diff --git a/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.dll b/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.dll
index b96ab44..f561d75 100644
Binary files a/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.dll and b/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.dll differ
diff --git a/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.pdb b/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.pdb
index eee4f02..1e6c51f 100644
Binary files a/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.pdb and b/DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.pdb differ
diff --git a/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.dll b/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.dll
index b96ab44..f561d75 100644
Binary files a/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.dll and b/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.dll differ
diff --git a/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.pdb b/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.pdb
index eee4f02..1e6c51f 100644
Binary files a/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.pdb and b/DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.pdb differ
diff --git a/README.md b/README.md
index 8bb6823..4be1a84 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,8 @@ The idea behind this project is to supply proper GPS for Windows Phone. It also
 
 ### OK, SO WHAT'S NEXT? HOW DO I START?
 
-You open the .sln file from WazeWP7 and run it. As simple as that.
+1. Install font.ttf and font_normal.ttf fonts under resources directory
+2. Open the .sln file from WazeWP7 and run it. As simple as that.
 
 ### COOL, NOW I WANT TO CHANGE THE BEHAVIOUR. HOW DO I DO THAT?
 
diff --git a/WazeWP7/AsyncNet.cs b/WazeWP7/AsyncNet.cs
index 6a96509..ec74637 100644
--- a/WazeWP7/AsyncNet.cs
+++ b/WazeWP7/AsyncNet.cs
@@ -24,28 +24,32 @@ public class AsyncNet : UIWorker.ValidityCheck
     //private static int concurrent_conns = 0;
     //private static object concurrent_conns_lock = new object();
 
-    private static int c_do_async_connect_cb;
-    private static int c_input_ready_cb;
-
-    private string url;
-    private string updateTime;
-    private int method;
-    private Stream Stream;
-    private int cb_addr;
-    private int context;
-    private object lock_object;
-
-    private int input_id = -1;
-    private byte[] buffer;
-    private int buffer_cur_ptr;
-    private int buffer_len;
+    private volatile static int c_do_async_connect_cb;
+    private volatile static int c_input_ready_cb;
 
-    private bool quit = false;
-    private bool eof = false;
-    private bool do_read = false;
-    private bool is_valid = true;
+    private volatile string url;
+    private volatile string updateTime;
+    private volatile int method;
+    private volatile Stream Stream;
+    private volatile int cb_addr;
+    private volatile int context;
+    private volatile object lock_object;
+
+    private volatile int input_id = -1;
+    private volatile byte[] buffer;
+    private volatile int buffer_cur_ptr;
+    private volatile int buffer_len;
+
+    private volatile bool quit = false;
+    private volatile bool eof = false;
+    private volatile bool do_read = false;
+    private volatile bool is_valid = true;
+
+    private volatile static NetQueue queue = null;
+    private volatile ManualResetEvent http_response_sync = new ManualResetEvent(false);
+    private volatile HttpWebResponse resp = null;
+    private volatile HttpWebRequest conn = null;
 
-    private static NetQueue queue = null;
 
     public AsyncNet(string url, int method, string updateTime,
        int cb_addr, int context)
@@ -90,9 +94,9 @@ public bool isValid()
 
     public void runNetLoop()
     {
-        ManualResetEvent http_response_sync = new ManualResetEvent(false);
-        HttpWebResponse resp = null;
-        HttpWebRequest conn = null;
+        http_response_sync = new ManualResetEvent(false);
+        resp = null;
+        conn = null;
 
         //bool wait = true;
         //while (wait)
diff --git a/WazeWP7/CibylCallTable.cs b/WazeWP7/CibylCallTable.cs
index 09a07c2..354eb6c 100644
--- a/WazeWP7/CibylCallTable.cs
+++ b/WazeWP7/CibylCallTable.cs
@@ -2,35 +2,35 @@
 public class CibylCallTable {
  public static int getAddressByName(String name) {
     if ( name == "__start") return 0x1000000;
-    if ( name == "main") return 0x10506bc;
+    if ( name == "main") return 0x10506cc;
     if ( name == "__do_global_ctors_aux") return 0x100004c;
     if ( name == "__do_global_dtors_aux") return 0x10000b8;
-    if ( name == "roadmap_gps_coarse_fix") return 0x1031e44;
-    if ( name == "roadmap_gpsj2me_pos1") return 0x1036d68;
-    if ( name == "roadmap_gpsj2me_pos2") return 0x1036d10;
-    if ( name == "rim_on_canvas_button_pressed") return 0x104e044;
-    if ( name == "rim_on_canvas_button_released") return 0x104e084;
-    if ( name == "rim_on_canvas_button_moved") return 0x104e0c4;
-    if ( name == "rim_on_menuItem") return 0x104fab4;
-    if ( name == "roadmap_main_on_battery_stat_changed") return 0x1051178;
-    if ( name == "roadmap_main_alloc_stack") return 0x1051694;
-    if ( name == "roadmap_main_input_ready") return 0x105059c;
-    if ( name == "rim_on_scheduledTask") return 0x10504c4;
-    if ( name == "roadmap_main_write_exception_to_log") return 0x1050a3c;
-    if ( name == "rim_start") return 0x10507d8;
-    if ( name == "rim_on_gps") return 0x104fc1c;
-    if ( name == "rim_on_key_down") return 0x1050c50;
-    if ( name == "rim_on_navigation_click") return 0x1051384;
-    if ( name == "rim_on_navigation_movement") return 0x1050358;
-    if ( name == "rim_on_menu_button") return 0x10511a4;
-    if ( name == "rim_on_orientation_change") return 0x1050310;
-    if ( name == "roadmap_main_set_sound_level") return 0x10509f8;
-    if ( name == "roadmap_main_exit") return 0x1050b24;
-    if ( name == "roadmap_main_browser_url_handler") return 0x1050a9c;
-    if ( name == "roadmap_sound_play_background_sound") return 0x10519e0;
-    if ( name == "do_async_connect_cb") return 0x1052250;
-    if ( name == "rim_on_editbox_closed") return 0x1052db4;
-    if ( name == "rim_on_editboxcamera_closed") return 0x1052f2c;
+    if ( name == "roadmap_gps_coarse_fix") return 0x1031e54;
+    if ( name == "roadmap_gpsj2me_pos1") return 0x1036d78;
+    if ( name == "roadmap_gpsj2me_pos2") return 0x1036d20;
+    if ( name == "rim_on_canvas_button_pressed") return 0x104e054;
+    if ( name == "rim_on_canvas_button_released") return 0x104e094;
+    if ( name == "rim_on_canvas_button_moved") return 0x104e0d4;
+    if ( name == "rim_on_menuItem") return 0x104fac4;
+    if ( name == "roadmap_main_on_battery_stat_changed") return 0x1051188;
+    if ( name == "roadmap_main_alloc_stack") return 0x10516a4;
+    if ( name == "roadmap_main_input_ready") return 0x10505ac;
+    if ( name == "rim_on_scheduledTask") return 0x10504d4;
+    if ( name == "roadmap_main_write_exception_to_log") return 0x1050a4c;
+    if ( name == "rim_start") return 0x10507e8;
+    if ( name == "rim_on_gps") return 0x104fc2c;
+    if ( name == "rim_on_key_down") return 0x1050c60;
+    if ( name == "rim_on_navigation_click") return 0x1051394;
+    if ( name == "rim_on_navigation_movement") return 0x1050368;
+    if ( name == "rim_on_menu_button") return 0x10511b4;
+    if ( name == "rim_on_orientation_change") return 0x1050320;
+    if ( name == "roadmap_main_set_sound_level") return 0x1050a08;
+    if ( name == "roadmap_main_exit") return 0x1050b34;
+    if ( name == "roadmap_main_browser_url_handler") return 0x1050aac;
+    if ( name == "roadmap_sound_play_background_sound") return 0x10519f0;
+    if ( name == "do_async_connect_cb") return 0x1052260;
+    if ( name == "rim_on_editbox_closed") return 0x1052dc4;
+    if ( name == "rim_on_editboxcamera_closed") return 0x1052f3c;
     else throw new Exception(name + " is not exported ");
  }
 
@@ -165,3371 +165,3377 @@ public static int fcall(int address, int sp, int a0, int a1, int a2, int a3) {
       case 0x1004454:  ret = Cibyl3.roadmap_log_path_1004454(sp, a0, a1, a2, a3); break;
       case 0x1004474:  ret = Cibyl3.roadmap_log_enabled_1004474(sp, a0, a1, a2, a3); break;
       case 0x100449c:  ret = Cibyl3.roadmap_log_100449c(sp, a0, a1, a2, a3); break;
-      case 0x10049d4:  ret = Cibyl3.roadmap_log_close_log_file_10049d4(sp, a0, a1, a2, a3); break;
-      case 0x1004a38:  ret = Cibyl3.roadmap_check_allocated_with_source_line_1004a38(sp, a0, a1, a2, a3); break;
-      case 0x1004a70:  ret = Cibyl3.roadmap_line_route_get_direction_1004a70( a0, a1); break;
-      case 0x1004ae4:  ret = Cibyl3.roadmap_line_route_is_low_weight_1004ae4( a0); break;
-      case 0x1004bdc:  ret = Cibyl3.roadmap_line_route_activate_1004bdc(sp, a0, a1, a2, a3); break;
-      case 0x1004c38:  ret = Cibyl3.roadmap_line_route_get_restrictions_1004c38(sp, a0, a1, a2, a3); break;
-      case 0x1004cdc:  ret = Cibyl3.roadmap_line_route_unmap_1004cdc(sp, a0, a1, a2, a3); break;
-      case 0x1004d30:  ret = Cibyl3.roadmap_line_route_map_1004d30(sp, a0, a1, a2, a3); break;
-      case 0x1004e30:  ret = Cibyl3.roadmap_line_speed_activate_1004e30(sp, a0, a1, a2, a3); break;
-      case 0x1004e8c:  ret = Cibyl3.roadmap_line_speed_get_1004e8c(sp, a0, a1, a2, a3); break;
-      case 0x1004f48:  ret = Cibyl3.roadmap_line_speed_get_speed_1004f48(sp, a0, a1, a2, a3); break;
-      case 0x1004fc8:  ret = Cibyl3.roadmap_line_speed_get_avg_1004fc8(sp, a0, a1, a2, a3); break;
-      case 0x1005078:  ret = Cibyl3.roadmap_line_speed_get_avg_speed_1005078(sp, a0, a1, a2, a3); break;
-      case 0x10050ec:  ret = Cibyl3.roadmap_line_speed_unmap_10050ec(sp, a0, a1, a2, a3); break;
-      case 0x1005140:  ret = Cibyl3.roadmap_line_speed_map_1005140(sp, a0, a1, a2, a3); break;
-      case 0x10052c8:  ret = Cibyl3.roadmap_line_speed_get_avg_cross_time_10052c8(sp, a0, a1, a2, a3); break;
-      case 0x10054b0:  ret = Cibyl4.T_73_10054b0(sp, a0, a1, a2, a3); break;
-      case 0x10055c0:  ret = Cibyl4.roadmap_line_speed_get_cross_times_10055c0(sp, a0, a1, a2, a3); break;
-      case 0x1005678:  ret = Cibyl4.roadmap_line_speed_get_cross_time_at_1005678(sp, a0, a1, a2, a3); break;
-      case 0x1005698:  ret = Cibyl4.roadmap_turns_in_square_1005698(); break;
-      case 0x10056a0:  ret = Cibyl4.roadmap_turns_of_node_10056a0(); break;
-      case 0x10057dc:  ret = Cibyl4.roadmap_dictionary_activate_10057dc( a0); break;
-      case 0x10057e8:  ret = Cibyl4.roadmap_dictionary_get_10057e8( a0, a1); break;
-      case 0x1005948:  ret = Cibyl4.roadmap_dictionary_unmap_1005948(sp, a0, a1, a2, a3); break;
-      case 0x10059f0:  ret = Cibyl4.roadmap_dictionary_find_words_10059f0(sp, a0, a1, a2, a3); break;
-      case 0x1005b48:  ret = Cibyl4.roadmap_dictionary_walk_1005b48(sp, a0, a1, a2, a3); break;
-      case 0x1005ca8:  ret = Cibyl4.roadmap_dictionary_get_all_results_1005ca8(sp, a0, a1, a2, a3); break;
-      case 0x1005d60:  ret = Cibyl4.roadmap_dictionary_initialize_one_1005d60(sp, a0, a1, a2, a3); break;
-      case 0x1005e3c:  ret = Cibyl4.roadmap_dictionary_map_1005e3c(sp, a0, a1, a2, a3); break;
-      case 0x1005f18:  ret = Cibyl4.roadmap_dictionary_set_mask_1005f18(sp, a0, a1, a2, a3); break;
-      case 0x100642c:  ret = Cibyl4.roadmap_dictionary_move_cursor_100642c(sp, a0, a1, a2, a3); break;
-      case 0x1006ba0:  ret = Cibyl4.roadmap_dictionary_open_1006ba0(sp, a0, a1, a2, a3); break;
-      case 0x1006bfc:  ret = Cibyl4.roadmap_math_set_min_zoom_1006bfc( a0); break;
-      case 0x1006c08:  ret = Cibyl4.roadmap_math_trigonometry_1006c08( a0, a1, a2, a3); break;
-      case 0x1006cc8:  ret = Cibyl4.roadmap_math_check_point_in_segment_1006cc8(sp, a0, a1, a2, a3); break;
-      case 0x1006df4:  ret = Cibyl4.roadmap_math_counter_rotate_coordinate_1006df4( a0, a1, a2, a3); break;
-      case 0x1006e84:  ret = Cibyl4.roadmap_math_project_1006e84( a0, a1, a2, a3); break;
-      case 0x1006f24:  ret = Cibyl4.roadmap_math_unproject_1006f24( a0, a1, a2, a3); break;
-      case 0x1006fc0:  ret = Cibyl4.roadmap_math_get_scale_1006fc0(sp, a0, a1, a2, a3); break;
-      case 0x10072a4:  ret = Cibyl4.roadmap_math_rotate_coordinates_10072a4(sp, a0, a1, a2, a3); break;
-      case 0x10073c4:  ret = Cibyl5.roadmap_math_rotate_project_coordinate_10073c4(sp, a0, a1, a2, a3); break;
-      case 0x10073e8:  ret = Cibyl5.roadmap_math_rotate_point_10073e8(sp, a0, a1, a2, a3); break;
-      case 0x10074ec:  ret = Cibyl5.roadmap_math_rotate_object_10074ec(sp, a0, a1, a2, a3); break;
-      case 0x1007620:  ret = Cibyl5.roadmap_math_register_unit_change_callback_1007620( a0); break;
-      case 0x1007630:  ret = Cibyl5.roadmap_math_use_metric_1007630(sp, a0, a1, a2, a3); break;
-      case 0x100766c:  ret = Cibyl5.roadmap_math_use_imperial_100766c(sp, a0, a1, a2, a3); break;
-      case 0x10076a8:  ret = Cibyl5.roadmap_math_set_focus_10076a8(sp, a0, a1, a2, a3); break;
-      case 0x1007718:  ret = Cibyl5.roadmap_math_release_focus_1007718(sp, a0, a1, a2, a3); break;
-      case 0x100777c:  ret = Cibyl5.roadmap_math_thickness_100777c(sp, a0, a1, a2, a3); break;
-      case 0x1007a18:  ret = Cibyl5.roadmap_math_normalize_orientation_1007a18( a0); break;
-      case 0x1007a4c:  ret = Cibyl5.roadmap_math_get_orientation_1007a4c(); break;
-      case 0x1007a5c:  ret = Cibyl5.roadmap_math_get_zoom_1007a5c(); break;
-      case 0x1007a6c:  ret = Cibyl5.roadmap_math_to_position_1007a6c(sp, a0, a1, a2, a3); break;
-      case 0x1007b74:  ret = Cibyl5.roadmap_math_set_orientation_1007b74(sp, a0, a1, a2, a3); break;
-      case 0x1007d6c:  ret = Cibyl5.roadmap_math_distance_unit_1007d6c(); break;
-      case 0x1007d84:  ret = Cibyl5.roadmap_math_trip_unit_1007d84(); break;
-      case 0x1007d9c:  ret = Cibyl5.roadmap_math_speed_unit_1007d9c(); break;
-      case 0x1007db4:  ret = Cibyl5.roadmap_math_distance_to_current_1007db4(sp, a0, a1, a2, a3); break;
-      case 0x1007df4:  ret = Cibyl5.roadmap_math_to_trip_distance_1007df4( a0); break;
-      case 0x1007e18:  ret = Cibyl5.roadmap_math_to_trip_distance_tenths_1007e18( a0); break;
-      case 0x1007e4c:  ret = Cibyl5.roadmap_math_to_speed_unit_1007e4c(sp, a0, a1, a2, a3); break;
-      case 0x1007e8c:  ret = Cibyl5.roadmap_math_meters_p_second_to_speed_unit_1007e8c(sp, a0, a1, a2, a3); break;
-      case 0x1007eb8:  ret = Cibyl5.roadmap_math_to_cm_1007eb8(sp, a0, a1, a2, a3); break;
-      case 0x1007f28:  ret = Cibyl5.roadmap_math_screen_edges_1007f28(sp, a0, a1, a2, a3); break;
-      case 0x1007f50:  ret = Cibyl5.roadmap_math_displayed_screen_edges_1007f50(sp, a0, a1, a2, a3); break;
-      case 0x1007f78:  ret = Cibyl5.roadmap_math_area_contains_1007f78( a0, a1); break;
-      case 0x10083b4:  ret = Cibyl5.roadmap_math_compare_points_10083b4( a0, a1, a2); break;
-      case 0x1008410:  ret = Cibyl5.roadmap_math_delta_direction_1008410( a0, a1); break;
-      case 0x100844c:  ret = Cibyl5.roadmap_math_get_context_100844c( a0, a1, a2); break;
-      case 0x1008478:  ret = Cibyl5.roadmap_math_is_metric_1008478(); break;
-      case 0x1008498:  ret = Cibyl5.roadmap_math_compute_scale_1008498(sp, a0, a1, a2, a3); break;
-      case 0x10086bc:  ret = Cibyl5.roadmap_math_set_context_10086bc(sp, a0, a1, a2, a3); break;
-      case 0x1008724:  ret = Cibyl5.roadmap_math_set_horizon_1008724(sp, a0, a1, a2, a3); break;
-      case 0x1008748:  ret = Cibyl5.roadmap_math_set_center_1008748(sp, a0, a1, a2, a3); break;
-      case 0x100877c:  ret = Cibyl5.roadmap_math_set_size_100877c(sp, a0, a1, a2, a3); break;
-      case 0x10087a8:  ret = Cibyl5.roadmap_math_street_address_10087a8(sp, a0, a1, a2, a3); break;
-      case 0x1008a70:  ret = Cibyl6.roadmap_math_arccosine_1008a70(sp, a0, a1, a2, a3); break;
-      case 0x1008c0c:  ret = Cibyl6.roadmap_math_to_current_unit_1008c0c(sp, a0, a1, a2, a3); break;
-      case 0x1008cc8:  ret = Cibyl6.roadmap_math_distance_convert_1008cc8(sp, a0, a1, a2, a3); break;
-      case 0x1008eb0:  ret = Cibyl6.roadmap_math_distance_1008eb0(sp, a0, a1, a2, a3); break;
-      case 0x1008f78:  ret = Cibyl6.roadmap_math_get_visible_coordinates_1008f78(sp, a0, a1, a2, a3); break;
-      case 0x1009694:  ret = Cibyl6.roadmap_math_screen_distance_1009694(sp, a0, a1, a2, a3); break;
-      case 0x1009824:  ret = Cibyl6.roadmap_math_azymuth_1009824(sp, a0, a1, a2, a3); break;
-      case 0x1009998:  ret = Cibyl6.roadmap_math_restore_zoom_1009998(sp, a0, a1, a2, a3); break;
-      case 0x10099f0:  ret = Cibyl6.roadmap_math_zoom_state_10099f0(sp, a0, a1, a2, a3); break;
-      case 0x1009a28:  ret = Cibyl6.roadmap_math_zoom_reset_1009a28(sp, a0, a1, a2, a3); break;
-      case 0x1009a6c:  ret = Cibyl6.roadmap_math_zoom_set_1009a6c(sp, a0, a1, a2, a3); break;
-      case 0x1009b10:  ret = Cibyl6.roadmap_math_set_scale_1009b10(sp, a0, a1, a2, a3); break;
-      case 0x1009cd0:  ret = Cibyl6.roadmap_math_adjust_zoom_1009cd0(sp, a0, a1, a2, a3); break;
-      case 0x1009d18:  ret = Cibyl6.roadmap_math_initialize_1009d18(sp, a0, a1, a2, a3); break;
-      case 0x1009db4:  ret = Cibyl6.roadmap_math_calc_line_length_1009db4(sp, a0, a1, a2, a3); break;
-      case 0x100a028:  ret = Cibyl7.roadmap_point_db_id_100a028( a0); break;
-      case 0x100a064:  ret = Cibyl7.roadmap_point_count_100a064(); break;
-      case 0x100a084:  ret = Cibyl7.roadmap_point_unmap_100a084(sp, a0, a1, a2, a3); break;
-      case 0x100a0b4:  ret = Cibyl7.roadmap_point_activate_100a0b4(sp, a0, a1, a2, a3); break;
-      case 0x100a120:  ret = Cibyl7.roadmap_point_map_100a120(sp, a0, a1, a2, a3); break;
-      case 0x100a1f8:  ret = Cibyl7.roadmap_polygon_count_100a1f8(); break;
-      case 0x100a218:  ret = Cibyl7.roadmap_polygon_category_100a218( a0); break;
-      case 0x100a23c:  ret = Cibyl7.roadmap_polygon_points_100a23c( a0, a1, a2); break;
-      case 0x100a2a0:  ret = Cibyl7.roadmap_polygon_unmap_100a2a0(sp, a0, a1, a2, a3); break;
-      case 0x100a30c:  ret = Cibyl7.roadmap_polygon_activate_100a30c(sp, a0, a1, a2, a3); break;
-      case 0x100a394:  ret = Cibyl7.roadmap_polygon_map_100a394(sp, a0, a1, a2, a3); break;
-      case 0x100a470:  ret = Cibyl7.roadmap_polygon_edges_100a470(sp, a0, a1, a2, a3); break;
-      case 0x100a51c:  ret = Cibyl7.roadmap_polygon_name_100a51c(sp, a0, a1, a2, a3); break;
-      case 0x100a558:  ret = Cibyl7.roadmap_shape_activate_100a558(sp, a0, a1, a2, a3); break;
-      case 0x100a5c4:  ret = Cibyl7.roadmap_shape_unmap_100a5c4(sp, a0, a1, a2, a3); break;
-      case 0x100a630:  ret = Cibyl7.roadmap_shape_map_100a630(sp, a0, a1, a2, a3); break;
-      case 0x100a6c8:  ret = Cibyl7.roadmap_shape_set_square_100a6c8(sp, a0, a1, a2, a3); break;
-      case 0x100a714:  Cibyl7.roadmap_square_activate_one_100a714(); break;
-      case 0x100a71c:  ret = Cibyl7.roadmap_square_force_next_update_100a71c(); break;
-      case 0x100a72c:  Cibyl7.roadmap_square_load_index_100a72c(); break;
-      case 0x100a734:  ret = Cibyl7.roadmap_square_activate_100a734(sp, a0, a1, a2, a3); break;
-      case 0x100a79c:  ret = Cibyl7.roadmap_square_map_one_100a79c(sp, a0, a1, a2, a3); break;
-      case 0x100aa0c:  ret = Cibyl7.roadmap_square_unload_all_100aa0c(sp, a0, a1, a2, a3); break;
-      case 0x100ab00:  ret = Cibyl7.roadmap_square_unmap_100ab00(sp, a0, a1, a2, a3); break;
-      case 0x100ab94:  ret = Cibyl7.roadmap_square_map_100ab94(sp, a0, a1, a2, a3); break;
-      case 0x100acd0:  ret = Cibyl7.roadmap_square_refresh_100acd0(sp, a0, a1, a2, a3); break;
-      case 0x100add4:  ret = Cibyl7.roadmap_square_scale_100add4(sp, a0, a1, a2, a3); break;
-      case 0x100adf4:  ret = Cibyl7.roadmap_square_at_current_scale_100adf4(sp, a0, a1, a2, a3); break;
-      case 0x100ae20:  ret = Cibyl7.roadmap_square_current_scale_shift_100ae20(sp, a0, a1, a2, a3); break;
-      case 0x100ae78:  ret = Cibyl7.roadmap_square_current_scale_factor_100ae78(sp, a0, a1, a2, a3); break;
-      case 0x100aee4:  ret = Cibyl7.roadmap_square_cross_pos_100aee4(sp, a0, a1, a2, a3); break;
-      case 0x100b020:  ret = Cibyl7.roadmap_square_set_screen_scale_100b020(sp, a0, a1, a2, a3); break;
-      case 0x100b074:  ret = Cibyl7.roadmap_square_adjust_scale_100b074(sp, a0, a1, a2, a3); break;
-      case 0x100b0dc:  ret = Cibyl7.roadmap_square_find_100b0dc(sp, a0, a1, a2, a3); break;
-      case 0x100b164:  ret = Cibyl7.roadmap_square_set_current_internal_100b164(sp, a0, a1, a2, a3); break;
-      case 0x100b37c:  ret = Cibyl8.roadmap_square_has_shapes_100b37c(sp, a0, a1, a2, a3); break;
-      case 0x100b3fc:  ret = Cibyl8.roadmap_square_min_100b3fc(sp, a0, a1, a2, a3); break;
-      case 0x100b484:  ret = Cibyl8.roadmap_square_version_100b484(sp, a0, a1, a2, a3); break;
-      case 0x100b50c:  ret = Cibyl8.roadmap_square_timestamp_100b50c(sp, a0, a1, a2, a3); break;
-      case 0x100b594:  ret = Cibyl8.roadmap_square_edges_100b594(sp, a0, a1, a2, a3); break;
-      case 0x100b76c:  ret = Cibyl8.roadmap_square_points_count_100b76c(sp, a0, a1, a2, a3); break;
-      case 0x100b7a8:  ret = Cibyl8.roadmap_square_search_100b7a8(sp, a0, a1, a2, a3); break;
-      case 0x100b848:  ret = Cibyl8.roadmap_square_find_neighbours_100b848(sp, a0, a1, a2, a3); break;
-      case 0x100bdb4:  ret = Cibyl8.roadmap_square_view_100bdb4(sp, a0, a1, a2, a3); break;
-      case 0x100c1bc:  ret = Cibyl8.roadmap_square_delete_reference_100c1bc(sp, a0, a1, a2, a3); break;
-      case 0x100c224:  ret = Cibyl8.roadmap_square_unmap_one_100c224(sp, a0, a1, a2, a3); break;
-      case 0x100c2c0:  ret = Cibyl8.T_174_100c2c0(sp, a0, a1, a2, a3); break;
-      case 0x100c300:  ret = Cibyl8.roadmap_square_request_location_100c300(sp, a0, a1, a2, a3); break;
-      case 0x100c4d4:  ret = Cibyl8.roadmap_tile_get_scale_factor_100c4d4( a0); break;
-      case 0x100c4f8:  ret = Cibyl8.roadmap_tile_get_scale_shift_100c4f8( a0); break;
-      case 0x100c500:  ret = Cibyl8.roadmap_tile_get_size_100c500( a0); break;
-      case 0x100c524:  ret = Cibyl8.roadmap_tile_get_origin_100c524( a0, a1, a2, a3); break;
-      case 0x100c5dc:  ret = Cibyl8.roadmap_tile_get_index_from_position_100c5dc( a0, a1, a2, a3); break;
-      case 0x100c63c:  ret = Cibyl8.roadmap_tile_get_id_from_position_100c63c(sp, a0, a1, a2, a3); break;
-      case 0x100c730:  ret = Cibyl8.roadmap_tile_get_max_scale_100c730(sp, a0, a1, a2, a3); break;
-      case 0x100c800:  ret = Cibyl8.roadmap_tile_get_scale_100c800(sp, a0, a1, a2, a3); break;
-      case 0x100c85c:  ret = Cibyl9.roadmap_tile_edges_100c85c(sp, a0, a1, a2, a3); break;
-      case 0x100c944:  ret = Cibyl9.roadmap_tile_is_adjacent_100c944(sp, a0, a1, a2, a3); break;
-      case 0x100ca10:  ret = Cibyl9.roadmap_tile_register_callback_100ca10( a0); break;
-      case 0x100ca20:  ret = Cibyl9.roadmap_tile_refresh_all_100ca20(sp, a0, a1, a2, a3); break;
-      case 0x100cabc:  ret = Cibyl9.refresh_all_tiles_100cabc(sp, a0, a1, a2, a3); break;
-      case 0x100cba4:  ret = Cibyl9.tile_load_progress_warn_100cba4(sp, a0, a1, a2, a3); break;
-      case 0x100cc3c:  ret = Cibyl9.init_loading_session_100cc3c(sp, a0, a1, a2, a3); break;
-      case 0x100cd5c:  ret = Cibyl9.queue_tile_100cd5c(sp, a0, a1, a2, a3); break;
-      case 0x100d03c:  ret = Cibyl9.http_cb_size_100d03c(sp, a0, a1, a2, a3); break;
-      case 0x100d0b4:  ret = Cibyl9.http_cb_progress_100d0b4(sp, a0, a1, a2, a3); break;
-      case 0x100d128:  ret = Cibyl9.load_next_tile_100d128(sp, a0, a1, a2, a3); break;
-      case 0x100d384:  ret = Cibyl9.roadmap_tile_request_100d384(sp, a0, a1, a2, a3); break;
-      case 0x100d508:  ret = Cibyl9.http_cb_done_100d508(sp, a0, a1, a2, a3); break;
-      case 0x100d6f0:  ret = Cibyl9.http_cb_error_100d6f0(sp, a0, a1, a2, a3); break;
-      case 0x100d8c8:  ret = Cibyl9.start_network_100d8c8(sp, a0, a1, a2, a3); break;
-      case 0x100d910:  ret = Cibyl9.roadmap_tile_manager_login_cb_100d910(sp, a0, a1, a2, a3); break;
-      case 0x100d960:  ret = Cibyl9.roadmap_tile_manager_check_timeouts_100d960(sp, a0, a1, a2, a3); break;
-      case 0x100da28:  ret = Cibyl9.roadmap_tile_status_add_100da28(sp, a0, a1, a2, a3); break;
-      case 0x100db90:  ret = Cibyl10.roadmap_tile_status_get_100db90(sp, a0, a1, a2, a3); break;
-      case 0x100dc38:  ret = Cibyl10.roadmap_warning_unregister_100dc38( a0, a1, a2, a3); break;
-      case 0x100dca8:  ret = Cibyl10.roadmap_warning_shutdown_100dca8(sp, a0, a1, a2, a3); break;
-      case 0x100dccc:  ret = Cibyl10.roadmap_warning_initialize_100dccc(sp, a0, a1, a2, a3); break;
-      case 0x100dd48:  ret = Cibyl10.roadmap_warning_monitor_100dd48(sp, a0, a1, a2, a3); break;
-      case 0x100de8c:  ret = Cibyl10.roadmap_warning_register_100de8c(sp, a0, a1, a2, a3); break;
-      case 0x100dfc8:  ret = Cibyl10.roadmap_config_skip_until_100dfc8( a0, a1); break;
-      case 0x100e004:  ret = Cibyl10.roadmap_config_skip_spaces_100e004( a0, a1); break;
-      case 0x100e038:  ret = Cibyl10.roadmap_config_extract_data_100e038( a0, a1, a2); break;
-      case 0x100e0c8:  ret = Cibyl10.roadmap_config_is_loaded_100e0c8(); break;
-      case 0x100e0d8:  ret = Cibyl10.roadmap_config_search_file_100e0d8(sp, a0, a1, a2, a3); break;
-      case 0x100e1f8:  ret = Cibyl10.roadmap_config_search_item_100e1f8(sp, a0, a1, a2, a3); break;
-      case 0x100e278:  ret = Cibyl10.roadmap_config_retrieve_100e278(sp, a0, a1, a2, a3); break;
-      case 0x100e348:  ret = Cibyl10.roadmap_config_get_100e348(sp, a0, a1, a2, a3); break;
-      case 0x100e408:  ret = Cibyl10.roadmap_config_set_item_100e408(sp, a0, a1, a2, a3); break;
-      case 0x100e50c:  ret = Cibyl10.roadmap_config_set_position_100e50c(sp, a0, a1, a2, a3); break;
-      case 0x100e5c0:  ret = Cibyl10.roadmap_config_set_100e5c0(sp, a0, a1, a2, a3); break;
-      case 0x100e610:  ret = Cibyl10.roadmap_config_set_integer_100e610(sp, a0, a1, a2, a3); break;
-      case 0x100e65c:  ret = Cibyl10.roadmap_config_get_position_100e65c(sp, a0, a1, a2, a3); break;
-      case 0x100e788:  ret = Cibyl10.roadmap_config_get_integer_100e788(sp, a0, a1, a2, a3); break;
-      case 0x100e7f4:  ret = Cibyl10.roadmap_config_match_100e7f4(sp, a0, a1, a2, a3); break;
-      case 0x100e820:  ret = Cibyl10.roadmap_config_update_100e820(sp, a0, a1, a2, a3); break;
-      case 0x100e9c4:  ret = Cibyl10.roadmap_config_save_one_100e9c4(sp, a0, a1, a2, a3); break;
-      case 0x100ea50:  ret = Cibyl10.roadmap_config_save_100ea50(sp, a0, a1, a2, a3); break;
-      case 0x100eab0:  ret = Cibyl10.roadmap_config_add_enumeration_value_100eab0(sp, a0, a1, a2, a3); break;
-      case 0x100eb44:  ret = Cibyl10.roadmap_config_new_item_100eb44(sp, a0, a1, a2, a3); break;
-      case 0x100ed70:  ret = Cibyl10.roadmap_config_declare_password_100ed70(sp, a0, a1, a2, a3); break;
-      case 0x100edb0:  ret = Cibyl10.roadmap_config_declare_100edb0(sp, a0, a1, a2, a3); break;
-      case 0x100edf8:  ret = Cibyl10.roadmap_config_declare_enumeration_100edf8(sp, a0, a1, a2, a3); break;
-      case 0x100eed8:  ret = Cibyl11.roadmap_config_get_name_value_binary_100eed8(sp, a0, a1, a2, a3); break;
-      case 0x100f004:  ret = Cibyl11.T_41_100f004(sp, a0, a1, a2, a3); break;
-      case 0x100f1ec:  ret = Cibyl11.roadmap_config_reload_100f1ec(sp, a0, a1, a2, a3); break;
-      case 0x100f31c:  ret = Cibyl11.roadmap_config_initialize_100f31c(sp, a0, a1, a2, a3); break;
-      case 0x100f35c:  ret = Cibyl11.roadmap_state_refresh_100f35c(sp, a0, a1, a2, a3); break;
-      case 0x100f3b0:  ret = Cibyl11.roadmap_state_monitor_100f3b0( a0, a1); break;
-      case 0x100f424:  ret = Cibyl11.roadmap_state_find_100f424(sp, a0, a1, a2, a3); break;
-      case 0x100f48c:  ret = Cibyl11.roadmap_state_add_100f48c(sp, a0, a1, a2, a3); break;
-      case 0x100f528:  ret = Cibyl11.upload_file_size_callback_100f528(); break;
-      case 0x100f530:  Cibyl11.upload_progress_callback_100f530(); break;
-      case 0x100f538:  ret = Cibyl11.roadmap_camera_image_shutdown_100f538(sp, a0, a1, a2, a3); break;
-      case 0x100f5c4:  ret = Cibyl11.roadmap_camera_image_initialize_100f5c4(sp, a0, a1, a2, a3); break;
-      case 0x100f6b8:  ret = Cibyl11.roadmap_camera_image_capture_100f6b8(sp, a0, a1, a2, a3); break;
-      case 0x100f74c:  ret = Cibyl11.download_error_callback_100f74c(sp, a0, a1, a2, a3); break;
-      case 0x100f7dc:  ret = Cibyl11.download_progress_callback_100f7dc(sp, a0, a1, a2, a3); break;
-      case 0x100f82c:  ret = Cibyl11.upload_done_100f82c(sp, a0, a1, a2, a3); break;
-      case 0x100f948:  ret = Cibyl11.upload_error_callback_100f948(sp, a0, a1, a2, a3); break;
-      case 0x100f9b0:  ret = Cibyl11.download_size_callback_100f9b0(sp, a0, a1, a2, a3); break;
-      case 0x100fcf4:  ret = Cibyl11.download_cache_add_100fcf4(sp, a0, a1, a2, a3); break;
-      case 0x100fda8:  ret = Cibyl11.download_done_callback_100fda8(sp, a0, a1, a2, a3); break;
-      case 0x100fe9c:  ret = Cibyl11.roadmap_camera_image_download_100fe9c(sp, a0, a1, a2, a3); break;
-      case 0x1010058:  ret = Cibyl11.roadmap_layer_all_roads_1010058( a0, a1, a2, a3); break;
-      case 0x10100ac:  ret = Cibyl11.roadmap_layer_visible_lines_10100ac(sp, a0, a1, a2, a3); break;
-      case 0x1010214:  ret = Cibyl11.roadmap_layer_visible_lines3_1010214(sp, a0, a1, a2, a3); break;
-      case 0x1010234:  ret = Cibyl11.roadmap_layer_visible_roads_1010234( a0, a1, a2, a3); break;
-      case 0x10102cc:  ret = Cibyl11.roadmap_layer_reset_10102cc(); break;
-      case 0x10102dc:  ret = Cibyl11.roadmap_layer_get_categories_names_10102dc( a0, a1); break;
-      case 0x10102f4:  ret = Cibyl11.roadmap_layer_cfcc2type_10102f4( a0); break;
-      case 0x1010314:  ret = Cibyl11.roadmap_layer_reload_internal_1010314(sp, a0, a1, a2, a3); break;
-      case 0x101098c:  ret = Cibyl12.roadmap_layer_initialize_101098c(sp, a0, a1, a2, a3); break;
-      case 0x1010a4c:  ret = Cibyl12.roadmap_layer_adjust_1010a4c(sp, a0, a1, a2, a3); break;
-      case 0x1010d44:  ret = Cibyl12.roadmap_layer_reload_1010d44(sp, a0, a1, a2, a3); break;
-      case 0x1010d84:  ret = Cibyl12.roadmap_street_get_street_t2s_1010d84(); break;
-      case 0x1010d9c:  ret = Cibyl12.roadmap_street_get_street_range_1010d9c(sp, a0, a1, a2, a3); break;
-      case 0x1010e18:  ret = Cibyl12.roadmap_street_unmap_1010e18(sp, a0, a1, a2, a3); break;
-      case 0x1010e84:  ret = Cibyl12.roadmap_street_activate_1010e84(sp, a0, a1, a2, a3); break;
-      case 0x1011008:  ret = Cibyl12.roadmap_street_map_1011008(sp, a0, a1, a2, a3); break;
-      case 0x10111ac:  ret = Cibyl12.roadmap_street_get_street_fetype_10111ac(sp, a0, a1, a2, a3); break;
-      case 0x10111fc:  ret = Cibyl12.roadmap_street_get_street_fename_10111fc(sp, a0, a1, a2, a3); break;
-      case 0x101124c:  ret = Cibyl12.roadmap_street_get_city_name_101124c(sp, a0, a1, a2, a3); break;
-      case 0x1011298:  ret = Cibyl12.roadmap_street_get_street_city_1011298(sp, a0, a1, a2, a3); break;
-      case 0x1011348:  ret = Cibyl12.roadmap_street_search_city_1011348(sp, a0, a1, a2, a3); break;
-      case 0x1011368:  ret = Cibyl12.roadmap_street_append_1011368(sp, a0, a1, a2, a3); break;
-      case 0x1011418:  ret = Cibyl12.roadmap_street_get_street_name_from_id_safe_1011418(sp, a0, a1, a2, a3); break;
-      case 0x1011818:  ret = Cibyl12.roadmap_street_get_street_name_1011818(sp, a0, a1, a2, a3); break;
-      case 0x101184c:  ret = Cibyl12.roadmap_street_get_street_address_101184c(sp, a0, a1, a2, a3); break;
-      case 0x1011920:  ret = Cibyl12.roadmap_street_get_full_name_1011920(sp, a0, a1, a2, a3); break;
-      case 0x1011a14:  ret = Cibyl12.roadmap_street_get_street_1011a14(sp, a0, a1, a2, a3); break;
-      case 0x1011a4c:  ret = Cibyl12.roadmap_street_get_properties_1011a4c(sp, a0, a1, a2, a3); break;
-      case 0x1011b20:  ret = Cibyl12.roadmap_street_replace_1011b20(sp, a0, a1, a2, a3); break;
-      case 0x1011d2c:  ret = Cibyl12.roadmap_street_distance_position_1011d2c(sp, a0, a1, a2, a3); break;
-      case 0x1011fe0:  ret = Cibyl13.roadmap_street_get_position_1011fe0(sp, a0, a1, a2, a3); break;
-      case 0x10121a4:  ret = Cibyl13.roadmap_street_blocks_by_city_10121a4(sp, a0, a1, a2, a3); break;
-      case 0x10124d4:  ret = Cibyl13.T_147_10124d4(sp, a0, a1, a2, a3); break;
-      case 0x1012790:  ret = Cibyl13.roadmap_street_extend_line_ends_1012790(sp, a0, a1, a2, a3); break;
-      case 0x1012c58:  ret = Cibyl13.roadmap_street_line_has_predecessor_1012c58(sp, a0, a1, a2, a3); break;
-      case 0x1012c88:  ret = Cibyl13.roadmap_street_get_distance_no_shape_1012c88(sp, a0, a1, a2, a3); break;
-      case 0x1012dac:  ret = Cibyl13.roadmap_street_get_distance_with_shape_1012dac(sp, a0, a1, a2, a3); break;
-      case 0x1013028:  ret = Cibyl13.roadmap_street_get_closest_1013028(sp, a0, a1, a2, a3); break;
-      case 0x1013390:  ret = Cibyl14.roadmap_street_check_distance_1013390(sp, a0, a1, a2, a3); break;
-      case 0x10134cc:  ret = Cibyl14.roadmap_street_get_distance_10134cc(sp, a0, a1, a2, a3); break;
-      case 0x101355c:  ret = Cibyl14.roadmap_county_count_101355c(); break;
-      case 0x101358c:  ret = Cibyl14.roadmap_county_by_position_101358c(sp, a0, a1, a2, a3); break;
-      case 0x10135dc:  ret = Cibyl14.roadmap_county_search_index_10135dc(sp, a0, a1, a2, a3); break;
-      case 0x101372c:  ret = Cibyl14.roadmap_locator_no_download_101372c(); break;
-      case 0x1013734:  ret = Cibyl14.roadmap_locator_close_1013734( a0, a1); break;
-      case 0x10137a0:  ret = Cibyl14.roadmap_locator_declare_10137a0( a0); break;
-      case 0x10137c0:  ret = Cibyl14.roadmap_locator_unload_tile_10137c0(sp, a0, a1, a2, a3); break;
-      case 0x10137f4:  ret = Cibyl14.roadmap_locator_load_tile_mem_10137f4(sp, a0, a1, a2, a3); break;
-      case 0x1013848:  ret = Cibyl14.roadmap_locator_load_tile_1013848(sp, a0, a1, a2, a3); break;
-      case 0x1013894:  ret = Cibyl14.roadmap_locator_static_county_1013894(sp, a0, a1, a2, a3); break;
-      case 0x101390c:  ret = Cibyl14.calloc_101390c(sp, a0, a1, a2, a3); break;
-      case 0x1013954:  ret = Cibyl14.roadmap_locator_configure_1013954(sp, a0, a1, a2, a3); break;
-      case 0x1013a50:  ret = Cibyl14.roadmap_locator_open_1013a50(sp, a0, a1, a2, a3); break;
-      case 0x1013c44:  ret = Cibyl14.roadmap_locator_activate_1013c44(sp, a0, a1, a2, a3); break;
-      case 0x1013c80:  ret = Cibyl14.roadmap_locator_by_city_1013c80(sp, a0, a1, a2, a3); break;
-      case 0x1013cec:  ret = Cibyl14.roadmap_locator_by_position_1013cec(sp, a0, a1, a2, a3); break;
-      case 0x1013d84:  ret = Cibyl14.roadmap_metadata_unmap_1013d84(sp, a0, a1, a2, a3); break;
-      case 0x1013df0:  ret = Cibyl14.roadmap_metadata_activate_1013df0(sp, a0, a1, a2, a3); break;
-      case 0x1013e94:  ret = Cibyl14.roadmap_metadata_map_1013e94(sp, a0, a1, a2, a3); break;
-      case 0x1014064:  ret = Cibyl14.roadmap_skin_register_1014064( a0, a1, a2); break;
-      case 0x10140b0:  ret = Cibyl14.roadmap_skin_auto_night_feature_enabled_10140b0(sp, a0, a1, a2, a3); break;
-      case 0x10140e4:  ret = Cibyl14.roadmap_skin_auto_night_mode_10140e4(sp, a0, a1, a2, a3); break;
-      case 0x1014194:  ret = Cibyl14.roadmap_skin_state_1014194(sp, a0, a1, a2, a3); break;
-      case 0x10141c0:  ret = Cibyl14.roadmap_skin_get_scheme_10141c0(sp, a0, a1, a2, a3); break;
-      case 0x10141e4:  ret = Cibyl14.roadmap_skin_auto_night_mode_kill_timer_10141e4(sp, a0, a1, a2, a3); break;
-      case 0x1014208:  ret = Cibyl14.roadmap_skin_state_screen_touched_1014208(sp, a0, a1, a2, a3); break;
-      case 0x101424c:  ret = Cibyl14.roadmap_skin_set_subskin_101424c(sp, a0, a1, a2, a3); break;
-      case 0x1014458:  ret = Cibyl14.roadmap_skin_gps_listener_1014458(sp, a0, a1, a2, a3); break;
-      case 0x101458c:  ret = Cibyl14.toggle_skin_timer_101458c(sp, a0, a1, a2, a3); break;
-      case 0x10145d4:  ret = Cibyl14.roadmap_skin_set_scheme_10145d4(sp, a0, a1, a2, a3); break;
-      case 0x101460c:  ret = Cibyl14.roadmap_skin_init_101460c(sp, a0, a1, a2, a3); break;
-      case 0x1014670:  ret = Cibyl14.roadmap_skin_toggle_1014670(sp, a0, a1, a2, a3); break;
-      case 0x10146b8:  ret = Cibyl14.roadmap_plugin_register_10146b8( a0, a1, a2, a3); break;
-      case 0x1014714:  ret = Cibyl14.roadmap_plugin_unregister_1014714( a0, a1); break;
-      case 0x101476c:  ret = Cibyl14.roadmap_plugin_override_line_101476c(); break;
-      case 0x101477c:  ret = Cibyl14.roadmap_plugin_screen_repaint_101477c(sp, a0, a1, a2, a3); break;
-      case 0x1014808:  ret = Cibyl14.roadmap_plugin_find_connected_lines_1014808(sp, a0, a1, a2, a3); break;
-      case 0x10148d0:  ret = Cibyl15.roadmap_plugin_adjust_layer_10148d0(sp, a0, a1, a2, a3); break;
-      case 0x1014978:  ret = Cibyl15.roadmap_plugin_get_closest_1014978(sp, a0, a1, a2, a3); break;
-      case 0x1014a54:  ret = Cibyl15.roadmap_plugin_shutdown_1014a54(sp, a0, a1, a2, a3); break;
-      case 0x1014ad4:  ret = Cibyl15.check_same_line_1014ad4( a0, a1); break;
-      case 0x1014b10:  ret = Cibyl15.roadmap_plugin_same_db_line_1014b10(sp, a0, a1, a2, a3); break;
-      case 0x1014c00:  ret = Cibyl15.roadmap_plugin_get_direction_1014c00(sp, a0, a1, a2, a3); break;
-      case 0x1014ccc:  ret = Cibyl15.roadmap_plugin_line_to_1014ccc(sp, a0, a1, a2, a3); break;
-      case 0x1014dd8:  ret = Cibyl15.roadmap_plugin_line_from_1014dd8(sp, a0, a1, a2, a3); break;
-      case 0x1014ee4:  ret = Cibyl15.roadmap_plugin_get_line_points_1014ee4(sp, a0, a1, a2, a3); break;
-      case 0x1014fec:  ret = Cibyl15.roadmap_plugin_calc_length_1014fec(sp, a0, a1, a2, a3); break;
-      case 0x101507c:  ret = Cibyl15.roadmap_plugin_get_street_101507c(sp, a0, a1, a2, a3); break;
-      case 0x1015174:  ret = Cibyl15.roadmap_plugin_get_street_properties_1015174(sp, a0, a1, a2, a3); break;
-      case 0x10152bc:  ret = Cibyl15.roadmap_plugin_street_full_name_10152bc(sp, a0, a1, a2, a3); break;
-      case 0x1015394:  ret = Cibyl15.roadmap_plugin_get_distance_1015394(sp, a0, a1, a2, a3); break;
-      case 0x1015474:  ret = Cibyl15.roadmap_plugin_activate_db_1015474(sp, a0, a1, a2, a3); break;
-      case 0x1015518:  ret = Cibyl15.roadmap_hash_get_first_1015518( a0, a1); break;
-      case 0x10155ac:  ret = Cibyl15.roadmap_hash_string_10155ac( a0, a1); break;
-      case 0x10155e0:  ret = Cibyl15.roadmap_hash_get_value_10155e0(sp, a0, a1, a2, a3); break;
-      case 0x1015668:  ret = Cibyl15.roadmap_hash_remove_1015668(sp, a0, a1, a2, a3); break;
-      case 0x1015744:  ret = Cibyl15.roadmap_hash_get_next_1015744(sp, a0, a1, a2, a3); break;
-      case 0x10157cc:  ret = Cibyl15.roadmap_hash_add_10157cc(sp, a0, a1, a2, a3); break;
-      case 0x10158bc:  ret = Cibyl15.roadmap_hash_new_10158bc(sp, a0, a1, a2, a3); break;
-      case 0x10159ac:  ret = Cibyl15.roadmap_hash_set_value_10159ac(sp, a0, a1, a2, a3); break;
-      case 0x1015a90:  ret = Cibyl15.roadmap_hash_free_1015a90(sp, a0, a1, a2, a3); break;
-      case 0x1015b18:  ret = Cibyl15.roadmap_hash_resize_1015b18(sp, a0, a1, a2, a3); break;
-      case 0x1015bdc:  ret = Cibyl16.roadmap_list_enqueue_1015bdc( a0, a1); break;
-      case 0x1015bf8:  ret = Cibyl16.roadmap_list_remove_1015bf8( a0, a1); break;
-      case 0x1015c3c:  ret = Cibyl16.roadmap_is_visible_1015c3c( a0); break;
-      case 0x1015c84:  ret = Cibyl16.roadmap_gps_source_1015c84(); break;
-      case 0x1015c94:  ret = Cibyl16.roadmap_verbosity_1015c94(); break;
-      case 0x1015ca4:  ret = Cibyl16.roadmap_debug_1015ca4(); break;
-      case 0x1015cb4:  ret = Cibyl16.roadmap_option_is_synchronous_1015cb4(); break;
-      case 0x1015cc4:  ret = Cibyl16.roadmap_option_set_no_area_1015cc4(); break;
-      case 0x1015cd4:  ret = Cibyl16.roadmap_option_set_square_1015cd4(); break;
-      case 0x1015ce4:  ret = Cibyl16.roadmap_option_set_verbose_1015ce4(); break;
-      case 0x1015d08:  ret = Cibyl16.roadmap_option_set_synchronous_1015d08(); break;
-      case 0x1015d18:  ret = Cibyl16.roadmap_option_set_verbosity_1015d18( a0); break;
-      case 0x1015d24:  ret = Cibyl16.roadmap_option_initialize_1015d24(sp, a0, a1, a2, a3); break;
-      case 0x1015de8:  ret = Cibyl16.roadmap_option_cache_1015de8(sp, a0, a1, a2, a3); break;
-      case 0x1015e18:  ret = Cibyl16.roadmap_option_1015e18(sp, a0, a1, a2, a3); break;
-      case 0x1015f64:  ret = Cibyl16.roadmap_option_usage_1015f64(sp, a0, a1, a2, a3); break;
-      case 0x1016014:  ret = Cibyl16.roadmap_option_set_debug_1016014(sp, a0, a1, a2, a3); break;
-      case 0x101606c:  ret = Cibyl16.roadmap_option_set_cache_101606c(sp, a0, a1, a2, a3); break;
-      case 0x10160cc:  ret = Cibyl16.roadmap_option_set_no_icon_10160cc(sp, a0, a1, a2, a3); break;
-      case 0x10160f8:  ret = Cibyl16.roadmap_option_set_no_toolbar_10160f8(sp, a0, a1, a2, a3); break;
-      case 0x1016124:  ret = Cibyl16.roadmap_option_set_geometry1_1016124(sp, a0, a1, a2, a3); break;
-      case 0x101614c:  ret = Cibyl16.roadmap_option_set_imperial_101614c(sp, a0, a1, a2, a3); break;
-      case 0x1016178:  ret = Cibyl16.roadmap_option_set_metric_1016178(sp, a0, a1, a2, a3); break;
-      case 0x10161a4:  ret = Cibyl16.roadmap_option_set_location_10161a4(sp, a0, a1, a2, a3); break;
-      case 0x10161cc:  ret = Cibyl16.roadmap_option_set_gps_10161cc(sp, a0, a1, a2, a3); break;
-      case 0x1016210:  ret = Cibyl16.roadmap_option_set_fastforward_1016210(sp, a0, a1, a2, a3); break;
-      case 0x1016234:  ret = Cibyl16.roadmap_option_set_geometry2_1016234(sp, a0, a1, a2, a3); break;
-      case 0x101631c:  ret = Cibyl16.roadmap_option_height_101631c(sp, a0, a1, a2, a3); break;
-      case 0x1016370:  ret = Cibyl16.roadmap_option_width_1016370(sp, a0, a1, a2, a3); break;
-      case 0x10163d0:  ret = Cibyl16.roadmap_ticker_height_10163d0(); break;
-      case 0x101640c:  ret = Cibyl16.roadmap_ticker_state_101640c(); break;
-      case 0x101641c:  ret = Cibyl16.roadmap_ticker_set_last_event_101641c( a0); break;
-      case 0x1016438:  ret = Cibyl16.roadmap_ticker_set_suppress_hide_1016438( a0); break;
-      case 0x1016444:  ret = Cibyl16.roadmap_ticker_show_1016444(sp, a0, a1, a2, a3); break;
-      case 0x10164ec:  ret = Cibyl16.roadmap_ticker_hide_10164ec(sp, a0, a1, a2, a3); break;
-      case 0x1016524:  ret = Cibyl16.roadmap_ticker_supress_hide_1016524(sp, a0, a1, a2, a3); break;
-      case 0x1016564:  ret = Cibyl16.roadmap_ticker_initialize_1016564(sp, a0, a1, a2, a3); break;
-      case 0x10166a8:  ret = Cibyl16.ticker_cfg_on_10166a8(sp, a0, a1, a2, a3); break;
-      case 0x10166d4:  ret = Cibyl16.roadmap_ticker_display_10166d4(sp, a0, a1, a2, a3); break;
-      case 0x1016cd0:  ret = Cibyl16.roadmap_foursquare_venues_list_1016cd0(sp, a0, a1, a2, a3); break;
-      case 0x1016db0:  ret = Cibyl16.delayed_show_progress_1016db0(sp, a0, a1, a2, a3); break;
-      case 0x1016de8:  ret = Cibyl16.request_time_out_1016de8(sp, a0, a1, a2, a3); break;
-      case 0x1016e28:  ret = Cibyl16.foursquare_pw_empty_1016e28(sp, a0, a1, a2, a3); break;
-      case 0x1016e60:  ret = Cibyl16.foursquare_un_empty_1016e60(sp, a0, a1, a2, a3); break;
-      case 0x1016e98:  ret = Cibyl16.on_ok_softkey_1016e98(sp, a0, a1, a2, a3); break;
-      case 0x1016eb8:  ret = Cibyl16.on_checkin_ok_btn_1016eb8(sp, a0, a1, a2, a3); break;
-      case 0x1016ed8:  ret = Cibyl16.parse_search_results_1016ed8(sp, a0, a1, a2, a3); break;
-      case 0x1017518:  ret = Cibyl17.roadmap_foursquare_disable_tweet_badge_1017518(sp, a0, a1, a2, a3); break;
-      case 0x101754c:  ret = Cibyl17.roadmap_foursquare_enable_tweet_badge_101754c(sp, a0, a1, a2, a3); break;
-      case 0x1017580:  ret = Cibyl17.roadmap_foursquare_disable_tweet_login_1017580(sp, a0, a1, a2, a3); break;
-      case 0x10175b4:  ret = Cibyl17.roadmap_foursquare_enable_tweet_login_10175b4(sp, a0, a1, a2, a3); break;
-      case 0x10175e8:  ret = Cibyl17.roadmap_foursquare_set_password_10175e8(sp, a0, a1, a2, a3); break;
-      case 0x101761c:  ret = Cibyl17.roadmap_foursquare_set_username_101761c(sp, a0, a1, a2, a3); break;
-      case 0x101764c:  ret = Cibyl17.roadmap_foursquare_set_logged_in_101764c(sp, a0, a1, a2, a3); break;
-      case 0x1017698:  ret = Cibyl17.roadmap_foursquare_login_failed_1017698(sp, a0, a1, a2, a3); break;
-      case 0x10176e8:  ret = Cibyl17.roadmap_foursquare_request_failed_10176e8(sp, a0, a1, a2, a3); break;
-      case 0x10177ec:  ret = Cibyl17.foursquare_network_error_10177ec(sp, a0, a1, a2, a3); break;
-      case 0x1017834:  ret = Cibyl17.roadmap_foursquare_is_tweet_badge_enabled_1017834(sp, a0, a1, a2, a3); break;
-      case 0x1017868:  ret = Cibyl17.on_venue_item_selected_1017868(sp, a0, a1, a2, a3); break;
-      case 0x1017968:  ret = Cibyl17.roadmap_foursquare_is_tweet_login_enabled_1017968(sp, a0, a1, a2, a3); break;
-      case 0x101799c:  ret = Cibyl17.roadmap_foursquare_login_101799c(sp, a0, a1, a2, a3); break;
-      case 0x1017a54:  ret = Cibyl17.roadmap_foursquare_is_enabled_1017a54(sp, a0, a1, a2, a3); break;
-      case 0x1017c6c:  ret = Cibyl17.roadmap_foursquare_get_password_1017c6c(sp, a0, a1, a2, a3); break;
-      case 0x1017c90:  ret = Cibyl17.roadmap_foursquare_get_username_1017c90(sp, a0, a1, a2, a3); break;
-      case 0x1017cb4:  ret = Cibyl17.roadmap_foursquare_logged_in_1017cb4(sp, a0, a1, a2, a3); break;
-      case 0x1017ce8:  ret = Cibyl17.on_login_dlg_close_1017ce8(sp, a0, a1, a2, a3); break;
-      case 0x1017e34:  ret = Cibyl17.roadmap_foursquare_initialize_1017e34(sp, a0, a1, a2, a3); break;
-      case 0x1017f54:  ret = Cibyl17.T_72_1017f54(sp, a0, a1, a2, a3); break;
-      case 0x1017fa0:  ret = Cibyl17.roadmap_foursquare_checkedin_dialog_1017fa0(sp, a0, a1, a2, a3); break;
-      case 0x1018418:  ret = Cibyl17.roadmap_foursquare_login_dialog_1018418(sp, a0, a1, a2, a3); break;
-      case 0x1018c78:  ret = Cibyl18.roadmap_foursquare_checkin_1018c78(sp, a0, a1, a2, a3); break;
-      case 0x1018d00:  ret = Cibyl18.on_foursquare_checkin_1018d00(sp, a0, a1, a2, a3); break;
-      case 0x1018d20:  ret = Cibyl18.roadmap_foursquare_response_1018d20(sp, a0, a1, a2, a3); break;
-      case 0x10190a8:  ret = Cibyl18.roadmap_display_initialize_10190a8(sp, a0, a1, a2, a3); break;
-      case 0x1019260:  ret = Cibyl18.roadmap_display_new_pen_1019260(sp, a0, a1, a2, a3); break;
-      case 0x1019364:  ret = Cibyl18.roadmap_display_create_pens_1019364(sp, a0, a1, a2, a3); break;
-      case 0x1019470:  ret = Cibyl18.roadmap_display_search_sign_1019470(sp, a0, a1, a2, a3); break;
-      case 0x10194f0:  ret = Cibyl18.roadmap_display_get_id_10194f0(sp, a0, a1, a2, a3); break;
-      case 0x1019564:  ret = Cibyl18.roadmap_display_hide_1019564(sp, a0, a1, a2, a3); break;
-      case 0x1019590:  ret = Cibyl18.roadmap_display_update_points_1019590(sp, a0, a1, a2, a3); break;
-      case 0x1019608:  ret = Cibyl18.roadmap_display_is_sign_active_1019608(sp, a0, a1, a2, a3); break;
-      case 0x1019658:  ret = Cibyl18.roadmap_display_image_sign_1019658(sp, a0, a1, a2, a3); break;
-      case 0x10196c4:  ret = Cibyl18.roadmap_display_highlight_10196c4(sp, a0, a1, a2, a3); break;
-      case 0x1019744:  ret = Cibyl18.roadmap_display_string_1019744(sp, a0, a1, a2, a3); break;
-      case 0x1019ad4:  ret = Cibyl18.roadmap_display_page_1019ad4(sp, a0, a1, a2, a3); break;
-      case 0x1019ba8:  ret = Cibyl18.roadmap_display_text_1019ba8(sp, a0, a1, a2, a3); break;
-      case 0x1019e40:  ret = Cibyl18.roadmap_display_activate_1019e40(sp, a0, a1, a2, a3); break;
-      case 0x101a194:  ret = Cibyl19.roadmap_display_sign_pop_up_101a194(sp, a0, a1, a2, a3); break;
-      case 0x101a408:  ret = Cibyl19.T_99_101a408(sp, a0, a1, a2, a3); break;
-      case 0x101a6c0:  ret = Cibyl19.roadmap_display_signs_101a6c0(sp, a0, a1, a2, a3); break;
-      case 0x101ad9c:  Cibyl19.roadmap_message_dummy_101ad9c(); break;
-      case 0x101ada4:  ret = Cibyl19.roadmap_message_register_101ada4( a0); break;
-      case 0x101adb4:  ret = Cibyl19.roadmap_message_update_101adb4(sp, a0, a1, a2, a3); break;
-      case 0x101addc:  ret = Cibyl19.roadmap_message_is_set_101addc(sp, a0, a1, a2, a3); break;
-      case 0x101ae54:  ret = Cibyl19.roadmap_message_unset_101ae54(sp, a0, a1, a2, a3); break;
-      case 0x101aec4:  ret = Cibyl19.roadmap_message_set_101aec4(sp, a0, a1, a2, a3); break;
-      case 0x101afb8:  ret = Cibyl19.roadmap_message_format_101afb8(sp, a0, a1, a2, a3); break;
-      case 0x101b0d8:  ret = Cibyl19.roadmap_sprite_decode_point_101b0d8(sp, a0, a1, a2, a3); break;
-      case 0x101b134:  ret = Cibyl19.roadmap_sprite_decode_sequence_101b134(sp, a0, a1, a2, a3); break;
-      case 0x101b210:  ret = Cibyl19.roadmap_sprite_decode_circle_101b210(sp, a0, a1, a2, a3); break;
-      case 0x101b2b4:  ret = Cibyl19.calloc_101b2b4(sp, a0, a1, a2, a3); break;
-      case 0x101b2fc:  ret = Cibyl19.roadmap_sprite_load_101b2fc(sp, a0, a1, a2, a3); break;
-      case 0x101b788:  ret = Cibyl20.roadmap_sprite_initialize_101b788(sp, a0, a1, a2, a3); break;
-      case 0x101bad4:  ret = Cibyl20.roadmap_sprite_place_101bad4(sp, a0, a1, a2, a3); break;
-      case 0x101bb50:  ret = Cibyl20.roadmap_sprite_draw_101bb50(sp, a0, a1, a2, a3); break;
-      case 0x101bcc8:  ret = Cibyl20.roadmap_object_exists_101bcc8( a0); break;
-      case 0x101bd00:  ret = Cibyl20.roadmap_object_disable_short_click_101bd00(); break;
-      case 0x101bd0c:  ret = Cibyl20.roadmap_object_enable_short_click_101bd0c(); break;
-      case 0x101bd2c:  Cibyl20.roadmap_object_null_listener_101bd2c(); break;
-      case 0x101bd34:  Cibyl20.roadmap_object_null_monitor_101bd34(); break;
-      case 0x101bd3c:  ret = Cibyl20.roadmap_object_move_101bd3c(sp, a0, a1, a2, a3); break;
-      case 0x101be78:  ret = Cibyl20.roadmap_object_set_zoom_101be78( a0, a1, a2); break;
-      case 0x101bed0:  ret = Cibyl20.roadmap_object_set_action_101bed0(sp, a0, a1, a2, a3); break;
-      case 0x101bf68:  ret = Cibyl20.out_of_zoom_101bf68(sp, a0, a1, a2, a3); break;
-      case 0x101bfd8:  ret = Cibyl20.roadmap_object_iterate_101bfd8(sp, a0, a1, a2, a3); break;
-      case 0x101c14c:  ret = Cibyl20.roadmap_object_remove_101c14c(sp, a0, a1, a2, a3); break;
-      case 0x101c27c:  ret = Cibyl20.roadmap_object_add_with_priority_101c27c(sp, a0, a1, a2, a3); break;
-      case 0x101c4fc:  ret = Cibyl20.roadmap_object_add_101c4fc(sp, a0, a1, a2, a3); break;
-      case 0x101c54c:  ret = Cibyl20.roadmap_object_short_click_101c54c(sp, a0, a1, a2, a3); break;
-      case 0x101c7b0:  ret = Cibyl20.roadmap_string_lock_101c7b0( a0); break;
-      case 0x101c7d4:  ret = Cibyl20.roadmap_string_get_101c7d4( a0); break;
-      case 0x101c7e8:  ret = Cibyl20.roadmap_string_compare_ignore_case_101c7e8( a0, a1); break;
-      case 0x101c818:  ret = Cibyl20.roadmap_string_is_sub_ignore_case_101c818(sp, a0, a1, a2, a3); break;
-      case 0x101c8f8:  ret = Cibyl20.roadmap_string_release_101c8f8(sp, a0, a1, a2, a3); break;
-      case 0x101c97c:  ret = Cibyl20.roadmap_string_release_all_101c97c(sp, a0, a1, a2, a3); break;
-      case 0x101ca0c:  ret = Cibyl21.roadmap_string_new_101ca0c(sp, a0, a1, a2, a3); break;
-      case 0x101cb5c:  ret = Cibyl21.roadmap_string_new_in_collection_101cb5c(sp, a0, a1, a2, a3); break;
-      case 0x101cc04:  ret = Cibyl21.roadmap_lang_rtl_101cc04(); break;
-      case 0x101cc14:  ret = Cibyl21.roadmap_lang_get_available_langs_count_101cc14(); break;
-      case 0x101cc24:  ret = Cibyl21.roadmap_lang_get_available_langs_values_101cc24(); break;
-      case 0x101cc30:  ret = Cibyl21.roadmap_lang_get_available_langs_labels_101cc30(); break;
-      case 0x101ccd4:  ret = Cibyl21.roadmap_lang_get_lang_value_101ccd4(sp, a0, a1, a2, a3); break;
-      case 0x101cd60:  ret = Cibyl21.roadmap_lang_get_101cd60(sp, a0, a1, a2, a3); break;
-      case 0x101ce48:  ret = Cibyl21.roadmap_lang_allocate_101ce48(sp, a0, a1, a2, a3); break;
-      case 0x101cf20:  ret = Cibyl21.roadmap_lang_conf_load_101cf20(sp, a0, a1, a2, a3); break;
-      case 0x101d110:  ret = Cibyl21.roadmap_lang_get_lang_file_update_time_101d110(sp, a0, a1, a2, a3); break;
-      case 0x101d164:  ret = Cibyl21.roadmap_lang_download_lang_file_101d164(sp, a0, a1, a2, a3); break;
-      case 0x101d1f8:  ret = Cibyl21.roadmap_lang_initialize_params_101d1f8(sp, a0, a1, a2, a3); break;
-      case 0x101d270:  ret = Cibyl21.roadmap_lang_set_update_time_101d270(sp, a0, a1, a2, a3); break;
-      case 0x101d2b0:  ret = Cibyl21.on_conf_file_downloaded_101d2b0(sp, a0, a1, a2, a3); break;
-      case 0x101d318:  ret = Cibyl21.roadmap_lang_get_update_time_101d318(sp, a0, a1, a2, a3); break;
-      case 0x101d350:  ret = Cibyl21.roadmap_lang_download_conf_file_101d350(sp, a0, a1, a2, a3); break;
-      case 0x101d3e0:  ret = Cibyl21.roadmap_lang_get_default_lang_101d3e0(sp, a0, a1, a2, a3); break;
-      case 0x101d418:  ret = Cibyl21.roadmap_lang_get_user_lang_101d418(sp, a0, a1, a2, a3); break;
-      case 0x101d484:  ret = Cibyl21.roadmap_lang_get_system_lang_101d484(sp, a0, a1, a2, a3); break;
-      case 0x101d4f4:  ret = Cibyl21.roadmap_lang_load_101d4f4(sp, a0, a1, a2, a3); break;
-      case 0x101d71c:  ret = Cibyl21.roadmap_lang_login_cb_101d71c(sp, a0, a1, a2, a3); break;
-      case 0x101d7f4:  ret = Cibyl21.roadmap_lang_initialize_101d7f4(sp, a0, a1, a2, a3); break;
-      case 0x101d8f4:  ret = Cibyl21.roadmap_lang_set_lang_file_update_time_101d8f4(sp, a0, a1, a2, a3); break;
-      case 0x101d960:  ret = Cibyl21.on_lang_file_downloaded_101d960(sp, a0, a1, a2, a3); break;
-      case 0x101da7c:  ret = Cibyl21.roadmap_lang_set_system_lang_101da7c(sp, a0, a1, a2, a3); break;
-      case 0x101dae0:  ret = Cibyl21.roadmap_adjust_initialize_101dae0(sp, a0, a1, a2, a3); break;
-      case 0x101db3c:  ret = Cibyl21.roadmap_adjust_offset_longitude_101db3c(sp, a0, a1, a2, a3); break;
-      case 0x101db60:  ret = Cibyl21.roadmap_adjust_offset_latitude_101db60(sp, a0, a1, a2, a3); break;
-      case 0x101db84:  ret = Cibyl21.roadmap_adjust_position_101db84(sp, a0, a1, a2, a3); break;
-      case 0x101dc40:  ret = Cibyl21.roadmap_trip_coordinate_101dc40( a0, a1, a2, a3); break;
-      case 0x101dce4:  ret = Cibyl21.roadmap_trip_gps_state_101dce4( a0); break;
-      case 0x101dd30:  ret = Cibyl21.roadmap_trip_is_focus_changed_101dd30( a0); break;
-      case 0x101dd54:  ret = Cibyl21.roadmap_trip_is_focus_moved_101dd54( a0); break;
-      case 0x101dd78:  ret = Cibyl21.roadmap_trip_is_refresh_needed_101dd78(); break;
-      case 0x101ddd4:  ret = Cibyl21.roadmap_trip_get_orientation_101ddd4(); break;
-      case 0x101de10:  ret = Cibyl21.roadmap_trip_get_focus_name_101de10(); break;
-      case 0x101de30:  ret = Cibyl22.roadmap_trip_get_focus_position_101de30(); break;
-      case 0x101de54:  ret = Cibyl22.roadmap_trip_search_101de54(sp, a0, a1, a2, a3); break;
-      case 0x101dec8:  ret = Cibyl22.roadmap_trip_get_nodes_101dec8(sp, a0, a1, a2, a3); break;
-      case 0x101df24:  ret = Cibyl22.roadmap_trip_get_gps_position_101df24(sp, a0, a1, a2, a3); break;
-      case 0x101df50:  ret = Cibyl22.roadmap_trip_get_position_101df50(sp, a0, a1, a2, a3); break;
-      case 0x101df7c:  ret = Cibyl22.roadmap_trip_initialize_101df7c(sp, a0, a1, a2, a3); break;
-      case 0x101e174:  ret = Cibyl22.roadmap_trip_format_messages_101e174(sp, a0, a1, a2, a3); break;
-      case 0x101e4b4:  ret = Cibyl22.roadmap_trip_new_101e4b4(sp, a0, a1, a2, a3); break;
-      case 0x101e684:  ret = Cibyl22.roadmap_trip_current_101e684(sp, a0, a1, a2, a3); break;
-      case 0x101e6a8:  ret = Cibyl22.roadmap_trip_display_101e6a8(sp, a0, a1, a2, a3); break;
-      case 0x101ebac:  ret = Cibyl22.roadmap_trip_stop_101ebac(sp, a0, a1, a2, a3); break;
-      case 0x101ebdc:  ret = Cibyl22.roadmap_trip_set_point_focus_101ebdc(sp, a0, a1, a2, a3); break;
-      case 0x101ece8:  ret = Cibyl22.roadmap_trip_set_focus_101ece8(sp, a0, a1, a2, a3); break;
-      case 0x101ed40:  ret = Cibyl22.roadmap_trip_activate_101ed40(sp, a0, a1, a2, a3); break;
-      case 0x101ee38:  ret = Cibyl22.roadmap_trip_reverse_101ee38(sp, a0, a1, a2, a3); break;
-      case 0x101ee98:  ret = Cibyl22.roadmap_trip_resume_101ee98(sp, a0, a1, a2, a3); break;
-      case 0x101eee8:  ret = Cibyl22.roadmap_trip_restore_focus_101eee8(sp, a0, a1, a2, a3); break;
-      case 0x101f044:  ret = Cibyl23.roadmap_trip_remove_point_101f044(sp, a0, a1, a2, a3); break;
-      case 0x101f1cc:  ret = Cibyl23.roadmap_trip_copy_focus_101f1cc(sp, a0, a1, a2, a3); break;
-      case 0x101f274:  ret = Cibyl23.roadmap_trip_update_101f274(sp, a0, a1, a2, a3); break;
-      case 0x101f5a8:  ret = Cibyl23.roadmap_trip_set_gps_and_nodes_position_101f5a8(sp, a0, a1, a2, a3); break;
-      case 0x101f638:  ret = Cibyl23.roadmap_trip_set_gps_position_101f638(sp, a0, a1, a2, a3); break;
-      case 0x101f6a8:  ret = Cibyl23.roadmap_trip_set_mobile_101f6a8(sp, a0, a1, a2, a3); break;
-      case 0x101f704:  ret = Cibyl23.roadmap_trip_set_selection_as_101f704(sp, a0, a1, a2, a3); break;
-      case 0x101f76c:  ret = Cibyl23.roadmap_trip_set_point_101f76c(sp, a0, a1, a2, a3); break;
-      case 0x101f79c:  ret = Cibyl23.roadmap_trip_start_101f79c(sp, a0, a1, a2, a3); break;
-      case 0x101f7fc:  Cibyl23.roadmap_screen_after_refresh_101f7fc(); break;
-      case 0x101f804:  ret = Cibyl23.roadmap_screen_in_view_101f804( a0, a1, a2); break;
-      case 0x101f84c:  ret = Cibyl23.roadmap_screen_subscribe_after_flow_control_refresh_101f84c( a0); break;
-      case 0x101f878:  ret = Cibyl23.roadmap_screen_get_view_mode_101f878(); break;
-      case 0x101f888:  ret = Cibyl23.roadmap_screen_get_nonogl_view_mode_101f888(); break;
-      case 0x101f898:  ret = Cibyl23.roadmap_screen_get_view_mode_screen_touched_101f898(); break;
-      case 0x101f8bc:  ret = Cibyl23.roadmap_screen_get_orientation_mode_101f8bc(); break;
-      case 0x101f8cc:  ret = Cibyl23.roadmap_screen_height_101f8cc( a0); break;
-      case 0x101f904:  ret = Cibyl23.roadmap_screen_mark_redraw_101f904(); break;
-      case 0x101f91c:  ret = Cibyl23.roadmap_screen_freeze_101f91c(); break;
-      case 0x101f93c:  ret = Cibyl23.roadmap_screen_set_orientation_dynamic_101f93c(); break;
-      case 0x101f970:  ret = Cibyl23.roadmap_screen_subscribe_after_refresh_101f970( a0); break;
-      case 0x101f998:  ret = Cibyl23.roadmap_screen_fast_refresh_101f998(); break;
-      case 0x101f9b8:  Cibyl23.dbg_time_start_101f9b8(); break;
-      case 0x101f9c0:  Cibyl23.dbg_time_end_101f9c0(); break;
-      case 0x101f9d0:  ret = Cibyl23.roadmap_screen_draw_flush_101f9d0(); break;
-      case 0x101f9dc:  ret = Cibyl23.roadmap_screen_touched_state_101f9dc(); break;
-      case 0x101f9f4:  ret = Cibyl23.roadmap_screen_not_touched_state_101f9f4(); break;
-      case 0x101fa0c:  ret = Cibyl23.roadmap_screen_set_screen_type_101fa0c( a0); break;
-      case 0x101fa28:  ret = Cibyl23.roadmap_screen_is_hd_screen_101fa28(); break;
-      case 0x101fa7c:  ret = Cibyl23.roadmap_screen_get_screen_scale_101fa7c( a0); break;
-      case 0x101fab8:  ret = Cibyl23.roadmap_screen_is_xicon_open_101fab8(); break;
-      case 0x101fac8:  ret = Cibyl23.roadmap_screen_set_background_run_101fac8( a0); break;
-      case 0x101fad4:  ret = Cibyl23.roadmap_screen_get_background_run_101fad4(); break;
-      case 0x101fb0c:  ret = Cibyl23.roadmap_screen_set_scale_101fb0c(sp, a0, a1, a2, a3); break;
-      case 0x101fb3c:  ret = Cibyl23.roadmap_screen_shade_bg_101fb3c(sp, a0, a1, a2, a3); break;
-      case 0x101fc00:  ret = Cibyl23.roadmap_screen_set_Xicon_state_101fc00(sp, a0, a1, a2, a3); break;
-      case 0x101fc54:  ret = Cibyl23.roadmap_screen_repaint_101fc54(sp, a0, a1, a2, a3); break;
-      case 0x101fca0:  ret = Cibyl23.roadmap_screen_touched_timer_101fca0(sp, a0, a1, a2, a3); break;
-      case 0x101fcfc:  ret = Cibyl23.roadmap_screen_unfreeze_101fcfc(sp, a0, a1, a2, a3); break;
-      case 0x101fd28:  ret = Cibyl23.roadmap_screen_show_top_bar_101fd28(sp, a0, a1, a2, a3); break;
-      case 0x101fd64:  ret = Cibyl23.roadmap_screen_show_screen_icons_101fd64(sp, a0, a1, a2, a3); break;
-      case 0x101fd90:  ret = Cibyl23.roadmap_screen_show_icons_only_when_touched_101fd90(sp, a0, a1, a2, a3); break;
-      case 0x101fddc:  ret = Cibyl23.roadmap_screen_get_orientation_mode_touched_101fddc(sp, a0, a1, a2, a3); break;
-      case 0x101fe10:  ret = Cibyl23.roadmap_screen_flush_polygons_101fe10(sp, a0, a1, a2, a3); break;
-      case 0x10200d0:  ret = Cibyl23.roadmap_screen_draw_object_10200d0(sp, a0, a1, a2, a3); break;
-      case 0x1020318:  ret = Cibyl23.is_screen_wide_1020318(sp, a0, a1, a2, a3); break;
-      case 0x1020388:  ret = Cibyl23.roadmap_screen_adjust_width_1020388(sp, a0, a1, a2, a3); break;
-      case 0x10203d8:  ret = Cibyl24.roadmap_screen_set_initial_position_10203d8(sp, a0, a1, a2, a3); break;
-      case 0x1020490:  ret = Cibyl24.roadmap_screen_reset_pens_1020490(sp, a0, a1, a2, a3); break;
-      case 0x10204d4:  ret = Cibyl24.roadmap_screen_shutdown_10204d4(sp, a0, a1, a2, a3); break;
-      case 0x102055c:  ret = Cibyl24.roadmap_screen_initialize_102055c(sp, a0, a1, a2, a3); break;
-      case 0x1020888:  ret = Cibyl24.roadmap_screen_record_move_1020888(sp, a0, a1, a2, a3); break;
-      case 0x102091c:  ret = Cibyl24.roadmap_screen_drag_motion_102091c(sp, a0, a1, a2, a3); break;
-      case 0x1020b28:  ret = Cibyl24.roadmap_screen_move_left_1020b28(sp, a0, a1, a2, a3); break;
-      case 0x1020b64:  ret = Cibyl24.roadmap_screen_move_right_1020b64(sp, a0, a1, a2, a3); break;
-      case 0x1020ba0:  ret = Cibyl24.roadmap_screen_move_down_1020ba0(sp, a0, a1, a2, a3); break;
-      case 0x1020bdc:  ret = Cibyl24.roadmap_screen_move_up_1020bdc(sp, a0, a1, a2, a3); break;
-      case 0x1020c18:  ret = Cibyl24.roadmap_screen_move_1020c18(sp, a0, a1, a2, a3); break;
-      case 0x1020c40:  ret = Cibyl24.roadmap_screen_update_center_1020c40(sp, a0, a1, a2, a3); break;
-      case 0x1020cf0:  ret = Cibyl24.roadmap_screen_drag_end_1020cf0(sp, a0, a1, a2, a3); break;
-      case 0x1020f5c:  ret = Cibyl24.roadmap_screen_update_center_animated_1020f5c(sp, a0, a1, a2, a3); break;
-      case 0x1020f7c:  ret = Cibyl24.roadmap_screen_move_center_1020f7c(sp, a0, a1, a2, a3); break;
-      case 0x1020fe4:  ret = Cibyl24.roadmap_screen_pressed_1020fe4(sp, a0, a1, a2, a3); break;
-      case 0x1021004:  ret = Cibyl24.roadmap_screen_zoom_reset_1021004(sp, a0, a1, a2, a3); break;
-      case 0x1021040:  ret = Cibyl24.roadmap_screen_zoom_out_1021040(sp, a0, a1, a2, a3); break;
-      case 0x1021110:  ret = Cibyl24.roadmap_screen_zoom_in_1021110(sp, a0, a1, a2, a3); break;
-      case 0x10211e0:  ret = Cibyl24.roadmap_screen_decrease_horizon_10211e0(sp, a0, a1, a2, a3); break;
-      case 0x102122c:  ret = Cibyl24.roadmap_screen_increase_horizon_102122c(sp, a0, a1, a2, a3); break;
-      case 0x1021280:  ret = Cibyl24.roadmap_screen_set_orientation_fixed_1021280(sp, a0, a1, a2, a3); break;
-      case 0x10212b4:  ret = Cibyl24.roadmap_screen_rotate_10212b4(sp, a0, a1, a2, a3); break;
-      case 0x1021340:  ret = Cibyl24.roadmap_screen_add_focus_on_me_softkey_1021340(sp, a0, a1, a2, a3); break;
-      case 0x1021394:  ret = Cibyl24.roadmap_screen_hold_1021394(sp, a0, a1, a2, a3); break;
-      case 0x1021420:  ret = Cibyl24.roadmap_screen_double_click_1021420(sp, a0, a1, a2, a3); break;
-      case 0x102146c:  ret = Cibyl24.roadmap_screen_refresh_102146c(sp, a0, a1, a2, a3); break;
-      case 0x10216e0:  ret = Cibyl25.roadmap_screen_drag_start_10216e0(sp, a0, a1, a2, a3); break;
-      case 0x102172c:  ret = Cibyl25.roadmap_screen_toggle_orientation_mode_102172c(sp, a0, a1, a2, a3); break;
-      case 0x102178c:  ret = Cibyl25.focus_on_me_102178c(sp, a0, a1, a2, a3); break;
-      case 0x10217e4:  ret = Cibyl25.focus_on_location_10217e4(sp, a0, a1, a2, a3); break;
-      case 0x1021830:  ret = Cibyl25.show_me_on_map_1021830(sp, a0, a1, a2, a3); break;
-      case 0x1021900:  ret = Cibyl25.roadmap_screen_redraw_1021900(sp, a0, a1, a2, a3); break;
-      case 0x1021930:  ret = Cibyl25.XiconTimer_1021930(sp, a0, a1, a2, a3); break;
-      case 0x1021954:  ret = Cibyl25.roadmap_screen_set_view_1021954(sp, a0, a1, a2, a3); break;
-      case 0x1021a54:  ret = Cibyl25.roadmap_screen_restore_view_1021a54(sp, a0, a1, a2, a3); break;
-      case 0x1021a9c:  ret = Cibyl25.roadmap_screen_toggle_view_mode_1021a9c(sp, a0, a1, a2, a3); break;
-      case 0x1021b40:  ret = Cibyl25.on_device_event_1021b40(sp, a0, a1, a2, a3); break;
-      case 0x1021ba8:  ret = Cibyl25.roadmap_screen_draw_sky_1021ba8(sp, a0, a1, a2, a3); break;
-      case 0x1021c4c:  ret = Cibyl25.roadmap_screen_draw_points_1021c4c(sp, a0, a1, a2, a3); break;
-      case 0x1021f34:  ret = Cibyl25.roadmap_screen_flush_lines_1021f34(sp, a0, a1, a2, a3); break;
-      case 0x1022070:  ret = Cibyl25.roadmap_screen_draw_line_points_1022070(sp, a0, a1, a2, a3); break;
-      case 0x10223d4:  ret = Cibyl25.roadmap_screen_flush_points_10223d4(sp, a0, a1, a2, a3); break;
-      case 0x1022434:  ret = Cibyl25.roadmap_screen_flush_lines_and_points_1022434(sp, a0, a1, a2, a3); break;
-      case 0x102245c:  ret = Cibyl25.roadmap_screen_add_segment_point_102245c(sp, a0, a1, a2, a3); break;
-      case 0x10226c8:  ret = Cibyl25.roadmap_screen_draw_one_line_internal_10226c8(sp, a0, a1, a2, a3); break;
-      case 0x1022e0c:  ret = Cibyl26.roadmap_screen_draw_one_line_1022e0c(sp, a0, a1, a2, a3); break;
-      case 0x1022e88:  ret = Cibyl26.roadmap_screen_draw_square_1022e88(sp, a0, a1, a2, a3); break;
-      case 0x1024144:  ret = Cibyl27.roadmap_screen_repaint_square_1024144(sp, a0, a1, a2, a3); break;
-      case 0x10242f8:  ret = Cibyl27.roadmap_screen_repaint_now_10242f8(sp, a0, a1, a2, a3); break;
-      case 0x1025664:  ret = Cibyl28.roadmap_screen_touched_off_1025664(sp, a0, a1, a2, a3); break;
-      case 0x10256ac:  ret = Cibyl28.roadmap_screen_refresh_flow_control_10256ac(sp, a0, a1, a2, a3); break;
-      case 0x10256e4:  ret = Cibyl28.roadmap_screen_touched_10256e4(sp, a0, a1, a2, a3); break;
-      case 0x102575c:  ret = Cibyl28.roadmap_screen_short_click_102575c(sp, a0, a1, a2, a3); break;
-      case 0x102585c:  ret = Cibyl28.roadmap_screen_configure_102585c(sp, a0, a1, a2, a3); break;
-      case 0x1025978:  Cibyl28.roadmap_view_menu_1025978(); break;
-      case 0x1025980:  ret = Cibyl28.roadmap_view_hold_1025980(); break;
-      case 0x1025998:  ret = Cibyl28.roadmap_view_auto_zoom_restore_1025998(sp, a0, a1, a2, a3); break;
-      case 0x10259c4:  ret = Cibyl28.roadmap_view_reset_10259c4(sp, a0, a1, a2, a3); break;
-      case 0x10259f0:  ret = Cibyl28.roadmap_view_navigation_10259f0(sp, a0, a1, a2, a3); break;
-      case 0x1025a18:  ret = Cibyl28.roadmap_view_commute_1025a18(sp, a0, a1, a2, a3); break;
-      case 0x1025a40:  ret = Cibyl28.roadmap_view_auto_zoom_suspend_1025a40(sp, a0, a1, a2, a3); break;
-      case 0x1025aac:  ret = Cibyl28.roadmap_view_show_labels_1025aac(sp, a0, a1, a2, a3); break;
-      case 0x1025b20:  ret = Cibyl28.roadmap_view_get_scale_1025b20(sp, a0, a1, a2, a3); break;
-      case 0x1025c30:  ret = Cibyl28.roadmap_view_get_orientation_1025c30(sp, a0, a1, a2, a3); break;
-      case 0x1025ce8:  ret = Cibyl28.roadmap_view_refresh_1025ce8(sp, a0, a1, a2, a3); break;
-      case 0x1026230:  ret = Cibyl28.on_ok_softkey_1026230(sp, a0, a1, a2, a3); break;
-      case 0x1026250:  ret = Cibyl28.dest_checkbox_callback_facebook_1026250(sp, a0, a1, a2, a3); break;
-      case 0x102630c:  ret = Cibyl28.dest_checkbox_callback_twitter_102630c(sp, a0, a1, a2, a3); break;
-      case 0x10263c8:  ret = Cibyl28.twitter_pw_empty_10263c8(sp, a0, a1, a2, a3); break;
-      case 0x1026400:  ret = Cibyl28.twitter_un_empty_1026400(sp, a0, a1, a2, a3); break;
-      case 0x1026438:  ret = Cibyl28.roadmap_social_set_show_profile_1026438(sp, a0, a1, a2, a3); break;
-      case 0x10264f0:  ret = Cibyl28.roadmap_facebook_set_show_picture_10264f0(sp, a0, a1, a2, a3); break;
-      case 0x1026564:  ret = Cibyl28.roadmap_facebook_set_show_name_1026564(sp, a0, a1, a2, a3); break;
-      case 0x1026624:  ret = Cibyl28.roadmap_social_set_munching_1026624(sp, a0, a1, a2, a3); break;
-      case 0x1026664:  ret = Cibyl28.roadmap_facebook_disable_munching_1026664(sp, a0, a1, a2, a3); break;
-      case 0x102668c:  ret = Cibyl28.roadmap_twitter_disable_munching_102668c(sp, a0, a1, a2, a3); break;
-      case 0x10266b4:  ret = Cibyl28.roadmap_facebook_enable_munching_10266b4(sp, a0, a1, a2, a3); break;
-      case 0x10266dc:  ret = Cibyl28.roadmap_twitter_enable_munching_10266dc(sp, a0, a1, a2, a3); break;
-      case 0x1026704:  ret = Cibyl28.roadmap_social_set_destination_mode_1026704(sp, a0, a1, a2, a3); break;
-      case 0x102675c:  ret = Cibyl28.roadmap_facebook_set_destination_mode_102675c(sp, a0, a1, a2, a3); break;
-      case 0x1026784:  ret = Cibyl28.roadmap_twitter_set_destination_mode_1026784(sp, a0, a1, a2, a3); break;
-      case 0x10267ac:  ret = Cibyl28.roadmap_social_set_sending_10267ac(sp, a0, a1, a2, a3); break;
-      case 0x10267ec:  ret = Cibyl28.roadmap_facebook_disable_sending_10267ec(sp, a0, a1, a2, a3); break;
-      case 0x1026814:  ret = Cibyl28.roadmap_twitter_disable_sending_1026814(sp, a0, a1, a2, a3); break;
-      case 0x102683c:  ret = Cibyl28.roadmap_facebook_enable_sending_102683c(sp, a0, a1, a2, a3); break;
-      case 0x1026864:  ret = Cibyl28.roadmap_twitter_enable_sending_1026864(sp, a0, a1, a2, a3); break;
-      case 0x102688c:  ret = Cibyl28.roadmap_twitter_set_password_102688c(sp, a0, a1, a2, a3); break;
-      case 0x10268c0:  ret = Cibyl28.roadmap_twitter_set_username_10268c0(sp, a0, a1, a2, a3); break;
-      case 0x10268f0:  ret = Cibyl28.roadmap_twitter_set_logged_in_10268f0(sp, a0, a1, a2, a3); break;
-      case 0x102693c:  ret = Cibyl28.roadmap_social_get_show_profile_102693c(sp, a0, a1, a2, a3); break;
-      case 0x1026998:  ret = Cibyl28.roadmap_twitter_get_show_profile_1026998(sp, a0, a1, a2, a3); break;
-      case 0x10269bc:  ret = Cibyl29.roadmap_facebook_get_show_profile_10269bc(sp, a0, a1, a2, a3); break;
-      case 0x10269e0:  ret = Cibyl29.roadmap_facebook_get_show_picture_10269e0(sp, a0, a1, a2, a3); break;
-      case 0x1026a40:  ret = Cibyl29.roadmap_facebook_get_show_name_1026a40(sp, a0, a1, a2, a3); break;
-      case 0x1026aa0:  ret = Cibyl29.roadmap_social_send_permissions_1026aa0(sp, a0, a1, a2, a3); break;
-      case 0x1026b20:  ret = Cibyl29.roadmap_twitter_is_signup_enabled_1026b20(sp, a0, a1, a2, a3); break;
-      case 0x1026b54:  ret = Cibyl29.roadmap_twitter_is_show_munching_1026b54(sp, a0, a1, a2, a3); break;
-      case 0x1026b88:  ret = Cibyl29.roadmap_social_is_munching_enabled_1026b88(sp, a0, a1, a2, a3); break;
-      case 0x1026bb8:  ret = Cibyl29.roadmap_facebook_is_munching_enabled_1026bb8(sp, a0, a1, a2, a3); break;
-      case 0x1026bdc:  ret = Cibyl29.roadmap_twitter_is_munching_enabled_1026bdc(sp, a0, a1, a2, a3); break;
-      case 0x1026c00:  ret = Cibyl29.roadmap_social_destination_mode_1026c00(sp, a0, a1, a2, a3); break;
-      case 0x1026c5c:  ret = Cibyl29.roadmap_facebook_destination_mode_1026c5c(sp, a0, a1, a2, a3); break;
-      case 0x1026c80:  ret = Cibyl29.roadmap_twitter_destination_mode_1026c80(sp, a0, a1, a2, a3); break;
-      case 0x1026ca4:  ret = Cibyl29.roadmap_social_is_sending_enabled_1026ca4(sp, a0, a1, a2, a3); break;
-      case 0x1026cd4:  ret = Cibyl29.roadmap_facebook_is_sending_enabled_1026cd4(sp, a0, a1, a2, a3); break;
-      case 0x1026cf8:  ret = Cibyl29.roadmap_twitter_is_sending_enabled_1026cf8(sp, a0, a1, a2, a3); break;
-      case 0x1026d1c:  ret = Cibyl29.roadmap_twitter_get_password_1026d1c(sp, a0, a1, a2, a3); break;
-      case 0x1026d40:  ret = Cibyl29.roadmap_twitter_get_username_1026d40(sp, a0, a1, a2, a3); break;
-      case 0x1026d64:  ret = Cibyl29.roadmap_social_logged_in_1026d64(sp, a0, a1, a2, a3); break;
-      case 0x1026d94:  ret = Cibyl29.roadmap_facebook_logged_in_1026d94(sp, a0, a1, a2, a3); break;
-      case 0x1026db8:  ret = Cibyl29.roadmap_facebook_refresh_connection_1026db8(sp, a0, a1, a2, a3); break;
-      case 0x1026e88:  ret = Cibyl29.on_check_login_completed_1026e88(sp, a0, a1, a2, a3); break;
-      case 0x1026edc:  ret = Cibyl29.roadmap_twitter_logged_in_1026edc(sp, a0, a1, a2, a3); break;
-      case 0x1026f00:  ret = Cibyl29.on_dlg_close_1026f00(sp, a0, a1, a2, a3); break;
-      case 0x1027240:  ret = Cibyl29.roadmap_twitter_login_failed_1027240(sp, a0, a1, a2, a3); break;
-      case 0x1027348:  ret = Cibyl29.roadmap_facebook_disconnect_1027348(sp, a0, a1, a2, a3); break;
-      case 0x1027384:  ret = Cibyl29.facebook_disconnect_confirmed_cb_1027384(sp, a0, a1, a2, a3); break;
-      case 0x1027498:  ret = Cibyl29.roadmap_facebook_check_login_1027498(sp, a0, a1, a2, a3); break;
-      case 0x10275c0:  ret = Cibyl29.after_facebook_connect_10275c0(sp, a0, a1, a2, a3); break;
-      case 0x10275e8:  ret = Cibyl29.roadmap_social_login_cb_10275e8(sp, a0, a1, a2, a3); break;
-      case 0x1027628:  ret = Cibyl29.on_disconnect_completed_1027628(sp, a0, a1, a2, a3); break;
-      case 0x1027650:  ret = Cibyl29.roadmap_facebook_connect_1027650(sp, a0, a1, a2, a3); break;
-      case 0x1027728:  ret = Cibyl29.login_button_callback_facebook_1027728(sp, a0, a1, a2, a3); break;
-      case 0x1027768:  ret = Cibyl29.roadmap_social_initialize_1027768(sp, a0, a1, a2, a3); break;
-      case 0x1027a9c:  ret = Cibyl29.T_60_1027a9c(sp, a0, a1, a2, a3); break;
-      case 0x1027ae8:  ret = Cibyl29.create_dialog_1027ae8(sp, a0, a1, a2, a3); break;
-      case 0x1028aa4:  ret = Cibyl30.roadmap_facebook_setting_dialog_1028aa4(sp, a0, a1, a2, a3); break;
-      case 0x1028b9c:  ret = Cibyl30.roadmap_twitter_setting_dialog_1028b9c(sp, a0, a1, a2, a3); break;
-      case 0x1028cac:  ret = Cibyl30.twitter_network_error_1028cac(sp, a0, a1, a2, a3); break;
-      case 0x1028cfc:  ret = Cibyl30.roadmap_factory_find_action_1028cfc(sp, a0, a1, a2, a3); break;
-      case 0x1028d58:  ret = Cibyl30.roadmap_factory_keyboard_1028d58(sp, a0, a1, a2, a3); break;
-      case 0x1028de8:  ret = Cibyl30.roadmap_factory_usage_1028de8(sp, a0, a1, a2, a3); break;
-      case 0x1028ef0:  ret = Cibyl30.calloc_1028ef0(sp, a0, a1, a2, a3); break;
-      case 0x1028f38:  ret = Cibyl30.roadmap_factory_keymap_1028f38(sp, a0, a1, a2, a3); break;
-      case 0x1029124:  ret = Cibyl30.roadmap_factory_load_config_1029124(sp, a0, a1, a2, a3); break;
-      case 0x102931c:  ret = Cibyl30.roadmap_factory_user_config_102931c(sp, a0, a1, a2, a3); break;
-      case 0x10294d8:  ret = Cibyl30.roadmap_factory_10294d8(sp, a0, a1, a2, a3); break;
-      case 0x102974c:  ret = Cibyl30.roadmap_factory_load_menu_item_102974c(sp, a0, a1, a2, a3); break;
-      case 0x10299ec:  ret = Cibyl30.roadmap_factory_load_menu_file_10299ec(sp, a0, a1, a2, a3); break;
-      case 0x1029bcc:  ret = Cibyl30.roadmap_factory_load_menu_1029bcc(sp, a0, a1, a2, a3); break;
-      case 0x1029c90:  ret = Cibyl30.roadmap_navigate_register_segment_changed_1029c90( a0, a1); break;
-      case 0x1029d04:  ret = Cibyl31.roadmap_navigate_unregister_segment_changed_1029d04( a0, a1); break;
-      case 0x1029d78:  ret = Cibyl31.roadmap_navigate_end_route_1029d78(); break;
-      case 0x1029d84:  ret = Cibyl31.roadmap_navigate_resume_route_1029d84(); break;
-      case 0x1029da8:  ret = Cibyl31.roadmap_navigate_get_current_1029da8(sp, a0, a1, a2, a3); break;
-      case 0x1029e40:  ret = Cibyl31.roadmap_navigate_get_time_1029e40(); break;
-      case 0x1029e68:  ret = Cibyl31.roadmap_navigate_route_1029e68(sp, a0, a1, a2, a3); break;
-      case 0x1029f64:  ret = Cibyl31.roadmap_navigate_initialize_1029f64(sp, a0, a1, a2, a3); break;
-      case 0x102a054:  ret = Cibyl31.roadmap_navigate_check_alerts_102a054(sp, a0, a1, a2, a3); break;
-      case 0x102a088:  ret = Cibyl31.roadmap_navigate_is_intersection_102a088(sp, a0, a1, a2, a3); break;
-      case 0x102a1bc:  ret = Cibyl31.roadmap_navigate_trace_102a1bc(sp, a0, a1, a2, a3); break;
-      case 0x102a2b0:  ret = Cibyl31.roadmap_navigate_is_jammed_102a2b0(sp, a0, a1, a2, a3); break;
-      case 0x102a3cc:  ret = Cibyl31.roadmap_navigate_fuzzify_102a3cc(sp, a0, a1, a2, a3); break;
-      case 0x102a5d0:  ret = Cibyl31.roadmap_navigate_enable_102a5d0(sp, a0, a1, a2, a3); break;
-      case 0x102a608:  ret = Cibyl31.roadmap_navigate_disable_102a608(sp, a0, a1, a2, a3); break;
-      case 0x102a654:  ret = Cibyl31.roadmap_navigate_adjust_focus_102a654(sp, a0, a1, a2, a3); break;
-      case 0x102a6ec:  ret = Cibyl31.roadmap_navigate_get_neighbours_102a6ec(sp, a0, a1, a2, a3); break;
-      case 0x102ac0c:  ret = Cibyl31.roadmap_navigate_retrieve_line_102ac0c(sp, a0, a1, a2, a3); break;
-      case 0x102ac94:  ret = Cibyl31.T_126_102ac94(sp, a0, a1, a2, a3); break;
-      case 0x102b0c8:  ret = Cibyl31.T_127_102b0c8(sp, a0, a1, a2, a3); break;
-      case 0x102b1a4:  ret = Cibyl31.roadmap_navigate_locate_102b1a4(sp, a0, a1, a2, a3); break;
-      case 0x102bcf0:  ret = Cibyl32.roadmap_fuzzy_set_cycle_params_102bcf0( a0, a1); break;
-      case 0x102bd04:  ret = Cibyl32.roadmap_fuzzy_max_distance_102bd04(); break;
-      case 0x102bd14:  ret = Cibyl32.roadmap_fuzzy_direction_102bd14( a0, a1, a2); break;
-      case 0x102bda0:  ret = Cibyl32.roadmap_fuzzy_distance_102bda0( a0, a1); break;
-      case 0x102bdf0:  ret = Cibyl32.roadmap_fuzzy_and_102bdf0( a0, a1); break;
-      case 0x102be2c:  ret = Cibyl32.roadmap_fuzzy_not_102be2c( a0); break;
-      case 0x102be38:  ret = Cibyl32.roadmap_fuzzy_false_102be38(); break;
-      case 0x102be40:  ret = Cibyl32.roadmap_fuzzy_is_acceptable_102be40( a0); break;
-      case 0x102be58:  ret = Cibyl32.roadmap_fuzzy_is_good_102be58( a0); break;
-      case 0x102be64:  ret = Cibyl32.roadmap_fuzzy_is_certain_102be64( a0); break;
-      case 0x102be70:  ret = Cibyl32.roadmap_fuzzy_good_102be70(); break;
-      case 0x102be78:  ret = Cibyl32.roadmap_fuzzy_acceptable_102be78(); break;
-      case 0x102be88:  ret = Cibyl32.roadmap_fuzzy_initialize_102be88(sp, a0, a1, a2, a3); break;
-      case 0x102bee0:  ret = Cibyl32.roadmap_fuzzy_connected_102bee0(sp, a0, a1, a2, a3); break;
-      case 0x102c094:  ret = Cibyl32.roadmap_fuzzy_reset_cycle_102c094(sp, a0, a1, a2, a3); break;
-      case 0x102c0d0:  Cibyl32.roadmap_start_export_data_102c0d0(); break;
-      case 0x102c0d8:  Cibyl32.roadmap_start_export_reset_102c0d8(); break;
-      case 0x102c0e0:  Cibyl32.roadmap_start_download_map_102c0e0(); break;
-      case 0x102c0e8:  ret = Cibyl32.on_contextmenu_closed_102c0e8(sp, a0, a1, a2, a3); break;
-      case 0x102c11c:  Cibyl32.roadmap_help_menu_102c11c(); break;
-      case 0x102c124:  Cibyl32.start_settings_quick_menu_102c124(); break;
-      case 0x102c13c:  ret = Cibyl32.roadmap_start_login_cb_102c13c(sp, a0, a1, a2, a3); break;
-      case 0x102c180:  ret = Cibyl32.roadmap_start_subscribe_102c180( a0); break;
-      case 0x102c198:  Cibyl32.roadmap_start_my_points_menu_102c198(); break;
-      case 0x102c1a0:  ret = Cibyl32.roadmap_confirmed_exit_callback_102c1a0(sp, a0, a1, a2, a3); break;
-      case 0x102c1c8:  ret = Cibyl32.viewMyPoints_102c1c8(sp, a0, a1, a2, a3); break;
-      case 0x102c218:  ret = Cibyl32.roadmap_start_set_timeout_102c218(sp, a0, a1, a2, a3); break;
-      case 0x102c23c:  ret = Cibyl32.roadmap_start_quick_menu_102c23c(sp, a0, a1, a2, a3); break;
-      case 0x102c328:  ret = Cibyl32.roadmap_start_sync_data_102c328(sp, a0, a1, a2, a3); break;
-      case 0x102c364:  ret = Cibyl32.roadmap_confirmed_exit_102c364(sp, a0, a1, a2, a3); break;
-      case 0x102c3a0:  ret = Cibyl32.roadmap_confirmed_start_sync_callback_102c3a0(sp, a0, a1, a2, a3); break;
-      case 0x102c3d0:  ret = Cibyl32.roadmap_start_detect_receiver_102c3d0(sp, a0, a1, a2, a3); break;
-      case 0x102c3f0:  ret = Cibyl32.roadmap_start_version_102c3f0(sp, a0, a1, a2, a3); break;
-      case 0x102c458:  ret = Cibyl32.roadmap_start_about_exit_102c458(sp, a0, a1, a2, a3); break;
-      case 0x102c720:  ret = Cibyl32.roadmap_start_find_action_102c720(sp, a0, a1, a2, a3); break;
-      case 0x102c780:  ret = Cibyl32.roadmap_start_get_menu_item_102c780(sp, a0, a1, a2, a3); break;
-      case 0x102c8e8:  ret = Cibyl32.get_menu_item_names_102c8e8(sp, a0, a1, a2, a3); break;
-      case 0x102ca78:  ret = Cibyl32.about_callbak_102ca78(sp, a0, a1, a2, a3); break;
-      case 0x102cac4:  ret = Cibyl32.network_status_callbak_102cac4(sp, a0, a1, a2, a3); break;
-      case 0x102caec:  ret = Cibyl32.roadmap_start_delete_waypoint_102caec(sp, a0, a1, a2, a3); break;
-      case 0x102cb0c:  ret = Cibyl32.roadmap_start_set_waypoint_102cb0c(sp, a0, a1, a2, a3); break;
-      case 0x102cb48:  ret = Cibyl32.roadmap_start_set_departure_102cb48(sp, a0, a1, a2, a3); break;
-      case 0x102cb7c:  ret = Cibyl32.roadmap_start_navigate_102cb7c(sp, a0, a1, a2, a3); break;
-      case 0x102cb9c:  ret = Cibyl32.save_destination_to_history_102cb9c(sp, a0, a1, a2, a3); break;
-      case 0x102ccf0:  ret = Cibyl32.roadmap_start_set_destination_102ccf0(sp, a0, a1, a2, a3); break;
-      case 0x102cd34:  ret = Cibyl32.roadmap_start_trip_reverse_102cd34(sp, a0, a1, a2, a3); break;
-      case 0x102cd54:  ret = Cibyl32.roadmap_start_trip_resume_102cd54(sp, a0, a1, a2, a3); break;
-      case 0x102cd74:  ret = Cibyl32.roadmap_start_trip_102cd74(sp, a0, a1, a2, a3); break;
-      case 0x102cd94:  ret = Cibyl32.roadmap_start_save_trip_as_102cd94(sp, a0, a1, a2, a3); break;
-      case 0x102cdb4:  ret = Cibyl32.roadmap_start_save_trip_102cdb4(sp, a0, a1, a2, a3); break;
-      case 0x102cddc:  ret = Cibyl32.roadmap_start_open_trip_102cddc(sp, a0, a1, a2, a3); break;
-      case 0x102ce00:  ret = Cibyl32.roadmap_start_create_trip_102ce00(sp, a0, a1, a2, a3); break;
-      case 0x102ce20:  ret = Cibyl32.roadmap_start_toggle_download_102ce20(sp, a0, a1, a2, a3); break;
-      case 0x102ceb0:  ret = Cibyl32.roadmap_start_add_action_102ceb0(sp, a0, a1, a2, a3); break;
-      case 0x102cf7c:  ret = Cibyl32.roadmap_start_no_download_102cf7c(sp, a0, a1, a2, a3); break;
-      case 0x102cfd0:  ret = Cibyl32.roadmap_start_show_location_102cfd0(sp, a0, a1, a2, a3); break;
-      case 0x102cffc:  ret = Cibyl32.roadmap_start_show_destination_102cffc(sp, a0, a1, a2, a3); break;
-      case 0x102d028:  ret = Cibyl32.roadmap_start_show_gps_102d028(sp, a0, a1, a2, a3); break;
-      case 0x102d064:  ret = Cibyl32.roadmap_start_periodic_102d064(sp, a0, a1, a2, a3); break;
-      case 0x102d0a8:  ret = Cibyl33.roadmap_start_hold_map_102d0a8(sp, a0, a1, a2, a3); break;
-      case 0x102d0d0:  ret = Cibyl33.roadmap_start_counter_rotate_102d0d0(sp, a0, a1, a2, a3); break;
-      case 0x102d0f0:  ret = Cibyl33.roadmap_start_rotate_102d0f0(sp, a0, a1, a2, a3); break;
-      case 0x102d110:  ret = Cibyl33.roadmap_start_purge_102d110(sp, a0, a1, a2, a3); break;
-      case 0x102d130:  ret = Cibyl33.roadmap_start_console_102d130(sp, a0, a1, a2, a3); break;
-      case 0x102d19c:  ret = Cibyl33.roadmap_start_reset_debug_mode_102d19c(sp, a0, a1, a2, a3); break;
-      case 0x102d25c:  ret = Cibyl33.roadmap_start_hide_menu_102d25c(sp, a0, a1, a2, a3); break;
-      case 0x102d27c:  ret = Cibyl33.bottom_bar_status_102d27c(sp, a0, a1, a2, a3); break;
-      case 0x102d2b8:  ret = Cibyl33.roadmap_start_popup_menu_102d2b8(sp, a0, a1, a2, a3); break;
-      case 0x102d3d8:  ret = Cibyl33.start_side_menu_102d3d8(sp, a0, a1, a2, a3); break;
-      case 0x102d418:  ret = Cibyl33.start_rotate_side_menu_102d418(sp, a0, a1, a2, a3); break;
-      case 0x102d450:  ret = Cibyl33.start_zoom_side_menu_102d450(sp, a0, a1, a2, a3); break;
-      case 0x102d634:  ret = Cibyl33.roadmap_start_set_closed_properly_102d634(sp, a0, a1, a2, a3); break;
-      case 0x102d664:  ret = Cibyl33.roadmap_start_exit_102d664(sp, a0, a1, a2, a3); break;
-      case 0x102d74c:  ret = Cibyl33.mark_location_callback_102d74c(sp, a0, a1, a2, a3); break;
-      case 0x102d7fc:  ret = Cibyl33.on_closed_alerts_quick_menu_102d7fc(sp, a0, a1, a2, a3); break;
-      case 0x102d834:  ret = Cibyl33.roadmap_start_continue_102d834(sp, a0, a1, a2, a3); break;
-      case 0x102da90:  ret = Cibyl33.roadmap_start_remove_gps_102da90(sp, a0, a1, a2, a3); break;
-      case 0x102dab0:  ret = Cibyl33.roadmap_start_add_gps_102dab0(sp, a0, a1, a2, a3); break;
-      case 0x102dad4:  ret = Cibyl33.roadmap_start_after_refresh_102dad4(sp, a0, a1, a2, a3); break;
-      case 0x102db54:  ret = Cibyl33.roadmap_gps_update_102db54(sp, a0, a1, a2, a3); break;
-      case 0x102dc10:  ret = Cibyl33.roadmap_start_usage_102dc10(sp, a0, a1, a2, a3); break;
-      case 0x102dc58:  ret = Cibyl33.roadmap_start_after_intro_screen_102dc58(sp, a0, a1, a2, a3); break;
-      case 0x102dc98:  ret = Cibyl33.roadmap_start_get_first_time_use_102dc98(sp, a0, a1, a2, a3); break;
-      case 0x102dcbc:  ret = Cibyl33.roadmap_start_102dcbc(sp, a0, a1, a2, a3); break;
-      case 0x102e3a4:  ret = Cibyl33.roadmap_start_screen_refresh_102e3a4(sp, a0, a1, a2, a3); break;
-      case 0x102e4cc:  ret = Cibyl33.start_more_menu_102e4cc(sp, a0, a1, a2, a3); break;
-      case 0x102e564:  ret = Cibyl33.start_map_updates_menu_102e564(sp, a0, a1, a2, a3); break;
-      case 0x102e5ac:  ret = Cibyl33.start_alerts_menu_102e5ac(sp, a0, a1, a2, a3); break;
-      case 0x102e890:  ret = Cibyl34.on_key_pressed_102e890(sp, a0, a1, a2, a3); break;
-      case 0x102ee90:  ret = Cibyl34.mark_location_102ee90(sp, a0, a1, a2, a3); break;
-      case 0x102f120:  ret = Cibyl34.gps_network_status_102f120(sp, a0, a1, a2, a3); break;
-      case 0x102f864:  ret = Cibyl34.obj_is_active_102f864(sp, a0, a1, a2, a3); break;
-      case 0x102f8c8:  ret = Cibyl34.roadmap_screen_obj_repeat_102f8c8(sp, a0, a1, a2, a3); break;
-      case 0x102f90c:  ret = Cibyl34.roadmap_screen_obj_global_offset_102f90c( a0, a1, a2, a3); break;
-      case 0x102fa24:  ret = Cibyl34.roadmap_screen_obj_decode_arg_102fa24(sp, a0, a1, a2, a3); break;
-      case 0x102fa78:  ret = Cibyl34.roadmap_object_string_102fa78(sp, a0, a1, a2, a3); break;
-      case 0x102fae8:  ret = Cibyl34.roadmap_screen_obj_load_102fae8(sp, a0, a1, a2, a3); break;
-      case 0x10302ac:  ret = Cibyl35.roadmap_screen_obj_reload_10302ac(sp, a0, a1, a2, a3); break;
-      case 0x10303bc:  ret = Cibyl35.roadmap_screen_obj_draw_10303bc(sp, a0, a1, a2, a3); break;
-      case 0x103061c:  ret = Cibyl35.roadmap_screen_obj_initialize_103061c(sp, a0, a1, a2, a3); break;
-      case 0x1030698:  ret = Cibyl35.roadmap_screen_obj_long_click_1030698(sp, a0, a1, a2, a3); break;
-      case 0x10307e0:  ret = Cibyl35.roadmap_screen_obj_short_click_10307e0(sp, a0, a1, a2, a3); break;
-      case 0x103088c:  ret = Cibyl35.roadmap_screen_obj_released_103088c(sp, a0, a1, a2, a3); break;
-      case 0x10308e0:  ret = Cibyl35.roadmap_screen_obj_pressed_10308e0(sp, a0, a1, a2, a3); break;
-      case 0x1030bf8:  Cibyl35.roadmap_gps_no_link_control_1030bf8(); break;
-      case 0x1030c00:  Cibyl35.roadmap_gps_no_periodic_control_1030c00(); break;
-      case 0x1030c08:  ret = Cibyl35.roadmap_gps_reception_state_1030c08(); break;
-      case 0x1030c18:  ret = Cibyl35.roadmap_gps_set_fix_1030c18(sp, a0, a1, a2, a3); break;
-      case 0x1030ca4:  ret = Cibyl35.roadmap_gps_get_fix_1030ca4(); break;
-      case 0x1030cc8:  ret = Cibyl35.roadmap_gps_call_loggers_1030cc8(sp, a0, a1, a2, a3); break;
-      case 0x1030d28:  ret = Cibyl35.roadmap_gps_get_received_time_1030d28(); break;
-      case 0x1030d38:  ret = Cibyl35.roadmap_gps_register_listener_1030d38( a0, a1, a2); break;
-      case 0x1030d84:  ret = Cibyl35.roadmap_gps_register_fix_listener_1030d84( a0, a1, a2); break;
-      case 0x1030e1c:  ret = Cibyl35.roadmap_gps_register_logger_1030e1c( a0, a1, a2); break;
-      case 0x1030e70:  ret = Cibyl35.roadmap_gps_register_link_control_1030e70( a0, a1); break;
-      case 0x1030e84:  ret = Cibyl35.roadmap_gps_register_periodic_control_1030e84( a0, a1); break;
-      case 0x1030e98:  ret = Cibyl35.roadmap_gps_have_reception_1030e98(); break;
-      case 0x1030eb0:  ret = Cibyl35.roadmap_gps_csv_tracker_get_enable_1030eb0(); break;
-      case 0x1030ef8:  ret = Cibyl35.roadmap_gps_satelite_count_1030ef8(); break;
-      case 0x1030f08:  ret = Cibyl35.roadmap_gps_detect_receiver_1030f08(sp, a0, a1, a2, a3); break;
-      case 0x1030f68:  ret = Cibyl35.roadmap_gps_raw_1030f68(sp, a0, a1, a2, a3); break;
-      case 0x1030fd8:  ret = Cibyl35.roadmap_gps_speed_accuracy_1030fd8(sp, a0, a1, a2, a3); break;
-      case 0x1030ffc:  ret = Cibyl35.roadmap_gps_vtg_1030ffc(sp, a0, a1, a2, a3); break;
-      case 0x1031084:  ret = Cibyl35.roadmap_gps_active_1031084(sp, a0, a1, a2, a3); break;
-      case 0x10310e0:  ret = Cibyl35.roadmap_gps_csv_tracker_initialize_10310e0(sp, a0, a1, a2, a3); break;
-      case 0x1031208:  ret = Cibyl35.roadmap_gps_update_status_1031208(sp, a0, a1, a2, a3); break;
-      case 0x1031268:  ret = Cibyl35.roadmap_gps_csv_tracker_shutdown_1031268(sp, a0, a1, a2, a3); break;
-      case 0x1031298:  ret = Cibyl35.roadmap_gps_csv_tracker_set_enable_1031298(sp, a0, a1, a2, a3); break;
-      case 0x10312ec:  ret = Cibyl35.roadmap_gps_shutdown_10312ec(sp, a0, a1, a2, a3); break;
-      case 0x1031350:  ret = Cibyl35.roadmap_gps_set_location_focus_1031350(sp, a0, a1, a2, a3); break;
-      case 0x10313a8:  ret = Cibyl35.roadmap_gps_update_reception_10313a8(sp, a0, a1, a2, a3); break;
-      case 0x1031458:  ret = Cibyl35.roadmap_gps_open_1031458(sp, a0, a1, a2, a3); break;
-      case 0x1031754:  ret = Cibyl36.roadmap_gps_input_1031754(sp, a0, a1, a2, a3); break;
-      case 0x1031884:  ret = Cibyl36.roadmap_gps_keep_alive_1031884(sp, a0, a1, a2, a3); break;
-      case 0x1031980:  ret = Cibyl36.roadmap_gps_gsv_1031980(sp, a0, a1, a2, a3); break;
-      case 0x1031b5c:  ret = Cibyl36.roadmap_gps_gsa_1031b5c(sp, a0, a1, a2, a3); break;
-      case 0x1031c6c:  ret = Cibyl36.roadmap_gps_pgrmm_1031c6c(sp, a0, a1, a2, a3); break;
-      case 0x1031cd4:  ret = Cibyl36.roadmap_gps_pgrme_1031cd4(sp, a0, a1, a2, a3); break;
-      case 0x1031cfc:  ret = Cibyl36.roadmap_gps_unregister_fix_listener_1031cfc(sp, a0, a1, a2, a3); break;
-      case 0x1031da0:  ret = Cibyl36.roadmap_gps_unregister_listener_1031da0(sp, a0, a1, a2, a3); break;
-      case 0x1031e44:  ret = Cibyl36.roadmap_gps_coarse_fix_1031e44(sp, a0, a1, a2, a3); break;
-      case 0x1031f38:  ret = Cibyl36.roadmap_gps_show_coordinats_1031f38(sp, a0, a1, a2, a3); break;
-      case 0x1031f64:  ret = Cibyl36.roadmap_gps_initialize_1031f64(sp, a0, a1, a2, a3); break;
-      case 0x10321bc:  ret = Cibyl36.roadmap_gps_warning_10321bc(sp, a0, a1, a2, a3); break;
-      case 0x1032240:  ret = Cibyl36.roadmap_gps_warning_init_timeout_1032240(sp, a0, a1, a2, a3); break;
-      case 0x1032268:  ret = Cibyl36.roadmap_gps_accept_fix_1032268(sp, a0, a1, a2, a3); break;
-      case 0x10322b4:  ret = Cibyl36.roadmap_gps_set_show_coordinates_10322b4(sp, a0, a1, a2, a3); break;
-      case 0x1032304:  ret = Cibyl36.roadmap_gps_reset_show_coordinates_1032304(sp, a0, a1, a2, a3); break;
-      case 0x103236c:  ret = Cibyl36.roadmap_gps_process_position_103236c(sp, a0, a1, a2, a3); break;
-      case 0x1032720:  ret = Cibyl36.roadmap_gps_gll_1032720(sp, a0, a1, a2, a3); break;
-      case 0x1032774:  ret = Cibyl36.roadmap_gps_gga_1032774(sp, a0, a1, a2, a3); break;
-      case 0x103286c:  ret = Cibyl36.roadmap_gps_rmc_103286c(sp, a0, a1, a2, a3); break;
-      case 0x1032908:  ret = Cibyl36.roadmap_gps_navigation_1032908(sp, a0, a1, a2, a3); break;
-      case 0x1032a24:  ret = Cibyl37.roadmap_alert_get_location_info_1032a24(); break;
-      case 0x1032a44:  ret = Cibyl37.roadmap_alert_is_square_dependent_1032a44(); break;
-      case 0x1032aa0:  ret = Cibyl37.roadmap_alert_is_cancelable_1032aa0(); break;
-      case 0x1032aa8:  ret = Cibyl37.roadmap_alert_check_same_street_1032aa8(); break;
-      case 0x1032ab0:  ret = Cibyl37.roadmap_alert_handle_alert_1032ab0(); break;
-      case 0x1032ab8:  ret = Cibyl37.roadmap_alert_count_1032ab8(); break;
-      case 0x1032ad8:  ret = Cibyl37.roadmap_alert_get_position_1032ad8( a0, a1, a2, a3); break;
-      case 0x1032b0c:  ret = Cibyl37.roadmap_alert_get_speed_1032b0c( a0); break;
-      case 0x1032b54:  ret = Cibyl37.roadmap_alert_get_id_1032b54( a0); break;
-      case 0x1032b78:  ret = Cibyl37.roadmap_alert_alertable_1032b78( a0); break;
-      case 0x1032bc4:  ret = Cibyl37.roadmap_alert_get_string_1032bc4( a0, a1, a2, a3); break;
-      case 0x1032c54:  ret = Cibyl37.roadmap_alert_get_map_icon_1032c54( a0, a1, a2, a3); break;
-      case 0x1032ce4:  ret = Cibyl37.roadmap_alert_get_priority_1032ce4(); break;
-      case 0x1032cec:  ret = Cibyl37.roadmap_alert_get_alert_icon_1032cec( a0, a1, a2, a3); break;
-      case 0x1032d7c:  ret = Cibyl37.roadmap_alert_get_warning_icon_1032d7c( a0, a1, a2, a3); break;
-      case 0x1032e0c:  ret = Cibyl37.roadmap_alert_distance_check_1032e0c(sp, a0, a1, a2, a3); break;
-      case 0x1032e88:  ret = Cibyl37.roadmap_alert_cancel_1032e88(sp, a0, a1, a2, a3); break;
-      case 0x1032f00:  ret = Cibyl37.roadmap_alert_activate_1032f00(sp, a0, a1, a2, a3); break;
-      case 0x1032f5c:  ret = Cibyl37.roadmap_alert_unmap_1032f5c(sp, a0, a1, a2, a3); break;
-      case 0x1032fc8:  ret = Cibyl37.roadmap_alert_map_1032fc8(sp, a0, a1, a2, a3); break;
-      case 0x1033084:  ret = Cibyl37.roadmap_alert_get_alert_sound_1033084(sp, a0, a1, a2, a3); break;
-      case 0x103313c:  ret = Cibyl37.roadmap_alert_get_distance_103313c(sp, a0, a1, a2, a3); break;
-      case 0x1033160:  ret = Cibyl37.roadmap_alerter_register_1033160( a0, a1); break;
-      case 0x1033198:  ret = Cibyl37.hide_alert_dialog_1033198(sp, a0, a1, a2, a3); break;
-      case 0x10331e4:  ret = Cibyl37.hide_10331e4(sp, a0, a1, a2, a3); break;
-      case 0x1033204:  ret = Cibyl37.hide_alert_timeout_1033204(sp, a0, a1, a2, a3); break;
-      case 0x1033314:  ret = Cibyl37.update_alert_1033314(sp, a0, a1, a2, a3); break;
-      case 0x10334d8:  ret = Cibyl37.show_alert_dialog_10334d8(sp, a0, a1, a2, a3); break;
-      case 0x10337f8:  ret = Cibyl37.report_irrelevant_10337f8(sp, a0, a1, a2, a3); break;
-      case 0x1033914:  ret = Cibyl37.delete_callback_1033914(sp, a0, a1, a2, a3); break;
-      case 0x10339b0:  ret = Cibyl37.get_street_from_line_10339b0(sp, a0, a1, a2, a3); break;
-      case 0x1033a1c:  ret = Cibyl37.get_alert_location_info_1033a1c(sp, a0, a1, a2, a3); break;
-      case 0x1033bcc:  ret = Cibyl37.alert_is_on_route_1033bcc(sp, a0, a1, a2, a3); break;
-      case 0x1033cdc:  ret = Cibyl38.is_alert_in_range_provider_1033cdc(sp, a0, a1, a2, a3); break;
-      case 0x1033fcc:  ret = Cibyl38.is_alert_in_range_1033fcc(sp, a0, a1, a2, a3); break;
-      case 0x1034314:  ret = Cibyl38.roadmap_alerter_initialize_1034314(sp, a0, a1, a2, a3); break;
-      case 0x1034410:  ret = Cibyl38.config_audio_alerts_enabled_1034410(sp, a0, a1, a2, a3); break;
-      case 0x103443c:  ret = Cibyl38.roadmap_alerter_audio_103443c(sp, a0, a1, a2, a3); break;
-      case 0x103449c:  ret = Cibyl38.roadmap_alerter_display_103449c(sp, a0, a1, a2, a3); break;
-      case 0x10345d8:  ret = Cibyl38.config_alerts_enabled_10345d8(sp, a0, a1, a2, a3); break;
-      case 0x1034604:  ret = Cibyl38.roadmap_alerter_check_1034604(sp, a0, a1, a2, a3); break;
-      case 0x103467c:  ret = Cibyl38.roadmap_mood_get_name_103467c(sp, a0, a1, a2, a3); break;
-      case 0x1034720:  ret = Cibyl38.roadmap_mood_from_string_1034720(sp, a0, a1, a2, a3); break;
-      case 0x1034a6c:  ret = Cibyl38.roadmap_mood_actual_state_1034a6c(sp, a0, a1, a2, a3); break;
-      case 0x1034ab4:  ret = Cibyl38.roadmap_mood_state_1034ab4(sp, a0, a1, a2, a3); break;
-      case 0x1034ae8:  ret = Cibyl38.roadmap_mood_set_1034ae8(sp, a0, a1, a2, a3); break;
-      case 0x1034b58:  ret = Cibyl38.roadmap_mood_call_back_1034b58(sp, a0, a1, a2, a3); break;
-      case 0x1034ba8:  ret = Cibyl38.roadmap_exclusive_mood_call_back_1034ba8(sp, a0, a1, a2, a3); break;
-      case 0x1034c48:  ret = Cibyl38.roadmap_mood_set_exclusive_moods_1034c48(sp, a0, a1, a2, a3); break;
-      case 0x1034cf4:  ret = Cibyl38.roadmap_mood_init_1034cf4(sp, a0, a1, a2, a3); break;
-      case 0x1034d94:  ret = Cibyl38.roadmap_mood_get_1034d94(sp, a0, a1, a2, a3); break;
-      case 0x1034dcc:  ret = Cibyl38.roadmap_mood_get_number_of_newbie_miles_1034dcc(sp, a0, a1, a2, a3); break;
-      case 0x1034e48:  ret = Cibyl38.roadmap_mood_dialog_1034e48(sp, a0, a1, a2, a3); break;
-      case 0x103540c:  ret = Cibyl39.roadmap_mood_103540c(sp, a0, a1, a2, a3); break;
-      case 0x103542c:  ret = Cibyl39.roadmap_mood_to_string_103542c(sp, a0, a1, a2, a3); break;
-      case 0x103560c:  ret = Cibyl39.roadmap_car_dialog_103560c(sp, a0, a1, a2, a3); break;
-      case 0x1035750:  ret = Cibyl39.roadmap_car_1035750(sp, a0, a1, a2, a3); break;
-      case 0x1035770:  ret = Cibyl39.roadmap_car_call_back_1035770(sp, a0, a1, a2, a3); break;
-      case 0x103583c:  ret = Cibyl39.roadmap_nmea_pgrmz_103583c(); break;
-      case 0x1035844:  ret = Cibyl39.roadmap_nmea_null_decoder_1035844(); break;
-      case 0x103584c:  ret = Cibyl39.hex2bin_103584c(sp, a0, a1, a2, a3); break;
-      case 0x10358cc:  ret = Cibyl39.roadmap_nmea_subscribe_10358cc(sp, a0, a1, a2, a3); break;
-      case 0x1035a10:  ret = Cibyl39.roadmap_nmea_pxrmcfg_1035a10(sp, a0, a1, a2, a3); break;
-      case 0x1035a8c:  ret = Cibyl39.roadmap_nmea_pxrmsub_1035a8c(sp, a0, a1, a2, a3); break;
-      case 0x1035b24:  ret = Cibyl39.roadmap_nmea_pxrmdel_1035b24(sp, a0, a1, a2, a3); break;
-      case 0x1035b64:  ret = Cibyl39.roadmap_nmea_pxrmadd_1035b64(sp, a0, a1, a2, a3); break;
-      case 0x1035be0:  ret = Cibyl39.roadmap_nmea_decode_numeric_1035be0(sp, a0, a1, a2, a3); break;
-      case 0x1035c5c:  ret = Cibyl39.roadmap_nmea_decode_coordinate_1035c5c(sp, a0, a1, a2, a3); break;
-      case 0x1035dbc:  ret = Cibyl39.roadmap_nmea_gll_1035dbc(sp, a0, a1, a2, a3); break;
-      case 0x1035eac:  ret = Cibyl39.roadmap_nmea_pxrmmov_1035eac(sp, a0, a1, a2, a3); break;
-      case 0x1035f50:  ret = Cibyl39.roadmap_nmea_vtg_1035f50(sp, a0, a1, a2, a3); break;
-      case 0x1035fe0:  ret = Cibyl39.roadmap_nmea_gsv_1035fe0(sp, a0, a1, a2, a3); break;
-      case 0x10361c8:  ret = Cibyl39.roadmap_nmea_gsa_10361c8(sp, a0, a1, a2, a3); break;
-      case 0x1036304:  ret = Cibyl39.roadmap_nmea_pgrmm_1036304(sp, a0, a1, a2, a3); break;
-      case 0x103634c:  ret = Cibyl39.roadmap_nmea_decode_unit_103634c(sp, a0, a1, a2, a3); break;
-      case 0x10363c0:  ret = Cibyl39.roadmap_nmea_pgrme_10363c0(sp, a0, a1, a2, a3); break;
-      case 0x1036480:  ret = Cibyl39.roadmap_nmea_decode_time_1036480(sp, a0, a1, a2, a3); break;
-      case 0x103666c:  ret = Cibyl40.roadmap_nmea_gga_103666c(sp, a0, a1, a2, a3); break;
-      case 0x10367d0:  ret = Cibyl40.roadmap_nmea_rmc_10367d0(sp, a0, a1, a2, a3); break;
-      case 0x10368c8:  ret = Cibyl40.roadmap_nmea_call_10368c8(sp, a0, a1, a2, a3); break;
-      case 0x10369c8:  ret = Cibyl40.roadmap_nmea_decode_10369c8(sp, a0, a1, a2, a3); break;
-      case 0x1036c4c:  ret = Cibyl40.roadmap_nmea_create_1036c4c(sp, a0, a1, a2, a3); break;
-      case 0x1036d04:  ret = Cibyl40.roadmap_gpsj2me_subscribe_to_navigation_1036d04( a0); break;
-      case 0x1036d10:  ret = Cibyl40.roadmap_gpsj2me_pos2_1036d10(sp, a0, a1, a2, a3); break;
-      case 0x1036d68:  ret = Cibyl40.roadmap_gpsj2me_pos1_1036d68( a0, a1); break;
-      case 0x1036d7c:  ret = Cibyl40.roadmap_gpsj2me_decode_1036d7c(sp, a0, a1, a2, a3); break;
-      case 0x1036e7c:  ret = Cibyl40.roadmap_input_shift_to_next_line_1036e7c(sp, a0, a1, a2, a3); break;
-      case 0x1036f04:  ret = Cibyl40.roadmap_input_1036f04(sp, a0, a1, a2, a3); break;
-      case 0x10371bc:  ret = Cibyl40.roadmap_io_same_10371bc( a0, a1, a2); break;
-      case 0x1037238:  ret = Cibyl40.roadmap_io_close_1037238(sp, a0, a1, a2, a3); break;
-      case 0x10372d4:  ret = Cibyl40.roadmap_io_write_10372d4(sp, a0, a1, a2, a3); break;
-      case 0x1037370:  ret = Cibyl40.roadmap_io_read_1037370(sp, a0, a1, a2, a3); break;
-      case 0x103742c:  ret = Cibyl40.roadmap_geocode_address_103742c(sp, a0, a1, a2, a3); break;
-      case 0x103772c:  ret = Cibyl40.roadmap_history_latest_103772c(sp, a0); break;
-      case 0x1037788:  ret = Cibyl40.roadmap_history_before_1037788(sp, a0, a1); break;
-      case 0x1037838:  ret = Cibyl40.roadmap_history_save_entries_1037838(sp, a0, a1, a2, a3); break;
-      case 0x103788c:  ret = Cibyl40.roadmap_history_save_103788c(sp, a0, a1, a2, a3); break;
-      case 0x1037918:  ret = Cibyl41.roadmap_history_declare_1037918(sp, a0, a1, a2, a3); break;
-      case 0x10379b4:  ret = Cibyl41.roadmap_history_remove_entry_10379b4(sp, a0, a1, a2, a3); break;
-      case 0x1037a90:  ret = Cibyl41.roadmap_history_delete_entry_1037a90(sp, a0, a1, a2, a3); break;
-      case 0x1037ab0:  ret = Cibyl41.roadmap_history_purge_1037ab0(sp, a0, a1, a2, a3); break;
-      case 0x1037b38:  ret = Cibyl41.roadmap_history_get_from_entry_1037b38(sp, a0, a1, a2, a3); break;
-      case 0x1037c10:  ret = Cibyl41.roadmap_history_get_1037c10(sp, a0, a1, a2, a3); break;
-      case 0x1037c94:  ret = Cibyl41.remove_commas_1037c94(sp, a0, a1, a2, a3); break;
-      case 0x1037cd8:  ret = Cibyl41.roadmap_history_update_1037cd8(sp, a0, a1, a2, a3); break;
-      case 0x1037e2c:  ret = Cibyl41.roadmap_history_add_entry_1037e2c(sp, a0, a1, a2, a3); break;
-      case 0x103822c:  ret = Cibyl41.roadmap_history_add_103822c(sp, a0, a1, a2, a3); break;
-      case 0x1038368:  ret = Cibyl41.roadmap_history_load_1038368(sp, a0, a1, a2, a3); break;
-      case 0x1038478:  ret = Cibyl41.roadmap_history_initialize_1038478(sp, a0, a1, a2, a3); break;
-      case 0x10384b0:  ret = Cibyl41.utf8_strlen_10384b0( a0, a1, a2); break;
-      case 0x1038500:  ret = Cibyl41.utf8_to_char_array_1038500(sp, a0, a1, a2, a3); break;
-      case 0x10385cc:  ret = Cibyl41.utf8_free_char_array_10385cc(sp, a0, a1, a2, a3); break;
-      case 0x1038648:  ret = Cibyl41.utf8_get_next_char_1038648(sp, a0, a1, a2, a3); break;
-      case 0x1038848:  ret = Cibyl41.utf8_remove_last_char_1038848(sp, a0, a1, a2, a3); break;
-      case 0x10388b4:  ret = Cibyl41.roadmap_keyboard_handler__key_pressed_10388b4(sp, a0, a1, a2, a3); break;
-      case 0x1038940:  ret = Cibyl41.roadmap_keyboard_register_to_event__general_1038940( a0, a1, a2, a3); break;
-      case 0x10389c0:  ret = Cibyl41.roadmap_keyboard_unregister_from_event__general_10389c0( a0, a1, a2, a3); break;
-      case 0x1038a70:  ret = Cibyl41.roadmap_keyboard_register_to_event__key_pressed_1038a70(sp, a0, a1, a2, a3); break;
-      case 0x1038aa0:  ret = Cibyl41.roadmap_keyboard_unregister_from_event__key_pressed_1038aa0(sp, a0, a1, a2, a3); break;
-      case 0x1038b08:  ret = Cibyl41.on_disabling_driving_lock_1038b08( a0); break;
-      case 0x1038b20:  ret = Cibyl41.roadmap_keyboard_set_typing_lock_enable_1038b20( a0); break;
-      case 0x1038b3c:  ret = Cibyl41.roadmap_keyboard_typing_locked_1038b3c(sp, a0, a1, a2, a3); break;
-      case 0x1038d10:  ret = Cibyl42.is_valid_nonalphabetic_char_1038d10( a0, a1); break;
-      case 0x1038dd0:  ret = Cibyl42.is_valid_key_1038dd0(sp, a0, a1, a2, a3); break;
-      case 0x1038efc:  ret = Cibyl42.phone_keyboard_state_init_1038efc( a0); break;
-      case 0x1038f10:  Cibyl42.multiple_key_info_init_1038f10( a0); break;
-      case 0x1038f1c:  ret = Cibyl42.phone_keyboard_init_1038f1c(sp, a0, a1, a2, a3); break;
-      case 0x1038f7c:  ret = Cibyl42.phone_keyboard_load_1038f7c(sp, a0, a1, a2, a3); break;
-      case 0x103900c:  ret = Cibyl42.roadmap_phone_keyboard_init_103900c(sp, a0, a1, a2, a3); break;
-      case 0x103906c:  ret = Cibyl42.multiple_key_info_get_next_valid_key_103906c(sp, a0, a1, a2, a3); break;
-      case 0x10392dc:  ret = Cibyl42.multiple_key_info_free_10392dc(sp, a0, a1, a2, a3); break;
-      case 0x1039304:  ret = Cibyl42.phone_keyboard_free_1039304(sp, a0, a1, a2, a3); break;
-      case 0x10393e8:  Cibyl42.roadmap_search_menu_10393e8(); break;
-      case 0x10393f0:  ret = Cibyl42.search_menu_set_local_search_attrs_10393f0(sp, a0, a1, a2, a3); break;
-      case 0x1039450:  ret = Cibyl42.search_menu_search_local_1039450(sp, a0, a1, a2, a3); break;
-      case 0x10394a8:  ret = Cibyl42.on_dlg_closed_local_10394a8(sp, a0, a1, a2, a3); break;
-      case 0x10394e8:  ret = Cibyl42.on_dlg_closed_address_10394e8(sp, a0, a1, a2, a3); break;
-      case 0x1039520:  ret = Cibyl42.search_menu_single_search_1039520(sp, a0, a1, a2, a3); break;
-      case 0x103955c:  ret = Cibyl42.search_menu_search_address_103955c(sp, a0, a1, a2, a3); break;
-      case 0x1039598:  ret = Cibyl42.roadmap_search_history_1039598(sp, a0, a1, a2, a3); break;
-      case 0x1039db8:  ret = Cibyl42.search_menu_my_saved_places_1039db8(sp, a0, a1, a2, a3); break;
-      case 0x1039df4:  ret = Cibyl42.search_menu_search_favorites_1039df4(sp, a0, a1, a2, a3); break;
-      case 0x1039e30:  ret = Cibyl42.search_menu_search_history_1039e30(sp, a0, a1, a2, a3); break;
-      case 0x1039e6c:  ret = Cibyl42.hide_our_dialogs_1039e6c(sp, a0, a1, a2, a3); break;
-      case 0x1039eb8:  ret = Cibyl42.on_erase_history_item_1039eb8(sp, a0, a1, a2, a3); break;
-      case 0x1039f58:  ret = Cibyl42.keyboard_callback_1039f58(sp, a0, a1, a2, a3); break;
-      case 0x103a02c:  ret = Cibyl42.T_97_103a02c(sp, a0, a1, a2, a3); break;
-      case 0x103a068:  ret = Cibyl42.roadmap_address_show_103a068(sp, a0, a1, a2, a3); break;
-      case 0x103a690:  ret = Cibyl43.on_option_selected_103a690(sp, a0, a1, a2, a3); break;
-      case 0x103a9a4:  ret = Cibyl43.local_search_get_provider_103a9a4(sp, a0, a1, a2, a3); break;
-      case 0x103a9c8:  ret = Cibyl43.local_search_resolve_address_103a9c8(sp, a0, a1, a2, a3); break;
-      case 0x103aa58:  ret = Cibyl43.local_search_get_logo_name_103aa58(sp, a0, a1, a2, a3); break;
-      case 0x103aaf4:  ret = Cibyl43.local_search_get_icon_name_103aaf4(sp, a0, a1, a2, a3); break;
-      case 0x103abbc:  ret = Cibyl43.local_search_get_provider_label_103abbc(sp, a0, a1, a2, a3); break;
-      case 0x103ac24:  ret = Cibyl43.local_search_term_103ac24(sp, a0, a1, a2, a3); break;
-      case 0x103ac7c:  ret = Cibyl43.local_search_init_103ac7c(sp, a0, a1, a2, a3); break;
-      case 0x103add0:  ret = Cibyl43.local_candidate_build_address_string_103add0(sp, a0, a1, a2, a3); break;
-      case 0x103b2c0:  ret = Cibyl43.on_local_option_103b2c0(sp, a0, a1, a2, a3); break;
-      case 0x103b6d4:  ret = Cibyl43.local_search_dlg_show_103b6d4(sp, a0, a1, a2, a3); break;
-      case 0x103b8e8:  ret = Cibyl44.on_search_103b8e8(sp, a0, a1, a2, a3); break;
-      case 0x103ba14:  ret = Cibyl44.on_search_error_message_103ba14(sp, a0, a1, a2, a3); break;
-      case 0x103ba34:  ret = Cibyl44.on_address_resolved_103ba34(sp, a0, a1, a2, a3); break;
-      case 0x103bce0:  ret = Cibyl44.get_selected_list_item_103bce0(sp, a0, a1, a2, a3); break;
-      case 0x103bd2c:  ret = Cibyl44.navigate_103bd2c(sp, a0, a1, a2, a3); break;
-      case 0x103bd5c:  ret = Cibyl44.on_list_item_selected_103bd5c(sp, a0, a1, a2, a3); break;
-      case 0x103bda4:  ret = Cibyl44.on_back_103bda4(sp, a0, a1, a2, a3); break;
-      case 0x103bde4:  ret = Cibyl44.on_options_103bde4(sp, a0, a1, a2, a3); break;
-      case 0x103bec0:  ret = Cibyl44.on_option_selected_103bec0(sp, a0, a1, a2, a3); break;
-      case 0x103bff0:  ret = Cibyl44.address_search_report_wrong_address_103bff0(sp, a0, a1, a2, a3); break;
-      case 0x103c110:  ret = Cibyl44.on_completed_reporting_bad_address_103c110(sp, a0, a1, a2, a3); break;
-      case 0x103c140:  ret = Cibyl44.address_search_resolve_address_103c140(sp, a0, a1, a2, a3); break;
-      case 0x103c18c:  ret = Cibyl44.address_search_term_103c18c(sp, a0, a1, a2, a3); break;
-      case 0x103c1e4:  ret = Cibyl44.address_search_init_103c1e4(sp, a0, a1, a2, a3); break;
-      case 0x103c2cc:  ret = Cibyl44.address_candidate_build_address_string_103c2cc(sp, a0, a1, a2, a3); break;
-      case 0x103c538:  ret = Cibyl44.on_address_option_103c538(sp, a0, a1, a2, a3); break;
-      case 0x103c870:  ret = Cibyl44.get_result_container_103c870(sp, a0, a1, a2, a3); break;
-      case 0x103c91c:  ret = Cibyl44.address_search_dlg_show_103c91c(sp, a0, a1, a2, a3); break;
-      case 0x103c9a0:  ret = Cibyl44.address_search_dlg_show_auto_103c9a0(sp, a0, a1, a2, a3); break;
-      case 0x103ca28:  ret = Cibyl44.on_search_103ca28(sp, a0, a1, a2, a3); break;
-      case 0x103cd14:  ret = Cibyl45.on_search_error_message_103cd14(sp, a0, a1, a2, a3); break;
-      case 0x103cd34:  ret = Cibyl45.on_address_resolved_103cd34(sp, a0, a1, a2, a3); break;
-      case 0x103cfcc:  ret = Cibyl45.on_auto_search_completed_103cfcc(sp, a0, a1, a2, a3); break;
-      case 0x103cfec:  ret = Cibyl45.send_error_report_103cfec(sp, a0, a1, a2, a3); break;
-      case 0x103d070:  ret = Cibyl45.get_selected_list_item_103d070(sp, a0, a1, a2, a3); break;
-      case 0x103d0bc:  ret = Cibyl45.navigate_103d0bc(sp, a0, a1, a2, a3); break;
-      case 0x103d0ec:  ret = Cibyl45.on_list_item_selected_103d0ec(sp, a0, a1, a2, a3); break;
-      case 0x103d17c:  ret = Cibyl45.on_back_103d17c(sp, a0, a1, a2, a3); break;
-      case 0x103d1bc:  ret = Cibyl45.on_options_103d1bc(sp, a0, a1, a2, a3); break;
-      case 0x103d300:  ret = Cibyl45.on_option_selected_103d300(sp, a0, a1, a2, a3); break;
-      case 0x103d44c:  ret = Cibyl45.address_search_auto_search_103d44c(sp, a0, a1, a2, a3); break;
-      case 0x103d49c:  ret = Cibyl45.on_key_pressed__delegate_to_editbox_103d49c(sp, a0, a1, a2, a3); break;
-      case 0x103d518:  ret = Cibyl45.on_btn_search_103d518(sp, a0, a1, a2, a3); break;
-      case 0x103d560:  ret = Cibyl45.generic_search_dlg_is_1st_103d560( a0); break;
-      case 0x103d584:  ret = Cibyl45.generic_search_dlg_reopen_native_keyboard_103d584(sp, a0, a1, a2, a3); break;
-      case 0x103d610:  ret = Cibyl45.on_keyboard_closed_103d610(sp, a0, a1, a2, a3); break;
-      case 0x103d78c:  ret = Cibyl45.create_input_container_103d78c(sp, a0, a1, a2, a3); break;
-      case 0x103d984:  ret = Cibyl45.create_dlg_103d984(sp, a0, a1, a2, a3); break;
-      case 0x103da30:  ret = Cibyl45.generic_search_dlg_get_search_dlg_103da30(sp, a0, a1, a2, a3); break;
-      case 0x103dac0:  ret = Cibyl45.on_device_event_103dac0(sp, a0, a1, a2, a3); break;
-      case 0x103db24:  ret = Cibyl45.generic_search_dlg_get_search_edit_box_103db24(sp, a0, a1, a2, a3); break;
-      case 0x103db54:  ret = Cibyl45.on_dlg_closed_103db54(sp, a0, a1, a2, a3); break;
-      case 0x103dc80:  ret = Cibyl45.reopen_keyboard_103dc80(sp, a0, a1, a2, a3); break;
-      case 0x103dd5c:  ret = Cibyl45.generic_search_dlg_switch_gui_103dd5c(sp, a0, a1, a2, a3); break;
-      case 0x103de44:  ret = Cibyl45.generic_search_dlg_show_103de44(sp, a0, a1, a2, a3); break;
-      case 0x103e180:  ret = Cibyl46.generic_search_result_103e180( a0); break;
-      case 0x103e1d4:  ret = Cibyl46.generic_address_add_103e1d4(sp, a0, a1, a2, a3); break;
-      case 0x103e244:  ret = Cibyl46.on_completed_103e244(sp, a0, a1, a2, a3); break;
-      case 0x103e28c:  ret = Cibyl46.get_house_number__str_103e28c(sp, a0, a1, a2, a3); break;
-      case 0x103e2f4:  ret = Cibyl46.generic_search_add_to_favorites_103e2f4(sp, a0, a1, a2, a3); break;
-      case 0x103e33c:  ret = Cibyl46.on_favorites_name_103e33c(sp, a0, a1, a2, a3); break;
-      case 0x103e464:  ret = Cibyl46.generic_search_add_address_to_history_103e464(sp, a0, a1, a2, a3); break;
-      case 0x103e598:  ret = Cibyl46.navigate_with_coordinates_103e598(sp, a0, a1, a2, a3); break;
-      case 0x103e744:  ret = Cibyl46.generic_search_resolve_address_103e744(sp, a0, a1, a2, a3); break;
-      case 0x103ea8c:  ret = Cibyl46.address_candidate_init_103ea8c(sp, a0, a1, a2, a3); break;
-      case 0x103eac0:  ret = Cibyl46.single_search_resolve_address_103eac0(sp, a0, a1, a2, a3); break;
-      case 0x103eb50:  ret = Cibyl46.on_single_search_address_candidate_103eb50(sp, a0, a1, a2, a3); break;
-      case 0x103ec44:  ret = Cibyl46.single_search_term_103ec44(sp, a0, a1, a2, a3); break;
-      case 0x103eca8:  ret = Cibyl46.single_search_init_103eca8(sp, a0, a1, a2, a3); break;
-      case 0x103ed8c:  ret = Cibyl46.single_search_dlg_show_103ed8c(sp, a0, a1, a2, a3); break;
-      case 0x103ee1c:  ret = Cibyl46.close_dialog_103ee1c(sp, a0, a1, a2, a3); break;
-      case 0x103eed0:  ret = Cibyl46.on_search_action_103eed0(sp, a0, a1, a2, a3); break;
-      case 0x103f1c4:  ret = Cibyl46.on_address_resolved_103f1c4(sp, a0, a1, a2, a3); break;
-      case 0x103f498:  ret = Cibyl47.on_option_selected_103f498(sp, a0, a1, a2, a3); break;
-      case 0x103f634:  ret = Cibyl47.roadmap_net_mon_set_enabled_103f634( a0); break;
-      case 0x103f640:  ret = Cibyl47.roadmap_net_mon_get_enabled_103f640(); break;
-      case 0x103f650:  ret = Cibyl47.roadmap_net_mon_disconnect_103f650( a0); break;
-      case 0x103f6fc:  ret = Cibyl47.update_activity_103f6fc(sp, a0, a1, a2, a3); break;
-      case 0x103f75c:  ret = Cibyl47.roadmap_net_mon_error_103f75c(sp, a0, a1, a2, a3); break;
-      case 0x103f7a8:  ret = Cibyl47.roadmap_net_mon_recv_103f7a8(sp, a0, a1, a2, a3); break;
-      case 0x103f810:  ret = Cibyl47.roadmap_net_mon_send_103f810(sp, a0, a1, a2, a3); break;
-      case 0x103f848:  ret = Cibyl47.roadmap_net_mon_connect_103f848(sp, a0, a1, a2, a3); break;
-      case 0x103f88c:  ret = Cibyl47.roadmap_net_mon_start_103f88c(sp, a0, a1, a2, a3); break;
-      case 0x103f8dc:  ret = Cibyl47.periodic_callack_103f8dc(sp, a0, a1, a2, a3); break;
-      case 0x103f960:  ret = Cibyl47.roadmap_net_mon_destroy_103f960(sp, a0, a1, a2, a3); break;
-      case 0x103f9ac:  ret = Cibyl47.roadmap_net_mon_initialize_103f9ac(sp, a0, a1, a2, a3); break;
-      case 0x103fa14:  ret = Cibyl47.roadmap_softkeys_orientation_103fa14(); break;
-      case 0x103fa1c:  ret = Cibyl47.roadmap_softkeys_left_softkey_callback_103fa1c(sp, a0, a1, a2, a3); break;
-      case 0x103fa80:  ret = Cibyl47.roadmap_softkeys_right_softkey_callback_103fa80(sp, a0, a1, a2, a3); break;
-      case 0x103fae4:  ret = Cibyl47.roadmap_softkeys_get_right_soft_key_text_103fae4(sp, a0, a1, a2, a3); break;
-      case 0x103fb58:  ret = Cibyl47.roadmap_softkeys_get_left_soft_key_text_103fb58(sp, a0, a1, a2, a3); break;
-      case 0x103fc90:  ret = Cibyl47.remove_softkey_103fc90(sp, a0, a1, a2, a3); break;
-      case 0x103fdbc:  ret = Cibyl47.roadmap_softkeys_remove_right_soft_key_103fdbc(sp, a0, a1, a2, a3); break;
-      case 0x103fe04:  ret = Cibyl47.roadmap_softkeys_remove_left_soft_key_103fe04(sp, a0, a1, a2, a3); break;
-      case 0x103fe4c:  ret = Cibyl47.queue_softkey_103fe4c(sp, a0, a1, a2, a3); break;
-      case 0x103ff3c:  ret = Cibyl47.roadmap_softkeys_set_right_soft_key_103ff3c(sp, a0, a1, a2, a3); break;
-      case 0x103ff84:  ret = Cibyl47.roadmap_softkeys_set_left_soft_key_103ff84(sp, a0, a1, a2, a3); break;
-      case 0x103ffcc:  ret = Cibyl47.device_event_info_copy_103ffcc( a0, a1); break;
-      case 0x103ffe4:  ret = Cibyl47.device_event_info_are_identical_103ffe4( a0, a1); break;
-      case 0x103fffc:  ret = Cibyl47.get_device_event_name_103fffc( a0); break;
-      case 0x1040030:  ret = Cibyl47.roadmap_device_event_notification_1040030(sp, a0, a1, a2, a3); break;
-      case 0x10400ac:  ret = Cibyl47.roadmap_device_events_unregister_10400ac(sp, a0, a1, a2, a3); break;
-      case 0x10400d8:  ret = Cibyl47.roadmap_device_events_register_10400d8(sp, a0, a1, a2, a3); break;
-      case 0x1040108:  ret = Cibyl47.roadmap_device_events_term_1040108(sp, a0, a1, a2, a3); break;
-      case 0x1040134:  ret = Cibyl47.roadmap_device_events_init_1040134(sp, a0, a1, a2, a3); break;
-      case 0x10401c8:  Cibyl47.device_event_info_init_10401c8( a0); break;
-      case 0x10401d4:  ret = Cibyl47.device_event_info_free_10401d4(sp, a0, a1, a2, a3); break;
-      case 0x10401f4:  ret = Cibyl47.insert_first_item_10401f4(sp, a0, a1, a2, a3); break;
-      case 0x1040254:  ret = Cibyl47.cyclic_array_init_1040254(sp, a0, a1, a2, a3); break;
-      case 0x10402a4:  ret = Cibyl47.cyclic_array_free_10402a4(sp, a0, a1, a2, a3); break;
-      case 0x1040358:  ret = Cibyl47.cyclic_array_size_1040358( a0); break;
-      case 0x10403a8:  ret = Cibyl47.cyclic_array_get_item_10403a8( a0, a1); break;
-      case 0x1040510:  ret = Cibyl47.cyclic_array_remove_item_1040510(sp, a0, a1, a2, a3); break;
-      case 0x10406ec:  ret = Cibyl47.cyclic_array_remove_same_item_10406ec(sp, a0, a1, a2, a3); break;
-      case 0x1040940:  ret = Cibyl47.cyclic_array_push_last_1040940(sp, a0, a1, a2, a3); break;
-      case 0x1040b3c:  ret = Cibyl47.roadmap_city_write_int_1040b3c(sp, a0, a1, a2, a3); break;
-      case 0x1040bc4:  ret = Cibyl47.roadmap_city_next_1040bc4(sp, a0, a1, a2, a3); break;
-      case 0x1040cc0:  ret = Cibyl48.roadmap_city_first_1040cc0(sp, a0, a1, a2, a3); break;
-      case 0x1040dbc:  ret = Cibyl48.roadmap_city_write_file_1040dbc(sp, a0, a1, a2, a3); break;
-      case 0x1040fdc:  ret = Cibyl48.roadmap_city_search_1040fdc(sp, a0, a1, a2, a3); break;
-      case 0x10410c8:  ret = Cibyl48.roadmap_city_unload_10410c8(sp, a0, a1, a2, a3); break;
-      case 0x10412b8:  ret = Cibyl48.roadmap_city_find_10412b8(sp, a0, a1, a2, a3); break;
-      case 0x1041420:  ret = Cibyl48.roadmap_city_add_1041420(sp, a0, a1, a2, a3); break;
-      case 0x10415d8:  ret = Cibyl48.roadmap_city_free_10415d8(sp, a0, a1, a2, a3); break;
-      case 0x10416bc:  ret = Cibyl48.roadmap_city_init_10416bc(sp, a0, a1, a2, a3); break;
-      case 0x1041920:  ret = Cibyl48.roadmap_range_get_street_1041920( a0); break;
-      case 0x104199c:  ret = Cibyl48.roadmap_range_activate_104199c(sp, a0, a1, a2, a3); break;
-      case 0x10419f8:  ret = Cibyl48.roadmap_range_get_address_10419f8(sp, a0, a1, a2, a3); break;
-      case 0x1041cc8:  ret = Cibyl48.roadmap_range_unmap_1041cc8(sp, a0, a1, a2, a3); break;
-      case 0x1041d34:  ret = Cibyl48.roadmap_range_map_1041d34(sp, a0, a1, a2, a3); break;
-      case 0x1041dd0:  Cibyl48.sttstr_reset_1041dd0( a0); break;
-      case 0x1041de4:  ret = Cibyl48.sttstr_trim_last_char_1041de4(sp, a0, a1, a2, a3); break;
-      case 0x1041ea4:  ret = Cibyl48.sttstr_copy_1041ea4(sp, a0, a1, a2, a3); break;
-      case 0x1041fb4:  ret = Cibyl48.dynstr_reset_1041fb4(sp, a0, a1, a2, a3); break;
-      case 0x1041fec:  ret = Cibyl48.T_1_1041fec(sp, a0, a1, a2, a3); break;
-      case 0x1042028:  ret = Cibyl48.dynstr_copy_1042028(sp, a0, a1, a2, a3); break;
-      case 0x1042228:  ret = Cibyl48.roadmap_bar_by_pos_1042228(sp, a0, a1, a2, a3); break;
-      case 0x10423cc:  ret = Cibyl48.roadmap_bar_short_click_10423cc(); break;
-      case 0x10423dc:  ret = Cibyl48.roadmap_bar_long_click_10423dc(); break;
-      case 0x10423ec:  ret = Cibyl48.roadmap_bar_drag_start_10423ec(); break;
-      case 0x10423fc:  ret = Cibyl48.roadmap_bar_top_height_10423fc(); break;
-      case 0x1042430:  ret = Cibyl48.roadmap_bar_bottom_height_1042430(); break;
-      case 0x1042464:  Cibyl48.roadmap_bar_switch_skins_1042464(); break;
-      case 0x104246c:  ret = Cibyl48.roadmap_bottom_bar_hide_104246c(); break;
-      case 0x104247c:  Cibyl48.roadmap_bottom_bar_show_104247c(); break;
-      case 0x10424a4:  ret = Cibyl48.roadmap_top_bar_show_10424a4(); break;
-      case 0x10424c8:  ret = Cibyl48.get_current_num_comments_10424c8(sp, a0, a1, a2, a3); break;
-      case 0x1042520:  ret = Cibyl49.get_dist_to_destination_1042520(sp, a0, a1, a2, a3); break;
-      case 0x1042568:  ret = Cibyl49.get_time_to_destination_1042568(sp, a0, a1, a2, a3); break;
-      case 0x10425b0:  ret = Cibyl49.get_current_street_10425b0(sp, a0, a1, a2, a3); break;
-      case 0x10425e8:  ret = Cibyl49.get_time_str_10425e8(sp, a0, a1, a2, a3); break;
-      case 0x1042614:  ret = Cibyl49.roadmap_bar_load_image_1042614(sp, a0, a1, a2, a3); break;
-      case 0x1042688:  ret = Cibyl49.createBGImage_1042688(sp, a0, a1, a2, a3); break;
-      case 0x1042744:  ret = Cibyl49.roadmap_bar_decode_arg_1042744(sp, a0, a1, a2, a3); break;
-      case 0x1042798:  ret = Cibyl49.roadmap_bar_decode_integer_1042798(sp, a0, a1, a2, a3); break;
-      case 0x1042818:  ret = Cibyl49.roadmap_bar_object_string_1042818(sp, a0, a1, a2, a3); break;
-      case 0x1042888:  ret = Cibyl49.roadmap_bar_obj_pressed_1042888(sp, a0, a1, a2, a3); break;
-      case 0x1042924:  ret = Cibyl49.roadmap_bar_drag_motion_1042924(sp, a0, a1, a2, a3); break;
-      case 0x10429e4:  ret = Cibyl49.draw_objects_10429e4(sp, a0, a1, a2, a3); break;
-      case 0x10430c8:  ret = Cibyl49.roadmap_bar_draw_bottom_bar_10430c8(sp, a0, a1, a2, a3); break;
-      case 0x1043240:  ret = Cibyl49.roadmap_bar_draw_top_bar_1043240(sp, a0, a1, a2, a3); break;
-      case 0x1043284:  ret = Cibyl49.roadmap_bar_draw_1043284(sp, a0, a1, a2, a3); break;
-      case 0x10432d0:  ret = Cibyl49.roadmap_bar_obj_released_10432d0(sp, a0, a1, a2, a3); break;
-      case 0x10433fc:  ret = Cibyl49.T_92_10433fc(sp, a0, a1, a2, a3); break;
-      case 0x1043c14:  ret = Cibyl50.roadmap_bar_initialize_1043c14(sp, a0, a1, a2, a3); break;
-      case 0x1043e40:  ret = Cibyl50.roadmap_prompts_get_count_1043e40(); break;
-      case 0x1043e50:  ret = Cibyl50.roadmap_prompts_get_values_1043e50(); break;
-      case 0x1043e5c:  ret = Cibyl50.roadmap_prompts_get_labels_1043e5c(); break;
-      case 0x1043e68:  ret = Cibyl50.roadmap_prompts_exist_1043e68(); break;
-      case 0x1043e70:  ret = Cibyl50.roadmap_prompts_init_params_1043e70(sp, a0, a1, a2, a3); break;
-      case 0x1043f0c:  ret = Cibyl50.roadmap_prompts_conf_load_1043f0c(sp, a0, a1, a2, a3); break;
-      case 0x10440c4:  ret = Cibyl50.roadmap_prompts_get_downloading_lang_name_10440c4(sp, a0, a1, a2, a3); break;
-      case 0x10440fc:  ret = Cibyl50.roadmap_prompts_get_queued_lang_10440fc(sp, a0, a1, a2, a3); break;
-      case 0x1044134:  ret = Cibyl50.roadmap_prompts_get_name_1044134(sp, a0, a1, a2, a3); break;
-      case 0x104416c:  ret = Cibyl50.prompts_downloads_warning_fn_104416c(sp, a0, a1, a2, a3); break;
-      case 0x10442b8:  ret = Cibyl50.roadmap_prompts_get_prompt_value_from_name_10442b8(sp, a0, a1, a2, a3); break;
-      case 0x1044368:  ret = Cibyl50.roadmap_prompts_get_prompt_value_1044368(sp, a0, a1, a2, a3); break;
-      case 0x1044408:  ret = Cibyl50.roadmap_prompts_set_downloading_lang_name_1044408(sp, a0, a1, a2, a3); break;
-      case 0x1044448:  ret = Cibyl50.roadmap_prompts_set_queued_lang_1044448(sp, a0, a1, a2, a3); break;
-      case 0x1044488:  ret = Cibyl50.roadmap_prompts_set_update_time_1044488(sp, a0, a1, a2, a3); break;
-      case 0x10444c8:  ret = Cibyl50.roadmap_prompts_set_name_10444c8(sp, a0, a1, a2, a3); break;
-      case 0x1044508:  ret = Cibyl50.roadmap_prompts_init_1044508(sp, a0, a1, a2, a3); break;
-      case 0x10445a4:  ret = Cibyl50.load_prompt_list_10445a4(sp, a0, a1, a2, a3); break;
-      case 0x10446e4:  ret = Cibyl50.roadmap_prompts_download_10446e4(sp, a0, a1, a2, a3); break;
-      case 0x1044804:  ret = Cibyl50.roadmap_prompts_login_cb_1044804(sp, a0, a1, a2, a3); break;
-      case 0x1044914:  ret = Cibyl50.on_conf_file_downloaded_1044914(sp, a0, a1, a2, a3); break;
-      case 0x1044a18:  ret = Cibyl50.on_download_lang_confirm_1044a18(sp, a0, a1, a2, a3); break;
-      case 0x1044a64:  ret = Cibyl50.roadmap_prompts_download_watchdog_timer_1044a64(sp, a0, a1, a2, a3); break;
-      case 0x1044b24:  ret = Cibyl50.on_loaded_prompt_file_1044b24(sp, a0, a1, a2, a3); break;
-      case 0x1044bd8:  ret = Cibyl50.roadmap_border_shutdown_1044bd8(sp, a0, a1, a2, a3); break;
-      case 0x1044c6c:  ret = Cibyl50.get_image_1044c6c(sp, a0, a1, a2, a3); break;
-      case 0x10453c8:  ret = Cibyl51.roadmap_display_border_10453c8(sp, a0, a1, a2, a3); break;
-      case 0x1045cb8:  ret = Cibyl51.roadmap_border_initialize_1045cb8(sp, a0, a1, a2, a3); break;
-      case 0x1045d7c:  ret = Cibyl51.roadmap_http_async_copy_abort_1045d7c(sp, a0, a1, a2, a3); break;
-      case 0x1045dd0:  ret = Cibyl51.roadmap_http_async_copy_1045dd0(sp, a0, a1, a2, a3); break;
-      case 0x1045e88:  ret = Cibyl51.roadmap_http_async_connect_cb_1045e88(sp, a0, a1, a2, a3); break;
-      case 0x1045f74:  ret = Cibyl51.roadmap_http_async_has_data_cb_1045f74(sp, a0, a1, a2, a3); break;
-      case 0x104644c:  ret = Cibyl51.override_long_click_104644c(); break;
-      case 0x1046454:  ret = Cibyl51.get_input_type_1046454(); break;
-      case 0x104645c:  ret = Cibyl51.roadmap_alternative_routes_suggest_dlg_active_104645c(sp, a0, a1, a2, a3); break;
-      case 0x1046498:  ret = Cibyl51.roadmap_alertnative_routes_after_login_1046498(sp, a0, a1, a2, a3); break;
-      case 0x1046684:  ret = Cibyl52.roadmap_alternative_routes_suggested_trip_1046684(sp, a0, a1, a2, a3); break;
-      case 0x10466ac:  ret = Cibyl52.on_suggest_dlg_close_10466ac(sp, a0, a1, a2, a3); break;
-      case 0x10466d0:  ret = Cibyl52.roadmap_alternative_routes_routes_dialog_10466d0(sp, a0, a1, a2, a3); break;
-      case 0x104694c:  ret = Cibyl52.suggest_route_dialog_close_104694c(sp, a0, a1, a2, a3); break;
-      case 0x10469c8:  ret = Cibyl52.route_select_10469c8(sp, a0, a1, a2, a3); break;
-      case 0x1046b30:  ret = Cibyl52.on_route_selected_1046b30(sp, a0, a1, a2, a3); break;
-      case 0x1046b54:  ret = Cibyl52.on_drive_btn_cb_1046b54(sp, a0, a1, a2, a3); break;
-      case 0x1046bc0:  ret = Cibyl52.update_button_1046bc0(sp, a0, a1, a2, a3); break;
-      case 0x1046cd0:  ret = Cibyl52.on_show_routes_dlg_closed_1046cd0(sp, a0, a1, a2, a3); break;
-      case 0x1046d14:  ret = Cibyl52.space_1046d14(sp, a0, a1, a2, a3); break;
-      case 0x1046d7c:  ret = Cibyl52.on_route_show_list_1046d7c(sp, a0, a1, a2, a3); break;
-      case 0x1046d9c:  ret = Cibyl52.highligh_selection_1046d9c(sp, a0, a1, a2, a3); break;
-      case 0x1046fb4:  ret = Cibyl52.on_routes_selection_all_1046fb4(sp, a0, a1, a2, a3); break;
-      case 0x1047094:  ret = Cibyl52.on_routes_selection_route_1047094(sp, a0, a1, a2, a3); break;
-      case 0x1047188:  ret = Cibyl52.keypressed_showroute_1047188(sp, a0, a1, a2, a3); break;
-      case 0x10473a4:  ret = Cibyl52.OnKeyPressed_10473a4(sp, a0, a1, a2, a3); break;
-      case 0x1047524:  ret = Cibyl52.on_compare_routes_option_selected_1047524(sp, a0, a1, a2, a3); break;
-      case 0x10475e8:  ret = Cibyl52.compare_routes_options_sk_cb_10475e8(sp, a0, a1, a2, a3); break;
-      case 0x1047734:  ret = Cibyl52.on_show_route_highlight_dlg_closed_1047734(sp, a0, a1, a2, a3); break;
-      case 0x10477e0:  ret = Cibyl52.roadmap_alternative_route_get_src_10477e0(sp, a0, a1, a2, a3); break;
-      case 0x104783c:  ret = Cibyl52.roadmap_alternative_route_get_waypoint_104783c(sp, a0, a1, a2, a3); break;
-      case 0x10478a0:  ret = Cibyl53.update_progress_10478a0(sp, a0, a1, a2, a3); break;
-      case 0x10478f8:  ret = Cibyl53.roadmap_alternative_routes_set_last_check_time_stamp_10478f8(sp, a0, a1, a2, a3); break;
-      case 0x1047928:  ret = Cibyl53.tod_1047928(sp, a0, a1, a2, a3); break;
-      case 0x1047980:  ret = Cibyl53.roadmap_alternative_routes_suggest_route_dialog_1047980(sp, a0, a1, a2, a3); break;
-      case 0x104812c:  ret = Cibyl53.request_route_104812c(sp, a0, a1, a2, a3); break;
-      case 0x10481d4:  ret = Cibyl53.on_close_btn_cb_10481d4(sp, a0, a1, a2, a3); break;
-      case 0x1048210:  ret = Cibyl53.on_suggest_dlg_canceled_1048210(sp, a0, a1, a2, a3); break;
-      case 0x104825c:  ret = Cibyl53.on_alt_routes_btn_cb_104825c(sp, a0, a1, a2, a3); break;
-      case 0x1048318:  ret = Cibyl53.add_routes_selection_1048318(sp, a0, a1, a2, a3); break;
-      case 0x1048710:  ret = Cibyl53.on_routes_option_selected_1048710(sp, a0, a1, a2, a3); break;
-      case 0x1048b80:  ret = Cibyl54.roadmap_alternative_routes_set_suggest_routes_1048b80(sp, a0, a1, a2, a3); break;
-      case 0x1048bcc:  ret = Cibyl54.dont_show_callback_1048bcc(sp, a0, a1, a2, a3); break;
-      case 0x1048c0c:  ret = Cibyl54.roadmap_alternative_feature_enabled_1048c0c(sp, a0, a1, a2, a3); break;
-      case 0x1048c40:  ret = Cibyl54.roadmap_alternative_routes_suggest_routes_1048c40(sp, a0, a1, a2, a3); break;
-      case 0x1048c74:  ret = Cibyl54.roadmap_alternative_routes_init_1048c74(sp, a0, a1, a2, a3); break;
-      case 0x1048da0:  ret = Cibyl54.on_checkbox_selected_1048da0(sp, a0, a1, a2, a3); break;
-      case 0x1048e94:  ret = Cibyl54.remider_add_pin_1048e94(sp, a0, a1, a2, a3); break;
-      case 0x1048fd8:  ret = Cibyl54.create_reminder_dlg_1048fd8(sp, a0, a1, a2, a3); break;
-      case 0x10490a4:  ret = Cibyl54.get_id_10490a4(sp, a0, a1, a2, a3); break;
-      case 0x10490e8:  ret = Cibyl54.show_reminder_dlg_10490e8(sp, a0, a1, a2, a3); break;
-      case 0x1049128:  ret = Cibyl54.OnReminderShortClick_1049128(sp, a0, a1, a2, a3); break;
-      case 0x1049404:  ret = Cibyl54.show_reminder_1049404(sp, a0, a1, a2, a3); break;
-      case 0x10496d4:  ret = Cibyl54.roadmap_reminder_add_entry_10496d4(sp, a0, a1, a2, a3); break;
-      case 0x10498a8:  ret = Cibyl54.reminder_add_dlg_buttons_callback_10498a8(sp, a0, a1, a2, a3); break;
-      case 0x1049b34:  ret = Cibyl54.roadmap_gps_update_1049b34(sp, a0, a1, a2, a3); break;
-      case 0x1049d9c:  ret = Cibyl54.roadmap_reminder_feature_enabled_1049d9c(sp, a0, a1, a2, a3); break;
-      case 0x1049dd0:  ret = Cibyl54.reminder_add_dlg_1049dd0(sp, a0, a1, a2, a3); break;
-      case 0x104a6bc:  ret = Cibyl55.roadmap_reminder_add_at_position_104a6bc(sp, a0, a1, a2, a3); break;
-      case 0x104a7c0:  ret = Cibyl55.roadmap_reminder_save_location_104a7c0(sp, a0, a1, a2, a3); break;
-      case 0x104a830:  ret = Cibyl55.roadmap_reminder_init_104a830(sp, a0, a1, a2, a3); break;
-      case 0x104aa08:  ret = Cibyl55.roadmap_speedometer_set_offset_104aa08( a0); break;
-      case 0x104aa14:  ret = Cibyl55.roadmap_speedometer_initialize_104aa14(sp, a0, a1, a2, a3); break;
-      case 0x104aa84:  ret = Cibyl55.roadmap_speedometer_after_refresh_104aa84(sp, a0, a1, a2, a3); break;
-      case 0x104ad98:  Cibyl55.roadmap_scoreboard_request_failed_104ad98(); break;
-      case 0x104ada0:  ret = Cibyl55.roadmap_scoreboard_response_104ada0( a3); break;
-      case 0x104ada8:  ret = Cibyl55.roadmap_scoreboard_feature_enabled_104ada8(sp, a0, a1, a2, a3); break;
-      case 0x104addc:  ret = Cibyl55.roadmap_scoreboard_104addc(sp, a0, a1, a2, a3); break;
-      case 0x104af80:  ret = Cibyl55.social_image_download_update_bitmap_cb_104af80(sp, a0, a1, a2, a3); break;
-      case 0x104afac:  ret = Cibyl55.download_size_callback_104afac(sp, a0, a1, a2, a3); break;
-      case 0x104afec:  ret = Cibyl55.roadmap_social_image_terminate_104afec(sp, a0, a1, a2, a3); break;
-      case 0x104b048:  ret = Cibyl55.download_done_callback_104b048(sp, a0, a1, a2, a3); break;
-      case 0x104b140:  ret = Cibyl55.download_error_callback_104b140(sp, a0, a1, a2, a3); break;
-      case 0x104b1e4:  ret = Cibyl55.download_progress_callback_104b1e4(sp, a0, a1, a2, a3); break;
-      case 0x104b234:  ret = Cibyl55.roadmap_social_image_download_104b234(sp, a0, a1, a2, a3); break;
-      case 0x104b534:  ret = Cibyl55.roadmap_social_image_download_update_bitmap_104b534(sp, a0, a1, a2, a3); break;
-      case 0x104b570:  ret = Cibyl55.roadmap_social_image_initialize_104b570(sp, a0, a1, a2, a3); break;
-      case 0x104b5a8:  ret = Cibyl55.exec_callbacks_104b5a8(sp, a0, a1, a2, a3); break;
-      case 0x104b624:  ret = Cibyl55.roadmap_pointer_force_click_104b624(sp, a0, a1, a2, a3); break;
-      case 0x104b650:  ret = Cibyl55.roadmap_pointer_enable_double_click_104b650(); break;
-      case 0x104b670:  ret = Cibyl55.roadmap_pointer_long_click_expired_104b670(); break;
-      case 0x104b690:  ret = Cibyl55.remove_callback_104b690(sp, a0, a1, a2, a3); break;
-      case 0x104b768:  ret = Cibyl55.roadmap_pointer_unregister_drag_end_104b768(sp, a0, a1, a2, a3); break;
-      case 0x104b78c:  ret = Cibyl55.roadmap_pointer_unregister_drag_motion_104b78c(sp, a0, a1, a2, a3); break;
-      case 0x104b7b0:  ret = Cibyl55.roadmap_pointer_unregister_drag_start_104b7b0(sp, a0, a1, a2, a3); break;
-      case 0x104b7d4:  ret = Cibyl55.roadmap_pointer_unregister_released_104b7d4(sp, a0, a1, a2, a3); break;
-      case 0x104b7f8:  ret = Cibyl55.roadmap_pointer_unregister_pressed_104b7f8(sp, a0, a1, a2, a3); break;
-      case 0x104b840:  ret = Cibyl55.roadmap_pointer_unregister_long_click_104b840(sp, a0, a1, a2, a3); break;
-      case 0x104b864:  ret = Cibyl55.roadmap_pointer_unregister_short_click_104b864(sp, a0, a1, a2, a3); break;
-      case 0x104b888:  ret = Cibyl55.queue_callback_104b888(sp, a0, a1, a2, a3); break;
-      case 0x104b998:  ret = Cibyl55.roadmap_pointer_register_drag_end_104b998(sp, a0, a1, a2, a3); break;
-      case 0x104b9c0:  ret = Cibyl56.roadmap_pointer_register_drag_motion_104b9c0(sp, a0, a1, a2, a3); break;
-      case 0x104b9e8:  ret = Cibyl56.roadmap_pointer_register_drag_start_104b9e8(sp, a0, a1, a2, a3); break;
-      case 0x104ba10:  ret = Cibyl56.roadmap_pointer_register_released_104ba10(sp, a0, a1, a2, a3); break;
-      case 0x104ba38:  ret = Cibyl56.roadmap_pointer_register_pressed_104ba38(sp, a0, a1, a2, a3); break;
-      case 0x104ba60:  ret = Cibyl56.roadmap_pointer_register_enter_key_press_104ba60(sp, a0, a1, a2, a3); break;
-      case 0x104ba88:  ret = Cibyl56.roadmap_pointer_register_double_click_104ba88(sp, a0, a1, a2, a3); break;
-      case 0x104bab0:  ret = Cibyl56.roadmap_pointer_register_long_click_104bab0(sp, a0, a1, a2, a3); break;
-      case 0x104bad8:  ret = Cibyl56.roadmap_pointer_register_short_click_104bad8(sp, a0, a1, a2, a3); break;
-      case 0x104bb00:  ret = Cibyl56.roadmap_pointer_initialize_104bb00(sp, a0, a1, a2, a3); break;
-      case 0x104bb3c:  ret = Cibyl56.roadmap_pointer_button_pressed_104bb3c(sp, a0, a1, a2, a3); break;
-      case 0x104bbbc:  ret = Cibyl56.roadmap_pointer_moved_104bbbc(sp, a0, a1, a2, a3); break;
-      case 0x104bcf8:  ret = Cibyl56.drag_flow_control_104bcf8(sp, a0, a1, a2, a3); break;
-      case 0x104bd30:  ret = Cibyl56.roadmap_pointer_button_released_104bd30(sp, a0, a1, a2, a3); break;
-      case 0x104bec8:  ret = Cibyl56.double_click_flow_control_104bec8(sp, a0, a1, a2, a3); break;
-      case 0x104bf14:  ret = Cibyl56.long_click_flow_control_104bf14(sp, a0, a1, a2, a3); break;
-      case 0x104bfdc:  Cibyl56.roadmap_analytics_log_event_104bfdc(); break;
-      case 0x104bfe4:  ret = Cibyl56.roadmap_messagebox_timeout_104bfe4(sp, a0, a1, a2, a3); break;
-      case 0x104c058:  ret = Cibyl56.roadmap_messagebox_cb_104c058(sp, a0, a1, a2, a3); break;
-      case 0x104c0cc:  ret = Cibyl56.roadmap_messagebox_custom_104c0cc(sp, a0, a1, a2, a3); break;
-      case 0x104c148:  ret = Cibyl56.roadmap_messagebox_104c148(sp, a0, a1, a2, a3); break;
-      case 0x104c1b8:  ret = Cibyl56.ssd_confirm_dialog_custom_timeout_104c1b8(sp, a0, a1, a2, a3); break;
-      case 0x104c2a4:  ret = Cibyl56.ssd_confirm_dialog_custom_104c2a4(sp, a0, a1, a2, a3); break;
-      case 0x104c2dc:  ret = Cibyl56.ssd_confirm_dialog_timeout_104c2dc(sp, a0, a1, a2, a3); break;
-      case 0x104c320:  ret = Cibyl56.ssd_confirm_dialog_104c320(sp, a0, a1, a2, a3); break;
-      case 0x104c360:  ret = Cibyl56.no_button_callback_104c360(sp, a0, a1, a2, a3); break;
-      case 0x104c398:  ret = Cibyl56.yes_button_callback_104c398(sp, a0, a1, a2, a3); break;
-      case 0x104c3d0:  ret = Cibyl56.ssd_progress_msg_dialog_show_104c3d0( a0); break;
-      case 0x104c3f0:  ret = Cibyl56.ssd_progress_msg_dialog_hide_104c3f0(); break;
-      case 0x104c3fc:  ret = Cibyl56.ssd_progress_msg_dialog_show_timed_104c3fc(sp, a0, a1, a2, a3); break;
-      case 0x104c438:  ret = Cibyl56.hide_timer_104c438(sp, a0, a1, a2, a3); break;
-      case 0x104c464:  ret = Cibyl56.roadmap_path_list_104c464(); break;
-      case 0x104c498:  ret = Cibyl56.file_connection_path_104c498(sp, a0, a1, a2, a3); break;
-      case 0x104c504:  ret = Cibyl56.roadmap_path_debug_104c504(sp, a0, a1, a2, a3); break;
-      case 0x104c524:  ret = Cibyl56.roadmap_path_downloads_104c524(sp, a0, a1, a2, a3); break;
-      case 0x104c544:  ret = Cibyl56.roadmap_path_gps_104c544(sp, a0, a1, a2, a3); break;
-      case 0x104c564:  ret = Cibyl56.roadmap_path_user_104c564(sp, a0, a1, a2, a3); break;
-      case 0x104c594:  ret = Cibyl56.roadmap_path_config_104c594(sp, a0, a1, a2, a3); break;
-      case 0x104c670:  ret = Cibyl56.roadmap_path_free_104c670(sp, a0, a1, a2, a3); break;
-      case 0x104c690:  ret = Cibyl56.roadmap_path_list_free_104c690(sp, a0, a1, a2, a3); break;
-      case 0x104c6f4:  ret = Cibyl56.roadmap_path_create_104c6f4(sp, a0, a1, a2, a3); break;
-      case 0x104c7f4:  ret = Cibyl56.roadmap_path_expand_104c7f4(sp, a0, a1, a2, a3); break;
-      case 0x104c954:  ret = Cibyl56.roadmap_path_cat_104c954(sp, a0, a1, a2, a3); break;
-      case 0x104cb30:  ret = Cibyl56.roadmap_path_join_104cb30(sp, a0, a1, a2, a3); break;
-      case 0x104cb78:  ret = Cibyl56.roadmap_path_images_104cb78(sp, a0, a1, a2, a3); break;
-      case 0x104cbd0:  ret = Cibyl56.roadmap_path_skip_directories_104cbd0(sp, a0, a1, a2, a3); break;
-      case 0x104cc64:  ret = Cibyl56.roadmap_path_parent_104cc64(sp, a0, a1, a2, a3); break;
-      case 0x104ccb4:  ret = Cibyl56.roadmap_path_format_104ccb4(sp, a0, a1, a2, a3); break;
-      case 0x104cddc:  ret = Cibyl57.T_56_104cddc(sp, a0, a1, a2, a3); break;
-      case 0x104ce20:  ret = Cibyl57.roadmap_path_list_create_104ce20(sp, a0, a1, a2, a3); break;
-      case 0x104cf54:  ret = Cibyl57.roadmap_path_find_104cf54(sp, a0, a1, a2, a3); break;
-      case 0x104d04c:  ret = Cibyl57.roadmap_path_preferred_104d04c(sp, a0, a1, a2, a3); break;
-      case 0x104d18c:  ret = Cibyl57.roadmap_path_next_104d18c(sp, a0, a1, a2, a3); break;
-      case 0x104d204:  ret = Cibyl57.roadmap_path_first_104d204(sp, a0, a1, a2, a3); break;
-      case 0x104d274:  ret = Cibyl57.roadmap_path_set_104d274(sp, a0, a1, a2, a3); break;
-      case 0x104d414:  ret = Cibyl57.roadmap_file_base_104d414( a0); break;
-      case 0x104d428:  ret = Cibyl57.roadmap_file_size_104d428( a0); break;
-      case 0x104d444:  ret = Cibyl57.roadmap_file_free_space_104d444(); break;
-      case 0x104d44c:  ret = Cibyl57.roadmap_file_close_104d44c(sp, a0, a1, a2, a3); break;
-      case 0x104d46c:  ret = Cibyl57.roadmap_file_write_104d46c(sp, a0, a1, a2, a3); break;
-      case 0x104d494:  ret = Cibyl57.roadmap_file_read_104d494(sp, a0, a1, a2, a3); break;
-      case 0x104d4bc:  ret = Cibyl57.fopen_exception_handler_104d4bc(sp, a0, a1, a2, a3); break;
-      case 0x104d5c0:  ret = Cibyl57.favail_104d5c0(sp, a0, a1, a2, a3); break;
-      case 0x104d628:  ret = Cibyl57.roadmap_file_unmap_104d628(sp, a0, a1, a2, a3); break;
-      case 0x104d690:  ret = Cibyl57.roadmap_file_exists_104d690(sp, a0, a1, a2, a3); break;
-      case 0x104d700:  ret = Cibyl57.roadmap_file_length_104d700(sp, a0, a1, a2, a3); break;
-      case 0x104d770:  ret = Cibyl57.roadmap_file_map_104d770(sp, a0, a1, a2, a3); break;
-      case 0x104da04:  ret = Cibyl57.roadmap_file_remove_104da04(sp, a0, a1, a2, a3); break;
-      case 0x104dac8:  ret = Cibyl57.roadmap_file_fopen_104dac8(sp, a0, a1, a2, a3); break;
-      case 0x104dd10:  ret = Cibyl57.roadmap_file_open_104dd10(sp, a0, a1, a2, a3); break;
-      case 0x104dd38:  Cibyl57.roadmap_canvas_ignore_mouse_104dd38(); break;
-      case 0x104dd40:  Cibyl57.roadmap_canvas_ignore_configure_104dd40(); break;
-      case 0x104dd48:  ret = Cibyl57.roadmap_canvas_get_thickness_104dd48( a0); break;
-      case 0x104dd5c:  ret = Cibyl57.roadmap_canvas_set_thickness_104dd5c( a0); break;
-      case 0x104dd8c:  ret = Cibyl57.roadmap_canvas_erase_104dd8c( a0, a1, a2); break;
-      case 0x104dde4:  ret = Cibyl57.roadmap_canvas_erase_area_104dde4( a0, a1, a2, a3); break;
-      case 0x104de2c:  ret = Cibyl57.roadmap_canvas_draw_multiple_points_104de2c( a0, a1, a2, a3); break;
-      case 0x104de80:  ret = Cibyl57.roadmap_canvas_register_button_pressed_handler_104de80( a0); break;
-      case 0x104de8c:  ret = Cibyl57.roadmap_canvas_register_button_released_handler_104de8c( a0); break;
-      case 0x104de98:  ret = Cibyl57.roadmap_canvas_register_mouse_move_handler_104de98( a0); break;
-      case 0x104dea4:  ret = Cibyl57.roadmap_canvas_register_configure_handler_104dea4( a0); break;
-      case 0x104def0:  ret = Cibyl57.roadmap_canvas_copy_image_104def0( a0, a1, a2, a3); break;
-      case 0x104dffc:  ret = Cibyl57.roadmap_canvas_image_width_104dffc( a0); break;
-      case 0x104e020:  ret = Cibyl57.roadmap_canvas_image_height_104e020( a0); break;
-      case 0x104e044:  ret = Cibyl57.rim_on_canvas_button_pressed_104e044(sp, a0, a1, a2, a3); break;
-      case 0x104e084:  ret = Cibyl57.rim_on_canvas_button_released_104e084(sp, a0, a1, a2, a3); break;
-      case 0x104e0c4:  ret = Cibyl57.rim_on_canvas_button_moved_104e0c4(sp, a0, a1, a2, a3); break;
-      case 0x104e104:  ret = Cibyl57.roadmap_canvas_image_from_buf_104e104(); break;
-      case 0x104e10c:  Cibyl57.roadmap_canvas_shutdown_104e10c(); break;
-      case 0x104e114:  Cibyl57.roadmap_canvas_image_invalidate_104e114(); break;
-      case 0x104e11c:  Cibyl57.roadmap_canvas_unmanaged_list_add_104e11c(); break;
-      case 0x104e124:  ret = Cibyl57.roadmap_canvas_image_jpg_from_buff_104e124(sp, a0, a1, a2, a3); break;
-      case 0x104e170:  ret = Cibyl57.roadmap_canvas_new_image_104e170(sp, a0, a1, a2, a3); break;
-      case 0x104e1d8:  ret = Cibyl57.dummy_handler_104e1d8(sp, a0, a1, a2, a3); break;
-      case 0x104e22c:  ret = Cibyl58.roadmap_canvas_configure_104e22c(sp, a0, a1, a2, a3); break;
-      case 0x104e31c:  ret = Cibyl58.roadmap_canvas_refresh_104e31c(sp, a0, a1, a2, a3); break;
-      case 0x104e35c:  ret = Cibyl58.roadmap_canvas_select_pen_104e35c(sp, a0, a1, a2, a3); break;
-      case 0x104e410:  ret = Cibyl58.roadmap_canvas_set_opacity_104e410(sp, a0, a1, a2, a3); break;
-      case 0x104e440:  ret = Cibyl58.bidi_string_104e440(sp, a0, a1, a2, a3); break;
-      case 0x104e62c:  ret = Cibyl58.roadmap_canvas_getFont_104e62c(sp, a0, a1, a2, a3); break;
-      case 0x104e86c:  ret = Cibyl58.roadmap_canvas_draw_string_angle_104e86c(sp, a0, a1, a2, a3); break;
-      case 0x104e944:  ret = Cibyl58.roadmap_canvas_draw_formated_string_angle_104e944(sp, a0, a1, a2, a3); break;
-      case 0x104e968:  ret = Cibyl58.roadmap_canvas_get_text_extents_104e968(sp, a0, a1, a2, a3); break;
-      case 0x104ea60:  ret = Cibyl58.roadmap_canvas_draw_string_size_104ea60(sp, a0, a1, a2, a3); break;
-      case 0x104ebfc:  ret = Cibyl58.roadmap_canvas_draw_string_104ebfc(sp, a0, a1, a2, a3); break;
-      case 0x104ec20:  ret = Cibyl58.roadmap_canvas_draw_formated_string_size_104ec20(sp, a0, a1, a2, a3); break;
-      case 0x104ec44:  ret = Cibyl58.roadmap_canvas_get_formated_text_extents_104ec44(sp, a0, a1, a2, a3); break;
-      case 0x104ec70:  ret = Cibyl58.roadmap_canvas_free_image_104ec70(sp, a0, a1, a2, a3); break;
-      case 0x104eca0:  ret = Cibyl58.roadmap_canvas_load_image_104eca0(sp, a0, a1, a2, a3); break;
-      case 0x104ed30:  ret = Cibyl58.roadmap_canvas_create_pen_new_104ed30(sp, a0, a1, a2, a3); break;
-      case 0x104edb0:  ret = Cibyl58.roadmap_canvas_set_foreground_104edb0(sp, a0, a1, a2, a3); break;
-      case 0x104ef00:  ret = Cibyl58.roadmap_canvas_create_pen_104ef00(sp, a0, a1, a2, a3); break;
-      case 0x104ef80:  ret = Cibyl58.roadmap_canvas_draw_multiple_polygons_104ef80(sp, a0, a1, a2, a3); break;
-      case 0x104f184:  ret = Cibyl58.roadmap_canvas_draw_multiple_circles_104f184(sp, a0, a1, a2, a3); break;
-      case 0x104f290:  ret = Cibyl58.roadmap_canvas_draw_multiple_lines_104f290(sp, a0, a1, a2, a3); break;
-      case 0x104f4a8:  ret = Cibyl58.roadmap_canvas_draw_image_104f4a8(sp, a0, a1, a2, a3); break;
-      case 0x104f628:  ret = Cibyl59.roadmap_internet_open_browser_104f628( a0); break;
-      case 0x104f650:  ret = Cibyl59.roadmap_time_get_time_104f650( a0, a1); break;
-      case 0x104f6b0:  ret = Cibyl59.roadmap_time_get_millis_104f6b0(sp); break;
-      case 0x104f6cc:  ret = Cibyl59.getIntegerFromString_104f6cc(sp, a0, a1, a2, a3); break;
-      case 0x104f748:  ret = Cibyl59.roadmap_time_parseGMTString_104f748(sp, a0, a1, a2, a3); break;
-      case 0x104f848:  ret = Cibyl59.roadmap_time_get_time_wseconds_104f848(sp, a0, a1, a2, a3); break;
-      case 0x104f8d8:  ret = Cibyl59.roadmap_time_get_hours_minutes_104f8d8(sp, a0, a1, a2, a3); break;
-      case 0x104f9d8:  ret = Cibyl59.roadmap_serial_read_104f9d8( a0, a1, a2); break;
-      case 0x104fa08:  ret = Cibyl59.roadmap_serial_write_104fa08(); break;
-      case 0x104fa10:  ret = Cibyl59.roadmap_serial_close_104fa10(); break;
-      case 0x104fa48:  ret = Cibyl59.roadmap_horizontal_screen_orientation_104fa48(); break;
-      case 0x104fa60:  Cibyl59.roadmap_main_toggle_full_screen_104fa60(); break;
-      case 0x104fa68:  Cibyl59.roadmap_main_set_keyboard_104fa68(); break;
-      case 0x104fa70:  ret = Cibyl59.roadmap_main_new_menu_104fa70(); break;
-      case 0x104fa80:  Cibyl59.roadmap_main_add_menu_104fa80(); break;
-      case 0x104fa88:  ret = Cibyl59.roadmap_main_browser_hide_104fa88(); break;
-      case 0x104fab4:  ret = Cibyl59.rim_on_menuItem_104fab4( a0, a1); break;
-      case 0x104fad8:  ret = Cibyl59.roadmap_main_set_miniMenu_item_104fad8( a0, a1, a2, a3); break;
-      case 0x104fb08:  ret = Cibyl59.roadmap_main_context_menu_reset_104fb08( a0); break;
-      case 0x104fb48:  ret = Cibyl59.roadmap_main_add_menu_item_104fb48( a0, a1, a2, a3); break;
-      case 0x104fbb0:  ret = Cibyl59.roadmap_main_add_separator_104fbb0( a0); break;
-      case 0x104fbd0:  Cibyl59.roadmap_main_add_tool_104fbd0(); break;
-      case 0x104fbd8:  Cibyl59.roadmap_main_add_tool_space_104fbd8(); break;
-      case 0x104fbe8:  Cibyl59.roadmap_main_show_104fbe8(); break;
-      case 0x104fbf0:  ret = Cibyl59.roadmap_main_set_last_cb_104fbf0( a0); break;
-      case 0x104fc04:  Cibyl59.roadmap_main_flush_104fc04(); break;
-      case 0x104fc1c:  ret = Cibyl59.rim_on_gps_104fc1c(sp, a0, a1, a2, a3); break;
-      case 0x104fce4:  ret = Cibyl59.roadmap_main_show_miniMenu_104fce4(); break;
-      case 0x104fd00:  ret = Cibyl59.roadmap_main_remove_periodic_104fd00(sp, a0, a1, a2, a3); break;
-      case 0x104fdec:  ret = Cibyl59.roadmap_main_set_seconds_timer_104fdec(sp, a0, a1, a2, a3); break;
-      case 0x104fe98:  ret = Cibyl59.roadmap_main_set_periodic_104fe98(sp, a0, a1, a2, a3); break;
-      case 0x1050114:  ret = Cibyl59.roadmap_main_register_seconds_timer_mgr_1050114(sp, a0, a1, a2, a3); break;
-      case 0x105013c:  ret = Cibyl59.roadmap_main_seconds_timer_mgr_105013c(sp, a0, a1, a2, a3); break;
-      case 0x10501fc:  ret = Cibyl59.battery_status_print_10501fc(sp, a0, a1, a2, a3); break;
-      case 0x10502f0:  ret = Cibyl59.roadmap_main_add_canvas_10502f0(sp, a0, a1, a2, a3); break;
-      case 0x1050310:  ret = Cibyl59.rim_on_orientation_change_1050310(sp, a0, a1, a2, a3); break;
-      case 0x1050358:  ret = Cibyl59.rim_on_navigation_movement_1050358(sp, a0, a1, a2, a3); break;
-      case 0x10504c4:  ret = Cibyl59.rim_on_scheduledTask_10504c4(sp, a0, a1, a2, a3); break;
-      case 0x105059c:  ret = Cibyl59.roadmap_main_input_ready_105059c(sp, a0, a1, a2, a3); break;
-      case 0x10506bc:  ret = Cibyl59.main_10506bc(sp, a0, a1, a2, a3); break;
-      case 0x10506e0:  ret = Cibyl59.roadmap_main_browser_launcher_10506e0(sp, a0, a1, a2, a3); break;
-      case 0x1050764:  ret = Cibyl59.roadmap_main_context_menu_set_1050764(sp, a0, a1, a2, a3); break;
-      case 0x10507d8:  ret = Cibyl59.rim_start_10507d8(sp, a0, a1, a2, a3); break;
-      case 0x10508fc:  ret = Cibyl59.roadmap_start_event_10508fc(sp, a0, a1, a2, a3); break;
-      case 0x1050924:  ret = Cibyl59.rim_backlight_on_callback_1050924(sp, a0, a1, a2, a3); break;
-      case 0x10509a4:  ret = Cibyl59.roadmap_main_sound_level_init_10509a4(sp, a0, a1, a2, a3); break;
-      case 0x10509f8:  ret = Cibyl59.roadmap_main_set_sound_level_10509f8(sp, a0, a1, a2, a3); break;
-      case 0x1050a3c:  ret = Cibyl59.roadmap_main_write_exception_to_log_1050a3c(sp, a0, a1, a2, a3); break;
-      case 0x1050a9c:  ret = Cibyl60.roadmap_main_browser_url_handler_1050a9c(sp, a0, a1, a2, a3); break;
-      case 0x1050ad4:  ret = Cibyl60.roadmap_main_set_cursor_1050ad4(sp, a0, a1, a2, a3); break;
-      case 0x1050b24:  ret = Cibyl60.roadmap_main_exit_1050b24(sp, a0, a1, a2, a3); break;
-      case 0x1050c50:  ret = Cibyl60.rim_on_key_down_1050c50(sp, a0, a1, a2, a3); break;
-      case 0x1050e34:  ret = Cibyl60.exit_handler_1050e34(sp, a0, a1, a2, a3); break;
-      case 0x1050eac:  ret = Cibyl60.roadmap_main_remove_input_1050eac(sp, a0, a1, a2, a3); break;
-      case 0x1050f84:  ret = Cibyl60.roadmap_main_set_input_1050f84(sp, a0, a1, a2, a3); break;
-      case 0x105113c:  ret = Cibyl60.menu_wrapper_105113c(sp, a0, a1, a2, a3); break;
-      case 0x1051178:  ret = Cibyl60.roadmap_main_on_battery_stat_changed_1051178(sp, a0, a1, a2, a3); break;
-      case 0x10511a4:  ret = Cibyl60.rim_on_menu_button_10511a4(sp, a0, a1, a2, a3); break;
-      case 0x1051384:  ret = Cibyl60.rim_on_navigation_click_1051384(sp, a0, a1, a2, a3); break;
-      case 0x10513dc:  ret = Cibyl60.roadmap_main_menu_button_unregister_10513dc(sp, a0, a1, a2, a3); break;
-      case 0x10514e0:  ret = Cibyl60.roadmap_main_menu_button_register_10514e0(sp, a0, a1, a2, a3); break;
-      case 0x1051694:  ret = Cibyl60.roadmap_main_alloc_stack_1051694(sp, a0, a1, a2, a3); break;
-      case 0x10516c0:  ret = Cibyl60.roadmap_main_new_10516c0(sp, a0, a1, a2, a3); break;
-      case 0x10516e0:  ret = Cibyl60.roadmap_input_type_set_mode_10516e0(sp, a0, a1, a2, a3); break;
-      case 0x1051898:  ret = Cibyl60.roadmap_sound_load_1051898(); break;
-      case 0x10518a0:  ret = Cibyl60.roadmap_sound_free_10518a0(); break;
-      case 0x10518a8:  ret = Cibyl60.roadmap_sound_list_create_10518a8( a0); break;
-      case 0x10518cc:  ret = Cibyl60.roadmap_sound_list_add_10518cc( a0, a1); break;
-      case 0x1051938:  ret = Cibyl60.roadmap_sound_initialize_1051938(); break;
-      case 0x105194c:  Cibyl60.roadmap_sound_shutdown_105194c(); break;
-      case 0x105195c:  ret = Cibyl60.roadmap_sound_play_list_105195c(sp, a0, a1, a2, a3); break;
-      case 0x10519e0:  ret = Cibyl60.roadmap_sound_play_background_sound_10519e0(sp, a0, a1, a2, a3); break;
-      case 0x1051a64:  ret = Cibyl60.roadmap_net_set_compress_enabled_1051a64( a0); break;
-      case 0x1051a80:  ret = Cibyl60.roadmap_net_shutdown_1051a80(sp, a0, a1, a2, a3); break;
-      case 0x1051aa0:  ret = Cibyl60.print_url_1051aa0(sp, a0, a1, a2, a3); break;
-      case 0x1051af0:  ret = Cibyl60.roadmap_net_close_1051af0(sp, a0, a1, a2, a3); break;
-      case 0x1051c80:  ret = Cibyl60.roadmap_net_remove_input_1051c80(sp, a0, a1, a2, a3); break;
-      case 0x1051d00:  ret = Cibyl60.roadmap_net_set_input_1051d00(sp, a0, a1, a2, a3); break;
-      case 0x1051d90:  ret = Cibyl60.general_net_exception_handler_1051d90(sp, a0, a1, a2, a3); break;
-      case 0x1051e08:  ret = Cibyl61.do_async_exception_handler_1051e08(sp, a0, a1, a2, a3); break;
-      case 0x1051e64:  ret = Cibyl61.roadmap_net_receive_1051e64(sp, a0, a1, a2, a3); break;
-      case 0x1052018:  ret = Cibyl61.roadmap_net_send_1052018(sp, a0, a1, a2, a3); break;
-      case 0x1052250:  ret = Cibyl61.do_async_connect_cb_1052250(sp, a0, a1, a2, a3); break;
-      case 0x1052318:  ret = Cibyl61.T_49_1052318(sp, a0, a1, a2, a3); break;
-      case 0x1052354:  ret = Cibyl61.roadmap_net_connect_async_1052354(sp, a0, a1, a2, a3); break;
-      case 0x1052a5c:  ret = Cibyl61.roadmap_tile_initialize_1052a5c(); break;
-      case 0x1052a64:  ret = Cibyl61.roadmap_tile_shutdown_1052a64( a0); break;
-      case 0x1052a8c:  ret = Cibyl61.roadmap_tile_store_1052a8c( a0, a1, a2, a3); break;
-      case 0x1052ac4:  Cibyl61.roadmap_tile_remove_1052ac4(); break;
-      case 0x1052acc:  Cibyl61.roadmap_tile_remove_all_1052acc(); break;
-      case 0x1052ad4:  ret = Cibyl61.load_index_1052ad4(sp, a0, a1, a2, a3); break;
-      case 0x1052be4:  ret = Cibyl61.roadmap_tile_load_1052be4(sp, a0, a1, a2, a3); break;
-      case 0x1052d34:  ret = Cibyl61.roadmap_native_keyboard_enabled_1052d34(); break;
-      case 0x1052d44:  Cibyl61.roadmap_native_keyboard_hide_1052d44(); break;
-      case 0x1052d5c:  ret = Cibyl61.ShowSearchEditbox_1052d5c( a0, a1); break;
-      case 0x1052d98:  ret = Cibyl61.GetEditboxText_1052d98(); break;
-      case 0x1052da4:  ret = Cibyl61.roadmap_is_touchScreen_supported_1052da4(); break;
-      case 0x1052db4:  ret = Cibyl61.rim_on_editbox_closed_1052db4(sp, a0, a1, a2, a3); break;
-      case 0x1052e08:  ret = Cibyl61.ShowEditbox_1052e08(sp, a0, a1, a2, a3); break;
-      case 0x1052ee0:  ret = Cibyl61.ResetEditBoxCameraImagePath_1052ee0(); break;
-      case 0x1052f2c:  ret = Cibyl61.rim_on_editboxcamera_closed_1052f2c(sp, a0, a1, a2, a3); break;
-      case 0x1052fa4:  ret = Cibyl61.ShowEditboxCamera_1052fa4(sp, a0, a1, a2, a3); break;
-      case 0x10530d8:  ret = Cibyl61.save_changes_10530d8(sp, a0, a1, a2, a3); break;
-      case 0x1053120:  ret = Cibyl61.on_save_1053120(sp, a0, a1, a2, a3); break;
-      case 0x1053148:  ret = Cibyl61.on_close_dialog_1053148(sp, a0, a1, a2, a3); break;
-      case 0x1053170:  ret = Cibyl61.roadmap_groups_settings_1053170(sp, a0, a1, a2, a3); break;
-      case 0x10535f8:  ret = Cibyl62.roadmap_version_write_10535f8(sp, a0, a1, a2, a3); break;
-      case 0x105366c:  ret = Cibyl62.roadmap_version_read_105366c(sp, a0, a1, a2, a3); break;
-      case 0x1053710:  ret = Cibyl62.roadmap_message_ticker_height_1053710(sp, a0, a1, a2, a3); break;
-      case 0x1053750:  ret = Cibyl62.roadmap_message_ticker_key_pressed_1053750( a0); break;
-      case 0x10537b0:  ret = Cibyl62.roadmap_message_ticker_short_click_10537b0(sp, a0, a1, a2, a3); break;
-      case 0x1053844:  ret = Cibyl62.roadmap_message_ticker_is_on_1053844(); break;
-      case 0x1053854:  ret = Cibyl62.roadmap_message_ticker_initialize_1053854(sp, a0, a1, a2, a3); break;
-      case 0x1053964:  ret = Cibyl62.roadmap_message_ticker_show_cb_1053964(sp, a0, a1, a2, a3); break;
-      case 0x1053b10:  ret = Cibyl62.roadmap_message_ticker_show_1053b10(sp, a0, a1, a2, a3); break;
-      case 0x1053b30:  ret = Cibyl62.on_resource_downloaded_1053b30(sp, a0, a1, a2, a3); break;
-      case 0x1053bcc:  ret = Cibyl62.roadmap_message_ticker_hide_1053bcc(sp, a0, a1, a2, a3); break;
-      case 0x1053c14:  ret = Cibyl62.roadmap_message_ticker_display_1053c14(sp, a0, a1, a2, a3); break;
-      case 0x1053eb4:  ret = Cibyl62.softkey_callback_1053eb4(sp, a0, a1, a2, a3); break;
-      case 0x1053f1c:  ret = Cibyl62.roadmap_groups_set_num_following_1053f1c( a0); break;
-      case 0x1053f28:  ret = Cibyl62.roadmap_groups_get_num_following_1053f28(); break;
-      case 0x1053f88:  ret = Cibyl62.roadmap_groups_get_active_group_wazer_icon_1053f88(); break;
-      case 0x1053f94:  ret = Cibyl62.roadmap_groups_display_groups_supported_1053f94(); break;
-      case 0x1053f9c:  Cibyl62.roadmap_groups_term_1053f9c(); break;
-      case 0x105425c:  ret = Cibyl62.groups_callback_105425c(sp, a0, a1, a2, a3); break;
-      case 0x1054378:  ret = Cibyl62.roadmap_groups_feature_enabled_1054378(sp, a0, a1, a2, a3); break;
-      case 0x10543ac:  ret = Cibyl62.roadmap_groups_get_url_10543ac(sp, a0, a1, a2, a3); break;
-      case 0x10543d0:  ret = Cibyl62.roadmap_groups_get_show_wazer_config_10543d0(sp, a0, a1, a2, a3); break;
-      case 0x1054434:  ret = Cibyl62.roadmap_groups_get_popup_config_1054434(sp, a0, a1, a2, a3); break;
-      case 0x10544b0:  ret = Cibyl62.roadmap_groups_set_show_wazer_config_10544b0(sp, a0, a1, a2, a3); break;
-      case 0x10544d8:  ret = Cibyl62.roadmap_groups_set_popup_config_10544d8(sp, a0, a1, a2, a3); break;
-      case 0x1054500:  ret = Cibyl62.roadmap_groups_alerts_action_1054500(sp, a0, a1, a2, a3); break;
-      case 0x10545e0:  ret = Cibyl62.configure_browser_10545e0(sp, a0, a1, a2, a3); break;
-      case 0x1054644:  ret = Cibyl62.append_current_location_1054644(sp, a0, a1, a2, a3); break;
-      case 0x105474c:  ret = Cibyl62.roadmap_groups_show_group_105474c(sp, a0, a1, a2, a3); break;
-      case 0x1054898:  ret = Cibyl62.roadmap_groups_show_1054898(sp, a0, a1, a2, a3); break;
-      case 0x10549bc:  ret = Cibyl62.on_close_cb_10549bc(sp, a0, a1, a2, a3); break;
-      case 0x10549dc:  ret = Cibyl62.roadmap_groups_browser_btn_close_cb_10549dc(sp, a0, a1, a2, a3); break;
-      case 0x10549fc:  ret = Cibyl62.roadmap_groups_init_10549fc(sp, a0, a1, a2, a3); break;
-      case 0x1054b28:  ret = Cibyl62.roadmap_groups_add_following_group_name_1054b28(sp, a0, a1, a2, a3); break;
-      case 0x1054b98:  ret = Cibyl63.roadmap_groups_add_following_group_icon_1054b98(sp, a0, a1, a2, a3); break;
-      case 0x1054c98:  ret = Cibyl63.roadmap_groups_set_active_group_icon_1054c98(sp, a0, a1, a2, a3); break;
-      case 0x1054d90:  ret = Cibyl63.roadmap_groups_set_active_group_name_1054d90(sp, a0, a1, a2, a3); break;
-      case 0x1054de0:  ret = Cibyl63.roadmap_browser_register_launcher_1054de0( a0); break;
-      case 0x1054dec:  ret = Cibyl63.roadmap_browser_register_close_1054dec( a0); break;
-      case 0x1054df8:  ret = Cibyl63.roadmap_browser_hide_1054df8(sp, a0, a1, a2, a3); break;
-      case 0x1054e40:  ret = Cibyl63.roadmap_browser_set_button_attrs_1054e40(sp, a0, a1, a2, a3); break;
-      case 0x1054ea4:  ret = Cibyl63.roadmap_browser_reset_attributes_1054ea4(sp, a0, a1, a2, a3); break;
-      case 0x1054ec8:  ret = Cibyl63.on_dlg_close_1054ec8(sp, a0, a1, a2, a3); break;
-      case 0x1054f38:  ret = Cibyl63.roadmap_browser_show_embeded_1054f38(sp, a0, a1, a2, a3); break;
-      case 0x1054fb8:  ret = Cibyl63.roadmap_browser_show_ssd_1054fb8(sp, a0, a1, a2, a3); break;
-      case 0x10551ec:  ret = Cibyl63.roadmap_browser_show_extended_10551ec(sp, a0, a1, a2, a3); break;
-      case 0x1055238:  ret = Cibyl63.roadmap_browser_show_1055238(sp, a0, a1, a2, a3); break;
-      case 0x10552a0:  ret = Cibyl63.roadmap_browser_url_handler_10552a0(sp, a0, a1, a2, a3); break;
-      case 0x1055490:  ret = Cibyl63.roadmap_help_first_topic_1055490( a0, a1, a2); break;
-      case 0x10554c4:  ret = Cibyl63.roadmap_help_initialize_10554c4(sp, a0, a1, a2, a3); break;
-      case 0x10555ac:  ret = Cibyl63.roadmap_open_help_10555ac(sp, a0, a1, a2, a3); break;
-      case 0x10555d8:  ret = Cibyl63.roadmap_help_about_10555d8(sp, a0, a1, a2, a3); break;
-      case 0x1055790:  ret = Cibyl63.about_callbak_1055790(sp, a0, a1, a2, a3); break;
-      case 0x10557b8:  ret = Cibyl63.roadmap_help_next_topic_10557b8(sp, a0, a1, a2, a3); break;
-      case 0x105583c:  ret = Cibyl63.roadmap_help_make_url_105583c(sp, a0, a1, a2, a3); break;
-      case 0x1055918:  ret = Cibyl63.roadmap_help_show_1055918(sp, a0, a1, a2, a3); break;
-      case 0x1055a98:  ret = Cibyl63.roadmap_help_trips_1055a98(sp, a0, a1, a2, a3); break;
-      case 0x1055abc:  ret = Cibyl63.roadmap_help_street_1055abc(sp, a0, a1, a2, a3); break;
-      case 0x1055ae0:  ret = Cibyl63.roadmap_help_key_1055ae0(sp, a0, a1, a2, a3); break;
-      case 0x1055b04:  ret = Cibyl63.roadmap_help_voice_1055b04(sp, a0, a1, a2, a3); break;
-      case 0x1055b28:  ret = Cibyl63.roadmap_help_options_1055b28(sp, a0, a1, a2, a3); break;
-      case 0x1055b4c:  ret = Cibyl63.roadmap_help_install_1055b4c(sp, a0, a1, a2, a3); break;
-      case 0x1055b70:  ret = Cibyl63.on_drive_btn_cb_1055b70(); break;
-      case 0x1055b78:  ret = Cibyl63.navigate_res_dlg_1055b78(sp, a0, a1, a2, a3); break;
-      case 0x1055c8c:  ret = Cibyl63.on_alt_routes_btn_cb_1055c8c(sp, a0, a1, a2, a3); break;
-      case 0x1055d70:  ret = Cibyl63.navigate_res_update_ETA_widget_1055d70(sp, a0, a1, a2, a3); break;
-      case 0x1056004:  ret = Cibyl64.navigate_res_show_ETA_widget_1056004(sp, a0, a1, a2, a3); break;
-      case 0x105603c:  ret = Cibyl64.navigate_res_hide_ETA_widget_105603c(sp, a0, a1, a2, a3); break;
-      case 0x1056074:  ret = Cibyl64.T_58_1056074(sp, a0, a1, a2, a3); break;
-      case 0x10560d0:  ret = Cibyl64.navigate_res_ETA_widget_10560d0(sp, a0, a1, a2, a3); break;
-      case 0x105644c:  ret = Cibyl64.navigate_segment_func_105644c( a0, a1); break;
-      case 0x10564ac:  ret = Cibyl64.navigate_line_in_route_10564ac( a0, a1, a2, a3); break;
-      case 0x10565bc:  ret = Cibyl64.navigate_track_enabled_10565bc(); break;
-      case 0x10565cc:  ret = Cibyl64.navigate_main_alt_routes_display_10565cc(); break;
-      case 0x10565dc:  ret = Cibyl64.navigate_main_is_alt_routes_10565dc(); break;
-      case 0x10565ec:  ret = Cibyl64.navigate_offtrack_10565ec(); break;
-      case 0x10565fc:  ret = Cibyl64.navigate_get_waypoint_10565fc( a0, a1, a2, a3); break;
-      case 0x1056758:  ret = Cibyl64.navigate_main_nav_resumed_1056758(); break;
-      case 0x10567c0:  ret = Cibyl64.navigate_main_prepare_for_request_10567c0(); break;
-      case 0x10567d8:  ret = Cibyl64.navigate_main_outline_iterator_10567d8( a0, a1); break;
-      case 0x1056828:  ret = Cibyl64.navigate_main_set_dest_pos_1056828( a0); break;
-      case 0x1056874:  ret = Cibyl64.navigate_main_state_1056874(); break;
-      case 0x105688c:  ret = Cibyl64.navigate_main_is_calculating_route_105688c(); break;
-      case 0x105689c:  ret = Cibyl64.switchETAtoTime_105689c(); break;
-      case 0x10568b4:  ret = Cibyl64.navigate_main_get_src_position_10568b4(); break;
-      case 0x10569ac:  ret = Cibyl64.navigate_play_sound_10569ac(sp, a0, a1, a2, a3); break;
-      case 0x1056a18:  ret = Cibyl64.refresh_eta_1056a18(sp, a0, a1, a2, a3); break;
-      case 0x1056e0c:  ret = Cibyl64.navigate_main_on_routing_rc_1056e0c(sp, a0, a1, a2, a3); break;
-      case 0x1056e44:  ret = Cibyl64.navigate_main_set_route_1056e44(sp, a0, a1, a2, a3); break;
-      case 0x1056eb4:  ret = Cibyl64.navigate_is_line_on_route_1056eb4(sp, a0, a1, a2, a3); break;
-      case 0x1057080:  ret = Cibyl64.navigate_main_suspend_navigation_1057080(sp, a0, a1, a2, a3); break;
-      case 0x10570c4:  ret = Cibyl64.navigate_progress_message_hide_delayed_10570c4(sp, a0, a1, a2, a3); break;
-      case 0x105717c:  ret = Cibyl64.navigate_progress_message_delayed_105717c(sp, a0, a1, a2, a3); break;
-      case 0x1057214:  ret = Cibyl64.navigate_display_street_1057214(sp, a0, a1, a2, a3); break;
-      case 0x10573dc:  ret = Cibyl64.navigate_is_auto_zoom_10573dc(sp, a0, a1, a2, a3); break;
-      case 0x1057408:  ret = Cibyl65.navigation_guidance_state_1057408(sp, a0, a1, a2, a3); break;
-      case 0x1057434:  ret = Cibyl65.navigate_main_local_calc_enabled_1057434(sp, a0, a1, a2, a3); break;
-      case 0x1057460:  ret = Cibyl65.navgiate_main_voice_guidance_enabled_1057460(sp, a0, a1, a2, a3); break;
-      case 0x105748c:  ret = Cibyl65.navigate_main_ETA_enabled_105748c(sp, a0, a1, a2, a3); break;
-      case 0x10574b8:  ret = Cibyl65.navigate_main_get_follow_gps_10574b8(sp, a0, a1, a2, a3); break;
-      case 0x10574f8:  ret = Cibyl65.navigate_main_get_current_time_10574f8(sp, a0, a1, a2, a3); break;
-      case 0x105753c:  ret = Cibyl65.navigate_main_calculate_eta_105753c(sp, a0, a1, a2, a3); break;
-      case 0x1057620:  ret = Cibyl65.navigate_main_list_1057620(sp, a0, a1, a2, a3); break;
-      case 0x1057fbc:  ret = Cibyl65.display_pop_up_1057fbc(sp, a0, a1, a2, a3); break;
-      case 0x10581a0:  ret = Cibyl65.navigate_main_list_call_back_10581a0(sp, a0, a1, a2, a3); break;
-      case 0x1058254:  ret = Cibyl65.NavList_OnKeyPressed_1058254(sp, a0, a1, a2, a3); break;
-      case 0x105831c:  ret = Cibyl65.navigate_main_list_hide_105831c(sp, a0, a1, a2, a3); break;
-      case 0x105834c:  ret = Cibyl65.navigate_main_list_state_105834c(sp, a0, a1, a2, a3); break;
-      case 0x1058374:  ret = Cibyl65.navigate_main_is_list_displaying_1058374(sp, a0, a1, a2, a3); break;
-      case 0x1058394:  ret = Cibyl65.navigate_menu_1058394(sp, a0, a1, a2, a3); break;
-      case 0x1058410:  ret = Cibyl65.navigate_main_screen_outline_1058410(sp, a0, a1, a2, a3); break;
-      case 0x105856c:  ret = Cibyl65.navigate_main_screen_repaint_105856c(sp, a0, a1, a2, a3); break;
-      case 0x1058a54:  ret = Cibyl66.navigate_main_draw_route_number_1058a54(sp, a0, a1, a2, a3); break;
-      case 0x1058c68:  ret = Cibyl66.navigate_main_set_outline_1058c68(sp, a0, a1, a2, a3); break;
-      case 0x1058d50:  ret = Cibyl66.navigate_main_init_pens_1058d50(sp, a0, a1, a2, a3); break;
-      case 0x1058f8c:  ret = Cibyl66.navigate_main_initialize_1058f8c(sp, a0, a1, a2, a3); break;
-      case 0x10592b4:  ret = Cibyl66.navigation_guidance_off_10592b4(sp, a0, a1, a2, a3); break;
-      case 0x10592e8:  ret = Cibyl66.navigation_guidance_on_10592e8(sp, a0, a1, a2, a3); break;
-      case 0x105931c:  ret = Cibyl66.toggle_navigation_guidance_105931c(sp, a0, a1, a2, a3); break;
-      case 0x1059398:  ret = Cibyl66.navigate_main_shutdown_1059398(sp, a0, a1, a2, a3); break;
-      case 0x105944c:  ret = Cibyl66.navigate_main_stop_navigation_105944c(sp, a0, a1, a2, a3); break;
-      case 0x10594c4:  ret = Cibyl66.navigate_update_10594c4(sp, a0, a1, a2, a3); break;
-      case 0x1059f6c:  ret = Cibyl67.navigate_main_stop_navigation_menu_1059f6c(sp, a0, a1, a2, a3); break;
-      case 0x1059fa4:  ret = Cibyl67.navigate_main_update_route_1059fa4(sp, a0, a1, a2, a3); break;
-      case 0x1059ff8:  ret = Cibyl67.navigate_update_next_1059ff8(sp, a0, a1, a2, a3); break;
-      case 0x105a23c:  ret = Cibyl67.navigate_main_get_distance_str_105a23c(sp, a0, a1, a2, a3); break;
-      case 0x105a3f4:  ret = Cibyl67.navigate_main_format_messages_105a3f4(sp, a0, a1, a2, a3); break;
-      case 0x105a610:  ret = Cibyl67.T_391_105a610(sp, a0, a1, a2, a3); break;
-      case 0x105abb8:  ret = Cibyl67.navigate_main_recalc_route_105abb8(sp, a0, a1, a2, a3); break;
-      case 0x105b174:  ret = Cibyl67.navigate_main_on_segment_ver_mismatch_105b174(sp, a0, a1, a2, a3); break;
-      case 0x105b2a4:  ret = Cibyl68.navigate_main_on_suggest_reroute_105b2a4(sp, a0, a1, a2, a3); break;
-      case 0x105b424:  ret = Cibyl68.navigate_get_next_line_105b424(sp, a0, a1, a2, a3); break;
-      case 0x105bd58:  ret = Cibyl68.navigate_main_on_route_105bd58(sp, a0, a1, a2, a3); break;
-      case 0x105c1a4:  ret = Cibyl68.navigate_main_on_segments_105c1a4(sp, a0, a1, a2, a3); break;
-      case 0x105c348:  ret = Cibyl68.navigate_main_calc_route_105c348(sp, a0, a1, a2, a3); break;
-      case 0x105c960:  ret = Cibyl69.navigate_main_route_105c960(sp, a0, a1, a2, a3); break;
-      case 0x105c99c:  ret = Cibyl69.navigate_resume_navigation_105c99c(sp, a0, a1, a2, a3); break;
-      case 0x105ca20:  ret = Cibyl69.navigate_main_login_cb_105ca20(sp, a0, a1, a2, a3); break;
-      case 0x105ca84:  ret = Cibyl69.main_navigator_105ca84(sp, a0, a1, a2, a3); break;
-      case 0x105cb5c:  ret = Cibyl69.navigate_instr_has_more_connections_105cb5c(sp, a0, a1, a2, a3); break;
-      case 0x105cc80:  ret = Cibyl69.navigate_instr_calc_azymuth_105cc80(sp, a0, a1, a2, a3); break;
-      case 0x105cdfc:  ret = Cibyl69.navigate_instr_fill_segment_105cdfc(sp, a0, a1, a2, a3); break;
-      case 0x105cf14:  ret = Cibyl69.navigate_instr_check_neighbours_105cf14(sp, a0, a1, a2, a3); break;
-      case 0x105d2c0:  ret = Cibyl69.navigate_instr_calc_cross_time_105d2c0(sp, a0, a1, a2, a3); break;
-      case 0x105d454:  ret = Cibyl69.navigate_instr_calc_length_105d454(sp, a0, a1, a2, a3); break;
-      case 0x105d4ec:  ret = Cibyl69.navigate_instr_fix_line_end_105d4ec(sp, a0, a1, a2, a3); break;
-      case 0x105d848:  ret = Cibyl69.navigate_instr_prepare_segments_105d848(sp, a0, a1, a2, a3); break;
-      case 0x105e28c:  ret = Cibyl70.navigate_bar_is_hidden_105e28c(); break;
-      case 0x105e29c:  ret = Cibyl70.navigate_bar_set_instruction_105e29c( a0); break;
-      case 0x105e2a8:  ret = Cibyl70.navigate_bar_set_next_instruction_105e2a8( a0); break;
-      case 0x105e2b4:  ret = Cibyl70.navigate_bar_set_exit_105e2b4( a0); break;
-      case 0x105e2c0:  ret = Cibyl70.navigate_bar_set_next_exit_105e2c0( a0); break;
-      case 0x105e2cc:  ret = Cibyl70.navigate_bar_set_distance_105e2cc( a0); break;
-      case 0x105e2d8:  ret = Cibyl70.navigate_bar_set_next_distance_105e2d8( a0); break;
-      case 0x105e2e4:  ret = Cibyl70.navigate_bar_set_mode_105e2e4( a0); break;
-      case 0x105e304:  ret = Cibyl70.navigate_bar_draw_105e304(sp, a0, a1, a2, a3); break;
-      case 0x105e520:  ret = Cibyl70.navigate_bar_set_street_105e520(sp, a0, a1, a2, a3); break;
-      case 0x105e56c:  ret = Cibyl70.navigate_bar_draw_instruction_105e56c(sp, a0, a1, a2, a3); break;
-      case 0x105e638:  ret = Cibyl70.navigate_bar_align_text_105e638(sp, a0, a1, a2, a3); break;
-      case 0x105e838:  ret = Cibyl70.navigate_bar_draw_exit_105e838(sp, a0, a1, a2, a3); break;
-      case 0x105e918:  ret = Cibyl70.navigate_bar_draw_ETA_105e918(sp, a0, a1, a2, a3); break;
-      case 0x105eb04:  ret = Cibyl70.navigate_bar_draw_distance_to_destination_105eb04(sp, a0, a1, a2, a3); break;
-      case 0x105ed90:  ret = Cibyl70.navigate_bar_draw_time_to_destination_105ed90(sp, a0, a1, a2, a3); break;
-      case 0x105eff4:  ret = Cibyl70.CreateBgImage_105eff4(sp, a0, a1, a2, a3); break;
-      case 0x105f0a0:  ret = Cibyl70.navigate_bar_resize_105f0a0(sp, a0, a1, a2, a3); break;
-      case 0x105f3a4:  ret = Cibyl70.navigate_bar_initialize_105f3a4(sp, a0, a1, a2, a3); break;
-      case 0x105f51c:  ret = Cibyl71.T_159_105f51c(sp, a0, a1, a2, a3); break;
-      case 0x105f854:  ret = Cibyl71.navigate_bar_after_refresh_105f854(sp, a0, a1, a2, a3); break;
-      case 0x105fdf0:  ret = Cibyl71.navigate_zoom_update_105fdf0( a0, a1, a2, a3); break;
-      case 0x105feb4:  ret = Cibyl71.navigate_zoom_get_scale_105feb4(); break;
-      case 0x105fee4:  ret = Cibyl71.navigate_plugin_register_105fee4(sp, a0, a1, a2, a3); break;
-      case 0x105ff08:  ret = Cibyl71.navigate_traffic_refresh_105ff08(sp, a0, a1, a2, a3); break;
-      case 0x105ff4c:  ret = Cibyl71.navigate_traffic_override_pen_105ff4c(sp, a0, a1, a2, a3); break;
-      case 0x1060280:  ret = Cibyl71.navigate_traffic_display_1060280(sp, a0, a1, a2, a3); break;
-      case 0x10602d8:  ret = Cibyl71.create_pens_10602d8(sp, a0, a1, a2, a3); break;
-      case 0x10603d0:  ret = Cibyl71.navigate_traffic_initialize_10603d0(sp, a0, a1, a2, a3); break;
-      case 0x10604b4:  ret = Cibyl71.create_pens_cb_10604b4(sp, a0, a1, a2, a3); break;
-      case 0x10604d4:  ret = Cibyl71.navigate_traffic_adjust_layer_10604d4(sp, a0, a1, a2, a3); break;
-      case 0x1060888:  ret = Cibyl71.button_callback_1060888(sp, a0, a1, a2, a3); break;
-      case 0x106091c:  ret = Cibyl71.free_cache_slot_106091c(sp, a0, a1, a2, a3); break;
-      case 0x1060998:  ret = Cibyl71.navigate_graph_clear_1060998(sp, a0, a1, a2, a3); break;
-      case 0x1060a8c:  ret = Cibyl72.extend_segment_1060a8c(sp, a0, a1, a2, a3); break;
-      case 0x1060b0c:  ret = Cibyl72.T_88_1060b0c(sp, a0, a1, a2, a3); break;
-      case 0x1060b50:  ret = Cibyl72.get_square_graph_1060b50(sp, a0, a1, a2, a3); break;
-      case 0x106104c:  ret = Cibyl72.get_connected_segments_106104c(sp, a0, a1, a2, a3); break;
-      case 0x106131c:  ret = Cibyl72.navigate_cost_use_traffic_106131c(); break;
-      case 0x1061324:  ret = Cibyl72.navigate_cost_reset_1061324(); break;
-      case 0x1061340:  ret = Cibyl72.navigate_cost_isPalestinianOptionEnabled_1061340(sp, a0, a1, a2, a3); break;
-      case 0x106136c:  ret = Cibyl72.navigate_cost_type_106136c(sp, a0, a1, a2, a3); break;
-      case 0x10613a0:  ret = Cibyl72.navigate_cost_get_10613a0(sp, a0, a1, a2, a3); break;
-      case 0x10613dc:  ret = Cibyl72.navigate_cost_allow_unknowns_10613dc(sp, a0, a1, a2, a3); break;
-      case 0x1061408:  ret = Cibyl72.navigate_cost_avoid_palestinian_roads_1061408(sp, a0, a1, a2, a3); break;
-      case 0x1061434:  ret = Cibyl72.navigate_cost_avoid_trails_1061434(sp, a0, a1, a2, a3); break;
-      case 0x1061488:  ret = Cibyl72.navigate_cost_prefer_unknown_directions_1061488(sp, a0, a1, a2, a3); break;
-      case 0x10614b4:  ret = Cibyl72.navigate_cost_avoid_toll_roads_10614b4(sp, a0, a1, a2, a3); break;
-      case 0x10614e0:  ret = Cibyl72.navigate_cost_avoid_primaries_10614e0(sp, a0, a1, a2, a3); break;
-      case 0x106150c:  ret = Cibyl72.navigate_cost_prefer_same_street_106150c(sp, a0, a1, a2, a3); break;
-      case 0x1061538:  ret = Cibyl72.navigate_cost_initialize_1061538(sp, a0, a1, a2, a3); break;
-      case 0x106173c:  ret = Cibyl72.save_changes_106173c(sp, a0, a1, a2, a3); break;
-      case 0x1061864:  ret = Cibyl72.on_save_1061864(sp, a0, a1, a2, a3); break;
-      case 0x10618a4:  ret = Cibyl72.on_close_dialog_10618a4(sp, a0, a1, a2, a3); break;
-      case 0x10618e4:  ret = Cibyl72.calc_penalty_10618e4(sp, a0, a1, a2, a3); break;
-      case 0x10619bc:  ret = Cibyl72.cost_fastest_traffic_10619bc(sp, a0, a1, a2, a3); break;
-      case 0x1061d20:  ret = Cibyl73.navigate_cost_time_1061d20(sp, a0, a1, a2, a3); break;
-      case 0x1061d4c:  ret = Cibyl73.cost_shortest_1061d4c(sp, a0, a1, a2, a3); break;
-      case 0x1061dd0:  ret = Cibyl73.cost_fastest_1061dd0(sp, a0, a1, a2, a3); break;
-      case 0x1061ec0:  ret = Cibyl73.T_82_1061ec0(sp, a0, a1, a2, a3); break;
-      case 0x1061f0c:  ret = Cibyl73.cost_preferences_1061f0c(sp, a0, a1, a2, a3); break;
-      case 0x106299c:  ret = Cibyl73.navigate_route_reload_data_106299c(); break;
-      case 0x10629a4:  ret = Cibyl73.navigate_route_load_data_10629a4(); break;
-      case 0x10629ac:  ret = Cibyl73.make_path_10629ac(sp, a0, a1, a2, a3); break;
-      case 0x1062b34:  ret = Cibyl73.find_prev_1062b34(sp, a0, a1, a2, a3); break;
-      case 0x1062c24:  ret = Cibyl73.make_queue_1062c24(sp, a0, a1, a2, a3); break;
-      case 0x1062c70:  ret = Cibyl73.astar_1062c70(sp, a0, a1, a2, a3); break;
-      case 0x106354c:  ret = Cibyl74.navigate_route_get_segments_106354c(sp, a0, a1, a2, a3); break;
-      case 0x1063ae8:  ret = Cibyl74.verify_route_id_1063ae8(sp, a0, a1, a2, a3); break;
-      case 0x1063bd0:  ret = Cibyl74.on_suggest_reroute_1063bd0(sp, a0, a1, a2, a3); break;
-      case 0x1063d88:  ret = Cibyl74.verify_alt_id_1063d88(sp, a0, a1, a2, a3); break;
-      case 0x1063eb4:  ret = Cibyl74.free_result_1063eb4(sp, a0, a1, a2, a3); break;
-      case 0x1063f64:  ret = Cibyl74.navigate_route_free_context_1063f64(sp, a0, a1, a2, a3); break;
-      case 0x1063fc0:  ret = Cibyl74.navigate_route_init_context_1063fc0(sp, a0, a1, a2, a3); break;
-      case 0x1064038:  ret = Cibyl74.navigate_route_cancel_request_1064038(sp, a0, a1, a2, a3); break;
-      case 0x1064074:  ret = Cibyl74.navigate_route_select_1064074(sp, a0, a1, a2, a3); break;
-      case 0x10641b8:  ret = Cibyl74.routing_error_10641b8(sp, a0, a1, a2, a3); break;
-      case 0x1064224:  ret = Cibyl74.navigate_route_request_1064224(sp, a0, a1, a2, a3); break;
-      case 0x1064714:  ret = Cibyl75.on_routing_response_code_1064714(sp, a0, a1, a2, a3); break;
-      case 0x106491c:  ret = Cibyl75.on_route_points_106491c(sp, a0, a1, a2, a3); break;
-      case 0x1064cfc:  ret = Cibyl75.request_tile_1064cfc(sp, a0, a1, a2, a3); break;
-      case 0x1064dac:  ret = Cibyl75.instrument_segments_1064dac(sp, a0, a1, a2, a3); break;
-      case 0x1065648:  ret = Cibyl75.on_route_segments_1065648(sp, a0, a1, a2, a3); break;
-      case 0x1066164:  ret = Cibyl76.instrument_segments_cb_1066164(sp, a0, a1, a2, a3); break;
-      case 0x10661e4:  ret = Cibyl76.on_routing_response_10661e4(sp, a0, a1, a2, a3); break;
-      case 0x106674c:  ret = Cibyl76.fh_minkey_106674c( a0); break;
-      case 0x1066768:  ret = Cibyl76.fh_min_1066768( a0); break;
-      case 0x1066790:  ret = Cibyl76.fh_find_data_el_1066790(sp, a0, a1, a2, a3); break;
-      case 0x1066880:  ret = Cibyl76.fh_cut_1066880( a0, a1, a2, a3); break;
-      case 0x1066938:  ret = Cibyl76.fh_compare_1066938(sp, a0, a1, a2, a3); break;
-      case 0x1066998:  ret = Cibyl76.fh_insertel_1066998(sp, a0, a1, a2, a3); break;
-      case 0x1066a84:  ret = Cibyl76.fh_extractminel_1066a84(sp, a0, a1, a2, a3); break;
-      case 0x1066ed8:  ret = Cibyl76.fh_extractmin_1066ed8(sp, a0, a1, a2, a3); break;
-      case 0x1066f2c:  ret = Cibyl76.fh_replacekeydata_1066f2c(sp, a0, a1, a2, a3); break;
-      case 0x1067060:  ret = Cibyl76.fh_replacedata_1067060(sp, a0, a1, a2, a3); break;
-      case 0x1067088:  ret = Cibyl76.fh_replacekey_1067088(sp, a0, a1, a2, a3); break;
-      case 0x1067114:  ret = Cibyl76.fhe_newelem_1067114(sp, a0, a1, a2, a3); break;
-      case 0x10671c4:  ret = Cibyl76.fh_insertkey_10671c4(sp, a0, a1, a2, a3); break;
-      case 0x1067274:  ret = Cibyl76.fh_makekeyheap_1067274(sp, a0, a1, a2, a3); break;
-      case 0x10672cc:  ret = Cibyl76.fh_destroyheap_10672cc(sp, a0, a1, a2, a3); break;
-      case 0x10673e8:  ret = Cibyl76.fh_deleteheap_10673e8(sp, a0, a1, a2, a3); break;
-      case 0x1067434:  ret = Cibyl76.ebuffer_get_buffer_1067434( a0); break;
-      case 0x10674e4:  ret = Cibyl76.ebuffer_init_10674e4(sp, a0, a1, a2, a3); break;
-      case 0x1067508:  ret = Cibyl76.ebuffer_free_1067508(sp, a0, a1, a2, a3); break;
-      case 0x106755c:  ret = Cibyl76.ebuffer_alloc_106755c(sp, a0, a1, a2, a3); break;
-      case 0x106762c:  ret = Cibyl77.socket_async_receive_106762c(sp, a0, a1, a2, a3); break;
-      case 0x1067774:  ret = Cibyl77.on_socket_has_data_1067774(sp, a0, a1, a2, a3); break;
-      case 0x1067844:  ret = Cibyl77.socket_async_receive_end_1067844(sp, a0, a1, a2, a3); break;
-      case 0x1067b64:  ret = Cibyl77.PackNetworkString_1067b64( a0, a1, a2, a3); break;
-      case 0x1067cd0:  ret = Cibyl77.ToLowerN_1067cd0(sp, a0, a1, a2, a3); break;
-      case 0x1068098:  ret = Cibyl77.AppendPrefix_ShiftOriginalRight_1068098(sp, a0, a1, a2, a3); break;
-      case 0x1068100:  ret = Cibyl77.SkipChars_1068100(sp, a0, a1, a2, a3); break;
-      case 0x10681a8:  ret = Cibyl77.EatChars_10681a8(sp, a0, a1, a2, a3); break;
-      case 0x1068250:  ret = Cibyl77.ExtractNetworkString_1068250(sp, a0, a1, a2, a3); break;
-      case 0x1068434:  ret = Cibyl77.ExtractString_1068434(sp, a0, a1, a2, a3); break;
-      case 0x106855c:  ret = Cibyl77.ReadIntFromString_106855c(sp, a0, a1, a2, a3); break;
-      case 0x10686b8:  ret = Cibyl77.ReadInt64FromString_10686b8(sp, a0, a1, a2, a3); break;
-      case 0x106885c:  ret = Cibyl77.ReadDoubleFromString_106885c(sp, a0, a1, a2, a3); break;
-      case 0x1068a88:  ret = Cibyl77.WSA_ExtractParams_1068a88(sp, a0, a1, a2, a3); break;
-      case 0x1068c74:  ret = Cibyl77.wstq_is_empty_1068c74( a0); break;
-      case 0x1068c80:  ret = Cibyl77.wstq_enqueue_1068c80(sp, a0, a1, a2, a3); break;
-      case 0x1068d9c:  ret = Cibyl77.wstq_init_1068d9c(sp, a0, a1, a2, a3); break;
-      case 0x1068dc0:  Cibyl77.wstq_item_init_1068dc0( a0); break;
-      case 0x1068ddc:  ret = Cibyl77.wstq_dequeue_1068ddc(sp, a0, a1, a2, a3); break;
-      case 0x1068ee4:  ret = Cibyl78.wstq_item_release_1068ee4(sp, a0, a1, a2, a3); break;
-      case 0x1068f24:  ret = Cibyl78.wstq_clear_1068f24(sp, a0, a1, a2, a3); break;
-      case 0x1068f8c:  ret = Cibyl78.wst_get_trans_state_1068f8c( a0); break;
-      case 0x1068f98:  ret = Cibyl78.wst_stop_trans_1068f98( a0); break;
-      case 0x1068fb4:  ret = Cibyl78.websvc_trans_getLastNetConnectRes_1068fb4(); break;
-      case 0x1068fc4:  ret = Cibyl78.http_response_status_init_1068fc4(sp, a0, a1, a2, a3); break;
-      case 0x1068fe8:  ret = Cibyl78.http_response_status_load_1068fe8(sp, a0, a1, a2, a3); break;
-      case 0x106912c:  ret = Cibyl78.on_data_received__106912c(sp, a0, a1, a2, a3); break;
-      case 0x106988c:  ret = Cibyl78.on_socket_connected__106988c(sp, a0, a1, a2, a3); break;
-      case 0x1069ab8:  ret = Cibyl78.wstq_Add_1069ab8(sp, a0, a1, a2, a3); break;
-      case 0x1069bd0:  ret = Cibyl78.wst_queue_clear_1069bd0(sp, a0, a1, a2, a3); break;
-      case 0x1069bf0:  ret = Cibyl78.wst_context_reset_1069bf0(sp, a0, a1, a2, a3); break;
-      case 0x1069c88:  ret = Cibyl78.wst_context_load_1069c88(sp, a0, a1, a2, a3); break;
-      case 0x1069ce0:  ret = Cibyl78.wst_start_trans__int_1069ce0(sp, a0, a1, a2, a3); break;
-      case 0x1069ec8:  ret = Cibyl78.wst_start_trans_1069ec8(sp, a0, a1, a2, a3); break;
-      case 0x106a08c:  ret = Cibyl78.wst_process_queue_item_106a08c(sp, a0, a1, a2, a3); break;
-      case 0x106a168:  ret = Cibyl79.wst_context_init_106a168(sp, a0, a1, a2, a3); break;
-      case 0x106a1ac:  ret = Cibyl79.wst_init_106a1ac(sp, a0, a1, a2, a3); break;
-      case 0x106a234:  ret = Cibyl79.wst_context_free_106a234(sp, a0, a1, a2, a3); break;
-      case 0x106a2a0:  ret = Cibyl79.wst_transaction_completed_106a2a0(sp, a0, a1, a2, a3); break;
-      case 0x106a35c:  ret = Cibyl79.on_data_received_106a35c(sp, a0, a1, a2, a3); break;
-      case 0x106a3c8:  ret = Cibyl79.on_socket_connected_106a3c8(sp, a0, a1, a2, a3); break;
-      case 0x106a420:  ret = Cibyl79.wst_watchdog_106a420(sp, a0, a1, a2, a3); break;
-      case 0x106a494:  ret = Cibyl79.wst_term_106a494(sp, a0, a1, a2, a3); break;
-      case 0x106a4f4:  ret = Cibyl79.WDF_FormatHttpDate_106a4f4(sp, a0, a1, a2, a3); break;
-      case 0x106a58c:  ret = Cibyl79.WDF_TimeFromModifiedSince_106a58c(sp, a0, a1, a2, a3); break;
-      case 0x106a5d0:  ret = Cibyl79.WDF_FormatHttpIfModifiedSince_106a5d0(sp, a0, a1, a2, a3); break;
-      case 0x106a638:  ret = Cibyl79.cyclic_buffer_get_unprocessed_data_106a638( a0); break;
-      case 0x106a644:  ret = Cibyl79.cyclic_buffer_update_processed_data_106a644(sp, a0, a1, a2, a3); break;
-      case 0x106a690:  ret = Cibyl79.cyclic_buffer_recycle_106a690(sp, a0, a1, a2, a3); break;
-      case 0x106a724:  ret = Cibyl79.cyclic_buffer_init_106a724(sp, a0, a1, a2, a3); break;
-      case 0x106a770:  ret = Cibyl79.mkgmtime_106a770(sp, a0, a1, a2, a3); break;
-      case 0x106a9fc:  ret = Cibyl79.Realtime_NotifyOnLoginChanged_106a9fc( a0); break;
-      case 0x106aaa0:  ret = Cibyl79.Realtime_WazerNearbyState_106aaa0(); break;
-      case 0x106aab0:  ret = Cibyl79.Realtime_SendTrafficInfo_106aab0(); break;
-      case 0x106aab8:  ret = Cibyl79.Realtime_IsLoggedIn_106aab8(); break;
-      case 0x106aad8:  ret = Cibyl79.RealTime_GetMyRanking_106aad8(); break;
-      case 0x106aae8:  ret = Cibyl79.RealTime_SetMapDisplayed_106aae8( a0); break;
-      case 0x106ab10:  ret = Cibyl79.Realtime_GetServerCookie_106ab10(); break;
-      case 0x106ab1c:  ret = Cibyl79.Realtime_GetServerId_106ab1c(); break;
-      case 0x106ab2c:  ret = Cibyl79.Realtime_AddonState_106ab2c(); break;
-      case 0x106ab48:  ret = Cibyl79.onRandomConfirm_106ab48(sp, a0, a1, a2, a3); break;
-      case 0x106ab70:  ret = Cibyl79.Realtime_IsAnonymous_106ab70(sp, a0, a1, a2, a3); break;
-      case 0x106ab9c:  ret = Cibyl79.Realtime_AnonymousMsg_106ab9c(sp, a0, a1, a2, a3); break;
-      case 0x106abe0:  ret = Cibyl79.Realtime_GetNickName_106abe0(sp, a0, a1, a2, a3); break;
-      case 0x106ac04:  ret = Cibyl79.RealTime_GetUserName_106ac04(sp, a0, a1, a2, a3); break;
-      case 0x106ac28:  ret = Cibyl79.RT_GetWebServiceAddress_106ac28(sp, a0, a1, a2, a3); break;
-      case 0x106ac4c:  ret = Cibyl79.Realtime_AllowPing_106ac4c(sp, a0, a1, a2, a3); break;
-      case 0x106ac80:  ret = Cibyl79.NameAndPasswordAlreadyFailedAuthentication_106ac80(sp, a0, a1, a2, a3); break;
-      case 0x106ad10:  ret = Cibyl79.GetEnableDisableState_106ad10(sp, a0, a1, a2, a3); break;
-      case 0x106ad64:  ret = Cibyl79.Realtime_SaveLoginInfo_106ad64(sp, a0, a1, a2, a3); break;
-      case 0x106ade0:  ret = Cibyl79.Realtime_CheckDumpOfflineAfterCrash_106ade0(sp, a0, a1, a2, a3); break;
-      case 0x106ae44:  ret = Cibyl79.Realtime_Set_AllowPing_106ae44(sp, a0, a1, a2, a3); break;
-      case 0x106ae90:  ret = Cibyl79.Realtime_SetLoginNickname_106ae90(sp, a0, a1, a2, a3); break;
-      case 0x106aeb8:  ret = Cibyl79.Realtime_SetLoginPassword_106aeb8(sp, a0, a1, a2, a3); break;
-      case 0x106aee0:  ret = Cibyl79.Realtime_SetLoginUsername_106aee0(sp, a0, a1, a2, a3); break;
-      case 0x106af08:  ret = Cibyl79.Realtime_LoginDetailsInit_106af08(sp, a0, a1, a2, a3); break;
-      case 0x106af78:  ret = Cibyl79.Realtime_SetIsNewbieConfig_106af78(sp, a0, a1, a2, a3); break;
-      case 0x106afdc:  ret = Cibyl79.Realtime_SetIsNewbie_106afdc(sp, a0, a1, a2, a3); break;
-      case 0x106b014:  ret = Cibyl79.Realtime_set_random_user_106b014(sp, a0, a1, a2, a3); break;
-      case 0x106b044:  ret = Cibyl79.Realtime_IsNewbie_106b044(sp, a0, a1, a2, a3); break;
-      case 0x106b068:  ret = Cibyl79.Realtime_is_random_user_106b068(sp, a0, a1, a2, a3); break;
-      case 0x106b08c:  ret = Cibyl79.Realtime_RandomUserMsg_106b08c(sp, a0, a1, a2, a3); break;
-      case 0x106b0fc:  ret = Cibyl79.RecommentToFriend_106b0fc(sp, a0, a1, a2, a3); break;
-      case 0x106b138:  ret = Cibyl79.UpgradeVersion_106b138(sp, a0, a1, a2, a3); break;
-      case 0x106b1a0:  ret = Cibyl79.recommend_waze_dialog_callbak_106b1a0(sp, a0, a1, a2, a3); break;
-      case 0x106b1f4:  ret = Cibyl79.Realtime_NotifySplashUpdateTime_106b1f4(sp, a0, a1, a2, a3); break;
-      case 0x106b250:  ret = Cibyl79.ThereAreTooManyNetworkErrors_106b250(sp, a0, a1, a2, a3); break;
-      case 0x106b2f8:  ret = Cibyl79.Realtime_ExternalPoiNotifyOnNavigate_106b2f8(sp, a0, a1, a2, a3); break;
-      case 0x106b354:  ret = Cibyl79.Realtime_ExternalPoiNotifyOnPopUp_106b354(sp, a0, a1, a2, a3); break;
-      case 0x106b3b0:  ret = Cibyl79.Realtime_FacebookPermissions_106b3b0(sp, a0, a1, a2, a3); break;
-      case 0x106b428:  ret = Cibyl79.Realtime_ReportAbuse_106b428(sp, a0, a1, a2, a3); break;
-      case 0x106b4f0:  ret = Cibyl79.Realtime_CollectCustomBonus_106b4f0(sp, a0, a1, a2, a3); break;
-      case 0x106b580:  ret = Cibyl79.Realtime_CollectBonus_106b580(sp, a0, a1, a2, a3); break;
-      case 0x106b618:  ret = Cibyl80.Realtime_SelectRoute_106b618(sp, a0, a1, a2, a3); break;
-      case 0x106b68c:  ret = Cibyl80.Realtime_GetGeoConfig_106b68c(sp, a0, a1, a2, a3); break;
-      case 0x106b6cc:  ret = Cibyl80.Realtime_RequestRoute_106b6cc(sp, a0, a1, a2, a3); break;
-      case 0x106b848:  ret = Cibyl80.Realtime_ReportOnNavigation_106b848(sp, a0, a1, a2, a3); break;
-      case 0x106b994:  ret = Cibyl80.LoginDetailsChanged_106b994(sp, a0, a1, a2, a3); break;
-      case 0x106ba8c:  ret = Cibyl80.Realtime_ResetLoginState_106ba8c(sp, a0, a1, a2, a3); break;
-      case 0x106bb20:  ret = Cibyl80.Login_106bb20(sp, a0, a1, a2, a3); break;
-      case 0x106bc20:  ret = Cibyl80.Realtime_Relogin_106bc20(sp, a0, a1, a2, a3); break;
-      case 0x106bc58:  ret = Cibyl80.OnMapMoved_106bc58(sp, a0, a1, a2, a3); break;
-      case 0x106bcfc:  ret = Cibyl80.Realtime_NotifyOnLogin_106bcfc(sp, a0, a1, a2, a3); break;
-      case 0x106bd84:  ret = Cibyl80.Realtime_SessionDetailsSave_106bd84(sp, a0, a1, a2, a3); break;
-      case 0x106bdd4:  ret = Cibyl80.RealTime_WarningInit_106bdd4(sp, a0, a1, a2, a3); break;
-      case 0x106bdfc:  ret = Cibyl80.Realtime_LoginChangedCallback_106bdfc(sp, a0, a1, a2, a3); break;
-      case 0x106be44:  ret = Cibyl80.Realtime_LoginCallback_106be44(sp, a0, a1, a2, a3); break;
-      case 0x106bebc:  ret = Cibyl80.TestLoginDetailsCompleted_106bebc(sp, a0, a1, a2, a3); break;
-      case 0x106bf14:  ret = Cibyl80.TestLoginDetails_106bf14(sp, a0, a1, a2, a3); break;
-      case 0x106bff0:  ret = Cibyl80.Realtime_VerifyLoginDetails_106bff0(sp, a0, a1, a2, a3); break;
-      case 0x106c07c:  ret = Cibyl80.RemoveWazerNearby_106c07c(sp, a0, a1, a2, a3); break;
-      case 0x106c0e4:  ret = Cibyl80.wazer_nearby_timeout_106c0e4(sp, a0, a1, a2, a3); break;
-      case 0x106c110:  ret = Cibyl80.RealTime_Auth_106c110(sp, a0, a1, a2, a3); break;
-      case 0x106c170:  ret = Cibyl80.RealTimeLoginState_106c170(sp, a0, a1, a2, a3); break;
-      case 0x106c1d4:  ret = Cibyl80.Realtime_UpdateProfile_106c1d4(sp, a0, a1, a2, a3); break;
-      case 0x106c230:  ret = Cibyl80.Realtime_CreateAccount_106c230(sp, a0, a1, a2, a3); break;
-      case 0x106c28c:  ret = Cibyl80.Realtime_TrafficAlertFeedback_106c28c(sp, a0, a1, a2, a3); break;
-      case 0x106c2c4:  ret = Cibyl80.Realtime_Report_Segments_106c2c4(sp, a0, a1, a2, a3); break;
-      case 0x106c3bc:  ret = Cibyl80.Realtime_Editor_ExportSegments_106c3bc(sp, a0, a1, a2, a3); break;
-      case 0x106c460:  ret = Cibyl80.ReportOneMarker_106c460(sp, a0, a1, a2, a3); break;
-      case 0x106c524:  ret = Cibyl80.Realtime_Report_Markers_106c524(sp, a0, a1, a2, a3); break;
-      case 0x106c5f8:  ret = Cibyl80.Realtime_Editor_ExportMarkers_106c5f8(sp, a0, a1, a2, a3); break;
-      case 0x106c69c:  ret = Cibyl80.Realtime_Remove_Alert_106c69c(sp, a0, a1, a2, a3); break;
-      case 0x106c6cc:  ret = Cibyl80.SendMessage_CachedMapProblems_106c6cc(sp, a0, a1, a2, a3); break;
-      case 0x106c814:  ret = Cibyl80.Realtime_ReportMapProblem_106c814(sp, a0, a1, a2, a3); break;
-      case 0x106c928:  ret = Cibyl81.Realtime_SessionDetailsInit_106c928(sp, a0, a1, a2, a3); break;
-      case 0x106c9a0:  ret = Cibyl81.RealTime_Warning_106c9a0(sp, a0, a1, a2, a3); break;
-      case 0x106ca00:  ret = Cibyl81.Realtime_Alert_ReportAtLocation_106ca00(sp, a0, a1, a2, a3); break;
-      case 0x106caa0:  ret = Cibyl81.Realtime_Post_Alert_Comment_106caa0(sp, a0, a1, a2, a3); break;
-      case 0x106cb10:  ret = Cibyl81.Realtime_TripServer_FindTrip_106cb10(sp, a0, a1, a2, a3); break;
-      case 0x106cb40:  ret = Cibyl81.Realtime_TripServer_DeletePOI_106cb40(sp, a0, a1, a2, a3); break;
-      case 0x106cb70:  ret = Cibyl81.Realtime_TripServer_GetNumPOIs_106cb70(sp, a0, a1, a2, a3); break;
-      case 0x106cb9c:  ret = Cibyl81.Realtime_TripServer_GetPOIs_106cb9c(sp, a0, a1, a2, a3); break;
-      case 0x106cbc8:  ret = Cibyl81.Realtime_TripServer_CreatePOI_106cbc8(sp, a0, a1, a2, a3); break;
-      case 0x106cc60:  ret = Cibyl81.Realtime_FoursquareCheckin_106cc60(sp, a0, a1, a2, a3); break;
-      case 0x106cc98:  ret = Cibyl81.Realtime_FoursquareSearch_106cc98(sp, a0, a1, a2, a3); break;
-      case 0x106ccc8:  ret = Cibyl81.Realtime_FoursquareConnect_106ccc8(sp, a0, a1, a2, a3); break;
-      case 0x106cd0c:  ret = Cibyl81.Realtime_TwitterConnect_106cd0c(sp, a0, a1, a2, a3); break;
-      case 0x106cd58:  ret = Cibyl81.Realtime_SendSMS_106cd58(sp, a0, a1, a2, a3); break;
-      case 0x106cd88:  ret = Cibyl81.keyboard_callback_106cd88(sp, a0, a1, a2, a3); break;
-      case 0x106cdd8:  ret = Cibyl81.Realtime_PinqWazer_106cdd8(sp, a0, a1, a2, a3); break;
-      case 0x106ce68:  ret = Cibyl81.Realtime_Report_Alert_106ce68(sp, a0, a1, a2, a3); break;
-      case 0x106cf34:  ret = Cibyl81.OnRemoveUser_106cf34(sp, a0, a1, a2, a3); break;
-      case 0x106d09c:  ret = Cibyl81.OnMoveUser_106d09c(sp, a0, a1, a2, a3); break;
-      case 0x106d298:  ret = Cibyl81.OnAddUser_106d298(sp, a0, a1, a2, a3); break;
-      case 0x106d748:  ret = Cibyl81.OnUserShortClick_106d748(sp, a0, a1, a2, a3); break;
-      case 0x106d774:  ret = Cibyl81.Realtime_ShowWazerNearby_106d774(sp, a0, a1, a2, a3); break;
-      case 0x106d7c0:  ret = Cibyl81.realtime_after_refresh_106d7c0(sp, a0, a1, a2, a3); break;
-      case 0x106d928:  ret = Cibyl81.OnKeepAliveTimer_Realtime_106d928(sp, a0, a1, a2, a3); break;
-      case 0x106d980:  ret = Cibyl81.Realtime_RandomUserRegister_106d980(sp, a0, a1, a2, a3); break;
-      case 0x106d9ac:  ret = Cibyl81.Realtime_ResetTransactionState_106d9ac(sp, a0, a1, a2, a3); break;
-      case 0x106d9e8:  ret = Cibyl81.OnAsyncOperationCompleted_GetGeoConfig_106d9e8(sp, a0, a1, a2, a3); break;
-      case 0x106da40:  ret = Cibyl81.OnAsyncOperationCompleted_Register_106da40(sp, a0, a1, a2, a3); break;
-      case 0x106db7c:  ret = Cibyl81.Realtime_SendCurrenScreenEdges_106db7c(sp, a0, a1, a2, a3); break;
-      case 0x106dc3c:  ret = Cibyl82.Realtime_SendCurrentViewDimentions_106dc3c(sp, a0, a1, a2, a3); break;
-      case 0x106ddb4:  ret = Cibyl82.OnTimePassedFromLastMapDragEvent_106ddb4(sp, a0, a1, a2, a3); break;
-      case 0x106de30:  ret = Cibyl82.SendMessage_UserPoints_106de30(sp, a0, a1, a2, a3); break;
-      case 0x106ded8:  ret = Cibyl82.SendMessage_Location_106ded8(sp, a0, a1, a2, a3); break;
-      case 0x106df68:  ret = Cibyl82.OnLocation_106df68(sp, a0, a1, a2, a3); break;
-      case 0x106dfc8:  ret = Cibyl82.SendMessage_SetMood_106dfc8(sp, a0, a1, a2, a3); break;
-      case 0x106e03c:  ret = Cibyl82.OnMoodChanged_106e03c(sp, a0, a1, a2, a3); break;
-      case 0x106e068:  ret = Cibyl82.SendMessage_SetMyVisability_106e068(sp, a0, a1, a2, a3); break;
-      case 0x106e298:  ret = Cibyl82.OnSettingsChanged_VisabilityGroup_106e298(sp, a0, a1, a2, a3); break;
-      case 0x106e2c4:  ret = Cibyl82.SendMessage_At_106e2c4(sp, a0, a1, a2, a3); break;
-      case 0x106e48c:  ret = Cibyl82.SendMessage_CreateNewRoads_106e48c(sp, a0, a1, a2, a3); break;
-      case 0x106e518:  ret = Cibyl82.SendMessage_GPSPath_106e518(sp, a0, a1, a2, a3); break;
-      case 0x106e560:  ret = Cibyl82.SendMessage_ExternalPoiDisplayed_106e560(sp, a0, a1, a2, a3); break;
-      case 0x106e590:  ret = Cibyl82.SendMessage_NodePath_106e590(sp, a0, a1, a2, a3); break;
-      case 0x106e830:  ret = Cibyl82.SendAllMessagesTogether_SendPart2_106e830(sp, a0, a1, a2, a3); break;
-      case 0x106eaec:  ret = Cibyl82.PerformVersionUpgrade_106eaec(sp, a0, a1, a2, a3); break;
-      case 0x106eb24:  ret = Cibyl82.OnMsgboxClosed_ShowSystemMessage_106eb24(sp, a0, a1, a2, a3); break;
-      case 0x106ec00:  ret = Cibyl82.Realtime_FullReset_106ec00(sp, a0, a1, a2, a3); break;
-      case 0x106ec78:  ret = Cibyl82.Realtime_Stop_106ec78(sp, a0, a1, a2, a3); break;
-      case 0x106ed70:  ret = Cibyl82.OnTransactionCompleted_106ed70(sp, a0, a1, a2, a3); break;
-      case 0x106f268:  ret = Cibyl83.OnAsyncOperationCompleted_ReportAbuse_106f268(sp, a0, a1, a2, a3); break;
-      case 0x106f2dc:  ret = Cibyl83.OnAsyncOperationCompleted_CollectBonus_106f2dc(sp, a0, a1, a2, a3); break;
-      case 0x106f350:  ret = Cibyl83.OnAsyncOperationCompleted_SelectRoute_106f350(sp, a0, a1, a2, a3); break;
-      case 0x106f3c4:  ret = Cibyl83.OnAsyncOperationCompleted_RequestRoute_106f3c4(sp, a0, a1, a2, a3); break;
-      case 0x106f438:  ret = Cibyl83.OnAsyncOperationCompleted_ReportOnNavigation_106f438(sp, a0, a1, a2, a3); break;
-      case 0x106f4ac:  ret = Cibyl83.OnTransactionCompleted_ReportSegments_106f4ac(sp, a0, a1, a2, a3); break;
-      case 0x106f520:  ret = Cibyl83.OnTransactionCompleted_ReportMarkers_106f520(sp, a0, a1, a2, a3); break;
-      case 0x106f594:  ret = Cibyl83.OnAsyncOperationCompleted_AllTogether_Part2_106f594(sp, a0, a1, a2, a3); break;
-      case 0x106f668:  ret = Cibyl83.OnAsyncOperationCompleted_AllTogether_Part1_106f668(sp, a0, a1, a2, a3); break;
-      case 0x106f73c:  ret = Cibyl83.OnAsyncOperationCompleted_MapDisplayed__only_106f73c(sp, a0, a1, a2, a3); break;
-      case 0x106f7b0:  ret = Cibyl83.OnAsyncOperationCompleted_UserPoints_106f7b0(sp, a0, a1, a2, a3); break;
-      case 0x106f814:  ret = Cibyl83.OnAsyncOperationCompleted_SetMood_106f814(sp, a0, a1, a2, a3); break;
-      case 0x106f86c:  ret = Cibyl83.OnAsyncOperationCompleted_NotifySplashUpdateTime_106f86c(sp, a0, a1, a2, a3); break;
-      case 0x106f8c8:  ret = Cibyl83.OnAsyncOperationCompleted_ExternalPoiNotifyOnNavigate_106f8c8(sp, a0, a1, a2, a3); break;
-      case 0x106f924:  ret = Cibyl83.OnAsyncOperationCompleted_ExternalPoiNotifyOnPopUp_106f924(sp, a0, a1, a2, a3); break;
-      case 0x106f980:  ret = Cibyl83.OnAsyncOperationCompleted_FacebookPermissions_106f980(sp, a0, a1, a2, a3); break;
-      case 0x106f9dc:  ret = Cibyl83.OnAsyncOperationCompleted_TripServer_106f9dc(sp, a0, a1, a2, a3); break;
-      case 0x106fa2c:  ret = Cibyl83.OnAsyncOperationCompleted_ReportMapProblem_106fa2c(sp, a0, a1, a2, a3); break;
-      case 0x106fa80:  ret = Cibyl83.OnAsyncOperationCompleted_PostComment_106fa80(sp, a0, a1, a2, a3); break;
-      case 0x106fad4:  ret = Cibyl83.OnAsyncOperationCompleted_Scoreboard_106fad4(sp, a0, a1, a2, a3); break;
-      case 0x106fb10:  ret = Cibyl83.OnAsyncOperationCompleted_Foursquare_106fb10(sp, a0, a1, a2, a3); break;
-      case 0x106fb4c:  ret = Cibyl83.OnAsyncOperationCompleted_TwitterConnect_106fb4c(sp, a0, a1, a2, a3); break;
-      case 0x106fba4:  ret = Cibyl83.OnAsyncOperationCompleted_SendSMS_106fba4(sp, a0, a1, a2, a3); break;
-      case 0x106fc14:  ret = Cibyl83.OnAsyncOperationCompleted_PingWazer_106fc14(sp, a0, a1, a2, a3); break;
-      case 0x106fc70:  ret = Cibyl83.OnAsyncOperationCompleted_ReportAlert_106fc70(sp, a0, a1, a2, a3); break;
-      case 0x106fce0:  ret = Cibyl83.OnAsyncOperationCompleted_ExternalPoiDisplayed_106fce0(sp, a0, a1, a2, a3); break;
-      case 0x106fd54:  ret = Cibyl83.OnAsyncOperationCompleted_CreateAccount_106fd54(sp, a0, a1, a2, a3); break;
-      case 0x106fd80:  ret = Cibyl83.OnAsyncOperationCompleted_NodePath_106fd80(sp, a0, a1, a2, a3); break;
-      case 0x106fe14:  ret = Cibyl83.OnAsyncOperationCompleted_GPSPath_106fe14(sp, a0, a1, a2, a3); break;
-      case 0x106ff0c:  ret = Cibyl83.OnAsyncOperationCompleted_CreateNewRoads_106ff0c(sp, a0, a1, a2, a3); break;
-      case 0x1070008:  ret = Cibyl83.OnAsyncOperationCompleted_MapDisplayed_1070008(sp, a0, a1, a2, a3); break;
-      case 0x1070100:  ret = Cibyl83.SendMessage_MapDisplyed_1070100(sp, a0, a1, a2, a3); break;
-      case 0x1070224:  ret = Cibyl83.SendAllMessagesTogether_BuildPacket_1070224(sp, a0, a1, a2, a3); break;
-      case 0x1070558:  ret = Cibyl84.SendAllMessagesTogether_SendPart1_1070558(sp, a0, a1, a2, a3); break;
-      case 0x10707e4:  ret = Cibyl84.SendAllMessagesTogether_10707e4(sp, a0, a1, a2, a3); break;
-      case 0x1070a7c:  ret = Cibyl84.OnTransactionCompleted_TestLoginDetails_Login_1070a7c(sp, a0, a1, a2, a3); break;
-      case 0x1070b10:  ret = Cibyl84.TransactionStarted_1070b10(sp, a0, a1, a2, a3); break;
-      case 0x1070b68:  ret = Cibyl84.StartTransaction_1070b68(sp, a0, a1, a2, a3); break;
-      case 0x1070c78:  ret = Cibyl84.OnTimer_Realtime_1070c78(sp, a0, a1, a2, a3); break;
-      case 0x1070fa0:  ret = Cibyl84.OnAsyncOperationCompleted_Login_1070fa0(sp, a0, a1, a2, a3); break;
-      case 0x1071058:  ret = Cibyl84.OnAsyncOperationCompleted_At_1071058(sp, a0, a1, a2, a3); break;
-      case 0x1071108:  ret = Cibyl84.OnAsyncOperationCompleted_SetVisability_1071108(sp, a0, a1, a2, a3); break;
-      case 0x10711dc:  ret = Cibyl84.OnAsyncOperationCompleted_AlertReport_10711dc(sp, a0, a1, a2, a3); break;
-      case 0x10712d4:  ret = Cibyl84.OnAsyncOperationCompleted_KeepAlive_10712d4(sp, a0, a1, a2, a3); break;
-      case 0x107132c:  ret = Cibyl84.OnAsyncOperationCompleted_AllTogether_107132c(sp, a0, a1, a2, a3); break;
-      case 0x107138c:  ret = Cibyl84.OnTransactionCompleted_LogoutAndStop_107138c(sp, a0, a1, a2, a3); break;
-      case 0x1071440:  ret = Cibyl84.Realtime_DecodeRefreshRateMilliseconds_1071440(sp, a0, a1, a2, a3); break;
-      case 0x1071500:  ret = Cibyl84.Realtime_GetKeepALiveRateRateinMilliseconds_1071500(sp, a0, a1, a2, a3); break;
-      case 0x1071588:  ret = Cibyl84.Realtime_GetRefreshRateinMilliseconds_1071588(sp, a0, a1, a2, a3); break;
-      case 0x10717ac:  ret = Cibyl84.Realtime_Start_10717ac(sp, a0, a1, a2, a3); break;
-      case 0x1071864:  ret = Cibyl85.OnDeviceEvent_1071864(sp, a0, a1, a2, a3); break;
-      case 0x1071a5c:  ret = Cibyl85.OnSettingsChanged_EnableDisable_1071a5c(sp, a0, a1, a2, a3); break;
-      case 0x1071abc:  ret = Cibyl85.Realtime_Initialize_1071abc(sp, a0, a1, a2, a3); break;
-      case 0x1071e5c:  ret = Cibyl85.RTNet_CreateAccount_1071e5c(sp, a0, a1, a2, a3); break;
-      case 0x1071ee8:  ret = Cibyl85.RTNet_GetTransactionState_1071ee8(sp, a0, a1, a2, a3); break;
-      case 0x1071f3c:  ret = Cibyl85.RTNet_AbortTransaction_1071f3c(sp, a0, a1, a2, a3); break;
-      case 0x1071f94:  ret = Cibyl85.RTNet_Watchdog_1071f94(sp, a0, a1, a2, a3); break;
-      case 0x1071fc0:  ret = Cibyl85.RTNet_TransactionQueue_ProcessSingleItem_1071fc0(sp, a0, a1, a2, a3); break;
-      case 0x1071ff4:  ret = Cibyl85.RTNet_TransactionQueue_Clear_1071ff4(sp, a0, a1, a2, a3); break;
-      case 0x1072020:  ret = Cibyl85.RTNet_Auth_BuildCommand_1072020(sp, a0, a1, a2, a3); break;
-      case 0x1072068:  ret = Cibyl85.format_ParamPair_string_1072068(sp, a0, a1, a2, a3); break;
-      case 0x1072250:  ret = Cibyl85.RTNet_ReportOneSegment_MaxLength_1072250(sp, a0, a1, a2, a3); break;
-      case 0x10723bc:  ret = Cibyl85.RTNet_RandomUserRegister_10723bc(sp, a0, a1, a2, a3); break;
-      case 0x1072468:  ret = Cibyl85.convert_int_coordinate_to_float_string_1072468(sp, a0, a1, a2, a3); break;
-      case 0x10724e8:  ret = Cibyl85.format_RoadMapArea_string_10724e8(sp, a0, a1, a2, a3); break;
-      case 0x107258c:  ret = Cibyl85.format_point_string_107258c(sp, a0, a1, a2, a3); break;
-      case 0x1072608:  ret = Cibyl85.format_DB_point_string_1072608(sp, a0, a1, a2, a3); break;
-      case 0x1072688:  ret = Cibyl85.RTNet_ReportOneSegment_Encode_1072688(sp, a0, a1, a2, a3); break;
-      case 0x1072988:  ret = Cibyl85.format_RoadMapGpsPosition_Pos_Azy_Str_1072988(sp, a0, a1, a2, a3); break;
-      case 0x10729fc:  ret = Cibyl85.format_RoadMapGpsPosition_string_10729fc(sp, a0, a1, a2, a3); break;
-      case 0x1072a94:  ret = Cibyl85.format_RoadMapPosition_string_1072a94(sp, a0, a1, a2, a3); break;
-      case 0x1072b04:  ret = Cibyl85.RTNet_GetGeoConfig_1072b04(sp, a0, a1, a2, a3); break;
-      case 0x1072bb0:  ret = Cibyl86.RTNet_GPSPath_BuildCommand_1072bb0(sp, a0, a1, a2, a3); break;
-      case 0x1072cd8:  ret = Cibyl86.wst_start_session_trans_1072cd8(sp, a0, a1, a2, a3); break;
-      case 0x1072eac:  ret = Cibyl86.RTNet_SelectRoute_1072eac(sp, a0, a1, a2, a3); break;
-      case 0x1072ef4:  ret = Cibyl86.RTNet_RequestRoute_1072ef4(sp, a0, a1, a2, a3); break;
-      case 0x107346c:  ret = Cibyl86.RTNet_TripServer_FindTrip_107346c(sp, a0, a1, a2, a3); break;
-      case 0x1073504:  ret = Cibyl86.RTNet_TripServer_DeletePOI_1073504(sp, a0, a1, a2, a3); break;
-      case 0x107356c:  ret = Cibyl86.RTNet_TripServer_GetNumPOIs_107356c(sp, a0, a1, a2, a3); break;
-      case 0x10735b4:  ret = Cibyl86.RTNet_TripServer_GetPOIs_10735b4(sp, a0, a1, a2, a3); break;
-      case 0x10735fc:  ret = Cibyl86.RTNet_TripServer_CreatePOI_10735fc(sp, a0, a1, a2, a3); break;
-      case 0x10736b0:  ret = Cibyl86.RTNet_NotifySplashUpdateTime_10736b0(sp, a0, a1, a2, a3); break;
-      case 0x1073740:  ret = Cibyl86.RTNet_ExternalPoiNotifyOnNavigate_1073740(sp, a0, a1, a2, a3); break;
-      case 0x107377c:  ret = Cibyl86.RTNet_ExternalPoiNotifyOnPopUp_107377c(sp, a0, a1, a2, a3); break;
-      case 0x10737b8:  ret = Cibyl86.RTNet_FacebookPermissions_10737b8(sp, a0, a1, a2, a3); break;
-      case 0x10738c8:  ret = Cibyl86.RTNet_ReportAbuse_10738c8(sp, a0, a1, a2, a3); break;
-      case 0x1073910:  ret = Cibyl86.RTNet_CollectCustomBonus_1073910(sp, a0, a1, a2, a3); break;
-      case 0x10739cc:  ret = Cibyl86.RTNet_CollectBonus_10739cc(sp, a0, a1, a2, a3); break;
-      case 0x1073a90:  ret = Cibyl86.RTNet_GeneralPacket_1073a90(sp, a0, a1, a2, a3); break;
-      case 0x1073ac0:  ret = Cibyl86.RTNet_UpdateProfile_1073ac0(sp, a0, a1, a2, a3); break;
-      case 0x1073b88:  ret = Cibyl86.RTNet_TrafficAlertFeedback_1073b88(sp, a0, a1, a2, a3); break;
-      case 0x1073c0c:  ret = Cibyl86.RTNet_UserPoints_1073c0c(sp, a0, a1, a2, a3); break;
-      case 0x1073c70:  ret = Cibyl86.RTNet_Location_1073c70(sp, a0, a1, a2, a3); break;
-      case 0x1073cf4:  ret = Cibyl86.RTNet_SetMood_1073cf4(sp, a0, a1, a2, a3); break;
-      case 0x1073d58:  ret = Cibyl86.RTNet_SetMyVisability_1073d58(sp, a0, a1, a2, a3); break;
-      case 0x1073ed0:  ret = Cibyl87.RTNet_ReportMarker_1073ed0(sp, a0, a1, a2, a3); break;
-      case 0x1074070:  ret = Cibyl87.RTNet_ReportMapProblem_1074070(sp, a0, a1, a2, a3); break;
-      case 0x10741cc:  ret = Cibyl87.RTNet_RemoveAlert_10741cc(sp, a0, a1, a2, a3); break;
-      case 0x1074208:  ret = Cibyl87.RTNet_PinqWazer_1074208(sp, a0, a1, a2, a3); break;
-      case 0x1074358:  ret = Cibyl87.RTNet_ReportAlertAtPosition_1074358(sp, a0, a1, a2, a3); break;
-      case 0x10744e0:  ret = Cibyl87.RTNet_ReportAlert_10744e0(sp, a0, a1, a2, a3); break;
-      case 0x10745c0:  ret = Cibyl87.RTNet_PostAlertComment_10745c0(sp, a0, a1, a2, a3); break;
-      case 0x10746d4:  ret = Cibyl87.RTNet_Scoreboard_getPoints_10746d4(sp, a0, a1, a2, a3); break;
-      case 0x1074788:  ret = Cibyl87.RTNet_FoursquareCheckin_1074788(sp, a0, a1, a2, a3); break;
-      case 0x10747ec:  ret = Cibyl87.RTNet_FoursquareSearch_10747ec(sp, a0, a1, a2, a3); break;
-      case 0x107486c:  ret = Cibyl87.RTNet_FoursquareConnect_107486c(sp, a0, a1, a2, a3); break;
-      case 0x10748e4:  ret = Cibyl87.RTNet_TwitterConnect_10748e4(sp, a0, a1, a2, a3); break;
-      case 0x1074964:  ret = Cibyl87.RTNet_SendSMS_1074964(sp, a0, a1, a2, a3); break;
-      case 0x10749a0:  ret = Cibyl87.RTNet_ExternalPoiDisplayed_10749a0(sp, a0, a1, a2, a3); break;
-      case 0x1074af4:  ret = Cibyl87.RTNet_NodePath_1074af4(sp, a0, a1, a2, a3); break;
-      case 0x1074d64:  ret = Cibyl87.RTNet_GPSPath_1074d64(sp, a0, a1, a2, a3); break;
-      case 0x1074fc0:  ret = Cibyl87.RTNet_CreateNewRoads_1074fc0(sp, a0, a1, a2, a3); break;
-      case 0x1075124:  ret = Cibyl88.RTNet_MapDisplyed_1075124(sp, a0, a1, a2, a3); break;
-      case 0x10751c0:  ret = Cibyl88.RTNet_NavigateTo_10751c0(sp, a0, a1, a2, a3); break;
-      case 0x1075248:  ret = Cibyl88.RTNet_KeepAlive_1075248(sp, a0, a1, a2, a3); break;
-      case 0x1075284:  ret = Cibyl88.RTNet_At_1075284(sp, a0, a1, a2, a3); break;
-      case 0x1075378:  ret = Cibyl88.RTNet_Logout_1075378(sp, a0, a1, a2, a3); break;
-      case 0x10753b4:  ret = Cibyl88.RTNet_Login_10753b4(sp, a0, a1, a2, a3); break;
-      case 0x10755b4:  ret = Cibyl88.RTNet_LoadParams_10755b4(sp, a0, a1, a2, a3); break;
-      case 0x107566c:  ret = Cibyl88.RTNet_Term_107566c(sp, a0, a1, a2, a3); break;
-      case 0x10756a4:  ret = Cibyl88.RTNet_Init_10756a4(sp, a0, a1, a2, a3); break;
-      case 0x10756e8:  ret = Cibyl88.RealtimeBonus_Record_Init_10756e8( a0); break;
-      case 0x107573c:  ret = Cibyl88.RealtimeBonus_Count_107573c(); break;
-      case 0x1075844:  ret = Cibyl88.RealtimeBonus_Check_Same_Street_1075844(); break;
-      case 0x107584c:  ret = Cibyl88.RealtimeBonus_is_square_dependent_107584c(); break;
-      case 0x1075854:  ret = Cibyl88.RealtimeBonus_get_location_info_1075854( a0); break;
-      case 0x1075888:  ret = Cibyl88.RealtimeBonus_get_priority_1075888(); break;
-      case 0x1075890:  ret = Cibyl88.RealtimeBonus_Get_Speed_1075890(); break;
-      case 0x1075898:  ret = Cibyl88.RealtimeBonus_Get_Id_1075898( a0); break;
-      case 0x10758d4:  ret = Cibyl88.RealtimeBonus_Get_Position_10758d4( a0, a1, a2); break;
-      case 0x1075a44:  ret = Cibyl88.RealtimeBonus_Get_Distance_1075a44( a0); break;
-      case 0x1075ae0:  ret = Cibyl88.RealtimeBonus_Is_Alertable_1075ae0( a0); break;
-      case 0x1075b34:  ret = Cibyl88.onBonusDelete_1075b34(sp, a0, a1, a2, a3); break;
-      case 0x1075ba0:  ret = Cibyl88.RealtimeBonus_Term_1075ba0(sp, a0, a1, a2, a3); break;
-      case 0x1075c10:  ret = Cibyl88.RealtimeBonus_Init_1075c10(sp, a0, a1, a2, a3); break;
-      case 0x1075cd8:  ret = Cibyl88.RealtimeBonus_OpenMessageTicker_1075cd8(sp, a0, a1, a2, a3); break;
-      case 0x1075d70:  ret = Cibyl88.RealtimeBonus_CreateGUIID_1075d70(sp, a0, a1, a2, a3); break;
-      case 0x1075da0:  ret = Cibyl88.RealtimeBonus_CollectedPointsConfirmed_1075da0(sp, a0, a1, a2, a3); break;
-      case 0x1075f5c:  ret = Cibyl88.RealtimeBonus_distance_check_1075f5c(sp, a0, a1, a2, a3); break;
-      case 0x1075fd8:  ret = Cibyl88.RealtimeBonus_HandleEvent_1075fd8(sp, a0, a1, a2, a3); break;
-      case 0x1076220:  ret = Cibyl88.AddBonusToMap_1076220(sp, a0, a1, a2, a3); break;
-      case 0x1076388:  ret = Cibyl88.onBonusAdd_1076388(sp, a0, a1, a2, a3); break;
-      case 0x10763dc:  ret = Cibyl88.on_resource_downloaded_10763dc(sp, a0, a1, a2, a3); break;
-      case 0x1076458:  ret = Cibyl88.ticker_closed_cb_1076458(sp, a0, a1, a2, a3); break;
-      case 0x10764b0:  ret = Cibyl88.SpeedCheck_Timer_10764b0(sp, a0, a1, a2, a3); break;
-      case 0x1076568:  ret = Cibyl88.RealtimeBonus_PopUp_1076568(sp, a0, a1, a2, a3); break;
-      case 0x10768bc:  ret = Cibyl89.OnbonusShortClick_10768bc(sp, a0, a1, a2, a3); break;
-      case 0x107690c:  ret = Cibyl89.RealtimeBonus_RemoveFromTable_107690c(sp, a0, a1, a2, a3); break;
-      case 0x10769f8:  ret = Cibyl89.RealtimeBonus_Delete_10769f8(sp, a0, a1, a2, a3); break;
-      case 0x1076b10:  ret = Cibyl89.RealtimeBonus_Add_1076b10(sp, a0, a1, a2, a3); break;
-      case 0x1076ef0:  ret = Cibyl89.RealTimeBonus_SegmentChangedCB_1076ef0(sp, a0, a1, a2, a3); break;
-      case 0x1077084:  ret = Cibyl89.RTAlerts_Count_1077084(); break;
-      case 0x10770d4:  ret = Cibyl89.RTAlerts_Get_10770d4( a0); break;
-      case 0x10770f0:  ret = Cibyl89.RTAlerts_Get_By_ID_10770f0( a0, a1, a2, a3); break;
-      case 0x1077178:  ret = Cibyl89.RTAlerts_State_1077178(); break;
-      case 0x10771d8:  ret = Cibyl89.RTAlerts_Get_Number_of_Comments_10771d8( a0, a1, a2, a3); break;
-      case 0x1077274:  ret = Cibyl89.RTAlerts_Has_Image_1077274( a0, a1, a2, a3); break;
-      case 0x10772c4:  ret = Cibyl89.RTAlerts_Get_Position_10772c4( a0, a1, a2); break;
-      case 0x107733c:  ret = Cibyl89.RTAlerts_Get_Type_By_Id_107733c( a0, a1, a2, a3); break;
-      case 0x107738c:  ret = Cibyl89.RTAlerts_Get_GroupName_By_Id_107738c( a0, a1, a2, a3); break;
-      case 0x10773d8:  ret = Cibyl89.RTAlerts_Get_Id_10773d8( a0); break;
-      case 0x1077430:  ret = Cibyl89.RTAlerts_Get_LocationStrByID_1077430( a0, a1, a2, a3); break;
-      case 0x107747c:  ret = Cibyl89.RTAlerts_Get_Speed_107747c( a0); break;
-      case 0x10774a8:  ret = Cibyl89.RTAlerts_Get_IconByType_10774a8( a0, a1); break;
-      case 0x107756c:  ret = Cibyl89.RTAlerts_Get_Icon_107756c(sp, a0, a1, a2, a3); break;
-      case 0x10775dc:  ret = Cibyl89.RTAlerts_Get_Map_AddOn_10775dc( a0, a1, a2, a3); break;
-      case 0x10776a0:  ret = Cibyl89.RTAlerts_Get_Number_Of_Map_AddOns_10776a0( a0, a1, a2, a3); break;
-      case 0x1077724:  ret = Cibyl89.RTAlerts_Get_Number_Of_AddOns_1077724( a0, a1, a2, a3); break;
-      case 0x10777b8:  ret = Cibyl89.RTAlerts_Get_AddOn_10777b8( a0, a1, a2, a3); break;
-      case 0x1077874:  ret = Cibyl89.RTAlerts_Get_Alert_Icon_1077874( a0, a1, a2, a3); break;
-      case 0x10778f8:  ret = Cibyl89.RTAlerts_Get_Warn_Icon_10778f8( a0, a1, a2, a3); break;
-      case 0x107797c:  ret = Cibyl89.RTAlerts_Get_String_107797c( a0, a1, a2, a3); break;
-      case 0x1077a00:  ret = Cibyl89.RTAlerts_Get_Distance_1077a00( a0); break;
-      case 0x1077a58:  ret = Cibyl89.RTAlerts_Is_Alertable_1077a58( a0); break;
-      case 0x1077ab4:  ret = Cibyl89.compare_proximity_1077ab4( a0, a1); break;
-      case 0x1077ae0:  ret = Cibyl89.compare_recency_1077ae0( a0, a1); break;
-      case 0x1077b0c:  ret = Cibyl89.RTAlerts_Get_Current_Alert_Id_1077b0c(); break;
-      case 0x1077b1c:  ret = Cibyl89.RTAlerts_Penalty_1077b1c(); break;
-      case 0x1077b24:  ret = Cibyl89.RTAlerts_Is_Cancelable_1077b24(); break;
-      case 0x1077b2c:  ret = Cibyl89.RTAlerts_Check_Same_Street_1077b2c(); break;
-      case 0x1077b34:  ret = Cibyl89.RTAlerts_HandleAlert_1077b34(); break;
-      case 0x1077b3c:  ret = Cibyl89.RTAlerts_is_square_dependent_1077b3c(); break;
-      case 0x1077b44:  ret = Cibyl89.RTAlerts_get_priority_1077b44(); break;
-      case 0x1077b4c:  ret = Cibyl89.RTAlerts_get_location_info_1077b4c( a0); break;
-      case 0x1077b68:  ret = Cibyl89.RTAlerts_Resert_Minimized_1077b68(); break;
-      case 0x1077b78:  ret = Cibyl89.RTAlerts_Get_Minimize_State_1077b78(); break;
-      case 0x1077bb0:  ret = Cibyl89.RTAlerts_Get_Stars_Icon_1077bb0( a0); break;
-      case 0x1077bf0:  ret = Cibyl89.RTAlerts_isByMe_1077bf0( a0, a1, a2, a3); break;
-      case 0x1077c40:  ret = Cibyl89.j2me_sort_alerts_1077c40(sp, a0, a1, a2, a3); break;
-      case 0x1077d40:  ret = Cibyl90.RTAlerts_clear_group_counter_1077d40(); break;
-      case 0x1077d68:  ret = Cibyl90.RAlerts_get_group_state_1077d68(); break;
-      case 0x1077ddc:  ret = Cibyl90.RTAlerts_isAlertOnRoute_1077ddc(sp, a0, a1, a2, a3); break;
-      case 0x1077e58:  ret = Cibyl90.RTAlerts_show_space_before_desc_1077e58(sp, a0, a1, a2, a3); break;
-      case 0x1077ea8:  ret = Cibyl90.RTAlerts_get_title_1077ea8(sp, a0, a1, a2, a3); break;
-      case 0x1077fd8:  ret = Cibyl90.RTAlerts_get_reported_by_string_1077fd8(sp, a0, a1, a2, a3); break;
-      case 0x1078044:  ret = Cibyl90.RTAlerts_GroupCount_Str_1078044(sp, a0, a1, a2, a3); break;
-      case 0x1078090:  ret = Cibyl90.RTAlerts_Count_Str_1078090(sp, a0, a1, a2, a3); break;
-      case 0x10780dc:  ret = Cibyl90.checkbox_callback_10780dc(sp, a0, a1, a2, a3); break;
-      case 0x10781f0:  ret = Cibyl90.RtAlerts_get_addional_text_icon_10781f0(sp, a0, a1, a2, a3); break;
-      case 0x1078228:  ret = Cibyl90.RtAlerts_get_addional_text_1078228(sp, a0, a1, a2, a3); break;
-      case 0x1078364:  ret = Cibyl90.RTAlerts_add_comment_stars_1078364(sp, a0, a1, a2, a3); break;
-      case 0x1078448:  ret = Cibyl90.RTAlerts_update_stars_1078448(sp, a0, a1, a2, a3); break;
-      case 0x10785d8:  ret = Cibyl90.RTAlerts_Delete_All_Comments_10785d8(sp, a0, a1, a2, a3); break;
-      case 0x1078614:  ret = Cibyl90.space_1078614(sp, a0, a1, a2, a3); break;
-      case 0x1078680:  ret = Cibyl90.send_map_problem_sk_cb_1078680(sp, a0, a1, a2, a3); break;
-      case 0x10787b4:  ret = Cibyl90.on_map_problem_close_10787b4(sp, a0, a1, a2, a3); break;
-      case 0x10787d4:  ret = Cibyl90.RTAlerts_CloseProgressDlg_10787d4(sp, a0, a1, a2, a3); break;
-      case 0x10787f4:  ret = Cibyl90.RTAlerts_ShowProgressDlg_10787f4(sp, a0, a1, a2, a3); break;
-      case 0x1078820:  ret = Cibyl90.RTAlerts_Minimized_Alert_Dialog_1078820(sp, a0, a1, a2, a3); break;
-      case 0x1078850:  ret = Cibyl90.RTAlerts_distance_check_1078850(sp, a0, a1, a2, a3); break;
-      case 0x10788cc:  ret = Cibyl90.RTAlerts_Sort_List_10788cc(sp, a0, a1, a2, a3); break;
-      case 0x1078a64:  ret = Cibyl90.RTAlerts_CurrentAlert_Has_Comments_1078a64(sp, a0, a1, a2, a3); break;
-      case 0x1078af0:  ret = Cibyl90.RTAlerts_is_reply_popup_on_1078af0(sp, a0, a1, a2, a3); break;
-      case 0x1078b34:  ret = Cibyl90.RTAlerts_ScrollState_1078b34(sp, a0, a1, a2, a3); break;
-      case 0x1078b80:  ret = Cibyl90.RTAlerts_CurrentComments_1078b80(sp, a0, a1, a2, a3); break;
-      case 0x1078ba8:  ret = Cibyl90.on_view_comments_1078ba8(sp, a0, a1, a2, a3); break;
-      case 0x1078cbc:  ret = Cibyl90.real_time_remove_alert_1078cbc(sp, a0, a1, a2, a3); break;
-      case 0x1078cdc:  ret = Cibyl90.real_time_post_alert_comment_by_id_1078cdc(sp, a0, a1, a2, a3); break;
-      case 0x1078d94:  ret = Cibyl90.real_time_post_alert_comment_1078d94(sp, a0, a1, a2, a3); break;
-      case 0x1078dc4:  ret = Cibyl90.on_add_comment_1078dc4(sp, a0, a1, a2, a3); break;
-      case 0x1078df4:  ret = Cibyl90.RTAlerts_Comment_PopUp_Hide_1078df4(sp, a0, a1, a2, a3); break;
-      case 0x1078e7c:  ret = Cibyl90.Comment_Ignore_sk_cb_1078e7c(sp, a0, a1, a2, a3); break;
-      case 0x1078e9c:  ret = Cibyl90.RTAlerts_Comment_Init_1078e9c(sp, a0, a1, a2, a3); break;
-      case 0x1078f18:  ret = Cibyl90.RTAlerts_Alert_Init_1078f18(sp, a0, a1, a2, a3); break;
-      case 0x1079080:  ret = Cibyl90.continue_report_after_image_upload_1079080(sp, a0, a1, a2, a3); break;
-      case 0x10791b0:  ret = Cibyl90.on_keyboard_closed_10791b0(sp, a0, a1, a2, a3); break;
-      case 0x10792d8:  ret = Cibyl91.alerts_direction_menu_10792d8(sp, a0, a1, a2, a3); break;
-      case 0x1079358:  ret = Cibyl91.add_real_time_alert_for_construction_1079358(sp, a0, a1, a2, a3); break;
-      case 0x107939c:  ret = Cibyl91.add_real_time_alert_for_other_107939c(sp, a0, a1, a2, a3); break;
-      case 0x10793e0:  ret = Cibyl91.add_real_time_alert_for_parking_10793e0(sp, a0, a1, a2, a3); break;
-      case 0x1079424:  ret = Cibyl91.add_real_time_alert_for_hazard_1079424(sp, a0, a1, a2, a3); break;
-      case 0x1079468:  ret = Cibyl91.add_real_time_alert_for_traffic_jam_1079468(sp, a0, a1, a2, a3); break;
-      case 0x10794ac:  ret = Cibyl91.add_real_time_alert_for_accident_10794ac(sp, a0, a1, a2, a3); break;
-      case 0x10794f0:  ret = Cibyl91.add_real_time_alert_for_police_10794f0(sp, a0, a1, a2, a3); break;
-      case 0x1079534:  ret = Cibyl91.RTAlerts_get_report_info_str_1079534(sp, a0, a1, a2, a3); break;
-      case 0x107968c:  ret = Cibyl91.on_button_close_107968c(sp, a0, a1, a2, a3); break;
-      case 0x10796b4:  ret = Cibyl91.on_ping_wazer_button_close_10796b4(sp, a0, a1, a2, a3); break;
-      case 0x10796dc:  ret = Cibyl91.RTAlerts_Clear_All_10796dc(sp, a0, a1, a2, a3); break;
-      case 0x107980c:  ret = Cibyl91.RTAlerts_Term_107980c(sp, a0, a1, a2, a3); break;
-      case 0x107982c:  ret = Cibyl91.alertCountTimerRedrawCB_107982c(sp, a0, a1, a2, a3); break;
-      case 0x107985c:  ret = Cibyl91.on_popup_close_107985c(sp, a0, a1, a2, a3); break;
-      case 0x10799b8:  ret = Cibyl91.RTAlerts_Stop_Scrolling_10799b8(sp, a0, a1, a2, a3); break;
-      case 0x1079aa8:  ret = Cibyl91.post_comment_keyboard_callback_1079aa8(sp, a0, a1, a2, a3); break;
-      case 0x1079b9c:  ret = Cibyl91.RTAlerts_Cancel_Scrolling_1079b9c(sp, a0, a1, a2, a3); break;
-      case 0x1079be0:  ret = Cibyl91.on_groups_callbak_1079be0(sp, a0, a1, a2, a3); break;
-      case 0x1079c10:  ret = Cibyl91.RTAlerts_Download_Image_1079c10(sp, a0, a1, a2, a3); break;
-      case 0x1079c94:  ret = Cibyl91.on_view_image_1079c94(sp, a0, a1, a2, a3); break;
-      case 0x1079cbc:  ret = Cibyl91.RTAlerts_Download_Image_Callback_1079cbc(sp, a0, a1, a2, a3); break;
-      case 0x1079fbc:  ret = Cibyl91.RTAlerts_View_Image_DlgClose_Callback_1079fbc(sp, a0, a1, a2, a3); break;
-      case 0x1079ff4:  ret = Cibyl91.RTAlerts_Get_City_Street_1079ff4(sp, a0, a1, a2, a3); break;
-      case 0x107a390:  ret = Cibyl91.RTAlerts_Get_Sound_107a390(sp, a0, a1, a2, a3); break;
-      case 0x107a43c:  ret = Cibyl91.RTAlerts_Get_Map_Icon_107a43c(sp, a0, a1, a2, a3); break;
-      case 0x107a570:  ret = Cibyl92.DeleteAlertObject_107a570(sp, a0, a1, a2, a3); break;
-      case 0x107a718:  ret = Cibyl92.RTAlerts_Remove_107a718(sp, a0, a1, a2, a3); break;
-      case 0x107ab48:  ret = Cibyl92.Rtalerts_Delete_107ab48(sp, a0, a1, a2, a3); break;
-      case 0x107ab74:  ret = Cibyl92.CreateAlertObject_107ab74(sp, a0, a1, a2, a3); break;
-      case 0x107af2c:  ret = Cibyl92.RTAlerts_Comment_PopUp_107af2c(sp, a0, a1, a2, a3); break;
-      case 0x107b3fc:  ret = Cibyl92.on_options_107b3fc(sp, a0, a1, a2, a3); break;
-      case 0x107b5e0:  ret = Cibyl92.report_abuse_107b5e0(sp, a0, a1, a2, a3); break;
-      case 0x107b664:  ret = Cibyl92.on_option_selected_107b664(sp, a0, a1, a2, a3); break;
-      case 0x107b714:  ret = Cibyl92.on_report_abuse_107b714(sp, a0, a1, a2, a3); break;
-      case 0x107b734:  ret = Cibyl92.report_abuse_confirm_dlg_callback_107b734(sp, a0, a1, a2, a3); break;
-      case 0x107b774:  ret = Cibyl92.RTAlerts_RefreshOnMap_107b774(sp, a0, a1, a2, a3); break;
-      case 0x107b894:  ret = Cibyl93.RTAlerts_Init_107b894(sp, a0, a1, a2, a3); break;
-      case 0x107ba94:  ret = Cibyl93.RTAlerts_report_map_problem_107ba94(sp, a0, a1, a2, a3); break;
-      case 0x107c020:  ret = Cibyl93.T_411_107c020(sp, a0, a1, a2, a3); break;
-      case 0x107c05c:  ret = Cibyl93.RTAlerts_Comment_Add_107c05c(sp, a0, a1, a2, a3); break;
-      case 0x107c258:  ret = Cibyl93.report_alert_107c258(sp, a0, a1, a2, a3); break;
-      case 0x107c2d8:  ret = Cibyl93.add_real_time_alert_for_construction_opposite_direction_107c2d8(sp, a0, a1, a2, a3); break;
-      case 0x107c308:  ret = Cibyl93.add_real_time_alert_for_other_opposite_direction_107c308(sp, a0, a1, a2, a3); break;
-      case 0x107c368:  ret = Cibyl93.add_real_time_alert_for_hazard_opposite_direction_107c368(sp, a0, a1, a2, a3); break;
-      case 0x107c398:  ret = Cibyl93.add_real_time_alert_for_traffic_jam_opposite_direction_107c398(sp, a0, a1, a2, a3); break;
-      case 0x107c3c8:  ret = Cibyl93.add_real_time_alert_for_accident_opposite_direction_107c3c8(sp, a0, a1, a2, a3); break;
-      case 0x107c3f8:  ret = Cibyl93.add_real_time_alert_for_police_opposite_direction_107c3f8(sp, a0, a1, a2, a3); break;
-      case 0x107c428:  ret = Cibyl93.add_real_time_alert_for_construction_my_direction_107c428(sp, a0, a1, a2, a3); break;
-      case 0x107c458:  ret = Cibyl93.add_real_time_alert_for_other_my_direction_107c458(sp, a0, a1, a2, a3); break;
-      case 0x107c4b8:  ret = Cibyl93.add_real_time_alert_for_hazard_my_direction_107c4b8(sp, a0, a1, a2, a3); break;
-      case 0x107c4e8:  ret = Cibyl93.add_real_time_alert_for_traffic_jam_my_direction_107c4e8(sp, a0, a1, a2, a3); break;
-      case 0x107c518:  ret = Cibyl93.add_real_time_alert_for_accident_my_direction_107c518(sp, a0, a1, a2, a3); break;
-      case 0x107c548:  ret = Cibyl93.add_real_time_alert_for_police_my_direction_107c548(sp, a0, a1, a2, a3); break;
-      case 0x107c578:  ret = Cibyl93.add_real_time_chit_chat_107c578(sp, a0, a1, a2, a3); break;
-      case 0x107c684:  ret = Cibyl93.T_412_107c684(sp, a0, a1, a2, a3); break;
-      case 0x107c7c4:  ret = Cibyl93.RTAlerts_popup_PingWazer_107c7c4(sp, a0, a1, a2, a3); break;
-      case 0x107d4a8:  ret = Cibyl94.RTAlerts_popup_alert_107d4a8(sp, a0, a1, a2, a3); break;
-      case 0x107e894:  ret = Cibyl95.RTAlerts_Scroll_Prev_107e894(sp, a0, a1, a2, a3); break;
-      case 0x107e96c:  ret = Cibyl95.RTAlerts_Scroll_Next_107e96c(sp, a0, a1, a2, a3); break;
-      case 0x107ea4c:  ret = Cibyl95.RTAlerts_Popup_By_Id_No_Center_107ea4c(sp, a0, a1, a2, a3); break;
-      case 0x107eb04:  ret = Cibyl95.OnAlertShortClick_107eb04(sp, a0, a1, a2, a3); break;
-      case 0x107eb70:  ret = Cibyl95.RTAlerts_Popup_By_Id_107eb70(sp, a0, a1, a2, a3); break;
-      case 0x107ec34:  ret = Cibyl95.RTAlerts_Add_107ec34(sp, a0, a1, a2, a3); break;
-      case 0x107f7f4:  ret = Cibyl95.RTAlerts_Popup_107f7f4(sp, a0, a1, a2, a3); break;
-      case 0x107fa44:  ret = Cibyl95.RTAlerts_Scroll_All_107fa44(sp, a0, a1, a2, a3); break;
-      case 0x107fb28:  ret = Cibyl95.RTAlerts_Timer_107fb28(sp, a0, a1, a2, a3); break;
-      case 0x107fd70:  ret = Cibyl96.populate_list_107fd70(sp, a0, a1, a2, a3); break;
-      case 0x10808dc:  ret = Cibyl96.populate_first_tab_10808dc(sp, a0, a1, a2, a3); break;
-      case 0x1080b30:  ret = Cibyl96.RealtimeAlertsDeleteCallBackTabs_1080b30(sp, a0, a1, a2, a3); break;
-      case 0x1080ba8:  ret = Cibyl96.delete_callback_1080ba8(sp, a0, a1, a2, a3); break;
-      case 0x1080bf4:  ret = Cibyl96.RealtimeAlertsListCallBackTabs_1080bf4(sp, a0, a1, a2, a3); break;
-      case 0x1080c6c:  ret = Cibyl96.create_list_1080c6c(sp, a0, a1, a2, a3); break;
-      case 0x1080cec:  ret = Cibyl96.report_list_1080cec(sp, a0, a1, a2, a3); break;
-      case 0x1080db4:  ret = Cibyl96.set_softkeys_1080db4(sp, a0, a1, a2, a3); break;
-      case 0x1080e10:  ret = Cibyl96.ShowListMenu_1080e10(sp, a0, a1, a2, a3); break;
-      case 0x1080fec:  ret = Cibyl97.RealtimeAlertsList_1080fec(sp, a0, a1, a2, a3); break;
-      case 0x1081010:  ret = Cibyl97.on_options_1081010(sp, a0, a1, a2, a3); break;
-      case 0x1081378:  ret = Cibyl97.on_option_delete_1081378(sp, a0, a1, a2, a3); break;
-      case 0x1081430:  ret = Cibyl97.report_abuse_confirm_dlg_callback_1081430(sp, a0, a1, a2, a3); break;
-      case 0x1081464:  ret = Cibyl97.populate_tab_1081464(sp, a0, a1, a2, a3); break;
-      case 0x10817dc:  ret = Cibyl97.on_tab_gain_focus_10817dc(sp, a0, a1, a2, a3); break;
-      case 0x10818c0:  ret = Cibyl97.on_option_selected_10818c0(sp, a0, a1, a2, a3); break;
-      case 0x1081c08:  ret = Cibyl97.count_tab_1081c08(sp, a0, a1, a2, a3); break;
-      case 0x1081cc0:  ret = Cibyl97.show_list_1081cc0(sp, a0, a1, a2, a3); break;
-      case 0x108217c:  ret = Cibyl97.report_list_other_108217c(sp, a0, a1, a2, a3); break;
-      case 0x1082200:  ret = Cibyl97.report_list_chit_chats_1082200(sp, a0, a1, a2, a3); break;
-      case 0x1082268:  ret = Cibyl98.report_list_accidents_1082268(sp, a0, a1, a2, a3); break;
-      case 0x10822d0:  ret = Cibyl98.report_list_loads_10822d0(sp, a0, a1, a2, a3); break;
-      case 0x108233c:  ret = Cibyl98.report_list_police_108233c(sp, a0, a1, a2, a3); break;
-      case 0x10823a4:  ret = Cibyl98.report_list_all_10823a4(sp, a0, a1, a2, a3); break;
-      case 0x1082400:  ret = Cibyl98.RealtimeAlertsListGroup_1082400(sp, a0, a1, a2, a3); break;
-      case 0x1082440:  ret = Cibyl98.on_button_show_no_groups_1082440(sp, a0, a1, a2, a3); break;
-      case 0x10825d8:  ret = Cibyl98.set_counts_10825d8(sp, a0, a1, a2, a3); break;
-      case 0x1082848:  ret = Cibyl98.RTTrafficInfo_InitRecord_1082848( a0); break;
-      case 0x108288c:  ret = Cibyl98.RTTrafficInfo_IsEmpty_108288c(); break;
-      case 0x108289c:  ret = Cibyl98.RTTrafficInfo_Count_108289c(); break;
-      case 0x10828ac:  ret = Cibyl98.RTTrafficInfo_RecordByID_10828ac( a0, a1, a2, a3); break;
-      case 0x1082934:  ret = Cibyl98.RTTrafficInfo_Get_1082934( a0); break;
-      case 0x108295c:  ret = Cibyl98.RTTrafficInfo_GetNumLines_108295c(); break;
-      case 0x108296c:  ret = Cibyl98.RTTrafficInfo_GetLine_108296c( a0); break;
-      case 0x1082994:  ret = Cibyl98.RTTrafficInfo_Get_Line_1082994( a0, a1, a2, a3); break;
-      case 0x1082a24:  ret = Cibyl98.RTTrafficInfo_Get_Avg_Speed_1082a24( a0, a1, a2, a3); break;
-      case 0x1082b6c:  ret = Cibyl98.RTTrafficInfo_InstrumentSegment_1082b6c(sp, a0, a1, a2, a3); break;
-      case 0x1082e38:  ret = Cibyl98.RTTrafficInfo_InstrumentSegments_1082e38(sp, a0, a1, a2, a3); break;
-      case 0x1082f0c:  ret = Cibyl98.RTTrafficInfo_Get_Avg_Cross_Time_1082f0c(sp, a0, a1, a2, a3); break;
-      case 0x1082fc4:  ret = Cibyl98.RTTrafficInfo_GenerateAlert_1082fc4(sp, a0, a1, a2, a3); break;
-      case 0x10830dc:  ret = Cibyl98.RTTrafficInfo_UpdateGeometry_10830dc(sp, a0, a1, a2, a3); break;
-      case 0x10831d8:  ret = Cibyl98.RTTrafficInfo_Remove_10831d8(sp, a0, a1, a2, a3); break;
-      case 0x10832ec:  ret = Cibyl98.RTTrafficInfo_UnitChangeCb_10832ec(sp, a0, a1, a2, a3); break;
-      case 0x10833a8:  ret = Cibyl98.RTTrafficInfo_Add_10833a8(sp, a0, a1, a2, a3); break;
-      case 0x1083830:  ret = Cibyl98.TrafficConfirmedCallback_1083830(sp, a0, a1, a2, a3); break;
-      case 0x10838e0:  ret = Cibyl99.RTTrafficInfo_ClearAll_10838e0(sp, a0, a1, a2, a3); break;
-      case 0x10839d4:  ret = Cibyl99.RTTrafficInfo_Reset_10839d4(sp, a0, a1, a2, a3); break;
-      case 0x10839f4:  ret = Cibyl99.RTTrafficInfo_AddSegments_10839f4(sp, a0, a1, a2, a3); break;
-      case 0x1083c3c:  ret = Cibyl99.RTTrafficInfo_TileReceivedCb_1083c3c(sp, a0, a1, a2, a3); break;
-      case 0x1083c98:  ret = Cibyl99.RTTrafficInfo_Term_1083c98(sp, a0, a1, a2, a3); break;
-      case 0x1083cc0:  ret = Cibyl99.RTTrafficInfo_Init_1083cc0(sp, a0, a1, a2, a3); break;
-      case 0x1083d60:  ret = Cibyl99.RealtimeTrafficInfoOutlineIterator_1083d60( a0, a1); break;
-      case 0x1083d88:  ret = Cibyl99.isDisplayingTrafficInfoOn_1083d88(sp, a0, a1, a2, a3); break;
-      case 0x1083db4:  ret = Cibyl99.RealtimeTrafficInfoState_1083db4(sp, a0, a1, a2, a3); break;
-      case 0x1083de0:  ret = Cibyl99.RealtimeRoadToggleShowTraffic_1083de0(sp, a0, a1, a2, a3); break;
-      case 0x1083e54:  ret = Cibyl99.RealtimeTrafficInfoUregister_1083e54(sp, a0, a1, a2, a3); break;
-      case 0x1083e8c:  ret = Cibyl99.RealtimeTrafficInfoPluginTerm_1083e8c(sp, a0, a1, a2, a3); break;
-      case 0x1083ec0:  ret = Cibyl99.RealtimeTrafficInfoPluginInit_1083ec0(sp, a0, a1, a2, a3); break;
-      case 0x10840f4:  ret = Cibyl99.RealtimeTrafficInfoScreenRepaint_10840f4(sp, a0, a1, a2, a3); break;
-      case 0x10847d8:  ret = Cibyl99.RealtimeAlertCommentsList_10847d8(sp, a0, a1, a2, a3); break;
-      case 0x10856bc:  ret = Cibyl100.comment_callback_10856bc(sp, a0, a1, a2, a3); break;
-      case 0x1085798:  ret = Cibyl100.on_option_selected_1085798(sp, a0, a1, a2, a3); break;
-      case 0x1085884:  ret = Cibyl100.report_abuse_confirm_dlg_callback_1085884(sp, a0, a1, a2, a3); break;
-      case 0x10858bc:  ret = Cibyl100.draw_comment_image_10858bc(sp, a0, a1, a2, a3); break;
-      case 0x1085a4c:  ret = Cibyl100.AlertSelected_1085a4c(sp, a0, a1, a2, a3); break;
-      case 0x1085a7c:  ret = Cibyl100.on_options_comments_1085a7c(sp, a0, a1, a2, a3); break;
-      case 0x1085b90:  Cibyl100.RTConnectionInfo_ResetTransaction_1085b90( a0); break;
-      case 0x1085ba4:  ret = Cibyl100.RTConnectionInfo_ResetLogin_1085ba4(sp, a0, a1, a2, a3); break;
-      case 0x1085c38:  ret = Cibyl100.RTConnectionInfo_FullReset_1085c38(sp, a0, a1, a2, a3); break;
-      case 0x1085c60:  ret = Cibyl100.RTConnectionInfo_Init_1085c60(sp, a0, a1, a2, a3); break;
-      case 0x1085cdc:  ret = Cibyl100.SetExternalPoiDrawOrder_1085cdc(sp, a0, a1, a2, a3); break;
-      case 0x1085e4c:  ret = Cibyl100.RmExternalPoi_1085e4c(sp, a0, a1, a2, a3); break;
-      case 0x1085ed0:  ret = Cibyl100.AddExternalPoi_1085ed0(sp, a0, a1, a2, a3); break;
-      case 0x10862bc:  ret = Cibyl100.AddExternalPoiType_10862bc(sp, a0, a1, a2, a3); break;
-      case 0x1086630:  ret = Cibyl100.OpenMessageTicker_1086630(sp, a0, a1, a2, a3); break;
-      case 0x10867d8:  ret = Cibyl100.OpenMoodSelection_10867d8(sp, a0, a1, a2, a3); break;
-      case 0x1086834:  ret = Cibyl100.UserGroups_1086834(sp, a0, a1, a2, a3); break;
-      case 0x1086b60:  ret = Cibyl101.CollectBonusRes_1086b60(sp, a0, a1, a2, a3); break;
-      case 0x1086dac:  ret = Cibyl101.RmBonus_1086dac(sp, a0, a1, a2, a3); break;
-      case 0x1086e48:  ret = Cibyl101.AddCustomBonus_1086e48(sp, a0, a1, a2, a3); break;
-      case 0x108712c:  ret = Cibyl101.AddBonus_108712c(sp, a0, a1, a2, a3); break;
-      case 0x108740c:  ret = Cibyl101.UpdateUserPoints_108740c(sp, a0, a1, a2, a3); break;
-      case 0x10874a8:  ret = Cibyl101.PostAlertCommentRes_10874a8(sp, a0, a1, a2, a3); break;
-      case 0x1087644:  ret = Cibyl101.ReportAlertRes_1087644(sp, a0, a1, a2, a3); break;
-      case 0x10877e0:  ret = Cibyl101.GeoLocation_10877e0(sp, a0, a1, a2, a3); break;
-      case 0x1087ba0:  ret = Cibyl101.MapUpdateTime_1087ba0(sp, a0, a1, a2, a3); break;
-      case 0x1087c28:  ret = Cibyl101.RmRoadInfo_1087c28(sp, a0, a1, a2, a3); break;
-      case 0x1087ce0:  ret = Cibyl101.RoadInfoSegments_1087ce0(sp, a0, a1, a2, a3); break;
-      case 0x1087f6c:  ret = Cibyl102.RoadInfoGeom_1087f6c(sp, a0, a1, a2, a3); break;
-      case 0x1088240:  ret = Cibyl102.AddRoadInfo_1088240(sp, a0, a1, a2, a3); break;
-      case 0x10886e0:  ret = Cibyl102.RemoveAlert_10886e0(sp, a0, a1, a2, a3); break;
-      case 0x1088798:  ret = Cibyl102.AddAlertComment_1088798(sp, a0, a1, a2, a3); break;
-      case 0x1088c0c:  ret = Cibyl102.BridgeToRes_1088c0c(sp, a0, a1, a2, a3); break;
-      case 0x1088fc0:  ret = Cibyl102.AddAlert_1088fc0(sp, a0, a1, a2, a3); break;
-      case 0x1089960:  ret = Cibyl103.VersionUpgrade_1089960(sp, a0, a1, a2, a3); break;
-      case 0x1089b28:  ret = Cibyl103.SystemMessage_1089b28(sp, a0, a1, a2, a3); break;
-      case 0x1089fec:  ret = Cibyl103.AddUser_1089fec(sp, a0, a1, a2, a3); break;
-      case 0x108a818:  ret = Cibyl103.VerifyStatus_108a818(sp, a0, a1, a2, a3); break;
-      case 0x108a978:  ret = Cibyl103.VerifyStatusAndTag_108a978(sp, a0, a1, a2, a3); break;
-      case 0x108ac18:  ret = Cibyl104.OnLogOutResponse_108ac18(sp, a0, a1, a2, a3); break;
-      case 0x108ace0:  ret = Cibyl104.OnLoginResponse_108ace0(sp, a0, a1, a2, a3); break;
-      case 0x108b05c:  ret = Cibyl104.OnRegisterResponse_108b05c(sp, a0, a1, a2, a3); break;
-      case 0x108b1d4:  ret = Cibyl104.RTUsers_Count_108b1d4( a0); break;
-      case 0x108b1e0:  ret = Cibyl104.RTUsers_IsEmpty_108b1e0( a0); break;
-      case 0x108b1ec:  ret = Cibyl104.RTUsers_Update_108b1ec(sp, a0, a1, a2, a3); break;
-      case 0x108b2e4:  ret = Cibyl104.RTUsers_ResetUpdateFlag_108b2e4( a0, a1); break;
-      case 0x108b310:  ret = Cibyl104.RTUsers_RedoUpdateFlag_108b310( a0, a1, a2); break;
-      case 0x108b378:  ret = Cibyl104.RTUsers_UserByID_108b378( a0, a1, a2, a3); break;
-      case 0x108b3c4:  ret = Cibyl104.on_close_108b3c4(sp, a0, a1, a2, a3); break;
-      case 0x108b414:  ret = Cibyl104.prepareValueString_108b414(sp, a0, a1, a2, a3); break;
-      case 0x108b558:  ret = Cibyl104.RTUserLocation_CreateGUIID_108b558(sp, a0, a1, a2, a3); break;
-      case 0x108b588:  ret = Cibyl104.disclaimer_cb_108b588(sp, a0, a1, a2, a3); break;
-      case 0x108b6cc:  ret = Cibyl104.post_comment_keyboard_callback_108b6cc(sp, a0, a1, a2, a3); break;
-      case 0x108b788:  ret = Cibyl104.RTUsers_Add_108b788(sp, a0, a1, a2, a3); break;
-      case 0x108b93c:  ret = Cibyl104.RTUsers_UpdateOrAdd_108b93c(sp, a0, a1, a2, a3); break;
-      case 0x108b998:  ret = Cibyl104.RTUserLocation_Init_108b998(sp, a0, a1, a2, a3); break;
-      case 0x108ba68:  ret = Cibyl104.RTUsers_ClearAll_108ba68(sp, a0, a1, a2, a3); break;
-      case 0x108bb24:  ret = Cibyl104.RTUsers_RemoveByIndex_108bb24(sp, a0, a1, a2, a3); break;
-      case 0x108bc00:  ret = Cibyl104.RTUsers_RemoveUnupdatedUsers_108bc00(sp, a0, a1, a2, a3); break;
-      case 0x108bd18:  ret = Cibyl104.RTUsers_Reset_108bd18(sp, a0, a1, a2, a3); break;
-      case 0x108bd7c:  ret = Cibyl104.RTUsers_Init_108bd7c(sp, a0, a1, a2, a3); break;
-      case 0x108be4c:  ret = Cibyl104.RTUsers_Popup_108be4c(sp, a0, a1, a2, a3); break;
-      case 0x108d050:  ret = Cibyl105.ERTVisabilityGroup_to_string_108d050( a0); break;
-      case 0x108d0c0:  Cibyl105.StatusStatistics_Reset_108d0c0( a0); break;
-      case 0x108d0cc:  Cibyl105.StatusStatistics_Init_108d0cc( a0); break;
-      case 0x108d0dc:  ret = Cibyl105.VersionUpgradeInfo_Init_108d0dc(sp, a0, a1, a2, a3); break;
-      case 0x108d100:  ret = Cibyl105.ERTVisabilityReport_from_string_108d100(sp, a0, a1, a2, a3); break;
-      case 0x108d128:  ret = Cibyl105.ERTVisabilityGroup_from_string_108d128(sp, a0, a1, a2, a3); break;
-      case 0x108d1a0:  ret = Cibyl105.RTSystemMessageQueue_IsEmpty_108d1a0(); break;
-      case 0x108d1c8:  ret = Cibyl105.RTSystemMessagesInit_108d1c8(sp, a0, a1, a2, a3); break;
-      case 0x108d200:  ret = Cibyl105.RTSystemMessagesSetLastMessageDisplayed_108d200(sp, a0, a1, a2, a3); break;
-      case 0x108d230:  ret = Cibyl105.RTSystemMessagesGetLastMessageDisplayed_108d230(sp, a0, a1, a2, a3); break;
-      case 0x108d254:  ret = Cibyl105.RTSystemMessage_Init_108d254(sp, a0, a1, a2, a3); break;
-      case 0x108d2b8:  ret = Cibyl105.RTSystemMessage_Free_108d2b8(sp, a0, a1, a2, a3); break;
-      case 0x108d330:  ret = Cibyl105.PopOldest_108d330(sp, a0, a1, a2, a3); break;
-      case 0x108d404:  ret = Cibyl105.RTSystemMessageQueue_Empty_108d404(sp, a0, a1, a2, a3); break;
-      case 0x108d42c:  ret = Cibyl105.RTSystemMessageQueue_Pop_108d42c(sp, a0, a1, a2, a3); break;
-      case 0x108d470:  ret = Cibyl105.RTSystemMessagesDisplay_108d470(sp, a0, a1, a2, a3); break;
-      case 0x108d8f0:  ret = Cibyl105.button_callback_108d8f0(sp, a0, a1, a2, a3); break;
-      case 0x108d918:  ret = Cibyl105.RTSystemMessagesDisplay_Timer_108d918(sp, a0, a1, a2, a3); break;
-      case 0x108d958:  ret = Cibyl105.RTSystemMessageQueue_Push_108d958(sp, a0, a1, a2, a3); break;
-      case 0x108da94:  ret = Cibyl105.set_state_108da94(sp, a0, a1, a2, a3); break;
-      case 0x108dac4:  ret = Cibyl105.RealtimePrivacyInit_108dac4(sp, a0, a1, a2, a3); break;
-      case 0x108dae4:  ret = Cibyl105.checkbox_callback_108dae4(sp, a0, a1, a2, a3); break;
-      case 0x108dbb0:  ret = Cibyl105.RealtimePrivacyState_108dbb0(sp, a0, a1, a2, a3); break;
-      case 0x108dbe0:  ret = Cibyl105.update_checked_108dbe0(sp, a0, a1, a2, a3); break;
-      case 0x108dca4:  ret = Cibyl105.RealtimePrivacySettings_108dca4(sp, a0, a1, a2, a3); break;
-      case 0x108e148:  ret = Cibyl105.RealtimePrivacySettingsWidgetCallBack_108e148(sp, a0, a1, a2, a3); break;
-      case 0x108e168:  ret = Cibyl105.save_changes_108e168(sp, a0, a1, a2, a3); break;
-      case 0x108e23c:  ret = Cibyl105.on_ok_108e23c(sp, a0, a1, a2, a3); break;
-      case 0x108e264:  ret = Cibyl105.on_close_dialog_108e264(sp, a0, a1, a2, a3); break;
-      case 0x108e28c:  ret = Cibyl105.Realtime_OfflineWriteLine_108e28c(sp, a0, a1, a2, a3); break;
-      case 0x108e3a8:  ret = Cibyl106.Realtime_OfflineWrite_108e3a8(sp, a0, a1, a2, a3); break;
-      case 0x108e428:  ret = Cibyl106.Realtime_OfflineClose_108e428(sp, a0, a1, a2, a3); break;
-      case 0x108e478:  ret = Cibyl106.Realtime_OfflineOpen_108e478(sp, a0, a1, a2, a3); break;
-      case 0x108e4d0:  ret = Cibyl106.RealtimeAltRoutes_Count_108e4d0(); break;
-      case 0x108e4e0:  ret = Cibyl106.RealtimeAltRoutes_Clear_108e4e0(); break;
-      case 0x108e4ec:  ret = Cibyl106.RealtimeAltRoutes_Init_Record_108e4ec( a0); break;
-      case 0x108e530:  ret = Cibyl106.RealtimeAltRoutes_Get_Record_108e530( a0); break;
-      case 0x108e54c:  ret = Cibyl106.RealtimeAltRoutes_Get_Route_Result_108e54c( a0); break;
-      case 0x108e568:  ret = Cibyl106.RealtimeAltRoutes_Get_Num_Routes_108e568(); break;
-      case 0x108e578:  ret = Cibyl106.RealtimeAltRoutes_Route_CancelRequest_108e578(); break;
-      case 0x108e588:  ret = Cibyl106.RealtimeAltRoutes_GetOrigin_108e588(sp, a0, a1, a2, a3); break;
-      case 0x108e638:  ret = Cibyl106.RealtimeAltRoutes_TripRoute_Request_108e638(sp, a0, a1, a2, a3); break;
-      case 0x108e71c:  ret = Cibyl106.RealtimeAltRoutes_OnTripRouteRC_108e71c(sp, a0, a1, a2, a3); break;
-      case 0x108e7b8:  ret = Cibyl106.RealtimeAltRoutes_Route_Request_108e7b8(sp, a0, a1, a2, a3); break;
-      case 0x108e8bc:  ret = Cibyl106.RealtimeAltRoutes_OnRouteSegments_108e8bc(sp, a0, a1, a2, a3); break;
-      case 0x108e97c:  ret = Cibyl106.RealtimeAltRoutes_OnTripRouteResults_108e97c(sp, a0, a1, a2, a3); break;
-      case 0x108eaa0:  ret = Cibyl106.RealtimeAltRoutes_OnRouteResults_108eaa0(sp, a0, a1, a2, a3); break;
-      case 0x108eba0:  ret = Cibyl106.RealtimeAltRoutes_Add_Route_108eba0(sp, a0, a1, a2, a3); break;
-      case 0x108ee94:  ret = Cibyl106.RealtimeExternalPoi_DisplayList_Compare_108ee94( a0, a1, a2, a3); break;
-      case 0x108ef44:  ret = Cibyl106.RealtimeExternalPoi_ExternalPoi_Init_108ef44(sp, a0, a1, a2, a3); break;
-      case 0x108efa4:  ret = Cibyl106.RealtimeExternalPoi_ExternalPoiType_Init_108efa4(sp, a0, a1, a2, a3); break;
-      case 0x108f020:  ret = Cibyl106.is_visible_108f020(sp, a0, a1, a2, a3); break;
-      case 0x108f0c0:  ret = Cibyl106.RemovePoiObject_108f0c0(sp, a0, a1, a2, a3); break;
-      case 0x108f1dc:  ret = Cibyl106.RealtimeExternalPoi_DisplayList_clear_108f1dc(sp, a0, a1, a2, a3); break;
-      case 0x108f278:  ret = Cibyl106.get_max_pois_display_108f278(sp, a0, a1, a2, a3); break;
-      case 0x108f2e4:  ret = Cibyl106.CreatePoiObject_108f2e4(sp, a0, a1, a2, a3); break;
-      case 0x108f5d4:  ret = Cibyl106.RealtimeExternalPoi_UpdateDisplayList_108f5d4(sp, a0, a1, a2, a3); break;
-      case 0x108f7b4:  ret = Cibyl107.OnPoiShortClick_108f7b4(sp, a0, a1, a2, a3); break;
-      case 0x108f83c:  ret = Cibyl107.init_ExternalPoiTypesTable_108f83c(sp, a0, a1, a2, a3); break;
-      case 0x108f89c:  ret = Cibyl107.init_ExternalPoiTable_108f89c(sp, a0, a1, a2, a3); break;
-      case 0x108f8fc:  ret = Cibyl107.RealtimeExternalPoi_AfterRefresh_108f8fc(sp, a0, a1, a2, a3); break;
-      case 0x108f9b4:  ret = Cibyl107.RealtimeExternalPoi_GetUrl_108f9b4(sp, a0, a1, a2, a3); break;
-      case 0x108f9d8:  ret = Cibyl107.RealtimeExternalPoi_FeatureEnabled_108f9d8(sp, a0, a1, a2, a3); break;
-      case 0x108fa0c:  ret = Cibyl107.RealtimeExternalPoi_DisplayList_add_ID_108fa0c(sp, a0, a1, a2, a3); break;
-      case 0x108fa5c:  ret = Cibyl107.RealtimeExternalPoi_DisplayList_108fa5c(sp, a0, a1, a2, a3); break;
-      case 0x108fc2c:  ret = Cibyl107.RealtimeExternalPoi_ExternalPoi_Remove_108fc2c(sp, a0, a1, a2, a3); break;
-      case 0x108fd88:  ret = Cibyl107.RealtimeExternalPoi_Term_108fd88(sp, a0, a1, a2, a3); break;
-      case 0x108fe18:  ret = Cibyl107.RealtimeExternalPoi_Init_108fe18(sp, a0, a1, a2, a3); break;
-      case 0x108ff08:  ret = Cibyl107.T_49_108ff08(sp, a0, a1, a2, a3); break;
-      case 0x108ff44:  ret = Cibyl107.RealtimeExternalPoi_ExternalPoiType_Add_108ff44(sp, a0, a1, a2, a3); break;
-      case 0x109011c:  ret = Cibyl107.RealtimeExternalPoi_ExternalPoi_Add_109011c(sp, a0, a1, a2, a3); break;
-      case 0x10902cc:  ret = Cibyl107.RealtimeExternalPoiDlg_10902cc(sp, a0, a1, a2, a3); break;
-      case 0x10904e0:  ret = Cibyl107.Drive_sk_cb_10904e0(sp, a0, a1, a2, a3); break;
-      case 0x1090560:  ret = Cibyl107.on_dialog_close_1090560(sp, a0, a1, a2, a3); break;
-      case 0x1090598:  ret = Cibyl107.draw_browser_rect_1090598(sp, a0, a1, a2, a3); break;
-      case 0x10907a0:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_Count_10907a0(); break;
-      case 0x10907b0:  ret = Cibyl107.RealtimeExternalPoi_DisplayedList_get_ID_10907b0( a0); break;
-      case 0x10907cc:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_10907cc(); break;
-      case 0x10907dc:  ret = Cibyl107.RealtimeExternalPoiNotifier_NotifyOnNavigate_10907dc(sp, a0, a1, a2, a3); break;
-      case 0x1090824:  ret = Cibyl107.RealtimeExternalPoiNotifier_NotifyOnPopUp_1090824(sp, a0, a1, a2, a3); break;
-      case 0x109086c:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_add_ID_109086c(sp, a0, a1, a2, a3); break;
-      case 0x10908d4:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_Init_10908d4(sp, a0, a1, a2, a3); break;
-      case 0x10908f4:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_clear_10908f4(sp, a0, a1, a2, a3); break;
-      case 0x1090920:  ret = Cibyl107.ssd_button_on_key_pressed_1090920(sp, a0, a1, a2, a3); break;
-      case 0x109098c:  ret = Cibyl107.ssd_button_enable_109098c(sp, a0, a1, a2, a3); break;
-      case 0x10909e0:  ret = Cibyl107.ssd_button_disable_10909e0(sp, a0, a1, a2, a3); break;
-      case 0x1090a34:  ret = Cibyl107.get_state_1090a34(sp, a0, a1, a2, a3); break;
-      case 0x1090b0c:  ret = Cibyl108.ssd_button_change_text_1090b0c(sp, a0, a1, a2, a3); break;
-      case 0x1090b48:  ret = Cibyl108.set_bitmap_name_1090b48(sp, a0, a1, a2, a3); break;
-      case 0x1090bd0:  ret = Cibyl108.ssd_button_change_images_1090bd0(sp, a0, a1, a2, a3); break;
-      case 0x1090cbc:  ret = Cibyl108.ssd_button_change_icon_1090cbc(sp, a0, a1, a2, a3); break;
-      case 0x1090d04:  ret = Cibyl108.release_1090d04(sp, a0, a1, a2, a3); break;
-      case 0x1090d3c:  ret = Cibyl108.set_value_1090d3c(sp, a0, a1, a2, a3); break;
-      case 0x1090ecc:  ret = Cibyl108.ssd_button_new_1090ecc(sp, a0, a1, a2, a3); break;
-      case 0x1091088:  ret = Cibyl108.ssd_button_label_1091088(sp, a0, a1, a2, a3); break;
-      case 0x109124c:  ret = Cibyl108.ssd_button_long_click_109124c(sp, a0, a1, a2, a3); break;
-      case 0x10912f8:  ret = Cibyl108.ssd_button_short_click_10912f8(sp, a0, a1, a2, a3); break;
-      case 0x1091354:  ret = Cibyl108.draw_1091354(sp, a0, a1, a2, a3); break;
-      case 0x1091518:  ret = Cibyl108.get_input_type_1091518( a0); break;
-      case 0x109152c:  ret = Cibyl108.ssd_list_get_row_109152c( a0, a1); break;
-      case 0x10915ac:  ret = Cibyl108.ssd_list_selected_string_10915ac( a0, a1, a2); break;
-      case 0x109162c:  ret = Cibyl108.ssd_list_selected_value_109162c( a0, a1, a2); break;
-      case 0x10916ac:  ret = Cibyl108.get_data_10916ac( a0); break;
-      case 0x1091748:  ret = Cibyl108.ssd_list_resize_1091748(sp, a0, a1, a2, a3); break;
-      case 0x10917cc:  ret = Cibyl108.update_list_rows_10917cc(sp, a0, a1, a2, a3); break;
-      case 0x1091c20:  ret = Cibyl108.label_callback_1091c20(sp, a0, a1, a2, a3); break;
-      case 0x1091d70:  ret = Cibyl108.setup_list_widgets_rows_1091d70(sp, a0, a1, a2, a3); break;
-      case 0x1092088:  ret = Cibyl109.ssd_list_populate_widgets_1092088(sp, a0, a1, a2, a3); break;
-      case 0x1092128:  ret = Cibyl109.next_button_callback_1092128(sp, a0, a1, a2, a3); break;
-      case 0x1092160:  ret = Cibyl109.setup_list_rows_1092160(sp, a0, a1, a2, a3); break;
-      case 0x10924c8:  ret = Cibyl109.ssd_list_populate_10924c8(sp, a0, a1, a2, a3); break;
-      case 0x1092560:  ret = Cibyl109.ssd_list_scroll_list_end_1092560(sp, a0, a1, a2, a3); break;
-      case 0x10925d4:  ret = Cibyl109.ssd_list_scroll_list_begin_10925d4(sp, a0, a1, a2, a3); break;
-      case 0x1092750:  ret = Cibyl109.ssd_list_new_1092750(sp, a0, a1, a2, a3); break;
-      case 0x1092860:  ret = Cibyl109.release_1092860(sp, a0, a1, a2, a3); break;
-      case 0x10928b4:  ret = Cibyl109.ssd_list_draw_10928b4(sp, a0, a1, a2, a3); break;
-      case 0x10929e0:  ret = Cibyl109.ssd_choice_new_10929e0(sp, a0, a1, a2, a3); break;
-      case 0x1092bf8:  ret = Cibyl109.choice_callback_1092bf8(sp, a0, a1, a2, a3); break;
-      case 0x1092c48:  ret = Cibyl109.set_data_1092c48(sp, a0, a1, a2, a3); break;
-      case 0x1092cc0:  ret = Cibyl109.set_value_1092cc0(sp, a0, a1, a2, a3); break;
-      case 0x1092d1c:  ret = Cibyl109.list_callback_1092d1c(sp, a0, a1, a2, a3); break;
-      case 0x1092d84:  ret = Cibyl109.get_value_1092d84(sp, a0, a1, a2, a3); break;
-      case 0x1092da8:  ret = Cibyl109.get_data_1092da8(sp, a0, a1, a2, a3); break;
-      case 0x1092e38:  Cibyl109.release_1092e38(); break;
-      case 0x1092e40:  ret = Cibyl109.short_click_1092e40(sp, a0, a1, a2, a3); break;
-      case 0x1092e78:  ret = Cibyl109.ssd_container_on_key_pressed_1092e78(sp, a0, a1, a2, a3); break;
-      case 0x1092ecc:  ret = Cibyl109.on_pointer_down_1092ecc(); break;
-      case 0x1092f4c:  ret = Cibyl109.draw_1092f4c(sp, a0, a1, a2, a3); break;
-      case 0x10939c0:  ret = Cibyl110.ssd_container_get_txtbox_height_10939c0(sp, a0, a1, a2, a3); break;
-      case 0x10939ec:  ret = Cibyl110.set_value_10939ec(sp, a0, a1, a2, a3); break;
-      case 0x1093a24:  ret = Cibyl110.ssd_container_new_1093a24(sp, a0, a1, a2, a3); break;
-      case 0x1093d88:  ret = Cibyl110.get_value_1093d88(sp, a0, a1, a2, a3); break;
-      case 0x1093dc4:  ret = Cibyl110.draw_title_bar_1093dc4(sp, a0, a1, a2, a3); break;
-      case 0x1093f4c:  ret = Cibyl110.draw_title_1093f4c(sp, a0, a1, a2, a3); break;
-      case 0x1093f90:  ret = Cibyl110.ssd_dialog_is_currently_active_1093f90(); break;
-      case 0x1093fa0:  ret = Cibyl110.ssd_dialog_get_currently_active_1093fa0(); break;
-      case 0x1093fc0:  ret = Cibyl110.ssd_dialog_currently_active_name_1093fc0(); break;
-      case 0x1093fe0:  ret = Cibyl110.ssd_dialog_get_current_container_1093fe0(); break;
-      case 0x1094000:  ret = Cibyl110.ssd_dialog_get_current_data_1094000(); break;
-      case 0x1094054:  ret = Cibyl110.ssd_dialog_get_focus_1094054(); break;
-      case 0x10940b8:  ret = Cibyl110.ssd_dialog_set_current_scroll_flag_10940b8( a0); break;
-      case 0x10940d8:  ret = Cibyl110.ssd_dialog_is_context_menu_10940d8(sp, a0, a1, a2, a3); break;
-      case 0x1094118:  ret = Cibyl110.ssd_dialog_get_1094118(sp, a0, a1, a2, a3); break;
-      case 0x10941a4:  ret = Cibyl110.ssd_dialog_exists_10941a4(sp, a0, a1, a2, a3); break;
-      case 0x10941e8:  ret = Cibyl110.ssd_dialog_right_title_button_10941e8(sp, a0, a1, a2, a3); break;
-      case 0x1094218:  ret = Cibyl110.ssd_dialog_free_1094218(sp, a0, a1, a2, a3); break;
-      case 0x10942e8:  ret = Cibyl110.ssd_dialog_add_vspace_10942e8(sp, a0, a1, a2, a3); break;
-      case 0x109434c:  ret = Cibyl110.ssd_dialog_add_hspace_109434c(sp, a0, a1, a2, a3); break;
-      case 0x10943b4:  ret = Cibyl110.ssd_dialog_set_ntv_keyboard_params_10943b4(sp, a0, a1, a2, a3); break;
-      case 0x109449c:  ret = Cibyl110.ssd_dialog_reset_offset_109449c(sp, a0, a1, a2, a3); break;
-      case 0x10944ec:  ret = Cibyl110.ssd_dialog_redraw_screen_recursive_10944ec(sp, a0, a1, a2, a3); break;
-      case 0x10945a4:  ret = Cibyl110.ssd_dialog_invalidate_tab_order_by_name_10945a4(sp, a0, a1, a2, a3); break;
-      case 0x10945f0:  ret = Cibyl110.ssd_dialog_invalidate_tab_order_10945f0(sp, a0, a1, a2, a3); break;
-      case 0x1094638:  ret = Cibyl110.ssd_dialog_context_1094638(sp, a0, a1, a2, a3); break;
-      case 0x109468c:  ret = Cibyl110.ssd_dialog_set_callback_109468c(sp, a0, a1, a2, a3); break;
-      case 0x1094734:  ret = Cibyl110.ssd_dialog_set_data_1094734(sp, a0, a1, a2, a3); break;
-      case 0x1094770:  ret = Cibyl110.ssd_dialog_set_value_1094770(sp, a0, a1, a2, a3); break;
-      case 0x10947ac:  ret = Cibyl110.ssd_dialog_get_data_10947ac(sp, a0, a1, a2, a3); break;
-      case 0x10947dc:  ret = Cibyl110.ssd_dialog_get_value_10947dc(sp, a0, a1, a2, a3); break;
-      case 0x109480c:  ret = Cibyl110.ssd_dialog_enable_callback_109480c(sp, a0, a1, a2, a3); break;
-      case 0x109483c:  ret = Cibyl110.ssd_dialog_draw_109483c(sp, a0, a1, a2, a3); break;
-      case 0x1094884:  ret = Cibyl110.ssd_dialog_hide_1094884(sp, a0, a1, a2, a3); break;
-      case 0x1094a94:  ret = Cibyl110.ssd_dialog_hide_all_1094a94(sp, a0, a1, a2, a3); break;
-      case 0x1094ae0:  ret = Cibyl110.left_softkey_callback_1094ae0(sp, a0, a1, a2, a3); break;
-      case 0x1094b64:  ret = Cibyl110.ssd_dialog_hide_current_1094b64(sp, a0, a1, a2, a3); break;
-      case 0x1094b98:  ret = Cibyl110.right_softkey_callback_1094b98(sp, a0, a1, a2, a3); break;
-      case 0x1094c1c:  ret = Cibyl110.ssd_dialog_drag_motion_1094c1c(sp, a0, a1, a2, a3); break;
-      case 0x1094dc0:  ret = Cibyl110.ssd_dialog_long_click_1094dc0(sp, a0, a1, a2, a3); break;
-      case 0x1094df8:  ret = Cibyl111.ssd_dialog_short_click_1094df8(sp, a0, a1, a2, a3); break;
-      case 0x1094f08:  ret = Cibyl111.ssd_dialog_released_1094f08(sp, a0, a1, a2, a3); break;
-      case 0x1094f50:  ret = Cibyl111.set_softkeys_1094f50(sp, a0, a1, a2, a3); break;
-      case 0x1095020:  ret = Cibyl111.ssd_dialog_refresh_current_softkeys_1095020(sp, a0, a1, a2, a3); break;
-      case 0x1095078:  ret = Cibyl111.ssd_dialog_drag_end_1095078(sp, a0, a1, a2, a3); break;
-      case 0x1095280:  ret = Cibyl111.keep_dragging_1095280(sp, a0, a1, a2, a3); break;
-      case 0x1095348:  ret = Cibyl111.ssd_dialog_drag_start_1095348(sp, a0, a1, a2, a3); break;
-      case 0x1095424:  ret = Cibyl111.ssd_dialog_pressed_1095424(sp, a0, a1, a2, a3); break;
-      case 0x109551c:  ret = Cibyl111.ssd_dialog_sort_tab_order_109551c(sp, a0, a1, a2, a3); break;
-      case 0x1095578:  ret = Cibyl111.ssd_dialog_sort_tab_order_by_gui_position_1095578(sp, a0, a1, a2, a3); break;
-      case 0x1095604:  ret = Cibyl111.draw_dialog_1095604(sp, a0, a1, a2, a3); break;
-      case 0x10957d8:  ret = Cibyl111.ssd_dialog_recalculate_10957d8(sp, a0, a1, a2, a3); break;
-      case 0x1095828:  ret = Cibyl111.ssd_dialog_draw_prev_1095828(sp, a0, a1, a2, a3); break;
-      case 0x1095874:  ret = Cibyl111.ssd_dialog_draw_now_1095874(sp, a0, a1, a2, a3); break;
-      case 0x109589c:  ret = Cibyl111.ssd_dialog_sort_tab_order_current_109589c(sp, a0, a1, a2, a3); break;
-      case 0x10958c4:  ret = Cibyl111.ssd_dialog_change_text_10958c4(sp, a0, a1, a2, a3); break;
-      case 0x109590c:  ret = Cibyl111.ssd_dialog_change_button_109590c(sp, a0, a1, a2, a3); break;
-      case 0x1095a08:  ret = Cibyl111.ssd_dialog_new_1095a08(sp, a0, a1, a2, a3); break;
-      case 0x1095be8:  ret = Cibyl111.ssd_dialog_align_focus_1095be8(sp, a0, a1, a2, a3); break;
-      case 0x1095dd0:  ret = Cibyl111.ssd_dialog_set_dialog_focus_1095dd0(sp, a0, a1, a2, a3); break;
-      case 0x1095eec:  ret = Cibyl111.ssd_dialog_activate_1095eec(sp, a0, a1, a2, a3); break;
-      case 0x109617c:  ret = Cibyl112.ssd_dialog_set_focus_109617c(sp, a0, a1, a2, a3); break;
-      case 0x10961b0:  ret = Cibyl112.ssd_dialog_resort_tab_order_10961b0(sp, a0, a1, a2, a3); break;
-      case 0x1096264:  ret = Cibyl112.ssd_dialog_move_focus_1096264(sp, a0, a1, a2, a3); break;
-      case 0x10962c4:  ret = Cibyl112.OnKeyPressed_10962c4(sp, a0, a1, a2, a3); break;
-      case 0x10964f4:  ret = Cibyl112.ssd_entry_set_kb_params_10964f4(sp, a0, a1, a2, a3); break;
-      case 0x1096544:  ret = Cibyl112.ssd_entry_set_editbox_title_1096544( a0, a1); break;
-      case 0x1096560:  ret = Cibyl112.confirmed_edit_callback_1096560(sp, a0, a1, a2, a3); break;
-      case 0x10965a4:  ret = Cibyl112.edit_callback_10965a4(sp, a0, a1, a2, a3); break;
-      case 0x1096668:  ret = Cibyl112.confirm_cb_1096668(sp, a0, a1, a2, a3); break;
-      case 0x1096694:  ret = Cibyl112.on_kb_closed_1096694(sp, a0, a1, a2, a3); break;
-      case 0x1096754:  ret = Cibyl112.set_value_1096754(sp, a0, a1, a2, a3); break;
-      case 0x10967dc:  ret = Cibyl112.get_value_10967dc(sp, a0, a1, a2, a3); break;
-      case 0x1096800:  ret = Cibyl112.T_20_1096800(sp, a0, a1, a2, a3); break;
-      case 0x109683c:  ret = Cibyl112.ssd_entry_new_109683c(sp, a0, a1, a2, a3); break;
-      case 0x1096acc:  ret = Cibyl112.ssd_confirmed_entry_new_1096acc(sp, a0, a1, a2, a3); break;
-      case 0x1096d18:  ret = Cibyl112.on_pointer_down_1096d18(); break;
-      case 0x1096d98:  ret = Cibyl112.ssd_menu_hide_1096d98(sp, a0, a1, a2, a3); break;
-      case 0x1096db8:  ret = Cibyl112.find_action_1096db8(sp, a0, a1, a2, a3); break;
-      case 0x1096e4c:  ret = Cibyl112.ssd_list_menu_activate_1096e4c(sp, a0, a1, a2, a3); break;
-      case 0x1096f78:  ret = Cibyl112.ssd_menu_set_right_text_1096f78(sp, a0, a1, a2, a3); break;
-      case 0x1096fdc:  ret = Cibyl112.ssd_menu_new_cb_1096fdc(sp, a0, a1, a2, a3); break;
-      case 0x10977e4:  ret = Cibyl113.ssd_menu_new_10977e4(sp, a0, a1, a2, a3); break;
-      case 0x1097814:  ret = Cibyl113.ssd_menu_activate_1097814(sp, a0, a1, a2, a3); break;
-      case 0x10978dc:  ret = Cibyl113.on_cancel_10978dc(sp, a0, a1, a2, a3); break;
-      case 0x1097914:  ret = Cibyl113.on_key_pressed_cancel_1097914(sp, a0, a1, a2, a3); break;
-      case 0x1097958:  ret = Cibyl113.short_click_1097958(sp, a0, a1, a2, a3); break;
-      case 0x1097994:  ret = Cibyl113.long_click_1097994(sp, a0, a1, a2, a3); break;
-      case 0x10979b4:  ret = Cibyl113.on_key_pressed_10979b4(sp, a0, a1, a2, a3); break;
-      case 0x10979f8:  ret = Cibyl113.delayed_short_click_10979f8(sp, a0, a1, a2, a3); break;
-      case 0x1097aa4:  ret = Cibyl113.delayed_cancel_1097aa4(sp, a0, a1, a2, a3); break;
-      case 0x1097ad8:  ret = Cibyl113.ssd_text_set_auto_size_1097ad8( a0); break;
-      case 0x1097ae8:  ret = Cibyl113.ssd_text_set_auto_trim_1097ae8( a0); break;
-      case 0x1097af8:  Cibyl113.ssd_text_set_color_1097af8( a0, a1); break;
-      case 0x1097b00:  ret = Cibyl113.ssd_text_set_input_type_1097b00( a0, a1, a2); break;
-      case 0x1097b1c:  ret = Cibyl113.ssd_text_set_font_size_1097b1c( a0, a1); break;
-      case 0x1097b3c:  ret = Cibyl113.reset_line_cache_1097b3c( a0, a1, a2, a3); break;
-      case 0x1097bc8:  ret = Cibyl113.get_value_1097bc8(sp, a0, a1, a2, a3); break;
-      case 0x1097c00:  ret = Cibyl113.ssd_text_get_text_1097c00(sp, a0, a1, a2, a3); break;
-      case 0x1097c34:  ret = Cibyl113.ssd_text__get_input_type_1097c34( a0); break;
-      case 0x1097c48:  ret = Cibyl113.ssd_text_set_readonly_1097c48( a0, a1); break;
-      case 0x1097d74:  ret = Cibyl113.text_ctx_init_1097d74(sp, a0, a1, a2, a3); break;
-      case 0x1097dac:  ret = Cibyl113.set_value_1097dac(sp, a0, a1, a2, a3); break;
-      case 0x1097e5c:  ret = Cibyl113.ssd_text_set_text_1097e5c(sp, a0, a1, a2, a3); break;
-      case 0x1097ecc:  ret = Cibyl113.on_editbox_closed_1097ecc(sp, a0, a1, a2, a3); break;
-      case 0x1097ef4:  ret = Cibyl113.ssd_text_reset_text_1097ef4(sp, a0, a1, a2, a3); break;
-      case 0x1097f40:  ret = Cibyl113.release_1097f40(sp, a0, a1, a2, a3); break;
-      case 0x1097f94:  ret = Cibyl113.format_text_1097f94(sp, a0, a1, a2, a3); break;
-      case 0x1098814:  ret = Cibyl113.draw_1098814(sp, a0, a1, a2, a3); break;
-      case 0x1098b48:  ret = Cibyl114.ssd_text_on_key_pressed_1098b48(sp, a0, a1, a2, a3); break;
-      case 0x1098c84:  ret = Cibyl114.T_35_1098c84(sp, a0, a1, a2, a3); break;
-      case 0x1098cc0:  ret = Cibyl114.ssd_text_set_text_size_1098cc0(sp, a0, a1, a2, a3); break;
-      case 0x1098d10:  ret = Cibyl114.ssd_text_new_1098d10(sp, a0, a1, a2, a3); break;
-      case 0x1098e94:  ret = Cibyl114.ssd_widget_default_on_key_pressed_1098e94(); break;
-      case 0x1098e9c:  Cibyl114.ssd_widget_set_callback_1098e9c( a0, a1); break;
-      case 0x1098ec4:  ret = Cibyl114.ssd_widget_add_1098ec4( a0, a1); break;
-      case 0x1098ef8:  Cibyl114.ssd_widget_set_size_1098ef8( a0, a1, a2); break;
-      case 0x1098f04:  ret = Cibyl114.ssd_widget_move_child_positions_1098f04(sp, a0, a1, a2, a3); break;
-      case 0x1098f84:  ret = Cibyl114.ssd_widget_set_offset_1098f84(sp, a0, a1, a2, a3); break;
-      case 0x1098fd8:  Cibyl114.ssd_widget_set_context_1098fd8( a0, a1); break;
-      case 0x1098fe0:  Cibyl114.ssd_widget_set_color_1098fe0( a0, a1, a2); break;
-      case 0x1098fec:  ret = Cibyl114.ssd_widget_get_context_1098fec( a0); break;
-      case 0x1098ff8:  ret = Cibyl114.ssd_widget_reset_cache_1098ff8(sp, a0, a1, a2, a3); break;
-      case 0x1099048:  ret = Cibyl114.ssd_widget_reset_position_1099048(sp, a0, a1, a2, a3); break;
-      case 0x1099098:  ret = Cibyl114.ssd_widget_hide_1099098( a0); break;
-      case 0x10990ac:  ret = Cibyl114.ssd_widget_show_10990ac( a0); break;
-      case 0x10990cc:  ret = Cibyl114.ssd_widget_set_flags_10990cc( a0, a1); break;
-      case 0x10990ec:  ret = Cibyl114.ssd_widget_on_key_pressed_10990ec(sp, a0, a1, a2, a3); break;
-      case 0x1099174:  Cibyl114.ssd_widget_set_left_softkey_callback_1099174( a0, a1); break;
-      case 0x109917c:  Cibyl114.ssd_widget_set_right_softkey_callback_109917c( a0, a1); break;
-      case 0x1099184:  ret = Cibyl114.ssd_widget_pointer_down_force_click_1099184( a0); break;
-      case 0x1099190:  ret = Cibyl114.ssd_widget_set_pointer_force_click_1099190( a0); break;
-      case 0x10991ac:  ret = Cibyl114.ssd_widget_set_click_offsets_10991ac(sp, a0, a1, a2, a3); break;
-      case 0x10991d0:  ret = Cibyl114.ssd_widget_set_click_offsets_ext_10991d0(sp, a0, a1, a2, a3); break;
-      case 0x10991e8:  Cibyl114.ssd_widget_set_focus_highlight_10991e8( a0, a1); break;
-      case 0x10991f0:  ret = Cibyl114.ssd_widget_set_recalculate_10991f0( a0); break;
-      case 0x10991fc:  ret = Cibyl114.ssd_widget_free_node_10991fc(sp, a0, a1, a2, a3); break;
-      case 0x1099240:  ret = Cibyl114.ssd_widget_free_all_1099240(sp, a0, a1, a2, a3); break;
-      case 0x10992a8:  ret = Cibyl114.ssd_widget_free_10992a8(sp, a0, a1, a2, a3); break;
-      case 0x1099350:  ret = Cibyl114.ssd_widget_get_size_1099350(sp, a0, a1, a2, a3); break;
-      case 0x109973c:  ret = Cibyl114.ssd_widget_contains_point_109973c(sp, a0, a1, a2, a3); break;
-      case 0x1099840:  ret = Cibyl114.ssd_widget_pointer_up_force_click_1099840(sp, a0, a1, a2, a3); break;
-      case 0x1099934:  ret = Cibyl114.ssd_widget_long_click_1099934(sp, a0, a1, a2, a3); break;
-      case 0x10999d0:  ret = Cibyl114.ssd_widget_short_click_10999d0(sp, a0, a1, a2, a3); break;
-      case 0x1099a6c:  ret = Cibyl114.ssd_widget_pointer_up_1099a6c(sp, a0, a1, a2, a3); break;
-      case 0x1099b08:  ret = Cibyl114.ssd_widget_pointer_down_1099b08(sp, a0, a1, a2, a3); break;
-      case 0x1099bbc:  ret = Cibyl114.ssd_widget_find_by_pos_1099bbc(sp, a0, a1, a2, a3); break;
-      case 0x1099c38:  ret = Cibyl114.get_size_1099c38(sp, a0, a1, a2, a3); break;
-      case 0x109a120:  ret = Cibyl115.ssd_widget_find_clickable_by_pos_109a120(sp, a0, a1, a2, a3); break;
-      case 0x109a238:  ret = Cibyl115.ssd_widget_container_size_109a238(sp, a0, a1, a2, a3); break;
-      case 0x109a320:  ret = Cibyl115.ssd_widget_replace_109a320(sp, a0, a1, a2, a3); break;
-      case 0x109a3a8:  ret = Cibyl115.ssd_widget_remove_109a3a8(sp, a0, a1, a2, a3); break;
-      case 0x109a424:  ret = Cibyl115.ssd_widget_rtl_109a424(sp, a0, a1, a2, a3); break;
-      case 0x109a45c:  ret = Cibyl115.ssd_widget_new_109a45c(sp, a0, a1, a2, a3); break;
-      case 0x109a588:  ret = Cibyl115.ssd_widget_draw_row_109a588(sp, a0, a1, a2, a3); break;
-      case 0x109aac0:  ret = Cibyl115.ssd_widget_draw_pack_109aac0(sp, a0, a1, a2, a3); break;
-      case 0x109adc0:  ret = Cibyl115.ssd_widget_draw_109adc0(sp, a0, a1, a2, a3); break;
-      case 0x109adf8:  ret = Cibyl115.ssd_widget_draw_one_109adf8(sp, a0, a1, a2, a3); break;
-      case 0x109af20:  ret = Cibyl115.ssd_widget_draw_grid_109af20(sp, a0, a1, a2, a3); break;
-      case 0x109b304:  ret = Cibyl115.ssd_widget_get_109b304(sp, a0, a1, a2, a3); break;
-      case 0x109b38c:  ret = Cibyl116.ssd_widget_set_data_109b38c(sp, a0, a1, a2, a3); break;
-      case 0x109b3e0:  ret = Cibyl116.ssd_widget_set_value_109b3e0(sp, a0, a1, a2, a3); break;
-      case 0x109b434:  ret = Cibyl116.ssd_widget_set_left_softkey_text_109b434(sp, a0, a1, a2, a3); break;
-      case 0x109b50c:  ret = Cibyl116.ssd_widget_set_right_softkey_text_109b50c(sp, a0, a1, a2, a3); break;
-      case 0x109b5e8:  ret = Cibyl116.ssd_widget_get_data_109b5e8(sp, a0, a1, a2, a3); break;
-      case 0x109b634:  ret = Cibyl116.ssd_widget_get_value_109b634(sp, a0, a1, a2, a3); break;
-      case 0x109b694:  ret = Cibyl116.ssd_progress_set_value_109b694( a0, a1); break;
-      case 0x109b6bc:  ret = Cibyl116.ssd_progress_new_109b6bc(sp, a0, a1, a2, a3); break;
-      case 0x109b71c:  ret = Cibyl116.draw_109b71c(sp, a0, a1, a2, a3); break;
-      case 0x109bb60:  ret = Cibyl116.list_callback_109bb60(sp, a0, a1, a2, a3); break;
-      case 0x109bb9c:  ret = Cibyl116.del_callback_109bb9c(sp, a0, a1, a2, a3); break;
-      case 0x109bbd8:  ret = Cibyl116.list_left_softkey_callback_109bbd8(sp, a0, a1, a2, a3); break;
-      case 0x109bc0c:  ret = Cibyl116.ssd_generic_list_dialog_hide_all_109bc0c(sp, a0, a1, a2, a3); break;
-      case 0x109bc2c:  ret = Cibyl116.ssd_generic_list_dialog_hide_109bc2c(sp, a0, a1, a2, a3); break;
-      case 0x109bce4:  ret = Cibyl116.on_dialog_closed_109bce4(sp, a0, a1, a2, a3); break;
-      case 0x109bf18:  ret = Cibyl116.ssd_generic_list_dialog_show_109bf18(sp, a0, a1, a2, a3); break;
-      case 0x109c0e4:  ret = Cibyl116.get_value_109c0e4( a0); break;
-      case 0x109c11c:  ret = Cibyl116.get_data_109c11c( a0); break;
-      case 0x109c14c:  ret = Cibyl116.ssd_checkbox_new_109c14c(sp, a0, a1, a2, a3); break;
-      case 0x109c310:  ret = Cibyl116.choice_callback_109c310(sp, a0, a1, a2, a3); break;
-      case 0x109c388:  ret = Cibyl116.set_data_109c388(sp, a0, a1, a2, a3); break;
-      case 0x109c450:  ret = Cibyl116.set_value_109c450(sp, a0, a1, a2, a3); break;
-      case 0x109c504:  ret = Cibyl116.ssd_contextmenu_show_item_109c504(sp, a0, a1, a2, a3); break;
-      case 0x109c5ec:  ret = Cibyl116.ssd_contextmenu_menu_button_register_109c5ec(sp, a0, a1, a2, a3); break;
-      case 0x109c628:  ret = Cibyl116.on_options_wrapper_109c628(sp, a0, a1, a2, a3); break;
-      case 0x109c678:  ret = Cibyl116.close_all_popup_menus_109c678(sp, a0, a1, a2, a3); break;
-      case 0x109c720:  ret = Cibyl116.exit_context_menu_109c720(sp, a0, a1, a2, a3); break;
-      case 0x109c7b0:  ret = Cibyl116.native_menu_item_callback_109c7b0(sp, a0, a1, a2, a3); break;
-      case 0x109c7f0:  ret = Cibyl116.ssd_context_menu_show_109c7f0(sp, a0, a1, a2, a3); break;
-      case 0x109c8e4:  ret = Cibyl117.ssd_contextmenu_delete_109c8e4(sp, a0, a1, a2, a3); break;
-      case 0x109c9a4:  ret = Cibyl117.ssd_contextmenu_set_separator_109c9a4(sp, a0, a1, a2, a3); break;
-      case 0x109ca4c:  ret = Cibyl117.ssd_contextmenu_show_item__by_action_name_109ca4c(sp, a0, a1, a2, a3); break;
-      case 0x109cbc8:  ret = Cibyl117.on_dialog_closed_109cbc8(sp, a0, a1, a2, a3); break;
-      case 0x109cc04:  ret = Cibyl117.on_device_event_109cc04( a0); break;
-      case 0x109cc28:  ret = Cibyl117.ssd_tabcontrol_get_dialog_109cc28( a0); break;
-      case 0x109cc34:  ret = Cibyl117.get_arrow_size_109cc34(sp, a0, a1, a2, a3); break;
-      case 0x109ccc8:  ret = Cibyl117.ssd_tabcontrol_get_height_109ccc8(sp, a0, a1, a2, a3); break;
-      case 0x109cce8:  ret = Cibyl117.ssd_tabcontrol_get_tab_109cce8(sp, a0, a1, a2, a3); break;
-      case 0x109cd5c:  ret = Cibyl117.ssd_tabcontrol_get_active_tab_109cd5c(sp, a0, a1, a2, a3); break;
-      case 0x109cd80:  ret = Cibyl117.tabsline_set_text_109cd80(sp, a0, a1, a2, a3); break;
-      case 0x109cdd0:  ret = Cibyl117.tabsline_select_tab_109cdd0(sp, a0, a1, a2, a3); break;
-      case 0x109ce9c:  ret = Cibyl117.tabsline_enable_arrow_109ce9c(sp, a0, a1, a2, a3); break;
-      case 0x109cefc:  ret = Cibyl117.initialize_tabsline_109cefc(sp, a0, a1, a2, a3); break;
-      case 0x109cf9c:  ret = Cibyl117.tabs_draw_109cf9c(sp, a0, a1, a2, a3); break;
-      case 0x109d1bc:  ret = Cibyl117.ssd_tabcontrol_set_active_tab_109d1bc(sp, a0, a1, a2, a3); break;
-      case 0x109d46c:  ret = Cibyl117.on_right_arrow_109d46c(sp, a0, a1, a2, a3); break;
-      case 0x109d4bc:  ret = Cibyl117.on_right_arrow_p_109d4bc(sp, a0, a1, a2, a3); break;
-      case 0x109d4dc:  ret = Cibyl117.on_tab_109d4dc(sp, a0, a1, a2, a3); break;
-      case 0x109d55c:  ret = Cibyl117.on_tab_p_109d55c(sp, a0, a1, a2, a3); break;
-      case 0x109d57c:  ret = Cibyl117.on_left_arrow_109d57c(sp, a0, a1, a2, a3); break;
-      case 0x109d5c4:  ret = Cibyl117.on_left_arrow_p_109d5c4(sp, a0, a1, a2, a3); break;
-      case 0x109d5e4:  ret = Cibyl117.move_one_tab_left_109d5e4(sp, a0, a1, a2, a3); break;
-      case 0x109d640:  ret = Cibyl117.ssd_tabcontrol_move_tab_left_109d640(sp, a0, a1, a2, a3); break;
-      case 0x109d688:  ret = Cibyl117.move_one_tab_right_109d688(sp, a0, a1, a2, a3); break;
-      case 0x109d6e4:  ret = Cibyl117.OnKeyPressed_109d6e4(sp, a0, a1, a2, a3); break;
-      case 0x109d794:  ret = Cibyl117.OnTabLineKeyPressed_109d794(sp, a0, a1, a2, a3); break;
-      case 0x109d7bc:  ret = Cibyl117.ssd_tabcontrol_move_tab_right_109d7bc(sp, a0, a1, a2, a3); break;
-      case 0x109d804:  ret = Cibyl117.ssd_tabcontrol_show_109d804(sp, a0, a1, a2, a3); break;
-      case 0x109d854:  ret = Cibyl117.tabcontrol_info_init_109d854(sp, a0, a1, a2, a3); break;
-      case 0x109d890:  ret = Cibyl117.ssd_tabcontrol_new_109d890(sp, a0, a1, a2, a3); break;
-      case 0x109dde0:  ret = Cibyl118.ssd_bitmap_remove_overlays_109dde0( a0); break;
-      case 0x109ddec:  ret = Cibyl118.ssd_bitmap_add_overlay_109ddec(sp, a0, a1, a2, a3); break;
-      case 0x109de58:  ret = Cibyl118.close_splash_109de58(sp, a0, a1, a2, a3); break;
-      case 0x109de94:  ret = Cibyl118.set_bitmap_name_109de94(sp, a0, a1, a2, a3); break;
-      case 0x109df10:  ret = Cibyl118.ssd_bitmap_update_109df10(sp, a0, a1, a2, a3); break;
-      case 0x109df3c:  ret = Cibyl118.ssd_bitmap_image_update_109df3c(sp, a0, a1, a2, a3); break;
-      case 0x109df90:  ret = Cibyl118.ssd_bitmap_image_new_109df90(sp, a0, a1, a2, a3); break;
-      case 0x109e050:  ret = Cibyl118.release_109e050(sp, a0, a1, a2, a3); break;
-      case 0x109e088:  ret = Cibyl118.set_value_109e088(sp, a0, a1, a2, a3); break;
-      case 0x109e13c:  ret = Cibyl118.ssd_bitmap_new_109e13c(sp, a0, a1, a2, a3); break;
-      case 0x109e1c0:  ret = Cibyl118.ssd_bitmap_splash_109e1c0(sp, a0, a1, a2, a3); break;
-      case 0x109e274:  ret = Cibyl118.draw_109e274(sp, a0, a1, a2, a3); break;
-      case 0x109e4a8:  ret = Cibyl118.draw_109e4a8(sp, a0, a1, a2, a3); break;
-      case 0x109e4d8:  ret = Cibyl118.ssd_popup_update_location_109e4d8( a0, a1); break;
-      case 0x109e4f0:  ret = Cibyl118.ssd_popup_new_109e4f0(sp, a0, a1, a2, a3); break;
-      case 0x109e6d0:  ret = Cibyl118.ssd_separator_new_109e6d0(sp, a0, a1, a2, a3); break;
-      case 0x109e718:  ret = Cibyl118.draw_109e718(sp, a0, a1, a2, a3); break;
-      case 0x109e7bc:  ret = Cibyl118.ssd_icon_wimage_is_valid_109e7bc( a0, a1); break;
-      case 0x109e828:  ret = Cibyl118.on_key_pressed_109e828(sp, a0, a1, a2, a3); break;
-      case 0x109e89c:  ret = Cibyl118.ssd_icon_set_width_109e89c( a0, a1); break;
-      case 0x109e8c4:  ret = Cibyl118.ssd_icon_set_state_109e8c4( a0, a1); break;
-      case 0x109e8d8:  ret = Cibyl118.ssd_icon_set_unhandled_key_press_109e8d8( a0, a1); break;
-      case 0x109e8e4:  ret = Cibyl118.on_pointer_down_109e8e4(sp, a0, a1, a2, a3); break;
-      case 0x109e95c:  ret = Cibyl118.draw_109e95c(sp, a0, a1, a2, a3); break;
-      case 0x109eb58:  ret = Cibyl118.load_image_109eb58(sp, a0, a1, a2, a3); break;
-      case 0x109ec20:  ret = Cibyl118.imageset_info_load_109ec20(sp, a0, a1, a2, a3); break;
-      case 0x109ecb4:  ret = Cibyl118.ssd_icon_set_images_109ecb4(sp, a0, a1, a2, a3); break;
-      case 0x109ed84:  ret = Cibyl118.wimage_info_load_109ed84(sp, a0, a1, a2, a3); break;
-      case 0x109eecc:  ret = Cibyl118.wimageset_info_load_109eecc(sp, a0, a1, a2, a3); break;
-      case 0x109ef58:  ret = Cibyl118.ssd_icon_set_wimages_109ef58(sp, a0, a1, a2, a3); break;
-      case 0x109f030:  ret = Cibyl119.icon_ctx_init_109f030(sp, a0, a1, a2, a3); break;
-      case 0x109f054:  ret = Cibyl119.ssd_icon_create_109f054(sp, a0, a1, a2, a3); break;
-      case 0x109f12c:  ret = Cibyl119.widget_get_next_focus_109f12c(sp, a0, a1, a2, a3); break;
-      case 0x109f1fc:  ret = Cibyl119.ssd_widget_get_input_type_109f1fc(sp, a0, a1, a2, a3); break;
-      case 0x109f260:  Cibyl119.ssd_widget_loose_focus_109f260( a0); break;
-      case 0x109f39c:  ret = Cibyl119.ssd_widget_sort_gui_tab_order__fix_corners_109f39c(sp, a0, a1, a2, a3); break;
-      case 0x109f628:  ret = Cibyl119.ssd_widget_sort_gui_tab_order__fix_orphan_pointers_109f628(sp, a0, a1, a2, a3); break;
-      case 0x109f69c:  ret = Cibyl119.ssd_widget_sort_gui_tab_order_109f69c(sp, a0, a1, a2, a3); break;
-      case 0x109f7b8:  ret = Cibyl119.ssd_widget_reset_tab_order_recursive_109f7b8(sp, a0, a1, a2, a3); break;
-      case 0x109f844:  ret = Cibyl119.ssd_widget_reset_tab_order_109f844(sp, a0, a1, a2, a3); break;
-      case 0x109f868:  ret = Cibyl119.ssd_widget_sort_tab_order_recursive_109f868(sp, a0, a1, a2, a3); break;
-      case 0x109fa40:  ret = Cibyl119.fix_widget_tab_order_sequence_109fa40( a0); break;
-      case 0x109faac:  ret = Cibyl119.ssd_widget_set_focus_109faac(sp, a0, a1, a2, a3); break;
-      case 0x109faf8:  ret = Cibyl119.ssd_widget_sort_tab_order_109faf8(sp, a0, a1, a2, a3); break;
-      case 0x109fb98:  ret = Cibyl119.ssd_widget_move_focus_109fb98(sp, a0, a1, a2, a3); break;
-      case 0x109fc68:  ret = Cibyl119.on_dialog_closed_109fc68(sp, a0, a1, a2, a3); break;
-      case 0x109fcc4:  ret = Cibyl119.ssd_show_keyboard_dialog_ext_109fcc4(sp, a0, a1, a2, a3); break;
-      case 0x10a036c:  ret = Cibyl119.on_done_10a036c(sp, a0, a1, a2, a3); break;
-      case 0x10a03d4:  ret = Cibyl119.btn_callback_10a03d4(sp, a0, a1, a2, a3); break;
-      case 0x10a0400:  ret = Cibyl119.on_key_pressed__delegate_to_editbox_10a0400(sp, a0, a1, a2, a3); break;
-      case 0x10a04e4:  ret = Cibyl119.roadmap_login_new_existing_dlg_10a04e4( a0, a1, a2, a3); break;
-      case 0x10a05a0:  ret = Cibyl120.roadmap_login_ssd_on_login_cb_10a05a0( a0); break;
-      case 0x10a05c4:  ret = Cibyl120.roadmap_login_is_login_active_10a05c4(); break;
-      case 0x10a05d8:  ret = Cibyl120.roadmap_login_dlg_get_username_10a05d8(); break;
-      case 0x10a05e4:  ret = Cibyl120.roadmap_login_dlg_get_password_10a05e4(); break;
-      case 0x10a05f0:  ret = Cibyl120.roadmap_login_dlg_get_nickname_10a05f0(); break;
-      case 0x10a05fc:  ret = Cibyl120.roadmap_login_ssd_on_signup_skip_10a05fc(sp, a0, a1, a2, a3); break;
-      case 0x10a0640:  ret = Cibyl120.roadmap_login_dlg_get_allowPing_10a0640(sp, a0, a1, a2, a3); break;
-      case 0x10a066c:  ret = Cibyl120.create_button_group_10a066c(sp, a0, a1, a2, a3); break;
-      case 0x10a0768:  ret = Cibyl120.roadmap_login_profile_dialog_show_10a0768(sp, a0, a1, a2, a3); break;
-      case 0x10a10f4:  ret = Cibyl120.on_ok_softkey_10a10f4(sp, a0, a1, a2, a3); break;
-      case 0x10a111c:  ret = Cibyl120.foursquare_button_cb_10a111c(sp, a0, a1, a2, a3); break;
-      case 0x10a113c:  ret = Cibyl120.facebook_button_cb_10a113c(sp, a0, a1, a2, a3); break;
-      case 0x10a115c:  ret = Cibyl120.twitter_button_cb_10a115c(sp, a0, a1, a2, a3); break;
-      case 0x10a117c:  ret = Cibyl120.on_mood_select_10a117c(sp, a0, a1, a2, a3); break;
-      case 0x10a11a0:  ret = Cibyl120.on_mood_changed_10a11a0(sp, a0, a1, a2, a3); break;
-      case 0x10a11e4:  ret = Cibyl120.on_car_select_10a11e4(sp, a0, a1, a2, a3); break;
-      case 0x10a1208:  ret = Cibyl120.on_car_changed_10a1208(sp, a0, a1, a2, a3); break;
-      case 0x10a1258:  ret = Cibyl120.on_close_dialog_10a1258(sp, a0, a1, a2, a3); break;
-      case 0x10a1290:  ret = Cibyl120.close_timeout_10a1290(sp, a0, a1, a2, a3); break;
-      case 0x10a12c0:  ret = Cibyl120.roadmap_login_details_dialog_show_un_pw_10a12c0(sp, a0, a1, a2, a3); break;
-      case 0x10a133c:  ret = Cibyl120.on_signup_skip_10a133c(sp, a0, a1, a2, a3); break;
-      case 0x10a135c:  ret = Cibyl120.roadmap_login_update_dlg_show_10a135c(sp, a0, a1, a2, a3); break;
-      case 0x10a13e8:  ret = Cibyl120.T_62_10a13e8(sp, a0, a1, a2, a3); break;
-      case 0x10a1440:  ret = Cibyl120.on_create_10a1440(sp, a0, a1, a2, a3); break;
-      case 0x10a14c4:  ret = Cibyl120.on_next_10a14c4(sp, a0, a1, a2, a3); break;
-      case 0x10a14f8:  ret = Cibyl120.on_update_10a14f8(sp, a0, a1, a2, a3); break;
-      case 0x10a15d0:  ret = Cibyl120.roadmap_res_invalidate_10a15d0(sp, a0, a1, a2, a3); break;
-      case 0x10a166c:  ret = Cibyl120.free_resource_10a166c(sp, a0, a1, a2, a3); break;
-      case 0x10a1708:  ret = Cibyl120.roadmap_res_shutdown_10a1708(sp, a0, a1, a2, a3); break;
-      case 0x10a1788:  ret = Cibyl120.load_resource_10a1788(sp, a0, a1, a2, a3); break;
-      case 0x10a1918:  ret = Cibyl121.roadmap_res_get_10a1918(sp, a0, a1, a2, a3); break;
-      case 0x10a1f74:  ret = Cibyl121.download_size_callback_10a1f74(sp, a0, a1, a2, a3); break;
-      case 0x10a1fb4:  ret = Cibyl121.PopOldest_10a1fb4(sp, a0, a1, a2, a3); break;
-      case 0x10a210c:  ret = Cibyl121.ResDataQueue_Push_10a210c(sp, a0, a1, a2, a3); break;
-      case 0x10a2214:  ret = Cibyl121.download_progress_callback_10a2214(sp, a0, a1, a2, a3); break;
-      case 0x10a2264:  ret = Cibyl121.get_images_output_path_10a2264(sp, a0, a1, a2, a3); break;
-      case 0x10a22d0:  ret = Cibyl121.get_sound_output_path_10a22d0(sp, a0, a1, a2, a3); break;
-      case 0x10a2368:  ret = Cibyl121.roadmap_download_start_10a2368(sp, a0, a1, a2, a3); break;
-      case 0x10a28a0:  ret = Cibyl121.download_done_callback_10a28a0(sp, a0, a1, a2, a3); break;
-      case 0x10a2a2c:  ret = Cibyl121.download_error_callback_10a2a2c(sp, a0, a1, a2, a3); break;
-      case 0x10a2b20:  ret = Cibyl121.roadmap_res_download_init_10a2b20(sp, a0, a1, a2, a3); break;
-      case 0x10a2c58:  ret = Cibyl122.roadmap_res_download_10a2c58(sp, a0, a1, a2, a3); break;
-      case 0x10a2d9c:  ret = Cibyl122.intro_screen_left_key_callback_10a2d9c(); break;
-      case 0x10a2da4:  Cibyl122.on_dialog_closed_10a2da4(); break;
-      case 0x10a2dac:  Cibyl122.on_dialog_closed_terms_of_use_10a2dac(); break;
-      case 0x10a2db4:  ret = Cibyl122.OnKeyPressed_10a2db4( a1); break;
-      case 0x10a2dc8:  ret = Cibyl122.roadmap_welcome_guided_tour_10a2dc8(sp, a0, a1, a2, a3); break;
-      case 0x10a2dfc:  ret = Cibyl122.space_10a2dfc(sp, a0, a1, a2, a3); break;
-      case 0x10a2e48:  ret = Cibyl122.roadmap_welcome_personalize_dialog_10a2e48(sp, a0, a1, a2, a3); break;
-      case 0x10a320c:  ret = Cibyl122.on_personalize_10a320c(sp, a0, a1, a2, a3); break;
-      case 0x10a322c:  ret = Cibyl122.set_first_time_no_10a322c(sp, a0, a1, a2, a3); break;
-      case 0x10a3260:  ret = Cibyl122.personalize_buttons_callback_10a3260(sp, a0, a1, a2, a3); break;
-      case 0x10a32d0:  ret = Cibyl122.set_terms_accepted_10a32d0(sp, a0, a1, a2, a3); break;
-      case 0x10a3304:  ret = Cibyl122.personalize_signin_callback_10a3304(sp, a0, a1, a2, a3); break;
-      case 0x10a3324:  ret = Cibyl122.is_show_intro_screen_10a3324(sp, a0, a1, a2, a3); break;
-      case 0x10a34ec:  ret = Cibyl122.welcome_dialog_10a34ec(sp, a0, a1, a2, a3); break;
-      case 0x10a3744:  ret = Cibyl122.on_skip_welcome_10a3744(sp, a0, a1, a2, a3); break;
-      case 0x10a376c:  ret = Cibyl122.callGlobalCallback_10a376c(sp, a0, a1, a2, a3); break;
-      case 0x10a37a8:  ret = Cibyl122.on_softkey_finish_10a37a8(sp, a0, a1, a2, a3); break;
-      case 0x10a37d8:  ret = Cibyl122.terms_of_use_native_10a37d8(sp, a0, a1, a2, a3); break;
-      case 0x10a399c:  ret = Cibyl122.roadmap_term_of_use_10a399c(sp, a0, a1, a2, a3); break;
-      case 0x10a3a38:  ret = Cibyl122.rim_terms_of_use_declined_10a3a38(sp, a0, a1, a2, a3); break;
-      case 0x10a3a74:  ret = Cibyl122.terms_of_use_declined_10a3a74(sp, a0, a1, a2, a3); break;
-      case 0x10a3a94:  ret = Cibyl122.add_text_to_group_10a3a94(sp, a0, a1, a2, a3); break;
-      case 0x10a3b48:  ret = Cibyl122.create_intro_screen_10a3b48(sp, a0, a1, a2, a3); break;
-      case 0x10a3d58:  ret = Cibyl122.rim_terms_of_use_accepted_10a3d58(sp, a0, a1, a2, a3); break;
-      case 0x10a3da4:  ret = Cibyl122.terms_of_use_accepted_10a3da4(sp, a0, a1, a2, a3); break;
-      case 0x10a3df0:  ret = Cibyl122.welcome_wizard_twitter_dialog_10a3df0(sp, a0, a1, a2, a3); break;
-      case 0x10a4170:  ret = Cibyl123.on_softkey_next_twitter_10a4170(sp, a0, a1, a2, a3); break;
-      case 0x10a45b0:  ret = Cibyl123.roadmap_geo_location_set_overall_score_10a45b0( a0); break;
-      case 0x10a45bc:  Cibyl123.roadmap_geo_location_info_10a45bc(); break;
-      case 0x10a45c4:  ret = Cibyl123.on_softkey_10a45c4(sp, a0, a1, a2, a3); break;
-      case 0x10a4600:  ret = Cibyl123.roadmap_geo_location_set_usage_score_str_10a4600(sp, a0, a1, a2, a3); break;
-      case 0x10a4630:  ret = Cibyl123.roadmap_geo_location_set_traffic_score_str_10a4630(sp, a0, a1, a2, a3); break;
-      case 0x10a4660:  ret = Cibyl123.roadmap_geo_location_set_map_score_str_10a4660(sp, a0, a1, a2, a3); break;
-      case 0x10a4690:  ret = Cibyl123.roadmap_geo_location_set_usage_score_10a4690(sp, a0, a1, a2, a3); break;
-      case 0x10a46c0:  ret = Cibyl123.roadmap_geo_location_set_traffic_score_10a46c0(sp, a0, a1, a2, a3); break;
-      case 0x10a46f0:  ret = Cibyl123.roadmap_geo_location_set_map_score_10a46f0(sp, a0, a1, a2, a3); break;
-      case 0x10a4720:  ret = Cibyl123.roadmap_geo_location_set_state_10a4720(sp, a0, a1, a2, a3); break;
-      case 0x10a474c:  ret = Cibyl123.roadmap_geo_location_set_metropolitan_10a474c(sp, a0, a1, a2, a3); break;
-      case 0x10a4778:  ret = Cibyl123.roadmap_general_settings_init_10a4778(sp, a0, a1, a2, a3); break;
-      case 0x10a48d0:  ret = Cibyl123.roadmap_general_settings_events_radius_10a48d0(sp, a0, a1, a2, a3); break;
-      case 0x10a48f4:  ret = Cibyl123.roadmap_general_settings_is_24_hour_clock_10a48f4(sp, a0, a1, a2, a3); break;
-      case 0x10a4920:  ret = Cibyl123.on_ok_10a4920(sp, a0, a1, a2, a3); break;
-      case 0x10a4b6c:  ret = Cibyl123.on_ok_softkey_10a4b6c(sp, a0, a1, a2, a3); break;
-      case 0x10a4b94:  ret = Cibyl123.on_close_dialog_10a4b94(sp, a0, a1, a2, a3); break;
-      case 0x10a4bc0:  ret = Cibyl123.lang_changed_delayed_message_10a4bc0(sp, a0, a1, a2, a3); break;
-      case 0x10a4bfc:  ret = Cibyl123.update_reports_dont_show_10a4bfc(sp, a0, a1, a2, a3); break;
-      case 0x10a4ce8:  ret = Cibyl123.set_checkbox_settings_10a4ce8(sp, a0, a1, a2, a3); break;
-      case 0x10a4d9c:  ret = Cibyl123.on_all_setting_saved_10a4d9c(sp, a0, a1, a2, a3); break;
-      case 0x10a5298:  ret = Cibyl123.on_prompts_selected_10a5298(sp, a0, a1, a2, a3); break;
-      case 0x10a5340:  ret = Cibyl123.on_download_lang_confirm_10a5340(sp, a0, a1, a2, a3); break;
-      case 0x10a5368:  ret = Cibyl123.callback_10a5368(sp, a0, a1, a2, a3); break;
-      case 0x10a54c0:  ret = Cibyl123.T_102_10a54c0(sp, a0, a1, a2, a3); break;
-      case 0x10a5544:  ret = Cibyl123.roadmap_all_settings_show_10a5544(sp, a0, a1, a2, a3); break;
-      case 0x10a5ae4:  ret = Cibyl124.T_103_10a5ae4(sp, a0, a1, a2, a3); break;
-      case 0x10a5e74:  ret = Cibyl124.roadmap_general_settings_show_10a5e74(sp, a0, a1, a2, a3); break;
-      case 0x10a6d54:  ret = Cibyl124.roadmap_map_settings_show_report_10a6d54(sp, a0, a1, a2, a3); break;
-      case 0x10a6de8:  ret = Cibyl124.on_map_scheme_select_10a6de8(sp, a0, a1, a2, a3); break;
-      case 0x10a6e98:  ret = Cibyl124.roadmap_map_settings_isEnabled_10a6e98(sp, a0, a1, a2, a3); break;
-      case 0x10a6ed0:  ret = Cibyl124.roadmap_map_settings_road_goodies_10a6ed0(sp, a0, a1, a2, a3); break;
-      case 0x10a6f18:  ret = Cibyl124.roadmap_map_settings_color_roads_10a6f18(sp, a0, a1, a2, a3); break;
-      case 0x10a6f60:  ret = Cibyl124.roadmap_map_settings_isShowSpeedometer_10a6f60(sp, a0, a1, a2, a3); break;
-      case 0x10a6ff0:  ret = Cibyl124.roadmap_map_settings_isShowTopBarOnTap_10a6ff0(sp, a0, a1, a2, a3); break;
-      case 0x10a7038:  ret = Cibyl124.roadmap_map_settings_isShowSpeedCams_10a7038(sp, a0, a1, a2, a3); break;
-      case 0x10a7080:  ret = Cibyl124.roadmap_map_settings_isShowWazers_10a7080(sp, a0, a1, a2, a3); break;
-      case 0x10a70c8:  ret = Cibyl124.on_ok_10a70c8(sp, a0, a1, a2, a3); break;
-      case 0x10a73c0:  ret = Cibyl125.on_ok_softkey_10a73c0(sp, a0, a1, a2, a3); break;
-      case 0x10a73e8:  ret = Cibyl125.on_close_dialog_10a73e8(sp, a0, a1, a2, a3); break;
-      case 0x10a7414:  ret = Cibyl125.map_scheme_callback_10a7414(sp, a0, a1, a2, a3); break;
-      case 0x10a747c:  ret = Cibyl125.roadmap_map_settings_init_10a747c(sp, a0, a1, a2, a3); break;
-      case 0x10a7664:  ret = Cibyl125.T_59_10a7664(sp, a0, a1, a2, a3); break;
-      case 0x10a76b0:  ret = Cibyl125.roadmap_map_settings_show_10a76b0(sp, a0, a1, a2, a3); break;
-      case 0x10a8758:  Cibyl126.on_close_dialog_10a8758(); break;
-      case 0x10a8760:  ret = Cibyl126.roadmap_download_settings_isDownloadWazers_10a8760(sp, a0, a1, a2, a3); break;
-      case 0x10a8780:  ret = Cibyl126.space_10a8780(sp, a0, a1, a2, a3); break;
-      case 0x10a87cc:  ret = Cibyl126.on_ok_softkey_10a87cc(sp, a0, a1, a2, a3); break;
-      case 0x10a88e8:  ret = Cibyl126.roadmap_download_settings_isEnabled_10a88e8(sp, a0, a1, a2, a3); break;
-      case 0x10a8920:  ret = Cibyl126.roadmap_download_settings_isDownloadTraffic_10a8920(sp, a0, a1, a2, a3); break;
-      case 0x10a89cc:  ret = Cibyl126.roadmap_download_settings_isDownloadReports_10a89cc(sp, a0, a1, a2, a3); break;
-      case 0x10a8a3c:  ret = Cibyl126.roadmap_download_settings_init_10a8a3c(sp, a0, a1, a2, a3); break;
-      case 0x10a8b28:  ret = Cibyl126.roadmap_download_settings_show_10a8b28(sp, a0, a1, a2, a3); break;
-      case 0x10a90f8:  ret = Cibyl126.roadmap_login_set_show_function_10a90f8( a0); break;
-      case 0x10a9104:  ret = Cibyl126.roadmap_login_empty_10a9104(sp, a0, a1, a2, a3); break;
-      case 0x10a9158:  ret = Cibyl126.roadmap_login_set_nickname_10a9158(sp, a0, a1, a2, a3); break;
-      case 0x10a917c:  ret = Cibyl126.roadmap_login_set_pwd_10a917c(sp, a0, a1, a2, a3); break;
-      case 0x10a91a0:  ret = Cibyl126.roadmap_login_set_username_10a91a0(sp, a0, a1, a2, a3); break;
-      case 0x10a91c0:  ret = Cibyl126.roadmap_login_details_update_profile_ok_repsonse_10a91c0(sp, a0, a1, a2, a3); break;
-      case 0x10a9228:  ret = Cibyl126.roadmap_login_update_details_on_response_10a9228(sp, a0, a1, a2, a3); break;
-      case 0x10a9370:  ret = Cibyl126.roadmap_login_on_login_10a9370(sp, a0, a1, a2, a3); break;
-      case 0x10a94c8:  ret = Cibyl126.check_alphanumeric_10a94c8(sp, a0, a1, a2, a3); break;
-      case 0x10a956c:  ret = Cibyl126.roadmap_login_validate_username_10a956c(sp, a0, a1, a2, a3); break;
-      case 0x10a95ec:  ret = Cibyl126.roadmap_login_validate_email_10a95ec(sp, a0, a1, a2, a3); break;
-      case 0x10a9648:  ret = Cibyl126.roadmap_login_validate_password_10a9648(sp, a0, a1, a2, a3); break;
-      case 0x10a96f4:  ret = Cibyl126.roadmap_login_on_update_10a96f4(sp, a0, a1, a2, a3); break;
-      case 0x10a9774:  ret = Cibyl126.roadmap_login_on_create_10a9774(sp, a0, a1, a2, a3); break;
-      case 0x10a97f4:  ret = Cibyl126.roadmap_login_on_signup_skip_10a97f4(sp, a0, a1, a2, a3); break;
-      case 0x10a9834:  ret = Cibyl126.on_signup_skip_msgbox_closed_10a9834(sp, a0, a1, a2, a3); break;
-      case 0x10a9854:  ret = Cibyl126.roadmap_login_details_dialog_show_10a9854(sp, a0, a1, a2, a3); break;
-      case 0x10a98b4:  ret = Cibyl126.roadmap_login_on_ok_10a98b4(sp, a0, a1, a2, a3); break;
-      case 0x10a99d8:  ret = Cibyl126.roadmap_login_on_login_cb_10a99d8(sp, a0, a1, a2, a3); break;
-      case 0x10a9aa0:  ret = Cibyl127.roadmap_login_update_login_cb_10a9aa0(sp, a0, a1, a2, a3); break;
-      case 0x10a9b24:  ret = Cibyl127.roadmap_login_initialize_10a9b24(sp, a0, a1, a2, a3); break;
-      case 0x10a9b94:  ret = Cibyl127.roadmap_trip_server_init_10a9b94(sp, a0, a1, a2, a3); break;
-      case 0x10a9bf8:  ret = Cibyl127.roadmap_trip_server_after_login_10a9bf8(sp, a0, a1, a2, a3); break;
-      case 0x10a9c3c:  ret = Cibyl127.create_poi_10a9c3c(sp, a0, a1, a2, a3); break;
-      case 0x10a9d60:  ret = Cibyl127.roadmap_trip_server_after_login_delayed_10a9d60(sp, a0, a1, a2, a3); break;
-      case 0x10a9eec:  ret = Cibyl127.roadmap_trip_server_create_poi_10a9eec(sp, a0, a1, a2, a3); break;
-      case 0x10a9f30:  ret = Cibyl127.roadmap_trip_get_num_Pois_10a9f30(sp, a0, a1, a2, a3); break;
-      case 0x10a9f50:  ret = Cibyl127.roadmap_trip_server_restore_favorites_10a9f50(sp, a0, a1, a2, a3); break;
-      case 0x10a9fa4:  ret = Cibyl127.roadmap_trip_server_restore_favorites_cb_10a9fa4(sp, a0, a1, a2, a3); break;
-      case 0x10aa000:  ret = Cibyl127.roadmap_tripserver_response_10aa000(sp, a0, a1, a2, a3); break;
-      case 0x10aa1ac:  ret = Cibyl127.on_get_num_pois_res_10aa1ac(sp, a0, a1, a2, a3); break;
-      case 0x10aa258:  ret = Cibyl127.on_get_pois_res_10aa258(sp, a0, a1, a2, a3); break;
-      case 0x10aa560:  ret = Cibyl127.on_create_poi_res_10aa560(sp, a0, a1, a2, a3); break;
-      case 0x10aa6ac:  ret = Cibyl127.on_suggested_trips_10aa6ac(sp, a0, a1, a2, a3); break;
-      case 0x10aa978:  Cibyl127.completed_10aa978(); break;
-      case 0x10aa980:  ret = Cibyl127.roadmap_geo_config_get_server_id_10aa980(sp, a0, a1, a2, a3); break;
-      case 0x10aa9a4:  ret = Cibyl127.roadmap_geo_config_get_version_10aa9a4(sp, a0, a1, a2, a3); break;
-      case 0x10aa9c8:  ret = Cibyl127.roadmap_geo_config_init_10aa9c8(sp, a0, a1, a2, a3); break;
-      case 0x10aab48:  ret = Cibyl127.roadmap_geo_config_fixed_location_10aab48(sp, a0, a1, a2, a3); break;
-      case 0x10aac18:  ret = Cibyl127.roadmap_geo_config_other_10aac18(sp, a0, a1, a2, a3); break;
-      case 0x10aac78:  ret = Cibyl127.roadmap_geo_config_stg_10aac78(sp, a0, a1, a2, a3); break;
-      case 0x10aacd8:  ret = Cibyl127.roadmap_geo_config_usa_10aacd8(sp, a0, a1, a2, a3); break;
-      case 0x10aad48:  ret = Cibyl128.roadmap_geo_config_il_10aad48(sp, a0, a1, a2, a3); break;
-      case 0x10aadb8:  ret = Cibyl128.lang_callback_new_10aadb8(sp, a0, a1, a2, a3); break;
-      case 0x10aae24:  ret = Cibyl128.need_to_ask_server_10aae24(sp, a0, a1, a2, a3); break;
-      case 0x10aae58:  ret = Cibyl128.lang_selected_new_10aae58(sp, a0, a1, a2, a3); break;
-      case 0x10aae88:  ret = Cibyl128.request_geo_config_10aae88(sp, a0, a1, a2, a3); break;
-      case 0x10ab4ec:  ret = Cibyl128.roadmap_geo_config_10ab4ec(sp, a0, a1, a2, a3); break;
-      case 0x10ab704:  ret = Cibyl128.retry_10ab704(sp, a0, a1, a2, a3); break;
-      case 0x10ab734:  ret = Cibyl128.lang_loaded_10ab734(sp, a0, a1, a2, a3); break;
-      case 0x10ab77c:  ret = Cibyl128.other_callback_10ab77c(sp, a0, a1, a2, a3); break;
-      case 0x10ab7b4:  ret = Cibyl128.il_callback_10ab7b4(sp, a0, a1, a2, a3); break;
-      case 0x10ab7ec:  ret = Cibyl128.usa_callback_10ab7ec(sp, a0, a1, a2, a3); break;
-      case 0x10ab824:  ret = Cibyl128.on_pointer_down_10ab824(sp, a0, a1, a2, a3); break;
-      case 0x10ab8a0:  ret = Cibyl128.on_update_config_10ab8a0(sp, a0, a1, a2, a3); break;
-      case 0x10abac8:  ret = Cibyl128.clean_up_10abac8(sp, a0, a1, a2, a3); break;
-      case 0x10abb14:  ret = Cibyl128.on_recieved_completed_10abb14(sp, a0, a1, a2, a3); break;
-      case 0x10abc98:  ret = Cibyl128.on_server_config_10abc98(sp, a0, a1, a2, a3); break;
-      case 0x10abf20:  ret = Cibyl128.on_geo_server_config_10abf20(sp, a0, a1, a2, a3); break;
-      case 0x10ac164:  ret = Cibyl129.on_user_lang_downloaded_10ac164(sp, a0, a1, a2, a3); break;
-      case 0x10ac1b4:  ret = Cibyl129.on_lang_conf_downloaded_10ac1b4(sp, a0, a1, a2, a3); break;
-      case 0x10ac22c:  ret = Cibyl129.roadmap_geo_config_transaction_failed_10ac22c(sp, a0, a1, a2, a3); break;
-      case 0x10ac2a0:  ret = Cibyl129.GeoConfigTimer_10ac2a0(sp, a0, a1, a2, a3); break;
-      case 0x10ac34c:  ret = Cibyl129.roadmap_geo_config_failed_cb_10ac34c(sp, a0, a1, a2, a3); break;
-      case 0x10ac36c:  ret = Cibyl129.roadmap_result_string_10ac36c(sp, a0, a1, a2, a3); break;
-      case 0x10ac504:  ret = Cibyl129.roadmap_spawn_write_pipe_10ac504(); break;
-      case 0x10ac50c:  ret = Cibyl129.roadmap_spawn_read_pipe_10ac50c(); break;
-      case 0x10ac514:  Cibyl129.roadmap_spawn_close_pipe_10ac514(); break;
-      case 0x10ac51c:  ret = Cibyl129.roadmap_device_events_os_init_10ac51c(); break;
-      case 0x10ac524:  Cibyl129.roadmap_device_events_os_term_10ac524(); break;
-      case 0x10ac534:  Cibyl129.roadmap_voice_initialize_10ac534(); break;
-      case 0x10ac53c:  Cibyl129.roadmap_voice_announce_10ac53c(); break;
-      case 0x10ac544:  Cibyl129.roadmap_voice_mute_10ac544(); break;
-      case 0x10ac54c:  Cibyl129.roadmap_voice_enable_10ac54c(); break;
-      case 0x10ac56c:  ret = Cibyl129.roadmap_trip_load_10ac56c(); break;
-      case 0x10ac574:  Cibyl129.roadmap_trip_save_10ac574(); break;
-      case 0x10ac57c:  Cibyl129.roadmap_trip_save_screenshot_10ac57c(); break;
-      case 0x10ac584:  Cibyl129.roadmap_download_show_space_10ac584(); break;
-      case 0x10ac58c:  Cibyl129.roadmap_download_delete_10ac58c(); break;
-      case 0x10ac594:  Cibyl129.roadmap_download_subscribe_protocol_10ac594(); break;
-      case 0x10ac59c:  Cibyl129.roadmap_download_subscribe_when_done_10ac59c(); break;
-      case 0x10ac5a4:  ret = Cibyl129.roadmap_download_enabled_10ac5a4(); break;
-      case 0x10ac5ac:  Cibyl129.roadmap_download_initialize_10ac5ac(); break;
-      case 0x10ac5b4:  Cibyl129.roadmap_download_block_10ac5b4(); break;
-      case 0x10ac5c4:  Cibyl129.roadmap_download_unblock_all_10ac5c4(); break;
-      case 0x10ac5cc:  ret = Cibyl129.roadmap_download_blocked_10ac5cc(); break;
-      case 0x10ac5d4:  Cibyl129.roadmap_copy_init_10ac5d4(); break;
-      case 0x10ac5dc:  Cibyl129.roadmap_httpcopy_init_10ac5dc(); break;
-      case 0x10ac5e4:  Cibyl129.roadmap_spawn_check_10ac5e4(); break;
-      case 0x10ac5ec:  Cibyl129.roadmap_spawn_initialize_10ac5ec(); break;
-      case 0x10ac5f4:  ret = Cibyl129.roadmap_spawn_10ac5f4(); break;
-      case 0x10ac634:  Cibyl129.roadmap_crossing_dialog_10ac634(); break;
-      case 0x10ac63c:  Cibyl129.roadmap_coord_dialog_10ac63c(); break;
-      case 0x10ac644:  Cibyl129.edit_markers_dialog_10ac644(); break;
-      case 0x10ac64c:  Cibyl129.editor_notes_add_quick_10ac64c(); break;
-      case 0x10ac654:  Cibyl129.editor_notes_add_edit_10ac654(); break;
-      case 0x10ac65c:  Cibyl129.editor_notes_add_voice_10ac65c(); break;
-      case 0x10ac66c:  ret = Cibyl129.roadmap_file_rename_10ac66c(); break;
-      case 0x10ac674:  Cibyl129.roadmap_net_initialize_10ac674(); break;
-      case 0x10ac67c:  ret = Cibyl129.roadmap_device_initialize_10ac67c(); break;
-      case 0x10ac684:  Cibyl129.roadmap_screen_draw_line_direction_10ac684(); break;
-      case 0x10ac694:  ret = Cibyl129.editor_is_enabled_10ac694(); break;
-      case 0x10ac6b4:  ret = Cibyl129.editor_main_set_10ac6b4(sp, a0, a1, a2, a3); break;
-      case 0x10ac718:  ret = Cibyl129.editor_main_shutdown_10ac718(sp, a0, a1, a2, a3); break;
-      case 0x10ac740:  ret = Cibyl129.editor_main_initialize_10ac740(sp, a0, a1, a2, a3); break;
-      case 0x10ac7a4:  ret = Cibyl129.editor_main_check_map_10ac7a4(sp, a0, a1, a2, a3); break;
-      case 0x10ac820:  ret = Cibyl129.editor_points_get_total_points_10ac820(); break;
-      case 0x10ac838:  ret = Cibyl129.editor_points_reset_munching_10ac838(); break;
-      case 0x10ac874:  ret = Cibyl129.editor_points_display_new_points_timed_10ac874(sp, a0, a1, a2, a3); break;
-      case 0x10ac918:  ret = Cibyl129.editor_points_hide_10ac918(sp, a0, a1, a2, a3); break;
-      case 0x10ac938:  ret = Cibyl129.timer_cb_10ac938(sp, a0, a1, a2, a3); break;
-      case 0x10ac988:  ret = Cibyl129.editor_points_display_10ac988(sp, a0, a1, a2, a3); break;
-      case 0x10ac9dc:  ret = Cibyl129.set_last_points_update_time_10ac9dc(sp, a0, a1, a2, a3); break;
-      case 0x10aca1c:  ret = Cibyl129.editor_points_set_saved_new_points_10aca1c(sp, a0, a1, a2, a3); break;
-      case 0x10aca54:  ret = Cibyl129.editor_points_add_10aca54(sp, a0, a1, a2, a3); break;
-      case 0x10acad0:  ret = Cibyl129.editor_points_add_new_points_10acad0(sp, a0, a1, a2, a3); break;
-      case 0x10acb00:  ret = Cibyl129.editor_points_set_old_points_10acb00(sp, a0, a1, a2, a3); break;
-      case 0x10acbdc:  ret = Cibyl129.editor_points_initialize_10acbdc(sp, a0, a1, a2, a3); break;
-      case 0x10acccc:  ret = Cibyl129.editor_track_filter_get_current_10acccc( a0, a1, a2); break;
-      case 0x10acd08:  ret = Cibyl129.editor_track_filter_get_10acd08(sp, a0, a1, a2, a3); break;
-      case 0x10ace10:  ret = Cibyl129.editor_track_filter_add_10ace10(sp, a0, a1, a2, a3); break;
-      case 0x10ad034:  ret = Cibyl129.editor_track_filter_new_10ad034(sp, a0, a1, a2, a3); break;
-      case 0x10ad09c:  ret = Cibyl129.resolve_add_10ad09c(sp, a0, a1, a2, a3); break;
-      case 0x10ad1d4:  ret = Cibyl129.editor_track_known_resolve_10ad1d4(); break;
-      case 0x10ad1ec:  ret = Cibyl129.editor_track_known_reset_resolve_10ad1ec(); break;
-      case 0x10ad1f8:  ret = Cibyl129.editor_track_known_locate_point_10ad1f8(sp, a0, a1, a2, a3); break;
-      case 0x10ae0a4:  ret = Cibyl130.editor_track_known_end_segment_10ae0a4(sp, a0, a1, a2, a3); break;
-      case 0x10ae3d8:  ret = Cibyl130.find_line_break_10ae3d8(sp, a0, a1, a2, a3); break;
-      case 0x10ae5c4:  ret = Cibyl130.detect_road_segment_10ae5c4(sp, a0, a1, a2, a3); break;
-      case 0x10ae97c:  ret = Cibyl130.editor_track_unknown_locate_point_10ae97c(sp, a0, a1, a2, a3); break;
-      case 0x10aeb34:  ret = Cibyl130.editor_track_util_get_line_point_ids_10aeb34(sp, a0, a1, a2, a3); break;
-      case 0x10aebd8:  ret = Cibyl130.add_line_length_10aebd8(sp, a0, a1, a2, a3); break;
-      case 0x10aec78:  ret = Cibyl130.editor_track_util_get_line_length_10aec78(sp, a0, a1, a2, a3); break;
-      case 0x10aed30:  ret = Cibyl130.editor_track_util_roadmap_node_to_editor_10aed30(sp, a0, a1, a2, a3); break;
-      case 0x10aedb0:  ret = Cibyl130.editor_track_util_create_db_10aedb0(sp, a0, a1, a2, a3); break;
-      case 0x10aee14:  ret = Cibyl130.editor_track_util_length_10aee14(sp, a0, a1, a2, a3); break;
-      case 0x10aee90:  ret = Cibyl130.editor_track_add_trkseg_10aee90(sp, a0, a1, a2, a3); break;
-      case 0x10aefa8:  ret = Cibyl130.editor_track_util_create_trkseg_10aefa8(sp, a0, a1, a2, a3); break;
-      case 0x10af1e0:  ret = Cibyl130.editor_track_util_create_line_10af1e0(sp, a0, a1, a2, a3); break;
-      case 0x10af37c:  ret = Cibyl131.editor_track_util_get_node_10af37c(sp, a0, a1, a2, a3); break;
-      case 0x10af4b8:  ret = Cibyl131.editor_track_util_node_pos_10af4b8(sp, a0, a1, a2, a3); break;
-      case 0x10af558:  ret = Cibyl131.editor_track_util_same_node_10af558(sp, a0, a1, a2, a3); break;
-      case 0x10af5b4:  ret = Cibyl131.adjust_connect_node_10af5b4(sp, a0, a1, a2, a3); break;
-      case 0x10af66c:  ret = Cibyl131.find_connecting_road_10af66c(sp, a0, a1, a2, a3); break;
-      case 0x10af7e4:  ret = Cibyl131.editor_track_util_find_street_10af7e4(sp, a0, a1, a2, a3); break;
-      case 0x10afadc:  ret = Cibyl131.editor_track_util_get_distance_10afadc(sp, a0, a1, a2, a3); break;
-      case 0x10afb1c:  ret = Cibyl131.editor_track_util_release_focus_10afb1c(sp, a0, a1, a2, a3); break;
-      case 0x10afb3c:  ret = Cibyl131.editor_track_util_set_focus_10afb3c(sp, a0, a1, a2, a3); break;
-      case 0x10afb84:  ret = Cibyl131.find_split_point_10afb84(sp, a0, a1, a2, a3); break;
-      case 0x10b0228:  ret = Cibyl131.editor_track_util_connect_roads_10b0228(sp, a0, a1, a2, a3); break;
-      case 0x10b0728:  ret = Cibyl132.editor_track_util_new_road_end_10b0728(sp, a0, a1, a2, a3); break;
-      case 0x10b0764:  ret = Cibyl132.editor_track_util_new_road_start_10b0764(sp, a0, a1, a2, a3); break;
-      case 0x10b07a0:  ret = Cibyl132.track_point_pos_10b07a0( a0); break;
-      case 0x10b07b4:  ret = Cibyl132.track_point_gps_10b07b4( a0); break;
-      case 0x10b07c8:  ret = Cibyl132.track_point_time_10b07c8( a0); break;
-      case 0x10b07e4:  ret = Cibyl132.track_point_status_10b07e4( a0); break;
-      case 0x10b07fc:  ret = Cibyl132.track_point_ordinal_10b07fc( a0); break;
-      case 0x10b0818:  ret = Cibyl132.export_track_point_pos_10b0818( a0); break;
-      case 0x10b0838:  ret = Cibyl132.export_track_point_gps_10b0838( a0); break;
-      case 0x10b0858:  ret = Cibyl132.export_track_point_time_10b0858( a0); break;
-      case 0x10b0884:  ret = Cibyl132.export_track_point_status_10b0884( a0); break;
-      case 0x10b08a8:  ret = Cibyl132.export_track_point_ordinal_10b08a8( a0); break;
-      case 0x10b08d4:  ret = Cibyl132.export_track_is_new_10b08d4(); break;
-      case 0x10b08e4:  ret = Cibyl132.export_track_num_points_10b08e4(); break;
-      case 0x10b08fc:  ret = Cibyl132.export_track_reset_points_10b08fc(); break;
-      case 0x10b0910:  ret = Cibyl132.editor_track_get_num_update_toggles_10b0910(); break;
-      case 0x10b0920:  ret = Cibyl132.editor_track_get_update_toggle_times_10b0920(); break;
-      case 0x10b092c:  ret = Cibyl132.editor_track_get_update_toggle_state_10b092c( a0); break;
-      case 0x10b0958:  ret = Cibyl132.editor_track_reset_update_toggles_10b0958(); break;
-      case 0x10b0964:  ret = Cibyl132.editor_ignore_new_roads_10b0964(); break;
-      case 0x10b0974:  ret = Cibyl132.editor_track_shape_position_10b0974( a0, a1); break;
-      case 0x10b09c8:  ret = Cibyl132.editor_track_is_new_direction_roads_10b09c8(sp, a0, a1, a2, a3); break;
-      case 0x10b0b00:  ret = Cibyl132.editor_track_deflate_10b0b00(sp, a0, a1, a2, a3); break;
-      case 0x10b0b90:  ret = Cibyl132.editor_track_draw_current_10b0b90(sp, a0, a1, a2, a3); break;
-      case 0x10b0c7c:  ret = Cibyl132.editor_track_is_new_road_10b0c7c(sp, a0, a1, a2, a3); break;
-      case 0x10b0cd8:  ret = Cibyl132.track_reset_points_10b0cd8(sp, a0, a1, a2, a3); break;
-      case 0x10b0d70:  ret = Cibyl132.editor_track_reset_10b0d70(sp, a0, a1, a2, a3); break;
-      case 0x10b0e10:  ret = Cibyl132.editor_track_initialize_10b0e10(sp, a0, a1, a2, a3); break;
-      case 0x10b0f9c:  ret = Cibyl132.editor_track_point_distance_10b0f9c(sp, a0, a1, a2, a3); break;
-      case 0x10b0fe4:  ret = Cibyl132.track_filter_init_10b0fe4(sp, a0, a1, a2, a3); break;
-      case 0x10b1050:  ret = Cibyl132.editor_track_get_gps_filter_10b1050(sp, a0, a1, a2, a3); break;
-      case 0x10b1074:  ret = Cibyl132.handle_new_direction_10b1074(sp, a0, a1, a2, a3); break;
-      case 0x10b10cc:  ret = Cibyl132.editor_new_roads_state_10b10cc(sp, a0, a1, a2, a3); break;
-      case 0x10b110c:  ret = Cibyl132.editor_track_toggle_new_roads_10b110c(sp, a0, a1, a2, a3); break;
-      case 0x10b1280:  ret = Cibyl132.T_155_10b1280(sp, a0, a1, a2, a3); break;
-      case 0x10b1404:  ret = Cibyl132.end_unknown_segments_10b1404(sp, a0, a1, a2, a3); break;
-      case 0x10b16b0:  ret = Cibyl132.editor_track_force_reset_10b16b0(sp, a0, a1, a2, a3); break;
-      case 0x10b1788:  ret = Cibyl132.editor_track_end_10b1788(sp, a0, a1, a2, a3); break;
-      case 0x10b17b0:  ret = Cibyl132.track_rec_locate_point_10b17b0(sp, a0, a1, a2, a3); break;
-      case 0x10b1f50:  ret = Cibyl133.editor_gps_update_10b1f50(sp, a0, a1, a2, a3); break;
-      case 0x10b219c:  ret = Cibyl133.editor_track_draw_current_new_direction_road_10b219c(sp, a0, a1, a2, a3); break;
-      case 0x10b2518:  ret = Cibyl133.editor_track_draw_new_direction_roads_10b2518(sp, a0, a1, a2, a3); break;
-      case 0x10b2908:  ret = Cibyl133.editor_track_compress_range_10b2908(sp, a0, a1, a2, a3); break;
-      case 0x10b2f18:  ret = Cibyl133.editor_track_compress_track_10b2f18(sp, a0, a1, a2, a3); break;
-      case 0x10b2f70:  ret = Cibyl133.editor_track_report_init_10b2f70(); break;
-      case 0x10b2fc8:  ret = Cibyl133.editor_track_report_get_current_position_10b2fc8(sp, a0, a1, a2, a3); break;
-      case 0x10b30d0:  ret = Cibyl133.editor_track_report_conclude_export_10b30d0(sp, a0, a1, a2, a3); break;
-      case 0x10b3140:  ret = Cibyl133.editor_track_report_begin_export_10b3140(sp, a0, a1, a2, a3); break;
-      case 0x10b3c28:  ret = Cibyl134.editor_marker_activate_10b3c28( a0); break;
-      case 0x10b3c34:  ret = Cibyl134.editor_marker_reg_type_10b3c34( a0, a1, a2); break;
-      case 0x10b3c6c:  ret = Cibyl134.editor_marker_items_pending_10b3c6c(sp, a0, a1, a2, a3); break;
-      case 0x10b3cc0:  ret = Cibyl134.editor_marker_committed_10b3cc0(sp, a0, a1, a2, a3); break;
-      case 0x10b3cec:  ret = Cibyl134.editor_marker_confirm_commit_10b3cec(sp, a0, a1, a2, a3); break;
-      case 0x10b3d18:  ret = Cibyl134.editor_marker_begin_commit_10b3d18(sp, a0, a1, a2, a3); break;
-      case 0x10b3dbc:  ret = Cibyl134.editor_marker_export_10b3dbc(sp, a0, a1, a2, a3); break;
-      case 0x10b3eb8:  ret = Cibyl134.editor_marker_type_10b3eb8(sp, a0, a1, a2, a3); break;
-      case 0x10b3f00:  ret = Cibyl134.editor_marker_position_10b3f00(sp, a0, a1, a2, a3); break;
-      case 0x10b400c:  ret = Cibyl134.editor_marker_note_10b400c(sp, a0, a1, a2, a3); break;
-      case 0x10b405c:  ret = Cibyl134.edit_marker_icon_10b405c(sp, a0, a1, a2, a3); break;
-      case 0x10b4190:  ret = Cibyl134.editor_marker_is_obsolete_10b4190(sp, a0, a1, a2, a3); break;
-      case 0x10b41f4:  ret = Cibyl134.editor_marker_count_10b41f4(sp, a0, a1, a2, a3); break;
-      case 0x10b4224:  ret = Cibyl134.editor_marker_add_10b4224(sp, a0, a1, a2, a3); break;
-      case 0x10b432c:  ret = Cibyl134.editor_dictionary_activate_10b432c( a0); break;
-      case 0x10b4338:  ret = Cibyl134.editor_dictionary_get_10b4338(sp, a0, a1, a2, a3); break;
-      case 0x10b4394:  ret = Cibyl134.editor_dictionary_locate_10b4394(sp, a0, a1, a2, a3); break;
-      case 0x10b441c:  ret = Cibyl134.editor_dictionary_add_10b441c(sp, a0, a1, a2, a3); break;
-      case 0x10b450c:  ret = Cibyl134.editor_shape_activate_10b450c( a0); break;
-      case 0x10b4518:  ret = Cibyl134.editor_shape_ordinal_10b4518(sp, a0, a1, a2, a3); break;
-      case 0x10b4548:  ret = Cibyl134.editor_shape_time_10b4548(sp, a0, a1, a2, a3); break;
-      case 0x10b4594:  ret = Cibyl134.editor_shape_altitude_10b4594(sp, a0, a1, a2, a3); break;
-      case 0x10b45c4:  ret = Cibyl134.editor_shape_position_10b45c4(sp, a0, a1, a2, a3); break;
-      case 0x10b4620:  ret = Cibyl134.editor_shape_add_10b4620(sp, a0, a1, a2, a3); break;
-      case 0x10b4664:  ret = Cibyl134.editor_points_activate_10b4664( a0); break;
-      case 0x10b4670:  ret = Cibyl134.editor_point_db_id_10b4670(sp, a0, a1, a2, a3); break;
-      case 0x10b46a0:  ret = Cibyl134.editor_point_position_10b46a0(sp, a0, a1, a2, a3); break;
-      case 0x10b46f0:  ret = Cibyl134.editor_point_set_pos_10b46f0(sp, a0, a1, a2, a3); break;
-      case 0x10b4760:  ret = Cibyl134.editor_point_add_10b4760(sp, a0, a1, a2, a3); break;
-      case 0x10b47a4:  ret = Cibyl134.editor_trkseg_activate_10b47a4( a0); break;
-      case 0x10b47b0:  ret = Cibyl134.editor_trkseg_items_pending_10b47b0(sp, a0, a1, a2, a3); break;
-      case 0x10b47d8:  ret = Cibyl134.editor_trkseg_item_committed_10b47d8(sp, a0, a1, a2, a3); break;
-      case 0x10b4804:  ret = Cibyl134.editor_trkseg_confirm_commit_10b4804(sp, a0, a1, a2, a3); break;
-      case 0x10b4830:  ret = Cibyl134.editor_trkseg_begin_commit_10b4830(sp, a0, a1, a2, a3); break;
-      case 0x10b4858:  ret = Cibyl134.editor_trkseg_get_count_10b4858(sp, a0, a1, a2, a3); break;
-      case 0x10b4880:  ret = Cibyl134.editor_trkseg_get_points_10b4880(sp, a0, a1, a2, a3); break;
-      case 0x10b48f8:  ret = Cibyl134.editor_trkseg_get_10b48f8(sp, a0, a1, a2, a3); break;
-      case 0x10b49a8:  ret = Cibyl134.editor_trkseg_get_time_10b49a8(sp, a0, a1, a2, a3); break;
-      case 0x10b4a10:  ret = Cibyl134.editor_trkseg_add_10b4a10(sp, a0, a1, a2, a3); break;
-      case 0x10b4a7c:  ret = Cibyl134.editor_street_activate_10b4a7c( a0); break;
-      case 0x10b4a88:  ret = Cibyl134.editor_street_get_street_address_10b4a88(); break;
-      case 0x10b4a94:  ret = Cibyl134.editor_street_get_street_t2s_10b4a94(sp, a0, a1, a2, a3); break;
-      case 0x10b4aec:  ret = Cibyl134.editor_street_get_street_city_10b4aec(sp, a0, a1, a2, a3); break;
-      case 0x10b4b48:  ret = Cibyl134.editor_street_get_street_fetype_10b4b48(sp, a0, a1, a2, a3); break;
-      case 0x10b4ba4:  ret = Cibyl134.editor_street_get_street_fename_10b4ba4(sp, a0, a1, a2, a3); break;
-      case 0x10b4bfc:  ret = Cibyl134.editor_street_get_street_name_10b4bfc(sp, a0, a1, a2, a3); break;
-      case 0x10b4c94:  ret = Cibyl134.editor_street_get_full_name_10b4c94(sp, a0, a1, a2, a3); break;
-      case 0x10b4d24:  ret = Cibyl134.editor_street_get_connected_lines_10b4d24(sp, a0, a1, a2, a3); break;
-      case 0x10b4e98:  ret = Cibyl134.editor_street_create_10b4e98(sp, a0, a1, a2, a3); break;
-      case 0x10b4fa0:  ret = Cibyl134.editor_street_get_distance_with_shape_10b4fa0(sp, a0, a1, a2, a3); break;
-      case 0x10b52e8:  ret = Cibyl135.editor_street_get_closest_10b52e8(sp, a0, a1, a2, a3); break;
-      case 0x10b5484:  ret = Cibyl135.editor_street_get_distance_10b5484(sp, a0, a1, a2, a3); break;
-      case 0x10b550c:  ret = Cibyl135.editor_lines_activate_10b550c( a0); break;
-      case 0x10b5518:  ret = Cibyl135.handle_segment_10b5518(sp, a0, a1, a2, a3); break;
-      case 0x10b5738:  ret = Cibyl135.editor_line_items_pending_10b5738(sp, a0, a1, a2, a3); break;
-      case 0x10b5760:  ret = Cibyl135.editor_line_confirm_commit_10b5760(sp, a0, a1, a2, a3); break;
-      case 0x10b578c:  ret = Cibyl135.editor_line_begin_commit_10b578c(sp, a0, a1, a2, a3); break;
-      case 0x10b57b4:  ret = Cibyl135.editor_line_committed_10b57b4(sp, a0, a1, a2, a3); break;
-      case 0x10b57e0:  ret = Cibyl135.editor_line_is_valid_10b57e0(sp, a0, a1, a2, a3); break;
-      case 0x10b582c:  ret = Cibyl135.editor_line_get_timestamp_10b582c(sp, a0, a1, a2, a3); break;
-      case 0x10b586c:  ret = Cibyl135.editor_line_get_direction_10b586c(sp, a0, a1, a2, a3); break;
-      case 0x10b58c8:  ret = Cibyl135.editor_line_get_street_10b58c8(sp, a0, a1, a2, a3); break;
-      case 0x10b5924:  ret = Cibyl135.editor_line_get_points_10b5924(sp, a0, a1, a2, a3); break;
-      case 0x10b5a24:  ret = Cibyl135.editor_line_set_direction_10b5a24(sp, a0, a1, a2, a3); break;
-      case 0x10b5aac:  ret = Cibyl135.editor_line_set_street_10b5aac(sp, a0, a1, a2, a3); break;
-      case 0x10b5bc4:  ret = Cibyl135.editor_line_set_flag_10b5bc4(sp, a0, a1, a2, a3); break;
-      case 0x10b5c54:  ret = Cibyl135.editor_line_invalidate_10b5c54(sp, a0, a1, a2, a3); break;
-      case 0x10b5c74:  ret = Cibyl135.editor_line_modify_properties_10b5c74(sp, a0, a1, a2, a3); break;
-      case 0x10b5d08:  ret = Cibyl135.editor_line_get_count_10b5d08(sp, a0, a1, a2, a3); break;
-      case 0x10b5d30:  ret = Cibyl135.editor_line_get_10b5d30(sp, a0, a1, a2, a3); break;
-      case 0x10b5e10:  ret = Cibyl135.editor_line_interpolate_request_tiles_10b5e10(sp, a0, a1, a2, a3); break;
-      case 0x10b5f68:  ret = Cibyl135.editor_line_get_update_time_10b5f68(sp, a0, a1, a2, a3); break;
-      case 0x10b6128:  ret = Cibyl135.editor_line_get_cross_time_10b6128(sp, a0, a1, a2, a3); break;
-      case 0x10b6180:  ret = Cibyl135.editor_line_length_10b6180(sp, a0, a1, a2, a3); break;
-      case 0x10b6290:  ret = Cibyl135.editor_line_add_10b6290(sp, a0, a1, a2, a3); break;
-      case 0x10b639c:  ret = Cibyl135.editor_line_copy_10b639c(sp, a0, a1, a2, a3); break;
-      case 0x10b650c:  ret = Cibyl135.editor_override_activate_10b650c( a0); break;
-      case 0x10b6518:  ret = Cibyl135.editor_override_get_count_10b6518(sp, a0, a1, a2, a3); break;
-      case 0x10b6540:  ret = Cibyl135.editor_override_get_10b6540(sp, a0, a1, a2, a3); break;
-      case 0x10b6614:  ret = Cibyl135.editor_override_find_10b6614(sp, a0, a1, a2, a3); break;
-      case 0x10b6788:  ret = Cibyl136.editor_override_exists_10b6788(sp, a0, a1, a2, a3); break;
-      case 0x10b67b0:  ret = Cibyl136.editor_override_line_get_direction_10b67b0(sp, a0, a1, a2, a3); break;
-      case 0x10b6804:  ret = Cibyl136.editor_override_line_get_flags_10b6804(sp, a0, a1, a2, a3); break;
-      case 0x10b6858:  ret = Cibyl136.editor_override_line_set_direction_10b6858(sp, a0, a1, a2, a3); break;
-      case 0x10b694c:  ret = Cibyl136.editor_override_line_set_flag_10b694c(sp, a0, a1, a2, a3); break;
-      case 0x10b69cc:  ret = Cibyl136.editor_db_get_record_10b69cc( a0, a1, a2, a3); break;
-      case 0x10b6a10:  ret = Cibyl136.editor_db_create_10b6a10(); break;
-      case 0x10b6a20:  ret = Cibyl136.editor_db_get_item_count_10b6a20( a0); break;
-      case 0x10b6a34:  ret = Cibyl136.editor_db_begin_commit_10b6a34( a0); break;
-      case 0x10b6a40:  ret = Cibyl136.editor_db_item_committed_10b6a40(sp, a0, a1, a2, a3); break;
-      case 0x10b6a74:  ret = Cibyl136.editor_db_items_pending_10b6a74( a0); break;
-      case 0x10b6aa0:  ret = Cibyl136.editor_db_confirm_commit_10b6aa0(sp, a0, a1, a2, a3); break;
-      case 0x10b6b34:  ret = Cibyl136.editor_db_write_record_10b6b34(sp, a0, a1, a2, a3); break;
-      case 0x10b6cd4:  ret = Cibyl136.editor_db_update_item_10b6cd4(sp, a0, a1, a2, a3); break;
-      case 0x10b6d60:  ret = Cibyl136.editor_db_write_item_10b6d60(sp, a0, a1, a2, a3); break;
-      case 0x10b6da0:  ret = Cibyl136.editor_db_allocate_new_block_10b6da0(sp, a0, a1, a2, a3); break;
-      case 0x10b6e78:  ret = Cibyl136.editor_db_allocate_items_10b6e78(sp, a0, a1, a2, a3); break;
-      case 0x10b6f58:  ret = Cibyl136.editor_db_get_item_10b6f58(sp, a0, a1, a2, a3); break;
-      case 0x10b7080:  ret = Cibyl136.calloc_10b7080(sp, a0, a1, a2, a3); break;
-      case 0x10b70c8:  ret = Cibyl136.editor_db_activate_handler_10b70c8(sp, a0, a1, a2, a3); break;
-      case 0x10b71a0:  ret = Cibyl136.editor_db_add_record_10b71a0(sp, a0, a1, a2, a3); break;
-      case 0x10b72a4:  ret = Cibyl136.editor_db_add_item_10b72a4(sp, a0, a1, a2, a3); break;
-      case 0x10b7318:  ret = Cibyl136.editor_db_delete_10b7318(sp, a0, a1, a2, a3); break;
-      case 0x10b7400:  ret = Cibyl136.editor_db_free_10b7400(sp, a0, a1, a2, a3); break;
-      case 0x10b74d4:  ret = Cibyl136.editor_db_close_10b74d4(sp, a0, a1, a2, a3); break;
-      case 0x10b752c:  ret = Cibyl136.editor_db_open_10b752c(sp, a0, a1, a2, a3); break;
-      case 0x10b79b4:  ret = Cibyl136.editor_db_activate_10b79b4(sp, a0, a1, a2, a3); break;
-      case 0x10b7a74:  ret = Cibyl137.editor_bar_show_10b7a74(); break;
-      case 0x10b7a98:  ret = Cibyl137.editor_bar_hide_10b7a98(); break;
-      case 0x10b7ab8:  ret = Cibyl137.editor_bar_set_length_10b7ab8( a0); break;
-      case 0x10b7ad0:  ret = Cibyl137.editor_bar_set_temp_length_10b7ad0( a0); break;
-      case 0x10b7adc:  ret = Cibyl137.editor_bar_short_click_10b7adc(sp, a0, a1, a2, a3); break;
-      case 0x10b7bdc:  ret = Cibyl137.editor_bar_pressed_10b7bdc(sp, a0, a1, a2, a3); break;
-      case 0x10b7d18:  ret = Cibyl137.editor_bar_after_refresh_10b7d18(sp, a0, a1, a2, a3); break;
-      case 0x10b808c:  ret = Cibyl137.editor_bar_feature_enabled_10b808c(sp, a0, a1, a2, a3); break;
-      case 0x10b80c0:  ret = Cibyl137.editor_bar_initialize_10b80c0(sp, a0, a1, a2, a3); break;
-      case 0x10b82c4:  Cibyl137.editor_plugin_shutdown_10b82c4(); break;
-      case 0x10b82d8:  ret = Cibyl137.editor_plugin_get_override_10b82d8(); break;
-      case 0x10b8308:  ret = Cibyl137.editor_plugin_register_10b8308(sp, a0, a1, a2, a3); break;
-      case 0x10b832c:  ret = Cibyl137.editor_plugin_get_direction_10b832c(sp, a0, a1, a2, a3); break;
-      case 0x10b8370:  ret = Cibyl137.editor_plugin_street_properties_10b8370(sp, a0, a1, a2, a3); break;
-      case 0x10b841c:  ret = Cibyl137.editor_plugin_get_street_10b841c(sp, a0, a1, a2, a3); break;
-      case 0x10b84ac:  ret = Cibyl137.editor_plugin_street_full_name_10b84ac(sp, a0, a1, a2, a3); break;
-      case 0x10b8528:  ret = Cibyl137.editor_plugin_activate_db_10b8528(sp, a0, a1, a2, a3); break;
-      case 0x10b854c:  ret = Cibyl137.editor_plugin_line_to_10b854c(sp, a0, a1, a2, a3); break;
-      case 0x10b85bc:  ret = Cibyl137.editor_plugin_line_from_10b85bc(sp, a0, a1, a2, a3); break;
-      case 0x10b8628:  ret = Cibyl137.upload_file_size_callback_10b8628(); break;
-      case 0x10b8630:  Cibyl137.upload_progress_callback_10b8630(); break;
-      case 0x10b8638:  ret = Cibyl137.upload_10b8638(sp, a0, a1, a2, a3); break;
-      case 0x10b87d4:  ret = Cibyl137.upload_done_10b87d4(sp, a0, a1, a2, a3); break;
-      case 0x10b89e8:  ret = Cibyl137.upload_error_callback_10b89e8(sp, a0, a1, a2, a3); break;
-      case 0x10b8a58:  ret = Cibyl137.prepare_for_upload_10b8a58(sp, a0, a1, a2, a3); break;
-      case 0x10b8cfc:  ret = Cibyl138.roadmap_confirmed_debug_info_submit_10b8cfc(sp, a0, a1, a2, a3); break;
-      case 0x10b8d64:  ret = Cibyl138.submit_10b8d64(sp, a0, a1, a2, a3); break;
-      case 0x10b8e20:  ret = Cibyl138.editor_upload_auto_10b8e20(sp, a0, a1, a2, a3); break;
-      case 0x10b8f44:  ret = Cibyl138.editor_http_send_10b8f44(sp, a0, a1, a2, a3); break;
-      case 0x10b8fe4:  ret = Cibyl138.send_auth_10b8fe4(sp, a0, a1, a2, a3); break;
-      case 0x10b913c:  ret = Cibyl138.editor_close_socket_file_10b913c(sp, a0, a1, a2, a3); break;
-      case 0x10b9178:  ret = Cibyl138.editor_post_file_10b9178(sp, a0, a1, a2, a3); break;
-      case 0x10b9768:  ret = Cibyl138.editor_upload_on_socket_connected_10b9768(sp, a0, a1, a2, a3); break;
-      case 0x10b9840:  ret = Cibyl138.editor_upload_initialize_10b9840(sp, a0, a1, a2, a3); break;
-      case 0x10b98b4:  ret = Cibyl138.editor_cleanup_test_10b98b4(sp, a0, a1, a2, a3); break;
-      case 0x10b9a50:  ret = Cibyl138.add_alert_verify_10b9a50(); break;
-      case 0x10b9a58:  ret = Cibyl138.remove_alert_verify_10b9a58(); break;
-      case 0x10b9a60:  ret = Cibyl138.add_red_light_cam_alert_10b9a60(sp, a0, a1, a2, a3); break;
-      case 0x10b9aec:  ret = Cibyl138.add_speed_cam_alert_10b9aec(sp, a0, a1, a2, a3); break;
-      case 0x10b9b78:  ret = Cibyl138.alert_get_city_street_10b9b78(sp, a0, a1, a2, a3); break;
-      case 0x10b9c10:  ret = Cibyl138.add_alert_initialize_10b9c10(sp, a0, a1, a2, a3); break;
-      case 0x10b9c4c:  ret = Cibyl138.add_alert_10b9c4c(sp, a0, a1, a2, a3); break;
-      case 0x10b9fc4:  ret = Cibyl139.add_speed_cam_10b9fc4(sp, a0, a1, a2, a3); break;
-      case 0x10ba188:  ret = Cibyl139.add_speed_cam_my_direction_10ba188(sp, a0, a1, a2, a3); break;
-      case 0x10ba1a8:  ret = Cibyl139.add_speed_cam_callback_10ba1a8(sp, a0, a1, a2, a3); break;
-      case 0x10ba1d0:  ret = Cibyl139.remove_alert_10ba1d0(sp, a0, a1, a2, a3); break;
-      case 0x10ba358:  ret = Cibyl139.request_speed_cam_delete_10ba358(sp, a0, a1, a2, a3); break;
-      case 0x10ba3b0:  ret = Cibyl139.T_82_10ba3b0(sp, a0, a1, a2, a3); break;
-      case 0x10ba4e4:  ret = Cibyl139.add_red_light_cam_my_direction_10ba4e4(sp, a0, a1, a2, a3); break;
-      case 0x10ba504:  ret = Cibyl139.add_red_light_cam_callback_10ba504(sp, a0, a1, a2, a3); break;
-      case 0x10ba52c:  ret = Cibyl139.T_83_10ba52c(sp, a0, a1, a2, a3); break;
-      case 0x10ba690:  ret = Cibyl139.add_alert_export_10ba690(sp, a0, a1, a2, a3); break;
-      case 0x10ba914:  ret = Cibyl139.remove_alert_export_10ba914(sp, a0, a1, a2, a3); break;
-      case 0x10ba9c0:  ret = Cibyl139.update_range_initialize_10ba9c0(sp, a0, a1, a2, a3); break;
-      case 0x10ba9e8:  ret = Cibyl139.update_range_10ba9e8(sp, a0, a1, a2, a3); break;
-      case 0x10bac64:  ret = Cibyl139.button_callback_10bac64(sp, a0, a1, a2, a3); break;
-      case 0x10bae38:  ret = Cibyl139.keyboard_callback_10bae38(sp, a0, a1, a2, a3); break;
-      case 0x10baeac:  ret = Cibyl139.update_range_dialog_10baeac(sp, a0, a1, a2, a3); break;
-      case 0x10bb6f8:  ret = Cibyl140.T_81_10bb6f8(sp, a0, a1, a2, a3); break;
-      case 0x10bb85c:  ret = Cibyl140.update_range_export_10bb85c(sp, a0, a1, a2, a3); break;
-      case 0x10bbaec:  ret = Cibyl140.update_range_verify_10bbaec(sp, a0, a1, a2, a3); break;
-      case 0x10bbc2c:  ret = Cibyl140.editor_dialog_city_cb_10bbc2c( a1); break;
-      case 0x10bbc3c:  ret = Cibyl140.editor_segments_apply_10bbc3c(sp, a0, a1, a2, a3); break;
-      case 0x10bbdf4:  ret = Cibyl140.editor_segments_find_city_10bbdf4(sp, a0, a1, a2, a3); break;
-      case 0x10bc070:  ret = Cibyl140.editor_segments_fill_dialog_10bc070(sp, a0, a1, a2, a3); break;
-      case 0x10bc39c:  ret = Cibyl140.editor_segments_properties_10bc39c(sp, a0, a1, a2, a3); break;
-      case 0x10bcc0c:  ret = Cibyl141.download_warning_fn_10bcc0c(sp, a0, a1, a2, a3); break;
-      case 0x10bcce4:  ret = Cibyl141.editor_sync_get_export_name_10bcce4(sp, a0, a1, a2, a3); break;
-      case 0x10bcd74:  ret = Cibyl141.editor_sync_get_export_path_10bcd74(sp, a0, a1, a2, a3); break;
-      case 0x10bcddc:  ret = Cibyl141.T_38_10bcddc(); break;
-      case 0x10bce90:  ret = Cibyl141.export_sync_10bce90(sp, a0, a1, a2, a3); break;
-      case 0x10bcffc:  ret = Cibyl141.editor_report_segments_10bcffc(sp, a0, a1, a2, a3); break;
-      case 0x10bd058:  ret = Cibyl141.editor_report_segments_cb_10bd058(sp, a0, a1, a2, a3); break;
-      case 0x10bd094:  ret = Cibyl141.editor_report_markers_10bd094(sp, a0, a1, a2, a3); break;
-      case 0x10bd0f0:  ret = Cibyl141.editor_report_markers_cb_10bd0f0(sp, a0, a1, a2, a3); break;
-      case 0x10bd168:  ret = Cibyl141.get_data_dir_10bd168(sp, a0, a1, a2, a3); break;
-      case 0x10bd198:  ret = Cibyl141.get_active_file_name_10bd198(sp, a0, a1, a2, a3); break;
-      case 0x10bd1dc:  ret = Cibyl141.gps_data_status_10bd1dc(sp, a0, a1, a2, a3); break;
-      case 0x10bd40c:  ret = Cibyl141.gps_data_update_10bd40c(sp, a0, a1, a2, a3); break;
-      case 0x10bd46c:  ret = Cibyl141.editor_gps_data_initialize_10bd46c(sp, a0, a1, a2, a3); break;
-      case 0x10bd4c0:  ret = Cibyl141.editor_screen_select_line_10bd4c0(sp, a0, a1, a2, a3); break;
-      case 0x10bd5fc:  ret = Cibyl141.editor_screen_line_iter_cb_10bd5fc(sp, a0, a1, a2, a3); break;
-      case 0x10bd61c:  ret = Cibyl141.editor_screen_short_click_10bd61c(); break;
-      case 0x10bd694:  ret = Cibyl141.editor_screen_reset_selected_10bd694(sp, a0, a1, a2, a3); break;
-      case 0x10bd6b8:  ret = Cibyl141.editor_screen_wazzy_name_10bd6b8(sp, a0, a1, a2, a3); break;
-      case 0x10bd6dc:  ret = Cibyl141.editor_screen_gray_scale_10bd6dc(sp, a0, a1, a2, a3); break;
-      case 0x10bd708:  ret = Cibyl141.editor_screen_overide_car_10bd708(sp, a0, a1, a2, a3); break;
-      case 0x10bd8b8:  ret = Cibyl141.editor_screen_show_candidates_10bd8b8(sp, a0, a1, a2, a3); break;
-      case 0x10bd8e4:  ret = Cibyl141.editor_screen_initialize_10bd8e4(sp, a0, a1, a2, a3); break;
-      case 0x10bdb48:  ret = Cibyl141.editor_screen_after_refresh_10bdb48(sp, a0, a1, a2, a3); break;
-      case 0x10bdb84:  ret = Cibyl141.editor_screen_delete_segments_10bdb84(sp, a0, a1, a2, a3); break;
-      case 0x10bdcd4:  ret = Cibyl141.editor_screen_update_segments_10bdcd4(sp, a0, a1, a2, a3); break;
-      case 0x10bdd04:  ret = Cibyl141.editor_screen_set_10bdd04(sp, a0, a1, a2, a3); break;
-      case 0x10bdd84:  ret = Cibyl141.editor_screen_long_click_10bdd84(sp, a0, a1, a2, a3); break;
-      case 0x10bdecc:  ret = Cibyl141.popup_menu_callback_10bdecc(sp, a0, a1, a2, a3); break;
-      case 0x10bdef8:  ret = Cibyl141.editor_screen_get_road_state_10bdef8(sp, a0, a1, a2, a3); break;
-      case 0x10be010:  ret = Cibyl141.editor_screen_repaint_lines_10be010(sp, a0, a1, a2, a3); break;
-      case 0x10be94c:  ret = Cibyl142.editor_screen_repaint_10be94c(sp, a0, a1, a2, a3); break;
-      case 0x10beddc:  ret = Cibyl142.editor_screen_adjust_layer_10beddc(sp, a0, a1, a2, a3); break;
-      case 0x10bf1e0:  ret = Cibyl142.sunriseset_10bf1e0(sp, a0, a1, a2, a3); break;
-      case 0x10bf8b8:  ret = Cibyl142.roadmap_sunriseset_10bf8b8(sp, a0, a1, a2, a3); break;
-      case 0x10bfa34:  ret = Cibyl142.roadmap_sunset_10bfa34(sp, a0, a1, a2, a3); break;
-      case 0x10bfa70:  ret = Cibyl142.roadmap_sunrise_10bfa70(sp, a0, a1, a2, a3); break;
-      case 0x10bfaac:  ret = Cibyl142.roadmap_label_add_place_10bfaac(); break;
-      case 0x10bfab4:  ret = Cibyl142.roadmap_label_clear_10bfab4(); break;
-      case 0x10bfac8:  ret = Cibyl142.roadmap_label_initialize_10bfac8(sp, a0, a1, a2, a3); break;
-      case 0x10bfb30:  ret = Cibyl142.roadmap_label_activate_10bfb30(sp, a0, a1, a2, a3); break;
-      case 0x10bfb94:  ret = Cibyl142.roadmap_label_add_10bfb94(sp, a0, a1, a2, a3); break;
-      case 0x10bfed8:  ret = Cibyl143.roadmap_label_start_10bfed8(sp, a0, a1, a2, a3); break;
-      case 0x10bffb0:  ret = Cibyl143.roadmap_label_draw_text_10bffb0(sp, a0, a1, a2, a3); break;
-      case 0x10c0034:  ret = Cibyl143.roadmap_label_draw_cache_10c0034(sp, a0, a1, a2, a3); break;
-      case 0x10c06d0:  ret = Cibyl143.__addsf3_10c06d0( a0, a1); break;
-      case 0x10c06e8:  ret = Cibyl143.__adddf3_10c06e8(sp, a0, a1, a2, a3); break;
-      case 0x10c0728:  ret = Cibyl143.__subsf3_10c0728( a0, a1); break;
-      case 0x10c0740:  ret = Cibyl143.__subdf3_10c0740(sp, a0, a1, a2, a3); break;
-      case 0x10c0780:  ret = Cibyl143.__mulsf3_10c0780( a0, a1); break;
-      case 0x10c0798:  ret = Cibyl143.__muldf3_10c0798(sp, a0, a1, a2, a3); break;
-      case 0x10c07d8:  ret = Cibyl143.__divsf3_10c07d8( a0, a1); break;
-      case 0x10c07f0:  ret = Cibyl143.__divdf3_10c07f0(sp, a0, a1, a2, a3); break;
-      case 0x10c0874:  ret = Cibyl143.__extendsfdf2_10c0874(sp, a0); break;
-      case 0x10c0898:  ret = Cibyl143.__truncdfsf2_10c0898(sp, a0, a1); break;
-      case 0x10c08bc:  ret = Cibyl143.__fixsfsi_10c08bc( a0); break;
-      case 0x10c08d0:  ret = Cibyl143.__fixdfsi_10c08d0(sp, a0, a1); break;
-      case 0x10c0934:  ret = Cibyl143.__fixunssfsi_10c0934( a0); break;
-      case 0x10c0948:  ret = Cibyl143.__fixunsdfsi_10c0948(sp, a0, a1); break;
-      case 0x10c09ac:  ret = Cibyl143.__floatsisf_10c09ac( a0); break;
-      case 0x10c09c0:  ret = Cibyl143.__floatsidf_10c09c0(sp, a0); break;
-      case 0x10c0a24:  ret = Cibyl143.__cmpsf2_10c0a24( a0, a1); break;
-      case 0x10c0a3c:  ret = Cibyl143.__cmpdf2_10c0a3c(sp, a0, a1, a2, a3); break;
-      case 0x10c0a70:  ret = Cibyl143.vsnprintf_10c0a70(sp, a0, a1, a2, a3); break;
-      case 0x10c1760:  ret = Cibyl144.__unorddf2_10c1760(sp, a0, a1, a2, a3); break;
-      case 0x10c17ac:  ret = Cibyl144.__gtdf2_10c17ac(sp, a0, a1, a2, a3); break;
-      case 0x10c188c:  ret = Cibyl144.__ltdf2_10c188c(sp, a0, a1, a2, a3); break;
-      case 0x10c18fc:  ret = Cibyl144.__gedf2_10c18fc(sp, a0, a1, a2, a3); break;
-      case 0x10c1a4c:  ret = Cibyl144.__unordsf2_10c1a4c( a0, a1); break;
-      case 0x10c1a80:  ret = Cibyl144.__gtsf2_10c1a80(sp, a0, a1, a2, a3); break;
-      case 0x10c1ad0:  ret = Cibyl144.__lesf2_10c1ad0(sp, a0, a1, a2, a3); break;
-      case 0x10c1b20:  ret = Cibyl144.__ltsf2_10c1b20(sp, a0, a1, a2, a3); break;
-      case 0x10c1b70:  ret = Cibyl144.__gesf2_10c1b70(sp, a0, a1, a2, a3); break;
-      case 0x10c1c10:  ret = Cibyl144.__eqsf2_10c1c10(sp, a0, a1, a2, a3); break;
-      case 0x10c1c60:  ret = Cibyl144.atof_10c1c60(sp, a0, a1, a2, a3); break;
-      case 0x10c1e10:  ret = Cibyl144.sin_10c1e10(sp, a0, a1); break;
-      case 0x10c1e44:  ret = Cibyl144.cos_10c1e44(sp, a0, a1); break;
-      case 0x10c1e78:  ret = Cibyl144.atan_10c1e78(sp, a0, a1); break;
-      case 0x10c1eac:  ret = Cibyl144.asin_10c1eac(sp, a0, a1); break;
-      case 0x10c1ee0:  ret = Cibyl144.acos_10c1ee0(sp, a0, a1); break;
-      case 0x10c1fb0:  ret = Cibyl144.floor_10c1fb0(sp, a0, a1); break;
-      case 0x10c1fe4:  ret = Cibyl144.sqrt_10c1fe4(sp, a0, a1); break;
-      case 0x10c2198:  Cibyl144.close_read_10c2198(); break;
-      case 0x10c21a0:  ret = Cibyl144.rs_close_10c21a0(sp, a0, a1, a2, a3); break;
-      case 0x10c2214:  ret = Cibyl144.resource_register_fs_10c2214(sp, a0, a1, a2, a3); break;
-      case 0x10c2278:  ret = Cibyl144.recordstore_register_fs_10c2278(sp, a0, a1, a2, a3); break;
-      case 0x10c22d4:  ret = Cibyl144.connector_register_fs_10c22d4(sp, a0, a1, a2, a3); break;
-      case 0x10c23a4:  ret = Cibyl144.res_open_10c23a4(sp, a0, a1, a2, a3); break;
-      case 0x10c2464:  ret = Cibyl144.conn_close_10c2464(sp, a0, a1, a2, a3); break;
-      case 0x10c24a0:  ret = Cibyl144.get_record_10c24a0(sp, a0, a1, a2, a3); break;
-      case 0x10c25a0:  ret = Cibyl144.rs_open_10c25a0(sp, a0, a1, a2, a3); break;
-      case 0x10c27b0:  ret = Cibyl144.close_write_10c27b0(sp, a0, a1, a2, a3); break;
-      case 0x10c2930:  ret = Cibyl144.conn_open_10c2930(sp, a0, a1, a2, a3); break;
-      case 0x10c2a78:  ret = Cibyl144.close_output_10c2a78( a0); break;
-      case 0x10c2ab0:  ret = Cibyl144.seek_10c2ab0( a0, a1, a2); break;
-      case 0x10c2b48:  ret = Cibyl144.close_dir_10c2b48( a0); break;
-      case 0x10c2b94:  ret = Cibyl144.register_fs_10c2b94(sp, a0, a1, a2, a3); break;
-      case 0x10c2bc4:  ret = Cibyl144.read_dir_10c2bc4(sp, a0, a1, a2, a3); break;
-      case 0x10c2c90:  ret = Cibyl144.remove_dir_10c2c90(sp, a0, a1, a2, a3); break;
-      case 0x10c2d08:  ret = Cibyl144.make_dir_10c2d08(sp, a0, a1, a2, a3); break;
-      case 0x10c2d80:  ret = Cibyl144.open_dir_10c2d80(sp, a0, a1, a2, a3); break;
-      case 0x10c2e94:  ret = Cibyl145.fileconnection_register_fs_10c2e94(sp, a0, a1, a2, a3); break;
-      case 0x10c2ef0:  ret = Cibyl145.close_10c2ef0(sp, a0, a1, a2, a3); break;
-      case 0x10c2f40:  ret = Cibyl145.open_file_10c2f40(sp, a0, a1, a2, a3); break;
-      case 0x10c31f4:  ret = Cibyl145.open_10c31f4(sp, a0, a1, a2, a3); break;
-      case 0x10c3248:  ret = Cibyl145.__offtime_10c3248(sp, a0, a1, a2, a3); break;
-      case 0x10c34cc:  ret = Cibyl145.gmtime_10c34cc(sp, a0, a1, a2, a3); break;
-      case 0x10c34fc:  ret = Cibyl145.localtime_r_10c34fc(sp, a0, a1, a2, a3); break;
-      case 0x10c3558:  ret = Cibyl145.localtime_10c3558(sp, a0, a1, a2, a3); break;
-      case 0x10c357c:  ret = Cibyl145.timegm_10c357c( a0, a1, a2, a3); break;
-      case 0x10c3658:  ret = Cibyl145.close_10c3658( a0); break;
-      case 0x10c367c:  ret = Cibyl145.read_10c367c( a0, a1, a2, a3); break;
-      case 0x10c36d8:  ret = Cibyl145.write_10c36d8(); break;
-      case 0x10c36e0:  ret = Cibyl145.seek_10c36e0(sp, a0, a1, a2, a3); break;
-      case 0x10c3798:  Cibyl145.seek_10c3798(); break;
-      case 0x10c37a0:  ret = Cibyl145.NOPH_MemoryFile_getDataPtr_10c37a0( a0); break;
-      case 0x10c37b4:  ret = Cibyl145.write_10c37b4(sp, a0, a1, a2, a3); break;
-      case 0x10c3890:  ret = Cibyl145.read_10c3890(sp, a0, a1, a2, a3); break;
-      case 0x10c390c:  ret = Cibyl145.close_10c390c(sp, a0, a1, a2, a3); break;
-      case 0x10c39c0:  ret = Cibyl145.NOPH_MemoryFile_setup_10c39c0(sp, a0, a1, a2, a3); break;
-      case 0x10c3a34:  ret = Cibyl145.NOPH_MemoryFile_open_10c3a34(sp, a0, a1, a2, a3); break;
-      case 0x10c3a8c:  ret = Cibyl145.NOPH_MemoryFile_openIndirectSizeHint_10c3a8c(sp, a0, a1, a2, a3); break;
+      case 0x10049e4:  ret = Cibyl3.roadmap_log_close_log_file_10049e4(sp, a0, a1, a2, a3); break;
+      case 0x1004a48:  ret = Cibyl3.roadmap_check_allocated_with_source_line_1004a48(sp, a0, a1, a2, a3); break;
+      case 0x1004a80:  ret = Cibyl3.roadmap_line_route_get_direction_1004a80( a0, a1); break;
+      case 0x1004af4:  ret = Cibyl3.roadmap_line_route_is_low_weight_1004af4( a0); break;
+      case 0x1004bec:  ret = Cibyl3.roadmap_line_route_activate_1004bec(sp, a0, a1, a2, a3); break;
+      case 0x1004c48:  ret = Cibyl3.roadmap_line_route_get_restrictions_1004c48(sp, a0, a1, a2, a3); break;
+      case 0x1004cec:  ret = Cibyl3.roadmap_line_route_unmap_1004cec(sp, a0, a1, a2, a3); break;
+      case 0x1004d40:  ret = Cibyl3.roadmap_line_route_map_1004d40(sp, a0, a1, a2, a3); break;
+      case 0x1004e40:  ret = Cibyl3.roadmap_line_speed_activate_1004e40(sp, a0, a1, a2, a3); break;
+      case 0x1004e9c:  ret = Cibyl3.roadmap_line_speed_get_1004e9c(sp, a0, a1, a2, a3); break;
+      case 0x1004f58:  ret = Cibyl3.roadmap_line_speed_get_speed_1004f58(sp, a0, a1, a2, a3); break;
+      case 0x1004fd8:  ret = Cibyl3.roadmap_line_speed_get_avg_1004fd8(sp, a0, a1, a2, a3); break;
+      case 0x1005088:  ret = Cibyl3.roadmap_line_speed_get_avg_speed_1005088(sp, a0, a1, a2, a3); break;
+      case 0x10050fc:  ret = Cibyl3.roadmap_line_speed_unmap_10050fc(sp, a0, a1, a2, a3); break;
+      case 0x1005150:  ret = Cibyl3.roadmap_line_speed_map_1005150(sp, a0, a1, a2, a3); break;
+      case 0x10052d8:  ret = Cibyl3.roadmap_line_speed_get_avg_cross_time_10052d8(sp, a0, a1, a2, a3); break;
+      case 0x10054c0:  ret = Cibyl4.T_73_10054c0(sp, a0, a1, a2, a3); break;
+      case 0x10055d0:  ret = Cibyl4.roadmap_line_speed_get_cross_times_10055d0(sp, a0, a1, a2, a3); break;
+      case 0x1005688:  ret = Cibyl4.roadmap_line_speed_get_cross_time_at_1005688(sp, a0, a1, a2, a3); break;
+      case 0x10056a8:  ret = Cibyl4.roadmap_turns_in_square_10056a8(); break;
+      case 0x10056b0:  ret = Cibyl4.roadmap_turns_of_node_10056b0(); break;
+      case 0x10057ec:  ret = Cibyl4.roadmap_dictionary_activate_10057ec( a0); break;
+      case 0x10057f8:  ret = Cibyl4.roadmap_dictionary_get_10057f8( a0, a1); break;
+      case 0x1005958:  ret = Cibyl4.roadmap_dictionary_unmap_1005958(sp, a0, a1, a2, a3); break;
+      case 0x1005a00:  ret = Cibyl4.roadmap_dictionary_find_words_1005a00(sp, a0, a1, a2, a3); break;
+      case 0x1005b58:  ret = Cibyl4.roadmap_dictionary_walk_1005b58(sp, a0, a1, a2, a3); break;
+      case 0x1005cb8:  ret = Cibyl4.roadmap_dictionary_get_all_results_1005cb8(sp, a0, a1, a2, a3); break;
+      case 0x1005d70:  ret = Cibyl4.roadmap_dictionary_initialize_one_1005d70(sp, a0, a1, a2, a3); break;
+      case 0x1005e4c:  ret = Cibyl4.roadmap_dictionary_map_1005e4c(sp, a0, a1, a2, a3); break;
+      case 0x1005f28:  ret = Cibyl4.roadmap_dictionary_set_mask_1005f28(sp, a0, a1, a2, a3); break;
+      case 0x100643c:  ret = Cibyl4.roadmap_dictionary_move_cursor_100643c(sp, a0, a1, a2, a3); break;
+      case 0x1006bb0:  ret = Cibyl4.roadmap_dictionary_open_1006bb0(sp, a0, a1, a2, a3); break;
+      case 0x1006c0c:  ret = Cibyl4.roadmap_math_set_min_zoom_1006c0c( a0); break;
+      case 0x1006c18:  ret = Cibyl4.roadmap_math_trigonometry_1006c18( a0, a1, a2, a3); break;
+      case 0x1006cd8:  ret = Cibyl4.roadmap_math_check_point_in_segment_1006cd8(sp, a0, a1, a2, a3); break;
+      case 0x1006e04:  ret = Cibyl4.roadmap_math_counter_rotate_coordinate_1006e04( a0, a1, a2, a3); break;
+      case 0x1006e94:  ret = Cibyl4.roadmap_math_project_1006e94( a0, a1, a2, a3); break;
+      case 0x1006f34:  ret = Cibyl4.roadmap_math_unproject_1006f34( a0, a1, a2, a3); break;
+      case 0x1006fd0:  ret = Cibyl4.roadmap_math_get_scale_1006fd0(sp, a0, a1, a2, a3); break;
+      case 0x10072b4:  ret = Cibyl4.roadmap_math_rotate_coordinates_10072b4(sp, a0, a1, a2, a3); break;
+      case 0x10073d4:  ret = Cibyl5.roadmap_math_rotate_project_coordinate_10073d4(sp, a0, a1, a2, a3); break;
+      case 0x10073f8:  ret = Cibyl5.roadmap_math_rotate_point_10073f8(sp, a0, a1, a2, a3); break;
+      case 0x10074fc:  ret = Cibyl5.roadmap_math_rotate_object_10074fc(sp, a0, a1, a2, a3); break;
+      case 0x1007630:  ret = Cibyl5.roadmap_math_register_unit_change_callback_1007630( a0); break;
+      case 0x1007640:  ret = Cibyl5.roadmap_math_use_metric_1007640(sp, a0, a1, a2, a3); break;
+      case 0x100767c:  ret = Cibyl5.roadmap_math_use_imperial_100767c(sp, a0, a1, a2, a3); break;
+      case 0x10076b8:  ret = Cibyl5.roadmap_math_set_focus_10076b8(sp, a0, a1, a2, a3); break;
+      case 0x1007728:  ret = Cibyl5.roadmap_math_release_focus_1007728(sp, a0, a1, a2, a3); break;
+      case 0x100778c:  ret = Cibyl5.roadmap_math_thickness_100778c(sp, a0, a1, a2, a3); break;
+      case 0x1007a28:  ret = Cibyl5.roadmap_math_normalize_orientation_1007a28( a0); break;
+      case 0x1007a5c:  ret = Cibyl5.roadmap_math_get_orientation_1007a5c(); break;
+      case 0x1007a6c:  ret = Cibyl5.roadmap_math_get_zoom_1007a6c(); break;
+      case 0x1007a7c:  ret = Cibyl5.roadmap_math_to_position_1007a7c(sp, a0, a1, a2, a3); break;
+      case 0x1007b84:  ret = Cibyl5.roadmap_math_set_orientation_1007b84(sp, a0, a1, a2, a3); break;
+      case 0x1007d7c:  ret = Cibyl5.roadmap_math_distance_unit_1007d7c(); break;
+      case 0x1007d94:  ret = Cibyl5.roadmap_math_trip_unit_1007d94(); break;
+      case 0x1007dac:  ret = Cibyl5.roadmap_math_speed_unit_1007dac(); break;
+      case 0x1007dc4:  ret = Cibyl5.roadmap_math_distance_to_current_1007dc4(sp, a0, a1, a2, a3); break;
+      case 0x1007e04:  ret = Cibyl5.roadmap_math_to_trip_distance_1007e04( a0); break;
+      case 0x1007e28:  ret = Cibyl5.roadmap_math_to_trip_distance_tenths_1007e28( a0); break;
+      case 0x1007e5c:  ret = Cibyl5.roadmap_math_to_speed_unit_1007e5c(sp, a0, a1, a2, a3); break;
+      case 0x1007e9c:  ret = Cibyl5.roadmap_math_meters_p_second_to_speed_unit_1007e9c(sp, a0, a1, a2, a3); break;
+      case 0x1007ec8:  ret = Cibyl5.roadmap_math_to_cm_1007ec8(sp, a0, a1, a2, a3); break;
+      case 0x1007f38:  ret = Cibyl5.roadmap_math_screen_edges_1007f38(sp, a0, a1, a2, a3); break;
+      case 0x1007f60:  ret = Cibyl5.roadmap_math_displayed_screen_edges_1007f60(sp, a0, a1, a2, a3); break;
+      case 0x1007f88:  ret = Cibyl5.roadmap_math_area_contains_1007f88( a0, a1); break;
+      case 0x10083c4:  ret = Cibyl5.roadmap_math_compare_points_10083c4( a0, a1, a2); break;
+      case 0x1008420:  ret = Cibyl5.roadmap_math_delta_direction_1008420( a0, a1); break;
+      case 0x100845c:  ret = Cibyl5.roadmap_math_get_context_100845c( a0, a1, a2); break;
+      case 0x1008488:  ret = Cibyl5.roadmap_math_is_metric_1008488(); break;
+      case 0x10084a8:  ret = Cibyl5.roadmap_math_compute_scale_10084a8(sp, a0, a1, a2, a3); break;
+      case 0x10086cc:  ret = Cibyl5.roadmap_math_set_context_10086cc(sp, a0, a1, a2, a3); break;
+      case 0x1008734:  ret = Cibyl5.roadmap_math_set_horizon_1008734(sp, a0, a1, a2, a3); break;
+      case 0x1008758:  ret = Cibyl5.roadmap_math_set_center_1008758(sp, a0, a1, a2, a3); break;
+      case 0x100878c:  ret = Cibyl5.roadmap_math_set_size_100878c(sp, a0, a1, a2, a3); break;
+      case 0x10087b8:  ret = Cibyl5.roadmap_math_street_address_10087b8(sp, a0, a1, a2, a3); break;
+      case 0x1008a80:  ret = Cibyl6.roadmap_math_arccosine_1008a80(sp, a0, a1, a2, a3); break;
+      case 0x1008c1c:  ret = Cibyl6.roadmap_math_to_current_unit_1008c1c(sp, a0, a1, a2, a3); break;
+      case 0x1008cd8:  ret = Cibyl6.roadmap_math_distance_convert_1008cd8(sp, a0, a1, a2, a3); break;
+      case 0x1008ec0:  ret = Cibyl6.roadmap_math_distance_1008ec0(sp, a0, a1, a2, a3); break;
+      case 0x1008f88:  ret = Cibyl6.roadmap_math_get_visible_coordinates_1008f88(sp, a0, a1, a2, a3); break;
+      case 0x10096a4:  ret = Cibyl6.roadmap_math_screen_distance_10096a4(sp, a0, a1, a2, a3); break;
+      case 0x1009834:  ret = Cibyl6.roadmap_math_azymuth_1009834(sp, a0, a1, a2, a3); break;
+      case 0x10099a8:  ret = Cibyl6.roadmap_math_restore_zoom_10099a8(sp, a0, a1, a2, a3); break;
+      case 0x1009a00:  ret = Cibyl6.roadmap_math_zoom_state_1009a00(sp, a0, a1, a2, a3); break;
+      case 0x1009a38:  ret = Cibyl6.roadmap_math_zoom_reset_1009a38(sp, a0, a1, a2, a3); break;
+      case 0x1009a7c:  ret = Cibyl6.roadmap_math_zoom_set_1009a7c(sp, a0, a1, a2, a3); break;
+      case 0x1009b20:  ret = Cibyl6.roadmap_math_set_scale_1009b20(sp, a0, a1, a2, a3); break;
+      case 0x1009ce0:  ret = Cibyl6.roadmap_math_adjust_zoom_1009ce0(sp, a0, a1, a2, a3); break;
+      case 0x1009d28:  ret = Cibyl6.roadmap_math_initialize_1009d28(sp, a0, a1, a2, a3); break;
+      case 0x1009dc4:  ret = Cibyl6.roadmap_math_calc_line_length_1009dc4(sp, a0, a1, a2, a3); break;
+      case 0x100a038:  ret = Cibyl7.roadmap_point_db_id_100a038( a0); break;
+      case 0x100a074:  ret = Cibyl7.roadmap_point_count_100a074(); break;
+      case 0x100a094:  ret = Cibyl7.roadmap_point_unmap_100a094(sp, a0, a1, a2, a3); break;
+      case 0x100a0c4:  ret = Cibyl7.roadmap_point_activate_100a0c4(sp, a0, a1, a2, a3); break;
+      case 0x100a130:  ret = Cibyl7.roadmap_point_map_100a130(sp, a0, a1, a2, a3); break;
+      case 0x100a208:  ret = Cibyl7.roadmap_polygon_count_100a208(); break;
+      case 0x100a228:  ret = Cibyl7.roadmap_polygon_category_100a228( a0); break;
+      case 0x100a24c:  ret = Cibyl7.roadmap_polygon_points_100a24c( a0, a1, a2); break;
+      case 0x100a2b0:  ret = Cibyl7.roadmap_polygon_unmap_100a2b0(sp, a0, a1, a2, a3); break;
+      case 0x100a31c:  ret = Cibyl7.roadmap_polygon_activate_100a31c(sp, a0, a1, a2, a3); break;
+      case 0x100a3a4:  ret = Cibyl7.roadmap_polygon_map_100a3a4(sp, a0, a1, a2, a3); break;
+      case 0x100a480:  ret = Cibyl7.roadmap_polygon_edges_100a480(sp, a0, a1, a2, a3); break;
+      case 0x100a52c:  ret = Cibyl7.roadmap_polygon_name_100a52c(sp, a0, a1, a2, a3); break;
+      case 0x100a568:  ret = Cibyl7.roadmap_shape_activate_100a568(sp, a0, a1, a2, a3); break;
+      case 0x100a5d4:  ret = Cibyl7.roadmap_shape_unmap_100a5d4(sp, a0, a1, a2, a3); break;
+      case 0x100a640:  ret = Cibyl7.roadmap_shape_map_100a640(sp, a0, a1, a2, a3); break;
+      case 0x100a6d8:  ret = Cibyl7.roadmap_shape_set_square_100a6d8(sp, a0, a1, a2, a3); break;
+      case 0x100a724:  Cibyl7.roadmap_square_activate_one_100a724(); break;
+      case 0x100a72c:  ret = Cibyl7.roadmap_square_force_next_update_100a72c(); break;
+      case 0x100a73c:  Cibyl7.roadmap_square_load_index_100a73c(); break;
+      case 0x100a744:  ret = Cibyl7.roadmap_square_activate_100a744(sp, a0, a1, a2, a3); break;
+      case 0x100a7ac:  ret = Cibyl7.roadmap_square_map_one_100a7ac(sp, a0, a1, a2, a3); break;
+      case 0x100aa1c:  ret = Cibyl7.roadmap_square_unload_all_100aa1c(sp, a0, a1, a2, a3); break;
+      case 0x100ab10:  ret = Cibyl7.roadmap_square_unmap_100ab10(sp, a0, a1, a2, a3); break;
+      case 0x100aba4:  ret = Cibyl7.roadmap_square_map_100aba4(sp, a0, a1, a2, a3); break;
+      case 0x100ace0:  ret = Cibyl7.roadmap_square_refresh_100ace0(sp, a0, a1, a2, a3); break;
+      case 0x100ade4:  ret = Cibyl7.roadmap_square_scale_100ade4(sp, a0, a1, a2, a3); break;
+      case 0x100ae04:  ret = Cibyl7.roadmap_square_at_current_scale_100ae04(sp, a0, a1, a2, a3); break;
+      case 0x100ae30:  ret = Cibyl7.roadmap_square_current_scale_shift_100ae30(sp, a0, a1, a2, a3); break;
+      case 0x100ae88:  ret = Cibyl7.roadmap_square_current_scale_factor_100ae88(sp, a0, a1, a2, a3); break;
+      case 0x100aef4:  ret = Cibyl7.roadmap_square_cross_pos_100aef4(sp, a0, a1, a2, a3); break;
+      case 0x100b030:  ret = Cibyl7.roadmap_square_set_screen_scale_100b030(sp, a0, a1, a2, a3); break;
+      case 0x100b084:  ret = Cibyl7.roadmap_square_adjust_scale_100b084(sp, a0, a1, a2, a3); break;
+      case 0x100b0ec:  ret = Cibyl7.roadmap_square_find_100b0ec(sp, a0, a1, a2, a3); break;
+      case 0x100b174:  ret = Cibyl7.roadmap_square_set_current_internal_100b174(sp, a0, a1, a2, a3); break;
+      case 0x100b38c:  ret = Cibyl8.roadmap_square_has_shapes_100b38c(sp, a0, a1, a2, a3); break;
+      case 0x100b40c:  ret = Cibyl8.roadmap_square_min_100b40c(sp, a0, a1, a2, a3); break;
+      case 0x100b494:  ret = Cibyl8.roadmap_square_version_100b494(sp, a0, a1, a2, a3); break;
+      case 0x100b51c:  ret = Cibyl8.roadmap_square_timestamp_100b51c(sp, a0, a1, a2, a3); break;
+      case 0x100b5a4:  ret = Cibyl8.roadmap_square_edges_100b5a4(sp, a0, a1, a2, a3); break;
+      case 0x100b77c:  ret = Cibyl8.roadmap_square_points_count_100b77c(sp, a0, a1, a2, a3); break;
+      case 0x100b7b8:  ret = Cibyl8.roadmap_square_search_100b7b8(sp, a0, a1, a2, a3); break;
+      case 0x100b858:  ret = Cibyl8.roadmap_square_find_neighbours_100b858(sp, a0, a1, a2, a3); break;
+      case 0x100bdc4:  ret = Cibyl8.roadmap_square_view_100bdc4(sp, a0, a1, a2, a3); break;
+      case 0x100c1cc:  ret = Cibyl8.roadmap_square_delete_reference_100c1cc(sp, a0, a1, a2, a3); break;
+      case 0x100c234:  ret = Cibyl8.roadmap_square_unmap_one_100c234(sp, a0, a1, a2, a3); break;
+      case 0x100c2d0:  ret = Cibyl8.T_174_100c2d0(sp, a0, a1, a2, a3); break;
+      case 0x100c310:  ret = Cibyl8.roadmap_square_request_location_100c310(sp, a0, a1, a2, a3); break;
+      case 0x100c4e4:  ret = Cibyl8.roadmap_tile_get_scale_factor_100c4e4( a0); break;
+      case 0x100c508:  ret = Cibyl8.roadmap_tile_get_scale_shift_100c508( a0); break;
+      case 0x100c510:  ret = Cibyl8.roadmap_tile_get_size_100c510( a0); break;
+      case 0x100c534:  ret = Cibyl8.roadmap_tile_get_origin_100c534( a0, a1, a2, a3); break;
+      case 0x100c5ec:  ret = Cibyl8.roadmap_tile_get_index_from_position_100c5ec( a0, a1, a2, a3); break;
+      case 0x100c64c:  ret = Cibyl8.roadmap_tile_get_id_from_position_100c64c(sp, a0, a1, a2, a3); break;
+      case 0x100c740:  ret = Cibyl8.roadmap_tile_get_max_scale_100c740(sp, a0, a1, a2, a3); break;
+      case 0x100c810:  ret = Cibyl8.roadmap_tile_get_scale_100c810(sp, a0, a1, a2, a3); break;
+      case 0x100c86c:  ret = Cibyl9.roadmap_tile_edges_100c86c(sp, a0, a1, a2, a3); break;
+      case 0x100c954:  ret = Cibyl9.roadmap_tile_is_adjacent_100c954(sp, a0, a1, a2, a3); break;
+      case 0x100ca20:  ret = Cibyl9.roadmap_tile_register_callback_100ca20( a0); break;
+      case 0x100ca30:  ret = Cibyl9.roadmap_tile_refresh_all_100ca30(sp, a0, a1, a2, a3); break;
+      case 0x100cacc:  ret = Cibyl9.refresh_all_tiles_100cacc(sp, a0, a1, a2, a3); break;
+      case 0x100cbb4:  ret = Cibyl9.tile_load_progress_warn_100cbb4(sp, a0, a1, a2, a3); break;
+      case 0x100cc4c:  ret = Cibyl9.init_loading_session_100cc4c(sp, a0, a1, a2, a3); break;
+      case 0x100cd6c:  ret = Cibyl9.queue_tile_100cd6c(sp, a0, a1, a2, a3); break;
+      case 0x100d04c:  ret = Cibyl9.http_cb_size_100d04c(sp, a0, a1, a2, a3); break;
+      case 0x100d0c4:  ret = Cibyl9.http_cb_progress_100d0c4(sp, a0, a1, a2, a3); break;
+      case 0x100d138:  ret = Cibyl9.load_next_tile_100d138(sp, a0, a1, a2, a3); break;
+      case 0x100d394:  ret = Cibyl9.roadmap_tile_request_100d394(sp, a0, a1, a2, a3); break;
+      case 0x100d518:  ret = Cibyl9.http_cb_done_100d518(sp, a0, a1, a2, a3); break;
+      case 0x100d700:  ret = Cibyl9.http_cb_error_100d700(sp, a0, a1, a2, a3); break;
+      case 0x100d8d8:  ret = Cibyl9.start_network_100d8d8(sp, a0, a1, a2, a3); break;
+      case 0x100d920:  ret = Cibyl9.roadmap_tile_manager_login_cb_100d920(sp, a0, a1, a2, a3); break;
+      case 0x100d970:  ret = Cibyl9.roadmap_tile_manager_check_timeouts_100d970(sp, a0, a1, a2, a3); break;
+      case 0x100da38:  ret = Cibyl9.roadmap_tile_status_add_100da38(sp, a0, a1, a2, a3); break;
+      case 0x100dba0:  ret = Cibyl10.roadmap_tile_status_get_100dba0(sp, a0, a1, a2, a3); break;
+      case 0x100dc48:  ret = Cibyl10.roadmap_warning_unregister_100dc48( a0, a1, a2, a3); break;
+      case 0x100dcb8:  ret = Cibyl10.roadmap_warning_shutdown_100dcb8(sp, a0, a1, a2, a3); break;
+      case 0x100dcdc:  ret = Cibyl10.roadmap_warning_initialize_100dcdc(sp, a0, a1, a2, a3); break;
+      case 0x100dd58:  ret = Cibyl10.roadmap_warning_monitor_100dd58(sp, a0, a1, a2, a3); break;
+      case 0x100de9c:  ret = Cibyl10.roadmap_warning_register_100de9c(sp, a0, a1, a2, a3); break;
+      case 0x100dfd8:  ret = Cibyl10.roadmap_config_skip_until_100dfd8( a0, a1); break;
+      case 0x100e014:  ret = Cibyl10.roadmap_config_skip_spaces_100e014( a0, a1); break;
+      case 0x100e048:  ret = Cibyl10.roadmap_config_extract_data_100e048( a0, a1, a2); break;
+      case 0x100e0d8:  ret = Cibyl10.roadmap_config_is_loaded_100e0d8(); break;
+      case 0x100e0e8:  ret = Cibyl10.roadmap_config_search_file_100e0e8(sp, a0, a1, a2, a3); break;
+      case 0x100e208:  ret = Cibyl10.roadmap_config_search_item_100e208(sp, a0, a1, a2, a3); break;
+      case 0x100e288:  ret = Cibyl10.roadmap_config_retrieve_100e288(sp, a0, a1, a2, a3); break;
+      case 0x100e358:  ret = Cibyl10.roadmap_config_get_100e358(sp, a0, a1, a2, a3); break;
+      case 0x100e418:  ret = Cibyl10.roadmap_config_set_item_100e418(sp, a0, a1, a2, a3); break;
+      case 0x100e51c:  ret = Cibyl10.roadmap_config_set_position_100e51c(sp, a0, a1, a2, a3); break;
+      case 0x100e5d0:  ret = Cibyl10.roadmap_config_set_100e5d0(sp, a0, a1, a2, a3); break;
+      case 0x100e620:  ret = Cibyl10.roadmap_config_set_integer_100e620(sp, a0, a1, a2, a3); break;
+      case 0x100e66c:  ret = Cibyl10.roadmap_config_get_position_100e66c(sp, a0, a1, a2, a3); break;
+      case 0x100e798:  ret = Cibyl10.roadmap_config_get_integer_100e798(sp, a0, a1, a2, a3); break;
+      case 0x100e804:  ret = Cibyl10.roadmap_config_match_100e804(sp, a0, a1, a2, a3); break;
+      case 0x100e830:  ret = Cibyl10.roadmap_config_update_100e830(sp, a0, a1, a2, a3); break;
+      case 0x100e9d4:  ret = Cibyl10.roadmap_config_save_one_100e9d4(sp, a0, a1, a2, a3); break;
+      case 0x100ea60:  ret = Cibyl10.roadmap_config_save_100ea60(sp, a0, a1, a2, a3); break;
+      case 0x100eac0:  ret = Cibyl10.roadmap_config_add_enumeration_value_100eac0(sp, a0, a1, a2, a3); break;
+      case 0x100eb54:  ret = Cibyl10.roadmap_config_new_item_100eb54(sp, a0, a1, a2, a3); break;
+      case 0x100ed80:  ret = Cibyl10.roadmap_config_declare_password_100ed80(sp, a0, a1, a2, a3); break;
+      case 0x100edc0:  ret = Cibyl10.roadmap_config_declare_100edc0(sp, a0, a1, a2, a3); break;
+      case 0x100ee08:  ret = Cibyl10.roadmap_config_declare_enumeration_100ee08(sp, a0, a1, a2, a3); break;
+      case 0x100eee8:  ret = Cibyl11.roadmap_config_get_name_value_binary_100eee8(sp, a0, a1, a2, a3); break;
+      case 0x100f014:  ret = Cibyl11.T_41_100f014(sp, a0, a1, a2, a3); break;
+      case 0x100f1fc:  ret = Cibyl11.roadmap_config_reload_100f1fc(sp, a0, a1, a2, a3); break;
+      case 0x100f32c:  ret = Cibyl11.roadmap_config_initialize_100f32c(sp, a0, a1, a2, a3); break;
+      case 0x100f36c:  ret = Cibyl11.roadmap_state_refresh_100f36c(sp, a0, a1, a2, a3); break;
+      case 0x100f3c0:  ret = Cibyl11.roadmap_state_monitor_100f3c0( a0, a1); break;
+      case 0x100f434:  ret = Cibyl11.roadmap_state_find_100f434(sp, a0, a1, a2, a3); break;
+      case 0x100f49c:  ret = Cibyl11.roadmap_state_add_100f49c(sp, a0, a1, a2, a3); break;
+      case 0x100f538:  ret = Cibyl11.upload_file_size_callback_100f538(); break;
+      case 0x100f540:  Cibyl11.upload_progress_callback_100f540(); break;
+      case 0x100f548:  ret = Cibyl11.roadmap_camera_image_shutdown_100f548(sp, a0, a1, a2, a3); break;
+      case 0x100f5d4:  ret = Cibyl11.roadmap_camera_image_initialize_100f5d4(sp, a0, a1, a2, a3); break;
+      case 0x100f6c8:  ret = Cibyl11.roadmap_camera_image_capture_100f6c8(sp, a0, a1, a2, a3); break;
+      case 0x100f75c:  ret = Cibyl11.download_error_callback_100f75c(sp, a0, a1, a2, a3); break;
+      case 0x100f7ec:  ret = Cibyl11.download_progress_callback_100f7ec(sp, a0, a1, a2, a3); break;
+      case 0x100f83c:  ret = Cibyl11.upload_done_100f83c(sp, a0, a1, a2, a3); break;
+      case 0x100f958:  ret = Cibyl11.upload_error_callback_100f958(sp, a0, a1, a2, a3); break;
+      case 0x100f9c0:  ret = Cibyl11.download_size_callback_100f9c0(sp, a0, a1, a2, a3); break;
+      case 0x100fd04:  ret = Cibyl11.download_cache_add_100fd04(sp, a0, a1, a2, a3); break;
+      case 0x100fdb8:  ret = Cibyl11.download_done_callback_100fdb8(sp, a0, a1, a2, a3); break;
+      case 0x100feac:  ret = Cibyl11.roadmap_camera_image_download_100feac(sp, a0, a1, a2, a3); break;
+      case 0x1010068:  ret = Cibyl11.roadmap_layer_all_roads_1010068( a0, a1, a2, a3); break;
+      case 0x10100bc:  ret = Cibyl11.roadmap_layer_visible_lines_10100bc(sp, a0, a1, a2, a3); break;
+      case 0x1010224:  ret = Cibyl11.roadmap_layer_visible_lines3_1010224(sp, a0, a1, a2, a3); break;
+      case 0x1010244:  ret = Cibyl11.roadmap_layer_visible_roads_1010244( a0, a1, a2, a3); break;
+      case 0x10102dc:  ret = Cibyl11.roadmap_layer_reset_10102dc(); break;
+      case 0x10102ec:  ret = Cibyl11.roadmap_layer_get_categories_names_10102ec( a0, a1); break;
+      case 0x1010304:  ret = Cibyl11.roadmap_layer_cfcc2type_1010304( a0); break;
+      case 0x1010324:  ret = Cibyl11.roadmap_layer_reload_internal_1010324(sp, a0, a1, a2, a3); break;
+      case 0x101099c:  ret = Cibyl12.roadmap_layer_initialize_101099c(sp, a0, a1, a2, a3); break;
+      case 0x1010a5c:  ret = Cibyl12.roadmap_layer_adjust_1010a5c(sp, a0, a1, a2, a3); break;
+      case 0x1010d54:  ret = Cibyl12.roadmap_layer_reload_1010d54(sp, a0, a1, a2, a3); break;
+      case 0x1010d94:  ret = Cibyl12.roadmap_street_get_street_t2s_1010d94(); break;
+      case 0x1010dac:  ret = Cibyl12.roadmap_street_get_street_range_1010dac(sp, a0, a1, a2, a3); break;
+      case 0x1010e28:  ret = Cibyl12.roadmap_street_unmap_1010e28(sp, a0, a1, a2, a3); break;
+      case 0x1010e94:  ret = Cibyl12.roadmap_street_activate_1010e94(sp, a0, a1, a2, a3); break;
+      case 0x1011018:  ret = Cibyl12.roadmap_street_map_1011018(sp, a0, a1, a2, a3); break;
+      case 0x10111bc:  ret = Cibyl12.roadmap_street_get_street_fetype_10111bc(sp, a0, a1, a2, a3); break;
+      case 0x101120c:  ret = Cibyl12.roadmap_street_get_street_fename_101120c(sp, a0, a1, a2, a3); break;
+      case 0x101125c:  ret = Cibyl12.roadmap_street_get_city_name_101125c(sp, a0, a1, a2, a3); break;
+      case 0x10112a8:  ret = Cibyl12.roadmap_street_get_street_city_10112a8(sp, a0, a1, a2, a3); break;
+      case 0x1011358:  ret = Cibyl12.roadmap_street_search_city_1011358(sp, a0, a1, a2, a3); break;
+      case 0x1011378:  ret = Cibyl12.roadmap_street_append_1011378(sp, a0, a1, a2, a3); break;
+      case 0x1011428:  ret = Cibyl12.roadmap_street_get_street_name_from_id_safe_1011428(sp, a0, a1, a2, a3); break;
+      case 0x1011828:  ret = Cibyl12.roadmap_street_get_street_name_1011828(sp, a0, a1, a2, a3); break;
+      case 0x101185c:  ret = Cibyl12.roadmap_street_get_street_address_101185c(sp, a0, a1, a2, a3); break;
+      case 0x1011930:  ret = Cibyl12.roadmap_street_get_full_name_1011930(sp, a0, a1, a2, a3); break;
+      case 0x1011a24:  ret = Cibyl12.roadmap_street_get_street_1011a24(sp, a0, a1, a2, a3); break;
+      case 0x1011a5c:  ret = Cibyl12.roadmap_street_get_properties_1011a5c(sp, a0, a1, a2, a3); break;
+      case 0x1011b30:  ret = Cibyl12.roadmap_street_replace_1011b30(sp, a0, a1, a2, a3); break;
+      case 0x1011d3c:  ret = Cibyl12.roadmap_street_distance_position_1011d3c(sp, a0, a1, a2, a3); break;
+      case 0x1011ff0:  ret = Cibyl13.roadmap_street_get_position_1011ff0(sp, a0, a1, a2, a3); break;
+      case 0x10121b4:  ret = Cibyl13.roadmap_street_blocks_by_city_10121b4(sp, a0, a1, a2, a3); break;
+      case 0x10124e4:  ret = Cibyl13.T_147_10124e4(sp, a0, a1, a2, a3); break;
+      case 0x10127a0:  ret = Cibyl13.roadmap_street_extend_line_ends_10127a0(sp, a0, a1, a2, a3); break;
+      case 0x1012c68:  ret = Cibyl13.roadmap_street_line_has_predecessor_1012c68(sp, a0, a1, a2, a3); break;
+      case 0x1012c98:  ret = Cibyl13.roadmap_street_get_distance_no_shape_1012c98(sp, a0, a1, a2, a3); break;
+      case 0x1012dbc:  ret = Cibyl13.roadmap_street_get_distance_with_shape_1012dbc(sp, a0, a1, a2, a3); break;
+      case 0x1013038:  ret = Cibyl13.roadmap_street_get_closest_1013038(sp, a0, a1, a2, a3); break;
+      case 0x10133a0:  ret = Cibyl14.roadmap_street_check_distance_10133a0(sp, a0, a1, a2, a3); break;
+      case 0x10134dc:  ret = Cibyl14.roadmap_street_get_distance_10134dc(sp, a0, a1, a2, a3); break;
+      case 0x101356c:  ret = Cibyl14.roadmap_county_count_101356c(); break;
+      case 0x101359c:  ret = Cibyl14.roadmap_county_by_position_101359c(sp, a0, a1, a2, a3); break;
+      case 0x10135ec:  ret = Cibyl14.roadmap_county_search_index_10135ec(sp, a0, a1, a2, a3); break;
+      case 0x101373c:  ret = Cibyl14.roadmap_locator_no_download_101373c(); break;
+      case 0x1013744:  ret = Cibyl14.roadmap_locator_close_1013744( a0, a1); break;
+      case 0x10137b0:  ret = Cibyl14.roadmap_locator_declare_10137b0( a0); break;
+      case 0x10137d0:  ret = Cibyl14.roadmap_locator_unload_tile_10137d0(sp, a0, a1, a2, a3); break;
+      case 0x1013804:  ret = Cibyl14.roadmap_locator_load_tile_mem_1013804(sp, a0, a1, a2, a3); break;
+      case 0x1013858:  ret = Cibyl14.roadmap_locator_load_tile_1013858(sp, a0, a1, a2, a3); break;
+      case 0x10138a4:  ret = Cibyl14.roadmap_locator_static_county_10138a4(sp, a0, a1, a2, a3); break;
+      case 0x101391c:  ret = Cibyl14.calloc_101391c(sp, a0, a1, a2, a3); break;
+      case 0x1013964:  ret = Cibyl14.roadmap_locator_configure_1013964(sp, a0, a1, a2, a3); break;
+      case 0x1013a60:  ret = Cibyl14.roadmap_locator_open_1013a60(sp, a0, a1, a2, a3); break;
+      case 0x1013c54:  ret = Cibyl14.roadmap_locator_activate_1013c54(sp, a0, a1, a2, a3); break;
+      case 0x1013c90:  ret = Cibyl14.roadmap_locator_by_city_1013c90(sp, a0, a1, a2, a3); break;
+      case 0x1013cfc:  ret = Cibyl14.roadmap_locator_by_position_1013cfc(sp, a0, a1, a2, a3); break;
+      case 0x1013d94:  ret = Cibyl14.roadmap_metadata_unmap_1013d94(sp, a0, a1, a2, a3); break;
+      case 0x1013e00:  ret = Cibyl14.roadmap_metadata_activate_1013e00(sp, a0, a1, a2, a3); break;
+      case 0x1013ea4:  ret = Cibyl14.roadmap_metadata_map_1013ea4(sp, a0, a1, a2, a3); break;
+      case 0x1014074:  ret = Cibyl14.roadmap_skin_register_1014074( a0, a1, a2); break;
+      case 0x10140c0:  ret = Cibyl14.roadmap_skin_auto_night_feature_enabled_10140c0(sp, a0, a1, a2, a3); break;
+      case 0x10140f4:  ret = Cibyl14.roadmap_skin_auto_night_mode_10140f4(sp, a0, a1, a2, a3); break;
+      case 0x10141a4:  ret = Cibyl14.roadmap_skin_state_10141a4(sp, a0, a1, a2, a3); break;
+      case 0x10141d0:  ret = Cibyl14.roadmap_skin_get_scheme_10141d0(sp, a0, a1, a2, a3); break;
+      case 0x10141f4:  ret = Cibyl14.roadmap_skin_auto_night_mode_kill_timer_10141f4(sp, a0, a1, a2, a3); break;
+      case 0x1014218:  ret = Cibyl14.roadmap_skin_state_screen_touched_1014218(sp, a0, a1, a2, a3); break;
+      case 0x101425c:  ret = Cibyl14.roadmap_skin_set_subskin_101425c(sp, a0, a1, a2, a3); break;
+      case 0x1014468:  ret = Cibyl14.roadmap_skin_gps_listener_1014468(sp, a0, a1, a2, a3); break;
+      case 0x101459c:  ret = Cibyl14.toggle_skin_timer_101459c(sp, a0, a1, a2, a3); break;
+      case 0x10145e4:  ret = Cibyl14.roadmap_skin_set_scheme_10145e4(sp, a0, a1, a2, a3); break;
+      case 0x101461c:  ret = Cibyl14.roadmap_skin_init_101461c(sp, a0, a1, a2, a3); break;
+      case 0x1014680:  ret = Cibyl14.roadmap_skin_toggle_1014680(sp, a0, a1, a2, a3); break;
+      case 0x10146c8:  ret = Cibyl14.roadmap_plugin_register_10146c8( a0, a1, a2, a3); break;
+      case 0x1014724:  ret = Cibyl14.roadmap_plugin_unregister_1014724( a0, a1); break;
+      case 0x101477c:  ret = Cibyl14.roadmap_plugin_override_line_101477c(); break;
+      case 0x101478c:  ret = Cibyl14.roadmap_plugin_screen_repaint_101478c(sp, a0, a1, a2, a3); break;
+      case 0x1014818:  ret = Cibyl14.roadmap_plugin_find_connected_lines_1014818(sp, a0, a1, a2, a3); break;
+      case 0x10148e0:  ret = Cibyl15.roadmap_plugin_adjust_layer_10148e0(sp, a0, a1, a2, a3); break;
+      case 0x1014988:  ret = Cibyl15.roadmap_plugin_get_closest_1014988(sp, a0, a1, a2, a3); break;
+      case 0x1014a64:  ret = Cibyl15.roadmap_plugin_shutdown_1014a64(sp, a0, a1, a2, a3); break;
+      case 0x1014ae4:  ret = Cibyl15.check_same_line_1014ae4( a0, a1); break;
+      case 0x1014b20:  ret = Cibyl15.roadmap_plugin_same_db_line_1014b20(sp, a0, a1, a2, a3); break;
+      case 0x1014c10:  ret = Cibyl15.roadmap_plugin_get_direction_1014c10(sp, a0, a1, a2, a3); break;
+      case 0x1014cdc:  ret = Cibyl15.roadmap_plugin_line_to_1014cdc(sp, a0, a1, a2, a3); break;
+      case 0x1014de8:  ret = Cibyl15.roadmap_plugin_line_from_1014de8(sp, a0, a1, a2, a3); break;
+      case 0x1014ef4:  ret = Cibyl15.roadmap_plugin_get_line_points_1014ef4(sp, a0, a1, a2, a3); break;
+      case 0x1014ffc:  ret = Cibyl15.roadmap_plugin_calc_length_1014ffc(sp, a0, a1, a2, a3); break;
+      case 0x101508c:  ret = Cibyl15.roadmap_plugin_get_street_101508c(sp, a0, a1, a2, a3); break;
+      case 0x1015184:  ret = Cibyl15.roadmap_plugin_get_street_properties_1015184(sp, a0, a1, a2, a3); break;
+      case 0x10152cc:  ret = Cibyl15.roadmap_plugin_street_full_name_10152cc(sp, a0, a1, a2, a3); break;
+      case 0x10153a4:  ret = Cibyl15.roadmap_plugin_get_distance_10153a4(sp, a0, a1, a2, a3); break;
+      case 0x1015484:  ret = Cibyl15.roadmap_plugin_activate_db_1015484(sp, a0, a1, a2, a3); break;
+      case 0x1015528:  ret = Cibyl15.roadmap_hash_get_first_1015528( a0, a1); break;
+      case 0x10155bc:  ret = Cibyl15.roadmap_hash_string_10155bc( a0, a1); break;
+      case 0x10155f0:  ret = Cibyl15.roadmap_hash_get_value_10155f0(sp, a0, a1, a2, a3); break;
+      case 0x1015678:  ret = Cibyl15.roadmap_hash_remove_1015678(sp, a0, a1, a2, a3); break;
+      case 0x1015754:  ret = Cibyl15.roadmap_hash_get_next_1015754(sp, a0, a1, a2, a3); break;
+      case 0x10157dc:  ret = Cibyl15.roadmap_hash_add_10157dc(sp, a0, a1, a2, a3); break;
+      case 0x10158cc:  ret = Cibyl15.roadmap_hash_new_10158cc(sp, a0, a1, a2, a3); break;
+      case 0x10159bc:  ret = Cibyl15.roadmap_hash_set_value_10159bc(sp, a0, a1, a2, a3); break;
+      case 0x1015aa0:  ret = Cibyl15.roadmap_hash_free_1015aa0(sp, a0, a1, a2, a3); break;
+      case 0x1015b28:  ret = Cibyl15.roadmap_hash_resize_1015b28(sp, a0, a1, a2, a3); break;
+      case 0x1015bec:  ret = Cibyl16.roadmap_list_enqueue_1015bec( a0, a1); break;
+      case 0x1015c08:  ret = Cibyl16.roadmap_list_remove_1015c08( a0, a1); break;
+      case 0x1015c4c:  ret = Cibyl16.roadmap_is_visible_1015c4c( a0); break;
+      case 0x1015c94:  ret = Cibyl16.roadmap_gps_source_1015c94(); break;
+      case 0x1015ca4:  ret = Cibyl16.roadmap_verbosity_1015ca4(); break;
+      case 0x1015cb4:  ret = Cibyl16.roadmap_debug_1015cb4(); break;
+      case 0x1015cc4:  ret = Cibyl16.roadmap_option_is_synchronous_1015cc4(); break;
+      case 0x1015cd4:  ret = Cibyl16.roadmap_option_set_no_area_1015cd4(); break;
+      case 0x1015ce4:  ret = Cibyl16.roadmap_option_set_square_1015ce4(); break;
+      case 0x1015cf4:  ret = Cibyl16.roadmap_option_set_verbose_1015cf4(); break;
+      case 0x1015d18:  ret = Cibyl16.roadmap_option_set_synchronous_1015d18(); break;
+      case 0x1015d28:  ret = Cibyl16.roadmap_option_set_verbosity_1015d28( a0); break;
+      case 0x1015d34:  ret = Cibyl16.roadmap_option_initialize_1015d34(sp, a0, a1, a2, a3); break;
+      case 0x1015df8:  ret = Cibyl16.roadmap_option_cache_1015df8(sp, a0, a1, a2, a3); break;
+      case 0x1015e28:  ret = Cibyl16.roadmap_option_1015e28(sp, a0, a1, a2, a3); break;
+      case 0x1015f74:  ret = Cibyl16.roadmap_option_usage_1015f74(sp, a0, a1, a2, a3); break;
+      case 0x1016024:  ret = Cibyl16.roadmap_option_set_debug_1016024(sp, a0, a1, a2, a3); break;
+      case 0x101607c:  ret = Cibyl16.roadmap_option_set_cache_101607c(sp, a0, a1, a2, a3); break;
+      case 0x10160dc:  ret = Cibyl16.roadmap_option_set_no_icon_10160dc(sp, a0, a1, a2, a3); break;
+      case 0x1016108:  ret = Cibyl16.roadmap_option_set_no_toolbar_1016108(sp, a0, a1, a2, a3); break;
+      case 0x1016134:  ret = Cibyl16.roadmap_option_set_geometry1_1016134(sp, a0, a1, a2, a3); break;
+      case 0x101615c:  ret = Cibyl16.roadmap_option_set_imperial_101615c(sp, a0, a1, a2, a3); break;
+      case 0x1016188:  ret = Cibyl16.roadmap_option_set_metric_1016188(sp, a0, a1, a2, a3); break;
+      case 0x10161b4:  ret = Cibyl16.roadmap_option_set_location_10161b4(sp, a0, a1, a2, a3); break;
+      case 0x10161dc:  ret = Cibyl16.roadmap_option_set_gps_10161dc(sp, a0, a1, a2, a3); break;
+      case 0x1016220:  ret = Cibyl16.roadmap_option_set_fastforward_1016220(sp, a0, a1, a2, a3); break;
+      case 0x1016244:  ret = Cibyl16.roadmap_option_set_geometry2_1016244(sp, a0, a1, a2, a3); break;
+      case 0x101632c:  ret = Cibyl16.roadmap_option_height_101632c(sp, a0, a1, a2, a3); break;
+      case 0x1016380:  ret = Cibyl16.roadmap_option_width_1016380(sp, a0, a1, a2, a3); break;
+      case 0x10163e0:  ret = Cibyl16.roadmap_ticker_height_10163e0(); break;
+      case 0x101641c:  ret = Cibyl16.roadmap_ticker_state_101641c(); break;
+      case 0x101642c:  ret = Cibyl16.roadmap_ticker_set_last_event_101642c( a0); break;
+      case 0x1016448:  ret = Cibyl16.roadmap_ticker_set_suppress_hide_1016448( a0); break;
+      case 0x1016454:  ret = Cibyl16.roadmap_ticker_show_1016454(sp, a0, a1, a2, a3); break;
+      case 0x10164fc:  ret = Cibyl16.roadmap_ticker_hide_10164fc(sp, a0, a1, a2, a3); break;
+      case 0x1016534:  ret = Cibyl16.roadmap_ticker_supress_hide_1016534(sp, a0, a1, a2, a3); break;
+      case 0x1016574:  ret = Cibyl16.roadmap_ticker_initialize_1016574(sp, a0, a1, a2, a3); break;
+      case 0x10166b8:  ret = Cibyl16.ticker_cfg_on_10166b8(sp, a0, a1, a2, a3); break;
+      case 0x10166e4:  ret = Cibyl16.roadmap_ticker_display_10166e4(sp, a0, a1, a2, a3); break;
+      case 0x1016ce0:  ret = Cibyl16.roadmap_foursquare_venues_list_1016ce0(sp, a0, a1, a2, a3); break;
+      case 0x1016dc0:  ret = Cibyl16.delayed_show_progress_1016dc0(sp, a0, a1, a2, a3); break;
+      case 0x1016df8:  ret = Cibyl16.request_time_out_1016df8(sp, a0, a1, a2, a3); break;
+      case 0x1016e38:  ret = Cibyl16.foursquare_pw_empty_1016e38(sp, a0, a1, a2, a3); break;
+      case 0x1016e70:  ret = Cibyl16.foursquare_un_empty_1016e70(sp, a0, a1, a2, a3); break;
+      case 0x1016ea8:  ret = Cibyl16.on_ok_softkey_1016ea8(sp, a0, a1, a2, a3); break;
+      case 0x1016ec8:  ret = Cibyl16.on_checkin_ok_btn_1016ec8(sp, a0, a1, a2, a3); break;
+      case 0x1016ee8:  ret = Cibyl16.parse_search_results_1016ee8(sp, a0, a1, a2, a3); break;
+      case 0x1017528:  ret = Cibyl17.roadmap_foursquare_disable_tweet_badge_1017528(sp, a0, a1, a2, a3); break;
+      case 0x101755c:  ret = Cibyl17.roadmap_foursquare_enable_tweet_badge_101755c(sp, a0, a1, a2, a3); break;
+      case 0x1017590:  ret = Cibyl17.roadmap_foursquare_disable_tweet_login_1017590(sp, a0, a1, a2, a3); break;
+      case 0x10175c4:  ret = Cibyl17.roadmap_foursquare_enable_tweet_login_10175c4(sp, a0, a1, a2, a3); break;
+      case 0x10175f8:  ret = Cibyl17.roadmap_foursquare_set_password_10175f8(sp, a0, a1, a2, a3); break;
+      case 0x101762c:  ret = Cibyl17.roadmap_foursquare_set_username_101762c(sp, a0, a1, a2, a3); break;
+      case 0x101765c:  ret = Cibyl17.roadmap_foursquare_set_logged_in_101765c(sp, a0, a1, a2, a3); break;
+      case 0x10176a8:  ret = Cibyl17.roadmap_foursquare_login_failed_10176a8(sp, a0, a1, a2, a3); break;
+      case 0x10176f8:  ret = Cibyl17.roadmap_foursquare_request_failed_10176f8(sp, a0, a1, a2, a3); break;
+      case 0x10177fc:  ret = Cibyl17.foursquare_network_error_10177fc(sp, a0, a1, a2, a3); break;
+      case 0x1017844:  ret = Cibyl17.roadmap_foursquare_is_tweet_badge_enabled_1017844(sp, a0, a1, a2, a3); break;
+      case 0x1017878:  ret = Cibyl17.on_venue_item_selected_1017878(sp, a0, a1, a2, a3); break;
+      case 0x1017978:  ret = Cibyl17.roadmap_foursquare_is_tweet_login_enabled_1017978(sp, a0, a1, a2, a3); break;
+      case 0x10179ac:  ret = Cibyl17.roadmap_foursquare_login_10179ac(sp, a0, a1, a2, a3); break;
+      case 0x1017a64:  ret = Cibyl17.roadmap_foursquare_is_enabled_1017a64(sp, a0, a1, a2, a3); break;
+      case 0x1017c7c:  ret = Cibyl17.roadmap_foursquare_get_password_1017c7c(sp, a0, a1, a2, a3); break;
+      case 0x1017ca0:  ret = Cibyl17.roadmap_foursquare_get_username_1017ca0(sp, a0, a1, a2, a3); break;
+      case 0x1017cc4:  ret = Cibyl17.roadmap_foursquare_logged_in_1017cc4(sp, a0, a1, a2, a3); break;
+      case 0x1017cf8:  ret = Cibyl17.on_login_dlg_close_1017cf8(sp, a0, a1, a2, a3); break;
+      case 0x1017e44:  ret = Cibyl17.roadmap_foursquare_initialize_1017e44(sp, a0, a1, a2, a3); break;
+      case 0x1017f64:  ret = Cibyl17.T_72_1017f64(sp, a0, a1, a2, a3); break;
+      case 0x1017fb0:  ret = Cibyl17.roadmap_foursquare_checkedin_dialog_1017fb0(sp, a0, a1, a2, a3); break;
+      case 0x1018428:  ret = Cibyl17.roadmap_foursquare_login_dialog_1018428(sp, a0, a1, a2, a3); break;
+      case 0x1018c88:  ret = Cibyl18.roadmap_foursquare_checkin_1018c88(sp, a0, a1, a2, a3); break;
+      case 0x1018d10:  ret = Cibyl18.on_foursquare_checkin_1018d10(sp, a0, a1, a2, a3); break;
+      case 0x1018d30:  ret = Cibyl18.roadmap_foursquare_response_1018d30(sp, a0, a1, a2, a3); break;
+      case 0x10190b8:  ret = Cibyl18.roadmap_display_initialize_10190b8(sp, a0, a1, a2, a3); break;
+      case 0x1019270:  ret = Cibyl18.roadmap_display_new_pen_1019270(sp, a0, a1, a2, a3); break;
+      case 0x1019374:  ret = Cibyl18.roadmap_display_create_pens_1019374(sp, a0, a1, a2, a3); break;
+      case 0x1019480:  ret = Cibyl18.roadmap_display_search_sign_1019480(sp, a0, a1, a2, a3); break;
+      case 0x1019500:  ret = Cibyl18.roadmap_display_get_id_1019500(sp, a0, a1, a2, a3); break;
+      case 0x1019574:  ret = Cibyl18.roadmap_display_hide_1019574(sp, a0, a1, a2, a3); break;
+      case 0x10195a0:  ret = Cibyl18.roadmap_display_update_points_10195a0(sp, a0, a1, a2, a3); break;
+      case 0x1019618:  ret = Cibyl18.roadmap_display_is_sign_active_1019618(sp, a0, a1, a2, a3); break;
+      case 0x1019668:  ret = Cibyl18.roadmap_display_image_sign_1019668(sp, a0, a1, a2, a3); break;
+      case 0x10196d4:  ret = Cibyl18.roadmap_display_highlight_10196d4(sp, a0, a1, a2, a3); break;
+      case 0x1019754:  ret = Cibyl18.roadmap_display_string_1019754(sp, a0, a1, a2, a3); break;
+      case 0x1019ae4:  ret = Cibyl18.roadmap_display_page_1019ae4(sp, a0, a1, a2, a3); break;
+      case 0x1019bb8:  ret = Cibyl18.roadmap_display_text_1019bb8(sp, a0, a1, a2, a3); break;
+      case 0x1019e50:  ret = Cibyl18.roadmap_display_activate_1019e50(sp, a0, a1, a2, a3); break;
+      case 0x101a1a4:  ret = Cibyl19.roadmap_display_sign_pop_up_101a1a4(sp, a0, a1, a2, a3); break;
+      case 0x101a418:  ret = Cibyl19.T_99_101a418(sp, a0, a1, a2, a3); break;
+      case 0x101a6d0:  ret = Cibyl19.roadmap_display_signs_101a6d0(sp, a0, a1, a2, a3); break;
+      case 0x101adac:  Cibyl19.roadmap_message_dummy_101adac(); break;
+      case 0x101adb4:  ret = Cibyl19.roadmap_message_register_101adb4( a0); break;
+      case 0x101adc4:  ret = Cibyl19.roadmap_message_update_101adc4(sp, a0, a1, a2, a3); break;
+      case 0x101adec:  ret = Cibyl19.roadmap_message_is_set_101adec(sp, a0, a1, a2, a3); break;
+      case 0x101ae64:  ret = Cibyl19.roadmap_message_unset_101ae64(sp, a0, a1, a2, a3); break;
+      case 0x101aed4:  ret = Cibyl19.roadmap_message_set_101aed4(sp, a0, a1, a2, a3); break;
+      case 0x101afc8:  ret = Cibyl19.roadmap_message_format_101afc8(sp, a0, a1, a2, a3); break;
+      case 0x101b0e8:  ret = Cibyl19.roadmap_sprite_decode_point_101b0e8(sp, a0, a1, a2, a3); break;
+      case 0x101b144:  ret = Cibyl19.roadmap_sprite_decode_sequence_101b144(sp, a0, a1, a2, a3); break;
+      case 0x101b220:  ret = Cibyl19.roadmap_sprite_decode_circle_101b220(sp, a0, a1, a2, a3); break;
+      case 0x101b2c4:  ret = Cibyl19.calloc_101b2c4(sp, a0, a1, a2, a3); break;
+      case 0x101b30c:  ret = Cibyl19.roadmap_sprite_load_101b30c(sp, a0, a1, a2, a3); break;
+      case 0x101b798:  ret = Cibyl20.roadmap_sprite_initialize_101b798(sp, a0, a1, a2, a3); break;
+      case 0x101bae4:  ret = Cibyl20.roadmap_sprite_place_101bae4(sp, a0, a1, a2, a3); break;
+      case 0x101bb60:  ret = Cibyl20.roadmap_sprite_draw_101bb60(sp, a0, a1, a2, a3); break;
+      case 0x101bcd8:  ret = Cibyl20.roadmap_object_exists_101bcd8( a0); break;
+      case 0x101bd10:  ret = Cibyl20.roadmap_object_disable_short_click_101bd10(); break;
+      case 0x101bd1c:  ret = Cibyl20.roadmap_object_enable_short_click_101bd1c(); break;
+      case 0x101bd3c:  Cibyl20.roadmap_object_null_listener_101bd3c(); break;
+      case 0x101bd44:  Cibyl20.roadmap_object_null_monitor_101bd44(); break;
+      case 0x101bd4c:  ret = Cibyl20.roadmap_object_move_101bd4c(sp, a0, a1, a2, a3); break;
+      case 0x101be88:  ret = Cibyl20.roadmap_object_set_zoom_101be88( a0, a1, a2); break;
+      case 0x101bee0:  ret = Cibyl20.roadmap_object_set_action_101bee0(sp, a0, a1, a2, a3); break;
+      case 0x101bf78:  ret = Cibyl20.out_of_zoom_101bf78(sp, a0, a1, a2, a3); break;
+      case 0x101bfe8:  ret = Cibyl20.roadmap_object_iterate_101bfe8(sp, a0, a1, a2, a3); break;
+      case 0x101c15c:  ret = Cibyl20.roadmap_object_remove_101c15c(sp, a0, a1, a2, a3); break;
+      case 0x101c28c:  ret = Cibyl20.roadmap_object_add_with_priority_101c28c(sp, a0, a1, a2, a3); break;
+      case 0x101c50c:  ret = Cibyl20.roadmap_object_add_101c50c(sp, a0, a1, a2, a3); break;
+      case 0x101c55c:  ret = Cibyl20.roadmap_object_short_click_101c55c(sp, a0, a1, a2, a3); break;
+      case 0x101c7c0:  ret = Cibyl20.roadmap_string_lock_101c7c0( a0); break;
+      case 0x101c7e4:  ret = Cibyl20.roadmap_string_get_101c7e4( a0); break;
+      case 0x101c7f8:  ret = Cibyl20.roadmap_string_compare_ignore_case_101c7f8( a0, a1); break;
+      case 0x101c828:  ret = Cibyl20.roadmap_string_is_sub_ignore_case_101c828(sp, a0, a1, a2, a3); break;
+      case 0x101c908:  ret = Cibyl20.roadmap_string_release_101c908(sp, a0, a1, a2, a3); break;
+      case 0x101c98c:  ret = Cibyl20.roadmap_string_release_all_101c98c(sp, a0, a1, a2, a3); break;
+      case 0x101ca1c:  ret = Cibyl21.roadmap_string_new_101ca1c(sp, a0, a1, a2, a3); break;
+      case 0x101cb6c:  ret = Cibyl21.roadmap_string_new_in_collection_101cb6c(sp, a0, a1, a2, a3); break;
+      case 0x101cc14:  ret = Cibyl21.roadmap_lang_rtl_101cc14(); break;
+      case 0x101cc24:  ret = Cibyl21.roadmap_lang_get_available_langs_count_101cc24(); break;
+      case 0x101cc34:  ret = Cibyl21.roadmap_lang_get_available_langs_values_101cc34(); break;
+      case 0x101cc40:  ret = Cibyl21.roadmap_lang_get_available_langs_labels_101cc40(); break;
+      case 0x101cce4:  ret = Cibyl21.roadmap_lang_get_lang_value_101cce4(sp, a0, a1, a2, a3); break;
+      case 0x101cd70:  ret = Cibyl21.roadmap_lang_get_101cd70(sp, a0, a1, a2, a3); break;
+      case 0x101ce58:  ret = Cibyl21.roadmap_lang_allocate_101ce58(sp, a0, a1, a2, a3); break;
+      case 0x101cf30:  ret = Cibyl21.roadmap_lang_conf_load_101cf30(sp, a0, a1, a2, a3); break;
+      case 0x101d120:  ret = Cibyl21.roadmap_lang_get_lang_file_update_time_101d120(sp, a0, a1, a2, a3); break;
+      case 0x101d174:  ret = Cibyl21.roadmap_lang_download_lang_file_101d174(sp, a0, a1, a2, a3); break;
+      case 0x101d208:  ret = Cibyl21.roadmap_lang_initialize_params_101d208(sp, a0, a1, a2, a3); break;
+      case 0x101d280:  ret = Cibyl21.roadmap_lang_set_update_time_101d280(sp, a0, a1, a2, a3); break;
+      case 0x101d2c0:  ret = Cibyl21.on_conf_file_downloaded_101d2c0(sp, a0, a1, a2, a3); break;
+      case 0x101d328:  ret = Cibyl21.roadmap_lang_get_update_time_101d328(sp, a0, a1, a2, a3); break;
+      case 0x101d360:  ret = Cibyl21.roadmap_lang_download_conf_file_101d360(sp, a0, a1, a2, a3); break;
+      case 0x101d3f0:  ret = Cibyl21.roadmap_lang_get_default_lang_101d3f0(sp, a0, a1, a2, a3); break;
+      case 0x101d428:  ret = Cibyl21.roadmap_lang_get_user_lang_101d428(sp, a0, a1, a2, a3); break;
+      case 0x101d494:  ret = Cibyl21.roadmap_lang_get_system_lang_101d494(sp, a0, a1, a2, a3); break;
+      case 0x101d504:  ret = Cibyl21.roadmap_lang_load_101d504(sp, a0, a1, a2, a3); break;
+      case 0x101d72c:  ret = Cibyl21.roadmap_lang_login_cb_101d72c(sp, a0, a1, a2, a3); break;
+      case 0x101d804:  ret = Cibyl21.roadmap_lang_initialize_101d804(sp, a0, a1, a2, a3); break;
+      case 0x101d904:  ret = Cibyl21.roadmap_lang_set_lang_file_update_time_101d904(sp, a0, a1, a2, a3); break;
+      case 0x101d970:  ret = Cibyl21.on_lang_file_downloaded_101d970(sp, a0, a1, a2, a3); break;
+      case 0x101da8c:  ret = Cibyl21.roadmap_lang_set_system_lang_101da8c(sp, a0, a1, a2, a3); break;
+      case 0x101daf0:  ret = Cibyl21.roadmap_adjust_initialize_101daf0(sp, a0, a1, a2, a3); break;
+      case 0x101db4c:  ret = Cibyl21.roadmap_adjust_offset_longitude_101db4c(sp, a0, a1, a2, a3); break;
+      case 0x101db70:  ret = Cibyl21.roadmap_adjust_offset_latitude_101db70(sp, a0, a1, a2, a3); break;
+      case 0x101db94:  ret = Cibyl21.roadmap_adjust_position_101db94(sp, a0, a1, a2, a3); break;
+      case 0x101dc50:  ret = Cibyl21.roadmap_trip_coordinate_101dc50( a0, a1, a2, a3); break;
+      case 0x101dcf4:  ret = Cibyl21.roadmap_trip_gps_state_101dcf4( a0); break;
+      case 0x101dd40:  ret = Cibyl21.roadmap_trip_is_focus_changed_101dd40( a0); break;
+      case 0x101dd64:  ret = Cibyl21.roadmap_trip_is_focus_moved_101dd64( a0); break;
+      case 0x101dd88:  ret = Cibyl21.roadmap_trip_is_refresh_needed_101dd88(); break;
+      case 0x101dde4:  ret = Cibyl21.roadmap_trip_get_orientation_101dde4(); break;
+      case 0x101de20:  ret = Cibyl21.roadmap_trip_get_focus_name_101de20(); break;
+      case 0x101de40:  ret = Cibyl22.roadmap_trip_get_focus_position_101de40(); break;
+      case 0x101de64:  ret = Cibyl22.roadmap_trip_search_101de64(sp, a0, a1, a2, a3); break;
+      case 0x101ded8:  ret = Cibyl22.roadmap_trip_get_nodes_101ded8(sp, a0, a1, a2, a3); break;
+      case 0x101df34:  ret = Cibyl22.roadmap_trip_get_gps_position_101df34(sp, a0, a1, a2, a3); break;
+      case 0x101df60:  ret = Cibyl22.roadmap_trip_get_position_101df60(sp, a0, a1, a2, a3); break;
+      case 0x101df8c:  ret = Cibyl22.roadmap_trip_initialize_101df8c(sp, a0, a1, a2, a3); break;
+      case 0x101e184:  ret = Cibyl22.roadmap_trip_format_messages_101e184(sp, a0, a1, a2, a3); break;
+      case 0x101e4c4:  ret = Cibyl22.roadmap_trip_new_101e4c4(sp, a0, a1, a2, a3); break;
+      case 0x101e694:  ret = Cibyl22.roadmap_trip_current_101e694(sp, a0, a1, a2, a3); break;
+      case 0x101e6b8:  ret = Cibyl22.roadmap_trip_display_101e6b8(sp, a0, a1, a2, a3); break;
+      case 0x101ebbc:  ret = Cibyl22.roadmap_trip_stop_101ebbc(sp, a0, a1, a2, a3); break;
+      case 0x101ebec:  ret = Cibyl22.roadmap_trip_set_point_focus_101ebec(sp, a0, a1, a2, a3); break;
+      case 0x101ecf8:  ret = Cibyl22.roadmap_trip_set_focus_101ecf8(sp, a0, a1, a2, a3); break;
+      case 0x101ed50:  ret = Cibyl22.roadmap_trip_activate_101ed50(sp, a0, a1, a2, a3); break;
+      case 0x101ee48:  ret = Cibyl22.roadmap_trip_reverse_101ee48(sp, a0, a1, a2, a3); break;
+      case 0x101eea8:  ret = Cibyl22.roadmap_trip_resume_101eea8(sp, a0, a1, a2, a3); break;
+      case 0x101eef8:  ret = Cibyl22.roadmap_trip_restore_focus_101eef8(sp, a0, a1, a2, a3); break;
+      case 0x101f054:  ret = Cibyl23.roadmap_trip_remove_point_101f054(sp, a0, a1, a2, a3); break;
+      case 0x101f1dc:  ret = Cibyl23.roadmap_trip_copy_focus_101f1dc(sp, a0, a1, a2, a3); break;
+      case 0x101f284:  ret = Cibyl23.roadmap_trip_update_101f284(sp, a0, a1, a2, a3); break;
+      case 0x101f5b8:  ret = Cibyl23.roadmap_trip_set_gps_and_nodes_position_101f5b8(sp, a0, a1, a2, a3); break;
+      case 0x101f648:  ret = Cibyl23.roadmap_trip_set_gps_position_101f648(sp, a0, a1, a2, a3); break;
+      case 0x101f6b8:  ret = Cibyl23.roadmap_trip_set_mobile_101f6b8(sp, a0, a1, a2, a3); break;
+      case 0x101f714:  ret = Cibyl23.roadmap_trip_set_selection_as_101f714(sp, a0, a1, a2, a3); break;
+      case 0x101f77c:  ret = Cibyl23.roadmap_trip_set_point_101f77c(sp, a0, a1, a2, a3); break;
+      case 0x101f7ac:  ret = Cibyl23.roadmap_trip_start_101f7ac(sp, a0, a1, a2, a3); break;
+      case 0x101f80c:  Cibyl23.roadmap_screen_after_refresh_101f80c(); break;
+      case 0x101f814:  ret = Cibyl23.roadmap_screen_in_view_101f814( a0, a1, a2); break;
+      case 0x101f85c:  ret = Cibyl23.roadmap_screen_subscribe_after_flow_control_refresh_101f85c( a0); break;
+      case 0x101f888:  ret = Cibyl23.roadmap_screen_get_view_mode_101f888(); break;
+      case 0x101f898:  ret = Cibyl23.roadmap_screen_get_nonogl_view_mode_101f898(); break;
+      case 0x101f8a8:  ret = Cibyl23.roadmap_screen_get_view_mode_screen_touched_101f8a8(); break;
+      case 0x101f8cc:  ret = Cibyl23.roadmap_screen_get_orientation_mode_101f8cc(); break;
+      case 0x101f8dc:  ret = Cibyl23.roadmap_screen_height_101f8dc( a0); break;
+      case 0x101f914:  ret = Cibyl23.roadmap_screen_mark_redraw_101f914(); break;
+      case 0x101f92c:  ret = Cibyl23.roadmap_screen_freeze_101f92c(); break;
+      case 0x101f94c:  ret = Cibyl23.roadmap_screen_set_orientation_dynamic_101f94c(); break;
+      case 0x101f980:  ret = Cibyl23.roadmap_screen_subscribe_after_refresh_101f980( a0); break;
+      case 0x101f9a8:  ret = Cibyl23.roadmap_screen_fast_refresh_101f9a8(); break;
+      case 0x101f9c8:  Cibyl23.dbg_time_start_101f9c8(); break;
+      case 0x101f9d0:  Cibyl23.dbg_time_end_101f9d0(); break;
+      case 0x101f9e0:  ret = Cibyl23.roadmap_screen_draw_flush_101f9e0(); break;
+      case 0x101f9ec:  ret = Cibyl23.roadmap_screen_touched_state_101f9ec(); break;
+      case 0x101fa04:  ret = Cibyl23.roadmap_screen_not_touched_state_101fa04(); break;
+      case 0x101fa1c:  ret = Cibyl23.roadmap_screen_set_screen_type_101fa1c( a0); break;
+      case 0x101fa38:  ret = Cibyl23.roadmap_screen_is_hd_screen_101fa38(); break;
+      case 0x101fa8c:  ret = Cibyl23.roadmap_screen_get_screen_scale_101fa8c( a0); break;
+      case 0x101fac8:  ret = Cibyl23.roadmap_screen_is_xicon_open_101fac8(); break;
+      case 0x101fad8:  ret = Cibyl23.roadmap_screen_set_background_run_101fad8( a0); break;
+      case 0x101fae4:  ret = Cibyl23.roadmap_screen_get_background_run_101fae4(); break;
+      case 0x101fb1c:  ret = Cibyl23.roadmap_screen_set_scale_101fb1c(sp, a0, a1, a2, a3); break;
+      case 0x101fb4c:  ret = Cibyl23.roadmap_screen_shade_bg_101fb4c(sp, a0, a1, a2, a3); break;
+      case 0x101fc10:  ret = Cibyl23.roadmap_screen_set_Xicon_state_101fc10(sp, a0, a1, a2, a3); break;
+      case 0x101fc64:  ret = Cibyl23.roadmap_screen_repaint_101fc64(sp, a0, a1, a2, a3); break;
+      case 0x101fcb0:  ret = Cibyl23.roadmap_screen_touched_timer_101fcb0(sp, a0, a1, a2, a3); break;
+      case 0x101fd0c:  ret = Cibyl23.roadmap_screen_unfreeze_101fd0c(sp, a0, a1, a2, a3); break;
+      case 0x101fd38:  ret = Cibyl23.roadmap_screen_show_top_bar_101fd38(sp, a0, a1, a2, a3); break;
+      case 0x101fd74:  ret = Cibyl23.roadmap_screen_show_screen_icons_101fd74(sp, a0, a1, a2, a3); break;
+      case 0x101fda0:  ret = Cibyl23.roadmap_screen_show_icons_only_when_touched_101fda0(sp, a0, a1, a2, a3); break;
+      case 0x101fdec:  ret = Cibyl23.roadmap_screen_get_orientation_mode_touched_101fdec(sp, a0, a1, a2, a3); break;
+      case 0x101fe20:  ret = Cibyl23.roadmap_screen_flush_polygons_101fe20(sp, a0, a1, a2, a3); break;
+      case 0x10200e0:  ret = Cibyl23.roadmap_screen_draw_object_10200e0(sp, a0, a1, a2, a3); break;
+      case 0x1020328:  ret = Cibyl23.is_screen_wide_1020328(sp, a0, a1, a2, a3); break;
+      case 0x1020398:  ret = Cibyl23.roadmap_screen_adjust_width_1020398(sp, a0, a1, a2, a3); break;
+      case 0x10203e8:  ret = Cibyl24.roadmap_screen_set_initial_position_10203e8(sp, a0, a1, a2, a3); break;
+      case 0x10204a0:  ret = Cibyl24.roadmap_screen_reset_pens_10204a0(sp, a0, a1, a2, a3); break;
+      case 0x10204e4:  ret = Cibyl24.roadmap_screen_shutdown_10204e4(sp, a0, a1, a2, a3); break;
+      case 0x102056c:  ret = Cibyl24.roadmap_screen_initialize_102056c(sp, a0, a1, a2, a3); break;
+      case 0x1020898:  ret = Cibyl24.roadmap_screen_record_move_1020898(sp, a0, a1, a2, a3); break;
+      case 0x102092c:  ret = Cibyl24.roadmap_screen_drag_motion_102092c(sp, a0, a1, a2, a3); break;
+      case 0x1020b38:  ret = Cibyl24.roadmap_screen_move_left_1020b38(sp, a0, a1, a2, a3); break;
+      case 0x1020b74:  ret = Cibyl24.roadmap_screen_move_right_1020b74(sp, a0, a1, a2, a3); break;
+      case 0x1020bb0:  ret = Cibyl24.roadmap_screen_move_down_1020bb0(sp, a0, a1, a2, a3); break;
+      case 0x1020bec:  ret = Cibyl24.roadmap_screen_move_up_1020bec(sp, a0, a1, a2, a3); break;
+      case 0x1020c28:  ret = Cibyl24.roadmap_screen_move_1020c28(sp, a0, a1, a2, a3); break;
+      case 0x1020c50:  ret = Cibyl24.roadmap_screen_update_center_1020c50(sp, a0, a1, a2, a3); break;
+      case 0x1020d00:  ret = Cibyl24.roadmap_screen_drag_end_1020d00(sp, a0, a1, a2, a3); break;
+      case 0x1020f6c:  ret = Cibyl24.roadmap_screen_update_center_animated_1020f6c(sp, a0, a1, a2, a3); break;
+      case 0x1020f8c:  ret = Cibyl24.roadmap_screen_move_center_1020f8c(sp, a0, a1, a2, a3); break;
+      case 0x1020ff4:  ret = Cibyl24.roadmap_screen_pressed_1020ff4(sp, a0, a1, a2, a3); break;
+      case 0x1021014:  ret = Cibyl24.roadmap_screen_zoom_reset_1021014(sp, a0, a1, a2, a3); break;
+      case 0x1021050:  ret = Cibyl24.roadmap_screen_zoom_out_1021050(sp, a0, a1, a2, a3); break;
+      case 0x1021120:  ret = Cibyl24.roadmap_screen_zoom_in_1021120(sp, a0, a1, a2, a3); break;
+      case 0x10211f0:  ret = Cibyl24.roadmap_screen_decrease_horizon_10211f0(sp, a0, a1, a2, a3); break;
+      case 0x102123c:  ret = Cibyl24.roadmap_screen_increase_horizon_102123c(sp, a0, a1, a2, a3); break;
+      case 0x1021290:  ret = Cibyl24.roadmap_screen_set_orientation_fixed_1021290(sp, a0, a1, a2, a3); break;
+      case 0x10212c4:  ret = Cibyl24.roadmap_screen_rotate_10212c4(sp, a0, a1, a2, a3); break;
+      case 0x1021350:  ret = Cibyl24.roadmap_screen_add_focus_on_me_softkey_1021350(sp, a0, a1, a2, a3); break;
+      case 0x10213a4:  ret = Cibyl24.roadmap_screen_hold_10213a4(sp, a0, a1, a2, a3); break;
+      case 0x1021430:  ret = Cibyl24.roadmap_screen_double_click_1021430(sp, a0, a1, a2, a3); break;
+      case 0x102147c:  ret = Cibyl24.roadmap_screen_refresh_102147c(sp, a0, a1, a2, a3); break;
+      case 0x10216f0:  ret = Cibyl25.roadmap_screen_drag_start_10216f0(sp, a0, a1, a2, a3); break;
+      case 0x102173c:  ret = Cibyl25.roadmap_screen_toggle_orientation_mode_102173c(sp, a0, a1, a2, a3); break;
+      case 0x102179c:  ret = Cibyl25.focus_on_me_102179c(sp, a0, a1, a2, a3); break;
+      case 0x10217f4:  ret = Cibyl25.focus_on_location_10217f4(sp, a0, a1, a2, a3); break;
+      case 0x1021840:  ret = Cibyl25.show_me_on_map_1021840(sp, a0, a1, a2, a3); break;
+      case 0x1021910:  ret = Cibyl25.roadmap_screen_redraw_1021910(sp, a0, a1, a2, a3); break;
+      case 0x1021940:  ret = Cibyl25.XiconTimer_1021940(sp, a0, a1, a2, a3); break;
+      case 0x1021964:  ret = Cibyl25.roadmap_screen_set_view_1021964(sp, a0, a1, a2, a3); break;
+      case 0x1021a64:  ret = Cibyl25.roadmap_screen_restore_view_1021a64(sp, a0, a1, a2, a3); break;
+      case 0x1021aac:  ret = Cibyl25.roadmap_screen_toggle_view_mode_1021aac(sp, a0, a1, a2, a3); break;
+      case 0x1021b50:  ret = Cibyl25.on_device_event_1021b50(sp, a0, a1, a2, a3); break;
+      case 0x1021bb8:  ret = Cibyl25.roadmap_screen_draw_sky_1021bb8(sp, a0, a1, a2, a3); break;
+      case 0x1021c5c:  ret = Cibyl25.roadmap_screen_draw_points_1021c5c(sp, a0, a1, a2, a3); break;
+      case 0x1021f44:  ret = Cibyl25.roadmap_screen_flush_lines_1021f44(sp, a0, a1, a2, a3); break;
+      case 0x1022080:  ret = Cibyl25.roadmap_screen_draw_line_points_1022080(sp, a0, a1, a2, a3); break;
+      case 0x10223e4:  ret = Cibyl25.roadmap_screen_flush_points_10223e4(sp, a0, a1, a2, a3); break;
+      case 0x1022444:  ret = Cibyl25.roadmap_screen_flush_lines_and_points_1022444(sp, a0, a1, a2, a3); break;
+      case 0x102246c:  ret = Cibyl25.roadmap_screen_add_segment_point_102246c(sp, a0, a1, a2, a3); break;
+      case 0x10226d8:  ret = Cibyl25.roadmap_screen_draw_one_line_internal_10226d8(sp, a0, a1, a2, a3); break;
+      case 0x1022e1c:  ret = Cibyl26.roadmap_screen_draw_one_line_1022e1c(sp, a0, a1, a2, a3); break;
+      case 0x1022e98:  ret = Cibyl26.roadmap_screen_draw_square_1022e98(sp, a0, a1, a2, a3); break;
+      case 0x1024154:  ret = Cibyl27.roadmap_screen_repaint_square_1024154(sp, a0, a1, a2, a3); break;
+      case 0x1024308:  ret = Cibyl27.roadmap_screen_repaint_now_1024308(sp, a0, a1, a2, a3); break;
+      case 0x1025674:  ret = Cibyl28.roadmap_screen_touched_off_1025674(sp, a0, a1, a2, a3); break;
+      case 0x10256bc:  ret = Cibyl28.roadmap_screen_refresh_flow_control_10256bc(sp, a0, a1, a2, a3); break;
+      case 0x10256f4:  ret = Cibyl28.roadmap_screen_touched_10256f4(sp, a0, a1, a2, a3); break;
+      case 0x102576c:  ret = Cibyl28.roadmap_screen_short_click_102576c(sp, a0, a1, a2, a3); break;
+      case 0x102586c:  ret = Cibyl28.roadmap_screen_configure_102586c(sp, a0, a1, a2, a3); break;
+      case 0x1025988:  Cibyl28.roadmap_view_menu_1025988(); break;
+      case 0x1025990:  ret = Cibyl28.roadmap_view_hold_1025990(); break;
+      case 0x10259a8:  ret = Cibyl28.roadmap_view_auto_zoom_restore_10259a8(sp, a0, a1, a2, a3); break;
+      case 0x10259d4:  ret = Cibyl28.roadmap_view_reset_10259d4(sp, a0, a1, a2, a3); break;
+      case 0x1025a00:  ret = Cibyl28.roadmap_view_navigation_1025a00(sp, a0, a1, a2, a3); break;
+      case 0x1025a28:  ret = Cibyl28.roadmap_view_commute_1025a28(sp, a0, a1, a2, a3); break;
+      case 0x1025a50:  ret = Cibyl28.roadmap_view_auto_zoom_suspend_1025a50(sp, a0, a1, a2, a3); break;
+      case 0x1025abc:  ret = Cibyl28.roadmap_view_show_labels_1025abc(sp, a0, a1, a2, a3); break;
+      case 0x1025b30:  ret = Cibyl28.roadmap_view_get_scale_1025b30(sp, a0, a1, a2, a3); break;
+      case 0x1025c40:  ret = Cibyl28.roadmap_view_get_orientation_1025c40(sp, a0, a1, a2, a3); break;
+      case 0x1025cf8:  ret = Cibyl28.roadmap_view_refresh_1025cf8(sp, a0, a1, a2, a3); break;
+      case 0x1026240:  ret = Cibyl28.on_ok_softkey_1026240(sp, a0, a1, a2, a3); break;
+      case 0x1026260:  ret = Cibyl28.dest_checkbox_callback_facebook_1026260(sp, a0, a1, a2, a3); break;
+      case 0x102631c:  ret = Cibyl28.dest_checkbox_callback_twitter_102631c(sp, a0, a1, a2, a3); break;
+      case 0x10263d8:  ret = Cibyl28.twitter_pw_empty_10263d8(sp, a0, a1, a2, a3); break;
+      case 0x1026410:  ret = Cibyl28.twitter_un_empty_1026410(sp, a0, a1, a2, a3); break;
+      case 0x1026448:  ret = Cibyl28.roadmap_social_set_show_profile_1026448(sp, a0, a1, a2, a3); break;
+      case 0x1026500:  ret = Cibyl28.roadmap_facebook_set_show_picture_1026500(sp, a0, a1, a2, a3); break;
+      case 0x1026574:  ret = Cibyl28.roadmap_facebook_set_show_name_1026574(sp, a0, a1, a2, a3); break;
+      case 0x1026634:  ret = Cibyl28.roadmap_social_set_munching_1026634(sp, a0, a1, a2, a3); break;
+      case 0x1026674:  ret = Cibyl28.roadmap_facebook_disable_munching_1026674(sp, a0, a1, a2, a3); break;
+      case 0x102669c:  ret = Cibyl28.roadmap_twitter_disable_munching_102669c(sp, a0, a1, a2, a3); break;
+      case 0x10266c4:  ret = Cibyl28.roadmap_facebook_enable_munching_10266c4(sp, a0, a1, a2, a3); break;
+      case 0x10266ec:  ret = Cibyl28.roadmap_twitter_enable_munching_10266ec(sp, a0, a1, a2, a3); break;
+      case 0x1026714:  ret = Cibyl28.roadmap_social_set_destination_mode_1026714(sp, a0, a1, a2, a3); break;
+      case 0x102676c:  ret = Cibyl28.roadmap_facebook_set_destination_mode_102676c(sp, a0, a1, a2, a3); break;
+      case 0x1026794:  ret = Cibyl28.roadmap_twitter_set_destination_mode_1026794(sp, a0, a1, a2, a3); break;
+      case 0x10267bc:  ret = Cibyl28.roadmap_social_set_sending_10267bc(sp, a0, a1, a2, a3); break;
+      case 0x10267fc:  ret = Cibyl28.roadmap_facebook_disable_sending_10267fc(sp, a0, a1, a2, a3); break;
+      case 0x1026824:  ret = Cibyl28.roadmap_twitter_disable_sending_1026824(sp, a0, a1, a2, a3); break;
+      case 0x102684c:  ret = Cibyl28.roadmap_facebook_enable_sending_102684c(sp, a0, a1, a2, a3); break;
+      case 0x1026874:  ret = Cibyl28.roadmap_twitter_enable_sending_1026874(sp, a0, a1, a2, a3); break;
+      case 0x102689c:  ret = Cibyl28.roadmap_twitter_set_password_102689c(sp, a0, a1, a2, a3); break;
+      case 0x10268d0:  ret = Cibyl28.roadmap_twitter_set_username_10268d0(sp, a0, a1, a2, a3); break;
+      case 0x1026900:  ret = Cibyl28.roadmap_twitter_set_logged_in_1026900(sp, a0, a1, a2, a3); break;
+      case 0x102694c:  ret = Cibyl28.roadmap_social_get_show_profile_102694c(sp, a0, a1, a2, a3); break;
+      case 0x10269a8:  ret = Cibyl28.roadmap_twitter_get_show_profile_10269a8(sp, a0, a1, a2, a3); break;
+      case 0x10269cc:  ret = Cibyl29.roadmap_facebook_get_show_profile_10269cc(sp, a0, a1, a2, a3); break;
+      case 0x10269f0:  ret = Cibyl29.roadmap_facebook_get_show_picture_10269f0(sp, a0, a1, a2, a3); break;
+      case 0x1026a50:  ret = Cibyl29.roadmap_facebook_get_show_name_1026a50(sp, a0, a1, a2, a3); break;
+      case 0x1026ab0:  ret = Cibyl29.roadmap_social_send_permissions_1026ab0(sp, a0, a1, a2, a3); break;
+      case 0x1026b30:  ret = Cibyl29.roadmap_twitter_is_signup_enabled_1026b30(sp, a0, a1, a2, a3); break;
+      case 0x1026b64:  ret = Cibyl29.roadmap_twitter_is_show_munching_1026b64(sp, a0, a1, a2, a3); break;
+      case 0x1026b98:  ret = Cibyl29.roadmap_social_is_munching_enabled_1026b98(sp, a0, a1, a2, a3); break;
+      case 0x1026bc8:  ret = Cibyl29.roadmap_facebook_is_munching_enabled_1026bc8(sp, a0, a1, a2, a3); break;
+      case 0x1026bec:  ret = Cibyl29.roadmap_twitter_is_munching_enabled_1026bec(sp, a0, a1, a2, a3); break;
+      case 0x1026c10:  ret = Cibyl29.roadmap_social_destination_mode_1026c10(sp, a0, a1, a2, a3); break;
+      case 0x1026c6c:  ret = Cibyl29.roadmap_facebook_destination_mode_1026c6c(sp, a0, a1, a2, a3); break;
+      case 0x1026c90:  ret = Cibyl29.roadmap_twitter_destination_mode_1026c90(sp, a0, a1, a2, a3); break;
+      case 0x1026cb4:  ret = Cibyl29.roadmap_social_is_sending_enabled_1026cb4(sp, a0, a1, a2, a3); break;
+      case 0x1026ce4:  ret = Cibyl29.roadmap_facebook_is_sending_enabled_1026ce4(sp, a0, a1, a2, a3); break;
+      case 0x1026d08:  ret = Cibyl29.roadmap_twitter_is_sending_enabled_1026d08(sp, a0, a1, a2, a3); break;
+      case 0x1026d2c:  ret = Cibyl29.roadmap_twitter_get_password_1026d2c(sp, a0, a1, a2, a3); break;
+      case 0x1026d50:  ret = Cibyl29.roadmap_twitter_get_username_1026d50(sp, a0, a1, a2, a3); break;
+      case 0x1026d74:  ret = Cibyl29.roadmap_social_logged_in_1026d74(sp, a0, a1, a2, a3); break;
+      case 0x1026da4:  ret = Cibyl29.roadmap_facebook_logged_in_1026da4(sp, a0, a1, a2, a3); break;
+      case 0x1026dc8:  ret = Cibyl29.roadmap_facebook_refresh_connection_1026dc8(sp, a0, a1, a2, a3); break;
+      case 0x1026e98:  ret = Cibyl29.on_check_login_completed_1026e98(sp, a0, a1, a2, a3); break;
+      case 0x1026eec:  ret = Cibyl29.roadmap_twitter_logged_in_1026eec(sp, a0, a1, a2, a3); break;
+      case 0x1026f10:  ret = Cibyl29.on_dlg_close_1026f10(sp, a0, a1, a2, a3); break;
+      case 0x1027250:  ret = Cibyl29.roadmap_twitter_login_failed_1027250(sp, a0, a1, a2, a3); break;
+      case 0x1027358:  ret = Cibyl29.roadmap_facebook_disconnect_1027358(sp, a0, a1, a2, a3); break;
+      case 0x1027394:  ret = Cibyl29.facebook_disconnect_confirmed_cb_1027394(sp, a0, a1, a2, a3); break;
+      case 0x10274a8:  ret = Cibyl29.roadmap_facebook_check_login_10274a8(sp, a0, a1, a2, a3); break;
+      case 0x10275d0:  ret = Cibyl29.after_facebook_connect_10275d0(sp, a0, a1, a2, a3); break;
+      case 0x10275f8:  ret = Cibyl29.roadmap_social_login_cb_10275f8(sp, a0, a1, a2, a3); break;
+      case 0x1027638:  ret = Cibyl29.on_disconnect_completed_1027638(sp, a0, a1, a2, a3); break;
+      case 0x1027660:  ret = Cibyl29.roadmap_facebook_connect_1027660(sp, a0, a1, a2, a3); break;
+      case 0x1027738:  ret = Cibyl29.login_button_callback_facebook_1027738(sp, a0, a1, a2, a3); break;
+      case 0x1027778:  ret = Cibyl29.roadmap_social_initialize_1027778(sp, a0, a1, a2, a3); break;
+      case 0x1027aac:  ret = Cibyl29.T_60_1027aac(sp, a0, a1, a2, a3); break;
+      case 0x1027af8:  ret = Cibyl29.create_dialog_1027af8(sp, a0, a1, a2, a3); break;
+      case 0x1028ab4:  ret = Cibyl30.roadmap_facebook_setting_dialog_1028ab4(sp, a0, a1, a2, a3); break;
+      case 0x1028bac:  ret = Cibyl30.roadmap_twitter_setting_dialog_1028bac(sp, a0, a1, a2, a3); break;
+      case 0x1028cbc:  ret = Cibyl30.twitter_network_error_1028cbc(sp, a0, a1, a2, a3); break;
+      case 0x1028d0c:  ret = Cibyl30.roadmap_factory_find_action_1028d0c(sp, a0, a1, a2, a3); break;
+      case 0x1028d68:  ret = Cibyl30.roadmap_factory_keyboard_1028d68(sp, a0, a1, a2, a3); break;
+      case 0x1028df8:  ret = Cibyl30.roadmap_factory_usage_1028df8(sp, a0, a1, a2, a3); break;
+      case 0x1028f00:  ret = Cibyl30.calloc_1028f00(sp, a0, a1, a2, a3); break;
+      case 0x1028f48:  ret = Cibyl30.roadmap_factory_keymap_1028f48(sp, a0, a1, a2, a3); break;
+      case 0x1029134:  ret = Cibyl30.roadmap_factory_load_config_1029134(sp, a0, a1, a2, a3); break;
+      case 0x102932c:  ret = Cibyl30.roadmap_factory_user_config_102932c(sp, a0, a1, a2, a3); break;
+      case 0x10294e8:  ret = Cibyl30.roadmap_factory_10294e8(sp, a0, a1, a2, a3); break;
+      case 0x102975c:  ret = Cibyl30.roadmap_factory_load_menu_item_102975c(sp, a0, a1, a2, a3); break;
+      case 0x10299fc:  ret = Cibyl30.roadmap_factory_load_menu_file_10299fc(sp, a0, a1, a2, a3); break;
+      case 0x1029bdc:  ret = Cibyl30.roadmap_factory_load_menu_1029bdc(sp, a0, a1, a2, a3); break;
+      case 0x1029ca0:  ret = Cibyl30.roadmap_navigate_register_segment_changed_1029ca0( a0, a1); break;
+      case 0x1029d14:  ret = Cibyl31.roadmap_navigate_unregister_segment_changed_1029d14( a0, a1); break;
+      case 0x1029d88:  ret = Cibyl31.roadmap_navigate_end_route_1029d88(); break;
+      case 0x1029d94:  ret = Cibyl31.roadmap_navigate_resume_route_1029d94(); break;
+      case 0x1029db8:  ret = Cibyl31.roadmap_navigate_get_current_1029db8(sp, a0, a1, a2, a3); break;
+      case 0x1029e50:  ret = Cibyl31.roadmap_navigate_get_time_1029e50(); break;
+      case 0x1029e78:  ret = Cibyl31.roadmap_navigate_route_1029e78(sp, a0, a1, a2, a3); break;
+      case 0x1029f74:  ret = Cibyl31.roadmap_navigate_initialize_1029f74(sp, a0, a1, a2, a3); break;
+      case 0x102a064:  ret = Cibyl31.roadmap_navigate_check_alerts_102a064(sp, a0, a1, a2, a3); break;
+      case 0x102a098:  ret = Cibyl31.roadmap_navigate_is_intersection_102a098(sp, a0, a1, a2, a3); break;
+      case 0x102a1cc:  ret = Cibyl31.roadmap_navigate_trace_102a1cc(sp, a0, a1, a2, a3); break;
+      case 0x102a2c0:  ret = Cibyl31.roadmap_navigate_is_jammed_102a2c0(sp, a0, a1, a2, a3); break;
+      case 0x102a3dc:  ret = Cibyl31.roadmap_navigate_fuzzify_102a3dc(sp, a0, a1, a2, a3); break;
+      case 0x102a5e0:  ret = Cibyl31.roadmap_navigate_enable_102a5e0(sp, a0, a1, a2, a3); break;
+      case 0x102a618:  ret = Cibyl31.roadmap_navigate_disable_102a618(sp, a0, a1, a2, a3); break;
+      case 0x102a664:  ret = Cibyl31.roadmap_navigate_adjust_focus_102a664(sp, a0, a1, a2, a3); break;
+      case 0x102a6fc:  ret = Cibyl31.roadmap_navigate_get_neighbours_102a6fc(sp, a0, a1, a2, a3); break;
+      case 0x102ac1c:  ret = Cibyl31.roadmap_navigate_retrieve_line_102ac1c(sp, a0, a1, a2, a3); break;
+      case 0x102aca4:  ret = Cibyl31.T_126_102aca4(sp, a0, a1, a2, a3); break;
+      case 0x102b0d8:  ret = Cibyl31.T_127_102b0d8(sp, a0, a1, a2, a3); break;
+      case 0x102b1b4:  ret = Cibyl31.roadmap_navigate_locate_102b1b4(sp, a0, a1, a2, a3); break;
+      case 0x102bd00:  ret = Cibyl32.roadmap_fuzzy_set_cycle_params_102bd00( a0, a1); break;
+      case 0x102bd14:  ret = Cibyl32.roadmap_fuzzy_max_distance_102bd14(); break;
+      case 0x102bd24:  ret = Cibyl32.roadmap_fuzzy_direction_102bd24( a0, a1, a2); break;
+      case 0x102bdb0:  ret = Cibyl32.roadmap_fuzzy_distance_102bdb0( a0, a1); break;
+      case 0x102be00:  ret = Cibyl32.roadmap_fuzzy_and_102be00( a0, a1); break;
+      case 0x102be3c:  ret = Cibyl32.roadmap_fuzzy_not_102be3c( a0); break;
+      case 0x102be48:  ret = Cibyl32.roadmap_fuzzy_false_102be48(); break;
+      case 0x102be50:  ret = Cibyl32.roadmap_fuzzy_is_acceptable_102be50( a0); break;
+      case 0x102be68:  ret = Cibyl32.roadmap_fuzzy_is_good_102be68( a0); break;
+      case 0x102be74:  ret = Cibyl32.roadmap_fuzzy_is_certain_102be74( a0); break;
+      case 0x102be80:  ret = Cibyl32.roadmap_fuzzy_good_102be80(); break;
+      case 0x102be88:  ret = Cibyl32.roadmap_fuzzy_acceptable_102be88(); break;
+      case 0x102be98:  ret = Cibyl32.roadmap_fuzzy_initialize_102be98(sp, a0, a1, a2, a3); break;
+      case 0x102bef0:  ret = Cibyl32.roadmap_fuzzy_connected_102bef0(sp, a0, a1, a2, a3); break;
+      case 0x102c0a4:  ret = Cibyl32.roadmap_fuzzy_reset_cycle_102c0a4(sp, a0, a1, a2, a3); break;
+      case 0x102c0e0:  Cibyl32.roadmap_start_export_data_102c0e0(); break;
+      case 0x102c0e8:  Cibyl32.roadmap_start_export_reset_102c0e8(); break;
+      case 0x102c0f0:  Cibyl32.roadmap_start_download_map_102c0f0(); break;
+      case 0x102c0f8:  ret = Cibyl32.on_contextmenu_closed_102c0f8(sp, a0, a1, a2, a3); break;
+      case 0x102c12c:  Cibyl32.roadmap_help_menu_102c12c(); break;
+      case 0x102c134:  Cibyl32.start_settings_quick_menu_102c134(); break;
+      case 0x102c14c:  ret = Cibyl32.roadmap_start_login_cb_102c14c(sp, a0, a1, a2, a3); break;
+      case 0x102c190:  ret = Cibyl32.roadmap_start_subscribe_102c190( a0); break;
+      case 0x102c1a8:  Cibyl32.roadmap_start_my_points_menu_102c1a8(); break;
+      case 0x102c1b0:  ret = Cibyl32.roadmap_confirmed_exit_callback_102c1b0(sp, a0, a1, a2, a3); break;
+      case 0x102c1d8:  ret = Cibyl32.viewMyPoints_102c1d8(sp, a0, a1, a2, a3); break;
+      case 0x102c228:  ret = Cibyl32.roadmap_start_set_timeout_102c228(sp, a0, a1, a2, a3); break;
+      case 0x102c24c:  ret = Cibyl32.roadmap_start_quick_menu_102c24c(sp, a0, a1, a2, a3); break;
+      case 0x102c338:  ret = Cibyl32.roadmap_start_sync_data_102c338(sp, a0, a1, a2, a3); break;
+      case 0x102c374:  ret = Cibyl32.roadmap_confirmed_exit_102c374(sp, a0, a1, a2, a3); break;
+      case 0x102c3b0:  ret = Cibyl32.roadmap_confirmed_start_sync_callback_102c3b0(sp, a0, a1, a2, a3); break;
+      case 0x102c3e0:  ret = Cibyl32.roadmap_start_detect_receiver_102c3e0(sp, a0, a1, a2, a3); break;
+      case 0x102c400:  ret = Cibyl32.roadmap_start_version_102c400(sp, a0, a1, a2, a3); break;
+      case 0x102c468:  ret = Cibyl32.roadmap_start_about_exit_102c468(sp, a0, a1, a2, a3); break;
+      case 0x102c730:  ret = Cibyl32.roadmap_start_find_action_102c730(sp, a0, a1, a2, a3); break;
+      case 0x102c790:  ret = Cibyl32.roadmap_start_get_menu_item_102c790(sp, a0, a1, a2, a3); break;
+      case 0x102c8f8:  ret = Cibyl32.get_menu_item_names_102c8f8(sp, a0, a1, a2, a3); break;
+      case 0x102ca88:  ret = Cibyl32.about_callbak_102ca88(sp, a0, a1, a2, a3); break;
+      case 0x102cad4:  ret = Cibyl32.network_status_callbak_102cad4(sp, a0, a1, a2, a3); break;
+      case 0x102cafc:  ret = Cibyl32.roadmap_start_delete_waypoint_102cafc(sp, a0, a1, a2, a3); break;
+      case 0x102cb1c:  ret = Cibyl32.roadmap_start_set_waypoint_102cb1c(sp, a0, a1, a2, a3); break;
+      case 0x102cb58:  ret = Cibyl32.roadmap_start_set_departure_102cb58(sp, a0, a1, a2, a3); break;
+      case 0x102cb8c:  ret = Cibyl32.roadmap_start_navigate_102cb8c(sp, a0, a1, a2, a3); break;
+      case 0x102cbac:  ret = Cibyl32.save_destination_to_history_102cbac(sp, a0, a1, a2, a3); break;
+      case 0x102cd00:  ret = Cibyl32.roadmap_start_set_destination_102cd00(sp, a0, a1, a2, a3); break;
+      case 0x102cd44:  ret = Cibyl32.roadmap_start_trip_reverse_102cd44(sp, a0, a1, a2, a3); break;
+      case 0x102cd64:  ret = Cibyl32.roadmap_start_trip_resume_102cd64(sp, a0, a1, a2, a3); break;
+      case 0x102cd84:  ret = Cibyl32.roadmap_start_trip_102cd84(sp, a0, a1, a2, a3); break;
+      case 0x102cda4:  ret = Cibyl32.roadmap_start_save_trip_as_102cda4(sp, a0, a1, a2, a3); break;
+      case 0x102cdc4:  ret = Cibyl32.roadmap_start_save_trip_102cdc4(sp, a0, a1, a2, a3); break;
+      case 0x102cdec:  ret = Cibyl32.roadmap_start_open_trip_102cdec(sp, a0, a1, a2, a3); break;
+      case 0x102ce10:  ret = Cibyl32.roadmap_start_create_trip_102ce10(sp, a0, a1, a2, a3); break;
+      case 0x102ce30:  ret = Cibyl32.roadmap_start_toggle_download_102ce30(sp, a0, a1, a2, a3); break;
+      case 0x102cec0:  ret = Cibyl32.roadmap_start_add_action_102cec0(sp, a0, a1, a2, a3); break;
+      case 0x102cf8c:  ret = Cibyl32.roadmap_start_no_download_102cf8c(sp, a0, a1, a2, a3); break;
+      case 0x102cfe0:  ret = Cibyl32.roadmap_start_show_location_102cfe0(sp, a0, a1, a2, a3); break;
+      case 0x102d00c:  ret = Cibyl32.roadmap_start_show_destination_102d00c(sp, a0, a1, a2, a3); break;
+      case 0x102d038:  ret = Cibyl32.roadmap_start_show_gps_102d038(sp, a0, a1, a2, a3); break;
+      case 0x102d074:  ret = Cibyl32.roadmap_start_periodic_102d074(sp, a0, a1, a2, a3); break;
+      case 0x102d0b8:  ret = Cibyl33.roadmap_start_hold_map_102d0b8(sp, a0, a1, a2, a3); break;
+      case 0x102d0e0:  ret = Cibyl33.roadmap_start_counter_rotate_102d0e0(sp, a0, a1, a2, a3); break;
+      case 0x102d100:  ret = Cibyl33.roadmap_start_rotate_102d100(sp, a0, a1, a2, a3); break;
+      case 0x102d120:  ret = Cibyl33.roadmap_start_purge_102d120(sp, a0, a1, a2, a3); break;
+      case 0x102d140:  ret = Cibyl33.roadmap_start_console_102d140(sp, a0, a1, a2, a3); break;
+      case 0x102d1ac:  ret = Cibyl33.roadmap_start_reset_debug_mode_102d1ac(sp, a0, a1, a2, a3); break;
+      case 0x102d26c:  ret = Cibyl33.roadmap_start_hide_menu_102d26c(sp, a0, a1, a2, a3); break;
+      case 0x102d28c:  ret = Cibyl33.bottom_bar_status_102d28c(sp, a0, a1, a2, a3); break;
+      case 0x102d2c8:  ret = Cibyl33.roadmap_start_popup_menu_102d2c8(sp, a0, a1, a2, a3); break;
+      case 0x102d3e8:  ret = Cibyl33.start_side_menu_102d3e8(sp, a0, a1, a2, a3); break;
+      case 0x102d428:  ret = Cibyl33.start_rotate_side_menu_102d428(sp, a0, a1, a2, a3); break;
+      case 0x102d460:  ret = Cibyl33.start_zoom_side_menu_102d460(sp, a0, a1, a2, a3); break;
+      case 0x102d644:  ret = Cibyl33.roadmap_start_set_closed_properly_102d644(sp, a0, a1, a2, a3); break;
+      case 0x102d674:  ret = Cibyl33.roadmap_start_exit_102d674(sp, a0, a1, a2, a3); break;
+      case 0x102d75c:  ret = Cibyl33.mark_location_callback_102d75c(sp, a0, a1, a2, a3); break;
+      case 0x102d80c:  ret = Cibyl33.on_closed_alerts_quick_menu_102d80c(sp, a0, a1, a2, a3); break;
+      case 0x102d844:  ret = Cibyl33.roadmap_start_continue_102d844(sp, a0, a1, a2, a3); break;
+      case 0x102daa0:  ret = Cibyl33.roadmap_start_remove_gps_102daa0(sp, a0, a1, a2, a3); break;
+      case 0x102dac0:  ret = Cibyl33.roadmap_start_add_gps_102dac0(sp, a0, a1, a2, a3); break;
+      case 0x102dae4:  ret = Cibyl33.roadmap_start_after_refresh_102dae4(sp, a0, a1, a2, a3); break;
+      case 0x102db64:  ret = Cibyl33.roadmap_gps_update_102db64(sp, a0, a1, a2, a3); break;
+      case 0x102dc20:  ret = Cibyl33.roadmap_start_usage_102dc20(sp, a0, a1, a2, a3); break;
+      case 0x102dc68:  ret = Cibyl33.roadmap_start_after_intro_screen_102dc68(sp, a0, a1, a2, a3); break;
+      case 0x102dca8:  ret = Cibyl33.roadmap_start_get_first_time_use_102dca8(sp, a0, a1, a2, a3); break;
+      case 0x102dccc:  ret = Cibyl33.roadmap_start_102dccc(sp, a0, a1, a2, a3); break;
+      case 0x102e3b4:  ret = Cibyl33.roadmap_start_screen_refresh_102e3b4(sp, a0, a1, a2, a3); break;
+      case 0x102e4dc:  ret = Cibyl33.start_more_menu_102e4dc(sp, a0, a1, a2, a3); break;
+      case 0x102e574:  ret = Cibyl33.start_map_updates_menu_102e574(sp, a0, a1, a2, a3); break;
+      case 0x102e5bc:  ret = Cibyl33.start_alerts_menu_102e5bc(sp, a0, a1, a2, a3); break;
+      case 0x102e8a0:  ret = Cibyl34.on_key_pressed_102e8a0(sp, a0, a1, a2, a3); break;
+      case 0x102eea0:  ret = Cibyl34.mark_location_102eea0(sp, a0, a1, a2, a3); break;
+      case 0x102f130:  ret = Cibyl34.gps_network_status_102f130(sp, a0, a1, a2, a3); break;
+      case 0x102f874:  ret = Cibyl34.obj_is_active_102f874(sp, a0, a1, a2, a3); break;
+      case 0x102f8d8:  ret = Cibyl34.roadmap_screen_obj_repeat_102f8d8(sp, a0, a1, a2, a3); break;
+      case 0x102f91c:  ret = Cibyl34.roadmap_screen_obj_global_offset_102f91c( a0, a1, a2, a3); break;
+      case 0x102fa34:  ret = Cibyl34.roadmap_screen_obj_decode_arg_102fa34(sp, a0, a1, a2, a3); break;
+      case 0x102fa88:  ret = Cibyl34.roadmap_object_string_102fa88(sp, a0, a1, a2, a3); break;
+      case 0x102faf8:  ret = Cibyl34.roadmap_screen_obj_load_102faf8(sp, a0, a1, a2, a3); break;
+      case 0x10302bc:  ret = Cibyl35.roadmap_screen_obj_reload_10302bc(sp, a0, a1, a2, a3); break;
+      case 0x10303cc:  ret = Cibyl35.roadmap_screen_obj_draw_10303cc(sp, a0, a1, a2, a3); break;
+      case 0x103062c:  ret = Cibyl35.roadmap_screen_obj_initialize_103062c(sp, a0, a1, a2, a3); break;
+      case 0x10306a8:  ret = Cibyl35.roadmap_screen_obj_long_click_10306a8(sp, a0, a1, a2, a3); break;
+      case 0x10307f0:  ret = Cibyl35.roadmap_screen_obj_short_click_10307f0(sp, a0, a1, a2, a3); break;
+      case 0x103089c:  ret = Cibyl35.roadmap_screen_obj_released_103089c(sp, a0, a1, a2, a3); break;
+      case 0x10308f0:  ret = Cibyl35.roadmap_screen_obj_pressed_10308f0(sp, a0, a1, a2, a3); break;
+      case 0x1030c08:  Cibyl35.roadmap_gps_no_link_control_1030c08(); break;
+      case 0x1030c10:  Cibyl35.roadmap_gps_no_periodic_control_1030c10(); break;
+      case 0x1030c18:  ret = Cibyl35.roadmap_gps_reception_state_1030c18(); break;
+      case 0x1030c28:  ret = Cibyl35.roadmap_gps_set_fix_1030c28(sp, a0, a1, a2, a3); break;
+      case 0x1030cb4:  ret = Cibyl35.roadmap_gps_get_fix_1030cb4(); break;
+      case 0x1030cd8:  ret = Cibyl35.roadmap_gps_call_loggers_1030cd8(sp, a0, a1, a2, a3); break;
+      case 0x1030d38:  ret = Cibyl35.roadmap_gps_get_received_time_1030d38(); break;
+      case 0x1030d48:  ret = Cibyl35.roadmap_gps_register_listener_1030d48( a0, a1, a2); break;
+      case 0x1030d94:  ret = Cibyl35.roadmap_gps_register_fix_listener_1030d94( a0, a1, a2); break;
+      case 0x1030e2c:  ret = Cibyl35.roadmap_gps_register_logger_1030e2c( a0, a1, a2); break;
+      case 0x1030e80:  ret = Cibyl35.roadmap_gps_register_link_control_1030e80( a0, a1); break;
+      case 0x1030e94:  ret = Cibyl35.roadmap_gps_register_periodic_control_1030e94( a0, a1); break;
+      case 0x1030ea8:  ret = Cibyl35.roadmap_gps_have_reception_1030ea8(); break;
+      case 0x1030ec0:  ret = Cibyl35.roadmap_gps_csv_tracker_get_enable_1030ec0(); break;
+      case 0x1030f08:  ret = Cibyl35.roadmap_gps_satelite_count_1030f08(); break;
+      case 0x1030f18:  ret = Cibyl35.roadmap_gps_detect_receiver_1030f18(sp, a0, a1, a2, a3); break;
+      case 0x1030f78:  ret = Cibyl35.roadmap_gps_raw_1030f78(sp, a0, a1, a2, a3); break;
+      case 0x1030fe8:  ret = Cibyl35.roadmap_gps_speed_accuracy_1030fe8(sp, a0, a1, a2, a3); break;
+      case 0x103100c:  ret = Cibyl35.roadmap_gps_vtg_103100c(sp, a0, a1, a2, a3); break;
+      case 0x1031094:  ret = Cibyl35.roadmap_gps_active_1031094(sp, a0, a1, a2, a3); break;
+      case 0x10310f0:  ret = Cibyl35.roadmap_gps_csv_tracker_initialize_10310f0(sp, a0, a1, a2, a3); break;
+      case 0x1031218:  ret = Cibyl35.roadmap_gps_update_status_1031218(sp, a0, a1, a2, a3); break;
+      case 0x1031278:  ret = Cibyl35.roadmap_gps_csv_tracker_shutdown_1031278(sp, a0, a1, a2, a3); break;
+      case 0x10312a8:  ret = Cibyl35.roadmap_gps_csv_tracker_set_enable_10312a8(sp, a0, a1, a2, a3); break;
+      case 0x10312fc:  ret = Cibyl35.roadmap_gps_shutdown_10312fc(sp, a0, a1, a2, a3); break;
+      case 0x1031360:  ret = Cibyl35.roadmap_gps_set_location_focus_1031360(sp, a0, a1, a2, a3); break;
+      case 0x10313b8:  ret = Cibyl35.roadmap_gps_update_reception_10313b8(sp, a0, a1, a2, a3); break;
+      case 0x1031468:  ret = Cibyl35.roadmap_gps_open_1031468(sp, a0, a1, a2, a3); break;
+      case 0x1031764:  ret = Cibyl36.roadmap_gps_input_1031764(sp, a0, a1, a2, a3); break;
+      case 0x1031894:  ret = Cibyl36.roadmap_gps_keep_alive_1031894(sp, a0, a1, a2, a3); break;
+      case 0x1031990:  ret = Cibyl36.roadmap_gps_gsv_1031990(sp, a0, a1, a2, a3); break;
+      case 0x1031b6c:  ret = Cibyl36.roadmap_gps_gsa_1031b6c(sp, a0, a1, a2, a3); break;
+      case 0x1031c7c:  ret = Cibyl36.roadmap_gps_pgrmm_1031c7c(sp, a0, a1, a2, a3); break;
+      case 0x1031ce4:  ret = Cibyl36.roadmap_gps_pgrme_1031ce4(sp, a0, a1, a2, a3); break;
+      case 0x1031d0c:  ret = Cibyl36.roadmap_gps_unregister_fix_listener_1031d0c(sp, a0, a1, a2, a3); break;
+      case 0x1031db0:  ret = Cibyl36.roadmap_gps_unregister_listener_1031db0(sp, a0, a1, a2, a3); break;
+      case 0x1031e54:  ret = Cibyl36.roadmap_gps_coarse_fix_1031e54(sp, a0, a1, a2, a3); break;
+      case 0x1031f48:  ret = Cibyl36.roadmap_gps_show_coordinats_1031f48(sp, a0, a1, a2, a3); break;
+      case 0x1031f74:  ret = Cibyl36.roadmap_gps_initialize_1031f74(sp, a0, a1, a2, a3); break;
+      case 0x10321cc:  ret = Cibyl36.roadmap_gps_warning_10321cc(sp, a0, a1, a2, a3); break;
+      case 0x1032250:  ret = Cibyl36.roadmap_gps_warning_init_timeout_1032250(sp, a0, a1, a2, a3); break;
+      case 0x1032278:  ret = Cibyl36.roadmap_gps_accept_fix_1032278(sp, a0, a1, a2, a3); break;
+      case 0x10322c4:  ret = Cibyl36.roadmap_gps_set_show_coordinates_10322c4(sp, a0, a1, a2, a3); break;
+      case 0x1032314:  ret = Cibyl36.roadmap_gps_reset_show_coordinates_1032314(sp, a0, a1, a2, a3); break;
+      case 0x103237c:  ret = Cibyl36.roadmap_gps_process_position_103237c(sp, a0, a1, a2, a3); break;
+      case 0x1032730:  ret = Cibyl36.roadmap_gps_gll_1032730(sp, a0, a1, a2, a3); break;
+      case 0x1032784:  ret = Cibyl36.roadmap_gps_gga_1032784(sp, a0, a1, a2, a3); break;
+      case 0x103287c:  ret = Cibyl36.roadmap_gps_rmc_103287c(sp, a0, a1, a2, a3); break;
+      case 0x1032918:  ret = Cibyl36.roadmap_gps_navigation_1032918(sp, a0, a1, a2, a3); break;
+      case 0x1032a34:  ret = Cibyl37.roadmap_alert_get_location_info_1032a34(); break;
+      case 0x1032a54:  ret = Cibyl37.roadmap_alert_is_square_dependent_1032a54(); break;
+      case 0x1032ab0:  ret = Cibyl37.roadmap_alert_is_cancelable_1032ab0(); break;
+      case 0x1032ab8:  ret = Cibyl37.roadmap_alert_check_same_street_1032ab8(); break;
+      case 0x1032ac0:  ret = Cibyl37.roadmap_alert_handle_alert_1032ac0(); break;
+      case 0x1032ac8:  ret = Cibyl37.roadmap_alert_count_1032ac8(); break;
+      case 0x1032ae8:  ret = Cibyl37.roadmap_alert_get_position_1032ae8( a0, a1, a2, a3); break;
+      case 0x1032b1c:  ret = Cibyl37.roadmap_alert_get_speed_1032b1c( a0); break;
+      case 0x1032b64:  ret = Cibyl37.roadmap_alert_get_id_1032b64( a0); break;
+      case 0x1032b88:  ret = Cibyl37.roadmap_alert_alertable_1032b88( a0); break;
+      case 0x1032bd4:  ret = Cibyl37.roadmap_alert_get_string_1032bd4( a0, a1, a2, a3); break;
+      case 0x1032c64:  ret = Cibyl37.roadmap_alert_get_map_icon_1032c64( a0, a1, a2, a3); break;
+      case 0x1032cf4:  ret = Cibyl37.roadmap_alert_get_priority_1032cf4(); break;
+      case 0x1032cfc:  ret = Cibyl37.roadmap_alert_get_alert_icon_1032cfc( a0, a1, a2, a3); break;
+      case 0x1032d8c:  ret = Cibyl37.roadmap_alert_get_warning_icon_1032d8c( a0, a1, a2, a3); break;
+      case 0x1032e1c:  ret = Cibyl37.roadmap_alert_distance_check_1032e1c(sp, a0, a1, a2, a3); break;
+      case 0x1032e98:  ret = Cibyl37.roadmap_alert_cancel_1032e98(sp, a0, a1, a2, a3); break;
+      case 0x1032f10:  ret = Cibyl37.roadmap_alert_activate_1032f10(sp, a0, a1, a2, a3); break;
+      case 0x1032f6c:  ret = Cibyl37.roadmap_alert_unmap_1032f6c(sp, a0, a1, a2, a3); break;
+      case 0x1032fd8:  ret = Cibyl37.roadmap_alert_map_1032fd8(sp, a0, a1, a2, a3); break;
+      case 0x1033094:  ret = Cibyl37.roadmap_alert_get_alert_sound_1033094(sp, a0, a1, a2, a3); break;
+      case 0x103314c:  ret = Cibyl37.roadmap_alert_get_distance_103314c(sp, a0, a1, a2, a3); break;
+      case 0x1033170:  ret = Cibyl37.roadmap_alerter_register_1033170( a0, a1); break;
+      case 0x10331a8:  ret = Cibyl37.hide_alert_dialog_10331a8(sp, a0, a1, a2, a3); break;
+      case 0x10331f4:  ret = Cibyl37.hide_10331f4(sp, a0, a1, a2, a3); break;
+      case 0x1033214:  ret = Cibyl37.hide_alert_timeout_1033214(sp, a0, a1, a2, a3); break;
+      case 0x1033324:  ret = Cibyl37.update_alert_1033324(sp, a0, a1, a2, a3); break;
+      case 0x10334e8:  ret = Cibyl37.show_alert_dialog_10334e8(sp, a0, a1, a2, a3); break;
+      case 0x1033808:  ret = Cibyl37.report_irrelevant_1033808(sp, a0, a1, a2, a3); break;
+      case 0x1033924:  ret = Cibyl37.delete_callback_1033924(sp, a0, a1, a2, a3); break;
+      case 0x10339c0:  ret = Cibyl37.get_street_from_line_10339c0(sp, a0, a1, a2, a3); break;
+      case 0x1033a2c:  ret = Cibyl37.get_alert_location_info_1033a2c(sp, a0, a1, a2, a3); break;
+      case 0x1033bdc:  ret = Cibyl37.alert_is_on_route_1033bdc(sp, a0, a1, a2, a3); break;
+      case 0x1033cec:  ret = Cibyl38.is_alert_in_range_provider_1033cec(sp, a0, a1, a2, a3); break;
+      case 0x1033fdc:  ret = Cibyl38.is_alert_in_range_1033fdc(sp, a0, a1, a2, a3); break;
+      case 0x1034324:  ret = Cibyl38.roadmap_alerter_initialize_1034324(sp, a0, a1, a2, a3); break;
+      case 0x1034420:  ret = Cibyl38.config_audio_alerts_enabled_1034420(sp, a0, a1, a2, a3); break;
+      case 0x103444c:  ret = Cibyl38.roadmap_alerter_audio_103444c(sp, a0, a1, a2, a3); break;
+      case 0x10344ac:  ret = Cibyl38.roadmap_alerter_display_10344ac(sp, a0, a1, a2, a3); break;
+      case 0x10345e8:  ret = Cibyl38.config_alerts_enabled_10345e8(sp, a0, a1, a2, a3); break;
+      case 0x1034614:  ret = Cibyl38.roadmap_alerter_check_1034614(sp, a0, a1, a2, a3); break;
+      case 0x103468c:  ret = Cibyl38.roadmap_mood_get_name_103468c(sp, a0, a1, a2, a3); break;
+      case 0x1034730:  ret = Cibyl38.roadmap_mood_from_string_1034730(sp, a0, a1, a2, a3); break;
+      case 0x1034a7c:  ret = Cibyl38.roadmap_mood_actual_state_1034a7c(sp, a0, a1, a2, a3); break;
+      case 0x1034ac4:  ret = Cibyl38.roadmap_mood_state_1034ac4(sp, a0, a1, a2, a3); break;
+      case 0x1034af8:  ret = Cibyl38.roadmap_mood_set_1034af8(sp, a0, a1, a2, a3); break;
+      case 0x1034b68:  ret = Cibyl38.roadmap_mood_call_back_1034b68(sp, a0, a1, a2, a3); break;
+      case 0x1034bb8:  ret = Cibyl38.roadmap_exclusive_mood_call_back_1034bb8(sp, a0, a1, a2, a3); break;
+      case 0x1034c58:  ret = Cibyl38.roadmap_mood_set_exclusive_moods_1034c58(sp, a0, a1, a2, a3); break;
+      case 0x1034d04:  ret = Cibyl38.roadmap_mood_init_1034d04(sp, a0, a1, a2, a3); break;
+      case 0x1034da4:  ret = Cibyl38.roadmap_mood_get_1034da4(sp, a0, a1, a2, a3); break;
+      case 0x1034ddc:  ret = Cibyl38.roadmap_mood_get_number_of_newbie_miles_1034ddc(sp, a0, a1, a2, a3); break;
+      case 0x1034e58:  ret = Cibyl38.roadmap_mood_dialog_1034e58(sp, a0, a1, a2, a3); break;
+      case 0x103541c:  ret = Cibyl39.roadmap_mood_103541c(sp, a0, a1, a2, a3); break;
+      case 0x103543c:  ret = Cibyl39.roadmap_mood_to_string_103543c(sp, a0, a1, a2, a3); break;
+      case 0x103561c:  ret = Cibyl39.roadmap_car_dialog_103561c(sp, a0, a1, a2, a3); break;
+      case 0x1035760:  ret = Cibyl39.roadmap_car_1035760(sp, a0, a1, a2, a3); break;
+      case 0x1035780:  ret = Cibyl39.roadmap_car_call_back_1035780(sp, a0, a1, a2, a3); break;
+      case 0x103584c:  ret = Cibyl39.roadmap_nmea_pgrmz_103584c(); break;
+      case 0x1035854:  ret = Cibyl39.roadmap_nmea_null_decoder_1035854(); break;
+      case 0x103585c:  ret = Cibyl39.hex2bin_103585c(sp, a0, a1, a2, a3); break;
+      case 0x10358dc:  ret = Cibyl39.roadmap_nmea_subscribe_10358dc(sp, a0, a1, a2, a3); break;
+      case 0x1035a20:  ret = Cibyl39.roadmap_nmea_pxrmcfg_1035a20(sp, a0, a1, a2, a3); break;
+      case 0x1035a9c:  ret = Cibyl39.roadmap_nmea_pxrmsub_1035a9c(sp, a0, a1, a2, a3); break;
+      case 0x1035b34:  ret = Cibyl39.roadmap_nmea_pxrmdel_1035b34(sp, a0, a1, a2, a3); break;
+      case 0x1035b74:  ret = Cibyl39.roadmap_nmea_pxrmadd_1035b74(sp, a0, a1, a2, a3); break;
+      case 0x1035bf0:  ret = Cibyl39.roadmap_nmea_decode_numeric_1035bf0(sp, a0, a1, a2, a3); break;
+      case 0x1035c6c:  ret = Cibyl39.roadmap_nmea_decode_coordinate_1035c6c(sp, a0, a1, a2, a3); break;
+      case 0x1035dcc:  ret = Cibyl39.roadmap_nmea_gll_1035dcc(sp, a0, a1, a2, a3); break;
+      case 0x1035ebc:  ret = Cibyl39.roadmap_nmea_pxrmmov_1035ebc(sp, a0, a1, a2, a3); break;
+      case 0x1035f60:  ret = Cibyl39.roadmap_nmea_vtg_1035f60(sp, a0, a1, a2, a3); break;
+      case 0x1035ff0:  ret = Cibyl39.roadmap_nmea_gsv_1035ff0(sp, a0, a1, a2, a3); break;
+      case 0x10361d8:  ret = Cibyl39.roadmap_nmea_gsa_10361d8(sp, a0, a1, a2, a3); break;
+      case 0x1036314:  ret = Cibyl39.roadmap_nmea_pgrmm_1036314(sp, a0, a1, a2, a3); break;
+      case 0x103635c:  ret = Cibyl39.roadmap_nmea_decode_unit_103635c(sp, a0, a1, a2, a3); break;
+      case 0x10363d0:  ret = Cibyl39.roadmap_nmea_pgrme_10363d0(sp, a0, a1, a2, a3); break;
+      case 0x1036490:  ret = Cibyl39.roadmap_nmea_decode_time_1036490(sp, a0, a1, a2, a3); break;
+      case 0x103667c:  ret = Cibyl40.roadmap_nmea_gga_103667c(sp, a0, a1, a2, a3); break;
+      case 0x10367e0:  ret = Cibyl40.roadmap_nmea_rmc_10367e0(sp, a0, a1, a2, a3); break;
+      case 0x10368d8:  ret = Cibyl40.roadmap_nmea_call_10368d8(sp, a0, a1, a2, a3); break;
+      case 0x10369d8:  ret = Cibyl40.roadmap_nmea_decode_10369d8(sp, a0, a1, a2, a3); break;
+      case 0x1036c5c:  ret = Cibyl40.roadmap_nmea_create_1036c5c(sp, a0, a1, a2, a3); break;
+      case 0x1036d14:  ret = Cibyl40.roadmap_gpsj2me_subscribe_to_navigation_1036d14( a0); break;
+      case 0x1036d20:  ret = Cibyl40.roadmap_gpsj2me_pos2_1036d20(sp, a0, a1, a2, a3); break;
+      case 0x1036d78:  ret = Cibyl40.roadmap_gpsj2me_pos1_1036d78( a0, a1); break;
+      case 0x1036d8c:  ret = Cibyl40.roadmap_gpsj2me_decode_1036d8c(sp, a0, a1, a2, a3); break;
+      case 0x1036e8c:  ret = Cibyl40.roadmap_input_shift_to_next_line_1036e8c(sp, a0, a1, a2, a3); break;
+      case 0x1036f14:  ret = Cibyl40.roadmap_input_1036f14(sp, a0, a1, a2, a3); break;
+      case 0x10371cc:  ret = Cibyl40.roadmap_io_same_10371cc( a0, a1, a2); break;
+      case 0x1037248:  ret = Cibyl40.roadmap_io_close_1037248(sp, a0, a1, a2, a3); break;
+      case 0x10372e4:  ret = Cibyl40.roadmap_io_write_10372e4(sp, a0, a1, a2, a3); break;
+      case 0x1037380:  ret = Cibyl40.roadmap_io_read_1037380(sp, a0, a1, a2, a3); break;
+      case 0x103743c:  ret = Cibyl40.roadmap_geocode_address_103743c(sp, a0, a1, a2, a3); break;
+      case 0x103773c:  ret = Cibyl40.roadmap_history_latest_103773c(sp, a0); break;
+      case 0x1037798:  ret = Cibyl40.roadmap_history_before_1037798(sp, a0, a1); break;
+      case 0x1037848:  ret = Cibyl40.roadmap_history_save_entries_1037848(sp, a0, a1, a2, a3); break;
+      case 0x103789c:  ret = Cibyl40.roadmap_history_save_103789c(sp, a0, a1, a2, a3); break;
+      case 0x1037928:  ret = Cibyl41.roadmap_history_declare_1037928(sp, a0, a1, a2, a3); break;
+      case 0x10379c4:  ret = Cibyl41.roadmap_history_remove_entry_10379c4(sp, a0, a1, a2, a3); break;
+      case 0x1037aa0:  ret = Cibyl41.roadmap_history_delete_entry_1037aa0(sp, a0, a1, a2, a3); break;
+      case 0x1037ac0:  ret = Cibyl41.roadmap_history_purge_1037ac0(sp, a0, a1, a2, a3); break;
+      case 0x1037b48:  ret = Cibyl41.roadmap_history_get_from_entry_1037b48(sp, a0, a1, a2, a3); break;
+      case 0x1037c20:  ret = Cibyl41.roadmap_history_get_1037c20(sp, a0, a1, a2, a3); break;
+      case 0x1037ca4:  ret = Cibyl41.remove_commas_1037ca4(sp, a0, a1, a2, a3); break;
+      case 0x1037ce8:  ret = Cibyl41.roadmap_history_update_1037ce8(sp, a0, a1, a2, a3); break;
+      case 0x1037e3c:  ret = Cibyl41.roadmap_history_add_entry_1037e3c(sp, a0, a1, a2, a3); break;
+      case 0x103823c:  ret = Cibyl41.roadmap_history_add_103823c(sp, a0, a1, a2, a3); break;
+      case 0x1038378:  ret = Cibyl41.roadmap_history_load_1038378(sp, a0, a1, a2, a3); break;
+      case 0x1038488:  ret = Cibyl41.roadmap_history_initialize_1038488(sp, a0, a1, a2, a3); break;
+      case 0x10384c0:  ret = Cibyl41.utf8_strlen_10384c0( a0, a1, a2); break;
+      case 0x1038510:  ret = Cibyl41.utf8_to_char_array_1038510(sp, a0, a1, a2, a3); break;
+      case 0x10385dc:  ret = Cibyl41.utf8_free_char_array_10385dc(sp, a0, a1, a2, a3); break;
+      case 0x1038658:  ret = Cibyl41.utf8_get_next_char_1038658(sp, a0, a1, a2, a3); break;
+      case 0x1038858:  ret = Cibyl41.utf8_remove_last_char_1038858(sp, a0, a1, a2, a3); break;
+      case 0x10388c4:  ret = Cibyl41.roadmap_keyboard_handler__key_pressed_10388c4(sp, a0, a1, a2, a3); break;
+      case 0x1038950:  ret = Cibyl41.roadmap_keyboard_register_to_event__general_1038950( a0, a1, a2, a3); break;
+      case 0x10389d0:  ret = Cibyl41.roadmap_keyboard_unregister_from_event__general_10389d0( a0, a1, a2, a3); break;
+      case 0x1038a80:  ret = Cibyl41.roadmap_keyboard_register_to_event__key_pressed_1038a80(sp, a0, a1, a2, a3); break;
+      case 0x1038ab0:  ret = Cibyl41.roadmap_keyboard_unregister_from_event__key_pressed_1038ab0(sp, a0, a1, a2, a3); break;
+      case 0x1038b18:  ret = Cibyl41.on_disabling_driving_lock_1038b18( a0); break;
+      case 0x1038b30:  ret = Cibyl41.roadmap_keyboard_set_typing_lock_enable_1038b30( a0); break;
+      case 0x1038b4c:  ret = Cibyl41.roadmap_keyboard_typing_locked_1038b4c(sp, a0, a1, a2, a3); break;
+      case 0x1038d20:  ret = Cibyl42.is_valid_nonalphabetic_char_1038d20( a0, a1); break;
+      case 0x1038de0:  ret = Cibyl42.is_valid_key_1038de0(sp, a0, a1, a2, a3); break;
+      case 0x1038f0c:  ret = Cibyl42.phone_keyboard_state_init_1038f0c( a0); break;
+      case 0x1038f20:  Cibyl42.multiple_key_info_init_1038f20( a0); break;
+      case 0x1038f2c:  ret = Cibyl42.phone_keyboard_init_1038f2c(sp, a0, a1, a2, a3); break;
+      case 0x1038f8c:  ret = Cibyl42.phone_keyboard_load_1038f8c(sp, a0, a1, a2, a3); break;
+      case 0x103901c:  ret = Cibyl42.roadmap_phone_keyboard_init_103901c(sp, a0, a1, a2, a3); break;
+      case 0x103907c:  ret = Cibyl42.multiple_key_info_get_next_valid_key_103907c(sp, a0, a1, a2, a3); break;
+      case 0x10392ec:  ret = Cibyl42.multiple_key_info_free_10392ec(sp, a0, a1, a2, a3); break;
+      case 0x1039314:  ret = Cibyl42.phone_keyboard_free_1039314(sp, a0, a1, a2, a3); break;
+      case 0x10393f8:  Cibyl42.roadmap_search_menu_10393f8(); break;
+      case 0x1039400:  ret = Cibyl42.search_menu_set_local_search_attrs_1039400(sp, a0, a1, a2, a3); break;
+      case 0x1039460:  ret = Cibyl42.search_menu_search_local_1039460(sp, a0, a1, a2, a3); break;
+      case 0x10394b8:  ret = Cibyl42.on_dlg_closed_local_10394b8(sp, a0, a1, a2, a3); break;
+      case 0x10394f8:  ret = Cibyl42.on_dlg_closed_address_10394f8(sp, a0, a1, a2, a3); break;
+      case 0x1039530:  ret = Cibyl42.search_menu_single_search_1039530(sp, a0, a1, a2, a3); break;
+      case 0x103956c:  ret = Cibyl42.search_menu_search_address_103956c(sp, a0, a1, a2, a3); break;
+      case 0x10395a8:  ret = Cibyl42.roadmap_search_history_10395a8(sp, a0, a1, a2, a3); break;
+      case 0x1039dc8:  ret = Cibyl42.search_menu_my_saved_places_1039dc8(sp, a0, a1, a2, a3); break;
+      case 0x1039e04:  ret = Cibyl42.search_menu_search_favorites_1039e04(sp, a0, a1, a2, a3); break;
+      case 0x1039e40:  ret = Cibyl42.search_menu_search_history_1039e40(sp, a0, a1, a2, a3); break;
+      case 0x1039e7c:  ret = Cibyl42.hide_our_dialogs_1039e7c(sp, a0, a1, a2, a3); break;
+      case 0x1039ec8:  ret = Cibyl42.on_erase_history_item_1039ec8(sp, a0, a1, a2, a3); break;
+      case 0x1039f68:  ret = Cibyl42.keyboard_callback_1039f68(sp, a0, a1, a2, a3); break;
+      case 0x103a03c:  ret = Cibyl42.T_97_103a03c(sp, a0, a1, a2, a3); break;
+      case 0x103a078:  ret = Cibyl42.roadmap_address_show_103a078(sp, a0, a1, a2, a3); break;
+      case 0x103a6a0:  ret = Cibyl43.on_option_selected_103a6a0(sp, a0, a1, a2, a3); break;
+      case 0x103a9b4:  ret = Cibyl43.local_search_get_provider_103a9b4(sp, a0, a1, a2, a3); break;
+      case 0x103a9d8:  ret = Cibyl43.local_search_resolve_address_103a9d8(sp, a0, a1, a2, a3); break;
+      case 0x103aa68:  ret = Cibyl43.local_search_get_logo_name_103aa68(sp, a0, a1, a2, a3); break;
+      case 0x103ab04:  ret = Cibyl43.local_search_get_icon_name_103ab04(sp, a0, a1, a2, a3); break;
+      case 0x103abcc:  ret = Cibyl43.local_search_get_provider_label_103abcc(sp, a0, a1, a2, a3); break;
+      case 0x103ac34:  ret = Cibyl43.local_search_term_103ac34(sp, a0, a1, a2, a3); break;
+      case 0x103ac8c:  ret = Cibyl43.local_search_init_103ac8c(sp, a0, a1, a2, a3); break;
+      case 0x103ade0:  ret = Cibyl43.local_candidate_build_address_string_103ade0(sp, a0, a1, a2, a3); break;
+      case 0x103b2d0:  ret = Cibyl43.on_local_option_103b2d0(sp, a0, a1, a2, a3); break;
+      case 0x103b6e4:  ret = Cibyl43.local_search_dlg_show_103b6e4(sp, a0, a1, a2, a3); break;
+      case 0x103b8f8:  ret = Cibyl44.on_search_103b8f8(sp, a0, a1, a2, a3); break;
+      case 0x103ba24:  ret = Cibyl44.on_search_error_message_103ba24(sp, a0, a1, a2, a3); break;
+      case 0x103ba44:  ret = Cibyl44.on_address_resolved_103ba44(sp, a0, a1, a2, a3); break;
+      case 0x103bcf0:  ret = Cibyl44.get_selected_list_item_103bcf0(sp, a0, a1, a2, a3); break;
+      case 0x103bd3c:  ret = Cibyl44.navigate_103bd3c(sp, a0, a1, a2, a3); break;
+      case 0x103bd6c:  ret = Cibyl44.on_list_item_selected_103bd6c(sp, a0, a1, a2, a3); break;
+      case 0x103bdb4:  ret = Cibyl44.on_back_103bdb4(sp, a0, a1, a2, a3); break;
+      case 0x103bdf4:  ret = Cibyl44.on_options_103bdf4(sp, a0, a1, a2, a3); break;
+      case 0x103bed0:  ret = Cibyl44.on_option_selected_103bed0(sp, a0, a1, a2, a3); break;
+      case 0x103c000:  ret = Cibyl44.address_search_report_wrong_address_103c000(sp, a0, a1, a2, a3); break;
+      case 0x103c120:  ret = Cibyl44.on_completed_reporting_bad_address_103c120(sp, a0, a1, a2, a3); break;
+      case 0x103c150:  ret = Cibyl44.address_search_resolve_address_103c150(sp, a0, a1, a2, a3); break;
+      case 0x103c19c:  ret = Cibyl44.address_search_term_103c19c(sp, a0, a1, a2, a3); break;
+      case 0x103c1f4:  ret = Cibyl44.address_search_init_103c1f4(sp, a0, a1, a2, a3); break;
+      case 0x103c2dc:  ret = Cibyl44.address_candidate_build_address_string_103c2dc(sp, a0, a1, a2, a3); break;
+      case 0x103c548:  ret = Cibyl44.on_address_option_103c548(sp, a0, a1, a2, a3); break;
+      case 0x103c880:  ret = Cibyl44.get_result_container_103c880(sp, a0, a1, a2, a3); break;
+      case 0x103c92c:  ret = Cibyl44.address_search_dlg_show_103c92c(sp, a0, a1, a2, a3); break;
+      case 0x103c9b0:  ret = Cibyl44.address_search_dlg_show_auto_103c9b0(sp, a0, a1, a2, a3); break;
+      case 0x103ca38:  ret = Cibyl44.on_search_103ca38(sp, a0, a1, a2, a3); break;
+      case 0x103cd24:  ret = Cibyl45.on_search_error_message_103cd24(sp, a0, a1, a2, a3); break;
+      case 0x103cd44:  ret = Cibyl45.on_address_resolved_103cd44(sp, a0, a1, a2, a3); break;
+      case 0x103cfdc:  ret = Cibyl45.on_auto_search_completed_103cfdc(sp, a0, a1, a2, a3); break;
+      case 0x103cffc:  ret = Cibyl45.send_error_report_103cffc(sp, a0, a1, a2, a3); break;
+      case 0x103d080:  ret = Cibyl45.get_selected_list_item_103d080(sp, a0, a1, a2, a3); break;
+      case 0x103d0cc:  ret = Cibyl45.navigate_103d0cc(sp, a0, a1, a2, a3); break;
+      case 0x103d0fc:  ret = Cibyl45.on_list_item_selected_103d0fc(sp, a0, a1, a2, a3); break;
+      case 0x103d18c:  ret = Cibyl45.on_back_103d18c(sp, a0, a1, a2, a3); break;
+      case 0x103d1cc:  ret = Cibyl45.on_options_103d1cc(sp, a0, a1, a2, a3); break;
+      case 0x103d310:  ret = Cibyl45.on_option_selected_103d310(sp, a0, a1, a2, a3); break;
+      case 0x103d45c:  ret = Cibyl45.address_search_auto_search_103d45c(sp, a0, a1, a2, a3); break;
+      case 0x103d4ac:  ret = Cibyl45.on_key_pressed__delegate_to_editbox_103d4ac(sp, a0, a1, a2, a3); break;
+      case 0x103d528:  ret = Cibyl45.on_btn_search_103d528(sp, a0, a1, a2, a3); break;
+      case 0x103d570:  ret = Cibyl45.generic_search_dlg_is_1st_103d570( a0); break;
+      case 0x103d594:  ret = Cibyl45.generic_search_dlg_reopen_native_keyboard_103d594(sp, a0, a1, a2, a3); break;
+      case 0x103d620:  ret = Cibyl45.on_keyboard_closed_103d620(sp, a0, a1, a2, a3); break;
+      case 0x103d79c:  ret = Cibyl45.create_input_container_103d79c(sp, a0, a1, a2, a3); break;
+      case 0x103d994:  ret = Cibyl45.create_dlg_103d994(sp, a0, a1, a2, a3); break;
+      case 0x103da40:  ret = Cibyl45.generic_search_dlg_get_search_dlg_103da40(sp, a0, a1, a2, a3); break;
+      case 0x103dad0:  ret = Cibyl45.on_device_event_103dad0(sp, a0, a1, a2, a3); break;
+      case 0x103db34:  ret = Cibyl45.generic_search_dlg_get_search_edit_box_103db34(sp, a0, a1, a2, a3); break;
+      case 0x103db64:  ret = Cibyl45.on_dlg_closed_103db64(sp, a0, a1, a2, a3); break;
+      case 0x103dc90:  ret = Cibyl45.reopen_keyboard_103dc90(sp, a0, a1, a2, a3); break;
+      case 0x103dd6c:  ret = Cibyl45.generic_search_dlg_switch_gui_103dd6c(sp, a0, a1, a2, a3); break;
+      case 0x103de54:  ret = Cibyl45.generic_search_dlg_show_103de54(sp, a0, a1, a2, a3); break;
+      case 0x103e190:  ret = Cibyl46.generic_search_result_103e190( a0); break;
+      case 0x103e1e4:  ret = Cibyl46.generic_address_add_103e1e4(sp, a0, a1, a2, a3); break;
+      case 0x103e254:  ret = Cibyl46.on_completed_103e254(sp, a0, a1, a2, a3); break;
+      case 0x103e29c:  ret = Cibyl46.get_house_number__str_103e29c(sp, a0, a1, a2, a3); break;
+      case 0x103e304:  ret = Cibyl46.generic_search_add_to_favorites_103e304(sp, a0, a1, a2, a3); break;
+      case 0x103e34c:  ret = Cibyl46.on_favorites_name_103e34c(sp, a0, a1, a2, a3); break;
+      case 0x103e474:  ret = Cibyl46.generic_search_add_address_to_history_103e474(sp, a0, a1, a2, a3); break;
+      case 0x103e5a8:  ret = Cibyl46.navigate_with_coordinates_103e5a8(sp, a0, a1, a2, a3); break;
+      case 0x103e754:  ret = Cibyl46.generic_search_resolve_address_103e754(sp, a0, a1, a2, a3); break;
+      case 0x103ea9c:  ret = Cibyl46.address_candidate_init_103ea9c(sp, a0, a1, a2, a3); break;
+      case 0x103ead0:  ret = Cibyl46.single_search_resolve_address_103ead0(sp, a0, a1, a2, a3); break;
+      case 0x103eb60:  ret = Cibyl46.on_single_search_address_candidate_103eb60(sp, a0, a1, a2, a3); break;
+      case 0x103ec54:  ret = Cibyl46.single_search_term_103ec54(sp, a0, a1, a2, a3); break;
+      case 0x103ecb8:  ret = Cibyl46.single_search_init_103ecb8(sp, a0, a1, a2, a3); break;
+      case 0x103ed9c:  ret = Cibyl46.single_search_dlg_show_103ed9c(sp, a0, a1, a2, a3); break;
+      case 0x103ee2c:  ret = Cibyl46.close_dialog_103ee2c(sp, a0, a1, a2, a3); break;
+      case 0x103eee0:  ret = Cibyl46.on_search_action_103eee0(sp, a0, a1, a2, a3); break;
+      case 0x103f1d4:  ret = Cibyl46.on_address_resolved_103f1d4(sp, a0, a1, a2, a3); break;
+      case 0x103f4a8:  ret = Cibyl47.on_option_selected_103f4a8(sp, a0, a1, a2, a3); break;
+      case 0x103f644:  ret = Cibyl47.roadmap_net_mon_set_enabled_103f644( a0); break;
+      case 0x103f650:  ret = Cibyl47.roadmap_net_mon_get_enabled_103f650(); break;
+      case 0x103f660:  ret = Cibyl47.roadmap_net_mon_disconnect_103f660( a0); break;
+      case 0x103f70c:  ret = Cibyl47.update_activity_103f70c(sp, a0, a1, a2, a3); break;
+      case 0x103f76c:  ret = Cibyl47.roadmap_net_mon_error_103f76c(sp, a0, a1, a2, a3); break;
+      case 0x103f7b8:  ret = Cibyl47.roadmap_net_mon_recv_103f7b8(sp, a0, a1, a2, a3); break;
+      case 0x103f820:  ret = Cibyl47.roadmap_net_mon_send_103f820(sp, a0, a1, a2, a3); break;
+      case 0x103f858:  ret = Cibyl47.roadmap_net_mon_connect_103f858(sp, a0, a1, a2, a3); break;
+      case 0x103f89c:  ret = Cibyl47.roadmap_net_mon_start_103f89c(sp, a0, a1, a2, a3); break;
+      case 0x103f8ec:  ret = Cibyl47.periodic_callack_103f8ec(sp, a0, a1, a2, a3); break;
+      case 0x103f970:  ret = Cibyl47.roadmap_net_mon_destroy_103f970(sp, a0, a1, a2, a3); break;
+      case 0x103f9bc:  ret = Cibyl47.roadmap_net_mon_initialize_103f9bc(sp, a0, a1, a2, a3); break;
+      case 0x103fa24:  ret = Cibyl47.roadmap_softkeys_orientation_103fa24(); break;
+      case 0x103fa2c:  ret = Cibyl47.roadmap_softkeys_left_softkey_callback_103fa2c(sp, a0, a1, a2, a3); break;
+      case 0x103fa90:  ret = Cibyl47.roadmap_softkeys_right_softkey_callback_103fa90(sp, a0, a1, a2, a3); break;
+      case 0x103faf4:  ret = Cibyl47.roadmap_softkeys_get_right_soft_key_text_103faf4(sp, a0, a1, a2, a3); break;
+      case 0x103fb68:  ret = Cibyl47.roadmap_softkeys_get_left_soft_key_text_103fb68(sp, a0, a1, a2, a3); break;
+      case 0x103fca0:  ret = Cibyl47.remove_softkey_103fca0(sp, a0, a1, a2, a3); break;
+      case 0x103fdcc:  ret = Cibyl47.roadmap_softkeys_remove_right_soft_key_103fdcc(sp, a0, a1, a2, a3); break;
+      case 0x103fe14:  ret = Cibyl47.roadmap_softkeys_remove_left_soft_key_103fe14(sp, a0, a1, a2, a3); break;
+      case 0x103fe5c:  ret = Cibyl47.queue_softkey_103fe5c(sp, a0, a1, a2, a3); break;
+      case 0x103ff4c:  ret = Cibyl47.roadmap_softkeys_set_right_soft_key_103ff4c(sp, a0, a1, a2, a3); break;
+      case 0x103ff94:  ret = Cibyl47.roadmap_softkeys_set_left_soft_key_103ff94(sp, a0, a1, a2, a3); break;
+      case 0x103ffdc:  ret = Cibyl47.device_event_info_copy_103ffdc( a0, a1); break;
+      case 0x103fff4:  ret = Cibyl47.device_event_info_are_identical_103fff4( a0, a1); break;
+      case 0x104000c:  ret = Cibyl47.get_device_event_name_104000c( a0); break;
+      case 0x1040040:  ret = Cibyl47.roadmap_device_event_notification_1040040(sp, a0, a1, a2, a3); break;
+      case 0x10400bc:  ret = Cibyl47.roadmap_device_events_unregister_10400bc(sp, a0, a1, a2, a3); break;
+      case 0x10400e8:  ret = Cibyl47.roadmap_device_events_register_10400e8(sp, a0, a1, a2, a3); break;
+      case 0x1040118:  ret = Cibyl47.roadmap_device_events_term_1040118(sp, a0, a1, a2, a3); break;
+      case 0x1040144:  ret = Cibyl47.roadmap_device_events_init_1040144(sp, a0, a1, a2, a3); break;
+      case 0x10401d8:  Cibyl47.device_event_info_init_10401d8( a0); break;
+      case 0x10401e4:  ret = Cibyl47.device_event_info_free_10401e4(sp, a0, a1, a2, a3); break;
+      case 0x1040204:  ret = Cibyl47.insert_first_item_1040204(sp, a0, a1, a2, a3); break;
+      case 0x1040264:  ret = Cibyl47.cyclic_array_init_1040264(sp, a0, a1, a2, a3); break;
+      case 0x10402b4:  ret = Cibyl47.cyclic_array_free_10402b4(sp, a0, a1, a2, a3); break;
+      case 0x1040368:  ret = Cibyl47.cyclic_array_size_1040368( a0); break;
+      case 0x10403b8:  ret = Cibyl47.cyclic_array_get_item_10403b8( a0, a1); break;
+      case 0x1040520:  ret = Cibyl47.cyclic_array_remove_item_1040520(sp, a0, a1, a2, a3); break;
+      case 0x10406fc:  ret = Cibyl47.cyclic_array_remove_same_item_10406fc(sp, a0, a1, a2, a3); break;
+      case 0x1040950:  ret = Cibyl47.cyclic_array_push_last_1040950(sp, a0, a1, a2, a3); break;
+      case 0x1040b4c:  ret = Cibyl47.roadmap_city_write_int_1040b4c(sp, a0, a1, a2, a3); break;
+      case 0x1040bd4:  ret = Cibyl47.roadmap_city_next_1040bd4(sp, a0, a1, a2, a3); break;
+      case 0x1040cd0:  ret = Cibyl48.roadmap_city_first_1040cd0(sp, a0, a1, a2, a3); break;
+      case 0x1040dcc:  ret = Cibyl48.roadmap_city_write_file_1040dcc(sp, a0, a1, a2, a3); break;
+      case 0x1040fec:  ret = Cibyl48.roadmap_city_search_1040fec(sp, a0, a1, a2, a3); break;
+      case 0x10410d8:  ret = Cibyl48.roadmap_city_unload_10410d8(sp, a0, a1, a2, a3); break;
+      case 0x10412c8:  ret = Cibyl48.roadmap_city_find_10412c8(sp, a0, a1, a2, a3); break;
+      case 0x1041430:  ret = Cibyl48.roadmap_city_add_1041430(sp, a0, a1, a2, a3); break;
+      case 0x10415e8:  ret = Cibyl48.roadmap_city_free_10415e8(sp, a0, a1, a2, a3); break;
+      case 0x10416cc:  ret = Cibyl48.roadmap_city_init_10416cc(sp, a0, a1, a2, a3); break;
+      case 0x1041930:  ret = Cibyl48.roadmap_range_get_street_1041930( a0); break;
+      case 0x10419ac:  ret = Cibyl48.roadmap_range_activate_10419ac(sp, a0, a1, a2, a3); break;
+      case 0x1041a08:  ret = Cibyl48.roadmap_range_get_address_1041a08(sp, a0, a1, a2, a3); break;
+      case 0x1041cd8:  ret = Cibyl48.roadmap_range_unmap_1041cd8(sp, a0, a1, a2, a3); break;
+      case 0x1041d44:  ret = Cibyl48.roadmap_range_map_1041d44(sp, a0, a1, a2, a3); break;
+      case 0x1041de0:  Cibyl48.sttstr_reset_1041de0( a0); break;
+      case 0x1041df4:  ret = Cibyl48.sttstr_trim_last_char_1041df4(sp, a0, a1, a2, a3); break;
+      case 0x1041eb4:  ret = Cibyl48.sttstr_copy_1041eb4(sp, a0, a1, a2, a3); break;
+      case 0x1041fc4:  ret = Cibyl48.dynstr_reset_1041fc4(sp, a0, a1, a2, a3); break;
+      case 0x1041ffc:  ret = Cibyl48.T_1_1041ffc(sp, a0, a1, a2, a3); break;
+      case 0x1042038:  ret = Cibyl48.dynstr_copy_1042038(sp, a0, a1, a2, a3); break;
+      case 0x1042238:  ret = Cibyl48.roadmap_bar_by_pos_1042238(sp, a0, a1, a2, a3); break;
+      case 0x10423dc:  ret = Cibyl48.roadmap_bar_short_click_10423dc(); break;
+      case 0x10423ec:  ret = Cibyl48.roadmap_bar_long_click_10423ec(); break;
+      case 0x10423fc:  ret = Cibyl48.roadmap_bar_drag_start_10423fc(); break;
+      case 0x104240c:  ret = Cibyl48.roadmap_bar_top_height_104240c(); break;
+      case 0x1042440:  ret = Cibyl48.roadmap_bar_bottom_height_1042440(); break;
+      case 0x1042474:  Cibyl48.roadmap_bar_switch_skins_1042474(); break;
+      case 0x104247c:  ret = Cibyl48.roadmap_bottom_bar_hide_104247c(); break;
+      case 0x104248c:  Cibyl48.roadmap_bottom_bar_show_104248c(); break;
+      case 0x10424b4:  ret = Cibyl48.roadmap_top_bar_show_10424b4(); break;
+      case 0x10424d8:  ret = Cibyl48.get_current_num_comments_10424d8(sp, a0, a1, a2, a3); break;
+      case 0x1042530:  ret = Cibyl49.get_dist_to_destination_1042530(sp, a0, a1, a2, a3); break;
+      case 0x1042578:  ret = Cibyl49.get_time_to_destination_1042578(sp, a0, a1, a2, a3); break;
+      case 0x10425c0:  ret = Cibyl49.get_current_street_10425c0(sp, a0, a1, a2, a3); break;
+      case 0x10425f8:  ret = Cibyl49.get_time_str_10425f8(sp, a0, a1, a2, a3); break;
+      case 0x1042624:  ret = Cibyl49.roadmap_bar_load_image_1042624(sp, a0, a1, a2, a3); break;
+      case 0x1042698:  ret = Cibyl49.createBGImage_1042698(sp, a0, a1, a2, a3); break;
+      case 0x1042754:  ret = Cibyl49.roadmap_bar_decode_arg_1042754(sp, a0, a1, a2, a3); break;
+      case 0x10427a8:  ret = Cibyl49.roadmap_bar_decode_integer_10427a8(sp, a0, a1, a2, a3); break;
+      case 0x1042828:  ret = Cibyl49.roadmap_bar_object_string_1042828(sp, a0, a1, a2, a3); break;
+      case 0x1042898:  ret = Cibyl49.roadmap_bar_obj_pressed_1042898(sp, a0, a1, a2, a3); break;
+      case 0x1042934:  ret = Cibyl49.roadmap_bar_drag_motion_1042934(sp, a0, a1, a2, a3); break;
+      case 0x10429f4:  ret = Cibyl49.draw_objects_10429f4(sp, a0, a1, a2, a3); break;
+      case 0x10430d8:  ret = Cibyl49.roadmap_bar_draw_bottom_bar_10430d8(sp, a0, a1, a2, a3); break;
+      case 0x1043250:  ret = Cibyl49.roadmap_bar_draw_top_bar_1043250(sp, a0, a1, a2, a3); break;
+      case 0x1043294:  ret = Cibyl49.roadmap_bar_draw_1043294(sp, a0, a1, a2, a3); break;
+      case 0x10432e0:  ret = Cibyl49.roadmap_bar_obj_released_10432e0(sp, a0, a1, a2, a3); break;
+      case 0x104340c:  ret = Cibyl49.T_92_104340c(sp, a0, a1, a2, a3); break;
+      case 0x1043c24:  ret = Cibyl50.roadmap_bar_initialize_1043c24(sp, a0, a1, a2, a3); break;
+      case 0x1043e50:  ret = Cibyl50.roadmap_prompts_get_count_1043e50(); break;
+      case 0x1043e60:  ret = Cibyl50.roadmap_prompts_get_values_1043e60(); break;
+      case 0x1043e6c:  ret = Cibyl50.roadmap_prompts_get_labels_1043e6c(); break;
+      case 0x1043e78:  ret = Cibyl50.roadmap_prompts_exist_1043e78(); break;
+      case 0x1043e80:  ret = Cibyl50.roadmap_prompts_init_params_1043e80(sp, a0, a1, a2, a3); break;
+      case 0x1043f1c:  ret = Cibyl50.roadmap_prompts_conf_load_1043f1c(sp, a0, a1, a2, a3); break;
+      case 0x10440d4:  ret = Cibyl50.roadmap_prompts_get_downloading_lang_name_10440d4(sp, a0, a1, a2, a3); break;
+      case 0x104410c:  ret = Cibyl50.roadmap_prompts_get_queued_lang_104410c(sp, a0, a1, a2, a3); break;
+      case 0x1044144:  ret = Cibyl50.roadmap_prompts_get_name_1044144(sp, a0, a1, a2, a3); break;
+      case 0x104417c:  ret = Cibyl50.prompts_downloads_warning_fn_104417c(sp, a0, a1, a2, a3); break;
+      case 0x10442c8:  ret = Cibyl50.roadmap_prompts_get_prompt_value_from_name_10442c8(sp, a0, a1, a2, a3); break;
+      case 0x1044378:  ret = Cibyl50.roadmap_prompts_get_prompt_value_1044378(sp, a0, a1, a2, a3); break;
+      case 0x1044418:  ret = Cibyl50.roadmap_prompts_set_downloading_lang_name_1044418(sp, a0, a1, a2, a3); break;
+      case 0x1044458:  ret = Cibyl50.roadmap_prompts_set_queued_lang_1044458(sp, a0, a1, a2, a3); break;
+      case 0x1044498:  ret = Cibyl50.roadmap_prompts_set_update_time_1044498(sp, a0, a1, a2, a3); break;
+      case 0x10444d8:  ret = Cibyl50.roadmap_prompts_set_name_10444d8(sp, a0, a1, a2, a3); break;
+      case 0x1044518:  ret = Cibyl50.roadmap_prompts_init_1044518(sp, a0, a1, a2, a3); break;
+      case 0x10445b4:  ret = Cibyl50.load_prompt_list_10445b4(sp, a0, a1, a2, a3); break;
+      case 0x10446f4:  ret = Cibyl50.roadmap_prompts_download_10446f4(sp, a0, a1, a2, a3); break;
+      case 0x1044814:  ret = Cibyl50.roadmap_prompts_login_cb_1044814(sp, a0, a1, a2, a3); break;
+      case 0x1044924:  ret = Cibyl50.on_conf_file_downloaded_1044924(sp, a0, a1, a2, a3); break;
+      case 0x1044a28:  ret = Cibyl50.on_download_lang_confirm_1044a28(sp, a0, a1, a2, a3); break;
+      case 0x1044a74:  ret = Cibyl50.roadmap_prompts_download_watchdog_timer_1044a74(sp, a0, a1, a2, a3); break;
+      case 0x1044b34:  ret = Cibyl50.on_loaded_prompt_file_1044b34(sp, a0, a1, a2, a3); break;
+      case 0x1044be8:  ret = Cibyl50.roadmap_border_shutdown_1044be8(sp, a0, a1, a2, a3); break;
+      case 0x1044c7c:  ret = Cibyl50.get_image_1044c7c(sp, a0, a1, a2, a3); break;
+      case 0x10453d8:  ret = Cibyl51.roadmap_display_border_10453d8(sp, a0, a1, a2, a3); break;
+      case 0x1045cc8:  ret = Cibyl51.roadmap_border_initialize_1045cc8(sp, a0, a1, a2, a3); break;
+      case 0x1045d8c:  ret = Cibyl51.roadmap_http_async_copy_abort_1045d8c(sp, a0, a1, a2, a3); break;
+      case 0x1045de0:  ret = Cibyl51.roadmap_http_async_copy_1045de0(sp, a0, a1, a2, a3); break;
+      case 0x1045e98:  ret = Cibyl51.roadmap_http_async_connect_cb_1045e98(sp, a0, a1, a2, a3); break;
+      case 0x1045f84:  ret = Cibyl51.roadmap_http_async_has_data_cb_1045f84(sp, a0, a1, a2, a3); break;
+      case 0x104645c:  ret = Cibyl51.override_long_click_104645c(); break;
+      case 0x1046464:  ret = Cibyl51.get_input_type_1046464(); break;
+      case 0x104646c:  ret = Cibyl51.roadmap_alternative_routes_suggest_dlg_active_104646c(sp, a0, a1, a2, a3); break;
+      case 0x10464a8:  ret = Cibyl51.roadmap_alertnative_routes_after_login_10464a8(sp, a0, a1, a2, a3); break;
+      case 0x1046694:  ret = Cibyl52.roadmap_alternative_routes_suggested_trip_1046694(sp, a0, a1, a2, a3); break;
+      case 0x10466bc:  ret = Cibyl52.on_suggest_dlg_close_10466bc(sp, a0, a1, a2, a3); break;
+      case 0x10466e0:  ret = Cibyl52.roadmap_alternative_routes_routes_dialog_10466e0(sp, a0, a1, a2, a3); break;
+      case 0x104695c:  ret = Cibyl52.suggest_route_dialog_close_104695c(sp, a0, a1, a2, a3); break;
+      case 0x10469d8:  ret = Cibyl52.route_select_10469d8(sp, a0, a1, a2, a3); break;
+      case 0x1046b40:  ret = Cibyl52.on_route_selected_1046b40(sp, a0, a1, a2, a3); break;
+      case 0x1046b64:  ret = Cibyl52.on_drive_btn_cb_1046b64(sp, a0, a1, a2, a3); break;
+      case 0x1046bd0:  ret = Cibyl52.update_button_1046bd0(sp, a0, a1, a2, a3); break;
+      case 0x1046ce0:  ret = Cibyl52.on_show_routes_dlg_closed_1046ce0(sp, a0, a1, a2, a3); break;
+      case 0x1046d24:  ret = Cibyl52.space_1046d24(sp, a0, a1, a2, a3); break;
+      case 0x1046d8c:  ret = Cibyl52.on_route_show_list_1046d8c(sp, a0, a1, a2, a3); break;
+      case 0x1046dac:  ret = Cibyl52.highligh_selection_1046dac(sp, a0, a1, a2, a3); break;
+      case 0x1046fc4:  ret = Cibyl52.on_routes_selection_all_1046fc4(sp, a0, a1, a2, a3); break;
+      case 0x10470a4:  ret = Cibyl52.on_routes_selection_route_10470a4(sp, a0, a1, a2, a3); break;
+      case 0x1047198:  ret = Cibyl52.keypressed_showroute_1047198(sp, a0, a1, a2, a3); break;
+      case 0x10473b4:  ret = Cibyl52.OnKeyPressed_10473b4(sp, a0, a1, a2, a3); break;
+      case 0x1047534:  ret = Cibyl52.on_compare_routes_option_selected_1047534(sp, a0, a1, a2, a3); break;
+      case 0x10475f8:  ret = Cibyl52.compare_routes_options_sk_cb_10475f8(sp, a0, a1, a2, a3); break;
+      case 0x1047744:  ret = Cibyl52.on_show_route_highlight_dlg_closed_1047744(sp, a0, a1, a2, a3); break;
+      case 0x10477f0:  ret = Cibyl52.roadmap_alternative_route_get_src_10477f0(sp, a0, a1, a2, a3); break;
+      case 0x104784c:  ret = Cibyl52.roadmap_alternative_route_get_waypoint_104784c(sp, a0, a1, a2, a3); break;
+      case 0x10478b0:  ret = Cibyl53.update_progress_10478b0(sp, a0, a1, a2, a3); break;
+      case 0x1047908:  ret = Cibyl53.roadmap_alternative_routes_set_last_check_time_stamp_1047908(sp, a0, a1, a2, a3); break;
+      case 0x1047938:  ret = Cibyl53.tod_1047938(sp, a0, a1, a2, a3); break;
+      case 0x1047990:  ret = Cibyl53.roadmap_alternative_routes_suggest_route_dialog_1047990(sp, a0, a1, a2, a3); break;
+      case 0x104813c:  ret = Cibyl53.request_route_104813c(sp, a0, a1, a2, a3); break;
+      case 0x10481e4:  ret = Cibyl53.on_close_btn_cb_10481e4(sp, a0, a1, a2, a3); break;
+      case 0x1048220:  ret = Cibyl53.on_suggest_dlg_canceled_1048220(sp, a0, a1, a2, a3); break;
+      case 0x104826c:  ret = Cibyl53.on_alt_routes_btn_cb_104826c(sp, a0, a1, a2, a3); break;
+      case 0x1048328:  ret = Cibyl53.add_routes_selection_1048328(sp, a0, a1, a2, a3); break;
+      case 0x1048720:  ret = Cibyl53.on_routes_option_selected_1048720(sp, a0, a1, a2, a3); break;
+      case 0x1048b90:  ret = Cibyl54.roadmap_alternative_routes_set_suggest_routes_1048b90(sp, a0, a1, a2, a3); break;
+      case 0x1048bdc:  ret = Cibyl54.dont_show_callback_1048bdc(sp, a0, a1, a2, a3); break;
+      case 0x1048c1c:  ret = Cibyl54.roadmap_alternative_feature_enabled_1048c1c(sp, a0, a1, a2, a3); break;
+      case 0x1048c50:  ret = Cibyl54.roadmap_alternative_routes_suggest_routes_1048c50(sp, a0, a1, a2, a3); break;
+      case 0x1048c84:  ret = Cibyl54.roadmap_alternative_routes_init_1048c84(sp, a0, a1, a2, a3); break;
+      case 0x1048db0:  ret = Cibyl54.on_checkbox_selected_1048db0(sp, a0, a1, a2, a3); break;
+      case 0x1048ea4:  ret = Cibyl54.remider_add_pin_1048ea4(sp, a0, a1, a2, a3); break;
+      case 0x1048fe8:  ret = Cibyl54.create_reminder_dlg_1048fe8(sp, a0, a1, a2, a3); break;
+      case 0x10490b4:  ret = Cibyl54.get_id_10490b4(sp, a0, a1, a2, a3); break;
+      case 0x10490f8:  ret = Cibyl54.show_reminder_dlg_10490f8(sp, a0, a1, a2, a3); break;
+      case 0x1049138:  ret = Cibyl54.OnReminderShortClick_1049138(sp, a0, a1, a2, a3); break;
+      case 0x1049414:  ret = Cibyl54.show_reminder_1049414(sp, a0, a1, a2, a3); break;
+      case 0x10496e4:  ret = Cibyl54.roadmap_reminder_add_entry_10496e4(sp, a0, a1, a2, a3); break;
+      case 0x10498b8:  ret = Cibyl54.reminder_add_dlg_buttons_callback_10498b8(sp, a0, a1, a2, a3); break;
+      case 0x1049b44:  ret = Cibyl54.roadmap_gps_update_1049b44(sp, a0, a1, a2, a3); break;
+      case 0x1049dac:  ret = Cibyl54.roadmap_reminder_feature_enabled_1049dac(sp, a0, a1, a2, a3); break;
+      case 0x1049de0:  ret = Cibyl54.reminder_add_dlg_1049de0(sp, a0, a1, a2, a3); break;
+      case 0x104a6cc:  ret = Cibyl55.roadmap_reminder_add_at_position_104a6cc(sp, a0, a1, a2, a3); break;
+      case 0x104a7d0:  ret = Cibyl55.roadmap_reminder_save_location_104a7d0(sp, a0, a1, a2, a3); break;
+      case 0x104a840:  ret = Cibyl55.roadmap_reminder_init_104a840(sp, a0, a1, a2, a3); break;
+      case 0x104aa18:  ret = Cibyl55.roadmap_speedometer_set_offset_104aa18( a0); break;
+      case 0x104aa24:  ret = Cibyl55.roadmap_speedometer_initialize_104aa24(sp, a0, a1, a2, a3); break;
+      case 0x104aa94:  ret = Cibyl55.roadmap_speedometer_after_refresh_104aa94(sp, a0, a1, a2, a3); break;
+      case 0x104ada8:  Cibyl55.roadmap_scoreboard_request_failed_104ada8(); break;
+      case 0x104adb0:  ret = Cibyl55.roadmap_scoreboard_response_104adb0( a3); break;
+      case 0x104adb8:  ret = Cibyl55.roadmap_scoreboard_feature_enabled_104adb8(sp, a0, a1, a2, a3); break;
+      case 0x104adec:  ret = Cibyl55.roadmap_scoreboard_104adec(sp, a0, a1, a2, a3); break;
+      case 0x104af90:  ret = Cibyl55.social_image_download_update_bitmap_cb_104af90(sp, a0, a1, a2, a3); break;
+      case 0x104afbc:  ret = Cibyl55.download_size_callback_104afbc(sp, a0, a1, a2, a3); break;
+      case 0x104affc:  ret = Cibyl55.roadmap_social_image_terminate_104affc(sp, a0, a1, a2, a3); break;
+      case 0x104b058:  ret = Cibyl55.download_done_callback_104b058(sp, a0, a1, a2, a3); break;
+      case 0x104b150:  ret = Cibyl55.download_error_callback_104b150(sp, a0, a1, a2, a3); break;
+      case 0x104b1f4:  ret = Cibyl55.download_progress_callback_104b1f4(sp, a0, a1, a2, a3); break;
+      case 0x104b244:  ret = Cibyl55.roadmap_social_image_download_104b244(sp, a0, a1, a2, a3); break;
+      case 0x104b544:  ret = Cibyl55.roadmap_social_image_download_update_bitmap_104b544(sp, a0, a1, a2, a3); break;
+      case 0x104b580:  ret = Cibyl55.roadmap_social_image_initialize_104b580(sp, a0, a1, a2, a3); break;
+      case 0x104b5b8:  ret = Cibyl55.exec_callbacks_104b5b8(sp, a0, a1, a2, a3); break;
+      case 0x104b634:  ret = Cibyl55.roadmap_pointer_force_click_104b634(sp, a0, a1, a2, a3); break;
+      case 0x104b660:  ret = Cibyl55.roadmap_pointer_enable_double_click_104b660(); break;
+      case 0x104b680:  ret = Cibyl55.roadmap_pointer_long_click_expired_104b680(); break;
+      case 0x104b6a0:  ret = Cibyl55.remove_callback_104b6a0(sp, a0, a1, a2, a3); break;
+      case 0x104b778:  ret = Cibyl55.roadmap_pointer_unregister_drag_end_104b778(sp, a0, a1, a2, a3); break;
+      case 0x104b79c:  ret = Cibyl55.roadmap_pointer_unregister_drag_motion_104b79c(sp, a0, a1, a2, a3); break;
+      case 0x104b7c0:  ret = Cibyl55.roadmap_pointer_unregister_drag_start_104b7c0(sp, a0, a1, a2, a3); break;
+      case 0x104b7e4:  ret = Cibyl55.roadmap_pointer_unregister_released_104b7e4(sp, a0, a1, a2, a3); break;
+      case 0x104b808:  ret = Cibyl55.roadmap_pointer_unregister_pressed_104b808(sp, a0, a1, a2, a3); break;
+      case 0x104b850:  ret = Cibyl55.roadmap_pointer_unregister_long_click_104b850(sp, a0, a1, a2, a3); break;
+      case 0x104b874:  ret = Cibyl55.roadmap_pointer_unregister_short_click_104b874(sp, a0, a1, a2, a3); break;
+      case 0x104b898:  ret = Cibyl55.queue_callback_104b898(sp, a0, a1, a2, a3); break;
+      case 0x104b9a8:  ret = Cibyl55.roadmap_pointer_register_drag_end_104b9a8(sp, a0, a1, a2, a3); break;
+      case 0x104b9d0:  ret = Cibyl56.roadmap_pointer_register_drag_motion_104b9d0(sp, a0, a1, a2, a3); break;
+      case 0x104b9f8:  ret = Cibyl56.roadmap_pointer_register_drag_start_104b9f8(sp, a0, a1, a2, a3); break;
+      case 0x104ba20:  ret = Cibyl56.roadmap_pointer_register_released_104ba20(sp, a0, a1, a2, a3); break;
+      case 0x104ba48:  ret = Cibyl56.roadmap_pointer_register_pressed_104ba48(sp, a0, a1, a2, a3); break;
+      case 0x104ba70:  ret = Cibyl56.roadmap_pointer_register_enter_key_press_104ba70(sp, a0, a1, a2, a3); break;
+      case 0x104ba98:  ret = Cibyl56.roadmap_pointer_register_double_click_104ba98(sp, a0, a1, a2, a3); break;
+      case 0x104bac0:  ret = Cibyl56.roadmap_pointer_register_long_click_104bac0(sp, a0, a1, a2, a3); break;
+      case 0x104bae8:  ret = Cibyl56.roadmap_pointer_register_short_click_104bae8(sp, a0, a1, a2, a3); break;
+      case 0x104bb10:  ret = Cibyl56.roadmap_pointer_initialize_104bb10(sp, a0, a1, a2, a3); break;
+      case 0x104bb4c:  ret = Cibyl56.roadmap_pointer_button_pressed_104bb4c(sp, a0, a1, a2, a3); break;
+      case 0x104bbcc:  ret = Cibyl56.roadmap_pointer_moved_104bbcc(sp, a0, a1, a2, a3); break;
+      case 0x104bd08:  ret = Cibyl56.drag_flow_control_104bd08(sp, a0, a1, a2, a3); break;
+      case 0x104bd40:  ret = Cibyl56.roadmap_pointer_button_released_104bd40(sp, a0, a1, a2, a3); break;
+      case 0x104bed8:  ret = Cibyl56.double_click_flow_control_104bed8(sp, a0, a1, a2, a3); break;
+      case 0x104bf24:  ret = Cibyl56.long_click_flow_control_104bf24(sp, a0, a1, a2, a3); break;
+      case 0x104bfec:  Cibyl56.roadmap_analytics_log_event_104bfec(); break;
+      case 0x104bff4:  ret = Cibyl56.roadmap_messagebox_timeout_104bff4(sp, a0, a1, a2, a3); break;
+      case 0x104c068:  ret = Cibyl56.roadmap_messagebox_cb_104c068(sp, a0, a1, a2, a3); break;
+      case 0x104c0dc:  ret = Cibyl56.roadmap_messagebox_custom_104c0dc(sp, a0, a1, a2, a3); break;
+      case 0x104c158:  ret = Cibyl56.roadmap_messagebox_104c158(sp, a0, a1, a2, a3); break;
+      case 0x104c1c8:  ret = Cibyl56.ssd_confirm_dialog_custom_timeout_104c1c8(sp, a0, a1, a2, a3); break;
+      case 0x104c2b4:  ret = Cibyl56.ssd_confirm_dialog_custom_104c2b4(sp, a0, a1, a2, a3); break;
+      case 0x104c2ec:  ret = Cibyl56.ssd_confirm_dialog_timeout_104c2ec(sp, a0, a1, a2, a3); break;
+      case 0x104c330:  ret = Cibyl56.ssd_confirm_dialog_104c330(sp, a0, a1, a2, a3); break;
+      case 0x104c370:  ret = Cibyl56.no_button_callback_104c370(sp, a0, a1, a2, a3); break;
+      case 0x104c3a8:  ret = Cibyl56.yes_button_callback_104c3a8(sp, a0, a1, a2, a3); break;
+      case 0x104c3e0:  ret = Cibyl56.ssd_progress_msg_dialog_show_104c3e0( a0); break;
+      case 0x104c400:  ret = Cibyl56.ssd_progress_msg_dialog_hide_104c400(); break;
+      case 0x104c40c:  ret = Cibyl56.ssd_progress_msg_dialog_show_timed_104c40c(sp, a0, a1, a2, a3); break;
+      case 0x104c448:  ret = Cibyl56.hide_timer_104c448(sp, a0, a1, a2, a3); break;
+      case 0x104c474:  ret = Cibyl56.roadmap_path_list_104c474(); break;
+      case 0x104c4a8:  ret = Cibyl56.file_connection_path_104c4a8(sp, a0, a1, a2, a3); break;
+      case 0x104c514:  ret = Cibyl56.roadmap_path_debug_104c514(sp, a0, a1, a2, a3); break;
+      case 0x104c534:  ret = Cibyl56.roadmap_path_downloads_104c534(sp, a0, a1, a2, a3); break;
+      case 0x104c554:  ret = Cibyl56.roadmap_path_gps_104c554(sp, a0, a1, a2, a3); break;
+      case 0x104c574:  ret = Cibyl56.roadmap_path_user_104c574(sp, a0, a1, a2, a3); break;
+      case 0x104c5a4:  ret = Cibyl56.roadmap_path_config_104c5a4(sp, a0, a1, a2, a3); break;
+      case 0x104c680:  ret = Cibyl56.roadmap_path_free_104c680(sp, a0, a1, a2, a3); break;
+      case 0x104c6a0:  ret = Cibyl56.roadmap_path_list_free_104c6a0(sp, a0, a1, a2, a3); break;
+      case 0x104c704:  ret = Cibyl56.roadmap_path_create_104c704(sp, a0, a1, a2, a3); break;
+      case 0x104c804:  ret = Cibyl56.roadmap_path_expand_104c804(sp, a0, a1, a2, a3); break;
+      case 0x104c964:  ret = Cibyl56.roadmap_path_cat_104c964(sp, a0, a1, a2, a3); break;
+      case 0x104cb40:  ret = Cibyl56.roadmap_path_join_104cb40(sp, a0, a1, a2, a3); break;
+      case 0x104cb88:  ret = Cibyl56.roadmap_path_images_104cb88(sp, a0, a1, a2, a3); break;
+      case 0x104cbe0:  ret = Cibyl56.roadmap_path_skip_directories_104cbe0(sp, a0, a1, a2, a3); break;
+      case 0x104cc74:  ret = Cibyl56.roadmap_path_parent_104cc74(sp, a0, a1, a2, a3); break;
+      case 0x104ccc4:  ret = Cibyl56.roadmap_path_format_104ccc4(sp, a0, a1, a2, a3); break;
+      case 0x104cdec:  ret = Cibyl57.T_56_104cdec(sp, a0, a1, a2, a3); break;
+      case 0x104ce30:  ret = Cibyl57.roadmap_path_list_create_104ce30(sp, a0, a1, a2, a3); break;
+      case 0x104cf64:  ret = Cibyl57.roadmap_path_find_104cf64(sp, a0, a1, a2, a3); break;
+      case 0x104d05c:  ret = Cibyl57.roadmap_path_preferred_104d05c(sp, a0, a1, a2, a3); break;
+      case 0x104d19c:  ret = Cibyl57.roadmap_path_next_104d19c(sp, a0, a1, a2, a3); break;
+      case 0x104d214:  ret = Cibyl57.roadmap_path_first_104d214(sp, a0, a1, a2, a3); break;
+      case 0x104d284:  ret = Cibyl57.roadmap_path_set_104d284(sp, a0, a1, a2, a3); break;
+      case 0x104d424:  ret = Cibyl57.roadmap_file_base_104d424( a0); break;
+      case 0x104d438:  ret = Cibyl57.roadmap_file_size_104d438( a0); break;
+      case 0x104d454:  ret = Cibyl57.roadmap_file_free_space_104d454(); break;
+      case 0x104d45c:  ret = Cibyl57.roadmap_file_close_104d45c(sp, a0, a1, a2, a3); break;
+      case 0x104d47c:  ret = Cibyl57.roadmap_file_write_104d47c(sp, a0, a1, a2, a3); break;
+      case 0x104d4a4:  ret = Cibyl57.roadmap_file_read_104d4a4(sp, a0, a1, a2, a3); break;
+      case 0x104d4cc:  ret = Cibyl57.fopen_exception_handler_104d4cc(sp, a0, a1, a2, a3); break;
+      case 0x104d5d0:  ret = Cibyl57.favail_104d5d0(sp, a0, a1, a2, a3); break;
+      case 0x104d638:  ret = Cibyl57.roadmap_file_unmap_104d638(sp, a0, a1, a2, a3); break;
+      case 0x104d6a0:  ret = Cibyl57.roadmap_file_exists_104d6a0(sp, a0, a1, a2, a3); break;
+      case 0x104d710:  ret = Cibyl57.roadmap_file_length_104d710(sp, a0, a1, a2, a3); break;
+      case 0x104d780:  ret = Cibyl57.roadmap_file_map_104d780(sp, a0, a1, a2, a3); break;
+      case 0x104da14:  ret = Cibyl57.roadmap_file_remove_104da14(sp, a0, a1, a2, a3); break;
+      case 0x104dad8:  ret = Cibyl57.roadmap_file_fopen_104dad8(sp, a0, a1, a2, a3); break;
+      case 0x104dd20:  ret = Cibyl57.roadmap_file_open_104dd20(sp, a0, a1, a2, a3); break;
+      case 0x104dd48:  Cibyl57.roadmap_canvas_ignore_mouse_104dd48(); break;
+      case 0x104dd50:  Cibyl57.roadmap_canvas_ignore_configure_104dd50(); break;
+      case 0x104dd58:  ret = Cibyl57.roadmap_canvas_get_thickness_104dd58( a0); break;
+      case 0x104dd6c:  ret = Cibyl57.roadmap_canvas_set_thickness_104dd6c( a0); break;
+      case 0x104dd9c:  ret = Cibyl57.roadmap_canvas_erase_104dd9c( a0, a1, a2); break;
+      case 0x104ddf4:  ret = Cibyl57.roadmap_canvas_erase_area_104ddf4( a0, a1, a2, a3); break;
+      case 0x104de3c:  ret = Cibyl57.roadmap_canvas_draw_multiple_points_104de3c( a0, a1, a2, a3); break;
+      case 0x104de90:  ret = Cibyl57.roadmap_canvas_register_button_pressed_handler_104de90( a0); break;
+      case 0x104de9c:  ret = Cibyl57.roadmap_canvas_register_button_released_handler_104de9c( a0); break;
+      case 0x104dea8:  ret = Cibyl57.roadmap_canvas_register_mouse_move_handler_104dea8( a0); break;
+      case 0x104deb4:  ret = Cibyl57.roadmap_canvas_register_configure_handler_104deb4( a0); break;
+      case 0x104df00:  ret = Cibyl57.roadmap_canvas_copy_image_104df00( a0, a1, a2, a3); break;
+      case 0x104e00c:  ret = Cibyl57.roadmap_canvas_image_width_104e00c( a0); break;
+      case 0x104e030:  ret = Cibyl57.roadmap_canvas_image_height_104e030( a0); break;
+      case 0x104e054:  ret = Cibyl57.rim_on_canvas_button_pressed_104e054(sp, a0, a1, a2, a3); break;
+      case 0x104e094:  ret = Cibyl57.rim_on_canvas_button_released_104e094(sp, a0, a1, a2, a3); break;
+      case 0x104e0d4:  ret = Cibyl57.rim_on_canvas_button_moved_104e0d4(sp, a0, a1, a2, a3); break;
+      case 0x104e114:  ret = Cibyl57.roadmap_canvas_image_from_buf_104e114(); break;
+      case 0x104e11c:  Cibyl57.roadmap_canvas_shutdown_104e11c(); break;
+      case 0x104e124:  Cibyl57.roadmap_canvas_image_invalidate_104e124(); break;
+      case 0x104e12c:  Cibyl57.roadmap_canvas_unmanaged_list_add_104e12c(); break;
+      case 0x104e134:  ret = Cibyl57.roadmap_canvas_image_jpg_from_buff_104e134(sp, a0, a1, a2, a3); break;
+      case 0x104e180:  ret = Cibyl57.roadmap_canvas_new_image_104e180(sp, a0, a1, a2, a3); break;
+      case 0x104e1e8:  ret = Cibyl57.dummy_handler_104e1e8(sp, a0, a1, a2, a3); break;
+      case 0x104e23c:  ret = Cibyl58.roadmap_canvas_configure_104e23c(sp, a0, a1, a2, a3); break;
+      case 0x104e32c:  ret = Cibyl58.roadmap_canvas_refresh_104e32c(sp, a0, a1, a2, a3); break;
+      case 0x104e36c:  ret = Cibyl58.roadmap_canvas_select_pen_104e36c(sp, a0, a1, a2, a3); break;
+      case 0x104e420:  ret = Cibyl58.roadmap_canvas_set_opacity_104e420(sp, a0, a1, a2, a3); break;
+      case 0x104e450:  ret = Cibyl58.bidi_string_104e450(sp, a0, a1, a2, a3); break;
+      case 0x104e63c:  ret = Cibyl58.roadmap_canvas_getFont_104e63c(sp, a0, a1, a2, a3); break;
+      case 0x104e87c:  ret = Cibyl58.roadmap_canvas_draw_string_angle_104e87c(sp, a0, a1, a2, a3); break;
+      case 0x104e954:  ret = Cibyl58.roadmap_canvas_draw_formated_string_angle_104e954(sp, a0, a1, a2, a3); break;
+      case 0x104e978:  ret = Cibyl58.roadmap_canvas_get_text_extents_104e978(sp, a0, a1, a2, a3); break;
+      case 0x104ea70:  ret = Cibyl58.roadmap_canvas_draw_string_size_104ea70(sp, a0, a1, a2, a3); break;
+      case 0x104ec0c:  ret = Cibyl58.roadmap_canvas_draw_string_104ec0c(sp, a0, a1, a2, a3); break;
+      case 0x104ec30:  ret = Cibyl58.roadmap_canvas_draw_formated_string_size_104ec30(sp, a0, a1, a2, a3); break;
+      case 0x104ec54:  ret = Cibyl58.roadmap_canvas_get_formated_text_extents_104ec54(sp, a0, a1, a2, a3); break;
+      case 0x104ec80:  ret = Cibyl58.roadmap_canvas_free_image_104ec80(sp, a0, a1, a2, a3); break;
+      case 0x104ecb0:  ret = Cibyl58.roadmap_canvas_load_image_104ecb0(sp, a0, a1, a2, a3); break;
+      case 0x104ed40:  ret = Cibyl58.roadmap_canvas_create_pen_new_104ed40(sp, a0, a1, a2, a3); break;
+      case 0x104edc0:  ret = Cibyl58.roadmap_canvas_set_foreground_104edc0(sp, a0, a1, a2, a3); break;
+      case 0x104ef10:  ret = Cibyl58.roadmap_canvas_create_pen_104ef10(sp, a0, a1, a2, a3); break;
+      case 0x104ef90:  ret = Cibyl58.roadmap_canvas_draw_multiple_polygons_104ef90(sp, a0, a1, a2, a3); break;
+      case 0x104f194:  ret = Cibyl58.roadmap_canvas_draw_multiple_circles_104f194(sp, a0, a1, a2, a3); break;
+      case 0x104f2a0:  ret = Cibyl58.roadmap_canvas_draw_multiple_lines_104f2a0(sp, a0, a1, a2, a3); break;
+      case 0x104f4b8:  ret = Cibyl58.roadmap_canvas_draw_image_104f4b8(sp, a0, a1, a2, a3); break;
+      case 0x104f638:  ret = Cibyl59.roadmap_internet_open_browser_104f638( a0); break;
+      case 0x104f660:  ret = Cibyl59.roadmap_time_get_time_104f660( a0, a1); break;
+      case 0x104f6c0:  ret = Cibyl59.roadmap_time_get_millis_104f6c0(sp); break;
+      case 0x104f6dc:  ret = Cibyl59.getIntegerFromString_104f6dc(sp, a0, a1, a2, a3); break;
+      case 0x104f758:  ret = Cibyl59.roadmap_time_parseGMTString_104f758(sp, a0, a1, a2, a3); break;
+      case 0x104f858:  ret = Cibyl59.roadmap_time_get_time_wseconds_104f858(sp, a0, a1, a2, a3); break;
+      case 0x104f8e8:  ret = Cibyl59.roadmap_time_get_hours_minutes_104f8e8(sp, a0, a1, a2, a3); break;
+      case 0x104f9e8:  ret = Cibyl59.roadmap_serial_read_104f9e8( a0, a1, a2); break;
+      case 0x104fa18:  ret = Cibyl59.roadmap_serial_write_104fa18(); break;
+      case 0x104fa20:  ret = Cibyl59.roadmap_serial_close_104fa20(); break;
+      case 0x104fa58:  ret = Cibyl59.roadmap_horizontal_screen_orientation_104fa58(); break;
+      case 0x104fa70:  Cibyl59.roadmap_main_toggle_full_screen_104fa70(); break;
+      case 0x104fa78:  Cibyl59.roadmap_main_set_keyboard_104fa78(); break;
+      case 0x104fa80:  ret = Cibyl59.roadmap_main_new_menu_104fa80(); break;
+      case 0x104fa90:  Cibyl59.roadmap_main_add_menu_104fa90(); break;
+      case 0x104fa98:  ret = Cibyl59.roadmap_main_browser_hide_104fa98(); break;
+      case 0x104fac4:  ret = Cibyl59.rim_on_menuItem_104fac4( a0, a1); break;
+      case 0x104fae8:  ret = Cibyl59.roadmap_main_set_miniMenu_item_104fae8( a0, a1, a2, a3); break;
+      case 0x104fb18:  ret = Cibyl59.roadmap_main_context_menu_reset_104fb18( a0); break;
+      case 0x104fb58:  ret = Cibyl59.roadmap_main_add_menu_item_104fb58( a0, a1, a2, a3); break;
+      case 0x104fbc0:  ret = Cibyl59.roadmap_main_add_separator_104fbc0( a0); break;
+      case 0x104fbe0:  Cibyl59.roadmap_main_add_tool_104fbe0(); break;
+      case 0x104fbe8:  Cibyl59.roadmap_main_add_tool_space_104fbe8(); break;
+      case 0x104fbf8:  Cibyl59.roadmap_main_show_104fbf8(); break;
+      case 0x104fc00:  ret = Cibyl59.roadmap_main_set_last_cb_104fc00( a0); break;
+      case 0x104fc14:  Cibyl59.roadmap_main_flush_104fc14(); break;
+      case 0x104fc2c:  ret = Cibyl59.rim_on_gps_104fc2c(sp, a0, a1, a2, a3); break;
+      case 0x104fcf4:  ret = Cibyl59.roadmap_main_show_miniMenu_104fcf4(); break;
+      case 0x104fd10:  ret = Cibyl59.roadmap_main_remove_periodic_104fd10(sp, a0, a1, a2, a3); break;
+      case 0x104fdfc:  ret = Cibyl59.roadmap_main_set_seconds_timer_104fdfc(sp, a0, a1, a2, a3); break;
+      case 0x104fea8:  ret = Cibyl59.roadmap_main_set_periodic_104fea8(sp, a0, a1, a2, a3); break;
+      case 0x1050124:  ret = Cibyl59.roadmap_main_register_seconds_timer_mgr_1050124(sp, a0, a1, a2, a3); break;
+      case 0x105014c:  ret = Cibyl59.roadmap_main_seconds_timer_mgr_105014c(sp, a0, a1, a2, a3); break;
+      case 0x105020c:  ret = Cibyl59.battery_status_print_105020c(sp, a0, a1, a2, a3); break;
+      case 0x1050300:  ret = Cibyl59.roadmap_main_add_canvas_1050300(sp, a0, a1, a2, a3); break;
+      case 0x1050320:  ret = Cibyl59.rim_on_orientation_change_1050320(sp, a0, a1, a2, a3); break;
+      case 0x1050368:  ret = Cibyl59.rim_on_navigation_movement_1050368(sp, a0, a1, a2, a3); break;
+      case 0x10504d4:  ret = Cibyl59.rim_on_scheduledTask_10504d4(sp, a0, a1, a2, a3); break;
+      case 0x10505ac:  ret = Cibyl59.roadmap_main_input_ready_10505ac(sp, a0, a1, a2, a3); break;
+      case 0x10506cc:  ret = Cibyl59.main_10506cc(sp, a0, a1, a2, a3); break;
+      case 0x10506f0:  ret = Cibyl59.roadmap_main_browser_launcher_10506f0(sp, a0, a1, a2, a3); break;
+      case 0x1050774:  ret = Cibyl59.roadmap_main_context_menu_set_1050774(sp, a0, a1, a2, a3); break;
+      case 0x10507e8:  ret = Cibyl59.rim_start_10507e8(sp, a0, a1, a2, a3); break;
+      case 0x105090c:  ret = Cibyl59.roadmap_start_event_105090c(sp, a0, a1, a2, a3); break;
+      case 0x1050934:  ret = Cibyl59.rim_backlight_on_callback_1050934(sp, a0, a1, a2, a3); break;
+      case 0x10509b4:  ret = Cibyl59.roadmap_main_sound_level_init_10509b4(sp, a0, a1, a2, a3); break;
+      case 0x1050a08:  ret = Cibyl59.roadmap_main_set_sound_level_1050a08(sp, a0, a1, a2, a3); break;
+      case 0x1050a4c:  ret = Cibyl59.roadmap_main_write_exception_to_log_1050a4c(sp, a0, a1, a2, a3); break;
+      case 0x1050aac:  ret = Cibyl60.roadmap_main_browser_url_handler_1050aac(sp, a0, a1, a2, a3); break;
+      case 0x1050ae4:  ret = Cibyl60.roadmap_main_set_cursor_1050ae4(sp, a0, a1, a2, a3); break;
+      case 0x1050b34:  ret = Cibyl60.roadmap_main_exit_1050b34(sp, a0, a1, a2, a3); break;
+      case 0x1050c60:  ret = Cibyl60.rim_on_key_down_1050c60(sp, a0, a1, a2, a3); break;
+      case 0x1050e44:  ret = Cibyl60.exit_handler_1050e44(sp, a0, a1, a2, a3); break;
+      case 0x1050ebc:  ret = Cibyl60.roadmap_main_remove_input_1050ebc(sp, a0, a1, a2, a3); break;
+      case 0x1050f94:  ret = Cibyl60.roadmap_main_set_input_1050f94(sp, a0, a1, a2, a3); break;
+      case 0x105114c:  ret = Cibyl60.menu_wrapper_105114c(sp, a0, a1, a2, a3); break;
+      case 0x1051188:  ret = Cibyl60.roadmap_main_on_battery_stat_changed_1051188(sp, a0, a1, a2, a3); break;
+      case 0x10511b4:  ret = Cibyl60.rim_on_menu_button_10511b4(sp, a0, a1, a2, a3); break;
+      case 0x1051394:  ret = Cibyl60.rim_on_navigation_click_1051394(sp, a0, a1, a2, a3); break;
+      case 0x10513ec:  ret = Cibyl60.roadmap_main_menu_button_unregister_10513ec(sp, a0, a1, a2, a3); break;
+      case 0x10514f0:  ret = Cibyl60.roadmap_main_menu_button_register_10514f0(sp, a0, a1, a2, a3); break;
+      case 0x10516a4:  ret = Cibyl60.roadmap_main_alloc_stack_10516a4(sp, a0, a1, a2, a3); break;
+      case 0x10516d0:  ret = Cibyl60.roadmap_main_new_10516d0(sp, a0, a1, a2, a3); break;
+      case 0x10516f0:  ret = Cibyl60.roadmap_input_type_set_mode_10516f0(sp, a0, a1, a2, a3); break;
+      case 0x10518a8:  ret = Cibyl60.roadmap_sound_load_10518a8(); break;
+      case 0x10518b0:  ret = Cibyl60.roadmap_sound_free_10518b0(); break;
+      case 0x10518b8:  ret = Cibyl60.roadmap_sound_list_create_10518b8( a0); break;
+      case 0x10518dc:  ret = Cibyl60.roadmap_sound_list_add_10518dc( a0, a1); break;
+      case 0x1051948:  ret = Cibyl60.roadmap_sound_initialize_1051948(); break;
+      case 0x105195c:  Cibyl60.roadmap_sound_shutdown_105195c(); break;
+      case 0x105196c:  ret = Cibyl60.roadmap_sound_play_list_105196c(sp, a0, a1, a2, a3); break;
+      case 0x10519f0:  ret = Cibyl60.roadmap_sound_play_background_sound_10519f0(sp, a0, a1, a2, a3); break;
+      case 0x1051a74:  ret = Cibyl60.roadmap_net_set_compress_enabled_1051a74( a0); break;
+      case 0x1051a90:  ret = Cibyl60.roadmap_net_shutdown_1051a90(sp, a0, a1, a2, a3); break;
+      case 0x1051ab0:  ret = Cibyl60.print_url_1051ab0(sp, a0, a1, a2, a3); break;
+      case 0x1051b00:  ret = Cibyl60.roadmap_net_close_1051b00(sp, a0, a1, a2, a3); break;
+      case 0x1051c90:  ret = Cibyl60.roadmap_net_remove_input_1051c90(sp, a0, a1, a2, a3); break;
+      case 0x1051d10:  ret = Cibyl60.roadmap_net_set_input_1051d10(sp, a0, a1, a2, a3); break;
+      case 0x1051da0:  ret = Cibyl60.general_net_exception_handler_1051da0(sp, a0, a1, a2, a3); break;
+      case 0x1051e18:  ret = Cibyl61.do_async_exception_handler_1051e18(sp, a0, a1, a2, a3); break;
+      case 0x1051e74:  ret = Cibyl61.roadmap_net_receive_1051e74(sp, a0, a1, a2, a3); break;
+      case 0x1052028:  ret = Cibyl61.roadmap_net_send_1052028(sp, a0, a1, a2, a3); break;
+      case 0x1052260:  ret = Cibyl61.do_async_connect_cb_1052260(sp, a0, a1, a2, a3); break;
+      case 0x1052328:  ret = Cibyl61.T_49_1052328(sp, a0, a1, a2, a3); break;
+      case 0x1052364:  ret = Cibyl61.roadmap_net_connect_async_1052364(sp, a0, a1, a2, a3); break;
+      case 0x1052a6c:  ret = Cibyl61.roadmap_tile_initialize_1052a6c(); break;
+      case 0x1052a74:  ret = Cibyl61.roadmap_tile_shutdown_1052a74( a0); break;
+      case 0x1052a9c:  ret = Cibyl61.roadmap_tile_store_1052a9c( a0, a1, a2, a3); break;
+      case 0x1052ad4:  Cibyl61.roadmap_tile_remove_1052ad4(); break;
+      case 0x1052adc:  Cibyl61.roadmap_tile_remove_all_1052adc(); break;
+      case 0x1052ae4:  ret = Cibyl61.load_index_1052ae4(sp, a0, a1, a2, a3); break;
+      case 0x1052bf4:  ret = Cibyl61.roadmap_tile_load_1052bf4(sp, a0, a1, a2, a3); break;
+      case 0x1052d44:  ret = Cibyl61.roadmap_native_keyboard_enabled_1052d44(); break;
+      case 0x1052d54:  Cibyl61.roadmap_native_keyboard_hide_1052d54(); break;
+      case 0x1052d6c:  ret = Cibyl61.ShowSearchEditbox_1052d6c( a0, a1); break;
+      case 0x1052da8:  ret = Cibyl61.GetEditboxText_1052da8(); break;
+      case 0x1052db4:  ret = Cibyl61.roadmap_is_touchScreen_supported_1052db4(); break;
+      case 0x1052dc4:  ret = Cibyl61.rim_on_editbox_closed_1052dc4(sp, a0, a1, a2, a3); break;
+      case 0x1052e18:  ret = Cibyl61.ShowEditbox_1052e18(sp, a0, a1, a2, a3); break;
+      case 0x1052ef0:  ret = Cibyl61.ResetEditBoxCameraImagePath_1052ef0(); break;
+      case 0x1052f3c:  ret = Cibyl61.rim_on_editboxcamera_closed_1052f3c(sp, a0, a1, a2, a3); break;
+      case 0x1052fb4:  ret = Cibyl61.ShowEditboxCamera_1052fb4(sp, a0, a1, a2, a3); break;
+      case 0x10530e8:  ret = Cibyl61.save_changes_10530e8(sp, a0, a1, a2, a3); break;
+      case 0x1053130:  ret = Cibyl61.on_save_1053130(sp, a0, a1, a2, a3); break;
+      case 0x1053158:  ret = Cibyl61.on_close_dialog_1053158(sp, a0, a1, a2, a3); break;
+      case 0x1053180:  ret = Cibyl61.roadmap_groups_settings_1053180(sp, a0, a1, a2, a3); break;
+      case 0x1053608:  ret = Cibyl62.roadmap_version_write_1053608(sp, a0, a1, a2, a3); break;
+      case 0x105367c:  ret = Cibyl62.roadmap_version_read_105367c(sp, a0, a1, a2, a3); break;
+      case 0x1053720:  ret = Cibyl62.roadmap_message_ticker_height_1053720(sp, a0, a1, a2, a3); break;
+      case 0x1053760:  ret = Cibyl62.roadmap_message_ticker_key_pressed_1053760( a0); break;
+      case 0x10537c0:  ret = Cibyl62.roadmap_message_ticker_short_click_10537c0(sp, a0, a1, a2, a3); break;
+      case 0x1053854:  ret = Cibyl62.roadmap_message_ticker_is_on_1053854(); break;
+      case 0x1053864:  ret = Cibyl62.roadmap_message_ticker_initialize_1053864(sp, a0, a1, a2, a3); break;
+      case 0x1053974:  ret = Cibyl62.roadmap_message_ticker_show_cb_1053974(sp, a0, a1, a2, a3); break;
+      case 0x1053b20:  ret = Cibyl62.roadmap_message_ticker_show_1053b20(sp, a0, a1, a2, a3); break;
+      case 0x1053b40:  ret = Cibyl62.on_resource_downloaded_1053b40(sp, a0, a1, a2, a3); break;
+      case 0x1053bdc:  ret = Cibyl62.roadmap_message_ticker_hide_1053bdc(sp, a0, a1, a2, a3); break;
+      case 0x1053c24:  ret = Cibyl62.roadmap_message_ticker_display_1053c24(sp, a0, a1, a2, a3); break;
+      case 0x1053ec4:  ret = Cibyl62.softkey_callback_1053ec4(sp, a0, a1, a2, a3); break;
+      case 0x1053f2c:  ret = Cibyl62.roadmap_groups_set_num_following_1053f2c( a0); break;
+      case 0x1053f38:  ret = Cibyl62.roadmap_groups_get_num_following_1053f38(); break;
+      case 0x1053f98:  ret = Cibyl62.roadmap_groups_get_active_group_wazer_icon_1053f98(); break;
+      case 0x1053fa4:  ret = Cibyl62.roadmap_groups_display_groups_supported_1053fa4(); break;
+      case 0x1053fac:  Cibyl62.roadmap_groups_term_1053fac(); break;
+      case 0x105426c:  ret = Cibyl62.groups_callback_105426c(sp, a0, a1, a2, a3); break;
+      case 0x1054388:  ret = Cibyl62.roadmap_groups_feature_enabled_1054388(sp, a0, a1, a2, a3); break;
+      case 0x10543bc:  ret = Cibyl62.roadmap_groups_get_url_10543bc(sp, a0, a1, a2, a3); break;
+      case 0x10543e0:  ret = Cibyl62.roadmap_groups_get_show_wazer_config_10543e0(sp, a0, a1, a2, a3); break;
+      case 0x1054444:  ret = Cibyl62.roadmap_groups_get_popup_config_1054444(sp, a0, a1, a2, a3); break;
+      case 0x10544c0:  ret = Cibyl62.roadmap_groups_set_show_wazer_config_10544c0(sp, a0, a1, a2, a3); break;
+      case 0x10544e8:  ret = Cibyl62.roadmap_groups_set_popup_config_10544e8(sp, a0, a1, a2, a3); break;
+      case 0x1054510:  ret = Cibyl62.roadmap_groups_alerts_action_1054510(sp, a0, a1, a2, a3); break;
+      case 0x10545f0:  ret = Cibyl62.configure_browser_10545f0(sp, a0, a1, a2, a3); break;
+      case 0x1054654:  ret = Cibyl62.append_current_location_1054654(sp, a0, a1, a2, a3); break;
+      case 0x105475c:  ret = Cibyl62.roadmap_groups_show_group_105475c(sp, a0, a1, a2, a3); break;
+      case 0x10548a8:  ret = Cibyl62.roadmap_groups_show_10548a8(sp, a0, a1, a2, a3); break;
+      case 0x10549cc:  ret = Cibyl62.on_close_cb_10549cc(sp, a0, a1, a2, a3); break;
+      case 0x10549ec:  ret = Cibyl62.roadmap_groups_browser_btn_close_cb_10549ec(sp, a0, a1, a2, a3); break;
+      case 0x1054a0c:  ret = Cibyl62.roadmap_groups_init_1054a0c(sp, a0, a1, a2, a3); break;
+      case 0x1054b38:  ret = Cibyl62.roadmap_groups_add_following_group_name_1054b38(sp, a0, a1, a2, a3); break;
+      case 0x1054ba8:  ret = Cibyl63.roadmap_groups_add_following_group_icon_1054ba8(sp, a0, a1, a2, a3); break;
+      case 0x1054ca8:  ret = Cibyl63.roadmap_groups_set_active_group_icon_1054ca8(sp, a0, a1, a2, a3); break;
+      case 0x1054da0:  ret = Cibyl63.roadmap_groups_set_active_group_name_1054da0(sp, a0, a1, a2, a3); break;
+      case 0x1054df0:  ret = Cibyl63.roadmap_browser_register_launcher_1054df0( a0); break;
+      case 0x1054dfc:  ret = Cibyl63.roadmap_browser_register_close_1054dfc( a0); break;
+      case 0x1054e08:  ret = Cibyl63.roadmap_browser_hide_1054e08(sp, a0, a1, a2, a3); break;
+      case 0x1054e50:  ret = Cibyl63.roadmap_browser_set_button_attrs_1054e50(sp, a0, a1, a2, a3); break;
+      case 0x1054eb4:  ret = Cibyl63.roadmap_browser_reset_attributes_1054eb4(sp, a0, a1, a2, a3); break;
+      case 0x1054ed8:  ret = Cibyl63.on_dlg_close_1054ed8(sp, a0, a1, a2, a3); break;
+      case 0x1054f48:  ret = Cibyl63.roadmap_browser_show_embeded_1054f48(sp, a0, a1, a2, a3); break;
+      case 0x1054fc8:  ret = Cibyl63.roadmap_browser_show_ssd_1054fc8(sp, a0, a1, a2, a3); break;
+      case 0x10551fc:  ret = Cibyl63.roadmap_browser_show_extended_10551fc(sp, a0, a1, a2, a3); break;
+      case 0x1055248:  ret = Cibyl63.roadmap_browser_show_1055248(sp, a0, a1, a2, a3); break;
+      case 0x10552b0:  ret = Cibyl63.roadmap_browser_url_handler_10552b0(sp, a0, a1, a2, a3); break;
+      case 0x10554a0:  ret = Cibyl63.roadmap_help_first_topic_10554a0( a0, a1, a2); break;
+      case 0x10554d4:  ret = Cibyl63.roadmap_help_initialize_10554d4(sp, a0, a1, a2, a3); break;
+      case 0x10555bc:  ret = Cibyl63.roadmap_open_help_10555bc(sp, a0, a1, a2, a3); break;
+      case 0x10555e8:  ret = Cibyl63.roadmap_help_about_10555e8(sp, a0, a1, a2, a3); break;
+      case 0x10557a0:  ret = Cibyl63.about_callbak_10557a0(sp, a0, a1, a2, a3); break;
+      case 0x10557c8:  ret = Cibyl63.roadmap_help_next_topic_10557c8(sp, a0, a1, a2, a3); break;
+      case 0x105584c:  ret = Cibyl63.roadmap_help_make_url_105584c(sp, a0, a1, a2, a3); break;
+      case 0x1055928:  ret = Cibyl63.roadmap_help_show_1055928(sp, a0, a1, a2, a3); break;
+      case 0x1055aa8:  ret = Cibyl63.roadmap_help_trips_1055aa8(sp, a0, a1, a2, a3); break;
+      case 0x1055acc:  ret = Cibyl63.roadmap_help_street_1055acc(sp, a0, a1, a2, a3); break;
+      case 0x1055af0:  ret = Cibyl63.roadmap_help_key_1055af0(sp, a0, a1, a2, a3); break;
+      case 0x1055b14:  ret = Cibyl63.roadmap_help_voice_1055b14(sp, a0, a1, a2, a3); break;
+      case 0x1055b38:  ret = Cibyl63.roadmap_help_options_1055b38(sp, a0, a1, a2, a3); break;
+      case 0x1055b5c:  ret = Cibyl63.roadmap_help_install_1055b5c(sp, a0, a1, a2, a3); break;
+      case 0x1055b80:  ret = Cibyl63.on_drive_btn_cb_1055b80(); break;
+      case 0x1055b88:  ret = Cibyl63.navigate_res_dlg_1055b88(sp, a0, a1, a2, a3); break;
+      case 0x1055c9c:  ret = Cibyl63.on_alt_routes_btn_cb_1055c9c(sp, a0, a1, a2, a3); break;
+      case 0x1055d80:  ret = Cibyl63.navigate_res_update_ETA_widget_1055d80(sp, a0, a1, a2, a3); break;
+      case 0x1056014:  ret = Cibyl64.navigate_res_show_ETA_widget_1056014(sp, a0, a1, a2, a3); break;
+      case 0x105604c:  ret = Cibyl64.navigate_res_hide_ETA_widget_105604c(sp, a0, a1, a2, a3); break;
+      case 0x1056084:  ret = Cibyl64.T_58_1056084(sp, a0, a1, a2, a3); break;
+      case 0x10560e0:  ret = Cibyl64.navigate_res_ETA_widget_10560e0(sp, a0, a1, a2, a3); break;
+      case 0x105645c:  ret = Cibyl64.navigate_segment_func_105645c( a0, a1); break;
+      case 0x10564bc:  ret = Cibyl64.navigate_line_in_route_10564bc( a0, a1, a2, a3); break;
+      case 0x10565cc:  ret = Cibyl64.navigate_track_enabled_10565cc(); break;
+      case 0x10565dc:  ret = Cibyl64.navigate_main_alt_routes_display_10565dc(); break;
+      case 0x10565ec:  ret = Cibyl64.navigate_main_is_alt_routes_10565ec(); break;
+      case 0x10565fc:  ret = Cibyl64.navigate_offtrack_10565fc(); break;
+      case 0x105660c:  ret = Cibyl64.navigate_get_waypoint_105660c( a0, a1, a2, a3); break;
+      case 0x1056768:  ret = Cibyl64.navigate_main_nav_resumed_1056768(); break;
+      case 0x10567d0:  ret = Cibyl64.navigate_main_prepare_for_request_10567d0(); break;
+      case 0x10567e8:  ret = Cibyl64.navigate_main_outline_iterator_10567e8( a0, a1); break;
+      case 0x1056838:  ret = Cibyl64.navigate_main_set_dest_pos_1056838( a0); break;
+      case 0x1056884:  ret = Cibyl64.navigate_main_state_1056884(); break;
+      case 0x105689c:  ret = Cibyl64.navigate_main_is_calculating_route_105689c(); break;
+      case 0x10568ac:  ret = Cibyl64.switchETAtoTime_10568ac(); break;
+      case 0x10568c4:  ret = Cibyl64.navigate_main_get_src_position_10568c4(); break;
+      case 0x10569bc:  ret = Cibyl64.navigate_play_sound_10569bc(sp, a0, a1, a2, a3); break;
+      case 0x1056a28:  ret = Cibyl64.refresh_eta_1056a28(sp, a0, a1, a2, a3); break;
+      case 0x1056e1c:  ret = Cibyl64.navigate_main_on_routing_rc_1056e1c(sp, a0, a1, a2, a3); break;
+      case 0x1056e54:  ret = Cibyl64.navigate_main_set_route_1056e54(sp, a0, a1, a2, a3); break;
+      case 0x1056ec4:  ret = Cibyl64.navigate_is_line_on_route_1056ec4(sp, a0, a1, a2, a3); break;
+      case 0x1057090:  ret = Cibyl64.navigate_main_suspend_navigation_1057090(sp, a0, a1, a2, a3); break;
+      case 0x10570d4:  ret = Cibyl64.navigate_progress_message_hide_delayed_10570d4(sp, a0, a1, a2, a3); break;
+      case 0x105718c:  ret = Cibyl64.navigate_progress_message_delayed_105718c(sp, a0, a1, a2, a3); break;
+      case 0x1057224:  ret = Cibyl64.navigate_display_street_1057224(sp, a0, a1, a2, a3); break;
+      case 0x10573ec:  ret = Cibyl64.navigate_is_auto_zoom_10573ec(sp, a0, a1, a2, a3); break;
+      case 0x1057418:  ret = Cibyl65.navigation_guidance_state_1057418(sp, a0, a1, a2, a3); break;
+      case 0x1057444:  ret = Cibyl65.navigate_main_local_calc_enabled_1057444(sp, a0, a1, a2, a3); break;
+      case 0x1057470:  ret = Cibyl65.navgiate_main_voice_guidance_enabled_1057470(sp, a0, a1, a2, a3); break;
+      case 0x105749c:  ret = Cibyl65.navigate_main_ETA_enabled_105749c(sp, a0, a1, a2, a3); break;
+      case 0x10574c8:  ret = Cibyl65.navigate_main_get_follow_gps_10574c8(sp, a0, a1, a2, a3); break;
+      case 0x1057508:  ret = Cibyl65.navigate_main_get_current_time_1057508(sp, a0, a1, a2, a3); break;
+      case 0x105754c:  ret = Cibyl65.navigate_main_calculate_eta_105754c(sp, a0, a1, a2, a3); break;
+      case 0x1057630:  ret = Cibyl65.navigate_main_list_1057630(sp, a0, a1, a2, a3); break;
+      case 0x1057fcc:  ret = Cibyl65.display_pop_up_1057fcc(sp, a0, a1, a2, a3); break;
+      case 0x10581b0:  ret = Cibyl65.navigate_main_list_call_back_10581b0(sp, a0, a1, a2, a3); break;
+      case 0x1058264:  ret = Cibyl65.NavList_OnKeyPressed_1058264(sp, a0, a1, a2, a3); break;
+      case 0x105832c:  ret = Cibyl65.navigate_main_list_hide_105832c(sp, a0, a1, a2, a3); break;
+      case 0x105835c:  ret = Cibyl65.navigate_main_list_state_105835c(sp, a0, a1, a2, a3); break;
+      case 0x1058384:  ret = Cibyl65.navigate_main_is_list_displaying_1058384(sp, a0, a1, a2, a3); break;
+      case 0x10583a4:  ret = Cibyl65.navigate_menu_10583a4(sp, a0, a1, a2, a3); break;
+      case 0x1058420:  ret = Cibyl65.navigate_main_screen_outline_1058420(sp, a0, a1, a2, a3); break;
+      case 0x105857c:  ret = Cibyl65.navigate_main_screen_repaint_105857c(sp, a0, a1, a2, a3); break;
+      case 0x1058a64:  ret = Cibyl66.navigate_main_draw_route_number_1058a64(sp, a0, a1, a2, a3); break;
+      case 0x1058c78:  ret = Cibyl66.navigate_main_set_outline_1058c78(sp, a0, a1, a2, a3); break;
+      case 0x1058d60:  ret = Cibyl66.navigate_main_init_pens_1058d60(sp, a0, a1, a2, a3); break;
+      case 0x1058f9c:  ret = Cibyl66.navigate_main_initialize_1058f9c(sp, a0, a1, a2, a3); break;
+      case 0x10592c4:  ret = Cibyl66.navigation_guidance_off_10592c4(sp, a0, a1, a2, a3); break;
+      case 0x10592f8:  ret = Cibyl66.navigation_guidance_on_10592f8(sp, a0, a1, a2, a3); break;
+      case 0x105932c:  ret = Cibyl66.toggle_navigation_guidance_105932c(sp, a0, a1, a2, a3); break;
+      case 0x10593a8:  ret = Cibyl66.navigate_main_shutdown_10593a8(sp, a0, a1, a2, a3); break;
+      case 0x105945c:  ret = Cibyl66.navigate_main_stop_navigation_105945c(sp, a0, a1, a2, a3); break;
+      case 0x10594d4:  ret = Cibyl66.navigate_update_10594d4(sp, a0, a1, a2, a3); break;
+      case 0x1059f7c:  ret = Cibyl67.navigate_main_stop_navigation_menu_1059f7c(sp, a0, a1, a2, a3); break;
+      case 0x1059fb4:  ret = Cibyl67.navigate_main_update_route_1059fb4(sp, a0, a1, a2, a3); break;
+      case 0x105a008:  ret = Cibyl67.navigate_update_next_105a008(sp, a0, a1, a2, a3); break;
+      case 0x105a24c:  ret = Cibyl67.navigate_main_get_distance_str_105a24c(sp, a0, a1, a2, a3); break;
+      case 0x105a404:  ret = Cibyl67.navigate_main_format_messages_105a404(sp, a0, a1, a2, a3); break;
+      case 0x105a620:  ret = Cibyl67.T_391_105a620(sp, a0, a1, a2, a3); break;
+      case 0x105abc8:  ret = Cibyl67.navigate_main_recalc_route_105abc8(sp, a0, a1, a2, a3); break;
+      case 0x105b184:  ret = Cibyl67.navigate_main_on_segment_ver_mismatch_105b184(sp, a0, a1, a2, a3); break;
+      case 0x105b2b4:  ret = Cibyl68.navigate_main_on_suggest_reroute_105b2b4(sp, a0, a1, a2, a3); break;
+      case 0x105b434:  ret = Cibyl68.navigate_get_next_line_105b434(sp, a0, a1, a2, a3); break;
+      case 0x105bd68:  ret = Cibyl68.navigate_main_on_route_105bd68(sp, a0, a1, a2, a3); break;
+      case 0x105c1b4:  ret = Cibyl68.navigate_main_on_segments_105c1b4(sp, a0, a1, a2, a3); break;
+      case 0x105c358:  ret = Cibyl68.navigate_main_calc_route_105c358(sp, a0, a1, a2, a3); break;
+      case 0x105c970:  ret = Cibyl69.navigate_main_route_105c970(sp, a0, a1, a2, a3); break;
+      case 0x105c9ac:  ret = Cibyl69.navigate_resume_navigation_105c9ac(sp, a0, a1, a2, a3); break;
+      case 0x105ca30:  ret = Cibyl69.navigate_main_login_cb_105ca30(sp, a0, a1, a2, a3); break;
+      case 0x105ca94:  ret = Cibyl69.main_navigator_105ca94(sp, a0, a1, a2, a3); break;
+      case 0x105cb6c:  ret = Cibyl69.navigate_instr_has_more_connections_105cb6c(sp, a0, a1, a2, a3); break;
+      case 0x105cc90:  ret = Cibyl69.navigate_instr_calc_azymuth_105cc90(sp, a0, a1, a2, a3); break;
+      case 0x105ce0c:  ret = Cibyl69.navigate_instr_fill_segment_105ce0c(sp, a0, a1, a2, a3); break;
+      case 0x105cf24:  ret = Cibyl69.navigate_instr_check_neighbours_105cf24(sp, a0, a1, a2, a3); break;
+      case 0x105d2d0:  ret = Cibyl69.navigate_instr_calc_cross_time_105d2d0(sp, a0, a1, a2, a3); break;
+      case 0x105d464:  ret = Cibyl69.navigate_instr_calc_length_105d464(sp, a0, a1, a2, a3); break;
+      case 0x105d4fc:  ret = Cibyl69.navigate_instr_fix_line_end_105d4fc(sp, a0, a1, a2, a3); break;
+      case 0x105d858:  ret = Cibyl69.navigate_instr_prepare_segments_105d858(sp, a0, a1, a2, a3); break;
+      case 0x105e29c:  ret = Cibyl70.navigate_bar_is_hidden_105e29c(); break;
+      case 0x105e2ac:  ret = Cibyl70.navigate_bar_set_instruction_105e2ac( a0); break;
+      case 0x105e2b8:  ret = Cibyl70.navigate_bar_set_next_instruction_105e2b8( a0); break;
+      case 0x105e2c4:  ret = Cibyl70.navigate_bar_set_exit_105e2c4( a0); break;
+      case 0x105e2d0:  ret = Cibyl70.navigate_bar_set_next_exit_105e2d0( a0); break;
+      case 0x105e2dc:  ret = Cibyl70.navigate_bar_set_distance_105e2dc( a0); break;
+      case 0x105e2e8:  ret = Cibyl70.navigate_bar_set_next_distance_105e2e8( a0); break;
+      case 0x105e2f4:  ret = Cibyl70.navigate_bar_set_mode_105e2f4( a0); break;
+      case 0x105e314:  ret = Cibyl70.navigate_bar_draw_105e314(sp, a0, a1, a2, a3); break;
+      case 0x105e530:  ret = Cibyl70.navigate_bar_set_street_105e530(sp, a0, a1, a2, a3); break;
+      case 0x105e57c:  ret = Cibyl70.navigate_bar_draw_instruction_105e57c(sp, a0, a1, a2, a3); break;
+      case 0x105e648:  ret = Cibyl70.navigate_bar_align_text_105e648(sp, a0, a1, a2, a3); break;
+      case 0x105e848:  ret = Cibyl70.navigate_bar_draw_exit_105e848(sp, a0, a1, a2, a3); break;
+      case 0x105e928:  ret = Cibyl70.navigate_bar_draw_ETA_105e928(sp, a0, a1, a2, a3); break;
+      case 0x105eb14:  ret = Cibyl70.navigate_bar_draw_distance_to_destination_105eb14(sp, a0, a1, a2, a3); break;
+      case 0x105eda0:  ret = Cibyl70.navigate_bar_draw_time_to_destination_105eda0(sp, a0, a1, a2, a3); break;
+      case 0x105f004:  ret = Cibyl70.CreateBgImage_105f004(sp, a0, a1, a2, a3); break;
+      case 0x105f0b0:  ret = Cibyl70.navigate_bar_resize_105f0b0(sp, a0, a1, a2, a3); break;
+      case 0x105f3b4:  ret = Cibyl70.navigate_bar_initialize_105f3b4(sp, a0, a1, a2, a3); break;
+      case 0x105f52c:  ret = Cibyl71.T_159_105f52c(sp, a0, a1, a2, a3); break;
+      case 0x105f864:  ret = Cibyl71.navigate_bar_after_refresh_105f864(sp, a0, a1, a2, a3); break;
+      case 0x105fe00:  ret = Cibyl71.navigate_zoom_update_105fe00( a0, a1, a2, a3); break;
+      case 0x105fec4:  ret = Cibyl71.navigate_zoom_get_scale_105fec4(); break;
+      case 0x105fef4:  ret = Cibyl71.navigate_plugin_register_105fef4(sp, a0, a1, a2, a3); break;
+      case 0x105ff18:  ret = Cibyl71.navigate_traffic_refresh_105ff18(sp, a0, a1, a2, a3); break;
+      case 0x105ff5c:  ret = Cibyl71.navigate_traffic_override_pen_105ff5c(sp, a0, a1, a2, a3); break;
+      case 0x1060290:  ret = Cibyl71.navigate_traffic_display_1060290(sp, a0, a1, a2, a3); break;
+      case 0x10602e8:  ret = Cibyl71.create_pens_10602e8(sp, a0, a1, a2, a3); break;
+      case 0x10603e0:  ret = Cibyl71.navigate_traffic_initialize_10603e0(sp, a0, a1, a2, a3); break;
+      case 0x10604c4:  ret = Cibyl71.create_pens_cb_10604c4(sp, a0, a1, a2, a3); break;
+      case 0x10604e4:  ret = Cibyl71.navigate_traffic_adjust_layer_10604e4(sp, a0, a1, a2, a3); break;
+      case 0x1060898:  ret = Cibyl71.button_callback_1060898(sp, a0, a1, a2, a3); break;
+      case 0x106092c:  ret = Cibyl71.free_cache_slot_106092c(sp, a0, a1, a2, a3); break;
+      case 0x10609a8:  ret = Cibyl71.navigate_graph_clear_10609a8(sp, a0, a1, a2, a3); break;
+      case 0x1060a9c:  ret = Cibyl72.extend_segment_1060a9c(sp, a0, a1, a2, a3); break;
+      case 0x1060b1c:  ret = Cibyl72.T_88_1060b1c(sp, a0, a1, a2, a3); break;
+      case 0x1060b60:  ret = Cibyl72.get_square_graph_1060b60(sp, a0, a1, a2, a3); break;
+      case 0x106105c:  ret = Cibyl72.get_connected_segments_106105c(sp, a0, a1, a2, a3); break;
+      case 0x106132c:  ret = Cibyl72.navigate_cost_use_traffic_106132c(); break;
+      case 0x1061334:  ret = Cibyl72.navigate_cost_reset_1061334(); break;
+      case 0x1061350:  ret = Cibyl72.navigate_cost_isPalestinianOptionEnabled_1061350(sp, a0, a1, a2, a3); break;
+      case 0x106137c:  ret = Cibyl72.navigate_cost_type_106137c(sp, a0, a1, a2, a3); break;
+      case 0x10613b0:  ret = Cibyl72.navigate_cost_get_10613b0(sp, a0, a1, a2, a3); break;
+      case 0x10613ec:  ret = Cibyl72.navigate_cost_allow_unknowns_10613ec(sp, a0, a1, a2, a3); break;
+      case 0x1061418:  ret = Cibyl72.navigate_cost_avoid_palestinian_roads_1061418(sp, a0, a1, a2, a3); break;
+      case 0x1061444:  ret = Cibyl72.navigate_cost_avoid_trails_1061444(sp, a0, a1, a2, a3); break;
+      case 0x1061498:  ret = Cibyl72.navigate_cost_prefer_unknown_directions_1061498(sp, a0, a1, a2, a3); break;
+      case 0x10614c4:  ret = Cibyl72.navigate_cost_avoid_toll_roads_10614c4(sp, a0, a1, a2, a3); break;
+      case 0x10614f0:  ret = Cibyl72.navigate_cost_avoid_primaries_10614f0(sp, a0, a1, a2, a3); break;
+      case 0x106151c:  ret = Cibyl72.navigate_cost_prefer_same_street_106151c(sp, a0, a1, a2, a3); break;
+      case 0x1061548:  ret = Cibyl72.navigate_cost_initialize_1061548(sp, a0, a1, a2, a3); break;
+      case 0x106174c:  ret = Cibyl72.save_changes_106174c(sp, a0, a1, a2, a3); break;
+      case 0x1061874:  ret = Cibyl72.on_save_1061874(sp, a0, a1, a2, a3); break;
+      case 0x10618b4:  ret = Cibyl72.on_close_dialog_10618b4(sp, a0, a1, a2, a3); break;
+      case 0x10618f4:  ret = Cibyl72.calc_penalty_10618f4(sp, a0, a1, a2, a3); break;
+      case 0x10619cc:  ret = Cibyl72.cost_fastest_traffic_10619cc(sp, a0, a1, a2, a3); break;
+      case 0x1061d30:  ret = Cibyl73.navigate_cost_time_1061d30(sp, a0, a1, a2, a3); break;
+      case 0x1061d5c:  ret = Cibyl73.cost_shortest_1061d5c(sp, a0, a1, a2, a3); break;
+      case 0x1061de0:  ret = Cibyl73.cost_fastest_1061de0(sp, a0, a1, a2, a3); break;
+      case 0x1061ed0:  ret = Cibyl73.T_82_1061ed0(sp, a0, a1, a2, a3); break;
+      case 0x1061f1c:  ret = Cibyl73.cost_preferences_1061f1c(sp, a0, a1, a2, a3); break;
+      case 0x10629ac:  ret = Cibyl73.navigate_route_reload_data_10629ac(); break;
+      case 0x10629b4:  ret = Cibyl73.navigate_route_load_data_10629b4(); break;
+      case 0x10629bc:  ret = Cibyl73.make_path_10629bc(sp, a0, a1, a2, a3); break;
+      case 0x1062b44:  ret = Cibyl73.find_prev_1062b44(sp, a0, a1, a2, a3); break;
+      case 0x1062c34:  ret = Cibyl73.make_queue_1062c34(sp, a0, a1, a2, a3); break;
+      case 0x1062c80:  ret = Cibyl73.astar_1062c80(sp, a0, a1, a2, a3); break;
+      case 0x106355c:  ret = Cibyl74.navigate_route_get_segments_106355c(sp, a0, a1, a2, a3); break;
+      case 0x1063af8:  ret = Cibyl74.verify_route_id_1063af8(sp, a0, a1, a2, a3); break;
+      case 0x1063be0:  ret = Cibyl74.on_suggest_reroute_1063be0(sp, a0, a1, a2, a3); break;
+      case 0x1063d98:  ret = Cibyl74.verify_alt_id_1063d98(sp, a0, a1, a2, a3); break;
+      case 0x1063ec4:  ret = Cibyl74.free_result_1063ec4(sp, a0, a1, a2, a3); break;
+      case 0x1063f74:  ret = Cibyl74.navigate_route_free_context_1063f74(sp, a0, a1, a2, a3); break;
+      case 0x1063fd0:  ret = Cibyl74.navigate_route_init_context_1063fd0(sp, a0, a1, a2, a3); break;
+      case 0x1064048:  ret = Cibyl74.navigate_route_cancel_request_1064048(sp, a0, a1, a2, a3); break;
+      case 0x1064084:  ret = Cibyl74.navigate_route_select_1064084(sp, a0, a1, a2, a3); break;
+      case 0x10641c8:  ret = Cibyl74.routing_error_10641c8(sp, a0, a1, a2, a3); break;
+      case 0x1064234:  ret = Cibyl74.navigate_route_request_1064234(sp, a0, a1, a2, a3); break;
+      case 0x1064724:  ret = Cibyl75.on_routing_response_code_1064724(sp, a0, a1, a2, a3); break;
+      case 0x106492c:  ret = Cibyl75.on_route_points_106492c(sp, a0, a1, a2, a3); break;
+      case 0x1064d0c:  ret = Cibyl75.request_tile_1064d0c(sp, a0, a1, a2, a3); break;
+      case 0x1064dbc:  ret = Cibyl75.instrument_segments_1064dbc(sp, a0, a1, a2, a3); break;
+      case 0x1065658:  ret = Cibyl75.on_route_segments_1065658(sp, a0, a1, a2, a3); break;
+      case 0x1066174:  ret = Cibyl76.instrument_segments_cb_1066174(sp, a0, a1, a2, a3); break;
+      case 0x10661f4:  ret = Cibyl76.on_routing_response_10661f4(sp, a0, a1, a2, a3); break;
+      case 0x106675c:  ret = Cibyl76.fh_minkey_106675c( a0); break;
+      case 0x1066778:  ret = Cibyl76.fh_min_1066778( a0); break;
+      case 0x10667a0:  ret = Cibyl76.fh_find_data_el_10667a0(sp, a0, a1, a2, a3); break;
+      case 0x1066890:  ret = Cibyl76.fh_cut_1066890( a0, a1, a2, a3); break;
+      case 0x1066948:  ret = Cibyl76.fh_compare_1066948(sp, a0, a1, a2, a3); break;
+      case 0x10669a8:  ret = Cibyl76.fh_insertel_10669a8(sp, a0, a1, a2, a3); break;
+      case 0x1066a94:  ret = Cibyl76.fh_extractminel_1066a94(sp, a0, a1, a2, a3); break;
+      case 0x1066ee8:  ret = Cibyl76.fh_extractmin_1066ee8(sp, a0, a1, a2, a3); break;
+      case 0x1066f3c:  ret = Cibyl76.fh_replacekeydata_1066f3c(sp, a0, a1, a2, a3); break;
+      case 0x1067070:  ret = Cibyl76.fh_replacedata_1067070(sp, a0, a1, a2, a3); break;
+      case 0x1067098:  ret = Cibyl76.fh_replacekey_1067098(sp, a0, a1, a2, a3); break;
+      case 0x1067124:  ret = Cibyl76.fhe_newelem_1067124(sp, a0, a1, a2, a3); break;
+      case 0x10671d4:  ret = Cibyl76.fh_insertkey_10671d4(sp, a0, a1, a2, a3); break;
+      case 0x1067284:  ret = Cibyl76.fh_makekeyheap_1067284(sp, a0, a1, a2, a3); break;
+      case 0x10672dc:  ret = Cibyl76.fh_destroyheap_10672dc(sp, a0, a1, a2, a3); break;
+      case 0x10673f8:  ret = Cibyl76.fh_deleteheap_10673f8(sp, a0, a1, a2, a3); break;
+      case 0x1067444:  ret = Cibyl76.ebuffer_get_buffer_1067444( a0); break;
+      case 0x10674f4:  ret = Cibyl76.ebuffer_init_10674f4(sp, a0, a1, a2, a3); break;
+      case 0x1067518:  ret = Cibyl76.ebuffer_free_1067518(sp, a0, a1, a2, a3); break;
+      case 0x106756c:  ret = Cibyl76.ebuffer_alloc_106756c(sp, a0, a1, a2, a3); break;
+      case 0x106763c:  ret = Cibyl77.socket_async_receive_106763c(sp, a0, a1, a2, a3); break;
+      case 0x1067784:  ret = Cibyl77.on_socket_has_data_1067784(sp, a0, a1, a2, a3); break;
+      case 0x1067854:  ret = Cibyl77.socket_async_receive_end_1067854(sp, a0, a1, a2, a3); break;
+      case 0x1067b74:  ret = Cibyl77.PackNetworkString_1067b74( a0, a1, a2, a3); break;
+      case 0x1067ce0:  ret = Cibyl77.ToLowerN_1067ce0(sp, a0, a1, a2, a3); break;
+      case 0x10680a8:  ret = Cibyl77.AppendPrefix_ShiftOriginalRight_10680a8(sp, a0, a1, a2, a3); break;
+      case 0x1068110:  ret = Cibyl77.SkipChars_1068110(sp, a0, a1, a2, a3); break;
+      case 0x10681b8:  ret = Cibyl77.EatChars_10681b8(sp, a0, a1, a2, a3); break;
+      case 0x1068260:  ret = Cibyl77.ExtractNetworkString_1068260(sp, a0, a1, a2, a3); break;
+      case 0x1068444:  ret = Cibyl77.ExtractString_1068444(sp, a0, a1, a2, a3); break;
+      case 0x106856c:  ret = Cibyl77.ReadIntFromString_106856c(sp, a0, a1, a2, a3); break;
+      case 0x10686c8:  ret = Cibyl77.ReadInt64FromString_10686c8(sp, a0, a1, a2, a3); break;
+      case 0x106886c:  ret = Cibyl77.ReadDoubleFromString_106886c(sp, a0, a1, a2, a3); break;
+      case 0x1068a98:  ret = Cibyl77.WSA_ExtractParams_1068a98(sp, a0, a1, a2, a3); break;
+      case 0x1068c84:  ret = Cibyl77.wstq_is_empty_1068c84( a0); break;
+      case 0x1068c90:  ret = Cibyl77.wstq_enqueue_1068c90(sp, a0, a1, a2, a3); break;
+      case 0x1068dac:  ret = Cibyl77.wstq_init_1068dac(sp, a0, a1, a2, a3); break;
+      case 0x1068dd0:  Cibyl77.wstq_item_init_1068dd0( a0); break;
+      case 0x1068dec:  ret = Cibyl77.wstq_dequeue_1068dec(sp, a0, a1, a2, a3); break;
+      case 0x1068ef4:  ret = Cibyl78.wstq_item_release_1068ef4(sp, a0, a1, a2, a3); break;
+      case 0x1068f34:  ret = Cibyl78.wstq_clear_1068f34(sp, a0, a1, a2, a3); break;
+      case 0x1068f9c:  ret = Cibyl78.wst_get_trans_state_1068f9c( a0); break;
+      case 0x1068fa8:  ret = Cibyl78.wst_stop_trans_1068fa8( a0); break;
+      case 0x1068fc4:  ret = Cibyl78.websvc_trans_getLastNetConnectRes_1068fc4(); break;
+      case 0x1068fd4:  ret = Cibyl78.http_response_status_init_1068fd4(sp, a0, a1, a2, a3); break;
+      case 0x1068ff8:  ret = Cibyl78.http_response_status_load_1068ff8(sp, a0, a1, a2, a3); break;
+      case 0x106913c:  ret = Cibyl78.OnCustomResponse_106913c(sp, a0, a1, a2, a3); break;
+      case 0x10694d8:  ret = Cibyl78.OnHTTPHeader_10694d8(sp, a0, a1, a2, a3); break;
+      case 0x10698a4:  ret = Cibyl78.wst_Send_10698a4(sp, a0, a1, a2, a3); break;
+      case 0x10699a4:  ret = Cibyl78.cont_10699a4(sp, a0, a1, a2, a3); break;
+      case 0x1069d58:  ret = Cibyl78.on_data_received__1069d58(sp, a0, a1, a2, a3); break;
+      case 0x1069ef4:  ret = Cibyl78.wst_Receive_1069ef4(sp, a0, a1, a2, a3); break;
+      case 0x1069f94:  ret = Cibyl78.on_socket_connected__1069f94(sp, a0, a1, a2, a3); break;
+      case 0x106a0a4:  ret = Cibyl78.wstq_Add_106a0a4(sp, a0, a1, a2, a3); break;
+      case 0x106a1bc:  ret = Cibyl79.wst_queue_clear_106a1bc(sp, a0, a1, a2, a3); break;
+      case 0x106a1dc:  ret = Cibyl79.wst_context_reset_106a1dc(sp, a0, a1, a2, a3); break;
+      case 0x106a274:  ret = Cibyl79.wst_context_load_106a274(sp, a0, a1, a2, a3); break;
+      case 0x106a2cc:  ret = Cibyl79.wst_start_trans__int_106a2cc(sp, a0, a1, a2, a3); break;
+      case 0x106a4b4:  ret = Cibyl79.wst_start_trans_106a4b4(sp, a0, a1, a2, a3); break;
+      case 0x106a678:  ret = Cibyl79.wst_process_queue_item_106a678(sp, a0, a1, a2, a3); break;
+      case 0x106a754:  ret = Cibyl79.wst_context_init_106a754(sp, a0, a1, a2, a3); break;
+      case 0x106a798:  ret = Cibyl79.wst_init_106a798(sp, a0, a1, a2, a3); break;
+      case 0x106a820:  ret = Cibyl79.wst_context_free_106a820(sp, a0, a1, a2, a3); break;
+      case 0x106a88c:  ret = Cibyl79.wst_transaction_completed_106a88c(sp, a0, a1, a2, a3); break;
+      case 0x106a964:  ret = Cibyl79.on_data_received_106a964(sp, a0, a1, a2, a3); break;
+      case 0x106a9d0:  ret = Cibyl79.on_socket_connected_106a9d0(sp, a0, a1, a2, a3); break;
+      case 0x106aa28:  ret = Cibyl79.wst_watchdog_106aa28(sp, a0, a1, a2, a3); break;
+      case 0x106aa9c:  ret = Cibyl79.wst_term_106aa9c(sp, a0, a1, a2, a3); break;
+      case 0x106ab18:  ret = Cibyl79.WDF_FormatHttpDate_106ab18(sp, a0, a1, a2, a3); break;
+      case 0x106abb0:  ret = Cibyl79.WDF_TimeFromModifiedSince_106abb0(sp, a0, a1, a2, a3); break;
+      case 0x106abf4:  ret = Cibyl79.WDF_FormatHttpIfModifiedSince_106abf4(sp, a0, a1, a2, a3); break;
+      case 0x106ac5c:  ret = Cibyl79.cyclic_buffer_get_unprocessed_data_106ac5c( a0); break;
+      case 0x106ac68:  ret = Cibyl79.cyclic_buffer_update_processed_data_106ac68(sp, a0, a1, a2, a3); break;
+      case 0x106acb4:  ret = Cibyl79.cyclic_buffer_recycle_106acb4(sp, a0, a1, a2, a3); break;
+      case 0x106ad48:  ret = Cibyl79.cyclic_buffer_init_106ad48(sp, a0, a1, a2, a3); break;
+      case 0x106ad94:  ret = Cibyl79.mkgmtime_106ad94(sp, a0, a1, a2, a3); break;
+      case 0x106b020:  ret = Cibyl79.Realtime_NotifyOnLoginChanged_106b020( a0); break;
+      case 0x106b0c4:  ret = Cibyl79.Realtime_WazerNearbyState_106b0c4(); break;
+      case 0x106b0d4:  ret = Cibyl79.Realtime_SendTrafficInfo_106b0d4(); break;
+      case 0x106b0dc:  ret = Cibyl79.Realtime_IsLoggedIn_106b0dc(); break;
+      case 0x106b0fc:  ret = Cibyl79.RealTime_GetMyRanking_106b0fc(); break;
+      case 0x106b10c:  ret = Cibyl79.RealTime_SetMapDisplayed_106b10c( a0); break;
+      case 0x106b134:  ret = Cibyl79.Realtime_GetServerCookie_106b134(); break;
+      case 0x106b140:  ret = Cibyl79.Realtime_GetServerId_106b140(); break;
+      case 0x106b150:  ret = Cibyl79.Realtime_AddonState_106b150(); break;
+      case 0x106b16c:  ret = Cibyl79.onRandomConfirm_106b16c(sp, a0, a1, a2, a3); break;
+      case 0x106b194:  ret = Cibyl79.Realtime_IsAnonymous_106b194(sp, a0, a1, a2, a3); break;
+      case 0x106b1c0:  ret = Cibyl79.Realtime_AnonymousMsg_106b1c0(sp, a0, a1, a2, a3); break;
+      case 0x106b204:  ret = Cibyl79.Realtime_GetNickName_106b204(sp, a0, a1, a2, a3); break;
+      case 0x106b228:  ret = Cibyl79.RealTime_GetUserName_106b228(sp, a0, a1, a2, a3); break;
+      case 0x106b24c:  ret = Cibyl79.RT_GetWebServiceAddress_106b24c(sp, a0, a1, a2, a3); break;
+      case 0x106b270:  ret = Cibyl79.Realtime_AllowPing_106b270(sp, a0, a1, a2, a3); break;
+      case 0x106b2a4:  ret = Cibyl79.NameAndPasswordAlreadyFailedAuthentication_106b2a4(sp, a0, a1, a2, a3); break;
+      case 0x106b334:  ret = Cibyl79.GetEnableDisableState_106b334(sp, a0, a1, a2, a3); break;
+      case 0x106b388:  ret = Cibyl79.Realtime_SaveLoginInfo_106b388(sp, a0, a1, a2, a3); break;
+      case 0x106b404:  ret = Cibyl79.Realtime_CheckDumpOfflineAfterCrash_106b404(sp, a0, a1, a2, a3); break;
+      case 0x106b468:  ret = Cibyl79.Realtime_Set_AllowPing_106b468(sp, a0, a1, a2, a3); break;
+      case 0x106b4b4:  ret = Cibyl79.Realtime_SetLoginNickname_106b4b4(sp, a0, a1, a2, a3); break;
+      case 0x106b4dc:  ret = Cibyl79.Realtime_SetLoginPassword_106b4dc(sp, a0, a1, a2, a3); break;
+      case 0x106b504:  ret = Cibyl79.Realtime_SetLoginUsername_106b504(sp, a0, a1, a2, a3); break;
+      case 0x106b52c:  ret = Cibyl79.Realtime_LoginDetailsInit_106b52c(sp, a0, a1, a2, a3); break;
+      case 0x106b59c:  ret = Cibyl79.Realtime_SetIsNewbieConfig_106b59c(sp, a0, a1, a2, a3); break;
+      case 0x106b600:  ret = Cibyl80.Realtime_SetIsNewbie_106b600(sp, a0, a1, a2, a3); break;
+      case 0x106b638:  ret = Cibyl80.Realtime_set_random_user_106b638(sp, a0, a1, a2, a3); break;
+      case 0x106b668:  ret = Cibyl80.Realtime_IsNewbie_106b668(sp, a0, a1, a2, a3); break;
+      case 0x106b68c:  ret = Cibyl80.Realtime_is_random_user_106b68c(sp, a0, a1, a2, a3); break;
+      case 0x106b6b0:  ret = Cibyl80.Realtime_RandomUserMsg_106b6b0(sp, a0, a1, a2, a3); break;
+      case 0x106b720:  ret = Cibyl80.RecommentToFriend_106b720(sp, a0, a1, a2, a3); break;
+      case 0x106b75c:  ret = Cibyl80.UpgradeVersion_106b75c(sp, a0, a1, a2, a3); break;
+      case 0x106b7c4:  ret = Cibyl80.recommend_waze_dialog_callbak_106b7c4(sp, a0, a1, a2, a3); break;
+      case 0x106b818:  ret = Cibyl80.Realtime_NotifySplashUpdateTime_106b818(sp, a0, a1, a2, a3); break;
+      case 0x106b874:  ret = Cibyl80.ThereAreTooManyNetworkErrors_106b874(sp, a0, a1, a2, a3); break;
+      case 0x106b91c:  ret = Cibyl80.Realtime_ExternalPoiNotifyOnNavigate_106b91c(sp, a0, a1, a2, a3); break;
+      case 0x106b978:  ret = Cibyl80.Realtime_ExternalPoiNotifyOnPopUp_106b978(sp, a0, a1, a2, a3); break;
+      case 0x106b9d4:  ret = Cibyl80.Realtime_FacebookPermissions_106b9d4(sp, a0, a1, a2, a3); break;
+      case 0x106ba4c:  ret = Cibyl80.Realtime_ReportAbuse_106ba4c(sp, a0, a1, a2, a3); break;
+      case 0x106bb14:  ret = Cibyl80.Realtime_CollectCustomBonus_106bb14(sp, a0, a1, a2, a3); break;
+      case 0x106bba4:  ret = Cibyl80.Realtime_CollectBonus_106bba4(sp, a0, a1, a2, a3); break;
+      case 0x106bc3c:  ret = Cibyl80.Realtime_SelectRoute_106bc3c(sp, a0, a1, a2, a3); break;
+      case 0x106bcb0:  ret = Cibyl80.Realtime_GetGeoConfig_106bcb0(sp, a0, a1, a2, a3); break;
+      case 0x106bcf0:  ret = Cibyl80.Realtime_RequestRoute_106bcf0(sp, a0, a1, a2, a3); break;
+      case 0x106be6c:  ret = Cibyl80.Realtime_ReportOnNavigation_106be6c(sp, a0, a1, a2, a3); break;
+      case 0x106bfb8:  ret = Cibyl80.LoginDetailsChanged_106bfb8(sp, a0, a1, a2, a3); break;
+      case 0x106c0b0:  ret = Cibyl80.Realtime_ResetLoginState_106c0b0(sp, a0, a1, a2, a3); break;
+      case 0x106c144:  ret = Cibyl80.Login_106c144(sp, a0, a1, a2, a3); break;
+      case 0x106c244:  ret = Cibyl80.Realtime_Relogin_106c244(sp, a0, a1, a2, a3); break;
+      case 0x106c27c:  ret = Cibyl80.OnMapMoved_106c27c(sp, a0, a1, a2, a3); break;
+      case 0x106c320:  ret = Cibyl80.Realtime_NotifyOnLogin_106c320(sp, a0, a1, a2, a3); break;
+      case 0x106c3a8:  ret = Cibyl80.Realtime_SessionDetailsSave_106c3a8(sp, a0, a1, a2, a3); break;
+      case 0x106c3f8:  ret = Cibyl80.RealTime_WarningInit_106c3f8(sp, a0, a1, a2, a3); break;
+      case 0x106c420:  ret = Cibyl80.Realtime_LoginChangedCallback_106c420(sp, a0, a1, a2, a3); break;
+      case 0x106c468:  ret = Cibyl80.Realtime_LoginCallback_106c468(sp, a0, a1, a2, a3); break;
+      case 0x106c4e0:  ret = Cibyl80.TestLoginDetailsCompleted_106c4e0(sp, a0, a1, a2, a3); break;
+      case 0x106c538:  ret = Cibyl80.TestLoginDetails_106c538(sp, a0, a1, a2, a3); break;
+      case 0x106c614:  ret = Cibyl80.Realtime_VerifyLoginDetails_106c614(sp, a0, a1, a2, a3); break;
+      case 0x106c6a0:  ret = Cibyl80.RemoveWazerNearby_106c6a0(sp, a0, a1, a2, a3); break;
+      case 0x106c708:  ret = Cibyl80.wazer_nearby_timeout_106c708(sp, a0, a1, a2, a3); break;
+      case 0x106c734:  ret = Cibyl80.RealTime_Auth_106c734(sp, a0, a1, a2, a3); break;
+      case 0x106c794:  ret = Cibyl80.RealTimeLoginState_106c794(sp, a0, a1, a2, a3); break;
+      case 0x106c7f8:  ret = Cibyl80.Realtime_UpdateProfile_106c7f8(sp, a0, a1, a2, a3); break;
+      case 0x106c854:  ret = Cibyl80.Realtime_CreateAccount_106c854(sp, a0, a1, a2, a3); break;
+      case 0x106c8b0:  ret = Cibyl81.Realtime_TrafficAlertFeedback_106c8b0(sp, a0, a1, a2, a3); break;
+      case 0x106c8e8:  ret = Cibyl81.Realtime_Report_Segments_106c8e8(sp, a0, a1, a2, a3); break;
+      case 0x106c9e0:  ret = Cibyl81.Realtime_Editor_ExportSegments_106c9e0(sp, a0, a1, a2, a3); break;
+      case 0x106ca84:  ret = Cibyl81.ReportOneMarker_106ca84(sp, a0, a1, a2, a3); break;
+      case 0x106cb48:  ret = Cibyl81.Realtime_Report_Markers_106cb48(sp, a0, a1, a2, a3); break;
+      case 0x106cc1c:  ret = Cibyl81.Realtime_Editor_ExportMarkers_106cc1c(sp, a0, a1, a2, a3); break;
+      case 0x106ccc0:  ret = Cibyl81.Realtime_Remove_Alert_106ccc0(sp, a0, a1, a2, a3); break;
+      case 0x106ccf0:  ret = Cibyl81.SendMessage_CachedMapProblems_106ccf0(sp, a0, a1, a2, a3); break;
+      case 0x106ce38:  ret = Cibyl81.Realtime_ReportMapProblem_106ce38(sp, a0, a1, a2, a3); break;
+      case 0x106cf4c:  ret = Cibyl81.Realtime_SessionDetailsInit_106cf4c(sp, a0, a1, a2, a3); break;
+      case 0x106cfc4:  ret = Cibyl81.RealTime_Warning_106cfc4(sp, a0, a1, a2, a3); break;
+      case 0x106d024:  ret = Cibyl81.Realtime_Alert_ReportAtLocation_106d024(sp, a0, a1, a2, a3); break;
+      case 0x106d0c4:  ret = Cibyl81.Realtime_Post_Alert_Comment_106d0c4(sp, a0, a1, a2, a3); break;
+      case 0x106d134:  ret = Cibyl81.Realtime_TripServer_FindTrip_106d134(sp, a0, a1, a2, a3); break;
+      case 0x106d164:  ret = Cibyl81.Realtime_TripServer_DeletePOI_106d164(sp, a0, a1, a2, a3); break;
+      case 0x106d194:  ret = Cibyl81.Realtime_TripServer_GetNumPOIs_106d194(sp, a0, a1, a2, a3); break;
+      case 0x106d1c0:  ret = Cibyl81.Realtime_TripServer_GetPOIs_106d1c0(sp, a0, a1, a2, a3); break;
+      case 0x106d1ec:  ret = Cibyl81.Realtime_TripServer_CreatePOI_106d1ec(sp, a0, a1, a2, a3); break;
+      case 0x106d284:  ret = Cibyl81.Realtime_FoursquareCheckin_106d284(sp, a0, a1, a2, a3); break;
+      case 0x106d2bc:  ret = Cibyl81.Realtime_FoursquareSearch_106d2bc(sp, a0, a1, a2, a3); break;
+      case 0x106d2ec:  ret = Cibyl81.Realtime_FoursquareConnect_106d2ec(sp, a0, a1, a2, a3); break;
+      case 0x106d330:  ret = Cibyl81.Realtime_TwitterConnect_106d330(sp, a0, a1, a2, a3); break;
+      case 0x106d37c:  ret = Cibyl81.Realtime_SendSMS_106d37c(sp, a0, a1, a2, a3); break;
+      case 0x106d3ac:  ret = Cibyl81.keyboard_callback_106d3ac(sp, a0, a1, a2, a3); break;
+      case 0x106d3fc:  ret = Cibyl81.Realtime_PinqWazer_106d3fc(sp, a0, a1, a2, a3); break;
+      case 0x106d48c:  ret = Cibyl81.Realtime_Report_Alert_106d48c(sp, a0, a1, a2, a3); break;
+      case 0x106d558:  ret = Cibyl81.OnRemoveUser_106d558(sp, a0, a1, a2, a3); break;
+      case 0x106d6c0:  ret = Cibyl81.OnMoveUser_106d6c0(sp, a0, a1, a2, a3); break;
+      case 0x106d8bc:  ret = Cibyl81.OnAddUser_106d8bc(sp, a0, a1, a2, a3); break;
+      case 0x106dd6c:  ret = Cibyl82.OnUserShortClick_106dd6c(sp, a0, a1, a2, a3); break;
+      case 0x106dd98:  ret = Cibyl82.Realtime_ShowWazerNearby_106dd98(sp, a0, a1, a2, a3); break;
+      case 0x106dde4:  ret = Cibyl82.realtime_after_refresh_106dde4(sp, a0, a1, a2, a3); break;
+      case 0x106df4c:  ret = Cibyl82.OnKeepAliveTimer_Realtime_106df4c(sp, a0, a1, a2, a3); break;
+      case 0x106dfa4:  ret = Cibyl82.Realtime_RandomUserRegister_106dfa4(sp, a0, a1, a2, a3); break;
+      case 0x106dfd0:  ret = Cibyl82.Realtime_ResetTransactionState_106dfd0(sp, a0, a1, a2, a3); break;
+      case 0x106e00c:  ret = Cibyl82.OnAsyncOperationCompleted_GetGeoConfig_106e00c(sp, a0, a1, a2, a3); break;
+      case 0x106e064:  ret = Cibyl82.OnAsyncOperationCompleted_Register_106e064(sp, a0, a1, a2, a3); break;
+      case 0x106e1a0:  ret = Cibyl82.Realtime_SendCurrenScreenEdges_106e1a0(sp, a0, a1, a2, a3); break;
+      case 0x106e260:  ret = Cibyl82.Realtime_SendCurrentViewDimentions_106e260(sp, a0, a1, a2, a3); break;
+      case 0x106e3d8:  ret = Cibyl82.OnTimePassedFromLastMapDragEvent_106e3d8(sp, a0, a1, a2, a3); break;
+      case 0x106e454:  ret = Cibyl82.SendMessage_UserPoints_106e454(sp, a0, a1, a2, a3); break;
+      case 0x106e4fc:  ret = Cibyl82.SendMessage_Location_106e4fc(sp, a0, a1, a2, a3); break;
+      case 0x106e58c:  ret = Cibyl82.OnLocation_106e58c(sp, a0, a1, a2, a3); break;
+      case 0x106e5ec:  ret = Cibyl82.SendMessage_SetMood_106e5ec(sp, a0, a1, a2, a3); break;
+      case 0x106e660:  ret = Cibyl82.OnMoodChanged_106e660(sp, a0, a1, a2, a3); break;
+      case 0x106e68c:  ret = Cibyl82.SendMessage_SetMyVisability_106e68c(sp, a0, a1, a2, a3); break;
+      case 0x106e8bc:  ret = Cibyl82.OnSettingsChanged_VisabilityGroup_106e8bc(sp, a0, a1, a2, a3); break;
+      case 0x106e8e8:  ret = Cibyl82.SendMessage_At_106e8e8(sp, a0, a1, a2, a3); break;
+      case 0x106eab0:  ret = Cibyl82.SendMessage_CreateNewRoads_106eab0(sp, a0, a1, a2, a3); break;
+      case 0x106eb3c:  ret = Cibyl82.SendMessage_GPSPath_106eb3c(sp, a0, a1, a2, a3); break;
+      case 0x106eb84:  ret = Cibyl82.SendMessage_ExternalPoiDisplayed_106eb84(sp, a0, a1, a2, a3); break;
+      case 0x106ebb4:  ret = Cibyl82.SendMessage_NodePath_106ebb4(sp, a0, a1, a2, a3); break;
+      case 0x106ee54:  ret = Cibyl82.SendAllMessagesTogether_SendPart2_106ee54(sp, a0, a1, a2, a3); break;
+      case 0x106f110:  ret = Cibyl82.PerformVersionUpgrade_106f110(sp, a0, a1, a2, a3); break;
+      case 0x106f148:  ret = Cibyl82.OnMsgboxClosed_ShowSystemMessage_106f148(sp, a0, a1, a2, a3); break;
+      case 0x106f224:  ret = Cibyl82.Realtime_FullReset_106f224(sp, a0, a1, a2, a3); break;
+      case 0x106f29c:  ret = Cibyl83.Realtime_Stop_106f29c(sp, a0, a1, a2, a3); break;
+      case 0x106f394:  ret = Cibyl83.OnTransactionCompleted_106f394(sp, a0, a1, a2, a3); break;
+      case 0x106f88c:  ret = Cibyl83.OnAsyncOperationCompleted_ReportAbuse_106f88c(sp, a0, a1, a2, a3); break;
+      case 0x106f900:  ret = Cibyl83.OnAsyncOperationCompleted_CollectBonus_106f900(sp, a0, a1, a2, a3); break;
+      case 0x106f974:  ret = Cibyl83.OnAsyncOperationCompleted_SelectRoute_106f974(sp, a0, a1, a2, a3); break;
+      case 0x106f9e8:  ret = Cibyl83.OnAsyncOperationCompleted_RequestRoute_106f9e8(sp, a0, a1, a2, a3); break;
+      case 0x106fa5c:  ret = Cibyl83.OnAsyncOperationCompleted_ReportOnNavigation_106fa5c(sp, a0, a1, a2, a3); break;
+      case 0x106fad0:  ret = Cibyl83.OnTransactionCompleted_ReportSegments_106fad0(sp, a0, a1, a2, a3); break;
+      case 0x106fb44:  ret = Cibyl83.OnTransactionCompleted_ReportMarkers_106fb44(sp, a0, a1, a2, a3); break;
+      case 0x106fbb8:  ret = Cibyl83.OnAsyncOperationCompleted_AllTogether_Part2_106fbb8(sp, a0, a1, a2, a3); break;
+      case 0x106fc8c:  ret = Cibyl83.OnAsyncOperationCompleted_AllTogether_Part1_106fc8c(sp, a0, a1, a2, a3); break;
+      case 0x106fd60:  ret = Cibyl83.OnAsyncOperationCompleted_MapDisplayed__only_106fd60(sp, a0, a1, a2, a3); break;
+      case 0x106fdd4:  ret = Cibyl83.OnAsyncOperationCompleted_UserPoints_106fdd4(sp, a0, a1, a2, a3); break;
+      case 0x106fe38:  ret = Cibyl83.OnAsyncOperationCompleted_SetMood_106fe38(sp, a0, a1, a2, a3); break;
+      case 0x106fe90:  ret = Cibyl83.OnAsyncOperationCompleted_NotifySplashUpdateTime_106fe90(sp, a0, a1, a2, a3); break;
+      case 0x106feec:  ret = Cibyl83.OnAsyncOperationCompleted_ExternalPoiNotifyOnNavigate_106feec(sp, a0, a1, a2, a3); break;
+      case 0x106ff48:  ret = Cibyl83.OnAsyncOperationCompleted_ExternalPoiNotifyOnPopUp_106ff48(sp, a0, a1, a2, a3); break;
+      case 0x106ffa4:  ret = Cibyl83.OnAsyncOperationCompleted_FacebookPermissions_106ffa4(sp, a0, a1, a2, a3); break;
+      case 0x1070000:  ret = Cibyl83.OnAsyncOperationCompleted_TripServer_1070000(sp, a0, a1, a2, a3); break;
+      case 0x1070050:  ret = Cibyl83.OnAsyncOperationCompleted_ReportMapProblem_1070050(sp, a0, a1, a2, a3); break;
+      case 0x10700a4:  ret = Cibyl83.OnAsyncOperationCompleted_PostComment_10700a4(sp, a0, a1, a2, a3); break;
+      case 0x10700f8:  ret = Cibyl83.OnAsyncOperationCompleted_Scoreboard_10700f8(sp, a0, a1, a2, a3); break;
+      case 0x1070134:  ret = Cibyl83.OnAsyncOperationCompleted_Foursquare_1070134(sp, a0, a1, a2, a3); break;
+      case 0x1070170:  ret = Cibyl83.OnAsyncOperationCompleted_TwitterConnect_1070170(sp, a0, a1, a2, a3); break;
+      case 0x10701c8:  ret = Cibyl83.OnAsyncOperationCompleted_SendSMS_10701c8(sp, a0, a1, a2, a3); break;
+      case 0x1070238:  ret = Cibyl83.OnAsyncOperationCompleted_PingWazer_1070238(sp, a0, a1, a2, a3); break;
+      case 0x1070294:  ret = Cibyl83.OnAsyncOperationCompleted_ReportAlert_1070294(sp, a0, a1, a2, a3); break;
+      case 0x1070304:  ret = Cibyl83.OnAsyncOperationCompleted_ExternalPoiDisplayed_1070304(sp, a0, a1, a2, a3); break;
+      case 0x1070378:  ret = Cibyl83.OnAsyncOperationCompleted_CreateAccount_1070378(sp, a0, a1, a2, a3); break;
+      case 0x10703a4:  ret = Cibyl83.OnAsyncOperationCompleted_NodePath_10703a4(sp, a0, a1, a2, a3); break;
+      case 0x1070438:  ret = Cibyl83.OnAsyncOperationCompleted_GPSPath_1070438(sp, a0, a1, a2, a3); break;
+      case 0x1070530:  ret = Cibyl84.OnAsyncOperationCompleted_CreateNewRoads_1070530(sp, a0, a1, a2, a3); break;
+      case 0x107062c:  ret = Cibyl84.OnAsyncOperationCompleted_MapDisplayed_107062c(sp, a0, a1, a2, a3); break;
+      case 0x1070724:  ret = Cibyl84.SendMessage_MapDisplyed_1070724(sp, a0, a1, a2, a3); break;
+      case 0x1070848:  ret = Cibyl84.SendAllMessagesTogether_BuildPacket_1070848(sp, a0, a1, a2, a3); break;
+      case 0x1070b7c:  ret = Cibyl84.SendAllMessagesTogether_SendPart1_1070b7c(sp, a0, a1, a2, a3); break;
+      case 0x1070e08:  ret = Cibyl84.SendAllMessagesTogether_1070e08(sp, a0, a1, a2, a3); break;
+      case 0x10710a0:  ret = Cibyl84.OnTransactionCompleted_TestLoginDetails_Login_10710a0(sp, a0, a1, a2, a3); break;
+      case 0x1071134:  ret = Cibyl84.TransactionStarted_1071134(sp, a0, a1, a2, a3); break;
+      case 0x107118c:  ret = Cibyl84.StartTransaction_107118c(sp, a0, a1, a2, a3); break;
+      case 0x107129c:  ret = Cibyl84.OnTimer_Realtime_107129c(sp, a0, a1, a2, a3); break;
+      case 0x10715c4:  ret = Cibyl84.OnAsyncOperationCompleted_Login_10715c4(sp, a0, a1, a2, a3); break;
+      case 0x107167c:  ret = Cibyl84.OnAsyncOperationCompleted_At_107167c(sp, a0, a1, a2, a3); break;
+      case 0x107172c:  ret = Cibyl84.OnAsyncOperationCompleted_SetVisability_107172c(sp, a0, a1, a2, a3); break;
+      case 0x1071800:  ret = Cibyl85.OnAsyncOperationCompleted_AlertReport_1071800(sp, a0, a1, a2, a3); break;
+      case 0x10718f8:  ret = Cibyl85.OnAsyncOperationCompleted_KeepAlive_10718f8(sp, a0, a1, a2, a3); break;
+      case 0x1071950:  ret = Cibyl85.OnAsyncOperationCompleted_AllTogether_1071950(sp, a0, a1, a2, a3); break;
+      case 0x10719b0:  ret = Cibyl85.OnTransactionCompleted_LogoutAndStop_10719b0(sp, a0, a1, a2, a3); break;
+      case 0x1071a64:  ret = Cibyl85.Realtime_DecodeRefreshRateMilliseconds_1071a64(sp, a0, a1, a2, a3); break;
+      case 0x1071b24:  ret = Cibyl85.Realtime_GetKeepALiveRateRateinMilliseconds_1071b24(sp, a0, a1, a2, a3); break;
+      case 0x1071bac:  ret = Cibyl85.Realtime_GetRefreshRateinMilliseconds_1071bac(sp, a0, a1, a2, a3); break;
+      case 0x1071dd0:  ret = Cibyl85.Realtime_Start_1071dd0(sp, a0, a1, a2, a3); break;
+      case 0x1071e88:  ret = Cibyl85.OnDeviceEvent_1071e88(sp, a0, a1, a2, a3); break;
+      case 0x1072080:  ret = Cibyl85.OnSettingsChanged_EnableDisable_1072080(sp, a0, a1, a2, a3); break;
+      case 0x10720e0:  ret = Cibyl85.Realtime_Initialize_10720e0(sp, a0, a1, a2, a3); break;
+      case 0x1072480:  ret = Cibyl85.RTNet_CreateAccount_1072480(sp, a0, a1, a2, a3); break;
+      case 0x107250c:  ret = Cibyl85.RTNet_GetTransactionState_107250c(sp, a0, a1, a2, a3); break;
+      case 0x1072560:  ret = Cibyl85.RTNet_AbortTransaction_1072560(sp, a0, a1, a2, a3); break;
+      case 0x10725b8:  ret = Cibyl85.RTNet_Watchdog_10725b8(sp, a0, a1, a2, a3); break;
+      case 0x10725e4:  ret = Cibyl85.RTNet_TransactionQueue_ProcessSingleItem_10725e4(sp, a0, a1, a2, a3); break;
+      case 0x1072618:  ret = Cibyl85.RTNet_TransactionQueue_Clear_1072618(sp, a0, a1, a2, a3); break;
+      case 0x1072644:  ret = Cibyl85.RTNet_Auth_BuildCommand_1072644(sp, a0, a1, a2, a3); break;
+      case 0x107268c:  ret = Cibyl85.format_ParamPair_string_107268c(sp, a0, a1, a2, a3); break;
+      case 0x1072874:  ret = Cibyl85.RTNet_ReportOneSegment_MaxLength_1072874(sp, a0, a1, a2, a3); break;
+      case 0x10729e0:  ret = Cibyl85.RTNet_RandomUserRegister_10729e0(sp, a0, a1, a2, a3); break;
+      case 0x1072a8c:  ret = Cibyl85.convert_int_coordinate_to_float_string_1072a8c(sp, a0, a1, a2, a3); break;
+      case 0x1072b0c:  ret = Cibyl85.format_RoadMapArea_string_1072b0c(sp, a0, a1, a2, a3); break;
+      case 0x1072bb0:  ret = Cibyl85.format_point_string_1072bb0(sp, a0, a1, a2, a3); break;
+      case 0x1072c2c:  ret = Cibyl86.format_DB_point_string_1072c2c(sp, a0, a1, a2, a3); break;
+      case 0x1072cac:  ret = Cibyl86.RTNet_ReportOneSegment_Encode_1072cac(sp, a0, a1, a2, a3); break;
+      case 0x1072fac:  ret = Cibyl86.format_RoadMapGpsPosition_Pos_Azy_Str_1072fac(sp, a0, a1, a2, a3); break;
+      case 0x1073020:  ret = Cibyl86.format_RoadMapGpsPosition_string_1073020(sp, a0, a1, a2, a3); break;
+      case 0x10730b8:  ret = Cibyl86.format_RoadMapPosition_string_10730b8(sp, a0, a1, a2, a3); break;
+      case 0x1073128:  ret = Cibyl86.RTNet_GetGeoConfig_1073128(sp, a0, a1, a2, a3); break;
+      case 0x10731d4:  ret = Cibyl86.RTNet_GPSPath_BuildCommand_10731d4(sp, a0, a1, a2, a3); break;
+      case 0x10732fc:  ret = Cibyl86.wst_start_session_trans_10732fc(sp, a0, a1, a2, a3); break;
+      case 0x10734d0:  ret = Cibyl86.RTNet_SelectRoute_10734d0(sp, a0, a1, a2, a3); break;
+      case 0x1073518:  ret = Cibyl86.RTNet_RequestRoute_1073518(sp, a0, a1, a2, a3); break;
+      case 0x1073a90:  ret = Cibyl86.RTNet_TripServer_FindTrip_1073a90(sp, a0, a1, a2, a3); break;
+      case 0x1073b28:  ret = Cibyl86.RTNet_TripServer_DeletePOI_1073b28(sp, a0, a1, a2, a3); break;
+      case 0x1073b90:  ret = Cibyl86.RTNet_TripServer_GetNumPOIs_1073b90(sp, a0, a1, a2, a3); break;
+      case 0x1073bd8:  ret = Cibyl86.RTNet_TripServer_GetPOIs_1073bd8(sp, a0, a1, a2, a3); break;
+      case 0x1073c20:  ret = Cibyl86.RTNet_TripServer_CreatePOI_1073c20(sp, a0, a1, a2, a3); break;
+      case 0x1073cd4:  ret = Cibyl86.RTNet_NotifySplashUpdateTime_1073cd4(sp, a0, a1, a2, a3); break;
+      case 0x1073d64:  ret = Cibyl86.RTNet_ExternalPoiNotifyOnNavigate_1073d64(sp, a0, a1, a2, a3); break;
+      case 0x1073da0:  ret = Cibyl86.RTNet_ExternalPoiNotifyOnPopUp_1073da0(sp, a0, a1, a2, a3); break;
+      case 0x1073ddc:  ret = Cibyl86.RTNet_FacebookPermissions_1073ddc(sp, a0, a1, a2, a3); break;
+      case 0x1073eec:  ret = Cibyl87.RTNet_ReportAbuse_1073eec(sp, a0, a1, a2, a3); break;
+      case 0x1073f34:  ret = Cibyl87.RTNet_CollectCustomBonus_1073f34(sp, a0, a1, a2, a3); break;
+      case 0x1073ff0:  ret = Cibyl87.RTNet_CollectBonus_1073ff0(sp, a0, a1, a2, a3); break;
+      case 0x10740b4:  ret = Cibyl87.RTNet_GeneralPacket_10740b4(sp, a0, a1, a2, a3); break;
+      case 0x10740e4:  ret = Cibyl87.RTNet_UpdateProfile_10740e4(sp, a0, a1, a2, a3); break;
+      case 0x10741ac:  ret = Cibyl87.RTNet_TrafficAlertFeedback_10741ac(sp, a0, a1, a2, a3); break;
+      case 0x1074230:  ret = Cibyl87.RTNet_UserPoints_1074230(sp, a0, a1, a2, a3); break;
+      case 0x1074294:  ret = Cibyl87.RTNet_Location_1074294(sp, a0, a1, a2, a3); break;
+      case 0x1074318:  ret = Cibyl87.RTNet_SetMood_1074318(sp, a0, a1, a2, a3); break;
+      case 0x107437c:  ret = Cibyl87.RTNet_SetMyVisability_107437c(sp, a0, a1, a2, a3); break;
+      case 0x10744f4:  ret = Cibyl87.RTNet_ReportMarker_10744f4(sp, a0, a1, a2, a3); break;
+      case 0x1074694:  ret = Cibyl87.RTNet_ReportMapProblem_1074694(sp, a0, a1, a2, a3); break;
+      case 0x10747f0:  ret = Cibyl87.RTNet_RemoveAlert_10747f0(sp, a0, a1, a2, a3); break;
+      case 0x107482c:  ret = Cibyl87.RTNet_PinqWazer_107482c(sp, a0, a1, a2, a3); break;
+      case 0x107497c:  ret = Cibyl87.RTNet_ReportAlertAtPosition_107497c(sp, a0, a1, a2, a3); break;
+      case 0x1074b04:  ret = Cibyl87.RTNet_ReportAlert_1074b04(sp, a0, a1, a2, a3); break;
+      case 0x1074be4:  ret = Cibyl87.RTNet_PostAlertComment_1074be4(sp, a0, a1, a2, a3); break;
+      case 0x1074cf8:  ret = Cibyl87.RTNet_Scoreboard_getPoints_1074cf8(sp, a0, a1, a2, a3); break;
+      case 0x1074dac:  ret = Cibyl87.RTNet_FoursquareCheckin_1074dac(sp, a0, a1, a2, a3); break;
+      case 0x1074e10:  ret = Cibyl87.RTNet_FoursquareSearch_1074e10(sp, a0, a1, a2, a3); break;
+      case 0x1074e90:  ret = Cibyl87.RTNet_FoursquareConnect_1074e90(sp, a0, a1, a2, a3); break;
+      case 0x1074f08:  ret = Cibyl87.RTNet_TwitterConnect_1074f08(sp, a0, a1, a2, a3); break;
+      case 0x1074f88:  ret = Cibyl87.RTNet_SendSMS_1074f88(sp, a0, a1, a2, a3); break;
+      case 0x1074fc4:  ret = Cibyl87.RTNet_ExternalPoiDisplayed_1074fc4(sp, a0, a1, a2, a3); break;
+      case 0x1075118:  ret = Cibyl87.RTNet_NodePath_1075118(sp, a0, a1, a2, a3); break;
+      case 0x1075388:  ret = Cibyl88.RTNet_GPSPath_1075388(sp, a0, a1, a2, a3); break;
+      case 0x10755e4:  ret = Cibyl88.RTNet_CreateNewRoads_10755e4(sp, a0, a1, a2, a3); break;
+      case 0x1075748:  ret = Cibyl88.RTNet_MapDisplyed_1075748(sp, a0, a1, a2, a3); break;
+      case 0x10757e4:  ret = Cibyl88.RTNet_NavigateTo_10757e4(sp, a0, a1, a2, a3); break;
+      case 0x107586c:  ret = Cibyl88.RTNet_KeepAlive_107586c(sp, a0, a1, a2, a3); break;
+      case 0x10758a8:  ret = Cibyl88.RTNet_At_10758a8(sp, a0, a1, a2, a3); break;
+      case 0x107599c:  ret = Cibyl88.RTNet_Logout_107599c(sp, a0, a1, a2, a3); break;
+      case 0x10759d8:  ret = Cibyl88.RTNet_Login_10759d8(sp, a0, a1, a2, a3); break;
+      case 0x1075bd8:  ret = Cibyl88.RTNet_LoadParams_1075bd8(sp, a0, a1, a2, a3); break;
+      case 0x1075c90:  ret = Cibyl88.RTNet_Term_1075c90(sp, a0, a1, a2, a3); break;
+      case 0x1075cc8:  ret = Cibyl88.RTNet_Init_1075cc8(sp, a0, a1, a2, a3); break;
+      case 0x1075d0c:  ret = Cibyl88.RealtimeBonus_Record_Init_1075d0c( a0); break;
+      case 0x1075d60:  ret = Cibyl88.RealtimeBonus_Count_1075d60(); break;
+      case 0x1075e68:  ret = Cibyl88.RealtimeBonus_Check_Same_Street_1075e68(); break;
+      case 0x1075e70:  ret = Cibyl88.RealtimeBonus_is_square_dependent_1075e70(); break;
+      case 0x1075e78:  ret = Cibyl88.RealtimeBonus_get_location_info_1075e78( a0); break;
+      case 0x1075eac:  ret = Cibyl88.RealtimeBonus_get_priority_1075eac(); break;
+      case 0x1075eb4:  ret = Cibyl88.RealtimeBonus_Get_Speed_1075eb4(); break;
+      case 0x1075ebc:  ret = Cibyl88.RealtimeBonus_Get_Id_1075ebc( a0); break;
+      case 0x1075ef8:  ret = Cibyl88.RealtimeBonus_Get_Position_1075ef8( a0, a1, a2); break;
+      case 0x1076068:  ret = Cibyl88.RealtimeBonus_Get_Distance_1076068( a0); break;
+      case 0x1076104:  ret = Cibyl88.RealtimeBonus_Is_Alertable_1076104( a0); break;
+      case 0x1076158:  ret = Cibyl88.onBonusDelete_1076158(sp, a0, a1, a2, a3); break;
+      case 0x10761c4:  ret = Cibyl88.RealtimeBonus_Term_10761c4(sp, a0, a1, a2, a3); break;
+      case 0x1076234:  ret = Cibyl88.RealtimeBonus_Init_1076234(sp, a0, a1, a2, a3); break;
+      case 0x10762fc:  ret = Cibyl88.RealtimeBonus_OpenMessageTicker_10762fc(sp, a0, a1, a2, a3); break;
+      case 0x1076394:  ret = Cibyl88.RealtimeBonus_CreateGUIID_1076394(sp, a0, a1, a2, a3); break;
+      case 0x10763c4:  ret = Cibyl88.RealtimeBonus_CollectedPointsConfirmed_10763c4(sp, a0, a1, a2, a3); break;
+      case 0x1076580:  ret = Cibyl88.RealtimeBonus_distance_check_1076580(sp, a0, a1, a2, a3); break;
+      case 0x10765fc:  ret = Cibyl88.RealtimeBonus_HandleEvent_10765fc(sp, a0, a1, a2, a3); break;
+      case 0x1076844:  ret = Cibyl89.AddBonusToMap_1076844(sp, a0, a1, a2, a3); break;
+      case 0x10769ac:  ret = Cibyl89.onBonusAdd_10769ac(sp, a0, a1, a2, a3); break;
+      case 0x1076a00:  ret = Cibyl89.on_resource_downloaded_1076a00(sp, a0, a1, a2, a3); break;
+      case 0x1076a7c:  ret = Cibyl89.ticker_closed_cb_1076a7c(sp, a0, a1, a2, a3); break;
+      case 0x1076ad4:  ret = Cibyl89.SpeedCheck_Timer_1076ad4(sp, a0, a1, a2, a3); break;
+      case 0x1076b8c:  ret = Cibyl89.RealtimeBonus_PopUp_1076b8c(sp, a0, a1, a2, a3); break;
+      case 0x1076ee0:  ret = Cibyl89.OnbonusShortClick_1076ee0(sp, a0, a1, a2, a3); break;
+      case 0x1076f30:  ret = Cibyl89.RealtimeBonus_RemoveFromTable_1076f30(sp, a0, a1, a2, a3); break;
+      case 0x107701c:  ret = Cibyl89.RealtimeBonus_Delete_107701c(sp, a0, a1, a2, a3); break;
+      case 0x1077134:  ret = Cibyl89.RealtimeBonus_Add_1077134(sp, a0, a1, a2, a3); break;
+      case 0x1077514:  ret = Cibyl89.RealTimeBonus_SegmentChangedCB_1077514(sp, a0, a1, a2, a3); break;
+      case 0x10776a8:  ret = Cibyl89.RTAlerts_Count_10776a8(); break;
+      case 0x10776f8:  ret = Cibyl89.RTAlerts_Get_10776f8( a0); break;
+      case 0x1077714:  ret = Cibyl89.RTAlerts_Get_By_ID_1077714( a0, a1, a2, a3); break;
+      case 0x107779c:  ret = Cibyl89.RTAlerts_State_107779c(); break;
+      case 0x10777fc:  ret = Cibyl89.RTAlerts_Get_Number_of_Comments_10777fc( a0, a1, a2, a3); break;
+      case 0x1077898:  ret = Cibyl89.RTAlerts_Has_Image_1077898( a0, a1, a2, a3); break;
+      case 0x10778e8:  ret = Cibyl89.RTAlerts_Get_Position_10778e8( a0, a1, a2); break;
+      case 0x1077960:  ret = Cibyl89.RTAlerts_Get_Type_By_Id_1077960( a0, a1, a2, a3); break;
+      case 0x10779b0:  ret = Cibyl89.RTAlerts_Get_GroupName_By_Id_10779b0( a0, a1, a2, a3); break;
+      case 0x10779fc:  ret = Cibyl89.RTAlerts_Get_Id_10779fc( a0); break;
+      case 0x1077a54:  ret = Cibyl89.RTAlerts_Get_LocationStrByID_1077a54( a0, a1, a2, a3); break;
+      case 0x1077aa0:  ret = Cibyl89.RTAlerts_Get_Speed_1077aa0( a0); break;
+      case 0x1077acc:  ret = Cibyl89.RTAlerts_Get_IconByType_1077acc( a0, a1); break;
+      case 0x1077b90:  ret = Cibyl89.RTAlerts_Get_Icon_1077b90(sp, a0, a1, a2, a3); break;
+      case 0x1077c00:  ret = Cibyl90.RTAlerts_Get_Map_AddOn_1077c00( a0, a1, a2, a3); break;
+      case 0x1077cc4:  ret = Cibyl90.RTAlerts_Get_Number_Of_Map_AddOns_1077cc4( a0, a1, a2, a3); break;
+      case 0x1077d48:  ret = Cibyl90.RTAlerts_Get_Number_Of_AddOns_1077d48( a0, a1, a2, a3); break;
+      case 0x1077ddc:  ret = Cibyl90.RTAlerts_Get_AddOn_1077ddc( a0, a1, a2, a3); break;
+      case 0x1077e98:  ret = Cibyl90.RTAlerts_Get_Alert_Icon_1077e98( a0, a1, a2, a3); break;
+      case 0x1077f1c:  ret = Cibyl90.RTAlerts_Get_Warn_Icon_1077f1c( a0, a1, a2, a3); break;
+      case 0x1077fa0:  ret = Cibyl90.RTAlerts_Get_String_1077fa0( a0, a1, a2, a3); break;
+      case 0x1078024:  ret = Cibyl90.RTAlerts_Get_Distance_1078024( a0); break;
+      case 0x107807c:  ret = Cibyl90.RTAlerts_Is_Alertable_107807c( a0); break;
+      case 0x10780d8:  ret = Cibyl90.compare_proximity_10780d8( a0, a1); break;
+      case 0x1078104:  ret = Cibyl90.compare_recency_1078104( a0, a1); break;
+      case 0x1078130:  ret = Cibyl90.RTAlerts_Get_Current_Alert_Id_1078130(); break;
+      case 0x1078140:  ret = Cibyl90.RTAlerts_Penalty_1078140(); break;
+      case 0x1078148:  ret = Cibyl90.RTAlerts_Is_Cancelable_1078148(); break;
+      case 0x1078150:  ret = Cibyl90.RTAlerts_Check_Same_Street_1078150(); break;
+      case 0x1078158:  ret = Cibyl90.RTAlerts_HandleAlert_1078158(); break;
+      case 0x1078160:  ret = Cibyl90.RTAlerts_is_square_dependent_1078160(); break;
+      case 0x1078168:  ret = Cibyl90.RTAlerts_get_priority_1078168(); break;
+      case 0x1078170:  ret = Cibyl90.RTAlerts_get_location_info_1078170( a0); break;
+      case 0x107818c:  ret = Cibyl90.RTAlerts_Resert_Minimized_107818c(); break;
+      case 0x107819c:  ret = Cibyl90.RTAlerts_Get_Minimize_State_107819c(); break;
+      case 0x10781d4:  ret = Cibyl90.RTAlerts_Get_Stars_Icon_10781d4( a0); break;
+      case 0x1078214:  ret = Cibyl90.RTAlerts_isByMe_1078214( a0, a1, a2, a3); break;
+      case 0x1078264:  ret = Cibyl90.j2me_sort_alerts_1078264(sp, a0, a1, a2, a3); break;
+      case 0x1078364:  ret = Cibyl90.RTAlerts_clear_group_counter_1078364(); break;
+      case 0x107838c:  ret = Cibyl90.RAlerts_get_group_state_107838c(); break;
+      case 0x1078400:  ret = Cibyl90.RTAlerts_isAlertOnRoute_1078400(sp, a0, a1, a2, a3); break;
+      case 0x107847c:  ret = Cibyl90.RTAlerts_show_space_before_desc_107847c(sp, a0, a1, a2, a3); break;
+      case 0x10784cc:  ret = Cibyl90.RTAlerts_get_title_10784cc(sp, a0, a1, a2, a3); break;
+      case 0x10785fc:  ret = Cibyl90.RTAlerts_get_reported_by_string_10785fc(sp, a0, a1, a2, a3); break;
+      case 0x1078668:  ret = Cibyl90.RTAlerts_GroupCount_Str_1078668(sp, a0, a1, a2, a3); break;
+      case 0x10786b4:  ret = Cibyl90.RTAlerts_Count_Str_10786b4(sp, a0, a1, a2, a3); break;
+      case 0x1078700:  ret = Cibyl90.checkbox_callback_1078700(sp, a0, a1, a2, a3); break;
+      case 0x1078814:  ret = Cibyl90.RtAlerts_get_addional_text_icon_1078814(sp, a0, a1, a2, a3); break;
+      case 0x107884c:  ret = Cibyl90.RtAlerts_get_addional_text_107884c(sp, a0, a1, a2, a3); break;
+      case 0x1078988:  ret = Cibyl90.RTAlerts_add_comment_stars_1078988(sp, a0, a1, a2, a3); break;
+      case 0x1078a6c:  ret = Cibyl90.RTAlerts_update_stars_1078a6c(sp, a0, a1, a2, a3); break;
+      case 0x1078bfc:  ret = Cibyl90.RTAlerts_Delete_All_Comments_1078bfc(sp, a0, a1, a2, a3); break;
+      case 0x1078c38:  ret = Cibyl90.space_1078c38(sp, a0, a1, a2, a3); break;
+      case 0x1078ca4:  ret = Cibyl90.send_map_problem_sk_cb_1078ca4(sp, a0, a1, a2, a3); break;
+      case 0x1078dd8:  ret = Cibyl90.on_map_problem_close_1078dd8(sp, a0, a1, a2, a3); break;
+      case 0x1078df8:  ret = Cibyl90.RTAlerts_CloseProgressDlg_1078df8(sp, a0, a1, a2, a3); break;
+      case 0x1078e18:  ret = Cibyl90.RTAlerts_ShowProgressDlg_1078e18(sp, a0, a1, a2, a3); break;
+      case 0x1078e44:  ret = Cibyl90.RTAlerts_Minimized_Alert_Dialog_1078e44(sp, a0, a1, a2, a3); break;
+      case 0x1078e74:  ret = Cibyl90.RTAlerts_distance_check_1078e74(sp, a0, a1, a2, a3); break;
+      case 0x1078ef0:  ret = Cibyl90.RTAlerts_Sort_List_1078ef0(sp, a0, a1, a2, a3); break;
+      case 0x1079088:  ret = Cibyl90.RTAlerts_CurrentAlert_Has_Comments_1079088(sp, a0, a1, a2, a3); break;
+      case 0x1079114:  ret = Cibyl91.RTAlerts_is_reply_popup_on_1079114(sp, a0, a1, a2, a3); break;
+      case 0x1079158:  ret = Cibyl91.RTAlerts_ScrollState_1079158(sp, a0, a1, a2, a3); break;
+      case 0x10791a4:  ret = Cibyl91.RTAlerts_CurrentComments_10791a4(sp, a0, a1, a2, a3); break;
+      case 0x10791cc:  ret = Cibyl91.on_view_comments_10791cc(sp, a0, a1, a2, a3); break;
+      case 0x10792e0:  ret = Cibyl91.real_time_remove_alert_10792e0(sp, a0, a1, a2, a3); break;
+      case 0x1079300:  ret = Cibyl91.real_time_post_alert_comment_by_id_1079300(sp, a0, a1, a2, a3); break;
+      case 0x10793b8:  ret = Cibyl91.real_time_post_alert_comment_10793b8(sp, a0, a1, a2, a3); break;
+      case 0x10793e8:  ret = Cibyl91.on_add_comment_10793e8(sp, a0, a1, a2, a3); break;
+      case 0x1079418:  ret = Cibyl91.RTAlerts_Comment_PopUp_Hide_1079418(sp, a0, a1, a2, a3); break;
+      case 0x10794a0:  ret = Cibyl91.Comment_Ignore_sk_cb_10794a0(sp, a0, a1, a2, a3); break;
+      case 0x10794c0:  ret = Cibyl91.RTAlerts_Comment_Init_10794c0(sp, a0, a1, a2, a3); break;
+      case 0x107953c:  ret = Cibyl91.RTAlerts_Alert_Init_107953c(sp, a0, a1, a2, a3); break;
+      case 0x10796a4:  ret = Cibyl91.continue_report_after_image_upload_10796a4(sp, a0, a1, a2, a3); break;
+      case 0x10797d4:  ret = Cibyl91.on_keyboard_closed_10797d4(sp, a0, a1, a2, a3); break;
+      case 0x10798fc:  ret = Cibyl91.alerts_direction_menu_10798fc(sp, a0, a1, a2, a3); break;
+      case 0x107997c:  ret = Cibyl91.add_real_time_alert_for_construction_107997c(sp, a0, a1, a2, a3); break;
+      case 0x10799c0:  ret = Cibyl91.add_real_time_alert_for_other_10799c0(sp, a0, a1, a2, a3); break;
+      case 0x1079a04:  ret = Cibyl91.add_real_time_alert_for_parking_1079a04(sp, a0, a1, a2, a3); break;
+      case 0x1079a48:  ret = Cibyl91.add_real_time_alert_for_hazard_1079a48(sp, a0, a1, a2, a3); break;
+      case 0x1079a8c:  ret = Cibyl91.add_real_time_alert_for_traffic_jam_1079a8c(sp, a0, a1, a2, a3); break;
+      case 0x1079ad0:  ret = Cibyl91.add_real_time_alert_for_accident_1079ad0(sp, a0, a1, a2, a3); break;
+      case 0x1079b14:  ret = Cibyl91.add_real_time_alert_for_police_1079b14(sp, a0, a1, a2, a3); break;
+      case 0x1079b58:  ret = Cibyl91.RTAlerts_get_report_info_str_1079b58(sp, a0, a1, a2, a3); break;
+      case 0x1079cb0:  ret = Cibyl91.on_button_close_1079cb0(sp, a0, a1, a2, a3); break;
+      case 0x1079cd8:  ret = Cibyl91.on_ping_wazer_button_close_1079cd8(sp, a0, a1, a2, a3); break;
+      case 0x1079d00:  ret = Cibyl91.RTAlerts_Clear_All_1079d00(sp, a0, a1, a2, a3); break;
+      case 0x1079e30:  ret = Cibyl91.RTAlerts_Term_1079e30(sp, a0, a1, a2, a3); break;
+      case 0x1079e50:  ret = Cibyl91.alertCountTimerRedrawCB_1079e50(sp, a0, a1, a2, a3); break;
+      case 0x1079e80:  ret = Cibyl91.on_popup_close_1079e80(sp, a0, a1, a2, a3); break;
+      case 0x1079fdc:  ret = Cibyl91.RTAlerts_Stop_Scrolling_1079fdc(sp, a0, a1, a2, a3); break;
+      case 0x107a0cc:  ret = Cibyl91.post_comment_keyboard_callback_107a0cc(sp, a0, a1, a2, a3); break;
+      case 0x107a1c0:  ret = Cibyl91.RTAlerts_Cancel_Scrolling_107a1c0(sp, a0, a1, a2, a3); break;
+      case 0x107a204:  ret = Cibyl91.on_groups_callbak_107a204(sp, a0, a1, a2, a3); break;
+      case 0x107a234:  ret = Cibyl91.RTAlerts_Download_Image_107a234(sp, a0, a1, a2, a3); break;
+      case 0x107a2b8:  ret = Cibyl91.on_view_image_107a2b8(sp, a0, a1, a2, a3); break;
+      case 0x107a2e0:  ret = Cibyl91.RTAlerts_Download_Image_Callback_107a2e0(sp, a0, a1, a2, a3); break;
+      case 0x107a5e0:  ret = Cibyl92.RTAlerts_View_Image_DlgClose_Callback_107a5e0(sp, a0, a1, a2, a3); break;
+      case 0x107a618:  ret = Cibyl92.RTAlerts_Get_City_Street_107a618(sp, a0, a1, a2, a3); break;
+      case 0x107a9b4:  ret = Cibyl92.RTAlerts_Get_Sound_107a9b4(sp, a0, a1, a2, a3); break;
+      case 0x107aa60:  ret = Cibyl92.RTAlerts_Get_Map_Icon_107aa60(sp, a0, a1, a2, a3); break;
+      case 0x107ab94:  ret = Cibyl92.DeleteAlertObject_107ab94(sp, a0, a1, a2, a3); break;
+      case 0x107ad3c:  ret = Cibyl92.RTAlerts_Remove_107ad3c(sp, a0, a1, a2, a3); break;
+      case 0x107b16c:  ret = Cibyl92.Rtalerts_Delete_107b16c(sp, a0, a1, a2, a3); break;
+      case 0x107b198:  ret = Cibyl92.CreateAlertObject_107b198(sp, a0, a1, a2, a3); break;
+      case 0x107b550:  ret = Cibyl92.RTAlerts_Comment_PopUp_107b550(sp, a0, a1, a2, a3); break;
+      case 0x107ba20:  ret = Cibyl93.on_options_107ba20(sp, a0, a1, a2, a3); break;
+      case 0x107bc04:  ret = Cibyl93.report_abuse_107bc04(sp, a0, a1, a2, a3); break;
+      case 0x107bc88:  ret = Cibyl93.on_option_selected_107bc88(sp, a0, a1, a2, a3); break;
+      case 0x107bd38:  ret = Cibyl93.on_report_abuse_107bd38(sp, a0, a1, a2, a3); break;
+      case 0x107bd58:  ret = Cibyl93.report_abuse_confirm_dlg_callback_107bd58(sp, a0, a1, a2, a3); break;
+      case 0x107bd98:  ret = Cibyl93.RTAlerts_RefreshOnMap_107bd98(sp, a0, a1, a2, a3); break;
+      case 0x107beb8:  ret = Cibyl93.RTAlerts_Init_107beb8(sp, a0, a1, a2, a3); break;
+      case 0x107c0b8:  ret = Cibyl93.RTAlerts_report_map_problem_107c0b8(sp, a0, a1, a2, a3); break;
+      case 0x107c644:  ret = Cibyl93.T_411_107c644(sp, a0, a1, a2, a3); break;
+      case 0x107c680:  ret = Cibyl93.RTAlerts_Comment_Add_107c680(sp, a0, a1, a2, a3); break;
+      case 0x107c87c:  ret = Cibyl93.report_alert_107c87c(sp, a0, a1, a2, a3); break;
+      case 0x107c8fc:  ret = Cibyl93.add_real_time_alert_for_construction_opposite_direction_107c8fc(sp, a0, a1, a2, a3); break;
+      case 0x107c92c:  ret = Cibyl93.add_real_time_alert_for_other_opposite_direction_107c92c(sp, a0, a1, a2, a3); break;
+      case 0x107c98c:  ret = Cibyl93.add_real_time_alert_for_hazard_opposite_direction_107c98c(sp, a0, a1, a2, a3); break;
+      case 0x107c9bc:  ret = Cibyl93.add_real_time_alert_for_traffic_jam_opposite_direction_107c9bc(sp, a0, a1, a2, a3); break;
+      case 0x107c9ec:  ret = Cibyl93.add_real_time_alert_for_accident_opposite_direction_107c9ec(sp, a0, a1, a2, a3); break;
+      case 0x107ca1c:  ret = Cibyl93.add_real_time_alert_for_police_opposite_direction_107ca1c(sp, a0, a1, a2, a3); break;
+      case 0x107ca4c:  ret = Cibyl93.add_real_time_alert_for_construction_my_direction_107ca4c(sp, a0, a1, a2, a3); break;
+      case 0x107ca7c:  ret = Cibyl93.add_real_time_alert_for_other_my_direction_107ca7c(sp, a0, a1, a2, a3); break;
+      case 0x107cadc:  ret = Cibyl93.add_real_time_alert_for_hazard_my_direction_107cadc(sp, a0, a1, a2, a3); break;
+      case 0x107cb0c:  ret = Cibyl93.add_real_time_alert_for_traffic_jam_my_direction_107cb0c(sp, a0, a1, a2, a3); break;
+      case 0x107cb3c:  ret = Cibyl93.add_real_time_alert_for_accident_my_direction_107cb3c(sp, a0, a1, a2, a3); break;
+      case 0x107cb6c:  ret = Cibyl93.add_real_time_alert_for_police_my_direction_107cb6c(sp, a0, a1, a2, a3); break;
+      case 0x107cb9c:  ret = Cibyl93.add_real_time_chit_chat_107cb9c(sp, a0, a1, a2, a3); break;
+      case 0x107cca8:  ret = Cibyl93.T_412_107cca8(sp, a0, a1, a2, a3); break;
+      case 0x107cde8:  ret = Cibyl94.RTAlerts_popup_PingWazer_107cde8(sp, a0, a1, a2, a3); break;
+      case 0x107dacc:  ret = Cibyl94.RTAlerts_popup_alert_107dacc(sp, a0, a1, a2, a3); break;
+      case 0x107eeb8:  ret = Cibyl95.RTAlerts_Scroll_Prev_107eeb8(sp, a0, a1, a2, a3); break;
+      case 0x107ef90:  ret = Cibyl95.RTAlerts_Scroll_Next_107ef90(sp, a0, a1, a2, a3); break;
+      case 0x107f070:  ret = Cibyl95.RTAlerts_Popup_By_Id_No_Center_107f070(sp, a0, a1, a2, a3); break;
+      case 0x107f128:  ret = Cibyl95.OnAlertShortClick_107f128(sp, a0, a1, a2, a3); break;
+      case 0x107f194:  ret = Cibyl95.RTAlerts_Popup_By_Id_107f194(sp, a0, a1, a2, a3); break;
+      case 0x107f258:  ret = Cibyl95.RTAlerts_Add_107f258(sp, a0, a1, a2, a3); break;
+      case 0x107fe18:  ret = Cibyl95.RTAlerts_Popup_107fe18(sp, a0, a1, a2, a3); break;
+      case 0x1080068:  ret = Cibyl95.RTAlerts_Scroll_All_1080068(sp, a0, a1, a2, a3); break;
+      case 0x108014c:  ret = Cibyl95.RTAlerts_Timer_108014c(sp, a0, a1, a2, a3); break;
+      case 0x1080394:  ret = Cibyl96.populate_list_1080394(sp, a0, a1, a2, a3); break;
+      case 0x1080f00:  ret = Cibyl96.populate_first_tab_1080f00(sp, a0, a1, a2, a3); break;
+      case 0x1081154:  ret = Cibyl96.RealtimeAlertsDeleteCallBackTabs_1081154(sp, a0, a1, a2, a3); break;
+      case 0x10811cc:  ret = Cibyl96.delete_callback_10811cc(sp, a0, a1, a2, a3); break;
+      case 0x1081218:  ret = Cibyl96.RealtimeAlertsListCallBackTabs_1081218(sp, a0, a1, a2, a3); break;
+      case 0x1081290:  ret = Cibyl96.create_list_1081290(sp, a0, a1, a2, a3); break;
+      case 0x1081310:  ret = Cibyl96.report_list_1081310(sp, a0, a1, a2, a3); break;
+      case 0x10813d8:  ret = Cibyl96.set_softkeys_10813d8(sp, a0, a1, a2, a3); break;
+      case 0x1081434:  ret = Cibyl96.ShowListMenu_1081434(sp, a0, a1, a2, a3); break;
+      case 0x1081610:  ret = Cibyl97.RealtimeAlertsList_1081610(sp, a0, a1, a2, a3); break;
+      case 0x1081634:  ret = Cibyl97.on_options_1081634(sp, a0, a1, a2, a3); break;
+      case 0x108199c:  ret = Cibyl97.on_option_delete_108199c(sp, a0, a1, a2, a3); break;
+      case 0x1081a54:  ret = Cibyl97.report_abuse_confirm_dlg_callback_1081a54(sp, a0, a1, a2, a3); break;
+      case 0x1081a88:  ret = Cibyl97.populate_tab_1081a88(sp, a0, a1, a2, a3); break;
+      case 0x1081e00:  ret = Cibyl97.on_tab_gain_focus_1081e00(sp, a0, a1, a2, a3); break;
+      case 0x1081ee4:  ret = Cibyl97.on_option_selected_1081ee4(sp, a0, a1, a2, a3); break;
+      case 0x108222c:  ret = Cibyl97.count_tab_108222c(sp, a0, a1, a2, a3); break;
+      case 0x10822e4:  ret = Cibyl97.show_list_10822e4(sp, a0, a1, a2, a3); break;
+      case 0x10827a0:  ret = Cibyl97.report_list_other_10827a0(sp, a0, a1, a2, a3); break;
+      case 0x1082824:  ret = Cibyl97.report_list_chit_chats_1082824(sp, a0, a1, a2, a3); break;
+      case 0x108288c:  ret = Cibyl98.report_list_accidents_108288c(sp, a0, a1, a2, a3); break;
+      case 0x10828f4:  ret = Cibyl98.report_list_loads_10828f4(sp, a0, a1, a2, a3); break;
+      case 0x1082960:  ret = Cibyl98.report_list_police_1082960(sp, a0, a1, a2, a3); break;
+      case 0x10829c8:  ret = Cibyl98.report_list_all_10829c8(sp, a0, a1, a2, a3); break;
+      case 0x1082a24:  ret = Cibyl98.RealtimeAlertsListGroup_1082a24(sp, a0, a1, a2, a3); break;
+      case 0x1082a64:  ret = Cibyl98.on_button_show_no_groups_1082a64(sp, a0, a1, a2, a3); break;
+      case 0x1082bfc:  ret = Cibyl98.set_counts_1082bfc(sp, a0, a1, a2, a3); break;
+      case 0x1082e6c:  ret = Cibyl98.RTTrafficInfo_InitRecord_1082e6c( a0); break;
+      case 0x1082eb0:  ret = Cibyl98.RTTrafficInfo_IsEmpty_1082eb0(); break;
+      case 0x1082ec0:  ret = Cibyl98.RTTrafficInfo_Count_1082ec0(); break;
+      case 0x1082ed0:  ret = Cibyl98.RTTrafficInfo_RecordByID_1082ed0( a0, a1, a2, a3); break;
+      case 0x1082f58:  ret = Cibyl98.RTTrafficInfo_Get_1082f58( a0); break;
+      case 0x1082f80:  ret = Cibyl98.RTTrafficInfo_GetNumLines_1082f80(); break;
+      case 0x1082f90:  ret = Cibyl98.RTTrafficInfo_GetLine_1082f90( a0); break;
+      case 0x1082fb8:  ret = Cibyl98.RTTrafficInfo_Get_Line_1082fb8( a0, a1, a2, a3); break;
+      case 0x1083048:  ret = Cibyl98.RTTrafficInfo_Get_Avg_Speed_1083048( a0, a1, a2, a3); break;
+      case 0x1083190:  ret = Cibyl98.RTTrafficInfo_InstrumentSegment_1083190(sp, a0, a1, a2, a3); break;
+      case 0x108345c:  ret = Cibyl98.RTTrafficInfo_InstrumentSegments_108345c(sp, a0, a1, a2, a3); break;
+      case 0x1083530:  ret = Cibyl98.RTTrafficInfo_Get_Avg_Cross_Time_1083530(sp, a0, a1, a2, a3); break;
+      case 0x10835e8:  ret = Cibyl98.RTTrafficInfo_GenerateAlert_10835e8(sp, a0, a1, a2, a3); break;
+      case 0x1083700:  ret = Cibyl98.RTTrafficInfo_UpdateGeometry_1083700(sp, a0, a1, a2, a3); break;
+      case 0x10837fc:  ret = Cibyl98.RTTrafficInfo_Remove_10837fc(sp, a0, a1, a2, a3); break;
+      case 0x1083910:  ret = Cibyl98.RTTrafficInfo_UnitChangeCb_1083910(sp, a0, a1, a2, a3); break;
+      case 0x10839cc:  ret = Cibyl98.RTTrafficInfo_Add_10839cc(sp, a0, a1, a2, a3); break;
+      case 0x1083e54:  ret = Cibyl98.TrafficConfirmedCallback_1083e54(sp, a0, a1, a2, a3); break;
+      case 0x1083f04:  ret = Cibyl99.RTTrafficInfo_ClearAll_1083f04(sp, a0, a1, a2, a3); break;
+      case 0x1083ff8:  ret = Cibyl99.RTTrafficInfo_Reset_1083ff8(sp, a0, a1, a2, a3); break;
+      case 0x1084018:  ret = Cibyl99.RTTrafficInfo_AddSegments_1084018(sp, a0, a1, a2, a3); break;
+      case 0x1084260:  ret = Cibyl99.RTTrafficInfo_TileReceivedCb_1084260(sp, a0, a1, a2, a3); break;
+      case 0x10842bc:  ret = Cibyl99.RTTrafficInfo_Term_10842bc(sp, a0, a1, a2, a3); break;
+      case 0x10842e4:  ret = Cibyl99.RTTrafficInfo_Init_10842e4(sp, a0, a1, a2, a3); break;
+      case 0x1084384:  ret = Cibyl99.RealtimeTrafficInfoOutlineIterator_1084384( a0, a1); break;
+      case 0x10843ac:  ret = Cibyl99.isDisplayingTrafficInfoOn_10843ac(sp, a0, a1, a2, a3); break;
+      case 0x10843d8:  ret = Cibyl99.RealtimeTrafficInfoState_10843d8(sp, a0, a1, a2, a3); break;
+      case 0x1084404:  ret = Cibyl99.RealtimeRoadToggleShowTraffic_1084404(sp, a0, a1, a2, a3); break;
+      case 0x1084478:  ret = Cibyl99.RealtimeTrafficInfoUregister_1084478(sp, a0, a1, a2, a3); break;
+      case 0x10844b0:  ret = Cibyl99.RealtimeTrafficInfoPluginTerm_10844b0(sp, a0, a1, a2, a3); break;
+      case 0x10844e4:  ret = Cibyl99.RealtimeTrafficInfoPluginInit_10844e4(sp, a0, a1, a2, a3); break;
+      case 0x1084718:  ret = Cibyl99.RealtimeTrafficInfoScreenRepaint_1084718(sp, a0, a1, a2, a3); break;
+      case 0x1084dfc:  ret = Cibyl99.RealtimeAlertCommentsList_1084dfc(sp, a0, a1, a2, a3); break;
+      case 0x1085ce0:  ret = Cibyl100.comment_callback_1085ce0(sp, a0, a1, a2, a3); break;
+      case 0x1085dbc:  ret = Cibyl100.on_option_selected_1085dbc(sp, a0, a1, a2, a3); break;
+      case 0x1085ea8:  ret = Cibyl100.report_abuse_confirm_dlg_callback_1085ea8(sp, a0, a1, a2, a3); break;
+      case 0x1085ee0:  ret = Cibyl100.draw_comment_image_1085ee0(sp, a0, a1, a2, a3); break;
+      case 0x1086070:  ret = Cibyl100.AlertSelected_1086070(sp, a0, a1, a2, a3); break;
+      case 0x10860a0:  ret = Cibyl100.on_options_comments_10860a0(sp, a0, a1, a2, a3); break;
+      case 0x10861b4:  Cibyl100.RTConnectionInfo_ResetTransaction_10861b4( a0); break;
+      case 0x10861c8:  ret = Cibyl100.RTConnectionInfo_ResetLogin_10861c8(sp, a0, a1, a2, a3); break;
+      case 0x108625c:  ret = Cibyl100.RTConnectionInfo_FullReset_108625c(sp, a0, a1, a2, a3); break;
+      case 0x1086284:  ret = Cibyl100.RTConnectionInfo_Init_1086284(sp, a0, a1, a2, a3); break;
+      case 0x1086300:  ret = Cibyl100.SetExternalPoiDrawOrder_1086300(sp, a0, a1, a2, a3); break;
+      case 0x1086470:  ret = Cibyl100.RmExternalPoi_1086470(sp, a0, a1, a2, a3); break;
+      case 0x10864f4:  ret = Cibyl100.AddExternalPoi_10864f4(sp, a0, a1, a2, a3); break;
+      case 0x10868e0:  ret = Cibyl100.AddExternalPoiType_10868e0(sp, a0, a1, a2, a3); break;
+      case 0x1086c54:  ret = Cibyl100.OpenMessageTicker_1086c54(sp, a0, a1, a2, a3); break;
+      case 0x1086dfc:  ret = Cibyl100.OpenMoodSelection_1086dfc(sp, a0, a1, a2, a3); break;
+      case 0x1086e58:  ret = Cibyl100.UserGroups_1086e58(sp, a0, a1, a2, a3); break;
+      case 0x1087184:  ret = Cibyl101.CollectBonusRes_1087184(sp, a0, a1, a2, a3); break;
+      case 0x10873d0:  ret = Cibyl101.RmBonus_10873d0(sp, a0, a1, a2, a3); break;
+      case 0x108746c:  ret = Cibyl101.AddCustomBonus_108746c(sp, a0, a1, a2, a3); break;
+      case 0x1087750:  ret = Cibyl101.AddBonus_1087750(sp, a0, a1, a2, a3); break;
+      case 0x1087a30:  ret = Cibyl101.UpdateUserPoints_1087a30(sp, a0, a1, a2, a3); break;
+      case 0x1087acc:  ret = Cibyl101.PostAlertCommentRes_1087acc(sp, a0, a1, a2, a3); break;
+      case 0x1087c68:  ret = Cibyl101.ReportAlertRes_1087c68(sp, a0, a1, a2, a3); break;
+      case 0x1087e04:  ret = Cibyl101.GeoLocation_1087e04(sp, a0, a1, a2, a3); break;
+      case 0x10881c4:  ret = Cibyl101.MapUpdateTime_10881c4(sp, a0, a1, a2, a3); break;
+      case 0x108824c:  ret = Cibyl101.RmRoadInfo_108824c(sp, a0, a1, a2, a3); break;
+      case 0x1088304:  ret = Cibyl101.RoadInfoSegments_1088304(sp, a0, a1, a2, a3); break;
+      case 0x1088590:  ret = Cibyl102.RoadInfoGeom_1088590(sp, a0, a1, a2, a3); break;
+      case 0x1088864:  ret = Cibyl102.AddRoadInfo_1088864(sp, a0, a1, a2, a3); break;
+      case 0x1088d04:  ret = Cibyl102.RemoveAlert_1088d04(sp, a0, a1, a2, a3); break;
+      case 0x1088dbc:  ret = Cibyl102.AddAlertComment_1088dbc(sp, a0, a1, a2, a3); break;
+      case 0x1089230:  ret = Cibyl102.BridgeToRes_1089230(sp, a0, a1, a2, a3); break;
+      case 0x10895e4:  ret = Cibyl102.AddAlert_10895e4(sp, a0, a1, a2, a3); break;
+      case 0x1089f84:  ret = Cibyl103.VersionUpgrade_1089f84(sp, a0, a1, a2, a3); break;
+      case 0x108a14c:  ret = Cibyl103.SystemMessage_108a14c(sp, a0, a1, a2, a3); break;
+      case 0x108a610:  ret = Cibyl103.AddUser_108a610(sp, a0, a1, a2, a3); break;
+      case 0x108ae3c:  ret = Cibyl103.VerifyStatus_108ae3c(sp, a0, a1, a2, a3); break;
+      case 0x108af9c:  ret = Cibyl103.VerifyStatusAndTag_108af9c(sp, a0, a1, a2, a3); break;
+      case 0x108b23c:  ret = Cibyl104.OnLogOutResponse_108b23c(sp, a0, a1, a2, a3); break;
+      case 0x108b304:  ret = Cibyl104.OnLoginResponse_108b304(sp, a0, a1, a2, a3); break;
+      case 0x108b680:  ret = Cibyl104.OnRegisterResponse_108b680(sp, a0, a1, a2, a3); break;
+      case 0x108b7f8:  ret = Cibyl104.RTUsers_Count_108b7f8( a0); break;
+      case 0x108b804:  ret = Cibyl104.RTUsers_IsEmpty_108b804( a0); break;
+      case 0x108b810:  ret = Cibyl104.RTUsers_Update_108b810(sp, a0, a1, a2, a3); break;
+      case 0x108b908:  ret = Cibyl104.RTUsers_ResetUpdateFlag_108b908( a0, a1); break;
+      case 0x108b934:  ret = Cibyl104.RTUsers_RedoUpdateFlag_108b934( a0, a1, a2); break;
+      case 0x108b99c:  ret = Cibyl104.RTUsers_UserByID_108b99c( a0, a1, a2, a3); break;
+      case 0x108b9e8:  ret = Cibyl104.on_close_108b9e8(sp, a0, a1, a2, a3); break;
+      case 0x108ba38:  ret = Cibyl104.prepareValueString_108ba38(sp, a0, a1, a2, a3); break;
+      case 0x108bb7c:  ret = Cibyl104.RTUserLocation_CreateGUIID_108bb7c(sp, a0, a1, a2, a3); break;
+      case 0x108bbac:  ret = Cibyl104.disclaimer_cb_108bbac(sp, a0, a1, a2, a3); break;
+      case 0x108bcf0:  ret = Cibyl104.post_comment_keyboard_callback_108bcf0(sp, a0, a1, a2, a3); break;
+      case 0x108bdac:  ret = Cibyl104.RTUsers_Add_108bdac(sp, a0, a1, a2, a3); break;
+      case 0x108bf60:  ret = Cibyl104.RTUsers_UpdateOrAdd_108bf60(sp, a0, a1, a2, a3); break;
+      case 0x108bfbc:  ret = Cibyl104.RTUserLocation_Init_108bfbc(sp, a0, a1, a2, a3); break;
+      case 0x108c08c:  ret = Cibyl104.RTUsers_ClearAll_108c08c(sp, a0, a1, a2, a3); break;
+      case 0x108c148:  ret = Cibyl104.RTUsers_RemoveByIndex_108c148(sp, a0, a1, a2, a3); break;
+      case 0x108c224:  ret = Cibyl104.RTUsers_RemoveUnupdatedUsers_108c224(sp, a0, a1, a2, a3); break;
+      case 0x108c33c:  ret = Cibyl104.RTUsers_Reset_108c33c(sp, a0, a1, a2, a3); break;
+      case 0x108c3a0:  ret = Cibyl104.RTUsers_Init_108c3a0(sp, a0, a1, a2, a3); break;
+      case 0x108c470:  ret = Cibyl104.RTUsers_Popup_108c470(sp, a0, a1, a2, a3); break;
+      case 0x108d674:  ret = Cibyl105.ERTVisabilityGroup_to_string_108d674( a0); break;
+      case 0x108d6e4:  Cibyl105.StatusStatistics_Reset_108d6e4( a0); break;
+      case 0x108d6f0:  Cibyl105.StatusStatistics_Init_108d6f0( a0); break;
+      case 0x108d700:  ret = Cibyl105.VersionUpgradeInfo_Init_108d700(sp, a0, a1, a2, a3); break;
+      case 0x108d724:  ret = Cibyl105.ERTVisabilityReport_from_string_108d724(sp, a0, a1, a2, a3); break;
+      case 0x108d74c:  ret = Cibyl105.ERTVisabilityGroup_from_string_108d74c(sp, a0, a1, a2, a3); break;
+      case 0x108d7c4:  ret = Cibyl105.RTSystemMessageQueue_IsEmpty_108d7c4(); break;
+      case 0x108d7ec:  ret = Cibyl105.RTSystemMessagesInit_108d7ec(sp, a0, a1, a2, a3); break;
+      case 0x108d824:  ret = Cibyl105.RTSystemMessagesSetLastMessageDisplayed_108d824(sp, a0, a1, a2, a3); break;
+      case 0x108d854:  ret = Cibyl105.RTSystemMessagesGetLastMessageDisplayed_108d854(sp, a0, a1, a2, a3); break;
+      case 0x108d878:  ret = Cibyl105.RTSystemMessage_Init_108d878(sp, a0, a1, a2, a3); break;
+      case 0x108d8dc:  ret = Cibyl105.RTSystemMessage_Free_108d8dc(sp, a0, a1, a2, a3); break;
+      case 0x108d954:  ret = Cibyl105.PopOldest_108d954(sp, a0, a1, a2, a3); break;
+      case 0x108da28:  ret = Cibyl105.RTSystemMessageQueue_Empty_108da28(sp, a0, a1, a2, a3); break;
+      case 0x108da50:  ret = Cibyl105.RTSystemMessageQueue_Pop_108da50(sp, a0, a1, a2, a3); break;
+      case 0x108da94:  ret = Cibyl105.RTSystemMessagesDisplay_108da94(sp, a0, a1, a2, a3); break;
+      case 0x108df14:  ret = Cibyl105.button_callback_108df14(sp, a0, a1, a2, a3); break;
+      case 0x108df3c:  ret = Cibyl105.RTSystemMessagesDisplay_Timer_108df3c(sp, a0, a1, a2, a3); break;
+      case 0x108df7c:  ret = Cibyl105.RTSystemMessageQueue_Push_108df7c(sp, a0, a1, a2, a3); break;
+      case 0x108e0b8:  ret = Cibyl105.set_state_108e0b8(sp, a0, a1, a2, a3); break;
+      case 0x108e0e8:  ret = Cibyl105.RealtimePrivacyInit_108e0e8(sp, a0, a1, a2, a3); break;
+      case 0x108e108:  ret = Cibyl105.checkbox_callback_108e108(sp, a0, a1, a2, a3); break;
+      case 0x108e1d4:  ret = Cibyl105.RealtimePrivacyState_108e1d4(sp, a0, a1, a2, a3); break;
+      case 0x108e204:  ret = Cibyl105.update_checked_108e204(sp, a0, a1, a2, a3); break;
+      case 0x108e2c8:  ret = Cibyl105.RealtimePrivacySettings_108e2c8(sp, a0, a1, a2, a3); break;
+      case 0x108e76c:  ret = Cibyl105.RealtimePrivacySettingsWidgetCallBack_108e76c(sp, a0, a1, a2, a3); break;
+      case 0x108e78c:  ret = Cibyl105.save_changes_108e78c(sp, a0, a1, a2, a3); break;
+      case 0x108e860:  ret = Cibyl105.on_ok_108e860(sp, a0, a1, a2, a3); break;
+      case 0x108e888:  ret = Cibyl105.on_close_dialog_108e888(sp, a0, a1, a2, a3); break;
+      case 0x108e8b0:  ret = Cibyl105.Realtime_OfflineWriteLine_108e8b0(sp, a0, a1, a2, a3); break;
+      case 0x108e9cc:  ret = Cibyl106.Realtime_OfflineWrite_108e9cc(sp, a0, a1, a2, a3); break;
+      case 0x108ea4c:  ret = Cibyl106.Realtime_OfflineClose_108ea4c(sp, a0, a1, a2, a3); break;
+      case 0x108ea9c:  ret = Cibyl106.Realtime_OfflineOpen_108ea9c(sp, a0, a1, a2, a3); break;
+      case 0x108eaf4:  ret = Cibyl106.RealtimeAltRoutes_Count_108eaf4(); break;
+      case 0x108eb04:  ret = Cibyl106.RealtimeAltRoutes_Clear_108eb04(); break;
+      case 0x108eb10:  ret = Cibyl106.RealtimeAltRoutes_Init_Record_108eb10( a0); break;
+      case 0x108eb54:  ret = Cibyl106.RealtimeAltRoutes_Get_Record_108eb54( a0); break;
+      case 0x108eb70:  ret = Cibyl106.RealtimeAltRoutes_Get_Route_Result_108eb70( a0); break;
+      case 0x108eb8c:  ret = Cibyl106.RealtimeAltRoutes_Get_Num_Routes_108eb8c(); break;
+      case 0x108eb9c:  ret = Cibyl106.RealtimeAltRoutes_Route_CancelRequest_108eb9c(); break;
+      case 0x108ebac:  ret = Cibyl106.RealtimeAltRoutes_GetOrigin_108ebac(sp, a0, a1, a2, a3); break;
+      case 0x108ec5c:  ret = Cibyl106.RealtimeAltRoutes_TripRoute_Request_108ec5c(sp, a0, a1, a2, a3); break;
+      case 0x108ed40:  ret = Cibyl106.RealtimeAltRoutes_OnTripRouteRC_108ed40(sp, a0, a1, a2, a3); break;
+      case 0x108eddc:  ret = Cibyl106.RealtimeAltRoutes_Route_Request_108eddc(sp, a0, a1, a2, a3); break;
+      case 0x108eee0:  ret = Cibyl106.RealtimeAltRoutes_OnRouteSegments_108eee0(sp, a0, a1, a2, a3); break;
+      case 0x108efa0:  ret = Cibyl106.RealtimeAltRoutes_OnTripRouteResults_108efa0(sp, a0, a1, a2, a3); break;
+      case 0x108f0c4:  ret = Cibyl106.RealtimeAltRoutes_OnRouteResults_108f0c4(sp, a0, a1, a2, a3); break;
+      case 0x108f1c4:  ret = Cibyl106.RealtimeAltRoutes_Add_Route_108f1c4(sp, a0, a1, a2, a3); break;
+      case 0x108f4b8:  ret = Cibyl106.RealtimeExternalPoi_DisplayList_Compare_108f4b8( a0, a1, a2, a3); break;
+      case 0x108f568:  ret = Cibyl106.RealtimeExternalPoi_ExternalPoi_Init_108f568(sp, a0, a1, a2, a3); break;
+      case 0x108f5c8:  ret = Cibyl106.RealtimeExternalPoi_ExternalPoiType_Init_108f5c8(sp, a0, a1, a2, a3); break;
+      case 0x108f644:  ret = Cibyl106.is_visible_108f644(sp, a0, a1, a2, a3); break;
+      case 0x108f6e4:  ret = Cibyl106.RemovePoiObject_108f6e4(sp, a0, a1, a2, a3); break;
+      case 0x108f800:  ret = Cibyl106.RealtimeExternalPoi_DisplayList_clear_108f800(sp, a0, a1, a2, a3); break;
+      case 0x108f89c:  ret = Cibyl106.get_max_pois_display_108f89c(sp, a0, a1, a2, a3); break;
+      case 0x108f908:  ret = Cibyl106.CreatePoiObject_108f908(sp, a0, a1, a2, a3); break;
+      case 0x108fbf8:  ret = Cibyl106.RealtimeExternalPoi_UpdateDisplayList_108fbf8(sp, a0, a1, a2, a3); break;
+      case 0x108fdd8:  ret = Cibyl107.OnPoiShortClick_108fdd8(sp, a0, a1, a2, a3); break;
+      case 0x108fe60:  ret = Cibyl107.init_ExternalPoiTypesTable_108fe60(sp, a0, a1, a2, a3); break;
+      case 0x108fec0:  ret = Cibyl107.init_ExternalPoiTable_108fec0(sp, a0, a1, a2, a3); break;
+      case 0x108ff20:  ret = Cibyl107.RealtimeExternalPoi_AfterRefresh_108ff20(sp, a0, a1, a2, a3); break;
+      case 0x108ffd8:  ret = Cibyl107.RealtimeExternalPoi_GetUrl_108ffd8(sp, a0, a1, a2, a3); break;
+      case 0x108fffc:  ret = Cibyl107.RealtimeExternalPoi_FeatureEnabled_108fffc(sp, a0, a1, a2, a3); break;
+      case 0x1090030:  ret = Cibyl107.RealtimeExternalPoi_DisplayList_add_ID_1090030(sp, a0, a1, a2, a3); break;
+      case 0x1090080:  ret = Cibyl107.RealtimeExternalPoi_DisplayList_1090080(sp, a0, a1, a2, a3); break;
+      case 0x1090250:  ret = Cibyl107.RealtimeExternalPoi_ExternalPoi_Remove_1090250(sp, a0, a1, a2, a3); break;
+      case 0x10903ac:  ret = Cibyl107.RealtimeExternalPoi_Term_10903ac(sp, a0, a1, a2, a3); break;
+      case 0x109043c:  ret = Cibyl107.RealtimeExternalPoi_Init_109043c(sp, a0, a1, a2, a3); break;
+      case 0x109052c:  ret = Cibyl107.T_49_109052c(sp, a0, a1, a2, a3); break;
+      case 0x1090568:  ret = Cibyl107.RealtimeExternalPoi_ExternalPoiType_Add_1090568(sp, a0, a1, a2, a3); break;
+      case 0x1090740:  ret = Cibyl107.RealtimeExternalPoi_ExternalPoi_Add_1090740(sp, a0, a1, a2, a3); break;
+      case 0x10908f0:  ret = Cibyl107.RealtimeExternalPoiDlg_10908f0(sp, a0, a1, a2, a3); break;
+      case 0x1090b04:  ret = Cibyl107.Drive_sk_cb_1090b04(sp, a0, a1, a2, a3); break;
+      case 0x1090b84:  ret = Cibyl107.on_dialog_close_1090b84(sp, a0, a1, a2, a3); break;
+      case 0x1090bbc:  ret = Cibyl107.draw_browser_rect_1090bbc(sp, a0, a1, a2, a3); break;
+      case 0x1090dc4:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_Count_1090dc4(); break;
+      case 0x1090dd4:  ret = Cibyl107.RealtimeExternalPoi_DisplayedList_get_ID_1090dd4( a0); break;
+      case 0x1090df0:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_1090df0(); break;
+      case 0x1090e00:  ret = Cibyl107.RealtimeExternalPoiNotifier_NotifyOnNavigate_1090e00(sp, a0, a1, a2, a3); break;
+      case 0x1090e48:  ret = Cibyl107.RealtimeExternalPoiNotifier_NotifyOnPopUp_1090e48(sp, a0, a1, a2, a3); break;
+      case 0x1090e90:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_add_ID_1090e90(sp, a0, a1, a2, a3); break;
+      case 0x1090ef8:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_Init_1090ef8(sp, a0, a1, a2, a3); break;
+      case 0x1090f18:  ret = Cibyl107.RealtimeExternalPoiNotifier_DisplayedList_clear_1090f18(sp, a0, a1, a2, a3); break;
+      case 0x1090f44:  ret = Cibyl107.ssd_button_on_key_pressed_1090f44(sp, a0, a1, a2, a3); break;
+      case 0x1090fb0:  ret = Cibyl107.ssd_button_enable_1090fb0(sp, a0, a1, a2, a3); break;
+      case 0x1091004:  ret = Cibyl107.ssd_button_disable_1091004(sp, a0, a1, a2, a3); break;
+      case 0x1091058:  ret = Cibyl107.get_state_1091058(sp, a0, a1, a2, a3); break;
+      case 0x1091130:  ret = Cibyl108.ssd_button_change_text_1091130(sp, a0, a1, a2, a3); break;
+      case 0x109116c:  ret = Cibyl108.set_bitmap_name_109116c(sp, a0, a1, a2, a3); break;
+      case 0x10911f4:  ret = Cibyl108.ssd_button_change_images_10911f4(sp, a0, a1, a2, a3); break;
+      case 0x10912e0:  ret = Cibyl108.ssd_button_change_icon_10912e0(sp, a0, a1, a2, a3); break;
+      case 0x1091328:  ret = Cibyl108.release_1091328(sp, a0, a1, a2, a3); break;
+      case 0x1091360:  ret = Cibyl108.set_value_1091360(sp, a0, a1, a2, a3); break;
+      case 0x10914f0:  ret = Cibyl108.ssd_button_new_10914f0(sp, a0, a1, a2, a3); break;
+      case 0x10916ac:  ret = Cibyl108.ssd_button_label_10916ac(sp, a0, a1, a2, a3); break;
+      case 0x1091870:  ret = Cibyl108.ssd_button_long_click_1091870(sp, a0, a1, a2, a3); break;
+      case 0x109191c:  ret = Cibyl108.ssd_button_short_click_109191c(sp, a0, a1, a2, a3); break;
+      case 0x1091978:  ret = Cibyl108.draw_1091978(sp, a0, a1, a2, a3); break;
+      case 0x1091b3c:  ret = Cibyl108.get_input_type_1091b3c( a0); break;
+      case 0x1091b50:  ret = Cibyl108.ssd_list_get_row_1091b50( a0, a1); break;
+      case 0x1091bd0:  ret = Cibyl108.ssd_list_selected_string_1091bd0( a0, a1, a2); break;
+      case 0x1091c50:  ret = Cibyl108.ssd_list_selected_value_1091c50( a0, a1, a2); break;
+      case 0x1091cd0:  ret = Cibyl108.get_data_1091cd0( a0); break;
+      case 0x1091d6c:  ret = Cibyl108.ssd_list_resize_1091d6c(sp, a0, a1, a2, a3); break;
+      case 0x1091df0:  ret = Cibyl108.update_list_rows_1091df0(sp, a0, a1, a2, a3); break;
+      case 0x1092244:  ret = Cibyl108.label_callback_1092244(sp, a0, a1, a2, a3); break;
+      case 0x1092394:  ret = Cibyl108.setup_list_widgets_rows_1092394(sp, a0, a1, a2, a3); break;
+      case 0x10926ac:  ret = Cibyl109.ssd_list_populate_widgets_10926ac(sp, a0, a1, a2, a3); break;
+      case 0x109274c:  ret = Cibyl109.next_button_callback_109274c(sp, a0, a1, a2, a3); break;
+      case 0x1092784:  ret = Cibyl109.setup_list_rows_1092784(sp, a0, a1, a2, a3); break;
+      case 0x1092aec:  ret = Cibyl109.ssd_list_populate_1092aec(sp, a0, a1, a2, a3); break;
+      case 0x1092b84:  ret = Cibyl109.ssd_list_scroll_list_end_1092b84(sp, a0, a1, a2, a3); break;
+      case 0x1092bf8:  ret = Cibyl109.ssd_list_scroll_list_begin_1092bf8(sp, a0, a1, a2, a3); break;
+      case 0x1092d74:  ret = Cibyl109.ssd_list_new_1092d74(sp, a0, a1, a2, a3); break;
+      case 0x1092e84:  ret = Cibyl109.release_1092e84(sp, a0, a1, a2, a3); break;
+      case 0x1092ed8:  ret = Cibyl109.ssd_list_draw_1092ed8(sp, a0, a1, a2, a3); break;
+      case 0x1093004:  ret = Cibyl109.ssd_choice_new_1093004(sp, a0, a1, a2, a3); break;
+      case 0x109321c:  ret = Cibyl109.choice_callback_109321c(sp, a0, a1, a2, a3); break;
+      case 0x109326c:  ret = Cibyl109.set_data_109326c(sp, a0, a1, a2, a3); break;
+      case 0x10932e4:  ret = Cibyl109.set_value_10932e4(sp, a0, a1, a2, a3); break;
+      case 0x1093340:  ret = Cibyl109.list_callback_1093340(sp, a0, a1, a2, a3); break;
+      case 0x10933a8:  ret = Cibyl109.get_value_10933a8(sp, a0, a1, a2, a3); break;
+      case 0x10933cc:  ret = Cibyl109.get_data_10933cc(sp, a0, a1, a2, a3); break;
+      case 0x109345c:  Cibyl109.release_109345c(); break;
+      case 0x1093464:  ret = Cibyl109.short_click_1093464(sp, a0, a1, a2, a3); break;
+      case 0x109349c:  ret = Cibyl109.ssd_container_on_key_pressed_109349c(sp, a0, a1, a2, a3); break;
+      case 0x10934f0:  ret = Cibyl109.on_pointer_down_10934f0(); break;
+      case 0x1093570:  ret = Cibyl109.draw_1093570(sp, a0, a1, a2, a3); break;
+      case 0x1093fe4:  ret = Cibyl110.ssd_container_get_txtbox_height_1093fe4(sp, a0, a1, a2, a3); break;
+      case 0x1094010:  ret = Cibyl110.set_value_1094010(sp, a0, a1, a2, a3); break;
+      case 0x1094048:  ret = Cibyl110.ssd_container_new_1094048(sp, a0, a1, a2, a3); break;
+      case 0x10943ac:  ret = Cibyl110.get_value_10943ac(sp, a0, a1, a2, a3); break;
+      case 0x10943e8:  ret = Cibyl110.draw_title_bar_10943e8(sp, a0, a1, a2, a3); break;
+      case 0x1094570:  ret = Cibyl110.draw_title_1094570(sp, a0, a1, a2, a3); break;
+      case 0x10945b4:  ret = Cibyl110.ssd_dialog_is_currently_active_10945b4(); break;
+      case 0x10945c4:  ret = Cibyl110.ssd_dialog_get_currently_active_10945c4(); break;
+      case 0x10945e4:  ret = Cibyl110.ssd_dialog_currently_active_name_10945e4(); break;
+      case 0x1094604:  ret = Cibyl110.ssd_dialog_get_current_container_1094604(); break;
+      case 0x1094624:  ret = Cibyl110.ssd_dialog_get_current_data_1094624(); break;
+      case 0x1094678:  ret = Cibyl110.ssd_dialog_get_focus_1094678(); break;
+      case 0x10946dc:  ret = Cibyl110.ssd_dialog_set_current_scroll_flag_10946dc( a0); break;
+      case 0x10946fc:  ret = Cibyl110.ssd_dialog_is_context_menu_10946fc(sp, a0, a1, a2, a3); break;
+      case 0x109473c:  ret = Cibyl110.ssd_dialog_get_109473c(sp, a0, a1, a2, a3); break;
+      case 0x10947c8:  ret = Cibyl110.ssd_dialog_exists_10947c8(sp, a0, a1, a2, a3); break;
+      case 0x109480c:  ret = Cibyl110.ssd_dialog_right_title_button_109480c(sp, a0, a1, a2, a3); break;
+      case 0x109483c:  ret = Cibyl110.ssd_dialog_free_109483c(sp, a0, a1, a2, a3); break;
+      case 0x109490c:  ret = Cibyl110.ssd_dialog_add_vspace_109490c(sp, a0, a1, a2, a3); break;
+      case 0x1094970:  ret = Cibyl110.ssd_dialog_add_hspace_1094970(sp, a0, a1, a2, a3); break;
+      case 0x10949d8:  ret = Cibyl110.ssd_dialog_set_ntv_keyboard_params_10949d8(sp, a0, a1, a2, a3); break;
+      case 0x1094ac0:  ret = Cibyl110.ssd_dialog_reset_offset_1094ac0(sp, a0, a1, a2, a3); break;
+      case 0x1094b10:  ret = Cibyl110.ssd_dialog_redraw_screen_recursive_1094b10(sp, a0, a1, a2, a3); break;
+      case 0x1094bc8:  ret = Cibyl110.ssd_dialog_invalidate_tab_order_by_name_1094bc8(sp, a0, a1, a2, a3); break;
+      case 0x1094c14:  ret = Cibyl110.ssd_dialog_invalidate_tab_order_1094c14(sp, a0, a1, a2, a3); break;
+      case 0x1094c5c:  ret = Cibyl110.ssd_dialog_context_1094c5c(sp, a0, a1, a2, a3); break;
+      case 0x1094cb0:  ret = Cibyl110.ssd_dialog_set_callback_1094cb0(sp, a0, a1, a2, a3); break;
+      case 0x1094d58:  ret = Cibyl110.ssd_dialog_set_data_1094d58(sp, a0, a1, a2, a3); break;
+      case 0x1094d94:  ret = Cibyl110.ssd_dialog_set_value_1094d94(sp, a0, a1, a2, a3); break;
+      case 0x1094dd0:  ret = Cibyl110.ssd_dialog_get_data_1094dd0(sp, a0, a1, a2, a3); break;
+      case 0x1094e00:  ret = Cibyl110.ssd_dialog_get_value_1094e00(sp, a0, a1, a2, a3); break;
+      case 0x1094e30:  ret = Cibyl110.ssd_dialog_enable_callback_1094e30(sp, a0, a1, a2, a3); break;
+      case 0x1094e60:  ret = Cibyl110.ssd_dialog_draw_1094e60(sp, a0, a1, a2, a3); break;
+      case 0x1094ea8:  ret = Cibyl110.ssd_dialog_hide_cont_1094ea8(sp, a0, a1, a2, a3); break;
+      case 0x1094ff4:  ret = Cibyl110.ssd_dialog_hide_1094ff4(sp, a0, a1, a2, a3); break;
+      case 0x10950dc:  ret = Cibyl110.ssd_dialog_hide_all_10950dc(sp, a0, a1, a2, a3); break;
+      case 0x1095128:  ret = Cibyl110.left_softkey_callback_1095128(sp, a0, a1, a2, a3); break;
+      case 0x10951ac:  ret = Cibyl110.ssd_dialog_hide_current_10951ac(sp, a0, a1, a2, a3); break;
+      case 0x10951e0:  ret = Cibyl110.right_softkey_callback_10951e0(sp, a0, a1, a2, a3); break;
+      case 0x1095264:  ret = Cibyl110.ssd_dialog_drag_motion_1095264(sp, a0, a1, a2, a3); break;
+      case 0x1095408:  ret = Cibyl110.ssd_dialog_long_click_1095408(sp, a0, a1, a2, a3); break;
+      case 0x1095440:  ret = Cibyl111.ssd_dialog_short_click_1095440(sp, a0, a1, a2, a3); break;
+      case 0x1095550:  ret = Cibyl111.ssd_dialog_released_1095550(sp, a0, a1, a2, a3); break;
+      case 0x1095598:  ret = Cibyl111.set_softkeys_1095598(sp, a0, a1, a2, a3); break;
+      case 0x1095668:  ret = Cibyl111.ssd_dialog_refresh_current_softkeys_1095668(sp, a0, a1, a2, a3); break;
+      case 0x10956c0:  ret = Cibyl111.ssd_dialog_drag_end_10956c0(sp, a0, a1, a2, a3); break;
+      case 0x10958c8:  ret = Cibyl111.keep_dragging_10958c8(sp, a0, a1, a2, a3); break;
+      case 0x1095990:  ret = Cibyl111.ssd_dialog_drag_start_1095990(sp, a0, a1, a2, a3); break;
+      case 0x1095a6c:  ret = Cibyl111.ssd_dialog_pressed_1095a6c(sp, a0, a1, a2, a3); break;
+      case 0x1095b64:  ret = Cibyl111.ssd_dialog_sort_tab_order_1095b64(sp, a0, a1, a2, a3); break;
+      case 0x1095bc0:  ret = Cibyl111.ssd_dialog_sort_tab_order_by_gui_position_1095bc0(sp, a0, a1, a2, a3); break;
+      case 0x1095c4c:  ret = Cibyl111.draw_dialog_1095c4c(sp, a0, a1, a2, a3); break;
+      case 0x1095e20:  ret = Cibyl111.ssd_dialog_recalculate_1095e20(sp, a0, a1, a2, a3); break;
+      case 0x1095e70:  ret = Cibyl111.ssd_dialog_draw_prev_1095e70(sp, a0, a1, a2, a3); break;
+      case 0x1095ebc:  ret = Cibyl111.ssd_dialog_draw_now_1095ebc(sp, a0, a1, a2, a3); break;
+      case 0x1095ee4:  ret = Cibyl111.ssd_dialog_sort_tab_order_current_1095ee4(sp, a0, a1, a2, a3); break;
+      case 0x1095f0c:  ret = Cibyl111.ssd_dialog_change_text_1095f0c(sp, a0, a1, a2, a3); break;
+      case 0x1095f54:  ret = Cibyl111.ssd_dialog_change_button_1095f54(sp, a0, a1, a2, a3); break;
+      case 0x1096050:  ret = Cibyl111.ssd_dialog_new_1096050(sp, a0, a1, a2, a3); break;
+      case 0x1096230:  ret = Cibyl111.ssd_dialog_align_focus_1096230(sp, a0, a1, a2, a3); break;
+      case 0x1096418:  ret = Cibyl111.ssd_dialog_set_dialog_focus_1096418(sp, a0, a1, a2, a3); break;
+      case 0x1096534:  ret = Cibyl111.ssd_dialog_activate_1096534(sp, a0, a1, a2, a3); break;
+      case 0x10967c4:  ret = Cibyl112.ssd_dialog_set_focus_10967c4(sp, a0, a1, a2, a3); break;
+      case 0x10967f8:  ret = Cibyl112.ssd_dialog_resort_tab_order_10967f8(sp, a0, a1, a2, a3); break;
+      case 0x10968ac:  ret = Cibyl112.ssd_dialog_move_focus_10968ac(sp, a0, a1, a2, a3); break;
+      case 0x109690c:  ret = Cibyl112.OnKeyPressed_109690c(sp, a0, a1, a2, a3); break;
+      case 0x1096b3c:  ret = Cibyl112.ssd_entry_set_kb_params_1096b3c(sp, a0, a1, a2, a3); break;
+      case 0x1096b8c:  ret = Cibyl112.ssd_entry_set_editbox_title_1096b8c( a0, a1); break;
+      case 0x1096ba8:  ret = Cibyl112.confirmed_edit_callback_1096ba8(sp, a0, a1, a2, a3); break;
+      case 0x1096bec:  ret = Cibyl112.edit_callback_1096bec(sp, a0, a1, a2, a3); break;
+      case 0x1096cb0:  ret = Cibyl112.confirm_cb_1096cb0(sp, a0, a1, a2, a3); break;
+      case 0x1096cdc:  ret = Cibyl112.on_kb_closed_1096cdc(sp, a0, a1, a2, a3); break;
+      case 0x1096d9c:  ret = Cibyl112.set_value_1096d9c(sp, a0, a1, a2, a3); break;
+      case 0x1096e24:  ret = Cibyl112.get_value_1096e24(sp, a0, a1, a2, a3); break;
+      case 0x1096e48:  ret = Cibyl112.T_20_1096e48(sp, a0, a1, a2, a3); break;
+      case 0x1096e84:  ret = Cibyl112.ssd_entry_new_1096e84(sp, a0, a1, a2, a3); break;
+      case 0x1097114:  ret = Cibyl112.ssd_confirmed_entry_new_1097114(sp, a0, a1, a2, a3); break;
+      case 0x1097360:  ret = Cibyl112.on_pointer_down_1097360(); break;
+      case 0x10973e0:  ret = Cibyl112.ssd_menu_hide_10973e0(sp, a0, a1, a2, a3); break;
+      case 0x1097400:  ret = Cibyl112.find_action_1097400(sp, a0, a1, a2, a3); break;
+      case 0x1097494:  ret = Cibyl112.ssd_list_menu_activate_1097494(sp, a0, a1, a2, a3); break;
+      case 0x10975c0:  ret = Cibyl112.ssd_menu_set_right_text_10975c0(sp, a0, a1, a2, a3); break;
+      case 0x1097624:  ret = Cibyl112.ssd_menu_new_cb_1097624(sp, a0, a1, a2, a3); break;
+      case 0x1097e2c:  ret = Cibyl113.ssd_menu_new_1097e2c(sp, a0, a1, a2, a3); break;
+      case 0x1097e5c:  ret = Cibyl113.ssd_menu_activate_1097e5c(sp, a0, a1, a2, a3); break;
+      case 0x1097f24:  ret = Cibyl113.on_cancel_1097f24(sp, a0, a1, a2, a3); break;
+      case 0x1097f5c:  ret = Cibyl113.on_key_pressed_cancel_1097f5c(sp, a0, a1, a2, a3); break;
+      case 0x1097fa0:  ret = Cibyl113.short_click_1097fa0(sp, a0, a1, a2, a3); break;
+      case 0x1097fdc:  ret = Cibyl113.long_click_1097fdc(sp, a0, a1, a2, a3); break;
+      case 0x1097ffc:  ret = Cibyl113.on_key_pressed_1097ffc(sp, a0, a1, a2, a3); break;
+      case 0x1098040:  ret = Cibyl113.delayed_short_click_1098040(sp, a0, a1, a2, a3); break;
+      case 0x10980ec:  ret = Cibyl113.delayed_cancel_10980ec(sp, a0, a1, a2, a3); break;
+      case 0x1098120:  ret = Cibyl113.ssd_text_set_auto_size_1098120( a0); break;
+      case 0x1098130:  ret = Cibyl113.ssd_text_set_auto_trim_1098130( a0); break;
+      case 0x1098140:  Cibyl113.ssd_text_set_color_1098140( a0, a1); break;
+      case 0x1098148:  ret = Cibyl113.ssd_text_set_input_type_1098148( a0, a1, a2); break;
+      case 0x1098164:  ret = Cibyl113.ssd_text_set_font_size_1098164( a0, a1); break;
+      case 0x1098184:  ret = Cibyl113.reset_line_cache_1098184( a0, a1, a2, a3); break;
+      case 0x1098210:  ret = Cibyl113.get_value_1098210(sp, a0, a1, a2, a3); break;
+      case 0x1098248:  ret = Cibyl113.ssd_text_get_text_1098248(sp, a0, a1, a2, a3); break;
+      case 0x109827c:  ret = Cibyl113.ssd_text__get_input_type_109827c( a0); break;
+      case 0x1098290:  ret = Cibyl113.ssd_text_set_readonly_1098290( a0, a1); break;
+      case 0x10983bc:  ret = Cibyl113.text_ctx_init_10983bc(sp, a0, a1, a2, a3); break;
+      case 0x10983f4:  ret = Cibyl113.set_value_10983f4(sp, a0, a1, a2, a3); break;
+      case 0x10984a4:  ret = Cibyl113.ssd_text_set_text_10984a4(sp, a0, a1, a2, a3); break;
+      case 0x1098514:  ret = Cibyl113.on_editbox_closed_1098514(sp, a0, a1, a2, a3); break;
+      case 0x109853c:  ret = Cibyl113.ssd_text_reset_text_109853c(sp, a0, a1, a2, a3); break;
+      case 0x1098588:  ret = Cibyl113.release_1098588(sp, a0, a1, a2, a3); break;
+      case 0x10985dc:  ret = Cibyl113.format_text_10985dc(sp, a0, a1, a2, a3); break;
+      case 0x1098e5c:  ret = Cibyl113.draw_1098e5c(sp, a0, a1, a2, a3); break;
+      case 0x1099190:  ret = Cibyl114.ssd_text_on_key_pressed_1099190(sp, a0, a1, a2, a3); break;
+      case 0x10992cc:  ret = Cibyl114.T_35_10992cc(sp, a0, a1, a2, a3); break;
+      case 0x1099308:  ret = Cibyl114.ssd_text_set_text_size_1099308(sp, a0, a1, a2, a3); break;
+      case 0x1099358:  ret = Cibyl114.ssd_text_new_1099358(sp, a0, a1, a2, a3); break;
+      case 0x10994dc:  ret = Cibyl114.ssd_widget_default_on_key_pressed_10994dc(); break;
+      case 0x10994e4:  Cibyl114.ssd_widget_set_callback_10994e4( a0, a1); break;
+      case 0x109950c:  ret = Cibyl114.ssd_widget_add_109950c( a0, a1); break;
+      case 0x1099540:  Cibyl114.ssd_widget_set_size_1099540( a0, a1, a2); break;
+      case 0x109954c:  ret = Cibyl114.ssd_widget_move_child_positions_109954c(sp, a0, a1, a2, a3); break;
+      case 0x10995cc:  ret = Cibyl114.ssd_widget_set_offset_10995cc(sp, a0, a1, a2, a3); break;
+      case 0x1099620:  Cibyl114.ssd_widget_set_context_1099620( a0, a1); break;
+      case 0x1099628:  Cibyl114.ssd_widget_set_color_1099628( a0, a1, a2); break;
+      case 0x1099634:  ret = Cibyl114.ssd_widget_get_context_1099634( a0); break;
+      case 0x1099640:  ret = Cibyl114.ssd_widget_reset_cache_1099640(sp, a0, a1, a2, a3); break;
+      case 0x1099690:  ret = Cibyl114.ssd_widget_reset_position_1099690(sp, a0, a1, a2, a3); break;
+      case 0x10996e0:  ret = Cibyl114.ssd_widget_hide_10996e0( a0); break;
+      case 0x10996f4:  ret = Cibyl114.ssd_widget_show_10996f4( a0); break;
+      case 0x1099714:  ret = Cibyl114.ssd_widget_set_flags_1099714( a0, a1); break;
+      case 0x1099734:  ret = Cibyl114.ssd_widget_on_key_pressed_1099734(sp, a0, a1, a2, a3); break;
+      case 0x10997bc:  Cibyl114.ssd_widget_set_left_softkey_callback_10997bc( a0, a1); break;
+      case 0x10997c4:  Cibyl114.ssd_widget_set_right_softkey_callback_10997c4( a0, a1); break;
+      case 0x10997cc:  ret = Cibyl114.ssd_widget_pointer_down_force_click_10997cc( a0); break;
+      case 0x10997d8:  ret = Cibyl114.ssd_widget_set_pointer_force_click_10997d8( a0); break;
+      case 0x10997f4:  ret = Cibyl114.ssd_widget_set_click_offsets_10997f4(sp, a0, a1, a2, a3); break;
+      case 0x1099818:  ret = Cibyl114.ssd_widget_set_click_offsets_ext_1099818(sp, a0, a1, a2, a3); break;
+      case 0x1099830:  Cibyl114.ssd_widget_set_focus_highlight_1099830( a0, a1); break;
+      case 0x1099838:  ret = Cibyl114.ssd_widget_set_recalculate_1099838( a0); break;
+      case 0x1099844:  ret = Cibyl114.ssd_widget_free_node_1099844(sp, a0, a1, a2, a3); break;
+      case 0x1099888:  ret = Cibyl114.ssd_widget_free_all_1099888(sp, a0, a1, a2, a3); break;
+      case 0x10998f0:  ret = Cibyl114.ssd_widget_free_10998f0(sp, a0, a1, a2, a3); break;
+      case 0x1099998:  ret = Cibyl114.ssd_widget_get_size_1099998(sp, a0, a1, a2, a3); break;
+      case 0x1099d84:  ret = Cibyl114.ssd_widget_contains_point_1099d84(sp, a0, a1, a2, a3); break;
+      case 0x1099e88:  ret = Cibyl114.ssd_widget_pointer_up_force_click_1099e88(sp, a0, a1, a2, a3); break;
+      case 0x1099f7c:  ret = Cibyl114.ssd_widget_long_click_1099f7c(sp, a0, a1, a2, a3); break;
+      case 0x109a018:  ret = Cibyl114.ssd_widget_short_click_109a018(sp, a0, a1, a2, a3); break;
+      case 0x109a0b4:  ret = Cibyl114.ssd_widget_pointer_up_109a0b4(sp, a0, a1, a2, a3); break;
+      case 0x109a150:  ret = Cibyl114.ssd_widget_pointer_down_109a150(sp, a0, a1, a2, a3); break;
+      case 0x109a204:  ret = Cibyl114.ssd_widget_find_by_pos_109a204(sp, a0, a1, a2, a3); break;
+      case 0x109a280:  ret = Cibyl114.get_size_109a280(sp, a0, a1, a2, a3); break;
+      case 0x109a768:  ret = Cibyl115.ssd_widget_find_clickable_by_pos_109a768(sp, a0, a1, a2, a3); break;
+      case 0x109a880:  ret = Cibyl115.ssd_widget_container_size_109a880(sp, a0, a1, a2, a3); break;
+      case 0x109a968:  ret = Cibyl115.ssd_widget_replace_109a968(sp, a0, a1, a2, a3); break;
+      case 0x109a9f0:  ret = Cibyl115.ssd_widget_remove_109a9f0(sp, a0, a1, a2, a3); break;
+      case 0x109aa6c:  ret = Cibyl115.ssd_widget_rtl_109aa6c(sp, a0, a1, a2, a3); break;
+      case 0x109aaa4:  ret = Cibyl115.ssd_widget_new_109aaa4(sp, a0, a1, a2, a3); break;
+      case 0x109abd0:  ret = Cibyl115.ssd_widget_draw_row_109abd0(sp, a0, a1, a2, a3); break;
+      case 0x109b108:  ret = Cibyl115.ssd_widget_draw_pack_109b108(sp, a0, a1, a2, a3); break;
+      case 0x109b408:  ret = Cibyl115.ssd_widget_draw_109b408(sp, a0, a1, a2, a3); break;
+      case 0x109b440:  ret = Cibyl115.ssd_widget_draw_one_109b440(sp, a0, a1, a2, a3); break;
+      case 0x109b568:  ret = Cibyl115.ssd_widget_draw_grid_109b568(sp, a0, a1, a2, a3); break;
+      case 0x109b94c:  ret = Cibyl115.ssd_widget_get_109b94c(sp, a0, a1, a2, a3); break;
+      case 0x109b9d4:  ret = Cibyl116.ssd_widget_set_data_109b9d4(sp, a0, a1, a2, a3); break;
+      case 0x109ba28:  ret = Cibyl116.ssd_widget_set_value_109ba28(sp, a0, a1, a2, a3); break;
+      case 0x109ba7c:  ret = Cibyl116.ssd_widget_set_left_softkey_text_109ba7c(sp, a0, a1, a2, a3); break;
+      case 0x109bb54:  ret = Cibyl116.ssd_widget_set_right_softkey_text_109bb54(sp, a0, a1, a2, a3); break;
+      case 0x109bc30:  ret = Cibyl116.ssd_widget_get_data_109bc30(sp, a0, a1, a2, a3); break;
+      case 0x109bc7c:  ret = Cibyl116.ssd_widget_get_value_109bc7c(sp, a0, a1, a2, a3); break;
+      case 0x109bcdc:  ret = Cibyl116.ssd_progress_set_value_109bcdc( a0, a1); break;
+      case 0x109bd04:  ret = Cibyl116.ssd_progress_new_109bd04(sp, a0, a1, a2, a3); break;
+      case 0x109bd64:  ret = Cibyl116.draw_109bd64(sp, a0, a1, a2, a3); break;
+      case 0x109c1a8:  ret = Cibyl116.list_callback_109c1a8(sp, a0, a1, a2, a3); break;
+      case 0x109c1e4:  ret = Cibyl116.del_callback_109c1e4(sp, a0, a1, a2, a3); break;
+      case 0x109c220:  ret = Cibyl116.list_left_softkey_callback_109c220(sp, a0, a1, a2, a3); break;
+      case 0x109c254:  ret = Cibyl116.ssd_generic_list_dialog_hide_all_109c254(sp, a0, a1, a2, a3); break;
+      case 0x109c274:  ret = Cibyl116.ssd_generic_list_dialog_hide_109c274(sp, a0, a1, a2, a3); break;
+      case 0x109c32c:  ret = Cibyl116.on_dialog_closed_109c32c(sp, a0, a1, a2, a3); break;
+      case 0x109c560:  ret = Cibyl116.ssd_generic_list_dialog_show_109c560(sp, a0, a1, a2, a3); break;
+      case 0x109c72c:  ret = Cibyl116.get_value_109c72c( a0); break;
+      case 0x109c764:  ret = Cibyl116.get_data_109c764( a0); break;
+      case 0x109c794:  ret = Cibyl116.ssd_checkbox_new_109c794(sp, a0, a1, a2, a3); break;
+      case 0x109c958:  ret = Cibyl116.choice_callback_109c958(sp, a0, a1, a2, a3); break;
+      case 0x109c9d0:  ret = Cibyl116.set_data_109c9d0(sp, a0, a1, a2, a3); break;
+      case 0x109ca98:  ret = Cibyl116.set_value_109ca98(sp, a0, a1, a2, a3); break;
+      case 0x109cb4c:  ret = Cibyl116.ssd_contextmenu_show_item_109cb4c(sp, a0, a1, a2, a3); break;
+      case 0x109cc34:  ret = Cibyl116.ssd_contextmenu_menu_button_register_109cc34(sp, a0, a1, a2, a3); break;
+      case 0x109cc70:  ret = Cibyl116.on_options_wrapper_109cc70(sp, a0, a1, a2, a3); break;
+      case 0x109ccc0:  ret = Cibyl116.close_all_popup_menus_109ccc0(sp, a0, a1, a2, a3); break;
+      case 0x109cd68:  ret = Cibyl116.exit_context_menu_109cd68(sp, a0, a1, a2, a3); break;
+      case 0x109cdf8:  ret = Cibyl116.native_menu_item_callback_109cdf8(sp, a0, a1, a2, a3); break;
+      case 0x109ce38:  ret = Cibyl116.ssd_context_menu_show_109ce38(sp, a0, a1, a2, a3); break;
+      case 0x109cf2c:  ret = Cibyl117.ssd_contextmenu_delete_109cf2c(sp, a0, a1, a2, a3); break;
+      case 0x109cfec:  ret = Cibyl117.ssd_contextmenu_set_separator_109cfec(sp, a0, a1, a2, a3); break;
+      case 0x109d094:  ret = Cibyl117.ssd_contextmenu_show_item__by_action_name_109d094(sp, a0, a1, a2, a3); break;
+      case 0x109d210:  ret = Cibyl117.on_dialog_closed_109d210(sp, a0, a1, a2, a3); break;
+      case 0x109d24c:  ret = Cibyl117.on_device_event_109d24c( a0); break;
+      case 0x109d270:  ret = Cibyl117.ssd_tabcontrol_get_dialog_109d270( a0); break;
+      case 0x109d27c:  ret = Cibyl117.get_arrow_size_109d27c(sp, a0, a1, a2, a3); break;
+      case 0x109d310:  ret = Cibyl117.ssd_tabcontrol_get_height_109d310(sp, a0, a1, a2, a3); break;
+      case 0x109d330:  ret = Cibyl117.ssd_tabcontrol_get_tab_109d330(sp, a0, a1, a2, a3); break;
+      case 0x109d3a4:  ret = Cibyl117.ssd_tabcontrol_get_active_tab_109d3a4(sp, a0, a1, a2, a3); break;
+      case 0x109d3c8:  ret = Cibyl117.tabsline_set_text_109d3c8(sp, a0, a1, a2, a3); break;
+      case 0x109d418:  ret = Cibyl117.tabsline_select_tab_109d418(sp, a0, a1, a2, a3); break;
+      case 0x109d4e4:  ret = Cibyl117.tabsline_enable_arrow_109d4e4(sp, a0, a1, a2, a3); break;
+      case 0x109d544:  ret = Cibyl117.initialize_tabsline_109d544(sp, a0, a1, a2, a3); break;
+      case 0x109d5e4:  ret = Cibyl117.tabs_draw_109d5e4(sp, a0, a1, a2, a3); break;
+      case 0x109d804:  ret = Cibyl117.ssd_tabcontrol_set_active_tab_109d804(sp, a0, a1, a2, a3); break;
+      case 0x109dab4:  ret = Cibyl117.on_right_arrow_109dab4(sp, a0, a1, a2, a3); break;
+      case 0x109db04:  ret = Cibyl117.on_right_arrow_p_109db04(sp, a0, a1, a2, a3); break;
+      case 0x109db24:  ret = Cibyl117.on_tab_109db24(sp, a0, a1, a2, a3); break;
+      case 0x109dba4:  ret = Cibyl117.on_tab_p_109dba4(sp, a0, a1, a2, a3); break;
+      case 0x109dbc4:  ret = Cibyl117.on_left_arrow_109dbc4(sp, a0, a1, a2, a3); break;
+      case 0x109dc0c:  ret = Cibyl117.on_left_arrow_p_109dc0c(sp, a0, a1, a2, a3); break;
+      case 0x109dc2c:  ret = Cibyl117.move_one_tab_left_109dc2c(sp, a0, a1, a2, a3); break;
+      case 0x109dc88:  ret = Cibyl117.ssd_tabcontrol_move_tab_left_109dc88(sp, a0, a1, a2, a3); break;
+      case 0x109dcd0:  ret = Cibyl117.move_one_tab_right_109dcd0(sp, a0, a1, a2, a3); break;
+      case 0x109dd2c:  ret = Cibyl117.OnKeyPressed_109dd2c(sp, a0, a1, a2, a3); break;
+      case 0x109dddc:  ret = Cibyl117.OnTabLineKeyPressed_109dddc(sp, a0, a1, a2, a3); break;
+      case 0x109de04:  ret = Cibyl117.ssd_tabcontrol_move_tab_right_109de04(sp, a0, a1, a2, a3); break;
+      case 0x109de4c:  ret = Cibyl117.ssd_tabcontrol_show_109de4c(sp, a0, a1, a2, a3); break;
+      case 0x109de9c:  ret = Cibyl117.tabcontrol_info_init_109de9c(sp, a0, a1, a2, a3); break;
+      case 0x109ded8:  ret = Cibyl117.ssd_tabcontrol_new_109ded8(sp, a0, a1, a2, a3); break;
+      case 0x109e428:  ret = Cibyl118.ssd_bitmap_remove_overlays_109e428( a0); break;
+      case 0x109e434:  ret = Cibyl118.ssd_bitmap_add_overlay_109e434(sp, a0, a1, a2, a3); break;
+      case 0x109e4a0:  ret = Cibyl118.close_splash_109e4a0(sp, a0, a1, a2, a3); break;
+      case 0x109e4dc:  ret = Cibyl118.set_bitmap_name_109e4dc(sp, a0, a1, a2, a3); break;
+      case 0x109e558:  ret = Cibyl118.ssd_bitmap_update_109e558(sp, a0, a1, a2, a3); break;
+      case 0x109e584:  ret = Cibyl118.ssd_bitmap_image_update_109e584(sp, a0, a1, a2, a3); break;
+      case 0x109e5d8:  ret = Cibyl118.ssd_bitmap_image_new_109e5d8(sp, a0, a1, a2, a3); break;
+      case 0x109e698:  ret = Cibyl118.release_109e698(sp, a0, a1, a2, a3); break;
+      case 0x109e6d0:  ret = Cibyl118.set_value_109e6d0(sp, a0, a1, a2, a3); break;
+      case 0x109e784:  ret = Cibyl118.ssd_bitmap_new_109e784(sp, a0, a1, a2, a3); break;
+      case 0x109e808:  ret = Cibyl118.ssd_bitmap_splash_109e808(sp, a0, a1, a2, a3); break;
+      case 0x109e8bc:  ret = Cibyl118.draw_109e8bc(sp, a0, a1, a2, a3); break;
+      case 0x109eaf0:  ret = Cibyl118.draw_109eaf0(sp, a0, a1, a2, a3); break;
+      case 0x109eb20:  ret = Cibyl118.ssd_popup_update_location_109eb20( a0, a1); break;
+      case 0x109eb38:  ret = Cibyl118.ssd_popup_new_109eb38(sp, a0, a1, a2, a3); break;
+      case 0x109ed18:  ret = Cibyl118.ssd_separator_new_109ed18(sp, a0, a1, a2, a3); break;
+      case 0x109ed60:  ret = Cibyl118.draw_109ed60(sp, a0, a1, a2, a3); break;
+      case 0x109ee04:  ret = Cibyl118.ssd_icon_wimage_is_valid_109ee04( a0, a1); break;
+      case 0x109ee70:  ret = Cibyl118.on_key_pressed_109ee70(sp, a0, a1, a2, a3); break;
+      case 0x109eee4:  ret = Cibyl118.ssd_icon_set_width_109eee4( a0, a1); break;
+      case 0x109ef0c:  ret = Cibyl118.ssd_icon_set_state_109ef0c( a0, a1); break;
+      case 0x109ef20:  ret = Cibyl118.ssd_icon_set_unhandled_key_press_109ef20( a0, a1); break;
+      case 0x109ef2c:  ret = Cibyl118.on_pointer_down_109ef2c(sp, a0, a1, a2, a3); break;
+      case 0x109efa4:  ret = Cibyl118.draw_109efa4(sp, a0, a1, a2, a3); break;
+      case 0x109f1a0:  ret = Cibyl118.load_image_109f1a0(sp, a0, a1, a2, a3); break;
+      case 0x109f268:  ret = Cibyl118.imageset_info_load_109f268(sp, a0, a1, a2, a3); break;
+      case 0x109f2fc:  ret = Cibyl118.ssd_icon_set_images_109f2fc(sp, a0, a1, a2, a3); break;
+      case 0x109f3cc:  ret = Cibyl118.wimage_info_load_109f3cc(sp, a0, a1, a2, a3); break;
+      case 0x109f514:  ret = Cibyl118.wimageset_info_load_109f514(sp, a0, a1, a2, a3); break;
+      case 0x109f5a0:  ret = Cibyl118.ssd_icon_set_wimages_109f5a0(sp, a0, a1, a2, a3); break;
+      case 0x109f678:  ret = Cibyl119.icon_ctx_init_109f678(sp, a0, a1, a2, a3); break;
+      case 0x109f69c:  ret = Cibyl119.ssd_icon_create_109f69c(sp, a0, a1, a2, a3); break;
+      case 0x109f774:  ret = Cibyl119.widget_get_next_focus_109f774(sp, a0, a1, a2, a3); break;
+      case 0x109f844:  ret = Cibyl119.ssd_widget_get_input_type_109f844(sp, a0, a1, a2, a3); break;
+      case 0x109f8a8:  Cibyl119.ssd_widget_loose_focus_109f8a8( a0); break;
+      case 0x109f9e4:  ret = Cibyl119.ssd_widget_sort_gui_tab_order__fix_corners_109f9e4(sp, a0, a1, a2, a3); break;
+      case 0x109fc70:  ret = Cibyl119.ssd_widget_sort_gui_tab_order__fix_orphan_pointers_109fc70(sp, a0, a1, a2, a3); break;
+      case 0x109fce4:  ret = Cibyl119.ssd_widget_sort_gui_tab_order_109fce4(sp, a0, a1, a2, a3); break;
+      case 0x109fe00:  ret = Cibyl119.ssd_widget_reset_tab_order_recursive_109fe00(sp, a0, a1, a2, a3); break;
+      case 0x109fe8c:  ret = Cibyl119.ssd_widget_reset_tab_order_109fe8c(sp, a0, a1, a2, a3); break;
+      case 0x109feb0:  ret = Cibyl119.ssd_widget_sort_tab_order_recursive_109feb0(sp, a0, a1, a2, a3); break;
+      case 0x10a0088:  ret = Cibyl119.fix_widget_tab_order_sequence_10a0088( a0); break;
+      case 0x10a00f4:  ret = Cibyl119.ssd_widget_set_focus_10a00f4(sp, a0, a1, a2, a3); break;
+      case 0x10a0140:  ret = Cibyl119.ssd_widget_sort_tab_order_10a0140(sp, a0, a1, a2, a3); break;
+      case 0x10a01e0:  ret = Cibyl119.ssd_widget_move_focus_10a01e0(sp, a0, a1, a2, a3); break;
+      case 0x10a02b0:  ret = Cibyl119.on_dialog_closed_10a02b0(sp, a0, a1, a2, a3); break;
+      case 0x10a030c:  ret = Cibyl119.ssd_show_keyboard_dialog_ext_10a030c(sp, a0, a1, a2, a3); break;
+      case 0x10a09b4:  ret = Cibyl119.on_done_10a09b4(sp, a0, a1, a2, a3); break;
+      case 0x10a0a1c:  ret = Cibyl119.btn_callback_10a0a1c(sp, a0, a1, a2, a3); break;
+      case 0x10a0a48:  ret = Cibyl119.on_key_pressed__delegate_to_editbox_10a0a48(sp, a0, a1, a2, a3); break;
+      case 0x10a0b2c:  ret = Cibyl119.roadmap_login_new_existing_dlg_10a0b2c( a0, a1, a2, a3); break;
+      case 0x10a0be8:  ret = Cibyl120.roadmap_login_ssd_on_login_cb_10a0be8( a0); break;
+      case 0x10a0c0c:  ret = Cibyl120.roadmap_login_is_login_active_10a0c0c(); break;
+      case 0x10a0c20:  ret = Cibyl120.roadmap_login_dlg_get_username_10a0c20(); break;
+      case 0x10a0c2c:  ret = Cibyl120.roadmap_login_dlg_get_password_10a0c2c(); break;
+      case 0x10a0c38:  ret = Cibyl120.roadmap_login_dlg_get_nickname_10a0c38(); break;
+      case 0x10a0c44:  ret = Cibyl120.roadmap_login_ssd_on_signup_skip_10a0c44(sp, a0, a1, a2, a3); break;
+      case 0x10a0c88:  ret = Cibyl120.roadmap_login_dlg_get_allowPing_10a0c88(sp, a0, a1, a2, a3); break;
+      case 0x10a0cb4:  ret = Cibyl120.create_button_group_10a0cb4(sp, a0, a1, a2, a3); break;
+      case 0x10a0db0:  ret = Cibyl120.roadmap_login_profile_dialog_show_10a0db0(sp, a0, a1, a2, a3); break;
+      case 0x10a173c:  ret = Cibyl120.on_ok_softkey_10a173c(sp, a0, a1, a2, a3); break;
+      case 0x10a1764:  ret = Cibyl120.foursquare_button_cb_10a1764(sp, a0, a1, a2, a3); break;
+      case 0x10a1784:  ret = Cibyl120.facebook_button_cb_10a1784(sp, a0, a1, a2, a3); break;
+      case 0x10a17a4:  ret = Cibyl120.twitter_button_cb_10a17a4(sp, a0, a1, a2, a3); break;
+      case 0x10a17c4:  ret = Cibyl120.on_mood_select_10a17c4(sp, a0, a1, a2, a3); break;
+      case 0x10a17e8:  ret = Cibyl120.on_mood_changed_10a17e8(sp, a0, a1, a2, a3); break;
+      case 0x10a182c:  ret = Cibyl120.on_car_select_10a182c(sp, a0, a1, a2, a3); break;
+      case 0x10a1850:  ret = Cibyl120.on_car_changed_10a1850(sp, a0, a1, a2, a3); break;
+      case 0x10a18a0:  ret = Cibyl120.on_close_dialog_10a18a0(sp, a0, a1, a2, a3); break;
+      case 0x10a18d8:  ret = Cibyl120.close_timeout_10a18d8(sp, a0, a1, a2, a3); break;
+      case 0x10a1908:  ret = Cibyl120.roadmap_login_details_dialog_show_un_pw_10a1908(sp, a0, a1, a2, a3); break;
+      case 0x10a1984:  ret = Cibyl120.on_signup_skip_10a1984(sp, a0, a1, a2, a3); break;
+      case 0x10a19a4:  ret = Cibyl120.roadmap_login_update_dlg_show_10a19a4(sp, a0, a1, a2, a3); break;
+      case 0x10a1a30:  ret = Cibyl120.T_62_10a1a30(sp, a0, a1, a2, a3); break;
+      case 0x10a1a88:  ret = Cibyl120.on_create_10a1a88(sp, a0, a1, a2, a3); break;
+      case 0x10a1b0c:  ret = Cibyl120.on_next_10a1b0c(sp, a0, a1, a2, a3); break;
+      case 0x10a1b40:  ret = Cibyl120.on_update_10a1b40(sp, a0, a1, a2, a3); break;
+      case 0x10a1c18:  ret = Cibyl120.roadmap_res_invalidate_10a1c18(sp, a0, a1, a2, a3); break;
+      case 0x10a1cb4:  ret = Cibyl120.free_resource_10a1cb4(sp, a0, a1, a2, a3); break;
+      case 0x10a1d50:  ret = Cibyl120.roadmap_res_shutdown_10a1d50(sp, a0, a1, a2, a3); break;
+      case 0x10a1dd0:  ret = Cibyl120.load_resource_10a1dd0(sp, a0, a1, a2, a3); break;
+      case 0x10a1f60:  ret = Cibyl121.roadmap_res_get_10a1f60(sp, a0, a1, a2, a3); break;
+      case 0x10a25bc:  ret = Cibyl121.download_size_callback_10a25bc(sp, a0, a1, a2, a3); break;
+      case 0x10a25fc:  ret = Cibyl121.PopOldest_10a25fc(sp, a0, a1, a2, a3); break;
+      case 0x10a2754:  ret = Cibyl121.ResDataQueue_Push_10a2754(sp, a0, a1, a2, a3); break;
+      case 0x10a285c:  ret = Cibyl121.download_progress_callback_10a285c(sp, a0, a1, a2, a3); break;
+      case 0x10a28ac:  ret = Cibyl121.get_images_output_path_10a28ac(sp, a0, a1, a2, a3); break;
+      case 0x10a2918:  ret = Cibyl121.get_sound_output_path_10a2918(sp, a0, a1, a2, a3); break;
+      case 0x10a29b0:  ret = Cibyl121.roadmap_download_start_10a29b0(sp, a0, a1, a2, a3); break;
+      case 0x10a2ee8:  ret = Cibyl121.download_done_callback_10a2ee8(sp, a0, a1, a2, a3); break;
+      case 0x10a3074:  ret = Cibyl121.download_error_callback_10a3074(sp, a0, a1, a2, a3); break;
+      case 0x10a3168:  ret = Cibyl121.roadmap_res_download_init_10a3168(sp, a0, a1, a2, a3); break;
+      case 0x10a32a0:  ret = Cibyl122.roadmap_res_download_10a32a0(sp, a0, a1, a2, a3); break;
+      case 0x10a33e4:  ret = Cibyl122.intro_screen_left_key_callback_10a33e4(); break;
+      case 0x10a33ec:  Cibyl122.on_dialog_closed_10a33ec(); break;
+      case 0x10a33f4:  Cibyl122.on_dialog_closed_terms_of_use_10a33f4(); break;
+      case 0x10a33fc:  ret = Cibyl122.OnKeyPressed_10a33fc( a1); break;
+      case 0x10a3410:  ret = Cibyl122.roadmap_welcome_guided_tour_10a3410(sp, a0, a1, a2, a3); break;
+      case 0x10a3444:  ret = Cibyl122.space_10a3444(sp, a0, a1, a2, a3); break;
+      case 0x10a3490:  ret = Cibyl122.roadmap_welcome_personalize_dialog_10a3490(sp, a0, a1, a2, a3); break;
+      case 0x10a3854:  ret = Cibyl122.on_personalize_10a3854(sp, a0, a1, a2, a3); break;
+      case 0x10a3874:  ret = Cibyl122.set_first_time_no_10a3874(sp, a0, a1, a2, a3); break;
+      case 0x10a38a8:  ret = Cibyl122.personalize_buttons_callback_10a38a8(sp, a0, a1, a2, a3); break;
+      case 0x10a3918:  ret = Cibyl122.set_terms_accepted_10a3918(sp, a0, a1, a2, a3); break;
+      case 0x10a394c:  ret = Cibyl122.personalize_signin_callback_10a394c(sp, a0, a1, a2, a3); break;
+      case 0x10a396c:  ret = Cibyl122.is_show_intro_screen_10a396c(sp, a0, a1, a2, a3); break;
+      case 0x10a3b34:  ret = Cibyl122.welcome_dialog_10a3b34(sp, a0, a1, a2, a3); break;
+      case 0x10a3d8c:  ret = Cibyl122.on_skip_welcome_10a3d8c(sp, a0, a1, a2, a3); break;
+      case 0x10a3db4:  ret = Cibyl122.callGlobalCallback_10a3db4(sp, a0, a1, a2, a3); break;
+      case 0x10a3df0:  ret = Cibyl122.on_softkey_finish_10a3df0(sp, a0, a1, a2, a3); break;
+      case 0x10a3e20:  ret = Cibyl122.terms_of_use_native_10a3e20(sp, a0, a1, a2, a3); break;
+      case 0x10a3fe4:  ret = Cibyl122.roadmap_term_of_use_10a3fe4(sp, a0, a1, a2, a3); break;
+      case 0x10a4080:  ret = Cibyl122.rim_terms_of_use_declined_10a4080(sp, a0, a1, a2, a3); break;
+      case 0x10a40bc:  ret = Cibyl122.terms_of_use_declined_10a40bc(sp, a0, a1, a2, a3); break;
+      case 0x10a40dc:  ret = Cibyl122.add_text_to_group_10a40dc(sp, a0, a1, a2, a3); break;
+      case 0x10a4190:  ret = Cibyl122.create_intro_screen_10a4190(sp, a0, a1, a2, a3); break;
+      case 0x10a43a0:  ret = Cibyl122.rim_terms_of_use_accepted_10a43a0(sp, a0, a1, a2, a3); break;
+      case 0x10a43ec:  ret = Cibyl122.terms_of_use_accepted_10a43ec(sp, a0, a1, a2, a3); break;
+      case 0x10a4438:  ret = Cibyl122.welcome_wizard_twitter_dialog_10a4438(sp, a0, a1, a2, a3); break;
+      case 0x10a47b8:  ret = Cibyl123.on_softkey_next_twitter_10a47b8(sp, a0, a1, a2, a3); break;
+      case 0x10a4bf8:  ret = Cibyl123.roadmap_geo_location_set_overall_score_10a4bf8( a0); break;
+      case 0x10a4c04:  Cibyl123.roadmap_geo_location_info_10a4c04(); break;
+      case 0x10a4c0c:  ret = Cibyl123.on_softkey_10a4c0c(sp, a0, a1, a2, a3); break;
+      case 0x10a4c48:  ret = Cibyl123.roadmap_geo_location_set_usage_score_str_10a4c48(sp, a0, a1, a2, a3); break;
+      case 0x10a4c78:  ret = Cibyl123.roadmap_geo_location_set_traffic_score_str_10a4c78(sp, a0, a1, a2, a3); break;
+      case 0x10a4ca8:  ret = Cibyl123.roadmap_geo_location_set_map_score_str_10a4ca8(sp, a0, a1, a2, a3); break;
+      case 0x10a4cd8:  ret = Cibyl123.roadmap_geo_location_set_usage_score_10a4cd8(sp, a0, a1, a2, a3); break;
+      case 0x10a4d08:  ret = Cibyl123.roadmap_geo_location_set_traffic_score_10a4d08(sp, a0, a1, a2, a3); break;
+      case 0x10a4d38:  ret = Cibyl123.roadmap_geo_location_set_map_score_10a4d38(sp, a0, a1, a2, a3); break;
+      case 0x10a4d68:  ret = Cibyl123.roadmap_geo_location_set_state_10a4d68(sp, a0, a1, a2, a3); break;
+      case 0x10a4d94:  ret = Cibyl123.roadmap_geo_location_set_metropolitan_10a4d94(sp, a0, a1, a2, a3); break;
+      case 0x10a4dc0:  ret = Cibyl123.roadmap_general_settings_init_10a4dc0(sp, a0, a1, a2, a3); break;
+      case 0x10a4f18:  ret = Cibyl123.roadmap_general_settings_events_radius_10a4f18(sp, a0, a1, a2, a3); break;
+      case 0x10a4f3c:  ret = Cibyl123.roadmap_general_settings_is_24_hour_clock_10a4f3c(sp, a0, a1, a2, a3); break;
+      case 0x10a4f68:  ret = Cibyl123.on_ok_10a4f68(sp, a0, a1, a2, a3); break;
+      case 0x10a51b4:  ret = Cibyl123.on_ok_softkey_10a51b4(sp, a0, a1, a2, a3); break;
+      case 0x10a51dc:  ret = Cibyl123.on_close_dialog_10a51dc(sp, a0, a1, a2, a3); break;
+      case 0x10a5208:  ret = Cibyl123.lang_changed_delayed_message_10a5208(sp, a0, a1, a2, a3); break;
+      case 0x10a5244:  ret = Cibyl123.update_reports_dont_show_10a5244(sp, a0, a1, a2, a3); break;
+      case 0x10a5330:  ret = Cibyl123.set_checkbox_settings_10a5330(sp, a0, a1, a2, a3); break;
+      case 0x10a53e4:  ret = Cibyl123.on_all_setting_saved_10a53e4(sp, a0, a1, a2, a3); break;
+      case 0x10a58e0:  ret = Cibyl123.on_prompts_selected_10a58e0(sp, a0, a1, a2, a3); break;
+      case 0x10a5988:  ret = Cibyl123.on_download_lang_confirm_10a5988(sp, a0, a1, a2, a3); break;
+      case 0x10a59b0:  ret = Cibyl123.callback_10a59b0(sp, a0, a1, a2, a3); break;
+      case 0x10a5b08:  ret = Cibyl123.T_102_10a5b08(sp, a0, a1, a2, a3); break;
+      case 0x10a5b8c:  ret = Cibyl123.roadmap_all_settings_show_10a5b8c(sp, a0, a1, a2, a3); break;
+      case 0x10a612c:  ret = Cibyl124.T_103_10a612c(sp, a0, a1, a2, a3); break;
+      case 0x10a64bc:  ret = Cibyl124.roadmap_general_settings_show_10a64bc(sp, a0, a1, a2, a3); break;
+      case 0x10a739c:  ret = Cibyl124.roadmap_map_settings_show_report_10a739c(sp, a0, a1, a2, a3); break;
+      case 0x10a7430:  ret = Cibyl124.on_map_scheme_select_10a7430(sp, a0, a1, a2, a3); break;
+      case 0x10a74e0:  ret = Cibyl124.roadmap_map_settings_isEnabled_10a74e0(sp, a0, a1, a2, a3); break;
+      case 0x10a7518:  ret = Cibyl124.roadmap_map_settings_road_goodies_10a7518(sp, a0, a1, a2, a3); break;
+      case 0x10a7560:  ret = Cibyl124.roadmap_map_settings_color_roads_10a7560(sp, a0, a1, a2, a3); break;
+      case 0x10a75a8:  ret = Cibyl124.roadmap_map_settings_isShowSpeedometer_10a75a8(sp, a0, a1, a2, a3); break;
+      case 0x10a7638:  ret = Cibyl124.roadmap_map_settings_isShowTopBarOnTap_10a7638(sp, a0, a1, a2, a3); break;
+      case 0x10a7680:  ret = Cibyl124.roadmap_map_settings_isShowSpeedCams_10a7680(sp, a0, a1, a2, a3); break;
+      case 0x10a76c8:  ret = Cibyl124.roadmap_map_settings_isShowWazers_10a76c8(sp, a0, a1, a2, a3); break;
+      case 0x10a7710:  ret = Cibyl124.on_ok_10a7710(sp, a0, a1, a2, a3); break;
+      case 0x10a7a08:  ret = Cibyl125.on_ok_softkey_10a7a08(sp, a0, a1, a2, a3); break;
+      case 0x10a7a30:  ret = Cibyl125.on_close_dialog_10a7a30(sp, a0, a1, a2, a3); break;
+      case 0x10a7a5c:  ret = Cibyl125.map_scheme_callback_10a7a5c(sp, a0, a1, a2, a3); break;
+      case 0x10a7ac4:  ret = Cibyl125.roadmap_map_settings_init_10a7ac4(sp, a0, a1, a2, a3); break;
+      case 0x10a7cac:  ret = Cibyl125.T_59_10a7cac(sp, a0, a1, a2, a3); break;
+      case 0x10a7cf8:  ret = Cibyl125.roadmap_map_settings_show_10a7cf8(sp, a0, a1, a2, a3); break;
+      case 0x10a8da0:  Cibyl126.on_close_dialog_10a8da0(); break;
+      case 0x10a8da8:  ret = Cibyl126.roadmap_download_settings_isDownloadWazers_10a8da8(sp, a0, a1, a2, a3); break;
+      case 0x10a8dc8:  ret = Cibyl126.space_10a8dc8(sp, a0, a1, a2, a3); break;
+      case 0x10a8e14:  ret = Cibyl126.on_ok_softkey_10a8e14(sp, a0, a1, a2, a3); break;
+      case 0x10a8f30:  ret = Cibyl126.roadmap_download_settings_isEnabled_10a8f30(sp, a0, a1, a2, a3); break;
+      case 0x10a8f68:  ret = Cibyl126.roadmap_download_settings_isDownloadTraffic_10a8f68(sp, a0, a1, a2, a3); break;
+      case 0x10a9014:  ret = Cibyl126.roadmap_download_settings_isDownloadReports_10a9014(sp, a0, a1, a2, a3); break;
+      case 0x10a9084:  ret = Cibyl126.roadmap_download_settings_init_10a9084(sp, a0, a1, a2, a3); break;
+      case 0x10a9170:  ret = Cibyl126.roadmap_download_settings_show_10a9170(sp, a0, a1, a2, a3); break;
+      case 0x10a9740:  ret = Cibyl126.roadmap_login_set_show_function_10a9740( a0); break;
+      case 0x10a974c:  ret = Cibyl126.roadmap_login_empty_10a974c(sp, a0, a1, a2, a3); break;
+      case 0x10a97a0:  ret = Cibyl126.roadmap_login_set_nickname_10a97a0(sp, a0, a1, a2, a3); break;
+      case 0x10a97c4:  ret = Cibyl126.roadmap_login_set_pwd_10a97c4(sp, a0, a1, a2, a3); break;
+      case 0x10a97e8:  ret = Cibyl126.roadmap_login_set_username_10a97e8(sp, a0, a1, a2, a3); break;
+      case 0x10a9808:  ret = Cibyl126.roadmap_login_details_update_profile_ok_repsonse_10a9808(sp, a0, a1, a2, a3); break;
+      case 0x10a9870:  ret = Cibyl126.roadmap_login_update_details_on_response_10a9870(sp, a0, a1, a2, a3); break;
+      case 0x10a99b8:  ret = Cibyl126.roadmap_login_on_login_10a99b8(sp, a0, a1, a2, a3); break;
+      case 0x10a9b10:  ret = Cibyl126.check_alphanumeric_10a9b10(sp, a0, a1, a2, a3); break;
+      case 0x10a9bb4:  ret = Cibyl126.roadmap_login_validate_username_10a9bb4(sp, a0, a1, a2, a3); break;
+      case 0x10a9c34:  ret = Cibyl126.roadmap_login_validate_email_10a9c34(sp, a0, a1, a2, a3); break;
+      case 0x10a9c90:  ret = Cibyl126.roadmap_login_validate_password_10a9c90(sp, a0, a1, a2, a3); break;
+      case 0x10a9d3c:  ret = Cibyl126.roadmap_login_on_update_10a9d3c(sp, a0, a1, a2, a3); break;
+      case 0x10a9dbc:  ret = Cibyl126.roadmap_login_on_create_10a9dbc(sp, a0, a1, a2, a3); break;
+      case 0x10a9e3c:  ret = Cibyl126.roadmap_login_on_signup_skip_10a9e3c(sp, a0, a1, a2, a3); break;
+      case 0x10a9e7c:  ret = Cibyl126.on_signup_skip_msgbox_closed_10a9e7c(sp, a0, a1, a2, a3); break;
+      case 0x10a9e9c:  ret = Cibyl126.roadmap_login_details_dialog_show_10a9e9c(sp, a0, a1, a2, a3); break;
+      case 0x10a9efc:  ret = Cibyl126.roadmap_login_on_ok_10a9efc(sp, a0, a1, a2, a3); break;
+      case 0x10aa020:  ret = Cibyl126.roadmap_login_on_login_cb_10aa020(sp, a0, a1, a2, a3); break;
+      case 0x10aa0e8:  ret = Cibyl127.roadmap_login_update_login_cb_10aa0e8(sp, a0, a1, a2, a3); break;
+      case 0x10aa16c:  ret = Cibyl127.roadmap_login_initialize_10aa16c(sp, a0, a1, a2, a3); break;
+      case 0x10aa1dc:  ret = Cibyl127.roadmap_trip_server_init_10aa1dc(sp, a0, a1, a2, a3); break;
+      case 0x10aa240:  ret = Cibyl127.roadmap_trip_server_after_login_10aa240(sp, a0, a1, a2, a3); break;
+      case 0x10aa284:  ret = Cibyl127.create_poi_10aa284(sp, a0, a1, a2, a3); break;
+      case 0x10aa3a8:  ret = Cibyl127.roadmap_trip_server_after_login_delayed_10aa3a8(sp, a0, a1, a2, a3); break;
+      case 0x10aa534:  ret = Cibyl127.roadmap_trip_server_create_poi_10aa534(sp, a0, a1, a2, a3); break;
+      case 0x10aa578:  ret = Cibyl127.roadmap_trip_get_num_Pois_10aa578(sp, a0, a1, a2, a3); break;
+      case 0x10aa598:  ret = Cibyl127.roadmap_trip_server_restore_favorites_10aa598(sp, a0, a1, a2, a3); break;
+      case 0x10aa5ec:  ret = Cibyl127.roadmap_trip_server_restore_favorites_cb_10aa5ec(sp, a0, a1, a2, a3); break;
+      case 0x10aa648:  ret = Cibyl127.roadmap_tripserver_response_10aa648(sp, a0, a1, a2, a3); break;
+      case 0x10aa7f4:  ret = Cibyl127.on_get_num_pois_res_10aa7f4(sp, a0, a1, a2, a3); break;
+      case 0x10aa8a0:  ret = Cibyl127.on_get_pois_res_10aa8a0(sp, a0, a1, a2, a3); break;
+      case 0x10aaba8:  ret = Cibyl127.on_create_poi_res_10aaba8(sp, a0, a1, a2, a3); break;
+      case 0x10aacf4:  ret = Cibyl127.on_suggested_trips_10aacf4(sp, a0, a1, a2, a3); break;
+      case 0x10aafc0:  Cibyl127.completed_10aafc0(); break;
+      case 0x10aafc8:  ret = Cibyl127.roadmap_geo_config_get_server_id_10aafc8(sp, a0, a1, a2, a3); break;
+      case 0x10aafec:  ret = Cibyl127.roadmap_geo_config_get_version_10aafec(sp, a0, a1, a2, a3); break;
+      case 0x10ab010:  ret = Cibyl127.roadmap_geo_config_init_10ab010(sp, a0, a1, a2, a3); break;
+      case 0x10ab190:  ret = Cibyl127.roadmap_geo_config_fixed_location_10ab190(sp, a0, a1, a2, a3); break;
+      case 0x10ab260:  ret = Cibyl127.roadmap_geo_config_other_10ab260(sp, a0, a1, a2, a3); break;
+      case 0x10ab2c0:  ret = Cibyl127.roadmap_geo_config_stg_10ab2c0(sp, a0, a1, a2, a3); break;
+      case 0x10ab320:  ret = Cibyl127.roadmap_geo_config_usa_10ab320(sp, a0, a1, a2, a3); break;
+      case 0x10ab390:  ret = Cibyl128.roadmap_geo_config_il_10ab390(sp, a0, a1, a2, a3); break;
+      case 0x10ab400:  ret = Cibyl128.lang_callback_new_10ab400(sp, a0, a1, a2, a3); break;
+      case 0x10ab46c:  ret = Cibyl128.need_to_ask_server_10ab46c(sp, a0, a1, a2, a3); break;
+      case 0x10ab4a0:  ret = Cibyl128.lang_selected_new_10ab4a0(sp, a0, a1, a2, a3); break;
+      case 0x10ab4d0:  ret = Cibyl128.request_geo_config_10ab4d0(sp, a0, a1, a2, a3); break;
+      case 0x10abb34:  ret = Cibyl128.roadmap_geo_config_10abb34(sp, a0, a1, a2, a3); break;
+      case 0x10abd4c:  ret = Cibyl128.retry_10abd4c(sp, a0, a1, a2, a3); break;
+      case 0x10abd7c:  ret = Cibyl128.lang_loaded_10abd7c(sp, a0, a1, a2, a3); break;
+      case 0x10abdc4:  ret = Cibyl128.other_callback_10abdc4(sp, a0, a1, a2, a3); break;
+      case 0x10abdfc:  ret = Cibyl128.il_callback_10abdfc(sp, a0, a1, a2, a3); break;
+      case 0x10abe34:  ret = Cibyl128.usa_callback_10abe34(sp, a0, a1, a2, a3); break;
+      case 0x10abe6c:  ret = Cibyl128.on_pointer_down_10abe6c(sp, a0, a1, a2, a3); break;
+      case 0x10abee8:  ret = Cibyl128.on_update_config_10abee8(sp, a0, a1, a2, a3); break;
+      case 0x10ac110:  ret = Cibyl128.clean_up_10ac110(sp, a0, a1, a2, a3); break;
+      case 0x10ac15c:  ret = Cibyl128.on_recieved_completed_10ac15c(sp, a0, a1, a2, a3); break;
+      case 0x10ac2e0:  ret = Cibyl128.on_server_config_10ac2e0(sp, a0, a1, a2, a3); break;
+      case 0x10ac568:  ret = Cibyl128.on_geo_server_config_10ac568(sp, a0, a1, a2, a3); break;
+      case 0x10ac7ac:  ret = Cibyl129.on_user_lang_downloaded_10ac7ac(sp, a0, a1, a2, a3); break;
+      case 0x10ac7fc:  ret = Cibyl129.on_lang_conf_downloaded_10ac7fc(sp, a0, a1, a2, a3); break;
+      case 0x10ac874:  ret = Cibyl129.roadmap_geo_config_transaction_failed_10ac874(sp, a0, a1, a2, a3); break;
+      case 0x10ac8e8:  ret = Cibyl129.GeoConfigTimer_10ac8e8(sp, a0, a1, a2, a3); break;
+      case 0x10ac994:  ret = Cibyl129.roadmap_geo_config_failed_cb_10ac994(sp, a0, a1, a2, a3); break;
+      case 0x10ac9b4:  ret = Cibyl129.roadmap_result_string_10ac9b4(sp, a0, a1, a2, a3); break;
+      case 0x10acb4c:  ret = Cibyl129.roadmap_spawn_write_pipe_10acb4c(); break;
+      case 0x10acb54:  ret = Cibyl129.roadmap_spawn_read_pipe_10acb54(); break;
+      case 0x10acb5c:  Cibyl129.roadmap_spawn_close_pipe_10acb5c(); break;
+      case 0x10acb64:  ret = Cibyl129.roadmap_device_events_os_init_10acb64(); break;
+      case 0x10acb6c:  Cibyl129.roadmap_device_events_os_term_10acb6c(); break;
+      case 0x10acb7c:  Cibyl129.roadmap_voice_initialize_10acb7c(); break;
+      case 0x10acb84:  Cibyl129.roadmap_voice_announce_10acb84(); break;
+      case 0x10acb8c:  Cibyl129.roadmap_voice_mute_10acb8c(); break;
+      case 0x10acb94:  Cibyl129.roadmap_voice_enable_10acb94(); break;
+      case 0x10acbb4:  ret = Cibyl129.roadmap_trip_load_10acbb4(); break;
+      case 0x10acbbc:  Cibyl129.roadmap_trip_save_10acbbc(); break;
+      case 0x10acbc4:  Cibyl129.roadmap_trip_save_screenshot_10acbc4(); break;
+      case 0x10acbcc:  Cibyl129.roadmap_download_show_space_10acbcc(); break;
+      case 0x10acbd4:  Cibyl129.roadmap_download_delete_10acbd4(); break;
+      case 0x10acbdc:  Cibyl129.roadmap_download_subscribe_protocol_10acbdc(); break;
+      case 0x10acbe4:  Cibyl129.roadmap_download_subscribe_when_done_10acbe4(); break;
+      case 0x10acbec:  ret = Cibyl129.roadmap_download_enabled_10acbec(); break;
+      case 0x10acbf4:  Cibyl129.roadmap_download_initialize_10acbf4(); break;
+      case 0x10acbfc:  Cibyl129.roadmap_download_block_10acbfc(); break;
+      case 0x10acc0c:  Cibyl129.roadmap_download_unblock_all_10acc0c(); break;
+      case 0x10acc14:  ret = Cibyl129.roadmap_download_blocked_10acc14(); break;
+      case 0x10acc1c:  Cibyl129.roadmap_copy_init_10acc1c(); break;
+      case 0x10acc24:  Cibyl129.roadmap_httpcopy_init_10acc24(); break;
+      case 0x10acc2c:  Cibyl129.roadmap_spawn_check_10acc2c(); break;
+      case 0x10acc34:  Cibyl129.roadmap_spawn_initialize_10acc34(); break;
+      case 0x10acc3c:  ret = Cibyl129.roadmap_spawn_10acc3c(); break;
+      case 0x10acc7c:  Cibyl129.roadmap_crossing_dialog_10acc7c(); break;
+      case 0x10acc84:  Cibyl129.roadmap_coord_dialog_10acc84(); break;
+      case 0x10acc8c:  Cibyl129.edit_markers_dialog_10acc8c(); break;
+      case 0x10acc94:  Cibyl129.editor_notes_add_quick_10acc94(); break;
+      case 0x10acc9c:  Cibyl129.editor_notes_add_edit_10acc9c(); break;
+      case 0x10acca4:  Cibyl129.editor_notes_add_voice_10acca4(); break;
+      case 0x10accb4:  ret = Cibyl129.roadmap_file_rename_10accb4(); break;
+      case 0x10accbc:  Cibyl129.roadmap_net_initialize_10accbc(); break;
+      case 0x10accc4:  ret = Cibyl129.roadmap_device_initialize_10accc4(); break;
+      case 0x10acccc:  Cibyl129.roadmap_screen_draw_line_direction_10acccc(); break;
+      case 0x10accdc:  ret = Cibyl129.editor_is_enabled_10accdc(); break;
+      case 0x10accfc:  ret = Cibyl129.editor_main_set_10accfc(sp, a0, a1, a2, a3); break;
+      case 0x10acd60:  ret = Cibyl129.editor_main_shutdown_10acd60(sp, a0, a1, a2, a3); break;
+      case 0x10acd88:  ret = Cibyl129.editor_main_initialize_10acd88(sp, a0, a1, a2, a3); break;
+      case 0x10acdec:  ret = Cibyl129.editor_main_check_map_10acdec(sp, a0, a1, a2, a3); break;
+      case 0x10ace68:  ret = Cibyl129.editor_points_get_total_points_10ace68(); break;
+      case 0x10ace80:  ret = Cibyl129.editor_points_reset_munching_10ace80(); break;
+      case 0x10acebc:  ret = Cibyl129.editor_points_display_new_points_timed_10acebc(sp, a0, a1, a2, a3); break;
+      case 0x10acf60:  ret = Cibyl129.editor_points_hide_10acf60(sp, a0, a1, a2, a3); break;
+      case 0x10acf80:  ret = Cibyl129.timer_cb_10acf80(sp, a0, a1, a2, a3); break;
+      case 0x10acfd0:  ret = Cibyl129.editor_points_display_10acfd0(sp, a0, a1, a2, a3); break;
+      case 0x10ad024:  ret = Cibyl129.set_last_points_update_time_10ad024(sp, a0, a1, a2, a3); break;
+      case 0x10ad064:  ret = Cibyl129.editor_points_set_saved_new_points_10ad064(sp, a0, a1, a2, a3); break;
+      case 0x10ad09c:  ret = Cibyl129.editor_points_add_10ad09c(sp, a0, a1, a2, a3); break;
+      case 0x10ad118:  ret = Cibyl129.editor_points_add_new_points_10ad118(sp, a0, a1, a2, a3); break;
+      case 0x10ad148:  ret = Cibyl129.editor_points_set_old_points_10ad148(sp, a0, a1, a2, a3); break;
+      case 0x10ad224:  ret = Cibyl129.editor_points_initialize_10ad224(sp, a0, a1, a2, a3); break;
+      case 0x10ad314:  ret = Cibyl129.editor_track_filter_get_current_10ad314( a0, a1, a2); break;
+      case 0x10ad350:  ret = Cibyl129.editor_track_filter_get_10ad350(sp, a0, a1, a2, a3); break;
+      case 0x10ad458:  ret = Cibyl129.editor_track_filter_add_10ad458(sp, a0, a1, a2, a3); break;
+      case 0x10ad67c:  ret = Cibyl129.editor_track_filter_new_10ad67c(sp, a0, a1, a2, a3); break;
+      case 0x10ad6e4:  ret = Cibyl129.resolve_add_10ad6e4(sp, a0, a1, a2, a3); break;
+      case 0x10ad81c:  ret = Cibyl129.editor_track_known_resolve_10ad81c(); break;
+      case 0x10ad834:  ret = Cibyl129.editor_track_known_reset_resolve_10ad834(); break;
+      case 0x10ad840:  ret = Cibyl129.editor_track_known_locate_point_10ad840(sp, a0, a1, a2, a3); break;
+      case 0x10ae6ec:  ret = Cibyl130.editor_track_known_end_segment_10ae6ec(sp, a0, a1, a2, a3); break;
+      case 0x10aea20:  ret = Cibyl130.find_line_break_10aea20(sp, a0, a1, a2, a3); break;
+      case 0x10aec0c:  ret = Cibyl130.detect_road_segment_10aec0c(sp, a0, a1, a2, a3); break;
+      case 0x10aefc4:  ret = Cibyl130.editor_track_unknown_locate_point_10aefc4(sp, a0, a1, a2, a3); break;
+      case 0x10af17c:  ret = Cibyl130.editor_track_util_get_line_point_ids_10af17c(sp, a0, a1, a2, a3); break;
+      case 0x10af220:  ret = Cibyl130.add_line_length_10af220(sp, a0, a1, a2, a3); break;
+      case 0x10af2c0:  ret = Cibyl130.editor_track_util_get_line_length_10af2c0(sp, a0, a1, a2, a3); break;
+      case 0x10af378:  ret = Cibyl130.editor_track_util_roadmap_node_to_editor_10af378(sp, a0, a1, a2, a3); break;
+      case 0x10af3f8:  ret = Cibyl130.editor_track_util_create_db_10af3f8(sp, a0, a1, a2, a3); break;
+      case 0x10af45c:  ret = Cibyl130.editor_track_util_length_10af45c(sp, a0, a1, a2, a3); break;
+      case 0x10af4d8:  ret = Cibyl130.editor_track_add_trkseg_10af4d8(sp, a0, a1, a2, a3); break;
+      case 0x10af5f0:  ret = Cibyl130.editor_track_util_create_trkseg_10af5f0(sp, a0, a1, a2, a3); break;
+      case 0x10af828:  ret = Cibyl130.editor_track_util_create_line_10af828(sp, a0, a1, a2, a3); break;
+      case 0x10af9c4:  ret = Cibyl131.editor_track_util_get_node_10af9c4(sp, a0, a1, a2, a3); break;
+      case 0x10afb00:  ret = Cibyl131.editor_track_util_node_pos_10afb00(sp, a0, a1, a2, a3); break;
+      case 0x10afba0:  ret = Cibyl131.editor_track_util_same_node_10afba0(sp, a0, a1, a2, a3); break;
+      case 0x10afbfc:  ret = Cibyl131.adjust_connect_node_10afbfc(sp, a0, a1, a2, a3); break;
+      case 0x10afcb4:  ret = Cibyl131.find_connecting_road_10afcb4(sp, a0, a1, a2, a3); break;
+      case 0x10afe2c:  ret = Cibyl131.editor_track_util_find_street_10afe2c(sp, a0, a1, a2, a3); break;
+      case 0x10b0124:  ret = Cibyl131.editor_track_util_get_distance_10b0124(sp, a0, a1, a2, a3); break;
+      case 0x10b0164:  ret = Cibyl131.editor_track_util_release_focus_10b0164(sp, a0, a1, a2, a3); break;
+      case 0x10b0184:  ret = Cibyl131.editor_track_util_set_focus_10b0184(sp, a0, a1, a2, a3); break;
+      case 0x10b01cc:  ret = Cibyl131.find_split_point_10b01cc(sp, a0, a1, a2, a3); break;
+      case 0x10b0870:  ret = Cibyl131.editor_track_util_connect_roads_10b0870(sp, a0, a1, a2, a3); break;
+      case 0x10b0d70:  ret = Cibyl132.editor_track_util_new_road_end_10b0d70(sp, a0, a1, a2, a3); break;
+      case 0x10b0dac:  ret = Cibyl132.editor_track_util_new_road_start_10b0dac(sp, a0, a1, a2, a3); break;
+      case 0x10b0de8:  ret = Cibyl132.track_point_pos_10b0de8( a0); break;
+      case 0x10b0dfc:  ret = Cibyl132.track_point_gps_10b0dfc( a0); break;
+      case 0x10b0e10:  ret = Cibyl132.track_point_time_10b0e10( a0); break;
+      case 0x10b0e2c:  ret = Cibyl132.track_point_status_10b0e2c( a0); break;
+      case 0x10b0e44:  ret = Cibyl132.track_point_ordinal_10b0e44( a0); break;
+      case 0x10b0e60:  ret = Cibyl132.export_track_point_pos_10b0e60( a0); break;
+      case 0x10b0e80:  ret = Cibyl132.export_track_point_gps_10b0e80( a0); break;
+      case 0x10b0ea0:  ret = Cibyl132.export_track_point_time_10b0ea0( a0); break;
+      case 0x10b0ecc:  ret = Cibyl132.export_track_point_status_10b0ecc( a0); break;
+      case 0x10b0ef0:  ret = Cibyl132.export_track_point_ordinal_10b0ef0( a0); break;
+      case 0x10b0f1c:  ret = Cibyl132.export_track_is_new_10b0f1c(); break;
+      case 0x10b0f2c:  ret = Cibyl132.export_track_num_points_10b0f2c(); break;
+      case 0x10b0f44:  ret = Cibyl132.export_track_reset_points_10b0f44(); break;
+      case 0x10b0f58:  ret = Cibyl132.editor_track_get_num_update_toggles_10b0f58(); break;
+      case 0x10b0f68:  ret = Cibyl132.editor_track_get_update_toggle_times_10b0f68(); break;
+      case 0x10b0f74:  ret = Cibyl132.editor_track_get_update_toggle_state_10b0f74( a0); break;
+      case 0x10b0fa0:  ret = Cibyl132.editor_track_reset_update_toggles_10b0fa0(); break;
+      case 0x10b0fac:  ret = Cibyl132.editor_ignore_new_roads_10b0fac(); break;
+      case 0x10b0fbc:  ret = Cibyl132.editor_track_shape_position_10b0fbc( a0, a1); break;
+      case 0x10b1010:  ret = Cibyl132.editor_track_is_new_direction_roads_10b1010(sp, a0, a1, a2, a3); break;
+      case 0x10b1148:  ret = Cibyl132.editor_track_deflate_10b1148(sp, a0, a1, a2, a3); break;
+      case 0x10b11d8:  ret = Cibyl132.editor_track_draw_current_10b11d8(sp, a0, a1, a2, a3); break;
+      case 0x10b12c4:  ret = Cibyl132.editor_track_is_new_road_10b12c4(sp, a0, a1, a2, a3); break;
+      case 0x10b1320:  ret = Cibyl132.track_reset_points_10b1320(sp, a0, a1, a2, a3); break;
+      case 0x10b13b8:  ret = Cibyl132.editor_track_reset_10b13b8(sp, a0, a1, a2, a3); break;
+      case 0x10b1458:  ret = Cibyl132.editor_track_initialize_10b1458(sp, a0, a1, a2, a3); break;
+      case 0x10b15e4:  ret = Cibyl132.editor_track_point_distance_10b15e4(sp, a0, a1, a2, a3); break;
+      case 0x10b162c:  ret = Cibyl132.track_filter_init_10b162c(sp, a0, a1, a2, a3); break;
+      case 0x10b1698:  ret = Cibyl132.editor_track_get_gps_filter_10b1698(sp, a0, a1, a2, a3); break;
+      case 0x10b16bc:  ret = Cibyl132.handle_new_direction_10b16bc(sp, a0, a1, a2, a3); break;
+      case 0x10b1714:  ret = Cibyl132.editor_new_roads_state_10b1714(sp, a0, a1, a2, a3); break;
+      case 0x10b1754:  ret = Cibyl132.editor_track_toggle_new_roads_10b1754(sp, a0, a1, a2, a3); break;
+      case 0x10b18c8:  ret = Cibyl132.T_155_10b18c8(sp, a0, a1, a2, a3); break;
+      case 0x10b1a4c:  ret = Cibyl132.end_unknown_segments_10b1a4c(sp, a0, a1, a2, a3); break;
+      case 0x10b1cf8:  ret = Cibyl132.editor_track_force_reset_10b1cf8(sp, a0, a1, a2, a3); break;
+      case 0x10b1dd0:  ret = Cibyl132.editor_track_end_10b1dd0(sp, a0, a1, a2, a3); break;
+      case 0x10b1df8:  ret = Cibyl132.track_rec_locate_point_10b1df8(sp, a0, a1, a2, a3); break;
+      case 0x10b2598:  ret = Cibyl133.editor_gps_update_10b2598(sp, a0, a1, a2, a3); break;
+      case 0x10b27e4:  ret = Cibyl133.editor_track_draw_current_new_direction_road_10b27e4(sp, a0, a1, a2, a3); break;
+      case 0x10b2b60:  ret = Cibyl133.editor_track_draw_new_direction_roads_10b2b60(sp, a0, a1, a2, a3); break;
+      case 0x10b2f50:  ret = Cibyl133.editor_track_compress_range_10b2f50(sp, a0, a1, a2, a3); break;
+      case 0x10b3560:  ret = Cibyl133.editor_track_compress_track_10b3560(sp, a0, a1, a2, a3); break;
+      case 0x10b35b8:  ret = Cibyl133.editor_track_report_init_10b35b8(); break;
+      case 0x10b3610:  ret = Cibyl133.editor_track_report_get_current_position_10b3610(sp, a0, a1, a2, a3); break;
+      case 0x10b3718:  ret = Cibyl133.editor_track_report_conclude_export_10b3718(sp, a0, a1, a2, a3); break;
+      case 0x10b3788:  ret = Cibyl133.editor_track_report_begin_export_10b3788(sp, a0, a1, a2, a3); break;
+      case 0x10b4270:  ret = Cibyl134.editor_marker_activate_10b4270( a0); break;
+      case 0x10b427c:  ret = Cibyl134.editor_marker_reg_type_10b427c( a0, a1, a2); break;
+      case 0x10b42b4:  ret = Cibyl134.editor_marker_items_pending_10b42b4(sp, a0, a1, a2, a3); break;
+      case 0x10b4308:  ret = Cibyl134.editor_marker_committed_10b4308(sp, a0, a1, a2, a3); break;
+      case 0x10b4334:  ret = Cibyl134.editor_marker_confirm_commit_10b4334(sp, a0, a1, a2, a3); break;
+      case 0x10b4360:  ret = Cibyl134.editor_marker_begin_commit_10b4360(sp, a0, a1, a2, a3); break;
+      case 0x10b4404:  ret = Cibyl134.editor_marker_export_10b4404(sp, a0, a1, a2, a3); break;
+      case 0x10b4500:  ret = Cibyl134.editor_marker_type_10b4500(sp, a0, a1, a2, a3); break;
+      case 0x10b4548:  ret = Cibyl134.editor_marker_position_10b4548(sp, a0, a1, a2, a3); break;
+      case 0x10b4654:  ret = Cibyl134.editor_marker_note_10b4654(sp, a0, a1, a2, a3); break;
+      case 0x10b46a4:  ret = Cibyl134.edit_marker_icon_10b46a4(sp, a0, a1, a2, a3); break;
+      case 0x10b47d8:  ret = Cibyl134.editor_marker_is_obsolete_10b47d8(sp, a0, a1, a2, a3); break;
+      case 0x10b483c:  ret = Cibyl134.editor_marker_count_10b483c(sp, a0, a1, a2, a3); break;
+      case 0x10b486c:  ret = Cibyl134.editor_marker_add_10b486c(sp, a0, a1, a2, a3); break;
+      case 0x10b4974:  ret = Cibyl134.editor_dictionary_activate_10b4974( a0); break;
+      case 0x10b4980:  ret = Cibyl134.editor_dictionary_get_10b4980(sp, a0, a1, a2, a3); break;
+      case 0x10b49dc:  ret = Cibyl134.editor_dictionary_locate_10b49dc(sp, a0, a1, a2, a3); break;
+      case 0x10b4a64:  ret = Cibyl134.editor_dictionary_add_10b4a64(sp, a0, a1, a2, a3); break;
+      case 0x10b4b54:  ret = Cibyl134.editor_shape_activate_10b4b54( a0); break;
+      case 0x10b4b60:  ret = Cibyl134.editor_shape_ordinal_10b4b60(sp, a0, a1, a2, a3); break;
+      case 0x10b4b90:  ret = Cibyl134.editor_shape_time_10b4b90(sp, a0, a1, a2, a3); break;
+      case 0x10b4bdc:  ret = Cibyl134.editor_shape_altitude_10b4bdc(sp, a0, a1, a2, a3); break;
+      case 0x10b4c0c:  ret = Cibyl134.editor_shape_position_10b4c0c(sp, a0, a1, a2, a3); break;
+      case 0x10b4c68:  ret = Cibyl134.editor_shape_add_10b4c68(sp, a0, a1, a2, a3); break;
+      case 0x10b4cac:  ret = Cibyl134.editor_points_activate_10b4cac( a0); break;
+      case 0x10b4cb8:  ret = Cibyl134.editor_point_db_id_10b4cb8(sp, a0, a1, a2, a3); break;
+      case 0x10b4ce8:  ret = Cibyl134.editor_point_position_10b4ce8(sp, a0, a1, a2, a3); break;
+      case 0x10b4d38:  ret = Cibyl134.editor_point_set_pos_10b4d38(sp, a0, a1, a2, a3); break;
+      case 0x10b4da8:  ret = Cibyl134.editor_point_add_10b4da8(sp, a0, a1, a2, a3); break;
+      case 0x10b4dec:  ret = Cibyl134.editor_trkseg_activate_10b4dec( a0); break;
+      case 0x10b4df8:  ret = Cibyl134.editor_trkseg_items_pending_10b4df8(sp, a0, a1, a2, a3); break;
+      case 0x10b4e20:  ret = Cibyl134.editor_trkseg_item_committed_10b4e20(sp, a0, a1, a2, a3); break;
+      case 0x10b4e4c:  ret = Cibyl134.editor_trkseg_confirm_commit_10b4e4c(sp, a0, a1, a2, a3); break;
+      case 0x10b4e78:  ret = Cibyl134.editor_trkseg_begin_commit_10b4e78(sp, a0, a1, a2, a3); break;
+      case 0x10b4ea0:  ret = Cibyl134.editor_trkseg_get_count_10b4ea0(sp, a0, a1, a2, a3); break;
+      case 0x10b4ec8:  ret = Cibyl134.editor_trkseg_get_points_10b4ec8(sp, a0, a1, a2, a3); break;
+      case 0x10b4f40:  ret = Cibyl134.editor_trkseg_get_10b4f40(sp, a0, a1, a2, a3); break;
+      case 0x10b4ff0:  ret = Cibyl134.editor_trkseg_get_time_10b4ff0(sp, a0, a1, a2, a3); break;
+      case 0x10b5058:  ret = Cibyl134.editor_trkseg_add_10b5058(sp, a0, a1, a2, a3); break;
+      case 0x10b50c4:  ret = Cibyl134.editor_street_activate_10b50c4( a0); break;
+      case 0x10b50d0:  ret = Cibyl134.editor_street_get_street_address_10b50d0(); break;
+      case 0x10b50dc:  ret = Cibyl134.editor_street_get_street_t2s_10b50dc(sp, a0, a1, a2, a3); break;
+      case 0x10b5134:  ret = Cibyl134.editor_street_get_street_city_10b5134(sp, a0, a1, a2, a3); break;
+      case 0x10b5190:  ret = Cibyl134.editor_street_get_street_fetype_10b5190(sp, a0, a1, a2, a3); break;
+      case 0x10b51ec:  ret = Cibyl134.editor_street_get_street_fename_10b51ec(sp, a0, a1, a2, a3); break;
+      case 0x10b5244:  ret = Cibyl134.editor_street_get_street_name_10b5244(sp, a0, a1, a2, a3); break;
+      case 0x10b52dc:  ret = Cibyl134.editor_street_get_full_name_10b52dc(sp, a0, a1, a2, a3); break;
+      case 0x10b536c:  ret = Cibyl134.editor_street_get_connected_lines_10b536c(sp, a0, a1, a2, a3); break;
+      case 0x10b54e0:  ret = Cibyl134.editor_street_create_10b54e0(sp, a0, a1, a2, a3); break;
+      case 0x10b55e8:  ret = Cibyl134.editor_street_get_distance_with_shape_10b55e8(sp, a0, a1, a2, a3); break;
+      case 0x10b5930:  ret = Cibyl135.editor_street_get_closest_10b5930(sp, a0, a1, a2, a3); break;
+      case 0x10b5acc:  ret = Cibyl135.editor_street_get_distance_10b5acc(sp, a0, a1, a2, a3); break;
+      case 0x10b5b54:  ret = Cibyl135.editor_lines_activate_10b5b54( a0); break;
+      case 0x10b5b60:  ret = Cibyl135.handle_segment_10b5b60(sp, a0, a1, a2, a3); break;
+      case 0x10b5d80:  ret = Cibyl135.editor_line_items_pending_10b5d80(sp, a0, a1, a2, a3); break;
+      case 0x10b5da8:  ret = Cibyl135.editor_line_confirm_commit_10b5da8(sp, a0, a1, a2, a3); break;
+      case 0x10b5dd4:  ret = Cibyl135.editor_line_begin_commit_10b5dd4(sp, a0, a1, a2, a3); break;
+      case 0x10b5dfc:  ret = Cibyl135.editor_line_committed_10b5dfc(sp, a0, a1, a2, a3); break;
+      case 0x10b5e28:  ret = Cibyl135.editor_line_is_valid_10b5e28(sp, a0, a1, a2, a3); break;
+      case 0x10b5e74:  ret = Cibyl135.editor_line_get_timestamp_10b5e74(sp, a0, a1, a2, a3); break;
+      case 0x10b5eb4:  ret = Cibyl135.editor_line_get_direction_10b5eb4(sp, a0, a1, a2, a3); break;
+      case 0x10b5f10:  ret = Cibyl135.editor_line_get_street_10b5f10(sp, a0, a1, a2, a3); break;
+      case 0x10b5f6c:  ret = Cibyl135.editor_line_get_points_10b5f6c(sp, a0, a1, a2, a3); break;
+      case 0x10b606c:  ret = Cibyl135.editor_line_set_direction_10b606c(sp, a0, a1, a2, a3); break;
+      case 0x10b60f4:  ret = Cibyl135.editor_line_set_street_10b60f4(sp, a0, a1, a2, a3); break;
+      case 0x10b620c:  ret = Cibyl135.editor_line_set_flag_10b620c(sp, a0, a1, a2, a3); break;
+      case 0x10b629c:  ret = Cibyl135.editor_line_invalidate_10b629c(sp, a0, a1, a2, a3); break;
+      case 0x10b62bc:  ret = Cibyl135.editor_line_modify_properties_10b62bc(sp, a0, a1, a2, a3); break;
+      case 0x10b6350:  ret = Cibyl135.editor_line_get_count_10b6350(sp, a0, a1, a2, a3); break;
+      case 0x10b6378:  ret = Cibyl135.editor_line_get_10b6378(sp, a0, a1, a2, a3); break;
+      case 0x10b6458:  ret = Cibyl135.editor_line_interpolate_request_tiles_10b6458(sp, a0, a1, a2, a3); break;
+      case 0x10b65b0:  ret = Cibyl135.editor_line_get_update_time_10b65b0(sp, a0, a1, a2, a3); break;
+      case 0x10b6770:  ret = Cibyl135.editor_line_get_cross_time_10b6770(sp, a0, a1, a2, a3); break;
+      case 0x10b67c8:  ret = Cibyl135.editor_line_length_10b67c8(sp, a0, a1, a2, a3); break;
+      case 0x10b68d8:  ret = Cibyl135.editor_line_add_10b68d8(sp, a0, a1, a2, a3); break;
+      case 0x10b69e4:  ret = Cibyl135.editor_line_copy_10b69e4(sp, a0, a1, a2, a3); break;
+      case 0x10b6b54:  ret = Cibyl135.editor_override_activate_10b6b54( a0); break;
+      case 0x10b6b60:  ret = Cibyl135.editor_override_get_count_10b6b60(sp, a0, a1, a2, a3); break;
+      case 0x10b6b88:  ret = Cibyl135.editor_override_get_10b6b88(sp, a0, a1, a2, a3); break;
+      case 0x10b6c5c:  ret = Cibyl135.editor_override_find_10b6c5c(sp, a0, a1, a2, a3); break;
+      case 0x10b6dd0:  ret = Cibyl136.editor_override_exists_10b6dd0(sp, a0, a1, a2, a3); break;
+      case 0x10b6df8:  ret = Cibyl136.editor_override_line_get_direction_10b6df8(sp, a0, a1, a2, a3); break;
+      case 0x10b6e4c:  ret = Cibyl136.editor_override_line_get_flags_10b6e4c(sp, a0, a1, a2, a3); break;
+      case 0x10b6ea0:  ret = Cibyl136.editor_override_line_set_direction_10b6ea0(sp, a0, a1, a2, a3); break;
+      case 0x10b6f94:  ret = Cibyl136.editor_override_line_set_flag_10b6f94(sp, a0, a1, a2, a3); break;
+      case 0x10b7014:  ret = Cibyl136.editor_db_get_record_10b7014( a0, a1, a2, a3); break;
+      case 0x10b7058:  ret = Cibyl136.editor_db_create_10b7058(); break;
+      case 0x10b7068:  ret = Cibyl136.editor_db_get_item_count_10b7068( a0); break;
+      case 0x10b707c:  ret = Cibyl136.editor_db_begin_commit_10b707c( a0); break;
+      case 0x10b7088:  ret = Cibyl136.editor_db_item_committed_10b7088(sp, a0, a1, a2, a3); break;
+      case 0x10b70bc:  ret = Cibyl136.editor_db_items_pending_10b70bc( a0); break;
+      case 0x10b70e8:  ret = Cibyl136.editor_db_confirm_commit_10b70e8(sp, a0, a1, a2, a3); break;
+      case 0x10b717c:  ret = Cibyl136.editor_db_write_record_10b717c(sp, a0, a1, a2, a3); break;
+      case 0x10b731c:  ret = Cibyl136.editor_db_update_item_10b731c(sp, a0, a1, a2, a3); break;
+      case 0x10b73a8:  ret = Cibyl136.editor_db_write_item_10b73a8(sp, a0, a1, a2, a3); break;
+      case 0x10b73e8:  ret = Cibyl136.editor_db_allocate_new_block_10b73e8(sp, a0, a1, a2, a3); break;
+      case 0x10b74c0:  ret = Cibyl136.editor_db_allocate_items_10b74c0(sp, a0, a1, a2, a3); break;
+      case 0x10b75a0:  ret = Cibyl136.editor_db_get_item_10b75a0(sp, a0, a1, a2, a3); break;
+      case 0x10b76c8:  ret = Cibyl136.calloc_10b76c8(sp, a0, a1, a2, a3); break;
+      case 0x10b7710:  ret = Cibyl136.editor_db_activate_handler_10b7710(sp, a0, a1, a2, a3); break;
+      case 0x10b77e8:  ret = Cibyl136.editor_db_add_record_10b77e8(sp, a0, a1, a2, a3); break;
+      case 0x10b78ec:  ret = Cibyl136.editor_db_add_item_10b78ec(sp, a0, a1, a2, a3); break;
+      case 0x10b7960:  ret = Cibyl136.editor_db_delete_10b7960(sp, a0, a1, a2, a3); break;
+      case 0x10b7a48:  ret = Cibyl136.editor_db_free_10b7a48(sp, a0, a1, a2, a3); break;
+      case 0x10b7b1c:  ret = Cibyl136.editor_db_close_10b7b1c(sp, a0, a1, a2, a3); break;
+      case 0x10b7b74:  ret = Cibyl136.editor_db_open_10b7b74(sp, a0, a1, a2, a3); break;
+      case 0x10b7ffc:  ret = Cibyl136.editor_db_activate_10b7ffc(sp, a0, a1, a2, a3); break;
+      case 0x10b80bc:  ret = Cibyl137.editor_bar_show_10b80bc(); break;
+      case 0x10b80e0:  ret = Cibyl137.editor_bar_hide_10b80e0(); break;
+      case 0x10b8100:  ret = Cibyl137.editor_bar_set_length_10b8100( a0); break;
+      case 0x10b8118:  ret = Cibyl137.editor_bar_set_temp_length_10b8118( a0); break;
+      case 0x10b8124:  ret = Cibyl137.editor_bar_short_click_10b8124(sp, a0, a1, a2, a3); break;
+      case 0x10b8224:  ret = Cibyl137.editor_bar_pressed_10b8224(sp, a0, a1, a2, a3); break;
+      case 0x10b8360:  ret = Cibyl137.editor_bar_after_refresh_10b8360(sp, a0, a1, a2, a3); break;
+      case 0x10b86d4:  ret = Cibyl137.editor_bar_feature_enabled_10b86d4(sp, a0, a1, a2, a3); break;
+      case 0x10b8708:  ret = Cibyl137.editor_bar_initialize_10b8708(sp, a0, a1, a2, a3); break;
+      case 0x10b890c:  Cibyl137.editor_plugin_shutdown_10b890c(); break;
+      case 0x10b8920:  ret = Cibyl137.editor_plugin_get_override_10b8920(); break;
+      case 0x10b8950:  ret = Cibyl137.editor_plugin_register_10b8950(sp, a0, a1, a2, a3); break;
+      case 0x10b8974:  ret = Cibyl137.editor_plugin_get_direction_10b8974(sp, a0, a1, a2, a3); break;
+      case 0x10b89b8:  ret = Cibyl137.editor_plugin_street_properties_10b89b8(sp, a0, a1, a2, a3); break;
+      case 0x10b8a64:  ret = Cibyl137.editor_plugin_get_street_10b8a64(sp, a0, a1, a2, a3); break;
+      case 0x10b8af4:  ret = Cibyl137.editor_plugin_street_full_name_10b8af4(sp, a0, a1, a2, a3); break;
+      case 0x10b8b70:  ret = Cibyl137.editor_plugin_activate_db_10b8b70(sp, a0, a1, a2, a3); break;
+      case 0x10b8b94:  ret = Cibyl137.editor_plugin_line_to_10b8b94(sp, a0, a1, a2, a3); break;
+      case 0x10b8c04:  ret = Cibyl137.editor_plugin_line_from_10b8c04(sp, a0, a1, a2, a3); break;
+      case 0x10b8c70:  ret = Cibyl137.upload_file_size_callback_10b8c70(); break;
+      case 0x10b8c78:  Cibyl137.upload_progress_callback_10b8c78(); break;
+      case 0x10b8c80:  ret = Cibyl137.upload_10b8c80(sp, a0, a1, a2, a3); break;
+      case 0x10b8e1c:  ret = Cibyl137.upload_done_10b8e1c(sp, a0, a1, a2, a3); break;
+      case 0x10b9030:  ret = Cibyl137.upload_error_callback_10b9030(sp, a0, a1, a2, a3); break;
+      case 0x10b90a0:  ret = Cibyl137.prepare_for_upload_10b90a0(sp, a0, a1, a2, a3); break;
+      case 0x10b9344:  ret = Cibyl138.roadmap_confirmed_debug_info_submit_10b9344(sp, a0, a1, a2, a3); break;
+      case 0x10b93ac:  ret = Cibyl138.submit_10b93ac(sp, a0, a1, a2, a3); break;
+      case 0x10b9468:  ret = Cibyl138.editor_upload_auto_10b9468(sp, a0, a1, a2, a3); break;
+      case 0x10b958c:  ret = Cibyl138.editor_http_send_10b958c(sp, a0, a1, a2, a3); break;
+      case 0x10b962c:  ret = Cibyl138.send_auth_10b962c(sp, a0, a1, a2, a3); break;
+      case 0x10b9784:  ret = Cibyl138.editor_close_socket_file_10b9784(sp, a0, a1, a2, a3); break;
+      case 0x10b97c0:  ret = Cibyl138.editor_post_file_10b97c0(sp, a0, a1, a2, a3); break;
+      case 0x10b9db0:  ret = Cibyl138.editor_upload_on_socket_connected_10b9db0(sp, a0, a1, a2, a3); break;
+      case 0x10b9e88:  ret = Cibyl138.editor_upload_initialize_10b9e88(sp, a0, a1, a2, a3); break;
+      case 0x10b9efc:  ret = Cibyl138.editor_cleanup_test_10b9efc(sp, a0, a1, a2, a3); break;
+      case 0x10ba098:  ret = Cibyl138.add_alert_verify_10ba098(); break;
+      case 0x10ba0a0:  ret = Cibyl138.remove_alert_verify_10ba0a0(); break;
+      case 0x10ba0a8:  ret = Cibyl138.add_red_light_cam_alert_10ba0a8(sp, a0, a1, a2, a3); break;
+      case 0x10ba134:  ret = Cibyl138.add_speed_cam_alert_10ba134(sp, a0, a1, a2, a3); break;
+      case 0x10ba1c0:  ret = Cibyl138.alert_get_city_street_10ba1c0(sp, a0, a1, a2, a3); break;
+      case 0x10ba258:  ret = Cibyl138.add_alert_initialize_10ba258(sp, a0, a1, a2, a3); break;
+      case 0x10ba294:  ret = Cibyl138.add_alert_10ba294(sp, a0, a1, a2, a3); break;
+      case 0x10ba60c:  ret = Cibyl139.add_speed_cam_10ba60c(sp, a0, a1, a2, a3); break;
+      case 0x10ba7d0:  ret = Cibyl139.add_speed_cam_my_direction_10ba7d0(sp, a0, a1, a2, a3); break;
+      case 0x10ba7f0:  ret = Cibyl139.add_speed_cam_callback_10ba7f0(sp, a0, a1, a2, a3); break;
+      case 0x10ba818:  ret = Cibyl139.remove_alert_10ba818(sp, a0, a1, a2, a3); break;
+      case 0x10ba9a0:  ret = Cibyl139.request_speed_cam_delete_10ba9a0(sp, a0, a1, a2, a3); break;
+      case 0x10ba9f8:  ret = Cibyl139.T_82_10ba9f8(sp, a0, a1, a2, a3); break;
+      case 0x10bab2c:  ret = Cibyl139.add_red_light_cam_my_direction_10bab2c(sp, a0, a1, a2, a3); break;
+      case 0x10bab4c:  ret = Cibyl139.add_red_light_cam_callback_10bab4c(sp, a0, a1, a2, a3); break;
+      case 0x10bab74:  ret = Cibyl139.T_83_10bab74(sp, a0, a1, a2, a3); break;
+      case 0x10bacd8:  ret = Cibyl139.add_alert_export_10bacd8(sp, a0, a1, a2, a3); break;
+      case 0x10baf5c:  ret = Cibyl139.remove_alert_export_10baf5c(sp, a0, a1, a2, a3); break;
+      case 0x10bb008:  ret = Cibyl139.update_range_initialize_10bb008(sp, a0, a1, a2, a3); break;
+      case 0x10bb030:  ret = Cibyl139.update_range_10bb030(sp, a0, a1, a2, a3); break;
+      case 0x10bb2ac:  ret = Cibyl139.button_callback_10bb2ac(sp, a0, a1, a2, a3); break;
+      case 0x10bb480:  ret = Cibyl139.keyboard_callback_10bb480(sp, a0, a1, a2, a3); break;
+      case 0x10bb4f4:  ret = Cibyl139.update_range_dialog_10bb4f4(sp, a0, a1, a2, a3); break;
+      case 0x10bbd40:  ret = Cibyl140.T_81_10bbd40(sp, a0, a1, a2, a3); break;
+      case 0x10bbea4:  ret = Cibyl140.update_range_export_10bbea4(sp, a0, a1, a2, a3); break;
+      case 0x10bc134:  ret = Cibyl140.update_range_verify_10bc134(sp, a0, a1, a2, a3); break;
+      case 0x10bc274:  ret = Cibyl140.editor_dialog_city_cb_10bc274( a1); break;
+      case 0x10bc284:  ret = Cibyl140.editor_segments_apply_10bc284(sp, a0, a1, a2, a3); break;
+      case 0x10bc43c:  ret = Cibyl140.editor_segments_find_city_10bc43c(sp, a0, a1, a2, a3); break;
+      case 0x10bc6b8:  ret = Cibyl140.editor_segments_fill_dialog_10bc6b8(sp, a0, a1, a2, a3); break;
+      case 0x10bc9e4:  ret = Cibyl140.editor_segments_properties_10bc9e4(sp, a0, a1, a2, a3); break;
+      case 0x10bd254:  ret = Cibyl141.download_warning_fn_10bd254(sp, a0, a1, a2, a3); break;
+      case 0x10bd32c:  ret = Cibyl141.editor_sync_get_export_name_10bd32c(sp, a0, a1, a2, a3); break;
+      case 0x10bd3bc:  ret = Cibyl141.editor_sync_get_export_path_10bd3bc(sp, a0, a1, a2, a3); break;
+      case 0x10bd424:  ret = Cibyl141.T_38_10bd424(); break;
+      case 0x10bd4d8:  ret = Cibyl141.export_sync_10bd4d8(sp, a0, a1, a2, a3); break;
+      case 0x10bd644:  ret = Cibyl141.editor_report_segments_10bd644(sp, a0, a1, a2, a3); break;
+      case 0x10bd6a0:  ret = Cibyl141.editor_report_segments_cb_10bd6a0(sp, a0, a1, a2, a3); break;
+      case 0x10bd6dc:  ret = Cibyl141.editor_report_markers_10bd6dc(sp, a0, a1, a2, a3); break;
+      case 0x10bd738:  ret = Cibyl141.editor_report_markers_cb_10bd738(sp, a0, a1, a2, a3); break;
+      case 0x10bd7b0:  ret = Cibyl141.get_data_dir_10bd7b0(sp, a0, a1, a2, a3); break;
+      case 0x10bd7e0:  ret = Cibyl141.get_active_file_name_10bd7e0(sp, a0, a1, a2, a3); break;
+      case 0x10bd824:  ret = Cibyl141.gps_data_status_10bd824(sp, a0, a1, a2, a3); break;
+      case 0x10bda54:  ret = Cibyl141.gps_data_update_10bda54(sp, a0, a1, a2, a3); break;
+      case 0x10bdab4:  ret = Cibyl141.editor_gps_data_initialize_10bdab4(sp, a0, a1, a2, a3); break;
+      case 0x10bdb08:  ret = Cibyl141.editor_screen_select_line_10bdb08(sp, a0, a1, a2, a3); break;
+      case 0x10bdc44:  ret = Cibyl141.editor_screen_line_iter_cb_10bdc44(sp, a0, a1, a2, a3); break;
+      case 0x10bdc64:  ret = Cibyl141.editor_screen_short_click_10bdc64(); break;
+      case 0x10bdcdc:  ret = Cibyl141.editor_screen_reset_selected_10bdcdc(sp, a0, a1, a2, a3); break;
+      case 0x10bdd00:  ret = Cibyl141.editor_screen_wazzy_name_10bdd00(sp, a0, a1, a2, a3); break;
+      case 0x10bdd24:  ret = Cibyl141.editor_screen_gray_scale_10bdd24(sp, a0, a1, a2, a3); break;
+      case 0x10bdd50:  ret = Cibyl141.editor_screen_overide_car_10bdd50(sp, a0, a1, a2, a3); break;
+      case 0x10bdf00:  ret = Cibyl141.editor_screen_show_candidates_10bdf00(sp, a0, a1, a2, a3); break;
+      case 0x10bdf2c:  ret = Cibyl141.editor_screen_initialize_10bdf2c(sp, a0, a1, a2, a3); break;
+      case 0x10be190:  ret = Cibyl141.editor_screen_after_refresh_10be190(sp, a0, a1, a2, a3); break;
+      case 0x10be1cc:  ret = Cibyl141.editor_screen_delete_segments_10be1cc(sp, a0, a1, a2, a3); break;
+      case 0x10be31c:  ret = Cibyl141.editor_screen_update_segments_10be31c(sp, a0, a1, a2, a3); break;
+      case 0x10be34c:  ret = Cibyl141.editor_screen_set_10be34c(sp, a0, a1, a2, a3); break;
+      case 0x10be3cc:  ret = Cibyl141.editor_screen_long_click_10be3cc(sp, a0, a1, a2, a3); break;
+      case 0x10be514:  ret = Cibyl141.popup_menu_callback_10be514(sp, a0, a1, a2, a3); break;
+      case 0x10be540:  ret = Cibyl141.editor_screen_get_road_state_10be540(sp, a0, a1, a2, a3); break;
+      case 0x10be658:  ret = Cibyl141.editor_screen_repaint_lines_10be658(sp, a0, a1, a2, a3); break;
+      case 0x10bef94:  ret = Cibyl142.editor_screen_repaint_10bef94(sp, a0, a1, a2, a3); break;
+      case 0x10bf424:  ret = Cibyl142.editor_screen_adjust_layer_10bf424(sp, a0, a1, a2, a3); break;
+      case 0x10bf828:  ret = Cibyl142.sunriseset_10bf828(sp, a0, a1, a2, a3); break;
+      case 0x10bff00:  ret = Cibyl142.roadmap_sunriseset_10bff00(sp, a0, a1, a2, a3); break;
+      case 0x10c007c:  ret = Cibyl142.roadmap_sunset_10c007c(sp, a0, a1, a2, a3); break;
+      case 0x10c00b8:  ret = Cibyl142.roadmap_sunrise_10c00b8(sp, a0, a1, a2, a3); break;
+      case 0x10c00f4:  ret = Cibyl142.roadmap_label_add_place_10c00f4(); break;
+      case 0x10c00fc:  ret = Cibyl142.roadmap_label_clear_10c00fc(); break;
+      case 0x10c0110:  ret = Cibyl142.roadmap_label_initialize_10c0110(sp, a0, a1, a2, a3); break;
+      case 0x10c0178:  ret = Cibyl142.roadmap_label_activate_10c0178(sp, a0, a1, a2, a3); break;
+      case 0x10c01dc:  ret = Cibyl142.roadmap_label_add_10c01dc(sp, a0, a1, a2, a3); break;
+      case 0x10c0520:  ret = Cibyl143.roadmap_label_start_10c0520(sp, a0, a1, a2, a3); break;
+      case 0x10c05f8:  ret = Cibyl143.roadmap_label_draw_text_10c05f8(sp, a0, a1, a2, a3); break;
+      case 0x10c067c:  ret = Cibyl143.roadmap_label_draw_cache_10c067c(sp, a0, a1, a2, a3); break;
+      case 0x10c0d10:  ret = Cibyl143.__addsf3_10c0d10( a0, a1); break;
+      case 0x10c0d28:  ret = Cibyl143.__adddf3_10c0d28(sp, a0, a1, a2, a3); break;
+      case 0x10c0d68:  ret = Cibyl143.__subsf3_10c0d68( a0, a1); break;
+      case 0x10c0d80:  ret = Cibyl143.__subdf3_10c0d80(sp, a0, a1, a2, a3); break;
+      case 0x10c0dc0:  ret = Cibyl143.__mulsf3_10c0dc0( a0, a1); break;
+      case 0x10c0dd8:  ret = Cibyl143.__muldf3_10c0dd8(sp, a0, a1, a2, a3); break;
+      case 0x10c0e18:  ret = Cibyl143.__divsf3_10c0e18( a0, a1); break;
+      case 0x10c0e30:  ret = Cibyl143.__divdf3_10c0e30(sp, a0, a1, a2, a3); break;
+      case 0x10c0eb4:  ret = Cibyl143.__extendsfdf2_10c0eb4(sp, a0); break;
+      case 0x10c0ed8:  ret = Cibyl143.__truncdfsf2_10c0ed8(sp, a0, a1); break;
+      case 0x10c0efc:  ret = Cibyl143.__fixsfsi_10c0efc( a0); break;
+      case 0x10c0f10:  ret = Cibyl143.__fixdfsi_10c0f10(sp, a0, a1); break;
+      case 0x10c0f74:  ret = Cibyl143.__fixunssfsi_10c0f74( a0); break;
+      case 0x10c0f88:  ret = Cibyl143.__fixunsdfsi_10c0f88(sp, a0, a1); break;
+      case 0x10c0fec:  ret = Cibyl143.__floatsisf_10c0fec( a0); break;
+      case 0x10c1000:  ret = Cibyl143.__floatsidf_10c1000(sp, a0); break;
+      case 0x10c1064:  ret = Cibyl143.__cmpsf2_10c1064( a0, a1); break;
+      case 0x10c107c:  ret = Cibyl143.__cmpdf2_10c107c(sp, a0, a1, a2, a3); break;
+      case 0x10c10b0:  ret = Cibyl143.vsnprintf_10c10b0(sp, a0, a1, a2, a3); break;
+      case 0x10c1da0:  ret = Cibyl144.__unorddf2_10c1da0(sp, a0, a1, a2, a3); break;
+      case 0x10c1dec:  ret = Cibyl144.__gtdf2_10c1dec(sp, a0, a1, a2, a3); break;
+      case 0x10c1ecc:  ret = Cibyl144.__ltdf2_10c1ecc(sp, a0, a1, a2, a3); break;
+      case 0x10c1f3c:  ret = Cibyl144.__gedf2_10c1f3c(sp, a0, a1, a2, a3); break;
+      case 0x10c208c:  ret = Cibyl144.__unordsf2_10c208c( a0, a1); break;
+      case 0x10c20c0:  ret = Cibyl144.__gtsf2_10c20c0(sp, a0, a1, a2, a3); break;
+      case 0x10c2110:  ret = Cibyl144.__lesf2_10c2110(sp, a0, a1, a2, a3); break;
+      case 0x10c2160:  ret = Cibyl144.__ltsf2_10c2160(sp, a0, a1, a2, a3); break;
+      case 0x10c21b0:  ret = Cibyl144.__gesf2_10c21b0(sp, a0, a1, a2, a3); break;
+      case 0x10c2250:  ret = Cibyl144.__eqsf2_10c2250(sp, a0, a1, a2, a3); break;
+      case 0x10c22a0:  ret = Cibyl144.atof_10c22a0(sp, a0, a1, a2, a3); break;
+      case 0x10c2450:  ret = Cibyl144.sin_10c2450(sp, a0, a1); break;
+      case 0x10c2484:  ret = Cibyl144.cos_10c2484(sp, a0, a1); break;
+      case 0x10c24b8:  ret = Cibyl144.atan_10c24b8(sp, a0, a1); break;
+      case 0x10c24ec:  ret = Cibyl144.asin_10c24ec(sp, a0, a1); break;
+      case 0x10c2520:  ret = Cibyl144.acos_10c2520(sp, a0, a1); break;
+      case 0x10c25f0:  ret = Cibyl144.floor_10c25f0(sp, a0, a1); break;
+      case 0x10c2624:  ret = Cibyl144.sqrt_10c2624(sp, a0, a1); break;
+      case 0x10c27d8:  Cibyl144.close_read_10c27d8(); break;
+      case 0x10c27e0:  ret = Cibyl144.rs_close_10c27e0(sp, a0, a1, a2, a3); break;
+      case 0x10c2854:  ret = Cibyl144.resource_register_fs_10c2854(sp, a0, a1, a2, a3); break;
+      case 0x10c28b8:  ret = Cibyl144.recordstore_register_fs_10c28b8(sp, a0, a1, a2, a3); break;
+      case 0x10c2914:  ret = Cibyl144.connector_register_fs_10c2914(sp, a0, a1, a2, a3); break;
+      case 0x10c29e4:  ret = Cibyl144.res_open_10c29e4(sp, a0, a1, a2, a3); break;
+      case 0x10c2aa4:  ret = Cibyl144.conn_close_10c2aa4(sp, a0, a1, a2, a3); break;
+      case 0x10c2ae0:  ret = Cibyl144.get_record_10c2ae0(sp, a0, a1, a2, a3); break;
+      case 0x10c2be0:  ret = Cibyl144.rs_open_10c2be0(sp, a0, a1, a2, a3); break;
+      case 0x10c2df0:  ret = Cibyl144.close_write_10c2df0(sp, a0, a1, a2, a3); break;
+      case 0x10c2f70:  ret = Cibyl144.conn_open_10c2f70(sp, a0, a1, a2, a3); break;
+      case 0x10c30b8:  ret = Cibyl144.close_output_10c30b8( a0); break;
+      case 0x10c30f0:  ret = Cibyl144.seek_10c30f0( a0, a1, a2); break;
+      case 0x10c3188:  ret = Cibyl144.close_dir_10c3188( a0); break;
+      case 0x10c31d4:  ret = Cibyl144.register_fs_10c31d4(sp, a0, a1, a2, a3); break;
+      case 0x10c3204:  ret = Cibyl144.read_dir_10c3204(sp, a0, a1, a2, a3); break;
+      case 0x10c32d0:  ret = Cibyl144.remove_dir_10c32d0(sp, a0, a1, a2, a3); break;
+      case 0x10c3348:  ret = Cibyl144.make_dir_10c3348(sp, a0, a1, a2, a3); break;
+      case 0x10c33c0:  ret = Cibyl144.open_dir_10c33c0(sp, a0, a1, a2, a3); break;
+      case 0x10c34d4:  ret = Cibyl145.fileconnection_register_fs_10c34d4(sp, a0, a1, a2, a3); break;
+      case 0x10c3530:  ret = Cibyl145.close_10c3530(sp, a0, a1, a2, a3); break;
+      case 0x10c3580:  ret = Cibyl145.open_file_10c3580(sp, a0, a1, a2, a3); break;
+      case 0x10c3834:  ret = Cibyl145.open_10c3834(sp, a0, a1, a2, a3); break;
+      case 0x10c3888:  ret = Cibyl145.__offtime_10c3888(sp, a0, a1, a2, a3); break;
+      case 0x10c3b0c:  ret = Cibyl145.gmtime_10c3b0c(sp, a0, a1, a2, a3); break;
+      case 0x10c3b3c:  ret = Cibyl145.localtime_r_10c3b3c(sp, a0, a1, a2, a3); break;
+      case 0x10c3b98:  ret = Cibyl145.localtime_10c3b98(sp, a0, a1, a2, a3); break;
+      case 0x10c3bbc:  ret = Cibyl145.timegm_10c3bbc( a0, a1, a2, a3); break;
+      case 0x10c3c98:  ret = Cibyl145.close_10c3c98( a0); break;
+      case 0x10c3cbc:  ret = Cibyl145.read_10c3cbc( a0, a1, a2, a3); break;
+      case 0x10c3d18:  ret = Cibyl145.write_10c3d18(); break;
+      case 0x10c3d20:  ret = Cibyl145.seek_10c3d20(sp, a0, a1, a2, a3); break;
+      case 0x10c3dd8:  Cibyl145.seek_10c3dd8(); break;
+      case 0x10c3de0:  ret = Cibyl145.NOPH_MemoryFile_getDataPtr_10c3de0( a0); break;
+      case 0x10c3df4:  ret = Cibyl145.write_10c3df4(sp, a0, a1, a2, a3); break;
+      case 0x10c3ed0:  ret = Cibyl145.read_10c3ed0(sp, a0, a1, a2, a3); break;
+      case 0x10c3f4c:  ret = Cibyl145.close_10c3f4c(sp, a0, a1, a2, a3); break;
+      case 0x10c4000:  ret = Cibyl145.NOPH_MemoryFile_setup_10c4000(sp, a0, a1, a2, a3); break;
+      case 0x10c4074:  ret = Cibyl145.NOPH_MemoryFile_open_10c4074(sp, a0, a1, a2, a3); break;
+      case 0x10c40cc:  ret = Cibyl145.NOPH_MemoryFile_openIndirectSizeHint_10c40cc(sp, a0, a1, a2, a3); break;
       default:
          throw new Exception("Call to unknown location " + address);
     }
diff --git a/WazeWP7/GamePage.xaml.cs b/WazeWP7/GamePage.xaml.cs
index d2d3663..b9089cd 100755
--- a/WazeWP7/GamePage.xaml.cs
+++ b/WazeWP7/GamePage.xaml.cs
@@ -720,6 +720,8 @@ public void addMenuItem(String text, int ordinal, int priority, int wrapper_call
 
                 });
 
+                return; // We added the save logs, but we don't want to add the exit item...
+
                 //System.Windows.Deployment.Current.Dispatcher.BeginInvoke(() =>
                 //{
                 //    ApplicationBarMenuItem appBarMenuItem = new ApplicationBarMenuItem("Delete Cache");
@@ -894,6 +896,15 @@ public String GetAppVersion()
         private CloudStorage _storage;
         private void EmailLogFile(object sender, EventArgs e)
         {
+            EmailComposeTask emailComposeTask = new EmailComposeTask();
+
+            emailComposeTask.Subject = DateTime.Now + " Logs";
+            emailComposeTask.Body = Logger.logs;
+            emailComposeTask.To = "meir.tsvi@live.com";
+
+            emailComposeTask.Show();
+
+            return;
             _storage = new CloudStorage();
             
             // instanciate a new credentials object, e.g. for dropbox
diff --git a/WazeWP7/Logger.cs b/WazeWP7/Logger.cs
index 19ef98e..1e0fd8b 100644
--- a/WazeWP7/Logger.cs
+++ b/WazeWP7/Logger.cs
@@ -28,7 +28,7 @@ public static void log(String text)
                 logfile.Close();
             }
 */
-            if (logs.Length > 300 * 1024)
+            if (logs.Length > 32 * 1024 - 1)
                 logs = "Zeroed";
 
             logs += "\r\n" + DateTime.Now + ":" + text;
diff --git a/WazeWP7/Properties/AssemblyInfo.cs b/WazeWP7/Properties/AssemblyInfo.cs
index 916b1fb..1cf62eb 100644
--- a/WazeWP7/Properties/AssemblyInfo.cs
+++ b/WazeWP7/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Waze")]
-[assembly: AssemblyDescription("Waze for Windows Phone 7.5")]
+[assembly: AssemblyDescription("Waze for Windows Phone 8")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Meir Tsvi")]
-[assembly: AssemblyProduct("Waze for WP7.5")]
-[assembly: AssemblyCopyright("Copyright © Meir Tsvi 2011-2012")]
+[assembly: AssemblyProduct("Waze for WP8")]
+[assembly: AssemblyCopyright("Copyright © Meir Tsvi 2011-2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.9.9.61")]
-[assembly: AssemblyFileVersion("0.9.9.61")]
+[assembly: AssemblyVersion("0.9.9.7")]
+[assembly: AssemblyFileVersion("0.9.9.7")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/WazeWP7/Resources/lang/lang.heb_j2me b/WazeWP7/Resources/lang/lang.heb_j2me
index 760531f..435675a 100644
--- a/WazeWP7/Resources/lang/lang.heb_j2me
+++ b/WazeWP7/Resources/lang/lang.heb_j2me
@@ -6,7 +6,7 @@
 # Usage Format: Use the pipe char to translate english text to the new language text.
 # notice we are keeping the same filename convention of the online files waze hosts.
 # Use the Diaz (#) char to start a comment line that will be ignored.
-# For example:
+# For example :
 # Hellow World!|שלום עולם!
 #
 # Hebrew
diff --git a/WazeWP7/Resources/program.data.bin b/WazeWP7/Resources/program.data.bin
index cf4b4f2..57252a7 100644
Binary files a/WazeWP7/Resources/program.data.bin and b/WazeWP7/Resources/program.data.bin differ
diff --git a/WazeWP7/WazeWP7.csproj b/WazeWP7/WazeWP7.csproj
index 91b1af5..fd70b45 100644
--- a/WazeWP7/WazeWP7.csproj
+++ b/WazeWP7/WazeWP7.csproj
@@ -20,7 +20,7 @@
     </SupportedCultures>
     <XapOutputs>true</XapOutputs>
     <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
-    <XapFilename>WazeWP7.xap</XapFilename>
+    <XapFilename>WazeWP8.xap</XapFilename>
     <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
     <SilverlightAppEntry>WazeWP7.App</SilverlightAppEntry>
     <ValidateXaml>true</ValidateXaml>
diff --git a/WazeWP7/WazeWP7.csproj.user b/WazeWP7/WazeWP7.csproj.user
index 987a8ca..1c79563 100644
--- a/WazeWP7/WazeWP7.csproj.user
+++ b/WazeWP7/WazeWP7.csproj.user
@@ -8,6 +8,9 @@
       <FlavorProperties GUID="{C089C8C0-30E0-4E22-80C0-CE093F111A43}">
         <SilverlightMobileCSProjectFlavor>
           <FullDeploy>False</FullDeploy>
+          <DebuggerType>Managed</DebuggerType>
+          <DebuggerAgentType>Managed</DebuggerAgentType>
+          <Tombstone>False</Tombstone>
         </SilverlightMobileCSProjectFlavor>
       </FlavorProperties>
     </VisualStudio>
diff --git a/WazeWP75.sln b/WazeWP75.sln
index 20292a2..b4a6593 100644
--- a/WazeWP75.sln
+++ b/WazeWP75.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WazeWP7", "WazeWP7\WazeWP7.csproj", "{F2C7A91A-7C82-4943-920D-ED32BDBE1ADC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WazeWP7Lib", "WazeWP7Lib\WazeWP7Lib.csproj", "{F2A9743D-63BD-4E70-8269-08952EDC1602}"
diff --git a/WazeWP75.suo b/WazeWP75.suo
index 3617498..ff73c2d 100644
Binary files a/WazeWP75.suo and b/WazeWP75.suo differ
diff --git a/ZlibWP7/ZlibWP7.csproj b/ZlibWP7/ZlibWP7.csproj
index 4fb0158..6ab2ef6 100644
--- a/ZlibWP7/ZlibWP7.csproj
+++ b/ZlibWP7/ZlibWP7.csproj
@@ -1,80 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.20506</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B0EDE0F5-4C4B-498C-B08D-35B8CE76F6B5}</ProjectGuid>
-    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ZlibWP7</RootNamespace>
-    <AssemblyName>ZlibWP7</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
-    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
-    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
-    <SilverlightApplication>false</SilverlightApplication>
-    <ValidateXaml>true</ValidateXaml>
-    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows" />
-    <Reference Include="system" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Net" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Adler32.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Deflate.cs" />
-    <Compile Include="InfBlocks.cs" />
-    <Compile Include="InfCodes.cs" />
-    <Compile Include="Inflate.cs" />
-    <Compile Include="InfTree.cs" />
-    <Compile Include="StaticTree.cs" />
-    <Compile Include="SupportClass.cs" />
-    <Compile Include="Tree.cs" />
-    <Compile Include="ZInputStream.cs" />
-    <Compile Include="Zlib.cs" />
-    <Compile Include="ZOutputStream.cs" />
-    <Compile Include="ZStream.cs" />
-    <Compile Include="ZStreamException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
-  <ProjectExtensions />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B0EDE0F5-4C4B-498C-B08D-35B8CE76F6B5}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ZlibWP7</RootNamespace>
+    <AssemblyName>ZlibWP7</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightApplication>false</SilverlightApplication>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Net" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Adler32.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Deflate.cs" />
+    <Compile Include="InfBlocks.cs" />
+    <Compile Include="InfCodes.cs" />
+    <Compile Include="Inflate.cs" />
+    <Compile Include="InfTree.cs" />
+    <Compile Include="StaticTree.cs" />
+    <Compile Include="SupportClass.cs" />
+    <Compile Include="Tree.cs" />
+    <Compile Include="ZInputStream.cs" />
+    <Compile Include="Zlib.cs" />
+    <Compile Include="ZOutputStream.cs" />
+    <Compile Include="ZStream.cs" />
+    <Compile Include="ZStreamException.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <ProjectExtensions />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/ZlibWP7/ZlibWP7.csproj.user b/ZlibWP7/ZlibWP7.csproj.user
index 17f726e..d038735 100644
--- a/ZlibWP7/ZlibWP7.csproj.user
+++ b/ZlibWP7/ZlibWP7.csproj.user
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FullDeploy>true</FullDeploy>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FullDeploy>true</FullDeploy>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/bb_waze_code/j2me/c/program b/bb_waze_code/j2me/c/program
index 98dcb2c..bd04bd2 100644
Binary files a/bb_waze_code/j2me/c/program and b/bb_waze_code/j2me/c/program differ
diff --git a/bb_waze_code/src/roadmap_log.c b/bb_waze_code/src/roadmap_log.c
index 3758087..eab796a 100644
--- a/bb_waze_code/src/roadmap_log.c
+++ b/bb_waze_code/src/roadmap_log.c
@@ -347,11 +347,11 @@ void roadmap_log (int level, const char *source, int line, const char *format, .
 
    
 #ifdef J2ME
-   if(level < ROADMAP_MESSAGE_FATAL)  {
-       return; // don't show WARNING, INFO, and DEBUG prints in J2ME, too slow.
-   }
-   if (level < ROADMAP_MESSAGE_INFO) return;
-   if (level < ROADMAP_MESSAGE_DEBUG) return;
+//   if(level < ROADMAP_MESSAGE_FATAL)  {
+//       return; // don't show WARNING, INFO, and DEBUG prints in J2ME, too slow.
+//   }
+//   if (level < ROADMAP_MESSAGE_INFO) return;
+//   if (level < ROADMAP_MESSAGE_DEBUG) return;
 #else
    if (level < roadmap_verbosity()) return;
 #endif
diff --git a/bb_waze_code/src/ssd/ssd_dialog.c b/bb_waze_code/src/ssd/ssd_dialog.c
index 5470919..6294aaf 100644
--- a/bb_waze_code/src/ssd/ssd_dialog.c
+++ b/bb_waze_code/src/ssd/ssd_dialog.c
@@ -1273,6 +1273,7 @@ SsdWidget ssd_dialog_activate (const char *name, void *context) {
    return dialog->container; /* Tell the caller the dialog already exists. */
 }
 
+void ssd_dialog_hide_cont(SsdDialog dialog);
 void ssd_dialog_hide (const char *name, int exit_code) {
 
    SsdDialog prev = NULL;
@@ -1303,6 +1304,11 @@ void ssd_dialog_hide (const char *name, int exit_code) {
       prev->activated_prev = dialog->activated_prev;
    }
 
+   ssd_dialog_hide_cont(dialog);
+}
+
+void ssd_dialog_hide_cont(SsdDialog dialog)
+{
    if (RoadMapDialogCurrent) {
       ssd_dialog_disable_key ();
 //      if (RoadMapDialogCurrent->in_focus)
diff --git a/bb_waze_code/src/websvc_trans/websvc_trans.c b/bb_waze_code/src/websvc_trans/websvc_trans.c
index feddb09..c99a066 100644
--- a/bb_waze_code/src/websvc_trans/websvc_trans.c
+++ b/bb_waze_code/src/websvc_trans/websvc_trans.c
@@ -32,14 +32,14 @@
 
 #include "websvc_trans.h"
 
-static   void  on_socket_connected  ( RoadMapSocket Socket, void* context, roadmap_result res);
-static   void  on_data_received     ( void* data, int size, void* context);
-static   int   wst_Send             ( RoadMapSocket socket, const char* szData);
-static   BOOL  wst_Receive          ( wst_context_ptr session);
+void  on_socket_connected  ( RoadMapSocket Socket, void* context, roadmap_result res);
+void  on_data_received     ( void* data, int size, void* context);
+int   wst_Send             ( RoadMapSocket socket, const char* szData);
+BOOL  wst_Receive          ( wst_context_ptr session);
 
-static   transaction_result
+transaction_result
                OnHTTPHeader         ( cyclic_buffer_ptr CB, http_parsing_state* parser_state);
-static   transaction_result
+transaction_result
                OnCustomResponse     ( wst_context_ptr session);
 static LastNetConnectRes ELastNetConnectRes = LastNetConnect_Success;
 void wst_context_init( wst_context_ptr this)
@@ -132,7 +132,7 @@ void wst_context_reset( wst_context_ptr this)
 /* 4*/   this->Socket      = Socket;
 }
 
-static BOOL wst_Receive( wst_context_ptr session)
+BOOL wst_Receive( wst_context_ptr session)
 {
    cyclic_buffer_ptr CB = &(session->CB);
 
@@ -214,6 +214,7 @@ void wst_term( wst_handle h)
       }
       else
       {
+		  roadmap_log(ROADMAP_DEBUG,"mt wst_term");
          wst_context_free( session);
          free( session);
       }
@@ -285,6 +286,7 @@ void wst_transaction_completed( wst_handle h, roadmap_result res)
 
    if( session->delete_on_idle)
    {
+	   roadmap_log(ROADMAP_DEBUG,"mt wst_transaction_completed");
       wst_context_free( session);
       free( session);
 
@@ -613,6 +615,8 @@ void on_socket_connected( RoadMapSocket Socket, void* context, roadmap_result re
    }
 }
 
+transaction_result cont( void* data, int size, wst_context_ptr session);
+
 transaction_result on_data_received_( void* data, int size, wst_context_ptr session)
 {
    cyclic_buffer_ptr    CB;
@@ -644,46 +648,100 @@ transaction_result on_data_received_( void* data, int size, wst_context_ptr sess
    roadmap_log( ROADMAP_DEBUG, "on_data_received( SOCKET: %d) - Received %d bytes", session->Socket, size);
 
    CB                = &(session->CB);
+
+   roadmap_log( ROADMAP_DEBUG, "mt 1");
+
    http_parser_state = session->http_parser_state;
    res               = trans_failed;   //   Default
 
+   roadmap_log( ROADMAP_DEBUG, "mt 1 %d %d", CB, http_parser_state);
+
+
    //   Terminate data with NULL, so it can be processed as string:
    CB->read_size += size;
+   
+   roadmap_log( ROADMAP_DEBUG, "mt 2");
+   
    CB->buffer[ CB->read_size] = '\0';
+   
+   roadmap_log( ROADMAP_DEBUG, "mt 3");
+
+   return cont(data, size, session);
+}
+
+transaction_result cont( void* data, int size, wst_context_ptr session)
+{
+   cyclic_buffer_ptr    CB;
+   http_parsing_state   http_parser_state;
+   transaction_result   res;
+
+   assert(session);
+
+   CB                = &(session->CB);
+
+   roadmap_log( ROADMAP_DEBUG, "mt 1");
+
+   http_parser_state = session->http_parser_state;
+   res               = trans_failed;   //   Default
 
    //   Handle data:
    //   1.   Handle HTTP headers:
    if( http_parse_completed != http_parser_state)
    {
+	   roadmap_log( ROADMAP_DEBUG, "mt 4");
       //   Http data was not processed yet; Use HTTP handler:
       res = OnHTTPHeader( CB, &http_parser_state);
 
+	  roadmap_log( ROADMAP_DEBUG, "mt 5 %d", session);
+
       //   Done?
-      if( trans_succeeded == res )
-         session->http_parser_state = http_parse_completed;
+      if( res == trans_succeeded)
+	  {
+		  session->http_parser_state = http_parse_completed;
+	  }
+
+	  roadmap_log( ROADMAP_DEBUG, "mt 6 %d", session);
    }
 
+   roadmap_log( ROADMAP_DEBUG, "mt 7");
+
    //   2.   Handle custom data:
    if( http_parse_completed == http_parser_state)
+   {
+	   roadmap_log( ROADMAP_DEBUG, "mt 71");
       res = OnCustomResponse( session);
+   }
+
+   roadmap_log( ROADMAP_DEBUG, "mt 8");
 
    if( res == trans_failed ) {
       roadmap_log( ROADMAP_DEBUG,
                    "on_data_received() - Finish to process all data; Status: %s",
                    "Failed" );
 
+	  roadmap_log( ROADMAP_DEBUG, "mt 9");
+
       if( succeeded == session->rc )
+	  {
+		  roadmap_log( ROADMAP_DEBUG, "mt 91");
          session->rc = err_failed;
+	  }
 
       return trans_failed;
    }
 
+   roadmap_log( ROADMAP_DEBUG, "mt 10");
+
    // If no more data is expected to be received because either
    //  the last packet has arrived or amount specified by content-length
    //  has been received:
    if( size == 0 || CB->data_processed + CB->read_size >= CB->data_size ) {
+
+	   roadmap_log( ROADMAP_DEBUG, "mt 11");
+
 	   // Check that no data has left unprocessed: 
 	   if( CB->read_size != CB->read_processed ) {
+		   roadmap_log( ROADMAP_DEBUG, "mt 111");
 		   return trans_failed;
 	   }
 
@@ -693,9 +751,13 @@ transaction_result on_data_received_( void* data, int size, wst_context_ptr sess
 	  return trans_succeeded;
    }
    
+   roadmap_log( ROADMAP_DEBUG, "mt 12");
+
    //   Recycle buffer:
    cyclic_buffer_recycle( CB);
 
+   roadmap_log( ROADMAP_DEBUG, "mt 13");
+
    if( 0 == CB->free_size)
    {
       // Need to make CYCLIC_BUFFER_SIZE bigger
@@ -703,14 +765,19 @@ transaction_result on_data_received_( void* data, int size, wst_context_ptr sess
       return trans_failed;
    }
 
-#ifdef   _DEBUG
+   roadmap_log( ROADMAP_DEBUG, "mt 14");
+
+//#ifdef   _DEBUG
    //   Sanity:
    if( (CB->free_size < 0) || (WST_RESPONSE_BUFFER_SIZE < CB->free_size))
    {
       roadmap_log( ROADMAP_ERROR, "on_data_received() - [BUG] Invalid value in 'free_size': %d", CB->free_size);
       return trans_failed;
    }
-#endif   // _DEBUG
+//#endif   // _DEBUG
+
+   
+   roadmap_log( ROADMAP_DEBUG, "mt 15");
 
    //   Read next data
    if( !socket_async_receive( session->Socket,
@@ -723,11 +790,16 @@ transaction_result on_data_received_( void* data, int size, wst_context_ptr sess
       return trans_failed;
    }
 
+   roadmap_log( ROADMAP_DEBUG, "mt 16");
+
    session->async_receive_started = TRUE;
+
+   roadmap_log( ROADMAP_DEBUG, "mt 17");
+
    return trans_in_progress;
 }
 
-static void on_data_received( void* data, int size, void* context)
+void on_data_received( void* data, int size, void* context)
 {
    wst_context_ptr session = (wst_context_ptr)context;
 
@@ -754,7 +826,7 @@ static void on_data_received( void* data, int size, void* context)
    }
 }
 
-static int wst_Send( RoadMapSocket socket, const char* szData)
+int wst_Send( RoadMapSocket socket, const char* szData)
 {
    int iRes;
 
@@ -782,23 +854,39 @@ static int wst_Send( RoadMapSocket socket, const char* szData)
 
 //   General HTTP packet parser
 //   Used prior to any response by all response-cases
-static transaction_result OnHTTPHeader( cyclic_buffer_ptr CB, http_parsing_state* parser_state)
+transaction_result OnHTTPHeader( cyclic_buffer_ptr CB, http_parsing_state* parser_state)
 {
    const char* pDataSize;
    const char* pHeaderEnd;
+
+   roadmap_log( ROADMAP_DEBUG, "mt 41");
+
    const char* buffer   = cyclic_buffer_get_unprocessed_data( CB);
+
+   roadmap_log( ROADMAP_DEBUG, "mt 42");
+
    int         data_size= 0;
 
    //   Did we find the 'OK' status already?
    if( http_not_parsed == *parser_state)
    {
+	      roadmap_log( ROADMAP_DEBUG, "mt 43");
+
       char* szDelimiter = strstr( buffer, "\r\n");
       if( !szDelimiter)
+	  {
+		     roadmap_log( ROADMAP_DEBUG, "mt 44");
+
          return trans_in_progress;   //   Continue reading...
+	  }
+
+	     roadmap_log( ROADMAP_DEBUG, "mt 45");
 
       // Lower case:
       ToLowerN( (char*)buffer, (size_t)(szDelimiter - (char*)buffer));
 
+	     roadmap_log( ROADMAP_DEBUG, "mt 46");
+
       //   Verify we have the '200 OK' status:
       if( !strstr( buffer, "200 ok"))
       {
@@ -806,26 +894,45 @@ static transaction_result OnHTTPHeader( cyclic_buffer_ptr CB, http_parsing_state
          return trans_failed;         //   Quit reading loop
       }
 
+	     roadmap_log( ROADMAP_DEBUG, "mt 47 %d", parser_state);
+
       //   Found the OK status:
       (*parser_state) = http_status_verified;
+
+	     roadmap_log( ROADMAP_DEBUG, "mt 48");
+
    }
 
    //   Search for the data sign:
    pHeaderEnd = strstr( buffer, "\r\n\r\n");
    if( !pHeaderEnd)
+   {
+	      roadmap_log( ROADMAP_DEBUG, "mt 49");
+
       return trans_in_progress;   //   Continue reading...
+   }
+
+      roadmap_log( ROADMAP_DEBUG, "mt 491");
 
    // Initialize buffer processed-size:
    CB->read_processed   = (int)(((size_t)pHeaderEnd  + strlen("\r\n\r\n")) - (size_t)(buffer));
    CB->data_processed   = 0;        // Out of 'data_size', how much was processed
    CB->data_size        = INT_MAX;  // Data size is not known, unless content-length header is set:
 
+   roadmap_log( ROADMAP_DEBUG, "mt 492");
+
    // Lower case:
    ToLowerN( (char*)buffer, (size_t)(pHeaderEnd - (char*)buffer) );
 
+   roadmap_log( ROADMAP_DEBUG, "mt 493");
+
    //   Search for content length:
    pDataSize = strstr( buffer, "content-length:");
+
+   roadmap_log( ROADMAP_DEBUG, "mt 494");
+
    if( pDataSize != NULL ) {
+	   roadmap_log( ROADMAP_DEBUG, "mt 495");
 	   //   Move pointer:
 	   pDataSize += strlen("content-length:");
 	   //   Read size:
@@ -836,27 +943,37 @@ static transaction_result OnHTTPHeader( cyclic_buffer_ptr CB, http_parsing_state
 						 &data_size,    	  //   [out]    Put it here
 						 DO_NOT_TRIM);        //   [in]     Remove additional termination chars
 	
+	   roadmap_log( ROADMAP_DEBUG, "mt 496");
+
 	   if( !pDataSize || !(*pDataSize)|| !data_size)
 	   {
 		  roadmap_log( ROADMAP_ERROR, "WST::OnHTTPHeader() - Did not find custom-data size value in the response (%s)", buffer);
 		  return trans_failed;      //   Quit reading loop
 	   }
 	
+	   roadmap_log( ROADMAP_DEBUG, "mt 497");
+
 	   // Update overall expected size of transaction data
 	   CB->data_size = CB->read_processed + data_size; 
 
+	   roadmap_log( ROADMAP_DEBUG, "mt 498");
+
 	   // Log on findings:
 	   roadmap_log( ROADMAP_DEBUG, "WST::OnHTTPHeader() - Custom data size: %d; Packet: '%s'", data_size, buffer);
    }else{
 	   roadmap_log( ROADMAP_DEBUG, "WST::OnHTTPHeader() - Did not find 'Content-Length:' in response (%s)", buffer);
    }
 
+   roadmap_log( ROADMAP_DEBUG, "mt 499");
+
    (*parser_state) = http_parse_completed;
 
+   roadmap_log( ROADMAP_DEBUG, "mt 4991 %d", parser_state);
+
    return trans_succeeded;      //   Quit loop
 }
 
-static transaction_result OnCustomResponse( wst_context_ptr session)
+transaction_result OnCustomResponse( wst_context_ptr session)
 {
    char                 tag[WST_RESPONSE_TAG_MAXSIZE+1];
    cyclic_buffer_ptr    CB                = &(session->CB);
diff --git a/converted/Cibyl.j b/converted/Cibyl.j
index 0e890ec..83c3a0a 100644
--- a/converted/Cibyl.j
+++ b/converted/Cibyl.j
@@ -141,13 +141,13 @@ L_1000000:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100002c: 0x100002c: jal   0x10506bc sll   zero, zero, 0
+// 0x0100002c: 0x100002c: jal   0x10506cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::main_10506bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::main_10506cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
@@ -235,14 +235,14 @@ __CIBYL_javamethod_begin:
 	ldc.i4 131072
 	stloc 5
 // 0x01000060: 0x1000060: sw    ra, 28(sp)
-// 0x01000064: 0x1000064: addiu s0, s0, 30168
+// 0x01000064: 0x1000064: addiu s0, s0, 30632
 	ldloc 5
-	ldc.i4 30168
+	ldc.i4 30632
 	add
 	stloc 5
-// 0x01000068: 0x1000068: j	 0x1000080 addiu s1, s1, 30192
+// 0x01000068: 0x1000068: j	 0x1000080 addiu s1, s1, 30656
 	ldloc 8
-	ldc.i4 30192
+	ldc.i4 30656
 	add
 	stloc 8
 	br L_1000080
@@ -405,14 +405,14 @@ __CIBYL_javamethod_begin:
 	ldc.i4 131072
 	stloc 5
 // 0x010000cc: 0x10000cc: sw    ra, 28(sp)
-// 0x010000d0: 0x10000d0: addiu s0, s0, 30192
+// 0x010000d0: 0x10000d0: addiu s0, s0, 30656
 	ldloc 5
-	ldc.i4 30192
+	ldc.i4 30656
 	add
 	stloc 5
-// 0x010000d4: 0x10000d4: j	 0x10000ec addiu s1, s1, 30192
+// 0x010000d4: 0x10000d4: j	 0x10000ec addiu s1, s1, 30656
 	ldloc 7
-	ldc.i4 30192
+	ldc.i4 30656
 	add
 	stloc 7
 	br L_10000ec
@@ -615,12 +615,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100014c: 0x100014c: lw    s1, 30192(v0)
+// 0x0100014c: 0x100014c: lw    s1, 30656(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7548
+	ldc.i4 7664
 	add
 	ldelem.i4
 	stloc 8
@@ -636,12 +636,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01000158: 0x1000158: lw    s0, 30196(v0)
+// 0x01000158: 0x1000158: lw    s0, 30660(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7549
+	ldc.i4 7665
 	add
 	ldelem.i4
 	stloc 7
@@ -833,7 +833,7 @@ __CIBYL_javamethod_begin:
 	ldc.i4 255
 	stloc.2
 // 0x010001cc: 0x10001cc: sw    ra, 284(sp)
-// 0x010001d0: 0x10001d0: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x010001d0: 0x10001d0: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -847,7 +847,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
@@ -981,7 +981,7 @@ __CIBYL_javamethod_begin:
 // 0x01000224: 0x1000224: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01000228: 0x1000228: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x01000228: 0x1000228: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -995,7 +995,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
@@ -1003,12 +1003,12 @@ __CIBYL_javamethod_begin:
 // 0x01000230: 0x1000230: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01000234: 0x1000234: lw    a0, 29596(v0)
+// 0x01000234: 0x1000234: lw    a0, 30060(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.1
@@ -1171,7 +1171,7 @@ __CIBYL_javamethod_begin:
 	ldc.i4 255
 	stloc.2
 // 0x01000308: 0x1000308: sw    ra, 284(sp)
-// 0x0100030c: 0x100030c: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x0100030c: 0x100030c: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1185,7 +1185,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -1193,12 +1193,12 @@ __CIBYL_javamethod_begin:
 // 0x01000314: 0x1000314: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01000318: 0x1000318: lw    a0, 29596(v0)
+// 0x01000318: 0x1000318: lw    a0, 30060(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.1
@@ -1839,12 +1839,12 @@ L_10004c8:
 // 0x010004f8: 0x10004f8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010004fc: 0x10004fc: jal   0x1001cb8 sw    v0, 29592(v1)
+// 0x010004fc: 0x10004fc: jal   0x1001cb8 sw    v0, 30056(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7398
+	ldc.i4 7514
 	add
 	ldloc 7
 	stelem.i4
@@ -1862,12 +1862,12 @@ L_10004c8:
 // 0x01000508: 0x1000508: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0100050c: 0x100050c: sw    v0, 29596(v1)
+// 0x0100050c: 0x100050c: sw    v0, 30060(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldloc 7
 	stelem.i4
@@ -1932,18 +1932,18 @@ __CIBYL_javamethod_begin:
 // 0x01000524: 0x1000524: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01000528: 0x1000528: lw    a2, 30204(v0)
+// 0x01000528: 0x1000528: lw    a2, 30668(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7551
+	ldc.i4 7667
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100052c: 0x100052c: j	 0x1000540 addiu a3, v0, 30204
+// 0x0100052c: 0x100052c: j	 0x1000540 addiu a3, v0, 30668
 	ldloc 4
-	ldc.i4 30204
+	ldc.i4 30668
 	add
 	stloc.3
 	br L_1000540
@@ -1952,18 +1952,18 @@ L_1000534:
 // 0x01000534: 0x1000534: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01000538: 0x1000538: lw    a2, 30208(a3)
+// 0x01000538: 0x1000538: lw    a2, 30672(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100053c: 0x100053c: addiu a3, a3, 30208
+// 0x0100053c: 0x100053c: addiu a3, a3, 30672
 	ldloc.3
-	ldc.i4 30208
+	ldc.i4 30672
 	add
 	stloc.3
 L_1000540:
@@ -2084,12 +2084,12 @@ L_1000568:
 // 0x010005b8: 0x10005b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.0
-// 0x010005bc: 0x10005bc: lw    a0, 30208(a0)
+// 0x010005bc: 0x10005bc: lw    a0, 30672(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldelem.i4
 	stloc.0
@@ -2129,12 +2129,12 @@ L_10005e4:
 // 0x010005e4: 0x10005e4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010005e8: 0x10005e8: lw    a3, 30220(a2)
+// 0x010005e8: 0x10005e8: lw    a3, 30684(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldelem.i4
 	stloc.3
@@ -2144,12 +2144,12 @@ L_10005e4:
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x010005f4: 0x10005f4: sw    a3, 30220(a2)
+// 0x010005f4: 0x10005f4: sw    a3, 30684(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldloc.3
 	stelem.i4
@@ -2169,12 +2169,12 @@ L_10005e4:
 	stloc.0
 	bne.un L_100060c
 // --- basic block ---
-// 0x01000604: 0x1000604: j	 0x1000610 sw    a2, 30208(a0)
+// 0x01000604: 0x1000604: j	 0x1000610 sw    a2, 30672(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldloc.2
 	stelem.i4
@@ -2233,12 +2233,12 @@ L_100062c:
 	stloc 7
 	bne.un L_1000648
 // --- basic block ---
-// 0x01000634: 0x1000634: lw    t1, 30216(t0)
+// 0x01000634: 0x1000634: lw    t1, 30680(t0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7554
+	ldc.i4 7670
 	add
 	ldelem.i4
 	stloc 8
@@ -2248,12 +2248,12 @@ L_100062c:
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01000640: 0x1000640: j	 0x100065c sw    t1, 30216(t0)
+// 0x01000640: 0x1000640: j	 0x100065c sw    t1, 30680(t0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7554
+	ldc.i4 7670
 	add
 	ldloc 8
 	stelem.i4
@@ -2264,12 +2264,12 @@ L_1000648:
 	ldc.i4 131072
 	stloc 7
 L_100064c:
-// 0x0100064c: 0x100064c: lw    t1, 30220(t0)
+// 0x0100064c: 0x100064c: lw    t1, 30684(t0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldelem.i4
 	stloc 8
@@ -2279,12 +2279,12 @@ L_100064c:
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01000658: 0x1000658: sw    t1, 30220(t0)
+// 0x01000658: 0x1000658: sw    t1, 30684(t0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldloc 8
 	stelem.i4
@@ -2353,12 +2353,12 @@ L_100066c:
 	stloc 4
 	bne.un L_1000700
 // --- basic block ---
-// 0x01000694: 0x1000694: lw    v0, 30208(v0)
+// 0x01000694: 0x1000694: lw    v0, 30672(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldelem.i4
 	stloc 4
@@ -2398,12 +2398,12 @@ L_10006bc:
 // 0x010006bc: 0x10006bc: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010006c0: 0x10006c0: lw    a3, 30220(a2)
+// 0x010006c0: 0x10006c0: lw    a3, 30684(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldelem.i4
 	stloc.3
@@ -2413,12 +2413,12 @@ L_10006bc:
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x010006cc: 0x10006cc: sw    a3, 30220(a2)
+// 0x010006cc: 0x10006cc: sw    a3, 30684(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldloc.3
 	stelem.i4
@@ -2438,12 +2438,12 @@ L_10006bc:
 	stloc 4
 	bne.un L_10006e4
 // --- basic block ---
-// 0x010006dc: 0x10006dc: j	 0x10006e8 sw    a2, 30208(v0)
+// 0x010006dc: 0x10006dc: j	 0x10006e8 sw    a2, 30672(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldloc.2
 	stelem.i4
@@ -2559,60 +2559,60 @@ __CIBYL_javamethod_begin:
 // 0x0100071c: 0x100071c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01000720: 0x1000720: sw    a0, 30208(v0)
+// 0x01000720: 0x1000720: sw    a0, 30672(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldloc.0
 	stelem.i4
 // 0x01000724: 0x1000724: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01000728: 0x1000728: sw    v1, 30220(v0)
+// 0x01000728: 0x1000728: sw    v1, 30684(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldloc 4
 	stelem.i4
 // 0x0100072c: 0x100072c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01000730: 0x1000730: sw    zero, 30204(v0)
+// 0x01000730: 0x1000730: sw    zero, 30668(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7551
+	ldc.i4 7667
 	add
 	ldc.i4.s 0
 	stelem.i4
 // 0x01000734: 0x1000734: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01000738: 0x1000738: sw    zero, 30212(v0)
+// 0x01000738: 0x1000738: sw    zero, 30676(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7553
+	ldc.i4 7669
 	add
 	ldc.i4.s 0
 	stelem.i4
 // 0x0100073c: 0x100073c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01000740: 0x1000740: jr    ra sw    zero, 30216(v0)
+// 0x01000740: 0x1000740: jr    ra sw    zero, 30680(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7554
+	ldc.i4 7670
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2697,12 +2697,12 @@ __CIBYL_javamethod_begin:
 // 0x01000760: 0x1000760: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01000764: 0x1000764: lw    v0, 30200(v0)
+// 0x01000764: 0x1000764: lw    v0, 30664(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7550
+	ldc.i4 7666
 	add
 	ldelem.i4
 	stloc 5
@@ -2717,12 +2717,12 @@ __CIBYL_javamethod_begin:
 // 0x01000778: 0x1000778: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100077c: 0x100077c: lw    a1, 29596(v0)
+// 0x0100077c: 0x100077c: lw    a1, 30060(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.2
@@ -2745,12 +2745,12 @@ L_1000788:
 // 0x01000788: 0x1000788: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100078c: 0x100078c: lw    v0, 30208(v0)
+// 0x0100078c: 0x100078c: lw    v0, 30672(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldelem.i4
 	stloc 5
@@ -2838,12 +2838,12 @@ L_10007dc:
 // 0x010007ec: 0x10007ec: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010007f0: 0x10007f0: lw    v0, 30200(v0)
+// 0x010007f0: 0x10007f0: lw    v0, 30664(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7550
+	ldc.i4 7666
 	add
 	ldelem.i4
 	stloc 5
@@ -2854,24 +2854,24 @@ L_10007dc:
 	stloc 5
 	brfalse L_10008bc
 // --- basic block ---
-// 0x01000800: 0x1000800: lw    a0, 29596(v0)
+// 0x01000800: 0x1000800: lw    a0, 30060(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.1
 // 0x01000804: 0x1000804: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01000808: 0x1000808: lw    a3, 30212(v0)
+// 0x01000808: 0x1000808: lw    a3, 30676(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7553
+	ldc.i4 7669
 	add
 	ldelem.i4
 	stloc 4
@@ -2932,12 +2932,12 @@ L_1000840:
 // 0x01000840: 0x1000840: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01000844: 0x1000844: lw    a1, 30220(a0)
+// 0x01000844: 0x1000844: lw    a1, 30684(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldelem.i4
 	stloc.2
@@ -2947,12 +2947,12 @@ L_1000840:
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01000850: 0x1000850: sw    a1, 30220(a0)
+// 0x01000850: 0x1000850: sw    a1, 30684(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7555
+	ldc.i4 7671
 	add
 	ldloc.2
 	stelem.i4
@@ -2972,12 +2972,12 @@ L_1000840:
 	stloc 5
 	bne.un L_1000868
 // --- basic block ---
-// 0x01000860: 0x1000860: j	 0x100086c sw    a0, 30208(v0)
+// 0x01000860: 0x1000860: j	 0x100086c sw    a0, 30672(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7552
+	ldc.i4 7668
 	add
 	ldloc.1
 	stelem.i4
@@ -3106,12 +3106,12 @@ L_10008bc:
 	ldc.i4 131072
 	stloc 5
 L_10008c0:
-// 0x010008c0: 0x10008c0: lw    v0, 30200(v0)
+// 0x010008c0: 0x10008c0: lw    v0, 30664(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7550
+	ldc.i4 7666
 	add
 	ldelem.i4
 	stloc 5
@@ -3125,12 +3125,12 @@ L_10008c0:
 // 0x010008d0: 0x10008d0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010008d4: 0x10008d4: lw    a0, 29596(v0)
+// 0x010008d4: 0x10008d4: lw    a0, 30060(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.1
@@ -3159,12 +3159,12 @@ L_10008e4:
 	br L_10008fc
 // --- basic block ---
 L_10008ec:
-// 0x010008ec: 0x10008ec: lw    a0, 30212(v1)
+// 0x010008ec: 0x10008ec: lw    a0, 30676(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7553
+	ldc.i4 7669
 	add
 	ldelem.i4
 	stloc.1
@@ -3178,12 +3178,12 @@ L_10008ec:
 	ldloc.1
 	add
 	stloc 9
-// 0x010008f8: 0x10008f8: sw    s0, 30212(v1)
+// 0x010008f8: 0x10008f8: sw    s0, 30676(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7553
+	ldc.i4 7669
 	add
 	ldloc 9
 	stelem.i4
@@ -3347,12 +3347,12 @@ __CIBYL_javamethod_begin:
 // 0x01000944: 0x1000944: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01000948: 0x1000948: lw    v0, 30200(v0)
+// 0x01000948: 0x1000948: lw    v0, 30664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7550
+	ldc.i4 7666
 	add
 	ldelem.i4
 	stloc 5
@@ -3363,12 +3363,12 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	brfalse L_1000a50
 // --- basic block ---
-// 0x01000958: 0x1000958: lw    a1, 29596(v0)
+// 0x01000958: 0x1000958: lw    a1, 30060(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.2
@@ -3397,12 +3397,12 @@ L_1000970:
 // 0x01000970: 0x1000970: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01000974: 0x1000974: lw    v0, 30204(v0)
+// 0x01000974: 0x1000974: lw    v0, 30668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7551
+	ldc.i4 7667
 	add
 	ldelem.i4
 	stloc 5
@@ -3451,12 +3451,12 @@ L_10009a4:
 // 0x010009a4: 0x10009a4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010009a8: 0x10009a8: lw    v0, 30200(v0)
+// 0x010009a8: 0x10009a8: lw    v0, 30664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7550
+	ldc.i4 7666
 	add
 	ldelem.i4
 	stloc 5
@@ -3467,12 +3467,12 @@ L_10009a4:
 	stloc 5
 	brfalse L_1000a50
 // --- basic block ---
-// 0x010009b8: 0x10009b8: lw    a0, 29596(v0)
+// 0x010009b8: 0x10009b8: lw    a0, 30060(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.1
@@ -3528,12 +3528,12 @@ L_10009ec:
 // 0x010009ec: 0x10009ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010009f0: 0x10009f0: lw    a1, 30216(a0)
+// 0x010009f0: 0x10009f0: lw    a1, 30680(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7554
+	ldc.i4 7670
 	add
 	ldelem.i4
 	stloc.2
@@ -3543,12 +3543,12 @@ L_10009ec:
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x010009fc: 0x10009fc: sw    a1, 30216(a0)
+// 0x010009fc: 0x10009fc: sw    a1, 30680(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7554
+	ldc.i4 7670
 	add
 	ldloc.2
 	stelem.i4
@@ -3568,12 +3568,12 @@ L_10009ec:
 	stloc 5
 	bne.un L_1000a14
 // --- basic block ---
-// 0x01000a0c: 0x1000a0c: j	 0x1000a18 sw    a0, 30204(v0)
+// 0x01000a0c: 0x1000a0c: j	 0x1000a18 sw    a0, 30668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7551
+	ldc.i4 7667
 	add
 	ldloc.1
 	stelem.i4
@@ -3617,12 +3617,12 @@ L_1000a18:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01000a2c: 0x1000a2c: lw    a0, 30212(v0)
+// 0x01000a2c: 0x1000a2c: lw    a0, 30676(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7553
+	ldc.i4 7669
 	add
 	ldelem.i4
 	stloc.1
@@ -3632,12 +3632,12 @@ L_1000a18:
 	ldloc 7
 	sub
 	stloc 7
-// 0x01000a38: 0x1000a38: j	 0x1000a50 sw    v1, 30212(v0)
+// 0x01000a38: 0x1000a38: j	 0x1000a50 sw    v1, 30676(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7553
+	ldc.i4 7669
 	add
 	ldloc 7
 	stelem.i4
@@ -4010,9 +4010,9 @@ __CIBYL_javamethod_begin:
 	ldc.i4 20548
 	add
 	stloc.3
-// 0x01000b10: 0x1000b10: addiu a3, a3, 24148
+// 0x01000b10: 0x1000b10: addiu a3, a3, 24612
 	ldloc 4
-	ldc.i4 24148
+	ldc.i4 24612
 	add
 	stloc 4
 // 0x01000b14: 0x1000b14: jal   0x1000e78 addiu a1, zero, 23
@@ -4746,7 +4746,7 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 // 0x01000dd4: 0x1000dd4: sw    ra, 284(sp)
-// 0x01000dd8: 0x1000dd8: jal   0x10c0a70 addiu a1, zero, 256
+// 0x01000dd8: 0x1000dd8: jal   0x10c10b0 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -4754,7 +4754,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
@@ -4905,7 +4905,7 @@ __CIBYL_javamethod_begin:
 	ldloc 8
 	stelem.i4
 // 0x01000e2c: 0x1000e2c: sw    ra, 284(sp)
-// 0x01000e30: 0x1000e30: jal   0x10c0a70 addiu a1, zero, 256
+// 0x01000e30: 0x1000e30: jal   0x10c10b0 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -4913,7 +4913,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
@@ -4928,12 +4928,12 @@ __CIBYL_javamethod_begin:
 // 0x01000e40: 0x1000e40: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01000e44: 0x1000e44: lw    a1, 29592(v0)
+// 0x01000e44: 0x1000e44: lw    a1, 30056(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7398
+	ldc.i4 7514
 	add
 	ldelem.i4
 	stloc.2
@@ -4954,12 +4954,12 @@ L_1000e50:
 // 0x01000e50: 0x1000e50: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01000e54: 0x1000e54: lw    a0, 29592(v0)
+// 0x01000e54: 0x1000e54: lw    a0, 30056(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7398
+	ldc.i4 7514
 	add
 	ldelem.i4
 	stloc.1
@@ -5122,7 +5122,7 @@ __CIBYL_javamethod_begin:
 	ldloc 8
 	stelem.i4
 // 0x01000ea8: 0x1000ea8: sw    ra, 292(sp)
-// 0x01000eac: 0x1000eac: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x01000eac: 0x1000eac: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5136,7 +5136,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
@@ -5151,12 +5151,12 @@ __CIBYL_javamethod_begin:
 // 0x01000ebc: 0x1000ebc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01000ec0: 0x1000ec0: lw    a1, 29592(v0)
+// 0x01000ec0: 0x1000ec0: lw    a1, 30056(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7398
+	ldc.i4 7514
 	add
 	ldelem.i4
 	stloc.2
@@ -5177,12 +5177,12 @@ L_1000ecc:
 // 0x01000ecc: 0x1000ecc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01000ed0: 0x1000ed0: lw    a0, 29592(v0)
+// 0x01000ed0: 0x1000ed0: lw    a0, 30056(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7398
+	ldc.i4 7514
 	add
 	ldelem.i4
 	stloc.1
@@ -5351,7 +5351,7 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 // 0x01000f28: 0x1000f28: sw    ra, 292(sp)
-// 0x01000f2c: 0x1000f2c: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x01000f2c: 0x1000f2c: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5365,7 +5365,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
@@ -5510,7 +5510,7 @@ __CIBYL_javamethod_begin:
 	ldc.i4.m1
 	stloc.2
 // 0x01000f80: 0x1000f80: sw    ra, 28(sp)
-// 0x01000f84: 0x1000f84: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x01000f84: 0x1000f84: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5524,7 +5524,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
@@ -5664,7 +5664,7 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stloc 4
 // 0x01000fac: 0x1000fac: sw    ra, 28(sp)
-// 0x01000fb0: 0x1000fb0: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x01000fb0: 0x1000fb0: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5678,7 +5678,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 17
 	stloc 9
diff --git a/converted/Cibyl1.j b/converted/Cibyl1.j
index 05d34e9..d496051 100644
--- a/converted/Cibyl1.j
+++ b/converted/Cibyl1.j
@@ -715,9 +715,9 @@ __CIBYL_javamethod_begin:
 	add
 	stloc.0
 // 0x0100198c: 0x100198c: sw    ra, 20(sp)
-// 0x01001990: 0x1001990: jal   0x10018cc addiu a2, a2, 30224
+// 0x01001990: 0x1001990: jal   0x10018cc addiu a2, a2, 30688
 	ldloc.3
-	ldc.i4 30224
+	ldc.i4 30688
 	add
 	stloc.3
 	ldloc.1
@@ -3267,9 +3267,9 @@ __CIBYL_javamethod_begin:
 // 0x01002090: 0x1002090: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01002094: 0x1002094: j	 0x10020e8 addiu s2, s5, 30500
+// 0x01002094: 0x1002094: j	 0x10020e8 addiu s2, s5, 30964
 	ldloc 12
-	ldc.i4 30500
+	ldc.i4 30964
 	add
 	stloc 10
 	br L_10020e8
@@ -3284,12 +3284,12 @@ L_100209c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010020a0: 0x10020a0: lw    v1, 30500(s5)
+// 0x010020a0: 0x10020a0: lw    v1, 30964(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7625
+	ldc.i4 7741
 	add
 	ldelem.i4
 	stloc 7
@@ -4848,9 +4848,9 @@ __CIBYL_javamethod_begin:
 // 0x01002578: 0x1002578: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0100257c: 0x100257c: j	 0x10025c8 addiu s4, s5, 30484
+// 0x0100257c: 0x100257c: j	 0x10025c8 addiu s4, s5, 30948
 	ldloc 13
-	ldc.i4 30484
+	ldc.i4 30948
 	add
 	stloc 12
 	br L_10025c8
@@ -4865,12 +4865,12 @@ L_1002584:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01002588: 0x1002588: lw    v1, 30484(s5)
+// 0x01002588: 0x1002588: lw    v1, 30948(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7621
+	ldc.i4 7737
 	add
 	ldelem.i4
 	stloc 7
@@ -4973,12 +4973,12 @@ L_10025e4:
 	brtrue L_1002604
 // --- basic block ---
 L_10025ec:
-// 0x010025ec: 0x10025ec: lw    s0, 30492(v0)
+// 0x010025ec: 0x10025ec: lw    s0, 30956(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7623
+	ldc.i4 7739
 	add
 	ldelem.i4
 	stloc 8
@@ -5708,9 +5708,9 @@ __CIBYL_javamethod_begin:
 // 0x010027ac: 0x10027ac: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x010027b0: 0x10027b0: addiu a0, a0, 30500
+// 0x010027b0: 0x10027b0: addiu a0, a0, 30964
 	ldloc.1
-	ldc.i4 30500
+	ldc.i4 30964
 	add
 	stloc.1
 // 0x010027b4: 0x10027b4: addu  a1, v1, zero
@@ -5796,9 +5796,9 @@ __CIBYL_javamethod_begin:
 // 0x010027e4: 0x10027e4: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x010027e8: 0x10027e8: addiu a0, a0, 30484
+// 0x010027e8: 0x10027e8: addiu a0, a0, 30948
 	ldloc.1
-	ldc.i4 30484
+	ldc.i4 30948
 	add
 	stloc.1
 // 0x010027ec: 0x10027ec: addu  a1, v1, zero
@@ -5870,24 +5870,24 @@ __CIBYL_javamethod_begin:
 // 0x0100280c: 0x100280c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01002810: 0x1002810: lw    v1, -30072(v0)
+// 0x01002810: 0x1002810: lw    v1, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
 // 0x01002814: 0x1002814: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01002818: 0x1002818: lw    v0, -30068(v0)
+// 0x01002818: 0x1002818: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
@@ -5928,7 +5928,7 @@ L_1002840:
 // 0x01002840: 0x1002840: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01002844: 0x1002844: jal   0x10a1918 addiu a1, zero, 19
+// 0x01002844: 0x1002844: jal   0x10a1f60 addiu a1, zero, 19
 	ldc.i4.s 19
 	stloc.2
 	ldloc.0
@@ -5936,7 +5936,7 @@ L_1002840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -5976,7 +5976,7 @@ L_1002840:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01002868: 0x1002868: jal   0x104f4a8 sw    zero, 20(sp)
+// 0x01002868: 0x1002868: jal   0x104f4b8 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5990,7 +5990,7 @@ L_1002840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -6004,7 +6004,7 @@ L_1002840:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01002874: 0x1002874: jal   0x104ec70 addu  a0, v0, zero
+// 0x01002874: 0x1002874: jal   0x104ec80 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6012,18 +6012,18 @@ L_1002840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100287c: 0x100287c: jal   0x104e31c sll   zero, zero, 0
+// 0x0100287c: 0x100287c: jal   0x104e32c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_refresh_104e31c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_refresh_104e32c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -6104,9 +6104,9 @@ __CIBYL_javamethod_begin:
 // 0x010028a4: 0x10028a4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010028a8: 0x10028a8: addiu a0, s0, 18248
+// 0x010028a8: 0x10028a8: addiu a0, s0, 19712
 	ldloc 8
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
 // 0x010028ac: 0x10028ac: addiu a1, a1, 144
@@ -6114,13 +6114,13 @@ __CIBYL_javamethod_begin:
 	ldc.i4 144
 	add
 	stloc.2
-// 0x010028b0: 0x10028b0: addiu a2, a2, 18500
+// 0x010028b0: 0x10028b0: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
 // 0x010028b4: 0x10028b4: sw    ra, 28(sp)
-// 0x010028b8: 0x10028b8: jal   0x100edb0 addu  a3, zero, zero
+// 0x010028b8: 0x10028b8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6128,7 +6128,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -6139,9 +6139,9 @@ __CIBYL_javamethod_begin:
 // 0x010028c4: 0x10028c4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010028c8: 0x10028c8: addiu a0, s0, 18248
+// 0x010028c8: 0x10028c8: addiu a0, s0, 19712
 	ldloc 8
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
 // 0x010028cc: 0x10028cc: addiu a1, a1, 160
@@ -6149,12 +6149,12 @@ __CIBYL_javamethod_begin:
 	ldc.i4 160
 	add
 	stloc.2
-// 0x010028d0: 0x10028d0: addiu a2, a2, 9424
+// 0x010028d0: 0x10028d0: addiu a2, a2, 9420
 	ldloc.3
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.3
-// 0x010028d4: 0x10028d4: jal   0x100edb0 addu  a3, zero, zero
+// 0x010028d4: 0x10028d4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6162,7 +6162,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -6184,9 +6184,9 @@ __CIBYL_javamethod_begin:
 	ldc.i4 20820
 	add
 	stloc 5
-// 0x010028f0: 0x10028f0: addiu a0, a0, 12560
+// 0x010028f0: 0x10028f0: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
 // 0x010028f4: 0x10028f4: addiu a1, a1, 176
@@ -6194,9 +6194,9 @@ __CIBYL_javamethod_begin:
 	ldc.i4 176
 	add
 	stloc.2
-// 0x010028f8: 0x10028f8: addiu a3, a3, 9464
+// 0x010028f8: 0x10028f8: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
 // 0x010028fc: 0x10028fc: addu  a2, zero, zero
@@ -6211,7 +6211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01002904: 0x1002904: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01002904: 0x1002904: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6225,7 +6225,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -6246,12 +6246,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100291c: 0x100291c: sw    v1, 30516(v0)
+// 0x0100291c: 0x100291c: sw    v1, 30980(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7629
+	ldc.i4 7745
 	add
 	ldloc 7
 	stelem.i4
@@ -6305,12 +6305,12 @@ __CIBYL_javamethod_begin:
 // 0x01002928: 0x1002928: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100292c: 0x100292c: lw    v0, 30516(v0)
+// 0x0100292c: 0x100292c: lw    v0, 30980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7629
+	ldc.i4 7745
 	add
 	ldelem.i4
 	stloc 5
@@ -6338,7 +6338,7 @@ L_1002944:
 // 0x01002944: 0x1002944: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01002948: 0x1002948: jal   0x100e348 addiu a0, a0, 144
+// 0x01002948: 0x1002948: jal   0x100e358 addiu a0, a0, 144
 	ldloc.1
 	ldc.i4 144
 	add
@@ -6348,7 +6348,7 @@ L_1002944:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
@@ -6422,7 +6422,7 @@ __CIBYL_javamethod_begin:
 	ldc.i4 30000
 	stloc.1
 // 0x01002970: 0x1002970: sw    ra, 20(sp)
-// 0x01002974: 0x1002974: jal   0x104fe98 sw    s0, 16(sp)
+// 0x01002974: 0x1002974: jal   0x104fea8 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6436,7 +6436,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
@@ -6454,7 +6454,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01002984: 0x1002984: jal   0x106b1f4 addu  a0, v0, zero
+// 0x01002984: 0x1002984: jal   0x106b818 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6462,17 +6462,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_NotifySplashUpdateTime_106b1f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifySplashUpdateTime_106b818(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100298c: 0x100298c: lw    v0, 30520(s0)
+// 0x0100298c: 0x100298c: lw    v0, 30984(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7630
+	ldc.i4 7746
 	add
 	ldelem.i4
 	stloc 5
@@ -6493,12 +6493,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010029a4: 0x10029a4: sw    zero, 30520(s0)
+// 0x010029a4: 0x10029a4: sw    zero, 30984(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7630
+	ldc.i4 7746
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6589,12 +6589,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010029c4: 0x10029c4: lw    s2, -30068(v0)
+// 0x010029c4: 0x10029c4: lw    s2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 8
@@ -6610,12 +6610,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010029d0: 0x10029d0: lw    s1, -30072(v0)
+// 0x010029d0: 0x10029d0: lw    s1, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 9
@@ -6672,10 +6672,10 @@ L_10029fc:
 	stloc 6
 	brfalse L_1002a20
 // --- basic block ---
-// 0x01002a08: 0x1002a08: beq   a0, zero, 0x1002a24 addiu v1, v1, 24168
+// 0x01002a08: 0x1002a08: beq   a0, zero, 0x1002a24 addiu v1, v1, 24632
 	ldloc.1
 	ldloc 6
-	ldc.i4 24168
+	ldc.i4 24632
 	add
 	stloc 6
 	brfalse L_1002a24
@@ -6694,9 +6694,9 @@ L_1002a14:
 	ldc.i4 131072
 	stloc 6
 L_1002a20:
-// 0x01002a20: 0x1002a20: addiu v1, v1, 24168
+// 0x01002a20: 0x1002a20: addiu v1, v1, 24632
 	ldloc 6
-	ldc.i4 24168
+	ldc.i4 24632
 	add
 	stloc 6
 L_1002a24:
@@ -6780,9 +6780,9 @@ L_1002a70:
 	ldc.i4.4
 	shl
 	stloc 5
-// 0x01002a78: 0x1002a78: addiu v1, v1, 24156
+// 0x01002a78: 0x1002a78: addiu v1, v1, 24620
 	ldloc 6
-	ldc.i4 24156
+	ldc.i4 24620
 	add
 	stloc 6
 // 0x01002a7c: 0x1002a7c: addu  v0, v0, v1
@@ -6908,9 +6908,9 @@ L_1002aac:
 // 0x01002ae4: 0x1002ae4: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x01002ae8: 0x1002ae8: jal   0x1000f64 addiu a0, s0, 30524
+// 0x01002ae8: 0x1002ae8: jal   0x1000f64 addiu a0, s0, 30988
 	ldloc 10
-	ldc.i4 30524
+	ldc.i4 30988
 	add
 	stloc.1
 	ldloc.0
@@ -6923,9 +6923,9 @@ L_1002aac:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01002af0: 0x1002af0: j	 0x1002b14 addiu v0, s0, 30524
+// 0x01002af0: 0x1002af0: j	 0x1002b14 addiu v0, s0, 30988
 	ldloc 10
-	ldc.i4 30524
+	ldc.i4 30988
 	add
 	stloc 5
 	br L_1002b14
@@ -6945,9 +6945,9 @@ L_1002af8:
 // 0x01002b04: 0x1002b04: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x01002b08: 0x1002b08: jal   0x1000f64 addiu a0, s0, 30576
+// 0x01002b08: 0x1002b08: jal   0x1000f64 addiu a0, s0, 31040
 	ldloc 10
-	ldc.i4 30576
+	ldc.i4 31040
 	add
 	stloc.1
 	ldloc.0
@@ -6960,9 +6960,9 @@ L_1002af8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01002b10: 0x1002b10: addiu v0, s0, 30576
+// 0x01002b10: 0x1002b10: addiu v0, s0, 31040
 	ldloc 10
-	ldc.i4 30576
+	ldc.i4 31040
 	add
 	stloc 5
 L_1002b14:
@@ -7167,7 +7167,7 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	brfalse L_1002b94
 // --- basic block ---
-// 0x01002b8c: 0x1002b8c: jal   0x106a58c addu  a0, s1, zero
+// 0x01002b8c: 0x1002b8c: jal   0x106abb0 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7175,7 +7175,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::WDF_TimeFromModifiedSince_106a58c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::WDF_TimeFromModifiedSince_106abb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -7215,9 +7215,9 @@ L_1002b94:
 	ldc.i4 20796
 	add
 	stloc.3
-// 0x01002bb4: 0x1002bb4: addiu a3, a3, 18500
+// 0x01002bb4: 0x1002bb4: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
 // 0x01002bb8: 0x1002bb8: addiu a0, zero, 4
@@ -7241,7 +7241,7 @@ L_1002b94:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01002bc4: 0x1002bc4: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x01002bc4: 0x1002bc4: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7255,7 +7255,7 @@ L_1002b94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -7264,7 +7264,7 @@ L_1002b94:
 	ldc.i4 16777216
 	stloc.1
 L_1002bd0:
-// 0x01002bd0: 0x1002bd0: jal   0x104fd00 addiu a0, a0, 11056
+// 0x01002bd0: 0x1002bd0: jal   0x104fd10 addiu a0, a0, 11056
 	ldloc.1
 	ldc.i4 11056
 	add
@@ -7274,7 +7274,7 @@ L_1002bd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -7354,7 +7354,7 @@ __CIBYL_javamethod_begin:
 	add
 	stloc.0
 // 0x01002c1c: 0x1002c1c: sw    ra, 20(sp)
-// 0x01002c20: 0x1002c20: jal   0x100e788 addiu a0, a0, 160
+// 0x01002c20: 0x1002c20: jal   0x100e798 addiu a0, a0, 160
 	ldloc.1
 	ldc.i4 160
 	add
@@ -7364,7 +7364,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
@@ -7421,12 +7421,12 @@ __CIBYL_javamethod_begin:
 // 0x01002c38: 0x1002c38: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01002c3c: 0x1002c3c: lw    v0, 30516(v0)
+// 0x01002c3c: 0x1002c3c: lw    v0, 30980(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7629
+	ldc.i4 7745
 	add
 	ldelem.i4
 	stloc 5
@@ -7474,7 +7474,7 @@ L_1002c5c:
 // 0x01002c5c: 0x1002c5c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01002c60: 0x1002c60: jal   0x100e5c0 addiu a0, a0, 144
+// 0x01002c60: 0x1002c60: jal   0x100e5d0 addiu a0, a0, 144
 	ldloc.1
 	ldc.i4 144
 	add
@@ -7484,7 +7484,7 @@ L_1002c5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
diff --git a/converted/Cibyl10.j b/converted/Cibyl10.j
index 8cee834..f5031f3 100644
--- a/converted/Cibyl10.j
+++ b/converted/Cibyl10.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl10::.ctor
 
-.method public static int32 roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra)
@@ -85,24 +85,24 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100db90: 0x100db90: lui   v0, 0x30000
+// 0x0100dba0: 0x100dba0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100db94: 0x100db94: lw    v0, -31164(v0)
+// 0x0100dba4: 0x100dba4: lw    v0, -30700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7791
+	ldc.i4 -7675
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100db98: 0x100db98: addiu sp, sp, -32
+// 0x0100dba8: 0x100dba8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100db9c: 0x100db9c: sw    s0, 16(sp)
+// 0x0100dbac: 0x100dbac: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -111,8 +111,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100dba0: 0x100dba0: sw    ra, 28(sp)
-// 0x0100dba4: 0x100dba4: sw    s2, 24(sp)
+// 0x0100dbb0: 0x100dbb0: sw    ra, 28(sp)
+// 0x0100dbb4: 0x100dbb4: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -121,7 +121,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100dba8: 0x100dba8: sw    s1, 20(sp)
+// 0x0100dbb8: 0x100dbb8: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -130,144 +130,144 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100dbac: 0x100dbac: beq   v0, zero, 0x100dc18 addu  s0, a0, zero
+// 0x0100dbbc: 0x100dbbc: beq   v0, zero, 0x100dc28 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_100dc18
+	brfalse L_100dc28
 // --- basic block ---
-// 0x0100dbb4: 0x100dbb4: lui   s1, 0x30000
+// 0x0100dbc4: 0x100dbc4: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 10
-// 0x0100dbb8: 0x100dbb8: lw    a0, -31160(s1)
+// 0x0100dbc8: 0x100dbc8: lw    a0, -30696(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7790
+	ldc.i4 -7674
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100dbbc: 0x100dbbc: addu  a1, s0, zero
+// 0x0100dbcc: 0x100dbcc: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0100dbc0: 0x100dbc0: jal   0x1015518 lui   s2, 0x30000
+// 0x0100dbd0: 0x100dbd0: jal   0x1015528 lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_get_first_1015518(int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_first_1015528(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100dbc8: 0x100dbc8: j	 0x100dbf8 addiu s2, s2, -31156
+// 0x0100dbd8: 0x100dbd8: j	 0x100dc08 addiu s2, s2, -30692
 	ldloc 9
-	ldc.i4 -31156
+	ldc.i4 -30692
 	add
 	stloc 9
-	br L_100dbf8
+	br L_100dc08
 // --- basic block ---
-L_100dbd0:
-// 0x0100dbd0: 0x100dbd0: lw    v0, 0(a0)
+L_100dbe0:
+// 0x0100dbe0: 0x100dbe0: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100dbd4: 0x100dbd4: sll   zero, zero, 0
-// 0x0100dbd8: 0x100dbd8: addu  v0, v0, v1
+// 0x0100dbe4: 0x100dbe4: sll   zero, zero, 0
+// 0x0100dbe8: 0x100dbe8: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0100dbdc: 0x100dbdc: lw    v1, 0(v0)
+// 0x0100dbec: 0x100dbec: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100dbe0: 0x100dbe0: sll   zero, zero, 0
-// 0x0100dbe4: 0x100dbe4: beq   v1, s0, 0x100dc20 addiu v0, v0, 4
+// 0x0100dbf0: 0x100dbf0: sll   zero, zero, 0
+// 0x0100dbf4: 0x100dbf4: beq   v1, s0, 0x100dc30 addiu v0, v0, 4
 	ldloc 7
 	ldloc 8
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	beq  L_100dc20
+	beq  L_100dc30
 // --- basic block ---
-// 0x0100dbec: 0x100dbec: lw    a0, -31160(s1)
+// 0x0100dbfc: 0x100dbfc: lw    a0, -30696(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7790
+	ldc.i4 -7674
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100dbf0: 0x100dbf0: jal   0x1015744 sll   zero, zero, 0
+// 0x0100dc00: 0x100dc00: jal   0x1015754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100dbf8:
-// 0x0100dbf8: 0x100dbf8: sra   a0, v0, 12
+L_100dc08:
+// 0x0100dc08: 0x100dc08: sra   a0, v0, 12
 	ldloc 5
 	ldc.i4.s 12
 	shr
 	stloc.1
-// 0x0100dbfc: 0x100dbfc: sll   a0, a0, 2
+// 0x0100dc0c: 0x100dc0c: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0100dc00: 0x100dc00: andi  v1, v0, 4095
+// 0x0100dc10: 0x100dc10: andi  v1, v0, 4095
 	ldloc 5
 	ldc.i4 4095
 	and
 	stloc 7
-// 0x0100dc04: 0x100dc04: addu  a0, a0, s2
+// 0x0100dc14: 0x100dc14: addu  a0, a0, s2
 	ldloc.1
 	ldloc 9
 	add
 	stloc.1
-// 0x0100dc08: 0x100dc08: sll   v1, v1, 3
+// 0x0100dc18: 0x100dc18: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x0100dc0c: 0x100dc0c: bgez  v0, 0x100dbd0 addu  a1, v0, zero
+// 0x0100dc1c: 0x100dc1c: bgez  v0, 0x100dbe0 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
 	ldc.i4.s 0
-	bge L_100dbd0
+	bge L_100dbe0
 // --- basic block ---
-// 0x0100dc14: 0x100dc14: addu  a0, s0, zero
+// 0x0100dc24: 0x100dc24: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_100dc18:
-// 0x0100dc18: 0x100dc18: jal   0x100da28 sll   zero, zero, 0
+L_100dc28:
+// 0x0100dc28: 0x100dc28: jal   0x100da38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_status_add_100da28(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_status_add_100da38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100dc20:
-// 0x0100dc20: 0x100dc20: lw    ra, 28(sp)
-// 0x0100dc24: 0x100dc24: lw    s2, 24(sp)
+L_100dc30:
+// 0x0100dc30: 0x100dc30: lw    ra, 28(sp)
+// 0x0100dc34: 0x100dc34: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -276,7 +276,7 @@ L_100dc20:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100dc28: 0x100dc28: lw    s1, 20(sp)
+// 0x0100dc38: 0x100dc38: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -285,7 +285,7 @@ L_100dc20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100dc2c: 0x100dc2c: lw    s0, 16(sp)
+// 0x0100dc3c: 0x100dc3c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -294,7 +294,7 @@ L_100dc20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100dc30: 0x100dc30: jr    ra addiu sp, sp, 32
+// 0x0100dc40: 0x100dc40: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -306,7 +306,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_warning_unregister_100dc38(int32,int32,int32,int32)
+.method public static int32 roadmap_warning_unregister_100dc48(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 lo)
@@ -341,38 +341,38 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100dc38: 0x100dc38: lui   v1, 0x30000
+// 0x0100dc48: 0x100dc48: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x0100dc3c: 0x100dc3c: addiu v1, v1, -31088
+// 0x0100dc4c: 0x100dc4c: addiu v1, v1, -30624
 	ldloc 4
-	ldc.i4 -31088
+	ldc.i4 -30624
 	add
 	stloc 4
-// 0x0100dc40: 0x100dc40: addu  v0, zero, zero
+// 0x0100dc50: 0x100dc50: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0100dc44: 0x100dc44: addiu a2, zero, 1
+// 0x0100dc54: 0x100dc54: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0100dc48: 0x100dc48: addiu a1, zero, 5
+// 0x0100dc58: 0x100dc58: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.1
-L_100dc4c:
-// 0x0100dc4c: 0x100dc4c: lw    a3, 0(v1)
+L_100dc5c:
+// 0x0100dc5c: 0x100dc5c: lw    a3, 0(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100dc50: 0x100dc50: sll   zero, zero, 0
-// 0x0100dc54: 0x100dc54: bne   a3, a2, 0x100dc94 sll   zero, zero, 0
+// 0x0100dc60: 0x100dc60: sll   zero, zero, 0
+// 0x0100dc64: 0x100dc64: bne   a3, a2, 0x100dca4 sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	bne.un L_100dc94
+	bne.un L_100dca4
 // --- basic block ---
-// 0x0100dc5c: 0x100dc5c: lw    a3, 8(v1)
+// 0x0100dc6c: 0x100dc6c: lw    a3, 8(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -381,49 +381,49 @@ L_100dc4c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100dc60: 0x100dc60: sll   zero, zero, 0
-// 0x0100dc64: 0x100dc64: bne   a3, a0, 0x100dc98 addiu v0, v0, 1
+// 0x0100dc70: 0x100dc70: sll   zero, zero, 0
+// 0x0100dc74: 0x100dc74: bne   a3, a0, 0x100dca8 addiu v0, v0, 1
 	ldloc.3
 	ldloc.0
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	bne.un L_100dc98
+	bne.un L_100dca8
 // --- basic block ---
-// 0x0100dc6c: 0x100dc6c: addiu v0, v0, -1
+// 0x0100dc7c: 0x100dc7c: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0100dc70: 0x100dc70: addiu v1, zero, 44
+// 0x0100dc80: 0x100dc80: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 4
-// 0x0100dc74: 0x100dc74: mult  v0, v1
+// 0x0100dc84: 0x100dc84: mult  v0, v1
 	ldloc 5
 	ldloc 4
 	mul
 	stloc 8
-// 0x0100dc78: 0x100dc78: lui   v1, 0x30000
+// 0x0100dc88: 0x100dc88: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x0100dc7c: 0x100dc7c: addiu v1, v1, -31088
+// 0x0100dc8c: 0x100dc8c: addiu v1, v1, -30624
 	ldloc 4
-	ldc.i4 -31088
+	ldc.i4 -30624
 	add
 	stloc 4
-// 0x0100dc80: 0x100dc80: addiu v0, zero, 1
+// 0x0100dc90: 0x100dc90: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0100dc84: 0x100dc84: mflo  lo
+// 0x0100dc94: 0x100dc94: mflo  lo
 	ldloc 8
 	stloc.0
-// 0x0100dc88: 0x100dc88: addu  v1, a0, v1
+// 0x0100dc98: 0x100dc98: addu  v1, a0, v1
 	ldloc.0
 	ldloc 4
 	add
 	stloc 4
-// 0x0100dc8c: 0x100dc8c: jr    ra sw    zero, 0(v1)
+// 0x0100dc9c: 0x100dc9c: jr    ra sw    zero, 0(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -432,23 +432,23 @@ L_100dc4c:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_100dc94:
-// 0x0100dc94: 0x100dc94: addiu v0, v0, 1
+L_100dca4:
+// 0x0100dca4: 0x100dca4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_100dc98:
-// 0x0100dc98: 0x100dc98: bne   v0, a1, 0x100dc4c addiu v1, v1, 44
+L_100dca8:
+// 0x0100dca8: 0x100dca8: bne   v0, a1, 0x100dc5c addiu v1, v1, 44
 	ldloc 5
 	ldloc.1
 	ldloc 4
 	ldc.i4.s 44
 	add
 	stloc 4
-	bne.un L_100dc4c
+	bne.un L_100dc5c
 // --- basic block ---
-// 0x0100dca0: 0x100dca0: jr    ra addu  v0, zero, zero
+// 0x0100dcb0: 0x100dcb0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
 	br __CIBYL_function_return
@@ -458,7 +458,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_warning_shutdown_100dca8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_warning_shutdown_100dcb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -493,18 +493,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100dca8: 0x100dca8: lui   a0, 0x1010000
+// 0x0100dcb8: 0x100dcb8: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x0100dcac: 0x100dcac: addiu sp, sp, -24
+// 0x0100dcbc: 0x100dcbc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100dcb0: 0x100dcb0: sw    ra, 20(sp)
-// 0x0100dcb4: 0x100dcb4: jal   0x104fd00 addiu a0, a0, -8888
+// 0x0100dcc0: 0x100dcc0: sw    ra, 20(sp)
+// 0x0100dcc4: 0x100dcc4: jal   0x104fd10 addiu a0, a0, -8872
 	ldloc.1
-	ldc.i4 -8888
+	ldc.i4 -8872
 	add
 	stloc.1
 	ldloc.0
@@ -512,14 +512,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0100dcbc: 0x100dcbc: lw    ra, 20(sp)
-// 0x0100dcc0: 0x100dcc0: sll   zero, zero, 0
-// 0x0100dcc4: 0x100dcc4: jr    ra addiu sp, sp, 24
+// 0x0100dccc: 0x100dccc: lw    ra, 20(sp)
+// 0x0100dcd0: 0x100dcd0: sll   zero, zero, 0
+// 0x0100dcd4: 0x100dcd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -531,7 +531,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_warning_initialize_100dccc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_warning_initialize_100dcdc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -566,37 +566,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100dccc: 0x100dccc: lui   a0, 0x10000
+// 0x0100dcdc: 0x100dcdc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0100dcd0: 0x100dcd0: lui   a1, 0x0
+// 0x0100dce0: 0x100dce0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100dcd4: 0x100dcd4: lui   a2, 0x0
+// 0x0100dce4: 0x100dce4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100dcd8: 0x100dcd8: addiu sp, sp, -24
+// 0x0100dce8: 0x100dce8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100dcdc: 0x100dcdc: addiu a0, a0, 12560
+// 0x0100dcec: 0x100dcec: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0100dce0: 0x100dce0: addiu a1, a1, 844
+// 0x0100dcf0: 0x100dcf0: addiu a1, a1, 844
 	ldloc.2
 	ldc.i4 844
 	add
 	stloc.2
-// 0x0100dce4: 0x100dce4: addiu a2, a2, 25884
+// 0x0100dcf4: 0x100dcf4: addiu a2, a2, 25884
 	ldloc.3
 	ldc.i4 25884
 	add
 	stloc.3
-// 0x0100dce8: 0x100dce8: sw    ra, 20(sp)
-// 0x0100dcec: 0x100dcec: jal   0x100edb0 addu  a3, zero, zero
+// 0x0100dcf8: 0x100dcf8: sw    ra, 20(sp)
+// 0x0100dcfc: 0x100dcfc: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -604,36 +604,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100dcf4: 0x100dcf4: lui   v0, 0x30000
+// 0x0100dd04: 0x100dd04: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100dcf8: 0x100dcf8: lui   v1, 0x30000
+// 0x0100dd08: 0x100dd08: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0100dcfc: 0x100dcfc: addiu v0, v0, -31088
+// 0x0100dd0c: 0x100dd0c: addiu v0, v0, -30624
 	ldloc 5
-	ldc.i4 -31088
+	ldc.i4 -30624
 	add
 	stloc 5
-// 0x0100dd00: 0x100dd00: addiu v1, v1, -30868
+// 0x0100dd10: 0x100dd10: addiu v1, v1, -30404
 	ldloc 6
-	ldc.i4 -30868
+	ldc.i4 -30404
 	add
 	stloc 6
-L_100dd04:
-// 0x0100dd04: 0x100dd04: sw    zero, 0(v0)
+L_100dd14:
+// 0x0100dd14: 0x100dd14: sw    zero, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100dd08: 0x100dd08: sw    zero, 4(v0)
+// 0x0100dd18: 0x100dd18: sw    zero, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -642,7 +642,7 @@ L_100dd04:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100dd0c: 0x100dd0c: sw    zero, 8(v0)
+// 0x0100dd1c: 0x100dd1c: sw    zero, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -651,25 +651,25 @@ L_100dd04:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100dd10: 0x100dd10: sb    zero, 12(v0)
+// 0x0100dd20: 0x100dd20: sb    zero, 12(v0)
 	ldloc 5
 	ldc.i4.s 12
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100dd14: 0x100dd14: addiu v0, v0, 44
+// 0x0100dd24: 0x100dd24: addiu v0, v0, 44
 	ldloc 5
 	ldc.i4.s 44
 	add
 	stloc 5
-// 0x0100dd18: 0x100dd18: bne   v0, v1, 0x100dd04 lui   a0, 0x0
+// 0x0100dd28: 0x100dd28: bne   v0, v1, 0x100dd14 lui   a0, 0x0
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_100dd04
+	bne.un L_100dd14
 // --- basic block ---
-// 0x0100dd20: 0x100dd20: jal   0x100e788 addiu a0, a0, 844
+// 0x0100dd30: 0x100dd30: jal   0x100e798 addiu a0, a0, 844
 	ldloc.1
 	ldc.i4 844
 	add
@@ -679,20 +679,20 @@ L_100dd04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100dd28: 0x100dd28: lui   a1, 0x1010000
+// 0x0100dd38: 0x100dd38: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0100dd2c: 0x100dd2c: addu  a0, v0, zero
+// 0x0100dd3c: 0x100dd3c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100dd30: 0x100dd30: jal   0x104fe98 addiu a1, a1, -8888
+// 0x0100dd40: 0x100dd40: jal   0x104fea8 addiu a1, a1, -8872
 	ldloc.2
-	ldc.i4 -8888
+	ldc.i4 -8872
 	add
 	stloc.2
 	ldloc.0
@@ -700,14 +700,14 @@ L_100dd04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100dd38: 0x100dd38: lw    ra, 20(sp)
-// 0x0100dd3c: 0x100dd3c: sll   zero, zero, 0
-// 0x0100dd40: 0x100dd40: jr    ra addiu sp, sp, 24
+// 0x0100dd48: 0x100dd48: lw    ra, 20(sp)
+// 0x0100dd4c: 0x100dd4c: sll   zero, zero, 0
+// 0x0100dd50: 0x100dd50: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -719,7 +719,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_warning_monitor_100dd48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_warning_monitor_100dd58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s5,int32 s3,int32 s7,int32 s0,int32 s2,int32 s4,int32 s6,int32 lo,int32 s8,int32 hi,int32 ra)
@@ -787,12 +787,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100dd48: 0x100dd48: addiu sp, sp, -184
+// 0x0100dd58: 0x100dd58: addiu sp, sp, -184
 	ldloc.0
 	ldc.i4 -184
 	add
 	stloc.0
-// 0x0100dd4c: 0x100dd4c: sw    s0, 144(sp)
+// 0x0100dd5c: 0x100dd5c: sw    s0, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -801,12 +801,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100dd50: 0x100dd50: addiu s0, sp, 16
+// 0x0100dd60: 0x100dd60: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-// 0x0100dd54: 0x100dd54: sw    s7, 172(sp)
+// 0x0100dd64: 0x100dd64: sw    s7, 172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -815,19 +815,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100dd58: 0x100dd58: addu  a0, s0, zero
+// 0x0100dd68: 0x100dd68: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x0100dd5c: 0x100dd5c: addu  a1, zero, zero
+// 0x0100dd6c: 0x100dd6c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0100dd60: 0x100dd60: addiu a2, zero, 128
+// 0x0100dd70: 0x100dd70: addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
-// 0x0100dd64: 0x100dd64: lui   s7, 0x30000
+// 0x0100dd74: 0x100dd74: lui   s7, 0x30000
 	ldc.i4 196608
 	stloc 11
-// 0x0100dd68: 0x100dd68: sw    s8, 176(sp)
+// 0x0100dd78: 0x100dd78: sw    s8, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -836,7 +836,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0100dd6c: 0x100dd6c: sw    s6, 168(sp)
+// 0x0100dd7c: 0x100dd7c: sw    s6, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -845,7 +845,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100dd70: 0x100dd70: sw    s4, 160(sp)
+// 0x0100dd80: 0x100dd80: sw    s4, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -854,7 +854,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100dd74: 0x100dd74: sw    s3, 156(sp)
+// 0x0100dd84: 0x100dd84: sw    s3, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -863,7 +863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100dd78: 0x100dd78: sw    s2, 152(sp)
+// 0x0100dd88: 0x100dd88: sw    s2, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -872,8 +872,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100dd7c: 0x100dd7c: sw    ra, 180(sp)
-// 0x0100dd80: 0x100dd80: sw    s5, 164(sp)
+// 0x0100dd8c: 0x100dd8c: sw    ra, 180(sp)
+// 0x0100dd90: 0x100dd90: sw    s5, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -882,7 +882,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100dd84: 0x100dd84: sw    s1, 148(sp)
+// 0x0100dd94: 0x100dd94: sw    s1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -891,9 +891,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100dd88: 0x100dd88: jal   0x100177c addiu s7, s7, -31088
+// 0x0100dd98: 0x100dd98: jal   0x100177c addiu s7, s7, -30624
 	ldloc 11
-	ldc.i4 -31088
+	ldc.i4 -30624
 	add
 	stloc 11
 	ldloc.1
@@ -905,43 +905,43 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100dd90: 0x100dd90: addu  s3, zero, zero
+// 0x0100dda0: 0x100dda0: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0100dd94: 0x100dd94: addu  s2, zero, zero
+// 0x0100dda4: 0x100dda4: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x0100dd98: 0x100dd98: lui   s8, 0x30000
+// 0x0100dda8: 0x100dda8: lui   s8, 0x30000
 	ldc.i4 196608
 	stloc 17
-// 0x0100dd9c: 0x100dd9c: addiu s4, zero, 5
+// 0x0100ddac: 0x100ddac: addiu s4, zero, 5
 	ldc.i4.5
 	stloc 14
-// 0x0100dda0: 0x100dda0: addiu s6, zero, 44
+// 0x0100ddb0: 0x100ddb0: addiu s6, zero, 44
 	ldc.i4.s 44
 	stloc 15
-L_100dda4:
-// 0x0100dda4: 0x100dda4: lw    s1, -31092(s8)
+L_100ddb4:
+// 0x0100ddb4: 0x100ddb4: lw    s1, -30628(s8)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7773
+	ldc.i4 -7657
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100dda8: 0x100dda8: sll   zero, zero, 0
-// 0x0100ddac: 0x100ddac: addiu s1, s1, 1
+// 0x0100ddb8: 0x100ddb8: sll   zero, zero, 0
+// 0x0100ddbc: 0x100ddbc: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0100ddb0: 0x100ddb0: addu  s1, s1, s3
+// 0x0100ddc0: 0x100ddc0: addu  s1, s1, s3
 	ldloc 7
 	ldloc 10
 	add
 	stloc 7
-// 0x0100ddb4: 0x100ddb4: div   s1, s4
+// 0x0100ddc4: 0x100ddc4: div   s1, s4
 	ldloc 7
 	ldloc 14
 	ldloc 7
@@ -950,41 +950,41 @@ L_100dda4:
 	stloc 16
 	rem
 	stloc 18
-// 0x0100ddb8: 0x100ddb8: mfhi  hi
+// 0x0100ddc8: 0x100ddc8: mfhi  hi
 	ldloc 18
 	stloc 7
-// 0x0100ddbc: 0x100ddbc: sll   zero, zero, 0
-// 0x0100ddc0: 0x100ddc0: sll   zero, zero, 0
-// 0x0100ddc4: 0x100ddc4: mult  s1, s6
+// 0x0100ddcc: 0x100ddcc: sll   zero, zero, 0
+// 0x0100ddd0: 0x100ddd0: sll   zero, zero, 0
+// 0x0100ddd4: 0x100ddd4: mult  s1, s6
 	ldloc 7
 	ldloc 15
 	mul
 	stloc 16
-// 0x0100ddc8: 0x100ddc8: mflo  lo
+// 0x0100ddd8: 0x100ddd8: mflo  lo
 	ldloc 16
 	stloc 9
-// 0x0100ddcc: 0x100ddcc: addu  s5, s5, s7
+// 0x0100dddc: 0x100dddc: addu  s5, s5, s7
 	ldloc 9
 	ldloc 11
 	add
 	stloc 9
-// 0x0100ddd0: 0x100ddd0: lw    v0, 0(s5)
+// 0x0100dde0: 0x100dde0: lw    v0, 0(s5)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100ddd4: 0x100ddd4: sll   zero, zero, 0
-// 0x0100ddd8: 0x100ddd8: beq   v0, zero, 0x100de34 addiu s3, s3, 1
+// 0x0100dde4: 0x100dde4: sll   zero, zero, 0
+// 0x0100dde8: 0x100dde8: beq   v0, zero, 0x100de44 addiu s3, s3, 1
 	ldloc 6
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	brfalse L_100de34
+	brfalse L_100de44
 // --- basic block ---
-// 0x0100dde0: 0x100dde0: lw    v0, 8(s5)
+// 0x0100ddf0: 0x100ddf0: lw    v0, 8(s5)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -993,8 +993,8 @@ L_100dda4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100dde4: 0x100dde4: sll   zero, zero, 0
-// 0x0100dde8: 0x100dde8: jalr  v0 addu  a0, s0, zero
+// 0x0100ddf4: 0x100ddf4: sll   zero, zero, 0
+// 0x0100ddf8: 0x100ddf8: jalr  v0 addu  a0, s0, zero
 	ldloc 6
 	ldloc 12
 	stloc.1
@@ -1008,12 +1008,12 @@ L_100dda4:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100ddf0: 0x100ddf0: mult  s1, s6
+// 0x0100de00: 0x100de00: mult  s1, s6
 	ldloc 7
 	ldloc 15
 	mul
 	stloc 16
-// 0x0100ddf4: 0x100ddf4: lw    a1, 4(s5)
+// 0x0100de04: 0x100de04: lw    a1, 4(s5)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1022,26 +1022,26 @@ L_100dda4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100ddf8: 0x100ddf8: mflo  lo
+// 0x0100de08: 0x100de08: mflo  lo
 	ldloc 16
 	stloc 8
-// 0x0100ddfc: 0x100ddfc: beq   a1, v0, 0x100de08 addiu a0, zero, 119
+// 0x0100de0c: 0x100de0c: beq   a1, v0, 0x100de18 addiu a0, zero, 119
 	ldloc.2
 	ldloc 6
 	ldc.i4.s 119
 	stloc.1
-	beq  L_100de08
+	beq  L_100de18
 // --- basic block ---
-// 0x0100de04: 0x100de04: addiu s2, zero, 1
+// 0x0100de14: 0x100de14: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 13
-L_100de08:
-// 0x0100de08: 0x100de08: addu  v1, s7, v1
+L_100de18:
+// 0x0100de18: 0x100de18: addu  v1, s7, v1
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x0100de0c: 0x100de0c: beq   v0, zero, 0x100de2c sw    v0, 4(v1)
+// 0x0100de1c: 0x100de1c: beq   v0, zero, 0x100de3c sw    v0, 4(v1)
 	ldloc 6
 	ldloc 5
 	ldloc 8
@@ -1051,12 +1051,12 @@ L_100de08:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_100de2c
+	brfalse L_100de3c
 // --- basic block ---
-// 0x0100de14: 0x100de14: addiu a0, zero, 119
+// 0x0100de24: 0x100de24: addiu a0, zero, 119
 	ldc.i4.s 119
 	stloc.1
-// 0x0100de18: 0x100de18: jal   0x101aec4 addiu a1, sp, 16
+// 0x0100de28: 0x100de28: jal   0x101aed4 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1066,77 +1066,77 @@ L_100de08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100de20: 0x100de20: lui   v0, 0x30000
+// 0x0100de30: 0x100de30: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0100de24: 0x100de24: j	 0x100de3c sw    s1, -31092(v0)
+// 0x0100de34: 0x100de34: j	 0x100de4c sw    s1, -30628(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7773
+	ldc.i4 -7657
 	add
 	ldloc 7
 	stelem.i4
-	br L_100de3c
+	br L_100de4c
 // --- basic block ---
-L_100de2c:
-// 0x0100de2c: 0x100de2c: jal   0x101ae54 sll   zero, zero, 0
+L_100de3c:
+// 0x0100de3c: 0x100de3c: jal   0x101ae64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_100de34:
-// 0x0100de34: 0x100de34: bne   s3, s4, 0x100dda4 sll   zero, zero, 0
+L_100de44:
+// 0x0100de44: 0x100de44: bne   s3, s4, 0x100ddb4 sll   zero, zero, 0
 	ldloc 10
 	ldloc 14
-	bne.un L_100dda4
+	bne.un L_100ddb4
 // --- basic block ---
-L_100de3c:
-// 0x0100de3c: 0x100de3c: beq   s2, zero, 0x100de5c sll   zero, zero, 0
+L_100de4c:
+// 0x0100de4c: 0x100de4c: beq   s2, zero, 0x100de6c sll   zero, zero, 0
 	ldloc 13
-	brfalse L_100de5c
+	brfalse L_100de6c
 // --- basic block ---
-// 0x0100de44: 0x100de44: jal   0x102146c sll   zero, zero, 0
+// 0x0100de54: 0x100de54: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100de4c: 0x100de4c: bne   v0, zero, 0x100de5c sll   zero, zero, 0
+// 0x0100de5c: 0x100de5c: bne   v0, zero, 0x100de6c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_100de5c
+	brtrue L_100de6c
 // --- basic block ---
-// 0x0100de54: 0x100de54: jal   0x1021900 sll   zero, zero, 0
+// 0x0100de64: 0x100de64: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_100de5c:
-// 0x0100de5c: 0x100de5c: lw    ra, 180(sp)
-// 0x0100de60: 0x100de60: lw    s8, 176(sp)
+L_100de6c:
+// 0x0100de6c: 0x100de6c: lw    ra, 180(sp)
+// 0x0100de70: 0x100de70: lw    s8, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1145,7 +1145,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0100de64: 0x100de64: lw    s7, 172(sp)
+// 0x0100de74: 0x100de74: lw    s7, 172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1154,7 +1154,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100de68: 0x100de68: lw    s6, 168(sp)
+// 0x0100de78: 0x100de78: lw    s6, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1163,7 +1163,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100de6c: 0x100de6c: lw    s5, 164(sp)
+// 0x0100de7c: 0x100de7c: lw    s5, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1172,7 +1172,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100de70: 0x100de70: lw    s4, 160(sp)
+// 0x0100de80: 0x100de80: lw    s4, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1181,7 +1181,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100de74: 0x100de74: lw    s3, 156(sp)
+// 0x0100de84: 0x100de84: lw    s3, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1190,7 +1190,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100de78: 0x100de78: lw    s2, 152(sp)
+// 0x0100de88: 0x100de88: lw    s2, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1199,7 +1199,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100de7c: 0x100de7c: lw    s1, 148(sp)
+// 0x0100de8c: 0x100de8c: lw    s1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1208,7 +1208,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100de80: 0x100de80: lw    s0, 144(sp)
+// 0x0100de90: 0x100de90: lw    s0, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1217,7 +1217,7 @@ L_100de5c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100de84: 0x100de84: jr    ra addiu sp, sp, 184
+// 0x0100de94: 0x100de94: jr    ra addiu sp, sp, 184
 	ldloc.0
 	ldc.i4 184
 	add
@@ -1229,7 +1229,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_warning_register_100de8c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_warning_register_100de9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 lo)
@@ -1267,36 +1267,36 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100de8c: 0x100de8c: lui   v0, 0x30000
+// 0x0100de9c: 0x100de9c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0100de90: 0x100de90: lw    v1, -31088(v0)
+// 0x0100dea0: 0x100dea0: lw    v1, -30624(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7772
+	ldc.i4 -7656
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100de94: 0x100de94: addiu sp, sp, -24
+// 0x0100dea4: 0x100dea4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100de98: 0x100de98: sw    ra, 20(sp)
-// 0x0100de9c: 0x100de9c: beq   v1, zero, 0x100deec addu  a2, zero, zero
+// 0x0100dea8: 0x100dea8: sw    ra, 20(sp)
+// 0x0100deac: 0x100deac: beq   v1, zero, 0x100defc addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_100deec
+	brfalse L_100defc
 // --- basic block ---
-// 0x0100dea4: 0x100dea4: addiu v0, v0, -31088
+// 0x0100deb4: 0x100deb4: addiu v0, v0, -30624
 	ldloc 6
-	ldc.i4 -31088
+	ldc.i4 -30624
 	add
 	stloc 6
-// 0x0100dea8: 0x100dea8: lw    v1, 44(v0)
+// 0x0100deb8: 0x100deb8: lw    v1, 44(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1305,14 +1305,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100deac: 0x100deac: sll   zero, zero, 0
-// 0x0100deb0: 0x100deb0: beq   v1, zero, 0x100deec addiu a2, zero, 1
+// 0x0100debc: 0x100debc: sll   zero, zero, 0
+// 0x0100dec0: 0x100dec0: beq   v1, zero, 0x100defc addiu a2, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.3
-	brfalse L_100deec
+	brfalse L_100defc
 // --- basic block ---
-// 0x0100deb8: 0x100deb8: lw    v1, 88(v0)
+// 0x0100dec8: 0x100dec8: lw    v1, 88(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1321,14 +1321,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100debc: 0x100debc: sll   zero, zero, 0
-// 0x0100dec0: 0x100dec0: beq   v1, zero, 0x100deec addiu a2, zero, 2
+// 0x0100decc: 0x100decc: sll   zero, zero, 0
+// 0x0100ded0: 0x100ded0: beq   v1, zero, 0x100defc addiu a2, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc.3
-	brfalse L_100deec
+	brfalse L_100defc
 // --- basic block ---
-// 0x0100dec8: 0x100dec8: lw    v1, 132(v0)
+// 0x0100ded8: 0x100ded8: lw    v1, 132(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1337,14 +1337,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100decc: 0x100decc: sll   zero, zero, 0
-// 0x0100ded0: 0x100ded0: beq   v1, zero, 0x100deec addiu a2, zero, 3
+// 0x0100dedc: 0x100dedc: sll   zero, zero, 0
+// 0x0100dee0: 0x100dee0: beq   v1, zero, 0x100defc addiu a2, zero, 3
 	ldloc 5
 	ldc.i4.3
 	stloc.3
-	brfalse L_100deec
+	brfalse L_100defc
 // --- basic block ---
-// 0x0100ded8: 0x100ded8: lw    v1, 176(v0)
+// 0x0100dee8: 0x100dee8: lw    v1, 176(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1353,45 +1353,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100dedc: 0x100dedc: sll   zero, zero, 0
-// 0x0100dee0: 0x100dee0: bne   v1, zero, 0x100df28 addu  v0, zero, zero
+// 0x0100deec: 0x100deec: sll   zero, zero, 0
+// 0x0100def0: 0x100def0: bne   v1, zero, 0x100df38 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_100df28
+	brtrue L_100df38
 // --- basic block ---
-// 0x0100dee8: 0x100dee8: addiu a2, zero, 4
+// 0x0100def8: 0x100def8: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-L_100deec:
-// 0x0100deec: 0x100deec: addiu v0, zero, 44
+L_100defc:
+// 0x0100defc: 0x100defc: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 6
-// 0x0100def0: 0x100def0: mult  a2, v0
+// 0x0100df00: 0x100df00: mult  a2, v0
 	ldloc.3
 	ldloc 6
 	mul
 	stloc 9
-// 0x0100def4: 0x100def4: lui   v1, 0x30000
+// 0x0100df04: 0x100df04: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100def8: 0x100def8: addiu v1, v1, -31088
+// 0x0100df08: 0x100df08: addiu v1, v1, -30624
 	ldloc 5
-	ldc.i4 -31088
+	ldc.i4 -30624
 	add
 	stloc 5
-// 0x0100defc: 0x100defc: addiu v0, zero, 1
+// 0x0100df0c: 0x100df0c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0100df00: 0x100df00: mflo  lo
+// 0x0100df10: 0x100df10: mflo  lo
 	ldloc 9
 	stloc.3
-// 0x0100df04: 0x100df04: addu  a3, a2, v1
+// 0x0100df14: 0x100df14: addu  a3, a2, v1
 	ldloc.3
 	ldloc 5
 	add
 	stloc 4
-// 0x0100df08: 0x100df08: sw    a0, 8(a3)
+// 0x0100df18: 0x100df18: sw    a0, 8(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
@@ -1400,10 +1400,10 @@ L_100deec:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100df0c: 0x100df0c: addiu a0, zero, 1
+// 0x0100df1c: 0x100df1c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100df10: 0x100df10: beq   a1, zero, 0x100df28 sw    a0, 0(a3)
+// 0x0100df20: 0x100df20: beq   a1, zero, 0x100df38 sw    a0, 0(a3)
 	ldloc.2
 	ldloc 7
 	ldloc 4
@@ -1411,14 +1411,14 @@ L_100deec:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_100df28
+	brfalse L_100df38
 // --- basic block ---
-// 0x0100df18: 0x100df18: addiu a0, a3, 12
+// 0x0100df28: 0x100df28: addiu a0, a3, 12
 	ldloc 4
 	ldc.i4.s 12
 	add
 	stloc.1
-// 0x0100df1c: 0x100df1c: jal   0x1001af8 addiu a2, zero, 32
+// 0x0100df2c: 0x100df2c: jal   0x1001af8 addiu a2, zero, 32
 	ldc.i4.s 32
 	stloc.3
 	ldloc.1
@@ -1427,13 +1427,13 @@ L_100deec:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0100df24: 0x100df24: addiu v0, zero, 1
+// 0x0100df34: 0x100df34: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_100df28:
-// 0x0100df28: 0x100df28: lw    ra, 20(sp)
-// 0x0100df2c: 0x100df2c: sll   zero, zero, 0
-// 0x0100df30: 0x100df30: jr    ra addiu sp, sp, 24
+L_100df38:
+// 0x0100df38: 0x100df38: lw    ra, 20(sp)
+// 0x0100df3c: 0x100df3c: sll   zero, zero, 0
+// 0x0100df40: 0x100df40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1445,7 +1445,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_config_skip_until_100dfc8(int32,int32)
+.method public static int32 roadmap_config_skip_until_100dfd8(int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1471,53 +1471,53 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100dfc8: 0x100dfc8: sll   a1, a1, 24
+// 0x0100dfd8: 0x100dfd8: sll   a1, a1, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc.1
-// 0x0100dfcc: 0x100dfcc: addu  v0, a0, zero
+// 0x0100dfdc: 0x100dfdc: addu  v0, a0, zero
 	ldloc.0
 	stloc.2
-// 0x0100dfd0: 0x100dfd0: sra   a1, a1, 24
+// 0x0100dfe0: 0x100dfe0: sra   a1, a1, 24
 	ldloc.1
 	ldc.i4.s 24
 	shr
 	stloc.1
-// 0x0100dfd4: 0x100dfd4: addiu a0, zero, 10
+// 0x0100dfe4: 0x100dfe4: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.0
-L_100dfd8:
-// 0x0100dfd8: 0x100dfd8: lb    v1, 0(v0)
+L_100dfe8:
+// 0x0100dfe8: 0x100dfe8: lb    v1, 0(v0)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0100dfdc: 0x100dfdc: sll   zero, zero, 0
-// 0x0100dfe0: 0x100dfe0: beq   v1, a0, 0x100dffc sll   zero, zero, 0
+// 0x0100dfec: 0x100dfec: sll   zero, zero, 0
+// 0x0100dff0: 0x100dff0: beq   v1, a0, 0x100e00c sll   zero, zero, 0
 	ldloc.3
 	ldloc.0
-	beq  L_100dffc
+	beq  L_100e00c
 // --- basic block ---
-// 0x0100dfe8: 0x100dfe8: beq   v1, a1, 0x100dffc sll   zero, zero, 0
+// 0x0100dff8: 0x100dff8: beq   v1, a1, 0x100e00c sll   zero, zero, 0
 	ldloc.3
 	ldloc.1
-	beq  L_100dffc
+	beq  L_100e00c
 // --- basic block ---
-// 0x0100dff0: 0x100dff0: bne   v1, zero, 0x100dfd8 addiu v0, v0, 1
+// 0x0100e000: 0x100e000: bne   v1, zero, 0x100dfe8 addiu v0, v0, 1
 	ldloc.3
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	brtrue L_100dfd8
+	brtrue L_100dfe8
 // --- basic block ---
-// 0x0100dff8: 0x100dff8: addiu v0, v0, -1
+// 0x0100e008: 0x100e008: addiu v0, v0, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-L_100dffc:
-// 0x0100dffc: 0x100dffc: jr    ra sll   zero, zero, 0
+L_100e00c:
+// 0x0100e00c: 0x100e00c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -1525,7 +1525,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_config_skip_spaces_100e004(int32,int32)
+.method public static int32 roadmap_config_skip_spaces_100e014(int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1551,44 +1551,44 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e004: 0x100e004: addu  v0, a0, zero
+// 0x0100e014: 0x100e014: addu  v0, a0, zero
 	ldloc.0
 	stloc.2
-// 0x0100e008: 0x100e008: addiu a1, zero, 32
+// 0x0100e018: 0x100e018: addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.1
-// 0x0100e00c: 0x100e00c: j	 0x100e018 addiu a0, zero, 9
+// 0x0100e01c: 0x100e01c: j	 0x100e028 addiu a0, zero, 9
 	ldc.i4.s 9
 	stloc.0
-	br L_100e018
+	br L_100e028
 // --- basic block ---
-L_100e014:
-// 0x0100e014: 0x100e014: addiu v0, v0, 1
+L_100e024:
+// 0x0100e024: 0x100e024: addiu v0, v0, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-L_100e018:
-// 0x0100e018: 0x100e018: lb    v1, 0(v0)
+L_100e028:
+// 0x0100e028: 0x100e028: lb    v1, 0(v0)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0100e01c: 0x100e01c: sll   zero, zero, 0
-// 0x0100e020: 0x100e020: beq   v1, a1, 0x100e014 sll   zero, zero, 0
+// 0x0100e02c: 0x100e02c: sll   zero, zero, 0
+// 0x0100e030: 0x100e030: beq   v1, a1, 0x100e024 sll   zero, zero, 0
 	ldloc.3
 	ldloc.1
-	beq  L_100e014
+	beq  L_100e024
 // --- basic block ---
-// 0x0100e028: 0x100e028: beq   v1, a0, 0x100e018 addiu v0, v0, 1
+// 0x0100e038: 0x100e038: beq   v1, a0, 0x100e028 addiu v0, v0, 1
 	ldloc.3
 	ldloc.0
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	beq  L_100e018
+	beq  L_100e028
 // --- basic block ---
-// 0x0100e030: 0x100e030: jr    ra addiu v0, v0, -1
+// 0x0100e040: 0x100e040: jr    ra addiu v0, v0, -1
 	ldloc.2
 	ldc.i4.m1
 	add
@@ -1600,7 +1600,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_config_extract_data_100e038(int32,int32,int32)
+.method public static int32 roadmap_config_extract_data_100e048(int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -1629,127 +1629,127 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e038: 0x100e038: addu  a1, a0, a1
+// 0x0100e048: 0x100e048: addu  a1, a0, a1
 	ldloc.0
 	ldloc.1
 	add
 	stloc.1
-// 0x0100e03c: 0x100e03c: addu  v0, a0, zero
+// 0x0100e04c: 0x100e04c: addu  v0, a0, zero
 	ldloc.0
 	stloc 4
-// 0x0100e040: 0x100e040: sb    zero, -1(a1)
+// 0x0100e050: 0x100e050: sb    zero, -1(a1)
 	ldloc.1
 	ldc.i4.m1
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100e044: 0x100e044: addiu a0, zero, 9
+// 0x0100e054: 0x100e054: addiu a0, zero, 9
 	ldc.i4.s 9
 	stloc.0
-// 0x0100e048: 0x100e048: j	 0x100e054 addiu a1, zero, 32
+// 0x0100e058: 0x100e058: j	 0x100e064 addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.1
-	br L_100e054
+	br L_100e064
 // --- basic block ---
-L_100e050:
-// 0x0100e050: 0x100e050: addiu v0, v0, 1
+L_100e060:
+// 0x0100e060: 0x100e060: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-L_100e054:
-// 0x0100e054: 0x100e054: lb    v1, 0(v0)
+L_100e064:
+// 0x0100e064: 0x100e064: lb    v1, 0(v0)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0100e058: 0x100e058: sll   zero, zero, 0
-// 0x0100e05c: 0x100e05c: beq   v1, a1, 0x100e050 sll   zero, zero, 0
+// 0x0100e068: 0x100e068: sll   zero, zero, 0
+// 0x0100e06c: 0x100e06c: beq   v1, a1, 0x100e060 sll   zero, zero, 0
 	ldloc.3
 	ldloc.1
-	beq  L_100e050
+	beq  L_100e060
 // --- basic block ---
-// 0x0100e064: 0x100e064: beq   v1, a0, 0x100e054 addiu v0, v0, 1
+// 0x0100e074: 0x100e074: beq   v1, a0, 0x100e064 addiu v0, v0, 1
 	ldloc.3
 	ldloc.0
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-	beq  L_100e054
+	beq  L_100e064
 // --- basic block ---
-// 0x0100e06c: 0x100e06c: addiu v0, v0, -1
+// 0x0100e07c: 0x100e07c: addiu v0, v0, -1
 	ldloc 4
 	ldc.i4.m1
 	add
 	stloc 4
-// 0x0100e070: 0x100e070: addiu a0, zero, 13
+// 0x0100e080: 0x100e080: addiu a0, zero, 13
 	ldc.i4.s 13
 	stloc.0
-// 0x0100e074: 0x100e074: beq   v1, a0, 0x100e0c0 addiu a0, zero, 10
+// 0x0100e084: 0x100e084: beq   v1, a0, 0x100e0d0 addiu a0, zero, 10
 	ldloc.3
 	ldloc.0
 	ldc.i4.s 10
 	stloc.0
-	beq  L_100e0c0
+	beq  L_100e0d0
 // --- basic block ---
-// 0x0100e07c: 0x100e07c: beq   v1, a0, 0x100e0c0 addiu a0, zero, 35
+// 0x0100e08c: 0x100e08c: beq   v1, a0, 0x100e0d0 addiu a0, zero, 35
 	ldloc.3
 	ldloc.0
 	ldc.i4.s 35
 	stloc.0
-	beq  L_100e0c0
+	beq  L_100e0d0
 // --- basic block ---
-// 0x0100e084: 0x100e084: beq   v1, a0, 0x100e0c0 addu  v1, v0, zero
+// 0x0100e094: 0x100e094: beq   v1, a0, 0x100e0d0 addu  v1, v0, zero
 	ldloc.3
 	ldloc.0
 	ldloc 4
 	stloc.3
-	beq  L_100e0c0
+	beq  L_100e0d0
 // --- basic block ---
-// 0x0100e08c: 0x100e08c: addiu a2, zero, 10
+// 0x0100e09c: 0x100e09c: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0100e090: 0x100e090: addiu a1, zero, 13
+// 0x0100e0a0: 0x100e0a0: addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.1
-L_100e094:
-// 0x0100e094: 0x100e094: lb    a0, 0(v1)
+L_100e0a4:
+// 0x0100e0a4: 0x100e0a4: lb    a0, 0(v1)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.0
-// 0x0100e098: 0x100e098: sll   zero, zero, 0
-// 0x0100e09c: 0x100e09c: beq   a0, zero, 0x100e0b8 sll   zero, zero, 0
+// 0x0100e0a8: 0x100e0a8: sll   zero, zero, 0
+// 0x0100e0ac: 0x100e0ac: beq   a0, zero, 0x100e0c8 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_100e0b8
+	brfalse L_100e0c8
 // --- basic block ---
-// 0x0100e0a4: 0x100e0a4: beq   a0, a2, 0x100e0b8 sll   zero, zero, 0
+// 0x0100e0b4: 0x100e0b4: beq   a0, a2, 0x100e0c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.2
-	beq  L_100e0b8
+	beq  L_100e0c8
 // --- basic block ---
-// 0x0100e0ac: 0x100e0ac: bne   a0, a1, 0x100e094 addiu v1, v1, 1
+// 0x0100e0bc: 0x100e0bc: bne   a0, a1, 0x100e0a4 addiu v1, v1, 1
 	ldloc.0
 	ldloc.1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-	bne.un L_100e094
+	bne.un L_100e0a4
 // --- basic block ---
-// 0x0100e0b4: 0x100e0b4: addiu v1, v1, -1
+// 0x0100e0c4: 0x100e0c4: addiu v1, v1, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-L_100e0b8:
-// 0x0100e0b8: 0x100e0b8: jr    ra sb    zero, 0(v1)
+L_100e0c8:
+// 0x0100e0c8: 0x100e0c8: jr    ra sb    zero, 0(v1)
 	ldloc.3
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	br __CIBYL_function_return
 // --- basic block ---
-L_100e0c0:
-// 0x0100e0c0: 0x100e0c0: jr    ra addu  v0, zero, zero
+L_100e0d0:
+// 0x0100e0d0: 0x100e0d0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
@@ -1759,7 +1759,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_config_is_loaded_100e0c8()
+.method public static int32 roadmap_config_is_loaded_100e0d8()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1776,25 +1776,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e0c8: 0x100e0c8: lui   v0, 0x30000
+// 0x0100e0d8: 0x100e0d8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0100e0cc: 0x100e0cc: lw    v0, -30868(v0)
+// 0x0100e0dc: 0x100e0dc: lw    v0, -30404(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7717
+	ldc.i4 -7601
 	add
 	ldelem.i4
 	stloc.0
-// 0x0100e0d0: 0x100e0d0: jr    ra sll   zero, zero, 0
+// 0x0100e0e0: 0x100e0e0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_config_search_file_100e0d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_search_file_100e0e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1835,24 +1835,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e0d8: 0x100e0d8: lui   v0, 0x30000
+// 0x0100e0e8: 0x100e0e8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100e0dc: 0x100e0dc: lw    v0, -30868(v0)
+// 0x0100e0ec: 0x100e0ec: lw    v0, -30404(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7717
+	ldc.i4 -7601
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e0e0: 0x100e0e0: addiu sp, sp, -40
+// 0x0100e0f0: 0x100e0f0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100e0e4: 0x100e0e4: sw    s0, 28(sp)
+// 0x0100e0f4: 0x100e0f4: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1861,8 +1861,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e0e8: 0x100e0e8: sw    ra, 36(sp)
-// 0x0100e0ec: 0x100e0ec: sw    s1, 32(sp)
+// 0x0100e0f8: 0x100e0f8: sw    ra, 36(sp)
+// 0x0100e0fc: 0x100e0fc: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1871,35 +1871,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100e0f0: 0x100e0f0: bne   v0, zero, 0x100e118 addu  s0, a0, zero
+// 0x0100e100: 0x100e100: bne   v0, zero, 0x100e128 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brtrue L_100e118
+	brtrue L_100e128
 // --- basic block ---
-// 0x0100e0f8: 0x100e0f8: lui   a1, 0x0
+// 0x0100e108: 0x100e108: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100e0fc: 0x100e0fc: lui   a3, 0x0
+// 0x0100e10c: 0x100e10c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100e100: 0x100e100: addiu a1, a1, 25908
+// 0x0100e110: 0x100e110: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100e104: 0x100e104: addiu a3, a3, 25936
+// 0x0100e114: 0x100e114: addiu a3, a3, 25936
 	ldloc 4
 	ldc.i4 25936
 	add
 	stloc 4
-// 0x0100e108: 0x100e108: addiu a0, zero, 5
+// 0x0100e118: 0x100e118: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100e10c: 0x100e10c: addiu a2, zero, 168
+// 0x0100e11c: 0x100e11c: addiu a2, zero, 168
 	ldc.i4 168
 	stloc.3
-// 0x0100e110: 0x100e110: jal   0x100449c sw    s0, 16(sp)
+// 0x0100e120: 0x100e120: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1918,73 +1918,73 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_100e118:
-// 0x0100e118: 0x100e118: lui   s1, 0x0
+L_100e128:
+// 0x0100e128: 0x100e128: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0100e11c: 0x100e11c: j	 0x100e138 addiu s1, s1, 860
+// 0x0100e12c: 0x100e12c: j	 0x100e148 addiu s1, s1, 860
 	ldloc 6
 	ldc.i4 860
 	add
 	stloc 6
-	br L_100e138
+	br L_100e148
 // --- basic block ---
-L_100e124:
-// 0x0100e124: 0x100e124: jal   0x1001b14 sll   zero, zero, 0
+L_100e134:
+// 0x0100e134: 0x100e134: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100e12c: 0x100e12c: beq   v0, zero, 0x100e16c sll   zero, zero, 0
+// 0x0100e13c: 0x100e13c: beq   v0, zero, 0x100e17c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100e16c
+	brfalse L_100e17c
 // --- basic block ---
-// 0x0100e134: 0x100e134: addiu s1, s1, 32
+// 0x0100e144: 0x100e144: addiu s1, s1, 32
 	ldloc 6
 	ldc.i4.s 32
 	add
 	stloc 6
-L_100e138:
-// 0x0100e138: 0x100e138: lw    v0, 0(s1)
+L_100e148:
+// 0x0100e148: 0x100e148: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100e13c: 0x100e13c: addu  a0, s0, zero
+// 0x0100e14c: 0x100e14c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100e140: 0x100e140: bne   v0, zero, 0x100e124 addu  a1, v0, zero
+// 0x0100e150: 0x100e150: bne   v0, zero, 0x100e134 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
-	brtrue L_100e124
+	brtrue L_100e134
 // --- basic block ---
-// 0x0100e148: 0x100e148: lui   a1, 0x0
+// 0x0100e158: 0x100e158: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100e14c: 0x100e14c: lui   a3, 0x0
+// 0x0100e15c: 0x100e15c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100e150: 0x100e150: addiu a1, a1, 25908
+// 0x0100e160: 0x100e160: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100e154: 0x100e154: addiu a3, a3, 25956
+// 0x0100e164: 0x100e164: addiu a3, a3, 25956
 	ldloc 4
 	ldc.i4 25956
 	add
 	stloc 4
-// 0x0100e158: 0x100e158: addiu a0, zero, 5
+// 0x0100e168: 0x100e168: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100e15c: 0x100e15c: addiu a2, zero, 177
+// 0x0100e16c: 0x100e16c: addiu a2, zero, 177
 	ldc.i4 177
 	stloc.3
-// 0x0100e160: 0x100e160: sw    s0, 16(sp)
+// 0x0100e170: 0x100e170: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1993,7 +1993,7 @@ L_100e138:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e164: 0x100e164: jal   0x100449c addu  s1, zero, zero
+// 0x0100e174: 0x100e174: jal   0x100449c addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
 	ldloc.0
@@ -2006,12 +2006,12 @@ L_100e138:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_100e16c:
-// 0x0100e16c: 0x100e16c: lw    ra, 36(sp)
-// 0x0100e170: 0x100e170: addu  v0, s1, zero
+L_100e17c:
+// 0x0100e17c: 0x100e17c: lw    ra, 36(sp)
+// 0x0100e180: 0x100e180: addu  v0, s1, zero
 	ldloc 6
 	stloc 5
-// 0x0100e174: 0x100e174: lw    s1, 32(sp)
+// 0x0100e184: 0x100e184: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2020,7 +2020,7 @@ L_100e16c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100e178: 0x100e178: lw    s0, 28(sp)
+// 0x0100e188: 0x100e188: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2029,7 +2029,7 @@ L_100e16c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e17c: 0x100e17c: jr    ra addiu sp, sp, 40
+// 0x0100e18c: 0x100e18c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2041,7 +2041,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_search_item_100e1f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_search_item_100e208(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -2082,12 +2082,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e1f8: 0x100e1f8: addiu sp, sp, -32
+// 0x0100e208: 0x100e208: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100e1fc: 0x100e1fc: sw    s1, 24(sp)
+// 0x0100e20c: 0x100e20c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2096,7 +2096,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e200: 0x100e200: sw    s0, 20(sp)
+// 0x0100e210: 0x100e210: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2105,17 +2105,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100e204: 0x100e204: sw    ra, 28(sp)
-// 0x0100e208: 0x100e208: addu  s1, a1, zero
+// 0x0100e214: 0x100e214: sw    ra, 28(sp)
+// 0x0100e218: 0x100e218: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0100e20c: 0x100e20c: beq   a1, zero, 0x100e260 addu  s0, zero, zero
+// 0x0100e21c: 0x100e21c: beq   a1, zero, 0x100e270 addu  s0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_100e260
+	brfalse L_100e270
 // --- basic block ---
-// 0x0100e214: 0x100e214: lw    s0, 16(a0)
+// 0x0100e224: 0x100e224: lw    s0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2124,11 +2124,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100e218: 0x100e218: j	 0x100e258 sll   zero, zero, 0
-	br L_100e258
+// 0x0100e228: 0x100e228: j	 0x100e268 sll   zero, zero, 0
+	br L_100e268
 // --- basic block ---
-L_100e220:
-// 0x0100e220: 0x100e220: lw    a0, 12(s0)
+L_100e230:
+// 0x0100e230: 0x100e230: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2137,7 +2137,7 @@ L_100e220:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100e224: 0x100e224: lw    a1, 4(s1)
+// 0x0100e234: 0x100e234: lw    a1, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2146,17 +2146,17 @@ L_100e220:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100e228: 0x100e228: jal   0x1001b14 sll   zero, zero, 0
+// 0x0100e238: 0x100e238: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0100e230: 0x100e230: bne   v0, zero, 0x100e250 sll   zero, zero, 0
+// 0x0100e240: 0x100e240: bne   v0, zero, 0x100e260 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_100e250
+	brtrue L_100e260
 // --- basic block ---
-// 0x0100e238: 0x100e238: lw    a0, 8(s0)
+// 0x0100e248: 0x100e248: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2165,43 +2165,43 @@ L_100e220:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100e23c: 0x100e23c: lw    a1, 0(s1)
+// 0x0100e24c: 0x100e24c: lw    a1, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0100e240: 0x100e240: jal   0x1001b14 sll   zero, zero, 0
+// 0x0100e250: 0x100e250: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0100e248: 0x100e248: beq   v0, zero, 0x100e260 sll   zero, zero, 0
+// 0x0100e258: 0x100e258: beq   v0, zero, 0x100e270 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_100e260
+	brfalse L_100e270
 // --- basic block ---
-L_100e250:
-// 0x0100e250: 0x100e250: lw    s0, 0(s0)
+L_100e260:
+// 0x0100e260: 0x100e260: lw    s0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100e254: 0x100e254: sll   zero, zero, 0
-L_100e258:
-// 0x0100e258: 0x100e258: bne   s0, zero, 0x100e220 sll   zero, zero, 0
+// 0x0100e264: 0x100e264: sll   zero, zero, 0
+L_100e268:
+// 0x0100e268: 0x100e268: bne   s0, zero, 0x100e230 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_100e220
+	brtrue L_100e230
 // --- basic block ---
-L_100e260:
-// 0x0100e260: 0x100e260: lw    ra, 28(sp)
-// 0x0100e264: 0x100e264: addu  v0, s0, zero
+L_100e270:
+// 0x0100e270: 0x100e270: lw    ra, 28(sp)
+// 0x0100e274: 0x100e274: addu  v0, s0, zero
 	ldloc 6
 	stloc 7
-// 0x0100e268: 0x100e268: lw    s1, 24(sp)
+// 0x0100e278: 0x100e278: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2210,7 +2210,7 @@ L_100e260:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e26c: 0x100e26c: lw    s0, 20(sp)
+// 0x0100e27c: 0x100e27c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2219,7 +2219,7 @@ L_100e260:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100e270: 0x100e270: jr    ra addiu sp, sp, 32
+// 0x0100e280: 0x100e280: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2231,7 +2231,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_config_retrieve_100e278(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_retrieve_100e288(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -2272,12 +2272,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e278: 0x100e278: addiu sp, sp, -32
+// 0x0100e288: 0x100e288: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100e27c: 0x100e27c: sw    s0, 20(sp)
+// 0x0100e28c: 0x100e28c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2286,8 +2286,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e280: 0x100e280: sw    ra, 28(sp)
-// 0x0100e284: 0x100e284: sw    s1, 24(sp)
+// 0x0100e290: 0x100e290: sw    ra, 28(sp)
+// 0x0100e294: 0x100e294: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2296,16 +2296,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100e288: 0x100e288: addu  s0, a0, zero
+// 0x0100e298: 0x100e298: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0100e28c: 0x100e28c: beq   a0, zero, 0x100e334 addu  v0, zero, zero
+// 0x0100e29c: 0x100e29c: beq   a0, zero, 0x100e344 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_100e334
+	brfalse L_100e344
 // --- basic block ---
-// 0x0100e294: 0x100e294: lw    v0, 12(a0)
+// 0x0100e2a4: 0x100e2a4: lw    v0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2314,12 +2314,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e298: 0x100e298: sll   zero, zero, 0
-// 0x0100e29c: 0x100e29c: beq   v0, zero, 0x100e2c8 sll   zero, zero, 0
+// 0x0100e2a8: 0x100e2a8: sll   zero, zero, 0
+// 0x0100e2ac: 0x100e2ac: beq   v0, zero, 0x100e2d8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100e2c8
+	brfalse L_100e2d8
 // --- basic block ---
-// 0x0100e2a4: 0x100e2a4: lw    v0, 4(v0)
+// 0x0100e2b4: 0x100e2b4: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2328,12 +2328,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e2a8: 0x100e2a8: sll   zero, zero, 0
-// 0x0100e2ac: 0x100e2ac: beq   v0, zero, 0x100e2c8 sll   zero, zero, 0
+// 0x0100e2b8: 0x100e2b8: sll   zero, zero, 0
+// 0x0100e2bc: 0x100e2bc: beq   v0, zero, 0x100e2d8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100e2c8
+	brfalse L_100e2d8
 // --- basic block ---
-// 0x0100e2b4: 0x100e2b4: lw    v0, 24(v0)
+// 0x0100e2c4: 0x100e2c4: lw    v0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2342,7 +2342,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e2b8: 0x100e2b8: lw    v1, 8(a0)
+// 0x0100e2c8: 0x100e2c8: lw    v1, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2351,17 +2351,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100e2bc: 0x100e2bc: sll   zero, zero, 0
-// 0x0100e2c0: 0x100e2c0: beq   v1, v0, 0x100e330 sll   zero, zero, 0
+// 0x0100e2cc: 0x100e2cc: sll   zero, zero, 0
+// 0x0100e2d0: 0x100e2d0: beq   v1, v0, 0x100e340 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	beq  L_100e330
+	beq  L_100e340
 // --- basic block ---
-L_100e2c8:
-// 0x0100e2c8: 0x100e2c8: lui   s1, 0x0
+L_100e2d8:
+// 0x0100e2d8: 0x100e2d8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0100e2cc: 0x100e2cc: sw    zero, 12(s0)
+// 0x0100e2dc: 0x100e2dc: sw    zero, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2370,39 +2370,39 @@ L_100e2c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100e2d0: 0x100e2d0: j	 0x100e2f4 addiu s1, s1, 860
+// 0x0100e2e0: 0x100e2e0: j	 0x100e304 addiu s1, s1, 860
 	ldloc 7
 	ldc.i4 860
 	add
 	stloc 7
-	br L_100e2f4
+	br L_100e304
 // --- basic block ---
-L_100e2d8:
-// 0x0100e2d8: 0x100e2d8: jal   0x100e1f8 sll   zero, zero, 0
+L_100e2e8:
+// 0x0100e2e8: 0x100e2e8: jal   0x100e208 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_item_100e1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_item_100e208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100e2e0: 0x100e2e0: beq   v0, zero, 0x100e2f4 addiu s1, s1, 32
+// 0x0100e2f0: 0x100e2f0: beq   v0, zero, 0x100e304 addiu s1, s1, 32
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 32
 	add
 	stloc 7
-	brfalse L_100e2f4
+	brfalse L_100e304
 // --- basic block ---
-// 0x0100e2e8: 0x100e2e8: addiu s1, s1, -32
+// 0x0100e2f8: 0x100e2f8: addiu s1, s1, -32
 	ldloc 7
 	ldc.i4.s -32
 	add
 	stloc 7
-// 0x0100e2ec: 0x100e2ec: j	 0x100e304 sw    v0, 12(s0)
+// 0x0100e2fc: 0x100e2fc: j	 0x100e314 sw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2411,27 +2411,27 @@ L_100e2d8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_100e304
+	br L_100e314
 // --- basic block ---
-L_100e2f4:
-// 0x0100e2f4: 0x100e2f4: lw    v0, 0(s1)
+L_100e304:
+// 0x0100e304: 0x100e304: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100e2f8: 0x100e2f8: addu  a0, s1, zero
+// 0x0100e308: 0x100e308: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0100e2fc: 0x100e2fc: bne   v0, zero, 0x100e2d8 addu  a1, s0, zero
+// 0x0100e30c: 0x100e30c: bne   v0, zero, 0x100e2e8 addu  a1, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
-	brtrue L_100e2d8
+	brtrue L_100e2e8
 // --- basic block ---
-L_100e304:
-// 0x0100e304: 0x100e304: lw    v0, 12(s0)
+L_100e314:
+// 0x0100e314: 0x100e314: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2440,12 +2440,12 @@ L_100e304:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e308: 0x100e308: sll   zero, zero, 0
-// 0x0100e30c: 0x100e30c: beq   v0, zero, 0x100e334 sll   zero, zero, 0
+// 0x0100e318: 0x100e318: sll   zero, zero, 0
+// 0x0100e31c: 0x100e31c: beq   v0, zero, 0x100e344 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100e334
+	brfalse L_100e344
 // --- basic block ---
-// 0x0100e314: 0x100e314: lw    v0, 4(v0)
+// 0x0100e324: 0x100e324: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2454,12 +2454,12 @@ L_100e304:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e318: 0x100e318: sll   zero, zero, 0
-// 0x0100e31c: 0x100e31c: beq   v0, zero, 0x100e330 sll   zero, zero, 0
+// 0x0100e328: 0x100e328: sll   zero, zero, 0
+// 0x0100e32c: 0x100e32c: beq   v0, zero, 0x100e340 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100e330
+	brfalse L_100e340
 // --- basic block ---
-// 0x0100e324: 0x100e324: lw    v0, 24(v0)
+// 0x0100e334: 0x100e334: lw    v0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2468,8 +2468,8 @@ L_100e304:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e328: 0x100e328: sll   zero, zero, 0
-// 0x0100e32c: 0x100e32c: sw    v0, 8(s0)
+// 0x0100e338: 0x100e338: sll   zero, zero, 0
+// 0x0100e33c: 0x100e33c: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2478,8 +2478,8 @@ L_100e304:
 	add
 	ldloc 5
 	stelem.i4
-L_100e330:
-// 0x0100e330: 0x100e330: lw    v0, 12(s0)
+L_100e340:
+// 0x0100e340: 0x100e340: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2488,9 +2488,9 @@ L_100e330:
 	add
 	ldelem.i4
 	stloc 5
-L_100e334:
-// 0x0100e334: 0x100e334: lw    ra, 28(sp)
-// 0x0100e338: 0x100e338: lw    s1, 24(sp)
+L_100e344:
+// 0x0100e344: 0x100e344: lw    ra, 28(sp)
+// 0x0100e348: 0x100e348: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2499,7 +2499,7 @@ L_100e334:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e33c: 0x100e33c: lw    s0, 20(sp)
+// 0x0100e34c: 0x100e34c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2508,7 +2508,7 @@ L_100e334:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e340: 0x100e340: jr    ra addiu sp, sp, 32
+// 0x0100e350: 0x100e350: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2520,7 +2520,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2555,41 +2555,41 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e348: 0x100e348: addiu sp, sp, -24
+// 0x0100e358: 0x100e358: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100e34c: 0x100e34c: sw    ra, 20(sp)
-// 0x0100e350: 0x100e350: jal   0x100e278 sll   zero, zero, 0
+// 0x0100e35c: 0x100e35c: sw    ra, 20(sp)
+// 0x0100e360: 0x100e360: jal   0x100e288 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_retrieve_100e278(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_retrieve_100e288(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e358: 0x100e358: bne   v0, zero, 0x100e36c addu  v1, v0, zero
+// 0x0100e368: 0x100e368: bne   v0, zero, 0x100e37c addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_100e36c
+	brtrue L_100e37c
 // --- basic block ---
-// 0x0100e360: 0x100e360: lui   v0, 0x10000
+// 0x0100e370: 0x100e370: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0100e364: 0x100e364: j	 0x100e380 addiu v0, v0, 18500
+// 0x0100e374: 0x100e374: j	 0x100e390 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_100e380
+	br L_100e390
 // --- basic block ---
-L_100e36c:
-// 0x0100e36c: 0x100e36c: lw    v0, 20(v0)
+L_100e37c:
+// 0x0100e37c: 0x100e37c: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2598,12 +2598,12 @@ L_100e36c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e370: 0x100e370: sll   zero, zero, 0
-// 0x0100e374: 0x100e374: bne   v0, zero, 0x100e380 sll   zero, zero, 0
+// 0x0100e380: 0x100e380: sll   zero, zero, 0
+// 0x0100e384: 0x100e384: bne   v0, zero, 0x100e390 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100e380
+	brtrue L_100e390
 // --- basic block ---
-// 0x0100e37c: 0x100e37c: lw    v0, 16(v1)
+// 0x0100e38c: 0x100e38c: lw    v0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2612,10 +2612,10 @@ L_100e36c:
 	add
 	ldelem.i4
 	stloc 5
-L_100e380:
-// 0x0100e380: 0x100e380: lw    ra, 20(sp)
-// 0x0100e384: 0x100e384: sll   zero, zero, 0
-// 0x0100e388: 0x100e388: jr    ra addiu sp, sp, 24
+L_100e390:
+// 0x0100e390: 0x100e390: lw    ra, 20(sp)
+// 0x0100e394: 0x100e394: sll   zero, zero, 0
+// 0x0100e398: 0x100e398: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2627,7 +2627,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_set_item_100e408(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_set_item_100e418(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
@@ -2674,12 +2674,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e408: 0x100e408: addiu sp, sp, -40
+// 0x0100e418: 0x100e418: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100e40c: 0x100e40c: sw    s1, 24(sp)
+// 0x0100e41c: 0x100e41c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2688,7 +2688,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e410: 0x100e410: lw    s1, 20(a0)
+// 0x0100e420: 0x100e420: lw    s1, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2697,7 +2697,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e414: 0x100e414: sw    s2, 28(sp)
+// 0x0100e424: 0x100e424: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2706,7 +2706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100e418: 0x100e418: sw    s0, 20(sp)
+// 0x0100e428: 0x100e428: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2715,8 +2715,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100e41c: 0x100e41c: sw    ra, 36(sp)
-// 0x0100e420: 0x100e420: sw    s3, 32(sp)
+// 0x0100e42c: 0x100e42c: sw    ra, 36(sp)
+// 0x0100e430: 0x100e430: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2725,20 +2725,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100e424: 0x100e424: addu  s0, a0, zero
+// 0x0100e434: 0x100e434: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100e428: 0x100e428: beq   s1, zero, 0x100e450 addu  s2, a1, zero
+// 0x0100e438: 0x100e438: beq   s1, zero, 0x100e460 addu  s2, a1, zero
 	ldloc 8
 	ldloc.2
 	stloc 10
-	brfalse L_100e450
+	brfalse L_100e460
 // --- basic block ---
-// 0x0100e430: 0x100e430: beq   a1, zero, 0x100e4c0 sll   zero, zero, 0
+// 0x0100e440: 0x100e440: beq   a1, zero, 0x100e4d0 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_100e4c0
+	brfalse L_100e4d0
 // --- basic block ---
-// 0x0100e438: 0x100e438: jal   0x1001b14 addu  a0, s1, zero
+// 0x0100e448: 0x100e448: jal   0x1001b14 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2746,21 +2746,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100e440: 0x100e440: bne   v0, zero, 0x100e474 addu  v0, zero, zero
+// 0x0100e450: 0x100e450: bne   v0, zero, 0x100e484 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_100e474
+	brtrue L_100e484
 // --- basic block ---
-// 0x0100e448: 0x100e448: j	 0x100e4f0 sll   zero, zero, 0
-	br L_100e4f0
+// 0x0100e458: 0x100e458: j	 0x100e500 sll   zero, zero, 0
+	br L_100e500
 // --- basic block ---
-L_100e450:
-// 0x0100e450: 0x100e450: beq   a1, zero, 0x100e4c8 sll   zero, zero, 0
+L_100e460:
+// 0x0100e460: 0x100e460: beq   a1, zero, 0x100e4d8 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_100e4c8
+	brfalse L_100e4d8
 // --- basic block ---
-// 0x0100e458: 0x100e458: lw    a0, 16(a0)
+// 0x0100e468: 0x100e468: lw    a0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2769,23 +2769,23 @@ L_100e450:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100e45c: 0x100e45c: jal   0x1001b14 sll   zero, zero, 0
+// 0x0100e46c: 0x100e46c: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100e464: 0x100e464: bne   v0, zero, 0x100e49c sll   zero, zero, 0
+// 0x0100e474: 0x100e474: bne   v0, zero, 0x100e4ac sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100e49c
+	brtrue L_100e4ac
 // --- basic block ---
-// 0x0100e46c: 0x100e46c: j	 0x100e4f0 addu  v0, zero, zero
+// 0x0100e47c: 0x100e47c: j	 0x100e500 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_100e4f0
+	br L_100e500
 // --- basic block ---
-L_100e474:
-// 0x0100e474: 0x100e474: jal   0x1001b48 addu  a0, s2, zero
+L_100e484:
+// 0x0100e484: 0x100e484: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -2794,10 +2794,10 @@ L_100e474:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e47c: 0x100e47c: addu  a0, s1, zero
+// 0x0100e48c: 0x100e48c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0100e480: 0x100e480: jal   0x1001b48 addu  s3, v0, zero
+// 0x0100e490: 0x100e490: jal   0x1001b48 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
@@ -2806,16 +2806,16 @@ L_100e474:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e488: 0x100e488: sltu  v0, v0, s3
+// 0x0100e498: 0x100e498: sltu  v0, v0, s3
 	ldloc 5
 	ldloc 11
 	clt.un
 	stloc 5
-// 0x0100e48c: 0x100e48c: beq   v0, zero, 0x100e4ac sll   zero, zero, 0
+// 0x0100e49c: 0x100e49c: beq   v0, zero, 0x100e4bc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100e4ac
+	brfalse L_100e4bc
 // --- basic block ---
-// 0x0100e494: 0x100e494: jal   0x1000930 addu  a0, s1, zero
+// 0x0100e4a4: 0x100e4a4: jal   0x1000930 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2828,8 +2828,8 @@ L_100e474:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100e49c:
-// 0x0100e49c: 0x100e49c: jal   0x1001ba8 addu  a0, s2, zero
+L_100e4ac:
+// 0x0100e4ac: 0x100e4ac: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2842,7 +2842,7 @@ L_100e49c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e4a4: 0x100e4a4: j	 0x100e4cc sw    v0, 20(s0)
+// 0x0100e4b4: 0x100e4b4: j	 0x100e4dc sw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2851,13 +2851,13 @@ L_100e49c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_100e4cc
+	br L_100e4dc
 // --- basic block ---
-L_100e4ac:
-// 0x0100e4ac: 0x100e4ac: addu  a0, s1, zero
+L_100e4bc:
+// 0x0100e4bc: 0x100e4bc: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0100e4b0: 0x100e4b0: jal   0x1001b68 addu  a1, s2, zero
+// 0x0100e4c0: 0x100e4c0: jal   0x1001b68 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
@@ -2867,11 +2867,11 @@ L_100e4ac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e4b8: 0x100e4b8: j	 0x100e4cc sll   zero, zero, 0
-	br L_100e4cc
+// 0x0100e4c8: 0x100e4c8: j	 0x100e4dc sll   zero, zero, 0
+	br L_100e4dc
 // --- basic block ---
-L_100e4c0:
-// 0x0100e4c0: 0x100e4c0: jal   0x1000930 addu  a0, s1, zero
+L_100e4d0:
+// 0x0100e4d0: 0x100e4d0: jal   0x1000930 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2884,8 +2884,8 @@ L_100e4c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100e4c8:
-// 0x0100e4c8: 0x100e4c8: sw    zero, 20(s0)
+L_100e4d8:
+// 0x0100e4d8: 0x100e4d8: sw    zero, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2894,8 +2894,8 @@ L_100e4c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100e4cc:
-// 0x0100e4cc: 0x100e4cc: lw    v1, 32(s0)
+L_100e4dc:
+// 0x0100e4dc: 0x100e4dc: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2904,28 +2904,28 @@ L_100e4cc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e4d0: 0x100e4d0: addiu v0, zero, 2
+// 0x0100e4e0: 0x100e4e0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0100e4d4: 0x100e4d4: sb    v0, 25(s0)
+// 0x0100e4e4: 0x100e4e4: sb    v0, 25(s0)
 	ldloc 9
 	ldc.i4.s 25
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100e4d8: 0x100e4d8: sb    zero, 26(s0)
+// 0x0100e4e8: 0x100e4e8: sb    zero, 26(s0)
 	ldloc 9
 	ldc.i4.s 26
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100e4dc: 0x100e4dc: beq   v1, zero, 0x100e4f0 addiu v0, zero, 1
+// 0x0100e4ec: 0x100e4ec: beq   v1, zero, 0x100e500 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brfalse L_100e4f0
+	brfalse L_100e500
 // --- basic block ---
-// 0x0100e4e4: 0x100e4e4: jalr  v1 sll   zero, zero, 0
+// 0x0100e4f4: 0x100e4f4: jalr  v1 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
 	ldloc.1
@@ -2937,12 +2937,12 @@ L_100e4cc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e4ec: 0x100e4ec: addiu v0, zero, 1
+// 0x0100e4fc: 0x100e4fc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_100e4f0:
-// 0x0100e4f0: 0x100e4f0: lw    ra, 36(sp)
-// 0x0100e4f4: 0x100e4f4: lw    s3, 32(sp)
+L_100e500:
+// 0x0100e500: 0x100e500: lw    ra, 36(sp)
+// 0x0100e504: 0x100e504: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2951,7 +2951,7 @@ L_100e4f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100e4f8: 0x100e4f8: lw    s2, 28(sp)
+// 0x0100e508: 0x100e508: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2960,7 +2960,7 @@ L_100e4f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100e4fc: 0x100e4fc: lw    s1, 24(sp)
+// 0x0100e50c: 0x100e50c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2969,7 +2969,7 @@ L_100e4f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e500: 0x100e500: lw    s0, 20(sp)
+// 0x0100e510: 0x100e510: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2978,7 +2978,7 @@ L_100e4f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100e504: 0x100e504: jr    ra addiu sp, sp, 40
+// 0x0100e514: 0x100e514: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2990,7 +2990,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_set_position_100e50c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_set_position_100e51c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s0,int32 s3,int32 s2,int32 ra)
@@ -3037,12 +3037,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e50c: 0x100e50c: addiu sp, sp, -168
+// 0x0100e51c: 0x100e51c: addiu sp, sp, -168
 	ldloc.0
 	ldc.i4 -168
 	add
 	stloc.0
-// 0x0100e510: 0x100e510: sw    s1, 152(sp)
+// 0x0100e520: 0x100e520: sw    s1, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3051,18 +3051,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100e514: 0x100e514: addu  s1, a0, zero
+// 0x0100e524: 0x100e524: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0100e518: 0x100e518: lui   a0, 0x10000
+// 0x0100e528: 0x100e528: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0100e51c: 0x100e51c: addiu a0, a0, 18248
+// 0x0100e52c: 0x100e52c: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0100e520: 0x100e520: sw    s3, 160(sp)
+// 0x0100e530: 0x100e530: sw    s3, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3071,7 +3071,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100e524: 0x100e524: sw    s0, 148(sp)
+// 0x0100e534: 0x100e534: sw    s0, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3080,8 +3080,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100e528: 0x100e528: sw    ra, 164(sp)
-// 0x0100e52c: 0x100e52c: sw    s2, 156(sp)
+// 0x0100e538: 0x100e538: sw    ra, 164(sp)
+// 0x0100e53c: 0x100e53c: sw    s2, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3090,7 +3090,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100e530: 0x100e530: jal   0x100e0d8 addu  s3, a1, zero
+// 0x0100e540: 0x100e540: jal   0x100e0e8 addu  s3, a1, zero
 	ldloc.2
 	stloc 10
 	ldloc.0
@@ -3098,37 +3098,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_file_100e0d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_file_100e0e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100e538: 0x100e538: bne   v0, zero, 0x100e55c addu  s0, v0, zero
+// 0x0100e548: 0x100e548: bne   v0, zero, 0x100e56c addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brtrue L_100e55c
+	brtrue L_100e56c
 // --- basic block ---
-// 0x0100e540: 0x100e540: lui   a1, 0x0
+// 0x0100e550: 0x100e550: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100e544: 0x100e544: lui   a3, 0x0
+// 0x0100e554: 0x100e554: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100e548: 0x100e548: addiu a1, a1, 25908
+// 0x0100e558: 0x100e558: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100e54c: 0x100e54c: addiu a3, a3, 25992
+// 0x0100e55c: 0x100e55c: addiu a3, a3, 25992
 	ldloc 4
 	ldc.i4 25992
 	add
 	stloc 4
-// 0x0100e550: 0x100e550: addiu a0, zero, 5
+// 0x0100e560: 0x100e560: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100e554: 0x100e554: jal   0x100449c addiu a2, zero, 996
+// 0x0100e564: 0x100e564: jal   0x100449c addiu a2, zero, 996
 	ldc.i4 996
 	stloc.3
 	ldloc.0
@@ -3141,11 +3141,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_100e55c:
-// 0x0100e55c: 0x100e55c: addu  a1, s1, zero
+L_100e56c:
+// 0x0100e56c: 0x100e56c: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x0100e560: 0x100e560: jal   0x100e1f8 addu  a0, s0, zero
+// 0x0100e570: 0x100e570: jal   0x100e208 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3153,23 +3153,23 @@ L_100e55c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_item_100e1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_item_100e208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100e568: 0x100e568: beq   v0, zero, 0x100e5a4 addu  s2, v0, zero
+// 0x0100e578: 0x100e578: beq   v0, zero, 0x100e5b4 addu  s2, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 11
-	brfalse L_100e5a4
+	brfalse L_100e5b4
 // --- basic block ---
-// 0x0100e570: 0x100e570: addiu s1, sp, 16
+// 0x0100e580: 0x100e580: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x0100e574: 0x100e574: lw    a3, 4(s3)
+// 0x0100e584: 0x100e584: lw    a3, 4(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3178,22 +3178,22 @@ L_100e55c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100e578: 0x100e578: lw    a2, 0(s3)
+// 0x0100e588: 0x100e588: lw    a2, 0(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100e57c: 0x100e57c: lui   a1, 0x10000
+// 0x0100e58c: 0x100e58c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0100e580: 0x100e580: addiu a1, a1, 9760
+// 0x0100e590: 0x100e590: addiu a1, a1, 9756
 	ldloc.2
-	ldc.i4 9760
+	ldc.i4 9756
 	add
 	stloc.2
-// 0x0100e584: 0x100e584: jal   0x1000f64 addu  a0, s1, zero
+// 0x0100e594: 0x100e594: jal   0x1000f64 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3206,10 +3206,10 @@ L_100e55c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100e58c: 0x100e58c: addu  a0, s2, zero
+// 0x0100e59c: 0x100e59c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0100e590: 0x100e590: jal   0x100e408 addu  a1, s1, zero
+// 0x0100e5a0: 0x100e5a0: jal   0x100e418 addu  a1, s1, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -3217,18 +3217,18 @@ L_100e55c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_item_100e408(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_item_100e418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100e598: 0x100e598: beq   v0, zero, 0x100e5a4 addiu v0, zero, 2
+// 0x0100e5a8: 0x100e5a8: beq   v0, zero, 0x100e5b4 addiu v0, zero, 2
 	ldloc 6
 	ldc.i4.2
 	stloc 6
-	brfalse L_100e5a4
+	brfalse L_100e5b4
 // --- basic block ---
-// 0x0100e5a0: 0x100e5a0: sw    v0, 12(s0)
+// 0x0100e5b0: 0x100e5b0: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3237,9 +3237,9 @@ L_100e55c:
 	add
 	ldloc 6
 	stelem.i4
-L_100e5a4:
-// 0x0100e5a4: 0x100e5a4: lw    ra, 164(sp)
-// 0x0100e5a8: 0x100e5a8: lw    s3, 160(sp)
+L_100e5b4:
+// 0x0100e5b4: 0x100e5b4: lw    ra, 164(sp)
+// 0x0100e5b8: 0x100e5b8: lw    s3, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3248,7 +3248,7 @@ L_100e5a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100e5ac: 0x100e5ac: lw    s2, 156(sp)
+// 0x0100e5bc: 0x100e5bc: lw    s2, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3257,7 +3257,7 @@ L_100e5a4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100e5b0: 0x100e5b0: lw    s1, 152(sp)
+// 0x0100e5c0: 0x100e5c0: lw    s1, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3266,7 +3266,7 @@ L_100e5a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e5b4: 0x100e5b4: lw    s0, 148(sp)
+// 0x0100e5c4: 0x100e5c4: lw    s0, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3275,7 +3275,7 @@ L_100e5a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100e5b8: 0x100e5b8: jr    ra addiu sp, sp, 168
+// 0x0100e5c8: 0x100e5c8: jr    ra addiu sp, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
@@ -3287,7 +3287,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3325,12 +3325,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e5c0: 0x100e5c0: addiu sp, sp, -32
+// 0x0100e5d0: 0x100e5d0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100e5c4: 0x100e5c4: sw    s0, 24(sp)
+// 0x0100e5d4: 0x100e5d4: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3339,7 +3339,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e5c8: 0x100e5c8: sw    a1, 16(sp)
+// 0x0100e5d8: 0x100e5d8: sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3348,19 +3348,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100e5cc: 0x100e5cc: sw    ra, 28(sp)
-// 0x0100e5d0: 0x100e5d0: jal   0x100e278 sll   zero, zero, 0
+// 0x0100e5dc: 0x100e5dc: sw    ra, 28(sp)
+// 0x0100e5e0: 0x100e5e0: jal   0x100e288 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_retrieve_100e278(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_retrieve_100e288(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e5d8: 0x100e5d8: lw    a1, 16(sp)
+// 0x0100e5e8: 0x100e5e8: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3369,13 +3369,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100e5dc: 0x100e5dc: beq   v0, zero, 0x100e600 addu  s0, v0, zero
+// 0x0100e5ec: 0x100e5ec: beq   v0, zero, 0x100e610 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_100e600
+	brfalse L_100e610
 // --- basic block ---
-// 0x0100e5e4: 0x100e5e4: jal   0x100e408 addu  a0, v0, zero
+// 0x0100e5f4: 0x100e5f4: jal   0x100e418 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3383,18 +3383,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_item_100e408(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_item_100e418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100e5ec: 0x100e5ec: beq   v0, zero, 0x100e600 addiu v1, zero, 2
+// 0x0100e5fc: 0x100e5fc: beq   v0, zero, 0x100e610 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 7
-	brfalse L_100e600
+	brfalse L_100e610
 // --- basic block ---
-// 0x0100e5f4: 0x100e5f4: lw    v0, 4(s0)
+// 0x0100e604: 0x100e604: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3403,8 +3403,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e5f8: 0x100e5f8: sll   zero, zero, 0
-// 0x0100e5fc: 0x100e5fc: sw    v1, 12(v0)
+// 0x0100e608: 0x100e608: sll   zero, zero, 0
+// 0x0100e60c: 0x100e60c: sw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3413,9 +3413,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-L_100e600:
-// 0x0100e600: 0x100e600: lw    ra, 28(sp)
-// 0x0100e604: 0x100e604: lw    s0, 24(sp)
+L_100e610:
+// 0x0100e610: 0x100e610: lw    ra, 28(sp)
+// 0x0100e614: 0x100e614: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3424,7 +3424,7 @@ L_100e600:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e608: 0x100e608: jr    ra addiu sp, sp, 32
+// 0x0100e618: 0x100e618: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3436,7 +3436,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -3477,12 +3477,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e610: 0x100e610: addiu sp, sp, -48
+// 0x0100e620: 0x100e620: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0100e614: 0x100e614: sw    s0, 36(sp)
+// 0x0100e624: 0x100e624: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3491,18 +3491,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100e618: 0x100e618: addu  a2, a1, zero
+// 0x0100e628: 0x100e628: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0100e61c: 0x100e61c: addiu s0, sp, 16
+// 0x0100e62c: 0x100e62c: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x0100e620: 0x100e620: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x0100e630: 0x100e630: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0100e624: 0x100e624: sw    s1, 40(sp)
+// 0x0100e634: 0x100e634: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3511,16 +3511,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100e628: 0x100e628: addiu a1, a1, -13884
+// 0x0100e638: 0x100e638: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0100e62c: 0x100e62c: addu  s1, a0, zero
+// 0x0100e63c: 0x100e63c: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0100e630: 0x100e630: sw    ra, 44(sp)
-// 0x0100e634: 0x100e634: jal   0x1000f64 addu  a0, s0, zero
+// 0x0100e640: 0x100e640: sw    ra, 44(sp)
+// 0x0100e644: 0x100e644: jal   0x1000f64 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3533,10 +3533,10 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0100e63c: 0x100e63c: addu  a0, s1, zero
+// 0x0100e64c: 0x100e64c: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0100e640: 0x100e640: jal   0x100e5c0 addu  a1, s0, zero
+// 0x0100e650: 0x100e650: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -3544,13 +3544,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0100e648: 0x100e648: lw    ra, 44(sp)
-// 0x0100e64c: 0x100e64c: lw    s1, 40(sp)
+// 0x0100e658: 0x100e658: lw    ra, 44(sp)
+// 0x0100e65c: 0x100e65c: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3559,7 +3559,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e650: 0x100e650: lw    s0, 36(sp)
+// 0x0100e660: 0x100e660: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3568,7 +3568,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100e654: 0x100e654: jr    ra addiu sp, sp, 48
+// 0x0100e664: 0x100e664: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3580,7 +3580,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_config_get_position_100e65c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_get_position_100e66c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -3624,12 +3624,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e65c: 0x100e65c: addiu sp, sp, -176
+// 0x0100e66c: 0x100e66c: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x0100e660: 0x100e660: sw    s0, 160(sp)
+// 0x0100e670: 0x100e670: sw    s0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3638,18 +3638,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100e664: 0x100e664: addu  s0, a0, zero
+// 0x0100e674: 0x100e674: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0100e668: 0x100e668: lui   a0, 0x10000
+// 0x0100e678: 0x100e678: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0100e66c: 0x100e66c: addiu a0, a0, 18248
+// 0x0100e67c: 0x100e67c: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0100e670: 0x100e670: sw    s1, 164(sp)
+// 0x0100e680: 0x100e680: sw    s1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3658,8 +3658,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100e674: 0x100e674: sw    ra, 172(sp)
-// 0x0100e678: 0x100e678: sw    s2, 168(sp)
+// 0x0100e684: 0x100e684: sw    ra, 172(sp)
+// 0x0100e688: 0x100e688: sw    s2, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3668,7 +3668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100e67c: 0x100e67c: jal   0x100e0d8 addu  s1, a1, zero
+// 0x0100e68c: 0x100e68c: jal   0x100e0e8 addu  s1, a1, zero
 	ldloc.2
 	stloc 9
 	ldloc.0
@@ -3676,40 +3676,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_file_100e0d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_file_100e0e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e684: 0x100e684: bne   v0, zero, 0x100e6b4 addu  a1, s0, zero
+// 0x0100e694: 0x100e694: bne   v0, zero, 0x100e6c4 addu  a1, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.2
-	brtrue L_100e6b4
+	brtrue L_100e6c4
 // --- basic block ---
-// 0x0100e68c: 0x100e68c: lui   a1, 0x0
+// 0x0100e69c: 0x100e69c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100e690: 0x100e690: lui   a3, 0x0
+// 0x0100e6a0: 0x100e6a0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100e694: 0x100e694: addiu a1, a1, 25908
+// 0x0100e6a4: 0x100e6a4: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100e698: 0x100e698: addiu a3, a3, 25992
+// 0x0100e6a8: 0x100e6a8: addiu a3, a3, 25992
 	ldloc 4
 	ldc.i4 25992
 	add
 	stloc 4
-// 0x0100e69c: 0x100e69c: addiu a0, zero, 5
+// 0x0100e6ac: 0x100e6ac: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100e6a0: 0x100e6a0: addiu a2, zero, 951
+// 0x0100e6b0: 0x100e6b0: addiu a2, zero, 951
 	ldc.i4 951
 	stloc.3
-// 0x0100e6a4: 0x100e6a4: jal   0x100449c sw    v0, 152(sp)
+// 0x0100e6b4: 0x100e6b4: jal   0x100449c sw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3728,7 +3728,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e6ac: 0x100e6ac: lw    v0, 152(sp)
+// 0x0100e6bc: 0x100e6bc: lw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3737,11 +3737,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100e6b0: 0x100e6b0: addu  a1, s0, zero
+// 0x0100e6c0: 0x100e6c0: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-L_100e6b4:
-// 0x0100e6b4: 0x100e6b4: jal   0x100e1f8 addu  a0, v0, zero
+L_100e6c4:
+// 0x0100e6c4: 0x100e6c4: jal   0x100e208 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3749,12 +3749,12 @@ L_100e6b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_item_100e1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_item_100e208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e6bc: 0x100e6bc: lw    s0, 20(v0)
+// 0x0100e6cc: 0x100e6cc: lw    s0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3763,12 +3763,12 @@ L_100e6b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e6c0: 0x100e6c0: sll   zero, zero, 0
-// 0x0100e6c4: 0x100e6c4: bne   s0, zero, 0x100e6dc sll   zero, zero, 0
+// 0x0100e6d0: 0x100e6d0: sll   zero, zero, 0
+// 0x0100e6d4: 0x100e6d4: bne   s0, zero, 0x100e6ec sll   zero, zero, 0
 	ldloc 7
-	brtrue L_100e6dc
+	brtrue L_100e6ec
 // --- basic block ---
-// 0x0100e6cc: 0x100e6cc: lw    s0, 16(v0)
+// 0x0100e6dc: 0x100e6dc: lw    s0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3777,22 +3777,22 @@ L_100e6b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e6d0: 0x100e6d0: sll   zero, zero, 0
-// 0x0100e6d4: 0x100e6d4: beq   s0, zero, 0x100e768 sll   zero, zero, 0
+// 0x0100e6e0: 0x100e6e0: sll   zero, zero, 0
+// 0x0100e6e4: 0x100e6e4: beq   s0, zero, 0x100e778 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_100e768
+	brfalse L_100e778
 // --- basic block ---
-L_100e6dc:
-// 0x0100e6dc: 0x100e6dc: lb    v0, 0(s0)
+L_100e6ec:
+// 0x0100e6ec: 0x100e6ec: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0100e6e0: 0x100e6e0: sll   zero, zero, 0
-// 0x0100e6e4: 0x100e6e4: beq   v0, zero, 0x100e768 sll   zero, zero, 0
+// 0x0100e6f0: 0x100e6f0: sll   zero, zero, 0
+// 0x0100e6f4: 0x100e6f4: beq   v0, zero, 0x100e778 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100e768
+	brfalse L_100e778
 // --- basic block ---
-// 0x0100e6ec: 0x100e6ec: jal   0x1001b48 addu  a0, s0, zero
+// 0x0100e6fc: 0x100e6fc: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3801,42 +3801,42 @@ L_100e6dc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e6f4: 0x100e6f4: sltiu v0, v0, 128
+// 0x0100e704: 0x100e704: sltiu v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	clt.un
 	stloc 5
-// 0x0100e6f8: 0x100e6f8: bne   v0, zero, 0x100e724 addiu s2, sp, 24
+// 0x0100e708: 0x100e708: bne   v0, zero, 0x100e734 addiu s2, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-	brtrue L_100e724
+	brtrue L_100e734
 // --- basic block ---
-// 0x0100e700: 0x100e700: lui   a1, 0x0
+// 0x0100e710: 0x100e710: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100e704: 0x100e704: lui   a3, 0x0
+// 0x0100e714: 0x100e714: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100e708: 0x100e708: addiu a1, a1, 25908
+// 0x0100e718: 0x100e718: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100e70c: 0x100e70c: addiu a3, a3, 26032
+// 0x0100e71c: 0x100e71c: addiu a3, a3, 26032
 	ldloc 4
 	ldc.i4 26032
 	add
 	stloc 4
-// 0x0100e710: 0x100e710: addiu a0, zero, 5
+// 0x0100e720: 0x100e720: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100e714: 0x100e714: addiu a2, zero, 968
+// 0x0100e724: 0x100e724: addiu a2, zero, 968
 	ldc.i4 968
 	stloc.3
-// 0x0100e718: 0x100e718: jal   0x100449c sw    s0, 16(sp)
+// 0x0100e728: 0x100e728: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3855,16 +3855,16 @@ L_100e6dc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e720: 0x100e720: addiu s2, sp, 24
+// 0x0100e730: 0x100e730: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-L_100e724:
-// 0x0100e724: 0x100e724: addu  a1, s0, zero
+L_100e734:
+// 0x0100e734: 0x100e734: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0100e728: 0x100e728: jal   0x1001b68 addu  a0, s2, zero
+// 0x0100e738: 0x100e738: jal   0x1001b68 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -3874,10 +3874,10 @@ L_100e724:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e730: 0x100e730: addu  a0, s2, zero
+// 0x0100e740: 0x100e740: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0100e734: 0x100e734: jal   0x1001a5c addiu a1, zero, 44
+// 0x0100e744: 0x100e744: jal   0x1001a5c addiu a1, zero, 44
 	ldc.i4.s 44
 	stloc.2
 	ldloc.1
@@ -3887,23 +3887,23 @@ L_100e724:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e73c: 0x100e73c: beq   v0, zero, 0x100e74c addu  s0, v0, zero
+// 0x0100e74c: 0x100e74c: beq   v0, zero, 0x100e75c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_100e74c
+	brfalse L_100e75c
 // --- basic block ---
-// 0x0100e744: 0x100e744: sb    zero, 0(v0)
+// 0x0100e754: 0x100e754: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100e748: 0x100e748: addiu s0, v0, 1
+// 0x0100e758: 0x100e758: addiu s0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 7
-L_100e74c:
-// 0x0100e74c: 0x100e74c: jal   0x1000d8c addiu a0, sp, 24
+L_100e75c:
+// 0x0100e75c: 0x100e75c: jal   0x1000d8c addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3918,14 +3918,14 @@ L_100e74c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e754: 0x100e754: sw    v0, 0(s1)
+// 0x0100e764: 0x100e764: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0100e758: 0x100e758: jal   0x1000d8c addu  a0, s0, zero
+// 0x0100e768: 0x100e768: jal   0x1000d8c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3938,7 +3938,7 @@ L_100e74c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e760: 0x100e760: j	 0x100e770 sw    v0, 4(s1)
+// 0x0100e770: 0x100e770: j	 0x100e780 sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3947,10 +3947,10 @@ L_100e74c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_100e770
+	br L_100e780
 // --- basic block ---
-L_100e768:
-// 0x0100e768: 0x100e768: sw    zero, 4(s1)
+L_100e778:
+// 0x0100e778: 0x100e778: sw    zero, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3959,16 +3959,16 @@ L_100e768:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100e76c: 0x100e76c: sw    zero, 0(s1)
+// 0x0100e77c: 0x100e77c: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_100e770:
-// 0x0100e770: 0x100e770: lw    ra, 172(sp)
-// 0x0100e774: 0x100e774: lw    s2, 168(sp)
+L_100e780:
+// 0x0100e780: 0x100e780: lw    ra, 172(sp)
+// 0x0100e784: 0x100e784: lw    s2, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3977,7 +3977,7 @@ L_100e770:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100e778: 0x100e778: lw    s1, 164(sp)
+// 0x0100e788: 0x100e788: lw    s1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3986,7 +3986,7 @@ L_100e770:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100e77c: 0x100e77c: lw    s0, 160(sp)
+// 0x0100e78c: 0x100e78c: lw    s0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3995,7 +3995,7 @@ L_100e770:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e780: 0x100e780: jr    ra addiu sp, sp, 176
+// 0x0100e790: 0x100e790: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -4007,7 +4007,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 ra,int32 v1)
@@ -4045,12 +4045,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e788: 0x100e788: addiu sp, sp, -24
+// 0x0100e798: 0x100e798: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100e78c: 0x100e78c: sw    s0, 16(sp)
+// 0x0100e79c: 0x100e79c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4059,39 +4059,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100e790: 0x100e790: sw    ra, 20(sp)
-// 0x0100e794: 0x100e794: jal   0x100e278 sll   zero, zero, 0
+// 0x0100e7a0: 0x100e7a0: sw    ra, 20(sp)
+// 0x0100e7a4: 0x100e7a4: jal   0x100e288 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_retrieve_100e278(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_retrieve_100e288(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100e79c: 0x100e79c: addu  s0, v0, zero
+// 0x0100e7ac: 0x100e7ac: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0100e7a0: 0x100e7a0: beq   s0, zero, 0x100e7e4 addu  v0, zero, zero
+// 0x0100e7b0: 0x100e7b0: beq   s0, zero, 0x100e7f4 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_100e7e4
+	brfalse L_100e7f4
 // --- basic block ---
-// 0x0100e7a8: 0x100e7a8: lbu   v0, 26(s0)
+// 0x0100e7b8: 0x100e7b8: lbu   v0, 26(s0)
 	ldloc 6
 	ldc.i4.s 26
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0100e7ac: 0x100e7ac: sll   zero, zero, 0
-// 0x0100e7b0: 0x100e7b0: bne   v0, zero, 0x100e7e0 sll   zero, zero, 0
+// 0x0100e7bc: 0x100e7bc: sll   zero, zero, 0
+// 0x0100e7c0: 0x100e7c0: bne   v0, zero, 0x100e7f0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100e7e0
+	brtrue L_100e7f0
 // --- basic block ---
-// 0x0100e7b8: 0x100e7b8: lw    a0, 20(s0)
+// 0x0100e7c8: 0x100e7c8: lw    a0, 20(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4100,12 +4100,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100e7bc: 0x100e7bc: sll   zero, zero, 0
-// 0x0100e7c0: 0x100e7c0: bne   a0, zero, 0x100e7cc sll   zero, zero, 0
+// 0x0100e7cc: 0x100e7cc: sll   zero, zero, 0
+// 0x0100e7d0: 0x100e7d0: bne   a0, zero, 0x100e7dc sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100e7cc
+	brtrue L_100e7dc
 // --- basic block ---
-// 0x0100e7c8: 0x100e7c8: lw    a0, 16(s0)
+// 0x0100e7d8: 0x100e7d8: lw    a0, 16(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4114,8 +4114,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-L_100e7cc:
-// 0x0100e7cc: 0x100e7cc: jal   0x1000d8c sll   zero, zero, 0
+L_100e7dc:
+// 0x0100e7dc: 0x100e7dc: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4126,7 +4126,7 @@ L_100e7cc:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100e7d4: 0x100e7d4: sw    v0, 28(s0)
+// 0x0100e7e4: 0x100e7e4: sw    v0, 28(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4135,17 +4135,17 @@ L_100e7cc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100e7d8: 0x100e7d8: addiu v0, zero, 1
+// 0x0100e7e8: 0x100e7e8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0100e7dc: 0x100e7dc: sb    v0, 26(s0)
+// 0x0100e7ec: 0x100e7ec: sb    v0, 26(s0)
 	ldloc 6
 	ldc.i4.s 26
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_100e7e0:
-// 0x0100e7e0: 0x100e7e0: lw    v0, 28(s0)
+L_100e7f0:
+// 0x0100e7f0: 0x100e7f0: lw    v0, 28(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4154,9 +4154,9 @@ L_100e7e0:
 	add
 	ldelem.i4
 	stloc 5
-L_100e7e4:
-// 0x0100e7e4: 0x100e7e4: lw    ra, 20(sp)
-// 0x0100e7e8: 0x100e7e8: lw    s0, 16(sp)
+L_100e7f4:
+// 0x0100e7f4: 0x100e7f4: lw    ra, 20(sp)
+// 0x0100e7f8: 0x100e7f8: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4165,7 +4165,7 @@ L_100e7e4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100e7ec: 0x100e7ec: jr    ra addiu sp, sp, 24
+// 0x0100e7fc: 0x100e7fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4177,7 +4177,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4212,13 +4212,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e7f4: 0x100e7f4: addiu sp, sp, -32
+// 0x0100e804: 0x100e804: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100e7f8: 0x100e7f8: sw    ra, 28(sp)
-// 0x0100e7fc: 0x100e7fc: jal   0x100e348 sw    a1, 16(sp)
+// 0x0100e808: 0x100e808: sw    ra, 28(sp)
+// 0x0100e80c: 0x100e80c: jal   0x100e358 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4232,12 +4232,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e804: 0x100e804: lw    a1, 16(sp)
+// 0x0100e814: 0x100e814: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4246,7 +4246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100e808: 0x100e808: jal   0x1001c08 addu  a0, v0, zero
+// 0x0100e818: 0x100e818: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4259,13 +4259,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100e810: 0x100e810: lw    ra, 28(sp)
-// 0x0100e814: 0x100e814: sltiu v0, v0, 1
+// 0x0100e820: 0x100e820: lw    ra, 28(sp)
+// 0x0100e824: 0x100e824: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0100e818: 0x100e818: jr    ra addiu sp, sp, 32
+// 0x0100e828: 0x100e828: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4277,7 +4277,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_update_100e820(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_update_100e830(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s7,int32 s4,int32 s3,int32 s5,int32 s8,int32 s6,int32 ra)
@@ -4339,12 +4339,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e820: 0x100e820: addiu sp, sp, -256
+// 0x0100e830: 0x100e830: addiu sp, sp, -256
 	ldloc.0
 	ldc.i4 -256
 	add
 	stloc.0
-// 0x0100e824: 0x100e824: sw    s6, 240(sp)
+// 0x0100e834: 0x100e834: sw    s6, 240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4353,7 +4353,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100e828: 0x100e828: sw    s3, 228(sp)
+// 0x0100e838: 0x100e838: sw    s3, 228(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4362,8 +4362,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100e82c: 0x100e82c: sw    ra, 252(sp)
-// 0x0100e830: 0x100e830: sw    s8, 248(sp)
+// 0x0100e83c: 0x100e83c: sw    ra, 252(sp)
+// 0x0100e840: 0x100e840: sw    s8, 248(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4372,7 +4372,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100e834: 0x100e834: sw    s7, 244(sp)
+// 0x0100e844: 0x100e844: sw    s7, 244(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4381,7 +4381,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100e838: 0x100e838: sw    s5, 236(sp)
+// 0x0100e848: 0x100e848: sw    s5, 236(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4390,7 +4390,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100e83c: 0x100e83c: sw    s4, 232(sp)
+// 0x0100e84c: 0x100e84c: sw    s4, 232(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4399,7 +4399,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100e840: 0x100e840: sw    s2, 224(sp)
+// 0x0100e850: 0x100e850: sw    s2, 224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4408,7 +4408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100e844: 0x100e844: sw    s1, 220(sp)
+// 0x0100e854: 0x100e854: sw    s1, 220(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4417,7 +4417,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100e848: 0x100e848: sw    s0, 216(sp)
+// 0x0100e858: 0x100e858: sw    s0, 216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4426,16 +4426,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e84c: 0x100e84c: addu  s6, a1, zero
+// 0x0100e85c: 0x100e85c: addu  s6, a1, zero
 	ldloc.2
 	stloc 16
-// 0x0100e850: 0x100e850: bne   a1, zero, 0x100e868 addu  s3, a0, zero
+// 0x0100e860: 0x100e860: bne   a1, zero, 0x100e878 addu  s3, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 13
-	brtrue L_100e868
+	brtrue L_100e878
 // --- basic block ---
-// 0x0100e858: 0x100e858: lw    v1, 12(a0)
+// 0x0100e868: 0x100e868: lw    v1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4444,16 +4444,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e85c: 0x100e85c: addiu v0, zero, 2
+// 0x0100e86c: 0x100e86c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0100e860: 0x100e860: bne   v1, v0, 0x100e994 sll   zero, zero, 0
+// 0x0100e870: 0x100e870: bne   v1, v0, 0x100e9a4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	bne.un L_100e994
+	bne.un L_100e9a4
 // --- basic block ---
-L_100e868:
-// 0x0100e868: 0x100e868: jal   0x104c594 addiu s0, sp, 16
+L_100e878:
+// 0x0100e878: 0x100e878: jal   0x104c5a4 addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4463,30 +4463,30 @@ L_100e868:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_config_104c594(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_config_104c5a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e870: 0x100e870: lw    a2, 0(s3)
+// 0x0100e880: 0x100e880: lw    a2, 0(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100e874: 0x100e874: lui   a1, 0x0
+// 0x0100e884: 0x100e884: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100e878: 0x100e878: addiu a1, a1, 26068
+// 0x0100e888: 0x100e888: addiu a1, a1, 26068
 	ldloc.2
 	ldc.i4 26068
 	add
 	stloc.2
-// 0x0100e87c: 0x100e87c: addu  a0, s0, zero
+// 0x0100e88c: 0x100e88c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100e880: 0x100e880: jal   0x1000f64 addu  s1, v0, zero
+// 0x0100e890: 0x100e890: jal   0x1000f64 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -4499,16 +4499,16 @@ L_100e868:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e888: 0x100e888: lui   a2, 0x0
+// 0x0100e898: 0x100e898: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100e88c: 0x100e88c: addu  a0, s1, zero
+// 0x0100e89c: 0x100e89c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100e890: 0x100e890: addu  a1, s0, zero
+// 0x0100e8a0: 0x100e8a0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0100e894: 0x100e894: jal   0x104dac8 addiu a2, a2, 28940
+// 0x0100e8a4: 0x100e8a4: jal   0x104dad8 addiu a2, a2, 28940
 	ldloc.3
 	ldc.i4 28940
 	add
@@ -4518,26 +4518,26 @@ L_100e868:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e89c: 0x100e89c: beq   v0, zero, 0x100e994 addu  s1, v0, zero
+// 0x0100e8ac: 0x100e8ac: beq   v0, zero, 0x100e9a4 addu  s1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brfalse L_100e994
+	brfalse L_100e9a4
 // --- basic block ---
-// 0x0100e8a4: 0x100e8a4: lui   s8, 0x0
+// 0x0100e8b4: 0x100e8b4: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x0100e8a8: 0x100e8a8: addiu s8, s8, 26076
+// 0x0100e8b8: 0x100e8b8: addiu s8, s8, 26076
 	ldloc 15
 	ldc.i4 26076
 	add
 	stloc 15
-// 0x0100e8ac: 0x100e8ac: lw    s0, 16(s3)
+// 0x0100e8bc: 0x100e8bc: lw    s0, 16(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4546,34 +4546,34 @@ L_100e868:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e8b0: 0x100e8b0: j	 0x100e97c addiu s5, sp, 116
+// 0x0100e8c0: 0x100e8c0: j	 0x100e98c addiu s5, sp, 116
 	ldloc.0
 	ldc.i4.s 116
 	add
 	stloc 14
-	br L_100e97c
+	br L_100e98c
 // --- basic block ---
-L_100e8b8:
-// 0x0100e8b8: 0x100e8b8: bne   s6, zero, 0x100e8d0 addiu v0, zero, 1
+L_100e8c8:
+// 0x0100e8c8: 0x100e8c8: bne   s6, zero, 0x100e8e0 addiu v0, zero, 1
 	ldloc 16
 	ldc.i4.1
 	stloc 6
-	brtrue L_100e8d0
+	brtrue L_100e8e0
 // --- basic block ---
-// 0x0100e8c0: 0x100e8c0: lbu   v1, 25(s0)
+// 0x0100e8d0: 0x100e8d0: lbu   v1, 25(s0)
 	ldloc 8
 	ldc.i4.s 25
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x0100e8c4: 0x100e8c4: sll   zero, zero, 0
-// 0x0100e8c8: 0x100e8c8: beq   v1, v0, 0x100e978 sll   zero, zero, 0
+// 0x0100e8d4: 0x100e8d4: sll   zero, zero, 0
+// 0x0100e8d8: 0x100e8d8: beq   v1, v0, 0x100e988 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	beq  L_100e978
+	beq  L_100e988
 // --- basic block ---
-L_100e8d0:
-// 0x0100e8d0: 0x100e8d0: lw    s4, 20(s0)
+L_100e8e0:
+// 0x0100e8e0: 0x100e8e0: lw    s4, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4582,12 +4582,12 @@ L_100e8d0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100e8d4: 0x100e8d4: sll   zero, zero, 0
-// 0x0100e8d8: 0x100e8d8: bne   s4, zero, 0x100e8e4 sll   zero, zero, 0
+// 0x0100e8e4: 0x100e8e4: sll   zero, zero, 0
+// 0x0100e8e8: 0x100e8e8: bne   s4, zero, 0x100e8f4 sll   zero, zero, 0
 	ldloc 12
-	brtrue L_100e8e4
+	brtrue L_100e8f4
 // --- basic block ---
-// 0x0100e8e0: 0x100e8e0: lw    s4, 16(s0)
+// 0x0100e8f0: 0x100e8f0: lw    s4, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4596,8 +4596,8 @@ L_100e8d0:
 	add
 	ldelem.i4
 	stloc 12
-L_100e8e4:
-// 0x0100e8e4: 0x100e8e4: lw    a2, 8(s0)
+L_100e8f4:
+// 0x0100e8f4: 0x100e8f4: lw    a2, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4606,7 +4606,7 @@ L_100e8e4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100e8e8: 0x100e8e8: lw    a3, 12(s0)
+// 0x0100e8f8: 0x100e8f8: lw    a3, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4615,7 +4615,7 @@ L_100e8e4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100e8ec: 0x100e8ec: jal   0x1000f64 sll   zero, zero, 0
+// 0x0100e8fc: 0x100e8fc: jal   0x1000f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4626,7 +4626,7 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e8f4: 0x100e8f4: jal   0x1000910 addiu a0, zero, 4
+// 0x0100e904: 0x100e904: jal   0x1000910 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -4639,10 +4639,10 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e8fc: 0x100e8fc: addu  a0, s5, zero
+// 0x0100e90c: 0x100e90c: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x0100e900: 0x100e900: jal   0x1001b48 addu  s2, v0, zero
+// 0x0100e910: 0x100e910: jal   0x1001b48 addu  s2, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.1
@@ -4651,24 +4651,24 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e908: 0x100e908: addiu s7, v0, 1
+// 0x0100e918: 0x100e918: addiu s7, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 11
-// 0x0100e90c: 0x100e90c: addiu a1, zero, 1
+// 0x0100e91c: 0x100e91c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0100e910: 0x100e910: addiu a2, zero, 4
+// 0x0100e920: 0x100e920: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0100e914: 0x100e914: addu  a3, s1, zero
+// 0x0100e924: 0x100e924: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0100e918: 0x100e918: addu  a0, s2, zero
+// 0x0100e928: 0x100e928: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0100e91c: 0x100e91c: jal   0x1001da4 sw    s7, 0(s2)
+// 0x0100e92c: 0x100e92c: jal   0x1001da4 sw    s7, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4685,16 +4685,16 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e924: 0x100e924: addu  a2, s7, zero
+// 0x0100e934: 0x100e934: addu  a2, s7, zero
 	ldloc 11
 	stloc.3
-// 0x0100e928: 0x100e928: addiu a1, zero, 1
+// 0x0100e938: 0x100e938: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0100e92c: 0x100e92c: addu  a3, s1, zero
+// 0x0100e93c: 0x100e93c: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0100e930: 0x100e930: jal   0x1001da4 addu  a0, s5, zero
+// 0x0100e940: 0x100e940: jal   0x1001da4 addu  a0, s5, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -4707,7 +4707,7 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e938: 0x100e938: jal   0x1001b48 addu  a0, s4, zero
+// 0x0100e948: 0x100e948: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
@@ -4716,24 +4716,24 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e940: 0x100e940: addiu s7, v0, 1
+// 0x0100e950: 0x100e950: addiu s7, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 11
-// 0x0100e944: 0x100e944: addiu a1, zero, 1
+// 0x0100e954: 0x100e954: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0100e948: 0x100e948: addiu a2, zero, 4
+// 0x0100e958: 0x100e958: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0100e94c: 0x100e94c: addu  a3, s1, zero
+// 0x0100e95c: 0x100e95c: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0100e950: 0x100e950: addu  a0, s2, zero
+// 0x0100e960: 0x100e960: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0100e954: 0x100e954: jal   0x1001da4 sw    s7, 0(s2)
+// 0x0100e964: 0x100e964: jal   0x1001da4 sw    s7, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4750,16 +4750,16 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e95c: 0x100e95c: addu  a0, s4, zero
+// 0x0100e96c: 0x100e96c: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0100e960: 0x100e960: addu  a2, s7, zero
+// 0x0100e970: 0x100e970: addu  a2, s7, zero
 	ldloc 11
 	stloc.3
-// 0x0100e964: 0x100e964: addiu a1, zero, 1
+// 0x0100e974: 0x100e974: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0100e968: 0x100e968: jal   0x1001da4 addu  a3, s1, zero
+// 0x0100e978: 0x100e978: jal   0x1001da4 addu  a3, s1, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -4772,7 +4772,7 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e970: 0x100e970: jal   0x1000930 addu  a0, s2, zero
+// 0x0100e980: 0x100e980: jal   0x1000930 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4785,25 +4785,25 @@ L_100e8e4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100e978:
-// 0x0100e978: 0x100e978: lw    s0, 0(s0)
+L_100e988:
+// 0x0100e988: 0x100e988: lw    s0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-L_100e97c:
-// 0x0100e97c: 0x100e97c: addu  a1, s8, zero
+L_100e98c:
+// 0x0100e98c: 0x100e98c: addu  a1, s8, zero
 	ldloc 15
 	stloc.2
-// 0x0100e980: 0x100e980: bne   s0, zero, 0x100e8b8 addu  a0, s5, zero
+// 0x0100e990: 0x100e990: bne   s0, zero, 0x100e8c8 addu  a0, s5, zero
 	ldloc 8
 	ldloc 14
 	stloc.1
-	brtrue L_100e8b8
+	brtrue L_100e8c8
 // --- basic block ---
-// 0x0100e988: 0x100e988: jal   0x10023b4 addu  a0, s1, zero
+// 0x0100e998: 0x100e998: jal   0x10023b4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4816,7 +4816,7 @@ L_100e97c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100e990: 0x100e990: sw    zero, 12(s3)
+// 0x0100e9a0: 0x100e9a0: sw    zero, 12(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4825,9 +4825,9 @@ L_100e97c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100e994:
-// 0x0100e994: 0x100e994: lw    ra, 252(sp)
-// 0x0100e998: 0x100e998: lw    s8, 248(sp)
+L_100e9a4:
+// 0x0100e9a4: 0x100e9a4: lw    ra, 252(sp)
+// 0x0100e9a8: 0x100e9a8: lw    s8, 248(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4836,7 +4836,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100e99c: 0x100e99c: lw    s7, 244(sp)
+// 0x0100e9ac: 0x100e9ac: lw    s7, 244(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4845,7 +4845,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100e9a0: 0x100e9a0: lw    s6, 240(sp)
+// 0x0100e9b0: 0x100e9b0: lw    s6, 240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4854,7 +4854,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100e9a4: 0x100e9a4: lw    s5, 236(sp)
+// 0x0100e9b4: 0x100e9b4: lw    s5, 236(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4863,7 +4863,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100e9a8: 0x100e9a8: lw    s4, 232(sp)
+// 0x0100e9b8: 0x100e9b8: lw    s4, 232(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4872,7 +4872,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100e9ac: 0x100e9ac: lw    s3, 228(sp)
+// 0x0100e9bc: 0x100e9bc: lw    s3, 228(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4881,7 +4881,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100e9b0: 0x100e9b0: lw    s2, 224(sp)
+// 0x0100e9c0: 0x100e9c0: lw    s2, 224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4890,7 +4890,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100e9b4: 0x100e9b4: lw    s1, 220(sp)
+// 0x0100e9c4: 0x100e9c4: lw    s1, 220(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4899,7 +4899,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100e9b8: 0x100e9b8: lw    s0, 216(sp)
+// 0x0100e9c8: 0x100e9c8: lw    s0, 216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4908,7 +4908,7 @@ L_100e994:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100e9bc: 0x100e9bc: jr    ra addiu sp, sp, 256
+// 0x0100e9cc: 0x100e9cc: jr    ra addiu sp, sp, 256
 	ldloc.0
 	ldc.i4 256
 	add
@@ -4920,7 +4920,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_config_save_one_100e9c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_save_one_100e9d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 s2,int32 ra,int32 v1)
@@ -4964,12 +4964,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100e9c4: 0x100e9c4: addiu sp, sp, -32
+// 0x0100e9d4: 0x100e9d4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100e9c8: 0x100e9c8: sw    s0, 16(sp)
+// 0x0100e9d8: 0x100e9d8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4978,10 +4978,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100e9cc: 0x100e9cc: lui   s0, 0x0
+// 0x0100e9dc: 0x100e9dc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100e9d0: 0x100e9d0: sw    s2, 24(sp)
+// 0x0100e9e0: 0x100e9e0: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4990,7 +4990,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100e9d4: 0x100e9d4: sw    s1, 20(sp)
+// 0x0100e9e4: 0x100e9e4: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4999,22 +4999,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100e9d8: 0x100e9d8: sw    ra, 28(sp)
-// 0x0100e9dc: 0x100e9dc: addu  s2, a0, zero
+// 0x0100e9e8: 0x100e9e8: sw    ra, 28(sp)
+// 0x0100e9ec: 0x100e9ec: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100e9e0: 0x100e9e0: addu  s1, a1, zero
+// 0x0100e9f0: 0x100e9f0: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0100e9e4: 0x100e9e4: j	 0x100ea28 addiu s0, s0, 860
+// 0x0100e9f4: 0x100e9f4: j	 0x100ea38 addiu s0, s0, 860
 	ldloc 5
 	ldc.i4 860
 	add
 	stloc 5
-	br L_100ea28
+	br L_100ea38
 // --- basic block ---
-L_100e9ec:
-// 0x0100e9ec: 0x100e9ec: lw    v0, 28(s0)
+L_100e9fc:
+// 0x0100e9fc: 0x100e9fc: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5023,34 +5023,34 @@ L_100e9ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100e9f0: 0x100e9f0: sll   zero, zero, 0
-// 0x0100e9f4: 0x100e9f4: beq   v0, zero, 0x100ea24 sll   zero, zero, 0
+// 0x0100ea00: 0x100ea00: sll   zero, zero, 0
+// 0x0100ea04: 0x100ea04: beq   v0, zero, 0x100ea34 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_100ea24
+	brfalse L_100ea34
 // --- basic block ---
-// 0x0100e9fc: 0x100e9fc: jal   0x1001b14 sll   zero, zero, 0
+// 0x0100ea0c: 0x100ea0c: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0100ea04: 0x100ea04: bne   v0, zero, 0x100ea28 addiu s0, s0, 32
+// 0x0100ea14: 0x100ea14: bne   v0, zero, 0x100ea38 addiu s0, s0, 32
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 32
 	add
 	stloc 5
-	brtrue L_100ea28
+	brtrue L_100ea38
 // --- basic block ---
-// 0x0100ea0c: 0x100ea0c: addiu s0, s0, -32
+// 0x0100ea1c: 0x100ea1c: addiu s0, s0, -32
 	ldloc 5
 	ldc.i4.s -32
 	add
 	stloc 5
-// 0x0100ea10: 0x100ea10: addu  a0, s0, zero
+// 0x0100ea20: 0x100ea20: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ea14: 0x100ea14: jal   0x100e820 addu  a1, s1, zero
+// 0x0100ea24: 0x100ea24: jal   0x100e830 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5058,40 +5058,40 @@ L_100e9ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_update_100e820(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_update_100e830(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x0100ea1c: 0x100ea1c: j	 0x100ea38 sll   zero, zero, 0
-	br L_100ea38
+// 0x0100ea2c: 0x100ea2c: j	 0x100ea48 sll   zero, zero, 0
+	br L_100ea48
 // --- basic block ---
-L_100ea24:
-// 0x0100ea24: 0x100ea24: addiu s0, s0, 32
+L_100ea34:
+// 0x0100ea34: 0x100ea34: addiu s0, s0, 32
 	ldloc 5
 	ldc.i4.s 32
 	add
 	stloc 5
-L_100ea28:
-// 0x0100ea28: 0x100ea28: lw    v0, 0(s0)
+L_100ea38:
+// 0x0100ea38: 0x100ea38: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100ea2c: 0x100ea2c: addu  a0, s2, zero
+// 0x0100ea3c: 0x100ea3c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0100ea30: 0x100ea30: bne   v0, zero, 0x100e9ec addu  a1, v0, zero
+// 0x0100ea40: 0x100ea40: bne   v0, zero, 0x100e9fc addu  a1, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.2
-	brtrue L_100e9ec
+	brtrue L_100e9fc
 // --- basic block ---
-L_100ea38:
-// 0x0100ea38: 0x100ea38: lw    ra, 28(sp)
-// 0x0100ea3c: 0x100ea3c: lw    s2, 24(sp)
+L_100ea48:
+// 0x0100ea48: 0x100ea48: lw    ra, 28(sp)
+// 0x0100ea4c: 0x100ea4c: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5100,7 +5100,7 @@ L_100ea38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100ea40: 0x100ea40: lw    s1, 20(sp)
+// 0x0100ea50: 0x100ea50: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5109,7 +5109,7 @@ L_100ea38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100ea44: 0x100ea44: lw    s0, 16(sp)
+// 0x0100ea54: 0x100ea54: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5118,7 +5118,7 @@ L_100ea38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ea48: 0x100ea48: jr    ra addiu sp, sp, 32
+// 0x0100ea58: 0x100ea58: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5130,7 +5130,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -5171,12 +5171,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100ea50: 0x100ea50: addiu sp, sp, -32
+// 0x0100ea60: 0x100ea60: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100ea54: 0x100ea54: sw    s0, 20(sp)
+// 0x0100ea64: 0x100ea64: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5185,10 +5185,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100ea58: 0x100ea58: lui   s0, 0x0
+// 0x0100ea68: 0x100ea68: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100ea5c: 0x100ea5c: sw    s1, 24(sp)
+// 0x0100ea6c: 0x100ea6c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5197,19 +5197,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100ea60: 0x100ea60: sw    ra, 28(sp)
-// 0x0100ea64: 0x100ea64: addu  s1, a0, zero
+// 0x0100ea70: 0x100ea70: sw    ra, 28(sp)
+// 0x0100ea74: 0x100ea74: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0100ea68: 0x100ea68: j	 0x100ea8c addiu s0, s0, 860
+// 0x0100ea78: 0x100ea78: j	 0x100ea9c addiu s0, s0, 860
 	ldloc 5
 	ldc.i4 860
 	add
 	stloc 5
-	br L_100ea8c
+	br L_100ea9c
 // --- basic block ---
-L_100ea70:
-// 0x0100ea70: 0x100ea70: lw    v0, 28(s0)
+L_100ea80:
+// 0x0100ea80: 0x100ea80: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5218,14 +5218,14 @@ L_100ea70:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ea74: 0x100ea74: sll   zero, zero, 0
-// 0x0100ea78: 0x100ea78: beq   v0, zero, 0x100ea88 addu  a0, s0, zero
+// 0x0100ea84: 0x100ea84: sll   zero, zero, 0
+// 0x0100ea88: 0x100ea88: beq   v0, zero, 0x100ea98 addu  a0, s0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brfalse L_100ea88
+	brfalse L_100ea98
 // --- basic block ---
-// 0x0100ea80: 0x100ea80: jal   0x100e820 addu  a1, s1, zero
+// 0x0100ea90: 0x100ea90: jal   0x100e830 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5233,32 +5233,32 @@ L_100ea70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_update_100e820(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_update_100e830(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-L_100ea88:
-// 0x0100ea88: 0x100ea88: addiu s0, s0, 32
+L_100ea98:
+// 0x0100ea98: 0x100ea98: addiu s0, s0, 32
 	ldloc 5
 	ldc.i4.s 32
 	add
 	stloc 5
-L_100ea8c:
-// 0x0100ea8c: 0x100ea8c: lw    v0, 0(s0)
+L_100ea9c:
+// 0x0100ea9c: 0x100ea9c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100ea90: 0x100ea90: sll   zero, zero, 0
-// 0x0100ea94: 0x100ea94: bne   v0, zero, 0x100ea70 sll   zero, zero, 0
+// 0x0100eaa0: 0x100eaa0: sll   zero, zero, 0
+// 0x0100eaa4: 0x100eaa4: bne   v0, zero, 0x100ea80 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_100ea70
+	brtrue L_100ea80
 // --- basic block ---
-// 0x0100ea9c: 0x100ea9c: lw    ra, 28(sp)
-// 0x0100eaa0: 0x100eaa0: lw    s1, 24(sp)
+// 0x0100eaac: 0x100eaac: lw    ra, 28(sp)
+// 0x0100eab0: 0x100eab0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5267,7 +5267,7 @@ L_100ea8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100eaa4: 0x100eaa4: lw    s0, 20(sp)
+// 0x0100eab4: 0x100eab4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5276,7 +5276,7 @@ L_100ea8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100eaa8: 0x100eaa8: jr    ra addiu sp, sp, 32
+// 0x0100eab8: 0x100eab8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5288,7 +5288,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_config_add_enumeration_value_100eab0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_add_enumeration_value_100eac0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 v1,int32 ra)
@@ -5335,13 +5335,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100eab0: 0x100eab0: addiu sp, sp, -40
+// 0x0100eac0: 0x100eac0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100eab4: 0x100eab4: sw    ra, 36(sp)
-// 0x0100eab8: 0x100eab8: sw    s3, 32(sp)
+// 0x0100eac4: 0x100eac4: sw    ra, 36(sp)
+// 0x0100eac8: 0x100eac8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5350,7 +5350,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100eabc: 0x100eabc: sw    s2, 28(sp)
+// 0x0100eacc: 0x100eacc: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5359,7 +5359,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100eac0: 0x100eac0: sw    s0, 20(sp)
+// 0x0100ead0: 0x100ead0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5368,7 +5368,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100eac4: 0x100eac4: sw    s1, 24(sp)
+// 0x0100ead4: 0x100ead4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5377,13 +5377,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100eac8: 0x100eac8: addu  s2, a0, zero
+// 0x0100ead8: 0x100ead8: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100eacc: 0x100eacc: addiu a0, zero, 8
+// 0x0100eadc: 0x100eadc: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x0100ead0: 0x100ead0: lw    s1, 36(s2)
+// 0x0100eae0: 0x100eae0: lw    s1, 36(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5392,7 +5392,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ead4: 0x100ead4: jal   0x1000910 addu  s3, a1, zero
+// 0x0100eae4: 0x100eae4: jal   0x1000910 addu  s3, a1, zero
 	ldloc.2
 	stloc 10
 	ldloc.0
@@ -5405,21 +5405,21 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0100eadc: 0x100eadc: lui   a0, 0x0
+// 0x0100eaec: 0x100eaec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100eae0: 0x100eae0: addiu a0, a0, 25908
+// 0x0100eaf0: 0x100eaf0: addiu a0, a0, 25908
 	ldloc.1
 	ldc.i4 25908
 	add
 	stloc.1
-// 0x0100eae4: 0x100eae4: addiu a1, zero, 328
+// 0x0100eaf4: 0x100eaf4: addiu a1, zero, 328
 	ldc.i4 328
 	stloc.2
-// 0x0100eae8: 0x100eae8: addu  a2, v0, zero
+// 0x0100eaf8: 0x100eaf8: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0100eaec: 0x100eaec: jal   0x1004a38 addu  s0, v0, zero
+// 0x0100eafc: 0x100eafc: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -5427,15 +5427,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0100eaf4: 0x100eaf4: addu  a0, s3, zero
+// 0x0100eb04: 0x100eb04: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0100eaf8: 0x100eaf8: jal   0x1001ba8 sw    zero, 0(s0)
+// 0x0100eb08: 0x100eb08: jal   0x1001ba8 sw    zero, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5452,7 +5452,7 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0100eb00: 0x100eb00: bne   s1, zero, 0x100eb10 sw    v0, 4(s0)
+// 0x0100eb10: 0x100eb10: bne   s1, zero, 0x100eb20 sw    v0, 4(s0)
 	ldloc 7
 	ldloc 5
 	ldloc 8
@@ -5462,9 +5462,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_100eb10
+	brtrue L_100eb20
 // --- basic block ---
-// 0x0100eb08: 0x100eb08: j	 0x100eb28 sw    s0, 36(s2)
+// 0x0100eb18: 0x100eb18: j	 0x100eb38 sw    s0, 36(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5473,34 +5473,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	br L_100eb28
+	br L_100eb38
 // --- basic block ---
-L_100eb10:
-// 0x0100eb10: 0x100eb10: addu  v0, s1, zero
+L_100eb20:
+// 0x0100eb20: 0x100eb20: addu  v0, s1, zero
 	ldloc 7
 	stloc 6
-// 0x0100eb14: 0x100eb14: lw    s1, 0(s1)
+// 0x0100eb24: 0x100eb24: lw    s1, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100eb18: 0x100eb18: sll   zero, zero, 0
-// 0x0100eb1c: 0x100eb1c: bne   s1, zero, 0x100eb10 sll   zero, zero, 0
+// 0x0100eb28: 0x100eb28: sll   zero, zero, 0
+// 0x0100eb2c: 0x100eb2c: bne   s1, zero, 0x100eb20 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_100eb10
+	brtrue L_100eb20
 // --- basic block ---
-// 0x0100eb24: 0x100eb24: sw    s0, 0(v0)
+// 0x0100eb34: 0x100eb34: sw    s0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_100eb28:
-// 0x0100eb28: 0x100eb28: lw    ra, 36(sp)
-// 0x0100eb2c: 0x100eb2c: lw    s3, 32(sp)
+L_100eb38:
+// 0x0100eb38: 0x100eb38: lw    ra, 36(sp)
+// 0x0100eb3c: 0x100eb3c: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5509,7 +5509,7 @@ L_100eb28:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100eb30: 0x100eb30: lw    s2, 28(sp)
+// 0x0100eb40: 0x100eb40: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5518,7 +5518,7 @@ L_100eb28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100eb34: 0x100eb34: lw    s1, 24(sp)
+// 0x0100eb44: 0x100eb44: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5527,7 +5527,7 @@ L_100eb28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100eb38: 0x100eb38: lw    s0, 20(sp)
+// 0x0100eb48: 0x100eb48: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5536,7 +5536,7 @@ L_100eb28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100eb3c: 0x100eb3c: jr    ra addiu sp, sp, 40
+// 0x0100eb4c: 0x100eb4c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5548,7 +5548,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_config_new_item_100eb44(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_new_item_100eb54(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s5,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s6,int32 s7,int32 ra,int32 t0)
@@ -5610,12 +5610,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100eb44: 0x100eb44: addiu sp, sp, -72
+// 0x0100eb54: 0x100eb54: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0100eb48: 0x100eb48: sw    s1, 40(sp)
+// 0x0100eb58: 0x100eb58: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5624,17 +5624,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100eb4c: 0x100eb4c: andi  s1, a3, 255
+// 0x0100eb5c: 0x100eb5c: andi  s1, a3, 255
 	ldloc 4
 	ldc.i4 255
 	and
 	stloc 9
-// 0x0100eb50: 0x100eb50: andi  v0, s1, 16
+// 0x0100eb60: 0x100eb60: andi  v0, s1, 16
 	ldloc 9
 	ldc.i4.s 16
 	and
 	stloc 6
-// 0x0100eb54: 0x100eb54: sw    s7, 64(sp)
+// 0x0100eb64: 0x100eb64: sw    s7, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5643,7 +5643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100eb58: 0x100eb58: sw    s6, 60(sp)
+// 0x0100eb68: 0x100eb68: sw    s6, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5652,7 +5652,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100eb5c: 0x100eb5c: sw    s4, 52(sp)
+// 0x0100eb6c: 0x100eb6c: sw    s4, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5661,7 +5661,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100eb60: 0x100eb60: sw    s3, 48(sp)
+// 0x0100eb70: 0x100eb70: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5670,7 +5670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100eb64: 0x100eb64: sw    s2, 44(sp)
+// 0x0100eb74: 0x100eb74: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5679,8 +5679,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100eb68: 0x100eb68: sw    ra, 68(sp)
-// 0x0100eb6c: 0x100eb6c: sw    s5, 56(sp)
+// 0x0100eb78: 0x100eb78: sw    ra, 68(sp)
+// 0x0100eb7c: 0x100eb7c: sw    s5, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5689,7 +5689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100eb70: 0x100eb70: sw    s0, 36(sp)
+// 0x0100eb80: 0x100eb80: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5698,13 +5698,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100eb74: 0x100eb74: addu  s7, a2, zero
+// 0x0100eb84: 0x100eb84: addu  s7, a2, zero
 	ldloc.3
 	stloc 15
-// 0x0100eb78: 0x100eb78: addu  s3, a0, zero
+// 0x0100eb88: 0x100eb88: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x0100eb7c: 0x100eb7c: lw    s6, 88(sp)
+// 0x0100eb8c: 0x100eb8c: lw    s6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5713,7 +5713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100eb80: 0x100eb80: lw    s4, 92(sp)
+// 0x0100eb90: 0x100eb90: lw    s4, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5722,42 +5722,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100eb84: 0x100eb84: beq   v0, zero, 0x100eb94 addu  s2, a1, zero
+// 0x0100eb94: 0x100eb94: beq   v0, zero, 0x100eba4 addu  s2, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 11
-	brfalse L_100eb94
+	brfalse L_100eba4
 // --- basic block ---
-// 0x0100eb8c: 0x100eb8c: j	 0x100ec50 andi  s1, s1, 239
+// 0x0100eb9c: 0x100eb9c: j	 0x100ec60 andi  s1, s1, 239
 	ldloc 9
 	ldc.i4 239
 	and
 	stloc 9
-	br L_100ec50
+	br L_100ec60
 // --- basic block ---
-L_100eb94:
-// 0x0100eb94: 0x100eb94: jal   0x100e1f8 sll   zero, zero, 0
+L_100eba4:
+// 0x0100eba4: 0x100eba4: jal   0x100e208 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_item_100e1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_item_100e208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100eb9c: 0x100eb9c: beq   v0, zero, 0x100ec50 addu  s0, v0, zero
+// 0x0100ebac: 0x100ebac: beq   v0, zero, 0x100ec60 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brfalse L_100ec50
+	brfalse L_100ec60
 // --- basic block ---
-// 0x0100eba4: 0x100eba4: beq   s6, zero, 0x100ebb0 sll   zero, zero, 0
+// 0x0100ebb4: 0x100ebb4: beq   s6, zero, 0x100ebc0 sll   zero, zero, 0
 	ldloc 14
-	brfalse L_100ebb0
+	brfalse L_100ebc0
 // --- basic block ---
-// 0x0100ebac: 0x100ebac: sw    s6, 32(v0)
+// 0x0100ebbc: 0x100ebbc: sw    s6, 32(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5766,17 +5766,17 @@ L_100eb94:
 	add
 	ldloc 14
 	stelem.i4
-L_100ebb0:
-// 0x0100ebb0: 0x100ebb0: lb    v0, 0(s7)
+L_100ebc0:
+// 0x0100ebc0: 0x100ebc0: lb    v0, 0(s7)
 	ldloc 15
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0100ebb4: 0x100ebb4: sll   zero, zero, 0
-// 0x0100ebb8: 0x100ebb8: beq   v0, zero, 0x100ebe4 sll   zero, zero, 0
+// 0x0100ebc4: 0x100ebc4: sll   zero, zero, 0
+// 0x0100ebc8: 0x100ebc8: beq   v0, zero, 0x100ebf4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_100ebe4
+	brfalse L_100ebf4
 // --- basic block ---
-// 0x0100ebc0: 0x100ebc0: lw    v0, 16(s0)
+// 0x0100ebd0: 0x100ebd0: lw    v0, 16(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5785,17 +5785,17 @@ L_100ebb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ebc4: 0x100ebc4: sll   zero, zero, 0
-// 0x0100ebc8: 0x100ebc8: lb    v0, 0(v0)
+// 0x0100ebd4: 0x100ebd4: sll   zero, zero, 0
+// 0x0100ebd8: 0x100ebd8: lb    v0, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0100ebcc: 0x100ebcc: sll   zero, zero, 0
-// 0x0100ebd0: 0x100ebd0: bne   v0, zero, 0x100ebe4 sll   zero, zero, 0
+// 0x0100ebdc: 0x100ebdc: sll   zero, zero, 0
+// 0x0100ebe0: 0x100ebe0: bne   v0, zero, 0x100ebf4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_100ebe4
+	brtrue L_100ebf4
 // --- basic block ---
-// 0x0100ebd8: 0x100ebd8: jal   0x1001ba8 addu  a0, s7, zero
+// 0x0100ebe8: 0x100ebe8: jal   0x1001ba8 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -5808,7 +5808,7 @@ L_100ebb0:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100ebe0: 0x100ebe0: sw    v0, 16(s0)
+// 0x0100ebf0: 0x100ebf0: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5817,37 +5817,37 @@ L_100ebb0:
 	add
 	ldloc 6
 	stelem.i4
-L_100ebe4:
-// 0x0100ebe4: 0x100ebe4: beq   s1, zero, 0x100ec40 sll   zero, zero, 0
+L_100ebf4:
+// 0x0100ebf4: 0x100ebf4: beq   s1, zero, 0x100ec50 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_100ec40
+	brfalse L_100ec50
 // --- basic block ---
-// 0x0100ebec: 0x100ebec: lbu   v0, 24(s0)
+// 0x0100ebfc: 0x100ebfc: lbu   v0, 24(s0)
 	ldloc 10
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x0100ebf0: 0x100ebf0: sll   zero, zero, 0
-// 0x0100ebf4: 0x100ebf4: beq   v0, s1, 0x100ec40 sll   zero, zero, 0
+// 0x0100ec00: 0x100ec00: sll   zero, zero, 0
+// 0x0100ec04: 0x100ec04: beq   v0, s1, 0x100ec50 sll   zero, zero, 0
 	ldloc 6
 	ldloc 9
-	beq  L_100ec40
+	beq  L_100ec50
 // --- basic block ---
-// 0x0100ebfc: 0x100ebfc: beq   v0, zero, 0x100ec3c lui   a1, 0x0
+// 0x0100ec0c: 0x100ec0c: beq   v0, zero, 0x100ec4c lui   a1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_100ec3c
+	brfalse L_100ec4c
 // --- basic block ---
-// 0x0100ec04: 0x100ec04: lw    t0, 0(s2)
+// 0x0100ec14: 0x100ec14: lw    t0, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 17
-// 0x0100ec08: 0x100ec08: lw    v1, 4(s2)
+// 0x0100ec18: 0x100ec18: lw    v1, 4(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -5856,26 +5856,26 @@ L_100ebe4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100ec0c: 0x100ec0c: lui   a3, 0x0
+// 0x0100ec1c: 0x100ec1c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100ec10: 0x100ec10: addiu a1, a1, 25908
+// 0x0100ec20: 0x100ec20: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100ec14: 0x100ec14: addiu a3, a3, 26084
+// 0x0100ec24: 0x100ec24: addiu a3, a3, 26084
 	ldloc 4
 	ldc.i4 26084
 	add
 	stloc 4
-// 0x0100ec18: 0x100ec18: addiu a0, zero, 4
+// 0x0100ec28: 0x100ec28: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100ec1c: 0x100ec1c: addiu a2, zero, 268
+// 0x0100ec2c: 0x100ec2c: addiu a2, zero, 268
 	ldc.i4 268
 	stloc.3
-// 0x0100ec20: 0x100ec20: sw    t0, 16(sp)
+// 0x0100ec30: 0x100ec30: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5884,7 +5884,7 @@ L_100ebe4:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0100ec24: 0x100ec24: sw    v1, 20(sp)
+// 0x0100ec34: 0x100ec34: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5893,7 +5893,7 @@ L_100ebe4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100ec28: 0x100ec28: sw    v0, 24(sp)
+// 0x0100ec38: 0x100ec38: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5902,7 +5902,7 @@ L_100ebe4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100ec2c: 0x100ec2c: jal   0x100449c sw    s1, 28(sp)
+// 0x0100ec3c: 0x100ec3c: jal   0x100449c sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5921,32 +5921,32 @@ L_100ebe4:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100ec34: 0x100ec34: j	 0x100ec40 sll   zero, zero, 0
-	br L_100ec40
+// 0x0100ec44: 0x100ec44: j	 0x100ec50 sll   zero, zero, 0
+	br L_100ec50
 // --- basic block ---
-L_100ec3c:
-// 0x0100ec3c: 0x100ec3c: sb    s1, 24(s0)
+L_100ec4c:
+// 0x0100ec4c: 0x100ec4c: sb    s1, 24(s0)
 	ldloc 10
 	ldc.i4.s 24
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_100ec40:
-// 0x0100ec40: 0x100ec40: beq   s4, zero, 0x100ecf4 sll   zero, zero, 0
+L_100ec50:
+// 0x0100ec50: 0x100ec50: beq   s4, zero, 0x100ed04 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_100ecf4
+	brfalse L_100ed04
 // --- basic block ---
-// 0x0100ec48: 0x100ec48: j	 0x100ecf4 sw    zero, 0(s4)
+// 0x0100ec58: 0x100ec58: j	 0x100ed04 sw    zero, 0(s4)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_100ecf4
+	br L_100ed04
 // --- basic block ---
-L_100ec50:
-// 0x0100ec50: 0x100ec50: jal   0x1000910 addiu a0, zero, 40
+L_100ec60:
+// 0x0100ec60: 0x100ec60: jal   0x1000910 addiu a0, zero, 40
 	ldc.i4.s 40
 	stloc.1
 	ldloc.0
@@ -5959,16 +5959,16 @@ L_100ec50:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100ec58: 0x100ec58: addu  a0, v0, zero
+// 0x0100ec68: 0x100ec68: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0100ec5c: 0x100ec5c: addu  a1, zero, zero
+// 0x0100ec6c: 0x100ec6c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0100ec60: 0x100ec60: addiu a2, zero, 40
+// 0x0100ec70: 0x100ec70: addiu a2, zero, 40
 	ldc.i4.s 40
 	stloc.3
-// 0x0100ec64: 0x100ec64: jal   0x100177c addu  s5, v0, zero
+// 0x0100ec74: 0x100ec74: jal   0x100177c addu  s5, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -5980,18 +5980,18 @@ L_100ec50:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100ec6c: 0x100ec6c: lui   a0, 0x0
+// 0x0100ec7c: 0x100ec7c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100ec70: 0x100ec70: addiu a0, a0, 25908
+// 0x0100ec80: 0x100ec80: addiu a0, a0, 25908
 	ldloc.1
 	ldc.i4 25908
 	add
 	stloc.1
-// 0x0100ec74: 0x100ec74: addiu a1, zero, 284
+// 0x0100ec84: 0x100ec84: addiu a1, zero, 284
 	ldc.i4 284
 	stloc.2
-// 0x0100ec78: 0x100ec78: jal   0x1004a38 addu  a2, s5, zero
+// 0x0100ec88: 0x100ec88: jal   0x1004a48 addu  a2, s5, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -5999,16 +5999,16 @@ L_100ec50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100ec80: 0x100ec80: lb    v0, 0(s7)
+// 0x0100ec90: 0x100ec90: lb    v0, 0(s7)
 	ldloc 15
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0100ec84: 0x100ec84: lw    a0, 4(s2)
+// 0x0100ec94: 0x100ec94: lw    a0, 4(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6017,14 +6017,14 @@ L_100ec50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100ec88: 0x100ec88: lw    v1, 0(s2)
+// 0x0100ec98: 0x100ec98: lw    v1, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100ec8c: 0x100ec8c: sw    s3, 4(s5)
+// 0x0100ec9c: 0x100ec9c: sw    s3, 4(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6033,7 +6033,7 @@ L_100ec50:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100ec90: 0x100ec90: sw    a0, 12(s5)
+// 0x0100eca0: 0x100eca0: sw    a0, 12(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6042,7 +6042,7 @@ L_100ec50:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100ec94: 0x100ec94: sw    v1, 8(s5)
+// 0x0100eca4: 0x100eca4: sw    v1, 8(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6051,21 +6051,21 @@ L_100ec50:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100ec98: 0x100ec98: bne   v0, zero, 0x100ecb0 addu  s0, s5, zero
+// 0x0100eca8: 0x100eca8: bne   v0, zero, 0x100ecc0 addu  s0, s5, zero
 	ldloc 6
 	ldloc 7
 	stloc 10
-	brtrue L_100ecb0
+	brtrue L_100ecc0
 // --- basic block ---
-// 0x0100eca0: 0x100eca0: lui   v0, 0x10000
+// 0x0100ecb0: 0x100ecb0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0100eca4: 0x100eca4: addiu v0, v0, 18500
+// 0x0100ecb4: 0x100ecb4: addiu v0, v0, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-// 0x0100eca8: 0x100eca8: j	 0x100ecb4 sw    v0, 16(s5)
+// 0x0100ecb8: 0x100ecb8: j	 0x100ecc4 sw    v0, 16(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6074,10 +6074,10 @@ L_100ec50:
 	add
 	ldloc 6
 	stelem.i4
-	br L_100ecb4
+	br L_100ecc4
 // --- basic block ---
-L_100ecb0:
-// 0x0100ecb0: 0x100ecb0: sw    s7, 16(s5)
+L_100ecc0:
+// 0x0100ecc0: 0x100ecc0: sw    s7, 16(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6086,14 +6086,14 @@ L_100ecb0:
 	add
 	ldloc 15
 	stelem.i4
-L_100ecb4:
-// 0x0100ecb4: 0x100ecb4: sb    s1, 24(s5)
+L_100ecc4:
+// 0x0100ecc4: 0x100ecc4: sb    s1, 24(s5)
 	ldloc 7
 	ldc.i4.s 24
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100ecb8: 0x100ecb8: sw    zero, 20(s5)
+// 0x0100ecc8: 0x100ecc8: sw    zero, 20(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6102,22 +6102,22 @@ L_100ecb4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100ecbc: 0x100ecbc: sb    zero, 25(s5)
+// 0x0100eccc: 0x100eccc: sb    zero, 25(s5)
 	ldloc 7
 	ldc.i4.s 25
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100ecc0: 0x100ecc0: beq   s6, zero, 0x100eccc sb    zero, 26(s5)
+// 0x0100ecd0: 0x100ecd0: beq   s6, zero, 0x100ecdc sb    zero, 26(s5)
 	ldloc 14
 	ldloc 7
 	ldc.i4.s 26
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brfalse L_100eccc
+	brfalse L_100ecdc
 // --- basic block ---
-// 0x0100ecc8: 0x100ecc8: sw    s6, 32(s5)
+// 0x0100ecd8: 0x100ecd8: sw    s6, 32(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6126,8 +6126,8 @@ L_100ecb4:
 	add
 	ldloc 14
 	stelem.i4
-L_100eccc:
-// 0x0100eccc: 0x100eccc: lw    v1, 16(s3)
+L_100ecdc:
+// 0x0100ecdc: 0x100ecdc: lw    v1, 16(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -6136,7 +6136,7 @@ L_100eccc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100ecd0: 0x100ecd0: lw    v0, 20(s3)
+// 0x0100ece0: 0x100ece0: lw    v0, 20(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -6145,8 +6145,8 @@ L_100eccc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ecd4: 0x100ecd4: sll   zero, zero, 0
-// 0x0100ecd8: 0x100ecd8: bne   v0, zero, 0x100ece4 sw    v1, 0(s5)
+// 0x0100ece4: 0x100ece4: sll   zero, zero, 0
+// 0x0100ece8: 0x100ece8: bne   v0, zero, 0x100ecf4 sw    v1, 0(s5)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -6154,9 +6154,9 @@ L_100eccc:
 	shr.un
 	ldloc 8
 	stelem.i4
-	brtrue L_100ece4
+	brtrue L_100ecf4
 // --- basic block ---
-// 0x0100ece0: 0x100ece0: sw    s5, 20(s3)
+// 0x0100ecf0: 0x100ecf0: sw    s5, 20(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -6165,8 +6165,8 @@ L_100eccc:
 	add
 	ldloc 7
 	stelem.i4
-L_100ece4:
-// 0x0100ece4: 0x100ece4: beq   s4, zero, 0x100ecf4 sw    s5, 16(s3)
+L_100ecf4:
+// 0x0100ecf4: 0x100ecf4: beq   s4, zero, 0x100ed04 sw    s5, 16(s3)
 	ldloc 13
 	ldloc 5
 	ldloc 12
@@ -6176,20 +6176,20 @@ L_100ece4:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_100ecf4
+	brfalse L_100ed04
 // --- basic block ---
-// 0x0100ecec: 0x100ecec: addiu v0, zero, 1
+// 0x0100ecfc: 0x100ecfc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0100ecf0: 0x100ecf0: sw    v0, 0(s4)
+// 0x0100ed00: 0x100ed00: sw    v0, 0(s4)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_100ecf4:
-// 0x0100ecf4: 0x100ecf4: lw    v0, 24(s3)
+L_100ed04:
+// 0x0100ed04: 0x100ed04: lw    v0, 24(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -6198,8 +6198,8 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ecf8: 0x100ecf8: lw    ra, 68(sp)
-// 0x0100ecfc: 0x100ecfc: sw    s0, 12(s2)
+// 0x0100ed08: 0x100ed08: lw    ra, 68(sp)
+// 0x0100ed0c: 0x100ed0c: sw    s0, 12(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6208,7 +6208,7 @@ L_100ecf4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100ed00: 0x100ed00: sw    v0, 8(s2)
+// 0x0100ed10: 0x100ed10: sw    v0, 8(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6217,7 +6217,7 @@ L_100ecf4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100ed04: 0x100ed04: lw    s7, 64(sp)
+// 0x0100ed14: 0x100ed14: lw    s7, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6226,10 +6226,10 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100ed08: 0x100ed08: addu  v0, s0, zero
+// 0x0100ed18: 0x100ed18: addu  v0, s0, zero
 	ldloc 10
 	stloc 6
-// 0x0100ed0c: 0x100ed0c: lw    s6, 60(sp)
+// 0x0100ed1c: 0x100ed1c: lw    s6, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6238,7 +6238,7 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100ed10: 0x100ed10: lw    s5, 56(sp)
+// 0x0100ed20: 0x100ed20: lw    s5, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6247,7 +6247,7 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ed14: 0x100ed14: lw    s4, 52(sp)
+// 0x0100ed24: 0x100ed24: lw    s4, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6256,7 +6256,7 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100ed18: 0x100ed18: lw    s3, 48(sp)
+// 0x0100ed28: 0x100ed28: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6265,7 +6265,7 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100ed1c: 0x100ed1c: lw    s2, 44(sp)
+// 0x0100ed2c: 0x100ed2c: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6274,7 +6274,7 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100ed20: 0x100ed20: lw    s1, 40(sp)
+// 0x0100ed30: 0x100ed30: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6283,7 +6283,7 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100ed24: 0x100ed24: lw    s0, 36(sp)
+// 0x0100ed34: 0x100ed34: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6292,7 +6292,7 @@ L_100ecf4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100ed28: 0x100ed28: jr    ra addiu sp, sp, 72
+// 0x0100ed38: 0x100ed38: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -6304,7 +6304,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_config_declare_password_100ed70(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_declare_password_100ed80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -6339,13 +6339,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100ed70: 0x100ed70: addiu sp, sp, -40
+// 0x0100ed80: 0x100ed80: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100ed74: 0x100ed74: sw    ra, 36(sp)
-// 0x0100ed78: 0x100ed78: sw    a1, 24(sp)
+// 0x0100ed84: 0x100ed84: sw    ra, 36(sp)
+// 0x0100ed88: 0x100ed88: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6354,7 +6354,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100ed7c: 0x100ed7c: jal   0x100e0d8 sw    a2, 28(sp)
+// 0x0100ed8c: 0x100ed8c: jal   0x100e0e8 sw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6368,12 +6368,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_file_100e0d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_file_100e0e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100ed84: 0x100ed84: lw    a1, 24(sp)
+// 0x0100ed94: 0x100ed94: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6382,7 +6382,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100ed88: 0x100ed88: lw    a2, 28(sp)
+// 0x0100ed98: 0x100ed98: lw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6391,13 +6391,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100ed8c: 0x100ed8c: addu  a0, v0, zero
+// 0x0100ed9c: 0x100ed9c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0100ed90: 0x100ed90: addiu a3, zero, 3
+// 0x0100eda0: 0x100eda0: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x0100ed94: 0x100ed94: sw    zero, 16(sp)
+// 0x0100eda4: 0x100eda4: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6406,7 +6406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100ed98: 0x100ed98: jal   0x100eb44 sw    zero, 20(sp)
+// 0x0100eda8: 0x100eda8: jal   0x100eb54 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6420,14 +6420,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_new_item_100eb44(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_new_item_100eb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100eda0: 0x100eda0: lw    ra, 36(sp)
-// 0x0100eda4: 0x100eda4: sll   zero, zero, 0
-// 0x0100eda8: 0x100eda8: jr    ra addiu sp, sp, 40
+// 0x0100edb0: 0x100edb0: lw    ra, 36(sp)
+// 0x0100edb4: 0x100edb4: sll   zero, zero, 0
+// 0x0100edb8: 0x100edb8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6439,7 +6439,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -6477,13 +6477,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100edb0: 0x100edb0: addiu sp, sp, -40
+// 0x0100edc0: 0x100edc0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100edb4: 0x100edb4: sw    ra, 36(sp)
-// 0x0100edb8: 0x100edb8: sw    s0, 32(sp)
+// 0x0100edc4: 0x100edc4: sw    ra, 36(sp)
+// 0x0100edc8: 0x100edc8: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6492,7 +6492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100edbc: 0x100edbc: sw    a1, 24(sp)
+// 0x0100edcc: 0x100edcc: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6501,10 +6501,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100edc0: 0x100edc0: addu  s0, a3, zero
+// 0x0100edd0: 0x100edd0: addu  s0, a3, zero
 	ldloc 4
 	stloc 6
-// 0x0100edc4: 0x100edc4: jal   0x100e0d8 sw    a2, 28(sp)
+// 0x0100edd4: 0x100edd4: jal   0x100e0e8 sw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6518,12 +6518,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_file_100e0d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_file_100e0e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0100edcc: 0x100edcc: lw    a1, 24(sp)
+// 0x0100eddc: 0x100eddc: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6532,7 +6532,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100edd0: 0x100edd0: lw    a2, 28(sp)
+// 0x0100ede0: 0x100ede0: lw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6541,13 +6541,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100edd4: 0x100edd4: addu  a0, v0, zero
+// 0x0100ede4: 0x100ede4: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x0100edd8: 0x100edd8: addu  a3, zero, zero
+// 0x0100ede8: 0x100ede8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0100eddc: 0x100eddc: sw    s0, 20(sp)
+// 0x0100edec: 0x100edec: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6556,7 +6556,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100ede0: 0x100ede0: jal   0x100eb44 sw    zero, 16(sp)
+// 0x0100edf0: 0x100edf0: jal   0x100eb54 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6570,13 +6570,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_new_item_100eb44(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_new_item_100eb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0100ede8: 0x100ede8: lw    ra, 36(sp)
-// 0x0100edec: 0x100edec: lw    s0, 32(sp)
+// 0x0100edf8: 0x100edf8: lw    ra, 36(sp)
+// 0x0100edfc: 0x100edfc: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6585,7 +6585,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100edf0: 0x100edf0: jr    ra addiu sp, sp, 40
+// 0x0100ee00: 0x100ee00: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6597,7 +6597,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -6641,13 +6641,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100edf8: 0x100edf8: addiu sp, sp, -56
+// 0x0100ee08: 0x100ee08: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0100edfc: 0x100edfc: sw    ra, 52(sp)
-// 0x0100ee00: 0x100ee00: sw    s1, 44(sp)
+// 0x0100ee0c: 0x100ee0c: sw    ra, 52(sp)
+// 0x0100ee10: 0x100ee10: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6656,7 +6656,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100ee04: 0x100ee04: sw    s0, 40(sp)
+// 0x0100ee14: 0x100ee14: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6665,13 +6665,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100ee08: 0x100ee08: addu  s1, a2, zero
+// 0x0100ee18: 0x100ee18: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0100ee0c: 0x100ee0c: addu  s0, a3, zero
+// 0x0100ee1c: 0x100ee1c: addu  s0, a3, zero
 	ldloc 4
 	stloc 9
-// 0x0100ee10: 0x100ee10: sw    a1, 32(sp)
+// 0x0100ee20: 0x100ee20: sw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6680,7 +6680,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100ee14: 0x100ee14: jal   0x100e0d8 sw    s2, 48(sp)
+// 0x0100ee24: 0x100ee24: jal   0x100e0e8 sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6694,12 +6694,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_search_file_100e0d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_search_file_100e0e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100ee1c: 0x100ee1c: lw    a1, 32(sp)
+// 0x0100ee2c: 0x100ee2c: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6708,16 +6708,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100ee20: 0x100ee20: addu  a0, v0, zero
+// 0x0100ee30: 0x100ee30: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0100ee24: 0x100ee24: addu  a2, s0, zero
+// 0x0100ee34: 0x100ee34: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x0100ee28: 0x100ee28: addiu a3, zero, 1
+// 0x0100ee38: 0x100ee38: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0100ee2c: 0x100ee2c: sw    s1, 16(sp)
+// 0x0100ee3c: 0x100ee3c: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6726,7 +6726,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100ee30: 0x100ee30: jal   0x100eb44 sw    zero, 20(sp)
+// 0x0100ee40: 0x100ee40: jal   0x100eb54 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6740,12 +6740,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_new_item_100eb44(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_new_item_100eb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100ee38: 0x100ee38: lw    s1, 36(v0)
+// 0x0100ee48: 0x100ee48: lw    s1, 36(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6754,11 +6754,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100ee3c: 0x100ee3c: j	 0x100ee68 sll   zero, zero, 0
-	br L_100ee68
+// 0x0100ee4c: 0x100ee4c: j	 0x100ee78 sll   zero, zero, 0
+	br L_100ee78
 // --- basic block ---
-L_100ee44:
-// 0x0100ee44: 0x100ee44: lw    a0, 4(s1)
+L_100ee54:
+// 0x0100ee54: 0x100ee54: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6767,7 +6767,7 @@ L_100ee44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100ee48: 0x100ee48: sw    v0, 32(sp)
+// 0x0100ee58: 0x100ee58: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6776,14 +6776,14 @@ L_100ee44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100ee4c: 0x100ee4c: lw    s2, 0(s1)
+// 0x0100ee5c: 0x100ee5c: lw    s2, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0100ee50: 0x100ee50: jal   0x1000930 sll   zero, zero, 0
+// 0x0100ee60: 0x100ee60: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6794,7 +6794,7 @@ L_100ee44:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100ee58: 0x100ee58: jal   0x1000930 addu  a0, s1, zero
+// 0x0100ee68: 0x100ee68: jal   0x1000930 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6807,7 +6807,7 @@ L_100ee44:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100ee60: 0x100ee60: lw    v0, 32(sp)
+// 0x0100ee70: 0x100ee70: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6816,17 +6816,17 @@ L_100ee44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ee64: 0x100ee64: addu  s1, s2, zero
+// 0x0100ee74: 0x100ee74: addu  s1, s2, zero
 	ldloc 10
 	stloc 8
-L_100ee68:
-// 0x0100ee68: 0x100ee68: bne   s1, zero, 0x100ee44 addu  a1, s0, zero
+L_100ee78:
+// 0x0100ee78: 0x100ee78: bne   s1, zero, 0x100ee54 addu  a1, s0, zero
 	ldloc 8
 	ldloc 9
 	stloc.2
-	brtrue L_100ee44
+	brtrue L_100ee54
 // --- basic block ---
-// 0x0100ee70: 0x100ee70: sw    zero, 36(v0)
+// 0x0100ee80: 0x100ee80: sw    zero, 36(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6835,10 +6835,10 @@ L_100ee68:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100ee74: 0x100ee74: addu  a0, v0, zero
+// 0x0100ee84: 0x100ee84: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0100ee78: 0x100ee78: jal   0x100eab0 sw    v0, 32(sp)
+// 0x0100ee88: 0x100ee88: jal   0x100eac0 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6852,17 +6852,17 @@ L_100ee68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_add_enumeration_value_100eab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_add_enumeration_value_100eac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100ee80: 0x100ee80: addiu v1, sp, 76
+// 0x0100ee90: 0x100ee90: addiu v1, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 7
-// 0x0100ee84: 0x100ee84: sw    v1, 24(sp)
+// 0x0100ee94: 0x100ee94: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6871,7 +6871,7 @@ L_100ee68:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100ee88: 0x100ee88: lw    v1, 72(sp)
+// 0x0100ee98: 0x100ee98: lw    v1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6880,11 +6880,11 @@ L_100ee68:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ee8c: 0x100ee8c: j	 0x100eeb0 sll   zero, zero, 0
-	br L_100eeb0
+// 0x0100ee9c: 0x100ee9c: j	 0x100eec0 sll   zero, zero, 0
+	br L_100eec0
 // --- basic block ---
-L_100ee94:
-// 0x0100ee94: 0x100ee94: jal   0x100eab0 sw    v0, 32(sp)
+L_100eea4:
+// 0x0100eea4: 0x100eea4: jal   0x100eac0 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6898,12 +6898,12 @@ L_100ee94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_add_enumeration_value_100eab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_add_enumeration_value_100eac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100ee9c: 0x100ee9c: lw    a0, 24(sp)
+// 0x0100eeac: 0x100eeac: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6912,20 +6912,20 @@ L_100ee94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100eea0: 0x100eea0: sll   zero, zero, 0
-// 0x0100eea4: 0x100eea4: lw    v1, 0(a0)
+// 0x0100eeb0: 0x100eeb0: sll   zero, zero, 0
+// 0x0100eeb4: 0x100eeb4: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100eea8: 0x100eea8: addiu a0, a0, 4
+// 0x0100eeb8: 0x100eeb8: addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x0100eeac: 0x100eeac: sw    a0, 24(sp)
+// 0x0100eebc: 0x100eebc: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6934,8 +6934,8 @@ L_100ee94:
 	add
 	ldloc.1
 	stelem.i4
-L_100eeb0:
-// 0x0100eeb0: 0x100eeb0: lw    v0, 32(sp)
+L_100eec0:
+// 0x0100eec0: 0x100eec0: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6944,17 +6944,17 @@ L_100eeb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100eeb4: 0x100eeb4: addu  a1, v1, zero
+// 0x0100eec4: 0x100eec4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0100eeb8: 0x100eeb8: bne   v1, zero, 0x100ee94 addu  a0, v0, zero
+// 0x0100eec8: 0x100eec8: bne   v1, zero, 0x100eea4 addu  a0, v0, zero
 	ldloc 7
 	ldloc 6
 	stloc.1
-	brtrue L_100ee94
+	brtrue L_100eea4
 // --- basic block ---
-// 0x0100eec0: 0x100eec0: lw    ra, 52(sp)
-// 0x0100eec4: 0x100eec4: lw    s2, 48(sp)
+// 0x0100eed0: 0x100eed0: lw    ra, 52(sp)
+// 0x0100eed4: 0x100eed4: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6963,7 +6963,7 @@ L_100eeb0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100eec8: 0x100eec8: lw    s1, 44(sp)
+// 0x0100eed8: 0x100eed8: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6972,7 +6972,7 @@ L_100eeb0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100eecc: 0x100eecc: lw    s0, 40(sp)
+// 0x0100eedc: 0x100eedc: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6981,7 +6981,7 @@ L_100eeb0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100eed0: 0x100eed0: jr    ra addiu sp, sp, 56
+// 0x0100eee0: 0x100eee0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl100.j b/converted/Cibyl100.j
index 8257b0e..e97b77f 100644
--- a/converted/Cibyl100.j
+++ b/converted/Cibyl100.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl100::.ctor
 
-.method public static int32 comment_callback_10856bc(int32,int32,int32,int32,int32)
+.method public static int32 comment_callback_1085ce0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -82,7 +82,7 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010856bc: 0x10856bc: lw    v1, 116(a0)
+// 0x01085ce0: 0x1085ce0: lw    v1, 116(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -91,13 +91,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010856c0: 0x10856c0: addiu sp, sp, -48
+// 0x01085ce4: 0x1085ce4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010856c4: 0x10856c4: sw    ra, 44(sp)
-// 0x010856c8: 0x10856c8: sw    s1, 40(sp)
+// 0x01085ce8: 0x1085ce8: sw    ra, 44(sp)
+// 0x01085cec: 0x1085cec: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -106,7 +106,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010856cc: 0x10856cc: sw    s0, 36(sp)
+// 0x01085cf0: 0x1085cf0: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -115,20 +115,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010856d0: 0x10856d0: beq   v1, zero, 0x1085784 addu  v0, zero, zero
+// 0x01085cf4: 0x1085cf4: beq   v1, zero, 0x1085da8 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1085784
+	brfalse L_1085da8
 // --- basic block ---
-// 0x010856d8: 0x10856d8: lw    v1, 0(v1)
+// 0x01085cfc: 0x1085cfc: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010856dc: 0x10856dc: lw    a0, 4(a0)
+// 0x01085d00: 0x1085d00: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -137,18 +137,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010856e0: 0x10856e0: lui   v0, 0x80000
+// 0x01085d04: 0x1085d04: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010856e4: 0x10856e4: lui   s0, 0x80000
+// 0x01085d08: 0x1085d08: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010856e8: 0x10856e8: jal   0x109617c sw    v1, -2128(v0)
+// 0x01085d0c: 0x1085d0c: jal   0x10967c4 sw    v1, -1664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -532
+	ldc.i4 -416
 	add
 	ldloc 8
 	stelem.i4
@@ -157,26 +157,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010856f0: 0x10856f0: lw    v0, -2136(s0)
+// 0x01085d14: 0x1085d14: lw    v0, -1672(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -534
+	ldc.i4 -418
 	add
 	ldelem.i4
 	stloc 5
-// 0x010856f4: 0x10856f4: sll   zero, zero, 0
-// 0x010856f8: 0x10856f8: beq   v0, zero, 0x108570c sll   zero, zero, 0
+// 0x01085d18: 0x1085d18: sll   zero, zero, 0
+// 0x01085d1c: 0x1085d1c: beq   v0, zero, 0x1085d30 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108570c
+	brfalse L_1085d30
 // --- basic block ---
-// 0x01085700: 0x1085700: jal   0x1094b64 addiu a0, zero, 2
+// 0x01085d24: 0x1085d24: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -184,25 +184,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01085708: 0x1085708: sw    zero, -2136(s0)
+// 0x01085d2c: 0x1085d2c: sw    zero, -1672(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -534
+	ldc.i4 -418
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108570c:
-// 0x0108570c: 0x108570c: lui   s0, 0x0
+L_1085d30:
+// 0x01085d30: 0x1085d30: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01085710: 0x1085710: jal   0x109a424 addu  a0, zero, zero
+// 0x01085d34: 0x1085d34: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -210,26 +210,26 @@ L_108570c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01085718: 0x1085718: addiu a0, s0, 17184
+// 0x01085d3c: 0x1085d3c: addiu a0, s0, 17184
 	ldloc 7
 	ldc.i4 17184
 	add
 	stloc.1
-// 0x0108571c: 0x108571c: addiu a1, zero, 1
+// 0x01085d40: 0x1085d40: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01085720: 0x1085720: addu  a2, zero, zero
+// 0x01085d44: 0x1085d44: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085724: 0x1085724: addu  a3, zero, zero
+// 0x01085d48: 0x1085d48: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01085728: 0x1085728: jal   0x109c504 sltu  s1, zero, v0
+// 0x01085d4c: 0x1085d4c: jal   0x109cb4c sltu  s1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
@@ -239,23 +239,23 @@ L_108570c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01085730: 0x1085730: addiu a0, s0, 17184
+// 0x01085d54: 0x1085d54: addiu a0, s0, 17184
 	ldloc 7
 	ldc.i4 17184
 	add
 	stloc.1
-// 0x01085734: 0x1085734: addu  a1, zero, zero
+// 0x01085d58: 0x1085d58: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085738: 0x1085738: addu  a2, zero, zero
+// 0x01085d5c: 0x1085d5c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108573c: 0x108573c: jal   0x109c504 addu  a3, zero, zero
+// 0x01085d60: 0x1085d60: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -263,42 +263,42 @@ L_108570c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01085744: 0x1085744: nor   s1, zero, s1
+// 0x01085d68: 0x1085d68: nor   s1, zero, s1
 	ldloc 9
 	ldc.i4.m1
 	xor
 	stloc 9
-// 0x01085748: 0x1085748: lui   a3, 0x1080000
+// 0x01085d6c: 0x1085d6c: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x0108574c: 0x108574c: addiu a2, s0, 17184
+// 0x01085d70: 0x1085d70: addiu a2, s0, 17184
 	ldloc 7
 	ldc.i4 17184
 	add
 	stloc.3
-// 0x01085750: 0x1085750: addiu v0, zero, 2
+// 0x01085d74: 0x1085d74: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01085754: 0x1085754: addiu s0, zero, 1
+// 0x01085d78: 0x1085d78: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01085758: 0x1085758: addu  a0, s1, zero
+// 0x01085d7c: 0x1085d7c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0108575c: 0x108575c: addiu a3, a3, 22424
+// 0x01085d80: 0x1085d80: addiu a3, a3, 23996
 	ldloc 4
-	ldc.i4 22424
+	ldc.i4 23996
 	add
 	stloc 4
-// 0x01085760: 0x1085760: addiu a1, zero, -2
+// 0x01085d84: 0x1085d84: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x01085764: 0x1085764: sw    v0, 20(sp)
+// 0x01085d88: 0x1085d88: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -307,7 +307,7 @@ L_108570c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085768: 0x1085768: sw    zero, 16(sp)
+// 0x01085d8c: 0x1085d8c: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -316,7 +316,7 @@ L_108570c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108576c: 0x108576c: sw    zero, 24(sp)
+// 0x01085d90: 0x1085d90: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -325,7 +325,7 @@ L_108570c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085770: 0x1085770: jal   0x109c7f0 sw    s0, 28(sp)
+// 0x01085d94: 0x1085d94: jal   0x109ce38 sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -339,29 +339,29 @@ L_108570c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01085778: 0x1085778: lui   v0, 0x80000
+// 0x01085d9c: 0x1085d9c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108577c: 0x108577c: sw    s0, -2136(v0)
+// 0x01085da0: 0x1085da0: sw    s0, -1672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -534
+	ldc.i4 -418
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085780: 0x1085780: addiu v0, zero, 1
+// 0x01085da4: 0x1085da4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1085784:
-// 0x01085784: 0x1085784: lw    ra, 44(sp)
-// 0x01085788: 0x1085788: lw    s1, 40(sp)
+L_1085da8:
+// 0x01085da8: 0x1085da8: lw    ra, 44(sp)
+// 0x01085dac: 0x1085dac: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -370,7 +370,7 @@ L_1085784:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108578c: 0x108578c: lw    s0, 36(sp)
+// 0x01085db0: 0x1085db0: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -379,7 +379,7 @@ L_1085784:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01085790: 0x1085790: jr    ra addiu sp, sp, 48
+// 0x01085db4: 0x1085db4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -391,7 +391,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_option_selected_1085798(int32,int32,int32,int32,int32)
+.method public static int32 on_option_selected_1085dbc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -432,16 +432,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085798: 0x1085798: addiu sp, sp, -56
+// 0x01085dbc: 0x1085dbc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0108579c: 0x108579c: lui   v0, 0x80000
+// 0x01085dc0: 0x1085dc0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010857a0: 0x10857a0: sw    ra, 52(sp)
-// 0x010857a4: 0x10857a4: sw    s1, 48(sp)
+// 0x01085dc4: 0x1085dc4: sw    ra, 52(sp)
+// 0x01085dc8: 0x1085dc8: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -450,7 +450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010857a8: 0x10857a8: sw    s0, 44(sp)
+// 0x01085dcc: 0x1085dcc: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -459,19 +459,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010857ac: 0x10857ac: beq   a0, zero, 0x1085870 sw    zero, -2136(v0)
+// 0x01085dd0: 0x1085dd0: beq   a0, zero, 0x1085e94 sw    zero, -1672(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -534
+	ldc.i4 -418
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1085870
+	brfalse L_1085e94
 // --- basic block ---
-// 0x010857b4: 0x10857b4: lw    v0, 20(a1)
+// 0x01085dd8: 0x1085dd8: lw    v0, 20(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -480,55 +480,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010857b8: 0x10857b8: sll   zero, zero, 0
-// 0x010857bc: 0x10857bc: beq   v0, zero, 0x10857dc addiu v1, zero, 1
+// 0x01085ddc: 0x1085ddc: sll   zero, zero, 0
+// 0x01085de0: 0x1085de0: beq   v0, zero, 0x1085e00 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_10857dc
+	brfalse L_1085e00
 // --- basic block ---
-// 0x010857c4: 0x10857c4: beq   v0, v1, 0x10857fc addiu v1, zero, 3
+// 0x01085de8: 0x1085de8: beq   v0, v1, 0x1085e20 addiu v1, zero, 3
 	ldloc 5
 	ldloc 7
 	ldc.i4.3
 	stloc 7
-	beq  L_10857fc
+	beq  L_1085e20
 // --- basic block ---
-// 0x010857cc: 0x10857cc: bne   v0, v1, 0x1085870 lui   a0, 0x20000
+// 0x01085df0: 0x1085df0: bne   v0, v1, 0x1085e94 lui   a0, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc.1
-	bne.un L_1085870
+	bne.un L_1085e94
 // --- basic block ---
-// 0x010857d4: 0x10857d4: j	 0x1085814 sll   zero, zero, 0
-	br L_1085814
+// 0x01085df8: 0x1085df8: j	 0x1085e38 sll   zero, zero, 0
+	br L_1085e38
 // --- basic block ---
-L_10857dc:
-// 0x010857dc: 0x10857dc: jal   0x109bc0c sll   zero, zero, 0
+L_1085e00:
+// 0x01085e00: 0x1085e00: jal   0x109c254 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_generic_list_dialog_hide_all_109bc0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_generic_list_dialog_hide_all_109c254(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010857e4: 0x10857e4: lui   v0, 0x80000
+// 0x01085e08: 0x1085e08: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010857e8: 0x10857e8: lw    a0, -2132(v0)
+// 0x01085e0c: 0x1085e0c: lw    a0, -1668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -533
+	ldc.i4 -417
 	add
 	ldelem.i4
 	stloc.1
-// 0x010857ec: 0x10857ec: jal   0x107eb70 addu  a1, zero, zero
+// 0x01085e10: 0x1085e10: jal   0x107f194 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -536,45 +536,45 @@ L_10857dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_By_Id_107eb70(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_By_Id_107f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010857f4: 0x10857f4: j	 0x1085870 sll   zero, zero, 0
-	br L_1085870
+// 0x01085e18: 0x1085e18: j	 0x1085e94 sll   zero, zero, 0
+	br L_1085e94
 // --- basic block ---
-L_10857fc:
-// 0x010857fc: 0x10857fc: lui   v0, 0x80000
+L_1085e20:
+// 0x01085e20: 0x1085e20: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01085800: 0x1085800: lw    a0, -2132(v0)
+// 0x01085e24: 0x1085e24: lw    a0, -1668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -533
+	ldc.i4 -417
 	add
 	ldelem.i4
 	stloc.1
-// 0x01085804: 0x1085804: jal   0x1078cdc sll   zero, zero, 0
+// 0x01085e28: 0x1085e28: jal   0x1079300 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::real_time_post_alert_comment_by_id_1078cdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::real_time_post_alert_comment_by_id_1079300(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108580c: 0x108580c: j	 0x1085870 sll   zero, zero, 0
-	br L_1085870
+// 0x01085e30: 0x1085e30: j	 0x1085e94 sll   zero, zero, 0
+	br L_1085e94
 // --- basic block ---
-L_1085814:
-// 0x01085814: 0x1085814: jal   0x101cd60 addiu a0, a0, -25696
+L_1085e38:
+// 0x01085e38: 0x1085e38: jal   0x101cd70 addiu a0, a0, -25232
 	ldloc.1
-	ldc.i4 -25696
+	ldc.i4 -25232
 	add
 	stloc.1
 	ldloc.0
@@ -582,20 +582,20 @@ L_1085814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108581c: 0x108581c: lui   a0, 0x20000
+// 0x01085e40: 0x1085e40: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01085820: 0x1085820: addiu a0, a0, -25680
+// 0x01085e44: 0x1085e44: addiu a0, a0, -25216
 	ldloc.1
-	ldc.i4 -25680
+	ldc.i4 -25216
 	add
 	stloc.1
-// 0x01085824: 0x1085824: jal   0x101cd60 addu  s1, v0, zero
+// 0x01085e48: 0x1085e48: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -603,20 +603,20 @@ L_1085814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108582c: 0x108582c: lui   a0, 0x10000
+// 0x01085e50: 0x1085e50: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01085830: 0x1085830: addiu a0, a0, -23936
+// 0x01085e54: 0x1085e54: addiu a0, a0, -23936
 	ldloc.1
 	ldc.i4 -23936
 	add
 	stloc.1
-// 0x01085834: 0x1085834: jal   0x101cd60 sw    v0, 32(sp)
+// 0x01085e58: 0x1085e58: jal   0x101cd70 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -630,20 +630,20 @@ L_1085814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108583c: 0x108583c: lui   a0, 0x10000
+// 0x01085e60: 0x1085e60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01085840: 0x1085840: addiu a0, a0, -25292
+// 0x01085e64: 0x1085e64: addiu a0, a0, -25292
 	ldloc.1
 	ldc.i4 -25292
 	add
 	stloc.1
-// 0x01085844: 0x1085844: jal   0x101cd60 addu  s0, v0, zero
+// 0x01085e68: 0x1085e68: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -651,15 +651,15 @@ L_1085814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108584c: 0x108584c: lui   a3, 0x1080000
+// 0x01085e70: 0x1085e70: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x01085850: 0x1085850: lw    a1, 32(sp)
+// 0x01085e74: 0x1085e74: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -668,18 +668,18 @@ L_1085814:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01085854: 0x1085854: addu  a0, s1, zero
+// 0x01085e78: 0x1085e78: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01085858: 0x1085858: addiu a3, a3, 22660
+// 0x01085e7c: 0x1085e7c: addiu a3, a3, 24232
 	ldloc 4
-	ldc.i4 22660
+	ldc.i4 24232
 	add
 	stloc 4
-// 0x0108585c: 0x108585c: addu  a2, zero, zero
+// 0x01085e80: 0x1085e80: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085860: 0x1085860: sw    s0, 20(sp)
+// 0x01085e84: 0x1085e84: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -688,7 +688,7 @@ L_1085814:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01085864: 0x1085864: sw    v0, 24(sp)
+// 0x01085e88: 0x1085e88: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -697,7 +697,7 @@ L_1085814:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085868: 0x1085868: jal   0x104c2a4 sw    zero, 16(sp)
+// 0x01085e8c: 0x1085e8c: jal   0x104c2b4 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -711,14 +711,14 @@ L_1085814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_104c2a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_custom_104c2b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1085870:
-// 0x01085870: 0x1085870: lw    ra, 52(sp)
-// 0x01085874: 0x1085874: lw    s1, 48(sp)
+L_1085e94:
+// 0x01085e94: 0x1085e94: lw    ra, 52(sp)
+// 0x01085e98: 0x1085e98: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -727,7 +727,7 @@ L_1085870:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01085878: 0x1085878: lw    s0, 44(sp)
+// 0x01085e9c: 0x1085e9c: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -736,7 +736,7 @@ L_1085870:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108587c: 0x108587c: jr    ra addiu sp, sp, 56
+// 0x01085ea0: 0x1085ea0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -748,7 +748,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_abuse_confirm_dlg_callback_1085884(int32,int32,int32,int32,int32)
+.method public static int32 report_abuse_confirm_dlg_callback_1085ea8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -783,58 +783,58 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085884: 0x1085884: addiu sp, sp, -24
+// 0x01085ea8: 0x1085ea8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01085888: 0x1085888: addiu v0, zero, 3
+// 0x01085eac: 0x1085eac: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0108588c: 0x108588c: bne   a0, v0, 0x10858ac sw    ra, 20(sp)
+// 0x01085eb0: 0x1085eb0: bne   a0, v0, 0x1085ed0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_10858ac
+	bne.un L_1085ed0
 // --- basic block ---
-// 0x01085894: 0x1085894: lui   v0, 0x80000
+// 0x01085eb8: 0x1085eb8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01085898: 0x1085898: lw    a0, -2132(v0)
+// 0x01085ebc: 0x1085ebc: lw    a0, -1668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -533
+	ldc.i4 -417
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108589c: 0x108589c: lui   v0, 0x80000
+// 0x01085ec0: 0x1085ec0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010858a0: 0x10858a0: lw    a1, -2128(v0)
+// 0x01085ec4: 0x1085ec4: lw    a1, -1664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -532
+	ldc.i4 -416
 	add
 	ldelem.i4
 	stloc.2
-// 0x010858a4: 0x10858a4: jal   0x106b428 sll   zero, zero, 0
+// 0x01085ec8: 0x1085ec8: jal   0x106ba4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_ReportAbuse_106b428(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ReportAbuse_106ba4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10858ac:
-// 0x010858ac: 0x10858ac: lw    ra, 20(sp)
-// 0x010858b0: 0x10858b0: sll   zero, zero, 0
-// 0x010858b4: 0x10858b4: jr    ra addiu sp, sp, 24
+L_1085ed0:
+// 0x01085ed0: 0x1085ed0: lw    ra, 20(sp)
+// 0x01085ed4: 0x1085ed4: sll   zero, zero, 0
+// 0x01085ed8: 0x1085ed8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -846,7 +846,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_comment_image_10858bc(int32,int32,int32,int32,int32)
+.method public static int32 draw_comment_image_1085ee0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s4,int32 s6,int32 s1,int32 s3,int32 s5,int32 s2,int32 ra,int32 t0,int32 lo)
@@ -908,12 +908,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010858bc: 0x10858bc: addiu sp, sp, -64
+// 0x01085ee0: 0x1085ee0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010858c0: 0x10858c0: sw    s6, 56(sp)
+// 0x01085ee4: 0x1085ee4: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -922,13 +922,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010858c4: 0x10858c4: addu  s6, a2, zero
+// 0x01085ee8: 0x1085ee8: addu  s6, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010858c8: 0x10858c8: lui   a2, 0x20000
+// 0x01085eec: 0x1085eec: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010858cc: 0x10858cc: sw    s0, 32(sp)
+// 0x01085ef0: 0x1085ef0: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -937,22 +937,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010858d0: 0x10858d0: addiu a2, a2, -21696
+// 0x01085ef4: 0x1085ef4: addiu a2, a2, -21232
 	ldloc.3
-	ldc.i4 -21696
+	ldc.i4 -21232
 	add
 	stloc.3
-// 0x010858d4: 0x10858d4: addu  a0, zero, zero
+// 0x01085ef8: 0x1085ef8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010858d8: 0x10858d8: addu  s0, a1, zero
+// 0x01085efc: 0x1085efc: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010858dc: 0x10858dc: addiu a1, zero, 1
+// 0x01085f00: 0x1085f00: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010858e0: 0x10858e0: sw    ra, 60(sp)
-// 0x010858e4: 0x10858e4: sw    s5, 52(sp)
+// 0x01085f04: 0x1085f04: sw    ra, 60(sp)
+// 0x01085f08: 0x1085f08: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -961,7 +961,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010858e8: 0x10858e8: sw    s3, 44(sp)
+// 0x01085f0c: 0x1085f0c: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -970,7 +970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010858ec: 0x10858ec: sw    s1, 36(sp)
+// 0x01085f10: 0x1085f10: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -979,7 +979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010858f0: 0x10858f0: sw    s4, 48(sp)
+// 0x01085f14: 0x1085f14: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -988,7 +988,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010858f4: 0x10858f4: jal   0x10a1918 sw    s2, 40(sp)
+// 0x01085f18: 0x1085f18: jal   0x10a1f60 sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1002,26 +1002,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010858fc: 0x10858fc: lui   a2, 0x20000
+// 0x01085f20: 0x1085f20: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01085900: 0x1085900: addiu a2, a2, -21588
+// 0x01085f24: 0x1085f24: addiu a2, a2, -21124
 	ldloc.3
-	ldc.i4 -21588
+	ldc.i4 -21124
 	add
 	stloc.3
-// 0x01085904: 0x1085904: addu  a0, zero, zero
+// 0x01085f28: 0x1085f28: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01085908: 0x1085908: addiu a1, zero, 1
+// 0x01085f2c: 0x1085f2c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108590c: 0x108590c: jal   0x10a1918 addu  s5, v0, zero
+// 0x01085f30: 0x1085f30: jal   0x10a1f60 addu  s5, v0, zero
 	ldloc 6
 	stloc 13
 	ldloc.0
@@ -1029,26 +1029,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01085914: 0x1085914: lui   a2, 0x20000
+// 0x01085f38: 0x1085f38: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01085918: 0x1085918: addiu a2, a2, -21564
+// 0x01085f3c: 0x1085f3c: addiu a2, a2, -21100
 	ldloc.3
-	ldc.i4 -21564
+	ldc.i4 -21100
 	add
 	stloc.3
-// 0x0108591c: 0x108591c: addu  a0, zero, zero
+// 0x01085f40: 0x1085f40: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01085920: 0x1085920: addiu a1, zero, 1
+// 0x01085f44: 0x1085f44: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01085924: 0x1085924: jal   0x10a1918 addu  s3, v0, zero
+// 0x01085f48: 0x1085f48: jal   0x10a1f60 addu  s3, v0, zero
 	ldloc 6
 	stloc 12
 	ldloc.0
@@ -1056,72 +1056,72 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108592c: 0x108592c: beq   s5, zero, 0x1085a24 addu  s1, v0, zero
+// 0x01085f50: 0x1085f50: beq   s5, zero, 0x1086048 addu  s1, v0, zero
 	ldloc 13
 	ldloc 6
 	stloc 11
-	brfalse L_1085a24
+	brfalse L_1086048
 // --- basic block ---
-// 0x01085934: 0x1085934: beq   s3, zero, 0x1085a24 sll   zero, zero, 0
+// 0x01085f58: 0x1085f58: beq   s3, zero, 0x1086048 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_1085a24
+	brfalse L_1086048
 // --- basic block ---
-// 0x0108593c: 0x108593c: beq   v0, zero, 0x1085a24 sll   zero, zero, 0
+// 0x01085f60: 0x1085f60: beq   v0, zero, 0x1086048 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1085a24
+	brfalse L_1086048
 // --- basic block ---
-// 0x01085944: 0x1085944: jal   0x104e020 addu  a0, s5, zero
+// 0x01085f68: 0x1085f68: jal   0x104e030 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108594c: 0x108594c: addu  a0, s3, zero
+// 0x01085f70: 0x1085f70: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x01085950: 0x1085950: addu  s4, v0, zero
+// 0x01085f74: 0x1085f74: addu  s4, v0, zero
 	ldloc 6
 	stloc 9
-// 0x01085954: 0x1085954: jal   0x104e020 andi  s6, s6, 1
+// 0x01085f78: 0x1085f78: jal   0x104e030 andi  s6, s6, 1
 	ldloc 10
 	ldc.i4.1
 	and
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108595c: 0x108595c: addu  a0, s1, zero
+// 0x01085f80: 0x1085f80: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01085960: 0x1085960: jal   0x104e020 addu  s2, v0, zero
+// 0x01085f84: 0x1085f84: jal   0x104e030 addu  s2, v0, zero
 	ldloc 6
 	stloc 14
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01085968: 0x1085968: bne   s6, zero, 0x1085a24 addiu s6, sp, 16
+// 0x01085f8c: 0x1085f8c: bne   s6, zero, 0x1086048 addiu s6, sp, 16
 	ldloc 10
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-	brtrue L_1085a24
+	brtrue L_1086048
 // --- basic block ---
-// 0x01085970: 0x1085970: lw    v1, 4(s0)
+// 0x01085f94: 0x1085f94: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1130,26 +1130,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01085974: 0x1085974: lw    t0, 0(s0)
+// 0x01085f98: 0x1085f98: lw    t0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 16
-// 0x01085978: 0x1085978: addu  a0, s5, zero
+// 0x01085f9c: 0x1085f9c: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x0108597c: 0x108597c: addu  a1, s6, zero
+// 0x01085fa0: 0x1085fa0: addu  a1, s6, zero
 	ldloc 10
 	stloc.2
-// 0x01085980: 0x1085980: addu  a2, zero, zero
+// 0x01085fa4: 0x1085fa4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085984: 0x1085984: addu  a3, zero, zero
+// 0x01085fa8: 0x1085fa8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01085988: 0x1085988: sw    v1, 20(sp)
+// 0x01085fac: 0x1085fac: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1158,7 +1158,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108598c: 0x108598c: sw    v0, 24(sp)
+// 0x01085fb0: 0x1085fb0: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01085990: 0x1085990: jal   0x104f4a8 sw    t0, 16(sp)
+// 0x01085fb4: 0x1085fb4: jal   0x104f4b8 sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1181,12 +1181,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01085998: 0x1085998: lw    v1, 4(s0)
+// 0x01085fbc: 0x1085fbc: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1195,7 +1195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108599c: 0x108599c: lw    a0, 12(s0)
+// 0x01085fc0: 0x1085fc0: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1204,7 +1204,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010859a0: 0x10859a0: lw    v0, 24(sp)
+// 0x01085fc4: 0x1085fc4: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1213,40 +1213,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010859a4: 0x10859a4: subu  s0, a0, v1
+// 0x01085fc8: 0x1085fc8: subu  s0, a0, v1
 	ldloc.1
 	ldloc 8
 	sub
 	stloc 7
-// 0x010859a8: 0x10859a8: subu  s0, s0, s4
+// 0x01085fcc: 0x1085fcc: subu  s0, s0, s4
 	ldloc 7
 	ldloc 9
 	sub
 	stloc 7
-// 0x010859ac: 0x10859ac: subu  v0, s0, v0
+// 0x01085fd0: 0x1085fd0: subu  v0, s0, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 6
-// 0x010859b0: 0x10859b0: div   v0, s2
+// 0x01085fd4: 0x1085fd4: div   v0, s2
 	ldloc 6
 	ldloc 14
 	div
 	stloc 17
-// 0x010859b4: 0x10859b4: addu  s4, s4, v1
+// 0x01085fd8: 0x1085fd8: addu  s4, s4, v1
 	ldloc 9
 	ldloc 8
 	add
 	stloc 9
-// 0x010859b8: 0x10859b8: mflo  lo
+// 0x01085fdc: 0x1085fdc: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x010859bc: 0x10859bc: addiu s0, s0, 5
+// 0x01085fe0: 0x1085fe0: addiu s0, s0, 5
 	ldloc 7
 	ldc.i4.5
 	add
 	stloc 7
-// 0x010859c0: 0x10859c0: blez  s0, 0x1085a00 sw    s4, 20(sp)
+// 0x01085fe4: 0x1085fe4: blez  s0, 0x1086024 sw    s4, 20(sp)
 	ldloc 7
 	ldloc 5
 	ldloc.0
@@ -1257,22 +1257,22 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 	ldc.i4.s 0
-	ble L_1085a00
+	ble L_1086024
 // --- basic block ---
-// 0x010859c8: 0x10859c8: addu  s4, zero, zero
+// 0x01085fec: 0x1085fec: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_10859cc:
-// 0x010859cc: 0x10859cc: addu  a0, s3, zero
+L_1085ff0:
+// 0x01085ff0: 0x1085ff0: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010859d0: 0x10859d0: addu  a1, s6, zero
+// 0x01085ff4: 0x1085ff4: addu  a1, s6, zero
 	ldloc 10
 	stloc.2
-// 0x010859d4: 0x10859d4: addu  a2, zero, zero
+// 0x01085ff8: 0x1085ff8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010859d8: 0x10859d8: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01085ffc: 0x1085ffc: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1280,12 +1280,12 @@ L_10859cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010859e0: 0x10859e0: lw    v1, 20(sp)
+// 0x01086004: 0x1086004: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1294,22 +1294,22 @@ L_10859cc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010859e4: 0x10859e4: addiu s4, s4, 1
+// 0x01086008: 0x1086008: addiu s4, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010859e8: 0x10859e8: addu  v1, v1, s2
+// 0x0108600c: 0x108600c: addu  v1, v1, s2
 	ldloc 8
 	ldloc 14
 	add
 	stloc 8
-// 0x010859ec: 0x10859ec: slt   v0, s4, s0
+// 0x01086010: 0x1086010: slt   v0, s4, s0
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 6
-// 0x010859f0: 0x10859f0: bne   v0, zero, 0x10859cc sw    v1, 20(sp)
+// 0x01086014: 0x1086014: bne   v0, zero, 0x1085ff0 sw    v1, 20(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1319,31 +1319,31 @@ L_10859cc:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_10859cc
+	brtrue L_1085ff0
 // --- basic block ---
-// 0x010859f8: 0x10859f8: j	 0x1085a14 addu  a0, s1, zero
+// 0x0108601c: 0x108601c: j	 0x1086038 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-	br L_1085a14
+	br L_1086038
 // --- basic block ---
-L_1085a00:
-// 0x01085a00: 0x1085a00: slti  s0, s0, -10
+L_1086024:
+// 0x01086024: 0x1086024: slti  s0, s0, -10
 	ldloc 7
 	ldc.i4.s -10
 	clt
 	stloc 7
-// 0x01085a04: 0x1085a04: beq   s0, zero, 0x1085a14 addu  a0, s1, zero
+// 0x01086028: 0x1086028: beq   s0, zero, 0x1086038 addu  a0, s1, zero
 	ldloc 7
 	ldloc 11
 	stloc.1
-	brfalse L_1085a14
+	brfalse L_1086038
 // --- basic block ---
-// 0x01085a0c: 0x1085a0c: addiu s4, s4, -10
+// 0x01086030: 0x1086030: addiu s4, s4, -10
 	ldloc 9
 	ldc.i4.s -10
 	add
 	stloc 9
-// 0x01085a10: 0x1085a10: sw    s4, 20(sp)
+// 0x01086034: 0x1086034: sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1352,16 +1352,16 @@ L_1085a00:
 	add
 	ldloc 9
 	stelem.i4
-L_1085a14:
-// 0x01085a14: 0x1085a14: addiu a1, sp, 16
+L_1086038:
+// 0x01086038: 0x1086038: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01085a18: 0x1085a18: addu  a2, zero, zero
+// 0x0108603c: 0x108603c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085a1c: 0x1085a1c: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01086040: 0x1086040: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1369,14 +1369,14 @@ L_1085a14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1085a24:
-// 0x01085a24: 0x1085a24: lw    ra, 60(sp)
-// 0x01085a28: 0x1085a28: lw    s6, 56(sp)
+L_1086048:
+// 0x01086048: 0x1086048: lw    ra, 60(sp)
+// 0x0108604c: 0x108604c: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1385,7 +1385,7 @@ L_1085a24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01085a2c: 0x1085a2c: lw    s5, 52(sp)
+// 0x01086050: 0x1086050: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1394,7 +1394,7 @@ L_1085a24:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01085a30: 0x1085a30: lw    s4, 48(sp)
+// 0x01086054: 0x1086054: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1403,7 +1403,7 @@ L_1085a24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01085a34: 0x1085a34: lw    s3, 44(sp)
+// 0x01086058: 0x1086058: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1412,7 +1412,7 @@ L_1085a24:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01085a38: 0x1085a38: lw    s2, 40(sp)
+// 0x0108605c: 0x108605c: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1421,7 +1421,7 @@ L_1085a24:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01085a3c: 0x1085a3c: lw    s1, 36(sp)
+// 0x01086060: 0x1086060: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1430,7 +1430,7 @@ L_1085a24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01085a40: 0x1085a40: lw    s0, 32(sp)
+// 0x01086064: 0x1086064: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1439,7 +1439,7 @@ L_1085a24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01085a44: 0x1085a44: jr    ra addiu sp, sp, 64
+// 0x01086068: 0x1086068: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1451,7 +1451,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 AlertSelected_1085a4c(int32,int32,int32,int32,int32)
+.method public static int32 AlertSelected_1086070(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1486,13 +1486,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085a4c: 0x1085a4c: addiu sp, sp, -24
+// 0x01086070: 0x1086070: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01085a50: 0x1085a50: sw    ra, 20(sp)
-// 0x01085a54: 0x1085a54: jal   0x1094a94 addu  a0, zero, zero
+// 0x01086074: 0x1086074: sw    ra, 20(sp)
+// 0x01086078: 0x1086078: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1500,24 +1500,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01085a5c: 0x1085a5c: lui   v0, 0x80000
+// 0x01086080: 0x1086080: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01085a60: 0x1085a60: lw    a0, -2132(v0)
+// 0x01086084: 0x1086084: lw    a0, -1668(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -533
+	ldc.i4 -417
 	add
 	ldelem.i4
 	stloc.1
-// 0x01085a64: 0x1085a64: jal   0x107eb70 addu  a1, zero, zero
+// 0x01086088: 0x1086088: jal   0x107f194 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1525,16 +1525,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_By_Id_107eb70(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_By_Id_107f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01085a6c: 0x1085a6c: lw    ra, 20(sp)
-// 0x01085a70: 0x1085a70: addiu v0, zero, 1
+// 0x01086090: 0x1086090: lw    ra, 20(sp)
+// 0x01086094: 0x1086094: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01085a74: 0x1085a74: jr    ra addiu sp, sp, 24
+// 0x01086098: 0x1086098: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1546,7 +1546,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_options_comments_1085a7c(int32,int32,int32,int32,int32)
+.method public static int32 on_options_comments_10860a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1590,12 +1590,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085a7c: 0x1085a7c: addiu sp, sp, -48
+// 0x010860a0: 0x10860a0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01085a80: 0x1085a80: sw    s0, 32(sp)
+// 0x010860a4: 0x10860a4: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1604,8 +1604,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01085a84: 0x1085a84: sw    ra, 44(sp)
-// 0x01085a88: 0x1085a88: sw    s2, 40(sp)
+// 0x010860a8: 0x10860a8: sw    ra, 44(sp)
+// 0x010860ac: 0x10860ac: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1614,7 +1614,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01085a8c: 0x1085a8c: jal   0x1094054 sw    s1, 36(sp)
+// 0x010860b0: 0x10860b0: jal   0x1094678 sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1623,21 +1623,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_get_focus_1094054()
+	call int32 Cibyl110::ssd_dialog_get_focus_1094678()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01085a94: 0x1085a94: beq   v0, zero, 0x1085ae4 addu  s0, v0, zero
+// 0x010860b8: 0x10860b8: beq   v0, zero, 0x1086108 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_1085ae4
+	brfalse L_1086108
 // --- basic block ---
-// 0x01085a9c: 0x1085a9c: lui   a1, 0x20000
+// 0x010860c0: 0x10860c0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01085aa0: 0x1085aa0: lw    a0, 16(v0)
+// 0x010860c4: 0x10860c4: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1646,9 +1646,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01085aa4: 0x1085aa4: jal   0x1001b14 addiu a1, a1, -21604
+// 0x010860c8: 0x10860c8: jal   0x1001b14 addiu a1, a1, -21140
 	ldloc.2
-	ldc.i4 -21604
+	ldc.i4 -21140
 	add
 	stloc.2
 	ldloc.1
@@ -1656,13 +1656,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01085aac: 0x1085aac: bne   v0, zero, 0x1085ae8 addiu v1, zero, -1
+// 0x010860d0: 0x10860d0: bne   v0, zero, 0x108610c addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 7
-	brtrue L_1085ae8
+	brtrue L_108610c
 // --- basic block ---
-// 0x01085ab4: 0x1085ab4: lw    v1, 116(s0)
+// 0x010860d8: 0x10860d8: lw    v1, 116(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1671,8 +1671,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01085ab8: 0x1085ab8: sll   zero, zero, 0
-// 0x01085abc: 0x1085abc: lw    a0, 520(v1)
+// 0x010860dc: 0x10860dc: sll   zero, zero, 0
+// 0x010860e0: 0x10860e0: lw    a0, 520(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1681,80 +1681,80 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01085ac0: 0x1085ac0: sll   zero, zero, 0
-// 0x01085ac4: 0x1085ac4: bne   a0, zero, 0x1085adc lui   v0, 0x80000
+// 0x010860e4: 0x10860e4: sll   zero, zero, 0
+// 0x010860e8: 0x10860e8: bne   a0, zero, 0x1086100 lui   v0, 0x80000
 	ldloc.1
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1085adc
+	brtrue L_1086100
 // --- basic block ---
-// 0x01085acc: 0x1085acc: lw    v1, 0(v1)
+// 0x010860f0: 0x10860f0: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01085ad0: 0x1085ad0: addiu s2, zero, 1
+// 0x010860f4: 0x10860f4: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x01085ad4: 0x1085ad4: j	 0x1085af4 sw    v1, -2128(v0)
+// 0x010860f8: 0x10860f8: j	 0x1086118 sw    v1, -1664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -532
+	ldc.i4 -416
 	add
 	ldloc 7
 	stelem.i4
-	br L_1085af4
+	br L_1086118
 // --- basic block ---
-L_1085adc:
-// 0x01085adc: 0x1085adc: j	 0x1085aec addiu v1, zero, -1
+L_1086100:
+// 0x01086100: 0x1086100: j	 0x1086110 addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-	br L_1085aec
+	br L_1086110
 // --- basic block ---
-L_1085ae4:
-// 0x01085ae4: 0x1085ae4: addiu v1, zero, -1
+L_1086108:
+// 0x01086108: 0x1086108: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-L_1085ae8:
-// 0x01085ae8: 0x1085ae8: lui   v0, 0x80000
+L_108610c:
+// 0x0108610c: 0x108610c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1085aec:
-// 0x01085aec: 0x1085aec: sw    v1, -2128(v0)
+L_1086110:
+// 0x01086110: 0x1086110: sw    v1, -1664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -532
+	ldc.i4 -416
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085af0: 0x1085af0: addu  s2, zero, zero
+// 0x01086114: 0x1086114: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_1085af4:
-// 0x01085af4: 0x1085af4: lui   s0, 0x80000
+L_1086118:
+// 0x01086118: 0x1086118: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01085af8: 0x1085af8: lw    v0, -2136(s0)
+// 0x0108611c: 0x108611c: lw    v0, -1672(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -534
+	ldc.i4 -418
 	add
 	ldelem.i4
 	stloc 5
-// 0x01085afc: 0x1085afc: sll   zero, zero, 0
-// 0x01085b00: 0x1085b00: beq   v0, zero, 0x1085b14 sll   zero, zero, 0
+// 0x01086120: 0x1086120: sll   zero, zero, 0
+// 0x01086124: 0x1086124: beq   v0, zero, 0x1086138 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1085b14
+	brfalse L_1086138
 // --- basic block ---
-// 0x01085b08: 0x1085b08: jal   0x1094b64 addiu a0, zero, 2
+// 0x0108612c: 0x108612c: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1762,22 +1762,22 @@ L_1085af4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01085b10: 0x1085b10: sw    zero, -2136(s0)
+// 0x01086134: 0x1086134: sw    zero, -1672(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -534
+	ldc.i4 -418
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1085b14:
-// 0x01085b14: 0x1085b14: jal   0x109a424 addu  a0, zero, zero
+L_1086138:
+// 0x01086138: 0x1086138: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1785,31 +1785,31 @@ L_1085b14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01085b1c: 0x1085b1c: lui   s0, 0x0
+// 0x01086140: 0x1086140: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01085b20: 0x1085b20: sltu  s1, zero, v0
+// 0x01086144: 0x1086144: sltu  s1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 9
-// 0x01085b24: 0x1085b24: addu  a2, s2, zero
+// 0x01086148: 0x1086148: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x01085b28: 0x1085b28: addiu a0, s0, 17184
+// 0x0108614c: 0x108614c: addiu a0, s0, 17184
 	ldloc 8
 	ldc.i4 17184
 	add
 	stloc.1
-// 0x01085b2c: 0x1085b2c: addiu a1, zero, 3
+// 0x01086150: 0x1086150: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01085b30: 0x1085b30: jal   0x109c504 addu  a3, zero, zero
+// 0x01086154: 0x1086154: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1817,23 +1817,23 @@ L_1085b14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01085b38: 0x1085b38: nor   s1, zero, s1
+// 0x0108615c: 0x108615c: nor   s1, zero, s1
 	ldloc 9
 	ldc.i4.m1
 	xor
 	stloc 9
-// 0x01085b3c: 0x1085b3c: addiu v0, zero, 2
+// 0x01086160: 0x1086160: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01085b40: 0x1085b40: lui   a3, 0x1080000
+// 0x01086164: 0x1086164: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x01085b44: 0x1085b44: sw    v0, 20(sp)
+// 0x01086168: 0x1086168: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1842,26 +1842,26 @@ L_1085b14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085b48: 0x1085b48: addu  a0, s1, zero
+// 0x0108616c: 0x108616c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01085b4c: 0x1085b4c: addiu a2, s0, 17184
+// 0x01086170: 0x1086170: addiu a2, s0, 17184
 	ldloc 8
 	ldc.i4 17184
 	add
 	stloc.3
-// 0x01085b50: 0x1085b50: addiu v0, zero, 1
+// 0x01086174: 0x1086174: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01085b54: 0x1085b54: addiu a3, a3, 22424
+// 0x01086178: 0x1086178: addiu a3, a3, 23996
 	ldloc 4
-	ldc.i4 22424
+	ldc.i4 23996
 	add
 	stloc 4
-// 0x01085b58: 0x1085b58: addiu a1, zero, -2
+// 0x0108617c: 0x108617c: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x01085b5c: 0x1085b5c: sw    v0, 28(sp)
+// 0x01086180: 0x1086180: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1870,7 +1870,7 @@ L_1085b14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085b60: 0x1085b60: sw    zero, 16(sp)
+// 0x01086184: 0x1086184: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1879,7 +1879,7 @@ L_1085b14:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085b64: 0x1085b64: jal   0x109c7f0 sw    zero, 24(sp)
+// 0x01086188: 0x1086188: jal   0x109ce38 sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1893,25 +1893,25 @@ L_1085b14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01085b6c: 0x1085b6c: lw    ra, 44(sp)
-// 0x01085b70: 0x1085b70: lui   v1, 0x80000
+// 0x01086190: 0x1086190: lw    ra, 44(sp)
+// 0x01086194: 0x1086194: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01085b74: 0x1085b74: sw    v0, -2136(v1)
+// 0x01086198: 0x1086198: sw    v0, -1672(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -534
+	ldc.i4 -418
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085b78: 0x1085b78: lw    s2, 40(sp)
+// 0x0108619c: 0x108619c: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1920,10 +1920,10 @@ L_1085b14:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01085b7c: 0x1085b7c: addu  v0, zero, zero
+// 0x010861a0: 0x10861a0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01085b80: 0x1085b80: lw    s1, 36(sp)
+// 0x010861a4: 0x10861a4: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1932,7 +1932,7 @@ L_1085b14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01085b84: 0x1085b84: lw    s0, 32(sp)
+// 0x010861a8: 0x10861a8: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1941,7 +1941,7 @@ L_1085b14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01085b88: 0x1085b88: jr    ra addiu sp, sp, 48
+// 0x010861ac: 0x10861ac: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1953,7 +1953,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void RTConnectionInfo_ResetTransaction_1085b90(int32)
+.method public static void RTConnectionInfo_ResetTransaction_10861b4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 ra)
@@ -1970,7 +1970,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085b90: 0x1085b90: sw    zero, 28692(a0)
+// 0x010861b4: 0x10861b4: sw    zero, 28692(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1979,7 +1979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085b94: 0x1085b94: jr    ra sw    zero, 28688(a0)
+// 0x010861b8: 0x10861b8: jr    ra sw    zero, 28688(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1992,7 +1992,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 RTConnectionInfo_ResetLogin_1085ba4(int32,int32,int32,int32,int32)
+.method public static int32 RTConnectionInfo_ResetLogin_10861c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -2030,12 +2030,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085ba4: 0x1085ba4: addiu sp, sp, -24
+// 0x010861c8: 0x10861c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01085ba8: 0x1085ba8: sw    s0, 16(sp)
+// 0x010861cc: 0x10861cc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2044,14 +2044,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085bac: 0x1085bac: addu  a1, zero, zero
+// 0x010861d0: 0x10861d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085bb0: 0x1085bb0: addu  s0, a0, zero
+// 0x010861d4: 0x10861d4: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01085bb4: 0x1085bb4: sw    ra, 20(sp)
-// 0x01085bb8: 0x1085bb8: jal   0x100177c addiu a2, zero, 64
+// 0x010861d8: 0x10861d8: sw    ra, 20(sp)
+// 0x010861dc: 0x10861dc: jal   0x100177c addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -2063,15 +2063,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01085bc0: 0x1085bc0: addiu a0, s0, 64
+// 0x010861e4: 0x10861e4: addiu a0, s0, 64
 	ldloc 5
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x01085bc4: 0x1085bc4: addu  a1, zero, zero
+// 0x010861e8: 0x10861e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085bc8: 0x1085bc8: jal   0x100177c addiu a2, zero, 64
+// 0x010861ec: 0x10861ec: jal   0x100177c addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -2083,15 +2083,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01085bd0: 0x1085bd0: addiu a0, s0, 128
+// 0x010861f4: 0x10861f4: addiu a0, s0, 128
 	ldloc 5
 	ldc.i4 128
 	add
 	stloc.1
-// 0x01085bd4: 0x1085bd4: addu  a1, zero, zero
+// 0x010861f8: 0x10861f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085bd8: 0x1085bd8: jal   0x100177c addiu a2, zero, 64
+// 0x010861fc: 0x10861fc: jal   0x100177c addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -2103,13 +2103,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01085be0: 0x1085be0: addu  a1, zero, zero
+// 0x01086204: 0x1086204: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085be4: 0x1085be4: addiu a2, zero, 64
+// 0x01086208: 0x1086208: addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
-// 0x01085be8: 0x1085be8: jal   0x100177c addiu a0, s0, 192
+// 0x0108620c: 0x108620c: jal   0x100177c addiu a0, s0, 192
 	ldloc 5
 	ldc.i4 192
 	add
@@ -2123,15 +2123,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01085bf0: 0x1085bf0: addiu v0, s0, 264
+// 0x01086214: 0x1086214: addiu v0, s0, 264
 	ldloc 5
 	ldc.i4 264
 	add
 	stloc 7
-// 0x01085bf4: 0x1085bf4: addiu v1, zero, -1
+// 0x01086218: 0x1086218: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x01085bf8: 0x1085bf8: sw    zero, 264(s0)
+// 0x0108621c: 0x108621c: sw    zero, 264(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2140,7 +2140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085bfc: 0x1085bfc: sw    v1, 260(s0)
+// 0x01086220: 0x1086220: sw    v1, 260(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2149,12 +2149,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01085c00: 0x1085c00: addiu a0, s0, 280
+// 0x01086224: 0x1086224: addiu a0, s0, 280
 	ldloc 5
 	ldc.i4 280
 	add
 	stloc.1
-// 0x01085c04: 0x1085c04: sw    zero, 12(v0)
+// 0x01086228: 0x1086228: sw    zero, 12(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2163,7 +2163,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085c08: 0x1085c08: sw    zero, 256(s0)
+// 0x0108622c: 0x108622c: sw    zero, 256(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2172,7 +2172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085c0c: 0x1085c0c: sw    zero, 4(v0)
+// 0x01086230: 0x1086230: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2181,7 +2181,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085c10: 0x1085c10: jal   0x108bd18 sw    zero, 8(v0)
+// 0x01086234: 0x1086234: jal   0x108c33c sw    zero, 8(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2195,24 +2195,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_Reset_108bd18(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_Reset_108c33c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01085c18: 0x1085c18: jal   0x10839d4 sll   zero, zero, 0
+// 0x0108623c: 0x108623c: jal   0x1083ff8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RTTrafficInfo_Reset_10839d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RTTrafficInfo_Reset_1083ff8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01085c20: 0x1085c20: lw    ra, 20(sp)
-// 0x01085c24: 0x1085c24: sw    zero, 28692(s0)
+// 0x01086244: 0x1086244: lw    ra, 20(sp)
+// 0x01086248: 0x1086248: sw    zero, 28692(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2221,7 +2221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085c28: 0x1085c28: sw    zero, 28688(s0)
+// 0x0108624c: 0x108624c: sw    zero, 28688(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2230,7 +2230,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085c2c: 0x1085c2c: lw    s0, 16(sp)
+// 0x01086250: 0x1086250: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2239,7 +2239,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01085c30: 0x1085c30: jr    ra addiu sp, sp, 24
+// 0x01086254: 0x1086254: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2251,7 +2251,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RTConnectionInfo_FullReset_1085c38(int32,int32,int32,int32,int32)
+.method public static int32 RTConnectionInfo_FullReset_108625c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -2289,13 +2289,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085c38: 0x1085c38: addiu sp, sp, -24
+// 0x0108625c: 0x108625c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01085c3c: 0x1085c3c: sw    ra, 20(sp)
-// 0x01085c40: 0x1085c40: sw    s0, 16(sp)
+// 0x01086260: 0x1086260: sw    ra, 20(sp)
+// 0x01086264: 0x1086264: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2304,7 +2304,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01085c44: 0x1085c44: jal   0x1085ba4 addu  s0, a0, zero
+// 0x01086268: 0x1086268: jal   0x10861c8 addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.0
@@ -2312,13 +2312,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl100::RTConnectionInfo_ResetLogin_1085ba4(int32,int32,int32,int32,int32)
+	call int32 Cibyl100::RTConnectionInfo_ResetLogin_10861c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01085c4c: 0x1085c4c: lw    ra, 20(sp)
-// 0x01085c50: 0x1085c50: sw    zero, 28696(s0)
+// 0x01086270: 0x1086270: lw    ra, 20(sp)
+// 0x01086274: 0x1086274: sw    zero, 28696(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2327,7 +2327,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01085c54: 0x1085c54: lw    s0, 16(sp)
+// 0x01086278: 0x1086278: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2336,7 +2336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01085c58: 0x1085c58: jr    ra addiu sp, sp, 24
+// 0x0108627c: 0x108627c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2348,7 +2348,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 RTConnectionInfo_Init_1085c60(int32,int32,int32,int32,int32)
+.method public static int32 RTConnectionInfo_Init_1086284(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -2392,12 +2392,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01085c60: 0x1085c60: addiu sp, sp, -40
+// 0x01086284: 0x1086284: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01085c64: 0x1085c64: sw    s1, 28(sp)
+// 0x01086288: 0x1086288: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2406,7 +2406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01085c68: 0x1085c68: sw    s0, 24(sp)
+// 0x0108628c: 0x108628c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2415,20 +2415,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01085c6c: 0x1085c6c: addu  s1, a1, zero
+// 0x01086290: 0x1086290: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01085c70: 0x1085c70: addu  s0, a2, zero
+// 0x01086294: 0x1086294: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01085c74: 0x1085c74: addu  a1, zero, zero
+// 0x01086298: 0x1086298: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085c78: 0x1085c78: addiu a2, zero, 28736
+// 0x0108629c: 0x108629c: addiu a2, zero, 28736
 	ldc.i4 28736
 	stloc.3
-// 0x01085c7c: 0x1085c7c: sw    ra, 36(sp)
-// 0x01085c80: 0x1085c80: sw    s2, 32(sp)
+// 0x010862a0: 0x10862a0: sw    ra, 36(sp)
+// 0x010862a4: 0x10862a4: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2437,7 +2437,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01085c84: 0x1085c84: sw    a3, 16(sp)
+// 0x010862a8: 0x10862a8: sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2446,7 +2446,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01085c88: 0x1085c88: jal   0x100177c addu  s2, a0, zero
+// 0x010862ac: 0x10862ac: jal   0x100177c addu  s2, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.1
@@ -2458,10 +2458,10 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x01085c90: 0x1085c90: addiu v0, zero, -1
+// 0x010862b4: 0x10862b4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01085c94: 0x1085c94: lw    a3, 16(sp)
+// 0x010862b8: 0x10862b8: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2470,7 +2470,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01085c98: 0x1085c98: sw    v0, 28708(s2)
+// 0x010862bc: 0x10862bc: sw    v0, 28708(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2479,7 +2479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085c9c: 0x1085c9c: sw    v0, 260(s2)
+// 0x010862c0: 0x10862c0: sw    v0, 260(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2488,7 +2488,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085ca0: 0x1085ca0: sw    v0, 28704(s2)
+// 0x010862c4: 0x10862c4: sw    v0, 28704(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2497,7 +2497,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085ca4: 0x1085ca4: sw    v0, 28700(s2)
+// 0x010862c8: 0x10862c8: sw    v0, 28700(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2506,7 +2506,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085ca8: 0x1085ca8: sw    v0, 28712(s2)
+// 0x010862cc: 0x10862cc: sw    v0, 28712(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2515,15 +2515,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085cac: 0x1085cac: addiu a0, s2, 280
+// 0x010862d0: 0x10862d0: addiu a0, s2, 280
 	ldloc 6
 	ldc.i4 280
 	add
 	stloc.1
-// 0x01085cb0: 0x1085cb0: addu  a1, s1, zero
+// 0x010862d4: 0x10862d4: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01085cb4: 0x1085cb4: jal   0x108bd7c addu  a2, s0, zero
+// 0x010862d8: 0x10862d8: jal   0x108c3a0 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -2531,13 +2531,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_Init_108bd7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_Init_108c3a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x01085cbc: 0x1085cbc: lw    ra, 36(sp)
-// 0x01085cc0: 0x1085cc0: lw    s2, 32(sp)
+// 0x010862e0: 0x10862e0: lw    ra, 36(sp)
+// 0x010862e4: 0x10862e4: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2546,7 +2546,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01085cc4: 0x1085cc4: lw    s1, 28(sp)
+// 0x010862e8: 0x10862e8: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2555,7 +2555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01085cc8: 0x1085cc8: lw    s0, 24(sp)
+// 0x010862ec: 0x10862ec: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2564,7 +2564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01085ccc: 0x1085ccc: jr    ra addiu sp, sp, 40
+// 0x010862f0: 0x10862f0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2576,7 +2576,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 SetExternalPoiDrawOrder_1085cdc(int32,int32,int32,int32,int32)
+.method public static int32 SetExternalPoiDrawOrder_1086300(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s5,int32 s6,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -2632,16 +2632,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1085cdc:
-// 0x01085cdc: 0x1085cdc: addiu sp, sp, -72
+L_1086300:
+// 0x01086300: 0x1086300: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01085ce0: 0x1085ce0: lui   a1, 0x0
+// 0x01086304: 0x1086304: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01085ce4: 0x1085ce4: sw    s2, 48(sp)
+// 0x01086308: 0x1086308: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2650,27 +2650,27 @@ L_1085cdc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01085ce8: 0x1085ce8: addiu v0, zero, 1
+// 0x0108630c: 0x108630c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01085cec: 0x1085cec: addu  s2, a3, zero
+// 0x01086310: 0x1086310: addu  s2, a3, zero
 	ldloc 4
 	stloc 12
-// 0x01085cf0: 0x1085cf0: addiu a1, a1, 30268
+// 0x01086314: 0x1086314: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01085cf4: 0x1085cf4: addu  a2, zero, zero
+// 0x01086318: 0x1086318: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085cf8: 0x1085cf8: addiu a3, sp, 24
+// 0x0108631c: 0x108631c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01085cfc: 0x1085cfc: sw    ra, 68(sp)
-// 0x01085d00: 0x1085d00: sw    s6, 64(sp)
+// 0x01086320: 0x1086320: sw    ra, 68(sp)
+// 0x01086324: 0x1086324: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2679,7 +2679,7 @@ L_1085cdc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01085d04: 0x1085d04: sw    s5, 60(sp)
+// 0x01086328: 0x1086328: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2688,7 +2688,7 @@ L_1085cdc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01085d08: 0x1085d08: sw    s4, 56(sp)
+// 0x0108632c: 0x108632c: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2697,7 +2697,7 @@ L_1085cdc:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01085d0c: 0x1085d0c: sw    s3, 52(sp)
+// 0x01086330: 0x1086330: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2706,7 +2706,7 @@ L_1085cdc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01085d10: 0x1085d10: sw    s1, 44(sp)
+// 0x01086334: 0x1086334: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2715,7 +2715,7 @@ L_1085cdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01085d14: 0x1085d14: sw    s0, 40(sp)
+// 0x01086338: 0x1086338: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2724,7 +2724,7 @@ L_1085cdc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01085d18: 0x1085d18: jal   0x106855c sw    v0, 16(sp)
+// 0x0108633c: 0x108633c: jal   0x106856c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2738,37 +2738,37 @@ L_1085cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01085d20: 0x1085d20: bne   v0, zero, 0x1085d50 lui   a1, 0x20000
+// 0x01086344: 0x1086344: bne   v0, zero, 0x1086374 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1085d50
+	brtrue L_1086374
 // --- basic block ---
-// 0x01085d28: 0x1085d28: lui   a3, 0x20000
+// 0x0108634c: 0x108634c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01085d2c: 0x1085d2c: addiu a1, a1, -21512
+// 0x01086350: 0x1086350: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01085d30: 0x1085d30: addiu a3, a3, -21476
+// 0x01086354: 0x1086354: addiu a3, a3, -21012
 	ldloc 4
-	ldc.i4 -21476
+	ldc.i4 -21012
 	add
 	stloc 4
-// 0x01085d34: 0x1085d34: addiu a0, zero, 4
+// 0x01086358: 0x1086358: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01085d38: 0x1085d38: addiu a2, zero, 3960
+// 0x0108635c: 0x108635c: addiu a2, zero, 3960
 	ldc.i4 3960
 	stloc.3
-// 0x01085d3c: 0x1085d3c: jal   0x100449c sw    v0, 32(sp)
+// 0x01086360: 0x1086360: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2787,10 +2787,10 @@ L_1085cdc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01085d44: 0x1085d44: addiu v1, zero, 18
+// 0x01086368: 0x1086368: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x01085d48: 0x1085d48: lw    v0, 32(sp)
+// 0x0108636c: 0x108636c: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2799,21 +2799,21 @@ L_1085cdc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01085d4c: 0x1085d4c: sw    v1, 0(s2)
+// 0x01086370: 0x1086370: sw    v1, 0(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_1085d50:
-// 0x01085d50: 0x1085d50: lui   s6, 0x0
+L_1086374:
+// 0x01086374: 0x1086374: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01085d54: 0x1085d54: lui   s5, 0x0
+// 0x01086378: 0x1086378: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01085d58: 0x1085d58: sw    v0, 32(sp)
+// 0x0108637c: 0x108637c: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2822,7 +2822,7 @@ L_1085d50:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01085d5c: 0x1085d5c: jal   0x108f1dc addiu s6, s6, 30268
+// 0x01086380: 0x1086380: jal   0x108f800 addiu s6, s6, 30268
 	ldloc 11
 	ldc.i4 30268
 	add
@@ -2832,53 +2832,53 @@ L_1085d50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_clear_108f1dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_clear_108f800(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01085d64: 0x1085d64: addiu s5, s5, 28076
+// 0x01086388: 0x1086388: addiu s5, s5, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 10
-// 0x01085d68: 0x1085d68: addu  s1, zero, zero
+// 0x0108638c: 0x108638c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01085d6c: 0x1085d6c: addu  s0, zero, zero
+// 0x01086390: 0x1086390: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01085d70: 0x1085d70: addiu s4, zero, 1
+// 0x01086394: 0x1086394: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 14
-// 0x01085d74: 0x1085d74: j	 0x1085df8 addiu s3, sp, 28
+// 0x01086398: 0x1086398: j	 0x108641c addiu s3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 13
-	br L_1085df8
+	br L_108641c
 // --- basic block ---
-L_1085d7c:
-// 0x01085d7c: 0x1085d7c: beq   s0, a1, 0x1085d8c sll   zero, zero, 0
+L_10863a0:
+// 0x010863a0: 0x10863a0: beq   s0, a1, 0x10863b0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.2
-	beq  L_1085d8c
+	beq  L_10863b0
 // --- basic block ---
-// 0x01085d84: 0x1085d84: beq   s1, zero, 0x1085d94 addu  a1, s5, zero
+// 0x010863a8: 0x10863a8: beq   s1, zero, 0x10863b8 addu  a1, s5, zero
 	ldloc 9
 	ldloc 10
 	stloc.2
-	brfalse L_1085d94
+	brfalse L_10863b8
 // --- basic block ---
-L_1085d8c:
-// 0x01085d8c: 0x1085d8c: addiu s1, zero, 1
+L_10863b0:
+// 0x010863b0: 0x10863b0: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x01085d90: 0x1085d90: addu  a1, s6, zero
+// 0x010863b4: 0x10863b4: addu  a1, s6, zero
 	ldloc 11
 	stloc.2
-L_1085d94:
-// 0x01085d94: 0x1085d94: jal   0x106855c sw    s4, 16(sp)
+L_10863b8:
+// 0x010863b8: 0x10863b8: jal   0x106856c sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2892,51 +2892,51 @@ L_1085d94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01085d9c: 0x1085d9c: beq   v0, zero, 0x1085dbc lui   a1, 0x20000
+// 0x010863c0: 0x10863c0: beq   v0, zero, 0x10863e0 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1085dbc
+	brfalse L_10863e0
 // --- basic block ---
-// 0x01085da4: 0x1085da4: bne   s1, zero, 0x1085de8 sll   zero, zero, 0
+// 0x010863c8: 0x10863c8: bne   s1, zero, 0x108640c sll   zero, zero, 0
 	ldloc 9
-	brtrue L_1085de8
+	brtrue L_108640c
 // --- basic block ---
-// 0x01085dac: 0x1085dac: lb    v1, 0(v0)
+// 0x010863d0: 0x10863d0: lb    v1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01085db0: 0x1085db0: sll   zero, zero, 0
-// 0x01085db4: 0x1085db4: bne   v1, zero, 0x1085de8 sll   zero, zero, 0
+// 0x010863d4: 0x10863d4: sll   zero, zero, 0
+// 0x010863d8: 0x10863d8: bne   v1, zero, 0x108640c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1085de8
+	brtrue L_108640c
 // --- basic block ---
-L_1085dbc:
-// 0x01085dbc: 0x1085dbc: lui   a3, 0x20000
+L_10863e0:
+// 0x010863e0: 0x10863e0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01085dc0: 0x1085dc0: addiu a1, a1, -21512
+// 0x010863e4: 0x10863e4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01085dc4: 0x1085dc4: addiu a3, a3, -21388
+// 0x010863e8: 0x10863e8: addiu a3, a3, -20924
 	ldloc 4
-	ldc.i4 -21388
+	ldc.i4 -20924
 	add
 	stloc 4
-// 0x01085dc8: 0x1085dc8: addiu a0, zero, 4
+// 0x010863ec: 0x10863ec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01085dcc: 0x1085dcc: addiu a2, zero, 3982
+// 0x010863f0: 0x10863f0: addiu a2, zero, 3982
 	ldc.i4 3982
 	stloc.3
-// 0x01085dd0: 0x1085dd0: jal   0x100449c sw    s0, 16(sp)
+// 0x010863f4: 0x10863f4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2955,23 +2955,23 @@ L_1085dbc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01085dd8: 0x1085dd8: addiu v0, zero, 18
+// 0x010863fc: 0x10863fc: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x01085ddc: 0x1085ddc: sw    v0, 0(s2)
+// 0x01086400: 0x1086400: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01085de0: 0x1085de0: j	 0x1085e24 addu  v0, zero, zero
+// 0x01086404: 0x1086404: j	 0x1086448 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1085e24
+	br L_1086448
 // --- basic block ---
-L_1085de8:
-// 0x01085de8: 0x1085de8: lw    a0, 28(sp)
+L_108640c:
+// 0x0108640c: 0x108640c: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2980,12 +2980,12 @@ L_1085de8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01085dec: 0x1085dec: addiu s0, s0, 1
+// 0x01086410: 0x1086410: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01085df0: 0x1085df0: jal   0x108fa0c sw    v0, 32(sp)
+// 0x01086414: 0x1086414: jal   0x1090030 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2999,13 +2999,13 @@ L_1085de8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_DisplayList_add_ID_108fa0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_DisplayList_add_ID_1090030(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1085df8:
-// 0x01085df8: 0x1085df8: lw    v1, 24(sp)
+L_108641c:
+// 0x0108641c: 0x108641c: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3014,7 +3014,7 @@ L_1085df8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01085dfc: 0x1085dfc: lw    v0, 32(sp)
+// 0x01086420: 0x1086420: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3023,29 +3023,29 @@ L_1085df8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01085e00: 0x1085e00: addiu a1, v1, -1
+// 0x01086424: 0x1086424: addiu a1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01085e04: 0x1085e04: slt   v1, s0, v1
+// 0x01086428: 0x1086428: slt   v1, s0, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 7
-// 0x01085e08: 0x1085e08: addu  a0, v0, zero
+// 0x0108642c: 0x108642c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01085e0c: 0x1085e0c: addu  a2, zero, zero
+// 0x01086430: 0x1086430: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085e10: 0x1085e10: bne   v1, zero, 0x1085d7c addu  a3, s3, zero
+// 0x01086434: 0x1086434: bne   v1, zero, 0x10863a0 addu  a3, s3, zero
 	ldloc 7
 	ldloc 13
 	stloc 4
-	brtrue L_1085d7c
+	brtrue L_10863a0
 // --- basic block ---
-// 0x01085e18: 0x1085e18: jal   0x108fa5c sw    v0, 32(sp)
+// 0x0108643c: 0x108643c: jal   0x1090080 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3059,12 +3059,12 @@ L_1085df8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_DisplayList_108fa5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_DisplayList_1090080(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01085e20: 0x1085e20: lw    v0, 32(sp)
+// 0x01086444: 0x1086444: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3073,9 +3073,9 @@ L_1085df8:
 	add
 	ldelem.i4
 	stloc 6
-L_1085e24:
-// 0x01085e24: 0x1085e24: lw    ra, 68(sp)
-// 0x01085e28: 0x1085e28: lw    s6, 64(sp)
+L_1086448:
+// 0x01086448: 0x1086448: lw    ra, 68(sp)
+// 0x0108644c: 0x108644c: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3084,7 +3084,7 @@ L_1085e24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01085e2c: 0x1085e2c: lw    s5, 60(sp)
+// 0x01086450: 0x1086450: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3093,7 +3093,7 @@ L_1085e24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01085e30: 0x1085e30: lw    s4, 56(sp)
+// 0x01086454: 0x1086454: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3102,7 +3102,7 @@ L_1085e24:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01085e34: 0x1085e34: lw    s3, 52(sp)
+// 0x01086458: 0x1086458: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3111,7 +3111,7 @@ L_1085e24:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01085e38: 0x1085e38: lw    s2, 48(sp)
+// 0x0108645c: 0x108645c: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3120,7 +3120,7 @@ L_1085e24:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01085e3c: 0x1085e3c: lw    s1, 44(sp)
+// 0x01086460: 0x1086460: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3129,7 +3129,7 @@ L_1085e24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01085e40: 0x1085e40: lw    s0, 40(sp)
+// 0x01086464: 0x1086464: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3138,7 +3138,7 @@ L_1085e24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01085e44: 0x1085e44: jr    ra addiu sp, sp, 72
+// 0x01086468: 0x1086468: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3150,7 +3150,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RmExternalPoi_1085e4c(int32,int32,int32,int32,int32)
+.method public static int32 RmExternalPoi_1086470(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -3191,16 +3191,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1085e4c:
-// 0x01085e4c: 0x1085e4c: addiu sp, sp, -48
+L_1086470:
+// 0x01086470: 0x1086470: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01085e50: 0x1085e50: lui   a1, 0x0
+// 0x01086474: 0x1086474: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01085e54: 0x1085e54: sw    s1, 40(sp)
+// 0x01086478: 0x1086478: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3209,26 +3209,26 @@ L_1085e4c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01085e58: 0x1085e58: addiu v0, zero, -1
+// 0x0108647c: 0x108647c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01085e5c: 0x1085e5c: addu  s1, a3, zero
+// 0x01086480: 0x1086480: addu  s1, a3, zero
 	ldloc 4
 	stloc 8
-// 0x01085e60: 0x1085e60: addiu a1, a1, 30268
+// 0x01086484: 0x1086484: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01085e64: 0x1085e64: addu  a2, zero, zero
+// 0x01086488: 0x1086488: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085e68: 0x1085e68: addiu a3, sp, 24
+// 0x0108648c: 0x108648c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01085e6c: 0x1085e6c: sw    s0, 36(sp)
+// 0x01086490: 0x1086490: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3237,8 +3237,8 @@ L_1085e4c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01085e70: 0x1085e70: sw    ra, 44(sp)
-// 0x01085e74: 0x1085e74: jal   0x106855c sw    v0, 16(sp)
+// 0x01086494: 0x1086494: sw    ra, 44(sp)
+// 0x01086498: 0x1086498: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3252,37 +3252,37 @@ L_1085e4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01085e7c: 0x1085e7c: bne   v0, zero, 0x1085eac addu  s0, v0, zero
+// 0x010864a0: 0x10864a0: bne   v0, zero, 0x10864d0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_1085eac
+	brtrue L_10864d0
 // --- basic block ---
-// 0x01085e84: 0x1085e84: lui   a1, 0x20000
+// 0x010864a8: 0x10864a8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01085e88: 0x1085e88: lui   a3, 0x20000
+// 0x010864ac: 0x10864ac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01085e8c: 0x1085e8c: addiu a1, a1, -21512
+// 0x010864b0: 0x10864b0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01085e90: 0x1085e90: addiu a3, a3, -21296
+// 0x010864b4: 0x10864b4: addiu a3, a3, -20832
 	ldloc 4
-	ldc.i4 -21296
+	ldc.i4 -20832
 	add
 	stloc 4
-// 0x01085e94: 0x1085e94: addiu a0, zero, 4
+// 0x010864b8: 0x10864b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01085e98: 0x1085e98: jal   0x100449c addiu a2, zero, 3930
+// 0x010864bc: 0x10864bc: jal   0x100449c addiu a2, zero, 3930
 	ldc.i4 3930
 	stloc.3
 	ldloc.0
@@ -3295,20 +3295,20 @@ L_1085e4c:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01085ea0: 0x1085ea0: addiu v0, zero, 18
+// 0x010864c4: 0x10864c4: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01085ea4: 0x1085ea4: j	 0x1085eb8 sw    v0, 0(s1)
+// 0x010864c8: 0x10864c8: j	 0x10864dc sw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1085eb8
+	br L_10864dc
 // --- basic block ---
-L_1085eac:
-// 0x01085eac: 0x1085eac: lw    a0, 24(sp)
+L_10864d0:
+// 0x010864d0: 0x10864d0: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3317,23 +3317,23 @@ L_1085eac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01085eb0: 0x1085eb0: jal   0x108fc2c sll   zero, zero, 0
+// 0x010864d4: 0x10864d4: jal   0x1090250 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_ExternalPoi_Remove_108fc2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_ExternalPoi_Remove_1090250(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1085eb8:
-// 0x01085eb8: 0x1085eb8: lw    ra, 44(sp)
-// 0x01085ebc: 0x1085ebc: addu  v0, s0, zero
+L_10864dc:
+// 0x010864dc: 0x10864dc: lw    ra, 44(sp)
+// 0x010864e0: 0x10864e0: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x01085ec0: 0x1085ec0: lw    s1, 40(sp)
+// 0x010864e4: 0x10864e4: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3342,7 +3342,7 @@ L_1085eb8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01085ec4: 0x1085ec4: lw    s0, 36(sp)
+// 0x010864e8: 0x10864e8: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3351,7 +3351,7 @@ L_1085eb8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01085ec8: 0x1085ec8: jr    ra addiu sp, sp, 48
+// 0x010864ec: 0x10864ec: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3363,7 +3363,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 AddExternalPoi_1085ed0(int32,int32,int32,int32,int32)
+.method public static int32 AddExternalPoi_10864f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
@@ -3410,13 +3410,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1085ed0:
-// 0x01085ed0: 0x1085ed0: addiu sp, sp, -232
+L_10864f4:
+// 0x010864f4: 0x10864f4: addiu sp, sp, -232
 	ldloc.0
 	ldc.i4 -232
 	add
 	stloc.0
-// 0x01085ed4: 0x1085ed4: sw    s2, 220(sp)
+// 0x010864f8: 0x10864f8: sw    s2, 220(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3425,12 +3425,12 @@ L_1085ed0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01085ed8: 0x1085ed8: addiu s2, sp, 28
+// 0x010864fc: 0x10864fc: addiu s2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x01085edc: 0x1085edc: sw    s3, 224(sp)
+// 0x01086500: 0x1086500: sw    s3, 224(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3439,7 +3439,7 @@ L_1085ed0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01085ee0: 0x1085ee0: sw    s0, 212(sp)
+// 0x01086504: 0x1086504: sw    s0, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3448,16 +3448,16 @@ L_1085ed0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01085ee4: 0x1085ee4: addu  s3, a0, zero
+// 0x01086508: 0x1086508: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01085ee8: 0x1085ee8: lui   s0, 0x0
+// 0x0108650c: 0x108650c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01085eec: 0x1085eec: addu  a0, s2, zero
+// 0x01086510: 0x1086510: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01085ef0: 0x1085ef0: sw    s1, 216(sp)
+// 0x01086514: 0x1086514: sw    s1, 216(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3466,8 +3466,8 @@ L_1085ed0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01085ef4: 0x1085ef4: sw    ra, 228(sp)
-// 0x01085ef8: 0x1085ef8: jal   0x108ef44 addu  s1, a3, zero
+// 0x01086518: 0x1086518: sw    ra, 228(sp)
+// 0x0108651c: 0x108651c: jal   0x108f568 addu  s1, a3, zero
 	ldloc 4
 	stloc 10
 	ldloc.0
@@ -3475,29 +3475,29 @@ L_1085ed0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoi_Init_108ef44(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoi_Init_108f568(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085f00: 0x1085f00: addu  a3, s2, zero
+// 0x01086524: 0x1086524: addu  a3, s2, zero
 	ldloc 9
 	stloc 4
-// 0x01085f04: 0x1085f04: addu  a0, s3, zero
+// 0x01086528: 0x1086528: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01085f08: 0x1085f08: addiu s2, zero, -1
+// 0x0108652c: 0x108652c: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 9
-// 0x01085f0c: 0x1085f0c: addiu a1, s0, 28076
+// 0x01086530: 0x1086530: addiu a1, s0, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01085f10: 0x1085f10: addu  a2, zero, zero
+// 0x01086534: 0x1086534: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085f14: 0x1085f14: jal   0x106855c sw    s2, 16(sp)
+// 0x01086538: 0x1086538: jal   0x106856c sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3511,66 +3511,66 @@ L_1085ed0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085f1c: 0x1085f1c: beq   v0, zero, 0x1085f34 lui   a1, 0x20000
+// 0x01086540: 0x1086540: beq   v0, zero, 0x1086558 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1085f34
+	brfalse L_1086558
 // --- basic block ---
-// 0x01085f24: 0x1085f24: lb    v1, 0(v0)
+// 0x01086548: 0x1086548: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01085f28: 0x1085f28: sll   zero, zero, 0
-// 0x01085f2c: 0x1085f2c: bne   v1, zero, 0x1085f4c sll   zero, zero, 0
+// 0x0108654c: 0x108654c: sll   zero, zero, 0
+// 0x01086550: 0x1086550: bne   v1, zero, 0x1086570 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1085f4c
+	brtrue L_1086570
 // --- basic block ---
-L_1085f34:
-// 0x01085f34: 0x1085f34: lui   a3, 0x20000
+L_1086558:
+// 0x01086558: 0x1086558: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01085f38: 0x1085f38: addiu a1, a1, -21512
+// 0x0108655c: 0x108655c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01085f3c: 0x1085f3c: addiu a3, a3, -21232
+// 0x01086560: 0x1086560: addiu a3, a3, -20768
 	ldloc 4
-	ldc.i4 -21232
+	ldc.i4 -20768
 	add
 	stloc 4
-// 0x01085f40: 0x1085f40: addiu a0, zero, 4
+// 0x01086564: 0x1086564: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01085f44: 0x1085f44: j	 0x1085f94 addiu a2, zero, 3739
+// 0x01086568: 0x1086568: j	 0x10865b8 addiu a2, zero, 3739
 	ldc.i4 3739
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_1085f4c:
-// 0x01085f4c: 0x1085f4c: addu  a0, v0, zero
+L_1086570:
+// 0x01086570: 0x1086570: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085f50: 0x1085f50: addiu a1, s0, 28076
+// 0x01086574: 0x1086574: addiu a1, s0, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01085f54: 0x1085f54: addu  a2, zero, zero
+// 0x01086578: 0x1086578: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085f58: 0x1085f58: addiu a3, sp, 36
+// 0x0108657c: 0x108657c: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x01085f5c: 0x1085f5c: jal   0x106855c sw    s2, 16(sp)
+// 0x01086580: 0x1086580: jal   0x106856c sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3584,53 +3584,53 @@ L_1085f4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085f64: 0x1085f64: beq   v0, zero, 0x1085f80 lui   a1, 0x20000
+// 0x01086588: 0x1086588: beq   v0, zero, 0x10865a4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1085f80
+	brfalse L_10865a4
 // --- basic block ---
-// 0x01085f6c: 0x1085f6c: lb    v1, 0(v0)
+// 0x01086590: 0x1086590: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01085f70: 0x1085f70: sll   zero, zero, 0
-// 0x01085f74: 0x1085f74: bne   v1, zero, 0x1085fa8 addiu s2, zero, 1
+// 0x01086594: 0x1086594: sll   zero, zero, 0
+// 0x01086598: 0x1086598: bne   v1, zero, 0x10865cc addiu s2, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 9
-	brtrue L_1085fa8
+	brtrue L_10865cc
 // --- basic block ---
-// 0x01085f7c: 0x1085f7c: lui   a1, 0x20000
+// 0x010865a0: 0x10865a0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1085f80:
-// 0x01085f80: 0x1085f80: lui   a3, 0x20000
+L_10865a4:
+// 0x010865a4: 0x10865a4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01085f84: 0x1085f84: addiu a1, a1, -21512
+// 0x010865a8: 0x10865a8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01085f88: 0x1085f88: addiu a3, a3, -21168
+// 0x010865ac: 0x10865ac: addiu a3, a3, -20704
 	ldloc 4
-	ldc.i4 -21168
+	ldc.i4 -20704
 	add
 	stloc 4
-// 0x01085f8c: 0x1085f8c: addiu a0, zero, 4
+// 0x010865b0: 0x10865b0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01085f90: 0x1085f90: addiu a2, zero, 3754
+// 0x010865b4: 0x10865b4: addiu a2, zero, 3754
 	ldc.i4 3754
 	stloc.3
-L_1085f94:
-// 0x01085f94: 0x1085f94: jal   0x100449c addu  s0, zero, zero
+L_10865b8:
+// 0x010865b8: 0x10865b8: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -3643,36 +3643,36 @@ L_1085f94:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085f9c: 0x1085f9c: addiu v0, zero, 18
+// 0x010865c0: 0x10865c0: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01085fa0: 0x1085fa0: j	 0x108629c sw    v0, 0(s1)
+// 0x010865c4: 0x10865c4: j	 0x10868c0 sw    v0, 0(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_108629c
+	br L_10868c0
 // --- basic block ---
-L_1085fa8:
-// 0x01085fa8: 0x1085fa8: addu  a0, v0, zero
+L_10865cc:
+// 0x010865cc: 0x10865cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085fac: 0x1085fac: addiu a1, s0, 28076
+// 0x010865d0: 0x10865d0: addiu a1, s0, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01085fb0: 0x1085fb0: addu  a2, zero, zero
+// 0x010865d4: 0x10865d4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085fb4: 0x1085fb4: addiu a3, sp, 32
+// 0x010865d8: 0x10865d8: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01085fb8: 0x1085fb8: jal   0x106855c sw    s2, 16(sp)
+// 0x010865dc: 0x10865dc: jal   0x106856c sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3686,66 +3686,66 @@ L_1085fa8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085fc0: 0x1085fc0: beq   v0, zero, 0x1085fd8 lui   a1, 0x20000
+// 0x010865e4: 0x10865e4: beq   v0, zero, 0x10865fc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1085fd8
+	brfalse L_10865fc
 // --- basic block ---
-// 0x01085fc8: 0x1085fc8: lb    v1, 0(v0)
+// 0x010865ec: 0x10865ec: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01085fcc: 0x1085fcc: sll   zero, zero, 0
-// 0x01085fd0: 0x1085fd0: bne   v1, zero, 0x1085ff0 sll   zero, zero, 0
+// 0x010865f0: 0x10865f0: sll   zero, zero, 0
+// 0x010865f4: 0x10865f4: bne   v1, zero, 0x1086614 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1085ff0
+	brtrue L_1086614
 // --- basic block ---
-L_1085fd8:
-// 0x01085fd8: 0x1085fd8: lui   a3, 0x20000
+L_10865fc:
+// 0x010865fc: 0x10865fc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01085fdc: 0x1085fdc: addiu a1, a1, -21512
+// 0x01086600: 0x1086600: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01085fe0: 0x1085fe0: addiu a3, a3, -21096
+// 0x01086604: 0x1086604: addiu a3, a3, -20632
 	ldloc 4
-	ldc.i4 -21096
+	ldc.i4 -20632
 	add
 	stloc 4
-// 0x01085fe4: 0x1085fe4: addiu a0, zero, 4
+// 0x01086608: 0x1086608: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01085fe8: 0x1085fe8: j	 0x1085f94 addiu a2, zero, 3769
+// 0x0108660c: 0x108660c: j	 0x10865b8 addiu a2, zero, 3769
 	ldc.i4 3769
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_1085ff0:
-// 0x01085ff0: 0x1085ff0: addu  a0, v0, zero
+L_1086614:
+// 0x01086614: 0x1086614: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085ff4: 0x1085ff4: addiu a1, s0, 28076
+// 0x01086618: 0x1086618: addiu a1, s0, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01085ff8: 0x1085ff8: addu  a2, zero, zero
+// 0x0108661c: 0x108661c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085ffc: 0x1085ffc: addiu a3, sp, 44
+// 0x01086620: 0x1086620: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x01086000: 0x1086000: jal   0x106855c sw    s2, 16(sp)
+// 0x01086624: 0x1086624: jal   0x106856c sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3759,66 +3759,66 @@ L_1085ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01086008: 0x1086008: beq   v0, zero, 0x1086020 lui   a1, 0x20000
+// 0x0108662c: 0x108662c: beq   v0, zero, 0x1086644 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086020
+	brfalse L_1086644
 // --- basic block ---
-// 0x01086010: 0x1086010: lb    v1, 0(v0)
+// 0x01086634: 0x1086634: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01086014: 0x1086014: sll   zero, zero, 0
-// 0x01086018: 0x1086018: bne   v1, zero, 0x1086038 sll   zero, zero, 0
+// 0x01086638: 0x1086638: sll   zero, zero, 0
+// 0x0108663c: 0x108663c: bne   v1, zero, 0x108665c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1086038
+	brtrue L_108665c
 // --- basic block ---
-L_1086020:
-// 0x01086020: 0x1086020: lui   a3, 0x20000
+L_1086644:
+// 0x01086644: 0x1086644: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086024: 0x1086024: addiu a1, a1, -21512
+// 0x01086648: 0x1086648: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086028: 0x1086028: addiu a3, a3, -21028
+// 0x0108664c: 0x108664c: addiu a3, a3, -20564
 	ldloc 4
-	ldc.i4 -21028
+	ldc.i4 -20564
 	add
 	stloc 4
-// 0x0108602c: 0x108602c: addiu a0, zero, 4
+// 0x01086650: 0x1086650: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086030: 0x1086030: j	 0x1085f94 addiu a2, zero, 3784
+// 0x01086654: 0x1086654: j	 0x10865b8 addiu a2, zero, 3784
 	ldc.i4 3784
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_1086038:
-// 0x01086038: 0x1086038: addu  a0, v0, zero
+L_108665c:
+// 0x0108665c: 0x108665c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108603c: 0x108603c: addiu a1, s0, 28076
+// 0x01086660: 0x1086660: addiu a1, s0, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086040: 0x1086040: addu  a2, zero, zero
+// 0x01086664: 0x1086664: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086044: 0x1086044: addiu a3, sp, 40
+// 0x01086668: 0x1086668: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x01086048: 0x1086048: jal   0x106855c sw    s2, 16(sp)
+// 0x0108666c: 0x108666c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3832,74 +3832,74 @@ L_1086038:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01086050: 0x1086050: beq   v0, zero, 0x108606c lui   a1, 0x20000
+// 0x01086674: 0x1086674: beq   v0, zero, 0x1086690 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108606c
+	brfalse L_1086690
 // --- basic block ---
-// 0x01086058: 0x1086058: lb    v1, 0(v0)
+// 0x0108667c: 0x108667c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0108605c: 0x108605c: sll   zero, zero, 0
-// 0x01086060: 0x1086060: bne   v1, zero, 0x1086084 lui   s2, 0x0
+// 0x01086680: 0x1086680: sll   zero, zero, 0
+// 0x01086684: 0x1086684: bne   v1, zero, 0x10866a8 lui   s2, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 9
-	brtrue L_1086084
+	brtrue L_10866a8
 // --- basic block ---
-// 0x01086068: 0x1086068: lui   a1, 0x20000
+// 0x0108668c: 0x108668c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_108606c:
-// 0x0108606c: 0x108606c: lui   a3, 0x20000
+L_1086690:
+// 0x01086690: 0x1086690: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086070: 0x1086070: addiu a1, a1, -21512
+// 0x01086694: 0x1086694: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086074: 0x1086074: addiu a3, a3, -20956
+// 0x01086698: 0x1086698: addiu a3, a3, -20492
 	ldloc 4
-	ldc.i4 -20956
+	ldc.i4 -20492
 	add
 	stloc 4
-// 0x01086078: 0x1086078: addiu a0, zero, 4
+// 0x0108669c: 0x108669c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108607c: 0x108607c: j	 0x1085f94 addiu a2, zero, 3799
+// 0x010866a0: 0x10866a0: j	 0x10865b8 addiu a2, zero, 3799
 	ldc.i4 3799
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_1086084:
-// 0x01086084: 0x1086084: addiu s0, zero, -1
+L_10866a8:
+// 0x010866a8: 0x10866a8: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x01086088: 0x1086088: addu  a0, v0, zero
+// 0x010866ac: 0x10866ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108608c: 0x108608c: addiu a1, s2, 28076
+// 0x010866b0: 0x10866b0: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086090: 0x1086090: addu  a2, zero, zero
+// 0x010866b4: 0x10866b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086094: 0x1086094: addiu a3, sp, 52
+// 0x010866b8: 0x10866b8: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x01086098: 0x1086098: jal   0x106855c sw    s0, 16(sp)
+// 0x010866bc: 0x10866bc: jal   0x106856c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3913,66 +3913,66 @@ L_1086084:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010860a0: 0x10860a0: beq   v0, zero, 0x10860b8 lui   a1, 0x20000
+// 0x010866c4: 0x10866c4: beq   v0, zero, 0x10866dc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10860b8
+	brfalse L_10866dc
 // --- basic block ---
-// 0x010860a8: 0x10860a8: lb    v1, 0(v0)
+// 0x010866cc: 0x10866cc: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010860ac: 0x10860ac: sll   zero, zero, 0
-// 0x010860b0: 0x10860b0: bne   v1, zero, 0x10860d0 sll   zero, zero, 0
+// 0x010866d0: 0x10866d0: sll   zero, zero, 0
+// 0x010866d4: 0x10866d4: bne   v1, zero, 0x10866f4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10860d0
+	brtrue L_10866f4
 // --- basic block ---
-L_10860b8:
-// 0x010860b8: 0x10860b8: lui   a3, 0x20000
+L_10866dc:
+// 0x010866dc: 0x10866dc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010860bc: 0x10860bc: addiu a1, a1, -21512
+// 0x010866e0: 0x10866e0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010860c0: 0x10860c0: addiu a3, a3, -20880
+// 0x010866e4: 0x10866e4: addiu a3, a3, -20416
 	ldloc 4
-	ldc.i4 -20880
+	ldc.i4 -20416
 	add
 	stloc 4
-// 0x010860c4: 0x10860c4: addiu a0, zero, 4
+// 0x010866e8: 0x10866e8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010860c8: 0x10860c8: j	 0x1085f94 addiu a2, zero, 3814
+// 0x010866ec: 0x10866ec: j	 0x10865b8 addiu a2, zero, 3814
 	ldc.i4 3814
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_10860d0:
-// 0x010860d0: 0x10860d0: addu  a0, v0, zero
+L_10866f4:
+// 0x010866f4: 0x10866f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010860d4: 0x10860d4: addiu a1, s2, 28076
+// 0x010866f8: 0x10866f8: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010860d8: 0x10860d8: addu  a2, zero, zero
+// 0x010866fc: 0x10866fc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010860dc: 0x10860dc: addiu a3, sp, 56
+// 0x01086700: 0x1086700: addiu a3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x010860e0: 0x10860e0: jal   0x106855c sw    s0, 16(sp)
+// 0x01086704: 0x1086704: jal   0x106856c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3986,66 +3986,66 @@ L_10860d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010860e8: 0x10860e8: beq   v0, zero, 0x1086100 lui   a1, 0x20000
+// 0x0108670c: 0x108670c: beq   v0, zero, 0x1086724 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086100
+	brfalse L_1086724
 // --- basic block ---
-// 0x010860f0: 0x10860f0: lb    v1, 0(v0)
+// 0x01086714: 0x1086714: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010860f4: 0x10860f4: sll   zero, zero, 0
-// 0x010860f8: 0x10860f8: bne   v1, zero, 0x1086118 sll   zero, zero, 0
+// 0x01086718: 0x1086718: sll   zero, zero, 0
+// 0x0108671c: 0x108671c: bne   v1, zero, 0x108673c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1086118
+	brtrue L_108673c
 // --- basic block ---
-L_1086100:
-// 0x01086100: 0x1086100: lui   a3, 0x20000
+L_1086724:
+// 0x01086724: 0x1086724: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086104: 0x1086104: addiu a1, a1, -21512
+// 0x01086728: 0x1086728: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086108: 0x1086108: addiu a3, a3, -20808
+// 0x0108672c: 0x108672c: addiu a3, a3, -20344
 	ldloc 4
-	ldc.i4 -20808
+	ldc.i4 -20344
 	add
 	stloc 4
-// 0x0108610c: 0x108610c: addiu a0, zero, 4
+// 0x01086730: 0x1086730: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086110: 0x1086110: j	 0x1085f94 addiu a2, zero, 3829
+// 0x01086734: 0x1086734: j	 0x10865b8 addiu a2, zero, 3829
 	ldc.i4 3829
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_1086118:
-// 0x01086118: 0x1086118: addu  a0, v0, zero
+L_108673c:
+// 0x0108673c: 0x108673c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108611c: 0x108611c: addiu a1, s2, 28076
+// 0x01086740: 0x1086740: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086120: 0x1086120: addu  a2, zero, zero
+// 0x01086744: 0x1086744: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086124: 0x1086124: addiu a3, sp, 60
+// 0x01086748: 0x1086748: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x01086128: 0x1086128: jal   0x106855c sw    s0, 16(sp)
+// 0x0108674c: 0x108674c: jal   0x106856c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4059,66 +4059,66 @@ L_1086118:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01086130: 0x1086130: beq   v0, zero, 0x1086148 lui   a1, 0x20000
+// 0x01086754: 0x1086754: beq   v0, zero, 0x108676c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086148
+	brfalse L_108676c
 // --- basic block ---
-// 0x01086138: 0x1086138: lb    v1, 0(v0)
+// 0x0108675c: 0x108675c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0108613c: 0x108613c: sll   zero, zero, 0
-// 0x01086140: 0x1086140: bne   v1, zero, 0x1086160 sll   zero, zero, 0
+// 0x01086760: 0x1086760: sll   zero, zero, 0
+// 0x01086764: 0x1086764: bne   v1, zero, 0x1086784 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1086160
+	brtrue L_1086784
 // --- basic block ---
-L_1086148:
-// 0x01086148: 0x1086148: lui   a3, 0x20000
+L_108676c:
+// 0x0108676c: 0x108676c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108614c: 0x108614c: addiu a1, a1, -21512
+// 0x01086770: 0x1086770: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086150: 0x1086150: addiu a3, a3, -20736
+// 0x01086774: 0x1086774: addiu a3, a3, -20272
 	ldloc 4
-	ldc.i4 -20736
+	ldc.i4 -20272
 	add
 	stloc 4
-// 0x01086154: 0x1086154: addiu a0, zero, 4
+// 0x01086778: 0x1086778: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086158: 0x1086158: j	 0x1085f94 addiu a2, zero, 3844
+// 0x0108677c: 0x108677c: j	 0x10865b8 addiu a2, zero, 3844
 	ldc.i4 3844
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_1086160:
-// 0x01086160: 0x1086160: addu  a0, v0, zero
+L_1086784:
+// 0x01086784: 0x1086784: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086164: 0x1086164: addiu a1, s2, 28076
+// 0x01086788: 0x1086788: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086168: 0x1086168: addu  a2, zero, zero
+// 0x0108678c: 0x108678c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108616c: 0x108616c: addiu a3, sp, 64
+// 0x01086790: 0x1086790: addiu a3, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 4
-// 0x01086170: 0x1086170: jal   0x106855c sw    s0, 16(sp)
+// 0x01086794: 0x1086794: jal   0x106856c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4132,66 +4132,66 @@ L_1086160:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01086178: 0x1086178: beq   v0, zero, 0x1086190 lui   a1, 0x20000
+// 0x0108679c: 0x108679c: beq   v0, zero, 0x10867b4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086190
+	brfalse L_10867b4
 // --- basic block ---
-// 0x01086180: 0x1086180: lb    v1, 0(v0)
+// 0x010867a4: 0x10867a4: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01086184: 0x1086184: sll   zero, zero, 0
-// 0x01086188: 0x1086188: bne   v1, zero, 0x10861a8 sll   zero, zero, 0
+// 0x010867a8: 0x10867a8: sll   zero, zero, 0
+// 0x010867ac: 0x10867ac: bne   v1, zero, 0x10867cc sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10861a8
+	brtrue L_10867cc
 // --- basic block ---
-L_1086190:
-// 0x01086190: 0x1086190: lui   a3, 0x20000
+L_10867b4:
+// 0x010867b4: 0x10867b4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086194: 0x1086194: addiu a1, a1, -21512
+// 0x010867b8: 0x10867b8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086198: 0x1086198: addiu a3, a3, -20660
+// 0x010867bc: 0x10867bc: addiu a3, a3, -20196
 	ldloc 4
-	ldc.i4 -20660
+	ldc.i4 -20196
 	add
 	stloc 4
-// 0x0108619c: 0x108619c: addiu a0, zero, 4
+// 0x010867c0: 0x10867c0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010861a0: 0x10861a0: j	 0x1085f94 addiu a2, zero, 3859
+// 0x010867c4: 0x10867c4: j	 0x10865b8 addiu a2, zero, 3859
 	ldc.i4 3859
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_10861a8:
-// 0x010861a8: 0x10861a8: addu  a0, v0, zero
+L_10867cc:
+// 0x010867cc: 0x10867cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010861ac: 0x10861ac: addiu a1, s2, 28076
+// 0x010867d0: 0x10867d0: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010861b0: 0x10861b0: addu  a2, zero, zero
+// 0x010867d4: 0x10867d4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010861b4: 0x10861b4: addiu a3, sp, 68
+// 0x010867d8: 0x10867d8: addiu a3, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 4
-// 0x010861b8: 0x10861b8: jal   0x106855c sw    s0, 16(sp)
+// 0x010867dc: 0x10867dc: jal   0x106856c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4205,72 +4205,72 @@ L_10861a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010861c0: 0x10861c0: beq   v0, zero, 0x10861d8 lui   a1, 0x20000
+// 0x010867e4: 0x10867e4: beq   v0, zero, 0x10867fc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10861d8
+	brfalse L_10867fc
 // --- basic block ---
-// 0x010861c8: 0x10861c8: lb    v1, 0(v0)
+// 0x010867ec: 0x10867ec: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010861cc: 0x10861cc: sll   zero, zero, 0
-// 0x010861d0: 0x10861d0: bne   v1, zero, 0x10861f0 sll   zero, zero, 0
+// 0x010867f0: 0x10867f0: sll   zero, zero, 0
+// 0x010867f4: 0x10867f4: bne   v1, zero, 0x1086814 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10861f0
+	brtrue L_1086814
 // --- basic block ---
-L_10861d8:
-// 0x010861d8: 0x10861d8: lui   a3, 0x20000
+L_10867fc:
+// 0x010867fc: 0x10867fc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010861dc: 0x10861dc: addiu a1, a1, -21512
+// 0x01086800: 0x1086800: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010861e0: 0x10861e0: addiu a3, a3, -20588
+// 0x01086804: 0x1086804: addiu a3, a3, -20124
 	ldloc 4
-	ldc.i4 -20588
+	ldc.i4 -20124
 	add
 	stloc 4
-// 0x010861e4: 0x10861e4: addiu a0, zero, 4
+// 0x01086808: 0x1086808: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010861e8: 0x10861e8: j	 0x1085f94 addiu a2, zero, 3874
+// 0x0108680c: 0x108680c: j	 0x10865b8 addiu a2, zero, 3874
 	ldc.i4 3874
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_10861f0:
-// 0x010861f0: 0x10861f0: lui   a1, 0x0
+L_1086814:
+// 0x01086814: 0x1086814: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010861f4: 0x10861f4: addiu s0, zero, -1
+// 0x01086818: 0x1086818: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x010861f8: 0x10861f8: addu  a0, v0, zero
+// 0x0108681c: 0x108681c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010861fc: 0x10861fc: addiu a1, a1, 28076
+// 0x01086820: 0x1086820: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086200: 0x1086200: addu  a2, zero, zero
+// 0x01086824: 0x1086824: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086204: 0x1086204: addiu a3, sp, 72
+// 0x01086828: 0x1086828: addiu a3, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 4
-// 0x01086208: 0x1086208: jal   0x106855c sw    s0, 16(sp)
+// 0x0108682c: 0x108682c: jal   0x106856c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4284,74 +4284,74 @@ L_10861f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01086210: 0x1086210: beq   v0, zero, 0x1086228 lui   a1, 0x20000
+// 0x01086834: 0x1086834: beq   v0, zero, 0x108684c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086228
+	brfalse L_108684c
 // --- basic block ---
-// 0x01086218: 0x1086218: lb    v1, 0(v0)
+// 0x0108683c: 0x108683c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0108621c: 0x108621c: sll   zero, zero, 0
-// 0x01086220: 0x1086220: bne   v1, zero, 0x1086240 sll   zero, zero, 0
+// 0x01086840: 0x1086840: sll   zero, zero, 0
+// 0x01086844: 0x1086844: bne   v1, zero, 0x1086864 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1086240
+	brtrue L_1086864
 // --- basic block ---
-L_1086228:
-// 0x01086228: 0x1086228: lui   a3, 0x20000
+L_108684c:
+// 0x0108684c: 0x108684c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108622c: 0x108622c: addiu a1, a1, -21512
+// 0x01086850: 0x1086850: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086230: 0x1086230: addiu a3, a3, -20512
+// 0x01086854: 0x1086854: addiu a3, a3, -20048
 	ldloc 4
-	ldc.i4 -20512
+	ldc.i4 -20048
 	add
 	stloc 4
-// 0x01086234: 0x1086234: addiu a0, zero, 4
+// 0x01086858: 0x1086858: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086238: 0x1086238: j	 0x1085f94 addiu a2, zero, 3889
+// 0x0108685c: 0x108685c: j	 0x10865b8 addiu a2, zero, 3889
 	ldc.i4 3889
 	stloc.3
-	br L_1085f94
+	br L_10865b8
 // --- basic block ---
-L_1086240:
-// 0x01086240: 0x1086240: lui   a3, 0x0
+L_1086864:
+// 0x01086864: 0x1086864: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01086244: 0x1086244: addu  a0, v0, zero
+// 0x01086868: 0x1086868: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086248: 0x1086248: addiu a3, a3, 30268
+// 0x0108686c: 0x108686c: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x0108624c: 0x108624c: addiu v0, zero, 128
+// 0x01086870: 0x1086870: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x01086250: 0x1086250: addiu a1, sp, 76
+// 0x01086874: 0x1086874: addiu a1, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.2
-// 0x01086254: 0x1086254: addiu a2, sp, 24
+// 0x01086878: 0x1086878: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01086258: 0x1086258: sw    s0, 16(sp)
+// 0x0108687c: 0x108687c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4360,7 +4360,7 @@ L_1086240:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108625c: 0x108625c: jal   0x1068250 sw    v0, 24(sp)
+// 0x01086880: 0x1086880: jal   0x1068260 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4374,37 +4374,37 @@ L_1086240:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01086264: 0x1086264: bne   v0, zero, 0x1086294 addu  s0, v0, zero
+// 0x01086888: 0x1086888: bne   v0, zero, 0x10868b8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1086294
+	brtrue L_10868b8
 // --- basic block ---
-// 0x0108626c: 0x108626c: lui   a1, 0x20000
+// 0x01086890: 0x1086890: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086270: 0x1086270: lui   a3, 0x20000
+// 0x01086894: 0x1086894: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086274: 0x1086274: addiu a1, a1, -21512
+// 0x01086898: 0x1086898: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086278: 0x1086278: addiu a3, a3, -20436
+// 0x0108689c: 0x108689c: addiu a3, a3, -19972
 	ldloc 4
-	ldc.i4 -20436
+	ldc.i4 -19972
 	add
 	stloc 4
-// 0x0108627c: 0x108627c: addiu a0, zero, 4
+// 0x010868a0: 0x10868a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086280: 0x1086280: jal   0x100449c addiu a2, zero, 3904
+// 0x010868a4: 0x10868a4: jal   0x100449c addiu a2, zero, 3904
 	ldc.i4 3904
 	stloc.3
 	ldloc.0
@@ -4417,20 +4417,20 @@ L_1086240:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01086288: 0x1086288: addiu v0, zero, 18
+// 0x010868ac: 0x10868ac: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0108628c: 0x108628c: j	 0x108629c sw    v0, 0(s1)
+// 0x010868b0: 0x10868b0: j	 0x10868c0 sw    v0, 0(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_108629c
+	br L_10868c0
 // --- basic block ---
-L_1086294:
-// 0x01086294: 0x1086294: jal   0x109011c addiu a0, sp, 28
+L_10868b8:
+// 0x010868b8: 0x10868b8: jal   0x1090740 addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -4440,17 +4440,17 @@ L_1086294:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_ExternalPoi_Add_109011c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_ExternalPoi_Add_1090740(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108629c:
-// 0x0108629c: 0x108629c: lw    ra, 228(sp)
-// 0x010862a0: 0x10862a0: addu  v0, s0, zero
+L_10868c0:
+// 0x010868c0: 0x10868c0: lw    ra, 228(sp)
+// 0x010868c4: 0x10868c4: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010862a4: 0x10862a4: lw    s3, 224(sp)
+// 0x010868c8: 0x10868c8: lw    s3, 224(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4459,7 +4459,7 @@ L_108629c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010862a8: 0x10862a8: lw    s2, 220(sp)
+// 0x010868cc: 0x10868cc: lw    s2, 220(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4468,7 +4468,7 @@ L_108629c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010862ac: 0x10862ac: lw    s1, 216(sp)
+// 0x010868d0: 0x10868d0: lw    s1, 216(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4477,7 +4477,7 @@ L_108629c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010862b0: 0x10862b0: lw    s0, 212(sp)
+// 0x010868d4: 0x10868d4: lw    s0, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4486,7 +4486,7 @@ L_108629c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010862b4: 0x10862b4: jr    ra addiu sp, sp, 232
+// 0x010868d8: 0x10868d8: jr    ra addiu sp, sp, 232
 	ldloc.0
 	ldc.i4 232
 	add
@@ -4498,7 +4498,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 AddExternalPoiType_10862bc(int32,int32,int32,int32,int32)
+.method public static int32 AddExternalPoiType_10868e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 s1,int32 s4,int32 ra)
@@ -4548,13 +4548,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10862bc:
-// 0x010862bc: 0x10862bc: addiu sp, sp, -472
+L_10868e0:
+// 0x010868e0: 0x10868e0: addiu sp, sp, -472
 	ldloc.0
 	ldc.i4 -472
 	add
 	stloc.0
-// 0x010862c0: 0x10862c0: sw    s2, 456(sp)
+// 0x010868e4: 0x10868e4: sw    s2, 456(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4563,12 +4563,12 @@ L_10862bc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010862c4: 0x10862c4: addiu s2, sp, 28
+// 0x010868e8: 0x10868e8: addiu s2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 8
-// 0x010862c8: 0x10862c8: sw    s3, 460(sp)
+// 0x010868ec: 0x10868ec: sw    s3, 460(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4577,7 +4577,7 @@ L_10862bc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010862cc: 0x10862cc: sw    s0, 448(sp)
+// 0x010868f0: 0x10868f0: sw    s0, 448(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4586,16 +4586,16 @@ L_10862bc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010862d0: 0x10862d0: addu  s3, a0, zero
+// 0x010868f4: 0x10868f4: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010862d4: 0x10862d4: lui   s0, 0x0
+// 0x010868f8: 0x10868f8: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010862d8: 0x10862d8: addu  a0, s2, zero
+// 0x010868fc: 0x10868fc: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010862dc: 0x10862dc: sw    s1, 452(sp)
+// 0x01086900: 0x1086900: sw    s1, 452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4604,11 +4604,11 @@ L_10862bc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010862e0: 0x10862e0: sw    ra, 468(sp)
-// 0x010862e4: 0x10862e4: addu  s1, a3, zero
+// 0x01086904: 0x1086904: sw    ra, 468(sp)
+// 0x01086908: 0x1086908: addu  s1, a3, zero
 	ldloc 4
 	stloc 11
-// 0x010862e8: 0x10862e8: jal   0x108efa4 sw    s4, 464(sp)
+// 0x0108690c: 0x108690c: jal   0x108f5c8 sw    s4, 464(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4622,29 +4622,29 @@ L_10862bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoiType_Init_108efa4(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoiType_Init_108f5c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010862f0: 0x10862f0: addu  a3, s2, zero
+// 0x01086914: 0x1086914: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x010862f4: 0x10862f4: addu  a0, s3, zero
+// 0x01086918: 0x1086918: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010862f8: 0x10862f8: addiu s2, zero, 1
+// 0x0108691c: 0x108691c: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010862fc: 0x10862fc: addiu a1, s0, 28076
+// 0x01086920: 0x1086920: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086300: 0x1086300: addu  a2, zero, zero
+// 0x01086924: 0x1086924: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086304: 0x1086304: jal   0x106855c sw    s2, 16(sp)
+// 0x01086928: 0x1086928: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4658,66 +4658,66 @@ L_10862bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108630c: 0x108630c: beq   v0, zero, 0x1086324 lui   a1, 0x20000
+// 0x01086930: 0x1086930: beq   v0, zero, 0x1086948 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086324
+	brfalse L_1086948
 // --- basic block ---
-// 0x01086314: 0x1086314: lb    v1, 0(v0)
+// 0x01086938: 0x1086938: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086318: 0x1086318: sll   zero, zero, 0
-// 0x0108631c: 0x108631c: bne   v1, zero, 0x108633c sll   zero, zero, 0
+// 0x0108693c: 0x108693c: sll   zero, zero, 0
+// 0x01086940: 0x1086940: bne   v1, zero, 0x1086960 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108633c
+	brtrue L_1086960
 // --- basic block ---
-L_1086324:
-// 0x01086324: 0x1086324: lui   a3, 0x20000
+L_1086948:
+// 0x01086948: 0x1086948: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086328: 0x1086328: addiu a1, a1, -21512
+// 0x0108694c: 0x108694c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108632c: 0x108632c: addiu a3, a3, -20356
+// 0x01086950: 0x1086950: addiu a3, a3, -19892
 	ldloc 4
-	ldc.i4 -20356
+	ldc.i4 -19892
 	add
 	stloc 4
-// 0x01086330: 0x1086330: addiu a0, zero, 4
+// 0x01086954: 0x1086954: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086334: 0x1086334: j	 0x1086384 addiu a2, zero, 3569
+// 0x01086958: 0x1086958: j	 0x10869a8 addiu a2, zero, 3569
 	ldc.i4 3569
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_108633c:
-// 0x0108633c: 0x108633c: addu  a0, v0, zero
+L_1086960:
+// 0x01086960: 0x1086960: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086340: 0x1086340: addiu a1, s0, 28076
+// 0x01086964: 0x1086964: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086344: 0x1086344: addu  a2, zero, zero
+// 0x01086968: 0x1086968: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086348: 0x1086348: addiu a3, sp, 32
+// 0x0108696c: 0x108696c: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x0108634c: 0x108634c: jal   0x106855c sw    s2, 16(sp)
+// 0x01086970: 0x1086970: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4731,53 +4731,53 @@ L_108633c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086354: 0x1086354: beq   v0, zero, 0x1086370 lui   a1, 0x20000
+// 0x01086978: 0x1086978: beq   v0, zero, 0x1086994 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086370
+	brfalse L_1086994
 // --- basic block ---
-// 0x0108635c: 0x108635c: lb    v1, 0(v0)
+// 0x01086980: 0x1086980: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086360: 0x1086360: sll   zero, zero, 0
-// 0x01086364: 0x1086364: bne   v1, zero, 0x1086398 addu  a0, v0, zero
+// 0x01086984: 0x1086984: sll   zero, zero, 0
+// 0x01086988: 0x1086988: bne   v1, zero, 0x10869bc addu  a0, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brtrue L_1086398
+	brtrue L_10869bc
 // --- basic block ---
-// 0x0108636c: 0x108636c: lui   a1, 0x20000
+// 0x01086990: 0x1086990: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1086370:
-// 0x01086370: 0x1086370: lui   a3, 0x20000
+L_1086994:
+// 0x01086994: 0x1086994: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086374: 0x1086374: addiu a1, a1, -21512
+// 0x01086998: 0x1086998: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086378: 0x1086378: addiu a3, a3, -20288
+// 0x0108699c: 0x108699c: addiu a3, a3, -19824
 	ldloc 4
-	ldc.i4 -20288
+	ldc.i4 -19824
 	add
 	stloc 4
-// 0x0108637c: 0x108637c: addiu a0, zero, 4
+// 0x010869a0: 0x10869a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086380: 0x1086380: addiu a2, zero, 3584
+// 0x010869a4: 0x10869a4: addiu a2, zero, 3584
 	ldc.i4 3584
 	stloc.3
-L_1086384:
-// 0x01086384: 0x1086384: jal   0x100449c addu  s0, zero, zero
+L_10869a8:
+// 0x010869a8: 0x10869a8: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -4790,33 +4790,33 @@ L_1086384:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108638c: 0x108638c: addiu v0, zero, 18
+// 0x010869b0: 0x10869b0: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01086390: 0x1086390: j	 0x108660c sw    v0, 0(s1)
+// 0x010869b4: 0x10869b4: j	 0x1086c30 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_108660c
+	br L_1086c30
 // --- basic block ---
-L_1086398:
-// 0x01086398: 0x1086398: addiu a1, s0, 28076
+L_10869bc:
+// 0x010869bc: 0x10869bc: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108639c: 0x108639c: addu  a2, zero, zero
+// 0x010869c0: 0x10869c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010863a0: 0x10863a0: addiu a3, sp, 36
+// 0x010869c4: 0x10869c4: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x010863a4: 0x10863a4: jal   0x106855c sw    s2, 16(sp)
+// 0x010869c8: 0x10869c8: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4830,79 +4830,79 @@ L_1086398:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010863ac: 0x10863ac: beq   v0, zero, 0x10863c8 lui   a1, 0x20000
+// 0x010869d0: 0x10869d0: beq   v0, zero, 0x10869ec lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10863c8
+	brfalse L_10869ec
 // --- basic block ---
-// 0x010863b4: 0x10863b4: lb    v1, 0(v0)
+// 0x010869d8: 0x10869d8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010863b8: 0x10863b8: sll   zero, zero, 0
-// 0x010863bc: 0x10863bc: bne   v1, zero, 0x10863e0 addiu s4, sp, 24
+// 0x010869dc: 0x10869dc: sll   zero, zero, 0
+// 0x010869e0: 0x10869e0: bne   v1, zero, 0x1086a04 addiu s4, sp, 24
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 12
-	brtrue L_10863e0
+	brtrue L_1086a04
 // --- basic block ---
-// 0x010863c4: 0x10863c4: lui   a1, 0x20000
+// 0x010869e8: 0x10869e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10863c8:
-// 0x010863c8: 0x10863c8: lui   a3, 0x20000
+L_10869ec:
+// 0x010869ec: 0x10869ec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010863cc: 0x10863cc: addiu a1, a1, -21512
+// 0x010869f0: 0x10869f0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010863d0: 0x10863d0: addiu a3, a3, -20212
+// 0x010869f4: 0x10869f4: addiu a3, a3, -19748
 	ldloc 4
-	ldc.i4 -20212
+	ldc.i4 -19748
 	add
 	stloc 4
-// 0x010863d4: 0x10863d4: addiu a0, zero, 4
+// 0x010869f8: 0x10869f8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010863d8: 0x10863d8: j	 0x1086384 addiu a2, zero, 3599
+// 0x010869fc: 0x10869fc: j	 0x10869a8 addiu a2, zero, 3599
 	ldc.i4 3599
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_10863e0:
-// 0x010863e0: 0x10863e0: addiu s3, zero, 128
+L_1086a04:
+// 0x01086a04: 0x1086a04: addiu s3, zero, 128
 	ldc.i4 128
 	stloc 10
-// 0x010863e4: 0x10863e4: addiu s2, zero, -1
+// 0x01086a08: 0x1086a08: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x010863e8: 0x10863e8: addu  a0, v0, zero
+// 0x01086a0c: 0x1086a0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010863ec: 0x10863ec: addiu a1, sp, 168
+// 0x01086a10: 0x1086a10: addiu a1, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
 	stloc.2
-// 0x010863f0: 0x10863f0: addu  a2, s4, zero
+// 0x01086a14: 0x1086a14: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x010863f4: 0x10863f4: addiu a3, s0, 28076
+// 0x01086a18: 0x1086a18: addiu a3, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010863f8: 0x10863f8: sw    s3, 24(sp)
+// 0x01086a1c: 0x1086a1c: sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4911,7 +4911,7 @@ L_10863e0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010863fc: 0x10863fc: jal   0x1068250 sw    s2, 16(sp)
+// 0x01086a20: 0x1086a20: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4925,66 +4925,66 @@ L_10863e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086404: 0x1086404: beq   v0, zero, 0x108641c lui   a1, 0x20000
+// 0x01086a28: 0x1086a28: beq   v0, zero, 0x1086a40 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108641c
+	brfalse L_1086a40
 // --- basic block ---
-// 0x0108640c: 0x108640c: lb    v1, 0(v0)
+// 0x01086a30: 0x1086a30: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086410: 0x1086410: sll   zero, zero, 0
-// 0x01086414: 0x1086414: bne   v1, zero, 0x1086434 sll   zero, zero, 0
+// 0x01086a34: 0x1086a34: sll   zero, zero, 0
+// 0x01086a38: 0x1086a38: bne   v1, zero, 0x1086a58 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1086434
+	brtrue L_1086a58
 // --- basic block ---
-L_108641c:
-// 0x0108641c: 0x108641c: lui   a3, 0x20000
+L_1086a40:
+// 0x01086a40: 0x1086a40: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086420: 0x1086420: addiu a1, a1, -21512
+// 0x01086a44: 0x1086a44: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086424: 0x1086424: addiu a3, a3, -20132
+// 0x01086a48: 0x1086a48: addiu a3, a3, -19668
 	ldloc 4
-	ldc.i4 -20132
+	ldc.i4 -19668
 	add
 	stloc 4
-// 0x01086428: 0x1086428: addiu a0, zero, 4
+// 0x01086a4c: 0x1086a4c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108642c: 0x108642c: j	 0x1086384 addiu a2, zero, 3615
+// 0x01086a50: 0x1086a50: j	 0x10869a8 addiu a2, zero, 3615
 	ldc.i4 3615
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_1086434:
-// 0x01086434: 0x1086434: addu  a0, v0, zero
+L_1086a58:
+// 0x01086a58: 0x1086a58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086438: 0x1086438: addu  a2, s4, zero
+// 0x01086a5c: 0x1086a5c: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x0108643c: 0x108643c: addiu a3, s0, 28076
+// 0x01086a60: 0x1086a60: addiu a3, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086440: 0x1086440: addiu a1, sp, 40
+// 0x01086a64: 0x1086a64: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x01086444: 0x1086444: sw    s3, 24(sp)
+// 0x01086a68: 0x1086a68: sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4993,7 +4993,7 @@ L_1086434:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01086448: 0x1086448: jal   0x1068250 sw    s2, 16(sp)
+// 0x01086a6c: 0x1086a6c: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5007,79 +5007,79 @@ L_1086434:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086450: 0x1086450: beq   v0, zero, 0x108646c lui   a1, 0x20000
+// 0x01086a74: 0x1086a74: beq   v0, zero, 0x1086a90 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108646c
+	brfalse L_1086a90
 // --- basic block ---
-// 0x01086458: 0x1086458: lb    v1, 0(v0)
+// 0x01086a7c: 0x1086a7c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108645c: 0x108645c: sll   zero, zero, 0
-// 0x01086460: 0x1086460: bne   v1, zero, 0x1086484 addiu s3, zero, -1
+// 0x01086a80: 0x1086a80: sll   zero, zero, 0
+// 0x01086a84: 0x1086a84: bne   v1, zero, 0x1086aa8 addiu s3, zero, -1
 	ldloc 7
 	ldc.i4.m1
 	stloc 10
-	brtrue L_1086484
+	brtrue L_1086aa8
 // --- basic block ---
-// 0x01086468: 0x1086468: lui   a1, 0x20000
+// 0x01086a8c: 0x1086a8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_108646c:
-// 0x0108646c: 0x108646c: lui   a3, 0x20000
+L_1086a90:
+// 0x01086a90: 0x1086a90: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086470: 0x1086470: addiu a1, a1, -21512
+// 0x01086a94: 0x1086a94: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086474: 0x1086474: addiu a3, a3, -20056
+// 0x01086a98: 0x1086a98: addiu a3, a3, -19592
 	ldloc 4
-	ldc.i4 -20056
+	ldc.i4 -19592
 	add
 	stloc 4
-// 0x01086478: 0x1086478: addiu a0, zero, 4
+// 0x01086a9c: 0x1086a9c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108647c: 0x108647c: j	 0x1086384 addiu a2, zero, 3631
+// 0x01086aa0: 0x1086aa0: j	 0x10869a8 addiu a2, zero, 3631
 	ldc.i4 3631
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_1086484:
-// 0x01086484: 0x1086484: lui   s0, 0x0
+L_1086aa8:
+// 0x01086aa8: 0x1086aa8: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01086488: 0x1086488: addu  a0, v0, zero
+// 0x01086aac: 0x1086aac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108648c: 0x108648c: addiu v0, zero, 128
+// 0x01086ab0: 0x1086ab0: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x01086490: 0x1086490: addiu a1, sp, 296
+// 0x01086ab4: 0x1086ab4: addiu a1, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
 	stloc.2
-// 0x01086494: 0x1086494: addiu a2, sp, 24
+// 0x01086ab8: 0x1086ab8: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01086498: 0x1086498: addiu a3, s0, 28076
+// 0x01086abc: 0x1086abc: addiu a3, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108649c: 0x108649c: sw    v0, 24(sp)
+// 0x01086ac0: 0x1086ac0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5088,7 +5088,7 @@ L_1086484:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010864a0: 0x10864a0: jal   0x1068250 sw    s3, 16(sp)
+// 0x01086ac4: 0x1086ac4: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5102,71 +5102,71 @@ L_1086484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010864a8: 0x10864a8: beq   v0, zero, 0x10864c4 lui   a1, 0x20000
+// 0x01086acc: 0x1086acc: beq   v0, zero, 0x1086ae8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10864c4
+	brfalse L_1086ae8
 // --- basic block ---
-// 0x010864b0: 0x10864b0: lb    v1, 0(v0)
+// 0x01086ad4: 0x1086ad4: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010864b4: 0x10864b4: sll   zero, zero, 0
-// 0x010864b8: 0x10864b8: bne   v1, zero, 0x10864dc addiu s2, zero, 1
+// 0x01086ad8: 0x1086ad8: sll   zero, zero, 0
+// 0x01086adc: 0x1086adc: bne   v1, zero, 0x1086b00 addiu s2, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 8
-	brtrue L_10864dc
+	brtrue L_1086b00
 // --- basic block ---
-// 0x010864c0: 0x10864c0: lui   a1, 0x20000
+// 0x01086ae4: 0x1086ae4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10864c4:
-// 0x010864c4: 0x10864c4: lui   a3, 0x20000
+L_1086ae8:
+// 0x01086ae8: 0x1086ae8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010864c8: 0x10864c8: addiu a1, a1, -21512
+// 0x01086aec: 0x1086aec: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010864cc: 0x10864cc: addiu a3, a3, -19980
+// 0x01086af0: 0x1086af0: addiu a3, a3, -19516
 	ldloc 4
-	ldc.i4 -19980
+	ldc.i4 -19516
 	add
 	stloc 4
-// 0x010864d0: 0x10864d0: addiu a0, zero, 4
+// 0x01086af4: 0x1086af4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010864d4: 0x10864d4: j	 0x1086384 addiu a2, zero, 3647
+// 0x01086af8: 0x1086af8: j	 0x10869a8 addiu a2, zero, 3647
 	ldc.i4 3647
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_10864dc:
-// 0x010864dc: 0x10864dc: addu  a0, v0, zero
+L_1086b00:
+// 0x01086b00: 0x1086b00: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010864e0: 0x10864e0: addiu a1, s0, 28076
+// 0x01086b04: 0x1086b04: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010864e4: 0x10864e4: addu  a2, zero, zero
+// 0x01086b08: 0x1086b08: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010864e8: 0x10864e8: addiu a3, sp, 424
+// 0x01086b0c: 0x1086b0c: addiu a3, sp, 424
 	ldloc.0
 	ldc.i4 424
 	add
 	stloc 4
-// 0x010864ec: 0x10864ec: jal   0x106855c sw    s2, 16(sp)
+// 0x01086b10: 0x1086b10: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5180,66 +5180,66 @@ L_10864dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010864f4: 0x10864f4: beq   v0, zero, 0x108650c lui   a1, 0x20000
+// 0x01086b18: 0x1086b18: beq   v0, zero, 0x1086b30 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108650c
+	brfalse L_1086b30
 // --- basic block ---
-// 0x010864fc: 0x10864fc: lb    v1, 0(v0)
+// 0x01086b20: 0x1086b20: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086500: 0x1086500: sll   zero, zero, 0
-// 0x01086504: 0x1086504: bne   v1, zero, 0x1086524 sll   zero, zero, 0
+// 0x01086b24: 0x1086b24: sll   zero, zero, 0
+// 0x01086b28: 0x1086b28: bne   v1, zero, 0x1086b48 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1086524
+	brtrue L_1086b48
 // --- basic block ---
-L_108650c:
-// 0x0108650c: 0x108650c: lui   a3, 0x20000
+L_1086b30:
+// 0x01086b30: 0x1086b30: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086510: 0x1086510: addiu a1, a1, -21512
+// 0x01086b34: 0x1086b34: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086514: 0x1086514: addiu a3, a3, -19904
+// 0x01086b38: 0x1086b38: addiu a3, a3, -19440
 	ldloc 4
-	ldc.i4 -19904
+	ldc.i4 -19440
 	add
 	stloc 4
-// 0x01086518: 0x1086518: addiu a0, zero, 4
+// 0x01086b3c: 0x1086b3c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108651c: 0x108651c: j	 0x1086384 addiu a2, zero, 3662
+// 0x01086b40: 0x1086b40: j	 0x10869a8 addiu a2, zero, 3662
 	ldc.i4 3662
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_1086524:
-// 0x01086524: 0x1086524: addu  a0, v0, zero
+L_1086b48:
+// 0x01086b48: 0x1086b48: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086528: 0x1086528: addiu a1, s0, 28076
+// 0x01086b4c: 0x1086b4c: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108652c: 0x108652c: addu  a2, zero, zero
+// 0x01086b50: 0x1086b50: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086530: 0x1086530: addiu a3, sp, 432
+// 0x01086b54: 0x1086b54: addiu a3, sp, 432
 	ldloc.0
 	ldc.i4 432
 	add
 	stloc 4
-// 0x01086534: 0x1086534: jal   0x106855c sw    s2, 16(sp)
+// 0x01086b58: 0x1086b58: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5253,66 +5253,66 @@ L_1086524:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108653c: 0x108653c: beq   v0, zero, 0x1086554 lui   a1, 0x20000
+// 0x01086b60: 0x1086b60: beq   v0, zero, 0x1086b78 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086554
+	brfalse L_1086b78
 // --- basic block ---
-// 0x01086544: 0x1086544: lb    v1, 0(v0)
+// 0x01086b68: 0x1086b68: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086548: 0x1086548: sll   zero, zero, 0
-// 0x0108654c: 0x108654c: bne   v1, zero, 0x108656c sll   zero, zero, 0
+// 0x01086b6c: 0x1086b6c: sll   zero, zero, 0
+// 0x01086b70: 0x1086b70: bne   v1, zero, 0x1086b90 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108656c
+	brtrue L_1086b90
 // --- basic block ---
-L_1086554:
-// 0x01086554: 0x1086554: lui   a3, 0x20000
+L_1086b78:
+// 0x01086b78: 0x1086b78: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086558: 0x1086558: addiu a1, a1, -21512
+// 0x01086b7c: 0x1086b7c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108655c: 0x108655c: addiu a3, a3, -19832
+// 0x01086b80: 0x1086b80: addiu a3, a3, -19368
 	ldloc 4
-	ldc.i4 -19832
+	ldc.i4 -19368
 	add
 	stloc 4
-// 0x01086560: 0x1086560: addiu a0, zero, 4
+// 0x01086b84: 0x1086b84: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086564: 0x1086564: j	 0x1086384 addiu a2, zero, 3677
+// 0x01086b88: 0x1086b88: j	 0x10869a8 addiu a2, zero, 3677
 	ldc.i4 3677
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_108656c:
-// 0x0108656c: 0x108656c: addu  a0, v0, zero
+L_1086b90:
+// 0x01086b90: 0x1086b90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086570: 0x1086570: addiu a1, s0, 28076
+// 0x01086b94: 0x1086b94: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086574: 0x1086574: addu  a2, zero, zero
+// 0x01086b98: 0x1086b98: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086578: 0x1086578: addiu a3, sp, 428
+// 0x01086b9c: 0x1086b9c: addiu a3, sp, 428
 	ldloc.0
 	ldc.i4 428
 	add
 	stloc 4
-// 0x0108657c: 0x108657c: jal   0x106855c sw    s2, 16(sp)
+// 0x01086ba0: 0x1086ba0: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5326,69 +5326,69 @@ L_108656c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086584: 0x1086584: beq   v0, zero, 0x108659c lui   a1, 0x20000
+// 0x01086ba8: 0x1086ba8: beq   v0, zero, 0x1086bc0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108659c
+	brfalse L_1086bc0
 // --- basic block ---
-// 0x0108658c: 0x108658c: lb    v1, 0(v0)
+// 0x01086bb0: 0x1086bb0: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086590: 0x1086590: sll   zero, zero, 0
-// 0x01086594: 0x1086594: bne   v1, zero, 0x10865b4 sll   zero, zero, 0
+// 0x01086bb4: 0x1086bb4: sll   zero, zero, 0
+// 0x01086bb8: 0x1086bb8: bne   v1, zero, 0x1086bd8 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10865b4
+	brtrue L_1086bd8
 // --- basic block ---
-L_108659c:
-// 0x0108659c: 0x108659c: lui   a3, 0x20000
+L_1086bc0:
+// 0x01086bc0: 0x1086bc0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010865a0: 0x10865a0: addiu a1, a1, -21512
+// 0x01086bc4: 0x1086bc4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010865a4: 0x10865a4: addiu a3, a3, -19740
+// 0x01086bc8: 0x1086bc8: addiu a3, a3, -19276
 	ldloc 4
-	ldc.i4 -19740
+	ldc.i4 -19276
 	add
 	stloc 4
-// 0x010865a8: 0x10865a8: addiu a0, zero, 4
+// 0x01086bcc: 0x1086bcc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010865ac: 0x10865ac: j	 0x1086384 addiu a2, zero, 3692
+// 0x01086bd0: 0x1086bd0: j	 0x10869a8 addiu a2, zero, 3692
 	ldc.i4 3692
 	stloc.3
-	br L_1086384
+	br L_10869a8
 // --- basic block ---
-L_10865b4:
-// 0x010865b4: 0x10865b4: lui   a1, 0x0
+L_1086bd8:
+// 0x01086bd8: 0x1086bd8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010865b8: 0x10865b8: addu  a0, v0, zero
+// 0x01086bdc: 0x1086bdc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010865bc: 0x10865bc: addiu a1, a1, 30268
+// 0x01086be0: 0x1086be0: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010865c0: 0x10865c0: addu  a2, zero, zero
+// 0x01086be4: 0x1086be4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010865c4: 0x10865c4: addiu a3, sp, 436
+// 0x01086be8: 0x1086be8: addiu a3, sp, 436
 	ldloc.0
 	ldc.i4 436
 	add
 	stloc 4
-// 0x010865c8: 0x10865c8: jal   0x106855c sw    s3, 16(sp)
+// 0x01086bec: 0x1086bec: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5402,37 +5402,37 @@ L_10865b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010865d0: 0x10865d0: bne   v0, zero, 0x1086600 addu  s0, v0, zero
+// 0x01086bf4: 0x1086bf4: bne   v0, zero, 0x1086c24 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1086600
+	brtrue L_1086c24
 // --- basic block ---
-// 0x010865d8: 0x10865d8: lui   a1, 0x20000
+// 0x01086bfc: 0x1086bfc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010865dc: 0x10865dc: lui   a3, 0x20000
+// 0x01086c00: 0x1086c00: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010865e0: 0x10865e0: addiu a1, a1, -21512
+// 0x01086c04: 0x1086c04: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010865e4: 0x10865e4: addiu a3, a3, -19648
+// 0x01086c08: 0x1086c08: addiu a3, a3, -19184
 	ldloc 4
-	ldc.i4 -19648
+	ldc.i4 -19184
 	add
 	stloc 4
-// 0x010865e8: 0x10865e8: addiu a0, zero, 4
+// 0x01086c0c: 0x1086c0c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010865ec: 0x10865ec: jal   0x100449c addiu a2, zero, 3708
+// 0x01086c10: 0x1086c10: jal   0x100449c addiu a2, zero, 3708
 	ldc.i4 3708
 	stloc.3
 	ldloc.0
@@ -5445,25 +5445,25 @@ L_10865b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010865f4: 0x10865f4: addiu v0, zero, 18
+// 0x01086c18: 0x1086c18: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x010865f8: 0x10865f8: j	 0x108660c sw    v0, 0(s1)
+// 0x01086c1c: 0x1086c1c: j	 0x1086c30 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_108660c
+	br L_1086c30
 // --- basic block ---
-L_1086600:
-// 0x01086600: 0x1086600: addiu a0, sp, 28
+L_1086c24:
+// 0x01086c24: 0x1086c24: addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x01086604: 0x1086604: jal   0x108ff44 sw    s2, 440(sp)
+// 0x01086c28: 0x1086c28: jal   0x1090568 sw    s2, 440(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5477,17 +5477,17 @@ L_1086600:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_ExternalPoiType_Add_108ff44(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_ExternalPoiType_Add_1090568(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108660c:
-// 0x0108660c: 0x108660c: lw    ra, 468(sp)
-// 0x01086610: 0x1086610: addu  v0, s0, zero
+L_1086c30:
+// 0x01086c30: 0x1086c30: lw    ra, 468(sp)
+// 0x01086c34: 0x1086c34: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x01086614: 0x1086614: lw    s4, 464(sp)
+// 0x01086c38: 0x1086c38: lw    s4, 464(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5496,7 +5496,7 @@ L_108660c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01086618: 0x1086618: lw    s3, 460(sp)
+// 0x01086c3c: 0x1086c3c: lw    s3, 460(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5505,7 +5505,7 @@ L_108660c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108661c: 0x108661c: lw    s2, 456(sp)
+// 0x01086c40: 0x1086c40: lw    s2, 456(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5514,7 +5514,7 @@ L_108660c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01086620: 0x1086620: lw    s1, 452(sp)
+// 0x01086c44: 0x1086c44: lw    s1, 452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5523,7 +5523,7 @@ L_108660c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01086624: 0x1086624: lw    s0, 448(sp)
+// 0x01086c48: 0x1086c48: lw    s0, 448(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5532,7 +5532,7 @@ L_108660c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01086628: 0x1086628: jr    ra addiu sp, sp, 472
+// 0x01086c4c: 0x1086c4c: jr    ra addiu sp, sp, 472
 	ldloc.0
 	ldc.i4 472
 	add
@@ -5544,7 +5544,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OpenMessageTicker_1086630(int32,int32,int32,int32,int32)
+.method public static int32 OpenMessageTicker_1086c54(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s4,int32 s0,int32 v1,int32 s2,int32 s3,int32 s5,int32 s6,int32 s7,int32 s1,int32 ra)
@@ -5603,13 +5603,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1086630:
-// 0x01086630: 0x1086630: addiu sp, sp, -840
+L_1086c54:
+// 0x01086c54: 0x1086c54: addiu sp, sp, -840
 	ldloc.0
 	ldc.i4 -840
 	add
 	stloc.0
-// 0x01086634: 0x1086634: sw    s5, 824(sp)
+// 0x01086c58: 0x1086c58: sw    s5, 824(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5618,10 +5618,10 @@ L_1086630:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01086638: 0x1086638: lui   s5, 0x0
+// 0x01086c5c: 0x1086c5c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x0108663c: 0x108663c: sw    s4, 820(sp)
+// 0x01086c60: 0x1086c60: sw    s4, 820(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5630,7 +5630,7 @@ L_1086630:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086640: 0x1086640: sw    s1, 808(sp)
+// 0x01086c64: 0x1086c64: sw    s1, 808(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5639,26 +5639,26 @@ L_1086630:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01086644: 0x1086644: addiu s4, zero, 1
+// 0x01086c68: 0x1086c68: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01086648: 0x1086648: addu  s1, a3, zero
+// 0x01086c6c: 0x1086c6c: addu  s1, a3, zero
 	ldloc 4
 	stloc 15
-// 0x0108664c: 0x108664c: addiu a1, s5, 28076
+// 0x01086c70: 0x1086c70: addiu a1, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086650: 0x1086650: addu  a2, zero, zero
+// 0x01086c74: 0x1086c74: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086654: 0x1086654: addiu a3, sp, 24
+// 0x01086c78: 0x1086c78: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01086658: 0x1086658: sw    s0, 804(sp)
+// 0x01086c7c: 0x1086c7c: sw    s0, 804(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5667,8 +5667,8 @@ L_1086630:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108665c: 0x108665c: sw    ra, 836(sp)
-// 0x01086660: 0x1086660: sw    s7, 832(sp)
+// 0x01086c80: 0x1086c80: sw    ra, 836(sp)
+// 0x01086c84: 0x1086c84: sw    s7, 832(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5677,7 +5677,7 @@ L_1086630:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01086664: 0x1086664: sw    s6, 828(sp)
+// 0x01086c88: 0x1086c88: sw    s6, 828(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5686,7 +5686,7 @@ L_1086630:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01086668: 0x1086668: sw    s3, 816(sp)
+// 0x01086c8c: 0x1086c8c: sw    s3, 816(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5695,7 +5695,7 @@ L_1086630:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108666c: 0x108666c: sw    s2, 812(sp)
+// 0x01086c90: 0x1086c90: sw    s2, 812(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5704,7 +5704,7 @@ L_1086630:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01086670: 0x1086670: jal   0x106855c sw    s4, 16(sp)
+// 0x01086c94: 0x1086c94: jal   0x106856c sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5718,76 +5718,76 @@ L_1086630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01086678: 0x1086678: bne   v0, zero, 0x108669c addu  s0, v0, zero
+// 0x01086c9c: 0x1086c9c: bne   v0, zero, 0x1086cc0 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 8
-	brtrue L_108669c
+	brtrue L_1086cc0
 // --- basic block ---
-// 0x01086680: 0x1086680: lui   a1, 0x20000
+// 0x01086ca4: 0x1086ca4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086684: 0x1086684: lui   a3, 0x20000
+// 0x01086ca8: 0x1086ca8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086688: 0x1086688: addiu a1, a1, -21512
+// 0x01086cac: 0x1086cac: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108668c: 0x108668c: addiu a3, a3, -19568
+// 0x01086cb0: 0x1086cb0: addiu a3, a3, -19104
 	ldloc 4
-	ldc.i4 -19568
+	ldc.i4 -19104
 	add
 	stloc 4
-// 0x01086690: 0x1086690: addiu a0, zero, 4
+// 0x01086cb4: 0x1086cb4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086694: 0x1086694: j	 0x10866e8 addiu a2, zero, 3488
+// 0x01086cb8: 0x1086cb8: j	 0x1086d0c addiu a2, zero, 3488
 	ldc.i4 3488
 	stloc.3
-	br L_10866e8
+	br L_1086d0c
 // --- basic block ---
-L_108669c:
-// 0x0108669c: 0x108669c: addiu s7, sp, 32
+L_1086cc0:
+// 0x01086cc0: 0x1086cc0: addiu s7, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 14
-// 0x010866a0: 0x10866a0: addiu s3, sp, 28
+// 0x01086cc4: 0x1086cc4: addiu s3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 11
-// 0x010866a4: 0x10866a4: addu  a0, v0, zero
+// 0x01086cc8: 0x1086cc8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010866a8: 0x10866a8: addiu s2, zero, 256
+// 0x01086ccc: 0x1086ccc: addiu s2, zero, 256
 	ldc.i4 256
 	stloc 10
-// 0x010866ac: 0x10866ac: addu  a1, s7, zero
+// 0x01086cd0: 0x1086cd0: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x010866b0: 0x10866b0: addu  a2, s3, zero
+// 0x01086cd4: 0x1086cd4: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x010866b4: 0x10866b4: addiu a3, s5, 28076
+// 0x01086cd8: 0x1086cd8: addiu a3, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010866b8: 0x10866b8: sb    zero, 32(sp)
+// 0x01086cdc: 0x1086cdc: sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010866bc: 0x10866bc: sw    s2, 28(sp)
+// 0x01086ce0: 0x1086ce0: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5796,7 +5796,7 @@ L_108669c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010866c0: 0x10866c0: jal   0x1068250 sw    s4, 16(sp)
+// 0x01086ce4: 0x1086ce4: jal   0x1068260 sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5810,41 +5810,41 @@ L_108669c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010866c8: 0x10866c8: bne   v0, zero, 0x10866fc addu  s0, v0, zero
+// 0x01086cec: 0x1086cec: bne   v0, zero, 0x1086d20 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 8
-	brtrue L_10866fc
+	brtrue L_1086d20
 // --- basic block ---
-// 0x010866d0: 0x10866d0: lui   a1, 0x20000
+// 0x01086cf4: 0x1086cf4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010866d4: 0x10866d4: lui   a3, 0x20000
+// 0x01086cf8: 0x1086cf8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010866d8: 0x10866d8: addiu a1, a1, -21512
+// 0x01086cfc: 0x1086cfc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010866dc: 0x10866dc: addiu a3, a3, -19516
+// 0x01086d00: 0x1086d00: addiu a3, a3, -19052
 	ldloc 4
-	ldc.i4 -19516
+	ldc.i4 -19052
 	add
 	stloc 4
-// 0x010866e0: 0x10866e0: addiu a0, zero, 4
+// 0x01086d04: 0x1086d04: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010866e4: 0x10866e4: addiu a2, zero, 3505
+// 0x01086d08: 0x1086d08: addiu a2, zero, 3505
 	ldc.i4 3505
 	stloc.3
-L_10866e8:
-// 0x010866e8: 0x10866e8: jal   0x100449c sll   zero, zero, 0
+L_1086d0c:
+// 0x01086d0c: 0x1086d0c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5855,39 +5855,39 @@ L_10866e8:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010866f0: 0x10866f0: addiu v0, zero, 18
+// 0x01086d14: 0x1086d14: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x010866f4: 0x10866f4: j	 0x10867a8 sw    v0, 0(s1)
+// 0x01086d18: 0x1086d18: j	 0x1086dcc sw    v0, 0(s1)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_10867a8
+	br L_1086dcc
 // --- basic block ---
-L_10866fc:
-// 0x010866fc: 0x10866fc: addiu s6, sp, 288
+L_1086d20:
+// 0x01086d20: 0x1086d20: addiu s6, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 13
-// 0x01086700: 0x1086700: addu  a0, v0, zero
+// 0x01086d24: 0x1086d24: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086704: 0x1086704: addiu a3, s5, 28076
+// 0x01086d28: 0x1086d28: addiu a3, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086708: 0x1086708: addu  a1, s6, zero
+// 0x01086d2c: 0x1086d2c: addu  a1, s6, zero
 	ldloc 13
 	stloc.2
-// 0x0108670c: 0x108670c: addu  a2, s3, zero
+// 0x01086d30: 0x1086d30: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01086710: 0x1086710: sw    s4, 16(sp)
+// 0x01086d34: 0x1086d34: sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5896,13 +5896,13 @@ L_10866fc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086714: 0x1086714: sb    zero, 288(sp)
+// 0x01086d38: 0x1086d38: sb    zero, 288(sp)
 	ldloc.0
 	ldc.i4 288
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01086718: 0x1086718: jal   0x1068250 sw    s2, 28(sp)
+// 0x01086d3c: 0x1086d3c: jal   0x1068260 sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5916,68 +5916,68 @@ L_10866fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01086720: 0x1086720: bne   v0, zero, 0x1086744 addu  s0, v0, zero
+// 0x01086d44: 0x1086d44: bne   v0, zero, 0x1086d68 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 8
-	brtrue L_1086744
+	brtrue L_1086d68
 // --- basic block ---
-// 0x01086728: 0x1086728: lui   a1, 0x20000
+// 0x01086d4c: 0x1086d4c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108672c: 0x108672c: lui   a3, 0x20000
+// 0x01086d50: 0x1086d50: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086730: 0x1086730: addiu a1, a1, -21512
+// 0x01086d54: 0x1086d54: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086734: 0x1086734: addiu a3, a3, -19460
+// 0x01086d58: 0x1086d58: addiu a3, a3, -18996
 	ldloc 4
-	ldc.i4 -19460
+	ldc.i4 -18996
 	add
 	stloc 4
-// 0x01086738: 0x1086738: addiu a0, zero, 4
+// 0x01086d5c: 0x1086d5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108673c: 0x108673c: j	 0x10866e8 addiu a2, zero, 3522
+// 0x01086d60: 0x1086d60: j	 0x1086d0c addiu a2, zero, 3522
 	ldc.i4 3522
 	stloc.3
-	br L_10866e8
+	br L_1086d0c
 // --- basic block ---
-L_1086744:
-// 0x01086744: 0x1086744: addiu s4, sp, 544
+L_1086d68:
+// 0x01086d68: 0x1086d68: addiu s4, sp, 544
 	ldloc.0
 	ldc.i4 544
 	add
 	stloc 7
-// 0x01086748: 0x1086748: lui   a3, 0x0
+// 0x01086d6c: 0x1086d6c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108674c: 0x108674c: addu  a0, v0, zero
+// 0x01086d70: 0x1086d70: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086750: 0x1086750: addu  a2, s3, zero
+// 0x01086d74: 0x1086d74: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01086754: 0x1086754: addiu v0, zero, -1
+// 0x01086d78: 0x1086d78: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01086758: 0x1086758: addiu a3, a3, 30268
+// 0x01086d7c: 0x1086d7c: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x0108675c: 0x108675c: addu  a1, s4, zero
+// 0x01086d80: 0x1086d80: addu  a1, s4, zero
 	ldloc 7
 	stloc.2
-// 0x01086760: 0x1086760: sw    s2, 28(sp)
+// 0x01086d84: 0x1086d84: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5986,7 +5986,7 @@ L_1086744:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01086764: 0x1086764: sw    v0, 16(sp)
+// 0x01086d88: 0x1086d88: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5995,7 +5995,7 @@ L_1086744:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01086768: 0x1086768: jal   0x1068250 sb    zero, 544(sp)
+// 0x01086d8c: 0x1086d8c: jal   0x1068260 sb    zero, 544(sp)
 	ldloc.0
 	ldc.i4 544
 	add
@@ -6006,43 +6006,43 @@ L_1086744:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01086770: 0x1086770: bne   v0, zero, 0x1086794 addu  s0, v0, zero
+// 0x01086d94: 0x1086d94: bne   v0, zero, 0x1086db8 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 8
-	brtrue L_1086794
+	brtrue L_1086db8
 // --- basic block ---
-// 0x01086778: 0x1086778: lui   a1, 0x20000
+// 0x01086d9c: 0x1086d9c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108677c: 0x108677c: lui   a3, 0x20000
+// 0x01086da0: 0x1086da0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086780: 0x1086780: addiu a1, a1, -21512
+// 0x01086da4: 0x1086da4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086784: 0x1086784: addiu a3, a3, -19412
+// 0x01086da8: 0x1086da8: addiu a3, a3, -18948
 	ldloc 4
-	ldc.i4 -19412
+	ldc.i4 -18948
 	add
 	stloc 4
-// 0x01086788: 0x1086788: addiu a0, zero, 4
+// 0x01086dac: 0x1086dac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108678c: 0x108678c: j	 0x10866e8 addiu a2, zero, 3539
+// 0x01086db0: 0x1086db0: j	 0x1086d0c addiu a2, zero, 3539
 	ldc.i4 3539
 	stloc.3
-	br L_10866e8
+	br L_1086d0c
 // --- basic block ---
-L_1086794:
-// 0x01086794: 0x1086794: lw    a0, 24(sp)
+L_1086db8:
+// 0x01086db8: 0x1086db8: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6051,13 +6051,13 @@ L_1086794:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01086798: 0x1086798: addu  a1, s7, zero
+// 0x01086dbc: 0x1086dbc: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x0108679c: 0x108679c: addu  a2, s6, zero
+// 0x01086dc0: 0x1086dc0: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x010867a0: 0x10867a0: jal   0x1075cd8 addu  a3, s4, zero
+// 0x01086dc4: 0x1086dc4: jal   0x10762fc addu  a3, s4, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -6065,17 +6065,17 @@ L_1086794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RealtimeBonus_OpenMessageTicker_1075cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RealtimeBonus_OpenMessageTicker_10762fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10867a8:
-// 0x010867a8: 0x10867a8: lw    ra, 836(sp)
-// 0x010867ac: 0x10867ac: addu  v0, s0, zero
+L_1086dcc:
+// 0x01086dcc: 0x1086dcc: lw    ra, 836(sp)
+// 0x01086dd0: 0x1086dd0: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x010867b0: 0x10867b0: lw    s7, 832(sp)
+// 0x01086dd4: 0x1086dd4: lw    s7, 832(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6084,7 +6084,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010867b4: 0x10867b4: lw    s6, 828(sp)
+// 0x01086dd8: 0x1086dd8: lw    s6, 828(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6093,7 +6093,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010867b8: 0x10867b8: lw    s5, 824(sp)
+// 0x01086ddc: 0x1086ddc: lw    s5, 824(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6102,7 +6102,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010867bc: 0x10867bc: lw    s4, 820(sp)
+// 0x01086de0: 0x1086de0: lw    s4, 820(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6111,7 +6111,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010867c0: 0x10867c0: lw    s3, 816(sp)
+// 0x01086de4: 0x1086de4: lw    s3, 816(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6120,7 +6120,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010867c4: 0x10867c4: lw    s2, 812(sp)
+// 0x01086de8: 0x1086de8: lw    s2, 812(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6129,7 +6129,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010867c8: 0x10867c8: lw    s1, 808(sp)
+// 0x01086dec: 0x1086dec: lw    s1, 808(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6138,7 +6138,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010867cc: 0x10867cc: lw    s0, 804(sp)
+// 0x01086df0: 0x1086df0: lw    s0, 804(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6147,7 +6147,7 @@ L_10867a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010867d0: 0x10867d0: jr    ra addiu sp, sp, 840
+// 0x01086df4: 0x1086df4: jr    ra addiu sp, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
@@ -6159,7 +6159,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 OpenMoodSelection_10867d8(int32,int32,int32,int32,int32)
+.method public static int32 OpenMoodSelection_1086dfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6194,33 +6194,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10867d8:
-// 0x010867d8: 0x10867d8: addiu sp, sp, -48
+L_1086dfc:
+// 0x01086dfc: 0x1086dfc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010867dc: 0x10867dc: lui   a1, 0x0
+// 0x01086e00: 0x1086e00: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010867e0: 0x10867e0: addiu a3, sp, 24
+// 0x01086e04: 0x1086e04: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x010867e4: 0x10867e4: addiu a1, a1, 30268
+// 0x01086e08: 0x1086e08: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010867e8: 0x10867e8: addu  a2, zero, zero
+// 0x01086e0c: 0x1086e0c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010867ec: 0x10867ec: addiu v0, zero, -1
+// 0x01086e10: 0x1086e10: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010867f0: 0x10867f0: sw    ra, 44(sp)
-// 0x010867f4: 0x10867f4: jal   0x106855c sw    v0, 16(sp)
+// 0x01086e14: 0x1086e14: sw    ra, 44(sp)
+// 0x01086e18: 0x1086e18: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6234,34 +6234,34 @@ L_10867d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010867fc: 0x10867fc: lui   a1, 0x20000
+// 0x01086e20: 0x1086e20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086800: 0x1086800: lui   a3, 0x20000
+// 0x01086e24: 0x1086e24: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086804: 0x1086804: addiu a1, a1, -21512
+// 0x01086e28: 0x1086e28: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086808: 0x1086808: addiu a3, a3, -19364
+// 0x01086e2c: 0x1086e2c: addiu a3, a3, -18900
 	ldloc 4
-	ldc.i4 -19364
+	ldc.i4 -18900
 	add
 	stloc 4
-// 0x0108680c: 0x108680c: addiu a0, zero, 2
+// 0x01086e30: 0x1086e30: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01086810: 0x1086810: addiu a2, zero, 3462
+// 0x01086e34: 0x1086e34: addiu a2, zero, 3462
 	ldc.i4 3462
 	stloc.3
-// 0x01086814: 0x1086814: jal   0x100449c sw    v0, 32(sp)
+// 0x01086e38: 0x1086e38: jal   0x100449c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6280,7 +6280,7 @@ L_10867d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108681c: 0x108681c: jal   0x106afdc addu  a0, zero, zero
+// 0x01086e40: 0x1086e40: jal   0x106b600 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6288,13 +6288,13 @@ L_10867d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetIsNewbie_106afdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_SetIsNewbie_106b600(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086824: 0x1086824: lw    ra, 44(sp)
-// 0x01086828: 0x1086828: lw    v0, 32(sp)
+// 0x01086e48: 0x1086e48: lw    ra, 44(sp)
+// 0x01086e4c: 0x1086e4c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6303,7 +6303,7 @@ L_10867d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108682c: 0x108682c: jr    ra addiu sp, sp, 48
+// 0x01086e50: 0x1086e50: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6315,7 +6315,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 UserGroups_1086834(int32,int32,int32,int32,int32)
+.method public static int32 UserGroups_1086e58(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s1,int32 s2,int32 s3,int32 s4,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -6377,13 +6377,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1086834:
-// 0x01086834: 0x1086834: addiu sp, sp, -432
+L_1086e58:
+// 0x01086e58: 0x1086e58: addiu sp, sp, -432
 	ldloc.0
 	ldc.i4 -432
 	add
 	stloc.0
-// 0x01086838: 0x1086838: sw    s1, 396(sp)
+// 0x01086e5c: 0x1086e5c: sw    s1, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6392,7 +6392,7 @@ L_1086834:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108683c: 0x108683c: sw    s0, 392(sp)
+// 0x01086e60: 0x1086e60: sw    s0, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6401,8 +6401,8 @@ L_1086834:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01086840: 0x1086840: sw    ra, 428(sp)
-// 0x01086844: 0x1086844: sw    s8, 424(sp)
+// 0x01086e64: 0x1086e64: sw    ra, 428(sp)
+// 0x01086e68: 0x1086e68: sw    s8, 424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6411,7 +6411,7 @@ L_1086834:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01086848: 0x1086848: sw    s7, 420(sp)
+// 0x01086e6c: 0x1086e6c: sw    s7, 420(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6420,7 +6420,7 @@ L_1086834:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0108684c: 0x108684c: sw    s6, 416(sp)
+// 0x01086e70: 0x1086e70: sw    s6, 416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6429,7 +6429,7 @@ L_1086834:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01086850: 0x1086850: sw    s5, 412(sp)
+// 0x01086e74: 0x1086e74: sw    s5, 412(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6438,7 +6438,7 @@ L_1086834:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01086854: 0x1086854: sw    s4, 408(sp)
+// 0x01086e78: 0x1086e78: sw    s4, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6447,7 +6447,7 @@ L_1086834:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01086858: 0x1086858: sw    s3, 404(sp)
+// 0x01086e7c: 0x1086e7c: sw    s3, 404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6456,7 +6456,7 @@ L_1086834:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108685c: 0x108685c: sw    s2, 400(sp)
+// 0x01086e80: 0x1086e80: sw    s2, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6465,20 +6465,20 @@ L_1086834:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01086860: 0x1086860: lb    v0, 0(a0)
+// 0x01086e84: 0x1086e84: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01086864: 0x1086864: addiu v1, zero, 44
+// 0x01086e88: 0x1086e88: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x01086868: 0x1086868: addu  s0, a0, zero
+// 0x01086e8c: 0x1086e8c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108686c: 0x108686c: addu  s1, a3, zero
+// 0x01086e90: 0x1086e90: addu  s1, a3, zero
 	ldloc 4
 	stloc 10
-// 0x01086870: 0x1086870: bne   v0, v1, 0x108689c sb    zero, 132(sp)
+// 0x01086e94: 0x1086e94: bne   v0, v1, 0x1086ec0 sb    zero, 132(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -6486,28 +6486,28 @@ L_1086834:
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	bne.un L_108689c
+	bne.un L_1086ec0
 // --- basic block ---
-// 0x01086878: 0x1086878: lui   a1, 0x20000
+// 0x01086e9c: 0x1086e9c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108687c: 0x108687c: lui   a3, 0x20000
+// 0x01086ea0: 0x1086ea0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086880: 0x1086880: addiu a1, a1, -21512
+// 0x01086ea4: 0x1086ea4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086884: 0x1086884: addiu a3, a3, -19316
+// 0x01086ea8: 0x1086ea8: addiu a3, a3, -18852
 	ldloc 4
-	ldc.i4 -19316
+	ldc.i4 -18852
 	add
 	stloc 4
-// 0x01086888: 0x1086888: addiu a0, zero, 1
+// 0x01086eac: 0x1086eac: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108688c: 0x108688c: jal   0x100449c addiu a2, zero, 3341
+// 0x01086eb0: 0x1086eb0: jal   0x100449c addiu a2, zero, 3341
 	ldc.i4 3341
 	stloc.3
 	ldloc.0
@@ -6520,21 +6520,21 @@ L_1086834:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086894: 0x1086894: j	 0x10868f4 addiu s0, s0, 1
+// 0x01086eb8: 0x1086eb8: j	 0x1086f18 addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10868f4
+	br L_1086f18
 // --- basic block ---
-L_108689c:
-// 0x0108689c: 0x108689c: addiu v0, zero, 250
+L_1086ec0:
+// 0x01086ec0: 0x1086ec0: addiu v0, zero, 250
 	ldc.i4 250
 	stloc 5
-// 0x010868a0: 0x10868a0: lui   a3, 0x0
+// 0x01086ec4: 0x1086ec4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010868a4: 0x10868a4: sw    v0, 24(sp)
+// 0x01086ec8: 0x1086ec8: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6543,25 +6543,25 @@ L_108689c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010868a8: 0x10868a8: addiu a3, a3, 28076
+// 0x01086ecc: 0x1086ecc: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010868ac: 0x10868ac: addiu v0, zero, 1
+// 0x01086ed0: 0x1086ed0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010868b0: 0x10868b0: addiu a1, sp, 132
+// 0x01086ed4: 0x1086ed4: addiu a1, sp, 132
 	ldloc.0
 	ldc.i4 132
 	add
 	stloc.2
-// 0x010868b4: 0x10868b4: addiu a2, sp, 24
+// 0x01086ed8: 0x1086ed8: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010868b8: 0x10868b8: jal   0x1068250 sw    v0, 16(sp)
+// 0x01086edc: 0x1086edc: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6575,59 +6575,59 @@ L_108689c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010868c0: 0x10868c0: beq   v0, zero, 0x10868d8 addu  s0, v0, zero
+// 0x01086ee4: 0x1086ee4: beq   v0, zero, 0x1086efc addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_10868d8
+	brfalse L_1086efc
 // --- basic block ---
-// 0x010868c8: 0x10868c8: lb    v0, 0(v0)
+// 0x01086eec: 0x1086eec: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010868cc: 0x10868cc: sll   zero, zero, 0
-// 0x010868d0: 0x10868d0: bne   v0, zero, 0x10868f4 sll   zero, zero, 0
+// 0x01086ef0: 0x1086ef0: sll   zero, zero, 0
+// 0x01086ef4: 0x1086ef4: bne   v0, zero, 0x1086f18 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10868f4
+	brtrue L_1086f18
 // --- basic block ---
-L_10868d8:
-// 0x010868d8: 0x10868d8: lui   a1, 0x20000
+L_1086efc:
+// 0x01086efc: 0x1086efc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010868dc: 0x10868dc: lui   a3, 0x20000
+// 0x01086f00: 0x1086f00: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010868e0: 0x10868e0: addiu a1, a1, -21512
+// 0x01086f04: 0x1086f04: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010868e4: 0x10868e4: addiu a3, a3, -19244
+// 0x01086f08: 0x1086f08: addiu a3, a3, -18780
 	ldloc 4
-	ldc.i4 -19244
+	ldc.i4 -18780
 	add
 	stloc 4
-// 0x010868e8: 0x10868e8: addiu a0, zero, 4
+// 0x01086f0c: 0x1086f0c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010868ec: 0x10868ec: j	 0x108698c addiu a2, zero, 3357
+// 0x01086f10: 0x1086f10: j	 0x1086fb0 addiu a2, zero, 3357
 	ldc.i4 3357
 	stloc.3
-	br L_108698c
+	br L_1086fb0
 // --- basic block ---
-L_10868f4:
-// 0x010868f4: 0x10868f4: lb    s7, 132(sp)
+L_1086f18:
+// 0x01086f18: 0x1086f18: lb    s7, 132(sp)
 	ldloc.0
 	ldc.i4 132
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 15
-// 0x010868f8: 0x10868f8: jal   0x1054d90 addiu a0, sp, 132
+// 0x01086f1c: 0x1086f1c: jal   0x1054da0 addiu a0, sp, 132
 	ldloc.0
 	ldc.i4 132
 	add
@@ -6637,51 +6637,51 @@ L_10868f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_groups_set_active_group_name_1054d90(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_groups_set_active_group_name_1054da0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086900: 0x1086900: sb    zero, 32(sp)
+// 0x01086f24: 0x1086f24: sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01086904: 0x1086904: lb    v1, 0(s0)
+// 0x01086f28: 0x1086f28: lb    v1, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086908: 0x1086908: addiu v0, zero, 44
+// 0x01086f2c: 0x1086f2c: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0108690c: 0x108690c: bne   v1, v0, 0x1086938 lui   a3, 0x0
+// 0x01086f30: 0x1086f30: bne   v1, v0, 0x1086f5c lui   a3, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_1086938
+	bne.un L_1086f5c
 // --- basic block ---
-// 0x01086914: 0x1086914: lui   a1, 0x20000
+// 0x01086f38: 0x1086f38: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086918: 0x1086918: lui   a3, 0x20000
+// 0x01086f3c: 0x1086f3c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108691c: 0x108691c: addiu a1, a1, -21512
+// 0x01086f40: 0x1086f40: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086920: 0x1086920: addiu a3, a3, -19176
+// 0x01086f44: 0x1086f44: addiu a3, a3, -18712
 	ldloc 4
-	ldc.i4 -19176
+	ldc.i4 -18712
 	add
 	stloc 4
-// 0x01086924: 0x1086924: addiu a0, zero, 1
+// 0x01086f48: 0x1086f48: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01086928: 0x1086928: jal   0x100449c addiu a2, zero, 3371
+// 0x01086f4c: 0x1086f4c: jal   0x100449c addiu a2, zero, 3371
 	ldc.i4 3371
 	stloc.3
 	ldloc.0
@@ -6694,18 +6694,18 @@ L_10868f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086930: 0x1086930: j	 0x10869a4 addiu v0, s0, 1
+// 0x01086f54: 0x1086f54: j	 0x1086fc8 addiu v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 5
-	br L_10869a4
+	br L_1086fc8
 // --- basic block ---
-L_1086938:
-// 0x01086938: 0x1086938: addiu v0, zero, 100
+L_1086f5c:
+// 0x01086f5c: 0x1086f5c: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x0108693c: 0x108693c: sw    v0, 24(sp)
+// 0x01086f60: 0x1086f60: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6714,28 +6714,28 @@ L_1086938:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01086940: 0x1086940: addu  a0, s0, zero
+// 0x01086f64: 0x1086f64: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01086944: 0x1086944: addiu v0, zero, 1
+// 0x01086f68: 0x1086f68: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01086948: 0x1086948: addiu a3, a3, 28076
+// 0x01086f6c: 0x1086f6c: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108694c: 0x108694c: addiu a1, sp, 32
+// 0x01086f70: 0x1086f70: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01086950: 0x1086950: addiu a2, sp, 24
+// 0x01086f74: 0x1086f74: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01086954: 0x1086954: jal   0x1068250 sw    v0, 16(sp)
+// 0x01086f78: 0x1086f78: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6749,55 +6749,55 @@ L_1086938:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108695c: 0x108695c: beq   v0, zero, 0x1086978 lui   a1, 0x20000
+// 0x01086f80: 0x1086f80: beq   v0, zero, 0x1086f9c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086978
+	brfalse L_1086f9c
 // --- basic block ---
-// 0x01086964: 0x1086964: lb    v1, 0(v0)
+// 0x01086f88: 0x1086f88: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086968: 0x1086968: sll   zero, zero, 0
-// 0x0108696c: 0x108696c: bne   v1, zero, 0x10869a8 addiu s5, sp, 32
+// 0x01086f8c: 0x1086f8c: sll   zero, zero, 0
+// 0x01086f90: 0x1086f90: bne   v1, zero, 0x1086fcc addiu s5, sp, 32
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-	brtrue L_10869a8
+	brtrue L_1086fcc
 // --- basic block ---
-// 0x01086974: 0x1086974: lui   a1, 0x20000
+// 0x01086f98: 0x1086f98: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1086978:
-// 0x01086978: 0x1086978: lui   a3, 0x20000
+L_1086f9c:
+// 0x01086f9c: 0x1086f9c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108697c: 0x108697c: addiu a1, a1, -21512
+// 0x01086fa0: 0x1086fa0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086980: 0x1086980: addiu a3, a3, -19096
+// 0x01086fa4: 0x1086fa4: addiu a3, a3, -18632
 	ldloc 4
-	ldc.i4 -19096
+	ldc.i4 -18632
 	add
 	stloc 4
-// 0x01086984: 0x1086984: addiu a0, zero, 4
+// 0x01086fa8: 0x1086fa8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086988: 0x1086988: addiu a2, zero, 3387
+// 0x01086fac: 0x1086fac: addiu a2, zero, 3387
 	ldc.i4 3387
 	stloc.3
-L_108698c:
-// 0x0108698c: 0x108698c: jal   0x100449c sll   zero, zero, 0
+L_1086fb0:
+// 0x01086fb0: 0x1086fb0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6808,33 +6808,33 @@ L_108698c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086994: 0x1086994: addiu v0, zero, 18
+// 0x01086fb8: 0x1086fb8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_1086998:
-// 0x01086998: 0x1086998: sw    v0, 0(s1)
+L_1086fbc:
+// 0x01086fbc: 0x1086fbc: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108699c: 0x108699c: j	 0x1086b30 addu  v0, zero, zero
+// 0x01086fc0: 0x1086fc0: j	 0x1087154 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1086b30
+	br L_1087154
 // --- basic block ---
-L_10869a4:
-// 0x010869a4: 0x10869a4: addiu s5, sp, 32
+L_1086fc8:
+// 0x01086fc8: 0x1086fc8: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-L_10869a8:
-// 0x010869a8: 0x10869a8: addu  a0, s5, zero
+L_1086fcc:
+// 0x01086fcc: 0x1086fcc: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010869ac: 0x10869ac: jal   0x1054c98 sw    v0, 384(sp)
+// 0x01086fd0: 0x1086fd0: jal   0x1054ca8 sw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6848,12 +6848,12 @@ L_10869a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_groups_set_active_group_icon_1054c98(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_groups_set_active_group_icon_1054ca8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010869b4: 0x10869b4: lw    v0, 384(sp)
+// 0x01086fd8: 0x1086fd8: lw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6862,29 +6862,29 @@ L_10869a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010869b8: 0x10869b8: lui   s0, 0x0
+// 0x01086fdc: 0x1086fdc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010869bc: 0x10869bc: addu  a0, v0, zero
+// 0x01086fe0: 0x1086fe0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010869c0: 0x10869c0: addiu a1, s0, 30268
+// 0x01086fe4: 0x1086fe4: addiu a1, s0, 30268
 	ldloc 8
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010869c4: 0x10869c4: addiu v0, zero, 1
+// 0x01086fe8: 0x1086fe8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010869c8: 0x10869c8: addu  a2, zero, zero
+// 0x01086fec: 0x1086fec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010869cc: 0x10869cc: addiu a3, sp, 28
+// 0x01086ff0: 0x1086ff0: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010869d0: 0x10869d0: jal   0x106855c sw    v0, 16(sp)
+// 0x01086ff4: 0x1086ff4: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6898,40 +6898,40 @@ L_10869a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010869d8: 0x10869d8: bne   v0, zero, 0x1086a08 addu  s0, zero, zero
+// 0x01086ffc: 0x1086ffc: bne   v0, zero, 0x108702c addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_1086a08
+	brtrue L_108702c
 // --- basic block ---
-// 0x010869e0: 0x10869e0: lui   a1, 0x20000
+// 0x01087004: 0x1087004: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010869e4: 0x10869e4: lui   a3, 0x20000
+// 0x01087008: 0x1087008: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010869e8: 0x10869e8: addiu a1, a1, -21512
+// 0x0108700c: 0x108700c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010869ec: 0x10869ec: addiu a3, a3, -19024
+// 0x01087010: 0x1087010: addiu a3, a3, -18560
 	ldloc 4
-	ldc.i4 -19024
+	ldc.i4 -18560
 	add
 	stloc 4
-// 0x010869f0: 0x10869f0: addiu a0, zero, 4
+// 0x01087014: 0x1087014: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010869f4: 0x10869f4: addiu a2, zero, 3404
+// 0x01087018: 0x1087018: addiu a2, zero, 3404
 	ldc.i4 3404
 	stloc.3
-// 0x010869f8: 0x10869f8: jal   0x100449c sw    v0, 384(sp)
+// 0x0108701c: 0x108701c: jal   0x100449c sw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6950,13 +6950,13 @@ L_10869a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086a00: 0x1086a00: j	 0x1086ae4 addiu v1, zero, 18
+// 0x01087024: 0x1087024: j	 0x1087108 addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-	br L_1086ae4
+	br L_1087108
 // --- basic block ---
-L_1086a08:
-// 0x01086a08: 0x1086a08: lw    s6, 28(sp)
+L_108702c:
+// 0x0108702c: 0x108702c: lw    s6, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6965,29 +6965,29 @@ L_1086a08:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01086a0c: 0x1086a0c: addiu s4, sp, 132
+// 0x01087030: 0x1087030: addiu s4, sp, 132
 	ldloc.0
 	ldc.i4 132
 	add
 	stloc 13
-// 0x01086a10: 0x1086a10: addiu s3, zero, 1
+// 0x01087034: 0x1087034: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x01086a14: 0x1086a14: addiu s2, sp, 24
+// 0x01087038: 0x1087038: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x01086a18: 0x1086a18: j	 0x1086afc addiu s8, zero, 100
+// 0x0108703c: 0x108703c: j	 0x1087120 addiu s8, zero, 100
 	ldc.i4.s 100
 	stloc 16
-	br L_1086afc
+	br L_1087120
 // --- basic block ---
-L_1086a20:
-// 0x01086a20: 0x1086a20: addiu v0, zero, 250
+L_1087044:
+// 0x01087044: 0x1087044: addiu v0, zero, 250
 	ldc.i4 250
 	stloc 5
-// 0x01086a24: 0x1086a24: sw    v0, 24(sp)
+// 0x01087048: 0x1087048: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6996,7 +6996,7 @@ L_1086a20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01086a28: 0x1086a28: jal   0x1068250 sw    s3, 16(sp)
+// 0x0108704c: 0x108704c: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7010,31 +7010,31 @@ L_1086a20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086a30: 0x1086a30: addu  a0, s0, zero
+// 0x01087054: 0x1087054: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01086a34: 0x1086a34: beq   v0, zero, 0x1086a4c addu  a1, s4, zero
+// 0x01087058: 0x1087058: beq   v0, zero, 0x1087070 addu  a1, s4, zero
 	ldloc 5
 	ldloc 13
 	stloc.2
-	brfalse L_1086a4c
+	brfalse L_1087070
 // --- basic block ---
-// 0x01086a3c: 0x1086a3c: lb    v1, 0(v0)
+// 0x01087060: 0x1087060: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086a40: 0x1086a40: sll   zero, zero, 0
-// 0x01086a44: 0x1086a44: bne   v1, zero, 0x1086a7c sll   zero, zero, 0
+// 0x01087064: 0x1087064: sll   zero, zero, 0
+// 0x01087068: 0x1087068: bne   v1, zero, 0x10870a0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1086a7c
+	brtrue L_10870a0
 // --- basic block ---
-L_1086a4c:
-// 0x01086a4c: 0x1086a4c: lw    v0, 28(sp)
+L_1087070:
+// 0x01087070: 0x1087070: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7043,29 +7043,29 @@ L_1086a4c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01086a50: 0x1086a50: lui   a1, 0x20000
+// 0x01087074: 0x1087074: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086a54: 0x1086a54: lui   a3, 0x20000
+// 0x01087078: 0x1087078: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086a58: 0x1086a58: addiu a1, a1, -21512
+// 0x0108707c: 0x108707c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086a5c: 0x1086a5c: addiu a3, a3, -18944
+// 0x01087080: 0x1087080: addiu a3, a3, -18480
 	ldloc 4
-	ldc.i4 -18944
+	ldc.i4 -18480
 	add
 	stloc 4
-// 0x01086a60: 0x1086a60: addiu a0, zero, 4
+// 0x01087084: 0x1087084: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086a64: 0x1086a64: addiu a2, zero, 3421
+// 0x01087088: 0x1087088: addiu a2, zero, 3421
 	ldc.i4 3421
 	stloc.3
-// 0x01086a68: 0x1086a68: sw    s0, 16(sp)
+// 0x0108708c: 0x108708c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7074,7 +7074,7 @@ L_1086a4c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01086a6c: 0x1086a6c: jal   0x100449c sw    v0, 20(sp)
+// 0x01087090: 0x1087090: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7093,13 +7093,13 @@ L_1086a4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086a74: 0x1086a74: j	 0x1086998 addiu v0, zero, 18
+// 0x01087098: 0x1087098: j	 0x1086fbc addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1086998
+	br L_1086fbc
 // --- basic block ---
-L_1086a7c:
-// 0x01086a7c: 0x1086a7c: jal   0x1054b28 sw    v0, 384(sp)
+L_10870a0:
+// 0x010870a0: 0x10870a0: jal   0x1054b38 sw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7113,12 +7113,12 @@ L_1086a7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_add_following_group_name_1054b28(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_add_following_group_name_1054b38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086a84: 0x1086a84: lw    v0, 384(sp)
+// 0x010870a8: 0x10870a8: lw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7127,24 +7127,24 @@ L_1086a7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01086a88: 0x1086a88: lui   a3, 0x0
+// 0x010870ac: 0x10870ac: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01086a8c: 0x1086a8c: addu  a0, v0, zero
+// 0x010870b0: 0x10870b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086a90: 0x1086a90: addu  a1, s5, zero
+// 0x010870b4: 0x10870b4: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x01086a94: 0x1086a94: addu  a2, s2, zero
+// 0x010870b8: 0x10870b8: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x01086a98: 0x1086a98: addiu a3, a3, 30268
+// 0x010870bc: 0x10870bc: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01086a9c: 0x1086a9c: sw    s8, 24(sp)
+// 0x010870c0: 0x10870c0: sw    s8, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7153,7 +7153,7 @@ L_1086a7c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01086aa0: 0x1086aa0: jal   0x1068250 sw    s3, 16(sp)
+// 0x010870c4: 0x10870c4: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7167,27 +7167,27 @@ L_1086a7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086aa8: 0x1086aa8: addu  a0, s0, zero
+// 0x010870cc: 0x10870cc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01086aac: 0x1086aac: bne   v0, zero, 0x1086aec addu  a1, s5, zero
+// 0x010870d0: 0x10870d0: bne   v0, zero, 0x1087110 addu  a1, s5, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brtrue L_1086aec
+	brtrue L_1087110
 // --- basic block ---
-// 0x01086ab4: 0x1086ab4: lui   a1, 0x20000
+// 0x010870d8: 0x10870d8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086ab8: 0x1086ab8: lui   a3, 0x20000
+// 0x010870dc: 0x10870dc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086abc: 0x1086abc: lw    v1, 28(sp)
+// 0x010870e0: 0x10870e0: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7196,23 +7196,23 @@ L_1086a7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01086ac0: 0x1086ac0: addiu a1, a1, -21512
+// 0x010870e4: 0x10870e4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086ac4: 0x1086ac4: addiu a3, a3, -18852
+// 0x010870e8: 0x10870e8: addiu a3, a3, -18388
 	ldloc 4
-	ldc.i4 -18852
+	ldc.i4 -18388
 	add
 	stloc 4
-// 0x01086ac8: 0x1086ac8: addiu a0, zero, 4
+// 0x010870ec: 0x10870ec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086acc: 0x1086acc: addiu a2, zero, 3437
+// 0x010870f0: 0x10870f0: addiu a2, zero, 3437
 	ldc.i4 3437
 	stloc.3
-// 0x01086ad0: 0x1086ad0: sw    s0, 16(sp)
+// 0x010870f4: 0x10870f4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7221,7 +7221,7 @@ L_1086a7c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01086ad4: 0x1086ad4: sw    v1, 20(sp)
+// 0x010870f8: 0x10870f8: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7230,7 +7230,7 @@ L_1086a7c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086ad8: 0x1086ad8: jal   0x100449c sw    v0, 384(sp)
+// 0x010870fc: 0x10870fc: jal   0x100449c sw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7249,21 +7249,21 @@ L_1086a7c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086ae0: 0x1086ae0: addiu v1, zero, 18
+// 0x01087104: 0x1087104: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-L_1086ae4:
-// 0x01086ae4: 0x1086ae4: j	 0x1086b2c sw    v1, 0(s1)
+L_1087108:
+// 0x01087108: 0x1087108: j	 0x1087150 sw    v1, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1086b2c
+	br L_1087150
 // --- basic block ---
-L_1086aec:
-// 0x01086aec: 0x1086aec: jal   0x1054b98 sw    v0, 384(sp)
+L_1087110:
+// 0x01087110: 0x1087110: jal   0x1054ba8 sw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7277,12 +7277,12 @@ L_1086aec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_groups_add_following_group_icon_1054b98(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_groups_add_following_group_icon_1054ba8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01086af4: 0x1086af4: lw    v0, 384(sp)
+// 0x01087118: 0x1087118: lw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7291,13 +7291,13 @@ L_1086aec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01086af8: 0x1086af8: addiu s0, s0, 1
+// 0x0108711c: 0x108711c: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1086afc:
-// 0x01086afc: 0x1086afc: lw    v1, 28(sp)
+L_1087120:
+// 0x01087120: 0x1087120: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7306,42 +7306,42 @@ L_1086afc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01086b00: 0x1086b00: lui   a3, 0x0
+// 0x01087124: 0x1087124: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01086b04: 0x1086b04: slt   v1, s0, v1
+// 0x01087128: 0x1087128: slt   v1, s0, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 7
-// 0x01086b08: 0x1086b08: addu  a0, v0, zero
+// 0x0108712c: 0x108712c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01086b0c: 0x1086b0c: addu  a2, s2, zero
+// 0x01087130: 0x1087130: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x01086b10: 0x1086b10: addiu a3, a3, 28076
+// 0x01087134: 0x1087134: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086b14: 0x1086b14: bne   v1, zero, 0x1086a20 addu  a1, s4, zero
+// 0x01087138: 0x1087138: bne   v1, zero, 0x1087044 addu  a1, s4, zero
 	ldloc 7
 	ldloc 13
 	stloc.2
-	brtrue L_1086a20
+	brtrue L_1087044
 // --- basic block ---
-// 0x01086b1c: 0x1086b1c: sltu  a0, zero, s7
+// 0x01087140: 0x1087140: sltu  a0, zero, s7
 	ldc.i4.s 0
 	ldloc 15
 	clt.un
 	stloc.1
-// 0x01086b20: 0x1086b20: addu  a0, a0, s6
+// 0x01087144: 0x1087144: addu  a0, a0, s6
 	ldloc.1
 	ldloc 14
 	add
 	stloc.1
-// 0x01086b24: 0x1086b24: jal   0x1053f1c sw    v0, 384(sp)
+// 0x01087148: 0x1087148: jal   0x1053f2c sw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7351,11 +7351,11 @@ L_1086afc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl62::roadmap_groups_set_num_following_1053f1c(int32)
+	call int32 Cibyl62::roadmap_groups_set_num_following_1053f2c(int32)
 	stloc 5
 // --- basic block ---
-L_1086b2c:
-// 0x01086b2c: 0x1086b2c: lw    v0, 384(sp)
+L_1087150:
+// 0x01087150: 0x1087150: lw    v0, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7364,9 +7364,9 @@ L_1086b2c:
 	add
 	ldelem.i4
 	stloc 5
-L_1086b30:
-// 0x01086b30: 0x1086b30: lw    ra, 428(sp)
-// 0x01086b34: 0x1086b34: lw    s8, 424(sp)
+L_1087154:
+// 0x01087154: 0x1087154: lw    ra, 428(sp)
+// 0x01087158: 0x1087158: lw    s8, 424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7375,7 +7375,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01086b38: 0x1086b38: lw    s7, 420(sp)
+// 0x0108715c: 0x108715c: lw    s7, 420(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7384,7 +7384,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01086b3c: 0x1086b3c: lw    s6, 416(sp)
+// 0x01087160: 0x1087160: lw    s6, 416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7393,7 +7393,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01086b40: 0x1086b40: lw    s5, 412(sp)
+// 0x01087164: 0x1087164: lw    s5, 412(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7402,7 +7402,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01086b44: 0x1086b44: lw    s4, 408(sp)
+// 0x01087168: 0x1087168: lw    s4, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7411,7 +7411,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01086b48: 0x1086b48: lw    s3, 404(sp)
+// 0x0108716c: 0x108716c: lw    s3, 404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7420,7 +7420,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01086b4c: 0x1086b4c: lw    s2, 400(sp)
+// 0x01087170: 0x1087170: lw    s2, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7429,7 +7429,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01086b50: 0x1086b50: lw    s1, 396(sp)
+// 0x01087174: 0x1087174: lw    s1, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7438,7 +7438,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01086b54: 0x1086b54: lw    s0, 392(sp)
+// 0x01087178: 0x1087178: lw    s0, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7447,7 +7447,7 @@ L_1086b30:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01086b58: 0x1086b58: jr    ra addiu sp, sp, 432
+// 0x0108717c: 0x108717c: jr    ra addiu sp, sp, 432
 	ldloc.0
 	ldc.i4 432
 	add
diff --git a/converted/Cibyl101.j b/converted/Cibyl101.j
index f626eee..ec20776 100644
--- a/converted/Cibyl101.j
+++ b/converted/Cibyl101.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl101::.ctor
 
-.method public static int32 CollectBonusRes_1086b60(int32,int32,int32,int32,int32)
+.method public static int32 CollectBonusRes_1087184(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s3,int32 s0,int32 s4,int32 s5,int32 s6,int32 s1,int32 s7,int32 ra)
@@ -100,13 +100,13 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1086b60:
-// 0x01086b60: 0x1086b60: addiu sp, sp, -336
+L_1087184:
+// 0x01087184: 0x1087184: addiu sp, sp, -336
 	ldloc.0
 	ldc.i4 -336
 	add
 	stloc.0
-// 0x01086b64: 0x1086b64: sw    s3, 312(sp)
+// 0x01087188: 0x1087188: sw    s3, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -115,10 +115,10 @@ L_1086b60:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01086b68: 0x1086b68: lui   s3, 0x0
+// 0x0108718c: 0x108718c: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01086b6c: 0x1086b6c: sw    s2, 308(sp)
+// 0x01087190: 0x1087190: sw    s2, 308(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -127,7 +127,7 @@ L_1086b60:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086b70: 0x1086b70: sw    s1, 304(sp)
+// 0x01087194: 0x1087194: sw    s1, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -136,27 +136,27 @@ L_1086b60:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01086b74: 0x1086b74: addiu s2, zero, 1
+// 0x01087198: 0x1087198: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01086b78: 0x1086b78: addu  s1, a3, zero
+// 0x0108719c: 0x108719c: addu  s1, a3, zero
 	ldloc 4
 	stloc 14
-// 0x01086b7c: 0x1086b7c: addiu a1, s3, 28076
+// 0x010871a0: 0x10871a0: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086b80: 0x1086b80: addu  a2, zero, zero
+// 0x010871a4: 0x10871a4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086b84: 0x1086b84: addiu a3, sp, 24
+// 0x010871a8: 0x10871a8: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01086b88: 0x1086b88: sw    ra, 332(sp)
-// 0x01086b8c: 0x1086b8c: sw    s7, 328(sp)
+// 0x010871ac: 0x10871ac: sw    ra, 332(sp)
+// 0x010871b0: 0x10871b0: sw    s7, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -165,7 +165,7 @@ L_1086b60:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01086b90: 0x1086b90: sw    s6, 324(sp)
+// 0x010871b4: 0x10871b4: sw    s6, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -174,7 +174,7 @@ L_1086b60:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01086b94: 0x1086b94: sw    s5, 320(sp)
+// 0x010871b8: 0x10871b8: sw    s5, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -183,7 +183,7 @@ L_1086b60:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01086b98: 0x1086b98: sw    s4, 316(sp)
+// 0x010871bc: 0x10871bc: sw    s4, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -192,7 +192,7 @@ L_1086b60:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01086b9c: 0x1086b9c: sw    s0, 300(sp)
+// 0x010871c0: 0x10871c0: sw    s0, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -201,7 +201,7 @@ L_1086b60:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01086ba0: 0x1086ba0: jal   0x106855c sw    s2, 16(sp)
+// 0x010871c4: 0x10871c4: jal   0x106856c sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -215,18 +215,18 @@ L_1086b60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086ba8: 0x1086ba8: beq   v0, zero, 0x1086bc0 addiu s7, zero, -1
+// 0x010871cc: 0x10871cc: beq   v0, zero, 0x10871e4 addiu s7, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 15
-	brfalse L_1086bc0
+	brfalse L_10871e4
 // --- basic block ---
-// 0x01086bb0: 0x1086bb0: lw    v1, 24(sp)
+// 0x010871d4: 0x10871d4: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -235,35 +235,35 @@ L_1086b60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01086bb4: 0x1086bb4: sll   zero, zero, 0
-// 0x01086bb8: 0x1086bb8: bne   v1, s7, 0x1086bec addu  a0, v0, zero
+// 0x010871d8: 0x10871d8: sll   zero, zero, 0
+// 0x010871dc: 0x10871dc: bne   v1, s7, 0x1087210 addu  a0, v0, zero
 	ldloc 8
 	ldloc 15
 	ldloc 6
 	stloc.1
-	bne.un L_1086bec
+	bne.un L_1087210
 // --- basic block ---
-L_1086bc0:
-// 0x01086bc0: 0x1086bc0: lui   a1, 0x20000
+L_10871e4:
+// 0x010871e4: 0x10871e4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086bc4: 0x1086bc4: lui   a3, 0x20000
+// 0x010871e8: 0x10871e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086bc8: 0x1086bc8: addiu a1, a1, -21512
+// 0x010871ec: 0x10871ec: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086bcc: 0x1086bcc: addiu a3, a3, -18760
+// 0x010871f0: 0x10871f0: addiu a3, a3, -18296
 	ldloc 4
-	ldc.i4 -18760
+	ldc.i4 -18296
 	add
 	stloc 4
-// 0x01086bd0: 0x1086bd0: addiu a0, zero, 4
+// 0x010871f4: 0x10871f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086bd4: 0x1086bd4: jal   0x100449c addiu a2, zero, 3224
+// 0x010871f8: 0x10871f8: jal   0x100449c addiu a2, zero, 3224
 	ldc.i4 3224
 	stloc.3
 	ldloc.0
@@ -276,36 +276,36 @@ L_1086bc0:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086bdc: 0x1086bdc: addiu v0, zero, 18
+// 0x01087200: 0x1087200: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x01086be0: 0x1086be0: sw    v0, 0(s1)
+// 0x01087204: 0x1087204: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01086be4: 0x1086be4: j	 0x1086d7c addu  s0, zero, zero
+// 0x01087208: 0x1087208: j	 0x10873a0 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1086d7c
+	br L_10873a0
 // --- basic block ---
-L_1086bec:
-// 0x01086bec: 0x1086bec: addiu a1, s3, 28076
+L_1087210:
+// 0x01087210: 0x1087210: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086bf0: 0x1086bf0: addu  a2, zero, zero
+// 0x01087214: 0x1087214: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086bf4: 0x1086bf4: addiu a3, sp, 28
+// 0x01087218: 0x1087218: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01086bf8: 0x1086bf8: jal   0x106855c sw    s2, 16(sp)
+// 0x0108721c: 0x108721c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -319,59 +319,59 @@ L_1086bec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086c00: 0x1086c00: bne   v0, zero, 0x1086c24 addu  s0, v0, zero
+// 0x01087224: 0x1087224: bne   v0, zero, 0x1087248 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_1086c24
+	brtrue L_1087248
 // --- basic block ---
-// 0x01086c08: 0x1086c08: lui   a1, 0x20000
+// 0x0108722c: 0x108722c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086c0c: 0x1086c0c: lui   a3, 0x20000
+// 0x01087230: 0x1087230: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086c10: 0x1086c10: addiu a1, a1, -21512
+// 0x01087234: 0x1087234: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086c14: 0x1086c14: addiu a3, a3, -18712
+// 0x01087238: 0x1087238: addiu a3, a3, -18248
 	ldloc 4
-	ldc.i4 -18712
+	ldc.i4 -18248
 	add
 	stloc 4
-// 0x01086c18: 0x1086c18: addiu a0, zero, 4
+// 0x0108723c: 0x108723c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086c1c: 0x1086c1c: j	 0x1086c5c addiu a2, zero, 3238
+// 0x01087240: 0x1087240: j	 0x1087280 addiu a2, zero, 3238
 	ldc.i4 3238
 	stloc.3
-	br L_1086c5c
+	br L_1087280
 // --- basic block ---
-L_1086c24:
-// 0x01086c24: 0x1086c24: addu  a0, v0, zero
+L_1087248:
+// 0x01087248: 0x1087248: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086c28: 0x1086c28: addiu a1, s3, 28076
+// 0x0108724c: 0x108724c: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086c2c: 0x1086c2c: addu  a2, zero, zero
+// 0x01087250: 0x1087250: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086c30: 0x1086c30: addiu a3, sp, 32
+// 0x01087254: 0x1087254: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01086c34: 0x1086c34: jal   0x106855c sw    s2, 16(sp)
+// 0x01087258: 0x1087258: jal   0x106856c sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -385,41 +385,41 @@ L_1086c24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086c3c: 0x1086c3c: bne   v0, zero, 0x1086c70 addu  s0, v0, zero
+// 0x01087260: 0x1087260: bne   v0, zero, 0x1087294 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_1086c70
+	brtrue L_1087294
 // --- basic block ---
-// 0x01086c44: 0x1086c44: lui   a1, 0x20000
+// 0x01087268: 0x1087268: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086c48: 0x1086c48: lui   a3, 0x20000
+// 0x0108726c: 0x108726c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086c4c: 0x1086c4c: addiu a1, a1, -21512
+// 0x01087270: 0x1087270: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086c50: 0x1086c50: addiu a3, a3, -18664
+// 0x01087274: 0x1087274: addiu a3, a3, -18200
 	ldloc 4
-	ldc.i4 -18664
+	ldc.i4 -18200
 	add
 	stloc 4
-// 0x01086c54: 0x1086c54: addiu a0, zero, 4
+// 0x01087278: 0x1087278: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086c58: 0x1086c58: addiu a2, zero, 3252
+// 0x0108727c: 0x108727c: addiu a2, zero, 3252
 	ldc.i4 3252
 	stloc.3
-L_1086c5c:
-// 0x01086c5c: 0x1086c5c: jal   0x100449c sll   zero, zero, 0
+L_1087280:
+// 0x01087280: 0x1087280: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -430,53 +430,53 @@ L_1086c5c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086c64: 0x1086c64: addiu v0, zero, 18
+// 0x01087288: 0x1087288: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x01086c68: 0x1086c68: j	 0x1086d7c sw    v0, 0(s1)
+// 0x0108728c: 0x108728c: j	 0x10873a0 sw    v0, 0(s1)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_1086d7c
+	br L_10873a0
 // --- basic block ---
-L_1086c70:
-// 0x01086c70: 0x1086c70: addiu s4, sp, 40
+L_1087294:
+// 0x01087294: 0x1087294: addiu s4, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 11
-// 0x01086c74: 0x1086c74: addiu s6, sp, 36
+// 0x01087298: 0x1087298: addiu s6, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 13
-// 0x01086c78: 0x1086c78: addu  a0, v0, zero
+// 0x0108729c: 0x108729c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086c7c: 0x1086c7c: addiu s5, zero, 256
+// 0x010872a0: 0x10872a0: addiu s5, zero, 256
 	ldc.i4 256
 	stloc 12
-// 0x01086c80: 0x1086c80: addu  a1, s4, zero
+// 0x010872a4: 0x10872a4: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x01086c84: 0x1086c84: addu  a2, s6, zero
+// 0x010872a8: 0x10872a8: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x01086c88: 0x1086c88: addiu a3, s3, 28076
+// 0x010872ac: 0x10872ac: addiu a3, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086c8c: 0x1086c8c: sb    zero, 40(sp)
+// 0x010872b0: 0x10872b0: sb    zero, 40(sp)
 	ldloc.0
 	ldc.i4.s 40
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01086c90: 0x1086c90: sw    s5, 36(sp)
+// 0x010872b4: 0x10872b4: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -485,7 +485,7 @@ L_1086c70:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01086c94: 0x1086c94: jal   0x1068250 sw    s2, 16(sp)
+// 0x010872b8: 0x10872b8: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -499,63 +499,63 @@ L_1086c70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086c9c: 0x1086c9c: bne   v0, zero, 0x1086cc0 addu  s0, v0, zero
+// 0x010872c0: 0x10872c0: bne   v0, zero, 0x10872e4 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_1086cc0
+	brtrue L_10872e4
 // --- basic block ---
-// 0x01086ca4: 0x1086ca4: lui   a1, 0x20000
+// 0x010872c8: 0x10872c8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086ca8: 0x1086ca8: lui   a3, 0x20000
+// 0x010872cc: 0x10872cc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086cac: 0x1086cac: addiu a1, a1, -21512
+// 0x010872d0: 0x10872d0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086cb0: 0x1086cb0: addiu a3, a3, -18616
+// 0x010872d4: 0x10872d4: addiu a3, a3, -18152
 	ldloc 4
-	ldc.i4 -18616
+	ldc.i4 -18152
 	add
 	stloc 4
-// 0x01086cb4: 0x1086cb4: addiu a0, zero, 4
+// 0x010872d8: 0x10872d8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086cb8: 0x1086cb8: j	 0x1086c5c addiu a2, zero, 3269
+// 0x010872dc: 0x10872dc: j	 0x1087280 addiu a2, zero, 3269
 	ldc.i4 3269
 	stloc.3
-	br L_1086c5c
+	br L_1087280
 // --- basic block ---
-L_1086cc0:
-// 0x01086cc0: 0x1086cc0: addiu a3, s3, 28076
+L_10872e4:
+// 0x010872e4: 0x10872e4: addiu a3, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086cc4: 0x1086cc4: addu  a0, v0, zero
+// 0x010872e8: 0x10872e8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086cc8: 0x1086cc8: addu  a1, s4, zero
+// 0x010872ec: 0x10872ec: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x01086ccc: 0x1086ccc: addu  a2, s6, zero
+// 0x010872f0: 0x10872f0: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x01086cd0: 0x1086cd0: lb    s3, 40(sp)
+// 0x010872f4: 0x10872f4: lb    s3, 40(sp)
 	ldloc.0
 	ldc.i4.s 40
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x01086cd4: 0x1086cd4: sw    s2, 16(sp)
+// 0x010872f8: 0x10872f8: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -564,7 +564,7 @@ L_1086cc0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086cd8: 0x1086cd8: sw    s5, 36(sp)
+// 0x010872fc: 0x10872fc: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -573,7 +573,7 @@ L_1086cc0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01086cdc: 0x1086cdc: jal   0x1068250 sb    zero, 40(sp)
+// 0x01087300: 0x1087300: jal   0x1068260 sb    zero, 40(sp)
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -584,66 +584,66 @@ L_1086cc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086ce4: 0x1086ce4: bne   v0, zero, 0x1086d08 addu  s0, v0, zero
+// 0x01087308: 0x1087308: bne   v0, zero, 0x108732c addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_1086d08
+	brtrue L_108732c
 // --- basic block ---
-// 0x01086cec: 0x1086cec: lui   a1, 0x20000
+// 0x01087310: 0x1087310: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086cf0: 0x1086cf0: lui   a3, 0x20000
+// 0x01087314: 0x1087314: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086cf4: 0x1086cf4: addiu a1, a1, -21512
+// 0x01087318: 0x1087318: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086cf8: 0x1086cf8: addiu a3, a3, -18568
+// 0x0108731c: 0x108731c: addiu a3, a3, -18104
 	ldloc 4
-	ldc.i4 -18568
+	ldc.i4 -18104
 	add
 	stloc 4
-// 0x01086cfc: 0x1086cfc: addiu a0, zero, 4
+// 0x01087320: 0x1087320: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086d00: 0x1086d00: j	 0x1086c5c addiu a2, zero, 3291
+// 0x01087324: 0x1087324: j	 0x1087280 addiu a2, zero, 3291
 	ldc.i4 3291
 	stloc.3
-	br L_1086c5c
+	br L_1087280
 // --- basic block ---
-L_1086d08:
-// 0x01086d08: 0x1086d08: lui   a3, 0x0
+L_108732c:
+// 0x0108732c: 0x108732c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01086d0c: 0x1086d0c: addu  a0, v0, zero
+// 0x01087330: 0x1087330: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086d10: 0x1086d10: addu  a2, s6, zero
+// 0x01087334: 0x1087334: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x01086d14: 0x1086d14: addiu a3, a3, 30268
+// 0x01087338: 0x1087338: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01086d18: 0x1086d18: addu  a1, s4, zero
+// 0x0108733c: 0x108733c: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x01086d1c: 0x1086d1c: lb    s2, 40(sp)
+// 0x01087340: 0x1087340: lb    s2, 40(sp)
 	ldloc.0
 	ldc.i4.s 40
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01086d20: 0x1086d20: sw    s5, 36(sp)
+// 0x01087344: 0x1087344: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -652,7 +652,7 @@ L_1086d08:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01086d24: 0x1086d24: sw    s7, 16(sp)
+// 0x01087348: 0x1087348: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -661,7 +661,7 @@ L_1086d08:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01086d28: 0x1086d28: jal   0x1068250 sb    zero, 40(sp)
+// 0x0108734c: 0x108734c: jal   0x1068260 sb    zero, 40(sp)
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -672,53 +672,53 @@ L_1086d08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01086d30: 0x1086d30: bne   v0, zero, 0x1086d54 addu  s0, v0, zero
+// 0x01087354: 0x1087354: bne   v0, zero, 0x1087378 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_1086d54
+	brtrue L_1087378
 // --- basic block ---
-// 0x01086d38: 0x1086d38: lui   a1, 0x20000
+// 0x0108735c: 0x108735c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086d3c: 0x1086d3c: lui   a3, 0x20000
+// 0x01087360: 0x1087360: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086d40: 0x1086d40: addiu a1, a1, -21512
+// 0x01087364: 0x1087364: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086d44: 0x1086d44: addiu a3, a3, -18520
+// 0x01087368: 0x1087368: addiu a3, a3, -18056
 	ldloc 4
-	ldc.i4 -18520
+	ldc.i4 -18056
 	add
 	stloc 4
-// 0x01086d48: 0x1086d48: addiu a0, zero, 4
+// 0x0108736c: 0x108736c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086d4c: 0x1086d4c: j	 0x1086c5c addiu a2, zero, 3313
+// 0x01087370: 0x1087370: j	 0x1087280 addiu a2, zero, 3313
 	ldc.i4 3313
 	stloc.3
-	br L_1086c5c
+	br L_1087280
 // --- basic block ---
-L_1086d54:
-// 0x01086d54: 0x1086d54: xori  a3, s3, 84
+L_1087378:
+// 0x01087378: 0x1087378: xori  a3, s3, 84
 	ldloc 9
 	ldc.i4.s 84
 	xor
 	stloc 4
-// 0x01086d58: 0x1086d58: xori  s2, s2, 84
+// 0x0108737c: 0x108737c: xori  s2, s2, 84
 	ldloc 7
 	ldc.i4.s 84
 	xor
 	stloc 7
-// 0x01086d5c: 0x1086d5c: lw    a0, 24(sp)
+// 0x01087380: 0x1087380: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -727,7 +727,7 @@ L_1086d54:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01086d60: 0x1086d60: lw    a1, 32(sp)
+// 0x01087384: 0x1087384: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -736,7 +736,7 @@ L_1086d54:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01086d64: 0x1086d64: lw    a2, 28(sp)
+// 0x01087388: 0x1087388: lw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -745,17 +745,17 @@ L_1086d54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01086d68: 0x1086d68: sltiu s2, s2, 1
+// 0x0108738c: 0x108738c: sltiu s2, s2, 1
 	ldloc 7
 	ldc.i4.1
 	clt.un
 	stloc 7
-// 0x01086d6c: 0x1086d6c: sltiu a3, a3, 1
+// 0x01087390: 0x1087390: sltiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	clt.un
 	stloc 4
-// 0x01086d70: 0x1086d70: sw    s2, 16(sp)
+// 0x01087394: 0x1087394: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -764,7 +764,7 @@ L_1086d54:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086d74: 0x1086d74: jal   0x1075da0 sw    s4, 20(sp)
+// 0x01087398: 0x1087398: jal   0x10763c4 sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -778,17 +778,17 @@ L_1086d54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RealtimeBonus_CollectedPointsConfirmed_1075da0(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RealtimeBonus_CollectedPointsConfirmed_10763c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1086d7c:
-// 0x01086d7c: 0x1086d7c: lw    ra, 332(sp)
-// 0x01086d80: 0x1086d80: addu  v0, s0, zero
+L_10873a0:
+// 0x010873a0: 0x10873a0: lw    ra, 332(sp)
+// 0x010873a4: 0x10873a4: addu  v0, s0, zero
 	ldloc 10
 	stloc 6
-// 0x01086d84: 0x1086d84: lw    s7, 328(sp)
+// 0x010873a8: 0x10873a8: lw    s7, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -797,7 +797,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01086d88: 0x1086d88: lw    s6, 324(sp)
+// 0x010873ac: 0x10873ac: lw    s6, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -806,7 +806,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01086d8c: 0x1086d8c: lw    s5, 320(sp)
+// 0x010873b0: 0x10873b0: lw    s5, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -815,7 +815,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01086d90: 0x1086d90: lw    s4, 316(sp)
+// 0x010873b4: 0x10873b4: lw    s4, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -824,7 +824,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01086d94: 0x1086d94: lw    s3, 312(sp)
+// 0x010873b8: 0x10873b8: lw    s3, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -833,7 +833,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01086d98: 0x1086d98: lw    s2, 308(sp)
+// 0x010873bc: 0x10873bc: lw    s2, 308(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -842,7 +842,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01086d9c: 0x1086d9c: lw    s1, 304(sp)
+// 0x010873c0: 0x10873c0: lw    s1, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -851,7 +851,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01086da0: 0x1086da0: lw    s0, 300(sp)
+// 0x010873c4: 0x10873c4: lw    s0, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -860,7 +860,7 @@ L_1086d7c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01086da4: 0x1086da4: jr    ra addiu sp, sp, 336
+// 0x010873c8: 0x10873c8: jr    ra addiu sp, sp, 336
 	ldloc.0
 	ldc.i4 336
 	add
@@ -872,7 +872,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RmBonus_1086dac(int32,int32,int32,int32,int32)
+.method public static int32 RmBonus_10873d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s1,int32 v1,int32 ra)
@@ -916,16 +916,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1086dac:
-// 0x01086dac: 0x1086dac: addiu sp, sp, -48
+L_10873d0:
+// 0x010873d0: 0x10873d0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01086db0: 0x1086db0: lui   a1, 0x0
+// 0x010873d4: 0x10873d4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01086db4: 0x1086db4: sw    s1, 36(sp)
+// 0x010873d8: 0x10873d8: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -934,7 +934,7 @@ L_1086dac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01086db8: 0x1086db8: sw    s0, 32(sp)
+// 0x010873dc: 0x10873dc: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -943,26 +943,26 @@ L_1086dac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086dbc: 0x1086dbc: addu  s1, a3, zero
+// 0x010873e0: 0x10873e0: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x01086dc0: 0x1086dc0: addiu a1, a1, 30268
+// 0x010873e4: 0x10873e4: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01086dc4: 0x1086dc4: addiu s0, zero, -1
+// 0x010873e8: 0x10873e8: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01086dc8: 0x1086dc8: addu  a2, zero, zero
+// 0x010873ec: 0x10873ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086dcc: 0x1086dcc: addiu a3, sp, 24
+// 0x010873f0: 0x10873f0: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01086dd0: 0x1086dd0: sw    s2, 40(sp)
+// 0x010873f4: 0x10873f4: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -971,8 +971,8 @@ L_1086dac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01086dd4: 0x1086dd4: sw    ra, 44(sp)
-// 0x01086dd8: 0x1086dd8: jal   0x106855c sw    s0, 16(sp)
+// 0x010873f8: 0x10873f8: sw    ra, 44(sp)
+// 0x010873fc: 0x10873fc: jal   0x106856c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -986,18 +986,18 @@ L_1086dac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01086de0: 0x1086de0: beq   v0, zero, 0x1086df8 addu  s2, v0, zero
+// 0x01087404: 0x1087404: beq   v0, zero, 0x108741c addu  s2, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 8
-	brfalse L_1086df8
+	brfalse L_108741c
 // --- basic block ---
-// 0x01086de8: 0x1086de8: lw    a0, 24(sp)
+// 0x0108740c: 0x108740c: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1006,33 +1006,33 @@ L_1086dac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01086dec: 0x1086dec: sll   zero, zero, 0
-// 0x01086df0: 0x1086df0: bne   a0, s0, 0x1086e24 sll   zero, zero, 0
+// 0x01087410: 0x1087410: sll   zero, zero, 0
+// 0x01087414: 0x1087414: bne   a0, s0, 0x1087448 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_1086e24
+	bne.un L_1087448
 // --- basic block ---
-L_1086df8:
-// 0x01086df8: 0x1086df8: lui   a1, 0x20000
+L_108741c:
+// 0x0108741c: 0x108741c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086dfc: 0x1086dfc: lui   a3, 0x20000
+// 0x01087420: 0x1087420: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086e00: 0x1086e00: addiu a1, a1, -21512
+// 0x01087424: 0x1087424: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086e04: 0x1086e04: addiu a3, a3, -18480
+// 0x01087428: 0x1087428: addiu a3, a3, -18016
 	ldloc 4
-	ldc.i4 -18480
+	ldc.i4 -18016
 	add
 	stloc 4
-// 0x01086e08: 0x1086e08: addiu a0, zero, 4
+// 0x0108742c: 0x108742c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086e0c: 0x1086e0c: jal   0x100449c addiu a2, zero, 3195
+// 0x01087430: 0x1087430: jal   0x100449c addiu a2, zero, 3195
 	ldc.i4 3195
 	stloc.3
 	ldloc.0
@@ -1045,39 +1045,39 @@ L_1086df8:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01086e14: 0x1086e14: addiu v0, zero, 18
+// 0x01087438: 0x1087438: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x01086e18: 0x1086e18: sw    v0, 0(s1)
+// 0x0108743c: 0x108743c: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01086e1c: 0x1086e1c: j	 0x1086e2c addu  s2, zero, zero
+// 0x01087440: 0x1087440: j	 0x1087450 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1086e2c
+	br L_1087450
 // --- basic block ---
-L_1086e24:
-// 0x01086e24: 0x1086e24: jal   0x10769f8 sll   zero, zero, 0
+L_1087448:
+// 0x01087448: 0x1087448: jal   0x107701c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RealtimeBonus_Delete_10769f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RealtimeBonus_Delete_107701c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_1086e2c:
-// 0x01086e2c: 0x1086e2c: lw    ra, 44(sp)
-// 0x01086e30: 0x1086e30: addu  v0, s2, zero
+L_1087450:
+// 0x01087450: 0x1087450: lw    ra, 44(sp)
+// 0x01087454: 0x1087454: addu  v0, s2, zero
 	ldloc 8
 	stloc 6
-// 0x01086e34: 0x1086e34: lw    s2, 40(sp)
+// 0x01087458: 0x1087458: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1086,7 +1086,7 @@ L_1086e2c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01086e38: 0x1086e38: lw    s1, 36(sp)
+// 0x0108745c: 0x108745c: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1095,7 +1095,7 @@ L_1086e2c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01086e3c: 0x1086e3c: lw    s0, 32(sp)
+// 0x01087460: 0x1087460: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1104,7 +1104,7 @@ L_1086e2c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01086e40: 0x1086e40: jr    ra addiu sp, sp, 48
+// 0x01087464: 0x1087464: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1116,7 +1116,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 AddCustomBonus_1086e48(int32,int32,int32,int32,int32)
+.method public static int32 AddCustomBonus_108746c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s3,int32 s0,int32 s4,int32 s8,int32 s1,int32 s7,int32 s5,int32 s6,int32 s2,int32 ra)
@@ -1178,13 +1178,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1086e48:
-// 0x01086e48: 0x1086e48: addiu sp, sp, -1208
+L_108746c:
+// 0x0108746c: 0x108746c: addiu sp, sp, -1208
 	ldloc.0
 	ldc.i4 -1208
 	add
 	stloc.0
-// 0x01086e4c: 0x1086e4c: sw    s5, 1188(sp)
+// 0x01087470: 0x1087470: sw    s5, 1188(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1193,12 +1193,12 @@ L_1086e48:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01086e50: 0x1086e50: addiu s5, sp, 28
+// 0x01087474: 0x1087474: addiu s5, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 14
-// 0x01086e54: 0x1086e54: sw    s3, 1180(sp)
+// 0x01087478: 0x1087478: sw    s3, 1180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1207,7 +1207,7 @@ L_1086e48:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01086e58: 0x1086e58: sw    s0, 1168(sp)
+// 0x0108747c: 0x108747c: sw    s0, 1168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1216,16 +1216,16 @@ L_1086e48:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01086e5c: 0x1086e5c: lui   s3, 0x0
+// 0x01087480: 0x1087480: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01086e60: 0x1086e60: addu  s0, a0, zero
+// 0x01087484: 0x1087484: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01086e64: 0x1086e64: addu  a0, s5, zero
+// 0x01087488: 0x1087488: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x01086e68: 0x1086e68: sw    s2, 1176(sp)
+// 0x0108748c: 0x108748c: sw    s2, 1176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1234,7 +1234,7 @@ L_1086e48:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01086e6c: 0x1086e6c: sw    s1, 1172(sp)
+// 0x01087490: 0x1087490: sw    s1, 1172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1243,11 +1243,11 @@ L_1086e48:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01086e70: 0x1086e70: addu  s2, a3, zero
+// 0x01087494: 0x1087494: addu  s2, a3, zero
 	ldloc 4
 	stloc 16
-// 0x01086e74: 0x1086e74: sw    ra, 1204(sp)
-// 0x01086e78: 0x1086e78: sw    s8, 1200(sp)
+// 0x01087498: 0x1087498: sw    ra, 1204(sp)
+// 0x0108749c: 0x108749c: sw    s8, 1200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1256,7 +1256,7 @@ L_1086e48:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01086e7c: 0x1086e7c: sw    s7, 1196(sp)
+// 0x010874a0: 0x10874a0: sw    s7, 1196(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1265,7 +1265,7 @@ L_1086e48:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01086e80: 0x1086e80: sw    s6, 1192(sp)
+// 0x010874a4: 0x10874a4: sw    s6, 1192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1274,7 +1274,7 @@ L_1086e48:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01086e84: 0x1086e84: sw    s4, 1184(sp)
+// 0x010874a8: 0x10874a8: sw    s4, 1184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1283,28 +1283,28 @@ L_1086e48:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01086e88: 0x1086e88: jal   0x10756e8 addiu s1, zero, 1
+// 0x010874ac: 0x10874ac: jal   0x1075d0c addiu s1, zero, 1
 	ldc.i4.1
 	stloc 12
 	ldloc.1
-	call int32 Cibyl88::RealtimeBonus_Record_Init_10756e8(int32)
+	call int32 Cibyl88::RealtimeBonus_Record_Init_1075d0c(int32)
 	stloc 6
 // --- basic block ---
-// 0x01086e90: 0x1086e90: addu  a0, s0, zero
+// 0x010874b4: 0x10874b4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01086e94: 0x1086e94: addiu a1, s3, 28076
+// 0x010874b8: 0x10874b8: addiu a1, s3, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086e98: 0x1086e98: addu  a2, zero, zero
+// 0x010874bc: 0x10874bc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086e9c: 0x1086e9c: addu  a3, s5, zero
+// 0x010874c0: 0x10874c0: addu  a3, s5, zero
 	ldloc 14
 	stloc 4
-// 0x01086ea0: 0x1086ea0: jal   0x106855c sw    s1, 16(sp)
+// 0x010874c4: 0x10874c4: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1318,18 +1318,18 @@ L_1086e48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01086ea8: 0x1086ea8: beq   v0, zero, 0x1086ec0 addiu s6, zero, -1
+// 0x010874cc: 0x10874cc: beq   v0, zero, 0x10874e4 addiu s6, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 15
-	brfalse L_1086ec0
+	brfalse L_10874e4
 // --- basic block ---
-// 0x01086eb0: 0x1086eb0: lw    v1, 28(sp)
+// 0x010874d4: 0x10874d4: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1338,71 +1338,71 @@ L_1086e48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01086eb4: 0x1086eb4: sll   zero, zero, 0
-// 0x01086eb8: 0x1086eb8: bne   v1, s6, 0x1086edc addiu s8, sp, 132
+// 0x010874d8: 0x10874d8: sll   zero, zero, 0
+// 0x010874dc: 0x10874dc: bne   v1, s6, 0x1087500 addiu s8, sp, 132
 	ldloc 7
 	ldloc 15
 	ldloc.0
 	ldc.i4 132
 	add
 	stloc 11
-	bne.un L_1086edc
+	bne.un L_1087500
 // --- basic block ---
-L_1086ec0:
-// 0x01086ec0: 0x1086ec0: lui   a1, 0x20000
+L_10874e4:
+// 0x010874e4: 0x10874e4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086ec4: 0x1086ec4: lui   a3, 0x20000
+// 0x010874e8: 0x10874e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086ec8: 0x1086ec8: addiu a1, a1, -21512
+// 0x010874ec: 0x10874ec: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086ecc: 0x1086ecc: addiu a3, a3, -18444
+// 0x010874f0: 0x10874f0: addiu a3, a3, -17980
 	ldloc 4
-	ldc.i4 -18444
+	ldc.i4 -17980
 	add
 	stloc 4
-// 0x01086ed0: 0x1086ed0: addiu a0, zero, 4
+// 0x010874f4: 0x10874f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086ed4: 0x1086ed4: j	 0x1086f74 addiu a2, zero, 3060
+// 0x010874f8: 0x10874f8: j	 0x1087598 addiu a2, zero, 3060
 	ldc.i4 3060
 	stloc.3
-	br L_1086f74
+	br L_1087598
 // --- basic block ---
-L_1086edc:
-// 0x01086edc: 0x1086edc: addiu s4, sp, 24
+L_1087500:
+// 0x01087500: 0x1087500: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01086ee0: 0x1086ee0: addu  a0, v0, zero
+// 0x01087504: 0x1087504: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086ee4: 0x1086ee4: addiu s7, zero, 128
+// 0x01087508: 0x1087508: addiu s7, zero, 128
 	ldc.i4 128
 	stloc 13
-// 0x01086ee8: 0x1086ee8: addu  a1, s8, zero
+// 0x0108750c: 0x108750c: addu  a1, s8, zero
 	ldloc 11
 	stloc.2
-// 0x01086eec: 0x1086eec: addu  a2, s4, zero
+// 0x01087510: 0x1087510: addu  a2, s4, zero
 	ldloc 10
 	stloc.3
-// 0x01086ef0: 0x1086ef0: addiu a3, s3, 28076
+// 0x01087514: 0x1087514: addiu a3, s3, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086ef4: 0x1086ef4: sb    zero, 132(sp)
+// 0x01087518: 0x1087518: sb    zero, 132(sp)
 	ldloc.0
 	ldc.i4 132
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01086ef8: 0x1086ef8: sw    s7, 24(sp)
+// 0x0108751c: 0x108751c: sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1411,7 +1411,7 @@ L_1086edc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01086efc: 0x1086efc: jal   0x1068250 sw    s1, 16(sp)
+// 0x01087520: 0x1087520: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1425,59 +1425,59 @@ L_1086edc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01086f04: 0x1086f04: bne   v0, zero, 0x1086f28 addu  s0, v0, zero
+// 0x01087528: 0x1087528: bne   v0, zero, 0x108754c addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brtrue L_1086f28
+	brtrue L_108754c
 // --- basic block ---
-// 0x01086f0c: 0x1086f0c: lui   a1, 0x20000
+// 0x01087530: 0x1087530: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086f10: 0x1086f10: lui   a3, 0x20000
+// 0x01087534: 0x1087534: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086f14: 0x1086f14: addiu a1, a1, -21512
+// 0x01087538: 0x1087538: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086f18: 0x1086f18: addiu a3, a3, -18396
+// 0x0108753c: 0x108753c: addiu a3, a3, -17932
 	ldloc 4
-	ldc.i4 -18396
+	ldc.i4 -17932
 	add
 	stloc 4
-// 0x01086f1c: 0x1086f1c: addiu a0, zero, 4
+// 0x01087540: 0x1087540: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086f20: 0x1086f20: j	 0x10870bc addiu a2, zero, 3078
+// 0x01087544: 0x1087544: j	 0x10876e0 addiu a2, zero, 3078
 	ldc.i4 3078
 	stloc.3
-	br L_10870bc
+	br L_10876e0
 // --- basic block ---
-L_1086f28:
-// 0x01086f28: 0x1086f28: addu  a0, v0, zero
+L_108754c:
+// 0x0108754c: 0x108754c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086f2c: 0x1086f2c: addiu a1, s3, 28076
+// 0x01087550: 0x1087550: addiu a1, s3, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01086f30: 0x1086f30: addu  a2, zero, zero
+// 0x01087554: 0x1087554: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01086f34: 0x1086f34: addiu a3, sp, 44
+// 0x01087558: 0x1087558: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x01086f38: 0x1086f38: sw    s8, 108(sp)
+// 0x0108755c: 0x108755c: sw    s8, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1486,7 +1486,7 @@ L_1086f28:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01086f3c: 0x1086f3c: jal   0x106855c sw    s1, 16(sp)
+// 0x01087560: 0x1087560: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1500,18 +1500,18 @@ L_1086f28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01086f44: 0x1086f44: beq   v0, zero, 0x1086f60 lui   a1, 0x20000
+// 0x01087568: 0x1087568: beq   v0, zero, 0x1087584 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1086f60
+	brfalse L_1087584
 // --- basic block ---
-// 0x01086f4c: 0x1086f4c: lw    v1, 44(sp)
+// 0x01087570: 0x1087570: lw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1520,41 +1520,41 @@ L_1086f28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01086f50: 0x1086f50: sll   zero, zero, 0
-// 0x01086f54: 0x1086f54: bne   v1, s6, 0x1086f88 addiu s8, sp, 260
+// 0x01087574: 0x1087574: sll   zero, zero, 0
+// 0x01087578: 0x1087578: bne   v1, s6, 0x10875ac addiu s8, sp, 260
 	ldloc 7
 	ldloc 15
 	ldloc.0
 	ldc.i4 260
 	add
 	stloc 11
-	bne.un L_1086f88
+	bne.un L_10875ac
 // --- basic block ---
-// 0x01086f5c: 0x1086f5c: lui   a1, 0x20000
+// 0x01087580: 0x1087580: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1086f60:
-// 0x01086f60: 0x1086f60: lui   a3, 0x20000
+L_1087584:
+// 0x01087584: 0x1087584: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086f64: 0x1086f64: addiu a1, a1, -21512
+// 0x01087588: 0x1087588: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086f68: 0x1086f68: addiu a3, a3, -18344
+// 0x0108758c: 0x108758c: addiu a3, a3, -17880
 	ldloc 4
-	ldc.i4 -18344
+	ldc.i4 -17880
 	add
 	stloc 4
-// 0x01086f6c: 0x1086f6c: addiu a0, zero, 4
+// 0x01087590: 0x1087590: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086f70: 0x1086f70: addiu a2, zero, 3094
+// 0x01087594: 0x1087594: addiu a2, zero, 3094
 	ldc.i4 3094
 	stloc.3
-L_1086f74:
-// 0x01086f74: 0x1086f74: jal   0x100449c addu  s0, zero, zero
+L_1087598:
+// 0x01087598: 0x1087598: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -1567,34 +1567,34 @@ L_1086f74:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01086f7c: 0x1086f7c: addiu v0, zero, 18
+// 0x010875a0: 0x10875a0: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x01086f80: 0x1086f80: j	 0x10870f8 sw    v0, 0(s2)
+// 0x010875a4: 0x10875a4: j	 0x108771c sw    v0, 0(s2)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_10870f8
+	br L_108771c
 // --- basic block ---
-L_1086f88:
-// 0x01086f88: 0x1086f88: addu  a0, v0, zero
+L_10875ac:
+// 0x010875ac: 0x10875ac: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086f8c: 0x1086f8c: addu  a1, s8, zero
+// 0x010875b0: 0x10875b0: addu  a1, s8, zero
 	ldloc 11
 	stloc.2
-// 0x01086f90: 0x1086f90: addu  a2, s4, zero
+// 0x010875b4: 0x10875b4: addu  a2, s4, zero
 	ldloc 10
 	stloc.3
-// 0x01086f94: 0x1086f94: addiu a3, s3, 28076
+// 0x010875b8: 0x10875b8: addiu a3, s3, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086f98: 0x1086f98: sw    s7, 24(sp)
+// 0x010875bc: 0x10875bc: sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1603,13 +1603,13 @@ L_1086f88:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01086f9c: 0x1086f9c: sb    zero, 260(sp)
+// 0x010875c0: 0x10875c0: sb    zero, 260(sp)
 	ldloc.0
 	ldc.i4 260
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01086fa0: 0x1086fa0: jal   0x1068250 sw    s1, 16(sp)
+// 0x010875c4: 0x10875c4: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1623,65 +1623,65 @@ L_1086f88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01086fa8: 0x1086fa8: bne   v0, zero, 0x1086fcc addu  s0, v0, zero
+// 0x010875cc: 0x10875cc: bne   v0, zero, 0x10875f0 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brtrue L_1086fcc
+	brtrue L_10875f0
 // --- basic block ---
-// 0x01086fb0: 0x1086fb0: lui   a1, 0x20000
+// 0x010875d4: 0x10875d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01086fb4: 0x1086fb4: lui   a3, 0x20000
+// 0x010875d8: 0x10875d8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01086fb8: 0x1086fb8: addiu a1, a1, -21512
+// 0x010875dc: 0x10875dc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01086fbc: 0x1086fbc: addiu a3, a3, -18284
+// 0x010875e0: 0x10875e0: addiu a3, a3, -17820
 	ldloc 4
-	ldc.i4 -18284
+	ldc.i4 -17820
 	add
 	stloc 4
-// 0x01086fc0: 0x1086fc0: addiu a0, zero, 4
+// 0x010875e4: 0x10875e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01086fc4: 0x1086fc4: j	 0x10870bc addiu a2, zero, 3111
+// 0x010875e8: 0x10875e8: j	 0x10876e0 addiu a2, zero, 3111
 	ldc.i4 3111
 	stloc.3
-	br L_10870bc
+	br L_10876e0
 // --- basic block ---
-L_1086fcc:
-// 0x01086fcc: 0x1086fcc: addiu v1, sp, 388
+L_10875f0:
+// 0x010875f0: 0x10875f0: addiu v1, sp, 388
 	ldloc.0
 	ldc.i4 388
 	add
 	stloc 7
-// 0x01086fd0: 0x1086fd0: addu  a1, v1, zero
+// 0x010875f4: 0x10875f4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01086fd4: 0x1086fd4: addu  a0, v0, zero
+// 0x010875f8: 0x10875f8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01086fd8: 0x1086fd8: addiu s7, zero, 256
+// 0x010875fc: 0x10875fc: addiu s7, zero, 256
 	ldc.i4 256
 	stloc 13
-// 0x01086fdc: 0x1086fdc: addu  a2, s4, zero
+// 0x01087600: 0x1087600: addu  a2, s4, zero
 	ldloc 10
 	stloc.3
-// 0x01086fe0: 0x1086fe0: addiu a3, s3, 28076
+// 0x01087604: 0x1087604: addiu a3, s3, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01086fe4: 0x1086fe4: sw    v1, 1160(sp)
+// 0x01087608: 0x1087608: sw    v1, 1160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1690,7 +1690,7 @@ L_1086fcc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01086fe8: 0x1086fe8: sw    s8, 56(sp)
+// 0x0108760c: 0x108760c: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1699,13 +1699,13 @@ L_1086fcc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01086fec: 0x1086fec: sb    zero, 388(sp)
+// 0x01087610: 0x1087610: sb    zero, 388(sp)
 	ldloc.0
 	ldc.i4 388
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01086ff0: 0x1086ff0: sw    s7, 24(sp)
+// 0x01087614: 0x1087614: sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1714,7 +1714,7 @@ L_1086fcc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01086ff4: 0x1086ff4: jal   0x1068250 sw    s1, 16(sp)
+// 0x01087618: 0x1087618: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1728,12 +1728,12 @@ L_1086fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01086ffc: 0x1086ffc: lw    v1, 1160(sp)
+// 0x01087620: 0x1087620: lw    v1, 1160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1742,57 +1742,57 @@ L_1086fcc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087000: 0x1087000: bne   v0, zero, 0x1087024 addu  s0, v0, zero
+// 0x01087624: 0x1087624: bne   v0, zero, 0x1087648 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brtrue L_1087024
+	brtrue L_1087648
 // --- basic block ---
-// 0x01087008: 0x1087008: lui   a1, 0x20000
+// 0x0108762c: 0x108762c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108700c: 0x108700c: lui   a3, 0x20000
+// 0x01087630: 0x1087630: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087010: 0x1087010: addiu a1, a1, -21512
+// 0x01087634: 0x1087634: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087014: 0x1087014: addiu a3, a3, -19516
+// 0x01087638: 0x1087638: addiu a3, a3, -19052
 	ldloc 4
-	ldc.i4 -19516
+	ldc.i4 -19052
 	add
 	stloc 4
-// 0x01087018: 0x1087018: addiu a0, zero, 4
+// 0x0108763c: 0x108763c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108701c: 0x108701c: j	 0x10870bc addiu a2, zero, 3129
+// 0x01087640: 0x1087640: j	 0x10876e0 addiu a2, zero, 3129
 	ldc.i4 3129
 	stloc.3
-	br L_10870bc
+	br L_10876e0
 // --- basic block ---
-L_1087024:
-// 0x01087024: 0x1087024: addiu s8, sp, 644
+L_1087648:
+// 0x01087648: 0x1087648: addiu s8, sp, 644
 	ldloc.0
 	ldc.i4 644
 	add
 	stloc 11
-// 0x01087028: 0x1087028: addu  a0, v0, zero
+// 0x0108764c: 0x108764c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0108702c: 0x108702c: addiu a3, s3, 28076
+// 0x01087650: 0x1087650: addiu a3, s3, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01087030: 0x1087030: addu  a1, s8, zero
+// 0x01087654: 0x1087654: addu  a1, s8, zero
 	ldloc 11
 	stloc.2
-// 0x01087034: 0x1087034: addu  a2, s4, zero
+// 0x01087658: 0x1087658: addu  a2, s4, zero
 	ldloc 10
 	stloc.3
-// 0x01087038: 0x1087038: sw    v1, 120(sp)
+// 0x0108765c: 0x108765c: sw    v1, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1801,13 +1801,13 @@ L_1087024:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108703c: 0x108703c: sb    zero, 644(sp)
+// 0x01087660: 0x1087660: sb    zero, 644(sp)
 	ldloc.0
 	ldc.i4 644
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01087040: 0x1087040: sw    s7, 24(sp)
+// 0x01087664: 0x1087664: sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1816,7 +1816,7 @@ L_1087024:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01087044: 0x1087044: jal   0x1068250 sw    s1, 16(sp)
+// 0x01087668: 0x1087668: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1830,65 +1830,65 @@ L_1087024:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108704c: 0x108704c: bne   v0, zero, 0x1087070 addu  s0, v0, zero
+// 0x01087670: 0x1087670: bne   v0, zero, 0x1087694 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brtrue L_1087070
+	brtrue L_1087694
 // --- basic block ---
-// 0x01087054: 0x1087054: lui   a1, 0x20000
+// 0x01087678: 0x1087678: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087058: 0x1087058: lui   a3, 0x20000
+// 0x0108767c: 0x108767c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108705c: 0x108705c: addiu a1, a1, -21512
+// 0x01087680: 0x1087680: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087060: 0x1087060: addiu a3, a3, -19460
+// 0x01087684: 0x1087684: addiu a3, a3, -18996
 	ldloc 4
-	ldc.i4 -19460
+	ldc.i4 -18996
 	add
 	stloc 4
-// 0x01087064: 0x1087064: addiu a0, zero, 4
+// 0x01087688: 0x1087688: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087068: 0x1087068: j	 0x10870bc addiu a2, zero, 3147
+// 0x0108768c: 0x108768c: j	 0x10876e0 addiu a2, zero, 3147
 	ldc.i4 3147
 	stloc.3
-	br L_10870bc
+	br L_10876e0
 // --- basic block ---
-L_1087070:
-// 0x01087070: 0x1087070: addiu s3, sp, 900
+L_1087694:
+// 0x01087694: 0x1087694: addiu s3, sp, 900
 	ldloc.0
 	ldc.i4 900
 	add
 	stloc 8
-// 0x01087074: 0x1087074: lui   a3, 0x0
+// 0x01087698: 0x1087698: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01087078: 0x1087078: addu  a2, s4, zero
+// 0x0108769c: 0x108769c: addu  a2, s4, zero
 	ldloc 10
 	stloc.3
-// 0x0108707c: 0x108707c: addu  a0, v0, zero
+// 0x010876a0: 0x10876a0: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01087080: 0x1087080: addiu a3, a3, 30268
+// 0x010876a4: 0x10876a4: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01087084: 0x1087084: addu  a1, s3, zero
+// 0x010876a8: 0x10876a8: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x01087088: 0x1087088: sw    s8, 124(sp)
+// 0x010876ac: 0x10876ac: sw    s8, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1897,7 +1897,7 @@ L_1087070:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108708c: 0x108708c: sw    s7, 24(sp)
+// 0x010876b0: 0x10876b0: sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1906,7 +1906,7 @@ L_1087070:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01087090: 0x1087090: sw    s6, 16(sp)
+// 0x010876b4: 0x10876b4: sw    s6, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1915,7 +1915,7 @@ L_1087070:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01087094: 0x1087094: jal   0x1068250 sb    zero, 900(sp)
+// 0x010876b8: 0x10876b8: jal   0x1068260 sb    zero, 900(sp)
 	ldloc.0
 	ldc.i4 900
 	add
@@ -1926,41 +1926,41 @@ L_1087070:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108709c: 0x108709c: addu  s0, v0, zero
+// 0x010876c0: 0x10876c0: addu  s0, v0, zero
 	ldloc 6
 	stloc 9
-// 0x010870a0: 0x10870a0: bne   v0, zero, 0x10870d0 lui   s4, 0x20000
+// 0x010876c4: 0x10876c4: bne   v0, zero, 0x10876f4 lui   s4, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 10
-	brtrue L_10870d0
+	brtrue L_10876f4
 // --- basic block ---
-// 0x010870a8: 0x10870a8: lui   a3, 0x20000
+// 0x010876cc: 0x10876cc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010870ac: 0x10870ac: addiu a1, s4, -21512
+// 0x010876d0: 0x10876d0: addiu a1, s4, -21048
 	ldloc 10
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010870b0: 0x10870b0: addiu a3, a3, -19412
+// 0x010876d4: 0x10876d4: addiu a3, a3, -18948
 	ldloc 4
-	ldc.i4 -19412
+	ldc.i4 -18948
 	add
 	stloc 4
-// 0x010870b4: 0x10870b4: addiu a0, zero, 4
+// 0x010876d8: 0x10876d8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010870b8: 0x10870b8: addiu a2, zero, 3164
+// 0x010876dc: 0x10876dc: addiu a2, zero, 3164
 	ldc.i4 3164
 	stloc.3
-L_10870bc:
-// 0x010870bc: 0x10870bc: jal   0x100449c sll   zero, zero, 0
+L_10876e0:
+// 0x010876e0: 0x10876e0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1971,23 +1971,23 @@ L_10870bc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010870c4: 0x10870c4: addiu v0, zero, 18
+// 0x010876e8: 0x10876e8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x010870c8: 0x10870c8: j	 0x10870f8 sw    v0, 0(s2)
+// 0x010876ec: 0x10876ec: j	 0x108771c sw    v0, 0(s2)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_10870f8
+	br L_108771c
 // --- basic block ---
-L_10870d0:
-// 0x010870d0: 0x10870d0: addu  a0, s5, zero
+L_10876f4:
+// 0x010876f4: 0x10876f4: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010870d4: 0x10870d4: sw    s3, 128(sp)
+// 0x010876f8: 0x10876f8: sw    s3, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1996,7 +1996,7 @@ L_10870d0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010870d8: 0x10870d8: jal   0x1076b10 sw    s1, 112(sp)
+// 0x010876fc: 0x10876fc: jal   0x1077134 sw    s1, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2010,28 +2010,28 @@ L_10870d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RealtimeBonus_Add_1076b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RealtimeBonus_Add_1077134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010870e0: 0x10870e0: lui   a3, 0x20000
+// 0x01087704: 0x1087704: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010870e4: 0x10870e4: addiu a1, s4, -21512
+// 0x01087708: 0x1087708: addiu a1, s4, -21048
 	ldloc 10
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010870e8: 0x10870e8: addiu a3, a3, -18232
+// 0x0108770c: 0x108770c: addiu a3, a3, -17768
 	ldloc 4
-	ldc.i4 -18232
+	ldc.i4 -17768
 	add
 	stloc 4
-// 0x010870ec: 0x10870ec: addiu a0, zero, 4
+// 0x01087710: 0x1087710: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010870f0: 0x10870f0: jal   0x100449c addiu a2, zero, 3174
+// 0x01087714: 0x1087714: jal   0x100449c addiu a2, zero, 3174
 	ldc.i4 3174
 	stloc.3
 	ldloc.0
@@ -2044,12 +2044,12 @@ L_10870d0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10870f8:
-// 0x010870f8: 0x10870f8: lw    ra, 1204(sp)
-// 0x010870fc: 0x10870fc: addu  v0, s0, zero
+L_108771c:
+// 0x0108771c: 0x108771c: lw    ra, 1204(sp)
+// 0x01087720: 0x1087720: addu  v0, s0, zero
 	ldloc 9
 	stloc 6
-// 0x01087100: 0x1087100: lw    s8, 1200(sp)
+// 0x01087724: 0x1087724: lw    s8, 1200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2058,7 +2058,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01087104: 0x1087104: lw    s7, 1196(sp)
+// 0x01087728: 0x1087728: lw    s7, 1196(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2067,7 +2067,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01087108: 0x1087108: lw    s6, 1192(sp)
+// 0x0108772c: 0x108772c: lw    s6, 1192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2076,7 +2076,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108710c: 0x108710c: lw    s5, 1188(sp)
+// 0x01087730: 0x1087730: lw    s5, 1188(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2085,7 +2085,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01087110: 0x1087110: lw    s4, 1184(sp)
+// 0x01087734: 0x1087734: lw    s4, 1184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2094,7 +2094,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01087114: 0x1087114: lw    s3, 1180(sp)
+// 0x01087738: 0x1087738: lw    s3, 1180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2103,7 +2103,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01087118: 0x1087118: lw    s2, 1176(sp)
+// 0x0108773c: 0x108773c: lw    s2, 1176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2112,7 +2112,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0108711c: 0x108711c: lw    s1, 1172(sp)
+// 0x01087740: 0x1087740: lw    s1, 1172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2121,7 +2121,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01087120: 0x1087120: lw    s0, 1168(sp)
+// 0x01087744: 0x1087744: lw    s0, 1168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2130,7 +2130,7 @@ L_10870f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01087124: 0x1087124: jr    ra addiu sp, sp, 1208
+// 0x01087748: 0x1087748: jr    ra addiu sp, sp, 1208
 	ldloc.0
 	ldc.i4 1208
 	add
@@ -2142,7 +2142,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 AddBonus_108712c(int32,int32,int32,int32,int32)
+.method public static int32 AddBonus_1087750(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s1,int32 s4,int32 ra)
@@ -2192,13 +2192,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108712c:
-// 0x0108712c: 0x108712c: addiu sp, sp, -288
+L_1087750:
+// 0x01087750: 0x1087750: addiu sp, sp, -288
 	ldloc.0
 	ldc.i4 -288
 	add
 	stloc.0
-// 0x01087130: 0x1087130: sw    s0, 264(sp)
+// 0x01087754: 0x1087754: sw    s0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2207,12 +2207,12 @@ L_108712c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087134: 0x1087134: addiu s0, sp, 28
+// 0x01087758: 0x1087758: addiu s0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 8
-// 0x01087138: 0x1087138: sw    s3, 276(sp)
+// 0x0108775c: 0x108775c: sw    s3, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2221,7 +2221,7 @@ L_108712c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108713c: 0x108713c: sw    s2, 272(sp)
+// 0x01087760: 0x1087760: sw    s2, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2230,16 +2230,16 @@ L_108712c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01087140: 0x1087140: lui   s3, 0x0
+// 0x01087764: 0x1087764: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01087144: 0x1087144: addu  s2, a0, zero
+// 0x01087768: 0x1087768: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01087148: 0x1087148: addu  a0, s0, zero
+// 0x0108776c: 0x108776c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108714c: 0x108714c: sw    s1, 268(sp)
+// 0x01087770: 0x1087770: sw    s1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2248,11 +2248,11 @@ L_108712c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01087150: 0x1087150: sw    ra, 284(sp)
-// 0x01087154: 0x1087154: addu  s1, a3, zero
+// 0x01087774: 0x1087774: sw    ra, 284(sp)
+// 0x01087778: 0x1087778: addu  s1, a3, zero
 	ldloc 4
 	stloc 11
-// 0x01087158: 0x1087158: jal   0x10756e8 sw    s4, 280(sp)
+// 0x0108777c: 0x108777c: jal   0x1075d0c sw    s4, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2262,27 +2262,27 @@ L_108712c:
 	ldloc 12
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl88::RealtimeBonus_Record_Init_10756e8(int32)
+	call int32 Cibyl88::RealtimeBonus_Record_Init_1075d0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01087160: 0x1087160: addu  a0, s2, zero
+// 0x01087784: 0x1087784: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01087164: 0x1087164: addu  a3, s0, zero
+// 0x01087788: 0x1087788: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x01087168: 0x1087168: addiu s2, zero, 1
+// 0x0108778c: 0x108778c: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0108716c: 0x108716c: addiu a1, s3, 28076
+// 0x01087790: 0x1087790: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087170: 0x1087170: addu  a2, zero, zero
+// 0x01087794: 0x1087794: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087174: 0x1087174: jal   0x106855c sw    s2, 16(sp)
+// 0x01087798: 0x1087798: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2296,18 +2296,18 @@ L_108712c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108717c: 0x108717c: beq   v0, zero, 0x1087194 lui   a1, 0x20000
+// 0x010877a0: 0x10877a0: beq   v0, zero, 0x10877b8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1087194
+	brfalse L_10877b8
 // --- basic block ---
-// 0x01087184: 0x1087184: lw    v1, 28(sp)
+// 0x010877a8: 0x10877a8: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2316,54 +2316,54 @@ L_108712c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087188: 0x1087188: addiu s0, zero, -1
+// 0x010877ac: 0x10877ac: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x0108718c: 0x108718c: bne   v1, s0, 0x10871ac sll   zero, zero, 0
+// 0x010877b0: 0x10877b0: bne   v1, s0, 0x10877d0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_10871ac
+	bne.un L_10877d0
 // --- basic block ---
-L_1087194:
-// 0x01087194: 0x1087194: lui   a3, 0x20000
+L_10877b8:
+// 0x010877b8: 0x10877b8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087198: 0x1087198: addiu a1, a1, -21512
+// 0x010877bc: 0x10877bc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108719c: 0x108719c: addiu a3, a3, -18204
+// 0x010877c0: 0x10877c0: addiu a3, a3, -17740
 	ldloc 4
-	ldc.i4 -18204
+	ldc.i4 -17740
 	add
 	stloc 4
-// 0x010871a0: 0x10871a0: addiu a0, zero, 4
+// 0x010877c4: 0x10877c4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010871a4: 0x10871a4: j	 0x10871f4 addiu a2, zero, 2916
+// 0x010877c8: 0x10877c8: j	 0x1087818 addiu a2, zero, 2916
 	ldc.i4 2916
 	stloc.3
-	br L_10871f4
+	br L_1087818
 // --- basic block ---
-L_10871ac:
-// 0x010871ac: 0x10871ac: addu  a0, v0, zero
+L_10877d0:
+// 0x010877d0: 0x10877d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010871b0: 0x10871b0: addiu a1, s3, 28076
+// 0x010877d4: 0x10877d4: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010871b4: 0x10871b4: addu  a2, zero, zero
+// 0x010877d8: 0x10877d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010871b8: 0x10871b8: addiu a3, sp, 36
+// 0x010877dc: 0x10877dc: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x010871bc: 0x10871bc: jal   0x106855c sw    s2, 16(sp)
+// 0x010877e0: 0x10877e0: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2377,18 +2377,18 @@ L_10871ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010871c4: 0x10871c4: beq   v0, zero, 0x10871e0 lui   a1, 0x20000
+// 0x010877e8: 0x10877e8: beq   v0, zero, 0x1087804 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10871e0
+	brfalse L_1087804
 // --- basic block ---
-// 0x010871cc: 0x10871cc: lw    v1, 36(sp)
+// 0x010877f0: 0x10877f0: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2397,39 +2397,39 @@ L_10871ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010871d0: 0x10871d0: sll   zero, zero, 0
-// 0x010871d4: 0x10871d4: bne   v1, s0, 0x1087208 addu  a0, v0, zero
+// 0x010877f4: 0x10877f4: sll   zero, zero, 0
+// 0x010877f8: 0x10877f8: bne   v1, s0, 0x108782c addu  a0, v0, zero
 	ldloc 7
 	ldloc 8
 	ldloc 5
 	stloc.1
-	bne.un L_1087208
+	bne.un L_108782c
 // --- basic block ---
-// 0x010871dc: 0x10871dc: lui   a1, 0x20000
+// 0x01087800: 0x1087800: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10871e0:
-// 0x010871e0: 0x10871e0: lui   a3, 0x20000
+L_1087804:
+// 0x01087804: 0x1087804: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010871e4: 0x10871e4: addiu a1, a1, -21512
+// 0x01087808: 0x1087808: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010871e8: 0x10871e8: addiu a3, a3, -18164
+// 0x0108780c: 0x108780c: addiu a3, a3, -17700
 	ldloc 4
-	ldc.i4 -18164
+	ldc.i4 -17700
 	add
 	stloc 4
-// 0x010871ec: 0x10871ec: addiu a0, zero, 4
+// 0x01087810: 0x1087810: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010871f0: 0x10871f0: addiu a2, zero, 2931
+// 0x01087814: 0x1087814: addiu a2, zero, 2931
 	ldc.i4 2931
 	stloc.3
-L_10871f4:
-// 0x010871f4: 0x10871f4: jal   0x100449c addu  s0, zero, zero
+L_1087818:
+// 0x01087818: 0x1087818: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -2442,33 +2442,33 @@ L_10871f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010871fc: 0x10871fc: addiu v0, zero, 18
+// 0x01087820: 0x1087820: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01087200: 0x1087200: j	 0x10873e8 sw    v0, 0(s1)
+// 0x01087824: 0x1087824: j	 0x1087a0c sw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10873e8
+	br L_1087a0c
 // --- basic block ---
-L_1087208:
-// 0x01087208: 0x1087208: addiu a1, s3, 28076
+L_108782c:
+// 0x0108782c: 0x108782c: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108720c: 0x108720c: addu  a2, zero, zero
+// 0x01087830: 0x1087830: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087210: 0x1087210: addiu a3, sp, 48
+// 0x01087834: 0x1087834: addiu a3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 4
-// 0x01087214: 0x1087214: jal   0x106855c sw    s2, 16(sp)
+// 0x01087838: 0x1087838: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2482,18 +2482,18 @@ L_1087208:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108721c: 0x108721c: beq   v0, zero, 0x1087234 lui   a1, 0x20000
+// 0x01087840: 0x1087840: beq   v0, zero, 0x1087858 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1087234
+	brfalse L_1087858
 // --- basic block ---
-// 0x01087224: 0x1087224: lw    v1, 48(sp)
+// 0x01087848: 0x1087848: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2502,52 +2502,52 @@ L_1087208:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087228: 0x1087228: sll   zero, zero, 0
-// 0x0108722c: 0x108722c: bne   v1, s0, 0x108724c sll   zero, zero, 0
+// 0x0108784c: 0x108784c: sll   zero, zero, 0
+// 0x01087850: 0x1087850: bne   v1, s0, 0x1087870 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_108724c
+	bne.un L_1087870
 // --- basic block ---
-L_1087234:
-// 0x01087234: 0x1087234: lui   a3, 0x20000
+L_1087858:
+// 0x01087858: 0x1087858: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087238: 0x1087238: addiu a1, a1, -21512
+// 0x0108785c: 0x108785c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108723c: 0x108723c: addiu a3, a3, -18120
+// 0x01087860: 0x1087860: addiu a3, a3, -17656
 	ldloc 4
-	ldc.i4 -18120
+	ldc.i4 -17656
 	add
 	stloc 4
-// 0x01087240: 0x1087240: addiu a0, zero, 4
+// 0x01087864: 0x1087864: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087244: 0x1087244: j	 0x10871f4 addiu a2, zero, 2946
+// 0x01087868: 0x1087868: j	 0x1087818 addiu a2, zero, 2946
 	ldc.i4 2946
 	stloc.3
-	br L_10871f4
+	br L_1087818
 // --- basic block ---
-L_108724c:
-// 0x0108724c: 0x108724c: addu  a0, v0, zero
+L_1087870:
+// 0x01087870: 0x1087870: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087250: 0x1087250: addiu a1, s3, 28076
+// 0x01087874: 0x1087874: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087254: 0x1087254: addu  a2, zero, zero
+// 0x01087878: 0x1087878: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087258: 0x1087258: addiu a3, sp, 52
+// 0x0108787c: 0x108787c: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x0108725c: 0x108725c: jal   0x106855c sw    s2, 16(sp)
+// 0x01087880: 0x1087880: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2561,18 +2561,18 @@ L_108724c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087264: 0x1087264: beq   v0, zero, 0x108727c lui   a1, 0x20000
+// 0x01087888: 0x1087888: beq   v0, zero, 0x10878a0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108727c
+	brfalse L_10878a0
 // --- basic block ---
-// 0x0108726c: 0x108726c: lw    v1, 52(sp)
+// 0x01087890: 0x1087890: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2581,52 +2581,52 @@ L_108724c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087270: 0x1087270: sll   zero, zero, 0
-// 0x01087274: 0x1087274: bne   v1, s0, 0x1087294 sll   zero, zero, 0
+// 0x01087894: 0x1087894: sll   zero, zero, 0
+// 0x01087898: 0x1087898: bne   v1, s0, 0x10878b8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1087294
+	bne.un L_10878b8
 // --- basic block ---
-L_108727c:
-// 0x0108727c: 0x108727c: lui   a3, 0x20000
+L_10878a0:
+// 0x010878a0: 0x10878a0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087280: 0x1087280: addiu a1, a1, -21512
+// 0x010878a4: 0x10878a4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087284: 0x1087284: addiu a3, a3, -18072
+// 0x010878a8: 0x10878a8: addiu a3, a3, -17608
 	ldloc 4
-	ldc.i4 -18072
+	ldc.i4 -17608
 	add
 	stloc 4
-// 0x01087288: 0x1087288: addiu a0, zero, 4
+// 0x010878ac: 0x10878ac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108728c: 0x108728c: j	 0x10871f4 addiu a2, zero, 2961
+// 0x010878b0: 0x10878b0: j	 0x1087818 addiu a2, zero, 2961
 	ldc.i4 2961
 	stloc.3
-	br L_10871f4
+	br L_1087818
 // --- basic block ---
-L_1087294:
-// 0x01087294: 0x1087294: addu  a0, v0, zero
+L_10878b8:
+// 0x010878b8: 0x10878b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087298: 0x1087298: addiu a1, s3, 28076
+// 0x010878bc: 0x10878bc: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108729c: 0x108729c: addu  a2, zero, zero
+// 0x010878c0: 0x10878c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010872a0: 0x10872a0: addiu a3, sp, 44
+// 0x010878c4: 0x10878c4: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x010872a4: 0x10872a4: jal   0x106855c sw    s2, 16(sp)
+// 0x010878c8: 0x10878c8: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2640,18 +2640,18 @@ L_1087294:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010872ac: 0x10872ac: beq   v0, zero, 0x10872c8 lui   a1, 0x20000
+// 0x010878d0: 0x10878d0: beq   v0, zero, 0x10878ec lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10872c8
+	brfalse L_10878ec
 // --- basic block ---
-// 0x010872b4: 0x10872b4: lw    v1, 44(sp)
+// 0x010878d8: 0x10878d8: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2660,60 +2660,60 @@ L_1087294:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010872b8: 0x10872b8: sll   zero, zero, 0
-// 0x010872bc: 0x10872bc: bne   v1, s0, 0x10872e0 lui   s4, 0x0
+// 0x010878dc: 0x10878dc: sll   zero, zero, 0
+// 0x010878e0: 0x10878e0: bne   v1, s0, 0x1087904 lui   s4, 0x0
 	ldloc 7
 	ldloc 8
 	ldc.i4.s 0
 	stloc 12
-	bne.un L_10872e0
+	bne.un L_1087904
 // --- basic block ---
-// 0x010872c4: 0x10872c4: lui   a1, 0x20000
+// 0x010878e8: 0x10878e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10872c8:
-// 0x010872c8: 0x10872c8: lui   a3, 0x20000
+L_10878ec:
+// 0x010878ec: 0x10878ec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010872cc: 0x10872cc: addiu a1, a1, -21512
+// 0x010878f0: 0x10878f0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010872d0: 0x10872d0: addiu a3, a3, -18024
+// 0x010878f4: 0x10878f4: addiu a3, a3, -17560
 	ldloc 4
-	ldc.i4 -18024
+	ldc.i4 -17560
 	add
 	stloc 4
-// 0x010872d4: 0x10872d4: addiu a0, zero, 4
+// 0x010878f8: 0x10878f8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010872d8: 0x10872d8: j	 0x10871f4 addiu a2, zero, 2976
+// 0x010878fc: 0x10878fc: j	 0x1087818 addiu a2, zero, 2976
 	ldc.i4 2976
 	stloc.3
-	br L_10871f4
+	br L_1087818
 // --- basic block ---
-L_10872e0:
-// 0x010872e0: 0x10872e0: addiu s0, zero, 1
+L_1087904:
+// 0x01087904: 0x1087904: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010872e4: 0x10872e4: addu  a0, v0, zero
+// 0x01087908: 0x1087908: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010872e8: 0x10872e8: addiu a1, s4, 28076
+// 0x0108790c: 0x108790c: addiu a1, s4, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010872ec: 0x10872ec: addu  a2, zero, zero
+// 0x01087910: 0x1087910: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010872f0: 0x10872f0: addiu a3, sp, 40
+// 0x01087914: 0x1087914: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x010872f4: 0x10872f4: jal   0x106855c sw    s0, 16(sp)
+// 0x01087918: 0x1087918: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2727,18 +2727,18 @@ L_10872e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010872fc: 0x10872fc: beq   v0, zero, 0x1087314 addiu s2, zero, -1
+// 0x01087920: 0x1087920: beq   v0, zero, 0x1087938 addiu s2, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 9
-	brfalse L_1087314
+	brfalse L_1087938
 // --- basic block ---
-// 0x01087304: 0x1087304: lw    v1, 40(sp)
+// 0x01087928: 0x1087928: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2747,62 +2747,62 @@ L_10872e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087308: 0x1087308: sll   zero, zero, 0
-// 0x0108730c: 0x108730c: bne   v1, s2, 0x1087330 addiu s3, sp, 132
+// 0x0108792c: 0x108792c: sll   zero, zero, 0
+// 0x01087930: 0x1087930: bne   v1, s2, 0x1087954 addiu s3, sp, 132
 	ldloc 7
 	ldloc 9
 	ldloc.0
 	ldc.i4 132
 	add
 	stloc 10
-	bne.un L_1087330
+	bne.un L_1087954
 // --- basic block ---
-L_1087314:
-// 0x01087314: 0x1087314: lui   a1, 0x20000
+L_1087938:
+// 0x01087938: 0x1087938: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087318: 0x1087318: lui   a3, 0x20000
+// 0x0108793c: 0x108793c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108731c: 0x108731c: addiu a1, a1, -21512
+// 0x01087940: 0x1087940: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087320: 0x1087320: addiu a3, a3, -17972
+// 0x01087944: 0x1087944: addiu a3, a3, -17508
 	ldloc 4
-	ldc.i4 -17972
+	ldc.i4 -17508
 	add
 	stloc 4
-// 0x01087324: 0x1087324: addiu a0, zero, 4
+// 0x01087948: 0x1087948: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087328: 0x1087328: j	 0x10871f4 addiu a2, zero, 2991
+// 0x0108794c: 0x108794c: j	 0x1087818 addiu a2, zero, 2991
 	ldc.i4 2991
 	stloc.3
-	br L_10871f4
+	br L_1087818
 // --- basic block ---
-L_1087330:
-// 0x01087330: 0x1087330: addu  a0, v0, zero
+L_1087954:
+// 0x01087954: 0x1087954: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087334: 0x1087334: addiu a3, s4, 28076
+// 0x01087958: 0x1087958: addiu a3, s4, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01087338: 0x1087338: addiu v0, zero, 128
+// 0x0108795c: 0x108795c: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x0108733c: 0x108733c: addu  a1, s3, zero
+// 0x01087960: 0x1087960: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x01087340: 0x1087340: addiu a2, sp, 24
+// 0x01087964: 0x1087964: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01087344: 0x1087344: sw    s0, 16(sp)
+// 0x01087968: 0x1087968: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2811,7 +2811,7 @@ L_1087330:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087348: 0x1087348: sw    v0, 24(sp)
+// 0x0108796c: 0x108796c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2820,7 +2820,7 @@ L_1087330:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108734c: 0x108734c: jal   0x1068250 sb    zero, 132(sp)
+// 0x01087970: 0x1087970: jal   0x1068260 sb    zero, 132(sp)
 	ldloc.0
 	ldc.i4 132
 	add
@@ -2831,37 +2831,37 @@ L_1087330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087354: 0x1087354: bne   v0, zero, 0x1087384 addu  s0, v0, zero
+// 0x01087978: 0x1087978: bne   v0, zero, 0x10879a8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1087384
+	brtrue L_10879a8
 // --- basic block ---
-// 0x0108735c: 0x108735c: lui   a1, 0x20000
+// 0x01087980: 0x1087980: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087360: 0x1087360: lui   a3, 0x20000
+// 0x01087984: 0x1087984: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087364: 0x1087364: addiu a1, a1, -21512
+// 0x01087988: 0x1087988: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087368: 0x1087368: addiu a3, a3, -17928
+// 0x0108798c: 0x108798c: addiu a3, a3, -17464
 	ldloc 4
-	ldc.i4 -17928
+	ldc.i4 -17464
 	add
 	stloc 4
-// 0x0108736c: 0x108736c: addiu a0, zero, 4
+// 0x01087990: 0x1087990: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087370: 0x1087370: jal   0x100449c addiu a2, zero, 3008
+// 0x01087994: 0x1087994: jal   0x100449c addiu a2, zero, 3008
 	ldc.i4 3008
 	stloc.3
 	ldloc.0
@@ -2874,39 +2874,39 @@ L_1087330:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087378: 0x1087378: addiu v0, zero, 18
+// 0x0108799c: 0x108799c: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0108737c: 0x108737c: j	 0x10873e8 sw    v0, 0(s1)
+// 0x010879a0: 0x10879a0: j	 0x1087a0c sw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10873e8
+	br L_1087a0c
 // --- basic block ---
-L_1087384:
-// 0x01087384: 0x1087384: lui   a1, 0x0
+L_10879a8:
+// 0x010879a8: 0x10879a8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01087388: 0x1087388: addu  a0, v0, zero
+// 0x010879ac: 0x10879ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108738c: 0x108738c: addiu a1, a1, 30268
+// 0x010879b0: 0x10879b0: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01087390: 0x1087390: addu  a2, zero, zero
+// 0x010879b4: 0x10879b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087394: 0x1087394: addiu a3, sp, 32
+// 0x010879b8: 0x10879b8: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01087398: 0x1087398: sw    s3, 56(sp)
+// 0x010879bc: 0x10879bc: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2915,7 +2915,7 @@ L_1087384:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108739c: 0x108739c: jal   0x106855c sw    s2, 16(sp)
+// 0x010879c0: 0x10879c0: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2929,18 +2929,18 @@ L_1087384:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010873a4: 0x10873a4: beq   v0, zero, 0x10873bc addu  s0, v0, zero
+// 0x010879c8: 0x10879c8: beq   v0, zero, 0x10879e0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_10873bc
+	brfalse L_10879e0
 // --- basic block ---
-// 0x010873ac: 0x10873ac: lw    v0, 32(sp)
+// 0x010879d0: 0x10879d0: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2949,37 +2949,37 @@ L_1087384:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010873b0: 0x10873b0: sll   zero, zero, 0
-// 0x010873b4: 0x10873b4: bne   v0, s2, 0x10873e0 addiu a0, sp, 28
+// 0x010879d4: 0x10879d4: sll   zero, zero, 0
+// 0x010879d8: 0x10879d8: bne   v0, s2, 0x1087a04 addiu a0, sp, 28
 	ldloc 5
 	ldloc 9
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.1
-	bne.un L_10873e0
+	bne.un L_1087a04
 // --- basic block ---
-L_10873bc:
-// 0x010873bc: 0x10873bc: lui   a1, 0x20000
+L_10879e0:
+// 0x010879e0: 0x10879e0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010873c0: 0x10873c0: lui   a3, 0x20000
+// 0x010879e4: 0x10879e4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010873c4: 0x10873c4: addiu a1, a1, -21512
+// 0x010879e8: 0x10879e8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010873c8: 0x10873c8: addiu a3, a3, -17884
+// 0x010879ec: 0x10879ec: addiu a3, a3, -17420
 	ldloc 4
-	ldc.i4 -17884
+	ldc.i4 -17420
 	add
 	stloc 4
-// 0x010873cc: 0x10873cc: addiu a0, zero, 4
+// 0x010879f0: 0x10879f0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010873d0: 0x10873d0: jal   0x100449c addiu a2, zero, 3024
+// 0x010879f4: 0x10879f4: jal   0x100449c addiu a2, zero, 3024
 	ldc.i4 3024
 	stloc.3
 	ldloc.0
@@ -2992,7 +2992,7 @@ L_10873bc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010873d8: 0x10873d8: sw    zero, 32(sp)
+// 0x010879fc: 0x10879fc: sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3001,13 +3001,13 @@ L_10873bc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010873dc: 0x10873dc: addiu a0, sp, 28
+// 0x01087a00: 0x1087a00: addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.1
-L_10873e0:
-// 0x010873e0: 0x10873e0: jal   0x1076b10 sw    zero, 112(sp)
+L_1087a04:
+// 0x01087a04: 0x1087a04: jal   0x1077134 sw    zero, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3021,17 +3021,17 @@ L_10873e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RealtimeBonus_Add_1076b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RealtimeBonus_Add_1077134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10873e8:
-// 0x010873e8: 0x10873e8: lw    ra, 284(sp)
-// 0x010873ec: 0x10873ec: addu  v0, s0, zero
+L_1087a0c:
+// 0x01087a0c: 0x1087a0c: lw    ra, 284(sp)
+// 0x01087a10: 0x1087a10: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010873f0: 0x10873f0: lw    s4, 280(sp)
+// 0x01087a14: 0x1087a14: lw    s4, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3040,7 +3040,7 @@ L_10873e8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010873f4: 0x10873f4: lw    s3, 276(sp)
+// 0x01087a18: 0x1087a18: lw    s3, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3049,7 +3049,7 @@ L_10873e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010873f8: 0x10873f8: lw    s2, 272(sp)
+// 0x01087a1c: 0x1087a1c: lw    s2, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3058,7 +3058,7 @@ L_10873e8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010873fc: 0x10873fc: lw    s1, 268(sp)
+// 0x01087a20: 0x1087a20: lw    s1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3067,7 +3067,7 @@ L_10873e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01087400: 0x1087400: lw    s0, 264(sp)
+// 0x01087a24: 0x1087a24: lw    s0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3076,7 +3076,7 @@ L_10873e8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01087404: 0x1087404: jr    ra addiu sp, sp, 288
+// 0x01087a28: 0x1087a28: jr    ra addiu sp, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
@@ -3088,7 +3088,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 UpdateUserPoints_108740c(int32,int32,int32,int32,int32)
+.method public static int32 UpdateUserPoints_1087a30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -3126,16 +3126,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108740c:
-// 0x0108740c: 0x108740c: addiu sp, sp, -48
+L_1087a30:
+// 0x01087a30: 0x1087a30: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01087410: 0x1087410: lui   a1, 0x0
+// 0x01087a34: 0x1087a34: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01087414: 0x1087414: sw    s0, 40(sp)
+// 0x01087a38: 0x1087a38: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3144,24 +3144,24 @@ L_108740c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087418: 0x1087418: addiu a1, a1, 30268
+// 0x01087a3c: 0x1087a3c: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x0108741c: 0x108741c: addu  s0, a3, zero
+// 0x01087a40: 0x1087a40: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x01087420: 0x1087420: addu  a2, zero, zero
+// 0x01087a44: 0x1087a44: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087424: 0x1087424: addiu a3, sp, 24
+// 0x01087a48: 0x1087a48: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01087428: 0x1087428: sw    ra, 44(sp)
-// 0x0108742c: 0x108742c: jal   0x106855c sw    zero, 16(sp)
+// 0x01087a4c: 0x1087a4c: sw    ra, 44(sp)
+// 0x01087a50: 0x1087a50: jal   0x106856c sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3175,37 +3175,37 @@ L_108740c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087434: 0x1087434: bne   v0, zero, 0x1087464 lui   a1, 0x20000
+// 0x01087a58: 0x1087a58: bne   v0, zero, 0x1087a88 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1087464
+	brtrue L_1087a88
 // --- basic block ---
-// 0x0108743c: 0x108743c: lui   a3, 0x20000
+// 0x01087a60: 0x1087a60: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087440: 0x1087440: addiu a1, a1, -21512
+// 0x01087a64: 0x1087a64: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087444: 0x1087444: addiu a3, a3, -17816
+// 0x01087a68: 0x1087a68: addiu a3, a3, -17352
 	ldloc 4
-	ldc.i4 -17816
+	ldc.i4 -17352
 	add
 	stloc 4
-// 0x01087448: 0x1087448: addiu a0, zero, 4
+// 0x01087a6c: 0x1087a6c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108744c: 0x108744c: addiu a2, zero, 2736
+// 0x01087a70: 0x1087a70: addiu a2, zero, 2736
 	ldc.i4 2736
 	stloc.3
-// 0x01087450: 0x1087450: jal   0x100449c sw    v0, 32(sp)
+// 0x01087a74: 0x1087a74: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3224,20 +3224,20 @@ L_108740c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087458: 0x1087458: addiu v1, zero, 18
+// 0x01087a7c: 0x1087a7c: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x0108745c: 0x108745c: j	 0x1087494 sw    v1, 0(s0)
+// 0x01087a80: 0x1087a80: j	 0x1087ab8 sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1087494
+	br L_1087ab8
 // --- basic block ---
-L_1087464:
-// 0x01087464: 0x1087464: lw    v1, 24(sp)
+L_1087a88:
+// 0x01087a88: 0x1087a88: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3246,26 +3246,26 @@ L_1087464:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087468: 0x1087468: lui   a3, 0x20000
+// 0x01087a8c: 0x1087a8c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108746c: 0x108746c: addiu a0, zero, 3
+// 0x01087a90: 0x1087a90: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01087470: 0x1087470: addiu a1, a1, -21512
+// 0x01087a94: 0x1087a94: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087474: 0x1087474: addiu a3, a3, -17772
+// 0x01087a98: 0x1087a98: addiu a3, a3, -17308
 	ldloc 4
-	ldc.i4 -17772
+	ldc.i4 -17308
 	add
 	stloc 4
-// 0x01087478: 0x1087478: addiu a2, zero, 2743
+// 0x01087a9c: 0x1087a9c: addiu a2, zero, 2743
 	ldc.i4 2743
 	stloc.3
-// 0x0108747c: 0x108747c: sw    v1, 16(sp)
+// 0x01087aa0: 0x1087aa0: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3274,7 +3274,7 @@ L_1087464:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01087480: 0x1087480: jal   0x100449c sw    v0, 32(sp)
+// 0x01087aa4: 0x1087aa4: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3293,7 +3293,7 @@ L_1087464:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087488: 0x1087488: lw    a0, 24(sp)
+// 0x01087aac: 0x1087aac: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3302,20 +3302,20 @@ L_1087464:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108748c: 0x108748c: jal   0x10acad0 sll   zero, zero, 0
+// 0x01087ab0: 0x1087ab0: jal   0x10ad118 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1087494:
-// 0x01087494: 0x1087494: lw    ra, 44(sp)
-// 0x01087498: 0x1087498: lw    v0, 32(sp)
+L_1087ab8:
+// 0x01087ab8: 0x1087ab8: lw    ra, 44(sp)
+// 0x01087abc: 0x1087abc: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3324,7 +3324,7 @@ L_1087494:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108749c: 0x108749c: lw    s0, 40(sp)
+// 0x01087ac0: 0x1087ac0: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3333,7 +3333,7 @@ L_1087494:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010874a0: 0x10874a0: jr    ra addiu sp, sp, 48
+// 0x01087ac4: 0x1087ac4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3345,7 +3345,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 PostAlertCommentRes_10874a8(int32,int32,int32,int32,int32)
+.method public static int32 PostAlertCommentRes_1087acc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 ra)
@@ -3395,13 +3395,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10874a8:
-// 0x010874a8: 0x10874a8: addiu sp, sp, -640
+L_1087acc:
+// 0x01087acc: 0x1087acc: addiu sp, sp, -640
 	ldloc.0
 	ldc.i4 -640
 	add
 	stloc.0
-// 0x010874ac: 0x10874ac: sw    s4, 632(sp)
+// 0x01087ad0: 0x1087ad0: sw    s4, 632(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3410,10 +3410,10 @@ L_10874a8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010874b0: 0x10874b0: lui   s4, 0x0
+// 0x01087ad4: 0x1087ad4: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010874b4: 0x10874b4: sw    s2, 624(sp)
+// 0x01087ad8: 0x1087ad8: sw    s2, 624(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3422,7 +3422,7 @@ L_10874a8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010874b8: 0x10874b8: sw    s0, 616(sp)
+// 0x01087adc: 0x1087adc: sw    s0, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3431,27 +3431,27 @@ L_10874a8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010874bc: 0x10874bc: addu  s2, a3, zero
+// 0x01087ae0: 0x1087ae0: addu  s2, a3, zero
 	ldloc 4
 	stloc 12
-// 0x010874c0: 0x10874c0: addiu s0, zero, 1
+// 0x01087ae4: 0x1087ae4: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010874c4: 0x10874c4: addiu a1, s4, 28076
+// 0x01087ae8: 0x1087ae8: addiu a1, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010874c8: 0x10874c8: addu  a2, zero, zero
+// 0x01087aec: 0x1087aec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010874cc: 0x10874cc: addiu a3, sp, 28
+// 0x01087af0: 0x1087af0: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010874d0: 0x10874d0: sw    ra, 636(sp)
-// 0x010874d4: 0x10874d4: sw    s3, 628(sp)
+// 0x01087af4: 0x1087af4: sw    ra, 636(sp)
+// 0x01087af8: 0x1087af8: sw    s3, 628(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3460,7 +3460,7 @@ L_10874a8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010874d8: 0x10874d8: sw    s1, 620(sp)
+// 0x01087afc: 0x1087afc: sw    s1, 620(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3469,7 +3469,7 @@ L_10874a8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010874dc: 0x10874dc: jal   0x106855c sw    s0, 16(sp)
+// 0x01087b00: 0x1087b00: jal   0x106856c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3483,67 +3483,67 @@ L_10874a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010874e4: 0x10874e4: bne   v0, zero, 0x1087508 addiu s1, sp, 32
+// 0x01087b08: 0x1087b08: bne   v0, zero, 0x1087b2c addiu s1, sp, 32
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-	brtrue L_1087508
+	brtrue L_1087b2c
 // --- basic block ---
-// 0x010874ec: 0x10874ec: lui   a1, 0x20000
+// 0x01087b10: 0x1087b10: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010874f0: 0x10874f0: lui   a3, 0x20000
+// 0x01087b14: 0x1087b14: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010874f4: 0x10874f4: addiu a1, a1, -21512
+// 0x01087b18: 0x1087b18: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010874f8: 0x10874f8: addiu a3, a3, -17720
+// 0x01087b1c: 0x1087b1c: addiu a3, a3, -17256
 	ldloc 4
-	ldc.i4 -17720
+	ldc.i4 -17256
 	add
 	stloc 4
-// 0x010874fc: 0x10874fc: addiu a0, zero, 4
+// 0x01087b20: 0x1087b20: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087500: 0x1087500: j	 0x108759c addiu a2, zero, 2835
+// 0x01087b24: 0x1087b24: j	 0x1087bc0 addiu a2, zero, 2835
 	ldc.i4 2835
 	stloc.3
-	br L_108759c
+	br L_1087bc0
 // --- basic block ---
-L_1087508:
-// 0x01087508: 0x1087508: addiu s3, sp, 24
+L_1087b2c:
+// 0x01087b2c: 0x1087b2c: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x0108750c: 0x108750c: addu  a0, v0, zero
+// 0x01087b30: 0x1087b30: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01087510: 0x1087510: addiu a3, s4, 28076
+// 0x01087b34: 0x1087b34: addiu a3, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01087514: 0x1087514: addiu v0, zero, 64
+// 0x01087b38: 0x1087b38: addiu v0, zero, 64
 	ldc.i4.s 64
 	stloc 6
-// 0x01087518: 0x1087518: addu  a1, s1, zero
+// 0x01087b3c: 0x1087b3c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0108751c: 0x108751c: addu  a2, s3, zero
+// 0x01087b40: 0x1087b40: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01087520: 0x1087520: sw    v0, 24(sp)
+// 0x01087b44: 0x1087b44: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3552,7 +3552,7 @@ L_1087508:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01087524: 0x1087524: sw    s0, 16(sp)
+// 0x01087b48: 0x1087b48: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3561,7 +3561,7 @@ L_1087508:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087528: 0x1087528: jal   0x1068250 sb    zero, 32(sp)
+// 0x01087b4c: 0x1087b4c: jal   0x1068260 sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3572,54 +3572,54 @@ L_1087508:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087530: 0x1087530: bne   v0, zero, 0x1087554 addiu s0, sp, 96
+// 0x01087b54: 0x1087b54: bne   v0, zero, 0x1087b78 addiu s0, sp, 96
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 8
-	brtrue L_1087554
+	brtrue L_1087b78
 // --- basic block ---
-// 0x01087538: 0x1087538: lui   a1, 0x20000
+// 0x01087b5c: 0x1087b5c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108753c: 0x108753c: lui   a3, 0x20000
+// 0x01087b60: 0x1087b60: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087540: 0x1087540: addiu a1, a1, -21512
+// 0x01087b64: 0x1087b64: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087544: 0x1087544: addiu a3, a3, -17652
+// 0x01087b68: 0x1087b68: addiu a3, a3, -17188
 	ldloc 4
-	ldc.i4 -17652
+	ldc.i4 -17188
 	add
 	stloc 4
-// 0x01087548: 0x1087548: addiu a0, zero, 4
+// 0x01087b6c: 0x1087b6c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108754c: 0x108754c: j	 0x108759c addiu a2, zero, 2851
+// 0x01087b70: 0x1087b70: j	 0x1087bc0 addiu a2, zero, 2851
 	ldc.i4 2851
 	stloc.3
-	br L_108759c
+	br L_1087bc0
 // --- basic block ---
-L_1087554:
-// 0x01087554: 0x1087554: addu  a0, v0, zero
+L_1087b78:
+// 0x01087b78: 0x1087b78: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01087558: 0x1087558: lui   a3, 0x0
+// 0x01087b7c: 0x1087b7c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108755c: 0x108755c: addiu v0, zero, 512
+// 0x01087b80: 0x1087b80: addiu v0, zero, 512
 	ldc.i4 512
 	stloc 6
-// 0x01087560: 0x1087560: sw    v0, 24(sp)
+// 0x01087b84: 0x1087b84: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3628,21 +3628,21 @@ L_1087554:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01087564: 0x1087564: addu  a2, s3, zero
+// 0x01087b88: 0x1087b88: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01087568: 0x1087568: addiu v0, zero, -1
+// 0x01087b8c: 0x1087b8c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0108756c: 0x108756c: addiu a3, a3, 30268
+// 0x01087b90: 0x1087b90: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01087570: 0x1087570: addu  a1, s0, zero
+// 0x01087b94: 0x1087b94: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01087574: 0x1087574: sw    v0, 16(sp)
+// 0x01087b98: 0x1087b98: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3651,7 +3651,7 @@ L_1087554:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01087578: 0x1087578: jal   0x1068250 sb    zero, 96(sp)
+// 0x01087b9c: 0x1087b9c: jal   0x1068260 sb    zero, 96(sp)
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -3662,38 +3662,38 @@ L_1087554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087580: 0x1087580: bne   v0, zero, 0x10875b0 lui   a1, 0x20000
+// 0x01087ba4: 0x1087ba4: bne   v0, zero, 0x1087bd4 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10875b0
+	brtrue L_1087bd4
 // --- basic block ---
-// 0x01087588: 0x1087588: lui   a3, 0x20000
+// 0x01087bac: 0x1087bac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108758c: 0x108758c: addiu a1, a1, -21512
+// 0x01087bb0: 0x1087bb0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087590: 0x1087590: addiu a3, a3, -17584
+// 0x01087bb4: 0x1087bb4: addiu a3, a3, -17120
 	ldloc 4
-	ldc.i4 -17584
+	ldc.i4 -17120
 	add
 	stloc 4
-// 0x01087594: 0x1087594: addiu a0, zero, 4
+// 0x01087bb8: 0x1087bb8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087598: 0x1087598: addiu a2, zero, 2867
+// 0x01087bbc: 0x1087bbc: addiu a2, zero, 2867
 	ldc.i4 2867
 	stloc.3
-L_108759c:
-// 0x0108759c: 0x108759c: jal   0x100449c sw    v0, 608(sp)
+L_1087bc0:
+// 0x01087bc0: 0x1087bc0: jal   0x100449c sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3712,31 +3712,31 @@ L_108759c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010875a4: 0x10875a4: addiu v1, zero, 18
+// 0x01087bc8: 0x1087bc8: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x010875a8: 0x10875a8: j	 0x1087620 sw    v1, 0(s2)
+// 0x01087bcc: 0x1087bcc: j	 0x1087c44 sw    v1, 0(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1087620
+	br L_1087c44
 // --- basic block ---
-L_10875b0:
-// 0x010875b0: 0x10875b0: lb    v1, 96(sp)
+L_1087bd4:
+// 0x01087bd4: 0x1087bd4: lb    v1, 96(sp)
 	ldloc.0
 	ldc.i4.s 96
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010875b4: 0x10875b4: sll   zero, zero, 0
-// 0x010875b8: 0x10875b8: beq   v1, zero, 0x10875f8 sll   zero, zero, 0
+// 0x01087bd8: 0x1087bd8: sll   zero, zero, 0
+// 0x01087bdc: 0x1087bdc: beq   v1, zero, 0x1087c1c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10875f8
+	brfalse L_1087c1c
 // --- basic block ---
-// 0x010875c0: 0x10875c0: lw    v1, 28(sp)
+// 0x01087be4: 0x1087be4: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3745,21 +3745,21 @@ L_10875b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010875c4: 0x10875c4: sll   zero, zero, 0
-// 0x010875c8: 0x10875c8: blez  v1, 0x10875e8 addu  a0, s1, zero
+// 0x01087be8: 0x1087be8: sll   zero, zero, 0
+// 0x01087bec: 0x1087bec: blez  v1, 0x1087c0c addu  a0, s1, zero
 	ldloc 7
 	ldloc 9
 	stloc.1
 	ldc.i4.s 0
-	ble L_10875e8
+	ble L_1087c0c
 // --- basic block ---
-// 0x010875d0: 0x10875d0: addu  a1, s0, zero
+// 0x01087bf4: 0x1087bf4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010875d4: 0x10875d4: addiu a2, zero, 5
+// 0x01087bf8: 0x1087bf8: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x010875d8: 0x10875d8: jal   0x104bfe4 sw    v0, 608(sp)
+// 0x01087bfc: 0x1087bfc: jal   0x104bff4 sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3773,19 +3773,19 @@ L_10875b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010875e0: 0x10875e0: j	 0x10875f4 sll   zero, zero, 0
-	br L_10875f4
+// 0x01087c04: 0x1087c04: j	 0x1087c18 sll   zero, zero, 0
+	br L_1087c18
 // --- basic block ---
-L_10875e8:
-// 0x010875e8: 0x10875e8: addu  a1, s0, zero
+L_1087c0c:
+// 0x01087c0c: 0x1087c0c: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010875ec: 0x10875ec: jal   0x104c148 sw    v0, 608(sp)
+// 0x01087c10: 0x1087c10: jal   0x104c158 sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3799,13 +3799,13 @@ L_10875e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10875f4:
-// 0x010875f4: 0x10875f4: lw    v0, 608(sp)
+L_1087c18:
+// 0x01087c18: 0x1087c18: lw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3814,8 +3814,8 @@ L_10875f4:
 	add
 	ldelem.i4
 	stloc 6
-L_10875f8:
-// 0x010875f8: 0x10875f8: lw    a0, 28(sp)
+L_1087c1c:
+// 0x01087c1c: 0x1087c1c: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3824,13 +3824,13 @@ L_10875f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010875fc: 0x10875fc: sll   zero, zero, 0
-// 0x01087600: 0x1087600: blez  a0, 0x1087624 sll   zero, zero, 0
+// 0x01087c20: 0x1087c20: sll   zero, zero, 0
+// 0x01087c24: 0x1087c24: blez  a0, 0x1087c48 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	ble L_1087624
+	ble L_1087c48
 // --- basic block ---
-// 0x01087608: 0x1087608: jal   0x10acad0 sw    v0, 608(sp)
+// 0x01087c2c: 0x1087c2c: jal   0x10ad118 sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3844,12 +3844,12 @@ L_10875f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087610: 0x1087610: lw    a0, 28(sp)
+// 0x01087c34: 0x1087c34: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3858,10 +3858,10 @@ L_10875f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087614: 0x1087614: addiu a1, zero, 5
+// 0x01087c38: 0x1087c38: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01087618: 0x1087618: jal   0x10ac874 addiu a2, zero, 4
+// 0x01087c3c: 0x1087c3c: jal   0x10acebc addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -3869,13 +3869,13 @@ L_10875f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_display_new_points_timed_10ac874(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_display_new_points_timed_10acebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1087620:
-// 0x01087620: 0x1087620: lw    v0, 608(sp)
+L_1087c44:
+// 0x01087c44: 0x1087c44: lw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3884,9 +3884,9 @@ L_1087620:
 	add
 	ldelem.i4
 	stloc 6
-L_1087624:
-// 0x01087624: 0x1087624: lw    ra, 636(sp)
-// 0x01087628: 0x1087628: lw    s4, 632(sp)
+L_1087c48:
+// 0x01087c48: 0x1087c48: lw    ra, 636(sp)
+// 0x01087c4c: 0x1087c4c: lw    s4, 632(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3895,7 +3895,7 @@ L_1087624:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108762c: 0x108762c: lw    s3, 628(sp)
+// 0x01087c50: 0x1087c50: lw    s3, 628(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3904,7 +3904,7 @@ L_1087624:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01087630: 0x1087630: lw    s2, 624(sp)
+// 0x01087c54: 0x1087c54: lw    s2, 624(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3913,7 +3913,7 @@ L_1087624:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01087634: 0x1087634: lw    s1, 620(sp)
+// 0x01087c58: 0x1087c58: lw    s1, 620(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3922,7 +3922,7 @@ L_1087624:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01087638: 0x1087638: lw    s0, 616(sp)
+// 0x01087c5c: 0x1087c5c: lw    s0, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3931,7 +3931,7 @@ L_1087624:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108763c: 0x108763c: jr    ra addiu sp, sp, 640
+// 0x01087c60: 0x1087c60: jr    ra addiu sp, sp, 640
 	ldloc.0
 	ldc.i4 640
 	add
@@ -3943,7 +3943,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ReportAlertRes_1087644(int32,int32,int32,int32,int32)
+.method public static int32 ReportAlertRes_1087c68(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 ra)
@@ -3993,13 +3993,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1087644:
-// 0x01087644: 0x1087644: addiu sp, sp, -640
+L_1087c68:
+// 0x01087c68: 0x1087c68: addiu sp, sp, -640
 	ldloc.0
 	ldc.i4 -640
 	add
 	stloc.0
-// 0x01087648: 0x1087648: sw    s4, 632(sp)
+// 0x01087c6c: 0x1087c6c: sw    s4, 632(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4008,10 +4008,10 @@ L_1087644:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108764c: 0x108764c: lui   s4, 0x0
+// 0x01087c70: 0x1087c70: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01087650: 0x1087650: sw    s2, 624(sp)
+// 0x01087c74: 0x1087c74: sw    s2, 624(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4020,7 +4020,7 @@ L_1087644:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01087654: 0x1087654: sw    s0, 616(sp)
+// 0x01087c78: 0x1087c78: sw    s0, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4029,27 +4029,27 @@ L_1087644:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087658: 0x1087658: addu  s2, a3, zero
+// 0x01087c7c: 0x1087c7c: addu  s2, a3, zero
 	ldloc 4
 	stloc 12
-// 0x0108765c: 0x108765c: addiu s0, zero, 1
+// 0x01087c80: 0x1087c80: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01087660: 0x1087660: addiu a1, s4, 28076
+// 0x01087c84: 0x1087c84: addiu a1, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087664: 0x1087664: addu  a2, zero, zero
+// 0x01087c88: 0x1087c88: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087668: 0x1087668: addiu a3, sp, 28
+// 0x01087c8c: 0x1087c8c: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0108766c: 0x108766c: sw    ra, 636(sp)
-// 0x01087670: 0x1087670: sw    s3, 628(sp)
+// 0x01087c90: 0x1087c90: sw    ra, 636(sp)
+// 0x01087c94: 0x1087c94: sw    s3, 628(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4058,7 +4058,7 @@ L_1087644:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01087674: 0x1087674: sw    s1, 620(sp)
+// 0x01087c98: 0x1087c98: sw    s1, 620(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4067,7 +4067,7 @@ L_1087644:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01087678: 0x1087678: jal   0x106855c sw    s0, 16(sp)
+// 0x01087c9c: 0x1087c9c: jal   0x106856c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4081,67 +4081,67 @@ L_1087644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087680: 0x1087680: bne   v0, zero, 0x10876a4 addiu s1, sp, 32
+// 0x01087ca4: 0x1087ca4: bne   v0, zero, 0x1087cc8 addiu s1, sp, 32
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-	brtrue L_10876a4
+	brtrue L_1087cc8
 // --- basic block ---
-// 0x01087688: 0x1087688: lui   a1, 0x20000
+// 0x01087cac: 0x1087cac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108768c: 0x108768c: lui   a3, 0x20000
+// 0x01087cb0: 0x1087cb0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087690: 0x1087690: addiu a1, a1, -21512
+// 0x01087cb4: 0x1087cb4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087694: 0x1087694: addiu a3, a3, -17720
+// 0x01087cb8: 0x1087cb8: addiu a3, a3, -17256
 	ldloc 4
-	ldc.i4 -17720
+	ldc.i4 -17256
 	add
 	stloc 4
-// 0x01087698: 0x1087698: addiu a0, zero, 4
+// 0x01087cbc: 0x1087cbc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108769c: 0x108769c: j	 0x1087738 addiu a2, zero, 2766
+// 0x01087cc0: 0x1087cc0: j	 0x1087d5c addiu a2, zero, 2766
 	ldc.i4 2766
 	stloc.3
-	br L_1087738
+	br L_1087d5c
 // --- basic block ---
-L_10876a4:
-// 0x010876a4: 0x10876a4: addiu s3, sp, 24
+L_1087cc8:
+// 0x01087cc8: 0x1087cc8: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x010876a8: 0x10876a8: addu  a0, v0, zero
+// 0x01087ccc: 0x1087ccc: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010876ac: 0x10876ac: addiu a3, s4, 28076
+// 0x01087cd0: 0x1087cd0: addiu a3, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010876b0: 0x10876b0: addiu v0, zero, 64
+// 0x01087cd4: 0x1087cd4: addiu v0, zero, 64
 	ldc.i4.s 64
 	stloc 6
-// 0x010876b4: 0x10876b4: addu  a1, s1, zero
+// 0x01087cd8: 0x1087cd8: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010876b8: 0x10876b8: addu  a2, s3, zero
+// 0x01087cdc: 0x1087cdc: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x010876bc: 0x10876bc: sw    v0, 24(sp)
+// 0x01087ce0: 0x1087ce0: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4150,7 +4150,7 @@ L_10876a4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010876c0: 0x10876c0: sw    s0, 16(sp)
+// 0x01087ce4: 0x1087ce4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4159,7 +4159,7 @@ L_10876a4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010876c4: 0x10876c4: jal   0x1068250 sb    zero, 32(sp)
+// 0x01087ce8: 0x1087ce8: jal   0x1068260 sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4170,54 +4170,54 @@ L_10876a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010876cc: 0x10876cc: bne   v0, zero, 0x10876f0 addiu s0, sp, 96
+// 0x01087cf0: 0x1087cf0: bne   v0, zero, 0x1087d14 addiu s0, sp, 96
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 8
-	brtrue L_10876f0
+	brtrue L_1087d14
 // --- basic block ---
-// 0x010876d4: 0x10876d4: lui   a1, 0x20000
+// 0x01087cf8: 0x1087cf8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010876d8: 0x10876d8: lui   a3, 0x20000
+// 0x01087cfc: 0x1087cfc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010876dc: 0x10876dc: addiu a1, a1, -21512
+// 0x01087d00: 0x1087d00: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010876e0: 0x10876e0: addiu a3, a3, -17652
+// 0x01087d04: 0x1087d04: addiu a3, a3, -17188
 	ldloc 4
-	ldc.i4 -17652
+	ldc.i4 -17188
 	add
 	stloc 4
-// 0x010876e4: 0x10876e4: addiu a0, zero, 4
+// 0x01087d08: 0x1087d08: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010876e8: 0x10876e8: j	 0x1087738 addiu a2, zero, 2782
+// 0x01087d0c: 0x1087d0c: j	 0x1087d5c addiu a2, zero, 2782
 	ldc.i4 2782
 	stloc.3
-	br L_1087738
+	br L_1087d5c
 // --- basic block ---
-L_10876f0:
-// 0x010876f0: 0x10876f0: addu  a0, v0, zero
+L_1087d14:
+// 0x01087d14: 0x1087d14: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010876f4: 0x10876f4: lui   a3, 0x0
+// 0x01087d18: 0x1087d18: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010876f8: 0x10876f8: addiu v0, zero, 512
+// 0x01087d1c: 0x1087d1c: addiu v0, zero, 512
 	ldc.i4 512
 	stloc 6
-// 0x010876fc: 0x10876fc: sw    v0, 24(sp)
+// 0x01087d20: 0x1087d20: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4226,21 +4226,21 @@ L_10876f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01087700: 0x1087700: addu  a2, s3, zero
+// 0x01087d24: 0x1087d24: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01087704: 0x1087704: addiu v0, zero, -1
+// 0x01087d28: 0x1087d28: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01087708: 0x1087708: addiu a3, a3, 30268
+// 0x01087d2c: 0x1087d2c: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x0108770c: 0x108770c: addu  a1, s0, zero
+// 0x01087d30: 0x1087d30: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01087710: 0x1087710: sw    v0, 16(sp)
+// 0x01087d34: 0x1087d34: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4249,7 +4249,7 @@ L_10876f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01087714: 0x1087714: jal   0x1068250 sb    zero, 96(sp)
+// 0x01087d38: 0x1087d38: jal   0x1068260 sb    zero, 96(sp)
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -4260,38 +4260,38 @@ L_10876f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108771c: 0x108771c: bne   v0, zero, 0x108774c lui   a1, 0x20000
+// 0x01087d40: 0x1087d40: bne   v0, zero, 0x1087d70 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108774c
+	brtrue L_1087d70
 // --- basic block ---
-// 0x01087724: 0x1087724: lui   a3, 0x20000
+// 0x01087d48: 0x1087d48: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087728: 0x1087728: addiu a1, a1, -21512
+// 0x01087d4c: 0x1087d4c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108772c: 0x108772c: addiu a3, a3, -17584
+// 0x01087d50: 0x1087d50: addiu a3, a3, -17120
 	ldloc 4
-	ldc.i4 -17584
+	ldc.i4 -17120
 	add
 	stloc 4
-// 0x01087730: 0x1087730: addiu a0, zero, 4
+// 0x01087d54: 0x1087d54: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087734: 0x1087734: addiu a2, zero, 2798
+// 0x01087d58: 0x1087d58: addiu a2, zero, 2798
 	ldc.i4 2798
 	stloc.3
-L_1087738:
-// 0x01087738: 0x1087738: jal   0x100449c sw    v0, 608(sp)
+L_1087d5c:
+// 0x01087d5c: 0x1087d5c: jal   0x100449c sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4310,31 +4310,31 @@ L_1087738:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087740: 0x1087740: addiu v1, zero, 18
+// 0x01087d64: 0x1087d64: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x01087744: 0x1087744: j	 0x10877bc sw    v1, 0(s2)
+// 0x01087d68: 0x1087d68: j	 0x1087de0 sw    v1, 0(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_10877bc
+	br L_1087de0
 // --- basic block ---
-L_108774c:
-// 0x0108774c: 0x108774c: lb    v1, 96(sp)
+L_1087d70:
+// 0x01087d70: 0x1087d70: lb    v1, 96(sp)
 	ldloc.0
 	ldc.i4.s 96
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01087750: 0x1087750: sll   zero, zero, 0
-// 0x01087754: 0x1087754: beq   v1, zero, 0x1087794 sll   zero, zero, 0
+// 0x01087d74: 0x1087d74: sll   zero, zero, 0
+// 0x01087d78: 0x1087d78: beq   v1, zero, 0x1087db8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1087794
+	brfalse L_1087db8
 // --- basic block ---
-// 0x0108775c: 0x108775c: lw    v1, 28(sp)
+// 0x01087d80: 0x1087d80: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4343,21 +4343,21 @@ L_108774c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087760: 0x1087760: sll   zero, zero, 0
-// 0x01087764: 0x1087764: blez  v1, 0x1087784 addu  a0, s1, zero
+// 0x01087d84: 0x1087d84: sll   zero, zero, 0
+// 0x01087d88: 0x1087d88: blez  v1, 0x1087da8 addu  a0, s1, zero
 	ldloc 7
 	ldloc 9
 	stloc.1
 	ldc.i4.s 0
-	ble L_1087784
+	ble L_1087da8
 // --- basic block ---
-// 0x0108776c: 0x108776c: addu  a1, s0, zero
+// 0x01087d90: 0x1087d90: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01087770: 0x1087770: addiu a2, zero, 5
+// 0x01087d94: 0x1087d94: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x01087774: 0x1087774: jal   0x104bfe4 sw    v0, 608(sp)
+// 0x01087d98: 0x1087d98: jal   0x104bff4 sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4371,19 +4371,19 @@ L_108774c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108777c: 0x108777c: j	 0x1087790 sll   zero, zero, 0
-	br L_1087790
+// 0x01087da0: 0x1087da0: j	 0x1087db4 sll   zero, zero, 0
+	br L_1087db4
 // --- basic block ---
-L_1087784:
-// 0x01087784: 0x1087784: addu  a1, s0, zero
+L_1087da8:
+// 0x01087da8: 0x1087da8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01087788: 0x1087788: jal   0x104c148 sw    v0, 608(sp)
+// 0x01087dac: 0x1087dac: jal   0x104c158 sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4397,13 +4397,13 @@ L_1087784:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1087790:
-// 0x01087790: 0x1087790: lw    v0, 608(sp)
+L_1087db4:
+// 0x01087db4: 0x1087db4: lw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4412,8 +4412,8 @@ L_1087790:
 	add
 	ldelem.i4
 	stloc 6
-L_1087794:
-// 0x01087794: 0x1087794: lw    a0, 28(sp)
+L_1087db8:
+// 0x01087db8: 0x1087db8: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4422,13 +4422,13 @@ L_1087794:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087798: 0x1087798: sll   zero, zero, 0
-// 0x0108779c: 0x108779c: blez  a0, 0x10877c0 sll   zero, zero, 0
+// 0x01087dbc: 0x1087dbc: sll   zero, zero, 0
+// 0x01087dc0: 0x1087dc0: blez  a0, 0x1087de4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	ble L_10877c0
+	ble L_1087de4
 // --- basic block ---
-// 0x010877a4: 0x10877a4: jal   0x10acad0 sw    v0, 608(sp)
+// 0x01087dc8: 0x1087dc8: jal   0x10ad118 sw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4442,12 +4442,12 @@ L_1087794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010877ac: 0x10877ac: lw    a0, 28(sp)
+// 0x01087dd0: 0x1087dd0: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4456,10 +4456,10 @@ L_1087794:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010877b0: 0x10877b0: addiu a1, zero, 5
+// 0x01087dd4: 0x1087dd4: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x010877b4: 0x10877b4: jal   0x10ac874 addiu a2, zero, 1
+// 0x01087dd8: 0x1087dd8: jal   0x10acebc addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -4467,13 +4467,13 @@ L_1087794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_display_new_points_timed_10ac874(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_display_new_points_timed_10acebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10877bc:
-// 0x010877bc: 0x10877bc: lw    v0, 608(sp)
+L_1087de0:
+// 0x01087de0: 0x1087de0: lw    v0, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4482,9 +4482,9 @@ L_10877bc:
 	add
 	ldelem.i4
 	stloc 6
-L_10877c0:
-// 0x010877c0: 0x10877c0: lw    ra, 636(sp)
-// 0x010877c4: 0x10877c4: lw    s4, 632(sp)
+L_1087de4:
+// 0x01087de4: 0x1087de4: lw    ra, 636(sp)
+// 0x01087de8: 0x1087de8: lw    s4, 632(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4493,7 +4493,7 @@ L_10877c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010877c8: 0x10877c8: lw    s3, 628(sp)
+// 0x01087dec: 0x1087dec: lw    s3, 628(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4502,7 +4502,7 @@ L_10877c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010877cc: 0x10877cc: lw    s2, 624(sp)
+// 0x01087df0: 0x1087df0: lw    s2, 624(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4511,7 +4511,7 @@ L_10877c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010877d0: 0x10877d0: lw    s1, 620(sp)
+// 0x01087df4: 0x1087df4: lw    s1, 620(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4520,7 +4520,7 @@ L_10877c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010877d4: 0x10877d4: lw    s0, 616(sp)
+// 0x01087df8: 0x1087df8: lw    s0, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4529,7 +4529,7 @@ L_10877c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010877d8: 0x10877d8: jr    ra addiu sp, sp, 640
+// 0x01087dfc: 0x1087dfc: jr    ra addiu sp, sp, 640
 	ldloc.0
 	ldc.i4 640
 	add
@@ -4541,7 +4541,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 GeoLocation_10877e0(int32,int32,int32,int32,int32)
+.method public static int32 GeoLocation_1087e04(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 s0,int32 ra)
@@ -4594,13 +4594,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10877e0:
-// 0x010877e0: 0x10877e0: addiu sp, sp, -200
+L_1087e04:
+// 0x01087e04: 0x1087e04: addiu sp, sp, -200
 	ldloc.0
 	ldc.i4 -200
 	add
 	stloc.0
-// 0x010877e4: 0x10877e4: sw    s5, 192(sp)
+// 0x01087e08: 0x1087e08: sw    s5, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4609,7 +4609,7 @@ L_10877e0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010877e8: 0x10877e8: sw    s3, 184(sp)
+// 0x01087e0c: 0x1087e0c: sw    s3, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4618,7 +4618,7 @@ L_10877e0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010877ec: 0x10877ec: sw    s2, 180(sp)
+// 0x01087e10: 0x1087e10: sw    s2, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4627,20 +4627,20 @@ L_10877e0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010877f0: 0x10877f0: addiu s3, sp, 32
+// 0x01087e14: 0x1087e14: addiu s3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-// 0x010877f4: 0x10877f4: addiu s5, sp, 28
+// 0x01087e18: 0x1087e18: addiu s5, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 12
-// 0x010877f8: 0x10877f8: lui   s2, 0x0
+// 0x01087e1c: 0x1087e1c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010877fc: 0x10877fc: sw    s4, 188(sp)
+// 0x01087e20: 0x1087e20: sw    s4, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4649,7 +4649,7 @@ L_10877e0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01087800: 0x1087800: sw    s1, 176(sp)
+// 0x01087e24: 0x1087e24: sw    s1, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4658,7 +4658,7 @@ L_10877e0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087804: 0x1087804: sw    s0, 172(sp)
+// 0x01087e28: 0x1087e28: sw    s0, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4667,28 +4667,28 @@ L_10877e0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01087808: 0x1087808: addiu s4, zero, 128
+// 0x01087e2c: 0x1087e2c: addiu s4, zero, 128
 	ldc.i4 128
 	stloc 11
-// 0x0108780c: 0x108780c: addu  s0, a3, zero
+// 0x01087e30: 0x1087e30: addu  s0, a3, zero
 	ldloc 4
 	stloc 13
-// 0x01087810: 0x1087810: addiu s1, zero, 1
+// 0x01087e34: 0x1087e34: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01087814: 0x1087814: addu  a1, s3, zero
+// 0x01087e38: 0x1087e38: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x01087818: 0x1087818: addu  a2, s5, zero
+// 0x01087e3c: 0x1087e3c: addu  a2, s5, zero
 	ldloc 12
 	stloc.3
-// 0x0108781c: 0x108781c: addiu a3, s2, 28076
+// 0x01087e40: 0x1087e40: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01087820: 0x1087820: sw    ra, 196(sp)
-// 0x01087824: 0x1087824: sw    s4, 28(sp)
+// 0x01087e44: 0x1087e44: sw    ra, 196(sp)
+// 0x01087e48: 0x1087e48: sw    s4, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4697,7 +4697,7 @@ L_10877e0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01087828: 0x1087828: jal   0x1068250 sw    s1, 16(sp)
+// 0x01087e4c: 0x1087e4c: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4711,53 +4711,53 @@ L_10877e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087830: 0x1087830: beq   v0, zero, 0x1087848 lui   a1, 0x20000
+// 0x01087e54: 0x1087e54: beq   v0, zero, 0x1087e6c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1087848
+	brfalse L_1087e6c
 // --- basic block ---
-// 0x01087838: 0x1087838: lb    v1, 0(v0)
+// 0x01087e5c: 0x1087e5c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108783c: 0x108783c: sll   zero, zero, 0
-// 0x01087840: 0x1087840: bne   v1, zero, 0x1087860 sll   zero, zero, 0
+// 0x01087e60: 0x1087e60: sll   zero, zero, 0
+// 0x01087e64: 0x1087e64: bne   v1, zero, 0x1087e84 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1087860
+	brtrue L_1087e84
 // --- basic block ---
-L_1087848:
-// 0x01087848: 0x1087848: lui   a3, 0x20000
+L_1087e6c:
+// 0x01087e6c: 0x1087e6c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108784c: 0x108784c: addiu a1, a1, -21512
+// 0x01087e70: 0x1087e70: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087850: 0x1087850: addiu a3, a3, -17520
+// 0x01087e74: 0x1087e74: addiu a3, a3, -17056
 	ldloc 4
-	ldc.i4 -17520
+	ldc.i4 -17056
 	add
 	stloc 4
-// 0x01087854: 0x1087854: addiu a0, zero, 4
+// 0x01087e78: 0x1087e78: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087858: 0x1087858: j	 0x10878bc addiu a2, zero, 2573
+// 0x01087e7c: 0x1087e7c: j	 0x1087ee0 addiu a2, zero, 2573
 	ldc.i4 2573
 	stloc.3
-	br L_10878bc
+	br L_1087ee0
 // --- basic block ---
-L_1087860:
-// 0x01087860: 0x1087860: addu  a0, s3, zero
+L_1087e84:
+// 0x01087e84: 0x1087e84: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01087864: 0x1087864: jal   0x10a474c sw    v0, 160(sp)
+// 0x01087e88: 0x1087e88: jal   0x10a4d94 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4771,12 +4771,12 @@ L_1087860:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_metropolitan_10a474c(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_metropolitan_10a4d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108786c: 0x108786c: lw    v0, 160(sp)
+// 0x01087e90: 0x1087e90: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4785,21 +4785,21 @@ L_1087860:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087870: 0x1087870: addu  a2, s5, zero
+// 0x01087e94: 0x1087e94: addu  a2, s5, zero
 	ldloc 12
 	stloc.3
-// 0x01087874: 0x1087874: addu  a0, v0, zero
+// 0x01087e98: 0x1087e98: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087878: 0x1087878: addu  a1, s3, zero
+// 0x01087e9c: 0x1087e9c: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0108787c: 0x108787c: addiu a3, s2, 28076
+// 0x01087ea0: 0x1087ea0: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01087880: 0x1087880: sw    s4, 28(sp)
+// 0x01087ea4: 0x1087ea4: sw    s4, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4808,7 +4808,7 @@ L_1087860:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01087884: 0x1087884: jal   0x1068250 sw    s1, 16(sp)
+// 0x01087ea8: 0x1087ea8: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4822,53 +4822,53 @@ L_1087860:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108788c: 0x108788c: beq   v0, zero, 0x10878a8 lui   a1, 0x20000
+// 0x01087eb0: 0x1087eb0: beq   v0, zero, 0x1087ecc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10878a8
+	brfalse L_1087ecc
 // --- basic block ---
-// 0x01087894: 0x1087894: lb    v1, 0(v0)
+// 0x01087eb8: 0x1087eb8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01087898: 0x1087898: sll   zero, zero, 0
-// 0x0108789c: 0x108789c: bne   v1, zero, 0x10878d4 addu  a0, s3, zero
+// 0x01087ebc: 0x1087ebc: sll   zero, zero, 0
+// 0x01087ec0: 0x1087ec0: bne   v1, zero, 0x1087ef8 addu  a0, s3, zero
 	ldloc 7
 	ldloc 9
 	stloc.1
-	brtrue L_10878d4
+	brtrue L_1087ef8
 // --- basic block ---
-// 0x010878a4: 0x10878a4: lui   a1, 0x20000
+// 0x01087ec8: 0x1087ec8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10878a8:
-// 0x010878a8: 0x10878a8: lui   a3, 0x20000
+L_1087ecc:
+// 0x01087ecc: 0x1087ecc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010878ac: 0x10878ac: addiu a1, a1, -21512
+// 0x01087ed0: 0x1087ed0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010878b0: 0x10878b0: addiu a3, a3, -17472
+// 0x01087ed4: 0x1087ed4: addiu a3, a3, -17008
 	ldloc 4
-	ldc.i4 -17472
+	ldc.i4 -17008
 	add
 	stloc 4
-// 0x010878b4: 0x10878b4: addiu a0, zero, 4
+// 0x01087ed8: 0x1087ed8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010878b8: 0x10878b8: addiu a2, zero, 2590
+// 0x01087edc: 0x1087edc: addiu a2, zero, 2590
 	ldc.i4 2590
 	stloc.3
-L_10878bc:
-// 0x010878bc: 0x10878bc: jal   0x100449c sll   zero, zero, 0
+L_1087ee0:
+// 0x01087ee0: 0x1087ee0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4879,23 +4879,23 @@ L_10878bc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010878c4: 0x10878c4: addiu v0, zero, 18
+// 0x01087ee8: 0x1087ee8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x010878c8: 0x10878c8: sw    v0, 0(s0)
+// 0x01087eec: 0x1087eec: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010878cc: 0x10878cc: j	 0x1087b7c addu  v0, zero, zero
+// 0x01087ef0: 0x1087ef0: j	 0x10881a0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1087b7c
+	br L_10881a0
 // --- basic block ---
-L_10878d4:
-// 0x010878d4: 0x10878d4: jal   0x10a4720 sw    v0, 160(sp)
+L_1087ef8:
+// 0x01087ef8: 0x1087ef8: jal   0x10a4d68 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4909,12 +4909,12 @@ L_10878d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_state_10a4720(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_state_10a4d68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010878dc: 0x10878dc: lw    v0, 160(sp)
+// 0x01087f00: 0x1087f00: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4923,26 +4923,26 @@ L_10878d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010878e0: 0x10878e0: addiu s3, sp, 24
+// 0x01087f04: 0x1087f04: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x010878e4: 0x10878e4: addu  a0, v0, zero
+// 0x01087f08: 0x1087f08: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010878e8: 0x10878e8: addiu a1, s2, 28076
+// 0x01087f0c: 0x1087f0c: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010878ec: 0x10878ec: addu  a2, zero, zero
+// 0x01087f10: 0x1087f10: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010878f0: 0x10878f0: addu  a3, s3, zero
+// 0x01087f14: 0x1087f14: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x010878f4: 0x10878f4: jal   0x106855c sw    s1, 16(sp)
+// 0x01087f18: 0x1087f18: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4956,50 +4956,50 @@ L_10878d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010878fc: 0x10878fc: beq   v0, zero, 0x1087914 lui   a1, 0x20000
+// 0x01087f20: 0x1087f20: beq   v0, zero, 0x1087f38 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1087914
+	brfalse L_1087f38
 // --- basic block ---
-// 0x01087904: 0x1087904: lb    v1, 0(v0)
+// 0x01087f28: 0x1087f28: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01087908: 0x1087908: sll   zero, zero, 0
-// 0x0108790c: 0x108790c: bne   v1, zero, 0x108792c sll   zero, zero, 0
+// 0x01087f2c: 0x1087f2c: sll   zero, zero, 0
+// 0x01087f30: 0x1087f30: bne   v1, zero, 0x1087f50 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108792c
+	brtrue L_1087f50
 // --- basic block ---
-L_1087914:
-// 0x01087914: 0x1087914: lui   a3, 0x20000
+L_1087f38:
+// 0x01087f38: 0x1087f38: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087918: 0x1087918: addiu a1, a1, -21512
+// 0x01087f3c: 0x1087f3c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108791c: 0x108791c: addiu a3, a3, -17428
+// 0x01087f40: 0x1087f40: addiu a3, a3, -16964
 	ldloc 4
-	ldc.i4 -17428
+	ldc.i4 -16964
 	add
 	stloc 4
-// 0x01087920: 0x1087920: addiu a0, zero, 4
+// 0x01087f44: 0x1087f44: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087924: 0x1087924: j	 0x10878bc addiu a2, zero, 2605
+// 0x01087f48: 0x1087f48: j	 0x1087ee0 addiu a2, zero, 2605
 	ldc.i4 2605
 	stloc.3
-	br L_10878bc
+	br L_1087ee0
 // --- basic block ---
-L_108792c:
-// 0x0108792c: 0x108792c: lw    a0, 24(sp)
+L_1087f50:
+// 0x01087f50: 0x1087f50: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5008,7 +5008,7 @@ L_108792c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087930: 0x1087930: jal   0x10a46f0 sw    v0, 160(sp)
+// 0x01087f54: 0x1087f54: jal   0x10a4d38 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5022,12 +5022,12 @@ L_108792c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_map_score_10a46f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_map_score_10a4d38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087938: 0x1087938: lw    v0, 160(sp)
+// 0x01087f5c: 0x1087f5c: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5036,21 +5036,21 @@ L_108792c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108793c: 0x108793c: addiu a1, s2, 28076
+// 0x01087f60: 0x1087f60: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087940: 0x1087940: addu  a0, v0, zero
+// 0x01087f64: 0x1087f64: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087944: 0x1087944: addu  a2, zero, zero
+// 0x01087f68: 0x1087f68: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087948: 0x1087948: addu  a3, s3, zero
+// 0x01087f6c: 0x1087f6c: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x0108794c: 0x108794c: jal   0x106855c sw    s1, 16(sp)
+// 0x01087f70: 0x1087f70: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5064,50 +5064,50 @@ L_108792c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087954: 0x1087954: beq   v0, zero, 0x108796c lui   a1, 0x20000
+// 0x01087f78: 0x1087f78: beq   v0, zero, 0x1087f90 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108796c
+	brfalse L_1087f90
 // --- basic block ---
-// 0x0108795c: 0x108795c: lb    v1, 0(v0)
+// 0x01087f80: 0x1087f80: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01087960: 0x1087960: sll   zero, zero, 0
-// 0x01087964: 0x1087964: bne   v1, zero, 0x1087984 sll   zero, zero, 0
+// 0x01087f84: 0x1087f84: sll   zero, zero, 0
+// 0x01087f88: 0x1087f88: bne   v1, zero, 0x1087fa8 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1087984
+	brtrue L_1087fa8
 // --- basic block ---
-L_108796c:
-// 0x0108796c: 0x108796c: lui   a3, 0x20000
+L_1087f90:
+// 0x01087f90: 0x1087f90: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087970: 0x1087970: addiu a1, a1, -21512
+// 0x01087f94: 0x1087f94: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087974: 0x1087974: addiu a3, a3, -17384
+// 0x01087f98: 0x1087f98: addiu a3, a3, -16920
 	ldloc 4
-	ldc.i4 -17384
+	ldc.i4 -16920
 	add
 	stloc 4
-// 0x01087978: 0x1087978: addiu a0, zero, 4
+// 0x01087f9c: 0x1087f9c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108797c: 0x108797c: j	 0x10878bc addiu a2, zero, 2620
+// 0x01087fa0: 0x1087fa0: j	 0x1087ee0 addiu a2, zero, 2620
 	ldc.i4 2620
 	stloc.3
-	br L_10878bc
+	br L_1087ee0
 // --- basic block ---
-L_1087984:
-// 0x01087984: 0x1087984: lw    a0, 24(sp)
+L_1087fa8:
+// 0x01087fa8: 0x1087fa8: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5116,7 +5116,7 @@ L_1087984:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087988: 0x1087988: jal   0x10a46c0 sw    v0, 160(sp)
+// 0x01087fac: 0x1087fac: jal   0x10a4d08 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5130,12 +5130,12 @@ L_1087984:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_traffic_score_10a46c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_traffic_score_10a4d08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087990: 0x1087990: lw    v0, 160(sp)
+// 0x01087fb4: 0x1087fb4: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5144,21 +5144,21 @@ L_1087984:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087994: 0x1087994: addiu a1, s2, 28076
+// 0x01087fb8: 0x1087fb8: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087998: 0x1087998: addu  a0, v0, zero
+// 0x01087fbc: 0x1087fbc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108799c: 0x108799c: addu  a3, s3, zero
+// 0x01087fc0: 0x1087fc0: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x010879a0: 0x10879a0: addu  a2, zero, zero
+// 0x01087fc4: 0x1087fc4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010879a4: 0x10879a4: sw    s1, 16(sp)
+// 0x01087fc8: 0x1087fc8: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5167,7 +5167,7 @@ L_1087984:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010879a8: 0x10879a8: jal   0x106855c sb    zero, 32(sp)
+// 0x01087fcc: 0x1087fcc: jal   0x106856c sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5178,50 +5178,50 @@ L_1087984:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010879b0: 0x10879b0: beq   v0, zero, 0x10879c8 lui   a1, 0x20000
+// 0x01087fd4: 0x1087fd4: beq   v0, zero, 0x1087fec lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10879c8
+	brfalse L_1087fec
 // --- basic block ---
-// 0x010879b8: 0x10879b8: lb    v1, 0(v0)
+// 0x01087fdc: 0x1087fdc: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010879bc: 0x10879bc: sll   zero, zero, 0
-// 0x010879c0: 0x10879c0: bne   v1, zero, 0x10879e0 sll   zero, zero, 0
+// 0x01087fe0: 0x1087fe0: sll   zero, zero, 0
+// 0x01087fe4: 0x1087fe4: bne   v1, zero, 0x1088004 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10879e0
+	brtrue L_1088004
 // --- basic block ---
-L_10879c8:
-// 0x010879c8: 0x10879c8: lui   a3, 0x20000
+L_1087fec:
+// 0x01087fec: 0x1087fec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010879cc: 0x10879cc: addiu a1, a1, -21512
+// 0x01087ff0: 0x1087ff0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010879d0: 0x10879d0: addiu a3, a3, -17336
+// 0x01087ff4: 0x1087ff4: addiu a3, a3, -16872
 	ldloc 4
-	ldc.i4 -17336
+	ldc.i4 -16872
 	add
 	stloc 4
-// 0x010879d4: 0x10879d4: addiu a0, zero, 4
+// 0x01087ff8: 0x1087ff8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010879d8: 0x10879d8: j	 0x10878bc addiu a2, zero, 2636
+// 0x01087ffc: 0x1087ffc: j	 0x1087ee0 addiu a2, zero, 2636
 	ldc.i4 2636
 	stloc.3
-	br L_10878bc
+	br L_1087ee0
 // --- basic block ---
-L_10879e0:
-// 0x010879e0: 0x10879e0: lw    a0, 24(sp)
+L_1088004:
+// 0x01088004: 0x1088004: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5230,7 +5230,7 @@ L_10879e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010879e4: 0x10879e4: jal   0x10a4690 sw    v0, 160(sp)
+// 0x01088008: 0x1088008: jal   0x10a4cd8 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5244,12 +5244,12 @@ L_10879e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_usage_score_10a4690(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_usage_score_10a4cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010879ec: 0x10879ec: lw    v0, 160(sp)
+// 0x01088010: 0x1088010: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5258,29 +5258,29 @@ L_10879e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010879f0: 0x10879f0: lui   s5, 0x0
+// 0x01088014: 0x1088014: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010879f4: 0x10879f4: addiu s4, zero, 1
+// 0x01088018: 0x1088018: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x010879f8: 0x10879f8: addu  a0, v0, zero
+// 0x0108801c: 0x108801c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010879fc: 0x10879fc: addiu a1, s5, 28076
+// 0x01088020: 0x1088020: addiu a1, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087a00: 0x1087a00: addu  a2, zero, zero
+// 0x01088024: 0x1088024: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087a04: 0x1087a04: addiu a3, sp, 24
+// 0x01088028: 0x1088028: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01087a08: 0x1087a08: jal   0x106855c sw    s4, 16(sp)
+// 0x0108802c: 0x108802c: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5294,40 +5294,40 @@ L_10879e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087a10: 0x1087a10: bne   v0, zero, 0x1087a30 lui   a1, 0x20000
+// 0x01088034: 0x1088034: bne   v0, zero, 0x1088054 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1087a30
+	brtrue L_1088054
 // --- basic block ---
-// 0x01087a18: 0x1087a18: lui   a3, 0x20000
+// 0x0108803c: 0x108803c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087a1c: 0x1087a1c: addiu a1, a1, -21512
+// 0x01088040: 0x1088040: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087a20: 0x1087a20: addiu a3, a3, -17292
+// 0x01088044: 0x1088044: addiu a3, a3, -16828
 	ldloc 4
-	ldc.i4 -17292
+	ldc.i4 -16828
 	add
 	stloc 4
-// 0x01087a24: 0x1087a24: addiu a0, zero, 4
+// 0x01088048: 0x1088048: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087a28: 0x1087a28: j	 0x1087b54 addiu a2, zero, 2651
+// 0x0108804c: 0x108804c: j	 0x1088178 addiu a2, zero, 2651
 	ldc.i4 2651
 	stloc.3
-	br L_1087b54
+	br L_1088178
 // --- basic block ---
-L_1087a30:
-// 0x01087a30: 0x1087a30: lw    a0, 24(sp)
+L_1088054:
+// 0x01088054: 0x1088054: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5336,7 +5336,7 @@ L_1087a30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087a34: 0x1087a34: jal   0x10a45b0 sw    v0, 160(sp)
+// 0x01088058: 0x1088058: jal   0x10a4bf8 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5346,10 +5346,10 @@ L_1087a30:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl123::roadmap_geo_location_set_overall_score_10a45b0(int32)
+	call int32 Cibyl123::roadmap_geo_location_set_overall_score_10a4bf8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01087a3c: 0x1087a3c: lw    v0, 160(sp)
+// 0x01088060: 0x1088060: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5358,40 +5358,40 @@ L_1087a30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087a40: 0x1087a40: addiu s1, sp, 32
+// 0x01088064: 0x1088064: addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
-// 0x01087a44: 0x1087a44: addiu s3, sp, 28
+// 0x01088068: 0x1088068: addiu s3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x01087a48: 0x1087a48: addiu s2, zero, 128
+// 0x0108806c: 0x108806c: addiu s2, zero, 128
 	ldc.i4 128
 	stloc 10
-// 0x01087a4c: 0x1087a4c: addu  a0, v0, zero
+// 0x01088070: 0x1088070: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087a50: 0x1087a50: addu  a1, s1, zero
+// 0x01088074: 0x1088074: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01087a54: 0x1087a54: addu  a2, s3, zero
+// 0x01088078: 0x1088078: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x01087a58: 0x1087a58: addiu a3, s5, 28076
+// 0x0108807c: 0x108807c: addiu a3, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01087a5c: 0x1087a5c: sb    zero, 32(sp)
+// 0x01088080: 0x1088080: sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01087a60: 0x1087a60: sw    s2, 28(sp)
+// 0x01088084: 0x1088084: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5400,7 +5400,7 @@ L_1087a30:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01087a64: 0x1087a64: jal   0x1068250 sw    s4, 16(sp)
+// 0x01088088: 0x1088088: jal   0x1068260 sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5414,53 +5414,53 @@ L_1087a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087a6c: 0x1087a6c: beq   v0, zero, 0x1087a84 lui   a1, 0x20000
+// 0x01088090: 0x1088090: beq   v0, zero, 0x10880a8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1087a84
+	brfalse L_10880a8
 // --- basic block ---
-// 0x01087a74: 0x1087a74: lb    v1, 0(v0)
+// 0x01088098: 0x1088098: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01087a78: 0x1087a78: sll   zero, zero, 0
-// 0x01087a7c: 0x1087a7c: bne   v1, zero, 0x1087a9c sll   zero, zero, 0
+// 0x0108809c: 0x108809c: sll   zero, zero, 0
+// 0x010880a0: 0x10880a0: bne   v1, zero, 0x10880c0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1087a9c
+	brtrue L_10880c0
 // --- basic block ---
-L_1087a84:
-// 0x01087a84: 0x1087a84: lui   a3, 0x20000
+L_10880a8:
+// 0x010880a8: 0x10880a8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087a88: 0x1087a88: addiu a1, a1, -21512
+// 0x010880ac: 0x10880ac: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087a8c: 0x1087a8c: addiu a3, a3, -17244
+// 0x010880b0: 0x10880b0: addiu a3, a3, -16780
 	ldloc 4
-	ldc.i4 -17244
+	ldc.i4 -16780
 	add
 	stloc 4
-// 0x01087a90: 0x1087a90: addiu a0, zero, 4
+// 0x010880b4: 0x10880b4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087a94: 0x1087a94: j	 0x10878bc addiu a2, zero, 2669
+// 0x010880b8: 0x10880b8: j	 0x1087ee0 addiu a2, zero, 2669
 	ldc.i4 2669
 	stloc.3
-	br L_10878bc
+	br L_1087ee0
 // --- basic block ---
-L_1087a9c:
-// 0x01087a9c: 0x1087a9c: addu  a0, s1, zero
+L_10880c0:
+// 0x010880c0: 0x10880c0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01087aa0: 0x1087aa0: jal   0x10a4660 sw    v0, 160(sp)
+// 0x010880c4: 0x10880c4: jal   0x10a4ca8 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5474,12 +5474,12 @@ L_1087a9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_map_score_str_10a4660(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_map_score_str_10a4ca8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087aa8: 0x1087aa8: lw    v0, 160(sp)
+// 0x010880cc: 0x10880cc: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5488,21 +5488,21 @@ L_1087a9c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087aac: 0x1087aac: addiu a3, s5, 28076
+// 0x010880d0: 0x10880d0: addiu a3, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01087ab0: 0x1087ab0: addu  a0, v0, zero
+// 0x010880d4: 0x10880d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087ab4: 0x1087ab4: addu  a1, s1, zero
+// 0x010880d8: 0x10880d8: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01087ab8: 0x1087ab8: addu  a2, s3, zero
+// 0x010880dc: 0x10880dc: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x01087abc: 0x1087abc: sw    s4, 16(sp)
+// 0x010880e0: 0x10880e0: sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5511,13 +5511,13 @@ L_1087a9c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01087ac0: 0x1087ac0: sb    zero, 32(sp)
+// 0x010880e4: 0x10880e4: sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01087ac4: 0x1087ac4: jal   0x1068250 sw    s2, 28(sp)
+// 0x010880e8: 0x10880e8: jal   0x1068260 sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5531,53 +5531,53 @@ L_1087a9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087acc: 0x1087acc: beq   v0, zero, 0x1087ae4 lui   a1, 0x20000
+// 0x010880f0: 0x10880f0: beq   v0, zero, 0x1088108 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1087ae4
+	brfalse L_1088108
 // --- basic block ---
-// 0x01087ad4: 0x1087ad4: lb    v1, 0(v0)
+// 0x010880f8: 0x10880f8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01087ad8: 0x1087ad8: sll   zero, zero, 0
-// 0x01087adc: 0x1087adc: bne   v1, zero, 0x1087afc sll   zero, zero, 0
+// 0x010880fc: 0x10880fc: sll   zero, zero, 0
+// 0x01088100: 0x1088100: bne   v1, zero, 0x1088120 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1087afc
+	brtrue L_1088120
 // --- basic block ---
-L_1087ae4:
-// 0x01087ae4: 0x1087ae4: lui   a3, 0x20000
+L_1088108:
+// 0x01088108: 0x1088108: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087ae8: 0x1087ae8: addiu a1, a1, -21512
+// 0x0108810c: 0x108810c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087aec: 0x1087aec: addiu a3, a3, -17192
+// 0x01088110: 0x1088110: addiu a3, a3, -16728
 	ldloc 4
-	ldc.i4 -17192
+	ldc.i4 -16728
 	add
 	stloc 4
-// 0x01087af0: 0x1087af0: addiu a0, zero, 4
+// 0x01088114: 0x1088114: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087af4: 0x1087af4: j	 0x10878bc addiu a2, zero, 2687
+// 0x01088118: 0x1088118: j	 0x1087ee0 addiu a2, zero, 2687
 	ldc.i4 2687
 	stloc.3
-	br L_10878bc
+	br L_1087ee0
 // --- basic block ---
-L_1087afc:
-// 0x01087afc: 0x1087afc: addu  a0, s1, zero
+L_1088120:
+// 0x01088120: 0x1088120: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01087b00: 0x1087b00: jal   0x10a4630 sw    v0, 160(sp)
+// 0x01088124: 0x1088124: jal   0x10a4c78 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5591,12 +5591,12 @@ L_1087afc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_traffic_score_str_10a4630(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_traffic_score_str_10a4c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087b08: 0x1087b08: lw    v0, 160(sp)
+// 0x0108812c: 0x108812c: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5605,27 +5605,27 @@ L_1087afc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087b0c: 0x1087b0c: lui   a3, 0x0
+// 0x01088130: 0x1088130: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01087b10: 0x1087b10: addu  a0, v0, zero
+// 0x01088134: 0x1088134: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087b14: 0x1087b14: addu  a2, s3, zero
+// 0x01088138: 0x1088138: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x01087b18: 0x1087b18: addiu v0, zero, -1
+// 0x0108813c: 0x108813c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01087b1c: 0x1087b1c: addiu a3, a3, 30268
+// 0x01088140: 0x1088140: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01087b20: 0x1087b20: addu  a1, s1, zero
+// 0x01088144: 0x1088144: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01087b24: 0x1087b24: sw    s2, 28(sp)
+// 0x01088148: 0x1088148: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5634,7 +5634,7 @@ L_1087afc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01087b28: 0x1087b28: sw    v0, 16(sp)
+// 0x0108814c: 0x108814c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5643,7 +5643,7 @@ L_1087afc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01087b2c: 0x1087b2c: jal   0x1068250 sb    zero, 32(sp)
+// 0x01088150: 0x1088150: jal   0x1068260 sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5654,41 +5654,41 @@ L_1087afc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087b34: 0x1087b34: bne   v0, zero, 0x1087b68 addu  a0, s1, zero
+// 0x01088158: 0x1088158: bne   v0, zero, 0x108818c addu  a0, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_1087b68
+	brtrue L_108818c
 // --- basic block ---
-// 0x01087b3c: 0x1087b3c: lui   a1, 0x20000
+// 0x01088160: 0x1088160: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087b40: 0x1087b40: lui   a3, 0x20000
+// 0x01088164: 0x1088164: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087b44: 0x1087b44: addiu a1, a1, -21512
+// 0x01088168: 0x1088168: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087b48: 0x1087b48: addiu a3, a3, -17136
+// 0x0108816c: 0x108816c: addiu a3, a3, -16672
 	ldloc 4
-	ldc.i4 -17136
+	ldc.i4 -16672
 	add
 	stloc 4
-// 0x01087b4c: 0x1087b4c: addiu a0, zero, 4
+// 0x01088170: 0x1088170: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087b50: 0x1087b50: addiu a2, zero, 2705
+// 0x01088174: 0x1088174: addiu a2, zero, 2705
 	ldc.i4 2705
 	stloc.3
-L_1087b54:
-// 0x01087b54: 0x1087b54: jal   0x100449c sw    v0, 160(sp)
+L_1088178:
+// 0x01088178: 0x1088178: jal   0x100449c sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5707,20 +5707,20 @@ L_1087b54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087b5c: 0x1087b5c: addiu v1, zero, 18
+// 0x01088180: 0x1088180: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x01087b60: 0x1087b60: j	 0x1087b78 sw    v1, 0(s0)
+// 0x01088184: 0x1088184: j	 0x108819c sw    v1, 0(s0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1087b78
+	br L_108819c
 // --- basic block ---
-L_1087b68:
-// 0x01087b68: 0x1087b68: jal   0x10a4600 sw    v0, 160(sp)
+L_108818c:
+// 0x0108818c: 0x108818c: jal   0x10a4c48 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5734,16 +5734,16 @@ L_1087b68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_geo_location_set_usage_score_str_10a4600(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_geo_location_set_usage_score_str_10a4c48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087b70: 0x1087b70: jal   0x10a45bc sll   zero, zero, 0
-	call void Cibyl123::roadmap_geo_location_info_10a45bc()
+// 0x01088194: 0x1088194: jal   0x10a4c04 sll   zero, zero, 0
+	call void Cibyl123::roadmap_geo_location_info_10a4c04()
 // --- basic block ---
-L_1087b78:
-// 0x01087b78: 0x1087b78: lw    v0, 160(sp)
+L_108819c:
+// 0x0108819c: 0x108819c: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5752,9 +5752,9 @@ L_1087b78:
 	add
 	ldelem.i4
 	stloc 5
-L_1087b7c:
-// 0x01087b7c: 0x1087b7c: lw    ra, 196(sp)
-// 0x01087b80: 0x1087b80: lw    s5, 192(sp)
+L_10881a0:
+// 0x010881a0: 0x10881a0: lw    ra, 196(sp)
+// 0x010881a4: 0x10881a4: lw    s5, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5763,7 +5763,7 @@ L_1087b7c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01087b84: 0x1087b84: lw    s4, 188(sp)
+// 0x010881a8: 0x10881a8: lw    s4, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5772,7 +5772,7 @@ L_1087b7c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01087b88: 0x1087b88: lw    s3, 184(sp)
+// 0x010881ac: 0x10881ac: lw    s3, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5781,7 +5781,7 @@ L_1087b7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01087b8c: 0x1087b8c: lw    s2, 180(sp)
+// 0x010881b0: 0x10881b0: lw    s2, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5790,7 +5790,7 @@ L_1087b7c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01087b90: 0x1087b90: lw    s1, 176(sp)
+// 0x010881b4: 0x10881b4: lw    s1, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5799,7 +5799,7 @@ L_1087b7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01087b94: 0x1087b94: lw    s0, 172(sp)
+// 0x010881b8: 0x10881b8: lw    s0, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5808,7 +5808,7 @@ L_1087b7c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01087b98: 0x1087b98: jr    ra addiu sp, sp, 200
+// 0x010881bc: 0x10881bc: jr    ra addiu sp, sp, 200
 	ldloc.0
 	ldc.i4 200
 	add
@@ -5820,7 +5820,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 MapUpdateTime_1087ba0(int32,int32,int32,int32,int32)
+.method public static int32 MapUpdateTime_10881c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -5858,16 +5858,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1087ba0:
-// 0x01087ba0: 0x1087ba0: addiu sp, sp, -48
+L_10881c4:
+// 0x010881c4: 0x10881c4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01087ba4: 0x1087ba4: lui   a1, 0x0
+// 0x010881c8: 0x10881c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01087ba8: 0x1087ba8: sw    s0, 40(sp)
+// 0x010881cc: 0x10881cc: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5876,24 +5876,24 @@ L_1087ba0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087bac: 0x1087bac: addiu a1, a1, 30268
+// 0x010881d0: 0x10881d0: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01087bb0: 0x1087bb0: addu  s0, a3, zero
+// 0x010881d4: 0x10881d4: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x01087bb4: 0x1087bb4: addu  a2, zero, zero
+// 0x010881d8: 0x10881d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087bb8: 0x1087bb8: addiu a3, sp, 24
+// 0x010881dc: 0x10881dc: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01087bbc: 0x1087bbc: sw    ra, 44(sp)
-// 0x01087bc0: 0x1087bc0: jal   0x106855c sw    zero, 16(sp)
+// 0x010881e0: 0x10881e0: sw    ra, 44(sp)
+// 0x010881e4: 0x10881e4: jal   0x106856c sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5907,40 +5907,40 @@ L_1087ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087bc8: 0x1087bc8: bne   v0, zero, 0x1087bfc lui   a0, 0xfffe0000
+// 0x010881ec: 0x10881ec: bne   v0, zero, 0x1088220 lui   a0, 0xfffe0000
 	ldloc 6
 	ldc.i4 4294836224
 	stloc.1
-	brtrue L_1087bfc
+	brtrue L_1088220
 // --- basic block ---
-// 0x01087bd0: 0x1087bd0: lui   a1, 0x20000
+// 0x010881f4: 0x10881f4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087bd4: 0x1087bd4: lui   a3, 0x20000
+// 0x010881f8: 0x10881f8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087bd8: 0x1087bd8: addiu a1, a1, -21512
+// 0x010881fc: 0x10881fc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087bdc: 0x1087bdc: addiu a3, a3, -17084
+// 0x01088200: 0x1088200: addiu a3, a3, -16620
 	ldloc 4
-	ldc.i4 -17084
+	ldc.i4 -16620
 	add
 	stloc 4
-// 0x01087be0: 0x1087be0: addiu a0, zero, 4
+// 0x01088204: 0x1088204: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087be4: 0x1087be4: addiu a2, zero, 2542
+// 0x01088208: 0x1088208: addiu a2, zero, 2542
 	ldc.i4 2542
 	stloc.3
-// 0x01087be8: 0x1087be8: jal   0x100449c sw    v0, 32(sp)
+// 0x0108820c: 0x108820c: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5959,20 +5959,20 @@ L_1087ba0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01087bf0: 0x1087bf0: addiu v1, zero, 18
+// 0x01088214: 0x1088214: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x01087bf4: 0x1087bf4: j	 0x1087c14 sw    v1, 0(s0)
+// 0x01088218: 0x1088218: j	 0x1088238 sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1087c14
+	br L_1088238
 // --- basic block ---
-L_1087bfc:
-// 0x01087bfc: 0x1087bfc: lw    v1, 24(sp)
+L_1088220:
+// 0x01088220: 0x1088220: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5981,20 +5981,20 @@ L_1087bfc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087c00: 0x1087c00: ori   a0, a0, 44672
+// 0x01088224: 0x1088224: ori   a0, a0, 44672
 	ldloc.1
 	ldc.i4 44672
 	or
 	stloc.1
-// 0x01087c04: 0x1087c04: addu  a0, v1, a0
+// 0x01088228: 0x1088228: addu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x01087c08: 0x1087c08: addu  a1, zero, zero
+// 0x0108822c: 0x108822c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01087c0c: 0x1087c0c: jal   0x10b98b4 sw    v0, 32(sp)
+// 0x01088230: 0x1088230: jal   0x10b9efc sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6008,14 +6008,14 @@ L_1087bfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_cleanup_test_10b98b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_cleanup_test_10b9efc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1087c14:
-// 0x01087c14: 0x1087c14: lw    ra, 44(sp)
-// 0x01087c18: 0x1087c18: lw    v0, 32(sp)
+L_1088238:
+// 0x01088238: 0x1088238: lw    ra, 44(sp)
+// 0x0108823c: 0x108823c: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6024,7 +6024,7 @@ L_1087c14:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01087c1c: 0x1087c1c: lw    s0, 40(sp)
+// 0x01088240: 0x1088240: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6033,7 +6033,7 @@ L_1087c14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01087c20: 0x1087c20: jr    ra addiu sp, sp, 48
+// 0x01088244: 0x1088244: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6045,7 +6045,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RmRoadInfo_1087c28(int32,int32,int32,int32,int32)
+.method public static int32 RmRoadInfo_108824c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -6086,16 +6086,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1087c28:
-// 0x01087c28: 0x1087c28: addiu sp, sp, -48
+L_108824c:
+// 0x0108824c: 0x108824c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01087c2c: 0x1087c2c: lui   a1, 0x0
+// 0x01088250: 0x1088250: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01087c30: 0x1087c30: sw    s1, 40(sp)
+// 0x01088254: 0x1088254: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6104,23 +6104,23 @@ L_1087c28:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01087c34: 0x1087c34: addiu a1, a1, 30268
+// 0x01088258: 0x1088258: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01087c38: 0x1087c38: addu  s1, a3, zero
+// 0x0108825c: 0x108825c: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x01087c3c: 0x1087c3c: addu  a2, zero, zero
+// 0x01088260: 0x1088260: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087c40: 0x1087c40: addiu a3, sp, 24
+// 0x01088264: 0x1088264: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01087c44: 0x1087c44: sw    s0, 36(sp)
+// 0x01088268: 0x1088268: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6129,8 +6129,8 @@ L_1087c28:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01087c48: 0x1087c48: sw    ra, 44(sp)
-// 0x01087c4c: 0x1087c4c: jal   0x106855c sw    zero, 16(sp)
+// 0x0108826c: 0x108826c: sw    ra, 44(sp)
+// 0x01088270: 0x1088270: jal   0x106856c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6144,18 +6144,18 @@ L_1087c28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01087c54: 0x1087c54: beq   v0, zero, 0x1087c6c addu  s0, v0, zero
+// 0x01088278: 0x1088278: beq   v0, zero, 0x1088290 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_1087c6c
+	brfalse L_1088290
 // --- basic block ---
-// 0x01087c5c: 0x1087c5c: lw    a0, 24(sp)
+// 0x01088280: 0x1088280: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6164,35 +6164,35 @@ L_1087c28:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087c60: 0x1087c60: addiu v0, zero, -1
+// 0x01088284: 0x1088284: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01087c64: 0x1087c64: bne   a0, v0, 0x1087c98 sll   zero, zero, 0
+// 0x01088288: 0x1088288: bne   a0, v0, 0x10882bc sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_1087c98
+	bne.un L_10882bc
 // --- basic block ---
-L_1087c6c:
-// 0x01087c6c: 0x1087c6c: lui   a1, 0x20000
+L_1088290:
+// 0x01088290: 0x1088290: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087c70: 0x1087c70: lui   a3, 0x20000
+// 0x01088294: 0x1088294: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087c74: 0x1087c74: addiu a1, a1, -21512
+// 0x01088298: 0x1088298: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087c78: 0x1087c78: addiu a3, a3, -17044
+// 0x0108829c: 0x108829c: addiu a3, a3, -16580
 	ldloc 4
-	ldc.i4 -17044
+	ldc.i4 -16580
 	add
 	stloc 4
-// 0x01087c7c: 0x1087c7c: addiu a0, zero, 4
+// 0x010882a0: 0x10882a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087c80: 0x1087c80: jal   0x100449c addiu a2, zero, 2509
+// 0x010882a4: 0x10882a4: jal   0x100449c addiu a2, zero, 2509
 	ldc.i4 2509
 	stloc.3
 	ldloc.0
@@ -6205,43 +6205,43 @@ L_1087c6c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01087c88: 0x1087c88: addiu v0, zero, 18
+// 0x010882ac: 0x10882ac: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01087c8c: 0x1087c8c: sw    v0, 0(s1)
+// 0x010882b0: 0x10882b0: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01087c90: 0x1087c90: j	 0x1087cc8 addu  s0, zero, zero
+// 0x010882b4: 0x10882b4: j	 0x10882ec addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1087cc8
+	br L_10882ec
 // --- basic block ---
-L_1087c98:
-// 0x01087c98: 0x1087c98: jal   0x10831d8 sll   zero, zero, 0
+L_10882bc:
+// 0x010882bc: 0x10882bc: jal   0x10837fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_Remove_10831d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_Remove_10837fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01087ca0: 0x1087ca0: bne   v0, zero, 0x1087cc8 lui   a1, 0x20000
+// 0x010882c4: 0x10882c4: bne   v0, zero, 0x10882ec lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1087cc8
+	brtrue L_10882ec
 // --- basic block ---
-// 0x01087ca8: 0x1087ca8: lui   a3, 0x20000
+// 0x010882cc: 0x10882cc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087cac: 0x1087cac: lw    v0, 24(sp)
+// 0x010882d0: 0x10882d0: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6250,23 +6250,23 @@ L_1087c98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087cb0: 0x1087cb0: addiu a1, a1, -21512
+// 0x010882d4: 0x10882d4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087cb4: 0x1087cb4: addiu a3, a3, -16980
+// 0x010882d8: 0x10882d8: addiu a3, a3, -16516
 	ldloc 4
-	ldc.i4 -16980
+	ldc.i4 -16516
 	add
 	stloc 4
-// 0x01087cb8: 0x1087cb8: addiu a0, zero, 1
+// 0x010882dc: 0x10882dc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01087cbc: 0x1087cbc: addiu a2, zero, 2517
+// 0x010882e0: 0x10882e0: addiu a2, zero, 2517
 	ldc.i4 2517
 	stloc.3
-// 0x01087cc0: 0x1087cc0: jal   0x100449c sw    v0, 16(sp)
+// 0x010882e4: 0x10882e4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6285,12 +6285,12 @@ L_1087c98:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1087cc8:
-// 0x01087cc8: 0x1087cc8: lw    ra, 44(sp)
-// 0x01087ccc: 0x1087ccc: addu  v0, s0, zero
+L_10882ec:
+// 0x010882ec: 0x10882ec: lw    ra, 44(sp)
+// 0x010882f0: 0x10882f0: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x01087cd0: 0x1087cd0: lw    s1, 40(sp)
+// 0x010882f4: 0x10882f4: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6299,7 +6299,7 @@ L_1087cc8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01087cd4: 0x1087cd4: lw    s0, 36(sp)
+// 0x010882f8: 0x10882f8: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6308,7 +6308,7 @@ L_1087cc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01087cd8: 0x1087cd8: jr    ra addiu sp, sp, 48
+// 0x010882fc: 0x10882fc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6320,7 +6320,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RoadInfoSegments_1087ce0(int32,int32,int32,int32,int32)
+.method public static int32 RoadInfoSegments_1088304(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s3,int32 t0,int32 s0,int32 s5,int32 s1,int32 s4,int32 ra)
@@ -6376,13 +6376,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1087ce0:
-// 0x01087ce0: 0x1087ce0: addiu sp, sp, -880
+L_1088304:
+// 0x01088304: 0x1088304: addiu sp, sp, -880
 	ldloc.0
 	ldc.i4 -880
 	add
 	stloc.0
-// 0x01087ce4: 0x1087ce4: sw    s3, 864(sp)
+// 0x01088308: 0x1088308: sw    s3, 864(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6391,10 +6391,10 @@ L_1087ce0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01087ce8: 0x1087ce8: lui   s3, 0x0
+// 0x0108830c: 0x108830c: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01087cec: 0x1087cec: sw    s2, 860(sp)
+// 0x01088310: 0x1088310: sw    s2, 860(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6403,7 +6403,7 @@ L_1087ce0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087cf0: 0x1087cf0: sw    s1, 856(sp)
+// 0x01088314: 0x1088314: sw    s1, 856(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6412,27 +6412,27 @@ L_1087ce0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01087cf4: 0x1087cf4: addiu s2, zero, 1
+// 0x01088318: 0x1088318: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01087cf8: 0x1087cf8: addu  s1, a3, zero
+// 0x0108831c: 0x108831c: addu  s1, a3, zero
 	ldloc 4
 	stloc 13
-// 0x01087cfc: 0x1087cfc: addiu a1, s3, 28076
+// 0x01088320: 0x1088320: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087d00: 0x1087d00: addu  a2, zero, zero
+// 0x01088324: 0x1088324: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087d04: 0x1087d04: addiu a3, sp, 24
+// 0x01088328: 0x1088328: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01087d08: 0x1087d08: sw    ra, 876(sp)
-// 0x01087d0c: 0x1087d0c: sw    s5, 872(sp)
+// 0x0108832c: 0x108832c: sw    ra, 876(sp)
+// 0x01088330: 0x1088330: sw    s5, 872(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6441,7 +6441,7 @@ L_1087ce0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01087d10: 0x1087d10: sw    s4, 868(sp)
+// 0x01088334: 0x1088334: sw    s4, 868(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6450,7 +6450,7 @@ L_1087ce0:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01087d14: 0x1087d14: sw    s0, 852(sp)
+// 0x01088338: 0x1088338: sw    s0, 852(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6459,7 +6459,7 @@ L_1087ce0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01087d18: 0x1087d18: jal   0x106855c sw    s2, 16(sp)
+// 0x0108833c: 0x108833c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6473,18 +6473,18 @@ L_1087ce0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087d20: 0x1087d20: beq   v0, zero, 0x1087d38 addiu v1, zero, -1
+// 0x01088344: 0x1088344: beq   v0, zero, 0x108835c addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 7
-	brfalse L_1087d38
+	brfalse L_108835c
 // --- basic block ---
-// 0x01087d28: 0x1087d28: lw    a0, 24(sp)
+// 0x0108834c: 0x108834c: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6493,35 +6493,35 @@ L_1087ce0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087d2c: 0x1087d2c: sll   zero, zero, 0
-// 0x01087d30: 0x1087d30: bne   a0, v1, 0x1087d5c addu  a0, v0, zero
+// 0x01088350: 0x1088350: sll   zero, zero, 0
+// 0x01088354: 0x1088354: bne   a0, v1, 0x1088380 addu  a0, v0, zero
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	stloc.1
-	bne.un L_1087d5c
+	bne.un L_1088380
 // --- basic block ---
-L_1087d38:
-// 0x01087d38: 0x1087d38: lui   a1, 0x20000
+L_108835c:
+// 0x0108835c: 0x108835c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087d3c: 0x1087d3c: lui   a3, 0x20000
+// 0x01088360: 0x1088360: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087d40: 0x1087d40: addiu a1, a1, -21512
+// 0x01088364: 0x1088364: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087d44: 0x1087d44: addiu a3, a3, -16896
+// 0x01088368: 0x1088368: addiu a3, a3, -16432
 	ldloc 4
-	ldc.i4 -16896
+	ldc.i4 -16432
 	add
 	stloc 4
-// 0x01087d48: 0x1087d48: addiu a0, zero, 4
+// 0x0108836c: 0x108836c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087d4c: 0x1087d4c: jal   0x100449c addiu a2, zero, 2405
+// 0x01088370: 0x1088370: jal   0x100449c addiu a2, zero, 2405
 	ldc.i4 2405
 	stloc.3
 	ldloc.0
@@ -6534,26 +6534,26 @@ L_1087d38:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087d54: 0x1087d54: j	 0x1087e4c addiu v0, zero, 18
+// 0x01088378: 0x1088378: j	 0x1088470 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1087e4c
+	br L_1088470
 // --- basic block ---
-L_1087d5c:
-// 0x01087d5c: 0x1087d5c: addiu a1, s3, 28076
+L_1088380:
+// 0x01088380: 0x1088380: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087d60: 0x1087d60: addu  a2, zero, zero
+// 0x01088384: 0x1088384: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087d64: 0x1087d64: addiu a3, sp, 32
+// 0x01088388: 0x1088388: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01087d68: 0x1087d68: jal   0x106855c sw    s2, 16(sp)
+// 0x0108838c: 0x108838c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6567,59 +6567,59 @@ L_1087d5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087d70: 0x1087d70: bne   v0, zero, 0x1087d94 addu  s0, v0, zero
+// 0x01088394: 0x1088394: bne   v0, zero, 0x10883b8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brtrue L_1087d94
+	brtrue L_10883b8
 // --- basic block ---
-// 0x01087d78: 0x1087d78: lui   a1, 0x20000
+// 0x0108839c: 0x108839c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087d7c: 0x1087d7c: lui   a3, 0x20000
+// 0x010883a0: 0x10883a0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087d80: 0x1087d80: addiu a1, a1, -21512
+// 0x010883a4: 0x10883a4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087d84: 0x1087d84: addiu a3, a3, -16860
+// 0x010883a8: 0x10883a8: addiu a3, a3, -16396
 	ldloc 4
-	ldc.i4 -16860
+	ldc.i4 -16396
 	add
 	stloc 4
-// 0x01087d88: 0x1087d88: addiu a0, zero, 4
+// 0x010883ac: 0x10883ac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087d8c: 0x1087d8c: j	 0x1087dcc addiu a2, zero, 2419
+// 0x010883b0: 0x10883b0: j	 0x10883f0 addiu a2, zero, 2419
 	ldc.i4 2419
 	stloc.3
-	br L_1087dcc
+	br L_10883f0
 // --- basic block ---
-L_1087d94:
-// 0x01087d94: 0x1087d94: addu  a0, v0, zero
+L_10883b8:
+// 0x010883b8: 0x10883b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087d98: 0x1087d98: addiu a1, s3, 28076
+// 0x010883bc: 0x10883bc: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087d9c: 0x1087d9c: addu  a2, zero, zero
+// 0x010883c0: 0x10883c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087da0: 0x1087da0: addiu a3, sp, 36
+// 0x010883c4: 0x10883c4: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x01087da4: 0x1087da4: jal   0x106855c sw    s2, 16(sp)
+// 0x010883c8: 0x10883c8: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6633,41 +6633,41 @@ L_1087d94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087dac: 0x1087dac: bne   v0, zero, 0x1087ddc addu  s0, v0, zero
+// 0x010883d0: 0x10883d0: bne   v0, zero, 0x1088400 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brtrue L_1087ddc
+	brtrue L_1088400
 // --- basic block ---
-// 0x01087db4: 0x1087db4: lui   a1, 0x20000
+// 0x010883d8: 0x10883d8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087db8: 0x1087db8: lui   a3, 0x20000
+// 0x010883dc: 0x10883dc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087dbc: 0x1087dbc: addiu a1, a1, -21512
+// 0x010883e0: 0x10883e0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087dc0: 0x1087dc0: addiu a3, a3, -16820
+// 0x010883e4: 0x10883e4: addiu a3, a3, -16356
 	ldloc 4
-	ldc.i4 -16820
+	ldc.i4 -16356
 	add
 	stloc 4
-// 0x01087dc4: 0x1087dc4: addiu a0, zero, 4
+// 0x010883e8: 0x10883e8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087dc8: 0x1087dc8: addiu a2, zero, 2433
+// 0x010883ec: 0x10883ec: addiu a2, zero, 2433
 	ldc.i4 2433
 	stloc.3
-L_1087dcc:
-// 0x01087dcc: 0x1087dcc: jal   0x100449c sll   zero, zero, 0
+L_10883f0:
+// 0x010883f0: 0x10883f0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6678,29 +6678,29 @@ L_1087dcc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087dd4: 0x1087dd4: j	 0x1087ed4 addiu v0, zero, 18
+// 0x010883f8: 0x10883f8: j	 0x10884f8 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1087ed4
+	br L_10884f8
 // --- basic block ---
-L_1087ddc:
-// 0x01087ddc: 0x1087ddc: addu  a0, v0, zero
+L_1088400:
+// 0x01088400: 0x1088400: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01087de0: 0x1087de0: addiu a1, s3, 28076
+// 0x01088404: 0x1088404: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087de4: 0x1087de4: addu  a2, zero, zero
+// 0x01088408: 0x1088408: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087de8: 0x1087de8: addiu a3, sp, 28
+// 0x0108840c: 0x108840c: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01087dec: 0x1087dec: jal   0x106855c sw    s2, 16(sp)
+// 0x01088410: 0x1088410: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6714,43 +6714,43 @@ L_1087ddc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087df4: 0x1087df4: bne   v0, zero, 0x1087e18 addu  s0, v0, zero
+// 0x01088418: 0x1088418: bne   v0, zero, 0x108843c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brtrue L_1087e18
+	brtrue L_108843c
 // --- basic block ---
-// 0x01087dfc: 0x1087dfc: lui   a1, 0x20000
+// 0x01088420: 0x1088420: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087e00: 0x1087e00: lui   a3, 0x20000
+// 0x01088424: 0x1088424: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087e04: 0x1087e04: addiu a1, a1, -21512
+// 0x01088428: 0x1088428: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087e08: 0x1087e08: addiu a3, a3, -16772
+// 0x0108842c: 0x108842c: addiu a3, a3, -16308
 	ldloc 4
-	ldc.i4 -16772
+	ldc.i4 -16308
 	add
 	stloc 4
-// 0x01087e0c: 0x1087e0c: addiu a0, zero, 4
+// 0x01088430: 0x1088430: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087e10: 0x1087e10: j	 0x1087dcc addiu a2, zero, 2447
+// 0x01088434: 0x1088434: j	 0x10883f0 addiu a2, zero, 2447
 	ldc.i4 2447
 	stloc.3
-	br L_1087dcc
+	br L_10883f0
 // --- basic block ---
-L_1087e18:
-// 0x01087e18: 0x1087e18: lw    v0, 28(sp)
+L_108843c:
+// 0x0108843c: 0x108843c: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6759,39 +6759,39 @@ L_1087e18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087e1c: 0x1087e1c: sll   zero, zero, 0
-// 0x01087e20: 0x1087e20: bgtz  v0, 0x1087e58 slti  v1, v0, 201
+// 0x01088440: 0x1088440: sll   zero, zero, 0
+// 0x01088444: 0x1088444: bgtz  v0, 0x108847c slti  v1, v0, 201
 	ldloc 5
 	ldloc 5
 	ldc.i4 201
 	clt
 	stloc 7
 	ldc.i4.s 0
-	bgt L_1087e58
+	bgt L_108847c
 // --- basic block ---
-// 0x01087e28: 0x1087e28: lui   a1, 0x20000
+// 0x0108844c: 0x108844c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087e2c: 0x1087e2c: lui   a3, 0x20000
+// 0x01088450: 0x1088450: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087e30: 0x1087e30: addiu a1, a1, -21512
+// 0x01088454: 0x1088454: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087e34: 0x1087e34: addiu a3, a3, -16724
+// 0x01088458: 0x1088458: addiu a3, a3, -16260
 	ldloc 4
-	ldc.i4 -16724
+	ldc.i4 -16260
 	add
 	stloc 4
-// 0x01087e38: 0x1087e38: addiu a0, zero, 4
+// 0x0108845c: 0x108845c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087e3c: 0x1087e3c: addiu a2, zero, 2454
+// 0x01088460: 0x1088460: addiu a2, zero, 2454
 	ldc.i4 2454
 	stloc.3
-// 0x01087e40: 0x1087e40: jal   0x100449c sw    v0, 16(sp)
+// 0x01088464: 0x1088464: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6810,33 +6810,33 @@ L_1087e18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087e48: 0x1087e48: addiu v0, zero, 18
+// 0x0108846c: 0x108846c: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_1087e4c:
-// 0x01087e4c: 0x1087e4c: sw    v0, 0(s1)
+L_1088470:
+// 0x01088470: 0x1088470: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01087e50: 0x1087e50: j	 0x1087f44 addu  s0, zero, zero
+// 0x01088474: 0x1088474: j	 0x1088568 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_1087f44
+	br L_1088568
 // --- basic block ---
-L_1087e58:
-// 0x01087e58: 0x1087e58: bne   v1, zero, 0x1087e84 lui   a1, 0x20000
+L_108847c:
+// 0x0108847c: 0x108847c: bne   v1, zero, 0x10884a8 lui   a1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1087e84
+	brtrue L_10884a8
 // --- basic block ---
-// 0x01087e60: 0x1087e60: lui   a3, 0x20000
+// 0x01088484: 0x1088484: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087e64: 0x1087e64: sw    v0, 16(sp)
+// 0x01088488: 0x1088488: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6845,7 +6845,7 @@ L_1087e58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01087e68: 0x1087e68: lw    v0, 24(sp)
+// 0x0108848c: 0x108848c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6854,23 +6854,23 @@ L_1087e58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087e6c: 0x1087e6c: addiu a1, a1, -21512
+// 0x01088490: 0x1088490: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087e70: 0x1087e70: addiu a3, a3, -16668
+// 0x01088494: 0x1088494: addiu a3, a3, -16204
 	ldloc 4
-	ldc.i4 -16668
+	ldc.i4 -16204
 	add
 	stloc 4
-// 0x01087e74: 0x1087e74: addiu a0, zero, 3
+// 0x01088498: 0x1088498: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01087e78: 0x1087e78: addiu a2, zero, 2461
+// 0x0108849c: 0x108849c: addiu a2, zero, 2461
 	ldc.i4 2461
 	stloc.3
-// 0x01087e7c: 0x1087e7c: jal   0x100449c sw    v0, 20(sp)
+// 0x010884a0: 0x10884a0: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6889,32 +6889,32 @@ L_1087e58:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1087e84:
-// 0x01087e84: 0x1087e84: lui   s5, 0x0
+L_10884a8:
+// 0x010884a8: 0x10884a8: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01087e88: 0x1087e88: addiu s5, s5, 30268
+// 0x010884ac: 0x10884ac: addiu s5, s5, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc 12
-// 0x01087e8c: 0x1087e8c: addiu s3, sp, 44
+// 0x010884b0: 0x10884b0: addiu s3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 9
-// 0x01087e90: 0x1087e90: addu  s2, zero, zero
+// 0x010884b4: 0x10884b4: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01087e94: 0x1087e94: j	 0x1087ef8 addiu s4, sp, 40
+// 0x010884b8: 0x10884b8: j	 0x108851c addiu s4, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 14
-	br L_1087ef8
+	br L_108851c
 // --- basic block ---
-L_1087e9c:
-// 0x01087e9c: 0x1087e9c: jal   0x106855c sw    t0, 16(sp)
+L_10884c0:
+// 0x010884c0: 0x10884c0: jal   0x106856c sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6928,45 +6928,45 @@ L_1087e9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087ea4: 0x1087ea4: addu  s0, v0, zero
+// 0x010884c8: 0x10884c8: addu  s0, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01087ea8: 0x1087ea8: bne   s0, zero, 0x1087edc slti  v0, s2, 200
+// 0x010884cc: 0x10884cc: bne   s0, zero, 0x1088500 slti  v0, s2, 200
 	ldloc 11
 	ldloc 8
 	ldc.i4 200
 	clt
 	stloc 5
-	brtrue L_1087edc
+	brtrue L_1088500
 // --- basic block ---
-// 0x01087eb0: 0x1087eb0: lui   a1, 0x20000
+// 0x010884d4: 0x10884d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087eb4: 0x1087eb4: lui   a3, 0x20000
+// 0x010884d8: 0x10884d8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087eb8: 0x1087eb8: addiu a1, a1, -21512
+// 0x010884dc: 0x10884dc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087ebc: 0x1087ebc: addiu a3, a3, -16628
+// 0x010884e0: 0x10884e0: addiu a3, a3, -16164
 	ldloc 4
-	ldc.i4 -16628
+	ldc.i4 -16164
 	add
 	stloc 4
-// 0x01087ec0: 0x1087ec0: addiu a0, zero, 4
+// 0x010884e4: 0x10884e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087ec4: 0x1087ec4: addiu a2, zero, 2476
+// 0x010884e8: 0x10884e8: addiu a2, zero, 2476
 	ldc.i4 2476
 	stloc.3
-// 0x01087ec8: 0x1087ec8: jal   0x100449c sw    s2, 16(sp)
+// 0x010884ec: 0x10884ec: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6985,25 +6985,25 @@ L_1087e9c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087ed0: 0x1087ed0: addiu v0, zero, 18
+// 0x010884f4: 0x10884f4: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_1087ed4:
-// 0x01087ed4: 0x1087ed4: j	 0x1087f44 sw    v0, 0(s1)
+L_10884f8:
+// 0x010884f8: 0x10884f8: j	 0x1088568 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1087f44
+	br L_1088568
 // --- basic block ---
-L_1087edc:
-// 0x01087edc: 0x1087edc: beq   v0, zero, 0x1087ef0 sll   zero, zero, 0
+L_1088500:
+// 0x01088500: 0x1088500: beq   v0, zero, 0x1088514 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1087ef0
+	brfalse L_1088514
 // --- basic block ---
-// 0x01087ee4: 0x1087ee4: lw    v0, 40(sp)
+// 0x01088508: 0x1088508: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7012,27 +7012,27 @@ L_1087edc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087ee8: 0x1087ee8: sll   zero, zero, 0
-// 0x01087eec: 0x1087eec: sw    v0, 0(s3)
+// 0x0108850c: 0x108850c: sll   zero, zero, 0
+// 0x01088510: 0x1088510: sw    v0, 0(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1087ef0:
-// 0x01087ef0: 0x1087ef0: addiu s2, s2, 1
+L_1088514:
+// 0x01088514: 0x1088514: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01087ef4: 0x1087ef4: addiu s3, s3, 4
+// 0x01088518: 0x1088518: addiu s3, s3, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_1087ef8:
-// 0x01087ef8: 0x1087ef8: lw    v0, 28(sp)
+L_108851c:
+// 0x0108851c: 0x108851c: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7041,51 +7041,51 @@ L_1087ef8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01087efc: 0x1087efc: addu  a0, s0, zero
+// 0x01088520: 0x1088520: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01087f00: 0x1087f00: addiu t0, v0, -1
+// 0x01088524: 0x1088524: addiu t0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x01087f04: 0x1087f04: slt   t0, s2, t0
+// 0x01088528: 0x1088528: slt   t0, s2, t0
 	ldloc 8
 	ldloc 10
 	clt
 	stloc 10
-// 0x01087f08: 0x1087f08: sltiu t0, t0, 1
+// 0x0108852c: 0x108852c: sltiu t0, t0, 1
 	ldloc 10
 	ldc.i4.1
 	clt.un
 	stloc 10
-// 0x01087f0c: 0x1087f0c: subu  t0, zero, t0
+// 0x01088530: 0x1088530: subu  t0, zero, t0
 	ldloc 10
 	neg
 	stloc 10
-// 0x01087f10: 0x1087f10: slt   v1, s2, v0
+// 0x01088534: 0x1088534: slt   v1, s2, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 7
-// 0x01087f14: 0x1087f14: ori   t0, t0, 1
+// 0x01088538: 0x1088538: ori   t0, t0, 1
 	ldloc 10
 	ldc.i4.1
 	or
 	stloc 10
-// 0x01087f18: 0x1087f18: addu  a1, s5, zero
+// 0x0108853c: 0x108853c: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x01087f1c: 0x1087f1c: addu  a2, zero, zero
+// 0x01088540: 0x1088540: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087f20: 0x1087f20: bne   v1, zero, 0x1087e9c addu  a3, s4, zero
+// 0x01088544: 0x1088544: bne   v1, zero, 0x10884c0 addu  a3, s4, zero
 	ldloc 7
 	ldloc 14
 	stloc 4
-	brtrue L_1087e9c
+	brtrue L_10884c0
 // --- basic block ---
-// 0x01087f28: 0x1087f28: lw    a0, 24(sp)
+// 0x0108854c: 0x108854c: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7094,7 +7094,7 @@ L_1087ef8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087f2c: 0x1087f2c: lw    a1, 32(sp)
+// 0x01088550: 0x1088550: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7103,7 +7103,7 @@ L_1087ef8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01087f30: 0x1087f30: lw    a2, 36(sp)
+// 0x01088554: 0x1088554: lw    a2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7112,15 +7112,15 @@ L_1087ef8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01087f34: 0x1087f34: addu  a3, v0, zero
+// 0x01088558: 0x1088558: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01087f38: 0x1087f38: addiu v0, sp, 44
+// 0x0108855c: 0x108855c: addiu v0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 5
-// 0x01087f3c: 0x1087f3c: jal   0x10839f4 sw    v0, 16(sp)
+// 0x01088560: 0x1088560: jal   0x1084018 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7134,17 +7134,17 @@ L_1087ef8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RTTrafficInfo_AddSegments_10839f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RTTrafficInfo_AddSegments_1084018(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1087f44:
-// 0x01087f44: 0x1087f44: lw    ra, 876(sp)
-// 0x01087f48: 0x1087f48: addu  v0, s0, zero
+L_1088568:
+// 0x01088568: 0x1088568: lw    ra, 876(sp)
+// 0x0108856c: 0x108856c: addu  v0, s0, zero
 	ldloc 11
 	stloc 5
-// 0x01087f4c: 0x1087f4c: lw    s5, 872(sp)
+// 0x01088570: 0x1088570: lw    s5, 872(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7153,7 +7153,7 @@ L_1087f44:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01087f50: 0x1087f50: lw    s4, 868(sp)
+// 0x01088574: 0x1088574: lw    s4, 868(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7162,7 +7162,7 @@ L_1087f44:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01087f54: 0x1087f54: lw    s3, 864(sp)
+// 0x01088578: 0x1088578: lw    s3, 864(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7171,7 +7171,7 @@ L_1087f44:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01087f58: 0x1087f58: lw    s2, 860(sp)
+// 0x0108857c: 0x108857c: lw    s2, 860(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7180,7 +7180,7 @@ L_1087f44:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01087f5c: 0x1087f5c: lw    s1, 856(sp)
+// 0x01088580: 0x1088580: lw    s1, 856(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7189,7 +7189,7 @@ L_1087f44:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01087f60: 0x1087f60: lw    s0, 852(sp)
+// 0x01088584: 0x1088584: lw    s0, 852(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7198,7 +7198,7 @@ L_1087f44:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01087f64: 0x1087f64: jr    ra addiu sp, sp, 880
+// 0x01088588: 0x1088588: jr    ra addiu sp, sp, 880
 	ldloc.0
 	ldc.i4 880
 	add
diff --git a/converted/Cibyl102.j b/converted/Cibyl102.j
index f150c91..16b767b 100644
--- a/converted/Cibyl102.j
+++ b/converted/Cibyl102.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl102::.ctor
 
-.method public static int32 RoadInfoGeom_1087f6c(int32,int32,int32,int32,int32)
+.method public static int32 RoadInfoGeom_1088590(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s4,int32 s2,int32 s5,int32 s6,int32 s3,int32 s7,int32 s8,int32 ra)
@@ -103,13 +103,13 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1087f6c:
-// 0x01087f6c: 0x1087f6c: addiu sp, sp, -80
+L_1088590:
+// 0x01088590: 0x1088590: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01087f70: 0x1087f70: sw    s1, 44(sp)
+// 0x01088594: 0x1088594: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -118,10 +118,10 @@ L_1087f6c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01087f74: 0x1087f74: lui   s1, 0x0
+// 0x01088598: 0x1088598: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01087f78: 0x1087f78: sw    s3, 52(sp)
+// 0x0108859c: 0x108859c: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -130,7 +130,7 @@ L_1087f6c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01087f7c: 0x1087f7c: sw    s0, 40(sp)
+// 0x010885a0: 0x10885a0: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -139,26 +139,26 @@ L_1087f6c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01087f80: 0x1087f80: addu  s3, a3, zero
+// 0x010885a4: 0x10885a4: addu  s3, a3, zero
 	ldloc 4
 	stloc 14
-// 0x01087f84: 0x1087f84: addiu s0, zero, 1
+// 0x010885a8: 0x10885a8: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01087f88: 0x1087f88: addiu a1, s1, 28076
+// 0x010885ac: 0x10885ac: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01087f8c: 0x1087f8c: addu  a2, zero, zero
+// 0x010885b0: 0x10885b0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01087f90: 0x1087f90: addiu a3, sp, 24
+// 0x010885b4: 0x10885b4: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01087f94: 0x1087f94: sw    s4, 56(sp)
+// 0x010885b8: 0x10885b8: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -167,8 +167,8 @@ L_1087f6c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01087f98: 0x1087f98: sw    ra, 76(sp)
-// 0x01087f9c: 0x1087f9c: sw    s8, 72(sp)
+// 0x010885bc: 0x10885bc: sw    ra, 76(sp)
+// 0x010885c0: 0x10885c0: sw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -177,7 +177,7 @@ L_1087f6c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01087fa0: 0x1087fa0: sw    s7, 68(sp)
+// 0x010885c4: 0x10885c4: sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -186,7 +186,7 @@ L_1087f6c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01087fa4: 0x1087fa4: sw    s6, 64(sp)
+// 0x010885c8: 0x10885c8: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -195,7 +195,7 @@ L_1087f6c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01087fa8: 0x1087fa8: sw    s5, 60(sp)
+// 0x010885cc: 0x10885cc: sw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -204,7 +204,7 @@ L_1087f6c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01087fac: 0x1087fac: sw    s2, 48(sp)
+// 0x010885d0: 0x10885d0: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -213,7 +213,7 @@ L_1087f6c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01087fb0: 0x1087fb0: jal   0x106855c sw    s0, 16(sp)
+// 0x010885d4: 0x10885d4: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -227,18 +227,18 @@ L_1087f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087fb8: 0x1087fb8: beq   v0, zero, 0x1087fd0 addu  s4, v0, zero
+// 0x010885dc: 0x10885dc: beq   v0, zero, 0x10885f4 addu  s4, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_1087fd0
+	brfalse L_10885f4
 // --- basic block ---
-// 0x01087fc0: 0x1087fc0: lw    a0, 24(sp)
+// 0x010885e4: 0x10885e4: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -247,35 +247,35 @@ L_1087f6c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01087fc4: 0x1087fc4: addiu v0, zero, -1
+// 0x010885e8: 0x10885e8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01087fc8: 0x1087fc8: bne   a0, v0, 0x1087ff4 sll   zero, zero, 0
+// 0x010885ec: 0x10885ec: bne   a0, v0, 0x1088618 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_1087ff4
+	bne.un L_1088618
 // --- basic block ---
-L_1087fd0:
-// 0x01087fd0: 0x1087fd0: lui   a1, 0x20000
+L_10885f4:
+// 0x010885f4: 0x10885f4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01087fd4: 0x1087fd4: lui   a3, 0x20000
+// 0x010885f8: 0x10885f8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01087fd8: 0x1087fd8: addiu a1, a1, -21512
+// 0x010885fc: 0x10885fc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01087fdc: 0x1087fdc: addiu a3, a3, -16896
+// 0x01088600: 0x1088600: addiu a3, a3, -16432
 	ldloc 4
-	ldc.i4 -16896
+	ldc.i4 -16432
 	add
 	stloc 4
-// 0x01087fe0: 0x1087fe0: addiu a0, zero, 4
+// 0x01088604: 0x1088604: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01087fe4: 0x1087fe4: jal   0x100449c addiu a2, zero, 2295
+// 0x01088608: 0x1088608: jal   0x100449c addiu a2, zero, 2295
 	ldc.i4 2295
 	stloc.3
 	ldloc.0
@@ -288,48 +288,48 @@ L_1087fd0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087fec: 0x1087fec: j	 0x1088024 addiu v0, zero, 18
+// 0x01088610: 0x1088610: j	 0x1088648 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1088024
+	br L_1088648
 // --- basic block ---
-L_1087ff4:
-// 0x01087ff4: 0x1087ff4: jal   0x10828ac sll   zero, zero, 0
+L_1088618:
+// 0x01088618: 0x1088618: jal   0x1082ed0 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_RecordByID_10828ac(int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_RecordByID_1082ed0(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01087ffc: 0x1087ffc: bne   v0, zero, 0x1088030 addu  s2, v0, zero
+// 0x01088620: 0x1088620: bne   v0, zero, 0x1088654 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brtrue L_1088030
+	brtrue L_1088654
 // --- basic block ---
-// 0x01088004: 0x1088004: lui   a1, 0x20000
+// 0x01088628: 0x1088628: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088008: 0x1088008: lui   a3, 0x20000
+// 0x0108862c: 0x108862c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108800c: 0x108800c: addiu a1, a1, -21512
+// 0x01088630: 0x1088630: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088010: 0x1088010: addiu a3, a3, -16584
+// 0x01088634: 0x1088634: addiu a3, a3, -16120
 	ldloc 4
-	ldc.i4 -16584
+	ldc.i4 -16120
 	add
 	stloc 4
-// 0x01088014: 0x1088014: addiu a0, zero, 4
+// 0x01088638: 0x1088638: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088018: 0x1088018: jal   0x100449c addiu a2, zero, 2304
+// 0x0108863c: 0x108863c: jal   0x100449c addiu a2, zero, 2304
 	ldc.i4 2304
 	stloc.3
 	ldloc.0
@@ -342,40 +342,40 @@ L_1087ff4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088020: 0x1088020: addiu v0, zero, 19
+// 0x01088644: 0x1088644: addiu v0, zero, 19
 	ldc.i4.s 19
 	stloc 5
-L_1088024:
-// 0x01088024: 0x1088024: sw    v0, 0(s3)
+L_1088648:
+// 0x01088648: 0x1088648: sw    v0, 0(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01088028: 0x1088028: j	 0x108820c addu  s0, zero, zero
+// 0x0108864c: 0x108864c: j	 0x1088830 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_108820c
+	br L_1088830
 // --- basic block ---
-L_1088030:
-// 0x01088030: 0x1088030: addu  a0, s4, zero
+L_1088654:
+// 0x01088654: 0x1088654: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x01088034: 0x1088034: addiu a1, s1, 28076
+// 0x01088658: 0x1088658: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01088038: 0x1088038: addu  a2, zero, zero
+// 0x0108865c: 0x108865c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108803c: 0x108803c: addiu a3, sp, 28
+// 0x01088660: 0x1088660: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01088040: 0x1088040: jal   0x106855c sw    s0, 16(sp)
+// 0x01088664: 0x1088664: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -389,37 +389,37 @@ L_1088030:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088048: 0x1088048: bne   v0, zero, 0x1088074 addu  s0, v0, zero
+// 0x0108866c: 0x108866c: bne   v0, zero, 0x1088698 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1088074
+	brtrue L_1088698
 // --- basic block ---
-// 0x01088050: 0x1088050: lui   a1, 0x20000
+// 0x01088674: 0x1088674: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088054: 0x1088054: lui   a3, 0x20000
+// 0x01088678: 0x1088678: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088058: 0x1088058: addiu a1, a1, -21512
+// 0x0108867c: 0x108867c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108805c: 0x108805c: addiu a3, a3, -16536
+// 0x01088680: 0x1088680: addiu a3, a3, -16072
 	ldloc 4
-	ldc.i4 -16536
+	ldc.i4 -16072
 	add
 	stloc 4
-// 0x01088060: 0x1088060: addiu a0, zero, 4
+// 0x01088684: 0x1088684: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088064: 0x1088064: jal   0x100449c addiu a2, zero, 2318
+// 0x01088688: 0x1088688: jal   0x100449c addiu a2, zero, 2318
 	ldc.i4 2318
 	stloc.3
 	ldloc.0
@@ -432,13 +432,13 @@ L_1088030:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108806c: 0x108806c: j	 0x10881a4 addiu v0, zero, 18
+// 0x01088690: 0x1088690: j	 0x10887c8 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_10881a4
+	br L_10887c8
 // --- basic block ---
-L_1088074:
-// 0x01088074: 0x1088074: lw    v0, 28(sp)
+L_1088698:
+// 0x01088698: 0x1088698: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -447,48 +447,48 @@ L_1088074:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088078: 0x1088078: sll   zero, zero, 0
-// 0x0108807c: 0x108807c: slti  v1, v0, 2
+// 0x0108869c: 0x108869c: sll   zero, zero, 0
+// 0x010886a0: 0x10886a0: slti  v1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 7
-// 0x01088080: 0x1088080: bne   v1, zero, 0x1088090 andi  v1, v0, 1
+// 0x010886a4: 0x10886a4: bne   v1, zero, 0x10886b4 andi  v1, v0, 1
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 7
-	brtrue L_1088090
+	brtrue L_10886b4
 // --- basic block ---
-// 0x01088088: 0x1088088: beq   v1, zero, 0x10880b8 sll   zero, zero, 0
+// 0x010886ac: 0x10886ac: beq   v1, zero, 0x10886dc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10880b8
+	brfalse L_10886dc
 // --- basic block ---
-L_1088090:
-// 0x01088090: 0x1088090: lui   a1, 0x20000
+L_10886b4:
+// 0x010886b4: 0x10886b4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088094: 0x1088094: lui   a3, 0x20000
+// 0x010886b8: 0x10886b8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088098: 0x1088098: addiu a1, a1, -21512
+// 0x010886bc: 0x10886bc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108809c: 0x108809c: addiu a3, a3, -16492
+// 0x010886c0: 0x10886c0: addiu a3, a3, -16028
 	ldloc 4
-	ldc.i4 -16492
+	ldc.i4 -16028
 	add
 	stloc 4
-// 0x010880a0: 0x10880a0: addiu a0, zero, 4
+// 0x010886c4: 0x10886c4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010880a4: 0x10880a4: addiu a2, zero, 2325
+// 0x010886c8: 0x10886c8: addiu a2, zero, 2325
 	ldc.i4 2325
 	stloc.3
-// 0x010880a8: 0x10880a8: jal   0x100449c sw    v0, 16(sp)
+// 0x010886cc: 0x10886cc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -507,23 +507,23 @@ L_1088090:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010880b0: 0x10880b0: j	 0x1088024 addiu v0, zero, 18
+// 0x010886d4: 0x10886d4: j	 0x1088648 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1088024
+	br L_1088648
 // --- basic block ---
-L_10880b8:
-// 0x010880b8: 0x10880b8: sra   v0, v0, 1
+L_10886dc:
+// 0x010886dc: 0x10886dc: sra   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shr
 	stloc 5
-// 0x010880bc: 0x10880bc: slti  v1, v0, 201
+// 0x010886e0: 0x10886e0: slti  v1, v0, 201
 	ldloc 5
 	ldc.i4 201
 	clt
 	stloc 7
-// 0x010880c0: 0x10880c0: bne   v1, zero, 0x10880f0 sw    v0, 28(sp)
+// 0x010886e4: 0x10886e4: bne   v1, zero, 0x1088714 sw    v0, 28(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -533,15 +533,15 @@ L_10880b8:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10880f0
+	brtrue L_1088714
 // --- basic block ---
-// 0x010880c8: 0x10880c8: lui   a1, 0x20000
+// 0x010886ec: 0x10886ec: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010880cc: 0x10880cc: lui   a3, 0x20000
+// 0x010886f0: 0x10886f0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010880d0: 0x10880d0: sw    v0, 16(sp)
+// 0x010886f4: 0x10886f4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -550,7 +550,7 @@ L_10880b8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010880d4: 0x10880d4: lw    v0, 24(sp)
+// 0x010886f8: 0x10886f8: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -559,23 +559,23 @@ L_10880b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010880d8: 0x10880d8: addiu a1, a1, -21512
+// 0x010886fc: 0x10886fc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010880dc: 0x10880dc: addiu a3, a3, -16440
+// 0x01088700: 0x1088700: addiu a3, a3, -15976
 	ldloc 4
-	ldc.i4 -16440
+	ldc.i4 -15976
 	add
 	stloc 4
-// 0x010880e0: 0x10880e0: addiu a0, zero, 3
+// 0x01088704: 0x1088704: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010880e4: 0x10880e4: addiu a2, zero, 2336
+// 0x01088708: 0x1088708: addiu a2, zero, 2336
 	ldc.i4 2336
 	stloc.3
-// 0x010880e8: 0x10880e8: jal   0x100449c sw    v0, 20(sp)
+// 0x0108870c: 0x108870c: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -594,8 +594,8 @@ L_10880b8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10880f0:
-// 0x010880f0: 0x10880f0: sw    zero, 824(s2)
+L_1088714:
+// 0x01088714: 0x1088714: sw    zero, 824(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -604,30 +604,30 @@ L_10880f0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010880f4: 0x10880f4: addu  s4, s2, zero
+// 0x01088718: 0x1088718: addu  s4, s2, zero
 	ldloc 11
 	stloc 10
-// 0x010880f8: 0x10880f8: addu  s6, zero, zero
+// 0x0108871c: 0x108871c: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010880fc: 0x10880fc: addu  s5, zero, zero
+// 0x01088720: 0x1088720: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x01088100: 0x1088100: addu  s1, zero, zero
+// 0x01088724: 0x1088724: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01088104: 0x1088104: addiu s8, zero, 1
+// 0x01088728: 0x1088728: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x01088108: 0x1088108: j	 0x10881e4 addiu s7, sp, 36
+// 0x0108872c: 0x108872c: j	 0x1088808 addiu s7, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 15
-	br L_10881e4
+	br L_1088808
 // --- basic block ---
-L_1088110:
-// 0x01088110: 0x1088110: jal   0x106855c sw    s8, 16(sp)
+L_1088734:
+// 0x01088734: 0x1088734: jal   0x106856c sw    s8, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -641,60 +641,60 @@ L_1088110:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088118: 0x1088118: lui   a1, 0x0
+// 0x0108873c: 0x108873c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108811c: 0x108811c: addu  s0, v0, zero
+// 0x01088740: 0x1088740: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01088120: 0x1088120: addu  a0, v0, zero
+// 0x01088744: 0x1088744: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088124: 0x1088124: addiu a1, a1, 30268
+// 0x01088748: 0x1088748: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01088128: 0x1088128: addu  a2, zero, zero
+// 0x0108874c: 0x108874c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108812c: 0x108812c: bne   v0, zero, 0x1088150 addu  a3, s7, zero
+// 0x01088750: 0x1088750: bne   v0, zero, 0x1088774 addu  a3, s7, zero
 	ldloc 5
 	ldloc 15
 	stloc 4
-	brtrue L_1088150
+	brtrue L_1088774
 // --- basic block ---
-// 0x01088134: 0x1088134: lui   a1, 0x20000
+// 0x01088758: 0x1088758: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088138: 0x1088138: lui   a3, 0x20000
+// 0x0108875c: 0x108875c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108813c: 0x108813c: addiu a1, a1, -21512
+// 0x01088760: 0x1088760: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088140: 0x1088140: addiu a3, a3, -16400
+// 0x01088764: 0x1088764: addiu a3, a3, -15936
 	ldloc 4
-	ldc.i4 -16400
+	ldc.i4 -15936
 	add
 	stloc 4
-// 0x01088144: 0x1088144: addiu a0, zero, 4
+// 0x01088768: 0x1088768: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088148: 0x1088148: j	 0x1088198 addiu a2, zero, 2350
+// 0x0108876c: 0x108876c: j	 0x10887bc addiu a2, zero, 2350
 	ldc.i4 2350
 	stloc.3
-	br L_1088198
+	br L_10887bc
 // --- basic block ---
-L_1088150:
-// 0x01088150: 0x1088150: lw    v0, 28(sp)
+L_1088774:
+// 0x01088774: 0x1088774: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -703,32 +703,32 @@ L_1088150:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088154: 0x1088154: sll   zero, zero, 0
-// 0x01088158: 0x1088158: addiu v0, v0, -1
+// 0x01088778: 0x1088778: sll   zero, zero, 0
+// 0x0108877c: 0x108877c: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0108815c: 0x108815c: slt   v0, s1, v0
+// 0x01088780: 0x1088780: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01088160: 0x1088160: sltiu v0, v0, 1
+// 0x01088784: 0x1088784: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01088164: 0x1088164: subu  v0, zero, v0
+// 0x01088788: 0x1088788: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x01088168: 0x1088168: ori   v0, v0, 1
+// 0x0108878c: 0x108878c: ori   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 5
-// 0x0108816c: 0x108816c: jal   0x106855c sw    v0, 16(sp)
+// 0x01088790: 0x1088790: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -742,46 +742,46 @@ L_1088150:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088174: 0x1088174: addu  s0, v0, zero
+// 0x01088798: 0x1088798: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01088178: 0x1088178: bne   s0, zero, 0x10881ac slti  v0, s1, 200
+// 0x0108879c: 0x108879c: bne   s0, zero, 0x10887d0 slti  v0, s1, 200
 	ldloc 8
 	ldloc 9
 	ldc.i4 200
 	clt
 	stloc 5
-	brtrue L_10881ac
+	brtrue L_10887d0
 // --- basic block ---
-// 0x01088180: 0x1088180: lui   a1, 0x20000
+// 0x010887a4: 0x10887a4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088184: 0x1088184: lui   a3, 0x20000
+// 0x010887a8: 0x10887a8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088188: 0x1088188: addiu a1, a1, -21512
+// 0x010887ac: 0x10887ac: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108818c: 0x108818c: addiu a3, a3, -16400
+// 0x010887b0: 0x10887b0: addiu a3, a3, -15936
 	ldloc 4
-	ldc.i4 -16400
+	ldc.i4 -15936
 	add
 	stloc 4
-// 0x01088190: 0x1088190: addiu a0, zero, 4
+// 0x010887b4: 0x10887b4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088194: 0x1088194: addiu a2, zero, 2363
+// 0x010887b8: 0x10887b8: addiu a2, zero, 2363
 	ldc.i4 2363
 	stloc.3
-L_1088198:
-// 0x01088198: 0x1088198: jal   0x100449c sw    s1, 16(sp)
+L_10887bc:
+// 0x010887bc: 0x10887bc: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -800,21 +800,21 @@ L_1088198:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010881a0: 0x10881a0: addiu v0, zero, 18
+// 0x010887c4: 0x10887c4: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_10881a4:
-// 0x010881a4: 0x10881a4: j	 0x108820c sw    v0, 0(s3)
+L_10887c8:
+// 0x010887c8: 0x10887c8: j	 0x1088830 sw    v0, 0(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_108820c
+	br L_1088830
 // --- basic block ---
-L_10881ac:
-// 0x010881ac: 0x10881ac: lw    v1, 36(sp)
+L_10887d0:
+// 0x010887d0: 0x10887d0: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -823,13 +823,13 @@ L_10881ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010881b0: 0x10881b0: sll   zero, zero, 0
-// 0x010881b4: 0x10881b4: addu  s6, s6, v1
+// 0x010887d4: 0x10887d4: sll   zero, zero, 0
+// 0x010887d8: 0x10887d8: addu  s6, s6, v1
 	ldloc 13
 	ldloc 7
 	add
 	stloc 13
-// 0x010881b8: 0x10881b8: lw    v1, 32(sp)
+// 0x010887dc: 0x10887dc: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -838,15 +838,15 @@ L_10881ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010881bc: 0x10881bc: beq   v0, zero, 0x10881dc addu  s5, s5, v1
+// 0x010887e0: 0x10887e0: beq   v0, zero, 0x1088800 addu  s5, s5, v1
 	ldloc 5
 	ldloc 12
 	ldloc 7
 	add
 	stloc 12
-	brfalse L_10881dc
+	brfalse L_1088800
 // --- basic block ---
-// 0x010881c4: 0x10881c4: sw    s5, 828(s4)
+// 0x010887e8: 0x10887e8: sw    s5, 828(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -855,7 +855,7 @@ L_10881ac:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010881c8: 0x10881c8: sw    s6, 832(s4)
+// 0x010887ec: 0x10887ec: sw    s6, 832(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -864,7 +864,7 @@ L_10881ac:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010881cc: 0x10881cc: lw    v0, 824(s2)
+// 0x010887f0: 0x10887f0: lw    v0, 824(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -873,13 +873,13 @@ L_10881ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010881d0: 0x10881d0: sll   zero, zero, 0
-// 0x010881d4: 0x10881d4: addiu v0, v0, 1
+// 0x010887f4: 0x10887f4: sll   zero, zero, 0
+// 0x010887f8: 0x10887f8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010881d8: 0x10881d8: sw    v0, 824(s2)
+// 0x010887fc: 0x10887fc: sw    v0, 824(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -888,19 +888,19 @@ L_10881ac:
 	add
 	ldloc 5
 	stelem.i4
-L_10881dc:
-// 0x010881dc: 0x10881dc: addiu s1, s1, 1
+L_1088800:
+// 0x01088800: 0x1088800: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010881e0: 0x10881e0: addiu s4, s4, 8
+// 0x01088804: 0x1088804: addiu s4, s4, 8
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc 10
-L_10881e4:
-// 0x010881e4: 0x10881e4: lw    v0, 28(sp)
+L_1088808:
+// 0x01088808: 0x1088808: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -909,34 +909,34 @@ L_10881e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010881e8: 0x10881e8: lui   a1, 0x0
+// 0x0108880c: 0x108880c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010881ec: 0x10881ec: slt   v0, s1, v0
+// 0x01088810: 0x1088810: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x010881f0: 0x10881f0: addu  a0, s0, zero
+// 0x01088814: 0x1088814: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010881f4: 0x10881f4: addiu a1, a1, 28076
+// 0x01088818: 0x1088818: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010881f8: 0x10881f8: addu  a2, zero, zero
+// 0x0108881c: 0x108881c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010881fc: 0x10881fc: bne   v0, zero, 0x1088110 addiu a3, sp, 32
+// 0x01088820: 0x1088820: bne   v0, zero, 0x1088734 addiu a3, sp, 32
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-	brtrue L_1088110
+	brtrue L_1088734
 // --- basic block ---
-// 0x01088204: 0x1088204: jal   0x10830dc addu  a0, s2, zero
+// 0x01088828: 0x1088828: jal   0x1083700 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -944,17 +944,17 @@ L_10881e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_UpdateGeometry_10830dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_UpdateGeometry_1083700(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108820c:
-// 0x0108820c: 0x108820c: lw    ra, 76(sp)
-// 0x01088210: 0x1088210: addu  v0, s0, zero
+L_1088830:
+// 0x01088830: 0x1088830: lw    ra, 76(sp)
+// 0x01088834: 0x1088834: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01088214: 0x1088214: lw    s8, 72(sp)
+// 0x01088838: 0x1088838: lw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -963,7 +963,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01088218: 0x1088218: lw    s7, 68(sp)
+// 0x0108883c: 0x108883c: lw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -972,7 +972,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108821c: 0x108821c: lw    s6, 64(sp)
+// 0x01088840: 0x1088840: lw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -981,7 +981,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01088220: 0x1088220: lw    s5, 60(sp)
+// 0x01088844: 0x1088844: lw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -990,7 +990,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01088224: 0x1088224: lw    s4, 56(sp)
+// 0x01088848: 0x1088848: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -999,7 +999,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01088228: 0x1088228: lw    s3, 52(sp)
+// 0x0108884c: 0x108884c: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1008,7 +1008,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108822c: 0x108822c: lw    s2, 48(sp)
+// 0x01088850: 0x1088850: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1017,7 +1017,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01088230: 0x1088230: lw    s1, 44(sp)
+// 0x01088854: 0x1088854: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1026,7 +1026,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01088234: 0x1088234: lw    s0, 40(sp)
+// 0x01088858: 0x1088858: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1035,7 +1035,7 @@ L_108820c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01088238: 0x1088238: jr    ra addiu sp, sp, 80
+// 0x0108885c: 0x108885c: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -1047,7 +1047,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 AddRoadInfo_1088240(int32,int32,int32,int32,int32)
+.method public static int32 AddRoadInfo_1088864(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s3,int32 s0,int32 ra)
@@ -1094,13 +1094,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1088240:
-// 0x01088240: 0x1088240: addiu sp, sp, -2776
+L_1088864:
+// 0x01088864: 0x1088864: addiu sp, sp, -2776
 	ldloc.0
 	ldc.i4 -2776
 	add
 	stloc.0
-// 0x01088244: 0x1088244: sw    s1, 2760(sp)
+// 0x01088868: 0x1088868: sw    s1, 2760(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1109,12 +1109,12 @@ L_1088240:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01088248: 0x1088248: addiu s1, sp, 40
+// 0x0108886c: 0x108886c: addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x0108824c: 0x108824c: sw    s3, 2768(sp)
+// 0x01088870: 0x1088870: sw    s3, 2768(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ L_1088240:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01088250: 0x1088250: sw    s2, 2764(sp)
+// 0x01088874: 0x1088874: sw    s2, 2764(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1132,16 +1132,16 @@ L_1088240:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01088254: 0x1088254: addu  s3, a0, zero
+// 0x01088878: 0x1088878: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01088258: 0x1088258: lui   s2, 0x0
+// 0x0108887c: 0x108887c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0108825c: 0x108825c: addu  a0, s1, zero
+// 0x01088880: 0x1088880: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01088260: 0x1088260: sw    s0, 2756(sp)
+// 0x01088884: 0x1088884: sw    s0, 2756(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1150,32 +1150,32 @@ L_1088240:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01088264: 0x1088264: sw    ra, 2772(sp)
-// 0x01088268: 0x1088268: jal   0x1082848 addu  s0, a3, zero
+// 0x01088888: 0x1088888: sw    ra, 2772(sp)
+// 0x0108888c: 0x108888c: jal   0x1082e6c addu  s0, a3, zero
 	ldloc 4
 	stloc 11
 	ldloc.1
-	call int32 Cibyl98::RTTrafficInfo_InitRecord_1082848(int32)
+	call int32 Cibyl98::RTTrafficInfo_InitRecord_1082e6c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01088270: 0x1088270: addu  a3, s1, zero
+// 0x01088894: 0x1088894: addu  a3, s1, zero
 	ldloc 8
 	stloc 4
-// 0x01088274: 0x1088274: addu  a0, s3, zero
+// 0x01088898: 0x1088898: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01088278: 0x1088278: addiu s1, zero, 1
+// 0x0108889c: 0x108889c: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0108827c: 0x108827c: addiu a1, s2, 28076
+// 0x010888a0: 0x10888a0: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01088280: 0x1088280: addu  a2, zero, zero
+// 0x010888a4: 0x10888a4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01088284: 0x1088284: jal   0x106855c sw    s1, 16(sp)
+// 0x010888a8: 0x10888a8: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1189,29 +1189,29 @@ L_1088240:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108828c: 0x108828c: beq   v0, zero, 0x10882b4 lui   a1, 0x20000
+// 0x010888b0: 0x10888b0: beq   v0, zero, 0x10888d8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10882b4
+	brfalse L_10888d8
 // --- basic block ---
-// 0x01088294: 0x1088294: lb    v1, 0(v0)
+// 0x010888b8: 0x10888b8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088298: 0x1088298: sll   zero, zero, 0
-// 0x0108829c: 0x108829c: beq   v1, zero, 0x10882b4 addiu v1, zero, -1
+// 0x010888bc: 0x10888bc: sll   zero, zero, 0
+// 0x010888c0: 0x10888c0: beq   v1, zero, 0x10888d8 addiu v1, zero, -1
 	ldloc 7
 	ldc.i4.m1
 	stloc 7
-	brfalse L_10882b4
+	brfalse L_10888d8
 // --- basic block ---
-// 0x010882a4: 0x10882a4: lw    a0, 40(sp)
+// 0x010888c8: 0x10888c8: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1220,52 +1220,52 @@ L_1088240:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010882a8: 0x10882a8: sll   zero, zero, 0
-// 0x010882ac: 0x10882ac: bne   a0, v1, 0x10882cc sll   zero, zero, 0
+// 0x010888cc: 0x10888cc: sll   zero, zero, 0
+// 0x010888d0: 0x10888d0: bne   a0, v1, 0x10888f0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10882cc
+	bne.un L_10888f0
 // --- basic block ---
-L_10882b4:
-// 0x010882b4: 0x10882b4: lui   a3, 0x20000
+L_10888d8:
+// 0x010888d8: 0x10888d8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010882b8: 0x10882b8: addiu a1, a1, -21512
+// 0x010888dc: 0x10888dc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010882bc: 0x10882bc: addiu a3, a3, -16352
+// 0x010888e0: 0x10888e0: addiu a3, a3, -15888
 	ldloc 4
-	ldc.i4 -16352
+	ldc.i4 -15888
 	add
 	stloc 4
-// 0x010882c0: 0x10882c0: addiu a0, zero, 4
+// 0x010888e4: 0x10888e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010882c4: 0x10882c4: j	 0x1088314 addiu a2, zero, 2092
+// 0x010888e8: 0x10888e8: j	 0x1088938 addiu a2, zero, 2092
 	ldc.i4 2092
 	stloc.3
-	br L_1088314
+	br L_1088938
 // --- basic block ---
-L_10882cc:
-// 0x010882cc: 0x10882cc: addu  a0, v0, zero
+L_10888f0:
+// 0x010888f0: 0x10888f0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010882d0: 0x10882d0: addiu a1, s2, 28076
+// 0x010888f4: 0x10888f4: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010882d4: 0x10882d4: addu  a2, zero, zero
+// 0x010888f8: 0x10888f8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010882d8: 0x10882d8: addiu a3, sp, 28
+// 0x010888fc: 0x10888fc: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010882dc: 0x10882dc: jal   0x106855c sw    s1, 16(sp)
+// 0x01088900: 0x1088900: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1279,51 +1279,51 @@ L_10882cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010882e4: 0x10882e4: beq   v0, zero, 0x10882fc addu  s3, v0, zero
+// 0x01088908: 0x1088908: beq   v0, zero, 0x1088920 addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_10882fc
+	brfalse L_1088920
 // --- basic block ---
-// 0x010882ec: 0x10882ec: lb    v0, 0(v0)
+// 0x01088910: 0x1088910: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010882f0: 0x10882f0: sll   zero, zero, 0
-// 0x010882f4: 0x10882f4: bne   v0, zero, 0x1088324 sll   zero, zero, 0
+// 0x01088914: 0x1088914: sll   zero, zero, 0
+// 0x01088918: 0x1088918: bne   v0, zero, 0x1088948 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1088324
+	brtrue L_1088948
 // --- basic block ---
-L_10882fc:
-// 0x010882fc: 0x10882fc: lui   a1, 0x20000
+L_1088920:
+// 0x01088920: 0x1088920: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088300: 0x1088300: lui   a3, 0x20000
+// 0x01088924: 0x1088924: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088304: 0x1088304: addiu a1, a1, -21512
+// 0x01088928: 0x1088928: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088308: 0x1088308: addiu a3, a3, -16288
+// 0x0108892c: 0x108892c: addiu a3, a3, -15824
 	ldloc 4
-	ldc.i4 -16288
+	ldc.i4 -15824
 	add
 	stloc 4
-// 0x0108830c: 0x108830c: addiu a0, zero, 4
+// 0x01088930: 0x1088930: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088310: 0x1088310: addiu a2, zero, 2108
+// 0x01088934: 0x1088934: addiu a2, zero, 2108
 	ldc.i4 2108
 	stloc.3
-L_1088314:
-// 0x01088314: 0x1088314: jal   0x100449c sll   zero, zero, 0
+L_1088938:
+// 0x01088938: 0x1088938: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1334,13 +1334,13 @@ L_1088314:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108831c: 0x108831c: j	 0x10886b8 addiu v0, zero, 18
+// 0x01088940: 0x1088940: j	 0x1088cdc addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_10886b8
+	br L_1088cdc
 // --- basic block ---
-L_1088324:
-// 0x01088324: 0x1088324: lw    a0, 28(sp)
+L_1088948:
+// 0x01088948: 0x1088948: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1349,39 +1349,39 @@ L_1088324:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01088328: 0x1088328: jal   0x10c09c0 sll   zero, zero, 0
+// 0x0108894c: 0x108894c: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088330: 0x1088330: lui   a0, 0x20000
+// 0x01088954: 0x1088954: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01088334: 0x1088334: lw    a3, 23740(a0)
+// 0x01088958: 0x1088958: lw    a3, 24204(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5935
+	ldc.i4 6051
 	add
 	ldelem.i4
 	stloc 4
-// 0x01088338: 0x1088338: lw    a2, 23736(a0)
+// 0x0108895c: 0x108895c: lw    a2, 24200(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5934
+	ldc.i4 6050
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108833c: 0x108833c: addu  a1, v1, zero
+// 0x01088960: 0x1088960: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01088340: 0x1088340: jal   0x10c0798 addu  a0, v0, zero
+// 0x01088964: 0x1088964: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1389,42 +1389,42 @@ L_1088324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088348: 0x1088348: addu  a1, v1, zero
+// 0x0108896c: 0x108896c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0108834c: 0x108834c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01088970: 0x1088970: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088354: 0x1088354: addu  a0, s3, zero
+// 0x01088978: 0x1088978: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01088358: 0x1088358: addiu a1, s2, 28076
+// 0x0108897c: 0x108897c: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108835c: 0x108835c: addu  a2, zero, zero
+// 0x01088980: 0x1088980: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01088360: 0x1088360: addiu a3, sp, 52
+// 0x01088984: 0x1088984: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x01088364: 0x1088364: sw    v0, 44(sp)
+// 0x01088988: 0x1088988: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1433,7 +1433,7 @@ L_1088324:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088368: 0x1088368: jal   0x106855c sw    s1, 16(sp)
+// 0x0108898c: 0x108898c: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1447,66 +1447,66 @@ L_1088324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088370: 0x1088370: beq   v0, zero, 0x1088388 lui   a1, 0x20000
+// 0x01088994: 0x1088994: beq   v0, zero, 0x10889ac lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1088388
+	brfalse L_10889ac
 // --- basic block ---
-// 0x01088378: 0x1088378: lb    v1, 0(v0)
+// 0x0108899c: 0x108899c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108837c: 0x108837c: sll   zero, zero, 0
-// 0x01088380: 0x1088380: bne   v1, zero, 0x10883a0 sll   zero, zero, 0
+// 0x010889a0: 0x10889a0: sll   zero, zero, 0
+// 0x010889a4: 0x10889a4: bne   v1, zero, 0x10889c4 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10883a0
+	brtrue L_10889c4
 // --- basic block ---
-L_1088388:
-// 0x01088388: 0x1088388: lui   a3, 0x20000
+L_10889ac:
+// 0x010889ac: 0x10889ac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108838c: 0x108838c: addiu a1, a1, -21512
+// 0x010889b0: 0x10889b0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088390: 0x1088390: addiu a3, a3, -16224
+// 0x010889b4: 0x10889b4: addiu a3, a3, -15760
 	ldloc 4
-	ldc.i4 -16224
+	ldc.i4 -15760
 	add
 	stloc 4
-// 0x01088394: 0x1088394: addiu a0, zero, 4
+// 0x010889b8: 0x10889b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088398: 0x1088398: j	 0x1088314 addiu a2, zero, 2124
+// 0x010889bc: 0x10889bc: j	 0x1088938 addiu a2, zero, 2124
 	ldc.i4 2124
 	stloc.3
-	br L_1088314
+	br L_1088938
 // --- basic block ---
-L_10883a0:
-// 0x010883a0: 0x10883a0: addu  a0, v0, zero
+L_10889c4:
+// 0x010889c4: 0x10889c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010883a4: 0x10883a4: addiu a1, s2, 28076
+// 0x010889c8: 0x10889c8: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010883a8: 0x10883a8: addu  a2, zero, zero
+// 0x010889cc: 0x10889cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010883ac: 0x10883ac: addiu a3, sp, 56
+// 0x010889d0: 0x10889d0: addiu a3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x010883b0: 0x10883b0: jal   0x106855c sw    s1, 16(sp)
+// 0x010889d4: 0x10889d4: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1520,82 +1520,82 @@ L_10883a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010883b8: 0x10883b8: beq   v0, zero, 0x10883d0 lui   a1, 0x20000
+// 0x010889dc: 0x10889dc: beq   v0, zero, 0x10889f4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10883d0
+	brfalse L_10889f4
 // --- basic block ---
-// 0x010883c0: 0x10883c0: lb    v1, 0(v0)
+// 0x010889e4: 0x10889e4: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010883c4: 0x10883c4: sll   zero, zero, 0
-// 0x010883c8: 0x10883c8: bne   v1, zero, 0x10883e8 sll   zero, zero, 0
+// 0x010889e8: 0x10889e8: sll   zero, zero, 0
+// 0x010889ec: 0x10889ec: bne   v1, zero, 0x1088a0c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10883e8
+	brtrue L_1088a0c
 // --- basic block ---
-L_10883d0:
-// 0x010883d0: 0x10883d0: lui   a3, 0x20000
+L_10889f4:
+// 0x010889f4: 0x10889f4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010883d4: 0x10883d4: addiu a1, a1, -21512
+// 0x010889f8: 0x10889f8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010883d8: 0x10883d8: addiu a3, a3, -16160
+// 0x010889fc: 0x10889fc: addiu a3, a3, -15696
 	ldloc 4
-	ldc.i4 -16160
+	ldc.i4 -15696
 	add
 	stloc 4
-// 0x010883dc: 0x10883dc: addiu a0, zero, 4
+// 0x01088a00: 0x1088a00: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010883e0: 0x10883e0: j	 0x1088314 addiu a2, zero, 2139
+// 0x01088a04: 0x1088a04: j	 0x1088938 addiu a2, zero, 2139
 	ldc.i4 2139
 	stloc.3
-	br L_1088314
+	br L_1088938
 // --- basic block ---
-L_10883e8:
-// 0x010883e8: 0x10883e8: addiu a0, zero, 44
+L_1088a0c:
+// 0x01088a0c: 0x1088a0c: addiu a0, zero, 44
 	ldc.i4.s 44
 	stloc.1
-// 0x010883ec: 0x10883ec: bne   v1, a0, 0x1088420 addu  a0, v0, zero
+// 0x01088a10: 0x1088a10: bne   v1, a0, 0x1088a44 addu  a0, v0, zero
 	ldloc 7
 	ldloc.1
 	ldloc 5
 	stloc.1
-	bne.un L_1088420
+	bne.un L_1088a44
 // --- basic block ---
-// 0x010883f4: 0x10883f4: lui   a1, 0x20000
+// 0x01088a18: 0x1088a18: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010883f8: 0x10883f8: lui   a3, 0x20000
+// 0x01088a1c: 0x1088a1c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010883fc: 0x10883fc: addiu a1, a1, -21512
+// 0x01088a20: 0x1088a20: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088400: 0x1088400: addiu a3, a3, -16084
+// 0x01088a24: 0x1088a24: addiu a3, a3, -15620
 	ldloc 4
-	ldc.i4 -16084
+	ldc.i4 -15620
 	add
 	stloc 4
-// 0x01088404: 0x1088404: addiu a0, zero, 1
+// 0x01088a28: 0x1088a28: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01088408: 0x1088408: addiu a2, zero, 2148
+// 0x01088a2c: 0x1088a2c: addiu a2, zero, 2148
 	ldc.i4 2148
 	stloc.3
-// 0x0108840c: 0x108840c: jal   0x100449c sw    v0, 2744(sp)
+// 0x01088a30: 0x1088a30: jal   0x100449c sw    v0, 2744(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1614,7 +1614,7 @@ L_10883e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088414: 0x1088414: lw    v0, 2744(sp)
+// 0x01088a38: 0x1088a38: lw    v0, 2744(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1623,21 +1623,21 @@ L_10883e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088418: 0x1088418: j	 0x1088474 addiu v0, v0, 1
+// 0x01088a3c: 0x1088a3c: j	 0x1088a98 addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	br L_1088474
+	br L_1088a98
 // --- basic block ---
-L_1088420:
-// 0x01088420: 0x1088420: lui   a3, 0x0
+L_1088a44:
+// 0x01088a44: 0x1088a44: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01088424: 0x1088424: addiu v0, zero, 200
+// 0x01088a48: 0x1088a48: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01088428: 0x1088428: sw    v0, 24(sp)
+// 0x01088a4c: 0x1088a4c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1646,25 +1646,25 @@ L_1088420:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108842c: 0x108842c: addiu a3, a3, 28076
+// 0x01088a50: 0x1088a50: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088430: 0x1088430: addiu v0, zero, 1
+// 0x01088a54: 0x1088a54: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01088434: 0x1088434: addiu a1, sp, 60
+// 0x01088a58: 0x1088a58: addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.2
-// 0x01088438: 0x1088438: addiu a2, sp, 24
+// 0x01088a5c: 0x1088a5c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108843c: 0x108843c: jal   0x1068250 sw    v0, 16(sp)
+// 0x01088a60: 0x1088a60: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1678,86 +1678,86 @@ L_1088420:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088444: 0x1088444: beq   v0, zero, 0x108845c lui   a1, 0x20000
+// 0x01088a68: 0x1088a68: beq   v0, zero, 0x1088a80 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108845c
+	brfalse L_1088a80
 // --- basic block ---
-// 0x0108844c: 0x108844c: lb    v1, 0(v0)
+// 0x01088a70: 0x1088a70: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088450: 0x1088450: sll   zero, zero, 0
-// 0x01088454: 0x1088454: bne   v1, zero, 0x1088474 sll   zero, zero, 0
+// 0x01088a74: 0x1088a74: sll   zero, zero, 0
+// 0x01088a78: 0x1088a78: bne   v1, zero, 0x1088a98 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1088474
+	brtrue L_1088a98
 // --- basic block ---
-L_108845c:
-// 0x0108845c: 0x108845c: lui   a3, 0x20000
+L_1088a80:
+// 0x01088a80: 0x1088a80: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088460: 0x1088460: addiu a1, a1, -21512
+// 0x01088a84: 0x1088a84: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088464: 0x1088464: addiu a3, a3, -16024
+// 0x01088a88: 0x1088a88: addiu a3, a3, -15560
 	ldloc 4
-	ldc.i4 -16024
+	ldc.i4 -15560
 	add
 	stloc 4
-// 0x01088468: 0x1088468: addiu a0, zero, 4
+// 0x01088a8c: 0x1088a8c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108846c: 0x108846c: j	 0x1088314 addiu a2, zero, 2163
+// 0x01088a90: 0x1088a90: j	 0x1088938 addiu a2, zero, 2163
 	ldc.i4 2163
 	stloc.3
-	br L_1088314
+	br L_1088938
 // --- basic block ---
-L_1088474:
-// 0x01088474: 0x1088474: lb    a0, 0(v0)
+L_1088a98:
+// 0x01088a98: 0x1088a98: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01088478: 0x1088478: addiu v1, zero, 44
+// 0x01088a9c: 0x1088a9c: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x0108847c: 0x108847c: bne   a0, v1, 0x10884b0 addu  a0, v0, zero
+// 0x01088aa0: 0x1088aa0: bne   a0, v1, 0x1088ad4 addu  a0, v0, zero
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	stloc.1
-	bne.un L_10884b0
+	bne.un L_1088ad4
 // --- basic block ---
-// 0x01088484: 0x1088484: lui   a1, 0x20000
+// 0x01088aa8: 0x1088aa8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088488: 0x1088488: lui   a3, 0x20000
+// 0x01088aac: 0x1088aac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108848c: 0x108848c: addiu a1, a1, -21512
+// 0x01088ab0: 0x1088ab0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088490: 0x1088490: addiu a3, a3, -15960
+// 0x01088ab4: 0x1088ab4: addiu a3, a3, -15496
 	ldloc 4
-	ldc.i4 -15960
+	ldc.i4 -15496
 	add
 	stloc 4
-// 0x01088494: 0x1088494: addiu a0, zero, 1
+// 0x01088ab8: 0x1088ab8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01088498: 0x1088498: addiu a2, zero, 2172
+// 0x01088abc: 0x1088abc: addiu a2, zero, 2172
 	ldc.i4 2172
 	stloc.3
-// 0x0108849c: 0x108849c: jal   0x100449c sw    v0, 2744(sp)
+// 0x01088ac0: 0x1088ac0: jal   0x100449c sw    v0, 2744(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1776,7 +1776,7 @@ L_1088474:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010884a4: 0x10884a4: lw    v0, 2744(sp)
+// 0x01088ac8: 0x1088ac8: lw    v0, 2744(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1785,21 +1785,21 @@ L_1088474:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010884a8: 0x10884a8: j	 0x1088504 addiu v0, v0, 1
+// 0x01088acc: 0x1088acc: j	 0x1088b28 addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	br L_1088504
+	br L_1088b28
 // --- basic block ---
-L_10884b0:
-// 0x010884b0: 0x10884b0: lui   a3, 0x0
+L_1088ad4:
+// 0x01088ad4: 0x1088ad4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010884b4: 0x10884b4: addiu v0, zero, 200
+// 0x01088ad8: 0x1088ad8: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x010884b8: 0x10884b8: sw    v0, 24(sp)
+// 0x01088adc: 0x1088adc: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1808,25 +1808,25 @@ L_10884b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010884bc: 0x10884bc: addiu a3, a3, 28076
+// 0x01088ae0: 0x1088ae0: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010884c0: 0x10884c0: addiu v0, zero, 1
+// 0x01088ae4: 0x1088ae4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010884c4: 0x10884c4: addiu a1, sp, 261
+// 0x01088ae8: 0x1088ae8: addiu a1, sp, 261
 	ldloc.0
 	ldc.i4 261
 	add
 	stloc.2
-// 0x010884c8: 0x10884c8: addiu a2, sp, 24
+// 0x01088aec: 0x1088aec: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010884cc: 0x10884cc: jal   0x1068250 sw    v0, 16(sp)
+// 0x01088af0: 0x1088af0: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1840,86 +1840,86 @@ L_10884b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010884d4: 0x10884d4: beq   v0, zero, 0x10884ec lui   a1, 0x20000
+// 0x01088af8: 0x1088af8: beq   v0, zero, 0x1088b10 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10884ec
+	brfalse L_1088b10
 // --- basic block ---
-// 0x010884dc: 0x10884dc: lb    v1, 0(v0)
+// 0x01088b00: 0x1088b00: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010884e0: 0x10884e0: sll   zero, zero, 0
-// 0x010884e4: 0x10884e4: bne   v1, zero, 0x1088504 sll   zero, zero, 0
+// 0x01088b04: 0x1088b04: sll   zero, zero, 0
+// 0x01088b08: 0x1088b08: bne   v1, zero, 0x1088b28 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1088504
+	brtrue L_1088b28
 // --- basic block ---
-L_10884ec:
-// 0x010884ec: 0x10884ec: lui   a3, 0x20000
+L_1088b10:
+// 0x01088b10: 0x1088b10: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010884f0: 0x10884f0: addiu a1, a1, -21512
+// 0x01088b14: 0x1088b14: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010884f4: 0x10884f4: addiu a3, a3, -15900
+// 0x01088b18: 0x1088b18: addiu a3, a3, -15436
 	ldloc 4
-	ldc.i4 -15900
+	ldc.i4 -15436
 	add
 	stloc 4
-// 0x010884f8: 0x10884f8: addiu a0, zero, 4
+// 0x01088b1c: 0x1088b1c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010884fc: 0x10884fc: j	 0x1088314 addiu a2, zero, 2187
+// 0x01088b20: 0x1088b20: j	 0x1088938 addiu a2, zero, 2187
 	ldc.i4 2187
 	stloc.3
-	br L_1088314
+	br L_1088938
 // --- basic block ---
-L_1088504:
-// 0x01088504: 0x1088504: lb    a0, 0(v0)
+L_1088b28:
+// 0x01088b28: 0x1088b28: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01088508: 0x1088508: addiu v1, zero, 44
+// 0x01088b2c: 0x1088b2c: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x0108850c: 0x108850c: bne   a0, v1, 0x1088540 addu  a0, v0, zero
+// 0x01088b30: 0x1088b30: bne   a0, v1, 0x1088b64 addu  a0, v0, zero
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	stloc.1
-	bne.un L_1088540
+	bne.un L_1088b64
 // --- basic block ---
-// 0x01088514: 0x1088514: lui   a1, 0x20000
+// 0x01088b38: 0x1088b38: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088518: 0x1088518: lui   a3, 0x20000
+// 0x01088b3c: 0x1088b3c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108851c: 0x108851c: addiu a1, a1, -21512
+// 0x01088b40: 0x1088b40: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088520: 0x1088520: addiu a3, a3, -15836
+// 0x01088b44: 0x1088b44: addiu a3, a3, -15372
 	ldloc 4
-	ldc.i4 -15836
+	ldc.i4 -15372
 	add
 	stloc 4
-// 0x01088524: 0x1088524: addiu a0, zero, 1
+// 0x01088b48: 0x1088b48: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01088528: 0x1088528: addiu a2, zero, 2196
+// 0x01088b4c: 0x1088b4c: addiu a2, zero, 2196
 	ldc.i4 2196
 	stloc.3
-// 0x0108852c: 0x108852c: jal   0x100449c sw    v0, 2744(sp)
+// 0x01088b50: 0x1088b50: jal   0x100449c sw    v0, 2744(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1938,7 +1938,7 @@ L_1088504:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088534: 0x1088534: lw    v0, 2744(sp)
+// 0x01088b58: 0x1088b58: lw    v0, 2744(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1947,21 +1947,21 @@ L_1088504:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088538: 0x1088538: j	 0x1088598 addiu v0, v0, 1
+// 0x01088b5c: 0x1088b5c: j	 0x1088bbc addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	br L_1088598
+	br L_1088bbc
 // --- basic block ---
-L_1088540:
-// 0x01088540: 0x1088540: lui   a3, 0x0
+L_1088b64:
+// 0x01088b64: 0x1088b64: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01088544: 0x1088544: addiu v0, zero, 200
+// 0x01088b68: 0x1088b68: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01088548: 0x1088548: sw    v0, 24(sp)
+// 0x01088b6c: 0x1088b6c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1970,25 +1970,25 @@ L_1088540:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108854c: 0x108854c: addiu a3, a3, 28076
+// 0x01088b70: 0x1088b70: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088550: 0x1088550: addiu v0, zero, 1
+// 0x01088b74: 0x1088b74: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01088554: 0x1088554: addiu a1, sp, 462
+// 0x01088b78: 0x1088b78: addiu a1, sp, 462
 	ldloc.0
 	ldc.i4 462
 	add
 	stloc.2
-// 0x01088558: 0x1088558: addiu a2, sp, 24
+// 0x01088b7c: 0x1088b7c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108855c: 0x108855c: jal   0x1068250 sw    v0, 16(sp)
+// 0x01088b80: 0x1088b80: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2002,88 +2002,88 @@ L_1088540:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088564: 0x1088564: beq   v0, zero, 0x1088580 lui   a1, 0x20000
+// 0x01088b88: 0x1088b88: beq   v0, zero, 0x1088ba4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1088580
+	brfalse L_1088ba4
 // --- basic block ---
-// 0x0108856c: 0x108856c: lb    v1, 0(v0)
+// 0x01088b90: 0x1088b90: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088570: 0x1088570: sll   zero, zero, 0
-// 0x01088574: 0x1088574: bne   v1, zero, 0x108859c addiu s3, sp, 24
+// 0x01088b94: 0x1088b94: sll   zero, zero, 0
+// 0x01088b98: 0x1088b98: bne   v1, zero, 0x1088bc0 addiu s3, sp, 24
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-	brtrue L_108859c
+	brtrue L_1088bc0
 // --- basic block ---
-// 0x0108857c: 0x108857c: lui   a1, 0x20000
+// 0x01088ba0: 0x1088ba0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1088580:
-// 0x01088580: 0x1088580: lui   a3, 0x20000
+L_1088ba4:
+// 0x01088ba4: 0x1088ba4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088584: 0x1088584: addiu a1, a1, -21512
+// 0x01088ba8: 0x1088ba8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088588: 0x1088588: addiu a3, a3, -15776
+// 0x01088bac: 0x1088bac: addiu a3, a3, -15312
 	ldloc 4
-	ldc.i4 -15776
+	ldc.i4 -15312
 	add
 	stloc 4
-// 0x0108858c: 0x108858c: addiu a0, zero, 4
+// 0x01088bb0: 0x1088bb0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088590: 0x1088590: j	 0x1088314 addiu a2, zero, 2211
+// 0x01088bb4: 0x1088bb4: j	 0x1088938 addiu a2, zero, 2211
 	ldc.i4 2211
 	stloc.3
-	br L_1088314
+	br L_1088938
 // --- basic block ---
-L_1088598:
-// 0x01088598: 0x1088598: addiu s3, sp, 24
+L_1088bbc:
+// 0x01088bbc: 0x1088bbc: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-L_108859c:
-// 0x0108859c: 0x108859c: lui   a3, 0x0
+L_1088bc0:
+// 0x01088bc0: 0x1088bc0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010885a0: 0x10885a0: addu  a0, v0, zero
+// 0x01088bc4: 0x1088bc4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010885a4: 0x10885a4: addiu a3, a3, 28076
+// 0x01088bc8: 0x1088bc8: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010885a8: 0x10885a8: addiu v0, zero, 200
+// 0x01088bcc: 0x1088bcc: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x010885ac: 0x10885ac: addiu s2, zero, 1
+// 0x01088bd0: 0x1088bd0: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010885b0: 0x10885b0: addiu a1, sp, 663
+// 0x01088bd4: 0x1088bd4: addiu a1, sp, 663
 	ldloc.0
 	ldc.i4 663
 	add
 	stloc.2
-// 0x010885b4: 0x10885b4: addu  a2, s3, zero
+// 0x01088bd8: 0x1088bd8: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x010885b8: 0x10885b8: sw    v0, 24(sp)
+// 0x01088bdc: 0x1088bdc: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2092,7 +2092,7 @@ L_108859c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010885bc: 0x10885bc: jal   0x1068250 sw    s2, 16(sp)
+// 0x01088be0: 0x1088be0: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2106,37 +2106,37 @@ L_108859c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010885c4: 0x10885c4: bne   v0, zero, 0x10885f0 addu  s1, v0, zero
+// 0x01088be8: 0x1088be8: bne   v0, zero, 0x1088c14 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10885f0
+	brtrue L_1088c14
 // --- basic block ---
-// 0x010885cc: 0x10885cc: lui   a1, 0x20000
+// 0x01088bf0: 0x1088bf0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010885d0: 0x10885d0: lui   a3, 0x20000
+// 0x01088bf4: 0x1088bf4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010885d4: 0x10885d4: addiu a1, a1, -21512
+// 0x01088bf8: 0x1088bf8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010885d8: 0x10885d8: addiu a3, a3, -15712
+// 0x01088bfc: 0x1088bfc: addiu a3, a3, -15248
 	ldloc 4
-	ldc.i4 -15712
+	ldc.i4 -15248
 	add
 	stloc 4
-// 0x010885dc: 0x10885dc: addiu a0, zero, 4
+// 0x01088c00: 0x1088c00: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010885e0: 0x10885e0: jal   0x100449c addiu a2, zero, 2228
+// 0x01088c04: 0x1088c04: jal   0x100449c addiu a2, zero, 2228
 	ldc.i4 2228
 	stloc.3
 	ldloc.0
@@ -2149,22 +2149,22 @@ L_108859c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010885e8: 0x10885e8: j	 0x1088650 addiu v0, zero, 18
+// 0x01088c0c: 0x1088c0c: j	 0x1088c74 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1088650
+	br L_1088c74
 // --- basic block ---
-L_10885f0:
-// 0x010885f0: 0x10885f0: addu  a0, v0, zero
+L_1088c14:
+// 0x01088c14: 0x1088c14: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010885f4: 0x10885f4: lui   a3, 0x0
+// 0x01088c18: 0x1088c18: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010885f8: 0x10885f8: addiu v0, zero, 5
+// 0x01088c1c: 0x1088c1c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010885fc: 0x10885fc: sw    v0, 24(sp)
+// 0x01088c20: 0x1088c20: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2173,23 +2173,23 @@ L_10885f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088600: 0x1088600: addu  a2, s3, zero
+// 0x01088c24: 0x1088c24: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01088604: 0x1088604: addiu v0, zero, -1
+// 0x01088c28: 0x1088c28: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01088608: 0x1088608: addiu a3, a3, 30268
+// 0x01088c2c: 0x1088c2c: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x0108860c: 0x108860c: addiu a1, sp, 32
+// 0x01088c30: 0x1088c30: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01088610: 0x1088610: sw    v0, 16(sp)
+// 0x01088c34: 0x1088c34: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2198,7 +2198,7 @@ L_10885f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088614: 0x1088614: sw    zero, 864(sp)
+// 0x01088c38: 0x1088c38: sw    zero, 864(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2207,7 +2207,7 @@ L_10885f0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01088618: 0x1088618: jal   0x1068250 sb    zero, 32(sp)
+// 0x01088c3c: 0x1088c3c: jal   0x1068260 sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2218,24 +2218,24 @@ L_10885f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088620: 0x1088620: bne   v0, zero, 0x1088658 addu  s1, v0, zero
+// 0x01088c44: 0x1088c44: bne   v0, zero, 0x1088c7c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1088658
+	brtrue L_1088c7c
 // --- basic block ---
-// 0x01088628: 0x1088628: lui   a1, 0x20000
+// 0x01088c4c: 0x1088c4c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108862c: 0x108862c: lui   a3, 0x20000
+// 0x01088c50: 0x1088c50: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088630: 0x1088630: lw    v0, 40(sp)
+// 0x01088c54: 0x1088c54: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2244,23 +2244,23 @@ L_10885f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088634: 0x1088634: addiu a1, a1, -21512
+// 0x01088c58: 0x1088c58: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088638: 0x1088638: addiu a3, a3, -15648
+// 0x01088c5c: 0x1088c5c: addiu a3, a3, -15184
 	ldloc 4
-	ldc.i4 -15648
+	ldc.i4 -15184
 	add
 	stloc 4
-// 0x0108863c: 0x108863c: addiu a0, zero, 4
+// 0x01088c60: 0x1088c60: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088640: 0x1088640: addiu a2, zero, 2248
+// 0x01088c64: 0x1088c64: addiu a2, zero, 2248
 	ldc.i4 2248
 	stloc.3
-// 0x01088644: 0x1088644: jal   0x100449c sw    v0, 16(sp)
+// 0x01088c68: 0x1088c68: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2279,35 +2279,35 @@ L_10885f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108864c: 0x108864c: addiu v0, zero, 18
+// 0x01088c70: 0x1088c70: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_1088650:
-// 0x01088650: 0x1088650: j	 0x10886c0 sw    v0, 0(s0)
+L_1088c74:
+// 0x01088c74: 0x1088c74: j	 0x1088ce4 sw    v0, 0(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10886c0
+	br L_1088ce4
 // --- basic block ---
-L_1088658:
-// 0x01088658: 0x1088658: lb    v1, 32(sp)
+L_1088c7c:
+// 0x01088c7c: 0x1088c7c: lb    v1, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108865c: 0x108865c: addiu v0, zero, 84
+// 0x01088c80: 0x1088c80: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x01088660: 0x1088660: bne   v1, v0, 0x1088670 sll   zero, zero, 0
+// 0x01088c84: 0x1088c84: bne   v1, v0, 0x1088c94 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1088670
+	bne.un L_1088c94
 // --- basic block ---
-// 0x01088668: 0x1088668: j	 0x1088674 sw    s2, 2736(sp)
+// 0x01088c8c: 0x1088c8c: j	 0x1088c98 sw    s2, 2736(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2316,10 +2316,10 @@ L_1088658:
 	add
 	ldloc 9
 	stelem.i4
-	br L_1088674
+	br L_1088c98
 // --- basic block ---
-L_1088670:
-// 0x01088670: 0x1088670: sw    zero, 2736(sp)
+L_1088c94:
+// 0x01088c94: 0x1088c94: sw    zero, 2736(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2328,8 +2328,8 @@ L_1088670:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1088674:
-// 0x01088674: 0x1088674: jal   0x10833a8 addiu a0, sp, 40
+L_1088c98:
+// 0x01088c98: 0x1088c98: jal   0x10839cc addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2339,16 +2339,16 @@ L_1088674:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_Add_10833a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_Add_10839cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108867c: 0x108867c: bne   v0, zero, 0x10886c0 sll   zero, zero, 0
+// 0x01088ca0: 0x1088ca0: bne   v0, zero, 0x1088ce4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10886c0
+	brtrue L_1088ce4
 // --- basic block ---
-// 0x01088684: 0x1088684: lw    s1, 40(sp)
+// 0x01088ca8: 0x1088ca8: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2357,33 +2357,33 @@ L_1088674:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01088688: 0x1088688: jal   0x108289c sll   zero, zero, 0
-	call int32 Cibyl98::RTTrafficInfo_Count_108289c()
+// 0x01088cac: 0x1088cac: jal   0x1082ec0 sll   zero, zero, 0
+	call int32 Cibyl98::RTTrafficInfo_Count_1082ec0()
 	stloc 5
 // --- basic block ---
-// 0x01088690: 0x1088690: lui   a1, 0x20000
+// 0x01088cb4: 0x1088cb4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088694: 0x1088694: lui   a3, 0x20000
+// 0x01088cb8: 0x1088cb8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088698: 0x1088698: addiu a1, a1, -21512
+// 0x01088cbc: 0x1088cbc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108869c: 0x108869c: addiu a3, a3, -15568
+// 0x01088cc0: 0x1088cc0: addiu a3, a3, -15104
 	ldloc 4
-	ldc.i4 -15568
+	ldc.i4 -15104
 	add
 	stloc 4
-// 0x010886a0: 0x10886a0: addiu a0, zero, 4
+// 0x01088cc4: 0x1088cc4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010886a4: 0x10886a4: addiu a2, zero, 2261
+// 0x01088cc8: 0x1088cc8: addiu a2, zero, 2261
 	ldc.i4 2261
 	stloc.3
-// 0x010886a8: 0x10886a8: sw    v0, 20(sp)
+// 0x01088ccc: 0x1088ccc: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2392,7 +2392,7 @@ L_1088674:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010886ac: 0x10886ac: jal   0x100449c sw    s1, 16(sp)
+// 0x01088cd0: 0x1088cd0: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2411,26 +2411,26 @@ L_1088674:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010886b4: 0x10886b4: addiu v0, zero, 8
+// 0x01088cd8: 0x1088cd8: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-L_10886b8:
-// 0x010886b8: 0x10886b8: sw    v0, 0(s0)
+L_1088cdc:
+// 0x01088cdc: 0x1088cdc: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010886bc: 0x10886bc: addu  s1, zero, zero
+// 0x01088ce0: 0x1088ce0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_10886c0:
-// 0x010886c0: 0x10886c0: lw    ra, 2772(sp)
-// 0x010886c4: 0x10886c4: addu  v0, s1, zero
+L_1088ce4:
+// 0x01088ce4: 0x1088ce4: lw    ra, 2772(sp)
+// 0x01088ce8: 0x1088ce8: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-// 0x010886c8: 0x10886c8: lw    s3, 2768(sp)
+// 0x01088cec: 0x1088cec: lw    s3, 2768(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2439,7 +2439,7 @@ L_10886c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010886cc: 0x10886cc: lw    s2, 2764(sp)
+// 0x01088cf0: 0x1088cf0: lw    s2, 2764(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2448,7 +2448,7 @@ L_10886c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010886d0: 0x10886d0: lw    s1, 2760(sp)
+// 0x01088cf4: 0x1088cf4: lw    s1, 2760(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2457,7 +2457,7 @@ L_10886c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010886d4: 0x10886d4: lw    s0, 2756(sp)
+// 0x01088cf8: 0x1088cf8: lw    s0, 2756(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2466,7 +2466,7 @@ L_10886c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010886d8: 0x10886d8: jr    ra addiu sp, sp, 2776
+// 0x01088cfc: 0x1088cfc: jr    ra addiu sp, sp, 2776
 	ldloc.0
 	ldc.i4 2776
 	add
@@ -2478,7 +2478,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RemoveAlert_10886e0(int32,int32,int32,int32,int32)
+.method public static int32 RemoveAlert_1088d04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -2519,16 +2519,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10886e0:
-// 0x010886e0: 0x10886e0: addiu sp, sp, -48
+L_1088d04:
+// 0x01088d04: 0x1088d04: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010886e4: 0x10886e4: lui   a1, 0x0
+// 0x01088d08: 0x1088d08: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010886e8: 0x10886e8: sw    s1, 40(sp)
+// 0x01088d0c: 0x1088d0c: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2537,23 +2537,23 @@ L_10886e0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010886ec: 0x10886ec: addiu a1, a1, 30268
+// 0x01088d10: 0x1088d10: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010886f0: 0x10886f0: addu  s1, a3, zero
+// 0x01088d14: 0x1088d14: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x010886f4: 0x10886f4: addu  a2, zero, zero
+// 0x01088d18: 0x1088d18: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010886f8: 0x10886f8: addiu a3, sp, 24
+// 0x01088d1c: 0x1088d1c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x010886fc: 0x10886fc: sw    s0, 36(sp)
+// 0x01088d20: 0x1088d20: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2562,8 +2562,8 @@ L_10886e0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01088700: 0x1088700: sw    ra, 44(sp)
-// 0x01088704: 0x1088704: jal   0x106855c sw    zero, 16(sp)
+// 0x01088d24: 0x1088d24: sw    ra, 44(sp)
+// 0x01088d28: 0x1088d28: jal   0x106856c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2577,18 +2577,18 @@ L_10886e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108870c: 0x108870c: beq   v0, zero, 0x1088724 addu  s0, v0, zero
+// 0x01088d30: 0x1088d30: beq   v0, zero, 0x1088d48 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_1088724
+	brfalse L_1088d48
 // --- basic block ---
-// 0x01088714: 0x1088714: lw    a0, 24(sp)
+// 0x01088d38: 0x1088d38: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2597,35 +2597,35 @@ L_10886e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01088718: 0x1088718: addiu v0, zero, -1
+// 0x01088d3c: 0x1088d3c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108871c: 0x108871c: bne   a0, v0, 0x1088750 sll   zero, zero, 0
+// 0x01088d40: 0x1088d40: bne   a0, v0, 0x1088d74 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_1088750
+	bne.un L_1088d74
 // --- basic block ---
-L_1088724:
-// 0x01088724: 0x1088724: lui   a1, 0x20000
+L_1088d48:
+// 0x01088d48: 0x1088d48: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088728: 0x1088728: lui   a3, 0x20000
+// 0x01088d4c: 0x1088d4c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108872c: 0x108872c: addiu a1, a1, -21512
+// 0x01088d50: 0x1088d50: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088730: 0x1088730: addiu a3, a3, -15472
+// 0x01088d54: 0x1088d54: addiu a3, a3, -15008
 	ldloc 4
-	ldc.i4 -15472
+	ldc.i4 -15008
 	add
 	stloc 4
-// 0x01088734: 0x1088734: addiu a0, zero, 4
+// 0x01088d58: 0x1088d58: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088738: 0x1088738: jal   0x100449c addiu a2, zero, 2053
+// 0x01088d5c: 0x1088d5c: jal   0x100449c addiu a2, zero, 2053
 	ldc.i4 2053
 	stloc.3
 	ldloc.0
@@ -2638,43 +2638,43 @@ L_1088724:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088740: 0x1088740: addiu v0, zero, 18
+// 0x01088d64: 0x1088d64: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01088744: 0x1088744: sw    v0, 0(s1)
+// 0x01088d68: 0x1088d68: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01088748: 0x1088748: j	 0x1088780 addu  s0, zero, zero
+// 0x01088d6c: 0x1088d6c: j	 0x1088da4 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1088780
+	br L_1088da4
 // --- basic block ---
-L_1088750:
-// 0x01088750: 0x1088750: jal   0x107a718 sll   zero, zero, 0
+L_1088d74:
+// 0x01088d74: 0x1088d74: jal   0x107ad3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::RTAlerts_Remove_107a718(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::RTAlerts_Remove_107ad3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088758: 0x1088758: bne   v0, zero, 0x1088780 lui   a1, 0x20000
+// 0x01088d7c: 0x1088d7c: bne   v0, zero, 0x1088da4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088780
+	brtrue L_1088da4
 // --- basic block ---
-// 0x01088760: 0x1088760: lui   a3, 0x20000
+// 0x01088d84: 0x1088d84: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088764: 0x1088764: lw    v0, 24(sp)
+// 0x01088d88: 0x1088d88: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2683,23 +2683,23 @@ L_1088750:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088768: 0x1088768: addiu a1, a1, -21512
+// 0x01088d8c: 0x1088d8c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108876c: 0x108876c: addiu a3, a3, -15408
+// 0x01088d90: 0x1088d90: addiu a3, a3, -14944
 	ldloc 4
-	ldc.i4 -15408
+	ldc.i4 -14944
 	add
 	stloc 4
-// 0x01088770: 0x1088770: addiu a0, zero, 1
+// 0x01088d94: 0x1088d94: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01088774: 0x1088774: addiu a2, zero, 2061
+// 0x01088d98: 0x1088d98: addiu a2, zero, 2061
 	ldc.i4 2061
 	stloc.3
-// 0x01088778: 0x1088778: jal   0x100449c sw    v0, 16(sp)
+// 0x01088d9c: 0x1088d9c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2718,12 +2718,12 @@ L_1088750:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1088780:
-// 0x01088780: 0x1088780: lw    ra, 44(sp)
-// 0x01088784: 0x1088784: addu  v0, s0, zero
+L_1088da4:
+// 0x01088da4: 0x1088da4: lw    ra, 44(sp)
+// 0x01088da8: 0x1088da8: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x01088788: 0x1088788: lw    s1, 40(sp)
+// 0x01088dac: 0x1088dac: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2732,7 +2732,7 @@ L_1088780:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108878c: 0x108878c: lw    s0, 36(sp)
+// 0x01088db0: 0x1088db0: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2741,7 +2741,7 @@ L_1088780:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01088790: 0x1088790: jr    ra addiu sp, sp, 48
+// 0x01088db4: 0x1088db4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2753,7 +2753,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 AddAlertComment_1088798(int32,int32,int32,int32,int32)
+.method public static int32 AddAlertComment_1088dbc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s1,int32 ra)
@@ -2803,13 +2803,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1088798:
-// 0x01088798: 0x1088798: addiu sp, sp, -728
+L_1088dbc:
+// 0x01088dbc: 0x1088dbc: addiu sp, sp, -728
 	ldloc.0
 	ldc.i4 -728
 	add
 	stloc.0
-// 0x0108879c: 0x108879c: sw    s3, 716(sp)
+// 0x01088dc0: 0x1088dc0: sw    s3, 716(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2818,12 +2818,12 @@ L_1088798:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010887a0: 0x10887a0: addiu s3, sp, 56
+// 0x01088dc4: 0x1088dc4: addiu s3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 10
-// 0x010887a4: 0x10887a4: sw    s2, 712(sp)
+// 0x01088dc8: 0x1088dc8: sw    s2, 712(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2832,7 +2832,7 @@ L_1088798:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010887a8: 0x10887a8: sw    s0, 704(sp)
+// 0x01088dcc: 0x1088dcc: sw    s0, 704(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2841,16 +2841,16 @@ L_1088798:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010887ac: 0x10887ac: lui   s2, 0x0
+// 0x01088dd0: 0x1088dd0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010887b0: 0x10887b0: addu  s0, a0, zero
+// 0x01088dd4: 0x1088dd4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010887b4: 0x10887b4: addu  a0, s3, zero
+// 0x01088dd8: 0x1088dd8: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010887b8: 0x10887b8: sw    s1, 708(sp)
+// 0x01088ddc: 0x1088ddc: sw    s1, 708(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2859,11 +2859,11 @@ L_1088798:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010887bc: 0x10887bc: sw    ra, 724(sp)
-// 0x010887c0: 0x10887c0: addu  s1, a3, zero
+// 0x01088de0: 0x1088de0: sw    ra, 724(sp)
+// 0x01088de4: 0x1088de4: addu  s1, a3, zero
 	ldloc 4
 	stloc 12
-// 0x010887c4: 0x10887c4: jal   0x1078e9c sw    s4, 720(sp)
+// 0x01088de8: 0x1088de8: jal   0x10794c0 sw    s4, 720(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2877,28 +2877,28 @@ L_1088798:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Comment_Init_1078e9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Comment_Init_10794c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010887cc: 0x10887cc: addu  a0, s0, zero
+// 0x01088df0: 0x1088df0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010887d0: 0x10887d0: addiu a1, s2, 28076
+// 0x01088df4: 0x1088df4: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010887d4: 0x10887d4: addu  a2, zero, zero
+// 0x01088df8: 0x1088df8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010887d8: 0x10887d8: addiu a3, sp, 60
+// 0x01088dfc: 0x1088dfc: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x010887dc: 0x10887dc: jal   0x106855c sw    zero, 16(sp)
+// 0x01088e00: 0x1088e00: jal   0x106856c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2912,30 +2912,30 @@ L_1088798:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010887e4: 0x10887e4: beq   v0, zero, 0x108880c addiu v1, zero, 44
+// 0x01088e08: 0x1088e08: beq   v0, zero, 0x1088e30 addiu v1, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc 7
-	brfalse L_108880c
+	brfalse L_1088e30
 // --- basic block ---
-// 0x010887ec: 0x10887ec: lb    a0, 0(v0)
+// 0x01088e10: 0x1088e10: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010887f0: 0x10887f0: sll   zero, zero, 0
-// 0x010887f4: 0x10887f4: bne   a0, v1, 0x108880c addiu s0, zero, -1
+// 0x01088e14: 0x1088e14: sll   zero, zero, 0
+// 0x01088e18: 0x1088e18: bne   a0, v1, 0x1088e30 addiu s0, zero, -1
 	ldloc.1
 	ldloc 7
 	ldc.i4.m1
 	stloc 8
-	bne.un L_108880c
+	bne.un L_1088e30
 // --- basic block ---
-// 0x010887fc: 0x10887fc: lw    v1, 60(sp)
+// 0x01088e20: 0x1088e20: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2944,58 +2944,58 @@ L_1088798:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01088800: 0x1088800: sll   zero, zero, 0
-// 0x01088804: 0x1088804: bne   v1, s0, 0x1088828 sll   zero, zero, 0
+// 0x01088e24: 0x1088e24: sll   zero, zero, 0
+// 0x01088e28: 0x1088e28: bne   v1, s0, 0x1088e4c sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1088828
+	bne.un L_1088e4c
 // --- basic block ---
-L_108880c:
-// 0x0108880c: 0x108880c: lui   a1, 0x20000
+L_1088e30:
+// 0x01088e30: 0x1088e30: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088810: 0x1088810: lui   a3, 0x20000
+// 0x01088e34: 0x1088e34: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088814: 0x1088814: addiu a1, a1, -21512
+// 0x01088e38: 0x1088e38: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088818: 0x1088818: addiu a3, a3, -15332
+// 0x01088e3c: 0x1088e3c: addiu a3, a3, -14868
 	ldloc 4
-	ldc.i4 -15332
+	ldc.i4 -14868
 	add
 	stloc 4
-// 0x0108881c: 0x108881c: addiu a0, zero, 4
+// 0x01088e40: 0x1088e40: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088820: 0x1088820: j	 0x1088874 addiu a2, zero, 1832
+// 0x01088e44: 0x1088e44: j	 0x1088e98 addiu a2, zero, 1832
 	ldc.i4 1832
 	stloc.3
-	br L_1088874
+	br L_1088e98
 // --- basic block ---
-L_1088828:
-// 0x01088828: 0x1088828: addu  a3, s3, zero
+L_1088e4c:
+// 0x01088e4c: 0x1088e4c: addu  a3, s3, zero
 	ldloc 10
 	stloc 4
-// 0x0108882c: 0x108882c: addiu a0, v0, 1
+// 0x01088e50: 0x1088e50: addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01088830: 0x1088830: addiu s3, zero, 1
+// 0x01088e54: 0x1088e54: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x01088834: 0x1088834: addiu a1, s2, 28076
+// 0x01088e58: 0x1088e58: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01088838: 0x1088838: addu  a2, zero, zero
+// 0x01088e5c: 0x1088e5c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108883c: 0x108883c: jal   0x106855c sw    s3, 16(sp)
+// 0x01088e60: 0x1088e60: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3009,55 +3009,55 @@ L_1088828:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088844: 0x1088844: beq   v0, zero, 0x1088860 lui   a1, 0x20000
+// 0x01088e68: 0x1088e68: beq   v0, zero, 0x1088e84 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1088860
+	brfalse L_1088e84
 // --- basic block ---
-// 0x0108884c: 0x108884c: lb    v1, 0(v0)
+// 0x01088e70: 0x1088e70: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088850: 0x1088850: sll   zero, zero, 0
-// 0x01088854: 0x1088854: bne   v1, zero, 0x1088884 addiu s4, sp, 24
+// 0x01088e74: 0x1088e74: sll   zero, zero, 0
+// 0x01088e78: 0x1088e78: bne   v1, zero, 0x1088ea8 addiu s4, sp, 24
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-	brtrue L_1088884
+	brtrue L_1088ea8
 // --- basic block ---
-// 0x0108885c: 0x108885c: lui   a1, 0x20000
+// 0x01088e80: 0x1088e80: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1088860:
-// 0x01088860: 0x1088860: lui   a3, 0x20000
+L_1088e84:
+// 0x01088e84: 0x1088e84: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088864: 0x1088864: addiu a1, a1, -21512
+// 0x01088e88: 0x1088e88: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088868: 0x1088868: addiu a3, a3, -15260
+// 0x01088e8c: 0x1088e8c: addiu a3, a3, -14796
 	ldloc 4
-	ldc.i4 -15260
+	ldc.i4 -14796
 	add
 	stloc 4
-// 0x0108886c: 0x108886c: addiu a0, zero, 4
+// 0x01088e90: 0x1088e90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088870: 0x1088870: addiu a2, zero, 1850
+// 0x01088e94: 0x1088e94: addiu a2, zero, 1850
 	ldc.i4 1850
 	stloc.3
-L_1088874:
-// 0x01088874: 0x1088874: jal   0x100449c sll   zero, zero, 0
+L_1088e98:
+// 0x01088e98: 0x1088e98: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3068,32 +3068,32 @@ L_1088874:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108887c: 0x108887c: j	 0x1088be0 addiu v0, zero, 18
+// 0x01088ea0: 0x1088ea0: j	 0x1089204 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1088be0
+	br L_1089204
 // --- basic block ---
-L_1088884:
-// 0x01088884: 0x1088884: addu  a0, v0, zero
+L_1088ea8:
+// 0x01088ea8: 0x1088ea8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088888: 0x1088888: addiu a1, sp, 173
+// 0x01088eac: 0x1088eac: addiu a1, sp, 173
 	ldloc.0
 	ldc.i4 173
 	add
 	stloc.2
-// 0x0108888c: 0x108888c: addiu v0, zero, 400
+// 0x01088eb0: 0x1088eb0: addiu v0, zero, 400
 	ldc.i4 400
 	stloc 5
-// 0x01088890: 0x1088890: addu  a2, s4, zero
+// 0x01088eb4: 0x1088eb4: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01088894: 0x1088894: addiu a3, s2, 28076
+// 0x01088eb8: 0x1088eb8: addiu a3, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088898: 0x1088898: sw    s0, 16(sp)
+// 0x01088ebc: 0x1088ebc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3102,7 +3102,7 @@ L_1088884:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108889c: 0x108889c: jal   0x1068250 sw    v0, 24(sp)
+// 0x01088ec0: 0x1088ec0: jal   0x1068260 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3116,59 +3116,59 @@ L_1088884:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010888a4: 0x10888a4: bne   v0, zero, 0x10888c8 addu  s0, v0, zero
+// 0x01088ec8: 0x1088ec8: bne   v0, zero, 0x1088eec addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10888c8
+	brtrue L_1088eec
 // --- basic block ---
-// 0x010888ac: 0x10888ac: lui   a1, 0x20000
+// 0x01088ed0: 0x1088ed0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010888b0: 0x10888b0: lui   a3, 0x20000
+// 0x01088ed4: 0x1088ed4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010888b4: 0x10888b4: addiu a1, a1, -21512
+// 0x01088ed8: 0x1088ed8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010888b8: 0x10888b8: addiu a3, a3, -15188
+// 0x01088edc: 0x1088edc: addiu a3, a3, -14724
 	ldloc 4
-	ldc.i4 -15188
+	ldc.i4 -14724
 	add
 	stloc 4
-// 0x010888bc: 0x10888bc: addiu a0, zero, 4
+// 0x01088ee0: 0x1088ee0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010888c0: 0x10888c0: j	 0x1088a78 addiu a2, zero, 1866
+// 0x01088ee4: 0x1088ee4: j	 0x108909c addiu a2, zero, 1866
 	ldc.i4 1866
 	stloc.3
-	br L_1088a78
+	br L_108909c
 // --- basic block ---
-L_10888c8:
-// 0x010888c8: 0x10888c8: addu  a0, v0, zero
+L_1088eec:
+// 0x01088eec: 0x1088eec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010888cc: 0x10888cc: addiu a1, s2, 28076
+// 0x01088ef0: 0x1088ef0: addiu a1, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010888d0: 0x10888d0: addu  a2, zero, zero
+// 0x01088ef4: 0x1088ef4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010888d4: 0x10888d4: addiu a3, sp, 64
+// 0x01088ef8: 0x1088ef8: addiu a3, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 4
-// 0x010888d8: 0x10888d8: jal   0x10686b8 sw    s3, 16(sp)
+// 0x01088efc: 0x1088efc: jal   0x10686c8 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3182,62 +3182,62 @@ L_10888c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadInt64FromString_10686b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadInt64FromString_10686c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010888e0: 0x10888e0: bne   v0, zero, 0x1088904 addu  s0, v0, zero
+// 0x01088f04: 0x1088f04: bne   v0, zero, 0x1088f28 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1088904
+	brtrue L_1088f28
 // --- basic block ---
-// 0x010888e8: 0x10888e8: lui   a1, 0x20000
+// 0x01088f0c: 0x1088f0c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010888ec: 0x10888ec: lui   a3, 0x20000
+// 0x01088f10: 0x1088f10: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010888f0: 0x10888f0: addiu a1, a1, -21512
+// 0x01088f14: 0x1088f14: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010888f4: 0x10888f4: addiu a3, a3, -15112
+// 0x01088f18: 0x1088f18: addiu a3, a3, -14648
 	ldloc 4
-	ldc.i4 -15112
+	ldc.i4 -14648
 	add
 	stloc 4
-// 0x010888f8: 0x10888f8: addiu a0, zero, 4
+// 0x01088f1c: 0x1088f1c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010888fc: 0x10888fc: j	 0x1088a78 addiu a2, zero, 1881
+// 0x01088f20: 0x1088f20: j	 0x108909c addiu a2, zero, 1881
 	ldc.i4 1881
 	stloc.3
-	br L_1088a78
+	br L_108909c
 // --- basic block ---
-L_1088904:
-// 0x01088904: 0x1088904: addu  a0, v0, zero
+L_1088f28:
+// 0x01088f28: 0x1088f28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088908: 0x1088908: addiu a1, sp, 72
+// 0x01088f2c: 0x1088f2c: addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x0108890c: 0x108890c: addiu v0, zero, 100
+// 0x01088f30: 0x1088f30: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x01088910: 0x1088910: addu  a2, s4, zero
+// 0x01088f34: 0x1088f34: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01088914: 0x1088914: addiu a3, s2, 28076
+// 0x01088f38: 0x1088f38: addiu a3, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088918: 0x1088918: sw    v0, 24(sp)
+// 0x01088f3c: 0x1088f3c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3246,7 +3246,7 @@ L_1088904:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108891c: 0x108891c: jal   0x1068250 sw    s3, 16(sp)
+// 0x01088f40: 0x1088f40: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3260,62 +3260,62 @@ L_1088904:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088924: 0x1088924: bne   v0, zero, 0x1088948 addu  s0, v0, zero
+// 0x01088f48: 0x1088f48: bne   v0, zero, 0x1088f6c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1088948
+	brtrue L_1088f6c
 // --- basic block ---
-// 0x0108892c: 0x108892c: lui   a1, 0x20000
+// 0x01088f50: 0x1088f50: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088930: 0x1088930: lui   a3, 0x20000
+// 0x01088f54: 0x1088f54: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088934: 0x1088934: addiu a1, a1, -21512
+// 0x01088f58: 0x1088f58: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088938: 0x1088938: addiu a3, a3, -15036
+// 0x01088f5c: 0x1088f5c: addiu a3, a3, -14572
 	ldloc 4
-	ldc.i4 -15036
+	ldc.i4 -14572
 	add
 	stloc 4
-// 0x0108893c: 0x108893c: addiu a0, zero, 4
+// 0x01088f60: 0x1088f60: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088940: 0x1088940: j	 0x1088a78 addiu a2, zero, 1898
+// 0x01088f64: 0x1088f64: j	 0x108909c addiu a2, zero, 1898
 	ldc.i4 1898
 	stloc.3
-	br L_1088a78
+	br L_108909c
 // --- basic block ---
-L_1088948:
-// 0x01088948: 0x1088948: addu  a0, v0, zero
+L_1088f6c:
+// 0x01088f6c: 0x1088f6c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108894c: 0x108894c: addu  a2, s4, zero
+// 0x01088f70: 0x1088f70: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01088950: 0x1088950: addiu v0, zero, 5
+// 0x01088f74: 0x1088f74: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01088954: 0x1088954: addiu a3, s2, 28076
+// 0x01088f78: 0x1088f78: addiu a3, s2, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088958: 0x1088958: addiu a1, sp, 28
+// 0x01088f7c: 0x1088f7c: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x0108895c: 0x108895c: sw    v0, 24(sp)
+// 0x01088f80: 0x1088f80: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3324,7 +3324,7 @@ L_1088948:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088960: 0x1088960: jal   0x1068250 sw    s3, 16(sp)
+// 0x01088f84: 0x1088f84: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3338,37 +3338,37 @@ L_1088948:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088968: 0x1088968: bne   v0, zero, 0x1088990 lui   a1, 0x20000
+// 0x01088f8c: 0x1088f8c: bne   v0, zero, 0x1088fb4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088990
+	brtrue L_1088fb4
 // --- basic block ---
-// 0x01088970: 0x1088970: lui   a3, 0x20000
+// 0x01088f94: 0x1088f94: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088974: 0x1088974: addiu a1, a1, -21512
+// 0x01088f98: 0x1088f98: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088978: 0x1088978: addiu a3, a3, -14964
+// 0x01088f9c: 0x1088f9c: addiu a3, a3, -14500
 	ldloc 4
-	ldc.i4 -14964
+	ldc.i4 -14500
 	add
 	stloc 4
-// 0x0108897c: 0x108897c: addiu a0, zero, 4
+// 0x01088fa0: 0x1088fa0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088980: 0x1088980: addiu a2, zero, 1914
+// 0x01088fa4: 0x1088fa4: addiu a2, zero, 1914
 	ldc.i4 1914
 	stloc.3
-// 0x01088984: 0x1088984: jal   0x100449c sw    v0, 696(sp)
+// 0x01088fa8: 0x1088fa8: jal   0x100449c sw    v0, 696(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3387,7 +3387,7 @@ L_1088948:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108898c: 0x108898c: lw    v0, 696(sp)
+// 0x01088fb0: 0x1088fb0: lw    v0, 696(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3396,24 +3396,24 @@ L_1088948:
 	add
 	ldelem.i4
 	stloc 5
-L_1088990:
-// 0x01088990: 0x1088990: lb    a0, 28(sp)
+L_1088fb4:
+// 0x01088fb4: 0x1088fb4: lb    a0, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01088994: 0x1088994: addiu v1, zero, 84
+// 0x01088fb8: 0x1088fb8: addiu v1, zero, 84
 	ldc.i4.s 84
 	stloc 7
-// 0x01088998: 0x1088998: bne   a0, v1, 0x10889a8 addiu v1, zero, 1
+// 0x01088fbc: 0x1088fbc: bne   a0, v1, 0x1088fcc addiu v1, zero, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	stloc 7
-	bne.un L_10889a8
+	bne.un L_1088fcc
 // --- basic block ---
-// 0x010889a0: 0x10889a0: j	 0x10889ac sw    v1, 576(sp)
+// 0x01088fc4: 0x1088fc4: j	 0x1088fd0 sw    v1, 576(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3422,10 +3422,10 @@ L_1088990:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10889ac
+	br L_1088fd0
 // --- basic block ---
-L_10889a8:
-// 0x010889a8: 0x10889a8: sw    zero, 576(sp)
+L_1088fcc:
+// 0x01088fcc: 0x1088fcc: sw    zero, 576(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3434,30 +3434,30 @@ L_10889a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10889ac:
-// 0x010889ac: 0x10889ac: lui   s3, 0x0
+L_1088fd0:
+// 0x01088fd0: 0x1088fd0: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010889b0: 0x10889b0: addiu s2, zero, 1
+// 0x01088fd4: 0x1088fd4: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010889b4: 0x10889b4: addu  a0, v0, zero
+// 0x01088fd8: 0x1088fd8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010889b8: 0x10889b8: addiu a1, s3, 28076
+// 0x01088fdc: 0x1088fdc: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010889bc: 0x10889bc: addu  a2, zero, zero
+// 0x01088fe0: 0x1088fe0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010889c0: 0x10889c0: addiu a3, sp, 588
+// 0x01088fe4: 0x1088fe4: addiu a3, sp, 588
 	ldloc.0
 	ldc.i4 588
 	add
 	stloc 4
-// 0x010889c4: 0x10889c4: jal   0x106855c sw    s2, 16(sp)
+// 0x01088fe8: 0x1088fe8: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3471,66 +3471,66 @@ L_10889ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010889cc: 0x10889cc: beq   v0, zero, 0x10889e4 lui   a1, 0x20000
+// 0x01088ff0: 0x1088ff0: beq   v0, zero, 0x1089008 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10889e4
+	brfalse L_1089008
 // --- basic block ---
-// 0x010889d4: 0x10889d4: lb    v1, 0(v0)
+// 0x01088ff8: 0x1088ff8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010889d8: 0x10889d8: sll   zero, zero, 0
-// 0x010889dc: 0x10889dc: bne   v1, zero, 0x10889fc sll   zero, zero, 0
+// 0x01088ffc: 0x1088ffc: sll   zero, zero, 0
+// 0x01089000: 0x1089000: bne   v1, zero, 0x1089020 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10889fc
+	brtrue L_1089020
 // --- basic block ---
-L_10889e4:
-// 0x010889e4: 0x10889e4: lui   a3, 0x20000
+L_1089008:
+// 0x01089008: 0x1089008: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010889e8: 0x10889e8: addiu a1, a1, -21512
+// 0x0108900c: 0x108900c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010889ec: 0x10889ec: addiu a3, a3, -14884
+// 0x01089010: 0x1089010: addiu a3, a3, -14420
 	ldloc 4
-	ldc.i4 -14884
+	ldc.i4 -14420
 	add
 	stloc 4
-// 0x010889f0: 0x10889f0: addiu a0, zero, 4
+// 0x01089014: 0x1089014: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010889f4: 0x10889f4: j	 0x1088874 addiu a2, zero, 1933
+// 0x01089018: 0x1089018: j	 0x1088e98 addiu a2, zero, 1933
 	ldc.i4 1933
 	stloc.3
-	br L_1088874
+	br L_1088e98
 // --- basic block ---
-L_10889fc:
-// 0x010889fc: 0x10889fc: addu  a0, v0, zero
+L_1089020:
+// 0x01089020: 0x1089020: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088a00: 0x1088a00: addiu a1, s3, 28076
+// 0x01089024: 0x1089024: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01088a04: 0x1088a04: addu  a2, zero, zero
+// 0x01089028: 0x1089028: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01088a08: 0x1088a08: addiu a3, sp, 584
+// 0x0108902c: 0x108902c: addiu a3, sp, 584
 	ldloc.0
 	ldc.i4 584
 	add
 	stloc 4
-// 0x01088a0c: 0x1088a0c: jal   0x106855c sw    s2, 16(sp)
+// 0x01089030: 0x1089030: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3544,64 +3544,64 @@ L_10889fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088a14: 0x1088a14: bne   v0, zero, 0x1088a38 addu  s0, v0, zero
+// 0x01089038: 0x1089038: bne   v0, zero, 0x108905c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1088a38
+	brtrue L_108905c
 // --- basic block ---
-// 0x01088a1c: 0x1088a1c: lui   a1, 0x20000
+// 0x01089040: 0x1089040: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088a20: 0x1088a20: lui   a3, 0x20000
+// 0x01089044: 0x1089044: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088a24: 0x1088a24: addiu a1, a1, -21512
+// 0x01089048: 0x1089048: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088a28: 0x1088a28: addiu a3, a3, -14816
+// 0x0108904c: 0x108904c: addiu a3, a3, -14352
 	ldloc 4
-	ldc.i4 -14816
+	ldc.i4 -14352
 	add
 	stloc 4
-// 0x01088a2c: 0x1088a2c: addiu a0, zero, 4
+// 0x01089050: 0x1089050: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088a30: 0x1088a30: j	 0x1088a78 addiu a2, zero, 1948
+// 0x01089054: 0x1089054: j	 0x108909c addiu a2, zero, 1948
 	ldc.i4 1948
 	stloc.3
-	br L_1088a78
+	br L_108909c
 // --- basic block ---
-L_1088a38:
-// 0x01088a38: 0x1088a38: addu  a0, v0, zero
+L_108905c:
+// 0x0108905c: 0x108905c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088a3c: 0x1088a3c: addiu a3, s3, 28076
+// 0x01089060: 0x1089060: addiu a3, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088a40: 0x1088a40: addiu v0, zero, 5
+// 0x01089064: 0x1089064: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01088a44: 0x1088a44: addiu a1, sp, 36
+// 0x01089068: 0x1089068: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x01088a48: 0x1088a48: addiu a2, sp, 24
+// 0x0108906c: 0x108906c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01088a4c: 0x1088a4c: sw    v0, 24(sp)
+// 0x01089070: 0x1089070: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3610,7 +3610,7 @@ L_1088a38:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088a50: 0x1088a50: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089074: 0x1089074: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3624,41 +3624,41 @@ L_1088a38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088a58: 0x1088a58: bne   v0, zero, 0x1088a88 addu  s0, v0, zero
+// 0x0108907c: 0x108907c: bne   v0, zero, 0x10890ac addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1088a88
+	brtrue L_10890ac
 // --- basic block ---
-// 0x01088a60: 0x1088a60: lui   a1, 0x20000
+// 0x01089084: 0x1089084: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088a64: 0x1088a64: lui   a3, 0x20000
+// 0x01089088: 0x1089088: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088a68: 0x1088a68: addiu a1, a1, -21512
+// 0x0108908c: 0x108908c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088a6c: 0x1088a6c: addiu a3, a3, -14748
+// 0x01089090: 0x1089090: addiu a3, a3, -14284
 	ldloc 4
-	ldc.i4 -14748
+	ldc.i4 -14284
 	add
 	stloc 4
-// 0x01088a70: 0x1088a70: addiu a0, zero, 4
+// 0x01089094: 0x1089094: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088a74: 0x1088a74: addiu a2, zero, 1964
+// 0x01089098: 0x1089098: addiu a2, zero, 1964
 	ldc.i4 1964
 	stloc.3
-L_1088a78:
-// 0x01088a78: 0x1088a78: jal   0x100449c sll   zero, zero, 0
+L_108909c:
+// 0x0108909c: 0x108909c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3669,27 +3669,27 @@ L_1088a78:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088a80: 0x1088a80: j	 0x1088b88 addiu v0, zero, 18
+// 0x010890a4: 0x10890a4: j	 0x10891ac addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1088b88
+	br L_10891ac
 // --- basic block ---
-L_1088a88:
-// 0x01088a88: 0x1088a88: lb    v1, 36(sp)
+L_10890ac:
+// 0x010890ac: 0x10890ac: lb    v1, 36(sp)
 	ldloc.0
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088a8c: 0x1088a8c: addiu v0, zero, 84
+// 0x010890b0: 0x10890b0: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x01088a90: 0x1088a90: bne   v1, v0, 0x1088aa0 sll   zero, zero, 0
+// 0x010890b4: 0x10890b4: bne   v1, v0, 0x10890c4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1088aa0
+	bne.un L_10890c4
 // --- basic block ---
-// 0x01088a98: 0x1088a98: j	 0x1088aa4 sw    s2, 580(sp)
+// 0x010890bc: 0x10890bc: j	 0x10890c8 sw    s2, 580(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3698,10 +3698,10 @@ L_1088a88:
 	add
 	ldloc 9
 	stelem.i4
-	br L_1088aa4
+	br L_10890c8
 // --- basic block ---
-L_1088aa0:
-// 0x01088aa0: 0x1088aa0: sw    zero, 580(sp)
+L_10890c4:
+// 0x010890c4: 0x10890c4: sw    zero, 580(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3710,41 +3710,41 @@ L_1088aa0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1088aa4:
-// 0x01088aa4: 0x1088aa4: lb    v1, 0(s0)
+L_10890c8:
+// 0x010890c8: 0x10890c8: lb    v1, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088aa8: 0x1088aa8: addiu v0, zero, 44
+// 0x010890cc: 0x10890cc: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x01088aac: 0x1088aac: bne   v1, v0, 0x1088ad8 lui   a3, 0x0
+// 0x010890d0: 0x10890d0: bne   v1, v0, 0x10890fc lui   a3, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_1088ad8
+	bne.un L_10890fc
 // --- basic block ---
-// 0x01088ab4: 0x1088ab4: lui   a1, 0x20000
+// 0x010890d8: 0x10890d8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088ab8: 0x1088ab8: lui   a3, 0x20000
+// 0x010890dc: 0x10890dc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088abc: 0x1088abc: addiu a1, a1, -21512
+// 0x010890e0: 0x10890e0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088ac0: 0x1088ac0: addiu a3, a3, -14672
+// 0x010890e4: 0x10890e4: addiu a3, a3, -14208
 	ldloc 4
-	ldc.i4 -14672
+	ldc.i4 -14208
 	add
 	stloc 4
-// 0x01088ac4: 0x1088ac4: addiu a0, zero, 1
+// 0x010890e8: 0x10890e8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01088ac8: 0x1088ac8: jal   0x100449c addiu a2, zero, 1977
+// 0x010890ec: 0x10890ec: jal   0x100449c addiu a2, zero, 1977
 	ldc.i4 1977
 	stloc.3
 	ldloc.0
@@ -3757,18 +3757,18 @@ L_1088aa4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088ad0: 0x1088ad0: j	 0x1088b2c addiu v0, s0, 1
+// 0x010890f4: 0x10890f4: j	 0x1089150 addiu v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 5
-	br L_1088b2c
+	br L_1089150
 // --- basic block ---
-L_1088ad8:
-// 0x01088ad8: 0x1088ad8: addiu v0, zero, 100
+L_10890fc:
+// 0x010890fc: 0x10890fc: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x01088adc: 0x1088adc: sw    v0, 24(sp)
+// 0x01089100: 0x1089100: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3777,28 +3777,28 @@ L_1088ad8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088ae0: 0x1088ae0: addu  a0, s0, zero
+// 0x01089104: 0x1089104: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01088ae4: 0x1088ae4: addiu v0, zero, 1
+// 0x01089108: 0x1089108: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01088ae8: 0x1088ae8: addiu a3, a3, 28076
+// 0x0108910c: 0x108910c: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088aec: 0x1088aec: addiu a1, sp, 592
+// 0x01089110: 0x1089110: addiu a1, sp, 592
 	ldloc.0
 	ldc.i4 592
 	add
 	stloc.2
-// 0x01088af0: 0x1088af0: addiu a2, sp, 24
+// 0x01089114: 0x1089114: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01088af4: 0x1088af4: jal   0x1068250 sw    v0, 16(sp)
+// 0x01089118: 0x1089118: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3812,59 +3812,59 @@ L_1088ad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088afc: 0x1088afc: beq   v0, zero, 0x1088b14 lui   a1, 0x20000
+// 0x01089120: 0x1089120: beq   v0, zero, 0x1089138 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1088b14
+	brfalse L_1089138
 // --- basic block ---
-// 0x01088b04: 0x1088b04: lb    v1, 0(v0)
+// 0x01089128: 0x1089128: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088b08: 0x1088b08: sll   zero, zero, 0
-// 0x01088b0c: 0x1088b0c: bne   v1, zero, 0x1088b2c sll   zero, zero, 0
+// 0x0108912c: 0x108912c: sll   zero, zero, 0
+// 0x01089130: 0x1089130: bne   v1, zero, 0x1089150 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1088b2c
+	brtrue L_1089150
 // --- basic block ---
-L_1088b14:
-// 0x01088b14: 0x1088b14: lui   a3, 0x20000
+L_1089138:
+// 0x01089138: 0x1089138: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088b18: 0x1088b18: addiu a1, a1, -21512
+// 0x0108913c: 0x108913c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088b1c: 0x1088b1c: addiu a3, a3, -14592
+// 0x01089140: 0x1089140: addiu a3, a3, -14128
 	ldloc 4
-	ldc.i4 -14592
+	ldc.i4 -14128
 	add
 	stloc 4
-// 0x01088b20: 0x1088b20: addiu a0, zero, 4
+// 0x01089144: 0x1089144: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088b24: 0x1088b24: j	 0x1088874 addiu a2, zero, 1993
+// 0x01089148: 0x1089148: j	 0x1088e98 addiu a2, zero, 1993
 	ldc.i4 1993
 	stloc.3
-	br L_1088874
+	br L_1088e98
 // --- basic block ---
-L_1088b2c:
-// 0x01088b2c: 0x1088b2c: addu  a0, v0, zero
+L_1089150:
+// 0x01089150: 0x1089150: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088b30: 0x1088b30: lui   a3, 0x0
+// 0x01089154: 0x1089154: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01088b34: 0x1088b34: addiu v0, zero, 5
+// 0x01089158: 0x1089158: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01088b38: 0x1088b38: sw    v0, 24(sp)
+// 0x0108915c: 0x108915c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3873,25 +3873,25 @@ L_1088b2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088b3c: 0x1088b3c: addiu a3, a3, 30268
+// 0x01089160: 0x1089160: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01088b40: 0x1088b40: addiu v0, zero, -1
+// 0x01089164: 0x1089164: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01088b44: 0x1088b44: addiu a1, sp, 44
+// 0x01089168: 0x1089168: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x01088b48: 0x1088b48: addiu a2, sp, 24
+// 0x0108916c: 0x108916c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01088b4c: 0x1088b4c: sw    v0, 16(sp)
+// 0x01089170: 0x1089170: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3900,7 +3900,7 @@ L_1088b2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088b50: 0x1088b50: jal   0x1068250 sb    zero, 44(sp)
+// 0x01089174: 0x1089174: jal   0x1068260 sb    zero, 44(sp)
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -3911,24 +3911,24 @@ L_1088b2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088b58: 0x1088b58: bne   v0, zero, 0x1088b90 addu  s0, v0, zero
+// 0x0108917c: 0x108917c: bne   v0, zero, 0x10891b4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1088b90
+	brtrue L_10891b4
 // --- basic block ---
-// 0x01088b60: 0x1088b60: lui   a1, 0x20000
+// 0x01089184: 0x1089184: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088b64: 0x1088b64: lui   a3, 0x20000
+// 0x01089188: 0x1089188: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088b68: 0x1088b68: lw    v0, 56(sp)
+// 0x0108918c: 0x108918c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3937,23 +3937,23 @@ L_1088b2c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088b6c: 0x1088b6c: addiu a1, a1, -21512
+// 0x01089190: 0x1089190: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088b70: 0x1088b70: addiu a3, a3, -14516
+// 0x01089194: 0x1089194: addiu a3, a3, -14052
 	ldloc 4
-	ldc.i4 -14516
+	ldc.i4 -14052
 	add
 	stloc 4
-// 0x01088b74: 0x1088b74: addiu a0, zero, 4
+// 0x01089198: 0x1089198: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088b78: 0x1088b78: addiu a2, zero, 2011
+// 0x0108919c: 0x108919c: addiu a2, zero, 2011
 	ldc.i4 2011
 	stloc.3
-// 0x01088b7c: 0x1088b7c: jal   0x100449c sw    v0, 16(sp)
+// 0x010891a0: 0x10891a0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3972,37 +3972,37 @@ L_1088b2c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088b84: 0x1088b84: addiu v0, zero, 18
+// 0x010891a8: 0x10891a8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_1088b88:
-// 0x01088b88: 0x1088b88: j	 0x1088be8 sw    v0, 0(s1)
+L_10891ac:
+// 0x010891ac: 0x10891ac: j	 0x108920c sw    v0, 0(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1088be8
+	br L_108920c
 // --- basic block ---
-L_1088b90:
-// 0x01088b90: 0x1088b90: lb    v1, 44(sp)
+L_10891b4:
+// 0x010891b4: 0x10891b4: lb    v1, 44(sp)
 	ldloc.0
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01088b94: 0x1088b94: addiu v0, zero, 84
+// 0x010891b8: 0x10891b8: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x01088b98: 0x1088b98: bne   v1, v0, 0x1088ba8 addiu v0, zero, 1
+// 0x010891bc: 0x10891bc: bne   v1, v0, 0x10891cc addiu v0, zero, 1
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	bne.un L_1088ba8
+	bne.un L_10891cc
 // --- basic block ---
-// 0x01088ba0: 0x1088ba0: j	 0x1088bac sw    v0, 692(sp)
+// 0x010891c4: 0x10891c4: j	 0x10891d0 sw    v0, 692(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4011,10 +4011,10 @@ L_1088b90:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1088bac
+	br L_10891d0
 // --- basic block ---
-L_1088ba8:
-// 0x01088ba8: 0x1088ba8: sw    zero, 692(sp)
+L_10891cc:
+// 0x010891cc: 0x10891cc: sw    zero, 692(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4023,8 +4023,8 @@ L_1088ba8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1088bac:
-// 0x01088bac: 0x1088bac: jal   0x107c05c addiu a0, sp, 56
+L_10891d0:
+// 0x010891d0: 0x10891d0: jal   0x107c680 addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4034,18 +4034,18 @@ L_1088bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::RTAlerts_Comment_Add_107c05c(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::RTAlerts_Comment_Add_107c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088bb4: 0x1088bb4: bne   v0, zero, 0x1088be8 lui   a1, 0x20000
+// 0x010891d8: 0x10891d8: bne   v0, zero, 0x108920c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088be8
+	brtrue L_108920c
 // --- basic block ---
-// 0x01088bbc: 0x1088bbc: lw    v0, 56(sp)
+// 0x010891e0: 0x10891e0: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4054,26 +4054,26 @@ L_1088bac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01088bc0: 0x1088bc0: lui   a3, 0x20000
+// 0x010891e4: 0x10891e4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088bc4: 0x1088bc4: addiu a1, a1, -21512
+// 0x010891e8: 0x10891e8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088bc8: 0x1088bc8: addiu a3, a3, -14420
+// 0x010891ec: 0x10891ec: addiu a3, a3, -13956
 	ldloc 4
-	ldc.i4 -14420
+	ldc.i4 -13956
 	add
 	stloc 4
-// 0x01088bcc: 0x1088bcc: addiu a0, zero, 4
+// 0x010891f0: 0x10891f0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088bd0: 0x1088bd0: addiu a2, zero, 2025
+// 0x010891f4: 0x10891f4: addiu a2, zero, 2025
 	ldc.i4 2025
 	stloc.3
-// 0x01088bd4: 0x1088bd4: jal   0x100449c sw    v0, 16(sp)
+// 0x010891f8: 0x10891f8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4092,26 +4092,26 @@ L_1088bac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088bdc: 0x1088bdc: addiu v0, zero, 8
+// 0x01089200: 0x1089200: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-L_1088be0:
-// 0x01088be0: 0x1088be0: sw    v0, 0(s1)
+L_1089204:
+// 0x01089204: 0x1089204: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01088be4: 0x1088be4: addu  s0, zero, zero
+// 0x01089208: 0x1089208: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_1088be8:
-// 0x01088be8: 0x1088be8: lw    ra, 724(sp)
-// 0x01088bec: 0x1088bec: addu  v0, s0, zero
+L_108920c:
+// 0x0108920c: 0x108920c: lw    ra, 724(sp)
+// 0x01089210: 0x1089210: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01088bf0: 0x1088bf0: lw    s4, 720(sp)
+// 0x01089214: 0x1089214: lw    s4, 720(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4120,7 +4120,7 @@ L_1088be8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01088bf4: 0x1088bf4: lw    s3, 716(sp)
+// 0x01089218: 0x1089218: lw    s3, 716(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4129,7 +4129,7 @@ L_1088be8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01088bf8: 0x1088bf8: lw    s2, 712(sp)
+// 0x0108921c: 0x108921c: lw    s2, 712(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4138,7 +4138,7 @@ L_1088be8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01088bfc: 0x1088bfc: lw    s1, 708(sp)
+// 0x01089220: 0x1089220: lw    s1, 708(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4147,7 +4147,7 @@ L_1088be8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01088c00: 0x1088c00: lw    s0, 704(sp)
+// 0x01089224: 0x1089224: lw    s0, 704(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4156,7 +4156,7 @@ L_1088be8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01088c04: 0x1088c04: jr    ra addiu sp, sp, 728
+// 0x01089228: 0x1089228: jr    ra addiu sp, sp, 728
 	ldloc.0
 	ldc.i4 728
 	add
@@ -4168,7 +4168,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 BridgeToRes_1088c0c(int32,int32,int32,int32,int32)
+.method public static int32 BridgeToRes_1089230(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 v1,int32 s1,int32 s0,int32 s3,int32 s4,int32 ra)
@@ -4218,13 +4218,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1088c0c:
-// 0x01088c0c: 0x1088c0c: addiu sp, sp, -160
+L_1089230:
+// 0x01089230: 0x1089230: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x01088c10: 0x1088c10: sw    s2, 144(sp)
+// 0x01089234: 0x1089234: sw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4233,7 +4233,7 @@ L_1088c0c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01088c14: 0x1088c14: sw    s0, 136(sp)
+// 0x01089238: 0x1089238: sw    s0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4242,18 +4242,18 @@ L_1088c0c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01088c18: 0x1088c18: addiu s2, sp, 36
+// 0x0108923c: 0x108923c: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 7
-// 0x01088c1c: 0x1088c1c: addu  s0, a3, zero
+// 0x01089240: 0x1089240: addu  s0, a3, zero
 	ldloc 4
 	stloc 10
-// 0x01088c20: 0x1088c20: lui   a3, 0x0
+// 0x01089244: 0x1089244: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01088c24: 0x1088c24: sw    s3, 148(sp)
+// 0x01089248: 0x1089248: sw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4262,26 +4262,26 @@ L_1088c0c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01088c28: 0x1088c28: addiu v0, zero, 100
+// 0x0108924c: 0x108924c: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x01088c2c: 0x1088c2c: addiu a3, a3, 28076
+// 0x01089250: 0x1089250: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01088c30: 0x1088c30: addiu s3, zero, 1
+// 0x01089254: 0x1089254: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x01088c34: 0x1088c34: addu  a1, s2, zero
+// 0x01089258: 0x1089258: addu  a1, s2, zero
 	ldloc 7
 	stloc.2
-// 0x01088c38: 0x1088c38: addiu a2, sp, 28
+// 0x0108925c: 0x108925c: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x01088c3c: 0x1088c3c: sw    s1, 140(sp)
+// 0x01089260: 0x1089260: sw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4290,8 +4290,8 @@ L_1088c0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01088c40: 0x1088c40: sw    ra, 156(sp)
-// 0x01088c44: 0x1088c44: sw    s4, 152(sp)
+// 0x01089264: 0x1089264: sw    ra, 156(sp)
+// 0x01089268: 0x1089268: sw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4300,7 +4300,7 @@ L_1088c0c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01088c48: 0x1088c48: sw    v0, 28(sp)
+// 0x0108926c: 0x108926c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4309,7 +4309,7 @@ L_1088c0c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01088c4c: 0x1088c4c: jal   0x1068250 sw    s3, 16(sp)
+// 0x01089270: 0x1089270: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4323,65 +4323,65 @@ L_1088c0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088c54: 0x1088c54: bne   v0, zero, 0x1088c78 addu  s1, v0, zero
+// 0x01089278: 0x1089278: bne   v0, zero, 0x108929c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1088c78
+	brtrue L_108929c
 // --- basic block ---
-// 0x01088c5c: 0x1088c5c: lui   a1, 0x20000
+// 0x01089280: 0x1089280: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088c60: 0x1088c60: lui   a3, 0x20000
+// 0x01089284: 0x1089284: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088c64: 0x1088c64: addiu a1, a1, -21512
+// 0x01089288: 0x1089288: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088c68: 0x1088c68: addiu a3, a3, -14340
+// 0x0108928c: 0x108928c: addiu a3, a3, -13876
 	ldloc 4
-	ldc.i4 -14340
+	ldc.i4 -13876
 	add
 	stloc 4
-// 0x01088c6c: 0x1088c6c: addiu a0, zero, 4
+// 0x01089290: 0x1089290: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088c70: 0x1088c70: j	 0x1088cb8 addiu a2, zero, 1731
+// 0x01089294: 0x1089294: j	 0x10892dc addiu a2, zero, 1731
 	ldc.i4 1731
 	stloc.3
-	br L_1088cb8
+	br L_10892dc
 // --- basic block ---
-L_1088c78:
-// 0x01088c78: 0x1088c78: lui   s4, 0x0
+L_108929c:
+// 0x0108929c: 0x108929c: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01088c7c: 0x1088c7c: addu  a0, v0, zero
+// 0x010892a0: 0x10892a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088c80: 0x1088c80: addiu a1, s4, 30268
+// 0x010892a4: 0x10892a4: addiu a1, s4, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01088c84: 0x1088c84: addiu v0, zero, -1
+// 0x010892a8: 0x10892a8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01088c88: 0x1088c88: addu  a2, zero, zero
+// 0x010892ac: 0x10892ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01088c8c: 0x1088c8c: addiu a3, sp, 24
+// 0x010892b0: 0x10892b0: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01088c90: 0x1088c90: jal   0x106855c sw    v0, 16(sp)
+// 0x010892b4: 0x10892b4: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4395,41 +4395,41 @@ L_1088c78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088c98: 0x1088c98: bne   v0, zero, 0x1088ccc addu  s1, v0, zero
+// 0x010892bc: 0x10892bc: bne   v0, zero, 0x10892f0 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1088ccc
+	brtrue L_10892f0
 // --- basic block ---
-// 0x01088ca0: 0x1088ca0: lui   a1, 0x20000
+// 0x010892c4: 0x10892c4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088ca4: 0x1088ca4: lui   a3, 0x20000
+// 0x010892c8: 0x10892c8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088ca8: 0x1088ca8: addiu a1, a1, -21512
+// 0x010892cc: 0x10892cc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088cac: 0x1088cac: addiu a3, a3, -14268
+// 0x010892d0: 0x10892d0: addiu a3, a3, -13804
 	ldloc 4
-	ldc.i4 -14268
+	ldc.i4 -13804
 	add
 	stloc 4
-// 0x01088cb0: 0x1088cb0: addiu a0, zero, 4
+// 0x010892d4: 0x10892d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088cb4: 0x1088cb4: addiu a2, zero, 1746
+// 0x010892d8: 0x10892d8: addiu a2, zero, 1746
 	ldc.i4 1746
 	stloc.3
-L_1088cb8:
-// 0x01088cb8: 0x1088cb8: jal   0x100449c sll   zero, zero, 0
+L_10892dc:
+// 0x010892dc: 0x10892dc: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4440,37 +4440,37 @@ L_1088cb8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088cc0: 0x1088cc0: addiu v0, zero, 18
+// 0x010892e4: 0x10892e4: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_1088cc4:
-// 0x01088cc4: 0x1088cc4: j	 0x1088f9c sw    v0, 0(s0)
+L_10892e8:
+// 0x010892e8: 0x10892e8: j	 0x10895c0 sw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1088f9c
+	br L_10895c0
 // --- basic block ---
-L_1088ccc:
-// 0x01088ccc: 0x1088ccc: addu  a0, v0, zero
+L_10892f0:
+// 0x010892f0: 0x10892f0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01088cd0: 0x1088cd0: addiu a1, s4, 30268
+// 0x010892f4: 0x10892f4: addiu a1, s4, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01088cd4: 0x1088cd4: addu  a2, zero, zero
+// 0x010892f8: 0x10892f8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01088cd8: 0x1088cd8: addiu a3, sp, 32
+// 0x010892fc: 0x10892fc: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01088cdc: 0x1088cdc: jal   0x106855c sw    s3, 16(sp)
+// 0x01089300: 0x1089300: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4484,51 +4484,51 @@ L_1088ccc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088ce4: 0x1088ce4: bne   v0, zero, 0x1088d08 addu  s1, v0, zero
+// 0x01089308: 0x1089308: bne   v0, zero, 0x108932c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1088d08
+	brtrue L_108932c
 // --- basic block ---
-// 0x01088cec: 0x1088cec: lui   a1, 0x20000
+// 0x01089310: 0x1089310: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01088cf0: 0x1088cf0: lui   a3, 0x20000
+// 0x01089314: 0x1089314: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088cf4: 0x1088cf4: addiu a1, a1, -21512
+// 0x01089318: 0x1089318: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088cf8: 0x1088cf8: addiu a3, a3, -14200
+// 0x0108931c: 0x108931c: addiu a3, a3, -13736
 	ldloc 4
-	ldc.i4 -14200
+	ldc.i4 -13736
 	add
 	stloc 4
-// 0x01088cfc: 0x1088cfc: addiu a0, zero, 4
+// 0x01089320: 0x1089320: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088d00: 0x1088d00: j	 0x1088cb8 addiu a2, zero, 1760
+// 0x01089324: 0x1089324: j	 0x10892dc addiu a2, zero, 1760
 	ldc.i4 1760
 	stloc.3
-	br L_1088cb8
+	br L_10892dc
 // --- basic block ---
-L_1088d08:
-// 0x01088d08: 0x1088d08: lui   a1, 0x10000
+L_108932c:
+// 0x0108932c: 0x108932c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01088d0c: 0x1088d0c: addiu a1, a1, 2620
+// 0x01089330: 0x1089330: addiu a1, a1, 2616
 	ldloc.2
-	ldc.i4 2620
+	ldc.i4 2616
 	add
 	stloc.2
-// 0x01088d10: 0x1088d10: jal   0x1001b14 addu  a0, s2, zero
+// 0x01089334: 0x1089334: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4536,13 +4536,13 @@ L_1088d08:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01088d18: 0x1088d18: bne   v0, zero, 0x1088d3c lui   a1, 0x20000
+// 0x0108933c: 0x108933c: bne   v0, zero, 0x1089360 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088d3c
+	brtrue L_1089360
 // --- basic block ---
-// 0x01088d20: 0x1088d20: lw    a0, 24(sp)
+// 0x01089344: 0x1089344: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4551,7 +4551,7 @@ L_1088d08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01088d24: 0x1088d24: lw    a2, 32(sp)
+// 0x01089348: 0x1089348: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4560,28 +4560,28 @@ L_1088d08:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01088d28: 0x1088d28: addu  a1, s0, zero
+// 0x0108934c: 0x108934c: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x01088d2c: 0x1088d2c: jal   0x104ada0 addu  a3, s1, zero
+// 0x01089350: 0x1089350: jal   0x104adb0 addu  a3, s1, zero
 	ldloc 9
 	stloc 4
 	ldloc 4
-	call int32 Cibyl55::roadmap_scoreboard_response_104ada0(int32)
+	call int32 Cibyl55::roadmap_scoreboard_response_104adb0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01088d34: 0x1088d34: j	 0x1088f9c addu  s1, v0, zero
+// 0x01089358: 0x1089358: j	 0x10895c0 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-	br L_1088f9c
+	br L_10895c0
 // --- basic block ---
-L_1088d3c:
-// 0x01088d3c: 0x1088d3c: addiu a1, a1, -14120
+L_1089360:
+// 0x01089360: 0x1089360: addiu a1, a1, -13656
 	ldloc.2
-	ldc.i4 -14120
+	ldc.i4 -13656
 	add
 	stloc.2
-// 0x01088d40: 0x1088d40: jal   0x1001b14 addu  a0, s2, zero
+// 0x01089364: 0x1089364: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4589,13 +4589,13 @@ L_1088d3c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01088d48: 0x1088d48: bne   v0, zero, 0x1088d70 lui   a1, 0x20000
+// 0x0108936c: 0x108936c: bne   v0, zero, 0x1089394 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088d70
+	brtrue L_1089394
 // --- basic block ---
-// 0x01088d50: 0x1088d50: lw    a0, 24(sp)
+// 0x01089374: 0x1089374: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4604,35 +4604,35 @@ L_1088d3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01088d54: 0x1088d54: addiu v0, zero, 200
+// 0x01089378: 0x1089378: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01088d58: 0x1088d58: beq   a0, v0, 0x1088f9c sll   zero, zero, 0
+// 0x0108937c: 0x108937c: beq   a0, v0, 0x10895c0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1088f9c
+	beq  L_10895c0
 // --- basic block ---
-// 0x01088d60: 0x1088d60: jal   0x1027240 sll   zero, zero, 0
+// 0x01089384: 0x1089384: jal   0x1027250 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_login_failed_1027240(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_login_failed_1027250(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088d68: 0x1088d68: j	 0x1088f9c sll   zero, zero, 0
-	br L_1088f9c
+// 0x0108938c: 0x108938c: j	 0x10895c0 sll   zero, zero, 0
+	br L_10895c0
 // --- basic block ---
-L_1088d70:
-// 0x01088d70: 0x1088d70: addiu a1, a1, -14112
+L_1089394:
+// 0x01089394: 0x1089394: addiu a1, a1, -13648
 	ldloc.2
-	ldc.i4 -14112
+	ldc.i4 -13648
 	add
 	stloc.2
-// 0x01088d74: 0x1088d74: jal   0x1001b14 addu  a0, s2, zero
+// 0x01089398: 0x1089398: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4640,13 +4640,13 @@ L_1088d70:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01088d7c: 0x1088d7c: bne   v0, zero, 0x1088da0 lui   a1, 0x20000
+// 0x010893a0: 0x10893a0: bne   v0, zero, 0x10893c4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088da0
+	brtrue L_10893c4
 // --- basic block ---
-// 0x01088d84: 0x1088d84: lw    a0, 24(sp)
+// 0x010893a8: 0x10893a8: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4655,7 +4655,7 @@ L_1088d70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01088d88: 0x1088d88: lw    a2, 32(sp)
+// 0x010893ac: 0x10893ac: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4664,10 +4664,10 @@ L_1088d70:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01088d8c: 0x1088d8c: addu  a1, s0, zero
+// 0x010893b0: 0x10893b0: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x01088d90: 0x1088d90: jal   0x1018d20 addu  a3, s1, zero
+// 0x010893b4: 0x10893b4: jal   0x1018d30 addu  a3, s1, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -4675,23 +4675,23 @@ L_1088d70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_foursquare_response_1018d20(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_foursquare_response_1018d30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088d98: 0x1088d98: j	 0x1088f9c addu  s1, v0, zero
+// 0x010893bc: 0x10893bc: j	 0x10895c0 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-	br L_1088f9c
+	br L_10895c0
 // --- basic block ---
-L_1088da0:
-// 0x01088da0: 0x1088da0: addiu a1, a1, -14100
+L_10893c4:
+// 0x010893c4: 0x10893c4: addiu a1, a1, -13636
 	ldloc.2
-	ldc.i4 -14100
+	ldc.i4 -13636
 	add
 	stloc.2
-// 0x01088da4: 0x1088da4: jal   0x1001b14 addu  a0, s2, zero
+// 0x010893c8: 0x10893c8: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4699,13 +4699,13 @@ L_1088da0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01088dac: 0x1088dac: bne   v0, zero, 0x1088e48 lui   a1, 0x20000
+// 0x010893d0: 0x10893d0: bne   v0, zero, 0x108946c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088e48
+	brtrue L_108946c
 // --- basic block ---
-// 0x01088db4: 0x1088db4: lw    s2, 24(sp)
+// 0x010893d8: 0x10893d8: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4714,36 +4714,36 @@ L_1088da0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01088db8: 0x1088db8: addiu v0, zero, 200
+// 0x010893dc: 0x10893dc: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01088dbc: 0x1088dbc: beq   s2, v0, 0x1088ed8 lui   a1, 0x20000
+// 0x010893e0: 0x10893e0: beq   s2, v0, 0x10894fc lui   a1, 0x20000
 	ldloc 7
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	beq  L_1088ed8
+	beq  L_10894fc
 // --- basic block ---
-// 0x01088dc4: 0x1088dc4: lui   a3, 0x20000
+// 0x010893e8: 0x10893e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088dc8: 0x1088dc8: addiu a1, a1, -21512
+// 0x010893ec: 0x10893ec: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088dcc: 0x1088dcc: addiu a3, a3, -14084
+// 0x010893f0: 0x10893f0: addiu a3, a3, -13620
 	ldloc 4
-	ldc.i4 -14084
+	ldc.i4 -13620
 	add
 	stloc 4
-// 0x01088dd0: 0x1088dd0: addiu a0, zero, 4
+// 0x010893f4: 0x10893f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088dd4: 0x1088dd4: addiu a2, zero, 3998
+// 0x010893f8: 0x10893f8: addiu a2, zero, 3998
 	ldc.i4 3998
 	stloc.3
-// 0x01088dd8: 0x1088dd8: jal   0x100449c sw    s2, 16(sp)
+// 0x010893fc: 0x10893fc: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4762,104 +4762,104 @@ L_1088da0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088de0: 0x1088de0: addiu v0, zero, 901
+// 0x01089404: 0x1089404: addiu v0, zero, 901
 	ldc.i4 901
 	stloc 5
-// 0x01088de4: 0x1088de4: beq   s2, v0, 0x1088cc4 addiu v0, zero, 30
+// 0x01089408: 0x1089408: beq   s2, v0, 0x10892e8 addiu v0, zero, 30
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 30
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088dec: 0x1088dec: addiu v0, zero, 902
+// 0x01089410: 0x1089410: addiu v0, zero, 902
 	ldc.i4 902
 	stloc 5
-// 0x01088df0: 0x1088df0: beq   s2, v0, 0x1088cc4 addiu v0, zero, 31
+// 0x01089414: 0x1089414: beq   s2, v0, 0x10892e8 addiu v0, zero, 31
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 31
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088df8: 0x1088df8: addiu v0, zero, 903
+// 0x0108941c: 0x108941c: addiu v0, zero, 903
 	ldc.i4 903
 	stloc 5
-// 0x01088dfc: 0x1088dfc: beq   s2, v0, 0x1088cc4 addiu v0, zero, 32
+// 0x01089420: 0x1089420: beq   s2, v0, 0x10892e8 addiu v0, zero, 32
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 32
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088e04: 0x1088e04: addiu v0, zero, 904
+// 0x01089428: 0x1089428: addiu v0, zero, 904
 	ldc.i4 904
 	stloc 5
-// 0x01088e08: 0x1088e08: beq   s2, v0, 0x1088cc4 addiu v0, zero, 33
+// 0x0108942c: 0x108942c: beq   s2, v0, 0x10892e8 addiu v0, zero, 33
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 33
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088e10: 0x1088e10: addiu v0, zero, 905
+// 0x01089434: 0x1089434: addiu v0, zero, 905
 	ldc.i4 905
 	stloc 5
-// 0x01088e14: 0x1088e14: beq   s2, v0, 0x1088cc4 addiu v0, zero, 34
+// 0x01089438: 0x1089438: beq   s2, v0, 0x10892e8 addiu v0, zero, 34
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 34
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088e1c: 0x1088e1c: addiu v0, zero, 906
+// 0x01089440: 0x1089440: addiu v0, zero, 906
 	ldc.i4 906
 	stloc 5
-// 0x01088e20: 0x1088e20: beq   s2, v0, 0x1088ee0 lui   a1, 0x20000
+// 0x01089444: 0x1089444: beq   s2, v0, 0x1089504 lui   a1, 0x20000
 	ldloc 7
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	beq  L_1088ee0
+	beq  L_1089504
 // --- basic block ---
-// 0x01088e28: 0x1088e28: addiu v0, zero, 18
+// 0x0108944c: 0x108944c: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01088e2c: 0x1088e2c: lui   a3, 0x20000
+// 0x01089450: 0x1089450: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088e30: 0x1088e30: sw    v0, 0(s0)
+// 0x01089454: 0x1089454: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01088e34: 0x1088e34: addiu a1, a1, -21512
+// 0x01089458: 0x1089458: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088e38: 0x1088e38: addiu a3, a3, -14024
+// 0x0108945c: 0x108945c: addiu a3, a3, -13560
 	ldloc 4
-	ldc.i4 -14024
+	ldc.i4 -13560
 	add
 	stloc 4
-// 0x01088e3c: 0x1088e3c: addiu a0, zero, 4
+// 0x01089460: 0x1089460: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088e40: 0x1088e40: j	 0x1088f04 addiu a2, zero, 4041
+// 0x01089464: 0x1089464: j	 0x1089528 addiu a2, zero, 4041
 	ldc.i4 4041
 	stloc.3
-	br L_1088f04
+	br L_1089528
 // --- basic block ---
-L_1088e48:
-// 0x01088e48: 0x1088e48: addiu a1, a1, -13956
+L_108946c:
+// 0x0108946c: 0x108946c: addiu a1, a1, -13492
 	ldloc.2
-	ldc.i4 -13956
+	ldc.i4 -13492
 	add
 	stloc.2
-// 0x01088e4c: 0x1088e4c: jal   0x1001b14 addu  a0, s2, zero
+// 0x01089470: 0x1089470: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4867,13 +4867,13 @@ L_1088e48:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01088e54: 0x1088e54: bne   v0, zero, 0x1088f14 lui   a1, 0x20000
+// 0x01089478: 0x1089478: bne   v0, zero, 0x1089538 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088f14
+	brtrue L_1089538
 // --- basic block ---
-// 0x01088e5c: 0x1088e5c: lw    s2, 24(sp)
+// 0x01089480: 0x1089480: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4882,36 +4882,36 @@ L_1088e48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01088e60: 0x1088e60: addiu v0, zero, 200
+// 0x01089484: 0x1089484: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01088e64: 0x1088e64: beq   s2, v0, 0x1088ed8 lui   a1, 0x20000
+// 0x01089488: 0x1089488: beq   s2, v0, 0x10894fc lui   a1, 0x20000
 	ldloc 7
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	beq  L_1088ed8
+	beq  L_10894fc
 // --- basic block ---
-// 0x01088e6c: 0x1088e6c: lui   a3, 0x20000
+// 0x01089490: 0x1089490: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088e70: 0x1088e70: addiu a1, a1, -21512
+// 0x01089494: 0x1089494: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088e74: 0x1088e74: addiu a3, a3, -13940
+// 0x01089498: 0x1089498: addiu a3, a3, -13476
 	ldloc 4
-	ldc.i4 -13940
+	ldc.i4 -13476
 	add
 	stloc 4
-// 0x01088e78: 0x1088e78: addiu a0, zero, 4
+// 0x0108949c: 0x108949c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088e7c: 0x1088e7c: addiu a2, zero, 4050
+// 0x010894a0: 0x10894a0: addiu a2, zero, 4050
 	ldc.i4 4050
 	stloc.3
-// 0x01088e80: 0x1088e80: jal   0x100449c sw    s2, 16(sp)
+// 0x010894a4: 0x10894a4: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4930,119 +4930,119 @@ L_1088e48:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088e88: 0x1088e88: addiu v0, zero, 911
+// 0x010894ac: 0x10894ac: addiu v0, zero, 911
 	ldc.i4 911
 	stloc 5
-// 0x01088e8c: 0x1088e8c: beq   s2, v0, 0x1088cc4 addiu v0, zero, 30
+// 0x010894b0: 0x10894b0: beq   s2, v0, 0x10892e8 addiu v0, zero, 30
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 30
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088e94: 0x1088e94: addiu v0, zero, 912
+// 0x010894b8: 0x10894b8: addiu v0, zero, 912
 	ldc.i4 912
 	stloc 5
-// 0x01088e98: 0x1088e98: beq   s2, v0, 0x1088cc4 addiu v0, zero, 31
+// 0x010894bc: 0x10894bc: beq   s2, v0, 0x10892e8 addiu v0, zero, 31
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 31
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088ea0: 0x1088ea0: addiu v0, zero, 913
+// 0x010894c4: 0x10894c4: addiu v0, zero, 913
 	ldc.i4 913
 	stloc 5
-// 0x01088ea4: 0x1088ea4: beq   s2, v0, 0x1088cc4 addiu v0, zero, 32
+// 0x010894c8: 0x10894c8: beq   s2, v0, 0x10892e8 addiu v0, zero, 32
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 32
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088eac: 0x1088eac: addiu v0, zero, 914
+// 0x010894d0: 0x10894d0: addiu v0, zero, 914
 	ldc.i4 914
 	stloc 5
-// 0x01088eb0: 0x1088eb0: beq   s2, v0, 0x1088cc4 addiu v0, zero, 33
+// 0x010894d4: 0x10894d4: beq   s2, v0, 0x10892e8 addiu v0, zero, 33
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 33
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088eb8: 0x1088eb8: addiu v0, zero, 915
+// 0x010894dc: 0x10894dc: addiu v0, zero, 915
 	ldc.i4 915
 	stloc 5
-// 0x01088ebc: 0x1088ebc: beq   s2, v0, 0x1088cc4 addiu v0, zero, 34
+// 0x010894e0: 0x10894e0: beq   s2, v0, 0x10892e8 addiu v0, zero, 34
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 34
 	stloc 5
-	beq  L_1088cc4
+	beq  L_10892e8
 // --- basic block ---
-// 0x01088ec4: 0x1088ec4: addiu v0, zero, 916
+// 0x010894e8: 0x10894e8: addiu v0, zero, 916
 	ldc.i4 916
 	stloc 5
-// 0x01088ec8: 0x1088ec8: bne   s2, v0, 0x1088ee8 lui   a1, 0x20000
+// 0x010894ec: 0x10894ec: bne   s2, v0, 0x108950c lui   a1, 0x20000
 	ldloc 7
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	bne.un L_1088ee8
+	bne.un L_108950c
 // --- basic block ---
-// 0x01088ed0: 0x1088ed0: j	 0x1088cc4 addiu v0, zero, 35
+// 0x010894f4: 0x10894f4: j	 0x10892e8 addiu v0, zero, 35
 	ldc.i4.s 35
 	stloc 5
-	br L_1088cc4
+	br L_10892e8
 // --- basic block ---
-L_1088ed8:
-// 0x01088ed8: 0x1088ed8: j	 0x1088f9c sw    zero, 0(s0)
+L_10894fc:
+// 0x010894fc: 0x10894fc: j	 0x10895c0 sw    zero, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_1088f9c
+	br L_10895c0
 // --- basic block ---
-L_1088ee0:
-// 0x01088ee0: 0x1088ee0: j	 0x1088cc4 addiu v0, zero, 35
+L_1089504:
+// 0x01089504: 0x1089504: j	 0x10892e8 addiu v0, zero, 35
 	ldc.i4.s 35
 	stloc 5
-	br L_1088cc4
+	br L_10892e8
 // --- basic block ---
-L_1088ee8:
-// 0x01088ee8: 0x1088ee8: addiu v0, zero, 18
+L_108950c:
+// 0x0108950c: 0x108950c: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01088eec: 0x1088eec: lui   a3, 0x20000
+// 0x01089510: 0x1089510: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088ef0: 0x1088ef0: sw    v0, 0(s0)
+// 0x01089514: 0x1089514: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01088ef4: 0x1088ef4: addiu a1, a1, -21512
+// 0x01089518: 0x1089518: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088ef8: 0x1088ef8: addiu a3, a3, -14024
+// 0x0108951c: 0x108951c: addiu a3, a3, -13560
 	ldloc 4
-	ldc.i4 -14024
+	ldc.i4 -13560
 	add
 	stloc 4
-// 0x01088efc: 0x1088efc: addiu a0, zero, 4
+// 0x01089520: 0x1089520: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088f00: 0x1088f00: addiu a2, zero, 4093
+// 0x01089524: 0x1089524: addiu a2, zero, 4093
 	ldc.i4 4093
 	stloc.3
-L_1088f04:
-// 0x01088f04: 0x1088f04: jal   0x100449c sw    s2, 16(sp)
+L_1089528:
+// 0x01089528: 0x1089528: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5061,16 +5061,16 @@ L_1088f04:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088f0c: 0x1088f0c: j	 0x1088f9c sll   zero, zero, 0
-	br L_1088f9c
+// 0x01089530: 0x1089530: j	 0x10895c0 sll   zero, zero, 0
+	br L_10895c0
 // --- basic block ---
-L_1088f14:
-// 0x01088f14: 0x1088f14: addiu a1, a1, -13880
+L_1089538:
+// 0x01089538: 0x1089538: addiu a1, a1, -13416
 	ldloc.2
-	ldc.i4 -13880
+	ldc.i4 -13416
 	add
 	stloc.2
-// 0x01088f18: 0x1088f18: jal   0x1001b14 addu  a0, s2, zero
+// 0x0108953c: 0x108953c: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -5078,13 +5078,13 @@ L_1088f14:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01088f20: 0x1088f20: bne   v0, zero, 0x1088f74 lui   a1, 0x20000
+// 0x01089544: 0x1089544: bne   v0, zero, 0x1089598 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1088f74
+	brtrue L_1089598
 // --- basic block ---
-// 0x01088f28: 0x1088f28: lw    v1, 24(sp)
+// 0x0108954c: 0x108954c: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5093,59 +5093,59 @@ L_1088f14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01088f2c: 0x1088f2c: addiu v0, zero, 200
+// 0x01089550: 0x1089550: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01088f30: 0x1088f30: beq   v1, v0, 0x1088f50 lui   a1, 0x20000
+// 0x01089554: 0x1089554: beq   v1, v0, 0x1089574 lui   a1, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	beq  L_1088f50
+	beq  L_1089574
 // --- basic block ---
-// 0x01088f38: 0x1088f38: lui   a3, 0x20000
+// 0x0108955c: 0x108955c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088f3c: 0x1088f3c: addiu a1, a1, -21512
+// 0x01089560: 0x1089560: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088f40: 0x1088f40: addiu a3, a3, -13868
+// 0x01089564: 0x1089564: addiu a3, a3, -13404
 	ldloc 4
-	ldc.i4 -13868
+	ldc.i4 -13404
 	add
 	stloc 4
-// 0x01088f44: 0x1088f44: addiu a0, zero, 4
+// 0x01089568: 0x1089568: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01088f48: 0x1088f48: j	 0x1088f64 addiu a2, zero, 1785
+// 0x0108956c: 0x108956c: j	 0x1089588 addiu a2, zero, 1785
 	ldc.i4 1785
 	stloc.3
-	br L_1088f64
+	br L_1089588
 // --- basic block ---
-L_1088f50:
-// 0x01088f50: 0x1088f50: lui   a3, 0x20000
+L_1089574:
+// 0x01089574: 0x1089574: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01088f54: 0x1088f54: addiu a1, a1, -21512
+// 0x01089578: 0x1089578: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01088f58: 0x1088f58: addiu a3, a3, -13768
+// 0x0108957c: 0x108957c: addiu a3, a3, -13304
 	ldloc 4
-	ldc.i4 -13768
+	ldc.i4 -13304
 	add
 	stloc 4
-// 0x01088f5c: 0x1088f5c: addiu a0, zero, 1
+// 0x01089580: 0x1089580: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01088f60: 0x1088f60: addiu a2, zero, 1788
+// 0x01089584: 0x1089584: addiu a2, zero, 1788
 	ldc.i4 1788
 	stloc.3
-L_1088f64:
-// 0x01088f64: 0x1088f64: jal   0x100449c sll   zero, zero, 0
+L_1089588:
+// 0x01089588: 0x1089588: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5156,16 +5156,16 @@ L_1088f64:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088f6c: 0x1088f6c: j	 0x1088f9c sll   zero, zero, 0
-	br L_1088f9c
+// 0x01089590: 0x1089590: j	 0x10895c0 sll   zero, zero, 0
+	br L_10895c0
 // --- basic block ---
-L_1088f74:
-// 0x01088f74: 0x1088f74: addu  a0, s2, zero
+L_1089598:
+// 0x01089598: 0x1089598: addu  a0, s2, zero
 	ldloc 7
 	stloc.1
-// 0x01088f78: 0x1088f78: jal   0x1001b14 addiu a1, a1, -13656
+// 0x0108959c: 0x108959c: jal   0x1001b14 addiu a1, a1, -13192
 	ldloc.2
-	ldc.i4 -13656
+	ldc.i4 -13192
 	add
 	stloc.2
 	ldloc.1
@@ -5173,11 +5173,11 @@ L_1088f74:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01088f80: 0x1088f80: bne   v0, zero, 0x1088f9c sll   zero, zero, 0
+// 0x010895a4: 0x10895a4: bne   v0, zero, 0x10895c0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1088f9c
+	brtrue L_10895c0
 // --- basic block ---
-// 0x01088f88: 0x1088f88: lw    a0, 24(sp)
+// 0x010895ac: 0x10895ac: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5186,7 +5186,7 @@ L_1088f74:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01088f8c: 0x1088f8c: lw    a1, 32(sp)
+// 0x010895b0: 0x10895b0: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5195,7 +5195,7 @@ L_1088f74:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01088f90: 0x1088f90: jal   0x10aa000 addu  a2, s1, zero
+// 0x010895b4: 0x10895b4: jal   0x10aa648 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -5203,20 +5203,20 @@ L_1088f74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_tripserver_response_10aa000(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_tripserver_response_10aa648(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01088f98: 0x1088f98: addu  s1, v0, zero
+// 0x010895bc: 0x10895bc: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-L_1088f9c:
-// 0x01088f9c: 0x1088f9c: lw    ra, 156(sp)
-// 0x01088fa0: 0x1088fa0: addu  v0, s1, zero
+L_10895c0:
+// 0x010895c0: 0x10895c0: lw    ra, 156(sp)
+// 0x010895c4: 0x10895c4: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-// 0x01088fa4: 0x1088fa4: lw    s4, 152(sp)
+// 0x010895c8: 0x10895c8: lw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5225,7 +5225,7 @@ L_1088f9c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01088fa8: 0x1088fa8: lw    s3, 148(sp)
+// 0x010895cc: 0x10895cc: lw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5234,7 +5234,7 @@ L_1088f9c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01088fac: 0x1088fac: lw    s2, 144(sp)
+// 0x010895d0: 0x10895d0: lw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5243,7 +5243,7 @@ L_1088f9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01088fb0: 0x1088fb0: lw    s1, 140(sp)
+// 0x010895d4: 0x10895d4: lw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5252,7 +5252,7 @@ L_1088f9c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01088fb4: 0x1088fb4: lw    s0, 136(sp)
+// 0x010895d8: 0x10895d8: lw    s0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5261,7 +5261,7 @@ L_1088f9c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01088fb8: 0x1088fb8: jr    ra addiu sp, sp, 160
+// 0x010895dc: 0x10895dc: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
@@ -5273,7 +5273,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 AddAlert_1088fc0(int32,int32,int32,int32,int32)
+.method public static int32 AddAlert_10895e4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 s4,int32 s5,int32 s1,int32 ra)
@@ -5326,13 +5326,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1088fc0:
-// 0x01088fc0: 0x1088fc0: addiu sp, sp, -1920
+L_10895e4:
+// 0x010895e4: 0x10895e4: addiu sp, sp, -1920
 	ldloc.0
 	ldc.i4 -1920
 	add
 	stloc.0
-// 0x01088fc4: 0x1088fc4: sw    s2, 1900(sp)
+// 0x010895e8: 0x10895e8: sw    s2, 1900(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5341,12 +5341,12 @@ L_1088fc0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01088fc8: 0x1088fc8: addiu s2, sp, 36
+// 0x010895ec: 0x10895ec: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-// 0x01088fcc: 0x1088fcc: sw    s3, 1904(sp)
+// 0x010895f0: 0x10895f0: sw    s3, 1904(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5355,7 +5355,7 @@ L_1088fc0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01088fd0: 0x1088fd0: sw    s0, 1892(sp)
+// 0x010895f4: 0x10895f4: sw    s0, 1892(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5364,16 +5364,16 @@ L_1088fc0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01088fd4: 0x1088fd4: addu  s3, a0, zero
+// 0x010895f8: 0x10895f8: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01088fd8: 0x1088fd8: lui   s0, 0x0
+// 0x010895fc: 0x10895fc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01088fdc: 0x1088fdc: addu  a0, s2, zero
+// 0x01089600: 0x1089600: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01088fe0: 0x1088fe0: sw    s1, 1896(sp)
+// 0x01089604: 0x1089604: sw    s1, 1896(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5382,11 +5382,11 @@ L_1088fc0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01088fe4: 0x1088fe4: sw    ra, 1916(sp)
-// 0x01088fe8: 0x1088fe8: addu  s1, a3, zero
+// 0x01089608: 0x1089608: sw    ra, 1916(sp)
+// 0x0108960c: 0x108960c: addu  s1, a3, zero
 	ldloc 4
 	stloc 13
-// 0x01088fec: 0x1088fec: sw    s5, 1912(sp)
+// 0x01089610: 0x1089610: sw    s5, 1912(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5395,7 +5395,7 @@ L_1088fc0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01088ff0: 0x1088ff0: jal   0x1078f18 sw    s4, 1908(sp)
+// 0x01089614: 0x1089614: jal   0x107953c sw    s4, 1908(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5409,26 +5409,26 @@ L_1088fc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Alert_Init_1078f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Alert_Init_107953c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01088ff8: 0x1088ff8: addu  a0, s3, zero
+// 0x0108961c: 0x108961c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01088ffc: 0x1088ffc: addu  a3, s2, zero
+// 0x01089620: 0x1089620: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x01089000: 0x1089000: addiu a1, s0, 28076
+// 0x01089624: 0x1089624: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089004: 0x1089004: addu  a2, zero, zero
+// 0x01089628: 0x1089628: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089008: 0x1089008: jal   0x106855c sw    zero, 16(sp)
+// 0x0108962c: 0x108962c: jal   0x106856c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5442,30 +5442,30 @@ L_1088fc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089010: 0x1089010: beq   v0, zero, 0x1089038 addiu v1, zero, 44
+// 0x01089634: 0x1089634: beq   v0, zero, 0x108965c addiu v1, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc 7
-	brfalse L_1089038
+	brfalse L_108965c
 // --- basic block ---
-// 0x01089018: 0x1089018: lb    a0, 0(v0)
+// 0x0108963c: 0x108963c: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0108901c: 0x108901c: sll   zero, zero, 0
-// 0x01089020: 0x1089020: bne   a0, v1, 0x1089038 addiu v1, zero, -1
+// 0x01089640: 0x1089640: sll   zero, zero, 0
+// 0x01089644: 0x1089644: bne   a0, v1, 0x108965c addiu v1, zero, -1
 	ldloc.1
 	ldloc 7
 	ldc.i4.m1
 	stloc 7
-	bne.un L_1089038
+	bne.un L_108965c
 // --- basic block ---
-// 0x01089028: 0x1089028: lw    a0, 36(sp)
+// 0x0108964c: 0x108964c: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5474,35 +5474,35 @@ L_1088fc0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108902c: 0x108902c: sll   zero, zero, 0
-// 0x01089030: 0x1089030: bne   a0, v1, 0x108905c addiu s2, zero, 1
+// 0x01089650: 0x1089650: sll   zero, zero, 0
+// 0x01089654: 0x1089654: bne   a0, v1, 0x1089680 addiu s2, zero, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	stloc 8
-	bne.un L_108905c
+	bne.un L_1089680
 // --- basic block ---
-L_1089038:
-// 0x01089038: 0x1089038: lui   a1, 0x20000
+L_108965c:
+// 0x0108965c: 0x108965c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108903c: 0x108903c: lui   a3, 0x20000
+// 0x01089660: 0x1089660: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089040: 0x1089040: addiu a1, a1, -21512
+// 0x01089664: 0x1089664: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089044: 0x1089044: addiu a3, a3, -13644
+// 0x01089668: 0x1089668: addiu a3, a3, -13180
 	ldloc 4
-	ldc.i4 -13644
+	ldc.i4 -13180
 	add
 	stloc 4
-// 0x01089048: 0x1089048: addiu a0, zero, 4
+// 0x0108966c: 0x108966c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108904c: 0x108904c: jal   0x100449c addiu a2, zero, 1227
+// 0x01089670: 0x1089670: jal   0x100449c addiu a2, zero, 1227
 	ldc.i4 1227
 	stloc.3
 	ldloc.0
@@ -5515,31 +5515,31 @@ L_1089038:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089054: 0x1089054: j	 0x1089930 addiu v0, zero, 18
+// 0x01089678: 0x1089678: j	 0x1089f54 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1089930
+	br L_1089f54
 // --- basic block ---
-L_108905c:
-// 0x0108905c: 0x108905c: addiu a0, v0, 1
+L_1089680:
+// 0x01089680: 0x1089680: addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01089060: 0x1089060: addiu a1, s0, 28076
+// 0x01089684: 0x1089684: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089064: 0x1089064: addu  a2, zero, zero
+// 0x01089688: 0x1089688: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089068: 0x1089068: addiu a3, sp, 40
+// 0x0108968c: 0x108968c: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x0108906c: 0x108906c: jal   0x106855c sw    s2, 16(sp)
+// 0x01089690: 0x1089690: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5553,53 +5553,53 @@ L_108905c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089074: 0x1089074: beq   v0, zero, 0x1089090 lui   a1, 0x20000
+// 0x01089698: 0x1089698: beq   v0, zero, 0x10896b4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1089090
+	brfalse L_10896b4
 // --- basic block ---
-// 0x0108907c: 0x108907c: lb    v1, 0(v0)
+// 0x010896a0: 0x10896a0: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089080: 0x1089080: sll   zero, zero, 0
-// 0x01089084: 0x1089084: bne   v1, zero, 0x10890b8 addu  a0, v0, zero
+// 0x010896a4: 0x10896a4: sll   zero, zero, 0
+// 0x010896a8: 0x10896a8: bne   v1, zero, 0x10896dc addu  a0, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brtrue L_10890b8
+	brtrue L_10896dc
 // --- basic block ---
-// 0x0108908c: 0x108908c: lui   a1, 0x20000
+// 0x010896b0: 0x10896b0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1089090:
-// 0x01089090: 0x1089090: lui   a3, 0x20000
+L_10896b4:
+// 0x010896b4: 0x10896b4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089094: 0x1089094: addiu a1, a1, -21512
+// 0x010896b8: 0x10896b8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089098: 0x1089098: addiu a3, a3, -13584
+// 0x010896bc: 0x10896bc: addiu a3, a3, -13120
 	ldloc 4
-	ldc.i4 -13584
+	ldc.i4 -13120
 	add
 	stloc 4
-// 0x0108909c: 0x108909c: addiu a0, zero, 4
+// 0x010896c0: 0x10896c0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010890a0: 0x10890a0: addiu a2, zero, 1245
+// 0x010896c4: 0x10896c4: addiu a2, zero, 1245
 	ldc.i4 1245
 	stloc.3
-L_10890a4:
-// 0x010890a4: 0x10890a4: lw    v0, 36(sp)
+L_10896c8:
+// 0x010896c8: 0x10896c8: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5608,7 +5608,7 @@ L_10890a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010890a8: 0x10890a8: jal   0x100449c sw    v0, 16(sp)
+// 0x010896cc: 0x10896cc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5627,27 +5627,27 @@ L_10890a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10890b0:
-// 0x010890b0: 0x10890b0: j	 0x1089930 addiu v0, zero, 18
+L_10896d4:
+// 0x010896d4: 0x10896d4: j	 0x1089f54 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1089930
+	br L_1089f54
 // --- basic block ---
-L_10890b8:
-// 0x010890b8: 0x10890b8: addiu a1, s0, 28076
+L_10896dc:
+// 0x010896dc: 0x10896dc: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010890bc: 0x10890bc: addu  a2, zero, zero
+// 0x010896e0: 0x10896e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010890c0: 0x10890c0: addiu a3, sp, 52
+// 0x010896e4: 0x10896e4: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x010890c4: 0x10890c4: jal   0x106855c sw    s2, 16(sp)
+// 0x010896e8: 0x10896e8: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5661,66 +5661,66 @@ L_10890b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010890cc: 0x10890cc: beq   v0, zero, 0x10890e4 lui   a1, 0x20000
+// 0x010896f0: 0x10896f0: beq   v0, zero, 0x1089708 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10890e4
+	brfalse L_1089708
 // --- basic block ---
-// 0x010890d4: 0x10890d4: lb    v1, 0(v0)
+// 0x010896f8: 0x10896f8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010890d8: 0x10890d8: sll   zero, zero, 0
-// 0x010890dc: 0x10890dc: bne   v1, zero, 0x10890fc sll   zero, zero, 0
+// 0x010896fc: 0x10896fc: sll   zero, zero, 0
+// 0x01089700: 0x1089700: bne   v1, zero, 0x1089720 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10890fc
+	brtrue L_1089720
 // --- basic block ---
-L_10890e4:
-// 0x010890e4: 0x10890e4: lui   a3, 0x20000
+L_1089708:
+// 0x01089708: 0x1089708: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010890e8: 0x10890e8: addiu a1, a1, -21512
+// 0x0108970c: 0x108970c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010890ec: 0x10890ec: addiu a3, a3, -13516
+// 0x01089710: 0x1089710: addiu a3, a3, -13052
 	ldloc 4
-	ldc.i4 -13516
+	ldc.i4 -13052
 	add
 	stloc 4
-// 0x010890f0: 0x10890f0: addiu a0, zero, 4
+// 0x01089714: 0x1089714: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010890f4: 0x10890f4: j	 0x10890a4 addiu a2, zero, 1260
+// 0x01089718: 0x1089718: j	 0x10896c8 addiu a2, zero, 1260
 	ldc.i4 1260
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_10890fc:
-// 0x010890fc: 0x10890fc: addu  a0, v0, zero
+L_1089720:
+// 0x01089720: 0x1089720: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089100: 0x1089100: addiu a1, s0, 28076
+// 0x01089724: 0x1089724: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089104: 0x1089104: addu  a2, zero, zero
+// 0x01089728: 0x1089728: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089108: 0x1089108: addiu a3, sp, 56
+// 0x0108972c: 0x108972c: addiu a3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x0108910c: 0x108910c: jal   0x106855c sw    s2, 16(sp)
+// 0x01089730: 0x1089730: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5734,71 +5734,71 @@ L_10890fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089114: 0x1089114: beq   v0, zero, 0x108912c lui   a1, 0x20000
+// 0x01089738: 0x1089738: beq   v0, zero, 0x1089750 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108912c
+	brfalse L_1089750
 // --- basic block ---
-// 0x0108911c: 0x108911c: lb    v1, 0(v0)
+// 0x01089740: 0x1089740: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089120: 0x1089120: sll   zero, zero, 0
-// 0x01089124: 0x1089124: bne   v1, zero, 0x1089144 sll   zero, zero, 0
+// 0x01089744: 0x1089744: sll   zero, zero, 0
+// 0x01089748: 0x1089748: bne   v1, zero, 0x1089768 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1089144
+	brtrue L_1089768
 // --- basic block ---
-L_108912c:
-// 0x0108912c: 0x108912c: lui   a3, 0x20000
+L_1089750:
+// 0x01089750: 0x1089750: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089130: 0x1089130: addiu a1, a1, -21512
+// 0x01089754: 0x1089754: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089134: 0x1089134: addiu a3, a3, -13444
+// 0x01089758: 0x1089758: addiu a3, a3, -12980
 	ldloc 4
-	ldc.i4 -13444
+	ldc.i4 -12980
 	add
 	stloc 4
-// 0x01089138: 0x1089138: addiu a0, zero, 4
+// 0x0108975c: 0x108975c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108913c: 0x108913c: j	 0x10890a4 addiu a2, zero, 1275
+// 0x01089760: 0x1089760: j	 0x10896c8 addiu a2, zero, 1275
 	ldc.i4 1275
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_1089144:
-// 0x01089144: 0x1089144: lui   a2, 0x10000
+L_1089768:
+// 0x01089768: 0x1089768: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01089148: 0x1089148: addu  a0, v0, zero
+// 0x0108976c: 0x108976c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108914c: 0x108914c: addiu a1, s0, 28076
+// 0x01089770: 0x1089770: addiu a1, s0, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089150: 0x1089150: addiu a2, a2, -22604
+// 0x01089774: 0x1089774: addiu a2, a2, -22604
 	ldloc.3
 	ldc.i4 -22604
 	add
 	stloc.3
-// 0x01089154: 0x1089154: addiu a3, sp, 184
+// 0x01089778: 0x1089778: addiu a3, sp, 184
 	ldloc.0
 	ldc.i4 184
 	add
 	stloc 4
-// 0x01089158: 0x1089158: jal   0x106855c sw    s2, 16(sp)
+// 0x0108977c: 0x108977c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5812,28 +5812,28 @@ L_1089144:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089160: 0x1089160: beq   v0, zero, 0x1089178 sll   zero, zero, 0
+// 0x01089784: 0x1089784: beq   v0, zero, 0x108979c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1089178
+	brfalse L_108979c
 // --- basic block ---
-// 0x01089168: 0x1089168: lb    v1, 0(v0)
+// 0x0108978c: 0x108978c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108916c: 0x108916c: sll   zero, zero, 0
-// 0x01089170: 0x1089170: bne   v1, zero, 0x10891a8 lui   s2, 0x0
+// 0x01089790: 0x1089790: sll   zero, zero, 0
+// 0x01089794: 0x1089794: bne   v1, zero, 0x10897cc lui   s2, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_10891a8
+	brtrue L_10897cc
 // --- basic block ---
-L_1089178:
-// 0x01089178: 0x1089178: lw    v1, 36(sp)
+L_108979c:
+// 0x0108979c: 0x108979c: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5842,29 +5842,29 @@ L_1089178:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108917c: 0x108917c: lui   a1, 0x20000
+// 0x010897a0: 0x10897a0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089180: 0x1089180: lui   a3, 0x20000
+// 0x010897a4: 0x10897a4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089184: 0x1089184: addiu a1, a1, -21512
+// 0x010897a8: 0x10897a8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089188: 0x1089188: addiu a3, a3, -13372
+// 0x010897ac: 0x10897ac: addiu a3, a3, -12908
 	ldloc 4
-	ldc.i4 -13372
+	ldc.i4 -12908
 	add
 	stloc 4
-// 0x0108918c: 0x108918c: addiu a0, zero, 4
+// 0x010897b0: 0x10897b0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089190: 0x1089190: addiu a2, zero, 1290
+// 0x010897b4: 0x10897b4: addiu a2, zero, 1290
 	ldc.i4 1290
 	stloc.3
-// 0x01089194: 0x1089194: sw    v0, 1880(sp)
+// 0x010897b8: 0x10897b8: sw    v0, 1880(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5873,7 +5873,7 @@ L_1089178:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089198: 0x1089198: jal   0x100449c sw    v1, 16(sp)
+// 0x010897bc: 0x10897bc: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5892,7 +5892,7 @@ L_1089178:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010891a0: 0x10891a0: lw    v0, 1880(sp)
+// 0x010897c4: 0x10897c4: lw    v0, 1880(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5901,35 +5901,35 @@ L_1089178:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010891a4: 0x10891a4: lui   s2, 0x0
+// 0x010897c8: 0x10897c8: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-L_10891a8:
-// 0x010891a8: 0x10891a8: lui   a2, 0x10000
+L_10897cc:
+// 0x010897cc: 0x10897cc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010891ac: 0x10891ac: addiu s0, zero, 1
+// 0x010897d0: 0x10897d0: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010891b0: 0x10891b0: addu  a0, v0, zero
+// 0x010897d4: 0x10897d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010891b4: 0x10891b4: addiu a2, a2, -22604
+// 0x010897d8: 0x10897d8: addiu a2, a2, -22604
 	ldloc.3
 	ldc.i4 -22604
 	add
 	stloc.3
-// 0x010891b8: 0x10891b8: addiu a1, s2, 28076
+// 0x010897dc: 0x10897dc: addiu a1, s2, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010891bc: 0x10891bc: addiu a3, sp, 188
+// 0x010897e0: 0x10897e0: addiu a3, sp, 188
 	ldloc.0
 	ldc.i4 188
 	add
 	stloc 4
-// 0x010891c0: 0x10891c0: jal   0x106855c sw    s0, 16(sp)
+// 0x010897e4: 0x10897e4: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5943,40 +5943,40 @@ L_10891a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010891c8: 0x10891c8: beq   v0, zero, 0x10890b0 sll   zero, zero, 0
+// 0x010897ec: 0x10897ec: beq   v0, zero, 0x10896d4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10890b0
+	brfalse L_10896d4
 // --- basic block ---
-// 0x010891d0: 0x10891d0: lb    v1, 0(v0)
+// 0x010897f4: 0x10897f4: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010891d4: 0x10891d4: sll   zero, zero, 0
-// 0x010891d8: 0x10891d8: beq   v1, zero, 0x10890b0 addu  a0, v0, zero
+// 0x010897f8: 0x10897f8: sll   zero, zero, 0
+// 0x010897fc: 0x10897fc: beq   v1, zero, 0x10896d4 addu  a0, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brfalse L_10890b0
+	brfalse L_10896d4
 // --- basic block ---
-// 0x010891e0: 0x10891e0: addiu a1, s2, 28076
+// 0x01089804: 0x1089804: addiu a1, s2, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010891e4: 0x10891e4: addu  a2, zero, zero
+// 0x01089808: 0x1089808: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010891e8: 0x10891e8: addiu a3, sp, 48
+// 0x0108980c: 0x108980c: addiu a3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 4
-// 0x010891ec: 0x10891ec: jal   0x106855c sw    s0, 16(sp)
+// 0x01089810: 0x1089810: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5990,66 +5990,66 @@ L_10891a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010891f4: 0x10891f4: beq   v0, zero, 0x108920c lui   a1, 0x20000
+// 0x01089818: 0x1089818: beq   v0, zero, 0x1089830 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108920c
+	brfalse L_1089830
 // --- basic block ---
-// 0x010891fc: 0x10891fc: lb    v1, 0(v0)
+// 0x01089820: 0x1089820: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089200: 0x1089200: sll   zero, zero, 0
-// 0x01089204: 0x1089204: bne   v1, zero, 0x1089224 sll   zero, zero, 0
+// 0x01089824: 0x1089824: sll   zero, zero, 0
+// 0x01089828: 0x1089828: bne   v1, zero, 0x1089848 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1089224
+	brtrue L_1089848
 // --- basic block ---
-L_108920c:
-// 0x0108920c: 0x108920c: lui   a3, 0x20000
+L_1089830:
+// 0x01089830: 0x1089830: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089210: 0x1089210: addiu a1, a1, -21512
+// 0x01089834: 0x1089834: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089214: 0x1089214: addiu a3, a3, -13304
+// 0x01089838: 0x1089838: addiu a3, a3, -12840
 	ldloc 4
-	ldc.i4 -13304
+	ldc.i4 -12840
 	add
 	stloc 4
-// 0x01089218: 0x1089218: addiu a0, zero, 4
+// 0x0108983c: 0x108983c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108921c: 0x108921c: j	 0x10890a4 addiu a2, zero, 1318
+// 0x01089840: 0x1089840: j	 0x10896c8 addiu a2, zero, 1318
 	ldc.i4 1318
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_1089224:
-// 0x01089224: 0x1089224: addu  a0, v0, zero
+L_1089848:
+// 0x01089848: 0x1089848: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089228: 0x1089228: addiu a1, s2, 28076
+// 0x0108984c: 0x108984c: addiu a1, s2, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108922c: 0x108922c: addu  a2, zero, zero
+// 0x01089850: 0x1089850: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089230: 0x1089230: addiu a3, sp, 60
+// 0x01089854: 0x1089854: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x01089234: 0x1089234: jal   0x106855c sw    s0, 16(sp)
+// 0x01089858: 0x1089858: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6063,60 +6063,60 @@ L_1089224:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108923c: 0x108923c: beq   v0, zero, 0x1089254 lui   a1, 0x20000
+// 0x01089860: 0x1089860: beq   v0, zero, 0x1089878 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1089254
+	brfalse L_1089878
 // --- basic block ---
-// 0x01089244: 0x1089244: lb    v1, 0(v0)
+// 0x01089868: 0x1089868: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089248: 0x1089248: sll   zero, zero, 0
-// 0x0108924c: 0x108924c: bne   v1, zero, 0x108926c sll   zero, zero, 0
+// 0x0108986c: 0x108986c: sll   zero, zero, 0
+// 0x01089870: 0x1089870: bne   v1, zero, 0x1089890 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108926c
+	brtrue L_1089890
 // --- basic block ---
-L_1089254:
-// 0x01089254: 0x1089254: lui   a3, 0x20000
+L_1089878:
+// 0x01089878: 0x1089878: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089258: 0x1089258: addiu a1, a1, -21512
+// 0x0108987c: 0x108987c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108925c: 0x108925c: addiu a3, a3, -13232
+// 0x01089880: 0x1089880: addiu a3, a3, -12768
 	ldloc 4
-	ldc.i4 -13232
+	ldc.i4 -12768
 	add
 	stloc 4
-// 0x01089260: 0x1089260: addiu a0, zero, 4
+// 0x01089884: 0x1089884: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089264: 0x1089264: j	 0x10890a4 addiu a2, zero, 1333
+// 0x01089888: 0x1089888: j	 0x10896c8 addiu a2, zero, 1333
 	ldc.i4 1333
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_108926c:
-// 0x0108926c: 0x108926c: addiu a0, zero, 44
+L_1089890:
+// 0x01089890: 0x1089890: addiu a0, zero, 44
 	ldc.i4.s 44
 	stloc.1
-// 0x01089270: 0x1089270: bne   v1, a0, 0x10892ac addu  a0, v0, zero
+// 0x01089894: 0x1089894: bne   v1, a0, 0x10898d0 addu  a0, v0, zero
 	ldloc 7
 	ldloc.1
 	ldloc 5
 	stloc.1
-	bne.un L_10892ac
+	bne.un L_10898d0
 // --- basic block ---
-// 0x01089278: 0x1089278: lw    v1, 36(sp)
+// 0x0108989c: 0x108989c: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6125,29 +6125,29 @@ L_108926c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108927c: 0x108927c: lui   a1, 0x20000
+// 0x010898a0: 0x10898a0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089280: 0x1089280: lui   a3, 0x20000
+// 0x010898a4: 0x10898a4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089284: 0x1089284: addiu a1, a1, -21512
+// 0x010898a8: 0x10898a8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089288: 0x1089288: addiu a3, a3, -13164
+// 0x010898ac: 0x10898ac: addiu a3, a3, -12700
 	ldloc 4
-	ldc.i4 -13164
+	ldc.i4 -12700
 	add
 	stloc 4
-// 0x0108928c: 0x108928c: addiu a0, zero, 1
+// 0x010898b0: 0x10898b0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01089290: 0x1089290: addiu a2, zero, 1342
+// 0x010898b4: 0x10898b4: addiu a2, zero, 1342
 	ldc.i4 1342
 	stloc.3
-// 0x01089294: 0x1089294: sw    v0, 1880(sp)
+// 0x010898b8: 0x10898b8: sw    v0, 1880(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6156,7 +6156,7 @@ L_108926c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089298: 0x1089298: jal   0x100449c sw    v1, 16(sp)
+// 0x010898bc: 0x10898bc: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6175,7 +6175,7 @@ L_108926c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010892a0: 0x10892a0: lw    v0, 1880(sp)
+// 0x010898c4: 0x10898c4: lw    v0, 1880(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6184,33 +6184,33 @@ L_108926c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010892a4: 0x10892a4: j	 0x10892fc addiu v0, v0, 1
+// 0x010898c8: 0x10898c8: j	 0x1089920 addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	br L_10892fc
+	br L_1089920
 // --- basic block ---
-L_10892ac:
-// 0x010892ac: 0x10892ac: addiu a3, s2, 28076
+L_10898d0:
+// 0x010898d0: 0x10898d0: addiu a3, s2, 28076
 	ldloc 8
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010892b0: 0x10892b0: addiu v0, zero, 400
+// 0x010898d4: 0x10898d4: addiu v0, zero, 400
 	ldc.i4 400
 	stloc 5
-// 0x010892b4: 0x10892b4: addiu a1, sp, 192
+// 0x010898d8: 0x10898d8: addiu a1, sp, 192
 	ldloc.0
 	ldc.i4 192
 	add
 	stloc.2
-// 0x010892b8: 0x10892b8: addiu a2, sp, 24
+// 0x010898dc: 0x10898dc: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010892bc: 0x10892bc: sw    v0, 24(sp)
+// 0x010898e0: 0x10898e0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6219,7 +6219,7 @@ L_10892ac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010892c0: 0x10892c0: jal   0x1068250 sw    s0, 16(sp)
+// 0x010898e4: 0x10898e4: jal   0x1068260 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6233,78 +6233,78 @@ L_10892ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010892c8: 0x10892c8: beq   v0, zero, 0x10892e4 lui   a1, 0x20000
+// 0x010898ec: 0x10898ec: beq   v0, zero, 0x1089908 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10892e4
+	brfalse L_1089908
 // --- basic block ---
-// 0x010892d0: 0x10892d0: lb    v1, 0(v0)
+// 0x010898f4: 0x10898f4: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010892d4: 0x10892d4: sll   zero, zero, 0
-// 0x010892d8: 0x10892d8: bne   v1, zero, 0x1089300 lui   s3, 0x0
+// 0x010898f8: 0x10898f8: sll   zero, zero, 0
+// 0x010898fc: 0x10898fc: bne   v1, zero, 0x1089924 lui   s3, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 10
-	brtrue L_1089300
+	brtrue L_1089924
 // --- basic block ---
-// 0x010892e0: 0x10892e0: lui   a1, 0x20000
+// 0x01089904: 0x1089904: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10892e4:
-// 0x010892e4: 0x10892e4: lui   a3, 0x20000
+L_1089908:
+// 0x01089908: 0x1089908: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010892e8: 0x10892e8: addiu a1, a1, -21512
+// 0x0108990c: 0x108990c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010892ec: 0x10892ec: addiu a3, a3, -13084
+// 0x01089910: 0x1089910: addiu a3, a3, -12620
 	ldloc 4
-	ldc.i4 -13084
+	ldc.i4 -12620
 	add
 	stloc 4
-// 0x010892f0: 0x10892f0: addiu a0, zero, 4
+// 0x01089914: 0x1089914: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010892f4: 0x10892f4: j	 0x10890a4 addiu a2, zero, 1358
+// 0x01089918: 0x1089918: j	 0x10896c8 addiu a2, zero, 1358
 	ldc.i4 1358
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_10892fc:
-// 0x010892fc: 0x10892fc: lui   s3, 0x0
+L_1089920:
+// 0x01089920: 0x1089920: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-L_1089300:
-// 0x01089300: 0x1089300: addu  a0, v0, zero
+L_1089924:
+// 0x01089924: 0x1089924: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089304: 0x1089304: addiu s2, zero, 1
+// 0x01089928: 0x1089928: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01089308: 0x1089308: addiu a1, s3, 28076
+// 0x0108992c: 0x108992c: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108930c: 0x108930c: addu  a2, zero, zero
+// 0x01089930: 0x1089930: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089310: 0x1089310: addiu a3, sp, 180
+// 0x01089934: 0x1089934: addiu a3, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc 4
-// 0x01089314: 0x1089314: jal   0x106855c sw    s2, 16(sp)
+// 0x01089938: 0x1089938: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6318,64 +6318,64 @@ L_1089300:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108931c: 0x108931c: bne   v0, zero, 0x1089340 addu  s0, v0, zero
+// 0x01089940: 0x1089940: bne   v0, zero, 0x1089964 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1089340
+	brtrue L_1089964
 // --- basic block ---
-// 0x01089324: 0x1089324: lui   a1, 0x20000
+// 0x01089948: 0x1089948: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089328: 0x1089328: lui   a3, 0x20000
+// 0x0108994c: 0x108994c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108932c: 0x108932c: addiu a1, a1, -21512
+// 0x01089950: 0x1089950: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089330: 0x1089330: addiu a3, a3, -13012
+// 0x01089954: 0x1089954: addiu a3, a3, -12548
 	ldloc 4
-	ldc.i4 -13012
+	ldc.i4 -12548
 	add
 	stloc 4
-// 0x01089334: 0x1089334: addiu a0, zero, 4
+// 0x01089958: 0x1089958: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089338: 0x1089338: j	 0x10898b8 addiu a2, zero, 1374
+// 0x0108995c: 0x108995c: j	 0x1089edc addiu a2, zero, 1374
 	ldc.i4 1374
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_1089340:
-// 0x01089340: 0x1089340: addu  a0, v0, zero
+L_1089964:
+// 0x01089964: 0x1089964: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089344: 0x1089344: addiu a3, s3, 28076
+// 0x01089968: 0x1089968: addiu a3, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089348: 0x1089348: addiu v0, zero, 100
+// 0x0108996c: 0x108996c: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x0108934c: 0x108934c: addiu a1, sp, 68
+// 0x01089970: 0x1089970: addiu a1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x01089350: 0x1089350: addiu a2, sp, 24
+// 0x01089974: 0x1089974: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01089354: 0x1089354: sw    v0, 24(sp)
+// 0x01089978: 0x1089978: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6384,7 +6384,7 @@ L_1089340:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089358: 0x1089358: jal   0x1068250 sw    s2, 16(sp)
+// 0x0108997c: 0x108997c: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6398,18 +6398,18 @@ L_1089340:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089360: 0x1089360: bne   v0, zero, 0x108939c lui   a3, 0x0
+// 0x01089984: 0x1089984: bne   v0, zero, 0x10899c0 lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_108939c
+	brtrue L_10899c0
 // --- basic block ---
-// 0x01089368: 0x1089368: lw    v1, 36(sp)
+// 0x0108998c: 0x108998c: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6418,29 +6418,29 @@ L_1089340:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108936c: 0x108936c: lui   a1, 0x20000
+// 0x01089990: 0x1089990: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089370: 0x1089370: lui   a3, 0x20000
+// 0x01089994: 0x1089994: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089374: 0x1089374: addiu a1, a1, -21512
+// 0x01089998: 0x1089998: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089378: 0x1089378: addiu a3, a3, -12940
+// 0x0108999c: 0x108999c: addiu a3, a3, -12476
 	ldloc 4
-	ldc.i4 -12940
+	ldc.i4 -12476
 	add
 	stloc 4
-// 0x0108937c: 0x108937c: addiu a0, zero, 4
+// 0x010899a0: 0x10899a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089380: 0x1089380: addiu a2, zero, 1390
+// 0x010899a4: 0x10899a4: addiu a2, zero, 1390
 	ldc.i4 1390
 	stloc.3
-// 0x01089384: 0x1089384: sw    v0, 1880(sp)
+// 0x010899a8: 0x10899a8: sw    v0, 1880(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6449,7 +6449,7 @@ L_1089340:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089388: 0x1089388: jal   0x100449c sw    v1, 16(sp)
+// 0x010899ac: 0x10899ac: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6468,7 +6468,7 @@ L_1089340:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089390: 0x1089390: lw    v0, 1880(sp)
+// 0x010899b4: 0x10899b4: lw    v0, 1880(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6477,7 +6477,7 @@ L_1089340:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01089394: 0x1089394: sw    zero, 1316(sp)
+// 0x010899b8: 0x10899b8: sw    zero, 1316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6486,35 +6486,35 @@ L_1089340:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01089398: 0x1089398: lui   a3, 0x0
+// 0x010899bc: 0x10899bc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-L_108939c:
-// 0x0108939c: 0x108939c: addu  a0, v0, zero
+L_10899c0:
+// 0x010899c0: 0x10899c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010893a0: 0x10893a0: addiu a3, a3, 28076
+// 0x010899c4: 0x10899c4: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010893a4: 0x10893a4: addiu v0, zero, 5
+// 0x010899c8: 0x10899c8: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010893a8: 0x10893a8: addiu s2, zero, 1
+// 0x010899cc: 0x10899cc: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010893ac: 0x10893ac: addiu a1, sp, 28
+// 0x010899d0: 0x10899d0: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x010893b0: 0x10893b0: addiu a2, sp, 24
+// 0x010899d4: 0x10899d4: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010893b4: 0x10893b4: sw    v0, 24(sp)
+// 0x010899d8: 0x10899d8: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6523,7 +6523,7 @@ L_108939c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010893b8: 0x10893b8: jal   0x1068250 sw    s2, 16(sp)
+// 0x010899dc: 0x10899dc: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6537,57 +6537,57 @@ L_108939c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010893c0: 0x10893c0: bne   v0, zero, 0x10893e4 addu  s0, v0, zero
+// 0x010899e4: 0x10899e4: bne   v0, zero, 0x1089a08 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10893e4
+	brtrue L_1089a08
 // --- basic block ---
-// 0x010893c8: 0x10893c8: lui   a1, 0x20000
+// 0x010899ec: 0x10899ec: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010893cc: 0x10893cc: lui   a3, 0x20000
+// 0x010899f0: 0x10899f0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010893d0: 0x10893d0: addiu a1, a1, -21512
+// 0x010899f4: 0x10899f4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010893d4: 0x10893d4: addiu a3, a3, -12864
+// 0x010899f8: 0x10899f8: addiu a3, a3, -12400
 	ldloc 4
-	ldc.i4 -12864
+	ldc.i4 -12400
 	add
 	stloc 4
-// 0x010893d8: 0x10893d8: addiu a0, zero, 4
+// 0x010899fc: 0x10899fc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010893dc: 0x10893dc: j	 0x10898b8 addiu a2, zero, 1405
+// 0x01089a00: 0x1089a00: j	 0x1089edc addiu a2, zero, 1405
 	ldc.i4 1405
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_10893e4:
-// 0x010893e4: 0x10893e4: lb    v1, 28(sp)
+L_1089a08:
+// 0x01089a08: 0x1089a08: lb    v1, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010893e8: 0x10893e8: addiu v0, zero, 84
+// 0x01089a0c: 0x1089a0c: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x010893ec: 0x10893ec: bne   v1, v0, 0x10893fc sll   zero, zero, 0
+// 0x01089a10: 0x1089a10: bne   v1, v0, 0x1089a20 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10893fc
+	bne.un L_1089a20
 // --- basic block ---
-// 0x010893f4: 0x10893f4: j	 0x1089400 sw    s2, 1316(sp)
+// 0x01089a18: 0x1089a18: j	 0x1089a24 sw    s2, 1316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6596,10 +6596,10 @@ L_10893e4:
 	add
 	ldloc 8
 	stelem.i4
-	br L_1089400
+	br L_1089a24
 // --- basic block ---
-L_10893fc:
-// 0x010893fc: 0x10893fc: sw    zero, 1316(sp)
+L_1089a20:
+// 0x01089a20: 0x1089a20: sw    zero, 1316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6608,38 +6608,38 @@ L_10893fc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1089400:
-// 0x01089400: 0x1089400: lui   s3, 0x0
+L_1089a24:
+// 0x01089a24: 0x1089a24: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01089404: 0x1089404: addiu s4, sp, 24
+// 0x01089a28: 0x1089a28: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x01089408: 0x1089408: addu  a0, s0, zero
+// 0x01089a2c: 0x1089a2c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0108940c: 0x108940c: addiu s2, zero, 1
+// 0x01089a30: 0x1089a30: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01089410: 0x1089410: addiu a1, sp, 845
+// 0x01089a34: 0x1089a34: addiu a1, sp, 845
 	ldloc.0
 	ldc.i4 845
 	add
 	stloc.2
-// 0x01089414: 0x1089414: addu  a2, s4, zero
+// 0x01089a38: 0x1089a38: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01089418: 0x1089418: addiu a3, s3, 28076
+// 0x01089a3c: 0x1089a3c: addiu a3, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108941c: 0x108941c: addiu s5, zero, 150
+// 0x01089a40: 0x1089a40: addiu s5, zero, 150
 	ldc.i4 150
 	stloc 12
-// 0x01089420: 0x1089420: sw    s5, 24(sp)
+// 0x01089a44: 0x1089a44: sw    s5, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6648,7 +6648,7 @@ L_1089400:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01089424: 0x1089424: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089a48: 0x1089a48: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6662,28 +6662,28 @@ L_1089400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108942c: 0x108942c: addu  a0, v0, zero
+// 0x01089a50: 0x1089a50: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089430: 0x1089430: addiu a1, s3, 28076
+// 0x01089a54: 0x1089a54: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089434: 0x1089434: addu  a2, zero, zero
+// 0x01089a58: 0x1089a58: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089438: 0x1089438: addiu a3, sp, 176
+// 0x01089a5c: 0x1089a5c: addiu a3, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc 4
-// 0x0108943c: 0x108943c: sw    zero, 64(sp)
+// 0x01089a60: 0x1089a60: sw    zero, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6692,7 +6692,7 @@ L_1089400:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01089440: 0x1089440: jal   0x106855c sw    s2, 16(sp)
+// 0x01089a64: 0x1089a64: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6706,66 +6706,66 @@ L_1089400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089448: 0x1089448: beq   v0, zero, 0x1089460 lui   a1, 0x20000
+// 0x01089a6c: 0x1089a6c: beq   v0, zero, 0x1089a84 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1089460
+	brfalse L_1089a84
 // --- basic block ---
-// 0x01089450: 0x1089450: lb    v1, 0(v0)
+// 0x01089a74: 0x1089a74: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089454: 0x1089454: sll   zero, zero, 0
-// 0x01089458: 0x1089458: bne   v1, zero, 0x1089478 sll   zero, zero, 0
+// 0x01089a78: 0x1089a78: sll   zero, zero, 0
+// 0x01089a7c: 0x1089a7c: bne   v1, zero, 0x1089a9c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1089478
+	brtrue L_1089a9c
 // --- basic block ---
-L_1089460:
-// 0x01089460: 0x1089460: lui   a3, 0x20000
+L_1089a84:
+// 0x01089a84: 0x1089a84: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089464: 0x1089464: addiu a1, a1, -21512
+// 0x01089a88: 0x1089a88: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089468: 0x1089468: addiu a3, a3, -12792
+// 0x01089a8c: 0x1089a8c: addiu a3, a3, -12328
 	ldloc 4
-	ldc.i4 -12792
+	ldc.i4 -12328
 	add
 	stloc 4
-// 0x0108946c: 0x108946c: addiu a0, zero, 4
+// 0x01089a90: 0x1089a90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089470: 0x1089470: j	 0x10890a4 addiu a2, zero, 1436
+// 0x01089a94: 0x1089a94: j	 0x10896c8 addiu a2, zero, 1436
 	ldc.i4 1436
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_1089478:
-// 0x01089478: 0x1089478: addu  a0, v0, zero
+L_1089a9c:
+// 0x01089a9c: 0x1089a9c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108947c: 0x108947c: addiu a1, s3, 28076
+// 0x01089aa0: 0x1089aa0: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089480: 0x1089480: addu  a2, zero, zero
+// 0x01089aa4: 0x1089aa4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089484: 0x1089484: addiu a3, sp, 172
+// 0x01089aa8: 0x1089aa8: addiu a3, sp, 172
 	ldloc.0
 	ldc.i4 172
 	add
 	stloc 4
-// 0x01089488: 0x1089488: jal   0x106855c sw    s2, 16(sp)
+// 0x01089aac: 0x1089aac: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6779,62 +6779,62 @@ L_1089478:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089490: 0x1089490: bne   v0, zero, 0x10894b4 addu  s0, v0, zero
+// 0x01089ab4: 0x1089ab4: bne   v0, zero, 0x1089ad8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10894b4
+	brtrue L_1089ad8
 // --- basic block ---
-// 0x01089498: 0x1089498: lui   a1, 0x20000
+// 0x01089abc: 0x1089abc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108949c: 0x108949c: lui   a3, 0x20000
+// 0x01089ac0: 0x1089ac0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010894a0: 0x10894a0: addiu a1, a1, -21512
+// 0x01089ac4: 0x1089ac4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010894a4: 0x10894a4: addiu a3, a3, -12724
+// 0x01089ac8: 0x1089ac8: addiu a3, a3, -12260
 	ldloc 4
-	ldc.i4 -12724
+	ldc.i4 -12260
 	add
 	stloc 4
-// 0x010894a8: 0x10894a8: addiu a0, zero, 4
+// 0x01089acc: 0x1089acc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010894ac: 0x10894ac: j	 0x10898b8 addiu a2, zero, 1451
+// 0x01089ad0: 0x1089ad0: j	 0x1089edc addiu a2, zero, 1451
 	ldc.i4 1451
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_10894b4:
-// 0x010894b4: 0x10894b4: addu  a0, v0, zero
+L_1089ad8:
+// 0x01089ad8: 0x1089ad8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010894b8: 0x10894b8: addiu a1, sp, 744
+// 0x01089adc: 0x1089adc: addiu a1, sp, 744
 	ldloc.0
 	ldc.i4 744
 	add
 	stloc.2
-// 0x010894bc: 0x10894bc: addu  a2, s4, zero
+// 0x01089ae0: 0x1089ae0: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x010894c0: 0x10894c0: addiu a3, s3, 28076
+// 0x01089ae4: 0x1089ae4: addiu a3, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010894c4: 0x10894c4: addiu v0, zero, 100
+// 0x01089ae8: 0x1089ae8: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x010894c8: 0x10894c8: sw    v0, 24(sp)
+// 0x01089aec: 0x1089aec: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6843,7 +6843,7 @@ L_10894b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010894cc: 0x10894cc: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089af0: 0x1089af0: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6857,28 +6857,28 @@ L_10894b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010894d4: 0x10894d4: addu  a0, v0, zero
+// 0x01089af8: 0x1089af8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010894d8: 0x10894d8: addiu a1, sp, 996
+// 0x01089afc: 0x1089afc: addiu a1, sp, 996
 	ldloc.0
 	ldc.i4 996
 	add
 	stloc.2
-// 0x010894dc: 0x10894dc: addu  a2, s4, zero
+// 0x01089b00: 0x1089b00: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x010894e0: 0x10894e0: addiu a3, s3, 28076
+// 0x01089b04: 0x1089b04: addiu a3, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010894e4: 0x10894e4: sw    s5, 24(sp)
+// 0x01089b08: 0x1089b08: sw    s5, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6887,7 +6887,7 @@ L_10894b4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010894e8: 0x10894e8: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089b0c: 0x1089b0c: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6901,28 +6901,28 @@ L_10894b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010894f0: 0x10894f0: addu  a0, v0, zero
+// 0x01089b14: 0x1089b14: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010894f4: 0x10894f4: addiu a1, sp, 1147
+// 0x01089b18: 0x1089b18: addiu a1, sp, 1147
 	ldloc.0
 	ldc.i4 1147
 	add
 	stloc.2
-// 0x010894f8: 0x10894f8: addu  a2, s4, zero
+// 0x01089b1c: 0x1089b1c: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x010894fc: 0x10894fc: addiu a3, s3, 28076
+// 0x01089b20: 0x1089b20: addiu a3, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089500: 0x1089500: sw    s5, 24(sp)
+// 0x01089b24: 0x1089b24: sw    s5, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6931,7 +6931,7 @@ L_10894b4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01089504: 0x1089504: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089b28: 0x1089b28: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6945,31 +6945,31 @@ L_10894b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108950c: 0x108950c: addu  a0, v0, zero
+// 0x01089b30: 0x1089b30: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089510: 0x1089510: addu  a2, s4, zero
+// 0x01089b34: 0x1089b34: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01089514: 0x1089514: addiu v0, zero, 5
+// 0x01089b38: 0x1089b38: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01089518: 0x1089518: addiu a3, s3, 28076
+// 0x01089b3c: 0x1089b3c: addiu a3, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108951c: 0x108951c: addiu a1, sp, 28
+// 0x01089b40: 0x1089b40: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x01089520: 0x1089520: sw    v0, 24(sp)
+// 0x01089b44: 0x1089b44: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6978,13 +6978,13 @@ L_10894b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089524: 0x1089524: sb    zero, 28(sp)
+// 0x01089b48: 0x1089b48: sb    zero, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01089528: 0x1089528: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089b4c: 0x1089b4c: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6998,57 +6998,57 @@ L_10894b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089530: 0x1089530: bne   v0, zero, 0x1089554 addu  s0, v0, zero
+// 0x01089b54: 0x1089b54: bne   v0, zero, 0x1089b78 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1089554
+	brtrue L_1089b78
 // --- basic block ---
-// 0x01089538: 0x1089538: lui   a1, 0x20000
+// 0x01089b5c: 0x1089b5c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108953c: 0x108953c: lui   a3, 0x20000
+// 0x01089b60: 0x1089b60: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089540: 0x1089540: addiu a1, a1, -21512
+// 0x01089b64: 0x1089b64: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089544: 0x1089544: addiu a3, a3, -12656
+// 0x01089b68: 0x1089b68: addiu a3, a3, -12192
 	ldloc 4
-	ldc.i4 -12656
+	ldc.i4 -12192
 	add
 	stloc 4
-// 0x01089548: 0x1089548: addiu a0, zero, 4
+// 0x01089b6c: 0x1089b6c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108954c: 0x108954c: j	 0x10898b8 addiu a2, zero, 1495
+// 0x01089b70: 0x1089b70: j	 0x1089edc addiu a2, zero, 1495
 	ldc.i4 1495
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_1089554:
-// 0x01089554: 0x1089554: lb    v1, 28(sp)
+L_1089b78:
+// 0x01089b78: 0x1089b78: lb    v1, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089558: 0x1089558: addiu v0, zero, 84
+// 0x01089b7c: 0x1089b7c: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x0108955c: 0x108955c: bne   v1, v0, 0x108956c sll   zero, zero, 0
+// 0x01089b80: 0x1089b80: bne   v1, v0, 0x1089b90 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_108956c
+	bne.un L_1089b90
 // --- basic block ---
-// 0x01089564: 0x1089564: j	 0x1089570 sw    s2, 1320(sp)
+// 0x01089b88: 0x1089b88: j	 0x1089b94 sw    s2, 1320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7057,10 +7057,10 @@ L_1089554:
 	add
 	ldloc 8
 	stelem.i4
-	br L_1089570
+	br L_1089b94
 // --- basic block ---
-L_108956c:
-// 0x0108956c: 0x108956c: sw    zero, 1320(sp)
+L_1089b90:
+// 0x01089b90: 0x1089b90: sw    zero, 1320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7069,35 +7069,35 @@ L_108956c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1089570:
-// 0x01089570: 0x1089570: lui   a3, 0x0
+L_1089b94:
+// 0x01089b94: 0x1089b94: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01089574: 0x1089574: addu  a0, s0, zero
+// 0x01089b98: 0x1089b98: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01089578: 0x1089578: addiu v0, zero, 5
+// 0x01089b9c: 0x1089b9c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x0108957c: 0x108957c: addiu a3, a3, 28076
+// 0x01089ba0: 0x1089ba0: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089580: 0x1089580: addiu s2, zero, 1
+// 0x01089ba4: 0x1089ba4: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01089584: 0x1089584: addiu a1, sp, 28
+// 0x01089ba8: 0x1089ba8: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x01089588: 0x1089588: addiu a2, sp, 24
+// 0x01089bac: 0x1089bac: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108958c: 0x108958c: sw    v0, 24(sp)
+// 0x01089bb0: 0x1089bb0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7106,13 +7106,13 @@ L_1089570:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089590: 0x1089590: sb    zero, 28(sp)
+// 0x01089bb4: 0x1089bb4: sb    zero, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01089594: 0x1089594: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089bb8: 0x1089bb8: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7126,57 +7126,57 @@ L_1089570:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108959c: 0x108959c: bne   v0, zero, 0x10895c0 addu  s0, v0, zero
+// 0x01089bc0: 0x1089bc0: bne   v0, zero, 0x1089be4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10895c0
+	brtrue L_1089be4
 // --- basic block ---
-// 0x010895a4: 0x10895a4: lui   a1, 0x20000
+// 0x01089bc8: 0x1089bc8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010895a8: 0x10895a8: lui   a3, 0x20000
+// 0x01089bcc: 0x1089bcc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010895ac: 0x10895ac: addiu a1, a1, -21512
+// 0x01089bd0: 0x1089bd0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010895b0: 0x10895b0: addiu a3, a3, -12580
+// 0x01089bd4: 0x1089bd4: addiu a3, a3, -12116
 	ldloc 4
-	ldc.i4 -12580
+	ldc.i4 -12116
 	add
 	stloc 4
-// 0x010895b4: 0x10895b4: addiu a0, zero, 4
+// 0x01089bd8: 0x1089bd8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010895b8: 0x10895b8: j	 0x10898b8 addiu a2, zero, 1517
+// 0x01089bdc: 0x1089bdc: j	 0x1089edc addiu a2, zero, 1517
 	ldc.i4 1517
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_10895c0:
-// 0x010895c0: 0x10895c0: lb    v1, 28(sp)
+L_1089be4:
+// 0x01089be4: 0x1089be4: lb    v1, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010895c4: 0x10895c4: addiu v0, zero, 84
+// 0x01089be8: 0x1089be8: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x010895c8: 0x10895c8: bne   v1, v0, 0x10895d8 sll   zero, zero, 0
+// 0x01089bec: 0x1089bec: bne   v1, v0, 0x1089bfc sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10895d8
+	bne.un L_1089bfc
 // --- basic block ---
-// 0x010895d0: 0x10895d0: j	 0x10895dc sw    s2, 1552(sp)
+// 0x01089bf4: 0x1089bf4: j	 0x1089c00 sw    s2, 1552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7185,10 +7185,10 @@ L_10895c0:
 	add
 	ldloc 8
 	stelem.i4
-	br L_10895dc
+	br L_1089c00
 // --- basic block ---
-L_10895d8:
-// 0x010895d8: 0x10895d8: sw    zero, 1552(sp)
+L_1089bfc:
+// 0x01089bfc: 0x1089bfc: sw    zero, 1552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7197,30 +7197,30 @@ L_10895d8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10895dc:
-// 0x010895dc: 0x10895dc: lb    a0, 0(s0)
+L_1089c00:
+// 0x01089c00: 0x1089c00: lb    a0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010895e0: 0x10895e0: addiu v1, zero, 44
+// 0x01089c04: 0x1089c04: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x010895e4: 0x10895e4: beq   a0, v1, 0x1089644 addiu v0, s0, 1
+// 0x01089c08: 0x1089c08: beq   a0, v1, 0x1089c68 addiu v0, s0, 1
 	ldloc.1
 	ldloc 7
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_1089644
+	beq  L_1089c68
 // --- basic block ---
-// 0x010895ec: 0x10895ec: addiu v0, zero, 64
+// 0x01089c10: 0x1089c10: addiu v0, zero, 64
 	ldc.i4.s 64
 	stloc 5
-// 0x010895f0: 0x10895f0: lui   a3, 0x0
+// 0x01089c14: 0x1089c14: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010895f4: 0x10895f4: sw    v0, 24(sp)
+// 0x01089c18: 0x1089c18: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7229,28 +7229,28 @@ L_10895dc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010895f8: 0x10895f8: addu  a0, s0, zero
+// 0x01089c1c: 0x1089c1c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010895fc: 0x10895fc: addiu v0, zero, 1
+// 0x01089c20: 0x1089c20: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01089600: 0x1089600: addiu a3, a3, 28076
+// 0x01089c24: 0x1089c24: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089604: 0x1089604: addiu a1, sp, 1468
+// 0x01089c28: 0x1089c28: addiu a1, sp, 1468
 	ldloc.0
 	ldc.i4 1468
 	add
 	stloc.2
-// 0x01089608: 0x1089608: addiu a2, sp, 24
+// 0x01089c2c: 0x1089c2c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108960c: 0x108960c: jal   0x1068250 sw    v0, 16(sp)
+// 0x01089c30: 0x1089c30: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7264,75 +7264,75 @@ L_10895dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089614: 0x1089614: beq   v0, zero, 0x108962c lui   a1, 0x20000
+// 0x01089c38: 0x1089c38: beq   v0, zero, 0x1089c50 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108962c
+	brfalse L_1089c50
 // --- basic block ---
-// 0x0108961c: 0x108961c: lb    v1, 0(v0)
+// 0x01089c40: 0x1089c40: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089620: 0x1089620: sll   zero, zero, 0
-// 0x01089624: 0x1089624: bne   v1, zero, 0x1089644 sll   zero, zero, 0
+// 0x01089c44: 0x1089c44: sll   zero, zero, 0
+// 0x01089c48: 0x1089c48: bne   v1, zero, 0x1089c68 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1089644
+	brtrue L_1089c68
 // --- basic block ---
-L_108962c:
-// 0x0108962c: 0x108962c: lui   a3, 0x20000
+L_1089c50:
+// 0x01089c50: 0x1089c50: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089630: 0x1089630: addiu a1, a1, -21512
+// 0x01089c54: 0x1089c54: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089634: 0x1089634: addiu a3, a3, -12500
+// 0x01089c58: 0x1089c58: addiu a3, a3, -12036
 	ldloc 4
-	ldc.i4 -12500
+	ldc.i4 -12036
 	add
 	stloc 4
-// 0x01089638: 0x1089638: addiu a0, zero, 4
+// 0x01089c5c: 0x1089c5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108963c: 0x108963c: j	 0x10890a4 addiu a2, zero, 1545
+// 0x01089c60: 0x1089c60: j	 0x10896c8 addiu a2, zero, 1545
 	ldc.i4 1545
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_1089644:
-// 0x01089644: 0x1089644: lb    a0, 0(v0)
+L_1089c68:
+// 0x01089c68: 0x1089c68: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01089648: 0x1089648: addiu v1, zero, 44
+// 0x01089c6c: 0x1089c6c: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x0108964c: 0x108964c: beq   a0, v1, 0x10896b0 addiu s0, v0, 1
+// 0x01089c70: 0x1089c70: beq   a0, v1, 0x1089cd4 addiu s0, v0, 1
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 9
-	beq  L_10896b0
+	beq  L_1089cd4
 // --- basic block ---
-// 0x01089654: 0x1089654: addu  a0, v0, zero
+// 0x01089c78: 0x1089c78: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089658: 0x1089658: lui   a3, 0x0
+// 0x01089c7c: 0x1089c7c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108965c: 0x108965c: addiu v0, zero, 128
+// 0x01089c80: 0x1089c80: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x01089660: 0x1089660: sw    v0, 24(sp)
+// 0x01089c84: 0x1089c84: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7341,25 +7341,25 @@ L_1089644:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089664: 0x1089664: addiu a3, a3, 28076
+// 0x01089c88: 0x1089c88: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089668: 0x1089668: addiu v0, zero, 1
+// 0x01089c8c: 0x1089c8c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108966c: 0x108966c: addiu a1, sp, 1340
+// 0x01089c90: 0x1089c90: addiu a1, sp, 1340
 	ldloc.0
 	ldc.i4 1340
 	add
 	stloc.2
-// 0x01089670: 0x1089670: addiu a2, sp, 24
+// 0x01089c94: 0x1089c94: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01089674: 0x1089674: jal   0x1068250 sw    v0, 16(sp)
+// 0x01089c98: 0x1089c98: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7373,67 +7373,67 @@ L_1089644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108967c: 0x108967c: beq   v0, zero, 0x1089694 addu  s0, v0, zero
+// 0x01089ca0: 0x1089ca0: beq   v0, zero, 0x1089cb8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_1089694
+	brfalse L_1089cb8
 // --- basic block ---
-// 0x01089684: 0x1089684: lb    v0, 0(v0)
+// 0x01089ca8: 0x1089ca8: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01089688: 0x1089688: sll   zero, zero, 0
-// 0x0108968c: 0x108968c: bne   v0, zero, 0x10896b0 sll   zero, zero, 0
+// 0x01089cac: 0x1089cac: sll   zero, zero, 0
+// 0x01089cb0: 0x1089cb0: bne   v0, zero, 0x1089cd4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10896b0
+	brtrue L_1089cd4
 // --- basic block ---
-L_1089694:
-// 0x01089694: 0x1089694: lui   a1, 0x20000
+L_1089cb8:
+// 0x01089cb8: 0x1089cb8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089698: 0x1089698: lui   a3, 0x20000
+// 0x01089cbc: 0x1089cbc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108969c: 0x108969c: addiu a1, a1, -21512
+// 0x01089cc0: 0x1089cc0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010896a0: 0x10896a0: addiu a3, a3, -12428
+// 0x01089cc4: 0x1089cc4: addiu a3, a3, -11964
 	ldloc 4
-	ldc.i4 -12428
+	ldc.i4 -11964
 	add
 	stloc 4
-// 0x010896a4: 0x10896a4: addiu a0, zero, 4
+// 0x01089cc8: 0x1089cc8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010896a8: 0x10896a8: j	 0x10890a4 addiu a2, zero, 1569
+// 0x01089ccc: 0x1089ccc: j	 0x10896c8 addiu a2, zero, 1569
 	ldc.i4 1569
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_10896b0:
-// 0x010896b0: 0x10896b0: lb    v1, 0(s0)
+L_1089cd4:
+// 0x01089cd4: 0x1089cd4: lb    v1, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010896b4: 0x10896b4: addiu v0, zero, 44
+// 0x01089cd8: 0x1089cd8: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x010896b8: 0x10896b8: bne   v1, v0, 0x10896ec lui   a3, 0x0
+// 0x01089cdc: 0x1089cdc: bne   v1, v0, 0x1089d10 lui   a3, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_10896ec
+	bne.un L_1089d10
 // --- basic block ---
-// 0x010896c0: 0x10896c0: lw    v0, 36(sp)
+// 0x01089ce4: 0x1089ce4: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7442,29 +7442,29 @@ L_10896b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010896c4: 0x10896c4: lui   a1, 0x20000
+// 0x01089ce8: 0x1089ce8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010896c8: 0x10896c8: lui   a3, 0x20000
+// 0x01089cec: 0x1089cec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010896cc: 0x10896cc: addiu a1, a1, -21512
+// 0x01089cf0: 0x1089cf0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010896d0: 0x10896d0: addiu a3, a3, -12356
+// 0x01089cf4: 0x1089cf4: addiu a3, a3, -11892
 	ldloc 4
-	ldc.i4 -12356
+	ldc.i4 -11892
 	add
 	stloc 4
-// 0x010896d4: 0x10896d4: addiu a0, zero, 1
+// 0x01089cf8: 0x1089cf8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010896d8: 0x10896d8: addiu a2, zero, 1578
+// 0x01089cfc: 0x1089cfc: addiu a2, zero, 1578
 	ldc.i4 1578
 	stloc.3
-// 0x010896dc: 0x10896dc: jal   0x100449c sw    v0, 16(sp)
+// 0x01089d00: 0x1089d00: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7483,18 +7483,18 @@ L_10896b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010896e4: 0x10896e4: j	 0x1089740 addiu v0, s0, 1
+// 0x01089d08: 0x1089d08: j	 0x1089d64 addiu v0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 5
-	br L_1089740
+	br L_1089d64
 // --- basic block ---
-L_10896ec:
-// 0x010896ec: 0x10896ec: addiu v0, zero, 100
+L_1089d10:
+// 0x01089d10: 0x1089d10: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x010896f0: 0x10896f0: sw    v0, 24(sp)
+// 0x01089d14: 0x1089d14: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7503,28 +7503,28 @@ L_10896ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010896f4: 0x10896f4: addu  a0, s0, zero
+// 0x01089d18: 0x1089d18: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010896f8: 0x10896f8: addiu v0, zero, 1
+// 0x01089d1c: 0x1089d1c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010896fc: 0x10896fc: addiu a3, a3, 28076
+// 0x01089d20: 0x1089d20: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089700: 0x1089700: addiu a1, sp, 1556
+// 0x01089d24: 0x1089d24: addiu a1, sp, 1556
 	ldloc.0
 	ldc.i4 1556
 	add
 	stloc.2
-// 0x01089704: 0x1089704: addiu a2, sp, 24
+// 0x01089d28: 0x1089d28: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01089708: 0x1089708: jal   0x1068250 sw    v0, 16(sp)
+// 0x01089d2c: 0x1089d2c: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7538,77 +7538,77 @@ L_10896ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089710: 0x1089710: beq   v0, zero, 0x1089728 lui   a1, 0x20000
+// 0x01089d34: 0x1089d34: beq   v0, zero, 0x1089d4c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1089728
+	brfalse L_1089d4c
 // --- basic block ---
-// 0x01089718: 0x1089718: lb    v1, 0(v0)
+// 0x01089d3c: 0x1089d3c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108971c: 0x108971c: sll   zero, zero, 0
-// 0x01089720: 0x1089720: bne   v1, zero, 0x1089740 sll   zero, zero, 0
+// 0x01089d40: 0x1089d40: sll   zero, zero, 0
+// 0x01089d44: 0x1089d44: bne   v1, zero, 0x1089d64 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1089740
+	brtrue L_1089d64
 // --- basic block ---
-L_1089728:
-// 0x01089728: 0x1089728: lui   a3, 0x20000
+L_1089d4c:
+// 0x01089d4c: 0x1089d4c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108972c: 0x108972c: addiu a1, a1, -21512
+// 0x01089d50: 0x1089d50: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089730: 0x1089730: addiu a3, a3, -12276
+// 0x01089d54: 0x1089d54: addiu a3, a3, -11812
 	ldloc 4
-	ldc.i4 -12276
+	ldc.i4 -11812
 	add
 	stloc 4
-// 0x01089734: 0x1089734: addiu a0, zero, 4
+// 0x01089d58: 0x1089d58: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089738: 0x1089738: j	 0x10890a4 addiu a2, zero, 1594
+// 0x01089d5c: 0x1089d5c: j	 0x10896c8 addiu a2, zero, 1594
 	ldc.i4 1594
 	stloc.3
-	br L_10890a4
+	br L_10896c8
 // --- basic block ---
-L_1089740:
-// 0x01089740: 0x1089740: lui   a3, 0x0
+L_1089d64:
+// 0x01089d64: 0x1089d64: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01089744: 0x1089744: addu  a0, v0, zero
+// 0x01089d68: 0x1089d68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089748: 0x1089748: addiu a3, a3, 28076
+// 0x01089d6c: 0x1089d6c: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108974c: 0x108974c: addiu v0, zero, 5
+// 0x01089d70: 0x1089d70: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01089750: 0x1089750: addiu s2, zero, 1
+// 0x01089d74: 0x1089d74: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01089754: 0x1089754: addiu a1, sp, 28
+// 0x01089d78: 0x1089d78: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x01089758: 0x1089758: addiu a2, sp, 24
+// 0x01089d7c: 0x1089d7c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108975c: 0x108975c: sw    v0, 24(sp)
+// 0x01089d80: 0x1089d80: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7617,13 +7617,13 @@ L_1089740:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089760: 0x1089760: sb    zero, 28(sp)
+// 0x01089d84: 0x1089d84: sb    zero, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01089764: 0x1089764: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089d88: 0x1089d88: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7637,57 +7637,57 @@ L_1089740:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108976c: 0x108976c: bne   v0, zero, 0x1089790 addu  s0, v0, zero
+// 0x01089d90: 0x1089d90: bne   v0, zero, 0x1089db4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1089790
+	brtrue L_1089db4
 // --- basic block ---
-// 0x01089774: 0x1089774: lui   a1, 0x20000
+// 0x01089d98: 0x1089d98: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089778: 0x1089778: lui   a3, 0x20000
+// 0x01089d9c: 0x1089d9c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108977c: 0x108977c: addiu a1, a1, -21512
+// 0x01089da0: 0x1089da0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089780: 0x1089780: addiu a3, a3, -12200
+// 0x01089da4: 0x1089da4: addiu a3, a3, -11736
 	ldloc 4
-	ldc.i4 -12200
+	ldc.i4 -11736
 	add
 	stloc 4
-// 0x01089784: 0x1089784: addiu a0, zero, 4
+// 0x01089da8: 0x1089da8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089788: 0x1089788: j	 0x10898b8 addiu a2, zero, 1612
+// 0x01089dac: 0x1089dac: j	 0x1089edc addiu a2, zero, 1612
 	ldc.i4 1612
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_1089790:
-// 0x01089790: 0x1089790: lb    v1, 28(sp)
+L_1089db4:
+// 0x01089db4: 0x1089db4: lb    v1, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089794: 0x1089794: addiu v0, zero, 84
+// 0x01089db8: 0x1089db8: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x01089798: 0x1089798: bne   v1, v0, 0x10897a8 sll   zero, zero, 0
+// 0x01089dbc: 0x1089dbc: bne   v1, v0, 0x1089dcc sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10897a8
+	bne.un L_1089dcc
 // --- basic block ---
-// 0x010897a0: 0x10897a0: j	 0x10897ac sw    s2, 1656(sp)
+// 0x01089dc4: 0x1089dc4: j	 0x1089dd0 sw    s2, 1656(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7696,10 +7696,10 @@ L_1089790:
 	add
 	ldloc 8
 	stelem.i4
-	br L_10897ac
+	br L_1089dd0
 // --- basic block ---
-L_10897a8:
-// 0x010897a8: 0x10897a8: sw    zero, 1656(sp)
+L_1089dcc:
+// 0x01089dcc: 0x1089dcc: sw    zero, 1656(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7708,38 +7708,38 @@ L_10897a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10897ac:
-// 0x010897ac: 0x10897ac: addiu s3, sp, 24
+L_1089dd0:
+// 0x01089dd0: 0x1089dd0: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x010897b0: 0x10897b0: lui   s5, 0x0
+// 0x01089dd4: 0x1089dd4: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010897b4: 0x10897b4: addu  a0, s0, zero
+// 0x01089dd8: 0x1089dd8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010897b8: 0x10897b8: addiu s2, zero, 1
+// 0x01089ddc: 0x1089ddc: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010897bc: 0x10897bc: addiu s0, zero, 100
+// 0x01089de0: 0x1089de0: addiu s0, zero, 100
 	ldc.i4.s 100
 	stloc 9
-// 0x010897c0: 0x10897c0: addiu a1, sp, 1660
+// 0x01089de4: 0x1089de4: addiu a1, sp, 1660
 	ldloc.0
 	ldc.i4 1660
 	add
 	stloc.2
-// 0x010897c4: 0x10897c4: addu  a2, s3, zero
+// 0x01089de8: 0x1089de8: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x010897c8: 0x10897c8: addiu a3, s5, 30268
+// 0x01089dec: 0x1089dec: addiu a3, s5, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x010897cc: 0x10897cc: sw    s0, 24(sp)
+// 0x01089df0: 0x1089df0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7748,10 +7748,10 @@ L_10897ac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010897d0: 0x10897d0: lui   s4, 0x0
+// 0x01089df4: 0x1089df4: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010897d4: 0x10897d4: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089df8: 0x1089df8: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7765,28 +7765,28 @@ L_10897ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010897dc: 0x10897dc: addu  a0, v0, zero
+// 0x01089e00: 0x1089e00: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010897e0: 0x10897e0: addiu a1, sp, 1760
+// 0x01089e04: 0x1089e04: addiu a1, sp, 1760
 	ldloc.0
 	ldc.i4 1760
 	add
 	stloc.2
-// 0x010897e4: 0x10897e4: addu  a2, s3, zero
+// 0x01089e08: 0x1089e08: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x010897e8: 0x10897e8: addiu a3, s4, 28076
+// 0x01089e0c: 0x1089e0c: addiu a3, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010897ec: 0x10897ec: sw    s0, 24(sp)
+// 0x01089e10: 0x1089e10: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7795,7 +7795,7 @@ L_10897ac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010897f0: 0x10897f0: jal   0x1068250 sw    s2, 16(sp)
+// 0x01089e14: 0x1089e14: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7809,28 +7809,28 @@ L_10897ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010897f8: 0x10897f8: addu  a0, v0, zero
+// 0x01089e1c: 0x1089e1c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010897fc: 0x10897fc: addiu a1, s4, 28076
+// 0x01089e20: 0x1089e20: addiu a1, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089800: 0x1089800: addu  a2, zero, zero
+// 0x01089e24: 0x1089e24: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089804: 0x1089804: addiu a3, sp, 1860
+// 0x01089e28: 0x1089e28: addiu a3, sp, 1860
 	ldloc.0
 	ldc.i4 1860
 	add
 	stloc 4
-// 0x01089808: 0x1089808: jal   0x106855c sw    s2, 16(sp)
+// 0x01089e2c: 0x1089e2c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7844,59 +7844,59 @@ L_10897ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089810: 0x1089810: bne   v0, zero, 0x1089834 addu  s0, v0, zero
+// 0x01089e34: 0x1089e34: bne   v0, zero, 0x1089e58 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1089834
+	brtrue L_1089e58
 // --- basic block ---
-// 0x01089818: 0x1089818: lui   a1, 0x20000
+// 0x01089e3c: 0x1089e3c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108981c: 0x108981c: lui   a3, 0x20000
+// 0x01089e40: 0x1089e40: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089820: 0x1089820: addiu a1, a1, -21512
+// 0x01089e44: 0x1089e44: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089824: 0x1089824: addiu a3, a3, -12112
+// 0x01089e48: 0x1089e48: addiu a3, a3, -11648
 	ldloc 4
-	ldc.i4 -12112
+	ldc.i4 -11648
 	add
 	stloc 4
-// 0x01089828: 0x1089828: addiu a0, zero, 4
+// 0x01089e4c: 0x1089e4c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108982c: 0x108982c: j	 0x10898b8 addiu a2, zero, 1652
+// 0x01089e50: 0x1089e50: j	 0x1089edc addiu a2, zero, 1652
 	ldc.i4 1652
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_1089834:
-// 0x01089834: 0x1089834: addu  a0, v0, zero
+L_1089e58:
+// 0x01089e58: 0x1089e58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089838: 0x1089838: addiu a1, s4, 28076
+// 0x01089e5c: 0x1089e5c: addiu a1, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108983c: 0x108983c: addu  a2, zero, zero
+// 0x01089e60: 0x1089e60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089840: 0x1089840: addiu a3, sp, 1864
+// 0x01089e64: 0x1089e64: addiu a3, sp, 1864
 	ldloc.0
 	ldc.i4 1864
 	add
 	stloc 4
-// 0x01089844: 0x1089844: jal   0x106855c sw    s2, 16(sp)
+// 0x01089e68: 0x1089e68: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7910,49 +7910,49 @@ L_1089834:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108984c: 0x108984c: bne   v0, zero, 0x1089870 addu  s0, v0, zero
+// 0x01089e70: 0x1089e70: bne   v0, zero, 0x1089e94 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1089870
+	brtrue L_1089e94
 // --- basic block ---
-// 0x01089854: 0x1089854: lui   a1, 0x20000
+// 0x01089e78: 0x1089e78: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089858: 0x1089858: lui   a3, 0x20000
+// 0x01089e7c: 0x1089e7c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108985c: 0x108985c: addiu a1, a1, -21512
+// 0x01089e80: 0x1089e80: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089860: 0x1089860: addiu a3, a3, -12040
+// 0x01089e84: 0x1089e84: addiu a3, a3, -11576
 	ldloc 4
-	ldc.i4 -12040
+	ldc.i4 -11576
 	add
 	stloc 4
-// 0x01089864: 0x1089864: addiu a0, zero, 4
+// 0x01089e88: 0x1089e88: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089868: 0x1089868: j	 0x10898b8 addiu a2, zero, 1668
+// 0x01089e8c: 0x1089e8c: j	 0x1089edc addiu a2, zero, 1668
 	ldc.i4 1668
 	stloc.3
-	br L_10898b8
+	br L_1089edc
 // --- basic block ---
-L_1089870:
-// 0x01089870: 0x1089870: addu  a0, v0, zero
+L_1089e94:
+// 0x01089e94: 0x1089e94: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089874: 0x1089874: addiu v0, zero, 5
+// 0x01089e98: 0x1089e98: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01089878: 0x1089878: sw    v0, 24(sp)
+// 0x01089e9c: 0x1089e9c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7961,23 +7961,23 @@ L_1089870:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108987c: 0x108987c: addu  a2, s3, zero
+// 0x01089ea0: 0x1089ea0: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01089880: 0x1089880: addiu v0, zero, -1
+// 0x01089ea4: 0x1089ea4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01089884: 0x1089884: addiu a3, s5, 30268
+// 0x01089ea8: 0x1089ea8: addiu a3, s5, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01089888: 0x1089888: addiu a1, sp, 28
+// 0x01089eac: 0x1089eac: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x0108988c: 0x108988c: sw    v0, 16(sp)
+// 0x01089eb0: 0x1089eb0: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7986,7 +7986,7 @@ L_1089870:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089890: 0x1089890: jal   0x1068250 sb    zero, 28(sp)
+// 0x01089eb4: 0x1089eb4: jal   0x1068260 sb    zero, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -7997,41 +7997,41 @@ L_1089870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089898: 0x1089898: bne   v0, zero, 0x10898d0 addu  s0, v0, zero
+// 0x01089ebc: 0x1089ebc: bne   v0, zero, 0x1089ef4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10898d0
+	brtrue L_1089ef4
 // --- basic block ---
-// 0x010898a0: 0x10898a0: lui   a1, 0x20000
+// 0x01089ec4: 0x1089ec4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010898a4: 0x10898a4: lui   a3, 0x20000
+// 0x01089ec8: 0x1089ec8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010898a8: 0x10898a8: addiu a1, a1, -21512
+// 0x01089ecc: 0x1089ecc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010898ac: 0x10898ac: addiu a3, a3, -11956
+// 0x01089ed0: 0x1089ed0: addiu a3, a3, -11492
 	ldloc 4
-	ldc.i4 -11956
+	ldc.i4 -11492
 	add
 	stloc 4
-// 0x010898b0: 0x10898b0: addiu a0, zero, 4
+// 0x01089ed4: 0x1089ed4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010898b4: 0x10898b4: addiu a2, zero, 1686
+// 0x01089ed8: 0x1089ed8: addiu a2, zero, 1686
 	ldc.i4 1686
 	stloc.3
-L_10898b8:
-// 0x010898b8: 0x10898b8: lw    v0, 36(sp)
+L_1089edc:
+// 0x01089edc: 0x1089edc: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8040,7 +8040,7 @@ L_10898b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010898bc: 0x10898bc: jal   0x100449c sw    v0, 16(sp)
+// 0x01089ee0: 0x1089ee0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8059,34 +8059,34 @@ L_10898b8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010898c4: 0x10898c4: addiu v0, zero, 18
+// 0x01089ee8: 0x1089ee8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x010898c8: 0x10898c8: j	 0x1089938 sw    v0, 0(s1)
+// 0x01089eec: 0x1089eec: j	 0x1089f5c sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1089938
+	br L_1089f5c
 // --- basic block ---
-L_10898d0:
-// 0x010898d0: 0x10898d0: lb    v1, 28(sp)
+L_1089ef4:
+// 0x01089ef4: 0x1089ef4: lb    v1, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010898d4: 0x10898d4: addiu v0, zero, 84
+// 0x01089ef8: 0x1089ef8: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x010898d8: 0x10898d8: bne   v1, v0, 0x10898e8 sll   zero, zero, 0
+// 0x01089efc: 0x1089efc: bne   v1, v0, 0x1089f0c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10898e8
+	bne.un L_1089f0c
 // --- basic block ---
-// 0x010898e0: 0x10898e0: j	 0x10898ec sw    s2, 1872(sp)
+// 0x01089f04: 0x1089f04: j	 0x1089f10 sw    s2, 1872(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8095,10 +8095,10 @@ L_10898d0:
 	add
 	ldloc 8
 	stelem.i4
-	br L_10898ec
+	br L_1089f10
 // --- basic block ---
-L_10898e8:
-// 0x010898e8: 0x10898e8: sw    zero, 1872(sp)
+L_1089f0c:
+// 0x01089f0c: 0x1089f0c: sw    zero, 1872(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8107,8 +8107,8 @@ L_10898e8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10898ec:
-// 0x010898ec: 0x10898ec: jal   0x107ec34 addiu a0, sp, 36
+L_1089f10:
+// 0x01089f10: 0x1089f10: jal   0x107f258 addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -8118,16 +8118,16 @@ L_10898ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Add_107ec34(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Add_107f258(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010898f4: 0x10898f4: bne   v0, zero, 0x1089938 sll   zero, zero, 0
+// 0x01089f18: 0x1089f18: bne   v0, zero, 0x1089f5c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1089938
+	brtrue L_1089f5c
 // --- basic block ---
-// 0x010898fc: 0x10898fc: lw    s0, 36(sp)
+// 0x01089f20: 0x1089f20: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8136,33 +8136,33 @@ L_10898ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01089900: 0x1089900: jal   0x1077084 sll   zero, zero, 0
-	call int32 Cibyl89::RTAlerts_Count_1077084()
+// 0x01089f24: 0x1089f24: jal   0x10776a8 sll   zero, zero, 0
+	call int32 Cibyl89::RTAlerts_Count_10776a8()
 	stloc 5
 // --- basic block ---
-// 0x01089908: 0x1089908: lui   a1, 0x20000
+// 0x01089f2c: 0x1089f2c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108990c: 0x108990c: lui   a3, 0x20000
+// 0x01089f30: 0x1089f30: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089910: 0x1089910: addiu a1, a1, -21512
+// 0x01089f34: 0x1089f34: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089914: 0x1089914: addiu a3, a3, -11880
+// 0x01089f38: 0x1089f38: addiu a3, a3, -11416
 	ldloc 4
-	ldc.i4 -11880
+	ldc.i4 -11416
 	add
 	stloc 4
-// 0x01089918: 0x1089918: addiu a0, zero, 4
+// 0x01089f3c: 0x1089f3c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108991c: 0x108991c: addiu a2, zero, 1700
+// 0x01089f40: 0x1089f40: addiu a2, zero, 1700
 	ldc.i4 1700
 	stloc.3
-// 0x01089920: 0x1089920: sw    v0, 20(sp)
+// 0x01089f44: 0x1089f44: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8171,7 +8171,7 @@ L_10898ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089924: 0x1089924: jal   0x100449c sw    s0, 16(sp)
+// 0x01089f48: 0x1089f48: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8190,26 +8190,26 @@ L_10898ec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108992c: 0x108992c: addiu v0, zero, 8
+// 0x01089f50: 0x1089f50: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-L_1089930:
-// 0x01089930: 0x1089930: sw    v0, 0(s1)
+L_1089f54:
+// 0x01089f54: 0x1089f54: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01089934: 0x1089934: addu  s0, zero, zero
+// 0x01089f58: 0x1089f58: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_1089938:
-// 0x01089938: 0x1089938: lw    ra, 1916(sp)
-// 0x0108993c: 0x108993c: addu  v0, s0, zero
+L_1089f5c:
+// 0x01089f5c: 0x1089f5c: lw    ra, 1916(sp)
+// 0x01089f60: 0x1089f60: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x01089940: 0x1089940: lw    s5, 1912(sp)
+// 0x01089f64: 0x1089f64: lw    s5, 1912(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8218,7 +8218,7 @@ L_1089938:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01089944: 0x1089944: lw    s4, 1908(sp)
+// 0x01089f68: 0x1089f68: lw    s4, 1908(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8227,7 +8227,7 @@ L_1089938:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01089948: 0x1089948: lw    s3, 1904(sp)
+// 0x01089f6c: 0x1089f6c: lw    s3, 1904(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8236,7 +8236,7 @@ L_1089938:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108994c: 0x108994c: lw    s2, 1900(sp)
+// 0x01089f70: 0x1089f70: lw    s2, 1900(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8245,7 +8245,7 @@ L_1089938:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01089950: 0x1089950: lw    s1, 1896(sp)
+// 0x01089f74: 0x1089f74: lw    s1, 1896(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8254,7 +8254,7 @@ L_1089938:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01089954: 0x1089954: lw    s0, 1892(sp)
+// 0x01089f78: 0x1089f78: lw    s0, 1892(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8263,7 +8263,7 @@ L_1089938:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01089958: 0x1089958: jr    ra addiu sp, sp, 1920
+// 0x01089f7c: 0x1089f7c: jr    ra addiu sp, sp, 1920
 	ldloc.0
 	ldc.i4 1920
 	add
diff --git a/converted/Cibyl103.j b/converted/Cibyl103.j
index d9c5ff4..6af9ca8 100644
--- a/converted/Cibyl103.j
+++ b/converted/Cibyl103.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl103::.ctor
 
-.method public static int32 VersionUpgrade_1089960(int32,int32,int32,int32,int32)
+.method public static int32 VersionUpgrade_1089f84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s0,int32 s1,int32 s3,int32 s4,int32 ra)
@@ -91,13 +91,13 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1089960:
-// 0x01089960: 0x1089960: addiu sp, sp, -64
+L_1089f84:
+// 0x01089f84: 0x1089f84: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01089964: 0x1089964: sw    s4, 56(sp)
+// 0x01089f88: 0x1089f88: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -106,10 +106,10 @@ L_1089960:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01089968: 0x1089968: lui   s4, 0x0
+// 0x01089f8c: 0x1089f8c: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x0108996c: 0x108996c: sw    s2, 48(sp)
+// 0x01089f90: 0x1089f90: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -118,7 +118,7 @@ L_1089960:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01089970: 0x1089970: sw    s1, 44(sp)
+// 0x01089f94: 0x1089f94: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -127,7 +127,7 @@ L_1089960:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01089974: 0x1089974: sw    s0, 40(sp)
+// 0x01089f98: 0x1089f98: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -136,30 +136,30 @@ L_1089960:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01089978: 0x1089978: addu  s1, a3, zero
+// 0x01089f9c: 0x1089f9c: addu  s1, a3, zero
 	ldloc 4
 	stloc 10
-// 0x0108997c: 0x108997c: lui   s0, 0xf0000
+// 0x01089fa0: 0x1089fa0: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 9
-// 0x01089980: 0x1089980: addiu s2, zero, -1
+// 0x01089fa4: 0x1089fa4: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x01089984: 0x1089984: addiu a1, s4, 28076
+// 0x01089fa8: 0x1089fa8: addiu a1, s4, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089988: 0x1089988: addu  a2, zero, zero
+// 0x01089fac: 0x1089fac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108998c: 0x108998c: addiu a3, sp, 28
+// 0x01089fb0: 0x1089fb0: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01089990: 0x1089990: sw    ra, 60(sp)
-// 0x01089994: 0x1089994: sw    s3, 52(sp)
+// 0x01089fb4: 0x1089fb4: sw    ra, 60(sp)
+// 0x01089fb8: 0x1089fb8: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -168,16 +168,16 @@ L_1089960:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01089998: 0x1089998: sw    zero, -30056(s0)
+// 0x01089fbc: 0x1089fbc: sw    zero, -29592(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7514
+	ldc.i4 -7398
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108999c: 0x108999c: jal   0x106855c sw    s2, 16(sp)
+// 0x01089fc0: 0x1089fc0: jal   0x106856c sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -191,37 +191,37 @@ L_1089960:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010899a4: 0x10899a4: bne   v0, zero, 0x10899c8 lui   a1, 0x20000
+// 0x01089fc8: 0x1089fc8: bne   v0, zero, 0x1089fec lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10899c8
+	brtrue L_1089fec
 // --- basic block ---
-// 0x010899ac: 0x10899ac: lui   a3, 0x20000
+// 0x01089fd0: 0x1089fd0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010899b0: 0x10899b0: addiu a1, a1, -21512
+// 0x01089fd4: 0x1089fd4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010899b4: 0x10899b4: addiu a3, a3, -11784
+// 0x01089fd8: 0x1089fd8: addiu a3, a3, -11320
 	ldloc 4
-	ldc.i4 -11784
+	ldc.i4 -11320
 	add
 	stloc 4
-// 0x010899b8: 0x10899b8: addiu a0, zero, 4
+// 0x01089fdc: 0x1089fdc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010899bc: 0x10899bc: addiu a2, zero, 1149
+// 0x01089fe0: 0x1089fe0: addiu a2, zero, 1149
 	ldc.i4 1149
 	stloc.3
-// 0x010899c0: 0x10899c0: j	 0x1089acc sw    v0, 32(sp)
+// 0x01089fe4: 0x1089fe4: j	 0x108a0f0 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -230,10 +230,10 @@ L_1089960:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1089acc
+	br L_108a0f0
 // --- basic block ---
-L_10899c8:
-// 0x010899c8: 0x10899c8: lw    v1, 28(sp)
+L_1089fec:
+// 0x01089fec: 0x1089fec: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -242,48 +242,48 @@ L_10899c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010899cc: 0x10899cc: sll   zero, zero, 0
-// 0x010899d0: 0x10899d0: addiu a0, v1, -1
+// 0x01089ff0: 0x1089ff0: sll   zero, zero, 0
+// 0x01089ff4: 0x1089ff4: addiu a0, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010899d4: 0x10899d4: sltiu a0, a0, 3
+// 0x01089ff8: 0x1089ff8: sltiu a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	clt.un
 	stloc.1
-// 0x010899d8: 0x10899d8: bne   a0, zero, 0x1089a08 addiu s3, sp, 24
+// 0x01089ffc: 0x1089ffc: bne   a0, zero, 0x108a02c addiu s3, sp, 24
 	ldloc.1
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-	brtrue L_1089a08
+	brtrue L_108a02c
 // --- basic block ---
-// 0x010899e0: 0x10899e0: lui   a1, 0x20000
+// 0x0108a004: 0x108a004: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010899e4: 0x10899e4: lui   a3, 0x20000
+// 0x0108a008: 0x108a008: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010899e8: 0x10899e8: addiu a1, a1, -21512
+// 0x0108a00c: 0x108a00c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x010899ec: 0x10899ec: addiu a3, a3, -11712
+// 0x0108a010: 0x108a010: addiu a3, a3, -11248
 	ldloc 4
-	ldc.i4 -11712
+	ldc.i4 -11248
 	add
 	stloc 4
-// 0x010899f0: 0x10899f0: addiu a0, zero, 4
+// 0x0108a014: 0x108a014: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010899f4: 0x10899f4: addiu a2, zero, 1156
+// 0x0108a018: 0x108a018: addiu a2, zero, 1156
 	ldc.i4 1156
 	stloc.3
-// 0x010899f8: 0x10899f8: jal   0x100449c sw    v1, 16(sp)
+// 0x0108a01c: 0x108a01c: jal   0x100449c sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -302,44 +302,44 @@ L_10899c8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01089a00: 0x1089a00: j	 0x1089a74 addiu v0, zero, 18
+// 0x0108a024: 0x108a024: j	 0x108a098 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-	br L_1089a74
+	br L_108a098
 // --- basic block ---
-L_1089a08:
-// 0x01089a08: 0x1089a08: lui   a1, 0xf0000
+L_108a02c:
+// 0x0108a02c: 0x108a02c: lui   a1, 0xf0000
 	ldc.i4 983040
 	stloc.2
-// 0x01089a0c: 0x1089a0c: addu  a0, v0, zero
+// 0x0108a030: 0x108a030: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01089a10: 0x1089a10: addiu a1, a1, -30052
+// 0x0108a034: 0x108a034: addiu a1, a1, -29588
 	ldloc.2
-	ldc.i4 -30052
+	ldc.i4 -29588
 	add
 	stloc.2
-// 0x01089a14: 0x1089a14: addiu v0, zero, 32
+// 0x0108a038: 0x108a038: addiu v0, zero, 32
 	ldc.i4.s 32
 	stloc 6
-// 0x01089a18: 0x1089a18: addiu a3, s4, 28076
+// 0x0108a03c: 0x108a03c: addiu a3, s4, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089a1c: 0x1089a1c: addu  a2, s3, zero
+// 0x0108a040: 0x108a040: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01089a20: 0x1089a20: sw    v1, -30056(s0)
+// 0x0108a044: 0x108a044: sw    v1, -29592(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7514
+	ldc.i4 -7398
 	add
 	ldloc 7
 	stelem.i4
-// 0x01089a24: 0x1089a24: sw    v0, 24(sp)
+// 0x0108a048: 0x108a048: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -348,7 +348,7 @@ L_1089a08:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01089a28: 0x1089a28: jal   0x1068250 sw    s2, 16(sp)
+// 0x0108a04c: 0x108a04c: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -362,35 +362,35 @@ L_1089a08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01089a30: 0x1089a30: beq   v0, zero, 0x1089a4c lui   a0, 0xf0000
+// 0x0108a054: 0x108a054: beq   v0, zero, 0x108a070 lui   a0, 0xf0000
 	ldloc 6
 	ldc.i4 983040
 	stloc.1
-	brfalse L_1089a4c
+	brfalse L_108a070
 // --- basic block ---
-// 0x01089a38: 0x1089a38: lb    v1, 0(v0)
+// 0x0108a05c: 0x108a05c: lb    v1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089a3c: 0x1089a3c: sll   zero, zero, 0
-// 0x01089a40: 0x1089a40: bne   v1, zero, 0x1089a80 lui   a1, 0xf0000
+// 0x0108a060: 0x108a060: sll   zero, zero, 0
+// 0x0108a064: 0x108a064: bne   v1, zero, 0x108a0a4 lui   a1, 0xf0000
 	ldloc 7
 	ldc.i4 983040
 	stloc.2
-	brtrue L_1089a80
+	brtrue L_108a0a4
 // --- basic block ---
-// 0x01089a48: 0x1089a48: lui   a0, 0xf0000
+// 0x0108a06c: 0x108a06c: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-L_1089a4c:
-// 0x01089a4c: 0x1089a4c: jal   0x108d0dc addiu a0, a0, -30056
+L_108a070:
+// 0x0108a070: 0x108a070: jal   0x108d700 addiu a0, a0, -29592
 	ldloc.1
-	ldc.i4 -30056
+	ldc.i4 -29592
 	add
 	stloc.1
 	ldloc.0
@@ -398,31 +398,31 @@ L_1089a4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01089a54: 0x1089a54: lui   a1, 0x20000
+// 0x0108a078: 0x108a078: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089a58: 0x1089a58: lui   a3, 0x20000
+// 0x0108a07c: 0x108a07c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089a5c: 0x1089a5c: addiu a1, a1, -21512
+// 0x0108a080: 0x108a080: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089a60: 0x1089a60: addiu a3, a3, -11632
+// 0x0108a084: 0x108a084: addiu a3, a3, -11168
 	ldloc 4
-	ldc.i4 -11632
+	ldc.i4 -11168
 	add
 	stloc 4
-// 0x01089a64: 0x1089a64: addiu a0, zero, 4
+// 0x0108a088: 0x108a088: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089a68: 0x1089a68: jal   0x100449c addiu a2, zero, 1175
+// 0x0108a08c: 0x108a08c: jal   0x100449c addiu a2, zero, 1175
 	ldc.i4 1175
 	stloc.3
 	ldloc.0
@@ -435,46 +435,46 @@ L_1089a4c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01089a70: 0x1089a70: addiu v0, zero, 18
+// 0x0108a094: 0x108a094: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-L_1089a74:
-// 0x01089a74: 0x1089a74: sw    v0, 0(s1)
+L_108a098:
+// 0x0108a098: 0x108a098: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01089a78: 0x1089a78: j	 0x1089b08 addu  v0, zero, zero
+// 0x0108a09c: 0x108a09c: j	 0x108a12c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1089b08
+	br L_108a12c
 // --- basic block ---
-L_1089a80:
-// 0x01089a80: 0x1089a80: lui   a3, 0x0
+L_108a0a4:
+// 0x0108a0a4: 0x108a0a4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01089a84: 0x1089a84: addu  a0, v0, zero
+// 0x0108a0a8: 0x108a0a8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01089a88: 0x1089a88: addiu a1, a1, -30019
+// 0x0108a0ac: 0x108a0ac: addiu a1, a1, -29555
 	ldloc.2
-	ldc.i4 -30019
+	ldc.i4 -29555
 	add
 	stloc.2
-// 0x01089a8c: 0x1089a8c: addiu v0, zero, 255
+// 0x0108a0b0: 0x108a0b0: addiu v0, zero, 255
 	ldc.i4 255
 	stloc 6
-// 0x01089a90: 0x1089a90: addu  a2, s3, zero
+// 0x0108a0b4: 0x108a0b4: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01089a94: 0x1089a94: addiu a3, a3, 30268
+// 0x0108a0b8: 0x108a0b8: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01089a98: 0x1089a98: sw    s2, 16(sp)
+// 0x0108a0bc: 0x108a0bc: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -483,7 +483,7 @@ L_1089a80:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01089a9c: 0x1089a9c: jal   0x1068250 sw    v0, 24(sp)
+// 0x0108a0c0: 0x108a0c0: jal   0x1068260 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -497,23 +497,23 @@ L_1089a80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01089aa4: 0x1089aa4: bne   v0, zero, 0x1089ae0 lui   s2, 0x20000
+// 0x0108a0c8: 0x108a0c8: bne   v0, zero, 0x108a104 lui   s2, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 8
-	brtrue L_1089ae0
+	brtrue L_108a104
 // --- basic block ---
-// 0x01089aac: 0x1089aac: addiu a0, s0, -30056
+// 0x0108a0d0: 0x108a0d0: addiu a0, s0, -29592
 	ldloc 9
-	ldc.i4 -30056
+	ldc.i4 -29592
 	add
 	stloc.1
-// 0x01089ab0: 0x1089ab0: jal   0x108d0dc sw    v0, 32(sp)
+// 0x0108a0d4: 0x108a0d4: jal   0x108d700 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -527,32 +527,32 @@ L_1089a80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01089ab8: 0x1089ab8: lui   a3, 0x20000
+// 0x0108a0dc: 0x108a0dc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089abc: 0x1089abc: addiu a1, s2, -21512
+// 0x0108a0e0: 0x108a0e0: addiu a1, s2, -21048
 	ldloc 8
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089ac0: 0x1089ac0: addiu a3, a3, -11556
+// 0x0108a0e4: 0x108a0e4: addiu a3, a3, -11092
 	ldloc 4
-	ldc.i4 -11556
+	ldc.i4 -11092
 	add
 	stloc 4
-// 0x01089ac4: 0x1089ac4: addiu a0, zero, 4
+// 0x0108a0e8: 0x108a0e8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089ac8: 0x1089ac8: addiu a2, zero, 1192
+// 0x0108a0ec: 0x108a0ec: addiu a2, zero, 1192
 	ldc.i4 1192
 	stloc.3
-L_1089acc:
-// 0x01089acc: 0x1089acc: jal   0x100449c sll   zero, zero, 0
+L_108a0f0:
+// 0x0108a0f0: 0x108a0f0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -563,48 +563,48 @@ L_1089acc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01089ad4: 0x1089ad4: addiu v1, zero, 18
+// 0x0108a0f8: 0x108a0f8: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x01089ad8: 0x1089ad8: j	 0x1089b04 sw    v1, 0(s1)
+// 0x0108a0fc: 0x108a0fc: j	 0x108a128 sw    v1, 0(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1089b04
+	br L_108a128
 // --- basic block ---
-L_1089ae0:
-// 0x01089ae0: 0x1089ae0: lw    v1, -30056(s0)
+L_108a104:
+// 0x0108a104: 0x108a104: lw    v1, -29592(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7514
+	ldc.i4 -7398
 	add
 	ldelem.i4
 	stloc 7
-// 0x01089ae4: 0x1089ae4: lui   a3, 0x20000
+// 0x0108a108: 0x108a108: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089ae8: 0x1089ae8: addiu a1, s2, -21512
+// 0x0108a10c: 0x108a10c: addiu a1, s2, -21048
 	ldloc 8
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089aec: 0x1089aec: addiu a3, a3, -11484
+// 0x0108a110: 0x108a110: addiu a3, a3, -11020
 	ldloc 4
-	ldc.i4 -11484
+	ldc.i4 -11020
 	add
 	stloc 4
-// 0x01089af0: 0x1089af0: addiu a0, zero, 2
+// 0x0108a114: 0x108a114: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01089af4: 0x1089af4: addiu a2, zero, 1197
+// 0x0108a118: 0x108a118: addiu a2, zero, 1197
 	ldc.i4 1197
 	stloc.3
-// 0x01089af8: 0x1089af8: sw    v1, 16(sp)
+// 0x0108a11c: 0x108a11c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -613,7 +613,7 @@ L_1089ae0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01089afc: 0x1089afc: jal   0x100449c sw    v0, 32(sp)
+// 0x0108a120: 0x108a120: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -632,8 +632,8 @@ L_1089ae0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1089b04:
-// 0x01089b04: 0x1089b04: lw    v0, 32(sp)
+L_108a128:
+// 0x0108a128: 0x108a128: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -642,9 +642,9 @@ L_1089b04:
 	add
 	ldelem.i4
 	stloc 6
-L_1089b08:
-// 0x01089b08: 0x1089b08: lw    ra, 60(sp)
-// 0x01089b0c: 0x1089b0c: lw    s4, 56(sp)
+L_108a12c:
+// 0x0108a12c: 0x108a12c: lw    ra, 60(sp)
+// 0x0108a130: 0x108a130: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -653,7 +653,7 @@ L_1089b08:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01089b10: 0x1089b10: lw    s3, 52(sp)
+// 0x0108a134: 0x108a134: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -662,7 +662,7 @@ L_1089b08:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01089b14: 0x1089b14: lw    s2, 48(sp)
+// 0x0108a138: 0x108a138: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -671,7 +671,7 @@ L_1089b08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01089b18: 0x1089b18: lw    s1, 44(sp)
+// 0x0108a13c: 0x108a13c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -680,7 +680,7 @@ L_1089b08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01089b1c: 0x1089b1c: lw    s0, 40(sp)
+// 0x0108a140: 0x108a140: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -689,7 +689,7 @@ L_1089b08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01089b20: 0x1089b20: jr    ra addiu sp, sp, 64
+// 0x0108a144: 0x108a144: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -701,7 +701,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 SystemMessage_1089b28(int32,int32,int32,int32,int32)
+.method public static int32 SystemMessage_108a14c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s1,int32 s6,int32 ra)
@@ -757,13 +757,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1089b28:
-// 0x01089b28: 0x1089b28: addiu sp, sp, -128
+L_108a14c:
+// 0x0108a14c: 0x108a14c: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x01089b2c: 0x1089b2c: sw    s5, 116(sp)
+// 0x0108a150: 0x108a150: sw    s5, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -772,12 +772,12 @@ L_1089b28:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01089b30: 0x1089b30: addiu s5, sp, 32
+// 0x0108a154: 0x108a154: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 12
-// 0x01089b34: 0x1089b34: sw    s4, 112(sp)
+// 0x0108a158: 0x108a158: sw    s4, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -786,7 +786,7 @@ L_1089b28:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01089b38: 0x1089b38: sw    s0, 96(sp)
+// 0x0108a15c: 0x108a15c: sw    s0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -795,17 +795,17 @@ L_1089b28:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01089b3c: 0x1089b3c: lui   s4, 0x0
+// 0x0108a160: 0x108a160: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01089b40: 0x1089b40: addu  s0, a0, zero
+// 0x0108a164: 0x108a164: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01089b44: 0x1089b44: addu  a0, s5, zero
+// 0x0108a168: 0x108a168: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01089b48: 0x1089b48: sw    ra, 124(sp)
-// 0x01089b4c: 0x1089b4c: sw    s3, 108(sp)
+// 0x0108a16c: 0x108a16c: sw    ra, 124(sp)
+// 0x0108a170: 0x108a170: sw    s3, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -814,7 +814,7 @@ L_1089b28:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01089b50: 0x1089b50: sw    s1, 100(sp)
+// 0x0108a174: 0x108a174: sw    s1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -823,7 +823,7 @@ L_1089b28:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01089b54: 0x1089b54: sw    s6, 120(sp)
+// 0x0108a178: 0x108a178: sw    s6, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -832,10 +832,10 @@ L_1089b28:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01089b58: 0x1089b58: addu  s1, a3, zero
+// 0x0108a17c: 0x108a17c: addu  s1, a3, zero
 	ldloc 4
 	stloc 13
-// 0x01089b5c: 0x1089b5c: sw    s2, 104(sp)
+// 0x0108a180: 0x108a180: sw    s2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -844,7 +844,7 @@ L_1089b28:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01089b60: 0x1089b60: jal   0x108d254 addiu s3, zero, 1
+// 0x0108a184: 0x108a184: jal   0x108d878 addiu s3, zero, 1
 	ldc.i4.1
 	stloc 10
 	ldloc.0
@@ -852,26 +852,26 @@ L_1089b28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089b68: 0x1089b68: addu  a0, s0, zero
+// 0x0108a18c: 0x108a18c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01089b6c: 0x1089b6c: addiu a1, s4, 28076
+// 0x0108a190: 0x108a190: addiu a1, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089b70: 0x1089b70: addu  a2, zero, zero
+// 0x0108a194: 0x108a194: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089b74: 0x1089b74: addu  a3, s5, zero
+// 0x0108a198: 0x108a198: addu  a3, s5, zero
 	ldloc 12
 	stloc 4
-// 0x01089b78: 0x1089b78: jal   0x106855c sw    s3, 16(sp)
+// 0x0108a19c: 0x108a19c: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -885,59 +885,59 @@ L_1089b28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089b80: 0x1089b80: bne   v0, zero, 0x1089ba4 addu  s0, v0, zero
+// 0x0108a1a4: 0x108a1a4: bne   v0, zero, 0x108a1c8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089ba4
+	brtrue L_108a1c8
 // --- basic block ---
-// 0x01089b88: 0x1089b88: lui   a1, 0x20000
+// 0x0108a1ac: 0x108a1ac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089b8c: 0x1089b8c: lui   a3, 0x20000
+// 0x0108a1b0: 0x108a1b0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089b90: 0x1089b90: addiu a1, a1, -21512
+// 0x0108a1b4: 0x108a1b4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089b94: 0x1089b94: addiu a3, a3, -11396
+// 0x0108a1b8: 0x108a1b8: addiu a3, a3, -10932
 	ldloc 4
-	ldc.i4 -11396
+	ldc.i4 -10932
 	add
 	stloc 4
-// 0x01089b98: 0x1089b98: addiu a0, zero, 4
+// 0x0108a1bc: 0x108a1bc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089b9c: 0x1089b9c: j	 0x1089bdc addiu a2, zero, 902
+// 0x0108a1c0: 0x108a1c0: j	 0x108a200 addiu a2, zero, 902
 	ldc.i4 902
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089ba4:
-// 0x01089ba4: 0x1089ba4: addu  a0, v0, zero
+L_108a1c8:
+// 0x0108a1c8: 0x108a1c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089ba8: 0x1089ba8: addiu a1, s4, 28076
+// 0x0108a1cc: 0x108a1cc: addiu a1, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089bac: 0x1089bac: addu  a2, zero, zero
+// 0x0108a1d0: 0x108a1d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089bb0: 0x1089bb0: addiu a3, sp, 36
+// 0x0108a1d4: 0x108a1d4: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x01089bb4: 0x1089bb4: jal   0x106855c sw    s3, 16(sp)
+// 0x0108a1d8: 0x108a1d8: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -951,41 +951,41 @@ L_1089ba4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089bbc: 0x1089bbc: bne   v0, zero, 0x1089bf0 addu  s0, v0, zero
+// 0x0108a1e0: 0x108a1e0: bne   v0, zero, 0x108a214 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089bf0
+	brtrue L_108a214
 // --- basic block ---
-// 0x01089bc4: 0x1089bc4: lui   a1, 0x20000
+// 0x0108a1e8: 0x108a1e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089bc8: 0x1089bc8: lui   a3, 0x20000
+// 0x0108a1ec: 0x108a1ec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089bcc: 0x1089bcc: addiu a1, a1, -21512
+// 0x0108a1f0: 0x108a1f0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089bd0: 0x1089bd0: addiu a3, a3, -11324
+// 0x0108a1f4: 0x108a1f4: addiu a3, a3, -10860
 	ldloc 4
-	ldc.i4 -11324
+	ldc.i4 -10860
 	add
 	stloc 4
-// 0x01089bd4: 0x1089bd4: addiu a0, zero, 4
+// 0x0108a1f8: 0x108a1f8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089bd8: 0x1089bd8: addiu a2, zero, 916
+// 0x0108a1fc: 0x108a1fc: addiu a2, zero, 916
 	ldc.i4 916
 	stloc.3
-L_1089bdc:
-// 0x01089bdc: 0x1089bdc: jal   0x100449c sll   zero, zero, 0
+L_108a200:
+// 0x0108a200: 0x108a200: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -996,36 +996,36 @@ L_1089bdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089be4: 0x1089be4: addiu v0, zero, 18
+// 0x0108a208: 0x108a208: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01089be8: 0x1089be8: j	 0x1089fc0 sw    v0, 0(s1)
+// 0x0108a20c: 0x108a20c: j	 0x108a5e4 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1089fc0
+	br L_108a5e4
 // --- basic block ---
-L_1089bf0:
-// 0x01089bf0: 0x1089bf0: addu  a0, v0, zero
+L_108a214:
+// 0x0108a214: 0x108a214: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089bf4: 0x1089bf4: addiu a1, s4, 28076
+// 0x0108a218: 0x108a218: addiu a1, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089bf8: 0x1089bf8: addu  a2, zero, zero
+// 0x0108a21c: 0x108a21c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089bfc: 0x1089bfc: addiu a3, sp, 40
+// 0x0108a220: 0x108a220: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x01089c00: 0x1089c00: jal   0x106855c sw    s3, 16(sp)
+// 0x0108a224: 0x108a224: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1039,65 +1039,65 @@ L_1089bf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089c08: 0x1089c08: bne   v0, zero, 0x1089c2c addu  s0, v0, zero
+// 0x0108a22c: 0x108a22c: bne   v0, zero, 0x108a250 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089c2c
+	brtrue L_108a250
 // --- basic block ---
-// 0x01089c10: 0x1089c10: lui   a1, 0x20000
+// 0x0108a234: 0x108a234: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089c14: 0x1089c14: lui   a3, 0x20000
+// 0x0108a238: 0x108a238: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089c18: 0x1089c18: addiu a1, a1, -21512
+// 0x0108a23c: 0x108a23c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089c1c: 0x1089c1c: addiu a3, a3, -11252
+// 0x0108a240: 0x108a240: addiu a3, a3, -10788
 	ldloc 4
-	ldc.i4 -11252
+	ldc.i4 -10788
 	add
 	stloc 4
-// 0x01089c20: 0x1089c20: addiu a0, zero, 4
+// 0x0108a244: 0x108a244: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089c24: 0x1089c24: j	 0x1089bdc addiu a2, zero, 930
+// 0x0108a248: 0x108a248: j	 0x108a200 addiu a2, zero, 930
 	ldc.i4 930
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089c2c:
-// 0x01089c2c: 0x1089c2c: addiu s6, sp, 24
+L_108a250:
+// 0x0108a250: 0x108a250: addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-// 0x01089c30: 0x1089c30: addu  a0, v0, zero
+// 0x0108a254: 0x108a254: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089c34: 0x1089c34: addu  a1, zero, zero
+// 0x0108a258: 0x108a258: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01089c38: 0x1089c38: addiu v0, zero, 64
+// 0x0108a25c: 0x108a25c: addiu v0, zero, 64
 	ldc.i4.s 64
 	stloc 5
-// 0x01089c3c: 0x1089c3c: addu  a2, s6, zero
+// 0x0108a260: 0x108a260: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x01089c40: 0x1089c40: addiu a3, s4, 28076
+// 0x0108a264: 0x108a264: addiu a3, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089c44: 0x1089c44: sw    v0, 24(sp)
+// 0x0108a268: 0x108a268: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1106,7 +1106,7 @@ L_1089c2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089c48: 0x1089c48: jal   0x1068250 sw    s3, 16(sp)
+// 0x0108a26c: 0x108a26c: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1120,43 +1120,43 @@ L_1089c2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089c50: 0x1089c50: bne   v0, zero, 0x1089c74 addu  s2, v0, zero
+// 0x0108a274: 0x108a274: bne   v0, zero, 0x108a298 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1089c74
+	brtrue L_108a298
 // --- basic block ---
-// 0x01089c58: 0x1089c58: lui   a1, 0x20000
+// 0x0108a27c: 0x108a27c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089c5c: 0x1089c5c: lui   a3, 0x20000
+// 0x0108a280: 0x108a280: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089c60: 0x1089c60: addiu a1, a1, -21512
+// 0x0108a284: 0x108a284: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089c64: 0x1089c64: addiu a3, a3, -11172
+// 0x0108a288: 0x108a288: addiu a3, a3, -10708
 	ldloc 4
-	ldc.i4 -11172
+	ldc.i4 -10708
 	add
 	stloc 4
-// 0x01089c68: 0x1089c68: addiu a0, zero, 4
+// 0x0108a28c: 0x108a28c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089c6c: 0x1089c6c: j	 0x1089d74 addiu a2, zero, 947
+// 0x0108a290: 0x108a290: j	 0x108a398 addiu a2, zero, 947
 	ldc.i4 947
 	stloc.3
-	br L_1089d74
+	br L_108a398
 // --- basic block ---
-L_1089c74:
-// 0x01089c74: 0x1089c74: lw    v0, 24(sp)
+L_108a298:
+// 0x0108a298: 0x108a298: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1165,19 +1165,19 @@ L_1089c74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01089c78: 0x1089c78: sll   zero, zero, 0
-// 0x01089c7c: 0x1089c7c: beq   v0, zero, 0x1089cdc addiu v0, v0, 1
+// 0x0108a29c: 0x108a29c: sll   zero, zero, 0
+// 0x0108a2a0: 0x108a2a0: beq   v0, zero, 0x108a300 addiu v0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brfalse L_1089cdc
+	brfalse L_108a300
 // --- basic block ---
-// 0x01089c84: 0x1089c84: addu  a0, v0, zero
+// 0x0108a2a8: 0x108a2a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089c88: 0x1089c88: jal   0x1000910 sw    v0, 24(sp)
+// 0x0108a2ac: 0x108a2ac: jal   0x1000910 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1196,21 +1196,21 @@ L_1089c74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089c90: 0x1089c90: addu  a1, v0, zero
+// 0x0108a2b4: 0x108a2b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01089c94: 0x1089c94: addu  a0, s0, zero
+// 0x0108a2b8: 0x108a2b8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01089c98: 0x1089c98: addu  a2, s6, zero
+// 0x0108a2bc: 0x108a2bc: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x01089c9c: 0x1089c9c: addiu a3, s4, 28076
+// 0x0108a2c0: 0x108a2c0: addiu a3, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089ca0: 0x1089ca0: sw    s3, 16(sp)
+// 0x0108a2c4: 0x108a2c4: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1219,7 +1219,7 @@ L_1089c74:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01089ca4: 0x1089ca4: jal   0x1068250 sw    v0, 44(sp)
+// 0x0108a2c8: 0x108a2c8: jal   0x1068260 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1233,21 +1233,21 @@ L_1089c74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089cac: 0x1089cac: addu  s0, v0, zero
+// 0x0108a2d0: 0x108a2d0: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01089cb0: 0x1089cb0: bne   v0, zero, 0x1089cdc addu  s2, v0, zero
+// 0x0108a2d4: 0x108a2d4: bne   v0, zero, 0x108a300 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1089cdc
+	brtrue L_108a300
 // --- basic block ---
-// 0x01089cb8: 0x1089cb8: jal   0x108d2b8 addu  a0, s5, zero
+// 0x0108a2dc: 0x108a2dc: jal   0x108d8dc addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -1255,84 +1255,84 @@ L_1089c74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Free_108d2b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Free_108d8dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089cc0: 0x1089cc0: lui   a1, 0x20000
+// 0x0108a2e4: 0x108a2e4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089cc4: 0x1089cc4: lui   a3, 0x20000
+// 0x0108a2e8: 0x108a2e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089cc8: 0x1089cc8: addiu a1, a1, -21512
+// 0x0108a2ec: 0x108a2ec: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089ccc: 0x1089ccc: addiu a3, a3, -11096
+// 0x0108a2f0: 0x108a2f0: addiu a3, a3, -10632
 	ldloc 4
-	ldc.i4 -11096
+	ldc.i4 -10632
 	add
 	stloc 4
-// 0x01089cd0: 0x1089cd0: addiu a0, zero, 4
+// 0x0108a2f4: 0x108a2f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089cd4: 0x1089cd4: j	 0x1089bdc addiu a2, zero, 967
+// 0x0108a2f8: 0x108a2f8: j	 0x108a200 addiu a2, zero, 967
 	ldc.i4 967
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089cdc:
-// 0x01089cdc: 0x1089cdc: lb    v0, 0(s2)
+L_108a300:
+// 0x0108a300: 0x108a300: lb    v0, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01089ce0: 0x1089ce0: addiu s4, sp, 24
+// 0x0108a304: 0x108a304: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x01089ce4: 0x1089ce4: xori  v0, v0, 44
+// 0x0108a308: 0x108a308: xori  v0, v0, 44
 	ldloc 5
 	ldc.i4.s 44
 	xor
 	stloc 5
-// 0x01089ce8: 0x1089ce8: sltiu v0, v0, 1
+// 0x0108a30c: 0x108a30c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01089cec: 0x1089cec: addu  s2, s2, v0
+// 0x0108a310: 0x108a310: addu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x01089cf0: 0x1089cf0: lui   s5, 0x0
+// 0x0108a314: 0x108a314: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01089cf4: 0x1089cf4: addiu v0, zero, 512
+// 0x0108a318: 0x108a318: addiu v0, zero, 512
 	ldc.i4 512
 	stloc 5
-// 0x01089cf8: 0x1089cf8: addiu s3, zero, 1
+// 0x0108a31c: 0x108a31c: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x01089cfc: 0x1089cfc: addu  a0, s2, zero
+// 0x0108a320: 0x108a320: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01089d00: 0x1089d00: addu  a1, zero, zero
+// 0x0108a324: 0x108a324: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01089d04: 0x1089d04: addu  a2, s4, zero
+// 0x0108a328: 0x108a328: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01089d08: 0x1089d08: addiu a3, s5, 30268
+// 0x0108a32c: 0x108a32c: addiu a3, s5, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01089d0c: 0x1089d0c: sw    v0, 24(sp)
+// 0x0108a330: 0x108a330: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1341,7 +1341,7 @@ L_1089cdc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089d10: 0x1089d10: jal   0x1068250 sw    s3, 16(sp)
+// 0x0108a334: 0x108a334: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1355,18 +1355,18 @@ L_1089cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089d18: 0x1089d18: bne   v0, zero, 0x1089d44 addu  s0, v0, zero
+// 0x0108a33c: 0x108a33c: bne   v0, zero, 0x108a368 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089d44
+	brtrue L_108a368
 // --- basic block ---
-// 0x01089d20: 0x1089d20: jal   0x108d2b8 addiu a0, sp, 32
+// 0x0108a344: 0x108a344: jal   0x108d8dc addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1376,37 +1376,37 @@ L_1089cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Free_108d2b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Free_108d8dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089d28: 0x1089d28: lui   a1, 0x20000
+// 0x0108a34c: 0x108a34c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089d2c: 0x1089d2c: lui   a3, 0x20000
+// 0x0108a350: 0x108a350: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089d30: 0x1089d30: addiu a1, a1, -21512
+// 0x0108a354: 0x108a354: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089d34: 0x1089d34: addiu a3, a3, -11172
+// 0x0108a358: 0x108a358: addiu a3, a3, -10708
 	ldloc 4
-	ldc.i4 -11172
+	ldc.i4 -10708
 	add
 	stloc 4
-// 0x01089d38: 0x1089d38: addiu a0, zero, 4
+// 0x0108a35c: 0x108a35c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089d3c: 0x1089d3c: j	 0x1089bdc addiu a2, zero, 989
+// 0x0108a360: 0x108a360: j	 0x108a200 addiu a2, zero, 989
 	ldc.i4 989
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089d44:
-// 0x01089d44: 0x1089d44: lw    v0, 24(sp)
+L_108a368:
+// 0x0108a368: 0x108a368: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1415,16 +1415,16 @@ L_1089d44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01089d48: 0x1089d48: sll   zero, zero, 0
-// 0x01089d4c: 0x1089d4c: bne   v0, zero, 0x1089d88 addiu v0, v0, 1
+// 0x0108a36c: 0x108a36c: sll   zero, zero, 0
+// 0x0108a370: 0x108a370: bne   v0, zero, 0x108a3ac addiu v0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_1089d88
+	brtrue L_108a3ac
 // --- basic block ---
-// 0x01089d54: 0x1089d54: jal   0x108d2b8 addiu a0, sp, 32
+// 0x0108a378: 0x108a378: jal   0x108d8dc addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1434,35 +1434,35 @@ L_1089d44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Free_108d2b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Free_108d8dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089d5c: 0x1089d5c: lui   a1, 0x20000
+// 0x0108a380: 0x108a380: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089d60: 0x1089d60: lui   a3, 0x20000
+// 0x0108a384: 0x108a384: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089d64: 0x1089d64: addiu a1, a1, -21512
+// 0x0108a388: 0x108a388: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089d68: 0x1089d68: addiu a3, a3, -11012
+// 0x0108a38c: 0x108a38c: addiu a3, a3, -10548
 	ldloc 4
-	ldc.i4 -11012
+	ldc.i4 -10548
 	add
 	stloc 4
-// 0x01089d6c: 0x1089d6c: addiu a0, zero, 4
+// 0x0108a390: 0x108a390: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089d70: 0x1089d70: addiu a2, zero, 997
+// 0x0108a394: 0x108a394: addiu a2, zero, 997
 	ldc.i4 997
 	stloc.3
-L_1089d74:
-// 0x01089d74: 0x1089d74: jal   0x100449c addu  s0, zero, zero
+L_108a398:
+// 0x0108a398: 0x108a398: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -1475,23 +1475,23 @@ L_1089d74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089d7c: 0x1089d7c: addiu v0, zero, 18
+// 0x0108a3a0: 0x108a3a0: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01089d80: 0x1089d80: j	 0x1089fc0 sw    v0, 0(s1)
+// 0x0108a3a4: 0x108a3a4: j	 0x108a5e4 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1089fc0
+	br L_108a5e4
 // --- basic block ---
-L_1089d88:
-// 0x01089d88: 0x1089d88: addu  a0, v0, zero
+L_108a3ac:
+// 0x0108a3ac: 0x108a3ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089d8c: 0x1089d8c: jal   0x1000910 sw    v0, 24(sp)
+// 0x0108a3b0: 0x108a3b0: jal   0x1000910 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1510,21 +1510,21 @@ L_1089d88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089d94: 0x1089d94: addu  a1, v0, zero
+// 0x0108a3b8: 0x108a3b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01089d98: 0x1089d98: addu  a0, s2, zero
+// 0x0108a3bc: 0x108a3bc: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01089d9c: 0x1089d9c: addiu a3, s5, 30268
+// 0x0108a3c0: 0x108a3c0: addiu a3, s5, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01089da0: 0x1089da0: addu  a2, s4, zero
+// 0x0108a3c4: 0x108a3c4: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01089da4: 0x1089da4: sw    v0, 68(sp)
+// 0x0108a3c8: 0x108a3c8: sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1533,7 +1533,7 @@ L_1089d88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089da8: 0x1089da8: sw    s3, 16(sp)
+// 0x0108a3cc: 0x108a3cc: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1542,7 +1542,7 @@ L_1089d88:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01089dac: 0x1089dac: jal   0x1068250 lui   s5, 0x0
+// 0x0108a3d0: 0x108a3d0: jal   0x1068260 lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 12
 	ldloc.0
@@ -1550,32 +1550,32 @@ L_1089d88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089db4: 0x1089db4: addu  a0, v0, zero
+// 0x0108a3d8: 0x108a3d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089db8: 0x1089db8: addu  s2, v0, zero
+// 0x0108a3dc: 0x108a3dc: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01089dbc: 0x1089dbc: addu  a1, zero, zero
+// 0x0108a3e0: 0x108a3e0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01089dc0: 0x1089dc0: addiu v0, zero, 20
+// 0x0108a3e4: 0x108a3e4: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x01089dc4: 0x1089dc4: addu  a2, s4, zero
+// 0x0108a3e8: 0x108a3e8: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01089dc8: 0x1089dc8: addiu a3, s5, 28076
+// 0x0108a3ec: 0x108a3ec: addiu a3, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089dcc: 0x1089dcc: sw    v0, 24(sp)
+// 0x0108a3f0: 0x108a3f0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1584,7 +1584,7 @@ L_1089d88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089dd0: 0x1089dd0: jal   0x1068250 sw    s3, 16(sp)
+// 0x0108a3f4: 0x108a3f4: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1598,18 +1598,18 @@ L_1089d88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089dd8: 0x1089dd8: bne   v0, zero, 0x1089e04 addu  s0, v0, zero
+// 0x0108a3fc: 0x108a3fc: bne   v0, zero, 0x108a428 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089e04
+	brtrue L_108a428
 // --- basic block ---
-// 0x01089de0: 0x1089de0: jal   0x108d2b8 addiu a0, sp, 32
+// 0x0108a404: 0x108a404: jal   0x108d8dc addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1619,37 +1619,37 @@ L_1089d88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Free_108d2b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Free_108d8dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089de8: 0x1089de8: lui   a1, 0x20000
+// 0x0108a40c: 0x108a40c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089dec: 0x1089dec: lui   a3, 0x20000
+// 0x0108a410: 0x108a410: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089df0: 0x1089df0: addiu a1, a1, -21512
+// 0x0108a414: 0x108a414: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089df4: 0x1089df4: addiu a3, a3, -10904
+// 0x0108a418: 0x108a418: addiu a3, a3, -10440
 	ldloc 4
-	ldc.i4 -10904
+	ldc.i4 -10440
 	add
 	stloc 4
-// 0x01089df8: 0x1089df8: addiu a0, zero, 4
+// 0x0108a41c: 0x108a41c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089dfc: 0x1089dfc: j	 0x1089bdc addiu a2, zero, 1025
+// 0x0108a420: 0x108a420: j	 0x108a200 addiu a2, zero, 1025
 	ldc.i4 1025
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089e04:
-// 0x01089e04: 0x1089e04: lw    v0, 24(sp)
+L_108a428:
+// 0x0108a428: 0x108a428: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1658,19 +1658,19 @@ L_1089e04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01089e08: 0x1089e08: sll   zero, zero, 0
-// 0x01089e0c: 0x1089e0c: beq   v0, zero, 0x1089e44 addiu v0, v0, 1
+// 0x0108a42c: 0x108a42c: sll   zero, zero, 0
+// 0x0108a430: 0x108a430: beq   v0, zero, 0x108a468 addiu v0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brfalse L_1089e44
+	brfalse L_108a468
 // --- basic block ---
-// 0x01089e14: 0x1089e14: addu  a0, v0, zero
+// 0x0108a438: 0x108a438: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01089e18: 0x1089e18: jal   0x1000910 sw    v0, 24(sp)
+// 0x0108a43c: 0x108a43c: jal   0x1000910 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1689,21 +1689,21 @@ L_1089e04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089e20: 0x1089e20: addu  a1, v0, zero
+// 0x0108a444: 0x108a444: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01089e24: 0x1089e24: addu  a2, s4, zero
+// 0x0108a448: 0x108a448: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01089e28: 0x1089e28: addiu a3, s5, 28076
+// 0x0108a44c: 0x108a44c: addiu a3, s5, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089e2c: 0x1089e2c: addu  a0, s2, zero
+// 0x0108a450: 0x108a450: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01089e30: 0x1089e30: sw    s3, 16(sp)
+// 0x0108a454: 0x108a454: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1712,7 +1712,7 @@ L_1089e04:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01089e34: 0x1089e34: jal   0x1068250 sw    v0, 92(sp)
+// 0x0108a458: 0x108a458: jal   0x1068260 sw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1726,18 +1726,18 @@ L_1089e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089e3c: 0x1089e3c: j	 0x1089e48 addu  s0, v0, zero
+// 0x0108a460: 0x108a460: j	 0x108a46c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	br L_1089e48
+	br L_108a46c
 // --- basic block ---
-L_1089e44:
-// 0x01089e44: 0x1089e44: sw    zero, 92(sp)
+L_108a468:
+// 0x0108a468: 0x108a468: sw    zero, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1746,25 +1746,25 @@ L_1089e44:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1089e48:
-// 0x01089e48: 0x1089e48: lb    v1, 0(s0)
+L_108a46c:
+// 0x0108a46c: 0x108a46c: lb    v1, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089e4c: 0x1089e4c: addiu v0, zero, 44
+// 0x0108a470: 0x108a470: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x01089e50: 0x1089e50: beq   v1, v0, 0x1089ea0 addiu v0, zero, 16
+// 0x0108a474: 0x108a474: beq   v1, v0, 0x108a4c4 addiu v0, zero, 16
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 16
 	stloc 5
-	beq  L_1089ea0
+	beq  L_108a4c4
 // --- basic block ---
-// 0x01089e58: 0x1089e58: lui   a3, 0x0
+// 0x0108a47c: 0x108a47c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01089e5c: 0x1089e5c: sw    v0, 24(sp)
+// 0x0108a480: 0x108a480: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1773,28 +1773,28 @@ L_1089e48:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089e60: 0x1089e60: addiu a3, a3, 28076
+// 0x0108a484: 0x108a484: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089e64: 0x1089e64: addiu v0, zero, 1
+// 0x0108a488: 0x108a488: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01089e68: 0x1089e68: addu  a0, s2, zero
+// 0x0108a48c: 0x108a48c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01089e6c: 0x1089e6c: addiu a1, sp, 48
+// 0x0108a490: 0x108a490: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x01089e70: 0x1089e70: addiu a2, sp, 24
+// 0x0108a494: 0x108a494: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01089e74: 0x1089e74: jal   0x1068250 sw    v0, 16(sp)
+// 0x0108a498: 0x108a498: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1808,71 +1808,71 @@ L_1089e48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089e7c: 0x1089e7c: bne   v0, zero, 0x1089ea4 addu  s0, v0, zero
+// 0x0108a4a0: 0x108a4a0: bne   v0, zero, 0x108a4c8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089ea4
+	brtrue L_108a4c8
 // --- basic block ---
-// 0x01089e84: 0x1089e84: lui   a1, 0x20000
+// 0x0108a4a8: 0x108a4a8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089e88: 0x1089e88: lui   a3, 0x20000
+// 0x0108a4ac: 0x108a4ac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089e8c: 0x1089e8c: addiu a1, a1, -21512
+// 0x0108a4b0: 0x108a4b0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089e90: 0x1089e90: addiu a3, a3, -10840
+// 0x0108a4b4: 0x108a4b4: addiu a3, a3, -10376
 	ldloc 4
-	ldc.i4 -10840
+	ldc.i4 -10376
 	add
 	stloc 4
-// 0x01089e94: 0x1089e94: addiu a0, zero, 4
+// 0x0108a4b8: 0x108a4b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089e98: 0x1089e98: j	 0x1089bdc addiu a2, zero, 1057
+// 0x0108a4bc: 0x108a4bc: j	 0x108a200 addiu a2, zero, 1057
 	ldc.i4 1057
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089ea0:
-// 0x01089ea0: 0x1089ea0: addiu s0, s0, 1
+L_108a4c4:
+// 0x0108a4c4: 0x108a4c4: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1089ea4:
-// 0x01089ea4: 0x1089ea4: lui   a1, 0x0
+L_108a4c8:
+// 0x0108a4c8: 0x108a4c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01089ea8: 0x1089ea8: addu  a0, s0, zero
+// 0x0108a4cc: 0x108a4cc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01089eac: 0x1089eac: addiu v0, zero, 1
+// 0x0108a4d0: 0x108a4d0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01089eb0: 0x1089eb0: addiu a1, a1, 28076
+// 0x0108a4d4: 0x108a4d4: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01089eb4: 0x1089eb4: addu  a2, zero, zero
+// 0x0108a4d8: 0x108a4d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089eb8: 0x1089eb8: addiu a3, sp, 28
+// 0x0108a4dc: 0x108a4dc: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01089ebc: 0x1089ebc: jal   0x106855c sw    v0, 16(sp)
+// 0x0108a4e0: 0x108a4e0: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1886,43 +1886,43 @@ L_1089ea4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089ec4: 0x1089ec4: bne   v0, zero, 0x1089ee8 addu  s0, v0, zero
+// 0x0108a4e8: 0x108a4e8: bne   v0, zero, 0x108a50c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089ee8
+	brtrue L_108a50c
 // --- basic block ---
-// 0x01089ecc: 0x1089ecc: lui   a1, 0x20000
+// 0x0108a4f0: 0x108a4f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089ed0: 0x1089ed0: lui   a3, 0x20000
+// 0x0108a4f4: 0x108a4f4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089ed4: 0x1089ed4: addiu a1, a1, -21512
+// 0x0108a4f8: 0x108a4f8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089ed8: 0x1089ed8: addiu a3, a3, -10764
+// 0x0108a4fc: 0x108a4fc: addiu a3, a3, -10300
 	ldloc 4
-	ldc.i4 -10764
+	ldc.i4 -10300
 	add
 	stloc 4
-// 0x01089edc: 0x1089edc: addiu a0, zero, 4
+// 0x0108a500: 0x108a500: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089ee0: 0x1089ee0: j	 0x1089bdc addiu a2, zero, 1075
+// 0x0108a504: 0x108a504: j	 0x108a200 addiu a2, zero, 1075
 	ldc.i4 1075
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089ee8:
-// 0x01089ee8: 0x1089ee8: lw    v0, 28(sp)
+L_108a50c:
+// 0x0108a50c: 0x108a50c: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1931,12 +1931,12 @@ L_1089ee8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01089eec: 0x1089eec: sll   zero, zero, 0
-// 0x01089ef0: 0x1089ef0: beq   v0, zero, 0x1089efc sll   zero, zero, 0
+// 0x0108a510: 0x108a510: sll   zero, zero, 0
+// 0x0108a514: 0x108a514: beq   v0, zero, 0x108a520 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1089efc
+	brfalse L_108a520
 // --- basic block ---
-// 0x01089ef8: 0x1089ef8: sw    v0, 64(sp)
+// 0x0108a51c: 0x108a51c: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1945,25 +1945,25 @@ L_1089ee8:
 	add
 	ldloc 5
 	stelem.i4
-L_1089efc:
-// 0x01089efc: 0x1089efc: lb    v1, 0(s0)
+L_108a520:
+// 0x0108a520: 0x108a520: lb    v1, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01089f00: 0x1089f00: addiu v0, zero, 44
+// 0x0108a524: 0x108a524: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x01089f04: 0x1089f04: beq   v1, v0, 0x1089f54 addiu v0, zero, 16
+// 0x0108a528: 0x108a528: beq   v1, v0, 0x108a578 addiu v0, zero, 16
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 16
 	stloc 5
-	beq  L_1089f54
+	beq  L_108a578
 // --- basic block ---
-// 0x01089f0c: 0x1089f0c: lui   a3, 0x0
+// 0x0108a530: 0x108a530: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01089f10: 0x1089f10: sw    v0, 24(sp)
+// 0x0108a534: 0x108a534: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1972,28 +1972,28 @@ L_1089efc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01089f14: 0x1089f14: addu  a0, s2, zero
+// 0x0108a538: 0x108a538: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01089f18: 0x1089f18: addiu v0, zero, 1
+// 0x0108a53c: 0x108a53c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01089f1c: 0x1089f1c: addiu a3, a3, 28076
+// 0x0108a540: 0x108a540: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01089f20: 0x1089f20: addiu a1, sp, 72
+// 0x0108a544: 0x108a544: addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x01089f24: 0x1089f24: addiu a2, sp, 24
+// 0x0108a548: 0x108a548: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01089f28: 0x1089f28: jal   0x1068250 sw    v0, 16(sp)
+// 0x0108a54c: 0x108a54c: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2007,71 +2007,71 @@ L_1089efc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089f30: 0x1089f30: bne   v0, zero, 0x1089f58 addu  s0, v0, zero
+// 0x0108a554: 0x108a554: bne   v0, zero, 0x108a57c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089f58
+	brtrue L_108a57c
 // --- basic block ---
-// 0x01089f38: 0x1089f38: lui   a1, 0x20000
+// 0x0108a55c: 0x108a55c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089f3c: 0x1089f3c: lui   a3, 0x20000
+// 0x0108a560: 0x108a560: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089f40: 0x1089f40: addiu a1, a1, -21512
+// 0x0108a564: 0x108a564: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089f44: 0x1089f44: addiu a3, a3, -10688
+// 0x0108a568: 0x108a568: addiu a3, a3, -10224
 	ldloc 4
-	ldc.i4 -10688
+	ldc.i4 -10224
 	add
 	stloc 4
-// 0x01089f48: 0x1089f48: addiu a0, zero, 4
+// 0x0108a56c: 0x108a56c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089f4c: 0x1089f4c: j	 0x1089bdc addiu a2, zero, 1094
+// 0x0108a570: 0x108a570: j	 0x108a200 addiu a2, zero, 1094
 	ldc.i4 1094
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089f54:
-// 0x01089f54: 0x1089f54: addiu s0, s0, 1
+L_108a578:
+// 0x0108a578: 0x108a578: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1089f58:
-// 0x01089f58: 0x1089f58: lui   a1, 0x0
+L_108a57c:
+// 0x0108a57c: 0x108a57c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01089f5c: 0x1089f5c: addu  a0, s0, zero
+// 0x0108a580: 0x108a580: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01089f60: 0x1089f60: addiu v0, zero, -1
+// 0x0108a584: 0x108a584: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01089f64: 0x1089f64: addiu a1, a1, 30268
+// 0x0108a588: 0x108a588: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01089f68: 0x1089f68: addu  a2, zero, zero
+// 0x0108a58c: 0x108a58c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01089f6c: 0x1089f6c: addiu a3, sp, 28
+// 0x0108a590: 0x108a590: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01089f70: 0x1089f70: jal   0x106855c sw    v0, 16(sp)
+// 0x0108a594: 0x108a594: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2085,43 +2085,43 @@ L_1089f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089f78: 0x1089f78: bne   v0, zero, 0x1089f9c addu  s0, v0, zero
+// 0x0108a59c: 0x108a59c: bne   v0, zero, 0x108a5c0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1089f9c
+	brtrue L_108a5c0
 // --- basic block ---
-// 0x01089f80: 0x1089f80: lui   a1, 0x20000
+// 0x0108a5a4: 0x108a5a4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01089f84: 0x1089f84: lui   a3, 0x20000
+// 0x0108a5a8: 0x108a5a8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01089f88: 0x1089f88: addiu a1, a1, -21512
+// 0x0108a5ac: 0x108a5ac: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x01089f8c: 0x1089f8c: addiu a3, a3, -10612
+// 0x0108a5b0: 0x108a5b0: addiu a3, a3, -10148
 	ldloc 4
-	ldc.i4 -10612
+	ldc.i4 -10148
 	add
 	stloc 4
-// 0x01089f90: 0x1089f90: addiu a0, zero, 4
+// 0x0108a5b4: 0x108a5b4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01089f94: 0x1089f94: j	 0x1089bdc addiu a2, zero, 1112
+// 0x0108a5b8: 0x108a5b8: j	 0x108a200 addiu a2, zero, 1112
 	ldc.i4 1112
 	stloc.3
-	br L_1089bdc
+	br L_108a200
 // --- basic block ---
-L_1089f9c:
-// 0x01089f9c: 0x1089f9c: lw    v0, 28(sp)
+L_108a5c0:
+// 0x0108a5c0: 0x108a5c0: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2130,16 +2130,16 @@ L_1089f9c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01089fa0: 0x1089fa0: sll   zero, zero, 0
-// 0x01089fa4: 0x1089fa4: beq   v0, zero, 0x1089fb0 addiu s1, sp, 32
+// 0x0108a5c4: 0x108a5c4: sll   zero, zero, 0
+// 0x0108a5c8: 0x108a5c8: beq   v0, zero, 0x108a5d4 addiu s1, sp, 32
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 13
-	brfalse L_1089fb0
+	brfalse L_108a5d4
 // --- basic block ---
-// 0x01089fac: 0x1089fac: sw    v0, 88(sp)
+// 0x0108a5d0: 0x108a5d0: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2148,8 +2148,8 @@ L_1089f9c:
 	add
 	ldloc 5
 	stelem.i4
-L_1089fb0:
-// 0x01089fb0: 0x1089fb0: jal   0x108d958 addu  a0, s1, zero
+L_108a5d4:
+// 0x0108a5d4: 0x108a5d4: jal   0x108df7c addu  a0, s1, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -2157,12 +2157,12 @@ L_1089fb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessageQueue_Push_108d958(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessageQueue_Push_108df7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01089fb8: 0x1089fb8: jal   0x108d254 addu  a0, s1, zero
+// 0x0108a5dc: 0x108a5dc: jal   0x108d878 addu  a0, s1, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -2170,17 +2170,17 @@ L_1089fb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1089fc0:
-// 0x01089fc0: 0x1089fc0: lw    ra, 124(sp)
-// 0x01089fc4: 0x1089fc4: addu  v0, s0, zero
+L_108a5e4:
+// 0x0108a5e4: 0x108a5e4: lw    ra, 124(sp)
+// 0x0108a5e8: 0x108a5e8: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01089fc8: 0x1089fc8: lw    s6, 120(sp)
+// 0x0108a5ec: 0x108a5ec: lw    s6, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2189,7 +2189,7 @@ L_1089fc0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01089fcc: 0x1089fcc: lw    s5, 116(sp)
+// 0x0108a5f0: 0x108a5f0: lw    s5, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2198,7 +2198,7 @@ L_1089fc0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01089fd0: 0x1089fd0: lw    s4, 112(sp)
+// 0x0108a5f4: 0x108a5f4: lw    s4, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2207,7 +2207,7 @@ L_1089fc0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01089fd4: 0x1089fd4: lw    s3, 108(sp)
+// 0x0108a5f8: 0x108a5f8: lw    s3, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2216,7 +2216,7 @@ L_1089fc0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01089fd8: 0x1089fd8: lw    s2, 104(sp)
+// 0x0108a5fc: 0x108a5fc: lw    s2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2225,7 +2225,7 @@ L_1089fc0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01089fdc: 0x1089fdc: lw    s1, 100(sp)
+// 0x0108a600: 0x108a600: lw    s1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2234,7 +2234,7 @@ L_1089fc0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01089fe0: 0x1089fe0: lw    s0, 96(sp)
+// 0x0108a604: 0x108a604: lw    s0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2243,7 +2243,7 @@ L_1089fc0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01089fe4: 0x1089fe4: jr    ra addiu sp, sp, 128
+// 0x0108a608: 0x108a608: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -2255,7 +2255,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 AddUser_1089fec(int32,int32,int32,int32,int32)
+.method public static int32 AddUser_108a610(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s4,int32 s3,int32 s0,int32 ra,int32 t0)
@@ -2308,13 +2308,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1089fec:
-// 0x01089fec: 0x1089fec: addiu sp, sp, -640
+L_108a610:
+// 0x0108a610: 0x108a610: addiu sp, sp, -640
 	ldloc.0
 	ldc.i4 -640
 	add
 	stloc.0
-// 0x01089ff0: 0x1089ff0: sw    s2, 624(sp)
+// 0x0108a614: 0x108a614: sw    s2, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2323,12 +2323,12 @@ L_1089fec:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01089ff4: 0x1089ff4: addiu s2, sp, 40
+// 0x0108a618: 0x108a618: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x01089ff8: 0x1089ff8: sw    s4, 632(sp)
+// 0x0108a61c: 0x108a61c: sw    s4, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2337,7 +2337,7 @@ L_1089fec:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01089ffc: 0x1089ffc: sw    s1, 620(sp)
+// 0x0108a620: 0x108a620: sw    s1, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2346,16 +2346,16 @@ L_1089fec:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108a000: 0x108a000: addu  s4, a0, zero
+// 0x0108a624: 0x108a624: addu  s4, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0108a004: 0x108a004: lui   s1, 0x0
+// 0x0108a628: 0x108a628: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0108a008: 0x108a008: addu  a0, s2, zero
+// 0x0108a62c: 0x108a62c: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0108a00c: 0x108a00c: sw    s3, 628(sp)
+// 0x0108a630: 0x108a630: sw    s3, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2364,7 +2364,7 @@ L_1089fec:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108a010: 0x108a010: sw    s0, 616(sp)
+// 0x0108a634: 0x108a634: sw    s0, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2373,11 +2373,11 @@ L_1089fec:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108a014: 0x108a014: addu  s3, a1, zero
+// 0x0108a638: 0x108a638: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0108a018: 0x108a018: sw    ra, 636(sp)
-// 0x0108a01c: 0x108a01c: jal   0x108b998 addu  s0, a3, zero
+// 0x0108a63c: 0x108a63c: sw    ra, 636(sp)
+// 0x0108a640: 0x108a640: jal   0x108bfbc addu  s0, a3, zero
 	ldloc 4
 	stloc 12
 	ldloc.0
@@ -2385,26 +2385,26 @@ L_1089fec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUserLocation_Init_108b998(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUserLocation_Init_108bfbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a024: 0x108a024: addu  a0, s4, zero
+// 0x0108a648: 0x108a648: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x0108a028: 0x108a028: addu  a3, s2, zero
+// 0x0108a64c: 0x108a64c: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x0108a02c: 0x108a02c: addiu a1, s1, 28076
+// 0x0108a650: 0x108a650: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a030: 0x108a030: addu  a2, zero, zero
+// 0x0108a654: 0x108a654: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a034: 0x108a034: jal   0x106855c sw    zero, 16(sp)
+// 0x0108a658: 0x108a658: jal   0x106856c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2418,30 +2418,30 @@ L_1089fec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a03c: 0x108a03c: beq   v0, zero, 0x108a064 addiu v1, zero, 44
+// 0x0108a660: 0x108a660: beq   v0, zero, 0x108a688 addiu v1, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc 7
-	brfalse L_108a064
+	brfalse L_108a688
 // --- basic block ---
-// 0x0108a044: 0x108a044: lb    a1, 0(v0)
+// 0x0108a668: 0x108a668: lb    a1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0108a048: 0x108a048: sll   zero, zero, 0
-// 0x0108a04c: 0x108a04c: bne   a1, v1, 0x108a064 addiu v1, zero, -1
+// 0x0108a66c: 0x108a66c: sll   zero, zero, 0
+// 0x0108a670: 0x108a670: bne   a1, v1, 0x108a688 addiu v1, zero, -1
 	ldloc.2
 	ldloc 7
 	ldc.i4.m1
 	stloc 7
-	bne.un L_108a064
+	bne.un L_108a688
 // --- basic block ---
-// 0x0108a054: 0x108a054: lw    a0, 40(sp)
+// 0x0108a678: 0x108a678: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2450,77 +2450,77 @@ L_1089fec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108a058: 0x108a058: sll   zero, zero, 0
-// 0x0108a05c: 0x108a05c: bne   a0, v1, 0x108a080 sll   zero, zero, 0
+// 0x0108a67c: 0x108a67c: sll   zero, zero, 0
+// 0x0108a680: 0x108a680: bne   a0, v1, 0x108a6a4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_108a080
+	bne.un L_108a6a4
 // --- basic block ---
-L_108a064:
-// 0x0108a064: 0x108a064: lui   a1, 0x20000
+L_108a688:
+// 0x0108a688: 0x108a688: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a068: 0x108a068: lui   a3, 0x20000
+// 0x0108a68c: 0x108a68c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a06c: 0x108a06c: addiu a1, a1, -21512
+// 0x0108a690: 0x108a690: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a070: 0x108a070: addiu a3, a3, -10536
+// 0x0108a694: 0x108a694: addiu a3, a3, -10072
 	ldloc 4
-	ldc.i4 -10536
+	ldc.i4 -10072
 	add
 	stloc 4
-// 0x0108a074: 0x108a074: addiu a0, zero, 4
+// 0x0108a698: 0x108a698: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a078: 0x108a078: j	 0x108a108 addiu a2, zero, 489
+// 0x0108a69c: 0x108a69c: j	 0x108a72c addiu a2, zero, 489
 	ldc.i4 489
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a080:
-// 0x0108a080: 0x108a080: lb    a2, 1(v0)
+L_108a6a4:
+// 0x0108a6a4: 0x108a6a4: lb    a2, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0108a084: 0x108a084: sll   zero, zero, 0
-// 0x0108a088: 0x108a088: bne   a2, a1, 0x108a0bc addiu a0, v0, 1
+// 0x0108a6a8: 0x108a6a8: sll   zero, zero, 0
+// 0x0108a6ac: 0x108a6ac: bne   a2, a1, 0x108a6e0 addiu a0, v0, 1
 	ldloc.3
 	ldloc.2
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_108a0bc
+	bne.un L_108a6e0
 // --- basic block ---
-// 0x0108a090: 0x108a090: lui   a1, 0x20000
+// 0x0108a6b4: 0x108a6b4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a094: 0x108a094: lui   a3, 0x20000
+// 0x0108a6b8: 0x108a6b8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a098: 0x108a098: addiu a1, a1, -21512
+// 0x0108a6bc: 0x108a6bc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a09c: 0x108a09c: addiu a3, a3, -10472
+// 0x0108a6c0: 0x108a6c0: addiu a3, a3, -10008
 	ldloc 4
-	ldc.i4 -10472
+	ldc.i4 -10008
 	add
 	stloc 4
-// 0x0108a0a0: 0x108a0a0: addiu a0, zero, 1
+// 0x0108a6c4: 0x108a6c4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108a0a4: 0x108a0a4: addiu a2, zero, 500
+// 0x0108a6c8: 0x108a6c8: addiu a2, zero, 500
 	ldc.i4 500
 	stloc.3
-// 0x0108a0a8: 0x108a0a8: jal   0x100449c sw    v0, 608(sp)
+// 0x0108a6cc: 0x108a6cc: jal   0x100449c sw    v0, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2539,7 +2539,7 @@ L_108a080:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a0b0: 0x108a0b0: lw    v0, 608(sp)
+// 0x0108a6d4: 0x108a6d4: lw    v0, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2548,33 +2548,33 @@ L_108a080:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108a0b4: 0x108a0b4: j	 0x108a118 addiu v0, v0, 2
+// 0x0108a6d8: 0x108a6d8: j	 0x108a73c addiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 5
-	br L_108a118
+	br L_108a73c
 // --- basic block ---
-L_108a0bc:
-// 0x0108a0bc: 0x108a0bc: addiu v0, zero, 63
+L_108a6e0:
+// 0x0108a6e0: 0x108a6e0: addiu v0, zero, 63
 	ldc.i4.s 63
 	stloc 5
-// 0x0108a0c0: 0x108a0c0: addiu a3, s1, 28076
+// 0x0108a6e4: 0x108a6e4: addiu a3, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108a0c4: 0x108a0c4: addiu a1, sp, 44
+// 0x0108a6e8: 0x108a6e8: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x0108a0c8: 0x108a0c8: addiu a2, sp, 24
+// 0x0108a6ec: 0x108a6ec: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108a0cc: 0x108a0cc: sw    v0, 24(sp)
+// 0x0108a6f0: 0x108a6f0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2583,7 +2583,7 @@ L_108a0bc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a0d0: 0x108a0d0: jal   0x1068250 sw    v1, 16(sp)
+// 0x0108a6f4: 0x108a6f4: jal   0x1068260 sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2597,53 +2597,53 @@ L_108a0bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a0d8: 0x108a0d8: beq   v0, zero, 0x108a0f4 lui   a1, 0x20000
+// 0x0108a6fc: 0x108a6fc: beq   v0, zero, 0x108a718 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a0f4
+	brfalse L_108a718
 // --- basic block ---
-// 0x0108a0e0: 0x108a0e0: lb    v1, 0(v0)
+// 0x0108a704: 0x108a704: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a0e4: 0x108a0e4: sll   zero, zero, 0
-// 0x0108a0e8: 0x108a0e8: bne   v1, zero, 0x108a11c lui   s1, 0x0
+// 0x0108a708: 0x108a708: sll   zero, zero, 0
+// 0x0108a70c: 0x108a70c: bne   v1, zero, 0x108a740 lui   s1, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 9
-	brtrue L_108a11c
+	brtrue L_108a740
 // --- basic block ---
-// 0x0108a0f0: 0x108a0f0: lui   a1, 0x20000
+// 0x0108a714: 0x108a714: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_108a0f4:
-// 0x0108a0f4: 0x108a0f4: lui   a3, 0x20000
+L_108a718:
+// 0x0108a718: 0x108a718: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a0f8: 0x108a0f8: addiu a1, a1, -21512
+// 0x0108a71c: 0x108a71c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a0fc: 0x108a0fc: addiu a3, a3, -10380
+// 0x0108a720: 0x108a720: addiu a3, a3, -9916
 	ldloc 4
-	ldc.i4 -10380
+	ldc.i4 -9916
 	add
 	stloc 4
-// 0x0108a100: 0x108a100: addiu a0, zero, 4
+// 0x0108a724: 0x108a724: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a104: 0x108a104: addiu a2, zero, 516
+// 0x0108a728: 0x108a728: addiu a2, zero, 516
 	ldc.i4 516
 	stloc.3
-L_108a108:
-// 0x0108a108: 0x108a108: jal   0x100449c sll   zero, zero, 0
+L_108a72c:
+// 0x0108a72c: 0x108a72c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2654,36 +2654,36 @@ L_108a108:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a110: 0x108a110: j	 0x108a7ec addiu v0, zero, 18
+// 0x0108a734: 0x108a734: j	 0x108ae10 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_108a7ec
+	br L_108ae10
 // --- basic block ---
-L_108a118:
-// 0x0108a118: 0x108a118: lui   s1, 0x0
+L_108a73c:
+// 0x0108a73c: 0x108a73c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-L_108a11c:
-// 0x0108a11c: 0x108a11c: addiu s2, zero, -1
+L_108a740:
+// 0x0108a740: 0x108a740: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x0108a120: 0x108a120: addu  a0, v0, zero
+// 0x0108a744: 0x108a744: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a124: 0x108a124: addiu a1, s1, 28076
+// 0x0108a748: 0x108a748: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a128: 0x108a128: addu  a2, zero, zero
+// 0x0108a74c: 0x108a74c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a12c: 0x108a12c: addiu a3, sp, 172
+// 0x0108a750: 0x108a750: addiu a3, sp, 172
 	ldloc.0
 	ldc.i4 172
 	add
 	stloc 4
-// 0x0108a130: 0x108a130: jal   0x106855c sw    s2, 16(sp)
+// 0x0108a754: 0x108a754: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2697,66 +2697,66 @@ L_108a11c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a138: 0x108a138: beq   v0, zero, 0x108a150 lui   a1, 0x20000
+// 0x0108a75c: 0x108a75c: beq   v0, zero, 0x108a774 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a150
+	brfalse L_108a774
 // --- basic block ---
-// 0x0108a140: 0x108a140: lb    v1, 0(v0)
+// 0x0108a764: 0x108a764: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a144: 0x108a144: sll   zero, zero, 0
-// 0x0108a148: 0x108a148: bne   v1, zero, 0x108a168 sll   zero, zero, 0
+// 0x0108a768: 0x108a768: sll   zero, zero, 0
+// 0x0108a76c: 0x108a76c: bne   v1, zero, 0x108a78c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108a168
+	brtrue L_108a78c
 // --- basic block ---
-L_108a150:
-// 0x0108a150: 0x108a150: lui   a3, 0x20000
+L_108a774:
+// 0x0108a774: 0x108a774: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a154: 0x108a154: addiu a1, a1, -21512
+// 0x0108a778: 0x108a778: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a158: 0x108a158: addiu a3, a3, -10316
+// 0x0108a77c: 0x108a77c: addiu a3, a3, -9852
 	ldloc 4
-	ldc.i4 -10316
+	ldc.i4 -9852
 	add
 	stloc 4
-// 0x0108a15c: 0x108a15c: addiu a0, zero, 4
+// 0x0108a780: 0x108a780: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a160: 0x108a160: j	 0x108a108 addiu a2, zero, 532
+// 0x0108a784: 0x108a784: j	 0x108a72c addiu a2, zero, 532
 	ldc.i4 532
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a168:
-// 0x0108a168: 0x108a168: addu  a0, v0, zero
+L_108a78c:
+// 0x0108a78c: 0x108a78c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a16c: 0x108a16c: addiu a1, s1, 28076
+// 0x0108a790: 0x108a790: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a170: 0x108a170: addu  a2, zero, zero
+// 0x0108a794: 0x108a794: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a174: 0x108a174: addiu a3, sp, 176
+// 0x0108a798: 0x108a798: addiu a3, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc 4
-// 0x0108a178: 0x108a178: jal   0x106855c sw    s2, 16(sp)
+// 0x0108a79c: 0x108a79c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2770,66 +2770,66 @@ L_108a168:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a180: 0x108a180: beq   v0, zero, 0x108a198 lui   a1, 0x20000
+// 0x0108a7a4: 0x108a7a4: beq   v0, zero, 0x108a7bc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a198
+	brfalse L_108a7bc
 // --- basic block ---
-// 0x0108a188: 0x108a188: lb    v1, 0(v0)
+// 0x0108a7ac: 0x108a7ac: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a18c: 0x108a18c: sll   zero, zero, 0
-// 0x0108a190: 0x108a190: bne   v1, zero, 0x108a1b0 sll   zero, zero, 0
+// 0x0108a7b0: 0x108a7b0: sll   zero, zero, 0
+// 0x0108a7b4: 0x108a7b4: bne   v1, zero, 0x108a7d4 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108a1b0
+	brtrue L_108a7d4
 // --- basic block ---
-L_108a198:
-// 0x0108a198: 0x108a198: lui   a3, 0x20000
+L_108a7bc:
+// 0x0108a7bc: 0x108a7bc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a19c: 0x108a19c: addiu a1, a1, -21512
+// 0x0108a7c0: 0x108a7c0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a1a0: 0x108a1a0: addiu a3, a3, -10252
+// 0x0108a7c4: 0x108a7c4: addiu a3, a3, -9788
 	ldloc 4
-	ldc.i4 -10252
+	ldc.i4 -9788
 	add
 	stloc 4
-// 0x0108a1a4: 0x108a1a4: addiu a0, zero, 4
+// 0x0108a7c8: 0x108a7c8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a1a8: 0x108a1a8: j	 0x108a108 addiu a2, zero, 547
+// 0x0108a7cc: 0x108a7cc: j	 0x108a72c addiu a2, zero, 547
 	ldc.i4 547
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a1b0:
-// 0x0108a1b0: 0x108a1b0: addu  a0, v0, zero
+L_108a7d4:
+// 0x0108a7d4: 0x108a7d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a1b4: 0x108a1b4: addiu a1, s1, 28076
+// 0x0108a7d8: 0x108a7d8: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a1b8: 0x108a1b8: addu  a2, zero, zero
+// 0x0108a7dc: 0x108a7dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a1bc: 0x108a1bc: addiu a3, sp, 180
+// 0x0108a7e0: 0x108a7e0: addiu a3, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc 4
-// 0x0108a1c0: 0x108a1c0: jal   0x106855c sw    s2, 16(sp)
+// 0x0108a7e4: 0x108a7e4: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2843,66 +2843,66 @@ L_108a1b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a1c8: 0x108a1c8: beq   v0, zero, 0x108a1e0 lui   a1, 0x20000
+// 0x0108a7ec: 0x108a7ec: beq   v0, zero, 0x108a804 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a1e0
+	brfalse L_108a804
 // --- basic block ---
-// 0x0108a1d0: 0x108a1d0: lb    v1, 0(v0)
+// 0x0108a7f4: 0x108a7f4: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a1d4: 0x108a1d4: sll   zero, zero, 0
-// 0x0108a1d8: 0x108a1d8: bne   v1, zero, 0x108a1f8 sll   zero, zero, 0
+// 0x0108a7f8: 0x108a7f8: sll   zero, zero, 0
+// 0x0108a7fc: 0x108a7fc: bne   v1, zero, 0x108a81c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108a1f8
+	brtrue L_108a81c
 // --- basic block ---
-L_108a1e0:
-// 0x0108a1e0: 0x108a1e0: lui   a3, 0x20000
+L_108a804:
+// 0x0108a804: 0x108a804: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a1e4: 0x108a1e4: addiu a1, a1, -21512
+// 0x0108a808: 0x108a808: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a1e8: 0x108a1e8: addiu a3, a3, -10188
+// 0x0108a80c: 0x108a80c: addiu a3, a3, -9724
 	ldloc 4
-	ldc.i4 -10188
+	ldc.i4 -9724
 	add
 	stloc 4
-// 0x0108a1ec: 0x108a1ec: addiu a0, zero, 4
+// 0x0108a810: 0x108a810: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a1f0: 0x108a1f0: j	 0x108a108 addiu a2, zero, 562
+// 0x0108a814: 0x108a814: j	 0x108a72c addiu a2, zero, 562
 	ldc.i4 562
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a1f8:
-// 0x0108a1f8: 0x108a1f8: addu  a0, v0, zero
+L_108a81c:
+// 0x0108a81c: 0x108a81c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a1fc: 0x108a1fc: addiu a1, s1, 28076
+// 0x0108a820: 0x108a820: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a200: 0x108a200: addu  a2, zero, zero
+// 0x0108a824: 0x108a824: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a204: 0x108a204: addiu a3, sp, 28
+// 0x0108a828: 0x108a828: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0108a208: 0x108a208: jal   0x106855c sw    s2, 16(sp)
+// 0x0108a82c: 0x108a82c: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2916,53 +2916,53 @@ L_108a1f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a210: 0x108a210: beq   v0, zero, 0x108a228 addu  s2, v0, zero
+// 0x0108a834: 0x108a834: beq   v0, zero, 0x108a84c addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_108a228
+	brfalse L_108a84c
 // --- basic block ---
-// 0x0108a218: 0x108a218: lb    v0, 0(v0)
+// 0x0108a83c: 0x108a83c: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108a21c: 0x108a21c: sll   zero, zero, 0
-// 0x0108a220: 0x108a220: bne   v0, zero, 0x108a244 sll   zero, zero, 0
+// 0x0108a840: 0x108a840: sll   zero, zero, 0
+// 0x0108a844: 0x108a844: bne   v0, zero, 0x108a868 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_108a244
+	brtrue L_108a868
 // --- basic block ---
-L_108a228:
-// 0x0108a228: 0x108a228: lui   a1, 0x20000
+L_108a84c:
+// 0x0108a84c: 0x108a84c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a22c: 0x108a22c: lui   a3, 0x20000
+// 0x0108a850: 0x108a850: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a230: 0x108a230: addiu a1, a1, -21512
+// 0x0108a854: 0x108a854: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a234: 0x108a234: addiu a3, a3, -10124
+// 0x0108a858: 0x108a858: addiu a3, a3, -9660
 	ldloc 4
-	ldc.i4 -10124
+	ldc.i4 -9660
 	add
 	stloc 4
-// 0x0108a238: 0x108a238: addiu a0, zero, 4
+// 0x0108a85c: 0x108a85c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a23c: 0x108a23c: j	 0x108a108 addiu a2, zero, 578
+// 0x0108a860: 0x108a860: j	 0x108a72c addiu a2, zero, 578
 	ldc.i4 578
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a244:
-// 0x0108a244: 0x108a244: lw    a0, 28(sp)
+L_108a868:
+// 0x0108a868: 0x108a868: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2971,39 +2971,39 @@ L_108a244:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108a248: 0x108a248: jal   0x10c09c0 sll   zero, zero, 0
+// 0x0108a86c: 0x108a86c: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a250: 0x108a250: lui   a0, 0x20000
+// 0x0108a874: 0x108a874: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108a254: 0x108a254: lw    a3, 23740(a0)
+// 0x0108a878: 0x108a878: lw    a3, 24204(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5935
+	ldc.i4 6051
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108a258: 0x108a258: lw    a2, 23736(a0)
+// 0x0108a87c: 0x108a87c: lw    a2, 24200(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5934
+	ldc.i4 6050
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108a25c: 0x108a25c: addu  a1, v1, zero
+// 0x0108a880: 0x108a880: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0108a260: 0x108a260: jal   0x10c0798 addu  a0, v0, zero
+// 0x0108a884: 0x108a884: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3011,31 +3011,31 @@ L_108a244:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a268: 0x108a268: addu  a0, s2, zero
+// 0x0108a88c: 0x108a88c: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0108a26c: 0x108a26c: addiu t0, zero, 1
+// 0x0108a890: 0x108a890: addiu t0, zero, 1
 	ldc.i4.1
 	stloc 14
-// 0x0108a270: 0x108a270: addiu a1, s1, 28076
+// 0x0108a894: 0x108a894: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a274: 0x108a274: addu  a2, zero, zero
+// 0x0108a898: 0x108a898: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a278: 0x108a278: addiu a3, sp, 192
+// 0x0108a89c: 0x108a89c: addiu a3, sp, 192
 	ldloc.0
 	ldc.i4 192
 	add
 	stloc 4
-// 0x0108a27c: 0x108a27c: sw    t0, 16(sp)
+// 0x0108a8a0: 0x108a8a0: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3044,7 +3044,7 @@ L_108a244:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108a280: 0x108a280: sw    v1, 188(sp)
+// 0x0108a8a4: 0x108a8a4: sw    v1, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3053,7 +3053,7 @@ L_108a244:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108a284: 0x108a284: jal   0x106855c sw    v0, 184(sp)
+// 0x0108a8a8: 0x108a8a8: jal   0x106856c sw    v0, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3067,59 +3067,59 @@ L_108a244:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a28c: 0x108a28c: bne   v0, zero, 0x108a2b0 addu  s2, v0, zero
+// 0x0108a8b0: 0x108a8b0: bne   v0, zero, 0x108a8d4 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a2b0
+	brtrue L_108a8d4
 // --- basic block ---
-// 0x0108a294: 0x108a294: lui   a1, 0x20000
+// 0x0108a8b8: 0x108a8b8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a298: 0x108a298: lui   a3, 0x20000
+// 0x0108a8bc: 0x108a8bc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a29c: 0x108a29c: addiu a1, a1, -21512
+// 0x0108a8c0: 0x108a8c0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a2a0: 0x108a2a0: addiu a3, a3, -10064
+// 0x0108a8c4: 0x108a8c4: addiu a3, a3, -9600
 	ldloc 4
-	ldc.i4 -10064
+	ldc.i4 -9600
 	add
 	stloc 4
-// 0x0108a2a4: 0x108a2a4: addiu a0, zero, 4
+// 0x0108a8c8: 0x108a8c8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a2a8: 0x108a2a8: j	 0x108a780 addiu a2, zero, 595
+// 0x0108a8cc: 0x108a8cc: j	 0x108ada4 addiu a2, zero, 595
 	ldc.i4 595
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a2b0:
-// 0x0108a2b0: 0x108a2b0: addu  a0, v0, zero
+L_108a8d4:
+// 0x0108a8d4: 0x108a8d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a2b4: 0x108a2b4: addiu a1, s1, 28076
+// 0x0108a8d8: 0x108a8d8: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a2b8: 0x108a2b8: addu  a2, zero, zero
+// 0x0108a8dc: 0x108a8dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a2bc: 0x108a2bc: addiu a3, sp, 196
+// 0x0108a8e0: 0x108a8e0: addiu a3, sp, 196
 	ldloc.0
 	ldc.i4 196
 	add
 	stloc 4
-// 0x0108a2c0: 0x108a2c0: jal   0x106855c sw    zero, 16(sp)
+// 0x0108a8e4: 0x108a8e4: jal   0x106856c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3133,83 +3133,83 @@ L_108a2b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a2c8: 0x108a2c8: bne   v0, zero, 0x108a2ec addu  s2, v0, zero
+// 0x0108a8ec: 0x108a8ec: bne   v0, zero, 0x108a910 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a2ec
+	brtrue L_108a910
 // --- basic block ---
-// 0x0108a2d0: 0x108a2d0: lui   a1, 0x20000
+// 0x0108a8f4: 0x108a8f4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a2d4: 0x108a2d4: lui   a3, 0x20000
+// 0x0108a8f8: 0x108a8f8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a2d8: 0x108a2d8: addiu a1, a1, -21512
+// 0x0108a8fc: 0x108a8fc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a2dc: 0x108a2dc: addiu a3, a3, -9996
+// 0x0108a900: 0x108a900: addiu a3, a3, -9532
 	ldloc 4
-	ldc.i4 -9996
+	ldc.i4 -9532
 	add
 	stloc 4
-// 0x0108a2e0: 0x108a2e0: addiu a0, zero, 4
+// 0x0108a904: 0x108a904: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a2e4: 0x108a2e4: j	 0x108a780 addiu a2, zero, 609
+// 0x0108a908: 0x108a908: j	 0x108ada4 addiu a2, zero, 609
 	ldc.i4 609
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a2ec:
-// 0x0108a2ec: 0x108a2ec: lb    v1, 1(v0)
+L_108a910:
+// 0x0108a910: 0x108a910: lb    v1, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a2f0: 0x108a2f0: addiu a0, v0, 1
+// 0x0108a914: 0x108a914: addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0108a2f4: 0x108a2f4: addiu v0, zero, 44
+// 0x0108a918: 0x108a918: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0108a2f8: 0x108a2f8: bne   v1, v0, 0x108a324 lui   a3, 0x0
+// 0x0108a91c: 0x108a91c: bne   v1, v0, 0x108a948 lui   a3, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_108a324
+	bne.un L_108a948
 // --- basic block ---
-// 0x0108a300: 0x108a300: lui   a1, 0x20000
+// 0x0108a924: 0x108a924: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a304: 0x108a304: lui   a3, 0x20000
+// 0x0108a928: 0x108a928: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a308: 0x108a308: addiu a1, a1, -21512
+// 0x0108a92c: 0x108a92c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a30c: 0x108a30c: addiu a3, a3, -9936
+// 0x0108a930: 0x108a930: addiu a3, a3, -9472
 	ldloc 4
-	ldc.i4 -9936
+	ldc.i4 -9472
 	add
 	stloc 4
-// 0x0108a310: 0x108a310: addiu a0, zero, 1
+// 0x0108a934: 0x108a934: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108a314: 0x108a314: jal   0x100449c addiu a2, zero, 620
+// 0x0108a938: 0x108a938: jal   0x100449c addiu a2, zero, 620
 	ldc.i4 620
 	stloc.3
 	ldloc.0
@@ -3222,18 +3222,18 @@ L_108a2ec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a31c: 0x108a31c: j	 0x108a378 addiu v0, s2, 2
+// 0x0108a940: 0x108a940: j	 0x108a99c addiu v0, s2, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 5
-	br L_108a378
+	br L_108a99c
 // --- basic block ---
-L_108a324:
-// 0x0108a324: 0x108a324: addiu v0, zero, 63
+L_108a948:
+// 0x0108a948: 0x108a948: addiu v0, zero, 63
 	ldc.i4.s 63
 	stloc 5
-// 0x0108a328: 0x108a328: sw    v0, 24(sp)
+// 0x0108a94c: 0x108a94c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3242,25 +3242,25 @@ L_108a324:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a32c: 0x108a32c: addiu a3, a3, 28076
+// 0x0108a950: 0x108a950: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108a330: 0x108a330: addiu v0, zero, -1
+// 0x0108a954: 0x108a954: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108a334: 0x108a334: addiu a1, sp, 200
+// 0x0108a958: 0x108a958: addiu a1, sp, 200
 	ldloc.0
 	ldc.i4 200
 	add
 	stloc.2
-// 0x0108a338: 0x108a338: addiu a2, sp, 24
+// 0x0108a95c: 0x108a95c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108a33c: 0x108a33c: jal   0x1068250 sw    v0, 16(sp)
+// 0x0108a960: 0x108a960: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3274,78 +3274,78 @@ L_108a324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a344: 0x108a344: beq   v0, zero, 0x108a360 lui   a1, 0x20000
+// 0x0108a968: 0x108a968: beq   v0, zero, 0x108a984 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a360
+	brfalse L_108a984
 // --- basic block ---
-// 0x0108a34c: 0x108a34c: lb    v1, 0(v0)
+// 0x0108a970: 0x108a970: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a350: 0x108a350: sll   zero, zero, 0
-// 0x0108a354: 0x108a354: bne   v1, zero, 0x108a37c lui   s1, 0x0
+// 0x0108a974: 0x108a974: sll   zero, zero, 0
+// 0x0108a978: 0x108a978: bne   v1, zero, 0x108a9a0 lui   s1, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 9
-	brtrue L_108a37c
+	brtrue L_108a9a0
 // --- basic block ---
-// 0x0108a35c: 0x108a35c: lui   a1, 0x20000
+// 0x0108a980: 0x108a980: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_108a360:
-// 0x0108a360: 0x108a360: lui   a3, 0x20000
+L_108a984:
+// 0x0108a984: 0x108a984: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a364: 0x108a364: addiu a1, a1, -21512
+// 0x0108a988: 0x108a988: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a368: 0x108a368: addiu a3, a3, -9872
+// 0x0108a98c: 0x108a98c: addiu a3, a3, -9408
 	ldloc 4
-	ldc.i4 -9872
+	ldc.i4 -9408
 	add
 	stloc 4
-// 0x0108a36c: 0x108a36c: addiu a0, zero, 4
+// 0x0108a990: 0x108a990: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a370: 0x108a370: j	 0x108a108 addiu a2, zero, 635
+// 0x0108a994: 0x108a994: j	 0x108a72c addiu a2, zero, 635
 	ldc.i4 635
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a378:
-// 0x0108a378: 0x108a378: lui   s1, 0x0
+L_108a99c:
+// 0x0108a99c: 0x108a99c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-L_108a37c:
-// 0x0108a37c: 0x108a37c: addu  a0, v0, zero
+L_108a9a0:
+// 0x0108a9a0: 0x108a9a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a380: 0x108a380: addiu s4, zero, -1
+// 0x0108a9a4: 0x108a9a4: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x0108a384: 0x108a384: addiu a1, s1, 28076
+// 0x0108a9a8: 0x108a9a8: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a388: 0x108a388: addu  a2, zero, zero
+// 0x0108a9ac: 0x108a9ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a38c: 0x108a38c: addiu a3, sp, 264
+// 0x0108a9b0: 0x108a9b0: addiu a3, sp, 264
 	ldloc.0
 	ldc.i4 264
 	add
 	stloc 4
-// 0x0108a390: 0x108a390: jal   0x106855c sw    s4, 16(sp)
+// 0x0108a9b4: 0x108a9b4: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3359,59 +3359,59 @@ L_108a37c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a398: 0x108a398: bne   v0, zero, 0x108a3bc addu  s2, v0, zero
+// 0x0108a9bc: 0x108a9bc: bne   v0, zero, 0x108a9e0 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a3bc
+	brtrue L_108a9e0
 // --- basic block ---
-// 0x0108a3a0: 0x108a3a0: lui   a1, 0x20000
+// 0x0108a9c4: 0x108a9c4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a3a4: 0x108a3a4: lui   a3, 0x20000
+// 0x0108a9c8: 0x108a9c8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a3a8: 0x108a3a8: addiu a1, a1, -21512
+// 0x0108a9cc: 0x108a9cc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a3ac: 0x108a3ac: addiu a3, a3, -9812
+// 0x0108a9d0: 0x108a9d0: addiu a3, a3, -9348
 	ldloc 4
-	ldc.i4 -9812
+	ldc.i4 -9348
 	add
 	stloc 4
-// 0x0108a3b0: 0x108a3b0: addiu a0, zero, 4
+// 0x0108a9d4: 0x108a9d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a3b4: 0x108a3b4: j	 0x108a780 addiu a2, zero, 651
+// 0x0108a9d8: 0x108a9d8: j	 0x108ada4 addiu a2, zero, 651
 	ldc.i4 651
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a3bc:
-// 0x0108a3bc: 0x108a3bc: addu  a0, v0, zero
+L_108a9e0:
+// 0x0108a9e0: 0x108a9e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a3c0: 0x108a3c0: addiu a1, s1, 28076
+// 0x0108a9e4: 0x108a9e4: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a3c4: 0x108a3c4: addu  a2, zero, zero
+// 0x0108a9e8: 0x108a9e8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a3c8: 0x108a3c8: addiu a3, sp, 268
+// 0x0108a9ec: 0x108a9ec: addiu a3, sp, 268
 	ldloc.0
 	ldc.i4 268
 	add
 	stloc 4
-// 0x0108a3cc: 0x108a3cc: jal   0x106855c sw    s4, 16(sp)
+// 0x0108a9f0: 0x108a9f0: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3425,59 +3425,59 @@ L_108a3bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a3d4: 0x108a3d4: bne   v0, zero, 0x108a3f8 addu  s2, v0, zero
+// 0x0108a9f8: 0x108a9f8: bne   v0, zero, 0x108aa1c addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a3f8
+	brtrue L_108aa1c
 // --- basic block ---
-// 0x0108a3dc: 0x108a3dc: lui   a1, 0x20000
+// 0x0108aa00: 0x108aa00: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a3e0: 0x108a3e0: lui   a3, 0x20000
+// 0x0108aa04: 0x108aa04: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a3e4: 0x108a3e4: addiu a1, a1, -21512
+// 0x0108aa08: 0x108aa08: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a3e8: 0x108a3e8: addiu a3, a3, -9752
+// 0x0108aa0c: 0x108aa0c: addiu a3, a3, -9288
 	ldloc 4
-	ldc.i4 -9752
+	ldc.i4 -9288
 	add
 	stloc 4
-// 0x0108a3ec: 0x108a3ec: addiu a0, zero, 4
+// 0x0108aa10: 0x108aa10: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a3f0: 0x108a3f0: j	 0x108a780 addiu a2, zero, 665
+// 0x0108aa14: 0x108aa14: j	 0x108ada4 addiu a2, zero, 665
 	ldc.i4 665
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a3f8:
-// 0x0108a3f8: 0x108a3f8: addu  a0, v0, zero
+L_108aa1c:
+// 0x0108aa1c: 0x108aa1c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a3fc: 0x108a3fc: addiu a1, s1, 28076
+// 0x0108aa20: 0x108aa20: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a400: 0x108a400: addu  a2, zero, zero
+// 0x0108aa24: 0x108aa24: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a404: 0x108a404: addiu a3, sp, 272
+// 0x0108aa28: 0x108aa28: addiu a3, sp, 272
 	ldloc.0
 	ldc.i4 272
 	add
 	stloc 4
-// 0x0108a408: 0x108a408: jal   0x106855c sw    s4, 16(sp)
+// 0x0108aa2c: 0x108aa2c: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3491,62 +3491,62 @@ L_108a3f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a410: 0x108a410: bne   v0, zero, 0x108a434 addu  s2, v0, zero
+// 0x0108aa34: 0x108aa34: bne   v0, zero, 0x108aa58 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a434
+	brtrue L_108aa58
 // --- basic block ---
-// 0x0108a418: 0x108a418: lui   a1, 0x20000
+// 0x0108aa3c: 0x108aa3c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a41c: 0x108a41c: lui   a3, 0x20000
+// 0x0108aa40: 0x108aa40: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a420: 0x108a420: addiu a1, a1, -21512
+// 0x0108aa44: 0x108aa44: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a424: 0x108a424: addiu a3, a3, -9692
+// 0x0108aa48: 0x108aa48: addiu a3, a3, -9228
 	ldloc 4
-	ldc.i4 -9692
+	ldc.i4 -9228
 	add
 	stloc 4
-// 0x0108a428: 0x108a428: addiu a0, zero, 4
+// 0x0108aa4c: 0x108aa4c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a42c: 0x108a42c: j	 0x108a780 addiu a2, zero, 679
+// 0x0108aa50: 0x108aa50: j	 0x108ada4 addiu a2, zero, 679
 	ldc.i4 679
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a434:
-// 0x0108a434: 0x108a434: addu  a0, v0, zero
+L_108aa58:
+// 0x0108aa58: 0x108aa58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a438: 0x108a438: addiu s4, zero, 1
+// 0x0108aa5c: 0x108aa5c: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x0108a43c: 0x108a43c: addiu a1, s1, 28076
+// 0x0108aa60: 0x108aa60: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a440: 0x108a440: addu  a2, zero, zero
+// 0x0108aa64: 0x108aa64: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a444: 0x108a444: addiu a3, sp, 276
+// 0x0108aa68: 0x108aa68: addiu a3, sp, 276
 	ldloc.0
 	ldc.i4 276
 	add
 	stloc 4
-// 0x0108a448: 0x108a448: jal   0x106855c sw    s4, 16(sp)
+// 0x0108aa6c: 0x108aa6c: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3560,59 +3560,59 @@ L_108a434:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a450: 0x108a450: bne   v0, zero, 0x108a474 addu  s2, v0, zero
+// 0x0108aa74: 0x108aa74: bne   v0, zero, 0x108aa98 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a474
+	brtrue L_108aa98
 // --- basic block ---
-// 0x0108a458: 0x108a458: lui   a1, 0x20000
+// 0x0108aa7c: 0x108aa7c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a45c: 0x108a45c: lui   a3, 0x20000
+// 0x0108aa80: 0x108aa80: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a460: 0x108a460: addiu a1, a1, -21512
+// 0x0108aa84: 0x108aa84: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a464: 0x108a464: addiu a3, a3, -9632
+// 0x0108aa88: 0x108aa88: addiu a3, a3, -9168
 	ldloc 4
-	ldc.i4 -9632
+	ldc.i4 -9168
 	add
 	stloc 4
-// 0x0108a468: 0x108a468: addiu a0, zero, 4
+// 0x0108aa8c: 0x108aa8c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a46c: 0x108a46c: j	 0x108a780 addiu a2, zero, 693
+// 0x0108aa90: 0x108aa90: j	 0x108ada4 addiu a2, zero, 693
 	ldc.i4 693
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a474:
-// 0x0108a474: 0x108a474: addu  a0, v0, zero
+L_108aa98:
+// 0x0108aa98: 0x108aa98: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a478: 0x108a478: addiu a1, s1, 28076
+// 0x0108aa9c: 0x108aa9c: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a47c: 0x108a47c: addu  a2, zero, zero
+// 0x0108aaa0: 0x108aaa0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a480: 0x108a480: addiu a3, sp, 280
+// 0x0108aaa4: 0x108aaa4: addiu a3, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
 	stloc 4
-// 0x0108a484: 0x108a484: jal   0x106855c sw    s4, 16(sp)
+// 0x0108aaa8: 0x108aaa8: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3626,59 +3626,59 @@ L_108a474:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a48c: 0x108a48c: bne   v0, zero, 0x108a4b0 addu  s2, v0, zero
+// 0x0108aab0: 0x108aab0: bne   v0, zero, 0x108aad4 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a4b0
+	brtrue L_108aad4
 // --- basic block ---
-// 0x0108a494: 0x108a494: lui   a1, 0x20000
+// 0x0108aab8: 0x108aab8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a498: 0x108a498: lui   a3, 0x20000
+// 0x0108aabc: 0x108aabc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a49c: 0x108a49c: addiu a1, a1, -21512
+// 0x0108aac0: 0x108aac0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a4a0: 0x108a4a0: addiu a3, a3, -9572
+// 0x0108aac4: 0x108aac4: addiu a3, a3, -9108
 	ldloc 4
-	ldc.i4 -9572
+	ldc.i4 -9108
 	add
 	stloc 4
-// 0x0108a4a4: 0x108a4a4: addiu a0, zero, 4
+// 0x0108aac8: 0x108aac8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a4a8: 0x108a4a8: j	 0x108a780 addiu a2, zero, 707
+// 0x0108aacc: 0x108aacc: j	 0x108ada4 addiu a2, zero, 707
 	ldc.i4 707
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a4b0:
-// 0x0108a4b0: 0x108a4b0: addu  a0, v0, zero
+L_108aad4:
+// 0x0108aad4: 0x108aad4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a4b4: 0x108a4b4: addiu a1, s1, 28076
+// 0x0108aad8: 0x108aad8: addiu a1, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108a4b8: 0x108a4b8: addu  a2, zero, zero
+// 0x0108aadc: 0x108aadc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a4bc: 0x108a4bc: addiu a3, sp, 288
+// 0x0108aae0: 0x108aae0: addiu a3, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 4
-// 0x0108a4c0: 0x108a4c0: jal   0x106855c sw    s4, 16(sp)
+// 0x0108aae4: 0x108aae4: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3692,76 +3692,76 @@ L_108a4b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a4c8: 0x108a4c8: bne   v0, zero, 0x108a4ec addu  s2, v0, zero
+// 0x0108aaec: 0x108aaec: bne   v0, zero, 0x108ab10 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a4ec
+	brtrue L_108ab10
 // --- basic block ---
-// 0x0108a4d0: 0x108a4d0: lui   a1, 0x20000
+// 0x0108aaf4: 0x108aaf4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a4d4: 0x108a4d4: lui   a3, 0x20000
+// 0x0108aaf8: 0x108aaf8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a4d8: 0x108a4d8: addiu a1, a1, -21512
+// 0x0108aafc: 0x108aafc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a4dc: 0x108a4dc: addiu a3, a3, -9508
+// 0x0108ab00: 0x108ab00: addiu a3, a3, -9044
 	ldloc 4
-	ldc.i4 -9508
+	ldc.i4 -9044
 	add
 	stloc 4
-// 0x0108a4e0: 0x108a4e0: addiu a0, zero, 4
+// 0x0108ab04: 0x108ab04: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a4e4: 0x108a4e4: j	 0x108a780 addiu a2, zero, 721
+// 0x0108ab08: 0x108ab08: j	 0x108ada4 addiu a2, zero, 721
 	ldc.i4 721
 	stloc.3
-	br L_108a780
+	br L_108ada4
 // --- basic block ---
-L_108a4ec:
-// 0x0108a4ec: 0x108a4ec: lb    v1, 0(v0)
+L_108ab10:
+// 0x0108ab10: 0x108ab10: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a4f0: 0x108a4f0: addiu v0, zero, 44
+// 0x0108ab14: 0x108ab14: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0108a4f4: 0x108a4f4: bne   v1, v0, 0x108a520 addu  a0, s2, zero
+// 0x0108ab18: 0x108ab18: bne   v1, v0, 0x108ab44 addu  a0, s2, zero
 	ldloc 7
 	ldloc 5
 	ldloc 8
 	stloc.1
-	bne.un L_108a520
+	bne.un L_108ab44
 // --- basic block ---
-// 0x0108a4fc: 0x108a4fc: lui   a1, 0x20000
+// 0x0108ab20: 0x108ab20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a500: 0x108a500: lui   a3, 0x20000
+// 0x0108ab24: 0x108ab24: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a504: 0x108a504: addiu a1, a1, -21512
+// 0x0108ab28: 0x108ab28: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a508: 0x108a508: addiu a3, a3, -9432
+// 0x0108ab2c: 0x108ab2c: addiu a3, a3, -8968
 	ldloc 4
-	ldc.i4 -9432
+	ldc.i4 -8968
 	add
 	stloc 4
-// 0x0108a50c: 0x108a50c: addiu a0, zero, 1
+// 0x0108ab30: 0x108ab30: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108a510: 0x108a510: jal   0x100449c addiu a2, zero, 730
+// 0x0108ab34: 0x108ab34: jal   0x100449c addiu a2, zero, 730
 	ldc.i4 730
 	stloc.3
 	ldloc.0
@@ -3774,33 +3774,33 @@ L_108a4ec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a518: 0x108a518: j	 0x108a56c addiu v0, s2, 1
+// 0x0108ab3c: 0x108ab3c: j	 0x108ab90 addiu v0, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 5
-	br L_108a56c
+	br L_108ab90
 // --- basic block ---
-L_108a520:
-// 0x0108a520: 0x108a520: addiu v0, zero, 100
+L_108ab44:
+// 0x0108ab44: 0x108ab44: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x0108a524: 0x108a524: addiu a3, s1, 28076
+// 0x0108ab48: 0x108ab48: addiu a3, s1, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108a528: 0x108a528: addiu a1, sp, 292
+// 0x0108ab4c: 0x108ab4c: addiu a1, sp, 292
 	ldloc.0
 	ldc.i4 292
 	add
 	stloc.2
-// 0x0108a52c: 0x108a52c: addiu a2, sp, 24
+// 0x0108ab50: 0x108ab50: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108a530: 0x108a530: sw    v0, 24(sp)
+// 0x0108ab54: 0x108ab54: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3809,7 +3809,7 @@ L_108a520:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a534: 0x108a534: jal   0x1068250 sw    s4, 16(sp)
+// 0x0108ab58: 0x108ab58: jal   0x1068260 sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3823,77 +3823,77 @@ L_108a520:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a53c: 0x108a53c: beq   v0, zero, 0x108a554 lui   a1, 0x20000
+// 0x0108ab60: 0x108ab60: beq   v0, zero, 0x108ab78 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a554
+	brfalse L_108ab78
 // --- basic block ---
-// 0x0108a544: 0x108a544: lb    v1, 0(v0)
+// 0x0108ab68: 0x108ab68: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a548: 0x108a548: sll   zero, zero, 0
-// 0x0108a54c: 0x108a54c: bne   v1, zero, 0x108a56c sll   zero, zero, 0
+// 0x0108ab6c: 0x108ab6c: sll   zero, zero, 0
+// 0x0108ab70: 0x108ab70: bne   v1, zero, 0x108ab90 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108a56c
+	brtrue L_108ab90
 // --- basic block ---
-L_108a554:
-// 0x0108a554: 0x108a554: lui   a3, 0x20000
+L_108ab78:
+// 0x0108ab78: 0x108ab78: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a558: 0x108a558: addiu a1, a1, -21512
+// 0x0108ab7c: 0x108ab7c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a55c: 0x108a55c: addiu a3, a3, -9356
+// 0x0108ab80: 0x108ab80: addiu a3, a3, -8892
 	ldloc 4
-	ldc.i4 -9356
+	ldc.i4 -8892
 	add
 	stloc 4
-// 0x0108a560: 0x108a560: addiu a0, zero, 4
+// 0x0108ab84: 0x108ab84: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a564: 0x108a564: j	 0x108a108 addiu a2, zero, 746
+// 0x0108ab88: 0x108ab88: j	 0x108a72c addiu a2, zero, 746
 	ldc.i4 746
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a56c:
-// 0x0108a56c: 0x108a56c: lui   a3, 0x0
+L_108ab90:
+// 0x0108ab90: 0x108ab90: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108a570: 0x108a570: addu  a0, v0, zero
+// 0x0108ab94: 0x108ab94: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a574: 0x108a574: addiu a3, a3, 28076
+// 0x0108ab98: 0x108ab98: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108a578: 0x108a578: addiu v0, zero, 5
+// 0x0108ab9c: 0x108ab9c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x0108a57c: 0x108a57c: addiu s1, zero, 1
+// 0x0108aba0: 0x108aba0: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0108a580: 0x108a580: addiu a1, sp, 32
+// 0x0108aba4: 0x108aba4: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0108a584: 0x108a584: addiu a2, sp, 24
+// 0x0108aba8: 0x108aba8: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108a588: 0x108a588: sw    v0, 24(sp)
+// 0x0108abac: 0x108abac: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3902,7 +3902,7 @@ L_108a56c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a58c: 0x108a58c: jal   0x1068250 sw    s1, 16(sp)
+// 0x0108abb0: 0x108abb0: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3916,57 +3916,57 @@ L_108a56c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a594: 0x108a594: bne   v0, zero, 0x108a5b8 addu  s2, v0, zero
+// 0x0108abb8: 0x108abb8: bne   v0, zero, 0x108abdc addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a5b8
+	brtrue L_108abdc
 // --- basic block ---
-// 0x0108a59c: 0x108a59c: lui   a1, 0x20000
+// 0x0108abc0: 0x108abc0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a5a0: 0x108a5a0: lui   a3, 0x20000
+// 0x0108abc4: 0x108abc4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a5a4: 0x108a5a4: addiu a1, a1, -21512
+// 0x0108abc8: 0x108abc8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a5a8: 0x108a5a8: addiu a3, a3, -9284
+// 0x0108abcc: 0x108abcc: addiu a3, a3, -8820
 	ldloc 4
-	ldc.i4 -9284
+	ldc.i4 -8820
 	add
 	stloc 4
-// 0x0108a5ac: 0x108a5ac: addiu a0, zero, 4
+// 0x0108abd0: 0x108abd0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a5b0: 0x108a5b0: j	 0x108a6a4 addiu a2, zero, 764
+// 0x0108abd4: 0x108abd4: j	 0x108acc8 addiu a2, zero, 764
 	ldc.i4 764
 	stloc.3
-	br L_108a6a4
+	br L_108acc8
 // --- basic block ---
-L_108a5b8:
-// 0x0108a5b8: 0x108a5b8: lb    v1, 32(sp)
+L_108abdc:
+// 0x0108abdc: 0x108abdc: lb    v1, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a5bc: 0x108a5bc: addiu v0, zero, 84
+// 0x0108abe0: 0x108abe0: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x0108a5c0: 0x108a5c0: bne   v1, v0, 0x108a5d0 sll   zero, zero, 0
+// 0x0108abe4: 0x108abe4: bne   v1, v0, 0x108abf4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_108a5d0
+	bne.un L_108abf4
 // --- basic block ---
-// 0x0108a5c8: 0x108a5c8: j	 0x108a5d4 sw    s1, 396(sp)
+// 0x0108abec: 0x108abec: j	 0x108abf8 sw    s1, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3975,10 +3975,10 @@ L_108a5b8:
 	add
 	ldloc 9
 	stelem.i4
-	br L_108a5d4
+	br L_108abf8
 // --- basic block ---
-L_108a5d0:
-// 0x0108a5d0: 0x108a5d0: sw    zero, 396(sp)
+L_108abf4:
+// 0x0108abf4: 0x108abf4: sw    zero, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3987,41 +3987,41 @@ L_108a5d0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108a5d4:
-// 0x0108a5d4: 0x108a5d4: lb    v1, 0(s2)
+L_108abf8:
+// 0x0108abf8: 0x108abf8: lb    v1, 0(s2)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a5d8: 0x108a5d8: addiu v0, zero, 44
+// 0x0108abfc: 0x108abfc: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0108a5dc: 0x108a5dc: bne   v1, v0, 0x108a608 lui   a3, 0x0
+// 0x0108ac00: 0x108ac00: bne   v1, v0, 0x108ac2c lui   a3, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_108a608
+	bne.un L_108ac2c
 // --- basic block ---
-// 0x0108a5e4: 0x108a5e4: lui   a1, 0x20000
+// 0x0108ac08: 0x108ac08: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a5e8: 0x108a5e8: lui   a3, 0x20000
+// 0x0108ac0c: 0x108ac0c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a5ec: 0x108a5ec: addiu a1, a1, -21512
+// 0x0108ac10: 0x108ac10: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a5f0: 0x108a5f0: addiu a3, a3, -9204
+// 0x0108ac14: 0x108ac14: addiu a3, a3, -8740
 	ldloc 4
-	ldc.i4 -9204
+	ldc.i4 -8740
 	add
 	stloc 4
-// 0x0108a5f4: 0x108a5f4: addiu a0, zero, 1
+// 0x0108ac18: 0x108ac18: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108a5f8: 0x108a5f8: jal   0x100449c addiu a2, zero, 778
+// 0x0108ac1c: 0x108ac1c: jal   0x100449c addiu a2, zero, 778
 	ldc.i4 778
 	stloc.3
 	ldloc.0
@@ -4034,18 +4034,18 @@ L_108a5d4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a600: 0x108a600: j	 0x108a65c addiu v0, s2, 1
+// 0x0108ac24: 0x108ac24: j	 0x108ac80 addiu v0, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 5
-	br L_108a65c
+	br L_108ac80
 // --- basic block ---
-L_108a608:
-// 0x0108a608: 0x108a608: addiu v0, zero, 100
+L_108ac2c:
+// 0x0108ac2c: 0x108ac2c: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x0108a60c: 0x108a60c: sw    v0, 24(sp)
+// 0x0108ac30: 0x108ac30: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4054,28 +4054,28 @@ L_108a608:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a610: 0x108a610: addu  a0, s2, zero
+// 0x0108ac34: 0x108ac34: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0108a614: 0x108a614: addiu v0, zero, 1
+// 0x0108ac38: 0x108ac38: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108a618: 0x108a618: addiu a3, a3, 28076
+// 0x0108ac3c: 0x108ac3c: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108a61c: 0x108a61c: addiu a1, sp, 400
+// 0x0108ac40: 0x108ac40: addiu a1, sp, 400
 	ldloc.0
 	ldc.i4 400
 	add
 	stloc.2
-// 0x0108a620: 0x108a620: addiu a2, sp, 24
+// 0x0108ac44: 0x108ac44: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108a624: 0x108a624: jal   0x1068250 sw    v0, 16(sp)
+// 0x0108ac48: 0x108ac48: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4089,77 +4089,77 @@ L_108a608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a62c: 0x108a62c: beq   v0, zero, 0x108a644 lui   a1, 0x20000
+// 0x0108ac50: 0x108ac50: beq   v0, zero, 0x108ac68 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a644
+	brfalse L_108ac68
 // --- basic block ---
-// 0x0108a634: 0x108a634: lb    v1, 0(v0)
+// 0x0108ac58: 0x108ac58: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a638: 0x108a638: sll   zero, zero, 0
-// 0x0108a63c: 0x108a63c: bne   v1, zero, 0x108a65c sll   zero, zero, 0
+// 0x0108ac5c: 0x108ac5c: sll   zero, zero, 0
+// 0x0108ac60: 0x108ac60: bne   v1, zero, 0x108ac80 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108a65c
+	brtrue L_108ac80
 // --- basic block ---
-L_108a644:
-// 0x0108a644: 0x108a644: lui   a3, 0x20000
+L_108ac68:
+// 0x0108ac68: 0x108ac68: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a648: 0x108a648: addiu a1, a1, -21512
+// 0x0108ac6c: 0x108ac6c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a64c: 0x108a64c: addiu a3, a3, -9140
+// 0x0108ac70: 0x108ac70: addiu a3, a3, -8676
 	ldloc 4
-	ldc.i4 -9140
+	ldc.i4 -8676
 	add
 	stloc 4
-// 0x0108a650: 0x108a650: addiu a0, zero, 4
+// 0x0108ac74: 0x108ac74: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a654: 0x108a654: j	 0x108a108 addiu a2, zero, 794
+// 0x0108ac78: 0x108ac78: j	 0x108a72c addiu a2, zero, 794
 	ldc.i4 794
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a65c:
-// 0x0108a65c: 0x108a65c: lui   a3, 0x0
+L_108ac80:
+// 0x0108ac80: 0x108ac80: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108a660: 0x108a660: addu  a0, v0, zero
+// 0x0108ac84: 0x108ac84: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a664: 0x108a664: addiu a3, a3, 30268
+// 0x0108ac88: 0x108ac88: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x0108a668: 0x108a668: addiu v0, zero, 5
+// 0x0108ac8c: 0x108ac8c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x0108a66c: 0x108a66c: addiu s1, zero, 1
+// 0x0108ac90: 0x108ac90: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0108a670: 0x108a670: addiu a1, sp, 32
+// 0x0108ac94: 0x108ac94: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0108a674: 0x108a674: addiu a2, sp, 24
+// 0x0108ac98: 0x108ac98: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108a678: 0x108a678: sw    v0, 24(sp)
+// 0x0108ac9c: 0x108ac9c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4168,7 +4168,7 @@ L_108a65c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a67c: 0x108a67c: jal   0x1068250 sw    s1, 16(sp)
+// 0x0108aca0: 0x108aca0: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4182,41 +4182,41 @@ L_108a65c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a684: 0x108a684: bne   v0, zero, 0x108a6b8 addu  s2, v0, zero
+// 0x0108aca8: 0x108aca8: bne   v0, zero, 0x108acdc addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108a6b8
+	brtrue L_108acdc
 // --- basic block ---
-// 0x0108a68c: 0x108a68c: lui   a1, 0x20000
+// 0x0108acb0: 0x108acb0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a690: 0x108a690: lui   a3, 0x20000
+// 0x0108acb4: 0x108acb4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a694: 0x108a694: addiu a1, a1, -21512
+// 0x0108acb8: 0x108acb8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a698: 0x108a698: addiu a3, a3, -9080
+// 0x0108acbc: 0x108acbc: addiu a3, a3, -8616
 	ldloc 4
-	ldc.i4 -9080
+	ldc.i4 -8616
 	add
 	stloc 4
-// 0x0108a69c: 0x108a69c: addiu a0, zero, 4
+// 0x0108acc0: 0x108acc0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a6a0: 0x108a6a0: addiu a2, zero, 811
+// 0x0108acc4: 0x108acc4: addiu a2, zero, 811
 	ldc.i4 811
 	stloc.3
-L_108a6a4:
-// 0x0108a6a4: 0x108a6a4: lw    v0, 40(sp)
+L_108acc8:
+// 0x0108acc8: 0x108acc8: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4225,7 +4225,7 @@ L_108a6a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108a6a8: 0x108a6a8: jal   0x100449c sw    v0, 16(sp)
+// 0x0108accc: 0x108accc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4244,27 +4244,27 @@ L_108a6a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a6b0: 0x108a6b0: j	 0x108a78c addiu v0, zero, 18
+// 0x0108acd4: 0x108acd4: j	 0x108adb0 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_108a78c
+	br L_108adb0
 // --- basic block ---
-L_108a6b8:
-// 0x0108a6b8: 0x108a6b8: lb    v1, 32(sp)
+L_108acdc:
+// 0x0108acdc: 0x108acdc: lb    v1, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a6bc: 0x108a6bc: addiu v0, zero, 84
+// 0x0108ace0: 0x108ace0: addiu v0, zero, 84
 	ldc.i4.s 84
 	stloc 5
-// 0x0108a6c0: 0x108a6c0: bne   v1, v0, 0x108a6d0 sll   zero, zero, 0
+// 0x0108ace4: 0x108ace4: bne   v1, v0, 0x108acf4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_108a6d0
+	bne.un L_108acf4
 // --- basic block ---
-// 0x0108a6c8: 0x108a6c8: j	 0x108a6d4 sw    s1, 392(sp)
+// 0x0108acec: 0x108acec: j	 0x108acf8 sw    s1, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4273,10 +4273,10 @@ L_108a6b8:
 	add
 	ldloc 9
 	stelem.i4
-	br L_108a6d4
+	br L_108acf8
 // --- basic block ---
-L_108a6d0:
-// 0x0108a6d0: 0x108a6d0: sw    zero, 392(sp)
+L_108acf4:
+// 0x0108acf4: 0x108acf4: sw    zero, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4285,30 +4285,30 @@ L_108a6d0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108a6d4:
-// 0x0108a6d4: 0x108a6d4: lb    a0, 0(s2)
+L_108acf8:
+// 0x0108acf8: 0x108acf8: lb    a0, 0(s2)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0108a6d8: 0x108a6d8: addiu v1, zero, 44
+// 0x0108acfc: 0x108acfc: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x0108a6dc: 0x108a6dc: beq   a0, v1, 0x108a73c addiu v0, s2, 1
+// 0x0108ad00: 0x108ad00: beq   a0, v1, 0x108ad60 addiu v0, s2, 1
 	ldloc.1
 	ldloc 7
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_108a73c
+	beq  L_108ad60
 // --- basic block ---
-// 0x0108a6e4: 0x108a6e4: addiu v0, zero, 100
+// 0x0108ad08: 0x108ad08: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x0108a6e8: 0x108a6e8: lui   a3, 0x0
+// 0x0108ad0c: 0x108ad0c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108a6ec: 0x108a6ec: sw    v0, 24(sp)
+// 0x0108ad10: 0x108ad10: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4317,28 +4317,28 @@ L_108a6d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a6f0: 0x108a6f0: addu  a0, s2, zero
+// 0x0108ad14: 0x108ad14: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0108a6f4: 0x108a6f4: addiu v0, zero, 1
+// 0x0108ad18: 0x108ad18: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108a6f8: 0x108a6f8: addiu a3, a3, 28076
+// 0x0108ad1c: 0x108ad1c: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108a6fc: 0x108a6fc: addiu a1, sp, 500
+// 0x0108ad20: 0x108ad20: addiu a1, sp, 500
 	ldloc.0
 	ldc.i4 500
 	add
 	stloc.2
-// 0x0108a700: 0x108a700: addiu a2, sp, 24
+// 0x0108ad24: 0x108ad24: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108a704: 0x108a704: jal   0x1068250 sw    v0, 16(sp)
+// 0x0108ad28: 0x108ad28: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4352,72 +4352,72 @@ L_108a6d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a70c: 0x108a70c: beq   v0, zero, 0x108a724 lui   a1, 0x20000
+// 0x0108ad30: 0x108ad30: beq   v0, zero, 0x108ad48 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a724
+	brfalse L_108ad48
 // --- basic block ---
-// 0x0108a714: 0x108a714: lb    v1, 0(v0)
+// 0x0108ad38: 0x108ad38: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108a718: 0x108a718: sll   zero, zero, 0
-// 0x0108a71c: 0x108a71c: bne   v1, zero, 0x108a73c sll   zero, zero, 0
+// 0x0108ad3c: 0x108ad3c: sll   zero, zero, 0
+// 0x0108ad40: 0x108ad40: bne   v1, zero, 0x108ad60 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108a73c
+	brtrue L_108ad60
 // --- basic block ---
-L_108a724:
-// 0x0108a724: 0x108a724: lui   a3, 0x20000
+L_108ad48:
+// 0x0108ad48: 0x108ad48: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a728: 0x108a728: addiu a1, a1, -21512
+// 0x0108ad4c: 0x108ad4c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a72c: 0x108a72c: addiu a3, a3, -9004
+// 0x0108ad50: 0x108ad50: addiu a3, a3, -8540
 	ldloc 4
-	ldc.i4 -9004
+	ldc.i4 -8540
 	add
 	stloc 4
-// 0x0108a730: 0x108a730: addiu a0, zero, 4
+// 0x0108ad54: 0x108ad54: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a734: 0x108a734: j	 0x108a108 addiu a2, zero, 840
+// 0x0108ad58: 0x108ad58: j	 0x108a72c addiu a2, zero, 840
 	ldc.i4 840
 	stloc.3
-	br L_108a108
+	br L_108a72c
 // --- basic block ---
-L_108a73c:
-// 0x0108a73c: 0x108a73c: lui   a1, 0x0
+L_108ad60:
+// 0x0108ad60: 0x108ad60: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108a740: 0x108a740: addu  a0, v0, zero
+// 0x0108ad64: 0x108ad64: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108a744: 0x108a744: addiu a1, a1, 30268
+// 0x0108ad68: 0x108ad68: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x0108a748: 0x108a748: addiu v0, zero, 1
+// 0x0108ad6c: 0x108ad6c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108a74c: 0x108a74c: addu  a2, zero, zero
+// 0x0108ad70: 0x108ad70: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a750: 0x108a750: addiu a3, sp, 600
+// 0x0108ad74: 0x108ad74: addiu a3, sp, 600
 	ldloc.0
 	ldc.i4 600
 	add
 	stloc 4
-// 0x0108a754: 0x108a754: jal   0x106855c sw    v0, 16(sp)
+// 0x0108ad78: 0x108ad78: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4431,46 +4431,46 @@ L_108a73c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a75c: 0x108a75c: addu  s2, v0, zero
+// 0x0108ad80: 0x108ad80: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108a760: 0x108a760: bne   v0, zero, 0x108a794 addiu a1, sp, 40
+// 0x0108ad84: 0x108ad84: bne   v0, zero, 0x108adb8 addiu a1, sp, 40
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-	brtrue L_108a794
+	brtrue L_108adb8
 // --- basic block ---
-// 0x0108a768: 0x108a768: lui   a1, 0x20000
+// 0x0108ad8c: 0x108ad8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a76c: 0x108a76c: lui   a3, 0x20000
+// 0x0108ad90: 0x108ad90: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a770: 0x108a770: addiu a1, a1, -21512
+// 0x0108ad94: 0x108ad94: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a774: 0x108a774: addiu a3, a3, -8936
+// 0x0108ad98: 0x108ad98: addiu a3, a3, -8472
 	ldloc 4
-	ldc.i4 -8936
+	ldc.i4 -8472
 	add
 	stloc 4
-// 0x0108a778: 0x108a778: addiu a0, zero, 4
+// 0x0108ad9c: 0x108ad9c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a77c: 0x108a77c: addiu a2, zero, 857
+// 0x0108ada0: 0x108ada0: addiu a2, zero, 857
 	ldc.i4 857
 	stloc.3
-L_108a780:
-// 0x0108a780: 0x108a780: jal   0x100449c sll   zero, zero, 0
+L_108ada4:
+// 0x0108ada4: 0x108ada4: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4481,24 +4481,24 @@ L_108a780:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a788: 0x108a788: addiu v0, zero, 18
+// 0x0108adac: 0x108adac: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_108a78c:
-// 0x0108a78c: 0x108a78c: j	 0x108a7f4 sw    v0, 0(s0)
+L_108adb0:
+// 0x0108adb0: 0x108adb0: j	 0x108ae18 sw    v0, 0(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_108a7f4
+	br L_108ae18
 // --- basic block ---
-L_108a794:
-// 0x0108a794: 0x108a794: addu  a0, a1, zero
+L_108adb8:
+// 0x0108adb8: 0x108adb8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0108a798: 0x108a798: sw    a1, 608(sp)
+// 0x0108adbc: 0x108adbc: sw    a1, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4507,7 +4507,7 @@ L_108a794:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108a79c: 0x108a79c: jal   0x108b558 addiu s3, s3, 280
+// 0x0108adc0: 0x108adc0: jal   0x108bb7c addiu s3, s3, 280
 	ldloc 11
 	ldc.i4 280
 	add
@@ -4517,12 +4517,12 @@ L_108a794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUserLocation_CreateGUIID_108b558(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUserLocation_CreateGUIID_108bb7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a7a4: 0x108a7a4: lw    a1, 608(sp)
+// 0x0108adc8: 0x108adc8: lw    a1, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4531,7 +4531,7 @@ L_108a794:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108a7a8: 0x108a7a8: jal   0x108b93c addu  a0, s3, zero
+// 0x0108adcc: 0x108adcc: jal   0x108bf60 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4539,16 +4539,16 @@ L_108a794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_UpdateOrAdd_108b93c(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_UpdateOrAdd_108bf60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a7b0: 0x108a7b0: bne   v0, zero, 0x108a7f4 sll   zero, zero, 0
+// 0x0108add4: 0x108add4: bne   v0, zero, 0x108ae18 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_108a7f4
+	brtrue L_108ae18
 // --- basic block ---
-// 0x0108a7b8: 0x108a7b8: lw    s1, 40(sp)
+// 0x0108addc: 0x108addc: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4557,36 +4557,36 @@ L_108a794:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108a7bc: 0x108a7bc: jal   0x108b1d4 addu  a0, s3, zero
+// 0x0108ade0: 0x108ade0: jal   0x108b7f8 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl104::RTUsers_Count_108b1d4(int32)
+	call int32 Cibyl104::RTUsers_Count_108b7f8(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108a7c4: 0x108a7c4: lui   a1, 0x20000
+// 0x0108ade8: 0x108ade8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a7c8: 0x108a7c8: lui   a3, 0x20000
+// 0x0108adec: 0x108adec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a7cc: 0x108a7cc: addiu a1, a1, -21512
+// 0x0108adf0: 0x108adf0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a7d0: 0x108a7d0: addiu a3, a3, -8868
+// 0x0108adf4: 0x108adf4: addiu a3, a3, -8404
 	ldloc 4
-	ldc.i4 -8868
+	ldc.i4 -8404
 	add
 	stloc 4
-// 0x0108a7d4: 0x108a7d4: addiu a0, zero, 4
+// 0x0108adf8: 0x108adf8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a7d8: 0x108a7d8: addiu a2, zero, 869
+// 0x0108adfc: 0x108adfc: addiu a2, zero, 869
 	ldc.i4 869
 	stloc.3
-// 0x0108a7dc: 0x108a7dc: sw    v0, 20(sp)
+// 0x0108ae00: 0x108ae00: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4595,7 +4595,7 @@ L_108a794:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a7e0: 0x108a7e0: jal   0x100449c sw    s1, 16(sp)
+// 0x0108ae04: 0x108ae04: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4614,26 +4614,26 @@ L_108a794:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a7e8: 0x108a7e8: addiu v0, zero, 8
+// 0x0108ae0c: 0x108ae0c: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-L_108a7ec:
-// 0x0108a7ec: 0x108a7ec: sw    v0, 0(s0)
+L_108ae10:
+// 0x0108ae10: 0x108ae10: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108a7f0: 0x108a7f0: addu  s2, zero, zero
+// 0x0108ae14: 0x108ae14: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_108a7f4:
-// 0x0108a7f4: 0x108a7f4: lw    ra, 636(sp)
-// 0x0108a7f8: 0x108a7f8: addu  v0, s2, zero
+L_108ae18:
+// 0x0108ae18: 0x108ae18: lw    ra, 636(sp)
+// 0x0108ae1c: 0x108ae1c: addu  v0, s2, zero
 	ldloc 8
 	stloc 5
-// 0x0108a7fc: 0x108a7fc: lw    s4, 632(sp)
+// 0x0108ae20: 0x108ae20: lw    s4, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4642,7 +4642,7 @@ L_108a7f4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108a800: 0x108a800: lw    s3, 628(sp)
+// 0x0108ae24: 0x108ae24: lw    s3, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4651,7 +4651,7 @@ L_108a7f4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108a804: 0x108a804: lw    s2, 624(sp)
+// 0x0108ae28: 0x108ae28: lw    s2, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4660,7 +4660,7 @@ L_108a7f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108a808: 0x108a808: lw    s1, 620(sp)
+// 0x0108ae2c: 0x108ae2c: lw    s1, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4669,7 +4669,7 @@ L_108a7f4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108a80c: 0x108a80c: lw    s0, 616(sp)
+// 0x0108ae30: 0x108ae30: lw    s0, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4678,7 +4678,7 @@ L_108a7f4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108a810: 0x108a810: jr    ra addiu sp, sp, 640
+// 0x0108ae34: 0x108ae34: jr    ra addiu sp, sp, 640
 	ldloc.0
 	ldc.i4 640
 	add
@@ -4690,7 +4690,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 VerifyStatus_108a818(int32,int32,int32,int32,int32)
+.method public static int32 VerifyStatus_108ae3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4734,13 +4734,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108a818:
-// 0x0108a818: 0x108a818: addiu sp, sp, -112
+L_108ae3c:
+// 0x0108ae3c: 0x108ae3c: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x0108a81c: 0x108a81c: sw    s2, 104(sp)
+// 0x0108ae40: 0x108ae40: sw    s2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4749,7 +4749,7 @@ L_108a818:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108a820: 0x108a820: sw    s1, 100(sp)
+// 0x0108ae44: 0x108ae44: sw    s1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4758,7 +4758,7 @@ L_108a818:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108a824: 0x108a824: sw    s0, 96(sp)
+// 0x0108ae48: 0x108ae48: sw    s0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4767,8 +4767,8 @@ L_108a818:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108a828: 0x108a828: sw    ra, 108(sp)
-// 0x0108a82c: 0x108a82c: sw    zero, 24(sp)
+// 0x0108ae4c: 0x108ae4c: sw    ra, 108(sp)
+// 0x0108ae50: 0x108ae50: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4777,26 +4777,26 @@ L_108a818:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108a830: 0x108a830: lb    v0, 0(a0)
+// 0x0108ae54: 0x108ae54: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108a834: 0x108a834: addu  s0, a0, zero
+// 0x0108ae58: 0x108ae58: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108a838: 0x108a838: addu  s2, a2, zero
+// 0x0108ae5c: 0x108ae5c: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0108a83c: 0x108a83c: bne   v0, zero, 0x108a870 addu  s1, a3, zero
+// 0x0108ae60: 0x108ae60: bne   v0, zero, 0x108ae94 addu  s1, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 9
-	brtrue L_108a870
+	brtrue L_108ae94
 // --- basic block ---
-// 0x0108a844: 0x108a844: addiu v0, zero, 18
+// 0x0108ae68: 0x108ae68: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0108a848: 0x108a848: jal   0x1001b48 sw    v0, 0(a3)
+// 0x0108ae6c: 0x108ae6c: jal   0x1001b48 sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4809,29 +4809,29 @@ L_108a818:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a850: 0x108a850: lui   a1, 0x20000
+// 0x0108ae74: 0x108ae74: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a854: 0x108a854: lui   a3, 0x20000
+// 0x0108ae78: 0x108ae78: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a858: 0x108a858: addiu a1, a1, -21512
+// 0x0108ae7c: 0x108ae7c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a85c: 0x108a85c: addiu a3, a3, -8752
+// 0x0108ae80: 0x108ae80: addiu a3, a3, -8288
 	ldloc 4
-	ldc.i4 -8752
+	ldc.i4 -8288
 	add
 	stloc 4
-// 0x0108a860: 0x108a860: addiu a0, zero, 4
+// 0x0108ae84: 0x108ae84: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a864: 0x108a864: addiu a2, zero, 68
+// 0x0108ae88: 0x108ae88: addiu a2, zero, 68
 	ldc.i4.s 68
 	stloc.3
-// 0x0108a868: 0x108a868: j	 0x108a8d0 sw    v0, 16(sp)
+// 0x0108ae8c: 0x108ae8c: j	 0x108aef4 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4840,21 +4840,21 @@ L_108a818:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108a8d0
+	br L_108aef4
 // --- basic block ---
-L_108a870:
-// 0x0108a870: 0x108a870: addiu a0, sp, 28
+L_108ae94:
+// 0x0108ae94: 0x108ae94: addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x0108a874: 0x108a874: addu  a1, s0, zero
+// 0x0108ae98: 0x108ae98: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0108a878: 0x108a878: addu  a2, zero, zero
+// 0x0108ae9c: 0x108ae9c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108a87c: 0x108a87c: jal   0x1068fe8 addiu a3, sp, 24
+// 0x0108aea0: 0x108aea0: jal   0x1068ff8 addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4864,81 +4864,81 @@ L_108a870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::http_response_status_load_1068fe8(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::http_response_status_load_1068ff8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a884: 0x108a884: addiu a0, zero, 1
+// 0x0108aea8: 0x108aea8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108a888: 0x108a888: beq   v0, a0, 0x108a8a0 addiu v1, zero, 2
+// 0x0108aeac: 0x108aeac: beq   v0, a0, 0x108aec4 addiu v1, zero, 2
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	stloc 7
-	beq  L_108a8a0
+	beq  L_108aec4
 // --- basic block ---
-// 0x0108a890: 0x108a890: bne   v0, v1, 0x108a8e0 sll   zero, zero, 0
+// 0x0108aeb4: 0x108aeb4: bne   v0, v1, 0x108af04 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_108a8e0
+	bne.un L_108af04
 // --- basic block ---
-// 0x0108a898: 0x108a898: j	 0x108a95c sw    a0, 0(s2)
+// 0x0108aebc: 0x108aebc: j	 0x108af80 sw    a0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-	br L_108a95c
+	br L_108af80
 // --- basic block ---
-L_108a8a0:
-// 0x0108a8a0: 0x108a8a0: lw    v0, 0(s1)
+L_108aec4:
+// 0x0108aec4: 0x108aec4: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108a8a4: 0x108a8a4: sll   zero, zero, 0
-// 0x0108a8a8: 0x108a8a8: bne   v0, zero, 0x108a8b4 addiu v0, zero, 18
+// 0x0108aec8: 0x108aec8: sll   zero, zero, 0
+// 0x0108aecc: 0x108aecc: bne   v0, zero, 0x108aed8 addiu v0, zero, 18
 	ldloc 5
 	ldc.i4.s 18
 	stloc 5
-	brtrue L_108a8b4
+	brtrue L_108aed8
 // --- basic block ---
-// 0x0108a8b0: 0x108a8b0: sw    v0, 0(s1)
+// 0x0108aed4: 0x108aed4: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_108a8b4:
-// 0x0108a8b4: 0x108a8b4: lui   a1, 0x20000
+L_108aed8:
+// 0x0108aed8: 0x108aed8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a8b8: 0x108a8b8: lui   a3, 0x20000
+// 0x0108aedc: 0x108aedc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a8bc: 0x108a8bc: addiu a1, a1, -21512
+// 0x0108aee0: 0x108aee0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a8c0: 0x108a8c0: addiu a3, a3, -8704
+// 0x0108aee4: 0x108aee4: addiu a3, a3, -8240
 	ldloc 4
-	ldc.i4 -8704
+	ldc.i4 -8240
 	add
 	stloc 4
-// 0x0108a8c4: 0x108a8c4: addiu a0, zero, 4
+// 0x0108aee8: 0x108aee8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a8c8: 0x108a8c8: addiu a2, zero, 84
+// 0x0108aeec: 0x108aeec: addiu a2, zero, 84
 	ldc.i4.s 84
 	stloc.3
-// 0x0108a8cc: 0x108a8cc: sw    s0, 16(sp)
+// 0x0108aef0: 0x108aef0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4947,8 +4947,8 @@ L_108a8b4:
 	add
 	ldloc 8
 	stelem.i4
-L_108a8d0:
-// 0x0108a8d0: 0x108a8d0: jal   0x100449c addu  s0, zero, zero
+L_108aef4:
+// 0x0108aef4: 0x108aef4: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -4961,11 +4961,11 @@ L_108a8d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a8d8: 0x108a8d8: j	 0x108a95c sll   zero, zero, 0
-	br L_108a95c
+// 0x0108aefc: 0x108aefc: j	 0x108af80 sll   zero, zero, 0
+	br L_108af80
 // --- basic block ---
-L_108a8e0:
-// 0x0108a8e0: 0x108a8e0: lw    v0, 28(sp)
+L_108af04:
+// 0x0108af04: 0x108af04: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4974,71 +4974,71 @@ L_108a8e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108a8e4: 0x108a8e4: addiu a0, zero, 200
+// 0x0108af08: 0x108af08: addiu a0, zero, 200
 	ldc.i4 200
 	stloc.1
-// 0x0108a8e8: 0x108a8e8: beq   v0, a0, 0x108a950 addiu a0, zero, 501
+// 0x0108af0c: 0x108af0c: beq   v0, a0, 0x108af74 addiu a0, zero, 501
 	ldloc 5
 	ldloc.1
 	ldc.i4 501
 	stloc.1
-	beq  L_108a950
+	beq  L_108af74
 // --- basic block ---
-// 0x0108a8f0: 0x108a8f0: beq   v0, a0, 0x108a918 sll   zero, zero, 0
+// 0x0108af14: 0x108af14: beq   v0, a0, 0x108af3c sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	beq  L_108a918
+	beq  L_108af3c
 // --- basic block ---
-// 0x0108a8f8: 0x108a8f8: addiu a0, zero, 600
+// 0x0108af1c: 0x108af1c: addiu a0, zero, 600
 	ldc.i4 600
 	stloc.1
-// 0x0108a8fc: 0x108a8fc: beq   v0, a0, 0x108a920 sll   zero, zero, 0
+// 0x0108af20: 0x108af20: beq   v0, a0, 0x108af44 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	beq  L_108a920
+	beq  L_108af44
 // --- basic block ---
-// 0x0108a904: 0x108a904: addiu a0, zero, 2002
+// 0x0108af28: 0x108af28: addiu a0, zero, 2002
 	ldc.i4 2002
 	stloc.1
-// 0x0108a908: 0x108a908: bne   v0, a0, 0x108a924 sll   zero, zero, 0
+// 0x0108af2c: 0x108af2c: bne   v0, a0, 0x108af48 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_108a924
+	bne.un L_108af48
 // --- basic block ---
-// 0x0108a910: 0x108a910: j	 0x108a950 sw    v1, 0(s1)
+// 0x0108af34: 0x108af34: j	 0x108af74 sw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_108a950
+	br L_108af74
 // --- basic block ---
-L_108a918:
-// 0x0108a918: 0x108a918: j	 0x108a924 addiu v1, zero, 27
+L_108af3c:
+// 0x0108af3c: 0x108af3c: j	 0x108af48 addiu v1, zero, 27
 	ldc.i4.s 27
 	stloc 7
-	br L_108a924
+	br L_108af48
 // --- basic block ---
-L_108a920:
-// 0x0108a920: 0x108a920: addiu v1, zero, 38
+L_108af44:
+// 0x0108af44: 0x108af44: addiu v1, zero, 38
 	ldc.i4.s 38
 	stloc 7
-L_108a924:
-// 0x0108a924: 0x108a924: sw    v1, 0(s1)
+L_108af48:
+// 0x0108af48: 0x108af48: sw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0108a928: 0x108a928: lui   a1, 0x20000
+// 0x0108af4c: 0x108af4c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a92c: 0x108a92c: lui   a3, 0x20000
+// 0x0108af50: 0x108af50: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108a930: 0x108a930: sw    v0, 16(sp)
+// 0x0108af54: 0x108af54: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5047,28 +5047,28 @@ L_108a924:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108a934: 0x108a934: addiu v0, sp, 32
+// 0x0108af58: 0x108af58: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0108a938: 0x108a938: addiu a1, a1, -21512
+// 0x0108af5c: 0x108af5c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108a93c: 0x108a93c: addiu a3, a3, -8648
+// 0x0108af60: 0x108af60: addiu a3, a3, -8184
 	ldloc 4
-	ldc.i4 -8648
+	ldc.i4 -8184
 	add
 	stloc 4
-// 0x0108a940: 0x108a940: addiu a0, zero, 4
+// 0x0108af64: 0x108af64: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108a944: 0x108a944: addiu a2, zero, 115
+// 0x0108af68: 0x108af68: addiu a2, zero, 115
 	ldc.i4.s 115
 	stloc.3
-// 0x0108a948: 0x108a948: j	 0x108a8d0 sw    v0, 20(sp)
+// 0x0108af6c: 0x108af6c: j	 0x108aef4 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5077,10 +5077,10 @@ L_108a924:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108a8d0
+	br L_108aef4
 // --- basic block ---
-L_108a950:
-// 0x0108a950: 0x108a950: lw    v0, 24(sp)
+L_108af74:
+// 0x0108af74: 0x108af74: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5089,18 +5089,18 @@ L_108a950:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108a954: 0x108a954: sll   zero, zero, 0
-// 0x0108a958: 0x108a958: addu  s0, s0, v0
+// 0x0108af78: 0x108af78: sll   zero, zero, 0
+// 0x0108af7c: 0x108af7c: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_108a95c:
-// 0x0108a95c: 0x108a95c: lw    ra, 108(sp)
-// 0x0108a960: 0x108a960: addu  v0, s0, zero
+L_108af80:
+// 0x0108af80: 0x108af80: lw    ra, 108(sp)
+// 0x0108af84: 0x108af84: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0108a964: 0x108a964: lw    s2, 104(sp)
+// 0x0108af88: 0x108af88: lw    s2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5109,7 +5109,7 @@ L_108a95c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108a968: 0x108a968: lw    s1, 100(sp)
+// 0x0108af8c: 0x108af8c: lw    s1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5118,7 +5118,7 @@ L_108a95c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108a96c: 0x108a96c: lw    s0, 96(sp)
+// 0x0108af90: 0x108af90: lw    s0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5127,7 +5127,7 @@ L_108a95c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108a970: 0x108a970: jr    ra addiu sp, sp, 112
+// 0x0108af94: 0x108af94: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -5139,7 +5139,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 VerifyStatusAndTag_108a978(int32,int32,int32,int32,int32)
+.method public static int32 VerifyStatusAndTag_108af9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 ra)
@@ -5192,12 +5192,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108a978: 0x108a978: addiu sp, sp, -168
+// 0x0108af9c: 0x108af9c: addiu sp, sp, -168
 	ldloc.0
 	ldc.i4 -168
 	add
 	stloc.0
-// 0x0108a97c: 0x108a97c: sw    s1, 144(sp)
+// 0x0108afa0: 0x108afa0: sw    s1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5206,7 +5206,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108a980: 0x108a980: lw    s1, 184(sp)
+// 0x0108afa4: 0x108afa4: lw    s1, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5215,7 +5215,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108a984: 0x108a984: sw    s3, 152(sp)
+// 0x0108afa8: 0x108afa8: sw    s3, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5224,7 +5224,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108a988: 0x108a988: sw    s2, 148(sp)
+// 0x0108afac: 0x108afac: sw    s2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5233,7 +5233,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108a98c: 0x108a98c: sw    s0, 140(sp)
+// 0x0108afb0: 0x108afb0: sw    s0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5242,8 +5242,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108a990: 0x108a990: sw    ra, 164(sp)
-// 0x0108a994: 0x108a994: sw    s5, 160(sp)
+// 0x0108afb4: 0x108afb4: sw    ra, 164(sp)
+// 0x0108afb8: 0x108afb8: sw    s5, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5252,7 +5252,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108a998: 0x108a998: sw    s4, 156(sp)
+// 0x0108afbc: 0x108afbc: sw    s4, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5261,16 +5261,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108a99c: 0x108a99c: addu  s2, a2, zero
+// 0x0108afc0: 0x108afc0: addu  s2, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0108a9a0: 0x108a9a0: addu  s0, a0, zero
+// 0x0108afc4: 0x108afc4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108a9a4: 0x108a9a4: addu  s3, a3, zero
+// 0x0108afc8: 0x108afc8: addu  s3, a3, zero
 	ldloc 4
 	stloc 10
-// 0x0108a9a8: 0x108a9a8: sw    zero, 24(sp)
+// 0x0108afcc: 0x108afcc: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5279,7 +5279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108a9ac: 0x108a9ac: beq   a2, zero, 0x108a9d8 sw    zero, 0(s1)
+// 0x0108afd0: 0x108afd0: beq   a2, zero, 0x108affc sw    zero, 0(s1)
 	ldloc.3
 	ldloc 6
 	ldloc 9
@@ -5287,25 +5287,25 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_108a9d8
+	brfalse L_108affc
 // --- basic block ---
-// 0x0108a9b4: 0x108a9b4: lb    v0, 0(a2)
+// 0x0108afd8: 0x108afd8: lb    v0, 0(a2)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108a9b8: 0x108a9b8: sll   zero, zero, 0
-// 0x0108a9bc: 0x108a9bc: beq   v0, zero, 0x108a9d8 lui   a1, 0x20000
+// 0x0108afdc: 0x108afdc: sll   zero, zero, 0
+// 0x0108afe0: 0x108afe0: beq   v0, zero, 0x108affc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108a9d8
+	brfalse L_108affc
 // --- basic block ---
-// 0x0108a9c4: 0x108a9c4: addiu a1, a1, -8600
+// 0x0108afe8: 0x108afe8: addiu a1, a1, -8136
 	ldloc.2
-	ldc.i4 -8600
+	ldc.i4 -8136
 	add
 	stloc.2
-// 0x0108a9c8: 0x108a9c8: jal   0x1001b14 addu  a0, a2, zero
+// 0x0108afec: 0x108afec: jal   0x1001b14 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.1
@@ -5313,33 +5313,33 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108a9d0: 0x108a9d0: j	 0x108a9dc sltiu s4, v0, 1
+// 0x0108aff4: 0x108aff4: j	 0x108b000 sltiu s4, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 12
-	br L_108a9dc
+	br L_108b000
 // --- basic block ---
-L_108a9d8:
-// 0x0108a9d8: 0x108a9d8: addu  s4, zero, zero
+L_108affc:
+// 0x0108affc: 0x108affc: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-L_108a9dc:
-// 0x0108a9dc: 0x108a9dc: lb    v0, 0(s0)
+L_108b000:
+// 0x0108b000: 0x108b000: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108a9e0: 0x108a9e0: sll   zero, zero, 0
-// 0x0108a9e4: 0x108a9e4: bne   v0, zero, 0x108aa18 addiu v0, zero, 18
+// 0x0108b004: 0x108b004: sll   zero, zero, 0
+// 0x0108b008: 0x108b008: bne   v0, zero, 0x108b03c addiu v0, zero, 18
 	ldloc 5
 	ldc.i4.s 18
 	stloc 5
-	brtrue L_108aa18
+	brtrue L_108b03c
 // --- basic block ---
-// 0x0108a9ec: 0x108a9ec: addu  a0, s0, zero
+// 0x0108b010: 0x108b010: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108a9f0: 0x108a9f0: jal   0x1001b48 sw    v0, 0(s1)
+// 0x0108b014: 0x108b014: jal   0x1001b48 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5352,29 +5352,29 @@ L_108a9dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108a9f8: 0x108a9f8: lui   a1, 0x20000
+// 0x0108b01c: 0x108b01c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108a9fc: 0x108a9fc: lui   a3, 0x20000
+// 0x0108b020: 0x108b020: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108aa00: 0x108aa00: addiu a1, a1, -21512
+// 0x0108b024: 0x108b024: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108aa04: 0x108aa04: addiu a3, a3, -8584
+// 0x0108b028: 0x108b028: addiu a3, a3, -8120
 	ldloc 4
-	ldc.i4 -8584
+	ldc.i4 -8120
 	add
 	stloc 4
-// 0x0108aa08: 0x108aa08: addiu a0, zero, 4
+// 0x0108b02c: 0x108b02c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108aa0c: 0x108aa0c: addiu a2, zero, 150
+// 0x0108b030: 0x108b030: addiu a2, zero, 150
 	ldc.i4 150
 	stloc.3
-// 0x0108aa10: 0x108aa10: j	 0x108abe8 sw    v0, 16(sp)
+// 0x0108b034: 0x108b034: j	 0x108b20c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5383,21 +5383,21 @@ L_108a9dc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108abe8
+	br L_108b20c
 // --- basic block ---
-L_108aa18:
-// 0x0108aa18: 0x108aa18: addiu a0, sp, 64
+L_108b03c:
+// 0x0108b03c: 0x108b03c: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x0108aa1c: 0x108aa1c: addu  a1, s0, zero
+// 0x0108b040: 0x108b040: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0108aa20: 0x108aa20: addiu a2, zero, 1
+// 0x0108b044: 0x108b044: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0108aa24: 0x108aa24: jal   0x1068fe8 addiu a3, sp, 24
+// 0x0108b048: 0x108b048: jal   0x1068ff8 addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5407,84 +5407,84 @@ L_108aa18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::http_response_status_load_1068fe8(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::http_response_status_load_1068ff8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108aa2c: 0x108aa2c: addiu s5, zero, 1
+// 0x0108b050: 0x108b050: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x0108aa30: 0x108aa30: beq   v0, s5, 0x108aa48 addiu v1, zero, 2
+// 0x0108b054: 0x108b054: beq   v0, s5, 0x108b06c addiu v1, zero, 2
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	stloc 7
-	beq  L_108aa48
+	beq  L_108b06c
 // --- basic block ---
-// 0x0108aa38: 0x108aa38: bne   v0, v1, 0x108aa80 addiu a0, zero, 200
+// 0x0108b05c: 0x108b05c: bne   v0, v1, 0x108b0a4 addiu a0, zero, 200
 	ldloc 5
 	ldloc 7
 	ldc.i4 200
 	stloc.1
-	bne.un L_108aa80
+	bne.un L_108b0a4
 // --- basic block ---
-// 0x0108aa40: 0x108aa40: j	 0x108abf0 sw    s5, 0(s3)
+// 0x0108b064: 0x108b064: j	 0x108b214 sw    s5, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-	br L_108abf0
+	br L_108b214
 // --- basic block ---
-L_108aa48:
-// 0x0108aa48: 0x108aa48: lw    v0, 0(s1)
+L_108b06c:
+// 0x0108b06c: 0x108b06c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108aa4c: 0x108aa4c: sll   zero, zero, 0
-// 0x0108aa50: 0x108aa50: bne   v0, zero, 0x108aa5c sll   zero, zero, 0
+// 0x0108b070: 0x108b070: sll   zero, zero, 0
+// 0x0108b074: 0x108b074: bne   v0, zero, 0x108b080 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_108aa5c
+	brtrue L_108b080
 // --- basic block ---
-// 0x0108aa58: 0x108aa58: addiu v0, zero, 18
+// 0x0108b07c: 0x108b07c: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_108aa5c:
-// 0x0108aa5c: 0x108aa5c: lui   a1, 0x20000
+L_108b080:
+// 0x0108b080: 0x108b080: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108aa60: 0x108aa60: lui   a3, 0x20000
+// 0x0108b084: 0x108b084: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108aa64: 0x108aa64: sw    v0, 0(s1)
+// 0x0108b088: 0x108b088: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108aa68: 0x108aa68: addiu a1, a1, -21512
+// 0x0108b08c: 0x108b08c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108aa6c: 0x108aa6c: addiu a3, a3, -8524
+// 0x0108b090: 0x108b090: addiu a3, a3, -8060
 	ldloc 4
-	ldc.i4 -8524
+	ldc.i4 -8060
 	add
 	stloc 4
-// 0x0108aa70: 0x108aa70: addiu a0, zero, 4
+// 0x0108b094: 0x108b094: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108aa74: 0x108aa74: addiu a2, zero, 165
+// 0x0108b098: 0x108b098: addiu a2, zero, 165
 	ldc.i4 165
 	stloc.3
-// 0x0108aa78: 0x108aa78: j	 0x108abe8 sw    s0, 16(sp)
+// 0x0108b09c: 0x108b09c: j	 0x108b20c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5493,10 +5493,10 @@ L_108aa5c:
 	add
 	ldloc 8
 	stelem.i4
-	br L_108abe8
+	br L_108b20c
 // --- basic block ---
-L_108aa80:
-// 0x0108aa80: 0x108aa80: lw    v0, 64(sp)
+L_108b0a4:
+// 0x0108b0a4: 0x108b0a4: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5505,47 +5505,47 @@ L_108aa80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108aa84: 0x108aa84: sll   zero, zero, 0
-// 0x0108aa88: 0x108aa88: beq   v0, a0, 0x108aad8 addiu a0, zero, 501
+// 0x0108b0a8: 0x108b0a8: sll   zero, zero, 0
+// 0x0108b0ac: 0x108b0ac: beq   v0, a0, 0x108b0fc addiu a0, zero, 501
 	ldloc 5
 	ldloc.1
 	ldc.i4 501
 	stloc.1
-	beq  L_108aad8
+	beq  L_108b0fc
 // --- basic block ---
-// 0x0108aa90: 0x108aa90: bne   v0, a0, 0x108aaa0 sll   zero, zero, 0
+// 0x0108b0b4: 0x108b0b4: bne   v0, a0, 0x108b0c4 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_108aaa0
+	bne.un L_108b0c4
 // --- basic block ---
-// 0x0108aa98: 0x108aa98: j	 0x108aaac addiu v1, zero, 27
+// 0x0108b0bc: 0x108b0bc: j	 0x108b0d0 addiu v1, zero, 27
 	ldc.i4.s 27
 	stloc 7
-	br L_108aaac
+	br L_108b0d0
 // --- basic block ---
-L_108aaa0:
-// 0x0108aaa0: 0x108aaa0: beq   s4, zero, 0x108aaac sll   zero, zero, 0
+L_108b0c4:
+// 0x0108b0c4: 0x108b0c4: beq   s4, zero, 0x108b0d0 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_108aaac
+	brfalse L_108b0d0
 // --- basic block ---
-// 0x0108aaa8: 0x108aaa8: addiu v1, zero, 24
+// 0x0108b0cc: 0x108b0cc: addiu v1, zero, 24
 	ldc.i4.s 24
 	stloc 7
-L_108aaac:
-// 0x0108aaac: 0x108aaac: sw    v1, 0(s1)
+L_108b0d0:
+// 0x0108b0d0: 0x108b0d0: sw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0108aab0: 0x108aab0: lui   a1, 0x20000
+// 0x0108b0d4: 0x108b0d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108aab4: 0x108aab4: lui   a3, 0x20000
+// 0x0108b0d8: 0x108b0d8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108aab8: 0x108aab8: sw    v0, 16(sp)
+// 0x0108b0dc: 0x108b0dc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5554,28 +5554,28 @@ L_108aaac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108aabc: 0x108aabc: addiu v0, sp, 68
+// 0x0108b0e0: 0x108b0e0: addiu v0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 5
-// 0x0108aac0: 0x108aac0: addiu a1, a1, -21512
+// 0x0108b0e4: 0x108b0e4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108aac4: 0x108aac4: addiu a3, a3, -8456
+// 0x0108b0e8: 0x108b0e8: addiu a3, a3, -7992
 	ldloc 4
-	ldc.i4 -8456
+	ldc.i4 -7992
 	add
 	stloc 4
-// 0x0108aac8: 0x108aac8: addiu a0, zero, 4
+// 0x0108b0ec: 0x108b0ec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108aacc: 0x108aacc: addiu a2, zero, 192
+// 0x0108b0f0: 0x108b0f0: addiu a2, zero, 192
 	ldc.i4 192
 	stloc.3
-// 0x0108aad0: 0x108aad0: j	 0x108abe8 sw    v0, 20(sp)
+// 0x0108b0f4: 0x108b0f4: j	 0x108b20c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5584,10 +5584,10 @@ L_108aaac:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108abe8
+	br L_108b20c
 // --- basic block ---
-L_108aad8:
-// 0x0108aad8: 0x108aad8: lw    v0, 24(sp)
+L_108b0fc:
+// 0x0108b0fc: 0x108b0fc: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5596,18 +5596,18 @@ L_108aad8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108aadc: 0x108aadc: beq   s2, zero, 0x108abf0 addu  s0, s0, v0
+// 0x0108b100: 0x108b100: beq   s2, zero, 0x108b214 addu  s0, s0, v0
 	ldloc 11
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-	brfalse L_108abf0
+	brfalse L_108b214
 // --- basic block ---
-// 0x0108aae4: 0x108aae4: addu  a0, s0, zero
+// 0x0108b108: 0x108b108: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108aae8: 0x108aae8: jal   0x1001a5c addiu a1, zero, 10
+// 0x0108b10c: 0x108b10c: jal   0x1001a5c addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
 	ldloc.1
@@ -5617,34 +5617,34 @@ L_108aad8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108aaf0: 0x108aaf0: bne   v0, zero, 0x108ab00 addiu v0, zero, 31
+// 0x0108b114: 0x108b114: bne   v0, zero, 0x108b124 addiu v0, zero, 31
 	ldloc 5
 	ldc.i4.s 31
 	stloc 5
-	brtrue L_108ab00
+	brtrue L_108b124
 // --- basic block ---
-// 0x0108aaf8: 0x108aaf8: j	 0x108abf0 sw    s5, 0(s3)
+// 0x0108b11c: 0x108b11c: j	 0x108b214 sw    s5, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-	br L_108abf0
+	br L_108b214
 // --- basic block ---
-L_108ab00:
-// 0x0108ab00: 0x108ab00: addiu s3, sp, 32
+L_108b124:
+// 0x0108b124: 0x108b124: addiu s3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x0108ab04: 0x108ab04: lui   a3, 0x0
+// 0x0108b128: 0x108b128: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108ab08: 0x108ab08: addu  a0, s0, zero
+// 0x0108b12c: 0x108b12c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108ab0c: 0x108ab0c: sw    v0, 28(sp)
+// 0x0108b130: 0x108b130: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5653,23 +5653,23 @@ L_108ab00:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108ab10: 0x108ab10: addiu a3, a3, 30268
+// 0x0108b134: 0x108b134: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x0108ab14: 0x108ab14: addiu v0, zero, -1
+// 0x0108b138: 0x108b138: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108ab18: 0x108ab18: addu  a1, s3, zero
+// 0x0108b13c: 0x108b13c: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x0108ab1c: 0x108ab1c: addiu a2, sp, 28
+// 0x0108b140: 0x108b140: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x0108ab20: 0x108ab20: jal   0x1068250 sw    v0, 16(sp)
+// 0x0108b144: 0x108b144: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5683,47 +5683,47 @@ L_108ab00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ab28: 0x108ab28: bne   v0, zero, 0x108ab5c addu  s0, v0, zero
+// 0x0108b14c: 0x108b14c: bne   v0, zero, 0x108b180 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_108ab5c
+	brtrue L_108b180
 // --- basic block ---
-// 0x0108ab30: 0x108ab30: addiu v0, zero, 18
+// 0x0108b154: 0x108b154: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0108ab34: 0x108ab34: lui   a1, 0x20000
+// 0x0108b158: 0x108b158: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108ab38: 0x108ab38: lui   a3, 0x20000
+// 0x0108b15c: 0x108b15c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ab3c: 0x108ab3c: sw    v0, 0(s1)
+// 0x0108b160: 0x108b160: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108ab40: 0x108ab40: addiu a1, a1, -21512
+// 0x0108b164: 0x108b164: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108ab44: 0x108ab44: addiu a3, a3, -8396
+// 0x0108b168: 0x108b168: addiu a3, a3, -7932
 	ldloc 4
-	ldc.i4 -8396
+	ldc.i4 -7932
 	add
 	stloc 4
-// 0x0108ab48: 0x108ab48: addiu a0, zero, 4
+// 0x0108b16c: 0x108b16c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ab4c: 0x108ab4c: jal   0x100449c addiu a2, zero, 223
+// 0x0108b170: 0x108b170: jal   0x100449c addiu a2, zero, 223
 	ldc.i4 223
 	stloc.3
 	ldloc.0
@@ -5736,14 +5736,14 @@ L_108ab00:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ab54: 0x108ab54: j	 0x108abf0 sll   zero, zero, 0
-	br L_108abf0
+// 0x0108b178: 0x108b178: j	 0x108b214 sll   zero, zero, 0
+	br L_108b214
 // --- basic block ---
-L_108ab5c:
-// 0x0108ab5c: 0x108ab5c: addu  a0, s2, zero
+L_108b180:
+// 0x0108b180: 0x108b180: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0108ab60: 0x108ab60: jal   0x1001b14 addu  a1, s3, zero
+// 0x0108b184: 0x108b184: jal   0x1001b14 addu  a1, s3, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
@@ -5751,13 +5751,13 @@ L_108ab5c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108ab68: 0x108ab68: beq   v0, zero, 0x108abf0 addiu v0, zero, 18
+// 0x0108b18c: 0x108b18c: beq   v0, zero, 0x108b214 addiu v0, zero, 18
 	ldloc 5
 	ldc.i4.s 18
 	stloc 5
-	brfalse L_108abf0
+	brfalse L_108b214
 // --- basic block ---
-// 0x0108ab70: 0x108ab70: beq   s4, zero, 0x108abc4 sw    v0, 0(s1)
+// 0x0108b194: 0x108b194: beq   s4, zero, 0x108b1e8 sw    v0, 0(s1)
 	ldloc 12
 	ldloc 6
 	ldloc 9
@@ -5765,17 +5765,17 @@ L_108ab5c:
 	shr.un
 	ldloc 5
 	stelem.i4
-	brfalse L_108abc4
+	brfalse L_108b1e8
 // --- basic block ---
-// 0x0108ab78: 0x108ab78: lui   a1, 0x20000
+// 0x0108b19c: 0x108b19c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108ab7c: 0x108ab7c: addu  a0, s3, zero
+// 0x0108b1a0: 0x108b1a0: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0108ab80: 0x108ab80: jal   0x1001b14 addiu a1, a1, -8328
+// 0x0108b1a4: 0x108b1a4: jal   0x1001b14 addiu a1, a1, -7864
 	ldloc.2
-	ldc.i4 -8328
+	ldc.i4 -7864
 	add
 	stloc.2
 	ldloc.1
@@ -5783,34 +5783,34 @@ L_108ab5c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108ab88: 0x108ab88: bne   v0, zero, 0x108abc8 lui   a1, 0x20000
+// 0x0108b1ac: 0x108b1ac: bne   v0, zero, 0x108b1ec lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108abc8
+	brtrue L_108b1ec
 // --- basic block ---
-// 0x0108ab90: 0x108ab90: addiu v0, zero, 24
+// 0x0108b1b4: 0x108b1b4: addiu v0, zero, 24
 	ldc.i4.s 24
 	stloc 5
-// 0x0108ab94: 0x108ab94: sw    v0, 0(s1)
+// 0x0108b1b8: 0x108b1b8: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108ab98: 0x108ab98: lb    v0, 0(s0)
+// 0x0108b1bc: 0x108b1bc: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108ab9c: 0x108ab9c: sll   zero, zero, 0
-// 0x0108aba0: 0x108aba0: beq   v0, zero, 0x108abcc lui   a3, 0x20000
+// 0x0108b1c0: 0x108b1c0: sll   zero, zero, 0
+// 0x0108b1c4: 0x108b1c4: beq   v0, zero, 0x108b1f0 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brfalse L_108abcc
+	brfalse L_108b1f0
 // --- basic block ---
-// 0x0108aba8: 0x108aba8: jal   0x1000d8c addu  a0, s0, zero
+// 0x0108b1cc: 0x108b1cc: jal   0x1000d8c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5823,57 +5823,57 @@ L_108ab5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108abb0: 0x108abb0: addiu v1, zero, 1
+// 0x0108b1d4: 0x108b1d4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0108abb4: 0x108abb4: bne   v0, v1, 0x108abc8 lui   a1, 0x20000
+// 0x0108b1d8: 0x108b1d8: bne   v0, v1, 0x108b1ec lui   a1, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
-	bne.un L_108abc8
+	bne.un L_108b1ec
 // --- basic block ---
-// 0x0108abbc: 0x108abbc: addiu v0, zero, 25
+// 0x0108b1e0: 0x108b1e0: addiu v0, zero, 25
 	ldc.i4.s 25
 	stloc 5
-// 0x0108abc0: 0x108abc0: sw    v0, 0(s1)
+// 0x0108b1e4: 0x108b1e4: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_108abc4:
-// 0x0108abc4: 0x108abc4: lui   a1, 0x20000
+L_108b1e8:
+// 0x0108b1e8: 0x108b1e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_108abc8:
-// 0x0108abc8: 0x108abc8: lui   a3, 0x20000
+L_108b1ec:
+// 0x0108b1ec: 0x108b1ec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-L_108abcc:
-// 0x0108abcc: 0x108abcc: addiu v0, sp, 32
+L_108b1f0:
+// 0x0108b1f0: 0x108b1f0: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0108abd0: 0x108abd0: addiu a1, a1, -21512
+// 0x0108b1f4: 0x108b1f4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108abd4: 0x108abd4: addiu a3, a3, -8316
+// 0x0108b1f8: 0x108b1f8: addiu a3, a3, -7852
 	ldloc 4
-	ldc.i4 -8316
+	ldc.i4 -7852
 	add
 	stloc 4
-// 0x0108abd8: 0x108abd8: addiu a0, zero, 4
+// 0x0108b1fc: 0x108b1fc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108abdc: 0x108abdc: addiu a2, zero, 245
+// 0x0108b200: 0x108b200: addiu a2, zero, 245
 	ldc.i4 245
 	stloc.3
-// 0x0108abe0: 0x108abe0: sw    v0, 16(sp)
+// 0x0108b204: 0x108b204: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5882,7 +5882,7 @@ L_108abcc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108abe4: 0x108abe4: sw    s2, 20(sp)
+// 0x0108b208: 0x108b208: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5891,8 +5891,8 @@ L_108abcc:
 	add
 	ldloc 11
 	stelem.i4
-L_108abe8:
-// 0x0108abe8: 0x108abe8: jal   0x100449c addu  s0, zero, zero
+L_108b20c:
+// 0x0108b20c: 0x108b20c: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -5905,12 +5905,12 @@ L_108abe8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108abf0:
-// 0x0108abf0: 0x108abf0: lw    ra, 164(sp)
-// 0x0108abf4: 0x108abf4: addu  v0, s0, zero
+L_108b214:
+// 0x0108b214: 0x108b214: lw    ra, 164(sp)
+// 0x0108b218: 0x108b218: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0108abf8: 0x108abf8: lw    s5, 160(sp)
+// 0x0108b21c: 0x108b21c: lw    s5, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5919,7 +5919,7 @@ L_108abf0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108abfc: 0x108abfc: lw    s4, 156(sp)
+// 0x0108b220: 0x108b220: lw    s4, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5928,7 +5928,7 @@ L_108abf0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108ac00: 0x108ac00: lw    s3, 152(sp)
+// 0x0108b224: 0x108b224: lw    s3, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5937,7 +5937,7 @@ L_108abf0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108ac04: 0x108ac04: lw    s2, 148(sp)
+// 0x0108b228: 0x108b228: lw    s2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5946,7 +5946,7 @@ L_108abf0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108ac08: 0x108ac08: lw    s1, 144(sp)
+// 0x0108b22c: 0x108b22c: lw    s1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5955,7 +5955,7 @@ L_108abf0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108ac0c: 0x108ac0c: lw    s0, 140(sp)
+// 0x0108b230: 0x108b230: lw    s0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5964,7 +5964,7 @@ L_108abf0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108ac10: 0x108ac10: jr    ra addiu sp, sp, 168
+// 0x0108b234: 0x108b234: jr    ra addiu sp, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
diff --git a/converted/Cibyl104.j b/converted/Cibyl104.j
index 4acb8a8..7922be8 100644
--- a/converted/Cibyl104.j
+++ b/converted/Cibyl104.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl104::.ctor
 
-.method public static int32 OnLogOutResponse_108ac18(int32,int32,int32,int32,int32)
+.method public static int32 OnLogOutResponse_108b23c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -85,8 +85,8 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108ac18:
-// 0x0108ac18: 0x108ac18: lw    v1, 28692(a1)
+L_108b23c:
+// 0x0108b23c: 0x108b23c: lw    v1, 28692(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -95,12 +95,12 @@ L_108ac18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108ac1c: 0x108ac1c: addiu sp, sp, -40
+// 0x0108b240: 0x108b240: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0108ac20: 0x108ac20: sw    s2, 32(sp)
+// 0x0108b244: 0x108b244: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -109,7 +109,7 @@ L_108ac18:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108ac24: 0x108ac24: sw    s1, 28(sp)
+// 0x0108b248: 0x108b248: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -118,7 +118,7 @@ L_108ac18:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108ac28: 0x108ac28: sw    s0, 24(sp)
+// 0x0108b24c: 0x108b24c: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -127,34 +127,34 @@ L_108ac18:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108ac2c: 0x108ac2c: sw    ra, 36(sp)
-// 0x0108ac30: 0x108ac30: addu  s0, a1, zero
+// 0x0108b250: 0x108b250: sw    ra, 36(sp)
+// 0x0108b254: 0x108b254: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0108ac34: 0x108ac34: addu  s2, a2, zero
+// 0x0108b258: 0x108b258: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0108ac38: 0x108ac38: addu  v0, a3, zero
+// 0x0108b25c: 0x108b25c: addu  v0, a3, zero
 	ldloc 4
 	stloc 5
-// 0x0108ac3c: 0x108ac3c: bne   v1, zero, 0x108aca8 addu  s1, a0, zero
+// 0x0108b260: 0x108b260: bne   v1, zero, 0x108b2cc addu  s1, a0, zero
 	ldloc 8
 	ldloc.1
 	stloc 9
-	brtrue L_108aca8
+	brtrue L_108b2cc
 // --- basic block ---
-// 0x0108ac44: 0x108ac44: lui   a2, 0x20000
+// 0x0108b268: 0x108b268: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108ac48: 0x108ac48: addiu a2, a2, -8240
+// 0x0108b26c: 0x108b26c: addiu a2, a2, -7776
 	ldloc.3
-	ldc.i4 -8240
+	ldc.i4 -7776
 	add
 	stloc.3
-// 0x0108ac4c: 0x108ac4c: addu  a3, s2, zero
+// 0x0108b270: 0x108b270: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x0108ac50: 0x108ac50: jal   0x108a978 sw    v0, 16(sp)
+// 0x0108b274: 0x108b274: jal   0x108af9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -168,32 +168,32 @@ L_108ac18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl103::VerifyStatusAndTag_108a978(int32,int32,int32,int32,int32)
+	call int32 Cibyl103::VerifyStatusAndTag_108af9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108ac58: 0x108ac58: beq   v0, zero, 0x108ac78 addu  s1, v0, zero
+// 0x0108b27c: 0x108b27c: beq   v0, zero, 0x108b29c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_108ac78
+	brfalse L_108b29c
 // --- basic block ---
-// 0x0108ac60: 0x108ac60: lw    v0, 0(s2)
+// 0x0108b284: 0x108b284: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108ac64: 0x108ac64: sll   zero, zero, 0
-// 0x0108ac68: 0x108ac68: bne   v0, zero, 0x108acc4 addiu v0, zero, 1
+// 0x0108b288: 0x108b288: sll   zero, zero, 0
+// 0x0108b28c: 0x108b28c: bne   v0, zero, 0x108b2e8 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_108acc4
+	brtrue L_108b2e8
 // --- basic block ---
-// 0x0108ac70: 0x108ac70: j	 0x108aca8 sw    v0, 28692(s0)
+// 0x0108b294: 0x108b294: j	 0x108b2cc sw    v0, 28692(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -202,40 +202,40 @@ L_108ac18:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108aca8
+	br L_108b2cc
 // --- basic block ---
-L_108ac78:
-// 0x0108ac78: 0x108ac78: lui   a1, 0x20000
+L_108b29c:
+// 0x0108b29c: 0x108b29c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108ac7c: 0x108ac7c: lui   a3, 0x20000
+// 0x0108b2a0: 0x108b2a0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ac80: 0x108ac80: lui   v0, 0x20000
+// 0x0108b2a4: 0x108b2a4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0108ac84: 0x108ac84: addiu v0, v0, -8172
+// 0x0108b2a8: 0x108b2a8: addiu v0, v0, -7708
 	ldloc 5
-	ldc.i4 -8172
+	ldc.i4 -7708
 	add
 	stloc 5
-// 0x0108ac88: 0x108ac88: addiu a1, a1, -21512
+// 0x0108b2ac: 0x108b2ac: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108ac8c: 0x108ac8c: addiu a3, a3, -8220
+// 0x0108b2b0: 0x108b2b0: addiu a3, a3, -7756
 	ldloc 4
-	ldc.i4 -8220
+	ldc.i4 -7756
 	add
 	stloc 4
-// 0x0108ac90: 0x108ac90: addiu a0, zero, 4
+// 0x0108b2b4: 0x108b2b4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ac94: 0x108ac94: addiu a2, zero, 450
+// 0x0108b2b8: 0x108b2b8: addiu a2, zero, 450
 	ldc.i4 450
 	stloc.3
-// 0x0108ac98: 0x108ac98: jal   0x100449c sw    v0, 16(sp)
+// 0x0108b2bc: 0x108b2bc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -254,14 +254,14 @@ L_108ac78:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108aca0: 0x108aca0: j	 0x108acc4 sll   zero, zero, 0
-	br L_108acc4
+// 0x0108b2c4: 0x108b2c4: j	 0x108b2e8 sll   zero, zero, 0
+	br L_108b2e8
 // --- basic block ---
-L_108aca8:
-// 0x0108aca8: 0x108aca8: addiu v0, zero, -1
+L_108b2cc:
+// 0x0108b2cc: 0x108b2cc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108acac: 0x108acac: sw    v0, 260(s0)
+// 0x0108b2d0: 0x108b2d0: sw    v0, 260(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -270,7 +270,7 @@ L_108aca8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108acb0: 0x108acb0: sw    zero, 256(s0)
+// 0x0108b2d4: 0x108b2d4: sw    zero, 256(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -279,15 +279,15 @@ L_108aca8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108acb4: 0x108acb4: addiu a0, s0, 192
+// 0x0108b2d8: 0x108b2d8: addiu a0, s0, 192
 	ldloc 7
 	ldc.i4 192
 	add
 	stloc.1
-// 0x0108acb8: 0x108acb8: addu  a1, zero, zero
+// 0x0108b2dc: 0x108b2dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108acbc: 0x108acbc: jal   0x100177c addiu a2, zero, 64
+// 0x0108b2e0: 0x108b2e0: jal   0x100177c addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -299,12 +299,12 @@ L_108aca8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_108acc4:
-// 0x0108acc4: 0x108acc4: lw    ra, 36(sp)
-// 0x0108acc8: 0x108acc8: addu  v0, s1, zero
+L_108b2e8:
+// 0x0108b2e8: 0x108b2e8: lw    ra, 36(sp)
+// 0x0108b2ec: 0x108b2ec: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-// 0x0108accc: 0x108accc: lw    s2, 32(sp)
+// 0x0108b2f0: 0x108b2f0: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -313,7 +313,7 @@ L_108acc4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108acd0: 0x108acd0: lw    s1, 28(sp)
+// 0x0108b2f4: 0x108b2f4: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -322,7 +322,7 @@ L_108acc4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108acd4: 0x108acd4: lw    s0, 24(sp)
+// 0x0108b2f8: 0x108b2f8: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -331,7 +331,7 @@ L_108acc4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108acd8: 0x108acd8: jr    ra addiu sp, sp, 40
+// 0x0108b2fc: 0x108b2fc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -343,7 +343,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnLoginResponse_108ace0(int32,int32,int32,int32,int32)
+.method public static int32 OnLoginResponse_108b304(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s4,int32 s1,int32 s5,int32 s2,int32 ra)
@@ -396,8 +396,8 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108ace0:
-// 0x0108ace0: 0x108ace0: lw    v0, 28692(a1)
+L_108b304:
+// 0x0108b304: 0x108b304: lw    v0, 28692(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -406,12 +406,12 @@ L_108ace0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ace4: 0x108ace4: addiu sp, sp, -72
+// 0x0108b308: 0x108b308: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0108ace8: 0x108ace8: sw    s3, 56(sp)
+// 0x0108b30c: 0x108b30c: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -420,7 +420,7 @@ L_108ace0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108acec: 0x108acec: sw    s2, 52(sp)
+// 0x0108b310: 0x108b310: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -429,7 +429,7 @@ L_108ace0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108acf0: 0x108acf0: sw    s1, 48(sp)
+// 0x0108b314: 0x108b314: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -438,7 +438,7 @@ L_108ace0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108acf4: 0x108acf4: sw    s0, 44(sp)
+// 0x0108b318: 0x108b318: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -447,8 +447,8 @@ L_108ace0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108acf8: 0x108acf8: sw    ra, 68(sp)
-// 0x0108acfc: 0x108acfc: sw    s5, 64(sp)
+// 0x0108b31c: 0x108b31c: sw    ra, 68(sp)
+// 0x0108b320: 0x108b320: sw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -457,7 +457,7 @@ L_108ace0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108ad00: 0x108ad00: sw    s4, 60(sp)
+// 0x0108b324: 0x108b324: sw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -466,33 +466,33 @@ L_108ace0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108ad04: 0x108ad04: addu  s0, a1, zero
+// 0x0108b328: 0x108b328: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0108ad08: 0x108ad08: addu  s3, a2, zero
+// 0x0108b32c: 0x108b32c: addu  s3, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0108ad0c: 0x108ad0c: addu  s2, a3, zero
+// 0x0108b330: 0x108b330: addu  s2, a3, zero
 	ldloc 4
 	stloc 13
-// 0x0108ad10: 0x108ad10: bne   v0, zero, 0x108ad80 addu  s1, a0, zero
+// 0x0108b334: 0x108b334: bne   v0, zero, 0x108b3a4 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 11
-	brtrue L_108ad80
+	brtrue L_108b3a4
 // --- basic block ---
-// 0x0108ad18: 0x108ad18: lui   a2, 0x20000
+// 0x0108b33c: 0x108b33c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108ad1c: 0x108ad1c: addiu a2, a2, -8600
+// 0x0108b340: 0x108b340: addiu a2, a2, -8136
 	ldloc.3
-	ldc.i4 -8600
+	ldc.i4 -8136
 	add
 	stloc.3
-// 0x0108ad20: 0x108ad20: addu  a3, s3, zero
+// 0x0108b344: 0x108b344: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x0108ad24: 0x108ad24: jal   0x108a978 sw    s2, 16(sp)
+// 0x0108b348: 0x108b348: jal   0x108af9c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -506,66 +506,66 @@ L_108ace0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl103::VerifyStatusAndTag_108a978(int32,int32,int32,int32,int32)
+	call int32 Cibyl103::VerifyStatusAndTag_108af9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ad2c: 0x108ad2c: beq   v0, zero, 0x108ad4c addu  s1, v0, zero
+// 0x0108b350: 0x108b350: beq   v0, zero, 0x108b370 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brfalse L_108ad4c
+	brfalse L_108b370
 // --- basic block ---
-// 0x0108ad34: 0x108ad34: lw    v1, 0(s3)
+// 0x0108b358: 0x108b358: lw    v1, 0(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0108ad38: 0x108ad38: sll   zero, zero, 0
-// 0x0108ad3c: 0x108ad3c: bne   v1, zero, 0x108b038 sll   zero, zero, 0
+// 0x0108b35c: 0x108b35c: sll   zero, zero, 0
+// 0x0108b360: 0x108b360: bne   v1, zero, 0x108b65c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_108b038
+	brtrue L_108b65c
 // --- basic block ---
-// 0x0108ad44: 0x108ad44: j	 0x108ad7c addiu v0, zero, 1
+// 0x0108b368: 0x108b368: j	 0x108b3a0 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_108ad7c
+	br L_108b3a0
 // --- basic block ---
-L_108ad4c:
-// 0x0108ad4c: 0x108ad4c: lui   a1, 0x20000
+L_108b370:
+// 0x0108b370: 0x108b370: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108ad50: 0x108ad50: lui   a3, 0x20000
+// 0x0108b374: 0x108b374: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ad54: 0x108ad54: lui   v0, 0x20000
+// 0x0108b378: 0x108b378: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0108ad58: 0x108ad58: addiu v0, v0, -8152
+// 0x0108b37c: 0x108b37c: addiu v0, v0, -7688
 	ldloc 5
-	ldc.i4 -8152
+	ldc.i4 -7688
 	add
 	stloc 5
-// 0x0108ad5c: 0x108ad5c: addiu a1, a1, -21512
+// 0x0108b380: 0x108b380: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108ad60: 0x108ad60: addiu a3, a3, -8220
+// 0x0108b384: 0x108b384: addiu a3, a3, -7756
 	ldloc 4
-	ldc.i4 -8220
+	ldc.i4 -7756
 	add
 	stloc 4
-// 0x0108ad64: 0x108ad64: addiu a0, zero, 4
+// 0x0108b388: 0x108b388: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ad68: 0x108ad68: addiu a2, zero, 307
+// 0x0108b38c: 0x108b38c: addiu a2, zero, 307
 	ldc.i4 307
 	stloc.3
-// 0x0108ad6c: 0x108ad6c: jal   0x100449c sw    v0, 16(sp)
+// 0x0108b390: 0x108b390: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -584,13 +584,13 @@ L_108ad4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ad74: 0x108ad74: j	 0x108b038 addu  v0, zero, zero
+// 0x0108b398: 0x108b398: j	 0x108b65c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_108b038
+	br L_108b65c
 // --- basic block ---
-L_108ad7c:
-// 0x0108ad7c: 0x108ad7c: sw    v0, 28692(s0)
+L_108b3a0:
+// 0x0108b3a0: 0x108b3a0: sw    v0, 28692(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -599,30 +599,30 @@ L_108ad7c:
 	add
 	ldloc 5
 	stelem.i4
-L_108ad80:
-// 0x0108ad80: 0x108ad80: lui   s3, 0x0
+L_108b3a4:
+// 0x0108b3a4: 0x108b3a4: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0108ad84: 0x108ad84: addiu s4, zero, -1
+// 0x0108b3a8: 0x108b3a8: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x0108ad88: 0x108ad88: addu  a0, s1, zero
+// 0x0108b3ac: 0x108b3ac: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0108ad8c: 0x108ad8c: addiu a1, s3, 28076
+// 0x0108b3b0: 0x108b3b0: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108ad90: 0x108ad90: addu  a2, zero, zero
+// 0x0108b3b4: 0x108b3b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108ad94: 0x108ad94: addiu a3, s0, 260
+// 0x0108b3b8: 0x108b3b8: addiu a3, s0, 260
 	ldloc 8
 	ldc.i4 260
 	add
 	stloc 4
-// 0x0108ad98: 0x108ad98: jal   0x106855c sw    s4, 16(sp)
+// 0x0108b3bc: 0x108b3bc: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -636,18 +636,18 @@ L_108ad80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ada0: 0x108ada0: beq   v0, zero, 0x108adb8 lui   a1, 0x20000
+// 0x0108b3c4: 0x108b3c4: beq   v0, zero, 0x108b3dc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108adb8
+	brfalse L_108b3dc
 // --- basic block ---
-// 0x0108ada8: 0x108ada8: lw    v1, 260(s0)
+// 0x0108b3cc: 0x108b3cc: lw    v1, 260(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -656,33 +656,33 @@ L_108ad80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108adac: 0x108adac: sll   zero, zero, 0
-// 0x0108adb0: 0x108adb0: bne   v1, s4, 0x108ade4 sll   zero, zero, 0
+// 0x0108b3d0: 0x108b3d0: sll   zero, zero, 0
+// 0x0108b3d4: 0x108b3d4: bne   v1, s4, 0x108b408 sll   zero, zero, 0
 	ldloc 7
 	ldloc 10
-	bne.un L_108ade4
+	bne.un L_108b408
 // --- basic block ---
-L_108adb8:
-// 0x0108adb8: 0x108adb8: lui   a3, 0x20000
+L_108b3dc:
+// 0x0108b3dc: 0x108b3dc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108adbc: 0x108adbc: addiu a1, a1, -21512
+// 0x0108b3e0: 0x108b3e0: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108adc0: 0x108adc0: addiu a3, a3, -8136
+// 0x0108b3e4: 0x108b3e4: addiu a3, a3, -7672
 	ldloc 4
-	ldc.i4 -8136
+	ldc.i4 -7672
 	add
 	stloc 4
-// 0x0108adc4: 0x108adc4: addiu a0, zero, 4
+// 0x0108b3e8: 0x108b3e8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108adc8: 0x108adc8: addiu a2, zero, 318
+// 0x0108b3ec: 0x108b3ec: addiu a2, zero, 318
 	ldc.i4 318
 	stloc.3
-// 0x0108adcc: 0x108adcc: jal   0x100449c sw    s1, 16(sp)
+// 0x0108b3f0: 0x108b3f0: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -701,54 +701,54 @@ L_108adb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108add4: 0x108add4: addiu v0, zero, 18
+// 0x0108b3f8: 0x108b3f8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-L_108add8:
-// 0x0108add8: 0x108add8: sw    v0, 0(s2)
+L_108b3fc:
+// 0x0108b3fc: 0x108b3fc: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108addc: 0x108addc: j	 0x108b038 addu  v0, zero, zero
+// 0x0108b400: 0x108b400: j	 0x108b65c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_108b038
+	br L_108b65c
 // --- basic block ---
-L_108ade4:
-// 0x0108ade4: 0x108ade4: lb    v1, 0(v0)
+L_108b408:
+// 0x0108b408: 0x108b408: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108ade8: 0x108ade8: sll   zero, zero, 0
-// 0x0108adec: 0x108adec: bne   v1, zero, 0x108ae18 addu  a0, v0, zero
+// 0x0108b40c: 0x108b40c: sll   zero, zero, 0
+// 0x0108b410: 0x108b410: bne   v1, zero, 0x108b43c addu  a0, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brtrue L_108ae18
+	brtrue L_108b43c
 // --- basic block ---
-// 0x0108adf4: 0x108adf4: lui   a1, 0x20000
+// 0x0108b418: 0x108b418: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108adf8: 0x108adf8: lui   a3, 0x20000
+// 0x0108b41c: 0x108b41c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108adfc: 0x108adfc: addiu a1, a1, -21512
+// 0x0108b420: 0x108b420: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108ae00: 0x108ae00: addiu a3, a3, -8064
+// 0x0108b424: 0x108b424: addiu a3, a3, -7600
 	ldloc 4
-	ldc.i4 -8064
+	ldc.i4 -7600
 	add
 	stloc 4
-// 0x0108ae04: 0x108ae04: addiu a0, zero, 4
+// 0x0108b428: 0x108b428: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ae08: 0x108ae08: jal   0x100449c addiu a2, zero, 326
+// 0x0108b42c: 0x108b42c: jal   0x100449c addiu a2, zero, 326
 	ldc.i4 326
 	stloc.3
 	ldloc.0
@@ -761,34 +761,34 @@ L_108ade4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ae10: 0x108ae10: j	 0x108add8 addiu v0, zero, 18
+// 0x0108b434: 0x108b434: j	 0x108b3fc addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_108add8
+	br L_108b3fc
 // --- basic block ---
-L_108ae18:
-// 0x0108ae18: 0x108ae18: addiu s5, zero, 1
+L_108b43c:
+// 0x0108b43c: 0x108b43c: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x0108ae1c: 0x108ae1c: addiu v0, zero, 63
+// 0x0108b440: 0x108b440: addiu v0, zero, 63
 	ldc.i4.s 63
 	stloc 5
-// 0x0108ae20: 0x108ae20: addiu a1, s0, 192
+// 0x0108b444: 0x108b444: addiu a1, s0, 192
 	ldloc 8
 	ldc.i4 192
 	add
 	stloc.2
-// 0x0108ae24: 0x108ae24: addiu a2, sp, 24
+// 0x0108b448: 0x108b448: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0108ae28: 0x108ae28: addiu a3, s3, 28076
+// 0x0108b44c: 0x108b44c: addiu a3, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108ae2c: 0x108ae2c: sw    v0, 24(sp)
+// 0x0108b450: 0x108b450: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -797,7 +797,7 @@ L_108ae18:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108ae30: 0x108ae30: jal   0x1068250 sw    s5, 16(sp)
+// 0x0108b454: 0x108b454: jal   0x1068260 sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -811,40 +811,40 @@ L_108ae18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ae38: 0x108ae38: bne   v0, zero, 0x108ae68 addu  a0, v0, zero
+// 0x0108b45c: 0x108b45c: bne   v0, zero, 0x108b48c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brtrue L_108ae68
+	brtrue L_108b48c
 // --- basic block ---
-// 0x0108ae40: 0x108ae40: lui   a1, 0x20000
+// 0x0108b464: 0x108b464: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108ae44: 0x108ae44: lui   a3, 0x20000
+// 0x0108b468: 0x108b468: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ae48: 0x108ae48: addiu a1, a1, -21512
+// 0x0108b46c: 0x108b46c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108ae4c: 0x108ae4c: addiu a3, a3, -7980
+// 0x0108b470: 0x108b470: addiu a3, a3, -7516
 	ldloc 4
-	ldc.i4 -7980
+	ldc.i4 -7516
 	add
 	stloc 4
-// 0x0108ae50: 0x108ae50: addiu a0, zero, 4
+// 0x0108b474: 0x108b474: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ae54: 0x108ae54: addiu a2, zero, 340
+// 0x0108b478: 0x108b478: addiu a2, zero, 340
 	ldc.i4 340
 	stloc.3
-// 0x0108ae58: 0x108ae58: jal   0x100449c sw    v0, 32(sp)
+// 0x0108b47c: 0x108b47c: jal   0x100449c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -863,26 +863,26 @@ L_108ae18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ae60: 0x108ae60: j	 0x108b004 addiu v1, zero, 18
+// 0x0108b484: 0x108b484: j	 0x108b628 addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-	br L_108b004
+	br L_108b628
 // --- basic block ---
-L_108ae68:
-// 0x0108ae68: 0x108ae68: addiu a1, s3, 28076
+L_108b48c:
+// 0x0108b48c: 0x108b48c: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108ae6c: 0x108ae6c: addu  a2, zero, zero
+// 0x0108b490: 0x108b490: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108ae70: 0x108ae70: addiu a3, s0, 28700
+// 0x0108b494: 0x108b494: addiu a3, s0, 28700
 	ldloc 8
 	ldc.i4 28700
 	add
 	stloc 4
-// 0x0108ae74: 0x108ae74: jal   0x106855c sw    s5, 16(sp)
+// 0x0108b498: 0x108b498: jal   0x106856c sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -896,56 +896,56 @@ L_108ae68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ae7c: 0x108ae7c: bne   v0, zero, 0x108ae9c lui   a1, 0x20000
+// 0x0108b4a0: 0x108b4a0: bne   v0, zero, 0x108b4c0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108ae9c
+	brtrue L_108b4c0
 // --- basic block ---
-// 0x0108ae84: 0x108ae84: lui   a3, 0x20000
+// 0x0108b4a8: 0x108b4a8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ae88: 0x108ae88: addiu a1, a1, -21512
+// 0x0108b4ac: 0x108b4ac: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108ae8c: 0x108ae8c: addiu a3, a3, -7892
+// 0x0108b4b0: 0x108b4b0: addiu a3, a3, -7428
 	ldloc 4
-	ldc.i4 -7892
+	ldc.i4 -7428
 	add
 	stloc 4
-// 0x0108ae90: 0x108ae90: addiu a0, zero, 4
+// 0x0108b4b4: 0x108b4b4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ae94: 0x108ae94: j	 0x108aff4 addiu a2, zero, 352
+// 0x0108b4b8: 0x108b4b8: j	 0x108b618 addiu a2, zero, 352
 	ldc.i4 352
 	stloc.3
-	br L_108aff4
+	br L_108b618
 // --- basic block ---
-L_108ae9c:
-// 0x0108ae9c: 0x108ae9c: addu  a0, v0, zero
+L_108b4c0:
+// 0x0108b4c0: 0x108b4c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108aea0: 0x108aea0: addiu a1, s3, 28076
+// 0x0108b4c4: 0x108b4c4: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108aea4: 0x108aea4: addu  a2, zero, zero
+// 0x0108b4c8: 0x108b4c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108aea8: 0x108aea8: addiu a3, s0, 28704
+// 0x0108b4cc: 0x108b4cc: addiu a3, s0, 28704
 	ldloc 8
 	ldc.i4 28704
 	add
 	stloc 4
-// 0x0108aeac: 0x108aeac: jal   0x106855c sw    s5, 16(sp)
+// 0x0108b4d0: 0x108b4d0: jal   0x106856c sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -959,56 +959,56 @@ L_108ae9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108aeb4: 0x108aeb4: bne   v0, zero, 0x108aed4 lui   a1, 0x20000
+// 0x0108b4d8: 0x108b4d8: bne   v0, zero, 0x108b4f8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108aed4
+	brtrue L_108b4f8
 // --- basic block ---
-// 0x0108aebc: 0x108aebc: lui   a3, 0x20000
+// 0x0108b4e0: 0x108b4e0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108aec0: 0x108aec0: addiu a1, a1, -21512
+// 0x0108b4e4: 0x108b4e4: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108aec4: 0x108aec4: addiu a3, a3, -7832
+// 0x0108b4e8: 0x108b4e8: addiu a3, a3, -7368
 	ldloc 4
-	ldc.i4 -7832
+	ldc.i4 -7368
 	add
 	stloc 4
-// 0x0108aec8: 0x108aec8: addiu a0, zero, 4
+// 0x0108b4ec: 0x108b4ec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108aecc: 0x108aecc: j	 0x108aff4 addiu a2, zero, 364
+// 0x0108b4f0: 0x108b4f0: j	 0x108b618 addiu a2, zero, 364
 	ldc.i4 364
 	stloc.3
-	br L_108aff4
+	br L_108b618
 // --- basic block ---
-L_108aed4:
-// 0x0108aed4: 0x108aed4: addu  a0, v0, zero
+L_108b4f8:
+// 0x0108b4f8: 0x108b4f8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108aed8: 0x108aed8: addiu a1, s3, 28076
+// 0x0108b4fc: 0x108b4fc: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108aedc: 0x108aedc: addu  a2, zero, zero
+// 0x0108b500: 0x108b500: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108aee0: 0x108aee0: addiu a3, s0, 28708
+// 0x0108b504: 0x108b504: addiu a3, s0, 28708
 	ldloc 8
 	ldc.i4 28708
 	add
 	stloc 4
-// 0x0108aee4: 0x108aee4: jal   0x106855c sw    s5, 16(sp)
+// 0x0108b508: 0x108b508: jal   0x106856c sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1022,56 +1022,56 @@ L_108aed4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108aeec: 0x108aeec: bne   v0, zero, 0x108af0c lui   a1, 0x20000
+// 0x0108b510: 0x108b510: bne   v0, zero, 0x108b530 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108af0c
+	brtrue L_108b530
 // --- basic block ---
-// 0x0108aef4: 0x108aef4: lui   a3, 0x20000
+// 0x0108b518: 0x108b518: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108aef8: 0x108aef8: addiu a1, a1, -21512
+// 0x0108b51c: 0x108b51c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108aefc: 0x108aefc: addiu a3, a3, -7768
+// 0x0108b520: 0x108b520: addiu a3, a3, -7304
 	ldloc 4
-	ldc.i4 -7768
+	ldc.i4 -7304
 	add
 	stloc 4
-// 0x0108af00: 0x108af00: addiu a0, zero, 4
+// 0x0108b524: 0x108b524: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108af04: 0x108af04: j	 0x108aff4 addiu a2, zero, 378
+// 0x0108b528: 0x108b528: j	 0x108b618 addiu a2, zero, 378
 	ldc.i4 378
 	stloc.3
-	br L_108aff4
+	br L_108b618
 // --- basic block ---
-L_108af0c:
-// 0x0108af0c: 0x108af0c: addu  a0, v0, zero
+L_108b530:
+// 0x0108b530: 0x108b530: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108af10: 0x108af10: addiu a1, s3, 28076
+// 0x0108b534: 0x108b534: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108af14: 0x108af14: addu  a2, zero, zero
+// 0x0108b538: 0x108b538: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108af18: 0x108af18: addiu a3, s0, 28712
+// 0x0108b53c: 0x108b53c: addiu a3, s0, 28712
 	ldloc 8
 	ldc.i4 28712
 	add
 	stloc 4
-// 0x0108af1c: 0x108af1c: jal   0x106855c sw    s4, 16(sp)
+// 0x0108b540: 0x108b540: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1085,56 +1085,56 @@ L_108af0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108af24: 0x108af24: bne   v0, zero, 0x108af44 lui   a1, 0x20000
+// 0x0108b548: 0x108b548: bne   v0, zero, 0x108b568 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108af44
+	brtrue L_108b568
 // --- basic block ---
-// 0x0108af2c: 0x108af2c: lui   a3, 0x20000
+// 0x0108b550: 0x108b550: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108af30: 0x108af30: addiu a1, a1, -21512
+// 0x0108b554: 0x108b554: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108af34: 0x108af34: addiu a3, a3, -7708
+// 0x0108b558: 0x108b558: addiu a3, a3, -7244
 	ldloc 4
-	ldc.i4 -7708
+	ldc.i4 -7244
 	add
 	stloc 4
-// 0x0108af38: 0x108af38: addiu a0, zero, 4
+// 0x0108b55c: 0x108b55c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108af3c: 0x108af3c: j	 0x108aff4 addiu a2, zero, 390
+// 0x0108b560: 0x108b560: j	 0x108b618 addiu a2, zero, 390
 	ldc.i4 390
 	stloc.3
-	br L_108aff4
+	br L_108b618
 // --- basic block ---
-L_108af44:
-// 0x0108af44: 0x108af44: addu  a0, v0, zero
+L_108b568:
+// 0x0108b568: 0x108b568: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108af48: 0x108af48: addiu a1, s3, 28076
+// 0x0108b56c: 0x108b56c: addiu a1, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0108af4c: 0x108af4c: addu  a2, zero, zero
+// 0x0108b570: 0x108b570: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108af50: 0x108af50: addiu a3, s0, 28716
+// 0x0108b574: 0x108b574: addiu a3, s0, 28716
 	ldloc 8
 	ldc.i4 28716
 	add
 	stloc 4
-// 0x0108af54: 0x108af54: jal   0x106855c sw    s4, 16(sp)
+// 0x0108b578: 0x108b578: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1148,59 +1148,59 @@ L_108af44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108af5c: 0x108af5c: bne   v0, zero, 0x108af7c lui   a1, 0x20000
+// 0x0108b580: 0x108b580: bne   v0, zero, 0x108b5a0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108af7c
+	brtrue L_108b5a0
 // --- basic block ---
-// 0x0108af64: 0x108af64: lui   a3, 0x20000
+// 0x0108b588: 0x108b588: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108af68: 0x108af68: addiu a1, a1, -21512
+// 0x0108b58c: 0x108b58c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108af6c: 0x108af6c: addiu a3, a3, -7640
+// 0x0108b590: 0x108b590: addiu a3, a3, -7176
 	ldloc 4
-	ldc.i4 -7640
+	ldc.i4 -7176
 	add
 	stloc 4
-// 0x0108af70: 0x108af70: addiu a0, zero, 4
+// 0x0108b594: 0x108b594: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108af74: 0x108af74: j	 0x108aff4 addiu a2, zero, 403
+// 0x0108b598: 0x108b598: j	 0x108b618 addiu a2, zero, 403
 	ldc.i4 403
 	stloc.3
-	br L_108aff4
+	br L_108b618
 // --- basic block ---
-L_108af7c:
-// 0x0108af7c: 0x108af7c: lui   a1, 0x0
+L_108b5a0:
+// 0x0108b5a0: 0x108b5a0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108af80: 0x108af80: addu  a0, v0, zero
+// 0x0108b5a4: 0x108b5a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108af84: 0x108af84: addiu a1, a1, 30268
+// 0x0108b5a8: 0x108b5a8: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x0108af88: 0x108af88: addu  a2, zero, zero
+// 0x0108b5ac: 0x108b5ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108af8c: 0x108af8c: addiu a3, s0, 28720
+// 0x0108b5b0: 0x108b5b0: addiu a3, s0, 28720
 	ldloc 8
 	ldc.i4 28720
 	add
 	stloc 4
-// 0x0108af90: 0x108af90: jal   0x106855c sw    s4, 16(sp)
+// 0x0108b5b4: 0x108b5b4: jal   0x106856c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1214,62 +1214,62 @@ L_108af7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108af98: 0x108af98: bne   v0, zero, 0x108afb8 lui   a1, 0x20000
+// 0x0108b5bc: 0x108b5bc: bne   v0, zero, 0x108b5dc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108afb8
+	brtrue L_108b5dc
 // --- basic block ---
-// 0x0108afa0: 0x108afa0: lui   a3, 0x20000
+// 0x0108b5c4: 0x108b5c4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108afa4: 0x108afa4: addiu a1, a1, -21512
+// 0x0108b5c8: 0x108b5c8: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108afa8: 0x108afa8: addiu a3, a3, -7584
+// 0x0108b5cc: 0x108b5cc: addiu a3, a3, -7120
 	ldloc 4
-	ldc.i4 -7584
+	ldc.i4 -7120
 	add
 	stloc 4
-// 0x0108afac: 0x108afac: addiu a0, zero, 4
+// 0x0108b5d0: 0x108b5d0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108afb0: 0x108afb0: j	 0x108aff4 addiu a2, zero, 415
+// 0x0108b5d4: 0x108b5d4: j	 0x108b618 addiu a2, zero, 415
 	ldc.i4 415
 	stloc.3
-	br L_108aff4
+	br L_108b618
 // --- basic block ---
-L_108afb8:
-// 0x0108afb8: 0x108afb8: lui   a1, 0x0
+L_108b5dc:
+// 0x0108b5dc: 0x108b5dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108afbc: 0x108afbc: addu  a0, v0, zero
+// 0x0108b5e0: 0x108b5e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108afc0: 0x108afc0: addiu a1, a1, 30268
+// 0x0108b5e4: 0x108b5e4: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x0108afc4: 0x108afc4: addiu v0, zero, -1
+// 0x0108b5e8: 0x108b5e8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108afc8: 0x108afc8: addu  a2, zero, zero
+// 0x0108b5ec: 0x108b5ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108afcc: 0x108afcc: addiu a3, s0, 28724
+// 0x0108b5f0: 0x108b5f0: addiu a3, s0, 28724
 	ldloc 8
 	ldc.i4 28724
 	add
 	stloc 4
-// 0x0108afd0: 0x108afd0: jal   0x106855c sw    v0, 16(sp)
+// 0x0108b5f4: 0x108b5f4: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1283,38 +1283,38 @@ L_108afb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108afd8: 0x108afd8: bne   v0, zero, 0x108b00c lui   a1, 0x20000
+// 0x0108b5fc: 0x108b5fc: bne   v0, zero, 0x108b630 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108b00c
+	brtrue L_108b630
 // --- basic block ---
-// 0x0108afe0: 0x108afe0: lui   a3, 0x20000
+// 0x0108b604: 0x108b604: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108afe4: 0x108afe4: addiu a1, a1, -21512
+// 0x0108b608: 0x108b608: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108afe8: 0x108afe8: addiu a3, a3, -7516
+// 0x0108b60c: 0x108b60c: addiu a3, a3, -7052
 	ldloc 4
-	ldc.i4 -7516
+	ldc.i4 -7052
 	add
 	stloc 4
-// 0x0108afec: 0x108afec: addiu a0, zero, 4
+// 0x0108b610: 0x108b610: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108aff0: 0x108aff0: addiu a2, zero, 428
+// 0x0108b614: 0x108b614: addiu a2, zero, 428
 	ldc.i4 428
 	stloc.3
-L_108aff4:
-// 0x0108aff4: 0x108aff4: sw    s1, 16(sp)
+L_108b618:
+// 0x0108b618: 0x108b618: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1323,7 +1323,7 @@ L_108aff4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108aff8: 0x108aff8: jal   0x100449c sw    v0, 32(sp)
+// 0x0108b61c: 0x108b61c: jal   0x100449c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1342,21 +1342,21 @@ L_108aff4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108b000: 0x108b000: addiu v1, zero, 18
+// 0x0108b624: 0x108b624: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-L_108b004:
-// 0x0108b004: 0x108b004: j	 0x108b034 sw    v1, 0(s2)
+L_108b628:
+// 0x0108b628: 0x108b628: j	 0x108b658 sw    v1, 0(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_108b034
+	br L_108b658
 // --- basic block ---
-L_108b00c:
-// 0x0108b00c: 0x108b00c: lw    a0, 28724(s0)
+L_108b630:
+// 0x0108b630: 0x108b630: lw    a0, 28724(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1365,7 +1365,7 @@ L_108b00c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108b010: 0x108b010: jal   0x1034c48 sw    v0, 32(sp)
+// 0x0108b634: 0x108b634: jal   0x1034c58 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1379,12 +1379,12 @@ L_108b00c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_set_exclusive_moods_1034c48(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_set_exclusive_moods_1034c58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108b018: 0x108b018: lw    a0, 28704(s0)
+// 0x0108b63c: 0x108b63c: lw    a0, 28704(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1393,7 +1393,7 @@ L_108b00c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108b01c: 0x108b01c: lw    a1, 28720(s0)
+// 0x0108b640: 0x108b640: lw    a1, 28720(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1402,21 +1402,21 @@ L_108b00c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108b020: 0x108b020: jal   0x10acb00 sll   zero, zero, 0
+// 0x0108b644: 0x108b644: jal   0x10ad148 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_set_old_points_10acb00(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_set_old_points_10ad148(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108b028: 0x108b028: addiu v1, zero, 1
+// 0x0108b64c: 0x108b64c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0108b02c: 0x108b02c: jal   0x1021900 sw    v1, 256(s0)
+// 0x0108b650: 0x108b650: jal   0x1021910 sw    v1, 256(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1430,13 +1430,13 @@ L_108b00c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108b034:
-// 0x0108b034: 0x108b034: lw    v0, 32(sp)
+L_108b658:
+// 0x0108b658: 0x108b658: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1445,9 +1445,9 @@ L_108b034:
 	add
 	ldelem.i4
 	stloc 5
-L_108b038:
-// 0x0108b038: 0x108b038: lw    ra, 68(sp)
-// 0x0108b03c: 0x108b03c: lw    s5, 64(sp)
+L_108b65c:
+// 0x0108b65c: 0x108b65c: lw    ra, 68(sp)
+// 0x0108b660: 0x108b660: lw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1456,7 +1456,7 @@ L_108b038:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108b040: 0x108b040: lw    s4, 60(sp)
+// 0x0108b664: 0x108b664: lw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1465,7 +1465,7 @@ L_108b038:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108b044: 0x108b044: lw    s3, 56(sp)
+// 0x0108b668: 0x108b668: lw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1474,7 +1474,7 @@ L_108b038:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108b048: 0x108b048: lw    s2, 52(sp)
+// 0x0108b66c: 0x108b66c: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1483,7 +1483,7 @@ L_108b038:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108b04c: 0x108b04c: lw    s1, 48(sp)
+// 0x0108b670: 0x108b670: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1492,7 +1492,7 @@ L_108b038:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108b050: 0x108b050: lw    s0, 44(sp)
+// 0x0108b674: 0x108b674: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1501,7 +1501,7 @@ L_108b038:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108b054: 0x108b054: jr    ra addiu sp, sp, 72
+// 0x0108b678: 0x108b678: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1513,7 +1513,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnRegisterResponse_108b05c(int32,int32,int32,int32,int32)
+.method public static int32 OnRegisterResponse_108b680(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s3,int32 s1,int32 v1,int32 s2,int32 s4,int32 s5,int32 ra)
@@ -1566,8 +1566,8 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108b05c:
-// 0x0108b05c: 0x108b05c: lw    v0, 28692(a1)
+L_108b680:
+// 0x0108b680: 0x108b680: lw    v0, 28692(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1576,12 +1576,12 @@ L_108b05c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108b060: 0x108b060: addiu sp, sp, -64
+// 0x0108b684: 0x108b684: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0108b064: 0x108b064: sw    s3, 48(sp)
+// 0x0108b688: 0x108b688: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1590,7 +1590,7 @@ L_108b05c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108b068: 0x108b068: sw    s2, 44(sp)
+// 0x0108b68c: 0x108b68c: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1599,7 +1599,7 @@ L_108b05c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108b06c: 0x108b06c: sw    s1, 40(sp)
+// 0x0108b690: 0x108b690: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1608,7 +1608,7 @@ L_108b05c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108b070: 0x108b070: sw    s0, 36(sp)
+// 0x0108b694: 0x108b694: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1617,8 +1617,8 @@ L_108b05c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108b074: 0x108b074: sw    ra, 60(sp)
-// 0x0108b078: 0x108b078: sw    s5, 56(sp)
+// 0x0108b698: 0x108b698: sw    ra, 60(sp)
+// 0x0108b69c: 0x108b69c: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1627,7 +1627,7 @@ L_108b05c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108b07c: 0x108b07c: sw    s4, 52(sp)
+// 0x0108b6a0: 0x108b6a0: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1636,33 +1636,33 @@ L_108b05c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108b080: 0x108b080: addu  s1, a1, zero
+// 0x0108b6a4: 0x108b6a4: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0108b084: 0x108b084: addu  s3, a2, zero
+// 0x0108b6a8: 0x108b6a8: addu  s3, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0108b088: 0x108b088: addu  s2, a3, zero
+// 0x0108b6ac: 0x108b6ac: addu  s2, a3, zero
 	ldloc 4
 	stloc 11
-// 0x0108b08c: 0x108b08c: bne   v0, zero, 0x108b0f8 addu  s0, a0, zero
+// 0x0108b6b0: 0x108b6b0: bne   v0, zero, 0x108b71c addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brtrue L_108b0f8
+	brtrue L_108b71c
 // --- basic block ---
-// 0x0108b094: 0x108b094: lui   a2, 0x20000
+// 0x0108b6b8: 0x108b6b8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108b098: 0x108b098: addiu a2, a2, -7452
+// 0x0108b6bc: 0x108b6bc: addiu a2, a2, -6988
 	ldloc.3
-	ldc.i4 -7452
+	ldc.i4 -6988
 	add
 	stloc.3
-// 0x0108b09c: 0x108b09c: addu  a3, s3, zero
+// 0x0108b6c0: 0x108b6c0: addu  a3, s3, zero
 	ldloc 8
 	stloc 4
-// 0x0108b0a0: 0x108b0a0: jal   0x108a978 sw    s2, 16(sp)
+// 0x0108b6c4: 0x108b6c4: jal   0x108af9c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1676,32 +1676,32 @@ L_108b05c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl103::VerifyStatusAndTag_108a978(int32,int32,int32,int32,int32)
+	call int32 Cibyl103::VerifyStatusAndTag_108af9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0108b0a8: 0x108b0a8: beq   v0, zero, 0x108b0c8 addu  s0, v0, zero
+// 0x0108b6cc: 0x108b6cc: beq   v0, zero, 0x108b6ec addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_108b0c8
+	brfalse L_108b6ec
 // --- basic block ---
-// 0x0108b0b0: 0x108b0b0: lw    v0, 0(s3)
+// 0x0108b6d4: 0x108b6d4: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108b0b4: 0x108b0b4: sll   zero, zero, 0
-// 0x0108b0b8: 0x108b0b8: bne   v0, zero, 0x108b1ac addiu v0, zero, 1
+// 0x0108b6d8: 0x108b6d8: sll   zero, zero, 0
+// 0x0108b6dc: 0x108b6dc: bne   v0, zero, 0x108b7d0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_108b1ac
+	brtrue L_108b7d0
 // --- basic block ---
-// 0x0108b0c0: 0x108b0c0: j	 0x108b0f8 sw    v0, 28692(s1)
+// 0x0108b6e4: 0x108b6e4: j	 0x108b71c sw    v0, 28692(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1710,40 +1710,40 @@ L_108b05c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108b0f8
+	br L_108b71c
 // --- basic block ---
-L_108b0c8:
-// 0x0108b0c8: 0x108b0c8: lui   a1, 0x20000
+L_108b6ec:
+// 0x0108b6ec: 0x108b6ec: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108b0cc: 0x108b0cc: lui   a3, 0x20000
+// 0x0108b6f0: 0x108b6f0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108b0d0: 0x108b0d0: lui   v0, 0x20000
+// 0x0108b6f4: 0x108b6f4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0108b0d4: 0x108b0d4: addiu v0, v0, -7432
+// 0x0108b6f8: 0x108b6f8: addiu v0, v0, -6968
 	ldloc 5
-	ldc.i4 -7432
+	ldc.i4 -6968
 	add
 	stloc 5
-// 0x0108b0d8: 0x108b0d8: addiu a1, a1, -21512
+// 0x0108b6fc: 0x108b6fc: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108b0dc: 0x108b0dc: addiu a3, a3, -8220
+// 0x0108b700: 0x108b700: addiu a3, a3, -7756
 	ldloc 4
-	ldc.i4 -8220
+	ldc.i4 -7756
 	add
 	stloc 4
-// 0x0108b0e0: 0x108b0e0: addiu a0, zero, 4
+// 0x0108b704: 0x108b704: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108b0e4: 0x108b0e4: addiu a2, zero, 260
+// 0x0108b708: 0x108b708: addiu a2, zero, 260
 	ldc.i4 260
 	stloc.3
-// 0x0108b0e8: 0x108b0e8: jal   0x100449c sw    v0, 16(sp)
+// 0x0108b70c: 0x108b70c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1762,39 +1762,39 @@ L_108b0c8:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0108b0f0: 0x108b0f0: j	 0x108b1ac sll   zero, zero, 0
-	br L_108b1ac
+// 0x0108b714: 0x108b714: j	 0x108b7d0 sll   zero, zero, 0
+	br L_108b7d0
 // --- basic block ---
-L_108b0f8:
-// 0x0108b0f8: 0x108b0f8: addiu s5, sp, 24
+L_108b71c:
+// 0x0108b71c: 0x108b71c: addiu s5, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 13
-// 0x0108b0fc: 0x108b0fc: lui   a3, 0x0
+// 0x0108b720: 0x108b720: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108b100: 0x108b100: addu  a0, s0, zero
+// 0x0108b724: 0x108b724: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0108b104: 0x108b104: addiu a3, a3, 28076
+// 0x0108b728: 0x108b728: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0108b108: 0x108b108: addiu s4, zero, 63
+// 0x0108b72c: 0x108b72c: addiu s4, zero, 63
 	ldc.i4.s 63
 	stloc 12
-// 0x0108b10c: 0x108b10c: addiu s3, zero, -1
+// 0x0108b730: 0x108b730: addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x0108b110: 0x108b110: addu  a1, s1, zero
+// 0x0108b734: 0x108b734: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0108b114: 0x108b114: addu  a2, s5, zero
+// 0x0108b738: 0x108b738: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x0108b118: 0x108b118: sw    s4, 24(sp)
+// 0x0108b73c: 0x108b73c: sw    s4, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1803,7 +1803,7 @@ L_108b0f8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108b11c: 0x108b11c: jal   0x1068250 sw    s3, 16(sp)
+// 0x0108b740: 0x108b740: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1817,62 +1817,62 @@ L_108b0f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0108b124: 0x108b124: bne   v0, zero, 0x108b148 addu  s0, v0, zero
+// 0x0108b748: 0x108b748: bne   v0, zero, 0x108b76c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_108b148
+	brtrue L_108b76c
 // --- basic block ---
-// 0x0108b12c: 0x108b12c: lui   a1, 0x20000
+// 0x0108b750: 0x108b750: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108b130: 0x108b130: lui   a3, 0x20000
+// 0x0108b754: 0x108b754: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108b134: 0x108b134: addiu a1, a1, -21512
+// 0x0108b758: 0x108b758: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108b138: 0x108b138: addiu a3, a3, -7412
+// 0x0108b75c: 0x108b75c: addiu a3, a3, -6948
 	ldloc 4
-	ldc.i4 -7412
+	ldc.i4 -6948
 	add
 	stloc 4
-// 0x0108b13c: 0x108b13c: addiu a0, zero, 4
+// 0x0108b760: 0x108b760: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108b140: 0x108b140: j	 0x108b188 addiu a2, zero, 272
+// 0x0108b764: 0x108b764: j	 0x108b7ac addiu a2, zero, 272
 	ldc.i4 272
 	stloc.3
-	br L_108b188
+	br L_108b7ac
 // --- basic block ---
-L_108b148:
-// 0x0108b148: 0x108b148: lui   a3, 0x0
+L_108b76c:
+// 0x0108b76c: 0x108b76c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108b14c: 0x108b14c: addu  a0, v0, zero
+// 0x0108b770: 0x108b770: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108b150: 0x108b150: addu  a2, s5, zero
+// 0x0108b774: 0x108b774: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x0108b154: 0x108b154: addiu a3, a3, 30268
+// 0x0108b778: 0x108b778: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x0108b158: 0x108b158: addiu a1, s1, 64
+// 0x0108b77c: 0x108b77c: addiu a1, s1, 64
 	ldloc 9
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x0108b15c: 0x108b15c: sw    s4, 24(sp)
+// 0x0108b780: 0x108b780: sw    s4, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1881,7 +1881,7 @@ L_108b148:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108b160: 0x108b160: jal   0x1068250 sw    s3, 16(sp)
+// 0x0108b784: 0x108b784: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1895,41 +1895,41 @@ L_108b148:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0108b168: 0x108b168: bne   v0, zero, 0x108b19c addu  s0, v0, zero
+// 0x0108b78c: 0x108b78c: bne   v0, zero, 0x108b7c0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_108b19c
+	brtrue L_108b7c0
 // --- basic block ---
-// 0x0108b170: 0x108b170: lui   a1, 0x20000
+// 0x0108b794: 0x108b794: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108b174: 0x108b174: lui   a3, 0x20000
+// 0x0108b798: 0x108b798: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108b178: 0x108b178: addiu a1, a1, -21512
+// 0x0108b79c: 0x108b79c: addiu a1, a1, -21048
 	ldloc.2
-	ldc.i4 -21512
+	ldc.i4 -21048
 	add
 	stloc.2
-// 0x0108b17c: 0x108b17c: addiu a3, a3, -7324
+// 0x0108b7a0: 0x108b7a0: addiu a3, a3, -6860
 	ldloc 4
-	ldc.i4 -7324
+	ldc.i4 -6860
 	add
 	stloc 4
-// 0x0108b180: 0x108b180: addiu a0, zero, 4
+// 0x0108b7a4: 0x108b7a4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108b184: 0x108b184: addiu a2, zero, 287
+// 0x0108b7a8: 0x108b7a8: addiu a2, zero, 287
 	ldc.i4 287
 	stloc.3
-L_108b188:
-// 0x0108b188: 0x108b188: jal   0x100449c sll   zero, zero, 0
+L_108b7ac:
+// 0x0108b7ac: 0x108b7ac: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1940,28 +1940,28 @@ L_108b188:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0108b190: 0x108b190: addiu v0, zero, 18
+// 0x0108b7b4: 0x108b7b4: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0108b194: 0x108b194: j	 0x108b1ac sw    v0, 0(s2)
+// 0x0108b7b8: 0x108b7b8: j	 0x108b7d0 sw    v0, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_108b1ac
+	br L_108b7d0
 // --- basic block ---
-L_108b19c:
-// 0x0108b19c: 0x108b19c: addiu a0, s1, 128
+L_108b7c0:
+// 0x0108b7c0: 0x108b7c0: addiu a0, s1, 128
 	ldloc 9
 	ldc.i4 128
 	add
 	stloc.1
-// 0x0108b1a0: 0x108b1a0: addu  a1, zero, zero
+// 0x0108b7c4: 0x108b7c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108b1a4: 0x108b1a4: jal   0x100177c addiu a2, zero, 63
+// 0x0108b7c8: 0x108b7c8: jal   0x100177c addiu a2, zero, 63
 	ldc.i4.s 63
 	stloc.3
 	ldloc.1
@@ -1973,12 +1973,12 @@ L_108b19c:
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_108b1ac:
-// 0x0108b1ac: 0x108b1ac: lw    ra, 60(sp)
-// 0x0108b1b0: 0x108b1b0: addu  v0, s0, zero
+L_108b7d0:
+// 0x0108b7d0: 0x108b7d0: lw    ra, 60(sp)
+// 0x0108b7d4: 0x108b7d4: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0108b1b4: 0x108b1b4: lw    s5, 56(sp)
+// 0x0108b7d8: 0x108b7d8: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1987,7 +1987,7 @@ L_108b1ac:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108b1b8: 0x108b1b8: lw    s4, 52(sp)
+// 0x0108b7dc: 0x108b7dc: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1996,7 +1996,7 @@ L_108b1ac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108b1bc: 0x108b1bc: lw    s3, 48(sp)
+// 0x0108b7e0: 0x108b7e0: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2005,7 +2005,7 @@ L_108b1ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108b1c0: 0x108b1c0: lw    s2, 44(sp)
+// 0x0108b7e4: 0x108b7e4: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2014,7 +2014,7 @@ L_108b1ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108b1c4: 0x108b1c4: lw    s1, 40(sp)
+// 0x0108b7e8: 0x108b7e8: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2023,7 +2023,7 @@ L_108b1ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108b1c8: 0x108b1c8: lw    s0, 36(sp)
+// 0x0108b7ec: 0x108b7ec: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2032,7 +2032,7 @@ L_108b1ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108b1cc: 0x108b1cc: jr    ra addiu sp, sp, 64
+// 0x0108b7f0: 0x108b7f0: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2044,7 +2044,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTUsers_Count_108b1d4(int32)
+.method public static int32 RTUsers_Count_108b7f8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2064,7 +2064,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b1d4: 0x108b1d4: lw    v0, 28400(a0)
+// 0x0108b7f8: 0x108b7f8: lw    v0, 28400(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2073,13 +2073,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108b1d8: 0x108b1d8: jr    ra sll   zero, zero, 0
+// 0x0108b7fc: 0x108b7fc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 RTUsers_IsEmpty_108b1e0(int32)
+.method public static int32 RTUsers_IsEmpty_108b804(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2099,7 +2099,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b1e0: 0x108b1e0: lw    v0, 28400(a0)
+// 0x0108b804: 0x108b804: lw    v0, 28400(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2108,7 +2108,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108b1e4: 0x108b1e4: jr    ra sltiu v0, v0, 1
+// 0x0108b808: 0x108b808: jr    ra sltiu v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
@@ -2118,7 +2118,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 RTUsers_Update_108b1ec(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_Update_108b810(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 ra,int32 lo)
@@ -2162,12 +2162,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b1ec: 0x108b1ec: addiu sp, sp, -32
+// 0x0108b810: 0x108b810: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108b1f0: 0x108b1f0: sw    s0, 20(sp)
+// 0x0108b814: 0x108b814: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2176,18 +2176,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108b1f4: 0x108b1f4: lw    a2, 0(a1)
+// 0x0108b818: 0x108b818: lw    a2, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0108b1f8: 0x108b1f8: addu  s0, a1, zero
+// 0x0108b81c: 0x108b81c: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0108b1fc: 0x108b1fc: sw    ra, 28(sp)
-// 0x0108b200: 0x108b200: sw    s1, 24(sp)
+// 0x0108b820: 0x108b820: sw    ra, 28(sp)
+// 0x0108b824: 0x108b824: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2196,7 +2196,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108b204: 0x108b204: lw    a1, 28400(a0)
+// 0x0108b828: 0x108b828: lw    a1, 28400(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2205,55 +2205,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108b208: 0x108b208: addu  v1, a0, zero
+// 0x0108b82c: 0x108b82c: addu  v1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108b20c: 0x108b20c: j	 0x108b270 addu  v0, zero, zero
+// 0x0108b830: 0x108b830: j	 0x108b894 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_108b270
+	br L_108b894
 // --- basic block ---
-L_108b214:
-// 0x0108b214: 0x108b214: lw    a3, 0(v1)
+L_108b838:
+// 0x0108b838: 0x108b838: lw    a3, 0(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108b218: 0x108b218: sll   zero, zero, 0
-// 0x0108b21c: 0x108b21c: bne   a3, a2, 0x108b26c addiu v1, v1, 568
+// 0x0108b83c: 0x108b83c: sll   zero, zero, 0
+// 0x0108b840: 0x108b840: bne   a3, a2, 0x108b890 addiu v1, v1, 568
 	ldloc 4
 	ldloc.3
 	ldloc 8
 	ldc.i4 568
 	add
 	stloc 8
-	bne.un L_108b26c
+	bne.un L_108b890
 // --- basic block ---
-// 0x0108b224: 0x108b224: addiu s1, zero, 568
+// 0x0108b848: 0x108b848: addiu s1, zero, 568
 	ldc.i4 568
 	stloc 7
-// 0x0108b228: 0x108b228: mult  v0, s1
+// 0x0108b84c: 0x108b84c: mult  v0, s1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 11
-// 0x0108b22c: 0x108b22c: addu  a1, s0, zero
+// 0x0108b850: 0x108b850: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0108b230: 0x108b230: addiu a2, zero, 568
+// 0x0108b854: 0x108b854: addiu a2, zero, 568
 	ldc.i4 568
 	stloc.3
-// 0x0108b234: 0x108b234: mflo  lo
+// 0x0108b858: 0x108b858: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0108b238: 0x108b238: addu  s1, a0, s1
+// 0x0108b85c: 0x108b85c: addu  s1, a0, s1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0108b23c: 0x108b23c: lw    v0, 564(s1)
+// 0x0108b860: 0x108b860: lw    v0, 564(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2262,10 +2262,10 @@ L_108b214:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108b240: 0x108b240: addu  a0, s1, zero
+// 0x0108b864: 0x108b864: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0108b244: 0x108b244: jal   0x1001800 sw    v0, 564(s0)
+// 0x0108b868: 0x108b868: jal   0x1001800 sw    v0, 564(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2283,20 +2283,20 @@ L_108b214:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108b24c: 0x108b24c: lui   v0, 0x80000
+// 0x0108b870: 0x108b870: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108b250: 0x108b250: lw    v0, -2116(v0)
+// 0x0108b874: 0x108b874: lw    v0, -1652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -529
+	ldc.i4 -413
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108b254: 0x108b254: sll   zero, zero, 0
-// 0x0108b258: 0x108b258: jalr  v0 addu  a0, s0, zero
+// 0x0108b878: 0x108b878: sll   zero, zero, 0
+// 0x0108b87c: 0x108b87c: jalr  v0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -2310,10 +2310,10 @@ L_108b214:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108b260: 0x108b260: addiu v0, zero, 1
+// 0x0108b884: 0x108b884: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108b264: 0x108b264: j	 0x108b280 sw    v0, 244(s1)
+// 0x0108b888: 0x108b888: j	 0x108b8a4 sw    v0, 244(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2322,30 +2322,30 @@ L_108b214:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108b280
+	br L_108b8a4
 // --- basic block ---
-L_108b26c:
-// 0x0108b26c: 0x108b26c: addiu v0, v0, 1
+L_108b890:
+// 0x0108b890: 0x108b890: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_108b270:
-// 0x0108b270: 0x108b270: slt   a3, v0, a1
+L_108b894:
+// 0x0108b894: 0x108b894: slt   a3, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 4
-// 0x0108b274: 0x108b274: bne   a3, zero, 0x108b214 sll   zero, zero, 0
+// 0x0108b898: 0x108b898: bne   a3, zero, 0x108b838 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_108b214
+	brtrue L_108b838
 // --- basic block ---
-// 0x0108b27c: 0x108b27c: addu  v0, zero, zero
+// 0x0108b8a0: 0x108b8a0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_108b280:
-// 0x0108b280: 0x108b280: lw    ra, 28(sp)
-// 0x0108b284: 0x108b284: lw    s1, 24(sp)
+L_108b8a4:
+// 0x0108b8a4: 0x108b8a4: lw    ra, 28(sp)
+// 0x0108b8a8: 0x108b8a8: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2354,7 +2354,7 @@ L_108b280:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108b288: 0x108b288: lw    s0, 20(sp)
+// 0x0108b8ac: 0x108b8ac: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2363,7 +2363,7 @@ L_108b280:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108b28c: 0x108b28c: jr    ra addiu sp, sp, 32
+// 0x0108b8b0: 0x108b8b0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2375,7 +2375,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTUsers_ResetUpdateFlag_108b2e4(int32,int32)
+.method public static int32 RTUsers_ResetUpdateFlag_108b908(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2401,10 +2401,10 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b2e4: 0x108b2e4: addu  v1, a0, zero
+// 0x0108b908: 0x108b908: addu  v1, a0, zero
 	ldloc.0
 	stloc.3
-// 0x0108b2e8: 0x108b2e8: lw    a0, 28400(a0)
+// 0x0108b90c: 0x108b90c: lw    a0, 28400(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2413,13 +2413,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0108b2ec: 0x108b2ec: j	 0x108b2fc addu  v0, zero, zero
+// 0x0108b910: 0x108b910: j	 0x108b920 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_108b2fc
+	br L_108b920
 // --- basic block ---
-L_108b2f4:
-// 0x0108b2f4: 0x108b2f4: sw    zero, -324(v1)
+L_108b918:
+// 0x0108b918: 0x108b918: sw    zero, -324(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
@@ -2428,26 +2428,26 @@ L_108b2f4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b2f8: 0x108b2f8: addiu v0, v0, 1
+// 0x0108b91c: 0x108b91c: addiu v0, v0, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-L_108b2fc:
-// 0x0108b2fc: 0x108b2fc: slt   a1, v0, a0
+L_108b920:
+// 0x0108b920: 0x108b920: slt   a1, v0, a0
 	ldloc.2
 	ldloc.0
 	clt
 	stloc.1
-// 0x0108b300: 0x108b300: bne   a1, zero, 0x108b2f4 addiu v1, v1, 568
+// 0x0108b924: 0x108b924: bne   a1, zero, 0x108b918 addiu v1, v1, 568
 	ldloc.1
 	ldloc.3
 	ldc.i4 568
 	add
 	stloc.3
-	brtrue L_108b2f4
+	brtrue L_108b918
 // --- basic block ---
-// 0x0108b308: 0x108b308: jr    ra sll   zero, zero, 0
+// 0x0108b92c: 0x108b92c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -2455,7 +2455,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 RTUsers_RedoUpdateFlag_108b310(int32,int32,int32)
+.method public static int32 RTUsers_RedoUpdateFlag_108b934(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2484,10 +2484,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b310: 0x108b310: addu  v1, a0, zero
+// 0x0108b934: 0x108b934: addu  v1, a0, zero
 	ldloc.0
 	stloc 4
-// 0x0108b314: 0x108b314: lw    a1, 28400(a0)
+// 0x0108b938: 0x108b938: lw    a1, 28400(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2496,16 +2496,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108b318: 0x108b318: addu  v0, zero, zero
+// 0x0108b93c: 0x108b93c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108b31c: 0x108b31c: j	 0x108b32c addiu a0, zero, 1
+// 0x0108b940: 0x108b940: j	 0x108b950 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.0
-	br L_108b32c
+	br L_108b950
 // --- basic block ---
-L_108b324:
-// 0x0108b324: 0x108b324: sw    a0, -324(v1)
+L_108b948:
+// 0x0108b948: 0x108b948: sw    a0, -324(v1)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -2514,26 +2514,26 @@ L_108b324:
 	add
 	ldloc.0
 	stelem.i4
-// 0x0108b328: 0x108b328: addiu v0, v0, 1
+// 0x0108b94c: 0x108b94c: addiu v0, v0, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-L_108b32c:
-// 0x0108b32c: 0x108b32c: slt   a2, v0, a1
+L_108b950:
+// 0x0108b950: 0x108b950: slt   a2, v0, a1
 	ldloc.3
 	ldloc.1
 	clt
 	stloc.2
-// 0x0108b330: 0x108b330: bne   a2, zero, 0x108b324 addiu v1, v1, 568
+// 0x0108b954: 0x108b954: bne   a2, zero, 0x108b948 addiu v1, v1, 568
 	ldloc.2
 	ldloc 4
 	ldc.i4 568
 	add
 	stloc 4
-	brtrue L_108b324
+	brtrue L_108b948
 // --- basic block ---
-// 0x0108b338: 0x108b338: jr    ra sll   zero, zero, 0
+// 0x0108b95c: 0x108b95c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -2541,7 +2541,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 RTUsers_UserByID_108b378(int32,int32,int32,int32)
+.method public static int32 RTUsers_UserByID_108b99c(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32 lo,int32[] mem)
@@ -2576,7 +2576,7 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b378: 0x108b378: lw    a2, 28400(a0)
+// 0x0108b99c: 0x108b99c: lw    a2, 28400(a0)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2585,67 +2585,67 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108b37c: 0x108b37c: addu  v1, a0, zero
+// 0x0108b9a0: 0x108b9a0: addu  v1, a0, zero
 	ldloc.0
 	stloc 5
-// 0x0108b380: 0x108b380: j	 0x108b3b0 addu  v0, zero, zero
+// 0x0108b9a4: 0x108b9a4: j	 0x108b9d4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_108b3b0
+	br L_108b9d4
 // --- basic block ---
-L_108b388:
-// 0x0108b388: 0x108b388: lw    a3, 0(v1)
+L_108b9ac:
+// 0x0108b9ac: 0x108b9ac: lw    a3, 0(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0108b38c: 0x108b38c: sll   zero, zero, 0
-// 0x0108b390: 0x108b390: bne   a3, a1, 0x108b3ac addiu v1, v1, 568
+// 0x0108b9b0: 0x108b9b0: sll   zero, zero, 0
+// 0x0108b9b4: 0x108b9b4: bne   a3, a1, 0x108b9d0 addiu v1, v1, 568
 	ldloc.3
 	ldloc.1
 	ldloc 5
 	ldc.i4 568
 	add
 	stloc 5
-	bne.un L_108b3ac
+	bne.un L_108b9d0
 // --- basic block ---
-// 0x0108b398: 0x108b398: addiu v1, zero, 568
+// 0x0108b9bc: 0x108b9bc: addiu v1, zero, 568
 	ldc.i4 568
 	stloc 5
-// 0x0108b39c: 0x108b39c: mult  v0, v1
+// 0x0108b9c0: 0x108b9c0: mult  v0, v1
 	ldloc 4
 	ldloc 5
 	mul
 	stloc 7
-// 0x0108b3a0: 0x108b3a0: mflo  lo
+// 0x0108b9c4: 0x108b9c4: mflo  lo
 	ldloc 7
 	stloc 4
-// 0x0108b3a4: 0x108b3a4: jr    ra addu  v0, a0, v0
+// 0x0108b9c8: 0x108b9c8: jr    ra addu  v0, a0, v0
 	ldloc.0
 	ldloc 4
 	add
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_108b3ac:
-// 0x0108b3ac: 0x108b3ac: addiu v0, v0, 1
+L_108b9d0:
+// 0x0108b9d0: 0x108b9d0: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-L_108b3b0:
-// 0x0108b3b0: 0x108b3b0: slt   a3, v0, a2
+L_108b9d4:
+// 0x0108b9d4: 0x108b9d4: slt   a3, v0, a2
 	ldloc 4
 	ldloc.2
 	clt
 	stloc.3
-// 0x0108b3b4: 0x108b3b4: bne   a3, zero, 0x108b388 sll   zero, zero, 0
+// 0x0108b9d8: 0x108b9d8: bne   a3, zero, 0x108b9ac sll   zero, zero, 0
 	ldloc.3
-	brtrue L_108b388
+	brtrue L_108b9ac
 // --- basic block ---
-// 0x0108b3bc: 0x108b3bc: jr    ra addu  v0, zero, zero
+// 0x0108b9e0: 0x108b9e0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
@@ -2655,7 +2655,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 on_close_108b3c4(int32,int32,int32,int32,int32)
+.method public static int32 on_close_108b9e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2690,35 +2690,35 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b3c4: 0x108b3c4: addiu sp, sp, -24
+// 0x0108b9e8: 0x108b9e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108b3c8: 0x108b3c8: sw    ra, 20(sp)
-// 0x0108b3cc: 0x108b3cc: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x0108b9ec: 0x108b9ec: sw    ra, 20(sp)
+// 0x0108b9f0: 0x108b9f0: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0108b3d4: 0x108b3d4: beq   v0, zero, 0x108b404 sll   zero, zero, 0
+// 0x0108b9f8: 0x108b9f8: beq   v0, zero, 0x108ba28 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108b404
+	brfalse L_108ba28
 // --- basic block ---
-// 0x0108b3dc: 0x108b3dc: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0108ba00: 0x108ba00: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b3e4: 0x108b3e4: lui   a1, 0x20000
+// 0x0108ba08: 0x108ba08: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108b3e8: 0x108b3e8: addu  a0, v0, zero
+// 0x0108ba0c: 0x108ba0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108b3ec: 0x108b3ec: jal   0x1001b14 addiu a1, a1, -7240
+// 0x0108ba10: 0x108ba10: jal   0x1001b14 addiu a1, a1, -6776
 	ldloc.2
-	ldc.i4 -7240
+	ldc.i4 -6776
 	add
 	stloc.2
 	ldloc.1
@@ -2726,11 +2726,11 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108b3f4: 0x108b3f4: bne   v0, zero, 0x108b404 sll   zero, zero, 0
+// 0x0108ba18: 0x108ba18: bne   v0, zero, 0x108ba28 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_108b404
+	brtrue L_108ba28
 // --- basic block ---
-// 0x0108b3fc: 0x108b3fc: jal   0x1094b64 addu  a0, zero, zero
+// 0x0108ba20: 0x108ba20: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2738,17 +2738,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108b404:
-// 0x0108b404: 0x108b404: lw    ra, 20(sp)
-// 0x0108b408: 0x108b408: addu  v0, zero, zero
+L_108ba28:
+// 0x0108ba28: 0x108ba28: lw    ra, 20(sp)
+// 0x0108ba2c: 0x108ba2c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0108b40c: 0x108b40c: jr    ra addiu sp, sp, 24
+// 0x0108ba30: 0x108ba30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2760,7 +2760,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 prepareValueString_108b414(int32,int32,int32,int32,int32)
+.method public static int32 prepareValueString_108ba38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 lo,int32 ra)
@@ -2801,23 +2801,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b414: 0x108b414: addu  a3, a0, zero
+// 0x0108ba38: 0x108ba38: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x0108b418: 0x108b418: lui   a0, 0x20000
+// 0x0108ba3c: 0x108ba3c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108b41c: 0x108b41c: addiu sp, sp, -40
+// 0x0108ba40: 0x108ba40: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0108b420: 0x108b420: addiu a0, a0, -6328
+// 0x0108ba44: 0x108ba44: addiu a0, a0, -5864
 	ldloc.1
-	ldc.i4 -6328
+	ldc.i4 -5864
 	add
 	stloc.1
-// 0x0108b424: 0x108b424: sw    a3, 28(sp)
+// 0x0108ba48: 0x108ba48: sw    a3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2826,8 +2826,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0108b428: 0x108b428: sw    ra, 36(sp)
-// 0x0108b42c: 0x108b42c: sw    s0, 32(sp)
+// 0x0108ba4c: 0x108ba4c: sw    ra, 36(sp)
+// 0x0108ba50: 0x108ba50: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2836,7 +2836,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108b430: 0x108b430: sw    a2, 24(sp)
+// 0x0108ba54: 0x108ba54: sw    a2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2845,7 +2845,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0108b434: 0x108b434: jal   0x101cd60 addu  s0, a1, zero
+// 0x0108ba58: 0x108ba58: jal   0x101cd70 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -2853,12 +2853,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0108b43c: 0x108b43c: lw    a2, 24(sp)
+// 0x0108ba60: 0x108ba60: lw    a2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2867,10 +2867,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108b440: 0x108b440: addu  a1, v0, zero
+// 0x0108ba64: 0x108ba64: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x0108b444: 0x108b444: jal   0x1001b14 addu  a0, a2, zero
+// 0x0108ba68: 0x108ba68: jal   0x1001b14 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.1
@@ -2878,7 +2878,7 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0108b44c: 0x108b44c: lw    a3, 28(sp)
+// 0x0108ba70: 0x108ba70: lw    a3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2887,24 +2887,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108b450: 0x108b450: beq   v0, zero, 0x108b474 lui   v0, 0x20000
+// 0x0108ba74: 0x108ba74: beq   v0, zero, 0x108ba98 lui   v0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_108b474
+	brfalse L_108ba98
 // --- basic block ---
-// 0x0108b458: 0x108b458: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x0108ba7c: 0x108ba7c: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0108b45c: 0x108b45c: addu  a0, s0, zero
+// 0x0108ba80: 0x108ba80: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108b460: 0x108b460: addiu a2, a2, -13884
+// 0x0108ba84: 0x108ba84: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0108b464: 0x108b464: jal   0x1000f9c addiu a1, zero, 30
+// 0x0108ba88: 0x108ba88: jal   0x1000f9c addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
 	ldloc.0
@@ -2917,215 +2917,215 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0108b46c: 0x108b46c: j	 0x108b548 sll   zero, zero, 0
-	br L_108b548
+// 0x0108ba90: 0x108ba90: j	 0x108bb6c sll   zero, zero, 0
+	br L_108bb6c
 // --- basic block ---
-L_108b474:
-// 0x0108b474: 0x108b474: addiu v0, v0, 29452
+L_108ba98:
+// 0x0108ba98: 0x108ba98: addiu v0, v0, 29916
 	ldloc 6
-	ldc.i4 29452
+	ldc.i4 29916
 	add
 	stloc 6
-// 0x0108b478: 0x108b478: addu  a0, zero, zero
+// 0x0108ba9c: 0x108ba9c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0108b47c: 0x108b47c: addiu v1, zero, 16
+// 0x0108baa0: 0x108baa0: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 5
-L_108b480:
-// 0x0108b480: 0x108b480: lw    a1, 0(v0)
+L_108baa4:
+// 0x0108baa4: 0x108baa4: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0108b484: 0x108b484: sll   zero, zero, 0
-// 0x0108b488: 0x108b488: slt   a1, a3, a1
+// 0x0108baa8: 0x108baa8: sll   zero, zero, 0
+// 0x0108baac: 0x108baac: slt   a1, a3, a1
 	ldloc 4
 	ldloc.2
 	clt
 	stloc.2
-// 0x0108b48c: 0x108b48c: bne   a1, zero, 0x108b4a0 addiu v0, v0, 4
+// 0x0108bab0: 0x108bab0: bne   a1, zero, 0x108bac4 addiu v0, v0, 4
 	ldloc.2
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-	brtrue L_108b4a0
+	brtrue L_108bac4
 // --- basic block ---
-// 0x0108b494: 0x108b494: addiu a0, a0, 1
+// 0x0108bab8: 0x108bab8: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0108b498: 0x108b498: bne   a0, v1, 0x108b480 sll   zero, zero, 0
+// 0x0108babc: 0x108babc: bne   a0, v1, 0x108baa4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_108b480
+	bne.un L_108baa4
 // --- basic block ---
-L_108b4a0:
-// 0x0108b4a0: 0x108b4a0: lui   v1, 0x3fff0000
+L_108bac4:
+// 0x0108bac4: 0x108bac4: lui   v1, 0x3fff0000
 	ldc.i4 1073676288
 	stloc 5
-// 0x0108b4a4: 0x108b4a4: ori   v1, v1, 65535
+// 0x0108bac8: 0x108bac8: ori   v1, v1, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x0108b4a8: 0x108b4a8: addu  v1, a0, v1
+// 0x0108bacc: 0x108bacc: addu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0108b4ac: 0x108b4ac: lui   v0, 0x20000
+// 0x0108bad0: 0x108bad0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0108b4b0: 0x108b4b0: addiu v0, v0, 29452
+// 0x0108bad4: 0x108bad4: addiu v0, v0, 29916
 	ldloc 6
-	ldc.i4 29452
+	ldc.i4 29916
 	add
 	stloc 6
-// 0x0108b4b4: 0x108b4b4: sll   v1, v1, 2
+// 0x0108bad8: 0x108bad8: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0108b4b8: 0x108b4b8: addu  v1, v1, v0
+// 0x0108badc: 0x108badc: addu  v1, v1, v0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0108b4bc: 0x108b4bc: lw    a3, 0(v1)
+// 0x0108bae0: 0x108bae0: lw    a3, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108b4c0: 0x108b4c0: lui   v1, 0xf0000
+// 0x0108bae4: 0x108bae4: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108b4c4: 0x108b4c4: sll   a0, a0, 2
+// 0x0108bae8: 0x108bae8: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0108b4c8: 0x108b4c8: ori   a1, v1, 16961
+// 0x0108baec: 0x108baec: ori   a1, v1, 16961
 	ldloc 5
 	ldc.i4 16961
 	or
 	stloc.2
-// 0x0108b4cc: 0x108b4cc: addu  v0, a0, v0
+// 0x0108baf0: 0x108baf0: addu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x0108b4d0: 0x108b4d0: slt   a1, a3, a1
+// 0x0108baf4: 0x108baf4: slt   a1, a3, a1
 	ldloc 4
 	ldloc.2
 	clt
 	stloc.2
-// 0x0108b4d4: 0x108b4d4: lw    v0, 0(v0)
+// 0x0108baf8: 0x108baf8: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0108b4d8: 0x108b4d8: bne   a1, zero, 0x108b4f8 ori   v1, v1, 16960
+// 0x0108bafc: 0x108bafc: bne   a1, zero, 0x108bb1c ori   v1, v1, 16960
 	ldloc.2
 	ldloc 5
 	ldc.i4 16960
 	or
 	stloc 5
-	brtrue L_108b4f8
+	brtrue L_108bb1c
 // --- basic block ---
-// 0x0108b4e0: 0x108b4e0: div   a3, v1
+// 0x0108bb04: 0x108bb04: div   a3, v1
 	ldloc 4
 	ldloc 5
 	div
 	stloc 9
-// 0x0108b4e4: 0x108b4e4: lui   a2, 0x20000
+// 0x0108bb08: 0x108bb08: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108b4e8: 0x108b4e8: addu  a0, s0, zero
+// 0x0108bb0c: 0x108bb0c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108b4ec: 0x108b4ec: mflo  lo
+// 0x0108bb10: 0x108bb10: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0108b4f0: 0x108b4f0: j	 0x108b520 addiu a2, a2, -7224
+// 0x0108bb14: 0x108bb14: j	 0x108bb44 addiu a2, a2, -6760
 	ldloc.3
-	ldc.i4 -7224
+	ldc.i4 -6760
 	add
 	stloc.3
-	br L_108b520
+	br L_108bb44
 // --- basic block ---
-L_108b4f8:
-// 0x0108b4f8: 0x108b4f8: slti  v1, a3, 1001
+L_108bb1c:
+// 0x0108bb1c: 0x108bb1c: slti  v1, a3, 1001
 	ldloc 4
 	ldc.i4 1001
 	clt
 	stloc 5
-// 0x0108b4fc: 0x108b4fc: bne   v1, zero, 0x108b530 addiu v1, zero, 1000
+// 0x0108bb20: 0x108bb20: bne   v1, zero, 0x108bb54 addiu v1, zero, 1000
 	ldloc 5
 	ldc.i4 1000
 	stloc 5
-	brtrue L_108b530
+	brtrue L_108bb54
 // --- basic block ---
-// 0x0108b504: 0x108b504: div   a3, v1
+// 0x0108bb28: 0x108bb28: div   a3, v1
 	ldloc 4
 	ldloc 5
 	div
 	stloc 9
-// 0x0108b508: 0x108b508: lui   a2, 0x20000
+// 0x0108bb2c: 0x108bb2c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108b50c: 0x108b50c: addu  a0, s0, zero
+// 0x0108bb30: 0x108bb30: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108b510: 0x108b510: addiu a2, a2, -7216
+// 0x0108bb34: 0x108bb34: addiu a2, a2, -6752
 	ldloc.3
-	ldc.i4 -7216
+	ldc.i4 -6752
 	add
 	stloc.3
-// 0x0108b514: 0x108b514: mflo  lo
+// 0x0108bb38: 0x108bb38: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0108b518: 0x108b518: sll   zero, zero, 0
-// 0x0108b51c: 0x108b51c: sll   zero, zero, 0
-L_108b520:
-// 0x0108b520: 0x108b520: div   v0, v1
+// 0x0108bb3c: 0x108bb3c: sll   zero, zero, 0
+// 0x0108bb40: 0x108bb40: sll   zero, zero, 0
+L_108bb44:
+// 0x0108bb44: 0x108bb44: div   v0, v1
 	ldloc 6
 	ldloc 5
 	div
 	stloc 9
-// 0x0108b524: 0x108b524: mflo  lo
+// 0x0108bb48: 0x108bb48: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0108b528: 0x108b528: j	 0x108b540 addiu a1, zero, 30
+// 0x0108bb4c: 0x108bb4c: j	 0x108bb64 addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
-	br L_108b540
+	br L_108bb64
 // --- basic block ---
-L_108b530:
-// 0x0108b530: 0x108b530: lui   a2, 0x20000
+L_108bb54:
+// 0x0108bb54: 0x108bb54: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108b534: 0x108b534: addu  a0, s0, zero
+// 0x0108bb58: 0x108bb58: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108b538: 0x108b538: addiu a2, a2, -7208
+// 0x0108bb5c: 0x108bb5c: addiu a2, a2, -6744
 	ldloc.3
-	ldc.i4 -7208
+	ldc.i4 -6744
 	add
 	stloc.3
-// 0x0108b53c: 0x108b53c: addiu a1, zero, 30
+// 0x0108bb60: 0x108bb60: addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
-L_108b540:
-// 0x0108b540: 0x108b540: jal   0x1000f9c sw    v0, 16(sp)
+L_108bb64:
+// 0x0108bb64: 0x108bb64: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3144,9 +3144,9 @@ L_108b540:
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_108b548:
-// 0x0108b548: 0x108b548: lw    ra, 36(sp)
-// 0x0108b54c: 0x108b54c: lw    s0, 32(sp)
+L_108bb6c:
+// 0x0108bb6c: 0x108bb6c: lw    ra, 36(sp)
+// 0x0108bb70: 0x108bb70: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3155,7 +3155,7 @@ L_108b548:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108b550: 0x108b550: jr    ra addiu sp, sp, 40
+// 0x0108bb74: 0x108bb74: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3167,7 +3167,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTUserLocation_CreateGUIID_108b558(int32,int32,int32,int32,int32)
+.method public static int32 RTUserLocation_CreateGUIID_108bb7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3202,33 +3202,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b558: 0x108b558: lw    a3, 0(a0)
+// 0x0108bb7c: 0x108bb7c: lw    a3, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108b55c: 0x108b55c: lui   a2, 0x20000
+// 0x0108bb80: 0x108bb80: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108b560: 0x108b560: addiu sp, sp, -24
+// 0x0108bb84: 0x108bb84: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108b564: 0x108b564: addiu a2, a2, -7200
+// 0x0108bb88: 0x108bb88: addiu a2, a2, -6736
 	ldloc.3
-	ldc.i4 -7200
+	ldc.i4 -6736
 	add
 	stloc.3
-// 0x0108b568: 0x108b568: addiu a0, a0, 68
+// 0x0108bb8c: 0x108bb8c: addiu a0, a0, 68
 	ldloc.1
 	ldc.i4.s 68
 	add
 	stloc.1
-// 0x0108b56c: 0x108b56c: sw    ra, 20(sp)
-// 0x0108b570: 0x108b570: jal   0x1000f9c addiu a1, zero, 63
+// 0x0108bb90: 0x108bb90: sw    ra, 20(sp)
+// 0x0108bb94: 0x108bb94: jal   0x1000f9c addiu a1, zero, 63
 	ldc.i4.s 63
 	stloc.2
 	ldloc.0
@@ -3241,9 +3241,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108b578: 0x108b578: lw    ra, 20(sp)
-// 0x0108b57c: 0x108b57c: sll   zero, zero, 0
-// 0x0108b580: 0x108b580: jr    ra addiu sp, sp, 24
+// 0x0108bb9c: 0x108bb9c: lw    ra, 20(sp)
+// 0x0108bba0: 0x108bba0: sll   zero, zero, 0
+// 0x0108bba4: 0x108bba4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3255,7 +3255,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 disclaimer_cb_108b588(int32,int32,int32,int32,int32)
+.method public static int32 disclaimer_cb_108bbac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3290,16 +3290,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b588: 0x108b588: lui   a0, 0x10000
+// 0x0108bbac: 0x108bbac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108b58c: 0x108b58c: addiu sp, sp, -32
+// 0x0108bbb0: 0x108bbb0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108b590: 0x108b590: sw    ra, 28(sp)
-// 0x0108b594: 0x108b594: jal   0x101cd60 addiu a0, a0, -19132
+// 0x0108bbb4: 0x108bbb4: sw    ra, 28(sp)
+// 0x0108bbb8: 0x108bbb8: jal   0x101cd70 addiu a0, a0, -19132
 	ldloc.1
 	ldc.i4 -19132
 	add
@@ -3309,51 +3309,51 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b59c: 0x108b59c: lui   v1, 0x80000
+// 0x0108bbc0: 0x108bbc0: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108b5a0: 0x108b5a0: addu  a0, v0, zero
+// 0x0108bbc4: 0x108bbc4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108b5a4: 0x108b5a4: lw    a3, -2108(v1)
+// 0x0108bbc8: 0x108bbc8: lw    a3, -1644(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -527
+	ldc.i4 -411
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108b5a8: 0x108b5a8: lui   a1, 0x10000
+// 0x0108bbcc: 0x108bbcc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108b5ac: 0x108b5ac: lui   a2, 0x1090000
+// 0x0108bbd0: 0x108bbd0: lui   a2, 0x1090000
 	ldc.i4 17367040
 	stloc.3
-// 0x0108b5b0: 0x108b5b0: lui   v0, 0x20000
+// 0x0108bbd4: 0x108bbd4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0108b5b4: 0x108b5b4: ori   v0, v0, 1
+// 0x0108bbd8: 0x108bbd8: ori   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 5
-// 0x0108b5b8: 0x108b5b8: addiu a1, a1, 18500
+// 0x0108bbdc: 0x108bbdc: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108b5bc: 0x108b5bc: addiu a2, a2, -18740
+// 0x0108bbe0: 0x108bbe0: addiu a2, a2, -17168
 	ldloc.3
-	ldc.i4 -18740
+	ldc.i4 -17168
 	add
 	stloc.3
-// 0x0108b5c0: 0x108b5c0: jal   0x1052e08 sw    v0, 16(sp)
+// 0x0108bbe4: 0x108bbe4: jal   0x1052e18 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3367,14 +3367,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b5c8: 0x108b5c8: lw    ra, 28(sp)
-// 0x0108b5cc: 0x108b5cc: sll   zero, zero, 0
-// 0x0108b5d0: 0x108b5d0: jr    ra addiu sp, sp, 32
+// 0x0108bbec: 0x108bbec: lw    ra, 28(sp)
+// 0x0108bbf0: 0x108bbf0: sll   zero, zero, 0
+// 0x0108bbf4: 0x108bbf4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3386,7 +3386,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 post_comment_keyboard_callback_108b6cc(int32,int32,int32,int32,int32)
+.method public static int32 post_comment_keyboard_callback_108bcf0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra,int32 t0)
@@ -3427,15 +3427,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b6cc: 0x108b6cc: addiu sp, sp, -72
+// 0x0108bcf0: 0x108bcf0: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0108b6d0: 0x108b6d0: addiu v1, zero, 1
+// 0x0108bcf4: 0x108bcf4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0108b6d4: 0x108b6d4: sw    s0, 64(sp)
+// 0x0108bcf8: 0x108bcf8: sw    s0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3444,37 +3444,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108b6d8: 0x108b6d8: sw    ra, 68(sp)
-// 0x0108b6dc: 0x108b6dc: addu  s0, a1, zero
+// 0x0108bcfc: 0x108bcfc: sw    ra, 68(sp)
+// 0x0108bd00: 0x108bd00: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0108b6e0: 0x108b6e0: bne   a0, v1, 0x108b778 addiu v0, zero, 1
+// 0x0108bd04: 0x108bd04: bne   a0, v1, 0x108bd9c addiu v0, zero, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	stloc 6
-	bne.un L_108b778
+	bne.un L_108bd9c
 // --- basic block ---
-// 0x0108b6e8: 0x108b6e8: lb    v1, 0(a1)
+// 0x0108bd0c: 0x108bd0c: lb    v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0108b6ec: 0x108b6ec: sll   zero, zero, 0
-// 0x0108b6f0: 0x108b6f0: beq   v1, zero, 0x108b778 addu  v0, zero, zero
+// 0x0108bd10: 0x108bd10: sll   zero, zero, 0
+// 0x0108bd14: 0x108bd14: beq   v1, zero, 0x108bd9c addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_108b778
+	brfalse L_108bd9c
 // --- basic block ---
-// 0x0108b6f8: 0x108b6f8: lui   a0, 0x20000
+// 0x0108bd1c: 0x108bd1c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108b6fc: 0x108b6fc: addiu a0, a0, -7092
+// 0x0108bd20: 0x108bd20: addiu a0, a0, -6628
 	ldloc.1
-	ldc.i4 -7092
+	ldc.i4 -6628
 	add
 	stloc.1
-// 0x0108b700: 0x108b700: jal   0x101cd60 sw    a2, 56(sp)
+// 0x0108bd24: 0x108bd24: jal   0x101cd70 sw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3488,19 +3488,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108b708: 0x108b708: jal   0x104c3d0 addu  a0, v0, zero
+// 0x0108bd2c: 0x108bd2c: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 6
 // --- basic block ---
-// 0x0108b710: 0x108b710: lw    a2, 56(sp)
+// 0x0108bd34: 0x108bd34: lw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3509,19 +3509,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108b714: 0x108b714: addiu a0, sp, 32
+// 0x0108bd38: 0x108bd38: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0108b718: 0x108b718: lw    a3, 0(a2)
+// 0x0108bd3c: 0x108bd3c: lw    a3, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108b71c: 0x108b71c: lw    t0, 136(a2)
+// 0x0108bd40: 0x108bd40: lw    t0, 136(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3530,7 +3530,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108b720: 0x108b720: lw    v1, 132(a2)
+// 0x0108bd44: 0x108bd44: lw    v1, 132(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3539,7 +3539,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108b724: 0x108b724: lw    v0, 140(a2)
+// 0x0108bd48: 0x108bd48: lw    v0, 140(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3548,13 +3548,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108b728: 0x108b728: addiu a1, zero, -1
+// 0x0108bd4c: 0x108bd4c: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0108b72c: 0x108b72c: addiu a2, zero, -1
+// 0x0108bd50: 0x108bd50: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108b730: 0x108b730: sw    t0, 36(sp)
+// 0x0108bd54: 0x108bd54: sw    t0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3563,7 +3563,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108b734: 0x108b734: sw    v1, 32(sp)
+// 0x0108bd58: 0x108bd58: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3572,7 +3572,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108b738: 0x108b738: sw    v0, 48(sp)
+// 0x0108bd5c: 0x108bd5c: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3581,7 +3581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108b73c: 0x108b73c: sw    s0, 20(sp)
+// 0x0108bd60: 0x108bd60: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3590,7 +3590,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108b740: 0x108b740: sw    zero, 16(sp)
+// 0x0108bd64: 0x108bd64: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3599,7 +3599,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b744: 0x108b744: sw    zero, 24(sp)
+// 0x0108bd68: 0x108bd68: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3608,7 +3608,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b748: 0x108b748: jal   0x106cdd8 sw    zero, 28(sp)
+// 0x0108bd6c: 0x108bd6c: jal   0x106d3fc sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3622,18 +3622,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_PinqWazer_106cdd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_PinqWazer_106d3fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108b750: 0x108b750: beq   v0, zero, 0x108b764 lui   v0, 0x20000
+// 0x0108bd74: 0x108bd74: beq   v0, zero, 0x108bd88 lui   v0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_108b764
+	brfalse L_108bd88
 // --- basic block ---
-// 0x0108b758: 0x108b758: jal   0x1094a94 addiu a0, zero, 1
+// 0x0108bd7c: 0x108bd7c: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3641,38 +3641,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108b760: 0x108b760: lui   v0, 0x20000
+// 0x0108bd84: 0x108bd84: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-L_108b764:
-// 0x0108b764: 0x108b764: lw    a0, 29516(v0)
+L_108bd88:
+// 0x0108bd88: 0x108bd88: lw    a0, 29980(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7379
+	ldc.i4 7495
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108b768: 0x108b768: addu  a1, zero, zero
+// 0x0108bd8c: 0x108bd8c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108b76c: 0x108b76c: jal   0x104bfdc addu  a2, zero, zero
+// 0x0108bd90: 0x108bd90: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x0108b774: 0x108b774: addiu v0, zero, 1
+// 0x0108bd98: 0x108bd98: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_108b778:
-// 0x0108b778: 0x108b778: lw    ra, 68(sp)
-// 0x0108b77c: 0x108b77c: lw    s0, 64(sp)
+L_108bd9c:
+// 0x0108bd9c: 0x108bd9c: lw    ra, 68(sp)
+// 0x0108bda0: 0x108bda0: lw    s0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3681,7 +3681,7 @@ L_108b778:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108b780: 0x108b780: jr    ra addiu sp, sp, 72
+// 0x0108bda4: 0x108bda4: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3693,7 +3693,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTUsers_Add_108b788(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_Add_108bdac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s1,int32 s0,int32 s3,int32 lo,int32 ra)
@@ -3743,7 +3743,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b788: 0x108b788: lw    v0, 28400(a0)
+// 0x0108bdac: 0x108bdac: lw    v0, 28400(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -3752,15 +3752,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108b78c: 0x108b78c: addiu sp, sp, -160
+// 0x0108bdb0: 0x108bdb0: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x0108b790: 0x108b790: addiu v1, zero, 50
+// 0x0108bdb4: 0x108bdb4: addiu v1, zero, 50
 	ldc.i4.s 50
 	stloc 6
-// 0x0108b794: 0x108b794: sw    s1, 144(sp)
+// 0x0108bdb8: 0x108bdb8: sw    s1, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3769,7 +3769,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108b798: 0x108b798: sw    s0, 140(sp)
+// 0x0108bdbc: 0x108bdbc: sw    s0, 140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3778,8 +3778,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108b79c: 0x108b79c: sw    ra, 156(sp)
-// 0x0108b7a0: 0x108b7a0: sw    s3, 152(sp)
+// 0x0108bdc0: 0x108bdc0: sw    ra, 156(sp)
+// 0x0108bdc4: 0x108bdc4: sw    s3, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3788,7 +3788,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108b7a4: 0x108b7a4: sw    s2, 148(sp)
+// 0x0108bdc8: 0x108bdc8: sw    s2, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3797,96 +3797,96 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108b7a8: 0x108b7a8: addu  s0, a0, zero
+// 0x0108bdcc: 0x108bdcc: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0108b7ac: 0x108b7ac: beq   v0, v1, 0x108b91c addu  s1, a1, zero
+// 0x0108bdd0: 0x108bdd0: beq   v0, v1, 0x108bf40 addu  s1, a1, zero
 	ldloc 5
 	ldloc 6
 	ldloc.2
 	stloc 9
-	beq  L_108b91c
+	beq  L_108bf40
 // --- basic block ---
-// 0x0108b7b4: 0x108b7b4: lw    a1, 0(a1)
+// 0x0108bdd8: 0x108bdd8: lw    a1, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0108b7b8: 0x108b7b8: j	 0x108b7d4 addu  v1, zero, zero
+// 0x0108bddc: 0x108bddc: j	 0x108bdf8 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_108b7d4
+	br L_108bdf8
 // --- basic block ---
-L_108b7c0:
-// 0x0108b7c0: 0x108b7c0: lw    a2, 0(a0)
+L_108bde4:
+// 0x0108bde4: 0x108bde4: lw    a2, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0108b7c4: 0x108b7c4: sll   zero, zero, 0
-// 0x0108b7c8: 0x108b7c8: beq   a2, a1, 0x108b91c addiu a0, a0, 568
+// 0x0108bde8: 0x108bde8: sll   zero, zero, 0
+// 0x0108bdec: 0x108bdec: beq   a2, a1, 0x108bf40 addiu a0, a0, 568
 	ldloc.3
 	ldloc.2
 	ldloc.1
 	ldc.i4 568
 	add
 	stloc.1
-	beq  L_108b91c
+	beq  L_108bf40
 // --- basic block ---
-// 0x0108b7d0: 0x108b7d0: addiu v1, v1, 1
+// 0x0108bdf4: 0x108bdf4: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_108b7d4:
-// 0x0108b7d4: 0x108b7d4: slt   a2, v1, v0
+L_108bdf8:
+// 0x0108bdf8: 0x108bdf8: slt   a2, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc.3
-// 0x0108b7d8: 0x108b7d8: bne   a2, zero, 0x108b7c0 sll   zero, zero, 0
+// 0x0108bdfc: 0x108bdfc: bne   a2, zero, 0x108bde4 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_108b7c0
+	brtrue L_108bde4
 // --- basic block ---
-// 0x0108b7e0: 0x108b7e0: lb    v0, 460(s1)
+// 0x0108be04: 0x108be04: lb    v0, 460(s1)
 	ldloc 9
 	ldc.i4 460
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108b7e4: 0x108b7e4: sll   zero, zero, 0
-// 0x0108b7e8: 0x108b7e8: beq   v0, zero, 0x108b8bc addiu s2, s1, 460
+// 0x0108be08: 0x108be08: sll   zero, zero, 0
+// 0x0108be0c: 0x108be0c: beq   v0, zero, 0x108bee0 addiu s2, s1, 460
 	ldloc 5
 	ldloc 9
 	ldc.i4 460
 	add
 	stloc 8
-	brfalse L_108b8bc
+	brfalse L_108bee0
 // --- basic block ---
-// 0x0108b7f0: 0x108b7f0: addiu s3, sp, 32
+// 0x0108be14: 0x108be14: addiu s3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 11
-// 0x0108b7f4: 0x108b7f4: lui   a2, 0x10000
+// 0x0108be18: 0x108be18: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108b7f8: 0x108b7f8: addiu a2, a2, 6600
+// 0x0108be1c: 0x108be1c: addiu a2, a2, 6596
 	ldloc.3
-	ldc.i4 6600
+	ldc.i4 6596
 	add
 	stloc.3
-// 0x0108b7fc: 0x108b7fc: addu  a3, s2, zero
+// 0x0108be20: 0x108be20: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x0108b800: 0x108b800: addu  a0, s3, zero
+// 0x0108be24: 0x108be24: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0108b804: 0x108b804: jal   0x1000f9c addiu a1, zero, 100
+// 0x0108be28: 0x108be28: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -3899,10 +3899,10 @@ L_108b7d4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b80c: 0x108b80c: addu  a0, s2, zero
+// 0x0108be30: 0x108be30: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0108b810: 0x108b810: jal   0x1001b68 addu  a1, s3, zero
+// 0x0108be34: 0x108be34: jal   0x1001b68 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -3912,13 +3912,13 @@ L_108b7d4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b818: 0x108b818: addu  a0, zero, zero
+// 0x0108be3c: 0x108be3c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0108b81c: 0x108b81c: addiu a1, zero, 1
+// 0x0108be40: 0x108be40: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108b820: 0x108b820: jal   0x10a1918 addu  a2, s2, zero
+// 0x0108be44: 0x108be44: jal   0x10a1f60 addu  a2, s2, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -3926,32 +3926,32 @@ L_108b7d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b828: 0x108b828: bne   v0, zero, 0x108b85c lui   a3, 0x10000
+// 0x0108be4c: 0x108be4c: bne   v0, zero, 0x108be80 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_108b85c
+	brtrue L_108be80
 // --- basic block ---
-// 0x0108b830: 0x108b830: addu  a1, s2, zero
+// 0x0108be54: 0x108be54: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x0108b834: 0x108b834: addiu a3, a3, 18500
+// 0x0108be58: 0x108be58: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0108b838: 0x108b838: addu  a0, zero, zero
+// 0x0108be5c: 0x108be5c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0108b83c: 0x108b83c: addu  a2, zero, zero
+// 0x0108be60: 0x108be60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108b840: 0x108b840: sw    zero, 16(sp)
+// 0x0108be64: 0x108be64: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3960,7 +3960,7 @@ L_108b7d4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b844: 0x108b844: sw    zero, 20(sp)
+// 0x0108be68: 0x108be68: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3969,7 +3969,7 @@ L_108b7d4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b848: 0x108b848: sw    zero, 24(sp)
+// 0x0108be6c: 0x108be6c: sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3978,7 +3978,7 @@ L_108b7d4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b84c: 0x108b84c: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0108be70: 0x108be70: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3992,52 +3992,52 @@ L_108b7d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b854: 0x108b854: j	 0x108b8bc sll   zero, zero, 0
-	br L_108b8bc
+// 0x0108be78: 0x108be78: j	 0x108bee0 sll   zero, zero, 0
+	br L_108bee0
 // --- basic block ---
-L_108b85c:
-// 0x0108b85c: 0x108b85c: jal   0x10543d0 sll   zero, zero, 0
+L_108be80:
+// 0x0108be80: 0x108be80: jal   0x10543e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b864: 0x108b864: beq   v0, zero, 0x108b8b8 addiu v0, zero, 1
+// 0x0108be88: 0x108be88: beq   v0, zero, 0x108bedc addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_108b8b8
+	brfalse L_108bedc
 // --- basic block ---
-// 0x0108b86c: 0x108b86c: jal   0x10543d0 sll   zero, zero, 0
+// 0x0108be90: 0x108be90: jal   0x10543e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b874: 0x108b874: addiu v1, zero, 1
+// 0x0108be98: 0x108be98: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108b878: 0x108b878: bne   v0, v1, 0x108b890 sll   zero, zero, 0
+// 0x0108be9c: 0x108be9c: bne   v0, v1, 0x108beb4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_108b890
+	bne.un L_108beb4
 // --- basic block ---
-// 0x0108b880: 0x108b880: lw    v0, 560(s1)
+// 0x0108bea4: 0x108bea4: lw    v0, 560(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4046,34 +4046,34 @@ L_108b85c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108b884: 0x108b884: sll   zero, zero, 0
-// 0x0108b888: 0x108b888: bne   v0, zero, 0x108b8b8 addiu v0, zero, 1
+// 0x0108bea8: 0x108bea8: sll   zero, zero, 0
+// 0x0108beac: 0x108beac: bne   v0, zero, 0x108bedc addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_108b8b8
+	brtrue L_108bedc
 // --- basic block ---
-L_108b890:
-// 0x0108b890: 0x108b890: jal   0x10543d0 sll   zero, zero, 0
+L_108beb4:
+// 0x0108beb4: 0x108beb4: jal   0x10543e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b898: 0x108b898: addiu v1, zero, 2
+// 0x0108bebc: 0x108bebc: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0108b89c: 0x108b89c: bne   v0, v1, 0x108b8bc sll   zero, zero, 0
+// 0x0108bec0: 0x108bec0: bne   v0, v1, 0x108bee0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_108b8bc
+	bne.un L_108bee0
 // --- basic block ---
-// 0x0108b8a4: 0x108b8a4: lw    v1, 560(s1)
+// 0x0108bec8: 0x108bec8: lw    v1, 560(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4082,17 +4082,17 @@ L_108b890:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108b8a8: 0x108b8a8: sll   zero, zero, 0
-// 0x0108b8ac: 0x108b8ac: bne   v1, v0, 0x108b8bc sll   zero, zero, 0
+// 0x0108becc: 0x108becc: sll   zero, zero, 0
+// 0x0108bed0: 0x108bed0: bne   v1, v0, 0x108bee0 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_108b8bc
+	bne.un L_108bee0
 // --- basic block ---
-// 0x0108b8b4: 0x108b8b4: addiu v0, zero, 1
+// 0x0108bed8: 0x108bed8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_108b8b8:
-// 0x0108b8b8: 0x108b8b8: sw    v0, 564(s1)
+L_108bedc:
+// 0x0108bedc: 0x108bedc: sw    v0, 564(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4101,8 +4101,8 @@ L_108b8b8:
 	add
 	ldloc 5
 	stelem.i4
-L_108b8bc:
-// 0x0108b8bc: 0x108b8bc: lw    a0, 28400(s0)
+L_108bee0:
+// 0x0108bee0: 0x108bee0: lw    a0, 28400(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -4111,24 +4111,24 @@ L_108b8bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108b8c0: 0x108b8c0: addiu s2, zero, 568
+// 0x0108bee4: 0x108bee4: addiu s2, zero, 568
 	ldc.i4 568
 	stloc 8
-// 0x0108b8c4: 0x108b8c4: mult  a0, s2
+// 0x0108bee8: 0x108bee8: mult  a0, s2
 	ldloc.1
 	ldloc 8
 	mul
 	stloc 12
-// 0x0108b8c8: 0x108b8c8: addu  a1, s1, zero
+// 0x0108beec: 0x108beec: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0108b8cc: 0x108b8cc: addiu a2, zero, 568
+// 0x0108bef0: 0x108bef0: addiu a2, zero, 568
 	ldc.i4 568
 	stloc.3
-// 0x0108b8d0: 0x108b8d0: mflo  lo
+// 0x0108bef4: 0x108bef4: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x0108b8d4: 0x108b8d4: jal   0x1001800 addu  a0, s0, a0
+// 0x0108bef8: 0x108bef8: jal   0x1001800 addu  a0, s0, a0
 	ldloc 10
 	ldloc.1
 	add
@@ -4142,7 +4142,7 @@ L_108b8bc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b8dc: 0x108b8dc: lw    v0, 28400(s0)
+// 0x0108bf00: 0x108bf00: lw    v0, 28400(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -4151,38 +4151,38 @@ L_108b8bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108b8e0: 0x108b8e0: addiu v1, zero, 1
+// 0x0108bf04: 0x108bf04: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108b8e4: 0x108b8e4: mult  v0, s2
+// 0x0108bf08: 0x108bf08: mult  v0, s2
 	ldloc 5
 	ldloc 8
 	mul
 	stloc 12
-// 0x0108b8e8: 0x108b8e8: lui   v0, 0x80000
+// 0x0108bf0c: 0x108bf0c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108b8ec: 0x108b8ec: lw    v0, -2112(v0)
+// 0x0108bf10: 0x108bf10: lw    v0, -1648(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -528
+	ldc.i4 -412
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108b8f0: 0x108b8f0: addu  a0, s1, zero
+// 0x0108bf14: 0x108bf14: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0108b8f4: 0x108b8f4: mflo  lo
+// 0x0108bf18: 0x108bf18: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x0108b8f8: 0x108b8f8: addu  s2, s0, s2
+// 0x0108bf1c: 0x108bf1c: addu  s2, s0, s2
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x0108b8fc: 0x108b8fc: sw    v1, 244(s2)
+// 0x0108bf20: 0x108bf20: sw    v1, 244(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4191,7 +4191,7 @@ L_108b8bc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108b900: 0x108b900: lw    v1, 28400(s0)
+// 0x0108bf24: 0x108bf24: lw    v1, 28400(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -4200,13 +4200,13 @@ L_108b8bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108b904: 0x108b904: sll   zero, zero, 0
-// 0x0108b908: 0x108b908: addiu v1, v1, 1
+// 0x0108bf28: 0x108bf28: sll   zero, zero, 0
+// 0x0108bf2c: 0x108bf2c: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0108b90c: 0x108b90c: jalr  v0 sw    v1, 28400(s0)
+// 0x0108bf30: 0x108bf30: jalr  v0 sw    v1, 28400(s0)
 	ldloc 5
 	ldloc 7
 	ldloc 10
@@ -4226,18 +4226,18 @@ L_108b8bc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108b914: 0x108b914: j	 0x108b920 addiu v0, zero, 1
+// 0x0108bf38: 0x108bf38: j	 0x108bf44 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_108b920
+	br L_108bf44
 // --- basic block ---
-L_108b91c:
-// 0x0108b91c: 0x108b91c: addu  v0, zero, zero
+L_108bf40:
+// 0x0108bf40: 0x108bf40: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_108b920:
-// 0x0108b920: 0x108b920: lw    ra, 156(sp)
-// 0x0108b924: 0x108b924: lw    s3, 152(sp)
+L_108bf44:
+// 0x0108bf44: 0x108bf44: lw    ra, 156(sp)
+// 0x0108bf48: 0x108bf48: lw    s3, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4246,7 +4246,7 @@ L_108b920:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108b928: 0x108b928: lw    s2, 148(sp)
+// 0x0108bf4c: 0x108bf4c: lw    s2, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4255,7 +4255,7 @@ L_108b920:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108b92c: 0x108b92c: lw    s1, 144(sp)
+// 0x0108bf50: 0x108bf50: lw    s1, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4264,7 +4264,7 @@ L_108b920:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108b930: 0x108b930: lw    s0, 140(sp)
+// 0x0108bf54: 0x108bf54: lw    s0, 140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4273,7 +4273,7 @@ L_108b920:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108b934: 0x108b934: jr    ra addiu sp, sp, 160
+// 0x0108bf58: 0x108bf58: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
@@ -4285,7 +4285,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTUsers_UpdateOrAdd_108b93c(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_UpdateOrAdd_108bf60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4326,12 +4326,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b93c: 0x108b93c: addiu sp, sp, -32
+// 0x0108bf60: 0x108bf60: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108b940: 0x108b940: sw    s1, 24(sp)
+// 0x0108bf64: 0x108bf64: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4340,7 +4340,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108b944: 0x108b944: sw    s0, 20(sp)
+// 0x0108bf68: 0x108bf68: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4349,11 +4349,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108b948: 0x108b948: sw    ra, 28(sp)
-// 0x0108b94c: 0x108b94c: addu  s1, a0, zero
+// 0x0108bf6c: 0x108bf6c: sw    ra, 28(sp)
+// 0x0108bf70: 0x108bf70: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0108b950: 0x108b950: jal   0x108b1ec addu  s0, a1, zero
+// 0x0108bf74: 0x108bf74: jal   0x108b810 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -4361,21 +4361,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_Update_108b1ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_Update_108b810(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108b958: 0x108b958: bne   v0, zero, 0x108b978 addiu v0, zero, 1
+// 0x0108bf7c: 0x108bf7c: bne   v0, zero, 0x108bf9c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_108b978
+	brtrue L_108bf9c
 // --- basic block ---
-// 0x0108b960: 0x108b960: addu  a0, s1, zero
+// 0x0108bf84: 0x108bf84: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0108b964: 0x108b964: jal   0x108b788 addu  a1, s0, zero
+// 0x0108bf88: 0x108bf88: jal   0x108bdac addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4383,22 +4383,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_Add_108b788(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_Add_108bdac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108b96c: 0x108b96c: beq   v0, zero, 0x108b980 addu  v1, zero, zero
+// 0x0108bf90: 0x108bf90: beq   v0, zero, 0x108bfa4 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_108b980
+	brfalse L_108bfa4
 // --- basic block ---
-// 0x0108b974: 0x108b974: addiu v0, zero, 1
+// 0x0108bf98: 0x108bf98: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_108b978:
-// 0x0108b978: 0x108b978: sw    v0, 244(s0)
+L_108bf9c:
+// 0x0108bf9c: 0x108bf9c: sw    v0, 244(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4407,15 +4407,15 @@ L_108b978:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108b97c: 0x108b97c: addiu v1, zero, 1
+// 0x0108bfa0: 0x108bfa0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-L_108b980:
-// 0x0108b980: 0x108b980: lw    ra, 28(sp)
-// 0x0108b984: 0x108b984: addu  v0, v1, zero
+L_108bfa4:
+// 0x0108bfa4: 0x108bfa4: lw    ra, 28(sp)
+// 0x0108bfa8: 0x108bfa8: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x0108b988: 0x108b988: lw    s1, 24(sp)
+// 0x0108bfac: 0x108bfac: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4424,7 +4424,7 @@ L_108b980:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108b98c: 0x108b98c: lw    s0, 20(sp)
+// 0x0108bfb0: 0x108bfb0: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4433,7 +4433,7 @@ L_108b980:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108b990: 0x108b990: jr    ra addiu sp, sp, 32
+// 0x0108bfb4: 0x108bfb4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4445,7 +4445,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTUserLocation_Init_108b998(int32,int32,int32,int32,int32)
+.method public static int32 RTUserLocation_Init_108bfbc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -4483,15 +4483,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108b998: 0x108b998: addiu sp, sp, -24
+// 0x0108bfbc: 0x108bfbc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108b99c: 0x108b99c: addiu v0, zero, -1
+// 0x0108bfc0: 0x108bfc0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0108b9a0: 0x108b9a0: sw    s0, 16(sp)
+// 0x0108bfc4: 0x108bfc4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4500,7 +4500,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108b9a4: 0x108b9a4: sw    v0, 236(a0)
+// 0x0108bfc8: 0x108bfc8: sw    v0, 236(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4509,17 +4509,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108b9a8: 0x108b9a8: addu  s0, a0, zero
+// 0x0108bfcc: 0x108bfcc: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0108b9ac: 0x108b9ac: sw    v0, 0(a0)
+// 0x0108bfd0: 0x108bfd0: sw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0108b9b0: 0x108b9b0: sw    zero, 132(a0)
+// 0x0108bfd4: 0x108bfd4: sw    zero, 132(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4528,7 +4528,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9b4: 0x108b9b4: sw    zero, 136(a0)
+// 0x0108bfd8: 0x108bfd8: sw    zero, 136(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4537,7 +4537,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9b8: 0x108b9b8: sw    zero, 140(a0)
+// 0x0108bfdc: 0x108bfdc: sw    zero, 140(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4546,7 +4546,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9bc: 0x108b9bc: sw    zero, 148(a0)
+// 0x0108bfe0: 0x108bfe0: sw    zero, 148(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4555,7 +4555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9c0: 0x108b9c0: sw    zero, 144(a0)
+// 0x0108bfe4: 0x108bfe4: sw    zero, 144(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4564,7 +4564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9c4: 0x108b9c4: sw    zero, 152(a0)
+// 0x0108bfe8: 0x108bfe8: sw    zero, 152(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4573,7 +4573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9c8: 0x108b9c8: sw    zero, 244(a0)
+// 0x0108bfec: 0x108bfec: sw    zero, 244(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4582,7 +4582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9cc: 0x108b9cc: sw    v0, 156(a0)
+// 0x0108bff0: 0x108bff0: sw    v0, 156(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4591,7 +4591,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108b9d0: 0x108b9d0: sw    v0, 224(a0)
+// 0x0108bff4: 0x108bff4: sw    v0, 224(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4600,7 +4600,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108b9d4: 0x108b9d4: sw    v0, 228(a0)
+// 0x0108bff8: 0x108bff8: sw    v0, 228(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4609,7 +4609,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108b9d8: 0x108b9d8: sw    v0, 232(a0)
+// 0x0108bffc: 0x108bffc: sw    v0, 232(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4618,7 +4618,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108b9dc: 0x108b9dc: sw    zero, 240(a0)
+// 0x0108c000: 0x108c000: sw    zero, 240(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4627,7 +4627,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9e0: 0x108b9e0: sw    zero, 248(a0)
+// 0x0108c004: 0x108c004: sw    zero, 248(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4636,7 +4636,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9e4: 0x108b9e4: sw    zero, 352(a0)
+// 0x0108c008: 0x108c008: sw    zero, 352(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4645,7 +4645,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9e8: 0x108b9e8: sw    zero, 356(a0)
+// 0x0108c00c: 0x108c00c: sw    zero, 356(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4654,7 +4654,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9ec: 0x108b9ec: sw    zero, 560(a0)
+// 0x0108c010: 0x108c010: sw    zero, 560(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4663,7 +4663,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9f0: 0x108b9f0: sw    zero, 564(a0)
+// 0x0108c014: 0x108c014: sw    zero, 564(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4672,16 +4672,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108b9f4: 0x108b9f4: addu  a1, zero, zero
+// 0x0108c018: 0x108c018: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108b9f8: 0x108b9f8: addiu a0, a0, 4
+// 0x0108c01c: 0x108c01c: addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x0108b9fc: 0x108b9fc: sw    ra, 20(sp)
-// 0x0108ba00: 0x108ba00: jal   0x100177c addiu a2, zero, 64
+// 0x0108c020: 0x108c020: sw    ra, 20(sp)
+// 0x0108c024: 0x108c024: jal   0x100177c addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -4693,15 +4693,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ba08: 0x108ba08: addiu a0, s0, 68
+// 0x0108c02c: 0x108c02c: addiu a0, s0, 68
 	ldloc 7
 	ldc.i4.s 68
 	add
 	stloc.1
-// 0x0108ba0c: 0x108ba0c: addu  a1, zero, zero
+// 0x0108c030: 0x108c030: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ba10: 0x108ba10: jal   0x100177c addiu a2, zero, 64
+// 0x0108c034: 0x108c034: jal   0x100177c addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -4713,15 +4713,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ba18: 0x108ba18: addiu a0, s0, 160
+// 0x0108c03c: 0x108c03c: addiu a0, s0, 160
 	ldloc 7
 	ldc.i4 160
 	add
 	stloc.1
-// 0x0108ba1c: 0x108ba1c: addu  a1, zero, zero
+// 0x0108c040: 0x108c040: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ba20: 0x108ba20: jal   0x100177c addiu a2, zero, 64
+// 0x0108c044: 0x108c044: jal   0x100177c addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -4733,15 +4733,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ba28: 0x108ba28: addiu a0, s0, 252
+// 0x0108c04c: 0x108c04c: addiu a0, s0, 252
 	ldloc 7
 	ldc.i4 252
 	add
 	stloc.1
-// 0x0108ba2c: 0x108ba2c: addu  a1, zero, zero
+// 0x0108c050: 0x108c050: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ba30: 0x108ba30: jal   0x100177c addiu a2, zero, 100
+// 0x0108c054: 0x108c054: jal   0x100177c addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.1
@@ -4753,15 +4753,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ba38: 0x108ba38: addiu a0, s0, 360
+// 0x0108c05c: 0x108c05c: addiu a0, s0, 360
 	ldloc 7
 	ldc.i4 360
 	add
 	stloc.1
-// 0x0108ba3c: 0x108ba3c: addu  a1, zero, zero
+// 0x0108c060: 0x108c060: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ba40: 0x108ba40: jal   0x100177c addiu a2, zero, 100
+// 0x0108c064: 0x108c064: jal   0x100177c addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.1
@@ -4773,15 +4773,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ba48: 0x108ba48: addiu a0, s0, 460
+// 0x0108c06c: 0x108c06c: addiu a0, s0, 460
 	ldloc 7
 	ldc.i4 460
 	add
 	stloc.1
-// 0x0108ba4c: 0x108ba4c: addu  a1, zero, zero
+// 0x0108c070: 0x108c070: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ba50: 0x108ba50: jal   0x100177c addiu a2, zero, 100
+// 0x0108c074: 0x108c074: jal   0x100177c addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.1
@@ -4793,8 +4793,8 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ba58: 0x108ba58: lw    ra, 20(sp)
-// 0x0108ba5c: 0x108ba5c: lw    s0, 16(sp)
+// 0x0108c07c: 0x108c07c: lw    ra, 20(sp)
+// 0x0108c080: 0x108c080: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4803,7 +4803,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108ba60: 0x108ba60: jr    ra addiu sp, sp, 24
+// 0x0108c084: 0x108c084: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4815,7 +4815,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTUsers_ClearAll_108ba68(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_ClearAll_108c08c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 ra,int32 v1,int32 lo)
@@ -4868,12 +4868,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108ba68: 0x108ba68: addiu sp, sp, -40
+// 0x0108c08c: 0x108c08c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0108ba6c: 0x108ba6c: sw    s4, 32(sp)
+// 0x0108c090: 0x108c090: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4882,7 +4882,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108ba70: 0x108ba70: sw    s3, 28(sp)
+// 0x0108c094: 0x108c094: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4891,7 +4891,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108ba74: 0x108ba74: sw    s1, 20(sp)
+// 0x0108c098: 0x108c098: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4900,7 +4900,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108ba78: 0x108ba78: sw    s0, 16(sp)
+// 0x0108c09c: 0x108c09c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4909,8 +4909,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108ba7c: 0x108ba7c: sw    ra, 36(sp)
-// 0x0108ba80: 0x108ba80: sw    s2, 24(sp)
+// 0x0108c0a0: 0x108c0a0: sw    ra, 36(sp)
+// 0x0108c0a4: 0x108c0a4: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4919,44 +4919,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108ba84: 0x108ba84: addu  s1, a0, zero
+// 0x0108c0a8: 0x108c0a8: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0108ba88: 0x108ba88: addu  s0, zero, zero
+// 0x0108c0ac: 0x108c0ac: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0108ba8c: 0x108ba8c: addiu s4, zero, 568
+// 0x0108c0b0: 0x108c0b0: addiu s4, zero, 568
 	ldc.i4 568
 	stloc 11
-// 0x0108ba90: 0x108ba90: j	 0x108bab8 lui   s3, 0x80000
+// 0x0108c0b4: 0x108c0b4: j	 0x108c0dc lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 10
-	br L_108bab8
+	br L_108c0dc
 // --- basic block ---
-L_108ba98:
-// 0x0108ba98: 0x108ba98: lw    v0, -2120(s3)
+L_108c0bc:
+// 0x0108c0bc: 0x108c0bc: lw    v0, -1656(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -530
+	ldc.i4 -414
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108ba9c: 0x108ba9c: addiu s0, s0, 1
+// 0x0108c0c0: 0x108c0c0: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0108baa0: 0x108baa0: mflo  lo
+// 0x0108c0c4: 0x108c0c4: mflo  lo
 	ldloc 14
 	stloc 8
-// 0x0108baa4: 0x108baa4: addu  s2, s1, s2
+// 0x0108c0c8: 0x108c0c8: addu  s2, s1, s2
 	ldloc 9
 	ldloc 8
 	add
 	stloc 8
-// 0x0108baa8: 0x108baa8: jalr  v0 addu  a0, s2, zero
+// 0x0108c0cc: 0x108c0cc: jalr  v0 addu  a0, s2, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
@@ -4970,7 +4970,7 @@ L_108ba98:
 	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x0108bab0: 0x108bab0: jal   0x108b998 addu  a0, s2, zero
+// 0x0108c0d4: 0x108c0d4: jal   0x108bfbc addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4978,13 +4978,13 @@ L_108ba98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUserLocation_Init_108b998(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUserLocation_Init_108bfbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 6
 // --- basic block ---
-L_108bab8:
-// 0x0108bab8: 0x108bab8: lw    v0, 28400(s1)
+L_108c0dc:
+// 0x0108c0dc: 0x108c0dc: lw    v0, 28400(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4993,22 +4993,22 @@ L_108bab8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108babc: 0x108babc: sll   zero, zero, 0
-// 0x0108bac0: 0x108bac0: slt   v0, s0, v0
+// 0x0108c0e0: 0x108c0e0: sll   zero, zero, 0
+// 0x0108c0e4: 0x108c0e4: slt   v0, s0, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x0108bac4: 0x108bac4: bne   v0, zero, 0x108ba98 mult  s0, s4
+// 0x0108c0e8: 0x108c0e8: bne   v0, zero, 0x108c0bc mult  s0, s4
 	ldloc 6
 	ldloc 7
 	ldloc 11
 	mul
 	stloc 14
-	brtrue L_108ba98
+	brtrue L_108c0bc
 // --- basic block ---
-// 0x0108bacc: 0x108bacc: lw    ra, 36(sp)
-// 0x0108bad0: 0x108bad0: sw    zero, 28400(s1)
+// 0x0108c0f0: 0x108c0f0: lw    ra, 36(sp)
+// 0x0108c0f4: 0x108c0f4: sw    zero, 28400(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5017,7 +5017,7 @@ L_108bab8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108bad4: 0x108bad4: lw    s4, 32(sp)
+// 0x0108c0f8: 0x108c0f8: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5026,7 +5026,7 @@ L_108bab8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108bad8: 0x108bad8: lw    s3, 28(sp)
+// 0x0108c0fc: 0x108c0fc: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5035,7 +5035,7 @@ L_108bab8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108badc: 0x108badc: lw    s2, 24(sp)
+// 0x0108c100: 0x108c100: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5044,7 +5044,7 @@ L_108bab8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108bae0: 0x108bae0: lw    s1, 20(sp)
+// 0x0108c104: 0x108c104: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5053,7 +5053,7 @@ L_108bab8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108bae4: 0x108bae4: lw    s0, 16(sp)
+// 0x0108c108: 0x108c108: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5062,7 +5062,7 @@ L_108bab8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108bae8: 0x108bae8: jr    ra addiu sp, sp, 40
+// 0x0108c10c: 0x108c10c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5074,7 +5074,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTUsers_RemoveByIndex_108bb24(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_RemoveByIndex_108c148(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 s2,int32 lo,int32 v1,int32 s3,int32 ra)
@@ -5124,12 +5124,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108bb24: 0x108bb24: addiu sp, sp, -48
+// 0x0108c148: 0x108c148: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0108bb28: 0x108bb28: sw    s0, 28(sp)
+// 0x0108c14c: 0x108c14c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5138,8 +5138,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108bb2c: 0x108bb2c: sw    ra, 44(sp)
-// 0x0108bb30: 0x108bb30: sw    s3, 40(sp)
+// 0x0108c150: 0x108c150: sw    ra, 44(sp)
+// 0x0108c154: 0x108c154: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5148,7 +5148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108bb34: 0x108bb34: sw    s2, 36(sp)
+// 0x0108c158: 0x108c158: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5157,7 +5157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108bb38: 0x108bb38: sw    s1, 32(sp)
+// 0x0108c15c: 0x108c15c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5166,14 +5166,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108bb3c: 0x108bb3c: bltz  a1, 0x108bbe0 addu  s0, a0, zero
+// 0x0108c160: 0x108c160: bltz  a1, 0x108c204 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 8
 	ldc.i4.s 0
-	blt L_108bbe0
+	blt L_108c204
 // --- basic block ---
-// 0x0108bb44: 0x108bb44: lw    v0, 28400(a0)
+// 0x0108c168: 0x108c168: lw    v0, 28400(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5182,39 +5182,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108bb48: 0x108bb48: sll   zero, zero, 0
-// 0x0108bb4c: 0x108bb4c: slt   v0, a1, v0
+// 0x0108c16c: 0x108c16c: sll   zero, zero, 0
+// 0x0108c170: 0x108c170: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108bb50: 0x108bb50: beq   v0, zero, 0x108bbe4 addu  v0, zero, zero
+// 0x0108c174: 0x108c174: beq   v0, zero, 0x108c208 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_108bbe4
+	brfalse L_108c208
 // --- basic block ---
-// 0x0108bb58: 0x108bb58: addiu s3, zero, 568
+// 0x0108c17c: 0x108c17c: addiu s3, zero, 568
 	ldc.i4 568
 	stloc 12
-// 0x0108bb5c: 0x108bb5c: mult  a1, s3
+// 0x0108c180: 0x108c180: mult  a1, s3
 	ldloc.2
 	ldloc 12
 	mul
 	stloc 10
-// 0x0108bb60: 0x108bb60: lui   v0, 0x80000
+// 0x0108c184: 0x108c184: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108bb64: 0x108bb64: lw    v0, -2120(v0)
+// 0x0108c188: 0x108c188: lw    v0, -1656(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -530
+	ldc.i4 -414
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108bb68: 0x108bb68: sw    a1, 16(sp)
+// 0x0108c18c: 0x108c18c: sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5223,13 +5223,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108bb6c: 0x108bb6c: addu  s2, a1, zero
+// 0x0108c190: 0x108c190: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0108bb70: 0x108bb70: mflo  lo
+// 0x0108c194: 0x108c194: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x0108bb74: 0x108bb74: jalr  v0 addu  a0, s0, a0
+// 0x0108c198: 0x108c198: jalr  v0 addu  a0, s0, a0
 	ldloc 5
 	ldloc 8
 	ldloc.1
@@ -5245,7 +5245,7 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x0108bb7c: 0x108bb7c: lw    a1, 16(sp)
+// 0x0108c1a0: 0x108c1a0: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5254,29 +5254,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108bb80: 0x108bb80: sll   zero, zero, 0
-// 0x0108bb84: 0x108bb84: addiu s1, a1, 1
+// 0x0108c1a4: 0x108c1a4: sll   zero, zero, 0
+// 0x0108c1a8: 0x108c1a8: addiu s1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0108bb88: 0x108bb88: mult  s1, s3
+// 0x0108c1ac: 0x108c1ac: mult  s1, s3
 	ldloc 7
 	ldloc 12
 	mul
 	stloc 10
-// 0x0108bb8c: 0x108bb8c: mflo  lo
+// 0x0108c1b0: 0x108c1b0: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x0108bb90: 0x108bb90: j	 0x108bba4 addu  s1, s0, s1
+// 0x0108c1b4: 0x108c1b4: j	 0x108c1c8 addu  s1, s0, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-	br L_108bba4
+	br L_108c1c8
 // --- basic block ---
-L_108bb98:
-// 0x0108bb98: 0x108bb98: jal   0x1001800 addiu s2, s2, 1
+L_108c1bc:
+// 0x0108c1bc: 0x108c1bc: jal   0x1001800 addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -5290,13 +5290,13 @@ L_108bb98:
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x0108bba0: 0x108bba0: addiu s1, s1, 568
+// 0x0108c1c4: 0x108c1c4: addiu s1, s1, 568
 	ldloc 7
 	ldc.i4 568
 	add
 	stloc 7
-L_108bba4:
-// 0x0108bba4: 0x108bba4: lw    v0, 28400(s0)
+L_108c1c8:
+// 0x0108c1c8: 0x108c1c8: lw    v0, 28400(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5305,39 +5305,39 @@ L_108bba4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108bba8: 0x108bba8: addiu a0, s1, -568
+// 0x0108c1cc: 0x108c1cc: addiu a0, s1, -568
 	ldloc 7
 	ldc.i4 -568
 	add
 	stloc.1
-// 0x0108bbac: 0x108bbac: addiu v0, v0, -1
+// 0x0108c1d0: 0x108c1d0: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0108bbb0: 0x108bbb0: slt   v1, s2, v0
+// 0x0108c1d4: 0x108c1d4: slt   v1, s2, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 11
-// 0x0108bbb4: 0x108bbb4: addu  a1, s1, zero
+// 0x0108c1d8: 0x108c1d8: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x0108bbb8: 0x108bbb8: bne   v1, zero, 0x108bb98 addiu a2, zero, 568
+// 0x0108c1dc: 0x108c1dc: bne   v1, zero, 0x108c1bc addiu a2, zero, 568
 	ldloc 11
 	ldc.i4 568
 	stloc.3
-	brtrue L_108bb98
+	brtrue L_108c1bc
 // --- basic block ---
-// 0x0108bbc0: 0x108bbc0: addiu a0, zero, 568
+// 0x0108c1e4: 0x108c1e4: addiu a0, zero, 568
 	ldc.i4 568
 	stloc.1
-// 0x0108bbc4: 0x108bbc4: mult  v0, a0
+// 0x0108c1e8: 0x108c1e8: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 10
-// 0x0108bbc8: 0x108bbc8: sw    v0, 28400(s0)
+// 0x0108c1ec: 0x108c1ec: sw    v0, 28400(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5346,10 +5346,10 @@ L_108bba4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108bbcc: 0x108bbcc: mflo  lo
+// 0x0108c1f0: 0x108c1f0: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x0108bbd0: 0x108bbd0: jal   0x108b998 addu  a0, s0, a0
+// 0x0108c1f4: 0x108c1f4: jal   0x108bfbc addu  a0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
@@ -5359,23 +5359,23 @@ L_108bba4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUserLocation_Init_108b998(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUserLocation_Init_108bfbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x0108bbd8: 0x108bbd8: j	 0x108bbe4 addiu v0, zero, 1
+// 0x0108c1fc: 0x108c1fc: j	 0x108c208 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_108bbe4
+	br L_108c208
 // --- basic block ---
-L_108bbe0:
-// 0x0108bbe0: 0x108bbe0: addu  v0, zero, zero
+L_108c204:
+// 0x0108c204: 0x108c204: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_108bbe4:
-// 0x0108bbe4: 0x108bbe4: lw    ra, 44(sp)
-// 0x0108bbe8: 0x108bbe8: lw    s3, 40(sp)
+L_108c208:
+// 0x0108c208: 0x108c208: lw    ra, 44(sp)
+// 0x0108c20c: 0x108c20c: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5384,7 +5384,7 @@ L_108bbe4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108bbec: 0x108bbec: lw    s2, 36(sp)
+// 0x0108c210: 0x108c210: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5393,7 +5393,7 @@ L_108bbe4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108bbf0: 0x108bbf0: lw    s1, 32(sp)
+// 0x0108c214: 0x108c214: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5402,7 +5402,7 @@ L_108bbe4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108bbf4: 0x108bbf4: lw    s0, 28(sp)
+// 0x0108c218: 0x108c218: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5411,7 +5411,7 @@ L_108bbe4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108bbf8: 0x108bbf8: jr    ra addiu sp, sp, 48
+// 0x0108c21c: 0x108c21c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5423,7 +5423,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTUsers_RemoveUnupdatedUsers_108bc00(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_RemoveUnupdatedUsers_108c224(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra,int32 lo,int32 v1)
@@ -5473,12 +5473,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108bc00: 0x108bc00: addiu sp, sp, -48
+// 0x0108c224: 0x108c224: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0108bc04: 0x108bc04: sw    s3, 40(sp)
+// 0x0108c228: 0x108c228: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5487,7 +5487,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108bc08: 0x108bc08: sw    s2, 36(sp)
+// 0x0108c22c: 0x108c22c: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5496,7 +5496,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108bc0c: 0x108bc0c: sw    s1, 32(sp)
+// 0x0108c230: 0x108c230: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5505,7 +5505,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108bc10: 0x108bc10: sw    s0, 28(sp)
+// 0x0108c234: 0x108c234: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5514,45 +5514,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108bc14: 0x108bc14: sw    zero, 0(a1)
+// 0x0108c238: 0x108c238: sw    zero, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108bc18: 0x108bc18: sw    ra, 44(sp)
-// 0x0108bc1c: 0x108bc1c: addu  s0, a1, zero
+// 0x0108c23c: 0x108c23c: sw    ra, 44(sp)
+// 0x0108c240: 0x108c240: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0108bc20: 0x108bc20: addu  s2, a0, zero
+// 0x0108c244: 0x108c244: addu  s2, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108bc24: 0x108bc24: sw    zero, 0(a2)
+// 0x0108c248: 0x108c248: sw    zero, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108bc28: 0x108bc28: addu  s1, zero, zero
+// 0x0108c24c: 0x108c24c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0108bc2c: 0x108bc2c: j	 0x108bc88 addiu s3, zero, 568
+// 0x0108c250: 0x108c250: j	 0x108c2ac addiu s3, zero, 568
 	ldc.i4 568
 	stloc 10
-	br L_108bc88
+	br L_108c2ac
 // --- basic block ---
-L_108bc34:
-// 0x0108bc34: 0x108bc34: mflo  lo
+L_108c258:
+// 0x0108c258: 0x108c258: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x0108bc38: 0x108bc38: addu  v0, s2, v0
+// 0x0108c25c: 0x108c25c: addu  v0, s2, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-// 0x0108bc3c: 0x108bc3c: lw    v0, 244(v0)
+// 0x0108c260: 0x108c260: lw    v0, 244(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5561,40 +5561,40 @@ L_108bc34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108bc40: 0x108bc40: sll   zero, zero, 0
-// 0x0108bc44: 0x108bc44: beq   v0, zero, 0x108bc60 addu  a1, s1, zero
+// 0x0108c264: 0x108c264: sll   zero, zero, 0
+// 0x0108c268: 0x108c268: beq   v0, zero, 0x108c284 addu  a1, s1, zero
 	ldloc 6
 	ldloc 7
 	stloc.2
-	brfalse L_108bc60
+	brfalse L_108c284
 // --- basic block ---
-// 0x0108bc4c: 0x108bc4c: lw    v0, 0(s0)
+// 0x0108c270: 0x108c270: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0108bc50: 0x108bc50: sll   zero, zero, 0
-// 0x0108bc54: 0x108bc54: addiu v0, v0, 1
+// 0x0108c274: 0x108c274: sll   zero, zero, 0
+// 0x0108c278: 0x108c278: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0108bc58: 0x108bc58: j	 0x108bc84 sw    v0, 0(s0)
+// 0x0108c27c: 0x108c27c: j	 0x108c2a8 sw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_108bc84
+	br L_108c2a8
 // --- basic block ---
-L_108bc60:
-// 0x0108bc60: 0x108bc60: addu  a0, s2, zero
+L_108c284:
+// 0x0108c284: 0x108c284: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0108bc64: 0x108bc64: jal   0x108bb24 sw    a2, 16(sp)
+// 0x0108c288: 0x108c288: jal   0x108c148 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5608,12 +5608,12 @@ L_108bc60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_RemoveByIndex_108bb24(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_RemoveByIndex_108c148(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x0108bc6c: 0x108bc6c: lw    a2, 16(sp)
+// 0x0108c290: 0x108c290: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5622,39 +5622,39 @@ L_108bc60:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108bc70: 0x108bc70: addiu s1, s1, -1
+// 0x0108c294: 0x108c294: addiu s1, s1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0108bc74: 0x108bc74: lw    v0, 0(a2)
+// 0x0108c298: 0x108c298: lw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0108bc78: 0x108bc78: sll   zero, zero, 0
-// 0x0108bc7c: 0x108bc7c: addiu v0, v0, 1
+// 0x0108c29c: 0x108c29c: sll   zero, zero, 0
+// 0x0108c2a0: 0x108c2a0: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0108bc80: 0x108bc80: sw    v0, 0(a2)
+// 0x0108c2a4: 0x108c2a4: sw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_108bc84:
-// 0x0108bc84: 0x108bc84: addiu s1, s1, 1
+L_108c2a8:
+// 0x0108c2a8: 0x108c2a8: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_108bc88:
-// 0x0108bc88: 0x108bc88: lw    v0, 28400(s2)
+L_108c2ac:
+// 0x0108c2ac: 0x108c2ac: lw    v0, 28400(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5663,22 +5663,22 @@ L_108bc88:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108bc8c: 0x108bc8c: sll   zero, zero, 0
-// 0x0108bc90: 0x108bc90: slt   v0, s1, v0
+// 0x0108c2b0: 0x108c2b0: sll   zero, zero, 0
+// 0x0108c2b4: 0x108c2b4: slt   v0, s1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x0108bc94: 0x108bc94: bne   v0, zero, 0x108bc34 mult  s1, s3
+// 0x0108c2b8: 0x108c2b8: bne   v0, zero, 0x108c258 mult  s1, s3
 	ldloc 6
 	ldloc 7
 	ldloc 10
 	mul
 	stloc 12
-	brtrue L_108bc34
+	brtrue L_108c258
 // --- basic block ---
-// 0x0108bc9c: 0x108bc9c: lw    ra, 44(sp)
-// 0x0108bca0: 0x108bca0: lw    s3, 40(sp)
+// 0x0108c2c0: 0x108c2c0: lw    ra, 44(sp)
+// 0x0108c2c4: 0x108c2c4: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5687,7 +5687,7 @@ L_108bc88:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108bca4: 0x108bca4: lw    s2, 36(sp)
+// 0x0108c2c8: 0x108c2c8: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5696,7 +5696,7 @@ L_108bc88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108bca8: 0x108bca8: lw    s1, 32(sp)
+// 0x0108c2cc: 0x108c2cc: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5705,7 +5705,7 @@ L_108bc88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108bcac: 0x108bcac: lw    s0, 28(sp)
+// 0x0108c2d0: 0x108c2d0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5714,7 +5714,7 @@ L_108bc88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108bcb0: 0x108bcb0: jr    ra addiu sp, sp, 48
+// 0x0108c2d4: 0x108c2d4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5726,7 +5726,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTUsers_Reset_108bd18(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_Reset_108c33c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s3,int32 s2,int32 ra,int32 lo,int32 v0,int32 v1)
@@ -5776,12 +5776,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108bd18: 0x108bd18: addiu sp, sp, -40
+// 0x0108c33c: 0x108c33c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0108bd1c: 0x108bd1c: sw    s3, 32(sp)
+// 0x0108c340: 0x108c340: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5790,7 +5790,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108bd20: 0x108bd20: sw    s2, 28(sp)
+// 0x0108c344: 0x108c344: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5799,7 +5799,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108bd24: 0x108bd24: sw    s1, 24(sp)
+// 0x0108c348: 0x108c348: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5808,7 +5808,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108bd28: 0x108bd28: sw    s0, 20(sp)
+// 0x0108c34c: 0x108c34c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5817,34 +5817,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108bd2c: 0x108bd2c: sw    ra, 36(sp)
-// 0x0108bd30: 0x108bd30: addu  s1, a0, zero
+// 0x0108c350: 0x108c350: sw    ra, 36(sp)
+// 0x0108c354: 0x108c354: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0108bd34: 0x108bd34: addu  s0, zero, zero
+// 0x0108c358: 0x108c358: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0108bd38: 0x108bd38: addiu s3, zero, 568
+// 0x0108c35c: 0x108c35c: addiu s3, zero, 568
 	ldc.i4 568
 	stloc 8
-// 0x0108bd3c: 0x108bd3c: addiu s2, zero, 50
+// 0x0108c360: 0x108c360: addiu s2, zero, 50
 	ldc.i4.s 50
 	stloc 9
-// 0x0108bd40: 0x108bd40: mult  s0, s3
+// 0x0108c364: 0x108c364: mult  s0, s3
 	ldloc 6
 	ldloc 8
 	mul
 	stloc 11
-L_108bd44:
-// 0x0108bd44: 0x108bd44: addiu s0, s0, 1
+L_108c368:
+// 0x0108c368: 0x108c368: addiu s0, s0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0108bd48: 0x108bd48: mflo  lo
+// 0x0108c36c: 0x108c36c: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x0108bd4c: 0x108bd4c: jal   0x108b998 addu  a0, s1, a0
+// 0x0108c370: 0x108c370: jal   0x108bfbc addu  a0, s1, a0
 	ldloc 7
 	ldloc.1
 	add
@@ -5854,22 +5854,22 @@ L_108bd44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUserLocation_Init_108b998(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUserLocation_Init_108bfbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 12
 // --- basic block ---
-// 0x0108bd54: 0x108bd54: bne   s0, s2, 0x108bd44 mult  s0, s3
+// 0x0108c378: 0x108c378: bne   s0, s2, 0x108c368 mult  s0, s3
 	ldloc 6
 	ldloc 9
 	ldloc 6
 	ldloc 8
 	mul
 	stloc 11
-	bne.un L_108bd44
+	bne.un L_108c368
 // --- basic block ---
-// 0x0108bd5c: 0x108bd5c: lw    ra, 36(sp)
-// 0x0108bd60: 0x108bd60: sw    zero, 28400(s1)
+// 0x0108c380: 0x108c380: lw    ra, 36(sp)
+// 0x0108c384: 0x108c384: sw    zero, 28400(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5878,7 +5878,7 @@ L_108bd44:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108bd64: 0x108bd64: lw    s3, 32(sp)
+// 0x0108c388: 0x108c388: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5887,7 +5887,7 @@ L_108bd44:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108bd68: 0x108bd68: lw    s2, 28(sp)
+// 0x0108c38c: 0x108c38c: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5896,7 +5896,7 @@ L_108bd44:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108bd6c: 0x108bd6c: lw    s1, 24(sp)
+// 0x0108c390: 0x108c390: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5905,7 +5905,7 @@ L_108bd44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108bd70: 0x108bd70: lw    s0, 20(sp)
+// 0x0108c394: 0x108c394: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5914,7 +5914,7 @@ L_108bd44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108bd74: 0x108bd74: jr    ra addiu sp, sp, 40
+// 0x0108c398: 0x108c398: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5926,7 +5926,7 @@ __CIBYL_function_return:
 	ldloc 12
 	ret
 }
-.method public static int32 RTUsers_Init_108bd7c(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_Init_108c3a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s4,int32 s0,int32 s6,int32 s1,int32 s2,int32 s3,int32 s5,int32 ra,int32 lo,int32 v1)
@@ -5985,12 +5985,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108bd7c: 0x108bd7c: addiu sp, sp, -56
+// 0x0108c3a0: 0x108c3a0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0108bd80: 0x108bd80: sw    s3, 36(sp)
+// 0x0108c3a4: 0x108c3a4: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5999,7 +5999,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108bd84: 0x108bd84: sw    s1, 28(sp)
+// 0x0108c3a8: 0x108c3a8: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6008,7 +6008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108bd88: 0x108bd88: sw    s0, 24(sp)
+// 0x0108c3ac: 0x108c3ac: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6017,28 +6017,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108bd8c: 0x108bd8c: addu  s3, a1, zero
+// 0x0108c3b0: 0x108c3b0: addu  s3, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0108bd90: 0x108bd90: addu  s0, a0, zero
+// 0x0108c3b4: 0x108c3b4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108bd94: 0x108bd94: addu  s1, a3, zero
+// 0x0108c3b8: 0x108c3b8: addu  s1, a3, zero
 	ldloc 4
 	stloc 10
-// 0x0108bd98: 0x108bd98: lui   a0, 0x20000
+// 0x0108c3bc: 0x108c3bc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108bd9c: 0x108bd9c: lui   a1, 0x0
+// 0x0108c3c0: 0x108c3c0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108bda0: 0x108bda0: lui   a3, 0x20000
+// 0x0108c3c4: 0x108c3c4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108bda4: 0x108bda4: lui   v0, 0x0
+// 0x0108c3c8: 0x108c3c8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0108bda8: 0x108bda8: sw    s2, 32(sp)
+// 0x0108c3cc: 0x108c3cc: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6047,33 +6047,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108bdac: 0x108bdac: addiu v0, v0, 20820
+// 0x0108c3d0: 0x108c3d0: addiu v0, v0, 20820
 	ldloc 6
 	ldc.i4 20820
 	add
 	stloc 6
-// 0x0108bdb0: 0x108bdb0: addu  s2, a2, zero
+// 0x0108c3d4: 0x108c3d4: addu  s2, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0108bdb4: 0x108bdb4: addiu a0, a0, -26888
+// 0x0108c3d8: 0x108c3d8: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0108bdb8: 0x108bdb8: addiu a1, a1, 17312
+// 0x0108c3dc: 0x108c3dc: addiu a1, a1, 17312
 	ldloc.2
 	ldc.i4 17312
 	add
 	stloc.2
-// 0x0108bdbc: 0x108bdbc: addiu a3, a3, 9464
+// 0x0108c3e0: 0x108c3e0: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x0108bdc0: 0x108bdc0: addu  a2, zero, zero
+// 0x0108c3e4: 0x108c3e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108bdc4: 0x108bdc4: sw    s6, 48(sp)
+// 0x0108c3e8: 0x108c3e8: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6082,7 +6082,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108bdc8: 0x108bdc8: sw    s5, 44(sp)
+// 0x0108c3ec: 0x108c3ec: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6091,7 +6091,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108bdcc: 0x108bdcc: sw    s4, 40(sp)
+// 0x0108c3f0: 0x108c3f0: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6100,8 +6100,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108bdd0: 0x108bdd0: sw    ra, 52(sp)
-// 0x0108bdd4: 0x108bdd4: sw    v0, 16(sp)
+// 0x0108c3f4: 0x108c3f4: sw    ra, 52(sp)
+// 0x0108c3f8: 0x108c3f8: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6110,7 +6110,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108bdd8: 0x108bdd8: sw    zero, 20(sp)
+// 0x0108c3fc: 0x108c3fc: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6119,7 +6119,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108bddc: 0x108bddc: jal   0x100edf8 addu  s4, zero, zero
+// 0x0108c400: 0x108c400: jal   0x100ee08 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 7
 	ldloc.0
@@ -6127,32 +6127,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 16
 	stloc 6
 // --- basic block ---
-// 0x0108bde4: 0x108bde4: addiu s6, zero, 568
+// 0x0108c408: 0x108c408: addiu s6, zero, 568
 	ldc.i4 568
 	stloc 9
-// 0x0108bde8: 0x108bde8: addiu s5, zero, 50
+// 0x0108c40c: 0x108c40c: addiu s5, zero, 50
 	ldc.i4.s 50
 	stloc 13
-// 0x0108bdec: 0x108bdec: mult  s4, s6
+// 0x0108c410: 0x108c410: mult  s4, s6
 	ldloc 7
 	ldloc 9
 	mul
 	stloc 15
-L_108bdf0:
-// 0x0108bdf0: 0x108bdf0: addiu s4, s4, 1
+L_108c414:
+// 0x0108c414: 0x108c414: addiu s4, s4, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0108bdf4: 0x108bdf4: mflo  lo
+// 0x0108c418: 0x108c418: mflo  lo
 	ldloc 15
 	stloc.1
-// 0x0108bdf8: 0x108bdf8: jal   0x108b998 addu  a0, s0, a0
+// 0x0108c41c: 0x108c41c: jal   0x108bfbc addu  a0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
@@ -6162,58 +6162,58 @@ L_108bdf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUserLocation_Init_108b998(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUserLocation_Init_108bfbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 16
 	stloc 6
 // --- basic block ---
-// 0x0108be00: 0x108be00: bne   s4, s5, 0x108bdf0 mult  s4, s6
+// 0x0108c424: 0x108c424: bne   s4, s5, 0x108c414 mult  s4, s6
 	ldloc 7
 	ldloc 13
 	ldloc 7
 	ldloc 9
 	mul
 	stloc 15
-	bne.un L_108bdf0
+	bne.un L_108c414
 // --- basic block ---
-// 0x0108be08: 0x108be08: lui   v0, 0x80000
+// 0x0108c42c: 0x108c42c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108be0c: 0x108be0c: sw    s3, -2112(v0)
+// 0x0108c430: 0x108c430: sw    s3, -1648(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -528
+	ldc.i4 -412
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108be10: 0x108be10: lw    ra, 52(sp)
-// 0x0108be14: 0x108be14: lui   v0, 0x80000
+// 0x0108c434: 0x108c434: lw    ra, 52(sp)
+// 0x0108c438: 0x108c438: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108be18: 0x108be18: sw    s2, -2116(v0)
+// 0x0108c43c: 0x108c43c: sw    s2, -1652(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -529
+	ldc.i4 -413
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108be1c: 0x108be1c: lui   v0, 0x80000
+// 0x0108c440: 0x108c440: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108be20: 0x108be20: sw    s1, -2120(v0)
+// 0x0108c444: 0x108c444: sw    s1, -1656(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -530
+	ldc.i4 -414
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108be24: 0x108be24: sw    zero, 28400(s0)
+// 0x0108c448: 0x108c448: sw    zero, 28400(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6222,7 +6222,7 @@ L_108bdf0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108be28: 0x108be28: lw    s6, 48(sp)
+// 0x0108c44c: 0x108c44c: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6231,7 +6231,7 @@ L_108bdf0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108be2c: 0x108be2c: lw    s5, 44(sp)
+// 0x0108c450: 0x108c450: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6240,7 +6240,7 @@ L_108bdf0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108be30: 0x108be30: lw    s4, 40(sp)
+// 0x0108c454: 0x108c454: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6249,7 +6249,7 @@ L_108bdf0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108be34: 0x108be34: lw    s3, 36(sp)
+// 0x0108c458: 0x108c458: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6258,7 +6258,7 @@ L_108bdf0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108be38: 0x108be38: lw    s2, 32(sp)
+// 0x0108c45c: 0x108c45c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6267,7 +6267,7 @@ L_108bdf0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108be3c: 0x108be3c: lw    s1, 28(sp)
+// 0x0108c460: 0x108c460: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6276,7 +6276,7 @@ L_108bdf0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108be40: 0x108be40: lw    s0, 24(sp)
+// 0x0108c464: 0x108c464: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6285,7 +6285,7 @@ L_108bdf0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108be44: 0x108be44: jr    ra addiu sp, sp, 56
+// 0x0108c468: 0x108c468: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6297,7 +6297,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTUsers_Popup_108be4c(int32,int32,int32,int32,int32)
+.method public static int32 RTUsers_Popup_108c470(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s7,int32 s3,int32 s0,int32 s1,int32 lo,int32 s2,int32 s8,int32 hi,int32 s4,int32 s5,int32 s6,int32 t0,int32 ra)
@@ -6368,27 +6368,27 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108be4c: 0x108be4c: lui   v0, 0x80000
+// 0x0108c470: 0x108c470: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108be50: 0x108be50: addiu sp, sp, -1408
+// 0x0108c474: 0x108c474: addiu sp, sp, -1408
 	ldloc.0
 	ldc.i4 -1408
 	add
 	stloc.0
-// 0x0108be54: 0x108be54: sw    zero, -2108(v0)
+// 0x0108c478: 0x108c478: sw    zero, -1644(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -527
+	ldc.i4 -411
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108be58: 0x108be58: lui   v0, 0xf0000
+// 0x0108c47c: 0x108c47c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108be5c: 0x108be5c: sw    s3, 1380(sp)
+// 0x0108c480: 0x108c480: sw    s3, 1380(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6397,19 +6397,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108be60: 0x108be60: lw    s3, -30068(v0)
+// 0x0108c484: 0x108c484: lw    s3, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108be64: 0x108be64: lui   v0, 0xf0000
+// 0x0108c488: 0x108c488: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108be68: 0x108be68: sw    s7, 1396(sp)
+// 0x0108c48c: 0x108c48c: sw    s7, 1396(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6418,7 +6418,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108be6c: 0x108be6c: sw    s6, 1392(sp)
+// 0x0108c490: 0x108c490: sw    s6, 1392(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6427,7 +6427,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0108be70: 0x108be70: sw    s4, 1384(sp)
+// 0x0108c494: 0x108c494: sw    s4, 1384(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6436,7 +6436,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0108be74: 0x108be74: sw    s2, 1376(sp)
+// 0x0108c498: 0x108c498: sw    s2, 1376(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6445,7 +6445,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108be78: 0x108be78: sw    s1, 1372(sp)
+// 0x0108c49c: 0x108c49c: sw    s1, 1372(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6454,7 +6454,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108be7c: 0x108be7c: sw    s0, 1368(sp)
+// 0x0108c4a0: 0x108c4a0: sw    s0, 1368(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6463,8 +6463,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108be80: 0x108be80: sw    ra, 1404(sp)
-// 0x0108be84: 0x108be84: sw    s8, 1400(sp)
+// 0x0108c4a4: 0x108c4a4: sw    ra, 1404(sp)
+// 0x0108c4a8: 0x108c4a8: sw    s8, 1400(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6473,7 +6473,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108be88: 0x108be88: sw    s5, 1388(sp)
+// 0x0108c4ac: 0x108c4ac: sw    s5, 1388(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6482,47 +6482,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0108be8c: 0x108be8c: addu  s0, a0, zero
+// 0x0108c4b0: 0x108c4b0: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0108be90: 0x108be90: addu  s6, a1, zero
+// 0x0108c4b4: 0x108c4b4: addu  s6, a1, zero
 	ldloc.2
 	stloc 18
-// 0x0108be94: 0x108be94: addu  s4, a2, zero
+// 0x0108c4b8: 0x108c4b8: addu  s4, a2, zero
 	ldloc.3
 	stloc 16
-// 0x0108be98: 0x108be98: lw    s7, -30072(v0)
+// 0x0108c4bc: 0x108c4bc: lw    s7, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108be9c: 0x108be9c: addu  s1, zero, zero
+// 0x0108c4c0: 0x108c4c0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x0108bea0: 0x108bea0: j	 0x108bee0 addiu s2, zero, 568
+// 0x0108c4c4: 0x108c4c4: j	 0x108c504 addiu s2, zero, 568
 	ldc.i4 568
 	stloc 13
-	br L_108bee0
+	br L_108c504
 // --- basic block ---
-L_108bea8:
-// 0x0108bea8: 0x108bea8: mult  s1, s2
+L_108c4cc:
+// 0x0108c4cc: 0x108c4cc: mult  s1, s2
 	ldloc 11
 	ldloc 13
 	mul
 	stloc 12
-// 0x0108beac: 0x108beac: mflo  lo
+// 0x0108c4d0: 0x108c4d0: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x0108beb0: 0x108beb0: addu  a0, s0, a0
+// 0x0108c4d4: 0x108c4d4: addu  a0, s0, a0
 	ldloc 10
 	ldloc.1
 	add
 	stloc.1
-// 0x0108beb4: 0x108beb4: jal   0x1001b14 addiu a0, a0, 68
+// 0x0108c4d8: 0x108c4d8: jal   0x1001b14 addiu a0, a0, 68
 	ldloc.1
 	ldc.i4.s 68
 	add
@@ -6532,36 +6532,36 @@ L_108bea8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108bebc: 0x108bebc: bne   v0, zero, 0x108bee0 addiu s1, s1, 1
+// 0x0108c4e0: 0x108c4e0: bne   v0, zero, 0x108c504 addiu s1, s1, 1
 	ldloc 5
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brtrue L_108bee0
+	brtrue L_108c504
 // --- basic block ---
-// 0x0108bec4: 0x108bec4: addiu s1, s1, -1
+// 0x0108c4e8: 0x108c4e8: addiu s1, s1, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-// 0x0108bec8: 0x108bec8: jal   0x101fa28 addiu s5, zero, 70
+// 0x0108c4ec: 0x108c4ec: jal   0x101fa38 addiu s5, zero, 70
 	ldc.i4.s 70
 	stloc 17
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0108bed0: 0x108bed0: beq   v0, zero, 0x108befc sll   zero, zero, 0
+// 0x0108c4f4: 0x108c4f4: beq   v0, zero, 0x108c520 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108befc
+	brfalse L_108c520
 // --- basic block ---
-// 0x0108bed8: 0x108bed8: j	 0x108befc addiu s5, zero, 100
+// 0x0108c4fc: 0x108c4fc: j	 0x108c520 addiu s5, zero, 100
 	ldc.i4.s 100
 	stloc 17
-	br L_108befc
+	br L_108c520
 // --- basic block ---
-L_108bee0:
-// 0x0108bee0: 0x108bee0: lw    v0, 28400(s0)
+L_108c504:
+// 0x0108c504: 0x108c504: lw    v0, 28400(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6570,47 +6570,47 @@ L_108bee0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108bee4: 0x108bee4: sll   zero, zero, 0
-// 0x0108bee8: 0x108bee8: slt   v0, s1, v0
+// 0x0108c508: 0x108c508: sll   zero, zero, 0
+// 0x0108c50c: 0x108c50c: slt   v0, s1, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108beec: 0x108beec: bne   v0, zero, 0x108bea8 addu  a1, s6, zero
+// 0x0108c510: 0x108c510: bne   v0, zero, 0x108c4cc addu  a1, s6, zero
 	ldloc 5
 	ldloc 18
 	stloc.2
-	brtrue L_108bea8
+	brtrue L_108c4cc
 // --- basic block ---
-// 0x0108bef4: 0x108bef4: j	 0x108cc38 sll   zero, zero, 0
-	br L_108cc38
+// 0x0108c518: 0x108c518: j	 0x108d25c sll   zero, zero, 0
+	br L_108d25c
 // --- basic block ---
-L_108befc:
-// 0x0108befc: 0x108befc: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+L_108c520:
+// 0x0108c520: 0x108c520: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0108bf04: 0x108bf04: beq   v0, zero, 0x108bf38 addiu v1, zero, 568
+// 0x0108c528: 0x108c528: beq   v0, zero, 0x108c55c addiu v1, zero, 568
 	ldloc 5
 	ldc.i4 568
 	stloc 6
-	brfalse L_108bf38
+	brfalse L_108c55c
 // --- basic block ---
-// 0x0108bf0c: 0x108bf0c: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0108c530: 0x108c530: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108bf14: 0x108bf14: lui   a1, 0x20000
+// 0x0108c538: 0x108c538: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108bf18: 0x108bf18: addu  a0, v0, zero
+// 0x0108c53c: 0x108c53c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108bf1c: 0x108bf1c: jal   0x1001b14 addiu a1, a1, -7240
+// 0x0108c540: 0x108c540: jal   0x1001b14 addiu a1, a1, -6776
 	ldloc.2
-	ldc.i4 -7240
+	ldc.i4 -6776
 	add
 	stloc.2
 	ldloc.1
@@ -6618,13 +6618,13 @@ L_108befc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108bf24: 0x108bf24: bne   v0, zero, 0x108bf38 addiu v1, zero, 568
+// 0x0108c548: 0x108c548: bne   v0, zero, 0x108c55c addiu v1, zero, 568
 	ldloc 5
 	ldc.i4 568
 	stloc 6
-	brtrue L_108bf38
+	brtrue L_108c55c
 // --- basic block ---
-// 0x0108bf2c: 0x108bf2c: jal   0x1094b64 addiu a0, zero, 2
+// 0x0108c550: 0x108c550: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -6632,32 +6632,32 @@ L_108befc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108bf34: 0x108bf34: addiu v1, zero, 568
+// 0x0108c558: 0x108c558: addiu v1, zero, 568
 	ldc.i4 568
 	stloc 6
-L_108bf38:
-// 0x0108bf38: 0x108bf38: mult  s1, v1
+L_108c55c:
+// 0x0108c55c: 0x108c55c: mult  s1, v1
 	ldloc 11
 	ldloc 6
 	mul
 	stloc 12
-// 0x0108bf3c: 0x108bf3c: addiu s2, zero, -1
+// 0x0108c560: 0x108c560: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 13
-// 0x0108bf40: 0x108bf40: mflo  lo
+// 0x0108c564: 0x108c564: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x0108bf44: 0x108bf44: addu  v1, s0, v1
+// 0x0108c568: 0x108c568: addu  v1, s0, v1
 	ldloc 10
 	ldloc 6
 	add
 	stloc 6
-// 0x0108bf48: 0x108bf48: lw    v0, 136(v1)
+// 0x0108c56c: 0x108c56c: lw    v0, 136(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6666,7 +6666,7 @@ L_108bf38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108bf4c: 0x108bf4c: lw    v1, 132(v1)
+// 0x0108c570: 0x108c570: lw    v1, 132(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6675,7 +6675,7 @@ L_108bf38:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108bf50: 0x108bf50: sw    v0, 44(sp)
+// 0x0108c574: 0x108c574: sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6684,7 +6684,7 @@ L_108bf38:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108bf54: 0x108bf54: beq   s4, s2, 0x108c040 sw    v1, 40(sp)
+// 0x0108c578: 0x108c578: beq   s4, s2, 0x108c664 sw    v1, 40(sp)
 	ldloc 16
 	ldloc 13
 	ldloc 7
@@ -6695,9 +6695,9 @@ L_108bf38:
 	add
 	ldloc 6
 	stelem.i4
-	beq  L_108c040
+	beq  L_108c664
 // --- basic block ---
-// 0x0108bf5c: 0x108bf5c: sw    v0, 68(sp)
+// 0x0108c580: 0x108c580: sw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6706,10 +6706,10 @@ L_108bf38:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108bf60: 0x108bf60: addiu v0, zero, 1
+// 0x0108c584: 0x108c584: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108bf64: 0x108bf64: bne   s4, v0, 0x108bf98 sw    v1, 64(sp)
+// 0x0108c588: 0x108c588: bne   s4, v0, 0x108c5bc sw    v1, 64(sp)
 	ldloc 16
 	ldloc 5
 	ldloc 7
@@ -6720,20 +6720,20 @@ L_108bf38:
 	add
 	ldloc 6
 	stelem.i4
-	bne.un L_108bf98
+	bne.un L_108c5bc
 // --- basic block ---
-// 0x0108bf6c: 0x108bf6c: addiu s2, sp, 64
+// 0x0108c590: 0x108c590: addiu s2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 13
-// 0x0108bf70: 0x108bf70: lui   a0, 0x10000
+// 0x0108c594: 0x108c594: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108bf74: 0x108bf74: addu  a1, s2, zero
+// 0x0108c598: 0x108c598: addu  a1, s2, zero
 	ldloc 13
 	stloc.2
-// 0x0108bf78: 0x108bf78: jal   0x101f76c addiu a0, a0, -29680
+// 0x0108c59c: 0x108c59c: jal   0x101f77c addiu a0, a0, -29680
 	ldloc.1
 	ldc.i4 -29680
 	add
@@ -6743,18 +6743,18 @@ L_108bf38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108bf80: 0x108bf80: addu  a0, s2, zero
+// 0x0108c5a4: 0x108c5a4: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108bf84: 0x108bf84: addiu a1, zero, 600
+// 0x0108c5a8: 0x108c5a8: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x0108bf88: 0x108bf88: jal   0x1020f5c addu  a2, zero, zero
+// 0x0108c5ac: 0x108c5ac: jal   0x1020f6c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6762,28 +6762,28 @@ L_108bf38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108bf90: 0x108bf90: j	 0x108c01c addiu s2, zero, 1000
+// 0x0108c5b4: 0x108c5b4: j	 0x108c640 addiu s2, zero, 1000
 	ldc.i4 1000
 	stloc 13
-	br L_108c01c
+	br L_108c640
 // --- basic block ---
-L_108bf98:
-// 0x0108bf98: 0x108bf98: addiu a0, sp, 72
+L_108c5bc:
+// 0x0108c5bc: 0x108c5bc: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x0108bf9c: 0x108bf9c: addiu a1, sp, 92
+// 0x0108c5c0: 0x108c5c0: addiu a1, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.2
-// 0x0108bfa0: 0x108bfa0: jal   0x1029da8 addiu a2, sp, 36
+// 0x0108c5c4: 0x108c5c4: jal   0x1029db8 addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -6793,21 +6793,21 @@ L_108bf98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108bfa8: 0x108bfa8: beq   v0, s2, 0x108c00c addiu a0, sp, 64
+// 0x0108c5cc: 0x108c5cc: beq   v0, s2, 0x108c630 addiu a0, sp, 64
 	ldloc 5
 	ldloc 13
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-	beq  L_108c00c
+	beq  L_108c630
 // --- basic block ---
-// 0x0108bfb0: 0x108bfb0: lw    v0, 76(sp)
+// 0x0108c5d4: 0x108c5d4: lw    v0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6816,10 +6816,10 @@ L_108bf98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108bfb4: 0x108bfb4: addu  a1, a0, zero
+// 0x0108c5d8: 0x108c5d8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0108bfb8: 0x108bfb8: sw    v0, 60(sp)
+// 0x0108c5dc: 0x108c5dc: sw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6828,7 +6828,7 @@ L_108bf98:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108bfbc: 0x108bfbc: lw    v0, 72(sp)
+// 0x0108c5e0: 0x108c5e0: lw    v0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6837,12 +6837,12 @@ L_108bf98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108bfc0: 0x108bfc0: addiu a0, sp, 56
+// 0x0108c5e4: 0x108c5e4: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x0108bfc4: 0x108bfc4: jal   0x1008eb0 sw    v0, 56(sp)
+// 0x0108c5e8: 0x108c5e8: jal   0x1008ec0 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6856,57 +6856,57 @@ L_108bf98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108bfcc: 0x108bfcc: slti  v1, v0, 1000
+// 0x0108c5f0: 0x108c5f0: slti  v1, v0, 1000
 	ldloc 5
 	ldc.i4 1000
 	clt
 	stloc 6
-// 0x0108bfd0: 0x108bfd0: bne   v1, zero, 0x108bff4 addiu s2, zero, 1000
+// 0x0108c5f4: 0x108c5f4: bne   v1, zero, 0x108c618 addiu s2, zero, 1000
 	ldloc 6
 	ldc.i4 1000
 	stloc 13
-	brtrue L_108bff4
+	brtrue L_108c618
 // --- basic block ---
-// 0x0108bfd8: 0x108bfd8: slti  v1, v0, 2000
+// 0x0108c5fc: 0x108c5fc: slti  v1, v0, 2000
 	ldloc 5
 	ldc.i4 2000
 	clt
 	stloc 6
-// 0x0108bfdc: 0x108bfdc: bne   v1, zero, 0x108bff4 addiu s2, zero, 1500
+// 0x0108c600: 0x108c600: bne   v1, zero, 0x108c618 addiu s2, zero, 1500
 	ldloc 6
 	ldc.i4 1500
 	stloc 13
-	brtrue L_108bff4
+	brtrue L_108c618
 // --- basic block ---
-// 0x0108bfe4: 0x108bfe4: slti  v0, v0, 5000
+// 0x0108c608: 0x108c608: slti  v0, v0, 5000
 	ldloc 5
 	ldc.i4 5000
 	clt
 	stloc 5
-// 0x0108bfe8: 0x108bfe8: bne   v0, zero, 0x108bff4 addiu s2, zero, 2500
+// 0x0108c60c: 0x108c60c: bne   v0, zero, 0x108c618 addiu s2, zero, 2500
 	ldloc 5
 	ldc.i4 2500
 	stloc 13
-	brtrue L_108bff4
+	brtrue L_108c618
 // --- basic block ---
-// 0x0108bff0: 0x108bff0: addiu s2, zero, 5000
+// 0x0108c614: 0x108c614: addiu s2, zero, 5000
 	ldc.i4 5000
 	stloc 13
-L_108bff4:
-// 0x0108bff4: 0x108bff4: addiu a0, sp, 56
+L_108c618:
+// 0x0108c618: 0x108c618: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x0108bff8: 0x108bff8: addiu a1, zero, 600
+// 0x0108c61c: 0x108c61c: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x0108bffc: 0x108bffc: jal   0x1020f5c addu  a2, zero, zero
+// 0x0108c620: 0x108c620: jal   0x1020f6c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6914,19 +6914,19 @@ L_108bff4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c004: 0x108c004: j	 0x108c01c sll   zero, zero, 0
-	br L_108c01c
+// 0x0108c628: 0x108c628: j	 0x108c640 sll   zero, zero, 0
+	br L_108c640
 // --- basic block ---
-L_108c00c:
-// 0x0108c00c: 0x108c00c: addiu a1, zero, 600
+L_108c630:
+// 0x0108c630: 0x108c630: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x0108c010: 0x108c010: jal   0x1020f5c addu  a2, zero, zero
+// 0x0108c634: 0x108c634: jal   0x1020f6c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6934,26 +6934,26 @@ L_108c00c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c018: 0x108c018: addiu s2, zero, 5000
+// 0x0108c63c: 0x108c63c: addiu s2, zero, 5000
 	ldc.i4 5000
 	stloc 13
-L_108c01c:
-// 0x0108c01c: 0x108c01c: jal   0x101f8cc sll   zero, zero, 0
+L_108c640:
+// 0x0108c640: 0x108c640: jal   0x101f8dc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_height_101f8cc(int32)
+	call int32 Cibyl23::roadmap_screen_height_101f8dc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c024: 0x108c024: addiu a1, zero, 3
+// 0x0108c648: 0x108c648: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0108c028: 0x108c028: div   v0, a1
+// 0x0108c64c: 0x108c64c: div   v0, a1
 	ldloc 5
 	ldloc.2
 	ldloc 5
@@ -6962,10 +6962,10 @@ L_108c01c:
 	stloc 12
 	rem
 	stloc 15
-// 0x0108c02c: 0x108c02c: mflo  lo
+// 0x0108c650: 0x108c650: mflo  lo
 	ldloc 12
 	stloc.2
-// 0x0108c030: 0x108c030: jal   0x101fb0c addu  a0, s2, zero
+// 0x0108c654: 0x108c654: jal   0x101fb1c addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -6973,40 +6973,40 @@ L_108c01c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_scale_101fb0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_scale_101fb1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c038: 0x108c038: jal   0x1021280 sll   zero, zero, 0
+// 0x0108c65c: 0x108c65c: jal   0x1021290 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_set_orientation_fixed_1021280(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_set_orientation_fixed_1021290(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108c040:
-// 0x0108c040: 0x108c040: addiu v0, zero, 568
+L_108c664:
+// 0x0108c664: 0x108c664: addiu v0, zero, 568
 	ldc.i4 568
 	stloc 5
-// 0x0108c044: 0x108c044: mult  s1, v0
+// 0x0108c668: 0x108c668: mult  s1, v0
 	ldloc 11
 	ldloc 5
 	mul
 	stloc 12
-// 0x0108c048: 0x108c048: mflo  lo
+// 0x0108c66c: 0x108c66c: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x0108c04c: 0x108c04c: addu  v0, s0, v0
+// 0x0108c670: 0x108c670: addu  v0, s0, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x0108c050: 0x108c050: lw    a0, 156(v0)
+// 0x0108c674: 0x108c674: lw    a0, 156(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7015,29 +7015,29 @@ L_108c040:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108c054: 0x108c054: jal   0x103542c sll   zero, zero, 0
+// 0x0108c678: 0x108c678: jal   0x103543c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_mood_to_string_103542c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_mood_to_string_103543c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c05c: 0x108c05c: lui   a0, 0x20000
+// 0x0108c680: 0x108c680: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c060: 0x108c060: addu  a1, v0, zero
+// 0x0108c684: 0x108c684: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c064: 0x108c064: addiu a0, a0, -7072
+// 0x0108c688: 0x108c688: addiu a0, a0, -6608
 	ldloc.1
-	ldc.i4 -7072
+	ldc.i4 -6608
 	add
 	stloc.1
-// 0x0108c068: 0x108c068: jal   0x109e13c addiu a2, zero, 512
+// 0x0108c68c: 0x108c68c: jal   0x109e784 addiu a2, zero, 512
 	ldc.i4 512
 	stloc.3
 	ldloc.0
@@ -7045,23 +7045,23 @@ L_108c040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c070: 0x108c070: addu  a0, v0, zero
+// 0x0108c694: 0x108c694: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c074: 0x108c074: addiu a1, sp, 48
+// 0x0108c698: 0x108c698: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x0108c078: 0x108c078: addu  a2, zero, zero
+// 0x0108c69c: 0x108c69c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c07c: 0x108c07c: jal   0x1099350 addu  s4, v0, zero
+// 0x0108c6a0: 0x108c6a0: jal   0x1099998 addu  s4, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -7069,25 +7069,25 @@ L_108c040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c084: 0x108c084: slt   v0, s3, s7
+// 0x0108c6a8: 0x108c6a8: slt   v0, s3, s7
 	ldloc 9
 	ldloc 8
 	clt
 	stloc 5
-// 0x0108c088: 0x108c088: beq   v0, zero, 0x108c094 sll   zero, zero, 0
+// 0x0108c6ac: 0x108c6ac: beq   v0, zero, 0x108c6b8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108c094
+	brfalse L_108c6b8
 // --- basic block ---
-// 0x0108c090: 0x108c090: addu  s7, s3, zero
+// 0x0108c6b4: 0x108c6b4: addu  s7, s3, zero
 	ldloc 9
 	stloc 8
-L_108c094:
-// 0x0108c094: 0x108c094: lw    a2, 48(sp)
+L_108c6b8:
+// 0x0108c6b8: 0x108c6b8: lw    a2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7096,41 +7096,41 @@ L_108c094:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108c098: 0x108c098: lui   a1, 0x10000
+// 0x0108c6bc: 0x108c6bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108c09c: 0x108c09c: subu  s7, s7, a2
+// 0x0108c6c0: 0x108c6c0: subu  s7, s7, a2
 	ldloc 8
 	ldloc.3
 	sub
 	stloc 8
-// 0x0108c0a0: 0x108c0a0: addiu a2, s7, -10
+// 0x0108c6c4: 0x108c6c4: addiu a2, s7, -10
 	ldloc 8
 	ldc.i4.s -10
 	add
 	stloc.3
-// 0x0108c0a4: 0x108c0a4: lui   a0, 0x20000
+// 0x0108c6c8: 0x108c6c8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c0a8: 0x108c0a8: addiu a1, a1, 18500
+// 0x0108c6cc: 0x108c6cc: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108c0ac: 0x108c0ac: subu  a2, a2, s5
+// 0x0108c6d0: 0x108c6d0: subu  a2, a2, s5
 	ldloc.3
 	ldloc 17
 	sub
 	stloc.3
-// 0x0108c0b0: 0x108c0b0: addiu a0, a0, -25208
+// 0x0108c6d4: 0x108c6d4: addiu a0, a0, -24744
 	ldloc.1
-	ldc.i4 -25208
+	ldc.i4 -24744
 	add
 	stloc.1
-// 0x0108c0b4: 0x108c0b4: addiu a3, zero, -1
+// 0x0108c6d8: 0x108c6d8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0108c0b8: 0x108c0b8: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0108c6dc: 0x108c6dc: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7144,65 +7144,65 @@ L_108c094:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c0c0: 0x108c0c0: addu  a0, v0, zero
+// 0x0108c6e4: 0x108c6e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c0c4: 0x108c0c4: addu  a1, zero, zero
+// 0x0108c6e8: 0x108c6e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c0c8: 0x108c0c8: addu  a2, zero, zero
+// 0x0108c6ec: 0x108c6ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c0cc: 0x108c0cc: jal   0x1098fe0 addu  s2, v0, zero
+// 0x0108c6f0: 0x108c6f0: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c0d4: 0x108c0d4: addiu a1, zero, 568
+// 0x0108c6f8: 0x108c6f8: addiu a1, zero, 568
 	ldc.i4 568
 	stloc.2
-// 0x0108c0d8: 0x108c0d8: mult  s1, a1
+// 0x0108c6fc: 0x108c6fc: mult  s1, a1
 	ldloc 11
 	ldloc.2
 	mul
 	stloc 12
-// 0x0108c0dc: 0x108c0dc: mflo  lo
+// 0x0108c700: 0x108c700: mflo  lo
 	ldloc 12
 	stloc.2
-// 0x0108c0e0: 0x108c0e0: addu  a1, s0, a1
+// 0x0108c704: 0x108c704: addu  a1, s0, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc.2
-// 0x0108c0e4: 0x108c0e4: lbu   v0, 4(a1)
+// 0x0108c708: 0x108c708: lbu   v0, 4(a1)
 	ldloc.2
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0108c0e8: 0x108c0e8: sll   zero, zero, 0
-// 0x0108c0ec: 0x108c0ec: bne   v0, zero, 0x108c10c addiu s3, sp, 248
+// 0x0108c70c: 0x108c70c: sll   zero, zero, 0
+// 0x0108c710: 0x108c710: bne   v0, zero, 0x108c730 addiu s3, sp, 248
 	ldloc 5
 	ldloc.0
 	ldc.i4 248
 	add
 	stloc 9
-	brtrue L_108c10c
+	brtrue L_108c730
 // --- basic block ---
-// 0x0108c0f4: 0x108c0f4: lui   a0, 0x20000
+// 0x0108c718: 0x108c718: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c0f8: 0x108c0f8: jal   0x101cd60 addiu a0, a0, -6328
+// 0x0108c71c: 0x108c71c: jal   0x101cd70 addiu a0, a0, -5864
 	ldloc.1
-	ldc.i4 -6328
+	ldc.i4 -5864
 	add
 	stloc.1
 	ldloc.0
@@ -7210,30 +7210,30 @@ L_108c094:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c100: 0x108c100: addu  a1, v0, zero
+// 0x0108c724: 0x108c724: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c104: 0x108c104: j	 0x108c114 addu  a0, s3, zero
+// 0x0108c728: 0x108c728: j	 0x108c738 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-	br L_108c114
+	br L_108c738
 // --- basic block ---
-L_108c10c:
-// 0x0108c10c: 0x108c10c: addu  a0, s3, zero
+L_108c730:
+// 0x0108c730: 0x108c730: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0108c110: 0x108c110: addiu a1, a1, 4
+// 0x0108c734: 0x108c734: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-L_108c114:
-// 0x0108c114: 0x108c114: jal   0x1001af8 addiu a2, zero, 100
+L_108c738:
+// 0x0108c738: 0x108c738: jal   0x1001af8 addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.1
@@ -7242,35 +7242,35 @@ L_108c114:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108c11c: 0x108c11c: addiu s3, sp, 248
+// 0x0108c740: 0x108c740: addiu s3, sp, 248
 	ldloc.0
 	ldc.i4 248
 	add
 	stloc 9
-// 0x0108c120: 0x108c120: lui   a0, 0x20000
+// 0x0108c744: 0x108c744: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c124: 0x108c124: addu  a3, zero, zero
+// 0x0108c748: 0x108c748: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0108c128: 0x108c128: addiu a0, a0, -7060
+// 0x0108c74c: 0x108c74c: addiu a0, a0, -6596
 	ldloc.1
-	ldc.i4 -7060
+	ldc.i4 -6596
 	add
 	stloc.1
-// 0x0108c12c: 0x108c12c: addu  a1, s3, zero
+// 0x0108c750: 0x108c750: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0108c130: 0x108c130: addiu a2, zero, 18
+// 0x0108c754: 0x108c754: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0108c134: 0x108c134: sb    zero, 347(sp)
+// 0x0108c758: 0x108c758: sb    zero, 347(sp)
 	ldloc.0
 	ldc.i4 347
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0108c138: 0x108c138: jal   0x1098d10 lui   s7, 0x0
+// 0x0108c75c: 0x108c75c: jal   0x1099358 lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -7278,23 +7278,23 @@ L_108c114:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c140: 0x108c140: addu  a0, v0, zero
+// 0x0108c764: 0x108c764: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c144: 0x108c144: addu  a2, zero, zero
+// 0x0108c768: 0x108c768: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c148: 0x108c148: addiu a1, s7, 23000
+// 0x0108c76c: 0x108c76c: addiu a1, s7, 23000
 	ldloc 8
 	ldc.i4 23000
 	add
 	stloc.2
-// 0x0108c14c: 0x108c14c: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108c770: 0x108c770: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7306,9 +7306,9 @@ L_108c114:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c154: 0x108c154: lw    v0, 1360(sp)
+// 0x0108c778: 0x108c778: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7317,29 +7317,29 @@ L_108c114:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c158: 0x108c158: addu  a0, s2, zero
+// 0x0108c77c: 0x108c77c: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c15c: 0x108c15c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108c780: 0x108c780: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c164: 0x108c164: addiu s8, zero, 568
+// 0x0108c788: 0x108c788: addiu s8, zero, 568
 	ldc.i4 568
 	stloc 14
-// 0x0108c168: 0x108c168: addiu a1, zero, 6
+// 0x0108c78c: 0x108c78c: addiu a1, zero, 6
 	ldc.i4.6
 	stloc.2
-// 0x0108c16c: 0x108c16c: addu  a2, zero, zero
+// 0x0108c790: 0x108c790: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c170: 0x108c170: jal   0x109434c addu  a0, s2, zero
+// 0x0108c794: 0x108c794: jal   0x1094970 addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -7347,25 +7347,25 @@ L_108c114:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c178: 0x108c178: mult  s1, s8
+// 0x0108c79c: 0x108c79c: mult  s1, s8
 	ldloc 11
 	ldloc 14
 	mul
 	stloc 12
-// 0x0108c17c: 0x108c17c: mflo  lo
+// 0x0108c7a0: 0x108c7a0: mflo  lo
 	ldloc 12
 	stloc 14
-// 0x0108c180: 0x108c180: addu  v1, s0, s8
+// 0x0108c7a4: 0x108c7a4: addu  v1, s0, s8
 	ldloc 10
 	ldloc 14
 	add
 	stloc 6
-// 0x0108c184: 0x108c184: lw    a0, 228(v1)
+// 0x0108c7a8: 0x108c7a8: lw    a0, 228(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7374,7 +7374,7 @@ L_108c114:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108c188: 0x108c188: jal   0x1077bb0 sw    v1, 1364(sp)
+// 0x0108c7ac: 0x108c7ac: jal   0x10781d4 sw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7384,21 +7384,21 @@ L_108c114:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl89::RTAlerts_Get_Stars_Icon_1077bb0(int32)
+	call int32 Cibyl90::RTAlerts_Get_Stars_Icon_10781d4(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108c190: 0x108c190: lui   a0, 0x20000
+// 0x0108c7b4: 0x108c7b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c194: 0x108c194: addiu a0, a0, -26820
+// 0x0108c7b8: 0x108c7b8: addiu a0, a0, -26356
 	ldloc.1
-	ldc.i4 -26820
+	ldc.i4 -26356
 	add
 	stloc.1
-// 0x0108c198: 0x108c198: addu  a1, v0, zero
+// 0x0108c7bc: 0x108c7bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c19c: 0x108c19c: jal   0x109e13c addiu a2, zero, 8
+// 0x0108c7c0: 0x108c7c0: jal   0x109e784 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -7406,25 +7406,25 @@ L_108c114:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c1a4: 0x108c1a4: addu  a1, v0, zero
+// 0x0108c7c8: 0x108c7c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c1a8: 0x108c1a8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x0108c7cc: 0x108c7cc: jal   0x109950c addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c1b0: 0x108c1b0: lw    v1, 1364(sp)
+// 0x0108c7d4: 0x108c7d4: lw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7433,39 +7433,39 @@ L_108c114:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108c1b4: 0x108c1b4: sll   zero, zero, 0
-// 0x0108c1b8: 0x108c1b8: lb    v0, 252(v1)
+// 0x0108c7d8: 0x108c7d8: sll   zero, zero, 0
+// 0x0108c7dc: 0x108c7dc: lb    v0, 252(v1)
 	ldloc 6
 	ldc.i4 252
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108c1bc: 0x108c1bc: sll   zero, zero, 0
-// 0x0108c1c0: 0x108c1c0: beq   v0, zero, 0x108c21c addu  a3, s0, s8
+// 0x0108c7e0: 0x108c7e0: sll   zero, zero, 0
+// 0x0108c7e4: 0x108c7e4: beq   v0, zero, 0x108c840 addu  a3, s0, s8
 	ldloc 5
 	ldloc 10
 	ldloc 14
 	add
 	stloc 4
-	brfalse L_108c21c
+	brfalse L_108c840
 // --- basic block ---
-// 0x0108c1c8: 0x108c1c8: lui   a2, 0x10000
+// 0x0108c7ec: 0x108c7ec: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108c1cc: 0x108c1cc: addiu a2, a2, 14640
+// 0x0108c7f0: 0x108c7f0: addiu a2, a2, 14636
 	ldloc.3
-	ldc.i4 14640
+	ldc.i4 14636
 	add
 	stloc.3
-// 0x0108c1d0: 0x108c1d0: addiu a3, a3, 252
+// 0x0108c7f4: 0x108c7f4: addiu a3, a3, 252
 	ldloc 4
 	ldc.i4 252
 	add
 	stloc 4
-// 0x0108c1d4: 0x108c1d4: addu  a0, s3, zero
+// 0x0108c7f8: 0x108c7f8: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0108c1d8: 0x108c1d8: jal   0x1000f9c addiu a1, zero, 100
+// 0x0108c7fc: 0x108c7fc: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -7478,21 +7478,21 @@ L_108c114:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c1e0: 0x108c1e0: lui   a0, 0x20000
+// 0x0108c804: 0x108c804: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c1e4: 0x108c1e4: addu  a1, s3, zero
+// 0x0108c808: 0x108c808: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0108c1e8: 0x108c1e8: addiu a0, a0, -25336
+// 0x0108c80c: 0x108c80c: addiu a0, a0, -24872
 	ldloc.1
-	ldc.i4 -25336
+	ldc.i4 -24872
 	add
 	stloc.1
-// 0x0108c1ec: 0x108c1ec: addiu a2, zero, 18
+// 0x0108c810: 0x108c810: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0108c1f0: 0x108c1f0: jal   0x1098d10 addiu a3, zero, 8
+// 0x0108c814: 0x108c814: jal   0x1099358 addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
 	ldloc.0
@@ -7500,23 +7500,23 @@ L_108c114:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c1f8: 0x108c1f8: addu  a0, v0, zero
+// 0x0108c81c: 0x108c81c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c1fc: 0x108c1fc: addiu a1, s7, 23000
+// 0x0108c820: 0x108c820: addiu a1, s7, 23000
 	ldloc 8
 	ldc.i4 23000
 	add
 	stloc.2
-// 0x0108c200: 0x108c200: addu  a2, zero, zero
+// 0x0108c824: 0x108c824: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c204: 0x108c204: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108c828: 0x108c828: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7528,9 +7528,9 @@ L_108c114:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c20c: 0x108c20c: lw    v0, 1360(sp)
+// 0x0108c830: 0x108c830: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7539,61 +7539,61 @@ L_108c114:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c210: 0x108c210: addu  a0, s2, zero
+// 0x0108c834: 0x108c834: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c214: 0x108c214: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108c838: 0x108c838: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108c21c:
-// 0x0108c21c: 0x108c21c: addiu a1, zero, 568
+L_108c840:
+// 0x0108c840: 0x108c840: addiu a1, zero, 568
 	ldc.i4 568
 	stloc.2
-// 0x0108c220: 0x108c220: mult  s1, a1
+// 0x0108c844: 0x108c844: mult  s1, a1
 	ldloc 11
 	ldloc.2
 	mul
 	stloc 12
-// 0x0108c224: 0x108c224: mflo  lo
+// 0x0108c848: 0x108c848: mflo  lo
 	ldloc 12
 	stloc.2
-// 0x0108c228: 0x108c228: addiu a1, a1, 160
+// 0x0108c84c: 0x108c84c: addiu a1, a1, 160
 	ldloc.2
 	ldc.i4 160
 	add
 	stloc.2
-// 0x0108c22c: 0x108c22c: addu  a1, s0, a1
+// 0x0108c850: 0x108c850: addu  a1, s0, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc.2
-// 0x0108c230: 0x108c230: lbu   v0, 0(a1)
+// 0x0108c854: 0x108c854: lbu   v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0108c234: 0x108c234: sll   zero, zero, 0
-// 0x0108c238: 0x108c238: beq   v0, zero, 0x108c298 addiu s7, zero, 568
+// 0x0108c858: 0x108c858: sll   zero, zero, 0
+// 0x0108c85c: 0x108c85c: beq   v0, zero, 0x108c8bc addiu s7, zero, 568
 	ldloc 5
 	ldc.i4 568
 	stloc 8
-	brfalse L_108c298
+	brfalse L_108c8bc
 // --- basic block ---
-// 0x0108c240: 0x108c240: addiu s3, sp, 348
+// 0x0108c864: 0x108c864: addiu s3, sp, 348
 	ldloc.0
 	ldc.i4 348
 	add
 	stloc 9
-// 0x0108c244: 0x108c244: addu  a0, s3, zero
+// 0x0108c868: 0x108c868: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0108c248: 0x108c248: jal   0x1001af8 addiu a2, zero, 100
+// 0x0108c86c: 0x108c86c: jal   0x1001af8 addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.1
@@ -7602,24 +7602,24 @@ L_108c21c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108c250: 0x108c250: lui   a0, 0x10000
+// 0x0108c874: 0x108c874: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108c254: 0x108c254: addu  a1, s3, zero
+// 0x0108c878: 0x108c878: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0108c258: 0x108c258: addiu a0, a0, -23820
+// 0x0108c87c: 0x108c87c: addiu a0, a0, -23820
 	ldloc.1
 	ldc.i4 -23820
 	add
 	stloc.1
-// 0x0108c25c: 0x108c25c: addiu a2, zero, 14
+// 0x0108c880: 0x108c880: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x0108c260: 0x108c260: addiu a3, zero, 8
+// 0x0108c884: 0x108c884: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0108c264: 0x108c264: jal   0x1098d10 sb    zero, 447(sp)
+// 0x0108c888: 0x108c888: jal   0x1099358 sb    zero, 447(sp)
 	ldloc.0
 	ldc.i4 447
 	add
@@ -7630,26 +7630,26 @@ L_108c21c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c26c: 0x108c26c: lui   a1, 0x0
+// 0x0108c890: 0x108c890: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c270: 0x108c270: addu  a0, v0, zero
+// 0x0108c894: 0x108c894: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c274: 0x108c274: addiu a1, a1, 23008
+// 0x0108c898: 0x108c898: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0108c278: 0x108c278: addu  a2, zero, zero
+// 0x0108c89c: 0x108c89c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c27c: 0x108c27c: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108c8a0: 0x108c8a0: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7661,9 +7661,9 @@ L_108c21c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c284: 0x108c284: lw    v0, 1360(sp)
+// 0x0108c8a8: 0x108c8a8: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7672,37 +7672,37 @@ L_108c21c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c288: 0x108c288: addu  a0, s2, zero
+// 0x0108c8ac: 0x108c8ac: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c28c: 0x108c28c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108c8b0: 0x108c8b0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c294: 0x108c294: addiu s7, zero, 568
+// 0x0108c8b8: 0x108c8b8: addiu s7, zero, 568
 	ldc.i4 568
 	stloc 8
-L_108c298:
-// 0x0108c298: 0x108c298: mult  s1, s7
+L_108c8bc:
+// 0x0108c8bc: 0x108c8bc: mult  s1, s7
 	ldloc 11
 	ldloc 8
 	mul
 	stloc 12
-// 0x0108c29c: 0x108c29c: mflo  lo
+// 0x0108c8c0: 0x108c8c0: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x0108c2a0: 0x108c2a0: addu  s7, s0, s7
+// 0x0108c8c4: 0x108c8c4: addu  s7, s0, s7
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x0108c2a4: 0x108c2a4: lw    a0, 232(s7)
+// 0x0108c8c8: 0x108c8c8: lw    a0, 232(s7)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7711,25 +7711,25 @@ L_108c298:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108c2a8: 0x108c2a8: sll   zero, zero, 0
-// 0x0108c2ac: 0x108c2ac: blez  a0, 0x108c38c addiu s8, sp, 248
+// 0x0108c8cc: 0x108c8cc: sll   zero, zero, 0
+// 0x0108c8d0: 0x108c8d0: blez  a0, 0x108c9b0 addiu s8, sp, 248
 	ldloc.1
 	ldloc.0
 	ldc.i4 248
 	add
 	stloc 14
 	ldc.i4.s 0
-	ble L_108c38c
+	ble L_108c9b0
 // --- basic block ---
-// 0x0108c2b4: 0x108c2b4: addiu s3, sp, 112
+// 0x0108c8d8: 0x108c8d8: addiu s3, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
 	stloc 9
-// 0x0108c2b8: 0x108c2b8: addu  a2, s8, zero
+// 0x0108c8dc: 0x108c8dc: addu  a2, s8, zero
 	ldloc 14
 	stloc.3
-// 0x0108c2bc: 0x108c2bc: jal   0x108b414 addu  a1, s3, zero
+// 0x0108c8e0: 0x108c8e0: jal   0x108ba38 addu  a1, s3, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -7737,17 +7737,17 @@ L_108c298:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::prepareValueString_108b414(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::prepareValueString_108ba38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c2c4: 0x108c2c4: addiu a3, sp, 144
+// 0x0108c8e8: 0x108c8e8: addiu a3, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
 	stloc 4
-// 0x0108c2c8: 0x108c2c8: lw    a0, 236(s7)
+// 0x0108c8ec: 0x108c8ec: lw    a0, 236(s7)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7756,13 +7756,13 @@ L_108c298:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108c2cc: 0x108c2cc: addu  a2, s8, zero
+// 0x0108c8f0: 0x108c8f0: addu  a2, s8, zero
 	ldloc 14
 	stloc.3
-// 0x0108c2d0: 0x108c2d0: addu  a1, a3, zero
+// 0x0108c8f4: 0x108c8f4: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x0108c2d4: 0x108c2d4: jal   0x108b414 sw    a3, 1360(sp)
+// 0x0108c8f8: 0x108c8f8: jal   0x108ba38 sw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7776,12 +7776,12 @@ L_108c298:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::prepareValueString_108b414(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::prepareValueString_108ba38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c2dc: 0x108c2dc: lw    v0, 232(s7)
+// 0x0108c900: 0x108c900: lw    v0, 232(s7)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7790,15 +7790,15 @@ L_108c298:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c2e0: 0x108c2e0: lui   a0, 0x20000
+// 0x0108c904: 0x108c904: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c2e4: 0x108c2e4: slti  v0, v0, 1000
+// 0x0108c908: 0x108c908: slti  v0, v0, 1000
 	ldloc 5
 	ldc.i4 1000
 	clt
 	stloc 5
-// 0x0108c2e8: 0x108c2e8: lw    a3, 1360(sp)
+// 0x0108c90c: 0x108c90c: lw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7807,15 +7807,15 @@ L_108c298:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108c2ec: 0x108c2ec: beq   v0, zero, 0x108c30c lui   s8, 0x20000
+// 0x0108c910: 0x108c910: beq   v0, zero, 0x108c930 lui   s8, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 14
-	brfalse L_108c30c
+	brfalse L_108c930
 // --- basic block ---
-// 0x0108c2f4: 0x108c2f4: jal   0x101cd60 addiu a0, a0, -7048
+// 0x0108c918: 0x108c918: jal   0x101cd70 addiu a0, a0, -6584
 	ldloc.1
-	ldc.i4 -7048
+	ldc.i4 -6584
 	add
 	stloc.1
 	ldloc.0
@@ -7823,31 +7823,31 @@ L_108c298:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c2fc: 0x108c2fc: addu  s7, v0, zero
+// 0x0108c920: 0x108c920: addu  s7, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108c300: 0x108c300: lui   v0, 0x0
+// 0x0108c924: 0x108c924: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0108c304: 0x108c304: j	 0x108c324 addiu a0, v0, 29984
+// 0x0108c928: 0x108c928: j	 0x108c948 addiu a0, v0, 29984
 	ldloc 5
 	ldc.i4 29984
 	add
 	stloc.1
-	br L_108c324
+	br L_108c948
 // --- basic block ---
-L_108c30c:
-// 0x0108c30c: 0x108c30c: addiu a0, a0, -7048
+L_108c930:
+// 0x0108c930: 0x108c930: addiu a0, a0, -6584
 	ldloc.1
-	ldc.i4 -7048
+	ldc.i4 -6584
 	add
 	stloc.1
-// 0x0108c310: 0x108c310: jal   0x101cd60 sw    a3, 1360(sp)
+// 0x0108c934: 0x108c934: jal   0x101cd70 sw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7861,35 +7861,35 @@ L_108c30c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c318: 0x108c318: lui   v1, 0x0
+// 0x0108c93c: 0x108c93c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0108c31c: 0x108c31c: addu  s7, v0, zero
+// 0x0108c940: 0x108c940: addu  s7, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108c320: 0x108c320: addiu a0, v1, 29984
+// 0x0108c944: 0x108c944: addiu a0, v1, 29984
 	ldloc 6
 	ldc.i4 29984
 	add
 	stloc.1
-L_108c324:
-// 0x0108c324: 0x108c324: jal   0x101cd60 sll   zero, zero, 0
+L_108c948:
+// 0x0108c948: 0x108c948: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c32c: 0x108c32c: lw    a3, 1360(sp)
+// 0x0108c950: 0x108c950: lw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7898,20 +7898,20 @@ L_108c324:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108c330: 0x108c330: addiu a0, sp, 748
+// 0x0108c954: 0x108c954: addiu a0, sp, 748
 	ldloc.0
 	ldc.i4 748
 	add
 	stloc.1
-// 0x0108c334: 0x108c334: addiu a2, s8, -7044
+// 0x0108c958: 0x108c958: addiu a2, s8, -6580
 	ldloc 14
-	ldc.i4 -7044
+	ldc.i4 -6580
 	add
 	stloc.3
-// 0x0108c338: 0x108c338: addiu a1, zero, 200
+// 0x0108c95c: 0x108c95c: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x0108c33c: 0x108c33c: sw    s7, 16(sp)
+// 0x0108c960: 0x108c960: sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7920,7 +7920,7 @@ L_108c324:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108c340: 0x108c340: sw    v0, 20(sp)
+// 0x0108c964: 0x108c964: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7929,7 +7929,7 @@ L_108c324:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108c344: 0x108c344: jal   0x1000f9c sw    s3, 24(sp)
+// 0x0108c968: 0x108c968: jal   0x1000f9c sw    s3, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7948,23 +7948,23 @@ L_108c324:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c34c: 0x108c34c: lui   a0, 0x20000
+// 0x0108c970: 0x108c970: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c350: 0x108c350: addiu a0, a0, -7028
+// 0x0108c974: 0x108c974: addiu a0, a0, -6564
 	ldloc.1
-	ldc.i4 -7028
+	ldc.i4 -6564
 	add
 	stloc.1
-// 0x0108c354: 0x108c354: addiu a1, sp, 748
+// 0x0108c978: 0x108c978: addiu a1, sp, 748
 	ldloc.0
 	ldc.i4 748
 	add
 	stloc.2
-// 0x0108c358: 0x108c358: addiu a2, zero, 14
+// 0x0108c97c: 0x108c97c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x0108c35c: 0x108c35c: jal   0x1098d10 ori   a3, zero, 32776
+// 0x0108c980: 0x108c980: jal   0x1099358 ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
@@ -7974,26 +7974,26 @@ L_108c324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c364: 0x108c364: lui   a1, 0x0
+// 0x0108c988: 0x108c988: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c368: 0x108c368: addu  a0, v0, zero
+// 0x0108c98c: 0x108c98c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c36c: 0x108c36c: addiu a1, a1, 23008
+// 0x0108c990: 0x108c990: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0108c370: 0x108c370: addu  a2, zero, zero
+// 0x0108c994: 0x108c994: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c374: 0x108c374: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108c998: 0x108c998: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8005,9 +8005,9 @@ L_108c324:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c37c: 0x108c37c: lw    v0, 1360(sp)
+// 0x0108c9a0: 0x108c9a0: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8016,40 +8016,40 @@ L_108c324:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c380: 0x108c380: addu  a0, s2, zero
+// 0x0108c9a4: 0x108c9a4: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c384: 0x108c384: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108c9a8: 0x108c9a8: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108c38c:
-// 0x0108c38c: 0x108c38c: addu  v1, zero, zero
+L_108c9b0:
+// 0x0108c9b0: 0x108c9b0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0108c390: 0x108c390: cibyl_sysc_arg 0x3
+// 0x0108c9b4: 0x108c9b4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0108c394: 0x108c394: cibyl_sysc 0x2143
+// 0x0108c9b8: 0x108c9b8: cibyl_sysc 0x2143
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0108c398: 0x108c398: addu  a0, v0, zero
+// 0x0108c9bc: 0x108c9bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c39c: 0x108c39c: addiu s7, zero, 568
+// 0x0108c9c0: 0x108c9c0: addiu s7, zero, 568
 	ldc.i4 568
 	stloc 8
-// 0x0108c3a0: 0x108c3a0: mult  s1, s7
+// 0x0108c9c4: 0x108c9c4: mult  s1, s7
 	ldloc 11
 	ldloc 8
 	mul
 	stloc 12
-// 0x0108c3a4: 0x108c3a4: sw    a0, 1352(sp)
+// 0x0108c9c8: 0x108c9c8: sw    a0, 1352(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8058,7 +8058,7 @@ L_108c38c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0108c3a8: 0x108c3a8: lw    v0, 1352(sp)
+// 0x0108c9cc: 0x108c9cc: lw    v0, 1352(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8067,12 +8067,12 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c3ac: 0x108c3ac: addiu a0, sp, 32
+// 0x0108c9d0: 0x108c9d0: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0108c3b0: 0x108c3b0: sw    v0, 32(sp)
+// 0x0108c9d4: 0x108c9d4: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8081,20 +8081,20 @@ L_108c38c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108c3b4: 0x108c3b4: addiu s3, sp, 948
+// 0x0108c9d8: 0x108c9d8: addiu s3, sp, 948
 	ldloc.0
 	ldc.i4 948
 	add
 	stloc 9
-// 0x0108c3b8: 0x108c3b8: mflo  lo
+// 0x0108c9dc: 0x108c9dc: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x0108c3bc: 0x108c3bc: addu  v0, s0, s7
+// 0x0108c9e0: 0x108c9e0: addu  v0, s0, s7
 	ldloc 10
 	ldloc 8
 	add
 	stloc 5
-// 0x0108c3c0: 0x108c3c0: lw    v0, 240(v0)
+// 0x0108c9e4: 0x108c9e4: lw    v0, 240(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8103,7 +8103,7 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c3c4: 0x108c3c4: jal   0x10c3558 sw    v0, 1356(sp)
+// 0x0108c9e8: 0x108c9e8: jal   0x10c3b98 sw    v0, 1356(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8117,18 +8117,18 @@ L_108c38c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c3cc: 0x108c3cc: addu  a1, v0, zero
+// 0x0108c9f0: 0x108c9f0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c3d0: 0x108c3d0: addiu a2, zero, 36
+// 0x0108c9f4: 0x108c9f4: addiu a2, zero, 36
 	ldc.i4.s 36
 	stloc.3
-// 0x0108c3d4: 0x108c3d4: jal   0x1001800 addiu a0, sp, 176
+// 0x0108c9f8: 0x108c9f8: jal   0x1001800 addiu a0, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -8142,7 +8142,7 @@ L_108c38c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c3dc: 0x108c3dc: lw    t0, 196(sp)
+// 0x0108ca00: 0x108ca00: lw    t0, 196(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8151,12 +8151,12 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0108c3e0: 0x108c3e0: addiu a0, s7, 240
+// 0x0108ca04: 0x108ca04: addiu a0, s7, 240
 	ldloc 8
 	ldc.i4 240
 	add
 	stloc.1
-// 0x0108c3e4: 0x108c3e4: sw    t0, 1360(sp)
+// 0x0108ca08: 0x108ca08: sw    t0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8165,7 +8165,7 @@ L_108c38c:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0108c3e8: 0x108c3e8: lw    s8, 192(sp)
+// 0x0108ca0c: 0x108ca0c: lw    s8, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8174,7 +8174,7 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108c3ec: 0x108c3ec: jal   0x10c3558 addu  a0, s0, a0
+// 0x0108ca10: 0x108ca10: jal   0x10c3b98 addu  a0, s0, a0
 	ldloc 10
 	ldloc.1
 	add
@@ -8184,18 +8184,18 @@ L_108c38c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c3f4: 0x108c3f4: addu  a1, v0, zero
+// 0x0108ca18: 0x108ca18: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c3f8: 0x108c3f8: addiu a2, zero, 36
+// 0x0108ca1c: 0x108ca1c: addiu a2, zero, 36
 	ldc.i4.s 36
 	stloc.3
-// 0x0108c3fc: 0x108c3fc: jal   0x1001800 addiu a0, sp, 212
+// 0x0108ca20: 0x108ca20: jal   0x1001800 addiu a0, sp, 212
 	ldloc.0
 	ldc.i4 212
 	add
@@ -8209,7 +8209,7 @@ L_108c38c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c404: 0x108c404: lw    v1, 232(sp)
+// 0x0108ca28: 0x108ca28: lw    v1, 232(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8218,10 +8218,10 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108c408: 0x108c408: lui   a0, 0x20000
+// 0x0108ca2c: 0x108ca2c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c40c: 0x108c40c: sw    v1, 1364(sp)
+// 0x0108ca30: 0x108ca30: sw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8230,7 +8230,7 @@ L_108c38c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108c410: 0x108c410: lw    s7, 228(sp)
+// 0x0108ca34: 0x108ca34: lw    s7, 228(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8239,9 +8239,9 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108c414: 0x108c414: jal   0x101cd60 addiu a0, a0, -7020
+// 0x0108ca38: 0x108ca38: jal   0x101cd70 addiu a0, a0, -6556
 	ldloc.1
-	ldc.i4 -7020
+	ldc.i4 -6556
 	add
 	stloc.1
 	ldloc.0
@@ -8249,26 +8249,26 @@ L_108c38c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c41c: 0x108c41c: lui   a2, 0x20000
+// 0x0108ca40: 0x108ca40: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108c420: 0x108c420: addiu a2, a2, 20272
+// 0x0108ca44: 0x108ca44: addiu a2, a2, 20732
 	ldloc.3
-	ldc.i4 20272
+	ldc.i4 20732
 	add
 	stloc.3
-// 0x0108c424: 0x108c424: addu  a3, v0, zero
+// 0x0108ca48: 0x108ca48: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0108c428: 0x108c428: addu  a0, s3, zero
+// 0x0108ca4c: 0x108ca4c: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0108c42c: 0x108c42c: jal   0x1000f9c addiu a1, zero, 200
+// 0x0108ca50: 0x108ca50: jal   0x1000f9c addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
 	ldloc.0
@@ -8281,7 +8281,7 @@ L_108c38c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c434: 0x108c434: lw    v1, 1364(sp)
+// 0x0108ca58: 0x108ca58: lw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8290,7 +8290,7 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108c438: 0x108c438: lw    t0, 1360(sp)
+// 0x0108ca5c: 0x108ca5c: lw    t0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8299,24 +8299,24 @@ L_108c38c:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0108c43c: 0x108c43c: addiu v0, zero, 2
+// 0x0108ca60: 0x108ca60: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0108c440: 0x108c440: subu  v1, t0, v1
+// 0x0108ca64: 0x108ca64: subu  v1, t0, v1
 	ldloc 19
 	ldloc 6
 	sub
 	stloc 6
-// 0x0108c444: 0x108c444: bne   v1, v0, 0x108c464 slti  v0, v1, 3
+// 0x0108ca68: 0x108ca68: bne   v1, v0, 0x108ca88 slti  v0, v1, 3
 	ldloc 6
 	ldloc 5
 	ldloc 6
 	ldc.i4.3
 	clt
 	stloc 5
-	bne.un L_108c464
+	bne.un L_108ca88
 // --- basic block ---
-// 0x0108c44c: 0x108c44c: jal   0x1001b48 addu  a0, s3, zero
+// 0x0108ca70: 0x108ca70: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -8325,27 +8325,27 @@ L_108c38c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c454: 0x108c454: lui   a0, 0x20000
+// 0x0108ca78: 0x108ca78: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c458: 0x108c458: addu  s7, v0, zero
+// 0x0108ca7c: 0x108ca7c: addu  s7, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108c45c: 0x108c45c: j	 0x108c4d8 addiu a0, a0, -7012
+// 0x0108ca80: 0x108ca80: j	 0x108cafc addiu a0, a0, -6548
 	ldloc.1
-	ldc.i4 -7012
+	ldc.i4 -6548
 	add
 	stloc.1
-	br L_108c4d8
+	br L_108cafc
 // --- basic block ---
-L_108c464:
-// 0x0108c464: 0x108c464: bne   v0, zero, 0x108c4a0 addu  a0, s3, zero
+L_108ca88:
+// 0x0108ca88: 0x108ca88: bne   v0, zero, 0x108cac4 addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_108c4a0
+	brtrue L_108cac4
 // --- basic block ---
-// 0x0108c46c: 0x108c46c: jal   0x1001b48 sw    v1, 1364(sp)
+// 0x0108ca90: 0x108ca90: jal   0x1001b48 sw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8360,15 +8360,15 @@ L_108c464:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c474: 0x108c474: lui   a0, 0x20000
+// 0x0108ca98: 0x108ca98: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c478: 0x108c478: addiu a0, a0, -6996
+// 0x0108ca9c: 0x108ca9c: addiu a0, a0, -6532
 	ldloc.1
-	ldc.i4 -6996
+	ldc.i4 -6532
 	add
 	stloc.1
-// 0x0108c47c: 0x108c47c: jal   0x101cd60 addu  s7, v0, zero
+// 0x0108caa0: 0x108caa0: jal   0x101cd70 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -8376,12 +8376,12 @@ L_108c464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c484: 0x108c484: lw    v1, 1364(sp)
+// 0x0108caa8: 0x108caa8: lw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8390,71 +8390,71 @@ L_108c464:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108c488: 0x108c488: addiu a1, zero, 200
+// 0x0108caac: 0x108caac: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x0108c48c: 0x108c48c: subu  a1, a1, s7
+// 0x0108cab0: 0x108cab0: subu  a1, a1, s7
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x0108c490: 0x108c490: addu  a0, s3, s7
+// 0x0108cab4: 0x108cab4: addu  a0, s3, s7
 	ldloc 9
 	ldloc 8
 	add
 	stloc.1
-// 0x0108c494: 0x108c494: addu  a2, v0, zero
+// 0x0108cab8: 0x108cab8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0108c498: 0x108c498: j	 0x108c590 addiu a3, v1, -1
+// 0x0108cabc: 0x108cabc: j	 0x108cbb4 addiu a3, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 4
-	br L_108c590
+	br L_108cbb4
 // --- basic block ---
-L_108c4a0:
-// 0x0108c4a0: 0x108c4a0: beq   s8, s7, 0x108c530 slt   v0, s7, s8
+L_108cac4:
+// 0x0108cac4: 0x108cac4: beq   s8, s7, 0x108cb54 slt   v0, s7, s8
 	ldloc 14
 	ldloc 8
 	ldloc 8
 	ldloc 14
 	clt
 	stloc 5
-	beq  L_108c530
+	beq  L_108cb54
 // --- basic block ---
-// 0x0108c4a8: 0x108c4a8: bne   v0, zero, 0x108c4b8 subu  a3, s8, s7
+// 0x0108cacc: 0x108cacc: bne   v0, zero, 0x108cadc subu  a3, s8, s7
 	ldloc 5
 	ldloc 14
 	ldloc 8
 	sub
 	stloc 4
-	brtrue L_108c4b8
+	brtrue L_108cadc
 // --- basic block ---
-// 0x0108c4b0: 0x108c4b0: addiu s8, s8, 12
+// 0x0108cad4: 0x108cad4: addiu s8, s8, 12
 	ldloc 14
 	ldc.i4.s 12
 	add
 	stloc 14
-// 0x0108c4b4: 0x108c4b4: subu  a3, s8, s7
+// 0x0108cad8: 0x108cad8: subu  a3, s8, s7
 	ldloc 14
 	ldloc 8
 	sub
 	stloc 4
-L_108c4b8:
-// 0x0108c4b8: 0x108c4b8: addiu v0, zero, 1
+L_108cadc:
+// 0x0108cadc: 0x108cadc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108c4bc: 0x108c4bc: bne   a3, v0, 0x108c4fc addiu s3, sp, 948
+// 0x0108cae0: 0x108cae0: bne   a3, v0, 0x108cb20 addiu s3, sp, 948
 	ldloc 4
 	ldloc 5
 	ldloc.0
 	ldc.i4 948
 	add
 	stloc 9
-	bne.un L_108c4fc
+	bne.un L_108cb20
 // --- basic block ---
-// 0x0108c4c4: 0x108c4c4: jal   0x1001b48 addu  a0, s3, zero
+// 0x0108cae8: 0x108cae8: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -8463,60 +8463,60 @@ L_108c4b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c4cc: 0x108c4cc: lui   a0, 0x20000
+// 0x0108caf0: 0x108caf0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c4d0: 0x108c4d0: addu  s7, v0, zero
+// 0x0108caf4: 0x108caf4: addu  s7, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108c4d4: 0x108c4d4: addiu a0, a0, -6980
+// 0x0108caf8: 0x108caf8: addiu a0, a0, -6516
 	ldloc.1
-	ldc.i4 -6980
+	ldc.i4 -6516
 	add
 	stloc.1
-L_108c4d8:
-// 0x0108c4d8: 0x108c4d8: jal   0x101cd60 sll   zero, zero, 0
+L_108cafc:
+// 0x0108cafc: 0x108cafc: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c4e0: 0x108c4e0: addiu a1, zero, 200
+// 0x0108cb04: 0x108cb04: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x0108c4e4: 0x108c4e4: lui   a2, 0x10000
+// 0x0108cb08: 0x108cb08: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108c4e8: 0x108c4e8: subu  a1, a1, s7
+// 0x0108cb0c: 0x108cb0c: subu  a1, a1, s7
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x0108c4ec: 0x108c4ec: addu  a0, s3, s7
+// 0x0108cb10: 0x108cb10: addu  a0, s3, s7
 	ldloc 9
 	ldloc 8
 	add
 	stloc.1
-// 0x0108c4f0: 0x108c4f0: addiu a2, a2, 19912
+// 0x0108cb14: 0x108cb14: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0108c4f4: 0x108c4f4: j	 0x108c590 addu  a3, v0, zero
+// 0x0108cb18: 0x108cb18: j	 0x108cbb4 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-	br L_108c590
+	br L_108cbb4
 // --- basic block ---
-L_108c4fc:
-// 0x0108c4fc: 0x108c4fc: addu  a0, s3, zero
+L_108cb20:
+// 0x0108cb20: 0x108cb20: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0108c500: 0x108c500: jal   0x1001b48 sw    a3, 1360(sp)
+// 0x0108cb24: 0x108cb24: jal   0x1001b48 sw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8531,15 +8531,15 @@ L_108c4fc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c508: 0x108c508: lui   a0, 0x20000
+// 0x0108cb2c: 0x108cb2c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c50c: 0x108c50c: addiu a0, a0, -6964
+// 0x0108cb30: 0x108cb30: addiu a0, a0, -6500
 	ldloc.1
-	ldc.i4 -6964
+	ldc.i4 -6500
 	add
 	stloc.1
-// 0x0108c510: 0x108c510: jal   0x101cd60 addu  s7, v0, zero
+// 0x0108cb34: 0x108cb34: jal   0x101cd70 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -8547,25 +8547,25 @@ L_108c4fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c518: 0x108c518: addiu a1, zero, 200
+// 0x0108cb3c: 0x108cb3c: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x0108c51c: 0x108c51c: subu  a1, a1, s7
+// 0x0108cb40: 0x108cb40: subu  a1, a1, s7
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x0108c520: 0x108c520: addu  a0, s3, s7
+// 0x0108cb44: 0x108cb44: addu  a0, s3, s7
 	ldloc 9
 	ldloc 8
 	add
 	stloc.1
-// 0x0108c524: 0x108c524: lw    a3, 1360(sp)
+// 0x0108cb48: 0x108cb48: lw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8574,13 +8574,13 @@ L_108c4fc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108c528: 0x108c528: j	 0x108c590 addu  a2, v0, zero
+// 0x0108cb4c: 0x108cb4c: j	 0x108cbb4 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-	br L_108c590
+	br L_108cbb4
 // --- basic block ---
-L_108c530:
-// 0x0108c530: 0x108c530: jal   0x1001b48 addu  a0, s3, zero
+L_108cb54:
+// 0x0108cb54: 0x108cb54: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -8589,15 +8589,15 @@ L_108c530:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c538: 0x108c538: lui   a0, 0x20000
+// 0x0108cb5c: 0x108cb5c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c53c: 0x108c53c: addiu a0, a0, -6948
+// 0x0108cb60: 0x108cb60: addiu a0, a0, -6484
 	ldloc.1
-	ldc.i4 -6948
+	ldc.i4 -6484
 	add
 	stloc.1
-// 0x0108c540: 0x108c540: jal   0x101cd60 addu  s7, v0, zero
+// 0x0108cb64: 0x108cb64: jal   0x101cd70 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -8605,15 +8605,15 @@ L_108c530:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c548: 0x108c548: addu  a2, v0, zero
+// 0x0108cb6c: 0x108cb6c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0108c54c: 0x108c54c: lw    v1, 1352(sp)
+// 0x0108cb70: 0x108cb70: lw    v1, 1352(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8622,7 +8622,7 @@ L_108c530:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108c550: 0x108c550: lw    v0, 1356(sp)
+// 0x0108cb74: 0x108cb74: lw    v0, 1356(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8631,7 +8631,7 @@ L_108c530:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c554: 0x108c554: sw    a2, 1360(sp)
+// 0x0108cb78: 0x108cb78: sw    a2, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8640,41 +8640,41 @@ L_108c530:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0108c558: 0x108c558: jal   0x10c09c0 subu  a0, v1, v0
+// 0x0108cb7c: 0x108cb7c: jal   0x10c1000 subu  a0, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c560: 0x108c560: addu  a1, v1, zero
+// 0x0108cb84: 0x108cb84: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x0108c564: 0x108c564: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0108cb88: 0x108cb88: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c56c: 0x108c56c: lui   a3, 0x10000
+// 0x0108cb90: 0x108cb90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0108c570: 0x108c570: ori   a3, a3, 20864
+// 0x0108cb94: 0x108cb94: ori   a3, a3, 20864
 	ldloc 4
 	ldc.i4 20864
 	or
 	stloc 4
-// 0x0108c574: 0x108c574: div   v0, a3
+// 0x0108cb98: 0x108cb98: div   v0, a3
 	ldloc 5
 	ldloc 4
 	ldloc 5
@@ -8683,15 +8683,15 @@ L_108c530:
 	stloc 12
 	rem
 	stloc 15
-// 0x0108c578: 0x108c578: addiu s8, zero, 200
+// 0x0108cb9c: 0x108cb9c: addiu s8, zero, 200
 	ldc.i4 200
 	stloc 14
-// 0x0108c57c: 0x108c57c: subu  s8, s8, s7
+// 0x0108cba0: 0x108cba0: subu  s8, s8, s7
 	ldloc 14
 	ldloc 8
 	sub
 	stloc 14
-// 0x0108c580: 0x108c580: lw    a2, 1360(sp)
+// 0x0108cba4: 0x108cba4: lw    a2, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8700,19 +8700,19 @@ L_108c530:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108c584: 0x108c584: addu  a0, s3, s7
+// 0x0108cba8: 0x108cba8: addu  a0, s3, s7
 	ldloc 9
 	ldloc 8
 	add
 	stloc.1
-// 0x0108c588: 0x108c588: addu  a1, s8, zero
+// 0x0108cbac: 0x108cbac: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-// 0x0108c58c: 0x108c58c: mflo  lo
+// 0x0108cbb0: 0x108cbb0: mflo  lo
 	ldloc 12
 	stloc 4
-L_108c590:
-// 0x0108c590: 0x108c590: jal   0x1000f9c addu  s3, zero, zero
+L_108cbb4:
+// 0x0108cbb4: 0x108cbb4: jal   0x1000f9c addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -8725,25 +8725,25 @@ L_108c590:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c598: 0x108c598: lui   a0, 0x20000
+// 0x0108cbbc: 0x108cbbc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c59c: 0x108c59c: ori   a3, zero, 32776
+// 0x0108cbc0: 0x108cbc0: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x0108c5a0: 0x108c5a0: addiu a0, a0, -6936
+// 0x0108cbc4: 0x108cbc4: addiu a0, a0, -6472
 	ldloc.1
-	ldc.i4 -6936
+	ldc.i4 -6472
 	add
 	stloc.1
-// 0x0108c5a4: 0x108c5a4: addiu a1, sp, 948
+// 0x0108cbc8: 0x108cbc8: addiu a1, sp, 948
 	ldloc.0
 	ldc.i4 948
 	add
 	stloc.2
-// 0x0108c5a8: 0x108c5a8: jal   0x1098d10 addiu a2, zero, 14
+// 0x0108cbcc: 0x108cbcc: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -8751,26 +8751,26 @@ L_108c590:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c5b0: 0x108c5b0: lui   a1, 0x0
+// 0x0108cbd4: 0x108cbd4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c5b4: 0x108c5b4: addu  a0, v0, zero
+// 0x0108cbd8: 0x108cbd8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c5b8: 0x108c5b8: addiu a1, a1, 23008
+// 0x0108cbdc: 0x108cbdc: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0108c5bc: 0x108c5bc: addu  a2, zero, zero
+// 0x0108cbe0: 0x108cbe0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c5c0: 0x108c5c0: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108cbe4: 0x108cbe4: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8782,9 +8782,9 @@ L_108c590:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c5c8: 0x108c5c8: lw    v0, 1360(sp)
+// 0x0108cbec: 0x108cbec: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8793,50 +8793,50 @@ L_108c590:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c5cc: 0x108c5cc: addu  a0, s2, zero
+// 0x0108cbf0: 0x108cbf0: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c5d0: 0x108c5d0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108cbf4: 0x108cbf4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c5d8: 0x108c5d8: sb    zero, 448(sp)
+// 0x0108cbfc: 0x108cbfc: sb    zero, 448(sp)
 	ldloc.0
 	ldc.i4 448
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0108c5dc: 0x108c5dc: j	 0x108c630 addiu s8, zero, 568
+// 0x0108cc00: 0x108cc00: j	 0x108cc54 addiu s8, zero, 568
 	ldc.i4 568
 	stloc 14
-	br L_108c630
+	br L_108cc54
 // --- basic block ---
-L_108c5e4:
-// 0x0108c5e4: 0x108c5e4: mult  s3, s8
+L_108cc08:
+// 0x0108cc08: 0x108cc08: mult  s3, s8
 	ldloc 9
 	ldloc 14
 	mul
 	stloc 12
-// 0x0108c5e8: 0x108c5e8: addiu s3, s3, 1
+// 0x0108cc0c: 0x108cc0c: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0108c5ec: 0x108c5ec: mflo  lo
+// 0x0108cc10: 0x108cc10: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x0108c5f0: 0x108c5f0: addu  a0, s0, s7
+// 0x0108cc14: 0x108cc14: addu  a0, s0, s7
 	ldloc 10
 	ldloc 8
 	add
 	stloc.1
-// 0x0108c5f4: 0x108c5f4: jal   0x1001b14 addiu a0, a0, 68
+// 0x0108cc18: 0x108cc18: jal   0x1001b14 addiu a0, a0, 68
 	ldloc.1
 	ldc.i4.s 68
 	add
@@ -8846,15 +8846,15 @@ L_108c5e4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108c5fc: 0x108c5fc: bne   v0, zero, 0x108c630 addu  s7, s0, s7
+// 0x0108cc20: 0x108cc20: bne   v0, zero, 0x108cc54 addu  s7, s0, s7
 	ldloc 5
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-	brtrue L_108c630
+	brtrue L_108cc54
 // --- basic block ---
-// 0x0108c604: 0x108c604: lw    a0, 144(s7)
+// 0x0108cc28: 0x108cc28: lw    a0, 144(s7)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -8863,7 +8863,7 @@ L_108c5e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108c608: 0x108c608: lw    a1, 148(s7)
+// 0x0108cc2c: 0x108cc2c: lw    a1, 148(s7)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -8872,16 +8872,16 @@ L_108c5e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108c60c: 0x108c60c: jal   0x10c08d0 sll   zero, zero, 0
+// 0x0108cc30: 0x108cc30: jal   0x10c0f10 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c614: 0x108c614: jal   0x1007e4c addu  a0, v0, zero
+// 0x0108cc38: 0x108cc38: jal   0x1007e5c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -8889,31 +8889,31 @@ L_108c5e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c61c: 0x108c61c: slti  v1, v0, 10
+// 0x0108cc40: 0x108cc40: slti  v1, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt
 	stloc 6
-// 0x0108c620: 0x108c620: beq   v1, zero, 0x108c668 slti  v0, v0, 40
+// 0x0108cc44: 0x108cc44: beq   v1, zero, 0x108cc8c slti  v0, v0, 40
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 40
 	clt
 	stloc 5
-	brfalse L_108c668
+	brfalse L_108cc8c
 // --- basic block ---
-// 0x0108c628: 0x108c628: j	 0x108c64c lui   a0, 0x20000
+// 0x0108cc4c: 0x108cc4c: j	 0x108cc70 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_108c64c
+	br L_108cc70
 // --- basic block ---
-L_108c630:
-// 0x0108c630: 0x108c630: lw    v0, 28400(s0)
+L_108cc54:
+// 0x0108cc54: 0x108cc54: lw    v0, 28400(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8922,27 +8922,27 @@ L_108c630:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c634: 0x108c634: sll   zero, zero, 0
-// 0x0108c638: 0x108c638: slt   v0, s3, v0
+// 0x0108cc58: 0x108cc58: sll   zero, zero, 0
+// 0x0108cc5c: 0x108cc5c: slt   v0, s3, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108c63c: 0x108c63c: bne   v0, zero, 0x108c5e4 addu  a1, s6, zero
+// 0x0108cc60: 0x108cc60: bne   v0, zero, 0x108cc08 addu  a1, s6, zero
 	ldloc 5
 	ldloc 18
 	stloc.2
-	brtrue L_108c5e4
+	brtrue L_108cc08
 // --- basic block ---
-// 0x0108c644: 0x108c644: j	 0x108c6e8 lui   a0, 0x20000
+// 0x0108cc68: 0x108cc68: j	 0x108cd0c lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_108c6e8
+	br L_108cd0c
 // --- basic block ---
-L_108c64c:
-// 0x0108c64c: 0x108c64c: jal   0x101cd60 addiu a0, a0, -6928
+L_108cc70:
+// 0x0108cc70: 0x108cc70: jal   0x101cd70 addiu a0, a0, -6464
 	ldloc.1
-	ldc.i4 -6928
+	ldc.i4 -6464
 	add
 	stloc.1
 	ldloc.0
@@ -8950,85 +8950,85 @@ L_108c64c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c654: 0x108c654: lui   a2, 0x10000
+// 0x0108cc78: 0x108cc78: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108c658: 0x108c658: addiu a2, a2, 19912
+// 0x0108cc7c: 0x108cc7c: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0108c65c: 0x108c65c: addu  a3, v0, zero
+// 0x0108cc80: 0x108cc80: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0108c660: 0x108c660: j	 0x108c69c addiu a0, sp, 548
+// 0x0108cc84: 0x108cc84: j	 0x108ccc0 addiu a0, sp, 548
 	ldloc.0
 	ldc.i4 548
 	add
 	stloc.1
-	br L_108c69c
+	br L_108ccc0
 // --- basic block ---
-L_108c668:
-// 0x0108c668: 0x108c668: lui   s3, 0x10000
+L_108cc8c:
+// 0x0108cc8c: 0x108cc8c: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0108c66c: 0x108c66c: beq   v0, zero, 0x108c680 addiu s7, sp, 548
+// 0x0108cc90: 0x108cc90: beq   v0, zero, 0x108cca4 addiu s7, sp, 548
 	ldloc 5
 	ldloc.0
 	ldc.i4 548
 	add
 	stloc 8
-	brfalse L_108c680
+	brfalse L_108cca4
 // --- basic block ---
-// 0x0108c674: 0x108c674: lui   a0, 0x20000
+// 0x0108cc98: 0x108cc98: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c678: 0x108c678: j	 0x108c688 addiu a0, a0, -6912
+// 0x0108cc9c: 0x108cc9c: j	 0x108ccac addiu a0, a0, -6448
 	ldloc.1
-	ldc.i4 -6912
+	ldc.i4 -6448
 	add
 	stloc.1
-	br L_108c688
+	br L_108ccac
 // --- basic block ---
-L_108c680:
-// 0x0108c680: 0x108c680: lui   a0, 0x20000
+L_108cca4:
+// 0x0108cca4: 0x108cca4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c684: 0x108c684: addiu a0, a0, -6900
+// 0x0108cca8: 0x108cca8: addiu a0, a0, -6436
 	ldloc.1
-	ldc.i4 -6900
+	ldc.i4 -6436
 	add
 	stloc.1
-L_108c688:
-// 0x0108c688: 0x108c688: jal   0x101cd60 sll   zero, zero, 0
+L_108ccac:
+// 0x0108ccac: 0x108ccac: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c690: 0x108c690: addu  a3, v0, zero
+// 0x0108ccb4: 0x108ccb4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0108c694: 0x108c694: addu  a0, s7, zero
+// 0x0108ccb8: 0x108ccb8: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x0108c698: 0x108c698: addiu a2, s3, 19912
+// 0x0108ccbc: 0x108ccbc: addiu a2, s3, 20332
 	ldloc 9
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-L_108c69c:
-// 0x0108c69c: 0x108c69c: jal   0x1000f9c addiu a1, zero, 100
+L_108ccc0:
+// 0x0108ccc0: 0x108ccc0: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -9041,12 +9041,12 @@ L_108c69c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c6a4: 0x108c6a4: lui   a0, 0x10000
+// 0x0108ccc8: 0x108ccc8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108c6a8: 0x108c6a8: jal   0x101cd60 addiu a0, a0, -14896
+// 0x0108cccc: 0x108cccc: jal   0x101cd70 addiu a0, a0, -14900
 	ldloc.1
-	ldc.i4 -14896
+	ldc.i4 -14900
 	add
 	stloc.1
 	ldloc.0
@@ -9054,12 +9054,12 @@ L_108c69c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c6b0: 0x108c6b0: jal   0x1007d9c sw    v0, 1360(sp)
+// 0x0108ccd4: 0x108ccd4: jal   0x1007dac sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9068,10 +9068,10 @@ L_108c69c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_speed_unit_1007d9c()
+	call int32 Cibyl5::roadmap_math_speed_unit_1007dac()
 	stloc 5
 // --- basic block ---
-// 0x0108c6b8: 0x108c6b8: jal   0x101cd60 addu  a0, v0, zero
+// 0x0108ccdc: 0x108ccdc: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -9079,15 +9079,15 @@ L_108c69c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c6c0: 0x108c6c0: lui   a2, 0x20000
+// 0x0108cce4: 0x108cce4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108c6c4: 0x108c6c4: lw    a3, 1360(sp)
+// 0x0108cce8: 0x108cce8: lw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9096,25 +9096,25 @@ L_108c69c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108c6c8: 0x108c6c8: addiu v1, sp, 548
+// 0x0108ccec: 0x108ccec: addiu v1, sp, 548
 	ldloc.0
 	ldc.i4 548
 	add
 	stloc 6
-// 0x0108c6cc: 0x108c6cc: addiu a2, a2, -6892
+// 0x0108ccf0: 0x108ccf0: addiu a2, a2, -6428
 	ldloc.3
-	ldc.i4 -6892
+	ldc.i4 -6428
 	add
 	stloc.3
-// 0x0108c6d0: 0x108c6d0: addiu a0, sp, 448
+// 0x0108ccf4: 0x108ccf4: addiu a0, sp, 448
 	ldloc.0
 	ldc.i4 448
 	add
 	stloc.1
-// 0x0108c6d4: 0x108c6d4: addiu a1, zero, 100
+// 0x0108ccf8: 0x108ccf8: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0108c6d8: 0x108c6d8: sw    v1, 16(sp)
+// 0x0108ccfc: 0x108ccfc: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9123,7 +9123,7 @@ L_108c69c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108c6dc: 0x108c6dc: jal   0x1000f9c sw    v0, 20(sp)
+// 0x0108cd00: 0x108cd00: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9142,26 +9142,26 @@ L_108c69c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c6e4: 0x108c6e4: lui   a0, 0x20000
+// 0x0108cd08: 0x108cd08: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_108c6e8:
-// 0x0108c6e8: 0x108c6e8: ori   a3, zero, 32776
+L_108cd0c:
+// 0x0108cd0c: 0x108cd0c: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x0108c6ec: 0x108c6ec: addiu a0, a0, -6880
+// 0x0108cd10: 0x108cd10: addiu a0, a0, -6416
 	ldloc.1
-	ldc.i4 -6880
+	ldc.i4 -6416
 	add
 	stloc.1
-// 0x0108c6f0: 0x108c6f0: addiu a1, sp, 448
+// 0x0108cd14: 0x108cd14: addiu a1, sp, 448
 	ldloc.0
 	ldc.i4 448
 	add
 	stloc.2
-// 0x0108c6f4: 0x108c6f4: jal   0x1098d10 addiu a2, zero, 14
+// 0x0108cd18: 0x108cd18: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -9169,26 +9169,26 @@ L_108c6e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c6fc: 0x108c6fc: lui   a1, 0x0
+// 0x0108cd20: 0x108cd20: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c700: 0x108c700: addu  a0, v0, zero
+// 0x0108cd24: 0x108cd24: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c704: 0x108c704: addiu a1, a1, 23008
+// 0x0108cd28: 0x108cd28: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0108c708: 0x108c708: addu  a2, zero, zero
+// 0x0108cd2c: 0x108cd2c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c70c: 0x108c70c: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108cd30: 0x108cd30: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9200,9 +9200,9 @@ L_108c6e8:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c714: 0x108c714: lw    v0, 1360(sp)
+// 0x0108cd38: 0x108cd38: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9211,39 +9211,39 @@ L_108c6e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c718: 0x108c718: addu  a0, s2, zero
+// 0x0108cd3c: 0x108cd3c: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c71c: 0x108c71c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108cd40: 0x108cd40: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c724: 0x108c724: addiu v0, zero, 568
+// 0x0108cd48: 0x108cd48: addiu v0, zero, 568
 	ldc.i4 568
 	stloc 5
-// 0x0108c728: 0x108c728: mult  s1, v0
+// 0x0108cd4c: 0x108cd4c: mult  s1, v0
 	ldloc 11
 	ldloc 5
 	mul
 	stloc 12
-// 0x0108c72c: 0x108c72c: addiu v1, zero, 1
+// 0x0108cd50: 0x108cd50: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108c730: 0x108c730: mflo  lo
+// 0x0108cd54: 0x108cd54: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x0108c734: 0x108c734: addu  v0, s0, v0
+// 0x0108cd58: 0x108cd58: addu  v0, s0, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x0108c738: 0x108c738: lw    v0, 248(v0)
+// 0x0108cd5c: 0x108cd5c: lw    v0, 248(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -9252,17 +9252,17 @@ L_108c6e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c73c: 0x108c73c: sll   zero, zero, 0
-// 0x0108c740: 0x108c740: bne   v0, v1, 0x108c75c lui   a0, 0x20000
+// 0x0108cd60: 0x108cd60: sll   zero, zero, 0
+// 0x0108cd64: 0x108cd64: bne   v0, v1, 0x108cd80 lui   a0, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc.1
-	bne.un L_108c75c
+	bne.un L_108cd80
 // --- basic block ---
-// 0x0108c748: 0x108c748: jal   0x101cd60 addiu a0, a0, -6872
+// 0x0108cd6c: 0x108cd6c: jal   0x101cd70 addiu a0, a0, -6408
 	ldloc.1
-	ldc.i4 -6872
+	ldc.i4 -6408
 	add
 	stloc.1
 	ldloc.0
@@ -9270,69 +9270,69 @@ L_108c6e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c750: 0x108c750: addu  a1, v0, zero
+// 0x0108cd74: 0x108cd74: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c754: 0x108c754: j	 0x108c788 addiu a0, sp, 1148
+// 0x0108cd78: 0x108cd78: j	 0x108cdac addiu a0, sp, 1148
 	ldloc.0
 	ldc.i4 1148
 	add
 	stloc.1
-	br L_108c788
+	br L_108cdac
 // --- basic block ---
-L_108c75c:
-// 0x0108c75c: 0x108c75c: bne   v0, zero, 0x108c770 addiu s3, sp, 1148
+L_108cd80:
+// 0x0108cd80: 0x108cd80: bne   v0, zero, 0x108cd94 addiu s3, sp, 1148
 	ldloc 5
 	ldloc.0
 	ldc.i4 1148
 	add
 	stloc 9
-	brtrue L_108c770
+	brtrue L_108cd94
 // --- basic block ---
-// 0x0108c764: 0x108c764: lui   a0, 0x20000
+// 0x0108cd88: 0x108cd88: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c768: 0x108c768: j	 0x108c778 addiu a0, a0, -6840
+// 0x0108cd8c: 0x108cd8c: j	 0x108cd9c addiu a0, a0, -6376
 	ldloc.1
-	ldc.i4 -6840
+	ldc.i4 -6376
 	add
 	stloc.1
-	br L_108c778
+	br L_108cd9c
 // --- basic block ---
-L_108c770:
-// 0x0108c770: 0x108c770: lui   a0, 0x20000
+L_108cd94:
+// 0x0108cd94: 0x108cd94: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c774: 0x108c774: addiu a0, a0, -6796
+// 0x0108cd98: 0x108cd98: addiu a0, a0, -6332
 	ldloc.1
-	ldc.i4 -6796
+	ldc.i4 -6332
 	add
 	stloc.1
-L_108c778:
-// 0x0108c778: 0x108c778: jal   0x101cd60 sll   zero, zero, 0
+L_108cd9c:
+// 0x0108cd9c: 0x108cd9c: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c780: 0x108c780: addu  a1, v0, zero
+// 0x0108cda4: 0x108cda4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c784: 0x108c784: addu  a0, s3, zero
+// 0x0108cda8: 0x108cda8: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-L_108c788:
-// 0x0108c788: 0x108c788: jal   0x1001af8 addiu a2, zero, 200
+L_108cdac:
+// 0x0108cdac: 0x108cdac: jal   0x1001af8 addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
 	ldloc.1
@@ -9341,16 +9341,16 @@ L_108c788:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108c790: 0x108c790: addu  a0, s2, zero
+// 0x0108cdb4: 0x108cdb4: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c794: 0x108c794: addiu a1, zero, 1
+// 0x0108cdb8: 0x108cdb8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108c798: 0x108c798: addiu a2, zero, 8
+// 0x0108cdbc: 0x108cdbc: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x0108c79c: 0x108c79c: jal   0x109434c sb    zero, 1347(sp)
+// 0x0108cdc0: 0x108cdc0: jal   0x1094970 sb    zero, 1347(sp)
 	ldloc.0
 	ldc.i4 1347
 	add
@@ -9361,28 +9361,28 @@ L_108c788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c7a4: 0x108c7a4: lui   a0, 0x20000
+// 0x0108cdc8: 0x108cdc8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c7a8: 0x108c7a8: addiu a3, zero, 8
+// 0x0108cdcc: 0x108cdcc: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0108c7ac: 0x108c7ac: addiu a0, a0, -6756
+// 0x0108cdd0: 0x108cdd0: addiu a0, a0, -6292
 	ldloc.1
-	ldc.i4 -6756
+	ldc.i4 -6292
 	add
 	stloc.1
-// 0x0108c7b0: 0x108c7b0: addiu a1, sp, 1148
+// 0x0108cdd4: 0x108cdd4: addiu a1, sp, 1148
 	ldloc.0
 	ldc.i4 1148
 	add
 	stloc.2
-// 0x0108c7b4: 0x108c7b4: jal   0x1098d10 addiu a2, zero, 12
+// 0x0108cdd8: 0x108cdd8: jal   0x1099358 addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
 	ldloc.0
@@ -9390,26 +9390,26 @@ L_108c788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c7bc: 0x108c7bc: lui   a1, 0x0
+// 0x0108cde0: 0x108cde0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c7c0: 0x108c7c0: addu  a0, v0, zero
+// 0x0108cde4: 0x108cde4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c7c4: 0x108c7c4: addu  a2, zero, zero
+// 0x0108cde8: 0x108cde8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c7c8: 0x108c7c8: addiu a1, a1, 23000
+// 0x0108cdec: 0x108cdec: addiu a1, a1, 23000
 	ldloc.2
 	ldc.i4 23000
 	add
 	stloc.2
-// 0x0108c7cc: 0x108c7cc: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108cdf0: 0x108cdf0: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9421,9 +9421,9 @@ L_108c788:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c7d4: 0x108c7d4: lw    v0, 1360(sp)
+// 0x0108cdf8: 0x108cdf8: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9432,26 +9432,26 @@ L_108c788:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c7d8: 0x108c7d8: addu  a0, s2, zero
+// 0x0108cdfc: 0x108cdfc: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0108c7dc: 0x108c7dc: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108ce00: 0x108ce00: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c7e4: 0x108c7e4: addiu v0, zero, -1
+// 0x0108ce08: 0x108ce08: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108c7e8: 0x108c7e8: lui   s3, 0x10000
+// 0x0108ce0c: 0x108ce0c: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0108c7ec: 0x108c7ec: sw    v0, 16(sp)
+// 0x0108ce10: 0x108ce10: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9460,31 +9460,31 @@ L_108c788:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108c7f0: 0x108c7f0: lui   a0, 0x20000
+// 0x0108ce14: 0x108ce14: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c7f4: 0x108c7f4: addiu v0, sp, 40
+// 0x0108ce18: 0x108ce18: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x0108c7f8: 0x108c7f8: addiu a3, zero, -2
+// 0x0108ce1c: 0x108ce1c: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x0108c7fc: 0x108c7fc: addiu a1, s3, 18500
+// 0x0108ce20: 0x108ce20: addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108c800: 0x108c800: addiu a0, a0, -7240
+// 0x0108ce24: 0x108ce24: addiu a0, a0, -6776
 	ldloc.1
-	ldc.i4 -7240
+	ldc.i4 -6776
 	add
 	stloc.1
-// 0x0108c804: 0x108c804: addu  a2, zero, zero
+// 0x0108ce28: 0x108ce28: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c808: 0x108c808: sw    v0, 20(sp)
+// 0x0108ce2c: 0x108ce2c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9493,10 +9493,10 @@ L_108c788:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108c80c: 0x108c80c: lui   v0, 0x10800000
+// 0x0108ce30: 0x108ce30: lui   v0, 0x10800000
 	ldc.i4 276824064
 	stloc 5
-// 0x0108c810: 0x108c810: jal   0x109e4f0 sw    v0, 24(sp)
+// 0x0108ce34: 0x108ce34: jal   0x109eb38 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9510,29 +9510,29 @@ L_108c788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c818: 0x108c818: addu  a0, v0, zero
+// 0x0108ce3c: 0x108ce3c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c81c: 0x108c81c: lui   v1, 0x80000
+// 0x0108ce40: 0x108ce40: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108c820: 0x108c820: addiu a1, zero, 2
+// 0x0108ce44: 0x108ce44: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0108c824: 0x108c824: addu  a2, zero, zero
+// 0x0108ce48: 0x108ce48: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c828: 0x108c828: jal   0x10942e8 sw    v0, -2124(v1)
+// 0x0108ce4c: 0x108ce4c: jal   0x109490c sw    v0, -1660(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -531
+	ldc.i4 -415
 	add
 	ldloc 5
 	stelem.i4
@@ -9541,34 +9541,34 @@ L_108c788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c830: 0x108c830: lui   a0, 0x10000
+// 0x0108ce54: 0x108ce54: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108c834: 0x108c834: addiu a1, s3, 18500
+// 0x0108ce58: 0x108ce58: addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108c838: 0x108c838: addiu a0, a0, 9040
+// 0x0108ce5c: 0x108ce5c: addiu a0, a0, 9036
 	ldloc.1
-	ldc.i4 9040
+	ldc.i4 9036
 	add
 	stloc.1
-// 0x0108c83c: 0x108c83c: addu  a2, s5, zero
+// 0x0108ce60: 0x108ce60: addu  a2, s5, zero
 	ldloc 17
 	stloc.3
-// 0x0108c840: 0x108c840: addiu a3, zero, -1
+// 0x0108ce64: 0x108ce64: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0108c844: 0x108c844: addiu v0, zero, 2
+// 0x0108ce68: 0x108ce68: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0108c848: 0x108c848: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0108ce6c: 0x108ce6c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9582,45 +9582,45 @@ L_108c788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c850: 0x108c850: addu  a0, v0, zero
+// 0x0108ce74: 0x108ce74: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c854: 0x108c854: addu  a1, zero, zero
+// 0x0108ce78: 0x108ce78: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c858: 0x108c858: addu  a2, zero, zero
+// 0x0108ce7c: 0x108ce7c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c85c: 0x108c85c: jal   0x1098fe0 addu  s3, v0, zero
+// 0x0108ce80: 0x108ce80: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c864: 0x108c864: addiu v0, zero, 568
+// 0x0108ce88: 0x108ce88: addiu v0, zero, 568
 	ldc.i4 568
 	stloc 5
-// 0x0108c868: 0x108c868: mult  s1, v0
+// 0x0108ce8c: 0x108ce8c: mult  s1, v0
 	ldloc 11
 	ldloc 5
 	mul
 	stloc 12
-// 0x0108c86c: 0x108c86c: mflo  lo
+// 0x0108ce90: 0x108ce90: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x0108c870: 0x108c870: addu  v0, s0, v0
+// 0x0108ce94: 0x108ce94: addu  v0, s0, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x0108c874: 0x108c874: lw    v0, 356(v0)
+// 0x0108ce98: 0x108ce98: lw    v0, 356(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -9629,57 +9629,57 @@ L_108c788:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c878: 0x108c878: sll   zero, zero, 0
-// 0x0108c87c: 0x108c87c: beq   v0, zero, 0x108c9ac addiu v0, zero, -513
+// 0x0108ce9c: 0x108ce9c: sll   zero, zero, 0
+// 0x0108cea0: 0x108cea0: beq   v0, zero, 0x108cfd0 addiu v0, zero, -513
 	ldloc 5
 	ldc.i4 -513
 	stloc 5
-	brfalse L_108c9ac
+	brfalse L_108cfd0
 // --- basic block ---
-// 0x0108c884: 0x108c884: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0108cea8: 0x108cea8: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0108c88c: 0x108c88c: beq   v0, zero, 0x108c8a0 sll   zero, zero, 0
+// 0x0108ceb0: 0x108ceb0: beq   v0, zero, 0x108cec4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108c8a0
+	brfalse L_108cec4
 // --- basic block ---
-// 0x0108c894: 0x108c894: addiu a3, zero, 77
+// 0x0108ceb8: 0x108ceb8: addiu a3, zero, 77
 	ldc.i4.s 77
 	stloc 4
-// 0x0108c898: 0x108c898: j	 0x108c8a8 addiu a2, zero, 77
+// 0x0108cebc: 0x108cebc: j	 0x108cecc addiu a2, zero, 77
 	ldc.i4.s 77
 	stloc.3
-	br L_108c8a8
+	br L_108cecc
 // --- basic block ---
-L_108c8a0:
-// 0x0108c8a0: 0x108c8a0: addiu a3, zero, 52
+L_108cec4:
+// 0x0108cec4: 0x108cec4: addiu a3, zero, 52
 	ldc.i4.s 52
 	stloc 4
-// 0x0108c8a4: 0x108c8a4: addiu a2, zero, 52
+// 0x0108cec8: 0x108cec8: addiu a2, zero, 52
 	ldc.i4.s 52
 	stloc.3
-L_108c8a8:
-// 0x0108c8a8: 0x108c8a8: lui   v1, 0x10000
+L_108cecc:
+// 0x0108cecc: 0x108cecc: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0108c8ac: 0x108c8ac: lui   a0, 0x20000
+// 0x0108ced0: 0x108ced0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c8b0: 0x108c8b0: addiu a1, v1, 18500
+// 0x0108ced4: 0x108ced4: addiu a1, v1, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108c8b4: 0x108c8b4: addiu a0, a0, -25252
+// 0x0108ced8: 0x108ced8: addiu a0, a0, -24788
 	ldloc.1
-	ldc.i4 -25252
+	ldc.i4 -24788
 	add
 	stloc.1
-// 0x0108c8b8: 0x108c8b8: addiu v0, zero, 1
+// 0x0108cedc: 0x108cedc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108c8bc: 0x108c8bc: sw    v1, 1364(sp)
+// 0x0108cee0: 0x108cee0: sw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9688,7 +9688,7 @@ L_108c8a8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108c8c0: 0x108c8c0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0108cee4: 0x108cee4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9702,50 +9702,50 @@ L_108c8a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c8c8: 0x108c8c8: lui   a1, 0x0
+// 0x0108ceec: 0x108ceec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c8cc: 0x108c8cc: addiu a1, a1, 23008
+// 0x0108cef0: 0x108cef0: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0108c8d0: 0x108c8d0: addu  a0, v0, zero
+// 0x0108cef4: 0x108cef4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c8d4: 0x108c8d4: addu  a2, a1, zero
+// 0x0108cef8: 0x108cef8: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0108c8d8: 0x108c8d8: jal   0x1098fe0 addu  s7, v0, zero
+// 0x0108cefc: 0x108cefc: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c8e0: 0x108c8e0: lui   a0, 0x20000
+// 0x0108cf04: 0x108cf04: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108c8e4: 0x108c8e4: lui   a1, 0x20000
+// 0x0108cf08: 0x108cf08: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108c8e8: 0x108c8e8: addiu a2, zero, 17
+// 0x0108cf0c: 0x108cf0c: addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
-// 0x0108c8ec: 0x108c8ec: addiu a0, a0, -25268
+// 0x0108cf10: 0x108cf10: addiu a0, a0, -24804
 	ldloc.1
-	ldc.i4 -25268
+	ldc.i4 -24804
 	add
 	stloc.1
-// 0x0108c8f0: 0x108c8f0: jal   0x109e13c addiu a1, a1, -25232
+// 0x0108cf14: 0x108cf14: jal   0x109e784 addiu a1, a1, -24768
 	ldloc.2
-	ldc.i4 -25232
+	ldc.i4 -24768
 	add
 	stloc.2
 	ldloc.0
@@ -9753,34 +9753,34 @@ L_108c8a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c8f8: 0x108c8f8: addu  a1, v0, zero
+// 0x0108cf1c: 0x108cf1c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108c8fc: 0x108c8fc: addu  a0, s7, zero
+// 0x0108cf20: 0x108cf20: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x0108c900: 0x108c900: jal   0x1098ec4 addu  s8, v0, zero
+// 0x0108cf24: 0x108cf24: jal   0x109950c addu  s8, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c908: 0x108c908: addu  a0, s4, zero
+// 0x0108cf2c: 0x108cf2c: addu  a0, s4, zero
 	ldloc 16
 	stloc.1
-// 0x0108c90c: 0x108c90c: addiu a1, zero, -20
+// 0x0108cf30: 0x108cf30: addiu a1, zero, -20
 	ldc.i4.s -20
 	stloc.2
-// 0x0108c910: 0x108c910: jal   0x1098f84 addiu a2, zero, 12
+// 0x0108cf34: 0x108cf34: jal   0x10995cc addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
 	ldloc.0
@@ -9788,12 +9788,12 @@ L_108c8a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c918: 0x108c918: lw    v1, 1364(sp)
+// 0x0108cf3c: 0x108cf3c: lw    v1, 1364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9802,26 +9802,26 @@ L_108c8a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108c91c: 0x108c91c: lui   a0, 0x10000
+// 0x0108cf40: 0x108cf40: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108c920: 0x108c920: addiu a1, v1, 18500
+// 0x0108cf44: 0x108cf44: addiu a1, v1, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108c924: 0x108c924: addiu a3, zero, 7
+// 0x0108cf48: 0x108cf48: addiu a3, zero, 7
 	ldc.i4.7
 	stloc 4
-// 0x0108c928: 0x108c928: addu  a2, s5, zero
+// 0x0108cf4c: 0x108cf4c: addu  a2, s5, zero
 	ldloc 17
 	stloc.3
-// 0x0108c92c: 0x108c92c: addiu a0, a0, 1764
+// 0x0108cf50: 0x108cf50: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x0108c930: 0x108c930: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0108cf54: 0x108cf54: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9835,21 +9835,21 @@ L_108c8a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c938: 0x108c938: addu  a0, v0, zero
+// 0x0108cf5c: 0x108cf5c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108c93c: 0x108c93c: addu  a2, zero, zero
+// 0x0108cf60: 0x108cf60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108c940: 0x108c940: addu  a1, zero, zero
+// 0x0108cf64: 0x108cf64: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108c944: 0x108c944: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108cf68: 0x108cf68: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9861,22 +9861,22 @@ L_108c8a8:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108c94c: 0x108c94c: addu  a0, s3, zero
+// 0x0108cf70: 0x108cf70: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0108c950: 0x108c950: jal   0x1098ec4 addu  a1, s7, zero
+// 0x0108cf74: 0x108cf74: jal   0x109950c addu  a1, s7, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c958: 0x108c958: lw    v0, 1360(sp)
+// 0x0108cf7c: 0x108cf7c: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9885,44 +9885,44 @@ L_108c8a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108c95c: 0x108c95c: addu  a0, s3, zero
+// 0x0108cf80: 0x108cf80: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0108c960: 0x108c960: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108cf84: 0x108cf84: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c968: 0x108c968: addu  a0, s7, zero
+// 0x0108cf8c: 0x108cf8c: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x0108c96c: 0x108c96c: jal   0x1098ec4 addu  a1, s4, zero
+// 0x0108cf90: 0x108cf90: jal   0x109950c addu  a1, s4, zero
 	ldloc 16
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c974: 0x108c974: addiu v0, zero, 568
+// 0x0108cf98: 0x108cf98: addiu v0, zero, 568
 	ldc.i4 568
 	stloc 5
-// 0x0108c978: 0x108c978: mult  s1, v0
+// 0x0108cf9c: 0x108cf9c: mult  s1, v0
 	ldloc 11
 	ldloc 5
 	mul
 	stloc 12
-// 0x0108c97c: 0x108c97c: addiu v0, zero, -1
+// 0x0108cfa0: 0x108cfa0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108c980: 0x108c980: sw    v0, 16(sp)
+// 0x0108cfa4: 0x108cfa4: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9931,7 +9931,7 @@ L_108c8a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108c984: 0x108c984: sw    s8, 20(sp)
+// 0x0108cfa8: 0x108cfa8: sw    s8, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9940,28 +9940,28 @@ L_108c8a8:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108c988: 0x108c988: addiu a0, zero, 1
+// 0x0108cfac: 0x108cfac: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108c98c: 0x108c98c: addiu a1, zero, 1
+// 0x0108cfb0: 0x108cfb0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108c990: 0x108c990: mflo  lo
+// 0x0108cfb4: 0x108cfb4: mflo  lo
 	ldloc 12
 	stloc 11
-// 0x0108c994: 0x108c994: addu  s1, s0, s1
+// 0x0108cfb8: 0x108cfb8: addu  s1, s0, s1
 	ldloc 10
 	ldloc 11
 	add
 	stloc 11
-// 0x0108c998: 0x108c998: lw    a2, 0(s1)
+// 0x0108cfbc: 0x108cfbc: lw    a2, 0(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0108c99c: 0x108c99c: jal   0x104b534 addiu a3, zero, -1
+// 0x0108cfc0: 0x108cfc0: jal   0x104b544 addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
 	ldloc.0
@@ -9969,21 +9969,21 @@ L_108c8a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b534(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b544(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c9a4: 0x108c9a4: j	 0x108c9d0 sb    zero, 448(sp)
+// 0x0108cfc8: 0x108cfc8: j	 0x108cff4 sb    zero, 448(sp)
 	ldloc.0
 	ldc.i4 448
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_108c9d0
+	br L_108cff4
 // --- basic block ---
-L_108c9ac:
-// 0x0108c9ac: 0x108c9ac: lw    v1, 48(s4)
+L_108cfd0:
+// 0x0108cfd0: 0x108cfd0: lw    v1, 48(s4)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -9992,18 +9992,18 @@ L_108c9ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108c9b0: 0x108c9b0: sll   zero, zero, 0
-// 0x0108c9b4: 0x108c9b4: and   v0, v1, v0
+// 0x0108cfd4: 0x108cfd4: sll   zero, zero, 0
+// 0x0108cfd8: 0x108cfd8: and   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	and
 	stloc 5
-// 0x0108c9b8: 0x108c9b8: ori   v0, v0, 1
+// 0x0108cfdc: 0x108cfdc: ori   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 5
-// 0x0108c9bc: 0x108c9bc: sw    v0, 48(s4)
+// 0x0108cfe0: 0x108cfe0: sw    v0, 48(s4)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -10012,54 +10012,54 @@ L_108c9ac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108c9c0: 0x108c9c0: addu  a1, s4, zero
+// 0x0108cfe4: 0x108cfe4: addu  a1, s4, zero
 	ldloc 16
 	stloc.2
-// 0x0108c9c4: 0x108c9c4: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0108cfe8: 0x108cfe8: jal   0x109950c addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108c9cc: 0x108c9cc: sb    zero, 448(sp)
+// 0x0108cff0: 0x108cff0: sb    zero, 448(sp)
 	ldloc.0
 	ldc.i4 448
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_108c9d0:
-// 0x0108c9d0: 0x108c9d0: addu  s1, zero, zero
+L_108cff4:
+// 0x0108cff4: 0x108cff4: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x0108c9d4: 0x108c9d4: j	 0x108ca30 addiu s5, zero, 568
+// 0x0108cff8: 0x108cff8: j	 0x108d054 addiu s5, zero, 568
 	ldc.i4 568
 	stloc 17
-	br L_108ca30
+	br L_108d054
 // --- basic block ---
-L_108c9dc:
-// 0x0108c9dc: 0x108c9dc: mult  s1, s5
+L_108d000:
+// 0x0108d000: 0x108d000: mult  s1, s5
 	ldloc 11
 	ldloc 17
 	mul
 	stloc 12
-// 0x0108c9e0: 0x108c9e0: addiu s1, s1, 1
+// 0x0108d004: 0x108d004: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x0108c9e4: 0x108c9e4: mflo  lo
+// 0x0108d008: 0x108d008: mflo  lo
 	ldloc 12
 	stloc 16
-// 0x0108c9e8: 0x108c9e8: addu  a0, s0, s4
+// 0x0108d00c: 0x108d00c: addu  a0, s0, s4
 	ldloc 10
 	ldloc 16
 	add
 	stloc.1
-// 0x0108c9ec: 0x108c9ec: jal   0x1001b14 addiu a0, a0, 68
+// 0x0108d010: 0x108d010: jal   0x1001b14 addiu a0, a0, 68
 	ldloc.1
 	ldc.i4.s 68
 	add
@@ -10069,20 +10069,20 @@ L_108c9dc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108c9f4: 0x108c9f4: bne   v0, zero, 0x108ca30 addiu a0, sp, 72
+// 0x0108d018: 0x108d018: bne   v0, zero, 0x108d054 addiu a0, sp, 72
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-	brtrue L_108ca30
+	brtrue L_108d054
 // --- basic block ---
-// 0x0108c9fc: 0x108c9fc: addu  s0, s0, s4
+// 0x0108d020: 0x108d020: addu  s0, s0, s4
 	ldloc 10
 	ldloc 16
 	add
 	stloc 10
-// 0x0108ca00: 0x108ca00: lw    v1, 132(s0)
+// 0x0108d024: 0x108d024: lw    v1, 132(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -10091,7 +10091,7 @@ L_108c9dc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108ca04: 0x108ca04: lw    v0, 136(s0)
+// 0x0108d028: 0x108d028: lw    v0, 136(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -10100,17 +10100,17 @@ L_108c9dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ca08: 0x108ca08: addiu a1, sp, 92
+// 0x0108d02c: 0x108d02c: addiu a1, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.2
-// 0x0108ca0c: 0x108ca0c: addiu a2, sp, 36
+// 0x0108d030: 0x108d030: addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.3
-// 0x0108ca10: 0x108ca10: sw    v1, 56(sp)
+// 0x0108d034: 0x108d034: sw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10119,7 +10119,7 @@ L_108c9dc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ca14: 0x108ca14: jal   0x1029da8 sw    v0, 60(sp)
+// 0x0108d038: 0x108d038: jal   0x1029db8 sw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10133,30 +10133,30 @@ L_108c9dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108ca1c: 0x108ca1c: addiu v1, zero, -1
+// 0x0108d040: 0x108d040: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0108ca20: 0x108ca20: bne   v0, v1, 0x108ca4c addiu a1, sp, 56
+// 0x0108d044: 0x108d044: bne   v0, v1, 0x108d070 addiu a1, sp, 56
 	ldloc 5
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-	bne.un L_108ca4c
+	bne.un L_108d070
 // --- basic block ---
-// 0x0108ca28: 0x108ca28: j	 0x108ca68 lui   a0, 0x20000
+// 0x0108d04c: 0x108d04c: j	 0x108d08c lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_108ca68
+	br L_108d08c
 // --- basic block ---
-L_108ca30:
-// 0x0108ca30: 0x108ca30: lw    v0, 28400(s0)
+L_108d054:
+// 0x0108d054: 0x108d054: lw    v0, 28400(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -10165,25 +10165,25 @@ L_108ca30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ca34: 0x108ca34: sll   zero, zero, 0
-// 0x0108ca38: 0x108ca38: slt   v0, s1, v0
+// 0x0108d058: 0x108d058: sll   zero, zero, 0
+// 0x0108d05c: 0x108d05c: slt   v0, s1, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108ca3c: 0x108ca3c: bne   v0, zero, 0x108c9dc addu  a1, s6, zero
+// 0x0108d060: 0x108d060: bne   v0, zero, 0x108d000 addu  a1, s6, zero
 	ldloc 5
 	ldloc 18
 	stloc.2
-	brtrue L_108c9dc
+	brtrue L_108d000
 // --- basic block ---
-// 0x0108ca44: 0x108ca44: j	 0x108cb30 lui   a0, 0x10000
+// 0x0108d068: 0x108d068: j	 0x108d154 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_108cb30
+	br L_108d154
 // --- basic block ---
-L_108ca4c:
-// 0x0108ca4c: 0x108ca4c: lw    v0, 76(sp)
+L_108d070:
+// 0x0108d070: 0x108d070: lw    v0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10192,8 +10192,8 @@ L_108ca4c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ca50: 0x108ca50: sll   zero, zero, 0
-// 0x0108ca54: 0x108ca54: sw    v0, 68(sp)
+// 0x0108d074: 0x108d074: sll   zero, zero, 0
+// 0x0108d078: 0x108d078: sw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10202,7 +10202,7 @@ L_108ca4c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108ca58: 0x108ca58: lw    v0, 72(sp)
+// 0x0108d07c: 0x108d07c: lw    v0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10211,12 +10211,12 @@ L_108ca4c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ca5c: 0x108ca5c: addiu a0, sp, 64
+// 0x0108d080: 0x108d080: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x0108ca60: 0x108ca60: j	 0x108ca90 sw    v0, 64(sp)
+// 0x0108d084: 0x108d084: j	 0x108d0b4 sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10225,12 +10225,12 @@ L_108ca4c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108ca90
+	br L_108d0b4
 // --- basic block ---
-L_108ca68:
-// 0x0108ca68: 0x108ca68: jal   0x101df50 addiu a0, a0, 6792
+L_108d08c:
+// 0x0108d08c: 0x108d08c: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -10238,23 +10238,23 @@ L_108ca68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108ca70: 0x108ca70: beq   v0, zero, 0x108cb2c sll   zero, zero, 0
+// 0x0108d094: 0x108d094: beq   v0, zero, 0x108d150 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108cb2c
+	brfalse L_108d150
 // --- basic block ---
-// 0x0108ca78: 0x108ca78: lw    v1, 0(v0)
+// 0x0108d09c: 0x108d09c: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0108ca7c: 0x108ca7c: lw    v0, 4(v0)
+// 0x0108d0a0: 0x108d0a0: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -10263,17 +10263,17 @@ L_108ca68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ca80: 0x108ca80: addiu a1, sp, 56
+// 0x0108d0a4: 0x108d0a4: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x0108ca84: 0x108ca84: addiu a0, sp, 64
+// 0x0108d0a8: 0x108d0a8: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x0108ca88: 0x108ca88: sw    v0, 68(sp)
+// 0x0108d0ac: 0x108d0ac: sw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10282,7 +10282,7 @@ L_108ca68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108ca8c: 0x108ca8c: sw    v1, 64(sp)
+// 0x0108d0b0: 0x108d0b0: sw    v1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10291,8 +10291,8 @@ L_108ca68:
 	add
 	ldloc 6
 	stelem.i4
-L_108ca90:
-// 0x0108ca90: 0x108ca90: jal   0x1008eb0 addiu s1, sp, 548
+L_108d0b4:
+// 0x0108d0b4: 0x108d0b4: jal   0x1008ec0 addiu s1, sp, 548
 	ldloc.0
 	ldc.i4 548
 	add
@@ -10302,25 +10302,25 @@ L_108ca90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108ca98: 0x108ca98: addu  s0, v0, zero
+// 0x0108d0bc: 0x108d0bc: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0108ca9c: 0x108ca9c: jal   0x1007df4 addu  a0, v0, zero
+// 0x0108d0c0: 0x108d0c0: jal   0x1007e04 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108caa4: 0x108caa4: addu  a0, s0, zero
+// 0x0108d0c8: 0x108d0c8: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0108caa8: 0x108caa8: jal   0x1007e18 sw    v0, 1360(sp)
+// 0x0108d0cc: 0x108d0cc: jal   0x1007e28 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10330,15 +10330,15 @@ L_108ca90:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cab0: 0x108cab0: addiu v1, zero, 10
+// 0x0108d0d4: 0x108d0d4: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x0108cab4: 0x108cab4: div   v0, v1
+// 0x0108d0d8: 0x108d0d8: div   v0, v1
 	ldloc 5
 	ldloc 6
 	ldloc 5
@@ -10347,7 +10347,7 @@ L_108ca90:
 	stloc 12
 	rem
 	stloc 15
-// 0x0108cab8: 0x108cab8: lw    a3, 1360(sp)
+// 0x0108d0dc: 0x108d0dc: lw    a3, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10356,29 +10356,29 @@ L_108ca90:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108cabc: 0x108cabc: addiu s0, sp, 648
+// 0x0108d0e0: 0x108d0e0: addiu s0, sp, 648
 	ldloc.0
 	ldc.i4 648
 	add
 	stloc 10
-// 0x0108cac0: 0x108cac0: lui   a2, 0x10000
+// 0x0108d0e4: 0x108d0e4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108cac4: 0x108cac4: addiu a2, a2, 8928
+// 0x0108d0e8: 0x108d0e8: addiu a2, a2, 8924
 	ldloc.3
-	ldc.i4 8928
+	ldc.i4 8924
 	add
 	stloc.3
-// 0x0108cac8: 0x108cac8: addu  a0, s0, zero
+// 0x0108d0ec: 0x108d0ec: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0108cacc: 0x108cacc: addiu a1, zero, 100
+// 0x0108d0f0: 0x108d0f0: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0108cad0: 0x108cad0: mfhi  hi
+// 0x0108d0f4: 0x108d0f4: mfhi  hi
 	ldloc 15
 	stloc 5
-// 0x0108cad4: 0x108cad4: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0108d0f8: 0x108d0f8: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10397,25 +10397,25 @@ L_108ca90:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cadc: 0x108cadc: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x0108d100: 0x108d100: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0108cae4: 0x108cae4: lui   a2, 0x10000
+// 0x0108d108: 0x108d108: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108cae8: 0x108cae8: addiu a2, a2, 19912
+// 0x0108d10c: 0x108d10c: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0108caec: 0x108caec: addu  a3, v0, zero
+// 0x0108d110: 0x108d110: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0108caf0: 0x108caf0: addiu a1, zero, 20
+// 0x0108d114: 0x108d114: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0108caf4: 0x108caf4: jal   0x1000f9c addu  a0, s1, zero
+// 0x0108d118: 0x108d118: jal   0x1000f9c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -10428,12 +10428,12 @@ L_108ca90:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cafc: 0x108cafc: lui   a0, 0x10000
+// 0x0108d120: 0x108d120: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108cb00: 0x108cb00: jal   0x101cd60 addiu a0, a0, -10164
+// 0x0108d124: 0x108d124: jal   0x101cd70 addiu a0, a0, -10168
 	ldloc.1
-	ldc.i4 -10164
+	ldc.i4 -10168
 	add
 	stloc.1
 	ldloc.0
@@ -10441,15 +10441,15 @@ L_108ca90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cb08: 0x108cb08: addu  a0, s1, zero
+// 0x0108d12c: 0x108d12c: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0108cb0c: 0x108cb0c: jal   0x101cd60 sw    v0, 1360(sp)
+// 0x0108d130: 0x108d130: jal   0x101cd70 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10463,12 +10463,12 @@ L_108ca90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cb14: 0x108cb14: lw    a2, 1360(sp)
+// 0x0108d138: 0x108d138: lw    a2, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10477,18 +10477,18 @@ L_108ca90:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108cb18: 0x108cb18: addu  a3, s0, zero
+// 0x0108d13c: 0x108d13c: addu  a3, s0, zero
 	ldloc 10
 	stloc 4
-// 0x0108cb1c: 0x108cb1c: addiu a0, sp, 448
+// 0x0108d140: 0x108d140: addiu a0, sp, 448
 	ldloc.0
 	ldc.i4 448
 	add
 	stloc.1
-// 0x0108cb20: 0x108cb20: addiu a1, zero, 100
+// 0x0108d144: 0x108d144: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0108cb24: 0x108cb24: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0108d148: 0x108d148: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10507,25 +10507,25 @@ L_108ca90:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108cb2c:
-// 0x0108cb2c: 0x108cb2c: lui   a0, 0x10000
+L_108d150:
+// 0x0108d150: 0x108d150: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_108cb30:
-// 0x0108cb30: 0x108cb30: addiu a3, zero, 1
+L_108d154:
+// 0x0108d154: 0x108d154: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0108cb34: 0x108cb34: addiu a0, a0, 1896
+// 0x0108d158: 0x108d158: addiu a0, a0, 1892
 	ldloc.1
-	ldc.i4 1896
+	ldc.i4 1892
 	add
 	stloc.1
-// 0x0108cb38: 0x108cb38: addiu a1, sp, 448
+// 0x0108d15c: 0x108d15c: addiu a1, sp, 448
 	ldloc.0
 	ldc.i4 448
 	add
 	stloc.2
-// 0x0108cb3c: 0x108cb3c: jal   0x1098d10 addiu a2, zero, 14
+// 0x0108d160: 0x108d160: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -10533,26 +10533,26 @@ L_108cb30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cb44: 0x108cb44: lui   a1, 0x0
+// 0x0108d168: 0x108d168: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108cb48: 0x108cb48: addu  a2, zero, zero
+// 0x0108d16c: 0x108d16c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108cb4c: 0x108cb4c: addu  a0, v0, zero
+// 0x0108d170: 0x108d170: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108cb50: 0x108cb50: addiu a1, a1, 23008
+// 0x0108d174: 0x108d174: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0108cb54: 0x108cb54: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108d178: 0x108d178: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10564,9 +10564,9 @@ L_108cb30:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108cb5c: 0x108cb5c: lw    v0, 1360(sp)
+// 0x0108d180: 0x108d180: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10575,86 +10575,86 @@ L_108cb30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108cb60: 0x108cb60: lui   s0, 0x80000
+// 0x0108d184: 0x108d184: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x0108cb64: 0x108cb64: addu  a1, v0, zero
+// 0x0108d188: 0x108d188: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108cb68: 0x108cb68: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0108d18c: 0x108d18c: jal   0x109950c addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cb70: 0x108cb70: lw    a0, -2124(s0)
+// 0x0108d194: 0x108d194: lw    a0, -1660(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -531
+	ldc.i4 -415
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108cb74: 0x108cb74: jal   0x1098ec4 addu  a1, s3, zero
+// 0x0108d198: 0x108d198: jal   0x109950c addu  a1, s3, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cb7c: 0x108cb7c: lw    a0, -2124(s0)
+// 0x0108d1a0: 0x108d1a0: lw    a0, -1660(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -531
+	ldc.i4 -415
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108cb80: 0x108cb80: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0108d1a4: 0x108d1a4: jal   0x109950c addu  a1, s2, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cb88: 0x108cb88: lui   a1, 0x10000
+// 0x0108d1ac: 0x108d1ac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108cb8c: 0x108cb8c: lui   a0, 0x10000
+// 0x0108d1b0: 0x108d1b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108cb90: 0x108cb90: addiu a3, zero, 5
+// 0x0108d1b4: 0x108d1b4: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x0108cb94: 0x108cb94: addiu a1, a1, 18500
+// 0x0108d1b8: 0x108d1b8: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108cb98: 0x108cb98: addiu a0, a0, 1764
+// 0x0108d1bc: 0x108d1bc: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x0108cb9c: 0x108cb9c: addiu a2, zero, -1
+// 0x0108d1c0: 0x108d1c0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108cba0: 0x108cba0: addiu v0, zero, 8
+// 0x0108d1c4: 0x108d1c4: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0108cba4: 0x108cba4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0108d1c8: 0x108d1c8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10668,21 +10668,21 @@ L_108cb30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cbac: 0x108cbac: addu  a0, v0, zero
+// 0x0108d1d0: 0x108d1d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108cbb0: 0x108cbb0: addu  a2, zero, zero
+// 0x0108d1d4: 0x108d1d4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108cbb4: 0x108cbb4: addu  a1, zero, zero
+// 0x0108d1d8: 0x108d1d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108cbb8: 0x108cbb8: jal   0x1098fe0 sw    v0, 1360(sp)
+// 0x0108d1dc: 0x108d1dc: jal   0x1099628 sw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10694,9 +10694,9 @@ L_108cb30:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108cbc0: 0x108cbc0: lw    v0, 1360(sp)
+// 0x0108d1e4: 0x108d1e4: lw    v0, 1360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10705,31 +10705,31 @@ L_108cb30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108cbc4: 0x108cbc4: lw    a0, -2124(s0)
+// 0x0108d1e8: 0x108d1e8: lw    a0, -1660(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -531
+	ldc.i4 -415
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108cbc8: 0x108cbc8: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108d1ec: 0x108d1ec: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cbd0: 0x108cbd0: lui   a0, 0x10000
+// 0x0108d1f4: 0x108d1f4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108cbd4: 0x108cbd4: jal   0x101cd60 addiu a0, a0, 844
+// 0x0108d1f8: 0x108d1f8: jal   0x101cd70 addiu a0, a0, 840
 	ldloc.1
-	ldc.i4 844
+	ldc.i4 840
 	add
 	stloc.1
 	ldloc.0
@@ -10737,36 +10737,36 @@ L_108cb30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cbdc: 0x108cbdc: lui   a2, 0x300000
+// 0x0108d200: 0x108d200: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x0108cbe0: 0x108cbe0: lui   a3, 0x1090000
+// 0x0108d204: 0x108d204: lui   a3, 0x1090000
 	ldc.i4 17367040
 	stloc 4
-// 0x0108cbe4: 0x108cbe4: lui   a0, 0x10000
+// 0x0108d208: 0x108d208: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108cbe8: 0x108cbe8: ori   a2, a2, 1
+// 0x0108d20c: 0x108d20c: ori   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	or
 	stloc.3
-// 0x0108cbec: 0x108cbec: addiu a3, a3, -19516
+// 0x0108d210: 0x108d210: addiu a3, a3, -17944
 	ldloc 4
-	ldc.i4 -19516
+	ldc.i4 -17944
 	add
 	stloc 4
-// 0x0108cbf0: 0x108cbf0: addiu a0, a0, 852
+// 0x0108d214: 0x108d214: addiu a0, a0, 848
 	ldloc.1
-	ldc.i4 852
+	ldc.i4 848
 	add
 	stloc.1
-// 0x0108cbf4: 0x108cbf4: jal   0x1091088 addu  a1, v0, zero
+// 0x0108d218: 0x108d218: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -10774,39 +10774,39 @@ L_108cb30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cbfc: 0x108cbfc: lw    a0, -2124(s0)
+// 0x0108d220: 0x108d220: lw    a0, -1660(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -531
+	ldc.i4 -415
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108cc00: 0x108cc00: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108d224: 0x108d224: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cc08: 0x108cc08: lui   a0, 0x20000
+// 0x0108d22c: 0x108d22c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108cc0c: 0x108cc0c: addiu a0, a0, -7240
+// 0x0108d230: 0x108d230: addiu a0, a0, -6776
 	ldloc.1
-	ldc.i4 -7240
+	ldc.i4 -6776
 	add
 	stloc.1
-// 0x0108cc10: 0x108cc10: jal   0x1095eec addu  a1, zero, zero
+// 0x0108d234: 0x108d234: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -10814,52 +10814,52 @@ L_108cb30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cc18: 0x108cc18: jal   0x102146c sll   zero, zero, 0
+// 0x0108d23c: 0x108d23c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108cc20: 0x108cc20: bne   v0, zero, 0x108cc30 sll   zero, zero, 0
+// 0x0108d244: 0x108d244: bne   v0, zero, 0x108d254 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_108cc30
+	brtrue L_108d254
 // --- basic block ---
-// 0x0108cc28: 0x108cc28: jal   0x1021900 sll   zero, zero, 0
+// 0x0108d24c: 0x108d24c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108cc30:
-// 0x0108cc30: 0x108cc30: jal   0x106dc3c sll   zero, zero, 0
+L_108d254:
+// 0x0108d254: 0x108d254: jal   0x106e260 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::Realtime_SendCurrentViewDimentions_106dc3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_SendCurrentViewDimentions_106e260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108cc38:
-// 0x0108cc38: 0x108cc38: lw    ra, 1404(sp)
-// 0x0108cc3c: 0x108cc3c: lw    s8, 1400(sp)
+L_108d25c:
+// 0x0108d25c: 0x108d25c: lw    ra, 1404(sp)
+// 0x0108d260: 0x108d260: lw    s8, 1400(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10868,7 +10868,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108cc40: 0x108cc40: lw    s7, 1396(sp)
+// 0x0108d264: 0x108d264: lw    s7, 1396(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10877,7 +10877,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108cc44: 0x108cc44: lw    s6, 1392(sp)
+// 0x0108d268: 0x108d268: lw    s6, 1392(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10886,7 +10886,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0108cc48: 0x108cc48: lw    s5, 1388(sp)
+// 0x0108d26c: 0x108d26c: lw    s5, 1388(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10895,7 +10895,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0108cc4c: 0x108cc4c: lw    s4, 1384(sp)
+// 0x0108d270: 0x108d270: lw    s4, 1384(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10904,7 +10904,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0108cc50: 0x108cc50: lw    s3, 1380(sp)
+// 0x0108d274: 0x108d274: lw    s3, 1380(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10913,7 +10913,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108cc54: 0x108cc54: lw    s2, 1376(sp)
+// 0x0108d278: 0x108d278: lw    s2, 1376(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10922,7 +10922,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108cc58: 0x108cc58: lw    s1, 1372(sp)
+// 0x0108d27c: 0x108d27c: lw    s1, 1372(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10931,7 +10931,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108cc5c: 0x108cc5c: lw    s0, 1368(sp)
+// 0x0108d280: 0x108d280: lw    s0, 1368(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10940,7 +10940,7 @@ L_108cc38:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108cc60: 0x108cc60: jr    ra addiu sp, sp, 1408
+// 0x0108d284: 0x108d284: jr    ra addiu sp, sp, 1408
 	ldloc.0
 	ldc.i4 1408
 	add
diff --git a/converted/Cibyl105.j b/converted/Cibyl105.j
index 216dac4..0d7f307 100644
--- a/converted/Cibyl105.j
+++ b/converted/Cibyl105.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl105::.ctor
 
-.method public static int32 ERTVisabilityGroup_to_string_108d050(int32)
+.method public static int32 ERTVisabilityGroup_to_string_108d674(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -61,63 +61,63 @@
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d050: 0x108d050: addiu a0, a0, -1
+// 0x0108d674: 0x108d674: addiu a0, a0, -1
 	ldloc.0
 	ldc.i4.m1
 	add
 	stloc.0
-// 0x0108d054: 0x108d054: sltiu v0, a0, 3
+// 0x0108d678: 0x108d678: sltiu v0, a0, 3
 	ldloc.0
 	ldc.i4.3
 	clt.un
 	stloc.1
-// 0x0108d058: 0x108d058: bne   v0, zero, 0x108d06c sll   zero, zero, 0
+// 0x0108d67c: 0x108d67c: bne   v0, zero, 0x108d690 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_108d06c
+	brtrue L_108d690
 // --- basic block ---
-// 0x0108d060: 0x108d060: lui   v0, 0x10000
+// 0x0108d684: 0x108d684: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108d064: 0x108d064: jr    ra addiu v0, v0, 20312
+// 0x0108d688: 0x108d688: jr    ra addiu v0, v0, 20776
 	ldloc.1
-	ldc.i4 20312
+	ldc.i4 20776
 	add
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_108d06c:
-// 0x0108d06c: 0x108d06c: lui   v0, 0x20000
+L_108d690:
+// 0x0108d690: 0x108d690: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108d070: 0x108d070: addiu v0, v0, 29520
+// 0x0108d694: 0x108d694: addiu v0, v0, 29984
 	ldloc.1
-	ldc.i4 29520
+	ldc.i4 29984
 	add
 	stloc.1
-// 0x0108d074: 0x108d074: sll   a0, a0, 2
+// 0x0108d698: 0x108d698: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-// 0x0108d078: 0x108d078: addu  a0, a0, v0
+// 0x0108d69c: 0x108d69c: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x0108d07c: 0x108d07c: lw    v0, 0(a0)
+// 0x0108d6a0: 0x108d6a0: lw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108d080: 0x108d080: jr    ra sll   zero, zero, 0
+// 0x0108d6a4: 0x108d6a4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static void StatusStatistics_Reset_108d0c0(int32)
+.method public static void StatusStatistics_Reset_108d6e4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 ra)
@@ -134,7 +134,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d0c0: 0x108d0c0: sw    zero, 8(a0)
+// 0x0108d6e4: 0x108d6e4: sw    zero, 8(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -143,7 +143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108d0c4: 0x108d0c4: jr    ra sw    zero, 4(a0)
+// 0x0108d6e8: 0x108d6e8: jr    ra sw    zero, 4(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -156,7 +156,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static void StatusStatistics_Init_108d0cc(int32)
+.method public static void StatusStatistics_Init_108d6f0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 ra)
@@ -173,7 +173,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d0cc: 0x108d0cc: sw    zero, 8(a0)
+// 0x0108d6f0: 0x108d6f0: sw    zero, 8(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -182,14 +182,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108d0d0: 0x108d0d0: sw    zero, 0(a0)
+// 0x0108d6f4: 0x108d6f4: sw    zero, 0(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108d0d4: 0x108d0d4: jr    ra sw    zero, 4(a0)
+// 0x0108d6f8: 0x108d6f8: jr    ra sw    zero, 4(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -202,7 +202,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+.method public static int32 VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -237,16 +237,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d0dc: 0x108d0dc: addiu sp, sp, -24
+// 0x0108d700: 0x108d700: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d0e0: 0x108d0e0: addu  a1, zero, zero
+// 0x0108d704: 0x108d704: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d0e4: 0x108d0e4: sw    ra, 20(sp)
-// 0x0108d0e8: 0x108d0e8: jal   0x100177c addiu a2, zero, 296
+// 0x0108d708: 0x108d708: sw    ra, 20(sp)
+// 0x0108d70c: 0x108d70c: jal   0x100177c addiu a2, zero, 296
 	ldc.i4 296
 	stloc.3
 	ldloc.1
@@ -258,9 +258,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d0f0: 0x108d0f0: lw    ra, 20(sp)
-// 0x0108d0f4: 0x108d0f4: sll   zero, zero, 0
-// 0x0108d0f8: 0x108d0f8: jr    ra addiu sp, sp, 24
+// 0x0108d714: 0x108d714: lw    ra, 20(sp)
+// 0x0108d718: 0x108d718: sll   zero, zero, 0
+// 0x0108d71c: 0x108d71c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -272,7 +272,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ERTVisabilityReport_from_string_108d100(int32,int32,int32,int32,int32)
+.method public static int32 ERTVisabilityReport_from_string_108d724(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -307,18 +307,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d100: 0x108d100: lui   a1, 0x10000
+// 0x0108d724: 0x108d724: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108d104: 0x108d104: addiu sp, sp, -24
+// 0x0108d728: 0x108d728: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d108: 0x108d108: sw    ra, 20(sp)
-// 0x0108d10c: 0x108d10c: jal   0x1001b14 addiu a1, a1, 31764
+// 0x0108d72c: 0x108d72c: sw    ra, 20(sp)
+// 0x0108d730: 0x108d730: jal   0x1001b14 addiu a1, a1, 32228
 	ldloc.2
-	ldc.i4 31764
+	ldc.i4 32228
 	add
 	stloc.2
 	ldloc.1
@@ -326,18 +326,18 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d114: 0x108d114: lw    ra, 20(sp)
-// 0x0108d118: 0x108d118: sltiu v0, v0, 1
+// 0x0108d738: 0x108d738: lw    ra, 20(sp)
+// 0x0108d73c: 0x108d73c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0108d11c: 0x108d11c: addiu v0, v0, 1
+// 0x0108d740: 0x108d740: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0108d120: 0x108d120: jr    ra addiu sp, sp, 24
+// 0x0108d744: 0x108d744: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -349,7 +349,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ERTVisabilityGroup_from_string_108d128(int32,int32,int32,int32,int32)
+.method public static int32 ERTVisabilityGroup_from_string_108d74c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -387,20 +387,20 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d128: 0x108d128: lui   a1, 0x10000
+// 0x0108d74c: 0x108d74c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108d12c: 0x108d12c: addiu sp, sp, -24
+// 0x0108d750: 0x108d750: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d130: 0x108d130: addiu a1, a1, 31740
+// 0x0108d754: 0x108d754: addiu a1, a1, 32204
 	ldloc.2
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.2
-// 0x0108d134: 0x108d134: sw    s0, 16(sp)
+// 0x0108d758: 0x108d758: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -409,8 +409,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108d138: 0x108d138: sw    ra, 20(sp)
-// 0x0108d13c: 0x108d13c: jal   0x1001b14 addu  s0, a0, zero
+// 0x0108d75c: 0x108d75c: sw    ra, 20(sp)
+// 0x0108d760: 0x108d760: jal   0x1001b14 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.1
@@ -418,21 +418,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d144: 0x108d144: beq   v0, zero, 0x108d17c addiu v1, zero, 2
+// 0x0108d768: 0x108d768: beq   v0, zero, 0x108d7a0 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_108d17c
+	brfalse L_108d7a0
 // --- basic block ---
-// 0x0108d14c: 0x108d14c: lui   a1, 0x10000
+// 0x0108d770: 0x108d770: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108d150: 0x108d150: addiu a1, a1, 20312
+// 0x0108d774: 0x108d774: addiu a1, a1, 20776
 	ldloc.2
-	ldc.i4 20312
+	ldc.i4 20776
 	add
 	stloc.2
-// 0x0108d154: 0x108d154: jal   0x1001b14 addu  a0, s0, zero
+// 0x0108d778: 0x108d778: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -440,18 +440,18 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d15c: 0x108d15c: beq   v0, zero, 0x108d178 addu  a0, s0, zero
+// 0x0108d780: 0x108d780: beq   v0, zero, 0x108d79c addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_108d178
+	brfalse L_108d79c
 // --- basic block ---
-// 0x0108d164: 0x108d164: lui   a1, 0x10000
+// 0x0108d788: 0x108d788: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108d168: 0x108d168: jal   0x1001b14 addiu a1, a1, 31752
+// 0x0108d78c: 0x108d78c: jal   0x1001b14 addiu a1, a1, 32216
 	ldloc.2
-	ldc.i4 31752
+	ldc.i4 32216
 	add
 	stloc.2
 	ldloc.1
@@ -459,22 +459,22 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d170: 0x108d170: beq   v0, zero, 0x108d17c addiu v1, zero, 1
+// 0x0108d794: 0x108d794: beq   v0, zero, 0x108d7a0 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_108d17c
+	brfalse L_108d7a0
 // --- basic block ---
-L_108d178:
-// 0x0108d178: 0x108d178: addiu v1, zero, 3
+L_108d79c:
+// 0x0108d79c: 0x108d79c: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-L_108d17c:
-// 0x0108d17c: 0x108d17c: lw    ra, 20(sp)
-// 0x0108d180: 0x108d180: addu  v0, v1, zero
+L_108d7a0:
+// 0x0108d7a0: 0x108d7a0: lw    ra, 20(sp)
+// 0x0108d7a4: 0x108d7a4: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0108d184: 0x108d184: lw    s0, 16(sp)
+// 0x0108d7a8: 0x108d7a8: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -483,7 +483,7 @@ L_108d17c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108d188: 0x108d188: jr    ra addiu sp, sp, 24
+// 0x0108d7ac: 0x108d7ac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -495,7 +495,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTSystemMessageQueue_IsEmpty_108d1a0()
+.method public static int32 RTSystemMessageQueue_IsEmpty_108d7c4()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -512,19 +512,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d1a0: 0x108d1a0: lui   v0, 0x80000
+// 0x0108d7c4: 0x108d7c4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x0108d1a4: 0x108d1a4: lw    v0, -2100(v0)
+// 0x0108d7c8: 0x108d7c8: lw    v0, -1636(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc.0
-// 0x0108d1a8: 0x108d1a8: jr    ra sltiu v0, v0, 1
+// 0x0108d7cc: 0x108d7cc: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -534,7 +534,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RTSystemMessagesInit_108d1c8(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessagesInit_108d7ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -569,37 +569,37 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d1c8: 0x108d1c8: lui   a0, 0x20000
+// 0x0108d7ec: 0x108d7ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108d1cc: 0x108d1cc: lui   a1, 0x0
+// 0x0108d7f0: 0x108d7f0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d1d0: 0x108d1d0: lui   a2, 0x10000
+// 0x0108d7f4: 0x108d7f4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108d1d4: 0x108d1d4: addiu sp, sp, -24
+// 0x0108d7f8: 0x108d7f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d1d8: 0x108d1d8: addiu a0, a0, -26888
+// 0x0108d7fc: 0x108d7fc: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0108d1dc: 0x108d1dc: addiu a1, a1, 17344
+// 0x0108d800: 0x108d800: addiu a1, a1, 17344
 	ldloc.2
 	ldc.i4 17344
 	add
 	stloc.2
-// 0x0108d1e0: 0x108d1e0: addiu a2, a2, -48
+// 0x0108d804: 0x108d804: addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x0108d1e4: 0x108d1e4: sw    ra, 20(sp)
-// 0x0108d1e8: 0x108d1e8: jal   0x100edb0 addu  a3, zero, zero
+// 0x0108d808: 0x108d808: sw    ra, 20(sp)
+// 0x0108d80c: 0x108d80c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -607,14 +607,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d1f0: 0x108d1f0: lw    ra, 20(sp)
-// 0x0108d1f4: 0x108d1f4: sll   zero, zero, 0
-// 0x0108d1f8: 0x108d1f8: jr    ra addiu sp, sp, 24
+// 0x0108d814: 0x108d814: lw    ra, 20(sp)
+// 0x0108d818: 0x108d818: sll   zero, zero, 0
+// 0x0108d81c: 0x108d81c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -626,7 +626,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RTSystemMessagesSetLastMessageDisplayed_108d200(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessagesSetLastMessageDisplayed_108d824(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -661,19 +661,19 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d200: 0x108d200: addu  a1, a0, zero
+// 0x0108d824: 0x108d824: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0108d204: 0x108d204: lui   a0, 0x0
+// 0x0108d828: 0x108d828: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108d208: 0x108d208: addiu sp, sp, -24
+// 0x0108d82c: 0x108d82c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d20c: 0x108d20c: sw    ra, 20(sp)
-// 0x0108d210: 0x108d210: jal   0x100e610 addiu a0, a0, 17344
+// 0x0108d830: 0x108d830: sw    ra, 20(sp)
+// 0x0108d834: 0x108d834: jal   0x100e620 addiu a0, a0, 17344
 	ldloc.1
 	ldc.i4 17344
 	add
@@ -683,12 +683,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108d218: 0x108d218: jal   0x100ea50 addu  a0, zero, zero
+// 0x0108d83c: 0x108d83c: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -696,14 +696,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108d220: 0x108d220: lw    ra, 20(sp)
-// 0x0108d224: 0x108d224: sll   zero, zero, 0
-// 0x0108d228: 0x108d228: jr    ra addiu sp, sp, 24
+// 0x0108d844: 0x108d844: lw    ra, 20(sp)
+// 0x0108d848: 0x108d848: sll   zero, zero, 0
+// 0x0108d84c: 0x108d84c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -715,7 +715,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTSystemMessagesGetLastMessageDisplayed_108d230(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessagesGetLastMessageDisplayed_108d854(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -750,16 +750,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d230: 0x108d230: lui   a0, 0x0
+// 0x0108d854: 0x108d854: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108d234: 0x108d234: addiu sp, sp, -24
+// 0x0108d858: 0x108d858: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d238: 0x108d238: sw    ra, 20(sp)
-// 0x0108d23c: 0x108d23c: jal   0x100e788 addiu a0, a0, 17344
+// 0x0108d85c: 0x108d85c: sw    ra, 20(sp)
+// 0x0108d860: 0x108d860: jal   0x100e798 addiu a0, a0, 17344
 	ldloc.1
 	ldc.i4 17344
 	add
@@ -769,14 +769,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d244: 0x108d244: lw    ra, 20(sp)
-// 0x0108d248: 0x108d248: sll   zero, zero, 0
-// 0x0108d24c: 0x108d24c: jr    ra addiu sp, sp, 24
+// 0x0108d868: 0x108d868: lw    ra, 20(sp)
+// 0x0108d86c: 0x108d86c: sll   zero, zero, 0
+// 0x0108d870: 0x108d870: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -788,7 +788,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -826,19 +826,19 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d254: 0x108d254: addiu sp, sp, -24
+// 0x0108d878: 0x108d878: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d258: 0x108d258: addu  a1, zero, zero
+// 0x0108d87c: 0x108d87c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d25c: 0x108d25c: addiu a2, zero, 64
+// 0x0108d880: 0x108d880: addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
-// 0x0108d260: 0x108d260: sw    ra, 20(sp)
-// 0x0108d264: 0x108d264: sw    s0, 16(sp)
+// 0x0108d884: 0x108d884: sw    ra, 20(sp)
+// 0x0108d888: 0x108d888: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -847,7 +847,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108d268: 0x108d268: jal   0x100177c addu  s0, a0, zero
+// 0x0108d88c: 0x108d88c: jal   0x100177c addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.1
@@ -859,20 +859,20 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108d270: 0x108d270: lui   a1, 0x0
+// 0x0108d894: 0x108d894: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d274: 0x108d274: addiu a0, s0, 16
+// 0x0108d898: 0x108d898: addiu a0, s0, 16
 	ldloc 6
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0108d278: 0x108d278: addiu a1, a1, 17328
+// 0x0108d89c: 0x108d89c: addiu a1, a1, 17328
 	ldloc.2
 	ldc.i4 17328
 	add
 	stloc.2
-// 0x0108d27c: 0x108d27c: jal   0x1001af8 addiu a2, zero, 16
+// 0x0108d8a0: 0x108d8a0: jal   0x1001af8 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -881,20 +881,20 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d284: 0x108d284: lui   a1, 0x0
+// 0x0108d8a8: 0x108d8a8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d288: 0x108d288: addiu a0, s0, 40
+// 0x0108d8ac: 0x108d8ac: addiu a0, s0, 40
 	ldloc 6
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0108d28c: 0x108d28c: addiu a1, a1, 17336
+// 0x0108d8b0: 0x108d8b0: addiu a1, a1, 17336
 	ldloc.2
 	ldc.i4 17336
 	add
 	stloc.2
-// 0x0108d290: 0x108d290: jal   0x1001af8 addiu a2, zero, 16
+// 0x0108d8b4: 0x108d8b4: jal   0x1001af8 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -903,11 +903,11 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d298: 0x108d298: addiu v0, zero, 16
+// 0x0108d8bc: 0x108d8bc: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0108d29c: 0x108d29c: lw    ra, 20(sp)
-// 0x0108d2a0: 0x108d2a0: sw    v0, 56(s0)
+// 0x0108d8c0: 0x108d8c0: lw    ra, 20(sp)
+// 0x0108d8c4: 0x108d8c4: sw    v0, 56(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -916,10 +916,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108d2a4: 0x108d2a4: addiu v0, zero, 20
+// 0x0108d8c8: 0x108d8c8: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x0108d2a8: 0x108d2a8: sw    v0, 32(s0)
+// 0x0108d8cc: 0x108d8cc: sw    v0, 32(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -928,7 +928,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108d2ac: 0x108d2ac: lw    s0, 16(sp)
+// 0x0108d8d0: 0x108d8d0: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -937,7 +937,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108d2b0: 0x108d2b0: jr    ra addiu sp, sp, 24
+// 0x0108d8d4: 0x108d8d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -949,7 +949,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTSystemMessage_Free_108d2b8(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessage_Free_108d8dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -987,12 +987,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d2b8: 0x108d2b8: addiu sp, sp, -24
+// 0x0108d8dc: 0x108d8dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d2bc: 0x108d2bc: sw    s0, 16(sp)
+// 0x0108d8e0: 0x108d8e0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1001,10 +1001,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108d2c0: 0x108d2c0: addu  s0, a0, zero
+// 0x0108d8e4: 0x108d8e4: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0108d2c4: 0x108d2c4: lw    a0, 12(a0)
+// 0x0108d8e8: 0x108d8e8: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1013,12 +1013,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d2c8: 0x108d2c8: sll   zero, zero, 0
-// 0x0108d2cc: 0x108d2cc: beq   a0, zero, 0x108d2e0 sw    ra, 20(sp)
+// 0x0108d8ec: 0x108d8ec: sll   zero, zero, 0
+// 0x0108d8f0: 0x108d8f0: beq   a0, zero, 0x108d904 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_108d2e0
+	brfalse L_108d904
 // --- basic block ---
-// 0x0108d2d4: 0x108d2d4: jal   0x1000930 sll   zero, zero, 0
+// 0x0108d8f8: 0x108d8f8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1029,7 +1029,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d2dc: 0x108d2dc: sw    zero, 12(s0)
+// 0x0108d900: 0x108d900: sw    zero, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1038,8 +1038,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108d2e0:
-// 0x0108d2e0: 0x108d2e0: lw    a0, 36(s0)
+L_108d904:
+// 0x0108d904: 0x108d904: lw    a0, 36(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1048,12 +1048,12 @@ L_108d2e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d2e4: 0x108d2e4: sll   zero, zero, 0
-// 0x0108d2e8: 0x108d2e8: beq   a0, zero, 0x108d2fc sll   zero, zero, 0
+// 0x0108d908: 0x108d908: sll   zero, zero, 0
+// 0x0108d90c: 0x108d90c: beq   a0, zero, 0x108d920 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_108d2fc
+	brfalse L_108d920
 // --- basic block ---
-// 0x0108d2f0: 0x108d2f0: jal   0x1000930 sll   zero, zero, 0
+// 0x0108d914: 0x108d914: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1064,7 +1064,7 @@ L_108d2e0:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d2f8: 0x108d2f8: sw    zero, 36(s0)
+// 0x0108d91c: 0x108d91c: sw    zero, 36(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1073,8 +1073,8 @@ L_108d2e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108d2fc:
-// 0x0108d2fc: 0x108d2fc: lw    a0, 60(s0)
+L_108d920:
+// 0x0108d920: 0x108d920: lw    a0, 60(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1083,12 +1083,12 @@ L_108d2fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d300: 0x108d300: sll   zero, zero, 0
-// 0x0108d304: 0x108d304: beq   a0, zero, 0x108d318 sll   zero, zero, 0
+// 0x0108d924: 0x108d924: sll   zero, zero, 0
+// 0x0108d928: 0x108d928: beq   a0, zero, 0x108d93c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_108d318
+	brfalse L_108d93c
 // --- basic block ---
-// 0x0108d30c: 0x108d30c: jal   0x1000930 sll   zero, zero, 0
+// 0x0108d930: 0x108d930: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1099,7 +1099,7 @@ L_108d2fc:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d314: 0x108d314: sw    zero, 60(s0)
+// 0x0108d938: 0x108d938: sw    zero, 60(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1108,8 +1108,8 @@ L_108d2fc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108d318:
-// 0x0108d318: 0x108d318: jal   0x108d254 addu  a0, s0, zero
+L_108d93c:
+// 0x0108d93c: 0x108d93c: jal   0x108d878 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -1117,13 +1117,13 @@ L_108d318:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d320: 0x108d320: lw    ra, 20(sp)
-// 0x0108d324: 0x108d324: lw    s0, 16(sp)
+// 0x0108d944: 0x108d944: lw    ra, 20(sp)
+// 0x0108d948: 0x108d948: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1132,7 +1132,7 @@ L_108d318:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108d328: 0x108d328: jr    ra addiu sp, sp, 24
+// 0x0108d94c: 0x108d94c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1144,7 +1144,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 PopOldest_108d330(int32,int32,int32,int32,int32)
+.method public static int32 PopOldest_108d954(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1182,25 +1182,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d330: 0x108d330: lui   v0, 0x80000
+// 0x0108d954: 0x108d954: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108d334: 0x108d334: lw    v0, -2100(v0)
+// 0x0108d958: 0x108d958: lw    v0, -1636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d338: 0x108d338: addiu sp, sp, -24
+// 0x0108d95c: 0x108d95c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d33c: 0x108d33c: sw    ra, 20(sp)
-// 0x0108d340: 0x108d340: sw    s0, 16(sp)
+// 0x0108d960: 0x108d960: sw    ra, 20(sp)
+// 0x0108d964: 0x108d964: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1209,16 +1209,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108d344: 0x108d344: beq   v0, zero, 0x108d360 addu  v1, a0, zero
+// 0x0108d968: 0x108d968: beq   v0, zero, 0x108d984 addu  v1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_108d360
+	brfalse L_108d984
 // --- basic block ---
-// 0x0108d34c: 0x108d34c: lui   v0, 0x0
+// 0x0108d970: 0x108d970: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0108d350: 0x108d350: lw    s0, 17360(v0)
+// 0x0108d974: 0x108d974: lw    s0, 17360(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1227,24 +1227,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108d354: 0x108d354: addiu v0, zero, -1
+// 0x0108d978: 0x108d978: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108d358: 0x108d358: bne   s0, v0, 0x108d378 lui   v0, 0x80000
+// 0x0108d97c: 0x108d97c: bne   s0, v0, 0x108d99c lui   v0, 0x80000
 	ldloc 8
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	bne.un L_108d378
+	bne.un L_108d99c
 // --- basic block ---
-L_108d360:
-// 0x0108d360: 0x108d360: beq   v1, zero, 0x108d3f4 addu  v0, zero, zero
+L_108d984:
+// 0x0108d984: 0x108d984: beq   v1, zero, 0x108da18 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_108d3f4
+	brfalse L_108da18
 // --- basic block ---
-// 0x0108d368: 0x108d368: jal   0x108d254 addu  a0, v1, zero
+// 0x0108d98c: 0x108d98c: jal   0x108d878 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1252,39 +1252,39 @@ L_108d360:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108d370: 0x108d370: j	 0x108d3f4 addu  v0, zero, zero
+// 0x0108d994: 0x108d994: j	 0x108da18 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_108d3f4
+	br L_108da18
 // --- basic block ---
-L_108d378:
-// 0x0108d378: 0x108d378: sll   s0, s0, 6
+L_108d99c:
+// 0x0108d99c: 0x108d99c: sll   s0, s0, 6
 	ldloc 8
 	ldc.i4.6
 	shl
 	stloc 8
-// 0x0108d37c: 0x108d37c: addiu v0, v0, -2096
+// 0x0108d9a0: 0x108d9a0: addiu v0, v0, -1632
 	ldloc 5
-	ldc.i4 -2096
+	ldc.i4 -1632
 	add
 	stloc 5
-// 0x0108d380: 0x108d380: beq   a0, zero, 0x108d3a4 addu  s0, v0, s0
+// 0x0108d9a4: 0x108d9a4: beq   a0, zero, 0x108d9c8 addu  s0, v0, s0
 	ldloc.1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-	brfalse L_108d3a4
+	brfalse L_108d9c8
 // --- basic block ---
-// 0x0108d388: 0x108d388: addu  a1, s0, zero
+// 0x0108d9ac: 0x108d9ac: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0108d38c: 0x108d38c: jal   0x1001800 addiu a2, zero, 64
+// 0x0108d9b0: 0x108d9b0: jal   0x1001800 addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -1296,7 +1296,7 @@ L_108d378:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108d394: 0x108d394: jal   0x108d254 addu  a0, s0, zero
+// 0x0108d9b8: 0x108d9b8: jal   0x108d878 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1304,18 +1304,18 @@ L_108d378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108d39c: 0x108d39c: j	 0x108d3b0 lui   a0, 0x80000
+// 0x0108d9c0: 0x108d9c0: j	 0x108d9d4 lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-	br L_108d3b0
+	br L_108d9d4
 // --- basic block ---
-L_108d3a4:
-// 0x0108d3a4: 0x108d3a4: jal   0x108d2b8 addu  a0, s0, zero
+L_108d9c8:
+// 0x0108d9c8: 0x108d9c8: jal   0x108d8dc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1323,38 +1323,38 @@ L_108d3a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Free_108d2b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Free_108d8dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108d3ac: 0x108d3ac: lui   a0, 0x80000
+// 0x0108d9d0: 0x108d9d0: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-L_108d3b0:
-// 0x0108d3b0: 0x108d3b0: lw    a1, -2100(a0)
+L_108d9d4:
+// 0x0108d9d4: 0x108d9d4: lw    a1, -1636(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108d3b4: 0x108d3b4: addiu v0, zero, 1
+// 0x0108d9d8: 0x108d9d8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108d3b8: 0x108d3b8: bne   a1, v0, 0x108d3d0 lui   v1, 0x0
+// 0x0108d9dc: 0x108d9dc: bne   a1, v0, 0x108d9f4 lui   v1, 0x0
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	bne.un L_108d3d0
+	bne.un L_108d9f4
 // --- basic block ---
-// 0x0108d3c0: 0x108d3c0: addiu v0, zero, -1
+// 0x0108d9e4: 0x108d9e4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0108d3c4: 0x108d3c4: sw    v0, 17360(v1)
+// 0x0108d9e8: 0x108d9e8: sw    v0, 17360(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1363,19 +1363,19 @@ L_108d3b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108d3c8: 0x108d3c8: j	 0x108d3f0 sw    zero, -2100(a0)
+// 0x0108d9ec: 0x108d9ec: j	 0x108da14 sw    zero, -1636(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_108d3f0
+	br L_108da14
 // --- basic block ---
-L_108d3d0:
-// 0x0108d3d0: 0x108d3d0: lw    v0, 17360(v1)
+L_108d9f4:
+// 0x0108d9f4: 0x108d9f4: lw    v0, 17360(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1384,40 +1384,40 @@ L_108d3d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d3d4: 0x108d3d4: addiu a1, a1, -1
+// 0x0108d9f8: 0x108d9f8: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x0108d3d8: 0x108d3d8: addiu v0, v0, 1
+// 0x0108d9fc: 0x108d9fc: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0108d3dc: 0x108d3dc: slti  a2, v0, 20
+// 0x0108da00: 0x108da00: slti  a2, v0, 20
 	ldloc 5
 	ldc.i4.s 20
 	clt
 	stloc.3
-// 0x0108d3e0: 0x108d3e0: subu  a2, zero, a2
+// 0x0108da04: 0x108da04: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x0108d3e4: 0x108d3e4: and   v0, v0, a2
+// 0x0108da08: 0x108da08: and   v0, v0, a2
 	ldloc 5
 	ldloc.3
 	and
 	stloc 5
-// 0x0108d3e8: 0x108d3e8: sw    a1, -2100(a0)
+// 0x0108da0c: 0x108da0c: sw    a1, -1636(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108d3ec: 0x108d3ec: sw    v0, 17360(v1)
+// 0x0108da10: 0x108da10: sw    v0, 17360(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1426,13 +1426,13 @@ L_108d3d0:
 	add
 	ldloc 5
 	stelem.i4
-L_108d3f0:
-// 0x0108d3f0: 0x108d3f0: addiu v0, zero, 1
+L_108da14:
+// 0x0108da14: 0x108da14: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_108d3f4:
-// 0x0108d3f4: 0x108d3f4: lw    ra, 20(sp)
-// 0x0108d3f8: 0x108d3f8: lw    s0, 16(sp)
+L_108da18:
+// 0x0108da18: 0x108da18: lw    ra, 20(sp)
+// 0x0108da1c: 0x108da1c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1441,7 +1441,7 @@ L_108d3f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108d3fc: 0x108d3fc: jr    ra addiu sp, sp, 24
+// 0x0108da20: 0x108da20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1453,7 +1453,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTSystemMessageQueue_Empty_108d404(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessageQueue_Empty_108da28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -1488,14 +1488,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d404: 0x108d404: addiu sp, sp, -24
+// 0x0108da28: 0x108da28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d408: 0x108d408: sw    ra, 20(sp)
-L_108d40c:
-// 0x0108d40c: 0x108d40c: jal   0x108d330 addu  a0, zero, zero
+// 0x0108da2c: 0x108da2c: sw    ra, 20(sp)
+L_108da30:
+// 0x0108da30: 0x108da30: jal   0x108d954 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1503,18 +1503,18 @@ L_108d40c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::PopOldest_108d330(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::PopOldest_108d954(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108d414: 0x108d414: bne   v0, zero, 0x108d40c sll   zero, zero, 0
+// 0x0108da38: 0x108da38: bne   v0, zero, 0x108da30 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_108d40c
+	brtrue L_108da30
 // --- basic block ---
-// 0x0108d41c: 0x108d41c: lw    ra, 20(sp)
-// 0x0108d420: 0x108d420: sll   zero, zero, 0
-// 0x0108d424: 0x108d424: jr    ra addiu sp, sp, 24
+// 0x0108da40: 0x108da40: lw    ra, 20(sp)
+// 0x0108da44: 0x108da44: sll   zero, zero, 0
+// 0x0108da48: 0x108da48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1526,7 +1526,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTSystemMessageQueue_Pop_108d42c(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessageQueue_Pop_108da50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -1561,48 +1561,48 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d42c: 0x108d42c: addiu sp, sp, -32
+// 0x0108da50: 0x108da50: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108d430: 0x108d430: sw    ra, 28(sp)
-// 0x0108d434: 0x108d434: jal   0x108d330 sll   zero, zero, 0
+// 0x0108da54: 0x108da54: sw    ra, 28(sp)
+// 0x0108da58: 0x108da58: jal   0x108d954 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::PopOldest_108d330(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::PopOldest_108d954(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0108d43c: 0x108d43c: lui   v1, 0x80000
+// 0x0108da60: 0x108da60: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108d440: 0x108d440: lw    v1, -2100(v1)
+// 0x0108da64: 0x108da64: lw    v1, -1636(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d444: 0x108d444: sll   zero, zero, 0
-// 0x0108d448: 0x108d448: bne   v1, zero, 0x108d460 lui   a0, 0x1090000
+// 0x0108da68: 0x108da68: sll   zero, zero, 0
+// 0x0108da6c: 0x108da6c: bne   v1, zero, 0x108da84 lui   a0, 0x1090000
 	ldloc 5
 	ldc.i4 17367040
 	stloc.1
-	brtrue L_108d460
+	brtrue L_108da84
 // --- basic block ---
-// 0x0108d450: 0x108d450: addiu a0, a0, -9960
+// 0x0108da74: 0x108da74: addiu a0, a0, -8388
 	ldloc.1
-	ldc.i4 -9960
+	ldc.i4 -8388
 	add
 	stloc.1
-// 0x0108d454: 0x108d454: jal   0x104fd00 sw    v0, 16(sp)
+// 0x0108da78: 0x108da78: jal   0x104fd10 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1616,12 +1616,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0108d45c: 0x108d45c: lw    v0, 16(sp)
+// 0x0108da80: 0x108da80: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1630,10 +1630,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-L_108d460:
-// 0x0108d460: 0x108d460: lw    ra, 28(sp)
-// 0x0108d464: 0x108d464: sll   zero, zero, 0
-// 0x0108d468: 0x108d468: jr    ra addiu sp, sp, 32
+L_108da84:
+// 0x0108da84: 0x108da84: lw    ra, 28(sp)
+// 0x0108da88: 0x108da88: sll   zero, zero, 0
+// 0x0108da8c: 0x108da8c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1645,7 +1645,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RTSystemMessagesDisplay_108d470(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessagesDisplay_108da94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s1,int32 s4,int32 s3,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -1704,25 +1704,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d470: 0x108d470: lui   v0, 0x80000
+// 0x0108da94: 0x108da94: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108d474: 0x108d474: lw    v0, -2100(v0)
+// 0x0108da98: 0x108da98: lw    v0, -1636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d478: 0x108d478: addiu sp, sp, -136
+// 0x0108da9c: 0x108da9c: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x0108d47c: 0x108d47c: sw    ra, 132(sp)
-// 0x0108d480: 0x108d480: sw    s7, 128(sp)
+// 0x0108daa0: 0x108daa0: sw    ra, 132(sp)
+// 0x0108daa4: 0x108daa4: sw    s7, 128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1731,7 +1731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0108d484: 0x108d484: sw    s6, 124(sp)
+// 0x0108daa8: 0x108daa8: sw    s6, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1740,7 +1740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108d488: 0x108d488: sw    s5, 120(sp)
+// 0x0108daac: 0x108daac: sw    s5, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1749,7 +1749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108d48c: 0x108d48c: sw    s4, 116(sp)
+// 0x0108dab0: 0x108dab0: sw    s4, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1758,7 +1758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108d490: 0x108d490: sw    s3, 112(sp)
+// 0x0108dab4: 0x108dab4: sw    s3, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1767,7 +1767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108d494: 0x108d494: sw    s2, 108(sp)
+// 0x0108dab8: 0x108dab8: sw    s2, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1776,7 +1776,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108d498: 0x108d498: sw    s1, 104(sp)
+// 0x0108dabc: 0x108dabc: sw    s1, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1785,7 +1785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108d49c: 0x108d49c: beq   v0, zero, 0x108d8c4 sw    s0, 100(sp)
+// 0x0108dac0: 0x108dac0: beq   v0, zero, 0x108dee8 sw    s0, 100(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -1795,14 +1795,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_108d8c4
+	brfalse L_108dee8
 // --- basic block ---
-// 0x0108d4a4: 0x108d4a4: addiu s0, sp, 24
+// 0x0108dac8: 0x108dac8: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0108d4a8: 0x108d4a8: jal   0x108d254 addu  a0, s0, zero
+// 0x0108dacc: 0x108dacc: jal   0x108d878 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1810,12 +1810,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d4b0: 0x108d4b0: jal   0x108d42c addu  a0, s0, zero
+// 0x0108dad4: 0x108dad4: jal   0x108da50 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1823,12 +1823,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessageQueue_Pop_108d42c(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessageQueue_Pop_108da50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d4b8: 0x108d4b8: lw    a0, 24(sp)
+// 0x0108dadc: 0x108dadc: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1837,30 +1837,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d4bc: 0x108d4bc: jal   0x108d200 sll   zero, zero, 0
+// 0x0108dae0: 0x108dae0: jal   0x108d824 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessagesSetLastMessageDisplayed_108d200(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessagesSetLastMessageDisplayed_108d824(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d4c4: 0x108d4c4: lui   v0, 0x80000
+// 0x0108dae8: 0x108dae8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108d4c8: 0x108d4c8: lw    v0, -2104(v0)
+// 0x0108daec: 0x108daec: lw    v0, -1640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d4cc: 0x108d4cc: lw    s3, 36(sp)
+// 0x0108daf0: 0x108daf0: lw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1869,7 +1869,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108d4d0: 0x108d4d0: lw    s7, 56(sp)
+// 0x0108daf4: 0x108daf4: lw    s7, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1878,7 +1878,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108d4d4: 0x108d4d4: lw    s6, 60(sp)
+// 0x0108daf8: 0x108daf8: lw    s6, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1887,7 +1887,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108d4d8: 0x108d4d8: lw    s5, 80(sp)
+// 0x0108dafc: 0x108dafc: lw    s5, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1896,7 +1896,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108d4dc: 0x108d4dc: lw    s1, 84(sp)
+// 0x0108db00: 0x108db00: lw    s1, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1905,37 +1905,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108d4e0: 0x108d4e0: bne   v0, zero, 0x108d6d0 lui   v0, 0x80000
+// 0x0108db04: 0x108db04: bne   v0, zero, 0x108dcf4 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_108d6d0
+	brtrue L_108dcf4
 // --- basic block ---
-// 0x0108d4e8: 0x108d4e8: lui   a0, 0x20000
+// 0x0108db0c: 0x108db0c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108d4ec: 0x108d4ec: lui   a1, 0x10000
+// 0x0108db10: 0x108db10: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0108d4f0: 0x108d4f0: lui   a3, 0x90010000
+// 0x0108db14: 0x108db14: lui   a3, 0x90010000
 	ldc.i4 2415984640
 	stloc 4
-// 0x0108d4f4: 0x108d4f4: ori   a3, a3, 20497
+// 0x0108db18: 0x108db18: ori   a3, a3, 20497
 	ldloc 4
 	ldc.i4 20497
 	or
 	stloc 4
-// 0x0108d4f8: 0x108d4f8: addiu a0, a0, -29276
+// 0x0108db1c: 0x108db1c: addiu a0, a0, -28812
 	ldloc.1
-	ldc.i4 -29276
+	ldc.i4 -28812
 	add
 	stloc.1
-// 0x0108d4fc: 0x108d4fc: addiu a1, a1, 18500
+// 0x0108db20: 0x108db20: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108d500: 0x108d500: jal   0x1095a08 addu  a2, zero, zero
+// 0x0108db24: 0x108db24: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1943,37 +1943,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d508: 0x108d508: jal   0x101fa28 addu  s0, v0, zero
+// 0x0108db2c: 0x108db2c: jal   0x101fa38 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0108d510: 0x108d510: beq   v0, zero, 0x108d51c addiu a3, zero, 35
+// 0x0108db34: 0x108db34: beq   v0, zero, 0x108db40 addiu a3, zero, 35
 	ldloc 5
 	ldc.i4.s 35
 	stloc 4
-	brfalse L_108d51c
+	brfalse L_108db40
 // --- basic block ---
-// 0x0108d518: 0x108d518: addiu a3, zero, 60
+// 0x0108db3c: 0x108db3c: addiu a3, zero, 60
 	ldc.i4.s 60
 	stloc 4
-L_108d51c:
-// 0x0108d51c: 0x108d51c: addu  a0, s0, zero
+L_108db40:
+// 0x0108db40: 0x108db40: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108d520: 0x108d520: addiu a1, zero, 5
+// 0x0108db44: 0x108db44: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0108d524: 0x108d524: addiu a2, zero, 8
+// 0x0108db48: 0x108db48: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x0108d528: 0x108d528: jal   0x10942e8 sw    a3, 88(sp)
+// 0x0108db4c: 0x108db4c: jal   0x109490c sw    a3, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1987,12 +1987,12 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d530: 0x108d530: lw    a3, 88(sp)
+// 0x0108db54: 0x108db54: lw    a3, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2001,24 +2001,24 @@ L_108d51c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108d534: 0x108d534: lui   a0, 0x20000
+// 0x0108db58: 0x108db58: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108d538: 0x108d538: addiu s2, zero, 8
+// 0x0108db5c: 0x108db5c: addiu s2, zero, 8
 	ldc.i4.8
 	stloc 9
-// 0x0108d53c: 0x108d53c: addiu a0, a0, -6692
+// 0x0108db60: 0x108db60: addiu a0, a0, -6228
 	ldloc.1
-	ldc.i4 -6692
+	ldc.i4 -6228
 	add
 	stloc.1
-// 0x0108d540: 0x108d540: addu  a1, zero, zero
+// 0x0108db64: 0x108db64: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d544: 0x108d544: addiu a2, zero, -2
+// 0x0108db68: 0x108db68: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0108d548: 0x108d548: jal   0x1093a24 sw    s2, 16(sp)
+// 0x0108db6c: 0x108db6c: jal   0x1094048 sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2032,45 +2032,45 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d550: 0x108d550: addu  a0, v0, zero
+// 0x0108db74: 0x108db74: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d554: 0x108d554: addu  a1, zero, zero
+// 0x0108db78: 0x108db78: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d558: 0x108d558: addu  a2, zero, zero
+// 0x0108db7c: 0x108db7c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108d55c: 0x108d55c: jal   0x1098fe0 addu  s4, v0, zero
+// 0x0108db80: 0x108db80: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108d564: 0x108d564: lui   a0, 0x20000
+// 0x0108db88: 0x108db88: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108d568: 0x108d568: lui   a1, 0x20000
+// 0x0108db8c: 0x108db8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108d56c: 0x108d56c: addiu a2, zero, 25
+// 0x0108db90: 0x108db90: addiu a2, zero, 25
 	ldc.i4.s 25
 	stloc.3
-// 0x0108d570: 0x108d570: addiu a0, a0, -6684
+// 0x0108db94: 0x108db94: addiu a0, a0, -6220
 	ldloc.1
-	ldc.i4 -6684
+	ldc.i4 -6220
 	add
 	stloc.1
-// 0x0108d574: 0x108d574: jal   0x109e13c addiu a1, a1, -6664
+// 0x0108db98: 0x108db98: jal   0x109e784 addiu a1, a1, -6200
 	ldloc.2
-	ldc.i4 -6664
+	ldc.i4 -6200
 	add
 	stloc.2
 	ldloc.0
@@ -2078,44 +2078,44 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d57c: 0x108d57c: addu  a1, v0, zero
+// 0x0108dba0: 0x108dba0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108d580: 0x108d580: jal   0x1098ec4 addu  a0, s4, zero
+// 0x0108dba4: 0x108dba4: jal   0x109950c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d588: 0x108d588: addu  a1, s4, zero
+// 0x0108dbac: 0x108dbac: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x0108d58c: 0x108d58c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108dbb0: 0x108dbb0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d594: 0x108d594: addu  a0, s0, zero
+// 0x0108dbb8: 0x108dbb8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108d598: 0x108d598: addiu a1, zero, 5
+// 0x0108dbbc: 0x108dbbc: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0108d59c: 0x108d59c: jal   0x10942e8 addiu a2, zero, 8
+// 0x0108dbc0: 0x108dbc0: jal   0x109490c addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -2123,29 +2123,29 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d5a4: 0x108d5a4: lui   a0, 0x10000
+// 0x0108dbc8: 0x108dbc8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108d5a8: 0x108d5a8: addiu a3, zero, -1
+// 0x0108dbcc: 0x108dbcc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0108d5ac: 0x108d5ac: addiu a0, a0, 6916
+// 0x0108dbd0: 0x108dbd0: addiu a0, a0, 6912
 	ldloc.1
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.1
-// 0x0108d5b0: 0x108d5b0: addu  a1, zero, zero
+// 0x0108dbd4: 0x108dbd4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d5b4: 0x108d5b4: addiu a2, zero, -2
+// 0x0108dbd8: 0x108dbd8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0108d5b8: 0x108d5b8: jal   0x1093a24 sw    s2, 16(sp)
+// 0x0108dbdc: 0x108dbdc: jal   0x1094048 sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2159,48 +2159,48 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d5c0: 0x108d5c0: addu  a0, v0, zero
+// 0x0108dbe4: 0x108dbe4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d5c4: 0x108d5c4: addu  a1, zero, zero
+// 0x0108dbe8: 0x108dbe8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d5c8: 0x108d5c8: addu  a2, zero, zero
+// 0x0108dbec: 0x108dbec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108d5cc: 0x108d5cc: addu  s2, v0, zero
+// 0x0108dbf0: 0x108dbf0: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0108d5d0: 0x108d5d0: jal   0x1098fe0 lui   s4, 0x10000
+// 0x0108dbf4: 0x108dbf4: jal   0x1099628 lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108d5d8: 0x108d5d8: lui   a0, 0x10000
+// 0x0108dbfc: 0x108dbfc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108d5dc: 0x108d5dc: addiu a3, zero, 17
+// 0x0108dc00: 0x108dc00: addiu a3, zero, 17
 	ldc.i4.s 17
 	stloc 4
-// 0x0108d5e0: 0x108d5e0: addiu a2, zero, 20
+// 0x0108dc04: 0x108dc04: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x0108d5e4: 0x108d5e4: addiu a0, a0, 328
+// 0x0108dc08: 0x108dc08: addiu a0, a0, 324
 	ldloc.1
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.1
-// 0x0108d5e8: 0x108d5e8: jal   0x1098d10 addiu a1, s4, 18500
+// 0x0108dc0c: 0x108dc0c: jal   0x1099358 addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -2208,23 +2208,23 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d5f0: 0x108d5f0: lui   a1, 0x0
+// 0x0108dc14: 0x108dc14: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d5f4: 0x108d5f4: addu  a0, v0, zero
+// 0x0108dc18: 0x108dc18: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d5f8: 0x108d5f8: addiu a1, a1, 17328
+// 0x0108dc1c: 0x108dc1c: addiu a1, a1, 17328
 	ldloc.2
 	ldc.i4 17328
 	add
 	stloc.2
-// 0x0108d5fc: 0x108d5fc: jal   0x1097af8 sw    v0, 88(sp)
+// 0x0108dc20: 0x108dc20: jal   0x1098140 sw    v0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2235,9 +2235,9 @@ L_108d51c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0108d604: 0x108d604: lw    v0, 88(sp)
+// 0x0108dc28: 0x108dc28: lw    v0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2246,39 +2246,39 @@ L_108d51c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d608: 0x108d608: addu  a0, s2, zero
+// 0x0108dc2c: 0x108dc2c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0108d60c: 0x108d60c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108dc30: 0x108dc30: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d614: 0x108d614: addu  a0, s0, zero
+// 0x0108dc38: 0x108dc38: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108d618: 0x108d618: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0108dc3c: 0x108dc3c: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d620: 0x108d620: addu  a0, s0, zero
+// 0x0108dc44: 0x108dc44: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108d624: 0x108d624: addiu a1, zero, 5
+// 0x0108dc48: 0x108dc48: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0108d628: 0x108d628: jal   0x10942e8 addiu a2, zero, 8
+// 0x0108dc4c: 0x108dc4c: jal   0x109490c addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -2286,30 +2286,30 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d630: 0x108d630: lui   a0, 0x20000
+// 0x0108dc54: 0x108dc54: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108d634: 0x108d634: ori   a3, zero, 32769
+// 0x0108dc58: 0x108dc58: ori   a3, zero, 32769
 	ldc.i4.s 0
 	ldc.i4 32769
 	or
 	stloc 4
-// 0x0108d638: 0x108d638: addiu a2, zero, 16
+// 0x0108dc5c: 0x108dc5c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0108d63c: 0x108d63c: addiu a1, s4, 18500
+// 0x0108dc60: 0x108dc60: addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0108d640: 0x108d640: jal   0x1098d10 addiu a0, a0, -2684
+// 0x0108dc64: 0x108dc64: jal   0x1099358 addiu a0, a0, -2220
 	ldloc.1
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -2317,23 +2317,23 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d648: 0x108d648: lui   a1, 0x0
+// 0x0108dc6c: 0x108dc6c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108d64c: 0x108d64c: addu  a0, v0, zero
+// 0x0108dc70: 0x108dc70: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d650: 0x108d650: addiu a1, a1, 17336
+// 0x0108dc74: 0x108dc74: addiu a1, a1, 17336
 	ldloc.2
 	ldc.i4 17336
 	add
 	stloc.2
-// 0x0108d654: 0x108d654: jal   0x1097af8 sw    v0, 88(sp)
+// 0x0108dc78: 0x108dc78: jal   0x1098140 sw    v0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2344,9 +2344,9 @@ L_108d51c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0108d65c: 0x108d65c: lw    v0, 88(sp)
+// 0x0108dc80: 0x108dc80: lw    v0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2355,26 +2355,26 @@ L_108d51c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d660: 0x108d660: addu  a0, s0, zero
+// 0x0108dc84: 0x108dc84: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108d664: 0x108d664: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108dc88: 0x108dc88: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d66c: 0x108d66c: addiu a1, zero, 14
+// 0x0108dc90: 0x108dc90: addiu a1, zero, 14
 	ldc.i4.s 14
 	stloc.2
-// 0x0108d670: 0x108d670: addiu a2, zero, 8
+// 0x0108dc94: 0x108dc94: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x0108d674: 0x108d674: jal   0x10942e8 addu  a0, s0, zero
+// 0x0108dc98: 0x108dc98: jal   0x109490c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2382,15 +2382,15 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d67c: 0x108d67c: lui   a0, 0x0
+// 0x0108dca0: 0x108dca0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108d680: 0x108d680: jal   0x101cd60 addiu a0, a0, 32524
+// 0x0108dca4: 0x108dca4: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -2400,36 +2400,36 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d688: 0x108d688: lui   a2, 0x300000
+// 0x0108dcac: 0x108dcac: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x0108d68c: 0x108d68c: lui   a3, 0x1090000
+// 0x0108dcb0: 0x108dcb0: lui   a3, 0x1090000
 	ldc.i4 17367040
 	stloc 4
-// 0x0108d690: 0x108d690: lui   a0, 0x0
+// 0x0108dcb4: 0x108dcb4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108d694: 0x108d694: ori   a2, a2, 13
+// 0x0108dcb8: 0x108dcb8: ori   a2, a2, 13
 	ldloc.3
 	ldc.i4.s 13
 	or
 	stloc.3
-// 0x0108d698: 0x108d698: addiu a3, a3, -10000
+// 0x0108dcbc: 0x108dcbc: addiu a3, a3, -8428
 	ldloc 4
-	ldc.i4 -10000
+	ldc.i4 -8428
 	add
 	stloc 4
-// 0x0108d69c: 0x108d69c: addiu a0, a0, 32528
+// 0x0108dcc0: 0x108dcc0: addiu a0, a0, 32528
 	ldloc.1
 	ldc.i4 32528
 	add
 	stloc.1
-// 0x0108d6a0: 0x108d6a0: jal   0x1091088 addu  a1, v0, zero
+// 0x0108dcc4: 0x108dcc4: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2437,31 +2437,31 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d6a8: 0x108d6a8: addu  a1, v0, zero
+// 0x0108dccc: 0x108dccc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108d6ac: 0x108d6ac: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108dcd0: 0x108dcd0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d6b4: 0x108d6b4: addu  a0, s0, zero
+// 0x0108dcd8: 0x108dcd8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108d6b8: 0x108d6b8: addiu a1, zero, 10
+// 0x0108dcdc: 0x108dcdc: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0108d6bc: 0x108d6bc: jal   0x10942e8 addiu a2, zero, 8
+// 0x0108dce0: 0x108dce0: jal   0x109490c addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -2469,45 +2469,45 @@ L_108d51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d6c4: 0x108d6c4: lui   v0, 0x80000
+// 0x0108dce8: 0x108dce8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108d6c8: 0x108d6c8: sw    s0, -2104(v0)
+// 0x0108dcec: 0x108dcec: sw    s0, -1640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108d6cc: 0x108d6cc: lui   v0, 0x80000
+// 0x0108dcf0: 0x108dcf0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_108d6d0:
-// 0x0108d6d0: 0x108d6d0: bne   s3, zero, 0x108d6f4 lui   a1, 0x10000
+L_108dcf4:
+// 0x0108dcf4: 0x108dcf4: bne   s3, zero, 0x108dd18 lui   a1, 0x10000
 	ldloc 12
 	ldc.i4 65536
 	stloc.2
-	brtrue L_108d6f4
+	brtrue L_108dd18
 // --- basic block ---
-// 0x0108d6d8: 0x108d6d8: lw    a0, -2104(v0)
+// 0x0108dcfc: 0x108dcfc: lw    a0, -1640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d6dc: 0x108d6dc: jal   0x109b304 addiu a1, a1, 6916
+// 0x0108dd00: 0x108dd00: jal   0x109b94c addiu a1, a1, 6912
 	ldloc.2
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
 	ldloc.0
@@ -2515,34 +2515,34 @@ L_108d6d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d6e4: 0x108d6e4: jal   0x1099098 addu  a0, v0, zero
+// 0x0108dd08: 0x108dd08: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d6ec: 0x108d6ec: j	 0x108d708 sll   zero, zero, 0
-	br L_108d708
+// 0x0108dd10: 0x108dd10: j	 0x108dd2c sll   zero, zero, 0
+	br L_108dd2c
 // --- basic block ---
-L_108d6f4:
-// 0x0108d6f4: 0x108d6f4: lw    a0, -2104(v0)
+L_108dd18:
+// 0x0108dd18: 0x108dd18: lw    a0, -1640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d6f8: 0x108d6f8: jal   0x109b304 addiu a1, a1, 6916
+// 0x0108dd1c: 0x108dd1c: jal   0x109b94c addiu a1, a1, 6912
 	ldloc.2
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
 	ldloc.0
@@ -2550,42 +2550,42 @@ L_108d6f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d700: 0x108d700: jal   0x10990ac addu  a0, v0, zero
+// 0x0108dd24: 0x108dd24: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108d708:
-// 0x0108d708: 0x108d708: bne   s1, zero, 0x108d730 lui   v0, 0x80000
+L_108dd2c:
+// 0x0108dd2c: 0x108dd2c: bne   s1, zero, 0x108dd54 lui   v0, 0x80000
 	ldloc 10
 	ldc.i4 524288
 	stloc 5
-	brtrue L_108d730
+	brtrue L_108dd54
 // --- basic block ---
-// 0x0108d710: 0x108d710: lw    a0, -2104(v0)
+// 0x0108dd34: 0x108dd34: lw    a0, -1640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d714: 0x108d714: lui   a1, 0x20000
+// 0x0108dd38: 0x108dd38: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108d718: 0x108d718: jal   0x109b304 addiu a1, a1, -6692
+// 0x0108dd3c: 0x108dd3c: jal   0x109b94c addiu a1, a1, -6228
 	ldloc.2
-	ldc.i4 -6692
+	ldc.i4 -6228
 	add
 	stloc.2
 	ldloc.0
@@ -2593,31 +2593,31 @@ L_108d708:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d720: 0x108d720: jal   0x1099098 addu  a0, v0, zero
+// 0x0108dd44: 0x108dd44: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d728: 0x108d728: j	 0x108d7a8 lui   s0, 0x80000
+// 0x0108dd4c: 0x108dd4c: j	 0x108ddcc lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-	br L_108d7a8
+	br L_108ddcc
 // --- basic block ---
-L_108d730:
-// 0x0108d730: 0x108d730: addu  a0, zero, zero
+L_108dd54:
+// 0x0108dd54: 0x108dd54: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0108d734: 0x108d734: addiu a1, zero, 1
+// 0x0108dd58: 0x108dd58: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108d738: 0x108d738: jal   0x10a1918 addu  a2, s1, zero
+// 0x0108dd5c: 0x108dd5c: jal   0x10a1f60 addu  a2, s1, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -2625,32 +2625,32 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d740: 0x108d740: beq   v0, zero, 0x108d7a4 lui   s0, 0x80000
+// 0x0108dd64: 0x108dd64: beq   v0, zero, 0x108ddc8 lui   s0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brfalse L_108d7a4
+	brfalse L_108ddc8
 // --- basic block ---
-// 0x0108d748: 0x108d748: lui   s2, 0x20000
+// 0x0108dd6c: 0x108dd6c: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x0108d74c: 0x108d74c: lw    a0, -2104(s0)
+// 0x0108dd70: 0x108dd70: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d750: 0x108d750: jal   0x109b304 addiu a1, s2, -6684
+// 0x0108dd74: 0x108dd74: jal   0x109b94c addiu a1, s2, -6220
 	ldloc 9
-	ldc.i4 -6684
+	ldc.i4 -6220
 	add
 	stloc.2
 	ldloc.0
@@ -2658,15 +2658,15 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d758: 0x108d758: addu  a0, v0, zero
+// 0x0108dd7c: 0x108dd7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d75c: 0x108d75c: jal   0x109df10 addu  a1, s1, zero
+// 0x0108dd80: 0x108dd80: jal   0x109e558 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -2674,23 +2674,23 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d764: 0x108d764: lw    a0, -2104(s0)
+// 0x0108dd88: 0x108dd88: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d768: 0x108d768: jal   0x109b304 addiu a1, s2, -6684
+// 0x0108dd8c: 0x108dd8c: jal   0x109b94c addiu a1, s2, -6220
 	ldloc 9
-	ldc.i4 -6684
+	ldc.i4 -6220
 	add
 	stloc.2
 	ldloc.0
@@ -2698,12 +2698,12 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d770: 0x108d770: jal   0x1099048 addu  a0, v0, zero
+// 0x0108dd94: 0x108dd94: jal   0x1099690 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2711,23 +2711,23 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d778: 0x108d778: lw    a0, -2104(s0)
+// 0x0108dd9c: 0x108dd9c: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d77c: 0x108d77c: jal   0x109b304 addiu a1, s2, -6684
+// 0x0108dda0: 0x108dda0: jal   0x109b94c addiu a1, s2, -6220
 	ldloc 9
-	ldc.i4 -6684
+	ldc.i4 -6220
 	add
 	stloc.2
 	ldloc.0
@@ -2735,12 +2735,12 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d784: 0x108d784: jal   0x1098ff8 addu  a0, v0, zero
+// 0x0108dda8: 0x108dda8: jal   0x1099640 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2748,26 +2748,26 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d78c: 0x108d78c: lw    a0, -2104(s0)
+// 0x0108ddb0: 0x108ddb0: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d790: 0x108d790: lui   a1, 0x20000
+// 0x0108ddb4: 0x108ddb4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108d794: 0x108d794: jal   0x109b304 addiu a1, a1, -6692
+// 0x0108ddb8: 0x108ddb8: jal   0x109b94c addiu a1, a1, -6228
 	ldloc.2
-	ldc.i4 -6692
+	ldc.i4 -6228
 	add
 	stloc.2
 	ldloc.0
@@ -2775,40 +2775,40 @@ L_108d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d79c: 0x108d79c: jal   0x10990ac addu  a0, v0, zero
+// 0x0108ddc0: 0x108ddc0: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108d7a4:
-// 0x0108d7a4: 0x108d7a4: lui   s0, 0x80000
+L_108ddc8:
+// 0x0108ddc8: 0x108ddc8: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_108d7a8:
-// 0x0108d7a8: 0x108d7a8: lui   s1, 0x10000
+L_108ddcc:
+// 0x0108ddcc: 0x108ddcc: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0108d7ac: 0x108d7ac: lw    a0, -2104(s0)
+// 0x0108ddd0: 0x108ddd0: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d7b0: 0x108d7b0: jal   0x109b304 addiu a1, s1, 328
+// 0x0108ddd4: 0x108ddd4: jal   0x109b94c addiu a1, s1, 324
 	ldloc 10
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
 	ldloc.0
@@ -2816,15 +2816,15 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d7b8: 0x108d7b8: addu  a0, v0, zero
+// 0x0108dddc: 0x108dddc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d7bc: 0x108d7bc: jal   0x1097e5c addu  a1, s3, zero
+// 0x0108dde0: 0x108dde0: jal   0x10984a4 addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -2832,23 +2832,23 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d7c4: 0x108d7c4: lw    a0, -2104(s0)
+// 0x0108dde8: 0x108dde8: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d7c8: 0x108d7c8: jal   0x109b304 addiu a1, s1, 328
+// 0x0108ddec: 0x108ddec: jal   0x109b94c addiu a1, s1, 324
 	ldloc 10
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
 	ldloc.0
@@ -2856,17 +2856,17 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d7d0: 0x108d7d0: addiu a0, sp, 40
+// 0x0108ddf4: 0x108ddf4: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0108d7d4: 0x108d7d4: jal   0x1001ba8 addu  s2, v0, zero
+// 0x0108ddf8: 0x108ddf8: jal   0x1001ba8 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2879,28 +2879,28 @@ L_108d7a8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d7dc: 0x108d7dc: addu  a1, v0, zero
+// 0x0108de00: 0x108de00: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108d7e0: 0x108d7e0: jal   0x1097af8 addu  a0, s2, zero
+// 0x0108de04: 0x108de04: jal   0x1098140 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0108d7e8: 0x108d7e8: lw    a0, -2104(s0)
+// 0x0108de0c: 0x108de0c: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d7ec: 0x108d7ec: jal   0x109b304 addiu a1, s1, 328
+// 0x0108de10: 0x108de10: jal   0x109b94c addiu a1, s1, 324
 	ldloc 10
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
 	ldloc.0
@@ -2908,37 +2908,37 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d7f4: 0x108d7f4: addu  a0, v0, zero
+// 0x0108de18: 0x108de18: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d7f8: 0x108d7f8: jal   0x1097b1c addu  a1, s7, zero
+// 0x0108de1c: 0x108de1c: jal   0x1098164 addu  a1, s7, zero
 	ldloc 15
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl113::ssd_text_set_font_size_1097b1c(int32,int32)
+	call int32 Cibyl113::ssd_text_set_font_size_1098164(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d800: 0x108d800: lui   s2, 0x10000
+// 0x0108de24: 0x108de24: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0108d804: 0x108d804: lw    a0, -2104(s0)
+// 0x0108de28: 0x108de28: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d808: 0x108d808: jal   0x109b304 addiu a1, s2, 6916
+// 0x0108de2c: 0x108de2c: jal   0x109b94c addiu a1, s2, 6912
 	ldloc 9
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
 	ldloc.0
@@ -2946,12 +2946,12 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d810: 0x108d810: jal   0x1099048 addu  a0, v0, zero
+// 0x0108de34: 0x108de34: jal   0x1099690 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2959,23 +2959,23 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d818: 0x108d818: lw    a0, -2104(s0)
+// 0x0108de3c: 0x108de3c: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d81c: 0x108d81c: jal   0x109b304 addiu a1, s2, 6916
+// 0x0108de40: 0x108de40: jal   0x109b94c addiu a1, s2, 6912
 	ldloc 9
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
 	ldloc.0
@@ -2983,12 +2983,12 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d824: 0x108d824: jal   0x1098ff8 addu  a0, v0, zero
+// 0x0108de48: 0x108de48: jal   0x1099640 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2996,23 +2996,23 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d82c: 0x108d82c: lw    a0, -2104(s0)
+// 0x0108de50: 0x108de50: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d830: 0x108d830: jal   0x109b304 addiu a1, s1, 328
+// 0x0108de54: 0x108de54: jal   0x109b94c addiu a1, s1, 324
 	ldloc 10
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
 	ldloc.0
@@ -3020,12 +3020,12 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d838: 0x108d838: jal   0x1099048 addu  a0, v0, zero
+// 0x0108de5c: 0x108de5c: jal   0x1099690 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3033,23 +3033,23 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d840: 0x108d840: lw    a0, -2104(s0)
+// 0x0108de64: 0x108de64: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d844: 0x108d844: jal   0x109b304 addiu a1, s1, 328
+// 0x0108de68: 0x108de68: jal   0x109b94c addiu a1, s1, 324
 	ldloc 10
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
 	ldloc.0
@@ -3057,12 +3057,12 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d84c: 0x108d84c: jal   0x1098ff8 addu  a0, v0, zero
+// 0x0108de70: 0x108de70: jal   0x1099640 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3070,26 +3070,26 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d854: 0x108d854: lui   s1, 0x20000
+// 0x0108de78: 0x108de78: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x0108d858: 0x108d858: lw    a0, -2104(s0)
+// 0x0108de7c: 0x108de7c: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d85c: 0x108d85c: jal   0x109b304 addiu a1, s1, -2684
+// 0x0108de80: 0x108de80: jal   0x109b94c addiu a1, s1, -2220
 	ldloc 10
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.2
 	ldloc.0
@@ -3097,15 +3097,15 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d864: 0x108d864: addu  a0, v0, zero
+// 0x0108de88: 0x108de88: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d868: 0x108d868: jal   0x1097e5c addu  a1, s6, zero
+// 0x0108de8c: 0x108de8c: jal   0x10984a4 addu  a1, s6, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -3113,23 +3113,23 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d870: 0x108d870: lw    a0, -2104(s0)
+// 0x0108de94: 0x108de94: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d874: 0x108d874: jal   0x109b304 addiu a1, s1, -2684
+// 0x0108de98: 0x108de98: jal   0x109b94c addiu a1, s1, -2220
 	ldloc 10
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.2
 	ldloc.0
@@ -3137,17 +3137,17 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d87c: 0x108d87c: addiu a0, sp, 64
+// 0x0108dea0: 0x108dea0: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x0108d880: 0x108d880: jal   0x1001ba8 addu  s2, v0, zero
+// 0x0108dea4: 0x108dea4: jal   0x1001ba8 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -3160,28 +3160,28 @@ L_108d7a8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d888: 0x108d888: addu  a1, v0, zero
+// 0x0108deac: 0x108deac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108d88c: 0x108d88c: jal   0x1097af8 addu  a0, s2, zero
+// 0x0108deb0: 0x108deb0: jal   0x1098140 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0108d894: 0x108d894: lw    a0, -2104(s0)
+// 0x0108deb8: 0x108deb8: lw    a0, -1640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -526
+	ldc.i4 -410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108d898: 0x108d898: jal   0x109b304 addiu a1, s1, -2684
+// 0x0108debc: 0x108debc: jal   0x109b94c addiu a1, s1, -2220
 	ldloc 10
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.2
 	ldloc.0
@@ -3189,31 +3189,31 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d8a0: 0x108d8a0: addu  a0, v0, zero
+// 0x0108dec4: 0x108dec4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108d8a4: 0x108d8a4: jal   0x1097b1c addu  a1, s5, zero
+// 0x0108dec8: 0x108dec8: jal   0x1098164 addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl113::ssd_text_set_font_size_1097b1c(int32,int32)
+	call int32 Cibyl113::ssd_text_set_font_size_1098164(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108d8ac: 0x108d8ac: lui   a0, 0x20000
+// 0x0108ded0: 0x108ded0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108d8b0: 0x108d8b0: addiu a0, a0, -29276
+// 0x0108ded4: 0x108ded4: addiu a0, a0, -28812
 	ldloc.1
-	ldc.i4 -29276
+	ldc.i4 -28812
 	add
 	stloc.1
-// 0x0108d8b4: 0x108d8b4: jal   0x1095eec addu  a1, zero, zero
+// 0x0108ded8: 0x108ded8: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3221,25 +3221,25 @@ L_108d7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108d8bc: 0x108d8bc: jal   0x1021900 sll   zero, zero, 0
+// 0x0108dee0: 0x108dee0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108d8c4:
-// 0x0108d8c4: 0x108d8c4: lw    ra, 132(sp)
-// 0x0108d8c8: 0x108d8c8: lw    s7, 128(sp)
+L_108dee8:
+// 0x0108dee8: 0x108dee8: lw    ra, 132(sp)
+// 0x0108deec: 0x108deec: lw    s7, 128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3248,7 +3248,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108d8cc: 0x108d8cc: lw    s6, 124(sp)
+// 0x0108def0: 0x108def0: lw    s6, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3257,7 +3257,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108d8d0: 0x108d8d0: lw    s5, 120(sp)
+// 0x0108def4: 0x108def4: lw    s5, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3266,7 +3266,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108d8d4: 0x108d8d4: lw    s4, 116(sp)
+// 0x0108def8: 0x108def8: lw    s4, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3275,7 +3275,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108d8d8: 0x108d8d8: lw    s3, 112(sp)
+// 0x0108defc: 0x108defc: lw    s3, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3284,7 +3284,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108d8dc: 0x108d8dc: lw    s2, 108(sp)
+// 0x0108df00: 0x108df00: lw    s2, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3293,7 +3293,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108d8e0: 0x108d8e0: lw    s1, 104(sp)
+// 0x0108df04: 0x108df04: lw    s1, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3302,7 +3302,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108d8e4: 0x108d8e4: lw    s0, 100(sp)
+// 0x0108df08: 0x108df08: lw    s0, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3311,7 +3311,7 @@ L_108d8c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108d8e8: 0x108d8e8: jr    ra addiu sp, sp, 136
+// 0x0108df0c: 0x108df0c: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -3323,7 +3323,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 button_callback_108d8f0(int32,int32,int32,int32,int32)
+.method public static int32 button_callback_108df14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -3358,13 +3358,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d8f0: 0x108d8f0: addiu sp, sp, -24
+// 0x0108df14: 0x108df14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d8f4: 0x108d8f4: sw    ra, 20(sp)
-// 0x0108d8f8: 0x108d8f8: jal   0x1094b64 addu  a0, zero, zero
+// 0x0108df18: 0x108df18: sw    ra, 20(sp)
+// 0x0108df1c: 0x108df1c: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3372,27 +3372,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108d900: 0x108d900: jal   0x108d470 sll   zero, zero, 0
+// 0x0108df24: 0x108df24: jal   0x108da94 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessagesDisplay_108d470(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessagesDisplay_108da94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108d908: 0x108d908: lw    ra, 20(sp)
-// 0x0108d90c: 0x108d90c: addiu v0, zero, 1
+// 0x0108df2c: 0x108df2c: lw    ra, 20(sp)
+// 0x0108df30: 0x108df30: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108d910: 0x108d910: jr    ra addiu sp, sp, 24
+// 0x0108df34: 0x108df34: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3404,7 +3404,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTSystemMessagesDisplay_Timer_108d918(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessagesDisplay_Timer_108df3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3439,26 +3439,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d918: 0x108d918: addiu sp, sp, -24
+// 0x0108df3c: 0x108df3c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108d91c: 0x108d91c: sw    ra, 20(sp)
-// 0x0108d920: 0x108d920: jal   0x108d470 sll   zero, zero, 0
+// 0x0108df40: 0x108df40: sw    ra, 20(sp)
+// 0x0108df44: 0x108df44: jal   0x108da94 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessagesDisplay_108d470(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessagesDisplay_108da94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108d928: 0x108d928: lw    ra, 20(sp)
-// 0x0108d92c: 0x108d92c: sll   zero, zero, 0
-// 0x0108d930: 0x108d930: jr    ra addiu sp, sp, 24
+// 0x0108df4c: 0x108df4c: lw    ra, 20(sp)
+// 0x0108df50: 0x108df50: sll   zero, zero, 0
+// 0x0108df54: 0x108df54: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3470,7 +3470,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RTSystemMessageQueue_Push_108d958(int32,int32,int32,int32,int32)
+.method public static int32 RTSystemMessageQueue_Push_108df7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3511,27 +3511,27 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108d958: 0x108d958: lui   v0, 0x80000
+// 0x0108df7c: 0x108df7c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108d95c: 0x108d95c: lw    v0, -2100(v0)
+// 0x0108df80: 0x108df80: lw    v0, -1636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d960: 0x108d960: addiu sp, sp, -48
+// 0x0108df84: 0x108df84: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0108d964: 0x108d964: addiu v1, zero, 20
+// 0x0108df88: 0x108df88: addiu v1, zero, 20
 	ldc.i4.s 20
 	stloc 8
-// 0x0108d968: 0x108d968: sw    s0, 36(sp)
+// 0x0108df8c: 0x108df8c: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3540,8 +3540,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108d96c: 0x108d96c: sw    ra, 44(sp)
-// 0x0108d970: 0x108d970: sw    s1, 40(sp)
+// 0x0108df90: 0x108df90: sw    ra, 44(sp)
+// 0x0108df94: 0x108df94: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3550,14 +3550,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108d974: 0x108d974: bne   v0, v1, 0x108d984 addu  s0, a0, zero
+// 0x0108df98: 0x108df98: bne   v0, v1, 0x108dfa8 addu  s0, a0, zero
 	ldloc 5
 	ldloc 8
 	ldloc.1
 	stloc 9
-	bne.un L_108d984
+	bne.un L_108dfa8
 // --- basic block ---
-// 0x0108d97c: 0x108d97c: jal   0x108d330 addu  a0, zero, zero
+// 0x0108dfa0: 0x108dfa0: jal   0x108d954 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3565,40 +3565,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::PopOldest_108d330(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::PopOldest_108d954(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_108d984:
-// 0x0108d984: 0x108d984: lui   v0, 0x80000
+L_108dfa8:
+// 0x0108dfa8: 0x108dfa8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108d988: 0x108d988: lw    v0, -2100(v0)
+// 0x0108dfac: 0x108dfac: lw    v0, -1636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108d98c: 0x108d98c: sll   zero, zero, 0
-// 0x0108d990: 0x108d990: bne   v0, zero, 0x108d9ac lui   v0, 0x80000
+// 0x0108dfb0: 0x108dfb0: sll   zero, zero, 0
+// 0x0108dfb4: 0x108dfb4: bne   v0, zero, 0x108dfd0 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_108d9ac
+	brtrue L_108dfd0
 // --- basic block ---
-// 0x0108d998: 0x108d998: lui   a1, 0x1090000
+// 0x0108dfbc: 0x108dfbc: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x0108d99c: 0x108d99c: addiu a1, a1, -9960
+// 0x0108dfc0: 0x108dfc0: addiu a1, a1, -8388
 	ldloc.2
-	ldc.i4 -9960
+	ldc.i4 -8388
 	add
 	stloc.2
-// 0x0108d9a0: 0x108d9a0: jal   0x104fe98 ori   a0, zero, 60000
+// 0x0108dfc4: 0x108dfc4: jal   0x104fea8 ori   a0, zero, 60000
 	ldc.i4.s 0
 	ldc.i4 60000
 	or
@@ -3608,35 +3608,35 @@ L_108d984:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108d9a8: 0x108d9a8: lui   v0, 0x80000
+// 0x0108dfcc: 0x108dfcc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_108d9ac:
-// 0x0108d9ac: 0x108d9ac: lw    v1, -2100(v0)
+L_108dfd0:
+// 0x0108dfd0: 0x108dfd0: lw    v1, -1636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108d9b0: 0x108d9b0: addiu a0, zero, 20
+// 0x0108dfd4: 0x108dfd4: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0108d9b4: 0x108d9b4: beq   v1, a0, 0x108da24 lui   a1, 0x0
+// 0x0108dfd8: 0x108dfd8: beq   v1, a0, 0x108e048 lui   a1, 0x0
 	ldloc 8
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	beq  L_108da24
+	beq  L_108e048
 // --- basic block ---
-// 0x0108d9bc: 0x108d9bc: lw    s1, 17360(a1)
+// 0x0108dfe0: 0x108dfe0: lw    s1, 17360(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3645,27 +3645,27 @@ L_108d9ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108d9c0: 0x108d9c0: addiu a0, zero, -1
+// 0x0108dfe4: 0x108dfe4: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0108d9c4: 0x108d9c4: bne   s1, a0, 0x108d9e0 sll   zero, zero, 0
+// 0x0108dfe8: 0x108dfe8: bne   s1, a0, 0x108e004 sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	bne.un L_108d9e0
+	bne.un L_108e004
 // --- basic block ---
-// 0x0108d9cc: 0x108d9cc: addiu v1, zero, 1
+// 0x0108dff0: 0x108dff0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0108d9d0: 0x108d9d0: sw    v1, -2100(v0)
+// 0x0108dff4: 0x108dff4: sw    v1, -1636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108d9d4: 0x108d9d4: sw    zero, 17360(a1)
+// 0x0108dff8: 0x108dff8: sw    zero, 17360(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3674,72 +3674,72 @@ L_108d9ac:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108d9d8: 0x108d9d8: j	 0x108da04 addu  s1, zero, zero
+// 0x0108dffc: 0x108dffc: j	 0x108e028 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_108da04
+	br L_108e028
 // --- basic block ---
-L_108d9e0:
-// 0x0108d9e0: 0x108d9e0: addu  s1, s1, v1
+L_108e004:
+// 0x0108e004: 0x108e004: addu  s1, s1, v1
 	ldloc 6
 	ldloc 8
 	add
 	stloc 6
-// 0x0108d9e4: 0x108d9e4: slti  a1, s1, 20
+// 0x0108e008: 0x108e008: slti  a1, s1, 20
 	ldloc 6
 	ldc.i4.s 20
 	clt
 	stloc.2
-// 0x0108d9e8: 0x108d9e8: addiu v1, v1, 1
+// 0x0108e00c: 0x108e00c: addiu v1, v1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0108d9ec: 0x108d9ec: bne   a1, zero, 0x108d9fc sw    v1, -2100(v0)
+// 0x0108e010: 0x108e010: bne   a1, zero, 0x108e020 sw    v1, -1636(v0)
 	ldloc.2
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -525
+	ldc.i4 -409
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_108d9fc
+	brtrue L_108e020
 // --- basic block ---
-// 0x0108d9f4: 0x108d9f4: j	 0x108da04 addiu s1, s1, -20
+// 0x0108e018: 0x108e018: j	 0x108e028 addiu s1, s1, -20
 	ldloc 6
 	ldc.i4.s -20
 	add
 	stloc 6
-	br L_108da04
+	br L_108e028
 // --- basic block ---
-L_108d9fc:
-// 0x0108d9fc: 0x108d9fc: beq   s1, a0, 0x108da24 sll   zero, zero, 0
+L_108e020:
+// 0x0108e020: 0x108e020: beq   s1, a0, 0x108e048 sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	beq  L_108da24
+	beq  L_108e048
 // --- basic block ---
-L_108da04:
-// 0x0108da04: 0x108da04: lui   v0, 0x80000
+L_108e028:
+// 0x0108e028: 0x108e028: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108da08: 0x108da08: addiu v0, v0, -2096
+// 0x0108e02c: 0x108e02c: addiu v0, v0, -1632
 	ldloc 5
-	ldc.i4 -2096
+	ldc.i4 -1632
 	add
 	stloc 5
-// 0x0108da0c: 0x108da0c: sll   s1, s1, 6
+// 0x0108e030: 0x108e030: sll   s1, s1, 6
 	ldloc 6
 	ldc.i4.6
 	shl
 	stloc 6
-// 0x0108da10: 0x108da10: addu  s1, v0, s1
+// 0x0108e034: 0x108e034: addu  s1, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x0108da14: 0x108da14: jal   0x108d254 addu  a0, s1, zero
+// 0x0108e038: 0x108e038: jal   0x108d878 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3747,20 +3747,20 @@ L_108da04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Init_108d254(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Init_108d878(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108da1c: 0x108da1c: j	 0x108da28 sll   zero, zero, 0
-	br L_108da28
+// 0x0108e040: 0x108e040: j	 0x108e04c sll   zero, zero, 0
+	br L_108e04c
 // --- basic block ---
-L_108da24:
-// 0x0108da24: 0x108da24: addu  s1, zero, zero
+L_108e048:
+// 0x0108e048: 0x108e048: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_108da28:
-// 0x0108da28: 0x108da28: lw    a2, 60(s0)
+L_108e04c:
+// 0x0108e04c: 0x108e04c: lw    a2, 60(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3769,14 +3769,14 @@ L_108da28:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108da2c: 0x108da2c: sll   zero, zero, 0
-// 0x0108da30: 0x108da30: beq   a2, zero, 0x108da70 addu  a0, zero, zero
+// 0x0108e050: 0x108e050: sll   zero, zero, 0
+// 0x0108e054: 0x108e054: beq   a2, zero, 0x108e094 addu  a0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_108da70
+	brfalse L_108e094
 // --- basic block ---
-// 0x0108da38: 0x108da38: jal   0x10a1918 addiu a1, zero, 1
+// 0x0108e05c: 0x108e05c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3784,18 +3784,18 @@ L_108da28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108da40: 0x108da40: bne   v0, zero, 0x108da74 addu  a0, s1, zero
+// 0x0108e064: 0x108e064: bne   v0, zero, 0x108e098 addu  a0, s1, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brtrue L_108da74
+	brtrue L_108e098
 // --- basic block ---
-// 0x0108da48: 0x108da48: lw    a1, 60(s0)
+// 0x0108e06c: 0x108e06c: lw    a1, 60(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3804,21 +3804,21 @@ L_108da28:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108da4c: 0x108da4c: lui   a3, 0x10000
+// 0x0108e070: 0x108e070: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0108da50: 0x108da50: addiu a3, a3, 18500
+// 0x0108e074: 0x108e074: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0108da54: 0x108da54: addu  a0, zero, zero
+// 0x0108e078: 0x108e078: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0108da58: 0x108da58: addu  a2, zero, zero
+// 0x0108e07c: 0x108e07c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108da5c: 0x108da5c: sw    zero, 16(sp)
+// 0x0108e080: 0x108e080: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3827,7 +3827,7 @@ L_108da28:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108da60: 0x108da60: sw    zero, 20(sp)
+// 0x0108e084: 0x108e084: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3836,7 +3836,7 @@ L_108da28:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108da64: 0x108da64: sw    zero, 24(sp)
+// 0x0108e088: 0x108e088: sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3845,7 +3845,7 @@ L_108da28:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108da68: 0x108da68: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0108e08c: 0x108e08c: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3859,20 +3859,20 @@ L_108da28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_108da70:
-// 0x0108da70: 0x108da70: addu  a0, s1, zero
+L_108e094:
+// 0x0108e094: 0x108e094: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-L_108da74:
-// 0x0108da74: 0x108da74: addu  a1, s0, zero
+L_108e098:
+// 0x0108e098: 0x108e098: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0108da78: 0x108da78: jal   0x1001800 addiu a2, zero, 64
+// 0x0108e09c: 0x108e09c: jal   0x1001800 addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -3884,8 +3884,8 @@ L_108da74:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108da80: 0x108da80: lw    ra, 44(sp)
-// 0x0108da84: 0x108da84: lw    s1, 40(sp)
+// 0x0108e0a4: 0x108e0a4: lw    ra, 44(sp)
+// 0x0108e0a8: 0x108e0a8: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3894,7 +3894,7 @@ L_108da74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108da88: 0x108da88: lw    s0, 36(sp)
+// 0x0108e0ac: 0x108e0ac: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3903,7 +3903,7 @@ L_108da74:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108da8c: 0x108da8c: jr    ra addiu sp, sp, 48
+// 0x0108e0b0: 0x108e0b0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3915,7 +3915,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_state_108da94(int32,int32,int32,int32,int32)
+.method public static int32 set_state_108e0b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3950,16 +3950,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108da94: 0x108da94: lui   a0, 0x0
+// 0x0108e0b8: 0x108e0b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108da98: 0x108da98: addiu sp, sp, -24
+// 0x0108e0bc: 0x108e0bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108da9c: 0x108da9c: sw    ra, 20(sp)
-// 0x0108daa0: 0x108daa0: jal   0x100e348 addiu a0, a0, 14928
+// 0x0108e0c0: 0x108e0c0: sw    ra, 20(sp)
+// 0x0108e0c4: 0x108e0c4: jal   0x100e358 addiu a0, a0, 14928
 	ldloc.1
 	ldc.i4 14928
 	add
@@ -3969,12 +3969,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108daa8: 0x108daa8: jal   0x108d128 addu  a0, v0, zero
+// 0x0108e0cc: 0x108e0cc: jal   0x108d74c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3982,16 +3982,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::ERTVisabilityGroup_from_string_108d128(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::ERTVisabilityGroup_from_string_108d74c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dab0: 0x108dab0: lw    ra, 20(sp)
-// 0x0108dab4: 0x108dab4: lui   v1, 0x0
+// 0x0108e0d4: 0x108e0d4: lw    ra, 20(sp)
+// 0x0108e0d8: 0x108e0d8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0108dab8: 0x108dab8: sw    v0, 17364(v1)
+// 0x0108e0dc: 0x108e0dc: sw    v0, 17364(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
@@ -4000,7 +4000,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108dabc: 0x108dabc: jr    ra addiu sp, sp, 24
+// 0x0108e0e0: 0x108e0e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4012,7 +4012,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimePrivacyInit_108dac4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimePrivacyInit_108e0e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4047,26 +4047,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108dac4: 0x108dac4: addiu sp, sp, -24
+// 0x0108e0e8: 0x108e0e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108dac8: 0x108dac8: sw    ra, 20(sp)
-// 0x0108dacc: 0x108dacc: jal   0x108da94 sll   zero, zero, 0
+// 0x0108e0ec: 0x108e0ec: sw    ra, 20(sp)
+// 0x0108e0f0: 0x108e0f0: jal   0x108e0b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::set_state_108da94(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::set_state_108e0b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108dad4: 0x108dad4: lw    ra, 20(sp)
-// 0x0108dad8: 0x108dad8: sll   zero, zero, 0
-// 0x0108dadc: 0x108dadc: jr    ra addiu sp, sp, 24
+// 0x0108e0f8: 0x108e0f8: lw    ra, 20(sp)
+// 0x0108e0fc: 0x108e0fc: sll   zero, zero, 0
+// 0x0108e100: 0x108e100: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4078,7 +4078,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 checkbox_callback_108dae4(int32,int32,int32,int32,int32)
+.method public static int32 checkbox_callback_108e108(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -4119,15 +4119,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108dae4: 0x108dae4: addiu sp, sp, -32
+// 0x0108e108: 0x108e108: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108dae8: 0x108dae8: lui   v0, 0x80000
+// 0x0108e10c: 0x108e10c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108daec: 0x108daec: sw    s0, 20(sp)
+// 0x0108e110: 0x108e110: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4136,16 +4136,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108daf0: 0x108daf0: lw    s0, -816(v0)
+// 0x0108e114: 0x108e114: lw    s0, -352(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -204
+	ldc.i4.s -88
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108daf4: 0x108daf4: sw    s1, 24(sp)
+// 0x0108e118: 0x108e118: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4154,14 +4154,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108daf8: 0x108daf8: sw    ra, 28(sp)
-// 0x0108dafc: 0x108dafc: beq   s0, zero, 0x108db44 addu  s1, a0, zero
+// 0x0108e11c: 0x108e11c: sw    ra, 28(sp)
+// 0x0108e120: 0x108e120: beq   s0, zero, 0x108e168 addu  s1, a0, zero
 	ldloc 7
 	ldloc.1
 	stloc 9
-	brfalse L_108db44
+	brfalse L_108e168
 // --- basic block ---
-// 0x0108db04: 0x108db04: lw    v0, 4(a0)
+// 0x0108e128: 0x108e128: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4170,7 +4170,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108db08: 0x108db08: lw    a1, 16(s0)
+// 0x0108e12c: 0x108e12c: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4179,7 +4179,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108db0c: 0x108db0c: lw    a0, 16(v0)
+// 0x0108e130: 0x108e130: lw    a0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4188,13 +4188,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108db10: 0x108db10: jal   0x1001b14 sll   zero, zero, 0
+// 0x0108e134: 0x108e134: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0108db18: 0x108db18: lw    v1, 180(s0)
+// 0x0108e13c: 0x108e13c: lw    v1, 180(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4203,36 +4203,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108db1c: 0x108db1c: bne   v0, zero, 0x108db30 lui   a1, 0x0
+// 0x0108e140: 0x108e140: bne   v0, zero, 0x108e154 lui   a1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_108db30
+	brtrue L_108e154
 // --- basic block ---
-// 0x0108db24: 0x108db24: addu  a0, s0, zero
+// 0x0108e148: 0x108e148: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0108db28: 0x108db28: j	 0x108db3c addiu a1, a1, 20820
+// 0x0108e14c: 0x108e14c: j	 0x108e160 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-	br L_108db3c
+	br L_108e160
 // --- basic block ---
-L_108db30:
-// 0x0108db30: 0x108db30: lui   a1, 0x20000
+L_108e154:
+// 0x0108e154: 0x108e154: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108db34: 0x108db34: addu  a0, s0, zero
+// 0x0108e158: 0x108e158: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0108db38: 0x108db38: addiu a1, a1, 9464
+// 0x0108e15c: 0x108e15c: addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-L_108db3c:
-// 0x0108db3c: 0x108db3c: jalr  v1 sll   zero, zero, 0
+L_108e160:
+// 0x0108e160: 0x108e160: jalr  v1 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -4244,25 +4244,25 @@ L_108db3c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_108db44:
-// 0x0108db44: 0x108db44: lui   v0, 0x80000
+L_108e168:
+// 0x0108e168: 0x108e168: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108db48: 0x108db48: lw    s0, -812(v0)
+// 0x0108e16c: 0x108e16c: lw    s0, -348(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -203
+	ldc.i4.s -87
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108db4c: 0x108db4c: sll   zero, zero, 0
-// 0x0108db50: 0x108db50: beq   s0, zero, 0x108db98 sll   zero, zero, 0
+// 0x0108e170: 0x108e170: sll   zero, zero, 0
+// 0x0108e174: 0x108e174: beq   s0, zero, 0x108e1bc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_108db98
+	brfalse L_108e1bc
 // --- basic block ---
-// 0x0108db58: 0x108db58: lw    v0, 4(s1)
+// 0x0108e17c: 0x108e17c: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4271,7 +4271,7 @@ L_108db44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108db5c: 0x108db5c: lw    a1, 16(s0)
+// 0x0108e180: 0x108e180: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4280,7 +4280,7 @@ L_108db44:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108db60: 0x108db60: lw    a0, 16(v0)
+// 0x0108e184: 0x108e184: lw    a0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4289,13 +4289,13 @@ L_108db44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108db64: 0x108db64: jal   0x1001b14 sll   zero, zero, 0
+// 0x0108e188: 0x108e188: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0108db6c: 0x108db6c: lw    v1, 180(s0)
+// 0x0108e190: 0x108e190: lw    v1, 180(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4304,36 +4304,36 @@ L_108db44:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108db70: 0x108db70: beq   v0, zero, 0x108db84 lui   a1, 0x20000
+// 0x0108e194: 0x108e194: beq   v0, zero, 0x108e1a8 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108db84
+	brfalse L_108e1a8
 // --- basic block ---
-// 0x0108db78: 0x108db78: addu  a0, s0, zero
+// 0x0108e19c: 0x108e19c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0108db7c: 0x108db7c: j	 0x108db90 addiu a1, a1, 9464
+// 0x0108e1a0: 0x108e1a0: j	 0x108e1b4 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-	br L_108db90
+	br L_108e1b4
 // --- basic block ---
-L_108db84:
-// 0x0108db84: 0x108db84: lui   a1, 0x0
+L_108e1a8:
+// 0x0108e1a8: 0x108e1a8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108db88: 0x108db88: addu  a0, s0, zero
+// 0x0108e1ac: 0x108e1ac: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0108db8c: 0x108db8c: addiu a1, a1, 20820
+// 0x0108e1b0: 0x108e1b0: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-L_108db90:
-// 0x0108db90: 0x108db90: jalr  v1 sll   zero, zero, 0
+L_108e1b4:
+// 0x0108e1b4: 0x108e1b4: jalr  v1 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -4345,12 +4345,12 @@ L_108db90:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_108db98:
-// 0x0108db98: 0x108db98: lw    ra, 28(sp)
-// 0x0108db9c: 0x108db9c: addiu v0, zero, 1
+L_108e1bc:
+// 0x0108e1bc: 0x108e1bc: lw    ra, 28(sp)
+// 0x0108e1c0: 0x108e1c0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108dba0: 0x108dba0: lw    s1, 24(sp)
+// 0x0108e1c4: 0x108e1c4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4359,7 +4359,7 @@ L_108db98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108dba4: 0x108dba4: lw    s0, 20(sp)
+// 0x0108e1c8: 0x108e1c8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4368,7 +4368,7 @@ L_108db98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108dba8: 0x108dba8: jr    ra addiu sp, sp, 32
+// 0x0108e1cc: 0x108e1cc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4380,7 +4380,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimePrivacyState_108dbb0(int32,int32,int32,int32,int32)
+.method public static int32 RealtimePrivacyState_108e1d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4415,33 +4415,33 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108dbb0: 0x108dbb0: addiu sp, sp, -24
+// 0x0108e1d4: 0x108e1d4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108dbb4: 0x108dbb4: sw    ra, 20(sp)
-// 0x0108dbb8: 0x108dbb8: jal   0x106c170 sll   zero, zero, 0
+// 0x0108e1d8: 0x108e1d8: sw    ra, 20(sp)
+// 0x0108e1dc: 0x108e1dc: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dbc0: 0x108dbc0: beq   v0, zero, 0x108dbd0 addu  v1, zero, zero
+// 0x0108e1e4: 0x108e1e4: beq   v0, zero, 0x108e1f4 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_108dbd0
+	brfalse L_108e1f4
 // --- basic block ---
-// 0x0108dbc8: 0x108dbc8: lui   v0, 0x0
+// 0x0108e1ec: 0x108e1ec: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0108dbcc: 0x108dbcc: lw    v1, 17364(v0)
+// 0x0108e1f0: 0x108e1f0: lw    v1, 17364(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -4450,12 +4450,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-L_108dbd0:
-// 0x0108dbd0: 0x108dbd0: lw    ra, 20(sp)
-// 0x0108dbd4: 0x108dbd4: addu  v0, v1, zero
+L_108e1f4:
+// 0x0108e1f4: 0x108e1f4: lw    ra, 20(sp)
+// 0x0108e1f8: 0x108e1f8: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0108dbd8: 0x108dbd8: jr    ra addiu sp, sp, 24
+// 0x0108e1fc: 0x108e1fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4467,7 +4467,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 update_checked_108dbe0(int32,int32,int32,int32,int32)
+.method public static int32 update_checked_108e204(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -4505,12 +4505,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108dbe0: 0x108dbe0: addiu sp, sp, -24
+// 0x0108e204: 0x108e204: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108dbe4: 0x108dbe4: sw    s0, 16(sp)
+// 0x0108e208: 0x108e208: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4519,27 +4519,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108dbe8: 0x108dbe8: lui   s0, 0x80000
+// 0x0108e20c: 0x108e20c: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0108dbec: 0x108dbec: lw    v0, -816(s0)
+// 0x0108e210: 0x108e210: lw    v0, -352(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -204
+	ldc.i4.s -88
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108dbf0: 0x108dbf0: sll   zero, zero, 0
-// 0x0108dbf4: 0x108dbf4: beq   v0, zero, 0x108dc94 sw    ra, 20(sp)
+// 0x0108e214: 0x108e214: sll   zero, zero, 0
+// 0x0108e218: 0x108e218: beq   v0, zero, 0x108e2b8 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_108dc94
+	brfalse L_108e2b8
 // --- basic block ---
-// 0x0108dbfc: 0x108dbfc: lui   v0, 0x0
+// 0x0108e220: 0x108e220: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0108dc00: 0x108dc00: lw    a0, 17364(v0)
+// 0x0108e224: 0x108e224: lw    a0, 17364(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -4548,24 +4548,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108dc04: 0x108dc04: jal   0x108d050 sll   zero, zero, 0
+// 0x0108e228: 0x108e228: jal   0x108d674 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl105::ERTVisabilityGroup_to_string_108d050(int32)
+	call int32 Cibyl105::ERTVisabilityGroup_to_string_108d674(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108dc0c: 0x108dc0c: lw    v1, -816(s0)
+// 0x0108e230: 0x108e230: lw    v1, -352(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -204
+	ldc.i4.s -88
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108dc10: 0x108dc10: addu  a0, v0, zero
+// 0x0108e234: 0x108e234: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108dc14: 0x108dc14: lw    s0, 16(v1)
+// 0x0108e238: 0x108e238: lw    s0, 16(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
@@ -4574,7 +4574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108dc18: 0x108dc18: jal   0x1001b14 addu  a1, s0, zero
+// 0x0108e23c: 0x108e23c: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -4582,47 +4582,47 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108dc20: 0x108dc20: beq   v0, zero, 0x108dc34 addu  a0, s0, zero
+// 0x0108e244: 0x108e244: beq   v0, zero, 0x108e258 addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_108dc34
+	brfalse L_108e258
 // --- basic block ---
-// 0x0108dc28: 0x108dc28: lui   a1, 0x20000
+// 0x0108e24c: 0x108e24c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108dc2c: 0x108dc2c: j	 0x108dc3c addiu a1, a1, 9464
+// 0x0108e250: 0x108e250: j	 0x108e260 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-	br L_108dc3c
+	br L_108e260
 // --- basic block ---
-L_108dc34:
-// 0x0108dc34: 0x108dc34: lui   a1, 0x0
+L_108e258:
+// 0x0108e258: 0x108e258: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108dc38: 0x108dc38: addiu a1, a1, 20820
+// 0x0108e25c: 0x108e25c: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-L_108dc3c:
-// 0x0108dc3c: 0x108dc3c: jal   0x1094734 sll   zero, zero, 0
+L_108e260:
+// 0x0108e260: 0x108e260: jal   0x1094d58 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dc44: 0x108dc44: lui   v0, 0x0
+// 0x0108e268: 0x108e268: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0108dc48: 0x108dc48: lw    a0, 17364(v0)
+// 0x0108e26c: 0x108e26c: lw    a0, 17364(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -4631,27 +4631,27 @@ L_108dc3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108dc4c: 0x108dc4c: jal   0x108d050 sll   zero, zero, 0
+// 0x0108e270: 0x108e270: jal   0x108d674 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl105::ERTVisabilityGroup_to_string_108d050(int32)
+	call int32 Cibyl105::ERTVisabilityGroup_to_string_108d674(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108dc54: 0x108dc54: lui   v1, 0x80000
+// 0x0108e278: 0x108e278: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108dc58: 0x108dc58: lw    v1, -812(v1)
+// 0x0108e27c: 0x108e27c: lw    v1, -348(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -203
+	ldc.i4.s -87
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108dc5c: 0x108dc5c: addu  a0, v0, zero
+// 0x0108e280: 0x108e280: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108dc60: 0x108dc60: lw    s0, 16(v1)
+// 0x0108e284: 0x108e284: lw    s0, 16(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
@@ -4660,7 +4660,7 @@ L_108dc3c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108dc64: 0x108dc64: jal   0x1001b14 addu  a1, s0, zero
+// 0x0108e288: 0x108e288: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -4668,49 +4668,49 @@ L_108dc3c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108dc6c: 0x108dc6c: bne   v0, zero, 0x108dc80 lui   a1, 0x0
+// 0x0108e290: 0x108e290: bne   v0, zero, 0x108e2a4 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_108dc80
+	brtrue L_108e2a4
 // --- basic block ---
-// 0x0108dc74: 0x108dc74: addu  a0, s0, zero
+// 0x0108e298: 0x108e298: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0108dc78: 0x108dc78: j	 0x108dc8c addiu a1, a1, 20820
+// 0x0108e29c: 0x108e29c: j	 0x108e2b0 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-	br L_108dc8c
+	br L_108e2b0
 // --- basic block ---
-L_108dc80:
-// 0x0108dc80: 0x108dc80: lui   a1, 0x20000
+L_108e2a4:
+// 0x0108e2a4: 0x108e2a4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108dc84: 0x108dc84: addu  a0, s0, zero
+// 0x0108e2a8: 0x108e2a8: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0108dc88: 0x108dc88: addiu a1, a1, 9464
+// 0x0108e2ac: 0x108e2ac: addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-L_108dc8c:
-// 0x0108dc8c: 0x108dc8c: jal   0x1094734 sll   zero, zero, 0
+L_108e2b0:
+// 0x0108e2b0: 0x108e2b0: jal   0x1094d58 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108dc94:
-// 0x0108dc94: 0x108dc94: lw    ra, 20(sp)
-// 0x0108dc98: 0x108dc98: lw    s0, 16(sp)
+L_108e2b8:
+// 0x0108e2b8: 0x108e2b8: lw    ra, 20(sp)
+// 0x0108e2bc: 0x108e2bc: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4719,7 +4719,7 @@ L_108dc94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108dc9c: 0x108dc9c: jr    ra addiu sp, sp, 24
+// 0x0108e2c0: 0x108e2c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4731,7 +4731,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimePrivacySettings_108dca4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimePrivacySettings_108e2c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s3,int32 s4,int32 s5,int32 s1,int32 s7,int32 t0,int32 s2,int32 t1,int32 t2,int32 t3,int32 s6,int32 s8,int32 ra)
@@ -4805,14 +4805,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108dca4:
-// 0x0108dca4: 0x108dca4: addiu sp, sp, -104
+L_108e2c8:
+// 0x0108e2c8: 0x108e2c8: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x0108dca8: 0x108dca8: sw    ra, 100(sp)
-// 0x0108dcac: 0x108dcac: sw    s8, 96(sp)
+// 0x0108e2cc: 0x108e2cc: sw    ra, 100(sp)
+// 0x0108e2d0: 0x108e2d0: sw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4821,7 +4821,7 @@ L_108dca4:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0108dcb0: 0x108dcb0: sw    s7, 92(sp)
+// 0x0108e2d4: 0x108e2d4: sw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4830,7 +4830,7 @@ L_108dca4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108dcb4: 0x108dcb4: sw    s6, 88(sp)
+// 0x0108e2d8: 0x108e2d8: sw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4839,7 +4839,7 @@ L_108dca4:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0108dcb8: 0x108dcb8: sw    s5, 84(sp)
+// 0x0108e2dc: 0x108e2dc: sw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4848,7 +4848,7 @@ L_108dca4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108dcbc: 0x108dcbc: sw    s4, 80(sp)
+// 0x0108e2e0: 0x108e2e0: sw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4857,7 +4857,7 @@ L_108dca4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108dcc0: 0x108dcc0: sw    s3, 76(sp)
+// 0x0108e2e4: 0x108e2e4: sw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4866,7 +4866,7 @@ L_108dca4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108dcc4: 0x108dcc4: sw    s2, 72(sp)
+// 0x0108e2e8: 0x108e2e8: sw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4875,7 +4875,7 @@ L_108dca4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0108dcc8: 0x108dcc8: sw    s1, 68(sp)
+// 0x0108e2ec: 0x108e2ec: sw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4884,7 +4884,7 @@ L_108dca4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108dccc: 0x108dccc: jal   0x108da94 sw    s0, 64(sp)
+// 0x0108e2f0: 0x108e2f0: jal   0x108e0b8 sw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4898,20 +4898,20 @@ L_108dca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::set_state_108da94(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::set_state_108e0b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dcd4: 0x108dcd4: lui   a0, 0x20000
+// 0x0108e2f8: 0x108e2f8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108dcd8: 0x108dcd8: addiu a0, a0, -6608
+// 0x0108e2fc: 0x108e2fc: addiu a0, a0, -6144
 	ldloc.1
-	ldc.i4 -6608
+	ldc.i4 -6144
 	add
 	stloc.1
-// 0x0108dcdc: 0x108dcdc: jal   0x1095eec addu  a1, zero, zero
+// 0x0108e300: 0x108e300: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4919,33 +4919,33 @@ L_108dca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dce4: 0x108dce4: bne   v0, zero, 0x108e110 sll   zero, zero, 0
+// 0x0108e308: 0x108e308: bne   v0, zero, 0x108e734 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_108e110
+	brtrue L_108e734
 // --- basic block ---
-// 0x0108dcec: 0x108dcec: jal   0x101fa28 addiu s4, zero, 24
+// 0x0108e310: 0x108e310: jal   0x101fa38 addiu s4, zero, 24
 	ldc.i4.s 24
 	stloc 10
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0108dcf4: 0x108dcf4: beq   v0, zero, 0x108dd00 sll   zero, zero, 0
+// 0x0108e318: 0x108e318: beq   v0, zero, 0x108e324 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108dd00
+	brfalse L_108e324
 // --- basic block ---
-// 0x0108dcfc: 0x108dcfc: addiu s4, zero, 60
+// 0x0108e320: 0x108e320: addiu s4, zero, 60
 	ldc.i4.s 60
 	stloc 10
-L_108dd00:
-// 0x0108dd00: 0x108dd00: lui   a0, 0x10000
+L_108e324:
+// 0x0108e324: 0x108e324: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108dd04: 0x108dd04: jal   0x101cd60 addiu a0, a0, -18620
+// 0x0108e328: 0x108e328: jal   0x101cd70 addiu a0, a0, -18620
 	ldloc.1
 	ldc.i4 -18620
 	add
@@ -4955,34 +4955,34 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dd0c: 0x108dd0c: lui   t3, 0x20000
+// 0x0108e330: 0x108e330: lui   t3, 0x20000
 	ldc.i4 131072
 	stloc 18
-// 0x0108dd10: 0x108dd10: lui   a2, 0x1090000
+// 0x0108e334: 0x108e334: lui   a2, 0x1090000
 	ldc.i4 17367040
 	stloc.3
-// 0x0108dd14: 0x108dd14: addiu a0, t3, -6608
+// 0x0108e338: 0x108e338: addiu a0, t3, -6144
 	ldloc 18
-	ldc.i4 -6608
+	ldc.i4 -6144
 	add
 	stloc.1
-// 0x0108dd18: 0x108dd18: addu  a1, v0, zero
+// 0x0108e33c: 0x108e33c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108dd1c: 0x108dd1c: addiu a2, a2, -7580
+// 0x0108e340: 0x108e340: addiu a2, a2, -6008
 	ldloc.3
-	ldc.i4 -7580
+	ldc.i4 -6008
 	add
 	stloc.3
-// 0x0108dd20: 0x108dd20: addiu a3, zero, 8192
+// 0x0108e344: 0x108e344: addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
-// 0x0108dd24: 0x108dd24: jal   0x1095a08 sw    t3, 56(sp)
+// 0x0108e348: 0x108e348: jal   0x1096050 sw    t3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4996,35 +4996,35 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dd2c: 0x108dd2c: lui   a0, 0x20000
+// 0x0108e350: 0x108e350: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108dd30: 0x108dd30: addu  a1, zero, zero
+// 0x0108e354: 0x108e354: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108dd34: 0x108dd34: addiu a2, zero, -1
+// 0x0108e358: 0x108e358: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108dd38: 0x108dd38: addiu a3, zero, -1
+// 0x0108e35c: 0x108e35c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0108dd3c: 0x108dd3c: addiu s3, zero, 136
+// 0x0108e360: 0x108e360: addiu s3, zero, 136
 	ldc.i4 136
 	stloc 9
-// 0x0108dd40: 0x108dd40: addiu a0, a0, -6592
+// 0x0108e364: 0x108e364: addiu a0, a0, -6128
 	ldloc.1
-	ldc.i4 -6592
+	ldc.i4 -6128
 	add
 	stloc.1
-// 0x0108dd44: 0x108dd44: addu  s2, v0, zero
+// 0x0108e368: 0x108e368: addu  s2, v0, zero
 	ldloc 5
 	stloc 15
-// 0x0108dd48: 0x108dd48: jal   0x1093a24 sw    s3, 16(sp)
+// 0x0108e36c: 0x108e36c: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5038,23 +5038,23 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dd50: 0x108dd50: lui   a0, 0x20000
+// 0x0108e374: 0x108e374: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108dd54: 0x108dd54: addiu a0, a0, -6568
+// 0x0108e378: 0x108e378: addiu a0, a0, -6104
 	ldloc.1
-	ldc.i4 -6568
+	ldc.i4 -6104
 	add
 	stloc.1
-// 0x0108dd58: 0x108dd58: addu  s0, v0, zero
+// 0x0108e37c: 0x108e37c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108dd5c: 0x108dd5c: jal   0x101cd60 lui   s5, 0x100000
+// 0x0108e380: 0x108e380: jal   0x101cd70 lui   s5, 0x100000
 	ldc.i4 1048576
 	stloc 11
 	ldloc.0
@@ -5062,28 +5062,28 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dd64: 0x108dd64: lui   a0, 0x20000
+// 0x0108e388: 0x108e388: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108dd68: 0x108dd68: ori   a3, s5, 4240
+// 0x0108e38c: 0x108e38c: ori   a3, s5, 4240
 	ldloc 11
 	ldc.i4 4240
 	or
 	stloc 4
-// 0x0108dd6c: 0x108dd6c: addiu a2, zero, 12
+// 0x0108e390: 0x108e390: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0108dd70: 0x108dd70: addiu a0, a0, -6508
+// 0x0108e394: 0x108e394: addiu a0, a0, -6044
 	ldloc.1
-	ldc.i4 -6508
+	ldc.i4 -6044
 	add
 	stloc.1
-// 0x0108dd74: 0x108dd74: jal   0x1098d10 addu  a1, v0, zero
+// 0x0108e398: 0x108e398: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5091,78 +5091,78 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dd7c: 0x108dd7c: addu  a1, v0, zero
+// 0x0108e3a0: 0x108e3a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108dd80: 0x108dd80: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e3a4: 0x108e3a4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dd88: 0x108dd88: addu  a0, s0, zero
+// 0x0108e3ac: 0x108e3ac: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108dd8c: 0x108dd8c: addu  a1, zero, zero
+// 0x0108e3b0: 0x108e3b0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108dd90: 0x108dd90: jal   0x1098fe0 addu  a2, zero, zero
+// 0x0108e3b4: 0x108e3b4: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108dd98: 0x108dd98: addu  a0, s0, zero
+// 0x0108e3bc: 0x108e3bc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108dd9c: 0x108dd9c: addu  a1, zero, zero
+// 0x0108e3c0: 0x108e3c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108dda0: 0x108dda0: jal   0x1098fe0 addu  a2, zero, zero
+// 0x0108e3c4: 0x108e3c4: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108dda8: 0x108dda8: lui   a0, 0x20000
+// 0x0108e3cc: 0x108e3cc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108ddac: 0x108ddac: lui   v0, 0x41000000
+// 0x0108e3d0: 0x108e3d0: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x0108ddb0: 0x108ddb0: addiu a2, zero, -1
+// 0x0108e3d4: 0x108e3d4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108ddb4: 0x108ddb4: addiu a3, zero, -1
+// 0x0108e3d8: 0x108e3d8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0108ddb8: 0x108ddb8: addiu a0, a0, -6484
+// 0x0108e3dc: 0x108e3dc: addiu a0, a0, -6020
 	ldloc.1
-	ldc.i4 -6484
+	ldc.i4 -6020
 	add
 	stloc.1
-// 0x0108ddbc: 0x108ddbc: addu  a1, zero, zero
+// 0x0108e3e0: 0x108e3e0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ddc0: 0x108ddc0: ori   v0, v0, 20608
+// 0x0108e3e4: 0x108e3e4: ori   v0, v0, 20608
 	ldloc 5
 	ldc.i4 20608
 	or
 	stloc 5
-// 0x0108ddc4: 0x108ddc4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0108e3e8: 0x108e3e8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5176,45 +5176,45 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108ddcc: 0x108ddcc: addu  a0, v0, zero
+// 0x0108e3f0: 0x108e3f0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108ddd0: 0x108ddd0: addu  a1, s0, zero
+// 0x0108e3f4: 0x108e3f4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0108ddd4: 0x108ddd4: jal   0x1098ec4 addu  s1, v0, zero
+// 0x0108e3f8: 0x108e3f8: jal   0x109950c addu  s1, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dddc: 0x108dddc: lui   a0, 0x20000
+// 0x0108e400: 0x108e400: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108dde0: 0x108dde0: addu  a1, zero, zero
+// 0x0108e404: 0x108e404: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108dde4: 0x108dde4: addiu a2, zero, -1
+// 0x0108e408: 0x108e408: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108dde8: 0x108dde8: addiu a3, zero, 22
+// 0x0108e40c: 0x108e40c: addiu a3, zero, 22
 	ldc.i4.s 22
 	stloc 4
-// 0x0108ddec: 0x108ddec: addiu a0, a0, -6468
+// 0x0108e410: 0x108e410: addiu a0, a0, -6004
 	ldloc.1
-	ldc.i4 -6468
+	ldc.i4 -6004
 	add
 	stloc.1
-// 0x0108ddf0: 0x108ddf0: jal   0x1093a24 sw    s3, 16(sp)
+// 0x0108e414: 0x108e414: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5228,20 +5228,20 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108ddf8: 0x108ddf8: lui   a0, 0x20000
+// 0x0108e41c: 0x108e41c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108ddfc: 0x108ddfc: addiu a0, a0, -6444
+// 0x0108e420: 0x108e420: addiu a0, a0, -5980
 	ldloc.1
-	ldc.i4 -6444
+	ldc.i4 -5980
 	add
 	stloc.1
-// 0x0108de00: 0x108de00: jal   0x101cd60 addu  s0, v0, zero
+// 0x0108e424: 0x108e424: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5249,26 +5249,26 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108de08: 0x108de08: lui   a0, 0x20000
+// 0x0108e42c: 0x108e42c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108de0c: 0x108de0c: addiu a3, zero, 4248
+// 0x0108e430: 0x108e430: addiu a3, zero, 4248
 	ldc.i4 4248
 	stloc 4
-// 0x0108de10: 0x108de10: addiu a2, zero, 12
+// 0x0108e434: 0x108e434: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0108de14: 0x108de14: addiu a0, a0, -6428
+// 0x0108e438: 0x108e438: addiu a0, a0, -5964
 	ldloc.1
-	ldc.i4 -6428
+	ldc.i4 -5964
 	add
 	stloc.1
-// 0x0108de18: 0x108de18: jal   0x1098d10 addu  a1, v0, zero
+// 0x0108e43c: 0x108e43c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5276,33 +5276,33 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108de20: 0x108de20: addu  a1, v0, zero
+// 0x0108e444: 0x108e444: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108de24: 0x108de24: addu  a0, s0, zero
+// 0x0108e448: 0x108e448: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108de28: 0x108de28: jal   0x1098ec4 lui   s3, 0x0
+// 0x0108e44c: 0x108e44c: jal   0x109950c lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108de30: 0x108de30: addiu a0, s3, 32244
+// 0x0108e454: 0x108e454: addiu a0, s3, 32244
 	ldloc 9
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x0108de34: 0x108de34: jal   0x109e6d0 addiu a1, zero, 512
+// 0x0108e458: 0x108e458: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -5310,77 +5310,77 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108de3c: 0x108de3c: addu  a1, v0, zero
+// 0x0108e460: 0x108e460: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108de40: 0x108de40: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e464: 0x108e464: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108de48: 0x108de48: addu  a0, s0, zero
+// 0x0108e46c: 0x108e46c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108de4c: 0x108de4c: addu  a2, zero, zero
+// 0x0108e470: 0x108e470: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108de50: 0x108de50: jal   0x1098fe0 addu  a1, zero, zero
+// 0x0108e474: 0x108e474: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108de58: 0x108de58: addu  a1, s0, zero
+// 0x0108e47c: 0x108e47c: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0108de5c: 0x108de5c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0108e480: 0x108e480: jal   0x109950c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108de64: 0x108de64: lui   a0, 0x20000
+// 0x0108e488: 0x108e488: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108de68: 0x108de68: ori   t1, s5, 136
+// 0x0108e48c: 0x108e48c: ori   t1, s5, 136
 	ldloc 11
 	ldc.i4 136
 	or
 	stloc 16
-// 0x0108de6c: 0x108de6c: addu  a3, s4, zero
+// 0x0108e490: 0x108e490: addu  a3, s4, zero
 	ldloc 10
 	stloc 4
-// 0x0108de70: 0x108de70: lui   t0, 0x0
+// 0x0108e494: 0x108e494: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x0108de74: 0x108de74: addiu a0, a0, -6404
+// 0x0108e498: 0x108e498: addiu a0, a0, -5940
 	ldloc.1
-	ldc.i4 -6404
+	ldc.i4 -5940
 	add
 	stloc.1
-// 0x0108de78: 0x108de78: addu  a1, zero, zero
+// 0x0108e49c: 0x108e49c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108de7c: 0x108de7c: addiu a2, zero, -1
+// 0x0108e4a0: 0x108e4a0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108de80: 0x108de80: sw    t1, 16(sp)
+// 0x0108e4a4: 0x108e4a4: sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5389,7 +5389,7 @@ L_108dd00:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0108de84: 0x108de84: sw    t1, 40(sp)
+// 0x0108e4a8: 0x108e4a8: sw    t1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5398,7 +5398,7 @@ L_108dd00:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0108de88: 0x108de88: jal   0x1093a24 sw    t0, 52(sp)
+// 0x0108e4ac: 0x108e4ac: jal   0x1094048 sw    t0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5412,12 +5412,12 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108de90: 0x108de90: lw    t0, 52(sp)
+// 0x0108e4b4: 0x108e4b4: lw    t0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5426,10 +5426,10 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108de94: 0x108de94: lui   v1, 0x1090000
+// 0x0108e4b8: 0x108e4b8: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 6
-// 0x0108de98: 0x108de98: lw    a1, 17364(t0)
+// 0x0108e4bc: 0x108e4bc: lw    a1, 17364(t0)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -5438,36 +5438,36 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108de9c: 0x108de9c: lui   s5, 0x10000
+// 0x0108e4c0: 0x108e4c0: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0108dea0: 0x108dea0: xori  a1, a1, 2
+// 0x0108e4c4: 0x108e4c4: xori  a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	xor
 	stloc.2
-// 0x0108dea4: 0x108dea4: addiu a3, v1, -9500
+// 0x0108e4c8: 0x108e4c8: addiu a3, v1, -7928
 	ldloc 6
-	ldc.i4 -9500
+	ldc.i4 -7928
 	add
 	stloc 4
-// 0x0108dea8: 0x108dea8: addiu a2, zero, 16
+// 0x0108e4cc: 0x108e4cc: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0108deac: 0x108deac: sltiu a1, a1, 1
+// 0x0108e4d0: 0x108e4d0: sltiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x0108deb0: 0x108deb0: addiu s8, zero, 1
+// 0x0108e4d4: 0x108e4d4: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 20
-// 0x0108deb4: 0x108deb4: addiu a0, s5, 31740
+// 0x0108e4d8: 0x108e4d8: addiu a0, s5, 32204
 	ldloc 11
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.1
-// 0x0108deb8: 0x108deb8: sw    v1, 44(sp)
+// 0x0108e4dc: 0x108e4dc: sw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5476,10 +5476,10 @@ L_108dd00:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108debc: 0x108debc: addu  s0, v0, zero
+// 0x0108e4e0: 0x108e4e0: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108dec0: 0x108dec0: sw    zero, 16(sp)
+// 0x0108e4e4: 0x108e4e4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5488,7 +5488,7 @@ L_108dd00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108dec4: 0x108dec4: sw    zero, 20(sp)
+// 0x0108e4e8: 0x108e4e8: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5497,7 +5497,7 @@ L_108dd00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108dec8: 0x108dec8: jal   0x109c14c sw    s8, 24(sp)
+// 0x0108e4ec: 0x108e4ec: jal   0x109c794 sw    s8, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5511,65 +5511,65 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108ded0: 0x108ded0: addu  a1, v0, zero
+// 0x0108e4f4: 0x108e4f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108ded4: 0x108ded4: addu  a0, s0, zero
+// 0x0108e4f8: 0x108e4f8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108ded8: 0x108ded8: lui   s7, 0x80000
+// 0x0108e4fc: 0x108e4fc: lui   s7, 0x80000
 	ldc.i4 524288
 	stloc 13
-// 0x0108dedc: 0x108dedc: jal   0x1098ec4 sw    v0, -816(s7)
+// 0x0108e500: 0x108e500: jal   0x109950c sw    v0, -352(s7)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -204
+	ldc.i4.s -88
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dee4: 0x108dee4: lui   v0, 0x20000
+// 0x0108e508: 0x108e508: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0108dee8: 0x108dee8: addiu v0, v0, -6388
+// 0x0108e50c: 0x108e50c: addiu v0, v0, -5924
 	ldloc 5
-	ldc.i4 -6388
+	ldc.i4 -5924
 	add
 	stloc 5
-// 0x0108deec: 0x108deec: addiu s6, sp, 32
+// 0x0108e510: 0x108e510: addiu s6, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 19
-// 0x0108def0: 0x108def0: addiu t2, zero, 16
+// 0x0108e514: 0x108e514: addiu t2, zero, 16
 	ldc.i4.s 16
 	stloc 17
-// 0x0108def4: 0x108def4: addiu a3, zero, 1
+// 0x0108e518: 0x108e518: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0108def8: 0x108def8: addu  a2, s6, zero
+// 0x0108e51c: 0x108e51c: addu  a2, s6, zero
 	ldloc 19
 	stloc.3
-// 0x0108defc: 0x108defc: addu  a0, v0, zero
+// 0x0108e520: 0x108e520: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108df00: 0x108df00: addu  a1, v0, zero
+// 0x0108e524: 0x108e524: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108df04: 0x108df04: sw    t2, 16(sp)
+// 0x0108e528: 0x108e528: sw    t2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5578,7 +5578,7 @@ L_108dd00:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0108df08: 0x108df08: sw    t2, 48(sp)
+// 0x0108e52c: 0x108e52c: sw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5587,7 +5587,7 @@ L_108dd00:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0108df0c: 0x108df0c: sw    v0, 32(sp)
+// 0x0108e530: 0x108e530: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5596,7 +5596,7 @@ L_108dd00:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108df10: 0x108df10: sw    zero, 36(sp)
+// 0x0108e534: 0x108e534: sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5605,7 +5605,7 @@ L_108dd00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108df14: 0x108df14: jal   0x1090ecc sw    zero, 20(sp)
+// 0x0108e538: 0x108e538: jal   0x10914f0 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5619,54 +5619,54 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df1c: 0x108df1c: addu  a1, v0, zero
+// 0x0108e540: 0x108e540: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108df20: 0x108df20: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e544: 0x108e544: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df28: 0x108df28: addu  a2, zero, zero
+// 0x0108e54c: 0x108e54c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108df2c: 0x108df2c: addu  a0, s0, zero
+// 0x0108e550: 0x108e550: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108df30: 0x108df30: jal   0x1098fe0 addu  a1, zero, zero
+// 0x0108e554: 0x108e554: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108df38: 0x108df38: addu  a1, s0, zero
+// 0x0108e55c: 0x108e55c: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0108df3c: 0x108df3c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0108e560: 0x108e560: jal   0x109950c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df44: 0x108df44: jal   0x101cd60 addiu a0, s5, 31740
+// 0x0108e568: 0x108e568: jal   0x101cd70 addiu a0, s5, 32204
 	ldloc 11
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.1
 	ldloc.0
@@ -5674,23 +5674,23 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df4c: 0x108df4c: addu  a1, v0, zero
+// 0x0108e570: 0x108e570: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108df50: 0x108df50: addiu a3, zero, 144
+// 0x0108e574: 0x108e574: addiu a3, zero, 144
 	ldc.i4 144
 	stloc 4
-// 0x0108df54: 0x108df54: addiu a2, zero, 12
+// 0x0108e578: 0x108e578: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0108df58: 0x108df58: jal   0x1098d10 addiu a0, s5, 31740
+// 0x0108e57c: 0x108e57c: jal   0x1099358 addiu a0, s5, 32204
 	ldloc 11
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.1
 	ldloc.0
@@ -5698,36 +5698,36 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df60: 0x108df60: addu  a1, v0, zero
+// 0x0108e584: 0x108e584: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108df64: 0x108df64: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e588: 0x108e588: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df6c: 0x108df6c: lui   a0, 0x20000
+// 0x0108e590: 0x108e590: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108df70: 0x108df70: addiu a0, a0, -6368
+// 0x0108e594: 0x108e594: addiu a0, a0, -5904
 	ldloc.1
-	ldc.i4 -6368
+	ldc.i4 -5904
 	add
 	stloc.1
-// 0x0108df74: 0x108df74: addiu a2, zero, 16
+// 0x0108e598: 0x108e598: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0108df78: 0x108df78: jal   0x109e13c addu  a1, a0, zero
+// 0x0108e59c: 0x108e59c: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -5735,30 +5735,30 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df80: 0x108df80: addu  a1, v0, zero
+// 0x0108e5a4: 0x108e5a4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108df84: 0x108df84: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e5a8: 0x108e5a8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df8c: 0x108df8c: addiu a0, s3, 32244
+// 0x0108e5b0: 0x108e5b0: addiu a0, s3, 32244
 	ldloc 9
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x0108df90: 0x108df90: jal   0x109e6d0 addiu a1, zero, 512
+// 0x0108e5b4: 0x108e5b4: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -5766,25 +5766,25 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108df98: 0x108df98: addu  a1, v0, zero
+// 0x0108e5bc: 0x108e5bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108df9c: 0x108df9c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e5c0: 0x108e5c0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dfa4: 0x108dfa4: lw    t1, 40(sp)
+// 0x0108e5c8: 0x108e5c8: lw    t1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5793,24 +5793,24 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0108dfa8: 0x108dfa8: lui   a0, 0x20000
+// 0x0108e5cc: 0x108e5cc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108dfac: 0x108dfac: addu  a3, s4, zero
+// 0x0108e5d0: 0x108e5d0: addu  a3, s4, zero
 	ldloc 10
 	stloc 4
-// 0x0108dfb0: 0x108dfb0: addiu a0, a0, -6352
+// 0x0108e5d4: 0x108e5d4: addiu a0, a0, -5888
 	ldloc.1
-	ldc.i4 -6352
+	ldc.i4 -5888
 	add
 	stloc.1
-// 0x0108dfb4: 0x108dfb4: addu  a1, zero, zero
+// 0x0108e5d8: 0x108e5d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108dfb8: 0x108dfb8: addiu a2, zero, -1
+// 0x0108e5dc: 0x108e5dc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108dfbc: 0x108dfbc: jal   0x1093a24 sw    t1, 16(sp)
+// 0x0108e5e0: 0x108e5e0: jal   0x1094048 sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5824,12 +5824,12 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dfc4: 0x108dfc4: lw    t0, 52(sp)
+// 0x0108e5e8: 0x108e5e8: lw    t0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5838,7 +5838,7 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108dfc8: 0x108dfc8: lw    v1, 44(sp)
+// 0x0108e5ec: 0x108e5ec: lw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5847,7 +5847,7 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108dfcc: 0x108dfcc: lw    a1, 17364(t0)
+// 0x0108e5f0: 0x108e5f0: lw    a1, 17364(t0)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -5856,36 +5856,36 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108dfd0: 0x108dfd0: lui   s4, 0x10000
+// 0x0108e5f4: 0x108e5f4: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0108dfd4: 0x108dfd4: xori  a1, a1, 3
+// 0x0108e5f8: 0x108e5f8: xori  a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	xor
 	stloc.2
-// 0x0108dfd8: 0x108dfd8: addiu a3, v1, -9500
+// 0x0108e5fc: 0x108e5fc: addiu a3, v1, -7928
 	ldloc 6
-	ldc.i4 -9500
+	ldc.i4 -7928
 	add
 	stloc 4
-// 0x0108dfdc: 0x108dfdc: addiu a2, zero, 16
+// 0x0108e600: 0x108e600: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0108dfe0: 0x108dfe0: sltiu a1, a1, 1
+// 0x0108e604: 0x108e604: sltiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x0108dfe4: 0x108dfe4: addiu a0, s4, 20312
+// 0x0108e608: 0x108e608: addiu a0, s4, 20776
 	ldloc 10
-	ldc.i4 20312
+	ldc.i4 20776
 	add
 	stloc.1
-// 0x0108dfe8: 0x108dfe8: addu  s0, v0, zero
+// 0x0108e60c: 0x108e60c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108dfec: 0x108dfec: sw    s8, 24(sp)
+// 0x0108e610: 0x108e610: sw    s8, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5894,7 +5894,7 @@ L_108dd00:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0108dff0: 0x108dff0: sw    zero, 16(sp)
+// 0x0108e614: 0x108e614: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5903,7 +5903,7 @@ L_108dd00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108dff4: 0x108dff4: jal   0x109c14c sw    zero, 20(sp)
+// 0x0108e618: 0x108e618: jal   0x109c794 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5917,23 +5917,23 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108dffc: 0x108dffc: addu  a1, v0, zero
+// 0x0108e620: 0x108e620: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108e000: 0x108e000: addu  a0, s0, zero
+// 0x0108e624: 0x108e624: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108e004: 0x108e004: addiu s7, s7, -816
+// 0x0108e628: 0x108e628: addiu s7, s7, -352
 	ldloc 13
-	ldc.i4 -816
+	ldc.i4 -352
 	add
 	stloc 13
-// 0x0108e008: 0x108e008: jal   0x1098ec4 sw    v0, 4(s7)
+// 0x0108e62c: 0x108e62c: jal   0x109950c sw    v0, 4(s7)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -5944,15 +5944,15 @@ L_108dd00:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e010: 0x108e010: lui   v0, 0x20000
+// 0x0108e634: 0x108e634: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0108e014: 0x108e014: lw    t2, 48(sp)
+// 0x0108e638: 0x108e638: lw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5961,24 +5961,24 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0108e018: 0x108e018: addiu v0, v0, -6336
+// 0x0108e63c: 0x108e63c: addiu v0, v0, -5872
 	ldloc 5
-	ldc.i4 -6336
+	ldc.i4 -5872
 	add
 	stloc 5
-// 0x0108e01c: 0x108e01c: addu  a2, s6, zero
+// 0x0108e640: 0x108e640: addu  a2, s6, zero
 	ldloc 19
 	stloc.3
-// 0x0108e020: 0x108e020: addiu a3, zero, 1
+// 0x0108e644: 0x108e644: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0108e024: 0x108e024: addu  a0, v0, zero
+// 0x0108e648: 0x108e648: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108e028: 0x108e028: addu  a1, v0, zero
+// 0x0108e64c: 0x108e64c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108e02c: 0x108e02c: sw    t2, 16(sp)
+// 0x0108e650: 0x108e650: sw    t2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5987,7 +5987,7 @@ L_108dd00:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0108e030: 0x108e030: sw    v0, 32(sp)
+// 0x0108e654: 0x108e654: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5996,7 +5996,7 @@ L_108dd00:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108e034: 0x108e034: sw    zero, 36(sp)
+// 0x0108e658: 0x108e658: sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6005,7 +6005,7 @@ L_108dd00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e038: 0x108e038: jal   0x1090ecc sw    zero, 20(sp)
+// 0x0108e65c: 0x108e65c: jal   0x10914f0 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6019,27 +6019,27 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e040: 0x108e040: addu  a1, v0, zero
+// 0x0108e664: 0x108e664: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108e044: 0x108e044: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e668: 0x108e668: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e04c: 0x108e04c: jal   0x101cd60 addiu a0, s4, 20312
+// 0x0108e670: 0x108e670: jal   0x101cd70 addiu a0, s4, 20776
 	ldloc 10
-	ldc.i4 20312
+	ldc.i4 20776
 	add
 	stloc.1
 	ldloc.0
@@ -6047,26 +6047,26 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e054: 0x108e054: lui   a0, 0x20000
+// 0x0108e678: 0x108e678: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108e058: 0x108e058: addiu a3, zero, 144
+// 0x0108e67c: 0x108e67c: addiu a3, zero, 144
 	ldc.i4 144
 	stloc 4
-// 0x0108e05c: 0x108e05c: addiu a2, zero, 12
+// 0x0108e680: 0x108e680: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0108e060: 0x108e060: addiu a0, a0, -6316
+// 0x0108e684: 0x108e684: addiu a0, a0, -5852
 	ldloc.1
-	ldc.i4 -6316
+	ldc.i4 -5852
 	add
 	stloc.1
-// 0x0108e064: 0x108e064: jal   0x1098d10 addu  a1, v0, zero
+// 0x0108e688: 0x108e688: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6074,36 +6074,36 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e06c: 0x108e06c: addu  a1, v0, zero
+// 0x0108e690: 0x108e690: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108e070: 0x108e070: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e694: 0x108e694: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e078: 0x108e078: lui   a0, 0x20000
+// 0x0108e69c: 0x108e69c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108e07c: 0x108e07c: addiu a0, a0, -6300
+// 0x0108e6a0: 0x108e6a0: addiu a0, a0, -5836
 	ldloc.1
-	ldc.i4 -6300
+	ldc.i4 -5836
 	add
 	stloc.1
-// 0x0108e080: 0x108e080: addiu a2, zero, 16
+// 0x0108e6a4: 0x108e6a4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0108e084: 0x108e084: jal   0x109e13c addu  a1, a0, zero
+// 0x0108e6a8: 0x108e6a8: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -6111,30 +6111,30 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e08c: 0x108e08c: addu  a1, v0, zero
+// 0x0108e6b0: 0x108e6b0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108e090: 0x108e090: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e6b4: 0x108e6b4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e098: 0x108e098: addiu a0, s3, 32244
+// 0x0108e6bc: 0x108e6bc: addiu a0, s3, 32244
 	ldloc 9
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x0108e09c: 0x108e09c: jal   0x109e6d0 addiu a1, zero, 512
+// 0x0108e6c0: 0x108e6c0: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -6142,68 +6142,68 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e0a4: 0x108e0a4: addu  a1, v0, zero
+// 0x0108e6c8: 0x108e6c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108e0a8: 0x108e0a8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0108e6cc: 0x108e6cc: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e0b0: 0x108e0b0: addu  a2, zero, zero
+// 0x0108e6d4: 0x108e6d4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108e0b4: 0x108e0b4: addu  a0, s0, zero
+// 0x0108e6d8: 0x108e6d8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0108e0b8: 0x108e0b8: jal   0x1098fe0 addu  a1, zero, zero
+// 0x0108e6dc: 0x108e6dc: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108e0c0: 0x108e0c0: addu  a0, s1, zero
+// 0x0108e6e4: 0x108e6e4: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x0108e0c4: 0x108e0c4: jal   0x1098ec4 addu  a1, s0, zero
+// 0x0108e6e8: 0x108e6e8: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e0cc: 0x108e0cc: addu  a1, s1, zero
+// 0x0108e6f0: 0x108e6f0: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x0108e0d0: 0x108e0d0: jal   0x1098ec4 addu  a0, s2, zero
+// 0x0108e6f4: 0x108e6f4: jal   0x109950c addu  a0, s2, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e0d8: 0x108e0d8: lui   a0, 0x0
+// 0x0108e6fc: 0x108e6fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108e0dc: 0x108e0dc: jal   0x101cd60 addiu a0, a0, 32524
+// 0x0108e700: 0x108e700: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -6213,15 +6213,15 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e0e4: 0x108e0e4: addu  a1, v0, zero
+// 0x0108e708: 0x108e708: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108e0e8: 0x108e0e8: jal   0x109b434 addu  a0, s2, zero
+// 0x0108e70c: 0x108e70c: jal   0x109ba7c addu  a0, s2, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -6229,27 +6229,27 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e0f0: 0x108e0f0: lui   a1, 0x1090000
+// 0x0108e714: 0x108e714: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x0108e0f4: 0x108e0f4: addu  a0, s2, zero
+// 0x0108e718: 0x108e718: addu  a0, s2, zero
 	ldloc 15
 	stloc.1
-// 0x0108e0f8: 0x108e0f8: jal   0x1099174 addiu a1, a1, -7620
+// 0x0108e71c: 0x108e71c: jal   0x10997bc addiu a1, a1, -6048
 	ldloc.2
-	ldc.i4 -7620
+	ldc.i4 -6048
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x0108e100: 0x108e100: lw    t3, 56(sp)
+// 0x0108e724: 0x108e724: lw    t3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6258,12 +6258,12 @@ L_108dd00:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0108e104: 0x108e104: addu  a1, zero, zero
+// 0x0108e728: 0x108e728: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108e108: 0x108e108: jal   0x1095eec addiu a0, t3, -6608
+// 0x0108e72c: 0x108e72c: jal   0x1096534 addiu a0, t3, -6144
 	ldloc 18
-	ldc.i4 -6608
+	ldc.i4 -6144
 	add
 	stloc.1
 	ldloc.0
@@ -6271,25 +6271,25 @@ L_108dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108e110:
-// 0x0108e110: 0x108e110: jal   0x108dbe0 sll   zero, zero, 0
+L_108e734:
+// 0x0108e734: 0x108e734: jal   0x108e204 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::update_checked_108dbe0(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::update_checked_108e204(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e118: 0x108e118: lw    ra, 100(sp)
-// 0x0108e11c: 0x108e11c: lw    s8, 96(sp)
+// 0x0108e73c: 0x108e73c: lw    ra, 100(sp)
+// 0x0108e740: 0x108e740: lw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6298,7 +6298,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 20
-// 0x0108e120: 0x108e120: lw    s7, 92(sp)
+// 0x0108e744: 0x108e744: lw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6307,7 +6307,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108e124: 0x108e124: lw    s6, 88(sp)
+// 0x0108e748: 0x108e748: lw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6316,7 +6316,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0108e128: 0x108e128: lw    s5, 84(sp)
+// 0x0108e74c: 0x108e74c: lw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6325,7 +6325,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108e12c: 0x108e12c: lw    s4, 80(sp)
+// 0x0108e750: 0x108e750: lw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6334,7 +6334,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108e130: 0x108e130: lw    s3, 76(sp)
+// 0x0108e754: 0x108e754: lw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6343,7 +6343,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108e134: 0x108e134: lw    s2, 72(sp)
+// 0x0108e758: 0x108e758: lw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6352,7 +6352,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108e138: 0x108e138: lw    s1, 68(sp)
+// 0x0108e75c: 0x108e75c: lw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6361,7 +6361,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108e13c: 0x108e13c: lw    s0, 64(sp)
+// 0x0108e760: 0x108e760: lw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6370,7 +6370,7 @@ L_108e110:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108e140: 0x108e140: jr    ra addiu sp, sp, 104
+// 0x0108e764: 0x108e764: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -6382,7 +6382,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimePrivacySettingsWidgetCallBack_108e148(int32,int32,int32,int32,int32)
+.method public static int32 RealtimePrivacySettingsWidgetCallBack_108e76c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -6417,28 +6417,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e148: 0x108e148: addiu sp, sp, -24
+// 0x0108e76c: 0x108e76c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108e14c: 0x108e14c: sw    ra, 20(sp)
-// 0x0108e150: 0x108e150: jal   0x108dca4 sll   zero, zero, 0
+// 0x0108e770: 0x108e770: sw    ra, 20(sp)
+// 0x0108e774: 0x108e774: jal   0x108e2c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RealtimePrivacySettings_108dca4(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RealtimePrivacySettings_108e2c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e158: 0x108e158: lw    ra, 20(sp)
-// 0x0108e15c: 0x108e15c: addiu v0, zero, 1
+// 0x0108e77c: 0x108e77c: lw    ra, 20(sp)
+// 0x0108e780: 0x108e780: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108e160: 0x108e160: jr    ra addiu sp, sp, 24
+// 0x0108e784: 0x108e784: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6450,7 +6450,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 save_changes_108e168(int32,int32,int32,int32,int32)
+.method public static int32 save_changes_108e78c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -6491,12 +6491,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e168: 0x108e168: addiu sp, sp, -32
+// 0x0108e78c: 0x108e78c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108e16c: 0x108e16c: sw    s1, 24(sp)
+// 0x0108e790: 0x108e790: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6505,20 +6505,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108e170: 0x108e170: lui   s1, 0x80000
+// 0x0108e794: 0x108e794: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x0108e174: 0x108e174: lw    v0, -816(s1)
+// 0x0108e798: 0x108e798: lw    v0, -352(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -204
+	ldc.i4.s -88
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108e178: 0x108e178: sw    ra, 28(sp)
-// 0x0108e17c: 0x108e17c: lw    a0, 16(v0)
+// 0x0108e79c: 0x108e79c: sw    ra, 28(sp)
+// 0x0108e7a0: 0x108e7a0: lw    a0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6527,7 +6527,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e180: 0x108e180: jal   0x10947ac sw    s0, 20(sp)
+// 0x0108e7a4: 0x108e7a4: jal   0x1094dd0 sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6541,18 +6541,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e188: 0x108e188: lui   s0, 0x0
+// 0x0108e7ac: 0x108e7ac: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0108e18c: 0x108e18c: addu  a0, v0, zero
+// 0x0108e7b0: 0x108e7b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108e190: 0x108e190: jal   0x1001b14 addiu a1, s0, 20820
+// 0x0108e7b4: 0x108e7b4: jal   0x1001b14 addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
@@ -6562,18 +6562,18 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108e198: 0x108e198: beq   v0, zero, 0x108e1d0 addu  v1, zero, zero
+// 0x0108e7bc: 0x108e7bc: beq   v0, zero, 0x108e7f4 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_108e1d0
+	brfalse L_108e7f4
 // --- basic block ---
-// 0x0108e1a0: 0x108e1a0: addiu s1, s1, -816
+// 0x0108e7c4: 0x108e7c4: addiu s1, s1, -352
 	ldloc 9
-	ldc.i4 -816
+	ldc.i4 -352
 	add
 	stloc 9
-// 0x0108e1a4: 0x108e1a4: lw    v0, 4(s1)
+// 0x0108e7c8: 0x108e7c8: lw    v0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6582,8 +6582,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108e1a8: 0x108e1a8: sll   zero, zero, 0
-// 0x0108e1ac: 0x108e1ac: lw    a0, 16(v0)
+// 0x0108e7cc: 0x108e7cc: sll   zero, zero, 0
+// 0x0108e7d0: 0x108e7d0: lw    a0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6592,21 +6592,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e1b0: 0x108e1b0: jal   0x10947ac sll   zero, zero, 0
+// 0x0108e7d4: 0x108e7d4: jal   0x1094dd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e1b8: 0x108e1b8: addu  a0, v0, zero
+// 0x0108e7dc: 0x108e7dc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108e1bc: 0x108e1bc: jal   0x1001b14 addiu a1, s0, 20820
+// 0x0108e7e0: 0x108e7e0: jal   0x1001b14 addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
@@ -6616,47 +6616,47 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108e1c4: 0x108e1c4: sltiu v1, v0, 1
+// 0x0108e7e8: 0x108e7e8: sltiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x0108e1c8: 0x108e1c8: addiu v0, zero, 2
+// 0x0108e7ec: 0x108e7ec: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0108e1cc: 0x108e1cc: subu  v1, v0, v1
+// 0x0108e7f0: 0x108e7f0: subu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	sub
 	stloc 6
-L_108e1d0:
-// 0x0108e1d0: 0x108e1d0: lui   s0, 0x80000
+L_108e7f4:
+// 0x0108e7f4: 0x108e7f4: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0108e1d4: 0x108e1d4: sll   v1, v1, 2
+// 0x0108e7f8: 0x108e7f8: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0108e1d8: 0x108e1d8: addiu s0, s0, -816
+// 0x0108e7fc: 0x108e7fc: addiu s0, s0, -352
 	ldloc 8
-	ldc.i4 -816
+	ldc.i4 -352
 	add
 	stloc 8
-// 0x0108e1dc: 0x108e1dc: addu  s0, v1, s0
+// 0x0108e800: 0x108e800: addu  s0, v1, s0
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x0108e1e0: 0x108e1e0: lw    v0, 0(s0)
+// 0x0108e804: 0x108e804: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108e1e4: 0x108e1e4: sll   zero, zero, 0
-// 0x0108e1e8: 0x108e1e8: lw    a0, 16(v0)
+// 0x0108e808: 0x108e808: sll   zero, zero, 0
+// 0x0108e80c: 0x108e80c: lw    a0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6665,28 +6665,28 @@ L_108e1d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e1ec: 0x108e1ec: jal   0x108d128 sll   zero, zero, 0
+// 0x0108e810: 0x108e810: jal   0x108d74c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::ERTVisabilityGroup_from_string_108d128(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::ERTVisabilityGroup_from_string_108d74c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e1f4: 0x108e1f4: lw    v1, 0(s0)
+// 0x0108e818: 0x108e818: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0108e1f8: 0x108e1f8: lui   a0, 0x0
+// 0x0108e81c: 0x108e81c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108e1fc: 0x108e1fc: lw    a1, 16(v1)
+// 0x0108e820: 0x108e820: lw    a1, 16(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6695,15 +6695,15 @@ L_108e1d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108e200: 0x108e200: addiu a0, a0, 14928
+// 0x0108e824: 0x108e824: addiu a0, a0, 14928
 	ldloc.1
 	ldc.i4 14928
 	add
 	stloc.1
-// 0x0108e204: 0x108e204: lui   v1, 0x0
+// 0x0108e828: 0x108e828: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0108e208: 0x108e208: jal   0x100e5c0 sw    v0, 17364(v1)
+// 0x0108e82c: 0x108e82c: jal   0x100e5d0 sw    v0, 17364(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6717,12 +6717,12 @@ L_108e1d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e210: 0x108e210: jal   0x100ea50 addu  a0, zero, zero
+// 0x0108e834: 0x108e834: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6730,35 +6730,35 @@ L_108e1d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e218: 0x108e218: jal   0x106e298 sll   zero, zero, 0
+// 0x0108e83c: 0x108e83c: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e220: 0x108e220: jal   0x1026aa0 sll   zero, zero, 0
+// 0x0108e844: 0x108e844: jal   0x1026ab0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_send_permissions_1026aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_send_permissions_1026ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e228: 0x108e228: lw    ra, 28(sp)
-// 0x0108e22c: 0x108e22c: lw    s1, 24(sp)
+// 0x0108e84c: 0x108e84c: lw    ra, 28(sp)
+// 0x0108e850: 0x108e850: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6767,7 +6767,7 @@ L_108e1d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108e230: 0x108e230: lw    s0, 20(sp)
+// 0x0108e854: 0x108e854: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6776,7 +6776,7 @@ L_108e1d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108e234: 0x108e234: jr    ra addiu sp, sp, 32
+// 0x0108e858: 0x108e858: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6788,7 +6788,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_ok_108e23c(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_108e860(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -6823,24 +6823,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e23c: 0x108e23c: addiu sp, sp, -24
+// 0x0108e860: 0x108e860: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108e240: 0x108e240: sw    ra, 20(sp)
-// 0x0108e244: 0x108e244: jal   0x108e168 sll   zero, zero, 0
+// 0x0108e864: 0x108e864: sw    ra, 20(sp)
+// 0x0108e868: 0x108e868: jal   0x108e78c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::save_changes_108e168(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::save_changes_108e78c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e24c: 0x108e24c: jal   0x1094b64 addu  a0, zero, zero
+// 0x0108e870: 0x108e870: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6848,14 +6848,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e254: 0x108e254: lw    ra, 20(sp)
-// 0x0108e258: 0x108e258: sll   zero, zero, 0
-// 0x0108e25c: 0x108e25c: jr    ra addiu sp, sp, 24
+// 0x0108e878: 0x108e878: lw    ra, 20(sp)
+// 0x0108e87c: 0x108e87c: sll   zero, zero, 0
+// 0x0108e880: 0x108e880: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6867,7 +6867,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_close_dialog_108e264(int32,int32,int32,int32,int32)
+.method public static int32 on_close_dialog_108e888(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -6902,34 +6902,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e264: 0x108e264: addiu sp, sp, -24
+// 0x0108e888: 0x108e888: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108e268: 0x108e268: addiu v0, zero, 1
+// 0x0108e88c: 0x108e88c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108e26c: 0x108e26c: bne   a0, v0, 0x108e27c sw    ra, 20(sp)
+// 0x0108e890: 0x108e890: bne   a0, v0, 0x108e8a0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_108e27c
+	bne.un L_108e8a0
 // --- basic block ---
-// 0x0108e274: 0x108e274: jal   0x108e168 sll   zero, zero, 0
+// 0x0108e898: 0x108e898: jal   0x108e78c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::save_changes_108e168(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::save_changes_108e78c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_108e27c:
-// 0x0108e27c: 0x108e27c: lw    ra, 20(sp)
-// 0x0108e280: 0x108e280: sll   zero, zero, 0
-// 0x0108e284: 0x108e284: jr    ra addiu sp, sp, 24
+L_108e8a0:
+// 0x0108e8a0: 0x108e8a0: lw    ra, 20(sp)
+// 0x0108e8a4: 0x108e8a4: sll   zero, zero, 0
+// 0x0108e8a8: 0x108e8a8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6941,7 +6941,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_OfflineWriteLine_108e28c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_OfflineWriteLine_108e8b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 s2,int32 s4,int32 s5,int32 s6,int32 s3,int32 s7,int32 ra)
@@ -7000,12 +7000,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e28c: 0x108e28c: addiu sp, sp, -64
+// 0x0108e8b0: 0x108e8b0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0108e290: 0x108e290: sw    s6, 52(sp)
+// 0x0108e8b4: 0x108e8b4: sw    s6, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7014,7 +7014,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108e294: 0x108e294: sw    s5, 48(sp)
+// 0x0108e8b8: 0x108e8b8: sw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7023,7 +7023,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108e298: 0x108e298: sw    s4, 44(sp)
+// 0x0108e8bc: 0x108e8bc: sw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7032,7 +7032,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108e29c: 0x108e29c: sw    s1, 32(sp)
+// 0x0108e8c0: 0x108e8c0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7041,19 +7041,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108e2a0: 0x108e2a0: lui   s6, 0x20000
+// 0x0108e8c4: 0x108e8c4: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x0108e2a4: 0x108e2a4: lui   s1, 0x20000
+// 0x0108e8c8: 0x108e8c8: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0108e2a8: 0x108e2a8: lui   s5, 0x10000
+// 0x0108e8cc: 0x108e8cc: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0108e2ac: 0x108e2ac: lui   s4, 0x0
+// 0x0108e8d0: 0x108e8d0: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0108e2b0: 0x108e2b0: sw    s7, 56(sp)
+// 0x0108e8d4: 0x108e8d4: sw    s7, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7062,7 +7062,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0108e2b4: 0x108e2b4: sw    s3, 40(sp)
+// 0x0108e8d8: 0x108e8d8: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7071,7 +7071,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108e2b8: 0x108e2b8: sw    s2, 36(sp)
+// 0x0108e8dc: 0x108e8dc: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7080,7 +7080,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108e2bc: 0x108e2bc: sw    s0, 28(sp)
+// 0x0108e8e0: 0x108e8e0: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7089,56 +7089,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108e2c0: 0x108e2c0: sw    ra, 60(sp)
-// 0x0108e2c4: 0x108e2c4: addu  s2, a0, zero
+// 0x0108e8e4: 0x108e8e4: sw    ra, 60(sp)
+// 0x0108e8e8: 0x108e8e8: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0108e2c8: 0x108e2c8: addu  s7, a1, zero
+// 0x0108e8ec: 0x108e8ec: addu  s7, a1, zero
 	ldloc.2
 	stloc 15
-// 0x0108e2cc: 0x108e2cc: addiu s1, s1, 29540
+// 0x0108e8f0: 0x108e8f0: addiu s1, s1, 30004
 	ldloc 7
-	ldc.i4 29540
+	ldc.i4 30004
 	add
 	stloc 7
-// 0x0108e2d0: 0x108e2d0: addiu s6, s6, 29568
+// 0x0108e8f4: 0x108e8f4: addiu s6, s6, 30032
 	ldloc 13
-	ldc.i4 29568
+	ldc.i4 30032
 	add
 	stloc 13
-// 0x0108e2d4: 0x108e2d4: addiu s5, s5, 19160
+// 0x0108e8f8: 0x108e8f8: addiu s5, s5, 18632
 	ldloc 12
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 12
-// 0x0108e2d8: 0x108e2d8: addiu s4, s4, 28676
+// 0x0108e8fc: 0x108e8fc: addiu s4, s4, 28676
 	ldloc 11
 	ldc.i4 28676
 	add
 	stloc 11
-// 0x0108e2dc: 0x108e2dc: lui   s3, 0x80000
+// 0x0108e900: 0x108e900: lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 14
-// 0x0108e2e0: 0x108e2e0: lui   s0, 0x80000
+// 0x0108e904: 0x108e904: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_108e2e4:
-// 0x0108e2e4: 0x108e2e4: lw    a1, 0(s1)
+L_108e908:
+// 0x0108e908: 0x108e908: lw    a1, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0108e2e8: 0x108e2e8: addiu s1, s1, 4
+// 0x0108e90c: 0x108e90c: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0108e2ec: 0x108e2ec: addu  a0, a1, zero
+// 0x0108e910: 0x108e910: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0108e2f0: 0x108e2f0: jal   0x1001b48 sw    a1, 16(sp)
+// 0x0108e914: 0x108e914: jal   0x1001b48 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7153,7 +7153,7 @@ L_108e2e4:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e2f8: 0x108e2f8: lw    a1, 16(sp)
+// 0x0108e91c: 0x108e91c: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7162,10 +7162,10 @@ L_108e2e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108e2fc: 0x108e2fc: addu  a0, s2, zero
+// 0x0108e920: 0x108e920: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0108e300: 0x108e300: jal   0x1001b2c addu  a2, v0, zero
+// 0x0108e924: 0x108e924: jal   0x1001b2c addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.1
@@ -7174,41 +7174,41 @@ L_108e2e4:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0108e308: 0x108e308: bne   v0, zero, 0x108e374 sll   zero, zero, 0
+// 0x0108e92c: 0x108e92c: bne   v0, zero, 0x108e998 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_108e374
+	brtrue L_108e998
 // --- basic block ---
-// 0x0108e310: 0x108e310: lw    a0, -804(s3)
+// 0x0108e934: 0x108e934: lw    a0, -340(s3)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -201
+	ldc.i4.s -85
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e314: 0x108e314: sll   zero, zero, 0
-// 0x0108e318: 0x108e318: beq   a0, zero, 0x108e348 sll   zero, zero, 0
+// 0x0108e938: 0x108e938: sll   zero, zero, 0
+// 0x0108e93c: 0x108e93c: beq   a0, zero, 0x108e96c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_108e348
+	brfalse L_108e96c
 // --- basic block ---
-// 0x0108e320: 0x108e320: lw    v0, -808(s0)
+// 0x0108e944: 0x108e944: lw    v0, -344(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -202
+	ldc.i4.s -86
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108e324: 0x108e324: sll   zero, zero, 0
-// 0x0108e328: 0x108e328: bne   v0, zero, 0x108e350 addu  a1, s2, zero
+// 0x0108e948: 0x108e948: sll   zero, zero, 0
+// 0x0108e94c: 0x108e94c: bne   v0, zero, 0x108e974 addu  a1, s2, zero
 	ldloc 6
 	ldloc 10
 	stloc.2
-	brtrue L_108e350
+	brtrue L_108e974
 // --- basic block ---
-// 0x0108e330: 0x108e330: jal   0x104dd10 addu  a1, s4, zero
+// 0x0108e954: 0x108e954: jal   0x104dd20 addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -7216,81 +7216,81 @@ L_108e2e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e338: 0x108e338: beq   v0, zero, 0x108e348 sw    v0, -808(s0)
+// 0x0108e95c: 0x108e95c: beq   v0, zero, 0x108e96c sw    v0, -344(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -202
+	ldc.i4.s -86
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_108e348
+	brfalse L_108e96c
 // --- basic block ---
-// 0x0108e340: 0x108e340: jal   0x106c110 sll   zero, zero, 0
+// 0x0108e964: 0x108e964: jal   0x106c734 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTime_Auth_106c110(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTime_Auth_106c734(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_108e348:
-// 0x0108e348: 0x108e348: lw    v0, -808(s0)
+L_108e96c:
+// 0x0108e96c: 0x108e96c: lw    v0, -344(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -202
+	ldc.i4.s -86
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108e34c: 0x108e34c: addu  a1, s2, zero
+// 0x0108e970: 0x108e970: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-L_108e350:
-// 0x0108e350: 0x108e350: addu  a2, s7, zero
+L_108e974:
+// 0x0108e974: 0x108e974: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x0108e354: 0x108e354: beq   v0, zero, 0x108e37c addu  a0, v0, zero
+// 0x0108e978: 0x108e978: beq   v0, zero, 0x108e9a0 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_108e37c
+	brfalse L_108e9a0
 // --- basic block ---
-// 0x0108e35c: 0x108e35c: jal   0x104d46c sll   zero, zero, 0
+// 0x0108e980: 0x108e980: jal   0x104d47c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e364: 0x108e364: lw    a0, -808(s0)
+// 0x0108e988: 0x108e988: lw    a0, -344(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -202
+	ldc.i4.s -86
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e368: 0x108e368: addu  a1, s5, zero
+// 0x0108e98c: 0x108e98c: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x0108e36c: 0x108e36c: jal   0x104d46c addiu a2, zero, 1
+// 0x0108e990: 0x108e990: jal   0x104d47c addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -7298,20 +7298,20 @@ L_108e350:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_108e374:
-// 0x0108e374: 0x108e374: bne   s1, s6, 0x108e2e4 sll   zero, zero, 0
+L_108e998:
+// 0x0108e998: 0x108e998: bne   s1, s6, 0x108e908 sll   zero, zero, 0
 	ldloc 7
 	ldloc 13
-	bne.un L_108e2e4
+	bne.un L_108e908
 // --- basic block ---
-L_108e37c:
-// 0x0108e37c: 0x108e37c: lw    ra, 60(sp)
-// 0x0108e380: 0x108e380: lw    s7, 56(sp)
+L_108e9a0:
+// 0x0108e9a0: 0x108e9a0: lw    ra, 60(sp)
+// 0x0108e9a4: 0x108e9a4: lw    s7, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7320,7 +7320,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108e384: 0x108e384: lw    s6, 52(sp)
+// 0x0108e9a8: 0x108e9a8: lw    s6, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7329,7 +7329,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108e388: 0x108e388: lw    s5, 48(sp)
+// 0x0108e9ac: 0x108e9ac: lw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7338,7 +7338,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108e38c: 0x108e38c: lw    s4, 44(sp)
+// 0x0108e9b0: 0x108e9b0: lw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7347,7 +7347,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108e390: 0x108e390: lw    s3, 40(sp)
+// 0x0108e9b4: 0x108e9b4: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7356,7 +7356,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108e394: 0x108e394: lw    s2, 36(sp)
+// 0x0108e9b8: 0x108e9b8: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7365,7 +7365,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108e398: 0x108e398: lw    s1, 32(sp)
+// 0x0108e9bc: 0x108e9bc: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7374,7 +7374,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e39c: 0x108e39c: lw    s0, 28(sp)
+// 0x0108e9c0: 0x108e9c0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7383,7 +7383,7 @@ L_108e37c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108e3a0: 0x108e3a0: jr    ra addiu sp, sp, 64
+// 0x0108e9c4: 0x108e9c4: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
diff --git a/converted/Cibyl106.j b/converted/Cibyl106.j
index 900af1b..81cc38a 100644
--- a/converted/Cibyl106.j
+++ b/converted/Cibyl106.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl106::.ctor
 
-.method public static int32 Realtime_OfflineWrite_108e3a8(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_OfflineWrite_108e9cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32 s1,int32[] mem,int32 v1,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e3a8: 0x108e3a8: addiu sp, sp, -32
+// 0x0108e9cc: 0x108e9cc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108e3ac: 0x108e3ac: sw    s0, 20(sp)
+// 0x0108e9d0: 0x108e9d0: sw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -96,8 +96,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108e3b0: 0x108e3b0: sw    ra, 28(sp)
-// 0x0108e3b4: 0x108e3b4: sw    s1, 24(sp)
+// 0x0108e9d4: 0x108e9d4: sw    ra, 28(sp)
+// 0x0108e9d8: 0x108e9d8: sw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -106,21 +106,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108e3b8: 0x108e3b8: addiu a1, zero, 10
+// 0x0108e9dc: 0x108e9dc: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0108e3bc: 0x108e3bc: j	 0x108e3d8 addu  s0, a0, zero
+// 0x0108e9e0: 0x108e9e0: j	 0x108e9fc addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-	br L_108e3d8
+	br L_108e9fc
 // --- basic block ---
-L_108e3c4:
-// 0x0108e3c4: 0x108e3c4: addiu s1, s1, 1
+L_108e9e8:
+// 0x0108e9e8: 0x108e9e8: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0108e3c8: 0x108e3c8: jal   0x108e28c addu  s0, s0, s1
+// 0x0108e9ec: 0x108e9ec: jal   0x108e8b0 addu  s0, s0, s1
 	ldloc 5
 	ldloc 7
 	add
@@ -130,19 +130,19 @@ L_108e3c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::Realtime_OfflineWriteLine_108e28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::Realtime_OfflineWriteLine_108e8b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e3d0: 0x108e3d0: addu  a0, s0, zero
+// 0x0108e9f4: 0x108e9f4: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0108e3d4: 0x108e3d4: addiu a1, zero, 10
+// 0x0108e9f8: 0x108e9f8: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-L_108e3d8:
-// 0x0108e3d8: 0x108e3d8: jal   0x1001a5c sll   zero, zero, 0
+L_108e9fc:
+// 0x0108e9fc: 0x108e9fc: jal   0x1001a5c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strchr_1001a5c(int32,int32)
@@ -150,40 +150,40 @@ L_108e3d8:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e3e0: 0x108e3e0: subu  s1, v0, s0
+// 0x0108ea04: 0x108ea04: subu  s1, v0, s0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 7
-// 0x0108e3e4: 0x108e3e4: addu  a0, s0, zero
+// 0x0108ea08: 0x108ea08: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0108e3e8: 0x108e3e8: bne   v0, zero, 0x108e3c4 addu  a1, s1, zero
+// 0x0108ea0c: 0x108ea0c: bne   v0, zero, 0x108e9e8 addu  a1, s1, zero
 	ldloc 6
 	ldloc 7
 	stloc.2
-	brtrue L_108e3c4
+	brtrue L_108e9e8
 // --- basic block ---
-// 0x0108e3f0: 0x108e3f0: lb    v0, 0(s0)
+// 0x0108ea14: 0x108ea14: lb    v0, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0108e3f4: 0x108e3f4: sll   zero, zero, 0
-// 0x0108e3f8: 0x108e3f8: beq   v0, zero, 0x108e414 sll   zero, zero, 0
+// 0x0108ea18: 0x108ea18: sll   zero, zero, 0
+// 0x0108ea1c: 0x108ea1c: beq   v0, zero, 0x108ea38 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_108e414
+	brfalse L_108ea38
 // --- basic block ---
-// 0x0108e400: 0x108e400: jal   0x1001b48 sll   zero, zero, 0
+// 0x0108ea24: 0x108ea24: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e408: 0x108e408: addu  a1, v0, zero
+// 0x0108ea2c: 0x108ea2c: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x0108e40c: 0x108e40c: jal   0x108e28c addu  a0, s0, zero
+// 0x0108ea30: 0x108ea30: jal   0x108e8b0 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -191,14 +191,14 @@ L_108e3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::Realtime_OfflineWriteLine_108e28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::Realtime_OfflineWriteLine_108e8b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_108e414:
-// 0x0108e414: 0x108e414: lw    ra, 28(sp)
-// 0x0108e418: 0x108e418: lw    s1, 24(sp)
+L_108ea38:
+// 0x0108ea38: 0x108ea38: lw    ra, 28(sp)
+// 0x0108ea3c: 0x108ea3c: lw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -207,7 +207,7 @@ L_108e414:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e41c: 0x108e41c: lw    s0, 20(sp)
+// 0x0108ea40: 0x108ea40: lw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -216,7 +216,7 @@ L_108e414:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108e420: 0x108e420: jr    ra addiu sp, sp, 32
+// 0x0108ea44: 0x108ea44: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -228,7 +228,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 Realtime_OfflineClose_108e428(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_OfflineClose_108ea4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -266,25 +266,25 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e428: 0x108e428: lui   v0, 0x80000
+// 0x0108ea4c: 0x108ea4c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108e42c: 0x108e42c: lw    a0, -808(v0)
+// 0x0108ea50: 0x108ea50: lw    a0, -344(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -202
+	ldc.i4.s -86
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e430: 0x108e430: addiu sp, sp, -24
+// 0x0108ea54: 0x108ea54: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108e434: 0x108e434: sw    ra, 20(sp)
-// 0x0108e438: 0x108e438: beq   a0, zero, 0x108e448 sw    s0, 16(sp)
+// 0x0108ea58: 0x108ea58: sw    ra, 20(sp)
+// 0x0108ea5c: 0x108ea5c: beq   a0, zero, 0x108ea6c sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc.0
@@ -294,70 +294,70 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_108e448
+	brfalse L_108ea6c
 // --- basic block ---
-// 0x0108e440: 0x108e440: jal   0x104d44c sll   zero, zero, 0
+// 0x0108ea64: 0x108ea64: jal   0x104d45c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_108e448:
-// 0x0108e448: 0x108e448: lui   s0, 0x80000
+L_108ea6c:
+// 0x0108ea6c: 0x108ea6c: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0108e44c: 0x108e44c: lw    a0, -804(s0)
+// 0x0108ea70: 0x108ea70: lw    a0, -340(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -201
+	ldc.i4.s -85
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e450: 0x108e450: lui   v0, 0x80000
+// 0x0108ea74: 0x108ea74: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108e454: 0x108e454: beq   a0, zero, 0x108e468 sw    zero, -808(v0)
+// 0x0108ea78: 0x108ea78: beq   a0, zero, 0x108ea8c sw    zero, -344(v0)
 	ldloc.1
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -202
+	ldc.i4.s -86
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_108e468
+	brfalse L_108ea8c
 // --- basic block ---
-// 0x0108e45c: 0x108e45c: jal   0x104c670 sll   zero, zero, 0
+// 0x0108ea80: 0x108ea80: jal   0x104c680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e464: 0x108e464: sw    zero, -804(s0)
+// 0x0108ea88: 0x108ea88: sw    zero, -340(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -201
+	ldc.i4.s -85
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108e468:
-// 0x0108e468: 0x108e468: lw    ra, 20(sp)
-// 0x0108e46c: 0x108e46c: lw    s0, 16(sp)
+L_108ea8c:
+// 0x0108ea8c: 0x108ea8c: lw    ra, 20(sp)
+// 0x0108ea90: 0x108ea90: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -366,7 +366,7 @@ L_108e468:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e470: 0x108e470: jr    ra addiu sp, sp, 24
+// 0x0108ea94: 0x108ea94: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -378,7 +378,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 Realtime_OfflineOpen_108e478(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_OfflineOpen_108ea9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -416,12 +416,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e478: 0x108e478: addiu sp, sp, -32
+// 0x0108ea9c: 0x108ea9c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108e47c: 0x108e47c: sw    s0, 24(sp)
+// 0x0108eaa0: 0x108eaa0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -430,7 +430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108e480: 0x108e480: sw    a0, 16(sp)
+// 0x0108eaa4: 0x108eaa4: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -439,7 +439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0108e484: 0x108e484: sw    a1, 20(sp)
+// 0x0108eaa8: 0x108eaa8: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -448,8 +448,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e488: 0x108e488: sw    ra, 28(sp)
-// 0x0108e48c: 0x108e48c: jal   0x108e428 lui   s0, 0x80000
+// 0x0108eaac: 0x108eaac: sw    ra, 28(sp)
+// 0x0108eab0: 0x108eab0: jal   0x108ea4c lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
 	ldloc.0
@@ -457,12 +457,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::Realtime_OfflineClose_108e428(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::Realtime_OfflineClose_108ea4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e494: 0x108e494: lw    a0, 16(sp)
+// 0x0108eab8: 0x108eab8: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -471,7 +471,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e498: 0x108e498: lw    a1, 20(sp)
+// 0x0108eabc: 0x108eabc: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -480,11 +480,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108e49c: 0x108e49c: bne   a0, zero, 0x108e4b4 sll   zero, zero, 0
+// 0x0108eac0: 0x108eac0: bne   a0, zero, 0x108ead8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_108e4b4
+	brtrue L_108ead8
 // --- basic block ---
-// 0x0108e4a4: 0x108e4a4: jal   0x1002f74 sw    a1, 20(sp)
+// 0x0108eac8: 0x108eac8: jal   0x1002f74 sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -503,7 +503,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e4ac: 0x108e4ac: lw    a1, 20(sp)
+// 0x0108ead0: 0x108ead0: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -512,32 +512,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108e4b0: 0x108e4b0: addu  a0, v0, zero
+// 0x0108ead4: 0x108ead4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-L_108e4b4:
-// 0x0108e4b4: 0x108e4b4: jal   0x104cb30 sll   zero, zero, 0
+L_108ead8:
+// 0x0108ead8: 0x108ead8: jal   0x104cb40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e4bc: 0x108e4bc: lw    ra, 28(sp)
-// 0x0108e4c0: 0x108e4c0: sw    v0, -804(s0)
+// 0x0108eae0: 0x108eae0: lw    ra, 28(sp)
+// 0x0108eae4: 0x108eae4: sw    v0, -340(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -201
+	ldc.i4.s -85
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108e4c4: 0x108e4c4: lw    s0, 24(sp)
+// 0x0108eae8: 0x108eae8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -546,7 +546,7 @@ L_108e4b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e4c8: 0x108e4c8: jr    ra addiu sp, sp, 32
+// 0x0108eaec: 0x108eaec: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -558,7 +558,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Count_108e4d0()
+.method public static int32 RealtimeAltRoutes_Count_108eaf4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -575,25 +575,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e4d0: 0x108e4d0: lui   v0, 0x80000
+// 0x0108eaf4: 0x108eaf4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x0108e4d4: 0x108e4d4: lw    v0, 8524(v0)
+// 0x0108eaf8: 0x108eaf8: lw    v0, 8988(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2131
+	ldc.i4 2247
 	add
 	ldelem.i4
 	stloc.0
-// 0x0108e4d8: 0x108e4d8: jr    ra sll   zero, zero, 0
+// 0x0108eafc: 0x108eafc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Clear_108e4e0()
+.method public static int32 RealtimeAltRoutes_Clear_108eb04()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -610,15 +610,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e4e0: 0x108e4e0: lui   v0, 0x80000
+// 0x0108eb04: 0x108eb04: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x0108e4e4: 0x108e4e4: jr    ra sw    zero, 8524(v0)
+// 0x0108eb08: 0x108eb08: jr    ra sw    zero, 8988(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2131
+	ldc.i4 2247
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -627,7 +627,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Init_Record_108e4ec(int32)
+.method public static int32 RealtimeAltRoutes_Init_Record_108eb10(int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32[] mem,int32 v0,int32 ra)
@@ -647,10 +647,10 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e4ec: 0x108e4ec: addiu v0, zero, -1
+// 0x0108eb10: 0x108eb10: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0108e4f0: 0x108e4f0: sw    v0, 904(a0)
+// 0x0108eb14: 0x108eb14: sw    v0, 904(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -659,7 +659,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e4f4: 0x108e4f4: sw    zero, 908(a0)
+// 0x0108eb18: 0x108eb18: sw    zero, 908(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -668,20 +668,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e4f8: 0x108e4f8: sw    v0, 0(a0)
+// 0x0108eb1c: 0x108eb1c: sw    v0, 0(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0108e4fc: 0x108e4fc: sb    zero, 4(a0)
+// 0x0108eb20: 0x108eb20: sb    zero, 4(a0)
 	ldloc.0
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0108e500: 0x108e500: sw    v0, 776(a0)
+// 0x0108eb24: 0x108eb24: sw    v0, 776(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -690,7 +690,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e504: 0x108e504: sw    v0, 772(a0)
+// 0x0108eb28: 0x108eb28: sw    v0, 772(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -699,7 +699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e508: 0x108e508: sw    v0, 784(a0)
+// 0x0108eb2c: 0x108eb2c: sw    v0, 784(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -708,7 +708,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e50c: 0x108e50c: sw    v0, 780(a0)
+// 0x0108eb30: 0x108eb30: sw    v0, 780(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -717,19 +717,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e510: 0x108e510: sb    zero, 260(a0)
+// 0x0108eb34: 0x108eb34: sb    zero, 260(a0)
 	ldloc.0
 	ldc.i4 260
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0108e514: 0x108e514: sb    zero, 516(a0)
+// 0x0108eb38: 0x108eb38: sb    zero, 516(a0)
 	ldloc.0
 	ldc.i4 516
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0108e518: 0x108e518: sw    zero, 788(a0)
+// 0x0108eb3c: 0x108eb3c: sw    zero, 788(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -738,7 +738,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e51c: 0x108e51c: sw    v0, 816(a0)
+// 0x0108eb40: 0x108eb40: sw    v0, 816(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -747,7 +747,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e520: 0x108e520: sw    zero, 820(a0)
+// 0x0108eb44: 0x108eb44: sw    zero, 820(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -756,7 +756,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e524: 0x108e524: sw    v0, 860(a0)
+// 0x0108eb48: 0x108eb48: sw    v0, 860(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -765,7 +765,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108e528: 0x108e528: jr    ra sw    zero, 864(a0)
+// 0x0108eb4c: 0x108eb4c: jr    ra sw    zero, 864(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -779,7 +779,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Get_Record_108e530(int32)
+.method public static int32 RealtimeAltRoutes_Get_Record_108eb54(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 lo,int32 ra)
@@ -799,26 +799,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e530: 0x108e530: addiu v0, zero, 932
+// 0x0108eb54: 0x108eb54: addiu v0, zero, 932
 	ldc.i4 932
 	stloc.1
-// 0x0108e534: 0x108e534: mult  a0, v0
+// 0x0108eb58: 0x108eb58: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc.2
-// 0x0108e538: 0x108e538: lui   v0, 0x80000
+// 0x0108eb5c: 0x108eb5c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0108e53c: 0x108e53c: addiu v0, v0, -796
+// 0x0108eb60: 0x108eb60: addiu v0, v0, -332
 	ldloc.1
-	ldc.i4 -796
+	ldc.i4 -332
 	add
 	stloc.1
-// 0x0108e540: 0x108e540: mflo  lo
+// 0x0108eb64: 0x108eb64: mflo  lo
 	ldloc.2
 	stloc.0
-// 0x0108e544: 0x108e544: jr    ra addu  v0, v0, a0
+// 0x0108eb68: 0x108eb68: jr    ra addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
@@ -828,7 +828,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Get_Route_Result_108e54c(int32)
+.method public static int32 RealtimeAltRoutes_Get_Route_Result_108eb70(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 lo,int32 ra)
@@ -848,26 +848,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e54c: 0x108e54c: addiu v0, zero, 44
+// 0x0108eb70: 0x108eb70: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc.1
-// 0x0108e550: 0x108e550: mult  a0, v0
+// 0x0108eb74: 0x108eb74: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc.2
-// 0x0108e554: 0x108e554: lui   v0, 0x80000
+// 0x0108eb78: 0x108eb78: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0108e558: 0x108e558: addiu v0, v0, 4
+// 0x0108eb7c: 0x108eb7c: addiu v0, v0, 468
 	ldloc.1
-	ldc.i4.4
+	ldc.i4 468
 	add
 	stloc.1
-// 0x0108e55c: 0x108e55c: mflo  lo
+// 0x0108eb80: 0x108eb80: mflo  lo
 	ldloc.2
 	stloc.0
-// 0x0108e560: 0x108e560: jr    ra addu  v0, v0, a0
+// 0x0108eb84: 0x108eb84: jr    ra addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
@@ -877,7 +877,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Get_Num_Routes_108e568()
+.method public static int32 RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -894,25 +894,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e568: 0x108e568: lui   v0, 0x80000
+// 0x0108eb8c: 0x108eb8c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x0108e56c: 0x108e56c: lw    v0, -8(v0)
+// 0x0108eb90: 0x108eb90: lw    v0, 456(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -2
+	ldc.i4.s 114
 	add
 	ldelem.i4
 	stloc.0
-// 0x0108e570: 0x108e570: jr    ra sll   zero, zero, 0
+// 0x0108eb94: 0x108eb94: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Route_CancelRequest_108e578()
+.method public static int32 RealtimeAltRoutes_Route_CancelRequest_108eb9c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -932,18 +932,18 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e578: 0x108e578: addiu v1, zero, 1
+// 0x0108eb9c: 0x108eb9c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108e57c: 0x108e57c: lui   v0, 0x80000
+// 0x0108eba0: 0x108eba0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x0108e580: 0x108e580: jr    ra sw    v1, -800(v0)
+// 0x0108eba4: 0x108eba4: jr    ra sw    v1, -336(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -200
+	ldc.i4.s -84
 	add
 	ldloc.1
 	stelem.i4
@@ -954,7 +954,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RealtimeAltRoutes_GetOrigin_108e588(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_GetOrigin_108ebac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -995,12 +995,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e588: 0x108e588: addiu sp, sp, -48
+// 0x0108ebac: 0x108ebac: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0108e58c: 0x108e58c: sw    s1, 40(sp)
+// 0x0108ebb0: 0x108ebb0: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1009,15 +1009,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108e590: 0x108e590: addu  s1, a2, zero
+// 0x0108ebb4: 0x108ebb4: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0108e594: 0x108e594: addiu a2, sp, 16
+// 0x0108ebb8: 0x108ebb8: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x0108e598: 0x108e598: sw    s0, 36(sp)
+// 0x0108ebbc: 0x108ebbc: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1026,8 +1026,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108e59c: 0x108e59c: sw    ra, 44(sp)
-// 0x0108e5a0: 0x108e5a0: jal   0x1029da8 addu  s0, a1, zero
+// 0x0108ebc0: 0x108ebc0: sw    ra, 44(sp)
+// 0x0108ebc4: 0x108ebc4: jal   0x1029db8 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -1035,36 +1035,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e5a8: 0x108e5a8: addiu v1, zero, -1
+// 0x0108ebcc: 0x108ebcc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0108e5ac: 0x108e5ac: beq   v0, v1, 0x108e624 addu  v0, zero, zero
+// 0x0108ebd0: 0x108ebd0: beq   v0, v1, 0x108ec48 addu  v0, zero, zero
 	ldloc 6
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	beq  L_108e624
+	beq  L_108ec48
 // --- basic block ---
-// 0x0108e5b4: 0x108e5b4: lw    v0, 0(s0)
+// 0x0108ebd8: 0x108ebd8: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0108e5b8: 0x108e5b8: sll   zero, zero, 0
-// 0x0108e5bc: 0x108e5bc: bne   v0, zero, 0x108e620 lui   v0, 0x0
+// 0x0108ebdc: 0x108ebdc: sll   zero, zero, 0
+// 0x0108ebe0: 0x108ebe0: bne   v0, zero, 0x108ec44 lui   v0, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_108e620
+	brtrue L_108ec44
 // --- basic block ---
-// 0x0108e5c4: 0x108e5c4: lw    v0, 576(v0)
+// 0x0108ebe8: 0x108ebe8: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1073,7 +1073,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108e5c8: 0x108e5c8: lw    a0, 12(s0)
+// 0x0108ebec: 0x108ebec: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1082,30 +1082,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e5cc: 0x108e5cc: sll   zero, zero, 0
-// 0x0108e5d0: 0x108e5d0: beq   a0, v0, 0x108e5e8 sll   zero, zero, 0
+// 0x0108ebf0: 0x108ebf0: sll   zero, zero, 0
+// 0x0108ebf4: 0x108ebf4: beq   a0, v0, 0x108ec0c sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_108e5e8
+	beq  L_108ec0c
 // --- basic block ---
-// 0x0108e5d8: 0x108e5d8: bltz  a0, 0x108e5e8 sll   zero, zero, 0
+// 0x0108ebfc: 0x108ebfc: bltz  a0, 0x108ec0c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_108e5e8
+	blt L_108ec0c
 // --- basic block ---
-// 0x0108e5e0: 0x108e5e0: jal   0x100b164 sll   zero, zero, 0
+// 0x0108ec04: 0x108ec04: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_108e5e8:
-// 0x0108e5e8: 0x108e5e8: lw    a0, 4(s0)
+L_108ec0c:
+// 0x0108ec0c: 0x108ec0c: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1114,12 +1114,12 @@ L_108e5e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108e5ec: 0x108e5ec: addiu a1, sp, 20
+// 0x0108ec10: 0x108ec10: addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x0108e5f0: 0x108e5f0: jal   0x1003adc addiu a2, sp, 24
+// 0x0108ec14: 0x108ec14: jal   0x1003adc addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1132,7 +1132,7 @@ L_108e5e8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e5f8: 0x108e5f8: lw    v1, 16(sp)
+// 0x0108ec1c: 0x108ec1c: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1141,15 +1141,15 @@ L_108e5e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e5fc: 0x108e5fc: addiu v0, zero, 1
+// 0x0108ec20: 0x108ec20: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108e600: 0x108e600: bne   v1, v0, 0x108e614 sll   zero, zero, 0
+// 0x0108ec24: 0x108ec24: bne   v1, v0, 0x108ec38 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	bne.un L_108e614
+	bne.un L_108ec38
 // --- basic block ---
-// 0x0108e608: 0x108e608: lw    v1, 24(sp)
+// 0x0108ec2c: 0x108ec2c: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1158,17 +1158,17 @@ L_108e5e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e60c: 0x108e60c: j	 0x108e624 sw    v1, 0(s1)
+// 0x0108ec30: 0x108ec30: j	 0x108ec48 sw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_108e624
+	br L_108ec48
 // --- basic block ---
-L_108e614:
-// 0x0108e614: 0x108e614: lw    v1, 20(sp)
+L_108ec38:
+// 0x0108ec38: 0x108ec38: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1177,22 +1177,22 @@ L_108e614:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e618: 0x108e618: j	 0x108e624 sw    v1, 0(s1)
+// 0x0108ec3c: 0x108ec3c: j	 0x108ec48 sw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_108e624
+	br L_108ec48
 // --- basic block ---
-L_108e620:
-// 0x0108e620: 0x108e620: addu  v0, zero, zero
+L_108ec44:
+// 0x0108ec44: 0x108ec44: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_108e624:
-// 0x0108e624: 0x108e624: lw    ra, 44(sp)
-// 0x0108e628: 0x108e628: lw    s1, 40(sp)
+L_108ec48:
+// 0x0108ec48: 0x108ec48: lw    ra, 44(sp)
+// 0x0108ec4c: 0x108ec4c: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1201,7 +1201,7 @@ L_108e624:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108e62c: 0x108e62c: lw    s0, 36(sp)
+// 0x0108ec50: 0x108ec50: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1210,7 +1210,7 @@ L_108e624:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108e630: 0x108e630: jr    ra addiu sp, sp, 48
+// 0x0108ec54: 0x108ec54: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1222,7 +1222,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeAltRoutes_TripRoute_Request_108e638(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_TripRoute_Request_108ec5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -1272,12 +1272,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e638: 0x108e638: addiu sp, sp, -136
+// 0x0108ec5c: 0x108ec5c: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x0108e63c: 0x108e63c: sw    s1, 116(sp)
+// 0x0108ec60: 0x108ec60: sw    s1, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1286,12 +1286,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108e640: 0x108e640: addiu s1, sp, 68
+// 0x0108ec64: 0x108ec64: addiu s1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 9
-// 0x0108e644: 0x108e644: sw    s4, 128(sp)
+// 0x0108ec68: 0x108ec68: sw    s4, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1300,7 +1300,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108e648: 0x108e648: sw    s3, 124(sp)
+// 0x0108ec6c: 0x108ec6c: sw    s3, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1309,7 +1309,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108e64c: 0x108e64c: sw    s0, 112(sp)
+// 0x0108ec70: 0x108ec70: sw    s0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1318,29 +1318,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108e650: 0x108e650: addu  s3, a0, zero
+// 0x0108ec74: 0x108ec74: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0108e654: 0x108e654: addu  s0, a1, zero
+// 0x0108ec78: 0x108ec78: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0108e658: 0x108e658: addu  s4, a2, zero
+// 0x0108ec7c: 0x108ec7c: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-// 0x0108e65c: 0x108e65c: addu  a0, s1, zero
+// 0x0108ec80: 0x108ec80: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0108e660: 0x108e660: addiu a1, sp, 88
+// 0x0108ec84: 0x108ec84: addiu a1, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc.2
-// 0x0108e664: 0x108e664: addiu a2, sp, 64
+// 0x0108ec88: 0x108ec88: addiu a2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.3
-// 0x0108e668: 0x108e668: sw    s2, 120(sp)
+// 0x0108ec8c: 0x108ec8c: sw    s2, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1349,8 +1349,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108e66c: 0x108e66c: sw    ra, 132(sp)
-// 0x0108e670: 0x108e670: jal   0x108e588 addu  s2, a3, zero
+// 0x0108ec90: 0x108ec90: sw    ra, 132(sp)
+// 0x0108ec94: 0x108ec94: jal   0x108ebac addu  s2, a3, zero
 	ldloc 4
 	stloc 10
 	ldloc.0
@@ -1358,24 +1358,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeAltRoutes_GetOrigin_108e588(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeAltRoutes_GetOrigin_108ebac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e678: 0x108e678: beq   v0, zero, 0x108e688 addiu v0, zero, -1
+// 0x0108ec9c: 0x108ec9c: beq   v0, zero, 0x108ecac addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brfalse L_108e688
+	brfalse L_108ecac
 // --- basic block ---
-// 0x0108e680: 0x108e680: j	 0x108e6a8 addu  s0, s1, zero
+// 0x0108eca4: 0x108eca4: j	 0x108eccc addu  s0, s1, zero
 	ldloc 9
 	stloc 7
-	br L_108e6a8
+	br L_108eccc
 // --- basic block ---
-L_108e688:
-// 0x0108e688: 0x108e688: sw    v0, 64(sp)
+L_108ecac:
+// 0x0108ecac: 0x108ecac: sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1384,7 +1384,7 @@ L_108e688:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108e68c: 0x108e68c: jal   0x1030e98 sw    v0, 92(sp)
+// 0x0108ecb0: 0x108ecb0: jal   0x1030ea8 sw    v0, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1393,16 +1393,16 @@ L_108e688:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 6
 // --- basic block ---
-// 0x0108e694: 0x108e694: beq   v0, zero, 0x108e6a8 lui   a0, 0x10000
+// 0x0108ecb8: 0x108ecb8: beq   v0, zero, 0x108eccc lui   a0, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	brfalse L_108e6a8
+	brfalse L_108eccc
 // --- basic block ---
-// 0x0108e69c: 0x108e69c: jal   0x101df50 addiu a0, a0, -31052
+// 0x0108ecc0: 0x108ecc0: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -1412,22 +1412,22 @@ L_108e688:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e6a4: 0x108e6a4: addu  s0, v0, zero
+// 0x0108ecc8: 0x108ecc8: addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-L_108e6a8:
-// 0x0108e6a8: 0x108e6a8: jal   0x10567c0 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_prepare_for_request_10567c0()
+L_108eccc:
+// 0x0108eccc: 0x108eccc: jal   0x10567d0 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_prepare_for_request_10567d0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e6b0: 0x108e6b0: lw    a1, 64(sp)
+// 0x0108ecd4: 0x108ecd4: lw    a1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1436,26 +1436,26 @@ L_108e6a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108e6b4: 0x108e6b4: lui   v0, 0x0
+// 0x0108ecd8: 0x108ecd8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0108e6b8: 0x108e6b8: addiu v0, v0, 17368
+// 0x0108ecdc: 0x108ecdc: addiu v0, v0, 17368
 	ldloc 6
 	ldc.i4 17368
 	add
 	stloc 6
-// 0x0108e6bc: 0x108e6bc: addu  a3, s0, zero
+// 0x0108ece0: 0x108ece0: addu  a3, s0, zero
 	ldloc 7
 	stloc 4
-// 0x0108e6c0: 0x108e6c0: addiu a0, sp, 88
+// 0x0108ece4: 0x108ece4: addiu a0, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc.1
-// 0x0108e6c4: 0x108e6c4: addu  a2, zero, zero
+// 0x0108ece8: 0x108ece8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108e6c8: 0x108e6c8: sw    s4, 16(sp)
+// 0x0108ecec: 0x108ecec: sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1464,7 +1464,7 @@ L_108e6a8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108e6cc: 0x108e6cc: sw    s3, 48(sp)
+// 0x0108ecf0: 0x108ecf0: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1473,7 +1473,7 @@ L_108e6a8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108e6d0: 0x108e6d0: sw    s2, 52(sp)
+// 0x0108ecf4: 0x108ecf4: sw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1482,7 +1482,7 @@ L_108e6a8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108e6d4: 0x108e6d4: sw    v0, 56(sp)
+// 0x0108ecf8: 0x108ecf8: sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1491,7 +1491,7 @@ L_108e6a8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108e6d8: 0x108e6d8: sw    zero, 20(sp)
+// 0x0108ecfc: 0x108ecfc: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1500,7 +1500,7 @@ L_108e6a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e6dc: 0x108e6dc: sw    zero, 24(sp)
+// 0x0108ed00: 0x108ed00: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1509,7 +1509,7 @@ L_108e6a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e6e0: 0x108e6e0: sw    zero, 28(sp)
+// 0x0108ed04: 0x108ed04: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1518,7 +1518,7 @@ L_108e6a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e6e4: 0x108e6e4: sw    zero, 32(sp)
+// 0x0108ed08: 0x108ed08: sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1527,7 +1527,7 @@ L_108e6a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e6e8: 0x108e6e8: sw    zero, 36(sp)
+// 0x0108ed0c: 0x108ed0c: sw    zero, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1536,7 +1536,7 @@ L_108e6a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e6ec: 0x108e6ec: sw    zero, 40(sp)
+// 0x0108ed10: 0x108ed10: sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1545,7 +1545,7 @@ L_108e6a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e6f0: 0x108e6f0: jal   0x1064224 sw    zero, 44(sp)
+// 0x0108ed14: 0x108ed14: jal   0x1064234 sw    zero, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1559,16 +1559,16 @@ L_108e6a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_request_1064224(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_request_1064234(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e6f8: 0x108e6f8: lw    ra, 132(sp)
-// 0x0108e6fc: 0x108e6fc: addiu v0, zero, 1
+// 0x0108ed1c: 0x108ed1c: lw    ra, 132(sp)
+// 0x0108ed20: 0x108ed20: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108e700: 0x108e700: lw    s4, 128(sp)
+// 0x0108ed24: 0x108ed24: lw    s4, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1577,7 +1577,7 @@ L_108e6a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108e704: 0x108e704: lw    s3, 124(sp)
+// 0x0108ed28: 0x108ed28: lw    s3, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1586,7 +1586,7 @@ L_108e6a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108e708: 0x108e708: lw    s2, 120(sp)
+// 0x0108ed2c: 0x108ed2c: lw    s2, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1595,7 +1595,7 @@ L_108e6a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108e70c: 0x108e70c: lw    s1, 116(sp)
+// 0x0108ed30: 0x108ed30: lw    s1, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1604,7 +1604,7 @@ L_108e6a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108e710: 0x108e710: lw    s0, 112(sp)
+// 0x0108ed34: 0x108ed34: lw    s0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1613,7 +1613,7 @@ L_108e6a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e714: 0x108e714: jr    ra addiu sp, sp, 136
+// 0x0108ed38: 0x108ed38: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -1625,7 +1625,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeAltRoutes_OnTripRouteRC_108e71c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_OnTripRouteRC_108ed40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -1663,16 +1663,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108e71c:
-// 0x0108e71c: 0x108e71c: addiu sp, sp, -32
+L_108ed40:
+// 0x0108ed40: 0x108ed40: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108e720: 0x108e720: addiu v1, zero, 200
+// 0x0108ed44: 0x108ed44: addiu v1, zero, 200
 	ldc.i4 200
 	stloc 6
-// 0x0108e724: 0x108e724: sw    s0, 24(sp)
+// 0x0108ed48: 0x108ed48: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1681,45 +1681,45 @@ L_108e71c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108e728: 0x108e728: sw    ra, 28(sp)
-// 0x0108e72c: 0x108e72c: addu  v0, a0, zero
+// 0x0108ed4c: 0x108ed4c: sw    ra, 28(sp)
+// 0x0108ed50: 0x108ed50: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0108e730: 0x108e730: bne   a1, v1, 0x108e740 addu  s0, a2, zero
+// 0x0108ed54: 0x108ed54: bne   a1, v1, 0x108ed64 addu  s0, a2, zero
 	ldloc.2
 	ldloc 6
 	ldloc.3
 	stloc 8
-	bne.un L_108e740
+	bne.un L_108ed64
 // --- basic block ---
-// 0x0108e738: 0x108e738: beq   a0, zero, 0x108e7a8 sll   zero, zero, 0
+// 0x0108ed5c: 0x108ed5c: beq   a0, zero, 0x108edcc sll   zero, zero, 0
 	ldloc.1
-	brfalse L_108e7a8
+	brfalse L_108edcc
 // --- basic block ---
-L_108e740:
-// 0x0108e740: 0x108e740: lui   a1, 0x20000
+L_108ed64:
+// 0x0108ed64: 0x108ed64: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108e744: 0x108e744: lui   a3, 0x20000
+// 0x0108ed68: 0x108ed68: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108e748: 0x108e748: addiu a1, a1, -6188
+// 0x0108ed6c: 0x108ed6c: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108e74c: 0x108e74c: addiu a3, a3, -6148
+// 0x0108ed70: 0x108ed70: addiu a3, a3, -5684
 	ldloc 4
-	ldc.i4 -6148
+	ldc.i4 -5684
 	add
 	stloc 4
-// 0x0108e750: 0x108e750: addiu a0, zero, 4
+// 0x0108ed74: 0x108ed74: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108e754: 0x108e754: addiu a2, zero, 278
+// 0x0108ed78: 0x108ed78: addiu a2, zero, 278
 	ldc.i4 278
 	stloc.3
-// 0x0108e758: 0x108e758: sw    v0, 20(sp)
+// 0x0108ed7c: 0x108ed7c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1728,7 +1728,7 @@ L_108e740:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108e75c: 0x108e75c: jal   0x100449c sw    s0, 16(sp)
+// 0x0108ed80: 0x108ed80: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1747,22 +1747,22 @@ L_108e740:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e764: 0x108e764: jal   0x104645c sll   zero, zero, 0
+// 0x0108ed88: 0x108ed88: jal   0x104646c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_alternative_routes_suggest_dlg_active_104645c(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_alternative_routes_suggest_dlg_active_104646c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e76c: 0x108e76c: beq   v0, zero, 0x108e7a8 sll   zero, zero, 0
+// 0x0108ed90: 0x108ed90: beq   v0, zero, 0x108edcc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108e7a8
+	brfalse L_108edcc
 // --- basic block ---
-// 0x0108e774: 0x108e774: jal   0x1094a94 addu  a0, zero, zero
+// 0x0108ed98: 0x108ed98: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1770,52 +1770,52 @@ L_108e740:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e77c: 0x108e77c: jal   0x102146c sll   zero, zero, 0
+// 0x0108eda0: 0x108eda0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e784: 0x108e784: bne   v0, zero, 0x108e798 lui   a0, 0x0
+// 0x0108eda8: 0x108eda8: bne   v0, zero, 0x108edbc lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_108e798
+	brtrue L_108edbc
 // --- basic block ---
-// 0x0108e78c: 0x108e78c: jal   0x1021900 sll   zero, zero, 0
+// 0x0108edb0: 0x108edb0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108e794: 0x108e794: lui   a0, 0x0
+// 0x0108edb8: 0x108edb8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_108e798:
-// 0x0108e798: 0x108e798: addiu a0, a0, 30092
+L_108edbc:
+// 0x0108edbc: 0x108edbc: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x0108e79c: 0x108e79c: addu  a1, s0, zero
+// 0x0108edc0: 0x108edc0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0108e7a0: 0x108e7a0: jal   0x104bfe4 addiu a2, zero, 5
+// 0x0108edc4: 0x108edc4: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -1823,14 +1823,14 @@ L_108e798:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108e7a8:
-// 0x0108e7a8: 0x108e7a8: lw    ra, 28(sp)
-// 0x0108e7ac: 0x108e7ac: lw    s0, 24(sp)
+L_108edcc:
+// 0x0108edcc: 0x108edcc: lw    ra, 28(sp)
+// 0x0108edd0: 0x108edd0: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1839,7 +1839,7 @@ L_108e7a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108e7b0: 0x108e7b0: jr    ra addiu sp, sp, 32
+// 0x0108edd4: 0x108edd4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1851,7 +1851,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Route_Request_108e7b8(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_Route_Request_108eddc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s4,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -1901,15 +1901,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108e7b8: 0x108e7b8: addiu sp, sp, -136
+// 0x0108eddc: 0x108eddc: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x0108e7bc: 0x108e7bc: lui   v0, 0x80000
+// 0x0108ede0: 0x108ede0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108e7c0: 0x108e7c0: sw    s3, 124(sp)
+// 0x0108ede4: 0x108ede4: sw    s3, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1918,7 +1918,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108e7c4: 0x108e7c4: sw    s2, 120(sp)
+// 0x0108ede8: 0x108ede8: sw    s2, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1927,7 +1927,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108e7c8: 0x108e7c8: sw    s1, 116(sp)
+// 0x0108edec: 0x108edec: sw    s1, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1936,7 +1936,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108e7cc: 0x108e7cc: sw    s0, 112(sp)
+// 0x0108edf0: 0x108edf0: sw    s0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1945,8 +1945,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108e7d0: 0x108e7d0: sw    ra, 132(sp)
-// 0x0108e7d4: 0x108e7d4: sw    s4, 128(sp)
+// 0x0108edf4: 0x108edf4: sw    ra, 132(sp)
+// 0x0108edf8: 0x108edf8: sw    s4, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1955,25 +1955,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108e7d8: 0x108e7d8: sw    zero, -800(v0)
+// 0x0108edfc: 0x108edfc: sw    zero, -336(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -200
+	ldc.i4.s -84
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e7dc: 0x108e7dc: addu  s2, a0, zero
+// 0x0108ee00: 0x108ee00: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0108e7e0: 0x108e7e0: addu  s0, a1, zero
+// 0x0108ee04: 0x108ee04: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0108e7e4: 0x108e7e4: addu  s3, a2, zero
+// 0x0108ee08: 0x108ee08: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x0108e7e8: 0x108e7e8: jal   0x10574b8 addu  s1, a3, zero
+// 0x0108ee0c: 0x108ee0c: jal   0x10574c8 addu  s1, a3, zero
 	ldloc 4
 	stloc 10
 	ldloc.0
@@ -1981,31 +1981,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_get_follow_gps_10574b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_get_follow_gps_10574c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e7f0: 0x108e7f0: beq   v0, zero, 0x108e840 addiu v0, zero, -1
+// 0x0108ee14: 0x108ee14: beq   v0, zero, 0x108ee64 addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brfalse L_108e840
+	brfalse L_108ee64
 // --- basic block ---
-// 0x0108e7f8: 0x108e7f8: addiu s4, sp, 68
+// 0x0108ee1c: 0x108ee1c: addiu s4, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 9
-// 0x0108e7fc: 0x108e7fc: addu  a0, s4, zero
+// 0x0108ee20: 0x108ee20: addu  a0, s4, zero
 	ldloc 9
 	stloc.1
-// 0x0108e800: 0x108e800: addiu a1, sp, 88
+// 0x0108ee24: 0x108ee24: addiu a1, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc.2
-// 0x0108e804: 0x108e804: jal   0x108e588 addiu a2, sp, 64
+// 0x0108ee28: 0x108ee28: jal   0x108ebac addiu a2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2015,24 +2015,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeAltRoutes_GetOrigin_108e588(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeAltRoutes_GetOrigin_108ebac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e80c: 0x108e80c: beq   v0, zero, 0x108e81c addiu v0, zero, -1
+// 0x0108ee30: 0x108ee30: beq   v0, zero, 0x108ee40 addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brfalse L_108e81c
+	brfalse L_108ee40
 // --- basic block ---
-// 0x0108e814: 0x108e814: j	 0x108e848 addu  s0, s4, zero
+// 0x0108ee38: 0x108ee38: j	 0x108ee6c addu  s0, s4, zero
 	ldloc 9
 	stloc 8
-	br L_108e848
+	br L_108ee6c
 // --- basic block ---
-L_108e81c:
-// 0x0108e81c: 0x108e81c: sw    v0, 64(sp)
+L_108ee40:
+// 0x0108ee40: 0x108ee40: sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2041,7 +2041,7 @@ L_108e81c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108e820: 0x108e820: jal   0x1030e98 sw    v0, 92(sp)
+// 0x0108ee44: 0x108ee44: jal   0x1030ea8 sw    v0, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2050,16 +2050,16 @@ L_108e81c:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 6
 // --- basic block ---
-// 0x0108e828: 0x108e828: beq   v0, zero, 0x108e848 lui   a0, 0x10000
+// 0x0108ee4c: 0x108ee4c: beq   v0, zero, 0x108ee6c lui   a0, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	brfalse L_108e848
+	brfalse L_108ee6c
 // --- basic block ---
-// 0x0108e830: 0x108e830: jal   0x101df50 addiu a0, a0, -31052
+// 0x0108ee54: 0x108ee54: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -2069,18 +2069,18 @@ L_108e81c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e838: 0x108e838: j	 0x108e848 addu  s0, v0, zero
+// 0x0108ee5c: 0x108ee5c: j	 0x108ee6c addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-	br L_108e848
+	br L_108ee6c
 // --- basic block ---
-L_108e840:
-// 0x0108e840: 0x108e840: sw    v0, 64(sp)
+L_108ee64:
+// 0x0108ee64: 0x108ee64: sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2089,7 +2089,7 @@ L_108e840:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108e844: 0x108e844: sw    v0, 92(sp)
+// 0x0108ee68: 0x108ee68: sw    v0, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2098,14 +2098,14 @@ L_108e840:
 	add
 	ldloc 6
 	stelem.i4
-L_108e848:
-// 0x0108e848: 0x108e848: jal   0x10567c0 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_prepare_for_request_10567c0()
+L_108ee6c:
+// 0x0108ee6c: 0x108ee6c: jal   0x10567d0 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_prepare_for_request_10567d0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e850: 0x108e850: lw    a1, 64(sp)
+// 0x0108ee74: 0x108ee74: lw    a1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2114,26 +2114,26 @@ L_108e848:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108e854: 0x108e854: lui   v0, 0x0
+// 0x0108ee78: 0x108ee78: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0108e858: 0x108e858: addiu v0, v0, 17392
+// 0x0108ee7c: 0x108ee7c: addiu v0, v0, 17392
 	ldloc 6
 	ldc.i4 17392
 	add
 	stloc 6
-// 0x0108e85c: 0x108e85c: addu  a3, s0, zero
+// 0x0108ee80: 0x108ee80: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x0108e860: 0x108e860: addiu a0, sp, 88
+// 0x0108ee84: 0x108ee84: addiu a0, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc.1
-// 0x0108e864: 0x108e864: addu  a2, zero, zero
+// 0x0108ee88: 0x108ee88: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108e868: 0x108e868: sw    s3, 16(sp)
+// 0x0108ee8c: 0x108ee8c: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2142,7 +2142,7 @@ L_108e848:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108e86c: 0x108e86c: sw    s2, 48(sp)
+// 0x0108ee90: 0x108ee90: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2151,7 +2151,7 @@ L_108e848:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108e870: 0x108e870: sw    s1, 52(sp)
+// 0x0108ee94: 0x108ee94: sw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2160,7 +2160,7 @@ L_108e848:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108e874: 0x108e874: sw    v0, 56(sp)
+// 0x0108ee98: 0x108ee98: sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2169,7 +2169,7 @@ L_108e848:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108e878: 0x108e878: sw    zero, 20(sp)
+// 0x0108ee9c: 0x108ee9c: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2178,7 +2178,7 @@ L_108e848:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e87c: 0x108e87c: sw    zero, 24(sp)
+// 0x0108eea0: 0x108eea0: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2187,7 +2187,7 @@ L_108e848:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e880: 0x108e880: sw    zero, 28(sp)
+// 0x0108eea4: 0x108eea4: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2196,7 +2196,7 @@ L_108e848:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e884: 0x108e884: sw    zero, 32(sp)
+// 0x0108eea8: 0x108eea8: sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2205,7 +2205,7 @@ L_108e848:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e888: 0x108e888: sw    zero, 36(sp)
+// 0x0108eeac: 0x108eeac: sw    zero, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2214,7 +2214,7 @@ L_108e848:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e88c: 0x108e88c: sw    zero, 40(sp)
+// 0x0108eeb0: 0x108eeb0: sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2223,7 +2223,7 @@ L_108e848:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108e890: 0x108e890: jal   0x1064224 sw    zero, 44(sp)
+// 0x0108eeb4: 0x108eeb4: jal   0x1064234 sw    zero, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2237,16 +2237,16 @@ L_108e848:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_request_1064224(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_request_1064234(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108e898: 0x108e898: lw    ra, 132(sp)
-// 0x0108e89c: 0x108e89c: addiu v0, zero, 1
+// 0x0108eebc: 0x108eebc: lw    ra, 132(sp)
+// 0x0108eec0: 0x108eec0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108e8a0: 0x108e8a0: lw    s4, 128(sp)
+// 0x0108eec4: 0x108eec4: lw    s4, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2255,7 +2255,7 @@ L_108e848:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108e8a4: 0x108e8a4: lw    s3, 124(sp)
+// 0x0108eec8: 0x108eec8: lw    s3, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2264,7 +2264,7 @@ L_108e848:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108e8a8: 0x108e8a8: lw    s2, 120(sp)
+// 0x0108eecc: 0x108eecc: lw    s2, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2273,7 +2273,7 @@ L_108e848:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108e8ac: 0x108e8ac: lw    s1, 116(sp)
+// 0x0108eed0: 0x108eed0: lw    s1, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2282,7 +2282,7 @@ L_108e848:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108e8b0: 0x108e8b0: lw    s0, 112(sp)
+// 0x0108eed4: 0x108eed4: lw    s0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2291,7 +2291,7 @@ L_108e848:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108e8b4: 0x108e8b4: jr    ra addiu sp, sp, 136
+// 0x0108eed8: 0x108eed8: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -2303,7 +2303,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeAltRoutes_OnRouteSegments_108e8bc(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_OnRouteSegments_108eee0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 s2,int32 ra,int32 t0,int32 t1,int32 t2)
@@ -2356,13 +2356,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108e8bc:
-// 0x0108e8bc: 0x108e8bc: addiu sp, sp, -56
+L_108eee0:
+// 0x0108eee0: 0x108eee0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0108e8c0: 0x108e8c0: sw    s2, 48(sp)
+// 0x0108eee4: 0x108eee4: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2371,13 +2371,13 @@ L_108e8bc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108e8c4: 0x108e8c4: lui   a3, 0x20000
+// 0x0108eee8: 0x108eee8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108e8c8: 0x108e8c8: lui   s2, 0x20000
+// 0x0108eeec: 0x108eeec: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x0108e8cc: 0x108e8cc: sw    s1, 44(sp)
+// 0x0108eef0: 0x108eef0: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2386,7 +2386,7 @@ L_108e8bc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108e8d0: 0x108e8d0: sw    s0, 40(sp)
+// 0x0108eef4: 0x108eef4: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2395,27 +2395,27 @@ L_108e8bc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108e8d4: 0x108e8d4: addu  s1, a2, zero
+// 0x0108eef8: 0x108eef8: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0108e8d8: 0x108e8d8: addu  s0, a1, zero
+// 0x0108eefc: 0x108eefc: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0108e8dc: 0x108e8dc: addiu a3, a3, -6100
+// 0x0108ef00: 0x108ef00: addiu a3, a3, -5636
 	ldloc 4
-	ldc.i4 -6100
+	ldc.i4 -5636
 	add
 	stloc 4
-// 0x0108e8e0: 0x108e8e0: addiu a0, zero, 1
+// 0x0108ef04: 0x108ef04: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108e8e4: 0x108e8e4: addiu a1, s2, -6188
+// 0x0108ef08: 0x108ef08: addiu a1, s2, -5724
 	ldloc 10
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108e8e8: 0x108e8e8: sw    ra, 52(sp)
-// 0x0108e8ec: 0x108e8ec: jal   0x100449c addiu a2, zero, 180
+// 0x0108ef0c: 0x108ef0c: sw    ra, 52(sp)
+// 0x0108ef10: 0x108ef10: jal   0x100449c addiu a2, zero, 180
 	ldc.i4 180
 	stloc.3
 	ldloc.0
@@ -2428,39 +2428,39 @@ L_108e8bc:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e8f4: 0x108e8f4: lui   v0, 0x80000
+// 0x0108ef18: 0x108ef18: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108e8f8: 0x108e8f8: lw    v0, -800(v0)
+// 0x0108ef1c: 0x108ef1c: lw    v0, -336(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -200
+	ldc.i4.s -84
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108e8fc: 0x108e8fc: sll   zero, zero, 0
-// 0x0108e900: 0x108e900: beq   v0, zero, 0x108e924 lui   a3, 0x20000
+// 0x0108ef20: 0x108ef20: sll   zero, zero, 0
+// 0x0108ef24: 0x108ef24: beq   v0, zero, 0x108ef48 lui   a3, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 4
-	brfalse L_108e924
+	brfalse L_108ef48
 // --- basic block ---
-// 0x0108e908: 0x108e908: addiu a1, s2, -6188
+// 0x0108ef2c: 0x108ef2c: addiu a1, s2, -5724
 	ldloc 10
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108e90c: 0x108e90c: addiu a3, a3, -6064
+// 0x0108ef30: 0x108ef30: addiu a3, a3, -5600
 	ldloc 4
-	ldc.i4 -6064
+	ldc.i4 -5600
 	add
 	stloc 4
-// 0x0108e910: 0x108e910: addiu a0, zero, 1
+// 0x0108ef34: 0x108ef34: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108e914: 0x108e914: jal   0x100449c addiu a2, zero, 182
+// 0x0108ef38: 0x108ef38: jal   0x100449c addiu a2, zero, 182
 	ldc.i4 182
 	stloc.3
 	ldloc.0
@@ -2473,18 +2473,18 @@ L_108e8bc:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108e91c: 0x108e91c: j	 0x108e964 sll   zero, zero, 0
-	br L_108e964
+// 0x0108ef40: 0x108ef40: j	 0x108ef88 sll   zero, zero, 0
+	br L_108ef88
 // --- basic block ---
-L_108e924:
-// 0x0108e924: 0x108e924: lw    a0, 0(s0)
+L_108ef48:
+// 0x0108ef48: 0x108ef48: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108e928: 0x108e928: lw    a1, 4(s0)
+// 0x0108ef4c: 0x108ef4c: lw    a1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2493,7 +2493,7 @@ L_108e924:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108e92c: 0x108e92c: lw    a2, 8(s0)
+// 0x0108ef50: 0x108ef50: lw    a2, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2502,7 +2502,7 @@ L_108e924:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108e930: 0x108e930: lw    a3, 28(s1)
+// 0x0108ef54: 0x108ef54: lw    a3, 28(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2511,7 +2511,7 @@ L_108e924:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108e934: 0x108e934: lw    t1, 12(s1)
+// 0x0108ef58: 0x108ef58: lw    t1, 12(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2520,7 +2520,7 @@ L_108e924:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108e938: 0x108e938: lw    v0, 20(s0)
+// 0x0108ef5c: 0x108ef5c: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2529,14 +2529,14 @@ L_108e924:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108e93c: 0x108e93c: lw    t2, 0(s1)
+// 0x0108ef60: 0x108ef60: lw    t2, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x0108e940: 0x108e940: lw    t0, 40(s0)
+// 0x0108ef64: 0x108ef64: lw    t0, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2545,7 +2545,7 @@ L_108e924:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108e944: 0x108e944: lw    v1, 32(s0)
+// 0x0108ef68: 0x108ef68: lw    v1, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2554,7 +2554,7 @@ L_108e924:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108e948: 0x108e948: sw    t2, 16(sp)
+// 0x0108ef6c: 0x108ef6c: sw    t2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2563,7 +2563,7 @@ L_108e924:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108e94c: 0x108e94c: sw    t1, 20(sp)
+// 0x0108ef70: 0x108ef70: sw    t1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2572,7 +2572,7 @@ L_108e924:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108e950: 0x108e950: sw    t0, 24(sp)
+// 0x0108ef74: 0x108ef74: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2581,7 +2581,7 @@ L_108e924:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108e954: 0x108e954: sw    v1, 28(sp)
+// 0x0108ef78: 0x108ef78: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2590,7 +2590,7 @@ L_108e924:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108e958: 0x108e958: sw    v0, 32(sp)
+// 0x0108ef7c: 0x108ef7c: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2599,7 +2599,7 @@ L_108e924:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108e95c: 0x108e95c: jal   0x105bd58 sw    zero, 36(sp)
+// 0x0108ef80: 0x108ef80: jal   0x105bd68 sw    zero, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2613,14 +2613,14 @@ L_108e924:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_on_route_105bd58(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_on_route_105bd68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_108e964:
-// 0x0108e964: 0x108e964: lw    ra, 52(sp)
-// 0x0108e968: 0x108e968: lw    s2, 48(sp)
+L_108ef88:
+// 0x0108ef88: 0x108ef88: lw    ra, 52(sp)
+// 0x0108ef8c: 0x108ef8c: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2629,7 +2629,7 @@ L_108e964:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108e96c: 0x108e96c: lw    s1, 44(sp)
+// 0x0108ef90: 0x108ef90: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2638,7 +2638,7 @@ L_108e964:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108e970: 0x108e970: lw    s0, 40(sp)
+// 0x0108ef94: 0x108ef94: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2647,7 +2647,7 @@ L_108e964:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108e974: 0x108e974: jr    ra addiu sp, sp, 56
+// 0x0108ef98: 0x108ef98: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2659,7 +2659,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeAltRoutes_OnTripRouteResults_108e97c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_OnTripRouteResults_108efa0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s0,int32 s3,int32 s4,int32 s1,int32 ra)
@@ -2709,13 +2709,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108e97c:
-// 0x0108e97c: 0x108e97c: addiu sp, sp, -48
+L_108efa0:
+// 0x0108efa0: 0x108efa0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0108e980: 0x108e980: sw    s1, 28(sp)
+// 0x0108efa4: 0x108efa4: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2724,8 +2724,8 @@ L_108e97c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108e984: 0x108e984: sw    ra, 44(sp)
-// 0x0108e988: 0x108e988: sw    s4, 40(sp)
+// 0x0108efa8: 0x108efa8: sw    ra, 44(sp)
+// 0x0108efac: 0x108efac: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2734,7 +2734,7 @@ L_108e97c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108e98c: 0x108e98c: sw    s3, 36(sp)
+// 0x0108efb0: 0x108efb0: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2743,7 +2743,7 @@ L_108e97c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108e990: 0x108e990: sw    s2, 32(sp)
+// 0x0108efb4: 0x108efb4: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2752,7 +2752,7 @@ L_108e97c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108e994: 0x108e994: sw    s0, 24(sp)
+// 0x0108efb8: 0x108efb8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2761,38 +2761,38 @@ L_108e97c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108e998: 0x108e998: addu  v0, a0, zero
+// 0x0108efbc: 0x108efbc: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0108e99c: 0x108e99c: beq   a0, zero, 0x108e9cc addu  s1, a2, zero
+// 0x0108efc0: 0x108efc0: beq   a0, zero, 0x108eff0 addu  s1, a2, zero
 	ldloc.1
 	ldloc.3
 	stloc 12
-	brfalse L_108e9cc
+	brfalse L_108eff0
 // --- basic block ---
-// 0x0108e9a4: 0x108e9a4: lui   a1, 0x20000
+// 0x0108efc8: 0x108efc8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108e9a8: 0x108e9a8: lui   a3, 0x20000
+// 0x0108efcc: 0x108efcc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108e9ac: 0x108e9ac: addiu a1, a1, -6188
+// 0x0108efd0: 0x108efd0: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108e9b0: 0x108e9b0: addiu a3, a3, -6004
+// 0x0108efd4: 0x108efd4: addiu a3, a3, -5540
 	ldloc 4
-	ldc.i4 -6004
+	ldc.i4 -5540
 	add
 	stloc 4
-// 0x0108e9b4: 0x108e9b4: addiu a0, zero, 4
+// 0x0108efd8: 0x108efd8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108e9b8: 0x108e9b8: addiu a2, zero, 156
+// 0x0108efdc: 0x108efdc: addiu a2, zero, 156
 	ldc.i4 156
 	stloc.3
-// 0x0108e9bc: 0x108e9bc: jal   0x100449c sw    v0, 16(sp)
+// 0x0108efe0: 0x108efe0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2811,56 +2811,56 @@ L_108e97c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108e9c4: 0x108e9c4: j	 0x108ea80 sll   zero, zero, 0
-	br L_108ea80
+// 0x0108efe8: 0x108efe8: j	 0x108f0a4 sll   zero, zero, 0
+	br L_108f0a4
 // --- basic block ---
-L_108e9cc:
-// 0x0108e9cc: 0x108e9cc: slti  v0, a1, 4
+L_108eff0:
+// 0x0108eff0: 0x108eff0: slti  v0, a1, 4
 	ldloc.2
 	ldc.i4.4
 	clt
 	stloc 6
-// 0x0108e9d0: 0x108e9d0: bne   v0, zero, 0x108e9dc addu  s0, a1, zero
+// 0x0108eff4: 0x108eff4: bne   v0, zero, 0x108f000 addu  s0, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 9
-	brtrue L_108e9dc
+	brtrue L_108f000
 // --- basic block ---
-// 0x0108e9d8: 0x108e9d8: addiu s0, zero, 3
+// 0x0108effc: 0x108effc: addiu s0, zero, 3
 	ldc.i4.3
 	stloc 9
-L_108e9dc:
-// 0x0108e9dc: 0x108e9dc: lui   a1, 0x20000
+L_108f000:
+// 0x0108f000: 0x108f000: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108e9e0: 0x108e9e0: lui   a3, 0x20000
+// 0x0108f004: 0x108f004: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108e9e4: 0x108e9e4: lui   s2, 0x80000
+// 0x0108f008: 0x108f008: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0108e9e8: 0x108e9e8: addiu a1, a1, -6188
+// 0x0108f00c: 0x108f00c: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108e9ec: 0x108e9ec: addiu a3, a3, -5952
+// 0x0108f010: 0x108f010: addiu a3, a3, -5488
 	ldloc 4
-	ldc.i4 -5952
+	ldc.i4 -5488
 	add
 	stloc 4
-// 0x0108e9f0: 0x108e9f0: addiu a0, zero, 1
+// 0x0108f014: 0x108f014: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108e9f4: 0x108e9f4: addiu a2, zero, 160
+// 0x0108f018: 0x108f018: addiu a2, zero, 160
 	ldc.i4 160
 	stloc.3
-// 0x0108e9f8: 0x108e9f8: addiu s2, s2, -796
+// 0x0108f01c: 0x108f01c: addiu s2, s2, -332
 	ldloc 7
-	ldc.i4 -796
+	ldc.i4 -332
 	add
 	stloc 7
-// 0x0108e9fc: 0x108e9fc: sw    s0, 16(sp)
+// 0x0108f020: 0x108f020: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2869,7 +2869,7 @@ L_108e9dc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108ea00: 0x108ea00: jal   0x100449c addu  s3, zero, zero
+// 0x0108f024: 0x108f024: jal   0x100449c addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -2882,10 +2882,10 @@ L_108e9dc:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ea08: 0x108ea08: addu  s4, zero, zero
+// 0x0108f02c: 0x108f02c: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x0108ea0c: 0x108ea0c: j	 0x108ea20 sw    s0, 788(s2)
+// 0x0108f030: 0x108f030: j	 0x108f044 sw    s0, 788(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2894,10 +2894,10 @@ L_108e9dc:
 	add
 	ldloc 9
 	stelem.i4
-	br L_108ea20
+	br L_108f044
 // --- basic block ---
-L_108ea14:
-// 0x0108ea14: 0x108ea14: jal   0x1001800 addiu s4, s4, 1
+L_108f038:
+// 0x0108f038: 0x108f038: jal   0x1001800 addiu s4, s4, 1
 	ldloc 11
 	ldc.i4.1
 	add
@@ -2911,39 +2911,39 @@ L_108ea14:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ea1c: 0x108ea1c: addiu s3, s3, 44
+// 0x0108f040: 0x108f040: addiu s3, s3, 44
 	ldloc 10
 	ldc.i4.s 44
 	add
 	stloc 10
-L_108ea20:
-// 0x0108ea20: 0x108ea20: addu  a0, s2, s3
+L_108f044:
+// 0x0108f044: 0x108f044: addu  a0, s2, s3
 	ldloc 7
 	ldloc 10
 	add
 	stloc.1
-// 0x0108ea24: 0x108ea24: slt   v0, s4, s0
+// 0x0108f048: 0x108f048: slt   v0, s4, s0
 	ldloc 11
 	ldloc 9
 	clt
 	stloc 6
-// 0x0108ea28: 0x108ea28: addiu a0, a0, 800
+// 0x0108f04c: 0x108f04c: addiu a0, a0, 800
 	ldloc.1
 	ldc.i4 800
 	add
 	stloc.1
-// 0x0108ea2c: 0x108ea2c: addu  a1, s1, s3
+// 0x0108f050: 0x108f050: addu  a1, s1, s3
 	ldloc 12
 	ldloc 10
 	add
 	stloc.2
-// 0x0108ea30: 0x108ea30: bne   v0, zero, 0x108ea14 addiu a2, zero, 44
+// 0x0108f054: 0x108f054: bne   v0, zero, 0x108f038 addiu a2, zero, 44
 	ldloc 6
 	ldc.i4.s 44
 	stloc.3
-	brtrue L_108ea14
+	brtrue L_108f038
 // --- basic block ---
-// 0x0108ea38: 0x108ea38: lw    v0, 808(s2)
+// 0x0108f05c: 0x108f05c: lw    v0, 808(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2952,7 +2952,7 @@ L_108ea20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108ea3c: 0x108ea3c: lw    v1, 804(s2)
+// 0x0108f060: 0x108f060: lw    v1, 804(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2961,23 +2961,23 @@ L_108ea20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108ea40: 0x108ea40: lui   a0, 0x10000
+// 0x0108f064: 0x108f064: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108ea44: 0x108ea44: lui   a1, 0x80000
+// 0x0108f068: 0x108f068: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x0108ea48: 0x108ea48: addiu a0, a0, -29748
+// 0x0108f06c: 0x108f06c: addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
 	stloc.1
-// 0x0108ea4c: 0x108ea4c: addiu a1, a1, -16
+// 0x0108f070: 0x108f070: addiu a1, a1, 448
 	ldloc.2
-	ldc.i4.s -16
+	ldc.i4 448
 	add
 	stloc.2
-// 0x0108ea50: 0x108ea50: sw    v1, 796(s2)
+// 0x0108f074: 0x108f074: sw    v1, 796(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2986,7 +2986,7 @@ L_108ea20:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108ea54: 0x108ea54: jal   0x101f76c sw    v0, 792(s2)
+// 0x0108f078: 0x108f078: jal   0x101f77c sw    v0, 792(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3000,25 +3000,25 @@ L_108ea20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ea5c: 0x108ea5c: lui   a0, 0x10000
+// 0x0108f080: 0x108f080: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108ea60: 0x108ea60: lui   a1, 0x80000
+// 0x0108f084: 0x108f084: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x0108ea64: 0x108ea64: addiu a0, a0, -29760
+// 0x0108f088: 0x108f088: addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
 	stloc.1
-// 0x0108ea68: 0x108ea68: jal   0x101f76c addiu a1, a1, -24
+// 0x0108f08c: 0x108f08c: jal   0x101f77c addiu a1, a1, 440
 	ldloc.2
-	ldc.i4.s -24
+	ldc.i4 440
 	add
 	stloc.2
 	ldloc.0
@@ -3026,36 +3026,36 @@ L_108ea20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ea70: 0x108ea70: jal   0x1047980 sll   zero, zero, 0
+// 0x0108f094: 0x108f094: jal   0x1047990 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::roadmap_alternative_routes_suggest_route_dialog_1047980(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::roadmap_alternative_routes_suggest_route_dialog_1047990(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ea78: 0x108ea78: jal   0x102146c sll   zero, zero, 0
+// 0x0108f09c: 0x108f09c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_108ea80:
-// 0x0108ea80: 0x108ea80: lw    ra, 44(sp)
-// 0x0108ea84: 0x108ea84: lw    s4, 40(sp)
+L_108f0a4:
+// 0x0108f0a4: 0x108f0a4: lw    ra, 44(sp)
+// 0x0108f0a8: 0x108f0a8: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3064,7 +3064,7 @@ L_108ea80:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108ea88: 0x108ea88: lw    s3, 36(sp)
+// 0x0108f0ac: 0x108f0ac: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3073,7 +3073,7 @@ L_108ea80:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108ea8c: 0x108ea8c: lw    s2, 32(sp)
+// 0x0108f0b0: 0x108f0b0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3082,7 +3082,7 @@ L_108ea80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108ea90: 0x108ea90: lw    s1, 28(sp)
+// 0x0108f0b4: 0x108f0b4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3091,7 +3091,7 @@ L_108ea80:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108ea94: 0x108ea94: lw    s0, 24(sp)
+// 0x0108f0b8: 0x108f0b8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3100,7 +3100,7 @@ L_108ea80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108ea98: 0x108ea98: jr    ra addiu sp, sp, 48
+// 0x0108f0bc: 0x108f0bc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3112,7 +3112,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeAltRoutes_OnRouteResults_108eaa0(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_OnRouteResults_108f0c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 v0,int32 v1,int32 s0,int32 s3,int32 s4,int32 s1,int32 ra)
@@ -3162,13 +3162,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108eaa0:
-// 0x0108eaa0: 0x108eaa0: addiu sp, sp, -48
+L_108f0c4:
+// 0x0108f0c4: 0x108f0c4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0108eaa4: 0x108eaa4: sw    s2, 32(sp)
+// 0x0108f0c8: 0x108f0c8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3177,7 +3177,7 @@ L_108eaa0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108eaa8: 0x108eaa8: sw    s1, 28(sp)
+// 0x0108f0cc: 0x108f0cc: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3186,8 +3186,8 @@ L_108eaa0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108eaac: 0x108eaac: sw    ra, 44(sp)
-// 0x0108eab0: 0x108eab0: sw    s4, 40(sp)
+// 0x0108f0d0: 0x108f0d0: sw    ra, 44(sp)
+// 0x0108f0d4: 0x108f0d4: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3196,7 +3196,7 @@ L_108eaa0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108eab4: 0x108eab4: sw    s3, 36(sp)
+// 0x0108f0d8: 0x108f0d8: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3205,7 +3205,7 @@ L_108eaa0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108eab8: 0x108eab8: sw    s0, 24(sp)
+// 0x0108f0dc: 0x108f0dc: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3214,44 +3214,44 @@ L_108eaa0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108eabc: 0x108eabc: addu  s2, a0, zero
+// 0x0108f0e0: 0x108f0e0: addu  s2, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0108eac0: 0x108eac0: beq   a0, zero, 0x108eaf8 addu  s1, a2, zero
+// 0x0108f0e4: 0x108f0e4: beq   a0, zero, 0x108f11c addu  s1, a2, zero
 	ldloc.1
 	ldloc.3
 	stloc 12
-	brfalse L_108eaf8
+	brfalse L_108f11c
 // --- basic block ---
-// 0x0108eac8: 0x108eac8: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x0108f0ec: 0x108f0ec: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108ead0: 0x108ead0: lui   a1, 0x20000
+// 0x0108f0f4: 0x108f0f4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108ead4: 0x108ead4: lui   a3, 0x20000
+// 0x0108f0f8: 0x108f0f8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ead8: 0x108ead8: addiu a1, a1, -6188
+// 0x0108f0fc: 0x108f0fc: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108eadc: 0x108eadc: addiu a3, a3, -5916
+// 0x0108f100: 0x108f100: addiu a3, a3, -5452
 	ldloc 4
-	ldc.i4 -5916
+	ldc.i4 -5452
 	add
 	stloc 4
-// 0x0108eae0: 0x108eae0: addiu a0, zero, 4
+// 0x0108f104: 0x108f104: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108eae4: 0x108eae4: addiu a2, zero, 131
+// 0x0108f108: 0x108f108: addiu a2, zero, 131
 	ldc.i4 131
 	stloc.3
-// 0x0108eae8: 0x108eae8: jal   0x100449c sw    s2, 16(sp)
+// 0x0108f10c: 0x108f10c: jal   0x100449c sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3270,56 +3270,56 @@ L_108eaa0:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108eaf0: 0x108eaf0: j	 0x108eb80 sll   zero, zero, 0
-	br L_108eb80
+// 0x0108f114: 0x108f114: j	 0x108f1a4 sll   zero, zero, 0
+	br L_108f1a4
 // --- basic block ---
-L_108eaf8:
-// 0x0108eaf8: 0x108eaf8: slti  v0, a1, 4
+L_108f11c:
+// 0x0108f11c: 0x108f11c: slti  v0, a1, 4
 	ldloc.2
 	ldc.i4.4
 	clt
 	stloc 7
-// 0x0108eafc: 0x108eafc: bne   v0, zero, 0x108eb08 addu  s0, a1, zero
+// 0x0108f120: 0x108f120: bne   v0, zero, 0x108f12c addu  s0, a1, zero
 	ldloc 7
 	ldloc.2
 	stloc 9
-	brtrue L_108eb08
+	brtrue L_108f12c
 // --- basic block ---
-// 0x0108eb04: 0x108eb04: addiu s0, zero, 3
+// 0x0108f128: 0x108f128: addiu s0, zero, 3
 	ldc.i4.3
 	stloc 9
-L_108eb08:
-// 0x0108eb08: 0x108eb08: lui   a1, 0x20000
+L_108f12c:
+// 0x0108f12c: 0x108f12c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108eb0c: 0x108eb0c: lui   a3, 0x20000
+// 0x0108f130: 0x108f130: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108eb10: 0x108eb10: lui   s2, 0x80000
+// 0x0108f134: 0x108f134: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108eb14: 0x108eb14: addiu a1, a1, -6188
+// 0x0108f138: 0x108f138: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108eb18: 0x108eb18: addiu a3, a3, -5952
+// 0x0108f13c: 0x108f13c: addiu a3, a3, -5488
 	ldloc 4
-	ldc.i4 -5952
+	ldc.i4 -5488
 	add
 	stloc 4
-// 0x0108eb1c: 0x108eb1c: addiu a0, zero, 1
+// 0x0108f140: 0x108f140: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108eb20: 0x108eb20: addiu a2, zero, 135
+// 0x0108f144: 0x108f144: addiu a2, zero, 135
 	ldc.i4 135
 	stloc.3
-// 0x0108eb24: 0x108eb24: addiu s2, s2, -796
+// 0x0108f148: 0x108f148: addiu s2, s2, -332
 	ldloc 6
-	ldc.i4 -796
+	ldc.i4 -332
 	add
 	stloc 6
-// 0x0108eb28: 0x108eb28: sw    s0, 16(sp)
+// 0x0108f14c: 0x108f14c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3328,7 +3328,7 @@ L_108eb08:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108eb2c: 0x108eb2c: jal   0x100449c addu  s3, zero, zero
+// 0x0108f150: 0x108f150: jal   0x100449c addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -3341,10 +3341,10 @@ L_108eb08:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108eb34: 0x108eb34: addu  s4, zero, zero
+// 0x0108f158: 0x108f158: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x0108eb38: 0x108eb38: j	 0x108eb4c sw    s0, 788(s2)
+// 0x0108f15c: 0x108f15c: j	 0x108f170 sw    s0, 788(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3353,10 +3353,10 @@ L_108eb08:
 	add
 	ldloc 9
 	stelem.i4
-	br L_108eb4c
+	br L_108f170
 // --- basic block ---
-L_108eb40:
-// 0x0108eb40: 0x108eb40: jal   0x1001800 addiu s4, s4, 1
+L_108f164:
+// 0x0108f164: 0x108f164: jal   0x1001800 addiu s4, s4, 1
 	ldloc 11
 	ldc.i4.1
 	add
@@ -3370,39 +3370,39 @@ L_108eb40:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108eb48: 0x108eb48: addiu s3, s3, 44
+// 0x0108f16c: 0x108f16c: addiu s3, s3, 44
 	ldloc 10
 	ldc.i4.s 44
 	add
 	stloc 10
-L_108eb4c:
-// 0x0108eb4c: 0x108eb4c: addu  a0, s2, s3
+L_108f170:
+// 0x0108f170: 0x108f170: addu  a0, s2, s3
 	ldloc 6
 	ldloc 10
 	add
 	stloc.1
-// 0x0108eb50: 0x108eb50: slt   v0, s4, s0
+// 0x0108f174: 0x108f174: slt   v0, s4, s0
 	ldloc 11
 	ldloc 9
 	clt
 	stloc 7
-// 0x0108eb54: 0x108eb54: addiu a0, a0, 800
+// 0x0108f178: 0x108f178: addiu a0, a0, 800
 	ldloc.1
 	ldc.i4 800
 	add
 	stloc.1
-// 0x0108eb58: 0x108eb58: addu  a1, s1, s3
+// 0x0108f17c: 0x108f17c: addu  a1, s1, s3
 	ldloc 12
 	ldloc 10
 	add
 	stloc.2
-// 0x0108eb5c: 0x108eb5c: bne   v0, zero, 0x108eb40 addiu a2, zero, 44
+// 0x0108f180: 0x108f180: bne   v0, zero, 0x108f164 addiu a2, zero, 44
 	ldloc 7
 	ldc.i4.s 44
 	stloc.3
-	brtrue L_108eb40
+	brtrue L_108f164
 // --- basic block ---
-// 0x0108eb64: 0x108eb64: lw    v1, 808(s2)
+// 0x0108f188: 0x108f188: lw    v1, 808(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3411,7 +3411,7 @@ L_108eb4c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108eb68: 0x108eb68: lw    v0, 804(s2)
+// 0x0108f18c: 0x108f18c: lw    v0, 804(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3420,7 +3420,7 @@ L_108eb4c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108eb6c: 0x108eb6c: sw    v1, 792(s2)
+// 0x0108f190: 0x108f190: sw    v1, 792(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3429,7 +3429,7 @@ L_108eb4c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108eb70: 0x108eb70: jal   0x10466d0 sw    v0, 796(s2)
+// 0x0108f194: 0x108f194: jal   0x10466e0 sw    v0, 796(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3443,25 +3443,25 @@ L_108eb4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::roadmap_alternative_routes_routes_dialog_10466d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::roadmap_alternative_routes_routes_dialog_10466e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108eb78: 0x108eb78: jal   0x102146c sll   zero, zero, 0
+// 0x0108f19c: 0x108f19c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_108eb80:
-// 0x0108eb80: 0x108eb80: lw    ra, 44(sp)
-// 0x0108eb84: 0x108eb84: lw    s4, 40(sp)
+L_108f1a4:
+// 0x0108f1a4: 0x108f1a4: lw    ra, 44(sp)
+// 0x0108f1a8: 0x108f1a8: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3470,7 +3470,7 @@ L_108eb80:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108eb88: 0x108eb88: lw    s3, 36(sp)
+// 0x0108f1ac: 0x108f1ac: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3479,7 +3479,7 @@ L_108eb80:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108eb8c: 0x108eb8c: lw    s2, 32(sp)
+// 0x0108f1b0: 0x108f1b0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3488,7 +3488,7 @@ L_108eb80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108eb90: 0x108eb90: lw    s1, 28(sp)
+// 0x0108f1b4: 0x108f1b4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3497,7 +3497,7 @@ L_108eb80:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108eb94: 0x108eb94: lw    s0, 24(sp)
+// 0x0108f1b8: 0x108f1b8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3506,7 +3506,7 @@ L_108eb80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108eb98: 0x108eb98: jr    ra addiu sp, sp, 48
+// 0x0108f1bc: 0x108f1bc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3518,7 +3518,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RealtimeAltRoutes_Add_Route_108eba0(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAltRoutes_Add_Route_108f1c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 lo,int32 v0,int32 v1,int32 s2,int32 s1,int32 t0,int32 t1,int32 ra)
@@ -3571,12 +3571,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108eba0: 0x108eba0: addiu sp, sp, -40
+// 0x0108f1c4: 0x108f1c4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0108eba4: 0x108eba4: sw    s0, 24(sp)
+// 0x0108f1c8: 0x108f1c8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3585,15 +3585,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108eba8: 0x108eba8: lui   s0, 0x80000
+// 0x0108f1cc: 0x108f1cc: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108ebac: 0x108ebac: addiu s0, s0, -796
+// 0x0108f1d0: 0x108f1d0: addiu s0, s0, -332
 	ldloc 6
-	ldc.i4 -796
+	ldc.i4 -332
 	add
 	stloc 6
-// 0x0108ebb0: 0x108ebb0: lw    v0, 9320(s0)
+// 0x0108f1d4: 0x108f1d4: lw    v0, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3602,10 +3602,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108ebb4: 0x108ebb4: addiu v1, zero, 10
+// 0x0108f1d8: 0x108f1d8: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 9
-// 0x0108ebb8: 0x108ebb8: sw    s1, 28(sp)
+// 0x0108f1dc: 0x108f1dc: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3614,8 +3614,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108ebbc: 0x108ebbc: sw    ra, 36(sp)
-// 0x0108ebc0: 0x108ebc0: sw    s2, 32(sp)
+// 0x0108f1e0: 0x108f1e0: sw    ra, 36(sp)
+// 0x0108f1e4: 0x108f1e4: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3624,65 +3624,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108ebc4: 0x108ebc4: bne   v0, v1, 0x108ebe8 addu  s1, a0, zero
+// 0x0108f1e8: 0x108f1e8: bne   v0, v1, 0x108f20c addu  s1, a0, zero
 	ldloc 8
 	ldloc 9
 	ldloc.1
 	stloc 11
-	bne.un L_108ebe8
+	bne.un L_108f20c
 // --- basic block ---
-// 0x0108ebcc: 0x108ebcc: lui   a1, 0x20000
+// 0x0108f1f0: 0x108f1f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108ebd0: 0x108ebd0: lui   a3, 0x20000
+// 0x0108f1f4: 0x108f1f4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ebd4: 0x108ebd4: addiu a1, a1, -6188
+// 0x0108f1f8: 0x108f1f8: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108ebd8: 0x108ebd8: addiu a3, a3, -5868
+// 0x0108f1fc: 0x108f1fc: addiu a3, a3, -5404
 	ldloc 4
-	ldc.i4 -5868
+	ldc.i4 -5404
 	add
 	stloc 4
-// 0x0108ebdc: 0x108ebdc: addiu a0, zero, 4
+// 0x0108f200: 0x108f200: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ebe0: 0x108ebe0: j	 0x108ec04 addiu a2, zero, 97
+// 0x0108f204: 0x108f204: j	 0x108f228 addiu a2, zero, 97
 	ldc.i4.s 97
 	stloc.3
-	br L_108ec04
+	br L_108f228
 // --- basic block ---
-L_108ebe8:
-// 0x0108ebe8: 0x108ebe8: bne   a0, zero, 0x108ec14 lui   a1, 0x20000
+L_108f20c:
+// 0x0108f20c: 0x108f20c: bne   a0, zero, 0x108f238 lui   a1, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108ec14
+	brtrue L_108f238
 // --- basic block ---
-// 0x0108ebf0: 0x108ebf0: lui   a3, 0x20000
+// 0x0108f214: 0x108f214: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ebf4: 0x108ebf4: addiu a1, a1, -6188
+// 0x0108f218: 0x108f218: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108ebf8: 0x108ebf8: addiu a3, a3, -5804
+// 0x0108f21c: 0x108f21c: addiu a3, a3, -5340
 	ldloc 4
-	ldc.i4 -5804
+	ldc.i4 -5340
 	add
 	stloc 4
-// 0x0108ebfc: 0x108ebfc: addiu a0, zero, 4
+// 0x0108f220: 0x108f220: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ec00: 0x108ec00: addiu a2, zero, 102
+// 0x0108f224: 0x108f224: addiu a2, zero, 102
 	ldc.i4.s 102
 	stloc.3
-L_108ec04:
-// 0x0108ec04: 0x108ec04: jal   0x100449c sll   zero, zero, 0
+L_108f228:
+// 0x0108f228: 0x108f228: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3693,44 +3693,44 @@ L_108ec04:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0108ec0c: 0x108ec0c: j	 0x108ed54 addu  v0, zero, zero
+// 0x0108f230: 0x108f230: j	 0x108f378 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_108ed54
+	br L_108f378
 // --- basic block ---
-L_108ec14:
-// 0x0108ec14: 0x108ec14: lw    v1, 0(a0)
+L_108f238:
+// 0x0108f238: 0x108f238: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0108ec18: 0x108ec18: lui   a3, 0x20000
+// 0x0108f23c: 0x108f23c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ec1c: 0x108ec1c: addiu a3, a3, -5740
+// 0x0108f240: 0x108f240: addiu a3, a3, -5276
 	ldloc 4
-	ldc.i4 -5740
+	ldc.i4 -5276
 	add
 	stloc 4
-// 0x0108ec20: 0x108ec20: addiu v0, s1, 4
+// 0x0108f244: 0x108f244: addiu v0, s1, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 8
-// 0x0108ec24: 0x108ec24: addiu a1, a1, -6188
+// 0x0108f248: 0x108f248: addiu a1, a1, -5724
 	ldloc.2
-	ldc.i4 -6188
+	ldc.i4 -5724
 	add
 	stloc.2
-// 0x0108ec28: 0x108ec28: addiu a0, zero, 1
+// 0x0108f24c: 0x108f24c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108ec2c: 0x108ec2c: addiu a2, zero, 106
+// 0x0108f250: 0x108f250: addiu a2, zero, 106
 	ldc.i4.s 106
 	stloc.3
-// 0x0108ec30: 0x108ec30: sw    v1, 16(sp)
+// 0x0108f254: 0x108f254: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3739,7 +3739,7 @@ L_108ec14:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108ec34: 0x108ec34: jal   0x100449c sw    v0, 20(sp)
+// 0x0108f258: 0x108f258: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3758,7 +3758,7 @@ L_108ec14:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0108ec3c: 0x108ec3c: lw    v0, 9320(s0)
+// 0x0108f260: 0x108f260: lw    v0, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3767,45 +3767,45 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108ec40: 0x108ec40: addiu s2, zero, 932
+// 0x0108f264: 0x108f264: addiu s2, zero, 932
 	ldc.i4 932
 	stloc 10
-// 0x0108ec44: 0x108ec44: mult  v0, s2
+// 0x0108f268: 0x108f268: mult  v0, s2
 	ldloc 8
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ec48: 0x108ec48: lw    v1, 0(s1)
+// 0x0108f26c: 0x108f26c: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0108ec4c: 0x108ec4c: addiu a1, s1, 260
+// 0x0108f270: 0x108f270: addiu a1, s1, 260
 	ldloc 11
 	ldc.i4 260
 	add
 	stloc.2
-// 0x0108ec50: 0x108ec50: addiu a2, zero, 256
+// 0x0108f274: 0x108f274: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0108ec54: 0x108ec54: mflo  lo
+// 0x0108f278: 0x108f278: mflo  lo
 	ldloc 7
 	stloc 8
-// 0x0108ec58: 0x108ec58: addu  v0, v0, s0
+// 0x0108f27c: 0x108f27c: addu  v0, v0, s0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x0108ec5c: 0x108ec5c: sw    v1, 0(v0)
+// 0x0108f280: 0x108f280: sw    v1, 0(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x0108ec60: 0x108ec60: lw    a0, 9320(s0)
+// 0x0108f284: 0x108f284: lw    a0, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3814,21 +3814,21 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108ec64: 0x108ec64: sll   zero, zero, 0
-// 0x0108ec68: 0x108ec68: mult  a0, s2
+// 0x0108f288: 0x108f288: sll   zero, zero, 0
+// 0x0108f28c: 0x108f28c: mult  a0, s2
 	ldloc.1
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ec6c: 0x108ec6c: mflo  lo
+// 0x0108f290: 0x108f290: mflo  lo
 	ldloc 7
 	stloc.1
-// 0x0108ec70: 0x108ec70: addu  a0, s0, a0
+// 0x0108f294: 0x108f294: addu  a0, s0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc.1
-// 0x0108ec74: 0x108ec74: jal   0x1001af8 addiu a0, a0, 260
+// 0x0108f298: 0x108f298: jal   0x1001af8 addiu a0, a0, 260
 	ldloc.1
 	ldc.i4 260
 	add
@@ -3839,7 +3839,7 @@ L_108ec14:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 8
 // --- basic block ---
-// 0x0108ec7c: 0x108ec7c: lw    a0, 9320(s0)
+// 0x0108f2a0: 0x108f2a0: lw    a0, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3848,28 +3848,28 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108ec80: 0x108ec80: addiu a1, s1, 516
+// 0x0108f2a4: 0x108f2a4: addiu a1, s1, 516
 	ldloc 11
 	ldc.i4 516
 	add
 	stloc.2
-// 0x0108ec84: 0x108ec84: mult  a0, s2
+// 0x0108f2a8: 0x108f2a8: mult  a0, s2
 	ldloc.1
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ec88: 0x108ec88: addiu a2, zero, 256
+// 0x0108f2ac: 0x108f2ac: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0108ec8c: 0x108ec8c: mflo  lo
+// 0x0108f2b0: 0x108f2b0: mflo  lo
 	ldloc 7
 	stloc.1
-// 0x0108ec90: 0x108ec90: addu  a0, s0, a0
+// 0x0108f2b4: 0x108f2b4: addu  a0, s0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc.1
-// 0x0108ec94: 0x108ec94: jal   0x1001af8 addiu a0, a0, 516
+// 0x0108f2b8: 0x108f2b8: jal   0x1001af8 addiu a0, a0, 516
 	ldloc.1
 	ldc.i4 516
 	add
@@ -3880,7 +3880,7 @@ L_108ec14:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 8
 // --- basic block ---
-// 0x0108ec9c: 0x108ec9c: lw    t1, 9320(s0)
+// 0x0108f2c0: 0x108f2c0: lw    t1, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3889,7 +3889,7 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108eca0: 0x108eca0: lw    t0, 776(s1)
+// 0x0108f2c4: 0x108f2c4: lw    t0, 776(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3898,12 +3898,12 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108eca4: 0x108eca4: mult  t1, s2
+// 0x0108f2c8: 0x108f2c8: mult  t1, s2
 	ldloc 13
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108eca8: 0x108eca8: lw    a3, 772(s1)
+// 0x0108f2cc: 0x108f2cc: lw    a3, 772(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3912,7 +3912,7 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108ecac: 0x108ecac: lw    a2, 784(s1)
+// 0x0108f2d0: 0x108f2d0: lw    a2, 784(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3921,7 +3921,7 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108ecb0: 0x108ecb0: lw    a1, 780(s1)
+// 0x0108f2d4: 0x108f2d4: lw    a1, 780(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3930,7 +3930,7 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108ecb4: 0x108ecb4: lw    a0, 796(s1)
+// 0x0108f2d8: 0x108f2d8: lw    a0, 796(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3939,7 +3939,7 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108ecb8: 0x108ecb8: lw    v1, 792(s1)
+// 0x0108f2dc: 0x108f2dc: lw    v1, 792(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3948,18 +3948,18 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108ecbc: 0x108ecbc: addiu v0, zero, 1
+// 0x0108f2e0: 0x108f2e0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0108ecc0: 0x108ecc0: mflo  lo
+// 0x0108f2e4: 0x108f2e4: mflo  lo
 	ldloc 7
 	stloc 13
-// 0x0108ecc4: 0x108ecc4: addu  t1, s0, t1
+// 0x0108f2e8: 0x108f2e8: addu  t1, s0, t1
 	ldloc 6
 	ldloc 13
 	add
 	stloc 13
-// 0x0108ecc8: 0x108ecc8: sw    t0, 776(t1)
+// 0x0108f2ec: 0x108f2ec: sw    t0, 776(t1)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -3968,7 +3968,7 @@ L_108ec14:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108eccc: 0x108eccc: lw    t0, 9320(s0)
+// 0x0108f2f0: 0x108f2f0: lw    t0, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3977,21 +3977,21 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108ecd0: 0x108ecd0: sll   zero, zero, 0
-// 0x0108ecd4: 0x108ecd4: mult  t0, s2
+// 0x0108f2f4: 0x108f2f4: sll   zero, zero, 0
+// 0x0108f2f8: 0x108f2f8: mult  t0, s2
 	ldloc 12
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ecd8: 0x108ecd8: mflo  lo
+// 0x0108f2fc: 0x108f2fc: mflo  lo
 	ldloc 7
 	stloc 12
-// 0x0108ecdc: 0x108ecdc: addu  t0, s0, t0
+// 0x0108f300: 0x108f300: addu  t0, s0, t0
 	ldloc 6
 	ldloc 12
 	add
 	stloc 12
-// 0x0108ece0: 0x108ece0: sw    a3, 772(t0)
+// 0x0108f304: 0x108f304: sw    a3, 772(t0)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -4000,7 +4000,7 @@ L_108ec14:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0108ece4: 0x108ece4: lw    a3, 9320(s0)
+// 0x0108f308: 0x108f308: lw    a3, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4009,21 +4009,21 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108ece8: 0x108ece8: sll   zero, zero, 0
-// 0x0108ecec: 0x108ecec: mult  a3, s2
+// 0x0108f30c: 0x108f30c: sll   zero, zero, 0
+// 0x0108f310: 0x108f310: mult  a3, s2
 	ldloc 4
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ecf0: 0x108ecf0: mflo  lo
+// 0x0108f314: 0x108f314: mflo  lo
 	ldloc 7
 	stloc 4
-// 0x0108ecf4: 0x108ecf4: addu  a3, s0, a3
+// 0x0108f318: 0x108f318: addu  a3, s0, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 4
-// 0x0108ecf8: 0x108ecf8: sw    a2, 784(a3)
+// 0x0108f31c: 0x108f31c: sw    a2, 784(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -4032,7 +4032,7 @@ L_108ec14:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0108ecfc: 0x108ecfc: lw    a2, 9320(s0)
+// 0x0108f320: 0x108f320: lw    a2, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4041,21 +4041,21 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108ed00: 0x108ed00: sll   zero, zero, 0
-// 0x0108ed04: 0x108ed04: mult  a2, s2
+// 0x0108f324: 0x108f324: sll   zero, zero, 0
+// 0x0108f328: 0x108f328: mult  a2, s2
 	ldloc.3
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ed08: 0x108ed08: mflo  lo
+// 0x0108f32c: 0x108f32c: mflo  lo
 	ldloc 7
 	stloc.3
-// 0x0108ed0c: 0x108ed0c: addu  a2, s0, a2
+// 0x0108f330: 0x108f330: addu  a2, s0, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc.3
-// 0x0108ed10: 0x108ed10: sw    a1, 780(a2)
+// 0x0108f334: 0x108f334: sw    a1, 780(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4064,7 +4064,7 @@ L_108ec14:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108ed14: 0x108ed14: lw    a1, 9320(s0)
+// 0x0108f338: 0x108f338: lw    a1, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4073,21 +4073,21 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108ed18: 0x108ed18: sll   zero, zero, 0
-// 0x0108ed1c: 0x108ed1c: mult  a1, s2
+// 0x0108f33c: 0x108f33c: sll   zero, zero, 0
+// 0x0108f340: 0x108f340: mult  a1, s2
 	ldloc.2
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ed20: 0x108ed20: mflo  lo
+// 0x0108f344: 0x108f344: mflo  lo
 	ldloc 7
 	stloc.2
-// 0x0108ed24: 0x108ed24: addu  a1, s0, a1
+// 0x0108f348: 0x108f348: addu  a1, s0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc.2
-// 0x0108ed28: 0x108ed28: sw    a0, 796(a1)
+// 0x0108f34c: 0x108f34c: sw    a0, 796(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4096,7 +4096,7 @@ L_108ec14:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0108ed2c: 0x108ed2c: lw    a0, 9320(s0)
+// 0x0108f350: 0x108f350: lw    a0, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4105,21 +4105,21 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108ed30: 0x108ed30: sll   zero, zero, 0
-// 0x0108ed34: 0x108ed34: mult  a0, s2
+// 0x0108f354: 0x108f354: sll   zero, zero, 0
+// 0x0108f358: 0x108f358: mult  a0, s2
 	ldloc.1
 	ldloc 10
 	mul
 	stloc 7
-// 0x0108ed38: 0x108ed38: mflo  lo
+// 0x0108f35c: 0x108f35c: mflo  lo
 	ldloc 7
 	stloc 10
-// 0x0108ed3c: 0x108ed3c: addu  s2, s2, s0
+// 0x0108f360: 0x108f360: addu  s2, s2, s0
 	ldloc 10
 	ldloc 6
 	add
 	stloc 10
-// 0x0108ed40: 0x108ed40: sw    v1, 792(s2)
+// 0x0108f364: 0x108f364: sw    v1, 792(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4128,7 +4128,7 @@ L_108ec14:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108ed44: 0x108ed44: lw    v1, 9320(s0)
+// 0x0108f368: 0x108f368: lw    v1, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4137,13 +4137,13 @@ L_108ec14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108ed48: 0x108ed48: sll   zero, zero, 0
-// 0x0108ed4c: 0x108ed4c: addiu v1, v1, 1
+// 0x0108f36c: 0x108f36c: sll   zero, zero, 0
+// 0x0108f370: 0x108f370: addiu v1, v1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0108ed50: 0x108ed50: sw    v1, 9320(s0)
+// 0x0108f374: 0x108f374: sw    v1, 9320(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4152,9 +4152,9 @@ L_108ec14:
 	add
 	ldloc 9
 	stelem.i4
-L_108ed54:
-// 0x0108ed54: 0x108ed54: lw    ra, 36(sp)
-// 0x0108ed58: 0x108ed58: lw    s2, 32(sp)
+L_108f378:
+// 0x0108f378: 0x108f378: lw    ra, 36(sp)
+// 0x0108f37c: 0x108f37c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4163,7 +4163,7 @@ L_108ed54:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108ed5c: 0x108ed5c: lw    s1, 28(sp)
+// 0x0108f380: 0x108f380: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4172,7 +4172,7 @@ L_108ed54:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108ed60: 0x108ed60: lw    s0, 24(sp)
+// 0x0108f384: 0x108f384: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4181,7 +4181,7 @@ L_108ed54:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108ed64: 0x108ed64: jr    ra addiu sp, sp, 40
+// 0x0108f388: 0x108f388: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4193,7 +4193,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 RealtimeExternalPoi_DisplayList_Compare_108ee94(int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_DisplayList_Compare_108f4b8(int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 t0,int32 ra)
@@ -4228,125 +4228,125 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108ee94: 0x108ee94: lui   v0, 0xf0000
+// 0x0108f4b8: 0x108f4b8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 4
-// 0x0108ee98: 0x108ee98: addiu v0, v0, -29760
+// 0x0108f4bc: 0x108f4bc: addiu v0, v0, -29296
 	ldloc 4
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 4
-// 0x0108ee9c: 0x108ee9c: lui   a2, 0xf0000
+// 0x0108f4c0: 0x108f4c0: lui   a2, 0xf0000
 	ldc.i4 983040
 	stloc.2
-// 0x0108eea0: 0x108eea0: lw    v1, 0(a0)
+// 0x0108f4c4: 0x108f4c4: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108eea4: 0x108eea4: lw    a3, 0(a1)
+// 0x0108f4c8: 0x108f4c8: lw    a3, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0108eea8: 0x108eea8: addiu a2, a2, -27760
+// 0x0108f4cc: 0x108f4cc: addiu a2, a2, -27296
 	ldloc.2
-	ldc.i4 -27760
+	ldc.i4 -27296
 	add
 	stloc.2
-// 0x0108eeac: 0x108eeac: addu  a1, v0, zero
+// 0x0108f4d0: 0x108f4d0: addu  a1, v0, zero
 	ldloc 4
 	stloc.1
-L_108eeb0:
-// 0x0108eeb0: 0x108eeb0: lw    a0, 0(a1)
+L_108f4d4:
+// 0x0108f4d4: 0x108f4d4: lw    a0, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x0108eeb4: 0x108eeb4: sll   zero, zero, 0
-// 0x0108eeb8: 0x108eeb8: beq   a0, zero, 0x108eed0 addiu a1, a1, 4
+// 0x0108f4d8: 0x108f4d8: sll   zero, zero, 0
+// 0x0108f4dc: 0x108f4dc: beq   a0, zero, 0x108f4f4 addiu a1, a1, 4
 	ldloc.0
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-	brfalse L_108eed0
+	brfalse L_108f4f4
 // --- basic block ---
-// 0x0108eec0: 0x108eec0: lw    t0, 0(a0)
+// 0x0108f4e4: 0x108f4e4: lw    t0, 0(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0108eec4: 0x108eec4: sll   zero, zero, 0
-// 0x0108eec8: 0x108eec8: beq   t0, v1, 0x108eed8 sll   zero, zero, 0
+// 0x0108f4e8: 0x108f4e8: sll   zero, zero, 0
+// 0x0108f4ec: 0x108f4ec: beq   t0, v1, 0x108f4fc sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_108eed8
+	beq  L_108f4fc
 // --- basic block ---
-L_108eed0:
-// 0x0108eed0: 0x108eed0: bne   a1, a2, 0x108eeb0 addu  a0, zero, zero
+L_108f4f4:
+// 0x0108f4f4: 0x108f4f4: bne   a1, a2, 0x108f4d4 addu  a0, zero, zero
 	ldloc.1
 	ldloc.2
 	ldc.i4.s 0
 	stloc.0
-	bne.un L_108eeb0
+	bne.un L_108f4d4
 // --- basic block ---
-L_108eed8:
-// 0x0108eed8: 0x108eed8: lw    v1, 0(v0)
+L_108f4fc:
+// 0x0108f4fc: 0x108f4fc: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108eedc: 0x108eedc: sll   zero, zero, 0
-// 0x0108eee0: 0x108eee0: beq   v1, zero, 0x108eef8 addiu v0, v0, 4
+// 0x0108f500: 0x108f500: sll   zero, zero, 0
+// 0x0108f504: 0x108f504: beq   v1, zero, 0x108f51c addiu v0, v0, 4
 	ldloc 5
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-	brfalse L_108eef8
+	brfalse L_108f51c
 // --- basic block ---
-// 0x0108eee8: 0x108eee8: lw    a1, 0(v1)
+// 0x0108f50c: 0x108f50c: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108eeec: 0x108eeec: sll   zero, zero, 0
-// 0x0108eef0: 0x108eef0: beq   a1, a3, 0x108ef00 sll   zero, zero, 0
+// 0x0108f510: 0x108f510: sll   zero, zero, 0
+// 0x0108f514: 0x108f514: beq   a1, a3, 0x108f524 sll   zero, zero, 0
 	ldloc.1
 	ldloc.3
-	beq  L_108ef00
+	beq  L_108f524
 // --- basic block ---
-L_108eef8:
-// 0x0108eef8: 0x108eef8: bne   v0, a2, 0x108eed8 addu  v1, zero, zero
+L_108f51c:
+// 0x0108f51c: 0x108f51c: bne   v0, a2, 0x108f4fc addu  v1, zero, zero
 	ldloc 4
 	ldloc.2
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_108eed8
+	bne.un L_108f4fc
 // --- basic block ---
-L_108ef00:
-// 0x0108ef00: 0x108ef00: beq   a0, zero, 0x108ef20 sll   zero, zero, 0
+L_108f524:
+// 0x0108f524: 0x108f524: beq   a0, zero, 0x108f544 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_108ef20
+	brfalse L_108f544
 // --- basic block ---
-// 0x0108ef08: 0x108ef08: beq   v1, zero, 0x108ef20 sll   zero, zero, 0
+// 0x0108f52c: 0x108f52c: beq   v1, zero, 0x108f544 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108ef20
+	brfalse L_108f544
 // --- basic block ---
-// 0x0108ef10: 0x108ef10: lw    v1, 40(v1)
+// 0x0108f534: 0x108f534: lw    v1, 40(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4355,7 +4355,7 @@ L_108ef00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ef14: 0x108ef14: lw    v0, 40(a0)
+// 0x0108f538: 0x108f538: lw    v0, 40(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4364,15 +4364,15 @@ L_108ef00:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108ef18: 0x108ef18: jr    ra subu  v0, v1, v0
+// 0x0108f53c: 0x108f53c: jr    ra subu  v0, v1, v0
 	ldloc 5
 	ldloc 4
 	sub
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_108ef20:
-// 0x0108ef20: 0x108ef20: jr    ra addu  v0, zero, zero
+L_108f544:
+// 0x0108f544: 0x108f544: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
@@ -4382,7 +4382,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 RealtimeExternalPoi_ExternalPoi_Init_108ef44(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_ExternalPoi_Init_108f568(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -4417,15 +4417,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108ef44: 0x108ef44: addiu v0, zero, -1
+// 0x0108f568: 0x108f568: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0108ef48: 0x108ef48: addiu sp, sp, -24
+// 0x0108f56c: 0x108f56c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108ef4c: 0x108ef4c: sw    v0, 44(a0)
+// 0x0108f570: 0x108f570: sw    v0, 44(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4434,14 +4434,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef50: 0x108ef50: sw    v0, 0(a0)
+// 0x0108f574: 0x108f574: sw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0108ef54: 0x108ef54: sw    zero, 176(a0)
+// 0x0108f578: 0x108f578: sw    zero, 176(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4450,7 +4450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108ef58: 0x108ef58: sw    v0, 4(a0)
+// 0x0108f57c: 0x108f57c: sw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4459,7 +4459,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef5c: 0x108ef5c: sw    v0, 8(a0)
+// 0x0108f580: 0x108f580: sw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4468,7 +4468,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef60: 0x108ef60: sw    v0, 12(a0)
+// 0x0108f584: 0x108f584: sw    v0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4477,7 +4477,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef64: 0x108ef64: sw    v0, 16(a0)
+// 0x0108f588: 0x108f588: sw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4486,7 +4486,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef68: 0x108ef68: sw    zero, 20(a0)
+// 0x0108f58c: 0x108f58c: sw    zero, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4495,7 +4495,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108ef6c: 0x108ef6c: sw    v0, 24(a0)
+// 0x0108f590: 0x108f590: sw    v0, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4504,7 +4504,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef70: 0x108ef70: sw    v0, 28(a0)
+// 0x0108f594: 0x108f594: sw    v0, 28(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4513,7 +4513,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef74: 0x108ef74: sw    v0, 32(a0)
+// 0x0108f598: 0x108f598: sw    v0, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4522,7 +4522,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef78: 0x108ef78: sw    v0, 36(a0)
+// 0x0108f59c: 0x108f59c: sw    v0, 36(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4531,7 +4531,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef7c: 0x108ef7c: sw    v0, 40(a0)
+// 0x0108f5a0: 0x108f5a0: sw    v0, 40(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4540,16 +4540,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108ef80: 0x108ef80: addu  a1, zero, zero
+// 0x0108f5a4: 0x108f5a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ef84: 0x108ef84: addiu a0, a0, 48
+// 0x0108f5a8: 0x108f5a8: addiu a0, a0, 48
 	ldloc.1
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x0108ef88: 0x108ef88: sw    ra, 20(sp)
-// 0x0108ef8c: 0x108ef8c: jal   0x100177c addiu a2, zero, 128
+// 0x0108f5ac: 0x108f5ac: sw    ra, 20(sp)
+// 0x0108f5b0: 0x108f5b0: jal   0x100177c addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.1
@@ -4561,9 +4561,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0108ef94: 0x108ef94: lw    ra, 20(sp)
-// 0x0108ef98: 0x108ef98: sll   zero, zero, 0
-// 0x0108ef9c: 0x108ef9c: jr    ra addiu sp, sp, 24
+// 0x0108f5b8: 0x108f5b8: lw    ra, 20(sp)
+// 0x0108f5bc: 0x108f5bc: sll   zero, zero, 0
+// 0x0108f5c0: 0x108f5c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4575,7 +4575,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeExternalPoi_ExternalPoiType_Init_108efa4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_ExternalPoiType_Init_108f5c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
@@ -4616,12 +4616,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108efa4: 0x108efa4: addiu sp, sp, -32
+// 0x0108f5c8: 0x108f5c8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108efa8: 0x108efa8: sw    s1, 24(sp)
+// 0x0108f5cc: 0x108f5cc: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4630,10 +4630,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108efac: 0x108efac: addiu s1, zero, -1
+// 0x0108f5d0: 0x108f5d0: addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0108efb0: 0x108efb0: sw    s0, 20(sp)
+// 0x0108f5d4: 0x108f5d4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4642,17 +4642,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108efb4: 0x108efb4: sw    s1, 0(a0)
+// 0x0108f5d8: 0x108f5d8: sw    s1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0108efb8: 0x108efb8: addu  s0, a0, zero
+// 0x0108f5dc: 0x108f5dc: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0108efbc: 0x108efbc: sw    s1, 4(a0)
+// 0x0108f5e0: 0x108f5e0: sw    s1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4661,7 +4661,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108efc0: 0x108efc0: sw    s1, 8(a0)
+// 0x0108f5e4: 0x108f5e4: sw    s1, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4670,16 +4670,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108efc4: 0x108efc4: addu  a1, zero, zero
+// 0x0108f5e8: 0x108f5e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108efc8: 0x108efc8: addiu a0, a0, 12
+// 0x0108f5ec: 0x108f5ec: addiu a0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	add
 	stloc.1
-// 0x0108efcc: 0x108efcc: sw    ra, 28(sp)
-// 0x0108efd0: 0x108efd0: jal   0x100177c addiu a2, zero, 128
+// 0x0108f5f0: 0x108f5f0: sw    ra, 28(sp)
+// 0x0108f5f4: 0x108f5f4: jal   0x100177c addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.1
@@ -4691,15 +4691,15 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0108efd8: 0x108efd8: addiu a0, s0, 140
+// 0x0108f5fc: 0x108f5fc: addiu a0, s0, 140
 	ldloc 6
 	ldc.i4 140
 	add
 	stloc.1
-// 0x0108efdc: 0x108efdc: addu  a1, zero, zero
+// 0x0108f600: 0x108f600: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108efe0: 0x108efe0: jal   0x100177c addiu a2, zero, 128
+// 0x0108f604: 0x108f604: jal   0x100177c addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.1
@@ -4711,15 +4711,15 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0108efe8: 0x108efe8: addiu a0, s0, 268
+// 0x0108f60c: 0x108f60c: addiu a0, s0, 268
 	ldloc 6
 	ldc.i4 268
 	add
 	stloc.1
-// 0x0108efec: 0x108efec: addu  a1, zero, zero
+// 0x0108f610: 0x108f610: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108eff0: 0x108eff0: jal   0x100177c addiu a2, zero, 128
+// 0x0108f614: 0x108f614: jal   0x100177c addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.1
@@ -4731,8 +4731,8 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0108eff8: 0x108eff8: lw    ra, 28(sp)
-// 0x0108effc: 0x108effc: sw    s1, 408(s0)
+// 0x0108f61c: 0x108f61c: lw    ra, 28(sp)
+// 0x0108f620: 0x108f620: sw    s1, 408(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4741,7 +4741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f000: 0x108f000: sw    s1, 396(s0)
+// 0x0108f624: 0x108f624: sw    s1, 396(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4750,7 +4750,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f004: 0x108f004: sw    s1, 400(s0)
+// 0x0108f628: 0x108f628: sw    s1, 400(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4759,7 +4759,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f008: 0x108f008: sw    s1, 404(s0)
+// 0x0108f62c: 0x108f62c: sw    s1, 404(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4768,7 +4768,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f00c: 0x108f00c: sw    zero, 412(s0)
+// 0x0108f630: 0x108f630: sw    zero, 412(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4777,7 +4777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108f010: 0x108f010: lw    s1, 24(sp)
+// 0x0108f634: 0x108f634: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4786,7 +4786,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f014: 0x108f014: lw    s0, 20(sp)
+// 0x0108f638: 0x108f638: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4795,7 +4795,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108f018: 0x108f018: jr    ra addiu sp, sp, 32
+// 0x0108f63c: 0x108f63c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4807,7 +4807,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 is_visible_108f020(int32,int32,int32,int32,int32)
+.method public static int32 is_visible_108f644(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -4842,35 +4842,35 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f020: 0x108f020: addiu sp, sp, -24
+// 0x0108f644: 0x108f644: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108f024: 0x108f024: bne   a0, zero, 0x108f050 sw    ra, 20(sp)
+// 0x0108f648: 0x108f648: bne   a0, zero, 0x108f674 sw    ra, 20(sp)
 	ldloc.1
-	brtrue L_108f050
+	brtrue L_108f674
 // --- basic block ---
-// 0x0108f02c: 0x108f02c: lui   a1, 0x20000
+// 0x0108f650: 0x108f650: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108f030: 0x108f030: lui   a3, 0x20000
+// 0x0108f654: 0x108f654: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108f034: 0x108f034: addiu a1, a1, -5692
+// 0x0108f658: 0x108f658: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108f038: 0x108f038: addiu a3, a3, -5648
+// 0x0108f65c: 0x108f65c: addiu a3, a3, -5184
 	ldloc 4
-	ldc.i4 -5648
+	ldc.i4 -5184
 	add
 	stloc 4
-// 0x0108f03c: 0x108f03c: addiu a0, zero, 4
+// 0x0108f660: 0x108f660: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108f040: 0x108f040: jal   0x100449c addiu a2, zero, 633
+// 0x0108f664: 0x108f664: jal   0x100449c addiu a2, zero, 633
 	ldc.i4 633
 	stloc.3
 	ldloc.0
@@ -4883,21 +4883,21 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0108f048: 0x108f048: j	 0x108f0b0 addu  v0, zero, zero
+// 0x0108f66c: 0x108f66c: j	 0x108f6d4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_108f0b0
+	br L_108f6d4
 // --- basic block ---
-L_108f050:
-// 0x0108f050: 0x108f050: lui   v1, 0xe0000
+L_108f674:
+// 0x0108f674: 0x108f674: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0108f054: 0x108f054: addiu v1, v1, 29604
+// 0x0108f678: 0x108f678: addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x0108f058: 0x108f058: lw    a1, 24(a0)
+// 0x0108f67c: 0x108f67c: lw    a1, 24(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4906,7 +4906,7 @@ L_108f050:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108f05c: 0x108f05c: lw    a2, 56(v1)
+// 0x0108f680: 0x108f680: lw    a2, 56(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4915,7 +4915,7 @@ L_108f050:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108f060: 0x108f060: lw    v0, 28(a0)
+// 0x0108f684: 0x108f684: lw    v0, 28(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4924,16 +4924,16 @@ L_108f050:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108f064: 0x108f064: slt   a0, a2, a1
+// 0x0108f688: 0x108f688: slt   a0, a2, a1
 	ldloc.3
 	ldloc.2
 	clt
 	stloc.1
-// 0x0108f068: 0x108f068: bne   a0, zero, 0x108f0ac sll   zero, zero, 0
+// 0x0108f68c: 0x108f68c: bne   a0, zero, 0x108f6d0 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_108f0ac
+	brtrue L_108f6d0
 // --- basic block ---
-// 0x0108f070: 0x108f070: lw    a0, 64(v1)
+// 0x0108f694: 0x108f694: lw    a0, 64(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4942,17 +4942,17 @@ L_108f050:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f074: 0x108f074: sll   zero, zero, 0
-// 0x0108f078: 0x108f078: slt   a1, a1, a0
+// 0x0108f698: 0x108f698: sll   zero, zero, 0
+// 0x0108f69c: 0x108f69c: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x0108f07c: 0x108f07c: bne   a1, zero, 0x108f0ac sll   zero, zero, 0
+// 0x0108f6a0: 0x108f6a0: bne   a1, zero, 0x108f6d0 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_108f0ac
+	brtrue L_108f6d0
 // --- basic block ---
-// 0x0108f084: 0x108f084: lw    a0, 60(v1)
+// 0x0108f6a8: 0x108f6a8: lw    a0, 60(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4961,17 +4961,17 @@ L_108f050:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f088: 0x108f088: sll   zero, zero, 0
-// 0x0108f08c: 0x108f08c: slt   a0, a0, v0
+// 0x0108f6ac: 0x108f6ac: sll   zero, zero, 0
+// 0x0108f6b0: 0x108f6b0: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0108f090: 0x108f090: bne   a0, zero, 0x108f0ac sll   zero, zero, 0
+// 0x0108f6b4: 0x108f6b4: bne   a0, zero, 0x108f6d0 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_108f0ac
+	brtrue L_108f6d0
 // --- basic block ---
-// 0x0108f098: 0x108f098: lw    v1, 68(v1)
+// 0x0108f6bc: 0x108f6bc: lw    v1, 68(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4980,27 +4980,27 @@ L_108f050:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f09c: 0x108f09c: sll   zero, zero, 0
-// 0x0108f0a0: 0x108f0a0: slt   v0, v0, v1
+// 0x0108f6c0: 0x108f6c0: sll   zero, zero, 0
+// 0x0108f6c4: 0x108f6c4: slt   v0, v0, v1
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x0108f0a4: 0x108f0a4: j	 0x108f0b0 xori  v0, v0, 1
+// 0x0108f6c8: 0x108f6c8: j	 0x108f6d4 xori  v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	xor
 	stloc 6
-	br L_108f0b0
+	br L_108f6d4
 // --- basic block ---
-L_108f0ac:
-// 0x0108f0ac: 0x108f0ac: addu  v0, zero, zero
+L_108f6d0:
+// 0x0108f6d0: 0x108f6d0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_108f0b0:
-// 0x0108f0b0: 0x108f0b0: lw    ra, 20(sp)
-// 0x0108f0b4: 0x108f0b4: sll   zero, zero, 0
-// 0x0108f0b8: 0x108f0b8: jr    ra addiu sp, sp, 24
+L_108f6d4:
+// 0x0108f6d4: 0x108f6d4: lw    ra, 20(sp)
+// 0x0108f6d8: 0x108f6d8: sll   zero, zero, 0
+// 0x0108f6dc: 0x108f6dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5012,7 +5012,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RemovePoiObject_108f0c0(int32,int32,int32,int32,int32)
+.method public static int32 RemovePoiObject_108f6e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -5056,12 +5056,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f0c0: 0x108f0c0: addiu sp, sp, -176
+// 0x0108f6e4: 0x108f6e4: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x0108f0c4: 0x108f0c4: sw    s0, 160(sp)
+// 0x0108f6e8: 0x108f6e8: sw    s0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5070,8 +5070,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108f0c8: 0x108f0c8: sw    ra, 172(sp)
-// 0x0108f0cc: 0x108f0cc: sw    s2, 168(sp)
+// 0x0108f6ec: 0x108f6ec: sw    ra, 172(sp)
+// 0x0108f6f0: 0x108f6f0: sw    s2, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5080,7 +5080,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108f0d0: 0x108f0d0: sw    s1, 164(sp)
+// 0x0108f6f4: 0x108f6f4: sw    s1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5089,32 +5089,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108f0d4: 0x108f0d4: addu  s0, a0, zero
+// 0x0108f6f8: 0x108f6f8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108f0d8: 0x108f0d8: bne   a0, zero, 0x108f100 lui   a1, 0x20000
+// 0x0108f6fc: 0x108f6fc: bne   a0, zero, 0x108f724 lui   a1, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108f100
+	brtrue L_108f724
 // --- basic block ---
-// 0x0108f0e0: 0x108f0e0: lui   a3, 0x20000
+// 0x0108f704: 0x108f704: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108f0e4: 0x108f0e4: addiu a1, a1, -5692
+// 0x0108f708: 0x108f708: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108f0e8: 0x108f0e8: addiu a3, a3, -5600
+// 0x0108f70c: 0x108f70c: addiu a3, a3, -5136
 	ldloc 4
-	ldc.i4 -5600
+	ldc.i4 -5136
 	add
 	stloc 4
-// 0x0108f0ec: 0x108f0ec: addiu a0, zero, 4
+// 0x0108f710: 0x108f710: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108f0f0: 0x108f0f0: jal   0x100449c addiu a2, zero, 538
+// 0x0108f714: 0x108f714: jal   0x100449c addiu a2, zero, 538
 	ldc.i4 538
 	stloc.3
 	ldloc.0
@@ -5127,37 +5127,37 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f0f8: 0x108f0f8: j	 0x108f1c4 sll   zero, zero, 0
-	br L_108f1c4
+// 0x0108f71c: 0x108f71c: j	 0x108f7e8 sll   zero, zero, 0
+	br L_108f7e8
 // --- basic block ---
-L_108f100:
-// 0x0108f100: 0x108f100: lw    v0, 0(a0)
+L_108f724:
+// 0x0108f724: 0x108f724: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108f104: 0x108f104: lui   a3, 0x20000
+// 0x0108f728: 0x108f728: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108f108: 0x108f108: addiu a1, a1, -5692
+// 0x0108f72c: 0x108f72c: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108f10c: 0x108f10c: addiu a3, a3, -5564
+// 0x0108f730: 0x108f730: addiu a3, a3, -5100
 	ldloc 4
-	ldc.i4 -5564
+	ldc.i4 -5100
 	add
 	stloc 4
-// 0x0108f110: 0x108f110: addiu a2, zero, 542
+// 0x0108f734: 0x108f734: addiu a2, zero, 542
 	ldc.i4 542
 	stloc.3
-// 0x0108f114: 0x108f114: addiu a0, zero, 1
+// 0x0108f738: 0x108f738: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108f118: 0x108f118: jal   0x100449c sw    v0, 16(sp)
+// 0x0108f73c: 0x108f73c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5176,7 +5176,7 @@ L_108f100:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f120: 0x108f120: jal   0x108f020 addu  a0, s0, zero
+// 0x0108f744: 0x108f744: jal   0x108f644 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5184,38 +5184,38 @@ L_108f100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::is_visible_108f020(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::is_visible_108f644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f128: 0x108f128: addiu s1, sp, 24
+// 0x0108f74c: 0x108f74c: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x0108f12c: 0x108f12c: lw    a3, 0(s0)
+// 0x0108f750: 0x108f750: lw    a3, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108f130: 0x108f130: lui   a2, 0x20000
+// 0x0108f754: 0x108f754: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108f134: 0x108f134: addiu a2, a2, -5516
+// 0x0108f758: 0x108f758: addiu a2, a2, -5052
 	ldloc.3
-	ldc.i4 -5516
+	ldc.i4 -5052
 	add
 	stloc.3
-// 0x0108f138: 0x108f138: addiu a1, zero, 128
+// 0x0108f75c: 0x108f75c: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0108f13c: 0x108f13c: addu  a0, s1, zero
+// 0x0108f760: 0x108f760: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0108f140: 0x108f140: jal   0x1000f9c addu  s2, v0, zero
+// 0x0108f764: 0x108f764: jal   0x1000f9c addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -5228,7 +5228,7 @@ L_108f100:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f148: 0x108f148: jal   0x101ca0c addu  a0, s1, zero
+// 0x0108f76c: 0x108f76c: jal   0x101ca1c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5236,15 +5236,15 @@ L_108f100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f150: 0x108f150: addu  a0, v0, zero
+// 0x0108f774: 0x108f774: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108f154: 0x108f154: jal   0x101c14c sw    v0, 152(sp)
+// 0x0108f778: 0x108f778: jal   0x101c15c sw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5258,12 +5258,12 @@ L_108f100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f15c: 0x108f15c: lw    v0, 152(sp)
+// 0x0108f780: 0x108f780: lw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5272,7 +5272,7 @@ L_108f100:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f160: 0x108f160: jal   0x101c8f8 addu  a0, v0, zero
+// 0x0108f784: 0x108f784: jal   0x101c908 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5280,12 +5280,12 @@ L_108f100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f168: 0x108f168: lw    v0, 20(s0)
+// 0x0108f78c: 0x108f78c: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5294,36 +5294,36 @@ L_108f100:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f16c: 0x108f16c: sll   zero, zero, 0
-// 0x0108f170: 0x108f170: lb    v0, 140(v0)
+// 0x0108f790: 0x108f790: sll   zero, zero, 0
+// 0x0108f794: 0x108f794: lb    v0, 140(v0)
 	ldloc 5
 	ldc.i4 140
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108f174: 0x108f174: sll   zero, zero, 0
-// 0x0108f178: 0x108f178: beq   v0, zero, 0x108f1b4 lui   a2, 0x20000
+// 0x0108f798: 0x108f798: sll   zero, zero, 0
+// 0x0108f79c: 0x108f79c: beq   v0, zero, 0x108f7d8 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brfalse L_108f1b4
+	brfalse L_108f7d8
 // --- basic block ---
-// 0x0108f180: 0x108f180: lw    a3, 0(s0)
+// 0x0108f7a4: 0x108f7a4: lw    a3, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108f184: 0x108f184: addiu a2, a2, -5488
+// 0x0108f7a8: 0x108f7a8: addiu a2, a2, -5024
 	ldloc.3
-	ldc.i4 -5488
+	ldc.i4 -5024
 	add
 	stloc.3
-// 0x0108f188: 0x108f188: addiu a1, zero, 128
+// 0x0108f7ac: 0x108f7ac: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0108f18c: 0x108f18c: jal   0x1000f9c addu  a0, s1, zero
+// 0x0108f7b0: 0x108f7b0: jal   0x1000f9c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5336,7 +5336,7 @@ L_108f100:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f194: 0x108f194: jal   0x101ca0c addu  a0, s1, zero
+// 0x0108f7b8: 0x108f7b8: jal   0x101ca1c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5344,15 +5344,15 @@ L_108f100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f19c: 0x108f19c: addu  a0, v0, zero
+// 0x0108f7c0: 0x108f7c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108f1a0: 0x108f1a0: jal   0x101c14c sw    v0, 152(sp)
+// 0x0108f7c4: 0x108f7c4: jal   0x101c15c sw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5366,12 +5366,12 @@ L_108f100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f1a8: 0x108f1a8: lw    v0, 152(sp)
+// 0x0108f7cc: 0x108f7cc: lw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5380,7 +5380,7 @@ L_108f100:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f1ac: 0x108f1ac: jal   0x101c8f8 addu  a0, v0, zero
+// 0x0108f7d0: 0x108f7d0: jal   0x101c908 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5388,13 +5388,13 @@ L_108f100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108f1b4:
-// 0x0108f1b4: 0x108f1b4: beq   s2, zero, 0x108f1c4 sw    zero, 176(s0)
+L_108f7d8:
+// 0x0108f7d8: 0x108f7d8: beq   s2, zero, 0x108f7e8 sw    zero, 176(s0)
 	ldloc 10
 	ldloc 6
 	ldloc 8
@@ -5404,22 +5404,22 @@ L_108f1b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_108f1c4
+	brfalse L_108f7e8
 // --- basic block ---
-// 0x0108f1bc: 0x108f1bc: jal   0x102146c sll   zero, zero, 0
+// 0x0108f7e0: 0x108f7e0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108f1c4:
-// 0x0108f1c4: 0x108f1c4: lw    ra, 172(sp)
-// 0x0108f1c8: 0x108f1c8: lw    s2, 168(sp)
+L_108f7e8:
+// 0x0108f7e8: 0x108f7e8: lw    ra, 172(sp)
+// 0x0108f7ec: 0x108f7ec: lw    s2, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5428,7 +5428,7 @@ L_108f1c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108f1cc: 0x108f1cc: lw    s1, 164(sp)
+// 0x0108f7f0: 0x108f7f0: lw    s1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5437,7 +5437,7 @@ L_108f1c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108f1d0: 0x108f1d0: lw    s0, 160(sp)
+// 0x0108f7f4: 0x108f7f4: lw    s0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5446,7 +5446,7 @@ L_108f1c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108f1d4: 0x108f1d4: jr    ra addiu sp, sp, 176
+// 0x0108f7f8: 0x108f7f8: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -5458,7 +5458,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_DisplayList_clear_108f1dc(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_DisplayList_clear_108f800(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 s2,int32 ra)
@@ -5502,12 +5502,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f1dc: 0x108f1dc: addiu sp, sp, -32
+// 0x0108f800: 0x108f800: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108f1e0: 0x108f1e0: sw    s0, 16(sp)
+// 0x0108f804: 0x108f804: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5516,15 +5516,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f1e4: 0x108f1e4: lui   s0, 0xf0000
+// 0x0108f808: 0x108f808: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0108f1e8: 0x108f1e8: addiu s0, s0, -29760
+// 0x0108f80c: 0x108f80c: addiu s0, s0, -29296
 	ldloc 7
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 7
-// 0x0108f1ec: 0x108f1ec: sw    s2, 24(sp)
+// 0x0108f810: 0x108f810: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5533,7 +5533,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108f1f0: 0x108f1f0: sw    s1, 20(sp)
+// 0x0108f814: 0x108f814: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5542,33 +5542,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108f1f4: 0x108f1f4: sw    ra, 28(sp)
-// 0x0108f1f8: 0x108f1f8: addu  s1, zero, zero
+// 0x0108f818: 0x108f818: sw    ra, 28(sp)
+// 0x0108f81c: 0x108f81c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0108f1fc: 0x108f1fc: j	 0x108f230 addu  s2, s0, zero
+// 0x0108f820: 0x108f820: j	 0x108f854 addu  s2, s0, zero
 	ldloc 7
 	stloc 10
-	br L_108f230
+	br L_108f854
 // --- basic block ---
-L_108f204:
-// 0x0108f204: 0x108f204: lw    a0, 0(s0)
+L_108f828:
+// 0x0108f828: 0x108f828: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108f208: 0x108f208: sll   zero, zero, 0
-// 0x0108f20c: 0x108f20c: beq   a0, zero, 0x108f22c addiu s1, s1, 1
+// 0x0108f82c: 0x108f82c: sll   zero, zero, 0
+// 0x0108f830: 0x108f830: beq   a0, zero, 0x108f850 addiu s1, s1, 1
 	ldloc.1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_108f22c
+	brfalse L_108f850
 // --- basic block ---
-// 0x0108f214: 0x108f214: lw    v0, 176(a0)
+// 0x0108f838: 0x108f838: lw    v0, 176(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5577,30 +5577,30 @@ L_108f204:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108f218: 0x108f218: sll   zero, zero, 0
-// 0x0108f21c: 0x108f21c: beq   v0, zero, 0x108f22c sll   zero, zero, 0
+// 0x0108f83c: 0x108f83c: sll   zero, zero, 0
+// 0x0108f840: 0x108f840: beq   v0, zero, 0x108f850 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_108f22c
+	brfalse L_108f850
 // --- basic block ---
-// 0x0108f224: 0x108f224: jal   0x108f0c0 sll   zero, zero, 0
+// 0x0108f848: 0x108f848: jal   0x108f6e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RemovePoiObject_108f0c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RemovePoiObject_108f6e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_108f22c:
-// 0x0108f22c: 0x108f22c: addiu s0, s0, 4
+L_108f850:
+// 0x0108f850: 0x108f850: addiu s0, s0, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_108f230:
-// 0x0108f230: 0x108f230: lw    v0, 2000(s2)
+L_108f854:
+// 0x0108f854: 0x108f854: lw    v0, 2000(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5609,27 +5609,27 @@ L_108f230:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108f234: 0x108f234: sll   zero, zero, 0
-// 0x0108f238: 0x108f238: slt   v0, s1, v0
+// 0x0108f858: 0x108f858: sll   zero, zero, 0
+// 0x0108f85c: 0x108f85c: slt   v0, s1, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0108f23c: 0x108f23c: bne   v0, zero, 0x108f204 lui   a0, 0xf0000
+// 0x0108f860: 0x108f860: bne   v0, zero, 0x108f828 lui   a0, 0xf0000
 	ldloc 6
 	ldc.i4 983040
 	stloc.1
-	brtrue L_108f204
+	brtrue L_108f828
 // --- basic block ---
-// 0x0108f244: 0x108f244: addiu a0, a0, -27352
+// 0x0108f868: 0x108f868: addiu a0, a0, -26888
 	ldloc.1
-	ldc.i4 -27352
+	ldc.i4 -26888
 	add
 	stloc.1
-// 0x0108f248: 0x108f248: addu  a1, zero, zero
+// 0x0108f86c: 0x108f86c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108f24c: 0x108f24c: jal   0x100177c addiu a2, zero, 2004
+// 0x0108f870: 0x108f870: jal   0x100177c addiu a2, zero, 2004
 	ldc.i4 2004
 	stloc.3
 	ldloc.1
@@ -5641,14 +5641,14 @@ L_108f230:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108f254: 0x108f254: lw    ra, 28(sp)
-// 0x0108f258: 0x108f258: addiu v1, zero, 1
+// 0x0108f878: 0x108f878: lw    ra, 28(sp)
+// 0x0108f87c: 0x108f87c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0108f25c: 0x108f25c: lui   v0, 0x80000
+// 0x0108f880: 0x108f880: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108f260: 0x108f260: lw    s2, 24(sp)
+// 0x0108f884: 0x108f884: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ L_108f230:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108f264: 0x108f264: lw    s1, 20(sp)
+// 0x0108f888: 0x108f888: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5666,7 +5666,7 @@ L_108f230:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108f268: 0x108f268: lw    s0, 16(sp)
+// 0x0108f88c: 0x108f88c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5675,16 +5675,16 @@ L_108f230:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f26c: 0x108f26c: sw    v1, 8528(v0)
+// 0x0108f890: 0x108f890: sw    v1, 8992(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2132
+	ldc.i4 2248
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108f270: 0x108f270: jr    ra addiu sp, sp, 32
+// 0x0108f894: 0x108f894: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5696,7 +5696,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 get_max_pois_display_108f278(int32,int32,int32,int32,int32)
+.method public static int32 get_max_pois_display_108f89c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5731,107 +5731,107 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f278: 0x108f278: lui   v0, 0xf0000
+// 0x0108f89c: 0x108f89c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108f27c: 0x108f27c: lw    v0, -30068(v0)
+// 0x0108f8a0: 0x108f8a0: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f280: 0x108f280: addiu sp, sp, -24
+// 0x0108f8a4: 0x108f8a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108f284: 0x108f284: slti  v0, v0, 300
+// 0x0108f8a8: 0x108f8a8: slti  v0, v0, 300
 	ldloc 5
 	ldc.i4 300
 	clt
 	stloc 5
-// 0x0108f288: 0x108f288: bne   v0, zero, 0x108f2b8 sw    ra, 20(sp)
+// 0x0108f8ac: 0x108f8ac: bne   v0, zero, 0x108f8dc sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_108f2b8
+	brtrue L_108f8dc
 // --- basic block ---
-// 0x0108f290: 0x108f290: lui   v0, 0xf0000
+// 0x0108f8b4: 0x108f8b4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108f294: 0x108f294: lw    v0, -30072(v0)
+// 0x0108f8b8: 0x108f8b8: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f298: 0x108f298: sll   zero, zero, 0
-// 0x0108f29c: 0x108f29c: slti  v0, v0, 300
+// 0x0108f8bc: 0x108f8bc: sll   zero, zero, 0
+// 0x0108f8c0: 0x108f8c0: slti  v0, v0, 300
 	ldloc 5
 	ldc.i4 300
 	clt
 	stloc 5
-// 0x0108f2a0: 0x108f2a0: beq   v0, zero, 0x108f2c8 lui   a0, 0x0
+// 0x0108f8c4: 0x108f8c4: beq   v0, zero, 0x108f8ec lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_108f2c8
+	brfalse L_108f8ec
 // --- basic block ---
-// 0x0108f2a8: 0x108f2a8: jal   0x1020318 sll   zero, zero, 0
+// 0x0108f8cc: 0x108f8cc: jal   0x1020328 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::is_screen_wide_1020318(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::is_screen_wide_1020328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108f2b0: 0x108f2b0: beq   v0, zero, 0x108f2c4 sll   zero, zero, 0
+// 0x0108f8d4: 0x108f8d4: beq   v0, zero, 0x108f8e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f2c4
+	brfalse L_108f8e8
 // --- basic block ---
-L_108f2b8:
-// 0x0108f2b8: 0x108f2b8: lui   a0, 0x0
+L_108f8dc:
+// 0x0108f8dc: 0x108f8dc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108f2bc: 0x108f2bc: j	 0x108f2cc addiu a0, a0, 17416
+// 0x0108f8e0: 0x108f8e0: j	 0x108f8f0 addiu a0, a0, 17416
 	ldloc.1
 	ldc.i4 17416
 	add
 	stloc.1
-	br L_108f2cc
+	br L_108f8f0
 // --- basic block ---
-L_108f2c4:
-// 0x0108f2c4: 0x108f2c4: lui   a0, 0x0
+L_108f8e8:
+// 0x0108f8e8: 0x108f8e8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_108f2c8:
-// 0x0108f2c8: 0x108f2c8: addiu a0, a0, 17432
+L_108f8ec:
+// 0x0108f8ec: 0x108f8ec: addiu a0, a0, 17432
 	ldloc.1
 	ldc.i4 17432
 	add
 	stloc.1
-L_108f2cc:
-// 0x0108f2cc: 0x108f2cc: jal   0x100e788 sll   zero, zero, 0
+L_108f8f0:
+// 0x0108f8f0: 0x108f8f0: jal   0x100e798 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108f2d4: 0x108f2d4: lw    ra, 20(sp)
-// 0x0108f2d8: 0x108f2d8: sll   zero, zero, 0
-// 0x0108f2dc: 0x108f2dc: jr    ra addiu sp, sp, 24
+// 0x0108f8f8: 0x108f8f8: lw    ra, 20(sp)
+// 0x0108f8fc: 0x108f8fc: sll   zero, zero, 0
+// 0x0108f900: 0x108f900: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5843,7 +5843,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 CreatePoiObject_108f2e4(int32,int32,int32,int32,int32)
+.method public static int32 CreatePoiObject_108f908(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s1,int32 s2,int32 s3,int32 s4,int32 lo,int32 ra)
@@ -5899,12 +5899,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f2e4: 0x108f2e4: addiu sp, sp, -232
+// 0x0108f908: 0x108f908: addiu sp, sp, -232
 	ldloc.0
 	ldc.i4 -232
 	add
 	stloc.0
-// 0x0108f2e8: 0x108f2e8: sw    s0, 204(sp)
+// 0x0108f90c: 0x108f90c: sw    s0, 204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5913,19 +5913,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108f2ec: 0x108f2ec: addu  s0, a0, zero
+// 0x0108f910: 0x108f910: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0108f2f0: 0x108f2f0: lui   a0, 0x20000
+// 0x0108f914: 0x108f914: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108f2f4: 0x108f2f4: addiu a0, a0, -5456
+// 0x0108f918: 0x108f918: addiu a0, a0, -4992
 	ldloc.1
-	ldc.i4 -5456
+	ldc.i4 -4992
 	add
 	stloc.1
-// 0x0108f2f8: 0x108f2f8: sw    ra, 228(sp)
-// 0x0108f2fc: 0x108f2fc: sw    s4, 220(sp)
+// 0x0108f91c: 0x108f91c: sw    ra, 228(sp)
+// 0x0108f920: 0x108f920: sw    s4, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5934,7 +5934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108f300: 0x108f300: sw    s2, 212(sp)
+// 0x0108f924: 0x108f924: sw    s2, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5943,7 +5943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108f304: 0x108f304: sw    s5, 224(sp)
+// 0x0108f928: 0x108f928: sw    s5, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5952,7 +5952,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108f308: 0x108f308: sw    s3, 216(sp)
+// 0x0108f92c: 0x108f92c: sw    s3, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5961,7 +5961,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108f30c: 0x108f30c: jal   0x101ca0c sw    s1, 208(sp)
+// 0x0108f930: 0x108f930: jal   0x101ca1c sw    s1, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5975,20 +5975,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f314: 0x108f314: lui   a0, 0x10000
+// 0x0108f938: 0x108f938: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108f318: 0x108f318: addiu a0, a0, -29692
+// 0x0108f93c: 0x108f93c: addiu a0, a0, -29692
 	ldloc.1
 	ldc.i4 -29692
 	add
 	stloc.1
-// 0x0108f31c: 0x108f31c: jal   0x101ca0c addu  s2, v0, zero
+// 0x0108f940: 0x108f940: jal   0x101ca1c addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -5996,37 +5996,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f324: 0x108f324: addu  s4, v0, zero
+// 0x0108f948: 0x108f948: addu  s4, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0108f328: 0x108f328: bne   s0, zero, 0x108f350 lui   a1, 0x20000
+// 0x0108f94c: 0x108f94c: bne   s0, zero, 0x108f974 lui   a1, 0x20000
 	ldloc 8
 	ldc.i4 131072
 	stloc.2
-	brtrue L_108f350
+	brtrue L_108f974
 // --- basic block ---
-// 0x0108f330: 0x108f330: lui   a3, 0x20000
+// 0x0108f954: 0x108f954: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108f334: 0x108f334: addiu a1, a1, -5692
+// 0x0108f958: 0x108f958: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108f338: 0x108f338: addiu a3, a3, -5436
+// 0x0108f95c: 0x108f95c: addiu a3, a3, -4972
 	ldloc 4
-	ldc.i4 -5436
+	ldc.i4 -4972
 	add
 	stloc 4
-// 0x0108f33c: 0x108f33c: addiu a0, zero, 4
+// 0x0108f960: 0x108f960: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108f340: 0x108f340: jal   0x100449c addiu a2, zero, 469
+// 0x0108f964: 0x108f964: jal   0x100449c addiu a2, zero, 469
 	ldc.i4 469
 	stloc.3
 	ldloc.0
@@ -6039,37 +6039,37 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f348: 0x108f348: j	 0x108f5b0 sll   zero, zero, 0
-	br L_108f5b0
+// 0x0108f96c: 0x108f96c: j	 0x108fbd4 sll   zero, zero, 0
+	br L_108fbd4
 // --- basic block ---
-L_108f350:
-// 0x0108f350: 0x108f350: lw    v0, 0(s0)
+L_108f974:
+// 0x0108f974: 0x108f974: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108f354: 0x108f354: lui   a3, 0x20000
+// 0x0108f978: 0x108f978: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108f358: 0x108f358: addiu a1, a1, -5692
+// 0x0108f97c: 0x108f97c: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108f35c: 0x108f35c: addiu a3, a3, -5400
+// 0x0108f980: 0x108f980: addiu a3, a3, -4936
 	ldloc 4
-	ldc.i4 -5400
+	ldc.i4 -4936
 	add
 	stloc 4
-// 0x0108f360: 0x108f360: addiu a0, zero, 1
+// 0x0108f984: 0x108f984: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108f364: 0x108f364: addiu a2, zero, 473
+// 0x0108f988: 0x108f988: addiu a2, zero, 473
 	ldc.i4 473
 	stloc.3
-// 0x0108f368: 0x108f368: jal   0x100449c sw    v0, 16(sp)
+// 0x0108f98c: 0x108f98c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6088,7 +6088,7 @@ L_108f350:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f370: 0x108f370: lw    v0, 176(s0)
+// 0x0108f994: 0x108f994: lw    v0, 176(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6097,34 +6097,34 @@ L_108f350:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f374: 0x108f374: sll   zero, zero, 0
-// 0x0108f378: 0x108f378: bne   v0, zero, 0x108f5b0 addiu s1, sp, 68
+// 0x0108f998: 0x108f998: sll   zero, zero, 0
+// 0x0108f99c: 0x108f99c: bne   v0, zero, 0x108fbd4 addiu s1, sp, 68
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 10
-	brtrue L_108f5b0
+	brtrue L_108fbd4
 // --- basic block ---
-// 0x0108f380: 0x108f380: lw    a3, 0(s0)
+// 0x0108f9a4: 0x108f9a4: lw    a3, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108f384: 0x108f384: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x0108f9a8: 0x108f9a8: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0108f388: 0x108f388: addiu a2, a2, -13884
+// 0x0108f9ac: 0x108f9ac: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0108f38c: 0x108f38c: addiu a1, zero, 128
+// 0x0108f9b0: 0x108f9b0: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0108f390: 0x108f390: jal   0x1000f9c addu  a0, s1, zero
+// 0x0108f9b4: 0x108f9b4: jal   0x1000f9c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6137,7 +6137,7 @@ L_108f350:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f398: 0x108f398: jal   0x101ca0c addu  a0, s1, zero
+// 0x0108f9bc: 0x108f9bc: jal   0x101ca1c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6145,15 +6145,15 @@ L_108f350:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f3a0: 0x108f3a0: addu  s3, v0, zero
+// 0x0108f9c4: 0x108f9c4: addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-// 0x0108f3a4: 0x108f3a4: lw    a2, 20(s0)
+// 0x0108f9c8: 0x108f9c8: lw    a2, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6162,7 +6162,7 @@ L_108f350:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108f3a8: 0x108f3a8: lw    v0, 28(s0)
+// 0x0108f9cc: 0x108f9cc: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6171,7 +6171,7 @@ L_108f350:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f3ac: 0x108f3ac: lw    v1, 24(s0)
+// 0x0108f9d0: 0x108f9d0: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6180,12 +6180,12 @@ L_108f350:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f3b0: 0x108f3b0: addiu a2, a2, 12
+// 0x0108f9d4: 0x108f9d4: addiu a2, a2, 12
 	ldloc.3
 	ldc.i4.s 12
 	add
 	stloc.3
-// 0x0108f3b4: 0x108f3b4: sw    v0, 52(sp)
+// 0x0108f9d8: 0x108f9d8: sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6194,16 +6194,16 @@ L_108f350:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108f3b8: 0x108f3b8: addu  a0, zero, zero
+// 0x0108f9dc: 0x108f9dc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0108f3bc: 0x108f3bc: addiu v0, zero, 4
+// 0x0108f9e0: 0x108f9e0: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0108f3c0: 0x108f3c0: addiu a1, zero, 1
+// 0x0108f9e4: 0x108f9e4: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108f3c4: 0x108f3c4: sw    v1, 48(sp)
+// 0x0108f9e8: 0x108f9e8: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6212,7 +6212,7 @@ L_108f350:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f3c8: 0x108f3c8: jal   0x10a1918 sw    v0, 40(sp)
+// 0x0108f9ec: 0x108f9ec: jal   0x10a1f60 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6226,45 +6226,45 @@ L_108f350:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f3d0: 0x108f3d0: beq   v0, zero, 0x108f3fc sll   zero, zero, 0
+// 0x0108f9f4: 0x108f9f4: beq   v0, zero, 0x108fa20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f3fc
+	brfalse L_108fa20
 // --- basic block ---
-// 0x0108f3d8: 0x108f3d8: jal   0x104e020 addu  a0, v0, zero
+// 0x0108f9fc: 0x108f9fc: jal   0x104e030 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f3e0: 0x108f3e0: addiu v1, zero, 2
+// 0x0108fa04: 0x108fa04: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0108f3e4: 0x108f3e4: div   v0, v1
+// 0x0108fa08: 0x108fa08: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 14
-// 0x0108f3e8: 0x108f3e8: mflo  lo
+// 0x0108fa0c: 0x108fa0c: mflo  lo
 	ldloc 14
 	stloc 7
-// 0x0108f3ec: 0x108f3ec: subu  v1, zero, v1
+// 0x0108fa10: 0x108fa10: subu  v1, zero, v1
 	ldloc 7
 	neg
 	stloc 7
-// 0x0108f3f0: 0x108f3f0: addiu v1, v1, 4
+// 0x0108fa14: 0x108fa14: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0108f3f4: 0x108f3f4: j	 0x108f400 sw    v1, 44(sp)
+// 0x0108fa18: 0x108fa18: j	 0x108fa24 sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6273,10 +6273,10 @@ L_108f350:
 	add
 	ldloc 7
 	stelem.i4
-	br L_108f400
+	br L_108fa24
 // --- basic block ---
-L_108f3fc:
-// 0x0108f3fc: 0x108f3fc: sw    zero, 44(sp)
+L_108fa20:
+// 0x0108fa20: 0x108fa20: sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6285,8 +6285,8 @@ L_108f3fc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_108f400:
-// 0x0108f400: 0x108f400: lw    a0, 20(s0)
+L_108fa24:
+// 0x0108fa24: 0x108fa24: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6295,12 +6295,12 @@ L_108f400:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f404: 0x108f404: addiu s5, sp, 68
+// 0x0108fa28: 0x108fa28: addiu s5, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 9
-// 0x0108f408: 0x108f408: jal   0x101ca0c addiu a0, a0, 12
+// 0x0108fa2c: 0x108fa2c: jal   0x101ca1c addiu a0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	add
@@ -6310,33 +6310,33 @@ L_108f400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f410: 0x108f410: lw    a3, 0(s0)
+// 0x0108fa34: 0x108fa34: lw    a3, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108f414: 0x108f414: lui   a2, 0x20000
+// 0x0108fa38: 0x108fa38: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108f418: 0x108f418: addiu a2, a2, -5516
+// 0x0108fa3c: 0x108fa3c: addiu a2, a2, -5052
 	ldloc.3
-	ldc.i4 -5516
+	ldc.i4 -5052
 	add
 	stloc.3
-// 0x0108f41c: 0x108f41c: addiu a1, zero, 128
+// 0x0108fa40: 0x108fa40: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0108f420: 0x108f420: addu  a0, s5, zero
+// 0x0108fa44: 0x108fa44: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x0108f424: 0x108f424: jal   0x1000f9c addu  s1, v0, zero
+// 0x0108fa48: 0x108fa48: jal   0x1000f9c addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -6349,7 +6349,7 @@ L_108f400:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f42c: 0x108f42c: jal   0x101ca0c addu  a0, s5, zero
+// 0x0108fa50: 0x108fa50: jal   0x101ca1c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6357,20 +6357,20 @@ L_108f400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f434: 0x108f434: addu  s5, v0, zero
+// 0x0108fa58: 0x108fa58: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0108f438: 0x108f438: addiu v1, sp, 48
+// 0x0108fa5c: 0x108fa5c: addiu v1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 7
-// 0x0108f43c: 0x108f43c: lw    v0, 40(s0)
+// 0x0108fa60: 0x108fa60: lw    v0, 40(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6379,7 +6379,7 @@ L_108f400:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f440: 0x108f440: sw    v1, 20(sp)
+// 0x0108fa64: 0x108fa64: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6388,29 +6388,29 @@ L_108f400:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f444: 0x108f444: addiu v1, sp, 40
+// 0x0108fa68: 0x108fa68: addiu v1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 7
-// 0x0108f448: 0x108f448: addu  a3, s4, zero
+// 0x0108fa6c: 0x108fa6c: addu  a3, s4, zero
 	ldloc 13
 	stloc 4
-// 0x0108f44c: 0x108f44c: addiu v0, v0, 3
+// 0x0108fa70: 0x108fa70: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x0108f450: 0x108f450: addu  a2, s3, zero
+// 0x0108fa74: 0x108fa74: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x0108f454: 0x108f454: addu  a1, s5, zero
+// 0x0108fa78: 0x108fa78: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x0108f458: 0x108f458: addu  a0, s2, zero
+// 0x0108fa7c: 0x108fa7c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0108f45c: 0x108f45c: sw    v1, 24(sp)
+// 0x0108fa80: 0x108fa80: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6419,10 +6419,10 @@ L_108f400:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f460: 0x108f460: addiu v1, zero, 28
+// 0x0108fa84: 0x108fa84: addiu v1, zero, 28
 	ldc.i4.s 28
 	stloc 7
-// 0x0108f464: 0x108f464: sw    v1, 28(sp)
+// 0x0108fa88: 0x108fa88: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6431,7 +6431,7 @@ L_108f400:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f468: 0x108f468: sw    v0, 36(sp)
+// 0x0108fa8c: 0x108fa8c: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6440,7 +6440,7 @@ L_108f400:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108f46c: 0x108f46c: sw    s1, 16(sp)
+// 0x0108fa90: 0x108fa90: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6449,7 +6449,7 @@ L_108f400:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108f470: 0x108f470: jal   0x101c27c sw    zero, 32(sp)
+// 0x0108fa94: 0x108fa94: jal   0x101c28c sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6463,20 +6463,20 @@ L_108f400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_with_priority_101c27c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_with_priority_101c28c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f478: 0x108f478: lui   a1, 0x1090000
+// 0x0108fa9c: 0x108fa9c: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x0108f47c: 0x108f47c: addu  a0, s5, zero
+// 0x0108faa0: 0x108faa0: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x0108f480: 0x108f480: jal   0x101bed0 addiu a1, a1, -2124
+// 0x0108faa4: 0x108faa4: jal   0x101bee0 addiu a1, a1, -552
 	ldloc.2
-	ldc.i4 -2124
+	ldc.i4 -552
 	add
 	stloc.2
 	ldloc.0
@@ -6484,12 +6484,12 @@ L_108f400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f488: 0x108f488: lw    v0, 20(s0)
+// 0x0108faac: 0x108faac: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6498,10 +6498,10 @@ L_108f400:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f48c: 0x108f48c: addiu a1, zero, -1
+// 0x0108fab0: 0x108fab0: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0108f490: 0x108f490: lw    a2, 400(v0)
+// 0x0108fab4: 0x108fab4: lw    a2, 400(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6510,18 +6510,18 @@ L_108f400:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108f494: 0x108f494: jal   0x101be78 addu  a0, s5, zero
+// 0x0108fab8: 0x108fab8: jal   0x101be88 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl20::roadmap_object_set_zoom_101be78(int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_set_zoom_101be88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f49c: 0x108f49c: jal   0x101c8f8 addu  a0, s1, zero
+// 0x0108fac0: 0x108fac0: jal   0x101c908 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6529,12 +6529,12 @@ L_108f400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f4a4: 0x108f4a4: jal   0x101c8f8 addu  a0, s5, zero
+// 0x0108fac8: 0x108fac8: jal   0x101c908 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6542,12 +6542,12 @@ L_108f400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f4ac: 0x108f4ac: lw    a2, 20(s0)
+// 0x0108fad0: 0x108fad0: lw    a2, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6556,29 +6556,29 @@ L_108f400:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108f4b0: 0x108f4b0: sll   zero, zero, 0
-// 0x0108f4b4: 0x108f4b4: lb    v0, 140(a2)
+// 0x0108fad4: 0x108fad4: sll   zero, zero, 0
+// 0x0108fad8: 0x108fad8: lb    v0, 140(a2)
 	ldloc.3
 	ldc.i4 140
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0108f4b8: 0x108f4b8: sll   zero, zero, 0
-// 0x0108f4bc: 0x108f4bc: beq   v0, zero, 0x108f5a4 addiu v0, zero, 1
+// 0x0108fadc: 0x108fadc: sll   zero, zero, 0
+// 0x0108fae0: 0x108fae0: beq   v0, zero, 0x108fbc8 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_108f5a4
+	brfalse L_108fbc8
 // --- basic block ---
-// 0x0108f4c4: 0x108f4c4: addiu a2, a2, 140
+// 0x0108fae8: 0x108fae8: addiu a2, a2, 140
 	ldloc.3
 	ldc.i4 140
 	add
 	stloc.3
-// 0x0108f4c8: 0x108f4c8: addu  a0, zero, zero
+// 0x0108faec: 0x108faec: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0108f4cc: 0x108f4cc: jal   0x10a1918 addiu a1, zero, 1
+// 0x0108faf0: 0x108faf0: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6586,45 +6586,45 @@ L_108f400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f4d4: 0x108f4d4: beq   v0, zero, 0x108f4fc sll   zero, zero, 0
+// 0x0108faf8: 0x108faf8: beq   v0, zero, 0x108fb20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f4fc
+	brfalse L_108fb20
 // --- basic block ---
-// 0x0108f4dc: 0x108f4dc: jal   0x104e020 addu  a0, v0, zero
+// 0x0108fb00: 0x108fb00: jal   0x104e030 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f4e4: 0x108f4e4: addiu v1, zero, 2
+// 0x0108fb08: 0x108fb08: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0108f4e8: 0x108f4e8: div   v0, v1
+// 0x0108fb0c: 0x108fb0c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 14
-// 0x0108f4ec: 0x108f4ec: mflo  lo
+// 0x0108fb10: 0x108fb10: mflo  lo
 	ldloc 14
 	stloc 7
-// 0x0108f4f0: 0x108f4f0: subu  v1, zero, v1
+// 0x0108fb14: 0x108fb14: subu  v1, zero, v1
 	ldloc 7
 	neg
 	stloc 7
-// 0x0108f4f4: 0x108f4f4: addiu v1, v1, 4
+// 0x0108fb18: 0x108fb18: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0108f4f8: 0x108f4f8: sw    v1, 44(sp)
+// 0x0108fb1c: 0x108fb1c: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6633,8 +6633,8 @@ L_108f400:
 	add
 	ldloc 7
 	stelem.i4
-L_108f4fc:
-// 0x0108f4fc: 0x108f4fc: lw    a0, 20(s0)
+L_108fb20:
+// 0x0108fb20: 0x108fb20: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6643,12 +6643,12 @@ L_108f4fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f500: 0x108f500: addiu s5, sp, 68
+// 0x0108fb24: 0x108fb24: addiu s5, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 9
-// 0x0108f504: 0x108f504: jal   0x101ca0c addiu a0, a0, 140
+// 0x0108fb28: 0x108fb28: jal   0x101ca1c addiu a0, a0, 140
 	ldloc.1
 	ldc.i4 140
 	add
@@ -6658,33 +6658,33 @@ L_108f4fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f50c: 0x108f50c: lw    a3, 0(s0)
+// 0x0108fb30: 0x108fb30: lw    a3, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0108f510: 0x108f510: lui   a2, 0x20000
+// 0x0108fb34: 0x108fb34: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108f514: 0x108f514: addiu a2, a2, -5488
+// 0x0108fb38: 0x108fb38: addiu a2, a2, -5024
 	ldloc.3
-	ldc.i4 -5488
+	ldc.i4 -5024
 	add
 	stloc.3
-// 0x0108f518: 0x108f518: addiu a1, zero, 128
+// 0x0108fb3c: 0x108fb3c: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0108f51c: 0x108f51c: addu  a0, s5, zero
+// 0x0108fb40: 0x108fb40: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x0108f520: 0x108f520: jal   0x1000f9c addu  s1, v0, zero
+// 0x0108fb44: 0x108fb44: jal   0x1000f9c addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -6697,7 +6697,7 @@ L_108f4fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f528: 0x108f528: jal   0x101ca0c addu  a0, s5, zero
+// 0x0108fb4c: 0x108fb4c: jal   0x101ca1c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6705,23 +6705,23 @@ L_108f4fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f530: 0x108f530: addu  s5, v0, zero
+// 0x0108fb54: 0x108fb54: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0108f534: 0x108f534: addu  a1, v0, zero
+// 0x0108fb58: 0x108fb58: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108f538: 0x108f538: addiu v0, sp, 48
+// 0x0108fb5c: 0x108fb5c: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x0108f53c: 0x108f53c: sw    v0, 20(sp)
+// 0x0108fb60: 0x108fb60: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6730,21 +6730,21 @@ L_108f4fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108f540: 0x108f540: addiu v0, sp, 40
+// 0x0108fb64: 0x108fb64: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x0108f544: 0x108f544: addu  a3, s4, zero
+// 0x0108fb68: 0x108fb68: addu  a3, s4, zero
 	ldloc 13
 	stloc 4
-// 0x0108f548: 0x108f548: addu  a2, s3, zero
+// 0x0108fb6c: 0x108fb6c: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x0108f54c: 0x108f54c: addu  a0, s2, zero
+// 0x0108fb70: 0x108fb70: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0108f550: 0x108f550: sw    v0, 24(sp)
+// 0x0108fb74: 0x108fb74: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6753,10 +6753,10 @@ L_108f4fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108f554: 0x108f554: addiu v0, zero, 28
+// 0x0108fb78: 0x108fb78: addiu v0, zero, 28
 	ldc.i4.s 28
 	stloc 5
-// 0x0108f558: 0x108f558: sw    v0, 28(sp)
+// 0x0108fb7c: 0x108fb7c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6765,7 +6765,7 @@ L_108f4fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108f55c: 0x108f55c: sw    s1, 16(sp)
+// 0x0108fb80: 0x108fb80: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6774,7 +6774,7 @@ L_108f4fc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108f560: 0x108f560: jal   0x101c4fc sw    zero, 32(sp)
+// 0x0108fb84: 0x108fb84: jal   0x101c50c sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6788,20 +6788,20 @@ L_108f4fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f568: 0x108f568: lui   a1, 0x1090000
+// 0x0108fb8c: 0x108fb8c: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x0108f56c: 0x108f56c: addu  a0, s5, zero
+// 0x0108fb90: 0x108fb90: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x0108f570: 0x108f570: jal   0x101bed0 addiu a1, a1, -2124
+// 0x0108fb94: 0x108fb94: jal   0x101bee0 addiu a1, a1, -552
 	ldloc.2
-	ldc.i4 -2124
+	ldc.i4 -552
 	add
 	stloc.2
 	ldloc.0
@@ -6809,12 +6809,12 @@ L_108f4fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f578: 0x108f578: lw    v0, 20(s0)
+// 0x0108fb9c: 0x108fb9c: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6823,10 +6823,10 @@ L_108f4fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f57c: 0x108f57c: addu  a0, s5, zero
+// 0x0108fba0: 0x108fba0: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x0108f580: 0x108f580: lw    a1, 400(v0)
+// 0x0108fba4: 0x108fba4: lw    a1, 400(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6835,7 +6835,7 @@ L_108f4fc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108f584: 0x108f584: lw    a2, 404(v0)
+// 0x0108fba8: 0x108fba8: lw    a2, 404(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6844,7 +6844,7 @@ L_108f4fc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108f588: 0x108f588: jal   0x101be78 addiu a1, a1, 1
+// 0x0108fbac: 0x108fbac: jal   0x101be88 addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
@@ -6852,12 +6852,12 @@ L_108f4fc:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl20::roadmap_object_set_zoom_101be78(int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_set_zoom_101be88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f590: 0x108f590: jal   0x101c8f8 addu  a0, s1, zero
+// 0x0108fbb4: 0x108fbb4: jal   0x101c908 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6865,12 +6865,12 @@ L_108f4fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f598: 0x108f598: jal   0x101c8f8 addu  a0, s5, zero
+// 0x0108fbbc: 0x108fbbc: jal   0x101c908 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6878,16 +6878,16 @@ L_108f4fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f5a0: 0x108f5a0: addiu v0, zero, 1
+// 0x0108fbc4: 0x108fbc4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_108f5a4:
-// 0x0108f5a4: 0x108f5a4: lw    a0, 8(s0)
+L_108fbc8:
+// 0x0108fbc8: 0x108fbc8: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6896,7 +6896,7 @@ L_108f5a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f5a8: 0x108f5a8: jal   0x109086c sw    v0, 176(s0)
+// 0x0108fbcc: 0x108fbcc: jal   0x1090e90 sw    v0, 176(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6910,14 +6910,14 @@ L_108f5a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_add_ID_109086c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_add_ID_1090e90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108f5b0:
-// 0x0108f5b0: 0x108f5b0: lw    ra, 228(sp)
-// 0x0108f5b4: 0x108f5b4: lw    s5, 224(sp)
+L_108fbd4:
+// 0x0108fbd4: 0x108fbd4: lw    ra, 228(sp)
+// 0x0108fbd8: 0x108fbd8: lw    s5, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6926,7 +6926,7 @@ L_108f5b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108f5b8: 0x108f5b8: lw    s4, 220(sp)
+// 0x0108fbdc: 0x108fbdc: lw    s4, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6935,7 +6935,7 @@ L_108f5b0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108f5bc: 0x108f5bc: lw    s3, 216(sp)
+// 0x0108fbe0: 0x108fbe0: lw    s3, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6944,7 +6944,7 @@ L_108f5b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108f5c0: 0x108f5c0: lw    s2, 212(sp)
+// 0x0108fbe4: 0x108fbe4: lw    s2, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6953,7 +6953,7 @@ L_108f5b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108f5c4: 0x108f5c4: lw    s1, 208(sp)
+// 0x0108fbe8: 0x108fbe8: lw    s1, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6962,7 +6962,7 @@ L_108f5b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108f5c8: 0x108f5c8: lw    s0, 204(sp)
+// 0x0108fbec: 0x108fbec: lw    s0, 204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6971,7 +6971,7 @@ L_108f5b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108f5cc: 0x108f5cc: jr    ra addiu sp, sp, 232
+// 0x0108fbf0: 0x108fbf0: jr    ra addiu sp, sp, 232
 	ldloc.0
 	ldc.i4 232
 	add
@@ -6983,7 +6983,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_UpdateDisplayList_108f5d4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_UpdateDisplayList_108fbf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s3,int32 s1,int32 s4,int32 s7,int32 v1,int32 s0,int32 s6,int32 s8,int32 s5,int32 ra)
@@ -7045,12 +7045,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f5d4: 0x108f5d4: addiu sp, sp, -56
+// 0x0108fbf8: 0x108fbf8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0108f5d8: 0x108f5d8: sw    s5, 36(sp)
+// 0x0108fbfc: 0x108fbfc: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7059,8 +7059,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0108f5dc: 0x108f5dc: sw    ra, 52(sp)
-// 0x0108f5e0: 0x108f5e0: sw    s8, 48(sp)
+// 0x0108fc00: 0x108fc00: sw    ra, 52(sp)
+// 0x0108fc04: 0x108fc04: sw    s8, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7069,7 +7069,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0108f5e4: 0x108f5e4: sw    s7, 44(sp)
+// 0x0108fc08: 0x108fc08: sw    s7, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7078,7 +7078,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108f5e8: 0x108f5e8: sw    s6, 40(sp)
+// 0x0108fc0c: 0x108fc0c: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7087,7 +7087,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108f5ec: 0x108f5ec: sw    s4, 32(sp)
+// 0x0108fc10: 0x108fc10: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7096,7 +7096,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108f5f0: 0x108f5f0: sw    s3, 28(sp)
+// 0x0108fc14: 0x108fc14: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7105,7 +7105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108f5f4: 0x108f5f4: sw    s2, 24(sp)
+// 0x0108fc18: 0x108fc18: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7114,7 +7114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f5f8: 0x108f5f8: sw    s1, 20(sp)
+// 0x0108fc1c: 0x108fc1c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7123,7 +7123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108f5fc: 0x108f5fc: jal   0x108f278 sw    s0, 16(sp)
+// 0x0108fc20: 0x108fc20: jal   0x108f89c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7137,107 +7137,107 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::get_max_pois_display_108f278(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::get_max_pois_display_108f89c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x0108f604: 0x108f604: addu  s5, v0, zero
+// 0x0108fc28: 0x108fc28: addu  s5, v0, zero
 	ldloc 5
 	stloc 16
-// 0x0108f608: 0x108f608: lui   v0, 0x80000
+// 0x0108fc2c: 0x108fc2c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108f60c: 0x108f60c: lw    v0, 8528(v0)
+// 0x0108fc30: 0x108fc30: lw    v0, 8992(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2132
+	ldc.i4 2248
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f610: 0x108f610: sll   zero, zero, 0
-// 0x0108f614: 0x108f614: bne   v0, zero, 0x108f784 lui   s1, 0xf0000
+// 0x0108fc34: 0x108fc34: sll   zero, zero, 0
+// 0x0108fc38: 0x108fc38: bne   v0, zero, 0x108fda8 lui   s1, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 9
-	brtrue L_108f784
+	brtrue L_108fda8
 // --- basic block ---
-// 0x0108f61c: 0x108f61c: addiu s1, s1, -27352
+// 0x0108fc40: 0x108fc40: addiu s1, s1, -26888
 	ldloc 9
-	ldc.i4 -27352
+	ldc.i4 -26888
 	add
 	stloc 9
-// 0x0108f620: 0x108f620: lui   s8, 0xf0000
+// 0x0108fc44: 0x108fc44: lui   s8, 0xf0000
 	ldc.i4 983040
 	stloc 15
-// 0x0108f624: 0x108f624: lui   s7, 0xf0000
+// 0x0108fc48: 0x108fc48: lui   s7, 0xf0000
 	ldc.i4 983040
 	stloc 11
-// 0x0108f628: 0x108f628: addiu s8, s8, -29760
+// 0x0108fc4c: 0x108fc4c: addiu s8, s8, -29296
 	ldloc 15
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 15
-// 0x0108f62c: 0x108f62c: addiu s7, s7, -27760
+// 0x0108fc50: 0x108fc50: addiu s7, s7, -27296
 	ldloc 11
-	ldc.i4 -27760
+	ldc.i4 -27296
 	add
 	stloc 11
-// 0x0108f630: 0x108f630: addu  s4, s1, zero
+// 0x0108fc54: 0x108fc54: addu  s4, s1, zero
 	ldloc 9
 	stloc 10
-// 0x0108f634: 0x108f634: addu  s0, zero, zero
+// 0x0108fc58: 0x108fc58: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x0108f638: 0x108f638: addu  s3, zero, zero
+// 0x0108fc5c: 0x108fc5c: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0108f63c: 0x108f63c: j	 0x108f6c0 addu  s6, s1, zero
+// 0x0108fc60: 0x108fc60: j	 0x108fce4 addu  s6, s1, zero
 	ldloc 9
 	stloc 14
-	br L_108f6c0
+	br L_108fce4
 // --- basic block ---
-L_108f644:
-// 0x0108f644: 0x108f644: lw    v1, 0(s4)
+L_108fc68:
+// 0x0108fc68: 0x108fc68: lw    v1, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-L_108f648:
-// 0x0108f648: 0x108f648: lw    s2, 0(v0)
+L_108fc6c:
+// 0x0108fc6c: 0x108fc6c: lw    s2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0108f64c: 0x108f64c: sll   zero, zero, 0
-// 0x0108f650: 0x108f650: beq   s2, zero, 0x108f680 addiu v0, v0, 4
+// 0x0108fc70: 0x108fc70: sll   zero, zero, 0
+// 0x0108fc74: 0x108fc74: beq   s2, zero, 0x108fca4 addiu v0, v0, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_108f680
+	brfalse L_108fca4
 // --- basic block ---
-// 0x0108f658: 0x108f658: lw    a0, 0(s2)
+// 0x0108fc7c: 0x108fc7c: lw    a0, 0(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108f65c: 0x108f65c: sll   zero, zero, 0
-// 0x0108f660: 0x108f660: bne   a0, v1, 0x108f680 sll   zero, zero, 0
+// 0x0108fc80: 0x108fc80: sll   zero, zero, 0
+// 0x0108fc84: 0x108fc84: bne   a0, v1, 0x108fca4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 12
-	bne.un L_108f680
+	bne.un L_108fca4
 // --- basic block ---
-// 0x0108f668: 0x108f668: lw    v0, 176(s2)
+// 0x0108fc8c: 0x108fc8c: lw    v0, 176(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7246,29 +7246,29 @@ L_108f648:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f66c: 0x108f66c: sll   zero, zero, 0
-// 0x0108f670: 0x108f670: beq   v0, zero, 0x108f6b8 sll   zero, zero, 0
+// 0x0108fc90: 0x108fc90: sll   zero, zero, 0
+// 0x0108fc94: 0x108fc94: beq   v0, zero, 0x108fcdc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f6b8
+	brfalse L_108fcdc
 // --- basic block ---
-// 0x0108f678: 0x108f678: j	 0x108f690 sll   zero, zero, 0
-	br L_108f690
+// 0x0108fc9c: 0x108fc9c: j	 0x108fcb4 sll   zero, zero, 0
+	br L_108fcb4
 // --- basic block ---
-L_108f680:
-// 0x0108f680: 0x108f680: bne   v0, s7, 0x108f648 sll   zero, zero, 0
+L_108fca4:
+// 0x0108fca4: 0x108fca4: bne   v0, s7, 0x108fc6c sll   zero, zero, 0
 	ldloc 5
 	ldloc 11
-	bne.un L_108f648
+	bne.un L_108fc6c
 // --- basic block ---
-// 0x0108f688: 0x108f688: j	 0x108f6bc addiu s3, s3, 1
+// 0x0108fcac: 0x108fcac: j	 0x108fce0 addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_108f6bc
+	br L_108fce0
 // --- basic block ---
-L_108f690:
-// 0x0108f690: 0x108f690: jal   0x108f020 addu  a0, s2, zero
+L_108fcb4:
+// 0x0108fcb4: 0x108fcb4: jal   0x108f644 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -7276,32 +7276,32 @@ L_108f690:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::is_visible_108f020(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::is_visible_108f644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x0108f698: 0x108f698: beq   v0, zero, 0x108f6b0 slt   v0, s0, s5
+// 0x0108fcbc: 0x108fcbc: beq   v0, zero, 0x108fcd4 slt   v0, s0, s5
 	ldloc 5
 	ldloc 13
 	ldloc 16
 	clt
 	stloc 5
-	brfalse L_108f6b0
+	brfalse L_108fcd4
 // --- basic block ---
-// 0x0108f6a0: 0x108f6a0: beq   v0, zero, 0x108f6b0 sll   zero, zero, 0
+// 0x0108fcc4: 0x108fcc4: beq   v0, zero, 0x108fcd4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f6b0
+	brfalse L_108fcd4
 // --- basic block ---
-// 0x0108f6a8: 0x108f6a8: j	 0x108f6b8 addiu s0, s0, 1
+// 0x0108fccc: 0x108fccc: j	 0x108fcdc addiu s0, s0, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	br L_108f6b8
+	br L_108fcdc
 // --- basic block ---
-L_108f6b0:
-// 0x0108f6b0: 0x108f6b0: jal   0x108f0c0 addu  a0, s2, zero
+L_108fcd4:
+// 0x0108fcd4: 0x108fcd4: jal   0x108f6e4 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -7309,25 +7309,25 @@ L_108f6b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RemovePoiObject_108f0c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RemovePoiObject_108f6e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-L_108f6b8:
-// 0x0108f6b8: 0x108f6b8: addiu s3, s3, 1
+L_108fcdc:
+// 0x0108fcdc: 0x108fcdc: addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_108f6bc:
-// 0x0108f6bc: 0x108f6bc: addiu s4, s4, 4
+L_108fce0:
+// 0x0108fce0: 0x108fce0: addiu s4, s4, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-L_108f6c0:
-// 0x0108f6c0: 0x108f6c0: lw    v0, 2000(s6)
+L_108fce4:
+// 0x0108fce4: 0x108fce4: lw    v0, 2000(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7336,112 +7336,112 @@ L_108f6c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f6c4: 0x108f6c4: sll   zero, zero, 0
-// 0x0108f6c8: 0x108f6c8: slt   v0, s3, v0
+// 0x0108fce8: 0x108fce8: sll   zero, zero, 0
+// 0x0108fcec: 0x108fcec: slt   v0, s3, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108f6cc: 0x108f6cc: bne   v0, zero, 0x108f644 addu  v0, s8, zero
+// 0x0108fcf0: 0x108fcf0: bne   v0, zero, 0x108fc68 addu  v0, s8, zero
 	ldloc 5
 	ldloc 15
 	stloc 5
-	brtrue L_108f644
+	brtrue L_108fc68
 // --- basic block ---
-// 0x0108f6d4: 0x108f6d4: lui   s7, 0xf0000
+// 0x0108fcf8: 0x108fcf8: lui   s7, 0xf0000
 	ldc.i4 983040
 	stloc 11
-// 0x0108f6d8: 0x108f6d8: lui   s6, 0xf0000
+// 0x0108fcfc: 0x108fcfc: lui   s6, 0xf0000
 	ldc.i4 983040
 	stloc 14
-// 0x0108f6dc: 0x108f6dc: lui   s4, 0xf0000
+// 0x0108fd00: 0x108fd00: lui   s4, 0xf0000
 	ldc.i4 983040
 	stloc 10
-// 0x0108f6e0: 0x108f6e0: addiu s7, s7, -27352
+// 0x0108fd04: 0x108fd04: addiu s7, s7, -26888
 	ldloc 11
-	ldc.i4 -27352
+	ldc.i4 -26888
 	add
 	stloc 11
-// 0x0108f6e4: 0x108f6e4: addiu s6, s6, -29760
+// 0x0108fd08: 0x108fd08: addiu s6, s6, -29296
 	ldloc 14
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 14
-// 0x0108f6e8: 0x108f6e8: addiu s4, s4, -27760
+// 0x0108fd0c: 0x108fd0c: addiu s4, s4, -27296
 	ldloc 10
-	ldc.i4 -27760
+	ldc.i4 -27296
 	add
 	stloc 10
-// 0x0108f6ec: 0x108f6ec: j	 0x108f770 addu  s3, zero, zero
+// 0x0108fd10: 0x108fd10: j	 0x108fd94 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_108f770
+	br L_108fd94
 // --- basic block ---
-L_108f6f4:
-// 0x0108f6f4: 0x108f6f4: lw    v1, 0(s1)
+L_108fd18:
+// 0x0108fd18: 0x108fd18: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-L_108f6f8:
-// 0x0108f6f8: 0x108f6f8: lw    s2, 0(v0)
+L_108fd1c:
+// 0x0108fd1c: 0x108fd1c: lw    s2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0108f6fc: 0x108f6fc: sll   zero, zero, 0
-// 0x0108f700: 0x108f700: beq   s2, zero, 0x108f72c addiu v0, v0, 4
+// 0x0108fd20: 0x108fd20: sll   zero, zero, 0
+// 0x0108fd24: 0x108fd24: beq   s2, zero, 0x108fd50 addiu v0, v0, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_108f72c
+	brfalse L_108fd50
 // --- basic block ---
-// 0x0108f708: 0x108f708: lw    a0, 0(s2)
+// 0x0108fd2c: 0x108fd2c: lw    a0, 0(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108f70c: 0x108f70c: sll   zero, zero, 0
-// 0x0108f710: 0x108f710: bne   a0, v1, 0x108f72c sll   zero, zero, 0
+// 0x0108fd30: 0x108fd30: sll   zero, zero, 0
+// 0x0108fd34: 0x108fd34: bne   a0, v1, 0x108fd50 sll   zero, zero, 0
 	ldloc.1
 	ldloc 12
-	bne.un L_108f72c
+	bne.un L_108fd50
 // --- basic block ---
-// 0x0108f718: 0x108f718: slt   v0, s0, s5
+// 0x0108fd3c: 0x108fd3c: slt   v0, s0, s5
 	ldloc 13
 	ldloc 16
 	clt
 	stloc 5
-// 0x0108f71c: 0x108f71c: beq   v0, zero, 0x108f768 sll   zero, zero, 0
+// 0x0108fd40: 0x108fd40: beq   v0, zero, 0x108fd8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f768
+	brfalse L_108fd8c
 // --- basic block ---
-// 0x0108f724: 0x108f724: j	 0x108f73c sll   zero, zero, 0
-	br L_108f73c
+// 0x0108fd48: 0x108fd48: j	 0x108fd60 sll   zero, zero, 0
+	br L_108fd60
 // --- basic block ---
-L_108f72c:
-// 0x0108f72c: 0x108f72c: bne   v0, s4, 0x108f6f8 sll   zero, zero, 0
+L_108fd50:
+// 0x0108fd50: 0x108fd50: bne   v0, s4, 0x108fd1c sll   zero, zero, 0
 	ldloc 5
 	ldloc 10
-	bne.un L_108f6f8
+	bne.un L_108fd1c
 // --- basic block ---
-// 0x0108f734: 0x108f734: j	 0x108f76c addiu s3, s3, 1
+// 0x0108fd58: 0x108fd58: j	 0x108fd90 addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_108f76c
+	br L_108fd90
 // --- basic block ---
-L_108f73c:
-// 0x0108f73c: 0x108f73c: jal   0x108f020 addu  a0, s2, zero
+L_108fd60:
+// 0x0108fd60: 0x108fd60: jal   0x108f644 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -7449,16 +7449,16 @@ L_108f73c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::is_visible_108f020(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::is_visible_108f644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x0108f744: 0x108f744: beq   v0, zero, 0x108f768 sll   zero, zero, 0
+// 0x0108fd68: 0x108fd68: beq   v0, zero, 0x108fd8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f768
+	brfalse L_108fd8c
 // --- basic block ---
-// 0x0108f74c: 0x108f74c: lw    v0, 176(s2)
+// 0x0108fd70: 0x108fd70: lw    v0, 176(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7467,12 +7467,12 @@ L_108f73c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f750: 0x108f750: sll   zero, zero, 0
-// 0x0108f754: 0x108f754: bne   v0, zero, 0x108f768 sll   zero, zero, 0
+// 0x0108fd74: 0x108fd74: sll   zero, zero, 0
+// 0x0108fd78: 0x108fd78: bne   v0, zero, 0x108fd8c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_108f768
+	brtrue L_108fd8c
 // --- basic block ---
-// 0x0108f75c: 0x108f75c: jal   0x108f2e4 addu  a0, s2, zero
+// 0x0108fd80: 0x108fd80: jal   0x108f908 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -7480,30 +7480,30 @@ L_108f73c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::CreatePoiObject_108f2e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::CreatePoiObject_108f908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x0108f764: 0x108f764: addiu s0, s0, 1
+// 0x0108fd88: 0x108fd88: addiu s0, s0, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-L_108f768:
-// 0x0108f768: 0x108f768: addiu s3, s3, 1
+L_108fd8c:
+// 0x0108fd8c: 0x108fd8c: addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_108f76c:
-// 0x0108f76c: 0x108f76c: addiu s1, s1, 4
+L_108fd90:
+// 0x0108fd90: 0x108fd90: addiu s1, s1, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_108f770:
-// 0x0108f770: 0x108f770: lw    v0, 2000(s7)
+L_108fd94:
+// 0x0108fd94: 0x108fd94: lw    v0, 2000(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7512,21 +7512,21 @@ L_108f770:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f774: 0x108f774: sll   zero, zero, 0
-// 0x0108f778: 0x108f778: slt   v0, s3, v0
+// 0x0108fd98: 0x108fd98: sll   zero, zero, 0
+// 0x0108fd9c: 0x108fd9c: slt   v0, s3, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108f77c: 0x108f77c: bne   v0, zero, 0x108f6f4 addu  v0, s6, zero
+// 0x0108fda0: 0x108fda0: bne   v0, zero, 0x108fd18 addu  v0, s6, zero
 	ldloc 5
 	ldloc 14
 	stloc 5
-	brtrue L_108f6f4
+	brtrue L_108fd18
 // --- basic block ---
-L_108f784:
-// 0x0108f784: 0x108f784: lw    ra, 52(sp)
-// 0x0108f788: 0x108f788: lw    s8, 48(sp)
+L_108fda8:
+// 0x0108fda8: 0x108fda8: lw    ra, 52(sp)
+// 0x0108fdac: 0x108fdac: lw    s8, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7535,7 +7535,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108f78c: 0x108f78c: lw    s7, 44(sp)
+// 0x0108fdb0: 0x108fdb0: lw    s7, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7544,7 +7544,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108f790: 0x108f790: lw    s6, 40(sp)
+// 0x0108fdb4: 0x108fdb4: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7553,7 +7553,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108f794: 0x108f794: lw    s5, 36(sp)
+// 0x0108fdb8: 0x108fdb8: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7562,7 +7562,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0108f798: 0x108f798: lw    s4, 32(sp)
+// 0x0108fdbc: 0x108fdbc: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7571,7 +7571,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108f79c: 0x108f79c: lw    s3, 28(sp)
+// 0x0108fdc0: 0x108fdc0: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7580,7 +7580,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108f7a0: 0x108f7a0: lw    s2, 24(sp)
+// 0x0108fdc4: 0x108fdc4: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7589,7 +7589,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f7a4: 0x108f7a4: lw    s1, 20(sp)
+// 0x0108fdc8: 0x108fdc8: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7598,7 +7598,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108f7a8: 0x108f7a8: lw    s0, 16(sp)
+// 0x0108fdcc: 0x108fdcc: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7607,7 +7607,7 @@ L_108f784:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108f7ac: 0x108f7ac: jr    ra addiu sp, sp, 56
+// 0x0108fdd0: 0x108fdd0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl107.j b/converted/Cibyl107.j
index fb86daa..3ee0be4 100644
--- a/converted/Cibyl107.j
+++ b/converted/Cibyl107.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl107::.ctor
 
-.method public static int32 OnPoiShortClick_108f7b4(int32,int32,int32,int32,int32)
+.method public static int32 OnPoiShortClick_108fdd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 ra)
@@ -79,12 +79,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f7b4: 0x108f7b4: addiu sp, sp, -32
+// 0x0108fdd8: 0x108fdd8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108f7b8: 0x108f7b8: sw    s0, 24(sp)
+// 0x0108fddc: 0x108fddc: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -93,8 +93,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108f7bc: 0x108f7bc: sw    ra, 28(sp)
-// 0x0108f7c0: 0x108f7c0: jal   0x1000d8c addu  s0, a0, zero
+// 0x0108fde0: 0x108fde0: sw    ra, 28(sp)
+// 0x0108fde4: 0x108fde4: jal   0x1000d8c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -107,94 +107,94 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0108f7c8: 0x108f7c8: lui   v1, 0xf0000
+// 0x0108fdec: 0x108fdec: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108f7cc: 0x108f7cc: lui   a1, 0xf0000
+// 0x0108fdf0: 0x108fdf0: lui   a1, 0xf0000
 	ldc.i4 983040
 	stloc.2
-// 0x0108f7d0: 0x108f7d0: addiu v1, v1, -29760
+// 0x0108fdf4: 0x108fdf4: addiu v1, v1, -29296
 	ldloc 5
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 5
-// 0x0108f7d4: 0x108f7d4: addiu a1, a1, -27760
+// 0x0108fdf8: 0x108fdf8: addiu a1, a1, -27296
 	ldloc.2
-	ldc.i4 -27760
+	ldc.i4 -27296
 	add
 	stloc.2
-L_108f7d8:
-// 0x0108f7d8: 0x108f7d8: lw    a0, 0(v1)
+L_108fdfc:
+// 0x0108fdfc: 0x108fdfc: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108f7dc: 0x108f7dc: sll   zero, zero, 0
-// 0x0108f7e0: 0x108f7e0: beq   a0, zero, 0x108f808 addiu v1, v1, 4
+// 0x0108fe00: 0x108fe00: sll   zero, zero, 0
+// 0x0108fe04: 0x108fe04: beq   a0, zero, 0x108fe2c addiu v1, v1, 4
 	ldloc.1
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_108f808
+	brfalse L_108fe2c
 // --- basic block ---
-// 0x0108f7e8: 0x108f7e8: lw    a2, 0(a0)
+// 0x0108fe0c: 0x108fe0c: lw    a2, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0108f7ec: 0x108f7ec: sll   zero, zero, 0
-// 0x0108f7f0: 0x108f7f0: bne   a2, v0, 0x108f808 sll   zero, zero, 0
+// 0x0108fe10: 0x108fe10: sll   zero, zero, 0
+// 0x0108fe14: 0x108fe14: bne   a2, v0, 0x108fe2c sll   zero, zero, 0
 	ldloc.3
 	ldloc 7
-	bne.un L_108f808
+	bne.un L_108fe2c
 // --- basic block ---
-// 0x0108f7f8: 0x108f7f8: jal   0x10902cc sll   zero, zero, 0
+// 0x0108fe1c: 0x108fe1c: jal   0x10908f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoiDlg_10902cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoiDlg_10908f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0108f800: 0x108f800: j	 0x108f82c sll   zero, zero, 0
-	br L_108f82c
+// 0x0108fe24: 0x108fe24: j	 0x108fe50 sll   zero, zero, 0
+	br L_108fe50
 // --- basic block ---
-L_108f808:
-// 0x0108f808: 0x108f808: bne   v1, a1, 0x108f7d8 lui   a3, 0x20000
+L_108fe2c:
+// 0x0108fe2c: 0x108fe2c: bne   v1, a1, 0x108fdfc lui   a3, 0x20000
 	ldloc 5
 	ldloc.2
 	ldc.i4 131072
 	stloc 4
-	bne.un L_108f7d8
+	bne.un L_108fdfc
 // --- basic block ---
-// 0x0108f810: 0x108f810: lui   a1, 0x20000
+// 0x0108fe34: 0x108fe34: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108f814: 0x108f814: addiu a1, a1, -5692
+// 0x0108fe38: 0x108fe38: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108f818: 0x108f818: addiu a3, a3, -5352
+// 0x0108fe3c: 0x108fe3c: addiu a3, a3, -4888
 	ldloc 4
-	ldc.i4 -5352
+	ldc.i4 -4888
 	add
 	stloc 4
-// 0x0108f81c: 0x108f81c: addiu a0, zero, 4
+// 0x0108fe40: 0x108fe40: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108f820: 0x108f820: addiu a2, zero, 451
+// 0x0108fe44: 0x108fe44: addiu a2, zero, 451
 	ldc.i4 451
 	stloc.3
-// 0x0108f824: 0x108f824: jal   0x100449c sw    s0, 16(sp)
+// 0x0108fe48: 0x108fe48: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -213,9 +213,9 @@ L_108f808:
 	stloc 5
 	stloc 7
 // --- basic block ---
-L_108f82c:
-// 0x0108f82c: 0x108f82c: lw    ra, 28(sp)
-// 0x0108f830: 0x108f830: lw    s0, 24(sp)
+L_108fe50:
+// 0x0108fe50: 0x108fe50: lw    ra, 28(sp)
+// 0x0108fe54: 0x108fe54: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -224,7 +224,7 @@ L_108f82c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108f834: 0x108f834: jr    ra addiu sp, sp, 32
+// 0x0108fe58: 0x108fe58: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -236,7 +236,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 init_ExternalPoiTypesTable_108f83c(int32,int32,int32,int32,int32)
+.method public static int32 init_ExternalPoiTypesTable_108fe60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 ra,int32 v1)
@@ -277,12 +277,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f83c: 0x108f83c: addiu sp, sp, -32
+// 0x0108fe60: 0x108fe60: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108f840: 0x108f840: sw    s0, 20(sp)
+// 0x0108fe64: 0x108fe64: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -291,10 +291,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108f844: 0x108f844: lui   s0, 0xf0000
+// 0x0108fe68: 0x108fe68: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108f848: 0x108f848: sw    s1, 24(sp)
+// 0x0108fe6c: 0x108fe6c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -303,16 +303,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f84c: 0x108f84c: addiu s0, s0, -27756
+// 0x0108fe70: 0x108fe70: addiu s0, s0, -27292
 	ldloc 5
-	ldc.i4 -27756
+	ldc.i4 -27292
 	add
 	stloc 5
-// 0x0108f850: 0x108f850: lui   s1, 0xf0000
+// 0x0108fe74: 0x108fe74: lui   s1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0108f854: 0x108f854: sw    ra, 28(sp)
-// 0x0108f858: 0x108f858: sw    zero, 400(s0)
+// 0x0108fe78: 0x108fe78: sw    ra, 28(sp)
+// 0x0108fe7c: 0x108fe7c: sw    zero, 400(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -321,27 +321,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108f85c: 0x108f85c: addiu s1, s1, -27356
+// 0x0108fe80: 0x108fe80: addiu s1, s1, -26892
 	ldloc 7
-	ldc.i4 -27356
+	ldc.i4 -26892
 	add
 	stloc 7
-L_108f860:
-// 0x0108f860: 0x108f860: lw    v0, 0(s0)
+L_108fe84:
+// 0x0108fe84: 0x108fe84: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0108f864: 0x108f864: sll   zero, zero, 0
-// 0x0108f868: 0x108f868: beq   v0, zero, 0x108f878 addu  a0, v0, zero
+// 0x0108fe88: 0x108fe88: sll   zero, zero, 0
+// 0x0108fe8c: 0x108fe8c: beq   v0, zero, 0x108fe9c addu  a0, v0, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
-	brfalse L_108f878
+	brfalse L_108fe9c
 // --- basic block ---
-// 0x0108f870: 0x108f870: jal   0x1000930 sll   zero, zero, 0
+// 0x0108fe94: 0x108fe94: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -352,26 +352,26 @@ L_108f860:
 	stloc 10
 	stloc 8
 // --- basic block ---
-L_108f878:
-// 0x0108f878: 0x108f878: sw    zero, 0(s0)
+L_108fe9c:
+// 0x0108fe9c: 0x108fe9c: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108f87c: 0x108f87c: addiu s0, s0, 4
+// 0x0108fea0: 0x108fea0: addiu s0, s0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x0108f880: 0x108f880: bne   s0, s1, 0x108f860 sll   zero, zero, 0
+// 0x0108fea4: 0x108fea4: bne   s0, s1, 0x108fe84 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_108f860
+	bne.un L_108fe84
 // --- basic block ---
-// 0x0108f888: 0x108f888: lw    ra, 28(sp)
-// 0x0108f88c: 0x108f88c: lw    s1, 24(sp)
+// 0x0108feac: 0x108feac: lw    ra, 28(sp)
+// 0x0108feb0: 0x108feb0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -380,7 +380,7 @@ L_108f878:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f890: 0x108f890: lw    s0, 20(sp)
+// 0x0108feb4: 0x108feb4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -389,7 +389,7 @@ L_108f878:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f894: 0x108f894: jr    ra addiu sp, sp, 32
+// 0x0108feb8: 0x108feb8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -401,7 +401,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 init_ExternalPoiTable_108f89c(int32,int32,int32,int32,int32)
+.method public static int32 init_ExternalPoiTable_108fec0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 ra,int32 v1)
@@ -442,12 +442,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f89c: 0x108f89c: addiu sp, sp, -32
+// 0x0108fec0: 0x108fec0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108f8a0: 0x108f8a0: sw    s0, 20(sp)
+// 0x0108fec4: 0x108fec4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -456,10 +456,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108f8a4: 0x108f8a4: lui   s0, 0xf0000
+// 0x0108fec8: 0x108fec8: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108f8a8: 0x108f8a8: sw    s1, 24(sp)
+// 0x0108fecc: 0x108fecc: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -468,16 +468,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108f8ac: 0x108f8ac: addiu s0, s0, -29760
+// 0x0108fed0: 0x108fed0: addiu s0, s0, -29296
 	ldloc 5
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 5
-// 0x0108f8b0: 0x108f8b0: lui   s1, 0xf0000
+// 0x0108fed4: 0x108fed4: lui   s1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0108f8b4: 0x108f8b4: sw    ra, 28(sp)
-// 0x0108f8b8: 0x108f8b8: sw    zero, 2000(s0)
+// 0x0108fed8: 0x108fed8: sw    ra, 28(sp)
+// 0x0108fedc: 0x108fedc: sw    zero, 2000(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -486,27 +486,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108f8bc: 0x108f8bc: addiu s1, s1, -27760
+// 0x0108fee0: 0x108fee0: addiu s1, s1, -27296
 	ldloc 7
-	ldc.i4 -27760
+	ldc.i4 -27296
 	add
 	stloc 7
-L_108f8c0:
-// 0x0108f8c0: 0x108f8c0: lw    v0, 0(s0)
+L_108fee4:
+// 0x0108fee4: 0x108fee4: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0108f8c4: 0x108f8c4: sll   zero, zero, 0
-// 0x0108f8c8: 0x108f8c8: beq   v0, zero, 0x108f8d8 addu  a0, v0, zero
+// 0x0108fee8: 0x108fee8: sll   zero, zero, 0
+// 0x0108feec: 0x108feec: beq   v0, zero, 0x108fefc addu  a0, v0, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
-	brfalse L_108f8d8
+	brfalse L_108fefc
 // --- basic block ---
-// 0x0108f8d0: 0x108f8d0: jal   0x1000930 sll   zero, zero, 0
+// 0x0108fef4: 0x108fef4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -517,26 +517,26 @@ L_108f8c0:
 	stloc 10
 	stloc 8
 // --- basic block ---
-L_108f8d8:
-// 0x0108f8d8: 0x108f8d8: sw    zero, 0(s0)
+L_108fefc:
+// 0x0108fefc: 0x108fefc: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108f8dc: 0x108f8dc: addiu s0, s0, 4
+// 0x0108ff00: 0x108ff00: addiu s0, s0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x0108f8e0: 0x108f8e0: bne   s0, s1, 0x108f8c0 sll   zero, zero, 0
+// 0x0108ff04: 0x108ff04: bne   s0, s1, 0x108fee4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_108f8c0
+	bne.un L_108fee4
 // --- basic block ---
-// 0x0108f8e8: 0x108f8e8: lw    ra, 28(sp)
-// 0x0108f8ec: 0x108f8ec: lw    s1, 24(sp)
+// 0x0108ff0c: 0x108ff0c: lw    ra, 28(sp)
+// 0x0108ff10: 0x108ff10: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -545,7 +545,7 @@ L_108f8d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f8f0: 0x108f8f0: lw    s0, 20(sp)
+// 0x0108ff14: 0x108ff14: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -554,7 +554,7 @@ L_108f8d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f8f4: 0x108f8f4: jr    ra addiu sp, sp, 32
+// 0x0108ff18: 0x108ff18: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -566,7 +566,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 RealtimeExternalPoi_AfterRefresh_108f8fc(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_AfterRefresh_108ff20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -601,28 +601,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f8fc: 0x108f8fc: lui   v0, 0xf0000
+// 0x0108ff20: 0x108ff20: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108f900: 0x108f900: lw    v0, -25352(v0)
+// 0x0108ff24: 0x108ff24: lw    v0, -24888(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6338
+	ldc.i4 -6222
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f904: 0x108f904: addiu sp, sp, -40
+// 0x0108ff28: 0x108ff28: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0108f908: 0x108f908: beq   v0, zero, 0x108f988 sw    ra, 36(sp)
+// 0x0108ff2c: 0x108ff2c: beq   v0, zero, 0x108ffac sw    ra, 36(sp)
 	ldloc 5
-	brfalse L_108f988
+	brfalse L_108ffac
 // --- basic block ---
-// 0x0108f910: 0x108f910: jal   0x1007f50 addiu a0, sp, 16
+// 0x0108ff34: 0x108ff34: jal   0x1007f60 addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -632,20 +632,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f50(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f918: 0x108f918: lui   v1, 0x80000
+// 0x0108ff3c: 0x108ff3c: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0108f91c: 0x108f91c: addiu v0, v1, 8536
+// 0x0108ff40: 0x108ff40: addiu v0, v1, 9000
 	ldloc 7
-	ldc.i4 8536
+	ldc.i4 9000
 	add
 	stloc 5
-// 0x0108f920: 0x108f920: lw    a1, 8(v0)
+// 0x0108ff44: 0x108ff44: lw    a1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -654,7 +654,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108f924: 0x108f924: lw    a0, 24(sp)
+// 0x0108ff48: 0x108ff48: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -663,15 +663,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f928: 0x108f928: sll   zero, zero, 0
-// 0x0108f92c: 0x108f92c: bne   a1, a0, 0x108f970 lui   a0, 0x80000
+// 0x0108ff4c: 0x108ff4c: sll   zero, zero, 0
+// 0x0108ff50: 0x108ff50: bne   a1, a0, 0x108ff94 lui   a0, 0x80000
 	ldloc.2
 	ldloc.1
 	ldc.i4 524288
 	stloc.1
-	bne.un L_108f970
+	bne.un L_108ff94
 // --- basic block ---
-// 0x0108f934: 0x108f934: lw    a1, 12(v0)
+// 0x0108ff58: 0x108ff58: lw    a1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -680,7 +680,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108f938: 0x108f938: lw    a0, 28(sp)
+// 0x0108ff5c: 0x108ff5c: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -689,24 +689,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f93c: 0x108f93c: sll   zero, zero, 0
-// 0x0108f940: 0x108f940: bne   a1, a0, 0x108f970 lui   a0, 0x80000
+// 0x0108ff60: 0x108ff60: sll   zero, zero, 0
+// 0x0108ff64: 0x108ff64: bne   a1, a0, 0x108ff94 lui   a0, 0x80000
 	ldloc.2
 	ldloc.1
 	ldc.i4 524288
 	stloc.1
-	bne.un L_108f970
+	bne.un L_108ff94
 // --- basic block ---
-// 0x0108f948: 0x108f948: lw    a0, 8536(v1)
+// 0x0108ff6c: 0x108ff6c: lw    a0, 9000(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2134
+	ldc.i4 2250
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108f94c: 0x108f94c: lw    v1, 16(sp)
+// 0x0108ff70: 0x108ff70: lw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -715,15 +715,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f950: 0x108f950: sll   zero, zero, 0
-// 0x0108f954: 0x108f954: bne   a0, v1, 0x108f970 lui   a0, 0x80000
+// 0x0108ff74: 0x108ff74: sll   zero, zero, 0
+// 0x0108ff78: 0x108ff78: bne   a0, v1, 0x108ff94 lui   a0, 0x80000
 	ldloc.1
 	ldloc 7
 	ldc.i4 524288
 	stloc.1
-	bne.un L_108f970
+	bne.un L_108ff94
 // --- basic block ---
-// 0x0108f95c: 0x108f95c: lw    v1, 4(v0)
+// 0x0108ff80: 0x108ff80: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -732,7 +732,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108f960: 0x108f960: lw    v0, 20(sp)
+// 0x0108ff84: 0x108ff84: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -741,26 +741,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f964: 0x108f964: sll   zero, zero, 0
-// 0x0108f968: 0x108f968: beq   v1, v0, 0x108f98c lui   v0, 0x80000
+// 0x0108ff88: 0x108ff88: sll   zero, zero, 0
+// 0x0108ff8c: 0x108ff8c: beq   v1, v0, 0x108ffb0 lui   v0, 0x80000
 	ldloc 7
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	beq  L_108f98c
+	beq  L_108ffb0
 // --- basic block ---
-L_108f970:
-// 0x0108f970: 0x108f970: addiu a0, a0, 8536
+L_108ff94:
+// 0x0108ff94: 0x108ff94: addiu a0, a0, 9000
 	ldloc.1
-	ldc.i4 8536
+	ldc.i4 9000
 	add
 	stloc.1
-// 0x0108f974: 0x108f974: addiu a1, sp, 16
+// 0x0108ff98: 0x108ff98: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0108f978: 0x108f978: jal   0x1001800 addiu a2, zero, 16
+// 0x0108ff9c: 0x108ff9c: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -772,37 +772,37 @@ L_108f970:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f980: 0x108f980: jal   0x108f5d4 sll   zero, zero, 0
+// 0x0108ffa4: 0x108ffa4: jal   0x108fbf8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_UpdateDisplayList_108f5d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_UpdateDisplayList_108fbf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108f988:
-// 0x0108f988: 0x108f988: lui   v0, 0x80000
+L_108ffac:
+// 0x0108ffac: 0x108ffac: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_108f98c:
-// 0x0108f98c: 0x108f98c: lw    v0, 8532(v0)
+L_108ffb0:
+// 0x0108ffb0: 0x108ffb0: lw    v0, 8996(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2133
+	ldc.i4 2249
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108f990: 0x108f990: sll   zero, zero, 0
-// 0x0108f994: 0x108f994: beq   v0, zero, 0x108f9a4 sll   zero, zero, 0
+// 0x0108ffb4: 0x108ffb4: sll   zero, zero, 0
+// 0x0108ffb8: 0x108ffb8: beq   v0, zero, 0x108ffc8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108f9a4
+	brfalse L_108ffc8
 // --- basic block ---
-// 0x0108f99c: 0x108f99c: jalr  v0 sll   zero, zero, 0
+// 0x0108ffc0: 0x108ffc0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -814,10 +814,10 @@ L_108f98c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108f9a4:
-// 0x0108f9a4: 0x108f9a4: lw    ra, 36(sp)
-// 0x0108f9a8: 0x108f9a8: sll   zero, zero, 0
-// 0x0108f9ac: 0x108f9ac: jr    ra addiu sp, sp, 40
+L_108ffc8:
+// 0x0108ffc8: 0x108ffc8: lw    ra, 36(sp)
+// 0x0108ffcc: 0x108ffcc: sll   zero, zero, 0
+// 0x0108ffd0: 0x108ffd0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -829,7 +829,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_GetUrl_108f9b4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_GetUrl_108ffd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -864,16 +864,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f9b4: 0x108f9b4: lui   a0, 0x0
+// 0x0108ffd8: 0x108ffd8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108f9b8: 0x108f9b8: addiu sp, sp, -24
+// 0x0108ffdc: 0x108ffdc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108f9bc: 0x108f9bc: sw    ra, 20(sp)
-// 0x0108f9c0: 0x108f9c0: jal   0x100e348 addiu a0, a0, 17464
+// 0x0108ffe0: 0x108ffe0: sw    ra, 20(sp)
+// 0x0108ffe4: 0x108ffe4: jal   0x100e358 addiu a0, a0, 17464
 	ldloc.1
 	ldc.i4 17464
 	add
@@ -883,14 +883,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0108f9c8: 0x108f9c8: lw    ra, 20(sp)
-// 0x0108f9cc: 0x108f9cc: sll   zero, zero, 0
-// 0x0108f9d0: 0x108f9d0: jr    ra addiu sp, sp, 24
+// 0x0108ffec: 0x108ffec: lw    ra, 20(sp)
+// 0x0108fff0: 0x108fff0: sll   zero, zero, 0
+// 0x0108fff4: 0x108fff4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -902,7 +902,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -937,16 +937,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108f9d8: 0x108f9d8: lui   a0, 0x0
+// 0x0108fffc: 0x108fffc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108f9dc: 0x108f9dc: addiu sp, sp, -24
+// 0x01090000: 0x1090000: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108f9e0: 0x108f9e0: sw    ra, 20(sp)
-// 0x0108f9e4: 0x108f9e4: jal   0x100e348 addiu a0, a0, 17448
+// 0x01090004: 0x1090004: sw    ra, 20(sp)
+// 0x01090008: 0x1090008: jal   0x100e358 addiu a0, a0, 17448
 	ldloc.1
 	ldc.i4 17448
 	add
@@ -956,18 +956,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108f9ec: 0x108f9ec: lui   a1, 0x0
+// 0x01090010: 0x1090010: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108f9f0: 0x108f9f0: addu  a0, v0, zero
+// 0x01090014: 0x1090014: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108f9f4: 0x108f9f4: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01090018: 0x1090018: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -977,13 +977,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108f9fc: 0x108f9fc: lw    ra, 20(sp)
-// 0x0108fa00: 0x108fa00: sltiu v0, v0, 1
+// 0x01090020: 0x1090020: lw    ra, 20(sp)
+// 0x01090024: 0x1090024: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0108fa04: 0x108fa04: jr    ra addiu sp, sp, 24
+// 0x01090028: 0x1090028: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -995,7 +995,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_DisplayList_add_ID_108fa0c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_DisplayList_add_ID_1090030(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1030,12 +1030,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108fa0c: 0x108fa0c: addiu sp, sp, -32
+// 0x01090030: 0x1090030: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108fa10: 0x108fa10: sw    a0, 16(sp)
+// 0x01090034: 0x1090034: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1044,19 +1044,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0108fa14: 0x108fa14: sw    ra, 28(sp)
-// 0x0108fa18: 0x108fa18: jal   0x108f9d8 sll   zero, zero, 0
+// 0x01090038: 0x1090038: sw    ra, 28(sp)
+// 0x0109003c: 0x109003c: jal   0x108fffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108fa20: 0x108fa20: lw    a0, 16(sp)
+// 0x01090044: 0x1090044: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1065,18 +1065,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108fa24: 0x108fa24: beq   v0, zero, 0x108fa4c lui   v0, 0xf0000
+// 0x01090048: 0x1090048: beq   v0, zero, 0x1090070 lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brfalse L_108fa4c
+	brfalse L_1090070
 // --- basic block ---
-// 0x0108fa2c: 0x108fa2c: addiu v0, v0, -27352
+// 0x01090050: 0x1090050: addiu v0, v0, -26888
 	ldloc 5
-	ldc.i4 -27352
+	ldc.i4 -26888
 	add
 	stloc 5
-// 0x0108fa30: 0x108fa30: lw    v1, 2000(v0)
+// 0x01090054: 0x1090054: lw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1085,30 +1085,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108fa34: 0x108fa34: sll   zero, zero, 0
-// 0x0108fa38: 0x108fa38: sll   a1, v1, 2
+// 0x01090058: 0x1090058: sll   zero, zero, 0
+// 0x0109005c: 0x109005c: sll   a1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0108fa3c: 0x108fa3c: addu  a1, a1, v0
+// 0x01090060: 0x1090060: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x0108fa40: 0x108fa40: addiu v1, v1, 1
+// 0x01090064: 0x1090064: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0108fa44: 0x108fa44: sw    a0, 0(a1)
+// 0x01090068: 0x1090068: sw    a0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0108fa48: 0x108fa48: sw    v1, 2000(v0)
+// 0x0109006c: 0x109006c: sw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1117,10 +1117,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-L_108fa4c:
-// 0x0108fa4c: 0x108fa4c: lw    ra, 28(sp)
-// 0x0108fa50: 0x108fa50: sll   zero, zero, 0
-// 0x0108fa54: 0x108fa54: jr    ra addiu sp, sp, 32
+L_1090070:
+// 0x01090070: 0x1090070: lw    ra, 28(sp)
+// 0x01090074: 0x1090074: sll   zero, zero, 0
+// 0x01090078: 0x1090078: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1132,7 +1132,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_DisplayList_108fa5c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_DisplayList_1090080(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s2,int32 v1,int32 s1,int32 s3,int32 s6,int32 s4,int32 s7,int32 s5,int32 ra)
@@ -1191,12 +1191,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108fa5c: 0x108fa5c: addiu sp, sp, -64
+// 0x01090080: 0x1090080: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0108fa60: 0x108fa60: sw    s5, 48(sp)
+// 0x01090084: 0x1090084: sw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1205,8 +1205,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0108fa64: 0x108fa64: sw    ra, 60(sp)
-// 0x0108fa68: 0x108fa68: sw    s7, 56(sp)
+// 0x01090088: 0x1090088: sw    ra, 60(sp)
+// 0x0109008c: 0x109008c: sw    s7, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1215,7 +1215,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108fa6c: 0x108fa6c: sw    s6, 52(sp)
+// 0x01090090: 0x1090090: sw    s6, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1224,7 +1224,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0108fa70: 0x108fa70: sw    s4, 44(sp)
+// 0x01090094: 0x1090094: sw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1233,7 +1233,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108fa74: 0x108fa74: sw    s3, 40(sp)
+// 0x01090098: 0x1090098: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1242,7 +1242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108fa78: 0x108fa78: sw    s2, 36(sp)
+// 0x0109009c: 0x109009c: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1251,7 +1251,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108fa7c: 0x108fa7c: sw    s1, 32(sp)
+// 0x010900a0: 0x10900a0: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1260,7 +1260,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108fa80: 0x108fa80: jal   0x108f278 sw    s0, 28(sp)
+// 0x010900a4: 0x10900a4: jal   0x108f89c sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1274,12 +1274,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::get_max_pois_display_108f278(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::get_max_pois_display_108f89c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0108fa88: 0x108fa88: jal   0x108f9d8 addu  s5, v0, zero
+// 0x010900ac: 0x10900ac: jal   0x108fffc addu  s5, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -1287,23 +1287,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0108fa90: 0x108fa90: beq   v0, zero, 0x108fc00 lui   s2, 0xf0000
+// 0x010900b4: 0x10900b4: beq   v0, zero, 0x1090224 lui   s2, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 8
-	brfalse L_108fc00
+	brfalse L_1090224
 // --- basic block ---
-// 0x0108fa98: 0x108fa98: addiu s2, s2, -27352
+// 0x010900bc: 0x10900bc: addiu s2, s2, -26888
 	ldloc 8
-	ldc.i4 -27352
+	ldc.i4 -26888
 	add
 	stloc 8
-// 0x0108fa9c: 0x108fa9c: lw    v0, 2000(s2)
+// 0x010900c0: 0x10900c0: lw    v0, 2000(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1312,28 +1312,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108faa0: 0x108faa0: sll   zero, zero, 0
-// 0x0108faa4: 0x108faa4: beq   v0, zero, 0x108fc00 addiu s3, zero, 1
+// 0x010900c4: 0x10900c4: sll   zero, zero, 0
+// 0x010900c8: 0x10900c8: beq   v0, zero, 0x1090224 addiu s3, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 11
-	brfalse L_108fc00
+	brfalse L_1090224
 // --- basic block ---
-// 0x0108faac: 0x108faac: addu  s1, s2, zero
+// 0x010900d0: 0x10900d0: addu  s1, s2, zero
 	ldloc 8
 	stloc 10
-// 0x0108fab0: 0x108fab0: addiu s4, sp, 16
+// 0x010900d4: 0x10900d4: addiu s4, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 13
-// 0x0108fab4: 0x108fab4: j	 0x108fb44 addiu s6, zero, -1
+// 0x010900d8: 0x10900d8: j	 0x1090168 addiu s6, zero, -1
 	ldc.i4.m1
 	stloc 12
-	br L_108fb44
+	br L_1090168
 // --- basic block ---
-L_108fabc:
-// 0x0108fabc: 0x108fabc: lw    v0, 4(s2)
+L_10900e0:
+// 0x010900e0: 0x10900e0: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1342,13 +1342,13 @@ L_108fabc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108fac0: 0x108fac0: addu  a0, s4, zero
+// 0x010900e4: 0x10900e4: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x0108fac4: 0x108fac4: addu  a1, s2, zero
+// 0x010900e8: 0x10900e8: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x0108fac8: 0x108fac8: jal   0x108ee94 sw    v0, 16(sp)
+// 0x010900ec: 0x10900ec: jal   0x108f4b8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1361,125 +1361,125 @@ L_108fabc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_Compare_108ee94(int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_Compare_108f4b8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0108fad0: 0x108fad0: srl   v0, v0, 31
+// 0x010900f4: 0x10900f4: srl   v0, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr.un
 	stloc 5
-// 0x0108fad4: 0x108fad4: j	 0x108fb0c addiu s0, s3, -1
+// 0x010900f8: 0x10900f8: j	 0x1090130 addiu s0, s3, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 7
-	br L_108fb0c
+	br L_1090130
 // --- basic block ---
-L_108fadc:
-// 0x0108fadc: 0x108fadc: lw    v0, 0(a1)
+L_1090100:
+// 0x01090100: 0x1090100: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0108fae0: 0x108fae0: addiu s0, s0, -1
+// 0x01090104: 0x1090104: addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0108fae4: 0x108fae4: sll   a1, s0, 2
+// 0x01090108: 0x1090108: sll   a1, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0108fae8: 0x108fae8: sw    v0, 0(v1)
+// 0x0109010c: 0x109010c: sw    v0, 0(v1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108faec: 0x108faec: addu  a1, s1, a1
+// 0x01090110: 0x1090110: addu  a1, s1, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc.2
-// 0x0108faf0: 0x108faf0: beq   s0, s6, 0x108fb04 addiu v0, zero, 1
+// 0x01090114: 0x1090114: beq   s0, s6, 0x1090128 addiu v0, zero, 1
 	ldloc 7
 	ldloc 12
 	ldc.i4.1
 	stloc 5
-	beq  L_108fb04
+	beq  L_1090128
 // --- basic block ---
-// 0x0108faf8: 0x108faf8: jal   0x108ee94 sll   zero, zero, 0
+// 0x0109011c: 0x109011c: jal   0x108f4b8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_Compare_108ee94(int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_Compare_108f4b8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0108fb00: 0x108fb00: srl   v0, v0, 31
+// 0x01090124: 0x1090124: srl   v0, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr.un
 	stloc 5
-L_108fb04:
-// 0x0108fb04: 0x108fb04: bltz  s0, 0x108fb28 sll   zero, zero, 0
+L_1090128:
+// 0x01090128: 0x1090128: bltz  s0, 0x109014c sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	blt L_108fb28
+	blt L_109014c
 // --- basic block ---
-L_108fb0c:
-// 0x0108fb0c: 0x108fb0c: addiu v1, s0, 1
+L_1090130:
+// 0x01090130: 0x1090130: addiu v1, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0108fb10: 0x108fb10: sll   a1, s0, 2
+// 0x01090134: 0x1090134: sll   a1, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0108fb14: 0x108fb14: sll   v1, v1, 2
+// 0x01090138: 0x1090138: sll   v1, v1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x0108fb18: 0x108fb18: addu  a1, a1, s1
+// 0x0109013c: 0x109013c: addu  a1, a1, s1
 	ldloc.2
 	ldloc 10
 	add
 	stloc.2
-// 0x0108fb1c: 0x108fb1c: addu  a0, s4, zero
+// 0x01090140: 0x1090140: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x0108fb20: 0x108fb20: bne   v0, zero, 0x108fadc addu  v1, v1, s1
+// 0x01090144: 0x1090144: bne   v0, zero, 0x1090100 addu  v1, v1, s1
 	ldloc 5
 	ldloc 9
 	ldloc 10
 	add
 	stloc 9
-	brtrue L_108fadc
+	brtrue L_1090100
 // --- basic block ---
-L_108fb28:
-// 0x0108fb28: 0x108fb28: addiu s0, s0, 1
+L_109014c:
+// 0x0109014c: 0x109014c: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0108fb2c: 0x108fb2c: sll   s0, s0, 2
+// 0x01090150: 0x1090150: sll   s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0108fb30: 0x108fb30: lw    v0, 16(sp)
+// 0x01090154: 0x1090154: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1488,30 +1488,30 @@ L_108fb28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108fb34: 0x108fb34: addu  s0, s0, s1
+// 0x01090158: 0x1090158: addu  s0, s0, s1
 	ldloc 7
 	ldloc 10
 	add
 	stloc 7
-// 0x0108fb38: 0x108fb38: sw    v0, 0(s0)
+// 0x0109015c: 0x109015c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0108fb3c: 0x108fb3c: addiu s3, s3, 1
+// 0x01090160: 0x1090160: addiu s3, s3, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x0108fb40: 0x108fb40: addiu s2, s2, 4
+// 0x01090164: 0x1090164: addiu s2, s2, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_108fb44:
-// 0x0108fb44: 0x108fb44: lw    v0, 2000(s1)
+L_1090168:
+// 0x01090168: 0x1090168: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1520,107 +1520,107 @@ L_108fb44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108fb48: 0x108fb48: sll   zero, zero, 0
-// 0x0108fb4c: 0x108fb4c: slt   v0, s3, v0
+// 0x0109016c: 0x109016c: sll   zero, zero, 0
+// 0x01090170: 0x1090170: slt   v0, s3, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108fb50: 0x108fb50: bne   v0, zero, 0x108fabc lui   s7, 0xf0000
+// 0x01090174: 0x1090174: bne   v0, zero, 0x10900e0 lui   s7, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 14
-	brtrue L_108fabc
+	brtrue L_10900e0
 // --- basic block ---
-// 0x0108fb58: 0x108fb58: lui   s6, 0xf0000
+// 0x0109017c: 0x109017c: lui   s6, 0xf0000
 	ldc.i4 983040
 	stloc 12
-// 0x0108fb5c: 0x108fb5c: addiu s7, s7, -29760
+// 0x01090180: 0x1090180: addiu s7, s7, -29296
 	ldloc 14
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 14
-// 0x0108fb60: 0x108fb60: addiu s6, s6, -27760
+// 0x01090184: 0x1090184: addiu s6, s6, -27296
 	ldloc 12
-	ldc.i4 -27760
+	ldc.i4 -27296
 	add
 	stloc 12
-// 0x0108fb64: 0x108fb64: addu  s3, zero, zero
+// 0x01090188: 0x1090188: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x0108fb68: 0x108fb68: addu  s2, zero, zero
+// 0x0109018c: 0x109018c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0108fb6c: 0x108fb6c: j	 0x108fbe0 addu  s4, s1, zero
+// 0x01090190: 0x1090190: j	 0x1090204 addu  s4, s1, zero
 	ldloc 10
 	stloc 13
-	br L_108fbe0
+	br L_1090204
 // --- basic block ---
-L_108fb74:
-// 0x0108fb74: 0x108fb74: lw    v1, 0(s1)
+L_1090198:
+// 0x01090198: 0x1090198: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-L_108fb78:
-// 0x0108fb78: 0x108fb78: lw    s0, 0(v0)
+L_109019c:
+// 0x0109019c: 0x109019c: lw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0108fb7c: 0x108fb7c: sll   zero, zero, 0
-// 0x0108fb80: 0x108fb80: beq   s0, zero, 0x108fbac addiu v0, v0, 4
+// 0x010901a0: 0x10901a0: sll   zero, zero, 0
+// 0x010901a4: 0x10901a4: beq   s0, zero, 0x10901d0 addiu v0, v0, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_108fbac
+	brfalse L_10901d0
 // --- basic block ---
-// 0x0108fb88: 0x108fb88: lw    a0, 0(s0)
+// 0x010901ac: 0x10901ac: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108fb8c: 0x108fb8c: sll   zero, zero, 0
-// 0x0108fb90: 0x108fb90: bne   a0, v1, 0x108fbac sll   zero, zero, 0
+// 0x010901b0: 0x10901b0: sll   zero, zero, 0
+// 0x010901b4: 0x10901b4: bne   a0, v1, 0x10901d0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 9
-	bne.un L_108fbac
+	bne.un L_10901d0
 // --- basic block ---
-// 0x0108fb98: 0x108fb98: slt   v0, s3, s5
+// 0x010901bc: 0x10901bc: slt   v0, s3, s5
 	ldloc 11
 	ldloc 15
 	clt
 	stloc 5
-// 0x0108fb9c: 0x108fb9c: beq   v0, zero, 0x108fbd8 sll   zero, zero, 0
+// 0x010901c0: 0x10901c0: beq   v0, zero, 0x10901fc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108fbd8
+	brfalse L_10901fc
 // --- basic block ---
-// 0x0108fba4: 0x108fba4: j	 0x108fbbc sll   zero, zero, 0
-	br L_108fbbc
+// 0x010901c8: 0x10901c8: j	 0x10901e0 sll   zero, zero, 0
+	br L_10901e0
 // --- basic block ---
-L_108fbac:
-// 0x0108fbac: 0x108fbac: bne   v0, s6, 0x108fb78 sll   zero, zero, 0
+L_10901d0:
+// 0x010901d0: 0x10901d0: bne   v0, s6, 0x109019c sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	bne.un L_108fb78
+	bne.un L_109019c
 // --- basic block ---
-// 0x0108fbb4: 0x108fbb4: j	 0x108fbdc addiu s2, s2, 1
+// 0x010901d8: 0x10901d8: j	 0x1090200 addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_108fbdc
+	br L_1090200
 // --- basic block ---
-L_108fbbc:
-// 0x0108fbbc: 0x108fbbc: jal   0x108f020 addu  a0, s0, zero
+L_10901e0:
+// 0x010901e0: 0x10901e0: jal   0x108f644 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1628,16 +1628,16 @@ L_108fbbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::is_visible_108f020(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::is_visible_108f644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0108fbc4: 0x108fbc4: beq   v0, zero, 0x108fbd8 sll   zero, zero, 0
+// 0x010901e8: 0x10901e8: beq   v0, zero, 0x10901fc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108fbd8
+	brfalse L_10901fc
 // --- basic block ---
-// 0x0108fbcc: 0x108fbcc: jal   0x108f2e4 addu  a0, s0, zero
+// 0x010901f0: 0x10901f0: jal   0x108f908 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1645,30 +1645,30 @@ L_108fbbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::CreatePoiObject_108f2e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::CreatePoiObject_108f908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0108fbd4: 0x108fbd4: addiu s3, s3, 1
+// 0x010901f8: 0x10901f8: addiu s3, s3, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_108fbd8:
-// 0x0108fbd8: 0x108fbd8: addiu s2, s2, 1
+L_10901fc:
+// 0x010901fc: 0x10901fc: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_108fbdc:
-// 0x0108fbdc: 0x108fbdc: addiu s1, s1, 4
+L_1090200:
+// 0x01090200: 0x1090200: addiu s1, s1, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-L_108fbe0:
-// 0x0108fbe0: 0x108fbe0: lw    v0, 2000(s4)
+L_1090204:
+// 0x01090204: 0x1090204: lw    v0, 2000(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -1677,27 +1677,27 @@ L_108fbe0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108fbe4: 0x108fbe4: sll   zero, zero, 0
-// 0x0108fbe8: 0x108fbe8: slt   v0, s2, v0
+// 0x01090208: 0x1090208: sll   zero, zero, 0
+// 0x0109020c: 0x109020c: slt   v0, s2, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108fbec: 0x108fbec: bne   v0, zero, 0x108fb74 addu  v0, s7, zero
+// 0x01090210: 0x1090210: bne   v0, zero, 0x1090198 addu  v0, s7, zero
 	ldloc 5
 	ldloc 14
 	stloc 5
-	brtrue L_108fb74
+	brtrue L_1090198
 // --- basic block ---
-// 0x0108fbf4: 0x108fbf4: lui   v0, 0x80000
+// 0x01090218: 0x1090218: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108fbf8: 0x108fbf8: jal   0x102146c sw    zero, 8528(v0)
+// 0x0109021c: 0x109021c: jal   0x102147c sw    zero, 8992(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2132
+	ldc.i4 2248
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1706,14 +1706,14 @@ L_108fbe0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_108fc00:
-// 0x0108fc00: 0x108fc00: lw    ra, 60(sp)
-// 0x0108fc04: 0x108fc04: lw    s7, 56(sp)
+L_1090224:
+// 0x01090224: 0x1090224: lw    ra, 60(sp)
+// 0x01090228: 0x1090228: lw    s7, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1722,7 +1722,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108fc08: 0x108fc08: lw    s6, 52(sp)
+// 0x0109022c: 0x109022c: lw    s6, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1731,7 +1731,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108fc0c: 0x108fc0c: lw    s5, 48(sp)
+// 0x01090230: 0x1090230: lw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1740,7 +1740,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108fc10: 0x108fc10: lw    s4, 44(sp)
+// 0x01090234: 0x1090234: lw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1749,7 +1749,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108fc14: 0x108fc14: lw    s3, 40(sp)
+// 0x01090238: 0x1090238: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1758,7 +1758,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108fc18: 0x108fc18: lw    s2, 36(sp)
+// 0x0109023c: 0x109023c: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1767,7 +1767,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108fc1c: 0x108fc1c: lw    s1, 32(sp)
+// 0x01090240: 0x1090240: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1776,7 +1776,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108fc20: 0x108fc20: lw    s0, 28(sp)
+// 0x01090244: 0x1090244: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1785,7 +1785,7 @@ L_108fc00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108fc24: 0x108fc24: jr    ra addiu sp, sp, 64
+// 0x01090248: 0x1090248: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1797,7 +1797,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_ExternalPoi_Remove_108fc2c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_ExternalPoi_Remove_1090250(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1838,12 +1838,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108fc2c: 0x108fc2c: addiu sp, sp, -40
+// 0x01090250: 0x1090250: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0108fc30: 0x108fc30: sw    s0, 28(sp)
+// 0x01090254: 0x1090254: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1852,8 +1852,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108fc34: 0x108fc34: sw    ra, 36(sp)
-// 0x0108fc38: 0x108fc38: sw    s1, 32(sp)
+// 0x01090258: 0x1090258: sw    ra, 36(sp)
+// 0x0109025c: 0x109025c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1862,7 +1862,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108fc3c: 0x108fc3c: jal   0x108f9d8 addu  s0, a0, zero
+// 0x01090260: 0x1090260: jal   0x108fffc addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -1870,37 +1870,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108fc44: 0x108fc44: beq   v0, zero, 0x108fd38 lui   a1, 0x20000
+// 0x01090268: 0x1090268: beq   v0, zero, 0x109035c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108fd38
+	brfalse L_109035c
 // --- basic block ---
-// 0x0108fc4c: 0x108fc4c: lui   a3, 0x20000
+// 0x01090270: 0x1090270: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108fc50: 0x108fc50: addiu a1, a1, -5692
+// 0x01090274: 0x1090274: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108fc54: 0x108fc54: addiu a3, a3, -5292
+// 0x01090278: 0x1090278: addiu a3, a3, -4828
 	ldloc 4
-	ldc.i4 -5292
+	ldc.i4 -4828
 	add
 	stloc 4
-// 0x0108fc58: 0x108fc58: addiu a0, zero, 1
+// 0x0109027c: 0x109027c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108fc5c: 0x108fc5c: addiu a2, zero, 367
+// 0x01090280: 0x1090280: addiu a2, zero, 367
 	ldc.i4 367
 	stloc.3
-// 0x0108fc60: 0x108fc60: jal   0x100449c sw    s0, 16(sp)
+// 0x01090284: 0x1090284: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1919,147 +1919,147 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108fc68: 0x108fc68: lui   v0, 0xf0000
+// 0x0109028c: 0x109028c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108fc6c: 0x108fc6c: addiu v0, v0, -29760
+// 0x01090290: 0x1090290: addiu v0, v0, -29296
 	ldloc 5
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 5
-// 0x0108fc70: 0x108fc70: lui   a1, 0xf0000
+// 0x01090294: 0x1090294: lui   a1, 0xf0000
 	ldc.i4 983040
 	stloc.2
-// 0x0108fc74: 0x108fc74: addiu a1, a1, -27760
+// 0x01090298: 0x1090298: addiu a1, a1, -27296
 	ldloc.2
-	ldc.i4 -27760
+	ldc.i4 -27296
 	add
 	stloc.2
-// 0x0108fc78: 0x108fc78: addu  v1, v0, zero
+// 0x0109029c: 0x109029c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_108fc7c:
-// 0x0108fc7c: 0x108fc7c: lw    a0, 0(v1)
+L_10902a0:
+// 0x010902a0: 0x10902a0: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108fc80: 0x108fc80: sll   zero, zero, 0
-// 0x0108fc84: 0x108fc84: beq   a0, zero, 0x108fc9c addiu v1, v1, 4
+// 0x010902a4: 0x10902a4: sll   zero, zero, 0
+// 0x010902a8: 0x10902a8: beq   a0, zero, 0x10902c0 addiu v1, v1, 4
 	ldloc.1
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	brfalse L_108fc9c
+	brfalse L_10902c0
 // --- basic block ---
-// 0x0108fc8c: 0x108fc8c: lw    a0, 0(a0)
+// 0x010902b0: 0x10902b0: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108fc90: 0x108fc90: sll   zero, zero, 0
-// 0x0108fc94: 0x108fc94: beq   a0, s0, 0x108fcac addu  s1, zero, zero
+// 0x010902b4: 0x10902b4: sll   zero, zero, 0
+// 0x010902b8: 0x10902b8: beq   a0, s0, 0x10902d0 addu  s1, zero, zero
 	ldloc.1
 	ldloc 8
 	ldc.i4.s 0
 	stloc 9
-	beq  L_108fcac
+	beq  L_10902d0
 // --- basic block ---
-L_108fc9c:
-// 0x0108fc9c: 0x108fc9c: bne   v1, a1, 0x108fc7c sll   zero, zero, 0
+L_10902c0:
+// 0x010902c0: 0x10902c0: bne   v1, a1, 0x10902a0 sll   zero, zero, 0
 	ldloc 7
 	ldloc.2
-	bne.un L_108fc7c
+	bne.un L_10902a0
 // --- basic block ---
-// 0x0108fca4: 0x108fca4: j	 0x108fd64 lui   a1, 0x20000
+// 0x010902c8: 0x10902c8: j	 0x1090388 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_108fd64
+	br L_1090388
 // --- basic block ---
-L_108fcac:
-// 0x0108fcac: 0x108fcac: addiu a0, zero, 500
+L_10902d0:
+// 0x010902d0: 0x10902d0: addiu a0, zero, 500
 	ldc.i4 500
 	stloc.1
-L_108fcb0:
-// 0x0108fcb0: 0x108fcb0: lw    v1, 0(v0)
+L_10902d4:
+// 0x010902d4: 0x10902d4: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0108fcb4: 0x108fcb4: sll   zero, zero, 0
-// 0x0108fcb8: 0x108fcb8: beq   v1, zero, 0x108fcd0 addiu v0, v0, 4
+// 0x010902d8: 0x10902d8: sll   zero, zero, 0
+// 0x010902dc: 0x10902dc: beq   v1, zero, 0x10902f4 addiu v0, v0, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_108fcd0
+	brfalse L_10902f4
 // --- basic block ---
-// 0x0108fcc0: 0x108fcc0: lw    v1, 0(v1)
+// 0x010902e4: 0x10902e4: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0108fcc4: 0x108fcc4: sll   zero, zero, 0
-// 0x0108fcc8: 0x108fcc8: beq   v1, s0, 0x108fce4 sll   v1, s1, 2
+// 0x010902e8: 0x10902e8: sll   zero, zero, 0
+// 0x010902ec: 0x10902ec: beq   v1, s0, 0x1090308 sll   v1, s1, 2
 	ldloc 7
 	ldloc 8
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 7
-	beq  L_108fce4
+	beq  L_1090308
 // --- basic block ---
-L_108fcd0:
-// 0x0108fcd0: 0x108fcd0: addiu s1, s1, 1
+L_10902f4:
+// 0x010902f4: 0x10902f4: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0108fcd4: 0x108fcd4: bne   s1, a0, 0x108fcb0 lui   a1, 0x20000
+// 0x010902f8: 0x10902f8: bne   s1, a0, 0x10902d4 lui   a1, 0x20000
 	ldloc 9
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	bne.un L_108fcb0
+	bne.un L_10902d4
 // --- basic block ---
-// 0x0108fcdc: 0x108fcdc: j	 0x108fd50 lui   a3, 0x20000
+// 0x01090300: 0x1090300: j	 0x1090374 lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-	br L_108fd50
+	br L_1090374
 // --- basic block ---
-L_108fce4:
-// 0x0108fce4: 0x108fce4: lui   v0, 0xf0000
+L_1090308:
+// 0x01090308: 0x1090308: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0108fce8: 0x108fce8: addiu v0, v0, -29760
+// 0x0109030c: 0x109030c: addiu v0, v0, -29296
 	ldloc 5
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 5
-// 0x0108fcec: 0x108fcec: addu  v0, v1, v0
+// 0x01090310: 0x1090310: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0108fcf0: 0x108fcf0: lw    a0, 0(v0)
+// 0x01090314: 0x1090314: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108fcf4: 0x108fcf4: sll   zero, zero, 0
-// 0x0108fcf8: 0x108fcf8: lw    v0, 176(a0)
+// 0x01090318: 0x1090318: sll   zero, zero, 0
+// 0x0109031c: 0x109031c: lw    v0, 176(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2068,48 +2068,48 @@ L_108fce4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108fcfc: 0x108fcfc: sll   zero, zero, 0
-// 0x0108fd00: 0x108fd00: beq   v0, zero, 0x108fd10 lui   s0, 0xf0000
+// 0x01090320: 0x1090320: sll   zero, zero, 0
+// 0x01090324: 0x1090324: beq   v0, zero, 0x1090334 lui   s0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 8
-	brfalse L_108fd10
+	brfalse L_1090334
 // --- basic block ---
-// 0x0108fd08: 0x108fd08: jal   0x108f0c0 sll   zero, zero, 0
+// 0x0109032c: 0x109032c: jal   0x108f6e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RemovePoiObject_108f0c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RemovePoiObject_108f6e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_108fd10:
-// 0x0108fd10: 0x108fd10: addiu s0, s0, -29760
+L_1090334:
+// 0x01090334: 0x1090334: addiu s0, s0, -29296
 	ldloc 8
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 8
-// 0x0108fd14: 0x108fd14: sll   s1, s1, 2
+// 0x01090338: 0x1090338: sll   s1, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x0108fd18: 0x108fd18: addu  s1, s1, s0
+// 0x0109033c: 0x109033c: addu  s1, s1, s0
 	ldloc 9
 	ldloc 8
 	add
 	stloc 9
-// 0x0108fd1c: 0x108fd1c: lw    a0, 0(s1)
+// 0x01090340: 0x1090340: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108fd20: 0x108fd20: jal   0x1000930 sll   zero, zero, 0
+// 0x01090344: 0x1090344: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2120,7 +2120,7 @@ L_108fd10:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108fd28: 0x108fd28: lw    v0, 2000(s0)
+// 0x0109034c: 0x109034c: lw    v0, 2000(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2129,19 +2129,19 @@ L_108fd10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108fd2c: 0x108fd2c: sw    zero, 0(s1)
+// 0x01090350: 0x1090350: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108fd30: 0x108fd30: addiu v0, v0, -1
+// 0x01090354: 0x1090354: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0108fd34: 0x108fd34: sw    v0, 2000(s0)
+// 0x01090358: 0x1090358: sw    v0, 2000(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2150,12 +2150,12 @@ L_108fd10:
 	add
 	ldloc 5
 	stelem.i4
-L_108fd38:
-// 0x0108fd38: 0x108fd38: lw    ra, 36(sp)
-// 0x0108fd3c: 0x108fd3c: addiu v0, zero, 1
+L_109035c:
+// 0x0109035c: 0x109035c: lw    ra, 36(sp)
+// 0x01090360: 0x1090360: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108fd40: 0x108fd40: lw    s1, 32(sp)
+// 0x01090364: 0x1090364: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2164,7 +2164,7 @@ L_108fd38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108fd44: 0x108fd44: lw    s0, 28(sp)
+// 0x01090368: 0x1090368: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2173,54 +2173,54 @@ L_108fd38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108fd48: 0x108fd48: jr    ra addiu sp, sp, 40
+// 0x0109036c: 0x109036c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_108fd50:
-// 0x0108fd50: 0x108fd50: addiu a1, a1, -5692
+L_1090374:
+// 0x01090374: 0x1090374: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108fd54: 0x108fd54: addiu a3, a3, -5244
+// 0x01090378: 0x1090378: addiu a3, a3, -4780
 	ldloc 4
-	ldc.i4 -5244
+	ldc.i4 -4780
 	add
 	stloc 4
-// 0x0108fd58: 0x108fd58: addiu a0, zero, 4
+// 0x0109037c: 0x109037c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108fd5c: 0x108fd5c: j	 0x108fd78 addiu a2, zero, 377
+// 0x01090380: 0x1090380: j	 0x109039c addiu a2, zero, 377
 	ldc.i4 377
 	stloc.3
-	br L_108fd78
+	br L_109039c
 // --- basic block ---
-L_108fd64:
-// 0x0108fd64: 0x108fd64: lui   a3, 0x20000
+L_1090388:
+// 0x01090388: 0x1090388: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108fd68: 0x108fd68: addiu a1, a1, -5692
+// 0x0109038c: 0x109038c: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108fd6c: 0x108fd6c: addiu a3, a3, -5160
+// 0x01090390: 0x1090390: addiu a3, a3, -4696
 	ldloc 4
-	ldc.i4 -5160
+	ldc.i4 -4696
 	add
 	stloc 4
-// 0x0108fd70: 0x108fd70: addiu a0, zero, 4
+// 0x01090394: 0x1090394: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108fd74: 0x108fd74: addiu a2, zero, 371
+// 0x01090398: 0x1090398: addiu a2, zero, 371
 	ldc.i4 371
 	stloc.3
-L_108fd78:
-// 0x0108fd78: 0x108fd78: jal   0x100449c sw    s0, 16(sp)
+L_109039c:
+// 0x0109039c: 0x109039c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2239,15 +2239,15 @@ L_108fd78:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108fd80: 0x108fd80: j	 0x108fd38 sll   zero, zero, 0
-	br L_108fd38
+// 0x010903a4: 0x10903a4: j	 0x109035c sll   zero, zero, 0
+	br L_109035c
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_Term_108fd88(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_Term_10903ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2282,61 +2282,61 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108fd88: 0x108fd88: addiu sp, sp, -24
+// 0x010903ac: 0x10903ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0108fd8c: 0x108fd8c: sw    ra, 20(sp)
-// 0x0108fd90: 0x108fd90: jal   0x108f9d8 sll   zero, zero, 0
+// 0x010903b0: 0x10903b0: sw    ra, 20(sp)
+// 0x010903b4: 0x10903b4: jal   0x108fffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fd98: 0x108fd98: beq   v0, zero, 0x108fdc4 sll   zero, zero, 0
+// 0x010903bc: 0x10903bc: beq   v0, zero, 0x10903e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108fdc4
+	brfalse L_10903e8
 // --- basic block ---
-// 0x0108fda0: 0x108fda0: jal   0x108f83c sll   zero, zero, 0
+// 0x010903c4: 0x10903c4: jal   0x108fe60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::init_ExternalPoiTypesTable_108f83c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::init_ExternalPoiTypesTable_108fe60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fda8: 0x108fda8: jal   0x108f89c sll   zero, zero, 0
+// 0x010903cc: 0x10903cc: jal   0x108fec0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::init_ExternalPoiTable_108f89c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::init_ExternalPoiTable_108fec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fdb0: 0x108fdb0: lui   a0, 0xf0000
+// 0x010903d4: 0x10903d4: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0108fdb4: 0x108fdb4: addiu a0, a0, -27352
+// 0x010903d8: 0x10903d8: addiu a0, a0, -26888
 	ldloc.1
-	ldc.i4 -27352
+	ldc.i4 -26888
 	add
 	stloc.1
-// 0x0108fdb8: 0x108fdb8: addu  a1, zero, zero
+// 0x010903dc: 0x10903dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108fdbc: 0x108fdbc: jal   0x100177c addiu a2, zero, 2004
+// 0x010903e0: 0x10903e0: jal   0x100177c addiu a2, zero, 2004
 	ldc.i4 2004
 	stloc.3
 	ldloc.1
@@ -2348,10 +2348,10 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108fdc4:
-// 0x0108fdc4: 0x108fdc4: lw    ra, 20(sp)
-// 0x0108fdc8: 0x108fdc8: sll   zero, zero, 0
-// 0x0108fdcc: 0x108fdcc: jr    ra addiu sp, sp, 24
+L_10903e8:
+// 0x010903e8: 0x10903e8: lw    ra, 20(sp)
+// 0x010903ec: 0x10903ec: sll   zero, zero, 0
+// 0x010903f0: 0x10903f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2363,7 +2363,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_Init_108fe18(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_Init_109043c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -2401,12 +2401,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108fe18: 0x108fe18: addiu sp, sp, -32
+// 0x0109043c: 0x109043c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108fe1c: 0x108fe1c: sw    s0, 24(sp)
+// 0x01090440: 0x1090440: sw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2415,43 +2415,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108fe20: 0x108fe20: lui   a1, 0x0
+// 0x01090444: 0x1090444: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108fe24: 0x108fe24: lui   s0, 0x10000
+// 0x01090448: 0x1090448: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0108fe28: 0x108fe28: lui   a3, 0x0
+// 0x0109044c: 0x109044c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0108fe2c: 0x108fe2c: lui   v0, 0x20000
+// 0x01090450: 0x1090450: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0108fe30: 0x108fe30: addiu a1, a1, 17448
+// 0x01090454: 0x1090454: addiu a1, a1, 17448
 	ldloc.2
 	ldc.i4 17448
 	add
 	stloc.2
-// 0x0108fe34: 0x108fe34: addiu a3, a3, 20820
+// 0x01090458: 0x1090458: addiu a3, a3, 20820
 	ldloc 4
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0108fe38: 0x108fe38: addiu a0, s0, 12560
+// 0x0109045c: 0x109045c: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0108fe3c: 0x108fe3c: addu  a2, zero, zero
+// 0x01090460: 0x1090460: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108fe40: 0x108fe40: addiu v0, v0, 9464
+// 0x01090464: 0x1090464: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x0108fe44: 0x108fe44: sw    ra, 28(sp)
-// 0x0108fe48: 0x108fe48: sw    v0, 16(sp)
+// 0x01090468: 0x1090468: sw    ra, 28(sp)
+// 0x0109046c: 0x109046c: sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2460,7 +2460,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108fe4c: 0x108fe4c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01090470: 0x1090470: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2474,60 +2474,60 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fe54: 0x108fe54: jal   0x108f9d8 sll   zero, zero, 0
+// 0x01090478: 0x1090478: jal   0x108fffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fe5c: 0x108fe5c: beq   v0, zero, 0x108fef8 sll   zero, zero, 0
+// 0x01090480: 0x1090480: beq   v0, zero, 0x109051c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108fef8
+	brfalse L_109051c
 // --- basic block ---
-// 0x0108fe64: 0x108fe64: jal   0x108f83c sll   zero, zero, 0
+// 0x01090488: 0x1090488: jal   0x108fe60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::init_ExternalPoiTypesTable_108f83c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::init_ExternalPoiTypesTable_108fe60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fe6c: 0x108fe6c: jal   0x108f89c sll   zero, zero, 0
+// 0x01090490: 0x1090490: jal   0x108fec0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::init_ExternalPoiTable_108f89c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::init_ExternalPoiTable_108fec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fe74: 0x108fe74: lui   a0, 0xf0000
+// 0x01090498: 0x1090498: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0108fe78: 0x108fe78: addiu a0, a0, -27352
+// 0x0109049c: 0x109049c: addiu a0, a0, -26888
 	ldloc.1
-	ldc.i4 -27352
+	ldc.i4 -26888
 	add
 	stloc.1
-// 0x0108fe7c: 0x108fe7c: addu  a1, zero, zero
+// 0x010904a0: 0x10904a0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108fe80: 0x108fe80: jal   0x100177c addiu a2, zero, 2004
+// 0x010904a4: 0x10904a4: jal   0x100177c addiu a2, zero, 2004
 	ldc.i4 2004
 	stloc.3
 	ldloc.1
@@ -2539,39 +2539,39 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fe88: 0x108fe88: jal   0x10908d4 sll   zero, zero, 0
+// 0x010904ac: 0x10904ac: jal   0x1090ef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_Init_10908d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_Init_1090ef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fe90: 0x108fe90: lui   a1, 0x0
+// 0x010904b4: 0x10904b4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108fe94: 0x108fe94: lui   a2, 0x10000
+// 0x010904b8: 0x10904b8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108fe98: 0x108fe98: addiu a1, a1, 17432
+// 0x010904bc: 0x10904bc: addiu a1, a1, 17432
 	ldloc.2
 	ldc.i4 17432
 	add
 	stloc.2
-// 0x0108fe9c: 0x108fe9c: addiu a2, a2, -15292
+// 0x010904c0: 0x10904c0: addiu a2, a2, 19516
 	ldloc.3
-	ldc.i4 -15292
+	ldc.i4 19516
 	add
 	stloc.3
-// 0x0108fea0: 0x108fea0: addiu a0, s0, 12560
+// 0x010904c4: 0x10904c4: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0108fea4: 0x108fea4: jal   0x100edb0 addu  a3, zero, zero
+// 0x010904c8: 0x10904c8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2579,33 +2579,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108feac: 0x108feac: lui   a1, 0x0
+// 0x010904d0: 0x10904d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108feb0: 0x108feb0: lui   a2, 0x10000
+// 0x010904d4: 0x10904d4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108feb4: 0x108feb4: addiu a1, a1, 17416
+// 0x010904d8: 0x10904d8: addiu a1, a1, 17416
 	ldloc.2
 	ldc.i4 17416
 	add
 	stloc.2
-// 0x0108feb8: 0x108feb8: addiu a2, a2, -15496
+// 0x010904dc: 0x10904dc: addiu a2, a2, 19432
 	ldloc.3
-	ldc.i4 -15496
+	ldc.i4 19432
 	add
 	stloc.3
-// 0x0108febc: 0x108febc: addiu a0, s0, 12560
+// 0x010904e0: 0x10904e0: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0108fec0: 0x108fec0: jal   0x100edb0 addu  a3, zero, zero
+// 0x010904e4: 0x10904e4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2613,33 +2613,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fec8: 0x108fec8: lui   a1, 0x0
+// 0x010904ec: 0x10904ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0108fecc: 0x108fecc: lui   a2, 0x10000
+// 0x010904f0: 0x10904f0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108fed0: 0x108fed0: addiu a0, s0, 12560
+// 0x010904f4: 0x10904f4: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0108fed4: 0x108fed4: addiu a1, a1, 17464
+// 0x010904f8: 0x10904f8: addiu a1, a1, 17464
 	ldloc.2
 	ldc.i4 17464
 	add
 	stloc.2
-// 0x0108fed8: 0x108fed8: addiu a2, a2, 18500
+// 0x010904fc: 0x10904fc: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0108fedc: 0x108fedc: jal   0x100edb0 addu  a3, zero, zero
+// 0x01090500: 0x1090500: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2647,40 +2647,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fee4: 0x108fee4: lui   a0, 0x1090000
+// 0x01090508: 0x1090508: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0108fee8: 0x108fee8: jal   0x101f970 addiu a0, a0, -1796
+// 0x0109050c: 0x109050c: jal   0x101f980 addiu a0, a0, -224
 	ldloc.1
-	ldc.i4 -1796
+	ldc.i4 -224
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108fef0: 0x108fef0: lui   v1, 0x80000
+// 0x01090514: 0x1090514: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0108fef4: 0x108fef4: sw    v0, 8532(v1)
+// 0x01090518: 0x1090518: sw    v0, 8996(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2133
+	ldc.i4 2249
 	add
 	ldloc 5
 	stelem.i4
-L_108fef8:
-// 0x0108fef8: 0x108fef8: lw    ra, 28(sp)
-// 0x0108fefc: 0x108fefc: lw    s0, 24(sp)
+L_109051c:
+// 0x0109051c: 0x109051c: lw    ra, 28(sp)
+// 0x01090520: 0x1090520: lw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2689,7 +2689,7 @@ L_108fef8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108ff00: 0x108ff00: jr    ra addiu sp, sp, 32
+// 0x01090524: 0x1090524: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2701,7 +2701,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_49_108ff08(int32,int32,int32,int32,int32)
+.method public static int32 T_49_109052c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -2739,13 +2739,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108ff08: 0x108ff08: addiu sp, sp, -32
+// 0x0109052c: 0x109052c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108ff0c: 0x108ff0c: sw    ra, 28(sp)
-// 0x0108ff10: 0x108ff10: sw    s0, 24(sp)
+// 0x01090530: 0x1090530: sw    ra, 28(sp)
+// 0x01090534: 0x1090534: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2754,7 +2754,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108ff14: 0x108ff14: jal   0x1000910 sw    a0, 16(sp)
+// 0x01090538: 0x1090538: jal   0x1000910 sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2773,7 +2773,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108ff1c: 0x108ff1c: lw    a2, 16(sp)
+// 0x01090540: 0x1090540: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2782,13 +2782,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108ff20: 0x108ff20: addu  a0, v0, zero
+// 0x01090544: 0x1090544: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0108ff24: 0x108ff24: addu  a1, zero, zero
+// 0x01090548: 0x1090548: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108ff28: 0x108ff28: jal   0x100177c addu  s0, v0, zero
+// 0x0109054c: 0x109054c: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -2800,11 +2800,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0108ff30: 0x108ff30: lw    ra, 28(sp)
-// 0x0108ff34: 0x108ff34: addu  v0, s0, zero
+// 0x01090554: 0x1090554: lw    ra, 28(sp)
+// 0x01090558: 0x1090558: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0108ff38: 0x108ff38: lw    s0, 24(sp)
+// 0x0109055c: 0x109055c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2813,7 +2813,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108ff3c: 0x108ff3c: jr    ra addiu sp, sp, 32
+// 0x01090560: 0x1090560: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2825,7 +2825,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeExternalPoi_ExternalPoiType_Add_108ff44(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_ExternalPoiType_Add_1090568(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra,int32 t0,int32 t1,int32 t2,int32 t3)
@@ -2881,12 +2881,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108ff44: 0x108ff44: addiu sp, sp, -56
+// 0x01090568: 0x1090568: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0108ff48: 0x108ff48: sw    s0, 40(sp)
+// 0x0109056c: 0x109056c: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2895,8 +2895,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108ff4c: 0x108ff4c: sw    ra, 52(sp)
-// 0x0108ff50: 0x108ff50: sw    s2, 48(sp)
+// 0x01090570: 0x1090570: sw    ra, 52(sp)
+// 0x01090574: 0x1090574: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2905,7 +2905,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108ff54: 0x108ff54: sw    s1, 44(sp)
+// 0x01090578: 0x1090578: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2914,7 +2914,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108ff58: 0x108ff58: jal   0x108f9d8 addu  s0, a0, zero
+// 0x0109057c: 0x109057c: jal   0x108fffc addu  s0, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -2922,40 +2922,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ff60: 0x108ff60: beq   v0, zero, 0x1090100 addiu v1, zero, 1
+// 0x01090584: 0x1090584: beq   v0, zero, 0x1090724 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_1090100
+	brfalse L_1090724
 // --- basic block ---
-// 0x0108ff68: 0x108ff68: bne   s0, zero, 0x108ff90 lui   s1, 0x20000
+// 0x0109058c: 0x109058c: bne   s0, zero, 0x10905b4 lui   s1, 0x20000
 	ldloc 9
 	ldc.i4 131072
 	stloc 8
-	brtrue L_108ff90
+	brtrue L_10905b4
 // --- basic block ---
-// 0x0108ff70: 0x108ff70: lui   a3, 0x20000
+// 0x01090594: 0x1090594: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ff74: 0x108ff74: addiu a1, s1, -5692
+// 0x01090598: 0x1090598: addiu a1, s1, -5228
 	ldloc 8
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108ff78: 0x108ff78: addiu a3, a3, -5080
+// 0x0109059c: 0x109059c: addiu a3, a3, -4616
 	ldloc 4
-	ldc.i4 -5080
+	ldc.i4 -4616
 	add
 	stloc 4
-// 0x0108ff7c: 0x108ff7c: addiu a0, zero, 4
+// 0x010905a0: 0x10905a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108ff80: 0x108ff80: jal   0x100449c addiu a2, zero, 246
+// 0x010905a4: 0x10905a4: jal   0x100449c addiu a2, zero, 246
 	ldc.i4 246
 	stloc.3
 	ldloc.0
@@ -2968,13 +2968,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ff88: 0x108ff88: j	 0x1090100 addu  v1, zero, zero
+// 0x010905ac: 0x10905ac: j	 0x1090724 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1090100
+	br L_1090724
 // --- basic block ---
-L_108ff90:
-// 0x0108ff90: 0x108ff90: lw    v1, 400(s0)
+L_10905b4:
+// 0x010905b4: 0x10905b4: lw    v1, 400(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2983,7 +2983,7 @@ L_108ff90:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108ff94: 0x108ff94: lw    v0, 404(s0)
+// 0x010905b8: 0x10905b8: lw    v0, 404(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2992,14 +2992,14 @@ L_108ff90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ff98: 0x108ff98: lw    t3, 0(s0)
+// 0x010905bc: 0x10905bc: lw    t3, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x0108ff9c: 0x108ff9c: lw    t0, 396(s0)
+// 0x010905c0: 0x10905c0: lw    t0, 396(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3008,44 +3008,44 @@ L_108ff90:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108ffa0: 0x108ffa0: lui   a3, 0x20000
+// 0x010905c4: 0x10905c4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108ffa4: 0x108ffa4: lui   s2, 0xf0000
+// 0x010905c8: 0x10905c8: lui   s2, 0xf0000
 	ldc.i4 983040
 	stloc 10
-// 0x0108ffa8: 0x108ffa8: addiu t2, s0, 140
+// 0x010905cc: 0x10905cc: addiu t2, s0, 140
 	ldloc 9
 	ldc.i4 140
 	add
 	stloc 14
-// 0x0108ffac: 0x108ffac: addiu t1, s0, 12
+// 0x010905d0: 0x10905d0: addiu t1, s0, 12
 	ldloc 9
 	ldc.i4.s 12
 	add
 	stloc 13
-// 0x0108ffb0: 0x108ffb0: addiu a3, a3, -5000
+// 0x010905d4: 0x10905d4: addiu a3, a3, -4536
 	ldloc 4
-	ldc.i4 -5000
+	ldc.i4 -4536
 	add
 	stloc 4
-// 0x0108ffb4: 0x108ffb4: addiu a0, zero, 1
+// 0x010905d8: 0x10905d8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0108ffb8: 0x108ffb8: addiu a1, s1, -5692
+// 0x010905dc: 0x10905dc: addiu a1, s1, -5228
 	ldloc 8
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108ffbc: 0x108ffbc: addiu a2, zero, 250
+// 0x010905e0: 0x10905e0: addiu a2, zero, 250
 	ldc.i4 250
 	stloc.3
-// 0x0108ffc0: 0x108ffc0: addiu s2, s2, -27756
+// 0x010905e4: 0x10905e4: addiu s2, s2, -27292
 	ldloc 10
-	ldc.i4 -27756
+	ldc.i4 -27292
 	add
 	stloc 10
-// 0x0108ffc4: 0x108ffc4: sw    v1, 32(sp)
+// 0x010905e8: 0x10905e8: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3054,7 +3054,7 @@ L_108ff90:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0108ffc8: 0x108ffc8: sw    v0, 36(sp)
+// 0x010905ec: 0x10905ec: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3063,7 +3063,7 @@ L_108ff90:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108ffcc: 0x108ffcc: sw    t3, 16(sp)
+// 0x010905f0: 0x10905f0: sw    t3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3072,7 +3072,7 @@ L_108ff90:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0108ffd0: 0x108ffd0: sw    t2, 20(sp)
+// 0x010905f4: 0x10905f4: sw    t2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3081,7 +3081,7 @@ L_108ff90:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108ffd4: 0x108ffd4: sw    t1, 24(sp)
+// 0x010905f8: 0x10905f8: sw    t1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3090,7 +3090,7 @@ L_108ff90:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108ffd8: 0x108ffd8: jal   0x100449c sw    t0, 28(sp)
+// 0x010905fc: 0x10905fc: jal   0x100449c sw    t0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3109,7 +3109,7 @@ L_108ff90:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108ffe0: 0x108ffe0: lw    v0, 400(s2)
+// 0x01090604: 0x1090604: lw    v0, 400(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3118,33 +3118,33 @@ L_108ff90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108ffe4: 0x108ffe4: addiu v1, zero, 100
+// 0x01090608: 0x1090608: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x0108ffe8: 0x108ffe8: bne   v0, v1, 0x1090010 lui   a3, 0x20000
+// 0x0109060c: 0x109060c: bne   v0, v1, 0x1090634 lui   a3, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc 4
-	bne.un L_1090010
+	bne.un L_1090634
 // --- basic block ---
-// 0x0108fff0: 0x108fff0: addiu a1, s1, -5692
+// 0x01090614: 0x1090614: addiu a1, s1, -5228
 	ldloc 8
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x0108fff4: 0x108fff4: addiu a3, a3, -4888
+// 0x01090618: 0x1090618: addiu a3, a3, -4424
 	ldloc 4
-	ldc.i4 -4888
+	ldc.i4 -4424
 	add
 	stloc 4
-// 0x0108fff8: 0x108fff8: addiu a0, zero, 4
+// 0x0109061c: 0x109061c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0108fffc: 0x108fffc: addiu a2, zero, 253
+// 0x01090620: 0x1090620: addiu a2, zero, 253
 	ldc.i4 253
 	stloc.3
-// 0x01090000: 0x1090000: jal   0x100449c sw    v0, 16(sp)
+// 0x01090624: 0x1090624: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3163,13 +3163,13 @@ L_108ff90:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090008: 0x1090008: j	 0x1090100 addu  v1, zero, zero
+// 0x0109062c: 0x109062c: j	 0x1090724 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1090100
+	br L_1090724
 // --- basic block ---
-L_1090010:
-// 0x01090010: 0x1090010: jal   0x108ff08 addiu a0, zero, 416
+L_1090634:
+// 0x01090634: 0x1090634: jal   0x109052c addiu a0, zero, 416
 	ldc.i4 416
 	stloc.1
 	ldloc.0
@@ -3177,15 +3177,15 @@ L_1090010:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::T_49_108ff08(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::T_49_109052c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090018: 0x1090018: addu  s1, v0, zero
+// 0x0109063c: 0x109063c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109001c: 0x109001c: jal   0x108efa4 addu  a0, v0, zero
+// 0x01090640: 0x1090640: jal   0x108f5c8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3193,18 +3193,18 @@ L_1090010:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoiType_Init_108efa4(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoiType_Init_108f5c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090024: 0x1090024: addu  a0, s1, zero
+// 0x01090648: 0x1090648: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01090028: 0x1090028: addu  a1, s0, zero
+// 0x0109064c: 0x109064c: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0109002c: 0x109002c: jal   0x1001800 addiu a2, zero, 416
+// 0x01090650: 0x1090650: jal   0x1001800 addiu a2, zero, 416
 	ldc.i4 416
 	stloc.3
 	ldloc.1
@@ -3216,7 +3216,7 @@ L_1090010:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090034: 0x1090034: lw    v0, 400(s2)
+// 0x01090658: 0x1090658: lw    v0, 400(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3225,46 +3225,46 @@ L_1090010:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090038: 0x1090038: sll   zero, zero, 0
-// 0x0109003c: 0x109003c: sll   v0, v0, 2
+// 0x0109065c: 0x109065c: sll   zero, zero, 0
+// 0x01090660: 0x1090660: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01090040: 0x1090040: addu  s2, v0, s2
+// 0x01090664: 0x1090664: addu  s2, v0, s2
 	ldloc 5
 	ldloc 10
 	add
 	stloc 10
-// 0x01090044: 0x1090044: sw    s1, 0(s2)
+// 0x01090668: 0x1090668: sw    s1, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01090048: 0x1090048: lb    v0, 12(s1)
+// 0x0109066c: 0x109066c: lb    v0, 12(s1)
 	ldloc 8
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109004c: 0x109004c: sll   zero, zero, 0
-// 0x01090050: 0x1090050: beq   v0, zero, 0x1090094 addiu s0, s1, 12
+// 0x01090670: 0x1090670: sll   zero, zero, 0
+// 0x01090674: 0x1090674: beq   v0, zero, 0x10906b8 addiu s0, s1, 12
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 9
-	brfalse L_1090094
+	brfalse L_10906b8
 // --- basic block ---
-// 0x01090058: 0x1090058: addu  a0, zero, zero
+// 0x0109067c: 0x109067c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109005c: 0x109005c: addiu a1, zero, 1
+// 0x01090680: 0x1090680: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01090060: 0x1090060: jal   0x10a1918 addu  a2, s0, zero
+// 0x01090684: 0x1090684: jal   0x10a1f60 addu  a2, s0, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -3272,32 +3272,32 @@ L_1090010:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090068: 0x1090068: bne   v0, zero, 0x1090094 lui   a3, 0x10000
+// 0x0109068c: 0x109068c: bne   v0, zero, 0x10906b8 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1090094
+	brtrue L_10906b8
 // --- basic block ---
-// 0x01090070: 0x1090070: addu  a1, s0, zero
+// 0x01090694: 0x1090694: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x01090074: 0x1090074: addiu a3, a3, 18500
+// 0x01090698: 0x1090698: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01090078: 0x1090078: addu  a0, zero, zero
+// 0x0109069c: 0x109069c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109007c: 0x109007c: addu  a2, zero, zero
+// 0x010906a0: 0x10906a0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01090080: 0x1090080: sw    zero, 16(sp)
+// 0x010906a4: 0x10906a4: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3306,7 +3306,7 @@ L_1090010:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01090084: 0x1090084: sw    zero, 20(sp)
+// 0x010906a8: 0x10906a8: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3315,7 +3315,7 @@ L_1090010:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01090088: 0x1090088: sw    zero, 24(sp)
+// 0x010906ac: 0x10906ac: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3324,7 +3324,7 @@ L_1090010:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109008c: 0x109008c: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x010906b0: 0x10906b0: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3338,37 +3338,37 @@ L_1090010:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1090094:
-// 0x01090094: 0x1090094: lb    v0, 140(s1)
+L_10906b8:
+// 0x010906b8: 0x10906b8: lb    v0, 140(s1)
 	ldloc 8
 	ldc.i4 140
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01090098: 0x1090098: sll   zero, zero, 0
-// 0x0109009c: 0x109009c: beq   v0, zero, 0x10900ec lui   v0, 0xf0000
+// 0x010906bc: 0x10906bc: sll   zero, zero, 0
+// 0x010906c0: 0x10906c0: beq   v0, zero, 0x1090710 lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brfalse L_10900ec
+	brfalse L_1090710
 // --- basic block ---
-// 0x010900a4: 0x10900a4: addiu s1, s1, 140
+// 0x010906c8: 0x10906c8: addiu s1, s1, 140
 	ldloc 8
 	ldc.i4 140
 	add
 	stloc 8
-// 0x010900a8: 0x10900a8: addu  a0, zero, zero
+// 0x010906cc: 0x10906cc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010900ac: 0x10900ac: addiu a1, zero, 1
+// 0x010906d0: 0x10906d0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010900b0: 0x10900b0: jal   0x10a1918 addu  a2, s1, zero
+// 0x010906d4: 0x10906d4: jal   0x10a1f60 addu  a2, s1, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -3376,35 +3376,35 @@ L_1090094:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010900b8: 0x10900b8: bne   v0, zero, 0x10900ec lui   v0, 0xf0000
+// 0x010906dc: 0x10906dc: bne   v0, zero, 0x1090710 lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brtrue L_10900ec
+	brtrue L_1090710
 // --- basic block ---
-// 0x010900c0: 0x10900c0: lui   a3, 0x10000
+// 0x010906e4: 0x10906e4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010900c4: 0x10900c4: addu  a1, s1, zero
+// 0x010906e8: 0x10906e8: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010900c8: 0x10900c8: addiu a3, a3, 18500
+// 0x010906ec: 0x10906ec: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x010900cc: 0x10900cc: addu  a0, zero, zero
+// 0x010906f0: 0x10906f0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010900d0: 0x10900d0: addu  a2, zero, zero
+// 0x010906f4: 0x10906f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010900d4: 0x10900d4: sw    zero, 16(sp)
+// 0x010906f8: 0x10906f8: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3413,7 +3413,7 @@ L_1090094:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010900d8: 0x10900d8: sw    zero, 20(sp)
+// 0x010906fc: 0x10906fc: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3422,7 +3422,7 @@ L_1090094:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010900dc: 0x10900dc: sw    zero, 24(sp)
+// 0x01090700: 0x1090700: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3431,7 +3431,7 @@ L_1090094:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010900e0: 0x10900e0: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x01090704: 0x1090704: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3445,21 +3445,21 @@ L_1090094:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010900e8: 0x10900e8: lui   v0, 0xf0000
+// 0x0109070c: 0x109070c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-L_10900ec:
-// 0x010900ec: 0x10900ec: addiu v0, v0, -27756
+L_1090710:
+// 0x01090710: 0x1090710: addiu v0, v0, -27292
 	ldloc 5
-	ldc.i4 -27756
+	ldc.i4 -27292
 	add
 	stloc 5
-// 0x010900f0: 0x10900f0: lw    a0, 400(v0)
+// 0x01090714: 0x1090714: lw    a0, 400(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3468,15 +3468,15 @@ L_10900ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010900f4: 0x10900f4: addiu v1, zero, 1
+// 0x01090718: 0x1090718: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010900f8: 0x10900f8: addiu a0, a0, 1
+// 0x0109071c: 0x109071c: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010900fc: 0x10900fc: sw    a0, 400(v0)
+// 0x01090720: 0x1090720: sw    a0, 400(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3485,12 +3485,12 @@ L_10900ec:
 	add
 	ldloc.1
 	stelem.i4
-L_1090100:
-// 0x01090100: 0x1090100: lw    ra, 52(sp)
-// 0x01090104: 0x1090104: addu  v0, v1, zero
+L_1090724:
+// 0x01090724: 0x1090724: lw    ra, 52(sp)
+// 0x01090728: 0x1090728: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x01090108: 0x1090108: lw    s2, 48(sp)
+// 0x0109072c: 0x109072c: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3499,7 +3499,7 @@ L_1090100:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109010c: 0x109010c: lw    s1, 44(sp)
+// 0x01090730: 0x1090730: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3508,7 +3508,7 @@ L_1090100:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090110: 0x1090110: lw    s0, 40(sp)
+// 0x01090734: 0x1090734: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3517,7 +3517,7 @@ L_1090100:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01090114: 0x1090114: jr    ra addiu sp, sp, 56
+// 0x01090738: 0x1090738: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3529,7 +3529,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoi_ExternalPoi_Add_109011c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoi_ExternalPoi_Add_1090740(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra,int32 t0,int32 t1)
@@ -3579,12 +3579,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109011c: 0x109011c: addiu sp, sp, -48
+// 0x01090740: 0x1090740: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01090120: 0x1090120: sw    s0, 32(sp)
+// 0x01090744: 0x1090744: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3593,8 +3593,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090124: 0x1090124: sw    ra, 44(sp)
-// 0x01090128: 0x1090128: sw    s2, 40(sp)
+// 0x01090748: 0x1090748: sw    ra, 44(sp)
+// 0x0109074c: 0x109074c: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3603,7 +3603,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109012c: 0x109012c: sw    s1, 36(sp)
+// 0x01090750: 0x1090750: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3612,7 +3612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01090130: 0x1090130: jal   0x108f9d8 addu  s0, a0, zero
+// 0x01090754: 0x1090754: jal   0x108fffc addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -3620,40 +3620,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108f9d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_FeatureEnabled_108fffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01090138: 0x1090138: beq   v0, zero, 0x1090290 addiu v1, zero, 1
+// 0x0109075c: 0x109075c: beq   v0, zero, 0x10908b4 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brfalse L_1090290
+	brfalse L_10908b4
 // --- basic block ---
-// 0x01090140: 0x1090140: bne   s0, zero, 0x1090168 lui   s1, 0x20000
+// 0x01090764: 0x1090764: bne   s0, zero, 0x109078c lui   s1, 0x20000
 	ldloc 8
 	ldc.i4 131072
 	stloc 9
-	brtrue L_1090168
+	brtrue L_109078c
 // --- basic block ---
-// 0x01090148: 0x1090148: lui   a3, 0x20000
+// 0x0109076c: 0x109076c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109014c: 0x109014c: addiu a1, s1, -5692
+// 0x01090770: 0x1090770: addiu a1, s1, -5228
 	ldloc 9
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x01090150: 0x1090150: addiu a3, a3, -4792
+// 0x01090774: 0x1090774: addiu a3, a3, -4328
 	ldloc 4
-	ldc.i4 -4792
+	ldc.i4 -4328
 	add
 	stloc 4
-// 0x01090154: 0x1090154: addiu a0, zero, 4
+// 0x01090778: 0x1090778: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01090158: 0x1090158: jal   0x100449c addiu a2, zero, 324
+// 0x0109077c: 0x109077c: jal   0x100449c addiu a2, zero, 324
 	ldc.i4 324
 	stloc.3
 	ldloc.0
@@ -3666,13 +3666,13 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01090160: 0x1090160: j	 0x1090290 addu  v1, zero, zero
+// 0x01090784: 0x1090784: j	 0x10908b4 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1090290
+	br L_10908b4
 // --- basic block ---
-L_1090168:
-// 0x01090168: 0x1090168: lw    v1, 24(s0)
+L_109078c:
+// 0x0109078c: 0x109078c: lw    v1, 24(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3681,7 +3681,7 @@ L_1090168:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109016c: 0x109016c: lw    v0, 4(s0)
+// 0x01090790: 0x1090790: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3690,14 +3690,14 @@ L_1090168:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01090170: 0x1090170: lw    t1, 0(s0)
+// 0x01090794: 0x1090794: lw    t1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x01090174: 0x1090174: lw    t0, 28(s0)
+// 0x01090798: 0x1090798: lw    t0, 28(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3706,26 +3706,26 @@ L_1090168:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01090178: 0x1090178: lui   a3, 0x20000
+// 0x0109079c: 0x109079c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109017c: 0x109017c: addiu a3, a3, -4716
+// 0x010907a0: 0x10907a0: addiu a3, a3, -4252
 	ldloc 4
-	ldc.i4 -4716
+	ldc.i4 -4252
 	add
 	stloc 4
-// 0x01090180: 0x1090180: addiu a0, zero, 1
+// 0x010907a4: 0x10907a4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01090184: 0x1090184: addiu a1, s1, -5692
+// 0x010907a8: 0x10907a8: addiu a1, s1, -5228
 	ldloc 9
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x01090188: 0x1090188: addiu a2, zero, 327
+// 0x010907ac: 0x10907ac: addiu a2, zero, 327
 	ldc.i4 327
 	stloc.3
-// 0x0109018c: 0x109018c: sw    v1, 24(sp)
+// 0x010907b0: 0x10907b0: sw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3734,7 +3734,7 @@ L_1090168:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090190: 0x1090190: sw    v0, 28(sp)
+// 0x010907b4: 0x10907b4: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3743,7 +3743,7 @@ L_1090168:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01090194: 0x1090194: sw    t1, 16(sp)
+// 0x010907b8: 0x10907b8: sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3752,7 +3752,7 @@ L_1090168:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01090198: 0x1090198: jal   0x100449c sw    t0, 20(sp)
+// 0x010907bc: 0x10907bc: jal   0x100449c sw    t0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3771,54 +3771,54 @@ L_1090168:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010901a0: 0x10901a0: lui   v0, 0xf0000
+// 0x010907c4: 0x10907c4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010901a4: 0x10901a4: lw    v0, -27760(v0)
+// 0x010907c8: 0x10907c8: lw    v0, -27296(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6940
+	ldc.i4 -6824
 	add
 	ldelem.i4
 	stloc 6
-// 0x010901a8: 0x10901a8: addiu v1, zero, 500
+// 0x010907cc: 0x10907cc: addiu v1, zero, 500
 	ldc.i4 500
 	stloc 5
-// 0x010901ac: 0x10901ac: bne   v0, v1, 0x10901c8 lui   a3, 0x20000
+// 0x010907d0: 0x10907d0: bne   v0, v1, 0x10907ec lui   a3, 0x20000
 	ldloc 6
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	bne.un L_10901c8
+	bne.un L_10907ec
 // --- basic block ---
-// 0x010901b4: 0x10901b4: addiu a1, s1, -5692
+// 0x010907d8: 0x10907d8: addiu a1, s1, -5228
 	ldloc 9
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x010901b8: 0x10901b8: addiu a3, a3, -4648
+// 0x010907dc: 0x10907dc: addiu a3, a3, -4184
 	ldloc 4
-	ldc.i4 -4648
+	ldc.i4 -4184
 	add
 	stloc 4
-// 0x010901bc: 0x10901bc: addiu a0, zero, 4
+// 0x010907e0: 0x10907e0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010901c0: 0x10901c0: j	 0x10902bc addiu a2, zero, 330
+// 0x010907e4: 0x10907e4: j	 0x10908e0 addiu a2, zero, 330
 	ldc.i4 330
 	stloc.3
-	br L_10902bc
+	br L_10908e0
 // --- basic block ---
-L_10901c8:
-// 0x010901c8: 0x10901c8: lui   v1, 0xf0000
+L_10907ec:
+// 0x010907ec: 0x10907ec: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010901cc: 0x10901cc: lui   a0, 0xf0000
+// 0x010907f0: 0x10907f0: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x010901d0: 0x10901d0: lw    v0, 4(s0)
+// 0x010907f4: 0x10907f4: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3827,47 +3827,47 @@ L_10901c8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010901d4: 0x10901d4: addiu v1, v1, -27756
+// 0x010907f8: 0x10907f8: addiu v1, v1, -27292
 	ldloc 5
-	ldc.i4 -27756
+	ldc.i4 -27292
 	add
 	stloc 5
-// 0x010901d8: 0x10901d8: addiu a0, a0, -27356
+// 0x010907fc: 0x10907fc: addiu a0, a0, -26892
 	ldloc.1
-	ldc.i4 -27356
+	ldc.i4 -26892
 	add
 	stloc.1
-L_10901dc:
-// 0x010901dc: 0x10901dc: lw    s2, 0(v1)
+L_1090800:
+// 0x01090800: 0x1090800: lw    s2, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010901e0: 0x10901e0: sll   zero, zero, 0
-// 0x010901e4: 0x10901e4: beq   s2, zero, 0x1090238 addiu v1, v1, 4
+// 0x01090804: 0x1090804: sll   zero, zero, 0
+// 0x01090808: 0x1090808: beq   s2, zero, 0x109085c addiu v1, v1, 4
 	ldloc 10
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_1090238
+	brfalse L_109085c
 // --- basic block ---
-// 0x010901ec: 0x10901ec: lw    a1, 0(s2)
+// 0x01090810: 0x1090810: lw    a1, 0(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010901f0: 0x10901f0: sll   zero, zero, 0
-// 0x010901f4: 0x10901f4: bne   a1, v0, 0x1090238 sll   zero, zero, 0
+// 0x01090814: 0x1090814: sll   zero, zero, 0
+// 0x01090818: 0x1090818: bne   a1, v0, 0x109085c sll   zero, zero, 0
 	ldloc.2
 	ldloc 6
-	bne.un L_1090238
+	bne.un L_109085c
 // --- basic block ---
-// 0x010901fc: 0x10901fc: jal   0x108ff08 addiu a0, zero, 180
+// 0x01090820: 0x1090820: jal   0x109052c addiu a0, zero, 180
 	ldc.i4 180
 	stloc.1
 	ldloc.0
@@ -3875,15 +3875,15 @@ L_10901dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::T_49_108ff08(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::T_49_109052c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01090204: 0x1090204: addu  s1, v0, zero
+// 0x01090828: 0x1090828: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-// 0x01090208: 0x1090208: jal   0x108ef44 addu  a0, v0, zero
+// 0x0109082c: 0x109082c: jal   0x108f568 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3891,15 +3891,15 @@ L_10901dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoi_Init_108ef44(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_ExternalPoi_Init_108f568(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01090210: 0x1090210: addu  a0, s1, zero
+// 0x01090834: 0x1090834: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01090214: 0x1090214: sw    s2, 20(s0)
+// 0x01090838: 0x1090838: sw    s2, 20(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3908,10 +3908,10 @@ L_10901dc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01090218: 0x1090218: addu  a1, s0, zero
+// 0x0109083c: 0x109083c: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0109021c: 0x109021c: jal   0x1001800 addiu a2, zero, 180
+// 0x01090840: 0x1090840: jal   0x1001800 addiu a2, zero, 180
 	ldc.i4 180
 	stloc.3
 	ldloc.1
@@ -3923,61 +3923,61 @@ L_10901dc:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01090224: 0x1090224: lui   v1, 0xf0000
+// 0x01090848: 0x1090848: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01090228: 0x1090228: addiu v1, v1, -29760
+// 0x0109084c: 0x109084c: addiu v1, v1, -29296
 	ldloc 5
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 5
-// 0x0109022c: 0x109022c: addu  v0, zero, zero
+// 0x01090850: 0x1090850: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01090230: 0x1090230: j	 0x1090248 addiu a0, zero, 500
+// 0x01090854: 0x1090854: j	 0x109086c addiu a0, zero, 500
 	ldc.i4 500
 	stloc.1
-	br L_1090248
+	br L_109086c
 // --- basic block ---
-L_1090238:
-// 0x01090238: 0x1090238: bne   v1, a0, 0x10901dc lui   a1, 0x20000
+L_109085c:
+// 0x0109085c: 0x109085c: bne   v1, a0, 0x1090800 lui   a1, 0x20000
 	ldloc 5
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10901dc
+	bne.un L_1090800
 // --- basic block ---
-// 0x01090240: 0x1090240: j	 0x10902ac lui   a3, 0x20000
+// 0x01090864: 0x1090864: j	 0x10908d0 lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-	br L_10902ac
+	br L_10908d0
 // --- basic block ---
-L_1090248:
-// 0x01090248: 0x1090248: lw    a1, 0(v1)
+L_109086c:
+// 0x0109086c: 0x109086c: lw    a1, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0109024c: 0x109024c: sll   zero, zero, 0
-// 0x01090250: 0x1090250: bne   a1, zero, 0x1090280 addiu v1, v1, 4
+// 0x01090870: 0x1090870: sll   zero, zero, 0
+// 0x01090874: 0x1090874: bne   a1, zero, 0x10908a4 addiu v1, v1, 4
 	ldloc.2
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brtrue L_1090280
+	brtrue L_10908a4
 // --- basic block ---
-// 0x01090258: 0x1090258: lui   v1, 0xf0000
+// 0x0109087c: 0x109087c: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0109025c: 0x109025c: addiu v1, v1, -29760
+// 0x01090880: 0x1090880: addiu v1, v1, -29296
 	ldloc 5
-	ldc.i4 -29760
+	ldc.i4 -29296
 	add
 	stloc 5
-// 0x01090260: 0x1090260: lw    a0, 2000(v1)
+// 0x01090884: 0x1090884: lw    a0, 2000(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3986,22 +3986,22 @@ L_1090248:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01090264: 0x1090264: sll   v0, v0, 2
+// 0x01090888: 0x1090888: sll   v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01090268: 0x1090268: addu  v0, v0, v1
+// 0x0109088c: 0x109088c: addu  v0, v0, v1
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x0109026c: 0x109026c: addiu a0, a0, 1
+// 0x01090890: 0x1090890: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01090270: 0x1090270: sw    a0, 2000(v1)
+// 0x01090894: 0x1090894: sw    a0, 2000(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4010,38 +4010,38 @@ L_1090248:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01090274: 0x1090274: sw    s1, 0(v0)
+// 0x01090898: 0x1090898: sw    s1, 0(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x01090278: 0x1090278: j	 0x1090290 addiu v1, zero, 1
+// 0x0109089c: 0x109089c: j	 0x10908b4 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1090290
+	br L_10908b4
 // --- basic block ---
-L_1090280:
-// 0x01090280: 0x1090280: addiu v0, v0, 1
+L_10908a4:
+// 0x010908a4: 0x10908a4: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01090284: 0x1090284: bne   v0, a0, 0x1090248 sll   zero, zero, 0
+// 0x010908a8: 0x10908a8: bne   v0, a0, 0x109086c sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	bne.un L_1090248
+	bne.un L_109086c
 // --- basic block ---
-// 0x0109028c: 0x109028c: addu  v1, zero, zero
+// 0x010908b0: 0x10908b0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1090290:
-// 0x01090290: 0x1090290: lw    ra, 44(sp)
-// 0x01090294: 0x1090294: addu  v0, v1, zero
+L_10908b4:
+// 0x010908b4: 0x10908b4: lw    ra, 44(sp)
+// 0x010908b8: 0x10908b8: addu  v0, v1, zero
 	ldloc 5
 	stloc 6
-// 0x01090298: 0x1090298: lw    s2, 40(sp)
+// 0x010908bc: 0x10908bc: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4050,7 +4050,7 @@ L_1090290:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109029c: 0x109029c: lw    s1, 36(sp)
+// 0x010908c0: 0x10908c0: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4059,7 +4059,7 @@ L_1090290:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010902a0: 0x10902a0: lw    s0, 32(sp)
+// 0x010908c4: 0x10908c4: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4068,32 +4068,32 @@ L_1090290:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010902a4: 0x10902a4: jr    ra addiu sp, sp, 48
+// 0x010908c8: 0x10908c8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10902ac:
-// 0x010902ac: 0x10902ac: addiu a1, a1, -5692
+L_10908d0:
+// 0x010908d0: 0x10908d0: addiu a1, a1, -5228
 	ldloc.2
-	ldc.i4 -5692
+	ldc.i4 -5228
 	add
 	stloc.2
-// 0x010902b0: 0x10902b0: addiu a3, a3, -4556
+// 0x010908d4: 0x10908d4: addiu a3, a3, -4092
 	ldloc 4
-	ldc.i4 -4556
+	ldc.i4 -4092
 	add
 	stloc 4
-// 0x010902b4: 0x10902b4: addiu a0, zero, 4
+// 0x010908d8: 0x10908d8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010902b8: 0x10902b8: addiu a2, zero, 336
+// 0x010908dc: 0x10908dc: addiu a2, zero, 336
 	ldc.i4 336
 	stloc.3
-L_10902bc:
-// 0x010902bc: 0x10902bc: jal   0x100449c sw    v0, 16(sp)
+L_10908e0:
+// 0x010908e0: 0x10908e0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4112,17 +4112,17 @@ L_10902bc:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010902c4: 0x10902c4: j	 0x1090290 addu  v1, zero, zero
+// 0x010908e8: 0x10908e8: j	 0x10908b4 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1090290
+	br L_10908b4
 __CIBYL_function_return:
 	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeExternalPoiDlg_10902cc(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoiDlg_10908f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s0,int32 s2,int32 s1,int32 ra)
@@ -4169,25 +4169,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010902cc: 0x10902cc: addiu sp, sp, -64
+// 0x010908f0: 0x10908f0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010902d0: 0x10902d0: lw    v0, 0(a0)
+// 0x010908f4: 0x10908f4: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010902d4: 0x10902d4: lui   a1, 0x20000
+// 0x010908f8: 0x10908f8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010902d8: 0x10902d8: lui   a3, 0x20000
+// 0x010908fc: 0x10908fc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010902dc: 0x10902dc: sw    s0, 44(sp)
+// 0x01090900: 0x1090900: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4196,26 +4196,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010902e0: 0x10902e0: addiu a1, a1, -4408
+// 0x01090904: 0x1090904: addiu a1, a1, -3944
 	ldloc.2
-	ldc.i4 -4408
+	ldc.i4 -3944
 	add
 	stloc.2
-// 0x010902e4: 0x10902e4: addu  s0, a0, zero
+// 0x01090908: 0x1090908: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010902e8: 0x10902e8: addiu a3, a3, -4364
+// 0x0109090c: 0x109090c: addiu a3, a3, -3900
 	ldloc 4
-	ldc.i4 -4364
+	ldc.i4 -3900
 	add
 	stloc 4
-// 0x010902ec: 0x10902ec: addiu a0, zero, 1
+// 0x01090910: 0x1090910: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010902f0: 0x10902f0: addiu a2, zero, 225
+// 0x01090914: 0x1090914: addiu a2, zero, 225
 	ldc.i4 225
 	stloc.3
-// 0x010902f4: 0x10902f4: sw    v0, 16(sp)
+// 0x01090918: 0x1090918: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4224,8 +4224,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010902f8: 0x10902f8: sw    ra, 60(sp)
-// 0x010902fc: 0x10902fc: sw    s3, 56(sp)
+// 0x0109091c: 0x109091c: sw    ra, 60(sp)
+// 0x01090920: 0x1090920: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4234,7 +4234,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090300: 0x1090300: sw    s2, 52(sp)
+// 0x01090924: 0x1090924: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4243,7 +4243,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01090304: 0x1090304: jal   0x100449c sw    s1, 48(sp)
+// 0x01090928: 0x1090928: jal   0x100449c sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4262,7 +4262,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109030c: 0x109030c: lw    a0, 8(s0)
+// 0x01090930: 0x1090930: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4271,63 +4271,63 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01090310: 0x1090310: jal   0x1090824 sll   zero, zero, 0
+// 0x01090934: 0x1090934: jal   0x1090e48 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_NotifyOnPopUp_1090824(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_NotifyOnPopUp_1090e48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090318: 0x1090318: lui   v0, 0x80000
+// 0x0109093c: 0x109093c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109031c: 0x109031c: lw    v0, 8552(v0)
+// 0x01090940: 0x1090940: lw    v0, 9016(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2138
+	ldc.i4 2254
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090320: 0x1090320: sll   zero, zero, 0
-// 0x01090324: 0x1090324: beq   v0, zero, 0x1090380 lui   a3, 0x10810000
+// 0x01090944: 0x1090944: sll   zero, zero, 0
+// 0x01090948: 0x1090948: beq   v0, zero, 0x10909a4 lui   a3, 0x10810000
 	ldloc 5
 	ldc.i4 276889600
 	stloc 4
-	brfalse L_1090380
+	brfalse L_10909a4
 // --- basic block ---
-// 0x0109032c: 0x109032c: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x01090950: 0x1090950: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090334: 0x1090334: beq   v0, zero, 0x1090368 lui   a0, 0x20000
+// 0x01090958: 0x1090958: beq   v0, zero, 0x109098c lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_1090368
+	brfalse L_109098c
 // --- basic block ---
-// 0x0109033c: 0x109033c: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x01090960: 0x1090960: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090344: 0x1090344: lui   a1, 0x20000
+// 0x01090968: 0x1090968: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01090348: 0x1090348: addu  a0, v0, zero
+// 0x0109096c: 0x109096c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109034c: 0x109034c: jal   0x1001b14 addiu a1, a1, -4316
+// 0x01090970: 0x1090970: jal   0x1001b14 addiu a1, a1, -3852
 	ldloc.2
-	ldc.i4 -4316
+	ldc.i4 -3852
 	add
 	stloc.2
 	ldloc.1
@@ -4335,13 +4335,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01090354: 0x1090354: bne   v0, zero, 0x1090368 lui   a0, 0x20000
+// 0x01090978: 0x1090978: bne   v0, zero, 0x109098c lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1090368
+	brtrue L_109098c
 // --- basic block ---
-// 0x0109035c: 0x109035c: jal   0x1094b64 addu  a0, zero, zero
+// 0x01090980: 0x1090980: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4349,21 +4349,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090364: 0x1090364: lui   a0, 0x20000
+// 0x01090988: 0x1090988: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_1090368:
-// 0x01090368: 0x1090368: addiu a0, a0, -4316
+L_109098c:
+// 0x0109098c: 0x109098c: addiu a0, a0, -3852
 	ldloc.1
-	ldc.i4 -4316
+	ldc.i4 -3852
 	add
 	stloc.1
-// 0x0109036c: 0x109036c: jal   0x1094218 addu  a1, zero, zero
+// 0x01090990: 0x1090990: jal   0x109483c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4371,54 +4371,54 @@ L_1090368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_free_1094218(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_free_109483c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090374: 0x1090374: lui   v0, 0x80000
+// 0x01090998: 0x1090998: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01090378: 0x1090378: sw    zero, 8552(v0)
+// 0x0109099c: 0x109099c: sw    zero, 9016(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2138
+	ldc.i4 2254
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109037c: 0x109037c: lui   a3, 0x10810000
+// 0x010909a0: 0x10909a0: lui   a3, 0x10810000
 	ldc.i4 276889600
 	stloc 4
-L_1090380:
-// 0x01090380: 0x1090380: lui   a0, 0x20000
+L_10909a4:
+// 0x010909a4: 0x10909a4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01090384: 0x1090384: lui   a1, 0x10000
+// 0x010909a8: 0x10909a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01090388: 0x1090388: lui   a2, 0x1090000
+// 0x010909ac: 0x10909ac: lui   a2, 0x1090000
 	ldc.i4 17367040
 	stloc.3
-// 0x0109038c: 0x109038c: ori   a3, a3, 20481
+// 0x010909b0: 0x10909b0: ori   a3, a3, 20481
 	ldloc 4
 	ldc.i4 20481
 	or
 	stloc 4
-// 0x01090390: 0x1090390: addiu a0, a0, -4316
+// 0x010909b4: 0x10909b4: addiu a0, a0, -3852
 	ldloc.1
-	ldc.i4 -4316
+	ldc.i4 -3852
 	add
 	stloc.1
-// 0x01090394: 0x1090394: addiu a1, a1, 18500
+// 0x010909b8: 0x10909b8: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01090398: 0x1090398: jal   0x1095a08 addiu a2, a2, 1376
+// 0x010909bc: 0x10909bc: jal   0x1096050 addiu a2, a2, 2948
 	ldloc.3
-	ldc.i4 1376
+	ldc.i4 2948
 	add
 	stloc.3
 	ldloc.0
@@ -4426,29 +4426,29 @@ L_1090380:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010903a0: 0x10903a0: addu  a0, v0, zero
+// 0x010909c4: 0x10909c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010903a4: 0x10903a4: lui   v1, 0x80000
+// 0x010909c8: 0x10909c8: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010903a8: 0x10903a8: addiu a1, zero, 2
+// 0x010909cc: 0x10909cc: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010903ac: 0x10903ac: addu  a2, zero, zero
+// 0x010909d0: 0x10909d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010903b0: 0x10903b0: jal   0x10942e8 sw    v0, 8552(v1)
+// 0x010909d4: 0x10909d4: jal   0x109490c sw    v0, 9016(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2138
+	ldc.i4 2254
 	add
 	ldloc 5
 	stelem.i4
@@ -4457,65 +4457,65 @@ L_1090380:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010903b8: 0x10903b8: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x010909dc: 0x10909dc: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010903c0: 0x10903c0: bne   v0, zero, 0x10903dc addiu a3, zero, 235
+// 0x010909e4: 0x10909e4: bne   v0, zero, 0x1090a00 addiu a3, zero, 235
 	ldloc 5
 	ldc.i4 235
 	stloc 4
-	brtrue L_10903dc
+	brtrue L_1090a00
 // --- basic block ---
-// 0x010903c8: 0x10903c8: jal   0x1020318 sll   zero, zero, 0
+// 0x010909ec: 0x10909ec: jal   0x1020328 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::is_screen_wide_1020318(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::is_screen_wide_1020328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010903d0: 0x10903d0: beq   v0, zero, 0x10903dc addiu a3, zero, 240
+// 0x010909f4: 0x10909f4: beq   v0, zero, 0x1090a00 addiu a3, zero, 240
 	ldloc 5
 	ldc.i4 240
 	stloc 4
-	brfalse L_10903dc
+	brfalse L_1090a00
 // --- basic block ---
-// 0x010903d8: 0x10903d8: addiu a3, zero, 155
+// 0x010909fc: 0x10909fc: addiu a3, zero, 155
 	ldc.i4 155
 	stloc 4
-L_10903dc:
-// 0x010903dc: 0x10903dc: lui   s1, 0x10000
+L_1090a00:
+// 0x01090a00: 0x1090a00: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x010903e0: 0x10903e0: lui   a0, 0x20000
+// 0x01090a04: 0x1090a04: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010903e4: 0x10903e4: addiu a0, a0, -4292
+// 0x01090a08: 0x1090a08: addiu a0, a0, -3828
 	ldloc.1
-	ldc.i4 -4292
+	ldc.i4 -3828
 	add
 	stloc.1
-// 0x010903e8: 0x10903e8: addiu a1, s1, 18500
+// 0x01090a0c: 0x1090a0c: addiu a1, s1, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010903ec: 0x10903ec: addiu a2, zero, -2
+// 0x01090a10: 0x1090a10: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010903f0: 0x10903f0: addiu v0, zero, 17
+// 0x01090a14: 0x1090a14: addiu v0, zero, 17
 	ldc.i4.s 17
 	stloc 5
-// 0x010903f4: 0x10903f4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01090a18: 0x1090a18: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4529,23 +4529,23 @@ L_10903dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010903fc: 0x10903fc: addu  s2, v0, zero
+// 0x01090a20: 0x1090a20: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01090400: 0x1090400: lui   v0, 0x1090000
+// 0x01090a24: 0x1090a24: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01090404: 0x1090404: addiu v0, v0, 1432
+// 0x01090a28: 0x1090a28: addiu v0, v0, 3004
 	ldloc 5
-	ldc.i4 1432
+	ldc.i4 3004
 	add
 	stloc 5
-// 0x01090408: 0x1090408: sw    v0, 184(s2)
+// 0x01090a2c: 0x1090a2c: sw    v0, 184(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4554,19 +4554,19 @@ L_10903dc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109040c: 0x109040c: addu  a0, s2, zero
+// 0x01090a30: 0x1090a30: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01090410: 0x1090410: addu  a1, zero, zero
+// 0x01090a34: 0x1090a34: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01090414: 0x1090414: addu  a2, zero, zero
+// 0x01090a38: 0x1090a38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01090418: 0x1090418: lui   s3, 0x80000
+// 0x01090a3c: 0x1090a3c: lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0109041c: 0x109041c: jal   0x1098fe0 sw    s0, 116(s2)
+// 0x01090a40: 0x1090a40: jal   0x1099628 sw    s0, 116(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4578,28 +4578,28 @@ L_10903dc:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01090424: 0x1090424: lw    a0, 8552(s3)
+// 0x01090a48: 0x1090a48: lw    a0, 9016(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2138
+	ldc.i4 2254
 	add
 	ldelem.i4
 	stloc.1
-// 0x01090428: 0x1090428: jal   0x1098ec4 addu  a1, s2, zero
+// 0x01090a4c: 0x1090a4c: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090430: 0x1090430: lw    v0, 20(s0)
+// 0x01090a54: 0x1090a54: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4608,16 +4608,16 @@ L_10903dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090434: 0x1090434: lw    s3, 8552(s3)
+// 0x01090a58: 0x1090a58: lw    s3, 9016(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2138
+	ldc.i4 2254
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090438: 0x1090438: lw    v0, 412(v0)
+// 0x01090a5c: 0x1090a5c: lw    v0, 412(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4626,8 +4626,8 @@ L_10903dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109043c: 0x109043c: sll   zero, zero, 0
-// 0x01090440: 0x1090440: beq   v0, zero, 0x1090470 sw    s0, 116(s3)
+// 0x01090a60: 0x1090a60: sll   zero, zero, 0
+// 0x01090a64: 0x1090a64: beq   v0, zero, 0x1090a94 sw    s0, 116(s3)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -4637,27 +4637,27 @@ L_10903dc:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_1090470
+	brfalse L_1090a94
 // --- basic block ---
-// 0x01090448: 0x1090448: lui   a1, 0x1090000
+// 0x01090a6c: 0x1090a6c: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x0109044c: 0x109044c: addiu a1, a1, 1248
+// 0x01090a70: 0x1090a70: addiu a1, a1, 2820
 	ldloc.2
-	ldc.i4 1248
+	ldc.i4 2820
 	add
 	stloc.2
-// 0x01090450: 0x1090450: jal   0x1099174 addu  a0, s3, zero
+// 0x01090a74: 0x1090a74: jal   0x10997bc addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01090458: 0x1090458: lui   a0, 0x10000
+// 0x01090a7c: 0x1090a7c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0109045c: 0x109045c: jal   0x101cd60 addiu a0, a0, -20576
+// 0x01090a80: 0x1090a80: jal   0x101cd70 addiu a0, a0, -20576
 	ldloc.1
 	ldc.i4 -20576
 	add
@@ -4667,40 +4667,40 @@ L_10903dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090464: 0x1090464: addu  a1, v0, zero
+// 0x01090a88: 0x1090a88: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01090468: 0x1090468: j	 0x1090484 addu  a0, s3, zero
+// 0x01090a8c: 0x1090a8c: j	 0x1090aa8 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-	br L_1090484
+	br L_1090aa8
 // --- basic block ---
-L_1090470:
-// 0x01090470: 0x1090470: addu  a1, zero, zero
+L_1090a94:
+// 0x01090a94: 0x1090a94: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01090474: 0x1090474: jal   0x1099174 addu  a0, s3, zero
+// 0x01090a98: 0x1090a98: jal   0x10997bc addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x0109047c: 0x109047c: addu  a0, s3, zero
+// 0x01090aa0: 0x1090aa0: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x01090480: 0x1090480: addiu a1, s1, 18500
+// 0x01090aa4: 0x1090aa4: addiu a1, s1, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-L_1090484:
-// 0x01090484: 0x1090484: jal   0x109b434 lui   s0, 0x20000
+L_1090aa8:
+// 0x01090aa8: 0x1090aa8: jal   0x109ba7c lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.0
@@ -4708,17 +4708,17 @@ L_1090484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109048c: 0x109048c: addu  a1, zero, zero
+// 0x01090ab0: 0x1090ab0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01090490: 0x1090490: jal   0x1095eec addiu a0, s0, -4316
+// 0x01090ab4: 0x1090ab4: jal   0x1096534 addiu a0, s0, -3852
 	ldloc 9
-	ldc.i4 -4316
+	ldc.i4 -3852
 	add
 	stloc.1
 	ldloc.0
@@ -4726,14 +4726,14 @@ L_1090484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090498: 0x1090498: jal   0x10957d8 addiu a0, s0, -4316
+// 0x01090abc: 0x1090abc: jal   0x1095e20 addiu a0, s0, -3852
 	ldloc 9
-	ldc.i4 -4316
+	ldc.i4 -3852
 	add
 	stloc.1
 	ldloc.0
@@ -4741,29 +4741,29 @@ L_1090484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_recalculate_10957d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_recalculate_1095e20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010904a0: 0x10904a0: lui   v0, 0x80000
+// 0x01090ac4: 0x1090ac4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010904a4: 0x10904a4: lw    a0, 8552(v0)
+// 0x01090ac8: 0x1090ac8: lw    a0, 9016(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2138
+	ldc.i4 2254
 	add
 	ldelem.i4
 	stloc.1
-// 0x010904a8: 0x10904a8: addiu a1, sp, 24
+// 0x01090acc: 0x1090acc: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010904ac: 0x10904ac: jal   0x1099350 addu  a2, zero, zero
+// 0x01090ad0: 0x1090ad0: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4771,20 +4771,20 @@ L_1090484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010904b4: 0x10904b4: addu  a0, s2, zero
+// 0x01090ad8: 0x1090ad8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010904b8: 0x10904b8: addiu a1, sp, 32
+// 0x01090adc: 0x1090adc: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010904bc: 0x10904bc: jal   0x1099350 addu  a2, zero, zero
+// 0x01090ae0: 0x1090ae0: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4792,13 +4792,13 @@ L_1090484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010904c4: 0x10904c4: lw    ra, 60(sp)
-// 0x010904c8: 0x10904c8: lw    s3, 56(sp)
+// 0x01090ae8: 0x1090ae8: lw    ra, 60(sp)
+// 0x01090aec: 0x1090aec: lw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4807,7 +4807,7 @@ L_1090484:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010904cc: 0x10904cc: lw    s2, 52(sp)
+// 0x01090af0: 0x1090af0: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4816,7 +4816,7 @@ L_1090484:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010904d0: 0x10904d0: lw    s1, 48(sp)
+// 0x01090af4: 0x1090af4: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4825,7 +4825,7 @@ L_1090484:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010904d4: 0x10904d4: lw    s0, 44(sp)
+// 0x01090af8: 0x1090af8: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4834,7 +4834,7 @@ L_1090484:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010904d8: 0x10904d8: jr    ra addiu sp, sp, 64
+// 0x01090afc: 0x1090afc: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4846,7 +4846,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Drive_sk_cb_10904e0(int32,int32,int32,int32,int32)
+.method public static int32 Drive_sk_cb_1090b04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4881,38 +4881,38 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010904e0: 0x10904e0: addiu sp, sp, -64
+// 0x01090b04: 0x1090b04: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010904e4: 0x10904e4: sw    ra, 60(sp)
-// 0x010904e8: 0x10904e8: beq   a2, zero, 0x1090550 addu  v0, zero, zero
+// 0x01090b08: 0x1090b08: sw    ra, 60(sp)
+// 0x01090b0c: 0x1090b0c: beq   a2, zero, 0x1090b74 addu  v0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1090550
+	brfalse L_1090b74
 // --- basic block ---
-// 0x010904f0: 0x10904f0: lui   v0, 0x10000
+// 0x01090b14: 0x1090b14: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010904f4: 0x10904f4: lui   a0, 0x20000
+// 0x01090b18: 0x1090b18: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010904f8: 0x10904f8: addiu v0, v0, 18500
+// 0x01090b1c: 0x1090b1c: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010904fc: 0x10904fc: addu  a1, zero, zero
+// 0x01090b20: 0x1090b20: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01090500: 0x1090500: addiu a0, a0, -4316
+// 0x01090b24: 0x1090b24: addiu a0, a0, -3852
 	ldloc.1
-	ldc.i4 -4316
+	ldc.i4 -3852
 	add
 	stloc.1
-// 0x01090504: 0x1090504: sw    v0, 36(sp)
+// 0x01090b28: 0x1090b28: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4921,7 +4921,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090508: 0x1090508: sw    v0, 32(sp)
+// 0x01090b2c: 0x1090b2c: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4930,7 +4930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109050c: 0x109050c: sw    v0, 28(sp)
+// 0x01090b30: 0x1090b30: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4939,7 +4939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090510: 0x1090510: sw    v0, 40(sp)
+// 0x01090b34: 0x1090b34: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4948,7 +4948,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090514: 0x1090514: sw    v0, 24(sp)
+// 0x01090b38: 0x1090b38: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4957,7 +4957,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090518: 0x1090518: jal   0x1094884 sw    a2, 48(sp)
+// 0x01090b3c: 0x1090b3c: jal   0x1094ff4 sw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4971,12 +4971,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090520: 0x1090520: lw    a2, 48(sp)
+// 0x01090b44: 0x1090b44: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4985,8 +4985,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01090524: 0x1090524: sll   zero, zero, 0
-// 0x01090528: 0x1090528: lw    a0, 8(a2)
+// 0x01090b48: 0x1090b48: sll   zero, zero, 0
+// 0x01090b4c: 0x1090b4c: lw    a0, 8(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4995,7 +4995,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109052c: 0x109052c: lw    v1, 28(a2)
+// 0x01090b50: 0x1090b50: lw    v1, 28(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -5004,7 +5004,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090530: 0x1090530: lw    v0, 24(a2)
+// 0x01090b54: 0x1090b54: lw    v0, 24(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -5013,7 +5013,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090534: 0x1090534: sw    v1, 20(sp)
+// 0x01090b58: 0x1090b58: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5022,7 +5022,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01090538: 0x1090538: jal   0x10907dc sw    v0, 16(sp)
+// 0x01090b5c: 0x1090b5c: jal   0x1090e00 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5036,17 +5036,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_NotifyOnNavigate_10907dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_NotifyOnNavigate_1090e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090540: 0x1090540: addiu a0, sp, 16
+// 0x01090b64: 0x1090b64: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01090544: 0x1090544: jal   0x105ca84 addiu a1, sp, 24
+// 0x01090b68: 0x1090b68: jal   0x105ca94 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5056,18 +5056,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::main_navigator_105ca84(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::main_navigator_105ca94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109054c: 0x109054c: addiu v0, zero, 1
+// 0x01090b70: 0x1090b70: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1090550:
-// 0x01090550: 0x1090550: lw    ra, 60(sp)
-// 0x01090554: 0x1090554: sll   zero, zero, 0
-// 0x01090558: 0x1090558: jr    ra addiu sp, sp, 64
+L_1090b74:
+// 0x01090b74: 0x1090b74: lw    ra, 60(sp)
+// 0x01090b78: 0x1090b78: sll   zero, zero, 0
+// 0x01090b7c: 0x1090b7c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5079,7 +5079,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_dialog_close_1090560(int32,int32,int32,int32,int32)
+.method public static int32 on_dialog_close_1090b84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5114,24 +5114,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090560: 0x1090560: lui   a0, 0x0
+// 0x01090b84: 0x1090b84: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01090564: 0x1090564: addiu v0, zero, -1
+// 0x01090b88: 0x1090b88: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01090568: 0x1090568: addiu sp, sp, -24
+// 0x01090b8c: 0x1090b8c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109056c: 0x109056c: addiu v1, a0, 17480
+// 0x01090b90: 0x1090b90: addiu v1, a0, 17480
 	ldloc.1
 	ldc.i4 17480
 	add
 	stloc 7
-// 0x01090570: 0x1090570: sw    ra, 20(sp)
-// 0x01090574: 0x1090574: sw    v0, 17480(a0)
+// 0x01090b94: 0x1090b94: sw    ra, 20(sp)
+// 0x01090b98: 0x1090b98: sw    v0, 17480(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5140,7 +5140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090578: 0x1090578: sw    v0, 8(v1)
+// 0x01090b9c: 0x1090b9c: sw    v0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5149,7 +5149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109057c: 0x109057c: sw    v0, 12(v1)
+// 0x01090ba0: 0x1090ba0: sw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5158,7 +5158,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090580: 0x1090580: jal   0x1054df8 sw    v0, 4(v1)
+// 0x01090ba4: 0x1090ba4: jal   0x1054e08 sw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5172,14 +5172,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_hide_1054df8(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_hide_1054e08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090588: 0x1090588: lw    ra, 20(sp)
-// 0x0109058c: 0x109058c: sll   zero, zero, 0
-// 0x01090590: 0x1090590: jr    ra addiu sp, sp, 24
+// 0x01090bac: 0x1090bac: lw    ra, 20(sp)
+// 0x01090bb0: 0x1090bb0: sll   zero, zero, 0
+// 0x01090bb4: 0x1090bb4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5191,7 +5191,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_browser_rect_1090598(int32,int32,int32,int32,int32)
+.method public static int32 draw_browser_rect_1090bbc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s0,int32 s5,int32 s6,int32 s1,int32 s3,int32 s4,int32 s7,int32 s8,int32 ra)
@@ -5253,17 +5253,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090598: 0x1090598: addiu sp, sp, -2248
+// 0x01090bbc: 0x1090bbc: addiu sp, sp, -2248
 	ldloc.0
 	ldc.i4 -2248
 	add
 	stloc.0
-// 0x0109059c: 0x109059c: andi  a2, a2, 1
+// 0x01090bc0: 0x1090bc0: andi  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc.3
-// 0x010905a0: 0x10905a0: sw    s2, 2216(sp)
+// 0x01090bc4: 0x1090bc4: sw    s2, 2216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5272,7 +5272,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010905a4: 0x10905a4: sw    s0, 2208(sp)
+// 0x01090bc8: 0x1090bc8: sw    s0, 2208(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5281,8 +5281,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010905a8: 0x10905a8: sw    ra, 2244(sp)
-// 0x010905ac: 0x10905ac: sw    s8, 2240(sp)
+// 0x01090bcc: 0x1090bcc: sw    ra, 2244(sp)
+// 0x01090bd0: 0x1090bd0: sw    s8, 2240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010905b0: 0x10905b0: sw    s7, 2236(sp)
+// 0x01090bd4: 0x1090bd4: sw    s7, 2236(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5300,7 +5300,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010905b4: 0x10905b4: sw    s6, 2232(sp)
+// 0x01090bd8: 0x1090bd8: sw    s6, 2232(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5309,7 +5309,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010905b8: 0x10905b8: sw    s5, 2228(sp)
+// 0x01090bdc: 0x1090bdc: sw    s5, 2228(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5318,7 +5318,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010905bc: 0x10905bc: sw    s4, 2224(sp)
+// 0x01090be0: 0x1090be0: sw    s4, 2224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5327,7 +5327,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010905c0: 0x10905c0: sw    s3, 2220(sp)
+// 0x01090be4: 0x1090be4: sw    s3, 2220(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5336,7 +5336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010905c4: 0x10905c4: sw    s1, 2212(sp)
+// 0x01090be8: 0x1090be8: sw    s1, 2212(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5345,7 +5345,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010905c8: 0x10905c8: lw    s0, 116(a0)
+// 0x01090bec: 0x1090bec: lw    s0, 116(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5354,19 +5354,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010905cc: 0x10905cc: bne   a2, zero, 0x1090770 addu  s2, a1, zero
+// 0x01090bf0: 0x1090bf0: bne   a2, zero, 0x1090d94 addu  s2, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 8
-	brtrue L_1090770
+	brtrue L_1090d94
 // --- basic block ---
-// 0x010905d4: 0x10905d4: beq   s0, zero, 0x1090770 lui   v0, 0x0
+// 0x01090bf8: 0x1090bf8: beq   s0, zero, 0x1090d94 lui   v0, 0x0
 	ldloc 9
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1090770
+	brfalse L_1090d94
 // --- basic block ---
-// 0x010905dc: 0x10905dc: lw    v1, 17480(v0)
+// 0x01090c00: 0x1090c00: lw    v1, 17480(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5375,24 +5375,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010905e0: 0x10905e0: lw    a0, 0(a1)
+// 0x01090c04: 0x1090c04: lw    a0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010905e4: 0x10905e4: sll   zero, zero, 0
-// 0x010905e8: 0x10905e8: bne   v1, a0, 0x109062c addiu v0, v0, 17480
+// 0x01090c08: 0x1090c08: sll   zero, zero, 0
+// 0x01090c0c: 0x1090c0c: bne   v1, a0, 0x1090c50 addiu v0, v0, 17480
 	ldloc 7
 	ldloc.1
 	ldloc 6
 	ldc.i4 17480
 	add
 	stloc 6
-	bne.un L_109062c
+	bne.un L_1090c50
 // --- basic block ---
-// 0x010905f0: 0x10905f0: lw    a1, 8(v0)
+// 0x01090c14: 0x1090c14: lw    a1, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5401,7 +5401,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010905f4: 0x10905f4: lw    a0, 8(s2)
+// 0x01090c18: 0x1090c18: lw    a0, 8(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5410,13 +5410,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010905f8: 0x10905f8: sll   zero, zero, 0
-// 0x010905fc: 0x10905fc: bne   a1, a0, 0x109062c sll   zero, zero, 0
+// 0x01090c1c: 0x1090c1c: sll   zero, zero, 0
+// 0x01090c20: 0x1090c20: bne   a1, a0, 0x1090c50 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_109062c
+	bne.un L_1090c50
 // --- basic block ---
-// 0x01090604: 0x1090604: lw    a1, 4(v0)
+// 0x01090c28: 0x1090c28: lw    a1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5425,7 +5425,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01090608: 0x1090608: lw    a0, 4(s2)
+// 0x01090c2c: 0x1090c2c: lw    a0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5434,13 +5434,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109060c: 0x109060c: sll   zero, zero, 0
-// 0x01090610: 0x1090610: bne   a1, a0, 0x109062c sll   zero, zero, 0
+// 0x01090c30: 0x1090c30: sll   zero, zero, 0
+// 0x01090c34: 0x1090c34: bne   a1, a0, 0x1090c50 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_109062c
+	bne.un L_1090c50
 // --- basic block ---
-// 0x01090618: 0x1090618: lw    a0, 12(v0)
+// 0x01090c3c: 0x1090c3c: lw    a0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5449,7 +5449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109061c: 0x109061c: lw    v0, 12(s2)
+// 0x01090c40: 0x1090c40: lw    v0, 12(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5458,29 +5458,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01090620: 0x1090620: sll   zero, zero, 0
-// 0x01090624: 0x1090624: beq   a0, v0, 0x1090770 sll   zero, zero, 0
+// 0x01090c44: 0x1090c44: sll   zero, zero, 0
+// 0x01090c48: 0x1090c48: beq   a0, v0, 0x1090d94 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_1090770
+	beq  L_1090d94
 // --- basic block ---
-L_109062c:
-// 0x0109062c: 0x109062c: addiu v0, zero, -1
+L_1090c50:
+// 0x01090c50: 0x1090c50: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01090630: 0x1090630: beq   v1, v0, 0x1090674 lui   v1, 0x0
+// 0x01090c54: 0x1090c54: beq   v1, v0, 0x1090c98 lui   v1, 0x0
 	ldloc 7
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	beq  L_1090674
+	beq  L_1090c98
 // --- basic block ---
-// 0x01090638: 0x1090638: addiu v1, v1, 17480
+// 0x01090c5c: 0x1090c5c: addiu v1, v1, 17480
 	ldloc 7
 	ldc.i4 17480
 	add
 	stloc 7
-// 0x0109063c: 0x109063c: lw    a0, 8(v1)
+// 0x01090c60: 0x1090c60: lw    a0, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5489,15 +5489,15 @@ L_109062c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01090640: 0x1090640: sll   zero, zero, 0
-// 0x01090644: 0x1090644: beq   a0, v0, 0x1090678 lui   a0, 0x0
+// 0x01090c64: 0x1090c64: sll   zero, zero, 0
+// 0x01090c68: 0x1090c68: beq   a0, v0, 0x1090c9c lui   a0, 0x0
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	beq  L_1090678
+	beq  L_1090c9c
 // --- basic block ---
-// 0x0109064c: 0x109064c: lw    a0, 4(v1)
+// 0x01090c70: 0x1090c70: lw    a0, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5506,15 +5506,15 @@ L_109062c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01090650: 0x1090650: sll   zero, zero, 0
-// 0x01090654: 0x1090654: beq   a0, v0, 0x1090678 lui   a0, 0x0
+// 0x01090c74: 0x1090c74: sll   zero, zero, 0
+// 0x01090c78: 0x1090c78: beq   a0, v0, 0x1090c9c lui   a0, 0x0
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	beq  L_1090678
+	beq  L_1090c9c
 // --- basic block ---
-// 0x0109065c: 0x109065c: lw    v1, 12(v1)
+// 0x01090c80: 0x1090c80: lw    v1, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5523,43 +5523,43 @@ L_109062c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090660: 0x1090660: sll   zero, zero, 0
-// 0x01090664: 0x1090664: beq   v1, v0, 0x109067c addu  a1, s2, zero
+// 0x01090c84: 0x1090c84: sll   zero, zero, 0
+// 0x01090c88: 0x1090c88: beq   v1, v0, 0x1090ca0 addu  a1, s2, zero
 	ldloc 7
 	ldloc 6
 	ldloc 8
 	stloc.2
-	beq  L_109067c
+	beq  L_1090ca0
 // --- basic block ---
-// 0x0109066c: 0x109066c: jal   0x1054df8 sll   zero, zero, 0
+// 0x01090c90: 0x1090c90: jal   0x1054e08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_hide_1054df8(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_hide_1054e08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1090674:
-// 0x01090674: 0x1090674: lui   a0, 0x0
+L_1090c98:
+// 0x01090c98: 0x1090c98: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1090678:
-// 0x01090678: 0x1090678: addu  a1, s2, zero
+L_1090c9c:
+// 0x01090c9c: 0x1090c9c: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-L_109067c:
-// 0x0109067c: 0x109067c: addiu a0, a0, 17480
+L_1090ca0:
+// 0x01090ca0: 0x1090ca0: addiu a0, a0, 17480
 	ldloc.1
 	ldc.i4 17480
 	add
 	stloc.1
-// 0x01090680: 0x1090680: addiu a2, zero, 16
+// 0x01090ca4: 0x1090ca4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01090684: 0x1090684: jal   0x1001800 addiu s1, sp, 56
+// 0x01090ca8: 0x1090ca8: jal   0x1001800 addiu s1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5573,19 +5573,19 @@ L_109067c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109068c: 0x109068c: addu  a1, s2, zero
+// 0x01090cb0: 0x1090cb0: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x01090690: 0x1090690: addu  a0, s1, zero
+// 0x01090cb4: 0x1090cb4: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x01090694: 0x1090694: addiu a2, zero, 16
+// 0x01090cb8: 0x1090cb8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01090698: 0x1090698: addiu v0, zero, 96
+// 0x01090cbc: 0x1090cbc: addiu v0, zero, 96
 	ldc.i4.s 96
 	stloc 6
-// 0x0109069c: 0x109069c: jal   0x1001800 sw    v0, 2120(sp)
+// 0x01090cc0: 0x1090cc0: jal   0x1001800 sw    v0, 2120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5603,7 +5603,7 @@ L_109067c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010906a4: 0x10906a4: lw    s5, 12(s2)
+// 0x01090cc8: 0x1090cc8: lw    s5, 12(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5612,7 +5612,7 @@ L_109067c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010906a8: 0x10906a8: lw    s6, 8(s2)
+// 0x01090ccc: 0x1090ccc: lw    s6, 8(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5621,7 +5621,7 @@ L_109067c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010906ac: 0x10906ac: lw    v1, 4(s2)
+// 0x01090cd0: 0x1090cd0: lw    v1, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5630,29 +5630,29 @@ L_109067c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010906b0: 0x10906b0: lw    v0, 0(s2)
+// 0x01090cd4: 0x1090cd4: lw    v0, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010906b4: 0x10906b4: addiu s5, s5, 1
+// 0x01090cd8: 0x1090cd8: addiu s5, s5, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x010906b8: 0x10906b8: addiu s6, s6, 1
+// 0x01090cdc: 0x1090cdc: addiu s6, s6, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010906bc: 0x10906bc: subu  s5, s5, v1
+// 0x01090ce0: 0x1090ce0: subu  s5, s5, v1
 	ldloc 10
 	ldloc 7
 	sub
 	stloc 10
-// 0x010906c0: 0x10906c0: jal   0x108f9b4 subu  s6, s6, v0
+// 0x01090ce4: 0x1090ce4: jal   0x108ffd8 subu  s6, s6, v0
 	ldloc 11
 	ldloc 6
 	sub
@@ -5662,12 +5662,12 @@ L_109067c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_GetUrl_108f9b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::RealtimeExternalPoi_GetUrl_108ffd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010906c8: 0x10906c8: lw    v1, 8(s0)
+// 0x01090cec: 0x1090cec: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5676,7 +5676,7 @@ L_109067c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010906cc: 0x10906cc: sw    v0, 2200(sp)
+// 0x01090cf0: 0x1090cf0: sw    v0, 2200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5685,7 +5685,7 @@ L_109067c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010906d0: 0x10906d0: jal   0x106ab1c sw    v1, 2204(sp)
+// 0x01090cf4: 0x1090cf4: jal   0x106b140 sw    v1, 2204(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5694,16 +5694,16 @@ L_109067c:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 6
 // --- basic block ---
-// 0x010906d8: 0x10906d8: jal   0x106ab10 addu  s8, v0, zero
+// 0x01090cfc: 0x1090cfc: jal   0x106b134 addu  s8, v0, zero
 	ldloc 6
 	stloc 16
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 6
 // --- basic block ---
-// 0x010906e0: 0x10906e0: jal   0x102c3f0 addu  s7, v0, zero
+// 0x01090d04: 0x1090d04: jal   0x102c400 addu  s7, v0, zero
 	ldloc 6
 	stloc 15
 	ldloc.0
@@ -5711,12 +5711,12 @@ L_109067c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010906e8: 0x10906e8: jal   0x101d484 addu  s4, v0, zero
+// 0x01090d0c: 0x1090d0c: jal   0x101d494 addu  s4, v0, zero
 	ldloc 6
 	stloc 14
 	ldloc.0
@@ -5724,12 +5724,12 @@ L_109067c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010906f0: 0x10906f0: jal   0x1020318 addu  s3, v0, zero
+// 0x01090d14: 0x1090d14: jal   0x1020328 addu  s3, v0, zero
 	ldloc 6
 	stloc 13
 	ldloc.0
@@ -5737,12 +5737,12 @@ L_109067c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::is_screen_wide_1020318(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::is_screen_wide_1020328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010906f8: 0x10906f8: lw    v1, 2204(sp)
+// 0x01090d1c: 0x1090d1c: lw    v1, 2204(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5751,10 +5751,10 @@ L_109067c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010906fc: 0x10906fc: lui   s2, 0x80000
+// 0x01090d20: 0x1090d20: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01090700: 0x1090700: lw    a3, 2200(sp)
+// 0x01090d24: 0x1090d24: lw    a3, 2200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5763,28 +5763,28 @@ L_109067c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01090704: 0x1090704: lui   a2, 0x20000
+// 0x01090d28: 0x1090d28: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01090708: 0x1090708: sltiu v0, v0, 1
+// 0x01090d2c: 0x1090d2c: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x0109070c: 0x109070c: addiu a2, a2, -4252
+// 0x01090d30: 0x1090d30: addiu a2, a2, -3788
 	ldloc.3
-	ldc.i4 -4252
+	ldc.i4 -3788
 	add
 	stloc.3
-// 0x01090710: 0x1090710: addiu a0, s2, 8556
+// 0x01090d34: 0x1090d34: addiu a0, s2, 9020
 	ldloc 8
-	ldc.i4 8556
+	ldc.i4 9020
 	add
 	stloc.1
-// 0x01090714: 0x1090714: addiu a1, zero, 1024
+// 0x01090d38: 0x1090d38: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x01090718: 0x1090718: sw    v1, 16(sp)
+// 0x01090d3c: 0x1090d3c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5793,15 +5793,15 @@ L_109067c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109071c: 0x109071c: addiu s0, s0, 48
+// 0x01090d40: 0x1090d40: addiu s0, s0, 48
 	ldloc 9
 	ldc.i4.s 48
 	add
 	stloc 9
-// 0x01090720: 0x1090720: addiu v1, zero, 70
+// 0x01090d44: 0x1090d44: addiu v1, zero, 70
 	ldc.i4.s 70
 	stloc 7
-// 0x01090724: 0x1090724: sw    v1, 28(sp)
+// 0x01090d48: 0x1090d48: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5810,7 +5810,7 @@ L_109067c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01090728: 0x1090728: sw    s8, 20(sp)
+// 0x01090d4c: 0x1090d4c: sw    s8, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5819,7 +5819,7 @@ L_109067c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109072c: 0x109072c: sw    s7, 24(sp)
+// 0x01090d50: 0x1090d50: sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5828,7 +5828,7 @@ L_109067c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01090730: 0x1090730: sw    s6, 32(sp)
+// 0x01090d54: 0x1090d54: sw    s6, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5837,7 +5837,7 @@ L_109067c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01090734: 0x1090734: sw    s5, 36(sp)
+// 0x01090d58: 0x1090d58: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5846,7 +5846,7 @@ L_109067c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01090738: 0x1090738: sw    s4, 40(sp)
+// 0x01090d5c: 0x1090d5c: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5855,7 +5855,7 @@ L_109067c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109073c: 0x109073c: sw    s3, 44(sp)
+// 0x01090d60: 0x1090d60: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5864,7 +5864,7 @@ L_109067c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01090740: 0x1090740: sw    v0, 48(sp)
+// 0x01090d64: 0x1090d64: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5873,7 +5873,7 @@ L_109067c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01090744: 0x1090744: jal   0x1000f9c sw    s0, 52(sp)
+// 0x01090d68: 0x1090d68: jal   0x1000f9c sw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5892,17 +5892,17 @@ L_109067c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109074c: 0x109074c: addiu a0, sp, 72
+// 0x01090d70: 0x1090d70: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x01090750: 0x1090750: addiu a1, s2, 8556
+// 0x01090d74: 0x1090d74: addiu a1, s2, 9020
 	ldloc 8
-	ldc.i4 8556
+	ldc.i4 9020
 	add
 	stloc.2
-// 0x01090754: 0x1090754: jal   0x1001af8 addiu a2, zero, 2048
+// 0x01090d78: 0x1090d78: jal   0x1001af8 addiu a2, zero, 2048
 	ldc.i4 2048
 	stloc.3
 	ldloc.1
@@ -5911,16 +5911,16 @@ L_109067c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0109075c: 0x109075c: addu  a0, s1, zero
+// 0x01090d80: 0x1090d80: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x01090760: 0x1090760: sb    zero, 2119(sp)
+// 0x01090d84: 0x1090d84: sb    zero, 2119(sp)
 	ldloc.0
 	ldc.i4 2119
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01090764: 0x1090764: sw    zero, 2192(sp)
+// 0x01090d88: 0x1090d88: sw    zero, 2192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5929,7 +5929,7 @@ L_109067c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01090768: 0x1090768: jal   0x1054f38 sw    zero, 2124(sp)
+// 0x01090d8c: 0x1090d8c: jal   0x1054f48 sw    zero, 2124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5943,14 +5943,14 @@ L_109067c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_show_embeded_1054f38(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_show_embeded_1054f48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1090770:
-// 0x01090770: 0x1090770: lw    ra, 2244(sp)
-// 0x01090774: 0x1090774: lw    s8, 2240(sp)
+L_1090d94:
+// 0x01090d94: 0x1090d94: lw    ra, 2244(sp)
+// 0x01090d98: 0x1090d98: lw    s8, 2240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5959,7 +5959,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01090778: 0x1090778: lw    s7, 2236(sp)
+// 0x01090d9c: 0x1090d9c: lw    s7, 2236(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5968,7 +5968,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109077c: 0x109077c: lw    s6, 2232(sp)
+// 0x01090da0: 0x1090da0: lw    s6, 2232(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5977,7 +5977,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01090780: 0x1090780: lw    s5, 2228(sp)
+// 0x01090da4: 0x1090da4: lw    s5, 2228(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5986,7 +5986,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01090784: 0x1090784: lw    s4, 2224(sp)
+// 0x01090da8: 0x1090da8: lw    s4, 2224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5995,7 +5995,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01090788: 0x1090788: lw    s3, 2220(sp)
+// 0x01090dac: 0x1090dac: lw    s3, 2220(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6004,7 +6004,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109078c: 0x109078c: lw    s2, 2216(sp)
+// 0x01090db0: 0x1090db0: lw    s2, 2216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6013,7 +6013,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090790: 0x1090790: lw    s1, 2212(sp)
+// 0x01090db4: 0x1090db4: lw    s1, 2212(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6022,7 +6022,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01090794: 0x1090794: lw    s0, 2208(sp)
+// 0x01090db8: 0x1090db8: lw    s0, 2208(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6031,7 +6031,7 @@ L_1090770:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01090798: 0x1090798: jr    ra addiu sp, sp, 2248
+// 0x01090dbc: 0x1090dbc: jr    ra addiu sp, sp, 2248
 	ldloc.0
 	ldc.i4 2248
 	add
@@ -6043,7 +6043,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_Count_10907a0()
+.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_Count_1090dc4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6060,25 +6060,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010907a0: 0x10907a0: lui   v0, 0xf0000
+// 0x01090dc4: 0x1090dc4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc.0
-// 0x010907a4: 0x10907a4: lw    v0, -23348(v0)
+// 0x01090dc8: 0x1090dc8: lw    v0, -22884(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5837
+	ldc.i4 -5721
 	add
 	ldelem.i4
 	stloc.0
-// 0x010907a8: 0x10907a8: jr    ra sll   zero, zero, 0
+// 0x01090dcc: 0x1090dcc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RealtimeExternalPoi_DisplayedList_get_ID_10907b0(int32)
+.method public static int32 RealtimeExternalPoi_DisplayedList_get_ID_1090dd4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -6098,38 +6098,38 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010907b0: 0x10907b0: lui   v0, 0xf0000
+// 0x01090dd4: 0x1090dd4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x010907b4: 0x10907b4: addiu v0, v0, -25348
+// 0x01090dd8: 0x1090dd8: addiu v0, v0, -24884
 	ldloc.1
-	ldc.i4 -25348
+	ldc.i4 -24884
 	add
 	stloc.1
-// 0x010907b8: 0x10907b8: sll   a0, a0, 2
+// 0x01090ddc: 0x1090ddc: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-// 0x010907bc: 0x10907bc: addu  a0, a0, v0
+// 0x01090de0: 0x1090de0: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x010907c0: 0x10907c0: lw    v0, 0(a0)
+// 0x01090de4: 0x1090de4: lw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010907c4: 0x10907c4: jr    ra sll   zero, zero, 0
+// 0x01090de8: 0x1090de8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_10907cc()
+.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_1090df0()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6146,19 +6146,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010907cc: 0x10907cc: lui   v0, 0xf0000
+// 0x01090df0: 0x1090df0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc.0
-// 0x010907d0: 0x10907d0: lw    v0, -23348(v0)
+// 0x01090df4: 0x1090df4: lw    v0, -22884(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5837
+	ldc.i4 -5721
 	add
 	ldelem.i4
 	stloc.0
-// 0x010907d4: 0x10907d4: jr    ra sltiu v0, v0, 1
+// 0x01090df8: 0x1090df8: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -6168,7 +6168,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RealtimeExternalPoiNotifier_NotifyOnNavigate_10907dc(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoiNotifier_NotifyOnNavigate_1090e00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -6206,18 +6206,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010907dc: 0x10907dc: addiu sp, sp, -32
+// 0x01090e00: 0x1090e00: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010907e0: 0x10907e0: lui   a1, 0x20000
+// 0x01090e04: 0x1090e04: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010907e4: 0x10907e4: lui   a3, 0x20000
+// 0x01090e08: 0x1090e08: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010907e8: 0x10907e8: sw    s0, 24(sp)
+// 0x01090e0c: 0x1090e0c: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6226,27 +6226,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010907ec: 0x10907ec: addiu a1, a1, -4152
+// 0x01090e10: 0x1090e10: addiu a1, a1, -3688
 	ldloc.2
-	ldc.i4 -4152
+	ldc.i4 -3688
 	add
 	stloc.2
-// 0x010907f0: 0x10907f0: addu  s0, a0, zero
+// 0x01090e14: 0x1090e14: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010907f4: 0x10907f4: addiu a3, a3, -4100
+// 0x01090e18: 0x1090e18: addiu a3, a3, -3636
 	ldloc 4
-	ldc.i4 -4100
+	ldc.i4 -3636
 	add
 	stloc 4
-// 0x010907f8: 0x10907f8: addiu a0, zero, 1
+// 0x01090e1c: 0x1090e1c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010907fc: 0x10907fc: addiu a2, zero, 86
+// 0x01090e20: 0x1090e20: addiu a2, zero, 86
 	ldc.i4.s 86
 	stloc.3
-// 0x01090800: 0x1090800: sw    ra, 28(sp)
-// 0x01090804: 0x1090804: jal   0x100449c sw    s0, 16(sp)
+// 0x01090e24: 0x1090e24: sw    ra, 28(sp)
+// 0x01090e28: 0x1090e28: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6265,7 +6265,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109080c: 0x109080c: jal   0x106b2f8 addu  a0, s0, zero
+// 0x01090e30: 0x1090e30: jal   0x106b91c addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6273,13 +6273,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_ExternalPoiNotifyOnNavigate_106b2f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ExternalPoiNotifyOnNavigate_106b91c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01090814: 0x1090814: lw    ra, 28(sp)
-// 0x01090818: 0x1090818: lw    s0, 24(sp)
+// 0x01090e38: 0x1090e38: lw    ra, 28(sp)
+// 0x01090e3c: 0x1090e3c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6288,7 +6288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109081c: 0x109081c: jr    ra addiu sp, sp, 32
+// 0x01090e40: 0x1090e40: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6300,7 +6300,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 RealtimeExternalPoiNotifier_NotifyOnPopUp_1090824(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoiNotifier_NotifyOnPopUp_1090e48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -6338,18 +6338,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090824: 0x1090824: addiu sp, sp, -32
+// 0x01090e48: 0x1090e48: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01090828: 0x1090828: lui   a1, 0x20000
+// 0x01090e4c: 0x1090e4c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109082c: 0x109082c: lui   a3, 0x20000
+// 0x01090e50: 0x1090e50: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01090830: 0x1090830: sw    s0, 24(sp)
+// 0x01090e54: 0x1090e54: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6358,27 +6358,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090834: 0x1090834: addiu a1, a1, -4152
+// 0x01090e58: 0x1090e58: addiu a1, a1, -3688
 	ldloc.2
-	ldc.i4 -4152
+	ldc.i4 -3688
 	add
 	stloc.2
-// 0x01090838: 0x1090838: addu  s0, a0, zero
+// 0x01090e5c: 0x1090e5c: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0109083c: 0x109083c: addiu a3, a3, -4028
+// 0x01090e60: 0x1090e60: addiu a3, a3, -3564
 	ldloc 4
-	ldc.i4 -4028
+	ldc.i4 -3564
 	add
 	stloc 4
-// 0x01090840: 0x1090840: addiu a0, zero, 1
+// 0x01090e64: 0x1090e64: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01090844: 0x1090844: addiu a2, zero, 80
+// 0x01090e68: 0x1090e68: addiu a2, zero, 80
 	ldc.i4.s 80
 	stloc.3
-// 0x01090848: 0x1090848: sw    ra, 28(sp)
-// 0x0109084c: 0x109084c: jal   0x100449c sw    s0, 16(sp)
+// 0x01090e6c: 0x1090e6c: sw    ra, 28(sp)
+// 0x01090e70: 0x1090e70: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6397,7 +6397,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01090854: 0x1090854: jal   0x106b354 addu  a0, s0, zero
+// 0x01090e78: 0x1090e78: jal   0x106b978 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6405,13 +6405,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_ExternalPoiNotifyOnPopUp_106b354(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ExternalPoiNotifyOnPopUp_106b978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109085c: 0x109085c: lw    ra, 28(sp)
-// 0x01090860: 0x1090860: lw    s0, 24(sp)
+// 0x01090e80: 0x1090e80: lw    ra, 28(sp)
+// 0x01090e84: 0x1090e84: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6420,7 +6420,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090864: 0x1090864: jr    ra addiu sp, sp, 32
+// 0x01090e88: 0x1090e88: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6432,7 +6432,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_add_ID_109086c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_add_ID_1090e90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6467,15 +6467,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109086c: 0x109086c: lui   v0, 0xf0000
+// 0x01090e90: 0x1090e90: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01090870: 0x1090870: addiu v0, v0, -25348
+// 0x01090e94: 0x1090e94: addiu v0, v0, -24884
 	ldloc 5
-	ldc.i4 -25348
+	ldc.i4 -24884
 	add
 	stloc 5
-// 0x01090874: 0x1090874: lw    v1, 2000(v0)
+// 0x01090e98: 0x1090e98: lw    v1, 2000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6484,43 +6484,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01090878: 0x1090878: addiu sp, sp, -24
+// 0x01090e9c: 0x1090e9c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109087c: 0x109087c: slti  a1, v1, 500
+// 0x01090ea0: 0x1090ea0: slti  a1, v1, 500
 	ldloc 6
 	ldc.i4 500
 	clt
 	stloc.2
-// 0x01090880: 0x1090880: beq   a1, zero, 0x10908a0 sw    ra, 20(sp)
+// 0x01090ea4: 0x1090ea4: beq   a1, zero, 0x1090ec4 sw    ra, 20(sp)
 	ldloc.2
-	brfalse L_10908a0
+	brfalse L_1090ec4
 // --- basic block ---
-// 0x01090888: 0x1090888: sll   a1, v1, 2
+// 0x01090eac: 0x1090eac: sll   a1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0109088c: 0x109088c: addu  a1, a1, v0
+// 0x01090eb0: 0x1090eb0: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x01090890: 0x1090890: addiu v1, v1, 1
+// 0x01090eb4: 0x1090eb4: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01090894: 0x1090894: sw    a0, 0(a1)
+// 0x01090eb8: 0x1090eb8: sw    a0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01090898: 0x1090898: j	 0x10908c4 sw    v1, 2000(v0)
+// 0x01090ebc: 0x1090ebc: j	 0x1090ee8 sw    v1, 2000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6529,29 +6529,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10908c4
+	br L_1090ee8
 // --- basic block ---
-L_10908a0:
-// 0x010908a0: 0x10908a0: lui   a1, 0x20000
+L_1090ec4:
+// 0x01090ec4: 0x1090ec4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010908a4: 0x10908a4: lui   a3, 0x20000
+// 0x01090ec8: 0x1090ec8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010908a8: 0x10908a8: addiu a0, zero, 1
+// 0x01090ecc: 0x1090ecc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010908ac: 0x10908ac: addiu a1, a1, -4152
+// 0x01090ed0: 0x1090ed0: addiu a1, a1, -3688
 	ldloc.2
-	ldc.i4 -4152
+	ldc.i4 -3688
 	add
 	stloc.2
-// 0x010908b0: 0x10908b0: addiu a3, a3, -3960
+// 0x01090ed4: 0x1090ed4: addiu a3, a3, -3496
 	ldloc 4
-	ldc.i4 -3960
+	ldc.i4 -3496
 	add
 	stloc 4
-// 0x010908b4: 0x10908b4: jal   0x100449c addiu a2, zero, 73
+// 0x01090ed8: 0x1090ed8: jal   0x100449c addiu a2, zero, 73
 	ldc.i4.s 73
 	stloc.3
 	ldloc.0
@@ -6564,7 +6564,7 @@ L_10908a0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010908bc: 0x10908bc: jal   0x106e560 addu  a0, zero, zero
+// 0x01090ee0: 0x1090ee0: jal   0x106eb84 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6572,15 +6572,15 @@ L_10908a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_ExternalPoiDisplayed_106e560(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_ExternalPoiDisplayed_106eb84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10908c4:
-// 0x010908c4: 0x10908c4: lw    ra, 20(sp)
-// 0x010908c8: 0x10908c8: sll   zero, zero, 0
-// 0x010908cc: 0x10908cc: jr    ra addiu sp, sp, 24
+L_1090ee8:
+// 0x01090ee8: 0x1090ee8: lw    ra, 20(sp)
+// 0x01090eec: 0x1090eec: sll   zero, zero, 0
+// 0x01090ef0: 0x1090ef0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6592,7 +6592,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_Init_10908d4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_Init_1090ef8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6627,26 +6627,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010908d4: 0x10908d4: addiu sp, sp, -24
+// 0x01090ef8: 0x1090ef8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010908d8: 0x10908d8: sw    ra, 20(sp)
-// 0x010908dc: 0x10908dc: jal   0x108f1dc sll   zero, zero, 0
+// 0x01090efc: 0x1090efc: sw    ra, 20(sp)
+// 0x01090f00: 0x1090f00: jal   0x108f800 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_clear_108f1dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeExternalPoi_DisplayList_clear_108f800(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010908e4: 0x10908e4: lw    ra, 20(sp)
-// 0x010908e8: 0x10908e8: sll   zero, zero, 0
-// 0x010908ec: 0x10908ec: jr    ra addiu sp, sp, 24
+// 0x01090f08: 0x1090f08: lw    ra, 20(sp)
+// 0x01090f0c: 0x1090f0c: sll   zero, zero, 0
+// 0x01090f10: 0x1090f10: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6658,7 +6658,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_clear_10908f4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeExternalPoiNotifier_DisplayedList_clear_1090f18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6693,24 +6693,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010908f4: 0x10908f4: lui   a0, 0xf0000
+// 0x01090f18: 0x1090f18: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x010908f8: 0x10908f8: addiu sp, sp, -24
+// 0x01090f1c: 0x1090f1c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010908fc: 0x10908fc: addiu a0, a0, -25348
+// 0x01090f20: 0x1090f20: addiu a0, a0, -24884
 	ldloc.1
-	ldc.i4 -25348
+	ldc.i4 -24884
 	add
 	stloc.1
-// 0x01090900: 0x1090900: addu  a1, zero, zero
+// 0x01090f24: 0x1090f24: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01090904: 0x1090904: sw    ra, 20(sp)
-// 0x01090908: 0x1090908: jal   0x100177c addiu a2, zero, 2004
+// 0x01090f28: 0x1090f28: sw    ra, 20(sp)
+// 0x01090f2c: 0x1090f2c: jal   0x100177c addiu a2, zero, 2004
 	ldc.i4 2004
 	stloc.3
 	ldloc.1
@@ -6722,9 +6722,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01090910: 0x1090910: lw    ra, 20(sp)
-// 0x01090914: 0x1090914: sll   zero, zero, 0
-// 0x01090918: 0x1090918: jr    ra addiu sp, sp, 24
+// 0x01090f34: 0x1090f34: lw    ra, 20(sp)
+// 0x01090f38: 0x1090f38: sll   zero, zero, 0
+// 0x01090f3c: 0x1090f3c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6736,7 +6736,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_button_on_key_pressed_1090920(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_on_key_pressed_1090f44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -6771,7 +6771,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090920: 0x1090920: lw    v1, 164(a0)
+// 0x01090f44: 0x1090f44: lw    v1, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6780,50 +6780,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090924: 0x1090924: addiu sp, sp, -24
+// 0x01090f48: 0x1090f48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01090928: 0x1090928: lw    v1, 0(v1)
+// 0x01090f4c: 0x1090f4c: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109092c: 0x109092c: addiu a3, zero, 2
+// 0x01090f50: 0x1090f50: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x01090930: 0x1090930: beq   v1, a3, 0x109096c sw    ra, 20(sp)
+// 0x01090f54: 0x1090f54: beq   v1, a3, 0x1090f90 sw    ra, 20(sp)
 	ldloc 5
 	ldloc 4
-	beq  L_109096c
+	beq  L_1090f90
 // --- basic block ---
-// 0x01090938: 0x1090938: andi  a2, a2, 2
+// 0x01090f5c: 0x1090f5c: andi  a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc.3
-// 0x0109093c: 0x109093c: beq   a2, zero, 0x109096c addiu v1, zero, 13
+// 0x01090f60: 0x1090f60: beq   a2, zero, 0x1090f90 addiu v1, zero, 13
 	ldloc.3
 	ldc.i4.s 13
 	stloc 5
-	brfalse L_109096c
+	brfalse L_1090f90
 // --- basic block ---
-// 0x01090944: 0x1090944: lb    a1, 0(a1)
+// 0x01090f68: 0x1090f68: lb    a1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01090948: 0x1090948: sll   zero, zero, 0
-// 0x0109094c: 0x109094c: bne   a1, v1, 0x109096c lui   a1, 0x20000
+// 0x01090f6c: 0x1090f6c: sll   zero, zero, 0
+// 0x01090f70: 0x1090f70: bne   a1, v1, 0x1090f90 lui   a1, 0x20000
 	ldloc.2
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	bne.un L_109096c
+	bne.un L_1090f90
 // --- basic block ---
-// 0x01090954: 0x1090954: lw    v0, 112(a0)
+// 0x01090f78: 0x1090f78: lw    v0, 112(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6832,11 +6832,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090958: 0x1090958: sll   zero, zero, 0
-// 0x0109095c: 0x109095c: jalr  v0 addiu a1, a1, -3888
+// 0x01090f7c: 0x1090f7c: sll   zero, zero, 0
+// 0x01090f80: 0x1090f80: jalr  v0 addiu a1, a1, -3424
 	ldloc 7
 	ldloc.2
-	ldc.i4 -3888
+	ldc.i4 -3424
 	add
 	stloc.2
 	ldloc.0
@@ -6849,19 +6849,19 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01090964: 0x1090964: j	 0x1090970 addiu v0, zero, 1
+// 0x01090f88: 0x1090f88: j	 0x1090f94 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1090970
+	br L_1090f94
 // --- basic block ---
-L_109096c:
-// 0x0109096c: 0x109096c: addu  v0, zero, zero
+L_1090f90:
+// 0x01090f90: 0x1090f90: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1090970:
-// 0x01090970: 0x1090970: lw    ra, 20(sp)
-// 0x01090974: 0x1090974: sll   zero, zero, 0
-// 0x01090978: 0x1090978: jr    ra addiu sp, sp, 24
+L_1090f94:
+// 0x01090f94: 0x1090f94: lw    ra, 20(sp)
+// 0x01090f98: 0x1090f98: sll   zero, zero, 0
+// 0x01090f9c: 0x1090f9c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6873,7 +6873,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_button_enable_109098c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_enable_1090fb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6908,16 +6908,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109098c: 0x109098c: addiu sp, sp, -24
+// 0x01090fb0: 0x1090fb0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01090990: 0x1090990: beq   a0, zero, 0x10909d0 sw    ra, 20(sp)
+// 0x01090fb4: 0x1090fb4: beq   a0, zero, 0x1090ff4 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_10909d0
+	brfalse L_1090ff4
 // --- basic block ---
-// 0x01090998: 0x1090998: lw    v0, 164(a0)
+// 0x01090fbc: 0x1090fbc: lw    v0, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6926,23 +6926,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109099c: 0x109099c: sll   zero, zero, 0
-// 0x010909a0: 0x10909a0: beq   v0, zero, 0x10909ac sll   zero, zero, 0
+// 0x01090fc0: 0x1090fc0: sll   zero, zero, 0
+// 0x01090fc4: 0x1090fc4: beq   v0, zero, 0x1090fd0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10909ac
+	brfalse L_1090fd0
 // --- basic block ---
-// 0x010909a8: 0x10909a8: sw    zero, 0(v0)
+// 0x01090fcc: 0x1090fcc: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10909ac:
-// 0x010909ac: 0x10909ac: lui   a1, 0x10000
+L_1090fd0:
+// 0x01090fd0: 0x1090fd0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010909b0: 0x10909b0: jal   0x109b304 addiu a1, a1, -32516
+// 0x01090fd4: 0x1090fd4: jal   0x109b94c addiu a1, a1, -32516
 	ldloc.2
 	ldc.i4 -32516
 	add
@@ -6952,37 +6952,37 @@ L_10909ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010909b8: 0x10909b8: beq   v0, zero, 0x10909d0 lui   a1, 0x0
+// 0x01090fdc: 0x1090fdc: beq   v0, zero, 0x1090ff4 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10909d0
+	brfalse L_1090ff4
 // --- basic block ---
-// 0x010909c0: 0x10909c0: addiu a1, a1, 23008
+// 0x01090fe4: 0x1090fe4: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010909c4: 0x10909c4: addu  a0, v0, zero
+// 0x01090fe8: 0x1090fe8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010909c8: 0x10909c8: jal   0x1098fe0 addu  a2, a1, zero
+// 0x01090fec: 0x1090fec: jal   0x1099628 addu  a2, a1, zero
 	ldloc.2
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_10909d0:
-// 0x010909d0: 0x10909d0: lw    ra, 20(sp)
-// 0x010909d4: 0x10909d4: sll   zero, zero, 0
-// 0x010909d8: 0x10909d8: jr    ra addiu sp, sp, 24
+L_1090ff4:
+// 0x01090ff4: 0x1090ff4: lw    ra, 20(sp)
+// 0x01090ff8: 0x1090ff8: sll   zero, zero, 0
+// 0x01090ffc: 0x1090ffc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6994,7 +6994,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_button_disable_10909e0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_disable_1091004(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -7029,16 +7029,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010909e0: 0x10909e0: addiu sp, sp, -24
+// 0x01091004: 0x1091004: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010909e4: 0x10909e4: beq   a0, zero, 0x1090a24 sw    ra, 20(sp)
+// 0x01091008: 0x1091008: beq   a0, zero, 0x1091048 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1090a24
+	brfalse L_1091048
 // --- basic block ---
-// 0x010909ec: 0x10909ec: lw    v0, 164(a0)
+// 0x01091010: 0x1091010: lw    v0, 164(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7047,25 +7047,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010909f0: 0x10909f0: sll   zero, zero, 0
-// 0x010909f4: 0x10909f4: beq   v0, zero, 0x1090a00 addiu v1, zero, 2
+// 0x01091014: 0x1091014: sll   zero, zero, 0
+// 0x01091018: 0x1091018: beq   v0, zero, 0x1091024 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_1090a00
+	brfalse L_1091024
 // --- basic block ---
-// 0x010909fc: 0x10909fc: sw    v1, 0(v0)
+// 0x01091020: 0x1091020: sw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_1090a00:
-// 0x01090a00: 0x1090a00: lui   a1, 0x10000
+L_1091024:
+// 0x01091024: 0x1091024: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01090a04: 0x1090a04: jal   0x109b304 addiu a1, a1, -32516
+// 0x01091028: 0x1091028: jal   0x109b94c addiu a1, a1, -32516
 	ldloc.2
 	ldc.i4 -32516
 	add
@@ -7075,37 +7075,37 @@ L_1090a00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01090a0c: 0x1090a0c: beq   v0, zero, 0x1090a24 lui   a1, 0x20000
+// 0x01091030: 0x1091030: beq   v0, zero, 0x1091048 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1090a24
+	brfalse L_1091048
 // --- basic block ---
-// 0x01090a14: 0x1090a14: addiu a1, a1, -3876
+// 0x01091038: 0x1091038: addiu a1, a1, -3412
 	ldloc.2
-	ldc.i4 -3876
+	ldc.i4 -3412
 	add
 	stloc.2
-// 0x01090a18: 0x1090a18: addu  a0, v0, zero
+// 0x0109103c: 0x109103c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01090a1c: 0x1090a1c: jal   0x1098fe0 addu  a2, a1, zero
+// 0x01091040: 0x1091040: jal   0x1099628 addu  a2, a1, zero
 	ldloc.2
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1090a24:
-// 0x01090a24: 0x1090a24: lw    ra, 20(sp)
-// 0x01090a28: 0x1090a28: sll   zero, zero, 0
-// 0x01090a2c: 0x1090a2c: jr    ra addiu sp, sp, 24
+L_1091048:
+// 0x01091048: 0x1091048: lw    ra, 20(sp)
+// 0x0109104c: 0x109104c: sll   zero, zero, 0
+// 0x01091050: 0x1091050: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7117,7 +7117,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_state_1090a34(int32,int32,int32,int32,int32)
+.method public static int32 get_state_1091058(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s1,int32 s3,int32 v1,int32 s0,int32 ra)
@@ -7164,7 +7164,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090a34: 0x1090a34: lw    v0, 60(a0)
+// 0x01091058: 0x1091058: lw    v0, 60(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7173,12 +7173,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01090a38: 0x1090a38: addiu sp, sp, -48
+// 0x0109105c: 0x109105c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01090a3c: 0x1090a3c: sw    s0, 28(sp)
+// 0x01091060: 0x1091060: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7187,8 +7187,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01090a40: 0x1090a40: sw    ra, 44(sp)
-// 0x01090a44: 0x1090a44: sw    s3, 40(sp)
+// 0x01091064: 0x1091064: sw    ra, 44(sp)
+// 0x01091068: 0x1091068: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7197,7 +7197,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01090a48: 0x1090a48: sw    s2, 36(sp)
+// 0x0109106c: 0x109106c: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7206,7 +7206,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01090a4c: 0x1090a4c: sw    s1, 32(sp)
+// 0x01091070: 0x1091070: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7215,7 +7215,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090a50: 0x1090a50: lw    v1, 164(a0)
+// 0x01091074: 0x1091074: lw    v1, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7224,129 +7224,129 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01090a54: 0x1090a54: beq   v0, zero, 0x1090a64 addu  s0, a2, zero
+// 0x01091078: 0x1091078: beq   v0, zero, 0x1091088 addu  s0, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 11
-	brfalse L_1090a64
+	brfalse L_1091088
 // --- basic block ---
-// 0x01090a5c: 0x1090a5c: j	 0x1090a6c addiu v0, zero, 1
+// 0x01091080: 0x1091080: j	 0x1091090 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_1090a6c
+	br L_1091090
 // --- basic block ---
-L_1090a64:
-// 0x01090a64: 0x1090a64: lw    v0, 0(v1)
+L_1091088:
+// 0x01091088: 0x1091088: lw    v0, 0(v1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01090a68: 0x1090a68: sll   zero, zero, 0
-L_1090a6c:
-// 0x01090a6c: 0x1090a6c: sw    v0, 0(a1)
+// 0x0109108c: 0x109108c: sll   zero, zero, 0
+L_1091090:
+// 0x01091090: 0x1091090: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01090a70: 0x1090a70: lw    v0, 0(v1)
+// 0x01091094: 0x1091094: lw    v0, 0(v1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01090a74: 0x1090a74: addiu a0, zero, 2
+// 0x01091098: 0x1091098: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01090a78: 0x1090a78: bne   v0, a0, 0x1090a84 sll   zero, zero, 0
+// 0x0109109c: 0x109109c: bne   v0, a0, 0x10910a8 sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	bne.un L_1090a84
+	bne.un L_10910a8
 // --- basic block ---
-// 0x01090a80: 0x1090a80: sw    v0, 0(a1)
+// 0x010910a4: 0x10910a4: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_1090a84:
-// 0x01090a84: 0x1090a84: lw    s1, 0(a1)
+L_10910a8:
+// 0x010910a8: 0x10910a8: lw    s1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01090a88: 0x1090a88: addiu s3, v1, 4
+// 0x010910ac: 0x10910ac: addiu s3, v1, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 9
-// 0x01090a8c: 0x1090a8c: addiu s2, s1, 48
+// 0x010910b0: 0x10910b0: addiu s2, s1, 48
 	ldloc 8
 	ldc.i4.s 48
 	add
 	stloc 7
-// 0x01090a90: 0x1090a90: sll   s2, s2, 2
+// 0x010910b4: 0x10910b4: sll   s2, s2, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01090a94: 0x1090a94: addu  s2, v1, s2
+// 0x010910b8: 0x10910b8: addu  s2, v1, s2
 	ldloc 10
 	ldloc 7
 	add
 	stloc 7
-// 0x01090a98: 0x1090a98: sll   v0, s1, 6
+// 0x010910bc: 0x10910bc: sll   v0, s1, 6
 	ldloc 8
 	ldc.i4.6
 	shl
 	stloc 6
-// 0x01090a9c: 0x1090a9c: addu  s3, s3, v0
+// 0x010910c0: 0x10910c0: addu  s3, s3, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01090aa0: 0x1090aa0: j	 0x1090adc addiu s2, s2, 4
+// 0x010910c4: 0x10910c4: j	 0x1091100 addiu s2, s2, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	br L_1090adc
+	br L_1091100
 // --- basic block ---
-L_1090aa8:
-// 0x01090aa8: 0x1090aa8: lw    v0, 0(s2)
+L_10910cc:
+// 0x010910cc: 0x10910cc: lw    v0, 0(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01090aac: 0x1090aac: sll   zero, zero, 0
-// 0x01090ab0: 0x1090ab0: beq   v0, zero, 0x1090ac0 addiu s3, s3, -64
+// 0x010910d0: 0x10910d0: sll   zero, zero, 0
+// 0x010910d4: 0x10910d4: beq   v0, zero, 0x10910e4 addiu s3, s3, -64
 	ldloc 6
 	ldloc 9
 	ldc.i4.s -64
 	add
 	stloc 9
-	brfalse L_1090ac0
+	brfalse L_10910e4
 // --- basic block ---
-// 0x01090ab8: 0x1090ab8: j	 0x1090aec sw    v0, 0(s0)
+// 0x010910dc: 0x10910dc: j	 0x1091110 sw    v0, 0(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_1090aec
+	br L_1091110
 // --- basic block ---
-L_1090ac0:
-// 0x01090ac0: 0x1090ac0: jal   0x10a1918 sw    a3, 16(sp)
+L_10910e4:
+// 0x010910e4: 0x10910e4: jal   0x10a1f60 sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7360,19 +7360,19 @@ L_1090ac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01090ac8: 0x1090ac8: sw    v0, 0(s0)
+// 0x010910ec: 0x10910ec: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01090acc: 0x1090acc: lw    a3, 16(sp)
+// 0x010910f0: 0x10910f0: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7381,43 +7381,43 @@ L_1090ac0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01090ad0: 0x1090ad0: bne   v0, zero, 0x1090aec addiu s2, s2, -4
+// 0x010910f4: 0x10910f4: bne   v0, zero, 0x1091110 addiu s2, s2, -4
 	ldloc 6
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 7
-	brtrue L_1090aec
+	brtrue L_1091110
 // --- basic block ---
-// 0x01090ad8: 0x1090ad8: addiu s1, s1, -1
+// 0x010910fc: 0x10910fc: addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_1090adc:
-// 0x01090adc: 0x1090adc: addu  a2, s3, zero
+L_1091100:
+// 0x01091100: 0x1091100: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x01090ae0: 0x1090ae0: addu  a0, zero, zero
+// 0x01091104: 0x1091104: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01090ae4: 0x1090ae4: bgez  s1, 0x1090aa8 addiu a1, zero, 1
+// 0x01091108: 0x1091108: bgez  s1, 0x10910cc addiu a1, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc.2
 	ldc.i4.s 0
-	bge L_1090aa8
+	bge L_10910cc
 // --- basic block ---
-L_1090aec:
-// 0x01090aec: 0x1090aec: lw    ra, 44(sp)
-// 0x01090af0: 0x1090af0: sw    s1, 0(a3)
+L_1091110:
+// 0x01091110: 0x1091110: lw    ra, 44(sp)
+// 0x01091114: 0x1091114: sw    s1, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01090af4: 0x1090af4: lw    s3, 40(sp)
+// 0x01091118: 0x1091118: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7426,7 +7426,7 @@ L_1090aec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01090af8: 0x1090af8: lw    s2, 36(sp)
+// 0x0109111c: 0x109111c: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7435,7 +7435,7 @@ L_1090aec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090afc: 0x1090afc: lw    s1, 32(sp)
+// 0x01091120: 0x1091120: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7444,7 +7444,7 @@ L_1090aec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090b00: 0x1090b00: lw    s0, 28(sp)
+// 0x01091124: 0x1091124: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7453,7 +7453,7 @@ L_1090aec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01090b04: 0x1090b04: jr    ra addiu sp, sp, 48
+// 0x01091128: 0x1091128: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
diff --git a/converted/Cibyl108.j b/converted/Cibyl108.j
index a1ef631..160a3a2 100644
--- a/converted/Cibyl108.j
+++ b/converted/Cibyl108.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl108::.ctor
 
-.method public static int32 ssd_button_change_text_1090b0c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_change_text_1091130(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 ra,int32 v1)
@@ -79,12 +79,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090b0c: 0x1090b0c: addiu sp, sp, -24
+// 0x01091130: 0x1091130: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01090b10: 0x1090b10: sw    s0, 16(sp)
+// 0x01091134: 0x1091134: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -93,14 +93,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01090b14: 0x1090b14: addu  s0, a1, zero
+// 0x01091138: 0x1091138: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x01090b18: 0x1090b18: lui   a1, 0x10000
+// 0x0109113c: 0x109113c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01090b1c: 0x1090b1c: sw    ra, 20(sp)
-// 0x01090b20: 0x1090b20: jal   0x109b304 addiu a1, a1, -32516
+// 0x01091140: 0x1091140: sw    ra, 20(sp)
+// 0x01091144: 0x1091144: jal   0x109b94c addiu a1, a1, -32516
 	ldloc.2
 	ldc.i4 -32516
 	add
@@ -110,18 +110,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01090b28: 0x1090b28: beq   v0, zero, 0x1090b38 addu  a0, v0, zero
+// 0x0109114c: 0x109114c: beq   v0, zero, 0x109115c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1090b38
+	brfalse L_109115c
 // --- basic block ---
-// 0x01090b30: 0x1090b30: jal   0x1097e5c addu  a1, s0, zero
+// 0x01091154: 0x1091154: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -129,14 +129,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1090b38:
-// 0x01090b38: 0x1090b38: lw    ra, 20(sp)
-// 0x01090b3c: 0x1090b3c: lw    s0, 16(sp)
+L_109115c:
+// 0x0109115c: 0x109115c: lw    ra, 20(sp)
+// 0x01091160: 0x1091160: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -145,7 +145,7 @@ L_1090b38:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01090b40: 0x1090b40: jr    ra addiu sp, sp, 24
+// 0x01091164: 0x1091164: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -157,7 +157,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_bitmap_name_1090b48(int32,int32,int32,int32,int32)
+.method public static int32 set_bitmap_name_109116c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -198,12 +198,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090b48: 0x1090b48: addiu sp, sp, -48
+// 0x0109116c: 0x109116c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01090b4c: 0x1090b4c: sw    s1, 40(sp)
+// 0x01091170: 0x1091170: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -212,13 +212,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090b50: 0x1090b50: addu  s1, a0, zero
+// 0x01091174: 0x1091174: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01090b54: 0x1090b54: addu  a0, a2, zero
+// 0x01091178: 0x1091178: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01090b58: 0x1090b58: sw    s0, 36(sp)
+// 0x0109117c: 0x109117c: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -227,7 +227,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01090b5c: 0x1090b5c: sw    a1, 24(sp)
+// 0x01091180: 0x1091180: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -236,8 +236,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01090b60: 0x1090b60: sw    ra, 44(sp)
-// 0x01090b64: 0x1090b64: jal   0x1001b48 addu  s0, a2, zero
+// 0x01091184: 0x1091184: sw    ra, 44(sp)
+// 0x01091188: 0x1091188: jal   0x1001b48 addu  s0, a2, zero
 	ldloc.3
 	stloc 7
 	ldloc.1
@@ -246,12 +246,12 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01090b6c: 0x1090b6c: sltiu v0, v0, 65
+// 0x01091190: 0x1091190: sltiu v0, v0, 65
 	ldloc 6
 	ldc.i4.s 65
 	clt.un
 	stloc 6
-// 0x01090b70: 0x1090b70: lw    a1, 24(sp)
+// 0x01091194: 0x1091194: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -260,28 +260,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01090b74: 0x1090b74: beq   v0, zero, 0x1090b98 lui   a3, 0x20000
+// 0x01091198: 0x1091198: beq   v0, zero, 0x10911bc lui   a3, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 4
-	brfalse L_1090b98
+	brfalse L_10911bc
 // --- basic block ---
-// 0x01090b7c: 0x1090b7c: addiu a0, s1, 4
+// 0x010911a0: 0x10911a0: addiu a0, s1, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc.1
-// 0x01090b80: 0x1090b80: sll   a1, a1, 6
+// 0x010911a4: 0x10911a4: sll   a1, a1, 6
 	ldloc.2
 	ldc.i4.6
 	shl
 	stloc.2
-// 0x01090b84: 0x1090b84: addu  a0, a0, a1
+// 0x010911a8: 0x10911a8: addu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01090b88: 0x1090b88: jal   0x1001b68 addu  a1, s0, zero
+// 0x010911ac: 0x10911ac: jal   0x1001b68 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -291,33 +291,33 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01090b90: 0x1090b90: j	 0x1090bbc sll   zero, zero, 0
-	br L_1090bbc
+// 0x010911b4: 0x10911b4: j	 0x10911e0 sll   zero, zero, 0
+	br L_10911e0
 // --- basic block ---
-L_1090b98:
-// 0x01090b98: 0x1090b98: lui   a1, 0x20000
+L_10911bc:
+// 0x010911bc: 0x10911bc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01090b9c: 0x1090b9c: addiu v0, zero, 64
+// 0x010911c0: 0x10911c0: addiu v0, zero, 64
 	ldc.i4.s 64
 	stloc 6
-// 0x01090ba0: 0x1090ba0: addiu a1, a1, -3868
+// 0x010911c4: 0x10911c4: addiu a1, a1, -3404
 	ldloc.2
-	ldc.i4 -3868
+	ldc.i4 -3404
 	add
 	stloc.2
-// 0x01090ba4: 0x1090ba4: addiu a3, a3, -3840
+// 0x010911c8: 0x10911c8: addiu a3, a3, -3376
 	ldloc 4
-	ldc.i4 -3840
+	ldc.i4 -3376
 	add
 	stloc 4
-// 0x01090ba8: 0x1090ba8: addiu a0, zero, 4
+// 0x010911cc: 0x10911cc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01090bac: 0x1090bac: addiu a2, zero, 97
+// 0x010911d0: 0x10911d0: addiu a2, zero, 97
 	ldc.i4.s 97
 	stloc.3
-// 0x01090bb0: 0x1090bb0: sw    s0, 16(sp)
+// 0x010911d4: 0x10911d4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -326,7 +326,7 @@ L_1090b98:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01090bb4: 0x1090bb4: jal   0x100449c sw    v0, 20(sp)
+// 0x010911d8: 0x10911d8: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -345,9 +345,9 @@ L_1090b98:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_1090bbc:
-// 0x01090bbc: 0x1090bbc: lw    ra, 44(sp)
-// 0x01090bc0: 0x1090bc0: lw    s1, 40(sp)
+L_10911e0:
+// 0x010911e0: 0x10911e0: lw    ra, 44(sp)
+// 0x010911e4: 0x10911e4: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -356,7 +356,7 @@ L_1090bbc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090bc4: 0x1090bc4: lw    s0, 36(sp)
+// 0x010911e8: 0x10911e8: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -365,7 +365,7 @@ L_1090bbc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090bc8: 0x1090bc8: jr    ra addiu sp, sp, 48
+// 0x010911ec: 0x10911ec: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -377,7 +377,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_button_change_images_1090bd0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_change_images_10911f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s3,int32 s0,int32 s4,int32 s5,int32 s1,int32 ra)
@@ -430,12 +430,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090bd0: 0x1090bd0: addiu sp, sp, -56
+// 0x010911f4: 0x10911f4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01090bd4: 0x1090bd4: sw    s5, 48(sp)
+// 0x010911f8: 0x10911f8: sw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -444,7 +444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01090bd8: 0x1090bd8: sw    s4, 44(sp)
+// 0x010911fc: 0x10911fc: sw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -453,7 +453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01090bdc: 0x1090bdc: sw    s3, 40(sp)
+// 0x01091200: 0x1091200: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -462,7 +462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01090be0: 0x1090be0: sw    s2, 36(sp)
+// 0x01091204: 0x1091204: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -471,7 +471,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01090be4: 0x1090be4: sw    s1, 32(sp)
+// 0x01091208: 0x1091208: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -480,7 +480,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01090be8: 0x1090be8: sw    s0, 28(sp)
+// 0x0109120c: 0x109120c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -489,17 +489,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01090bec: 0x1090bec: sw    ra, 52(sp)
-// 0x01090bf0: 0x1090bf0: addu  s0, a0, zero
+// 0x01091210: 0x1091210: sw    ra, 52(sp)
+// 0x01091214: 0x1091214: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01090bf4: 0x1090bf4: addu  s2, a1, zero
+// 0x01091218: 0x1091218: addu  s2, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01090bf8: 0x1090bf8: addu  s1, a2, zero
+// 0x0109121c: 0x109121c: addu  s1, a2, zero
 	ldloc.3
 	stloc 13
-// 0x01090bfc: 0x1090bfc: lw    s5, 164(a0)
+// 0x01091220: 0x1091220: lw    s5, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -508,23 +508,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01090c00: 0x1090c00: addu  s3, zero, zero
+// 0x01091224: 0x1091224: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01090c04: 0x1090c04: j	 0x1090c34 addu  s4, zero, zero
+// 0x01091228: 0x1091228: j	 0x1091258 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_1090c34
+	br L_1091258
 // --- basic block ---
-L_1090c0c:
-// 0x01090c0c: 0x1090c0c: lw    a2, 0(v1)
+L_1091230:
+// 0x01091230: 0x1091230: lw    a2, 0(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01090c10: 0x1090c10: jal   0x1090b48 sw    a3, 16(sp)
+// 0x01091234: 0x1091234: jal   0x109116c sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -538,24 +538,24 @@ L_1090c0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::set_bitmap_name_1090b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::set_bitmap_name_109116c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01090c18: 0x1090c18: addu  v0, s2, s3
+// 0x0109123c: 0x109123c: addu  v0, s2, s3
 	ldloc 7
 	ldloc 9
 	add
 	stloc 6
-// 0x01090c1c: 0x1090c1c: lw    v1, 0(v0)
+// 0x01091240: 0x1091240: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01090c20: 0x1090c20: lw    a3, 16(sp)
+// 0x01091244: 0x1091244: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -564,17 +564,17 @@ L_1090c0c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01090c24: 0x1090c24: addu  v0, s5, s3
+// 0x01091248: 0x1091248: addu  v0, s5, s3
 	ldloc 12
 	ldloc 9
 	add
 	stloc 6
-// 0x01090c28: 0x1090c28: addiu s4, s4, 1
+// 0x0109124c: 0x109124c: addiu s4, s4, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x01090c2c: 0x1090c2c: sw    v1, 196(v0)
+// 0x01091250: 0x1091250: sw    v1, 196(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -583,32 +583,32 @@ L_1090c0c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090c30: 0x1090c30: addiu s3, s3, 4
+// 0x01091254: 0x1091254: addiu s3, s3, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_1090c34:
-// 0x01090c34: 0x1090c34: slt   v0, s4, a3
+L_1091258:
+// 0x01091258: 0x1091258: slt   v0, s4, a3
 	ldloc 11
 	ldloc 4
 	clt
 	stloc 6
-// 0x01090c38: 0x1090c38: addu  v1, s1, s3
+// 0x0109125c: 0x109125c: addu  v1, s1, s3
 	ldloc 13
 	ldloc 9
 	add
 	stloc 8
-// 0x01090c3c: 0x1090c3c: addu  a1, s4, zero
+// 0x01091260: 0x1091260: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x01090c40: 0x1090c40: bne   v0, zero, 0x1090c0c addu  a0, s5, zero
+// 0x01091264: 0x1091264: bne   v0, zero, 0x1091230 addu  a0, s5, zero
 	ldloc 6
 	ldloc 12
 	stloc.1
-	brtrue L_1090c0c
+	brtrue L_1091230
 // --- basic block ---
-// 0x01090c48: 0x1090c48: lw    s2, 196(s5)
+// 0x0109126c: 0x109126c: lw    s2, 196(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -617,21 +617,21 @@ L_1090c34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090c4c: 0x1090c4c: sll   zero, zero, 0
-// 0x01090c50: 0x1090c50: bne   s2, zero, 0x1090c7c addu  a0, zero, zero
+// 0x01091270: 0x1091270: sll   zero, zero, 0
+// 0x01091274: 0x1091274: bne   s2, zero, 0x10912a0 addu  a0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1090c7c
+	brtrue L_10912a0
 // --- basic block ---
-// 0x01090c58: 0x1090c58: lw    a2, 0(s1)
+// 0x0109127c: 0x109127c: lw    a2, 0(s1)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01090c5c: 0x1090c5c: jal   0x10a1918 addiu a1, zero, 1
+// 0x01091280: 0x1091280: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -639,18 +639,18 @@ L_1090c34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01090c64: 0x1090c64: bne   v0, zero, 0x1090c7c addu  s2, v0, zero
+// 0x01091288: 0x1091288: bne   v0, zero, 0x10912a0 addu  s2, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
-	brtrue L_1090c7c
+	brtrue L_10912a0
 // --- basic block ---
-// 0x01090c6c: 0x1090c6c: sw    zero, 28(s0)
+// 0x01091290: 0x1091290: sw    zero, 28(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -659,7 +659,7 @@ L_1090c34:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01090c70: 0x1090c70: sw    zero, 24(s0)
+// 0x01091294: 0x1091294: sw    zero, 24(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -668,22 +668,22 @@ L_1090c34:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01090c74: 0x1090c74: j	 0x1090c98 addiu v0, zero, -1
+// 0x01091298: 0x1091298: j	 0x10912bc addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-	br L_1090c98
+	br L_10912bc
 // --- basic block ---
-L_1090c7c:
-// 0x01090c7c: 0x1090c7c: jal   0x104e020 addu  a0, s2, zero
+L_10912a0:
+// 0x010912a0: 0x10912a0: jal   0x104e030 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01090c84: 0x1090c84: sw    v0, 28(s0)
+// 0x010912a8: 0x10912a8: sw    v0, 28(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -692,16 +692,16 @@ L_1090c7c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01090c88: 0x1090c88: jal   0x104dffc addu  a0, s2, zero
+// 0x010912ac: 0x10912ac: jal   0x104e00c addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01090c90: 0x1090c90: sw    v0, 24(s0)
+// 0x010912b4: 0x10912b4: sw    v0, 24(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -710,12 +710,12 @@ L_1090c7c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01090c94: 0x1090c94: addu  v0, zero, zero
+// 0x010912b8: 0x10912b8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1090c98:
-// 0x01090c98: 0x1090c98: lw    ra, 52(sp)
-// 0x01090c9c: 0x1090c9c: lw    s5, 48(sp)
+L_10912bc:
+// 0x010912bc: 0x10912bc: lw    ra, 52(sp)
+// 0x010912c0: 0x10912c0: lw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -724,7 +724,7 @@ L_1090c98:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01090ca0: 0x1090ca0: lw    s4, 44(sp)
+// 0x010912c4: 0x10912c4: lw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -733,7 +733,7 @@ L_1090c98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01090ca4: 0x1090ca4: lw    s3, 40(sp)
+// 0x010912c8: 0x10912c8: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -742,7 +742,7 @@ L_1090c98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01090ca8: 0x1090ca8: lw    s2, 36(sp)
+// 0x010912cc: 0x10912cc: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -751,7 +751,7 @@ L_1090c98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090cac: 0x1090cac: lw    s1, 32(sp)
+// 0x010912d0: 0x10912d0: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -760,7 +760,7 @@ L_1090c98:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01090cb0: 0x1090cb0: lw    s0, 28(sp)
+// 0x010912d4: 0x10912d4: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -769,7 +769,7 @@ L_1090c98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01090cb4: 0x1090cb4: jr    ra addiu sp, sp, 56
+// 0x010912d8: 0x10912d8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -781,7 +781,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_button_change_icon_1090cbc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_change_icon_10912e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -816,56 +816,56 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090cbc: 0x1090cbc: addiu sp, sp, -40
+// 0x010912e0: 0x10912e0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01090cc0: 0x1090cc0: sw    ra, 36(sp)
-// 0x01090cc4: 0x1090cc4: addu  a3, a2, zero
+// 0x010912e4: 0x10912e4: sw    ra, 36(sp)
+// 0x010912e8: 0x10912e8: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x01090cc8: 0x1090cc8: addiu v1, sp, 16
+// 0x010912ec: 0x10912ec: addiu v1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x01090ccc: 0x1090ccc: j	 0x1090cdc addu  v0, zero, zero
+// 0x010912f0: 0x10912f0: j	 0x1091300 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1090cdc
+	br L_1091300
 // --- basic block ---
-L_1090cd4:
-// 0x01090cd4: 0x1090cd4: sw    zero, 0(v1)
+L_10912f8:
+// 0x010912f8: 0x10912f8: sw    zero, 0(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01090cd8: 0x1090cd8: addiu v1, v1, 4
+// 0x010912fc: 0x10912fc: addiu v1, v1, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-L_1090cdc:
-// 0x01090cdc: 0x1090cdc: slt   a2, v0, a3
+L_1091300:
+// 0x01091300: 0x1091300: slt   a2, v0, a3
 	ldloc 5
 	ldloc 4
 	clt
 	stloc.3
-// 0x01090ce0: 0x1090ce0: bne   a2, zero, 0x1090cd4 addiu v0, v0, 1
+// 0x01091304: 0x1091304: bne   a2, zero, 0x10912f8 addiu v0, v0, 1
 	ldloc.3
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_1090cd4
+	brtrue L_10912f8
 // --- basic block ---
-// 0x01090ce8: 0x1090ce8: addu  a2, a1, zero
+// 0x0109130c: 0x109130c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01090cec: 0x1090cec: jal   0x1090bd0 addiu a1, sp, 16
+// 0x01091310: 0x1091310: jal   0x10911f4 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -875,14 +875,14 @@ L_1090cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_images_1090bd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_images_10911f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01090cf4: 0x1090cf4: lw    ra, 36(sp)
-// 0x01090cf8: 0x1090cf8: sll   zero, zero, 0
-// 0x01090cfc: 0x1090cfc: jr    ra addiu sp, sp, 40
+// 0x01091318: 0x1091318: lw    ra, 36(sp)
+// 0x0109131c: 0x109131c: sll   zero, zero, 0
+// 0x01091320: 0x1091320: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -894,7 +894,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 release_1090d04(int32,int32,int32,int32,int32)
+.method public static int32 release_1091328(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -932,12 +932,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090d04: 0x1090d04: addiu sp, sp, -24
+// 0x01091328: 0x1091328: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01090d08: 0x1090d08: sw    s0, 16(sp)
+// 0x0109132c: 0x109132c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -946,10 +946,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01090d0c: 0x1090d0c: addu  s0, a0, zero
+// 0x01091330: 0x1091330: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01090d10: 0x1090d10: lw    a0, 164(a0)
+// 0x01091334: 0x1091334: lw    a0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -958,12 +958,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01090d14: 0x1090d14: sll   zero, zero, 0
-// 0x01090d18: 0x1090d18: beq   a0, zero, 0x1090d2c sw    ra, 20(sp)
+// 0x01091338: 0x1091338: sll   zero, zero, 0
+// 0x0109133c: 0x109133c: beq   a0, zero, 0x1091350 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1090d2c
+	brfalse L_1091350
 // --- basic block ---
-// 0x01090d20: 0x1090d20: jal   0x1000930 sll   zero, zero, 0
+// 0x01091344: 0x1091344: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -974,7 +974,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01090d28: 0x1090d28: sw    zero, 164(s0)
+// 0x0109134c: 0x109134c: sw    zero, 164(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -983,9 +983,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1090d2c:
-// 0x01090d2c: 0x1090d2c: lw    ra, 20(sp)
-// 0x01090d30: 0x1090d30: lw    s0, 16(sp)
+L_1091350:
+// 0x01091350: 0x1091350: lw    ra, 20(sp)
+// 0x01091354: 0x1091354: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -994,7 +994,7 @@ L_1090d2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01090d34: 0x1090d34: jr    ra addiu sp, sp, 24
+// 0x01091358: 0x1091358: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1006,7 +1006,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 set_value_1090d3c(int32,int32,int32,int32,int32)
+.method public static int32 set_value_1091360(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s6,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -1062,12 +1062,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090d3c: 0x1090d3c: addiu sp, sp, -56
+// 0x01091360: 0x1091360: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01090d40: 0x1090d40: sw    s0, 24(sp)
+// 0x01091364: 0x1091364: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1076,10 +1076,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090d44: 0x1090d44: addu  s0, a0, zero
+// 0x01091368: 0x1091368: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01090d48: 0x1090d48: lw    a0, 20(a0)
+// 0x0109136c: 0x109136c: lw    a0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1088,7 +1088,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01090d4c: 0x1090d4c: sw    s3, 36(sp)
+// 0x01091370: 0x1091370: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1097,8 +1097,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01090d50: 0x1090d50: sw    ra, 52(sp)
-// 0x01090d54: 0x1090d54: sw    s6, 48(sp)
+// 0x01091374: 0x1091374: sw    ra, 52(sp)
+// 0x01091378: 0x1091378: sw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1107,7 +1107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01090d58: 0x1090d58: sw    s5, 44(sp)
+// 0x0109137c: 0x109137c: sw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1116,7 +1116,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01090d5c: 0x1090d5c: sw    s4, 40(sp)
+// 0x01091380: 0x1091380: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1125,7 +1125,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01090d60: 0x1090d60: sw    s2, 32(sp)
+// 0x01091384: 0x1091384: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1134,7 +1134,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01090d64: 0x1090d64: sw    s1, 28(sp)
+// 0x01091388: 0x1091388: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1143,7 +1143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01090d68: 0x1090d68: lw    s3, 164(s0)
+// 0x0109138c: 0x109138c: lw    s3, 164(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1152,20 +1152,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01090d6c: 0x1090d6c: beq   a0, zero, 0x1090d94 sll   zero, zero, 0
+// 0x01091390: 0x1091390: beq   a0, zero, 0x10913b8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1090d94
+	brfalse L_10913b8
 // --- basic block ---
-// 0x01090d74: 0x1090d74: lb    v0, 0(a0)
+// 0x01091398: 0x1091398: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01090d78: 0x1090d78: sll   zero, zero, 0
-// 0x01090d7c: 0x1090d7c: beq   v0, zero, 0x1090d94 sll   zero, zero, 0
+// 0x0109139c: 0x109139c: sll   zero, zero, 0
+// 0x010913a0: 0x10913a0: beq   v0, zero, 0x10913b8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1090d94
+	brfalse L_10913b8
 // --- basic block ---
-// 0x01090d84: 0x1090d84: jal   0x1000930 sw    a1, 16(sp)
+// 0x010913a8: 0x10913a8: jal   0x1000930 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1184,7 +1184,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090d8c: 0x1090d8c: lw    a1, 16(sp)
+// 0x010913b0: 0x10913b0: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1193,20 +1193,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01090d90: 0x1090d90: sll   zero, zero, 0
-L_1090d94:
-// 0x01090d94: 0x1090d94: lb    v0, 0(a1)
+// 0x010913b4: 0x10913b4: sll   zero, zero, 0
+L_10913b8:
+// 0x010913b8: 0x10913b8: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01090d98: 0x1090d98: sll   zero, zero, 0
-// 0x01090d9c: 0x1090d9c: beq   v0, zero, 0x1090db4 lui   v0, 0x10000
+// 0x010913bc: 0x10913bc: sll   zero, zero, 0
+// 0x010913c0: 0x10913c0: beq   v0, zero, 0x10913d8 lui   v0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	brfalse L_1090db4
+	brfalse L_10913d8
 // --- basic block ---
-// 0x01090da4: 0x1090da4: jal   0x1001ba8 addu  a0, a1, zero
+// 0x010913c8: 0x10913c8: jal   0x1001ba8 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -1219,7 +1219,7 @@ L_1090d94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090dac: 0x1090dac: j	 0x1090dbc sw    v0, 20(s0)
+// 0x010913d0: 0x10913d0: j	 0x10913e0 sw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1228,15 +1228,15 @@ L_1090d94:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1090dbc
+	br L_10913e0
 // --- basic block ---
-L_1090db4:
-// 0x01090db4: 0x1090db4: addiu v0, v0, 18500
+L_10913d8:
+// 0x010913d8: 0x10913d8: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x01090db8: 0x1090db8: sw    v0, 20(s0)
+// 0x010913dc: 0x10913dc: sw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1245,8 +1245,8 @@ L_1090db4:
 	add
 	ldloc 5
 	stelem.i4
-L_1090dbc:
-// 0x01090dbc: 0x1090dbc: lw    v0, 48(s0)
+L_10913e0:
+// 0x010913e0: 0x10913e0: lw    v0, 48(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1255,24 +1255,24 @@ L_1090dbc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090dc0: 0x1090dc0: sll   zero, zero, 0
-// 0x01090dc4: 0x1090dc4: andi  v0, v0, 64
+// 0x010913e4: 0x10913e4: sll   zero, zero, 0
+// 0x010913e8: 0x10913e8: andi  v0, v0, 64
 	ldloc 5
 	ldc.i4.s 64
 	and
 	stloc 5
-// 0x01090dc8: 0x1090dc8: beq   v0, zero, 0x1090de0 addiu s4, s3, 4
+// 0x010913ec: 0x10913ec: beq   v0, zero, 0x1091404 addiu s4, s3, 4
 	ldloc 5
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 13
-	brfalse L_1090de0
+	brfalse L_1091404
 // --- basic block ---
-// 0x01090dd0: 0x1090dd0: addiu v0, zero, -1
+// 0x010913f4: 0x10913f4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01090dd4: 0x1090dd4: sw    v0, 24(s0)
+// 0x010913f8: 0x10913f8: sw    v0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1281,7 +1281,7 @@ L_1090dbc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090dd8: 0x1090dd8: j	 0x1090e98 sw    v0, 28(s0)
+// 0x010913fc: 0x10913fc: j	 0x10914bc sw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1290,25 +1290,25 @@ L_1090dbc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1090e98
+	br L_10914bc
 // --- basic block ---
-L_1090de0:
-// 0x01090de0: 0x1090de0: addiu s5, s3, 196
+L_1091404:
+// 0x01091404: 0x1091404: addiu s5, s3, 196
 	ldloc 12
 	ldc.i4 196
 	add
 	stloc 14
-// 0x01090de4: 0x1090de4: addu  s1, zero, zero
+// 0x01091408: 0x1091408: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01090de8: 0x1090de8: addu  s2, zero, zero
+// 0x0109140c: 0x109140c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01090dec: 0x1090dec: addu  s6, zero, zero
+// 0x01091410: 0x1091410: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_1090df0:
-// 0x01090df0: 0x1090df0: lw    v0, 196(s3)
+L_1091414:
+// 0x01091414: 0x1091414: lw    v0, 196(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1317,24 +1317,24 @@ L_1090df0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090df4: 0x1090df4: sll   zero, zero, 0
-// 0x01090df8: 0x1090df8: bne   v0, zero, 0x1090ec4 sll   zero, zero, 0
+// 0x01091418: 0x1091418: sll   zero, zero, 0
+// 0x0109141c: 0x109141c: bne   v0, zero, 0x10914e8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1090ec4
+	brtrue L_10914e8
 // --- basic block ---
-// 0x01090e00: 0x1090e00: bne   s6, zero, 0x1090ec4 addu  v0, s6, zero
+// 0x01091424: 0x1091424: bne   s6, zero, 0x10914e8 addu  v0, s6, zero
 	ldloc 9
 	ldloc 9
 	stloc 5
-	brtrue L_1090ec4
+	brtrue L_10914e8
 // --- basic block ---
-// 0x01090e08: 0x1090e08: addu  a0, zero, zero
+// 0x0109142c: 0x109142c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01090e0c: 0x1090e0c: addiu a1, zero, 1
+// 0x01091430: 0x1091430: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01090e10: 0x1090e10: jal   0x10a1918 addu  a2, s4, zero
+// 0x01091434: 0x1091434: jal   0x10a1f60 addu  a2, s4, zero
 	ldloc 13
 	stloc.3
 	ldloc.0
@@ -1342,122 +1342,122 @@ L_1090df0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090e18: 0x1090e18: beq   v0, zero, 0x1090e84 addu  s6, v0, zero
+// 0x0109143c: 0x109143c: beq   v0, zero, 0x10914a8 addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_1090e84
+	brfalse L_10914a8
 // --- basic block ---
-L_1090e20:
-// 0x01090e20: 0x1090e20: beq   s2, zero, 0x1090e30 sll   zero, zero, 0
+L_1091444:
+// 0x01091444: 0x1091444: beq   s2, zero, 0x1091454 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_1090e30
+	brfalse L_1091454
 // --- basic block ---
-// 0x01090e28: 0x1090e28: bne   s1, zero, 0x1090e4c sll   zero, zero, 0
+// 0x0109144c: 0x109144c: bne   s1, zero, 0x1091470 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_1090e4c
+	brtrue L_1091470
 // --- basic block ---
-L_1090e30:
-// 0x01090e30: 0x1090e30: jal   0x104dffc addu  a0, s6, zero
+L_1091454:
+// 0x01091454: 0x1091454: jal   0x104e00c addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090e38: 0x1090e38: addu  a0, s6, zero
+// 0x0109145c: 0x109145c: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x01090e3c: 0x1090e3c: jal   0x104e020 addu  s2, v0, zero
+// 0x01091460: 0x1091460: jal   0x104e030 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090e44: 0x1090e44: j	 0x1090e84 addu  s1, v0, zero
+// 0x01091468: 0x1091468: j	 0x10914a8 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-	br L_1090e84
+	br L_10914a8
 // --- basic block ---
-L_1090e4c:
-// 0x01090e4c: 0x1090e4c: jal   0x104dffc addu  a0, s6, zero
+L_1091470:
+// 0x01091470: 0x1091470: jal   0x104e00c addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090e54: 0x1090e54: beq   s2, v0, 0x1090e68 slt   v1, s2, v0
+// 0x01091478: 0x1091478: beq   s2, v0, 0x109148c slt   v1, s2, v0
 	ldloc 11
 	ldloc 5
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 7
-	beq  L_1090e68
+	beq  L_109148c
 // --- basic block ---
-// 0x01090e5c: 0x1090e5c: beq   v1, zero, 0x1090e68 sll   zero, zero, 0
+// 0x01091480: 0x1091480: beq   v1, zero, 0x109148c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1090e68
+	brfalse L_109148c
 // --- basic block ---
-// 0x01090e64: 0x1090e64: addu  s2, v0, zero
+// 0x01091488: 0x1091488: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-L_1090e68:
-// 0x01090e68: 0x1090e68: jal   0x104e020 addu  a0, s6, zero
+L_109148c:
+// 0x0109148c: 0x109148c: jal   0x104e030 addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01090e70: 0x1090e70: beq   s1, v0, 0x1090e80 slt   v1, s1, v0
+// 0x01091494: 0x1091494: beq   s1, v0, 0x10914a4 slt   v1, s1, v0
 	ldloc 10
 	ldloc 5
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 7
-	beq  L_1090e80
+	beq  L_10914a4
 // --- basic block ---
-// 0x01090e78: 0x1090e78: beq   v1, zero, 0x1090e84 sll   zero, zero, 0
+// 0x0109149c: 0x109149c: beq   v1, zero, 0x10914a8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1090e84
+	brfalse L_10914a8
 // --- basic block ---
-L_1090e80:
-// 0x01090e80: 0x1090e80: addu  s1, v0, zero
+L_10914a4:
+// 0x010914a4: 0x10914a4: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-L_1090e84:
-// 0x01090e84: 0x1090e84: addiu s4, s4, 64
+L_10914a8:
+// 0x010914a8: 0x10914a8: addiu s4, s4, 64
 	ldloc 13
 	ldc.i4.s 64
 	add
 	stloc 13
-// 0x01090e88: 0x1090e88: bne   s4, s5, 0x1090df0 addiu s3, s3, 4
+// 0x010914ac: 0x10914ac: bne   s4, s5, 0x1091414 addiu s3, s3, 4
 	ldloc 13
 	ldloc 14
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-	bne.un L_1090df0
+	bne.un L_1091414
 // --- basic block ---
-// 0x01090e90: 0x1090e90: sw    s2, 24(s0)
+// 0x010914b4: 0x10914b4: sw    s2, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1466,7 +1466,7 @@ L_1090e84:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01090e94: 0x1090e94: sw    s1, 28(s0)
+// 0x010914b8: 0x10914b8: sw    s1, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1475,12 +1475,12 @@ L_1090e84:
 	add
 	ldloc 10
 	stelem.i4
-L_1090e98:
-// 0x01090e98: 0x1090e98: lw    ra, 52(sp)
-// 0x01090e9c: 0x1090e9c: addu  v0, zero, zero
+L_10914bc:
+// 0x010914bc: 0x10914bc: lw    ra, 52(sp)
+// 0x010914c0: 0x10914c0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01090ea0: 0x1090ea0: lw    s6, 48(sp)
+// 0x010914c4: 0x10914c4: lw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1489,7 +1489,7 @@ L_1090e98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01090ea4: 0x1090ea4: lw    s5, 44(sp)
+// 0x010914c8: 0x10914c8: lw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1498,7 +1498,7 @@ L_1090e98:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01090ea8: 0x1090ea8: lw    s4, 40(sp)
+// 0x010914cc: 0x10914cc: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1507,7 +1507,7 @@ L_1090e98:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01090eac: 0x1090eac: lw    s3, 36(sp)
+// 0x010914d0: 0x10914d0: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1516,7 +1516,7 @@ L_1090e98:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01090eb0: 0x1090eb0: lw    s2, 32(sp)
+// 0x010914d4: 0x10914d4: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1525,7 +1525,7 @@ L_1090e98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01090eb4: 0x1090eb4: lw    s1, 28(sp)
+// 0x010914d8: 0x10914d8: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1534,7 +1534,7 @@ L_1090e98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01090eb8: 0x1090eb8: lw    s0, 24(sp)
+// 0x010914dc: 0x10914dc: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1543,25 +1543,25 @@ L_1090e98:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090ebc: 0x1090ebc: jr    ra addiu sp, sp, 56
+// 0x010914e0: 0x10914e0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1090ec4:
-// 0x01090ec4: 0x1090ec4: j	 0x1090e20 addu  s6, v0, zero
+L_10914e8:
+// 0x010914e8: 0x10914e8: j	 0x1091444 addu  s6, v0, zero
 	ldloc 5
 	stloc 9
-	br L_1090e20
+	br L_1091444
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s3,int32 s2,int32 s0,int32 s6,int32 v1,int32 s4,int32 s5,int32 ra)
@@ -1617,12 +1617,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01090ecc: 0x1090ecc: addiu sp, sp, -48
+// 0x010914f0: 0x10914f0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01090ed0: 0x1090ed0: sw    s1, 20(sp)
+// 0x010914f4: 0x10914f4: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1631,14 +1631,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01090ed4: 0x1090ed4: addu  s1, a0, zero
+// 0x010914f8: 0x10914f8: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01090ed8: 0x1090ed8: addiu a0, zero, 208
+// 0x010914fc: 0x10914fc: addiu a0, zero, 208
 	ldc.i4 208
 	stloc.1
-// 0x01090edc: 0x1090edc: sw    ra, 44(sp)
-// 0x01090ee0: 0x1090ee0: sw    s6, 40(sp)
+// 0x01091500: 0x1091500: sw    ra, 44(sp)
+// 0x01091504: 0x1091504: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1647,7 +1647,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01090ee4: 0x1090ee4: sw    s5, 36(sp)
+// 0x01091508: 0x1091508: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1656,7 +1656,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01090ee8: 0x1090ee8: sw    s4, 32(sp)
+// 0x0109150c: 0x109150c: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1665,10 +1665,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01090eec: 0x1090eec: addu  s5, a3, zero
+// 0x01091510: 0x1091510: addu  s5, a3, zero
 	ldloc 4
 	stloc 14
-// 0x01090ef0: 0x1090ef0: sw    s3, 28(sp)
+// 0x01091514: 0x1091514: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1677,7 +1677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090ef4: 0x1090ef4: sw    s2, 24(sp)
+// 0x01091518: 0x1091518: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1686,7 +1686,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01090ef8: 0x1090ef8: lw    s3, 64(sp)
+// 0x0109151c: 0x109151c: lw    s3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1695,7 +1695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090efc: 0x1090efc: sw    s0, 16(sp)
+// 0x01091520: 0x1091520: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1704,10 +1704,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01090f00: 0x1090f00: addu  s4, a1, zero
+// 0x01091524: 0x1091524: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01090f04: 0x1090f04: jal   0x1000910 addu  s0, a2, zero
+// 0x01091528: 0x1091528: jal   0x1000910 addu  s0, a2, zero
 	ldloc.3
 	stloc 10
 	ldloc.0
@@ -1720,16 +1720,16 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x01090f0c: 0x1090f0c: addu  a0, v0, zero
+// 0x01091530: 0x1091530: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01090f10: 0x1090f10: addu  a1, zero, zero
+// 0x01091534: 0x1091534: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01090f14: 0x1090f14: addiu a2, zero, 208
+// 0x01091538: 0x1091538: addiu a2, zero, 208
 	ldc.i4 208
 	stloc.3
-// 0x01090f18: 0x1090f18: jal   0x100177c addu  s2, v0, zero
+// 0x0109153c: 0x109153c: jal   0x100177c addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -1741,18 +1741,18 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x01090f20: 0x1090f20: lui   a1, 0x1090000
+// 0x01091544: 0x1091544: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x01090f24: 0x1090f24: addu  a0, s1, zero
+// 0x01091548: 0x1091548: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x01090f28: 0x1090f28: addu  a2, s3, zero
+// 0x0109154c: 0x109154c: addu  a2, s3, zero
 	ldloc 8
 	stloc.3
-// 0x01090f2c: 0x1090f2c: jal   0x109a45c addiu a1, a1, 2336
+// 0x01091550: 0x1091550: jal   0x109aaa4 addiu a1, a1, 3908
 	ldloc.2
-	ldc.i4 2336
+	ldc.i4 3908
 	add
 	stloc.2
 	ldloc.0
@@ -1760,15 +1760,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x01090f34: 0x1090f34: addu  s1, v0, zero
+// 0x01091558: 0x1091558: addu  s1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01090f38: 0x1090f38: sw    s3, 48(v0)
+// 0x0109155c: 0x109155c: sw    s3, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1777,30 +1777,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01090f3c: 0x1090f3c: lui   v0, 0x20000
+// 0x01091560: 0x1091560: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01090f40: 0x1090f40: addiu v0, v0, -25064
+// 0x01091564: 0x1091564: addiu v0, v0, -24600
 	ldloc 5
-	ldc.i4 -25064
+	ldc.i4 -24600
 	add
 	stloc 5
-// 0x01090f44: 0x1090f44: sw    v0, 0(s1)
+// 0x01091568: 0x1091568: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01090f48: 0x1090f48: lui   v0, 0x1090000
+// 0x0109156c: 0x109156c: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01090f4c: 0x1090f4c: addiu v0, v0, 4948
+// 0x01091570: 0x1091570: addiu v0, v0, 6520
 	ldloc 5
-	ldc.i4 4948
+	ldc.i4 6520
 	add
 	stloc 5
-// 0x01090f50: 0x1090f50: sw    v0, 184(s1)
+// 0x01091574: 0x1091574: sw    v0, 184(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1809,15 +1809,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090f54: 0x1090f54: lui   v0, 0x1090000
+// 0x01091578: 0x1091578: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01090f58: 0x1090f58: addiu v0, v0, 3332
+// 0x0109157c: 0x109157c: addiu v0, v0, 4904
 	ldloc 5
-	ldc.i4 3332
+	ldc.i4 4904
 	add
 	stloc 5
-// 0x01090f5c: 0x1090f5c: sw    v0, 220(s1)
+// 0x01091580: 0x1091580: sw    v0, 220(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1826,7 +1826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090f60: 0x1090f60: sw    s2, 164(s1)
+// 0x01091584: 0x1091584: sw    s2, 164(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1835,30 +1835,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01090f64: 0x1090f64: sw    zero, 0(s2)
+// 0x01091588: 0x1091588: sw    zero, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01090f68: 0x1090f68: addu  s6, s2, zero
+// 0x0109158c: 0x109158c: addu  s6, s2, zero
 	ldloc 9
 	stloc 11
-// 0x01090f6c: 0x1090f6c: j	 0x1090f88 addu  s3, zero, zero
+// 0x01091590: 0x1091590: j	 0x10915ac addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1090f88
+	br L_10915ac
 // --- basic block ---
-L_1090f74:
-// 0x01090f74: 0x1090f74: lw    a2, 0(s0)
+L_1091598:
+// 0x01091598: 0x1091598: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01090f78: 0x1090f78: jal   0x1090b48 addiu s3, s3, 1
+// 0x0109159c: 0x109159c: jal   0x109116c addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -1868,17 +1868,17 @@ L_1090f74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::set_bitmap_name_1090b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::set_bitmap_name_109116c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x01090f80: 0x1090f80: addiu s0, s0, 4
+// 0x010915a4: 0x10915a4: addiu s0, s0, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-// 0x01090f84: 0x1090f84: sw    zero, 192(s6)
+// 0x010915a8: 0x10915a8: sw    zero, 192(s6)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1887,27 +1887,27 @@ L_1090f74:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1090f88:
-// 0x01090f88: 0x1090f88: slt   v0, s3, s5
+L_10915ac:
+// 0x010915ac: 0x10915ac: slt   v0, s3, s5
 	ldloc 8
 	ldloc 14
 	clt
 	stloc 5
-// 0x01090f8c: 0x1090f8c: addu  a1, s3, zero
+// 0x010915b0: 0x10915b0: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x01090f90: 0x1090f90: addu  a0, s2, zero
+// 0x010915b4: 0x10915b4: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01090f94: 0x1090f94: bne   v0, zero, 0x1090f74 addiu s6, s6, 4
+// 0x010915b8: 0x10915b8: bne   v0, zero, 0x1091598 addiu s6, s6, 4
 	ldloc 5
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-	brtrue L_1090f74
+	brtrue L_1091598
 // --- basic block ---
-// 0x01090f9c: 0x1090f9c: lw    v0, 68(sp)
+// 0x010915c0: 0x10915c0: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1916,10 +1916,10 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01090fa0: 0x1090fa0: addu  a1, s4, zero
+// 0x010915c4: 0x10915c4: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x01090fa4: 0x1090fa4: sw    v0, 112(s1)
+// 0x010915c8: 0x10915c8: sw    v0, 112(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1928,7 +1928,7 @@ L_1090f88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090fa8: 0x1090fa8: jal   0x1090d3c addu  a0, s1, zero
+// 0x010915cc: 0x10915cc: jal   0x1091360 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1936,20 +1936,20 @@ L_1090f88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::set_value_1090d3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::set_value_1091360(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x01090fb0: 0x1090fb0: lui   v0, 0x1090000
+// 0x010915d4: 0x10915d4: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01090fb4: 0x1090fb4: addiu v0, v0, 4856
+// 0x010915d8: 0x10915d8: addiu v0, v0, 6428
 	ldloc 5
-	ldc.i4 4856
+	ldc.i4 6428
 	add
 	stloc 5
-// 0x01090fb8: 0x1090fb8: sw    v0, 196(s1)
+// 0x010915dc: 0x10915dc: sw    v0, 196(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1958,15 +1958,15 @@ L_1090f88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090fbc: 0x1090fbc: lui   v0, 0x1090000
+// 0x010915e0: 0x10915e0: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01090fc0: 0x1090fc0: addiu v0, v0, 4684
+// 0x010915e4: 0x10915e4: addiu v0, v0, 6256
 	ldloc 5
-	ldc.i4 4684
+	ldc.i4 6256
 	add
 	stloc 5
-// 0x01090fc4: 0x1090fc4: sw    v0, 200(s1)
+// 0x010915e8: 0x10915e8: sw    v0, 200(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1975,16 +1975,16 @@ L_1090f88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090fc8: 0x1090fc8: lw    ra, 44(sp)
-// 0x01090fcc: 0x1090fcc: lui   v0, 0x1090000
+// 0x010915ec: 0x10915ec: lw    ra, 44(sp)
+// 0x010915f0: 0x10915f0: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01090fd0: 0x1090fd0: addiu v0, v0, 3388
+// 0x010915f4: 0x10915f4: addiu v0, v0, 4960
 	ldloc 5
-	ldc.i4 3388
+	ldc.i4 4960
 	add
 	stloc 5
-// 0x01090fd4: 0x1090fd4: sw    v0, 176(s1)
+// 0x010915f8: 0x10915f8: sw    v0, 176(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1993,7 +1993,7 @@ L_1090f88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01090fd8: 0x1090fd8: lw    s6, 40(sp)
+// 0x010915fc: 0x10915fc: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2002,10 +2002,10 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01090fdc: 0x1090fdc: addu  v0, s1, zero
+// 0x01091600: 0x1091600: addu  v0, s1, zero
 	ldloc 7
 	stloc 5
-// 0x01090fe0: 0x1090fe0: lw    s5, 36(sp)
+// 0x01091604: 0x1091604: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2014,7 +2014,7 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01090fe4: 0x1090fe4: lw    s4, 32(sp)
+// 0x01091608: 0x1091608: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2023,7 +2023,7 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01090fe8: 0x1090fe8: lw    s3, 28(sp)
+// 0x0109160c: 0x109160c: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2032,7 +2032,7 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01090fec: 0x1090fec: lw    s2, 24(sp)
+// 0x01091610: 0x1091610: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2041,7 +2041,7 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01090ff0: 0x1090ff0: lw    s1, 20(sp)
+// 0x01091614: 0x1091614: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2050,7 +2050,7 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01090ff4: 0x1090ff4: lw    s0, 16(sp)
+// 0x01091618: 0x1091618: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2059,7 +2059,7 @@ L_1090f88:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01090ff8: 0x1090ff8: jr    ra addiu sp, sp, 48
+// 0x0109161c: 0x109161c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2071,7 +2071,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_button_label_1091088(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 t0,int32 s2,int32 s5,int32 s6,int32 s1,int32 s3,int32 s4,int32 s7,int32 s8,int32 ra)
@@ -2136,20 +2136,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01091088: 0x1091088: addiu sp, sp, -96
+// 0x010916ac: 0x10916ac: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0109108c: 0x109108c: lui   t0, 0x20000
+// 0x010916b0: 0x10916b0: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01091090: 0x1091090: addiu t0, t0, -3756
+// 0x010916b4: 0x10916b4: addiu t0, t0, -3292
 	ldloc 9
-	ldc.i4 -3756
+	ldc.i4 -3292
 	add
 	stloc 9
-// 0x01091094: 0x1091094: sw    s0, 56(sp)
+// 0x010916b8: 0x10916b8: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2158,13 +2158,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01091098: 0x1091098: lui   s0, 0x80000
+// 0x010916bc: 0x10916bc: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109109c: 0x109109c: lui   v0, 0x20000
+// 0x010916c0: 0x10916c0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010910a0: 0x10910a0: sw    t0, 40(sp)
+// 0x010916c4: 0x10916c4: sw    t0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2173,29 +2173,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010910a4: 0x10910a4: lw    v1, 9580(s0)
+// 0x010916c8: 0x10916c8: lw    v1, 10044(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2395
+	ldc.i4 2511
 	add
 	ldelem.i4
 	stloc 8
-// 0x010910a8: 0x10910a8: lui   t0, 0x20000
+// 0x010916cc: 0x10916cc: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x010910ac: 0x10910ac: addiu v0, v0, -3768
+// 0x010916d0: 0x10916d0: addiu v0, v0, -3304
 	ldloc 6
-	ldc.i4 -3768
+	ldc.i4 -3304
 	add
 	stloc 6
-// 0x010910b0: 0x10910b0: addiu t0, t0, -3744
+// 0x010916d4: 0x10916d4: addiu t0, t0, -3280
 	ldloc 9
-	ldc.i4 -3744
+	ldc.i4 -3280
 	add
 	stloc 9
-// 0x010910b4: 0x10910b4: sw    s4, 72(sp)
+// 0x010916d8: 0x10916d8: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2204,7 +2204,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010910b8: 0x10910b8: sw    s3, 68(sp)
+// 0x010916dc: 0x10916dc: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2213,7 +2213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010910bc: 0x10910bc: sw    s2, 64(sp)
+// 0x010916e0: 0x10916e0: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2222,7 +2222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010910c0: 0x10910c0: sw    s1, 60(sp)
+// 0x010916e4: 0x10916e4: sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2231,8 +2231,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010910c4: 0x10910c4: sw    ra, 92(sp)
-// 0x010910c8: 0x10910c8: sw    s8, 88(sp)
+// 0x010916e8: 0x10916e8: sw    ra, 92(sp)
+// 0x010916ec: 0x10916ec: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2241,7 +2241,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010910cc: 0x10910cc: sw    s7, 84(sp)
+// 0x010916f0: 0x10916f0: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2250,7 +2250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010910d0: 0x10910d0: sw    s6, 80(sp)
+// 0x010916f4: 0x10916f4: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2259,7 +2259,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010910d4: 0x10910d4: sw    s5, 76(sp)
+// 0x010916f8: 0x10916f8: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2268,7 +2268,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010910d8: 0x10910d8: sw    t0, 44(sp)
+// 0x010916fc: 0x10916fc: sw    t0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2277,19 +2277,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010910dc: 0x10910dc: addu  s4, a0, zero
+// 0x01091700: 0x1091700: addu  s4, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010910e0: 0x10910e0: addu  s1, a1, zero
+// 0x01091704: 0x1091704: addu  s1, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010910e4: 0x10910e4: addu  s3, a2, zero
+// 0x01091708: 0x1091708: addu  s3, a2, zero
 	ldloc.3
 	stloc 14
-// 0x010910e8: 0x10910e8: addu  s2, a3, zero
+// 0x0109170c: 0x109170c: addu  s2, a3, zero
 	ldloc 4
 	stloc 10
-// 0x010910ec: 0x10910ec: bgtz  v1, 0x1091110 sw    v0, 36(sp)
+// 0x01091710: 0x1091710: bgtz  v1, 0x1091734 sw    v0, 36(sp)
 	ldloc 8
 	ldloc 5
 	ldloc.0
@@ -2300,15 +2300,15 @@ __CIBYL_javamethod_begin:
 	ldloc 6
 	stelem.i4
 	ldc.i4.s 0
-	bgt L_1091110
+	bgt L_1091734
 // --- basic block ---
-// 0x010910f4: 0x10910f4: addu  a2, v0, zero
+// 0x01091718: 0x1091718: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x010910f8: 0x10910f8: addiu a1, zero, 3
+// 0x0109171c: 0x109171c: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010910fc: 0x10910fc: jal   0x10a1918 addu  a0, zero, zero
+// 0x01091720: 0x1091720: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2316,58 +2316,58 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01091104: 0x1091104: jal   0x104dffc addu  a0, v0, zero
+// 0x01091728: 0x1091728: jal   0x104e00c addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109110c: 0x109110c: sw    v0, 9580(s0)
+// 0x01091730: 0x1091730: sw    v0, 10044(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2395
+	ldc.i4 2511
 	add
 	ldloc 6
 	stelem.i4
-L_1091110:
-// 0x01091110: 0x1091110: addiu s6, sp, 28
+L_1091734:
+// 0x01091734: 0x1091734: addiu s6, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 12
-// 0x01091114: 0x1091114: addiu s0, sp, 24
+// 0x01091738: 0x1091738: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x01091118: 0x1091118: addiu s5, sp, 32
+// 0x0109173c: 0x109173c: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 11
-// 0x0109111c: 0x109111c: addu  a2, s0, zero
+// 0x01091740: 0x1091740: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x01091120: 0x1091120: addu  a3, s6, zero
+// 0x01091744: 0x1091744: addu  a3, s6, zero
 	ldloc 12
 	stloc 4
-// 0x01091124: 0x1091124: addu  a0, s1, zero
+// 0x01091748: 0x1091748: addu  a0, s1, zero
 	ldloc 13
 	stloc.1
-// 0x01091128: 0x1091128: addiu a1, zero, 14
+// 0x0109174c: 0x109174c: addiu a1, zero, 14
 	ldc.i4.s 14
 	stloc.2
-// 0x0109112c: 0x109112c: sw    s5, 16(sp)
+// 0x01091750: 0x1091750: sw    s5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2376,7 +2376,7 @@ L_1091110:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01091130: 0x1091130: sw    zero, 20(sp)
+// 0x01091754: 0x1091754: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2385,7 +2385,7 @@ L_1091110:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01091134: 0x1091134: jal   0x104e968 lui   s8, 0x80000
+// 0x01091758: 0x1091758: jal   0x104e978 lui   s8, 0x80000
 	ldc.i4 524288
 	stloc 17
 	ldloc.0
@@ -2393,33 +2393,33 @@ L_1091110:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109113c: 0x109113c: addiu s7, zero, -2
+// 0x01091760: 0x1091760: addiu s7, zero, -2
 	ldc.i4.s -2
 	stloc 16
-// 0x01091140: 0x1091140: addu  v0, s6, zero
+// 0x01091764: 0x1091764: addu  v0, s6, zero
 	ldloc 12
 	stloc 6
-// 0x01091144: 0x1091144: addu  s6, s5, zero
+// 0x01091768: 0x1091768: addu  s6, s5, zero
 	ldloc 11
 	stloc 12
-// 0x01091148: 0x1091148: addu  s5, s0, zero
+// 0x0109176c: 0x109176c: addu  s5, s0, zero
 	ldloc 7
 	stloc 11
-// 0x0109114c: 0x109114c: j	 0x109116c addiu s0, zero, 14
+// 0x01091770: 0x1091770: j	 0x1091790 addiu s0, zero, 14
 	ldc.i4.s 14
 	stloc 7
-	br L_109116c
+	br L_1091790
 // --- basic block ---
-L_1091154:
-// 0x01091154: 0x1091154: addu  a1, s0, zero
+L_1091778:
+// 0x01091778: 0x1091778: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01091158: 0x1091158: sw    v0, 48(sp)
+// 0x0109177c: 0x109177c: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2428,7 +2428,7 @@ L_1091154:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109115c: 0x109115c: sw    s6, 16(sp)
+// 0x01091780: 0x1091780: sw    s6, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2437,7 +2437,7 @@ L_1091154:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01091160: 0x1091160: jal   0x104e968 sw    zero, 20(sp)
+// 0x01091784: 0x1091784: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2451,12 +2451,12 @@ L_1091154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01091168: 0x1091168: lw    v0, 48(sp)
+// 0x0109178c: 0x109178c: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2465,17 +2465,17 @@ L_1091154:
 	add
 	ldelem.i4
 	stloc 6
-L_109116c:
-// 0x0109116c: 0x109116c: lw    v1, 9580(s8)
+L_1091790:
+// 0x01091790: 0x1091790: lw    v1, 10044(s8)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 2395
+	ldc.i4 2511
 	add
 	ldelem.i4
 	stloc 8
-// 0x01091170: 0x1091170: lw    a1, 24(sp)
+// 0x01091794: 0x1091794: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2484,83 +2484,83 @@ L_109116c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091174: 0x1091174: addiu t0, v1, -4
+// 0x01091798: 0x1091798: addiu t0, v1, -4
 	ldloc 8
 	ldc.i4.s -4
 	add
 	stloc 9
-// 0x01091178: 0x1091178: slt   t0, a1, t0
+// 0x0109179c: 0x109179c: slt   t0, a1, t0
 	ldloc.2
 	ldloc 9
 	clt
 	stloc 9
-// 0x0109117c: 0x109117c: addu  a0, s1, zero
+// 0x010917a0: 0x10917a0: addu  a0, s1, zero
 	ldloc 13
 	stloc.1
-// 0x01091180: 0x1091180: addu  a2, s5, zero
+// 0x010917a4: 0x10917a4: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x01091184: 0x1091184: bne   t0, zero, 0x10911a8 addu  a3, v0, zero
+// 0x010917a8: 0x10917a8: bne   t0, zero, 0x10917cc addu  a3, v0, zero
 	ldloc 9
 	ldloc 6
 	stloc 4
-	brtrue L_10911a8
+	brtrue L_10917cc
 // --- basic block ---
-// 0x0109118c: 0x109118c: beq   s0, s7, 0x10911b0 sll   zero, zero, 0
+// 0x010917b0: 0x10917b0: beq   s0, s7, 0x10917d4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 16
-	beq  L_10911b0
+	beq  L_10917d4
 // --- basic block ---
-// 0x01091194: 0x1091194: bltz  a1, 0x10911a8 sll   zero, zero, 0
+// 0x010917b8: 0x10917b8: bltz  a1, 0x10917cc sll   zero, zero, 0
 	ldloc.2
 	ldc.i4.s 0
-	blt L_10911a8
+	blt L_10917cc
 // --- basic block ---
-// 0x0109119c: 0x109119c: bgtz  v1, 0x1091154 addiu s0, s0, -2
+// 0x010917c0: 0x10917c0: bgtz  v1, 0x1091778 addiu s0, s0, -2
 	ldloc 8
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc 7
 	ldc.i4.s 0
-	bgt L_1091154
+	bgt L_1091778
 // --- basic block ---
-// 0x010911a4: 0x10911a4: addiu s0, s0, 2
+// 0x010917c8: 0x10917c8: addiu s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-L_10911a8:
-// 0x010911a8: 0x10911a8: bgtz  s0, 0x10911b4 sll   zero, zero, 0
+L_10917cc:
+// 0x010917cc: 0x10917cc: bgtz  s0, 0x10917d8 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bgt L_10911b4
+	bgt L_10917d8
 // --- basic block ---
-L_10911b0:
-// 0x010911b0: 0x10911b0: addiu s0, zero, 14
+L_10917d4:
+// 0x010917d4: 0x10917d4: addiu s0, zero, 14
 	ldc.i4.s 14
 	stloc 7
-L_10911b4:
-// 0x010911b4: 0x10911b4: lui   a1, 0x10000
+L_10917d8:
+// 0x010917d8: 0x10917d8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010911b8: 0x10911b8: addu  a0, s4, zero
+// 0x010917dc: 0x10917dc: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x010911bc: 0x10911bc: addiu a2, sp, 36
+// 0x010917e0: 0x10917e0: addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.3
-// 0x010911c0: 0x10911c0: addiu a1, a1, 18500
+// 0x010917e4: 0x10917e4: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010911c4: 0x10911c4: addiu a3, zero, 3
+// 0x010917e8: 0x10917e8: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010911c8: 0x10911c8: sw    s3, 16(sp)
+// 0x010917ec: 0x10917ec: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2569,7 +2569,7 @@ L_10911b4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010911cc: 0x10911cc: jal   0x1090ecc sw    s2, 20(sp)
+// 0x010917f0: 0x10917f0: jal   0x10914f0 sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2583,29 +2583,29 @@ L_10911b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010911d4: 0x10911d4: lui   a0, 0x10000
+// 0x010917f8: 0x10917f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010911d8: 0x10911d8: addu  a1, s1, zero
+// 0x010917fc: 0x10917fc: addu  a1, s1, zero
 	ldloc 13
 	stloc.2
-// 0x010911dc: 0x10911dc: addu  a2, s0, zero
+// 0x01091800: 0x1091800: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x010911e0: 0x10911e0: addiu a3, zero, 17
+// 0x01091804: 0x1091804: addiu a3, zero, 17
 	ldc.i4.s 17
 	stloc 4
-// 0x010911e4: 0x10911e4: addiu a0, a0, -32516
+// 0x01091808: 0x1091808: addiu a0, a0, -32516
 	ldloc.1
 	ldc.i4 -32516
 	add
 	stloc.1
-// 0x010911e8: 0x10911e8: jal   0x1098d10 addu  s2, v0, zero
+// 0x0109180c: 0x109180c: jal   0x1099358 addu  s2, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -2613,26 +2613,26 @@ L_10911b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010911f0: 0x10911f0: lui   a1, 0x0
+// 0x01091814: 0x1091814: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010911f4: 0x10911f4: addiu a1, a1, 23008
+// 0x01091818: 0x1091818: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010911f8: 0x10911f8: addu  a0, v0, zero
+// 0x0109181c: 0x109181c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010911fc: 0x10911fc: addu  a2, a1, zero
+// 0x01091820: 0x1091820: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01091200: 0x1091200: jal   0x1098fe0 sw    v0, 48(sp)
+// 0x01091824: 0x1091824: jal   0x1099628 sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2644,9 +2644,9 @@ L_10911b4:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01091208: 0x1091208: lw    v0, 48(sp)
+// 0x0109182c: 0x109182c: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2655,24 +2655,24 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109120c: 0x109120c: addu  a0, s2, zero
+// 0x01091830: 0x1091830: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01091210: 0x1091210: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01091834: 0x1091834: jal   0x109950c addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01091218: 0x1091218: lw    ra, 92(sp)
-// 0x0109121c: 0x109121c: addu  v0, s2, zero
+// 0x0109183c: 0x109183c: lw    ra, 92(sp)
+// 0x01091840: 0x1091840: addu  v0, s2, zero
 	ldloc 10
 	stloc 6
-// 0x01091220: 0x1091220: lw    s8, 88(sp)
+// 0x01091844: 0x1091844: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2681,7 +2681,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01091224: 0x1091224: lw    s7, 84(sp)
+// 0x01091848: 0x1091848: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2690,7 +2690,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01091228: 0x1091228: lw    s6, 80(sp)
+// 0x0109184c: 0x109184c: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2699,7 +2699,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109122c: 0x109122c: lw    s5, 76(sp)
+// 0x01091850: 0x1091850: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2708,7 +2708,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091230: 0x1091230: lw    s4, 72(sp)
+// 0x01091854: 0x1091854: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2717,7 +2717,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01091234: 0x1091234: lw    s3, 68(sp)
+// 0x01091858: 0x1091858: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2726,7 +2726,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01091238: 0x1091238: lw    s2, 64(sp)
+// 0x0109185c: 0x109185c: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2735,7 +2735,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109123c: 0x109123c: lw    s1, 60(sp)
+// 0x01091860: 0x1091860: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2744,7 +2744,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01091240: 0x1091240: lw    s0, 56(sp)
+// 0x01091864: 0x1091864: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2753,7 +2753,7 @@ L_10911b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01091244: 0x1091244: jr    ra addiu sp, sp, 96
+// 0x01091868: 0x1091868: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -2765,7 +2765,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_button_long_click_109124c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_long_click_1091870(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s3,int32 s1,int32 ra)
@@ -2812,12 +2812,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109124c: 0x109124c: addiu sp, sp, -40
+// 0x01091870: 0x1091870: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01091250: 0x1091250: sw    s3, 32(sp)
+// 0x01091874: 0x1091874: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2826,19 +2826,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01091254: 0x1091254: lui   s3, 0x80000
+// 0x01091878: 0x1091878: lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01091258: 0x1091258: lw    v0, 9584(s3)
+// 0x0109187c: 0x109187c: lw    v0, 10048(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2396
+	ldc.i4 2512
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109125c: 0x109125c: sw    s1, 24(sp)
+// 0x01091880: 0x1091880: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2847,7 +2847,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01091260: 0x1091260: sw    s0, 20(sp)
+// 0x01091884: 0x1091884: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2856,8 +2856,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01091264: 0x1091264: sw    ra, 36(sp)
-// 0x01091268: 0x1091268: sw    s2, 28(sp)
+// 0x01091888: 0x1091888: sw    ra, 36(sp)
+// 0x0109188c: 0x109188c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2866,7 +2866,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109126c: 0x109126c: sw    zero, 136(a0)
+// 0x01091890: 0x1091890: sw    zero, 136(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2875,7 +2875,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01091270: 0x1091270: lw    s1, 164(a0)
+// 0x01091894: 0x1091894: lw    s1, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2884,57 +2884,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091274: 0x1091274: bne   v0, zero, 0x10912a8 addu  s0, a0, zero
+// 0x01091898: 0x1091898: bne   v0, zero, 0x10918cc addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 8
-	brtrue L_10912a8
+	brtrue L_10918cc
 // --- basic block ---
-// 0x0109127c: 0x109127c: jal   0x10518a8 addiu a0, zero, 1
+// 0x010918a0: 0x10918a0: jal   0x10518b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01091284: 0x1091284: lui   s2, 0x10000
+// 0x010918a8: 0x10918a8: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01091288: 0x1091288: addu  a0, v0, zero
+// 0x010918ac: 0x10918ac: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0109128c: 0x109128c: addiu a1, s2, -15908
+// 0x010918b0: 0x10918b0: addiu a1, s2, -15908
 	ldloc 9
 	ldc.i4 -15908
 	add
 	stloc.2
-// 0x01091290: 0x1091290: jal   0x10518cc sw    v0, 9584(s3)
+// 0x010918b4: 0x10918b4: jal   0x10518dc sw    v0, 10048(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2396
+	ldc.i4 2512
 	add
 	ldloc 6
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01091298: 0x1091298: addiu a2, s2, -15908
+// 0x010918bc: 0x10918bc: addiu a2, s2, -15908
 	ldloc 9
 	ldc.i4 -15908
 	add
 	stloc.3
-// 0x0109129c: 0x109129c: addiu a0, zero, 1
+// 0x010918c0: 0x10918c0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010912a0: 0x10912a0: jal   0x10a1918 addu  a1, zero, zero
+// 0x010918c4: 0x10918c4: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2942,36 +2942,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10912a8:
-// 0x010912a8: 0x10912a8: lui   v0, 0x80000
+L_10918cc:
+// 0x010918cc: 0x10918cc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010912ac: 0x10912ac: lw    a0, 9584(v0)
+// 0x010918d0: 0x10918d0: lw    a0, 10048(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2396
+	ldc.i4 2512
 	add
 	ldelem.i4
 	stloc.1
-// 0x010912b0: 0x10912b0: jal   0x105195c sll   zero, zero, 0
+// 0x010918d4: 0x10918d4: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010912b8: 0x10912b8: lw    v0, 112(s0)
+// 0x010918dc: 0x10918dc: lw    v0, 112(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2980,20 +2980,20 @@ L_10912a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010912bc: 0x10912bc: sll   zero, zero, 0
-// 0x010912c0: 0x10912c0: beq   v0, zero, 0x10912d4 addu  a0, s0, zero
+// 0x010918e0: 0x10918e0: sll   zero, zero, 0
+// 0x010918e4: 0x10918e4: beq   v0, zero, 0x10918f8 addu  a0, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
-	brfalse L_10912d4
+	brfalse L_10918f8
 // --- basic block ---
-// 0x010912c8: 0x10912c8: lui   a1, 0x20000
+// 0x010918ec: 0x10918ec: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010912cc: 0x10912cc: jalr  v0 addiu a1, a1, -3728
+// 0x010918f0: 0x10918f0: jalr  v0 addiu a1, a1, -3264
 	ldloc 6
 	ldloc.2
-	ldc.i4 -3728
+	ldc.i4 -3264
 	add
 	stloc.2
 	ldloc.0
@@ -3006,19 +3006,19 @@ L_10912a8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10912d4:
-// 0x010912d4: 0x10912d4: lw    ra, 36(sp)
-// 0x010912d8: 0x10912d8: sw    zero, 0(s1)
+L_10918f8:
+// 0x010918f8: 0x10918f8: lw    ra, 36(sp)
+// 0x010918fc: 0x10918fc: sw    zero, 0(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010912dc: 0x10912dc: addiu v0, zero, 1
+// 0x01091900: 0x1091900: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010912e0: 0x10912e0: lw    s3, 32(sp)
+// 0x01091904: 0x1091904: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3027,7 +3027,7 @@ L_10912d4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010912e4: 0x10912e4: lw    s2, 28(sp)
+// 0x01091908: 0x1091908: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3036,7 +3036,7 @@ L_10912d4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010912e8: 0x10912e8: lw    s1, 24(sp)
+// 0x0109190c: 0x109190c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3045,7 +3045,7 @@ L_10912d4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010912ec: 0x10912ec: lw    s0, 20(sp)
+// 0x01091910: 0x1091910: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3054,7 +3054,7 @@ L_10912d4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010912f0: 0x10912f0: jr    ra addiu sp, sp, 40
+// 0x01091914: 0x1091914: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3066,7 +3066,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_button_short_click_10912f8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_button_short_click_109191c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3101,7 +3101,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010912f8: 0x10912f8: lw    a1, 164(a0)
+// 0x0109191c: 0x109191c: lw    a1, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3110,30 +3110,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010912fc: 0x10912fc: addiu sp, sp, -24
+// 0x01091920: 0x1091920: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01091300: 0x1091300: lw    a3, 0(a1)
+// 0x01091924: 0x1091924: lw    a3, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01091304: 0x1091304: addiu a2, zero, 2
+// 0x01091928: 0x1091928: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01091308: 0x1091308: sw    ra, 20(sp)
-// 0x0109130c: 0x109130c: beq   a3, a2, 0x1091344 addiu v0, zero, 1
+// 0x0109192c: 0x109192c: sw    ra, 20(sp)
+// 0x01091930: 0x1091930: beq   a3, a2, 0x1091968 addiu v0, zero, 1
 	ldloc 4
 	ldloc.3
 	ldc.i4.1
 	stloc 5
-	beq  L_1091344
+	beq  L_1091968
 // --- basic block ---
-// 0x01091314: 0x1091314: lw    v0, 112(a0)
+// 0x01091938: 0x1091938: lw    v0, 112(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3142,8 +3142,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091318: 0x1091318: sll   zero, zero, 0
-// 0x0109131c: 0x109131c: beq   v0, zero, 0x1091338 sw    zero, 136(a0)
+// 0x0109193c: 0x109193c: sll   zero, zero, 0
+// 0x01091940: 0x1091940: beq   v0, zero, 0x109195c sw    zero, 136(a0)
 	ldloc 5
 	ldloc 6
 	ldloc.1
@@ -3153,15 +3153,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1091338
+	brfalse L_109195c
 // --- basic block ---
-// 0x01091324: 0x1091324: lui   a1, 0x20000
+// 0x01091948: 0x1091948: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01091328: 0x1091328: jalr  v0 addiu a1, a1, -3888
+// 0x0109194c: 0x109194c: jalr  v0 addiu a1, a1, -3424
 	ldloc 5
 	ldloc.2
-	ldc.i4 -3888
+	ldc.i4 -3424
 	add
 	stloc.2
 	ldloc.0
@@ -3174,13 +3174,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01091330: 0x1091330: j	 0x1091344 addiu v0, zero, 1
+// 0x01091954: 0x1091954: j	 0x1091968 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1091344
+	br L_1091968
 // --- basic block ---
-L_1091338:
-// 0x01091338: 0x1091338: jal   0x1021900 sw    zero, 0(a1)
+L_109195c:
+// 0x0109195c: 0x109195c: jal   0x1021910 sw    zero, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3192,18 +3192,18 @@ L_1091338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01091340: 0x1091340: addu  v0, zero, zero
+// 0x01091964: 0x1091964: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1091344:
-// 0x01091344: 0x1091344: lw    ra, 20(sp)
-// 0x01091348: 0x1091348: sll   zero, zero, 0
-// 0x0109134c: 0x109134c: jr    ra addiu sp, sp, 24
+L_1091968:
+// 0x01091968: 0x1091968: lw    ra, 20(sp)
+// 0x0109196c: 0x109196c: sll   zero, zero, 0
+// 0x01091970: 0x1091970: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3215,7 +3215,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_1091354(int32,int32,int32,int32,int32)
+.method public static int32 draw_1091978(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
@@ -3262,19 +3262,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01091354: 0x1091354: addiu sp, sp, -72
+// 0x01091978: 0x1091978: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01091358: 0x1091358: lw    v1, 0(a1)
+// 0x0109197c: 0x109197c: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109135c: 0x109135c: lw    v0, 4(a1)
+// 0x01091980: 0x1091980: lw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3283,7 +3283,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091360: 0x1091360: sw    s3, 64(sp)
+// 0x01091984: 0x1091984: sw    s3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3292,10 +3292,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01091364: 0x1091364: addu  s3, a2, zero
+// 0x01091988: 0x1091988: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x01091368: 0x1091368: sw    s0, 52(sp)
+// 0x0109198c: 0x109198c: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3304,30 +3304,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109136c: 0x109136c: addiu a2, sp, 24
+// 0x01091990: 0x1091990: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01091370: 0x1091370: addu  s0, a1, zero
+// 0x01091994: 0x1091994: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01091374: 0x1091374: addiu a3, sp, 28
+// 0x01091998: 0x1091998: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01091378: 0x1091378: addiu a1, sp, 32
+// 0x0109199c: 0x109199c: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0109137c: 0x109137c: andi  s3, s3, 1
+// 0x010919a0: 0x10919a0: andi  s3, s3, 1
 	ldloc 11
 	ldc.i4.1
 	and
 	stloc 11
-// 0x01091380: 0x1091380: sw    s2, 60(sp)
+// 0x010919a4: 0x10919a4: sw    s2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3336,7 +3336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01091384: 0x1091384: sw    s1, 56(sp)
+// 0x010919a8: 0x10919a8: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3345,8 +3345,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01091388: 0x1091388: sw    ra, 68(sp)
-// 0x0109138c: 0x109138c: sw    v1, 36(sp)
+// 0x010919ac: 0x10919ac: sw    ra, 68(sp)
+// 0x010919b0: 0x10919b0: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3355,7 +3355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01091390: 0x1091390: sw    v0, 40(sp)
+// 0x010919b4: 0x10919b4: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3364,7 +3364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091394: 0x1091394: sw    zero, 24(sp)
+// 0x010919b8: 0x10919b8: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3373,7 +3373,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01091398: 0x1091398: lw    s2, 164(a0)
+// 0x010919bc: 0x10919bc: lw    s2, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3382,7 +3382,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109139c: 0x109139c: jal   0x1090a34 addu  s1, a0, zero
+// 0x010919c0: 0x10919c0: jal   0x1091058 addu  s1, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -3390,16 +3390,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::get_state_1090a34(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::get_state_1091058(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010913a4: 0x10913a4: beq   s3, zero, 0x109146c sll   zero, zero, 0
+// 0x010919c8: 0x10919c8: beq   s3, zero, 0x1091a90 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_109146c
+	brfalse L_1091a90
 // --- basic block ---
-// 0x010913ac: 0x10913ac: lw    a2, 32(sp)
+// 0x010919d0: 0x10919d0: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3408,23 +3408,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010913b0: 0x10913b0: sll   zero, zero, 0
-// 0x010913b4: 0x10913b4: addiu v0, a2, 48
+// 0x010919d4: 0x10919d4: sll   zero, zero, 0
+// 0x010919d8: 0x10919d8: addiu v0, a2, 48
 	ldloc.3
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x010913b8: 0x10913b8: sll   v0, v0, 2
+// 0x010919dc: 0x10919dc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010913bc: 0x10913bc: addu  v0, s2, v0
+// 0x010919e0: 0x10919e0: addu  v0, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x010913c0: 0x10913c0: lw    v0, 4(v0)
+// 0x010919e4: 0x10919e4: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3433,29 +3433,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010913c4: 0x10913c4: sll   zero, zero, 0
-// 0x010913c8: 0x10913c8: bne   v0, zero, 0x10913e4 sll   a2, a2, 6
+// 0x010919e8: 0x10919e8: sll   zero, zero, 0
+// 0x010919ec: 0x10919ec: bne   v0, zero, 0x1091a08 sll   a2, a2, 6
 	ldloc 5
 	ldloc.3
 	ldc.i4.6
 	shl
 	stloc.3
-	brtrue L_10913e4
+	brtrue L_1091a08
 // --- basic block ---
-// 0x010913d0: 0x10913d0: addiu v0, s2, 4
+// 0x010919f4: 0x10919f4: addiu v0, s2, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010913d4: 0x10913d4: addu  a2, v0, a2
+// 0x010919f8: 0x10919f8: addu  a2, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc.3
-// 0x010913d8: 0x10913d8: addu  a0, zero, zero
+// 0x010919fc: 0x10919fc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010913dc: 0x10913dc: jal   0x10a1918 addiu a1, zero, 1
+// 0x01091a00: 0x1091a00: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3463,13 +3463,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10913e4:
-// 0x010913e4: 0x10913e4: sw    v0, 24(sp)
+L_1091a08:
+// 0x01091a08: 0x1091a08: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3478,7 +3478,7 @@ L_10913e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010913e8: 0x10913e8: lw    v0, 24(sp)
+// 0x01091a0c: 0x1091a0c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3487,16 +3487,16 @@ L_10913e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010913ec: 0x10913ec: sll   zero, zero, 0
-// 0x010913f0: 0x10913f0: bne   v0, zero, 0x1091424 addiu a2, s2, 4
+// 0x01091a10: 0x1091a10: sll   zero, zero, 0
+// 0x01091a14: 0x1091a14: bne   v0, zero, 0x1091a48 addiu a2, s2, 4
 	ldloc 5
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc.3
-	brtrue L_1091424
+	brtrue L_1091a48
 // --- basic block ---
-// 0x010913f8: 0x10913f8: lw    v0, 196(s2)
+// 0x01091a1c: 0x1091a1c: lw    v0, 196(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3505,8 +3505,8 @@ L_10913e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010913fc: 0x10913fc: sll   zero, zero, 0
-// 0x01091400: 0x1091400: sw    v0, 24(sp)
+// 0x01091a20: 0x1091a20: sll   zero, zero, 0
+// 0x01091a24: 0x1091a24: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3515,7 +3515,7 @@ L_10913e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091404: 0x1091404: lw    v0, 24(sp)
+// 0x01091a28: 0x1091a28: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3524,15 +3524,15 @@ L_10913e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091408: 0x1091408: sll   zero, zero, 0
-// 0x0109140c: 0x109140c: bne   v0, zero, 0x1091424 sll   zero, zero, 0
+// 0x01091a2c: 0x1091a2c: sll   zero, zero, 0
+// 0x01091a30: 0x1091a30: bne   v0, zero, 0x1091a48 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1091424
+	brtrue L_1091a48
 // --- basic block ---
-// 0x01091414: 0x1091414: addu  a0, zero, zero
+// 0x01091a38: 0x1091a38: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01091418: 0x1091418: jal   0x10a1918 addiu a1, zero, 1
+// 0x01091a3c: 0x1091a3c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3540,12 +3540,12 @@ L_10913e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091420: 0x1091420: sw    v0, 24(sp)
+// 0x01091a44: 0x1091a44: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3554,8 +3554,8 @@ L_10913e4:
 	add
 	ldloc 5
 	stelem.i4
-L_1091424:
-// 0x01091424: 0x1091424: lw    a0, 24(sp)
+L_1091a48:
+// 0x01091a48: 0x1091a48: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3564,12 +3564,12 @@ L_1091424:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091428: 0x1091428: sll   zero, zero, 0
-// 0x0109142c: 0x109142c: bne   a0, zero, 0x1091440 sll   zero, zero, 0
+// 0x01091a4c: 0x1091a4c: sll   zero, zero, 0
+// 0x01091a50: 0x1091a50: bne   a0, zero, 0x1091a64 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1091440
+	brtrue L_1091a64
 // --- basic block ---
-// 0x01091434: 0x1091434: sw    zero, 28(s1)
+// 0x01091a58: 0x1091a58: sw    zero, 28(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3578,7 +3578,7 @@ L_1091424:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01091438: 0x1091438: j	 0x10914fc sw    zero, 24(s1)
+// 0x01091a5c: 0x1091a5c: j	 0x1091b20 sw    zero, 24(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3587,29 +3587,29 @@ L_1091424:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10914fc
+	br L_1091b20
 // --- basic block ---
-L_1091440:
-// 0x01091440: 0x1091440: lw    s1, 0(s0)
+L_1091a64:
+// 0x01091a64: 0x1091a64: lw    s1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01091444: 0x1091444: jal   0x104dffc sll   zero, zero, 0
+// 0x01091a68: 0x1091a68: jal   0x104e00c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109144c: 0x109144c: addu  v0, v0, s1
+// 0x01091a70: 0x1091a70: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x01091450: 0x1091450: lw    a0, 24(sp)
+// 0x01091a74: 0x1091a74: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3618,7 +3618,7 @@ L_1091440:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091454: 0x1091454: lw    s1, 4(s0)
+// 0x01091a78: 0x1091a78: lw    s1, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3627,7 +3627,7 @@ L_1091440:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01091458: 0x1091458: jal   0x104e020 sw    v0, 8(s0)
+// 0x01091a7c: 0x1091a7c: jal   0x104e030 sw    v0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3637,17 +3637,17 @@ L_1091440:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091460: 0x1091460: addu  v0, v0, s1
+// 0x01091a84: 0x1091a84: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x01091464: 0x1091464: j	 0x10914fc sw    v0, 12(s0)
+// 0x01091a88: 0x1091a88: j	 0x1091b20 sw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3656,10 +3656,10 @@ L_1091440:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10914fc
+	br L_1091b20
 // --- basic block ---
-L_109146c:
-// 0x0109146c: 0x109146c: lw    a0, 24(sp)
+L_1091a90:
+// 0x01091a90: 0x1091a90: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3668,14 +3668,14 @@ L_109146c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091470: 0x1091470: sll   zero, zero, 0
-// 0x01091474: 0x1091474: bne   a0, zero, 0x10914a4 lui   a1, 0x20000
+// 0x01091a94: 0x1091a94: sll   zero, zero, 0
+// 0x01091a98: 0x1091a98: bne   a0, zero, 0x1091ac8 lui   a1, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10914a4
+	brtrue L_1091ac8
 // --- basic block ---
-// 0x0109147c: 0x109147c: lw    v0, 16(s1)
+// 0x01091aa0: 0x1091aa0: lw    v0, 16(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3684,26 +3684,26 @@ L_109146c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091480: 0x1091480: lui   a3, 0x20000
+// 0x01091aa4: 0x1091aa4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01091484: 0x1091484: addiu a1, a1, -3868
+// 0x01091aa8: 0x1091aa8: addiu a1, a1, -3404
 	ldloc.2
-	ldc.i4 -3868
+	ldc.i4 -3404
 	add
 	stloc.2
-// 0x01091488: 0x1091488: addiu a3, a3, -3716
+// 0x01091aac: 0x1091aac: addiu a3, a3, -3252
 	ldloc 4
-	ldc.i4 -3716
+	ldc.i4 -3252
 	add
 	stloc 4
-// 0x0109148c: 0x109148c: addiu a0, zero, 4
+// 0x01091ab0: 0x1091ab0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01091490: 0x1091490: addiu a2, zero, 153
+// 0x01091ab4: 0x1091ab4: addiu a2, zero, 153
 	ldc.i4 153
 	stloc.3
-// 0x01091494: 0x1091494: jal   0x100449c sw    v0, 16(sp)
+// 0x01091ab8: 0x1091ab8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3722,11 +3722,11 @@ L_109146c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109149c: 0x109149c: j	 0x10914fc sll   zero, zero, 0
-	br L_10914fc
+// 0x01091ac0: 0x1091ac0: j	 0x1091b20 sll   zero, zero, 0
+	br L_1091b20
 // --- basic block ---
-L_10914a4:
-// 0x010914a4: 0x10914a4: lw    v0, 32(sp)
+L_1091ac8:
+// 0x01091ac8: 0x1091ac8: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3735,37 +3735,37 @@ L_10914a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010914a8: 0x10914a8: sll   zero, zero, 0
-// 0x010914ac: 0x10914ac: beq   v0, zero, 0x10914e0 addiu a1, sp, 36
+// 0x01091acc: 0x1091acc: sll   zero, zero, 0
+// 0x01091ad0: 0x1091ad0: beq   v0, zero, 0x1091b04 addiu a1, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-	brfalse L_10914e0
+	brfalse L_1091b04
 // --- basic block ---
-// 0x010914b4: 0x10914b4: addiu v1, zero, 1
+// 0x01091ad8: 0x1091ad8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010914b8: 0x10914b8: beq   v0, v1, 0x10914d0 addiu v1, zero, 2
+// 0x01091adc: 0x1091adc: beq   v0, v1, 0x1091af4 addiu v1, zero, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	beq  L_10914d0
+	beq  L_1091af4
 // --- basic block ---
-// 0x010914c0: 0x10914c0: bne   v0, v1, 0x10914fc addu  a2, zero, zero
+// 0x01091ae4: 0x1091ae4: bne   v0, v1, 0x1091b20 addu  a2, zero, zero
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc.3
-	bne.un L_10914fc
+	bne.un L_1091b20
 // --- basic block ---
-// 0x010914c8: 0x10914c8: j	 0x10914e4 sll   zero, zero, 0
-	br L_10914e4
+// 0x01091aec: 0x1091aec: j	 0x1091b08 sll   zero, zero, 0
+	br L_1091b08
 // --- basic block ---
-L_10914d0:
-// 0x010914d0: 0x10914d0: lw    v1, 28(sp)
+L_1091af4:
+// 0x01091af4: 0x1091af4: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3774,48 +3774,48 @@ L_10914d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010914d4: 0x10914d4: sll   zero, zero, 0
-// 0x010914d8: 0x10914d8: bne   v1, v0, 0x10914ec addiu a1, sp, 36
+// 0x01091af8: 0x1091af8: sll   zero, zero, 0
+// 0x01091afc: 0x1091afc: bne   v1, v0, 0x1091b10 addiu a1, sp, 36
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-	bne.un L_10914ec
+	bne.un L_1091b10
 // --- basic block ---
-L_10914e0:
-// 0x010914e0: 0x10914e0: addu  a2, zero, zero
+L_1091b04:
+// 0x01091b04: 0x1091b04: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_10914e4:
-// 0x010914e4: 0x10914e4: j	 0x10914f4 addu  a3, zero, zero
+L_1091b08:
+// 0x01091b08: 0x1091b08: j	 0x1091b18 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_10914f4
+	br L_1091b18
 // --- basic block ---
-L_10914ec:
-// 0x010914ec: 0x10914ec: addu  a2, zero, zero
+L_1091b10:
+// 0x01091b10: 0x1091b10: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010914f0: 0x10914f0: addiu a3, zero, 1
+// 0x01091b14: 0x1091b14: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-L_10914f4:
-// 0x010914f4: 0x10914f4: jal   0x104f4a8 sll   zero, zero, 0
+L_1091b18:
+// 0x01091b18: 0x1091b18: jal   0x104f4b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10914fc:
-// 0x010914fc: 0x10914fc: lw    ra, 68(sp)
-// 0x01091500: 0x1091500: lw    s3, 64(sp)
+L_1091b20:
+// 0x01091b20: 0x1091b20: lw    ra, 68(sp)
+// 0x01091b24: 0x1091b24: lw    s3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3824,7 +3824,7 @@ L_10914fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091504: 0x1091504: lw    s2, 60(sp)
+// 0x01091b28: 0x1091b28: lw    s2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3833,7 +3833,7 @@ L_10914fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01091508: 0x1091508: lw    s1, 56(sp)
+// 0x01091b2c: 0x1091b2c: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3842,7 +3842,7 @@ L_10914fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109150c: 0x109150c: lw    s0, 52(sp)
+// 0x01091b30: 0x1091b30: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3851,7 +3851,7 @@ L_10914fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01091510: 0x1091510: jr    ra addiu sp, sp, 72
+// 0x01091b34: 0x1091b34: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3863,7 +3863,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_input_type_1091518(int32)
+.method public static int32 get_input_type_1091b3c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -3883,7 +3883,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01091518: 0x1091518: lw    v0, 164(a0)
+// 0x01091b3c: 0x1091b3c: lw    v0, 164(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -3892,8 +3892,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109151c: 0x109151c: sll   zero, zero, 0
-// 0x01091520: 0x1091520: lw    v0, 8(v0)
+// 0x01091b40: 0x1091b40: sll   zero, zero, 0
+// 0x01091b44: 0x1091b44: lw    v0, 8(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -3902,13 +3902,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091524: 0x1091524: jr    ra sll   zero, zero, 0
+// 0x01091b48: 0x1091b48: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_list_get_row_109152c(int32,int32)
+.method public static int32 ssd_list_get_row_1091b50(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -3931,7 +3931,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109152c: 0x109152c: lw    v0, 164(a0)
+// 0x01091b50: 0x1091b50: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -3940,12 +3940,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091530: 0x1091530: sll   a1, a1, 2
+// 0x01091b54: 0x1091b54: sll   a1, a1, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01091534: 0x1091534: lw    v0, 12(v0)
+// 0x01091b58: 0x1091b58: lw    v0, 12(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -3954,26 +3954,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091538: 0x1091538: sll   zero, zero, 0
-// 0x0109153c: 0x109153c: addu  a1, v0, a1
+// 0x01091b5c: 0x1091b5c: sll   zero, zero, 0
+// 0x01091b60: 0x1091b60: addu  a1, v0, a1
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01091540: 0x1091540: lw    v0, 0(a1)
+// 0x01091b64: 0x1091b64: lw    v0, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01091544: 0x1091544: jr    ra sll   zero, zero, 0
+// 0x01091b68: 0x1091b68: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 ssd_list_selected_string_10915ac(int32,int32,int32)
+.method public static int32 ssd_list_selected_string_1091bd0(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4002,7 +4002,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010915ac: 0x10915ac: lw    v0, 164(a0)
+// 0x01091bd0: 0x1091bd0: lw    v0, 164(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4011,8 +4011,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010915b0: 0x10915b0: sll   zero, zero, 0
-// 0x010915b4: 0x10915b4: lw    v1, 28(v0)
+// 0x01091bd4: 0x1091bd4: sll   zero, zero, 0
+// 0x01091bd8: 0x1091bd8: lw    v1, 28(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4021,14 +4021,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010915b8: 0x10915b8: sll   zero, zero, 0
-// 0x010915bc: 0x10915bc: beq   v1, zero, 0x1091624 addu  v1, zero, zero
+// 0x01091bdc: 0x1091bdc: sll   zero, zero, 0
+// 0x01091be0: 0x1091be0: beq   v1, zero, 0x1091c48 addu  v1, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_1091624
+	brfalse L_1091c48
 // --- basic block ---
-// 0x010915c4: 0x10915c4: lw    a1, 4(v0)
+// 0x01091be8: 0x1091be8: lw    a1, 4(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4037,15 +4037,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010915c8: 0x10915c8: j	 0x109161c slt   a0, v1, a1
+// 0x01091bec: 0x1091bec: j	 0x1091c40 slt   a0, v1, a1
 	ldloc 4
 	ldloc.1
 	clt
 	stloc.0
-	br L_109161c
+	br L_1091c40
 // --- basic block ---
-L_10915d0:
-// 0x010915d0: 0x10915d0: lw    a0, 12(v0)
+L_1091bf4:
+// 0x01091bf4: 0x1091bf4: lw    a0, 12(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4054,21 +4054,21 @@ L_10915d0:
 	add
 	ldelem.i4
 	stloc.0
-// 0x010915d4: 0x10915d4: sll   zero, zero, 0
-// 0x010915d8: 0x10915d8: addu  a2, a0, a2
+// 0x01091bf8: 0x1091bf8: sll   zero, zero, 0
+// 0x01091bfc: 0x1091bfc: addu  a2, a0, a2
 	ldloc.0
 	ldloc.2
 	add
 	stloc.2
-// 0x010915dc: 0x10915dc: lw    a0, 0(a2)
+// 0x01091c00: 0x1091c00: lw    a0, 0(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x010915e0: 0x10915e0: sll   zero, zero, 0
-// 0x010915e4: 0x10915e4: lw    a2, 60(a0)
+// 0x01091c04: 0x1091c04: sll   zero, zero, 0
+// 0x01091c08: 0x1091c08: lw    a2, 60(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4077,16 +4077,16 @@ L_10915d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010915e8: 0x10915e8: sll   zero, zero, 0
-// 0x010915ec: 0x10915ec: beq   a2, zero, 0x1091618 addiu v1, v1, 1
+// 0x01091c0c: 0x1091c0c: sll   zero, zero, 0
+// 0x01091c10: 0x1091c10: beq   a2, zero, 0x1091c3c addiu v1, v1, 1
 	ldloc.2
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-	brfalse L_1091618
+	brfalse L_1091c3c
 // --- basic block ---
-// 0x010915f4: 0x10915f4: lw    a1, 116(a0)
+// 0x01091c18: 0x1091c18: lw    a1, 116(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4095,7 +4095,7 @@ L_10915d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010915f8: 0x10915f8: lw    a0, 48(v0)
+// 0x01091c1c: 0x1091c1c: lw    a0, 48(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4104,7 +4104,7 @@ L_10915d0:
 	add
 	ldelem.i4
 	stloc.0
-// 0x010915fc: 0x10915fc: lw    v1, 32(v0)
+// 0x01091c20: 0x1091c20: lw    v1, 32(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4113,48 +4113,48 @@ L_10915d0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01091600: 0x1091600: addu  v0, a1, a0
+// 0x01091c24: 0x1091c24: addu  v0, a1, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.3
-// 0x01091604: 0x1091604: sll   v0, v0, 2
+// 0x01091c28: 0x1091c28: sll   v0, v0, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01091608: 0x1091608: addu  v0, v1, v0
+// 0x01091c2c: 0x1091c2c: addu  v0, v1, v0
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x0109160c: 0x109160c: lw    v0, 0(v0)
+// 0x01091c30: 0x1091c30: lw    v0, 0(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01091610: 0x1091610: jr    ra sll   zero, zero, 0
+// 0x01091c34: 0x1091c34: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1091618:
-// 0x01091618: 0x1091618: slt   a0, v1, a1
+L_1091c3c:
+// 0x01091c3c: 0x1091c3c: slt   a0, v1, a1
 	ldloc 4
 	ldloc.1
 	clt
 	stloc.0
-L_109161c:
-// 0x0109161c: 0x109161c: bne   a0, zero, 0x10915d0 sll   a2, v1, 2
+L_1091c40:
+// 0x01091c40: 0x1091c40: bne   a0, zero, 0x1091bf4 sll   a2, v1, 2
 	ldloc.0
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc.2
-	brtrue L_10915d0
+	brtrue L_1091bf4
 // --- basic block ---
-L_1091624:
-// 0x01091624: 0x1091624: jr    ra addu  v0, zero, zero
+L_1091c48:
+// 0x01091c48: 0x1091c48: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	br __CIBYL_function_return
@@ -4164,7 +4164,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 ssd_list_selected_value_109162c(int32,int32,int32)
+.method public static int32 ssd_list_selected_value_1091c50(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4193,7 +4193,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109162c: 0x109162c: lw    v0, 164(a0)
+// 0x01091c50: 0x1091c50: lw    v0, 164(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4202,8 +4202,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01091630: 0x1091630: sll   zero, zero, 0
-// 0x01091634: 0x1091634: lw    v1, 28(v0)
+// 0x01091c54: 0x1091c54: sll   zero, zero, 0
+// 0x01091c58: 0x1091c58: lw    v1, 28(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4212,14 +4212,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01091638: 0x1091638: sll   zero, zero, 0
-// 0x0109163c: 0x109163c: beq   v1, zero, 0x10916a4 addu  v1, zero, zero
+// 0x01091c5c: 0x1091c5c: sll   zero, zero, 0
+// 0x01091c60: 0x1091c60: beq   v1, zero, 0x1091cc8 addu  v1, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_10916a4
+	brfalse L_1091cc8
 // --- basic block ---
-// 0x01091644: 0x1091644: lw    a1, 4(v0)
+// 0x01091c68: 0x1091c68: lw    a1, 4(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4228,15 +4228,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091648: 0x1091648: j	 0x109169c slt   a0, v1, a1
+// 0x01091c6c: 0x1091c6c: j	 0x1091cc0 slt   a0, v1, a1
 	ldloc 4
 	ldloc.1
 	clt
 	stloc.0
-	br L_109169c
+	br L_1091cc0
 // --- basic block ---
-L_1091650:
-// 0x01091650: 0x1091650: lw    a0, 12(v0)
+L_1091c74:
+// 0x01091c74: 0x1091c74: lw    a0, 12(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4245,21 +4245,21 @@ L_1091650:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01091654: 0x1091654: sll   zero, zero, 0
-// 0x01091658: 0x1091658: addu  a2, a0, a2
+// 0x01091c78: 0x1091c78: sll   zero, zero, 0
+// 0x01091c7c: 0x1091c7c: addu  a2, a0, a2
 	ldloc.0
 	ldloc.2
 	add
 	stloc.2
-// 0x0109165c: 0x109165c: lw    a0, 0(a2)
+// 0x01091c80: 0x1091c80: lw    a0, 0(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x01091660: 0x1091660: sll   zero, zero, 0
-// 0x01091664: 0x1091664: lw    a2, 60(a0)
+// 0x01091c84: 0x1091c84: sll   zero, zero, 0
+// 0x01091c88: 0x1091c88: lw    a2, 60(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4268,16 +4268,16 @@ L_1091650:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091668: 0x1091668: sll   zero, zero, 0
-// 0x0109166c: 0x109166c: beq   a2, zero, 0x1091698 addiu v1, v1, 1
+// 0x01091c8c: 0x1091c8c: sll   zero, zero, 0
+// 0x01091c90: 0x1091c90: beq   a2, zero, 0x1091cbc addiu v1, v1, 1
 	ldloc.2
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-	brfalse L_1091698
+	brfalse L_1091cbc
 // --- basic block ---
-// 0x01091674: 0x1091674: lw    a1, 116(a0)
+// 0x01091c98: 0x1091c98: lw    a1, 116(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4286,7 +4286,7 @@ L_1091650:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091678: 0x1091678: lw    a0, 48(v0)
+// 0x01091c9c: 0x1091c9c: lw    a0, 48(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4295,7 +4295,7 @@ L_1091650:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0109167c: 0x109167c: lw    v1, 36(v0)
+// 0x01091ca0: 0x1091ca0: lw    v1, 36(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -4304,48 +4304,48 @@ L_1091650:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01091680: 0x1091680: addu  v0, a1, a0
+// 0x01091ca4: 0x1091ca4: addu  v0, a1, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.3
-// 0x01091684: 0x1091684: sll   v0, v0, 2
+// 0x01091ca8: 0x1091ca8: sll   v0, v0, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01091688: 0x1091688: addu  v0, v1, v0
+// 0x01091cac: 0x1091cac: addu  v0, v1, v0
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x0109168c: 0x109168c: lw    v0, 0(v0)
+// 0x01091cb0: 0x1091cb0: lw    v0, 0(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01091690: 0x1091690: jr    ra sll   zero, zero, 0
+// 0x01091cb4: 0x1091cb4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1091698:
-// 0x01091698: 0x1091698: slt   a0, v1, a1
+L_1091cbc:
+// 0x01091cbc: 0x1091cbc: slt   a0, v1, a1
 	ldloc 4
 	ldloc.1
 	clt
 	stloc.0
-L_109169c:
-// 0x0109169c: 0x109169c: bne   a0, zero, 0x1091650 sll   a2, v1, 2
+L_1091cc0:
+// 0x01091cc0: 0x1091cc0: bne   a0, zero, 0x1091c74 sll   a2, v1, 2
 	ldloc.0
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc.2
-	brtrue L_1091650
+	brtrue L_1091c74
 // --- basic block ---
-L_10916a4:
-// 0x010916a4: 0x10916a4: jr    ra addu  v0, zero, zero
+L_1091cc8:
+// 0x01091cc8: 0x1091cc8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	br __CIBYL_function_return
@@ -4355,7 +4355,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 get_data_10916ac(int32)
+.method public static int32 get_data_1091cd0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4378,7 +4378,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010916ac: 0x10916ac: lw    v0, 164(a0)
+// 0x01091cd0: 0x1091cd0: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4387,14 +4387,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010916b0: 0x10916b0: sll   zero, zero, 0
-// 0x010916b4: 0x10916b4: beq   v0, zero, 0x10916e4 addiu a0, zero, -1
+// 0x01091cd4: 0x1091cd4: sll   zero, zero, 0
+// 0x01091cd8: 0x1091cd8: beq   v0, zero, 0x1091d08 addiu a0, zero, -1
 	ldloc.1
 	ldc.i4.m1
 	stloc.0
-	brfalse L_10916e4
+	brfalse L_1091d08
 // --- basic block ---
-// 0x010916bc: 0x10916bc: lw    v1, 52(v0)
+// 0x01091ce0: 0x1091ce0: lw    v1, 52(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4403,17 +4403,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010916c0: 0x10916c0: sll   zero, zero, 0
-// 0x010916c4: 0x10916c4: beq   v1, a0, 0x10916e4 sll   v1, v1, 2
+// 0x01091ce4: 0x1091ce4: sll   zero, zero, 0
+// 0x01091ce8: 0x1091ce8: beq   v1, a0, 0x1091d08 sll   v1, v1, 2
 	ldloc.2
 	ldloc.0
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-	beq  L_10916e4
+	beq  L_1091d08
 // --- basic block ---
-// 0x010916cc: 0x10916cc: lw    v0, 36(v0)
+// 0x01091cf0: 0x1091cf0: lw    v0, 36(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4422,24 +4422,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010916d0: 0x10916d0: sll   zero, zero, 0
-// 0x010916d4: 0x10916d4: addu  v1, v0, v1
+// 0x01091cf4: 0x1091cf4: sll   zero, zero, 0
+// 0x01091cf8: 0x1091cf8: addu  v1, v0, v1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x010916d8: 0x10916d8: lw    v0, 0(v1)
+// 0x01091cfc: 0x1091cfc: lw    v0, 0(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010916dc: 0x10916dc: jr    ra sll   zero, zero, 0
+// 0x01091d00: 0x1091d00: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10916e4:
-// 0x010916e4: 0x10916e4: jr    ra addu  v0, zero, zero
+L_1091d08:
+// 0x01091d08: 0x1091d08: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	br __CIBYL_function_return
@@ -4449,7 +4449,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -4487,12 +4487,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01091748: 0x1091748: addiu sp, sp, -24
+// 0x01091d6c: 0x1091d6c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109174c: 0x109174c: sw    s0, 16(sp)
+// 0x01091d70: 0x1091d70: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4501,8 +4501,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01091750: 0x1091750: sw    ra, 20(sp)
-// 0x01091754: 0x1091754: lw    s0, 164(a0)
+// 0x01091d74: 0x1091d74: sw    ra, 20(sp)
+// 0x01091d78: 0x1091d78: lw    s0, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4511,14 +4511,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01091758: 0x1091758: blez  a1, 0x1091768 addiu v0, zero, 42
+// 0x01091d7c: 0x1091d7c: blez  a1, 0x1091d8c addiu v0, zero, 42
 	ldloc.2
 	ldc.i4.s 42
 	stloc 5
 	ldc.i4.s 0
-	ble L_1091768
+	ble L_1091d8c
 // --- basic block ---
-// 0x01091760: 0x1091760: j	 0x109176c sw    a1, 64(s0)
+// 0x01091d84: 0x1091d84: j	 0x1091d90 sw    a1, 64(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4527,10 +4527,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	br L_109176c
+	br L_1091d90
 // --- basic block ---
-L_1091768:
-// 0x01091768: 0x1091768: sw    v0, 64(s0)
+L_1091d8c:
+// 0x01091d8c: 0x1091d8c: sw    v0, 64(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4539,16 +4539,16 @@ L_1091768:
 	add
 	ldloc 5
 	stelem.i4
-L_109176c:
-// 0x0109176c: 0x109176c: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+L_1091d90:
+// 0x01091d90: 0x1091d90: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01091774: 0x1091774: beq   v0, zero, 0x10917b0 sll   zero, zero, 0
+// 0x01091d98: 0x1091d98: beq   v0, zero, 0x1091dd4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10917b0
+	brfalse L_1091dd4
 // --- basic block ---
-// 0x0109177c: 0x109177c: lw    a0, 64(s0)
+// 0x01091da0: 0x1091da0: lw    a0, 64(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4557,39 +4557,39 @@ L_109176c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091780: 0x1091780: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01091da4: 0x1091da4: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01091788: 0x1091788: lui   a0, 0x20000
+// 0x01091dac: 0x1091dac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109178c: 0x109178c: lw    a3, 23876(a0)
+// 0x01091db0: 0x1091db0: lw    a3, 24340(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5969
+	ldc.i4 6085
 	add
 	ldelem.i4
 	stloc 4
-// 0x01091790: 0x1091790: lw    a2, 23872(a0)
+// 0x01091db4: 0x1091db4: lw    a2, 24336(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5968
+	ldc.i4 6084
 	add
 	ldelem.i4
 	stloc.3
-// 0x01091794: 0x1091794: addu  a1, v1, zero
+// 0x01091db8: 0x1091db8: addu  a1, v1, zero
 	ldloc 8
 	stloc.2
-// 0x01091798: 0x1091798: jal   0x10c0798 addu  a0, v0, zero
+// 0x01091dbc: 0x1091dbc: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4597,26 +4597,26 @@ L_109176c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010917a0: 0x10917a0: addu  a1, v1, zero
+// 0x01091dc4: 0x1091dc4: addu  a1, v1, zero
 	ldloc 8
 	stloc.2
-// 0x010917a4: 0x10917a4: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01091dc8: 0x1091dc8: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010917ac: 0x10917ac: sw    v0, 64(s0)
+// 0x01091dd0: 0x1091dd0: sw    v0, 64(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4625,12 +4625,12 @@ L_109176c:
 	add
 	ldloc 5
 	stelem.i4
-L_10917b0:
-// 0x010917b0: 0x10917b0: lw    ra, 20(sp)
-// 0x010917b4: 0x10917b4: addiu v0, zero, -1
+L_1091dd4:
+// 0x01091dd4: 0x1091dd4: lw    ra, 20(sp)
+// 0x01091dd8: 0x1091dd8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010917b8: 0x10917b8: sw    v0, 72(s0)
+// 0x01091ddc: 0x1091ddc: sw    v0, 72(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4639,7 +4639,7 @@ L_10917b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010917bc: 0x10917bc: sw    v0, 68(s0)
+// 0x01091de0: 0x1091de0: sw    v0, 68(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4648,7 +4648,7 @@ L_10917b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010917c0: 0x10917c0: lw    s0, 16(sp)
+// 0x01091de4: 0x1091de4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4657,7 +4657,7 @@ L_10917b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010917c4: 0x10917c4: jr    ra addiu sp, sp, 24
+// 0x01091de8: 0x1091de8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4669,7 +4669,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 update_list_rows_10917cc(int32,int32,int32,int32,int32)
+.method public static int32 update_list_rows_1091df0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s3,int32 s2,int32 s6,int32 s4,int32 s7,int32 s5,int32 s8,int32 ra)
@@ -4731,12 +4731,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010917cc: 0x10917cc: addiu sp, sp, -80
+// 0x01091df0: 0x1091df0: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010917d0: 0x10917d0: sw    s6, 64(sp)
+// 0x01091df4: 0x1091df4: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4745,7 +4745,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010917d4: 0x10917d4: sw    s0, 40(sp)
+// 0x01091df8: 0x1091df8: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4754,8 +4754,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010917d8: 0x10917d8: sw    ra, 76(sp)
-// 0x010917dc: 0x10917dc: sw    s8, 72(sp)
+// 0x01091dfc: 0x1091dfc: sw    ra, 76(sp)
+// 0x01091e00: 0x1091e00: sw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4764,7 +4764,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010917e0: 0x10917e0: sw    s7, 68(sp)
+// 0x01091e04: 0x1091e04: sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4773,7 +4773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010917e4: 0x10917e4: sw    s5, 60(sp)
+// 0x01091e08: 0x1091e08: sw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4782,7 +4782,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010917e8: 0x10917e8: sw    s4, 56(sp)
+// 0x01091e0c: 0x1091e0c: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4791,7 +4791,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010917ec: 0x10917ec: sw    s3, 52(sp)
+// 0x01091e10: 0x1091e10: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4800,7 +4800,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010917f0: 0x10917f0: sw    s2, 48(sp)
+// 0x01091e14: 0x1091e14: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4809,7 +4809,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010917f4: 0x10917f4: sw    s1, 44(sp)
+// 0x01091e18: 0x1091e18: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4818,7 +4818,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010917f8: 0x10917f8: sw    a0, 80(sp)
+// 0x01091e1c: 0x1091e1c: sw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4827,23 +4827,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010917fc: 0x10917fc: jal   0x101fa28 addu  s0, a2, zero
+// 0x01091e20: 0x1091e20: jal   0x101fa38 addu  s0, a2, zero
 	ldloc.3
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01091804: 0x1091804: beq   v0, zero, 0x1091810 addiu s6, zero, 70
+// 0x01091e28: 0x1091e28: beq   v0, zero, 0x1091e34 addiu s6, zero, 70
 	ldloc 5
 	ldc.i4.s 70
 	stloc 12
-	brfalse L_1091810
+	brfalse L_1091e34
 // --- basic block ---
-// 0x0109180c: 0x109180c: addiu s6, zero, 110
+// 0x01091e30: 0x1091e30: addiu s6, zero, 110
 	ldc.i4.s 110
 	stloc 12
-L_1091810:
-// 0x01091810: 0x1091810: lw    s2, 28(s0)
+L_1091e34:
+// 0x01091e34: 0x1091e34: lw    s2, 28(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4852,14 +4852,14 @@ L_1091810:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091814: 0x1091814: lw    v0, 0(s0)
+// 0x01091e38: 0x1091e38: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01091818: 0x1091818: lw    s5, 64(s0)
+// 0x01091e3c: 0x1091e3c: lw    s5, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4868,16 +4868,16 @@ L_1091810:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109181c: 0x109181c: slt   v0, v0, s2
+// 0x01091e40: 0x1091e40: slt   v0, v0, s2
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 5
-// 0x01091820: 0x1091820: beq   v0, zero, 0x1091a24 sll   zero, zero, 0
+// 0x01091e44: 0x1091e44: beq   v0, zero, 0x1092048 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1091a24
+	brfalse L_1092048
 // --- basic block ---
-// 0x01091828: 0x1091828: lw    a0, 12(s0)
+// 0x01091e4c: 0x1091e4c: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4886,7 +4886,7 @@ L_1091810:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109182c: 0x109182c: jal   0x1000a60 sll   a1, s2, 2
+// 0x01091e50: 0x1091e50: jal   0x1000a60 sll   a1, s2, 2
 	ldloc 11
 	ldc.i4.2
 	shl
@@ -4901,17 +4901,17 @@ L_1091810:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091834: 0x1091834: lw    s3, 0(s0)
+// 0x01091e58: 0x1091e58: lw    s3, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01091838: 0x1091838: lui   s7, 0x0
+// 0x01091e5c: 0x1091e5c: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x0109183c: 0x109183c: sw    v0, 12(s0)
+// 0x01091e60: 0x1091e60: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4920,20 +4920,20 @@ L_1091810:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091840: 0x1091840: addiu s7, s7, 23008
+// 0x01091e64: 0x1091e64: addiu s7, s7, 23008
 	ldloc 14
 	ldc.i4 23008
 	add
 	stloc 14
-// 0x01091844: 0x1091844: j	 0x1091a14 sll   s4, s3, 2
+// 0x01091e68: 0x1091e68: j	 0x1092038 sll   s4, s3, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 13
-	br L_1091a14
+	br L_1092038
 // --- basic block ---
-L_109184c:
-// 0x0109184c: 0x109184c: lw    v0, 44(s0)
+L_1091e70:
+// 0x01091e70: 0x1091e70: lw    v0, 44(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4942,72 +4942,72 @@ L_109184c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091850: 0x1091850: sll   zero, zero, 0
-// 0x01091854: 0x1091854: beq   v0, zero, 0x1091870 addu  v0, v0, s4
+// 0x01091e74: 0x1091e74: sll   zero, zero, 0
+// 0x01091e78: 0x1091e78: beq   v0, zero, 0x1091e94 addu  v0, v0, s4
 	ldloc 5
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-	brfalse L_1091870
+	brfalse L_1091e94
 // --- basic block ---
-// 0x0109185c: 0x109185c: lw    v1, 0(v0)
+// 0x01091e80: 0x1091e80: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01091860: 0x1091860: lui   v0, 0x2000000
+// 0x01091e84: 0x1091e84: lui   v0, 0x2000000
 	ldc.i4 33554432
 	stloc 5
-// 0x01091864: 0x1091864: and   v0, v1, v0
+// 0x01091e88: 0x1091e88: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01091868: 0x1091868: bne   v0, zero, 0x1091874 lui   v1, 0x2000000
+// 0x01091e8c: 0x1091e8c: bne   v0, zero, 0x1091e98 lui   v1, 0x2000000
 	ldloc 5
 	ldc.i4 33554432
 	stloc 7
-	brtrue L_1091874
+	brtrue L_1091e98
 // --- basic block ---
-L_1091870:
-// 0x01091870: 0x1091870: addu  v1, zero, zero
+L_1091e94:
+// 0x01091e94: 0x1091e94: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1091874:
-// 0x01091874: 0x1091874: lui   v0, 0x100000
+L_1091e98:
+// 0x01091e98: 0x1091e98: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x01091878: 0x1091878: ori   v0, v0, 8
+// 0x01091e9c: 0x1091e9c: ori   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	or
 	stloc 5
-// 0x0109187c: 0x109187c: lui   a0, 0x20000
+// 0x01091ea0: 0x1091ea0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01091880: 0x1091880: or    v0, v1, v0
+// 0x01091ea4: 0x1091ea4: or    v0, v1, v0
 	ldloc 7
 	ldloc 5
 	or
 	stloc 5
-// 0x01091884: 0x1091884: addu  a3, s5, zero
+// 0x01091ea8: 0x1091ea8: addu  a3, s5, zero
 	ldloc 15
 	stloc 4
-// 0x01091888: 0x1091888: addu  a1, zero, zero
+// 0x01091eac: 0x1091eac: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109188c: 0x109188c: addiu a2, zero, -2
+// 0x01091eb0: 0x1091eb0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01091890: 0x1091890: addiu a0, a0, -3672
+// 0x01091eb4: 0x1091eb4: addiu a0, a0, -3208
 	ldloc.1
-	ldc.i4 -3672
+	ldc.i4 -3208
 	add
 	stloc.1
-// 0x01091894: 0x1091894: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01091eb8: 0x1091eb8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5021,60 +5021,60 @@ L_1091874:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109189c: 0x109189c: addu  a0, v0, zero
+// 0x01091ec0: 0x1091ec0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010918a0: 0x10918a0: jal   0x1099190 addu  s1, v0, zero
+// 0x01091ec4: 0x1091ec4: jal   0x10997d8 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010918a8: 0x10918a8: lui   a1, 0x0
+// 0x01091ecc: 0x1091ecc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010918ac: 0x10918ac: addu  a0, s1, zero
+// 0x01091ed0: 0x1091ed0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010918b0: 0x10918b0: addiu a1, a1, 31980
+// 0x01091ed4: 0x1091ed4: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010918b4: 0x10918b4: jal   0x1098fe0 addu  a2, s7, zero
+// 0x01091ed8: 0x1091ed8: jal   0x1099628 addu  a2, s7, zero
 	ldloc 14
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010918bc: 0x10918bc: lui   a0, 0x10000
+// 0x01091ee0: 0x1091ee0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010918c0: 0x10918c0: lui   a1, 0x10000
+// 0x01091ee4: 0x1091ee4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010918c4: 0x10918c4: addiu a0, a0, -32516
+// 0x01091ee8: 0x1091ee8: addiu a0, a0, -32516
 	ldloc.1
 	ldc.i4 -32516
 	add
 	stloc.1
-// 0x010918c8: 0x10918c8: addiu a1, a1, 18500
+// 0x01091eec: 0x1091eec: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010918cc: 0x10918cc: addiu a2, zero, 14
+// 0x01091ef0: 0x1091ef0: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010918d0: 0x10918d0: jal   0x1098d10 addiu a3, zero, 24
+// 0x01091ef4: 0x1091ef4: jal   0x1099358 addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
 	ldloc.0
@@ -5082,12 +5082,12 @@ L_1091874:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010918d8: 0x10918d8: sw    v0, 28(sp)
+// 0x01091efc: 0x1091efc: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5096,7 +5096,7 @@ L_1091874:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010918dc: 0x10918dc: lw    v0, 84(s0)
+// 0x01091f00: 0x1091f00: lw    v0, 84(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5105,14 +5105,14 @@ L_1091874:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010918e0: 0x10918e0: sll   zero, zero, 0
-// 0x010918e4: 0x10918e4: beq   v0, zero, 0x10918fc lui   a2, 0x20000
+// 0x01091f04: 0x1091f04: sll   zero, zero, 0
+// 0x01091f08: 0x1091f08: beq   v0, zero, 0x1091f20 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brfalse L_10918fc
+	brfalse L_1091f20
 // --- basic block ---
-// 0x010918ec: 0x10918ec: lw    a0, 28(sp)
+// 0x01091f10: 0x1091f10: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5121,37 +5121,37 @@ L_1091874:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010918f0: 0x10918f0: addu  a1, s7, zero
+// 0x01091f14: 0x1091f14: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x010918f4: 0x10918f4: jal   0x1098fe0 addiu a2, a2, -3664
+// 0x01091f18: 0x1091f18: jal   0x1099628 addiu a2, a2, -3200
 	ldloc.3
-	ldc.i4 -3664
+	ldc.i4 -3200
 	add
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_10918fc:
-// 0x010918fc: 0x10918fc: lui   a1, 0x1090000
+L_1091f20:
+// 0x01091f20: 0x1091f20: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x01091900: 0x1091900: addiu v0, s5, -10
+// 0x01091f24: 0x1091f24: addiu v0, s5, -10
 	ldloc 15
 	ldc.i4.s -10
 	add
 	stloc 5
-// 0x01091904: 0x1091904: addu  a0, s1, zero
+// 0x01091f28: 0x1091f28: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01091908: 0x1091908: addiu a1, a1, 7200
+// 0x01091f2c: 0x1091f2c: addiu a1, a1, 8772
 	ldloc.2
-	ldc.i4 7200
+	ldc.i4 8772
 	add
 	stloc.2
-// 0x0109190c: 0x109190c: jal   0x1098e9c sw    v0, 32(sp)
+// 0x01091f30: 0x1091f30: jal   0x10994e4 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5162,9 +5162,9 @@ L_10918fc:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_callback_1098e9c(int32,int32)
+	call void Cibyl114::ssd_widget_set_callback_10994e4(int32,int32)
 // --- basic block ---
-// 0x01091914: 0x1091914: lw    a3, 32(sp)
+// 0x01091f38: 0x1091f38: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5173,24 +5173,24 @@ L_10918fc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01091918: 0x1091918: lui   a0, 0x20000
+// 0x01091f3c: 0x1091f3c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109191c: 0x109191c: addu  a1, zero, zero
+// 0x01091f40: 0x1091f40: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01091920: 0x1091920: addu  a2, s6, zero
+// 0x01091f44: 0x1091f44: addu  a2, s6, zero
 	ldloc 12
 	stloc.3
-// 0x01091924: 0x1091924: addiu a0, a0, -21844
+// 0x01091f48: 0x1091f48: addiu a0, a0, -21380
 	ldloc.1
-	ldc.i4 -21844
+	ldc.i4 -21380
 	add
 	stloc.1
-// 0x01091928: 0x1091928: addiu v0, zero, 16
+// 0x01091f4c: 0x1091f4c: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0109192c: 0x109192c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01091f50: 0x1091f50: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5204,21 +5204,21 @@ L_10918fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091934: 0x1091934: addu  a0, v0, zero
+// 0x01091f58: 0x1091f58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01091938: 0x1091938: addu  a1, zero, zero
+// 0x01091f5c: 0x1091f5c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109193c: 0x109193c: addu  a2, zero, zero
+// 0x01091f60: 0x1091f60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01091940: 0x1091940: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01091f64: 0x1091f64: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5230,9 +5230,9 @@ L_10918fc:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01091948: 0x1091948: lw    v0, 84(s0)
+// 0x01091f6c: 0x1091f6c: lw    v0, 84(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5241,23 +5241,23 @@ L_10918fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109194c: 0x109194c: sll   zero, zero, 0
-// 0x01091950: 0x1091950: beq   v0, zero, 0x1091990 lui   v0, 0xf0000
+// 0x01091f70: 0x1091f70: sll   zero, zero, 0
+// 0x01091f74: 0x1091f74: beq   v0, zero, 0x1091fb4 lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brfalse L_1091990
+	brfalse L_1091fb4
 // --- basic block ---
-// 0x01091958: 0x1091958: lw    a2, -30068(v0)
+// 0x01091f7c: 0x1091f7c: lw    a2, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109195c: 0x109195c: lw    a3, 32(sp)
+// 0x01091f80: 0x1091f80: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5266,28 +5266,28 @@ L_10918fc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01091960: 0x1091960: addiu a2, a2, -10
+// 0x01091f84: 0x1091f84: addiu a2, a2, -10
 	ldloc.3
 	ldc.i4.s -10
 	add
 	stloc.3
-// 0x01091964: 0x1091964: lui   a0, 0x20000
+// 0x01091f88: 0x1091f88: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01091968: 0x1091968: subu  a2, a2, s6
+// 0x01091f8c: 0x1091f8c: subu  a2, a2, s6
 	ldloc.3
 	ldloc 12
 	sub
 	stloc.3
-// 0x0109196c: 0x109196c: addu  a1, zero, zero
+// 0x01091f90: 0x1091f90: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01091970: 0x1091970: addiu a0, a0, -3656
+// 0x01091f94: 0x1091f94: addiu a0, a0, -3192
 	ldloc.1
-	ldc.i4 -3656
+	ldc.i4 -3192
 	add
 	stloc.1
-// 0x01091974: 0x1091974: jal   0x1093a24 sw    zero, 16(sp)
+// 0x01091f98: 0x1091f98: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5301,30 +5301,30 @@ L_10918fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109197c: 0x109197c: addu  a0, v0, zero
+// 0x01091fa0: 0x1091fa0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01091980: 0x1091980: addu  a1, zero, zero
+// 0x01091fa4: 0x1091fa4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01091984: 0x1091984: addu  a2, zero, zero
+// 0x01091fa8: 0x1091fa8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01091988: 0x1091988: jal   0x1098fe0 addu  s8, v0, zero
+// 0x01091fac: 0x1091fac: jal   0x1099628 addu  s8, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1091990:
-// 0x01091990: 0x1091990: lw    a1, 24(sp)
+L_1091fb4:
+// 0x01091fb4: 0x1091fb4: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5333,17 +5333,17 @@ L_1091990:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091994: 0x1091994: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01091fb8: 0x1091fb8: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109199c: 0x109199c: lw    v0, 84(s0)
+// 0x01091fc0: 0x1091fc0: lw    v0, 84(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5352,26 +5352,26 @@ L_1091990:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010919a0: 0x10919a0: sll   zero, zero, 0
-// 0x010919a4: 0x10919a4: beq   v0, zero, 0x10919b8 sll   zero, zero, 0
+// 0x01091fc4: 0x1091fc4: sll   zero, zero, 0
+// 0x01091fc8: 0x1091fc8: beq   v0, zero, 0x1091fdc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10919b8
+	brfalse L_1091fdc
 // --- basic block ---
-// 0x010919ac: 0x10919ac: addu  a0, s1, zero
+// 0x01091fd0: 0x1091fd0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010919b0: 0x10919b0: jal   0x1098ec4 addu  a1, s8, zero
+// 0x01091fd4: 0x1091fd4: jal   0x109950c addu  a1, s8, zero
 	ldloc 16
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10919b8:
-// 0x010919b8: 0x10919b8: lw    a1, 28(sp)
+L_1091fdc:
+// 0x01091fdc: 0x1091fdc: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5380,17 +5380,17 @@ L_10919b8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010919bc: 0x10919bc: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01091fe0: 0x1091fe0: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010919c4: 0x10919c4: lw    a0, 80(sp)
+// 0x01091fe8: 0x1091fe8: lw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5399,28 +5399,28 @@ L_10919b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010919c8: 0x10919c8: jal   0x1098ec4 addu  a1, s1, zero
+// 0x01091fec: 0x1091fec: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010919d0: 0x10919d0: lui   v0, 0x1090000
+// 0x01091ff4: 0x1091ff4: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x010919d4: 0x10919d4: addiu v0, v0, 5400
+// 0x01091ff8: 0x1091ff8: addiu v0, v0, 6972
 	ldloc 5
-	ldc.i4 5400
+	ldc.i4 6972
 	add
 	stloc 5
-// 0x010919d8: 0x10919d8: lui   a0, 0x0
+// 0x01091ffc: 0x1091ffc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010919dc: 0x10919dc: sw    s3, 116(s1)
+// 0x01092000: 0x1092000: sw    s3, 116(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5429,15 +5429,15 @@ L_10919b8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010919e0: 0x10919e0: addiu a0, a0, 32244
+// 0x01092004: 0x1092004: addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010919e4: 0x10919e4: addiu a1, zero, 512
+// 0x01092008: 0x1092008: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010919e8: 0x10919e8: sw    s0, 164(s1)
+// 0x0109200c: 0x109200c: sw    s0, 164(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5446,7 +5446,7 @@ L_10919b8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010919ec: 0x10919ec: jal   0x109e6d0 sw    v0, 224(s1)
+// 0x01092010: 0x1092010: jal   0x109ed18 sw    v0, 224(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5460,25 +5460,25 @@ L_10919b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010919f4: 0x10919f4: addu  a1, v0, zero
+// 0x01092018: 0x1092018: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010919f8: 0x10919f8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0109201c: 0x109201c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091a00: 0x1091a00: lw    v0, 12(s0)
+// 0x01092024: 0x1092024: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5487,66 +5487,66 @@ L_10919b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091a04: 0x1091a04: addiu s3, s3, 1
+// 0x01092028: 0x1092028: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01091a08: 0x1091a08: addu  v0, v0, s4
+// 0x0109202c: 0x109202c: addu  v0, v0, s4
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-// 0x01091a0c: 0x1091a0c: sw    s1, 0(v0)
+// 0x01092030: 0x1092030: sw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01091a10: 0x1091a10: addiu s4, s4, 4
+// 0x01092034: 0x1092034: addiu s4, s4, 4
 	ldloc 13
 	ldc.i4.4
 	add
 	stloc 13
-L_1091a14:
-// 0x01091a14: 0x1091a14: slt   v0, s3, s2
+L_1092038:
+// 0x01092038: 0x1092038: slt   v0, s3, s2
 	ldloc 10
 	ldloc 11
 	clt
 	stloc 5
-// 0x01091a18: 0x1091a18: bne   v0, zero, 0x109184c sll   zero, zero, 0
+// 0x0109203c: 0x109203c: bne   v0, zero, 0x1091e70 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109184c
+	brtrue L_1091e70
 // --- basic block ---
-// 0x01091a20: 0x1091a20: sw    s2, 0(s0)
+// 0x01092044: 0x1092044: sw    s2, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-L_1091a24:
-// 0x01091a24: 0x1091a24: lui   s4, 0x0
+L_1092048:
+// 0x01092048: 0x1092048: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01091a28: 0x1091a28: addiu s4, s4, 32244
+// 0x0109204c: 0x109204c: addiu s4, s4, 32244
 	ldloc 13
 	ldc.i4 32244
 	add
 	stloc 13
-// 0x01091a2c: 0x1091a2c: addu  s1, zero, zero
+// 0x01092050: 0x1092050: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01091a30: 0x1091a30: j	 0x1091aa4 addiu s3, s2, -1
+// 0x01092054: 0x1092054: j	 0x10920c8 addiu s3, s2, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 10
-	br L_1091aa4
+	br L_10920c8
 // --- basic block ---
-L_1091a38:
-// 0x01091a38: 0x1091a38: lw    v0, 12(s0)
+L_109205c:
+// 0x0109205c: 0x109205c: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5555,26 +5555,26 @@ L_1091a38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091a3c: 0x1091a3c: sll   zero, zero, 0
-// 0x01091a40: 0x1091a40: addu  v0, v0, s6
+// 0x01092060: 0x1092060: sll   zero, zero, 0
+// 0x01092064: 0x1092064: addu  v0, v0, s6
 	ldloc 5
 	ldloc 12
 	add
 	stloc 5
-// 0x01091a44: 0x1091a44: lw    a0, 0(v0)
+// 0x01092068: 0x1092068: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01091a48: 0x1091a48: jal   0x1098ef8 sll   zero, zero, 0
+// 0x0109206c: 0x109206c: jal   0x1099540 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x01091a50: 0x1091a50: lw    v0, 12(s0)
+// 0x01092074: 0x1092074: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5583,27 +5583,27 @@ L_1091a38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091a54: 0x1091a54: sll   zero, zero, 0
-// 0x01091a58: 0x1091a58: addu  v0, v0, s6
+// 0x01092078: 0x1092078: sll   zero, zero, 0
+// 0x0109207c: 0x109207c: addu  v0, v0, s6
 	ldloc 5
 	ldloc 12
 	add
 	stloc 5
-// 0x01091a5c: 0x1091a5c: lw    a0, 0(v0)
+// 0x01092080: 0x1092080: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01091a60: 0x1091a60: jal   0x10990ac sll   zero, zero, 0
+// 0x01092084: 0x1092084: jal   0x10996f4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091a68: 0x1091a68: lw    v0, 12(s0)
+// 0x0109208c: 0x109208c: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5612,20 +5612,20 @@ L_1091a38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091a6c: 0x1091a6c: sll   zero, zero, 0
-// 0x01091a70: 0x1091a70: addu  s6, v0, s6
+// 0x01092090: 0x1092090: sll   zero, zero, 0
+// 0x01092094: 0x1092094: addu  s6, v0, s6
 	ldloc 5
 	ldloc 12
 	add
 	stloc 12
-// 0x01091a74: 0x1091a74: lw    a0, 0(s6)
+// 0x01092098: 0x1092098: lw    a0, 0(s6)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01091a78: 0x1091a78: jal   0x109b304 addu  a1, s4, zero
+// 0x0109209c: 0x109209c: jal   0x109b94c addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -5633,82 +5633,82 @@ L_1091a38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091a80: 0x1091a80: beq   s1, s3, 0x1091a98 addu  a0, v0, zero
+// 0x010920a4: 0x10920a4: beq   s1, s3, 0x10920bc addu  a0, v0, zero
 	ldloc 8
 	ldloc 10
 	ldloc 5
 	stloc.1
-	beq  L_1091a98
+	beq  L_10920bc
 // --- basic block ---
-// 0x01091a88: 0x1091a88: jal   0x10990ac addiu s1, s1, 1
+// 0x010920ac: 0x10920ac: jal   0x10996f4 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091a90: 0x1091a90: j	 0x1091aa8 slt   v0, s1, s2
+// 0x010920b4: 0x10920b4: j	 0x10920cc slt   v0, s1, s2
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-	br L_1091aa8
+	br L_10920cc
 // --- basic block ---
-L_1091a98:
-// 0x01091a98: 0x1091a98: jal   0x1099098 addu  a0, v0, zero
+L_10920bc:
+// 0x010920bc: 0x10920bc: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01091aa0: 0x1091aa0: addiu s1, s1, 1
+// 0x010920c4: 0x10920c4: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1091aa4:
-// 0x01091aa4: 0x1091aa4: slt   v0, s1, s2
+L_10920c8:
+// 0x010920c8: 0x10920c8: slt   v0, s1, s2
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-L_1091aa8:
-// 0x01091aa8: 0x1091aa8: sll   s6, s1, 2
+L_10920cc:
+// 0x010920cc: 0x10920cc: sll   s6, s1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 12
-// 0x01091aac: 0x1091aac: addu  a2, s5, zero
+// 0x010920d0: 0x10920d0: addu  a2, s5, zero
 	ldloc 15
 	stloc.3
-// 0x01091ab0: 0x1091ab0: bne   v0, zero, 0x1091a38 addiu a1, zero, -2
+// 0x010920d4: 0x10920d4: bne   v0, zero, 0x109205c addiu a1, zero, -2
 	ldloc 5
 	ldc.i4.s -2
 	stloc.2
-	brtrue L_1091a38
+	brtrue L_109205c
 // --- basic block ---
-// 0x01091ab8: 0x1091ab8: sll   s3, s2, 2
+// 0x010920dc: 0x10920dc: sll   s3, s2, 2
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x01091abc: 0x1091abc: j	 0x1091adc addu  s1, s2, zero
+// 0x010920e0: 0x10920e0: j	 0x1092100 addu  s1, s2, zero
 	ldloc 11
 	stloc 8
-	br L_1091adc
+	br L_1092100
 // --- basic block ---
-L_1091ac4:
-// 0x01091ac4: 0x1091ac4: lw    v0, 12(s0)
+L_10920e8:
+// 0x010920e8: 0x10920e8: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5717,30 +5717,30 @@ L_1091ac4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091ac8: 0x1091ac8: sll   zero, zero, 0
-// 0x01091acc: 0x1091acc: addu  v0, v0, s3
+// 0x010920ec: 0x10920ec: sll   zero, zero, 0
+// 0x010920f0: 0x10920f0: addu  v0, v0, s3
 	ldloc 5
 	ldloc 10
 	add
 	stloc 5
-// 0x01091ad0: 0x1091ad0: lw    a0, 0(v0)
+// 0x010920f4: 0x10920f4: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01091ad4: 0x1091ad4: jal   0x1099098 addiu s3, s3, 4
+// 0x010920f8: 0x10920f8: jal   0x10996e0 addiu s3, s3, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1091adc:
-// 0x01091adc: 0x1091adc: lw    v0, 4(s0)
+L_1092100:
+// 0x01092100: 0x1092100: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5749,22 +5749,22 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091ae0: 0x1091ae0: sll   zero, zero, 0
-// 0x01091ae4: 0x1091ae4: slt   v0, s1, v0
+// 0x01092104: 0x1092104: sll   zero, zero, 0
+// 0x01092108: 0x1092108: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01091ae8: 0x1091ae8: bne   v0, zero, 0x1091ac4 addiu s1, s1, 1
+// 0x0109210c: 0x109210c: bne   v0, zero, 0x10920e8 addiu s1, s1, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_1091ac4
+	brtrue L_10920e8
 // --- basic block ---
-// 0x01091af0: 0x1091af0: lw    ra, 76(sp)
-// 0x01091af4: 0x1091af4: sw    s2, 4(s0)
+// 0x01092114: 0x1092114: lw    ra, 76(sp)
+// 0x01092118: 0x1092118: sw    s2, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5773,7 +5773,7 @@ L_1091adc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01091af8: 0x1091af8: lw    s8, 72(sp)
+// 0x0109211c: 0x109211c: lw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5782,7 +5782,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01091afc: 0x1091afc: lw    s7, 68(sp)
+// 0x01092120: 0x1092120: lw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5791,7 +5791,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01091b00: 0x1091b00: lw    s6, 64(sp)
+// 0x01092124: 0x1092124: lw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5800,7 +5800,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01091b04: 0x1091b04: lw    s5, 60(sp)
+// 0x01092128: 0x1092128: lw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5809,7 +5809,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01091b08: 0x1091b08: lw    s4, 56(sp)
+// 0x0109212c: 0x109212c: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5818,7 +5818,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01091b0c: 0x1091b0c: lw    s3, 52(sp)
+// 0x01092130: 0x1092130: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5827,7 +5827,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01091b10: 0x1091b10: lw    s2, 48(sp)
+// 0x01092134: 0x1092134: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5836,7 +5836,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091b14: 0x1091b14: lw    s1, 44(sp)
+// 0x01092138: 0x1092138: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5845,7 +5845,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01091b18: 0x1091b18: lw    s0, 40(sp)
+// 0x0109213c: 0x109213c: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5854,7 +5854,7 @@ L_1091adc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01091b1c: 0x1091b1c: jr    ra addiu sp, sp, 80
+// 0x01092140: 0x1092140: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -5866,7 +5866,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 label_callback_1091c20(int32,int32,int32,int32,int32)
+.method public static int32 label_callback_1092244(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -5916,7 +5916,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01091c20: 0x1091c20: lw    v0, 4(a0)
+// 0x01092244: 0x1092244: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5925,12 +5925,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091c24: 0x1091c24: addiu sp, sp, -40
+// 0x01092248: 0x1092248: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01091c28: 0x1091c28: sw    s3, 28(sp)
+// 0x0109224c: 0x109224c: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5939,10 +5939,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01091c2c: 0x1091c2c: lui   a1, 0x10000
+// 0x01092250: 0x1092250: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01091c30: 0x1091c30: lw    s3, 4(v0)
+// 0x01092254: 0x1092254: lw    s3, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5951,12 +5951,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091c34: 0x1091c34: addiu a1, a1, -32516
+// 0x01092258: 0x1092258: addiu a1, a1, -32516
 	ldloc.2
 	ldc.i4 -32516
 	add
 	stloc.2
-// 0x01091c38: 0x1091c38: sw    s4, 32(sp)
+// 0x0109225c: 0x109225c: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5965,7 +5965,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01091c3c: 0x1091c3c: sw    s2, 24(sp)
+// 0x01092260: 0x1092260: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5974,7 +5974,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01091c40: 0x1091c40: sw    s1, 20(sp)
+// 0x01092264: 0x1092264: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5983,8 +5983,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01091c44: 0x1091c44: sw    ra, 36(sp)
-// 0x01091c48: 0x1091c48: sw    s0, 16(sp)
+// 0x01092268: 0x1092268: sw    ra, 36(sp)
+// 0x0109226c: 0x109226c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5993,7 +5993,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01091c4c: 0x1091c4c: jal   0x109b634 addu  s2, a0, zero
+// 0x01092270: 0x1092270: jal   0x109bc7c addu  s2, a0, zero
 	ldloc.1
 	stloc 10
 	ldloc.0
@@ -6001,12 +6001,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091c54: 0x1091c54: lw    s1, 164(s3)
+// 0x01092278: 0x1092278: lw    s1, 164(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6015,10 +6015,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01091c58: 0x1091c58: addu  s4, v0, zero
+// 0x0109227c: 0x109227c: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x01091c5c: 0x1091c5c: lw    v0, 16(s1)
+// 0x01092280: 0x1092280: lw    v0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6027,14 +6027,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091c60: 0x1091c60: sll   zero, zero, 0
-// 0x01091c64: 0x1091c64: beq   v0, zero, 0x1091d4c addiu v0, zero, -1
+// 0x01092284: 0x1092284: sll   zero, zero, 0
+// 0x01092288: 0x1092288: beq   v0, zero, 0x1092370 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1091d4c
+	brfalse L_1092370
 // --- basic block ---
-// 0x01091c6c: 0x1091c6c: sw    v0, 52(s1)
+// 0x01092290: 0x1092290: sw    v0, 52(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6043,13 +6043,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091c70: 0x1091c70: j	 0x1091ca8 addu  s0, zero, zero
+// 0x01092294: 0x1092294: j	 0x10922cc addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1091ca8
+	br L_10922cc
 // --- basic block ---
-L_1091c78:
-// 0x01091c78: 0x1091c78: lw    v0, 32(s1)
+L_109229c:
+// 0x0109229c: 0x109229c: lw    v0, 32(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6058,39 +6058,39 @@ L_1091c78:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091c7c: 0x1091c7c: sll   zero, zero, 0
-// 0x01091c80: 0x1091c80: addu  v1, v0, v1
+// 0x010922a0: 0x10922a0: sll   zero, zero, 0
+// 0x010922a4: 0x10922a4: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01091c84: 0x1091c84: lw    a0, 0(v1)
+// 0x010922a8: 0x10922a8: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01091c88: 0x1091c88: jal   0x1001b14 sll   zero, zero, 0
+// 0x010922ac: 0x10922ac: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01091c90: 0x1091c90: bne   v0, zero, 0x1091ca8 addiu s0, s0, 1
+// 0x010922b4: 0x10922b4: bne   v0, zero, 0x10922cc addiu s0, s0, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_1091ca8
+	brtrue L_10922cc
 // --- basic block ---
-// 0x01091c98: 0x1091c98: addiu s0, s0, -1
+// 0x010922bc: 0x10922bc: addiu s0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01091c9c: 0x1091c9c: sw    s0, 52(s1)
+// 0x010922c0: 0x10922c0: sw    s0, 52(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6099,13 +6099,13 @@ L_1091c78:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01091ca0: 0x1091ca0: j	 0x1091cdc addu  s0, zero, zero
+// 0x010922c4: 0x10922c4: j	 0x1092300 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1091cdc
+	br L_1092300
 // --- basic block ---
-L_1091ca8:
-// 0x01091ca8: 0x1091ca8: lw    v0, 28(s1)
+L_10922cc:
+// 0x010922cc: 0x10922cc: lw    v0, 28(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6114,29 +6114,29 @@ L_1091ca8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091cac: 0x1091cac: sll   v1, s0, 2
+// 0x010922d0: 0x10922d0: sll   v1, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01091cb0: 0x1091cb0: slt   v0, s0, v0
+// 0x010922d4: 0x10922d4: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01091cb4: 0x1091cb4: bne   v0, zero, 0x1091c78 addu  a1, s4, zero
+// 0x010922d8: 0x10922d8: bne   v0, zero, 0x109229c addu  a1, s4, zero
 	ldloc 5
 	ldloc 12
 	stloc.2
-	brtrue L_1091c78
+	brtrue L_109229c
 // --- basic block ---
-// 0x01091cbc: 0x1091cbc: j	 0x1091d50 addu  v0, zero, zero
+// 0x010922e0: 0x10922e0: j	 0x1092374 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1091d50
+	br L_1092374
 // --- basic block ---
-L_1091cc4:
-// 0x01091cc4: 0x1091cc4: lw    v0, 12(s1)
+L_10922e8:
+// 0x010922e8: 0x10922e8: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6145,24 +6145,24 @@ L_1091cc4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091cc8: 0x1091cc8: addiu s0, s0, 1
+// 0x010922ec: 0x10922ec: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01091ccc: 0x1091ccc: addu  v1, v0, v1
+// 0x010922f0: 0x10922f0: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01091cd0: 0x1091cd0: lw    a0, 0(v1)
+// 0x010922f4: 0x10922f4: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01091cd4: 0x1091cd4: jal   0x109f260 sw    zero, 136(a0)
+// 0x010922f8: 0x10922f8: jal   0x109f8a8 sw    zero, 136(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6172,10 +6172,10 @@ L_1091cc4:
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.1
-	call void Cibyl119::ssd_widget_loose_focus_109f260(int32)
+	call void Cibyl119::ssd_widget_loose_focus_109f8a8(int32)
 // --- basic block ---
-L_1091cdc:
-// 0x01091cdc: 0x1091cdc: lw    v0, 4(s1)
+L_1092300:
+// 0x01092300: 0x1092300: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6184,21 +6184,21 @@ L_1091cdc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091ce0: 0x1091ce0: sll   zero, zero, 0
-// 0x01091ce4: 0x1091ce4: slt   v0, s0, v0
+// 0x01092304: 0x1092304: sll   zero, zero, 0
+// 0x01092308: 0x1092308: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01091ce8: 0x1091ce8: bne   v0, zero, 0x1091cc4 sll   v1, s0, 2
+// 0x0109230c: 0x109230c: bne   v0, zero, 0x10922e8 sll   v1, s0, 2
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 7
-	brtrue L_1091cc4
+	brtrue L_10922e8
 // --- basic block ---
-// 0x01091cf0: 0x1091cf0: jal   0x109617c addu  a0, s2, zero
+// 0x01092314: 0x1092314: jal   0x10967c4 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6206,29 +6206,29 @@ L_1091cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091cf8: 0x1091cf8: jal   0x1021900 sll   zero, zero, 0
+// 0x0109231c: 0x109231c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091d00: 0x1091d00: lui   a1, 0x10000
+// 0x01092324: 0x1092324: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01091d04: 0x1091d04: addu  a0, s2, zero
+// 0x01092328: 0x1092328: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01091d08: 0x1091d08: lw    s0, 16(s1)
+// 0x0109232c: 0x109232c: lw    s0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6237,7 +6237,7 @@ L_1091cdc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01091d0c: 0x1091d0c: jal   0x109b634 addiu a1, a1, -32516
+// 0x01092330: 0x1092330: jal   0x109bc7c addiu a1, a1, -32516
 	ldloc.2
 	ldc.i4 -32516
 	add
@@ -6247,12 +6247,12 @@ L_1091cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091d14: 0x1091d14: lw    v1, 36(s1)
+// 0x01092338: 0x1092338: lw    v1, 36(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6261,14 +6261,14 @@ L_1091cdc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01091d18: 0x1091d18: sll   zero, zero, 0
-// 0x01091d1c: 0x1091d1c: beq   v1, zero, 0x1091d38 addu  a2, zero, zero
+// 0x0109233c: 0x109233c: sll   zero, zero, 0
+// 0x01092340: 0x1092340: beq   v1, zero, 0x109235c addu  a2, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_1091d38
+	brfalse L_109235c
 // --- basic block ---
-// 0x01091d24: 0x1091d24: lw    a0, 52(s1)
+// 0x01092348: 0x1092348: lw    a0, 52(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6277,29 +6277,29 @@ L_1091cdc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091d28: 0x1091d28: sll   zero, zero, 0
-// 0x01091d2c: 0x1091d2c: sll   a0, a0, 2
+// 0x0109234c: 0x109234c: sll   zero, zero, 0
+// 0x01092350: 0x1092350: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01091d30: 0x1091d30: addu  v1, v1, a0
+// 0x01092354: 0x1092354: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01091d34: 0x1091d34: lw    a2, 0(v1)
+// 0x01092358: 0x1092358: lw    a2, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-L_1091d38:
-// 0x01091d38: 0x1091d38: addu  a0, s3, zero
+L_109235c:
+// 0x0109235c: 0x109235c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01091d3c: 0x1091d3c: jalr  s0 addu  a1, v0, zero
+// 0x01092360: 0x1092360: jalr  s0 addu  a1, v0, zero
 	ldloc 8
 	ldloc 5
 	stloc.2
@@ -6313,16 +6313,16 @@ L_1091d38:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091d44: 0x1091d44: j	 0x1091d50 sll   zero, zero, 0
-	br L_1091d50
+// 0x01092368: 0x1092368: j	 0x1092374 sll   zero, zero, 0
+	br L_1092374
 // --- basic block ---
-L_1091d4c:
-// 0x01091d4c: 0x1091d4c: addu  v0, zero, zero
+L_1092370:
+// 0x01092370: 0x1092370: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1091d50:
-// 0x01091d50: 0x1091d50: lw    ra, 36(sp)
-// 0x01091d54: 0x1091d54: lw    s4, 32(sp)
+L_1092374:
+// 0x01092374: 0x1092374: lw    ra, 36(sp)
+// 0x01092378: 0x1092378: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6331,7 +6331,7 @@ L_1091d50:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01091d58: 0x1091d58: lw    s3, 28(sp)
+// 0x0109237c: 0x109237c: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6340,7 +6340,7 @@ L_1091d50:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091d5c: 0x1091d5c: lw    s2, 24(sp)
+// 0x01092380: 0x1092380: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6349,7 +6349,7 @@ L_1091d50:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01091d60: 0x1091d60: lw    s1, 20(sp)
+// 0x01092384: 0x1092384: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6358,7 +6358,7 @@ L_1091d50:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01091d64: 0x1091d64: lw    s0, 16(sp)
+// 0x01092388: 0x1092388: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6367,7 +6367,7 @@ L_1091d50:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01091d68: 0x1091d68: jr    ra addiu sp, sp, 40
+// 0x0109238c: 0x109238c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6379,7 +6379,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 setup_list_widgets_rows_1091d70(int32,int32,int32,int32,int32)
+.method public static int32 setup_list_widgets_rows_1092394(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -6441,7 +6441,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01091d70: 0x1091d70: lw    v0, 12(a0)
+// 0x01092394: 0x1092394: lw    v0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6450,12 +6450,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091d74: 0x1091d74: addiu sp, sp, -88
+// 0x01092398: 0x1092398: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01091d78: 0x1091d78: sw    s3, 60(sp)
+// 0x0109239c: 0x109239c: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6464,7 +6464,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01091d7c: 0x1091d7c: sw    s0, 48(sp)
+// 0x010923a0: 0x10923a0: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6473,8 +6473,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01091d80: 0x1091d80: sw    ra, 84(sp)
-// 0x01091d84: 0x1091d84: sw    s8, 80(sp)
+// 0x010923a4: 0x10923a4: sw    ra, 84(sp)
+// 0x010923a8: 0x10923a8: sw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6483,7 +6483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01091d88: 0x1091d88: sw    s7, 76(sp)
+// 0x010923ac: 0x10923ac: sw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6492,7 +6492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01091d8c: 0x1091d8c: sw    s6, 72(sp)
+// 0x010923b0: 0x10923b0: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6501,7 +6501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01091d90: 0x1091d90: sw    s5, 68(sp)
+// 0x010923b4: 0x10923b4: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6510,7 +6510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01091d94: 0x1091d94: sw    s4, 64(sp)
+// 0x010923b8: 0x10923b8: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6519,7 +6519,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01091d98: 0x1091d98: sw    s2, 56(sp)
+// 0x010923bc: 0x10923bc: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6528,7 +6528,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01091d9c: 0x1091d9c: sw    s1, 52(sp)
+// 0x010923c0: 0x10923c0: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6537,7 +6537,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01091da0: 0x1091da0: lw    s3, 48(a0)
+// 0x010923c4: 0x10923c4: lw    s3, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6546,59 +6546,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01091da4: 0x1091da4: beq   v0, zero, 0x1092058 addu  s0, a0, zero
+// 0x010923c8: 0x10923c8: beq   v0, zero, 0x109267c addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_1092058
+	brfalse L_109267c
 // --- basic block ---
-// 0x01091dac: 0x1091dac: lui   s8, 0x10000
+// 0x010923d0: 0x10923d0: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x01091db0: 0x1091db0: lui   s7, 0x20000
+// 0x010923d4: 0x10923d4: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 15
-// 0x01091db4: 0x1091db4: lui   s6, 0x20000
+// 0x010923d8: 0x10923d8: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x01091db8: 0x1091db8: lui   s5, 0x20000
+// 0x010923dc: 0x10923dc: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x01091dbc: 0x1091dbc: lui   s4, 0x20000
+// 0x010923e0: 0x10923e0: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x01091dc0: 0x1091dc0: addiu s8, s8, -32516
+// 0x010923e4: 0x10923e4: addiu s8, s8, -32516
 	ldloc 16
 	ldc.i4 -32516
 	add
 	stloc 16
-// 0x01091dc4: 0x1091dc4: addiu s7, s7, -21844
+// 0x010923e8: 0x10923e8: addiu s7, s7, -21380
 	ldloc 15
-	ldc.i4 -21844
+	ldc.i4 -21380
 	add
 	stloc 15
-// 0x01091dc8: 0x1091dc8: addiu s6, s6, -3636
+// 0x010923ec: 0x10923ec: addiu s6, s6, -3172
 	ldloc 14
-	ldc.i4 -3636
+	ldc.i4 -3172
 	add
 	stloc 14
-// 0x01091dcc: 0x1091dcc: addiu s5, s5, -3656
+// 0x010923f0: 0x10923f0: addiu s5, s5, -3192
 	ldloc 13
-	ldc.i4 -3656
+	ldc.i4 -3192
 	add
 	stloc 13
-// 0x01091dd0: 0x1091dd0: addiu s4, s4, -3616
+// 0x010923f4: 0x10923f4: addiu s4, s4, -3152
 	ldloc 12
-	ldc.i4 -3616
+	ldc.i4 -3152
 	add
 	stloc 12
-// 0x01091dd4: 0x1091dd4: j	 0x1092044 addu  s2, zero, zero
+// 0x010923f8: 0x10923f8: j	 0x1092668 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_1092044
+	br L_1092668
 // --- basic block ---
-L_1091ddc:
-// 0x01091ddc: 0x1091ddc: lw    v1, 12(s0)
+L_1092400:
+// 0x01092400: 0x1092400: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6607,23 +6607,23 @@ L_1091ddc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01091de0: 0x1091de0: sll   zero, zero, 0
-// 0x01091de4: 0x1091de4: addu  v0, v1, v0
+// 0x01092404: 0x1092404: sll   zero, zero, 0
+// 0x01092408: 0x1092408: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01091de8: 0x1091de8: lw    v1, 0(v0)
+// 0x0109240c: 0x109240c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01091dec: 0x1091dec: lui   a1, 0xfdff0000
+// 0x01092410: 0x1092410: lui   a1, 0xfdff0000
 	ldc.i4 4261347328
 	stloc.2
-// 0x01091df0: 0x1091df0: lw    v0, 48(v1)
+// 0x01092414: 0x1092414: lw    v0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6632,12 +6632,12 @@ L_1091ddc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091df4: 0x1091df4: ori   a1, a1, 65535
+// 0x01092418: 0x1092418: ori   a1, a1, 65535
 	ldloc.2
 	ldc.i4 65535
 	or
 	stloc.2
-// 0x01091df8: 0x1091df8: lw    a0, 44(s0)
+// 0x0109241c: 0x109241c: lw    a0, 44(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6646,12 +6646,12 @@ L_1091ddc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091dfc: 0x1091dfc: and   v0, v0, a1
+// 0x01092420: 0x1092420: and   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	and
 	stloc 5
-// 0x01091e00: 0x1091e00: beq   a0, zero, 0x1091e30 sw    v0, 48(v1)
+// 0x01092424: 0x1092424: beq   a0, zero, 0x1092454 sw    v0, 48(v1)
 	ldloc.1
 	ldloc 6
 	ldloc 7
@@ -6661,9 +6661,9 @@ L_1091ddc:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1091e30
+	brfalse L_1092454
 // --- basic block ---
-// 0x01091e08: 0x1091e08: lw    a1, 28(s0)
+// 0x0109242c: 0x109242c: lw    a1, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6672,39 +6672,39 @@ L_1091ddc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091e0c: 0x1091e0c: sll   zero, zero, 0
-// 0x01091e10: 0x1091e10: slt   a1, s2, a1
+// 0x01092430: 0x1092430: sll   zero, zero, 0
+// 0x01092434: 0x1092434: slt   a1, s2, a1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc.2
-// 0x01091e14: 0x1091e14: beq   a1, zero, 0x1091e30 sll   a1, s3, 2
+// 0x01092438: 0x1092438: beq   a1, zero, 0x1092454 sll   a1, s3, 2
 	ldloc.2
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc.2
-	brfalse L_1091e30
+	brfalse L_1092454
 // --- basic block ---
-// 0x01091e1c: 0x1091e1c: addu  a0, a0, a1
+// 0x01092440: 0x1092440: addu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01091e20: 0x1091e20: lw    a0, 0(a0)
+// 0x01092444: 0x1092444: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01091e24: 0x1091e24: sll   zero, zero, 0
-// 0x01091e28: 0x1091e28: or    v0, a0, v0
+// 0x01092448: 0x1092448: sll   zero, zero, 0
+// 0x0109244c: 0x109244c: or    v0, a0, v0
 	ldloc.1
 	ldloc 5
 	or
 	stloc 5
-// 0x01091e2c: 0x1091e2c: sw    v0, 48(v1)
+// 0x01092450: 0x1092450: sw    v0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6713,8 +6713,8 @@ L_1091ddc:
 	add
 	ldloc 5
 	stelem.i4
-L_1091e30:
-// 0x01091e30: 0x1091e30: lw    v0, 28(s0)
+L_1092454:
+// 0x01092454: 0x1092454: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6723,7 +6723,7 @@ L_1091e30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091e34: 0x1091e34: lw    a0, 48(v1)
+// 0x01092458: 0x1092458: lw    a0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6732,32 +6732,32 @@ L_1091e30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091e38: 0x1091e38: bne   s3, v0, 0x1091e68 sll   v0, s3, 2
+// 0x0109245c: 0x109245c: bne   s3, v0, 0x109248c sll   v0, s3, 2
 	ldloc 11
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 5
-	bne.un L_1091e68
+	bne.un L_109248c
 // --- basic block ---
-// 0x01091e40: 0x1091e40: lui   v0, 0xffef0000
+// 0x01092464: 0x1092464: lui   v0, 0xffef0000
 	ldc.i4 4293853184
 	stloc 5
-// 0x01091e44: 0x1091e44: ori   v0, v0, 65535
+// 0x01092468: 0x1092468: ori   v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x01091e48: 0x1091e48: and   a0, a0, v0
+// 0x0109246c: 0x109246c: and   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	and
 	stloc.1
-// 0x01091e4c: 0x1091e4c: lui   a2, 0x10000
+// 0x01092470: 0x1092470: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01091e50: 0x1091e50: sw    a0, 48(v1)
+// 0x01092474: 0x1092474: sw    a0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6766,7 +6766,7 @@ L_1091e30:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01091e54: 0x1091e54: sw    zero, 52(v1)
+// 0x01092478: 0x1092478: sw    zero, 52(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6775,12 +6775,12 @@ L_1091e30:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01091e58: 0x1091e58: addiu a2, a2, 18500
+// 0x0109247c: 0x109247c: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01091e5c: 0x1091e5c: sw    zero, 40(sp)
+// 0x01092480: 0x1092480: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6789,7 +6789,7 @@ L_1091e30:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01091e60: 0x1091e60: j	 0x1091eb0 sw    zero, 36(sp)
+// 0x01092484: 0x1092484: j	 0x10924d4 sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6798,10 +6798,10 @@ L_1091e30:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1091eb0
+	br L_10924d4
 // --- basic block ---
-L_1091e68:
-// 0x01091e68: 0x1091e68: lw    a3, 88(s0)
+L_109248c:
+// 0x0109248c: 0x109248c: lw    a3, 88(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6810,7 +6810,7 @@ L_1091e68:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01091e6c: 0x1091e6c: lw    a2, 32(s0)
+// 0x01092490: 0x1092490: lw    a2, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6819,7 +6819,7 @@ L_1091e68:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01091e70: 0x1091e70: lw    a1, 84(s0)
+// 0x01092494: 0x1092494: lw    a1, 84(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6828,45 +6828,45 @@ L_1091e68:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091e74: 0x1091e74: sll   zero, zero, 0
-// 0x01091e78: 0x1091e78: addu  a1, a1, v0
+// 0x01092498: 0x1092498: sll   zero, zero, 0
+// 0x0109249c: 0x109249c: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x01091e7c: 0x1091e7c: addu  a2, a2, v0
+// 0x010924a0: 0x10924a0: addu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc.3
-// 0x01091e80: 0x1091e80: addu  v0, a3, v0
+// 0x010924a4: 0x10924a4: addu  v0, a3, v0
 	ldloc 4
 	ldloc 5
 	add
 	stloc 5
-// 0x01091e84: 0x1091e84: lw    v0, 0(v0)
+// 0x010924a8: 0x10924a8: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01091e88: 0x1091e88: lui   a3, 0x100000
+// 0x010924ac: 0x10924ac: lui   a3, 0x100000
 	ldc.i4 1048576
 	stloc 4
-// 0x01091e8c: 0x1091e8c: lw    a1, 0(a1)
+// 0x010924b0: 0x10924b0: lw    a1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01091e90: 0x1091e90: or    a0, a0, a3
+// 0x010924b4: 0x10924b4: or    a0, a0, a3
 	ldloc.1
 	ldloc 4
 	or
 	stloc.1
-// 0x01091e94: 0x1091e94: sw    v0, 36(sp)
+// 0x010924b8: 0x10924b8: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6875,17 +6875,17 @@ L_1091e68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091e98: 0x1091e98: lw    a2, 0(a2)
+// 0x010924bc: 0x10924bc: lw    a2, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01091e9c: 0x1091e9c: addiu v0, zero, 1
+// 0x010924c0: 0x10924c0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01091ea0: 0x1091ea0: sw    a1, 40(sp)
+// 0x010924c4: 0x10924c4: sw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6894,7 +6894,7 @@ L_1091e68:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01091ea4: 0x1091ea4: sw    a0, 48(v1)
+// 0x010924c8: 0x10924c8: sw    a0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6903,7 +6903,7 @@ L_1091e68:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01091ea8: 0x1091ea8: sw    v0, 52(v1)
+// 0x010924cc: 0x10924cc: sw    v0, 52(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6912,19 +6912,19 @@ L_1091e68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091eac: 0x1091eac: addiu s3, s3, 1
+// 0x010924d0: 0x10924d0: addiu s3, s3, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1091eb0:
-// 0x01091eb0: 0x1091eb0: addu  a0, v1, zero
+L_10924d4:
+// 0x010924d4: 0x10924d4: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01091eb4: 0x1091eb4: addu  a1, s8, zero
+// 0x010924d8: 0x10924d8: addu  a1, s8, zero
 	ldloc 16
 	stloc.2
-// 0x01091eb8: 0x1091eb8: jal   0x109b3e0 sw    v1, 44(sp)
+// 0x010924dc: 0x10924dc: jal   0x109ba28 sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6938,12 +6938,12 @@ L_1091eb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091ec0: 0x1091ec0: lw    v1, 44(sp)
+// 0x010924e4: 0x10924e4: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6952,10 +6952,10 @@ L_1091eb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01091ec4: 0x1091ec4: addu  a1, s7, zero
+// 0x010924e8: 0x10924e8: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x01091ec8: 0x1091ec8: jal   0x109b304 addu  a0, v1, zero
+// 0x010924ec: 0x10924ec: jal   0x109b94c addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6963,12 +6963,12 @@ L_1091eb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091ed0: 0x1091ed0: lw    v1, 44(sp)
+// 0x010924f4: 0x10924f4: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6977,13 +6977,13 @@ L_1091eb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01091ed4: 0x1091ed4: addu  a1, s6, zero
+// 0x010924f8: 0x10924f8: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x01091ed8: 0x1091ed8: addu  a0, v1, zero
+// 0x010924fc: 0x10924fc: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01091edc: 0x1091edc: jal   0x109b304 sw    v0, 32(sp)
+// 0x01092500: 0x1092500: jal   0x109b94c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6997,15 +6997,15 @@ L_1091eb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091ee4: 0x1091ee4: addu  s1, v0, zero
+// 0x01092508: 0x1092508: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01091ee8: 0x1091ee8: lw    v0, 40(sp)
+// 0x0109250c: 0x109250c: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7014,7 +7014,7 @@ L_1091eb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091eec: 0x1091eec: lw    v1, 44(sp)
+// 0x01092510: 0x1092510: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7023,14 +7023,14 @@ L_1091eb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01091ef0: 0x1091ef0: beq   v0, zero, 0x1091f30 sll   zero, zero, 0
+// 0x01092514: 0x1092514: beq   v0, zero, 0x1092554 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1091f30
+	brfalse L_1092554
 // --- basic block ---
-// 0x01091ef8: 0x1091ef8: addu  a0, v1, zero
+// 0x0109251c: 0x109251c: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01091efc: 0x1091efc: jal   0x109b304 addu  a1, s5, zero
+// 0x01092520: 0x1092520: jal   0x109b94c addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -7038,12 +7038,12 @@ L_1091eb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091f04: 0x1091f04: lw    a1, 12(v0)
+// 0x01092528: 0x1092528: lw    a1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7052,17 +7052,17 @@ L_1091eb0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091f08: 0x1091f08: sll   zero, zero, 0
-// 0x01091f0c: 0x1091f0c: beq   a1, zero, 0x1091f24 addu  v1, v0, zero
+// 0x0109252c: 0x109252c: sll   zero, zero, 0
+// 0x01092530: 0x1092530: beq   a1, zero, 0x1092548 addu  v1, v0, zero
 	ldloc.2
 	ldloc 5
 	stloc 7
-	brfalse L_1091f24
+	brfalse L_1092548
 // --- basic block ---
-// 0x01091f14: 0x1091f14: addu  a0, v0, zero
+// 0x01092538: 0x1092538: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01091f18: 0x1091f18: jal   0x109a3a8 sw    v0, 44(sp)
+// 0x0109253c: 0x109253c: jal   0x109a9f0 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7076,12 +7076,12 @@ L_1091eb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_remove_109a3a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_remove_109a9f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091f20: 0x1091f20: lw    v1, 44(sp)
+// 0x01092544: 0x1092544: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7090,8 +7090,8 @@ L_1091eb0:
 	add
 	ldelem.i4
 	stloc 7
-L_1091f24:
-// 0x01091f24: 0x1091f24: lw    a1, 40(sp)
+L_1092548:
+// 0x01092548: 0x1092548: lw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7100,18 +7100,18 @@ L_1091f24:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091f28: 0x1091f28: jal   0x1098ec4 addu  a0, v1, zero
+// 0x0109254c: 0x109254c: jal   0x109950c addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1091f30:
-// 0x01091f30: 0x1091f30: lw    a1, 36(sp)
+L_1092554:
+// 0x01092554: 0x1092554: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7120,12 +7120,12 @@ L_1091f30:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091f34: 0x1091f34: sll   zero, zero, 0
-// 0x01091f38: 0x1091f38: bne   a1, zero, 0x1091f5c sll   zero, zero, 0
+// 0x01092558: 0x1092558: sll   zero, zero, 0
+// 0x0109255c: 0x109255c: bne   a1, zero, 0x1092580 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1091f5c
+	brtrue L_1092580
 // --- basic block ---
-// 0x01091f40: 0x1091f40: lw    a0, 32(sp)
+// 0x01092564: 0x1092564: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7134,26 +7134,26 @@ L_1091f30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091f44: 0x1091f44: jal   0x1099098 sll   zero, zero, 0
+// 0x01092568: 0x1092568: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01091f4c: 0x1091f4c: bne   s1, zero, 0x1092038 addu  a0, s1, zero
+// 0x01092570: 0x1092570: bne   s1, zero, 0x109265c addu  a0, s1, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
-	brtrue L_1092038
+	brtrue L_109265c
 // --- basic block ---
-// 0x01091f54: 0x1091f54: j	 0x1092044 addiu s2, s2, 1
+// 0x01092578: 0x1092578: j	 0x1092668 addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_1092044
+	br L_1092668
 // --- basic block ---
-L_1091f5c:
-// 0x01091f5c: 0x1091f5c: lw    a0, 32(sp)
+L_1092580:
+// 0x01092580: 0x1092580: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7162,28 +7162,28 @@ L_1091f5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091f60: 0x1091f60: jal   0x10990ac sll   zero, zero, 0
+// 0x01092584: 0x1092584: jal   0x10996f4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091f68: 0x1091f68: beq   s1, zero, 0x1091f78 sll   zero, zero, 0
+// 0x0109258c: 0x109258c: beq   s1, zero, 0x109259c sll   zero, zero, 0
 	ldloc 10
-	brfalse L_1091f78
+	brfalse L_109259c
 // --- basic block ---
-// 0x01091f70: 0x1091f70: jal   0x10990ac addu  a0, s1, zero
+// 0x01092594: 0x1092594: jal   0x10996f4 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1091f78:
-// 0x01091f78: 0x1091f78: lw    v0, 32(sp)
+L_109259c:
+// 0x0109259c: 0x109259c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7192,8 +7192,8 @@ L_1091f78:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01091f7c: 0x1091f7c: sll   zero, zero, 0
-// 0x01091f80: 0x1091f80: lw    a1, 12(v0)
+// 0x010925a0: 0x10925a0: sll   zero, zero, 0
+// 0x010925a4: 0x10925a4: lw    a1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7202,12 +7202,12 @@ L_1091f78:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091f84: 0x1091f84: sll   zero, zero, 0
-// 0x01091f88: 0x1091f88: beq   a1, zero, 0x1091fb0 sll   zero, zero, 0
+// 0x010925a8: 0x10925a8: sll   zero, zero, 0
+// 0x010925ac: 0x10925ac: beq   a1, zero, 0x10925d4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1091fb0
+	brfalse L_10925d4
 // --- basic block ---
-// 0x01091f90: 0x1091f90: jal   0x109a3a8 addu  a0, v0, zero
+// 0x010925b4: 0x10925b4: jal   0x109a9f0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7215,12 +7215,12 @@ L_1091f78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_remove_109a3a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_remove_109a9f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091f98: 0x1091f98: lw    a0, 32(sp)
+// 0x010925bc: 0x10925bc: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7229,7 +7229,7 @@ L_1091f78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091f9c: 0x1091f9c: lw    a1, 36(sp)
+// 0x010925c0: 0x10925c0: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7238,23 +7238,23 @@ L_1091f78:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091fa0: 0x1091fa0: jal   0x1098ec4 addiu s2, s2, 1
+// 0x010925c4: 0x10925c4: jal   0x109950c addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091fa8: 0x1091fa8: j	 0x1092044 sll   zero, zero, 0
-	br L_1092044
+// 0x010925cc: 0x10925cc: j	 0x1092668 sll   zero, zero, 0
+	br L_1092668
 // --- basic block ---
-L_1091fb0:
-// 0x01091fb0: 0x1091fb0: lw    a0, 32(sp)
+L_10925d4:
+// 0x010925d4: 0x10925d4: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7263,7 +7263,7 @@ L_1091fb0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01091fb4: 0x1091fb4: lw    a1, 36(sp)
+// 0x010925d8: 0x10925d8: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7272,21 +7272,21 @@ L_1091fb0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01091fb8: 0x1091fb8: jal   0x1098ec4 sll   zero, zero, 0
+// 0x010925dc: 0x10925dc: jal   0x109950c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091fc0: 0x1091fc0: beq   s1, zero, 0x1092040 addu  a0, s1, zero
+// 0x010925e4: 0x10925e4: beq   s1, zero, 0x1092664 addu  a0, s1, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
-	brfalse L_1092040
+	brfalse L_1092664
 // --- basic block ---
-// 0x01091fc8: 0x1091fc8: jal   0x109b304 addu  a1, s4, zero
+// 0x010925ec: 0x10925ec: jal   0x109b94c addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -7294,21 +7294,21 @@ L_1091fb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01091fd0: 0x1091fd0: bne   v0, zero, 0x1092028 addu  a0, s4, zero
+// 0x010925f4: 0x10925f4: bne   v0, zero, 0x109264c addu  a0, s4, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_1092028
+	brtrue L_109264c
 // --- basic block ---
-// 0x01091fd8: 0x1091fd8: addiu v0, zero, 16
+// 0x010925fc: 0x10925fc: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x01091fdc: 0x1091fdc: sw    v0, 16(sp)
+// 0x01092600: 0x1092600: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7317,15 +7317,15 @@ L_1091fb0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091fe0: 0x1091fe0: lui   v0, 0x20000
+// 0x01092604: 0x1092604: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01091fe4: 0x1091fe4: addiu v0, v0, -3604
+// 0x01092608: 0x1092608: addiu v0, v0, -3140
 	ldloc 5
-	ldc.i4 -3604
+	ldc.i4 -3140
 	add
 	stloc 5
-// 0x01091fe8: 0x1091fe8: sw    v0, 24(sp)
+// 0x0109260c: 0x109260c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7334,15 +7334,15 @@ L_1091fb0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091fec: 0x1091fec: lui   v0, 0x20000
+// 0x01092610: 0x1092610: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01091ff0: 0x1091ff0: addiu v0, v0, -3592
+// 0x01092614: 0x1092614: addiu v0, v0, -3128
 	ldloc 5
-	ldc.i4 -3592
+	ldc.i4 -3128
 	add
 	stloc 5
-// 0x01091ff4: 0x1091ff4: sw    v0, 28(sp)
+// 0x01092618: 0x1092618: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7351,26 +7351,26 @@ L_1091fb0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01091ff8: 0x1091ff8: lui   v0, 0x1090000
+// 0x0109261c: 0x109261c: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01091ffc: 0x1091ffc: addu  a1, s4, zero
+// 0x01092620: 0x1092620: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01092000: 0x1092000: addiu a2, sp, 24
+// 0x01092624: 0x1092624: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01092004: 0x1092004: addiu a3, zero, 2
+// 0x01092628: 0x1092628: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x01092008: 0x1092008: addiu v0, v0, 8488
+// 0x0109262c: 0x109262c: addiu v0, v0, 10060
 	ldloc 5
-	ldc.i4 8488
+	ldc.i4 10060
 	add
 	stloc 5
-// 0x0109200c: 0x109200c: jal   0x1090ecc sw    v0, 20(sp)
+// 0x01092630: 0x1092630: jal   0x10914f0 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7384,18 +7384,18 @@ L_1091fb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092014: 0x1092014: addu  a1, v0, zero
+// 0x01092638: 0x1092638: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01092018: 0x1092018: addu  a0, s1, zero
+// 0x0109263c: 0x109263c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0109201c: 0x109201c: jal   0x1098ec4 sw    v0, 44(sp)
+// 0x01092640: 0x1092640: jal   0x109950c sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7406,12 +7406,12 @@ L_1091fb0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092024: 0x1092024: lw    v0, 44(sp)
+// 0x01092648: 0x1092648: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7420,8 +7420,8 @@ L_1091fb0:
 	add
 	ldelem.i4
 	stloc 5
-L_1092028:
-// 0x01092028: 0x1092028: lw    v1, 80(s0)
+L_109264c:
+// 0x0109264c: 0x109264c: lw    v1, 80(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7430,27 +7430,27 @@ L_1092028:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109202c: 0x109202c: sll   zero, zero, 0
-// 0x01092030: 0x1092030: bne   v1, zero, 0x1092040 addu  a0, v0, zero
+// 0x01092650: 0x1092650: sll   zero, zero, 0
+// 0x01092654: 0x1092654: bne   v1, zero, 0x1092664 addu  a0, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brtrue L_1092040
+	brtrue L_1092664
 // --- basic block ---
-L_1092038:
-// 0x01092038: 0x1092038: jal   0x1099098 sll   zero, zero, 0
+L_109265c:
+// 0x0109265c: 0x109265c: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1092040:
-// 0x01092040: 0x1092040: addiu s2, s2, 1
+L_1092664:
+// 0x01092664: 0x1092664: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1092044:
-// 0x01092044: 0x1092044: lw    v0, 4(s0)
+L_1092668:
+// 0x01092668: 0x1092668: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7459,23 +7459,23 @@ L_1092044:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092048: 0x1092048: sll   zero, zero, 0
-// 0x0109204c: 0x109204c: slt   v0, s2, v0
+// 0x0109266c: 0x109266c: sll   zero, zero, 0
+// 0x01092670: 0x1092670: slt   v0, s2, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01092050: 0x1092050: bne   v0, zero, 0x1091ddc sll   v0, s2, 2
+// 0x01092674: 0x1092674: bne   v0, zero, 0x1092400 sll   v0, s2, 2
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 5
-	brtrue L_1091ddc
+	brtrue L_1092400
 // --- basic block ---
-L_1092058:
-// 0x01092058: 0x1092058: lw    ra, 84(sp)
-// 0x0109205c: 0x109205c: lw    s8, 80(sp)
+L_109267c:
+// 0x0109267c: 0x109267c: lw    ra, 84(sp)
+// 0x01092680: 0x1092680: lw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7484,7 +7484,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01092060: 0x1092060: lw    s7, 76(sp)
+// 0x01092684: 0x1092684: lw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7493,7 +7493,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01092064: 0x1092064: lw    s6, 72(sp)
+// 0x01092688: 0x1092688: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7502,7 +7502,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01092068: 0x1092068: lw    s5, 68(sp)
+// 0x0109268c: 0x109268c: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7511,7 +7511,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109206c: 0x109206c: lw    s4, 64(sp)
+// 0x01092690: 0x1092690: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7520,7 +7520,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01092070: 0x1092070: lw    s3, 60(sp)
+// 0x01092694: 0x1092694: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7529,7 +7529,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01092074: 0x1092074: lw    s2, 56(sp)
+// 0x01092698: 0x1092698: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7538,7 +7538,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01092078: 0x1092078: lw    s1, 52(sp)
+// 0x0109269c: 0x109269c: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7547,7 +7547,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109207c: 0x109207c: lw    s0, 48(sp)
+// 0x010926a0: 0x10926a0: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7556,7 +7556,7 @@ L_1092058:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01092080: 0x1092080: jr    ra addiu sp, sp, 88
+// 0x010926a4: 0x10926a4: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
diff --git a/converted/Cibyl109.j b/converted/Cibyl109.j
index 3606588..5f8a7f2 100644
--- a/converted/Cibyl109.j
+++ b/converted/Cibyl109.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl109::.ctor
 
-.method public static int32 ssd_list_populate_widgets_1092088(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_populate_widgets_10926ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092088: 0x1092088: addiu sp, sp, -32
+// 0x010926ac: 0x10926ac: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109208c: 0x109208c: sw    s0, 20(sp)
+// 0x010926b0: 0x10926b0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -96,7 +96,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092090: 0x1092090: lw    s0, 164(a0)
+// 0x010926b4: 0x10926b4: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -105,7 +105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092094: 0x1092094: lw    v0, 48(sp)
+// 0x010926b8: 0x10926b8: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -114,7 +114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01092098: 0x1092098: sw    a3, 84(s0)
+// 0x010926bc: 0x10926bc: sw    a3, 84(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -123,7 +123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109209c: 0x109209c: sw    v0, 36(s0)
+// 0x010926c0: 0x10926c0: sw    v0, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -132,7 +132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010920a0: 0x10920a0: lw    v0, 52(sp)
+// 0x010926c4: 0x10926c4: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -141,7 +141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010920a4: 0x10920a4: sw    a1, 28(s0)
+// 0x010926c8: 0x10926c8: sw    a1, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -150,7 +150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010920a8: 0x10920a8: sw    v0, 88(s0)
+// 0x010926cc: 0x10926cc: sw    v0, 88(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -159,7 +159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010920ac: 0x10920ac: lw    v0, 56(sp)
+// 0x010926d0: 0x10926d0: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -168,7 +168,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010920b0: 0x10920b0: sw    a2, 32(s0)
+// 0x010926d4: 0x10926d4: sw    a2, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -177,7 +177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010920b4: 0x10920b4: sw    v0, 44(s0)
+// 0x010926d8: 0x10926d8: sw    v0, 44(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -186,7 +186,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010920b8: 0x10920b8: lw    v0, 60(sp)
+// 0x010926dc: 0x10926dc: lw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -195,7 +195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010920bc: 0x10920bc: sw    s1, 24(sp)
+// 0x010926e0: 0x10926e0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -204,7 +204,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010920c0: 0x10920c0: sw    v0, 16(s0)
+// 0x010926e4: 0x10926e4: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -213,7 +213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010920c4: 0x10920c4: lw    v0, 64(sp)
+// 0x010926e8: 0x10926e8: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -222,10 +222,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010920c8: 0x10920c8: addu  s1, a0, zero
+// 0x010926ec: 0x10926ec: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010920cc: 0x10920cc: sw    v0, 20(s0)
+// 0x010926f0: 0x10926f0: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -234,7 +234,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010920d0: 0x10920d0: lw    v0, 68(sp)
+// 0x010926f4: 0x10926f4: lw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -243,8 +243,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010920d4: 0x10920d4: sll   zero, zero, 0
-// 0x010920d8: 0x10920d8: sw    v0, 80(s0)
+// 0x010926f8: 0x10926f8: sll   zero, zero, 0
+// 0x010926fc: 0x10926fc: sw    v0, 80(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -253,7 +253,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010920dc: 0x10920dc: sw    zero, 48(s0)
+// 0x01092700: 0x1092700: sw    zero, 48(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -262,8 +262,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010920e0: 0x10920e0: sw    ra, 28(sp)
-// 0x010920e4: 0x10920e4: jal   0x1091d70 addu  a0, s0, zero
+// 0x01092704: 0x1092704: sw    ra, 28(sp)
+// 0x01092708: 0x1092708: jal   0x1092394 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -271,20 +271,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::setup_list_widgets_rows_1091d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::setup_list_widgets_rows_1092394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010920ec: 0x10920ec: lui   a1, 0x20000
+// 0x01092710: 0x1092710: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010920f0: 0x10920f0: addu  a0, s1, zero
+// 0x01092714: 0x1092714: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010920f4: 0x10920f4: jal   0x109b304 addiu a1, a1, -3580
+// 0x01092718: 0x1092718: jal   0x109b94c addiu a1, a1, -3116
 	ldloc.2
-	ldc.i4 -3580
+	ldc.i4 -3116
 	add
 	stloc.2
 	ldloc.0
@@ -292,20 +292,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010920fc: 0x10920fc: addu  a0, v0, zero
+// 0x01092720: 0x1092720: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01092100: 0x1092100: addiu a1, s0, 68
+// 0x01092724: 0x1092724: addiu a1, s0, 68
 	ldloc 7
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x01092104: 0x1092104: jal   0x10917cc addu  a2, s0, zero
+// 0x01092728: 0x1092728: jal   0x1091df0 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -313,12 +313,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::update_list_rows_10917cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::update_list_rows_1091df0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109210c: 0x109210c: jal   0x1091d70 addu  a0, s0, zero
+// 0x01092730: 0x1092730: jal   0x1092394 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -326,13 +326,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::setup_list_widgets_rows_1091d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::setup_list_widgets_rows_1092394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01092114: 0x1092114: lw    ra, 28(sp)
-// 0x01092118: 0x1092118: lw    s1, 24(sp)
+// 0x01092738: 0x1092738: lw    ra, 28(sp)
+// 0x0109273c: 0x109273c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -341,7 +341,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109211c: 0x109211c: lw    s0, 20(sp)
+// 0x01092740: 0x1092740: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -350,7 +350,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092120: 0x1092120: jr    ra addiu sp, sp, 32
+// 0x01092744: 0x1092744: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -362,7 +362,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 next_button_callback_1092128(int32,int32,int32,int32,int32)
+.method public static int32 next_button_callback_109274c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -397,7 +397,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092128: 0x1092128: lw    v0, 4(a0)
+// 0x0109274c: 0x109274c: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -406,12 +406,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109212c: 0x109212c: addiu sp, sp, -24
+// 0x01092750: 0x1092750: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01092130: 0x1092130: lw    a0, 4(v0)
+// 0x01092754: 0x1092754: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -420,45 +420,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01092134: 0x1092134: sw    ra, 20(sp)
-// 0x01092138: 0x1092138: jal   0x109617c sll   zero, zero, 0
+// 0x01092758: 0x1092758: sw    ra, 20(sp)
+// 0x0109275c: 0x109275c: jal   0x10967c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092140: 0x1092140: jal   0x1021900 sll   zero, zero, 0
+// 0x01092764: 0x1092764: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092148: 0x1092148: jal   0x103fa1c sll   zero, zero, 0
+// 0x0109276c: 0x109276c: jal   0x103fa2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_left_softkey_callback_103fa1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_left_softkey_callback_103fa2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092150: 0x1092150: lw    ra, 20(sp)
-// 0x01092154: 0x1092154: addu  v0, zero, zero
+// 0x01092774: 0x1092774: lw    ra, 20(sp)
+// 0x01092778: 0x1092778: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01092158: 0x1092158: jr    ra addiu sp, sp, 24
+// 0x0109277c: 0x109277c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -470,7 +470,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 setup_list_rows_1092160(int32,int32,int32,int32,int32)
+.method public static int32 setup_list_rows_1092784(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s8,int32 s0,int32 s1,int32 s2,int32 s5,int32 s4,int32 s3,int32 s6,int32 s7,int32 ra)
@@ -532,7 +532,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092160: 0x1092160: lw    v0, 12(a0)
+// 0x01092784: 0x1092784: lw    v0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -541,12 +541,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092164: 0x1092164: addiu sp, sp, -96
+// 0x01092788: 0x1092788: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01092168: 0x1092168: sw    s3, 68(sp)
+// 0x0109278c: 0x109278c: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -555,7 +555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109216c: 0x109216c: sw    s0, 56(sp)
+// 0x01092790: 0x1092790: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -564,8 +564,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01092170: 0x1092170: sw    ra, 92(sp)
-// 0x01092174: 0x1092174: sw    s8, 88(sp)
+// 0x01092794: 0x1092794: sw    ra, 92(sp)
+// 0x01092798: 0x1092798: sw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -574,7 +574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01092178: 0x1092178: sw    s7, 84(sp)
+// 0x0109279c: 0x109279c: sw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -583,7 +583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109217c: 0x109217c: sw    s6, 80(sp)
+// 0x010927a0: 0x10927a0: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -592,7 +592,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01092180: 0x1092180: sw    s5, 76(sp)
+// 0x010927a4: 0x10927a4: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -601,7 +601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01092184: 0x1092184: sw    s4, 72(sp)
+// 0x010927a8: 0x10927a8: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -610,7 +610,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01092188: 0x1092188: sw    s2, 64(sp)
+// 0x010927ac: 0x10927ac: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -619,7 +619,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109218c: 0x109218c: sw    s1, 60(sp)
+// 0x010927b0: 0x10927b0: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -628,7 +628,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01092190: 0x1092190: lw    s3, 48(a0)
+// 0x010927b4: 0x10927b4: lw    s3, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -637,43 +637,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01092194: 0x1092194: beq   v0, zero, 0x1092498 addu  s0, a0, zero
+// 0x010927b8: 0x10927b8: beq   v0, zero, 0x1092abc addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
-	brfalse L_1092498
+	brfalse L_1092abc
 // --- basic block ---
-// 0x0109219c: 0x109219c: lui   s7, 0x10000
+// 0x010927c0: 0x10927c0: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x010921a0: 0x10921a0: lui   s6, 0x10000
+// 0x010927c4: 0x10927c4: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 15
-// 0x010921a4: 0x10921a4: lui   s4, 0x20000
+// 0x010927c8: 0x10927c8: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x010921a8: 0x10921a8: addiu s7, s7, -32516
+// 0x010927cc: 0x10927cc: addiu s7, s7, -32516
 	ldloc 16
 	ldc.i4 -32516
 	add
 	stloc 16
-// 0x010921ac: 0x10921ac: addiu s6, s6, -27784
+// 0x010927d0: 0x10927d0: addiu s6, s6, -27784
 	ldloc 15
 	ldc.i4 -27784
 	add
 	stloc 15
-// 0x010921b0: 0x10921b0: addiu s4, s4, -3616
+// 0x010927d4: 0x10927d4: addiu s4, s4, -3152
 	ldloc 13
-	ldc.i4 -3616
+	ldc.i4 -3152
 	add
 	stloc 13
-// 0x010921b4: 0x10921b4: j	 0x1092484 addu  s2, zero, zero
+// 0x010927d8: 0x10927d8: j	 0x1092aa8 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_1092484
+	br L_1092aa8
 // --- basic block ---
-L_10921bc:
-// 0x010921bc: 0x10921bc: lw    v1, 12(s0)
+L_10927e0:
+// 0x010927e0: 0x10927e0: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -682,23 +682,23 @@ L_10921bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010921c0: 0x10921c0: sll   zero, zero, 0
-// 0x010921c4: 0x10921c4: addu  v0, v1, v0
+// 0x010927e4: 0x10927e4: sll   zero, zero, 0
+// 0x010927e8: 0x10927e8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010921c8: 0x10921c8: lw    s8, 0(v0)
+// 0x010927ec: 0x10927ec: lw    s8, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010921cc: 0x10921cc: lui   v0, 0xfdff0000
+// 0x010927f0: 0x10927f0: lui   v0, 0xfdff0000
 	ldc.i4 4261347328
 	stloc 5
-// 0x010921d0: 0x10921d0: lw    a0, 48(s8)
+// 0x010927f4: 0x10927f4: lw    a0, 48(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -707,12 +707,12 @@ L_10921bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010921d4: 0x10921d4: ori   v0, v0, 65535
+// 0x010927f8: 0x10927f8: ori   v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x010921d8: 0x10921d8: lw    v1, 44(s0)
+// 0x010927fc: 0x10927fc: lw    v1, 44(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -721,12 +721,12 @@ L_10921bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010921dc: 0x10921dc: and   v0, a0, v0
+// 0x01092800: 0x1092800: and   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	and
 	stloc 5
-// 0x010921e0: 0x10921e0: beq   v1, zero, 0x1092210 sw    v0, 48(s8)
+// 0x01092804: 0x1092804: beq   v1, zero, 0x1092834 sw    v0, 48(s8)
 	ldloc 7
 	ldloc 6
 	ldloc 8
@@ -736,9 +736,9 @@ L_10921bc:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1092210
+	brfalse L_1092834
 // --- basic block ---
-// 0x010921e8: 0x10921e8: lw    a0, 28(s0)
+// 0x0109280c: 0x109280c: lw    a0, 28(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -747,39 +747,39 @@ L_10921bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010921ec: 0x10921ec: sll   zero, zero, 0
-// 0x010921f0: 0x10921f0: slt   a0, s2, a0
+// 0x01092810: 0x1092810: sll   zero, zero, 0
+// 0x01092814: 0x1092814: slt   a0, s2, a0
 	ldloc 11
 	ldloc.1
 	clt
 	stloc.1
-// 0x010921f4: 0x10921f4: beq   a0, zero, 0x1092210 sll   a0, s3, 2
+// 0x01092818: 0x1092818: beq   a0, zero, 0x1092834 sll   a0, s3, 2
 	ldloc.1
 	ldloc 14
 	ldc.i4.2
 	shl
 	stloc.1
-	brfalse L_1092210
+	brfalse L_1092834
 // --- basic block ---
-// 0x010921fc: 0x10921fc: addu  v1, v1, a0
+// 0x01092820: 0x1092820: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01092200: 0x1092200: lw    v1, 0(v1)
+// 0x01092824: 0x1092824: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01092204: 0x1092204: sll   zero, zero, 0
-// 0x01092208: 0x1092208: or    v0, v1, v0
+// 0x01092828: 0x1092828: sll   zero, zero, 0
+// 0x0109282c: 0x109282c: or    v0, v1, v0
 	ldloc 7
 	ldloc 5
 	or
 	stloc 5
-// 0x0109220c: 0x109220c: sw    v0, 48(s8)
+// 0x01092830: 0x1092830: sw    v0, 48(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -788,8 +788,8 @@ L_10921bc:
 	add
 	ldloc 5
 	stelem.i4
-L_1092210:
-// 0x01092210: 0x1092210: lw    v0, 28(s0)
+L_1092834:
+// 0x01092834: 0x1092834: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -798,8 +798,8 @@ L_1092210:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092214: 0x1092214: sll   zero, zero, 0
-// 0x01092218: 0x1092218: bne   s3, v0, 0x1092244 sw    zero, 24(sp)
+// 0x01092838: 0x1092838: sll   zero, zero, 0
+// 0x0109283c: 0x109283c: bne   s3, v0, 0x1092868 sw    zero, 24(sp)
 	ldloc 14
 	ldloc 5
 	ldloc 6
@@ -810,9 +810,9 @@ L_1092210:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_1092244
+	bne.un L_1092868
 // --- basic block ---
-// 0x01092220: 0x1092220: lw    v1, 48(s8)
+// 0x01092844: 0x1092844: lw    v1, 48(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -821,23 +821,23 @@ L_1092210:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092224: 0x1092224: lui   v0, 0xffef0000
+// 0x01092848: 0x1092848: lui   v0, 0xffef0000
 	ldc.i4 4293853184
 	stloc 5
-// 0x01092228: 0x1092228: ori   v0, v0, 65535
+// 0x0109284c: 0x109284c: ori   v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x0109222c: 0x109222c: and   v0, v1, v0
+// 0x01092850: 0x1092850: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01092230: 0x1092230: lui   a2, 0x10000
+// 0x01092854: 0x1092854: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01092234: 0x1092234: sw    v0, 48(s8)
+// 0x01092858: 0x1092858: sw    v0, 48(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -846,7 +846,7 @@ L_1092210:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092238: 0x1092238: sw    zero, 52(s8)
+// 0x0109285c: 0x109285c: sw    zero, 52(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -855,15 +855,15 @@ L_1092210:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109223c: 0x109223c: j	 0x1092290 addiu a2, a2, 18500
+// 0x01092860: 0x1092860: j	 0x10928b4 addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-	br L_1092290
+	br L_10928b4
 // --- basic block ---
-L_1092244:
-// 0x01092244: 0x1092244: lw    a0, 32(s0)
+L_1092868:
+// 0x01092868: 0x1092868: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -872,12 +872,12 @@ L_1092244:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01092248: 0x1092248: sll   v0, s3, 2
+// 0x0109286c: 0x109286c: sll   v0, s3, 2
 	ldloc 14
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0109224c: 0x109224c: lw    v1, 40(s0)
+// 0x01092870: 0x1092870: lw    v1, 40(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -886,34 +886,34 @@ L_1092244:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092250: 0x1092250: addu  a0, a0, v0
+// 0x01092874: 0x1092874: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x01092254: 0x1092254: lw    a2, 0(a0)
+// 0x01092878: 0x1092878: lw    a2, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01092258: 0x1092258: beq   v1, zero, 0x109226c addu  v0, v1, v0
+// 0x0109287c: 0x109287c: beq   v1, zero, 0x1092890 addu  v0, v1, v0
 	ldloc 7
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-	brfalse L_109226c
+	brfalse L_1092890
 // --- basic block ---
-// 0x01092260: 0x1092260: lw    v0, 0(v0)
+// 0x01092884: 0x1092884: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01092264: 0x1092264: j	 0x1092270 sw    v0, 24(sp)
+// 0x01092888: 0x1092888: j	 0x1092894 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -922,10 +922,10 @@ L_1092244:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1092270
+	br L_1092894
 // --- basic block ---
-L_109226c:
-// 0x0109226c: 0x109226c: sw    zero, 24(sp)
+L_1092890:
+// 0x01092890: 0x1092890: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -934,8 +934,8 @@ L_109226c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1092270:
-// 0x01092270: 0x1092270: lw    v1, 48(s8)
+L_1092894:
+// 0x01092894: 0x1092894: lw    v1, 48(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -944,15 +944,15 @@ L_1092270:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092274: 0x1092274: lui   v0, 0x100000
+// 0x01092898: 0x1092898: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x01092278: 0x1092278: or    v0, v1, v0
+// 0x0109289c: 0x109289c: or    v0, v1, v0
 	ldloc 7
 	ldloc 5
 	or
 	stloc 5
-// 0x0109227c: 0x109227c: sw    v0, 48(s8)
+// 0x010928a0: 0x10928a0: sw    v0, 48(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -961,10 +961,10 @@ L_1092270:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092280: 0x1092280: addiu v0, zero, 1
+// 0x010928a4: 0x10928a4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01092284: 0x1092284: sw    v0, 52(s8)
+// 0x010928a8: 0x10928a8: sw    v0, 52(s8)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -973,7 +973,7 @@ L_1092270:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092288: 0x1092288: sw    zero, 28(sp)
+// 0x010928ac: 0x10928ac: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -982,16 +982,16 @@ L_1092270:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109228c: 0x109228c: addiu s3, s3, 1
+// 0x010928b0: 0x10928b0: addiu s3, s3, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-L_1092290:
-// 0x01092290: 0x1092290: addu  a0, s8, zero
+L_10928b4:
+// 0x010928b4: 0x10928b4: addu  a0, s8, zero
 	ldloc 8
 	stloc.1
-// 0x01092294: 0x1092294: jal   0x109b3e0 addu  a1, s7, zero
+// 0x010928b8: 0x10928b8: jal   0x109ba28 addu  a1, s7, zero
 	ldloc 16
 	stloc.2
 	ldloc.0
@@ -999,20 +999,20 @@ L_1092290:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109229c: 0x109229c: lui   a1, 0x20000
+// 0x010928c0: 0x10928c0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010922a0: 0x10922a0: addu  a0, s8, zero
+// 0x010928c4: 0x10928c4: addu  a0, s8, zero
 	ldloc 8
 	stloc.1
-// 0x010922a4: 0x10922a4: jal   0x109b304 addiu a1, a1, -21844
+// 0x010928c8: 0x10928c8: jal   0x109b94c addiu a1, a1, -21380
 	ldloc.2
-	ldc.i4 -21844
+	ldc.i4 -21380
 	add
 	stloc.2
 	ldloc.0
@@ -1020,23 +1020,23 @@ L_1092290:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010922ac: 0x10922ac: lui   a1, 0x20000
+// 0x010928d0: 0x10928d0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010922b0: 0x10922b0: addu  a0, s8, zero
+// 0x010928d4: 0x10928d4: addu  a0, s8, zero
 	ldloc 8
 	stloc.1
-// 0x010922b4: 0x10922b4: addiu a1, a1, -3636
+// 0x010928d8: 0x10928d8: addiu a1, a1, -3172
 	ldloc.2
-	ldc.i4 -3636
+	ldc.i4 -3172
 	add
 	stloc.2
-// 0x010922b8: 0x10922b8: jal   0x109b304 addu  s5, v0, zero
+// 0x010928dc: 0x10928dc: jal   0x109b94c addu  s5, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -1044,15 +1044,15 @@ L_1092290:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010922c0: 0x10922c0: addu  s1, v0, zero
+// 0x010928e4: 0x10928e4: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010922c4: 0x10922c4: lw    v0, 40(s0)
+// 0x010928e8: 0x10928e8: lw    v0, 40(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1061,14 +1061,14 @@ L_1092290:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010922c8: 0x10922c8: sll   zero, zero, 0
-// 0x010922cc: 0x10922cc: bne   v0, zero, 0x1092310 addu  a0, s8, zero
+// 0x010928ec: 0x10928ec: sll   zero, zero, 0
+// 0x010928f0: 0x10928f0: bne   v0, zero, 0x1092934 addu  a0, s8, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_1092310
+	brtrue L_1092934
 // --- basic block ---
-// 0x010922d4: 0x10922d4: jal   0x109b304 addu  a1, s7, zero
+// 0x010928f8: 0x10928f8: jal   0x109b94c addu  a1, s7, zero
 	ldloc 16
 	stloc.2
 	ldloc.0
@@ -1076,42 +1076,42 @@ L_1092290:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010922dc: 0x10922dc: addu  a0, s5, zero
+// 0x01092900: 0x1092900: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x010922e0: 0x10922e0: jal   0x1099098 addu  s8, v0, zero
+// 0x01092904: 0x1092904: jal   0x10996e0 addu  s8, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010922e8: 0x10922e8: beq   s1, zero, 0x10922fc addu  a0, s8, zero
+// 0x0109290c: 0x109290c: beq   s1, zero, 0x1092920 addu  a0, s8, zero
 	ldloc 10
 	ldloc 8
 	stloc.1
-	brfalse L_10922fc
+	brfalse L_1092920
 // --- basic block ---
-// 0x010922f0: 0x10922f0: jal   0x1099098 addu  a0, s1, zero
+// 0x01092914: 0x1092914: jal   0x10996e0 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010922f8: 0x10922f8: addu  a0, s8, zero
+// 0x0109291c: 0x109291c: addu  a0, s8, zero
 	ldloc 8
 	stloc.1
-L_10922fc:
-// 0x010922fc: 0x10922fc: addiu a1, zero, 10
+L_1092920:
+// 0x01092920: 0x1092920: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x01092300: 0x1092300: jal   0x1098f84 addu  a2, zero, zero
+// 0x01092924: 0x1092924: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1119,48 +1119,48 @@ L_10922fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092308: 0x1092308: j	 0x1092484 addiu s2, s2, 1
+// 0x0109292c: 0x109292c: j	 0x1092aa8 addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	br L_1092484
+	br L_1092aa8
 // --- basic block ---
-L_1092310:
-// 0x01092310: 0x1092310: jal   0x10990ac addu  a0, s5, zero
+L_1092934:
+// 0x01092934: 0x1092934: jal   0x10996f4 addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092318: 0x1092318: beq   s1, zero, 0x109232c addu  a0, s5, zero
+// 0x0109293c: 0x109293c: beq   s1, zero, 0x1092950 addu  a0, s5, zero
 	ldloc 10
 	ldloc 12
 	stloc.1
-	brfalse L_109232c
+	brfalse L_1092950
 // --- basic block ---
-// 0x01092320: 0x1092320: jal   0x10990ac addu  a0, s1, zero
+// 0x01092944: 0x1092944: jal   0x10996f4 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092328: 0x1092328: addu  a0, s5, zero
+// 0x0109294c: 0x109294c: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-L_109232c:
-// 0x0109232c: 0x109232c: jal   0x109b304 addu  a1, s6, zero
+L_1092950:
+// 0x01092950: 0x1092950: jal   0x109b94c addu  a1, s6, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -1168,15 +1168,15 @@ L_109232c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092334: 0x1092334: addu  s8, v0, zero
+// 0x01092958: 0x1092958: addu  s8, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01092338: 0x1092338: lw    v0, 24(sp)
+// 0x0109295c: 0x109295c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1185,22 +1185,22 @@ L_109232c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109233c: 0x109233c: beq   s8, zero, 0x10923c0 sll   zero, zero, 0
+// 0x01092960: 0x1092960: beq   s8, zero, 0x10929e4 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10923c0
+	brfalse L_10929e4
 // --- basic block ---
-// 0x01092344: 0x1092344: beq   v0, zero, 0x1092398 addu  a0, s8, zero
+// 0x01092968: 0x1092968: beq   v0, zero, 0x10929bc addu  a0, s8, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brfalse L_1092398
+	brfalse L_10929bc
 // --- basic block ---
-// 0x0109234c: 0x109234c: addiu a1, sp, 24
+// 0x01092970: 0x1092970: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01092350: 0x1092350: jal   0x1090cbc addiu a2, zero, 1
+// 0x01092974: 0x1092974: jal   0x10912e0 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -1208,27 +1208,27 @@ L_109232c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_icon_1090cbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_icon_10912e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092358: 0x1092358: jal   0x10990ac addu  a0, s8, zero
+// 0x0109297c: 0x109297c: jal   0x10996f4 addu  a0, s8, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092360: 0x1092360: beq   s1, zero, 0x1092480 addu  a0, s1, zero
+// 0x01092984: 0x1092984: beq   s1, zero, 0x1092aa4 addu  a0, s1, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
-	brfalse L_1092480
+	brfalse L_1092aa4
 // --- basic block ---
-// 0x01092368: 0x1092368: jal   0x109b304 addu  a1, s4, zero
+// 0x0109298c: 0x109298c: jal   0x109b94c addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -1236,18 +1236,18 @@ L_109232c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092370: 0x1092370: beq   v0, zero, 0x1092478 addu  a0, v0, zero
+// 0x01092994: 0x1092994: beq   v0, zero, 0x1092a9c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1092478
+	brfalse L_1092a9c
 // --- basic block ---
-// 0x01092378: 0x1092378: lw    v0, 80(s0)
+// 0x0109299c: 0x109299c: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1256,33 +1256,33 @@ L_109232c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109237c: 0x109237c: sll   zero, zero, 0
-// 0x01092380: 0x1092380: beq   v0, zero, 0x1092478 sll   zero, zero, 0
+// 0x010929a0: 0x10929a0: sll   zero, zero, 0
+// 0x010929a4: 0x10929a4: beq   v0, zero, 0x1092a9c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1092478
+	brfalse L_1092a9c
 // --- basic block ---
-// 0x01092388: 0x1092388: jal   0x10990ac addiu s2, s2, 1
+// 0x010929ac: 0x10929ac: jal   0x10996f4 addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092390: 0x1092390: j	 0x1092484 sll   zero, zero, 0
-	br L_1092484
+// 0x010929b4: 0x10929b4: j	 0x1092aa8 sll   zero, zero, 0
+	br L_1092aa8
 // --- basic block ---
-L_1092398:
-// 0x01092398: 0x1092398: beq   s1, zero, 0x1092474 addu  a0, s1, zero
+L_10929bc:
+// 0x010929bc: 0x10929bc: beq   s1, zero, 0x1092a98 addu  a0, s1, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
-	brfalse L_1092474
+	brfalse L_1092a98
 // --- basic block ---
-// 0x010923a0: 0x10923a0: jal   0x109b304 addu  a1, s4, zero
+// 0x010929c4: 0x10929c4: jal   0x109b94c addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -1290,49 +1290,49 @@ L_1092398:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010923a8: 0x10923a8: beq   v0, zero, 0x1092474 sll   zero, zero, 0
+// 0x010929cc: 0x10929cc: beq   v0, zero, 0x1092a98 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1092474
+	brfalse L_1092a98
 // --- basic block ---
-// 0x010923b0: 0x10923b0: jal   0x1099098 addu  a0, v0, zero
+// 0x010929d4: 0x10929d4: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010923b8: 0x10923b8: j	 0x1092478 addu  a0, s8, zero
+// 0x010929dc: 0x10929dc: j	 0x1092a9c addu  a0, s8, zero
 	ldloc 8
 	stloc.1
-	br L_1092478
+	br L_1092a9c
 // --- basic block ---
-L_10923c0:
-// 0x010923c0: 0x10923c0: beq   v0, zero, 0x1092480 addu  a0, s6, zero
+L_10929e4:
+// 0x010929e4: 0x10929e4: beq   v0, zero, 0x1092aa4 addu  a0, s6, zero
 	ldloc 5
 	ldloc 15
 	stloc.1
-	brfalse L_1092480
+	brfalse L_1092aa4
 // --- basic block ---
-// 0x010923c8: 0x10923c8: addu  a1, s6, zero
+// 0x010929ec: 0x10929ec: addu  a1, s6, zero
 	ldloc 15
 	stloc.2
-// 0x010923cc: 0x10923cc: addiu s8, zero, 17
+// 0x010929f0: 0x10929f0: addiu s8, zero, 17
 	ldc.i4.s 17
 	stloc 8
-// 0x010923d0: 0x10923d0: addiu a2, sp, 24
+// 0x010929f4: 0x10929f4: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010923d4: 0x10923d4: addiu a3, zero, 1
+// 0x010929f8: 0x10929f8: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010923d8: 0x10923d8: sw    s8, 16(sp)
+// 0x010929fc: 0x10929fc: sw    s8, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1341,7 +1341,7 @@ L_10923c0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010923dc: 0x10923dc: jal   0x1090ecc sw    zero, 20(sp)
+// 0x01092a00: 0x1092a00: jal   0x10914f0 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1355,44 +1355,44 @@ L_10923c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010923e4: 0x10923e4: addu  a1, v0, zero
+// 0x01092a08: 0x1092a08: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010923e8: 0x10923e8: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01092a0c: 0x1092a0c: jal   0x109950c addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010923f0: 0x10923f0: beq   s1, zero, 0x1092480 lui   a1, 0x20000
+// 0x01092a14: 0x1092a14: beq   s1, zero, 0x1092aa4 lui   a1, 0x20000
 	ldloc 10
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1092480
+	brfalse L_1092aa4
 // --- basic block ---
-// 0x010923f8: 0x10923f8: addiu s5, sp, 40
+// 0x01092a1c: 0x1092a1c: addiu s5, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 12
-// 0x010923fc: 0x10923fc: addu  a0, s5, zero
+// 0x01092a20: 0x1092a20: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01092400: 0x1092400: addiu a1, a1, 29568
+// 0x01092a24: 0x1092a24: addiu a1, a1, 30032
 	ldloc.2
-	ldc.i4 29568
+	ldc.i4 30032
 	add
 	stloc.2
-// 0x01092404: 0x1092404: jal   0x1001800 addiu a2, zero, 16
+// 0x01092a28: 0x1092a28: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -1404,15 +1404,15 @@ L_10923c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109240c: 0x109240c: lui   v0, 0x20000
+// 0x01092a30: 0x1092a30: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01092410: 0x1092410: addiu v0, v0, -3604
+// 0x01092a34: 0x1092a34: addiu v0, v0, -3140
 	ldloc 5
-	ldc.i4 -3604
+	ldc.i4 -3140
 	add
 	stloc 5
-// 0x01092414: 0x1092414: sw    v0, 32(sp)
+// 0x01092a38: 0x1092a38: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1421,15 +1421,15 @@ L_10923c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092418: 0x1092418: lui   v0, 0x20000
+// 0x01092a3c: 0x1092a3c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0109241c: 0x109241c: addiu v0, v0, -3592
+// 0x01092a40: 0x1092a40: addiu v0, v0, -3128
 	ldloc 5
-	ldc.i4 -3592
+	ldc.i4 -3128
 	add
 	stloc 5
-// 0x01092420: 0x1092420: sw    v0, 36(sp)
+// 0x01092a44: 0x1092a44: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1438,29 +1438,29 @@ L_10923c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092424: 0x1092424: lui   v0, 0x1090000
+// 0x01092a48: 0x1092a48: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01092428: 0x1092428: addiu a2, sp, 32
+// 0x01092a4c: 0x1092a4c: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0109242c: 0x109242c: addiu a3, zero, 2
+// 0x01092a50: 0x1092a50: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x01092430: 0x1092430: addu  a0, s4, zero
+// 0x01092a54: 0x1092a54: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x01092434: 0x1092434: addu  a1, s4, zero
+// 0x01092a58: 0x1092a58: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x01092438: 0x1092438: addiu v0, v0, 8488
+// 0x01092a5c: 0x1092a5c: addiu v0, v0, 10060
 	ldloc 5
-	ldc.i4 8488
+	ldc.i4 10060
 	add
 	stloc 5
-// 0x0109243c: 0x109243c: sw    s8, 16(sp)
+// 0x01092a60: 0x1092a60: sw    s8, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1469,7 +1469,7 @@ L_10923c0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01092440: 0x1092440: jal   0x1090ecc sw    v0, 20(sp)
+// 0x01092a64: 0x1092a64: jal   0x10914f0 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1483,18 +1483,18 @@ L_10923c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092448: 0x1092448: addu  s8, v0, zero
+// 0x01092a6c: 0x1092a6c: addu  s8, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109244c: 0x109244c: addu  a0, v0, zero
+// 0x01092a70: 0x1092a70: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092450: 0x1092450: jal   0x10991ac addu  a1, s5, zero
+// 0x01092a74: 0x1092a74: jal   0x10997f4 addu  a1, s5, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -1502,25 +1502,25 @@ L_10923c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092458: 0x1092458: addu  a0, s1, zero
+// 0x01092a7c: 0x1092a7c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0109245c: 0x109245c: jal   0x1098ec4 addu  a1, s8, zero
+// 0x01092a80: 0x1092a80: jal   0x109950c addu  a1, s8, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092464: 0x1092464: lw    v0, 80(s0)
+// 0x01092a88: 0x1092a88: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1529,29 +1529,29 @@ L_10923c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092468: 0x1092468: sll   zero, zero, 0
-// 0x0109246c: 0x109246c: bne   v0, zero, 0x1092480 sll   zero, zero, 0
+// 0x01092a8c: 0x1092a8c: sll   zero, zero, 0
+// 0x01092a90: 0x1092a90: bne   v0, zero, 0x1092aa4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1092480
+	brtrue L_1092aa4
 // --- basic block ---
-L_1092474:
-// 0x01092474: 0x1092474: addu  a0, s8, zero
+L_1092a98:
+// 0x01092a98: 0x1092a98: addu  a0, s8, zero
 	ldloc 8
 	stloc.1
-L_1092478:
-// 0x01092478: 0x1092478: jal   0x1099098 sll   zero, zero, 0
+L_1092a9c:
+// 0x01092a9c: 0x1092a9c: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1092480:
-// 0x01092480: 0x1092480: addiu s2, s2, 1
+L_1092aa4:
+// 0x01092aa4: 0x1092aa4: addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1092484:
-// 0x01092484: 0x1092484: lw    v0, 4(s0)
+L_1092aa8:
+// 0x01092aa8: 0x1092aa8: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1560,23 +1560,23 @@ L_1092484:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092488: 0x1092488: sll   zero, zero, 0
-// 0x0109248c: 0x109248c: slt   v0, s2, v0
+// 0x01092aac: 0x1092aac: sll   zero, zero, 0
+// 0x01092ab0: 0x1092ab0: slt   v0, s2, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x01092490: 0x1092490: bne   v0, zero, 0x10921bc sll   v0, s2, 2
+// 0x01092ab4: 0x1092ab4: bne   v0, zero, 0x10927e0 sll   v0, s2, 2
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 5
-	brtrue L_10921bc
+	brtrue L_10927e0
 // --- basic block ---
-L_1092498:
-// 0x01092498: 0x1092498: lw    ra, 92(sp)
-// 0x0109249c: 0x109249c: lw    s8, 88(sp)
+L_1092abc:
+// 0x01092abc: 0x1092abc: lw    ra, 92(sp)
+// 0x01092ac0: 0x1092ac0: lw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1585,7 +1585,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010924a0: 0x10924a0: lw    s7, 84(sp)
+// 0x01092ac4: 0x1092ac4: lw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1594,7 +1594,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010924a4: 0x10924a4: lw    s6, 80(sp)
+// 0x01092ac8: 0x1092ac8: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1603,7 +1603,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010924a8: 0x10924a8: lw    s5, 76(sp)
+// 0x01092acc: 0x1092acc: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1612,7 +1612,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010924ac: 0x10924ac: lw    s4, 72(sp)
+// 0x01092ad0: 0x1092ad0: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1621,7 +1621,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010924b0: 0x10924b0: lw    s3, 68(sp)
+// 0x01092ad4: 0x1092ad4: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1630,7 +1630,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010924b4: 0x10924b4: lw    s2, 64(sp)
+// 0x01092ad8: 0x1092ad8: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1639,7 +1639,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010924b8: 0x10924b8: lw    s1, 60(sp)
+// 0x01092adc: 0x1092adc: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1648,7 +1648,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010924bc: 0x10924bc: lw    s0, 56(sp)
+// 0x01092ae0: 0x1092ae0: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1657,7 +1657,7 @@ L_1092498:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010924c0: 0x10924c0: jr    ra addiu sp, sp, 96
+// 0x01092ae4: 0x1092ae4: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -1669,7 +1669,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_list_populate_10924c8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_populate_1092aec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 s1,int32 ra)
@@ -1710,12 +1710,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010924c8: 0x10924c8: addiu sp, sp, -32
+// 0x01092aec: 0x1092aec: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010924cc: 0x10924cc: sw    s0, 20(sp)
+// 0x01092af0: 0x1092af0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1724,7 +1724,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010924d0: 0x10924d0: lw    s0, 164(a0)
+// 0x01092af4: 0x1092af4: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1733,7 +1733,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010924d4: 0x10924d4: sw    s1, 24(sp)
+// 0x01092af8: 0x1092af8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1742,7 +1742,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010924d8: 0x10924d8: sw    a2, 32(s0)
+// 0x01092afc: 0x1092afc: sw    a2, 32(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1751,7 +1751,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010924dc: 0x10924dc: lw    v0, 48(sp)
+// 0x01092b00: 0x1092b00: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1760,7 +1760,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010924e0: 0x10924e0: sw    a1, 28(s0)
+// 0x01092b04: 0x1092b04: sw    a1, 28(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1769,7 +1769,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010924e4: 0x10924e4: sw    v0, 40(s0)
+// 0x01092b08: 0x1092b08: sw    v0, 40(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1778,7 +1778,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010924e8: 0x10924e8: lw    v0, 52(sp)
+// 0x01092b0c: 0x1092b0c: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1787,7 +1787,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010924ec: 0x10924ec: sw    a3, 36(s0)
+// 0x01092b10: 0x1092b10: sw    a3, 36(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1796,7 +1796,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010924f0: 0x10924f0: sw    v0, 44(s0)
+// 0x01092b14: 0x1092b14: sw    v0, 44(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1805,7 +1805,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010924f4: 0x10924f4: lw    v0, 56(sp)
+// 0x01092b18: 0x1092b18: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1814,10 +1814,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010924f8: 0x10924f8: addu  s1, a0, zero
+// 0x01092b1c: 0x1092b1c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010924fc: 0x10924fc: sw    v0, 16(s0)
+// 0x01092b20: 0x1092b20: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1826,7 +1826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092500: 0x1092500: lw    v0, 60(sp)
+// 0x01092b24: 0x1092b24: lw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1835,8 +1835,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092504: 0x1092504: sll   zero, zero, 0
-// 0x01092508: 0x1092508: sw    v0, 20(s0)
+// 0x01092b28: 0x1092b28: sll   zero, zero, 0
+// 0x01092b2c: 0x1092b2c: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1845,7 +1845,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109250c: 0x109250c: lw    v0, 64(sp)
+// 0x01092b30: 0x1092b30: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1854,7 +1854,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092510: 0x1092510: sw    zero, 48(s0)
+// 0x01092b34: 0x1092b34: sw    zero, 48(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1863,7 +1863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01092514: 0x1092514: sw    v0, 80(s0)
+// 0x01092b38: 0x1092b38: sw    v0, 80(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1872,8 +1872,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092518: 0x1092518: sw    ra, 28(sp)
-// 0x0109251c: 0x109251c: jal   0x1092160 addu  a0, s0, zero
+// 0x01092b3c: 0x1092b3c: sw    ra, 28(sp)
+// 0x01092b40: 0x1092b40: jal   0x1092784 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -1881,20 +1881,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::setup_list_rows_1092160(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::setup_list_rows_1092784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01092524: 0x1092524: lui   a1, 0x20000
+// 0x01092b48: 0x1092b48: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01092528: 0x1092528: addu  a0, s1, zero
+// 0x01092b4c: 0x1092b4c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109252c: 0x109252c: jal   0x109b304 addiu a1, a1, -3580
+// 0x01092b50: 0x1092b50: jal   0x109b94c addiu a1, a1, -3116
 	ldloc.2
-	ldc.i4 -3580
+	ldc.i4 -3116
 	add
 	stloc.2
 	ldloc.0
@@ -1902,20 +1902,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01092534: 0x1092534: addu  a0, v0, zero
+// 0x01092b58: 0x1092b58: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x01092538: 0x1092538: addiu a1, s0, 68
+// 0x01092b5c: 0x1092b5c: addiu a1, s0, 68
 	ldloc 6
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x0109253c: 0x109253c: jal   0x10917cc addu  a2, s0, zero
+// 0x01092b60: 0x1092b60: jal   0x1091df0 addu  a2, s0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -1923,12 +1923,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::update_list_rows_10917cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::update_list_rows_1091df0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01092544: 0x1092544: jal   0x1092160 addu  a0, s0, zero
+// 0x01092b68: 0x1092b68: jal   0x1092784 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -1936,13 +1936,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::setup_list_rows_1092160(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::setup_list_rows_1092784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109254c: 0x109254c: lw    ra, 28(sp)
-// 0x01092550: 0x1092550: lw    s1, 24(sp)
+// 0x01092b70: 0x1092b70: lw    ra, 28(sp)
+// 0x01092b74: 0x1092b74: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1951,7 +1951,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01092554: 0x1092554: lw    s0, 20(sp)
+// 0x01092b78: 0x1092b78: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1960,7 +1960,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01092558: 0x1092558: jr    ra addiu sp, sp, 32
+// 0x01092b7c: 0x1092b7c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1972,7 +1972,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_list_scroll_list_end_1092560(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_scroll_list_end_1092b84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 hi,int32 lo)
@@ -2013,7 +2013,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092560: 0x1092560: lw    v0, 28(a1)
+// 0x01092b84: 0x1092b84: lw    v0, 28(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2022,7 +2022,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092564: 0x1092564: lw    v1, 4(a1)
+// 0x01092b88: 0x1092b88: lw    v1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2031,12 +2031,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092568: 0x1092568: addiu sp, sp, -24
+// 0x01092b8c: 0x1092b8c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109256c: 0x109256c: div   v0, v1
+// 0x01092b90: 0x1092b90: div   v0, v1
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -2045,34 +2045,34 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	rem
 	stloc 9
-// 0x01092570: 0x1092570: addu  a0, a1, zero
+// 0x01092b94: 0x1092b94: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01092574: 0x1092574: mfhi  hi
+// 0x01092b98: 0x1092b98: mfhi  hi
 	ldloc 9
 	stloc.2
-// 0x01092578: 0x1092578: beq   a1, zero, 0x1092588 sw    ra, 20(sp)
+// 0x01092b9c: 0x1092b9c: beq   a1, zero, 0x1092bac sw    ra, 20(sp)
 	ldloc.2
-	brfalse L_1092588
+	brfalse L_1092bac
 // --- basic block ---
-// 0x01092580: 0x1092580: j	 0x1092590 subu  v0, v0, a1
+// 0x01092ba4: 0x1092ba4: j	 0x1092bb4 subu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	sub
 	stloc 5
-	br L_1092590
+	br L_1092bb4
 // --- basic block ---
-L_1092588:
-// 0x01092588: 0x1092588: beq   v0, zero, 0x1092598 subu  v0, v0, v1
+L_1092bac:
+// 0x01092bac: 0x1092bac: beq   v0, zero, 0x1092bbc subu  v0, v0, v1
 	ldloc 5
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 5
-	brfalse L_1092598
+	brfalse L_1092bbc
 // --- basic block ---
-L_1092590:
-// 0x01092590: 0x1092590: j	 0x109259c sw    v0, 48(a0)
+L_1092bb4:
+// 0x01092bb4: 0x1092bb4: j	 0x1092bc0 sw    v0, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2081,10 +2081,10 @@ L_1092590:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109259c
+	br L_1092bc0
 // --- basic block ---
-L_1092598:
-// 0x01092598: 0x1092598: sw    zero, 48(a0)
+L_1092bbc:
+// 0x01092bbc: 0x1092bbc: sw    zero, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2093,8 +2093,8 @@ L_1092598:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_109259c:
-// 0x0109259c: 0x109259c: lw    v0, 88(a0)
+L_1092bc0:
+// 0x01092bc0: 0x1092bc0: lw    v0, 88(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2103,43 +2103,43 @@ L_109259c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010925a0: 0x10925a0: sll   zero, zero, 0
-// 0x010925a4: 0x10925a4: beq   v0, zero, 0x10925bc sll   zero, zero, 0
+// 0x01092bc4: 0x1092bc4: sll   zero, zero, 0
+// 0x01092bc8: 0x1092bc8: beq   v0, zero, 0x1092be0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10925bc
+	brfalse L_1092be0
 // --- basic block ---
-// 0x010925ac: 0x10925ac: jal   0x1091d70 sll   zero, zero, 0
+// 0x01092bd0: 0x1092bd0: jal   0x1092394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::setup_list_widgets_rows_1091d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::setup_list_widgets_rows_1092394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010925b4: 0x10925b4: j	 0x10925c4 sll   zero, zero, 0
-	br L_10925c4
+// 0x01092bd8: 0x1092bd8: j	 0x1092be8 sll   zero, zero, 0
+	br L_1092be8
 // --- basic block ---
-L_10925bc:
-// 0x010925bc: 0x10925bc: jal   0x1092160 sll   zero, zero, 0
+L_1092be0:
+// 0x01092be0: 0x1092be0: jal   0x1092784 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::setup_list_rows_1092160(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::setup_list_rows_1092784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10925c4:
-// 0x010925c4: 0x10925c4: lw    ra, 20(sp)
-// 0x010925c8: 0x10925c8: addiu v0, zero, 1
+L_1092be8:
+// 0x01092be8: 0x1092be8: lw    ra, 20(sp)
+// 0x01092bec: 0x1092bec: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010925cc: 0x10925cc: jr    ra addiu sp, sp, 24
+// 0x01092bf0: 0x1092bf0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2151,7 +2151,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_list_scroll_list_begin_10925d4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_scroll_list_begin_1092bf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -2186,7 +2186,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010925d4: 0x10925d4: lw    v0, 88(a1)
+// 0x01092bf8: 0x1092bf8: lw    v0, 88(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2195,16 +2195,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010925d8: 0x10925d8: addiu sp, sp, -24
+// 0x01092bfc: 0x1092bfc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010925dc: 0x10925dc: sw    ra, 20(sp)
-// 0x010925e0: 0x10925e0: addu  a0, a1, zero
+// 0x01092c00: 0x1092c00: sw    ra, 20(sp)
+// 0x01092c04: 0x1092c04: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010925e4: 0x10925e4: beq   v0, zero, 0x10925fc sw    zero, 48(a1)
+// 0x01092c08: 0x1092c08: beq   v0, zero, 0x1092c20 sw    zero, 48(a1)
 	ldloc 5
 	ldloc 6
 	ldloc.2
@@ -2214,40 +2214,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10925fc
+	brfalse L_1092c20
 // --- basic block ---
-// 0x010925ec: 0x10925ec: jal   0x1091d70 sll   zero, zero, 0
+// 0x01092c10: 0x1092c10: jal   0x1092394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::setup_list_widgets_rows_1091d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::setup_list_widgets_rows_1092394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010925f4: 0x10925f4: j	 0x1092604 sll   zero, zero, 0
-	br L_1092604
+// 0x01092c18: 0x1092c18: j	 0x1092c28 sll   zero, zero, 0
+	br L_1092c28
 // --- basic block ---
-L_10925fc:
-// 0x010925fc: 0x10925fc: jal   0x1092160 sll   zero, zero, 0
+L_1092c20:
+// 0x01092c20: 0x1092c20: jal   0x1092784 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::setup_list_rows_1092160(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::setup_list_rows_1092784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1092604:
-// 0x01092604: 0x1092604: lw    ra, 20(sp)
-// 0x01092608: 0x1092608: addiu v0, zero, 1
+L_1092c28:
+// 0x01092c28: 0x1092c28: lw    ra, 20(sp)
+// 0x01092c2c: 0x1092c2c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109260c: 0x109260c: jr    ra addiu sp, sp, 24
+// 0x01092c30: 0x1092c30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2259,7 +2259,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_list_new_1092750(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -2306,12 +2306,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092750: 0x1092750: addiu sp, sp, -56
+// 0x01092d74: 0x1092d74: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01092754: 0x1092754: sw    s0, 36(sp)
+// 0x01092d78: 0x1092d78: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2320,14 +2320,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092758: 0x1092758: addu  s0, a0, zero
+// 0x01092d7c: 0x1092d7c: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0109275c: 0x109275c: addiu a0, zero, 92
+// 0x01092d80: 0x1092d80: addiu a0, zero, 92
 	ldc.i4.s 92
 	stloc.1
-// 0x01092760: 0x1092760: sw    ra, 52(sp)
-// 0x01092764: 0x1092764: sw    s3, 48(sp)
+// 0x01092d84: 0x1092d84: sw    ra, 52(sp)
+// 0x01092d88: 0x1092d88: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2336,7 +2336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01092768: 0x1092768: sw    s2, 44(sp)
+// 0x01092d8c: 0x1092d8c: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2345,13 +2345,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109276c: 0x109276c: addu  s3, a1, zero
+// 0x01092d90: 0x1092d90: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01092770: 0x1092770: addu  s2, a3, zero
+// 0x01092d94: 0x1092d94: addu  s2, a3, zero
 	ldloc 4
 	stloc 10
-// 0x01092774: 0x1092774: jal   0x1000910 sw    s1, 40(sp)
+// 0x01092d98: 0x1092d98: jal   0x1000910 sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2370,16 +2370,16 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109277c: 0x109277c: addu  a0, v0, zero
+// 0x01092da0: 0x1092da0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092780: 0x1092780: addu  a1, zero, zero
+// 0x01092da4: 0x1092da4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01092784: 0x1092784: addiu a2, zero, 92
+// 0x01092da8: 0x1092da8: addiu a2, zero, 92
 	ldc.i4.s 92
 	stloc.3
-// 0x01092788: 0x1092788: jal   0x100177c addu  s1, v0, zero
+// 0x01092dac: 0x1092dac: jal   0x100177c addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -2391,7 +2391,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01092790: 0x1092790: lw    v0, 72(sp)
+// 0x01092db4: 0x1092db4: lw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2400,19 +2400,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092794: 0x1092794: addu  a2, s3, zero
+// 0x01092db8: 0x1092db8: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01092798: 0x1092798: addu  a0, s0, zero
+// 0x01092dbc: 0x1092dbc: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0109279c: 0x109279c: addiu a3, zero, -1
+// 0x01092dc0: 0x1092dc0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010927a0: 0x10927a0: addu  a1, zero, zero
+// 0x01092dc4: 0x1092dc4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010927a4: 0x10927a4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01092dc8: 0x1092dc8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2426,34 +2426,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010927ac: 0x10927ac: lui   a1, 0x0
+// 0x01092dd0: 0x1092dd0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010927b0: 0x10927b0: addiu a1, a1, 23008
+// 0x01092dd4: 0x1092dd4: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010927b4: 0x10927b4: addu  s0, v0, zero
+// 0x01092dd8: 0x1092dd8: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010927b8: 0x10927b8: addu  a0, v0, zero
+// 0x01092ddc: 0x1092ddc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010927bc: 0x10927bc: jal   0x1098fe0 addu  a2, a1, zero
+// 0x01092de0: 0x1092de0: jal   0x1099628 addu  a2, a1, zero
 	ldloc.2
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010927c4: 0x10927c4: lw    v0, 184(s0)
+// 0x01092de8: 0x1092de8: lw    v0, 184(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2462,10 +2462,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010927c8: 0x10927c8: lui   a0, 0x20000
+// 0x01092dec: 0x1092dec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010927cc: 0x10927cc: sw    v0, 76(s1)
+// 0x01092df0: 0x1092df0: sw    v0, 76(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2474,15 +2474,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010927d0: 0x10927d0: lui   v0, 0x1090000
+// 0x01092df4: 0x1092df4: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x010927d4: 0x10927d4: addiu v0, v0, 10420
+// 0x01092df8: 0x1092df8: addiu v0, v0, 11992
 	ldloc 5
-	ldc.i4 10420
+	ldc.i4 11992
 	add
 	stloc 5
-// 0x010927d8: 0x10927d8: sw    v0, 184(s0)
+// 0x01092dfc: 0x1092dfc: sw    v0, 184(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2491,7 +2491,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010927dc: 0x10927dc: lw    v0, 76(sp)
+// 0x01092e00: 0x1092e00: lw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2500,7 +2500,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010927e0: 0x10927e0: sw    s1, 164(s0)
+// 0x01092e04: 0x1092e04: sw    s1, 164(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2509,21 +2509,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010927e4: 0x10927e4: addiu a3, zero, -1
+// 0x01092e08: 0x1092e08: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010927e8: 0x10927e8: addiu a0, a0, -3580
+// 0x01092e0c: 0x1092e0c: addiu a0, a0, -3116
 	ldloc.1
-	ldc.i4 -3580
+	ldc.i4 -3116
 	add
 	stloc.1
-// 0x010927ec: 0x10927ec: addu  a1, zero, zero
+// 0x01092e10: 0x1092e10: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010927f0: 0x10927f0: addiu a2, zero, -2
+// 0x01092e14: 0x1092e14: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010927f4: 0x10927f4: sw    s2, 8(s1)
+// 0x01092e18: 0x1092e18: sw    s2, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2532,7 +2532,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010927f8: 0x10927f8: sw    v0, 24(s1)
+// 0x01092e1c: 0x1092e1c: sw    v0, 24(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2541,7 +2541,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010927fc: 0x10927fc: jal   0x1093a24 sw    zero, 16(sp)
+// 0x01092e20: 0x1092e20: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2555,21 +2555,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01092804: 0x1092804: addu  a0, v0, zero
+// 0x01092e28: 0x1092e28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092808: 0x1092808: addu  a2, zero, zero
+// 0x01092e2c: 0x1092e2c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109280c: 0x109280c: addu  a1, zero, zero
+// 0x01092e30: 0x1092e30: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01092810: 0x1092810: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01092e34: 0x1092e34: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2581,9 +2581,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01092818: 0x1092818: lw    v0, 24(sp)
+// 0x01092e3c: 0x1092e3c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2592,28 +2592,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109281c: 0x109281c: addu  a0, s0, zero
+// 0x01092e40: 0x1092e40: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01092820: 0x1092820: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01092e44: 0x1092e44: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01092828: 0x1092828: lui   v0, 0x1090000
+// 0x01092e4c: 0x1092e4c: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x0109282c: 0x109282c: addiu v0, v0, 5804
+// 0x01092e50: 0x1092e50: addiu v0, v0, 7376
 	ldloc 5
-	ldc.i4 5804
+	ldc.i4 7376
 	add
 	stloc 5
-// 0x01092830: 0x1092830: sw    v0, 172(s0)
+// 0x01092e54: 0x1092e54: sw    v0, 172(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2622,16 +2622,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092834: 0x1092834: lw    ra, 52(sp)
-// 0x01092838: 0x1092838: lui   v0, 0x1090000
+// 0x01092e58: 0x1092e58: lw    ra, 52(sp)
+// 0x01092e5c: 0x1092e5c: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x0109283c: 0x109283c: addiu v0, v0, 10336
+// 0x01092e60: 0x1092e60: addiu v0, v0, 11908
 	ldloc 5
-	ldc.i4 10336
+	ldc.i4 11908
 	add
 	stloc 5
-// 0x01092840: 0x1092840: sw    v0, 220(s0)
+// 0x01092e64: 0x1092e64: sw    v0, 220(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2640,7 +2640,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092844: 0x1092844: lw    s3, 48(sp)
+// 0x01092e68: 0x1092e68: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2649,10 +2649,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01092848: 0x1092848: addu  v0, s0, zero
+// 0x01092e6c: 0x1092e6c: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0109284c: 0x109284c: lw    s2, 44(sp)
+// 0x01092e70: 0x1092e70: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2661,7 +2661,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01092850: 0x1092850: lw    s1, 40(sp)
+// 0x01092e74: 0x1092e74: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2670,7 +2670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01092854: 0x1092854: lw    s0, 36(sp)
+// 0x01092e78: 0x1092e78: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2679,7 +2679,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092858: 0x1092858: jr    ra addiu sp, sp, 56
+// 0x01092e7c: 0x1092e7c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2691,7 +2691,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 release_1092860(int32,int32,int32,int32,int32)
+.method public static int32 release_1092e84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -2732,12 +2732,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092860: 0x1092860: addiu sp, sp, -32
+// 0x01092e84: 0x1092e84: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01092864: 0x1092864: sw    s0, 20(sp)
+// 0x01092e88: 0x1092e88: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2746,8 +2746,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092868: 0x1092868: sw    ra, 28(sp)
-// 0x0109286c: 0x109286c: sw    s1, 24(sp)
+// 0x01092e8c: 0x1092e8c: sw    ra, 28(sp)
+// 0x01092e90: 0x1092e90: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2756,13 +2756,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01092870: 0x1092870: beq   a0, zero, 0x10928a0 addu  s0, a0, zero
+// 0x01092e94: 0x1092e94: beq   a0, zero, 0x1092ec4 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_10928a0
+	brfalse L_1092ec4
 // --- basic block ---
-// 0x01092878: 0x1092878: lw    s1, 164(a0)
+// 0x01092e9c: 0x1092e9c: lw    s1, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2771,12 +2771,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109287c: 0x109287c: sll   zero, zero, 0
-// 0x01092880: 0x1092880: beq   s1, zero, 0x10928a0 sll   zero, zero, 0
+// 0x01092ea0: 0x1092ea0: sll   zero, zero, 0
+// 0x01092ea4: 0x1092ea4: beq   s1, zero, 0x1092ec4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10928a0
+	brfalse L_1092ec4
 // --- basic block ---
-// 0x01092888: 0x1092888: lw    a0, 12(s1)
+// 0x01092eac: 0x1092eac: lw    a0, 12(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2785,7 +2785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109288c: 0x109288c: jal   0x1000930 sll   zero, zero, 0
+// 0x01092eb0: 0x1092eb0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2796,7 +2796,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01092894: 0x1092894: jal   0x1000930 addu  a0, s1, zero
+// 0x01092eb8: 0x1092eb8: jal   0x1000930 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2809,7 +2809,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0109289c: 0x109289c: sw    zero, 164(s0)
+// 0x01092ec0: 0x1092ec0: sw    zero, 164(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2818,9 +2818,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10928a0:
-// 0x010928a0: 0x10928a0: lw    ra, 28(sp)
-// 0x010928a4: 0x10928a4: lw    s1, 24(sp)
+L_1092ec4:
+// 0x01092ec4: 0x1092ec4: lw    ra, 28(sp)
+// 0x01092ec8: 0x1092ec8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2829,7 +2829,7 @@ L_10928a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010928a8: 0x10928a8: lw    s0, 20(sp)
+// 0x01092ecc: 0x1092ecc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2838,7 +2838,7 @@ L_10928a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010928ac: 0x10928ac: jr    ra addiu sp, sp, 32
+// 0x01092ed0: 0x1092ed0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2850,7 +2850,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 ssd_list_draw_10928b4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_draw_1092ed8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s3,int32 s0,int32 s1,int32 ra)
@@ -2897,17 +2897,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010928b4: 0x10928b4: addiu sp, sp, -40
+// 0x01092ed8: 0x1092ed8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010928b8: 0x10928b8: andi  v0, a2, 2
+// 0x01092edc: 0x1092edc: andi  v0, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc 6
-// 0x010928bc: 0x10928bc: sw    s3, 32(sp)
+// 0x01092ee0: 0x1092ee0: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2916,7 +2916,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010928c0: 0x10928c0: sw    s2, 28(sp)
+// 0x01092ee4: 0x1092ee4: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2925,7 +2925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010928c4: 0x10928c4: sw    s1, 24(sp)
+// 0x01092ee8: 0x1092ee8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2934,7 +2934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010928c8: 0x10928c8: sw    s0, 20(sp)
+// 0x01092eec: 0x1092eec: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2943,14 +2943,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010928cc: 0x10928cc: sw    ra, 36(sp)
-// 0x010928d0: 0x10928d0: addu  s0, a2, zero
+// 0x01092ef0: 0x1092ef0: sw    ra, 36(sp)
+// 0x01092ef4: 0x1092ef4: addu  s0, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010928d4: 0x10928d4: addu  s1, a0, zero
+// 0x01092ef8: 0x1092ef8: addu  s1, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010928d8: 0x10928d8: lw    s2, 164(a0)
+// 0x01092efc: 0x1092efc: lw    s2, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2959,13 +2959,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010928dc: 0x10928dc: bne   v0, zero, 0x1092960 addu  s3, a1, zero
+// 0x01092f00: 0x1092f00: bne   v0, zero, 0x1092f84 addu  s3, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 9
-	brtrue L_1092960
+	brtrue L_1092f84
 // --- basic block ---
-// 0x010928e4: 0x10928e4: lw    a2, 28(s2)
+// 0x01092f08: 0x1092f08: lw    a2, 28(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2974,7 +2974,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010928e8: 0x10928e8: lw    a1, 12(a1)
+// 0x01092f0c: 0x1092f0c: lw    a1, 12(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2983,7 +2983,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010928ec: 0x10928ec: lw    v1, 4(s3)
+// 0x01092f10: 0x1092f10: lw    v1, 4(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2992,7 +2992,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010928f0: 0x10928f0: lw    a0, 8(s3)
+// 0x01092f14: 0x1092f14: lw    a0, 8(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3001,18 +3001,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010928f4: 0x10928f4: lw    v0, 0(s3)
+// 0x01092f18: 0x1092f18: lw    v0, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010928f8: 0x10928f8: beq   a2, zero, 0x10929c4 sll   zero, zero, 0
+// 0x01092f1c: 0x1092f1c: beq   a2, zero, 0x1092fe8 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_10929c4
+	brfalse L_1092fe8
 // --- basic block ---
-// 0x01092900: 0x1092900: lw    a3, 72(s2)
+// 0x01092f24: 0x1092f24: lw    a3, 72(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3021,15 +3021,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01092904: 0x1092904: addiu a2, zero, -1
+// 0x01092f28: 0x1092f28: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01092908: 0x1092908: beq   a3, a2, 0x1092920 sll   zero, zero, 0
+// 0x01092f2c: 0x1092f2c: beq   a3, a2, 0x1092f44 sll   zero, zero, 0
 	ldloc 4
 	ldloc.3
-	beq  L_1092920
+	beq  L_1092f44
 // --- basic block ---
-// 0x01092910: 0x1092910: lw    a3, 68(s2)
+// 0x01092f34: 0x1092f34: lw    a3, 68(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3038,24 +3038,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01092914: 0x1092914: sll   zero, zero, 0
-// 0x01092918: 0x1092918: bne   a3, a2, 0x1092960 sll   zero, zero, 0
+// 0x01092f38: 0x1092f38: sll   zero, zero, 0
+// 0x01092f3c: 0x1092f3c: bne   a3, a2, 0x1092f84 sll   zero, zero, 0
 	ldloc 4
 	ldloc.3
-	bne.un L_1092960
+	bne.un L_1092f84
 // --- basic block ---
-L_1092920:
-// 0x01092920: 0x1092920: addiu a1, a1, 1
+L_1092f44:
+// 0x01092f44: 0x1092f44: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01092924: 0x1092924: addiu a0, a0, 1
+// 0x01092f48: 0x1092f48: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01092928: 0x1092928: lw    a2, 88(s2)
+// 0x01092f4c: 0x1092f4c: lw    a2, 88(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3064,17 +3064,17 @@ L_1092920:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109292c: 0x109292c: subu  v1, a1, v1
+// 0x01092f50: 0x1092f50: subu  v1, a1, v1
 	ldloc.2
 	ldloc 8
 	sub
 	stloc 8
-// 0x01092930: 0x1092930: subu  v0, a0, v0
+// 0x01092f54: 0x1092f54: subu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc 6
-// 0x01092934: 0x1092934: sw    v1, 72(s2)
+// 0x01092f58: 0x1092f58: sw    v1, 72(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3083,7 +3083,7 @@ L_1092920:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01092938: 0x1092938: beq   a2, zero, 0x1092950 sw    v0, 68(s2)
+// 0x01092f5c: 0x1092f5c: beq   a2, zero, 0x1092f74 sw    v0, 68(s2)
 	ldloc.3
 	ldloc 5
 	ldloc 7
@@ -3093,9 +3093,9 @@ L_1092920:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_1092950
+	brfalse L_1092f74
 // --- basic block ---
-// 0x01092940: 0x1092940: jal   0x1091d70 addu  a0, s2, zero
+// 0x01092f64: 0x1092f64: jal   0x1092394 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3103,16 +3103,16 @@ L_1092920:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::setup_list_widgets_rows_1091d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::setup_list_widgets_rows_1092394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01092948: 0x1092948: j	 0x1092958 sll   zero, zero, 0
-	br L_1092958
+// 0x01092f6c: 0x1092f6c: j	 0x1092f7c sll   zero, zero, 0
+	br L_1092f7c
 // --- basic block ---
-L_1092950:
-// 0x01092950: 0x1092950: jal   0x1092160 addu  a0, s2, zero
+L_1092f74:
+// 0x01092f74: 0x1092f74: jal   0x1092784 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3120,35 +3120,35 @@ L_1092950:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::setup_list_rows_1092160(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::setup_list_rows_1092784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1092958:
-// 0x01092958: 0x1092958: jal   0x10945f0 sll   zero, zero, 0
+L_1092f7c:
+// 0x01092f7c: 0x1092f7c: jal   0x1094c14 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_10945f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_1094c14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1092960:
-// 0x01092960: 0x1092960: jal   0x1094054 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_focus_1094054()
+L_1092f84:
+// 0x01092f84: 0x1092f84: jal   0x1094678 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_focus_1094678()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01092968: 0x1092968: bne   v0, zero, 0x1092988 sll   zero, zero, 0
+// 0x01092f8c: 0x1092f8c: bne   v0, zero, 0x1092fac sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1092988
+	brtrue L_1092fac
 // --- basic block ---
-// 0x01092970: 0x1092970: lw    v0, 28(s2)
+// 0x01092f94: 0x1092f94: lw    v0, 28(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3157,35 +3157,35 @@ L_1092960:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01092974: 0x1092974: sll   zero, zero, 0
-// 0x01092978: 0x1092978: blez  v0, 0x1092988 sll   zero, zero, 0
+// 0x01092f98: 0x1092f98: sll   zero, zero, 0
+// 0x01092f9c: 0x1092f9c: blez  v0, 0x1092fac sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	ble L_1092988
+	ble L_1092fac
 // --- basic block ---
-// 0x01092980: 0x1092980: jal   0x109589c sll   zero, zero, 0
+// 0x01092fa4: 0x1092fa4: jal   0x1095ee4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_current_109589c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_current_1095ee4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1092988:
-// 0x01092988: 0x1092988: jal   0x1094054 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_focus_1094054()
+L_1092fac:
+// 0x01092fac: 0x1092fac: jal   0x1094678 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_focus_1094678()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01092990: 0x1092990: bne   v0, zero, 0x10929b0 sll   zero, zero, 0
+// 0x01092fb4: 0x1092fb4: bne   v0, zero, 0x1092fd4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10929b0
+	brtrue L_1092fd4
 // --- basic block ---
-// 0x01092998: 0x1092998: lw    v0, 28(s2)
+// 0x01092fbc: 0x1092fbc: lw    v0, 28(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3194,25 +3194,25 @@ L_1092988:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109299c: 0x109299c: sll   zero, zero, 0
-// 0x010929a0: 0x10929a0: blez  v0, 0x10929b0 sll   zero, zero, 0
+// 0x01092fc0: 0x1092fc0: sll   zero, zero, 0
+// 0x01092fc4: 0x1092fc4: blez  v0, 0x1092fd4 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	ble L_10929b0
+	ble L_1092fd4
 // --- basic block ---
-// 0x010929a8: 0x10929a8: jal   0x109589c sll   zero, zero, 0
+// 0x01092fcc: 0x1092fcc: jal   0x1095ee4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_current_109589c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_current_1095ee4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10929b0:
-// 0x010929b0: 0x10929b0: lw    v0, 76(s2)
+L_1092fd4:
+// 0x01092fd4: 0x1092fd4: lw    v0, 76(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3221,13 +3221,13 @@ L_10929b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010929b4: 0x10929b4: addu  a0, s1, zero
+// 0x01092fd8: 0x1092fd8: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010929b8: 0x10929b8: addu  a1, s3, zero
+// 0x01092fdc: 0x1092fdc: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010929bc: 0x10929bc: jalr  v0 addu  a2, s0, zero
+// 0x01092fe0: 0x1092fe0: jalr  v0 addu  a2, s0, zero
 	ldloc 6
 	ldloc 10
 	stloc.3
@@ -3241,9 +3241,9 @@ L_10929b0:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10929c4:
-// 0x010929c4: 0x10929c4: lw    ra, 36(sp)
-// 0x010929c8: 0x10929c8: lw    s3, 32(sp)
+L_1092fe8:
+// 0x01092fe8: 0x1092fe8: lw    ra, 36(sp)
+// 0x01092fec: 0x1092fec: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3252,7 +3252,7 @@ L_10929c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010929cc: 0x10929cc: lw    s2, 28(sp)
+// 0x01092ff0: 0x1092ff0: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3261,7 +3261,7 @@ L_10929c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010929d0: 0x10929d0: lw    s1, 24(sp)
+// 0x01092ff4: 0x1092ff4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3270,7 +3270,7 @@ L_10929c4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010929d4: 0x10929d4: lw    s0, 20(sp)
+// 0x01092ff8: 0x1092ff8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3279,7 +3279,7 @@ L_10929c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010929d8: 0x10929d8: jr    ra addiu sp, sp, 40
+// 0x01092ffc: 0x1092ffc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3291,7 +3291,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -3344,12 +3344,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010929e0: 0x10929e0: addiu sp, sp, -72
+// 0x01093004: 0x1093004: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010929e4: 0x10929e4: sw    s0, 44(sp)
+// 0x01093008: 0x1093008: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3358,14 +3358,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010929e8: 0x10929e8: addu  s0, a0, zero
+// 0x0109300c: 0x109300c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010929ec: 0x10929ec: addiu a0, zero, 20
+// 0x01093010: 0x1093010: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x010929f0: 0x10929f0: sw    ra, 68(sp)
-// 0x010929f4: 0x10929f4: sw    s5, 64(sp)
+// 0x01093014: 0x1093014: sw    ra, 68(sp)
+// 0x01093018: 0x1093018: sw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3374,7 +3374,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010929f8: 0x10929f8: sw    s4, 60(sp)
+// 0x0109301c: 0x109301c: sw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3383,13 +3383,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010929fc: 0x10929fc: addu  s5, a1, zero
+// 0x01093020: 0x1093020: addu  s5, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01092a00: 0x1092a00: addu  s4, a2, zero
+// 0x01093024: 0x1093024: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01092a04: 0x1092a04: sw    s3, 56(sp)
+// 0x01093028: 0x1093028: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3398,7 +3398,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01092a08: 0x1092a08: sw    s2, 52(sp)
+// 0x0109302c: 0x109302c: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3407,10 +3407,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01092a0c: 0x1092a0c: addu  s3, a3, zero
+// 0x01093030: 0x1093030: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x01092a10: 0x1092a10: jal   0x1000910 sw    s1, 48(sp)
+// 0x01093034: 0x1093034: jal   0x1000910 sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3429,16 +3429,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092a18: 0x1092a18: addu  a0, v0, zero
+// 0x0109303c: 0x109303c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092a1c: 0x1092a1c: addu  a1, zero, zero
+// 0x01093040: 0x1093040: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01092a20: 0x1092a20: addiu a2, zero, 20
+// 0x01093044: 0x1093044: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x01092a24: 0x1092a24: jal   0x100177c addu  s1, v0, zero
+// 0x01093048: 0x1093048: jal   0x100177c addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -3450,7 +3450,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092a2c: 0x1092a2c: lw    v0, 92(sp)
+// 0x01093050: 0x1093050: lw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3459,24 +3459,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092a30: 0x1092a30: addiu a3, zero, 23
+// 0x01093054: 0x1093054: addiu a3, zero, 23
 	ldc.i4.s 23
 	stloc 4
-// 0x01092a34: 0x1092a34: addu  a0, s0, zero
+// 0x01093058: 0x1093058: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01092a38: 0x1092a38: ori   v0, v0, 16
+// 0x0109305c: 0x109305c: ori   v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	or
 	stloc 5
-// 0x01092a3c: 0x1092a3c: addu  a1, zero, zero
+// 0x01093060: 0x1093060: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01092a40: 0x1092a40: addiu a2, zero, -1
+// 0x01093064: 0x1093064: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01092a44: 0x1092a44: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01093068: 0x1093068: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3490,56 +3490,56 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092a4c: 0x1092a4c: addu  s0, v0, zero
+// 0x01093070: 0x1093070: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01092a50: 0x1092a50: addu  a0, v0, zero
+// 0x01093074: 0x1093074: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092a54: 0x1092a54: addu  a1, zero, zero
+// 0x01093078: 0x1093078: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01092a58: 0x1092a58: jal   0x1098fe0 addu  a2, zero, zero
+// 0x0109307c: 0x109307c: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01092a60: 0x1092a60: jal   0x1099190 addu  a0, s0, zero
+// 0x01093084: 0x1093084: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01092a68: 0x1092a68: lui   a0, 0x0
+// 0x0109308c: 0x109308c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01092a6c: 0x1092a6c: addu  a1, zero, zero
+// 0x01093090: 0x1093090: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01092a70: 0x1092a70: addiu a2, zero, -1
+// 0x01093094: 0x1093094: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01092a74: 0x1092a74: addiu a3, zero, -1
+// 0x01093098: 0x1093098: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01092a78: 0x1092a78: addiu a0, a0, 31968
+// 0x0109309c: 0x109309c: addiu a0, a0, 31968
 	ldloc.1
 	ldc.i4 31968
 	add
 	stloc.1
-// 0x01092a7c: 0x1092a7c: addiu v0, zero, 16
+// 0x010930a0: 0x10930a0: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x01092a80: 0x1092a80: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010930a4: 0x10930a4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3553,22 +3553,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092a88: 0x1092a88: addu  a0, v0, zero
+// 0x010930ac: 0x10930ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092a8c: 0x1092a8c: jal   0x1099190 addu  s2, v0, zero
+// 0x010930b0: 0x10930b0: jal   0x10997d8 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01092a94: 0x1092a94: lw    v0, 96(sp)
+// 0x010930b8: 0x10930b8: lw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3577,14 +3577,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092a98: 0x1092a98: sw    s5, 0(s1)
+// 0x010930bc: 0x10930bc: sw    s5, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-// 0x01092a9c: 0x1092a9c: sw    v0, 4(s1)
+// 0x010930c0: 0x10930c0: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3593,15 +3593,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092aa0: 0x1092aa0: lui   v0, 0x1090000
+// 0x010930c4: 0x10930c4: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01092aa4: 0x1092aa4: addiu v0, v0, 11652
+// 0x010930c8: 0x10930c8: addiu v0, v0, 13224
 	ldloc 5
-	ldc.i4 11652
+	ldc.i4 13224
 	add
 	stloc 5
-// 0x01092aa8: 0x1092aa8: sw    v0, 168(s0)
+// 0x010930cc: 0x10930cc: sw    v0, 168(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3610,15 +3610,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092aac: 0x1092aac: lui   v0, 0x1090000
+// 0x010930d0: 0x10930d0: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01092ab0: 0x1092ab0: addiu v0, v0, 11688
+// 0x010930d4: 0x10930d4: addiu v0, v0, 13260
 	ldloc 5
-	ldc.i4 11688
+	ldc.i4 13260
 	add
 	stloc 5
-// 0x01092ab4: 0x1092ab4: sw    v0, 172(s0)
+// 0x010930d8: 0x10930d8: sw    v0, 172(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3627,15 +3627,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092ab8: 0x1092ab8: lui   v0, 0x1090000
+// 0x010930dc: 0x10930dc: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01092abc: 0x1092abc: addiu v0, v0, 11456
+// 0x010930e0: 0x10930e0: addiu v0, v0, 13028
 	ldloc 5
-	ldc.i4 11456
+	ldc.i4 13028
 	add
 	stloc 5
-// 0x01092ac0: 0x1092ac0: sw    v0, 176(s0)
+// 0x010930e4: 0x10930e4: sw    v0, 176(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3644,15 +3644,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092ac4: 0x1092ac4: lui   v0, 0x1090000
+// 0x010930e8: 0x10930e8: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01092ac8: 0x1092ac8: addiu v0, v0, 11336
+// 0x010930ec: 0x10930ec: addiu v0, v0, 12908
 	ldloc 5
-	ldc.i4 11336
+	ldc.i4 12908
 	add
 	stloc 5
-// 0x01092acc: 0x1092acc: sw    v0, 180(s0)
+// 0x010930f0: 0x10930f0: sw    v0, 180(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3661,15 +3661,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092ad0: 0x1092ad0: lui   v0, 0x1090000
+// 0x010930f4: 0x10930f4: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01092ad4: 0x1092ad4: addiu v0, v0, 11256
+// 0x010930f8: 0x10930f8: addiu v0, v0, 12828
 	ldloc 5
-	ldc.i4 11256
+	ldc.i4 12828
 	add
 	stloc 5
-// 0x01092ad8: 0x1092ad8: sw    v0, 112(s2)
+// 0x010930fc: 0x10930fc: sw    v0, 112(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3678,7 +3678,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092adc: 0x1092adc: lw    v0, 88(sp)
+// 0x01093100: 0x1093100: lw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3687,7 +3687,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092ae0: 0x1092ae0: sw    zero, 108(s0)
+// 0x01093104: 0x1093104: sw    zero, 108(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3696,10 +3696,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01092ae4: 0x1092ae4: addu  a0, zero, zero
+// 0x01093108: 0x1093108: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01092ae8: 0x1092ae8: sw    s1, 164(s0)
+// 0x0109310c: 0x109310c: sw    s1, 164(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3708,7 +3708,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01092aec: 0x1092aec: sw    zero, 108(s2)
+// 0x01093110: 0x1093110: sw    zero, 108(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3717,7 +3717,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01092af0: 0x1092af0: sw    s4, 8(s1)
+// 0x01093114: 0x1093114: sw    s4, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3726,7 +3726,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01092af4: 0x1092af4: sw    v0, 16(s1)
+// 0x01093118: 0x1093118: sw    v0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3735,7 +3735,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092af8: 0x1092af8: jal   0x109a424 sw    s3, 12(s1)
+// 0x0109311c: 0x109311c: jal   0x109aa6c sw    s3, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3749,30 +3749,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092b00: 0x1092b00: lw    a1, 0(s3)
+// 0x01093124: 0x1093124: lw    a1, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01092b04: 0x1092b04: lui   a0, 0x20000
+// 0x01093128: 0x1093128: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01092b08: 0x1092b08: addiu a2, zero, -1
+// 0x0109312c: 0x109312c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01092b0c: 0x1092b0c: addiu a3, zero, 16
+// 0x01093130: 0x1093130: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x01092b10: 0x1092b10: jal   0x1098d10 addiu a0, a0, 9016
+// 0x01093134: 0x1093134: jal   0x1099358 addiu a0, a0, 9480
 	ldloc.1
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -3780,23 +3780,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092b18: 0x1092b18: lui   a1, 0x20000
+// 0x0109313c: 0x109313c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01092b1c: 0x1092b1c: addu  a0, v0, zero
+// 0x01093140: 0x1093140: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092b20: 0x1092b20: addiu a1, a1, -3564
+// 0x01093144: 0x1093144: addiu a1, a1, -3100
 	ldloc.2
-	ldc.i4 -3564
+	ldc.i4 -3100
 	add
 	stloc.2
-// 0x01092b24: 0x1092b24: jal   0x1097af8 sw    v0, 32(sp)
+// 0x01093148: 0x1093148: jal   0x1098140 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3807,9 +3807,9 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01092b2c: 0x1092b2c: lw    v0, 32(sp)
+// 0x01093150: 0x1093150: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3818,20 +3818,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092b30: 0x1092b30: addu  a0, s2, zero
+// 0x01093154: 0x1093154: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01092b34: 0x1092b34: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01093158: 0x1093158: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092b3c: 0x1092b3c: jal   0x109a424 addu  a0, zero, zero
+// 0x01093160: 0x1093160: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3839,35 +3839,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092b44: 0x1092b44: bne   v0, zero, 0x1092b54 lui   v0, 0x20000
+// 0x01093168: 0x1093168: bne   v0, zero, 0x1093178 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brtrue L_1092b54
+	brtrue L_1093178
 // --- basic block ---
-// 0x01092b4c: 0x1092b4c: j	 0x1092b5c addiu v0, v0, -3556
+// 0x01093170: 0x1093170: j	 0x1093180 addiu v0, v0, -3092
 	ldloc 5
-	ldc.i4 -3556
+	ldc.i4 -3092
 	add
 	stloc 5
-	br L_1092b5c
+	br L_1093180
 // --- basic block ---
-L_1092b54:
-// 0x01092b54: 0x1092b54: lui   v0, 0x20000
+L_1093178:
+// 0x01093178: 0x1093178: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01092b58: 0x1092b58: addiu v0, v0, -3544
+// 0x0109317c: 0x109317c: addiu v0, v0, -3080
 	ldloc 5
-	ldc.i4 -3544
+	ldc.i4 -3080
 	add
 	stloc 5
-L_1092b5c:
-// 0x01092b5c: 0x1092b5c: sw    v0, 28(sp)
+L_1093180:
+// 0x01093180: 0x1093180: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3876,7 +3876,7 @@ L_1092b5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092b60: 0x1092b60: sw    v0, 24(sp)
+// 0x01093184: 0x1093184: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3885,10 +3885,10 @@ L_1092b5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092b64: 0x1092b64: addiu v0, zero, 18
+// 0x01093188: 0x1093188: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01092b68: 0x1092b68: sw    v0, 16(sp)
+// 0x0109318c: 0x109318c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3897,39 +3897,39 @@ L_1092b5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092b6c: 0x1092b6c: lui   a0, 0x20000
+// 0x01093190: 0x1093190: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01092b70: 0x1092b70: lui   a1, 0x10000
+// 0x01093194: 0x1093194: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01092b74: 0x1092b74: lui   v0, 0x1090000
+// 0x01093198: 0x1093198: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01092b78: 0x1092b78: addiu a2, sp, 24
+// 0x0109319c: 0x109319c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01092b7c: 0x1092b7c: addiu a3, zero, 2
+// 0x010931a0: 0x10931a0: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x01092b80: 0x1092b80: addiu a0, a0, -3532
+// 0x010931a4: 0x10931a4: addiu a0, a0, -3068
 	ldloc.1
-	ldc.i4 -3532
+	ldc.i4 -3068
 	add
 	stloc.1
-// 0x01092b84: 0x1092b84: addiu a1, a1, 18500
+// 0x010931a8: 0x10931a8: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01092b88: 0x1092b88: addiu v0, v0, 11256
+// 0x010931ac: 0x10931ac: addiu v0, v0, 12828
 	ldloc 5
-	ldc.i4 11256
+	ldc.i4 12828
 	add
 	stloc 5
-// 0x01092b8c: 0x1092b8c: jal   0x1090ecc sw    v0, 20(sp)
+// 0x010931b0: 0x10931b0: jal   0x10914f0 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3943,18 +3943,18 @@ L_1092b5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092b94: 0x1092b94: addu  a1, v0, zero
+// 0x010931b8: 0x10931b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01092b98: 0x1092b98: addu  a0, s0, zero
+// 0x010931bc: 0x10931bc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01092b9c: 0x1092b9c: jal   0x1098ec4 sw    v0, 32(sp)
+// 0x010931c0: 0x10931c0: jal   0x109950c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3965,12 +3965,12 @@ L_1092b5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092ba4: 0x1092ba4: lw    v0, 32(sp)
+// 0x010931c8: 0x10931c8: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3979,13 +3979,13 @@ L_1092b5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092ba8: 0x1092ba8: lui   s1, 0x0
+// 0x010931cc: 0x10931cc: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01092bac: 0x1092bac: addu  a0, v0, zero
+// 0x010931d0: 0x10931d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01092bb0: 0x1092bb0: jal   0x10991ac addiu a1, s1, 17496
+// 0x010931d4: 0x10931d4: jal   0x10997f4 addiu a1, s1, 17496
 	ldloc 9
 	ldc.i4 17496
 	add
@@ -3995,15 +3995,15 @@ L_1092b5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092bb8: 0x1092bb8: addu  a0, s0, zero
+// 0x010931dc: 0x10931dc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01092bbc: 0x1092bbc: jal   0x10991ac addiu a1, s1, 17496
+// 0x010931e0: 0x10931e0: jal   0x10997f4 addiu a1, s1, 17496
 	ldloc 9
 	ldc.i4 17496
 	add
@@ -4013,29 +4013,29 @@ L_1092b5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092bc4: 0x1092bc4: addu  a0, s0, zero
+// 0x010931e8: 0x10931e8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01092bc8: 0x1092bc8: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010931ec: 0x10931ec: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092bd0: 0x1092bd0: lw    ra, 68(sp)
-// 0x01092bd4: 0x1092bd4: addu  v0, s0, zero
+// 0x010931f4: 0x10931f4: lw    ra, 68(sp)
+// 0x010931f8: 0x10931f8: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01092bd8: 0x1092bd8: lw    s5, 64(sp)
+// 0x010931fc: 0x10931fc: lw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4044,7 +4044,7 @@ L_1092b5c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01092bdc: 0x1092bdc: lw    s4, 60(sp)
+// 0x01093200: 0x1093200: lw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4053,7 +4053,7 @@ L_1092b5c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01092be0: 0x1092be0: lw    s3, 56(sp)
+// 0x01093204: 0x1093204: lw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4062,7 +4062,7 @@ L_1092b5c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01092be4: 0x1092be4: lw    s2, 52(sp)
+// 0x01093208: 0x1093208: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4071,7 +4071,7 @@ L_1092b5c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01092be8: 0x1092be8: lw    s1, 48(sp)
+// 0x0109320c: 0x109320c: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4080,7 +4080,7 @@ L_1092b5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01092bec: 0x1092bec: lw    s0, 44(sp)
+// 0x01093210: 0x1093210: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4089,7 +4089,7 @@ L_1092b5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01092bf0: 0x1092bf0: jr    ra addiu sp, sp, 72
+// 0x01093214: 0x1093214: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -4101,7 +4101,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 choice_callback_1092bf8(int32,int32,int32,int32,int32)
+.method public static int32 choice_callback_109321c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -4136,7 +4136,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092bf8: 0x1092bf8: lw    v0, 4(a0)
+// 0x0109321c: 0x109321c: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4145,12 +4145,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092bfc: 0x1092bfc: addiu sp, sp, -40
+// 0x01093220: 0x1093220: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01092c00: 0x1092c00: lw    v1, 164(v0)
+// 0x01093224: 0x1093224: lw    v1, 164(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4159,10 +4159,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01092c04: 0x1092c04: addu  a3, zero, zero
+// 0x01093228: 0x1093228: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01092c08: 0x1092c08: lw    a2, 12(v1)
+// 0x0109322c: 0x109322c: lw    a2, 12(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4171,14 +4171,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01092c0c: 0x1092c0c: lw    a0, 0(v1)
+// 0x01093230: 0x1093230: lw    a0, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01092c10: 0x1092c10: lw    a1, 8(v1)
+// 0x01093234: 0x1093234: lw    a1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4187,10 +4187,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01092c14: 0x1092c14: lui   v1, 0x1090000
+// 0x01093238: 0x1093238: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 6
-// 0x01092c18: 0x1092c18: sw    v0, 24(sp)
+// 0x0109323c: 0x109323c: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4199,16 +4199,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092c1c: 0x1092c1c: addiu v1, v1, 11548
+// 0x01093240: 0x1093240: addiu v1, v1, 13120
 	ldloc 6
-	ldc.i4 11548
+	ldc.i4 13120
 	add
 	stloc 6
-// 0x01092c20: 0x1092c20: addiu v0, zero, 40
+// 0x01093244: 0x1093244: addiu v0, zero, 40
 	ldc.i4.s 40
 	stloc 7
-// 0x01092c24: 0x1092c24: sw    ra, 36(sp)
-// 0x01092c28: 0x1092c28: sw    v0, 28(sp)
+// 0x01093248: 0x1093248: sw    ra, 36(sp)
+// 0x0109324c: 0x109324c: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4217,7 +4217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092c2c: 0x1092c2c: sw    v1, 16(sp)
+// 0x01093250: 0x1093250: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4226,7 +4226,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01092c30: 0x1092c30: jal   0x109bf18 sw    zero, 20(sp)
+// 0x01093254: 0x1093254: jal   0x109c560 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4240,16 +4240,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_generic_list_dialog_show_109bf18(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_generic_list_dialog_show_109c560(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01092c38: 0x1092c38: lw    ra, 36(sp)
-// 0x01092c3c: 0x1092c3c: addiu v0, zero, 1
+// 0x0109325c: 0x109325c: lw    ra, 36(sp)
+// 0x01093260: 0x1093260: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01092c40: 0x1092c40: jr    ra addiu sp, sp, 40
+// 0x01093264: 0x1093264: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4261,7 +4261,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 set_data_1092c48(int32,int32,int32,int32,int32)
+.method public static int32 set_data_109326c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t0,int32 ra)
@@ -4299,7 +4299,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092c48: 0x1092c48: lw    v1, 164(a0)
+// 0x0109326c: 0x109326c: lw    v1, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4308,13 +4308,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092c4c: 0x1092c4c: addiu sp, sp, -24
+// 0x01093270: 0x1093270: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01092c50: 0x1092c50: sw    ra, 20(sp)
-// 0x01092c54: 0x1092c54: lw    a3, 8(v1)
+// 0x01093274: 0x1093274: sw    ra, 20(sp)
+// 0x01093278: 0x1093278: lw    a3, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4323,13 +4323,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01092c58: 0x1092c58: j	 0x1092c80 addu  a2, zero, zero
+// 0x0109327c: 0x109327c: j	 0x10932a4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_1092c80
+	br L_10932a4
 // --- basic block ---
-L_1092c60:
-// 0x01092c60: 0x1092c60: lw    v0, 16(v1)
+L_1093284:
+// 0x01093284: 0x1093284: lw    v0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4338,53 +4338,53 @@ L_1092c60:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092c64: 0x1092c64: sll   zero, zero, 0
-// 0x01092c68: 0x1092c68: addu  t0, v0, t0
+// 0x01093288: 0x1093288: sll   zero, zero, 0
+// 0x0109328c: 0x109328c: addu  t0, v0, t0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x01092c6c: 0x1092c6c: lw    v0, 0(t0)
+// 0x01093290: 0x1093290: lw    v0, 0(t0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01092c70: 0x1092c70: sll   zero, zero, 0
-// 0x01092c74: 0x1092c74: beq   v0, a1, 0x1092c94 sll   zero, zero, 0
+// 0x01093294: 0x1093294: sll   zero, zero, 0
+// 0x01093298: 0x1093298: beq   v0, a1, 0x10932b8 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	beq  L_1092c94
+	beq  L_10932b8
 // --- basic block ---
-// 0x01092c7c: 0x1092c7c: addiu a2, a2, 1
+// 0x010932a0: 0x10932a0: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-L_1092c80:
-// 0x01092c80: 0x1092c80: slt   v0, a2, a3
+L_10932a4:
+// 0x010932a4: 0x10932a4: slt   v0, a2, a3
 	ldloc.3
 	ldloc 4
 	clt
 	stloc 5
-// 0x01092c84: 0x1092c84: bne   v0, zero, 0x1092c60 sll   t0, a2, 2
+// 0x010932a8: 0x10932a8: bne   v0, zero, 0x1093284 sll   t0, a2, 2
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc 8
-	brtrue L_1092c60
+	brtrue L_1093284
 // --- basic block ---
-// 0x01092c8c: 0x1092c8c: beq   a2, a3, 0x1092cb0 addiu v0, zero, -1
+// 0x010932b0: 0x10932b0: beq   a2, a3, 0x10932d4 addiu v0, zero, -1
 	ldloc.3
 	ldloc 4
 	ldc.i4.m1
 	stloc 5
-	beq  L_1092cb0
+	beq  L_10932d4
 // --- basic block ---
-L_1092c94:
-// 0x01092c94: 0x1092c94: lw    v0, 12(v1)
+L_10932b8:
+// 0x010932b8: 0x10932b8: lw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4393,29 +4393,29 @@ L_1092c94:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092c98: 0x1092c98: sll   a2, a2, 2
+// 0x010932bc: 0x10932bc: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01092c9c: 0x1092c9c: addu  a2, v0, a2
+// 0x010932c0: 0x10932c0: addu  a2, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc.3
-// 0x01092ca0: 0x1092ca0: lui   a1, 0x20000
+// 0x010932c4: 0x10932c4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01092ca4: 0x1092ca4: lw    a2, 0(a2)
+// 0x010932c8: 0x10932c8: lw    a2, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01092ca8: 0x1092ca8: jal   0x109b3e0 addiu a1, a1, 9016
+// 0x010932cc: 0x10932cc: jal   0x109ba28 addiu a1, a1, 9480
 	ldloc.2
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.2
 	ldloc.0
@@ -4423,15 +4423,15 @@ L_1092c94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1092cb0:
-// 0x01092cb0: 0x1092cb0: lw    ra, 20(sp)
-// 0x01092cb4: 0x1092cb4: sll   zero, zero, 0
-// 0x01092cb8: 0x1092cb8: jr    ra addiu sp, sp, 24
+L_10932d4:
+// 0x010932d4: 0x10932d4: lw    ra, 20(sp)
+// 0x010932d8: 0x10932d8: sll   zero, zero, 0
+// 0x010932dc: 0x10932dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4443,7 +4443,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_value_1092cc0(int32,int32,int32,int32,int32)
+.method public static int32 set_value_10932e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -4481,7 +4481,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092cc0: 0x1092cc0: lw    v0, 164(a0)
+// 0x010932e4: 0x10932e4: lw    v0, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4490,12 +4490,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092cc4: 0x1092cc4: addiu sp, sp, -32
+// 0x010932e8: 0x10932e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01092cc8: 0x1092cc8: lw    v0, 4(v0)
+// 0x010932ec: 0x10932ec: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4504,7 +4504,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092ccc: 0x1092ccc: sw    s0, 24(sp)
+// 0x010932f0: 0x10932f0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4513,17 +4513,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01092cd0: 0x1092cd0: sw    ra, 28(sp)
-// 0x01092cd4: 0x1092cd4: addu  s0, a0, zero
+// 0x010932f4: 0x10932f4: sw    ra, 28(sp)
+// 0x010932f8: 0x10932f8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01092cd8: 0x1092cd8: beq   v0, zero, 0x1092cf4 addu  a2, a1, zero
+// 0x010932fc: 0x10932fc: beq   v0, zero, 0x1093318 addu  a2, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc.3
-	brfalse L_1092cf4
+	brfalse L_1093318
 // --- basic block ---
-// 0x01092ce0: 0x1092ce0: jalr  v0 sw    a1, 16(sp)
+// 0x01093304: 0x1093304: jalr  v0 sw    a1, 16(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4543,7 +4543,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092ce8: 0x1092ce8: lw    a2, 16(sp)
+// 0x0109330c: 0x109330c: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4552,22 +4552,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01092cec: 0x1092cec: beq   v0, zero, 0x1092d08 addu  v1, zero, zero
+// 0x01093310: 0x1093310: beq   v0, zero, 0x109332c addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1092d08
+	brfalse L_109332c
 // --- basic block ---
-L_1092cf4:
-// 0x01092cf4: 0x1092cf4: lui   a1, 0x20000
+L_1093318:
+// 0x01093318: 0x1093318: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01092cf8: 0x1092cf8: addu  a0, s0, zero
+// 0x0109331c: 0x109331c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01092cfc: 0x1092cfc: jal   0x109b3e0 addiu a1, a1, 9016
+// 0x01093320: 0x1093320: jal   0x109ba28 addiu a1, a1, 9480
 	ldloc.2
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.2
 	ldloc.0
@@ -4575,20 +4575,20 @@ L_1092cf4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092d04: 0x1092d04: addu  v1, v0, zero
+// 0x01093328: 0x1093328: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_1092d08:
-// 0x01092d08: 0x1092d08: lw    ra, 28(sp)
-// 0x01092d0c: 0x1092d0c: addu  v0, v1, zero
+L_109332c:
+// 0x0109332c: 0x109332c: lw    ra, 28(sp)
+// 0x01093330: 0x1093330: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x01092d10: 0x1092d10: lw    s0, 24(sp)
+// 0x01093334: 0x1093334: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4597,7 +4597,7 @@ L_1092d08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01092d14: 0x1092d14: jr    ra addiu sp, sp, 32
+// 0x01093338: 0x1093338: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4609,7 +4609,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 list_callback_1092d1c(int32,int32,int32,int32,int32)
+.method public static int32 list_callback_1093340(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -4650,12 +4650,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092d1c: 0x1092d1c: addiu sp, sp, -40
+// 0x01093340: 0x1093340: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01092d20: 0x1092d20: sw    s1, 32(sp)
+// 0x01093344: 0x1093344: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4664,7 +4664,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01092d24: 0x1092d24: sw    s0, 28(sp)
+// 0x01093348: 0x1093348: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4673,7 +4673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01092d28: 0x1092d28: lw    s1, 164(a3)
+// 0x0109334c: 0x109334c: lw    s1, 164(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -4682,21 +4682,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01092d2c: 0x1092d2c: addu  s0, a1, zero
+// 0x01093350: 0x1093350: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01092d30: 0x1092d30: lui   a1, 0x20000
+// 0x01093354: 0x1093354: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01092d34: 0x1092d34: addu  a0, a3, zero
+// 0x01093358: 0x1093358: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x01092d38: 0x1092d38: addiu a1, a1, 9016
+// 0x0109335c: 0x109335c: addiu a1, a1, 9480
 	ldloc.2
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.2
-// 0x01092d3c: 0x1092d3c: sw    a3, 16(sp)
+// 0x01093360: 0x1093360: sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4705,8 +4705,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01092d40: 0x1092d40: sw    ra, 36(sp)
-// 0x01092d44: 0x1092d44: jal   0x109b3e0 addu  a2, s0, zero
+// 0x01093364: 0x1093364: sw    ra, 36(sp)
+// 0x01093368: 0x1093368: jal   0x109ba28 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -4714,23 +4714,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01092d4c: 0x1092d4c: jal   0x109bc2c sll   zero, zero, 0
+// 0x01093370: 0x1093370: jal   0x109c274 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_generic_list_dialog_hide_109bc2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_generic_list_dialog_hide_109c274(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01092d54: 0x1092d54: lw    v0, 4(s1)
+// 0x01093378: 0x1093378: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4739,7 +4739,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01092d58: 0x1092d58: lw    a3, 16(sp)
+// 0x0109337c: 0x109337c: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4748,13 +4748,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01092d5c: 0x1092d5c: beq   v0, zero, 0x1092d6c addu  a0, a3, zero
+// 0x01093380: 0x1093380: beq   v0, zero, 0x1093390 addu  a0, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc.1
-	brfalse L_1092d6c
+	brfalse L_1093390
 // --- basic block ---
-// 0x01092d64: 0x1092d64: jalr  v0 addu  a1, s0, zero
+// 0x01093388: 0x1093388: jalr  v0 addu  a1, s0, zero
 	ldloc 6
 	ldloc 7
 	stloc.2
@@ -4768,12 +4768,12 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_1092d6c:
-// 0x01092d6c: 0x1092d6c: lw    ra, 36(sp)
-// 0x01092d70: 0x1092d70: addiu v0, zero, 1
+L_1093390:
+// 0x01093390: 0x1093390: lw    ra, 36(sp)
+// 0x01093394: 0x1093394: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01092d74: 0x1092d74: lw    s1, 32(sp)
+// 0x01093398: 0x1093398: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4782,7 +4782,7 @@ L_1092d6c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01092d78: 0x1092d78: lw    s0, 28(sp)
+// 0x0109339c: 0x109339c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4791,7 +4791,7 @@ L_1092d6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092d7c: 0x1092d7c: jr    ra addiu sp, sp, 40
+// 0x010933a0: 0x10933a0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4803,7 +4803,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 get_value_1092d84(int32,int32,int32,int32,int32)
+.method public static int32 get_value_10933a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4838,18 +4838,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092d84: 0x1092d84: lui   a1, 0x20000
+// 0x010933a8: 0x10933a8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01092d88: 0x1092d88: addiu sp, sp, -24
+// 0x010933ac: 0x10933ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01092d8c: 0x1092d8c: sw    ra, 20(sp)
-// 0x01092d90: 0x1092d90: jal   0x109b634 addiu a1, a1, 9016
+// 0x010933b0: 0x10933b0: sw    ra, 20(sp)
+// 0x010933b4: 0x10933b4: jal   0x109bc7c addiu a1, a1, 9480
 	ldloc.2
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.2
 	ldloc.0
@@ -4857,14 +4857,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01092d98: 0x1092d98: lw    ra, 20(sp)
-// 0x01092d9c: 0x1092d9c: sll   zero, zero, 0
-// 0x01092da0: 0x1092da0: jr    ra addiu sp, sp, 24
+// 0x010933bc: 0x10933bc: lw    ra, 20(sp)
+// 0x010933c0: 0x10933c0: sll   zero, zero, 0
+// 0x010933c4: 0x10933c4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4876,7 +4876,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 get_data_1092da8(int32,int32,int32,int32,int32)
+.method public static int32 get_data_10933cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 v1,int32 s2,int32 ra)
@@ -4920,12 +4920,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092da8: 0x1092da8: addiu sp, sp, -32
+// 0x010933cc: 0x10933cc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01092dac: 0x1092dac: sw    s2, 24(sp)
+// 0x010933d0: 0x10933d0: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4934,7 +4934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01092db0: 0x1092db0: sw    s1, 20(sp)
+// 0x010933d4: 0x10933d4: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4943,7 +4943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01092db4: 0x1092db4: sw    s0, 16(sp)
+// 0x010933d8: 0x10933d8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4952,8 +4952,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01092db8: 0x1092db8: sw    ra, 28(sp)
-// 0x01092dbc: 0x1092dbc: lw    s1, 164(a0)
+// 0x010933dc: 0x10933dc: sw    ra, 28(sp)
+// 0x010933e0: 0x10933e0: lw    s1, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4962,7 +4962,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01092dc0: 0x1092dc0: jal   0x1092d84 addu  s0, zero, zero
+// 0x010933e4: 0x10933e4: jal   0x10933a8 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 6
 	ldloc.0
@@ -4970,18 +4970,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::get_value_1092d84(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::get_value_10933a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01092dc8: 0x1092dc8: j	 0x1092df4 addu  s2, v0, zero
+// 0x010933ec: 0x10933ec: j	 0x1093418 addu  s2, v0, zero
 	ldloc 7
 	stloc 10
-	br L_1092df4
+	br L_1093418
 // --- basic block ---
-L_1092dd0:
-// 0x01092dd0: 0x1092dd0: lw    v0, 12(s1)
+L_10933f4:
+// 0x010933f4: 0x10933f4: lw    v0, 12(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4990,36 +4990,36 @@ L_1092dd0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092dd4: 0x1092dd4: sll   zero, zero, 0
-// 0x01092dd8: 0x1092dd8: addu  a1, v0, a1
+// 0x010933f8: 0x10933f8: sll   zero, zero, 0
+// 0x010933fc: 0x10933fc: addu  a1, v0, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc.2
-// 0x01092ddc: 0x1092ddc: lw    a1, 0(a1)
+// 0x01093400: 0x1093400: lw    a1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01092de0: 0x1092de0: jal   0x1001b14 sll   zero, zero, 0
+// 0x01093404: 0x1093404: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01092de8: 0x1092de8: beq   v0, zero, 0x1092e10 sll   zero, zero, 0
+// 0x0109340c: 0x109340c: beq   v0, zero, 0x1093434 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1092e10
+	brfalse L_1093434
 // --- basic block ---
-// 0x01092df0: 0x1092df0: addiu s0, s0, 1
+// 0x01093414: 0x1093414: addiu s0, s0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_1092df4:
-// 0x01092df4: 0x1092df4: lw    v1, 8(s1)
+L_1093418:
+// 0x01093418: 0x1093418: lw    v1, 8(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5028,31 +5028,31 @@ L_1092df4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01092df8: 0x1092df8: sll   a1, s0, 2
+// 0x0109341c: 0x109341c: sll   a1, s0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01092dfc: 0x1092dfc: slt   v0, s0, v1
+// 0x01093420: 0x1093420: slt   v0, s0, v1
 	ldloc 6
 	ldloc 9
 	clt
 	stloc 7
-// 0x01092e00: 0x1092e00: bne   v0, zero, 0x1092dd0 addu  a0, s2, zero
+// 0x01093424: 0x1093424: bne   v0, zero, 0x10933f4 addu  a0, s2, zero
 	ldloc 7
 	ldloc 10
 	stloc.1
-	brtrue L_1092dd0
+	brtrue L_10933f4
 // --- basic block ---
-// 0x01092e08: 0x1092e08: beq   s0, v1, 0x1092e20 addu  v0, zero, zero
+// 0x0109342c: 0x109342c: beq   s0, v1, 0x1093444 addu  v0, zero, zero
 	ldloc 6
 	ldloc 9
 	ldc.i4.s 0
 	stloc 7
-	beq  L_1092e20
+	beq  L_1093444
 // --- basic block ---
-L_1092e10:
-// 0x01092e10: 0x1092e10: lw    v0, 16(s1)
+L_1093434:
+// 0x01093434: 0x1093434: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5061,26 +5061,26 @@ L_1092e10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01092e14: 0x1092e14: sll   s0, s0, 2
+// 0x01093438: 0x1093438: sll   s0, s0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01092e18: 0x1092e18: addu  s0, v0, s0
+// 0x0109343c: 0x109343c: addu  s0, v0, s0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x01092e1c: 0x1092e1c: lw    v0, 0(s0)
+// 0x01093440: 0x1093440: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-L_1092e20:
-// 0x01092e20: 0x1092e20: lw    ra, 28(sp)
-// 0x01092e24: 0x1092e24: lw    s2, 24(sp)
+L_1093444:
+// 0x01093444: 0x1093444: lw    ra, 28(sp)
+// 0x01093448: 0x1093448: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5089,7 +5089,7 @@ L_1092e20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01092e28: 0x1092e28: lw    s1, 20(sp)
+// 0x0109344c: 0x109344c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5098,7 +5098,7 @@ L_1092e20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01092e2c: 0x1092e2c: lw    s0, 16(sp)
+// 0x01093450: 0x1093450: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5107,7 +5107,7 @@ L_1092e20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01092e30: 0x1092e30: jr    ra addiu sp, sp, 32
+// 0x01093454: 0x1093454: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5119,7 +5119,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static void release_1092e38()
+.method public static void release_109345c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -5130,12 +5130,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092e38: 0x1092e38: jr    ra sll   zero, zero, 0
+// 0x0109345c: 0x109345c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 short_click_1092e40(int32,int32,int32,int32,int32)
+.method public static int32 short_click_1093464(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -5170,7 +5170,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092e40: 0x1092e40: lw    v1, 112(a0)
+// 0x01093464: 0x1093464: lw    v1, 112(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5179,13 +5179,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092e44: 0x1092e44: addiu sp, sp, -24
+// 0x01093468: 0x1093468: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01092e48: 0x1092e48: sw    ra, 20(sp)
-// 0x01092e4c: 0x1092e4c: sw    zero, 136(a0)
+// 0x0109346c: 0x109346c: sw    ra, 20(sp)
+// 0x01093470: 0x1093470: sw    zero, 136(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5194,19 +5194,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01092e50: 0x1092e50: beq   v1, zero, 0x1092e68 addu  v0, zero, zero
+// 0x01093474: 0x1093474: beq   v1, zero, 0x109348c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1092e68
+	brfalse L_109348c
 // --- basic block ---
-// 0x01092e58: 0x1092e58: lui   a1, 0x20000
+// 0x0109347c: 0x109347c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01092e5c: 0x1092e5c: jalr  v1 addiu a1, a1, -3888
+// 0x01093480: 0x1093480: jalr  v1 addiu a1, a1, -3424
 	ldloc 5
 	ldloc.2
-	ldc.i4 -3888
+	ldc.i4 -3424
 	add
 	stloc.2
 	ldloc.0
@@ -5219,13 +5219,13 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01092e64: 0x1092e64: addiu v0, zero, 1
+// 0x01093488: 0x1093488: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1092e68:
-// 0x01092e68: 0x1092e68: lw    ra, 20(sp)
-// 0x01092e6c: 0x1092e6c: sll   zero, zero, 0
-// 0x01092e70: 0x1092e70: jr    ra addiu sp, sp, 24
+L_109348c:
+// 0x0109348c: 0x109348c: lw    ra, 20(sp)
+// 0x01093490: 0x1093490: sll   zero, zero, 0
+// 0x01093494: 0x1093494: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5237,7 +5237,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_container_on_key_pressed_1092e78(int32,int32,int32,int32,int32)
+.method public static int32 ssd_container_on_key_pressed_109349c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5272,35 +5272,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092e78: 0x1092e78: addiu sp, sp, -24
+// 0x0109349c: 0x109349c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01092e7c: 0x1092e7c: andi  a2, a2, 2
+// 0x010934a0: 0x10934a0: andi  a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc.3
-// 0x01092e80: 0x1092e80: beq   a2, zero, 0x1092eb8 sw    ra, 20(sp)
+// 0x010934a4: 0x10934a4: beq   a2, zero, 0x10934dc sw    ra, 20(sp)
 	ldloc.3
-	brfalse L_1092eb8
+	brfalse L_10934dc
 // --- basic block ---
-// 0x01092e88: 0x1092e88: lb    a1, 0(a1)
+// 0x010934ac: 0x10934ac: lb    a1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01092e8c: 0x1092e8c: addiu v1, zero, 13
+// 0x010934b0: 0x10934b0: addiu v1, zero, 13
 	ldc.i4.s 13
 	stloc 7
-// 0x01092e90: 0x1092e90: bne   a1, v1, 0x1092ebc addu  v0, zero, zero
+// 0x010934b4: 0x10934b4: bne   a1, v1, 0x10934e0 addu  v0, zero, zero
 	ldloc.2
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1092ebc
+	bne.un L_10934e0
 // --- basic block ---
-// 0x01092e98: 0x1092e98: lw    v0, 112(a0)
+// 0x010934bc: 0x10934bc: lw    v0, 112(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5309,17 +5309,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092e9c: 0x1092e9c: sll   zero, zero, 0
-// 0x01092ea0: 0x1092ea0: beq   v0, zero, 0x1092eb8 lui   a1, 0x20000
+// 0x010934c0: 0x10934c0: sll   zero, zero, 0
+// 0x010934c4: 0x10934c4: beq   v0, zero, 0x10934dc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1092eb8
+	brfalse L_10934dc
 // --- basic block ---
-// 0x01092ea8: 0x1092ea8: jalr  v0 addiu a1, a1, -3888
+// 0x010934cc: 0x10934cc: jalr  v0 addiu a1, a1, -3424
 	ldloc 5
 	ldloc.2
-	ldc.i4 -3888
+	ldc.i4 -3424
 	add
 	stloc.2
 	ldloc.0
@@ -5332,19 +5332,19 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01092eb0: 0x1092eb0: j	 0x1092ebc addiu v0, zero, 1
+// 0x010934d4: 0x10934d4: j	 0x10934e0 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1092ebc
+	br L_10934e0
 // --- basic block ---
-L_1092eb8:
-// 0x01092eb8: 0x1092eb8: addu  v0, zero, zero
+L_10934dc:
+// 0x010934dc: 0x10934dc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1092ebc:
-// 0x01092ebc: 0x1092ebc: lw    ra, 20(sp)
-// 0x01092ec0: 0x1092ec0: sll   zero, zero, 0
-// 0x01092ec4: 0x1092ec4: jr    ra addiu sp, sp, 24
+L_10934e0:
+// 0x010934e0: 0x10934e0: lw    ra, 20(sp)
+// 0x010934e4: 0x10934e4: sll   zero, zero, 0
+// 0x010934e8: 0x10934e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5356,7 +5356,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_pointer_down_1092ecc()
+.method public static int32 on_pointer_down_10934f0()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -5370,7 +5370,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092ecc: 0x1092ecc: jr    ra addu  v0, zero, zero
+// 0x010934f0: 0x10934f0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -5378,7 +5378,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 draw_1092f4c(int32,int32,int32,int32,int32)
+.method public static int32 draw_1093570(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 t0,int32 s8,int32 t2,int32 s5,int32 t1,int32 s3,int32 s6,int32 s7,int32 t3,int32 t4,int32 lo,int32 ra)
@@ -5458,12 +5458,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01092f4c: 0x1092f4c: addiu sp, sp, -160
+// 0x01093570: 0x1093570: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x01092f50: 0x1092f50: sw    s3, 132(sp)
+// 0x01093574: 0x1093574: sw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5472,15 +5472,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01092f54: 0x1092f54: addiu v0, zero, 5
+// 0x01093578: 0x1093578: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01092f58: 0x1092f58: andi  s3, a2, 1
+// 0x0109357c: 0x109357c: andi  s3, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc 17
-// 0x01092f5c: 0x1092f5c: sw    s7, 148(sp)
+// 0x01093580: 0x1093580: sw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5489,7 +5489,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01092f60: 0x1092f60: sw    s2, 128(sp)
+// 0x01093584: 0x1093584: sw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5498,7 +5498,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01092f64: 0x1092f64: sw    s1, 124(sp)
+// 0x01093588: 0x1093588: sw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5507,7 +5507,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01092f68: 0x1092f68: sw    s0, 120(sp)
+// 0x0109358c: 0x109358c: sw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5516,8 +5516,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01092f6c: 0x1092f6c: sw    ra, 156(sp)
-// 0x01092f70: 0x1092f70: sw    s8, 152(sp)
+// 0x01093590: 0x1093590: sw    ra, 156(sp)
+// 0x01093594: 0x1093594: sw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5526,7 +5526,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01092f74: 0x1092f74: sw    s6, 144(sp)
+// 0x01093598: 0x1093598: sw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5535,7 +5535,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01092f78: 0x1092f78: sw    s5, 140(sp)
+// 0x0109359c: 0x109359c: sw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5544,7 +5544,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01092f7c: 0x1092f7c: sw    s4, 136(sp)
+// 0x010935a0: 0x10935a0: sw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5553,13 +5553,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01092f80: 0x1092f80: addu  s7, a2, zero
+// 0x010935a4: 0x10935a4: addu  s7, a2, zero
 	ldloc.3
 	stloc 19
-// 0x01092f84: 0x1092f84: addu  s1, a0, zero
+// 0x010935a8: 0x10935a8: addu  s1, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01092f88: 0x1092f88: sw    v0, 32(sp)
+// 0x010935ac: 0x10935ac: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5568,7 +5568,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01092f8c: 0x1092f8c: lw    s2, 108(a0)
+// 0x010935b0: 0x10935b0: lw    s2, 108(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5577,13 +5577,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01092f90: 0x1092f90: bne   s3, zero, 0x10930e8 addu  s0, a1, zero
+// 0x010935b4: 0x10935b4: bne   s3, zero, 0x109370c addu  s0, a1, zero
 	ldloc 17
 	ldloc.2
 	stloc 8
-	brtrue L_10930e8
+	brtrue L_109370c
 // --- basic block ---
-// 0x01092f98: 0x1092f98: lw    v0, 60(a0)
+// 0x010935bc: 0x10935bc: lw    v0, 60(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5592,12 +5592,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092f9c: 0x1092f9c: sll   zero, zero, 0
-// 0x01092fa0: 0x1092fa0: beq   v0, zero, 0x1092fc4 sll   zero, zero, 0
+// 0x010935c0: 0x10935c0: sll   zero, zero, 0
+// 0x010935c4: 0x10935c4: beq   v0, zero, 0x10935e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1092fc4
+	brfalse L_10935e8
 // --- basic block ---
-// 0x01092fa8: 0x1092fa8: lw    v0, 64(a0)
+// 0x010935cc: 0x10935cc: lw    v0, 64(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5606,23 +5606,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092fac: 0x1092fac: sll   zero, zero, 0
-// 0x01092fb0: 0x1092fb0: beq   v0, zero, 0x1092fc4 sll   zero, zero, 0
+// 0x010935d0: 0x10935d0: sll   zero, zero, 0
+// 0x010935d4: 0x10935d4: beq   v0, zero, 0x10935e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1092fc4
+	brfalse L_10935e8
 // --- basic block ---
-// 0x01092fb8: 0x1092fb8: lui   s2, 0x20000
+// 0x010935dc: 0x10935dc: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01092fbc: 0x1092fbc: j	 0x1092fdc addiu s2, s2, -3664
+// 0x010935e0: 0x10935e0: j	 0x1093600 addiu s2, s2, -3200
 	ldloc 9
-	ldc.i4 -3664
+	ldc.i4 -3200
 	add
 	stloc 9
-	br L_1092fdc
+	br L_1093600
 // --- basic block ---
-L_1092fc4:
-// 0x01092fc4: 0x1092fc4: lw    v0, 68(s1)
+L_10935e8:
+// 0x010935e8: 0x10935e8: lw    v0, 68(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5631,17 +5631,17 @@ L_1092fc4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092fc8: 0x1092fc8: sll   zero, zero, 0
-// 0x01092fcc: 0x1092fcc: bne   v0, zero, 0x10938fc sll   zero, zero, 0
+// 0x010935ec: 0x10935ec: sll   zero, zero, 0
+// 0x010935f0: 0x10935f0: bne   v0, zero, 0x1093f20 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10938fc
+	brtrue L_1093f20
 // --- basic block ---
-// 0x01092fd4: 0x1092fd4: beq   s2, zero, 0x1093070 sll   zero, zero, 0
+// 0x010935f8: 0x10935f8: beq   s2, zero, 0x1093694 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_1093070
+	brfalse L_1093694
 // --- basic block ---
-L_1092fdc:
-// 0x01092fdc: 0x1092fdc: lw    v0, 48(s1)
+L_1093600:
+// 0x01093600: 0x1093600: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5650,42 +5650,42 @@ L_1092fdc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01092fe0: 0x1092fe0: sll   zero, zero, 0
-// 0x01092fe4: 0x1092fe4: andi  v1, v0, 16384
+// 0x01093604: 0x1093604: sll   zero, zero, 0
+// 0x01093608: 0x1093608: andi  v1, v0, 16384
 	ldloc 5
 	ldc.i4 16384
 	and
 	stloc 7
-// 0x01092fe8: 0x1092fe8: beq   v1, zero, 0x1093010 lui   v1, 0x20000
+// 0x0109360c: 0x109360c: beq   v1, zero, 0x1093634 lui   v1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 7
-	brfalse L_1093010
+	brfalse L_1093634
 // --- basic block ---
-// 0x01092ff0: 0x1092ff0: lui   v0, 0x80000
+// 0x01093614: 0x1093614: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01092ff4: 0x1092ff4: lw    a0, 9636(v0)
+// 0x01093618: 0x1093618: lw    a0, 10100(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2409
+	ldc.i4 2525
 	add
 	ldelem.i4
 	stloc.1
-// 0x01092ff8: 0x1092ff8: jal   0x104e35c sll   zero, zero, 0
+// 0x0109361c: 0x109361c: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093000: 0x1093000: jal   0x104edb0 addu  a0, s2, zero
+// 0x01093624: 0x1093624: jal   0x104edc0 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5693,47 +5693,47 @@ L_1092fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093008: 0x1093008: j	 0x1093070 sll   zero, zero, 0
-	br L_1093070
+// 0x0109362c: 0x109362c: j	 0x1093694 sll   zero, zero, 0
+	br L_1093694
 // --- basic block ---
-L_1093010:
-// 0x01093010: 0x1093010: and   v0, v0, v1
+L_1093634:
+// 0x01093634: 0x1093634: and   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 5
-// 0x01093014: 0x1093014: bne   v0, zero, 0x1093070 lui   v0, 0x80000
+// 0x01093638: 0x1093638: bne   v0, zero, 0x1093694 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1093070
+	brtrue L_1093694
 // --- basic block ---
-// 0x0109301c: 0x109301c: lw    a0, 9636(v0)
+// 0x01093640: 0x1093640: lw    a0, 10100(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2409
+	ldc.i4 2525
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093020: 0x1093020: jal   0x104e35c sll   zero, zero, 0
+// 0x01093644: 0x1093644: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093028: 0x1093028: jal   0x104edb0 addu  a0, s2, zero
+// 0x0109364c: 0x109364c: jal   0x104edc0 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5741,12 +5741,12 @@ L_1093010:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093030: 0x1093030: lw    v0, 48(s1)
+// 0x01093654: 0x1093654: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5755,32 +5755,32 @@ L_1093010:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093034: 0x1093034: lui   v1, 0x20000000
+// 0x01093658: 0x1093658: lui   v1, 0x20000000
 	ldc.i4 536870912
 	stloc 7
-// 0x01093038: 0x1093038: and   v1, v0, v1
+// 0x0109365c: 0x109365c: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x0109303c: 0x109303c: bne   v1, zero, 0x109304c sll   zero, zero, 0
+// 0x01093660: 0x1093660: bne   v1, zero, 0x1093670 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_109304c
+	brtrue L_1093670
 // --- basic block ---
-// 0x01093044: 0x1093044: bgez  v0, 0x1093068 sll   zero, zero, 0
+// 0x01093668: 0x1093668: bgez  v0, 0x109368c sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1093068
+	bge L_109368c
 // --- basic block ---
-L_109304c:
-// 0x0109304c: 0x109304c: lw    v1, 0(s0)
+L_1093670:
+// 0x01093670: 0x1093670: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01093050: 0x1093050: lw    v0, 8(s0)
+// 0x01093674: 0x1093674: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5789,24 +5789,24 @@ L_109304c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093054: 0x1093054: addiu v1, v1, 10
+// 0x01093678: 0x1093678: addiu v1, v1, 10
 	ldloc 7
 	ldc.i4.s 10
 	add
 	stloc 7
-// 0x01093058: 0x1093058: addiu v0, v0, -10
+// 0x0109367c: 0x109367c: addiu v0, v0, -10
 	ldloc 5
 	ldc.i4.s -10
 	add
 	stloc 5
-// 0x0109305c: 0x109305c: sw    v1, 0(s0)
+// 0x01093680: 0x1093680: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01093060: 0x1093060: j	 0x1093070 sw    v0, 8(s0)
+// 0x01093684: 0x1093684: j	 0x1093694 sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5815,23 +5815,23 @@ L_109304c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1093070
+	br L_1093694
 // --- basic block ---
-L_1093068:
-// 0x01093068: 0x1093068: jal   0x104dde4 addu  a0, s0, zero
+L_109368c:
+// 0x0109368c: 0x109368c: jal   0x104ddf4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_erase_area_104dde4(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_erase_area_104ddf4(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1093070:
-// 0x01093070: 0x1093070: lw    v0, 48(s1)
+L_1093694:
+// 0x01093694: 0x1093694: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5840,51 +5840,51 @@ L_1093070:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093074: 0x1093074: lui   v1, 0x30000
+// 0x01093698: 0x1093698: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01093078: 0x1093078: ori   v1, v1, 40960
+// 0x0109369c: 0x109369c: ori   v1, v1, 40960
 	ldloc 7
 	ldc.i4 40960
 	or
 	stloc 7
-// 0x0109307c: 0x109307c: and   v1, v0, v1
+// 0x010936a0: 0x10936a0: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x01093080: 0x1093080: addiu v0, zero, 8192
+// 0x010936a4: 0x10936a4: addiu v0, zero, 8192
 	ldc.i4 8192
 	stloc 5
-// 0x01093084: 0x1093084: bne   v1, v0, 0x10930e8 sll   zero, zero, 0
+// 0x010936a8: 0x10936a8: bne   v1, v0, 0x109370c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10930e8
+	bne.un L_109370c
 // --- basic block ---
-// 0x0109308c: 0x109308c: jal   0x1014194 sll   zero, zero, 0
+// 0x010936b0: 0x10936b0: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093094: 0x1093094: beq   v0, zero, 0x10930b8 sll   zero, zero, 0
+// 0x010936b8: 0x10936b8: beq   v0, zero, 0x10936dc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10930b8
+	brfalse L_10936dc
 // --- basic block ---
-// 0x0109309c: 0x109309c: lui   a0, 0x20000
+// 0x010936c0: 0x10936c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010930a0: 0x10930a0: addiu a0, a0, -3520
+// 0x010936c4: 0x10936c4: addiu a0, a0, -3056
 	ldloc.1
-	ldc.i4 -3520
+	ldc.i4 -3056
 	add
 	stloc.1
-// 0x010930a4: 0x10930a4: jal   0x104ef00 addu  a1, zero, zero
+// 0x010936c8: 0x10936c8: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5892,31 +5892,31 @@ L_1093070:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010930ac: 0x10930ac: lui   a0, 0x20000
+// 0x010936d0: 0x10936d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010930b0: 0x10930b0: j	 0x10930d0 addiu a0, a0, -3496
+// 0x010936d4: 0x10936d4: j	 0x10936f4 addiu a0, a0, -3032
 	ldloc.1
-	ldc.i4 -3496
+	ldc.i4 -3032
 	add
 	stloc.1
-	br L_10930d0
+	br L_10936f4
 // --- basic block ---
-L_10930b8:
-// 0x010930b8: 0x10930b8: lui   a0, 0x20000
+L_10936dc:
+// 0x010936dc: 0x10936dc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010930bc: 0x10930bc: addiu a0, a0, -3488
+// 0x010936e0: 0x10936e0: addiu a0, a0, -3024
 	ldloc.1
-	ldc.i4 -3488
+	ldc.i4 -3024
 	add
 	stloc.1
-// 0x010930c0: 0x10930c0: jal   0x104ef00 addu  a1, zero, zero
+// 0x010936e4: 0x10936e4: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5924,54 +5924,54 @@ L_10930b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010930c8: 0x10930c8: lui   a0, 0x20000
+// 0x010936ec: 0x10936ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010930cc: 0x10930cc: addiu a0, a0, -3464
+// 0x010936f0: 0x10936f0: addiu a0, a0, -3000
 	ldloc.1
-	ldc.i4 -3464
+	ldc.i4 -3000
 	add
 	stloc.1
-L_10930d0:
-// 0x010930d0: 0x10930d0: jal   0x104edb0 sll   zero, zero, 0
+L_10936f4:
+// 0x010936f4: 0x10936f4: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010930d8: 0x10930d8: jal   0x104dd5c addiu a0, zero, 1
+// 0x010936fc: 0x10936fc: jal   0x104dd6c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010930e0: 0x10930e0: jal   0x104dde4 addu  a0, s0, zero
+// 0x01093704: 0x1093704: jal   0x104ddf4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_erase_area_104dde4(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_erase_area_104ddf4(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10930e8:
-// 0x010930e8: 0x10930e8: lw    v0, 48(s1)
+L_109370c:
+// 0x0109370c: 0x109370c: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5980,24 +5980,24 @@ L_10930e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010930ec: 0x10930ec: sll   zero, zero, 0
-// 0x010930f0: 0x10930f0: andi  v0, v0, 4096
+// 0x01093710: 0x1093710: sll   zero, zero, 0
+// 0x01093714: 0x1093714: andi  v0, v0, 4096
 	ldloc 5
 	ldc.i4 4096
 	and
 	stloc 5
-// 0x010930f4: 0x10930f4: beq   v0, zero, 0x10933c4 sll   zero, zero, 0
+// 0x01093718: 0x1093718: beq   v0, zero, 0x10939e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10933c4
+	brfalse L_10939e8
 // --- basic block ---
-// 0x010930fc: 0x10930fc: lw    v0, 0(s0)
+// 0x01093720: 0x1093720: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01093100: 0x1093100: lw    v1, 4(s0)
+// 0x01093724: 0x1093724: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6006,7 +6006,7 @@ L_10930e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093104: 0x1093104: lw    a1, 8(s0)
+// 0x01093728: 0x1093728: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6015,7 +6015,7 @@ L_10930e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01093108: 0x1093108: lw    a0, 12(s0)
+// 0x0109372c: 0x109372c: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6024,17 +6024,17 @@ L_10930e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109310c: 0x109310c: addiu v0, v0, 1
+// 0x01093730: 0x1093730: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01093110: 0x1093110: addiu v1, v1, 1
+// 0x01093734: 0x1093734: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01093114: 0x1093114: sw    v1, 96(sp)
+// 0x01093738: 0x1093738: sw    v1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6043,7 +6043,7 @@ L_10930e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01093118: 0x1093118: sw    a1, 76(sp)
+// 0x0109373c: 0x109373c: sw    a1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6052,7 +6052,7 @@ L_10930e8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109311c: 0x109311c: sw    a0, 88(sp)
+// 0x01093740: 0x1093740: sw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6061,7 +6061,7 @@ L_10930e8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01093120: 0x1093120: sw    v0, 92(sp)
+// 0x01093744: 0x1093744: sw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6070,7 +6070,7 @@ L_10930e8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093124: 0x1093124: sw    v0, 60(sp)
+// 0x01093748: 0x1093748: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6079,7 +6079,7 @@ L_10930e8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093128: 0x1093128: sw    v1, 64(sp)
+// 0x0109374c: 0x109374c: sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6088,7 +6088,7 @@ L_10930e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109312c: 0x109312c: sw    v1, 72(sp)
+// 0x01093750: 0x1093750: sw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6097,7 +6097,7 @@ L_10930e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01093130: 0x1093130: sw    a1, 68(sp)
+// 0x01093754: 0x1093754: sw    a1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6106,7 +6106,7 @@ L_10930e8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01093134: 0x1093134: sw    a0, 80(sp)
+// 0x01093758: 0x1093758: sw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6115,7 +6115,7 @@ L_10930e8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01093138: 0x1093138: bne   s3, zero, 0x10932f8 sw    v0, 84(sp)
+// 0x0109375c: 0x109375c: bne   s3, zero, 0x109391c sw    v0, 84(sp)
 	ldloc 17
 	ldloc 6
 	ldloc.0
@@ -6125,32 +6125,32 @@ L_10930e8:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10932f8
+	brtrue L_109391c
 // --- basic block ---
-// 0x01093140: 0x1093140: lui   v0, 0x80000
+// 0x01093764: 0x1093764: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093144: 0x1093144: lw    a0, 9640(v0)
+// 0x01093768: 0x1093768: lw    a0, 10104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2410
+	ldc.i4 2526
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093148: 0x1093148: jal   0x104e35c sll   zero, zero, 0
+// 0x0109376c: 0x109376c: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093150: 0x1093150: lw    a0, 104(s1)
+// 0x01093774: 0x1093774: lw    a0, 104(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6159,35 +6159,35 @@ L_10930e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093154: 0x1093154: sll   zero, zero, 0
-// 0x01093158: 0x1093158: bne   a0, zero, 0x1093164 lui   v0, 0x20000
+// 0x01093778: 0x1093778: sll   zero, zero, 0
+// 0x0109377c: 0x109377c: bne   a0, zero, 0x1093788 lui   v0, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc 5
-	brtrue L_1093164
+	brtrue L_1093788
 // --- basic block ---
-// 0x01093160: 0x1093160: lw    a0, 29584(v0)
+// 0x01093784: 0x1093784: lw    a0, 30048(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7396
+	ldc.i4 7512
 	add
 	ldelem.i4
 	stloc.1
-L_1093164:
-// 0x01093164: 0x1093164: jal   0x104edb0 sll   zero, zero, 0
+L_1093788:
+// 0x01093788: 0x1093788: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109316c: 0x109316c: lw    v0, 48(s1)
+// 0x01093790: 0x1093790: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6196,49 +6196,49 @@ L_1093164:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093170: 0x1093170: sll   zero, zero, 0
-// 0x01093174: 0x1093174: andi  v1, v0, 16384
+// 0x01093794: 0x1093794: sll   zero, zero, 0
+// 0x01093798: 0x1093798: andi  v1, v0, 16384
 	ldloc 5
 	ldc.i4 16384
 	and
 	stloc 7
-// 0x01093178: 0x1093178: beq   v1, zero, 0x10932e4 lui   a1, 0x8000000
+// 0x0109379c: 0x109379c: beq   v1, zero, 0x1093908 lui   a1, 0x8000000
 	ldloc 7
 	ldc.i4 134217728
 	stloc.2
-	brfalse L_10932e4
+	brfalse L_1093908
 // --- basic block ---
-// 0x01093180: 0x1093180: and   a1, v0, a1
+// 0x010937a4: 0x10937a4: and   a1, v0, a1
 	ldloc 5
 	ldloc.2
 	and
 	stloc.2
-// 0x01093184: 0x1093184: sltiu a1, a1, 1
+// 0x010937a8: 0x10937a8: sltiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x01093188: 0x1093188: lui   v1, 0x4000000
+// 0x010937ac: 0x10937ac: lui   v1, 0x4000000
 	ldc.i4 67108864
 	stloc 7
-// 0x0109318c: 0x109318c: subu  a1, zero, a1
+// 0x010937b0: 0x10937b0: subu  a1, zero, a1
 	ldloc.2
 	neg
 	stloc.2
-// 0x01093190: 0x1093190: and   v1, v0, v1
+// 0x010937b4: 0x10937b4: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x01093194: 0x1093194: beq   v1, zero, 0x10931ac ori   a1, a1, 16
+// 0x010937b8: 0x10937b8: beq   v1, zero, 0x10937d0 ori   a1, a1, 16
 	ldloc 7
 	ldloc.2
 	ldc.i4.s 16
 	or
 	stloc.2
-	brfalse L_10931ac
+	brfalse L_10937d0
 // --- basic block ---
-// 0x0109319c: 0x109319c: lw    v1, 80(sp)
+// 0x010937c0: 0x10937c0: lw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6247,32 +6247,32 @@ L_1093164:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010931a0: 0x10931a0: addiu a2, zero, 19
+// 0x010937c4: 0x10937c4: addiu a2, zero, 19
 	ldc.i4.s 19
 	stloc.3
-// 0x010931a4: 0x10931a4: j	 0x10931c8 addiu v1, v1, -17
+// 0x010937c8: 0x10937c8: j	 0x10937ec addiu v1, v1, -17
 	ldloc 7
 	ldc.i4.s -17
 	add
 	stloc 7
-	br L_10931c8
+	br L_10937ec
 // --- basic block ---
-L_10931ac:
-// 0x010931ac: 0x10931ac: lui   v1, 0x2000000
+L_10937d0:
+// 0x010937d0: 0x10937d0: lui   v1, 0x2000000
 	ldc.i4 33554432
 	stloc 7
-// 0x010931b0: 0x10931b0: and   v1, v0, v1
+// 0x010937d4: 0x10937d4: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x010931b4: 0x10931b4: beq   v1, zero, 0x10931d0 lui   v1, 0x1000000
+// 0x010937d8: 0x10937d8: beq   v1, zero, 0x10937f4 lui   v1, 0x1000000
 	ldloc 7
 	ldc.i4 16777216
 	stloc 7
-	brfalse L_10931d0
+	brfalse L_10937f4
 // --- basic block ---
-// 0x010931bc: 0x10931bc: lw    v1, 80(sp)
+// 0x010937e0: 0x10937e0: lw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6281,16 +6281,16 @@ L_10931ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010931c0: 0x10931c0: addiu a2, zero, 20
+// 0x010937e4: 0x10937e4: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x010931c4: 0x10931c4: addiu v1, v1, -7
+// 0x010937e8: 0x10937e8: addiu v1, v1, -7
 	ldloc 7
 	ldc.i4.s -7
 	add
 	stloc 7
-L_10931c8:
-// 0x010931c8: 0x10931c8: j	 0x10931f8 sw    v1, 80(sp)
+L_10937ec:
+// 0x010937ec: 0x10937ec: j	 0x109381c sw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6299,33 +6299,33 @@ L_10931c8:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10931f8
+	br L_109381c
 // --- basic block ---
-L_10931d0:
-// 0x010931d0: 0x10931d0: and   v1, v0, v1
+L_10937f4:
+// 0x010937f4: 0x10937f4: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x010931d4: 0x10931d4: beq   v1, zero, 0x10931f8 addiu a2, zero, -1
+// 0x010937f8: 0x10937f8: beq   v1, zero, 0x109381c addiu a2, zero, -1
 	ldloc 7
 	ldc.i4.m1
 	stloc.3
-	brfalse L_10931f8
+	brfalse L_109381c
 // --- basic block ---
-// 0x010931dc: 0x10931dc: lui   v1, 0x50000000
+// 0x01093800: 0x1093800: lui   v1, 0x50000000
 	ldc.i4 1342177280
 	stloc 7
-// 0x010931e0: 0x10931e0: and   v1, v0, v1
+// 0x01093804: 0x1093804: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x010931e4: 0x10931e4: bne   v1, zero, 0x10931f8 sll   zero, zero, 0
+// 0x01093808: 0x1093808: bne   v1, zero, 0x109381c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10931f8
+	brtrue L_109381c
 // --- basic block ---
-// 0x010931ec: 0x10931ec: lw    v1, 80(sp)
+// 0x01093810: 0x1093810: lw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6334,51 +6334,51 @@ L_10931d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010931f0: 0x10931f0: j	 0x10931c8 addiu v1, v1, -10
+// 0x01093814: 0x1093814: j	 0x10937ec addiu v1, v1, -10
 	ldloc 7
 	ldc.i4.s -10
 	add
 	stloc 7
-	br L_10931c8
+	br L_10937ec
 // --- basic block ---
-L_10931f8:
-// 0x010931f8: 0x10931f8: addiu v1, zero, 16
+L_109381c:
+// 0x0109381c: 0x109381c: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 7
-// 0x010931fc: 0x10931fc: beq   a1, v1, 0x1093208 lui   v1, 0x40000000
+// 0x01093820: 0x1093820: beq   a1, v1, 0x109382c lui   v1, 0x40000000
 	ldloc.2
 	ldloc 7
 	ldc.i4 1073741824
 	stloc 7
-	beq  L_1093208
+	beq  L_109382c
 // --- basic block ---
-// 0x01093204: 0x1093204: addiu a1, zero, -1
+// 0x01093828: 0x1093828: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-L_1093208:
-// 0x01093208: 0x1093208: and   v1, v0, v1
+L_109382c:
+// 0x0109382c: 0x109382c: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x0109320c: 0x109320c: bne   v1, zero, 0x1093220 lui   s2, 0x20000
+// 0x01093830: 0x1093830: bne   v1, zero, 0x1093844 lui   s2, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 9
-	brtrue L_1093220
+	brtrue L_1093844
 // --- basic block ---
-// 0x01093214: 0x1093214: addiu s2, s2, -3456
+// 0x01093838: 0x1093838: addiu s2, s2, -2992
 	ldloc 9
-	ldc.i4 -3456
+	ldc.i4 -2992
 	add
 	stloc 9
-// 0x01093218: 0x1093218: j	 0x1093254 addiu a0, zero, 8
+// 0x0109383c: 0x109383c: j	 0x1093878 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-	br L_1093254
+	br L_1093878
 // --- basic block ---
-L_1093220:
-// 0x01093220: 0x1093220: lw    v1, 60(s1)
+L_1093844:
+// 0x01093844: 0x1093844: lw    v1, 60(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6387,14 +6387,14 @@ L_1093220:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093224: 0x1093224: sll   zero, zero, 0
-// 0x01093228: 0x1093228: beq   v1, zero, 0x109324c lui   s2, 0x0
+// 0x01093848: 0x1093848: sll   zero, zero, 0
+// 0x0109384c: 0x109384c: beq   v1, zero, 0x1093870 lui   s2, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_109324c
+	brfalse L_1093870
 // --- basic block ---
-// 0x01093230: 0x1093230: lw    v1, 64(s1)
+// 0x01093854: 0x1093854: lw    v1, 64(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6403,47 +6403,47 @@ L_1093220:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093234: 0x1093234: sll   zero, zero, 0
-// 0x01093238: 0x1093238: beq   v1, zero, 0x109324c sll   zero, zero, 0
+// 0x01093858: 0x1093858: sll   zero, zero, 0
+// 0x0109385c: 0x109385c: beq   v1, zero, 0x1093870 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109324c
+	brfalse L_1093870
 // --- basic block ---
-// 0x01093240: 0x1093240: lui   s2, 0x20000
+// 0x01093864: 0x1093864: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01093244: 0x1093244: j	 0x1093250 addiu s2, s2, -3664
+// 0x01093868: 0x1093868: j	 0x1093874 addiu s2, s2, -3200
 	ldloc 9
-	ldc.i4 -3664
+	ldc.i4 -3200
 	add
 	stloc 9
-	br L_1093250
+	br L_1093874
 // --- basic block ---
-L_109324c:
-// 0x0109324c: 0x109324c: addiu s2, s2, 23008
+L_1093870:
+// 0x01093870: 0x1093870: addiu s2, s2, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc 9
-L_1093250:
-// 0x01093250: 0x1093250: addu  a0, zero, zero
+L_1093874:
+// 0x01093874: 0x1093874: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_1093254:
-// 0x01093254: 0x1093254: lui   v1, 0x10000000
+L_1093878:
+// 0x01093878: 0x1093878: lui   v1, 0x10000000
 	ldc.i4 268435456
 	stloc 7
-// 0x01093258: 0x1093258: and   v1, v0, v1
+// 0x0109387c: 0x109387c: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x0109325c: 0x109325c: beq   v1, zero, 0x109329c lui   v1, 0x800000
+// 0x01093880: 0x1093880: beq   v1, zero, 0x10938c0 lui   v1, 0x800000
 	ldloc 7
 	ldc.i4 8388608
 	stloc 7
-	brfalse L_109329c
+	brfalse L_10938c0
 // --- basic block ---
-// 0x01093264: 0x1093264: lw    v1, 60(s1)
+// 0x01093888: 0x1093888: lw    v1, 60(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6452,12 +6452,12 @@ L_1093254:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093268: 0x1093268: sll   zero, zero, 0
-// 0x0109326c: 0x109326c: beq   v1, zero, 0x109328c sll   zero, zero, 0
+// 0x0109388c: 0x109388c: sll   zero, zero, 0
+// 0x01093890: 0x1093890: beq   v1, zero, 0x10938b0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109328c
+	brfalse L_10938b0
 // --- basic block ---
-// 0x01093274: 0x1093274: lw    v1, 64(s1)
+// 0x01093898: 0x1093898: lw    v1, 64(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6466,49 +6466,49 @@ L_1093254:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093278: 0x1093278: sll   zero, zero, 0
-// 0x0109327c: 0x109327c: beq   v1, zero, 0x109328c lui   s2, 0x20000
+// 0x0109389c: 0x109389c: sll   zero, zero, 0
+// 0x010938a0: 0x10938a0: beq   v1, zero, 0x10938b0 lui   s2, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 9
-	brfalse L_109328c
+	brfalse L_10938b0
 // --- basic block ---
-// 0x01093284: 0x1093284: j	 0x1093294 addiu s2, s2, -3664
+// 0x010938a8: 0x10938a8: j	 0x10938b8 addiu s2, s2, -3200
 	ldloc 9
-	ldc.i4 -3664
+	ldc.i4 -3200
 	add
 	stloc 9
-	br L_1093294
+	br L_10938b8
 // --- basic block ---
-L_109328c:
-// 0x0109328c: 0x109328c: lui   s2, 0x0
+L_10938b0:
+// 0x010938b0: 0x10938b0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01093290: 0x1093290: addiu s2, s2, 31980
+// 0x010938b4: 0x10938b4: addiu s2, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc 9
-L_1093294:
-// 0x01093294: 0x1093294: addiu a0, zero, 8
+L_10938b8:
+// 0x010938b8: 0x10938b8: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x01093298: 0x1093298: lui   v1, 0x800000
+// 0x010938bc: 0x10938bc: lui   v1, 0x800000
 	ldc.i4 8388608
 	stloc 7
-L_109329c:
-// 0x0109329c: 0x109329c: and   v0, v0, v1
+L_10938c0:
+// 0x010938c0: 0x10938c0: and   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 5
-// 0x010932a0: 0x10932a0: beq   v0, zero, 0x10932c4 addu  v0, zero, zero
+// 0x010938c4: 0x10938c4: beq   v0, zero, 0x10938e8 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10932c4
+	brfalse L_10938e8
 // --- basic block ---
-// 0x010932a8: 0x10932a8: lw    v0, 116(s1)
+// 0x010938cc: 0x10938cc: lw    v0, 116(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6517,32 +6517,32 @@ L_109329c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010932ac: 0x10932ac: sll   zero, zero, 0
-// 0x010932b0: 0x10932b0: beq   v0, zero, 0x10932c0 sll   zero, zero, 0
+// 0x010938d0: 0x10938d0: sll   zero, zero, 0
+// 0x010938d4: 0x10938d4: beq   v0, zero, 0x10938e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10932c0
+	brfalse L_10938e4
 // --- basic block ---
-// 0x010932b8: 0x10932b8: j	 0x10932c4 addu  a2, zero, zero
+// 0x010938dc: 0x10938dc: j	 0x10938e8 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_10932c4
+	br L_10938e8
 // --- basic block ---
-L_10932c0:
-// 0x010932c0: 0x10932c0: addu  v0, zero, zero
+L_10938e4:
+// 0x010938e4: 0x10938e4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10932c4:
-// 0x010932c4: 0x10932c4: addiu v1, sp, 60
+L_10938e8:
+// 0x010938e8: 0x10938e8: addiu v1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 7
-// 0x010932c8: 0x10932c8: addiu a3, sp, 76
+// 0x010938ec: 0x10938ec: addiu a3, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 4
-// 0x010932cc: 0x10932cc: sw    v1, 16(sp)
+// 0x010938f0: 0x10938f0: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6551,7 +6551,7 @@ L_10932c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010932d0: 0x10932d0: sw    v0, 24(sp)
+// 0x010938f4: 0x10938f4: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6560,7 +6560,7 @@ L_10932c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010932d4: 0x10932d4: jal   0x10453c8 sw    s2, 20(sp)
+// 0x010938f8: 0x10938f8: jal   0x10453d8 sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6574,29 +6574,29 @@ L_10932c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_display_border_10453c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_display_border_10453d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010932dc: 0x10932dc: j	 0x10932f8 sll   zero, zero, 0
-	br L_10932f8
+// 0x01093900: 0x1093900: j	 0x109391c sll   zero, zero, 0
+	br L_109391c
 // --- basic block ---
-L_10932e4:
-// 0x010932e4: 0x10932e4: addiu a0, zero, 1
+L_1093908:
+// 0x01093908: 0x1093908: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010932e8: 0x10932e8: addiu a1, sp, 32
+// 0x0109390c: 0x109390c: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010932ec: 0x10932ec: addiu a2, sp, 60
+// 0x01093910: 0x1093910: addiu a2, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.3
-// 0x010932f0: 0x10932f0: jal   0x104f290 addiu a3, zero, 1
+// 0x01093914: 0x1093914: jal   0x104f2a0 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -6604,13 +6604,13 @@ L_10932e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f290(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f2a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10932f8:
-// 0x010932f8: 0x10932f8: lw    v0, 48(s1)
+L_109391c:
+// 0x0109391c: 0x109391c: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6619,35 +6619,35 @@ L_10932f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010932fc: 0x10932fc: sll   zero, zero, 0
-// 0x01093300: 0x1093300: andi  v1, v0, 16384
+// 0x01093920: 0x1093920: sll   zero, zero, 0
+// 0x01093924: 0x1093924: andi  v1, v0, 16384
 	ldloc 5
 	ldc.i4 16384
 	and
 	stloc 7
-// 0x01093304: 0x1093304: beq   v1, zero, 0x1093394 lui   v1, 0x40000000
+// 0x01093928: 0x1093928: beq   v1, zero, 0x10939b8 lui   v1, 0x40000000
 	ldloc 7
 	ldc.i4 1073741824
 	stloc 7
-	brfalse L_1093394
+	brfalse L_10939b8
 // --- basic block ---
-// 0x0109330c: 0x109330c: and   v1, v0, v1
+// 0x01093930: 0x1093930: and   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	and
 	stloc 7
-// 0x01093310: 0x1093310: lw    v0, 0(s0)
+// 0x01093934: 0x1093934: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01093314: 0x1093314: beq   v1, zero, 0x109334c sll   zero, zero, 0
+// 0x01093938: 0x1093938: beq   v1, zero, 0x1093970 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109334c
+	brfalse L_1093970
 // --- basic block ---
-// 0x0109331c: 0x109331c: lw    a1, 4(s0)
+// 0x01093940: 0x1093940: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6656,7 +6656,7 @@ L_10932f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01093320: 0x1093320: lw    a0, 8(s0)
+// 0x01093944: 0x1093944: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6665,7 +6665,7 @@ L_10932f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093324: 0x1093324: lw    v1, 12(s0)
+// 0x01093948: 0x1093948: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6674,34 +6674,34 @@ L_10932f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093328: 0x1093328: addiu v0, v0, 4
+// 0x0109394c: 0x109394c: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x0109332c: 0x109332c: addiu a1, a1, 4
+// 0x01093950: 0x1093950: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01093330: 0x1093330: addiu a0, a0, -4
+// 0x01093954: 0x1093954: addiu a0, a0, -4
 	ldloc.1
 	ldc.i4.s -4
 	add
 	stloc.1
-// 0x01093334: 0x1093334: addiu v1, v1, -4
+// 0x01093958: 0x1093958: addiu v1, v1, -4
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 7
-// 0x01093338: 0x1093338: sw    v0, 0(s0)
+// 0x0109395c: 0x109395c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0109333c: 0x109333c: sw    a1, 4(s0)
+// 0x01093960: 0x1093960: sw    a1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6710,7 +6710,7 @@ L_10932f8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01093340: 0x1093340: sw    a0, 8(s0)
+// 0x01093964: 0x1093964: sw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6719,7 +6719,7 @@ L_10932f8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01093344: 0x1093344: j	 0x10933c4 sw    v1, 12(s0)
+// 0x01093968: 0x1093968: j	 0x10939e8 sw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6728,22 +6728,22 @@ L_10932f8:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10933c4
+	br L_10939e8
 // --- basic block ---
-L_109334c:
-// 0x0109334c: 0x109334c: addiu v0, v0, 10
+L_1093970:
+// 0x01093970: 0x1093970: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x01093350: 0x1093350: sw    v0, 0(s0)
+// 0x01093974: 0x1093974: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01093354: 0x1093354: lw    v1, 48(s1)
+// 0x01093978: 0x1093978: lw    v1, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6752,20 +6752,20 @@ L_109334c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093358: 0x1093358: lui   v0, 0x5000000
+// 0x0109397c: 0x109397c: lui   v0, 0x5000000
 	ldc.i4 83886080
 	stloc 5
-// 0x0109335c: 0x109335c: ori   v0, v0, 8192
+// 0x01093980: 0x1093980: ori   v0, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	or
 	stloc 5
-// 0x01093360: 0x1093360: and   v0, v1, v0
+// 0x01093984: 0x1093984: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01093364: 0x1093364: lw    t0, 4(s0)
+// 0x01093988: 0x1093988: lw    t0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6774,25 +6774,25 @@ L_109334c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01093368: 0x1093368: beq   v0, zero, 0x1093378 sll   zero, zero, 0
+// 0x0109398c: 0x109398c: beq   v0, zero, 0x109399c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1093378
+	brfalse L_109399c
 // --- basic block ---
-// 0x01093370: 0x1093370: j	 0x109337c addiu t0, t0, 10
+// 0x01093994: 0x1093994: j	 0x10939a0 addiu t0, t0, 10
 	ldloc 12
 	ldc.i4.s 10
 	add
 	stloc 12
-	br L_109337c
+	br L_10939a0
 // --- basic block ---
-L_1093378:
-// 0x01093378: 0x1093378: addiu t0, t0, 4
+L_109399c:
+// 0x0109399c: 0x109399c: addiu t0, t0, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-L_109337c:
-// 0x0109337c: 0x109337c: lw    v1, 8(s0)
+L_10939a0:
+// 0x010939a0: 0x10939a0: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6801,7 +6801,7 @@ L_109337c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093380: 0x1093380: lw    v0, 12(s0)
+// 0x010939a4: 0x10939a4: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6810,7 +6810,7 @@ L_109337c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093384: 0x1093384: sw    t0, 4(s0)
+// 0x010939a8: 0x10939a8: sw    t0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6819,27 +6819,27 @@ L_109337c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01093388: 0x1093388: addiu v1, v1, -10
+// 0x010939ac: 0x10939ac: addiu v1, v1, -10
 	ldloc 7
 	ldc.i4.s -10
 	add
 	stloc 7
-// 0x0109338c: 0x109338c: j	 0x10933bc addiu v0, v0, -10
+// 0x010939b0: 0x10939b0: j	 0x10939e0 addiu v0, v0, -10
 	ldloc 5
 	ldc.i4.s -10
 	add
 	stloc 5
-	br L_10933bc
+	br L_10939e0
 // --- basic block ---
-L_1093394:
-// 0x01093394: 0x1093394: lw    a1, 0(s0)
+L_10939b8:
+// 0x010939b8: 0x10939b8: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01093398: 0x1093398: lw    a0, 4(s0)
+// 0x010939bc: 0x10939bc: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6848,7 +6848,7 @@ L_1093394:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109339c: 0x109339c: lw    v1, 8(s0)
+// 0x010939c0: 0x10939c0: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6857,7 +6857,7 @@ L_1093394:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010933a0: 0x10933a0: lw    v0, 12(s0)
+// 0x010939c4: 0x10939c4: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6866,34 +6866,34 @@ L_1093394:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010933a4: 0x10933a4: addiu a1, a1, 2
+// 0x010939c8: 0x10939c8: addiu a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	add
 	stloc.2
-// 0x010933a8: 0x10933a8: addiu a0, a0, 2
+// 0x010939cc: 0x10939cc: addiu a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	add
 	stloc.1
-// 0x010933ac: 0x10933ac: addiu v1, v1, -2
+// 0x010939d0: 0x10939d0: addiu v1, v1, -2
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc 7
-// 0x010933b0: 0x10933b0: addiu v0, v0, -2
+// 0x010939d4: 0x10939d4: addiu v0, v0, -2
 	ldloc 5
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x010933b4: 0x10933b4: sw    a1, 0(s0)
+// 0x010939d8: 0x10939d8: sw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010933b8: 0x10933b8: sw    a0, 4(s0)
+// 0x010939dc: 0x10939dc: sw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6902,8 +6902,8 @@ L_1093394:
 	add
 	ldloc.1
 	stelem.i4
-L_10933bc:
-// 0x010933bc: 0x10933bc: sw    v1, 8(s0)
+L_10939e0:
+// 0x010939e0: 0x10939e0: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6912,7 +6912,7 @@ L_10933bc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010933c0: 0x10933c0: sw    v0, 12(s0)
+// 0x010939e4: 0x10939e4: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6921,8 +6921,8 @@ L_10933bc:
 	add
 	ldloc 5
 	stelem.i4
-L_10933c4:
-// 0x010933c4: 0x10933c4: lw    v1, 48(s1)
+L_10939e8:
+// 0x010939e8: 0x10939e8: lw    v1, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6931,36 +6931,36 @@ L_10933c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010933c8: 0x10933c8: lui   v0, 0x20000000
+// 0x010939ec: 0x10939ec: lui   v0, 0x20000000
 	ldc.i4 536870912
 	stloc 5
-// 0x010933cc: 0x10933cc: and   v0, v1, v0
+// 0x010939f0: 0x10939f0: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x010933d0: 0x10933d0: beq   v0, zero, 0x1093674 sll   zero, zero, 0
+// 0x010939f4: 0x10939f4: beq   v0, zero, 0x1093c98 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1093674
+	brfalse L_1093c98
 // --- basic block ---
-// 0x010933d8: 0x10933d8: bne   s3, zero, 0x1093644 sll   zero, zero, 0
+// 0x010939fc: 0x10939fc: bne   s3, zero, 0x1093c68 sll   zero, zero, 0
 	ldloc 17
-	brtrue L_1093644
+	brtrue L_1093c68
 // --- basic block ---
-// 0x010933e0: 0x10933e0: beq   s2, zero, 0x1093400 lui   s4, 0x80000
+// 0x01093a04: 0x1093a04: beq   s2, zero, 0x1093a24 lui   s4, 0x80000
 	ldloc 9
 	ldc.i4 524288
 	stloc 10
-	brfalse L_1093400
+	brfalse L_1093a24
 // --- basic block ---
-// 0x010933e8: 0x10933e8: lw    v1, 0(s0)
+// 0x01093a0c: 0x1093a0c: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010933ec: 0x10933ec: lw    v0, 8(s0)
+// 0x01093a10: 0x1093a10: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6969,24 +6969,24 @@ L_10933c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010933f0: 0x10933f0: addiu v1, v1, -10
+// 0x01093a14: 0x1093a14: addiu v1, v1, -10
 	ldloc 7
 	ldc.i4.s -10
 	add
 	stloc 7
-// 0x010933f4: 0x10933f4: addiu v0, v0, 10
+// 0x01093a18: 0x1093a18: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x010933f8: 0x10933f8: sw    v1, 0(s0)
+// 0x01093a1c: 0x1093a1c: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010933fc: 0x10933fc: sw    v0, 8(s0)
+// 0x01093a20: 0x1093a20: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6995,32 +6995,32 @@ L_10933c4:
 	add
 	ldloc 5
 	stelem.i4
-L_1093400:
-// 0x01093400: 0x1093400: lw    v0, 9608(s4)
+L_1093a24:
+// 0x01093a24: 0x1093a24: lw    v0, 10072(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2402
+	ldc.i4 2518
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093404: 0x1093404: sll   zero, zero, 0
-// 0x01093408: 0x1093408: bne   v0, zero, 0x1093424 lui   a2, 0x20000
+// 0x01093a28: 0x1093a28: sll   zero, zero, 0
+// 0x01093a2c: 0x1093a2c: bne   v0, zero, 0x1093a48 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_1093424
+	brtrue L_1093a48
 // --- basic block ---
-// 0x01093410: 0x1093410: addiu a2, a2, -3448
+// 0x01093a34: 0x1093a34: addiu a2, a2, -2984
 	ldloc.3
-	ldc.i4 -3448
+	ldc.i4 -2984
 	add
 	stloc.3
-// 0x01093414: 0x1093414: addu  a0, zero, zero
+// 0x01093a38: 0x1093a38: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01093418: 0x1093418: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093a3c: 0x1093a3c: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7028,49 +7028,49 @@ L_1093400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093420: 0x1093420: sw    v0, 9608(s4)
+// 0x01093a44: 0x1093a44: sw    v0, 10072(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2402
+	ldc.i4 2518
 	add
 	ldloc 5
 	stelem.i4
-L_1093424:
-// 0x01093424: 0x1093424: lui   s4, 0x80000
+L_1093a48:
+// 0x01093a48: 0x1093a48: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01093428: 0x1093428: lw    v0, 9600(s4)
+// 0x01093a4c: 0x1093a4c: lw    v0, 10064(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2400
+	ldc.i4 2516
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109342c: 0x109342c: sll   zero, zero, 0
-// 0x01093430: 0x1093430: bne   v0, zero, 0x109344c lui   a2, 0x20000
+// 0x01093a50: 0x1093a50: sll   zero, zero, 0
+// 0x01093a54: 0x1093a54: bne   v0, zero, 0x1093a70 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_109344c
+	brtrue L_1093a70
 // --- basic block ---
-// 0x01093438: 0x1093438: addiu a2, a2, -3436
+// 0x01093a5c: 0x1093a5c: addiu a2, a2, -2972
 	ldloc.3
-	ldc.i4 -3436
+	ldc.i4 -2972
 	add
 	stloc.3
-// 0x0109343c: 0x109343c: addu  a0, zero, zero
+// 0x01093a60: 0x1093a60: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01093440: 0x1093440: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093a64: 0x1093a64: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7078,49 +7078,49 @@ L_1093424:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093448: 0x1093448: sw    v0, 9600(s4)
+// 0x01093a6c: 0x1093a6c: sw    v0, 10064(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2400
+	ldc.i4 2516
 	add
 	ldloc 5
 	stelem.i4
-L_109344c:
-// 0x0109344c: 0x109344c: lui   s4, 0x80000
+L_1093a70:
+// 0x01093a70: 0x1093a70: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01093450: 0x1093450: lw    v0, 9604(s4)
+// 0x01093a74: 0x1093a74: lw    v0, 10068(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2401
+	ldc.i4 2517
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093454: 0x1093454: sll   zero, zero, 0
-// 0x01093458: 0x1093458: bne   v0, zero, 0x1093474 lui   a2, 0x20000
+// 0x01093a78: 0x1093a78: sll   zero, zero, 0
+// 0x01093a7c: 0x1093a7c: bne   v0, zero, 0x1093a98 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_1093474
+	brtrue L_1093a98
 // --- basic block ---
-// 0x01093460: 0x1093460: addiu a2, a2, -3420
+// 0x01093a84: 0x1093a84: addiu a2, a2, -2956
 	ldloc.3
-	ldc.i4 -3420
+	ldc.i4 -2956
 	add
 	stloc.3
-// 0x01093464: 0x1093464: addu  a0, zero, zero
+// 0x01093a88: 0x1093a88: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01093468: 0x1093468: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093a8c: 0x1093a8c: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7128,49 +7128,49 @@ L_109344c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093470: 0x1093470: sw    v0, 9604(s4)
+// 0x01093a94: 0x1093a94: sw    v0, 10068(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2401
+	ldc.i4 2517
 	add
 	ldloc 5
 	stelem.i4
-L_1093474:
-// 0x01093474: 0x1093474: lui   s4, 0x80000
+L_1093a98:
+// 0x01093a98: 0x1093a98: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01093478: 0x1093478: lw    v0, 9596(s4)
+// 0x01093a9c: 0x1093a9c: lw    v0, 10060(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2399
+	ldc.i4 2515
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109347c: 0x109347c: sll   zero, zero, 0
-// 0x01093480: 0x1093480: bne   v0, zero, 0x109349c lui   a2, 0x20000
+// 0x01093aa0: 0x1093aa0: sll   zero, zero, 0
+// 0x01093aa4: 0x1093aa4: bne   v0, zero, 0x1093ac0 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_109349c
+	brtrue L_1093ac0
 // --- basic block ---
-// 0x01093488: 0x1093488: addiu a2, a2, -3404
+// 0x01093aac: 0x1093aac: addiu a2, a2, -2940
 	ldloc.3
-	ldc.i4 -3404
+	ldc.i4 -2940
 	add
 	stloc.3
-// 0x0109348c: 0x109348c: addu  a0, zero, zero
+// 0x01093ab0: 0x1093ab0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01093490: 0x1093490: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093ab4: 0x1093ab4: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7178,49 +7178,49 @@ L_1093474:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093498: 0x1093498: sw    v0, 9596(s4)
+// 0x01093abc: 0x1093abc: sw    v0, 10060(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2399
+	ldc.i4 2515
 	add
 	ldloc 5
 	stelem.i4
-L_109349c:
-// 0x0109349c: 0x109349c: lui   s4, 0x80000
+L_1093ac0:
+// 0x01093ac0: 0x1093ac0: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x010934a0: 0x10934a0: lw    v0, 9588(s4)
+// 0x01093ac4: 0x1093ac4: lw    v0, 10052(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2397
+	ldc.i4 2513
 	add
 	ldelem.i4
 	stloc 5
-// 0x010934a4: 0x10934a4: sll   zero, zero, 0
-// 0x010934a8: 0x10934a8: bne   v0, zero, 0x10934c4 lui   a2, 0x20000
+// 0x01093ac8: 0x1093ac8: sll   zero, zero, 0
+// 0x01093acc: 0x1093acc: bne   v0, zero, 0x1093ae8 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_10934c4
+	brtrue L_1093ae8
 // --- basic block ---
-// 0x010934b0: 0x10934b0: addiu a2, a2, -3380
+// 0x01093ad4: 0x1093ad4: addiu a2, a2, -2916
 	ldloc.3
-	ldc.i4 -3380
+	ldc.i4 -2916
 	add
 	stloc.3
-// 0x010934b4: 0x10934b4: addu  a0, zero, zero
+// 0x01093ad8: 0x1093ad8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010934b8: 0x10934b8: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093adc: 0x1093adc: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7228,49 +7228,49 @@ L_109349c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010934c0: 0x10934c0: sw    v0, 9588(s4)
+// 0x01093ae4: 0x1093ae4: sw    v0, 10052(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2397
+	ldc.i4 2513
 	add
 	ldloc 5
 	stelem.i4
-L_10934c4:
-// 0x010934c4: 0x10934c4: lui   s4, 0x80000
+L_1093ae8:
+// 0x01093ae8: 0x1093ae8: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x010934c8: 0x10934c8: lw    v0, 9592(s4)
+// 0x01093aec: 0x1093aec: lw    v0, 10056(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2398
+	ldc.i4 2514
 	add
 	ldelem.i4
 	stloc 5
-// 0x010934cc: 0x10934cc: sll   zero, zero, 0
-// 0x010934d0: 0x10934d0: bne   v0, zero, 0x10934ec lui   a2, 0x20000
+// 0x01093af0: 0x1093af0: sll   zero, zero, 0
+// 0x01093af4: 0x1093af4: bne   v0, zero, 0x1093b10 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_10934ec
+	brtrue L_1093b10
 // --- basic block ---
-// 0x010934d8: 0x10934d8: addiu a2, a2, -3356
+// 0x01093afc: 0x1093afc: addiu a2, a2, -2892
 	ldloc.3
-	ldc.i4 -3356
+	ldc.i4 -2892
 	add
 	stloc.3
-// 0x010934dc: 0x10934dc: addu  a0, zero, zero
+// 0x01093b00: 0x1093b00: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010934e0: 0x10934e0: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093b04: 0x1093b04: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7278,22 +7278,22 @@ L_10934c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010934e8: 0x10934e8: sw    v0, 9592(s4)
+// 0x01093b0c: 0x1093b0c: sw    v0, 10056(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2398
+	ldc.i4 2514
 	add
 	ldloc 5
 	stelem.i4
-L_10934ec:
-// 0x010934ec: 0x10934ec: lw    v0, 60(s1)
+L_1093b10:
+// 0x01093b10: 0x1093b10: lw    v0, 60(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7302,14 +7302,14 @@ L_10934ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010934f0: 0x10934f0: sll   zero, zero, 0
-// 0x010934f4: 0x10934f4: beq   v0, zero, 0x1093530 lui   v0, 0x80000
+// 0x01093b14: 0x1093b14: sll   zero, zero, 0
+// 0x01093b18: 0x1093b18: beq   v0, zero, 0x1093b54 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1093530
+	brfalse L_1093b54
 // --- basic block ---
-// 0x010934fc: 0x10934fc: lw    v0, 64(s1)
+// 0x01093b20: 0x1093b20: lw    v0, 64(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7318,95 +7318,95 @@ L_10934ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093500: 0x1093500: sll   zero, zero, 0
-// 0x01093504: 0x1093504: beq   v0, zero, 0x109352c sll   zero, zero, 0
+// 0x01093b24: 0x1093b24: sll   zero, zero, 0
+// 0x01093b28: 0x1093b28: beq   v0, zero, 0x1093b50 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109352c
+	brfalse L_1093b50
 // --- basic block ---
-// 0x0109350c: 0x109350c: lui   v0, 0x80000
+// 0x01093b30: 0x1093b30: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093510: 0x1093510: lw    v1, 9596(v0)
+// 0x01093b34: 0x1093b34: lw    v1, 10060(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2399
+	ldc.i4 2515
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093514: 0x1093514: lui   v0, 0x80000
+// 0x01093b38: 0x1093b38: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093518: 0x1093518: lw    s5, 9588(v0)
+// 0x01093b3c: 0x1093b3c: lw    s5, 10052(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2397
+	ldc.i4 2513
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109351c: 0x109351c: lui   v0, 0x80000
+// 0x01093b40: 0x1093b40: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093520: 0x1093520: lw    s6, 9592(v0)
+// 0x01093b44: 0x1093b44: lw    s6, 10056(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2398
+	ldc.i4 2514
 	add
 	ldelem.i4
 	stloc 18
-// 0x01093524: 0x1093524: j	 0x1093548 addu  a0, v1, zero
+// 0x01093b48: 0x1093b48: j	 0x1093b6c addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-	br L_1093548
+	br L_1093b6c
 // --- basic block ---
-L_109352c:
-// 0x0109352c: 0x109352c: lui   v0, 0x80000
+L_1093b50:
+// 0x01093b50: 0x1093b50: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1093530:
-// 0x01093530: 0x1093530: lw    v1, 9608(v0)
+L_1093b54:
+// 0x01093b54: 0x1093b54: lw    v1, 10072(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2402
+	ldc.i4 2518
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093534: 0x1093534: lui   v0, 0x80000
+// 0x01093b58: 0x1093b58: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093538: 0x1093538: lw    s5, 9600(v0)
+// 0x01093b5c: 0x1093b5c: lw    s5, 10064(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2400
+	ldc.i4 2516
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109353c: 0x109353c: lui   v0, 0x80000
+// 0x01093b60: 0x1093b60: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093540: 0x1093540: lw    s6, 9604(v0)
+// 0x01093b64: 0x1093b64: lw    s6, 10068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2401
+	ldc.i4 2517
 	add
 	ldelem.i4
 	stloc 18
-// 0x01093544: 0x1093544: addu  a0, v1, zero
+// 0x01093b68: 0x1093b68: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-L_1093548:
-// 0x01093548: 0x1093548: jal   0x104dffc sw    v1, 116(sp)
+L_1093b6c:
+// 0x01093b6c: 0x1093b6c: jal   0x104e00c sw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7416,36 +7416,36 @@ L_1093548:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093550: 0x1093550: addu  a0, s5, zero
+// 0x01093b74: 0x1093b74: addu  a0, s5, zero
 	ldloc 15
 	stloc.1
-// 0x01093554: 0x1093554: jal   0x104dffc addu  s8, v0, zero
+// 0x01093b78: 0x1093b78: jal   0x104e00c addu  s8, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109355c: 0x109355c: addu  a0, s6, zero
+// 0x01093b80: 0x1093b80: addu  a0, s6, zero
 	ldloc 18
 	stloc.1
-// 0x01093560: 0x1093560: jal   0x104dffc addu  s4, v0, zero
+// 0x01093b84: 0x1093b84: jal   0x104e00c addu  s4, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093568: 0x1093568: lw    v1, 116(sp)
+// 0x01093b8c: 0x1093b8c: lw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7454,19 +7454,19 @@ L_1093548:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109356c: 0x109356c: lw    t2, 0(s0)
+// 0x01093b90: 0x1093b90: lw    t2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x01093570: 0x1093570: addiu t1, sp, 52
+// 0x01093b94: 0x1093b94: addiu t1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 16
-// 0x01093574: 0x1093574: lw    t0, 4(s0)
+// 0x01093b98: 0x1093b98: lw    t0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7475,19 +7475,19 @@ L_1093548:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01093578: 0x1093578: addu  a0, v1, zero
+// 0x01093b9c: 0x1093b9c: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0109357c: 0x109357c: addu  a1, t1, zero
+// 0x01093ba0: 0x1093ba0: addu  a1, t1, zero
 	ldloc 16
 	stloc.2
-// 0x01093580: 0x1093580: addu  a2, zero, zero
+// 0x01093ba4: 0x1093ba4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01093584: 0x1093584: addu  a3, zero, zero
+// 0x01093ba8: 0x1093ba8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01093588: 0x1093588: sw    t2, 52(sp)
+// 0x01093bac: 0x1093bac: sw    t2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7496,7 +7496,7 @@ L_1093548:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109358c: 0x109358c: sw    v0, 112(sp)
+// 0x01093bb0: 0x1093bb0: sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7505,7 +7505,7 @@ L_1093548:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093590: 0x1093590: sw    t1, 108(sp)
+// 0x01093bb4: 0x1093bb4: sw    t1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7514,7 +7514,7 @@ L_1093548:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01093594: 0x1093594: jal   0x104f4a8 sw    t0, 56(sp)
+// 0x01093bb8: 0x1093bb8: jal   0x104f4b8 sw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7528,19 +7528,19 @@ L_1093548:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109359c: 0x109359c: lw    v1, 0(s0)
+// 0x01093bc0: 0x1093bc0: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010935a0: 0x10935a0: lw    t2, 8(s0)
+// 0x01093bc4: 0x1093bc4: lw    t2, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7549,7 +7549,7 @@ L_1093548:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010935a4: 0x10935a4: lw    v0, 112(sp)
+// 0x01093bc8: 0x1093bc8: lw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7558,27 +7558,27 @@ L_1093548:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010935a8: 0x10935a8: subu  t2, t2, v1
+// 0x01093bcc: 0x1093bcc: subu  t2, t2, v1
 	ldloc 14
 	ldloc 7
 	sub
 	stloc 14
-// 0x010935ac: 0x10935ac: subu  t2, t2, s4
+// 0x01093bd0: 0x1093bd0: subu  t2, t2, s4
 	ldloc 14
 	ldloc 10
 	sub
 	stloc 14
-// 0x010935b0: 0x10935b0: subu  s8, t2, s8
+// 0x01093bd4: 0x1093bd4: subu  s8, t2, s8
 	ldloc 14
 	ldloc 13
 	sub
 	stloc 13
-// 0x010935b4: 0x10935b4: div   s8, v0
+// 0x01093bd8: 0x1093bd8: div   s8, v0
 	ldloc 13
 	ldloc 5
 	div
 	stloc 22
-// 0x010935b8: 0x10935b8: lw    t1, 108(sp)
+// 0x01093bdc: 0x1093bdc: lw    t1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7587,26 +7587,26 @@ L_1093548:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010935bc: 0x10935bc: addu  v1, zero, zero
+// 0x01093be0: 0x1093be0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010935c0: 0x10935c0: mflo  lo
+// 0x01093be4: 0x1093be4: mflo  lo
 	ldloc 22
 	stloc 14
-// 0x010935c4: 0x10935c4: j	 0x1093604 addu  s8, zero, zero
+// 0x01093be8: 0x1093be8: j	 0x1093c28 addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_1093604
+	br L_1093c28
 // --- basic block ---
-L_10935cc:
-// 0x010935cc: 0x10935cc: lw    t3, 0(s0)
+L_1093bf0:
+// 0x01093bf0: 0x1093bf0: lw    t3, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 20
-// 0x010935d0: 0x10935d0: sw    t0, 56(sp)
+// 0x01093bf4: 0x1093bf4: sw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7615,17 +7615,17 @@ L_10935cc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010935d4: 0x10935d4: addu  t0, s4, t3
+// 0x01093bf8: 0x1093bf8: addu  t0, s4, t3
 	ldloc 10
 	ldloc 20
 	add
 	stloc 12
-// 0x010935d8: 0x10935d8: addu  t4, t0, t4
+// 0x01093bfc: 0x1093bfc: addu  t4, t0, t4
 	ldloc 12
 	ldloc 21
 	add
 	stloc 21
-// 0x010935dc: 0x10935dc: sw    v0, 112(sp)
+// 0x01093c00: 0x1093c00: sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7634,7 +7634,7 @@ L_10935cc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010935e0: 0x10935e0: sw    v1, 116(sp)
+// 0x01093c04: 0x1093c04: sw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7643,7 +7643,7 @@ L_10935cc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010935e4: 0x10935e4: sw    t1, 108(sp)
+// 0x01093c08: 0x1093c08: sw    t1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7652,7 +7652,7 @@ L_10935cc:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010935e8: 0x10935e8: sw    t2, 104(sp)
+// 0x01093c0c: 0x1093c0c: sw    t2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7661,7 +7661,7 @@ L_10935cc:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010935ec: 0x10935ec: jal   0x104f4a8 sw    t4, 52(sp)
+// 0x01093c10: 0x1093c10: jal   0x104f4b8 sw    t4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7675,12 +7675,12 @@ L_10935cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010935f4: 0x10935f4: lw    t2, 104(sp)
+// 0x01093c18: 0x1093c18: lw    t2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7689,7 +7689,7 @@ L_10935cc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010935f8: 0x10935f8: lw    t1, 108(sp)
+// 0x01093c1c: 0x1093c1c: lw    t1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7698,7 +7698,7 @@ L_10935cc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010935fc: 0x10935fc: lw    v1, 116(sp)
+// 0x01093c20: 0x1093c20: lw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7707,7 +7707,7 @@ L_10935cc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093600: 0x1093600: lw    v0, 112(sp)
+// 0x01093c24: 0x1093c24: lw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7716,35 +7716,35 @@ L_10935cc:
 	add
 	ldelem.i4
 	stloc 5
-L_1093604:
-// 0x01093604: 0x1093604: slt   t3, s8, t2
+L_1093c28:
+// 0x01093c28: 0x1093c28: slt   t3, s8, t2
 	ldloc 13
 	ldloc 14
 	clt
 	stloc 20
-// 0x01093608: 0x1093608: addu  v1, v1, v0
+// 0x01093c2c: 0x1093c2c: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0109360c: 0x109360c: addu  a0, s6, zero
+// 0x01093c30: 0x1093c30: addu  a0, s6, zero
 	ldloc 18
 	stloc.1
-// 0x01093610: 0x1093610: addu  a1, t1, zero
+// 0x01093c34: 0x1093c34: addu  a1, t1, zero
 	ldloc 16
 	stloc.2
-// 0x01093614: 0x1093614: addu  a2, zero, zero
+// 0x01093c38: 0x1093c38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01093618: 0x1093618: addu  a3, zero, zero
+// 0x01093c3c: 0x1093c3c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109361c: 0x109361c: subu  t4, v1, v0
+// 0x01093c40: 0x1093c40: subu  t4, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 21
-// 0x01093620: 0x1093620: lw    t0, 4(s0)
+// 0x01093c44: 0x1093c44: lw    t0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7753,15 +7753,15 @@ L_1093604:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01093624: 0x1093624: bne   t3, zero, 0x10935cc addiu s8, s8, 1
+// 0x01093c48: 0x1093c48: bne   t3, zero, 0x1093bf0 addiu s8, s8, 1
 	ldloc 20
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	brtrue L_10935cc
+	brtrue L_1093bf0
 // --- basic block ---
-// 0x0109362c: 0x109362c: lw    v0, 8(s0)
+// 0x01093c50: 0x1093c50: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7770,15 +7770,15 @@ L_1093604:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093630: 0x1093630: addu  a0, s5, zero
+// 0x01093c54: 0x1093c54: addu  a0, s5, zero
 	ldloc 15
 	stloc.1
-// 0x01093634: 0x1093634: subu  s4, v0, s4
+// 0x01093c58: 0x1093c58: subu  s4, v0, s4
 	ldloc 5
 	ldloc 10
 	sub
 	stloc 10
-// 0x01093638: 0x1093638: sw    s4, 52(sp)
+// 0x01093c5c: 0x1093c5c: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7787,7 +7787,7 @@ L_1093604:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109363c: 0x109363c: jal   0x104f4a8 sw    t0, 56(sp)
+// 0x01093c60: 0x1093c60: jal   0x104f4b8 sw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7801,20 +7801,20 @@ L_1093604:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1093644:
-// 0x01093644: 0x1093644: lw    a1, 0(s0)
+L_1093c68:
+// 0x01093c68: 0x1093c68: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01093648: 0x1093648: lw    a0, 4(s0)
+// 0x01093c6c: 0x1093c6c: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7823,7 +7823,7 @@ L_1093644:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109364c: 0x109364c: lw    v1, 8(s0)
+// 0x01093c70: 0x1093c70: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7832,7 +7832,7 @@ L_1093644:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093650: 0x1093650: lw    v0, 12(s0)
+// 0x01093c74: 0x1093c74: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7841,34 +7841,34 @@ L_1093644:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093654: 0x1093654: addiu a1, a1, 20
+// 0x01093c78: 0x1093c78: addiu a1, a1, 20
 	ldloc.2
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x01093658: 0x1093658: addiu a0, a0, 10
+// 0x01093c7c: 0x1093c7c: addiu a0, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	add
 	stloc.1
-// 0x0109365c: 0x109365c: addiu v1, v1, -20
+// 0x01093c80: 0x1093c80: addiu v1, v1, -20
 	ldloc 7
 	ldc.i4.s -20
 	add
 	stloc 7
-// 0x01093660: 0x1093660: addiu v0, v0, -10
+// 0x01093c84: 0x1093c84: addiu v0, v0, -10
 	ldloc 5
 	ldc.i4.s -10
 	add
 	stloc 5
-// 0x01093664: 0x1093664: sw    a1, 0(s0)
+// 0x01093c88: 0x1093c88: sw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01093668: 0x1093668: sw    a0, 4(s0)
+// 0x01093c8c: 0x1093c8c: sw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7877,7 +7877,7 @@ L_1093644:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109366c: 0x109366c: sw    v1, 8(s0)
+// 0x01093c90: 0x1093c90: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7886,7 +7886,7 @@ L_1093644:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01093670: 0x1093670: sw    v0, 12(s0)
+// 0x01093c94: 0x1093c94: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7895,8 +7895,8 @@ L_1093644:
 	add
 	ldloc 5
 	stelem.i4
-L_1093674:
-// 0x01093674: 0x1093674: lw    v0, 48(s1)
+L_1093c98:
+// 0x01093c98: 0x1093c98: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7905,30 +7905,30 @@ L_1093674:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093678: 0x1093678: sll   zero, zero, 0
-// 0x0109367c: 0x109367c: bgez  v0, 0x1093858 sll   zero, zero, 0
+// 0x01093c9c: 0x1093c9c: sll   zero, zero, 0
+// 0x01093ca0: 0x1093ca0: bgez  v0, 0x1093e7c sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1093858
+	bge L_1093e7c
 // --- basic block ---
-// 0x01093684: 0x1093684: bne   s3, zero, 0x1093820 sll   zero, zero, 0
+// 0x01093ca8: 0x1093ca8: bne   s3, zero, 0x1093e44 sll   zero, zero, 0
 	ldloc 17
-	brtrue L_1093820
+	brtrue L_1093e44
 // --- basic block ---
-// 0x0109368c: 0x109368c: beq   s2, zero, 0x10936ac lui   s2, 0x80000
+// 0x01093cb0: 0x1093cb0: beq   s2, zero, 0x1093cd0 lui   s2, 0x80000
 	ldloc 9
 	ldc.i4 524288
 	stloc 9
-	brfalse L_10936ac
+	brfalse L_1093cd0
 // --- basic block ---
-// 0x01093694: 0x1093694: lw    v1, 0(s0)
+// 0x01093cb8: 0x1093cb8: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01093698: 0x1093698: lw    v0, 8(s0)
+// 0x01093cbc: 0x1093cbc: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7937,24 +7937,24 @@ L_1093674:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109369c: 0x109369c: addiu v1, v1, -10
+// 0x01093cc0: 0x1093cc0: addiu v1, v1, -10
 	ldloc 7
 	ldc.i4.s -10
 	add
 	stloc 7
-// 0x010936a0: 0x10936a0: addiu v0, v0, 10
+// 0x01093cc4: 0x1093cc4: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x010936a4: 0x10936a4: sw    v1, 0(s0)
+// 0x01093cc8: 0x1093cc8: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010936a8: 0x10936a8: sw    v0, 8(s0)
+// 0x01093ccc: 0x1093ccc: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7963,32 +7963,32 @@ L_1093674:
 	add
 	ldloc 5
 	stelem.i4
-L_10936ac:
-// 0x010936ac: 0x10936ac: lw    v0, 9620(s2)
+L_1093cd0:
+// 0x01093cd0: 0x1093cd0: lw    v0, 10084(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2405
+	ldc.i4 2521
 	add
 	ldelem.i4
 	stloc 5
-// 0x010936b0: 0x10936b0: sll   zero, zero, 0
-// 0x010936b4: 0x10936b4: bne   v0, zero, 0x10936d0 lui   a2, 0x20000
+// 0x01093cd4: 0x1093cd4: sll   zero, zero, 0
+// 0x01093cd8: 0x1093cd8: bne   v0, zero, 0x1093cf4 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_10936d0
+	brtrue L_1093cf4
 // --- basic block ---
-// 0x010936bc: 0x10936bc: addiu a2, a2, -3332
+// 0x01093ce0: 0x1093ce0: addiu a2, a2, -2868
 	ldloc.3
-	ldc.i4 -3332
+	ldc.i4 -2868
 	add
 	stloc.3
-// 0x010936c0: 0x10936c0: addu  a0, zero, zero
+// 0x01093ce4: 0x1093ce4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010936c4: 0x10936c4: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093ce8: 0x1093ce8: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7996,49 +7996,49 @@ L_10936ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010936cc: 0x10936cc: sw    v0, 9620(s2)
+// 0x01093cf0: 0x1093cf0: sw    v0, 10084(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2405
+	ldc.i4 2521
 	add
 	ldloc 5
 	stelem.i4
-L_10936d0:
-// 0x010936d0: 0x10936d0: lui   s2, 0x80000
+L_1093cf4:
+// 0x01093cf4: 0x1093cf4: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x010936d4: 0x10936d4: lw    v0, 9612(s2)
+// 0x01093cf8: 0x1093cf8: lw    v0, 10076(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2403
+	ldc.i4 2519
 	add
 	ldelem.i4
 	stloc 5
-// 0x010936d8: 0x10936d8: sll   zero, zero, 0
-// 0x010936dc: 0x10936dc: bne   v0, zero, 0x10936f8 lui   a2, 0x20000
+// 0x01093cfc: 0x1093cfc: sll   zero, zero, 0
+// 0x01093d00: 0x1093d00: bne   v0, zero, 0x1093d1c lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_10936f8
+	brtrue L_1093d1c
 // --- basic block ---
-// 0x010936e4: 0x10936e4: addiu a2, a2, -3316
+// 0x01093d08: 0x1093d08: addiu a2, a2, -2852
 	ldloc.3
-	ldc.i4 -3316
+	ldc.i4 -2852
 	add
 	stloc.3
-// 0x010936e8: 0x10936e8: addu  a0, zero, zero
+// 0x01093d0c: 0x1093d0c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010936ec: 0x10936ec: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093d10: 0x1093d10: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -8046,49 +8046,49 @@ L_10936d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010936f4: 0x10936f4: sw    v0, 9612(s2)
+// 0x01093d18: 0x1093d18: sw    v0, 10076(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2403
+	ldc.i4 2519
 	add
 	ldloc 5
 	stelem.i4
-L_10936f8:
-// 0x010936f8: 0x10936f8: lui   s2, 0x80000
+L_1093d1c:
+// 0x01093d1c: 0x1093d1c: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x010936fc: 0x10936fc: lw    v0, 9616(s2)
+// 0x01093d20: 0x1093d20: lw    v0, 10080(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2404
+	ldc.i4 2520
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093700: 0x1093700: sll   zero, zero, 0
-// 0x01093704: 0x1093704: bne   v0, zero, 0x1093720 lui   a2, 0x20000
+// 0x01093d24: 0x1093d24: sll   zero, zero, 0
+// 0x01093d28: 0x1093d28: bne   v0, zero, 0x1093d44 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_1093720
+	brtrue L_1093d44
 // --- basic block ---
-// 0x0109370c: 0x109370c: addiu a2, a2, -3300
+// 0x01093d30: 0x1093d30: addiu a2, a2, -2836
 	ldloc.3
-	ldc.i4 -3300
+	ldc.i4 -2836
 	add
 	stloc.3
-// 0x01093710: 0x1093710: addu  a0, zero, zero
+// 0x01093d34: 0x1093d34: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01093714: 0x1093714: jal   0x10a1918 addiu a1, zero, 3
+// 0x01093d38: 0x1093d38: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -8096,61 +8096,61 @@ L_10936f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109371c: 0x109371c: sw    v0, 9616(s2)
+// 0x01093d40: 0x1093d40: sw    v0, 10080(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2404
+	ldc.i4 2520
 	add
 	ldloc 5
 	stelem.i4
-L_1093720:
-// 0x01093720: 0x1093720: lui   v0, 0x80000
+L_1093d44:
+// 0x01093d44: 0x1093d44: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093724: 0x1093724: lw    v1, 9620(v0)
+// 0x01093d48: 0x1093d48: lw    v1, 10084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2405
+	ldc.i4 2521
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093728: 0x1093728: lui   v0, 0x80000
+// 0x01093d4c: 0x1093d4c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109372c: 0x109372c: lw    s3, 9612(v0)
+// 0x01093d50: 0x1093d50: lw    s3, 10076(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2403
+	ldc.i4 2519
 	add
 	ldelem.i4
 	stloc 17
-// 0x01093730: 0x1093730: lui   v0, 0x80000
+// 0x01093d54: 0x1093d54: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093734: 0x1093734: addu  a0, v1, zero
+// 0x01093d58: 0x1093d58: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01093738: 0x1093738: lw    s4, 9616(v0)
+// 0x01093d5c: 0x1093d5c: lw    s4, 10080(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2404
+	ldc.i4 2520
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109373c: 0x109373c: jal   0x104dffc sw    v1, 116(sp)
+// 0x01093d60: 0x1093d60: jal   0x104e00c sw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8160,36 +8160,36 @@ L_1093720:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093744: 0x1093744: addu  a0, s3, zero
+// 0x01093d68: 0x1093d68: addu  a0, s3, zero
 	ldloc 17
 	stloc.1
-// 0x01093748: 0x1093748: jal   0x104dffc addu  s5, v0, zero
+// 0x01093d6c: 0x1093d6c: jal   0x104e00c addu  s5, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093750: 0x1093750: addu  a0, s4, zero
+// 0x01093d74: 0x1093d74: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x01093754: 0x1093754: jal   0x104dffc addu  s2, v0, zero
+// 0x01093d78: 0x1093d78: jal   0x104e00c addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109375c: 0x109375c: lw    v1, 116(sp)
+// 0x01093d80: 0x1093d80: lw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8198,22 +8198,22 @@ L_1093720:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093760: 0x1093760: lw    t0, 0(s0)
+// 0x01093d84: 0x1093d84: lw    t0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x01093764: 0x1093764: addiu s8, sp, 52
+// 0x01093d88: 0x1093d88: addiu s8, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 13
-// 0x01093768: 0x1093768: addu  s6, v0, zero
+// 0x01093d8c: 0x1093d8c: addu  s6, v0, zero
 	ldloc 5
 	stloc 18
-// 0x0109376c: 0x109376c: lw    v0, 4(s0)
+// 0x01093d90: 0x1093d90: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8222,19 +8222,19 @@ L_1093720:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093770: 0x1093770: addu  a0, v1, zero
+// 0x01093d94: 0x1093d94: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01093774: 0x1093774: addu  a1, s8, zero
+// 0x01093d98: 0x1093d98: addu  a1, s8, zero
 	ldloc 13
 	stloc.2
-// 0x01093778: 0x1093778: addu  a2, zero, zero
+// 0x01093d9c: 0x1093d9c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109377c: 0x109377c: addu  a3, zero, zero
+// 0x01093da0: 0x1093da0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01093780: 0x1093780: sw    v0, 56(sp)
+// 0x01093da4: 0x1093da4: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8243,7 +8243,7 @@ L_1093720:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093784: 0x1093784: jal   0x104f4a8 sw    t0, 52(sp)
+// 0x01093da8: 0x1093da8: jal   0x104f4b8 sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8257,12 +8257,12 @@ L_1093720:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109378c: 0x109378c: lw    a0, 8(s0)
+// 0x01093db0: 0x1093db0: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8271,56 +8271,56 @@ L_1093720:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093790: 0x1093790: lw    v1, 0(s0)
+// 0x01093db4: 0x1093db4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01093794: 0x1093794: addu  v0, s8, zero
+// 0x01093db8: 0x1093db8: addu  v0, s8, zero
 	ldloc 13
 	stloc 5
-// 0x01093798: 0x1093798: subu  v1, a0, v1
+// 0x01093dbc: 0x1093dbc: subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-// 0x0109379c: 0x109379c: subu  v1, v1, s2
+// 0x01093dc0: 0x1093dc0: subu  v1, v1, s2
 	ldloc 7
 	ldloc 9
 	sub
 	stloc 7
-// 0x010937a0: 0x10937a0: subu  s5, v1, s5
+// 0x01093dc4: 0x1093dc4: subu  s5, v1, s5
 	ldloc 7
 	ldloc 15
 	sub
 	stloc 15
-// 0x010937a4: 0x10937a4: div   s5, s6
+// 0x01093dc8: 0x1093dc8: div   s5, s6
 	ldloc 15
 	ldloc 18
 	div
 	stloc 22
-// 0x010937a8: 0x10937a8: addu  s8, zero, zero
+// 0x01093dcc: 0x1093dcc: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010937ac: 0x10937ac: mflo  lo
+// 0x01093dd0: 0x1093dd0: mflo  lo
 	ldloc 22
 	stloc 7
-// 0x010937b0: 0x10937b0: j	 0x10937e0 addu  s5, zero, zero
+// 0x01093dd4: 0x1093dd4: j	 0x1093e04 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 15
-	br L_10937e0
+	br L_1093e04
 // --- basic block ---
-L_10937b8:
-// 0x010937b8: 0x10937b8: lw    t1, 0(s0)
+L_1093ddc:
+// 0x01093ddc: 0x1093ddc: lw    t1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 16
-// 0x010937bc: 0x10937bc: sw    t0, 56(sp)
+// 0x01093de0: 0x1093de0: sw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8329,17 +8329,17 @@ L_10937b8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010937c0: 0x10937c0: addu  t0, s2, t1
+// 0x01093de4: 0x1093de4: addu  t0, s2, t1
 	ldloc 9
 	ldloc 16
 	add
 	stloc 12
-// 0x010937c4: 0x10937c4: addu  t2, t0, t2
+// 0x01093de8: 0x1093de8: addu  t2, t0, t2
 	ldloc 12
 	ldloc 14
 	add
 	stloc 14
-// 0x010937c8: 0x10937c8: sw    v0, 112(sp)
+// 0x01093dec: 0x1093dec: sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8348,7 +8348,7 @@ L_10937b8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010937cc: 0x10937cc: sw    v1, 116(sp)
+// 0x01093df0: 0x1093df0: sw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8357,7 +8357,7 @@ L_10937b8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010937d0: 0x10937d0: jal   0x104f4a8 sw    t2, 52(sp)
+// 0x01093df4: 0x1093df4: jal   0x104f4b8 sw    t2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8371,12 +8371,12 @@ L_10937b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010937d8: 0x10937d8: lw    v1, 116(sp)
+// 0x01093dfc: 0x1093dfc: lw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8385,7 +8385,7 @@ L_10937b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010937dc: 0x10937dc: lw    v0, 112(sp)
+// 0x01093e00: 0x1093e00: lw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8394,35 +8394,35 @@ L_10937b8:
 	add
 	ldelem.i4
 	stloc 5
-L_10937e0:
-// 0x010937e0: 0x10937e0: slt   t1, s8, v1
+L_1093e04:
+// 0x01093e04: 0x1093e04: slt   t1, s8, v1
 	ldloc 13
 	ldloc 7
 	clt
 	stloc 16
-// 0x010937e4: 0x10937e4: addu  s5, s5, s6
+// 0x01093e08: 0x1093e08: addu  s5, s5, s6
 	ldloc 15
 	ldloc 18
 	add
 	stloc 15
-// 0x010937e8: 0x10937e8: addu  a0, s4, zero
+// 0x01093e0c: 0x1093e0c: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x010937ec: 0x10937ec: addu  a1, v0, zero
+// 0x01093e10: 0x1093e10: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010937f0: 0x10937f0: addu  a2, zero, zero
+// 0x01093e14: 0x1093e14: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010937f4: 0x10937f4: addu  a3, zero, zero
+// 0x01093e18: 0x1093e18: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010937f8: 0x10937f8: subu  t2, s5, s6
+// 0x01093e1c: 0x1093e1c: subu  t2, s5, s6
 	ldloc 15
 	ldloc 18
 	sub
 	stloc 14
-// 0x010937fc: 0x10937fc: lw    t0, 4(s0)
+// 0x01093e20: 0x1093e20: lw    t0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8431,15 +8431,15 @@ L_10937e0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01093800: 0x1093800: bne   t1, zero, 0x10937b8 addiu s8, s8, 1
+// 0x01093e24: 0x1093e24: bne   t1, zero, 0x1093ddc addiu s8, s8, 1
 	ldloc 16
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	brtrue L_10937b8
+	brtrue L_1093ddc
 // --- basic block ---
-// 0x01093808: 0x1093808: lw    v1, 8(s0)
+// 0x01093e2c: 0x1093e2c: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8448,15 +8448,15 @@ L_10937e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109380c: 0x109380c: addu  a0, s3, zero
+// 0x01093e30: 0x1093e30: addu  a0, s3, zero
 	ldloc 17
 	stloc.1
-// 0x01093810: 0x1093810: subu  s2, v1, s2
+// 0x01093e34: 0x1093e34: subu  s2, v1, s2
 	ldloc 7
 	ldloc 9
 	sub
 	stloc 9
-// 0x01093814: 0x1093814: sw    s2, 52(sp)
+// 0x01093e38: 0x1093e38: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8465,7 +8465,7 @@ L_10937e0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01093818: 0x1093818: jal   0x104f4a8 sw    t0, 56(sp)
+// 0x01093e3c: 0x1093e3c: jal   0x104f4b8 sw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8479,20 +8479,20 @@ L_10937e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1093820:
-// 0x01093820: 0x1093820: lw    a1, 0(s0)
+L_1093e44:
+// 0x01093e44: 0x1093e44: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01093824: 0x1093824: lw    a0, 4(s0)
+// 0x01093e48: 0x1093e48: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8501,7 +8501,7 @@ L_1093820:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093828: 0x1093828: lw    v1, 8(s0)
+// 0x01093e4c: 0x1093e4c: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8510,7 +8510,7 @@ L_1093820:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109382c: 0x109382c: lw    v0, 12(s0)
+// 0x01093e50: 0x1093e50: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8519,34 +8519,34 @@ L_1093820:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093830: 0x1093830: addiu a1, a1, 20
+// 0x01093e54: 0x1093e54: addiu a1, a1, 20
 	ldloc.2
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x01093834: 0x1093834: addiu a0, a0, 10
+// 0x01093e58: 0x1093e58: addiu a0, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	add
 	stloc.1
-// 0x01093838: 0x1093838: addiu v1, v1, -20
+// 0x01093e5c: 0x1093e5c: addiu v1, v1, -20
 	ldloc 7
 	ldc.i4.s -20
 	add
 	stloc 7
-// 0x0109383c: 0x109383c: addiu v0, v0, -10
+// 0x01093e60: 0x1093e60: addiu v0, v0, -10
 	ldloc 5
 	ldc.i4.s -10
 	add
 	stloc 5
-// 0x01093840: 0x1093840: sw    a1, 0(s0)
+// 0x01093e64: 0x1093e64: sw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01093844: 0x1093844: sw    a0, 4(s0)
+// 0x01093e68: 0x1093e68: sw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8555,7 +8555,7 @@ L_1093820:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01093848: 0x1093848: sw    v1, 8(s0)
+// 0x01093e6c: 0x1093e6c: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8564,7 +8564,7 @@ L_1093820:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109384c: 0x109384c: sw    v0, 12(s0)
+// 0x01093e70: 0x1093e70: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8573,7 +8573,7 @@ L_1093820:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093850: 0x1093850: lw    v0, 48(s1)
+// 0x01093e74: 0x1093e74: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -8582,18 +8582,18 @@ L_1093820:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093854: 0x1093854: sll   zero, zero, 0
-L_1093858:
-// 0x01093858: 0x1093858: andi  v0, v0, 8192
+// 0x01093e78: 0x1093e78: sll   zero, zero, 0
+L_1093e7c:
+// 0x01093e7c: 0x1093e7c: andi  v0, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	and
 	stloc 5
-// 0x0109385c: 0x109385c: beq   v0, zero, 0x109387c sll   zero, zero, 0
+// 0x01093e80: 0x1093e80: beq   v0, zero, 0x1093ea0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109387c
+	brfalse L_1093ea0
 // --- basic block ---
-// 0x01093864: 0x1093864: lw    a1, 132(s1)
+// 0x01093e88: 0x1093e88: lw    a1, 132(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -8602,7 +8602,7 @@ L_1093858:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01093868: 0x1093868: jal   0x109b434 addu  a0, s1, zero
+// 0x01093e8c: 0x1093e8c: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8610,12 +8610,12 @@ L_1093858:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093870: 0x1093870: lw    a1, 128(s1)
+// 0x01093e94: 0x1093e94: lw    a1, 128(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -8624,7 +8624,7 @@ L_1093858:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01093874: 0x1093874: jal   0x109b50c addu  a0, s1, zero
+// 0x01093e98: 0x1093e98: jal   0x109bb54 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8632,22 +8632,22 @@ L_1093858:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109387c:
-// 0x0109387c: 0x109387c: andi  s7, s7, 2
+L_1093ea0:
+// 0x01093ea0: 0x1093ea0: andi  s7, s7, 2
 	ldloc 19
 	ldc.i4.2
 	and
 	stloc 19
-// 0x01093880: 0x1093880: beq   s7, zero, 0x1093908 sll   zero, zero, 0
+// 0x01093ea4: 0x1093ea4: beq   s7, zero, 0x1093f2c sll   zero, zero, 0
 	ldloc 19
-	brfalse L_1093908
+	brfalse L_1093f2c
 // --- basic block ---
-// 0x01093888: 0x1093888: lw    v0, 48(s1)
+// 0x01093eac: 0x1093eac: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -8656,24 +8656,24 @@ L_109387c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109388c: 0x109388c: sll   zero, zero, 0
-// 0x01093890: 0x1093890: andi  v0, v0, 8192
+// 0x01093eb0: 0x1093eb0: sll   zero, zero, 0
+// 0x01093eb4: 0x1093eb4: andi  v0, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	and
 	stloc 5
-// 0x01093894: 0x1093894: beq   v0, zero, 0x1093908 lui   a1, 0x10000
+// 0x01093eb8: 0x1093eb8: beq   v0, zero, 0x1093f2c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1093908
+	brfalse L_1093f2c
 // --- basic block ---
-// 0x0109389c: 0x109389c: addu  a0, s1, zero
+// 0x01093ec0: 0x1093ec0: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010938a0: 0x10938a0: jal   0x109b304 addiu a1, a1, 6916
+// 0x01093ec4: 0x1093ec4: jal   0x109b94c addiu a1, a1, 6912
 	ldloc.2
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
 	ldloc.0
@@ -8681,20 +8681,20 @@ L_109387c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010938a8: 0x10938a8: beq   v0, zero, 0x1093908 addiu a2, sp, 44
+// 0x01093ecc: 0x1093ecc: beq   v0, zero, 0x1093f2c addiu a2, sp, 44
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.3
-	brfalse L_1093908
+	brfalse L_1093f2c
 // --- basic block ---
-// 0x010938b0: 0x10938b0: lw    a3, 8(s0)
+// 0x01093ed4: 0x1093ed4: lw    a3, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8703,7 +8703,7 @@ L_109387c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010938b4: 0x10938b4: lw    v1, 12(s0)
+// 0x01093ed8: 0x1093ed8: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8712,14 +8712,14 @@ L_109387c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010938b8: 0x10938b8: lw    a1, 0(s0)
+// 0x01093edc: 0x1093edc: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010938bc: 0x10938bc: lw    a0, 4(s0)
+// 0x01093ee0: 0x1093ee0: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8728,35 +8728,35 @@ L_109387c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010938c0: 0x10938c0: addiu a3, a3, 1
+// 0x01093ee4: 0x1093ee4: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010938c4: 0x10938c4: addiu v1, v1, 1
+// 0x01093ee8: 0x1093ee8: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010938c8: 0x10938c8: subu  v1, v1, a0
+// 0x01093eec: 0x1093eec: subu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 7
-// 0x010938cc: 0x10938cc: subu  a3, a3, a1
+// 0x01093ef0: 0x1093ef0: subu  a3, a3, a1
 	ldloc 4
 	ldloc.2
 	sub
 	stloc 4
-// 0x010938d0: 0x10938d0: addu  a0, v0, zero
+// 0x01093ef4: 0x1093ef4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010938d4: 0x10938d4: addiu a1, sp, 36
+// 0x01093ef8: 0x1093ef8: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010938d8: 0x10938d8: sw    v1, 48(sp)
+// 0x01093efc: 0x1093efc: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8765,7 +8765,7 @@ L_109387c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010938dc: 0x10938dc: jal   0x1099350 sw    a3, 44(sp)
+// 0x01093f00: 0x1093f00: jal   0x1099998 sw    a3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8779,12 +8779,12 @@ L_109387c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010938e4: 0x10938e4: lw    v1, 4(s0)
+// 0x01093f08: 0x1093f08: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8793,7 +8793,7 @@ L_109387c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010938e8: 0x10938e8: lw    v0, 40(sp)
+// 0x01093f0c: 0x1093f0c: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8802,13 +8802,13 @@ L_109387c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010938ec: 0x10938ec: sll   zero, zero, 0
-// 0x010938f0: 0x10938f0: addu  v0, v1, v0
+// 0x01093f10: 0x1093f10: sll   zero, zero, 0
+// 0x01093f14: 0x1093f14: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010938f4: 0x10938f4: j	 0x1093908 sw    v0, 4(s0)
+// 0x01093f18: 0x1093f18: j	 0x1093f2c sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8817,22 +8817,22 @@ L_109387c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1093908
+	br L_1093f2c
 // --- basic block ---
-L_10938fc:
-// 0x010938fc: 0x10938fc: lui   s2, 0x20000
+L_1093f20:
+// 0x01093f20: 0x1093f20: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01093900: 0x1093900: j	 0x1092fdc addiu s2, s2, -3280
+// 0x01093f24: 0x1093f24: j	 0x1093600 addiu s2, s2, -2816
 	ldloc 9
-	ldc.i4 -3280
+	ldc.i4 -2816
 	add
 	stloc 9
-	br L_1092fdc
+	br L_1093600
 // --- basic block ---
-L_1093908:
-// 0x01093908: 0x1093908: lw    ra, 156(sp)
-// 0x0109390c: 0x109390c: lw    s8, 152(sp)
+L_1093f2c:
+// 0x01093f2c: 0x1093f2c: lw    ra, 156(sp)
+// 0x01093f30: 0x1093f30: lw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8841,7 +8841,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01093910: 0x1093910: lw    s7, 148(sp)
+// 0x01093f34: 0x1093f34: lw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8850,7 +8850,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01093914: 0x1093914: lw    s6, 144(sp)
+// 0x01093f38: 0x1093f38: lw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8859,7 +8859,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01093918: 0x1093918: lw    s5, 140(sp)
+// 0x01093f3c: 0x1093f3c: lw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8868,7 +8868,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109391c: 0x109391c: lw    s4, 136(sp)
+// 0x01093f40: 0x1093f40: lw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8877,7 +8877,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01093920: 0x1093920: lw    s3, 132(sp)
+// 0x01093f44: 0x1093f44: lw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8886,7 +8886,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01093924: 0x1093924: lw    s2, 128(sp)
+// 0x01093f48: 0x1093f48: lw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8895,7 +8895,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01093928: 0x1093928: lw    s1, 124(sp)
+// 0x01093f4c: 0x1093f4c: lw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8904,7 +8904,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109392c: 0x109392c: lw    s0, 120(sp)
+// 0x01093f50: 0x1093f50: lw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8913,7 +8913,7 @@ L_1093908:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01093930: 0x1093930: jr    ra addiu sp, sp, 160
+// 0x01093f54: 0x1093f54: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
diff --git a/converted/Cibyl11.j b/converted/Cibyl11.j
index 00d9e33..e739533 100644
--- a/converted/Cibyl11.j
+++ b/converted/Cibyl11.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl11::.ctor
 
-.method public static int32 roadmap_config_get_name_value_binary_100eed8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_get_name_value_binary_100eee8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 ra)
@@ -91,12 +91,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100eed8: 0x100eed8: addiu sp, sp, -40
+// 0x0100eee8: 0x100eee8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100eedc: 0x100eedc: sw    s1, 20(sp)
+// 0x0100eeec: 0x100eeec: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -105,14 +105,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100eee0: 0x100eee0: addu  s1, a0, zero
+// 0x0100eef0: 0x100eef0: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0100eee4: 0x100eee4: addiu a0, zero, 4
+// 0x0100eef4: 0x100eef4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100eee8: 0x100eee8: sw    ra, 36(sp)
-// 0x0100eeec: 0x100eeec: sw    s4, 32(sp)
+// 0x0100eef8: 0x100eef8: sw    ra, 36(sp)
+// 0x0100eefc: 0x100eefc: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -121,7 +121,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100eef0: 0x100eef0: sw    s3, 28(sp)
+// 0x0100ef00: 0x100ef00: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -130,7 +130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100eef4: 0x100eef4: sw    s2, 24(sp)
+// 0x0100ef04: 0x100ef04: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100eef8: 0x100eef8: sw    s0, 16(sp)
+// 0x0100ef08: 0x100ef08: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -148,10 +148,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100eefc: 0x100eefc: addu  s2, a2, zero
+// 0x0100ef0c: 0x100ef0c: addu  s2, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0100ef00: 0x100ef00: jal   0x1000910 addu  s3, a1, zero
+// 0x0100ef10: 0x100ef10: jal   0x1000910 addu  s3, a1, zero
 	ldloc.2
 	stloc 11
 	ldloc.0
@@ -164,19 +164,19 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ef08: 0x100ef08: addu  a0, v0, zero
+// 0x0100ef18: 0x100ef18: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ef0c: 0x100ef0c: addiu a1, zero, 1
+// 0x0100ef1c: 0x100ef1c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0100ef10: 0x100ef10: addiu a2, zero, 4
+// 0x0100ef20: 0x100ef20: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0100ef14: 0x100ef14: addu  a3, s2, zero
+// 0x0100ef24: 0x100ef24: addu  a3, s2, zero
 	ldloc 9
 	stloc 4
-// 0x0100ef18: 0x100ef18: jal   0x1001cec addu  s0, v0, zero
+// 0x0100ef28: 0x100ef28: jal   0x1001cec addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -189,25 +189,25 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ef20: 0x100ef20: addu  s4, v0, zero
+// 0x0100ef30: 0x100ef30: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x0100ef24: 0x100ef24: addiu v0, zero, 4
+// 0x0100ef34: 0x100ef34: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0100ef28: 0x100ef28: bne   s4, v0, 0x100efd4 sll   zero, zero, 0
+// 0x0100ef38: 0x100ef38: bne   s4, v0, 0x100efe4 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	bne.un L_100efd4
+	bne.un L_100efe4
 // --- basic block ---
-// 0x0100ef30: 0x100ef30: lw    a0, 0(s0)
+// 0x0100ef40: 0x100ef40: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100ef34: 0x100ef34: jal   0x1000910 sll   zero, zero, 0
+// 0x0100ef44: 0x100ef44: jal   0x1000910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -218,27 +218,27 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ef3c: 0x100ef3c: lw    a2, 0(s0)
+// 0x0100ef4c: 0x100ef4c: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100ef40: 0x100ef40: sw    v0, 0(s1)
+// 0x0100ef50: 0x100ef50: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0100ef44: 0x100ef44: addu  a0, v0, zero
+// 0x0100ef54: 0x100ef54: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ef48: 0x100ef48: addiu a1, zero, 1
+// 0x0100ef58: 0x100ef58: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0100ef4c: 0x100ef4c: jal   0x1001cec addu  a3, s2, zero
+// 0x0100ef5c: 0x100ef5c: jal   0x1001cec addu  a3, s2, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -251,28 +251,28 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ef54: 0x100ef54: lw    v1, 0(s0)
+// 0x0100ef64: 0x100ef64: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100ef58: 0x100ef58: sll   zero, zero, 0
-// 0x0100ef5c: 0x100ef5c: bne   v0, v1, 0x100ef7c addiu a1, zero, 1
+// 0x0100ef68: 0x100ef68: sll   zero, zero, 0
+// 0x0100ef6c: 0x100ef6c: bne   v0, v1, 0x100ef8c addiu a1, zero, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	stloc.2
-	bne.un L_100ef7c
+	bne.un L_100ef8c
 // --- basic block ---
-// 0x0100ef64: 0x100ef64: addu  a0, s0, zero
+// 0x0100ef74: 0x100ef74: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100ef68: 0x100ef68: addiu a2, zero, 4
+// 0x0100ef78: 0x100ef78: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0100ef6c: 0x100ef6c: jal   0x1001cec addu  a3, s2, zero
+// 0x0100ef7c: 0x100ef7c: jal   0x1001cec addu  a3, s2, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -285,31 +285,31 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ef74: 0x100ef74: beq   v0, s4, 0x100ef88 sll   zero, zero, 0
+// 0x0100ef84: 0x100ef84: beq   v0, s4, 0x100ef98 sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	beq  L_100ef88
+	beq  L_100ef98
 // --- basic block ---
-L_100ef7c:
-// 0x0100ef7c: 0x100ef7c: lw    a0, 0(s1)
+L_100ef8c:
+// 0x0100ef8c: 0x100ef8c: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100ef80: 0x100ef80: j	 0x100efcc sll   zero, zero, 0
-	br L_100efcc
+// 0x0100ef90: 0x100ef90: j	 0x100efdc sll   zero, zero, 0
+	br L_100efdc
 // --- basic block ---
-L_100ef88:
-// 0x0100ef88: 0x100ef88: lw    a0, 0(s0)
+L_100ef98:
+// 0x0100ef98: 0x100ef98: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100ef8c: 0x100ef8c: jal   0x1000910 sll   zero, zero, 0
+// 0x0100ef9c: 0x100ef9c: jal   0x1000910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -320,27 +320,27 @@ L_100ef88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ef94: 0x100ef94: lw    a2, 0(s0)
+// 0x0100efa4: 0x100efa4: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100ef98: 0x100ef98: addu  a0, v0, zero
+// 0x0100efa8: 0x100efa8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ef9c: 0x100ef9c: sw    v0, 0(s3)
+// 0x0100efac: 0x100efac: sw    v0, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0100efa0: 0x100efa0: addu  a3, s2, zero
+// 0x0100efb0: 0x100efb0: addu  a3, s2, zero
 	ldloc 9
 	stloc 4
-// 0x0100efa4: 0x100efa4: jal   0x1001cec addiu a1, zero, 1
+// 0x0100efb4: 0x100efb4: jal   0x1001cec addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -353,29 +353,29 @@ L_100ef88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100efac: 0x100efac: lw    a0, 0(s0)
+// 0x0100efbc: 0x100efbc: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100efb0: 0x100efb0: sll   zero, zero, 0
-// 0x0100efb4: 0x100efb4: beq   v0, a0, 0x100efe0 addiu v1, zero, 1
+// 0x0100efc0: 0x100efc0: sll   zero, zero, 0
+// 0x0100efc4: 0x100efc4: beq   v0, a0, 0x100eff0 addiu v1, zero, 1
 	ldloc 5
 	ldloc.1
 	ldc.i4.1
 	stloc 7
-	beq  L_100efe0
+	beq  L_100eff0
 // --- basic block ---
-// 0x0100efbc: 0x100efbc: lw    a0, 0(s1)
+// 0x0100efcc: 0x100efcc: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100efc0: 0x100efc0: jal   0x1000930 sll   zero, zero, 0
+// 0x0100efd0: 0x100efd0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -386,15 +386,15 @@ L_100ef88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100efc8: 0x100efc8: lw    a0, 0(s3)
+// 0x0100efd8: 0x100efd8: lw    a0, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-L_100efcc:
-// 0x0100efcc: 0x100efcc: jal   0x1000930 sll   zero, zero, 0
+L_100efdc:
+// 0x0100efdc: 0x100efdc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -405,8 +405,8 @@ L_100efcc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100efd4:
-// 0x0100efd4: 0x100efd4: jal   0x1000930 addu  a0, s0, zero
+L_100efe4:
+// 0x0100efe4: 0x100efe4: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -419,15 +419,15 @@ L_100efd4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100efdc: 0x100efdc: addu  v1, zero, zero
+// 0x0100efec: 0x100efec: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_100efe0:
-// 0x0100efe0: 0x100efe0: lw    ra, 36(sp)
-// 0x0100efe4: 0x100efe4: addu  v0, v1, zero
+L_100eff0:
+// 0x0100eff0: 0x100eff0: lw    ra, 36(sp)
+// 0x0100eff4: 0x100eff4: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x0100efe8: 0x100efe8: lw    s4, 32(sp)
+// 0x0100eff8: 0x100eff8: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -436,7 +436,7 @@ L_100efe0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100efec: 0x100efec: lw    s3, 28(sp)
+// 0x0100effc: 0x100effc: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -445,7 +445,7 @@ L_100efe0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100eff0: 0x100eff0: lw    s2, 24(sp)
+// 0x0100f000: 0x100f000: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -454,7 +454,7 @@ L_100efe0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100eff4: 0x100eff4: lw    s1, 20(sp)
+// 0x0100f004: 0x100f004: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -463,7 +463,7 @@ L_100efe0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100eff8: 0x100eff8: lw    s0, 16(sp)
+// 0x0100f008: 0x100f008: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -472,7 +472,7 @@ L_100efe0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100effc: 0x100effc: jr    ra addiu sp, sp, 40
+// 0x0100f00c: 0x100f00c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -484,7 +484,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_41_100f004(int32,int32,int32,int32,int32)
+.method public static int32 T_41_100f014(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s8,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -546,19 +546,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f004: 0x100f004: addiu sp, sp, -200
+// 0x0100f014: 0x100f014: addiu sp, sp, -200
 	ldloc.0
 	ldc.i4 -200
 	add
 	stloc.0
-// 0x0100f008: 0x100f008: lw    a2, 0(a1)
+// 0x0100f018: 0x100f018: lw    a2, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100f00c: 0x100f00c: sw    s1, 164(sp)
+// 0x0100f01c: 0x100f01c: sw    s1, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -567,7 +567,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100f010: 0x100f010: sw    s0, 160(sp)
+// 0x0100f020: 0x100f020: sw    s0, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -576,18 +576,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100f014: 0x100f014: addu  s1, a1, zero
+// 0x0100f024: 0x100f024: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0100f018: 0x100f018: addiu s0, sp, 52
+// 0x0100f028: 0x100f028: addiu s0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 8
-// 0x0100f01c: 0x100f01c: lui   a1, 0x0
+// 0x0100f02c: 0x100f02c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100f020: 0x100f020: sw    s2, 168(sp)
+// 0x0100f030: 0x100f030: sw    s2, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -596,19 +596,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f024: 0x100f024: addiu a1, a1, 26068
+// 0x0100f034: 0x100f034: addiu a1, a1, 26068
 	ldloc.2
 	ldc.i4 26068
 	add
 	stloc.2
-// 0x0100f028: 0x100f028: addu  s2, a0, zero
+// 0x0100f038: 0x100f038: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100f02c: 0x100f02c: addu  a0, s0, zero
+// 0x0100f03c: 0x100f03c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100f030: 0x100f030: sw    ra, 196(sp)
-// 0x0100f034: 0x100f034: sw    s8, 192(sp)
+// 0x0100f040: 0x100f040: sw    ra, 196(sp)
+// 0x0100f044: 0x100f044: sw    s8, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -617,7 +617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100f038: 0x100f038: sw    s7, 188(sp)
+// 0x0100f048: 0x100f048: sw    s7, 188(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -626,7 +626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100f03c: 0x100f03c: sw    s6, 184(sp)
+// 0x0100f04c: 0x100f04c: sw    s6, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -635,7 +635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100f040: 0x100f040: sw    s5, 180(sp)
+// 0x0100f050: 0x100f050: sw    s5, 180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -644,7 +644,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100f044: 0x100f044: sw    s4, 176(sp)
+// 0x0100f054: 0x100f054: sw    s4, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -653,7 +653,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100f048: 0x100f048: jal   0x1000f64 sw    s3, 172(sp)
+// 0x0100f058: 0x100f058: jal   0x1000f64 sw    s3, 172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -672,16 +672,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f050: 0x100f050: lui   a2, 0x0
+// 0x0100f060: 0x100f060: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100f054: 0x100f054: addu  a1, s0, zero
+// 0x0100f064: 0x100f064: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0100f058: 0x100f058: addu  a0, s2, zero
+// 0x0100f068: 0x100f068: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0100f05c: 0x100f05c: jal   0x104dac8 addiu a2, a2, 26128
+// 0x0100f06c: 0x100f06c: jal   0x104dad8 addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
@@ -691,30 +691,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f064: 0x100f064: addu  s0, v0, zero
+// 0x0100f074: 0x100f074: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0100f068: 0x100f068: beq   s0, zero, 0x100f1bc addu  v0, zero, zero
+// 0x0100f078: 0x100f078: beq   s0, zero, 0x100f1cc addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_100f1bc
+	brfalse L_100f1cc
 // --- basic block ---
-// 0x0100f070: 0x100f070: j	 0x100f174 lui   s8, 0x10000
+// 0x0100f080: 0x100f080: j	 0x100f184 lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 10
-	br L_100f174
+	br L_100f184
 // --- basic block ---
-L_100f078:
-// 0x0100f078: 0x100f078: addu  a1, s6, zero
+L_100f088:
+// 0x0100f088: 0x100f088: addu  a1, s6, zero
 	ldloc 15
 	stloc.2
-// 0x0100f07c: 0x100f07c: jal   0x100eed8 addu  a2, s0, zero
+// 0x0100f08c: 0x100f08c: jal   0x100eee8 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -722,16 +722,16 @@ L_100f078:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_config_get_name_value_binary_100eed8(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_config_get_name_value_binary_100eee8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f084: 0x100f084: beq   v0, zero, 0x100f1a0 sll   zero, zero, 0
+// 0x0100f094: 0x100f094: beq   v0, zero, 0x100f1b0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_100f1a0
+	brfalse L_100f1b0
 // --- basic block ---
-// 0x0100f08c: 0x100f08c: lw    v1, 28(sp)
+// 0x0100f09c: 0x100f09c: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -740,36 +740,36 @@ L_100f078:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f090: 0x100f090: sll   zero, zero, 0
-// 0x0100f094: 0x100f094: addu  v0, v1, zero
+// 0x0100f0a0: 0x100f0a0: sll   zero, zero, 0
+// 0x0100f0a4: 0x100f0a4: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-L_100f098:
-// 0x0100f098: 0x100f098: lb    a0, 0(v0)
+L_100f0a8:
+// 0x0100f0a8: 0x100f0a8: lb    a0, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0100f09c: 0x100f09c: sll   zero, zero, 0
-// 0x0100f0a0: 0x100f0a0: beq   a0, s5, 0x100f190 sll   zero, zero, 0
+// 0x0100f0ac: 0x100f0ac: sll   zero, zero, 0
+// 0x0100f0b0: 0x100f0b0: beq   a0, s5, 0x100f1a0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 14
-	beq  L_100f190
+	beq  L_100f1a0
 // --- basic block ---
-// 0x0100f0a8: 0x100f0a8: bne   a0, s4, 0x100f114 sll   zero, zero, 0
+// 0x0100f0b8: 0x100f0b8: bne   a0, s4, 0x100f124 sll   zero, zero, 0
 	ldloc.1
 	ldloc 13
-	bne.un L_100f114
+	bne.un L_100f124
 // --- basic block ---
-// 0x0100f0b0: 0x100f0b0: addiu a0, v0, 1
+// 0x0100f0c0: 0x100f0c0: addiu a0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0100f0b4: 0x100f0b4: sb    zero, 0(v0)
+// 0x0100f0c4: 0x100f0c4: sb    zero, 0(v0)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100f0b8: 0x100f0b8: jal   0x1001ba8 sw    v1, 152(sp)
+// 0x0100f0c8: 0x100f0c8: jal   0x1001ba8 sw    v1, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -788,7 +788,7 @@ L_100f098:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f0c0: 0x100f0c0: lw    v1, 152(sp)
+// 0x0100f0d0: 0x100f0d0: lw    v1, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -797,7 +797,7 @@ L_100f098:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f0c4: 0x100f0c4: sw    v0, 40(sp)
+// 0x0100f0d4: 0x100f0d4: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -806,7 +806,7 @@ L_100f098:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f0c8: 0x100f0c8: jal   0x1001ba8 addu  a0, v1, zero
+// 0x0100f0d8: 0x100f0d8: jal   0x1001ba8 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -819,7 +819,7 @@ L_100f098:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f0d0: 0x100f0d0: lw    a0, 28(sp)
+// 0x0100f0e0: 0x100f0e0: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -828,7 +828,7 @@ L_100f098:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f0d4: 0x100f0d4: sw    v0, 36(sp)
+// 0x0100f0e4: 0x100f0e4: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -837,7 +837,7 @@ L_100f098:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f0d8: 0x100f0d8: jal   0x1000930 sw    zero, 48(sp)
+// 0x0100f0e8: 0x100f0e8: jal   0x1000930 sw    zero, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -856,19 +856,19 @@ L_100f098:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f0e0: 0x100f0e0: addu  a0, s1, zero
+// 0x0100f0f0: 0x100f0f0: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0100f0e4: 0x100f0e4: addu  a1, s3, zero
+// 0x0100f0f4: 0x100f0f4: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x0100f0e8: 0x100f0e8: addu  a2, s8, zero
+// 0x0100f0f8: 0x100f0f8: addu  a2, s8, zero
 	ldloc 10
 	stloc.3
-// 0x0100f0ec: 0x100f0ec: addiu a3, zero, 16
+// 0x0100f0fc: 0x100f0fc: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x0100f0f0: 0x100f0f0: sw    zero, 16(sp)
+// 0x0100f100: 0x100f100: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -877,7 +877,7 @@ L_100f098:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100f0f4: 0x100f0f4: jal   0x100eb44 sw    s2, 20(sp)
+// 0x0100f104: 0x100f104: jal   0x100eb54 sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -891,12 +891,12 @@ L_100f098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_new_item_100eb44(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_new_item_100eb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f0fc: 0x100f0fc: lw    v1, 32(sp)
+// 0x0100f10c: 0x100f10c: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -905,28 +905,28 @@ L_100f098:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f100: 0x100f100: sll   zero, zero, 0
-// 0x0100f104: 0x100f104: beq   v1, zero, 0x100f124 sll   zero, zero, 0
+// 0x0100f110: 0x100f110: sll   zero, zero, 0
+// 0x0100f114: 0x100f114: beq   v1, zero, 0x100f134 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_100f124
+	brfalse L_100f134
 // --- basic block ---
-// 0x0100f10c: 0x100f10c: j	 0x100f144 sll   zero, zero, 0
-	br L_100f144
+// 0x0100f11c: 0x100f11c: j	 0x100f154 sll   zero, zero, 0
+	br L_100f154
 // --- basic block ---
-L_100f114:
-// 0x0100f114: 0x100f114: bne   a0, zero, 0x100f098 addiu v0, v0, 1
+L_100f124:
+// 0x0100f124: 0x100f124: bne   a0, zero, 0x100f0a8 addiu v0, v0, 1
 	ldloc.1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_100f098
+	brtrue L_100f0a8
 // --- basic block ---
-// 0x0100f11c: 0x100f11c: j	 0x100f190 sll   zero, zero, 0
-	br L_100f190
+// 0x0100f12c: 0x100f12c: j	 0x100f1a0 sll   zero, zero, 0
+	br L_100f1a0
 // --- basic block ---
-L_100f124:
-// 0x0100f124: 0x100f124: lw    a0, 40(sp)
+L_100f134:
+// 0x0100f134: 0x100f134: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -935,7 +935,7 @@ L_100f124:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f128: 0x100f128: jal   0x1000930 sw    v0, 152(sp)
+// 0x0100f138: 0x100f138: jal   0x1000930 sw    v0, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -954,7 +954,7 @@ L_100f124:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f130: 0x100f130: lw    a0, 36(sp)
+// 0x0100f140: 0x100f140: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -963,7 +963,7 @@ L_100f124:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f134: 0x100f134: jal   0x1000930 sll   zero, zero, 0
+// 0x0100f144: 0x100f144: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -974,7 +974,7 @@ L_100f124:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f13c: 0x100f13c: lw    v0, 152(sp)
+// 0x0100f14c: 0x100f14c: lw    v0, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -983,9 +983,9 @@ L_100f124:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f140: 0x100f140: sll   zero, zero, 0
-L_100f144:
-// 0x0100f144: 0x100f144: lw    a0, 20(v0)
+// 0x0100f150: 0x100f150: sll   zero, zero, 0
+L_100f154:
+// 0x0100f154: 0x100f154: lw    a0, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -994,12 +994,12 @@ L_100f144:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f148: 0x100f148: sll   zero, zero, 0
-// 0x0100f14c: 0x100f14c: beq   a0, zero, 0x100f160 sll   zero, zero, 0
+// 0x0100f158: 0x100f158: sll   zero, zero, 0
+// 0x0100f15c: 0x100f15c: beq   a0, zero, 0x100f170 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_100f160
+	brfalse L_100f170
 // --- basic block ---
-// 0x0100f154: 0x100f154: jal   0x1000930 sw    v0, 152(sp)
+// 0x0100f164: 0x100f164: jal   0x1000930 sw    v0, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1018,7 +1018,7 @@ L_100f144:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f15c: 0x100f15c: lw    v0, 152(sp)
+// 0x0100f16c: 0x100f16c: lw    v0, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1027,8 +1027,8 @@ L_100f144:
 	add
 	ldelem.i4
 	stloc 6
-L_100f160:
-// 0x0100f160: 0x100f160: lw    v1, 24(sp)
+L_100f170:
+// 0x0100f170: 0x100f170: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1037,13 +1037,13 @@ L_100f160:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f164: 0x100f164: sb    zero, 26(v0)
+// 0x0100f174: 0x100f174: sb    zero, 26(v0)
 	ldloc 6
 	ldc.i4.s 26
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100f168: 0x100f168: sw    v1, 20(v0)
+// 0x0100f178: 0x100f178: sw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1052,62 +1052,62 @@ L_100f160:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f16c: 0x100f16c: j	 0x100f190 sb    zero, 25(v0)
+// 0x0100f17c: 0x100f17c: j	 0x100f1a0 sb    zero, 25(v0)
 	ldloc 6
 	ldc.i4.s 25
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_100f190
+	br L_100f1a0
 // --- basic block ---
-L_100f174:
-// 0x0100f174: 0x100f174: addiu s8, s8, 18500
+L_100f184:
+// 0x0100f184: 0x100f184: addiu s8, s8, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 10
-// 0x0100f178: 0x100f178: addiu s7, sp, 28
+// 0x0100f188: 0x100f188: addiu s7, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 16
-// 0x0100f17c: 0x100f17c: addiu s6, sp, 24
+// 0x0100f18c: 0x100f18c: addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-// 0x0100f180: 0x100f180: addiu s5, zero, 10
+// 0x0100f190: 0x100f190: addiu s5, zero, 10
 	ldc.i4.s 10
 	stloc 14
-// 0x0100f184: 0x100f184: addiu s4, zero, 46
+// 0x0100f194: 0x100f194: addiu s4, zero, 46
 	ldc.i4.s 46
 	stloc 13
-// 0x0100f188: 0x100f188: addiu s3, sp, 36
+// 0x0100f198: 0x100f198: addiu s3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 12
-// 0x0100f18c: 0x100f18c: addiu s2, sp, 32
+// 0x0100f19c: 0x100f19c: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-L_100f190:
-// 0x0100f190: 0x100f190: jal   0x1001e30 addu  a0, s0, zero
+L_100f1a0:
+// 0x0100f1a0: 0x100f1a0: jal   0x1001e30 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 6
 // --- basic block ---
-// 0x0100f198: 0x100f198: beq   v0, zero, 0x100f078 addu  a0, s7, zero
+// 0x0100f1a8: 0x100f1a8: beq   v0, zero, 0x100f088 addu  a0, s7, zero
 	ldloc 6
 	ldloc 16
 	stloc.1
-	brfalse L_100f078
+	brfalse L_100f088
 // --- basic block ---
-L_100f1a0:
-// 0x0100f1a0: 0x100f1a0: jal   0x10023b4 addu  a0, s0, zero
+L_100f1b0:
+// 0x0100f1b0: 0x100f1b0: jal   0x10023b4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1120,13 +1120,13 @@ L_100f1a0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f1a8: 0x100f1a8: lui   v0, 0x30000
+// 0x0100f1b8: 0x100f1b8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0100f1ac: 0x100f1ac: addiu v1, zero, 1
+// 0x0100f1bc: 0x100f1bc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0100f1b0: 0x100f1b0: sw    zero, 12(s1)
+// 0x0100f1c0: 0x100f1c0: sw    zero, 12(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1135,21 +1135,21 @@ L_100f1a0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100f1b4: 0x100f1b4: sw    v1, -30868(v0)
+// 0x0100f1c4: 0x100f1c4: sw    v1, -30404(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7717
+	ldc.i4 -7601
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f1b8: 0x100f1b8: addiu v0, zero, 1
+// 0x0100f1c8: 0x100f1c8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_100f1bc:
-// 0x0100f1bc: 0x100f1bc: lw    ra, 196(sp)
-// 0x0100f1c0: 0x100f1c0: lw    s8, 192(sp)
+L_100f1cc:
+// 0x0100f1cc: 0x100f1cc: lw    ra, 196(sp)
+// 0x0100f1d0: 0x100f1d0: lw    s8, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1158,7 +1158,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100f1c4: 0x100f1c4: lw    s7, 188(sp)
+// 0x0100f1d4: 0x100f1d4: lw    s7, 188(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100f1c8: 0x100f1c8: lw    s6, 184(sp)
+// 0x0100f1d8: 0x100f1d8: lw    s6, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1176,7 +1176,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100f1cc: 0x100f1cc: lw    s5, 180(sp)
+// 0x0100f1dc: 0x100f1dc: lw    s5, 180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1185,7 +1185,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100f1d0: 0x100f1d0: lw    s4, 176(sp)
+// 0x0100f1e0: 0x100f1e0: lw    s4, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1194,7 +1194,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100f1d4: 0x100f1d4: lw    s3, 172(sp)
+// 0x0100f1e4: 0x100f1e4: lw    s3, 172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1203,7 +1203,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100f1d8: 0x100f1d8: lw    s2, 168(sp)
+// 0x0100f1e8: 0x100f1e8: lw    s2, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1212,7 +1212,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100f1dc: 0x100f1dc: lw    s1, 164(sp)
+// 0x0100f1ec: 0x100f1ec: lw    s1, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1221,7 +1221,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100f1e0: 0x100f1e0: lw    s0, 160(sp)
+// 0x0100f1f0: 0x100f1f0: lw    s0, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1230,7 +1230,7 @@ L_100f1bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f1e4: 0x100f1e4: jr    ra addiu sp, sp, 200
+// 0x0100f1f4: 0x100f1f4: jr    ra addiu sp, sp, 200
 	ldloc.0
 	ldc.i4 200
 	add
@@ -1242,7 +1242,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_config_reload_100f1ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_reload_100f1fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1283,12 +1283,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f1ec: 0x100f1ec: addiu sp, sp, -40
+// 0x0100f1fc: 0x100f1fc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100f1f0: 0x100f1f0: sw    s1, 32(sp)
+// 0x0100f200: 0x100f200: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1297,10 +1297,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f1f4: 0x100f1f4: lui   s1, 0x0
+// 0x0100f204: 0x100f204: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0100f1f8: 0x100f1f8: sw    s0, 28(sp)
+// 0x0100f208: 0x100f208: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1309,57 +1309,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f1fc: 0x100f1fc: sw    ra, 36(sp)
-// 0x0100f200: 0x100f200: addu  s0, a0, zero
+// 0x0100f20c: 0x100f20c: sw    ra, 36(sp)
+// 0x0100f210: 0x100f210: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100f204: 0x100f204: j	 0x100f220 addiu s1, s1, 860
+// 0x0100f214: 0x100f214: j	 0x100f230 addiu s1, s1, 860
 	ldloc 6
 	ldc.i4 860
 	add
 	stloc 6
-	br L_100f220
+	br L_100f230
 // --- basic block ---
-L_100f20c:
-// 0x0100f20c: 0x100f20c: jal   0x1001b14 sll   zero, zero, 0
+L_100f21c:
+// 0x0100f21c: 0x100f21c: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100f214: 0x100f214: beq   v0, zero, 0x100f238 sll   zero, zero, 0
+// 0x0100f224: 0x100f224: beq   v0, zero, 0x100f248 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100f238
+	brfalse L_100f248
 // --- basic block ---
-// 0x0100f21c: 0x100f21c: addiu s1, s1, 32
+// 0x0100f22c: 0x100f22c: addiu s1, s1, 32
 	ldloc 6
 	ldc.i4.s 32
 	add
 	stloc 6
-L_100f220:
-// 0x0100f220: 0x100f220: lw    v0, 0(s1)
+L_100f230:
+// 0x0100f230: 0x100f230: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100f224: 0x100f224: addu  a1, s0, zero
+// 0x0100f234: 0x100f234: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0100f228: 0x100f228: bne   v0, zero, 0x100f20c addu  a0, v0, zero
+// 0x0100f238: 0x100f238: bne   v0, zero, 0x100f21c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brtrue L_100f20c
+	brtrue L_100f21c
 // --- basic block ---
-// 0x0100f230: 0x100f230: j	 0x100f2d8 lui   a1, 0x0
+// 0x0100f240: 0x100f240: j	 0x100f2e8 lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-	br L_100f2d8
+	br L_100f2e8
 // --- basic block ---
-L_100f238:
-// 0x0100f238: 0x100f238: lw    v0, 24(s1)
+L_100f248:
+// 0x0100f248: 0x100f248: lw    v0, 24(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1368,7 +1368,7 @@ L_100f238:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100f23c: 0x100f23c: lw    a0, 4(s1)
+// 0x0100f24c: 0x100f24c: lw    a0, 4(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1377,12 +1377,12 @@ L_100f238:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f240: 0x100f240: addiu v0, v0, 1
+// 0x0100f250: 0x100f250: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0100f244: 0x100f244: jal   0x104d204 sw    v0, 24(s1)
+// 0x0100f254: 0x100f254: jal   0x104d214 sw    v0, 24(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1396,35 +1396,35 @@ L_100f238:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100f24c: 0x100f24c: j	 0x100f274 addu  s0, v0, zero
+// 0x0100f25c: 0x100f25c: j	 0x100f284 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-	br L_100f274
+	br L_100f284
 // --- basic block ---
-L_100f254:
-// 0x0100f254: 0x100f254: jal   0x100f004 sll   zero, zero, 0
+L_100f264:
+// 0x0100f264: 0x100f264: jal   0x100f014 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::T_41_100f004(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::T_41_100f014(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100f25c: 0x100f25c: bne   v0, zero, 0x100f288 addu  a1, s0, zero
+// 0x0100f26c: 0x100f26c: bne   v0, zero, 0x100f298 addu  a1, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brtrue L_100f288
+	brtrue L_100f298
 // --- basic block ---
-// 0x0100f264: 0x100f264: lw    a0, 4(s1)
+// 0x0100f274: 0x100f274: lw    a0, 4(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1433,35 +1433,35 @@ L_100f254:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f268: 0x100f268: jal   0x104d18c sll   zero, zero, 0
+// 0x0100f278: 0x100f278: jal   0x104d19c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100f270: 0x100f270: addu  s0, v0, zero
+// 0x0100f280: 0x100f280: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_100f274:
-// 0x0100f274: 0x100f274: addu  a0, v0, zero
+L_100f284:
+// 0x0100f284: 0x100f284: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100f278: 0x100f278: bne   v0, zero, 0x100f254 addu  a1, s1, zero
+// 0x0100f288: 0x100f288: bne   v0, zero, 0x100f264 addu  a1, s1, zero
 	ldloc 5
 	ldloc 6
 	stloc.2
-	brtrue L_100f254
+	brtrue L_100f264
 // --- basic block ---
-// 0x0100f280: 0x100f280: j	 0x100f300 sll   zero, zero, 0
-	br L_100f300
+// 0x0100f290: 0x100f290: j	 0x100f310 sll   zero, zero, 0
+	br L_100f310
 // --- basic block ---
-L_100f288:
-// 0x0100f288: 0x100f288: lw    v1, 8(s1)
+L_100f298:
+// 0x0100f298: 0x100f298: lw    v1, 8(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1470,44 +1470,44 @@ L_100f288:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f28c: 0x100f28c: sll   zero, zero, 0
-// 0x0100f290: 0x100f290: beq   v1, zero, 0x100f2c0 sll   zero, zero, 0
+// 0x0100f29c: 0x100f29c: sll   zero, zero, 0
+// 0x0100f2a0: 0x100f2a0: beq   v1, zero, 0x100f2d0 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_100f2c0
+	brfalse L_100f2d0
 // --- basic block ---
-// 0x0100f298: 0x100f298: bne   v0, zero, 0x100f2c0 lui   a1, 0x0
+// 0x0100f2a8: 0x100f2a8: bne   v0, zero, 0x100f2d0 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_100f2c0
+	brtrue L_100f2d0
 // --- basic block ---
-// 0x0100f2a0: 0x100f2a0: lw    v0, 0(s1)
+// 0x0100f2b0: 0x100f2b0: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100f2a4: 0x100f2a4: lui   a3, 0x0
+// 0x0100f2b4: 0x100f2b4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f2a8: 0x100f2a8: addiu a1, a1, 25908
+// 0x0100f2b8: 0x100f2b8: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100f2ac: 0x100f2ac: addiu a3, a3, 26132
+// 0x0100f2bc: 0x100f2bc: addiu a3, a3, 26132
 	ldloc 4
 	ldc.i4 26132
 	add
 	stloc 4
-// 0x0100f2b0: 0x100f2b0: addiu a0, zero, 4
+// 0x0100f2c0: 0x100f2c0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100f2b4: 0x100f2b4: addiu a2, zero, 804
+// 0x0100f2c4: 0x100f2c4: addiu a2, zero, 804
 	ldc.i4 804
 	stloc.3
-// 0x0100f2b8: 0x100f2b8: j	 0x100f2f0 sw    v0, 16(sp)
+// 0x0100f2c8: 0x100f2c8: j	 0x100f300 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1516,15 +1516,15 @@ L_100f288:
 	add
 	ldloc 5
 	stelem.i4
-	br L_100f2f0
+	br L_100f300
 // --- basic block ---
-L_100f2c0:
-// 0x0100f2c0: 0x100f2c0: addu  v0, zero, zero
+L_100f2d0:
+// 0x0100f2d0: 0x100f2d0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_100f2c4:
-// 0x0100f2c4: 0x100f2c4: lw    ra, 36(sp)
-// 0x0100f2c8: 0x100f2c8: lw    s1, 32(sp)
+L_100f2d4:
+// 0x0100f2d4: 0x100f2d4: lw    ra, 36(sp)
+// 0x0100f2d8: 0x100f2d8: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1533,7 +1533,7 @@ L_100f2c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f2cc: 0x100f2cc: lw    s0, 28(sp)
+// 0x0100f2dc: 0x100f2dc: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1542,34 +1542,34 @@ L_100f2c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100f2d0: 0x100f2d0: jr    ra addiu sp, sp, 40
+// 0x0100f2e0: 0x100f2e0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_100f2d8:
-// 0x0100f2d8: 0x100f2d8: lui   a3, 0x0
+L_100f2e8:
+// 0x0100f2e8: 0x100f2e8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f2dc: 0x100f2dc: addiu a1, a1, 25908
+// 0x0100f2ec: 0x100f2ec: addiu a1, a1, 25908
 	ldloc.2
 	ldc.i4 25908
 	add
 	stloc.2
-// 0x0100f2e0: 0x100f2e0: addiu a3, a3, 26188
+// 0x0100f2f0: 0x100f2f0: addiu a3, a3, 26188
 	ldloc 4
 	ldc.i4 26188
 	add
 	stloc 4
-// 0x0100f2e4: 0x100f2e4: addiu a0, zero, 4
+// 0x0100f2f4: 0x100f2f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100f2e8: 0x100f2e8: addiu a2, zero, 772
+// 0x0100f2f8: 0x100f2f8: addiu a2, zero, 772
 	ldc.i4 772
 	stloc.3
-// 0x0100f2ec: 0x100f2ec: sw    s0, 16(sp)
+// 0x0100f2fc: 0x100f2fc: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1578,8 +1578,8 @@ L_100f2d8:
 	add
 	ldloc 9
 	stelem.i4
-L_100f2f0:
-// 0x0100f2f0: 0x100f2f0: jal   0x100449c sll   zero, zero, 0
+L_100f300:
+// 0x0100f300: 0x100f300: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1590,27 +1590,27 @@ L_100f2f0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100f2f8: 0x100f2f8: j	 0x100f2c4 addiu v0, zero, -1
+// 0x0100f308: 0x100f308: j	 0x100f2d4 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_100f2c4
+	br L_100f2d4
 // --- basic block ---
-L_100f300:
-// 0x0100f300: 0x100f300: jal   0x104c594 sll   zero, zero, 0
+L_100f310:
+// 0x0100f310: 0x100f310: jal   0x104c5a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_config_104c594(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_config_104c5a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100f308: 0x100f308: addu  a0, v0, zero
+// 0x0100f318: 0x100f318: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100f30c: 0x100f30c: jal   0x100f004 addu  a1, s1, zero
+// 0x0100f31c: 0x100f31c: jal   0x100f014 addu  a1, s1, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -1618,20 +1618,20 @@ L_100f300:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::T_41_100f004(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::T_41_100f014(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100f314: 0x100f314: j	 0x100f288 sll   zero, zero, 0
-	br L_100f288
+// 0x0100f324: 0x100f324: j	 0x100f298 sll   zero, zero, 0
+	br L_100f298
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_config_initialize_100f31c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_config_initialize_100f32c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -1669,12 +1669,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f31c: 0x100f31c: addiu sp, sp, -24
+// 0x0100f32c: 0x100f32c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100f320: 0x100f320: sw    s0, 16(sp)
+// 0x0100f330: 0x100f330: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1683,50 +1683,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100f324: 0x100f324: lui   s0, 0x0
+// 0x0100f334: 0x100f334: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100f328: 0x100f328: sw    ra, 20(sp)
-// 0x0100f32c: 0x100f32c: j	 0x100f33c addiu s0, s0, 860
+// 0x0100f338: 0x100f338: sw    ra, 20(sp)
+// 0x0100f33c: 0x100f33c: j	 0x100f34c addiu s0, s0, 860
 	ldloc 5
 	ldc.i4 860
 	add
 	stloc 5
-	br L_100f33c
+	br L_100f34c
 // --- basic block ---
-L_100f334:
-// 0x0100f334: 0x100f334: jal   0x100f1ec sll   zero, zero, 0
+L_100f344:
+// 0x0100f344: 0x100f344: jal   0x100f1fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_config_reload_100f1ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_config_reload_100f1fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-L_100f33c:
-// 0x0100f33c: 0x100f33c: lw    v0, 0(s0)
+L_100f34c:
+// 0x0100f34c: 0x100f34c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100f340: 0x100f340: addiu s0, s0, 32
+// 0x0100f350: 0x100f350: addiu s0, s0, 32
 	ldloc 5
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0100f344: 0x100f344: bne   v0, zero, 0x100f334 addu  a0, v0, zero
+// 0x0100f354: 0x100f354: bne   v0, zero, 0x100f344 addu  a0, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_100f334
+	brtrue L_100f344
 // --- basic block ---
-// 0x0100f34c: 0x100f34c: lw    ra, 20(sp)
-// 0x0100f350: 0x100f350: lw    s0, 16(sp)
+// 0x0100f35c: 0x100f35c: lw    ra, 20(sp)
+// 0x0100f360: 0x100f360: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1735,7 +1735,7 @@ L_100f33c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100f354: 0x100f354: jr    ra addiu sp, sp, 24
+// 0x0100f364: 0x100f364: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1747,7 +1747,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_state_refresh_100f35c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_state_refresh_100f36c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 ra,int32 v1)
@@ -1788,12 +1788,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f35c: 0x100f35c: addiu sp, sp, -32
+// 0x0100f36c: 0x100f36c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100f360: 0x100f360: sw    s1, 24(sp)
+// 0x0100f370: 0x100f370: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1802,7 +1802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f364: 0x100f364: sw    s0, 20(sp)
+// 0x0100f374: 0x100f374: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1811,41 +1811,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100f368: 0x100f368: lui   s1, 0x30000
+// 0x0100f378: 0x100f378: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0100f36c: 0x100f36c: lui   s0, 0x30000
+// 0x0100f37c: 0x100f37c: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100f370: 0x100f370: sw    ra, 28(sp)
-// 0x0100f374: 0x100f374: addiu s0, s0, -30864
+// 0x0100f380: 0x100f380: sw    ra, 28(sp)
+// 0x0100f384: 0x100f384: addiu s0, s0, -30400
 	ldloc 5
-	ldc.i4 -30864
+	ldc.i4 -30400
 	add
 	stloc 5
-// 0x0100f378: 0x100f378: addiu s1, s1, -30844
+// 0x0100f388: 0x100f388: addiu s1, s1, -30380
 	ldloc 7
-	ldc.i4 -30844
+	ldc.i4 -30380
 	add
 	stloc 7
-L_100f37c:
-// 0x0100f37c: 0x100f37c: lw    v0, 0(s0)
+L_100f38c:
+// 0x0100f38c: 0x100f38c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100f380: 0x100f380: sll   zero, zero, 0
-// 0x0100f384: 0x100f384: beq   v0, zero, 0x100f39c addiu s0, s0, 4
+// 0x0100f390: 0x100f390: sll   zero, zero, 0
+// 0x0100f394: 0x100f394: beq   v0, zero, 0x100f3ac addiu s0, s0, 4
 	ldloc 8
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_100f39c
+	brfalse L_100f3ac
 // --- basic block ---
-// 0x0100f38c: 0x100f38c: jalr  v0 sll   zero, zero, 0
+// 0x0100f39c: 0x100f39c: jalr  v0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -1857,14 +1857,14 @@ L_100f37c:
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x0100f394: 0x100f394: bne   s0, s1, 0x100f37c sll   zero, zero, 0
+// 0x0100f3a4: 0x100f3a4: bne   s0, s1, 0x100f38c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_100f37c
+	bne.un L_100f38c
 // --- basic block ---
-L_100f39c:
-// 0x0100f39c: 0x100f39c: lw    ra, 28(sp)
-// 0x0100f3a0: 0x100f3a0: lw    s1, 24(sp)
+L_100f3ac:
+// 0x0100f3ac: 0x100f3ac: lw    ra, 28(sp)
+// 0x0100f3b0: 0x100f3b0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1873,7 +1873,7 @@ L_100f39c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f3a4: 0x100f3a4: lw    s0, 20(sp)
+// 0x0100f3b4: 0x100f3b4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1882,7 +1882,7 @@ L_100f39c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100f3a8: 0x100f3a8: jr    ra addiu sp, sp, 32
+// 0x0100f3b8: 0x100f3b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1894,7 +1894,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_state_monitor_100f3b0(int32,int32)
+.method public static int32 roadmap_state_monitor_100f3c0(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1920,31 +1920,31 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f3b0: 0x100f3b0: lui   v0, 0x30000
+// 0x0100f3c0: 0x100f3c0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x0100f3b4: 0x100f3b4: lw    v1, -30864(v0)
+// 0x0100f3c4: 0x100f3c4: lw    v1, -30400(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7716
+	ldc.i4 -7600
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100f3b8: 0x100f3b8: sll   zero, zero, 0
-// 0x0100f3bc: 0x100f3bc: beq   v1, zero, 0x100f40c addu  a1, zero, zero
+// 0x0100f3c8: 0x100f3c8: sll   zero, zero, 0
+// 0x0100f3cc: 0x100f3cc: beq   v1, zero, 0x100f41c addu  a1, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_100f40c
+	brfalse L_100f41c
 // --- basic block ---
-// 0x0100f3c4: 0x100f3c4: addiu v0, v0, -30864
+// 0x0100f3d4: 0x100f3d4: addiu v0, v0, -30400
 	ldloc.2
-	ldc.i4 -30864
+	ldc.i4 -30400
 	add
 	stloc.2
-// 0x0100f3c8: 0x100f3c8: lw    v1, 4(v0)
+// 0x0100f3d8: 0x100f3d8: lw    v1, 4(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1953,14 +1953,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100f3cc: 0x100f3cc: sll   zero, zero, 0
-// 0x0100f3d0: 0x100f3d0: beq   v1, zero, 0x100f408 addiu a1, zero, 1
+// 0x0100f3dc: 0x100f3dc: sll   zero, zero, 0
+// 0x0100f3e0: 0x100f3e0: beq   v1, zero, 0x100f418 addiu a1, zero, 1
 	ldloc.3
 	ldc.i4.1
 	stloc.1
-	brfalse L_100f408
+	brfalse L_100f418
 // --- basic block ---
-// 0x0100f3d8: 0x100f3d8: lw    v1, 8(v0)
+// 0x0100f3e8: 0x100f3e8: lw    v1, 8(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1969,14 +1969,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100f3dc: 0x100f3dc: sll   zero, zero, 0
-// 0x0100f3e0: 0x100f3e0: beq   v1, zero, 0x100f408 addiu a1, zero, 2
+// 0x0100f3ec: 0x100f3ec: sll   zero, zero, 0
+// 0x0100f3f0: 0x100f3f0: beq   v1, zero, 0x100f418 addiu a1, zero, 2
 	ldloc.3
 	ldc.i4.2
 	stloc.1
-	brfalse L_100f408
+	brfalse L_100f418
 // --- basic block ---
-// 0x0100f3e8: 0x100f3e8: lw    v1, 12(v0)
+// 0x0100f3f8: 0x100f3f8: lw    v1, 12(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1985,14 +1985,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100f3ec: 0x100f3ec: sll   zero, zero, 0
-// 0x0100f3f0: 0x100f3f0: beq   v1, zero, 0x100f408 addiu a1, zero, 3
+// 0x0100f3fc: 0x100f3fc: sll   zero, zero, 0
+// 0x0100f400: 0x100f400: beq   v1, zero, 0x100f418 addiu a1, zero, 3
 	ldloc.3
 	ldc.i4.3
 	stloc.1
-	brfalse L_100f408
+	brfalse L_100f418
 // --- basic block ---
-// 0x0100f3f8: 0x100f3f8: lw    v0, 16(v0)
+// 0x0100f408: 0x100f408: lw    v0, 16(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -2001,42 +2001,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100f3fc: 0x100f3fc: sll   zero, zero, 0
-// 0x0100f400: 0x100f400: bne   v0, zero, 0x100f41c addiu a1, zero, 4
+// 0x0100f40c: 0x100f40c: sll   zero, zero, 0
+// 0x0100f410: 0x100f410: bne   v0, zero, 0x100f42c addiu a1, zero, 4
 	ldloc.2
 	ldc.i4.4
 	stloc.1
-	brtrue L_100f41c
+	brtrue L_100f42c
 // --- basic block ---
-L_100f408:
-// 0x0100f408: 0x100f408: lui   v0, 0x30000
+L_100f418:
+// 0x0100f418: 0x100f418: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.2
-L_100f40c:
-// 0x0100f40c: 0x100f40c: sll   a1, a1, 2
+L_100f41c:
+// 0x0100f41c: 0x100f41c: sll   a1, a1, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0100f410: 0x100f410: addiu v0, v0, -30864
+// 0x0100f420: 0x100f420: addiu v0, v0, -30400
 	ldloc.2
-	ldc.i4 -30864
+	ldc.i4 -30400
 	add
 	stloc.2
-// 0x0100f414: 0x100f414: addu  a1, a1, v0
+// 0x0100f424: 0x100f424: addu  a1, a1, v0
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x0100f418: 0x100f418: sw    a0, 0(a1)
+// 0x0100f428: 0x100f428: sw    a0, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-L_100f41c:
-// 0x0100f41c: 0x100f41c: jr    ra sll   zero, zero, 0
+L_100f42c:
+// 0x0100f42c: 0x100f42c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -2044,7 +2044,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_state_find_100f424(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_state_find_100f434(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -2085,15 +2085,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f424: 0x100f424: addiu sp, sp, -32
+// 0x0100f434: 0x100f434: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100f428: 0x100f428: lui   v0, 0x30000
+// 0x0100f438: 0x100f438: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0100f42c: 0x100f42c: sw    s1, 24(sp)
+// 0x0100f43c: 0x100f43c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2102,7 +2102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100f430: 0x100f430: sw    s0, 20(sp)
+// 0x0100f440: 0x100f440: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2111,40 +2111,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f434: 0x100f434: sw    ra, 28(sp)
-// 0x0100f438: 0x100f438: lw    s0, -30844(v0)
+// 0x0100f444: 0x100f444: sw    ra, 28(sp)
+// 0x0100f448: 0x100f448: lw    s0, -30380(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7711
+	ldc.i4 -7595
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f43c: 0x100f43c: j	 0x100f46c addu  s1, a0, zero
+// 0x0100f44c: 0x100f44c: j	 0x100f47c addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-	br L_100f46c
+	br L_100f47c
 // --- basic block ---
-L_100f444:
-// 0x0100f444: 0x100f444: lw    a0, 0(s0)
+L_100f454:
+// 0x0100f454: 0x100f454: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100f448: 0x100f448: jal   0x1001b14 sll   zero, zero, 0
+// 0x0100f458: 0x100f458: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0100f450: 0x100f450: bne   v0, zero, 0x100f464 sll   zero, zero, 0
+// 0x0100f460: 0x100f460: bne   v0, zero, 0x100f474 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_100f464
+	brtrue L_100f474
 // --- basic block ---
-// 0x0100f458: 0x100f458: lw    v0, 4(s0)
+// 0x0100f468: 0x100f468: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2153,11 +2153,11 @@ L_100f444:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f45c: 0x100f45c: j	 0x100f478 sll   zero, zero, 0
-	br L_100f478
+// 0x0100f46c: 0x100f46c: j	 0x100f488 sll   zero, zero, 0
+	br L_100f488
 // --- basic block ---
-L_100f464:
-// 0x0100f464: 0x100f464: lw    s0, 8(s0)
+L_100f474:
+// 0x0100f474: 0x100f474: lw    s0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2166,20 +2166,20 @@ L_100f464:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f468: 0x100f468: sll   zero, zero, 0
-L_100f46c:
-// 0x0100f46c: 0x100f46c: bne   s0, zero, 0x100f444 addu  a1, s1, zero
+// 0x0100f478: 0x100f478: sll   zero, zero, 0
+L_100f47c:
+// 0x0100f47c: 0x100f47c: bne   s0, zero, 0x100f454 addu  a1, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brtrue L_100f444
+	brtrue L_100f454
 // --- basic block ---
-// 0x0100f474: 0x100f474: addu  v0, zero, zero
+// 0x0100f484: 0x100f484: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_100f478:
-// 0x0100f478: 0x100f478: lw    ra, 28(sp)
-// 0x0100f47c: 0x100f47c: lw    s1, 24(sp)
+L_100f488:
+// 0x0100f488: 0x100f488: lw    ra, 28(sp)
+// 0x0100f48c: 0x100f48c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2188,7 +2188,7 @@ L_100f478:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f480: 0x100f480: lw    s0, 20(sp)
+// 0x0100f490: 0x100f490: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2197,7 +2197,7 @@ L_100f478:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f484: 0x100f484: jr    ra addiu sp, sp, 32
+// 0x0100f494: 0x100f494: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2209,7 +2209,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -2253,12 +2253,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f48c: 0x100f48c: addiu sp, sp, -32
+// 0x0100f49c: 0x100f49c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100f490: 0x100f490: sw    s2, 24(sp)
+// 0x0100f4a0: 0x100f4a0: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2267,14 +2267,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100f494: 0x100f494: addu  s2, a0, zero
+// 0x0100f4a4: 0x100f4a4: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0100f498: 0x100f498: addiu a0, zero, 12
+// 0x0100f4a8: 0x100f4a8: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0100f49c: 0x100f49c: sw    ra, 28(sp)
-// 0x0100f4a0: 0x100f4a0: sw    s1, 20(sp)
+// 0x0100f4ac: 0x100f4ac: sw    ra, 28(sp)
+// 0x0100f4b0: 0x100f4b0: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2283,7 +2283,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f4a4: 0x100f4a4: sw    s0, 16(sp)
+// 0x0100f4b4: 0x100f4b4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2292,7 +2292,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f4a8: 0x100f4a8: jal   0x1000910 addu  s1, a1, zero
+// 0x0100f4b8: 0x100f4b8: jal   0x1000910 addu  s1, a1, zero
 	ldloc.2
 	stloc 9
 	ldloc.0
@@ -2305,21 +2305,21 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0100f4b0: 0x100f4b0: lui   a0, 0x0
+// 0x0100f4c0: 0x100f4c0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100f4b4: 0x100f4b4: addiu a0, a0, 26252
+// 0x0100f4c4: 0x100f4c4: addiu a0, a0, 26252
 	ldloc.1
 	ldc.i4 26252
 	add
 	stloc.1
-// 0x0100f4b8: 0x100f4b8: addiu a1, zero, 59
+// 0x0100f4c8: 0x100f4c8: addiu a1, zero, 59
 	ldc.i4.s 59
 	stloc.2
-// 0x0100f4bc: 0x100f4bc: addu  a2, v0, zero
+// 0x0100f4cc: 0x100f4cc: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x0100f4c0: 0x100f4c0: jal   0x1004a38 addu  s0, v0, zero
+// 0x0100f4d0: 0x100f4d0: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 7
 	stloc 6
 	ldloc.0
@@ -2327,12 +2327,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0100f4c8: 0x100f4c8: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0100f4d8: 0x100f4d8: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2345,20 +2345,20 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0100f4d0: 0x100f4d0: lui   v1, 0x30000
+// 0x0100f4e0: 0x100f4e0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0100f4d4: 0x100f4d4: lw    a0, -30844(v1)
+// 0x0100f4e4: 0x100f4e4: lw    a0, -30380(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7711
+	ldc.i4 -7595
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f4d8: 0x100f4d8: lw    ra, 28(sp)
-// 0x0100f4dc: 0x100f4dc: sw    s1, 4(s0)
+// 0x0100f4e8: 0x100f4e8: lw    ra, 28(sp)
+// 0x0100f4ec: 0x100f4ec: sw    s1, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2367,23 +2367,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f4e0: 0x100f4e0: sw    s0, -30844(v1)
+// 0x0100f4f0: 0x100f4f0: sw    s0, -30380(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7711
+	ldc.i4 -7595
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f4e4: 0x100f4e4: sw    v0, 0(s0)
+// 0x0100f4f4: 0x100f4f4: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0100f4e8: 0x100f4e8: sw    a0, 8(s0)
+// 0x0100f4f8: 0x100f4f8: sw    a0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2392,7 +2392,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100f4ec: 0x100f4ec: lw    s2, 24(sp)
+// 0x0100f4fc: 0x100f4fc: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2401,7 +2401,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100f4f0: 0x100f4f0: lw    s1, 20(sp)
+// 0x0100f500: 0x100f500: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2410,7 +2410,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100f4f4: 0x100f4f4: lw    s0, 16(sp)
+// 0x0100f504: 0x100f504: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2419,7 +2419,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f4f8: 0x100f4f8: jr    ra addiu sp, sp, 32
+// 0x0100f508: 0x100f508: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2431,7 +2431,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 upload_file_size_callback_100f528()
+.method public static int32 upload_file_size_callback_100f538()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -2445,8 +2445,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100f528:
-// 0x0100f528: 0x100f528: jr    ra addiu v0, zero, 1
+L_100f538:
+// 0x0100f538: 0x100f538: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -2454,7 +2454,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void upload_progress_callback_100f530()
+.method public static void upload_progress_callback_100f540()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2465,13 +2465,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100f530:
-// 0x0100f530: 0x100f530: jr    ra sll   zero, zero, 0
+L_100f540:
+// 0x0100f540: 0x100f540: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_camera_image_shutdown_100f538(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_camera_image_shutdown_100f548(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -2515,12 +2515,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f538: 0x100f538: addiu sp, sp, -32
+// 0x0100f548: 0x100f548: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100f53c: 0x100f53c: sw    s2, 24(sp)
+// 0x0100f54c: 0x100f54c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2529,7 +2529,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f540: 0x100f540: sw    s1, 20(sp)
+// 0x0100f550: 0x100f550: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2538,7 +2538,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100f544: 0x100f544: sw    s0, 16(sp)
+// 0x0100f554: 0x100f554: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2547,71 +2547,71 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100f548: 0x100f548: lui   s2, 0x30000
+// 0x0100f558: 0x100f558: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x0100f54c: 0x100f54c: lui   s0, 0x30000
+// 0x0100f55c: 0x100f55c: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100f550: 0x100f550: lui   s1, 0x10000
+// 0x0100f560: 0x100f560: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0100f554: 0x100f554: sw    ra, 28(sp)
-// 0x0100f558: 0x100f558: addiu s0, s0, -30840
+// 0x0100f564: 0x100f564: sw    ra, 28(sp)
+// 0x0100f568: 0x100f568: addiu s0, s0, -30376
 	ldloc 5
-	ldc.i4 -30840
+	ldc.i4 -30376
 	add
 	stloc 5
-// 0x0100f55c: 0x100f55c: addiu s2, s2, -30640
+// 0x0100f56c: 0x100f56c: addiu s2, s2, -30176
 	ldloc 9
-	ldc.i4 -30640
+	ldc.i4 -30176
 	add
 	stloc 9
-// 0x0100f560: 0x100f560: addiu s1, s1, 18500
+// 0x0100f570: 0x100f570: addiu s1, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 8
-L_100f564:
-// 0x0100f564: 0x100f564: lw    v0, 0(s0)
+L_100f574:
+// 0x0100f574: 0x100f574: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100f568: 0x100f568: addu  a0, s1, zero
+// 0x0100f578: 0x100f578: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0100f56c: 0x100f56c: beq   v0, zero, 0x100f5ac addu  a1, v0, zero
+// 0x0100f57c: 0x100f57c: beq   v0, zero, 0x100f5bc addu  a1, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.2
-	brfalse L_100f5ac
+	brfalse L_100f5bc
 // --- basic block ---
-// 0x0100f574: 0x100f574: jal   0x104d690 sll   zero, zero, 0
+// 0x0100f584: 0x100f584: jal   0x104d6a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0100f57c: 0x100f57c: beq   v0, zero, 0x100f590 sll   zero, zero, 0
+// 0x0100f58c: 0x100f58c: beq   v0, zero, 0x100f5a0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_100f590
+	brfalse L_100f5a0
 // --- basic block ---
-// 0x0100f584: 0x100f584: lw    a1, 0(s0)
+// 0x0100f594: 0x100f594: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0100f588: 0x100f588: jal   0x104da04 addu  a0, s1, zero
+// 0x0100f598: 0x100f598: jal   0x104da14 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2619,20 +2619,20 @@ L_100f564:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-L_100f590:
-// 0x0100f590: 0x100f590: lw    a0, 0(s0)
+L_100f5a0:
+// 0x0100f5a0: 0x100f5a0: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100f594: 0x100f594: jal   0x1000930 sll   zero, zero, 0
+// 0x0100f5a4: 0x100f5a4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2643,26 +2643,26 @@ L_100f590:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0100f59c: 0x100f59c: sw    zero, 0(s0)
+// 0x0100f5ac: 0x100f5ac: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100f5a0: 0x100f5a0: addiu s0, s0, 4
+// 0x0100f5b0: 0x100f5b0: addiu s0, s0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x0100f5a4: 0x100f5a4: bne   s0, s2, 0x100f564 sll   zero, zero, 0
+// 0x0100f5b4: 0x100f5b4: bne   s0, s2, 0x100f574 sll   zero, zero, 0
 	ldloc 5
 	ldloc 9
-	bne.un L_100f564
+	bne.un L_100f574
 // --- basic block ---
-L_100f5ac:
-// 0x0100f5ac: 0x100f5ac: lw    ra, 28(sp)
-// 0x0100f5b0: 0x100f5b0: lw    s2, 24(sp)
+L_100f5bc:
+// 0x0100f5bc: 0x100f5bc: lw    ra, 28(sp)
+// 0x0100f5c0: 0x100f5c0: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2671,7 +2671,7 @@ L_100f5ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100f5b4: 0x100f5b4: lw    s1, 20(sp)
+// 0x0100f5c4: 0x100f5c4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2680,7 +2680,7 @@ L_100f5ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f5b8: 0x100f5b8: lw    s0, 16(sp)
+// 0x0100f5c8: 0x100f5c8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2689,7 +2689,7 @@ L_100f5ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100f5bc: 0x100f5bc: jr    ra addiu sp, sp, 32
+// 0x0100f5cc: 0x100f5cc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2701,7 +2701,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_camera_image_initialize_100f5c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_camera_image_initialize_100f5d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s1,int32 s3,int32 ra)
@@ -2748,12 +2748,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f5c4: 0x100f5c4: addiu sp, sp, -40
+// 0x0100f5d4: 0x100f5d4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100f5c8: 0x100f5c8: sw    s3, 32(sp)
+// 0x0100f5d8: 0x100f5d8: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2762,7 +2762,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100f5cc: 0x100f5cc: sw    s2, 28(sp)
+// 0x0100f5dc: 0x100f5dc: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2771,35 +2771,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100f5d0: 0x100f5d0: lui   s3, 0x0
+// 0x0100f5e0: 0x100f5e0: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0100f5d4: 0x100f5d4: lui   s2, 0x10000
+// 0x0100f5e4: 0x100f5e4: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0100f5d8: 0x100f5d8: lui   a2, 0x0
+// 0x0100f5e8: 0x100f5e8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100f5dc: 0x100f5dc: addiu a0, s2, 12560
+// 0x0100f5ec: 0x100f5ec: addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0100f5e0: 0x100f5e0: addiu a1, s3, 1020
+// 0x0100f5f0: 0x100f5f0: addiu a1, s3, 1020
 	ldloc 11
 	ldc.i4 1020
 	add
 	stloc.2
-// 0x0100f5e4: 0x100f5e4: addiu a2, a2, 21228
+// 0x0100f5f4: 0x100f5f4: addiu a2, a2, 21228
 	ldloc.3
 	ldc.i4 21228
 	add
 	stloc.3
-// 0x0100f5e8: 0x100f5e8: addu  a3, zero, zero
+// 0x0100f5f8: 0x100f5f8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f5ec: 0x100f5ec: sw    ra, 36(sp)
-// 0x0100f5f0: 0x100f5f0: sw    s1, 24(sp)
+// 0x0100f5fc: 0x100f5fc: sw    ra, 36(sp)
+// 0x0100f600: 0x100f600: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2808,7 +2808,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100f5f4: 0x100f5f4: sw    s0, 20(sp)
+// 0x0100f604: 0x100f604: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2817,7 +2817,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f5f8: 0x100f5f8: jal   0x100edb0 lui   s1, 0x0
+// 0x0100f608: 0x100f608: jal   0x100edc0 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -2825,30 +2825,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f600: 0x100f600: lui   a2, 0x0
+// 0x0100f610: 0x100f610: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100f604: 0x100f604: addiu a0, s2, 12560
+// 0x0100f614: 0x100f614: addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0100f608: 0x100f608: addiu a1, s1, 1036
+// 0x0100f618: 0x100f618: addiu a1, s1, 1036
 	ldloc 10
 	ldc.i4 1036
 	add
 	stloc.2
-// 0x0100f60c: 0x100f60c: addiu a2, a2, 26280
+// 0x0100f61c: 0x100f61c: addiu a2, a2, 26280
 	ldloc.3
 	ldc.i4 26280
 	add
 	stloc.3
-// 0x0100f610: 0x100f610: jal   0x100edb0 addu  a3, zero, zero
+// 0x0100f620: 0x100f620: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2856,33 +2856,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f618: 0x100f618: lui   s0, 0x0
+// 0x0100f628: 0x100f628: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0100f61c: 0x100f61c: lui   a2, 0x10000
+// 0x0100f62c: 0x100f62c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0100f620: 0x100f620: addiu a0, s2, 12560
+// 0x0100f630: 0x100f630: addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0100f624: 0x100f624: addiu a1, s0, 1052
+// 0x0100f634: 0x100f634: addiu a1, s0, 1052
 	ldloc 9
 	ldc.i4 1052
 	add
 	stloc.2
-// 0x0100f628: 0x100f628: addiu a2, a2, -16892
+// 0x0100f638: 0x100f638: addiu a2, a2, 19396
 	ldloc.3
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc.3
-// 0x0100f62c: 0x100f62c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0100f63c: 0x100f63c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2890,33 +2890,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f634: 0x100f634: lui   a1, 0x0
+// 0x0100f644: 0x100f644: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100f638: 0x100f638: lui   a2, 0x10000
+// 0x0100f648: 0x100f648: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0100f63c: 0x100f63c: addiu a0, s2, 12560
+// 0x0100f64c: 0x100f64c: addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0100f640: 0x100f640: addiu a1, a1, 1068
+// 0x0100f650: 0x100f650: addiu a1, a1, 1068
 	ldloc.2
 	ldc.i4 1068
 	add
 	stloc.2
-// 0x0100f644: 0x100f644: addiu a2, a2, 18500
+// 0x0100f654: 0x100f654: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0100f648: 0x100f648: jal   0x100edb0 addu  a3, zero, zero
+// 0x0100f658: 0x100f658: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2924,33 +2924,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f650: 0x100f650: lui   a1, 0x0
+// 0x0100f660: 0x100f660: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100f654: 0x100f654: lui   a2, 0x0
+// 0x0100f664: 0x100f664: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100f658: 0x100f658: addiu a1, a1, 1084
+// 0x0100f668: 0x100f668: addiu a1, a1, 1084
 	ldloc.2
 	ldc.i4 1084
 	add
 	stloc.2
-// 0x0100f65c: 0x100f65c: addiu a2, a2, 26284
+// 0x0100f66c: 0x100f66c: addiu a2, a2, 26284
 	ldloc.3
 	ldc.i4 26284
 	add
 	stloc.3
-// 0x0100f660: 0x100f660: addu  a3, zero, zero
+// 0x0100f670: 0x100f670: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f664: 0x100f664: jal   0x100edb0 addiu a0, s2, 12560
+// 0x0100f674: 0x100f674: jal   0x100edc0 addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
 	ldloc.0
@@ -2958,12 +2958,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f66c: 0x100f66c: jal   0x100e788 addiu a0, s3, 1020
+// 0x0100f67c: 0x100f67c: jal   0x100e798 addiu a0, s3, 1020
 	ldloc 11
 	ldc.i4 1020
 	add
@@ -2973,20 +2973,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f674: 0x100f674: addiu a0, s1, 1036
+// 0x0100f684: 0x100f684: addiu a0, s1, 1036
 	ldloc 10
 	ldc.i4 1036
 	add
 	stloc.1
-// 0x0100f678: 0x100f678: lui   v1, 0x0
+// 0x0100f688: 0x100f688: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100f67c: 0x100f67c: jal   0x100e788 sw    v0, 1100(v1)
+// 0x0100f68c: 0x100f68c: jal   0x100e798 sw    v0, 1100(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3000,20 +3000,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f684: 0x100f684: lui   v1, 0x0
+// 0x0100f694: 0x100f694: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100f688: 0x100f688: addiu a0, s0, 1052
+// 0x0100f698: 0x100f698: addiu a0, s0, 1052
 	ldloc 9
 	ldc.i4 1052
 	add
 	stloc.1
-// 0x0100f68c: 0x100f68c: jal   0x100e788 sw    v0, 1104(v1)
+// 0x0100f69c: 0x100f69c: jal   0x100e798 sw    v0, 1104(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3027,16 +3027,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100f694: 0x100f694: lw    ra, 36(sp)
-// 0x0100f698: 0x100f698: lui   v1, 0x0
+// 0x0100f6a4: 0x100f6a4: lw    ra, 36(sp)
+// 0x0100f6a8: 0x100f6a8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100f69c: 0x100f69c: lw    s3, 32(sp)
+// 0x0100f6ac: 0x100f6ac: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3045,7 +3045,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100f6a0: 0x100f6a0: lw    s2, 28(sp)
+// 0x0100f6b0: 0x100f6b0: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3054,7 +3054,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f6a4: 0x100f6a4: lw    s1, 24(sp)
+// 0x0100f6b4: 0x100f6b4: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3063,7 +3063,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100f6a8: 0x100f6a8: lw    s0, 20(sp)
+// 0x0100f6b8: 0x100f6b8: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3072,7 +3072,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100f6ac: 0x100f6ac: sw    v0, 1108(v1)
+// 0x0100f6bc: 0x100f6bc: sw    v0, 1108(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3081,7 +3081,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f6b0: 0x100f6b0: jr    ra addiu sp, sp, 40
+// 0x0100f6c0: 0x100f6c0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3093,7 +3093,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_camera_image_capture_100f6b8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_camera_image_capture_100f6c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3134,12 +3134,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100f6b8: 0x100f6b8: addiu sp, sp, -40
+// 0x0100f6c8: 0x100f6c8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100f6bc: 0x100f6bc: lw    v0, 4(a0)
+// 0x0100f6cc: 0x100f6cc: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3148,14 +3148,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f6c0: 0x100f6c0: lw    v1, 0(a0)
+// 0x0100f6d0: 0x100f6d0: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100f6c4: 0x100f6c4: sw    s0, 28(sp)
+// 0x0100f6d4: 0x100f6d4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3164,13 +3164,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100f6c8: 0x100f6c8: lui   a3, 0x0
+// 0x0100f6d8: 0x100f6d8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f6cc: 0x100f6cc: lui   s0, 0x0
+// 0x0100f6dc: 0x100f6dc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0100f6d0: 0x100f6d0: sw    s1, 32(sp)
+// 0x0100f6e0: 0x100f6e0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3179,27 +3179,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f6d4: 0x100f6d4: addiu a3, a3, 26376
+// 0x0100f6e4: 0x100f6e4: addiu a3, a3, 26376
 	ldloc 4
 	ldc.i4 26376
 	add
 	stloc 4
-// 0x0100f6d8: 0x100f6d8: addu  s1, a1, zero
+// 0x0100f6e8: 0x100f6e8: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0100f6dc: 0x100f6dc: addiu a0, zero, 1
+// 0x0100f6ec: 0x100f6ec: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100f6e0: 0x100f6e0: addiu a1, s0, 26340
+// 0x0100f6f0: 0x100f6f0: addiu a1, s0, 26340
 	ldloc 8
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f6e4: 0x100f6e4: addiu a2, zero, 438
+// 0x0100f6f4: 0x100f6f4: addiu a2, zero, 438
 	ldc.i4 438
 	stloc.3
-// 0x0100f6e8: 0x100f6e8: sw    ra, 36(sp)
-// 0x0100f6ec: 0x100f6ec: sw    v1, 16(sp)
+// 0x0100f6f8: 0x100f6f8: sw    ra, 36(sp)
+// 0x0100f6fc: 0x100f6fc: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3208,7 +3208,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f6f0: 0x100f6f0: jal   0x100449c sw    v0, 20(sp)
+// 0x0100f700: 0x100f700: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3227,29 +3227,29 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f6f8: 0x100f6f8: bne   s1, zero, 0x100f71c lui   a1, 0x0
+// 0x0100f708: 0x100f708: bne   s1, zero, 0x100f72c lui   a1, 0x0
 	ldloc 9
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_100f71c
+	brtrue L_100f72c
 // --- basic block ---
-// 0x0100f700: 0x100f700: lui   a3, 0x0
+// 0x0100f710: 0x100f710: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f704: 0x100f704: addiu a1, s0, 26340
+// 0x0100f714: 0x100f714: addiu a1, s0, 26340
 	ldloc 8
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f708: 0x100f708: addiu a3, a3, 26428
+// 0x0100f718: 0x100f718: addiu a3, a3, 26428
 	ldloc 4
 	ldc.i4 26428
 	add
 	stloc 4
-// 0x0100f70c: 0x100f70c: addiu a0, zero, 1
+// 0x0100f71c: 0x100f71c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100f710: 0x100f710: jal   0x100449c addiu a2, zero, 446
+// 0x0100f720: 0x100f720: jal   0x100449c addiu a2, zero, 446
 	ldc.i4 446
 	stloc.3
 	ldloc.0
@@ -3262,27 +3262,27 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f718: 0x100f718: lui   a1, 0x0
+// 0x0100f728: 0x100f728: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_100f71c:
-// 0x0100f71c: 0x100f71c: lui   a3, 0x0
+L_100f72c:
+// 0x0100f72c: 0x100f72c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f720: 0x100f720: addiu a1, a1, 26340
+// 0x0100f730: 0x100f730: addiu a1, a1, 26340
 	ldloc.2
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f724: 0x100f724: addiu a3, a3, 26484
+// 0x0100f734: 0x100f734: addiu a3, a3, 26484
 	ldloc 4
 	ldc.i4 26484
 	add
 	stloc 4
-// 0x0100f728: 0x100f728: addiu a0, zero, 3
+// 0x0100f738: 0x100f738: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0100f72c: 0x100f72c: jal   0x100449c addiu a2, zero, 451
+// 0x0100f73c: 0x100f73c: jal   0x100449c addiu a2, zero, 451
 	ldc.i4 451
 	stloc.3
 	ldloc.0
@@ -3295,11 +3295,11 @@ L_100f71c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100f734: 0x100f734: lw    ra, 36(sp)
-// 0x0100f738: 0x100f738: addu  v0, zero, zero
+// 0x0100f744: 0x100f744: lw    ra, 36(sp)
+// 0x0100f748: 0x100f748: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0100f73c: 0x100f73c: lw    s1, 32(sp)
+// 0x0100f74c: 0x100f74c: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3308,7 +3308,7 @@ L_100f71c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100f740: 0x100f740: lw    s0, 28(sp)
+// 0x0100f750: 0x100f750: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3317,7 +3317,7 @@ L_100f71c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f744: 0x100f744: jr    ra addiu sp, sp, 40
+// 0x0100f754: 0x100f754: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3329,7 +3329,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 download_error_callback_100f74c(int32,int32,int32,int32,int32)
+.method public static int32 download_error_callback_100f75c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -3370,18 +3370,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100f74c:
-// 0x0100f74c: 0x100f74c: addiu sp, sp, -1064
+L_100f75c:
+// 0x0100f75c: 0x100f75c: addiu sp, sp, -1064
 	ldloc.0
 	ldc.i4 -1064
 	add
 	stloc.0
-// 0x0100f750: 0x100f750: addiu v0, sp, 1076
+// 0x0100f760: 0x100f760: addiu v0, sp, 1076
 	ldloc.0
 	ldc.i4 1076
 	add
 	stloc 6
-// 0x0100f754: 0x100f754: sw    s1, 1056(sp)
+// 0x0100f764: 0x100f764: sw    s1, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3390,12 +3390,12 @@ L_100f74c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100f758: 0x100f758: addiu s1, sp, 20
+// 0x0100f768: 0x100f768: addiu s1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 8
-// 0x0100f75c: 0x100f75c: sw    s0, 1052(sp)
+// 0x0100f76c: 0x100f76c: sw    s0, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3404,7 +3404,7 @@ L_100f74c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f760: 0x100f760: sw    a3, 1076(sp)
+// 0x0100f770: 0x100f770: sw    a3, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3413,20 +3413,20 @@ L_100f74c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100f764: 0x100f764: addu  s0, a0, zero
+// 0x0100f774: 0x100f774: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0100f768: 0x100f768: addu  a3, v0, zero
+// 0x0100f778: 0x100f778: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0100f76c: 0x100f76c: addu  a0, s1, zero
+// 0x0100f77c: 0x100f77c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0100f770: 0x100f770: addiu a1, zero, 1024
+// 0x0100f780: 0x100f780: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x0100f774: 0x100f774: sw    ra, 1060(sp)
-// 0x0100f778: 0x100f778: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x0100f784: 0x100f784: sw    ra, 1060(sp)
+// 0x0100f788: 0x100f788: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3440,26 +3440,26 @@ L_100f74c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0100f780: 0x100f780: lui   a1, 0x0
+// 0x0100f790: 0x100f790: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100f784: 0x100f784: addiu a0, zero, 3
+// 0x0100f794: 0x100f794: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0100f788: 0x100f788: addiu a1, a1, 26340
+// 0x0100f798: 0x100f798: addiu a1, a1, 26340
 	ldloc.2
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f78c: 0x100f78c: addu  a3, s1, zero
+// 0x0100f79c: 0x100f79c: addu  a3, s1, zero
 	ldloc 8
 	stloc 4
-// 0x0100f790: 0x100f790: jal   0x100449c addiu a2, zero, 296
+// 0x0100f7a0: 0x100f7a0: jal   0x100449c addiu a2, zero, 296
 	ldc.i4 296
 	stloc.3
 	ldloc.0
@@ -3472,7 +3472,7 @@ L_100f74c:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0100f798: 0x100f798: lw    a0, 4(s0)
+// 0x0100f7a8: 0x100f7a8: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3481,12 +3481,12 @@ L_100f74c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f79c: 0x100f79c: sll   zero, zero, 0
-// 0x0100f7a0: 0x100f7a0: beq   a0, zero, 0x100f7b4 sll   zero, zero, 0
+// 0x0100f7ac: 0x100f7ac: sll   zero, zero, 0
+// 0x0100f7b0: 0x100f7b0: beq   a0, zero, 0x100f7c4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_100f7b4
+	brfalse L_100f7c4
 // --- basic block ---
-// 0x0100f7a8: 0x100f7a8: jal   0x1000930 sll   zero, zero, 0
+// 0x0100f7b8: 0x100f7b8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3497,7 +3497,7 @@ L_100f74c:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0100f7b0: 0x100f7b0: sw    zero, 4(s0)
+// 0x0100f7c0: 0x100f7c0: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3506,8 +3506,8 @@ L_100f74c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100f7b4:
-// 0x0100f7b4: 0x100f7b4: lw    a0, 16(s0)
+L_100f7c4:
+// 0x0100f7c4: 0x100f7c4: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3516,7 +3516,7 @@ L_100f7b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f7b8: 0x100f7b8: lw    v0, 12(s0)
+// 0x0100f7c8: 0x100f7c8: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3525,10 +3525,10 @@ L_100f7b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f7bc: 0x100f7bc: addiu a1, zero, -1
+// 0x0100f7cc: 0x100f7cc: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0100f7c0: 0x100f7c0: jalr  v0 addu  a2, zero, zero
+// 0x0100f7d0: 0x100f7d0: jalr  v0 addu  a2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.3
@@ -3542,8 +3542,8 @@ L_100f7b4:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0100f7c8: 0x100f7c8: lw    ra, 1060(sp)
-// 0x0100f7cc: 0x100f7cc: lw    s1, 1056(sp)
+// 0x0100f7d8: 0x100f7d8: lw    ra, 1060(sp)
+// 0x0100f7dc: 0x100f7dc: lw    s1, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3552,7 +3552,7 @@ L_100f7b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f7d0: 0x100f7d0: lw    s0, 1052(sp)
+// 0x0100f7e0: 0x100f7e0: lw    s0, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3561,7 +3561,7 @@ L_100f7b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f7d4: 0x100f7d4: jr    ra addiu sp, sp, 1064
+// 0x0100f7e4: 0x100f7e4: jr    ra addiu sp, sp, 1064
 	ldloc.0
 	ldc.i4 1064
 	add
@@ -3573,7 +3573,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 download_progress_callback_100f7dc(int32,int32,int32,int32,int32)
+.method public static int32 download_progress_callback_100f7ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 ra,int32 v1)
@@ -3614,8 +3614,8 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100f7dc:
-// 0x0100f7dc: 0x100f7dc: lw    v0, 4(a0)
+L_100f7ec:
+// 0x0100f7ec: 0x100f7ec: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3624,12 +3624,12 @@ L_100f7dc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f7e0: 0x100f7e0: addiu sp, sp, -32
+// 0x0100f7f0: 0x100f7f0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100f7e4: 0x100f7e4: sw    s1, 24(sp)
+// 0x0100f7f4: 0x100f7f4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3638,7 +3638,7 @@ L_100f7dc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f7e8: 0x100f7e8: sw    s0, 20(sp)
+// 0x0100f7f8: 0x100f7f8: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3647,17 +3647,17 @@ L_100f7dc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100f7ec: 0x100f7ec: sw    ra, 28(sp)
-// 0x0100f7f0: 0x100f7f0: addu  s0, a0, zero
+// 0x0100f7fc: 0x100f7fc: sw    ra, 28(sp)
+// 0x0100f800: 0x100f800: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0100f7f4: 0x100f7f4: beq   v0, zero, 0x100f818 addu  s1, a2, zero
+// 0x0100f804: 0x100f804: beq   v0, zero, 0x100f828 addu  s1, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 7
-	brfalse L_100f818
+	brfalse L_100f828
 // --- basic block ---
-// 0x0100f7fc: 0x100f7fc: lw    a0, 8(a0)
+// 0x0100f80c: 0x100f80c: lw    a0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3666,7 +3666,7 @@ L_100f7dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f800: 0x100f800: jal   0x1001800 addu  a0, v0, a0
+// 0x0100f810: 0x100f810: jal   0x1001800 addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
@@ -3680,7 +3680,7 @@ L_100f7dc:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0100f808: 0x100f808: lw    v0, 8(s0)
+// 0x0100f818: 0x100f818: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3689,13 +3689,13 @@ L_100f7dc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f80c: 0x100f80c: sll   zero, zero, 0
-// 0x0100f810: 0x100f810: addu  s1, v0, s1
+// 0x0100f81c: 0x100f81c: sll   zero, zero, 0
+// 0x0100f820: 0x100f820: addu  s1, v0, s1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x0100f814: 0x100f814: sw    s1, 8(s0)
+// 0x0100f824: 0x100f824: sw    s1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3704,9 +3704,9 @@ L_100f7dc:
 	add
 	ldloc 7
 	stelem.i4
-L_100f818:
-// 0x0100f818: 0x100f818: lw    ra, 28(sp)
-// 0x0100f81c: 0x100f81c: lw    s1, 24(sp)
+L_100f828:
+// 0x0100f828: 0x100f828: lw    ra, 28(sp)
+// 0x0100f82c: 0x100f82c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3715,7 +3715,7 @@ L_100f818:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f820: 0x100f820: lw    s0, 20(sp)
+// 0x0100f830: 0x100f830: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3724,7 +3724,7 @@ L_100f818:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100f824: 0x100f824: jr    ra addiu sp, sp, 32
+// 0x0100f834: 0x100f834: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3736,7 +3736,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 upload_done_100f82c(int32,int32,int32,int32,int32)
+.method public static int32 upload_done_100f83c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -3777,13 +3777,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100f82c:
-// 0x0100f82c: 0x100f82c: addiu sp, sp, -544
+L_100f83c:
+// 0x0100f83c: 0x100f83c: addiu sp, sp, -544
 	ldloc.0
 	ldc.i4 -544
 	add
 	stloc.0
-// 0x0100f830: 0x100f830: sw    s0, 532(sp)
+// 0x0100f840: 0x100f840: sw    s0, 532(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3792,8 +3792,8 @@ L_100f82c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f834: 0x100f834: sw    ra, 540(sp)
-// 0x0100f838: 0x100f838: sw    s1, 536(sp)
+// 0x0100f844: 0x100f844: sw    ra, 540(sp)
+// 0x0100f848: 0x100f848: sw    s1, 536(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3802,7 +3802,7 @@ L_100f82c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100f83c: 0x100f83c: sw    a2, 552(sp)
+// 0x0100f84c: 0x100f84c: sw    a2, 552(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3811,7 +3811,7 @@ L_100f82c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0100f840: 0x100f840: sw    a3, 556(sp)
+// 0x0100f850: 0x100f850: sw    a3, 556(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3820,35 +3820,35 @@ L_100f82c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100f844: 0x100f844: beq   a1, zero, 0x100f894 addu  s0, a0, zero
+// 0x0100f854: 0x100f854: beq   a1, zero, 0x100f8a4 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 7
-	brfalse L_100f894
+	brfalse L_100f8a4
 // --- basic block ---
-// 0x0100f84c: 0x100f84c: addiu v0, sp, 552
+// 0x0100f85c: 0x100f85c: addiu v0, sp, 552
 	ldloc.0
 	ldc.i4 552
 	add
 	stloc 6
-// 0x0100f850: 0x100f850: addiu s1, sp, 28
+// 0x0100f860: 0x100f860: addiu s1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x0100f854: 0x100f854: addu  a2, a1, zero
+// 0x0100f864: 0x100f864: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0100f858: 0x100f858: addu  a3, v0, zero
+// 0x0100f868: 0x100f868: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0100f85c: 0x100f85c: addu  a0, s1, zero
+// 0x0100f86c: 0x100f86c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100f860: 0x100f860: addiu a1, zero, 500
+// 0x0100f870: 0x100f870: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x0100f864: 0x100f864: jal   0x10c0a70 sw    v0, 24(sp)
+// 0x0100f874: 0x100f874: jal   0x10c10b0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3862,12 +3862,12 @@ L_100f82c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f86c: 0x100f86c: lw    v0, 8(s0)
+// 0x0100f87c: 0x100f87c: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3876,29 +3876,29 @@ L_100f82c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f870: 0x100f870: lui   a1, 0x0
+// 0x0100f880: 0x100f880: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100f874: 0x100f874: lui   a3, 0x0
+// 0x0100f884: 0x100f884: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f878: 0x100f878: addiu a1, a1, 26340
+// 0x0100f888: 0x100f888: addiu a1, a1, 26340
 	ldloc.2
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f87c: 0x100f87c: addiu a3, a3, 26512
+// 0x0100f88c: 0x100f88c: addiu a3, a3, 26512
 	ldloc 4
 	ldc.i4 26512
 	add
 	stloc 4
-// 0x0100f880: 0x100f880: addiu a0, zero, 1
+// 0x0100f890: 0x100f890: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100f884: 0x100f884: addiu a2, zero, 661
+// 0x0100f894: 0x100f894: addiu a2, zero, 661
 	ldc.i4 661
 	stloc.3
-// 0x0100f888: 0x100f888: sw    v0, 16(sp)
+// 0x0100f898: 0x100f898: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3907,7 +3907,7 @@ L_100f82c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f88c: 0x100f88c: jal   0x100449c sw    s1, 20(sp)
+// 0x0100f89c: 0x100f89c: jal   0x100449c sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3926,24 +3926,24 @@ L_100f82c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_100f894:
-// 0x0100f894: 0x100f894: addiu s1, sp, 28
+L_100f8a4:
+// 0x0100f8a4: 0x100f8a4: addiu s1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x0100f898: 0x100f898: lui   a0, 0x0
+// 0x0100f8a8: 0x100f8a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100f89c: 0x100f89c: addu  a1, s1, zero
+// 0x0100f8ac: 0x100f8ac: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0100f8a0: 0x100f8a0: addiu a0, a0, 26568
+// 0x0100f8b0: 0x100f8b0: addiu a0, a0, 26568
 	ldloc.1
 	ldc.i4 26568
 	add
 	stloc.1
-// 0x0100f8a4: 0x100f8a4: jal   0x1001b2c addiu a2, zero, 9
+// 0x0100f8b4: 0x100f8b4: jal   0x1001b2c addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
 	ldloc.1
@@ -3952,32 +3952,32 @@ L_100f894:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0100f8ac: 0x100f8ac: bne   v0, zero, 0x100f8ec lui   a1, 0x0
+// 0x0100f8bc: 0x100f8bc: bne   v0, zero, 0x100f8fc lui   a1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_100f8ec
+	brtrue L_100f8fc
 // --- basic block ---
-// 0x0100f8b4: 0x100f8b4: lui   a3, 0x0
+// 0x0100f8c4: 0x100f8c4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f8b8: 0x100f8b8: addiu a1, a1, 26340
+// 0x0100f8c8: 0x100f8c8: addiu a1, a1, 26340
 	ldloc.2
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f8bc: 0x100f8bc: addiu a3, a3, 26580
+// 0x0100f8cc: 0x100f8cc: addiu a3, a3, 26580
 	ldloc 4
 	ldc.i4 26580
 	add
 	stloc 4
-// 0x0100f8c0: 0x100f8c0: addiu a0, zero, 1
+// 0x0100f8d0: 0x100f8d0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100f8c4: 0x100f8c4: addiu a2, zero, 667
+// 0x0100f8d4: 0x100f8d4: addiu a2, zero, 667
 	ldc.i4 667
 	stloc.3
-// 0x0100f8c8: 0x100f8c8: jal   0x100449c sw    s1, 16(sp)
+// 0x0100f8d8: 0x100f8d8: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3996,7 +3996,7 @@ L_100f894:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f8d0: 0x100f8d0: lw    a0, 12(s0)
+// 0x0100f8e0: 0x100f8e0: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4005,12 +4005,12 @@ L_100f894:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f8d4: 0x100f8d4: addiu a1, sp, 37
+// 0x0100f8e4: 0x100f8e4: addiu a1, sp, 37
 	ldloc.0
 	ldc.i4.s 37
 	add
 	stloc.2
-// 0x0100f8d8: 0x100f8d8: jal   0x1001800 addiu a2, zero, 36
+// 0x0100f8e8: 0x100f8e8: jal   0x1001800 addiu a2, zero, 36
 	ldc.i4.s 36
 	stloc.3
 	ldloc.1
@@ -4022,7 +4022,7 @@ L_100f894:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f8e0: 0x100f8e0: lw    v0, 12(s0)
+// 0x0100f8f0: 0x100f8f0: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4031,16 +4031,16 @@ L_100f894:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f8e4: 0x100f8e4: j	 0x100f910 sb    zero, 36(v0)
+// 0x0100f8f4: 0x100f8f4: j	 0x100f920 sb    zero, 36(v0)
 	ldloc 6
 	ldc.i4.s 36
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_100f910
+	br L_100f920
 // --- basic block ---
-L_100f8ec:
-// 0x0100f8ec: 0x100f8ec: lw    v0, 12(s0)
+L_100f8fc:
+// 0x0100f8fc: 0x100f8fc: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4049,30 +4049,30 @@ L_100f8ec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f8f0: 0x100f8f0: lui   a3, 0x0
+// 0x0100f900: 0x100f900: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f8f4: 0x100f8f4: sb    zero, 0(v0)
+// 0x0100f904: 0x100f904: sb    zero, 0(v0)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100f8f8: 0x100f8f8: addiu a1, a1, 26340
+// 0x0100f908: 0x100f908: addiu a1, a1, 26340
 	ldloc.2
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f8fc: 0x100f8fc: addiu a3, a3, 26636
+// 0x0100f90c: 0x100f90c: addiu a3, a3, 26636
 	ldloc 4
 	ldc.i4 26636
 	add
 	stloc 4
-// 0x0100f900: 0x100f900: addiu a0, zero, 3
+// 0x0100f910: 0x100f910: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0100f904: 0x100f904: addiu a2, zero, 676
+// 0x0100f914: 0x100f914: addiu a2, zero, 676
 	ldc.i4 676
 	stloc.3
-// 0x0100f908: 0x100f908: jal   0x100449c sw    s1, 16(sp)
+// 0x0100f918: 0x100f918: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4091,15 +4091,15 @@ L_100f8ec:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_100f910:
-// 0x0100f910: 0x100f910: lw    v0, 0(s0)
+L_100f920:
+// 0x0100f920: 0x100f920: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100f914: 0x100f914: lw    a0, 4(s0)
+// 0x0100f924: 0x100f924: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4108,7 +4108,7 @@ L_100f910:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f918: 0x100f918: jalr  v0 sll   zero, zero, 0
+// 0x0100f928: 0x100f928: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -4120,7 +4120,7 @@ L_100f910:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f920: 0x100f920: lw    a0, 8(s0)
+// 0x0100f930: 0x100f930: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4129,18 +4129,18 @@ L_100f910:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f924: 0x100f924: jal   0x104c670 sll   zero, zero, 0
+// 0x0100f934: 0x100f934: jal   0x104c680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f92c: 0x100f92c: jal   0x1000930 addu  a0, s0, zero
+// 0x0100f93c: 0x100f93c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4153,8 +4153,8 @@ L_100f910:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f934: 0x100f934: lw    ra, 540(sp)
-// 0x0100f938: 0x100f938: lw    s1, 536(sp)
+// 0x0100f944: 0x100f944: lw    ra, 540(sp)
+// 0x0100f948: 0x100f948: lw    s1, 536(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4163,7 +4163,7 @@ L_100f910:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100f93c: 0x100f93c: lw    s0, 532(sp)
+// 0x0100f94c: 0x100f94c: lw    s0, 532(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4172,7 +4172,7 @@ L_100f910:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f940: 0x100f940: jr    ra addiu sp, sp, 544
+// 0x0100f950: 0x100f950: jr    ra addiu sp, sp, 544
 	ldloc.0
 	ldc.i4 544
 	add
@@ -4184,7 +4184,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 upload_error_callback_100f948(int32,int32,int32,int32,int32)
+.method public static int32 upload_error_callback_100f958(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -4222,13 +4222,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100f948:
-// 0x0100f948: 0x100f948: addiu sp, sp, -32
+L_100f958:
+// 0x0100f958: 0x100f958: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100f94c: 0x100f94c: lw    v0, 8(a0)
+// 0x0100f95c: 0x100f95c: lw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4237,26 +4237,26 @@ L_100f948:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f950: 0x100f950: lui   a1, 0x0
+// 0x0100f960: 0x100f960: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100f954: 0x100f954: lui   a3, 0x0
+// 0x0100f964: 0x100f964: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100f958: 0x100f958: addiu a1, a1, 26340
+// 0x0100f968: 0x100f968: addiu a1, a1, 26340
 	ldloc.2
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100f95c: 0x100f95c: addiu a3, a3, 26688
+// 0x0100f96c: 0x100f96c: addiu a3, a3, 26688
 	ldloc 4
 	ldc.i4 26688
 	add
 	stloc 4
-// 0x0100f960: 0x100f960: addiu a2, zero, 646
+// 0x0100f970: 0x100f970: addiu a2, zero, 646
 	ldc.i4 646
 	stloc.3
-// 0x0100f964: 0x100f964: sw    s0, 24(sp)
+// 0x0100f974: 0x100f974: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4265,14 +4265,14 @@ L_100f948:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f968: 0x100f968: addu  s0, a0, zero
+// 0x0100f978: 0x100f978: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0100f96c: 0x100f96c: addiu a0, zero, 4
+// 0x0100f97c: 0x100f97c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100f970: 0x100f970: sw    ra, 28(sp)
-// 0x0100f974: 0x100f974: jal   0x100449c sw    v0, 16(sp)
+// 0x0100f980: 0x100f980: sw    ra, 28(sp)
+// 0x0100f984: 0x100f984: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4291,14 +4291,14 @@ L_100f948:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f97c: 0x100f97c: lw    v0, 0(s0)
+// 0x0100f98c: 0x100f98c: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100f980: 0x100f980: lw    a0, 4(s0)
+// 0x0100f990: 0x100f990: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4307,7 +4307,7 @@ L_100f948:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f984: 0x100f984: jalr  v0 sll   zero, zero, 0
+// 0x0100f994: 0x100f994: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -4319,7 +4319,7 @@ L_100f948:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f98c: 0x100f98c: lw    a0, 8(s0)
+// 0x0100f99c: 0x100f99c: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4328,18 +4328,18 @@ L_100f948:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100f990: 0x100f990: jal   0x104c670 sll   zero, zero, 0
+// 0x0100f9a0: 0x100f9a0: jal   0x104c680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f998: 0x100f998: jal   0x1000930 addu  a0, s0, zero
+// 0x0100f9a8: 0x100f9a8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4352,8 +4352,8 @@ L_100f948:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0100f9a0: 0x100f9a0: lw    ra, 28(sp)
-// 0x0100f9a4: 0x100f9a4: lw    s0, 24(sp)
+// 0x0100f9b0: 0x100f9b0: lw    ra, 28(sp)
+// 0x0100f9b4: 0x100f9b4: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4362,7 +4362,7 @@ L_100f948:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100f9a8: 0x100f9a8: jr    ra addiu sp, sp, 32
+// 0x0100f9b8: 0x100f9b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4374,7 +4374,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 download_size_callback_100f9b0(int32,int32,int32,int32,int32)
+.method public static int32 download_size_callback_100f9c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -4412,13 +4412,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100f9b0:
-// 0x0100f9b0: 0x100f9b0: addiu sp, sp, -32
+L_100f9c0:
+// 0x0100f9c0: 0x100f9c0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100f9b4: 0x100f9b4: sw    s0, 24(sp)
+// 0x0100f9c4: 0x100f9c4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4427,17 +4427,17 @@ L_100f9b0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100f9b8: 0x100f9b8: sw    ra, 28(sp)
-// 0x0100f9bc: 0x100f9bc: beq   a1, zero, 0x100f9dc addu  s0, a0, zero
+// 0x0100f9c8: 0x100f9c8: sw    ra, 28(sp)
+// 0x0100f9cc: 0x100f9cc: beq   a1, zero, 0x100f9ec addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 6
-	brfalse L_100f9dc
+	brfalse L_100f9ec
 // --- basic block ---
-// 0x0100f9c4: 0x100f9c4: addu  a0, a1, zero
+// 0x0100f9d4: 0x100f9d4: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0100f9c8: 0x100f9c8: jal   0x1000910 sw    a1, 16(sp)
+// 0x0100f9d8: 0x100f9d8: jal   0x1000910 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4456,7 +4456,7 @@ L_100f9b0:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0100f9d0: 0x100f9d0: lw    a1, 16(sp)
+// 0x0100f9e0: 0x100f9e0: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4465,7 +4465,7 @@ L_100f9b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100f9d4: 0x100f9d4: sw    v0, 4(s0)
+// 0x0100f9e4: 0x100f9e4: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4474,7 +4474,7 @@ L_100f9b0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100f9d8: 0x100f9d8: sw    zero, 8(s0)
+// 0x0100f9e8: 0x100f9e8: sw    zero, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4483,12 +4483,12 @@ L_100f9b0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100f9dc:
-// 0x0100f9dc: 0x100f9dc: lw    ra, 28(sp)
-// 0x0100f9e0: 0x100f9e0: addu  v0, a1, zero
+L_100f9ec:
+// 0x0100f9ec: 0x100f9ec: lw    ra, 28(sp)
+// 0x0100f9f0: 0x100f9f0: addu  v0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0100f9e4: 0x100f9e4: lw    s0, 24(sp)
+// 0x0100f9f4: 0x100f9f4: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4497,7 +4497,7 @@ L_100f9dc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100f9e8: 0x100f9e8: jr    ra addiu sp, sp, 32
+// 0x0100f9f8: 0x100f9f8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4509,7 +4509,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 download_cache_add_100fcf4(int32,int32,int32,int32,int32)
+.method public static int32 download_cache_add_100fd04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra,int32 hi,int32 lo)
@@ -4559,42 +4559,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100fcf4: 0x100fcf4: lui   v0, 0x30000
+// 0x0100fd04: 0x100fd04: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100fcf8: 0x100fcf8: lw    v1, -30636(v0)
+// 0x0100fd08: 0x100fd08: lw    v1, -30172(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7659
+	ldc.i4 -7543
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100fcfc: 0x100fcfc: lui   v0, 0x30000
+// 0x0100fd0c: 0x100fd0c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0100fd00: 0x100fd00: sll   v1, v1, 2
+// 0x0100fd10: 0x100fd10: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0100fd04: 0x100fd04: addiu v0, v0, -30840
+// 0x0100fd14: 0x100fd14: addiu v0, v0, -30376
 	ldloc 5
-	ldc.i4 -30840
+	ldc.i4 -30376
 	add
 	stloc 5
-// 0x0100fd08: 0x100fd08: addiu sp, sp, -32
+// 0x0100fd18: 0x100fd18: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100fd0c: 0x100fd0c: addu  v0, v1, v0
+// 0x0100fd1c: 0x100fd1c: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0100fd10: 0x100fd10: sw    s0, 16(sp)
+// 0x0100fd20: 0x100fd20: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4603,14 +4603,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100fd14: 0x100fd14: lw    s0, 0(v0)
+// 0x0100fd24: 0x100fd24: lw    s0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100fd18: 0x100fd18: sw    s2, 24(sp)
+// 0x0100fd28: 0x100fd28: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4619,8 +4619,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100fd1c: 0x100fd1c: sw    ra, 28(sp)
-// 0x0100fd20: 0x100fd20: sw    s1, 20(sp)
+// 0x0100fd2c: 0x100fd2c: sw    ra, 28(sp)
+// 0x0100fd30: 0x100fd30: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4629,21 +4629,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100fd24: 0x100fd24: beq   s0, zero, 0x100fd54 addu  s2, a0, zero
+// 0x0100fd34: 0x100fd34: beq   s0, zero, 0x100fd64 addu  s2, a0, zero
 	ldloc 8
 	ldloc.1
 	stloc 10
-	brfalse L_100fd54
+	brfalse L_100fd64
 // --- basic block ---
-// 0x0100fd2c: 0x100fd2c: lui   s1, 0x10000
+// 0x0100fd3c: 0x100fd3c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0100fd30: 0x100fd30: addiu a0, s1, 18500
+// 0x0100fd40: 0x100fd40: addiu a0, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0100fd34: 0x100fd34: jal   0x104d690 addu  a1, s0, zero
+// 0x0100fd44: 0x100fd44: jal   0x104d6a0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4651,20 +4651,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100fd3c: 0x100fd3c: beq   v0, zero, 0x100fd4c addiu a0, s1, 18500
+// 0x0100fd4c: 0x100fd4c: beq   v0, zero, 0x100fd5c addiu a0, s1, 18768
 	ldloc 5
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-	brfalse L_100fd4c
+	brfalse L_100fd5c
 // --- basic block ---
-// 0x0100fd44: 0x100fd44: jal   0x104da04 addu  a1, s0, zero
+// 0x0100fd54: 0x100fd54: jal   0x104da14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4672,13 +4672,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_100fd4c:
-// 0x0100fd4c: 0x100fd4c: jal   0x1000930 addu  a0, s0, zero
+L_100fd5c:
+// 0x0100fd5c: 0x100fd5c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4691,20 +4691,20 @@ L_100fd4c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_100fd54:
-// 0x0100fd54: 0x100fd54: lui   s0, 0x30000
+L_100fd64:
+// 0x0100fd64: 0x100fd64: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0100fd58: 0x100fd58: lw    s1, -30636(s0)
+// 0x0100fd68: 0x100fd68: lw    s1, -30172(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7659
+	ldc.i4 -7543
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100fd5c: 0x100fd5c: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0100fd6c: 0x100fd6c: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4717,24 +4717,24 @@ L_100fd54:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100fd64: 0x100fd64: lw    v1, -30636(s0)
+// 0x0100fd74: 0x100fd74: lw    v1, -30172(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7659
+	ldc.i4 -7543
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100fd68: 0x100fd68: addiu a0, zero, 50
+// 0x0100fd78: 0x100fd78: addiu a0, zero, 50
 	ldc.i4.s 50
 	stloc.1
-// 0x0100fd6c: 0x100fd6c: addiu v1, v1, 1
+// 0x0100fd7c: 0x100fd7c: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0100fd70: 0x100fd70: div   v1, a0
+// 0x0100fd80: 0x100fd80: div   v1, a0
 	ldloc 6
 	ldloc.1
 	ldloc 6
@@ -4743,33 +4743,33 @@ L_100fd54:
 	stloc 13
 	rem
 	stloc 12
-// 0x0100fd74: 0x100fd74: lui   a0, 0x30000
+// 0x0100fd84: 0x100fd84: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0100fd78: 0x100fd78: sll   s1, s1, 2
+// 0x0100fd88: 0x100fd88: sll   s1, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x0100fd7c: 0x100fd7c: addiu a0, a0, -30840
+// 0x0100fd8c: 0x100fd8c: addiu a0, a0, -30376
 	ldloc.1
-	ldc.i4 -30840
+	ldc.i4 -30376
 	add
 	stloc.1
-// 0x0100fd80: 0x100fd80: lw    ra, 28(sp)
-// 0x0100fd84: 0x100fd84: addu  s1, s1, a0
+// 0x0100fd90: 0x100fd90: lw    ra, 28(sp)
+// 0x0100fd94: 0x100fd94: addu  s1, s1, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc 9
-// 0x0100fd88: 0x100fd88: sw    v0, 0(s1)
+// 0x0100fd98: 0x100fd98: sw    v0, 0(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0100fd8c: 0x100fd8c: lw    s2, 24(sp)
+// 0x0100fd9c: 0x100fd9c: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4778,7 +4778,7 @@ L_100fd54:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100fd90: 0x100fd90: lw    s1, 20(sp)
+// 0x0100fda0: 0x100fda0: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4787,19 +4787,19 @@ L_100fd54:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100fd94: 0x100fd94: mfhi  hi
+// 0x0100fda4: 0x100fda4: mfhi  hi
 	ldloc 12
 	stloc 6
-// 0x0100fd98: 0x100fd98: sw    v1, -30636(s0)
+// 0x0100fda8: 0x100fda8: sw    v1, -30172(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7659
+	ldc.i4 -7543
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100fd9c: 0x100fd9c: lw    s0, 16(sp)
+// 0x0100fdac: 0x100fdac: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4808,7 +4808,7 @@ L_100fd54:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100fda0: 0x100fda0: jr    ra addiu sp, sp, 32
+// 0x0100fdb0: 0x100fdb0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4820,7 +4820,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 download_done_callback_100fda8(int32,int32,int32,int32,int32)
+.method public static int32 download_done_callback_100fdb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -4867,13 +4867,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100fda8:
-// 0x0100fda8: 0x100fda8: addiu sp, sp, -48
+L_100fdb8:
+// 0x0100fdb8: 0x100fdb8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0100fdac: 0x100fdac: lw    v0, 8(a0)
+// 0x0100fdbc: 0x100fdbc: lw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4882,7 +4882,7 @@ L_100fda8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100fdb0: 0x100fdb0: sw    s3, 40(sp)
+// 0x0100fdc0: 0x100fdc0: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4891,7 +4891,7 @@ L_100fda8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100fdb4: 0x100fdb4: sw    s1, 32(sp)
+// 0x0100fdc4: 0x100fdc4: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4900,20 +4900,20 @@ L_100fda8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100fdb8: 0x100fdb8: lui   s3, 0x0
+// 0x0100fdc8: 0x100fdc8: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0100fdbc: 0x100fdbc: lw    s1, 0(a0)
+// 0x0100fdcc: 0x100fdcc: lw    s1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0100fdc0: 0x100fdc0: lui   a3, 0x0
+// 0x0100fdd0: 0x100fdd0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100fdc4: 0x100fdc4: sw    s0, 28(sp)
+// 0x0100fdd4: 0x100fdd4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4922,27 +4922,27 @@ L_100fda8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100fdc8: 0x100fdc8: addiu a3, a3, 27004
+// 0x0100fdd8: 0x100fdd8: addiu a3, a3, 27004
 	ldloc 4
 	ldc.i4 27004
 	add
 	stloc 4
-// 0x0100fdcc: 0x100fdcc: addiu a1, s3, 26340
+// 0x0100fddc: 0x100fddc: addiu a1, s3, 26340
 	ldloc 11
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100fdd0: 0x100fdd0: addiu a2, zero, 319
+// 0x0100fde0: 0x100fde0: addiu a2, zero, 319
 	ldc.i4 319
 	stloc.3
-// 0x0100fdd4: 0x100fdd4: addu  s0, a0, zero
+// 0x0100fde4: 0x100fde4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0100fdd8: 0x100fdd8: addiu a0, zero, 2
+// 0x0100fde8: 0x100fde8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0100fddc: 0x100fddc: sw    ra, 44(sp)
-// 0x0100fde0: 0x100fde0: sw    s2, 36(sp)
+// 0x0100fdec: 0x100fdec: sw    ra, 44(sp)
+// 0x0100fdf0: 0x100fdf0: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4951,7 +4951,7 @@ L_100fda8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100fde4: 0x100fde4: sw    v0, 16(sp)
+// 0x0100fdf4: 0x100fdf4: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4960,7 +4960,7 @@ L_100fda8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100fde8: 0x100fde8: jal   0x100449c sw    s1, 20(sp)
+// 0x0100fdf8: 0x100fdf8: jal   0x100449c sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4979,13 +4979,13 @@ L_100fda8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fdf0: 0x100fdf0: lui   a1, 0x0
+// 0x0100fe00: 0x100fe00: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100fdf4: 0x100fdf4: addu  a0, s1, zero
+// 0x0100fe04: 0x100fe04: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100fdf8: 0x100fdf8: jal   0x104dd10 addiu a1, a1, 28940
+// 0x0100fe08: 0x100fe08: jal   0x104dd20 addiu a1, a1, 28940
 	ldloc.2
 	ldc.i4 28940
 	add
@@ -4995,37 +4995,37 @@ L_100fda8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe00: 0x100fe00: bne   v0, zero, 0x100fe24 addu  s2, v0, zero
+// 0x0100fe10: 0x100fe10: bne   v0, zero, 0x100fe34 addu  s2, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_100fe24
+	brtrue L_100fe34
 // --- basic block ---
-// 0x0100fe08: 0x100fe08: lui   a3, 0x0
+// 0x0100fe18: 0x100fe18: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100fe0c: 0x100fe0c: addiu a1, s3, 26340
+// 0x0100fe1c: 0x100fe1c: addiu a1, s3, 26340
 	ldloc 11
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100fe10: 0x100fe10: addiu a3, a3, 27060
+// 0x0100fe20: 0x100fe20: addiu a3, a3, 27060
 	ldloc 4
 	ldc.i4 27060
 	add
 	stloc 4
-// 0x0100fe14: 0x100fe14: addiu a0, zero, 3
+// 0x0100fe24: 0x100fe24: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0100fe18: 0x100fe18: addiu a2, zero, 325
+// 0x0100fe28: 0x100fe28: addiu a2, zero, 325
 	ldc.i4 325
 	stloc.3
-// 0x0100fe1c: 0x100fe1c: jal   0x100449c sw    s1, 16(sp)
+// 0x0100fe2c: 0x100fe2c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5044,8 +5044,8 @@ L_100fda8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100fe24:
-// 0x0100fe24: 0x100fe24: lw    a1, 4(s0)
+L_100fe34:
+// 0x0100fe34: 0x100fe34: lw    a1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5054,7 +5054,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100fe28: 0x100fe28: lw    a2, 8(s0)
+// 0x0100fe38: 0x100fe38: lw    a2, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5063,7 +5063,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100fe2c: 0x100fe2c: jal   0x104d46c addu  a0, s2, zero
+// 0x0100fe3c: 0x100fe3c: jal   0x104d47c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5071,12 +5071,12 @@ L_100fe24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe34: 0x100fe34: jal   0x104d44c addu  a0, s2, zero
+// 0x0100fe44: 0x100fe44: jal   0x104d45c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5084,25 +5084,25 @@ L_100fe24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe3c: 0x100fe3c: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x0100fe4c: 0x100fe4c: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe44: 0x100fe44: lw    a2, 0(s0)
+// 0x0100fe54: 0x100fe54: lw    a2, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100fe48: 0x100fe48: lw    v0, 12(s0)
+// 0x0100fe58: 0x100fe58: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5111,7 +5111,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100fe4c: 0x100fe4c: lw    a0, 16(s0)
+// 0x0100fe5c: 0x100fe5c: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5120,7 +5120,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100fe50: 0x100fe50: jalr  v0 addu  a1, zero, zero
+// 0x0100fe60: 0x100fe60: jalr  v0 addu  a1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
@@ -5134,7 +5134,7 @@ L_100fe24:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe58: 0x100fe58: jal   0x100fcf4 addu  a0, s1, zero
+// 0x0100fe68: 0x100fe68: jal   0x100fd04 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5142,12 +5142,12 @@ L_100fe24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::download_cache_add_100fcf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::download_cache_add_100fd04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe60: 0x100fe60: lw    a0, 4(s0)
+// 0x0100fe70: 0x100fe70: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5156,7 +5156,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100fe64: 0x100fe64: jal   0x1000930 sll   zero, zero, 0
+// 0x0100fe74: 0x100fe74: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5167,25 +5167,25 @@ L_100fe24:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe6c: 0x100fe6c: lw    a0, 0(s0)
+// 0x0100fe7c: 0x100fe7c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100fe70: 0x100fe70: jal   0x104c670 sll   zero, zero, 0
+// 0x0100fe80: 0x100fe80: jal   0x104c680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe78: 0x100fe78: jal   0x1000930 addu  a0, s0, zero
+// 0x0100fe88: 0x100fe88: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5198,8 +5198,8 @@ L_100fe24:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100fe80: 0x100fe80: lw    ra, 44(sp)
-// 0x0100fe84: 0x100fe84: lw    s3, 40(sp)
+// 0x0100fe90: 0x100fe90: lw    ra, 44(sp)
+// 0x0100fe94: 0x100fe94: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5208,7 +5208,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100fe88: 0x100fe88: lw    s2, 36(sp)
+// 0x0100fe98: 0x100fe98: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5217,7 +5217,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100fe8c: 0x100fe8c: lw    s1, 32(sp)
+// 0x0100fe9c: 0x100fe9c: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5226,7 +5226,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100fe90: 0x100fe90: lw    s0, 28(sp)
+// 0x0100fea0: 0x100fea0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5235,7 +5235,7 @@ L_100fe24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100fe94: 0x100fe94: jr    ra addiu sp, sp, 48
+// 0x0100fea4: 0x100fea4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5247,7 +5247,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_camera_image_download_100fe9c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_camera_image_download_100feac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s6,int32 s2,int32 s3,int32 s4,int32 s5,int32 s7,int32 ra)
@@ -5306,12 +5306,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100fe9c: 0x100fe9c: addiu sp, sp, -72
+// 0x0100feac: 0x100feac: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0100fea0: 0x100fea0: sw    s5, 56(sp)
+// 0x0100feb0: 0x100feb0: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5320,18 +5320,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100fea4: 0x100fea4: lui   a3, 0x0
+// 0x0100feb4: 0x100feb4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100fea8: 0x100fea8: lui   s5, 0x0
+// 0x0100feb8: 0x100feb8: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x0100feac: 0x100feac: addiu a3, a3, 27096
+// 0x0100febc: 0x100febc: addiu a3, a3, 27096
 	ldloc 4
 	ldc.i4 27096
 	add
 	stloc 4
-// 0x0100feb0: 0x100feb0: sw    s4, 52(sp)
+// 0x0100fec0: 0x100fec0: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5340,7 +5340,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100feb4: 0x100feb4: sw    s3, 48(sp)
+// 0x0100fec4: 0x100fec4: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5349,7 +5349,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100feb8: 0x100feb8: sw    s1, 40(sp)
+// 0x0100fec8: 0x100fec8: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5358,28 +5358,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100febc: 0x100febc: addu  s4, a1, zero
+// 0x0100fecc: 0x100fecc: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x0100fec0: 0x100fec0: addu  s1, a0, zero
+// 0x0100fed0: 0x100fed0: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100fec4: 0x100fec4: addiu a1, s5, 26340
+// 0x0100fed4: 0x100fed4: addiu a1, s5, 26340
 	ldloc 14
 	ldc.i4 26340
 	add
 	stloc.2
-// 0x0100fec8: 0x100fec8: addiu a0, zero, 1
+// 0x0100fed8: 0x100fed8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100fecc: 0x100fecc: addu  s3, a2, zero
+// 0x0100fedc: 0x100fedc: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x0100fed0: 0x100fed0: addiu a2, zero, 182
+// 0x0100fee0: 0x100fee0: addiu a2, zero, 182
 	ldc.i4 182
 	stloc.3
-// 0x0100fed4: 0x100fed4: sw    ra, 68(sp)
-// 0x0100fed8: 0x100fed8: sw    s6, 60(sp)
+// 0x0100fee4: 0x100fee4: sw    ra, 68(sp)
+// 0x0100fee8: 0x100fee8: sw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5388,7 +5388,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100fedc: 0x100fedc: sw    s2, 44(sp)
+// 0x0100feec: 0x100feec: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5397,7 +5397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100fee0: 0x100fee0: sw    s7, 64(sp)
+// 0x0100fef0: 0x100fef0: sw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5406,7 +5406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100fee4: 0x100fee4: sw    s0, 36(sp)
+// 0x0100fef4: 0x100fef4: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5415,7 +5415,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100fee8: 0x100fee8: jal   0x100449c sw    s1, 16(sp)
+// 0x0100fef8: 0x100fef8: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5434,7 +5434,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100fef0: 0x100fef0: jal   0x1001b48 addu  a0, s1, zero
+// 0x0100ff00: 0x100ff00: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -5443,7 +5443,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100fef8: 0x100fef8: jal   0x1000910 addiu a0, v0, 5
+// 0x0100ff08: 0x100ff08: jal   0x1000910 addiu a0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	add
@@ -5458,13 +5458,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff00: 0x100ff00: addu  a0, v0, zero
+// 0x0100ff10: 0x100ff10: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ff04: 0x100ff04: addu  a1, s1, zero
+// 0x0100ff14: 0x100ff14: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0100ff08: 0x100ff08: jal   0x1001b68 addu  s2, v0, zero
+// 0x0100ff18: 0x100ff18: jal   0x1001b68 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
@@ -5474,13 +5474,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff10: 0x100ff10: lui   a1, 0x0
+// 0x0100ff20: 0x100ff20: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100ff14: 0x100ff14: addu  a0, s2, zero
+// 0x0100ff24: 0x100ff24: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0100ff18: 0x100ff18: jal   0x1001ac4 addiu a1, a1, 27128
+// 0x0100ff28: 0x100ff28: jal   0x1001ac4 addiu a1, a1, 27128
 	ldloc.2
 	ldc.i4 27128
 	add
@@ -5490,21 +5490,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100ff20: 0x100ff20: jal   0x104cb78 sll   zero, zero, 0
+// 0x0100ff30: 0x100ff30: jal   0x104cb88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_images_104cb78(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_images_104cb88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff28: 0x100ff28: addu  a0, v0, zero
+// 0x0100ff38: 0x100ff38: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ff2c: 0x100ff2c: jal   0x104cb30 addu  a1, s2, zero
+// 0x0100ff3c: 0x100ff3c: jal   0x104cb40 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -5512,18 +5512,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff34: 0x100ff34: addu  a1, v0, zero
+// 0x0100ff44: 0x100ff44: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0100ff38: 0x100ff38: addu  a0, zero, zero
+// 0x0100ff48: 0x100ff48: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0100ff3c: 0x100ff3c: jal   0x104d690 addu  s6, v0, zero
+// 0x0100ff4c: 0x100ff4c: jal   0x104d6a0 addu  s6, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -5531,16 +5531,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff44: 0x100ff44: beq   v0, zero, 0x100ff74 sll   zero, zero, 0
+// 0x0100ff54: 0x100ff54: beq   v0, zero, 0x100ff84 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100ff74
+	brfalse L_100ff84
 // --- basic block ---
-// 0x0100ff4c: 0x100ff4c: jal   0x100fcf4 addu  a0, s6, zero
+// 0x0100ff5c: 0x100ff5c: jal   0x100fd04 addu  a0, s6, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5548,18 +5548,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::download_cache_add_100fcf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::download_cache_add_100fd04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff54: 0x100ff54: addu  a0, s4, zero
+// 0x0100ff64: 0x100ff64: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x0100ff58: 0x100ff58: addu  a1, zero, zero
+// 0x0100ff68: 0x100ff68: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0100ff5c: 0x100ff5c: jalr  s3 addu  a2, s6, zero
+// 0x0100ff6c: 0x100ff6c: jalr  s3 addu  a2, s6, zero
 	ldloc 12
 	ldloc 10
 	stloc.3
@@ -5573,7 +5573,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff64: 0x100ff64: jal   0x104c670 addu  a0, s6, zero
+// 0x0100ff74: 0x100ff74: jal   0x104c680 addu  a0, s6, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5581,19 +5581,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff6c: 0x100ff6c: j	 0x1010020 sll   zero, zero, 0
-	br L_1010020
+// 0x0100ff7c: 0x100ff7c: j	 0x1010030 sll   zero, zero, 0
+	br L_1010030
 // --- basic block ---
-L_100ff74:
-// 0x0100ff74: 0x100ff74: lui   a0, 0x0
+L_100ff84:
+// 0x0100ff84: 0x100ff84: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100ff78: 0x100ff78: jal   0x100e348 addiu a0, a0, 1084
+// 0x0100ff88: 0x100ff88: jal   0x100e358 addiu a0, a0, 1084
 	ldloc.1
 	ldc.i4 1084
 	add
@@ -5603,15 +5603,15 @@ L_100ff74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff80: 0x100ff80: addu  a0, v0, zero
+// 0x0100ff90: 0x100ff90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ff84: 0x100ff84: jal   0x1001b48 addu  s7, v0, zero
+// 0x0100ff94: 0x100ff94: jal   0x1001b48 addu  s7, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.1
@@ -5620,10 +5620,10 @@ L_100ff74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff8c: 0x100ff8c: addu  a0, s1, zero
+// 0x0100ff9c: 0x100ff9c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100ff90: 0x100ff90: jal   0x1001b48 addu  s0, v0, zero
+// 0x0100ffa0: 0x100ffa0: jal   0x1001b48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -5632,12 +5632,12 @@ L_100ff74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ff98: 0x100ff98: addu  v0, s0, v0
+// 0x0100ffa8: 0x100ffa8: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x0100ff9c: 0x100ff9c: jal   0x1000910 addiu a0, v0, 1
+// 0x0100ffac: 0x100ffac: jal   0x1000910 addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
@@ -5652,18 +5652,18 @@ L_100ff74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ffa4: 0x100ffa4: addu  a2, v0, zero
+// 0x0100ffb4: 0x100ffb4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0100ffa8: 0x100ffa8: addu  s0, v0, zero
+// 0x0100ffb8: 0x100ffb8: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0100ffac: 0x100ffac: addiu a0, s5, 26340
+// 0x0100ffbc: 0x100ffbc: addiu a0, s5, 26340
 	ldloc 14
 	ldc.i4 26340
 	add
 	stloc.1
-// 0x0100ffb0: 0x100ffb0: jal   0x1004a38 addiu a1, zero, 235
+// 0x0100ffc0: 0x100ffc0: jal   0x1004a48 addiu a1, zero, 235
 	ldc.i4 235
 	stloc.2
 	ldloc.0
@@ -5671,15 +5671,15 @@ L_100ff74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ffb8: 0x100ffb8: addu  a0, s0, zero
+// 0x0100ffc8: 0x100ffc8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100ffbc: 0x100ffbc: jal   0x1001b68 addu  a1, s7, zero
+// 0x0100ffcc: 0x100ffcc: jal   0x1001b68 addu  a1, s7, zero
 	ldloc 15
 	stloc.2
 	ldloc.1
@@ -5689,10 +5689,10 @@ L_100ff74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ffc4: 0x100ffc4: addu  a1, s1, zero
+// 0x0100ffd4: 0x100ffd4: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0100ffc8: 0x100ffc8: jal   0x1001ac4 addu  a0, s0, zero
+// 0x0100ffd8: 0x100ffd8: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5700,7 +5700,7 @@ L_100ff74:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100ffd0: 0x100ffd0: jal   0x1000910 addiu a0, zero, 20
+// 0x0100ffe0: 0x100ffe0: jal   0x1000910 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -5713,22 +5713,22 @@ L_100ff74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ffd8: 0x100ffd8: lui   a0, 0x0
+// 0x0100ffe8: 0x100ffe8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100ffdc: 0x100ffdc: addiu a0, a0, 27136
+// 0x0100ffec: 0x100ffec: addiu a0, a0, 27136
 	ldloc.1
 	ldc.i4 27136
 	add
 	stloc.1
-// 0x0100ffe0: 0x100ffe0: sw    s6, 0(v0)
+// 0x0100fff0: 0x100fff0: sw    s6, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x0100ffe4: 0x100ffe4: sw    s4, 16(v0)
+// 0x0100fff4: 0x100fff4: sw    s4, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5737,7 +5737,7 @@ L_100ff74:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100ffe8: 0x100ffe8: sw    s3, 12(v0)
+// 0x0100fff8: 0x100fff8: sw    s3, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5746,7 +5746,7 @@ L_100ff74:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100ffec: 0x100ffec: sw    zero, 4(v0)
+// 0x0100fffc: 0x100fffc: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5755,7 +5755,8 @@ L_100ff74:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100fff0: 0x100fff0: jal   0x101cd60 sw    v0, 24(sp)
+L_1010000:
+// 0x01010000: 0x1010000: jal   0x101cd70 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5769,23 +5770,22 @@ L_100ff74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100fff8: 0x100fff8: jal   0x104c3d0 addu  a0, v0, zero
+// 0x01010008: 0x1010008: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-L_1010000:
-// 0x01010000: 0x1010000: lui   a0, 0x0
+// 0x01010010: 0x1010010: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01010004: 0x1010004: lw    a1, 24(sp)
+// 0x01010014: 0x1010014: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5794,15 +5794,15 @@ L_1010000:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01010008: 0x1010008: addiu a0, a0, 1128
+// 0x01010018: 0x1010018: addiu a0, a0, 1128
 	ldloc.1
 	ldc.i4 1128
 	add
 	stloc.1
-// 0x0101000c: 0x101000c: addu  a2, s0, zero
+// 0x0101001c: 0x101001c: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x01010010: 0x1010010: jal   0x1045dd0 addu  a3, zero, zero
+// 0x01010020: 0x1010020: jal   0x1045de0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5810,12 +5810,12 @@ L_1010000:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_http_async_copy_1045dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_http_async_copy_1045de0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010018: 0x1010018: jal   0x1000930 addu  a0, s0, zero
+// 0x01010028: 0x1010028: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5828,8 +5828,8 @@ L_1010000:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1010020:
-// 0x01010020: 0x1010020: jal   0x1000930 addu  a0, s2, zero
+L_1010030:
+// 0x01010030: 0x1010030: jal   0x1000930 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -5842,11 +5842,11 @@ L_1010020:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010028: 0x1010028: lw    ra, 68(sp)
-// 0x0101002c: 0x101002c: addu  v0, zero, zero
+// 0x01010038: 0x1010038: lw    ra, 68(sp)
+// 0x0101003c: 0x101003c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01010030: 0x1010030: lw    s7, 64(sp)
+// 0x01010040: 0x1010040: lw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5855,7 +5855,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01010034: 0x1010034: lw    s6, 60(sp)
+// 0x01010044: 0x1010044: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5864,7 +5864,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01010038: 0x1010038: lw    s5, 56(sp)
+// 0x01010048: 0x1010048: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5873,7 +5873,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101003c: 0x101003c: lw    s4, 52(sp)
+// 0x0101004c: 0x101004c: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5882,7 +5882,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01010040: 0x1010040: lw    s3, 48(sp)
+// 0x01010050: 0x1010050: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5891,7 +5891,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01010044: 0x1010044: lw    s2, 44(sp)
+// 0x01010054: 0x1010054: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5900,7 +5900,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01010048: 0x1010048: lw    s1, 40(sp)
+// 0x01010058: 0x1010058: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5909,7 +5909,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101004c: 0x101004c: lw    s0, 36(sp)
+// 0x0101005c: 0x101005c: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5918,7 +5918,7 @@ L_1010020:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01010050: 0x1010050: jr    ra addiu sp, sp, 72
+// 0x01010060: 0x1010060: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -5930,7 +5930,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+.method public static int32 roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 t0,int32 ra)
@@ -5965,24 +5965,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010058: 0x1010058: lui   v0, 0x20000
+// 0x01010068: 0x1010068: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0101005c: 0x101005c: lw    v0, 24776(v0)
+// 0x0101006c: 0x101006c: lw    v0, 25240(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 6194
+	ldc.i4 6310
 	add
 	ldelem.i4
 	stloc 4
-// 0x01010060: 0x1010060: addiu a1, a1, -1
+// 0x01010070: 0x1010070: addiu a1, a1, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01010064: 0x1010064: lw    v1, 4(v0)
+// 0x01010074: 0x1010074: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5991,74 +5991,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010068: 0x1010068: sll   zero, zero, 0
-// 0x0101006c: 0x101006c: addiu a2, v1, 7
+// 0x01010078: 0x1010078: sll   zero, zero, 0
+// 0x0101007c: 0x101007c: addiu a2, v1, 7
 	ldloc 5
 	ldc.i4.7
 	add
 	stloc.2
-// 0x01010070: 0x1010070: addu  v0, v0, a2
+// 0x01010080: 0x1010080: addu  v0, v0, a2
 	ldloc 4
 	ldloc.2
 	add
 	stloc 4
-// 0x01010074: 0x1010074: addiu v1, v1, -1
+// 0x01010084: 0x1010084: addiu v1, v1, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01010078: 0x1010078: j	 0x101009c addiu a2, zero, -1
+// 0x01010088: 0x1010088: j	 0x10100ac addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.2
-	br L_101009c
+	br L_10100ac
 // --- basic block ---
-L_1010080:
-// 0x01010080: 0x1010080: lb    t0, 0(v0)
+L_1010090:
+// 0x01010090: 0x1010090: lb    t0, 0(v0)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01010084: 0x1010084: addiu v1, v1, -1
+// 0x01010094: 0x1010094: addiu v1, v1, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01010088: 0x1010088: beq   a3, zero, 0x10100a4 addiu v0, v0, -1
+// 0x01010098: 0x1010098: beq   a3, zero, 0x10100b4 addiu v0, v0, -1
 	ldloc.3
 	ldloc 4
 	ldc.i4.m1
 	add
 	stloc 4
-	brfalse L_10100a4
+	brfalse L_10100b4
 // --- basic block ---
-// 0x01010090: 0x1010090: sw    t0, 0(a0)
+// 0x010100a0: 0x10100a0: sw    t0, 0(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01010094: 0x1010094: addiu a2, a2, 1
+// 0x010100a4: 0x10100a4: addiu a2, a2, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01010098: 0x1010098: addiu a0, a0, 4
+// 0x010100a8: 0x10100a8: addiu a0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	add
 	stloc.0
-L_101009c:
-// 0x0101009c: 0x101009c: bgez  v1, 0x1010080 slt   a3, a2, a1
+L_10100ac:
+// 0x010100ac: 0x10100ac: bgez  v1, 0x1010090 slt   a3, a2, a1
 	ldloc 5
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.3
 	ldc.i4.s 0
-	bge L_1010080
+	bge L_1010090
 // --- basic block ---
-L_10100a4:
-// 0x010100a4: 0x10100a4: jr    ra addiu v0, a2, 1
+L_10100b4:
+// 0x010100b4: 0x10100b4: jr    ra addiu v0, a2, 1
 	ldloc.2
 	ldc.i4.1
 	add
@@ -6070,7 +6070,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_layer_visible_lines_10100ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_layer_visible_lines_10100bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 t2,int32[] mem,int32 s0,int32 s1,int32 t9,int32 v0,int32 t0,int32 t1,int32 v1,int32 s2,int32 t3,int32 t4,int32 t5,int32 t6,int32 t7,int32 t8,int32 lo,int32 ra)
@@ -6147,42 +6147,42 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010100ac: 0x10100ac: lui   t0, 0xe0000
+// 0x010100bc: 0x10100bc: lui   t0, 0xe0000
 	ldc.i4 917504
 	stloc 11
-// 0x010100b0: 0x10100b0: addiu sp, sp, -16
+// 0x010100c0: 0x10100c0: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010100b4: 0x10100b4: addiu v0, a2, 30
+// 0x010100c4: 0x10100c4: addiu v0, a2, 30
 	ldloc.3
 	ldc.i4.s 30
 	add
 	stloc 10
-// 0x010100b8: 0x10100b8: addiu v1, a2, 12
+// 0x010100c8: 0x10100c8: addiu v1, a2, 12
 	ldloc.3
 	ldc.i4.s 12
 	add
 	stloc 13
-// 0x010100bc: 0x10100bc: lw    t8, 29728(t0)
+// 0x010100cc: 0x10100cc: lw    t8, 30192(t0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 20
-// 0x010100c0: 0x10100c0: lui   t0, 0x0
+// 0x010100d0: 0x10100d0: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010100c4: 0x10100c4: sll   t7, v0, 2
+// 0x010100d4: 0x10100d4: sll   t7, v0, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 19
-// 0x010100c8: 0x10100c8: sw    s2, 12(sp)
+// 0x010100d8: 0x10100d8: sw    s2, 12(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6191,7 +6191,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010100cc: 0x10100cc: sw    s1, 8(sp)
+// 0x010100dc: 0x10100dc: sw    s1, 8(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6200,7 +6200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010100d0: 0x10100d0: sw    s0, 4(sp)
+// 0x010100e0: 0x10100e0: sw    s0, 4(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6209,12 +6209,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010100d4: 0x10100d4: addiu a1, a1, -1
+// 0x010100e4: 0x10100e4: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x010100d8: 0x10100d8: lw    t0, 1148(t0)
+// 0x010100e8: 0x10100e8: lw    t0, 1148(t0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6223,51 +6223,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010100dc: 0x10100dc: sll   v1, v1, 2
+// 0x010100ec: 0x10100ec: sll   v1, v1, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc 13
-// 0x010100e0: 0x10100e0: addiu v0, zero, -1
+// 0x010100f0: 0x10100f0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x010100e4: 0x10100e4: addiu t6, zero, 192
+// 0x010100f4: 0x10100f4: addiu t6, zero, 192
 	ldc.i4 192
 	stloc 18
-// 0x010100e8: 0x10100e8: lui   t5, 0xe0000
+// 0x010100f8: 0x10100f8: lui   t5, 0xe0000
 	ldc.i4 917504
 	stloc 17
-// 0x010100ec: 0x10100ec: addiu t4, zero, -1
+// 0x010100fc: 0x10100fc: addiu t4, zero, -1
 	ldc.i4.m1
 	stloc 16
-// 0x010100f0: 0x10100f0: j	 0x10101ec lui   t3, 0x0
+L_1010100:
+// 0x01010100: 0x1010100: j	 0x10101fc lui   t3, 0x0
 	ldc.i4.s 0
 	stloc 15
-	br L_10101ec
+	br L_10101fc
 // --- basic block ---
-L_10100f8:
-// 0x010100f8: 0x10100f8: lb    t2, 8(t2)
+L_1010108:
+// 0x01010108: 0x1010108: lb    t2, 8(t2)
 	ldloc 5
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010100fc: 0x10100fc: sll   zero, zero, 0
-L_1010100:
-// 0x01010100: 0x1010100: mult  t2, t6
+// 0x0101010c: 0x101010c: sll   zero, zero, 0
+// 0x01010110: 0x1010110: mult  t2, t6
 	ldloc 5
 	ldloc 18
 	mul
 	stloc 21
-// 0x01010104: 0x1010104: mflo  lo
+// 0x01010114: 0x1010114: mflo  lo
 	ldloc 21
 	stloc 9
-// 0x01010108: 0x1010108: addu  t9, t8, t9
+// 0x01010118: 0x1010118: addu  t9, t8, t9
 	ldloc 20
 	ldloc 9
 	add
 	stloc 9
-// 0x0101010c: 0x101010c: lw    s0, 8(t9)
+// 0x0101011c: 0x101011c: lw    s0, 8(t9)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6276,21 +6276,21 @@ L_1010100:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010110: 0x1010110: sll   zero, zero, 0
-// 0x01010114: 0x1010114: beq   s0, zero, 0x10101d0 sll   zero, zero, 0
+// 0x01010120: 0x1010120: sll   zero, zero, 0
+// 0x01010124: 0x1010124: beq   s0, zero, 0x10101e0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10101d0
+	brfalse L_10101e0
 // --- basic block ---
-// 0x0101011c: 0x101011c: lw    s1, 29604(t5)
+// 0x0101012c: 0x101012c: lw    s1, 30068(t5)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 8
-// 0x01010120: 0x1010120: lw    s0, 16(t9)
+// 0x01010130: 0x1010130: lw    s0, 16(t9)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6299,54 +6299,54 @@ L_1010100:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010124: 0x1010124: sll   zero, zero, 0
-// 0x01010128: 0x1010128: slt   s0, s1, s0
+// 0x01010134: 0x1010134: sll   zero, zero, 0
+// 0x01010138: 0x1010138: slt   s0, s1, s0
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 7
-// 0x0101012c: 0x101012c: beq   s0, zero, 0x10101d0 sll   zero, zero, 0
+// 0x0101013c: 0x101013c: beq   s0, zero, 0x10101e0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10101d0
+	brfalse L_10101e0
 // --- basic block ---
-// 0x01010134: 0x1010134: bltz  a2, 0x101014c addu  s0, t9, t7
+// 0x01010144: 0x1010144: bltz  a2, 0x101015c addu  s0, t9, t7
 	ldloc.3
 	ldloc 9
 	ldloc 19
 	add
 	stloc 7
 	ldc.i4.s 0
-	blt L_101014c
+	blt L_101015c
 // --- basic block ---
-// 0x0101013c: 0x101013c: lw    s0, 0(s0)
+// 0x0101014c: 0x101014c: lw    s0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01010140: 0x1010140: sll   zero, zero, 0
-// 0x01010144: 0x1010144: beq   s0, zero, 0x10101d0 sll   zero, zero, 0
+// 0x01010150: 0x1010150: sll   zero, zero, 0
+// 0x01010154: 0x1010154: beq   s0, zero, 0x10101e0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10101d0
+	brfalse L_10101e0
 // --- basic block ---
-L_101014c:
-// 0x0101014c: 0x101014c: addiu v0, v0, 1
+L_101015c:
+// 0x0101015c: 0x101015c: addiu v0, v0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01010150: 0x1010150: sll   s0, v0, 2
+// 0x01010160: 0x1010160: sll   s0, v0, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01010154: 0x1010154: addu  s1, a0, s0
+// 0x01010164: 0x1010164: addu  s1, a0, s0
 	ldloc.1
 	ldloc 7
 	add
 	stloc 8
-// 0x01010158: 0x1010158: beq   a3, zero, 0x10101c4 sw    t2, 0(s1)
+// 0x01010168: 0x1010168: beq   a3, zero, 0x10101d4 sw    t2, 0(s1)
 	ldloc 4
 	ldloc 6
 	ldloc 8
@@ -6354,14 +6354,14 @@ L_101014c:
 	shr.un
 	ldloc 5
 	stelem.i4
-	brfalse L_10101c4
+	brfalse L_10101d4
 // --- basic block ---
-// 0x01010160: 0x1010160: bne   a2, t4, 0x10101b4 sll   zero, zero, 0
+// 0x01010170: 0x1010170: bne   a2, t4, 0x10101c4 sll   zero, zero, 0
 	ldloc.3
 	ldloc 16
-	bne.un L_10101b4
+	bne.un L_10101c4
 // --- basic block ---
-// 0x01010168: 0x1010168: lw    t2, 1144(t3)
+// 0x01010178: 0x1010178: lw    t2, 1144(t3)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -6370,122 +6370,122 @@ L_101014c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101016c: 0x101016c: sll   zero, zero, 0
-// 0x01010170: 0x1010170: addiu s1, t2, 30
+// 0x0101017c: 0x101017c: sll   zero, zero, 0
+// 0x01010180: 0x1010180: addiu s1, t2, 30
 	ldloc 5
 	ldc.i4.s 30
 	add
 	stloc 8
-// 0x01010174: 0x1010174: sll   s1, s1, 2
+// 0x01010184: 0x1010184: sll   s1, s1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x01010178: 0x1010178: j	 0x10101a4 addu  s1, t9, s1
+// 0x01010188: 0x1010188: j	 0x10101b4 addu  s1, t9, s1
 	ldloc 9
 	ldloc 8
 	add
 	stloc 8
-	br L_10101a4
+	br L_10101b4
 // --- basic block ---
-L_1010180:
-// 0x01010180: 0x1010180: lw    s2, 0(s1)
+L_1010190:
+// 0x01010190: 0x1010190: lw    s2, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x01010184: 0x1010184: sll   zero, zero, 0
-// 0x01010188: 0x1010188: beq   s2, zero, 0x10101a0 addiu s1, s1, -4
+// 0x01010194: 0x1010194: sll   zero, zero, 0
+// 0x01010198: 0x1010198: beq   s2, zero, 0x10101b0 addiu s1, s1, -4
 	ldloc 14
 	ldloc 8
 	ldc.i4.s -4
 	add
 	stloc 8
-	brfalse L_10101a0
+	brfalse L_10101b0
 // --- basic block ---
-// 0x01010190: 0x1010190: addiu t2, t2, 12
+// 0x010101a0: 0x10101a0: addiu t2, t2, 12
 	ldloc 5
 	ldc.i4.s 12
 	add
 	stloc 5
-// 0x01010194: 0x1010194: sll   t2, t2, 2
+// 0x010101a4: 0x10101a4: sll   t2, t2, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01010198: 0x1010198: j	 0x10101b8 addu  t9, t9, t2
+// 0x010101a8: 0x10101a8: j	 0x10101c8 addu  t9, t9, t2
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-	br L_10101b8
+	br L_10101c8
 // --- basic block ---
-L_10101a0:
-// 0x010101a0: 0x10101a0: addiu t2, t2, -1
+L_10101b0:
+// 0x010101b0: 0x10101b0: addiu t2, t2, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-L_10101a4:
-// 0x010101a4: 0x10101a4: bgez  t2, 0x1010180 sll   zero, zero, 0
+L_10101b4:
+// 0x010101b4: 0x10101b4: bgez  t2, 0x1010190 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1010180
+	bge L_1010190
 // --- basic block ---
-// 0x010101ac: 0x10101ac: j	 0x10101c8 slt   t2, v0, a1
+// 0x010101bc: 0x10101bc: j	 0x10101d8 slt   t2, v0, a1
 	ldloc 10
 	ldloc.2
 	clt
 	stloc 5
-	br L_10101c8
+	br L_10101d8
 // --- basic block ---
-L_10101b4:
-// 0x010101b4: 0x10101b4: addu  t9, t9, v1
+L_10101c4:
+// 0x010101c4: 0x10101c4: addu  t9, t9, v1
 	ldloc 9
 	ldloc 13
 	add
 	stloc 9
-L_10101b8:
-// 0x010101b8: 0x10101b8: lw    t2, 0(t9)
+L_10101c8:
+// 0x010101c8: 0x10101c8: lw    t2, 0(t9)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010101bc: 0x10101bc: addu  s0, a3, s0
+// 0x010101cc: 0x10101cc: addu  s0, a3, s0
 	ldloc 4
 	ldloc 7
 	add
 	stloc 7
-// 0x010101c0: 0x10101c0: sw    t2, 0(s0)
+// 0x010101d0: 0x10101d0: sw    t2, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10101c4:
-// 0x010101c4: 0x10101c4: slt   t2, v0, a1
+L_10101d4:
+// 0x010101d4: 0x10101d4: slt   t2, v0, a1
 	ldloc 10
 	ldloc.2
 	clt
 	stloc 5
-L_10101c8:
-// 0x010101c8: 0x10101c8: beq   t2, zero, 0x10101fc sll   zero, zero, 0
+L_10101d8:
+// 0x010101d8: 0x10101d8: beq   t2, zero, 0x101020c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10101fc
+	brfalse L_101020c
 // --- basic block ---
-L_10101d0:
-// 0x010101d0: 0x10101d0: addiu t1, t1, 1
+L_10101e0:
+// 0x010101e0: 0x10101e0: addiu t1, t1, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-L_10101d4:
-// 0x010101d4: 0x10101d4: lw    t2, 4(t0)
+L_10101e4:
+// 0x010101e4: 0x10101e4: lw    t2, 4(t0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6494,47 +6494,47 @@ L_10101d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010101d8: 0x10101d8: sll   zero, zero, 0
-// 0x010101dc: 0x10101dc: slt   t2, t1, t2
+// 0x010101e8: 0x10101e8: sll   zero, zero, 0
+// 0x010101ec: 0x10101ec: slt   t2, t1, t2
 	ldloc 12
 	ldloc 5
 	clt
 	stloc 5
-// 0x010101e0: 0x10101e0: bne   t2, zero, 0x10100f8 addu  t2, t0, t1
+// 0x010101f0: 0x10101f0: bne   t2, zero, 0x1010108 addu  t2, t0, t1
 	ldloc 5
 	ldloc 11
 	ldloc 12
 	add
 	stloc 5
-	brtrue L_10100f8
+	brtrue L_1010108
 // --- basic block ---
-// 0x010101e8: 0x10101e8: addiu t0, t0, 136
+// 0x010101f8: 0x10101f8: addiu t0, t0, 136
 	ldloc 11
 	ldc.i4 136
 	add
 	stloc 11
-L_10101ec:
-// 0x010101ec: 0x10101ec: lw    t1, 0(t0)
+L_10101fc:
+// 0x010101fc: 0x10101fc: lw    t1, 0(t0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x010101f0: 0x10101f0: sll   zero, zero, 0
-// 0x010101f4: 0x10101f4: bne   t1, zero, 0x10101d4 addu  t1, zero, zero
+// 0x01010200: 0x1010200: sll   zero, zero, 0
+// 0x01010204: 0x1010204: bne   t1, zero, 0x10101e4 addu  t1, zero, zero
 	ldloc 12
 	ldc.i4.s 0
 	stloc 12
-	brtrue L_10101d4
+	brtrue L_10101e4
 // --- basic block ---
-L_10101fc:
-// 0x010101fc: 0x10101fc: addiu v0, v0, 1
+L_101020c:
+// 0x0101020c: 0x101020c: addiu v0, v0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01010200: 0x1010200: lw    s2, 12(sp)
+// 0x01010210: 0x1010210: lw    s2, 12(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6543,7 +6543,7 @@ L_10101fc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01010204: 0x1010204: lw    s1, 8(sp)
+// 0x01010214: 0x1010214: lw    s1, 8(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6552,7 +6552,7 @@ L_10101fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01010208: 0x1010208: lw    s0, 4(sp)
+// 0x01010218: 0x1010218: lw    s0, 4(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6561,7 +6561,7 @@ L_10101fc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101020c: 0x101020c: jr    ra addiu sp, sp, 16
+// 0x0101021c: 0x101021c: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6573,7 +6573,7 @@ __CIBYL_function_return:
 	ldloc 10
 	ret
 }
-.method public static int32 roadmap_layer_visible_lines3_1010214(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_layer_visible_lines3_1010224(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6608,13 +6608,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010214: 0x1010214: addiu sp, sp, -24
+// 0x01010224: 0x1010224: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01010218: 0x1010218: sw    ra, 20(sp)
-// 0x0101021c: 0x101021c: jal   0x10100ac addu  a3, zero, zero
+// 0x01010228: 0x1010228: sw    ra, 20(sp)
+// 0x0101022c: 0x101022c: jal   0x10100bc addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6622,14 +6622,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_visible_lines_10100ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_visible_lines_10100bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01010224: 0x1010224: lw    ra, 20(sp)
-// 0x01010228: 0x1010228: sll   zero, zero, 0
-// 0x0101022c: 0x101022c: jr    ra addiu sp, sp, 24
+// 0x01010234: 0x1010234: lw    ra, 20(sp)
+// 0x01010238: 0x1010238: sll   zero, zero, 0
+// 0x0101023c: 0x101023c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6641,7 +6641,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_layer_visible_roads_1010234(int32,int32,int32,int32)
+.method public static int32 roadmap_layer_visible_roads_1010244(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 t4,int32[] mem,int32 v1,int32 t3,int32 t5,int32 t0,int32 t1,int32 t2,int32 lo,int32 ra)
@@ -6694,24 +6694,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010234: 0x1010234: lui   v0, 0x20000
+// 0x01010244: 0x1010244: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01010238: 0x1010238: lw    v1, 24776(v0)
+// 0x01010248: 0x1010248: lw    v1, 25240(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 6194
+	ldc.i4 6310
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101023c: 0x101023c: addiu a1, a1, -1
+// 0x0101024c: 0x101024c: addiu a1, a1, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01010240: 0x1010240: lw    v0, 4(v1)
+// 0x01010250: 0x1010250: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6720,68 +6720,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01010244: 0x1010244: addiu t1, zero, 192
+// 0x01010254: 0x1010254: addiu t1, zero, 192
 	ldc.i4 192
 	stloc 11
-// 0x01010248: 0x1010248: addiu a2, v0, 7
+// 0x01010258: 0x1010258: addiu a2, v0, 7
 	ldloc 4
 	ldc.i4.7
 	add
 	stloc.2
-// 0x0101024c: 0x101024c: addu  v1, v1, a2
+// 0x0101025c: 0x101025c: addu  v1, v1, a2
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-// 0x01010250: 0x1010250: lui   a2, 0xe0000
+// 0x01010260: 0x1010260: lui   a2, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x01010254: 0x1010254: lw    t2, 29728(a2)
+// 0x01010264: 0x1010264: lw    t2, 30192(a2)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 12
-// 0x01010258: 0x1010258: lui   t0, 0xe0000
+// 0x01010268: 0x1010268: lui   t0, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x0101025c: 0x101025c: addiu a2, v0, -1
+// 0x0101026c: 0x101026c: addiu a2, v0, -1
 	ldloc 4
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01010260: 0x1010260: j	 0x10102bc addiu v0, zero, -1
+// 0x01010270: 0x1010270: j	 0x10102cc addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 4
-	br L_10102bc
+	br L_10102cc
 // --- basic block ---
-L_1010268:
-// 0x01010268: 0x1010268: lb    a3, 0(v1)
+L_1010278:
+// 0x01010278: 0x1010278: lb    a3, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0101026c: 0x101026c: addiu a2, a2, -1
+// 0x0101027c: 0x101027c: addiu a2, a2, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01010270: 0x1010270: mult  a3, t1
+// 0x01010280: 0x1010280: mult  a3, t1
 	ldloc.3
 	ldloc 11
 	mul
 	stloc 13
-// 0x01010274: 0x1010274: mflo  lo
+// 0x01010284: 0x1010284: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x01010278: 0x1010278: addu  t4, t2, t4
+// 0x01010288: 0x1010288: addu  t4, t2, t4
 	ldloc 12
 	ldloc 5
 	add
 	stloc 5
-// 0x0101027c: 0x101027c: lw    t5, 8(t4)
+// 0x0101028c: 0x101028c: lw    t5, 8(t4)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6790,16 +6790,16 @@ L_1010268:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01010280: 0x1010280: sll   zero, zero, 0
-// 0x01010284: 0x1010284: beq   t5, zero, 0x10102bc addiu v1, v1, -1
+// 0x01010290: 0x1010290: sll   zero, zero, 0
+// 0x01010294: 0x1010294: beq   t5, zero, 0x10102cc addiu v1, v1, -1
 	ldloc 9
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-	brfalse L_10102bc
+	brfalse L_10102cc
 // --- basic block ---
-// 0x0101028c: 0x101028c: lw    t4, 16(t4)
+// 0x0101029c: 0x101029c: lw    t4, 16(t4)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6808,63 +6808,63 @@ L_1010268:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010290: 0x1010290: lw    t5, 29604(t0)
+// 0x010102a0: 0x10102a0: lw    t5, 30068(t0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 9
-// 0x01010294: 0x1010294: sll   zero, zero, 0
-// 0x01010298: 0x1010298: slt   t4, t5, t4
+// 0x010102a4: 0x10102a4: sll   zero, zero, 0
+// 0x010102a8: 0x10102a8: slt   t4, t5, t4
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x0101029c: 0x101029c: beq   t4, zero, 0x10102bc sll   zero, zero, 0
+// 0x010102ac: 0x10102ac: beq   t4, zero, 0x10102cc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10102bc
+	brfalse L_10102cc
 // --- basic block ---
-// 0x010102a4: 0x10102a4: beq   t3, zero, 0x10102c4 sll   zero, zero, 0
+// 0x010102b4: 0x10102b4: beq   t3, zero, 0x10102d4 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10102c4
+	brfalse L_10102d4
 // --- basic block ---
-// 0x010102ac: 0x10102ac: addiu v0, v0, 1
+// 0x010102bc: 0x10102bc: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010102b0: 0x10102b0: sll   t3, v0, 2
+// 0x010102c0: 0x10102c0: sll   t3, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x010102b4: 0x10102b4: addu  t3, a0, t3
+// 0x010102c4: 0x10102c4: addu  t3, a0, t3
 	ldloc.0
 	ldloc 8
 	add
 	stloc 8
-// 0x010102b8: 0x10102b8: sw    a3, 0(t3)
+// 0x010102c8: 0x10102c8: sw    a3, 0(t3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-L_10102bc:
-// 0x010102bc: 0x10102bc: bgez  a2, 0x1010268 slt   t3, v0, a1
+L_10102cc:
+// 0x010102cc: 0x10102cc: bgez  a2, 0x1010278 slt   t3, v0, a1
 	ldloc.2
 	ldloc 4
 	ldloc.1
 	clt
 	stloc 8
 	ldc.i4.s 0
-	bge L_1010268
+	bge L_1010278
 // --- basic block ---
-L_10102c4:
-// 0x010102c4: 0x10102c4: jr    ra addiu v0, v0, 1
+L_10102d4:
+// 0x010102d4: 0x10102d4: jr    ra addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
@@ -6876,7 +6876,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_layer_reset_10102cc()
+.method public static int32 roadmap_layer_reset_10102dc()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6896,13 +6896,13 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010102cc: 0x10102cc: addiu v1, zero, -1
+// 0x010102dc: 0x10102dc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010102d0: 0x10102d0: lui   v0, 0x0
+// 0x010102e0: 0x10102e0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x010102d4: 0x10102d4: jr    ra sw    v1, 1796(v0)
+// 0x010102e4: 0x10102e4: jr    ra sw    v1, 1796(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -6918,7 +6918,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_layer_get_categories_names_10102dc(int32,int32)
+.method public static int32 roadmap_layer_get_categories_names_10102ec(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -6941,25 +6941,25 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010102dc: 0x10102dc: lui   v0, 0x0
+// 0x010102ec: 0x10102ec: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010102e0: 0x10102e0: addiu v0, v0, 1696
+// 0x010102f0: 0x10102f0: addiu v0, v0, 1696
 	ldloc.2
 	ldc.i4 1696
 	add
 	stloc.2
-// 0x010102e4: 0x10102e4: sw    v0, 0(a0)
+// 0x010102f4: 0x10102f4: sw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010102e8: 0x10102e8: addiu v0, zero, 20
+// 0x010102f8: 0x10102f8: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x010102ec: 0x10102ec: jr    ra sw    v0, 0(a1)
+// 0x010102fc: 0x10102fc: jr    ra sw    v0, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -6971,7 +6971,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_layer_cfcc2type_10102f4(int32)
+.method public static int32 roadmap_layer_cfcc2type_1010304(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -6991,43 +6991,43 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010102f4: 0x10102f4: addiu a0, a0, -1
+// 0x01010304: 0x1010304: addiu a0, a0, -1
 	ldloc.0
 	ldc.i4.m1
 	add
 	stloc.0
-// 0x010102f8: 0x10102f8: sll   v0, a0, 2
+// 0x01010308: 0x1010308: sll   v0, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010102fc: 0x10102fc: lui   a0, 0x0
+// 0x0101030c: 0x101030c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01010300: 0x1010300: addiu a0, a0, 1696
+// 0x01010310: 0x1010310: addiu a0, a0, 1696
 	ldloc.0
 	ldc.i4 1696
 	add
 	stloc.0
-// 0x01010304: 0x1010304: addu  a0, a0, v0
+// 0x01010314: 0x1010314: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x01010308: 0x1010308: lw    v0, 0(a0)
+// 0x01010318: 0x1010318: lw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101030c: 0x101030c: jr    ra sll   zero, zero, 0
+// 0x0101031c: 0x101031c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_layer_reload_internal_1010314(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_layer_reload_internal_1010324(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s6,int32 s7,int32 s1,int32 s3,int32 s4,int32 s5,int32 s8,int32 lo,int32 ra)
@@ -7092,21 +7092,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010314: 0x1010314: lui   a0, 0x0
+// 0x01010324: 0x1010324: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01010318: 0x1010318: addiu sp, sp, -120
+// 0x01010328: 0x1010328: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x0101031c: 0x101031c: addiu a0, a0, 19600
+// 0x0101032c: 0x101032c: addiu a0, a0, 19600
 	ldloc.1
 	ldc.i4 19600
 	add
 	stloc.1
-// 0x01010320: 0x1010320: sw    ra, 116(sp)
-// 0x01010324: 0x1010324: sw    s8, 112(sp)
+// 0x01010330: 0x1010330: sw    ra, 116(sp)
+// 0x01010334: 0x1010334: sw    s8, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7115,7 +7115,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01010328: 0x1010328: sw    s5, 100(sp)
+// 0x01010338: 0x1010338: sw    s5, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7124,7 +7124,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101032c: 0x101032c: sw    s7, 108(sp)
+// 0x0101033c: 0x101033c: sw    s7, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7133,7 +7133,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01010330: 0x1010330: sw    s6, 104(sp)
+// 0x01010340: 0x1010340: sw    s6, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7142,7 +7142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01010334: 0x1010334: sw    s4, 96(sp)
+// 0x01010344: 0x1010344: sw    s4, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7151,7 +7151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01010338: 0x1010338: sw    s3, 92(sp)
+// 0x01010348: 0x1010348: sw    s3, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7160,7 +7160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101033c: 0x101033c: sw    s2, 88(sp)
+// 0x0101034c: 0x101034c: sw    s2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7169,7 +7169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01010340: 0x1010340: sw    s1, 84(sp)
+// 0x01010350: 0x1010350: sw    s1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7178,7 +7178,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01010344: 0x1010344: sw    s0, 80(sp)
+// 0x01010354: 0x1010354: sw    s0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7187,7 +7187,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01010348: 0x1010348: sw    zero, 40(sp)
+// 0x01010358: 0x1010358: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7196,7 +7196,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101034c: 0x101034c: sw    zero, 44(sp)
+// 0x0101035c: 0x101035c: sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7205,7 +7205,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01010350: 0x1010350: sw    zero, 48(sp)
+// 0x01010360: 0x1010360: sw    zero, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7214,7 +7214,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01010354: 0x1010354: jal   0x100e348 sw    zero, 52(sp)
+// 0x01010364: 0x1010364: jal   0x100e358 sw    zero, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7228,20 +7228,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101035c: 0x101035c: lui   a0, 0x0
+// 0x0101036c: 0x101036c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01010360: 0x1010360: addiu a0, a0, 19616
+// 0x01010370: 0x1010370: addiu a0, a0, 19616
 	ldloc.1
 	ldc.i4 19616
 	add
 	stloc.1
-// 0x01010364: 0x1010364: sw    v0, 68(sp)
+// 0x01010374: 0x1010374: sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7250,7 +7250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010368: 0x1010368: jal   0x100e348 lui   s8, 0x0
+// 0x01010378: 0x1010378: jal   0x100e358 lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 16
 	ldloc.0
@@ -7258,15 +7258,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010370: 0x1010370: lui   v0, 0x0
+// 0x01010380: 0x1010380: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01010374: 0x1010374: sw    zero, 1792(v0)
+// 0x01010384: 0x1010384: sw    zero, 1792(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7275,51 +7275,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01010378: 0x1010378: addiu s8, s8, 1696
+// 0x01010388: 0x1010388: addiu s8, s8, 1696
 	ldloc 16
 	ldc.i4 1696
 	add
 	stloc 16
-// 0x0101037c: 0x101037c: j	 0x101093c addiu s5, zero, 1
+// 0x0101038c: 0x101038c: j	 0x101094c addiu s5, zero, 1
 	ldc.i4.1
 	stloc 15
-	br L_101093c
+	br L_101094c
 // --- basic block ---
-L_1010384:
-// 0x01010384: 0x1010384: addiu s0, zero, 192
+L_1010394:
+// 0x01010394: 0x1010394: addiu s0, zero, 192
 	ldc.i4 192
 	stloc 9
-// 0x01010388: 0x1010388: mult  s5, s0
+// 0x01010398: 0x1010398: mult  s5, s0
 	ldloc 15
 	ldloc 9
 	mul
 	stloc 17
-// 0x0101038c: 0x101038c: lw    s3, 0(s8)
+// 0x0101039c: 0x101039c: lw    s3, 0(s8)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x01010390: 0x1010390: lui   v0, 0xe0000
+// 0x010103a0: 0x10103a0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01010394: 0x1010394: lw    v0, 29728(v0)
+// 0x010103a4: 0x10103a4: lw    v0, 30192(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010398: 0x1010398: addu  a0, s3, zero
+// 0x010103a8: 0x10103a8: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x0101039c: 0x101039c: mflo  lo
+// 0x010103ac: 0x10103ac: mflo  lo
 	ldloc 17
 	stloc 9
-// 0x010103a0: 0x10103a0: jal   0x1001b48 addu  s0, v0, s0
+// 0x010103b0: 0x10103b0: jal   0x1001b48 addu  s0, v0, s0
 	ldloc 5
 	ldloc 9
 	add
@@ -7330,12 +7330,12 @@ L_1010384:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010103a8: 0x10103a8: addiu s4, v0, 64
+// 0x010103b8: 0x10103b8: addiu s4, v0, 64
 	ldloc 5
 	ldc.i4.s 64
 	add
 	stloc 14
-// 0x010103ac: 0x10103ac: jal   0x1000910 addu  a0, s4, zero
+// 0x010103bc: 0x10103bc: jal   0x1000910 addu  a0, s4, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -7348,19 +7348,19 @@ L_1010384:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010103b4: 0x10103b4: addu  s1, v0, zero
+// 0x010103c4: 0x10103c4: addu  s1, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010103b8: 0x10103b8: lw    v0, -30628(s2)
+// 0x010103c8: 0x10103c8: lw    v0, -30164(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7657
+	ldc.i4 -7541
 	add
 	ldelem.i4
 	stloc 5
-// 0x010103bc: 0x10103bc: sw    s3, 40(sp)
+// 0x010103cc: 0x10103cc: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7369,7 +7369,7 @@ L_1010384:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010103c0: 0x10103c0: bne   v0, zero, 0x1010488 sw    zero, 48(sp)
+// 0x010103d0: 0x10103d0: bne   v0, zero, 0x1010498 sw    zero, 48(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7379,17 +7379,17 @@ L_1010384:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_1010488
+	brtrue L_1010498
 // --- basic block ---
-// 0x010103c8: 0x10103c8: addiu v0, zero, 1
+// 0x010103d8: 0x10103d8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010103cc: 0x10103cc: addiu s2, sp, 40
+// 0x010103dc: 0x10103dc: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x010103d0: 0x10103d0: sw    v0, 24(s0)
+// 0x010103e0: 0x10103e0: sw    v0, 24(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7398,7 +7398,7 @@ L_1010384:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010103d4: 0x10103d4: sw    v0, 8(s0)
+// 0x010103e4: 0x10103e4: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7407,44 +7407,44 @@ L_1010384:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010103d8: 0x10103d8: lui   a2, 0x10000
+// 0x010103e8: 0x10103e8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010103dc: 0x10103dc: lui   a0, 0x0
+// 0x010103ec: 0x10103ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010103e0: 0x10103e0: lui   v0, 0x0
+// 0x010103f0: 0x10103f0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010103e4: 0x10103e4: addu  a1, s2, zero
+// 0x010103f4: 0x10103f4: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x010103e8: 0x10103e8: addiu v0, v0, 27232
+// 0x010103f8: 0x10103f8: addiu v0, v0, 27232
 	ldloc 5
 	ldc.i4 27232
 	add
 	stloc 5
-// 0x010103ec: 0x10103ec: sw    s3, 0(s0)
+// 0x010103fc: 0x10103fc: sw    s3, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-// 0x010103f0: 0x10103f0: addiu a2, a2, 18500
+// 0x01010400: 0x1010400: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010103f4: 0x10103f4: addiu a0, a0, 26236
+// 0x01010404: 0x1010404: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010103f8: 0x10103f8: addu  a3, zero, zero
+// 0x01010408: 0x1010408: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010103fc: 0x10103fc: sw    zero, 32(s0)
+// 0x0101040c: 0x101040c: sw    zero, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7453,7 +7453,7 @@ L_1010384:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01010400: 0x1010400: sw    v0, 44(sp)
+// 0x01010410: 0x1010410: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7462,7 +7462,7 @@ L_1010384:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010404: 0x1010404: jal   0x100edb0 sw    zero, 52(sp)
+// 0x01010414: 0x1010414: jal   0x100edc0 sw    zero, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7476,12 +7476,12 @@ L_1010384:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101040c: 0x101040c: jal   0x100e348 addu  a0, s2, zero
+// 0x0101041c: 0x101041c: jal   0x100e358 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7489,26 +7489,26 @@ L_1010384:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010414: 0x1010414: lui   s2, 0x0
+// 0x01010424: 0x1010424: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01010418: 0x1010418: addu  s6, v0, zero
+// 0x01010428: 0x1010428: addu  s6, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0101041c: 0x101041c: j	 0x1010478 addiu s2, s2, 1152
+// 0x0101042c: 0x101042c: j	 0x1010488 addiu s2, s2, 1152
 	ldloc 8
 	ldc.i4 1152
 	add
 	stloc 8
-	br L_1010478
+	br L_1010488
 // --- basic block ---
-L_1010424:
-// 0x01010424: 0x1010424: jal   0x1001c08 sll   zero, zero, 0
+L_1010434:
+// 0x01010434: 0x1010434: jal   0x1001c08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7519,51 +7519,51 @@ L_1010424:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101042c: 0x101042c: bne   v0, zero, 0x1010478 addiu s2, s2, 136
+// 0x0101043c: 0x101043c: bne   v0, zero, 0x1010488 addiu s2, s2, 136
 	ldloc 5
 	ldloc 8
 	ldc.i4 136
 	add
 	stloc 8
-	brtrue L_1010478
+	brtrue L_1010488
 // --- basic block ---
-// 0x01010434: 0x1010434: addiu s2, s2, -136
+// 0x01010444: 0x1010444: addiu s2, s2, -136
 	ldloc 8
 	ldc.i4 -136
 	add
 	stloc 8
-// 0x01010438: 0x1010438: lui   a0, 0x0
+// 0x01010448: 0x1010448: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101043c: 0x101043c: addiu a0, a0, 1152
+// 0x0101044c: 0x101044c: addiu a0, a0, 1152
 	ldloc.1
 	ldc.i4 1152
 	add
 	stloc.1
-// 0x01010440: 0x1010440: subu  v1, s2, a0
+// 0x01010450: 0x1010450: subu  v1, s2, a0
 	ldloc 8
 	ldloc.1
 	sub
 	stloc 7
-// 0x01010444: 0x1010444: lui   v0, 0xf0f00000
+// 0x01010454: 0x1010454: lui   v0, 0xf0f00000
 	ldc.i4 4042260480
 	stloc 5
-// 0x01010448: 0x1010448: sra   v1, v1, 3
+// 0x01010458: 0x1010458: sra   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shr
 	stloc 7
-// 0x0101044c: 0x101044c: ori   v0, v0, 61681
+// 0x0101045c: 0x101045c: ori   v0, v0, 61681
 	ldloc 5
 	ldc.i4 61681
 	or
 	stloc 5
-// 0x01010450: 0x1010450: mult  v1, v0
+// 0x01010460: 0x1010460: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 17
-// 0x01010454: 0x1010454: lw    v0, 4(s2)
+// 0x01010464: 0x1010464: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7572,24 +7572,24 @@ L_1010424:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010458: 0x1010458: sll   zero, zero, 0
-// 0x0101045c: 0x101045c: addiu v1, v0, 1
+// 0x01010468: 0x1010468: sll   zero, zero, 0
+// 0x0101046c: 0x101046c: addiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01010460: 0x1010460: addu  v0, s2, v0
+// 0x01010470: 0x1010470: addu  v0, s2, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01010464: 0x1010464: sb    s5, 8(v0)
+// 0x01010474: 0x1010474: sb    s5, 8(v0)
 	ldloc 5
 	ldc.i4.8
 	add
 	ldloc 15
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01010468: 0x1010468: sw    v1, 4(s2)
+// 0x01010478: 0x1010478: sw    v1, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7598,10 +7598,10 @@ L_1010424:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101046c: 0x101046c: mflo  lo
+// 0x0101047c: 0x101047c: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x01010470: 0x1010470: j	 0x1010488 sw    v0, 4(s0)
+// 0x01010480: 0x1010480: j	 0x1010498 sw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7610,47 +7610,47 @@ L_1010424:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1010488
+	br L_1010498
 // --- basic block ---
-L_1010478:
-// 0x01010478: 0x1010478: lw    v0, 0(s2)
+L_1010488:
+// 0x01010488: 0x1010488: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101047c: 0x101047c: addu  a0, s6, zero
+// 0x0101048c: 0x101048c: addu  a0, s6, zero
 	ldloc 10
 	stloc.1
-// 0x01010480: 0x1010480: bne   v0, zero, 0x1010424 addu  a1, v0, zero
+// 0x01010490: 0x1010490: bne   v0, zero, 0x1010434 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
-	brtrue L_1010424
+	brtrue L_1010434
 // --- basic block ---
-L_1010488:
-// 0x01010488: 0x1010488: lui   v0, 0x30000
+L_1010498:
+// 0x01010498: 0x1010498: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101048c: 0x101048c: lui   v1, 0x0
+// 0x0101049c: 0x101049c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01010490: 0x1010490: lw    v0, -30628(v0)
+// 0x010104a0: 0x10104a0: lw    v0, -30164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7657
+	ldc.i4 -7541
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010494: 0x1010494: addiu v1, v1, 27240
+// 0x010104a4: 0x10104a4: addiu v1, v1, 27240
 	ldloc 7
 	ldc.i4 27240
 	add
 	stloc 7
-// 0x01010498: 0x1010498: sw    v1, 44(sp)
+// 0x010104a8: 0x10104a8: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7659,7 +7659,7 @@ L_1010488:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101049c: 0x101049c: bne   v0, zero, 0x10104c0 sw    zero, 52(sp)
+// 0x010104ac: 0x10104ac: bne   v0, zero, 0x10104d0 sw    zero, 52(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7669,30 +7669,30 @@ L_1010488:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_10104c0
+	brtrue L_10104d0
 // --- basic block ---
-// 0x010104a4: 0x10104a4: lui   a0, 0x0
+// 0x010104b4: 0x10104b4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010104a8: 0x10104a8: lui   a2, 0x10000
+// 0x010104b8: 0x10104b8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010104ac: 0x10104ac: addiu a0, a0, 26236
+// 0x010104bc: 0x10104bc: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010104b0: 0x10104b0: addiu a2, a2, -16892
+// 0x010104c0: 0x10104c0: addiu a2, a2, 19396
 	ldloc.3
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc.3
-// 0x010104b4: 0x10104b4: addiu a1, sp, 40
+// 0x010104c4: 0x10104c4: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010104b8: 0x10104b8: jal   0x100edb0 addu  a3, zero, zero
+// 0x010104c8: 0x10104c8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -7700,18 +7700,18 @@ L_1010488:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10104c0:
-// 0x010104c0: 0x10104c0: addiu s2, sp, 40
+L_10104d0:
+// 0x010104d0: 0x10104d0: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x010104c4: 0x10104c4: jal   0x100e788 addu  a0, s2, zero
+// 0x010104d4: 0x10104d4: jal   0x100e798 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7719,25 +7719,25 @@ L_10104c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010104cc: 0x10104cc: lui   v1, 0x30000
+// 0x010104dc: 0x10104dc: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x010104d0: 0x10104d0: lw    v1, -30628(v1)
+// 0x010104e0: 0x10104e0: lw    v1, -30164(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7657
+	ldc.i4 -7541
 	add
 	ldelem.i4
 	stloc 7
-// 0x010104d4: 0x10104d4: sll   zero, zero, 0
-// 0x010104d8: 0x10104d8: bne   v1, zero, 0x1010560 sw    v0, 20(s0)
+// 0x010104e4: 0x10104e4: sll   zero, zero, 0
+// 0x010104e8: 0x10104e8: bne   v1, zero, 0x1010570 sw    v0, 20(s0)
 	ldloc 7
 	ldloc 6
 	ldloc 9
@@ -7747,39 +7747,39 @@ L_10104c0:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1010560
+	brtrue L_1010570
 // --- basic block ---
-// 0x010104e0: 0x10104e0: lui   s6, 0x0
+// 0x010104f0: 0x10104f0: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010104e4: 0x10104e4: lui   a2, 0x0
+// 0x010104f4: 0x10104f4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010104e8: 0x10104e8: lui   v0, 0x0
+// 0x010104f8: 0x10104f8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010104ec: 0x10104ec: addiu a2, a2, 27264
+// 0x010104fc: 0x10104fc: addiu a2, a2, 27264
 	ldloc.3
 	ldc.i4 27264
 	add
 	stloc.3
-// 0x010104f0: 0x10104f0: addu  a1, s2, zero
+// 0x01010500: 0x1010500: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x010104f4: 0x10104f4: addu  a3, zero, zero
+// 0x01010504: 0x1010504: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010104f8: 0x10104f8: addiu v0, v0, 27252
+// 0x01010508: 0x1010508: addiu v0, v0, 27252
 	ldloc 5
 	ldc.i4 27252
 	add
 	stloc 5
-// 0x010104fc: 0x10104fc: addiu a0, s6, 26236
+// 0x0101050c: 0x101050c: addiu a0, s6, 26236
 	ldloc 10
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01010500: 0x1010500: sw    v0, 44(sp)
+// 0x01010510: 0x1010510: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7788,7 +7788,7 @@ L_10104c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010504: 0x1010504: jal   0x100edb0 sw    zero, 52(sp)
+// 0x01010514: 0x1010514: jal   0x100edc0 sw    zero, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7802,12 +7802,12 @@ L_10104c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101050c: 0x101050c: jal   0x100e788 addu  a0, s2, zero
+// 0x0101051c: 0x101051c: jal   0x100e798 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7815,23 +7815,23 @@ L_10104c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010514: 0x1010514: lui   a2, 0x10000
+// 0x01010524: 0x1010524: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01010518: 0x1010518: lui   v1, 0x0
+// 0x01010528: 0x1010528: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0101051c: 0x101051c: addiu v1, v1, 27276
+// 0x0101052c: 0x101052c: addiu v1, v1, 27276
 	ldloc 7
 	ldc.i4 27276
 	add
 	stloc 7
-// 0x01010520: 0x1010520: sw    v0, 16(s0)
+// 0x01010530: 0x1010530: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7840,23 +7840,23 @@ L_10104c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010524: 0x1010524: addiu a2, a2, 9424
+// 0x01010534: 0x1010534: addiu a2, a2, 9420
 	ldloc.3
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.3
-// 0x01010528: 0x1010528: addiu a0, s6, 26236
+// 0x01010538: 0x1010538: addiu a0, s6, 26236
 	ldloc 10
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x0101052c: 0x101052c: addu  a1, s2, zero
+// 0x0101053c: 0x101053c: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x01010530: 0x1010530: addu  a3, zero, zero
+// 0x01010540: 0x1010540: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01010534: 0x1010534: sw    v1, 44(sp)
+// 0x01010544: 0x1010544: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7865,7 +7865,7 @@ L_10104c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01010538: 0x1010538: jal   0x100edb0 sw    zero, 52(sp)
+// 0x01010548: 0x1010548: jal   0x100edc0 sw    zero, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7879,12 +7879,12 @@ L_10104c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010540: 0x1010540: jal   0x100e788 addu  a0, s2, zero
+// 0x01010550: 0x1010550: jal   0x100e798 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7892,15 +7892,15 @@ L_10104c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010548: 0x1010548: addiu v1, zero, -1
+// 0x01010558: 0x1010558: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0101054c: 0x101054c: bne   v0, v1, 0x1010560 sw    v0, 28(s0)
+// 0x0101055c: 0x101055c: bne   v0, v1, 0x1010570 sw    v0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldloc 6
@@ -7911,9 +7911,9 @@ L_10104c0:
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_1010560
+	bne.un L_1010570
 // --- basic block ---
-// 0x01010554: 0x1010554: lw    v0, 16(s0)
+// 0x01010564: 0x1010564: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7922,8 +7922,8 @@ L_10104c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010558: 0x1010558: sll   zero, zero, 0
-// 0x0101055c: 0x101055c: sw    v0, 28(s0)
+// 0x01010568: 0x1010568: sll   zero, zero, 0
+// 0x0101056c: 0x101056c: sw    v0, 28(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7932,28 +7932,28 @@ L_10104c0:
 	add
 	ldloc 5
 	stelem.i4
-L_1010560:
-// 0x01010560: 0x1010560: lui   v0, 0x30000
+L_1010570:
+// 0x01010570: 0x1010570: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01010564: 0x1010564: lui   a0, 0x10000
+// 0x01010574: 0x1010574: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01010568: 0x1010568: lw    v0, -30628(v0)
+// 0x01010578: 0x1010578: lw    v0, -30164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7657
+	ldc.i4 -7541
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101056c: 0x101056c: addiu a0, a0, 11600
+// 0x0101057c: 0x101057c: addiu a0, a0, 11596
 	ldloc.1
-	ldc.i4 11600
+	ldc.i4 11596
 	add
 	stloc.1
-// 0x01010570: 0x1010570: sw    a0, 44(sp)
+// 0x01010580: 0x1010580: sw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7962,7 +7962,7 @@ L_1010560:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01010574: 0x1010574: bne   v0, zero, 0x1010598 sw    zero, 52(sp)
+// 0x01010584: 0x1010584: bne   v0, zero, 0x10105a8 sw    zero, 52(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7972,30 +7972,30 @@ L_1010560:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_1010598
+	brtrue L_10105a8
 // --- basic block ---
-// 0x0101057c: 0x101057c: lui   a0, 0x0
+// 0x0101058c: 0x101058c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01010580: 0x1010580: lui   a2, 0x0
+// 0x01010590: 0x1010590: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01010584: 0x1010584: addiu a0, a0, 26236
+// 0x01010594: 0x1010594: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01010588: 0x1010588: addiu a2, a2, 27292
+// 0x01010598: 0x1010598: addiu a2, a2, 27292
 	ldloc.3
 	ldc.i4 27292
 	add
 	stloc.3
-// 0x0101058c: 0x101058c: addiu a1, sp, 40
+// 0x0101059c: 0x101059c: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x01010590: 0x1010590: jal   0x100edb0 addu  a3, zero, zero
+// 0x010105a0: 0x10105a0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -8003,18 +8003,18 @@ L_1010560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1010598:
-// 0x01010598: 0x1010598: addiu s7, sp, 40
+L_10105a8:
+// 0x010105a8: 0x10105a8: addiu s7, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 11
-// 0x0101059c: 0x101059c: jal   0x100e348 addu  a0, s7, zero
+// 0x010105ac: 0x10105ac: jal   0x100e358 addu  a0, s7, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8022,45 +8022,45 @@ L_1010598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010105a4: 0x10105a4: addu  v1, v0, zero
+// 0x010105b4: 0x10105b4: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010105a8: 0x10105a8: lui   s6, 0x0
+// 0x010105b8: 0x10105b8: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010105ac: 0x10105ac: lui   s2, 0x10000
+// 0x010105bc: 0x10105bc: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010105b0: 0x10105b0: lui   v0, 0x0
+// 0x010105c0: 0x10105c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010105b4: 0x10105b4: addiu a2, s2, 18500
+// 0x010105c4: 0x10105c4: addiu a2, s2, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010105b8: 0x10105b8: addu  a1, s7, zero
+// 0x010105c8: 0x10105c8: addu  a1, s7, zero
 	ldloc 11
 	stloc.2
-// 0x010105bc: 0x10105bc: addu  a3, zero, zero
+// 0x010105cc: 0x10105cc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010105c0: 0x10105c0: addiu a0, s6, 26236
+// 0x010105d0: 0x10105d0: addiu a0, s6, 26236
 	ldloc 10
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010105c4: 0x10105c4: addiu v0, v0, 27300
+// 0x010105d4: 0x10105d4: addiu v0, v0, 27300
 	ldloc 5
 	ldc.i4 27300
 	add
 	stloc 5
-// 0x010105c8: 0x10105c8: sw    v1, 72(sp)
+// 0x010105d8: 0x10105d8: sw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8069,7 +8069,7 @@ L_1010598:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010105cc: 0x10105cc: sw    v0, 44(sp)
+// 0x010105dc: 0x10105dc: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8078,7 +8078,7 @@ L_1010598:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010105d0: 0x10105d0: jal   0x100edb0 sw    zero, 52(sp)
+// 0x010105e0: 0x10105e0: jal   0x100edc0 sw    zero, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8092,12 +8092,12 @@ L_1010598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010105d8: 0x10105d8: jal   0x100e348 addu  a0, s7, zero
+// 0x010105e8: 0x10105e8: jal   0x100e358 addu  a0, s7, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8105,12 +8105,12 @@ L_1010598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010105e0: 0x10105e0: jal   0x10bd6dc sw    v0, 64(sp)
+// 0x010105f0: 0x10105f0: jal   0x10bdd24 sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8124,17 +8124,17 @@ L_1010598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010105e8: 0x10105e8: sltiu v0, v0, 1
+// 0x010105f8: 0x10105f8: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010105ec: 0x10105ec: sw    v0, 60(sp)
+// 0x010105fc: 0x10105fc: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8143,7 +8143,7 @@ L_1010598:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010105f0: 0x10105f0: lw    a0, 60(sp)
+// 0x01010600: 0x1010600: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8152,10 +8152,10 @@ L_1010598:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010105f4: 0x10105f4: addiu v0, zero, 3
+// 0x01010604: 0x1010604: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010105f8: 0x10105f8: lw    v1, 72(sp)
+// 0x01010608: 0x1010608: lw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8164,17 +8164,17 @@ L_1010598:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010105fc: 0x10105fc: subu  a0, v0, a0
+// 0x0101060c: 0x101060c: subu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc.1
-// 0x01010600: 0x1010600: addiu v0, sp, 32
+// 0x01010610: 0x1010610: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01010604: 0x1010604: sw    a0, 60(sp)
+// 0x01010614: 0x1010614: sw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8183,7 +8183,7 @@ L_1010598:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01010608: 0x1010608: sw    v1, 28(sp)
+// 0x01010618: 0x1010618: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8192,10 +8192,10 @@ L_1010598:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101060c: 0x101060c: addu  s6, s0, zero
+// 0x0101061c: 0x101061c: addu  s6, s0, zero
 	ldloc 9
 	stloc 10
-// 0x01010610: 0x1010610: sw    v0, 56(sp)
+// 0x01010620: 0x1010620: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8204,28 +8204,28 @@ L_1010598:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010614: 0x1010614: addiu s2, zero, 1
+// 0x01010624: 0x1010624: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-L_1010618:
-// 0x01010618: 0x1010618: lui   a2, 0x0
+L_1010628:
+// 0x01010628: 0x1010628: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101061c: 0x101061c: addu  a1, s4, zero
+// 0x0101062c: 0x101062c: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x01010620: 0x1010620: addiu a2, a2, 27312
+// 0x01010630: 0x1010630: addiu a2, a2, 27312
 	ldloc.3
 	ldc.i4 27312
 	add
 	stloc.3
-// 0x01010624: 0x1010624: addu  a3, s2, zero
+// 0x01010634: 0x1010634: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x01010628: 0x1010628: addu  a0, s1, zero
+// 0x01010638: 0x1010638: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x0101062c: 0x101062c: jal   0x1000f9c sw    zero, 24(sp)
+// 0x0101063c: 0x101063c: jal   0x1000f9c sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8244,7 +8244,7 @@ L_1010618:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010634: 0x1010634: jal   0x1001ba8 addu  a0, s1, zero
+// 0x01010644: 0x1010644: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8257,19 +8257,19 @@ L_1010618:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101063c: 0x101063c: lui   a0, 0x30000
+// 0x0101064c: 0x101064c: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01010640: 0x1010640: lw    v1, -30628(a0)
+// 0x01010650: 0x1010650: lw    v1, -30164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7657
+	ldc.i4 -7541
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010644: 0x1010644: sw    v0, 44(sp)
+// 0x01010654: 0x1010654: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8278,7 +8278,7 @@ L_1010618:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010648: 0x1010648: bne   v1, zero, 0x101066c sw    zero, 52(sp)
+// 0x01010658: 0x1010658: bne   v1, zero, 0x101067c sw    zero, 52(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -8288,28 +8288,28 @@ L_1010618:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_101066c
+	brtrue L_101067c
 // --- basic block ---
-// 0x01010650: 0x1010650: lui   a0, 0x0
+// 0x01010660: 0x1010660: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01010654: 0x1010654: lui   a2, 0x10000
+// 0x01010664: 0x1010664: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01010658: 0x1010658: addiu a0, a0, 26236
+// 0x01010668: 0x1010668: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x0101065c: 0x101065c: addu  a1, s7, zero
+// 0x0101066c: 0x101066c: addu  a1, s7, zero
 	ldloc 11
 	stloc.2
-// 0x01010660: 0x1010660: addiu a2, a2, -48
+// 0x01010670: 0x1010670: addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x01010664: 0x1010664: jal   0x100edb0 addiu a3, sp, 24
+// 0x01010674: 0x1010674: jal   0x100edc0 addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -8319,13 +8319,13 @@ L_1010618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101066c:
-// 0x0101066c: 0x101066c: jal   0x100e788 addu  a0, s7, zero
+L_101067c:
+// 0x0101067c: 0x101067c: jal   0x100e798 addu  a0, s7, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8333,12 +8333,12 @@ L_101066c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010674: 0x1010674: sw    v0, 40(s6)
+// 0x01010684: 0x1010684: sw    v0, 40(s6)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -8347,33 +8347,33 @@ L_101066c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010678: 0x1010678: addiu v0, zero, 2
+// 0x01010688: 0x1010688: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0101067c: 0x101067c: bne   s2, v0, 0x1010694 sll   zero, zero, 0
+// 0x0101068c: 0x101068c: bne   s2, v0, 0x10106a4 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_1010694
+	bne.un L_10106a4
 // --- basic block ---
-// 0x01010684: 0x1010684: jal   0x10bd6dc sll   zero, zero, 0
+// 0x01010694: 0x1010694: jal   0x10bdd24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101068c: 0x101068c: beq   v0, zero, 0x1010778 lui   v0, 0x0
+// 0x0101069c: 0x101069c: beq   v0, zero, 0x1010788 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1010778
+	brfalse L_1010788
 // --- basic block ---
-L_1010694:
-// 0x01010694: 0x1010694: lw    v0, 24(sp)
+L_10106a4:
+// 0x010106a4: 0x10106a4: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8382,12 +8382,12 @@ L_1010694:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010698: 0x1010698: sll   zero, zero, 0
-// 0x0101069c: 0x101069c: bne   v0, zero, 0x10106b0 sll   zero, zero, 0
+// 0x010106a8: 0x10106a8: sll   zero, zero, 0
+// 0x010106ac: 0x10106ac: bne   v0, zero, 0x10106c0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10106b0
+	brtrue L_10106c0
 // --- basic block ---
-// 0x010106a4: 0x10106a4: lw    a0, 44(sp)
+// 0x010106b4: 0x10106b4: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8396,7 +8396,7 @@ L_1010694:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010106a8: 0x10106a8: jal   0x1000930 sll   zero, zero, 0
+// 0x010106b8: 0x10106b8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -8407,8 +8407,8 @@ L_1010694:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10106b0:
-// 0x010106b0: 0x10106b0: lw    v0, 40(s6)
+L_10106c0:
+// 0x010106c0: 0x10106c0: lw    v0, 40(s6)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -8417,25 +8417,25 @@ L_10106b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010106b4: 0x10106b4: sll   zero, zero, 0
-// 0x010106b8: 0x10106b8: beq   v0, zero, 0x1010774 lui   a2, 0x0
+// 0x010106c4: 0x10106c4: sll   zero, zero, 0
+// 0x010106c8: 0x10106c8: beq   v0, zero, 0x1010784 lui   a2, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_1010774
+	brfalse L_1010784
 // --- basic block ---
-// 0x010106c0: 0x10106c0: addu  a1, s4, zero
+// 0x010106d0: 0x10106d0: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x010106c4: 0x10106c4: addiu a2, a2, 27320
+// 0x010106d4: 0x10106d4: addiu a2, a2, 27320
 	ldloc.3
 	ldc.i4 27320
 	add
 	stloc.3
-// 0x010106c8: 0x10106c8: addu  a3, s2, zero
+// 0x010106d8: 0x10106d8: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x010106cc: 0x10106cc: jal   0x1000f9c addu  a0, s1, zero
+// 0x010106dc: 0x10106dc: jal   0x1000f9c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8448,7 +8448,7 @@ L_10106b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010106d4: 0x10106d4: jal   0x1001ba8 addu  a0, s1, zero
+// 0x010106e4: 0x10106e4: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8461,19 +8461,19 @@ L_10106b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010106dc: 0x10106dc: lui   a0, 0x30000
+// 0x010106ec: 0x10106ec: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x010106e0: 0x10106e0: lw    v1, -30628(a0)
+// 0x010106f0: 0x10106f0: lw    v1, -30164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7657
+	ldc.i4 -7541
 	add
 	ldelem.i4
 	stloc 7
-// 0x010106e4: 0x10106e4: sw    v0, 44(sp)
+// 0x010106f4: 0x10106f4: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8482,7 +8482,7 @@ L_10106b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010106e8: 0x10106e8: bne   v1, zero, 0x101070c sw    zero, 52(sp)
+// 0x010106f8: 0x10106f8: bne   v1, zero, 0x101071c sw    zero, 52(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -8492,28 +8492,28 @@ L_10106b0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_101070c
+	brtrue L_101071c
 // --- basic block ---
-// 0x010106f0: 0x10106f0: lui   a0, 0x0
+// 0x01010700: 0x1010700: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010106f4: 0x10106f4: lui   a2, 0x10000
+// 0x01010704: 0x1010704: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010106f8: 0x10106f8: addiu a0, a0, 26236
+// 0x01010708: 0x1010708: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010106fc: 0x10106fc: addu  a1, s7, zero
+// 0x0101070c: 0x101070c: addu  a1, s7, zero
 	ldloc 11
 	stloc.2
-// 0x01010700: 0x1010700: addiu a2, a2, 18500
+// 0x01010710: 0x1010710: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01010704: 0x1010704: jal   0x100edb0 addiu a3, sp, 24
+// 0x01010714: 0x1010714: jal   0x100edc0 addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -8523,13 +8523,13 @@ L_10106b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101070c:
-// 0x0101070c: 0x101070c: jal   0x100e348 addu  a0, s7, zero
+L_101071c:
+// 0x0101071c: 0x101071c: jal   0x100e358 addu  a0, s7, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8537,12 +8537,12 @@ L_101070c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010714: 0x1010714: lw    v1, 56(sp)
+// 0x01010724: 0x1010724: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8551,15 +8551,15 @@ L_101070c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010718: 0x1010718: sll   zero, zero, 0
-// 0x0101071c: 0x101071c: sw    v0, 0(v1)
+// 0x01010728: 0x1010728: sll   zero, zero, 0
+// 0x0101072c: 0x101072c: sw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01010720: 0x1010720: lw    v1, 24(sp)
+// 0x01010730: 0x1010730: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8568,12 +8568,12 @@ L_101070c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010724: 0x1010724: sll   zero, zero, 0
-// 0x01010728: 0x1010728: bne   v1, zero, 0x1010744 sll   zero, zero, 0
+// 0x01010734: 0x1010734: sll   zero, zero, 0
+// 0x01010738: 0x1010738: bne   v1, zero, 0x1010754 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1010744
+	brtrue L_1010754
 // --- basic block ---
-// 0x01010730: 0x1010730: lw    a0, 44(sp)
+// 0x01010740: 0x1010740: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8582,7 +8582,7 @@ L_101070c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010734: 0x1010734: jal   0x1000930 sw    v0, 72(sp)
+// 0x01010744: 0x1010744: jal   0x1000930 sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8601,7 +8601,7 @@ L_101070c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101073c: 0x101073c: lw    v0, 72(sp)
+// 0x0101074c: 0x101074c: lw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8610,20 +8610,20 @@ L_101070c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010740: 0x1010740: sll   zero, zero, 0
-L_1010744:
-// 0x01010744: 0x1010744: lb    v0, 0(v0)
+// 0x01010750: 0x1010750: sll   zero, zero, 0
+L_1010754:
+// 0x01010754: 0x1010754: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01010748: 0x1010748: sll   zero, zero, 0
-// 0x0101074c: 0x101074c: beq   v0, zero, 0x1010778 lui   v0, 0x0
+// 0x01010758: 0x1010758: sll   zero, zero, 0
+// 0x0101075c: 0x101075c: beq   v0, zero, 0x1010788 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1010778
+	brfalse L_1010788
 // --- basic block ---
-// 0x01010754: 0x1010754: lw    v1, 56(sp)
+// 0x01010764: 0x1010764: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8632,7 +8632,7 @@ L_1010744:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010758: 0x1010758: lw    a0, 60(sp)
+// 0x01010768: 0x1010768: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8641,22 +8641,22 @@ L_1010744:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101075c: 0x101075c: addiu s2, s2, 1
+// 0x0101076c: 0x101076c: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01010760: 0x1010760: addiu v1, v1, 4
+// 0x01010770: 0x1010770: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x01010764: 0x1010764: slt   v0, s2, a0
+// 0x01010774: 0x1010774: slt   v0, s2, a0
 	ldloc 8
 	ldloc.1
 	clt
 	stloc 5
-// 0x01010768: 0x1010768: sw    v1, 56(sp)
+// 0x01010778: 0x1010778: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8665,20 +8665,20 @@ L_1010744:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101076c: 0x101076c: bne   v0, zero, 0x1010618 addiu s6, s6, 4
+// 0x0101077c: 0x101077c: bne   v0, zero, 0x1010628 addiu s6, s6, 4
 	ldloc 5
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-	brtrue L_1010618
+	brtrue L_1010628
 // --- basic block ---
-L_1010774:
-// 0x01010774: 0x1010774: lui   v0, 0x0
+L_1010784:
+// 0x01010784: 0x1010784: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1010778:
-// 0x01010778: 0x1010778: lw    v1, 1144(v0)
+L_1010788:
+// 0x01010788: 0x1010788: lw    v1, 1144(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8687,13 +8687,13 @@ L_1010778:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101077c: 0x101077c: sll   zero, zero, 0
-// 0x01010780: 0x1010780: slt   v1, v1, s2
+// 0x0101078c: 0x101078c: sll   zero, zero, 0
+// 0x01010790: 0x1010790: slt   v1, v1, s2
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 7
-// 0x01010784: 0x1010784: beq   v1, zero, 0x1010790 sw    s2, 12(s0)
+// 0x01010794: 0x1010794: beq   v1, zero, 0x10107a0 sw    s2, 12(s0)
 	ldloc 7
 	ldloc 6
 	ldloc 9
@@ -8703,9 +8703,9 @@ L_1010778:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1010790
+	brfalse L_10107a0
 // --- basic block ---
-// 0x0101078c: 0x101078c: sw    s2, 1144(v0)
+// 0x0101079c: 0x101079c: sw    s2, 1144(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8714,8 +8714,8 @@ L_1010778:
 	add
 	ldloc 8
 	stelem.i4
-L_1010790:
-// 0x01010790: 0x1010790: lw    s7, 28(sp)
+L_10107a0:
+// 0x010107a0: 0x10107a0: lw    s7, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8724,31 +8724,31 @@ L_1010790:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01010794: 0x1010794: addu  s6, s0, zero
+// 0x010107a4: 0x10107a4: addu  s6, s0, zero
 	ldloc 9
 	stloc 10
-// 0x01010798: 0x1010798: addu  s2, zero, zero
+// 0x010107a8: 0x10107a8: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_101079c:
-// 0x0101079c: 0x101079c: lui   a2, 0x0
+L_10107ac:
+// 0x010107ac: 0x10107ac: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010107a0: 0x10107a0: addu  a3, s2, zero
+// 0x010107b0: 0x10107b0: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x010107a4: 0x10107a4: addiu a2, a2, 27328
+// 0x010107b4: 0x10107b4: addiu a2, a2, 27328
 	ldloc.3
 	ldc.i4 27328
 	add
 	stloc.3
-// 0x010107a8: 0x10107a8: addu  a1, s4, zero
+// 0x010107b8: 0x10107b8: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x010107ac: 0x10107ac: addu  a0, s1, zero
+// 0x010107bc: 0x10107bc: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x010107b0: 0x10107b0: jal   0x1000f9c sw    s3, 16(sp)
+// 0x010107c0: 0x10107c0: jal   0x1000f9c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8767,10 +8767,10 @@ L_101079c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010107b8: 0x10107b8: lui   v0, 0x0
+// 0x010107c8: 0x10107c8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010107bc: 0x10107bc: lw    a1, 1792(v0)
+// 0x010107cc: 0x10107cc: lw    a1, 1792(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8779,7 +8779,7 @@ L_101079c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010107c0: 0x10107c0: jal   0x104ef00 addu  a0, s1, zero
+// 0x010107d0: 0x10107d0: jal   0x104ef10 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8787,12 +8787,12 @@ L_101079c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010107c8: 0x10107c8: lw    a0, 20(s0)
+// 0x010107d8: 0x10107d8: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8801,7 +8801,7 @@ L_101079c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010107cc: 0x10107cc: sw    v0, 48(s6)
+// 0x010107dc: 0x10107dc: sw    v0, 48(s6)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -8810,38 +8810,38 @@ L_101079c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010107d0: 0x10107d0: jal   0x104dd5c addiu s2, s2, 1
+// 0x010107e0: 0x10107e0: jal   0x104dd6c addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010107d8: 0x10107d8: beq   s7, zero, 0x1010800 addiu v1, zero, 6
+// 0x010107e8: 0x10107e8: beq   s7, zero, 0x1010810 addiu v1, zero, 6
 	ldloc 11
 	ldc.i4.6
 	stloc 7
-	brfalse L_1010800
+	brfalse L_1010810
 // --- basic block ---
-// 0x010107e0: 0x10107e0: lb    v0, 0(s7)
+// 0x010107f0: 0x10107f0: lb    v0, 0(s7)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010107e4: 0x10107e4: sll   zero, zero, 0
-// 0x010107e8: 0x10107e8: slti  v0, v0, 33
+// 0x010107f4: 0x10107f4: sll   zero, zero, 0
+// 0x010107f8: 0x10107f8: slti  v0, v0, 33
 	ldloc 5
 	ldc.i4.s 33
 	clt
 	stloc 5
-// 0x010107ec: 0x10107ec: bne   v0, zero, 0x1010800 sll   zero, zero, 0
+// 0x010107fc: 0x10107fc: bne   v0, zero, 0x1010810 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010800
+	brtrue L_1010810
 // --- basic block ---
-// 0x010107f4: 0x10107f4: jal   0x104edb0 addu  a0, s7, zero
+// 0x01010804: 0x1010804: jal   0x104edc0 addu  a0, s7, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8849,31 +8849,31 @@ L_101079c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010107fc: 0x10107fc: addiu v1, zero, 6
+// 0x0101080c: 0x101080c: addiu v1, zero, 6
 	ldc.i4.6
 	stloc 7
-L_1010800:
-// 0x01010800: 0x1010800: bne   s2, v1, 0x101079c addiu s6, s6, 12
+L_1010810:
+// 0x01010810: 0x1010810: bne   s2, v1, 0x10107ac addiu s6, s6, 12
 	ldloc 8
 	ldloc 7
 	ldloc 10
 	ldc.i4.s 12
 	add
 	stloc 10
-	bne.un L_101079c
+	bne.un L_10107ac
 // --- basic block ---
-// 0x01010808: 0x1010808: j	 0x10108c4 addu  s2, zero, zero
+// 0x01010818: 0x1010818: j	 0x10108d4 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10108c4
+	br L_10108d4
 // --- basic block ---
-L_1010810:
-// 0x01010810: 0x1010810: sw    s6, 20(sp)
+L_1010820:
+// 0x01010820: 0x1010820: sw    s6, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8882,7 +8882,7 @@ L_1010810:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01010814: 0x1010814: jal   0x1000f9c sw    s3, 16(sp)
+// 0x01010824: 0x1010824: jal   0x1000f9c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8901,10 +8901,10 @@ L_1010810:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101081c: 0x101081c: lui   v0, 0x0
+// 0x0101082c: 0x101082c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01010820: 0x1010820: lw    a1, 1792(v0)
+// 0x01010830: 0x1010830: lw    a1, 1792(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8913,7 +8913,7 @@ L_1010810:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01010824: 0x1010824: jal   0x104ef00 addu  a0, s1, zero
+// 0x01010834: 0x1010834: jal   0x104ef10 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8921,12 +8921,12 @@ L_1010810:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101082c: 0x101082c: lw    a0, 60(sp)
+// 0x0101083c: 0x101083c: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8935,12 +8935,12 @@ L_1010810:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010830: 0x1010830: addiu s6, s6, 1
+// 0x01010840: 0x1010840: addiu s6, s6, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01010834: 0x1010834: lw    v1, 40(a0)
+// 0x01010844: 0x1010844: lw    v1, 40(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -8949,8 +8949,8 @@ L_1010810:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010838: 0x1010838: sll   zero, zero, 0
-// 0x0101083c: 0x101083c: bgez  v1, 0x1010850 sw    v0, 0(s7)
+// 0x01010848: 0x1010848: sll   zero, zero, 0
+// 0x0101084c: 0x101084c: bgez  v1, 0x1010860 sw    v0, 0(s7)
 	ldloc 7
 	ldloc 6
 	ldloc 11
@@ -8959,9 +8959,9 @@ L_1010810:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1010850
+	bge L_1010860
 // --- basic block ---
-// 0x01010844: 0x1010844: lw    v0, 20(s0)
+// 0x01010854: 0x1010854: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8970,14 +8970,14 @@ L_1010810:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010848: 0x1010848: sll   zero, zero, 0
-// 0x0101084c: 0x101084c: addu  v1, v1, v0
+// 0x01010858: 0x1010858: sll   zero, zero, 0
+// 0x0101085c: 0x101085c: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-L_1010850:
-// 0x01010850: 0x1010850: lw    v0, 56(sp)
+L_1010860:
+// 0x01010860: 0x1010860: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8986,7 +8986,7 @@ L_1010850:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010854: 0x1010854: sw    v1, 72(sp)
+// 0x01010864: 0x1010864: sw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8995,14 +8995,14 @@ L_1010850:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01010858: 0x1010858: lw    a0, 0(v0)
+// 0x01010868: 0x1010868: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101085c: 0x101085c: jal   0x104edb0 addiu s7, s7, 4
+// 0x0101086c: 0x101086c: jal   0x104edc0 addiu s7, s7, 4
 	ldloc 11
 	ldc.i4.4
 	add
@@ -9012,12 +9012,12 @@ L_1010850:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010864: 0x1010864: lw    v1, 72(sp)
+// 0x01010874: 0x1010874: lw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9026,23 +9026,23 @@ L_1010850:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010868: 0x1010868: sll   zero, zero, 0
-// 0x0101086c: 0x101086c: blez  v1, 0x101087c addu  a0, v1, zero
+// 0x01010878: 0x1010878: sll   zero, zero, 0
+// 0x0101087c: 0x101087c: blez  v1, 0x101088c addu  a0, v1, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
 	ldc.i4.s 0
-	ble L_101087c
+	ble L_101088c
 // --- basic block ---
-// 0x01010874: 0x1010874: jal   0x104dd5c sll   zero, zero, 0
+// 0x01010884: 0x1010884: jal   0x104dd6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101087c:
-// 0x0101087c: 0x101087c: lw    v1, 56(sp)
+L_101088c:
+// 0x0101088c: 0x101088c: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9051,7 +9051,7 @@ L_101087c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010880: 0x1010880: lw    a0, 60(sp)
+// 0x01010890: 0x1010890: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9060,17 +9060,17 @@ L_101087c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010884: 0x1010884: addiu v1, v1, 4
+// 0x01010894: 0x1010894: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x01010888: 0x1010888: addiu a0, a0, 4
+// 0x01010898: 0x1010898: addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x0101088c: 0x101088c: sw    v1, 56(sp)
+// 0x0101089c: 0x101089c: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9079,7 +9079,7 @@ L_101087c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01010890: 0x1010890: sw    a0, 60(sp)
+// 0x010108a0: 0x10108a0: sw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9088,8 +9088,8 @@ L_101087c:
 	add
 	ldloc.1
 	stelem.i4
-L_1010894:
-// 0x01010894: 0x1010894: lw    v0, 12(s0)
+L_10108a4:
+// 0x010108a4: 0x10108a4: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -9098,61 +9098,61 @@ L_1010894:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010898: 0x1010898: lui   a2, 0x0
+// 0x010108a8: 0x10108a8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101089c: 0x101089c: slt   v0, s6, v0
+// 0x010108ac: 0x10108ac: slt   v0, s6, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x010108a0: 0x10108a0: addiu a2, a2, 27336
+// 0x010108b0: 0x10108b0: addiu a2, a2, 27336
 	ldloc.3
 	ldc.i4 27336
 	add
 	stloc.3
-// 0x010108a4: 0x10108a4: addu  a3, s2, zero
+// 0x010108b4: 0x10108b4: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x010108a8: 0x10108a8: addu  a1, s4, zero
+// 0x010108b8: 0x10108b8: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x010108ac: 0x10108ac: bne   v0, zero, 0x1010810 addu  a0, s1, zero
+// 0x010108bc: 0x10108bc: bne   v0, zero, 0x1010820 addu  a0, s1, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_1010810
+	brtrue L_1010820
 // --- basic block ---
-// 0x010108b4: 0x10108b4: addiu s2, s2, 1
+// 0x010108c4: 0x10108c4: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010108b8: 0x10108b8: addiu v0, zero, 6
+// 0x010108c8: 0x10108c8: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x010108bc: 0x10108bc: beq   s2, v0, 0x10108ec lui   a2, 0x0
+// 0x010108cc: 0x10108cc: beq   s2, v0, 0x10108fc lui   a2, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	beq  L_10108ec
+	beq  L_10108fc
 // --- basic block ---
-L_10108c4:
-// 0x010108c4: 0x10108c4: addiu v0, zero, 12
+L_10108d4:
+// 0x010108d4: 0x10108d4: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x010108c8: 0x10108c8: mult  s2, v0
+// 0x010108d8: 0x10108d8: mult  s2, v0
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 17
-// 0x010108cc: 0x10108cc: addiu v1, sp, 32
+// 0x010108dc: 0x10108dc: addiu v1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 7
-// 0x010108d0: 0x10108d0: sw    s0, 60(sp)
+// 0x010108e0: 0x10108e0: sw    s0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9161,7 +9161,7 @@ L_10108c4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010108d4: 0x10108d4: sw    v1, 56(sp)
+// 0x010108e4: 0x10108e4: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9170,34 +9170,34 @@ L_10108c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010108d8: 0x10108d8: addiu s6, zero, 1
+// 0x010108e8: 0x10108e8: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x010108dc: 0x10108dc: mflo  lo
+// 0x010108ec: 0x10108ec: mflo  lo
 	ldloc 17
 	stloc 11
-// 0x010108e0: 0x10108e0: addiu s7, s7, 52
+// 0x010108f0: 0x10108f0: addiu s7, s7, 52
 	ldloc 11
 	ldc.i4.s 52
 	add
 	stloc 11
-// 0x010108e4: 0x10108e4: j	 0x1010894 addu  s7, s0, s7
+// 0x010108f4: 0x10108f4: j	 0x10108a4 addu  s7, s0, s7
 	ldloc 9
 	ldloc 11
 	add
 	stloc 11
-	br L_1010894
+	br L_10108a4
 // --- basic block ---
-L_10108ec:
-// 0x010108ec: 0x10108ec: addiu a2, a2, 27344
+L_10108fc:
+// 0x010108fc: 0x10108fc: addiu a2, a2, 27344
 	ldloc.3
 	ldc.i4 27344
 	add
 	stloc.3
-// 0x010108f0: 0x10108f0: addu  a3, s3, zero
+// 0x01010900: 0x1010900: addu  a3, s3, zero
 	ldloc 13
 	stloc 4
-// 0x010108f4: 0x10108f4: jal   0x1000f9c addu  a0, s1, zero
+// 0x01010904: 0x1010904: jal   0x1000f9c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -9210,10 +9210,10 @@ L_10108ec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010108fc: 0x10108fc: lui   v0, 0x0
+// 0x0101090c: 0x101090c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01010900: 0x1010900: lw    a1, 1792(v0)
+// 0x01010910: 0x1010910: lw    a1, 1792(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9222,7 +9222,7 @@ L_10108ec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01010904: 0x1010904: jal   0x104ef00 addu  a0, s1, zero
+// 0x01010914: 0x1010914: jal   0x104ef10 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -9230,12 +9230,12 @@ L_10108ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101090c: 0x101090c: lw    a0, 64(sp)
+// 0x0101091c: 0x101091c: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9244,7 +9244,7 @@ L_10108ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010910: 0x1010910: sw    v0, 32(s0)
+// 0x01010920: 0x1010920: sw    v0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -9253,16 +9253,16 @@ L_10108ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010914: 0x1010914: lb    v0, 0(a0)
+// 0x01010924: 0x1010924: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01010918: 0x1010918: sll   zero, zero, 0
-// 0x0101091c: 0x101091c: bne   v0, zero, 0x1010928 sll   zero, zero, 0
+// 0x01010928: 0x1010928: sll   zero, zero, 0
+// 0x0101092c: 0x101092c: bne   v0, zero, 0x1010938 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010928
+	brtrue L_1010938
 // --- basic block ---
-// 0x01010924: 0x1010924: lw    a0, 68(sp)
+// 0x01010934: 0x1010934: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9271,8 +9271,8 @@ L_10108ec:
 	add
 	ldelem.i4
 	stloc.1
-L_1010928:
-// 0x01010928: 0x1010928: jal   0x104edb0 addiu s5, s5, 1
+L_1010938:
+// 0x01010938: 0x1010938: jal   0x104edc0 addiu s5, s5, 1
 	ldloc 15
 	ldc.i4.1
 	add
@@ -9282,12 +9282,12 @@ L_1010928:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010930: 0x1010930: jal   0x1000930 addu  a0, s1, zero
+// 0x01010940: 0x1010940: jal   0x1000930 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -9300,50 +9300,50 @@ L_1010928:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010938: 0x1010938: addiu s8, s8, 4
+// 0x01010948: 0x1010948: addiu s8, s8, 4
 	ldloc 16
 	ldc.i4.4
 	add
 	stloc 16
-L_101093c:
-// 0x0101093c: 0x101093c: lui   v0, 0x30000
+L_101094c:
+// 0x0101094c: 0x101094c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01010940: 0x1010940: lw    v0, -30632(v0)
+// 0x01010950: 0x1010950: lw    v0, -30168(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7658
+	ldc.i4 -7542
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010944: 0x1010944: sll   zero, zero, 0
-// 0x01010948: 0x1010948: slt   v0, v0, s5
+// 0x01010954: 0x1010954: sll   zero, zero, 0
+// 0x01010958: 0x1010958: slt   v0, v0, s5
 	ldloc 5
 	ldloc 15
 	clt
 	stloc 5
-// 0x0101094c: 0x101094c: beq   v0, zero, 0x1010384 lui   s2, 0x30000
+// 0x0101095c: 0x101095c: beq   v0, zero, 0x1010394 lui   s2, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 8
-	brfalse L_1010384
+	brfalse L_1010394
 // --- basic block ---
-// 0x01010954: 0x1010954: lw    ra, 116(sp)
-// 0x01010958: 0x1010958: addiu v0, zero, 1
+// 0x01010964: 0x1010964: lw    ra, 116(sp)
+// 0x01010968: 0x1010968: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101095c: 0x101095c: sw    v0, -30628(s2)
+// 0x0101096c: 0x101096c: sw    v0, -30164(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7657
+	ldc.i4 -7541
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010960: 0x1010960: lw    s8, 112(sp)
+// 0x01010970: 0x1010970: lw    s8, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9352,7 +9352,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01010964: 0x1010964: lw    s7, 108(sp)
+// 0x01010974: 0x1010974: lw    s7, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9361,7 +9361,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01010968: 0x1010968: lw    s6, 104(sp)
+// 0x01010978: 0x1010978: lw    s6, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9370,7 +9370,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101096c: 0x101096c: lw    s5, 100(sp)
+// 0x0101097c: 0x101097c: lw    s5, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9379,7 +9379,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01010970: 0x1010970: lw    s4, 96(sp)
+// 0x01010980: 0x1010980: lw    s4, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9388,7 +9388,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01010974: 0x1010974: lw    s3, 92(sp)
+// 0x01010984: 0x1010984: lw    s3, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9397,7 +9397,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01010978: 0x1010978: lw    s2, 88(sp)
+// 0x01010988: 0x1010988: lw    s2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9406,7 +9406,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101097c: 0x101097c: lw    s1, 84(sp)
+// 0x0101098c: 0x101098c: lw    s1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9415,7 +9415,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01010980: 0x1010980: lw    s0, 80(sp)
+// 0x01010990: 0x1010990: lw    s0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9424,7 +9424,7 @@ L_101093c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01010984: 0x1010984: jr    ra addiu sp, sp, 120
+// 0x01010994: 0x1010994: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
diff --git a/converted/Cibyl110.j b/converted/Cibyl110.j
index 6627cb1..5d2818a 100644
--- a/converted/Cibyl110.j
+++ b/converted/Cibyl110.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl110::.ctor
 
-.method public static int32 ssd_container_get_txtbox_height_10939c0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_container_get_txtbox_height_1093fe4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -76,31 +76,31 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010939c0: 0x10939c0: addiu sp, sp, -24
+// 0x01093fe4: 0x1093fe4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010939c4: 0x10939c4: sw    ra, 20(sp)
-// 0x010939c8: 0x10939c8: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01093fe8: 0x1093fe8: sw    ra, 20(sp)
+// 0x01093fec: 0x1093fec: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 6
 // --- basic block ---
-// 0x010939d0: 0x10939d0: bne   v0, zero, 0x10939dc addiu v1, zero, 50
+// 0x01093ff4: 0x1093ff4: bne   v0, zero, 0x1094000 addiu v1, zero, 50
 	ldloc 6
 	ldc.i4.s 50
 	stloc 5
-	brtrue L_10939dc
+	brtrue L_1094000
 // --- basic block ---
-// 0x010939d8: 0x10939d8: addiu v1, zero, 23
+// 0x01093ffc: 0x1093ffc: addiu v1, zero, 23
 	ldc.i4.s 23
 	stloc 5
-L_10939dc:
-// 0x010939dc: 0x10939dc: lw    ra, 20(sp)
-// 0x010939e0: 0x10939e0: addu  v0, v1, zero
+L_1094000:
+// 0x01094000: 0x1094000: lw    ra, 20(sp)
+// 0x01094004: 0x1094004: addu  v0, v1, zero
 	ldloc 5
 	stloc 6
-// 0x010939e4: 0x10939e4: jr    ra addiu sp, sp, 24
+// 0x01094008: 0x1094008: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -112,7 +112,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 set_value_10939ec(int32,int32,int32,int32,int32)
+.method public static int32 set_value_1094010(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -147,7 +147,7 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010939ec: 0x10939ec: lw    v0, 48(a0)
+// 0x01094010: 0x1094010: lw    v0, 48(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -156,32 +156,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010939f0: 0x10939f0: addiu sp, sp, -24
+// 0x01094014: 0x1094014: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010939f4: 0x10939f4: andi  v1, v0, 8192
+// 0x01094018: 0x1094018: andi  v1, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	and
 	stloc 6
-// 0x010939f8: 0x10939f8: sw    ra, 20(sp)
-// 0x010939fc: 0x10939fc: addu  a2, a1, zero
+// 0x0109401c: 0x109401c: sw    ra, 20(sp)
+// 0x01094020: 0x1094020: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01093a00: 0x1093a00: beq   v1, zero, 0x1093a14 addiu v0, zero, -1
+// 0x01094024: 0x1094024: beq   v1, zero, 0x1094038 addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1093a14
+	brfalse L_1094038
 // --- basic block ---
-// 0x01093a08: 0x1093a08: lui   a1, 0x10000
+// 0x0109402c: 0x109402c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01093a0c: 0x1093a0c: jal   0x109b3e0 addiu a1, a1, 328
+// 0x01094030: 0x1094030: jal   0x109ba28 addiu a1, a1, 324
 	ldloc.2
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
 	ldloc.0
@@ -189,15 +189,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1093a14:
-// 0x01093a14: 0x1093a14: lw    ra, 20(sp)
-// 0x01093a18: 0x1093a18: sll   zero, zero, 0
-// 0x01093a1c: 0x1093a1c: jr    ra addiu sp, sp, 24
+L_1094038:
+// 0x01094038: 0x1094038: lw    ra, 20(sp)
+// 0x0109403c: 0x109403c: sll   zero, zero, 0
+// 0x01094040: 0x1094040: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -209,7 +209,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+.method public static int32 ssd_container_new_1094048(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 s2,int32 s1,int32 s5,int32 s3,int32 s4,int32 ra)
@@ -262,12 +262,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093a24: 0x1093a24: addiu sp, sp, -56
+// 0x01094048: 0x1094048: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01093a28: 0x1093a28: sw    s0, 28(sp)
+// 0x0109404c: 0x109404c: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -276,19 +276,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01093a2c: 0x1093a2c: lui   s0, 0x80000
+// 0x01094050: 0x1094050: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01093a30: 0x1093a30: lw    v0, 9632(s0)
+// 0x01094054: 0x1094054: lw    v0, 10096(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2408
+	ldc.i4 2524
 	add
 	ldelem.i4
 	stloc 6
-// 0x01093a34: 0x1093a34: sw    s5, 48(sp)
+// 0x01094058: 0x1094058: sw    s5, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -297,7 +297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01093a38: 0x1093a38: sw    s4, 44(sp)
+// 0x0109405c: 0x109405c: sw    s4, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -306,7 +306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01093a3c: 0x1093a3c: sw    s3, 40(sp)
+// 0x01094060: 0x1094060: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -315,7 +315,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01093a40: 0x1093a40: sw    s2, 36(sp)
+// 0x01094064: 0x1094064: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -324,7 +324,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01093a44: 0x1093a44: sw    s1, 32(sp)
+// 0x01094068: 0x1094068: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -333,17 +333,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01093a48: 0x1093a48: sw    ra, 52(sp)
-// 0x01093a4c: 0x1093a4c: addu  s3, a0, zero
+// 0x0109406c: 0x109406c: sw    ra, 52(sp)
+// 0x01094070: 0x1094070: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01093a50: 0x1093a50: addu  s4, a1, zero
+// 0x01094074: 0x1094074: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01093a54: 0x1093a54: addu  s1, a2, zero
+// 0x01094078: 0x1094078: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01093a58: 0x1093a58: lw    s2, 72(sp)
+// 0x0109407c: 0x109407c: lw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -352,21 +352,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01093a5c: 0x1093a5c: bne   v0, zero, 0x1093abc addu  s5, a3, zero
+// 0x01094080: 0x1094080: bne   v0, zero, 0x10940e0 addu  s5, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 11
-	brtrue L_1093abc
+	brtrue L_10940e0
 // --- basic block ---
-// 0x01093a64: 0x1093a64: lui   a0, 0x20000
+// 0x01094088: 0x1094088: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01093a68: 0x1093a68: addu  a1, zero, zero
+// 0x0109408c: 0x109408c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01093a6c: 0x1093a6c: jal   0x104ef00 addiu a0, a0, -3272
+// 0x01094090: 0x1094090: jal   0x104ef10 addiu a0, a0, -2808
 	ldloc.1
-	ldc.i4 -3272
+	ldc.i4 -2808
 	add
 	stloc.1
 	ldloc.0
@@ -374,32 +374,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093a74: 0x1093a74: lui   v1, 0x20000
+// 0x01094098: 0x1094098: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01093a78: 0x1093a78: lw    a0, 29588(v1)
+// 0x0109409c: 0x109409c: lw    a0, 30052(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7397
+	ldc.i4 7513
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093a7c: 0x1093a7c: lui   v1, 0x80000
+// 0x010940a0: 0x10940a0: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093a80: 0x1093a80: jal   0x104edb0 sw    v0, 9636(v1)
+// 0x010940a4: 0x10940a4: jal   0x104edc0 sw    v0, 10100(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2409
+	ldc.i4 2525
 	add
 	ldloc 6
 	stelem.i4
@@ -408,20 +408,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093a88: 0x1093a88: lui   a0, 0x20000
+// 0x010940ac: 0x10940ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01093a8c: 0x1093a8c: addu  a1, zero, zero
+// 0x010940b0: 0x10940b0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01093a90: 0x1093a90: jal   0x104ef00 addiu a0, a0, -3256
+// 0x010940b4: 0x10940b4: jal   0x104ef10 addiu a0, a0, -2792
 	ldloc.1
-	ldc.i4 -3256
+	ldc.i4 -2792
 	add
 	stloc.1
 	ldloc.0
@@ -429,28 +429,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093a98: 0x1093a98: lui   a0, 0x20000
+// 0x010940bc: 0x10940bc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01093a9c: 0x1093a9c: lui   v1, 0x80000
+// 0x010940c0: 0x10940c0: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093aa0: 0x1093aa0: addiu a0, a0, -3236
+// 0x010940c4: 0x10940c4: addiu a0, a0, -2772
 	ldloc.1
-	ldc.i4 -3236
+	ldc.i4 -2772
 	add
 	stloc.1
-// 0x01093aa4: 0x1093aa4: jal   0x104edb0 sw    v0, 9640(v1)
+// 0x010940c8: 0x10940c8: jal   0x104edc0 sw    v0, 10104(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2410
+	ldc.i4 2526
 	add
 	ldloc 6
 	stelem.i4
@@ -459,45 +459,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093aac: 0x1093aac: jal   0x104dd5c addiu a0, zero, 1
+// 0x010940d0: 0x10940d0: jal   0x104dd6c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093ab4: 0x1093ab4: addiu v0, zero, 1
+// 0x010940d8: 0x10940d8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01093ab8: 0x1093ab8: sw    v0, 9632(s0)
+// 0x010940dc: 0x10940dc: sw    v0, 10096(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2408
+	ldc.i4 2524
 	add
 	ldloc 6
 	stelem.i4
-L_1093abc:
-// 0x01093abc: 0x1093abc: lui   a1, 0x1090000
+L_10940e0:
+// 0x010940e0: 0x10940e0: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x01093ac0: 0x1093ac0: addu  a0, s3, zero
+// 0x010940e4: 0x10940e4: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x01093ac4: 0x1093ac4: addiu a1, a1, 11896
+// 0x010940e8: 0x10940e8: addiu a1, a1, 13468
 	ldloc.2
-	ldc.i4 11896
+	ldc.i4 13468
 	add
 	stloc.2
-// 0x01093ac8: 0x1093ac8: jal   0x109a45c addu  a2, s2, zero
+// 0x010940ec: 0x10940ec: jal   0x109aaa4 addu  a2, s2, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -505,38 +505,38 @@ L_1093abc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093ad0: 0x1093ad0: lui   v1, 0x10000
+// 0x010940f4: 0x10940f4: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01093ad4: 0x1093ad4: addu  s0, v0, zero
+// 0x010940f8: 0x10940f8: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x01093ad8: 0x1093ad8: addiu v1, v1, 2236
+// 0x010940fc: 0x10940fc: addiu v1, v1, 2232
 	ldloc 5
-	ldc.i4 2236
+	ldc.i4 2232
 	add
 	stloc 5
-// 0x01093adc: 0x1093adc: sw    v1, 0(s0)
+// 0x01094100: 0x1094100: sw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01093ae0: 0x1093ae0: lui   v1, 0x1090000
+// 0x01094104: 0x1094104: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01093ae4: 0x1093ae4: addiu v1, v1, 12108
+// 0x01094108: 0x1094108: addiu v1, v1, 13680
 	ldloc 5
-	ldc.i4 12108
+	ldc.i4 13680
 	add
 	stloc 5
-// 0x01093ae8: 0x1093ae8: sw    v1, 184(s0)
+// 0x0109410c: 0x109410c: sw    v1, 184(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -545,15 +545,15 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093aec: 0x1093aec: lui   v1, 0x1090000
+// 0x01094110: 0x1094110: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01093af0: 0x1093af0: addiu v1, v1, 11832
+// 0x01094114: 0x1094114: addiu v1, v1, 13404
 	ldloc 5
-	ldc.i4 11832
+	ldc.i4 13404
 	add
 	stloc 5
-// 0x01093af4: 0x1093af4: sw    v1, 220(s0)
+// 0x01094118: 0x1094118: sw    v1, 220(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -562,15 +562,15 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093af8: 0x1093af8: lui   v1, 0x1090000
+// 0x0109411c: 0x109411c: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01093afc: 0x1093afc: addiu v1, v1, 15752
+// 0x01094120: 0x1094120: addiu v1, v1, 17324
 	ldloc 5
-	ldc.i4 15752
+	ldc.i4 17324
 	add
 	stloc 5
-// 0x01093b00: 0x1093b00: sw    v1, 168(s0)
+// 0x01094124: 0x1094124: sw    v1, 168(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -579,15 +579,15 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093b04: 0x1093b04: lui   v1, 0x1090000
+// 0x01094128: 0x1094128: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01093b08: 0x1093b08: addiu v1, v1, 14828
+// 0x0109412c: 0x109412c: addiu v1, v1, 16400
 	ldloc 5
-	ldc.i4 14828
+	ldc.i4 16400
 	add
 	stloc 5
-// 0x01093b0c: 0x1093b0c: sw    v1, 176(s0)
+// 0x01094130: 0x1094130: sw    v1, 176(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -596,15 +596,15 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093b10: 0x1093b10: lui   v1, 0x1090000
+// 0x01094134: 0x1094134: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01093b14: 0x1093b14: addiu v1, v1, 11840
+// 0x01094138: 0x1094138: addiu v1, v1, 13412
 	ldloc 5
-	ldc.i4 11840
+	ldc.i4 13412
 	add
 	stloc 5
-// 0x01093b18: 0x1093b18: sw    v1, 196(s0)
+// 0x0109413c: 0x109413c: sw    v1, 196(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -613,24 +613,24 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093b1c: 0x1093b1c: lui   v1, 0x20000
+// 0x01094140: 0x1094140: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01093b20: 0x1093b20: lw    v1, 29584(v1)
+// 0x01094144: 0x1094144: lw    v1, 30048(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7396
+	ldc.i4 7512
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093b24: 0x1093b24: andi  v0, s2, 8192
+// 0x01094148: 0x1094148: andi  v0, s2, 8192
 	ldloc 9
 	ldc.i4 8192
 	and
 	stloc 6
-// 0x01093b28: 0x1093b28: sw    v1, 104(s0)
+// 0x0109414c: 0x109414c: sw    v1, 104(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -639,19 +639,19 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093b2c: 0x1093b2c: lui   v1, 0x20000
+// 0x01094150: 0x1094150: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01093b30: 0x1093b30: lw    v1, 29588(v1)
+// 0x01094154: 0x1094154: lw    v1, 30052(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7397
+	ldc.i4 7513
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093b34: 0x1093b34: sw    s1, 24(s0)
+// 0x01094158: 0x1094158: sw    s1, 24(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -660,7 +660,7 @@ L_1093abc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01093b38: 0x1093b38: sw    v1, 108(s0)
+// 0x0109415c: 0x109415c: sw    v1, 108(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -669,15 +669,15 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093b3c: 0x1093b3c: lui   v1, 0x1090000
+// 0x01094160: 0x1094160: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01093b40: 0x1093b40: addiu v1, v1, 11980
+// 0x01094164: 0x1094164: addiu v1, v1, 13552
 	ldloc 5
-	ldc.i4 11980
+	ldc.i4 13552
 	add
 	stloc 5
-// 0x01093b44: 0x1093b44: sw    s5, 28(s0)
+// 0x01094168: 0x1094168: sw    s5, 28(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -686,7 +686,7 @@ L_1093abc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01093b48: 0x1093b48: sw    v1, 188(s0)
+// 0x0109416c: 0x109416c: sw    v1, 188(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -695,7 +695,7 @@ L_1093abc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093b4c: 0x1093b4c: beq   v0, zero, 0x1093d14 sw    s2, 48(s0)
+// 0x01094170: 0x1094170: beq   v0, zero, 0x1094338 sw    s2, 48(s0)
 	ldloc 6
 	ldloc 7
 	ldloc 8
@@ -705,9 +705,9 @@ L_1093abc:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_1093d14
+	brfalse L_1094338
 // --- basic block ---
-// 0x01093b54: 0x1093b54: jal   0x109a424 addu  a0, zero, zero
+// 0x01094178: 0x1094178: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -715,12 +715,12 @@ L_1093abc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093b5c: 0x1093b5c: lw    v1, 48(s0)
+// 0x01094180: 0x1094180: lw    v1, 48(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -729,54 +729,54 @@ L_1093abc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093b60: 0x1093b60: lui   v0, 0x30000
+// 0x01094184: 0x1094184: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01093b64: 0x1093b64: and   v1, v1, v0
+// 0x01094188: 0x1094188: and   v1, v1, v0
 	ldloc 5
 	ldloc 6
 	and
 	stloc 5
-// 0x01093b68: 0x1093b68: lui   v0, 0x10000
+// 0x0109418c: 0x109418c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01093b6c: 0x1093b6c: beq   v1, v0, 0x1093be4 sll   zero, zero, 0
+// 0x01094190: 0x1094190: beq   v1, v0, 0x1094208 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	beq  L_1093be4
+	beq  L_1094208
 // --- basic block ---
-// 0x01093b74: 0x1093b74: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01094198: 0x1094198: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 6
 // --- basic block ---
-// 0x01093b7c: 0x1093b7c: beq   v0, zero, 0x1093b88 addiu a3, zero, 28
+// 0x010941a0: 0x10941a0: beq   v0, zero, 0x10941ac addiu a3, zero, 28
 	ldloc 6
 	ldc.i4.s 28
 	stloc 4
-	brfalse L_1093b88
+	brfalse L_10941ac
 // --- basic block ---
-// 0x01093b84: 0x1093b84: addiu a3, zero, 60
+// 0x010941a8: 0x10941a8: addiu a3, zero, 60
 	ldc.i4.s 60
 	stloc 4
-L_1093b88:
-// 0x01093b88: 0x1093b88: lui   a0, 0x10000
+L_10941ac:
+// 0x010941ac: 0x10941ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01093b8c: 0x1093b8c: addiu a0, a0, 6916
+// 0x010941b0: 0x10941b0: addiu a0, a0, 6912
 	ldloc.1
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.1
-// 0x01093b90: 0x1093b90: addu  a1, zero, zero
+// 0x010941b4: 0x10941b4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01093b94: 0x1093b94: addiu a2, zero, -2
+// 0x010941b8: 0x10941b8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01093b98: 0x1093b98: addiu v0, zero, 8
+// 0x010941bc: 0x10941bc: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 6
-// 0x01093b9c: 0x1093b9c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010941c0: 0x10941c0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -790,30 +790,30 @@ L_1093b88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093ba4: 0x1093ba4: addu  s1, v0, zero
+// 0x010941c8: 0x10941c8: addu  s1, v0, zero
 	ldloc 6
 	stloc 10
-// 0x01093ba8: 0x1093ba8: addu  a0, v0, zero
+// 0x010941cc: 0x10941cc: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01093bac: 0x1093bac: addu  a1, zero, zero
+// 0x010941d0: 0x10941d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01093bb0: 0x1093bb0: addiu v0, zero, 10
+// 0x010941d4: 0x10941d4: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x01093bb4: 0x1093bb4: addu  a2, zero, zero
+// 0x010941d8: 0x10941d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01093bb8: 0x1093bb8: addu  a3, zero, zero
+// 0x010941dc: 0x10941dc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01093bbc: 0x1093bbc: jal   0x10991d0 sw    v0, 16(sp)
+// 0x010941e0: 0x10941e0: jal   0x1099818 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -827,16 +827,16 @@ L_1093b88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_10991d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_1099818(int32,int32,int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01093bc4: 0x1093bc4: addu  a0, s1, zero
+// 0x010941e8: 0x10941e8: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01093bc8: 0x1093bc8: addu  a1, zero, zero
+// 0x010941ec: 0x10941ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01093bcc: 0x1093bcc: jal   0x1098f84 addu  a2, zero, zero
+// 0x010941f0: 0x10941f0: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -844,20 +844,20 @@ L_1093b88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093bd4: 0x1093bd4: lui   v0, 0x1090000
+// 0x010941f8: 0x10941f8: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 6
-// 0x01093bd8: 0x1093bd8: addiu v0, v0, 16204
+// 0x010941fc: 0x10941fc: addiu v0, v0, 17776
 	ldloc 6
-	ldc.i4 16204
+	ldc.i4 17776
 	add
 	stloc 6
-// 0x01093bdc: 0x1093bdc: j	 0x1093c18 sw    v0, 184(s1)
+// 0x01094200: 0x1094200: j	 0x109423c sw    v0, 184(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -866,41 +866,41 @@ L_1093b88:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1093c18
+	br L_109423c
 // --- basic block ---
-L_1093be4:
-// 0x01093be4: 0x1093be4: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+L_1094208:
+// 0x01094208: 0x1094208: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 6
 // --- basic block ---
-// 0x01093bec: 0x1093bec: beq   v0, zero, 0x1093bf8 addiu a3, zero, 24
+// 0x01094210: 0x1094210: beq   v0, zero, 0x109421c addiu a3, zero, 24
 	ldloc 6
 	ldc.i4.s 24
 	stloc 4
-	brfalse L_1093bf8
+	brfalse L_109421c
 // --- basic block ---
-// 0x01093bf4: 0x1093bf4: addiu a3, zero, 43
+// 0x01094218: 0x1094218: addiu a3, zero, 43
 	ldc.i4.s 43
 	stloc 4
-L_1093bf8:
-// 0x01093bf8: 0x1093bf8: lui   a0, 0x10000
+L_109421c:
+// 0x0109421c: 0x109421c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01093bfc: 0x1093bfc: addiu v0, zero, 8
+// 0x01094220: 0x1094220: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 6
-// 0x01093c00: 0x1093c00: addiu a0, a0, 6916
+// 0x01094224: 0x1094224: addiu a0, a0, 6912
 	ldloc.1
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.1
-// 0x01093c04: 0x1093c04: addu  a1, zero, zero
+// 0x01094228: 0x1094228: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01093c08: 0x1093c08: addiu a2, zero, -2
+// 0x0109422c: 0x109422c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01093c0c: 0x1093c0c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01094230: 0x1094230: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -914,54 +914,54 @@ L_1093bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093c14: 0x1093c14: addu  s1, v0, zero
+// 0x01094238: 0x1094238: addu  s1, v0, zero
 	ldloc 6
 	stloc 10
-L_1093c18:
-// 0x01093c18: 0x1093c18: lui   s3, 0x0
+L_109423c:
+// 0x0109423c: 0x109423c: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01093c1c: 0x1093c1c: addu  a0, s1, zero
+// 0x01094240: 0x1094240: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01093c20: 0x1093c20: addiu a1, s3, 23008
+// 0x01094244: 0x1094244: addiu a1, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01093c24: 0x1093c24: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01094248: 0x1094248: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01093c2c: 0x1093c2c: lui   a1, 0x10000
+// 0x01094250: 0x1094250: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01093c30: 0x1093c30: lui   a0, 0x10000
+// 0x01094254: 0x1094254: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01093c34: 0x1093c34: addiu a1, a1, 18500
+// 0x01094258: 0x1094258: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01093c38: 0x1093c38: addiu a0, a0, 328
+// 0x0109425c: 0x109425c: addiu a0, a0, 324
 	ldloc.1
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.1
-// 0x01093c3c: 0x1093c3c: addiu a2, zero, 18
+// 0x01094260: 0x1094260: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01093c40: 0x1093c40: jal   0x1098d10 addiu a3, zero, 145
+// 0x01094264: 0x1094264: jal   0x1099358 addiu a3, zero, 145
 	ldc.i4 145
 	stloc 4
 	ldloc.0
@@ -969,31 +969,31 @@ L_1093c18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093c48: 0x1093c48: addu  a0, v0, zero
+// 0x0109426c: 0x109426c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01093c4c: 0x1093c4c: addiu a1, s3, 23008
+// 0x01094270: 0x1094270: addiu a1, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01093c50: 0x1093c50: addu  a2, zero, zero
+// 0x01094274: 0x1094274: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01093c54: 0x1093c54: jal   0x1098fe0 addu  s5, v0, zero
+// 0x01094278: 0x1094278: jal   0x1099628 addu  s5, v0, zero
 	ldloc 6
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01093c5c: 0x1093c5c: lw    v0, 48(s0)
+// 0x01094280: 0x1094280: lw    v0, 48(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1002,44 +1002,44 @@ L_1093c18:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01093c60: 0x1093c60: lui   v1, 0x4000000
+// 0x01094284: 0x1094284: lui   v1, 0x4000000
 	ldc.i4 67108864
 	stloc 5
-// 0x01093c64: 0x1093c64: ori   v1, v1, 16384
+// 0x01094288: 0x1094288: ori   v1, v1, 16384
 	ldloc 5
 	ldc.i4 16384
 	or
 	stloc 5
-// 0x01093c68: 0x1093c68: and   v1, v0, v1
+// 0x0109428c: 0x109428c: and   v1, v0, v1
 	ldloc 6
 	ldloc 5
 	and
 	stloc 5
-// 0x01093c6c: 0x1093c6c: addiu v0, zero, 16384
+// 0x01094290: 0x1094290: addiu v0, zero, 16384
 	ldc.i4 16384
 	stloc 6
-// 0x01093c70: 0x1093c70: bne   v1, v0, 0x1093c84 addiu a1, s3, 23008
+// 0x01094294: 0x1094294: bne   v1, v0, 0x10942a8 addiu a1, s3, 23008
 	ldloc 5
 	ldloc 6
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.2
-	bne.un L_1093c84
+	bne.un L_10942a8
 // --- basic block ---
-// 0x01093c78: 0x1093c78: addu  a0, s5, zero
+// 0x0109429c: 0x109429c: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x01093c7c: 0x1093c7c: jal   0x1098fe0 addu  a2, zero, zero
+// 0x010942a0: 0x10942a0: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1093c84:
-// 0x01093c84: 0x1093c84: lw    v0, 48(s0)
+L_10942a8:
+// 0x010942a8: 0x10942a8: lw    v0, 48(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1048,155 +1048,155 @@ L_1093c84:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01093c88: 0x1093c88: sll   zero, zero, 0
-// 0x01093c8c: 0x1093c8c: andi  v1, v0, 8192
+// 0x010942ac: 0x10942ac: sll   zero, zero, 0
+// 0x010942b0: 0x10942b0: andi  v1, v0, 8192
 	ldloc 6
 	ldc.i4 8192
 	and
 	stloc 5
-// 0x01093c90: 0x1093c90: beq   v1, zero, 0x1093cf4 lui   v1, 0x10000000
+// 0x010942b4: 0x10942b4: beq   v1, zero, 0x1094318 lui   v1, 0x10000000
 	ldloc 5
 	ldc.i4 268435456
 	stloc 5
-	brfalse L_1093cf4
+	brfalse L_1094318
 // --- basic block ---
-// 0x01093c98: 0x1093c98: and   v1, v0, v1
+// 0x010942bc: 0x10942bc: and   v1, v0, v1
 	ldloc 6
 	ldloc 5
 	and
 	stloc 5
-// 0x01093c9c: 0x1093c9c: beq   v1, zero, 0x1093cb8 lui   v1, 0x10000
+// 0x010942c0: 0x10942c0: beq   v1, zero, 0x10942dc lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	brfalse L_1093cb8
+	brfalse L_10942dc
 // --- basic block ---
-// 0x01093ca4: 0x1093ca4: lui   a1, 0x0
+// 0x010942c8: 0x10942c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01093ca8: 0x1093ca8: addiu a1, a1, 23008
+// 0x010942cc: 0x10942cc: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01093cac: 0x1093cac: addu  a0, s5, zero
+// 0x010942d0: 0x10942d0: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x01093cb0: 0x1093cb0: j	 0x1093cec addu  a2, a1, zero
+// 0x010942d4: 0x10942d4: j	 0x1094310 addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-	br L_1093cec
+	br L_1094310
 // --- basic block ---
-L_1093cb8:
-// 0x01093cb8: 0x1093cb8: and   v0, v0, v1
+L_10942dc:
+// 0x010942dc: 0x10942dc: and   v0, v0, v1
 	ldloc 6
 	ldloc 5
 	and
 	stloc 6
-// 0x01093cbc: 0x1093cbc: beq   v0, zero, 0x1093cd0 lui   v0, 0x20000
+// 0x010942e0: 0x10942e0: beq   v0, zero, 0x10942f4 lui   v0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_1093cd0
+	brfalse L_10942f4
 // --- basic block ---
-// 0x01093cc4: 0x1093cc4: and   s2, s2, v0
+// 0x010942e8: 0x10942e8: and   s2, s2, v0
 	ldloc 9
 	ldloc 6
 	and
 	stloc 9
-// 0x01093cc8: 0x1093cc8: beq   s2, zero, 0x1093cdc sll   zero, zero, 0
+// 0x010942ec: 0x10942ec: beq   s2, zero, 0x1094300 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_1093cdc
+	brfalse L_1094300
 // --- basic block ---
-L_1093cd0:
-// 0x01093cd0: 0x1093cd0: lui   a1, 0x0
+L_10942f4:
+// 0x010942f4: 0x10942f4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01093cd4: 0x1093cd4: j	 0x1093ce4 addiu a1, a1, 23008
+// 0x010942f8: 0x10942f8: j	 0x1094308 addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-	br L_1093ce4
+	br L_1094308
 // --- basic block ---
-L_1093cdc:
-// 0x01093cdc: 0x1093cdc: lui   a1, 0x0
+L_1094300:
+// 0x01094300: 0x1094300: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01093ce0: 0x1093ce0: addiu a1, a1, 31980
+// 0x01094304: 0x1094304: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-L_1093ce4:
-// 0x01093ce4: 0x1093ce4: addu  a0, s5, zero
+L_1094308:
+// 0x01094308: 0x1094308: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x01093ce8: 0x1093ce8: addu  a2, zero, zero
+// 0x0109430c: 0x109430c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_1093cec:
-// 0x01093cec: 0x1093cec: jal   0x1098fe0 sll   zero, zero, 0
+L_1094310:
+// 0x01094310: 0x1094310: jal   0x1099628 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1093cf4:
-// 0x01093cf4: 0x1093cf4: addu  a1, s5, zero
+L_1094318:
+// 0x01094318: 0x1094318: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x01093cf8: 0x1093cf8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0109431c: 0x109431c: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093d00: 0x1093d00: addu  a0, s0, zero
+// 0x01094324: 0x1094324: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01093d04: 0x1093d04: jal   0x1098ec4 addu  a1, s1, zero
+// 0x01094328: 0x1094328: jal   0x109950c addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093d0c: 0x1093d0c: j	 0x1093d28 lui   a0, 0x20000
+// 0x01094330: 0x1094330: j	 0x109434c lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_1093d28
+	br L_109434c
 // --- basic block ---
-L_1093d14:
-// 0x01093d14: 0x1093d14: lui   v0, 0x30000
+L_1094338:
+// 0x01094338: 0x1094338: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01093d18: 0x1093d18: and   s2, s2, v0
+// 0x0109433c: 0x109433c: and   s2, s2, v0
 	ldloc 9
 	ldloc 6
 	and
 	stloc 9
-// 0x01093d1c: 0x1093d1c: bne   s2, v0, 0x1093d58 addu  a1, s4, zero
+// 0x01094340: 0x1094340: bne   s2, v0, 0x109437c addu  a1, s4, zero
 	ldloc 9
 	ldloc 6
 	ldloc 13
 	stloc.2
-	bne.un L_1093d58
+	bne.un L_109437c
 // --- basic block ---
-// 0x01093d24: 0x1093d24: lui   a0, 0x20000
+// 0x01094348: 0x1094348: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_1093d28:
-// 0x01093d28: 0x1093d28: jal   0x101cd60 addiu a0, a0, -3228
+L_109434c:
+// 0x0109434c: 0x109434c: jal   0x101cd70 addiu a0, a0, -2764
 	ldloc.1
-	ldc.i4 -3228
+	ldc.i4 -2764
 	add
 	stloc.1
 	ldloc.0
@@ -1204,15 +1204,15 @@ L_1093d28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093d30: 0x1093d30: addu  a1, v0, zero
+// 0x01094354: 0x1094354: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01093d34: 0x1093d34: jal   0x109b50c addu  a0, s0, zero
+// 0x01094358: 0x1094358: jal   0x109bb54 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1220,17 +1220,17 @@ L_1093d28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093d3c: 0x1093d3c: lui   a0, 0x20000
+// 0x01094360: 0x1094360: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01093d40: 0x1093d40: jal   0x101cd60 addiu a0, a0, -3216
+// 0x01094364: 0x1094364: jal   0x101cd70 addiu a0, a0, -2752
 	ldloc.1
-	ldc.i4 -3216
+	ldc.i4 -2752
 	add
 	stloc.1
 	ldloc.0
@@ -1238,15 +1238,15 @@ L_1093d28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093d48: 0x1093d48: addu  a1, v0, zero
+// 0x0109436c: 0x109436c: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01093d4c: 0x1093d4c: jal   0x109b434 addu  a0, s0, zero
+// 0x01094370: 0x1094370: jal   0x109ba7c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1254,16 +1254,16 @@ L_1093d28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093d54: 0x1093d54: addu  a1, s4, zero
+// 0x01094378: 0x1094378: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-L_1093d58:
-// 0x01093d58: 0x1093d58: jal   0x10939ec addu  a0, s0, zero
+L_109437c:
+// 0x0109437c: 0x109437c: jal   0x1094010 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1271,16 +1271,16 @@ L_1093d58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::set_value_10939ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::set_value_1094010(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01093d60: 0x1093d60: lw    ra, 52(sp)
-// 0x01093d64: 0x1093d64: addu  v0, s0, zero
+// 0x01094384: 0x1094384: lw    ra, 52(sp)
+// 0x01094388: 0x1094388: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x01093d68: 0x1093d68: lw    s5, 48(sp)
+// 0x0109438c: 0x109438c: lw    s5, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1289,7 +1289,7 @@ L_1093d58:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01093d6c: 0x1093d6c: lw    s4, 44(sp)
+// 0x01094390: 0x1094390: lw    s4, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1298,7 +1298,7 @@ L_1093d58:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01093d70: 0x1093d70: lw    s3, 40(sp)
+// 0x01094394: 0x1094394: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1307,7 +1307,7 @@ L_1093d58:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01093d74: 0x1093d74: lw    s2, 36(sp)
+// 0x01094398: 0x1094398: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1316,7 +1316,7 @@ L_1093d58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01093d78: 0x1093d78: lw    s1, 32(sp)
+// 0x0109439c: 0x109439c: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1325,7 +1325,7 @@ L_1093d58:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01093d7c: 0x1093d7c: lw    s0, 28(sp)
+// 0x010943a0: 0x10943a0: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1334,7 +1334,7 @@ L_1093d58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01093d80: 0x1093d80: jr    ra addiu sp, sp, 56
+// 0x010943a4: 0x10943a4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1346,7 +1346,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 get_value_1093d88(int32,int32,int32,int32,int32)
+.method public static int32 get_value_10943ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1381,7 +1381,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093d88: 0x1093d88: lw    v0, 48(a0)
+// 0x010943ac: 0x10943ac: lw    v0, 48(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1390,37 +1390,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093d8c: 0x1093d8c: addiu sp, sp, -24
+// 0x010943b0: 0x10943b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01093d90: 0x1093d90: andi  v0, v0, 8192
+// 0x010943b4: 0x10943b4: andi  v0, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	and
 	stloc 5
-// 0x01093d94: 0x1093d94: bne   v0, zero, 0x1093da8 sw    ra, 20(sp)
+// 0x010943b8: 0x10943b8: bne   v0, zero, 0x10943cc sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1093da8
+	brtrue L_10943cc
 // --- basic block ---
-// 0x01093d9c: 0x1093d9c: lui   v0, 0x10000
+// 0x010943c0: 0x10943c0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01093da0: 0x1093da0: j	 0x1093db4 addiu v0, v0, 18500
+// 0x010943c4: 0x10943c4: j	 0x10943d8 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_1093db4
+	br L_10943d8
 // --- basic block ---
-L_1093da8:
-// 0x01093da8: 0x1093da8: lui   a1, 0x10000
+L_10943cc:
+// 0x010943cc: 0x10943cc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01093dac: 0x1093dac: jal   0x109b634 addiu a1, a1, 328
+// 0x010943d0: 0x10943d0: jal   0x109bc7c addiu a1, a1, 324
 	ldloc.2
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
 	ldloc.0
@@ -1428,15 +1428,15 @@ L_1093da8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1093db4:
-// 0x01093db4: 0x1093db4: lw    ra, 20(sp)
-// 0x01093db8: 0x1093db8: sll   zero, zero, 0
-// 0x01093dbc: 0x1093dbc: jr    ra addiu sp, sp, 24
+L_10943d8:
+// 0x010943d8: 0x10943d8: lw    ra, 20(sp)
+// 0x010943dc: 0x10943dc: sll   zero, zero, 0
+// 0x010943e0: 0x10943e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1448,7 +1448,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_title_bar_1093dc4(int32,int32,int32,int32,int32)
+.method public static int32 draw_title_bar_10943e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s6,int32 s4,int32 s5,int32 ra,int32 t0,int32 lo)
@@ -1510,12 +1510,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093dc4: 0x1093dc4: addiu sp, sp, -80
+// 0x010943e8: 0x10943e8: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01093dc8: 0x1093dc8: lw    v1, 4(a0)
+// 0x010943ec: 0x10943ec: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1524,7 +1524,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093dcc: 0x1093dcc: sw    s0, 48(sp)
+// 0x010943f0: 0x10943f0: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1533,24 +1533,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01093dd0: 0x1093dd0: lui   s0, 0x80000
+// 0x010943f4: 0x10943f4: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01093dd4: 0x1093dd4: lw    v0, 9628(s0)
+// 0x010943f8: 0x10943f8: lw    v0, 10092(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2407
+	ldc.i4 2523
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093dd8: 0x1093dd8: addiu v1, v1, -1
+// 0x010943fc: 0x10943fc: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01093ddc: 0x1093ddc: sw    s2, 56(sp)
+// 0x01094400: 0x1094400: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1559,8 +1559,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01093de0: 0x1093de0: sw    ra, 76(sp)
-// 0x01093de4: 0x1093de4: sw    s6, 72(sp)
+// 0x01094404: 0x1094404: sw    ra, 76(sp)
+// 0x01094408: 0x1094408: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1569,7 +1569,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01093de8: 0x1093de8: sw    s5, 68(sp)
+// 0x0109440c: 0x109440c: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1578,7 +1578,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01093dec: 0x1093dec: sw    s4, 64(sp)
+// 0x01094410: 0x1094410: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1587,7 +1587,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01093df0: 0x1093df0: sw    s3, 60(sp)
+// 0x01094414: 0x1094414: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1596,7 +1596,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01093df4: 0x1093df4: sw    s1, 52(sp)
+// 0x01094418: 0x1094418: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1605,10 +1605,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01093df8: 0x1093df8: addu  s2, a0, zero
+// 0x0109441c: 0x109441c: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01093dfc: 0x1093dfc: bne   v0, zero, 0x1093e1c sw    v1, 4(a0)
+// 0x01094420: 0x1094420: bne   v0, zero, 0x1094440 sw    v1, 4(a0)
 	ldloc 5
 	ldloc 6
 	ldloc.1
@@ -1618,20 +1618,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1093e1c
+	brtrue L_1094440
 // --- basic block ---
-// 0x01093e04: 0x1093e04: lui   a2, 0x20000
+// 0x01094428: 0x1094428: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01093e08: 0x1093e08: addiu a2, a2, -3204
+// 0x0109442c: 0x109442c: addiu a2, a2, -2740
 	ldloc.3
-	ldc.i4 -3204
+	ldc.i4 -2740
 	add
 	stloc.3
-// 0x01093e0c: 0x1093e0c: addu  a0, zero, zero
+// 0x01094430: 0x1094430: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01093e10: 0x1093e10: jal   0x10a1918 addiu a1, zero, 3
+// 0x01094434: 0x1094434: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -1639,41 +1639,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093e18: 0x1093e18: sw    v0, 9628(s0)
+// 0x0109443c: 0x109443c: sw    v0, 10092(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2407
+	ldc.i4 2523
 	add
 	ldloc 5
 	stelem.i4
-L_1093e1c:
-// 0x01093e1c: 0x1093e1c: lui   v0, 0x80000
+L_1094440:
+// 0x01094440: 0x1094440: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093e20: 0x1093e20: lw    v1, 0(s2)
+// 0x01094444: 0x1094444: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01093e24: 0x1093e24: lw    a0, 9624(v0)
+// 0x01094448: 0x1094448: lw    a0, 10088(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2406
+	ldc.i4 2522
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093e28: 0x1093e28: lw    v0, 4(s2)
+// 0x0109444c: 0x109444c: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1682,7 +1682,7 @@ L_1093e1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093e2c: 0x1093e2c: sw    v1, 24(sp)
+// 0x01094450: 0x1094450: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1691,7 +1691,7 @@ L_1093e1c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01093e30: 0x1093e30: beq   a0, zero, 0x1093e5c sw    v0, 28(sp)
+// 0x01094454: 0x1094454: beq   a0, zero, 0x1094480 sw    v0, 28(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -1701,12 +1701,12 @@ L_1093e1c:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1093e5c
+	brfalse L_1094480
 // --- basic block ---
-// 0x01093e38: 0x1093e38: lui   v0, 0x0
+// 0x0109445c: 0x109445c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01093e3c: 0x1093e3c: lw    v1, 17512(v0)
+// 0x01094460: 0x1094460: lw    v1, 17512(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1715,75 +1715,75 @@ L_1093e1c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093e40: 0x1093e40: lui   v0, 0xf0000
+// 0x01094464: 0x1094464: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01093e44: 0x1093e44: lw    v0, -30068(v0)
+// 0x01094468: 0x1094468: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093e48: 0x1093e48: sll   zero, zero, 0
-// 0x01093e4c: 0x1093e4c: beq   v1, v0, 0x1093f10 lui   v0, 0x80000
+// 0x0109446c: 0x109446c: sll   zero, zero, 0
+// 0x01094470: 0x1094470: beq   v1, v0, 0x1094534 lui   v0, 0x80000
 	ldloc 7
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	beq  L_1093f10
+	beq  L_1094534
 // --- basic block ---
-// 0x01093e54: 0x1093e54: jal   0x104ec70 sll   zero, zero, 0
+// 0x01094478: 0x1094478: jal   0x104ec80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1093e5c:
-// 0x01093e5c: 0x1093e5c: lui   v0, 0x80000
+L_1094480:
+// 0x01094480: 0x1094480: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093e60: 0x1093e60: lw    s0, 9628(v0)
+// 0x01094484: 0x1094484: lw    s0, 10092(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2407
+	ldc.i4 2523
 	add
 	ldelem.i4
 	stloc 8
-// 0x01093e64: 0x1093e64: lui   v0, 0xf0000
+// 0x01094488: 0x1094488: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01093e68: 0x1093e68: lw    s1, -30068(v0)
+// 0x0109448c: 0x109448c: lw    s1, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 10
-// 0x01093e6c: 0x1093e6c: jal   0x104e020 addu  a0, s0, zero
+// 0x01094490: 0x1094490: jal   0x104e030 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093e74: 0x1093e74: addu  a1, v0, zero
+// 0x01094498: 0x1094498: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01093e78: 0x1093e78: jal   0x104e170 addu  a0, s1, zero
+// 0x0109449c: 0x109449c: jal   0x104e180 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1791,24 +1791,24 @@ L_1093e5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093e80: 0x1093e80: addu  a0, s0, zero
+// 0x010944a4: 0x10944a4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01093e84: 0x1093e84: jal   0x104dffc addu  s1, v0, zero
+// 0x010944a8: 0x10944a8: jal   0x104e00c addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093e8c: 0x1093e8c: lw    v1, 8(s2)
+// 0x010944b0: 0x10944b0: lw    v1, 8(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1817,41 +1817,41 @@ L_1093e5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093e90: 0x1093e90: sll   zero, zero, 0
-// 0x01093e94: 0x1093e94: div   v1, v0
+// 0x010944b4: 0x10944b4: sll   zero, zero, 0
+// 0x010944b8: 0x10944b8: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 17
-// 0x01093e98: 0x1093e98: mflo  lo
+// 0x010944bc: 0x10944bc: mflo  lo
 	ldloc 17
 	stloc 12
-// 0x01093e9c: 0x1093e9c: beq   s0, zero, 0x1093ef4 addiu s6, s6, 1
+// 0x010944c0: 0x10944c0: beq   s0, zero, 0x1094518 addiu s6, s6, 1
 	ldloc 8
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-	brfalse L_1093ef4
+	brfalse L_1094518
 // --- basic block ---
-// 0x01093ea4: 0x1093ea4: addu  s3, zero, zero
+// 0x010944c8: 0x10944c8: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01093ea8: 0x1093ea8: addu  s2, zero, zero
+// 0x010944cc: 0x10944cc: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01093eac: 0x1093eac: addiu s5, sp, 32
+// 0x010944d0: 0x10944d0: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 14
-// 0x01093eb0: 0x1093eb0: j	 0x1093ed4 addiu s4, zero, 1
+// 0x010944d4: 0x10944d4: j	 0x10944f8 addiu s4, zero, 1
 	ldc.i4.1
 	stloc 13
-	br L_1093ed4
+	br L_10944f8
 // --- basic block ---
-L_1093eb8:
-// 0x01093eb8: 0x1093eb8: sw    v0, 40(sp)
+L_10944dc:
+// 0x010944dc: 0x10944dc: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1860,7 +1860,7 @@ L_1093eb8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01093ebc: 0x1093ebc: sw    t0, 32(sp)
+// 0x010944e0: 0x10944e0: sw    t0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1869,7 +1869,7 @@ L_1093eb8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01093ec0: 0x1093ec0: sw    zero, 36(sp)
+// 0x010944e4: 0x10944e4: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1878,7 +1878,7 @@ L_1093eb8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01093ec4: 0x1093ec4: jal   0x104def0 sw    s4, 16(sp)
+// 0x010944e8: 0x10944e8: jal   0x104df00 sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1891,12 +1891,12 @@ L_1093eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093ecc: 0x1093ecc: lw    v0, 40(sp)
+// 0x010944f0: 0x10944f0: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1905,71 +1905,71 @@ L_1093eb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01093ed0: 0x1093ed0: addiu s2, s2, 1
+// 0x010944f4: 0x10944f4: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1093ed4:
-// 0x01093ed4: 0x1093ed4: addu  s3, s3, v0
+L_10944f8:
+// 0x010944f8: 0x10944f8: addu  s3, s3, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x01093ed8: 0x1093ed8: slt   v1, s6, s2
+// 0x010944fc: 0x10944fc: slt   v1, s6, s2
 	ldloc 12
 	ldloc 9
 	clt
 	stloc 7
-// 0x01093edc: 0x1093edc: addu  a0, s1, zero
+// 0x01094500: 0x1094500: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01093ee0: 0x1093ee0: addu  a1, s5, zero
+// 0x01094504: 0x1094504: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x01093ee4: 0x1093ee4: addu  a2, zero, zero
+// 0x01094508: 0x1094508: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01093ee8: 0x1093ee8: addu  a3, s0, zero
+// 0x0109450c: 0x109450c: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x01093eec: 0x1093eec: beq   v1, zero, 0x1093eb8 subu  t0, s3, v0
+// 0x01094510: 0x1094510: beq   v1, zero, 0x10944dc subu  t0, s3, v0
 	ldloc 7
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 16
-	brfalse L_1093eb8
+	brfalse L_10944dc
 // --- basic block ---
-L_1093ef4:
-// 0x01093ef4: 0x1093ef4: lui   v0, 0xf0000
+L_1094518:
+// 0x01094518: 0x1094518: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01093ef8: 0x1093ef8: lw    v1, -30068(v0)
+// 0x0109451c: 0x109451c: lw    v1, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x01093efc: 0x1093efc: lui   v0, 0x80000
+// 0x01094520: 0x1094520: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01093f00: 0x1093f00: sw    s1, 9624(v0)
+// 0x01094524: 0x1094524: sw    s1, 10088(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2406
+	ldc.i4 2522
 	add
 	ldloc 10
 	stelem.i4
-// 0x01093f04: 0x1093f04: lui   v0, 0x0
+// 0x01094528: 0x1094528: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01093f08: 0x1093f08: sw    v1, 17512(v0)
+// 0x0109452c: 0x109452c: sw    v1, 17512(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1978,28 +1978,28 @@ L_1093ef4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01093f0c: 0x1093f0c: lui   v0, 0x80000
+// 0x01094530: 0x1094530: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1093f10:
-// 0x01093f10: 0x1093f10: lw    a0, 9624(v0)
+L_1094534:
+// 0x01094534: 0x1094534: lw    a0, 10088(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2406
+	ldc.i4 2522
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093f14: 0x1093f14: addiu a1, sp, 24
+// 0x01094538: 0x1094538: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01093f18: 0x1093f18: addu  a2, zero, zero
+// 0x0109453c: 0x109453c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01093f1c: 0x1093f1c: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01094540: 0x1094540: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2007,13 +2007,13 @@ L_1093f10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01093f24: 0x1093f24: lw    ra, 76(sp)
-// 0x01093f28: 0x1093f28: lw    s6, 72(sp)
+// 0x01094548: 0x1094548: lw    ra, 76(sp)
+// 0x0109454c: 0x109454c: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2022,7 +2022,7 @@ L_1093f10:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01093f2c: 0x1093f2c: lw    s5, 68(sp)
+// 0x01094550: 0x1094550: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2031,7 +2031,7 @@ L_1093f10:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01093f30: 0x1093f30: lw    s4, 64(sp)
+// 0x01094554: 0x1094554: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2040,7 +2040,7 @@ L_1093f10:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01093f34: 0x1093f34: lw    s3, 60(sp)
+// 0x01094558: 0x1094558: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2049,7 +2049,7 @@ L_1093f10:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01093f38: 0x1093f38: lw    s2, 56(sp)
+// 0x0109455c: 0x109455c: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2058,7 +2058,7 @@ L_1093f10:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01093f3c: 0x1093f3c: lw    s1, 52(sp)
+// 0x01094560: 0x1094560: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2067,7 +2067,7 @@ L_1093f10:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01093f40: 0x1093f40: lw    s0, 48(sp)
+// 0x01094564: 0x1094564: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2076,7 +2076,7 @@ L_1093f10:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01093f44: 0x1093f44: jr    ra addiu sp, sp, 80
+// 0x01094568: 0x1094568: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -2088,7 +2088,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_title_1093f4c(int32,int32,int32,int32,int32)
+.method public static int32 draw_title_1094570(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -2126,12 +2126,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093f4c: 0x1093f4c: addiu sp, sp, -32
+// 0x01094570: 0x1094570: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01093f50: 0x1093f50: sw    s0, 24(sp)
+// 0x01094574: 0x1094574: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2140,17 +2140,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01093f54: 0x1093f54: sw    ra, 28(sp)
-// 0x01093f58: 0x1093f58: bne   a2, zero, 0x1093f78 addu  s0, a0, zero
+// 0x01094578: 0x1094578: sw    ra, 28(sp)
+// 0x0109457c: 0x109457c: bne   a2, zero, 0x109459c addu  s0, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 6
-	brtrue L_1093f78
+	brtrue L_109459c
 // --- basic block ---
-// 0x01093f60: 0x1093f60: addu  a0, a1, zero
+// 0x01094584: 0x1094584: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01093f64: 0x1093f64: sw    a1, 16(sp)
+// 0x01094588: 0x1094588: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2159,7 +2159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01093f68: 0x1093f68: jal   0x1093dc4 sw    a2, 20(sp)
+// 0x0109458c: 0x109458c: jal   0x10943e8 sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2173,12 +2173,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::draw_title_bar_1093dc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::draw_title_bar_10943e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01093f70: 0x1093f70: lw    a2, 20(sp)
+// 0x01094594: 0x1094594: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2187,7 +2187,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01093f74: 0x1093f74: lw    a1, 16(sp)
+// 0x01094598: 0x1094598: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2196,8 +2196,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_1093f78:
-// 0x01093f78: 0x1093f78: jal   0x1092f4c addu  a0, s0, zero
+L_109459c:
+// 0x0109459c: 0x109459c: jal   0x1093570 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2205,13 +2205,13 @@ L_1093f78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::draw_1092f4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::draw_1093570(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01093f80: 0x1093f80: lw    ra, 28(sp)
-// 0x01093f84: 0x1093f84: lw    s0, 24(sp)
+// 0x010945a4: 0x10945a4: lw    ra, 28(sp)
+// 0x010945a8: 0x10945a8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2220,7 +2220,7 @@ L_1093f78:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01093f88: 0x1093f88: jr    ra addiu sp, sp, 32
+// 0x010945ac: 0x10945ac: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2232,7 +2232,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_dialog_is_currently_active_1093f90()
+.method public static int32 ssd_dialog_is_currently_active_10945b4()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2249,19 +2249,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093f90: 0x1093f90: lui   v0, 0x80000
+// 0x010945b4: 0x10945b4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01093f94: 0x1093f94: lw    v0, 9644(v0)
+// 0x010945b8: 0x10945b8: lw    v0, 10108(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.0
-// 0x01093f98: 0x1093f98: jr    ra sltu  v0, zero, v0
+// 0x010945bc: 0x10945bc: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
@@ -2271,7 +2271,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_dialog_get_currently_active_1093fa0()
+.method public static int32 ssd_dialog_get_currently_active_10945c4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2291,26 +2291,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093fa0: 0x1093fa0: lui   v0, 0x80000
+// 0x010945c4: 0x10945c4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01093fa4: 0x1093fa4: lw    v1, 9644(v0)
+// 0x010945c8: 0x10945c8: lw    v1, 10108(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093fa8: 0x1093fa8: sll   zero, zero, 0
-// 0x01093fac: 0x1093fac: beq   v1, zero, 0x1093fb8 addu  v0, zero, zero
+// 0x010945cc: 0x10945cc: sll   zero, zero, 0
+// 0x010945d0: 0x10945d0: beq   v1, zero, 0x10945dc addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_1093fb8
+	brfalse L_10945dc
 // --- basic block ---
-// 0x01093fb4: 0x1093fb4: lw    v0, 20(v1)
+// 0x010945d8: 0x10945d8: lw    v0, 20(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2319,8 +2319,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-L_1093fb8:
-// 0x01093fb8: 0x1093fb8: jr    ra sll   zero, zero, 0
+L_10945dc:
+// 0x010945dc: 0x10945dc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -2328,7 +2328,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_dialog_currently_active_name_1093fc0()
+.method public static int32 ssd_dialog_currently_active_name_10945e4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2348,26 +2348,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093fc0: 0x1093fc0: lui   v0, 0x80000
+// 0x010945e4: 0x10945e4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01093fc4: 0x1093fc4: lw    v1, 9644(v0)
+// 0x010945e8: 0x10945e8: lw    v1, 10108(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093fc8: 0x1093fc8: sll   zero, zero, 0
-// 0x01093fcc: 0x1093fcc: beq   v1, zero, 0x1093fd8 addu  v0, zero, zero
+// 0x010945ec: 0x10945ec: sll   zero, zero, 0
+// 0x010945f0: 0x10945f0: beq   v1, zero, 0x10945fc addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_1093fd8
+	brfalse L_10945fc
 // --- basic block ---
-// 0x01093fd4: 0x1093fd4: lw    v0, 8(v1)
+// 0x010945f8: 0x10945f8: lw    v0, 8(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2376,8 +2376,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-L_1093fd8:
-// 0x01093fd8: 0x1093fd8: jr    ra sll   zero, zero, 0
+L_10945fc:
+// 0x010945fc: 0x10945fc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -2385,7 +2385,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_dialog_get_current_container_1093fe0()
+.method public static int32 ssd_dialog_get_current_container_1094604()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2405,26 +2405,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01093fe0: 0x1093fe0: lui   v0, 0x80000
+// 0x01094604: 0x1094604: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01093fe4: 0x1093fe4: lw    v1, 9644(v0)
+// 0x01094608: 0x1094608: lw    v1, 10108(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x01093fe8: 0x1093fe8: sll   zero, zero, 0
-// 0x01093fec: 0x1093fec: beq   v1, zero, 0x1093ff8 addu  v0, zero, zero
+// 0x0109460c: 0x109460c: sll   zero, zero, 0
+// 0x01094610: 0x1094610: beq   v1, zero, 0x109461c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_1093ff8
+	brfalse L_109461c
 // --- basic block ---
-// 0x01093ff4: 0x1093ff4: lw    v0, 20(v1)
+// 0x01094618: 0x1094618: lw    v0, 20(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2433,8 +2433,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-L_1093ff8:
-// 0x01093ff8: 0x1093ff8: jr    ra sll   zero, zero, 0
+L_109461c:
+// 0x0109461c: 0x109461c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -2442,7 +2442,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_dialog_get_current_data_1094000()
+.method public static int32 ssd_dialog_get_current_data_1094624()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 ra)
@@ -2459,20 +2459,20 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094000: 0x1094000: lui   v0, 0x80000
+// 0x01094624: 0x1094624: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01094004: 0x1094004: lw    v0, 9644(v0)
+// 0x01094628: 0x1094628: lw    v0, 10108(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.0
-// 0x01094008: 0x1094008: sll   zero, zero, 0
-// 0x0109400c: 0x109400c: lw    v0, 20(v0)
+// 0x0109462c: 0x109462c: sll   zero, zero, 0
+// 0x01094630: 0x1094630: lw    v0, 20(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -2481,8 +2481,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01094010: 0x1094010: sll   zero, zero, 0
-// 0x01094014: 0x1094014: lw    v0, 164(v0)
+// 0x01094634: 0x1094634: sll   zero, zero, 0
+// 0x01094638: 0x1094638: lw    v0, 164(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -2491,13 +2491,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01094018: 0x1094018: jr    ra sll   zero, zero, 0
+// 0x0109463c: 0x109463c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_dialog_get_focus_1094054()
+.method public static int32 ssd_dialog_get_focus_1094678()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2517,26 +2517,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094054: 0x1094054: lui   v0, 0x80000
+// 0x01094678: 0x1094678: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01094058: 0x1094058: lw    v1, 9644(v0)
+// 0x0109467c: 0x109467c: lw    v1, 10108(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109405c: 0x109405c: sll   zero, zero, 0
-// 0x01094060: 0x1094060: beq   v1, zero, 0x109406c addu  v0, zero, zero
+// 0x01094680: 0x1094680: sll   zero, zero, 0
+// 0x01094684: 0x1094684: beq   v1, zero, 0x1094690 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_109406c
+	brfalse L_1094690
 // --- basic block ---
-// 0x01094068: 0x1094068: lw    v0, 28(v1)
+// 0x0109468c: 0x109468c: lw    v0, 28(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2545,8 +2545,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-L_109406c:
-// 0x0109406c: 0x109406c: jr    ra sll   zero, zero, 0
+L_1094690:
+// 0x01094690: 0x1094690: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -2554,7 +2554,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_dialog_set_current_scroll_flag_10940b8(int32)
+.method public static int32 ssd_dialog_set_current_scroll_flag_10946dc(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -2574,24 +2574,24 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010940b8: 0x10940b8: lui   v0, 0x80000
+// 0x010946dc: 0x10946dc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010940bc: 0x10940bc: lw    v0, 9644(v0)
+// 0x010946e0: 0x10946e0: lw    v0, 10108(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x010940c0: 0x10940c0: sll   zero, zero, 0
-// 0x010940c4: 0x10940c4: beq   v0, zero, 0x10940d0 sll   zero, zero, 0
+// 0x010946e4: 0x10946e4: sll   zero, zero, 0
+// 0x010946e8: 0x10946e8: beq   v0, zero, 0x10946f4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10940d0
+	brfalse L_10946f4
 // --- basic block ---
-// 0x010940cc: 0x10940cc: sw    a0, 96(v0)
+// 0x010946f0: 0x10946f0: sw    a0, 96(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2600,14 +2600,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.0
 	stelem.i4
-L_10940d0:
-// 0x010940d0: 0x10940d0: jr    ra sll   zero, zero, 0
+L_10946f4:
+// 0x010946f4: 0x10946f4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_dialog_is_context_menu_10940d8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_is_context_menu_10946fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2642,31 +2642,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010940d8: 0x10940d8: lui   v0, 0x80000
+// 0x010946fc: 0x10946fc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010940dc: 0x10940dc: lw    v1, 9644(v0)
+// 0x01094700: 0x1094700: lw    v1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x010940e0: 0x10940e0: addiu sp, sp, -24
+// 0x01094704: 0x1094704: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010940e4: 0x10940e4: sw    ra, 20(sp)
-// 0x010940e8: 0x10940e8: beq   v1, zero, 0x1094108 addu  v0, zero, zero
+// 0x01094708: 0x1094708: sw    ra, 20(sp)
+// 0x0109470c: 0x109470c: beq   v1, zero, 0x109472c addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1094108
+	brfalse L_109472c
 // --- basic block ---
-// 0x010940f0: 0x10940f0: lw    v0, 20(v1)
+// 0x01094714: 0x1094714: lw    v0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2675,10 +2675,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010940f4: 0x10940f4: lui   a1, 0x20000
+// 0x01094718: 0x1094718: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010940f8: 0x10940f8: lw    a0, 16(v0)
+// 0x0109471c: 0x109471c: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2687,9 +2687,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010940fc: 0x10940fc: jal   0x1000420 addiu a1, a1, -3196
+// 0x01094720: 0x1094720: jal   0x1000420 addiu a1, a1, -2732
 	ldloc.2
-	ldc.i4 -3196
+	ldc.i4 -2732
 	add
 	stloc.2
 	ldloc.0
@@ -2702,15 +2702,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094104: 0x1094104: sltu  v0, zero, v0
+// 0x01094728: 0x1094728: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-L_1094108:
-// 0x01094108: 0x1094108: lw    ra, 20(sp)
-// 0x0109410c: 0x109410c: sll   zero, zero, 0
-// 0x01094110: 0x1094110: jr    ra addiu sp, sp, 24
+L_109472c:
+// 0x0109472c: 0x109472c: lw    ra, 20(sp)
+// 0x01094730: 0x1094730: sll   zero, zero, 0
+// 0x01094734: 0x1094734: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2722,7 +2722,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_get_1094118(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_get_109473c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -2763,15 +2763,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094118: 0x1094118: addiu sp, sp, -32
+// 0x0109473c: 0x109473c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109411c: 0x109411c: lui   v0, 0x80000
+// 0x01094740: 0x1094740: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01094120: 0x1094120: sw    s1, 24(sp)
+// 0x01094744: 0x1094744: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2780,7 +2780,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01094124: 0x1094124: sw    s0, 20(sp)
+// 0x01094748: 0x1094748: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2789,23 +2789,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01094128: 0x1094128: sw    ra, 28(sp)
-// 0x0109412c: 0x109412c: lw    s0, 9648(v0)
+// 0x0109474c: 0x109474c: sw    ra, 28(sp)
+// 0x01094750: 0x1094750: lw    s0, 10112(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2412
+	ldc.i4 2528
 	add
 	ldelem.i4
 	stloc 6
-// 0x01094130: 0x1094130: j	 0x1094154 addu  s1, a0, zero
+// 0x01094754: 0x1094754: j	 0x1094778 addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-	br L_1094154
+	br L_1094778
 // --- basic block ---
-L_1094138:
-// 0x01094138: 0x1094138: lw    a0, 8(s0)
+L_109475c:
+// 0x0109475c: 0x109475c: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2814,37 +2814,37 @@ L_1094138:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109413c: 0x109413c: jal   0x1001b14 sll   zero, zero, 0
+// 0x01094760: 0x1094760: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01094144: 0x1094144: beq   v0, zero, 0x109415c sll   zero, zero, 0
+// 0x01094768: 0x1094768: beq   v0, zero, 0x1094780 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109415c
+	brfalse L_1094780
 // --- basic block ---
-// 0x0109414c: 0x109414c: lw    s0, 0(s0)
+// 0x01094770: 0x1094770: lw    s0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01094150: 0x1094150: sll   zero, zero, 0
-L_1094154:
-// 0x01094154: 0x1094154: bne   s0, zero, 0x1094138 addu  a1, s1, zero
+// 0x01094774: 0x1094774: sll   zero, zero, 0
+L_1094778:
+// 0x01094778: 0x1094778: bne   s0, zero, 0x109475c addu  a1, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brtrue L_1094138
+	brtrue L_109475c
 // --- basic block ---
-L_109415c:
-// 0x0109415c: 0x109415c: lw    ra, 28(sp)
-// 0x01094160: 0x1094160: addu  v0, s0, zero
+L_1094780:
+// 0x01094780: 0x1094780: lw    ra, 28(sp)
+// 0x01094784: 0x1094784: addu  v0, s0, zero
 	ldloc 6
 	stloc 7
-// 0x01094164: 0x1094164: lw    s1, 24(sp)
+// 0x01094788: 0x1094788: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2853,7 +2853,7 @@ L_109415c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094168: 0x1094168: lw    s0, 20(sp)
+// 0x0109478c: 0x109478c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2862,7 +2862,7 @@ L_109415c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109416c: 0x109416c: jr    ra addiu sp, sp, 32
+// 0x01094790: 0x1094790: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2874,7 +2874,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_dialog_exists_10941a4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_exists_10947c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2909,30 +2909,30 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010941a4: 0x10941a4: addiu sp, sp, -24
+// 0x010947c8: 0x10947c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010941a8: 0x10941a8: sw    ra, 20(sp)
-// 0x010941ac: 0x10941ac: jal   0x1094118 sll   zero, zero, 0
+// 0x010947cc: 0x10947cc: sw    ra, 20(sp)
+// 0x010947d0: 0x10947d0: jal   0x109473c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_1094118(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_109473c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010941b4: 0x10941b4: lw    ra, 20(sp)
-// 0x010941b8: 0x10941b8: sltu  v0, zero, v0
+// 0x010947d8: 0x10947d8: lw    ra, 20(sp)
+// 0x010947dc: 0x10947dc: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010941bc: 0x10941bc: jr    ra addiu sp, sp, 24
+// 0x010947e0: 0x10947e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2944,7 +2944,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_right_title_button_10941e8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_right_title_button_109480c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -2979,22 +2979,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010941e8: 0x10941e8: lui   v0, 0x80000
+// 0x0109480c: 0x109480c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010941ec: 0x10941ec: lw    v0, 9644(v0)
+// 0x01094810: 0x1094810: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x010941f0: 0x10941f0: lui   a1, 0x20000
+// 0x01094814: 0x1094814: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010941f4: 0x10941f4: lw    a0, 20(v0)
+// 0x01094818: 0x1094818: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3003,15 +3003,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010941f8: 0x10941f8: addiu sp, sp, -24
+// 0x0109481c: 0x109481c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010941fc: 0x10941fc: sw    ra, 20(sp)
-// 0x01094200: 0x1094200: jal   0x109b304 addiu a1, a1, -3176
+// 0x01094820: 0x1094820: sw    ra, 20(sp)
+// 0x01094824: 0x1094824: jal   0x109b94c addiu a1, a1, -2712
 	ldloc.2
-	ldc.i4 -3176
+	ldc.i4 -2712
 	add
 	stloc.2
 	ldloc.0
@@ -3019,14 +3019,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01094208: 0x1094208: lw    ra, 20(sp)
-// 0x0109420c: 0x109420c: sll   zero, zero, 0
-// 0x01094210: 0x1094210: jr    ra addiu sp, sp, 24
+// 0x0109482c: 0x109482c: lw    ra, 20(sp)
+// 0x01094830: 0x1094830: sll   zero, zero, 0
+// 0x01094834: 0x1094834: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3038,7 +3038,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_free_1094218(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_free_109483c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3076,12 +3076,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094218: 0x1094218: addiu sp, sp, -32
+// 0x0109483c: 0x109483c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109421c: 0x109421c: sw    s0, 24(sp)
+// 0x01094840: 0x1094840: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3090,7 +3090,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01094220: 0x1094220: sw    a1, 16(sp)
+// 0x01094844: 0x1094844: sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3099,19 +3099,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01094224: 0x1094224: sw    ra, 28(sp)
-// 0x01094228: 0x1094228: jal   0x1094118 sll   zero, zero, 0
+// 0x01094848: 0x1094848: sw    ra, 28(sp)
+// 0x0109484c: 0x109484c: jal   0x109473c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_1094118(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_109473c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094230: 0x1094230: lw    a1, 16(sp)
+// 0x01094854: 0x1094854: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3120,10 +3120,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01094234: 0x1094234: addu  s0, v0, zero
+// 0x01094858: 0x1094858: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01094238: 0x1094238: lw    v0, 20(v0)
+// 0x0109485c: 0x109485c: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3132,13 +3132,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109423c: 0x109423c: bne   a1, zero, 0x1094258 lui   v1, 0x80000
+// 0x01094860: 0x1094860: bne   a1, zero, 0x109487c lui   v1, 0x80000
 	ldloc.2
 	ldc.i4 524288
 	stloc 7
-	brtrue L_1094258
+	brtrue L_109487c
 // --- basic block ---
-// 0x01094244: 0x1094244: lw    v0, 48(v0)
+// 0x01094868: 0x1094868: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3147,91 +3147,91 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094248: 0x1094248: sll   zero, zero, 0
-// 0x0109424c: 0x109424c: andi  v0, v0, 2048
+// 0x0109486c: 0x109486c: sll   zero, zero, 0
+// 0x01094870: 0x1094870: andi  v0, v0, 2048
 	ldloc 5
 	ldc.i4 2048
 	and
 	stloc 5
-// 0x01094250: 0x1094250: bne   v0, zero, 0x10942d8 sll   zero, zero, 0
+// 0x01094874: 0x1094874: bne   v0, zero, 0x10948fc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10942d8
+	brtrue L_10948fc
 // --- basic block ---
-L_1094258:
-// 0x01094258: 0x1094258: lw    v0, 9648(v1)
+L_109487c:
+// 0x0109487c: 0x109487c: lw    v0, 10112(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2412
+	ldc.i4 2528
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109425c: 0x109425c: sll   zero, zero, 0
-// 0x01094260: 0x1094260: bne   v0, s0, 0x109428c sll   zero, zero, 0
+// 0x01094880: 0x1094880: sll   zero, zero, 0
+// 0x01094884: 0x1094884: bne   v0, s0, 0x10948b0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_109428c
+	bne.un L_10948b0
 // --- basic block ---
-// 0x01094268: 0x1094268: lw    v0, 0(s0)
+// 0x0109488c: 0x109488c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109426c: 0x109426c: j	 0x109429c sw    v0, 9648(v1)
+// 0x01094890: 0x1094890: j	 0x10948c0 sw    v0, 10112(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2412
+	ldc.i4 2528
 	add
 	ldloc 5
 	stelem.i4
-	br L_109429c
+	br L_10948c0
 // --- basic block ---
-L_1094274:
-// 0x01094274: 0x1094274: bne   v1, s0, 0x1094288 sll   zero, zero, 0
+L_1094898:
+// 0x01094898: 0x1094898: bne   v1, s0, 0x10948ac sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1094288
+	bne.un L_10948ac
 // --- basic block ---
-// 0x0109427c: 0x109427c: lw    v1, 0(s0)
+// 0x010948a0: 0x10948a0: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01094280: 0x1094280: j	 0x109429c sw    v1, 0(v0)
+// 0x010948a4: 0x10948a4: j	 0x10948c0 sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_109429c
+	br L_10948c0
 // --- basic block ---
-L_1094288:
-// 0x01094288: 0x1094288: addu  v0, v1, zero
+L_10948ac:
+// 0x010948ac: 0x10948ac: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-L_109428c:
-// 0x0109428c: 0x109428c: lw    v1, 0(v0)
+L_10948b0:
+// 0x010948b0: 0x10948b0: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01094290: 0x1094290: sll   zero, zero, 0
-// 0x01094294: 0x1094294: bne   v1, zero, 0x1094274 sll   zero, zero, 0
+// 0x010948b4: 0x10948b4: sll   zero, zero, 0
+// 0x010948b8: 0x10948b8: bne   v1, zero, 0x1094898 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1094274
+	brtrue L_1094898
 // --- basic block ---
-L_109429c:
-// 0x0109429c: 0x109429c: lw    a0, 20(s0)
+L_10948c0:
+// 0x010948c0: 0x10948c0: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3240,7 +3240,7 @@ L_109429c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010942a0: 0x10942a0: jal   0x10992a8 addu  a2, zero, zero
+// 0x010948c4: 0x10948c4: jal   0x10998f0 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3248,12 +3248,12 @@ L_109429c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_10992a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_10998f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010942a8: 0x10942a8: lw    v0, 116(s0)
+// 0x010948cc: 0x10948cc: lw    v0, 116(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3262,12 +3262,12 @@ L_109429c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010942ac: 0x10942ac: sll   zero, zero, 0
-// 0x010942b0: 0x10942b0: beq   v0, zero, 0x10942c4 sll   zero, zero, 0
+// 0x010948d0: 0x10948d0: sll   zero, zero, 0
+// 0x010948d4: 0x10948d4: beq   v0, zero, 0x10948e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10942c4
+	brfalse L_10948e8
 // --- basic block ---
-// 0x010942b8: 0x10942b8: lw    a0, 120(s0)
+// 0x010948dc: 0x10948dc: lw    a0, 120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3276,7 +3276,7 @@ L_109429c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010942bc: 0x10942bc: jalr  v0 sll   zero, zero, 0
+// 0x010948e0: 0x10948e0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3288,8 +3288,8 @@ L_109429c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10942c4:
-// 0x010942c4: 0x10942c4: lw    a0, 8(s0)
+L_10948e8:
+// 0x010948e8: 0x10948e8: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3298,7 +3298,7 @@ L_10942c4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010942c8: 0x10942c8: jal   0x1000930 sll   zero, zero, 0
+// 0x010948ec: 0x10948ec: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3309,7 +3309,7 @@ L_10942c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010942d0: 0x10942d0: jal   0x1000930 addu  a0, s0, zero
+// 0x010948f4: 0x10948f4: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3322,9 +3322,9 @@ L_10942c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10942d8:
-// 0x010942d8: 0x10942d8: lw    ra, 28(sp)
-// 0x010942dc: 0x10942dc: lw    s0, 24(sp)
+L_10948fc:
+// 0x010948fc: 0x10948fc: lw    ra, 28(sp)
+// 0x01094900: 0x1094900: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3333,7 +3333,7 @@ L_10942d8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010942e0: 0x10942e0: jr    ra addiu sp, sp, 32
+// 0x01094904: 0x1094904: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3345,7 +3345,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -3383,12 +3383,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010942e8: 0x10942e8: addiu sp, sp, -40
+// 0x0109490c: 0x109490c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010942ec: 0x10942ec: sw    s0, 32(sp)
+// 0x01094910: 0x1094910: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3397,33 +3397,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010942f0: 0x10942f0: addu  s0, a0, zero
+// 0x01094914: 0x1094914: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010942f4: 0x10942f4: lui   a0, 0x0
+// 0x01094918: 0x1094918: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010942f8: 0x10942f8: addu  a3, a1, zero
+// 0x0109491c: 0x109491c: addu  a3, a1, zero
 	ldloc.2
 	stloc 4
-// 0x010942fc: 0x10942fc: ori   v0, a2, 136
+// 0x01094920: 0x1094920: ori   v0, a2, 136
 	ldloc.3
 	ldc.i4 136
 	or
 	stloc 5
-// 0x01094300: 0x1094300: addiu a0, a0, 32124
+// 0x01094924: 0x1094924: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01094304: 0x1094304: addu  a1, zero, zero
+// 0x01094928: 0x1094928: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01094308: 0x1094308: addiu a2, zero, -2
+// 0x0109492c: 0x109492c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0109430c: 0x109430c: sw    ra, 36(sp)
-// 0x01094310: 0x1094310: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01094930: 0x1094930: sw    ra, 36(sp)
+// 0x01094934: 0x1094934: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3437,21 +3437,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01094318: 0x1094318: addu  a0, v0, zero
+// 0x0109493c: 0x109493c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109431c: 0x109431c: addu  a1, zero, zero
+// 0x01094940: 0x1094940: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01094320: 0x1094320: addu  a2, zero, zero
+// 0x01094944: 0x1094944: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01094324: 0x1094324: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01094948: 0x1094948: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3463,9 +3463,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109432c: 0x109432c: lw    v0, 24(sp)
+// 0x01094950: 0x1094950: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3474,21 +3474,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094330: 0x1094330: addu  a0, s0, zero
+// 0x01094954: 0x1094954: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01094334: 0x1094334: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01094958: 0x1094958: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109433c: 0x109433c: lw    ra, 36(sp)
-// 0x01094340: 0x1094340: lw    s0, 32(sp)
+// 0x01094960: 0x1094960: lw    ra, 36(sp)
+// 0x01094964: 0x1094964: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3497,7 +3497,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094344: 0x1094344: jr    ra addiu sp, sp, 40
+// 0x01094968: 0x1094968: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3509,7 +3509,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -3547,12 +3547,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109434c: 0x109434c: addiu sp, sp, -40
+// 0x01094970: 0x1094970: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01094350: 0x1094350: sw    s0, 32(sp)
+// 0x01094974: 0x1094974: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3561,19 +3561,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01094354: 0x1094354: addu  v0, a1, zero
+// 0x01094978: 0x1094978: addu  v0, a1, zero
 	ldloc.2
 	stloc 5
-// 0x01094358: 0x1094358: addu  s0, a0, zero
+// 0x0109497c: 0x109497c: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0109435c: 0x109435c: lui   a1, 0x10000
+// 0x01094980: 0x1094980: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01094360: 0x1094360: lui   a0, 0x20000
+// 0x01094984: 0x1094984: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01094364: 0x1094364: sw    a2, 16(sp)
+// 0x01094988: 0x1094988: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3582,21 +3582,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01094368: 0x1094368: addiu a3, zero, 20
+// 0x0109498c: 0x109498c: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0109436c: 0x109436c: addiu a1, a1, 18500
+// 0x01094990: 0x1094990: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01094370: 0x1094370: addu  a2, v0, zero
+// 0x01094994: 0x1094994: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01094374: 0x1094374: sw    ra, 36(sp)
-// 0x01094378: 0x1094378: jal   0x1093a24 addiu a0, a0, -3156
+// 0x01094998: 0x1094998: sw    ra, 36(sp)
+// 0x0109499c: 0x109499c: jal   0x1094048 addiu a0, a0, -2692
 	ldloc.1
-	ldc.i4 -3156
+	ldc.i4 -2692
 	add
 	stloc.1
 	ldloc.0
@@ -3604,21 +3604,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01094380: 0x1094380: addu  a0, v0, zero
+// 0x010949a4: 0x10949a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01094384: 0x1094384: addu  a1, zero, zero
+// 0x010949a8: 0x10949a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01094388: 0x1094388: addu  a2, zero, zero
+// 0x010949ac: 0x10949ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109438c: 0x109438c: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010949b0: 0x10949b0: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3630,9 +3630,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01094394: 0x1094394: lw    v0, 24(sp)
+// 0x010949b8: 0x10949b8: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3641,21 +3641,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094398: 0x1094398: addu  a0, s0, zero
+// 0x010949bc: 0x10949bc: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0109439c: 0x109439c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010949c0: 0x10949c0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010943a4: 0x10943a4: lw    ra, 36(sp)
-// 0x010943a8: 0x10943a8: lw    s0, 32(sp)
+// 0x010949c8: 0x10949c8: lw    ra, 36(sp)
+// 0x010949cc: 0x10949cc: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3664,7 +3664,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010943ac: 0x10943ac: jr    ra addiu sp, sp, 40
+// 0x010949d0: 0x10949d0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3676,7 +3676,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_set_ntv_keyboard_params_10943b4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_set_ntv_keyboard_params_10949d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -3711,13 +3711,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010943b4: 0x10943b4: addiu sp, sp, -32
+// 0x010949d8: 0x10949d8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010943b8: 0x10943b8: sw    ra, 28(sp)
-// 0x010943bc: 0x10943bc: jal   0x1094118 sw    a1, 16(sp)
+// 0x010949dc: 0x10949dc: sw    ra, 28(sp)
+// 0x010949e0: 0x10949e0: jal   0x109473c sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3731,12 +3731,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_1094118(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_109473c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010943c4: 0x10943c4: lw    a1, 16(sp)
+// 0x010949e8: 0x10949e8: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3745,20 +3745,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010943c8: 0x10943c8: addiu v1, v0, 100
+// 0x010949ec: 0x10949ec: addiu v1, v0, 100
 	ldloc 6
 	ldc.i4.s 100
 	add
 	stloc 7
-// 0x010943cc: 0x10943cc: lw    a0, 0(a1)
+// 0x010949f0: 0x10949f0: lw    a0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010943d0: 0x10943d0: sll   zero, zero, 0
-// 0x010943d4: 0x10943d4: sw    a0, 100(v0)
+// 0x010949f4: 0x10949f4: sll   zero, zero, 0
+// 0x010949f8: 0x10949f8: sw    a0, 100(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3767,7 +3767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010943d8: 0x10943d8: lw    v0, 4(a1)
+// 0x010949fc: 0x10949fc: lw    v0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3776,8 +3776,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010943dc: 0x10943dc: sll   zero, zero, 0
-// 0x010943e0: 0x10943e0: sw    v0, 4(v1)
+// 0x01094a00: 0x1094a00: sll   zero, zero, 0
+// 0x01094a04: 0x1094a04: sw    v0, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010943e4: 0x10943e4: lw    v0, 8(a1)
+// 0x01094a08: 0x1094a08: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3795,8 +3795,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010943e8: 0x10943e8: sll   zero, zero, 0
-// 0x010943ec: 0x10943ec: sw    v0, 8(v1)
+// 0x01094a0c: 0x1094a0c: sll   zero, zero, 0
+// 0x01094a10: 0x1094a10: sw    v0, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3805,9 +3805,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010943f0: 0x10943f0: lw    ra, 28(sp)
-// 0x010943f4: 0x10943f4: sll   zero, zero, 0
-// 0x010943f8: 0x10943f8: jr    ra addiu sp, sp, 32
+// 0x01094a14: 0x1094a14: lw    ra, 28(sp)
+// 0x01094a18: 0x1094a18: sll   zero, zero, 0
+// 0x01094a1c: 0x1094a1c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3819,7 +3819,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_dialog_reset_offset_109449c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_reset_offset_1094ac0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -3857,15 +3857,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109449c: 0x109449c: addiu sp, sp, -24
+// 0x01094ac0: 0x1094ac0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010944a0: 0x10944a0: lui   v0, 0x80000
+// 0x01094ac4: 0x1094ac4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010944a4: 0x10944a4: sw    s0, 16(sp)
+// 0x01094ac8: 0x1094ac8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3874,21 +3874,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010944a8: 0x10944a8: lw    s0, 9644(v0)
+// 0x01094acc: 0x1094acc: lw    s0, 10108(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x010944ac: 0x10944ac: sll   zero, zero, 0
-// 0x010944b0: 0x10944b0: beq   s0, zero, 0x10944dc sw    ra, 20(sp)
+// 0x01094ad0: 0x1094ad0: sll   zero, zero, 0
+// 0x01094ad4: 0x1094ad4: beq   s0, zero, 0x1094b00 sw    ra, 20(sp)
 	ldloc 6
-	brfalse L_10944dc
+	brfalse L_1094b00
 // --- basic block ---
-// 0x010944b8: 0x10944b8: lw    a0, 24(s0)
+// 0x01094adc: 0x1094adc: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3897,14 +3897,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010944bc: 0x10944bc: sll   zero, zero, 0
-// 0x010944c0: 0x10944c0: beq   a0, zero, 0x10944dc addu  a1, zero, zero
+// 0x01094ae0: 0x1094ae0: sll   zero, zero, 0
+// 0x01094ae4: 0x1094ae4: beq   a0, zero, 0x1094b00 addu  a1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10944dc
+	brfalse L_1094b00
 // --- basic block ---
-// 0x010944c8: 0x10944c8: jal   0x1098f84 addu  a2, zero, zero
+// 0x01094aec: 0x1094aec: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3912,12 +3912,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010944d0: 0x10944d0: lw    a0, 24(s0)
+// 0x01094af4: 0x1094af4: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3926,20 +3926,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010944d4: 0x10944d4: jal   0x1098ff8 sll   zero, zero, 0
+// 0x01094af8: 0x1094af8: jal   0x1099640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-L_10944dc:
-// 0x010944dc: 0x10944dc: lw    ra, 20(sp)
-// 0x010944e0: 0x10944e0: lw    s0, 16(sp)
+L_1094b00:
+// 0x01094b00: 0x1094b00: lw    ra, 20(sp)
+// 0x01094b04: 0x1094b04: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3948,7 +3948,7 @@ L_10944dc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010944e4: 0x10944e4: jr    ra addiu sp, sp, 24
+// 0x01094b08: 0x1094b08: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3960,7 +3960,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_dialog_redraw_screen_recursive_10944ec(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_redraw_screen_recursive_1094b10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3998,12 +3998,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010944ec: 0x10944ec: addiu sp, sp, -40
+// 0x01094b10: 0x1094b10: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010944f0: 0x10944f0: sw    s0, 32(sp)
+// 0x01094b14: 0x1094b14: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4012,7 +4012,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010944f4: 0x10944f4: lw    s0, 20(a0)
+// 0x01094b18: 0x1094b18: lw    s0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4021,10 +4021,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010944f8: 0x10944f8: lui   v0, 0x10000
+// 0x01094b1c: 0x1094b1c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010944fc: 0x10944fc: lw    v1, 48(s0)
+// 0x01094b20: 0x1094b20: lw    v1, 48(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4033,81 +4033,81 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094500: 0x1094500: sll   zero, zero, 0
-// 0x01094504: 0x1094504: and   v0, v1, v0
+// 0x01094b24: 0x1094b24: sll   zero, zero, 0
+// 0x01094b28: 0x1094b28: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01094508: 0x1094508: beq   v0, zero, 0x1094528 sw    ra, 36(sp)
+// 0x01094b2c: 0x1094b2c: beq   v0, zero, 0x1094b4c sw    ra, 36(sp)
 	ldloc 5
-	brfalse L_1094528
+	brfalse L_1094b4c
 // --- basic block ---
-// 0x01094510: 0x1094510: lw    a0, 0(a0)
+// 0x01094b34: 0x1094b34: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01094514: 0x1094514: sll   zero, zero, 0
-// 0x01094518: 0x1094518: beq   a0, zero, 0x109452c lui   v0, 0xf0000
+// 0x01094b38: 0x1094b38: sll   zero, zero, 0
+// 0x01094b3c: 0x1094b3c: beq   a0, zero, 0x1094b50 lui   v0, 0xf0000
 	ldloc.1
 	ldc.i4 983040
 	stloc 5
-	brfalse L_109452c
+	brfalse L_1094b50
 // --- basic block ---
-// 0x01094520: 0x1094520: jal   0x10944ec sll   zero, zero, 0
+// 0x01094b44: 0x1094b44: jal   0x1094b10 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_redraw_screen_recursive_10944ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_redraw_screen_recursive_1094b10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1094528:
-// 0x01094528: 0x1094528: lui   v0, 0xf0000
+L_1094b4c:
+// 0x01094b4c: 0x1094b4c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-L_109452c:
-// 0x0109452c: 0x109452c: lw    v1, -30068(v0)
+L_1094b50:
+// 0x01094b50: 0x1094b50: lw    v1, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094530: 0x1094530: lui   v0, 0xf0000
+// 0x01094b54: 0x1094b54: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01094534: 0x1094534: lw    v0, -30072(v0)
+// 0x01094b58: 0x1094b58: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094538: 0x1094538: addiu v1, v1, -1
+// 0x01094b5c: 0x1094b5c: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0109453c: 0x109453c: addiu v0, v0, -1
+// 0x01094b60: 0x1094b60: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01094540: 0x1094540: addu  a0, s0, zero
+// 0x01094b64: 0x1094b64: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01094544: 0x1094544: sw    v1, 24(sp)
+// 0x01094b68: 0x1094b68: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4116,7 +4116,7 @@ L_109452c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01094548: 0x1094548: sw    v0, 28(sp)
+// 0x01094b6c: 0x1094b6c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4125,7 +4125,7 @@ L_109452c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109454c: 0x109454c: sw    zero, 16(sp)
+// 0x01094b70: 0x1094b70: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4134,7 +4134,7 @@ L_109452c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01094550: 0x1094550: jal   0x1098ff8 sw    zero, 20(sp)
+// 0x01094b74: 0x1094b74: jal   0x1099640 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4148,20 +4148,20 @@ L_109452c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094558: 0x1094558: addu  a0, s0, zero
+// 0x01094b7c: 0x1094b7c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109455c: 0x109455c: addiu a1, sp, 16
+// 0x01094b80: 0x1094b80: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01094560: 0x1094560: jal   0x109adc0 addu  a2, zero, zero
+// 0x01094b84: 0x1094b84: jal   0x109b408 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4169,13 +4169,13 @@ L_109452c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_109adc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_109b408(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094568: 0x1094568: lw    ra, 36(sp)
-// 0x0109456c: 0x109456c: lw    s0, 32(sp)
+// 0x01094b8c: 0x1094b8c: lw    ra, 36(sp)
+// 0x01094b90: 0x1094b90: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4184,7 +4184,7 @@ L_109452c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094570: 0x1094570: jr    ra addiu sp, sp, 40
+// 0x01094b94: 0x1094b94: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4196,7 +4196,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_invalidate_tab_order_by_name_10945a4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_invalidate_tab_order_by_name_1094bc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4231,28 +4231,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010945a4: 0x10945a4: addiu sp, sp, -32
+// 0x01094bc8: 0x1094bc8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010945a8: 0x10945a8: sw    ra, 28(sp)
-// 0x010945ac: 0x10945ac: jal   0x1094118 sll   zero, zero, 0
+// 0x01094bcc: 0x1094bcc: sw    ra, 28(sp)
+// 0x01094bd0: 0x1094bd0: jal   0x109473c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_1094118(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_109473c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010945b4: 0x10945b4: beq   v0, zero, 0x10945e0 sll   zero, zero, 0
+// 0x01094bd8: 0x1094bd8: beq   v0, zero, 0x1094c04 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10945e0
+	brfalse L_1094c04
 // --- basic block ---
-// 0x010945bc: 0x10945bc: lw    a0, 20(v0)
+// 0x01094be0: 0x1094be0: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4261,7 +4261,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010945c0: 0x10945c0: jal   0x109f844 sw    v0, 16(sp)
+// 0x01094be4: 0x1094be4: jal   0x109fe8c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4275,12 +4275,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_reset_tab_order_109f844(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_reset_tab_order_109fe8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010945c8: 0x10945c8: lw    v0, 16(sp)
+// 0x01094bec: 0x1094bec: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4289,8 +4289,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010945cc: 0x10945cc: sll   zero, zero, 0
-// 0x010945d0: 0x10945d0: sw    zero, 32(v0)
+// 0x01094bf0: 0x1094bf0: sll   zero, zero, 0
+// 0x01094bf4: 0x1094bf4: sw    zero, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4299,7 +4299,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010945d4: 0x10945d4: sw    zero, 36(v0)
+// 0x01094bf8: 0x1094bf8: sw    zero, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4308,7 +4308,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010945d8: 0x10945d8: sw    zero, 44(v0)
+// 0x01094bfc: 0x1094bfc: sw    zero, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4317,7 +4317,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010945dc: 0x10945dc: sw    zero, 28(v0)
+// 0x01094c00: 0x1094c00: sw    zero, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4326,10 +4326,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10945e0:
-// 0x010945e0: 0x10945e0: lw    ra, 28(sp)
-// 0x010945e4: 0x10945e4: sll   zero, zero, 0
-// 0x010945e8: 0x10945e8: jr    ra addiu sp, sp, 32
+L_1094c04:
+// 0x01094c04: 0x1094c04: lw    ra, 28(sp)
+// 0x01094c08: 0x1094c08: sll   zero, zero, 0
+// 0x01094c0c: 0x1094c0c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4341,7 +4341,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_invalidate_tab_order_10945f0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_invalidate_tab_order_1094c14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -4379,15 +4379,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010945f0: 0x10945f0: addiu sp, sp, -24
+// 0x01094c14: 0x1094c14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010945f4: 0x10945f4: lui   v0, 0x80000
+// 0x01094c18: 0x1094c18: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010945f8: 0x10945f8: sw    s0, 16(sp)
+// 0x01094c1c: 0x1094c1c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4396,21 +4396,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010945fc: 0x10945fc: lw    s0, 9644(v0)
+// 0x01094c20: 0x1094c20: lw    s0, 10108(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x01094600: 0x1094600: sll   zero, zero, 0
-// 0x01094604: 0x1094604: beq   s0, zero, 0x1094628 sw    ra, 20(sp)
+// 0x01094c24: 0x1094c24: sll   zero, zero, 0
+// 0x01094c28: 0x1094c28: beq   s0, zero, 0x1094c4c sw    ra, 20(sp)
 	ldloc 6
-	brfalse L_1094628
+	brfalse L_1094c4c
 // --- basic block ---
-// 0x0109460c: 0x109460c: lw    a0, 20(s0)
+// 0x01094c30: 0x1094c30: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4419,18 +4419,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094610: 0x1094610: jal   0x109f844 sll   zero, zero, 0
+// 0x01094c34: 0x1094c34: jal   0x109fe8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_reset_tab_order_109f844(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_reset_tab_order_109fe8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01094618: 0x1094618: sw    zero, 32(s0)
+// 0x01094c3c: 0x1094c3c: sw    zero, 32(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4439,7 +4439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109461c: 0x109461c: sw    zero, 36(s0)
+// 0x01094c40: 0x1094c40: sw    zero, 36(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4448,7 +4448,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01094620: 0x1094620: sw    zero, 44(s0)
+// 0x01094c44: 0x1094c44: sw    zero, 44(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4457,7 +4457,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01094624: 0x1094624: sw    zero, 28(s0)
+// 0x01094c48: 0x1094c48: sw    zero, 28(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4466,9 +4466,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1094628:
-// 0x01094628: 0x1094628: lw    ra, 20(sp)
-// 0x0109462c: 0x109462c: lw    s0, 16(sp)
+L_1094c4c:
+// 0x01094c4c: 0x1094c4c: lw    ra, 20(sp)
+// 0x01094c50: 0x1094c50: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4477,7 +4477,7 @@ L_1094628:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01094630: 0x1094630: jr    ra addiu sp, sp, 24
+// 0x01094c54: 0x1094c54: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4489,7 +4489,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_dialog_context_1094638(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_context_1094c5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4524,48 +4524,48 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094638: 0x1094638: lui   v0, 0x80000
+// 0x01094c5c: 0x1094c5c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109463c: 0x109463c: lw    v0, 9644(v0)
+// 0x01094c60: 0x1094c60: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094640: 0x1094640: addiu sp, sp, -24
+// 0x01094c64: 0x1094c64: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094644: 0x1094644: bne   v0, zero, 0x1094670 sw    ra, 20(sp)
+// 0x01094c68: 0x1094c68: bne   v0, zero, 0x1094c94 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1094670
+	brtrue L_1094c94
 // --- basic block ---
-// 0x0109464c: 0x109464c: lui   a1, 0x20000
+// 0x01094c70: 0x1094c70: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01094650: 0x1094650: lui   a3, 0x20000
+// 0x01094c74: 0x1094c74: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01094654: 0x1094654: addiu a1, a1, -3148
+// 0x01094c78: 0x1094c78: addiu a1, a1, -2684
 	ldloc.2
-	ldc.i4 -3148
+	ldc.i4 -2684
 	add
 	stloc.2
-// 0x01094658: 0x1094658: addiu a3, a3, -3120
+// 0x01094c7c: 0x1094c7c: addiu a3, a3, -2656
 	ldloc 4
-	ldc.i4 -3120
+	ldc.i4 -2656
 	add
 	stloc 4
-// 0x0109465c: 0x109465c: addiu a0, zero, 4
+// 0x01094c80: 0x1094c80: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01094660: 0x1094660: jal   0x100449c addiu a2, zero, 1445
-	ldc.i4 1445
+// 0x01094c84: 0x1094c84: jal   0x100449c addiu a2, zero, 1451
+	ldc.i4 1451
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -4577,13 +4577,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01094668: 0x1094668: j	 0x109467c addu  v0, zero, zero
+// 0x01094c8c: 0x1094c8c: j	 0x1094ca0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_109467c
+	br L_1094ca0
 // --- basic block ---
-L_1094670:
-// 0x01094670: 0x1094670: lw    v0, 20(v0)
+L_1094c94:
+// 0x01094c94: 0x1094c94: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4592,8 +4592,8 @@ L_1094670:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094674: 0x1094674: sll   zero, zero, 0
-// 0x01094678: 0x1094678: lw    v0, 116(v0)
+// 0x01094c98: 0x1094c98: sll   zero, zero, 0
+// 0x01094c9c: 0x1094c9c: lw    v0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4602,10 +4602,10 @@ L_1094670:
 	add
 	ldelem.i4
 	stloc 5
-L_109467c:
-// 0x0109467c: 0x109467c: lw    ra, 20(sp)
-// 0x01094680: 0x1094680: sll   zero, zero, 0
-// 0x01094684: 0x1094684: jr    ra addiu sp, sp, 24
+L_1094ca0:
+// 0x01094ca0: 0x1094ca0: lw    ra, 20(sp)
+// 0x01094ca4: 0x1094ca4: sll   zero, zero, 0
+// 0x01094ca8: 0x1094ca8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4617,7 +4617,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_set_callback_109468c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_set_callback_1094cb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -4655,24 +4655,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109468c: 0x109468c: lui   v0, 0x80000
+// 0x01094cb0: 0x1094cb0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094690: 0x1094690: lw    v0, 9644(v0)
+// 0x01094cb4: 0x1094cb4: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094694: 0x1094694: addiu sp, sp, -24
+// 0x01094cb8: 0x1094cb8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094698: 0x1094698: sw    s0, 16(sp)
+// 0x01094cbc: 0x1094cbc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4681,34 +4681,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109469c: 0x109469c: sw    ra, 20(sp)
-// 0x010946a0: 0x10946a0: bne   v0, zero, 0x10946c4 addu  s0, a0, zero
+// 0x01094cc0: 0x1094cc0: sw    ra, 20(sp)
+// 0x01094cc4: 0x1094cc4: bne   v0, zero, 0x1094ce8 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brtrue L_10946c4
+	brtrue L_1094ce8
 // --- basic block ---
-// 0x010946a8: 0x10946a8: lui   a1, 0x20000
+// 0x01094ccc: 0x1094ccc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010946ac: 0x10946ac: lui   a3, 0x20000
+// 0x01094cd0: 0x1094cd0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010946b0: 0x10946b0: addiu a1, a1, -3148
+// 0x01094cd4: 0x1094cd4: addiu a1, a1, -2684
 	ldloc.2
-	ldc.i4 -3148
+	ldc.i4 -2684
 	add
 	stloc.2
-// 0x010946b4: 0x10946b4: addiu a3, a3, -3060
+// 0x01094cd8: 0x1094cd8: addiu a3, a3, -2596
 	ldloc 4
-	ldc.i4 -3060
+	ldc.i4 -2596
 	add
 	stloc 4
-// 0x010946b8: 0x10946b8: addiu a0, zero, 5
+// 0x01094cdc: 0x1094cdc: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010946bc: 0x10946bc: jal   0x100449c addiu a2, zero, 1435
-	ldc.i4 1435
+// 0x01094ce0: 0x1094ce0: jal   0x100449c addiu a2, zero, 1441
+	ldc.i4 1441
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -4720,21 +4720,21 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_10946c4:
-// 0x010946c4: 0x10946c4: lui   v0, 0x80000
+L_1094ce8:
+// 0x01094ce8: 0x1094ce8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010946c8: 0x10946c8: lw    v0, 9644(v0)
+// 0x01094cec: 0x1094cec: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x010946cc: 0x10946cc: lw    ra, 20(sp)
-// 0x010946d0: 0x10946d0: sw    s0, 16(v0)
+// 0x01094cf0: 0x1094cf0: lw    ra, 20(sp)
+// 0x01094cf4: 0x1094cf4: sw    s0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4743,7 +4743,7 @@ L_10946c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010946d4: 0x10946d4: lw    s0, 16(sp)
+// 0x01094cf8: 0x1094cf8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4752,7 +4752,7 @@ L_10946c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010946d8: 0x10946d8: jr    ra addiu sp, sp, 24
+// 0x01094cfc: 0x1094cfc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4764,7 +4764,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4799,37 +4799,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094734: 0x1094734: lui   v0, 0x80000
+// 0x01094d58: 0x1094d58: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094738: 0x1094738: lw    v1, 9644(v0)
+// 0x01094d5c: 0x1094d5c: lw    v1, 10108(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109473c: 0x109473c: addiu sp, sp, -24
+// 0x01094d60: 0x1094d60: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094740: 0x1094740: sw    ra, 20(sp)
-// 0x01094744: 0x1094744: addu  a3, a0, zero
+// 0x01094d64: 0x1094d64: sw    ra, 20(sp)
+// 0x01094d68: 0x1094d68: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01094748: 0x1094748: addu  a2, a1, zero
+// 0x01094d6c: 0x1094d6c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0109474c: 0x109474c: beq   v1, zero, 0x1094760 addu  v0, zero, zero
+// 0x01094d70: 0x1094d70: beq   v1, zero, 0x1094d84 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1094760
+	brfalse L_1094d84
 // --- basic block ---
-// 0x01094754: 0x1094754: lw    a0, 20(v1)
+// 0x01094d78: 0x1094d78: lw    a0, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4838,7 +4838,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094758: 0x1094758: jal   0x109b38c addu  a1, a3, zero
+// 0x01094d7c: 0x1094d7c: jal   0x109b9d4 addu  a1, a3, zero
 	ldloc 4
 	stloc.2
 	ldloc.0
@@ -4846,15 +4846,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_data_109b38c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_data_109b9d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1094760:
-// 0x01094760: 0x1094760: lw    ra, 20(sp)
-// 0x01094764: 0x1094764: sll   zero, zero, 0
-// 0x01094768: 0x1094768: jr    ra addiu sp, sp, 24
+L_1094d84:
+// 0x01094d84: 0x1094d84: lw    ra, 20(sp)
+// 0x01094d88: 0x1094d88: sll   zero, zero, 0
+// 0x01094d8c: 0x1094d8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4866,7 +4866,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4901,37 +4901,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094770: 0x1094770: lui   v0, 0x80000
+// 0x01094d94: 0x1094d94: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094774: 0x1094774: lw    v1, 9644(v0)
+// 0x01094d98: 0x1094d98: lw    v1, 10108(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x01094778: 0x1094778: addiu sp, sp, -24
+// 0x01094d9c: 0x1094d9c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109477c: 0x109477c: sw    ra, 20(sp)
-// 0x01094780: 0x1094780: addu  a3, a0, zero
+// 0x01094da0: 0x1094da0: sw    ra, 20(sp)
+// 0x01094da4: 0x1094da4: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01094784: 0x1094784: addu  a2, a1, zero
+// 0x01094da8: 0x1094da8: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01094788: 0x1094788: beq   v1, zero, 0x109479c addu  v0, zero, zero
+// 0x01094dac: 0x1094dac: beq   v1, zero, 0x1094dc0 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109479c
+	brfalse L_1094dc0
 // --- basic block ---
-// 0x01094790: 0x1094790: lw    a0, 20(v1)
+// 0x01094db4: 0x1094db4: lw    a0, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4940,7 +4940,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094794: 0x1094794: jal   0x109b3e0 addu  a1, a3, zero
+// 0x01094db8: 0x1094db8: jal   0x109ba28 addu  a1, a3, zero
 	ldloc 4
 	stloc.2
 	ldloc.0
@@ -4948,15 +4948,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_109479c:
-// 0x0109479c: 0x109479c: lw    ra, 20(sp)
-// 0x010947a0: 0x10947a0: sll   zero, zero, 0
-// 0x010947a4: 0x10947a4: jr    ra addiu sp, sp, 24
+L_1094dc0:
+// 0x01094dc0: 0x1094dc0: lw    ra, 20(sp)
+// 0x01094dc4: 0x1094dc4: sll   zero, zero, 0
+// 0x01094dc8: 0x1094dc8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4968,7 +4968,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5003,22 +5003,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010947ac: 0x10947ac: lui   v0, 0x80000
+// 0x01094dd0: 0x1094dd0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010947b0: 0x10947b0: lw    v0, 9644(v0)
+// 0x01094dd4: 0x1094dd4: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x010947b4: 0x10947b4: addu  a1, a0, zero
+// 0x01094dd8: 0x1094dd8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010947b8: 0x10947b8: lw    a0, 20(v0)
+// 0x01094ddc: 0x1094ddc: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5027,26 +5027,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010947bc: 0x10947bc: addiu sp, sp, -24
+// 0x01094de0: 0x1094de0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010947c0: 0x10947c0: sw    ra, 20(sp)
-// 0x010947c4: 0x10947c4: jal   0x109b5e8 sll   zero, zero, 0
+// 0x01094de4: 0x1094de4: sw    ra, 20(sp)
+// 0x01094de8: 0x1094de8: jal   0x109bc30 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_data_109b5e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_data_109bc30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010947cc: 0x10947cc: lw    ra, 20(sp)
-// 0x010947d0: 0x10947d0: sll   zero, zero, 0
-// 0x010947d4: 0x10947d4: jr    ra addiu sp, sp, 24
+// 0x01094df0: 0x1094df0: lw    ra, 20(sp)
+// 0x01094df4: 0x1094df4: sll   zero, zero, 0
+// 0x01094df8: 0x1094df8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5058,7 +5058,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5093,22 +5093,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010947dc: 0x10947dc: lui   v0, 0x80000
+// 0x01094e00: 0x1094e00: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010947e0: 0x10947e0: lw    v0, 9644(v0)
+// 0x01094e04: 0x1094e04: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x010947e4: 0x10947e4: addu  a1, a0, zero
+// 0x01094e08: 0x1094e08: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010947e8: 0x10947e8: lw    a0, 20(v0)
+// 0x01094e0c: 0x1094e0c: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5117,26 +5117,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010947ec: 0x10947ec: addiu sp, sp, -24
+// 0x01094e10: 0x1094e10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010947f0: 0x10947f0: sw    ra, 20(sp)
-// 0x010947f4: 0x10947f4: jal   0x109b634 sll   zero, zero, 0
+// 0x01094e14: 0x1094e14: sw    ra, 20(sp)
+// 0x01094e18: 0x1094e18: jal   0x109bc7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010947fc: 0x10947fc: lw    ra, 20(sp)
-// 0x01094800: 0x1094800: sll   zero, zero, 0
-// 0x01094804: 0x1094804: jr    ra addiu sp, sp, 24
+// 0x01094e20: 0x1094e20: lw    ra, 20(sp)
+// 0x01094e24: 0x1094e24: sll   zero, zero, 0
+// 0x01094e28: 0x1094e28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5148,7 +5148,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_enable_callback_109480c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_enable_callback_1094e30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5183,32 +5183,32 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109480c: 0x109480c: lui   a0, 0x1090000
+// 0x01094e30: 0x1094e30: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01094810: 0x1094810: addiu sp, sp, -24
+// 0x01094e34: 0x1094e34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094814: 0x1094814: addiu v1, zero, 1
+// 0x01094e38: 0x1094e38: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01094818: 0x1094818: lui   v0, 0x80000
+// 0x01094e3c: 0x1094e3c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109481c: 0x109481c: addiu a0, a0, 18444
+// 0x01094e40: 0x1094e40: addiu a0, a0, 20016
 	ldloc.1
-	ldc.i4 18444
+	ldc.i4 20016
 	add
 	stloc.1
-// 0x01094820: 0x1094820: sw    ra, 20(sp)
-// 0x01094824: 0x1094824: jal   0x104fd00 sw    v1, 9656(v0)
+// 0x01094e44: 0x1094e44: sw    ra, 20(sp)
+// 0x01094e48: 0x1094e48: jal   0x104fd10 sw    v1, 10120(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2414
+	ldc.i4 2530
 	add
 	ldloc 6
 	stelem.i4
@@ -5217,14 +5217,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109482c: 0x109482c: lw    ra, 20(sp)
-// 0x01094830: 0x1094830: sll   zero, zero, 0
-// 0x01094834: 0x1094834: jr    ra addiu sp, sp, 24
+// 0x01094e50: 0x1094e50: lw    ra, 20(sp)
+// 0x01094e54: 0x1094e54: sll   zero, zero, 0
+// 0x01094e58: 0x1094e58: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5236,7 +5236,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5271,28 +5271,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109483c: 0x109483c: lui   v0, 0x80000
+// 0x01094e60: 0x1094e60: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094840: 0x1094840: lw    v0, 9644(v0)
+// 0x01094e64: 0x1094e64: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094844: 0x1094844: addiu sp, sp, -24
+// 0x01094e68: 0x1094e68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094848: 0x1094848: beq   v0, zero, 0x109485c sw    ra, 20(sp)
+// 0x01094e6c: 0x1094e6c: beq   v0, zero, 0x1094e80 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_109485c
+	brfalse L_1094e80
 // --- basic block ---
-// 0x01094850: 0x1094850: lw    a1, 8(v0)
+// 0x01094e74: 0x1094e74: lw    a1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5301,20 +5301,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01094854: 0x1094854: j	 0x1094864 sll   zero, zero, 0
-	br L_1094864
+// 0x01094e78: 0x1094e78: j	 0x1094e88 sll   zero, zero, 0
+	br L_1094e88
 // --- basic block ---
-L_109485c:
-// 0x0109485c: 0x109485c: lui   a1, 0x10000
+L_1094e80:
+// 0x01094e80: 0x1094e80: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01094860: 0x1094860: addiu a1, a1, 18500
+// 0x01094e84: 0x1094e84: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-L_1094864:
-// 0x01094864: 0x1094864: jal   0x109c5ec addu  a0, zero, zero
+L_1094e88:
+// 0x01094e88: 0x1094e88: jal   0x109cc34 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5322,25 +5322,25 @@ L_1094864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109486c: 0x109486c: jal   0x1021900 sll   zero, zero, 0
+// 0x01094e90: 0x1094e90: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01094874: 0x1094874: lw    ra, 20(sp)
-// 0x01094878: 0x1094878: sll   zero, zero, 0
-// 0x0109487c: 0x109487c: jr    ra addiu sp, sp, 24
+// 0x01094e98: 0x1094e98: lw    ra, 20(sp)
+// 0x01094e9c: 0x1094e9c: sll   zero, zero, 0
+// 0x01094ea0: 0x1094ea0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5352,29 +5352,26 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_hide_cont_1094ea8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
 // local  0 is register sp
-// local 12 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5385,256 +5382,67 @@ __CIBYL_function_return:
 	stloc 4
 	ldc.i4.s 0
 	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094884: 0x1094884: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x01094888: 0x1094888: lui   v0, 0x80000
+// 0x01094ea8: 0x1094ea8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109488c: 0x109488c: sw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 8
-	stelem.i4
-// 0x01094890: 0x1094890: lw    s0, 9644(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 2411
-	add
-	ldelem.i4
-	stloc 8
-// 0x01094894: 0x1094894: sw    s3, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 11
-	stelem.i4
-// 0x01094898: 0x1094898: sw    s2, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 10
-	stelem.i4
-// 0x0109489c: 0x109489c: sw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x010948a0: 0x10948a0: sw    ra, 36(sp)
-// 0x010948a4: 0x10948a4: addu  s3, a0, zero
-	ldloc.1
-	stloc 11
-// 0x010948a8: 0x10948a8: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x010948ac: 0x10948ac: bne   s0, zero, 0x10948d0 addu  s1, zero, zero
-	ldloc 8
-	ldc.i4.s 0
-	stloc 9
-	brtrue L_10948d0
-// --- basic block ---
-// 0x010948b4: 0x10948b4: j	 0x1094a78 sll   zero, zero, 0
-	br L_1094a78
-// --- basic block ---
-L_10948bc:
-// 0x010948bc: 0x10948bc: lw    v0, 4(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 5
-// 0x010948c0: 0x10948c0: sll   zero, zero, 0
-// 0x010948c4: 0x10948c4: beq   v0, zero, 0x1094a78 addu  s1, s0, zero
-	ldloc 5
-	ldloc 8
-	stloc 9
-	brfalse L_1094a78
-// --- basic block ---
-// 0x010948cc: 0x10948cc: addu  s0, v0, zero
+// 0x01094eac: 0x1094eac: lw    v0, 10108(v0)
+	ldloc 7
 	ldloc 5
-	stloc 8
-L_10948d0:
-// 0x010948d0: 0x10948d0: lw    a0, 8(s0)
-	ldloc 6
-	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4 2527
 	add
 	ldelem.i4
-	stloc.1
-// 0x010948d4: 0x10948d4: jal   0x1001b14 addu  a1, s3, zero
-	ldloc 11
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
-// --- basic block ---
-// 0x010948dc: 0x10948dc: bne   v0, zero, 0x10948bc sll   zero, zero, 0
-	ldloc 5
-	brtrue L_10948bc
-// --- basic block ---
-// 0x010948e4: 0x10948e4: j	 0x1094a60 sll   zero, zero, 0
-	br L_1094a60
-// --- basic block ---
-L_10948ec:
-// 0x010948ec: 0x10948ec: lw    a1, 12(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc.2
-// 0x010948f0: 0x10948f0: jalr  v0 addu  a0, s2, zero
-	ldloc 5
-	ldloc 10
-	stloc.1
+// 0x01094eb0: 0x1094eb0: addiu sp, sp, -24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_10948f8:
-// 0x010948f8: 0x10948f8: bne   s1, zero, 0x109491c lui   v0, 0x80000
-	ldloc 9
-	ldc.i4 524288
-	stloc 5
-	brtrue L_109491c
-// --- basic block ---
-// 0x01094900: 0x1094900: lw    v1, 9644(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 2411
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 7
-// 0x01094904: 0x1094904: sll   zero, zero, 0
-// 0x01094908: 0x1094908: beq   v1, zero, 0x109492c sll   zero, zero, 0
-	ldloc 7
-	brfalse L_109492c
-// --- basic block ---
-// 0x01094910: 0x1094910: lw    v1, 4(v1)
-	ldloc 6
+	stloc.0
+// 0x01094eb4: 0x1094eb4: sw    s0, 16(sp)
 	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 7
-// 0x01094914: 0x1094914: j	 0x109492c sw    v1, 9644(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 2411
+	ldc.i4.4
 	add
-	ldloc 7
-	stelem.i4
-	br L_109492c
-// --- basic block ---
-L_109491c:
-// 0x0109491c: 0x109491c: lw    v0, 4(s0)
-	ldloc 6
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 5
-// 0x01094920: 0x1094920: sll   zero, zero, 0
-// 0x01094924: 0x1094924: sw    v0, 4(s1)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldloc 5
 	stelem.i4
-// 0x01094928: 0x1094928: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_109492c:
-// 0x0109492c: 0x109492c: lw    v0, 9644(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 2411
-	add
-	ldelem.i4
-	stloc 5
-// 0x01094930: 0x1094930: sll   zero, zero, 0
-// 0x01094934: 0x1094934: beq   v0, zero, 0x1094958 lui   a1, 0x1090000
+// 0x01094eb8: 0x1094eb8: sw    ra, 20(sp)
+// 0x01094ebc: 0x1094ebc: beq   v0, zero, 0x1094ee4 addu  s0, a0, zero
 	ldloc 5
+	ldloc.1
+	stloc 8
+	brfalse L_1094ee4
+// --- basic block ---
+// 0x01094ec4: 0x1094ec4: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-	brfalse L_1094958
-// --- basic block ---
-// 0x0109493c: 0x109493c: lui   v0, 0x80000
+// 0x01094ec8: 0x1094ec8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094940: 0x1094940: addiu a1, a1, 18444
+// 0x01094ecc: 0x1094ecc: addiu a1, a1, 20016
 	ldloc.2
-	ldc.i4 18444
+	ldc.i4 20016
 	add
 	stloc.2
-// 0x01094944: 0x1094944: addiu a0, zero, 350
+// 0x01094ed0: 0x1094ed0: addiu a0, zero, 350
 	ldc.i4 350
 	stloc.1
-// 0x01094948: 0x1094948: jal   0x104fe98 sw    zero, 9656(v0)
-	ldloc 6
+// 0x01094ed4: 0x1094ed4: jal   0x104fea8 sw    zero, 10120(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2414
+	ldc.i4 2530
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5643,21 +5451,21 @@ L_109492c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01094950: 0x1094950: j	 0x10949b8 sll   zero, zero, 0
-	br L_10949b8
+// 0x01094edc: 0x1094edc: j	 0x1094f44 sll   zero, zero, 0
+	br L_1094f44
 // --- basic block ---
-L_1094958:
-// 0x01094958: 0x1094958: lui   a0, 0x1090000
+L_1094ee4:
+// 0x01094ee4: 0x1094ee4: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109495c: 0x109495c: jal   0x104b7f8 addiu a0, a0, 21540
+// 0x01094ee8: 0x1094ee8: jal   0x104b808 addiu a0, a0, 23148
 	ldloc.1
-	ldc.i4 21540
+	ldc.i4 23148
 	add
 	stloc.1
 	ldloc.0
@@ -5665,17 +5473,17 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_pressed_104b7f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_pressed_104b808(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01094964: 0x1094964: lui   a0, 0x1090000
+// 0x01094ef0: 0x1094ef0: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01094968: 0x1094968: jal   0x104b7d4 addiu a0, a0, 20232
+// 0x01094ef4: 0x1094ef4: jal   0x104b7e4 addiu a0, a0, 21840
 	ldloc.1
-	ldc.i4 20232
+	ldc.i4 21840
 	add
 	stloc.1
 	ldloc.0
@@ -5683,17 +5491,17 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_released_104b7d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_released_104b7e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01094970: 0x1094970: lui   a0, 0x1090000
+// 0x01094efc: 0x1094efc: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01094974: 0x1094974: jal   0x104b864 addiu a0, a0, 19960
+// 0x01094f00: 0x1094f00: jal   0x104b874 addiu a0, a0, 21568
 	ldloc.1
-	ldc.i4 19960
+	ldc.i4 21568
 	add
 	stloc.1
 	ldloc.0
@@ -5701,17 +5509,17 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_short_click_104b864(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_short_click_104b874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109497c: 0x109497c: lui   a0, 0x1090000
+// 0x01094f08: 0x1094f08: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01094980: 0x1094980: jal   0x104b840 addiu a0, a0, 19904
+// 0x01094f0c: 0x1094f0c: jal   0x104b850 addiu a0, a0, 21512
 	ldloc.1
-	ldc.i4 19904
+	ldc.i4 21512
 	add
 	stloc.1
 	ldloc.0
@@ -5719,17 +5527,17 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_long_click_104b840(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_long_click_104b850(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01094988: 0x1094988: lui   a0, 0x1090000
+// 0x01094f14: 0x1094f14: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109498c: 0x109498c: jal   0x104b7b0 addiu a0, a0, 21320
+// 0x01094f18: 0x1094f18: jal   0x104b7c0 addiu a0, a0, 22928
 	ldloc.1
-	ldc.i4 21320
+	ldc.i4 22928
 	add
 	stloc.1
 	ldloc.0
@@ -5737,17 +5545,17 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_drag_start_104b7b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_drag_start_104b7c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01094994: 0x1094994: lui   a0, 0x1090000
+// 0x01094f20: 0x1094f20: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01094998: 0x1094998: jal   0x104b768 addiu a0, a0, 20600
+// 0x01094f24: 0x1094f24: jal   0x104b778 addiu a0, a0, 22208
 	ldloc.1
-	ldc.i4 20600
+	ldc.i4 22208
 	add
 	stloc.1
 	ldloc.0
@@ -5755,17 +5563,17 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_drag_end_104b768(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_drag_end_104b778(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010949a0: 0x10949a0: lui   a0, 0x1090000
+// 0x01094f2c: 0x1094f2c: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x010949a4: 0x10949a4: jal   0x104b78c addiu a0, a0, 19484
+// 0x01094f30: 0x1094f30: jal   0x104b79c addiu a0, a0, 21092
 	ldloc.1
-	ldc.i4 19484
+	ldc.i4 21092
 	add
 	stloc.1
 	ldloc.0
@@ -5773,17 +5581,17 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_drag_motion_104b78c(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_drag_motion_104b79c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010949ac: 0x10949ac: lui   a0, 0x1090000
+// 0x01094f38: 0x1094f38: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x010949b0: 0x10949b0: jal   0x1038aa0 addiu a0, a0, 25284
+// 0x01094f3c: 0x1094f3c: jal   0x1038ab0 addiu a0, a0, 26892
 	ldloc.1
-	ldc.i4 25284
+	ldc.i4 26892
 	add
 	stloc.1
 	ldloc.0
@@ -5791,14 +5599,14 @@ L_1094958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_unregister_from_event__key_pressed_1038aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_unregister_from_event__key_pressed_1038ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_10949b8:
-// 0x010949b8: 0x10949b8: lw    a0, 8(s0)
-	ldloc 6
+L_1094f44:
+// 0x01094f44: 0x1094f44: lw    a0, 8(s0)
+	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
@@ -5806,28 +5614,28 @@ L_10949b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010949bc: 0x10949bc: jal   0x10513dc sll   zero, zero, 0
+// 0x01094f48: 0x1094f48: jal   0x10513ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_menu_button_unregister_10513dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_menu_button_unregister_10513ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010949c4: 0x10949c4: jal   0x104fb08 addu  a0, zero, zero
+// 0x01094f50: 0x1094f50: jal   0x104fb18 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb08(int32)
+	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb18(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010949cc: 0x10949cc: lw    a0, 8(s0)
-	ldloc 6
+// 0x01094f58: 0x1094f58: lw    a0, 8(s0)
+	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
@@ -5835,19 +5643,19 @@ L_10949b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010949d0: 0x10949d0: jal   0x103fdbc sll   zero, zero, 0
+// 0x01094f5c: 0x1094f5c: jal   0x103fdcc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010949d8: 0x10949d8: lw    a0, 8(s0)
-	ldloc 6
+// 0x01094f64: 0x1094f64: lw    a0, 8(s0)
+	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
@@ -5855,53 +5663,53 @@ L_10949b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010949dc: 0x10949dc: jal   0x103fe04 sll   zero, zero, 0
+// 0x01094f68: 0x1094f68: jal   0x103fe14 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_left_soft_key_103fe04(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_left_soft_key_103fe14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010949e4: 0x10949e4: lui   v0, 0x80000
+// 0x01094f70: 0x1094f70: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010949e8: 0x10949e8: lw    v0, 9652(v0)
-	ldloc 6
+// 0x01094f74: 0x1094f74: lw    v0, 10116(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2413
+	ldc.i4 2529
 	add
 	ldelem.i4
 	stloc 5
-// 0x010949ec: 0x10949ec: sll   zero, zero, 0
-// 0x010949f0: 0x10949f0: beq   v0, zero, 0x1094a40 lui   v0, 0x80000
+// 0x01094f78: 0x1094f78: sll   zero, zero, 0
+// 0x01094f7c: 0x1094f7c: beq   v0, zero, 0x1094fcc lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1094a40
+	brfalse L_1094fcc
 // --- basic block ---
-// 0x010949f8: 0x10949f8: lw    v0, 9644(v0)
-	ldloc 6
+// 0x01094f84: 0x1094f84: lw    v0, 10108(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x010949fc: 0x10949fc: j	 0x1094a38 lui   v1, 0x30000
+// 0x01094f88: 0x1094f88: j	 0x1094fc4 lui   v1, 0x30000
 	ldc.i4 196608
-	stloc 7
-	br L_1094a38
+	stloc 6
+	br L_1094fc4
 // --- basic block ---
-L_1094a04:
-// 0x01094a04: 0x1094a04: lw    a0, 20(v0)
-	ldloc 6
+L_1094f90:
+// 0x01094f90: 0x1094f90: lw    a0, 20(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
@@ -5909,9 +5717,9 @@ L_1094a04:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094a08: 0x1094a08: sll   zero, zero, 0
-// 0x01094a0c: 0x1094a0c: lw    a0, 48(a0)
-	ldloc 6
+// 0x01094f94: 0x1094f94: sll   zero, zero, 0
+// 0x01094f98: 0x1094f98: lw    a0, 48(a0)
+	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
@@ -5919,33 +5727,33 @@ L_1094a04:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094a10: 0x1094a10: sll   zero, zero, 0
-// 0x01094a14: 0x1094a14: and   a0, a0, v1
+// 0x01094f9c: 0x1094f9c: sll   zero, zero, 0
+// 0x01094fa0: 0x1094fa0: and   a0, a0, v1
 	ldloc.1
-	ldloc 7
+	ldloc 6
 	and
 	stloc.1
-// 0x01094a18: 0x1094a18: bne   a0, zero, 0x1094a30 sll   zero, zero, 0
+// 0x01094fa4: 0x1094fa4: bne   a0, zero, 0x1094fbc sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1094a30
+	brtrue L_1094fbc
 // --- basic block ---
-// 0x01094a20: 0x1094a20: jal   0x109483c sll   zero, zero, 0
+// 0x01094fac: 0x1094fac: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01094a28: 0x1094a28: j	 0x1094a78 sll   zero, zero, 0
-	br L_1094a78
+// 0x01094fb4: 0x1094fb4: j	 0x1094fe4 sll   zero, zero, 0
+	br L_1094fe4
 // --- basic block ---
-L_1094a30:
-// 0x01094a30: 0x1094a30: lw    v0, 4(v0)
-	ldloc 6
+L_1094fbc:
+// 0x01094fbc: 0x1094fbc: lw    v0, 4(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
@@ -5953,14 +5761,14 @@ L_1094a30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094a34: 0x1094a34: sll   zero, zero, 0
-L_1094a38:
-// 0x01094a38: 0x1094a38: bne   v0, zero, 0x1094a04 sll   zero, zero, 0
+// 0x01094fc0: 0x1094fc0: sll   zero, zero, 0
+L_1094fc4:
+// 0x01094fc4: 0x1094fc4: bne   v0, zero, 0x1094f90 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1094a04
+	brtrue L_1094f90
 // --- basic block ---
-L_1094a40:
-// 0x01094a40: 0x1094a40: jal   0x10516e0 addiu a0, zero, 2
+L_1094fcc:
+// 0x01094fcc: 0x1094fcc: jal   0x10516f0 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -5968,23 +5776,23 @@ L_1094a40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01094a48: 0x1094a48: lui   v0, 0x80000
+// 0x01094fd4: 0x1094fd4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094a4c: 0x1094a4c: addiu a0, zero, 1
+// 0x01094fd8: 0x1094fd8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01094a50: 0x1094a50: jal   0x102e3a4 sw    zero, 9652(v0)
-	ldloc 6
+// 0x01094fdc: 0x1094fdc: jal   0x102e3b4 sw    zero, 10116(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2413
+	ldc.i4 2529
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5993,36 +5801,319 @@ L_1094a40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_screen_refresh_102e3a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_screen_refresh_102e3b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_1094fe4:
+// 0x01094fe4: 0x1094fe4: lw    ra, 20(sp)
+// 0x01094fe8: 0x1094fe8: lw    s0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 8
+// 0x01094fec: 0x1094fec: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
+
+// local  6 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01094ff4: 0x1094ff4: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x01094ff8: 0x1094ff8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x01094ffc: 0x1094ffc: sw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
+// 0x01095000: 0x1095000: lw    s0, 10108(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 2527
+	add
+	ldelem.i4
+	stloc 7
+// 0x01095004: 0x1095004: sw    s3, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 11
+	stelem.i4
+// 0x01095008: 0x1095008: sw    s2, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 10
+	stelem.i4
+// 0x0109500c: 0x109500c: sw    s1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 9
+	stelem.i4
+// 0x01095010: 0x1095010: sw    ra, 36(sp)
+// 0x01095014: 0x1095014: addu  s3, a0, zero
+	ldloc.1
+	stloc 11
+// 0x01095018: 0x1095018: addu  s2, a1, zero
+	ldloc.2
+	stloc 10
+// 0x0109501c: 0x109501c: bne   s0, zero, 0x1095040 addu  s1, zero, zero
+	ldloc 7
+	ldc.i4.s 0
+	stloc 9
+	brtrue L_1095040
+// --- basic block ---
+// 0x01095024: 0x1095024: j	 0x10950c0 sll   zero, zero, 0
+	br L_10950c0
+// --- basic block ---
+L_109502c:
+// 0x0109502c: 0x109502c: lw    v0, 4(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 6
+// 0x01095030: 0x1095030: sll   zero, zero, 0
+// 0x01095034: 0x1095034: beq   v0, zero, 0x10950c0 addu  s1, s0, zero
+	ldloc 6
+	ldloc 7
+	stloc 9
+	brfalse L_10950c0
 // --- basic block ---
-// 0x01094a58: 0x1094a58: j	 0x1094a78 sll   zero, zero, 0
-	br L_1094a78
+// 0x0109503c: 0x109503c: addu  s0, v0, zero
+	ldloc 6
+	stloc 7
+L_1095040:
+// 0x01095040: 0x1095040: lw    a0, 8(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldelem.i4
+	stloc.1
+// 0x01095044: 0x1095044: jal   0x1001b14 addu  a1, s3, zero
+	ldloc 11
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 6
 // --- basic block ---
-L_1094a60:
-// 0x01094a60: 0x1094a60: lw    v0, 16(s0)
+// 0x0109504c: 0x109504c: bne   v0, zero, 0x109502c sll   zero, zero, 0
 	ldloc 6
+	brtrue L_109502c
+// --- basic block ---
+// 0x01095054: 0x1095054: j	 0x10950a8 sll   zero, zero, 0
+	br L_10950a8
+// --- basic block ---
+L_109505c:
+// 0x0109505c: 0x109505c: lw    a1, 12(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldelem.i4
+	stloc.2
+// 0x01095060: 0x1095060: jalr  v0 addu  a0, s2, zero
+	ldloc 6
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+L_1095068:
+// 0x01095068: 0x1095068: bne   s1, zero, 0x109508c lui   v0, 0x80000
+	ldloc 9
+	ldc.i4 524288
+	stloc 6
+	brtrue L_109508c
+// --- basic block ---
+// 0x01095070: 0x1095070: lw    v1, 10108(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 2527
+	add
+	ldelem.i4
+	stloc 8
+// 0x01095074: 0x1095074: sll   zero, zero, 0
+// 0x01095078: 0x1095078: beq   v1, zero, 0x1095098 sll   zero, zero, 0
+	ldloc 8
+	brfalse L_1095098
+// --- basic block ---
+// 0x01095080: 0x1095080: lw    v1, 4(v1)
+	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 5
-// 0x01094a64: 0x1094a64: sll   zero, zero, 0
-// 0x01094a68: 0x1094a68: bne   v0, zero, 0x10948ec sll   zero, zero, 0
+	stloc 8
+// 0x01095084: 0x1095084: j	 0x1095098 sw    v1, 10108(v0)
 	ldloc 5
-	brtrue L_10948ec
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 2527
+	add
+	ldloc 8
+	stelem.i4
+	br L_1095098
 // --- basic block ---
-// 0x01094a70: 0x1094a70: j	 0x10948f8 sll   zero, zero, 0
-	br L_10948f8
+L_109508c:
+// 0x0109508c: 0x109508c: lw    v0, 4(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 6
+// 0x01095090: 0x1095090: sll   zero, zero, 0
+// 0x01095094: 0x1095094: sw    v0, 4(s1)
+	ldloc 5
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 6
+	stelem.i4
+L_1095098:
+// 0x01095098: 0x1095098: jal   0x1094ea8 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_hide_cont_1094ea8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
 // --- basic block ---
-L_1094a78:
-// 0x01094a78: 0x1094a78: lw    ra, 36(sp)
-// 0x01094a7c: 0x1094a7c: lw    s3, 32(sp)
+// 0x010950a0: 0x10950a0: j	 0x10950c0 sll   zero, zero, 0
+	br L_10950c0
+// --- basic block ---
+L_10950a8:
+// 0x010950a8: 0x10950a8: lw    v0, 16(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x010950ac: 0x10950ac: sll   zero, zero, 0
+// 0x010950b0: 0x10950b0: bne   v0, zero, 0x109505c sll   zero, zero, 0
 	ldloc 6
+	brtrue L_109505c
+// --- basic block ---
+// 0x010950b8: 0x10950b8: j	 0x1095068 sll   zero, zero, 0
+	br L_1095068
+// --- basic block ---
+L_10950c0:
+// 0x010950c0: 0x10950c0: lw    ra, 36(sp)
+// 0x010950c4: 0x10950c4: lw    s3, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6030,8 +6121,8 @@ L_1094a78:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01094a80: 0x1094a80: lw    s2, 28(sp)
-	ldloc 6
+// 0x010950c8: 0x10950c8: lw    s2, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6039,8 +6130,8 @@ L_1094a78:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01094a84: 0x1094a84: lw    s1, 24(sp)
-	ldloc 6
+// 0x010950cc: 0x10950cc: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6048,28 +6139,28 @@ L_1094a78:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01094a88: 0x1094a88: lw    s0, 20(sp)
-	ldloc 6
+// 0x010950d0: 0x10950d0: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 8
-// 0x01094a8c: 0x1094a8c: jr    ra addiu sp, sp, 40
+	stloc 7
+// 0x010950d4: 0x10950d4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -6110,12 +6201,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094a94: 0x1094a94: addiu sp, sp, -32
+// 0x010950dc: 0x10950dc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01094a98: 0x1094a98: sw    s1, 24(sp)
+// 0x010950e0: 0x10950e0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6124,7 +6215,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01094a9c: 0x1094a9c: sw    s0, 20(sp)
+// 0x010950e4: 0x10950e4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6133,17 +6224,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01094aa0: 0x1094aa0: sw    ra, 28(sp)
-// 0x01094aa4: 0x1094aa4: addu  s1, a0, zero
+// 0x010950e8: 0x10950e8: sw    ra, 28(sp)
+// 0x010950ec: 0x10950ec: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01094aa8: 0x1094aa8: j	 0x1094abc lui   s0, 0x80000
+// 0x010950f0: 0x10950f0: j	 0x1095104 lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-	br L_1094abc
+	br L_1095104
 // --- basic block ---
-L_1094ab0:
-// 0x01094ab0: 0x1094ab0: lw    a0, 8(v0)
+L_10950f8:
+// 0x010950f8: 0x10950f8: lw    a0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6152,36 +6243,36 @@ L_1094ab0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094ab4: 0x1094ab4: jal   0x1094884 sll   zero, zero, 0
+// 0x010950fc: 0x10950fc: jal   0x1094ff4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_1094abc:
-// 0x01094abc: 0x1094abc: lw    v0, 9644(s0)
+L_1095104:
+// 0x01095104: 0x1095104: lw    v0, 10108(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x01094ac0: 0x1094ac0: sll   zero, zero, 0
-// 0x01094ac4: 0x1094ac4: bne   v0, zero, 0x1094ab0 addu  a1, s1, zero
+// 0x01095108: 0x1095108: sll   zero, zero, 0
+// 0x0109510c: 0x109510c: bne   v0, zero, 0x10950f8 addu  a1, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brtrue L_1094ab0
+	brtrue L_10950f8
 // --- basic block ---
-// 0x01094acc: 0x1094acc: lw    ra, 28(sp)
-// 0x01094ad0: 0x1094ad0: lw    s1, 24(sp)
+// 0x01095114: 0x1095114: lw    ra, 28(sp)
+// 0x01095118: 0x1095118: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6190,7 +6281,7 @@ L_1094abc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094ad4: 0x1094ad4: lw    s0, 20(sp)
+// 0x0109511c: 0x109511c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6199,7 +6290,7 @@ L_1094abc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094ad8: 0x1094ad8: jr    ra addiu sp, sp, 32
+// 0x01095120: 0x1095120: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6211,7 +6302,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 left_softkey_callback_1094ae0(int32,int32,int32,int32,int32)
+.method public static int32 left_softkey_callback_1095128(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6246,28 +6337,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094ae0: 0x1094ae0: lui   v0, 0x80000
+// 0x01095128: 0x1095128: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094ae4: 0x1094ae4: lw    v1, 9644(v0)
+// 0x0109512c: 0x109512c: lw    v1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094ae8: 0x1094ae8: addiu sp, sp, -24
+// 0x01095130: 0x1095130: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094aec: 0x1094aec: beq   v1, zero, 0x1094b54 sw    ra, 20(sp)
+// 0x01095134: 0x1095134: beq   v1, zero, 0x109519c sw    ra, 20(sp)
 	ldloc 7
-	brfalse L_1094b54
+	brfalse L_109519c
 // --- basic block ---
-// 0x01094af4: 0x1094af4: lw    a0, 24(v1)
+// 0x0109513c: 0x109513c: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6276,12 +6367,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094af8: 0x1094af8: sll   zero, zero, 0
-// 0x01094afc: 0x1094afc: beq   a0, zero, 0x1094b20 sll   zero, zero, 0
+// 0x01095140: 0x1095140: sll   zero, zero, 0
+// 0x01095144: 0x1095144: beq   a0, zero, 0x1095168 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1094b20
+	brfalse L_1095168
 // --- basic block ---
-// 0x01094b04: 0x1094b04: lw    v0, 160(a0)
+// 0x0109514c: 0x109514c: lw    v0, 160(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6290,14 +6381,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094b08: 0x1094b08: sll   zero, zero, 0
-// 0x01094b0c: 0x1094b0c: beq   v0, zero, 0x1094b20 lui   a1, 0x10000
+// 0x01095150: 0x1095150: sll   zero, zero, 0
+// 0x01095154: 0x1095154: beq   v0, zero, 0x1095168 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1094b20
+	brfalse L_1095168
 // --- basic block ---
-// 0x01094b14: 0x1094b14: lw    a2, 12(v1)
+// 0x0109515c: 0x109515c: lw    a2, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6306,11 +6397,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01094b18: 0x1094b18: j	 0x1094b3c sll   zero, zero, 0
-	br L_1094b3c
+// 0x01095160: 0x1095160: j	 0x1095184 sll   zero, zero, 0
+	br L_1095184
 // --- basic block ---
-L_1094b20:
-// 0x01094b20: 0x1094b20: lw    a0, 20(v1)
+L_1095168:
+// 0x01095168: 0x1095168: lw    a0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6319,8 +6410,8 @@ L_1094b20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094b24: 0x1094b24: sll   zero, zero, 0
-// 0x01094b28: 0x1094b28: lw    v0, 160(a0)
+// 0x0109516c: 0x109516c: sll   zero, zero, 0
+// 0x01095170: 0x1095170: lw    v0, 160(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6329,14 +6420,14 @@ L_1094b20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094b2c: 0x1094b2c: sll   zero, zero, 0
-// 0x01094b30: 0x1094b30: beq   v0, zero, 0x1094b4c lui   a1, 0x10000
+// 0x01095174: 0x1095174: sll   zero, zero, 0
+// 0x01095178: 0x1095178: beq   v0, zero, 0x1095194 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1094b4c
+	brfalse L_1095194
 // --- basic block ---
-// 0x01094b38: 0x1094b38: lw    a2, 116(a0)
+// 0x01095180: 0x1095180: lw    a2, 116(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6345,11 +6436,11 @@ L_1094b20:
 	add
 	ldelem.i4
 	stloc.3
-L_1094b3c:
-// 0x01094b3c: 0x1094b3c: jalr  v0 addiu a1, a1, 18500
+L_1095184:
+// 0x01095184: 0x1095184: jalr  v0 addiu a1, a1, 18768
 	ldloc 5
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6362,11 +6453,11 @@ L_1094b3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094b44: 0x1094b44: j	 0x1094b54 sll   zero, zero, 0
-	br L_1094b54
+// 0x0109518c: 0x109518c: j	 0x109519c sll   zero, zero, 0
+	br L_109519c
 // --- basic block ---
-L_1094b4c:
-// 0x01094b4c: 0x1094b4c: jal   0x1094a94 addiu a0, zero, 2
+L_1095194:
+// 0x01095194: 0x1095194: jal   0x10950dc addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -6374,15 +6465,15 @@ L_1094b4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1094b54:
-// 0x01094b54: 0x1094b54: lw    ra, 20(sp)
-// 0x01094b58: 0x1094b58: sll   zero, zero, 0
-// 0x01094b5c: 0x1094b5c: jr    ra addiu sp, sp, 24
+L_109519c:
+// 0x0109519c: 0x109519c: lw    ra, 20(sp)
+// 0x010951a0: 0x10951a0: sll   zero, zero, 0
+// 0x010951a4: 0x10951a4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6394,7 +6485,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6429,31 +6520,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094b64: 0x1094b64: lui   v0, 0x80000
+// 0x010951ac: 0x10951ac: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094b68: 0x1094b68: lw    v0, 9644(v0)
+// 0x010951b0: 0x10951b0: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094b6c: 0x1094b6c: addiu sp, sp, -24
+// 0x010951b4: 0x10951b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094b70: 0x1094b70: sw    ra, 20(sp)
-// 0x01094b74: 0x1094b74: beq   v0, zero, 0x1094b88 addu  a1, a0, zero
+// 0x010951b8: 0x10951b8: sw    ra, 20(sp)
+// 0x010951bc: 0x10951bc: beq   v0, zero, 0x10951d0 addu  a1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc.2
-	brfalse L_1094b88
+	brfalse L_10951d0
 // --- basic block ---
-// 0x01094b7c: 0x1094b7c: lw    a0, 8(v0)
+// 0x010951c4: 0x10951c4: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6462,21 +6553,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094b80: 0x1094b80: jal   0x1094884 sll   zero, zero, 0
+// 0x010951c8: 0x10951c8: jal   0x1094ff4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1094b88:
-// 0x01094b88: 0x1094b88: lw    ra, 20(sp)
-// 0x01094b8c: 0x1094b8c: sll   zero, zero, 0
-// 0x01094b90: 0x1094b90: jr    ra addiu sp, sp, 24
+L_10951d0:
+// 0x010951d0: 0x10951d0: lw    ra, 20(sp)
+// 0x010951d4: 0x10951d4: sll   zero, zero, 0
+// 0x010951d8: 0x10951d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6488,7 +6579,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 right_softkey_callback_1094b98(int32,int32,int32,int32,int32)
+.method public static int32 right_softkey_callback_10951e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6523,28 +6614,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094b98: 0x1094b98: lui   v0, 0x80000
+// 0x010951e0: 0x10951e0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094b9c: 0x1094b9c: lw    v1, 9644(v0)
+// 0x010951e4: 0x10951e4: lw    v1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094ba0: 0x1094ba0: addiu sp, sp, -24
+// 0x010951e8: 0x10951e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094ba4: 0x1094ba4: beq   v1, zero, 0x1094c0c sw    ra, 20(sp)
+// 0x010951ec: 0x10951ec: beq   v1, zero, 0x1095254 sw    ra, 20(sp)
 	ldloc 7
-	brfalse L_1094c0c
+	brfalse L_1095254
 // --- basic block ---
-// 0x01094bac: 0x1094bac: lw    a0, 24(v1)
+// 0x010951f4: 0x10951f4: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6553,12 +6644,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094bb0: 0x1094bb0: sll   zero, zero, 0
-// 0x01094bb4: 0x1094bb4: beq   a0, zero, 0x1094bd8 sll   zero, zero, 0
+// 0x010951f8: 0x10951f8: sll   zero, zero, 0
+// 0x010951fc: 0x10951fc: beq   a0, zero, 0x1095220 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1094bd8
+	brfalse L_1095220
 // --- basic block ---
-// 0x01094bbc: 0x1094bbc: lw    v0, 156(a0)
+// 0x01095204: 0x1095204: lw    v0, 156(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6567,14 +6658,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094bc0: 0x1094bc0: sll   zero, zero, 0
-// 0x01094bc4: 0x1094bc4: beq   v0, zero, 0x1094bd8 lui   a1, 0x10000
+// 0x01095208: 0x1095208: sll   zero, zero, 0
+// 0x0109520c: 0x109520c: beq   v0, zero, 0x1095220 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1094bd8
+	brfalse L_1095220
 // --- basic block ---
-// 0x01094bcc: 0x1094bcc: lw    a2, 12(v1)
+// 0x01095214: 0x1095214: lw    a2, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6583,11 +6674,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01094bd0: 0x1094bd0: j	 0x1094bf4 sll   zero, zero, 0
-	br L_1094bf4
+// 0x01095218: 0x1095218: j	 0x109523c sll   zero, zero, 0
+	br L_109523c
 // --- basic block ---
-L_1094bd8:
-// 0x01094bd8: 0x1094bd8: lw    a0, 20(v1)
+L_1095220:
+// 0x01095220: 0x1095220: lw    a0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6596,8 +6687,8 @@ L_1094bd8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094bdc: 0x1094bdc: sll   zero, zero, 0
-// 0x01094be0: 0x1094be0: lw    v0, 156(a0)
+// 0x01095224: 0x1095224: sll   zero, zero, 0
+// 0x01095228: 0x1095228: lw    v0, 156(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6606,14 +6697,14 @@ L_1094bd8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094be4: 0x1094be4: sll   zero, zero, 0
-// 0x01094be8: 0x1094be8: beq   v0, zero, 0x1094c04 lui   a1, 0x10000
+// 0x0109522c: 0x109522c: sll   zero, zero, 0
+// 0x01095230: 0x1095230: beq   v0, zero, 0x109524c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1094c04
+	brfalse L_109524c
 // --- basic block ---
-// 0x01094bf0: 0x1094bf0: lw    a2, 116(a0)
+// 0x01095238: 0x1095238: lw    a2, 116(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6622,11 +6713,11 @@ L_1094bd8:
 	add
 	ldelem.i4
 	stloc.3
-L_1094bf4:
-// 0x01094bf4: 0x1094bf4: jalr  v0 addiu a1, a1, 18500
+L_109523c:
+// 0x0109523c: 0x109523c: jalr  v0 addiu a1, a1, 18768
 	ldloc 5
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6639,11 +6730,11 @@ L_1094bf4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094bfc: 0x1094bfc: j	 0x1094c0c sll   zero, zero, 0
-	br L_1094c0c
+// 0x01095244: 0x1095244: j	 0x1095254 sll   zero, zero, 0
+	br L_1095254
 // --- basic block ---
-L_1094c04:
-// 0x01094c04: 0x1094c04: jal   0x1094b64 addiu a0, zero, 2
+L_109524c:
+// 0x0109524c: 0x109524c: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -6651,15 +6742,15 @@ L_1094c04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1094c0c:
-// 0x01094c0c: 0x1094c0c: lw    ra, 20(sp)
-// 0x01094c10: 0x1094c10: sll   zero, zero, 0
-// 0x01094c14: 0x1094c14: jr    ra addiu sp, sp, 24
+L_1095254:
+// 0x01095254: 0x1095254: lw    ra, 20(sp)
+// 0x01095258: 0x1095258: sll   zero, zero, 0
+// 0x0109525c: 0x109525c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6671,7 +6762,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_drag_motion_1094c1c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_drag_motion_1095264(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 s4,int32 lo,int32 ra)
@@ -6724,15 +6815,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094c1c: 0x1094c1c: addiu sp, sp, -48
+// 0x01095264: 0x1095264: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01094c20: 0x1094c20: lui   v0, 0x80000
+// 0x01095268: 0x1095268: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094c24: 0x1094c24: sw    s0, 24(sp)
+// 0x0109526c: 0x109526c: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6741,16 +6832,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01094c28: 0x1094c28: lw    s0, 9644(v0)
+// 0x01095270: 0x1095270: lw    s0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094c2c: 0x1094c2c: sw    s1, 28(sp)
+// 0x01095274: 0x1095274: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6759,8 +6850,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01094c30: 0x1094c30: sw    ra, 44(sp)
-// 0x01094c34: 0x1094c34: sw    s4, 40(sp)
+// 0x01095278: 0x1095278: sw    ra, 44(sp)
+// 0x0109527c: 0x109527c: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6769,7 +6860,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01094c38: 0x1094c38: sw    s3, 36(sp)
+// 0x01095280: 0x1095280: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6778,7 +6869,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01094c3c: 0x1094c3c: sw    s2, 32(sp)
+// 0x01095284: 0x1095284: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6787,16 +6878,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01094c40: 0x1094c40: addu  s1, a0, zero
+// 0x01095288: 0x1095288: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01094c44: 0x1094c44: beq   s0, zero, 0x1094da0 addu  v0, zero, zero
+// 0x0109528c: 0x109528c: beq   s0, zero, 0x10953e8 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1094da0
+	brfalse L_10953e8
 // --- basic block ---
-// 0x01094c4c: 0x1094c4c: lw    a0, 20(s0)
+// 0x01095294: 0x1095294: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6805,10 +6896,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094c50: 0x1094c50: lui   v0, 0x10000
+// 0x01095298: 0x1095298: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01094c54: 0x1094c54: lw    v1, 48(a0)
+// 0x0109529c: 0x109529c: lw    v1, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6817,42 +6908,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094c58: 0x1094c58: sll   zero, zero, 0
-// 0x01094c5c: 0x1094c5c: and   v0, v1, v0
+// 0x010952a0: 0x10952a0: sll   zero, zero, 0
+// 0x010952a4: 0x10952a4: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01094c60: 0x1094c60: beq   v0, zero, 0x1094c7c lui   v0, 0x80000
+// 0x010952a8: 0x10952a8: beq   v0, zero, 0x10952c4 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1094c7c
+	brfalse L_10952c4
 // --- basic block ---
-// 0x01094c68: 0x1094c68: lw    v0, 9772(v0)
+// 0x010952b0: 0x10952b0: lw    v0, 10236(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094c6c: 0x1094c6c: sll   zero, zero, 0
-// 0x01094c70: 0x1094c70: addiu v0, v0, 1
+// 0x010952b4: 0x10952b4: sll   zero, zero, 0
+// 0x010952b8: 0x10952b8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01094c74: 0x1094c74: j	 0x1094da0 sltu  v0, zero, v0
+// 0x010952bc: 0x10952bc: j	 0x10953e8 sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	br L_1094da0
+	br L_10953e8
 // --- basic block ---
-L_1094c7c:
-// 0x01094c7c: 0x1094c7c: lw    v1, 24(s0)
+L_10952c4:
+// 0x010952c4: 0x10952c4: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6861,14 +6952,14 @@ L_1094c7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094c80: 0x1094c80: sll   zero, zero, 0
-// 0x01094c84: 0x1094c84: beq   v1, zero, 0x1094da0 addiu v0, zero, 1
+// 0x010952c8: 0x10952c8: sll   zero, zero, 0
+// 0x010952cc: 0x10952cc: beq   v1, zero, 0x10953e8 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brfalse L_1094da0
+	brfalse L_10953e8
 // --- basic block ---
-// 0x01094c8c: 0x1094c8c: lw    v0, 212(v1)
+// 0x010952d4: 0x10952d4: lw    v0, 212(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6877,12 +6968,12 @@ L_1094c7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094c90: 0x1094c90: sll   zero, zero, 0
-// 0x01094c94: 0x1094c94: beq   v0, zero, 0x1094cac sll   zero, zero, 0
+// 0x010952d8: 0x10952d8: sll   zero, zero, 0
+// 0x010952dc: 0x10952dc: beq   v0, zero, 0x10952f4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1094cac
+	brfalse L_10952f4
 // --- basic block ---
-// 0x01094c9c: 0x1094c9c: jalr  v0 addu  a1, s1, zero
+// 0x010952e4: 0x10952e4: jalr  v0 addu  a1, s1, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
@@ -6896,11 +6987,11 @@ L_1094c7c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094ca4: 0x1094ca4: j	 0x1094da0 sll   zero, zero, 0
-	br L_1094da0
+// 0x010952ec: 0x10952ec: j	 0x10953e8 sll   zero, zero, 0
+	br L_10953e8
 // --- basic block ---
-L_1094cac:
-// 0x01094cac: 0x1094cac: lw    v0, 96(s0)
+L_10952f4:
+// 0x010952f4: 0x10952f4: lw    v0, 96(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6909,14 +7000,14 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094cb0: 0x1094cb0: sll   zero, zero, 0
-// 0x01094cb4: 0x1094cb4: beq   v0, zero, 0x1094da0 addiu v0, zero, 1
+// 0x010952f8: 0x10952f8: sll   zero, zero, 0
+// 0x010952fc: 0x10952fc: beq   v0, zero, 0x10953e8 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_1094da0
+	brfalse L_10953e8
 // --- basic block ---
-// 0x01094cbc: 0x1094cbc: lw    a1, 60(s0)
+// 0x01095304: 0x1095304: lw    a1, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6925,7 +7016,7 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01094cc0: 0x1094cc0: lw    v0, 4(s1)
+// 0x01095308: 0x1095308: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6934,71 +7025,71 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094cc4: 0x1094cc4: sll   zero, zero, 0
-// 0x01094cc8: 0x1094cc8: subu  a1, a1, v0
+// 0x0109530c: 0x109530c: sll   zero, zero, 0
+// 0x01095310: 0x1095310: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x01094ccc: 0x1094ccc: sra   a0, a1, 31
+// 0x01095314: 0x1095314: sra   a0, a1, 31
 	ldloc.2
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x01094cd0: 0x1094cd0: xor   a1, a0, a1
+// 0x01095318: 0x1095318: xor   a1, a0, a1
 	ldloc.1
 	ldloc.2
 	xor
 	stloc.2
-// 0x01094cd4: 0x1094cd4: subu  a0, a1, a0
+// 0x0109531c: 0x109531c: subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-// 0x01094cd8: 0x1094cd8: slti  a0, a0, 6
+// 0x01095320: 0x1095320: slti  a0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	clt
 	stloc.1
-// 0x01094cdc: 0x1094cdc: bne   a0, zero, 0x1094d9c lui   s4, 0xf0000
+// 0x01095324: 0x1095324: bne   a0, zero, 0x10953e4 lui   s4, 0xf0000
 	ldloc.1
 	ldc.i4 983040
 	stloc 12
-	brtrue L_1094d9c
+	brtrue L_10953e4
 // --- basic block ---
-// 0x01094ce4: 0x1094ce4: lw    a0, -30072(s4)
+// 0x0109532c: 0x109532c: lw    a0, -29608(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094ce8: 0x1094ce8: addiu s2, zero, 3
+// 0x01095330: 0x1095330: addiu s2, zero, 3
 	ldc.i4.3
 	stloc 11
-// 0x01094cec: 0x1094cec: div   a0, s2
+// 0x01095334: 0x1095334: div   a0, s2
 	ldloc.1
 	ldloc 11
 	div
 	stloc 13
-// 0x01094cf0: 0x1094cf0: addiu a1, zero, -1
+// 0x01095338: 0x1095338: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x01094cf4: 0x1094cf4: lui   a0, 0x80000
+// 0x0109533c: 0x109533c: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x01094cf8: 0x1094cf8: sw    a1, 9772(a0)
+// 0x01095340: 0x1095340: sw    a1, 10236(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldloc.2
 	stelem.i4
-// 0x01094cfc: 0x1094cfc: lw    s3, 88(s0)
+// 0x01095344: 0x1095344: lw    s3, 88(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7007,7 +7098,7 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01094d00: 0x1094d00: lw    a0, 52(s0)
+// 0x01095348: 0x1095348: lw    a0, 52(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7016,39 +7107,39 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094d04: 0x1094d04: addu  s3, s3, v0
+// 0x0109534c: 0x109534c: addu  s3, s3, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x01094d08: 0x1094d08: subu  s3, s3, a0
+// 0x01095350: 0x1095350: subu  s3, s3, a0
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 9
-// 0x01094d0c: 0x1094d0c: mflo  lo
+// 0x01095354: 0x1095354: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x01094d10: 0x1094d10: slt   a0, v0, s3
+// 0x01095358: 0x1095358: slt   a0, v0, s3
 	ldloc 5
 	ldloc 9
 	clt
 	stloc.1
-// 0x01094d14: 0x1094d14: bne   a0, zero, 0x1094d6c addiu v0, zero, 16
+// 0x0109535c: 0x109535c: bne   a0, zero, 0x10953b4 addiu v0, zero, 16
 	ldloc.1
 	ldc.i4.s 16
 	stloc 5
-	brtrue L_1094d6c
+	brtrue L_10953b4
 // --- basic block ---
-// 0x01094d1c: 0x1094d1c: addu  a0, v1, zero
+// 0x01095364: 0x1095364: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01094d20: 0x1094d20: addiu a1, sp, 16
+// 0x01095368: 0x1095368: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01094d24: 0x1094d24: jal   0x1099350 addu  a2, zero, zero
+// 0x0109536c: 0x109536c: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -7056,21 +7147,21 @@ L_1094cac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094d2c: 0x1094d2c: lw    v1, -30072(s4)
+// 0x01095374: 0x1095374: lw    v1, -29608(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094d30: 0x1094d30: lw    v0, 20(sp)
+// 0x01095378: 0x1095378: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7079,26 +7170,26 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094d34: 0x1094d34: sll   zero, zero, 0
-// 0x01094d38: 0x1094d38: slt   a0, v1, v0
+// 0x0109537c: 0x109537c: sll   zero, zero, 0
+// 0x01095380: 0x1095380: slt   a0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc.1
-// 0x01094d3c: 0x1094d3c: beq   a0, zero, 0x1094d74 sll   v1, v1, 1
+// 0x01095384: 0x1095384: beq   a0, zero, 0x10953bc sll   v1, v1, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	shl
 	stloc 7
-	brfalse L_1094d74
+	brfalse L_10953bc
 // --- basic block ---
-// 0x01094d44: 0x1094d44: div   v1, s2
+// 0x0109538c: 0x109538c: div   v1, s2
 	ldloc 7
 	ldloc 11
 	div
 	stloc 13
-// 0x01094d48: 0x1094d48: lw    v1, 24(s0)
+// 0x01095390: 0x1095390: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7107,8 +7198,8 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094d4c: 0x1094d4c: sll   zero, zero, 0
-// 0x01094d50: 0x1094d50: lw    v1, 124(v1)
+// 0x01095394: 0x1095394: sll   zero, zero, 0
+// 0x01095398: 0x1095398: lw    v1, 124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7117,28 +7208,28 @@ L_1094cac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094d54: 0x1094d54: sll   zero, zero, 0
-// 0x01094d58: 0x1094d58: addu  v1, v0, v1
+// 0x0109539c: 0x109539c: sll   zero, zero, 0
+// 0x010953a0: 0x10953a0: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01094d5c: 0x1094d5c: mflo  lo
+// 0x010953a4: 0x10953a4: mflo  lo
 	ldloc 13
 	stloc 11
-// 0x01094d60: 0x1094d60: slt   v1, v1, s2
+// 0x010953a8: 0x10953a8: slt   v1, v1, s2
 	ldloc 7
 	ldloc 11
 	clt
 	stloc 7
-// 0x01094d64: 0x1094d64: beq   v1, zero, 0x1094d74 addiu v0, zero, 16
+// 0x010953ac: 0x10953ac: beq   v1, zero, 0x10953bc addiu v0, zero, 16
 	ldloc 7
 	ldc.i4.s 16
 	stloc 5
-	brfalse L_1094d74
+	brfalse L_10953bc
 // --- basic block ---
-L_1094d6c:
-// 0x01094d6c: 0x1094d6c: j	 0x1094d9c sw    v0, 92(s0)
+L_10953b4:
+// 0x010953b4: 0x10953b4: j	 0x10953e4 sw    v0, 92(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7147,17 +7238,17 @@ L_1094d6c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1094d9c
+	br L_10953e4
 // --- basic block ---
-L_1094d74:
-// 0x01094d74: 0x1094d74: lw    v0, 0(s1)
+L_10953bc:
+// 0x010953bc: 0x10953bc: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01094d78: 0x1094d78: lw    v1, 4(s1)
+// 0x010953c0: 0x10953c0: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7166,7 +7257,7 @@ L_1094d74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094d7c: 0x1094d7c: lw    a0, 24(s0)
+// 0x010953c4: 0x10953c4: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7175,7 +7266,7 @@ L_1094d74:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094d80: 0x1094d80: sw    v1, 60(s0)
+// 0x010953c8: 0x10953c8: sw    v1, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7184,7 +7275,7 @@ L_1094d74:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01094d84: 0x1094d84: sw    v0, 56(s0)
+// 0x010953cc: 0x10953cc: sw    v0, 56(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7193,10 +7284,10 @@ L_1094d74:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01094d88: 0x1094d88: addu  a2, s3, zero
+// 0x010953d0: 0x10953d0: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x01094d8c: 0x1094d8c: jal   0x1098f84 addu  a1, zero, zero
+// 0x010953d4: 0x10953d4: jal   0x10995cc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7204,29 +7295,29 @@ L_1094d74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094d94: 0x1094d94: jal   0x109483c sll   zero, zero, 0
+// 0x010953dc: 0x10953dc: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1094d9c:
-// 0x01094d9c: 0x1094d9c: addiu v0, zero, 1
+L_10953e4:
+// 0x010953e4: 0x10953e4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1094da0:
-// 0x01094da0: 0x1094da0: lw    ra, 44(sp)
-// 0x01094da4: 0x1094da4: lw    s4, 40(sp)
+L_10953e8:
+// 0x010953e8: 0x10953e8: lw    ra, 44(sp)
+// 0x010953ec: 0x10953ec: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7235,7 +7326,7 @@ L_1094da0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01094da8: 0x1094da8: lw    s3, 36(sp)
+// 0x010953f0: 0x10953f0: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7244,7 +7335,7 @@ L_1094da0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01094dac: 0x1094dac: lw    s2, 32(sp)
+// 0x010953f4: 0x10953f4: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7253,7 +7344,7 @@ L_1094da0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01094db0: 0x1094db0: lw    s1, 28(sp)
+// 0x010953f8: 0x10953f8: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7262,7 +7353,7 @@ L_1094da0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01094db4: 0x1094db4: lw    s0, 24(sp)
+// 0x010953fc: 0x10953fc: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7271,7 +7362,7 @@ L_1094da0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094db8: 0x1094db8: jr    ra addiu sp, sp, 48
+// 0x01095400: 0x1095400: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -7283,7 +7374,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_long_click_1094dc0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_long_click_1095408(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -7318,22 +7409,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094dc0: 0x1094dc0: lui   v0, 0x80000
+// 0x01095408: 0x1095408: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094dc4: 0x1094dc4: lw    v0, 9644(v0)
+// 0x0109540c: 0x109540c: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094dc8: 0x1094dc8: lui   a1, 0x80000
+// 0x01095410: 0x1095410: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x01094dcc: 0x1094dcc: lw    a0, 20(v0)
+// 0x01095414: 0x1095414: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7342,15 +7433,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094dd0: 0x1094dd0: addiu sp, sp, -24
+// 0x01095418: 0x1095418: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094dd4: 0x1094dd4: sw    ra, 20(sp)
-// 0x01094dd8: 0x1094dd8: jal   0x1099934 addiu a1, a1, 9772
+// 0x0109541c: 0x109541c: sw    ra, 20(sp)
+// 0x01095420: 0x1095420: jal   0x1099f7c addiu a1, a1, 10236
 	ldloc.2
-	ldc.i4 9772
+	ldc.i4 10236
 	add
 	stloc.2
 	ldloc.0
@@ -7358,27 +7449,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_long_click_1099934(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_long_click_1099f7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01094de0: 0x1094de0: jal   0x1021900 sll   zero, zero, 0
+// 0x01095428: 0x1095428: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01094de8: 0x1094de8: lw    ra, 20(sp)
-// 0x01094dec: 0x1094dec: addiu v0, zero, 1
+// 0x01095430: 0x1095430: lw    ra, 20(sp)
+// 0x01095434: 0x1095434: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01094df0: 0x1094df0: jr    ra addiu sp, sp, 24
+// 0x01095438: 0x1095438: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl111.j b/converted/Cibyl111.j
index 42674be..2fcb99a 100644
--- a/converted/Cibyl111.j
+++ b/converted/Cibyl111.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl111::.ctor
 
-.method public static int32 ssd_dialog_short_click_1094df8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_short_click_1095440(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -85,12 +85,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094df8: 0x1094df8: addiu sp, sp, -32
+// 0x01095440: 0x1095440: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01094dfc: 0x1094dfc: sw    s2, 24(sp)
+// 0x01095444: 0x1095444: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -99,19 +99,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01094e00: 0x1094e00: lui   s2, 0x80000
+// 0x01095448: 0x1095448: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01094e04: 0x1094e04: lw    v0, 9772(s2)
+// 0x0109544c: 0x109544c: lw    v0, 10236(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094e08: 0x1094e08: sw    s1, 20(sp)
+// 0x01095450: 0x1095450: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -120,8 +120,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01094e0c: 0x1094e0c: sw    ra, 28(sp)
-// 0x01094e10: 0x1094e10: sw    s0, 16(sp)
+// 0x01095454: 0x1095454: sw    ra, 28(sp)
+// 0x01095458: 0x1095458: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -130,29 +130,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01094e14: 0x1094e14: bgez  v0, 0x1094e54 addu  s1, a0, zero
+// 0x0109545c: 0x109545c: bgez  v0, 0x109549c addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
 	ldc.i4.s 0
-	bge L_1094e54
+	bge L_109549c
 // --- basic block ---
-// 0x01094e1c: 0x1094e1c: lui   v0, 0x80000
+// 0x01095464: 0x1095464: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094e20: 0x1094e20: lw    v0, 9644(v0)
+// 0x01095468: 0x1095468: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094e24: 0x1094e24: addu  a1, a0, zero
+// 0x0109546c: 0x109546c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01094e28: 0x1094e28: lw    a0, 20(v0)
+// 0x01095470: 0x1095470: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -161,7 +161,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094e2c: 0x1094e2c: jal   0x1099bbc addiu a2, zero, 1
+// 0x01095474: 0x1095474: jal   0x109a204 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -169,39 +169,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_find_by_pos_1099bbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_find_by_pos_109a204(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01094e34: 0x1094e34: beq   v0, zero, 0x1094eec addu  s0, zero, zero
+// 0x0109547c: 0x109547c: beq   v0, zero, 0x1095534 addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_1094eec
+	brfalse L_1095534
 // --- basic block ---
-// 0x01094e3c: 0x1094e3c: lw    v1, 0(s1)
+// 0x01095484: 0x1095484: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01094e40: 0x1094e40: addiu v0, s2, 9772
+// 0x01095488: 0x1095488: addiu v0, s2, 10236
 	ldloc 7
-	ldc.i4 9772
+	ldc.i4 10236
 	add
 	stloc 5
-// 0x01094e44: 0x1094e44: sw    v1, 9772(s2)
+// 0x0109548c: 0x109548c: sw    v1, 10236(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldloc 9
 	stelem.i4
-// 0x01094e48: 0x1094e48: lw    v1, 4(s1)
+// 0x01095490: 0x1095490: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -210,8 +210,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01094e4c: 0x1094e4c: sll   zero, zero, 0
-// 0x01094e50: 0x1094e50: sw    v1, 4(v0)
+// 0x01095494: 0x1095494: sll   zero, zero, 0
+// 0x01095498: 0x1095498: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -220,23 +220,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-L_1094e54:
-// 0x01094e54: 0x1094e54: lui   s2, 0x80000
+L_109549c:
+// 0x0109549c: 0x109549c: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01094e58: 0x1094e58: lw    v0, 9644(s2)
+// 0x010954a0: 0x10954a0: lw    v0, 10108(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094e5c: 0x1094e5c: lui   s1, 0x80000
+// 0x010954a4: 0x10954a4: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01094e60: 0x1094e60: lw    a0, 20(v0)
+// 0x010954a8: 0x10954a8: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -245,9 +245,9 @@ L_1094e54:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094e64: 0x1094e64: jal   0x10999d0 addiu a1, s1, 9772
+// 0x010954ac: 0x10954ac: jal   0x109a018 addiu a1, s1, 10236
 	ldloc 8
-	ldc.i4 9772
+	ldc.i4 10236
 	add
 	stloc.2
 	ldloc.0
@@ -255,28 +255,28 @@ L_1094e54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_short_click_10999d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_short_click_109a018(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01094e6c: 0x1094e6c: bne   v0, zero, 0x1094ee4 addu  s0, v0, zero
+// 0x010954b4: 0x10954b4: bne   v0, zero, 0x109552c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brtrue L_1094ee4
+	brtrue L_109552c
 // --- basic block ---
-// 0x01094e74: 0x1094e74: lw    v0, 9644(s2)
+// 0x010954bc: 0x10954bc: lw    v0, 10108(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094e78: 0x1094e78: sll   zero, zero, 0
-// 0x01094e7c: 0x1094e7c: lw    a0, 24(v0)
+// 0x010954c0: 0x10954c0: sll   zero, zero, 0
+// 0x010954c4: 0x10954c4: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -285,16 +285,16 @@ L_1094e54:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094e80: 0x1094e80: sll   zero, zero, 0
-// 0x01094e84: 0x1094e84: beq   a0, zero, 0x1094ea4 lui   s2, 0x80000
+// 0x010954c8: 0x10954c8: sll   zero, zero, 0
+// 0x010954cc: 0x10954cc: beq   a0, zero, 0x10954ec lui   s2, 0x80000
 	ldloc.1
 	ldc.i4 524288
 	stloc 7
-	brfalse L_1094ea4
+	brfalse L_10954ec
 // --- basic block ---
-// 0x01094e8c: 0x1094e8c: jal   0x10999d0 addiu a1, s1, 9772
+// 0x010954d4: 0x10954d4: jal   0x109a018 addiu a1, s1, 10236
 	ldloc 8
-	ldc.i4 9772
+	ldc.i4 10236
 	add
 	stloc.2
 	ldloc.0
@@ -302,36 +302,36 @@ L_1094e54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_short_click_10999d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_short_click_109a018(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01094e94: 0x1094e94: beq   v0, zero, 0x1094ea4 lui   s2, 0x80000
+// 0x010954dc: 0x10954dc: beq   v0, zero, 0x10954ec lui   s2, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 7
-	brfalse L_1094ea4
+	brfalse L_10954ec
 // --- basic block ---
-// 0x01094e9c: 0x1094e9c: j	 0x1094ee4 addu  s0, v0, zero
+// 0x010954e4: 0x10954e4: j	 0x109552c addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-	br L_1094ee4
+	br L_109552c
 // --- basic block ---
-L_1094ea4:
-// 0x01094ea4: 0x1094ea4: lw    v0, 9644(s2)
+L_10954ec:
+// 0x010954ec: 0x10954ec: lw    v0, 10108(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094ea8: 0x1094ea8: lui   s1, 0x80000
+// 0x010954f0: 0x10954f0: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01094eac: 0x1094eac: lw    a0, 20(v0)
+// 0x010954f4: 0x10954f4: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -340,12 +340,12 @@ L_1094ea4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094eb0: 0x1094eb0: addiu a1, s1, 9772
+// 0x010954f8: 0x10954f8: addiu a1, s1, 10236
 	ldloc 8
-	ldc.i4 9772
+	ldc.i4 10236
 	add
 	stloc.2
-// 0x01094eb4: 0x1094eb4: jal   0x1099bbc addiu a2, zero, 1
+// 0x010954fc: 0x10954fc: jal   0x109a204 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -353,30 +353,30 @@ L_1094ea4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_find_by_pos_1099bbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_find_by_pos_109a204(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01094ebc: 0x1094ebc: bne   v0, zero, 0x1094ee0 addiu a1, s1, 9772
+// 0x01095504: 0x1095504: bne   v0, zero, 0x1095528 addiu a1, s1, 10236
 	ldloc 5
 	ldloc 8
-	ldc.i4 9772
+	ldc.i4 10236
 	add
 	stloc.2
-	brtrue L_1094ee0
+	brtrue L_1095528
 // --- basic block ---
-// 0x01094ec4: 0x1094ec4: lw    v0, 9644(s2)
+// 0x0109550c: 0x109550c: lw    v0, 10108(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094ec8: 0x1094ec8: sll   zero, zero, 0
-// 0x01094ecc: 0x1094ecc: lw    a0, 24(v0)
+// 0x01095510: 0x1095510: sll   zero, zero, 0
+// 0x01095514: 0x1095514: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -385,7 +385,7 @@ L_1094ea4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094ed0: 0x1094ed0: jal   0x1099bbc addiu a2, zero, 1
+// 0x01095518: 0x1095518: jal   0x109a204 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -393,37 +393,37 @@ L_1094ea4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_find_by_pos_1099bbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_find_by_pos_109a204(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01094ed8: 0x1094ed8: beq   v0, zero, 0x1094ee4 sll   zero, zero, 0
+// 0x01095520: 0x1095520: beq   v0, zero, 0x109552c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1094ee4
+	brfalse L_109552c
 // --- basic block ---
-L_1094ee0:
-// 0x01094ee0: 0x1094ee0: addiu s0, zero, 1
+L_1095528:
+// 0x01095528: 0x1095528: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 10
-L_1094ee4:
-// 0x01094ee4: 0x1094ee4: jal   0x1021900 sll   zero, zero, 0
+L_109552c:
+// 0x0109552c: 0x109552c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1094eec:
-// 0x01094eec: 0x1094eec: lw    ra, 28(sp)
-// 0x01094ef0: 0x1094ef0: addu  v0, s0, zero
+L_1095534:
+// 0x01095534: 0x1095534: lw    ra, 28(sp)
+// 0x01095538: 0x1095538: addu  v0, s0, zero
 	ldloc 10
 	stloc 5
-// 0x01094ef4: 0x1094ef4: lw    s2, 24(sp)
+// 0x0109553c: 0x109553c: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -432,7 +432,7 @@ L_1094eec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01094ef8: 0x1094ef8: lw    s1, 20(sp)
+// 0x01095540: 0x1095540: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -441,7 +441,7 @@ L_1094eec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094efc: 0x1094efc: lw    s0, 16(sp)
+// 0x01095544: 0x1095544: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -450,7 +450,7 @@ L_1094eec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01094f00: 0x1094f00: jr    ra addiu sp, sp, 32
+// 0x01095548: 0x1095548: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -462,7 +462,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_released_1094f08(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_released_1095550(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -497,22 +497,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094f08: 0x1094f08: lui   v0, 0x80000
+// 0x01095550: 0x1095550: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094f0c: 0x1094f0c: lw    v0, 9644(v0)
+// 0x01095554: 0x1095554: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01094f10: 0x1094f10: addu  a1, a0, zero
+// 0x01095558: 0x1095558: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01094f14: 0x1094f14: lw    a0, 20(v0)
+// 0x0109555c: 0x109555c: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -521,24 +521,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094f18: 0x1094f18: addiu sp, sp, -24
+// 0x01095560: 0x1095560: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01094f1c: 0x1094f1c: addiu v1, zero, -1
+// 0x01095564: 0x1095564: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01094f20: 0x1094f20: lui   v0, 0x80000
+// 0x01095568: 0x1095568: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094f24: 0x1094f24: sw    ra, 20(sp)
-// 0x01094f28: 0x1094f28: jal   0x1099a6c sw    v1, 9772(v0)
+// 0x0109556c: 0x109556c: sw    ra, 20(sp)
+// 0x01095570: 0x1095570: jal   0x109a0b4 sw    v1, 10236(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldloc 7
 	stelem.i4
@@ -547,32 +547,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_pointer_up_1099a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_pointer_up_109a0b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094f30: 0x1094f30: beq   v0, zero, 0x1094f40 sll   zero, zero, 0
+// 0x01095578: 0x1095578: beq   v0, zero, 0x1095588 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1094f40
+	brfalse L_1095588
 // --- basic block ---
-// 0x01094f38: 0x1094f38: jal   0x1021900 sll   zero, zero, 0
+// 0x01095580: 0x1095580: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1094f40:
-// 0x01094f40: 0x1094f40: lw    ra, 20(sp)
-// 0x01094f44: 0x1094f44: addu  v0, zero, zero
+L_1095588:
+// 0x01095588: 0x1095588: lw    ra, 20(sp)
+// 0x0109558c: 0x109558c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01094f48: 0x1094f48: jr    ra addiu sp, sp, 24
+// 0x01095590: 0x1095590: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -584,7 +584,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_softkeys_1094f50(int32,int32,int32,int32,int32)
+.method public static int32 set_softkeys_1095598(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -625,12 +625,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01094f50: 0x1094f50: addiu sp, sp, -32
+// 0x01095598: 0x1095598: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01094f54: 0x1094f54: sw    s1, 24(sp)
+// 0x0109559c: 0x109559c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -639,7 +639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01094f58: 0x1094f58: lw    s1, 24(a0)
+// 0x010955a0: 0x10955a0: lw    s1, 24(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -648,7 +648,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094f5c: 0x1094f5c: sw    s0, 20(sp)
+// 0x010955a4: 0x10955a4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -657,14 +657,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01094f60: 0x1094f60: sw    ra, 28(sp)
-// 0x01094f64: 0x1094f64: bne   s1, zero, 0x1094f74 addu  s0, a0, zero
+// 0x010955a8: 0x10955a8: sw    ra, 28(sp)
+// 0x010955ac: 0x10955ac: bne   s1, zero, 0x10955bc addu  s0, a0, zero
 	ldloc 8
 	ldloc.1
 	stloc 9
-	brtrue L_1094f74
+	brtrue L_10955bc
 // --- basic block ---
-// 0x01094f6c: 0x1094f6c: lw    s1, 20(a0)
+// 0x010955b4: 0x10955b4: lw    s1, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -673,9 +673,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01094f70: 0x1094f70: sll   zero, zero, 0
-L_1094f74:
-// 0x01094f74: 0x1094f74: lw    a1, 128(s1)
+// 0x010955b8: 0x10955b8: sll   zero, zero, 0
+L_10955bc:
+// 0x010955bc: 0x10955bc: lw    a1, 128(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -684,36 +684,36 @@ L_1094f74:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01094f78: 0x1094f78: sll   zero, zero, 0
-// 0x01094f7c: 0x1094f7c: beq   a1, zero, 0x1094f8c lui   a0, 0x80000
+// 0x010955c0: 0x10955c0: sll   zero, zero, 0
+// 0x010955c4: 0x10955c4: beq   a1, zero, 0x10955d4 lui   a0, 0x80000
 	ldloc.2
 	ldc.i4 524288
 	stloc.1
-	brfalse L_1094f8c
+	brfalse L_10955d4
 // --- basic block ---
-// 0x01094f84: 0x1094f84: j	 0x1094f98 addiu a0, a0, 9716
+// 0x010955cc: 0x10955cc: j	 0x10955e0 addiu a0, a0, 10180
 	ldloc.1
-	ldc.i4 9716
+	ldc.i4 10180
 	add
 	stloc.1
-	br L_1094f98
+	br L_10955e0
 // --- basic block ---
-L_1094f8c:
-// 0x01094f8c: 0x1094f8c: lui   a1, 0x20000
+L_10955d4:
+// 0x010955d4: 0x10955d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01094f90: 0x1094f90: addiu a0, a0, 9716
+// 0x010955d8: 0x10955d8: addiu a0, a0, 10180
 	ldloc.1
-	ldc.i4 9716
+	ldc.i4 10180
 	add
 	stloc.1
-// 0x01094f94: 0x1094f94: addiu a1, a1, -3228
+// 0x010955dc: 0x10955dc: addiu a1, a1, -2764
 	ldloc.2
-	ldc.i4 -3228
+	ldc.i4 -2764
 	add
 	stloc.2
-L_1094f98:
-// 0x01094f98: 0x1094f98: jal   0x1001b68 sll   zero, zero, 0
+L_10955e0:
+// 0x010955e0: 0x10955e0: jal   0x1001b68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcpy_1001b68(int32,int32)
@@ -721,18 +721,18 @@ L_1094f98:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094fa0: 0x1094fa0: lui   v0, 0x80000
+// 0x010955e8: 0x10955e8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094fa4: 0x1094fa4: lui   v1, 0x1090000
+// 0x010955ec: 0x10955ec: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 7
-// 0x01094fa8: 0x1094fa8: addiu v0, v0, 9716
+// 0x010955f0: 0x10955f0: addiu v0, v0, 10180
 	ldloc 5
-	ldc.i4 9716
+	ldc.i4 10180
 	add
 	stloc 5
-// 0x01094fac: 0x1094fac: lw    a0, 8(s0)
+// 0x010955f4: 0x10955f4: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -741,15 +741,15 @@ L_1094f98:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094fb0: 0x1094fb0: addiu v1, v1, 19352
+// 0x010955f8: 0x10955f8: addiu v1, v1, 20960
 	ldloc 7
-	ldc.i4 19352
+	ldc.i4 20960
 	add
 	stloc 7
-// 0x01094fb4: 0x1094fb4: addu  a1, v0, zero
+// 0x010955fc: 0x10955fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01094fb8: 0x1094fb8: jal   0x103ff3c sw    v1, 52(v0)
+// 0x01095600: 0x1095600: jal   0x103ff4c sw    v1, 52(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -763,12 +763,12 @@ L_1094f98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094fc0: 0x1094fc0: lw    a1, 132(s1)
+// 0x01095608: 0x1095608: lw    a1, 132(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -777,36 +777,36 @@ L_1094f98:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01094fc4: 0x1094fc4: sll   zero, zero, 0
-// 0x01094fc8: 0x1094fc8: beq   a1, zero, 0x1094fd8 lui   a0, 0x80000
+// 0x0109560c: 0x109560c: sll   zero, zero, 0
+// 0x01095610: 0x1095610: beq   a1, zero, 0x1095620 lui   a0, 0x80000
 	ldloc.2
 	ldc.i4 524288
 	stloc.1
-	brfalse L_1094fd8
+	brfalse L_1095620
 // --- basic block ---
-// 0x01094fd0: 0x1094fd0: j	 0x1094fe4 addiu a0, a0, 9660
+// 0x01095618: 0x1095618: j	 0x109562c addiu a0, a0, 10124
 	ldloc.1
-	ldc.i4 9660
+	ldc.i4 10124
 	add
 	stloc.1
-	br L_1094fe4
+	br L_109562c
 // --- basic block ---
-L_1094fd8:
-// 0x01094fd8: 0x1094fd8: lui   a1, 0x20000
+L_1095620:
+// 0x01095620: 0x1095620: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01094fdc: 0x1094fdc: addiu a0, a0, 9660
+// 0x01095624: 0x1095624: addiu a0, a0, 10124
 	ldloc.1
-	ldc.i4 9660
+	ldc.i4 10124
 	add
 	stloc.1
-// 0x01094fe0: 0x1094fe0: addiu a1, a1, -3216
+// 0x01095628: 0x1095628: addiu a1, a1, -2752
 	ldloc.2
-	ldc.i4 -3216
+	ldc.i4 -2752
 	add
 	stloc.2
-L_1094fe4:
-// 0x01094fe4: 0x1094fe4: jal   0x1001b68 sll   zero, zero, 0
+L_109562c:
+// 0x0109562c: 0x109562c: jal   0x1001b68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcpy_1001b68(int32,int32)
@@ -814,18 +814,18 @@ L_1094fe4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01094fec: 0x1094fec: lui   v0, 0x80000
+// 0x01095634: 0x1095634: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01094ff0: 0x1094ff0: lui   v1, 0x1090000
+// 0x01095638: 0x1095638: lui   v1, 0x1090000
 	ldc.i4 17367040
 	stloc 7
-// 0x01094ff4: 0x1094ff4: addiu v0, v0, 9660
+// 0x0109563c: 0x109563c: addiu v0, v0, 10124
 	ldloc 5
-	ldc.i4 9660
+	ldc.i4 10124
 	add
 	stloc 5
-// 0x01094ff8: 0x1094ff8: lw    a0, 8(s0)
+// 0x01095640: 0x1095640: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -834,15 +834,15 @@ L_1094fe4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01094ffc: 0x1094ffc: addiu v1, v1, 19168
+// 0x01095644: 0x1095644: addiu v1, v1, 20776
 	ldloc 7
-	ldc.i4 19168
+	ldc.i4 20776
 	add
 	stloc 7
-// 0x01095000: 0x1095000: addu  a1, v0, zero
+// 0x01095648: 0x1095648: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01095004: 0x1095004: jal   0x103ff84 sw    v1, 52(v0)
+// 0x0109564c: 0x109564c: jal   0x103ff94 sw    v1, 52(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -856,13 +856,13 @@ L_1094fe4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_set_left_soft_key_103ff84(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_set_left_soft_key_103ff94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109500c: 0x109500c: lw    ra, 28(sp)
-// 0x01095010: 0x1095010: lw    s1, 24(sp)
+// 0x01095654: 0x1095654: lw    ra, 28(sp)
+// 0x01095658: 0x1095658: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -871,7 +871,7 @@ L_1094fe4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095014: 0x1095014: lw    s0, 20(sp)
+// 0x0109565c: 0x109565c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -880,7 +880,7 @@ L_1094fe4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095018: 0x1095018: jr    ra addiu sp, sp, 32
+// 0x01095660: 0x1095660: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -892,7 +892,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_refresh_current_softkeys_1095020(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_refresh_current_softkeys_1095668(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
@@ -933,12 +933,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095020: 0x1095020: addiu sp, sp, -32
+// 0x01095668: 0x1095668: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01095024: 0x1095024: sw    s1, 24(sp)
+// 0x0109566c: 0x109566c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -947,10 +947,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01095028: 0x1095028: lui   s1, 0x80000
+// 0x01095670: 0x1095670: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109502c: 0x109502c: sw    s0, 20(sp)
+// 0x01095674: 0x1095674: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -959,21 +959,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01095030: 0x1095030: lw    s0, 9644(s1)
+// 0x01095678: 0x1095678: lw    s0, 10108(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x01095034: 0x1095034: sll   zero, zero, 0
-// 0x01095038: 0x1095038: beq   s0, zero, 0x1095064 sw    ra, 28(sp)
+// 0x0109567c: 0x109567c: sll   zero, zero, 0
+// 0x01095680: 0x1095680: beq   s0, zero, 0x10956ac sw    ra, 28(sp)
 	ldloc 6
-	brfalse L_1095064
+	brfalse L_10956ac
 // --- basic block ---
-// 0x01095040: 0x1095040: lw    a0, 8(s0)
+// 0x01095688: 0x1095688: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -982,18 +982,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095044: 0x1095044: jal   0x103fdbc sll   zero, zero, 0
+// 0x0109568c: 0x109568c: jal   0x103fdcc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109504c: 0x109504c: lw    a0, 8(s0)
+// 0x01095694: 0x1095694: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1002,40 +1002,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095050: 0x1095050: jal   0x103fe04 sll   zero, zero, 0
+// 0x01095698: 0x1095698: jal   0x103fe14 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_left_soft_key_103fe04(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_left_soft_key_103fe14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01095058: 0x1095058: lw    a0, 9644(s1)
+// 0x010956a0: 0x10956a0: lw    a0, 10108(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109505c: 0x109505c: jal   0x1094f50 sll   zero, zero, 0
+// 0x010956a4: 0x10956a4: jal   0x1095598 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::set_softkeys_1094f50(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::set_softkeys_1095598(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-L_1095064:
-// 0x01095064: 0x1095064: lw    ra, 28(sp)
-// 0x01095068: 0x1095068: lw    s1, 24(sp)
+L_10956ac:
+// 0x010956ac: 0x10956ac: lw    ra, 28(sp)
+// 0x010956b0: 0x10956b0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1044,7 +1044,7 @@ L_1095064:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109506c: 0x109506c: lw    s0, 20(sp)
+// 0x010956b4: 0x10956b4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1053,7 +1053,7 @@ L_1095064:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01095070: 0x1095070: jr    ra addiu sp, sp, 32
+// 0x010956b8: 0x10956b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1065,7 +1065,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_dialog_drag_end_1095078(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_drag_end_10956c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s5,int32 s3,int32 s6,int32 s4,int32 ra)
@@ -1121,12 +1121,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095078: 0x1095078: addiu sp, sp, -64
+// 0x010956c0: 0x10956c0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0109507c: 0x109507c: sw    s1, 36(sp)
+// 0x010956c4: 0x10956c4: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1135,10 +1135,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01095080: 0x1095080: lui   s1, 0x80000
+// 0x010956c8: 0x10956c8: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01095084: 0x1095084: sw    s0, 32(sp)
+// 0x010956cc: 0x10956cc: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1147,16 +1147,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095088: 0x1095088: lw    s0, 9644(s1)
+// 0x010956d0: 0x10956d0: lw    s0, 10108(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109508c: 0x109508c: sw    s2, 40(sp)
+// 0x010956d4: 0x10956d4: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1165,8 +1165,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01095090: 0x1095090: sw    ra, 60(sp)
-// 0x01095094: 0x1095094: sw    s6, 56(sp)
+// 0x010956d8: 0x10956d8: sw    ra, 60(sp)
+// 0x010956dc: 0x10956dc: sw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1175,7 +1175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01095098: 0x1095098: sw    s5, 52(sp)
+// 0x010956e0: 0x10956e0: sw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1184,7 +1184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109509c: 0x109509c: sw    s4, 48(sp)
+// 0x010956e4: 0x10956e4: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1193,7 +1193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010950a0: 0x10950a0: sw    s3, 44(sp)
+// 0x010956e8: 0x10956e8: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1202,16 +1202,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010950a4: 0x10950a4: addu  s2, a0, zero
+// 0x010956ec: 0x10956ec: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010950a8: 0x10950a8: beq   s0, zero, 0x1095258 addu  v0, zero, zero
+// 0x010956f0: 0x10956f0: beq   s0, zero, 0x10958a0 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1095258
+	brfalse L_10958a0
 // --- basic block ---
-// 0x010950b0: 0x10950b0: lw    v0, 20(s0)
+// 0x010956f8: 0x10956f8: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1220,8 +1220,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010950b4: 0x10950b4: sll   zero, zero, 0
-// 0x010950b8: 0x10950b8: lw    v1, 48(v0)
+// 0x010956fc: 0x10956fc: sll   zero, zero, 0
+// 0x01095700: 0x1095700: lw    v1, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1230,51 +1230,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010950bc: 0x10950bc: lui   v0, 0x10000
+// 0x01095704: 0x1095704: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010950c0: 0x10950c0: and   v0, v1, v0
+// 0x01095708: 0x1095708: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x010950c4: 0x10950c4: beq   v0, zero, 0x10950e0 lui   v0, 0x80000
+// 0x0109570c: 0x109570c: beq   v0, zero, 0x1095728 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_10950e0
+	brfalse L_1095728
 // --- basic block ---
-// 0x010950cc: 0x10950cc: lw    v0, 9772(v0)
+// 0x01095714: 0x1095714: lw    v0, 10236(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldelem.i4
 	stloc 5
-// 0x010950d0: 0x10950d0: sll   zero, zero, 0
-// 0x010950d4: 0x10950d4: addiu v0, v0, 1
+// 0x01095718: 0x1095718: sll   zero, zero, 0
+// 0x0109571c: 0x109571c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010950d8: 0x10950d8: j	 0x1095258 sltu  v0, zero, v0
+// 0x01095720: 0x1095720: j	 0x10958a0 sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	br L_1095258
+	br L_10958a0
 // --- basic block ---
-L_10950e0:
-// 0x010950e0: 0x10950e0: jal   0x104f6b0 sll   zero, zero, 0
+L_1095728:
+// 0x01095728: 0x1095728: jal   0x104f6c0 sll   zero, zero, 0
 	ldloc.0
-	call int32 Cibyl59::roadmap_time_get_millis_104f6b0(int32)
+	call int32 Cibyl59::roadmap_time_get_millis_104f6c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010950e8: 0x10950e8: sw    v0, 76(s0)
+// 0x01095730: 0x1095730: sw    v0, 76(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1283,7 +1283,7 @@ L_10950e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010950ec: 0x10950ec: lw    a0, 4(s2)
+// 0x01095734: 0x1095734: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1292,14 +1292,14 @@ L_10950e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010950f0: 0x10950f0: lw    v1, 0(s2)
+// 0x01095738: 0x1095738: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010950f4: 0x10950f4: lw    v0, 24(s0)
+// 0x0109573c: 0x109573c: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1308,7 +1308,7 @@ L_10950e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010950f8: 0x10950f8: sw    a0, 68(s0)
+// 0x01095740: 0x1095740: sw    a0, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1317,7 +1317,7 @@ L_10950e0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010950fc: 0x10950fc: beq   v0, zero, 0x1095254 sw    v1, 64(s0)
+// 0x01095744: 0x1095744: beq   v0, zero, 0x109589c sw    v1, 64(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -1327,9 +1327,9 @@ L_10950e0:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1095254
+	brfalse L_109589c
 // --- basic block ---
-// 0x01095104: 0x1095104: lw    v0, 208(v0)
+// 0x0109574c: 0x109574c: lw    v0, 208(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1338,12 +1338,12 @@ L_10950e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095108: 0x1095108: sll   zero, zero, 0
-// 0x0109510c: 0x109510c: beq   v0, zero, 0x1095128 sll   zero, zero, 0
+// 0x01095750: 0x1095750: sll   zero, zero, 0
+// 0x01095754: 0x1095754: beq   v0, zero, 0x1095770 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1095128
+	brfalse L_1095770
 // --- basic block ---
-// 0x01095114: 0x1095114: lw    a0, 20(s0)
+// 0x0109575c: 0x109575c: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1352,7 +1352,7 @@ L_10950e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095118: 0x1095118: jalr  v0 addu  a1, s2, zero
+// 0x01095760: 0x1095760: jalr  v0 addu  a1, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
@@ -1366,11 +1366,11 @@ L_10950e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095120: 0x1095120: j	 0x1095258 sll   zero, zero, 0
-	br L_1095258
+// 0x01095768: 0x1095768: j	 0x10958a0 sll   zero, zero, 0
+	br L_10958a0
 // --- basic block ---
-L_1095128:
-// 0x01095128: 0x1095128: lw    v0, 96(s0)
+L_1095770:
+// 0x01095770: 0x1095770: lw    v0, 96(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1379,26 +1379,26 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109512c: 0x109512c: sll   zero, zero, 0
-// 0x01095130: 0x1095130: beq   v0, zero, 0x1095258 addiu v0, zero, 1
+// 0x01095774: 0x1095774: sll   zero, zero, 0
+// 0x01095778: 0x1095778: beq   v0, zero, 0x10958a0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_1095258
+	brfalse L_10958a0
 // --- basic block ---
-// 0x01095138: 0x1095138: lw    v0, 9644(s1)
+// 0x01095780: 0x1095780: lw    v0, 10108(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109513c: 0x109513c: lui   a1, 0x10000
+// 0x01095784: 0x1095784: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01095140: 0x1095140: lw    a0, 20(v0)
+// 0x01095788: 0x1095788: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1407,12 +1407,12 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095144: 0x1095144: addiu a1, a1, 6916
+// 0x0109578c: 0x109578c: addiu a1, a1, 6912
 	ldloc.2
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
-// 0x01095148: 0x1095148: lw    s3, 4(s2)
+// 0x01095790: 0x1095790: lw    s3, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1421,7 +1421,7 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109514c: 0x109514c: lw    s4, 88(s0)
+// 0x01095794: 0x1095794: lw    s4, 88(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1430,7 +1430,7 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01095150: 0x1095150: lw    s2, 52(s0)
+// 0x01095798: 0x1095798: lw    s2, 52(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1439,7 +1439,7 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095154: 0x1095154: jal   0x109b304 lui   s1, 0xf0000
+// 0x0109579c: 0x109579c: jal   0x109b94c lui   s1, 0xf0000
 	ldc.i4 983040
 	stloc 10
 	ldloc.0
@@ -1447,21 +1447,21 @@ L_1095128:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109515c: 0x109515c: lw    v1, -30072(s1)
+// 0x010957a4: 0x10957a4: lw    v1, -29608(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095160: 0x1095160: lw    v0, 36(v0)
+// 0x010957a8: 0x10957a8: lw    v0, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1470,7 +1470,7 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095164: 0x1095164: lw    a0, 24(s0)
+// 0x010957ac: 0x10957ac: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1479,17 +1479,17 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095168: 0x1095168: addiu s5, v1, -4
+// 0x010957b0: 0x10957b0: addiu s5, v1, -4
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 11
-// 0x0109516c: 0x109516c: subu  s5, s5, v0
+// 0x010957b4: 0x10957b4: subu  s5, s5, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 11
-// 0x01095170: 0x1095170: jal   0x1098ff8 addiu s6, sp, 16
+// 0x010957b8: 0x10957b8: jal   0x1099640 addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1499,12 +1499,12 @@ L_1095128:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095178: 0x1095178: lw    a0, 24(s0)
+// 0x010957c0: 0x10957c0: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1513,10 +1513,10 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109517c: 0x109517c: addu  a1, s6, zero
+// 0x010957c4: 0x10957c4: addu  a1, s6, zero
 	ldloc 13
 	stloc.2
-// 0x01095180: 0x1095180: jal   0x1099350 addu  a2, zero, zero
+// 0x010957c8: 0x10957c8: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1524,21 +1524,21 @@ L_1095128:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095188: 0x1095188: lw    v0, -30072(s1)
+// 0x010957d0: 0x10957d0: lw    v0, -29608(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109518c: 0x109518c: lw    v1, 20(sp)
+// 0x010957d4: 0x10957d4: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1547,19 +1547,19 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095190: 0x1095190: addiu v0, v0, 1
+// 0x010957d8: 0x10957d8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01095194: 0x1095194: bne   v1, v0, 0x10951b4 addiu v0, zero, -1
+// 0x010957dc: 0x10957dc: bne   v1, v0, 0x10957fc addiu v0, zero, -1
 	ldloc 7
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	bne.un L_10951b4
+	bne.un L_10957fc
 // --- basic block ---
-// 0x0109519c: 0x109519c: lw    a0, 24(s0)
+// 0x010957e4: 0x10957e4: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1568,15 +1568,15 @@ L_1095128:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010951a0: 0x10951a0: addu  a1, s6, zero
+// 0x010957e8: 0x10957e8: addu  a1, s6, zero
 	ldloc 13
 	stloc.2
-// 0x010951a4: 0x10951a4: addiu a2, sp, 24
+// 0x010957ec: 0x10957ec: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010951a8: 0x10951a8: sw    v0, 28(sp)
+// 0x010957f0: 0x10957f0: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1585,7 +1585,7 @@ L_1095128:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010951ac: 0x10951ac: jal   0x1099350 sw    v0, 24(sp)
+// 0x010957f4: 0x10957f4: jal   0x1099998 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1599,13 +1599,13 @@ L_1095128:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10951b4:
-// 0x010951b4: 0x10951b4: lw    v0, 20(sp)
+L_10957fc:
+// 0x010957fc: 0x10957fc: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1614,36 +1614,36 @@ L_10951b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010951b8: 0x10951b8: sll   zero, zero, 0
-// 0x010951bc: 0x10951bc: slt   v1, v0, s5
+// 0x01095800: 0x1095800: sll   zero, zero, 0
+// 0x01095804: 0x1095804: slt   v1, v0, s5
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 7
-// 0x010951c0: 0x10951c0: bne   v1, zero, 0x1095238 addu  s3, s4, s3
+// 0x01095808: 0x1095808: bne   v1, zero, 0x1095880 addu  s3, s4, s3
 	ldloc 7
 	ldloc 14
 	ldloc 12
 	add
 	stloc 12
-	brtrue L_1095238
+	brtrue L_1095880
 // --- basic block ---
-// 0x010951c8: 0x10951c8: subu  s2, s3, s2
+// 0x01095810: 0x1095810: subu  s2, s3, s2
 	ldloc 12
 	ldloc 9
 	sub
 	stloc 9
-// 0x010951cc: 0x10951cc: addu  a0, s2, v0
+// 0x01095814: 0x1095814: addu  a0, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc.1
-// 0x010951d0: 0x10951d0: slt   a0, s5, a0
+// 0x01095818: 0x1095818: slt   a0, s5, a0
 	ldloc 11
 	ldloc.1
 	clt
 	stloc.1
-// 0x010951d4: 0x10951d4: lw    v1, 24(s0)
+// 0x0109581c: 0x109581c: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1652,13 +1652,13 @@ L_10951b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010951d8: 0x10951d8: beq   a0, zero, 0x109520c lui   a0, 0xf0000
+// 0x01095820: 0x1095820: beq   a0, zero, 0x1095854 lui   a0, 0xf0000
 	ldloc.1
 	ldc.i4 983040
 	stloc.1
-	brfalse L_109520c
+	brfalse L_1095854
 // --- basic block ---
-// 0x010951e0: 0x10951e0: lw    a0, 20(s0)
+// 0x01095828: 0x1095828: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1667,7 +1667,7 @@ L_10951b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010951e4: 0x10951e4: lw    v0, 124(v1)
+// 0x0109582c: 0x109582c: lw    v0, 124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1676,7 +1676,7 @@ L_10951b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010951e8: 0x10951e8: lw    v1, 12(a0)
+// 0x01095830: 0x1095830: lw    v1, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1685,12 +1685,12 @@ L_10951b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010951ec: 0x10951ec: addu  v0, s2, v0
+// 0x01095834: 0x1095834: addu  v0, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x010951f0: 0x10951f0: lw    v1, 36(v1)
+// 0x01095838: 0x1095838: lw    v1, 36(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1699,21 +1699,21 @@ L_10951b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010951f4: 0x10951f4: sll   zero, zero, 0
-// 0x010951f8: 0x10951f8: slt   v0, v1, v0
+// 0x0109583c: 0x109583c: sll   zero, zero, 0
+// 0x01095840: 0x1095840: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010951fc: 0x10951fc: bne   v0, zero, 0x1095238 sll   zero, zero, 0
+// 0x01095844: 0x1095844: bne   v0, zero, 0x1095880 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1095238
+	brtrue L_1095880
 // --- basic block ---
-// 0x01095204: 0x1095204: j	 0x109523c sll   zero, zero, 0
-	br L_109523c
+// 0x0109584c: 0x109584c: j	 0x1095884 sll   zero, zero, 0
+	br L_1095884
 // --- basic block ---
-L_109520c:
-// 0x0109520c: 0x109520c: lw    v1, 124(v1)
+L_1095854:
+// 0x01095854: 0x1095854: lw    v1, 124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1722,53 +1722,53 @@ L_109520c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095210: 0x1095210: sll   zero, zero, 0
-// 0x01095214: 0x1095214: addu  v1, v0, v1
+// 0x01095858: 0x1095858: sll   zero, zero, 0
+// 0x0109585c: 0x109585c: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01095218: 0x1095218: lw    a0, -30072(a0)
+// 0x01095860: 0x1095860: lw    a0, -29608(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109521c: 0x109521c: addu  v1, v1, s2
+// 0x01095864: 0x1095864: addu  v1, v1, s2
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-// 0x01095220: 0x1095220: slt   v1, v1, a0
+// 0x01095868: 0x1095868: slt   v1, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x01095224: 0x1095224: beq   v1, zero, 0x109523c sll   zero, zero, 0
+// 0x0109586c: 0x109586c: beq   v1, zero, 0x1095884 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109523c
+	brfalse L_1095884
 // --- basic block ---
-// 0x0109522c: 0x109522c: subu  s2, s5, v0
+// 0x01095874: 0x1095874: subu  s2, s5, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 9
-// 0x01095230: 0x1095230: j	 0x109523c addiu s2, s2, -2
+// 0x01095878: 0x1095878: j	 0x1095884 addiu s2, s2, -2
 	ldloc 9
 	ldc.i4.s -2
 	add
 	stloc 9
-	br L_109523c
+	br L_1095884
 // --- basic block ---
-L_1095238:
-// 0x01095238: 0x1095238: addu  s2, zero, zero
+L_1095880:
+// 0x01095880: 0x1095880: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_109523c:
-// 0x0109523c: 0x109523c: lw    a0, 24(s0)
+L_1095884:
+// 0x01095884: 0x1095884: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1777,10 +1777,10 @@ L_109523c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095240: 0x1095240: addu  a1, zero, zero
+// 0x01095888: 0x1095888: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01095244: 0x1095244: jal   0x1098f84 addu  a2, s2, zero
+// 0x0109588c: 0x109588c: jal   0x10995cc addu  a2, s2, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -1788,12 +1788,12 @@ L_109523c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109524c: 0x109524c: jal   0x109483c sw    s2, 88(s0)
+// 0x01095894: 0x1095894: jal   0x1094e60 sw    s2, 88(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1807,18 +1807,18 @@ L_109523c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1095254:
-// 0x01095254: 0x1095254: addiu v0, zero, 1
+L_109589c:
+// 0x0109589c: 0x109589c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1095258:
-// 0x01095258: 0x1095258: lw    ra, 60(sp)
-// 0x0109525c: 0x109525c: lw    s6, 56(sp)
+L_10958a0:
+// 0x010958a0: 0x10958a0: lw    ra, 60(sp)
+// 0x010958a4: 0x10958a4: lw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1827,7 +1827,7 @@ L_1095258:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01095260: 0x1095260: lw    s5, 52(sp)
+// 0x010958a8: 0x10958a8: lw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1836,7 +1836,7 @@ L_1095258:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01095264: 0x1095264: lw    s4, 48(sp)
+// 0x010958ac: 0x10958ac: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1845,7 +1845,7 @@ L_1095258:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01095268: 0x1095268: lw    s3, 44(sp)
+// 0x010958b0: 0x10958b0: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1854,7 +1854,7 @@ L_1095258:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109526c: 0x109526c: lw    s2, 40(sp)
+// 0x010958b4: 0x10958b4: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1863,7 +1863,7 @@ L_1095258:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095270: 0x1095270: lw    s1, 36(sp)
+// 0x010958b8: 0x10958b8: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1872,7 +1872,7 @@ L_1095258:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01095274: 0x1095274: lw    s0, 32(sp)
+// 0x010958bc: 0x10958bc: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1881,7 +1881,7 @@ L_1095258:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095278: 0x1095278: jr    ra addiu sp, sp, 64
+// 0x010958c0: 0x10958c0: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1893,7 +1893,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 keep_dragging_1095280(int32,int32,int32,int32,int32)
+.method public static int32 keep_dragging_10958c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 ra)
@@ -1931,28 +1931,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095280: 0x1095280: lui   v0, 0x80000
+// 0x010958c8: 0x10958c8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095284: 0x1095284: lw    v0, 9644(v0)
+// 0x010958cc: 0x10958cc: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095288: 0x1095288: addiu sp, sp, -32
+// 0x010958d0: 0x10958d0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109528c: 0x109528c: beq   v0, zero, 0x1095338 sw    ra, 28(sp)
+// 0x010958d4: 0x10958d4: beq   v0, zero, 0x1095980 sw    ra, 28(sp)
 	ldloc 5
-	brfalse L_1095338
+	brfalse L_1095980
 // --- basic block ---
-// 0x01095294: 0x1095294: lw    v1, 92(v0)
+// 0x010958dc: 0x10958dc: lw    v1, 92(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1961,7 +1961,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095298: 0x1095298: lw    a0, 48(v0)
+// 0x010958e0: 0x10958e0: lw    a0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1970,7 +1970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109529c: 0x109529c: lw    a1, 52(v0)
+// 0x010958e4: 0x10958e4: lw    a1, 52(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1979,7 +1979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010952a0: 0x10952a0: lw    a2, 68(v0)
+// 0x010958e8: 0x10958e8: lw    a2, 68(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1988,17 +1988,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010952a4: 0x10952a4: addiu v1, v1, 1
+// 0x010958ec: 0x10958ec: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010952a8: 0x10952a8: subu  a2, a2, a1
+// 0x010958f0: 0x10958f0: subu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.3
-// 0x010952ac: 0x10952ac: sw    v1, 92(v0)
+// 0x010958f4: 0x10958f4: sw    v1, 92(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2007,7 +2007,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010952b0: 0x10952b0: sw    a0, 16(sp)
+// 0x010958f8: 0x10958f8: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2016,7 +2016,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010952b4: 0x10952b4: lw    a1, 80(v0)
+// 0x010958fc: 0x10958fc: lw    a1, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2025,7 +2025,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010952b8: 0x10952b8: lw    a0, 60(v0)
+// 0x01095900: 0x1095900: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2034,72 +2034,72 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010952bc: 0x10952bc: blez  a2, 0x10952e4 addiu a2, zero, 3
+// 0x01095904: 0x1095904: blez  a2, 0x109592c addiu a2, zero, 3
 	ldloc.3
 	ldc.i4.3
 	stloc.3
 	ldc.i4.s 0
-	ble L_10952e4
+	ble L_109592c
 // --- basic block ---
-// 0x010952c4: 0x10952c4: div   a1, a2
+// 0x0109590c: 0x109590c: div   a1, a2
 	ldloc.2
 	ldloc.3
 	div
 	stloc 8
-// 0x010952c8: 0x10952c8: mflo  lo
+// 0x01095910: 0x1095910: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010952cc: 0x10952cc: sll   zero, zero, 0
-// 0x010952d0: 0x10952d0: sll   zero, zero, 0
-// 0x010952d4: 0x10952d4: mult  a1, v1
+// 0x01095914: 0x1095914: sll   zero, zero, 0
+// 0x01095918: 0x1095918: sll   zero, zero, 0
+// 0x0109591c: 0x109591c: mult  a1, v1
 	ldloc.2
 	ldloc 7
 	mul
 	stloc 8
-// 0x010952d8: 0x10952d8: mflo  lo
+// 0x01095920: 0x1095920: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x010952dc: 0x10952dc: j	 0x1095304 addu  a0, a2, a0
+// 0x01095924: 0x1095924: j	 0x109594c addu  a0, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-	br L_1095304
+	br L_109594c
 // --- basic block ---
-L_10952e4:
-// 0x010952e4: 0x10952e4: addiu a2, zero, -3
+L_109592c:
+// 0x0109592c: 0x109592c: addiu a2, zero, -3
 	ldc.i4.s -3
 	stloc.3
-// 0x010952e8: 0x10952e8: div   a1, a2
+// 0x01095930: 0x1095930: div   a1, a2
 	ldloc.2
 	ldloc.3
 	div
 	stloc 8
-// 0x010952ec: 0x10952ec: mflo  lo
+// 0x01095934: 0x1095934: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x010952f0: 0x10952f0: sll   zero, zero, 0
-// 0x010952f4: 0x10952f4: sll   zero, zero, 0
-// 0x010952f8: 0x10952f8: mult  a2, v1
+// 0x01095938: 0x1095938: sll   zero, zero, 0
+// 0x0109593c: 0x109593c: sll   zero, zero, 0
+// 0x01095940: 0x1095940: mult  a2, v1
 	ldloc.3
 	ldloc 7
 	mul
 	stloc 8
-// 0x010952fc: 0x10952fc: mflo  lo
+// 0x01095944: 0x1095944: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01095300: 0x1095300: addu  a0, a1, a0
+// 0x01095948: 0x1095948: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-L_1095304:
-// 0x01095304: 0x1095304: slti  v1, v1, 16
+L_109594c:
+// 0x0109594c: 0x109594c: slti  v1, v1, 16
 	ldloc 7
 	ldc.i4.s 16
 	clt
 	stloc 7
-// 0x01095308: 0x1095308: sw    a0, 20(sp)
+// 0x01095950: 0x1095950: sw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2108,30 +2108,30 @@ L_1095304:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109530c: 0x109530c: beq   v1, zero, 0x1095324 addiu a0, sp, 16
+// 0x01095954: 0x1095954: beq   v1, zero, 0x109596c addiu a0, sp, 16
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	brfalse L_1095324
+	brfalse L_109596c
 // --- basic block ---
-// 0x01095314: 0x1095314: jal   0x1094c1c sll   zero, zero, 0
+// 0x0109595c: 0x109595c: jal   0x1095264 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_drag_motion_1094c1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_drag_motion_1095264(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109531c: 0x109531c: j	 0x1095338 sll   zero, zero, 0
-	br L_1095338
+// 0x01095964: 0x1095964: j	 0x1095980 sll   zero, zero, 0
+	br L_1095980
 // --- basic block ---
-L_1095324:
-// 0x01095324: 0x1095324: jal   0x1095078 sw    zero, 84(v0)
+L_109596c:
+// 0x0109596c: 0x109596c: jal   0x10956c0 sw    zero, 84(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2145,17 +2145,17 @@ L_1095324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_drag_end_1095078(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_drag_end_10956c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109532c: 0x109532c: lui   a0, 0x1090000
+// 0x01095974: 0x1095974: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01095330: 0x1095330: jal   0x104fd00 addiu a0, a0, 21120
+// 0x01095978: 0x1095978: jal   0x104fd10 addiu a0, a0, 22728
 	ldloc.1
-	ldc.i4 21120
+	ldc.i4 22728
 	add
 	stloc.1
 	ldloc.0
@@ -2163,15 +2163,15 @@ L_1095324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1095338:
-// 0x01095338: 0x1095338: lw    ra, 28(sp)
-// 0x0109533c: 0x109533c: sll   zero, zero, 0
-// 0x01095340: 0x1095340: jr    ra addiu sp, sp, 32
+L_1095980:
+// 0x01095980: 0x1095980: lw    ra, 28(sp)
+// 0x01095984: 0x1095984: sll   zero, zero, 0
+// 0x01095988: 0x1095988: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2183,7 +2183,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_drag_start_1095348(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_drag_start_1095990(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -2221,15 +2221,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095348: 0x1095348: addiu sp, sp, -24
+// 0x01095990: 0x1095990: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109534c: 0x109534c: lui   v0, 0x80000
+// 0x01095994: 0x1095994: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095350: 0x1095350: sw    s0, 16(sp)
+// 0x01095998: 0x1095998: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2238,26 +2238,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01095354: 0x1095354: lw    s0, 9644(v0)
+// 0x0109599c: 0x109599c: lw    s0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095358: 0x1095358: sw    ra, 20(sp)
-// 0x0109535c: 0x109535c: addu  a1, a0, zero
+// 0x010959a0: 0x10959a0: sw    ra, 20(sp)
+// 0x010959a4: 0x10959a4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01095360: 0x1095360: beq   s0, zero, 0x1095414 addu  v0, zero, zero
+// 0x010959a8: 0x10959a8: beq   s0, zero, 0x1095a5c addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1095414
+	brfalse L_1095a5c
 // --- basic block ---
-// 0x01095368: 0x1095368: lw    a0, 20(s0)
+// 0x010959b0: 0x10959b0: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2266,10 +2266,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109536c: 0x109536c: lui   v0, 0x10000
+// 0x010959b4: 0x10959b4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01095370: 0x1095370: lw    v1, 48(a0)
+// 0x010959b8: 0x10959b8: lw    v1, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2278,42 +2278,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095374: 0x1095374: sll   zero, zero, 0
-// 0x01095378: 0x1095378: and   v0, v1, v0
+// 0x010959bc: 0x10959bc: sll   zero, zero, 0
+// 0x010959c0: 0x10959c0: and   v0, v1, v0
 	ldloc 8
 	ldloc 5
 	and
 	stloc 5
-// 0x0109537c: 0x109537c: beq   v0, zero, 0x1095398 lui   v0, 0x80000
+// 0x010959c4: 0x10959c4: beq   v0, zero, 0x10959e0 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1095398
+	brfalse L_10959e0
 // --- basic block ---
-// 0x01095384: 0x1095384: lw    v0, 9772(v0)
+// 0x010959cc: 0x10959cc: lw    v0, 10236(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095388: 0x1095388: sll   zero, zero, 0
-// 0x0109538c: 0x109538c: addiu v0, v0, 1
+// 0x010959d0: 0x10959d0: sll   zero, zero, 0
+// 0x010959d4: 0x10959d4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01095390: 0x1095390: j	 0x1095414 sltu  v0, zero, v0
+// 0x010959d8: 0x10959d8: j	 0x1095a5c sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	br L_1095414
+	br L_1095a5c
 // --- basic block ---
-L_1095398:
-// 0x01095398: 0x1095398: lw    v0, 24(s0)
+L_10959e0:
+// 0x010959e0: 0x10959e0: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2322,12 +2322,12 @@ L_1095398:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109539c: 0x109539c: sll   zero, zero, 0
-// 0x010953a0: 0x10953a0: beq   v0, zero, 0x10953c8 sll   zero, zero, 0
+// 0x010959e4: 0x10959e4: sll   zero, zero, 0
+// 0x010959e8: 0x10959e8: beq   v0, zero, 0x1095a10 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10953c8
+	brfalse L_1095a10
 // --- basic block ---
-// 0x010953a8: 0x10953a8: lw    v0, 204(v0)
+// 0x010959f0: 0x10959f0: lw    v0, 204(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2336,12 +2336,12 @@ L_1095398:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010953ac: 0x10953ac: sll   zero, zero, 0
-// 0x010953b0: 0x10953b0: beq   v0, zero, 0x10953c8 sll   zero, zero, 0
+// 0x010959f4: 0x10959f4: sll   zero, zero, 0
+// 0x010959f8: 0x10959f8: beq   v0, zero, 0x1095a10 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10953c8
+	brfalse L_1095a10
 // --- basic block ---
-// 0x010953b8: 0x10953b8: jalr  v0 sll   zero, zero, 0
+// 0x01095a00: 0x1095a00: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2353,18 +2353,18 @@ L_1095398:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010953c0: 0x10953c0: j	 0x1095414 sll   zero, zero, 0
-	br L_1095414
+// 0x01095a08: 0x1095a08: j	 0x1095a5c sll   zero, zero, 0
+	br L_1095a5c
 // --- basic block ---
-L_10953c8:
-// 0x010953c8: 0x10953c8: lw    v1, 0(a1)
+L_1095a10:
+// 0x01095a10: 0x1095a10: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010953cc: 0x10953cc: lw    v0, 4(a1)
+// 0x01095a14: 0x1095a14: lw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2373,7 +2373,7 @@ L_10953c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010953d0: 0x10953d0: sw    v1, 48(s0)
+// 0x01095a18: 0x1095a18: sw    v1, 48(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2382,7 +2382,7 @@ L_10953c8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010953d4: 0x10953d4: sw    v0, 52(s0)
+// 0x01095a1c: 0x1095a1c: sw    v0, 52(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2391,7 +2391,7 @@ L_10953c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010953d8: 0x10953d8: lw    v1, 4(a1)
+// 0x01095a20: 0x1095a20: lw    v1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2400,14 +2400,14 @@ L_10953c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010953dc: 0x10953dc: lw    v0, 0(a1)
+// 0x01095a24: 0x1095a24: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010953e0: 0x10953e0: sw    v1, 60(s0)
+// 0x01095a28: 0x1095a28: sw    v1, 60(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2416,7 +2416,7 @@ L_10953c8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010953e4: 0x10953e4: sw    v0, 56(s0)
+// 0x01095a2c: 0x1095a2c: sw    v0, 56(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2425,7 +2425,7 @@ L_10953c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010953e8: 0x10953e8: jal   0x104f6b0 sw    zero, 92(s0)
+// 0x01095a30: 0x1095a30: jal   0x104f6c0 sw    zero, 92(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2435,12 +2435,12 @@ L_10953c8:
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
-	call int32 Cibyl59::roadmap_time_get_millis_104f6b0(int32)
+	call int32 Cibyl59::roadmap_time_get_millis_104f6c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010953f0: 0x10953f0: lw    v1, 84(s0)
+// 0x01095a38: 0x1095a38: lw    v1, 84(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2449,7 +2449,7 @@ L_10953c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010953f4: 0x10953f4: sw    v0, 72(s0)
+// 0x01095a3c: 0x1095a3c: sw    v0, 72(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2458,18 +2458,18 @@ L_10953c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010953f8: 0x10953f8: beq   v1, zero, 0x1095414 addiu v0, zero, 1
+// 0x01095a40: 0x1095a40: beq   v1, zero, 0x1095a5c addiu v0, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc 5
-	brfalse L_1095414
+	brfalse L_1095a5c
 // --- basic block ---
-// 0x01095400: 0x1095400: lui   a0, 0x1090000
+// 0x01095a48: 0x1095a48: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01095404: 0x1095404: jal   0x104fd00 addiu a0, a0, 21120
+// 0x01095a4c: 0x1095a4c: jal   0x104fd10 addiu a0, a0, 22728
 	ldloc.1
-	ldc.i4 21120
+	ldc.i4 22728
 	add
 	stloc.1
 	ldloc.0
@@ -2477,12 +2477,12 @@ L_10953c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109540c: 0x109540c: sw    zero, 84(s0)
+// 0x01095a54: 0x1095a54: sw    zero, 84(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2491,12 +2491,12 @@ L_10953c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095410: 0x1095410: addiu v0, zero, 1
+// 0x01095a58: 0x1095a58: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1095414:
-// 0x01095414: 0x1095414: lw    ra, 20(sp)
-// 0x01095418: 0x1095418: lw    s0, 16(sp)
+L_1095a5c:
+// 0x01095a5c: 0x1095a5c: lw    ra, 20(sp)
+// 0x01095a60: 0x1095a60: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2505,7 +2505,7 @@ L_1095414:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109541c: 0x109541c: jr    ra addiu sp, sp, 24
+// 0x01095a64: 0x1095a64: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2517,7 +2517,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_pressed_1095424(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_pressed_1095a6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2561,12 +2561,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095424: 0x1095424: addiu sp, sp, -32
+// 0x01095a6c: 0x1095a6c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01095428: 0x1095428: sw    s2, 24(sp)
+// 0x01095a70: 0x1095a70: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2575,19 +2575,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109542c: 0x109542c: lui   s2, 0x80000
+// 0x01095a74: 0x1095a74: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01095430: 0x1095430: lw    v0, 9644(s2)
+// 0x01095a78: 0x1095a78: lw    v0, 10108(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095434: 0x1095434: sw    s1, 20(sp)
+// 0x01095a7c: 0x1095a7c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2596,7 +2596,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01095438: 0x1095438: lw    s1, 20(v0)
+// 0x01095a80: 0x1095a80: lw    s1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2605,7 +2605,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109543c: 0x109543c: sw    s0, 16(sp)
+// 0x01095a84: 0x1095a84: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2614,17 +2614,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095440: 0x1095440: addu  a1, a0, zero
+// 0x01095a88: 0x1095a88: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01095444: 0x1095444: addu  s0, a0, zero
+// 0x01095a8c: 0x1095a8c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01095448: 0x1095448: addiu a2, zero, 1
+// 0x01095a90: 0x1095a90: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0109544c: 0x109544c: sw    ra, 28(sp)
-// 0x01095450: 0x1095450: jal   0x1099bbc addu  a0, s1, zero
+// 0x01095a94: 0x1095a94: sw    ra, 28(sp)
+// 0x01095a98: 0x1095a98: jal   0x109a204 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2632,42 +2632,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_find_by_pos_1099bbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_find_by_pos_109a204(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095458: 0x1095458: beq   v0, zero, 0x1095484 lui   v1, 0x80000
+// 0x01095aa0: 0x1095aa0: beq   v0, zero, 0x1095acc lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 7
-	brfalse L_1095484
+	brfalse L_1095acc
 // --- basic block ---
-// 0x01095460: 0x1095460: lw    v0, 0(s0)
+// 0x01095aa8: 0x1095aa8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01095464: 0x1095464: addiu a0, v1, 9772
+// 0x01095aac: 0x1095aac: addiu a0, v1, 10236
 	ldloc 7
-	ldc.i4 9772
+	ldc.i4 10236
 	add
 	stloc.1
-// 0x01095468: 0x1095468: sw    v0, 9772(v1)
+// 0x01095ab0: 0x1095ab0: sw    v0, 10236(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109546c: 0x109546c: lui   v0, 0x80000
+// 0x01095ab4: 0x1095ab4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095470: 0x1095470: lw    a1, 4(s0)
+// 0x01095ab8: 0x1095ab8: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2676,17 +2676,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01095474: 0x1095474: lw    v0, 9656(v0)
+// 0x01095abc: 0x1095abc: lw    v0, 10120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2414
+	ldc.i4 2530
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095478: 0x1095478: sll   zero, zero, 0
-// 0x0109547c: 0x109547c: bne   v0, zero, 0x10954a4 sw    a1, 4(a0)
+// 0x01095ac0: 0x1095ac0: sll   zero, zero, 0
+// 0x01095ac4: 0x1095ac4: bne   v0, zero, 0x1095aec sw    a1, 4(a0)
 	ldloc 5
 	ldloc 6
 	ldloc.1
@@ -2696,10 +2696,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	brtrue L_10954a4
+	brtrue L_1095aec
 // --- basic block ---
-L_1095484:
-// 0x01095484: 0x1095484: lw    a0, 16(s1)
+L_1095acc:
+// 0x01095acc: 0x1095acc: lw    a0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2708,23 +2708,23 @@ L_1095484:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095488: 0x1095488: lui   a1, 0x20000
+// 0x01095ad0: 0x1095ad0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109548c: 0x109548c: addiu v0, zero, -1
+// 0x01095ad4: 0x1095ad4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01095490: 0x1095490: addiu a1, a1, -3196
+// 0x01095ad8: 0x1095ad8: addiu a1, a1, -2732
 	ldloc.2
-	ldc.i4 -3196
+	ldc.i4 -2732
 	add
 	stloc.2
-// 0x01095494: 0x1095494: jal   0x1000420 sw    v0, 9772(v1)
+// 0x01095adc: 0x1095adc: jal   0x1000420 sw    v0, 10236(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2443
+	ldc.i4 2559
 	add
 	ldloc 5
 	stelem.i4
@@ -2738,25 +2738,25 @@ L_1095484:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109549c: 0x109549c: j	 0x1095500 sltu  v1, zero, v0
+// 0x01095ae4: 0x1095ae4: j	 0x1095b48 sltu  v1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 7
-	br L_1095500
+	br L_1095b48
 // --- basic block ---
-L_10954a4:
-// 0x010954a4: 0x10954a4: lw    v0, 9644(s2)
+L_1095aec:
+// 0x01095aec: 0x1095aec: lw    v0, 10108(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x010954a8: 0x10954a8: sll   zero, zero, 0
-// 0x010954ac: 0x10954ac: lw    v1, 24(v0)
+// 0x01095af0: 0x1095af0: sll   zero, zero, 0
+// 0x01095af4: 0x1095af4: lw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2765,12 +2765,12 @@ L_10954a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010954b0: 0x10954b0: sll   zero, zero, 0
-// 0x010954b4: 0x10954b4: beq   v1, zero, 0x10954d4 sll   zero, zero, 0
+// 0x01095af8: 0x1095af8: sll   zero, zero, 0
+// 0x01095afc: 0x1095afc: beq   v1, zero, 0x1095b1c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10954d4
+	brfalse L_1095b1c
 // --- basic block ---
-// 0x010954bc: 0x10954bc: lw    v0, 96(v0)
+// 0x01095b04: 0x1095b04: lw    v0, 96(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2779,14 +2779,14 @@ L_10954a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010954c0: 0x10954c0: sll   zero, zero, 0
-// 0x010954c4: 0x10954c4: beq   v0, zero, 0x10954d8 lui   v0, 0x80000
+// 0x01095b08: 0x1095b08: sll   zero, zero, 0
+// 0x01095b0c: 0x1095b0c: beq   v0, zero, 0x1095b20 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_10954d8
+	brfalse L_1095b20
 // --- basic block ---
-// 0x010954cc: 0x10954cc: jal   0x1095348 addu  a0, s0, zero
+// 0x01095b14: 0x1095b14: jal   0x1095990 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2794,27 +2794,27 @@ L_10954a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_drag_start_1095348(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_drag_start_1095990(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10954d4:
-// 0x010954d4: 0x10954d4: lui   v0, 0x80000
+L_1095b1c:
+// 0x01095b1c: 0x1095b1c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_10954d8:
-// 0x010954d8: 0x10954d8: lw    v0, 9644(v0)
+L_1095b20:
+// 0x01095b20: 0x1095b20: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x010954dc: 0x10954dc: sll   zero, zero, 0
-// 0x010954e0: 0x10954e0: lw    a0, 20(v0)
+// 0x01095b24: 0x1095b24: sll   zero, zero, 0
+// 0x01095b28: 0x1095b28: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2823,7 +2823,7 @@ L_10954d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010954e4: 0x10954e4: jal   0x1099b08 addu  a1, s0, zero
+// 0x01095b2c: 0x1095b2c: jal   0x109a150 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2831,37 +2831,37 @@ L_10954d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_pointer_down_1099b08(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_pointer_down_109a150(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010954ec: 0x10954ec: beq   v0, zero, 0x1095500 addiu v1, zero, 1
+// 0x01095b34: 0x1095b34: beq   v0, zero, 0x1095b48 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_1095500
+	brfalse L_1095b48
 // --- basic block ---
-// 0x010954f4: 0x10954f4: jal   0x1021900 sll   zero, zero, 0
+// 0x01095b3c: 0x1095b3c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010954fc: 0x10954fc: addiu v1, zero, 1
+// 0x01095b44: 0x1095b44: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1095500:
-// 0x01095500: 0x1095500: lw    ra, 28(sp)
-// 0x01095504: 0x1095504: addu  v0, v1, zero
+L_1095b48:
+// 0x01095b48: 0x1095b48: lw    ra, 28(sp)
+// 0x01095b4c: 0x1095b4c: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x01095508: 0x1095508: lw    s2, 24(sp)
+// 0x01095b50: 0x1095b50: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2870,7 +2870,7 @@ L_1095500:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109550c: 0x109550c: lw    s1, 20(sp)
+// 0x01095b54: 0x1095b54: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2879,7 +2879,7 @@ L_1095500:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095510: 0x1095510: lw    s0, 16(sp)
+// 0x01095b58: 0x1095b58: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2888,7 +2888,7 @@ L_1095500:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095514: 0x1095514: jr    ra addiu sp, sp, 32
+// 0x01095b5c: 0x1095b5c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2900,7 +2900,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_sort_tab_order_109551c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_sort_tab_order_1095b64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -2938,12 +2938,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109551c: 0x109551c: addiu sp, sp, -24
+// 0x01095b64: 0x1095b64: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01095520: 0x1095520: sw    s0, 16(sp)
+// 0x01095b68: 0x1095b68: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2952,14 +2952,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01095524: 0x1095524: sw    ra, 20(sp)
-// 0x01095528: 0x1095528: beq   a0, zero, 0x1095568 addu  s0, a0, zero
+// 0x01095b6c: 0x1095b6c: sw    ra, 20(sp)
+// 0x01095b70: 0x1095b70: beq   a0, zero, 0x1095bb0 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1095568
+	brfalse L_1095bb0
 // --- basic block ---
-// 0x01095530: 0x1095530: lw    v0, 36(a0)
+// 0x01095b78: 0x1095b78: lw    v0, 36(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2968,12 +2968,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01095534: 0x1095534: sll   zero, zero, 0
-// 0x01095538: 0x1095538: bne   v0, zero, 0x1095568 sll   zero, zero, 0
+// 0x01095b7c: 0x1095b7c: sll   zero, zero, 0
+// 0x01095b80: 0x1095b80: bne   v0, zero, 0x1095bb0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1095568
+	brtrue L_1095bb0
 // --- basic block ---
-// 0x01095540: 0x1095540: lw    a1, 20(a0)
+// 0x01095b88: 0x1095b88: lw    a1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2982,21 +2982,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01095544: 0x1095544: jal   0x109faf8 sll   zero, zero, 0
+// 0x01095b8c: 0x1095b8c: jal   0x10a0140 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_tab_order_109faf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_tab_order_10a0140(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109554c: 0x109554c: addiu v1, zero, 1
+// 0x01095b94: 0x1095b94: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01095550: 0x1095550: sw    v1, 36(s0)
+// 0x01095b98: 0x1095b98: sw    v1, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3005,7 +3005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095554: 0x1095554: sw    v0, 28(s0)
+// 0x01095b9c: 0x1095b9c: sw    v0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3014,7 +3014,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01095558: 0x1095558: beq   v0, zero, 0x1095568 sw    v0, 32(s0)
+// 0x01095ba0: 0x1095ba0: beq   v0, zero, 0x1095bb0 sw    v0, 32(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -3024,9 +3024,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_1095568
+	brfalse L_1095bb0
 // --- basic block ---
-// 0x01095560: 0x1095560: jal   0x109faac addu  a0, v0, zero
+// 0x01095ba8: 0x1095ba8: jal   0x10a00f4 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3034,14 +3034,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1095568:
-// 0x01095568: 0x1095568: lw    ra, 20(sp)
-// 0x0109556c: 0x109556c: lw    s0, 16(sp)
+L_1095bb0:
+// 0x01095bb0: 0x1095bb0: lw    ra, 20(sp)
+// 0x01095bb4: 0x1095bb4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3050,7 +3050,7 @@ L_1095568:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095570: 0x1095570: jr    ra addiu sp, sp, 24
+// 0x01095bb8: 0x1095bb8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3062,7 +3062,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_dialog_sort_tab_order_by_gui_position_1095578(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_sort_tab_order_by_gui_position_1095bc0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3103,12 +3103,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095578: 0x1095578: addiu sp, sp, -32
+// 0x01095bc0: 0x1095bc0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109557c: 0x109557c: sw    s0, 20(sp)
+// 0x01095bc4: 0x1095bc4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3117,20 +3117,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095580: 0x1095580: lui   s0, 0x80000
+// 0x01095bc8: 0x1095bc8: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01095584: 0x1095584: lw    a0, 9644(s0)
+// 0x01095bcc: 0x1095bcc: lw    a0, 10108(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095588: 0x1095588: sw    ra, 28(sp)
-// 0x0109558c: 0x109558c: beq   a0, zero, 0x10955f0 sw    s1, 24(sp)
+// 0x01095bd0: 0x1095bd0: sw    ra, 28(sp)
+// 0x01095bd4: 0x1095bd4: beq   a0, zero, 0x1095c38 sw    s1, 24(sp)
 	ldloc.1
 	ldloc 5
 	ldloc.0
@@ -3140,9 +3140,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_10955f0
+	brfalse L_1095c38
 // --- basic block ---
-// 0x01095594: 0x1095594: lw    v0, 40(a0)
+// 0x01095bdc: 0x1095bdc: lw    v0, 40(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3151,12 +3151,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01095598: 0x1095598: sll   zero, zero, 0
-// 0x0109559c: 0x109559c: beq   v0, zero, 0x10955f0 sll   zero, zero, 0
+// 0x01095be0: 0x1095be0: sll   zero, zero, 0
+// 0x01095be4: 0x1095be4: beq   v0, zero, 0x1095c38 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10955f0
+	brfalse L_1095c38
 // --- basic block ---
-// 0x010955a4: 0x10955a4: lw    v0, 44(a0)
+// 0x01095bec: 0x1095bec: lw    v0, 44(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3165,33 +3165,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010955a8: 0x10955a8: sll   zero, zero, 0
-// 0x010955ac: 0x10955ac: bne   v0, zero, 0x10955f0 sll   zero, zero, 0
+// 0x01095bf0: 0x1095bf0: sll   zero, zero, 0
+// 0x01095bf4: 0x1095bf4: bne   v0, zero, 0x1095c38 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10955f0
+	brtrue L_1095c38
 // --- basic block ---
-// 0x010955b4: 0x10955b4: jal   0x109551c sll   zero, zero, 0
+// 0x01095bfc: 0x1095bfc: jal   0x1095b64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_109551c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_1095b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010955bc: 0x10955bc: lw    v0, 9644(s0)
+// 0x01095c04: 0x1095c04: lw    v0, 10108(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x010955c0: 0x10955c0: sll   zero, zero, 0
-// 0x010955c4: 0x10955c4: lw    a0, 32(v0)
+// 0x01095c08: 0x1095c08: sll   zero, zero, 0
+// 0x01095c0c: 0x1095c0c: lw    a0, 32(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3200,7 +3200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010955c8: 0x10955c8: lw    s1, 28(v0)
+// 0x01095c10: 0x1095c10: lw    s1, 28(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3209,30 +3209,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010955cc: 0x10955cc: jal   0x109f69c sll   zero, zero, 0
+// 0x01095c14: 0x1095c14: jal   0x109fce4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_gui_tab_order_109f69c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_gui_tab_order_109fce4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010955d4: 0x10955d4: lw    v1, 9644(s0)
+// 0x01095c1c: 0x1095c1c: lw    v1, 10108(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x010955d8: 0x10955d8: addiu a0, zero, 1
+// 0x01095c20: 0x1095c20: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010955dc: 0x10955dc: sw    a0, 44(v1)
+// 0x01095c24: 0x1095c24: sw    a0, 44(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3241,7 +3241,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010955e0: 0x10955e0: beq   v0, s1, 0x10955f0 sw    v0, 28(v1)
+// 0x01095c28: 0x1095c28: beq   v0, s1, 0x1095c38 sw    v0, 28(v1)
 	ldloc 6
 	ldloc 9
 	ldloc 5
@@ -3252,9 +3252,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	beq  L_10955f0
+	beq  L_1095c38
 // --- basic block ---
-// 0x010955e8: 0x10955e8: jal   0x109faac addu  a0, v0, zero
+// 0x01095c30: 0x1095c30: jal   0x10a00f4 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3262,14 +3262,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10955f0:
-// 0x010955f0: 0x10955f0: lw    ra, 28(sp)
-// 0x010955f4: 0x10955f4: lw    s1, 24(sp)
+L_1095c38:
+// 0x01095c38: 0x1095c38: lw    ra, 28(sp)
+// 0x01095c3c: 0x1095c3c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3278,7 +3278,7 @@ L_10955f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010955f8: 0x10955f8: lw    s0, 20(sp)
+// 0x01095c40: 0x1095c40: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3287,7 +3287,7 @@ L_10955f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010955fc: 0x10955fc: jr    ra addiu sp, sp, 32
+// 0x01095c44: 0x1095c44: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3299,7 +3299,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 draw_dialog_1095604(int32,int32,int32,int32,int32)
+.method public static int32 draw_dialog_1095c4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -3343,12 +3343,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095604: 0x1095604: addiu sp, sp, -56
+// 0x01095c4c: 0x1095c4c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01095608: 0x1095608: sw    s0, 40(sp)
+// 0x01095c50: 0x1095c50: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3357,8 +3357,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109560c: 0x109560c: sw    ra, 52(sp)
-// 0x01095610: 0x1095610: sw    s2, 48(sp)
+// 0x01095c54: 0x1095c54: sw    ra, 52(sp)
+// 0x01095c58: 0x1095c58: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3367,7 +3367,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01095614: 0x1095614: sw    s1, 44(sp)
+// 0x01095c5c: 0x1095c5c: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3376,16 +3376,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095618: 0x1095618: addu  s0, a0, zero
+// 0x01095c60: 0x1095c60: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109561c: 0x109561c: beq   a0, zero, 0x10957c0 addu  v0, zero, zero
+// 0x01095c64: 0x1095c64: beq   a0, zero, 0x1095e08 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10957c0
+	brfalse L_1095e08
 // --- basic block ---
-// 0x01095624: 0x1095624: lw    v0, 20(a0)
+// 0x01095c6c: 0x1095c6c: lw    v0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3394,7 +3394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095628: 0x1095628: sw    zero, 24(sp)
+// 0x01095c70: 0x1095c70: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3403,7 +3403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109562c: 0x109562c: lw    v1, 48(v0)
+// 0x01095c74: 0x1095c74: lw    v1, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3412,37 +3412,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095630: 0x1095630: lui   v0, 0x10000
+// 0x01095c78: 0x1095c78: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01095634: 0x1095634: and   v0, v1, v0
+// 0x01095c7c: 0x1095c7c: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01095638: 0x1095638: beq   v0, zero, 0x1095650 sll   zero, zero, 0
+// 0x01095c80: 0x1095c80: beq   v0, zero, 0x1095c98 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1095650
+	brfalse L_1095c98
 // --- basic block ---
-// 0x01095640: 0x1095640: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+// 0x01095c88: 0x1095c88: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095648: 0x1095648: j	 0x1095654 addiu v0, v0, 1
+// 0x01095c90: 0x1095c90: j	 0x1095c9c addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	br L_1095654
+	br L_1095c9c
 // --- basic block ---
-L_1095650:
-// 0x01095650: 0x1095650: addiu v0, zero, 1
+L_1095c98:
+// 0x01095c98: 0x1095c98: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1095654:
-// 0x01095654: 0x1095654: sw    v0, 28(sp)
+L_1095c9c:
+// 0x01095c9c: 0x1095c9c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3451,36 +3451,36 @@ L_1095654:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01095658: 0x1095658: lui   v0, 0xf0000
+// 0x01095ca0: 0x1095ca0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0109565c: 0x109565c: lui   v1, 0xf0000
+// 0x01095ca4: 0x1095ca4: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x01095660: 0x1095660: lw    v0, -30068(v0)
+// 0x01095ca8: 0x1095ca8: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095664: 0x1095664: lw    s1, -30072(v1)
+// 0x01095cac: 0x1095cac: lw    s1, -29608(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095668: 0x1095668: addiu v0, v0, -1
+// 0x01095cb0: 0x1095cb0: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0109566c: 0x109566c: sw    v0, 32(sp)
+// 0x01095cb4: 0x1095cb4: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3489,17 +3489,17 @@ L_1095654:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01095670: 0x1095670: jal   0x1042430 addiu s1, s1, -1
+// 0x01095cb8: 0x1095cb8: jal   0x1042440 addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095678: 0x1095678: lw    a0, 20(s0)
+// 0x01095cc0: 0x1095cc0: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3508,20 +3508,20 @@ L_1095654:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109567c: 0x109567c: subu  v0, s1, v0
+// 0x01095cc4: 0x1095cc4: subu  v0, s1, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 5
-// 0x01095680: 0x1095680: addiu a1, sp, 24
+// 0x01095cc8: 0x1095cc8: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01095684: 0x1095684: addu  a2, zero, zero
+// 0x01095ccc: 0x1095ccc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01095688: 0x1095688: jal   0x109adc0 sw    v0, 36(sp)
+// 0x01095cd0: 0x1095cd0: jal   0x109b408 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3535,12 +3535,12 @@ L_1095654:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_109adc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_109b408(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095690: 0x1095690: lw    a0, 20(s0)
+// 0x01095cd8: 0x1095cd8: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3549,8 +3549,8 @@ L_1095654:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095694: 0x1095694: sll   zero, zero, 0
-// 0x01095698: 0x1095698: lw    v0, 48(a0)
+// 0x01095cdc: 0x1095cdc: sll   zero, zero, 0
+// 0x01095ce0: 0x1095ce0: lw    v0, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3559,17 +3559,17 @@ L_1095654:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109569c: 0x109569c: sll   zero, zero, 0
-// 0x010956a0: 0x10956a0: andi  v0, v0, 8192
+// 0x01095ce4: 0x1095ce4: sll   zero, zero, 0
+// 0x01095ce8: 0x1095ce8: andi  v0, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	and
 	stloc 5
-// 0x010956a4: 0x10956a4: beq   v0, zero, 0x1095754 sll   zero, zero, 0
+// 0x01095cec: 0x1095cec: beq   v0, zero, 0x1095d9c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1095754
+	brfalse L_1095d9c
 // --- basic block ---
-// 0x010956ac: 0x10956ac: lw    v0, 24(s0)
+// 0x01095cf4: 0x1095cf4: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3578,12 +3578,12 @@ L_1095654:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010956b0: 0x10956b0: sll   zero, zero, 0
-// 0x010956b4: 0x10956b4: beq   v0, zero, 0x1095754 sll   zero, zero, 0
+// 0x01095cf8: 0x1095cf8: sll   zero, zero, 0
+// 0x01095cfc: 0x1095cfc: beq   v0, zero, 0x1095d9c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1095754
+	brfalse L_1095d9c
 // --- basic block ---
-// 0x010956bc: 0x10956bc: lw    v0, 44(v0)
+// 0x01095d04: 0x1095d04: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3592,17 +3592,17 @@ L_1095654:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010956c0: 0x10956c0: sll   zero, zero, 0
-// 0x010956c4: 0x10956c4: bgez  v0, 0x1095754 lui   a1, 0x10000
+// 0x01095d08: 0x1095d08: sll   zero, zero, 0
+// 0x01095d0c: 0x1095d0c: bgez  v0, 0x1095d9c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
 	ldc.i4.s 0
-	bge L_1095754
+	bge L_1095d9c
 // --- basic block ---
-// 0x010956cc: 0x10956cc: jal   0x109b304 addiu a1, a1, 6916
+// 0x01095d14: 0x1095d14: jal   0x109b94c addiu a1, a1, 6912
 	ldloc.2
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
 	ldloc.0
@@ -3610,23 +3610,23 @@ L_1095654:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010956d4: 0x10956d4: addu  a0, v0, zero
+// 0x01095d1c: 0x1095d1c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010956d8: 0x10956d8: addiu a1, sp, 16
+// 0x01095d20: 0x1095d20: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010956dc: 0x10956dc: addu  a2, zero, zero
+// 0x01095d24: 0x1095d24: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010956e0: 0x10956e0: jal   0x1099350 addu  s1, v0, zero
+// 0x01095d28: 0x1095d28: jal   0x1099998 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -3634,33 +3634,33 @@ L_1095654:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010956e8: 0x10956e8: jal   0x1020318 sll   zero, zero, 0
+// 0x01095d30: 0x1095d30: jal   0x1020328 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::is_screen_wide_1020318(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::is_screen_wide_1020328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010956f0: 0x10956f0: bne   v0, zero, 0x1095708 sll   zero, zero, 0
+// 0x01095d38: 0x1095d38: bne   v0, zero, 0x1095d50 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1095708
+	brtrue L_1095d50
 // --- basic block ---
-// 0x010956f8: 0x10956f8: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+// 0x01095d40: 0x1095d40: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095700: 0x1095700: j	 0x109570c sw    v0, 28(sp)
+// 0x01095d48: 0x1095d48: j	 0x1095d54 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3669,10 +3669,10 @@ L_1095654:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109570c
+	br L_1095d54
 // --- basic block ---
-L_1095708:
-// 0x01095708: 0x1095708: sw    zero, 28(sp)
+L_1095d50:
+// 0x01095d50: 0x1095d50: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3681,8 +3681,8 @@ L_1095708:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_109570c:
-// 0x0109570c: 0x109570c: lw    v0, 20(sp)
+L_1095d54:
+// 0x01095d54: 0x1095d54: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3691,7 +3691,7 @@ L_109570c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095710: 0x1095710: lw    v1, 28(sp)
+// 0x01095d58: 0x1095d58: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3700,22 +3700,22 @@ L_109570c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095714: 0x1095714: addiu s2, sp, 24
+// 0x01095d5c: 0x1095d5c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01095718: 0x1095718: addu  v1, v1, v0
+// 0x01095d60: 0x1095d60: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0109571c: 0x109571c: addiu v1, v1, -1
+// 0x01095d64: 0x1095d64: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01095720: 0x1095720: lw    v0, 184(s1)
+// 0x01095d68: 0x1095d68: lw    v0, 184(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3724,16 +3724,16 @@ L_109570c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095724: 0x1095724: addu  a0, s1, zero
+// 0x01095d6c: 0x1095d6c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01095728: 0x1095728: addu  a1, s2, zero
+// 0x01095d70: 0x1095d70: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0109572c: 0x109572c: addu  a2, zero, zero
+// 0x01095d74: 0x1095d74: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01095730: 0x1095730: jalr  v0 sw    v1, 36(sp)
+// 0x01095d78: 0x1095d78: jalr  v0 sw    v1, 36(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3753,7 +3753,7 @@ L_109570c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095738: 0x1095738: lw    v0, 28(sp)
+// 0x01095d80: 0x1095d80: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3762,7 +3762,7 @@ L_109570c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109573c: 0x109573c: lw    a0, 12(s1)
+// 0x01095d84: 0x1095d84: lw    a0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3771,18 +3771,18 @@ L_109570c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095740: 0x1095740: addiu v0, v0, 1
+// 0x01095d88: 0x1095d88: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01095744: 0x1095744: addu  a1, s2, zero
+// 0x01095d8c: 0x1095d8c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01095748: 0x1095748: addu  a2, zero, zero
+// 0x01095d90: 0x1095d90: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109574c: 0x109574c: jal   0x109adc0 sw    v0, 28(sp)
+// 0x01095d94: 0x1095d94: jal   0x109b408 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3796,13 +3796,13 @@ L_109570c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_109adc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_109b408(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1095754:
-// 0x01095754: 0x1095754: jal   0x10430c8 addiu a0, zero, 1
+L_1095d9c:
+// 0x01095d9c: 0x1095d9c: jal   0x10430d8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3810,12 +3810,12 @@ L_1095754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_draw_bottom_bar_10430c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_draw_bottom_bar_10430d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109575c: 0x109575c: lw    v0, 20(s0)
+// 0x01095da4: 0x1095da4: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3824,8 +3824,8 @@ L_1095754:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095760: 0x1095760: sll   zero, zero, 0
-// 0x01095764: 0x1095764: lw    v0, 48(v0)
+// 0x01095da8: 0x1095da8: sll   zero, zero, 0
+// 0x01095dac: 0x1095dac: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3834,17 +3834,17 @@ L_1095754:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095768: 0x1095768: sll   zero, zero, 0
-// 0x0109576c: 0x109576c: andi  v0, v0, 8192
+// 0x01095db0: 0x1095db0: sll   zero, zero, 0
+// 0x01095db4: 0x1095db4: andi  v0, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	and
 	stloc 5
-// 0x01095770: 0x1095770: beq   v0, zero, 0x10957b0 sll   zero, zero, 0
+// 0x01095db8: 0x1095db8: beq   v0, zero, 0x1095df8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10957b0
+	brfalse L_1095df8
 // --- basic block ---
-// 0x01095778: 0x1095778: lw    v0, 24(s0)
+// 0x01095dc0: 0x1095dc0: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3853,12 +3853,12 @@ L_1095754:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109577c: 0x109577c: sll   zero, zero, 0
-// 0x01095780: 0x1095780: beq   v0, zero, 0x10957b0 sll   zero, zero, 0
+// 0x01095dc4: 0x1095dc4: sll   zero, zero, 0
+// 0x01095dc8: 0x1095dc8: beq   v0, zero, 0x1095df8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10957b0
+	brfalse L_1095df8
 // --- basic block ---
-// 0x01095788: 0x1095788: lw    v0, 44(v0)
+// 0x01095dd0: 0x1095dd0: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3867,28 +3867,28 @@ L_1095754:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109578c: 0x109578c: sll   zero, zero, 0
-// 0x01095790: 0x1095790: bgez  v0, 0x10957b0 sll   zero, zero, 0
+// 0x01095dd4: 0x1095dd4: sll   zero, zero, 0
+// 0x01095dd8: 0x1095dd8: bgez  v0, 0x1095df8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_10957b0
+	bge L_1095df8
 // --- basic block ---
-// 0x01095798: 0x1095798: jal   0x1020318 sll   zero, zero, 0
+// 0x01095de0: 0x1095de0: jal   0x1020328 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::is_screen_wide_1020318(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::is_screen_wide_1020328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010957a0: 0x10957a0: bne   v0, zero, 0x10957b0 sll   zero, zero, 0
+// 0x01095de8: 0x1095de8: bne   v0, zero, 0x1095df8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10957b0
+	brtrue L_1095df8
 // --- basic block ---
-// 0x010957a8: 0x10957a8: jal   0x1043240 addiu a0, zero, 1
+// 0x01095df0: 0x1095df0: jal   0x1043250 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3896,13 +3896,13 @@ L_1095754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_draw_top_bar_1043240(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_draw_top_bar_1043250(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10957b0:
-// 0x010957b0: 0x10957b0: jal   0x109551c addu  a0, s0, zero
+L_1095df8:
+// 0x01095df8: 0x1095df8: jal   0x1095b64 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3910,25 +3910,25 @@ L_10957b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_109551c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_1095b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010957b8: 0x10957b8: jal   0x1095578 sll   zero, zero, 0
+// 0x01095e00: 0x1095e00: jal   0x1095bc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_by_gui_position_1095578(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_by_gui_position_1095bc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10957c0:
-// 0x010957c0: 0x10957c0: lw    ra, 52(sp)
-// 0x010957c4: 0x10957c4: lw    s2, 48(sp)
+L_1095e08:
+// 0x01095e08: 0x1095e08: lw    ra, 52(sp)
+// 0x01095e0c: 0x1095e0c: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3937,7 +3937,7 @@ L_10957c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010957c8: 0x10957c8: lw    s1, 44(sp)
+// 0x01095e10: 0x1095e10: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3946,7 +3946,7 @@ L_10957c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010957cc: 0x10957cc: lw    s0, 40(sp)
+// 0x01095e14: 0x1095e14: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3955,7 +3955,7 @@ L_10957c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010957d0: 0x10957d0: jr    ra addiu sp, sp, 56
+// 0x01095e18: 0x1095e18: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3967,7 +3967,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_recalculate_10957d8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_recalculate_1095e20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -4005,13 +4005,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010957d8: 0x10957d8: addiu sp, sp, -24
+// 0x01095e20: 0x1095e20: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010957dc: 0x10957dc: sw    ra, 20(sp)
-// 0x010957e0: 0x10957e0: beq   a0, zero, 0x10957f8 sw    s0, 16(sp)
+// 0x01095e24: 0x1095e24: sw    ra, 20(sp)
+// 0x01095e28: 0x1095e28: beq   a0, zero, 0x1095e40 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 7
 	ldloc.0
@@ -4021,46 +4021,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10957f8
+	brfalse L_1095e40
 // --- basic block ---
-// 0x010957e8: 0x10957e8: jal   0x1094118 sll   zero, zero, 0
+// 0x01095e30: 0x1095e30: jal   0x109473c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_1094118(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_109473c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010957f0: 0x10957f0: j	 0x1095800 addu  s0, v0, zero
+// 0x01095e38: 0x1095e38: j	 0x1095e48 addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-	br L_1095800
+	br L_1095e48
 // --- basic block ---
-L_10957f8:
-// 0x010957f8: 0x10957f8: lui   v0, 0x80000
+L_1095e40:
+// 0x01095e40: 0x1095e40: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010957fc: 0x10957fc: lw    s0, 9644(v0)
+// 0x01095e44: 0x1095e44: lw    s0, 10108(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-L_1095800:
-// 0x01095800: 0x1095800: jal   0x10991f0 addiu a0, zero, 1
+L_1095e48:
+// 0x01095e48: 0x1095e48: jal   0x1099838 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_recalculate_10991f0(int32)
+	call int32 Cibyl114::ssd_widget_set_recalculate_1099838(int32)
 	stloc 5
 // --- basic block ---
-// 0x01095808: 0x1095808: jal   0x1095604 addu  a0, s0, zero
+// 0x01095e50: 0x1095e50: jal   0x1095c4c addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4068,20 +4068,20 @@ L_1095800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::draw_dialog_1095604(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::draw_dialog_1095c4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095810: 0x1095810: jal   0x10991f0 addu  a0, zero, zero
+// 0x01095e58: 0x1095e58: jal   0x1099838 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_recalculate_10991f0(int32)
+	call int32 Cibyl114::ssd_widget_set_recalculate_1099838(int32)
 	stloc 5
 // --- basic block ---
-// 0x01095818: 0x1095818: lw    ra, 20(sp)
-// 0x0109581c: 0x109581c: lw    s0, 16(sp)
+// 0x01095e60: 0x1095e60: lw    ra, 20(sp)
+// 0x01095e64: 0x1095e64: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4090,7 +4090,7 @@ L_1095800:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01095820: 0x1095820: jr    ra addiu sp, sp, 24
+// 0x01095e68: 0x1095e68: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4102,7 +4102,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_draw_prev_1095828(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_draw_prev_1095e70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4137,28 +4137,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095828: 0x1095828: lui   v0, 0x80000
+// 0x01095e70: 0x1095e70: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109582c: 0x109582c: lw    v0, 9644(v0)
+// 0x01095e74: 0x1095e74: lw    v0, 10108(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095830: 0x1095830: addiu sp, sp, -24
+// 0x01095e78: 0x1095e78: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01095834: 0x1095834: beq   v0, zero, 0x1095864 sw    ra, 20(sp)
+// 0x01095e7c: 0x1095e7c: beq   v0, zero, 0x1095eac sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1095864
+	brfalse L_1095eac
 // --- basic block ---
-// 0x0109583c: 0x109583c: lw    v1, 20(v0)
+// 0x01095e84: 0x1095e84: lw    v1, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4167,8 +4167,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01095840: 0x1095840: sll   zero, zero, 0
-// 0x01095844: 0x1095844: lw    a0, 48(v1)
+// 0x01095e88: 0x1095e88: sll   zero, zero, 0
+// 0x01095e8c: 0x1095e8c: lw    a0, 48(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4177,19 +4177,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095848: 0x1095848: lui   v1, 0x10000
+// 0x01095e90: 0x1095e90: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0109584c: 0x109584c: and   v1, a0, v1
+// 0x01095e94: 0x1095e94: and   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	and
 	stloc 6
-// 0x01095850: 0x1095850: beq   v1, zero, 0x1095864 sll   zero, zero, 0
+// 0x01095e98: 0x1095e98: beq   v1, zero, 0x1095eac sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1095864
+	brfalse L_1095eac
 // --- basic block ---
-// 0x01095858: 0x1095858: lw    a0, 4(v0)
+// 0x01095ea0: 0x1095ea0: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4198,21 +4198,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109585c: 0x109585c: jal   0x1095604 sll   zero, zero, 0
+// 0x01095ea4: 0x1095ea4: jal   0x1095c4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::draw_dialog_1095604(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::draw_dialog_1095c4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1095864:
-// 0x01095864: 0x1095864: lw    ra, 20(sp)
-// 0x01095868: 0x1095868: sll   zero, zero, 0
-// 0x0109586c: 0x109586c: jr    ra addiu sp, sp, 24
+L_1095eac:
+// 0x01095eac: 0x1095eac: lw    ra, 20(sp)
+// 0x01095eb0: 0x1095eb0: sll   zero, zero, 0
+// 0x01095eb4: 0x1095eb4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4224,7 +4224,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_draw_now_1095874(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_draw_now_1095ebc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4259,38 +4259,38 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095874: 0x1095874: lui   v0, 0x80000
+// 0x01095ebc: 0x1095ebc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095878: 0x1095878: lw    a0, 9644(v0)
+// 0x01095ec0: 0x1095ec0: lw    a0, 10108(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109587c: 0x109587c: addiu sp, sp, -24
+// 0x01095ec4: 0x1095ec4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01095880: 0x1095880: sw    ra, 20(sp)
-// 0x01095884: 0x1095884: jal   0x1095604 sll   zero, zero, 0
+// 0x01095ec8: 0x1095ec8: sw    ra, 20(sp)
+// 0x01095ecc: 0x1095ecc: jal   0x1095c4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::draw_dialog_1095604(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::draw_dialog_1095c4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109588c: 0x109588c: lw    ra, 20(sp)
-// 0x01095890: 0x1095890: sll   zero, zero, 0
-// 0x01095894: 0x1095894: jr    ra addiu sp, sp, 24
+// 0x01095ed4: 0x1095ed4: lw    ra, 20(sp)
+// 0x01095ed8: 0x1095ed8: sll   zero, zero, 0
+// 0x01095edc: 0x1095edc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4302,7 +4302,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_sort_tab_order_current_109589c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_sort_tab_order_current_1095ee4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4337,38 +4337,38 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109589c: 0x109589c: lui   v0, 0x80000
+// 0x01095ee4: 0x1095ee4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010958a0: 0x10958a0: lw    a0, 9644(v0)
+// 0x01095ee8: 0x1095ee8: lw    a0, 10108(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x010958a4: 0x10958a4: addiu sp, sp, -24
+// 0x01095eec: 0x1095eec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010958a8: 0x10958a8: sw    ra, 20(sp)
-// 0x010958ac: 0x10958ac: jal   0x109551c sll   zero, zero, 0
+// 0x01095ef0: 0x1095ef0: sw    ra, 20(sp)
+// 0x01095ef4: 0x1095ef4: jal   0x1095b64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_109551c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_1095b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010958b4: 0x10958b4: lw    ra, 20(sp)
-// 0x010958b8: 0x10958b8: sll   zero, zero, 0
-// 0x010958bc: 0x10958bc: jr    ra addiu sp, sp, 24
+// 0x01095efc: 0x1095efc: lw    ra, 20(sp)
+// 0x01095f00: 0x1095f00: sll   zero, zero, 0
+// 0x01095f04: 0x1095f04: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4380,7 +4380,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_change_text_10958c4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_change_text_1095f0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -4418,27 +4418,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010958c4: 0x10958c4: lui   v0, 0x80000
+// 0x01095f0c: 0x1095f0c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010958c8: 0x10958c8: lw    v1, 9644(v0)
+// 0x01095f10: 0x1095f10: lw    v1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x010958cc: 0x10958cc: addiu sp, sp, -24
+// 0x01095f14: 0x1095f14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010958d0: 0x10958d0: addu  v0, a0, zero
+// 0x01095f18: 0x1095f18: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010958d4: 0x10958d4: lw    a0, 20(v1)
+// 0x01095f1c: 0x1095f1c: lw    a0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4447,7 +4447,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010958d8: 0x10958d8: sw    s0, 16(sp)
+// 0x01095f20: 0x1095f20: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4456,11 +4456,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010958dc: 0x10958dc: addu  s0, a1, zero
+// 0x01095f24: 0x1095f24: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010958e0: 0x10958e0: sw    ra, 20(sp)
-// 0x010958e4: 0x10958e4: jal   0x109b304 addu  a1, v0, zero
+// 0x01095f28: 0x1095f28: sw    ra, 20(sp)
+// 0x01095f2c: 0x1095f2c: jal   0x109b94c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4468,18 +4468,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010958ec: 0x10958ec: beq   v0, zero, 0x10958fc addu  a0, v0, zero
+// 0x01095f34: 0x1095f34: beq   v0, zero, 0x1095f44 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_10958fc
+	brfalse L_1095f44
 // --- basic block ---
-// 0x010958f4: 0x10958f4: jal   0x1097e5c addu  a1, s0, zero
+// 0x01095f3c: 0x1095f3c: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4487,14 +4487,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10958fc:
-// 0x010958fc: 0x10958fc: lw    ra, 20(sp)
-// 0x01095900: 0x1095900: lw    s0, 16(sp)
+L_1095f44:
+// 0x01095f44: 0x1095f44: lw    ra, 20(sp)
+// 0x01095f48: 0x1095f48: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4503,7 +4503,7 @@ L_10958fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095904: 0x1095904: jr    ra addiu sp, sp, 24
+// 0x01095f4c: 0x1095f4c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4515,7 +4515,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_change_button_109590c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_change_button_1095f54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -4553,27 +4553,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109590c: 0x109590c: lui   v0, 0x80000
+// 0x01095f54: 0x1095f54: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095910: 0x1095910: lw    v1, 9644(v0)
+// 0x01095f58: 0x1095f58: lw    v1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095914: 0x1095914: addiu sp, sp, -32
+// 0x01095f5c: 0x1095f5c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01095918: 0x1095918: addu  v0, a0, zero
+// 0x01095f60: 0x1095f60: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0109591c: 0x109591c: lw    a0, 20(v1)
+// 0x01095f64: 0x1095f64: lw    a0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4582,7 +4582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095920: 0x1095920: sw    s0, 24(sp)
+// 0x01095f68: 0x1095f68: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4591,10 +4591,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095924: 0x1095924: addu  s0, a1, zero
+// 0x01095f6c: 0x1095f6c: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01095928: 0x1095928: sw    a2, 16(sp)
+// 0x01095f70: 0x1095f70: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4603,8 +4603,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0109592c: 0x109592c: sw    ra, 28(sp)
-// 0x01095930: 0x1095930: jal   0x109b304 addu  a1, v0, zero
+// 0x01095f74: 0x1095f74: sw    ra, 28(sp)
+// 0x01095f78: 0x1095f78: jal   0x109b94c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4612,12 +4612,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095938: 0x1095938: lw    a2, 16(sp)
+// 0x01095f80: 0x1095f80: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4626,13 +4626,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109593c: 0x109593c: beq   v0, zero, 0x109594c addu  a0, v0, zero
+// 0x01095f84: 0x1095f84: beq   v0, zero, 0x1095f94 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_109594c
+	brfalse L_1095f94
 // --- basic block ---
-// 0x01095944: 0x1095944: jal   0x1090cbc addu  a1, s0, zero
+// 0x01095f8c: 0x1095f8c: jal   0x10912e0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4640,14 +4640,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_icon_1090cbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_icon_10912e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109594c:
-// 0x0109594c: 0x109594c: lw    ra, 28(sp)
-// 0x01095950: 0x1095950: lw    s0, 24(sp)
+L_1095f94:
+// 0x01095f94: 0x1095f94: lw    ra, 28(sp)
+// 0x01095f98: 0x1095f98: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4656,7 +4656,7 @@ L_109594c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095954: 0x1095954: jr    ra addiu sp, sp, 32
+// 0x01095f9c: 0x1095f9c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4668,7 +4668,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4718,12 +4718,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095a08: 0x1095a08: addiu sp, sp, -48
+// 0x01096050: 0x1096050: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01095a0c: 0x1095a0c: sw    s3, 36(sp)
+// 0x01096054: 0x1096054: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4732,14 +4732,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01095a10: 0x1095a10: addu  s3, a0, zero
+// 0x01096058: 0x1096058: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01095a14: 0x1095a14: addiu a0, zero, 124
+// 0x0109605c: 0x109605c: addiu a0, zero, 124
 	ldc.i4.s 124
 	stloc.1
-// 0x01095a18: 0x1095a18: sw    ra, 44(sp)
-// 0x01095a1c: 0x1095a1c: sw    s4, 40(sp)
+// 0x01096060: 0x1096060: sw    ra, 44(sp)
+// 0x01096064: 0x1096064: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4748,7 +4748,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01095a20: 0x1095a20: sw    s2, 32(sp)
+// 0x01096068: 0x1096068: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4757,7 +4757,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01095a24: 0x1095a24: sw    s1, 28(sp)
+// 0x0109606c: 0x109606c: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4766,13 +4766,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01095a28: 0x1095a28: addu  s2, a2, zero
+// 0x01096070: 0x1096070: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01095a2c: 0x1095a2c: addu  s1, a3, zero
+// 0x01096074: 0x1096074: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x01095a30: 0x1095a30: sw    s0, 24(sp)
+// 0x01096078: 0x1096078: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4781,7 +4781,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01095a34: 0x1095a34: jal   0x1000910 addu  s4, a1, zero
+// 0x0109607c: 0x109607c: jal   0x1000910 addu  s4, a1, zero
 	ldloc.2
 	stloc 12
 	ldloc.0
@@ -4794,16 +4794,16 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095a3c: 0x1095a3c: addu  a0, v0, zero
+// 0x01096084: 0x1096084: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01095a40: 0x1095a40: addu  a1, zero, zero
+// 0x01096088: 0x1096088: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01095a44: 0x1095a44: addiu a2, zero, 124
+// 0x0109608c: 0x109608c: addiu a2, zero, 124
 	ldc.i4.s 124
 	stloc.3
-// 0x01095a48: 0x1095a48: jal   0x100177c addu  s0, v0, zero
+// 0x01096090: 0x1096090: jal   0x100177c addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.1
@@ -4815,18 +4815,18 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095a50: 0x1095a50: lui   a0, 0x20000
+// 0x01096098: 0x1096098: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01095a54: 0x1095a54: addiu a1, zero, 545
+// 0x0109609c: 0x109609c: addiu a1, zero, 545
 	ldc.i4 545
 	stloc.2
-// 0x01095a58: 0x1095a58: addiu a0, a0, -3148
+// 0x010960a0: 0x10960a0: addiu a0, a0, -2684
 	ldloc.1
-	ldc.i4 -3148
+	ldc.i4 -2684
 	add
 	stloc.1
-// 0x01095a5c: 0x1095a5c: jal   0x1004a38 addu  a2, s0, zero
+// 0x010960a4: 0x10960a4: jal   0x1004a48 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -4834,12 +4834,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095a64: 0x1095a64: jal   0x1001ba8 addu  a0, s3, zero
+// 0x010960ac: 0x10960ac: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4852,25 +4852,25 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095a6c: 0x1095a6c: srl   a1, s1, 18
+// 0x010960b4: 0x10960b4: srl   a1, s1, 18
 	ldloc 9
 	ldc.i4.s 18
 	shr.un
 	stloc.2
-// 0x01095a70: 0x1095a70: lui   a0, 0x10000
+// 0x010960b8: 0x10960b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01095a74: 0x1095a74: addiu v1, s0, 100
+// 0x010960bc: 0x10960bc: addiu v1, s0, 100
 	ldloc 7
 	ldc.i4.s 100
 	add
 	stloc 8
-// 0x01095a78: 0x1095a78: andi  a1, a1, 1
+// 0x010960c0: 0x10960c0: andi  a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	and
 	stloc.2
-// 0x01095a7c: 0x1095a7c: sw    v0, 8(s0)
+// 0x010960c4: 0x10960c4: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4879,15 +4879,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01095a80: 0x1095a80: and   a0, s1, a0
+// 0x010960c8: 0x10960c8: and   a0, s1, a0
 	ldloc 9
 	ldloc.1
 	and
 	stloc.1
-// 0x01095a84: 0x1095a84: addiu v0, zero, 2
+// 0x010960cc: 0x10960cc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01095a88: 0x1095a88: sw    zero, 100(s0)
+// 0x010960d0: 0x10960d0: sw    zero, 100(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4896,7 +4896,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095a8c: 0x1095a8c: sw    s2, 16(s0)
+// 0x010960d4: 0x10960d4: sw    s2, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4905,7 +4905,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01095a90: 0x1095a90: sw    a1, 40(s0)
+// 0x010960d8: 0x10960d8: sw    a1, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4914,7 +4914,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01095a94: 0x1095a94: sw    v0, 112(s0)
+// 0x010960dc: 0x10960dc: sw    v0, 112(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4923,7 +4923,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01095a98: 0x1095a98: sw    zero, 8(v1)
+// 0x010960e0: 0x10960e0: sw    zero, 8(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4932,7 +4932,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095a9c: 0x1095a9c: sw    zero, 116(s0)
+// 0x010960e4: 0x10960e4: sw    zero, 116(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4941,7 +4941,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095aa0: 0x1095aa0: sw    zero, 120(s0)
+// 0x010960e8: 0x10960e8: sw    zero, 120(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4950,7 +4950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095aa4: 0x1095aa4: sw    zero, 28(s0)
+// 0x010960ec: 0x10960ec: sw    zero, 28(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4959,7 +4959,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095aa8: 0x1095aa8: sw    zero, 36(s0)
+// 0x010960f0: 0x10960f0: sw    zero, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4968,7 +4968,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095aac: 0x1095aac: sw    zero, 44(s0)
+// 0x010960f4: 0x10960f4: sw    zero, 44(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4977,7 +4977,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095ab0: 0x1095ab0: sw    zero, 4(v1)
+// 0x010960f8: 0x10960f8: sw    zero, 4(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4986,65 +4986,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095ab4: 0x1095ab4: beq   a0, zero, 0x1095acc addiu a3, zero, -2
+// 0x010960fc: 0x10960fc: beq   a0, zero, 0x1096114 addiu a3, zero, -2
 	ldloc.1
 	ldc.i4.s -2
 	stloc 4
-	brfalse L_1095acc
+	brfalse L_1096114
 // --- basic block ---
-// 0x01095abc: 0x1095abc: lui   v0, 0x80000
+// 0x01096104: 0x1096104: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095ac0: 0x1095ac0: and   v0, s1, v0
+// 0x01096108: 0x1096108: and   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	and
 	stloc 5
-// 0x01095ac4: 0x1095ac4: bne   v0, zero, 0x1095ad4 addiu a3, zero, -1
+// 0x0109610c: 0x109610c: bne   v0, zero, 0x109611c addiu a3, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 4
-	brtrue L_1095ad4
+	brtrue L_109611c
 // --- basic block ---
-L_1095acc:
-// 0x01095acc: 0x1095acc: j	 0x1095ad8 addiu s2, zero, -2
+L_1096114:
+// 0x01096114: 0x1096114: j	 0x1096120 addiu s2, zero, -2
 	ldc.i4.s -2
 	stloc 10
-	br L_1095ad8
+	br L_1096120
 // --- basic block ---
-L_1095ad4:
-// 0x01095ad4: 0x1095ad4: addiu s2, zero, -1
+L_109611c:
+// 0x0109611c: 0x109611c: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 10
-L_1095ad8:
-// 0x01095ad8: 0x1095ad8: lui   v0, 0x100000
+L_1096120:
+// 0x01096120: 0x1096120: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x01095adc: 0x1095adc: and   v0, s1, v0
+// 0x01096124: 0x1096124: and   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	and
 	stloc 5
-// 0x01095ae0: 0x1095ae0: beq   v0, zero, 0x1095afc addiu v0, zero, 1
+// 0x01096128: 0x1096128: beq   v0, zero, 0x1096144 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_1095afc
+	brfalse L_1096144
 // --- basic block ---
-// 0x01095ae8: 0x1095ae8: lui   v0, 0xffef0000
+// 0x01096130: 0x1096130: lui   v0, 0xffef0000
 	ldc.i4 4293853184
 	stloc 5
-// 0x01095aec: 0x1095aec: ori   v0, v0, 65535
+// 0x01096134: 0x1096134: ori   v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x01095af0: 0x1095af0: and   s1, s1, v0
+// 0x01096138: 0x1096138: and   s1, s1, v0
 	ldloc 9
 	ldloc 5
 	and
 	stloc 9
-// 0x01095af4: 0x1095af4: j	 0x1095b00 sw    zero, 96(s0)
+// 0x0109613c: 0x109613c: j	 0x1096148 sw    zero, 96(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5053,10 +5053,10 @@ L_1095ad8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1095b00
+	br L_1096148
 // --- basic block ---
-L_1095afc:
-// 0x01095afc: 0x1095afc: sw    v0, 96(s0)
+L_1096144:
+// 0x01096144: 0x1096144: sw    v0, 96(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5065,17 +5065,17 @@ L_1095afc:
 	add
 	ldloc 5
 	stelem.i4
-L_1095b00:
-// 0x01095b00: 0x1095b00: addu  a0, s3, zero
+L_1096148:
+// 0x01096148: 0x1096148: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01095b04: 0x1095b04: addu  a1, s4, zero
+// 0x0109614c: 0x109614c: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01095b08: 0x1095b08: addu  a2, s2, zero
+// 0x01096150: 0x1096150: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x01095b0c: 0x1095b0c: jal   0x1093a24 sw    s1, 16(sp)
+// 0x01096154: 0x1096154: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5089,32 +5089,32 @@ L_1095b00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095b14: 0x1095b14: lui   v1, 0x80000
+// 0x0109615c: 0x109615c: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01095b18: 0x1095b18: lw    v1, 9648(v1)
+// 0x01096160: 0x1096160: lw    v1, 10112(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2412
+	ldc.i4 2528
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095b1c: 0x1095b1c: lui   a0, 0x10000
+// 0x01096164: 0x1096164: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01095b20: 0x1095b20: and   s1, s1, a0
+// 0x01096168: 0x1096168: and   s1, s1, a0
 	ldloc 9
 	ldloc.1
 	and
 	stloc 9
-// 0x01095b24: 0x1095b24: sw    v0, 20(s0)
+// 0x0109616c: 0x109616c: sw    v0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5123,7 +5123,7 @@ L_1095b00:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01095b28: 0x1095b28: bne   s1, zero, 0x1095b70 sw    v1, 0(s0)
+// 0x01096170: 0x1096170: bne   s1, zero, 0x10961b8 sw    v1, 0(s0)
 	ldloc 9
 	ldloc 6
 	ldloc 7
@@ -5131,21 +5131,21 @@ L_1095b00:
 	shr.un
 	ldloc 8
 	stelem.i4
-	brtrue L_1095b70
+	brtrue L_10961b8
 // --- basic block ---
-// 0x01095b30: 0x1095b30: addiu a3, zero, -1
+// 0x01096178: 0x1096178: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01095b34: 0x1095b34: addu  a0, s3, zero
+// 0x0109617c: 0x109617c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01095b38: 0x1095b38: addu  a1, s4, zero
+// 0x01096180: 0x1096180: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01095b3c: 0x1095b3c: addu  a2, s2, zero
+// 0x01096184: 0x1096184: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x01095b40: 0x1095b40: jal   0x1093a24 sw    zero, 16(sp)
+// 0x01096188: 0x1096188: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5159,21 +5159,21 @@ L_1095b00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095b48: 0x1095b48: addu  a0, v0, zero
+// 0x01096190: 0x1096190: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01095b4c: 0x1095b4c: addu  a1, zero, zero
+// 0x01096194: 0x1096194: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01095b50: 0x1095b50: addu  a2, zero, zero
+// 0x01096198: 0x1096198: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01095b54: 0x1095b54: jal   0x1098fe0 sw    v0, 24(s0)
+// 0x0109619c: 0x109619c: jal   0x1099628 sw    v0, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5185,9 +5185,9 @@ L_1095b00:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01095b5c: 0x1095b5c: lw    a0, 20(s0)
+// 0x010961a4: 0x10961a4: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5196,7 +5196,7 @@ L_1095b00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095b60: 0x1095b60: lw    a1, 24(s0)
+// 0x010961a8: 0x10961a8: lw    a1, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5205,15 +5205,15 @@ L_1095b00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01095b64: 0x1095b64: jal   0x1098ec4 sll   zero, zero, 0
+// 0x010961ac: 0x10961ac: jal   0x109950c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095b6c: 0x1095b6c: sw    zero, 88(s0)
+// 0x010961b4: 0x10961b4: sw    zero, 88(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5222,11 +5222,11 @@ L_1095b00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1095b70:
-// 0x01095b70: 0x1095b70: lui   a0, 0x20000
+L_10961b8:
+// 0x010961b8: 0x10961b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01095b74: 0x1095b74: lw    s2, 20(s0)
+// 0x010961bc: 0x10961bc: lw    s2, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5235,20 +5235,20 @@ L_1095b70:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01095b78: 0x1095b78: addiu a0, a0, -3228
+// 0x010961c0: 0x10961c0: addiu a0, a0, -2764
 	ldloc.1
-	ldc.i4 -3228
+	ldc.i4 -2764
 	add
 	stloc.1
-// 0x01095b7c: 0x1095b7c: lui   v0, 0x80000
+// 0x010961c4: 0x10961c4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095b80: 0x1095b80: jal   0x101cd60 sw    s0, 9648(v0)
+// 0x010961c8: 0x10961c8: jal   0x101cd70 sw    s0, 10112(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2412
+	ldc.i4 2528
 	add
 	ldloc 7
 	stelem.i4
@@ -5257,15 +5257,15 @@ L_1095b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095b88: 0x1095b88: addu  a1, v0, zero
+// 0x010961d0: 0x10961d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01095b8c: 0x1095b8c: jal   0x109b50c addu  a0, s2, zero
+// 0x010961d4: 0x10961d4: jal   0x109bb54 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5273,15 +5273,15 @@ L_1095b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095b94: 0x1095b94: lui   a0, 0x20000
+// 0x010961dc: 0x10961dc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01095b98: 0x1095b98: lw    s2, 20(s0)
+// 0x010961e0: 0x10961e0: lw    s2, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5290,9 +5290,9 @@ L_1095b70:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01095b9c: 0x1095b9c: jal   0x101cd60 addiu a0, a0, -3216
+// 0x010961e4: 0x10961e4: jal   0x101cd70 addiu a0, a0, -2752
 	ldloc.1
-	ldc.i4 -3216
+	ldc.i4 -2752
 	add
 	stloc.1
 	ldloc.0
@@ -5300,15 +5300,15 @@ L_1095b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095ba4: 0x1095ba4: addu  a1, v0, zero
+// 0x010961ec: 0x10961ec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01095ba8: 0x1095ba8: jal   0x109b434 addu  a0, s2, zero
+// 0x010961f0: 0x10961f0: jal   0x109ba7c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5316,16 +5316,16 @@ L_1095b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01095bb0: 0x1095bb0: bne   s1, zero, 0x1095bc4 sll   zero, zero, 0
+// 0x010961f8: 0x10961f8: bne   s1, zero, 0x109620c sll   zero, zero, 0
 	ldloc 9
-	brtrue L_1095bc4
+	brtrue L_109620c
 // --- basic block ---
-// 0x01095bb8: 0x1095bb8: lw    v0, 24(s0)
+// 0x01096200: 0x1096200: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5334,11 +5334,11 @@ L_1095b70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095bbc: 0x1095bbc: j	 0x1095bc8 sll   zero, zero, 0
-	br L_1095bc8
+// 0x01096204: 0x1096204: j	 0x1096210 sll   zero, zero, 0
+	br L_1096210
 // --- basic block ---
-L_1095bc4:
-// 0x01095bc4: 0x1095bc4: lw    v0, 20(s0)
+L_109620c:
+// 0x0109620c: 0x109620c: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5347,9 +5347,9 @@ L_1095bc4:
 	add
 	ldelem.i4
 	stloc 5
-L_1095bc8:
-// 0x01095bc8: 0x1095bc8: lw    ra, 44(sp)
-// 0x01095bcc: 0x1095bcc: lw    s4, 40(sp)
+L_1096210:
+// 0x01096210: 0x1096210: lw    ra, 44(sp)
+// 0x01096214: 0x1096214: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5358,7 +5358,7 @@ L_1095bc8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01095bd0: 0x1095bd0: lw    s3, 36(sp)
+// 0x01096218: 0x1096218: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5367,7 +5367,7 @@ L_1095bc8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01095bd4: 0x1095bd4: lw    s2, 32(sp)
+// 0x0109621c: 0x109621c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5376,7 +5376,7 @@ L_1095bc8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01095bd8: 0x1095bd8: lw    s1, 28(sp)
+// 0x01096220: 0x1096220: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5385,7 +5385,7 @@ L_1095bc8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095bdc: 0x1095bdc: lw    s0, 24(sp)
+// 0x01096224: 0x1096224: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5394,7 +5394,7 @@ L_1095bc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095be0: 0x1095be0: jr    ra addiu sp, sp, 48
+// 0x01096228: 0x1096228: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5406,7 +5406,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_align_focus_1095be8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_align_focus_1096230(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra,int32 lo)
@@ -5453,22 +5453,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095be8: 0x1095be8: lui   v0, 0x80000
+// 0x01096230: 0x1096230: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095bec: 0x1095bec: lw    v0, 9644(v0)
+// 0x01096234: 0x1096234: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095bf0: 0x1095bf0: lui   a1, 0x10000
+// 0x01096238: 0x1096238: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01095bf4: 0x1095bf4: lw    a0, 20(v0)
+// 0x0109623c: 0x109623c: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5477,17 +5477,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095bf8: 0x1095bf8: addiu sp, sp, -48
+// 0x01096240: 0x1096240: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01095bfc: 0x1095bfc: addiu a1, a1, 6916
+// 0x01096244: 0x1096244: addiu a1, a1, 6912
 	ldloc.2
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
-// 0x01095c00: 0x1095c00: sw    s0, 32(sp)
+// 0x01096248: 0x1096248: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5496,8 +5496,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095c04: 0x1095c04: sw    ra, 44(sp)
-// 0x01095c08: 0x1095c08: sw    s2, 40(sp)
+// 0x0109624c: 0x109624c: sw    ra, 44(sp)
+// 0x01096250: 0x1096250: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5506,7 +5506,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01095c0c: 0x1095c0c: jal   0x109b304 sw    s1, 36(sp)
+// 0x01096254: 0x1096254: jal   0x109b94c sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5520,26 +5520,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095c14: 0x1095c14: beq   v0, zero, 0x1095c30 addu  s0, zero, zero
+// 0x0109625c: 0x109625c: beq   v0, zero, 0x1096278 addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_1095c30
+	brfalse L_1096278
 // --- basic block ---
-// 0x01095c1c: 0x1095c1c: addu  a0, v0, zero
+// 0x01096264: 0x1096264: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01095c20: 0x1095c20: addiu a1, sp, 24
+// 0x01096268: 0x1096268: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01095c24: 0x1095c24: jal   0x1099350 addu  a2, zero, zero
+// 0x0109626c: 0x109626c: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5547,12 +5547,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095c2c: 0x1095c2c: lw    s0, 28(sp)
+// 0x01096274: 0x1096274: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5561,50 +5561,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-L_1095c30:
-// 0x01095c30: 0x1095c30: jal   0x1020318 sll   zero, zero, 0
+L_1096278:
+// 0x01096278: 0x1096278: jal   0x1020328 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::is_screen_wide_1020318(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::is_screen_wide_1020328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095c38: 0x1095c38: bne   v0, zero, 0x1095c50 lui   v0, 0x80000
+// 0x01096280: 0x1096280: bne   v0, zero, 0x1096298 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1095c50
+	brtrue L_1096298
 // --- basic block ---
-// 0x01095c40: 0x1095c40: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+// 0x01096288: 0x1096288: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095c48: 0x1095c48: addu  s0, s0, v0
+// 0x01096290: 0x1096290: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01095c4c: 0x1095c4c: lui   v0, 0x80000
+// 0x01096294: 0x1096294: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1095c50:
-// 0x01095c50: 0x1095c50: lw    v0, 9644(v0)
+L_1096298:
+// 0x01096298: 0x1096298: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095c54: 0x1095c54: sll   zero, zero, 0
-// 0x01095c58: 0x1095c58: lw    v0, 20(v0)
+// 0x0109629c: 0x109629c: sll   zero, zero, 0
+// 0x010962a0: 0x10962a0: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5613,8 +5613,8 @@ L_1095c50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095c5c: 0x1095c5c: sll   zero, zero, 0
-// 0x01095c60: 0x1095c60: lw    v1, 48(v0)
+// 0x010962a4: 0x10962a4: sll   zero, zero, 0
+// 0x010962a8: 0x10962a8: lw    v1, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5623,69 +5623,69 @@ L_1095c50:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095c64: 0x1095c64: lui   v0, 0x400000
+// 0x010962ac: 0x10962ac: lui   v0, 0x400000
 	ldc.i4 4194304
 	stloc 5
-// 0x01095c68: 0x1095c68: and   v0, v1, v0
+// 0x010962b0: 0x10962b0: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01095c6c: 0x1095c6c: beq   v0, zero, 0x1095c84 lui   v0, 0xf0000
+// 0x010962b4: 0x10962b4: beq   v0, zero, 0x10962cc lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brfalse L_1095c84
+	brfalse L_10962cc
 // --- basic block ---
-// 0x01095c74: 0x1095c74: jal   0x109ccc8 sll   zero, zero, 0
+// 0x010962bc: 0x10962bc: jal   0x109d310 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_get_height_109ccc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_get_height_109d310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095c7c: 0x1095c7c: addu  s0, s0, v0
+// 0x010962c4: 0x10962c4: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01095c80: 0x1095c80: lui   v0, 0xf0000
+// 0x010962c8: 0x10962c8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-L_1095c84:
-// 0x01095c84: 0x1095c84: lw    s1, -30072(v0)
+L_10962cc:
+// 0x010962cc: 0x10962cc: lw    s1, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095c88: 0x1095c88: jal   0x1042430 sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+// 0x010962d0: 0x10962d0: jal   0x1042440 sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095c90: 0x1095c90: lui   v1, 0x80000
+// 0x010962d8: 0x10962d8: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01095c94: 0x1095c94: lw    v1, 9644(v1)
+// 0x010962dc: 0x10962dc: lw    v1, 10108(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095c98: 0x1095c98: sll   zero, zero, 0
-// 0x01095c9c: 0x1095c9c: lw    a0, 28(v1)
+// 0x010962e0: 0x10962e0: sll   zero, zero, 0
+// 0x010962e4: 0x10962e4: lw    a0, 28(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5694,12 +5694,12 @@ L_1095c84:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095ca0: 0x1095ca0: sll   zero, zero, 0
-// 0x01095ca4: 0x1095ca4: beq   a0, zero, 0x1095db0 sll   zero, zero, 0
+// 0x010962e8: 0x10962e8: sll   zero, zero, 0
+// 0x010962ec: 0x10962ec: beq   a0, zero, 0x10963f8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1095db0
+	brfalse L_10963f8
 // --- basic block ---
-// 0x01095cac: 0x1095cac: lw    v1, 24(v1)
+// 0x010962f4: 0x10962f4: lw    v1, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5708,14 +5708,14 @@ L_1095c84:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095cb0: 0x1095cb0: sll   zero, zero, 0
-// 0x01095cb4: 0x1095cb4: beq   v1, zero, 0x1095db0 addiu a1, zero, -1
+// 0x010962f8: 0x10962f8: sll   zero, zero, 0
+// 0x010962fc: 0x10962fc: beq   v1, zero, 0x10963f8 addiu a1, zero, -1
 	ldloc 7
 	ldc.i4.m1
 	stloc.2
-	brfalse L_1095db0
+	brfalse L_10963f8
 // --- basic block ---
-// 0x01095cbc: 0x1095cbc: lw    a2, 124(a0)
+// 0x01096304: 0x1096304: lw    a2, 124(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5724,13 +5724,13 @@ L_1095c84:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01095cc0: 0x1095cc0: sll   zero, zero, 0
-// 0x01095cc4: 0x1095cc4: beq   a2, a1, 0x1095cdc sll   zero, zero, 0
+// 0x01096308: 0x1096308: sll   zero, zero, 0
+// 0x0109630c: 0x109630c: beq   a2, a1, 0x1096324 sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	beq  L_1095cdc
+	beq  L_1096324
 // --- basic block ---
-// 0x01095ccc: 0x1095ccc: lw    a2, 120(a0)
+// 0x01096314: 0x1096314: lw    a2, 120(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5739,18 +5739,18 @@ L_1095c84:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01095cd0: 0x1095cd0: sll   zero, zero, 0
-// 0x01095cd4: 0x1095cd4: bne   a2, a1, 0x1095cf0 addiu a1, sp, 16
+// 0x01096318: 0x1096318: sll   zero, zero, 0
+// 0x0109631c: 0x109631c: bne   a2, a1, 0x1096338 addiu a1, sp, 16
 	ldloc.3
 	ldloc.2
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-	bne.un L_1095cf0
+	bne.un L_1096338
 // --- basic block ---
-L_1095cdc:
-// 0x01095cdc: 0x1095cdc: lw    a1, 44(v1)
+L_1096324:
+// 0x01096324: 0x1096324: lw    a1, 44(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5759,7 +5759,7 @@ L_1095cdc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01095ce0: 0x1095ce0: sw    zero, 124(a0)
+// 0x01096328: 0x1096328: sw    zero, 124(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5768,12 +5768,12 @@ L_1095cdc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01095ce4: 0x1095ce4: addiu a1, a1, 20
+// 0x0109632c: 0x109632c: addiu a1, a1, 20
 	ldloc.2
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x01095ce8: 0x1095ce8: sw    a1, 44(v1)
+// 0x01096330: 0x1096330: sw    a1, 44(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5782,16 +5782,16 @@ L_1095cdc:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01095cec: 0x1095cec: addiu a1, sp, 16
+// 0x01096334: 0x1096334: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-L_1095cf0:
-// 0x01095cf0: 0x1095cf0: addu  a2, zero, zero
+L_1096338:
+// 0x01096338: 0x1096338: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01095cf4: 0x1095cf4: jal   0x1099350 subu  s1, s1, v0
+// 0x0109633c: 0x109633c: jal   0x1099998 subu  s1, s1, v0
 	ldloc 9
 	ldloc 5
 	sub
@@ -5801,35 +5801,35 @@ L_1095cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095cfc: 0x1095cfc: addiu v0, zero, 2
+// 0x01096344: 0x1096344: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01095d00: 0x1095d00: div   s1, v0
+// 0x01096348: 0x1096348: div   s1, v0
 	ldloc 9
 	ldloc 5
 	div
 	stloc 12
-// 0x01095d04: 0x1095d04: lui   s2, 0x80000
+// 0x0109634c: 0x109634c: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01095d08: 0x1095d08: lw    v0, 9644(s2)
+// 0x01096350: 0x1096350: lw    v0, 10108(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095d0c: 0x1095d0c: addu  a1, zero, zero
+// 0x01096354: 0x1096354: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01095d10: 0x1095d10: lw    a0, 24(v0)
+// 0x01096358: 0x1096358: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5838,8 +5838,8 @@ L_1095cf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095d14: 0x1095d14: sll   zero, zero, 0
-// 0x01095d18: 0x1095d18: lw    a2, 44(a0)
+// 0x0109635c: 0x109635c: sll   zero, zero, 0
+// 0x01096360: 0x1096360: lw    a2, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5848,10 +5848,10 @@ L_1095cf0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01095d1c: 0x1095d1c: mflo  lo
+// 0x01096364: 0x1096364: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x01095d20: 0x1095d20: jal   0x1098f84 subu  a2, a2, v0
+// 0x01096368: 0x1096368: jal   0x10995cc subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
@@ -5861,12 +5861,12 @@ L_1095cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095d28: 0x1095d28: jal   0x10957d8 addu  a0, zero, zero
+// 0x01096370: 0x1096370: jal   0x1095e20 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5874,21 +5874,21 @@ L_1095cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_recalculate_10957d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_recalculate_1095e20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095d30: 0x1095d30: lw    a0, 9644(s2)
+// 0x01096378: 0x1096378: lw    a0, 10108(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095d34: 0x1095d34: lw    v1, 20(sp)
+// 0x0109637c: 0x109637c: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5897,7 +5897,7 @@ L_1095cf0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095d38: 0x1095d38: lw    v0, 28(a0)
+// 0x01096380: 0x1096380: lw    v0, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5906,8 +5906,8 @@ L_1095cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095d3c: 0x1095d3c: sll   zero, zero, 0
-// 0x01095d40: 0x1095d40: lw    v0, 124(v0)
+// 0x01096384: 0x1096384: sll   zero, zero, 0
+// 0x01096388: 0x1096388: lw    v0, 124(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5916,24 +5916,24 @@ L_1095cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095d44: 0x1095d44: sll   zero, zero, 0
-// 0x01095d48: 0x1095d48: addu  a1, v0, v1
+// 0x0109638c: 0x109638c: sll   zero, zero, 0
+// 0x01096390: 0x1096390: addu  a1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc.2
-// 0x01095d4c: 0x1095d4c: slt   a1, s1, a1
+// 0x01096394: 0x1096394: slt   a1, s1, a1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc.2
-// 0x01095d50: 0x1095d50: beq   a1, zero, 0x1095d7c addu  a1, zero, zero
+// 0x01096398: 0x1096398: beq   a1, zero, 0x10963c4 addu  a1, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1095d7c
+	brfalse L_10963c4
 // --- basic block ---
-// 0x01095d58: 0x1095d58: lw    a0, 24(a0)
+// 0x010963a0: 0x10963a0: lw    a0, 24(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5942,8 +5942,8 @@ L_1095cf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095d5c: 0x1095d5c: sll   zero, zero, 0
-// 0x01095d60: 0x1095d60: lw    a2, 44(a0)
+// 0x010963a4: 0x10963a4: sll   zero, zero, 0
+// 0x010963a8: 0x10963a8: lw    a2, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5952,40 +5952,40 @@ L_1095cf0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01095d64: 0x1095d64: sll   zero, zero, 0
-// 0x01095d68: 0x1095d68: addiu a2, a2, -5
+// 0x010963ac: 0x10963ac: sll   zero, zero, 0
+// 0x010963b0: 0x10963b0: addiu a2, a2, -5
 	ldloc.3
 	ldc.i4.s -5
 	add
 	stloc.3
-// 0x01095d6c: 0x1095d6c: subu  v0, a2, v0
+// 0x010963b4: 0x10963b4: subu  v0, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc 5
-// 0x01095d70: 0x1095d70: subu  v1, v0, v1
+// 0x010963b8: 0x10963b8: subu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 7
-// 0x01095d74: 0x1095d74: j	 0x1095da0 addu  a2, v1, s1
+// 0x010963bc: 0x10963bc: j	 0x10963e8 addu  a2, v1, s1
 	ldloc 7
 	ldloc 9
 	add
 	stloc.3
-	br L_1095da0
+	br L_10963e8
 // --- basic block ---
-L_1095d7c:
-// 0x01095d7c: 0x1095d7c: slt   v1, v0, s0
+L_10963c4:
+// 0x010963c4: 0x10963c4: slt   v1, v0, s0
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 7
-// 0x01095d80: 0x1095d80: beq   v1, zero, 0x1095db0 sll   zero, zero, 0
+// 0x010963c8: 0x10963c8: beq   v1, zero, 0x10963f8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1095db0
+	brfalse L_10963f8
 // --- basic block ---
-// 0x01095d88: 0x1095d88: lw    a0, 24(a0)
+// 0x010963d0: 0x10963d0: lw    a0, 24(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5994,8 +5994,8 @@ L_1095d7c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095d8c: 0x1095d8c: sll   zero, zero, 0
-// 0x01095d90: 0x1095d90: lw    v1, 44(a0)
+// 0x010963d4: 0x10963d4: sll   zero, zero, 0
+// 0x010963d8: 0x10963d8: lw    v1, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6004,30 +6004,30 @@ L_1095d7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095d94: 0x1095d94: sll   zero, zero, 0
-// 0x01095d98: 0x1095d98: subu  v0, v1, v0
+// 0x010963dc: 0x10963dc: sll   zero, zero, 0
+// 0x010963e0: 0x10963e0: subu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x01095d9c: 0x1095d9c: addu  a2, v0, s0
+// 0x010963e4: 0x10963e4: addu  a2, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc.3
-L_1095da0:
-// 0x01095da0: 0x1095da0: jal   0x1098f84 sll   zero, zero, 0
+L_10963e8:
+// 0x010963e8: 0x10963e8: jal   0x10995cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095da8: 0x1095da8: jal   0x10957d8 addu  a0, zero, zero
+// 0x010963f0: 0x10963f0: jal   0x1095e20 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6035,25 +6035,25 @@ L_1095da0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_recalculate_10957d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_recalculate_1095e20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1095db0:
-// 0x01095db0: 0x1095db0: jal   0x109483c sll   zero, zero, 0
+L_10963f8:
+// 0x010963f8: 0x10963f8: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095db8: 0x1095db8: lw    ra, 44(sp)
-// 0x01095dbc: 0x1095dbc: lw    s2, 40(sp)
+// 0x01096400: 0x1096400: lw    ra, 44(sp)
+// 0x01096404: 0x1096404: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6062,7 +6062,7 @@ L_1095db0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01095dc0: 0x1095dc0: lw    s1, 36(sp)
+// 0x01096408: 0x1096408: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6071,7 +6071,7 @@ L_1095db0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095dc4: 0x1095dc4: lw    s0, 32(sp)
+// 0x0109640c: 0x109640c: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6080,7 +6080,7 @@ L_1095db0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095dc8: 0x1095dc8: jr    ra addiu sp, sp, 48
+// 0x01096410: 0x1096410: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6092,7 +6092,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_set_dialog_focus_1095dd0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_set_dialog_focus_1096418(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -6136,12 +6136,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095dd0: 0x1095dd0: addiu sp, sp, -32
+// 0x01096418: 0x1096418: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01095dd4: 0x1095dd4: sw    s1, 20(sp)
+// 0x0109641c: 0x109641c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6150,7 +6150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095dd8: 0x1095dd8: sw    s0, 16(sp)
+// 0x01096420: 0x1096420: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6159,8 +6159,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01095ddc: 0x1095ddc: sw    ra, 28(sp)
-// 0x01095de0: 0x1095de0: sw    s2, 24(sp)
+// 0x01096424: 0x1096424: sw    ra, 28(sp)
+// 0x01096428: 0x1096428: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6169,16 +6169,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01095de4: 0x1095de4: addu  s0, a1, zero
+// 0x0109642c: 0x109642c: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01095de8: 0x1095de8: beq   a1, zero, 0x1095e00 addu  s1, a0, zero
+// 0x01096430: 0x1096430: beq   a1, zero, 0x1096448 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 8
-	brfalse L_1095e00
+	brfalse L_1096448
 // --- basic block ---
-// 0x01095df0: 0x1095df0: lw    v0, 52(a1)
+// 0x01096438: 0x1096438: lw    v0, 52(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6187,23 +6187,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095df4: 0x1095df4: sll   zero, zero, 0
-// 0x01095df8: 0x1095df8: beq   v0, zero, 0x1095ed4 addu  v0, zero, zero
+// 0x0109643c: 0x109643c: sll   zero, zero, 0
+// 0x01096440: 0x1096440: beq   v0, zero, 0x109651c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1095ed4
+	brfalse L_109651c
 // --- basic block ---
-L_1095e00:
-// 0x01095e00: 0x1095e00: lui   a1, 0x20000
+L_1096448:
+// 0x01096448: 0x1096448: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01095e04: 0x1095e04: addiu a1, a1, -2936
+// 0x0109644c: 0x109644c: addiu a1, a1, -2472
 	ldloc.2
-	ldc.i4 -2936
+	ldc.i4 -2472
 	add
 	stloc.2
-// 0x01095e08: 0x1095e08: jal   0x109b304 addu  a0, s0, zero
+// 0x01096450: 0x1096450: jal   0x109b94c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6211,16 +6211,16 @@ L_1095e00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01095e10: 0x1095e10: beq   v0, zero, 0x1095e24 sll   zero, zero, 0
+// 0x01096458: 0x1096458: beq   v0, zero, 0x109646c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1095e24
+	brfalse L_109646c
 // --- basic block ---
-// 0x01095e18: 0x1095e18: lw    a0, 12(v0)
+// 0x01096460: 0x1096460: lw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6229,15 +6229,15 @@ L_1095e00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095e1c: 0x1095e1c: jal   0x10990ac sll   zero, zero, 0
+// 0x01096464: 0x1096464: jal   0x10996f4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_1095e24:
-// 0x01095e24: 0x1095e24: lw    s2, 28(s1)
+L_109646c:
+// 0x0109646c: 0x109646c: lw    s2, 28(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6246,19 +6246,19 @@ L_1095e24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095e28: 0x1095e28: sll   zero, zero, 0
-// 0x01095e2c: 0x1095e2c: bne   s2, s0, 0x1095e5c sll   zero, zero, 0
+// 0x01096470: 0x1096470: sll   zero, zero, 0
+// 0x01096474: 0x1096474: bne   s2, s0, 0x10964a4 sll   zero, zero, 0
 	ldloc 9
 	ldloc 7
-	bne.un L_1095e5c
+	bne.un L_10964a4
 // --- basic block ---
-// 0x01095e34: 0x1095e34: beq   s0, zero, 0x1095ed4 addiu v0, zero, 1
+// 0x0109647c: 0x109647c: beq   s0, zero, 0x109651c addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brfalse L_1095ed4
+	brfalse L_109651c
 // --- basic block ---
-// 0x01095e3c: 0x1095e3c: lw    v0, 60(s0)
+// 0x01096484: 0x1096484: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6267,12 +6267,12 @@ L_1095e24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095e40: 0x1095e40: sll   zero, zero, 0
-// 0x01095e44: 0x1095e44: bne   v0, zero, 0x1095ed0 sll   zero, zero, 0
+// 0x01096488: 0x1096488: sll   zero, zero, 0
+// 0x0109648c: 0x109648c: bne   v0, zero, 0x1096518 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1095ed0
+	brtrue L_1096518
 // --- basic block ---
-// 0x01095e4c: 0x1095e4c: jal   0x109faac addu  a0, s0, zero
+// 0x01096494: 0x1096494: jal   0x10a00f4 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6280,22 +6280,22 @@ L_1095e24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01095e54: 0x1095e54: j	 0x1095ed4 addiu v0, zero, 1
+// 0x0109649c: 0x109649c: j	 0x109651c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1095ed4
+	br L_109651c
 // --- basic block ---
-L_1095e5c:
-// 0x01095e5c: 0x1095e5c: beq   s0, zero, 0x1095e74 sll   zero, zero, 0
+L_10964a4:
+// 0x010964a4: 0x10964a4: beq   s0, zero, 0x10964bc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1095e74
+	brfalse L_10964bc
 // --- basic block ---
-// 0x01095e64: 0x1095e64: lw    v0, 100(s0)
+// 0x010964ac: 0x10964ac: lw    v0, 100(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6304,26 +6304,26 @@ L_1095e5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095e68: 0x1095e68: sll   zero, zero, 0
-// 0x01095e6c: 0x1095e6c: bne   s1, v0, 0x1095ed4 addu  v0, zero, zero
+// 0x010964b0: 0x10964b0: sll   zero, zero, 0
+// 0x010964b4: 0x10964b4: bne   s1, v0, 0x109651c addu  v0, zero, zero
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1095ed4
+	bne.un L_109651c
 // --- basic block ---
-L_1095e74:
-// 0x01095e74: 0x1095e74: beq   s2, zero, 0x1095e88 sll   zero, zero, 0
+L_10964bc:
+// 0x010964bc: 0x10964bc: beq   s2, zero, 0x10964d0 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_1095e88
+	brfalse L_10964d0
 // --- basic block ---
-// 0x01095e7c: 0x1095e7c: jal   0x109f260 addu  a0, s2, zero
+// 0x010964c4: 0x10964c4: jal   0x109f8a8 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call void Cibyl119::ssd_widget_loose_focus_109f260(int32)
+	call void Cibyl119::ssd_widget_loose_focus_109f8a8(int32)
 // --- basic block ---
-// 0x01095e84: 0x1095e84: sw    zero, 28(s1)
+// 0x010964cc: 0x10964cc: sw    zero, 28(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6332,14 +6332,14 @@ L_1095e74:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1095e88:
-// 0x01095e88: 0x1095e88: beq   s0, zero, 0x1095ed4 addiu v0, zero, 1
+L_10964d0:
+// 0x010964d0: 0x10964d0: beq   s0, zero, 0x109651c addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brfalse L_1095ed4
+	brfalse L_109651c
 // --- basic block ---
-// 0x01095e90: 0x1095e90: jal   0x109faac addu  a0, s0, zero
+// 0x010964d8: 0x10964d8: jal   0x10a00f4 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6347,16 +6347,16 @@ L_1095e88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01095e98: 0x1095e98: bne   v0, zero, 0x1095eb8 sll   zero, zero, 0
+// 0x010964e0: 0x10964e0: bne   v0, zero, 0x1096500 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1095eb8
+	brtrue L_1096500
 // --- basic block ---
-// 0x01095ea0: 0x1095ea0: jal   0x109faac addu  a0, s2, zero
+// 0x010964e8: 0x10964e8: jal   0x10a00f4 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6364,16 +6364,16 @@ L_1095e88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01095ea8: 0x1095ea8: beq   v0, zero, 0x1095ec8 sll   zero, zero, 0
+// 0x010964f0: 0x10964f0: beq   v0, zero, 0x1096510 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1095ec8
+	brfalse L_1096510
 // --- basic block ---
-// 0x01095eb0: 0x1095eb0: j	 0x1095ec8 sw    s2, 28(s1)
+// 0x010964f8: 0x10964f8: j	 0x1096510 sw    s2, 28(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6382,10 +6382,10 @@ L_1095e88:
 	add
 	ldloc 9
 	stelem.i4
-	br L_1095ec8
+	br L_1096510
 // --- basic block ---
-L_1095eb8:
-// 0x01095eb8: 0x1095eb8: jal   0x1095be8 sw    s0, 28(s1)
+L_1096500:
+// 0x01096500: 0x1096500: jal   0x1096230 sw    s0, 28(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6399,29 +6399,29 @@ L_1095eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_align_focus_1095be8(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_align_focus_1096230(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01095ec0: 0x1095ec0: j	 0x1095ed4 addiu v0, zero, 1
+// 0x01096508: 0x1096508: j	 0x109651c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1095ed4
+	br L_109651c
 // --- basic block ---
-L_1095ec8:
-// 0x01095ec8: 0x1095ec8: j	 0x1095ed4 addu  v0, zero, zero
+L_1096510:
+// 0x01096510: 0x1096510: j	 0x109651c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1095ed4
+	br L_109651c
 // --- basic block ---
-L_1095ed0:
-// 0x01095ed0: 0x1095ed0: addiu v0, zero, 1
+L_1096518:
+// 0x01096518: 0x1096518: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1095ed4:
-// 0x01095ed4: 0x1095ed4: lw    ra, 28(sp)
-// 0x01095ed8: 0x1095ed8: lw    s2, 24(sp)
+L_109651c:
+// 0x0109651c: 0x109651c: lw    ra, 28(sp)
+// 0x01096520: 0x1096520: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6430,7 +6430,7 @@ L_1095ed4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01095edc: 0x1095edc: lw    s1, 20(sp)
+// 0x01096524: 0x1096524: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6439,7 +6439,7 @@ L_1095ed4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095ee0: 0x1095ee0: lw    s0, 16(sp)
+// 0x01096528: 0x1096528: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6448,7 +6448,7 @@ L_1095ed4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095ee4: 0x1095ee4: jr    ra addiu sp, sp, 32
+// 0x0109652c: 0x109652c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6460,7 +6460,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -6510,15 +6510,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01095eec: 0x1095eec: addiu sp, sp, -40
+// 0x01096534: 0x1096534: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01095ef0: 0x1095ef0: lui   v0, 0x80000
+// 0x01096538: 0x1096538: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095ef4: 0x1095ef4: sw    s4, 32(sp)
+// 0x0109653c: 0x109653c: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6527,7 +6527,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01095ef8: 0x1095ef8: sw    s3, 28(sp)
+// 0x01096540: 0x1096540: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6536,7 +6536,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01095efc: 0x1095efc: sw    s1, 20(sp)
+// 0x01096544: 0x1096544: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6545,7 +6545,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01095f00: 0x1095f00: sw    s0, 16(sp)
+// 0x01096548: 0x1096548: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6554,8 +6554,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01095f04: 0x1095f04: sw    ra, 36(sp)
-// 0x01095f08: 0x1095f08: sw    s2, 24(sp)
+// 0x0109654c: 0x109654c: sw    ra, 36(sp)
+// 0x01096550: 0x1096550: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6564,19 +6564,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01095f0c: 0x1095f0c: addu  s4, a1, zero
+// 0x01096554: 0x1096554: addu  s4, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01095f10: 0x1095f10: lw    s1, 9644(v0)
+// 0x01096558: 0x1096558: lw    s1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095f14: 0x1095f14: jal   0x1094118 addu  s3, a0, zero
+// 0x0109655c: 0x109655c: jal   0x109473c addu  s3, a0, zero
 	ldloc.1
 	stloc 11
 	ldloc.0
@@ -6584,24 +6584,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_1094118(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_109473c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095f1c: 0x1095f1c: addu  s0, v0, zero
+// 0x01096564: 0x1096564: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01095f20: 0x1095f20: beq   s0, zero, 0x109614c addu  v0, zero, zero
+// 0x01096568: 0x1096568: beq   s0, zero, 0x1096794 addu  v0, zero, zero
 	ldloc 9
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109614c
+	brfalse L_1096794
 // --- basic block ---
-// 0x01095f28: 0x1095f28: addu  a0, zero, zero
+// 0x01096570: 0x1096570: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01095f2c: 0x1095f2c: jal   0x109c5ec addu  a1, s3, zero
+// 0x01096574: 0x1096574: jal   0x109cc34 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -6609,21 +6609,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095f34: 0x1095f34: j	 0x1095f48 addu  s2, zero, zero
+// 0x0109657c: 0x109657c: j	 0x1096590 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1095f48
+	br L_1096590
 // --- basic block ---
-L_1095f3c:
-// 0x01095f3c: 0x1095f3c: addu  s2, s1, zero
+L_1096584:
+// 0x01096584: 0x1096584: addu  s2, s1, zero
 	ldloc 8
 	stloc 10
-// 0x01095f40: 0x1095f40: lw    s1, 4(s1)
+// 0x01096588: 0x1096588: lw    s1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6632,15 +6632,15 @@ L_1095f3c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01095f44: 0x1095f44: sll   zero, zero, 0
-L_1095f48:
-// 0x01095f48: 0x1095f48: beq   s1, zero, 0x1095f6c addu  a1, s3, zero
+// 0x0109658c: 0x109658c: sll   zero, zero, 0
+L_1096590:
+// 0x01096590: 0x1096590: beq   s1, zero, 0x10965b4 addu  a1, s3, zero
 	ldloc 8
 	ldloc 11
 	stloc.2
-	brfalse L_1095f6c
+	brfalse L_10965b4
 // --- basic block ---
-// 0x01095f50: 0x1095f50: lw    a0, 8(s1)
+// 0x01096598: 0x1096598: lw    a0, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6649,33 +6649,33 @@ L_1095f48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095f54: 0x1095f54: jal   0x1001b14 sll   zero, zero, 0
+// 0x0109659c: 0x109659c: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01095f5c: 0x1095f5c: bne   v0, zero, 0x1095f3c sll   zero, zero, 0
+// 0x010965a4: 0x10965a4: bne   v0, zero, 0x1096584 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1095f3c
+	brtrue L_1096584
 // --- basic block ---
-// 0x01095f64: 0x1095f64: j	 0x109616c sll   zero, zero, 0
-	br L_109616c
+// 0x010965ac: 0x10965ac: j	 0x10967b4 sll   zero, zero, 0
+	br L_10967b4
 // --- basic block ---
-L_1095f6c:
-// 0x01095f6c: 0x1095f6c: lui   v0, 0x80000
+L_10965b4:
+// 0x010965b4: 0x10965b4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095f70: 0x1095f70: lw    v0, 9644(v0)
+// 0x010965b8: 0x10965b8: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095f74: 0x1095f74: sw    s4, 12(s0)
+// 0x010965bc: 0x10965bc: sw    s4, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6684,7 +6684,7 @@ L_1095f6c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01095f78: 0x1095f78: bne   v0, zero, 0x1095fac sw    v0, 4(s0)
+// 0x010965c0: 0x10965c0: bne   v0, zero, 0x10965f4 sw    v0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -6694,18 +6694,18 @@ L_1095f6c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1095fac
+	brtrue L_10965f4
 // --- basic block ---
-// 0x01095f80: 0x1095f80: j	 0x1095fdc lui   v0, 0x80000
+// 0x010965c8: 0x10965c8: j	 0x1096624 lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-	br L_1095fdc
+	br L_1096624
 // --- basic block ---
-L_1095f88:
-// 0x01095f88: 0x1095f88: lui   v0, 0x80000
+L_10965d0:
+// 0x010965d0: 0x10965d0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01095f8c: 0x1095f8c: lw    a0, 4(s1)
+// 0x010965d4: 0x10965d4: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6714,16 +6714,16 @@ L_1095f88:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095f90: 0x1095f90: lw    v1, 9644(v0)
+// 0x010965d8: 0x10965d8: lw    v1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095f94: 0x1095f94: sw    a0, 4(s2)
+// 0x010965dc: 0x10965dc: sw    a0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6732,7 +6732,7 @@ L_1095f88:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01095f98: 0x1095f98: sw    v1, 4(s1)
+// 0x010965e0: 0x10965e0: sw    v1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6741,17 +6741,17 @@ L_1095f88:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01095f9c: 0x1095f9c: sw    s1, 9644(v0)
+// 0x010965e4: 0x10965e4: sw    s1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldloc 8
 	stelem.i4
-L_1095fa0:
-// 0x01095fa0: 0x1095fa0: lw    v0, 20(s1)
+L_10965e8:
+// 0x010965e8: 0x10965e8: lw    v0, 20(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6760,11 +6760,11 @@ L_1095fa0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095fa4: 0x1095fa4: j	 0x109614c sll   zero, zero, 0
-	br L_109614c
+// 0x010965ec: 0x10965ec: j	 0x1096794 sll   zero, zero, 0
+	br L_1096794
 // --- basic block ---
-L_1095fac:
-// 0x01095fac: 0x1095fac: lw    v1, 20(v0)
+L_10965f4:
+// 0x010965f4: 0x10965f4: lw    v1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6773,8 +6773,8 @@ L_1095fac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01095fb0: 0x1095fb0: sll   zero, zero, 0
-// 0x01095fb4: 0x1095fb4: lw    a0, 48(v1)
+// 0x010965f8: 0x10965f8: sll   zero, zero, 0
+// 0x010965fc: 0x10965fc: lw    a0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6783,19 +6783,19 @@ L_1095fac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095fb8: 0x1095fb8: lui   v1, 0x800000
+// 0x01096600: 0x1096600: lui   v1, 0x800000
 	ldc.i4 8388608
 	stloc 7
-// 0x01095fbc: 0x1095fbc: and   v1, a0, v1
+// 0x01096604: 0x1096604: and   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	and
 	stloc 7
-// 0x01095fc0: 0x1095fc0: beq   v1, zero, 0x1095fd8 sll   zero, zero, 0
+// 0x01096608: 0x1096608: beq   v1, zero, 0x1096620 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1095fd8
+	brfalse L_1096620
 // --- basic block ---
-// 0x01095fc8: 0x1095fc8: lw    a0, 8(v0)
+// 0x01096610: 0x1096610: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6804,7 +6804,7 @@ L_1095fac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01095fcc: 0x1095fcc: jal   0x1094884 addu  a1, zero, zero
+// 0x01096614: 0x1096614: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6812,12 +6812,12 @@ L_1095fac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095fd4: 0x1095fd4: sw    zero, 4(s0)
+// 0x0109661c: 0x109661c: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6826,33 +6826,33 @@ L_1095fac:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1095fd8:
-// 0x01095fd8: 0x1095fd8: lui   v0, 0x80000
+L_1096620:
+// 0x01096620: 0x1096620: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1095fdc:
-// 0x01095fdc: 0x1095fdc: lw    v0, 9644(v0)
+L_1096624:
+// 0x01096624: 0x1096624: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01095fe0: 0x1095fe0: sll   zero, zero, 0
-// 0x01095fe4: 0x1095fe4: bne   v0, zero, 0x109606c lui   s1, 0x80000
+// 0x01096628: 0x1096628: sll   zero, zero, 0
+// 0x0109662c: 0x109662c: bne   v0, zero, 0x10966b4 lui   s1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brtrue L_109606c
+	brtrue L_10966b4
 // --- basic block ---
-// 0x01095fec: 0x1095fec: lui   a0, 0x1090000
+// 0x01096634: 0x1096634: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01095ff0: 0x1095ff0: jal   0x1038a70 addiu a0, a0, 25284
+// 0x01096638: 0x1096638: jal   0x1038a80 addiu a0, a0, 26892
 	ldloc.1
-	ldc.i4 25284
+	ldc.i4 26892
 	add
 	stloc.1
 	ldloc.0
@@ -6860,20 +6860,20 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_register_to_event__key_pressed_1038a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_register_to_event__key_pressed_1038a80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01095ff8: 0x1095ff8: lui   a0, 0x1090000
+// 0x01096640: 0x1096640: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01095ffc: 0x1095ffc: addiu a0, a0, 21540
+// 0x01096644: 0x1096644: addiu a0, a0, 23148
 	ldloc.1
-	ldc.i4 21540
+	ldc.i4 23148
 	add
 	stloc.1
-// 0x01096000: 0x1096000: jal   0x104ba38 addiu a1, zero, 3
+// 0x01096648: 0x1096648: jal   0x104ba48 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6881,20 +6881,20 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba38(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096008: 0x1096008: lui   a0, 0x1090000
+// 0x01096650: 0x1096650: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109600c: 0x109600c: addiu a0, a0, 20232
+// 0x01096654: 0x1096654: addiu a0, a0, 21840
 	ldloc.1
-	ldc.i4 20232
+	ldc.i4 21840
 	add
 	stloc.1
-// 0x01096010: 0x1096010: jal   0x104ba10 addiu a1, zero, 3
+// 0x01096658: 0x1096658: jal   0x104ba20 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6902,20 +6902,20 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_released_104ba10(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_released_104ba20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096018: 0x1096018: lui   a0, 0x1090000
+// 0x01096660: 0x1096660: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109601c: 0x109601c: addiu a0, a0, 19960
+// 0x01096664: 0x1096664: addiu a0, a0, 21568
 	ldloc.1
-	ldc.i4 19960
+	ldc.i4 21568
 	add
 	stloc.1
-// 0x01096020: 0x1096020: jal   0x104bad8 addiu a1, zero, 3
+// 0x01096668: 0x1096668: jal   0x104bae8 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6923,20 +6923,20 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096028: 0x1096028: lui   a0, 0x1090000
+// 0x01096670: 0x1096670: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109602c: 0x109602c: addiu a0, a0, 19904
+// 0x01096674: 0x1096674: addiu a0, a0, 21512
 	ldloc.1
-	ldc.i4 19904
+	ldc.i4 21512
 	add
 	stloc.1
-// 0x01096030: 0x1096030: jal   0x104bab0 addiu a1, zero, 3
+// 0x01096678: 0x1096678: jal   0x104bac0 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6944,20 +6944,20 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096038: 0x1096038: lui   a0, 0x1090000
+// 0x01096680: 0x1096680: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109603c: 0x109603c: addiu a0, a0, 21320
+// 0x01096684: 0x1096684: addiu a0, a0, 22928
 	ldloc.1
-	ldc.i4 21320
+	ldc.i4 22928
 	add
 	stloc.1
-// 0x01096040: 0x1096040: jal   0x104b9e8 addiu a1, zero, 3
+// 0x01096688: 0x1096688: jal   0x104b9f8 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6965,20 +6965,20 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_drag_start_104b9e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_drag_start_104b9f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096048: 0x1096048: lui   a0, 0x1090000
+// 0x01096690: 0x1096690: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109604c: 0x109604c: addiu a0, a0, 20600
+// 0x01096694: 0x1096694: addiu a0, a0, 22208
 	ldloc.1
-	ldc.i4 20600
+	ldc.i4 22208
 	add
 	stloc.1
-// 0x01096050: 0x1096050: jal   0x104b998 addiu a1, zero, 3
+// 0x01096698: 0x1096698: jal   0x104b9a8 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6986,20 +6986,20 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_register_drag_end_104b998(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_register_drag_end_104b9a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096058: 0x1096058: lui   a0, 0x1090000
+// 0x010966a0: 0x10966a0: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x0109605c: 0x109605c: addiu a0, a0, 19484
+// 0x010966a4: 0x10966a4: addiu a0, a0, 21092
 	ldloc.1
-	ldc.i4 19484
+	ldc.i4 21092
 	add
 	stloc.1
-// 0x01096060: 0x1096060: jal   0x104b9c0 addiu a1, zero, 3
+// 0x010966a8: 0x10966a8: jal   0x104b9d0 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -7007,24 +7007,24 @@ L_1095fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_drag_motion_104b9c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_drag_motion_104b9d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096068: 0x1096068: lui   s1, 0x80000
+// 0x010966b0: 0x10966b0: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_109606c:
-// 0x0109606c: 0x109606c: addu  a0, s0, zero
+L_10966b4:
+// 0x010966b4: 0x10966b4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01096070: 0x1096070: jal   0x1094f50 sw    s0, 9644(s1)
+// 0x010966b8: 0x10966b8: jal   0x1095598 sw    s0, 10108(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldloc 9
 	stelem.i4
@@ -7033,22 +7033,22 @@ L_109606c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::set_softkeys_1094f50(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::set_softkeys_1095598(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096078: 0x1096078: lw    v0, 9644(s1)
+// 0x010966c0: 0x10966c0: lw    v0, 10108(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109607c: 0x109607c: sll   zero, zero, 0
-// 0x01096080: 0x1096080: lw    v0, 20(v0)
+// 0x010966c4: 0x10966c4: sll   zero, zero, 0
+// 0x010966c8: 0x10966c8: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7057,8 +7057,8 @@ L_109606c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096084: 0x1096084: sll   zero, zero, 0
-// 0x01096088: 0x1096088: lw    v1, 48(v0)
+// 0x010966cc: 0x10966cc: sll   zero, zero, 0
+// 0x010966d0: 0x10966d0: lw    v1, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7067,31 +7067,31 @@ L_109606c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109608c: 0x109608c: lui   v0, 0x400000
+// 0x010966d4: 0x10966d4: lui   v0, 0x400000
 	ldc.i4 4194304
 	stloc 5
-// 0x01096090: 0x1096090: and   v0, v1, v0
+// 0x010966d8: 0x10966d8: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01096094: 0x1096094: beq   v0, zero, 0x10960a4 sll   zero, zero, 0
+// 0x010966dc: 0x10966dc: beq   v0, zero, 0x10966ec sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10960a4
+	brfalse L_10966ec
 // --- basic block ---
-// 0x0109609c: 0x109609c: jal   0x10945f0 sll   zero, zero, 0
+// 0x010966e4: 0x10966e4: jal   0x1094c14 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_10945f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_1094c14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10960a4:
-// 0x010960a4: 0x10960a4: jal   0x109551c addu  a0, s0, zero
+L_10966ec:
+// 0x010966ec: 0x10966ec: jal   0x1095b64 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7099,12 +7099,12 @@ L_10960a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_109551c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_1095b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010960ac: 0x10960ac: lw    a0, 24(s0)
+// 0x010966f4: 0x10966f4: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7113,8 +7113,8 @@ L_10960a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010960b0: 0x10960b0: sll   zero, zero, 0
-// 0x010960b4: 0x10960b4: beq   a0, zero, 0x10960c8 sw    zero, 88(s0)
+// 0x010966f8: 0x10966f8: sll   zero, zero, 0
+// 0x010966fc: 0x10966fc: beq   a0, zero, 0x1096710 sw    zero, 88(s0)
 	ldloc.1
 	ldloc 6
 	ldloc 9
@@ -7124,12 +7124,12 @@ L_10960a4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10960c8
+	brfalse L_1096710
 // --- basic block ---
-// 0x010960bc: 0x10960bc: addu  a1, zero, zero
+// 0x01096704: 0x1096704: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010960c0: 0x10960c0: jal   0x1098f84 addu  a2, zero, zero
+// 0x01096708: 0x1096708: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -7137,13 +7137,13 @@ L_10960a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10960c8:
-// 0x010960c8: 0x10960c8: lw    a1, 32(s0)
+L_1096710:
+// 0x01096710: 0x1096710: lw    a1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7152,10 +7152,10 @@ L_10960c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010960cc: 0x10960cc: addu  a0, s0, zero
+// 0x01096714: 0x1096714: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010960d0: 0x10960d0: jal   0x1095dd0 lui   s1, 0x80000
+// 0x01096718: 0x1096718: jal   0x1096418 lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
 	ldloc.0
@@ -7163,28 +7163,28 @@ L_10960c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_set_dialog_focus_1095dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_set_dialog_focus_1096418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010960d8: 0x10960d8: lw    v0, 9652(s1)
+// 0x01096720: 0x1096720: lw    v0, 10116(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2413
+	ldc.i4 2529
 	add
 	ldelem.i4
 	stloc 5
-// 0x010960dc: 0x10960dc: sll   zero, zero, 0
-// 0x010960e0: 0x10960e0: bne   v0, zero, 0x1096118 lui   v0, 0x80000
+// 0x01096724: 0x1096724: sll   zero, zero, 0
+// 0x01096728: 0x1096728: bne   v0, zero, 0x1096760 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1096118
+	brtrue L_1096760
 // --- basic block ---
-// 0x010960e8: 0x10960e8: lw    v0, 20(s0)
+// 0x01096730: 0x1096730: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7193,8 +7193,8 @@ L_10960c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010960ec: 0x10960ec: sll   zero, zero, 0
-// 0x010960f0: 0x10960f0: lw    v1, 48(v0)
+// 0x01096734: 0x1096734: sll   zero, zero, 0
+// 0x01096738: 0x1096738: lw    v1, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7203,21 +7203,21 @@ L_10960c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010960f4: 0x10960f4: lui   v0, 0x30000
+// 0x0109673c: 0x109673c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010960f8: 0x10960f8: and   v0, v1, v0
+// 0x01096740: 0x1096740: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x010960fc: 0x10960fc: bne   v0, zero, 0x1096118 lui   v0, 0x80000
+// 0x01096744: 0x1096744: bne   v0, zero, 0x1096760 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1096118
+	brtrue L_1096760
 // --- basic block ---
-// 0x01096104: 0x1096104: jal   0x102e3a4 addu  a0, zero, zero
+// 0x0109674c: 0x109674c: jal   0x102e3b4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7225,44 +7225,44 @@ L_10960c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_screen_refresh_102e3a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_screen_refresh_102e3b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109610c: 0x109610c: addiu v0, zero, 1
+// 0x01096754: 0x1096754: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01096110: 0x1096110: sw    v0, 9652(s1)
+// 0x01096758: 0x1096758: sw    v0, 10116(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2413
+	ldc.i4 2529
 	add
 	ldloc 5
 	stelem.i4
-// 0x01096114: 0x1096114: lui   v0, 0x80000
+// 0x0109675c: 0x109675c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1096118:
-// 0x01096118: 0x1096118: lw    v0, 9652(v0)
+L_1096760:
+// 0x01096760: 0x1096760: lw    v0, 10116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2413
+	ldc.i4 2529
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109611c: 0x109611c: sll   zero, zero, 0
-// 0x01096120: 0x1096120: beq   v0, zero, 0x1096134 lui   a1, 0x1090000
+// 0x01096764: 0x1096764: sll   zero, zero, 0
+// 0x01096768: 0x1096768: beq   v0, zero, 0x109677c lui   a1, 0x1090000
 	ldloc 5
 	ldc.i4 17367040
 	stloc.2
-	brfalse L_1096134
+	brfalse L_109677c
 // --- basic block ---
-// 0x01096128: 0x1096128: jal   0x102e3a4 addu  a0, zero, zero
+// 0x01096770: 0x1096770: jal   0x102e3b4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7270,32 +7270,32 @@ L_1096118:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_screen_refresh_102e3a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_screen_refresh_102e3b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096130: 0x1096130: lui   a1, 0x1090000
+// 0x01096778: 0x1096778: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-L_1096134:
-// 0x01096134: 0x1096134: lui   v0, 0x80000
+L_109677c:
+// 0x0109677c: 0x109677c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01096138: 0x1096138: addiu a1, a1, 18444
+// 0x01096780: 0x1096780: addiu a1, a1, 20016
 	ldloc.2
-	ldc.i4 18444
+	ldc.i4 20016
 	add
 	stloc.2
-// 0x0109613c: 0x109613c: addiu a0, zero, 350
+// 0x01096784: 0x1096784: addiu a0, zero, 350
 	ldc.i4 350
 	stloc.1
-// 0x01096140: 0x1096140: jal   0x104fe98 sw    zero, 9656(v0)
+// 0x01096788: 0x1096788: jal   0x104fea8 sw    zero, 10120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2414
+	ldc.i4 2530
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -7304,12 +7304,12 @@ L_1096134:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096148: 0x1096148: lw    v0, 20(s0)
+// 0x01096790: 0x1096790: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7318,9 +7318,9 @@ L_1096134:
 	add
 	ldelem.i4
 	stloc 5
-L_109614c:
-// 0x0109614c: 0x109614c: lw    ra, 36(sp)
-// 0x01096150: 0x1096150: lw    s4, 32(sp)
+L_1096794:
+// 0x01096794: 0x1096794: lw    ra, 36(sp)
+// 0x01096798: 0x1096798: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7329,7 +7329,7 @@ L_109614c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01096154: 0x1096154: lw    s3, 28(sp)
+// 0x0109679c: 0x109679c: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7338,7 +7338,7 @@ L_109614c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01096158: 0x1096158: lw    s2, 24(sp)
+// 0x010967a0: 0x10967a0: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7347,7 +7347,7 @@ L_109614c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109615c: 0x109615c: lw    s1, 20(sp)
+// 0x010967a4: 0x10967a4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7356,7 +7356,7 @@ L_109614c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096160: 0x1096160: lw    s0, 16(sp)
+// 0x010967a8: 0x10967a8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7365,20 +7365,20 @@ L_109614c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01096164: 0x1096164: jr    ra addiu sp, sp, 40
+// 0x010967ac: 0x10967ac: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_109616c:
-// 0x0109616c: 0x109616c: bne   s2, zero, 0x1095f88 sll   zero, zero, 0
+L_10967b4:
+// 0x010967b4: 0x10967b4: bne   s2, zero, 0x10965d0 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_1095f88
+	brtrue L_10965d0
 // --- basic block ---
-// 0x01096174: 0x1096174: j	 0x1095fa0 sll   zero, zero, 0
-	br L_1095fa0
+// 0x010967bc: 0x10967bc: j	 0x10965e8 sll   zero, zero, 0
+	br L_10965e8
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl112.j b/converted/Cibyl112.j
index e1de73b..b0039d5 100644
--- a/converted/Cibyl112.j
+++ b/converted/Cibyl112.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl112::.ctor
 
-.method public static int32 ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -76,34 +76,34 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109617c: 0x109617c: lui   v0, 0x80000
+// 0x010967c4: 0x10967c4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01096180: 0x1096180: lw    v1, 9644(v0)
+// 0x010967c8: 0x10967c8: lw    v1, 10108(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 6
-// 0x01096184: 0x1096184: addiu sp, sp, -24
+// 0x010967cc: 0x10967cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01096188: 0x1096188: sw    ra, 20(sp)
-// 0x0109618c: 0x109618c: addu  a1, a0, zero
+// 0x010967d0: 0x10967d0: sw    ra, 20(sp)
+// 0x010967d4: 0x10967d4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01096190: 0x1096190: beq   v1, zero, 0x10961a0 addu  v0, zero, zero
+// 0x010967d8: 0x10967d8: beq   v1, zero, 0x10967e8 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10961a0
+	brfalse L_10967e8
 // --- basic block ---
-// 0x01096198: 0x1096198: jal   0x1095dd0 addu  a0, v1, zero
+// 0x010967e0: 0x10967e0: jal   0x1096418 addu  a0, v1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -111,15 +111,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_set_dialog_focus_1095dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_set_dialog_focus_1096418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10961a0:
-// 0x010961a0: 0x10961a0: lw    ra, 20(sp)
-// 0x010961a4: 0x10961a4: sll   zero, zero, 0
-// 0x010961a8: 0x10961a8: jr    ra addiu sp, sp, 24
+L_10967e8:
+// 0x010967e8: 0x10967e8: lw    ra, 20(sp)
+// 0x010967ec: 0x10967ec: sll   zero, zero, 0
+// 0x010967f0: 0x10967f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -131,7 +131,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_dialog_resort_tab_order_10961b0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_resort_tab_order_10967f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 s2,int32 ra)
@@ -175,15 +175,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010961b0: 0x10961b0: addiu sp, sp, -32
+// 0x010967f8: 0x10967f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010961b4: 0x10961b4: lui   v0, 0x80000
+// 0x010967fc: 0x10967fc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010961b8: 0x10961b8: sw    s0, 16(sp)
+// 0x01096800: 0x1096800: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -192,17 +192,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010961bc: 0x10961bc: lw    s0, 9644(v0)
+// 0x01096804: 0x1096804: lw    s0, 10108(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x010961c0: 0x10961c0: sw    ra, 28(sp)
-// 0x010961c4: 0x10961c4: sw    s2, 24(sp)
+// 0x01096808: 0x1096808: sw    ra, 28(sp)
+// 0x0109680c: 0x109680c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -211,7 +211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010961c8: 0x10961c8: beq   s0, zero, 0x109624c sw    s1, 20(sp)
+// 0x01096810: 0x1096810: beq   s0, zero, 0x1096894 sw    s1, 20(sp)
 	ldloc 7
 	ldloc 5
 	ldloc.0
@@ -221,9 +221,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_109624c
+	brfalse L_1096894
 // --- basic block ---
-// 0x010961d0: 0x10961d0: lw    s1, 32(s0)
+// 0x01096818: 0x1096818: lw    s1, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -232,7 +232,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010961d4: 0x10961d4: lw    s2, 28(s0)
+// 0x0109681c: 0x109681c: lw    s2, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -241,18 +241,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010961d8: 0x10961d8: jal   0x10945f0 sll   zero, zero, 0
+// 0x01096820: 0x1096820: jal   0x1094c14 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_10945f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_1094c14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010961e0: 0x10961e0: jal   0x109551c addu  a0, s0, zero
+// 0x01096828: 0x1096828: jal   0x1095b64 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -260,27 +260,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_109551c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_1095b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010961e8: 0x10961e8: jal   0x1095578 sll   zero, zero, 0
+// 0x01096830: 0x1096830: jal   0x1095bc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_by_gui_position_1095578(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_by_gui_position_1095bc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010961f0: 0x10961f0: beq   s1, zero, 0x1096218 sll   zero, zero, 0
+// 0x01096838: 0x1096838: beq   s1, zero, 0x1096860 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1096218
+	brfalse L_1096860
 // --- basic block ---
-// 0x010961f8: 0x10961f8: jal   0x109617c addu  a0, s1, zero
+// 0x01096840: 0x1096840: jal   0x10967c4 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -288,16 +288,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01096200: 0x1096200: beq   v0, zero, 0x1096218 sll   zero, zero, 0
+// 0x01096848: 0x1096848: beq   v0, zero, 0x1096860 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1096218
+	brfalse L_1096860
 // --- basic block ---
-// 0x01096208: 0x1096208: sw    s1, 28(s0)
+// 0x01096850: 0x1096850: sw    s1, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -306,7 +306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109620c: 0x109620c: sw    s1, 32(s0)
+// 0x01096854: 0x1096854: sw    s1, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -315,21 +315,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01096210: 0x1096210: j	 0x109621c addiu s1, zero, 1
+// 0x01096858: 0x1096858: j	 0x1096864 addiu s1, zero, 1
 	ldc.i4.1
 	stloc 8
-	br L_109621c
+	br L_1096864
 // --- basic block ---
-L_1096218:
-// 0x01096218: 0x1096218: addu  s1, zero, zero
+L_1096860:
+// 0x01096860: 0x1096860: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_109621c:
-// 0x0109621c: 0x109621c: beq   s2, zero, 0x1096234 sll   zero, zero, 0
+L_1096864:
+// 0x01096864: 0x1096864: beq   s2, zero, 0x109687c sll   zero, zero, 0
 	ldloc 10
-	brfalse L_1096234
+	brfalse L_109687c
 // --- basic block ---
-// 0x01096224: 0x1096224: jal   0x109617c addu  a0, s2, zero
+// 0x0109686c: 0x109686c: jal   0x10967c4 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -337,22 +337,22 @@ L_109621c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109622c: 0x109622c: bne   v0, zero, 0x109623c sll   zero, zero, 0
+// 0x01096874: 0x1096874: bne   v0, zero, 0x1096884 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109623c
+	brtrue L_1096884
 // --- basic block ---
-L_1096234:
-// 0x01096234: 0x1096234: beq   s1, zero, 0x109624c sll   zero, zero, 0
+L_109687c:
+// 0x0109687c: 0x109687c: beq   s1, zero, 0x1096894 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_109624c
+	brfalse L_1096894
 // --- basic block ---
-L_109623c:
-// 0x0109623c: 0x109623c: jal   0x109551c addu  a0, s0, zero
+L_1096884:
+// 0x01096884: 0x1096884: jal   0x1095b64 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -360,25 +360,25 @@ L_109623c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_109551c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_1095b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01096244: 0x1096244: jal   0x1095578 sll   zero, zero, 0
+// 0x0109688c: 0x109688c: jal   0x1095bc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_by_gui_position_1095578(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_by_gui_position_1095bc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_109624c:
-// 0x0109624c: 0x109624c: lw    ra, 28(sp)
-// 0x01096250: 0x1096250: lw    s2, 24(sp)
+L_1096894:
+// 0x01096894: 0x1096894: lw    ra, 28(sp)
+// 0x01096898: 0x1096898: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -387,7 +387,7 @@ L_109624c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01096254: 0x1096254: lw    s1, 20(sp)
+// 0x0109689c: 0x109689c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -396,7 +396,7 @@ L_109624c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096258: 0x1096258: lw    s0, 16(sp)
+// 0x010968a0: 0x10968a0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -405,7 +405,7 @@ L_109624c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109625c: 0x109625c: jr    ra addiu sp, sp, 32
+// 0x010968a4: 0x10968a4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -417,7 +417,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_dialog_move_focus_1096264(int32,int32,int32,int32,int32)
+.method public static int32 ssd_dialog_move_focus_10968ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -455,15 +455,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096264: 0x1096264: addiu sp, sp, -24
+// 0x010968ac: 0x10968ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01096268: 0x1096268: lui   v0, 0x80000
+// 0x010968b0: 0x10968b0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0109626c: 0x109626c: sw    s0, 16(sp)
+// 0x010968b4: 0x10968b4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -472,19 +472,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01096270: 0x1096270: lw    s0, 9644(v0)
+// 0x010968b8: 0x10968b8: lw    s0, 10108(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x01096274: 0x1096274: addu  a1, a0, zero
+// 0x010968bc: 0x10968bc: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01096278: 0x1096278: lw    a0, 28(s0)
+// 0x010968c0: 0x10968c0: lw    a0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -493,12 +493,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109627c: 0x109627c: sll   zero, zero, 0
-// 0x01096280: 0x1096280: bne   a0, zero, 0x109629c sw    ra, 20(sp)
+// 0x010968c4: 0x10968c4: sll   zero, zero, 0
+// 0x010968c8: 0x10968c8: bne   a0, zero, 0x10968e4 sw    ra, 20(sp)
 	ldloc.1
-	brtrue L_109629c
+	brtrue L_10968e4
 // --- basic block ---
-// 0x01096288: 0x1096288: lw    a1, 32(s0)
+// 0x010968d0: 0x10968d0: lw    a1, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -507,7 +507,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109628c: 0x109628c: jal   0x1095dd0 addu  a0, s0, zero
+// 0x010968d4: 0x10968d4: jal   0x1096418 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -515,27 +515,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_set_dialog_focus_1095dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_set_dialog_focus_1096418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01096294: 0x1096294: j	 0x10962b4 sll   zero, zero, 0
-	br L_10962b4
+// 0x010968dc: 0x10968dc: j	 0x10968fc sll   zero, zero, 0
+	br L_10968fc
 // --- basic block ---
-L_109629c:
-// 0x0109629c: 0x109629c: jal   0x109fb98 sll   zero, zero, 0
+L_10968e4:
+// 0x010968e4: 0x10968e4: jal   0x10a01e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_move_focus_109fb98(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_move_focus_10a01e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010962a4: 0x10962a4: jal   0x1095be8 sw    v0, 28(s0)
+// 0x010968ec: 0x10968ec: jal   0x1096230 sw    v0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -549,25 +549,25 @@ L_109629c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_align_focus_1095be8(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_align_focus_1096230(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010962ac: 0x10962ac: jal   0x10961b0 sll   zero, zero, 0
+// 0x010968f4: 0x10968f4: jal   0x10967f8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_resort_tab_order_10961b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_resort_tab_order_10967f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10962b4:
-// 0x010962b4: 0x10962b4: lw    ra, 20(sp)
-// 0x010962b8: 0x10962b8: lw    s0, 16(sp)
+L_10968fc:
+// 0x010968fc: 0x10968fc: lw    ra, 20(sp)
+// 0x01096900: 0x1096900: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -576,7 +576,7 @@ L_10962b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010962bc: 0x10962bc: jr    ra addiu sp, sp, 24
+// 0x01096904: 0x1096904: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -588,7 +588,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 OnKeyPressed_10962c4(int32,int32,int32,int32,int32)
+.method public static int32 OnKeyPressed_109690c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -629,24 +629,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010962c4: 0x10962c4: lui   v0, 0x80000
+// 0x0109690c: 0x109690c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010962c8: 0x10962c8: lw    v1, 9644(v0)
+// 0x01096910: 0x1096910: lw    v1, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 7
-// 0x010962cc: 0x10962cc: addiu sp, sp, -32
+// 0x01096914: 0x1096914: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010962d0: 0x10962d0: sw    s1, 24(sp)
+// 0x01096918: 0x1096918: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -655,7 +655,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010962d4: 0x10962d4: sw    s0, 20(sp)
+// 0x0109691c: 0x109691c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -664,20 +664,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010962d8: 0x10962d8: sw    ra, 28(sp)
-// 0x010962dc: 0x10962dc: addu  s0, a0, zero
+// 0x01096920: 0x1096920: sw    ra, 28(sp)
+// 0x01096924: 0x1096924: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010962e0: 0x10962e0: addu  s1, a1, zero
+// 0x01096928: 0x1096928: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010962e4: 0x10962e4: beq   v1, zero, 0x10964c0 addu  v0, zero, zero
+// 0x0109692c: 0x109692c: beq   v1, zero, 0x1096b08 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10964c0
+	brfalse L_1096b08
 // --- basic block ---
-// 0x010962ec: 0x10962ec: lw    a0, 28(v1)
+// 0x01096934: 0x1096934: lw    a0, 28(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -686,14 +686,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010962f0: 0x10962f0: sll   zero, zero, 0
-// 0x010962f4: 0x10962f4: beq   a0, zero, 0x109630c addu  a1, s0, zero
+// 0x01096938: 0x1096938: sll   zero, zero, 0
+// 0x0109693c: 0x109693c: beq   a0, zero, 0x1096954 addu  a1, s0, zero
 	ldloc.1
 	ldloc 9
 	stloc.2
-	brfalse L_109630c
+	brfalse L_1096954
 // --- basic block ---
-// 0x010962fc: 0x10962fc: jal   0x10990ec addu  a2, s1, zero
+// 0x01096944: 0x1096944: jal   0x1099734 addu  a2, s1, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -701,57 +701,57 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_on_key_pressed_10990ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_on_key_pressed_1099734(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096304: 0x1096304: bne   v0, zero, 0x10964ac sll   zero, zero, 0
+// 0x0109694c: 0x109694c: bne   v0, zero, 0x1096af4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10964ac
+	brtrue L_1096af4
 // --- basic block ---
-L_109630c:
-// 0x0109630c: 0x109630c: andi  v0, s1, 1
+L_1096954:
+// 0x01096954: 0x1096954: andi  v0, s1, 1
 	ldloc 8
 	ldc.i4.1
 	and
 	stloc 5
-// 0x01096310: 0x1096310: beq   v0, zero, 0x109646c lui   v0, 0x80000
+// 0x01096958: 0x1096958: beq   v0, zero, 0x1096ab4 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_109646c
+	brfalse L_1096ab4
 // --- basic block ---
-// 0x01096318: 0x1096318: lbu   a0, 0(s0)
+// 0x01096960: 0x1096960: lbu   a0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x0109631c: 0x109631c: sll   zero, zero, 0
-// 0x01096320: 0x1096320: addiu a0, a0, -1
+// 0x01096964: 0x1096964: sll   zero, zero, 0
+// 0x01096968: 0x1096968: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01096324: 0x1096324: lw    v0, 9644(v0)
+// 0x0109696c: 0x109696c: lw    v0, 10108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2411
+	ldc.i4 2527
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096328: 0x1096328: andi  a0, a0, 255
+// 0x01096970: 0x1096970: andi  a0, a0, 255
 	ldloc.1
 	ldc.i4 255
 	and
 	stloc.1
-// 0x0109632c: 0x109632c: sltiu a1, a0, 7
+// 0x01096974: 0x1096974: sltiu a1, a0, 7
 	ldloc.1
 	ldc.i4.7
 	clt.un
 	stloc.2
-// 0x01096330: 0x1096330: lw    v1, 20(v0)
+// 0x01096978: 0x1096978: lw    v1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -760,41 +760,41 @@ L_109630c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01096334: 0x1096334: beq   a1, zero, 0x10964bc lui   a1, 0x20000
+// 0x0109697c: 0x109697c: beq   a1, zero, 0x1096b04 lui   a1, 0x20000
 	ldloc.2
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10964bc
+	brfalse L_1096b04
 // --- basic block ---
-// 0x0109633c: 0x109633c: sll   a0, a0, 2
+// 0x01096984: 0x1096984: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01096340: 0x1096340: addiu a1, a1, 29592
+// 0x01096988: 0x1096988: addiu a1, a1, 30056
 	ldloc.2
-	ldc.i4 29592
+	ldc.i4 30056
 	add
 	stloc.2
-// 0x01096344: 0x1096344: addu  a0, a1, a0
+// 0x0109698c: 0x109698c: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01096348: 0x1096348: lw    a0, 0(a0)
+// 0x01096990: 0x1096990: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109634c: 0x109634c: sll   zero, zero, 0
-// 0x01096350: 0x1096350: jr    a0 sll   zero, zero, 0
+// 0x01096994: 0x1096994: sll   zero, zero, 0
+// 0x01096998: 0x1096998: jr    a0 sll   zero, zero, 0
 	ldloc.1
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1096358:
-// 0x01096358: 0x1096358: lw    a1, 48(v1)
+L_10969a0:
+// 0x010969a0: 0x10969a0: lw    a1, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -803,21 +803,21 @@ L_1096358:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109635c: 0x109635c: lui   a0, 0x400000
+// 0x010969a4: 0x10969a4: lui   a0, 0x400000
 	ldc.i4 4194304
 	stloc.1
-// 0x01096360: 0x1096360: and   a0, a1, a0
+// 0x010969a8: 0x10969a8: and   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	and
 	stloc.1
-// 0x01096364: 0x1096364: beq   a0, zero, 0x10964a4 addiu a0, zero, 2
+// 0x010969ac: 0x10969ac: beq   a0, zero, 0x1096aec addiu a0, zero, 2
 	ldloc.1
 	ldc.i4.2
 	stloc.1
-	brfalse L_10964a4
+	brfalse L_1096aec
 // --- basic block ---
-// 0x0109636c: 0x109636c: lw    a0, 24(v0)
+// 0x010969b4: 0x10969b4: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -826,37 +826,37 @@ L_1096358:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01096370: 0x1096370: sll   zero, zero, 0
-// 0x01096374: 0x1096374: bne   a0, zero, 0x1096380 sll   zero, zero, 0
+// 0x010969b8: 0x10969b8: sll   zero, zero, 0
+// 0x010969bc: 0x10969bc: bne   a0, zero, 0x10969c8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1096380
+	brtrue L_10969c8
 // --- basic block ---
-// 0x0109637c: 0x109637c: addu  a0, v1, zero
+// 0x010969c4: 0x10969c4: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-L_1096380:
-// 0x01096380: 0x1096380: jal   0x109d640 sll   zero, zero, 0
+L_10969c8:
+// 0x010969c8: 0x10969c8: jal   0x109dc88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_move_tab_left_109d640(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_move_tab_left_109dc88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096388: 0x1096388: j	 0x10964ac sll   zero, zero, 0
-	br L_10964ac
+// 0x010969d0: 0x10969d0: j	 0x1096af4 sll   zero, zero, 0
+	br L_1096af4
 // --- basic block ---
-L_1096390:
-// 0x01096390: 0x1096390: j	 0x10964a4 addiu a0, zero, 4
+L_10969d8:
+// 0x010969d8: 0x10969d8: j	 0x1096aec addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-	br L_10964a4
+	br L_1096aec
 // --- basic block ---
-L_1096398:
-// 0x01096398: 0x1096398: lw    a1, 48(v1)
+L_10969e0:
+// 0x010969e0: 0x10969e0: lw    a1, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -865,21 +865,21 @@ L_1096398:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109639c: 0x109639c: lui   a0, 0x400000
+// 0x010969e4: 0x10969e4: lui   a0, 0x400000
 	ldc.i4 4194304
 	stloc.1
-// 0x010963a0: 0x10963a0: and   a0, a1, a0
+// 0x010969e8: 0x10969e8: and   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	and
 	stloc.1
-// 0x010963a4: 0x10963a4: beq   a0, zero, 0x10964a4 addiu a0, zero, 3
+// 0x010969ec: 0x10969ec: beq   a0, zero, 0x1096aec addiu a0, zero, 3
 	ldloc.1
 	ldc.i4.3
 	stloc.1
-	brfalse L_10964a4
+	brfalse L_1096aec
 // --- basic block ---
-// 0x010963ac: 0x10963ac: lw    a0, 24(v0)
+// 0x010969f4: 0x10969f4: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -888,37 +888,37 @@ L_1096398:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010963b0: 0x10963b0: sll   zero, zero, 0
-// 0x010963b4: 0x10963b4: bne   a0, zero, 0x10963c0 sll   zero, zero, 0
+// 0x010969f8: 0x10969f8: sll   zero, zero, 0
+// 0x010969fc: 0x10969fc: bne   a0, zero, 0x1096a08 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10963c0
+	brtrue L_1096a08
 // --- basic block ---
-// 0x010963bc: 0x10963bc: addu  a0, v1, zero
+// 0x01096a04: 0x1096a04: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-L_10963c0:
-// 0x010963c0: 0x10963c0: jal   0x109d7bc sll   zero, zero, 0
+L_1096a08:
+// 0x01096a08: 0x1096a08: jal   0x109de04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_move_tab_right_109d7bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_move_tab_right_109de04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010963c8: 0x10963c8: j	 0x10964ac sll   zero, zero, 0
-	br L_10964ac
+// 0x01096a10: 0x1096a10: j	 0x1096af4 sll   zero, zero, 0
+	br L_1096af4
 // --- basic block ---
-L_10963d0:
-// 0x010963d0: 0x10963d0: j	 0x10964a4 addiu a0, zero, 5
+L_1096a18:
+// 0x01096a18: 0x1096a18: j	 0x1096aec addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-	br L_10964a4
+	br L_1096aec
 // --- basic block ---
-L_10963d8:
-// 0x010963d8: 0x10963d8: lw    a0, 24(v0)
+L_1096a20:
+// 0x01096a20: 0x1096a20: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -927,12 +927,12 @@ L_10963d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010963dc: 0x10963dc: sll   zero, zero, 0
-// 0x010963e0: 0x10963e0: beq   a0, zero, 0x10963f8 sll   zero, zero, 0
+// 0x01096a24: 0x1096a24: sll   zero, zero, 0
+// 0x01096a28: 0x1096a28: beq   a0, zero, 0x1096a40 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10963f8
+	brfalse L_1096a40
 // --- basic block ---
-// 0x010963e8: 0x10963e8: lw    v0, 156(a0)
+// 0x01096a30: 0x1096a30: lw    v0, 156(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -941,13 +941,13 @@ L_10963d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010963ec: 0x10963ec: sll   zero, zero, 0
-// 0x010963f0: 0x10963f0: bne   v0, zero, 0x1096444 sll   zero, zero, 0
+// 0x01096a34: 0x1096a34: sll   zero, zero, 0
+// 0x01096a38: 0x1096a38: bne   v0, zero, 0x1096a8c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1096444
+	brtrue L_1096a8c
 // --- basic block ---
-L_10963f8:
-// 0x010963f8: 0x10963f8: lw    v0, 156(v1)
+L_1096a40:
+// 0x01096a40: 0x1096a40: lw    v0, 156(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -956,19 +956,19 @@ L_10963f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010963fc: 0x10963fc: sll   zero, zero, 0
-// 0x01096400: 0x1096400: bne   v0, zero, 0x1096440 sll   zero, zero, 0
+// 0x01096a44: 0x1096a44: sll   zero, zero, 0
+// 0x01096a48: 0x1096a48: bne   v0, zero, 0x1096a88 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1096440
+	brtrue L_1096a88
 // --- basic block ---
-L_1096408:
-// 0x01096408: 0x1096408: j	 0x1096490 addiu a0, zero, 2
+L_1096a50:
+// 0x01096a50: 0x1096a50: j	 0x1096ad8 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-	br L_1096490
+	br L_1096ad8
 // --- basic block ---
-L_1096410:
-// 0x01096410: 0x1096410: lw    a0, 24(v0)
+L_1096a58:
+// 0x01096a58: 0x1096a58: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -977,12 +977,12 @@ L_1096410:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01096414: 0x1096414: sll   zero, zero, 0
-// 0x01096418: 0x1096418: beq   a0, zero, 0x1096430 sll   zero, zero, 0
+// 0x01096a5c: 0x1096a5c: sll   zero, zero, 0
+// 0x01096a60: 0x1096a60: beq   a0, zero, 0x1096a78 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1096430
+	brfalse L_1096a78
 // --- basic block ---
-// 0x01096420: 0x1096420: lw    v0, 160(a0)
+// 0x01096a68: 0x1096a68: lw    v0, 160(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -991,13 +991,13 @@ L_1096410:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096424: 0x1096424: sll   zero, zero, 0
-// 0x01096428: 0x1096428: bne   v0, zero, 0x1096444 sll   zero, zero, 0
+// 0x01096a6c: 0x1096a6c: sll   zero, zero, 0
+// 0x01096a70: 0x1096a70: bne   v0, zero, 0x1096a8c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1096444
+	brtrue L_1096a8c
 // --- basic block ---
-L_1096430:
-// 0x01096430: 0x1096430: lw    v0, 160(v1)
+L_1096a78:
+// 0x01096a78: 0x1096a78: lw    v0, 160(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1006,17 +1006,17 @@ L_1096430:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096434: 0x1096434: sll   zero, zero, 0
-// 0x01096438: 0x1096438: beq   v0, zero, 0x109645c sll   zero, zero, 0
+// 0x01096a7c: 0x1096a7c: sll   zero, zero, 0
+// 0x01096a80: 0x1096a80: beq   v0, zero, 0x1096aa4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109645c
+	brfalse L_1096aa4
 // --- basic block ---
-L_1096440:
-// 0x01096440: 0x1096440: addu  a0, v1, zero
+L_1096a88:
+// 0x01096a88: 0x1096a88: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-L_1096444:
-// 0x01096444: 0x1096444: lw    a1, 16(a0)
+L_1096a8c:
+// 0x01096a8c: 0x1096a8c: lw    a1, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1025,7 +1025,7 @@ L_1096444:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01096448: 0x1096448: lw    a2, 116(a0)
+// 0x01096a90: 0x1096a90: lw    a2, 116(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1034,7 +1034,7 @@ L_1096444:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109644c: 0x109644c: jalr  v0 sll   zero, zero, 0
+// 0x01096a94: 0x1096a94: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1046,11 +1046,11 @@ L_1096444:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096454: 0x1096454: j	 0x10964ac sll   zero, zero, 0
-	br L_10964ac
+// 0x01096a9c: 0x1096a9c: j	 0x1096af4 sll   zero, zero, 0
+	br L_1096af4
 // --- basic block ---
-L_109645c:
-// 0x0109645c: 0x109645c: jal   0x1094a94 addiu a0, zero, 2
+L_1096aa4:
+// 0x01096aa4: 0x1096aa4: jal   0x10950dc addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1058,100 +1058,100 @@ L_109645c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096464: 0x1096464: j	 0x10964ac sll   zero, zero, 0
-	br L_10964ac
+// 0x01096aac: 0x1096aac: j	 0x1096af4 sll   zero, zero, 0
+	br L_1096af4
 // --- basic block ---
-L_109646c:
-// 0x0109646c: 0x109646c: andi  s1, s1, 2
+L_1096ab4:
+// 0x01096ab4: 0x1096ab4: andi  s1, s1, 2
 	ldloc 8
 	ldc.i4.2
 	and
 	stloc 8
-// 0x01096470: 0x1096470: beq   s1, zero, 0x10964ac addiu v1, zero, 9
+// 0x01096ab8: 0x1096ab8: beq   s1, zero, 0x1096af4 addiu v1, zero, 9
 	ldloc 8
 	ldc.i4.s 9
 	stloc 7
-	brfalse L_10964ac
+	brfalse L_1096af4
 // --- basic block ---
-// 0x01096478: 0x1096478: lb    v0, 0(s0)
+// 0x01096ac0: 0x1096ac0: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109647c: 0x109647c: sll   zero, zero, 0
-// 0x01096480: 0x1096480: beq   v0, v1, 0x10964a0 addiu v1, zero, 27
+// 0x01096ac4: 0x1096ac4: sll   zero, zero, 0
+// 0x01096ac8: 0x1096ac8: beq   v0, v1, 0x1096ae8 addiu v1, zero, 27
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 27
 	stloc 7
-	beq  L_10964a0
+	beq  L_1096ae8
 // --- basic block ---
-// 0x01096488: 0x1096488: bne   v0, v1, 0x10964bc addiu a0, zero, 1
+// 0x01096ad0: 0x1096ad0: bne   v0, v1, 0x1096b04 addiu a0, zero, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	stloc.1
-	bne.un L_10964bc
+	bne.un L_1096b04
 // --- basic block ---
-L_1096490:
-// 0x01096490: 0x1096490: jal   0x1094b64 sll   zero, zero, 0
+L_1096ad8:
+// 0x01096ad8: 0x1096ad8: jal   0x10951ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096498: 0x1096498: j	 0x10964ac sll   zero, zero, 0
-	br L_10964ac
+// 0x01096ae0: 0x1096ae0: j	 0x1096af4 sll   zero, zero, 0
+	br L_1096af4
 // --- basic block ---
-L_10964a0:
-// 0x010964a0: 0x10964a0: addiu a0, zero, 1
+L_1096ae8:
+// 0x01096ae8: 0x1096ae8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_10964a4:
-// 0x010964a4: 0x10964a4: jal   0x1096264 sll   zero, zero, 0
+L_1096aec:
+// 0x01096aec: 0x1096aec: jal   0x10968ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_move_focus_1096264(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_move_focus_10968ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10964ac:
-// 0x010964ac: 0x10964ac: jal   0x1021900 sll   zero, zero, 0
+L_1096af4:
+// 0x01096af4: 0x1096af4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010964b4: 0x10964b4: j	 0x10964c0 addiu v0, zero, 1
+// 0x01096afc: 0x1096afc: j	 0x1096b08 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10964c0
+	br L_1096b08
 // --- basic block ---
-L_10964bc:
-// 0x010964bc: 0x10964bc: addu  v0, zero, zero
+L_1096b04:
+// 0x01096b04: 0x1096b04: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10964c0:
-// 0x010964c0: 0x10964c0: lw    ra, 28(sp)
-// 0x010964c4: 0x10964c4: lw    s1, 24(sp)
+L_1096b08:
+// 0x01096b08: 0x1096b08: lw    ra, 28(sp)
+// 0x01096b0c: 0x1096b0c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1160,7 +1160,7 @@ L_10964c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010964c8: 0x10964c8: lw    s0, 20(sp)
+// 0x01096b10: 0x1096b10: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1169,7 +1169,7 @@ L_10964c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010964cc: 0x10964cc: jr    ra addiu sp, sp, 32
+// 0x01096b14: 0x1096b14: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1179,26 +1179,26 @@ L_10964c0:
 __CIBYL_local_jumptab:
 	stloc.1
 	ldloc.1
-	ldc.i4 17392472
-	beq  L_1096358
+	ldc.i4 17394080
+	beq  L_10969a0
 	ldloc.1
-	ldc.i4 17392528
-	beq  L_1096390
+	ldc.i4 17394136
+	beq  L_10969d8
 	ldloc.1
-	ldc.i4 17392536
-	beq  L_1096398
+	ldc.i4 17394144
+	beq  L_10969e0
 	ldloc.1
-	ldc.i4 17392592
-	beq  L_10963d0
+	ldc.i4 17394200
+	beq  L_1096a18
 	ldloc.1
-	ldc.i4 17392600
-	beq  L_10963d8
+	ldc.i4 17394208
+	beq  L_1096a20
 	ldloc.1
-	ldc.i4 17392648
-	beq  L_1096408
+	ldc.i4 17394256
+	beq  L_1096a50
 	ldloc.1
-	ldc.i4 17392656
-	beq  L_1096410
+	ldc.i4 17394264
+	beq  L_1096a58
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -1206,7 +1206,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_entry_set_kb_params_10964f4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_entry_set_kb_params_1096b3c(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -1241,7 +1241,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010964f4: 0x10964f4: lw    v0, 116(a0)
+// 0x01096b3c: 0x1096b3c: lw    v0, 116(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1250,12 +1250,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010964f8: 0x10964f8: sll   zero, zero, 0
-// 0x010964fc: 0x10964fc: beq   v0, zero, 0x1096520 sll   zero, zero, 0
+// 0x01096b40: 0x1096b40: sll   zero, zero, 0
+// 0x01096b44: 0x1096b44: beq   v0, zero, 0x1096b68 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1096520
+	brfalse L_1096b68
 // --- basic block ---
-// 0x01096504: 0x1096504: lw    v1, 20(sp)
+// 0x01096b4c: 0x1096b4c: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1264,7 +1264,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01096508: 0x1096508: sw    a1, 4(v0)
+// 0x01096b50: 0x1096b50: sw    a1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1273,7 +1273,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109650c: 0x109650c: sw    v1, 20(v0)
+// 0x01096b54: 0x1096b54: sw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1282,7 +1282,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01096510: 0x1096510: lw    v1, 16(sp)
+// 0x01096b58: 0x1096b58: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1291,7 +1291,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01096514: 0x1096514: sw    a2, 8(v0)
+// 0x01096b5c: 0x1096b5c: sw    a2, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1300,7 +1300,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01096518: 0x1096518: sw    a3, 12(v0)
+// 0x01096b60: 0x1096b60: sw    a3, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1309,7 +1309,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109651c: 0x109651c: sw    v1, 16(v0)
+// 0x01096b64: 0x1096b64: sw    v1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1318,8 +1318,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-L_1096520:
-// 0x01096520: 0x1096520: jr    ra sll   zero, zero, 0
+L_1096b68:
+// 0x01096b68: 0x1096b68: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -1327,7 +1327,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_entry_set_editbox_title_1096544(int32,int32)
+.method public static int32 ssd_entry_set_editbox_title_1096b8c(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -1350,7 +1350,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096544: 0x1096544: lw    v0, 116(a0)
+// 0x01096b8c: 0x1096b8c: lw    v0, 116(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1359,12 +1359,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01096548: 0x1096548: sll   zero, zero, 0
-// 0x0109654c: 0x109654c: beq   v0, zero, 0x1096558 sll   zero, zero, 0
+// 0x01096b90: 0x1096b90: sll   zero, zero, 0
+// 0x01096b94: 0x1096b94: beq   v0, zero, 0x1096ba0 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1096558
+	brfalse L_1096ba0
 // --- basic block ---
-// 0x01096554: 0x1096554: sw    a1, 24(v0)
+// 0x01096b9c: 0x1096b9c: sw    a1, 24(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -1373,14 +1373,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-L_1096558:
-// 0x01096558: 0x1096558: jr    ra sll   zero, zero, 0
+L_1096ba0:
+// 0x01096ba0: 0x1096ba0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 confirmed_edit_callback_1096560(int32,int32,int32,int32,int32)
+.method public static int32 confirmed_edit_callback_1096ba8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -1415,7 +1415,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096560: 0x1096560: lw    v1, 4(a0)
+// 0x01096ba8: 0x1096ba8: lw    v1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1424,10 +1424,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01096564: 0x1096564: addu  v0, a0, zero
+// 0x01096bac: 0x1096bac: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01096568: 0x1096568: lw    v1, 116(v1)
+// 0x01096bb0: 0x1096bb0: lw    v1, 116(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1436,39 +1436,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109656c: 0x109656c: lui   a0, 0x0
+// 0x01096bb4: 0x1096bb4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01096570: 0x1096570: lw    a1, 0(v1)
+// 0x01096bb8: 0x1096bb8: lw    a1, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01096574: 0x1096574: lui   a3, 0x1090000
+// 0x01096bbc: 0x1096bbc: lui   a3, 0x1090000
 	ldc.i4 17367040
 	stloc 4
-// 0x01096578: 0x1096578: addiu sp, sp, -32
+// 0x01096bc0: 0x1096bc0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109657c: 0x109657c: addiu a0, a0, 25892
+// 0x01096bc4: 0x1096bc4: addiu a0, a0, 25892
 	ldloc.1
 	ldc.i4 25892
 	add
 	stloc.1
-// 0x01096580: 0x1096580: addiu a3, a3, 26216
+// 0x01096bc8: 0x1096bc8: addiu a3, a3, 27824
 	ldloc 4
-	ldc.i4 26216
+	ldc.i4 27824
 	add
 	stloc 4
-// 0x01096584: 0x1096584: addu  a2, zero, zero
+// 0x01096bcc: 0x1096bcc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01096588: 0x1096588: sw    ra, 28(sp)
-// 0x0109658c: 0x109658c: jal   0x104c320 sw    v0, 16(sp)
+// 0x01096bd0: 0x1096bd0: sw    ra, 28(sp)
+// 0x01096bd4: 0x1096bd4: jal   0x104c330 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1482,16 +1482,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01096594: 0x1096594: lw    ra, 28(sp)
-// 0x01096598: 0x1096598: addiu v0, zero, 1
+// 0x01096bdc: 0x1096bdc: lw    ra, 28(sp)
+// 0x01096be0: 0x1096be0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0109659c: 0x109659c: jr    ra addiu sp, sp, 32
+// 0x01096be4: 0x1096be4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1503,7 +1503,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 edit_callback_10965a4(int32,int32,int32,int32,int32)
+.method public static int32 edit_callback_1096bec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -1544,7 +1544,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010965a4: 0x10965a4: lw    a3, 4(a0)
+// 0x01096bec: 0x1096bec: lw    a3, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1553,12 +1553,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010965a8: 0x10965a8: addiu sp, sp, -48
+// 0x01096bf0: 0x1096bf0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010965ac: 0x10965ac: lw    v0, 168(a3)
+// 0x01096bf4: 0x1096bf4: lw    v0, 168(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -1567,8 +1567,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010965b0: 0x10965b0: sw    ra, 44(sp)
-// 0x010965b4: 0x10965b4: sw    s1, 40(sp)
+// 0x01096bf8: 0x1096bf8: sw    ra, 44(sp)
+// 0x01096bfc: 0x1096bfc: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1577,7 +1577,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010965b8: 0x10965b8: sw    s0, 36(sp)
+// 0x01096c00: 0x1096c00: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1586,7 +1586,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010965bc: 0x10965bc: sw    a3, 24(sp)
+// 0x01096c04: 0x1096c04: sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1595,7 +1595,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010965c0: 0x10965c0: lw    s1, 116(a3)
+// 0x01096c08: 0x1096c08: lw    s1, 116(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -1604,7 +1604,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010965c4: 0x10965c4: jalr  v0 addu  a0, a3, zero
+// 0x01096c0c: 0x1096c0c: jalr  v0 addu  a0, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc.1
@@ -1618,7 +1618,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010965cc: 0x10965cc: lw    a3, 24(sp)
+// 0x01096c14: 0x1096c14: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1627,10 +1627,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010965d0: 0x10965d0: lui   a1, 0x20000
+// 0x01096c18: 0x1096c18: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010965d4: 0x10965d4: lw    a0, 12(a3)
+// 0x01096c1c: 0x1096c1c: lw    a0, 12(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -1639,12 +1639,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010965d8: 0x10965d8: addiu a1, a1, -568
+// 0x01096c20: 0x1096c20: addiu a1, a1, -104
 	ldloc.2
-	ldc.i4 -568
+	ldc.i4.s -104
 	add
 	stloc.2
-// 0x010965dc: 0x10965dc: jal   0x109b304 addu  s0, v0, zero
+// 0x01096c24: 0x1096c24: jal   0x109b94c addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -1652,12 +1652,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010965e4: 0x10965e4: lw    a3, 24(sp)
+// 0x01096c2c: 0x1096c2c: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1666,11 +1666,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010965e8: 0x10965e8: beq   v0, zero, 0x1096628 sll   zero, zero, 0
+// 0x01096c30: 0x1096c30: beq   v0, zero, 0x1096c70 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1096628
+	brfalse L_1096c70
 // --- basic block ---
-// 0x010965f0: 0x10965f0: lw    v0, 48(v0)
+// 0x01096c38: 0x1096c38: lw    v0, 48(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1679,17 +1679,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010965f4: 0x10965f4: sll   zero, zero, 0
-// 0x010965f8: 0x10965f8: andi  v0, v0, 8192
+// 0x01096c3c: 0x1096c3c: sll   zero, zero, 0
+// 0x01096c40: 0x1096c40: andi  v0, v0, 8192
 	ldloc 6
 	ldc.i4 8192
 	and
 	stloc 6
-// 0x010965fc: 0x10965fc: beq   v0, zero, 0x1096628 sll   zero, zero, 0
+// 0x01096c44: 0x1096c44: beq   v0, zero, 0x1096c70 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1096628
+	brfalse L_1096c70
 // --- basic block ---
-// 0x01096604: 0x1096604: lw    a0, 24(s1)
+// 0x01096c4c: 0x1096c4c: lw    a0, 24(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1698,14 +1698,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01096608: 0x1096608: sll   zero, zero, 0
-// 0x0109660c: 0x109660c: bne   a0, zero, 0x1096618 lui   a2, 0x1090000
+// 0x01096c50: 0x1096c50: sll   zero, zero, 0
+// 0x01096c54: 0x1096c54: bne   a0, zero, 0x1096c60 lui   a2, 0x1090000
 	ldloc.1
 	ldc.i4 17367040
 	stloc.3
-	brtrue L_1096618
+	brtrue L_1096c60
 // --- basic block ---
-// 0x01096614: 0x1096614: lw    a0, 4(s1)
+// 0x01096c5c: 0x1096c5c: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1714,22 +1714,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-L_1096618:
-// 0x01096618: 0x1096618: addu  a1, s0, zero
+L_1096c60:
+// 0x01096c60: 0x1096c60: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0109661c: 0x109661c: addiu a2, a2, 26260
+// 0x01096c64: 0x1096c64: addiu a2, a2, 27868
 	ldloc.3
-	ldc.i4 26260
+	ldc.i4 27868
 	add
 	stloc.3
-// 0x01096620: 0x1096620: j	 0x1096648 addiu v0, zero, 2
+// 0x01096c68: 0x1096c68: j	 0x1096c90 addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-	br L_1096648
+	br L_1096c90
 // --- basic block ---
-L_1096628:
-// 0x01096628: 0x1096628: lw    a0, 24(s1)
+L_1096c70:
+// 0x01096c70: 0x1096c70: lw    a0, 24(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1738,14 +1738,14 @@ L_1096628:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109662c: 0x109662c: sll   zero, zero, 0
-// 0x01096630: 0x1096630: bne   a0, zero, 0x109663c lui   a2, 0x1090000
+// 0x01096c74: 0x1096c74: sll   zero, zero, 0
+// 0x01096c78: 0x1096c78: bne   a0, zero, 0x1096c84 lui   a2, 0x1090000
 	ldloc.1
 	ldc.i4 17367040
 	stloc.3
-	brtrue L_109663c
+	brtrue L_1096c84
 // --- basic block ---
-// 0x01096638: 0x1096638: lw    a0, 4(s1)
+// 0x01096c80: 0x1096c80: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1754,20 +1754,20 @@ L_1096628:
 	add
 	ldelem.i4
 	stloc.1
-L_109663c:
-// 0x0109663c: 0x109663c: addu  a1, s0, zero
+L_1096c84:
+// 0x01096c84: 0x1096c84: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01096640: 0x1096640: addiu a2, a2, 26260
+// 0x01096c88: 0x1096c88: addiu a2, a2, 27868
 	ldloc.3
-	ldc.i4 26260
+	ldc.i4 27868
 	add
 	stloc.3
-// 0x01096644: 0x1096644: addiu v0, zero, 1
+// 0x01096c8c: 0x1096c8c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1096648:
-// 0x01096648: 0x1096648: jal   0x1052e08 sw    v0, 16(sp)
+L_1096c90:
+// 0x01096c90: 0x1096c90: jal   0x1052e18 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1781,16 +1781,16 @@ L_1096648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01096650: 0x1096650: lw    ra, 44(sp)
-// 0x01096654: 0x1096654: addiu v0, zero, 1
+// 0x01096c98: 0x1096c98: lw    ra, 44(sp)
+// 0x01096c9c: 0x1096c9c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01096658: 0x1096658: lw    s1, 40(sp)
+// 0x01096ca0: 0x1096ca0: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1799,7 +1799,7 @@ L_1096648:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109665c: 0x109665c: lw    s0, 36(sp)
+// 0x01096ca4: 0x1096ca4: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1808,7 +1808,7 @@ L_1096648:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096660: 0x1096660: jr    ra addiu sp, sp, 48
+// 0x01096ca8: 0x1096ca8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1820,7 +1820,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 confirm_cb_1096668(int32,int32,int32,int32,int32)
+.method public static int32 confirm_cb_1096cb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1855,23 +1855,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096668: 0x1096668: addiu sp, sp, -24
+// 0x01096cb0: 0x1096cb0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109666c: 0x109666c: addiu v0, zero, 3
+// 0x01096cb4: 0x1096cb4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01096670: 0x1096670: bne   a0, v0, 0x1096684 sw    ra, 20(sp)
+// 0x01096cb8: 0x1096cb8: bne   a0, v0, 0x1096ccc sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1096684
+	bne.un L_1096ccc
 // --- basic block ---
-// 0x01096678: 0x1096678: addu  a0, a1, zero
+// 0x01096cc0: 0x1096cc0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0109667c: 0x109667c: jal   0x10965a4 addu  a1, zero, zero
+// 0x01096cc4: 0x1096cc4: jal   0x1096bec addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1879,15 +1879,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::edit_callback_10965a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::edit_callback_1096bec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1096684:
-// 0x01096684: 0x1096684: lw    ra, 20(sp)
-// 0x01096688: 0x1096688: sll   zero, zero, 0
-// 0x0109668c: 0x109668c: jr    ra addiu sp, sp, 24
+L_1096ccc:
+// 0x01096ccc: 0x1096ccc: lw    ra, 20(sp)
+// 0x01096cd0: 0x1096cd0: sll   zero, zero, 0
+// 0x01096cd4: 0x1096cd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1899,7 +1899,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_kb_closed_1096694(int32,int32,int32,int32,int32)
+.method public static int32 on_kb_closed_1096cdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1943,15 +1943,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096694: 0x1096694: addiu sp, sp, -40
+// 0x01096cdc: 0x1096cdc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01096698: 0x1096698: addiu v0, zero, 1
+// 0x01096ce0: 0x1096ce0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0109669c: 0x109669c: sw    s2, 32(sp)
+// 0x01096ce4: 0x1096ce4: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1960,7 +1960,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010966a0: 0x10966a0: sw    s1, 28(sp)
+// 0x01096ce8: 0x1096ce8: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1969,7 +1969,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010966a4: 0x10966a4: sw    s0, 24(sp)
+// 0x01096cec: 0x1096cec: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1978,11 +1978,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010966a8: 0x10966a8: sw    ra, 36(sp)
-// 0x010966ac: 0x10966ac: addu  s1, a0, zero
+// 0x01096cf0: 0x1096cf0: sw    ra, 36(sp)
+// 0x01096cf4: 0x1096cf4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010966b0: 0x10966b0: lw    s2, 116(a2)
+// 0x01096cf8: 0x1096cf8: lw    s2, 116(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -1991,14 +1991,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010966b4: 0x10966b4: bne   a0, v0, 0x1096720 addu  s0, a1, zero
+// 0x01096cfc: 0x1096cfc: bne   a0, v0, 0x1096d68 addu  s0, a1, zero
 	ldloc.1
 	ldloc 6
 	ldloc.2
 	stloc 8
-	bne.un L_1096720
+	bne.un L_1096d68
 // --- basic block ---
-// 0x010966bc: 0x10966bc: lw    v0, 176(a2)
+// 0x01096d04: 0x1096d04: lw    v0, 176(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2007,10 +2007,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010966c0: 0x10966c0: addu  a0, a2, zero
+// 0x01096d08: 0x1096d08: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010966c4: 0x10966c4: jalr  v0 sw    a2, 16(sp)
+// 0x01096d0c: 0x1096d0c: jalr  v0 sw    a2, 16(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -2030,7 +2030,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010966cc: 0x10966cc: lw    a2, 16(sp)
+// 0x01096d14: 0x1096d14: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2039,27 +2039,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010966d0: 0x10966d0: beq   s0, zero, 0x1096704 lui   a1, 0x20000
+// 0x01096d18: 0x1096d18: beq   s0, zero, 0x1096d4c lui   a1, 0x20000
 	ldloc 8
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1096704
+	brfalse L_1096d4c
 // --- basic block ---
-// 0x010966d8: 0x10966d8: lb    v0, 0(s0)
+// 0x01096d20: 0x1096d20: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010966dc: 0x10966dc: sll   zero, zero, 0
-// 0x010966e0: 0x10966e0: beq   v0, zero, 0x1096704 sll   zero, zero, 0
+// 0x01096d24: 0x1096d24: sll   zero, zero, 0
+// 0x01096d28: 0x1096d28: beq   v0, zero, 0x1096d4c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1096704
+	brfalse L_1096d4c
 // --- basic block ---
-// 0x010966e8: 0x10966e8: addu  a0, a2, zero
+// 0x01096d30: 0x1096d30: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010966ec: 0x10966ec: jal   0x109b304 addiu a1, a1, -2924
+// 0x01096d34: 0x1096d34: jal   0x109b94c addiu a1, a1, -2460
 	ldloc.2
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.2
 	ldloc.0
@@ -2067,31 +2067,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010966f4: 0x10966f4: jal   0x1099098 addu  a0, v0, zero
+// 0x01096d3c: 0x1096d3c: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 6
 // --- basic block ---
-// 0x010966fc: 0x10966fc: j	 0x109671c sll   zero, zero, 0
-	br L_109671c
+// 0x01096d44: 0x1096d44: j	 0x1096d64 sll   zero, zero, 0
+	br L_1096d64
 // --- basic block ---
-L_1096704:
-// 0x01096704: 0x1096704: addu  a0, a2, zero
+L_1096d4c:
+// 0x01096d4c: 0x1096d4c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01096708: 0x1096708: addiu a1, a1, -2924
+// 0x01096d50: 0x1096d50: addiu a1, a1, -2460
 	ldloc.2
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.2
-// 0x0109670c: 0x109670c: jal   0x109b304 sw    a2, 16(sp)
+// 0x01096d54: 0x1096d54: jal   0x109b94c sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2105,22 +2105,22 @@ L_1096704:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01096714: 0x1096714: jal   0x10990ac addu  a0, v0, zero
+// 0x01096d5c: 0x1096d5c: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_109671c:
-// 0x0109671c: 0x109671c: lw    a2, 16(sp)
+L_1096d64:
+// 0x01096d64: 0x1096d64: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2129,8 +2129,8 @@ L_109671c:
 	add
 	ldelem.i4
 	stloc.3
-L_1096720:
-// 0x01096720: 0x1096720: lw    v1, 16(s2)
+L_1096d68:
+// 0x01096d68: 0x1096d68: lw    v1, 16(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2139,17 +2139,17 @@ L_1096720:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01096724: 0x1096724: sll   zero, zero, 0
-// 0x01096728: 0x1096728: beq   v1, zero, 0x109673c addiu v0, zero, 1
+// 0x01096d6c: 0x1096d6c: sll   zero, zero, 0
+// 0x01096d70: 0x1096d70: beq   v1, zero, 0x1096d84 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 6
-	brfalse L_109673c
+	brfalse L_1096d84
 // --- basic block ---
-// 0x01096730: 0x1096730: addu  a0, s1, zero
+// 0x01096d78: 0x1096d78: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01096734: 0x1096734: jalr  v1 addu  a1, s0, zero
+// 0x01096d7c: 0x1096d7c: jalr  v1 addu  a1, s0, zero
 	ldloc 7
 	ldloc 8
 	stloc.2
@@ -2163,9 +2163,9 @@ L_1096720:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_109673c:
-// 0x0109673c: 0x109673c: lw    ra, 36(sp)
-// 0x01096740: 0x1096740: lw    s2, 32(sp)
+L_1096d84:
+// 0x01096d84: 0x1096d84: lw    ra, 36(sp)
+// 0x01096d88: 0x1096d88: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2174,7 +2174,7 @@ L_109673c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01096744: 0x1096744: lw    s1, 28(sp)
+// 0x01096d8c: 0x1096d8c: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2183,7 +2183,7 @@ L_109673c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01096748: 0x1096748: lw    s0, 24(sp)
+// 0x01096d90: 0x1096d90: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2192,7 +2192,7 @@ L_109673c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109674c: 0x109674c: jr    ra addiu sp, sp, 40
+// 0x01096d94: 0x1096d94: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2204,7 +2204,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 set_value_1096754(int32,int32,int32,int32,int32)
+.method public static int32 set_value_1096d9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -2245,12 +2245,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096754: 0x1096754: addiu sp, sp, -32
+// 0x01096d9c: 0x1096d9c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01096758: 0x1096758: sw    s1, 24(sp)
+// 0x01096da0: 0x1096da0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2259,7 +2259,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109675c: 0x109675c: sw    s0, 20(sp)
+// 0x01096da4: 0x1096da4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2268,31 +2268,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01096760: 0x1096760: sw    ra, 28(sp)
-// 0x01096764: 0x1096764: addu  s0, a1, zero
+// 0x01096da8: 0x1096da8: sw    ra, 28(sp)
+// 0x01096dac: 0x1096dac: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01096768: 0x1096768: beq   a1, zero, 0x109679c addu  s1, a0, zero
+// 0x01096db0: 0x1096db0: beq   a1, zero, 0x1096de4 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 8
-	brfalse L_109679c
+	brfalse L_1096de4
 // --- basic block ---
-// 0x01096770: 0x1096770: lb    v0, 0(a1)
+// 0x01096db8: 0x1096db8: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01096774: 0x1096774: sll   zero, zero, 0
-// 0x01096778: 0x1096778: beq   v0, zero, 0x109679c sll   zero, zero, 0
+// 0x01096dbc: 0x1096dbc: sll   zero, zero, 0
+// 0x01096dc0: 0x1096dc0: beq   v0, zero, 0x1096de4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109679c
+	brfalse L_1096de4
 // --- basic block ---
-// 0x01096780: 0x1096780: lui   a1, 0x20000
+// 0x01096dc8: 0x1096dc8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01096784: 0x1096784: jal   0x109b304 addiu a1, a1, -2924
+// 0x01096dcc: 0x1096dcc: jal   0x109b94c addiu a1, a1, -2460
 	ldloc.2
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.2
 	ldloc.0
@@ -2300,33 +2300,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109678c: 0x109678c: jal   0x1099098 addu  a0, v0, zero
+// 0x01096dd4: 0x1096dd4: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01096794: 0x1096794: j	 0x10967b8 lui   a1, 0x20000
+// 0x01096ddc: 0x1096ddc: j	 0x1096e00 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_10967b8
+	br L_1096e00
 // --- basic block ---
-L_109679c:
-// 0x0109679c: 0x109679c: lui   a1, 0x20000
+L_1096de4:
+// 0x01096de4: 0x1096de4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010967a0: 0x10967a0: addu  a0, s1, zero
+// 0x01096de8: 0x1096de8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010967a4: 0x10967a4: jal   0x109b304 addiu a1, a1, -2924
+// 0x01096dec: 0x1096dec: jal   0x109b94c addiu a1, a1, -2460
 	ldloc.2
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.2
 	ldloc.0
@@ -2334,33 +2334,33 @@ L_109679c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010967ac: 0x10967ac: jal   0x10990ac addu  a0, v0, zero
+// 0x01096df4: 0x1096df4: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010967b4: 0x10967b4: lui   a1, 0x20000
+// 0x01096dfc: 0x1096dfc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10967b8:
-// 0x010967b8: 0x10967b8: addu  a0, s1, zero
+L_1096e00:
+// 0x01096e00: 0x1096e00: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010967bc: 0x10967bc: addu  a2, s0, zero
+// 0x01096e04: 0x1096e04: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x010967c0: 0x10967c0: jal   0x109b3e0 addiu a1, a1, -568
+// 0x01096e08: 0x1096e08: jal   0x109ba28 addiu a1, a1, -104
 	ldloc.2
-	ldc.i4 -568
+	ldc.i4.s -104
 	add
 	stloc.2
 	ldloc.0
@@ -2368,13 +2368,13 @@ L_10967b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010967c8: 0x10967c8: lw    ra, 28(sp)
-// 0x010967cc: 0x10967cc: lw    s1, 24(sp)
+// 0x01096e10: 0x1096e10: lw    ra, 28(sp)
+// 0x01096e14: 0x1096e14: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2383,7 +2383,7 @@ L_10967b8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010967d0: 0x10967d0: lw    s0, 20(sp)
+// 0x01096e18: 0x1096e18: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2392,7 +2392,7 @@ L_10967b8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010967d4: 0x10967d4: jr    ra addiu sp, sp, 32
+// 0x01096e1c: 0x1096e1c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2404,7 +2404,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_value_10967dc(int32,int32,int32,int32,int32)
+.method public static int32 get_value_1096e24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2439,18 +2439,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010967dc: 0x10967dc: lui   a1, 0x20000
+// 0x01096e24: 0x1096e24: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010967e0: 0x10967e0: addiu sp, sp, -24
+// 0x01096e28: 0x1096e28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010967e4: 0x10967e4: sw    ra, 20(sp)
-// 0x010967e8: 0x10967e8: jal   0x109b634 addiu a1, a1, -568
+// 0x01096e2c: 0x1096e2c: sw    ra, 20(sp)
+// 0x01096e30: 0x1096e30: jal   0x109bc7c addiu a1, a1, -104
 	ldloc.2
-	ldc.i4 -568
+	ldc.i4.s -104
 	add
 	stloc.2
 	ldloc.0
@@ -2458,14 +2458,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010967f0: 0x10967f0: lw    ra, 20(sp)
-// 0x010967f4: 0x10967f4: sll   zero, zero, 0
-// 0x010967f8: 0x10967f8: jr    ra addiu sp, sp, 24
+// 0x01096e38: 0x1096e38: lw    ra, 20(sp)
+// 0x01096e3c: 0x1096e3c: sll   zero, zero, 0
+// 0x01096e40: 0x1096e40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2477,7 +2477,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 T_20_1096800(int32,int32,int32,int32,int32)
+.method public static int32 T_20_1096e48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 ra,int32 v1)
@@ -2515,16 +2515,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096800: 0x1096800: addiu sp, sp, -24
+// 0x01096e48: 0x1096e48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01096804: 0x1096804: addiu a0, zero, 28
+// 0x01096e4c: 0x1096e4c: addiu a0, zero, 28
 	ldc.i4.s 28
 	stloc.1
-// 0x01096808: 0x1096808: sw    ra, 20(sp)
-// 0x0109680c: 0x109680c: jal   0x1000910 sw    s0, 16(sp)
+// 0x01096e50: 0x1096e50: sw    ra, 20(sp)
+// 0x01096e54: 0x1096e54: jal   0x1000910 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2543,16 +2543,16 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01096814: 0x1096814: addu  a0, v0, zero
+// 0x01096e5c: 0x1096e5c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096818: 0x1096818: addu  a1, zero, zero
+// 0x01096e60: 0x1096e60: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109681c: 0x109681c: addiu a2, zero, 28
+// 0x01096e64: 0x1096e64: addiu a2, zero, 28
 	ldc.i4.s 28
 	stloc.3
-// 0x01096820: 0x1096820: jal   0x100177c addu  s0, v0, zero
+// 0x01096e68: 0x1096e68: jal   0x100177c addu  s0, v0, zero
 	ldloc 5
 	stloc 6
 	ldloc.1
@@ -2564,11 +2564,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01096828: 0x1096828: lw    ra, 20(sp)
-// 0x0109682c: 0x109682c: addu  v0, s0, zero
+// 0x01096e70: 0x1096e70: lw    ra, 20(sp)
+// 0x01096e74: 0x1096e74: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-// 0x01096830: 0x1096830: lw    s0, 16(sp)
+// 0x01096e78: 0x1096e78: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2577,7 +2577,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01096834: 0x1096834: jr    ra addiu sp, sp, 24
+// 0x01096e7c: 0x1096e7c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2589,7 +2589,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s1,int32 s2,int32 s3,int32 s4,int32 s6,int32 s7,int32 ra)
@@ -2648,12 +2648,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109683c: 0x109683c: addiu sp, sp, -72
+// 0x01096e84: 0x1096e84: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01096840: 0x1096840: sw    a0, 24(sp)
+// 0x01096e88: 0x1096e88: sw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2662,8 +2662,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01096844: 0x1096844: sw    ra, 68(sp)
-// 0x01096848: 0x1096848: sw    s7, 64(sp)
+// 0x01096e8c: 0x1096e8c: sw    ra, 68(sp)
+// 0x01096e90: 0x1096e90: sw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2672,7 +2672,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109684c: 0x109684c: sw    s6, 60(sp)
+// 0x01096e94: 0x1096e94: sw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2681,7 +2681,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01096850: 0x1096850: sw    s5, 56(sp)
+// 0x01096e98: 0x1096e98: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2690,7 +2690,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01096854: 0x1096854: sw    s4, 52(sp)
+// 0x01096e9c: 0x1096e9c: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2699,7 +2699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01096858: 0x1096858: sw    s3, 48(sp)
+// 0x01096ea0: 0x1096ea0: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2708,7 +2708,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109685c: 0x109685c: sw    s1, 40(sp)
+// 0x01096ea4: 0x1096ea4: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2717,7 +2717,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01096860: 0x1096860: sw    s0, 36(sp)
+// 0x01096ea8: 0x1096ea8: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2726,13 +2726,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01096864: 0x1096864: addu  s4, a1, zero
+// 0x01096eac: 0x1096eac: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01096868: 0x1096868: addu  s0, a2, zero
+// 0x01096eb0: 0x1096eb0: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0109686c: 0x109686c: sw    s2, 44(sp)
+// 0x01096eb4: 0x1096eb4: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2741,7 +2741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01096870: 0x1096870: lw    s3, 96(sp)
+// 0x01096eb8: 0x1096eb8: lw    s3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2750,7 +2750,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01096874: 0x1096874: jal   0x10939c0 addu  s6, a3, zero
+// 0x01096ebc: 0x1096ebc: jal   0x1093fe4 addu  s6, a3, zero
 	ldloc 4
 	stloc 14
 	ldloc.0
@@ -2758,12 +2758,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_get_txtbox_height_10939c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_get_txtbox_height_1093fe4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109687c: 0x109687c: jal   0x1096800 addu  s7, v0, zero
+// 0x01096ec4: 0x1096ec4: jal   0x1096e48 addu  s7, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -2771,25 +2771,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::T_20_1096800(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::T_20_1096e48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096884: 0x1096884: addu  s1, v0, zero
+// 0x01096ecc: 0x1096ecc: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01096888: 0x1096888: lui   v0, 0x100000
+// 0x01096ed0: 0x1096ed0: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x0109688c: 0x109688c: sw    zero, 0(s1)
+// 0x01096ed4: 0x1096ed4: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096890: 0x1096890: sw    zero, 4(s1)
+// 0x01096ed8: 0x1096ed8: sw    zero, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2798,7 +2798,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096894: 0x1096894: sw    zero, 8(s1)
+// 0x01096edc: 0x1096edc: sw    zero, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2807,7 +2807,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096898: 0x1096898: sw    zero, 12(s1)
+// 0x01096ee0: 0x1096ee0: sw    zero, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2816,7 +2816,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109689c: 0x109689c: sw    zero, 16(s1)
+// 0x01096ee4: 0x1096ee4: sw    zero, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2825,7 +2825,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010968a0: 0x10968a0: sw    zero, 20(s1)
+// 0x01096ee8: 0x1096ee8: sw    zero, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2834,7 +2834,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010968a4: 0x10968a4: sw    zero, 24(s1)
+// 0x01096eec: 0x1096eec: sw    zero, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2843,12 +2843,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010968a8: 0x10968a8: and   v0, s0, v0
+// 0x01096ef0: 0x1096ef0: and   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	and
 	stloc 5
-// 0x010968ac: 0x10968ac: lw    a0, 24(sp)
+// 0x01096ef4: 0x1096ef4: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2857,39 +2857,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010968b0: 0x10968b0: beq   v0, zero, 0x10968c8 addu  s5, zero, zero
+// 0x01096ef8: 0x1096ef8: beq   v0, zero, 0x1096f10 addu  s5, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_10968c8
+	brfalse L_1096f10
 // --- basic block ---
-// 0x010968b8: 0x10968b8: lui   v0, 0xffef0000
+// 0x01096f00: 0x1096f00: lui   v0, 0xffef0000
 	ldc.i4 4293853184
 	stloc 5
-// 0x010968bc: 0x10968bc: ori   v0, v0, 65535
+// 0x01096f04: 0x1096f04: ori   v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x010968c0: 0x10968c0: and   s0, s0, v0
+// 0x01096f08: 0x1096f08: and   s0, s0, v0
 	ldloc 8
 	ldloc 5
 	and
 	stloc 8
-// 0x010968c4: 0x10968c4: lui   s5, 0x100000
+// 0x01096f0c: 0x1096f0c: lui   s5, 0x100000
 	ldc.i4 1048576
 	stloc 9
-L_10968c8:
-// 0x010968c8: 0x10968c8: addu  a1, zero, zero
+L_1096f10:
+// 0x01096f10: 0x1096f10: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010968cc: 0x10968cc: addiu a2, zero, -1
+// 0x01096f14: 0x1096f14: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010968d0: 0x10968d0: addiu a3, zero, -1
+// 0x01096f18: 0x1096f18: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010968d4: 0x10968d4: jal   0x1093a24 sw    s0, 16(sp)
+// 0x01096f1c: 0x1096f1c: jal   0x1094048 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2903,23 +2903,23 @@ L_10968c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010968dc: 0x10968dc: addu  s2, v0, zero
+// 0x01096f24: 0x1096f24: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010968e0: 0x10968e0: lui   v0, 0x20000000
+// 0x01096f28: 0x1096f28: lui   v0, 0x20000000
 	ldc.i4 536870912
 	stloc 5
-// 0x010968e4: 0x10968e4: ori   v0, v0, 16
+// 0x01096f2c: 0x1096f2c: ori   v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	or
 	stloc 5
-// 0x010968e8: 0x10968e8: lw    a2, 88(sp)
+// 0x01096f30: 0x1096f30: lw    a2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2928,26 +2928,26 @@ L_10968c8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010968ec: 0x10968ec: lui   a0, 0x0
+// 0x01096f34: 0x1096f34: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010968f0: 0x10968f0: addu  a3, s7, zero
+// 0x01096f38: 0x1096f38: addu  a3, s7, zero
 	ldloc 15
 	stloc 4
-// 0x010968f4: 0x10968f4: or    s5, s5, v0
+// 0x01096f3c: 0x1096f3c: or    s5, s5, v0
 	ldloc 9
 	ldloc 5
 	or
 	stloc 9
-// 0x010968f8: 0x10968f8: addiu a0, a0, 31968
+// 0x01096f40: 0x1096f40: addiu a0, a0, 31968
 	ldloc.1
 	ldc.i4 31968
 	add
 	stloc.1
-// 0x010968fc: 0x10968fc: addu  a1, zero, zero
+// 0x01096f44: 0x1096f44: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096900: 0x1096900: jal   0x1093a24 sw    s5, 16(sp)
+// 0x01096f48: 0x1096f48: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2961,44 +2961,44 @@ L_10968c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096908: 0x1096908: addu  s0, v0, zero
+// 0x01096f50: 0x1096f50: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109690c: 0x109690c: addu  a0, v0, zero
+// 0x01096f54: 0x1096f54: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096910: 0x1096910: addu  a1, zero, zero
+// 0x01096f58: 0x1096f58: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096914: 0x1096914: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01096f5c: 0x1096f5c: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109691c: 0x109691c: jal   0x1099190 addu  a0, s0, zero
+// 0x01096f64: 0x1096f64: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01096924: 0x1096924: lui   v0, 0x1090000
+// 0x01096f6c: 0x1096f6c: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01096928: 0x1096928: addiu v0, v0, 26588
+// 0x01096f70: 0x1096f70: addiu v0, v0, 28196
 	ldloc 5
-	ldc.i4 26588
+	ldc.i4 28196
 	add
 	stloc 5
-// 0x0109692c: 0x109692c: sw    v0, 168(s2)
+// 0x01096f74: 0x1096f74: sw    v0, 168(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3007,15 +3007,15 @@ L_10968c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01096930: 0x1096930: lui   v0, 0x1090000
+// 0x01096f78: 0x1096f78: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01096934: 0x1096934: addiu v0, v0, 26452
+// 0x01096f7c: 0x1096f7c: addiu v0, v0, 28060
 	ldloc 5
-	ldc.i4 26452
+	ldc.i4 28060
 	add
 	stloc 5
-// 0x01096938: 0x1096938: sw    v0, 176(s2)
+// 0x01096f80: 0x1096f80: sw    v0, 176(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3024,21 +3024,21 @@ L_10968c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109693c: 0x109693c: lui   v0, 0x1090000
+// 0x01096f84: 0x1096f84: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01096940: 0x1096940: addiu v0, v0, 26020
+// 0x01096f88: 0x1096f88: addiu v0, v0, 27628
 	ldloc 5
-	ldc.i4 26020
+	ldc.i4 27628
 	add
 	stloc 5
-// 0x01096944: 0x1096944: lui   a0, 0x20000
+// 0x01096f8c: 0x1096f8c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01096948: 0x1096948: addiu a3, zero, -1
+// 0x01096f90: 0x1096f90: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0109694c: 0x109694c: sw    v0, 112(s0)
+// 0x01096f94: 0x1096f94: sw    v0, 112(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3047,7 +3047,7 @@ L_10968c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01096950: 0x1096950: sw    zero, 108(s2)
+// 0x01096f98: 0x1096f98: sw    zero, 108(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3056,12 +3056,12 @@ L_10968c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096954: 0x1096954: addiu a0, a0, -2916
+// 0x01096f9c: 0x1096f9c: addiu a0, a0, -2452
 	ldloc.1
-	ldc.i4 -2916
+	ldc.i4 -2452
 	add
 	stloc.1
-// 0x01096958: 0x1096958: sw    zero, 108(s0)
+// 0x01096fa0: 0x1096fa0: sw    zero, 108(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3070,16 +3070,16 @@ L_10968c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109695c: 0x109695c: addu  a1, zero, zero
+// 0x01096fa4: 0x1096fa4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096960: 0x1096960: addiu a2, zero, 5
+// 0x01096fa8: 0x1096fa8: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x01096964: 0x1096964: addiu v0, zero, 128
+// 0x01096fac: 0x1096fac: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x01096968: 0x1096968: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01096fb0: 0x1096fb0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3093,21 +3093,21 @@ L_10968c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096970: 0x1096970: addu  a0, v0, zero
+// 0x01096fb8: 0x1096fb8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096974: 0x1096974: addu  a2, zero, zero
+// 0x01096fbc: 0x1096fbc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01096978: 0x1096978: addu  a1, zero, zero
+// 0x01096fc0: 0x1096fc0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109697c: 0x109697c: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01096fc4: 0x1096fc4: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3119,9 +3119,9 @@ L_10968c8:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01096984: 0x1096984: lw    v0, 24(sp)
+// 0x01096fcc: 0x1096fcc: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3130,44 +3130,44 @@ L_10968c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096988: 0x1096988: addu  a0, s0, zero
+// 0x01096fd0: 0x1096fd0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109698c: 0x109698c: addu  a1, v0, zero
+// 0x01096fd4: 0x1096fd4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01096990: 0x1096990: jal   0x1098ec4 lui   s5, 0x20000
+// 0x01096fd8: 0x1096fd8: jal   0x109950c lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096998: 0x1096998: ori   s5, s5, 16
+// 0x01096fe0: 0x1096fe0: ori   s5, s5, 16
 	ldloc 9
 	ldc.i4.s 16
 	or
 	stloc 9
-// 0x0109699c: 0x109699c: lui   a0, 0x20000
+// 0x01096fe4: 0x1096fe4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010969a0: 0x10969a0: or    a3, s6, s5
+// 0x01096fe8: 0x1096fe8: or    a3, s6, s5
 	ldloc 14
 	ldloc 9
 	or
 	stloc 4
-// 0x010969a4: 0x10969a4: addiu a2, zero, -1
+// 0x01096fec: 0x1096fec: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010969a8: 0x10969a8: addiu a0, a0, -568
+// 0x01096ff0: 0x1096ff0: addiu a0, a0, -104
 	ldloc.1
-	ldc.i4 -568
+	ldc.i4.s -104
 	add
 	stloc.1
-// 0x010969ac: 0x10969ac: jal   0x1098d10 addu  a1, s4, zero
+// 0x01096ff4: 0x1096ff4: jal   0x1099358 addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -3175,18 +3175,18 @@ L_10968c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010969b4: 0x10969b4: addu  a1, v0, zero
+// 0x01096ffc: 0x1096ffc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010969b8: 0x10969b8: addu  a0, s0, zero
+// 0x01097000: 0x1097000: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010969bc: 0x10969bc: jal   0x1098ec4 sw    v0, 24(sp)
+// 0x01097004: 0x1097004: jal   0x109950c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3197,12 +3197,12 @@ L_10968c8:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010969c4: 0x10969c4: lw    v0, 24(sp)
+// 0x0109700c: 0x109700c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3211,13 +3211,13 @@ L_10968c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010969c8: 0x10969c8: addu  a1, zero, zero
+// 0x01097010: 0x1097010: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010969cc: 0x10969cc: addu  a0, v0, zero
+// 0x01097014: 0x1097014: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010969d0: 0x10969d0: jal   0x1098f84 addiu a2, zero, -2
+// 0x01097018: 0x1097018: jal   0x10995cc addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
 	ldloc.0
@@ -3225,49 +3225,49 @@ L_10968c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010969d8: 0x10969d8: bne   s3, zero, 0x10969f4 lui   a0, 0x20000
+// 0x01097020: 0x1097020: bne   s3, zero, 0x109703c lui   a0, 0x20000
 	ldloc 12
 	ldc.i4 131072
 	stloc.1
-	brtrue L_10969f4
+	brtrue L_109703c
 // --- basic block ---
-// 0x010969e0: 0x10969e0: lui   a1, 0x10000
+// 0x01097028: 0x1097028: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010969e4: 0x10969e4: addiu a0, a0, -2924
+// 0x0109702c: 0x109702c: addiu a0, a0, -2460
 	ldloc.1
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.1
-// 0x010969e8: 0x10969e8: addiu a1, a1, 18500
+// 0x01097030: 0x1097030: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010969ec: 0x10969ec: j	 0x1096a00 addu  a3, s5, zero
+// 0x01097034: 0x1097034: j	 0x1097048 addu  a3, s5, zero
 	ldloc 9
 	stloc 4
-	br L_1096a00
+	br L_1097048
 // --- basic block ---
-L_10969f4:
-// 0x010969f4: 0x10969f4: addiu a0, a0, -2924
+L_109703c:
+// 0x0109703c: 0x109703c: addiu a0, a0, -2460
 	ldloc.1
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.1
-// 0x010969f8: 0x10969f8: addu  a3, s5, zero
+// 0x01097040: 0x1097040: addu  a3, s5, zero
 	ldloc 9
 	stloc 4
-// 0x010969fc: 0x10969fc: addu  a1, s3, zero
+// 0x01097044: 0x1097044: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-L_1096a00:
-// 0x01096a00: 0x1096a00: jal   0x1098d10 addiu a2, zero, -1
+L_1097048:
+// 0x01097048: 0x1097048: jal   0x1099358 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -3275,21 +3275,21 @@ L_1096a00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096a08: 0x1096a08: addu  a0, v0, zero
+// 0x01097050: 0x1097050: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096a0c: 0x1096a0c: addu  a1, zero, zero
+// 0x01097054: 0x1097054: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096a10: 0x1096a10: addiu a2, zero, -2
+// 0x01097058: 0x1097058: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01096a14: 0x1096a14: jal   0x1098f84 sw    v0, 24(sp)
+// 0x0109705c: 0x109705c: jal   0x10995cc sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3303,12 +3303,12 @@ L_1096a00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096a1c: 0x1096a1c: lw    v0, 24(sp)
+// 0x01097064: 0x1097064: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3317,26 +3317,26 @@ L_1096a00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096a20: 0x1096a20: lui   a1, 0x20000
+// 0x01097068: 0x1097068: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01096a24: 0x1096a24: addu  a0, v0, zero
+// 0x0109706c: 0x109706c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096a28: 0x1096a28: addiu a1, a1, -2908
+// 0x01097070: 0x1097070: addiu a1, a1, -2444
 	ldloc.2
-	ldc.i4 -2908
+	ldc.i4 -2444
 	add
 	stloc.2
-// 0x01096a2c: 0x1096a2c: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01097074: 0x1097074: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01096a34: 0x1096a34: lw    v0, 24(sp)
+// 0x0109707c: 0x109707c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3345,20 +3345,20 @@ L_1096a00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096a38: 0x1096a38: addu  a0, s0, zero
+// 0x01097080: 0x1097080: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01096a3c: 0x1096a3c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01097084: 0x1097084: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096a44: 0x1096a44: sw    s1, 116(s2)
+// 0x0109708c: 0x109708c: sw    s1, 116(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3367,7 +3367,7 @@ L_1096a00:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01096a48: 0x1096a48: lw    v0, 24(sp)
+// 0x01097090: 0x1097090: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3376,43 +3376,43 @@ L_1096a00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096a4c: 0x1096a4c: beq   s4, zero, 0x1096a70 addu  a1, s0, zero
+// 0x01097094: 0x1097094: beq   s4, zero, 0x10970b8 addu  a1, s0, zero
 	ldloc 13
 	ldloc 8
 	stloc.2
-	brfalse L_1096a70
+	brfalse L_10970b8
 // --- basic block ---
-// 0x01096a54: 0x1096a54: lb    v1, 0(s4)
+// 0x0109709c: 0x109709c: lb    v1, 0(s4)
 	ldloc 13
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01096a58: 0x1096a58: sll   zero, zero, 0
-// 0x01096a5c: 0x1096a5c: beq   v1, zero, 0x1096a70 sll   zero, zero, 0
+// 0x010970a0: 0x10970a0: sll   zero, zero, 0
+// 0x010970a4: 0x10970a4: beq   v1, zero, 0x10970b8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1096a70
+	brfalse L_10970b8
 // --- basic block ---
-// 0x01096a64: 0x1096a64: jal   0x1099098 addu  a0, v0, zero
+// 0x010970ac: 0x10970ac: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01096a6c: 0x1096a6c: addu  a1, s0, zero
+// 0x010970b4: 0x10970b4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-L_1096a70:
-// 0x01096a70: 0x1096a70: jal   0x1098ec4 addu  a0, s2, zero
+L_10970b8:
+// 0x010970b8: 0x10970b8: jal   0x109950c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096a78: 0x1096a78: lw    v0, 116(s2)
+// 0x010970c0: 0x10970c0: lw    v0, 116(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3421,12 +3421,12 @@ L_1096a70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096a7c: 0x1096a7c: sll   zero, zero, 0
-// 0x01096a80: 0x1096a80: beq   v0, zero, 0x1096a9c sll   zero, zero, 0
+// 0x010970c4: 0x10970c4: sll   zero, zero, 0
+// 0x010970c8: 0x10970c8: beq   v0, zero, 0x10970e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1096a9c
+	brfalse L_10970e4
 // --- basic block ---
-// 0x01096a88: 0x1096a88: sw    s3, 4(v0)
+// 0x010970d0: 0x10970d0: sw    s3, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3435,7 +3435,7 @@ L_1096a70:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01096a8c: 0x1096a8c: sw    zero, 20(v0)
+// 0x010970d4: 0x10970d4: sw    zero, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3444,7 +3444,7 @@ L_1096a70:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096a90: 0x1096a90: sw    zero, 8(v0)
+// 0x010970d8: 0x10970d8: sw    zero, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3453,7 +3453,7 @@ L_1096a70:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096a94: 0x1096a94: sw    zero, 12(v0)
+// 0x010970dc: 0x10970dc: sw    zero, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3462,7 +3462,7 @@ L_1096a70:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096a98: 0x1096a98: sw    zero, 16(v0)
+// 0x010970e0: 0x10970e0: sw    zero, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3471,12 +3471,12 @@ L_1096a70:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1096a9c:
-// 0x01096a9c: 0x1096a9c: lw    ra, 68(sp)
-// 0x01096aa0: 0x1096aa0: addu  v0, s2, zero
+L_10970e4:
+// 0x010970e4: 0x10970e4: lw    ra, 68(sp)
+// 0x010970e8: 0x10970e8: addu  v0, s2, zero
 	ldloc 11
 	stloc 5
-// 0x01096aa4: 0x1096aa4: lw    s7, 64(sp)
+// 0x010970ec: 0x10970ec: lw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3485,7 +3485,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01096aa8: 0x1096aa8: lw    s6, 60(sp)
+// 0x010970f0: 0x10970f0: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3494,7 +3494,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01096aac: 0x1096aac: lw    s5, 56(sp)
+// 0x010970f4: 0x10970f4: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3503,7 +3503,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01096ab0: 0x1096ab0: lw    s4, 52(sp)
+// 0x010970f8: 0x10970f8: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3512,7 +3512,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01096ab4: 0x1096ab4: lw    s3, 48(sp)
+// 0x010970fc: 0x10970fc: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3521,7 +3521,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01096ab8: 0x1096ab8: lw    s2, 44(sp)
+// 0x01097100: 0x1097100: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3530,7 +3530,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01096abc: 0x1096abc: lw    s1, 40(sp)
+// 0x01097104: 0x1097104: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3539,7 +3539,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01096ac0: 0x1096ac0: lw    s0, 36(sp)
+// 0x01097108: 0x1097108: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3548,7 +3548,7 @@ L_1096a9c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096ac4: 0x1096ac4: jr    ra addiu sp, sp, 72
+// 0x0109710c: 0x109710c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3560,7 +3560,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_confirmed_entry_new_1096acc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_confirmed_entry_new_1097114(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 s5,int32 s3,int32 s4,int32 s6,int32 s7,int32 ra)
@@ -3619,13 +3619,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096acc: 0x1096acc: addiu sp, sp, -72
+// 0x01097114: 0x1097114: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01096ad0: 0x1096ad0: sw    ra, 68(sp)
-// 0x01096ad4: 0x1096ad4: sw    s7, 64(sp)
+// 0x01097118: 0x1097118: sw    ra, 68(sp)
+// 0x0109711c: 0x109711c: sw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3634,7 +3634,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01096ad8: 0x1096ad8: sw    s6, 60(sp)
+// 0x01097120: 0x1097120: sw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3643,7 +3643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01096adc: 0x1096adc: sw    s5, 56(sp)
+// 0x01097124: 0x1097124: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3652,7 +3652,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01096ae0: 0x1096ae0: sw    s4, 52(sp)
+// 0x01097128: 0x1097128: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3661,7 +3661,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01096ae4: 0x1096ae4: sw    s3, 48(sp)
+// 0x0109712c: 0x109712c: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3670,7 +3670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01096ae8: 0x1096ae8: sw    s2, 44(sp)
+// 0x01097130: 0x1097130: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3679,7 +3679,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01096aec: 0x1096aec: sw    s1, 40(sp)
+// 0x01097134: 0x1097134: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3688,7 +3688,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01096af0: 0x1096af0: sw    s0, 36(sp)
+// 0x01097138: 0x1097138: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3697,16 +3697,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01096af4: 0x1096af4: addu  s1, a2, zero
+// 0x0109713c: 0x109713c: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01096af8: 0x1096af8: addu  s4, a0, zero
+// 0x01097140: 0x1097140: addu  s4, a0, zero
 	ldloc.1
 	stloc 13
-// 0x01096afc: 0x1096afc: addu  s3, a1, zero
+// 0x01097144: 0x1097144: addu  s3, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01096b00: 0x1096b00: lw    s5, 100(sp)
+// 0x01097148: 0x1097148: lw    s5, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3715,7 +3715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01096b04: 0x1096b04: jal   0x10939c0 addu  s6, a3, zero
+// 0x0109714c: 0x109714c: jal   0x1093fe4 addu  s6, a3, zero
 	ldloc 4
 	stloc 14
 	ldloc.0
@@ -3723,12 +3723,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_get_txtbox_height_10939c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_get_txtbox_height_1093fe4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096b0c: 0x1096b0c: jal   0x1096800 addu  s7, v0, zero
+// 0x01097154: 0x1097154: jal   0x1096e48 addu  s7, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -3736,30 +3736,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::T_20_1096800(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::T_20_1096e48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096b14: 0x1096b14: addu  s0, v0, zero
+// 0x0109715c: 0x109715c: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01096b18: 0x1096b18: lui   v0, 0x100000
+// 0x01097160: 0x1097160: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x01096b1c: 0x1096b1c: and   v0, s1, v0
+// 0x01097164: 0x1097164: and   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	and
 	stloc 5
-// 0x01096b20: 0x1096b20: sw    zero, 0(s0)
+// 0x01097168: 0x1097168: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096b24: 0x1096b24: sw    zero, 4(s0)
+// 0x0109716c: 0x109716c: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3768,7 +3768,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096b28: 0x1096b28: sw    zero, 8(s0)
+// 0x01097170: 0x1097170: sw    zero, 8(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3777,7 +3777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096b2c: 0x1096b2c: sw    zero, 12(s0)
+// 0x01097174: 0x1097174: sw    zero, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096b30: 0x1096b30: sw    zero, 16(s0)
+// 0x01097178: 0x1097178: sw    zero, 16(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3795,7 +3795,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096b34: 0x1096b34: sw    zero, 20(s0)
+// 0x0109717c: 0x109717c: sw    zero, 20(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3804,7 +3804,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096b38: 0x1096b38: sw    zero, 24(s0)
+// 0x01097180: 0x1097180: sw    zero, 24(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3813,42 +3813,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096b3c: 0x1096b3c: beq   v0, zero, 0x1096b54 addu  s2, zero, zero
+// 0x01097184: 0x1097184: beq   v0, zero, 0x109719c addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_1096b54
+	brfalse L_109719c
 // --- basic block ---
-// 0x01096b44: 0x1096b44: lui   v0, 0xffef0000
+// 0x0109718c: 0x109718c: lui   v0, 0xffef0000
 	ldc.i4 4293853184
 	stloc 5
-// 0x01096b48: 0x1096b48: ori   v0, v0, 65535
+// 0x01097190: 0x1097190: ori   v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x01096b4c: 0x1096b4c: and   s1, s1, v0
+// 0x01097194: 0x1097194: and   s1, s1, v0
 	ldloc 8
 	ldloc 5
 	and
 	stloc 8
-// 0x01096b50: 0x1096b50: lui   s2, 0x100000
+// 0x01097198: 0x1097198: lui   s2, 0x100000
 	ldc.i4 1048576
 	stloc 9
-L_1096b54:
-// 0x01096b54: 0x1096b54: addu  a0, s4, zero
+L_109719c:
+// 0x0109719c: 0x109719c: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x01096b58: 0x1096b58: addu  a1, zero, zero
+// 0x010971a0: 0x10971a0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096b5c: 0x1096b5c: addiu a2, zero, -1
+// 0x010971a4: 0x10971a4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01096b60: 0x1096b60: addiu a3, zero, -1
+// 0x010971a8: 0x10971a8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01096b64: 0x1096b64: jal   0x1093a24 sw    s1, 16(sp)
+// 0x010971ac: 0x10971ac: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3862,18 +3862,18 @@ L_1096b54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096b6c: 0x1096b6c: addu  s1, v0, zero
+// 0x010971b4: 0x10971b4: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01096b70: 0x1096b70: lui   v0, 0x20000000
+// 0x010971b8: 0x10971b8: lui   v0, 0x20000000
 	ldc.i4 536870912
 	stloc 5
-// 0x01096b74: 0x1096b74: lw    a2, 88(sp)
+// 0x010971bc: 0x10971bc: lw    a2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3882,31 +3882,31 @@ L_1096b54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01096b78: 0x1096b78: ori   v0, v0, 16
+// 0x010971c0: 0x10971c0: ori   v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	or
 	stloc 5
-// 0x01096b7c: 0x1096b7c: lui   a0, 0x0
+// 0x010971c4: 0x10971c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01096b80: 0x1096b80: or    s2, s2, v0
+// 0x010971c8: 0x10971c8: or    s2, s2, v0
 	ldloc 9
 	ldloc 5
 	or
 	stloc 9
-// 0x01096b84: 0x1096b84: addu  a3, s7, zero
+// 0x010971cc: 0x10971cc: addu  a3, s7, zero
 	ldloc 15
 	stloc 4
-// 0x01096b88: 0x1096b88: addu  a1, zero, zero
+// 0x010971d0: 0x10971d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096b8c: 0x1096b8c: addiu a0, a0, 31968
+// 0x010971d4: 0x10971d4: addiu a0, a0, 31968
 	ldloc.1
 	ldc.i4 31968
 	add
 	stloc.1
-// 0x01096b90: 0x1096b90: jal   0x1093a24 sw    s2, 16(sp)
+// 0x010971d8: 0x10971d8: jal   0x1094048 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3920,30 +3920,30 @@ L_1096b54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096b98: 0x1096b98: addu  a0, v0, zero
+// 0x010971e0: 0x10971e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096b9c: 0x1096b9c: jal   0x1099190 addu  s2, v0, zero
+// 0x010971e4: 0x10971e4: jal   0x10997d8 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01096ba4: 0x1096ba4: lui   v0, 0x1090000
+// 0x010971ec: 0x10971ec: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01096ba8: 0x1096ba8: addiu v0, v0, 26588
+// 0x010971f0: 0x10971f0: addiu v0, v0, 28196
 	ldloc 5
-	ldc.i4 26588
+	ldc.i4 28196
 	add
 	stloc 5
-// 0x01096bac: 0x1096bac: sw    v0, 168(s1)
+// 0x010971f4: 0x10971f4: sw    v0, 168(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3952,15 +3952,15 @@ L_1096b54:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01096bb0: 0x1096bb0: lui   v0, 0x1090000
+// 0x010971f8: 0x10971f8: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01096bb4: 0x1096bb4: addiu v0, v0, 26452
+// 0x010971fc: 0x10971fc: addiu v0, v0, 28060
 	ldloc 5
-	ldc.i4 26452
+	ldc.i4 28060
 	add
 	stloc 5
-// 0x01096bb8: 0x1096bb8: sw    v0, 176(s1)
+// 0x01097200: 0x1097200: sw    v0, 176(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3969,21 +3969,21 @@ L_1096b54:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01096bbc: 0x1096bbc: lui   v0, 0x1090000
+// 0x01097204: 0x1097204: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x01096bc0: 0x1096bc0: addiu v0, v0, 25952
+// 0x01097208: 0x1097208: addiu v0, v0, 27560
 	ldloc 5
-	ldc.i4 25952
+	ldc.i4 27560
 	add
 	stloc 5
-// 0x01096bc4: 0x1096bc4: lui   a0, 0x20000
+// 0x0109720c: 0x109720c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01096bc8: 0x1096bc8: addiu a3, zero, -1
+// 0x01097210: 0x1097210: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01096bcc: 0x1096bcc: sw    v0, 112(s2)
+// 0x01097214: 0x1097214: sw    v0, 112(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3992,7 +3992,7 @@ L_1096b54:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01096bd0: 0x1096bd0: sw    zero, 108(s1)
+// 0x01097218: 0x1097218: sw    zero, 108(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4001,12 +4001,12 @@ L_1096b54:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096bd4: 0x1096bd4: addiu a0, a0, -2916
+// 0x0109721c: 0x109721c: addiu a0, a0, -2452
 	ldloc.1
-	ldc.i4 -2916
+	ldc.i4 -2452
 	add
 	stloc.1
-// 0x01096bd8: 0x1096bd8: sw    zero, 108(s2)
+// 0x01097220: 0x1097220: sw    zero, 108(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4015,16 +4015,16 @@ L_1096b54:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096bdc: 0x1096bdc: addu  a1, zero, zero
+// 0x01097224: 0x1097224: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096be0: 0x1096be0: addiu a2, zero, 5
+// 0x01097228: 0x1097228: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x01096be4: 0x1096be4: addiu v0, zero, 128
+// 0x0109722c: 0x109722c: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x01096be8: 0x1096be8: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01097230: 0x1097230: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4038,21 +4038,21 @@ L_1096b54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096bf0: 0x1096bf0: addu  a0, v0, zero
+// 0x01097238: 0x1097238: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096bf4: 0x1096bf4: addu  a2, zero, zero
+// 0x0109723c: 0x109723c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01096bf8: 0x1096bf8: addu  a1, zero, zero
+// 0x01097240: 0x1097240: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096bfc: 0x1096bfc: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01097244: 0x1097244: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4064,9 +4064,9 @@ L_1096b54:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01096c04: 0x1096c04: lw    v0, 24(sp)
+// 0x0109724c: 0x109724c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4075,36 +4075,36 @@ L_1096b54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096c08: 0x1096c08: addu  a0, s2, zero
+// 0x01097250: 0x1097250: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01096c0c: 0x1096c0c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01097254: 0x1097254: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096c14: 0x1096c14: lui   a0, 0x20000
+// 0x0109725c: 0x109725c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01096c18: 0x1096c18: ori   a3, s6, 16
+// 0x01097260: 0x1097260: ori   a3, s6, 16
 	ldloc 14
 	ldc.i4.s 16
 	or
 	stloc 4
-// 0x01096c1c: 0x1096c1c: addiu a0, a0, -568
+// 0x01097264: 0x1097264: addiu a0, a0, -104
 	ldloc.1
-	ldc.i4 -568
+	ldc.i4.s -104
 	add
 	stloc.1
-// 0x01096c20: 0x1096c20: addiu a2, zero, -1
+// 0x01097268: 0x1097268: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01096c24: 0x1096c24: jal   0x1098d10 addu  a1, s3, zero
+// 0x0109726c: 0x109726c: jal   0x1099358 addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -4112,59 +4112,59 @@ L_1096b54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096c2c: 0x1096c2c: addu  a1, v0, zero
+// 0x01097274: 0x1097274: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01096c30: 0x1096c30: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01097278: 0x1097278: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096c38: 0x1096c38: bne   s5, zero, 0x1096c50 lui   a0, 0x20000
+// 0x01097280: 0x1097280: bne   s5, zero, 0x1097298 lui   a0, 0x20000
 	ldloc 11
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1096c50
+	brtrue L_1097298
 // --- basic block ---
-// 0x01096c40: 0x1096c40: lui   a1, 0x10000
+// 0x01097288: 0x1097288: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01096c44: 0x1096c44: addiu a0, a0, -2924
+// 0x0109728c: 0x109728c: addiu a0, a0, -2460
 	ldloc.1
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.1
-// 0x01096c48: 0x1096c48: j	 0x1096c58 addiu a1, a1, 18500
+// 0x01097290: 0x1097290: j	 0x10972a0 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-	br L_1096c58
+	br L_10972a0
 // --- basic block ---
-L_1096c50:
-// 0x01096c50: 0x1096c50: addiu a0, a0, -2924
+L_1097298:
+// 0x01097298: 0x1097298: addiu a0, a0, -2460
 	ldloc.1
-	ldc.i4 -2924
+	ldc.i4 -2460
 	add
 	stloc.1
-// 0x01096c54: 0x1096c54: addu  a1, s5, zero
+// 0x0109729c: 0x109729c: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-L_1096c58:
-// 0x01096c58: 0x1096c58: addiu a3, zero, 16
+L_10972a0:
+// 0x010972a0: 0x10972a0: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x01096c5c: 0x1096c5c: jal   0x1098d10 addiu a2, zero, -1
+// 0x010972a4: 0x10972a4: jal   0x1099358 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -4172,47 +4172,47 @@ L_1096c58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096c64: 0x1096c64: lui   a1, 0x20000
+// 0x010972ac: 0x10972ac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01096c68: 0x1096c68: addu  s5, v0, zero
+// 0x010972b0: 0x10972b0: addu  s5, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01096c6c: 0x1096c6c: addu  a0, v0, zero
+// 0x010972b4: 0x10972b4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096c70: 0x1096c70: addu  a2, zero, zero
+// 0x010972b8: 0x10972b8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01096c74: 0x1096c74: jal   0x1098fe0 addiu a1, a1, -2908
+// 0x010972bc: 0x10972bc: jal   0x1099628 addiu a1, a1, -2444
 	ldloc.2
-	ldc.i4 -2908
+	ldc.i4 -2444
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01096c7c: 0x1096c7c: addu  a0, s2, zero
+// 0x010972c4: 0x10972c4: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01096c80: 0x1096c80: jal   0x1098ec4 addu  a1, s5, zero
+// 0x010972c8: 0x10972c8: jal   0x109950c addu  a1, s5, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096c88: 0x1096c88: lw    a0, 96(sp)
+// 0x010972d0: 0x10972d0: lw    a0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4221,7 +4221,7 @@ L_1096c58:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01096c8c: 0x1096c8c: jal   0x1001ba8 sll   zero, zero, 0
+// 0x010972d4: 0x10972d4: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4232,14 +4232,14 @@ L_1096c58:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096c94: 0x1096c94: sw    v0, 0(s0)
+// 0x010972dc: 0x10972dc: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01096c98: 0x1096c98: beq   s3, zero, 0x1096cb8 sw    s0, 116(s1)
+// 0x010972e0: 0x10972e0: beq   s3, zero, 0x1097300 sw    s0, 116(s1)
 	ldloc 12
 	ldloc 6
 	ldloc 8
@@ -4249,42 +4249,42 @@ L_1096c58:
 	add
 	ldloc 10
 	stelem.i4
-	brfalse L_1096cb8
+	brfalse L_1097300
 // --- basic block ---
-// 0x01096ca0: 0x1096ca0: lb    v0, 0(s3)
+// 0x010972e8: 0x10972e8: lb    v0, 0(s3)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01096ca4: 0x1096ca4: sll   zero, zero, 0
-// 0x01096ca8: 0x1096ca8: beq   v0, zero, 0x1096cbc addu  a1, s2, zero
+// 0x010972ec: 0x10972ec: sll   zero, zero, 0
+// 0x010972f0: 0x10972f0: beq   v0, zero, 0x1097304 addu  a1, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brfalse L_1096cbc
+	brfalse L_1097304
 // --- basic block ---
-// 0x01096cb0: 0x1096cb0: jal   0x1099098 addu  a0, s5, zero
+// 0x010972f8: 0x10972f8: jal   0x10996e0 addu  a0, s5, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1096cb8:
-// 0x01096cb8: 0x1096cb8: addu  a1, s2, zero
+L_1097300:
+// 0x01097300: 0x1097300: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-L_1096cbc:
-// 0x01096cbc: 0x1096cbc: jal   0x1098ec4 addu  a0, s1, zero
+L_1097304:
+// 0x01097304: 0x1097304: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096cc4: 0x1096cc4: lw    v0, 116(s1)
+// 0x0109730c: 0x109730c: lw    v0, 116(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4293,12 +4293,12 @@ L_1096cbc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096cc8: 0x1096cc8: sll   zero, zero, 0
-// 0x01096ccc: 0x1096ccc: beq   v0, zero, 0x1096ce8 sll   zero, zero, 0
+// 0x01097310: 0x1097310: sll   zero, zero, 0
+// 0x01097314: 0x1097314: beq   v0, zero, 0x1097330 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1096ce8
+	brfalse L_1097330
 // --- basic block ---
-// 0x01096cd4: 0x1096cd4: sw    s4, 4(v0)
+// 0x0109731c: 0x109731c: sw    s4, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4307,7 +4307,7 @@ L_1096cbc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01096cd8: 0x1096cd8: sw    zero, 20(v0)
+// 0x01097320: 0x1097320: sw    zero, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4316,7 +4316,7 @@ L_1096cbc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096cdc: 0x1096cdc: sw    zero, 8(v0)
+// 0x01097324: 0x1097324: sw    zero, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4325,7 +4325,7 @@ L_1096cbc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096ce0: 0x1096ce0: sw    zero, 12(v0)
+// 0x01097328: 0x1097328: sw    zero, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4334,7 +4334,7 @@ L_1096cbc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01096ce4: 0x1096ce4: sw    zero, 16(v0)
+// 0x0109732c: 0x109732c: sw    zero, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4343,12 +4343,12 @@ L_1096cbc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1096ce8:
-// 0x01096ce8: 0x1096ce8: lw    ra, 68(sp)
-// 0x01096cec: 0x1096cec: addu  v0, s1, zero
+L_1097330:
+// 0x01097330: 0x1097330: lw    ra, 68(sp)
+// 0x01097334: 0x1097334: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-// 0x01096cf0: 0x1096cf0: lw    s7, 64(sp)
+// 0x01097338: 0x1097338: lw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4357,7 +4357,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01096cf4: 0x1096cf4: lw    s6, 60(sp)
+// 0x0109733c: 0x109733c: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4366,7 +4366,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01096cf8: 0x1096cf8: lw    s5, 56(sp)
+// 0x01097340: 0x1097340: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4375,7 +4375,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01096cfc: 0x1096cfc: lw    s4, 52(sp)
+// 0x01097344: 0x1097344: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4384,7 +4384,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01096d00: 0x1096d00: lw    s3, 48(sp)
+// 0x01097348: 0x1097348: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4393,7 +4393,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01096d04: 0x1096d04: lw    s2, 44(sp)
+// 0x0109734c: 0x109734c: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4402,7 +4402,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01096d08: 0x1096d08: lw    s1, 40(sp)
+// 0x01097350: 0x1097350: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4411,7 +4411,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096d0c: 0x1096d0c: lw    s0, 36(sp)
+// 0x01097354: 0x1097354: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4420,7 +4420,7 @@ L_1096ce8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01096d10: 0x1096d10: jr    ra addiu sp, sp, 72
+// 0x01097358: 0x1097358: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -4432,7 +4432,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_pointer_down_1096d18()
+.method public static int32 on_pointer_down_1097360()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4446,7 +4446,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096d18: 0x1096d18: jr    ra addu  v0, zero, zero
+// 0x01097360: 0x1097360: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -4454,7 +4454,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_menu_hide_1096d98(int32,int32,int32,int32,int32)
+.method public static int32 ssd_menu_hide_10973e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4489,13 +4489,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096d98: 0x1096d98: addiu sp, sp, -24
+// 0x010973e0: 0x10973e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01096d9c: 0x1096d9c: sw    ra, 20(sp)
-// 0x01096da0: 0x1096da0: jal   0x1094884 addu  a1, zero, zero
+// 0x010973e4: 0x10973e4: sw    ra, 20(sp)
+// 0x010973e8: 0x10973e8: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4503,14 +4503,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01096da8: 0x1096da8: lw    ra, 20(sp)
-// 0x01096dac: 0x1096dac: sll   zero, zero, 0
-// 0x01096db0: 0x1096db0: jr    ra addiu sp, sp, 24
+// 0x010973f0: 0x10973f0: lw    ra, 20(sp)
+// 0x010973f4: 0x10973f4: sll   zero, zero, 0
+// 0x010973f8: 0x10973f8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4522,7 +4522,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 find_action_1096db8(int32,int32,int32,int32,int32)
+.method public static int32 find_action_1097400(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 s2,int32 s1,int32 ra,int32 v1)
@@ -4566,12 +4566,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096db8: 0x1096db8: addiu sp, sp, -32
+// 0x01097400: 0x1097400: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01096dbc: 0x1096dbc: sw    s2, 24(sp)
+// 0x01097404: 0x1097404: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4580,7 +4580,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01096dc0: 0x1096dc0: sw    s1, 20(sp)
+// 0x01097408: 0x1097408: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4589,7 +4589,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01096dc4: 0x1096dc4: sw    s0, 16(sp)
+// 0x0109740c: 0x109740c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4598,74 +4598,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01096dc8: 0x1096dc8: sw    ra, 28(sp)
-// 0x01096dcc: 0x1096dcc: addu  s1, a0, zero
+// 0x01097410: 0x1097410: sw    ra, 28(sp)
+// 0x01097414: 0x1097414: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01096dd0: 0x1096dd0: addu  s2, a1, zero
+// 0x01097418: 0x1097418: addu  s2, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01096dd4: 0x1096dd4: j	 0x1096df0 addu  s0, a0, zero
+// 0x0109741c: 0x109741c: j	 0x1097438 addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-	br L_1096df0
+	br L_1097438
 // --- basic block ---
-L_1096ddc:
-// 0x01096ddc: 0x1096ddc: jal   0x1001b14 sll   zero, zero, 0
+L_1097424:
+// 0x01097424: 0x1097424: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01096de4: 0x1096de4: beq   v0, zero, 0x1096e30 sll   zero, zero, 0
+// 0x0109742c: 0x109742c: beq   v0, zero, 0x1097478 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1096e30
+	brfalse L_1097478
 // --- basic block ---
-// 0x01096dec: 0x1096dec: addiu s0, s0, 24
+// 0x01097434: 0x1097434: addiu s0, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 5
-L_1096df0:
-// 0x01096df0: 0x1096df0: lw    v0, 0(s0)
+L_1097438:
+// 0x01097438: 0x1097438: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01096df4: 0x1096df4: addu  a1, s2, zero
+// 0x0109743c: 0x109743c: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x01096df8: 0x1096df8: bne   v0, zero, 0x1096ddc addu  a0, v0, zero
+// 0x01097440: 0x1097440: bne   v0, zero, 0x1097424 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brtrue L_1096ddc
+	brtrue L_1097424
 // --- basic block ---
-// 0x01096e00: 0x1096e00: j	 0x1096e1c addu  s0, s1, zero
+// 0x01097448: 0x1097448: j	 0x1097464 addu  s0, s1, zero
 	ldloc 9
 	stloc 5
-	br L_1096e1c
+	br L_1097464
 // --- basic block ---
-L_1096e08:
-// 0x01096e08: 0x1096e08: jal   0x1001b14 sll   zero, zero, 0
+L_1097450:
+// 0x01097450: 0x1097450: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01096e10: 0x1096e10: beq   v0, zero, 0x1096e30 sll   zero, zero, 0
+// 0x01097458: 0x1097458: beq   v0, zero, 0x1097478 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1096e30
+	brfalse L_1097478
 // --- basic block ---
-// 0x01096e18: 0x1096e18: addiu s0, s0, 24
+// 0x01097460: 0x1097460: addiu s0, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 5
-L_1096e1c:
-// 0x01096e1c: 0x1096e1c: lw    v0, 4(s0)
+L_1097464:
+// 0x01097464: 0x1097464: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4674,24 +4674,24 @@ L_1096e1c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01096e20: 0x1096e20: addu  a1, s2, zero
+// 0x01097468: 0x1097468: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x01096e24: 0x1096e24: bne   v0, zero, 0x1096e08 addu  a0, v0, zero
+// 0x0109746c: 0x109746c: bne   v0, zero, 0x1097450 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brtrue L_1096e08
+	brtrue L_1097450
 // --- basic block ---
-// 0x01096e2c: 0x1096e2c: addu  s0, zero, zero
+// 0x01097474: 0x1097474: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1096e30:
-// 0x01096e30: 0x1096e30: lw    ra, 28(sp)
-// 0x01096e34: 0x1096e34: addu  v0, s0, zero
+L_1097478:
+// 0x01097478: 0x1097478: lw    ra, 28(sp)
+// 0x0109747c: 0x109747c: addu  v0, s0, zero
 	ldloc 5
 	stloc 6
-// 0x01096e38: 0x1096e38: lw    s2, 24(sp)
+// 0x01097480: 0x1097480: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4700,7 +4700,7 @@ L_1096e30:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096e3c: 0x1096e3c: lw    s1, 20(sp)
+// 0x01097484: 0x1097484: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4709,7 +4709,7 @@ L_1096e30:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01096e40: 0x1096e40: lw    s0, 16(sp)
+// 0x01097488: 0x1097488: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4718,7 +4718,7 @@ L_1096e30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01096e44: 0x1096e44: jr    ra addiu sp, sp, 32
+// 0x0109748c: 0x109748c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4730,7 +4730,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_list_menu_activate_1096e4c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_list_menu_activate_1097494(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s3,int32 v1,int32 s2,int32 s4,int32 ra)
@@ -4780,12 +4780,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096e4c: 0x1096e4c: addiu sp, sp, -40
+// 0x01097494: 0x1097494: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01096e50: 0x1096e50: sw    s2, 24(sp)
+// 0x01097498: 0x1097498: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4794,7 +4794,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01096e54: 0x1096e54: sw    s0, 16(sp)
+// 0x0109749c: 0x109749c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4803,8 +4803,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01096e58: 0x1096e58: sw    ra, 36(sp)
-// 0x01096e5c: 0x1096e5c: sw    s4, 32(sp)
+// 0x010974a0: 0x10974a0: sw    ra, 36(sp)
+// 0x010974a4: 0x10974a4: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4813,7 +4813,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01096e60: 0x1096e60: sw    s3, 28(sp)
+// 0x010974a8: 0x10974a8: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4822,7 +4822,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01096e64: 0x1096e64: sw    s1, 20(sp)
+// 0x010974ac: 0x10974ac: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4831,10 +4831,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01096e68: 0x1096e68: addu  a0, a1, zero
+// 0x010974b0: 0x10974b0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01096e6c: 0x1096e6c: lw    s2, 56(sp)
+// 0x010974b4: 0x10974b4: lw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4843,21 +4843,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01096e70: 0x1096e70: beq   a1, zero, 0x1096e90 addu  s0, a2, zero
+// 0x010974b8: 0x10974b8: beq   a1, zero, 0x10974d8 addu  s0, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 7
-	brfalse L_1096e90
+	brfalse L_10974d8
 // --- basic block ---
-// 0x01096e78: 0x1096e78: lui   a1, 0x20000
+// 0x010974c0: 0x10974c0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01096e7c: 0x1096e7c: addiu a1, a1, 9748
+// 0x010974c4: 0x10974c4: addiu a1, a1, 10208
 	ldloc.2
-	ldc.i4 9748
+	ldc.i4 10208
 	add
 	stloc.2
-// 0x01096e80: 0x1096e80: jal   0x102931c addu  a2, s2, zero
+// 0x010974c8: 0x10974c8: jal   0x102932c addu  a2, s2, zero
 	ldloc 11
 	stloc.3
 	ldloc.0
@@ -4865,54 +4865,54 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_user_config_102931c(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_user_config_102932c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01096e88: 0x1096e88: bne   v0, zero, 0x1096e94 sll   zero, zero, 0
+// 0x010974d0: 0x10974d0: bne   v0, zero, 0x10974dc sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1096e94
+	brtrue L_10974dc
 // --- basic block ---
-L_1096e90:
-// 0x01096e90: 0x1096e90: addu  v0, s0, zero
+L_10974d8:
+// 0x010974d8: 0x10974d8: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-L_1096e94:
-// 0x01096e94: 0x1096e94: lui   s3, 0x20000
+L_10974dc:
+// 0x010974dc: 0x10974dc: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01096e98: 0x1096e98: addu  s1, v0, zero
+// 0x010974e0: 0x10974e0: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x01096e9c: 0x1096e9c: addiu s3, s3, 24920
+// 0x010974e4: 0x10974e4: addiu s3, s3, 25384
 	ldloc 9
-	ldc.i4 24920
+	ldc.i4 25384
 	add
 	stloc 9
-// 0x01096ea0: 0x1096ea0: j	 0x1096ed8 addiu s0, zero, 1
+// 0x010974e8: 0x10974e8: j	 0x1097520 addiu s0, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1096ed8
+	br L_1097520
 // --- basic block ---
-L_1096ea8:
-// 0x01096ea8: 0x1096ea8: beq   v0, s3, 0x1096ed4 sll   zero, zero, 0
+L_10974f0:
+// 0x010974f0: 0x10974f0: beq   v0, s3, 0x109751c sll   zero, zero, 0
 	ldloc 6
 	ldloc 9
-	beq  L_1096ed4
+	beq  L_109751c
 // --- basic block ---
-// 0x01096eb0: 0x1096eb0: jal   0x1096db8 sll   zero, zero, 0
+// 0x010974f8: 0x10974f8: jal   0x1097400 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::find_action_1096db8(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::find_action_1097400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01096eb8: 0x1096eb8: lw    a0, 4(v0)
+// 0x01097500: 0x1097500: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4921,7 +4921,7 @@ L_1096ea8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01096ebc: 0x1096ebc: jal   0x101cd60 addu  s4, v0, zero
+// 0x01097504: 0x1097504: jal   0x101cd70 addu  s4, v0, zero
 	ldloc 6
 	stloc 12
 	ldloc.0
@@ -4929,12 +4929,12 @@ L_1096ea8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01096ec4: 0x1096ec4: lw    a2, 20(s4)
+// 0x0109750c: 0x109750c: lw    a2, 20(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -4943,57 +4943,57 @@ L_1096ea8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01096ec8: 0x1096ec8: addu  a0, s0, zero
+// 0x01097510: 0x1097510: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01096ecc: 0x1096ecc: jal   0x104fad8 addu  a1, v0, zero
+// 0x01097514: 0x1097514: jal   0x104fae8 addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_1096ed4:
-// 0x01096ed4: 0x1096ed4: addiu s0, s0, 1
+L_109751c:
+// 0x0109751c: 0x109751c: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_1096ed8:
-// 0x01096ed8: 0x1096ed8: lw    v0, 0(s1)
+L_1097520:
+// 0x01097520: 0x1097520: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01096edc: 0x1096edc: addu  a0, s2, zero
+// 0x01097524: 0x1097524: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01096ee0: 0x1096ee0: addiu s1, s1, 4
+// 0x01097528: 0x1097528: addiu s1, s1, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x01096ee4: 0x1096ee4: bne   v0, zero, 0x1096ea8 addu  a1, v0, zero
+// 0x0109752c: 0x109752c: bne   v0, zero, 0x10974f0 addu  a1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.2
-	brtrue L_1096ea8
+	brtrue L_10974f0
 // --- basic block ---
-// 0x01096eec: 0x1096eec: jal   0x104fce4 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_main_show_miniMenu_104fce4()
+// 0x01097534: 0x1097534: jal   0x104fcf4 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_main_show_miniMenu_104fcf4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01096ef4: 0x1096ef4: lw    ra, 36(sp)
-// 0x01096ef8: 0x1096ef8: lw    s4, 32(sp)
+// 0x0109753c: 0x109753c: lw    ra, 36(sp)
+// 0x01097540: 0x1097540: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5002,7 +5002,7 @@ L_1096ed8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01096efc: 0x1096efc: lw    s3, 28(sp)
+// 0x01097544: 0x1097544: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5011,7 +5011,7 @@ L_1096ed8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01096f00: 0x1096f00: lw    s2, 24(sp)
+// 0x01097548: 0x1097548: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5020,7 +5020,7 @@ L_1096ed8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01096f04: 0x1096f04: lw    s1, 20(sp)
+// 0x0109754c: 0x109754c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5029,7 +5029,7 @@ L_1096ed8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096f08: 0x1096f08: lw    s0, 16(sp)
+// 0x01097550: 0x1097550: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5038,7 +5038,7 @@ L_1096ed8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01096f0c: 0x1096f0c: jr    ra addiu sp, sp, 40
+// 0x01097554: 0x1097554: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5050,7 +5050,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_menu_set_right_text_1096f78(int32,int32,int32,int32,int32)
+.method public static int32 ssd_menu_set_right_text_10975c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5091,12 +5091,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096f78: 0x1096f78: addiu sp, sp, -32
+// 0x010975c0: 0x10975c0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01096f7c: 0x1096f7c: sw    s0, 20(sp)
+// 0x010975c4: 0x10975c4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5105,13 +5105,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01096f80: 0x1096f80: addu  s0, a1, zero
+// 0x010975c8: 0x10975c8: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01096f84: 0x1096f84: addu  a1, zero, zero
+// 0x010975cc: 0x10975cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01096f88: 0x1096f88: sw    s1, 24(sp)
+// 0x010975d0: 0x10975d0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5120,8 +5120,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01096f8c: 0x1096f8c: sw    ra, 28(sp)
-// 0x01096f90: 0x1096f90: jal   0x1095eec addu  s1, a2, zero
+// 0x010975d4: 0x10975d4: sw    ra, 28(sp)
+// 0x010975d8: 0x10975d8: jal   0x1096534 addu  s1, a2, zero
 	ldloc.3
 	stloc 9
 	ldloc.0
@@ -5129,18 +5129,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096f98: 0x1096f98: beq   v0, zero, 0x1096fc8 addu  a0, v0, zero
+// 0x010975e0: 0x10975e0: beq   v0, zero, 0x1097610 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1096fc8
+	brfalse L_1097610
 // --- basic block ---
-// 0x01096fa0: 0x1096fa0: jal   0x109b304 addu  a1, s0, zero
+// 0x010975e8: 0x10975e8: jal   0x109b94c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5148,23 +5148,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096fa8: 0x1096fa8: beq   v0, zero, 0x1096fc8 addu  a0, v0, zero
+// 0x010975f0: 0x10975f0: beq   v0, zero, 0x1097610 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1096fc8
+	brfalse L_1097610
 // --- basic block ---
-// 0x01096fb0: 0x1096fb0: lui   a1, 0x20000
+// 0x010975f8: 0x10975f8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01096fb4: 0x1096fb4: jal   0x109b304 addiu a1, a1, -2880
+// 0x010975fc: 0x10975fc: jal   0x109b94c addiu a1, a1, -2416
 	ldloc.2
-	ldc.i4 -2880
+	ldc.i4 -2416
 	add
 	stloc.2
 	ldloc.0
@@ -5172,15 +5172,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01096fbc: 0x1096fbc: addu  a0, v0, zero
+// 0x01097604: 0x1097604: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01096fc0: 0x1096fc0: jal   0x1097e5c addu  a1, s1, zero
+// 0x01097608: 0x1097608: jal   0x10984a4 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -5188,14 +5188,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1096fc8:
-// 0x01096fc8: 0x1096fc8: lw    ra, 28(sp)
-// 0x01096fcc: 0x1096fcc: lw    s1, 24(sp)
+L_1097610:
+// 0x01097610: 0x1097610: lw    ra, 28(sp)
+// 0x01097614: 0x1097614: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5204,7 +5204,7 @@ L_1096fc8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01096fd0: 0x1096fd0: lw    s0, 20(sp)
+// 0x01097618: 0x1097618: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5213,7 +5213,7 @@ L_1096fc8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01096fd4: 0x1096fd4: jr    ra addiu sp, sp, 32
+// 0x0109761c: 0x109761c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5225,7 +5225,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_menu_new_cb_1096fdc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_menu_new_cb_1097624(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s5,int32 s7,int32 s4,int32 s8,int32 s6,int32 ra)
@@ -5287,12 +5287,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01096fdc: 0x1096fdc: addiu sp, sp, -104
+// 0x01097624: 0x1097624: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x01096fe0: 0x1096fe0: sw    s2, 72(sp)
+// 0x01097628: 0x1097628: sw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5301,7 +5301,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01096fe4: 0x1096fe4: sw    s0, 64(sp)
+// 0x0109762c: 0x109762c: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5310,19 +5310,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01096fe8: 0x1096fe8: addu  s2, a1, zero
+// 0x01097630: 0x1097630: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01096fec: 0x1096fec: addu  s0, a0, zero
+// 0x01097634: 0x1097634: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01096ff0: 0x1096ff0: lui   a1, 0x20000
+// 0x01097638: 0x1097638: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01096ff4: 0x1096ff4: addu  a0, a2, zero
+// 0x0109763c: 0x109763c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01096ff8: 0x1096ff8: lw    a2, 120(sp)
+// 0x01097640: 0x1097640: lw    a2, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5331,13 +5331,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01096ffc: 0x1096ffc: addiu a1, a1, 9748
+// 0x01097644: 0x1097644: addiu a1, a1, 10208
 	ldloc.2
-	ldc.i4 9748
+	ldc.i4 10208
 	add
 	stloc.2
-// 0x01097000: 0x1097000: sw    ra, 100(sp)
-// 0x01097004: 0x1097004: sw    s7, 92(sp)
+// 0x01097648: 0x1097648: sw    ra, 100(sp)
+// 0x0109764c: 0x109764c: sw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5346,7 +5346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01097008: 0x1097008: sw    s6, 88(sp)
+// 0x01097650: 0x1097650: sw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5355,10 +5355,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109700c: 0x109700c: addu  s7, a3, zero
+// 0x01097654: 0x1097654: addu  s7, a3, zero
 	ldloc 4
 	stloc 13
-// 0x01097010: 0x1097010: sw    s5, 84(sp)
+// 0x01097658: 0x1097658: sw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5367,7 +5367,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01097014: 0x1097014: sw    s4, 80(sp)
+// 0x0109765c: 0x109765c: sw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5376,7 +5376,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01097018: 0x1097018: sw    s1, 68(sp)
+// 0x01097660: 0x1097660: sw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5385,7 +5385,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109701c: 0x109701c: lw    s4, 124(sp)
+// 0x01097664: 0x1097664: lw    s4, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5394,7 +5394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01097020: 0x1097020: sw    s8, 96(sp)
+// 0x01097668: 0x1097668: sw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5403,7 +5403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01097024: 0x1097024: jal   0x102931c sw    s3, 76(sp)
+// 0x0109766c: 0x109766c: jal   0x102932c sw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5417,15 +5417,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_user_config_102931c(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_user_config_102932c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109702c: 0x109702c: addu  a0, s0, zero
+// 0x01097674: 0x1097674: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01097030: 0x1097030: jal   0x101cd60 addu  s5, v0, zero
+// 0x01097678: 0x1097678: jal   0x101cd70 addu  s5, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -5433,15 +5433,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097038: 0x1097038: lui   a3, 0x40000
+// 0x01097680: 0x1097680: lui   a3, 0x40000
 	ldc.i4 262144
 	stloc 4
-// 0x0109703c: 0x109703c: lw    a2, 128(sp)
+// 0x01097684: 0x1097684: lw    a2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5450,20 +5450,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097040: 0x1097040: ori   a3, a3, 1
+// 0x01097688: 0x1097688: ori   a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	or
 	stloc 4
-// 0x01097044: 0x1097044: addu  a1, v0, zero
+// 0x0109768c: 0x109768c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01097048: 0x1097048: or    a3, s4, a3
+// 0x01097690: 0x1097690: or    a3, s4, a3
 	ldloc 14
 	ldloc 4
 	or
 	stloc 4
-// 0x0109704c: 0x109704c: jal   0x1095a08 addu  a0, s0, zero
+// 0x01097694: 0x1097694: jal   0x1096050 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5471,36 +5471,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097054: 0x1097054: jal   0x101fa28 addu  s1, v0, zero
+// 0x0109769c: 0x109769c: jal   0x101fa38 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0109705c: 0x109705c: beq   v0, zero, 0x1097068 addiu s6, zero, 45
+// 0x010976a4: 0x10976a4: beq   v0, zero, 0x10976b0 addiu s6, zero, 45
 	ldloc 5
 	ldc.i4.s 45
 	stloc 16
-	brfalse L_1097068
+	brfalse L_10976b0
 // --- basic block ---
-// 0x01097064: 0x1097064: addiu s6, zero, 90
+// 0x010976ac: 0x10976ac: addiu s6, zero, 90
 	ldc.i4.s 90
 	stloc 16
-L_1097068:
-// 0x01097068: 0x1097068: lui   v0, 0x10000
+L_10976b0:
+// 0x010976b0: 0x10976b0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0109706c: 0x109706c: and   v0, s4, v0
+// 0x010976b4: 0x10976b4: and   v0, s4, v0
 	ldloc 14
 	ldloc 5
 	and
 	stloc 5
-// 0x01097070: 0x1097070: sw    v0, 48(sp)
+// 0x010976b8: 0x10976b8: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5509,7 +5509,7 @@ L_1097068:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01097074: 0x1097074: lw    a0, 48(sp)
+// 0x010976bc: 0x10976bc: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5518,133 +5518,133 @@ L_1097068:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097078: 0x1097078: lui   v1, 0xf0000
+// 0x010976c0: 0x10976c0: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0109707c: 0x109707c: beq   a0, zero, 0x1097138 lui   v0, 0xf0000
+// 0x010976c4: 0x10976c4: beq   a0, zero, 0x1097780 lui   v0, 0xf0000
 	ldloc.1
 	ldc.i4 983040
 	stloc 5
-	brfalse L_1097138
+	brfalse L_1097780
 // --- basic block ---
-// 0x01097084: 0x1097084: lw    v0, -30072(v0)
+// 0x010976cc: 0x10976cc: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097088: 0x1097088: lw    s2, -30068(v1)
+// 0x010976d0: 0x10976d0: lw    s2, -29604(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109708c: 0x109708c: sll   zero, zero, 0
-// 0x01097090: 0x1097090: slt   v1, v0, s2
+// 0x010976d4: 0x10976d4: sll   zero, zero, 0
+// 0x010976d8: 0x10976d8: slt   v1, v0, s2
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 7
-// 0x01097094: 0x1097094: beq   v1, zero, 0x10970a0 sll   zero, zero, 0
+// 0x010976dc: 0x10976dc: beq   v1, zero, 0x10976e8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10970a0
+	brfalse L_10976e8
 // --- basic block ---
-// 0x0109709c: 0x109709c: addu  s2, v0, zero
+// 0x010976e4: 0x10976e4: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-L_10970a0:
-// 0x010970a0: 0x10970a0: jal   0x101fa28 addiu s2, s2, -40
+L_10976e8:
+// 0x010976e8: 0x10976e8: jal   0x101fa38 addiu s2, s2, -40
 	ldloc 9
 	ldc.i4.s -40
 	add
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010970a8: 0x10970a8: bne   v0, zero, 0x10970c4 slti  v0, s2, 481
+// 0x010976f0: 0x10976f0: bne   v0, zero, 0x109770c slti  v0, s2, 481
 	ldloc 5
 	ldloc 9
 	ldc.i4 481
 	clt
 	stloc 5
-	brtrue L_10970c4
+	brtrue L_109770c
 // --- basic block ---
-// 0x010970b0: 0x10970b0: slti  v0, s2, 241
+// 0x010976f8: 0x10976f8: slti  v0, s2, 241
 	ldloc 9
 	ldc.i4 241
 	clt
 	stloc 5
-// 0x010970b4: 0x10970b4: bne   v0, zero, 0x10970d0 lui   v0, 0x80000
+// 0x010976fc: 0x10976fc: bne   v0, zero, 0x1097718 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10970d0
+	brtrue L_1097718
 // --- basic block ---
-// 0x010970bc: 0x10970bc: j	 0x10970d0 addiu s2, zero, 240
+// 0x01097704: 0x1097704: j	 0x1097718 addiu s2, zero, 240
 	ldc.i4 240
 	stloc 9
-	br L_10970d0
+	br L_1097718
 // --- basic block ---
-L_10970c4:
-// 0x010970c4: 0x10970c4: bne   v0, zero, 0x10970d0 lui   v0, 0x80000
+L_109770c:
+// 0x0109770c: 0x109770c: bne   v0, zero, 0x1097718 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10970d0
+	brtrue L_1097718
 // --- basic block ---
-// 0x010970cc: 0x10970cc: addiu s2, zero, 480
+// 0x01097714: 0x1097714: addiu s2, zero, 480
 	ldc.i4 480
 	stloc 9
-L_10970d0:
-// 0x010970d0: 0x10970d0: and   v0, s4, v0
+L_1097718:
+// 0x01097718: 0x1097718: and   v0, s4, v0
 	ldloc 14
 	ldloc 5
 	and
 	stloc 5
-// 0x010970d4: 0x10970d4: beq   v0, zero, 0x10970e0 sll   zero, zero, 0
+// 0x0109771c: 0x109771c: beq   v0, zero, 0x1097728 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10970e0
+	brfalse L_1097728
 // --- basic block ---
-// 0x010970dc: 0x10970dc: addiu s2, zero, -1
+// 0x01097724: 0x1097724: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 9
-L_10970e0:
-// 0x010970e0: 0x10970e0: addu  a0, s1, zero
+L_1097728:
+// 0x01097728: 0x1097728: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010970e4: 0x10970e4: addiu a1, zero, -1
+// 0x0109772c: 0x109772c: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010970e8: 0x10970e8: jal   0x1098ef8 addiu a2, zero, -1
+// 0x01097730: 0x1097730: jal   0x1099540 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x010970f0: 0x10970f0: addu  a2, s2, zero
+// 0x01097738: 0x1097738: addu  a2, s2, zero
 	ldloc 9
 	stloc.3
-// 0x010970f4: 0x10970f4: addu  a0, s0, zero
+// 0x0109773c: 0x109773c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010970f8: 0x10970f8: addiu a3, zero, -1
+// 0x01097740: 0x1097740: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010970fc: 0x10970fc: addu  a1, zero, zero
+// 0x01097744: 0x1097744: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097100: 0x1097100: lui   s0, 0x0
+// 0x01097748: 0x1097748: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01097104: 0x1097104: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0109774c: 0x109774c: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5658,107 +5658,107 @@ L_10970e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109710c: 0x109710c: addu  s3, v0, zero
+// 0x01097754: 0x1097754: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01097110: 0x1097110: addu  a0, s1, zero
+// 0x01097758: 0x1097758: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01097114: 0x1097114: addiu a1, s0, 31980
+// 0x0109775c: 0x109775c: addiu a1, s0, 31980
 	ldloc 8
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01097118: 0x1097118: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01097760: 0x1097760: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01097120: 0x1097120: addu  a0, s3, zero
+// 0x01097768: 0x1097768: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01097124: 0x1097124: addiu a1, s0, 31980
+// 0x0109776c: 0x109776c: addiu a1, s0, 31980
 	ldloc 8
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01097128: 0x1097128: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01097770: 0x1097770: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01097130: 0x1097130: j	 0x1097258 addu  a0, s1, zero
+// 0x01097778: 0x1097778: j	 0x10978a0 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-	br L_1097258
+	br L_10978a0
 // --- basic block ---
-L_1097138:
-// 0x01097138: 0x1097138: lw    v0, -30072(v0)
+L_1097780:
+// 0x01097780: 0x1097780: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109713c: 0x109713c: lw    a2, -30068(v1)
+// 0x01097784: 0x1097784: lw    a2, -29604(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097140: 0x1097140: sll   zero, zero, 0
-// 0x01097144: 0x1097144: slt   v1, v0, a2
+// 0x01097788: 0x1097788: sll   zero, zero, 0
+// 0x0109778c: 0x109778c: slt   v1, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 7
-// 0x01097148: 0x1097148: beq   v1, zero, 0x1097154 sll   zero, zero, 0
+// 0x01097790: 0x1097790: beq   v1, zero, 0x109779c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1097154
+	brfalse L_109779c
 // --- basic block ---
-// 0x01097150: 0x1097150: addu  a2, v0, zero
+// 0x01097798: 0x1097798: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_1097154:
-// 0x01097154: 0x1097154: lui   v0, 0x40000000
+L_109779c:
+// 0x0109779c: 0x109779c: lui   v0, 0x40000000
 	ldc.i4 1073741824
 	stloc 5
-// 0x01097158: 0x1097158: addiu a2, a2, -10
+// 0x010977a0: 0x10977a0: addiu a2, a2, -10
 	ldloc.3
 	ldc.i4.s -10
 	add
 	stloc.3
-// 0x0109715c: 0x109715c: addu  a0, s0, zero
+// 0x010977a4: 0x10977a4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01097160: 0x1097160: addu  a1, zero, zero
+// 0x010977a8: 0x10977a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097164: 0x1097164: addiu a3, zero, -1
+// 0x010977ac: 0x10977ac: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01097168: 0x1097168: ori   v0, v0, 20481
+// 0x010977b0: 0x10977b0: ori   v0, v0, 20481
 	ldloc 5
 	ldc.i4 20481
 	or
 	stloc 5
-// 0x0109716c: 0x109716c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010977b4: 0x10977b4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5772,52 +5772,52 @@ L_1097154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097174: 0x1097174: addu  a0, v0, zero
+// 0x010977bc: 0x10977bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01097178: 0x1097178: addu  a1, zero, zero
+// 0x010977c0: 0x10977c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109717c: 0x109717c: addu  a2, zero, zero
+// 0x010977c4: 0x10977c4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01097180: 0x1097180: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010977c8: 0x10977c8: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01097188: 0x1097188: beq   s2, zero, 0x1097210 lui   a0, 0x0
+// 0x010977d0: 0x10977d0: beq   s2, zero, 0x1097858 lui   a0, 0x0
 	ldloc 9
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1097210
+	brfalse L_1097858
 // --- basic block ---
-// 0x01097190: 0x1097190: addiu a0, a0, 32124
+// 0x010977d8: 0x10977d8: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01097194: 0x1097194: addu  a1, zero, zero
+// 0x010977dc: 0x10977dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097198: 0x1097198: addiu a2, zero, -2
+// 0x010977e0: 0x10977e0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0109719c: 0x109719c: addiu a3, zero, 5
+// 0x010977e4: 0x10977e4: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x010971a0: 0x10971a0: addiu v0, zero, 136
+// 0x010977e8: 0x10977e8: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010971a4: 0x10971a4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010977ec: 0x10977ec: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5831,21 +5831,21 @@ L_1097154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010971ac: 0x10971ac: addu  a0, v0, zero
+// 0x010977f4: 0x10977f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010971b0: 0x10971b0: addu  a1, zero, zero
+// 0x010977f8: 0x10977f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010971b4: 0x10971b4: addu  a2, zero, zero
+// 0x010977fc: 0x10977fc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010971b8: 0x10971b8: jal   0x1098fe0 sw    v0, 52(sp)
+// 0x01097800: 0x1097800: jal   0x1099628 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5857,17 +5857,17 @@ L_1097154:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010971c0: 0x10971c0: lui   v1, 0x400000
+// 0x01097808: 0x1097808: lui   v1, 0x400000
 	ldc.i4 4194304
 	stloc 7
-// 0x010971c4: 0x10971c4: and   v1, s4, v1
+// 0x0109780c: 0x109780c: and   v1, s4, v1
 	ldloc 14
 	ldloc 7
 	and
 	stloc 7
-// 0x010971c8: 0x10971c8: lw    v0, 52(sp)
+// 0x01097810: 0x1097810: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5876,85 +5876,85 @@ L_1097154:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010971cc: 0x10971cc: beq   v1, zero, 0x10971f8 sll   zero, zero, 0
+// 0x01097814: 0x1097814: beq   v1, zero, 0x1097840 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10971f8
+	brfalse L_1097840
 // --- basic block ---
-// 0x010971d4: 0x10971d4: addu  a1, v0, zero
+// 0x0109781c: 0x109781c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010971d8: 0x10971d8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01097820: 0x1097820: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010971e0: 0x10971e0: addu  a0, s1, zero
+// 0x01097828: 0x1097828: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010971e4: 0x10971e4: jal   0x1098ec4 addu  a1, s3, zero
+// 0x0109782c: 0x109782c: jal   0x109950c addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010971ec: 0x10971ec: addu  a0, s1, zero
+// 0x01097834: 0x1097834: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010971f0: 0x10971f0: j	 0x109725c addu  a1, s2, zero
+// 0x01097838: 0x1097838: j	 0x10978a4 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-	br L_109725c
+	br L_10978a4
 // --- basic block ---
-L_10971f8:
-// 0x010971f8: 0x10971f8: addu  a1, v0, zero
+L_1097840:
+// 0x01097840: 0x1097840: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010971fc: 0x10971fc: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01097844: 0x1097844: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097204: 0x1097204: addu  a0, s1, zero
+// 0x0109784c: 0x109784c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01097208: 0x1097208: j	 0x109724c addu  a1, s2, zero
+// 0x01097850: 0x1097850: j	 0x1097894 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-	br L_109724c
+	br L_1097894
 // --- basic block ---
-L_1097210:
-// 0x01097210: 0x1097210: addiu a0, a0, 32124
+L_1097858:
+// 0x01097858: 0x1097858: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01097214: 0x1097214: addiu a3, zero, 5
+// 0x0109785c: 0x109785c: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x01097218: 0x1097218: addu  a1, zero, zero
+// 0x01097860: 0x1097860: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109721c: 0x109721c: addiu a2, zero, -2
+// 0x01097864: 0x1097864: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01097220: 0x1097220: addiu v0, zero, 136
+// 0x01097868: 0x1097868: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x01097224: 0x1097224: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0109786c: 0x109786c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5968,21 +5968,21 @@ L_1097210:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109722c: 0x109722c: addu  a0, v0, zero
+// 0x01097874: 0x1097874: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01097230: 0x1097230: addu  a1, zero, zero
+// 0x01097878: 0x1097878: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097234: 0x1097234: addu  a2, zero, zero
+// 0x0109787c: 0x109787c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01097238: 0x1097238: jal   0x1098fe0 sw    v0, 52(sp)
+// 0x01097880: 0x1097880: jal   0x1099628 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5994,9 +5994,9 @@ L_1097210:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01097240: 0x1097240: lw    v0, 52(sp)
+// 0x01097888: 0x1097888: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6005,73 +6005,73 @@ L_1097210:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097244: 0x1097244: addu  a0, s1, zero
+// 0x0109788c: 0x109788c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01097248: 0x1097248: addu  a1, v0, zero
+// 0x01097890: 0x1097890: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-L_109724c:
-// 0x0109724c: 0x109724c: jal   0x1098ec4 sll   zero, zero, 0
+L_1097894:
+// 0x01097894: 0x1097894: jal   0x109950c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097254: 0x1097254: addu  a0, s1, zero
+// 0x0109789c: 0x109789c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-L_1097258:
-// 0x01097258: 0x1097258: addu  a1, s3, zero
+L_10978a0:
+// 0x010978a0: 0x10978a0: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-L_109725c:
-// 0x0109725c: 0x109725c: jal   0x1098ec4 sll   zero, zero, 0
+L_10978a4:
+// 0x010978a4: 0x10978a4: jal   0x109950c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097264: 0x1097264: bne   s5, zero, 0x1097270 sll   zero, zero, 0
+// 0x010978ac: 0x10978ac: bne   s5, zero, 0x10978b8 sll   zero, zero, 0
 	ldloc 12
-	brtrue L_1097270
+	brtrue L_10978b8
 // --- basic block ---
-// 0x0109726c: 0x109726c: addu  s5, s7, zero
+// 0x010978b4: 0x10978b4: addu  s5, s7, zero
 	ldloc 13
 	stloc 12
-L_1097270:
-// 0x01097270: 0x1097270: lui   s8, 0x1090000
+L_10978b8:
+// 0x010978b8: 0x10978b8: lui   s8, 0x1090000
 	ldc.i4 17367040
 	stloc 15
-// 0x01097274: 0x1097274: lui   s7, 0x0
+// 0x010978bc: 0x10978bc: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01097278: 0x1097278: addiu s8, s8, 27928
+// 0x010978c0: 0x10978c0: addiu s8, s8, 29536
 	ldloc 15
-	ldc.i4 27928
+	ldc.i4 29536
 	add
 	stloc 15
-// 0x0109727c: 0x109727c: addiu s7, s7, 31980
+// 0x010978c4: 0x10978c4: addiu s7, s7, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc 13
-// 0x01097280: 0x1097280: j	 0x10977a0 addu  s0, zero, zero
+// 0x010978c8: 0x10978c8: j	 0x1097de8 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10977a0
+	br L_1097de8
 // --- basic block ---
-L_1097288:
-// 0x01097288: 0x1097288: addu  a0, s2, zero
+L_10978d0:
+// 0x010978d0: 0x10978d0: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0109728c: 0x109728c: jal   0x1001b14 addiu a1, a1, 24920
+// 0x010978d4: 0x10978d4: jal   0x1001b14 addiu a1, a1, 25384
 	ldloc.2
-	ldc.i4 24920
+	ldc.i4 25384
 	add
 	stloc.2
 	ldloc.1
@@ -6079,17 +6079,17 @@ L_1097288:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01097294: 0x1097294: bne   v0, zero, 0x10972a4 sll   zero, zero, 0
+// 0x010978dc: 0x10978dc: bne   v0, zero, 0x10978ec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10972a4
+	brtrue L_10978ec
 // --- basic block ---
-// 0x0109729c: 0x109729c: j	 0x109779c addiu s0, zero, 4
+// 0x010978e4: 0x10978e4: j	 0x1097de4 addiu s0, zero, 4
 	ldc.i4.4
 	stloc 8
-	br L_109779c
+	br L_1097de4
 // --- basic block ---
-L_10972a4:
-// 0x010972a4: 0x10972a4: lw    a2, 48(sp)
+L_10978ec:
+// 0x010978ec: 0x10978ec: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6098,12 +6098,12 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010972a8: 0x10972a8: sll   zero, zero, 0
-// 0x010972ac: 0x10972ac: beq   a2, zero, 0x1097558 sll   zero, zero, 0
+// 0x010978f0: 0x10978f0: sll   zero, zero, 0
+// 0x010978f4: 0x10978f4: beq   a2, zero, 0x1097ba0 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1097558
+	brfalse L_1097ba0
 // --- basic block ---
-// 0x010972b4: 0x10972b4: lw    a0, 120(sp)
+// 0x010978fc: 0x10978fc: lw    a0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6112,7 +6112,7 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010972b8: 0x10972b8: jal   0x1096db8 addu  a1, s2, zero
+// 0x01097900: 0x1097900: jal   0x1097400 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6120,12 +6120,12 @@ L_10972a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::find_action_1096db8(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::find_action_1097400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010972c0: 0x10972c0: sw    v0, 40(sp)
+// 0x01097908: 0x1097908: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6134,27 +6134,27 @@ L_10972a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010972c4: 0x10972c4: lui   v0, 0x100000
+// 0x0109790c: 0x109790c: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010972c8: 0x10972c8: or    v0, s0, v0
+// 0x01097910: 0x1097910: or    v0, s0, v0
 	ldloc 8
 	ldloc 5
 	or
 	stloc 5
-// 0x010972cc: 0x10972cc: addu  a3, s6, zero
+// 0x01097914: 0x1097914: addu  a3, s6, zero
 	ldloc 16
 	stloc 4
-// 0x010972d0: 0x10972d0: addu  a0, s2, zero
+// 0x01097918: 0x1097918: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010972d4: 0x10972d4: addu  a1, zero, zero
+// 0x0109791c: 0x109791c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010972d8: 0x10972d8: addiu a2, zero, -2
+// 0x01097920: 0x1097920: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010972dc: 0x10972dc: sw    v0, 44(sp)
+// 0x01097924: 0x1097924: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6163,7 +6163,7 @@ L_10972a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010972e0: 0x10972e0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01097928: 0x1097928: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6177,24 +6177,24 @@ L_10972a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010972e8: 0x10972e8: addu  a0, v0, zero
+// 0x01097930: 0x1097930: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010972ec: 0x10972ec: addu  a1, zero, zero
+// 0x01097934: 0x1097934: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010972f0: 0x10972f0: addu  a2, zero, zero
+// 0x01097938: 0x1097938: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010972f4: 0x10972f4: addu  s0, v0, zero
+// 0x0109793c: 0x109793c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010972f8: 0x10972f8: sw    s2, 32(sp)
+// 0x01097940: 0x1097940: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6203,7 +6203,7 @@ L_10972a4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010972fc: 0x10972fc: jal   0x1098fe0 sw    zero, 36(sp)
+// 0x01097944: 0x1097944: jal   0x1099628 sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6215,26 +6215,26 @@ L_10972a4:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01097304: 0x1097304: lui   a0, 0x20000
+// 0x0109794c: 0x109794c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01097308: 0x1097308: addu  a3, s6, zero
+// 0x01097950: 0x1097950: addu  a3, s6, zero
 	ldloc 16
 	stloc 4
-// 0x0109730c: 0x109730c: addiu a0, a0, -2868
+// 0x01097954: 0x1097954: addiu a0, a0, -2404
 	ldloc.1
-	ldc.i4 -2868
+	ldc.i4 -2404
 	add
 	stloc.1
-// 0x01097310: 0x1097310: addu  a1, zero, zero
+// 0x01097958: 0x1097958: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097314: 0x1097314: addiu a2, zero, 60
+// 0x0109795c: 0x109795c: addiu a2, zero, 60
 	ldc.i4.s 60
 	stloc.3
-// 0x01097318: 0x1097318: jal   0x1093a24 sw    zero, 16(sp)
+// 0x01097960: 0x1097960: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6248,21 +6248,21 @@ L_10972a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097320: 0x1097320: addu  a0, v0, zero
+// 0x01097968: 0x1097968: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01097324: 0x1097324: addu  a1, zero, zero
+// 0x0109796c: 0x109796c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097328: 0x1097328: addu  a2, zero, zero
+// 0x01097970: 0x1097970: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109732c: 0x109732c: jal   0x1098fe0 sw    v0, 56(sp)
+// 0x01097974: 0x1097974: jal   0x1099628 sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6274,26 +6274,26 @@ L_10972a4:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01097334: 0x1097334: addiu a3, zero, 1
+// 0x0109797c: 0x109797c: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01097338: 0x1097338: addiu a2, sp, 32
+// 0x01097980: 0x1097980: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0109733c: 0x109733c: addu  a0, s2, zero
+// 0x01097984: 0x1097984: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01097340: 0x1097340: addu  a1, s2, zero
+// 0x01097988: 0x1097988: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x01097344: 0x1097344: addiu v0, zero, 17
+// 0x0109798c: 0x109798c: addiu v0, zero, 17
 	ldc.i4.s 17
 	stloc 5
-// 0x01097348: 0x1097348: sw    v0, 16(sp)
+// 0x01097990: 0x1097990: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6302,7 +6302,7 @@ L_10972a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109734c: 0x109734c: jal   0x1090ecc sw    zero, 20(sp)
+// 0x01097994: 0x1097994: jal   0x10914f0 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6316,12 +6316,12 @@ L_10972a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097354: 0x1097354: lw    v1, 56(sp)
+// 0x0109799c: 0x109799c: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6330,13 +6330,13 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097358: 0x1097358: addu  a1, v0, zero
+// 0x010979a0: 0x10979a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0109735c: 0x109735c: addu  a0, v1, zero
+// 0x010979a4: 0x10979a4: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01097360: 0x1097360: jal   0x1098ec4 sw    v0, 52(sp)
+// 0x010979a8: 0x10979a8: jal   0x109950c sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6347,27 +6347,27 @@ L_10972a4:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097368: 0x1097368: jal   0x1099190 addu  a0, s0, zero
+// 0x010979b0: 0x10979b0: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01097370: 0x1097370: lui   a0, 0x1090000
+// 0x010979b8: 0x10979b8: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x01097374: 0x1097374: addiu a0, a0, 31064
+// 0x010979bc: 0x10979bc: addiu a0, a0, 32672
 	ldloc.1
-	ldc.i4 31064
+	ldc.i4 32672
 	add
 	stloc.1
-// 0x01097378: 0x1097378: sw    a0, 200(s0)
+// 0x010979c0: 0x10979c0: sw    a0, 200(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6376,7 +6376,7 @@ L_10972a4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109737c: 0x109737c: sw    a0, 196(s0)
+// 0x010979c4: 0x10979c4: sw    a0, 196(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6385,7 +6385,7 @@ L_10972a4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01097380: 0x1097380: sw    s8, 188(s0)
+// 0x010979c8: 0x10979c8: sw    s8, 188(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6394,14 +6394,14 @@ L_10972a4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01097384: 0x1097384: jal   0x1099190 addu  a0, s0, zero
+// 0x010979cc: 0x10979cc: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x0109738c: 0x109738c: lw    v0, 52(sp)
+// 0x010979d4: 0x10979d4: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6410,18 +6410,18 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097390: 0x1097390: lui   a2, 0x1090000
+// 0x010979d8: 0x10979d8: lui   a2, 0x1090000
 	ldc.i4 17367040
 	stloc.3
-// 0x01097394: 0x1097394: addiu a2, a2, 31156
+// 0x010979dc: 0x10979dc: addiu a2, a2, 32764
 	ldloc.3
-	ldc.i4 31156
+	ldc.i4 32764
 	add
 	stloc.3
-// 0x01097398: 0x1097398: addu  a0, v0, zero
+// 0x010979e0: 0x10979e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109739c: 0x109739c: sw    a2, 216(s0)
+// 0x010979e4: 0x10979e4: sw    a2, 216(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6430,12 +6430,12 @@ L_10972a4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010973a0: 0x10973a0: addiu a1, sp, 24
+// 0x010979e8: 0x10979e8: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010973a4: 0x10973a4: jal   0x1099350 addu  a2, zero, zero
+// 0x010979ec: 0x10979ec: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6443,12 +6443,12 @@ L_10972a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010973ac: 0x10973ac: lw    v0, 40(sp)
+// 0x010979f4: 0x10979f4: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6457,8 +6457,8 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010973b0: 0x10973b0: sll   zero, zero, 0
-// 0x010973b4: 0x10973b4: lw    a1, 20(v0)
+// 0x010979f8: 0x10979f8: sll   zero, zero, 0
+// 0x010979fc: 0x10979fc: lw    a1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6467,14 +6467,14 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010973b8: 0x10973b8: jal   0x1098fd8 addu  a0, s0, zero
+// 0x01097a00: 0x1097a00: jal   0x1099620 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_context_1098fd8(int32,int32)
+	call void Cibyl114::ssd_widget_set_context_1099620(int32,int32)
 // --- basic block ---
-// 0x010973c0: 0x10973c0: lw    v1, 56(sp)
+// 0x01097a08: 0x1097a08: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6483,48 +6483,48 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010973c4: 0x10973c4: addu  a0, s0, zero
+// 0x01097a0c: 0x1097a0c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010973c8: 0x10973c8: jal   0x1098ec4 addu  a1, v1, zero
+// 0x01097a10: 0x1097a10: jal   0x109950c addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010973d0: 0x10973d0: andi  v0, s4, 32768
+// 0x01097a18: 0x1097a18: andi  v0, s4, 32768
 	ldloc 14
 	ldc.i4 32768
 	and
 	stloc 5
-// 0x010973d4: 0x10973d4: bne   v0, zero, 0x1097470 lui   v0, 0x0
+// 0x01097a1c: 0x1097a1c: bne   v0, zero, 0x1097ab8 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1097470
+	brtrue L_1097ab8
 // --- basic block ---
-// 0x010973dc: 0x10973dc: addiu a3, zero, -1
+// 0x01097a24: 0x1097a24: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010973e0: 0x10973e0: addiu a0, v0, 31968
+// 0x01097a28: 0x1097a28: addiu a0, v0, 31968
 	ldloc 5
 	ldc.i4 31968
 	add
 	stloc.1
-// 0x010973e4: 0x10973e4: addiu a2, zero, -1
+// 0x01097a2c: 0x1097a2c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010973e8: 0x10973e8: addu  a1, zero, zero
+// 0x01097a30: 0x1097a30: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010973ec: 0x10973ec: addiu v0, zero, 24
+// 0x01097a34: 0x1097a34: addiu v0, zero, 24
 	ldc.i4.s 24
 	stloc 5
-// 0x010973f0: 0x10973f0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01097a38: 0x1097a38: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6538,21 +6538,21 @@ L_10972a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010973f8: 0x10973f8: addu  a0, v0, zero
+// 0x01097a40: 0x1097a40: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010973fc: 0x10973fc: addu  a1, s7, zero
+// 0x01097a44: 0x1097a44: addu  a1, s7, zero
 	ldloc 13
 	stloc.2
-// 0x01097400: 0x1097400: addu  a2, zero, zero
+// 0x01097a48: 0x1097a48: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01097404: 0x1097404: jal   0x1098fe0 sw    v0, 56(sp)
+// 0x01097a4c: 0x1097a4c: jal   0x1099628 sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6564,9 +6564,9 @@ L_10972a4:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109740c: 0x109740c: lw    a2, 40(sp)
+// 0x01097a54: 0x1097a54: lw    a2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6575,8 +6575,8 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097410: 0x1097410: sll   zero, zero, 0
-// 0x01097414: 0x1097414: lw    a0, 4(a2)
+// 0x01097a58: 0x1097a58: sll   zero, zero, 0
+// 0x01097a5c: 0x1097a5c: lw    a0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -6585,30 +6585,30 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097418: 0x1097418: jal   0x101cd60 sll   zero, zero, 0
+// 0x01097a60: 0x1097a60: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097420: 0x1097420: lui   a0, 0x0
+// 0x01097a68: 0x1097a68: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01097424: 0x1097424: addiu a2, zero, 18
+// 0x01097a6c: 0x1097a6c: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01097428: 0x1097428: addiu a3, zero, 24
+// 0x01097a70: 0x1097a70: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0109742c: 0x109742c: addu  a1, v0, zero
+// 0x01097a74: 0x1097a74: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01097430: 0x1097430: jal   0x1098d10 addiu a0, a0, 32016
+// 0x01097a78: 0x1097a78: jal   0x1099358 addiu a0, a0, 32016
 	ldloc.1
 	ldc.i4 32016
 	add
@@ -6618,23 +6618,23 @@ L_10972a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097438: 0x1097438: lui   a1, 0x0
+// 0x01097a80: 0x1097a80: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0109743c: 0x109743c: addu  a0, v0, zero
+// 0x01097a84: 0x1097a84: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01097440: 0x1097440: addiu a1, a1, 23008
+// 0x01097a88: 0x1097a88: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01097444: 0x1097444: jal   0x1097af8 sw    v0, 52(sp)
+// 0x01097a8c: 0x1097a8c: jal   0x1098140 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6645,9 +6645,9 @@ L_10972a4:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0109744c: 0x109744c: lw    v1, 56(sp)
+// 0x01097a94: 0x1097a94: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6656,7 +6656,7 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097450: 0x1097450: lw    v0, 52(sp)
+// 0x01097a98: 0x1097a98: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6665,20 +6665,20 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097454: 0x1097454: addu  a0, v1, zero
+// 0x01097a9c: 0x1097a9c: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01097458: 0x1097458: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01097aa0: 0x1097aa0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097460: 0x1097460: lw    v1, 56(sp)
+// 0x01097aa8: 0x1097aa8: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6687,29 +6687,29 @@ L_10972a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097464: 0x1097464: addu  a0, s0, zero
+// 0x01097aac: 0x1097aac: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01097468: 0x1097468: jal   0x1098ec4 addu  a1, v1, zero
+// 0x01097ab0: 0x1097ab0: jal   0x109950c addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1097470:
-// 0x01097470: 0x1097470: lui   a0, 0x20000
+L_1097ab8:
+// 0x01097ab8: 0x1097ab8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01097474: 0x1097474: addiu a0, a0, -2856
+// 0x01097abc: 0x1097abc: addiu a0, a0, -2392
 	ldloc.1
-	ldc.i4 -2856
+	ldc.i4 -2392
 	add
 	stloc.1
-// 0x01097478: 0x1097478: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01097ac0: 0x1097ac0: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -6717,38 +6717,38 @@ L_1097470:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097480: 0x1097480: addu  a1, v0, zero
+// 0x01097ac8: 0x1097ac8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01097484: 0x1097484: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01097acc: 0x1097acc: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109748c: 0x109748c: addu  a1, s0, zero
+// 0x01097ad4: 0x1097ad4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01097490: 0x1097490: jal   0x1098ec4 addu  a0, s3, zero
+// 0x01097ad8: 0x1097ad8: jal   0x109950c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097498: 0x1097498: lw    v0, 4(s5)
+// 0x01097ae0: 0x1097ae0: lw    v0, 4(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6757,14 +6757,14 @@ L_1097470:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109749c: 0x109749c: sll   zero, zero, 0
-// 0x010974a0: 0x10974a0: bne   v0, zero, 0x109779c addu  s0, zero, zero
+// 0x01097ae4: 0x1097ae4: sll   zero, zero, 0
+// 0x01097ae8: 0x1097ae8: bne   v0, zero, 0x1097de4 addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_109779c
+	brtrue L_1097de4
 // --- basic block ---
-// 0x010974a8: 0x10974a8: lw    v0, 44(sp)
+// 0x01097af0: 0x1097af0: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6773,19 +6773,19 @@ L_1097470:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010974ac: 0x10974ac: addu  a3, s6, zero
+// 0x01097af4: 0x1097af4: addu  a3, s6, zero
 	ldloc 16
 	stloc 4
-// 0x010974b0: 0x10974b0: addu  a0, s2, zero
+// 0x01097af8: 0x1097af8: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010974b4: 0x10974b4: addu  a1, zero, zero
+// 0x01097afc: 0x1097afc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010974b8: 0x10974b8: addiu a2, zero, -2
+// 0x01097b00: 0x1097b00: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010974bc: 0x10974bc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01097b04: 0x1097b04: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6799,45 +6799,45 @@ L_1097470:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010974c4: 0x10974c4: addu  a0, v0, zero
+// 0x01097b0c: 0x1097b0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010974c8: 0x10974c8: addu  a1, zero, zero
+// 0x01097b10: 0x1097b10: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010974cc: 0x10974cc: addu  a2, zero, zero
+// 0x01097b14: 0x1097b14: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010974d0: 0x10974d0: jal   0x1098fe0 addu  s0, v0, zero
+// 0x01097b18: 0x1097b18: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010974d8: 0x10974d8: lui   a0, 0x1090000
+// 0x01097b20: 0x1097b20: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x010974dc: 0x10974dc: lui   a2, 0x1090000
+// 0x01097b24: 0x1097b24: lui   a2, 0x1090000
 	ldc.i4 17367040
 	stloc.3
-// 0x010974e0: 0x10974e0: addiu a2, a2, 30996
+// 0x01097b28: 0x1097b28: addiu a2, a2, 32604
 	ldloc.3
-	ldc.i4 30996
+	ldc.i4 32604
 	add
 	stloc.3
-// 0x010974e4: 0x10974e4: addiu a0, a0, 30940
+// 0x01097b2c: 0x1097b2c: addiu a0, a0, 32548
 	ldloc.1
-	ldc.i4 30940
+	ldc.i4 32548
 	add
 	stloc.1
-// 0x010974e8: 0x10974e8: sw    a2, 216(s0)
+// 0x01097b30: 0x1097b30: sw    a2, 216(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6846,7 +6846,7 @@ L_1097470:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010974ec: 0x10974ec: sw    a0, 196(s0)
+// 0x01097b34: 0x1097b34: sw    a0, 196(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6855,7 +6855,7 @@ L_1097470:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010974f0: 0x10974f0: sw    s8, 188(s0)
+// 0x01097b38: 0x1097b38: sw    s8, 188(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6864,17 +6864,17 @@ L_1097470:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010974f4: 0x10974f4: jal   0x1099190 addu  a0, s0, zero
+// 0x01097b3c: 0x1097b3c: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010974fc: 0x10974fc: lui   a0, 0x10000
+// 0x01097b44: 0x1097b44: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01097500: 0x1097500: jal   0x101cd60 addiu a0, a0, -25292
+// 0x01097b48: 0x1097b48: jal   0x101cd70 addiu a0, a0, -25292
 	ldloc.1
 	ldc.i4 -25292
 	add
@@ -6884,24 +6884,24 @@ L_1097470:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097508: 0x1097508: lui   a0, 0x10000
+// 0x01097b50: 0x1097b50: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0109750c: 0x109750c: addiu a2, zero, 18
+// 0x01097b54: 0x1097b54: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01097510: 0x1097510: addiu a3, zero, 17
+// 0x01097b58: 0x1097b58: addiu a3, zero, 17
 	ldc.i4.s 17
 	stloc 4
-// 0x01097514: 0x1097514: addu  a1, v0, zero
+// 0x01097b5c: 0x1097b5c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01097518: 0x1097518: jal   0x1098d10 addiu a0, a0, -25284
+// 0x01097b60: 0x1097b60: jal   0x1099358 addiu a0, a0, -25284
 	ldloc.1
 	ldc.i4 -25284
 	add
@@ -6911,23 +6911,23 @@ L_1097470:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097520: 0x1097520: lui   a1, 0x0
+// 0x01097b68: 0x1097b68: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01097524: 0x1097524: addu  a0, v0, zero
+// 0x01097b6c: 0x1097b6c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01097528: 0x1097528: addiu a1, a1, 23008
+// 0x01097b70: 0x1097b70: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0109752c: 0x109752c: jal   0x1097af8 sw    v0, 52(sp)
+// 0x01097b74: 0x1097b74: jal   0x1098140 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6938,16 +6938,16 @@ L_1097470:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01097534: 0x1097534: jal   0x1099190 addu  a0, s0, zero
+// 0x01097b7c: 0x1097b7c: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x0109753c: 0x109753c: lw    v0, 52(sp)
+// 0x01097b84: 0x1097b84: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6956,29 +6956,29 @@ L_1097470:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097540: 0x1097540: addu  a0, s0, zero
+// 0x01097b88: 0x1097b88: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01097544: 0x1097544: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01097b8c: 0x1097b8c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109754c: 0x109754c: addu  a0, s3, zero
+// 0x01097b94: 0x1097b94: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01097550: 0x1097550: j	 0x1097794 addu  a1, s0, zero
+// 0x01097b98: 0x1097b98: j	 0x1097ddc addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-	br L_1097794
+	br L_1097ddc
 // --- basic block ---
-L_1097558:
-// 0x01097558: 0x1097558: lw    a0, 120(sp)
+L_1097ba0:
+// 0x01097ba0: 0x1097ba0: lw    a0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6987,7 +6987,7 @@ L_1097558:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109755c: 0x109755c: jal   0x1096db8 addu  a1, s2, zero
+// 0x01097ba4: 0x1097ba4: jal   0x1097400 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6995,12 +6995,12 @@ L_1097558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::find_action_1096db8(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::find_action_1097400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097564: 0x1097564: jal   0x101fa28 sw    v0, 40(sp)
+// 0x01097bac: 0x1097bac: jal   0x101fa38 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7009,42 +7009,42 @@ L_1097558:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0109756c: 0x109756c: beq   v0, zero, 0x1097578 addiu a3, zero, 60
+// 0x01097bb4: 0x1097bb4: beq   v0, zero, 0x1097bc0 addiu a3, zero, 60
 	ldloc 5
 	ldc.i4.s 60
 	stloc 4
-	brfalse L_1097578
+	brfalse L_1097bc0
 // --- basic block ---
-// 0x01097574: 0x1097574: addiu a3, zero, 90
+// 0x01097bbc: 0x1097bbc: addiu a3, zero, 90
 	ldc.i4.s 90
 	stloc 4
-L_1097578:
-// 0x01097578: 0x1097578: lui   v0, 0x100000
+L_1097bc0:
+// 0x01097bc0: 0x1097bc0: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x0109757c: 0x109757c: ori   v0, v0, 1
+// 0x01097bc4: 0x1097bc4: ori   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 5
-// 0x01097580: 0x1097580: or    s0, s0, v0
+// 0x01097bc8: 0x1097bc8: or    s0, s0, v0
 	ldloc 8
 	ldloc 5
 	or
 	stloc 8
-// 0x01097584: 0x1097584: addu  a1, zero, zero
+// 0x01097bcc: 0x1097bcc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097588: 0x1097588: addiu a2, zero, -2
+// 0x01097bd0: 0x1097bd0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0109758c: 0x109758c: addu  a0, s2, zero
+// 0x01097bd4: 0x1097bd4: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01097590: 0x1097590: jal   0x1093a24 sw    s0, 16(sp)
+// 0x01097bd8: 0x1097bd8: jal   0x1094048 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7058,39 +7058,39 @@ L_1097578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097598: 0x1097598: addu  s0, v0, zero
+// 0x01097be0: 0x1097be0: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109759c: 0x109759c: lui   a0, 0x1090000
+// 0x01097be4: 0x1097be4: lui   a0, 0x1090000
 	ldc.i4 17367040
 	stloc.1
-// 0x010975a0: 0x10975a0: lui   v0, 0x1090000
+// 0x01097be8: 0x1097be8: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x010975a4: 0x10975a4: lui   a2, 0x1090000
+// 0x01097bec: 0x1097bec: lui   a2, 0x1090000
 	ldc.i4 17367040
 	stloc.3
-// 0x010975a8: 0x10975a8: addiu v0, v0, 31124
+// 0x01097bf0: 0x1097bf0: addiu v0, v0, 32732
 	ldloc 5
-	ldc.i4 31124
+	ldc.i4 32732
 	add
 	stloc 5
-// 0x010975ac: 0x10975ac: addiu a2, a2, 31064
+// 0x01097bf4: 0x1097bf4: addiu a2, a2, 32672
 	ldloc.3
-	ldc.i4 31064
+	ldc.i4 32672
 	add
 	stloc.3
-// 0x010975b0: 0x10975b0: addiu a0, a0, 31156
+// 0x01097bf8: 0x1097bf8: addiu a0, a0, 32764
 	ldloc.1
-	ldc.i4 31156
+	ldc.i4 32764
 	add
 	stloc.1
-// 0x010975b4: 0x10975b4: sw    v0, 200(s0)
+// 0x01097bfc: 0x1097bfc: sw    v0, 200(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7099,7 +7099,7 @@ L_1097578:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010975b8: 0x10975b8: sw    a0, 216(s0)
+// 0x01097c00: 0x1097c00: sw    a0, 216(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7108,7 +7108,7 @@ L_1097578:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010975bc: 0x10975bc: sw    a2, 196(s0)
+// 0x01097c04: 0x1097c04: sw    a2, 196(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7117,10 +7117,10 @@ L_1097578:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010975c0: 0x10975c0: addu  a0, s0, zero
+// 0x01097c08: 0x1097c08: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010975c4: 0x10975c4: jal   0x1099190 sw    s8, 188(s0)
+// 0x01097c0c: 0x1097c0c: jal   0x10997d8 sw    s8, 188(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7130,18 +7130,18 @@ L_1097578:
 	ldloc 15
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010975cc: 0x10975cc: lui   v0, 0x1090000
+// 0x01097c14: 0x1097c14: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x010975d0: 0x10975d0: addiu v0, v0, 31156
+// 0x01097c18: 0x1097c18: addiu v0, v0, 32764
 	ldloc 5
-	ldc.i4 31156
+	ldc.i4 32764
 	add
 	stloc 5
-// 0x010975d4: 0x10975d4: sw    v0, 216(s0)
+// 0x01097c1c: 0x1097c1c: sw    v0, 216(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7150,41 +7150,41 @@ L_1097578:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010975d8: 0x10975d8: addu  a0, s0, zero
+// 0x01097c20: 0x1097c20: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010975dc: 0x10975dc: addu  a1, s7, zero
+// 0x01097c24: 0x1097c24: addu  a1, s7, zero
 	ldloc 13
 	stloc.2
-// 0x010975e0: 0x10975e0: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01097c28: 0x1097c28: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010975e8: 0x10975e8: lui   a0, 0x20000
+// 0x01097c30: 0x1097c30: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010975ec: 0x10975ec: addiu a3, zero, -1
+// 0x01097c34: 0x1097c34: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010975f0: 0x10975f0: addu  a1, zero, zero
+// 0x01097c38: 0x1097c38: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010975f4: 0x10975f4: addiu a2, zero, 80
+// 0x01097c3c: 0x1097c3c: addiu a2, zero, 80
 	ldc.i4.s 80
 	stloc.3
-// 0x010975f8: 0x10975f8: addiu a0, a0, -2900
+// 0x01097c40: 0x1097c40: addiu a0, a0, -2436
 	ldloc.1
-	ldc.i4 -2900
+	ldc.i4 -2436
 	add
 	stloc.1
-// 0x010975fc: 0x10975fc: addiu v0, zero, 16
+// 0x01097c44: 0x1097c44: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x01097600: 0x1097600: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01097c48: 0x1097c48: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7198,21 +7198,21 @@ L_1097578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097608: 0x1097608: addu  a0, v0, zero
+// 0x01097c50: 0x1097c50: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109760c: 0x109760c: addu  a1, zero, zero
+// 0x01097c54: 0x1097c54: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097610: 0x1097610: addu  a2, zero, zero
+// 0x01097c58: 0x1097c58: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01097614: 0x1097614: jal   0x1098fe0 sw    v0, 56(sp)
+// 0x01097c5c: 0x1097c5c: jal   0x1099628 sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7224,26 +7224,26 @@ L_1097578:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109761c: 0x109761c: addiu a3, zero, 1
+// 0x01097c64: 0x1097c64: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01097620: 0x1097620: addu  a0, s2, zero
+// 0x01097c68: 0x1097c68: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01097624: 0x1097624: addiu a2, sp, 32
+// 0x01097c6c: 0x1097c6c: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x01097628: 0x1097628: addu  a1, s2, zero
+// 0x01097c70: 0x1097c70: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x0109762c: 0x109762c: addiu v0, zero, 17
+// 0x01097c74: 0x1097c74: addiu v0, zero, 17
 	ldc.i4.s 17
 	stloc 5
-// 0x01097630: 0x1097630: sw    v0, 16(sp)
+// 0x01097c78: 0x1097c78: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7252,7 +7252,7 @@ L_1097578:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01097634: 0x1097634: sw    s2, 32(sp)
+// 0x01097c7c: 0x1097c7c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7261,7 +7261,7 @@ L_1097578:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01097638: 0x1097638: sw    zero, 36(sp)
+// 0x01097c80: 0x1097c80: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7270,7 +7270,7 @@ L_1097578:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109763c: 0x109763c: jal   0x1090ecc sw    zero, 20(sp)
+// 0x01097c84: 0x1097c84: jal   0x10914f0 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7284,12 +7284,12 @@ L_1097578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097644: 0x1097644: lw    a2, 40(sp)
+// 0x01097c8c: 0x1097c8c: lw    a2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7298,10 +7298,10 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097648: 0x1097648: addu  a0, s0, zero
+// 0x01097c90: 0x1097c90: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109764c: 0x109764c: lw    a1, 20(a2)
+// 0x01097c94: 0x1097c94: lw    a1, 20(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -7310,7 +7310,7 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097650: 0x1097650: jal   0x1098fd8 sw    v0, 52(sp)
+// 0x01097c98: 0x1097c98: jal   0x1099620 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7321,9 +7321,9 @@ L_1097578:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_context_1098fd8(int32,int32)
+	call void Cibyl114::ssd_widget_set_context_1099620(int32,int32)
 // --- basic block ---
-// 0x01097658: 0x1097658: lw    v0, 52(sp)
+// 0x01097ca0: 0x1097ca0: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7332,7 +7332,7 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109765c: 0x109765c: lw    v1, 56(sp)
+// 0x01097ca4: 0x1097ca4: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7341,20 +7341,20 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097660: 0x1097660: addu  a1, v0, zero
+// 0x01097ca8: 0x1097ca8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01097664: 0x1097664: jal   0x1098ec4 addu  a0, v1, zero
+// 0x01097cac: 0x1097cac: jal   0x109950c addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109766c: 0x109766c: lw    v1, 56(sp)
+// 0x01097cb4: 0x1097cb4: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7363,48 +7363,48 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097670: 0x1097670: addu  a0, s0, zero
+// 0x01097cb8: 0x1097cb8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01097674: 0x1097674: jal   0x1098ec4 addu  a1, v1, zero
+// 0x01097cbc: 0x1097cbc: jal   0x109950c addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109767c: 0x109767c: andi  v0, s4, 32768
+// 0x01097cc4: 0x1097cc4: andi  v0, s4, 32768
 	ldloc 14
 	ldc.i4 32768
 	and
 	stloc 5
-// 0x01097680: 0x1097680: bne   v0, zero, 0x1097764 lui   v0, 0x0
+// 0x01097cc8: 0x1097cc8: bne   v0, zero, 0x1097dac lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1097764
+	brtrue L_1097dac
 // --- basic block ---
-// 0x01097688: 0x1097688: addiu a3, zero, -1
+// 0x01097cd0: 0x1097cd0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0109768c: 0x109768c: addiu a0, v0, 31968
+// 0x01097cd4: 0x1097cd4: addiu a0, v0, 31968
 	ldloc 5
 	ldc.i4 31968
 	add
 	stloc.1
-// 0x01097690: 0x1097690: addiu a2, zero, -1
+// 0x01097cd8: 0x1097cd8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01097694: 0x1097694: addu  a1, zero, zero
+// 0x01097cdc: 0x1097cdc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097698: 0x1097698: addiu v0, zero, 24
+// 0x01097ce0: 0x1097ce0: addiu v0, zero, 24
 	ldc.i4.s 24
 	stloc 5
-// 0x0109769c: 0x109769c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01097ce4: 0x1097ce4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7418,29 +7418,29 @@ L_1097578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010976a4: 0x10976a4: addu  a0, v0, zero
+// 0x01097cec: 0x1097cec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010976a8: 0x10976a8: addu  a1, s7, zero
+// 0x01097cf0: 0x1097cf0: addu  a1, s7, zero
 	ldloc 13
 	stloc.2
-// 0x010976ac: 0x10976ac: addu  a2, zero, zero
+// 0x01097cf4: 0x1097cf4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010976b0: 0x10976b0: jal   0x1098fe0 addu  s2, v0, zero
+// 0x01097cf8: 0x1097cf8: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010976b8: 0x10976b8: lw    a2, 40(sp)
+// 0x01097d00: 0x1097d00: lw    a2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7449,8 +7449,8 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010976bc: 0x10976bc: sll   zero, zero, 0
-// 0x010976c0: 0x10976c0: lw    a0, 4(a2)
+// 0x01097d04: 0x1097d04: sll   zero, zero, 0
+// 0x01097d08: 0x1097d08: lw    a0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -7459,32 +7459,32 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010976c4: 0x10976c4: jal   0x101cd60 sll   zero, zero, 0
+// 0x01097d0c: 0x1097d0c: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010976cc: 0x10976cc: lui   a0, 0x0
+// 0x01097d14: 0x1097d14: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010976d0: 0x10976d0: addiu a2, zero, 16
+// 0x01097d18: 0x1097d18: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010976d4: 0x10976d4: addu  a3, zero, zero
+// 0x01097d1c: 0x1097d1c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010976d8: 0x10976d8: addiu a0, a0, 32016
+// 0x01097d20: 0x1097d20: addiu a0, a0, 32016
 	ldloc.1
 	ldc.i4 32016
 	add
 	stloc.1
-// 0x010976dc: 0x10976dc: jal   0x1098d10 addu  a1, v0, zero
+// 0x01097d24: 0x1097d24: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7492,44 +7492,44 @@ L_1097578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010976e4: 0x10976e4: addu  a1, v0, zero
+// 0x01097d2c: 0x1097d2c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010976e8: 0x10976e8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01097d30: 0x1097d30: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010976f0: 0x10976f0: lui   a0, 0x20000
+// 0x01097d38: 0x1097d38: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010976f4: 0x10976f4: lui   a1, 0x10000
+// 0x01097d3c: 0x1097d3c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010976f8: 0x10976f8: addiu a0, a0, -2880
+// 0x01097d40: 0x1097d40: addiu a0, a0, -2416
 	ldloc.1
-	ldc.i4 -2880
+	ldc.i4 -2416
 	add
 	stloc.1
-// 0x010976fc: 0x10976fc: addiu a1, a1, 18500
+// 0x01097d44: 0x1097d44: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01097700: 0x1097700: addiu a2, zero, 14
+// 0x01097d48: 0x1097d48: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01097704: 0x1097704: jal   0x1098d10 addiu a3, zero, 18
+// 0x01097d4c: 0x1097d4c: jal   0x1099358 addiu a3, zero, 18
 	ldc.i4.s 18
 	stloc 4
 	ldloc.0
@@ -7537,15 +7537,15 @@ L_1097578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109770c: 0x109770c: addu  a0, zero, zero
+// 0x01097d54: 0x1097d54: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01097710: 0x1097710: jal   0x109a424 sw    v0, 40(sp)
+// 0x01097d58: 0x1097d58: jal   0x109aa6c sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7559,16 +7559,16 @@ L_1097578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097718: 0x1097718: beq   v0, zero, 0x109772c sll   zero, zero, 0
+// 0x01097d60: 0x1097d60: beq   v0, zero, 0x1097d74 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109772c
+	brfalse L_1097d74
 // --- basic block ---
-// 0x01097720: 0x1097720: lw    a0, 40(sp)
+// 0x01097d68: 0x1097d68: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7577,13 +7577,13 @@ L_1097578:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097724: 0x1097724: j	 0x1097734 addiu a1, zero, 15
+// 0x01097d6c: 0x1097d6c: j	 0x1097d7c addiu a1, zero, 15
 	ldc.i4.s 15
 	stloc.2
-	br L_1097734
+	br L_1097d7c
 // --- basic block ---
-L_109772c:
-// 0x0109772c: 0x109772c: lw    a0, 40(sp)
+L_1097d74:
+// 0x01097d74: 0x1097d74: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7592,11 +7592,11 @@ L_109772c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097730: 0x1097730: addiu a1, zero, -15
+// 0x01097d78: 0x1097d78: addiu a1, zero, -15
 	ldc.i4.s -15
 	stloc.2
-L_1097734:
-// 0x01097734: 0x1097734: jal   0x1098f84 addu  a2, zero, zero
+L_1097d7c:
+// 0x01097d7c: 0x1097d7c: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -7604,12 +7604,12 @@ L_1097734:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109773c: 0x109773c: lw    a0, 40(sp)
+// 0x01097d84: 0x1097d84: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7618,19 +7618,19 @@ L_1097734:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097740: 0x1097740: lui   a1, 0x20000
+// 0x01097d88: 0x1097d88: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01097744: 0x1097744: jal   0x1097af8 addiu a1, a1, -2844
+// 0x01097d8c: 0x1097d8c: jal   0x1098140 addiu a1, a1, -2380
 	ldloc.2
-	ldc.i4 -2844
+	ldc.i4 -2380
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0109774c: 0x109774c: lw    a1, 40(sp)
+// 0x01097d94: 0x1097d94: lw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7639,31 +7639,31 @@ L_1097734:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097750: 0x1097750: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01097d98: 0x1097d98: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097758: 0x1097758: addu  a0, s0, zero
+// 0x01097da0: 0x1097da0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109775c: 0x109775c: jal   0x1098ec4 addu  a1, s2, zero
+// 0x01097da4: 0x1097da4: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1097764:
-// 0x01097764: 0x1097764: lw    v0, 4(s5)
+L_1097dac:
+// 0x01097dac: 0x1097dac: lw    v0, 4(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -7672,19 +7672,19 @@ L_1097764:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097768: 0x1097768: sll   zero, zero, 0
-// 0x0109776c: 0x109776c: beq   v0, zero, 0x109778c lui   a0, 0x20000
+// 0x01097db0: 0x1097db0: sll   zero, zero, 0
+// 0x01097db4: 0x1097db4: beq   v0, zero, 0x1097dd4 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_109778c
+	brfalse L_1097dd4
 // --- basic block ---
-// 0x01097774: 0x1097774: addiu a0, a0, -2856
+// 0x01097dbc: 0x1097dbc: addiu a0, a0, -2392
 	ldloc.1
-	ldc.i4 -2856
+	ldc.i4 -2392
 	add
 	stloc.1
-// 0x01097778: 0x1097778: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01097dc0: 0x1097dc0: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -7692,68 +7692,68 @@ L_1097764:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097780: 0x1097780: addu  a1, v0, zero
+// 0x01097dc8: 0x1097dc8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01097784: 0x1097784: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01097dcc: 0x1097dcc: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109778c:
-// 0x0109778c: 0x109778c: addu  a1, s0, zero
+L_1097dd4:
+// 0x01097dd4: 0x1097dd4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01097790: 0x1097790: addu  a0, s3, zero
+// 0x01097dd8: 0x1097dd8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-L_1097794:
-// 0x01097794: 0x1097794: jal   0x1098ec4 addu  s0, zero, zero
+L_1097ddc:
+// 0x01097ddc: 0x1097ddc: jal   0x109950c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109779c:
-// 0x0109779c: 0x109779c: addiu s5, s5, 4
+L_1097de4:
+// 0x01097de4: 0x1097de4: addiu s5, s5, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-L_10977a0:
-// 0x010977a0: 0x10977a0: lw    s2, 0(s5)
+L_1097de8:
+// 0x01097de8: 0x1097de8: lw    s2, 0(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010977a4: 0x10977a4: sll   zero, zero, 0
-// 0x010977a8: 0x10977a8: bne   s2, zero, 0x1097288 lui   a1, 0x20000
+// 0x01097dec: 0x1097dec: sll   zero, zero, 0
+// 0x01097df0: 0x1097df0: bne   s2, zero, 0x10978d0 lui   a1, 0x20000
 	ldloc 9
 	ldc.i4 131072
 	stloc.2
-	brtrue L_1097288
+	brtrue L_10978d0
 // --- basic block ---
-// 0x010977b0: 0x10977b0: lw    ra, 100(sp)
-// 0x010977b4: 0x10977b4: addu  v0, s1, zero
+// 0x01097df8: 0x1097df8: lw    ra, 100(sp)
+// 0x01097dfc: 0x1097dfc: addu  v0, s1, zero
 	ldloc 10
 	stloc 5
-// 0x010977b8: 0x10977b8: lw    s8, 96(sp)
+// 0x01097e00: 0x1097e00: lw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7762,7 +7762,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010977bc: 0x10977bc: lw    s7, 92(sp)
+// 0x01097e04: 0x1097e04: lw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7771,7 +7771,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010977c0: 0x10977c0: lw    s6, 88(sp)
+// 0x01097e08: 0x1097e08: lw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7780,7 +7780,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010977c4: 0x10977c4: lw    s5, 84(sp)
+// 0x01097e0c: 0x1097e0c: lw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7789,7 +7789,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010977c8: 0x10977c8: lw    s4, 80(sp)
+// 0x01097e10: 0x1097e10: lw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7798,7 +7798,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010977cc: 0x10977cc: lw    s3, 76(sp)
+// 0x01097e14: 0x1097e14: lw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7807,7 +7807,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010977d0: 0x10977d0: lw    s2, 72(sp)
+// 0x01097e18: 0x1097e18: lw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7816,7 +7816,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010977d4: 0x10977d4: lw    s1, 68(sp)
+// 0x01097e1c: 0x1097e1c: lw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7825,7 +7825,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010977d8: 0x10977d8: lw    s0, 64(sp)
+// 0x01097e20: 0x1097e20: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7834,7 +7834,7 @@ L_10977a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010977dc: 0x10977dc: jr    ra addiu sp, sp, 104
+// 0x01097e24: 0x1097e24: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
diff --git a/converted/Cibyl113.j b/converted/Cibyl113.j
index 9424eaa..ac7bbae 100644
--- a/converted/Cibyl113.j
+++ b/converted/Cibyl113.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl113::.ctor
 
-.method public static int32 ssd_menu_new_10977e4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_menu_new_1097e2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -76,12 +76,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010977e4: 0x10977e4: addiu sp, sp, -40
+// 0x01097e2c: 0x1097e2c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010977e8: 0x10977e8: lw    v0, 56(sp)
+// 0x01097e30: 0x1097e30: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -90,8 +90,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010977ec: 0x10977ec: sw    ra, 36(sp)
-// 0x010977f0: 0x10977f0: sw    v0, 16(sp)
+// 0x01097e34: 0x1097e34: sw    ra, 36(sp)
+// 0x01097e38: 0x1097e38: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -100,7 +100,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010977f4: 0x10977f4: lw    v0, 60(sp)
+// 0x01097e3c: 0x1097e3c: lw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -109,7 +109,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010977f8: 0x10977f8: sw    zero, 24(sp)
+// 0x01097e40: 0x1097e40: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -118,7 +118,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010977fc: 0x10977fc: jal   0x1096fdc sw    v0, 20(sp)
+// 0x01097e44: 0x1097e44: jal   0x1097624 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -132,14 +132,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_new_cb_1096fdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_new_cb_1097624(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01097804: 0x1097804: lw    ra, 36(sp)
-// 0x01097808: 0x1097808: sll   zero, zero, 0
-// 0x0109780c: 0x109780c: jr    ra addiu sp, sp, 40
+// 0x01097e4c: 0x1097e4c: lw    ra, 36(sp)
+// 0x01097e50: 0x1097e50: sll   zero, zero, 0
+// 0x01097e54: 0x1097e54: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -151,7 +151,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_menu_activate_1097814(int32,int32,int32,int32,int32)
+.method public static int32 ssd_menu_activate_1097e5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -204,12 +204,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097814: 0x1097814: addiu sp, sp, -64
+// 0x01097e5c: 0x1097e5c: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01097818: 0x1097818: sw    s5, 56(sp)
+// 0x01097e60: 0x1097e60: sw    s5, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -218,13 +218,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109781c: 0x109781c: addu  s5, a1, zero
+// 0x01097e64: 0x1097e64: addu  s5, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01097820: 0x1097820: addu  a1, zero, zero
+// 0x01097e68: 0x1097e68: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097824: 0x1097824: sw    s4, 52(sp)
+// 0x01097e6c: 0x1097e6c: sw    s4, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -233,7 +233,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01097828: 0x1097828: sw    s3, 48(sp)
+// 0x01097e70: 0x1097e70: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -242,7 +242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109782c: 0x109782c: sw    s2, 44(sp)
+// 0x01097e74: 0x1097e74: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -251,7 +251,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01097830: 0x1097830: sw    s1, 40(sp)
+// 0x01097e78: 0x1097e78: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -260,7 +260,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01097834: 0x1097834: sw    s0, 36(sp)
+// 0x01097e7c: 0x1097e7c: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -269,14 +269,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01097838: 0x1097838: sw    ra, 60(sp)
-// 0x0109783c: 0x109783c: addu  s4, a2, zero
+// 0x01097e80: 0x1097e80: sw    ra, 60(sp)
+// 0x01097e84: 0x1097e84: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01097840: 0x1097840: addu  s3, a3, zero
+// 0x01097e88: 0x1097e88: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x01097844: 0x1097844: lw    s0, 80(sp)
+// 0x01097e8c: 0x1097e8c: lw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -285,7 +285,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01097848: 0x1097848: lw    s2, 88(sp)
+// 0x01097e90: 0x1097e90: lw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -294,7 +294,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109784c: 0x109784c: jal   0x1095eec addu  s1, a0, zero
+// 0x01097e94: 0x1097e94: jal   0x1096534 addu  s1, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -302,21 +302,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01097854: 0x1097854: beq   v0, zero, 0x1097880 addu  a2, s5, zero
+// 0x01097e9c: 0x1097e9c: beq   v0, zero, 0x1097ec8 addu  a2, s5, zero
 	ldloc 6
 	ldloc 13
 	stloc.3
-	brfalse L_1097880
+	brfalse L_1097ec8
 // --- basic block ---
-// 0x0109785c: 0x109785c: addu  a0, s0, zero
+// 0x01097ea4: 0x1097ea4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01097860: 0x1097860: jal   0x109468c sw    v0, 24(sp)
+// 0x01097ea8: 0x1097ea8: jal   0x1094cb0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -330,12 +330,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_callback_109468c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_callback_1094cb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01097868: 0x1097868: lw    v0, 24(sp)
+// 0x01097eb0: 0x1097eb0: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -344,24 +344,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109786c: 0x109786c: addu  a1, s2, zero
+// 0x01097eb4: 0x1097eb4: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01097870: 0x1097870: jal   0x10990cc addu  a0, v0, zero
+// 0x01097eb8: 0x1097eb8: jal   0x1099714 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_set_flags_10990cc(int32,int32)
+	call int32 Cibyl114::ssd_widget_set_flags_1099714(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01097878: 0x1097878: j	 0x10978b0 sll   zero, zero, 0
-	br L_10978b0
+// 0x01097ec0: 0x1097ec0: j	 0x1097ef8 sll   zero, zero, 0
+	br L_1097ef8
 // --- basic block ---
-L_1097880:
-// 0x01097880: 0x1097880: lw    v0, 84(sp)
+L_1097ec8:
+// 0x01097ec8: 0x1097ec8: lw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -370,16 +370,16 @@ L_1097880:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097884: 0x1097884: addu  a3, s4, zero
+// 0x01097ecc: 0x1097ecc: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x01097888: 0x1097888: addu  a1, s3, zero
+// 0x01097ed0: 0x1097ed0: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0109788c: 0x109788c: addu  a0, s1, zero
+// 0x01097ed4: 0x1097ed4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01097890: 0x1097890: sw    v0, 16(sp)
+// 0x01097ed8: 0x1097ed8: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -388,7 +388,7 @@ L_1097880:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01097894: 0x1097894: jal   0x10977e4 sw    s2, 20(sp)
+// 0x01097edc: 0x1097edc: jal   0x1097e2c sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -402,15 +402,15 @@ L_1097880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_menu_new_10977e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_menu_new_1097e2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109789c: 0x109789c: addu  a0, s1, zero
+// 0x01097ee4: 0x1097ee4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010978a0: 0x10978a0: jal   0x1095eec addu  a1, zero, zero
+// 0x01097ee8: 0x1097ee8: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -418,12 +418,12 @@ L_1097880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010978a8: 0x10978a8: jal   0x109468c addu  a0, s0, zero
+// 0x01097ef0: 0x1097ef0: jal   0x1094cb0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -431,25 +431,25 @@ L_1097880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_callback_109468c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_callback_1094cb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10978b0:
-// 0x010978b0: 0x10978b0: jal   0x109483c sll   zero, zero, 0
+L_1097ef8:
+// 0x01097ef8: 0x1097ef8: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010978b8: 0x10978b8: lw    ra, 60(sp)
-// 0x010978bc: 0x10978bc: lw    s5, 56(sp)
+// 0x01097f00: 0x1097f00: lw    ra, 60(sp)
+// 0x01097f04: 0x1097f04: lw    s5, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -458,7 +458,7 @@ L_10978b0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010978c0: 0x10978c0: lw    s4, 52(sp)
+// 0x01097f08: 0x1097f08: lw    s4, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -467,7 +467,7 @@ L_10978b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010978c4: 0x10978c4: lw    s3, 48(sp)
+// 0x01097f0c: 0x1097f0c: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -476,7 +476,7 @@ L_10978b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010978c8: 0x10978c8: lw    s2, 44(sp)
+// 0x01097f10: 0x1097f10: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -485,7 +485,7 @@ L_10978b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010978cc: 0x10978cc: lw    s1, 40(sp)
+// 0x01097f14: 0x1097f14: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -494,7 +494,7 @@ L_10978b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010978d0: 0x10978d0: lw    s0, 36(sp)
+// 0x01097f18: 0x1097f18: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -503,7 +503,7 @@ L_10978b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010978d4: 0x10978d4: jr    ra addiu sp, sp, 64
+// 0x01097f1c: 0x1097f1c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -515,7 +515,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_cancel_10978dc(int32,int32,int32,int32,int32)
+.method public static int32 on_cancel_1097f24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -550,43 +550,43 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010978dc: 0x10978dc: addiu sp, sp, -24
+// 0x01097f24: 0x1097f24: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010978e0: 0x10978e0: sw    ra, 20(sp)
-// 0x010978e4: 0x10978e4: jal   0x109617c sll   zero, zero, 0
+// 0x01097f28: 0x1097f28: sw    ra, 20(sp)
+// 0x01097f2c: 0x1097f2c: jal   0x10967c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010978ec: 0x10978ec: jal   0x1021900 sll   zero, zero, 0
+// 0x01097f34: 0x1097f34: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010978f4: 0x10978f4: lui   a1, 0x1090000
-	ldc.i4 17367040
+// 0x01097f3c: 0x1097f3c: lui   a1, 0x10a0000
+	ldc.i4 17432576
 	stloc.2
-// 0x010978f8: 0x10978f8: addiu a1, a1, 31396
+// 0x01097f40: 0x1097f40: addiu a1, a1, -32532
 	ldloc.2
-	ldc.i4 31396
+	ldc.i4 -32532
 	add
 	stloc.2
-// 0x010978fc: 0x10978fc: jal   0x104fe98 addiu a0, zero, 100
+// 0x01097f44: 0x1097f44: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -594,16 +594,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01097904: 0x1097904: lw    ra, 20(sp)
-// 0x01097908: 0x1097908: addiu v0, zero, 1
+// 0x01097f4c: 0x1097f4c: lw    ra, 20(sp)
+// 0x01097f50: 0x1097f50: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109790c: 0x109790c: jr    ra addiu sp, sp, 24
+// 0x01097f54: 0x1097f54: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -615,7 +615,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_key_pressed_cancel_1097914(int32,int32,int32,int32,int32)
+.method public static int32 on_key_pressed_cancel_1097f5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -650,35 +650,35 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097914: 0x1097914: addiu sp, sp, -24
+// 0x01097f5c: 0x1097f5c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097918: 0x1097918: andi  a2, a2, 2
+// 0x01097f60: 0x1097f60: andi  a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc.3
-// 0x0109791c: 0x109791c: beq   a2, zero, 0x1097944 sw    ra, 20(sp)
+// 0x01097f64: 0x1097f64: beq   a2, zero, 0x1097f8c sw    ra, 20(sp)
 	ldloc.3
-	brfalse L_1097944
+	brfalse L_1097f8c
 // --- basic block ---
-// 0x01097924: 0x1097924: lb    v1, 0(a1)
+// 0x01097f6c: 0x1097f6c: lb    v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01097928: 0x1097928: addiu v0, zero, 13
+// 0x01097f70: 0x1097f70: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x0109792c: 0x109792c: bne   v1, v0, 0x1097944 addu  a0, zero, zero
+// 0x01097f74: 0x1097f74: bne   v1, v0, 0x1097f8c addu  a0, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_1097944
+	bne.un L_1097f8c
 // --- basic block ---
-// 0x01097934: 0x1097934: jal   0x10978dc addu  a1, zero, zero
+// 0x01097f7c: 0x1097f7c: jal   0x1097f24 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -686,24 +686,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::on_cancel_10978dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::on_cancel_1097f24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109793c: 0x109793c: j	 0x1097948 addiu v0, zero, 1
+// 0x01097f84: 0x1097f84: j	 0x1097f90 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1097948
+	br L_1097f90
 // --- basic block ---
-L_1097944:
-// 0x01097944: 0x1097944: addu  v0, zero, zero
+L_1097f8c:
+// 0x01097f8c: 0x1097f8c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1097948:
-// 0x01097948: 0x1097948: lw    ra, 20(sp)
-// 0x0109794c: 0x109794c: sll   zero, zero, 0
-// 0x01097950: 0x1097950: jr    ra addiu sp, sp, 24
+L_1097f90:
+// 0x01097f90: 0x1097f90: lw    ra, 20(sp)
+// 0x01097f94: 0x1097f94: sll   zero, zero, 0
+// 0x01097f98: 0x1097f98: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -715,7 +715,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 short_click_1097958(int32,int32,int32,int32,int32)
+.method public static int32 short_click_1097fa0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -750,21 +750,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097958: 0x1097958: addiu sp, sp, -24
+// 0x01097fa0: 0x1097fa0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109795c: 0x109795c: lui   v0, 0x80000
+// 0x01097fa4: 0x1097fa4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01097960: 0x1097960: sw    ra, 20(sp)
-// 0x01097964: 0x1097964: jal   0x109617c sw    a0, 9780(v0)
+// 0x01097fa8: 0x1097fa8: sw    ra, 20(sp)
+// 0x01097fac: 0x1097fac: jal   0x10967c4 sw    a0, 10244(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2445
+	ldc.i4 2561
 	add
 	ldloc.1
 	stelem.i4
@@ -773,31 +773,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109796c: 0x109796c: jal   0x1021900 sll   zero, zero, 0
+// 0x01097fb4: 0x1097fb4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01097974: 0x1097974: lui   a1, 0x1090000
-	ldc.i4 17367040
+// 0x01097fbc: 0x1097fbc: lui   a1, 0x10a0000
+	ldc.i4 17432576
 	stloc.2
-// 0x01097978: 0x1097978: addiu a1, a1, 31224
+// 0x01097fc0: 0x1097fc0: addiu a1, a1, -32704
 	ldloc.2
-	ldc.i4 31224
+	ldc.i4 -32704
 	add
 	stloc.2
-// 0x0109797c: 0x109797c: jal   0x104fe98 addiu a0, zero, 100
+// 0x01097fc4: 0x1097fc4: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -805,16 +805,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01097984: 0x1097984: lw    ra, 20(sp)
-// 0x01097988: 0x1097988: addiu v0, zero, 1
+// 0x01097fcc: 0x1097fcc: lw    ra, 20(sp)
+// 0x01097fd0: 0x1097fd0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109798c: 0x109798c: jr    ra addiu sp, sp, 24
+// 0x01097fd4: 0x1097fd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -826,7 +826,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 long_click_1097994(int32,int32,int32,int32,int32)
+.method public static int32 long_click_1097fdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -861,26 +861,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097994: 0x1097994: addiu sp, sp, -24
+// 0x01097fdc: 0x1097fdc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097998: 0x1097998: sw    ra, 20(sp)
-// 0x0109799c: 0x109799c: jal   0x1097958 sll   zero, zero, 0
+// 0x01097fe0: 0x1097fe0: sw    ra, 20(sp)
+// 0x01097fe4: 0x1097fe4: jal   0x1097fa0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::short_click_1097958(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::short_click_1097fa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010979a4: 0x10979a4: lw    ra, 20(sp)
-// 0x010979a8: 0x10979a8: sll   zero, zero, 0
-// 0x010979ac: 0x10979ac: jr    ra addiu sp, sp, 24
+// 0x01097fec: 0x1097fec: lw    ra, 20(sp)
+// 0x01097ff0: 0x1097ff0: sll   zero, zero, 0
+// 0x01097ff4: 0x1097ff4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -892,7 +892,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_key_pressed_10979b4(int32,int32,int32,int32,int32)
+.method public static int32 on_key_pressed_1097ffc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -927,33 +927,33 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010979b4: 0x10979b4: addiu sp, sp, -24
+// 0x01097ffc: 0x1097ffc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010979b8: 0x10979b8: andi  a2, a2, 2
+// 0x01098000: 0x1098000: andi  a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc.3
-// 0x010979bc: 0x10979bc: beq   a2, zero, 0x10979e4 sw    ra, 20(sp)
+// 0x01098004: 0x1098004: beq   a2, zero, 0x109802c sw    ra, 20(sp)
 	ldloc.3
-	brfalse L_10979e4
+	brfalse L_109802c
 // --- basic block ---
-// 0x010979c4: 0x10979c4: lb    v1, 0(a1)
+// 0x0109800c: 0x109800c: lb    v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010979c8: 0x10979c8: addiu v0, zero, 13
+// 0x01098010: 0x1098010: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x010979cc: 0x10979cc: bne   v1, v0, 0x10979e4 sll   zero, zero, 0
+// 0x01098014: 0x1098014: bne   v1, v0, 0x109802c sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_10979e4
+	bne.un L_109802c
 // --- basic block ---
-// 0x010979d4: 0x10979d4: jal   0x1097958 addu  a1, zero, zero
+// 0x0109801c: 0x109801c: jal   0x1097fa0 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -961,24 +961,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::short_click_1097958(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::short_click_1097fa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010979dc: 0x10979dc: j	 0x10979e8 addiu v0, zero, 1
+// 0x01098024: 0x1098024: j	 0x1098030 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10979e8
+	br L_1098030
 // --- basic block ---
-L_10979e4:
-// 0x010979e4: 0x10979e4: addu  v0, zero, zero
+L_109802c:
+// 0x0109802c: 0x109802c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10979e8:
-// 0x010979e8: 0x10979e8: lw    ra, 20(sp)
-// 0x010979ec: 0x10979ec: sll   zero, zero, 0
-// 0x010979f0: 0x10979f0: jr    ra addiu sp, sp, 24
+L_1098030:
+// 0x01098030: 0x1098030: lw    ra, 20(sp)
+// 0x01098034: 0x1098034: sll   zero, zero, 0
+// 0x01098038: 0x1098038: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -990,7 +990,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 delayed_short_click_10979f8(int32,int32,int32,int32,int32)
+.method public static int32 delayed_short_click_1098040(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1028,24 +1028,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010979f8: 0x10979f8: lui   v0, 0x80000
+// 0x01098040: 0x1098040: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010979fc: 0x10979fc: lw    v0, 9780(v0)
+// 0x01098044: 0x1098044: lw    v0, 10244(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2445
+	ldc.i4 2561
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097a00: 0x1097a00: addiu sp, sp, -24
+// 0x01098048: 0x1098048: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097a04: 0x1097a04: sw    s0, 16(sp)
+// 0x0109804c: 0x109804c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1054,10 +1054,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01097a08: 0x1097a08: lui   a0, 0x1090000
-	ldc.i4 17367040
+// 0x01098050: 0x1098050: lui   a0, 0x10a0000
+	ldc.i4 17432576
 	stloc.1
-// 0x01097a0c: 0x1097a0c: lw    s0, 116(v0)
+// 0x01098054: 0x1098054: lw    s0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1066,10 +1066,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01097a10: 0x1097a10: sw    ra, 20(sp)
-// 0x01097a14: 0x1097a14: jal   0x104fd00 addiu a0, a0, 31224
+// 0x01098058: 0x1098058: sw    ra, 20(sp)
+// 0x0109805c: 0x109805c: jal   0x104fd10 addiu a0, a0, -32704
 	ldloc.1
-	ldc.i4 31224
+	ldc.i4 -32704
 	add
 	stloc.1
 	ldloc.0
@@ -1077,18 +1077,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097a1c: 0x1097a1c: beq   s0, zero, 0x1097a30 lui   v0, 0x80000
+// 0x01098064: 0x1098064: beq   s0, zero, 0x1098078 lui   v0, 0x80000
 	ldloc 8
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1097a30
+	brfalse L_1098078
 // --- basic block ---
-// 0x01097a24: 0x1097a24: jalr  s0 sll   zero, zero, 0
+// 0x0109806c: 0x109806c: jalr  s0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -1100,21 +1100,21 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097a2c: 0x1097a2c: lui   v0, 0x80000
+// 0x01098074: 0x1098074: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1097a30:
-// 0x01097a30: 0x1097a30: lw    v0, 9780(v0)
+L_1098078:
+// 0x01098078: 0x1098078: lw    v0, 10244(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2445
+	ldc.i4 2561
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097a34: 0x1097a34: sll   zero, zero, 0
-// 0x01097a38: 0x1097a38: lw    v1, 4(v0)
+// 0x0109807c: 0x109807c: sll   zero, zero, 0
+// 0x01098080: 0x1098080: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ L_1097a30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097a3c: 0x1097a3c: sw    zero, 60(v0)
+// 0x01098084: 0x1098084: sw    zero, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1132,7 +1132,7 @@ L_1097a30:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01097a40: 0x1097a40: lw    v0, 4(v1)
+// 0x01098088: 0x1098088: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1141,10 +1141,10 @@ L_1097a30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097a44: 0x1097a44: lui   v1, 0x10000
+// 0x0109808c: 0x109808c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01097a48: 0x1097a48: lw    a0, 48(v0)
+// 0x01098090: 0x1098090: lw    a0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1153,17 +1153,17 @@ L_1097a30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097a4c: 0x1097a4c: sll   zero, zero, 0
-// 0x01097a50: 0x1097a50: and   v1, a0, v1
+// 0x01098094: 0x1098094: sll   zero, zero, 0
+// 0x01098098: 0x1098098: and   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	and
 	stloc 7
-// 0x01097a54: 0x1097a54: beq   v1, zero, 0x1097a68 sll   zero, zero, 0
+// 0x0109809c: 0x109809c: beq   v1, zero, 0x10980b0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1097a68
+	brfalse L_10980b0
 // --- basic block ---
-// 0x01097a5c: 0x1097a5c: lw    a0, 16(v0)
+// 0x010980a4: 0x10980a4: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1172,7 +1172,7 @@ L_1097a30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097a60: 0x1097a60: jal   0x1094884 addu  a1, zero, zero
+// 0x010980a8: 0x10980a8: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1180,30 +1180,30 @@ L_1097a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1097a68:
-// 0x01097a68: 0x1097a68: lui   v0, 0x80000
+L_10980b0:
+// 0x010980b0: 0x10980b0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01097a6c: 0x1097a6c: lw    v0, 9780(v0)
+// 0x010980b4: 0x10980b4: lw    v0, 10244(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2445
+	ldc.i4 2561
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097a70: 0x1097a70: sll   zero, zero, 0
-L_1097a74:
-// 0x01097a74: 0x1097a74: addu  v1, v0, zero
+// 0x010980b8: 0x10980b8: sll   zero, zero, 0
+L_10980bc:
+// 0x010980bc: 0x10980bc: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01097a78: 0x1097a78: lw    v0, 4(v0)
+// 0x010980c0: 0x10980c0: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1212,20 +1212,20 @@ L_1097a74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097a7c: 0x1097a7c: sll   zero, zero, 0
-// 0x01097a80: 0x1097a80: bne   v0, zero, 0x1097a74 sll   zero, zero, 0
+// 0x010980c4: 0x10980c4: sll   zero, zero, 0
+// 0x010980c8: 0x10980c8: bne   v0, zero, 0x10980bc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1097a74
+	brtrue L_10980bc
 // --- basic block ---
-// 0x01097a88: 0x1097a88: lui   v0, 0x80000
+// 0x010980d0: 0x10980d0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01097a8c: 0x1097a8c: jal   0x1021900 sw    v1, 9780(v0)
+// 0x010980d4: 0x10980d4: jal   0x1021910 sw    v1, 10244(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2445
+	ldc.i4 2561
 	add
 	ldloc 7
 	stelem.i4
@@ -1234,13 +1234,13 @@ L_1097a74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097a94: 0x1097a94: lw    ra, 20(sp)
-// 0x01097a98: 0x1097a98: lw    s0, 16(sp)
+// 0x010980dc: 0x10980dc: lw    ra, 20(sp)
+// 0x010980e0: 0x10980e0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1249,7 +1249,7 @@ L_1097a74:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01097a9c: 0x1097a9c: jr    ra addiu sp, sp, 24
+// 0x010980e4: 0x10980e4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1261,7 +1261,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 delayed_cancel_1097aa4(int32,int32,int32,int32,int32)
+.method public static int32 delayed_cancel_10980ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1296,18 +1296,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097aa4: 0x1097aa4: lui   a0, 0x1090000
-	ldc.i4 17367040
+// 0x010980ec: 0x10980ec: lui   a0, 0x10a0000
+	ldc.i4 17432576
 	stloc.1
-// 0x01097aa8: 0x1097aa8: addiu sp, sp, -24
+// 0x010980f0: 0x10980f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097aac: 0x1097aac: sw    ra, 20(sp)
-// 0x01097ab0: 0x1097ab0: jal   0x104fd00 addiu a0, a0, 31396
+// 0x010980f4: 0x10980f4: sw    ra, 20(sp)
+// 0x010980f8: 0x10980f8: jal   0x104fd10 addiu a0, a0, -32532
 	ldloc.1
-	ldc.i4 31396
+	ldc.i4 -32532
 	add
 	stloc.1
 	ldloc.0
@@ -1315,12 +1315,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01097ab8: 0x1097ab8: jal   0x1094b64 addiu a0, zero, 2
+// 0x01098100: 0x1098100: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1328,25 +1328,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01097ac0: 0x1097ac0: jal   0x1021900 sll   zero, zero, 0
+// 0x01098108: 0x1098108: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01097ac8: 0x1097ac8: lw    ra, 20(sp)
-// 0x01097acc: 0x1097acc: sll   zero, zero, 0
-// 0x01097ad0: 0x1097ad0: jr    ra addiu sp, sp, 24
+// 0x01098110: 0x1098110: lw    ra, 20(sp)
+// 0x01098114: 0x1098114: sll   zero, zero, 0
+// 0x01098118: 0x1098118: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1358,7 +1358,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_text_set_auto_size_1097ad8(int32)
+.method public static int32 ssd_text_set_auto_size_1098120(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1381,7 +1381,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097ad8: 0x1097ad8: lw    v0, 164(a0)
+// 0x01098120: 0x1098120: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1390,10 +1390,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097adc: 0x1097adc: addiu v1, zero, 1
+// 0x01098124: 0x1098124: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01097ae0: 0x1097ae0: jr    ra sw    v1, 12(v0)
+// 0x01098128: 0x1098128: jr    ra sw    v1, 12(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -1409,7 +1409,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_text_set_auto_trim_1097ae8(int32)
+.method public static int32 ssd_text_set_auto_trim_1098130(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1432,7 +1432,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097ae8: 0x1097ae8: lw    v0, 164(a0)
+// 0x01098130: 0x1098130: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1441,10 +1441,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097aec: 0x1097aec: addiu v1, zero, 1
+// 0x01098134: 0x1098134: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01097af0: 0x1097af0: jr    ra sw    v1, 20(v0)
+// 0x01098138: 0x1098138: jr    ra sw    v1, 20(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -1460,7 +1460,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static void ssd_text_set_color_1097af8(int32,int32)
+.method public static void ssd_text_set_color_1098140(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 ra,int32[] mem)
@@ -1480,7 +1480,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097af8: 0x1097af8: jr    ra sw    a1, 104(a0)
+// 0x01098140: 0x1098140: jr    ra sw    a1, 104(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1493,7 +1493,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ssd_text_set_input_type_1097b00(int32,int32,int32)
+.method public static int32 ssd_text_set_input_type_1098148(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1522,7 +1522,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097b00: 0x1097b00: lw    a2, 48(a0)
+// 0x01098148: 0x1098148: lw    a2, 48(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -1531,7 +1531,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097b04: 0x1097b04: lw    v1, 164(a0)
+// 0x0109814c: 0x109814c: lw    v1, 164(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -1540,15 +1540,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097b08: 0x1097b08: addiu v0, zero, -16385
+// 0x01098150: 0x1098150: addiu v0, zero, -16385
 	ldc.i4 -16385
 	stloc.3
-// 0x01097b0c: 0x1097b0c: and   v0, a2, v0
+// 0x01098154: 0x1098154: and   v0, a2, v0
 	ldloc.2
 	ldloc.3
 	and
 	stloc.3
-// 0x01097b10: 0x1097b10: sw    a1, 4(v1)
+// 0x01098158: 0x1098158: sw    a1, 4(v1)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -1557,7 +1557,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01097b14: 0x1097b14: jr    ra sw    v0, 48(a0)
+// 0x0109815c: 0x109815c: jr    ra sw    v0, 48(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -1573,7 +1573,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 ssd_text_set_font_size_1097b1c(int32,int32)
+.method public static int32 ssd_text_set_font_size_1098164(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -1596,7 +1596,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097b1c: 0x1097b1c: lw    v0, 164(a0)
+// 0x01098164: 0x1098164: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1605,7 +1605,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097b20: 0x1097b20: jr    ra sw    a1, 0(v0)
+// 0x01098168: 0x1098168: jr    ra sw    a1, 0(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -1617,7 +1617,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 reset_line_cache_1097b3c(int32,int32,int32,int32)
+.method public static int32 reset_line_cache_1098184(int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -1649,10 +1649,10 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097b3c: 0x1097b3c: beq   a0, zero, 0x1097bc0 sll   zero, zero, 0
+// 0x01098184: 0x1098184: beq   a0, zero, 0x1098208 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_1097bc0
-// 0x01097b44: 0x1097b44: lw    v0, 164(a0)
+	brfalse L_1098208
+// 0x0109818c: 0x109818c: lw    v0, 164(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -1661,8 +1661,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097b48: 0x1097b48: sll   zero, zero, 0
-// 0x01097b4c: 0x1097b4c: lw    v1, 100(v0)
+// 0x01098190: 0x1098190: sll   zero, zero, 0
+// 0x01098194: 0x1098194: lw    v1, 100(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -1671,14 +1671,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097b50: 0x1097b50: sll   zero, zero, 0
-// 0x01097b54: 0x1097b54: beq   v1, zero, 0x1097bc0 addu  a1, v0, zero
+// 0x01098198: 0x1098198: sll   zero, zero, 0
+// 0x0109819c: 0x109819c: beq   v1, zero, 0x1098208 addu  a1, v0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
-	brfalse L_1097bc0
+	brfalse L_1098208
 // --- basic block ---
-// 0x01097b5c: 0x1097b5c: sw    zero, 100(v0)
+// 0x010981a4: 0x10981a4: sw    zero, 100(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -1687,20 +1687,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01097b60: 0x1097b60: addu  a0, v0, zero
+// 0x010981a8: 0x10981a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.0
-// 0x01097b64: 0x1097b64: j	 0x1097ba8 addu  v1, zero, zero
+// 0x010981ac: 0x10981ac: j	 0x10981f0 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1097ba8
+	br L_10981f0
 // --- basic block ---
-L_1097b6c:
-// 0x01097b6c: 0x1097b6c: beq   v1, zero, 0x1097b98 sll   zero, zero, 0
+L_10981b4:
+// 0x010981b4: 0x10981b4: beq   v1, zero, 0x10981e0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1097b98
+	brfalse L_10981e0
 // --- basic block ---
-// 0x01097b74: 0x1097b74: lw    a2, 32(a1)
+// 0x010981bc: 0x10981bc: lw    a2, 32(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -1709,38 +1709,38 @@ L_1097b6c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097b78: 0x1097b78: sll   zero, zero, 0
-// 0x01097b7c: 0x1097b7c: addiu a3, a2, -1
+// 0x010981c0: 0x10981c0: sll   zero, zero, 0
+// 0x010981c4: 0x10981c4: addiu a3, a2, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01097b80: 0x1097b80: beq   a3, zero, 0x1097b94 sll   zero, zero, 0
+// 0x010981c8: 0x10981c8: beq   a3, zero, 0x10981dc sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1097b94
+	brfalse L_10981dc
 // --- basic block ---
-// 0x01097b88: 0x1097b88: lbu   a3, 51(a0)
+// 0x010981d0: 0x10981d0: lbu   a3, 51(a0)
 	ldloc.0
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x01097b8c: 0x1097b8c: sll   zero, zero, 0
-// 0x01097b90: 0x1097b90: sb    a3, -1(a2)
+// 0x010981d4: 0x10981d4: sll   zero, zero, 0
+// 0x010981d8: 0x10981d8: sb    a3, -1(a2)
 	ldloc.2
 	ldc.i4.m1
 	add
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1097b94:
-// 0x01097b94: 0x1097b94: sb    zero, 51(a0)
+L_10981dc:
+// 0x010981dc: 0x10981dc: sb    zero, 51(a0)
 	ldloc.0
 	ldc.i4.s 51
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1097b98:
-// 0x01097b98: 0x1097b98: sw    zero, 32(a1)
+L_10981e0:
+// 0x010981e0: 0x10981e0: sw    zero, 32(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -1749,23 +1749,23 @@ L_1097b98:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01097b9c: 0x1097b9c: addiu v1, v1, 1
+// 0x010981e4: 0x10981e4: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01097ba0: 0x1097ba0: addiu a1, a1, 4
+// 0x010981e8: 0x10981e8: addiu a1, a1, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x01097ba4: 0x1097ba4: addiu a0, a0, 1
+// 0x010981ec: 0x10981ec: addiu a0, a0, 1
 	ldloc.0
 	ldc.i4.1
 	add
 	stloc.0
-L_1097ba8:
-// 0x01097ba8: 0x1097ba8: lw    a2, 96(v0)
+L_10981f0:
+// 0x010981f0: 0x10981f0: lw    a2, 96(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -1774,17 +1774,17 @@ L_1097ba8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097bac: 0x1097bac: sll   zero, zero, 0
-// 0x01097bb0: 0x1097bb0: slt   a2, v1, a2
+// 0x010981f4: 0x10981f4: sll   zero, zero, 0
+// 0x010981f8: 0x10981f8: slt   a2, v1, a2
 	ldloc 6
 	ldloc.2
 	clt
 	stloc.2
-// 0x01097bb4: 0x1097bb4: bne   a2, zero, 0x1097b6c sll   zero, zero, 0
+// 0x010981fc: 0x10981fc: bne   a2, zero, 0x10981b4 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1097b6c
+	brtrue L_10981b4
 // --- basic block ---
-// 0x01097bbc: 0x1097bbc: sw    zero, 96(v0)
+// 0x01098204: 0x1098204: sw    zero, 96(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -1793,8 +1793,8 @@ L_1097ba8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1097bc0:
-// 0x01097bc0: 0x1097bc0: jr    ra sll   zero, zero, 0
+L_1098208:
+// 0x01098208: 0x1098208: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
@@ -1802,7 +1802,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_value_1097bc8(int32,int32,int32,int32,int32)
+.method public static int32 get_value_1098210(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -1840,7 +1840,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097bc8: 0x1097bc8: lw    v0, 164(a0)
+// 0x01098210: 0x1098210: lw    v0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1849,12 +1849,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097bcc: 0x1097bcc: addiu sp, sp, -24
+// 0x01098214: 0x1098214: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097bd0: 0x1097bd0: lw    v0, 100(v0)
+// 0x01098218: 0x1098218: lw    v0, 100(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1863,7 +1863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097bd4: 0x1097bd4: sw    s0, 16(sp)
+// 0x0109821c: 0x109821c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1872,26 +1872,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01097bd8: 0x1097bd8: sw    ra, 20(sp)
-// 0x01097bdc: 0x1097bdc: beq   v0, zero, 0x1097bec addu  s0, a0, zero
+// 0x01098220: 0x1098220: sw    ra, 20(sp)
+// 0x01098224: 0x1098224: beq   v0, zero, 0x1098234 addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brfalse L_1097bec
+	brfalse L_1098234
 // --- basic block ---
-// 0x01097be4: 0x1097be4: jal   0x1097b3c sll   zero, zero, 0
+// 0x0109822c: 0x109822c: jal   0x1098184 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::reset_line_cache_1097b3c(int32,int32,int32,int32)
+	call int32 Cibyl113::reset_line_cache_1098184(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_1097bec:
-// 0x01097bec: 0x1097bec: lw    ra, 20(sp)
-// 0x01097bf0: 0x1097bf0: lw    v0, 20(s0)
+L_1098234:
+// 0x01098234: 0x1098234: lw    ra, 20(sp)
+// 0x01098238: 0x1098238: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1900,7 +1900,7 @@ L_1097bec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097bf4: 0x1097bf4: lw    s0, 16(sp)
+// 0x0109823c: 0x109823c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1909,7 +1909,7 @@ L_1097bec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097bf8: 0x1097bf8: jr    ra addiu sp, sp, 24
+// 0x01098240: 0x1098240: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1921,7 +1921,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+.method public static int32 ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -1959,12 +1959,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097c00: 0x1097c00: addiu sp, sp, -24
+// 0x01098248: 0x1098248: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097c04: 0x1097c04: sw    s0, 16(sp)
+// 0x0109824c: 0x109824c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1973,27 +1973,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01097c08: 0x1097c08: sw    ra, 20(sp)
-// 0x01097c0c: 0x1097c0c: addu  s0, a0, zero
+// 0x01098250: 0x1098250: sw    ra, 20(sp)
+// 0x01098254: 0x1098254: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01097c10: 0x1097c10: beq   a0, zero, 0x1097c24 addu  v0, zero, zero
+// 0x01098258: 0x1098258: beq   a0, zero, 0x109826c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1097c24
+	brfalse L_109826c
 // --- basic block ---
-// 0x01097c18: 0x1097c18: jal   0x1097b3c sll   zero, zero, 0
+// 0x01098260: 0x1098260: jal   0x1098184 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::reset_line_cache_1097b3c(int32,int32,int32,int32)
+	call int32 Cibyl113::reset_line_cache_1098184(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01097c20: 0x1097c20: lw    v0, 20(s0)
+// 0x01098268: 0x1098268: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2002,9 +2002,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-L_1097c24:
-// 0x01097c24: 0x1097c24: lw    ra, 20(sp)
-// 0x01097c28: 0x1097c28: lw    s0, 16(sp)
+L_109826c:
+// 0x0109826c: 0x109826c: lw    ra, 20(sp)
+// 0x01098270: 0x1098270: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2013,7 +2013,7 @@ L_1097c24:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097c2c: 0x1097c2c: jr    ra addiu sp, sp, 24
+// 0x01098274: 0x1098274: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2025,7 +2025,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_text__get_input_type_1097c34(int32)
+.method public static int32 ssd_text__get_input_type_109827c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -2045,7 +2045,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097c34: 0x1097c34: lw    v0, 164(a0)
+// 0x0109827c: 0x109827c: lw    v0, 164(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2054,8 +2054,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097c38: 0x1097c38: sll   zero, zero, 0
-// 0x01097c3c: 0x1097c3c: lw    v0, 4(v0)
+// 0x01098280: 0x1098280: sll   zero, zero, 0
+// 0x01098284: 0x1098284: lw    v0, 4(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2064,13 +2064,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097c40: 0x1097c40: jr    ra sll   zero, zero, 0
+// 0x01098288: 0x1098288: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_text_set_readonly_1097c48(int32,int32)
+.method public static int32 ssd_text_set_readonly_1098290(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2096,7 +2096,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097c48: 0x1097c48: lw    v1, 48(a0)
+// 0x01098290: 0x1098290: lw    v1, 48(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2105,24 +2105,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097c4c: 0x1097c4c: bne   a1, zero, 0x1097c5c ori   v0, v1, 16384
+// 0x01098294: 0x1098294: bne   a1, zero, 0x10982a4 ori   v0, v1, 16384
 	ldloc.1
 	ldloc.3
 	ldc.i4 16384
 	or
 	stloc.2
-	brtrue L_1097c5c
+	brtrue L_10982a4
 // --- basic block ---
-// 0x01097c54: 0x1097c54: addiu v0, zero, -16385
+// 0x0109829c: 0x109829c: addiu v0, zero, -16385
 	ldc.i4 -16385
 	stloc.2
-// 0x01097c58: 0x1097c58: and   v0, v1, v0
+// 0x010982a0: 0x10982a0: and   v0, v1, v0
 	ldloc.3
 	ldloc.2
 	and
 	stloc.2
-L_1097c5c:
-// 0x01097c5c: 0x1097c5c: jr    ra sw    v0, 48(a0)
+L_10982a4:
+// 0x010982a4: 0x10982a4: jr    ra sw    v0, 48(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2138,7 +2138,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 text_ctx_init_1097d74(int32,int32,int32,int32,int32)
+.method public static int32 text_ctx_init_10983bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -2176,19 +2176,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097d74: 0x1097d74: addiu sp, sp, -24
+// 0x010983bc: 0x10983bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097d78: 0x1097d78: addu  a1, zero, zero
+// 0x010983c0: 0x10983c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097d7c: 0x1097d7c: addiu a2, zero, 108
+// 0x010983c4: 0x10983c4: addiu a2, zero, 108
 	ldc.i4.s 108
 	stloc.3
-// 0x01097d80: 0x1097d80: sw    ra, 20(sp)
-// 0x01097d84: 0x1097d84: sw    s0, 16(sp)
+// 0x010983c8: 0x10983c8: sw    ra, 20(sp)
+// 0x010983cc: 0x10983cc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2197,7 +2197,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01097d88: 0x1097d88: jal   0x100177c addu  s0, a0, zero
+// 0x010983d0: 0x10983d0: jal   0x100177c addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.1
@@ -2209,11 +2209,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01097d90: 0x1097d90: lw    ra, 20(sp)
-// 0x01097d94: 0x1097d94: addiu v0, zero, 255
+// 0x010983d8: 0x10983d8: lw    ra, 20(sp)
+// 0x010983dc: 0x10983dc: addiu v0, zero, 255
 	ldc.i4 255
 	stloc 7
-// 0x01097d98: 0x1097d98: sw    v0, 28(s0)
+// 0x010983e0: 0x10983e0: sw    v0, 28(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2222,7 +2222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01097d9c: 0x1097d9c: sw    v0, 4(s0)
+// 0x010983e4: 0x10983e4: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2231,7 +2231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01097da0: 0x1097da0: lw    s0, 16(sp)
+// 0x010983e8: 0x10983e8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2240,7 +2240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097da4: 0x1097da4: jr    ra addiu sp, sp, 24
+// 0x010983ec: 0x10983ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2252,7 +2252,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 set_value_1097dac(int32,int32,int32,int32,int32)
+.method public static int32 set_value_10983f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -2293,7 +2293,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097dac: 0x1097dac: lw    v0, 112(a0)
+// 0x010983f4: 0x10983f4: lw    v0, 112(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2302,12 +2302,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097db0: 0x1097db0: addiu sp, sp, -32
+// 0x010983f8: 0x10983f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01097db4: 0x1097db4: sw    s1, 24(sp)
+// 0x010983fc: 0x10983fc: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2316,7 +2316,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01097db8: 0x1097db8: sw    s0, 20(sp)
+// 0x01098400: 0x1098400: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2325,17 +2325,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01097dbc: 0x1097dbc: sw    ra, 28(sp)
-// 0x01097dc0: 0x1097dc0: addu  s0, a0, zero
+// 0x01098404: 0x1098404: sw    ra, 28(sp)
+// 0x01098408: 0x1098408: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01097dc4: 0x1097dc4: beq   v0, zero, 0x1097ddc addu  s1, a1, zero
+// 0x0109840c: 0x109840c: beq   v0, zero, 0x1098424 addu  s1, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 9
-	brfalse L_1097ddc
+	brfalse L_1098424
 // --- basic block ---
-// 0x01097dcc: 0x1097dcc: jalr  v0 sll   zero, zero, 0
+// 0x01098414: 0x1098414: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2347,14 +2347,14 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01097dd4: 0x1097dd4: beq   v0, zero, 0x1097e44 addiu v1, zero, -1
+// 0x0109841c: 0x109841c: beq   v0, zero, 0x109848c addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 8
-	brfalse L_1097e44
+	brfalse L_109848c
 // --- basic block ---
-L_1097ddc:
-// 0x01097ddc: 0x1097ddc: lw    v0, 164(s0)
+L_1098424:
+// 0x01098424: 0x1098424: lw    v0, 164(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2363,10 +2363,10 @@ L_1097ddc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097de0: 0x1097de0: addiu v1, zero, 1
+// 0x01098428: 0x1098428: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01097de4: 0x1097de4: sw    v1, 104(v0)
+// 0x0109842c: 0x109842c: sw    v1, 104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2375,23 +2375,23 @@ L_1097ddc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01097de8: 0x1097de8: jal   0x1097b3c addu  a0, s0, zero
+// 0x01098430: 0x1098430: jal   0x1098184 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::reset_line_cache_1097b3c(int32,int32,int32,int32)
+	call int32 Cibyl113::reset_line_cache_1098184(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01097df0: 0x1097df0: lb    v0, 0(s1)
+// 0x01098438: 0x1098438: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01097df4: 0x1097df4: lw    a0, 20(s0)
+// 0x0109843c: 0x109843c: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2400,11 +2400,11 @@ L_1097ddc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097df8: 0x1097df8: beq   v0, zero, 0x1097e1c sll   zero, zero, 0
+// 0x01098440: 0x1098440: beq   v0, zero, 0x1098464 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1097e1c
+	brfalse L_1098464
 // --- basic block ---
-// 0x01097e00: 0x1097e00: lw    v0, 164(s0)
+// 0x01098448: 0x1098448: lw    v0, 164(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2413,8 +2413,8 @@ L_1097ddc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097e04: 0x1097e04: sll   zero, zero, 0
-// 0x01097e08: 0x1097e08: lw    a2, 28(v0)
+// 0x0109844c: 0x109844c: sll   zero, zero, 0
+// 0x01098450: 0x1098450: lw    a2, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2423,7 +2423,7 @@ L_1097ddc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097e0c: 0x1097e0c: jal   0x1041ea4 addu  a1, s1, zero
+// 0x01098454: 0x1098454: jal   0x1041eb4 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -2431,27 +2431,27 @@ L_1097ddc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::sttstr_copy_1041ea4(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::sttstr_copy_1041eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01097e14: 0x1097e14: j	 0x1097e28 addu  a0, s0, zero
+// 0x0109845c: 0x109845c: j	 0x1098470 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-	br L_1097e28
+	br L_1098470
 // --- basic block ---
-L_1097e1c:
-// 0x01097e1c: 0x1097e1c: jal   0x1041dd0 sll   zero, zero, 0
+L_1098464:
+// 0x01098464: 0x1098464: jal   0x1041de0 sll   zero, zero, 0
 	ldloc.1
-	call void Cibyl48::sttstr_reset_1041dd0(int32)
+	call void Cibyl48::sttstr_reset_1041de0(int32)
 // --- basic block ---
-L_1097e24:
-// 0x01097e24: 0x1097e24: addu  a0, s0, zero
+L_109846c:
+// 0x0109846c: 0x109846c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-L_1097e28:
-// 0x01097e28: 0x1097e28: lw    s0, 4(s0)
+L_1098470:
+// 0x01098470: 0x1098470: lw    s0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2460,31 +2460,31 @@ L_1097e28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097e2c: 0x1097e2c: sll   zero, zero, 0
-// 0x01097e30: 0x1097e30: bne   s0, zero, 0x1097e24 sll   zero, zero, 0
+// 0x01098474: 0x1098474: sll   zero, zero, 0
+// 0x01098478: 0x1098478: bne   s0, zero, 0x109846c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1097e24
+	brtrue L_109846c
 // --- basic block ---
-// 0x01097e38: 0x1097e38: jal   0x1098ff8 sll   zero, zero, 0
+// 0x01098480: 0x1098480: jal   0x1099640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01097e40: 0x1097e40: addu  v1, zero, zero
+// 0x01098488: 0x1098488: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_1097e44:
-// 0x01097e44: 0x1097e44: lw    ra, 28(sp)
-// 0x01097e48: 0x1097e48: addu  v0, v1, zero
+L_109848c:
+// 0x0109848c: 0x109848c: lw    ra, 28(sp)
+// 0x01098490: 0x1098490: addu  v0, v1, zero
 	ldloc 8
 	stloc 5
-// 0x01097e4c: 0x1097e4c: lw    s1, 24(sp)
+// 0x01098494: 0x1098494: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2493,7 +2493,7 @@ L_1097e44:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01097e50: 0x1097e50: lw    s0, 20(sp)
+// 0x01098498: 0x1098498: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2502,7 +2502,7 @@ L_1097e44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097e54: 0x1097e54: jr    ra addiu sp, sp, 32
+// 0x0109849c: 0x109849c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2514,7 +2514,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 v1,int32 ra)
@@ -2555,12 +2555,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097e5c: 0x1097e5c: addiu sp, sp, -40
+// 0x010984a4: 0x10984a4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01097e60: 0x1097e60: sw    s0, 28(sp)
+// 0x010984a8: 0x10984a8: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2569,8 +2569,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01097e64: 0x1097e64: sw    ra, 36(sp)
-// 0x01097e68: 0x1097e68: sw    s1, 32(sp)
+// 0x010984ac: 0x10984ac: sw    ra, 36(sp)
+// 0x010984b0: 0x10984b0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2579,13 +2579,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01097e6c: 0x1097e6c: beq   a0, zero, 0x1097eb8 addu  s0, a0, zero
+// 0x010984b4: 0x10984b4: beq   a0, zero, 0x1098500 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 6
-	brfalse L_1097eb8
+	brfalse L_1098500
 // --- basic block ---
-// 0x01097e74: 0x1097e74: lw    s1, 164(a0)
+// 0x010984bc: 0x10984bc: lw    s1, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2594,10 +2594,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01097e78: 0x1097e78: addiu v0, zero, 1
+// 0x010984c0: 0x10984c0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01097e7c: 0x1097e7c: sw    v0, 104(s1)
+// 0x010984c4: 0x10984c4: sw    v0, 104(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2606,7 +2606,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01097e80: 0x1097e80: jal   0x1097b3c sw    a1, 16(sp)
+// 0x010984c8: 0x10984c8: jal   0x1098184 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2619,12 +2619,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::reset_line_cache_1097b3c(int32,int32,int32,int32)
+	call int32 Cibyl113::reset_line_cache_1098184(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01097e88: 0x1097e88: lw    a2, 28(s1)
+// 0x010984d0: 0x10984d0: lw    a2, 28(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2633,7 +2633,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097e8c: 0x1097e8c: lw    a0, 20(s0)
+// 0x010984d4: 0x10984d4: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2642,7 +2642,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097e90: 0x1097e90: lw    a1, 16(sp)
+// 0x010984d8: 0x10984d8: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2651,22 +2651,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097e94: 0x1097e94: jal   0x1041ea4 sll   zero, zero, 0
+// 0x010984dc: 0x10984dc: jal   0x1041eb4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::sttstr_copy_1041ea4(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::sttstr_copy_1041eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-L_1097e9c:
-// 0x01097e9c: 0x1097e9c: addu  a0, s0, zero
+L_10984e4:
+// 0x010984e4: 0x10984e4: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01097ea0: 0x1097ea0: lw    s0, 4(s0)
+// 0x010984e8: 0x10984e8: lw    s0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2675,25 +2675,25 @@ L_1097e9c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097ea4: 0x1097ea4: sll   zero, zero, 0
-// 0x01097ea8: 0x1097ea8: bne   s0, zero, 0x1097e9c sll   zero, zero, 0
+// 0x010984ec: 0x10984ec: sll   zero, zero, 0
+// 0x010984f0: 0x10984f0: bne   s0, zero, 0x10984e4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1097e9c
+	brtrue L_10984e4
 // --- basic block ---
-// 0x01097eb0: 0x1097eb0: jal   0x1098ff8 sll   zero, zero, 0
+// 0x010984f8: 0x10984f8: jal   0x1099640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-L_1097eb8:
-// 0x01097eb8: 0x1097eb8: lw    ra, 36(sp)
-// 0x01097ebc: 0x1097ebc: lw    s1, 32(sp)
+L_1098500:
+// 0x01098500: 0x1098500: lw    ra, 36(sp)
+// 0x01098504: 0x1098504: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2702,7 +2702,7 @@ L_1097eb8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01097ec0: 0x1097ec0: lw    s0, 28(sp)
+// 0x01098508: 0x1098508: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2711,7 +2711,7 @@ L_1097eb8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097ec4: 0x1097ec4: jr    ra addiu sp, sp, 40
+// 0x0109850c: 0x109850c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2723,7 +2723,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_editbox_closed_1097ecc(int32,int32,int32,int32,int32)
+.method public static int32 on_editbox_closed_1098514(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2758,20 +2758,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097ecc: 0x1097ecc: addiu sp, sp, -24
+// 0x01098514: 0x1098514: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097ed0: 0x1097ed0: addiu v0, zero, 1
+// 0x01098518: 0x1098518: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01097ed4: 0x1097ed4: bne   a0, v0, 0x1097ee4 sw    ra, 20(sp)
+// 0x0109851c: 0x109851c: bne   a0, v0, 0x109852c sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1097ee4
+	bne.un L_109852c
 // --- basic block ---
-// 0x01097edc: 0x1097edc: jal   0x1097e5c addu  a0, a2, zero
+// 0x01098524: 0x1098524: jal   0x10984a4 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -2779,15 +2779,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1097ee4:
-// 0x01097ee4: 0x1097ee4: lw    ra, 20(sp)
-// 0x01097ee8: 0x1097ee8: sll   zero, zero, 0
-// 0x01097eec: 0x1097eec: jr    ra addiu sp, sp, 24
+L_109852c:
+// 0x0109852c: 0x109852c: lw    ra, 20(sp)
+// 0x01098530: 0x1098530: sll   zero, zero, 0
+// 0x01098534: 0x1098534: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2799,7 +2799,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_text_reset_text_1097ef4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_text_reset_text_109853c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -2837,12 +2837,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097ef4: 0x1097ef4: addiu sp, sp, -24
+// 0x0109853c: 0x109853c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097ef8: 0x1097ef8: sw    s0, 16(sp)
+// 0x01098540: 0x1098540: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2851,14 +2851,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01097efc: 0x1097efc: sw    ra, 20(sp)
-// 0x01097f00: 0x1097f00: beq   a0, zero, 0x1097f30 addu  s0, a0, zero
+// 0x01098544: 0x1098544: sw    ra, 20(sp)
+// 0x01098548: 0x1098548: beq   a0, zero, 0x1098578 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 5
-	brfalse L_1097f30
+	brfalse L_1098578
 // --- basic block ---
-// 0x01097f08: 0x1097f08: lw    a0, 20(a0)
+// 0x01098550: 0x1098550: lw    a0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2867,15 +2867,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097f0c: 0x1097f0c: jal   0x1041dd0 sll   zero, zero, 0
+// 0x01098554: 0x1098554: jal   0x1041de0 sll   zero, zero, 0
 	ldloc.1
-	call void Cibyl48::sttstr_reset_1041dd0(int32)
+	call void Cibyl48::sttstr_reset_1041de0(int32)
 // --- basic block ---
-L_1097f14:
-// 0x01097f14: 0x1097f14: addu  a0, s0, zero
+L_109855c:
+// 0x0109855c: 0x109855c: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x01097f18: 0x1097f18: lw    s0, 4(s0)
+// 0x01098560: 0x1098560: lw    s0, 4(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2884,25 +2884,25 @@ L_1097f14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097f1c: 0x1097f1c: sll   zero, zero, 0
-// 0x01097f20: 0x1097f20: bne   s0, zero, 0x1097f14 sll   zero, zero, 0
+// 0x01098564: 0x1098564: sll   zero, zero, 0
+// 0x01098568: 0x1098568: bne   s0, zero, 0x109855c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1097f14
+	brtrue L_109855c
 // --- basic block ---
-// 0x01097f28: 0x1097f28: jal   0x1098ff8 sll   zero, zero, 0
+// 0x01098570: 0x1098570: jal   0x1099640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-L_1097f30:
-// 0x01097f30: 0x1097f30: lw    ra, 20(sp)
-// 0x01097f34: 0x1097f34: lw    s0, 16(sp)
+L_1098578:
+// 0x01098578: 0x1098578: lw    ra, 20(sp)
+// 0x0109857c: 0x109857c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2911,7 +2911,7 @@ L_1097f30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01097f38: 0x1097f38: jr    ra addiu sp, sp, 24
+// 0x01098580: 0x1098580: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2923,7 +2923,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 release_1097f40(int32,int32,int32,int32,int32)
+.method public static int32 release_1098588(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -2961,12 +2961,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097f40: 0x1097f40: addiu sp, sp, -24
+// 0x01098588: 0x1098588: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01097f44: 0x1097f44: sw    s0, 16(sp)
+// 0x0109858c: 0x109858c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2975,10 +2975,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01097f48: 0x1097f48: addu  s0, a0, zero
+// 0x01098590: 0x1098590: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01097f4c: 0x1097f4c: lw    a0, 20(a0)
+// 0x01098594: 0x1098594: lw    a0, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2987,12 +2987,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097f50: 0x1097f50: sll   zero, zero, 0
-// 0x01097f54: 0x1097f54: beq   a0, zero, 0x1097f68 sw    ra, 20(sp)
+// 0x01098598: 0x1098598: sll   zero, zero, 0
+// 0x0109859c: 0x109859c: beq   a0, zero, 0x10985b0 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1097f68
+	brfalse L_10985b0
 // --- basic block ---
-// 0x01097f5c: 0x1097f5c: jal   0x1000930 sll   zero, zero, 0
+// 0x010985a4: 0x10985a4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3003,7 +3003,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01097f64: 0x1097f64: sw    zero, 20(s0)
+// 0x010985ac: 0x10985ac: sw    zero, 20(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3012,8 +3012,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1097f68:
-// 0x01097f68: 0x1097f68: lw    a0, 164(s0)
+L_10985b0:
+// 0x010985b0: 0x10985b0: lw    a0, 164(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3022,12 +3022,12 @@ L_1097f68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01097f6c: 0x1097f6c: sll   zero, zero, 0
-// 0x01097f70: 0x1097f70: beq   a0, zero, 0x1097f84 sll   zero, zero, 0
+// 0x010985b4: 0x10985b4: sll   zero, zero, 0
+// 0x010985b8: 0x10985b8: beq   a0, zero, 0x10985cc sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1097f84
+	brfalse L_10985cc
 // --- basic block ---
-// 0x01097f78: 0x1097f78: jal   0x1000930 sll   zero, zero, 0
+// 0x010985c0: 0x10985c0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3038,7 +3038,7 @@ L_1097f68:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01097f80: 0x1097f80: sw    zero, 164(s0)
+// 0x010985c8: 0x10985c8: sw    zero, 164(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3047,9 +3047,9 @@ L_1097f68:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1097f84:
-// 0x01097f84: 0x1097f84: lw    ra, 20(sp)
-// 0x01097f88: 0x1097f88: lw    s0, 16(sp)
+L_10985cc:
+// 0x010985cc: 0x10985cc: lw    ra, 20(sp)
+// 0x010985d0: 0x10985d0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3058,7 +3058,7 @@ L_1097f84:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01097f8c: 0x1097f8c: jr    ra addiu sp, sp, 24
+// 0x010985d4: 0x10985d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3070,7 +3070,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 format_text_1097f94(int32,int32,int32,int32,int32)
+.method public static int32 format_text_10985dc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s5,int32 s2,int32 s7,int32 s3,int32 s4,int32 s6,int32 s8,int32 lo,int32 ra)
@@ -3135,12 +3135,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01097f94: 0x1097f94: addiu sp, sp, -664
+// 0x010985dc: 0x10985dc: addiu sp, sp, -664
 	ldloc.0
 	ldc.i4 -664
 	add
 	stloc.0
-// 0x01097f98: 0x1097f98: sw    s3, 636(sp)
+// 0x010985e0: 0x10985e0: sw    s3, 636(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3149,7 +3149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01097f9c: 0x1097f9c: sw    s1, 628(sp)
+// 0x010985e4: 0x10985e4: sw    s1, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3158,13 +3158,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01097fa0: 0x1097fa0: addu  s3, a0, zero
+// 0x010985e8: 0x10985e8: addu  s3, a0, zero
 	ldloc.1
 	stloc 13
-// 0x01097fa4: 0x1097fa4: addu  s1, a2, zero
+// 0x010985ec: 0x10985ec: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01097fa8: 0x1097fa8: sw    a1, 668(sp)
+// 0x010985f0: 0x10985f0: sw    a1, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3173,15 +3173,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01097fac: 0x1097fac: addiu a0, sp, 72
+// 0x010985f4: 0x10985f4: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x01097fb0: 0x1097fb0: addu  a1, zero, zero
+// 0x010985f8: 0x10985f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01097fb4: 0x1097fb4: sw    s8, 656(sp)
+// 0x010985fc: 0x10985fc: sw    s8, 656(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3190,7 +3190,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01097fb8: 0x1097fb8: sw    s2, 632(sp)
+// 0x01098600: 0x1098600: sw    s2, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3199,8 +3199,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01097fbc: 0x1097fbc: sw    ra, 660(sp)
-// 0x01097fc0: 0x1097fc0: sw    s7, 652(sp)
+// 0x01098604: 0x1098604: sw    ra, 660(sp)
+// 0x01098608: 0x1098608: sw    s7, 652(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3209,7 +3209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01097fc4: 0x1097fc4: sw    s6, 648(sp)
+// 0x0109860c: 0x109860c: sw    s6, 648(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3218,7 +3218,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01097fc8: 0x1097fc8: sw    s5, 644(sp)
+// 0x01098610: 0x1098610: sw    s5, 644(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3227,7 +3227,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01097fcc: 0x1097fcc: sw    s4, 640(sp)
+// 0x01098614: 0x1098614: sw    s4, 640(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3236,7 +3236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01097fd0: 0x1097fd0: sw    s0, 624(sp)
+// 0x01098618: 0x1098618: sw    s0, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3245,7 +3245,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01097fd4: 0x1097fd4: lw    s2, 164(s3)
+// 0x0109861c: 0x109861c: lw    s2, 164(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3254,7 +3254,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01097fd8: 0x1097fd8: jal   0x100177c addiu a2, zero, 512
+// 0x01098620: 0x1098620: jal   0x100177c addiu a2, zero, 512
 	ldc.i4 512
 	stloc.3
 	ldloc.1
@@ -3266,7 +3266,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01097fe0: 0x1097fe0: lw    a2, 12(s1)
+// 0x01098628: 0x1098628: lw    a2, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3275,7 +3275,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01097fe4: 0x1097fe4: lw    a1, 4(s1)
+// 0x0109862c: 0x109862c: lw    a1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3284,7 +3284,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01097fe8: 0x1097fe8: lw    v1, 48(s3)
+// 0x01098630: 0x1098630: lw    v1, 48(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3293,12 +3293,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01097fec: 0x1097fec: subu  a1, a2, a1
+// 0x01098634: 0x1098634: subu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.2
-// 0x01097ff0: 0x1097ff0: sw    a1, 612(sp)
+// 0x01098638: 0x1098638: sw    a1, 612(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3307,15 +3307,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01097ff4: 0x1097ff4: lui   a1, 0x10000
+// 0x0109863c: 0x109863c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01097ff8: 0x1097ff8: and   a1, v1, a1
+// 0x01098640: 0x1098640: and   a1, v1, a1
 	ldloc 7
 	ldloc.2
 	and
 	stloc.2
-// 0x01097ffc: 0x1097ffc: lw    s8, 8(s1)
+// 0x01098644: 0x1098644: lw    s8, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3324,14 +3324,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01098000: 0x1098000: lw    a3, 0(s1)
+// 0x01098648: 0x1098648: lw    a3, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01098004: 0x1098004: sw    a1, 600(sp)
+// 0x0109864c: 0x109864c: sw    a1, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3340,7 +3340,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01098008: 0x1098008: lw    a0, 36(s3)
+// 0x01098650: 0x1098650: lw    a0, 36(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3349,28 +3349,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109800c: 0x109800c: lui   a1, 0x20000
+// 0x01098654: 0x1098654: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01098010: 0x1098010: addiu s8, s8, 1
+// 0x01098658: 0x1098658: addiu s8, s8, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x01098014: 0x1098014: and   a1, v1, a1
+// 0x0109865c: 0x109865c: and   a1, v1, a1
 	ldloc 7
 	ldloc.2
 	and
 	stloc.2
-// 0x01098018: 0x1098018: addiu v0, zero, -1
+// 0x01098660: 0x1098660: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109801c: 0x109801c: subu  s8, s8, a3
+// 0x01098664: 0x1098664: subu  s8, s8, a3
 	ldloc 16
 	ldloc 4
 	sub
 	stloc 16
-// 0x01098020: 0x1098020: beq   a0, v0, 0x1098038 sw    a1, 608(sp)
+// 0x01098668: 0x1098668: beq   a0, v0, 0x1098680 sw    a1, 608(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -3381,9 +3381,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	beq  L_1098038
+	beq  L_1098680
 // --- basic block ---
-// 0x01098028: 0x1098028: lw    v1, 32(s3)
+// 0x01098670: 0x1098670: lw    v1, 32(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3392,14 +3392,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109802c: 0x109802c: sll   zero, zero, 0
-// 0x01098030: 0x1098030: bne   v1, v0, 0x1098050 sll   zero, zero, 0
+// 0x01098674: 0x1098674: sll   zero, zero, 0
+// 0x01098678: 0x1098678: bne   v1, v0, 0x1098698 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1098050
+	bne.un L_1098698
 // --- basic block ---
-L_1098038:
-// 0x01098038: 0x1098038: lw    v0, 100(s2)
+L_1098680:
+// 0x01098680: 0x1098680: lw    v0, 100(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3408,25 +3408,25 @@ L_1098038:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109803c: 0x109803c: sll   zero, zero, 0
-// 0x01098040: 0x1098040: beq   v0, zero, 0x1098058 sll   zero, zero, 0
+// 0x01098684: 0x1098684: sll   zero, zero, 0
+// 0x01098688: 0x1098688: beq   v0, zero, 0x10986a0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098058
+	brfalse L_10986a0
 // --- basic block ---
-// 0x01098048: 0x1098048: jal   0x1097b3c addu  a0, s3, zero
+// 0x01098690: 0x1098690: jal   0x1098184 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::reset_line_cache_1097b3c(int32,int32,int32,int32)
+	call int32 Cibyl113::reset_line_cache_1098184(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1098050:
-// 0x01098050: 0x1098050: lw    v0, 100(s2)
+L_1098698:
+// 0x01098698: 0x1098698: lw    v0, 100(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3435,13 +3435,13 @@ L_1098050:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098054: 0x1098054: sll   zero, zero, 0
-L_1098058:
-// 0x01098058: 0x1098058: beq   v0, zero, 0x1098244 sll   zero, zero, 0
+// 0x0109869c: 0x109869c: sll   zero, zero, 0
+L_10986a0:
+// 0x010986a0: 0x10986a0: beq   v0, zero, 0x109888c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098244
+	brfalse L_109888c
 // --- basic block ---
-// 0x01098060: 0x1098060: lw    a0, 48(s3)
+// 0x010986a8: 0x10986a8: lw    a0, 48(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3450,7 +3450,7 @@ L_1098058:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098064: 0x1098064: lw    v1, 8(s1)
+// 0x010986ac: 0x10986ac: lw    v1, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3459,24 +3459,24 @@ L_1098058:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098068: 0x1098068: andi  a0, a0, 32768
+// 0x010986b0: 0x10986b0: andi  a0, a0, 32768
 	ldloc.1
 	ldc.i4 32768
 	and
 	stloc.1
-// 0x0109806c: 0x109806c: sltu  a0, zero, a0
+// 0x010986b4: 0x10986b4: sltu  a0, zero, a0
 	ldc.i4.s 0
 	ldloc.1
 	clt.un
 	stloc.1
-// 0x01098070: 0x1098070: lw    v0, 0(s1)
+// 0x010986b8: 0x10986b8: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01098074: 0x1098074: sw    a0, 588(sp)
+// 0x010986bc: 0x10986bc: sw    a0, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3485,12 +3485,12 @@ L_1098058:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01098078: 0x1098078: addiu v1, v1, 1
+// 0x010986c0: 0x10986c0: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109807c: 0x109807c: lw    a1, 588(sp)
+// 0x010986c4: 0x10986c4: lw    a1, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3499,15 +3499,15 @@ L_1098058:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01098080: 0x1098080: subu  v1, v1, v0
+// 0x010986c8: 0x10986c8: subu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 7
-// 0x01098084: 0x1098084: addiu a0, zero, 2
+// 0x010986cc: 0x10986cc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01098088: 0x1098088: sw    v1, 584(sp)
+// 0x010986d0: 0x10986d0: sw    v1, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3516,7 +3516,7 @@ L_1098058:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109808c: 0x109808c: lw    v1, 668(sp)
+// 0x010986d4: 0x10986d4: lw    v1, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3525,12 +3525,12 @@ L_1098058:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098090: 0x1098090: subu  a1, a0, a1
+// 0x010986d8: 0x10986d8: subu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.2
-// 0x01098094: 0x1098094: sw    a1, 588(sp)
+// 0x010986dc: 0x10986dc: sw    a1, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3539,7 +3539,7 @@ L_1098058:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01098098: 0x1098098: lw    s4, 164(s3)
+// 0x010986e0: 0x10986e0: lw    s4, 164(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3548,11 +3548,11 @@ L_1098058:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109809c: 0x109809c: beq   v1, zero, 0x10980b0 sll   zero, zero, 0
+// 0x010986e4: 0x10986e4: beq   v1, zero, 0x10986f8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10980b0
+	brfalse L_10986f8
 // --- basic block ---
-// 0x010980a4: 0x10980a4: lw    v1, 4(s1)
+// 0x010986ec: 0x10986ec: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3561,7 +3561,7 @@ L_1098058:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010980a8: 0x10980a8: sw    v0, 64(sp)
+// 0x010986f0: 0x10986f0: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3570,7 +3570,7 @@ L_1098058:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010980ac: 0x10980ac: sw    v1, 68(sp)
+// 0x010986f4: 0x10986f4: sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3579,29 +3579,29 @@ L_1098058:
 	add
 	ldloc 7
 	stelem.i4
-L_10980b0:
-// 0x010980b0: 0x10980b0: addu  s0, s4, zero
+L_10986f8:
+// 0x010986f8: 0x10986f8: addu  s0, s4, zero
 	ldloc 14
 	stloc 9
-// 0x010980b4: 0x10980b4: addu  s8, s4, zero
+// 0x010986fc: 0x10986fc: addu  s8, s4, zero
 	ldloc 14
 	stloc 16
-// 0x010980b8: 0x10980b8: addu  s5, zero, zero
+// 0x01098700: 0x1098700: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010980bc: 0x10980bc: addu  s6, zero, zero
+// 0x01098704: 0x1098704: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x010980c0: 0x10980c0: addu  s7, zero, zero
+// 0x01098708: 0x1098708: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010980c4: 0x10980c4: j	 0x10981d0 addiu s2, zero, 2
+// 0x0109870c: 0x109870c: j	 0x1098818 addiu s2, zero, 2
 	ldc.i4.2
 	stloc 11
-	br L_10981d0
+	br L_1098818
 // --- basic block ---
-L_10980cc:
-// 0x010980cc: 0x10980cc: lw    a0, 668(sp)
+L_1098714:
+// 0x01098714: 0x1098714: lw    a0, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3610,12 +3610,12 @@ L_10980cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010980d0: 0x10980d0: sll   zero, zero, 0
-// 0x010980d4: 0x10980d4: beq   a0, zero, 0x10981a4 sll   zero, zero, 0
+// 0x01098718: 0x1098718: sll   zero, zero, 0
+// 0x0109871c: 0x109871c: beq   a0, zero, 0x10987ec sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10981a4
+	brfalse L_10987ec
 // --- basic block ---
-// 0x010980dc: 0x10980dc: lw    a0, 60(s0)
+// 0x01098724: 0x1098724: lw    a0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3624,7 +3624,7 @@ L_10980cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010980e0: 0x10980e0: lw    v0, 48(s3)
+// 0x01098728: 0x1098728: lw    v0, 48(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3633,7 +3633,7 @@ L_10980cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010980e4: 0x10980e4: lw    a1, 68(sp)
+// 0x0109872c: 0x109872c: lw    a1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3642,24 +3642,24 @@ L_10980cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010980e8: 0x10980e8: lw    v1, 0(s1)
+// 0x01098730: 0x1098730: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010980ec: 0x10980ec: addu  a0, a1, a0
+// 0x01098734: 0x1098734: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x010980f0: 0x10980f0: andi  v0, v0, 1
+// 0x01098738: 0x1098738: andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010980f4: 0x10980f4: sw    a0, 68(sp)
+// 0x0109873c: 0x109873c: sw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3668,7 +3668,7 @@ L_10980cc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010980f8: 0x10980f8: beq   v0, zero, 0x1098144 sw    v1, 64(sp)
+// 0x01098740: 0x1098740: beq   v0, zero, 0x109878c sw    v1, 64(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3678,9 +3678,9 @@ L_10980cc:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1098144
+	brfalse L_109878c
 // --- basic block ---
-// 0x01098100: 0x1098100: jal   0x109a424 addu  a0, zero, zero
+// 0x01098748: 0x1098748: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3688,12 +3688,12 @@ L_10980cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098108: 0x1098108: lw    a0, 56(s0)
+// 0x01098750: 0x1098750: lw    a0, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3702,7 +3702,7 @@ L_10980cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109810c: 0x109810c: lw    v1, 64(sp)
+// 0x01098754: 0x1098754: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3711,11 +3711,11 @@ L_10980cc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098110: 0x1098110: beq   v0, zero, 0x1098124 sll   zero, zero, 0
+// 0x01098758: 0x1098758: beq   v0, zero, 0x109876c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098124
+	brfalse L_109876c
 // --- basic block ---
-// 0x01098118: 0x1098118: lw    a1, 584(sp)
+// 0x01098760: 0x1098760: lw    a1, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3724,15 +3724,15 @@ L_10980cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109811c: 0x109811c: j	 0x1098130 subu  a0, a1, a0
+// 0x01098764: 0x1098764: j	 0x1098778 subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-	br L_1098130
+	br L_1098778
 // --- basic block ---
-L_1098124:
-// 0x01098124: 0x1098124: lw    v0, 584(sp)
+L_109876c:
+// 0x0109876c: 0x109876c: lw    v0, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3741,27 +3741,27 @@ L_1098124:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098128: 0x1098128: sll   zero, zero, 0
-// 0x0109812c: 0x109812c: subu  a0, v0, a0
+// 0x01098770: 0x1098770: sll   zero, zero, 0
+// 0x01098774: 0x1098774: subu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc.1
-L_1098130:
-// 0x01098130: 0x1098130: div   a0, s2
+L_1098778:
+// 0x01098778: 0x1098778: div   a0, s2
 	ldloc.1
 	ldloc 11
 	div
 	stloc 17
-// 0x01098134: 0x1098134: mflo  lo
+// 0x0109877c: 0x109877c: mflo  lo
 	ldloc 17
 	stloc.1
-// 0x01098138: 0x1098138: addu  v1, v1, a0
+// 0x01098780: 0x1098780: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x0109813c: 0x109813c: j	 0x1098174 sw    v1, 64(sp)
+// 0x01098784: 0x1098784: j	 0x10987bc sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3770,10 +3770,10 @@ L_1098130:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1098174
+	br L_10987bc
 // --- basic block ---
-L_1098144:
-// 0x01098144: 0x1098144: jal   0x109a424 addu  a0, zero, zero
+L_109878c:
+// 0x0109878c: 0x109878c: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3781,16 +3781,16 @@ L_1098144:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109814c: 0x109814c: beq   v0, zero, 0x1098174 sll   zero, zero, 0
+// 0x01098794: 0x1098794: beq   v0, zero, 0x10987bc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098174
+	brfalse L_10987bc
 // --- basic block ---
-// 0x01098154: 0x1098154: lw    v1, 64(sp)
+// 0x0109879c: 0x109879c: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3799,7 +3799,7 @@ L_1098144:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098158: 0x1098158: lw    v0, 56(s0)
+// 0x010987a0: 0x10987a0: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3808,13 +3808,13 @@ L_1098144:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109815c: 0x109815c: sll   zero, zero, 0
-// 0x01098160: 0x1098160: subu  v0, v1, v0
+// 0x010987a4: 0x10987a4: sll   zero, zero, 0
+// 0x010987a8: 0x10987a8: subu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x01098164: 0x1098164: lw    v1, 584(sp)
+// 0x010987ac: 0x10987ac: lw    v1, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3823,13 +3823,13 @@ L_1098144:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098168: 0x1098168: sll   zero, zero, 0
-// 0x0109816c: 0x109816c: addu  v0, v0, v1
+// 0x010987b0: 0x10987b0: sll   zero, zero, 0
+// 0x010987b4: 0x10987b4: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01098170: 0x1098170: sw    v0, 64(sp)
+// 0x010987b8: 0x10987b8: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3838,8 +3838,8 @@ L_1098144:
 	add
 	ldloc 5
 	stelem.i4
-L_1098174:
-// 0x01098174: 0x1098174: lw    v0, 64(sp)
+L_10987bc:
+// 0x010987bc: 0x10987bc: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3848,7 +3848,7 @@ L_1098174:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098178: 0x1098178: lw    a1, 588(sp)
+// 0x010987c0: 0x10987c0: lw    a1, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3857,12 +3857,12 @@ L_1098174:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109817c: 0x109817c: addiu v0, v0, -20
+// 0x010987c4: 0x10987c4: addiu v0, v0, -20
 	ldloc 5
 	ldc.i4.s -20
 	add
 	stloc 5
-// 0x01098180: 0x1098180: sw    v0, 64(sp)
+// 0x010987c8: 0x10987c8: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3871,14 +3871,14 @@ L_1098174:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098184: 0x1098184: lw    a3, 0(s4)
+// 0x010987cc: 0x10987cc: lw    a3, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01098188: 0x1098188: sw    a1, 16(sp)
+// 0x010987d0: 0x10987d0: sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3887,7 +3887,7 @@ L_1098174:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109818c: 0x109818c: lw    v0, 32(s8)
+// 0x010987d4: 0x10987d4: lw    v0, 32(s8)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -3896,18 +3896,18 @@ L_1098174:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098190: 0x1098190: addiu a0, sp, 64
+// 0x010987d8: 0x10987d8: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x01098194: 0x1098194: addu  a1, zero, zero
+// 0x010987dc: 0x10987dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01098198: 0x1098198: addu  a2, zero, zero
+// 0x010987e0: 0x10987e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109819c: 0x109819c: jal   0x104e944 sw    v0, 20(sp)
+// 0x010987e4: 0x10987e4: jal   0x104e954 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3921,13 +3921,13 @@ L_1098174:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_formated_string_angle_104e944(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_formated_string_angle_104e954(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10981a4:
-// 0x010981a4: 0x10981a4: lw    v0, 56(s0)
+L_10987ec:
+// 0x010987ec: 0x10987ec: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3936,21 +3936,21 @@ L_10981a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010981a8: 0x10981a8: sll   zero, zero, 0
-// 0x010981ac: 0x10981ac: slt   v1, s6, v0
+// 0x010987f0: 0x10987f0: sll   zero, zero, 0
+// 0x010987f4: 0x10987f4: slt   v1, s6, v0
 	ldloc 15
 	ldloc 5
 	clt
 	stloc 7
-// 0x010981b0: 0x10981b0: beq   v1, zero, 0x10981bc sll   zero, zero, 0
+// 0x010987f8: 0x10987f8: beq   v1, zero, 0x1098804 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10981bc
+	brfalse L_1098804
 // --- basic block ---
-// 0x010981b8: 0x10981b8: addu  s6, v0, zero
+// 0x01098800: 0x1098800: addu  s6, v0, zero
 	ldloc 5
 	stloc 15
-L_10981bc:
-// 0x010981bc: 0x10981bc: lw    v0, 60(s0)
+L_1098804:
+// 0x01098804: 0x1098804: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3959,28 +3959,28 @@ L_10981bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010981c0: 0x10981c0: addiu s7, s7, 1
+// 0x01098808: 0x1098808: addiu s7, s7, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010981c4: 0x10981c4: addu  s5, s5, v0
+// 0x0109880c: 0x109880c: addu  s5, s5, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x010981c8: 0x10981c8: addiu s0, s0, 8
+// 0x01098810: 0x1098810: addiu s0, s0, 8
 	ldloc 9
 	ldc.i4.8
 	add
 	stloc 9
-// 0x010981cc: 0x10981cc: addiu s8, s8, 4
+// 0x01098814: 0x1098814: addiu s8, s8, 4
 	ldloc 16
 	ldc.i4.4
 	add
 	stloc 16
-L_10981d0:
-// 0x010981d0: 0x10981d0: lw    v0, 96(s4)
+L_1098818:
+// 0x01098818: 0x1098818: lw    v0, 96(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -3989,24 +3989,24 @@ L_10981d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010981d4: 0x10981d4: sll   zero, zero, 0
-// 0x010981d8: 0x10981d8: slt   v0, s7, v0
+// 0x0109881c: 0x109881c: sll   zero, zero, 0
+// 0x01098820: 0x1098820: slt   v0, s7, v0
 	ldloc 12
 	ldloc 5
 	clt
 	stloc 5
-// 0x010981dc: 0x10981dc: bne   v0, zero, 0x10980cc sll   zero, zero, 0
+// 0x01098824: 0x1098824: bne   v0, zero, 0x1098714 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10980cc
+	brtrue L_1098714
 // --- basic block ---
-// 0x010981e4: 0x10981e4: lw    v0, 0(s1)
+// 0x0109882c: 0x109882c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010981e8: 0x10981e8: lw    a0, 4(s1)
+// 0x01098830: 0x1098830: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4015,17 +4015,17 @@ L_10981d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010981ec: 0x10981ec: addiu v0, v0, -1
+// 0x01098834: 0x1098834: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010981f0: 0x10981f0: addu  s6, v0, s6
+// 0x01098838: 0x1098838: addu  s6, v0, s6
 	ldloc 5
 	ldloc 15
 	add
 	stloc 15
-// 0x010981f4: 0x10981f4: jal   0x10c09ac sw    s6, 8(s1)
+// 0x0109883c: 0x109883c: jal   0x10c0fec sw    s6, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4039,30 +4039,30 @@ L_10981d0:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010981fc: 0x10981fc: lui   v1, 0x20000
+// 0x01098844: 0x1098844: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01098200: 0x1098200: lw    a1, 23684(v1)
+// 0x01098848: 0x1098848: lw    a1, 24144(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5921
+	ldc.i4 6036
 	add
 	ldelem.i4
 	stloc.2
-// 0x01098204: 0x1098204: jal   0x10c06d0 addu  a0, v0, zero
+// 0x0109884c: 0x109884c: jal   0x10c0d10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109820c: 0x109820c: addu  a0, s5, zero
+// 0x01098854: 0x1098854: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-// 0x01098210: 0x1098210: jal   0x10c09ac addu  s0, v0, zero
+// 0x01098858: 0x1098858: jal   0x10c0fec addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -4070,38 +4070,38 @@ L_10981d0:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01098218: 0x1098218: lui   v1, 0x20000
+// 0x01098860: 0x1098860: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0109821c: 0x109821c: lw    a1, 23688(v1)
+// 0x01098864: 0x1098864: lw    a1, 24148(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5922
+	ldc.i4 6037
 	add
 	ldelem.i4
 	stloc.2
-// 0x01098220: 0x1098220: jal   0x10c0780 addu  a0, v0, zero
+// 0x01098868: 0x1098868: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01098228: 0x1098228: addu  a1, v0, zero
+// 0x01098870: 0x1098870: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0109822c: 0x109822c: jal   0x10c06d0 addu  a0, s0, zero
+// 0x01098874: 0x1098874: jal   0x10c0d10 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01098234: 0x1098234: jal   0x10c08bc addu  a0, v0, zero
+// 0x0109887c: 0x109887c: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -4109,7 +4109,7 @@ L_10981d0:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x0109823c: 0x109823c: j	 0x10987e0 sw    v0, 12(s1)
+// 0x01098884: 0x1098884: j	 0x1098e28 sw    v0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4118,10 +4118,10 @@ L_10981d0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10987e0
+	br L_1098e28
 // --- basic block ---
-L_1098244:
-// 0x01098244: 0x1098244: lw    v0, 668(sp)
+L_109888c:
+// 0x0109888c: 0x109888c: lw    v0, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4130,19 +4130,19 @@ L_1098244:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098248: 0x1098248: sll   zero, zero, 0
-// 0x0109824c: 0x109824c: beq   v0, zero, 0x1098264 sll   zero, zero, 0
+// 0x01098890: 0x1098890: sll   zero, zero, 0
+// 0x01098894: 0x1098894: beq   v0, zero, 0x10988ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098264
+	brfalse L_10988ac
 // --- basic block ---
-// 0x01098254: 0x1098254: lw    v1, 0(s1)
+// 0x0109889c: 0x109889c: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01098258: 0x1098258: lw    v0, 4(s1)
+// 0x010988a0: 0x10988a0: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4151,7 +4151,7 @@ L_1098244:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109825c: 0x109825c: sw    v1, 56(sp)
+// 0x010988a4: 0x10988a4: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4160,7 +4160,7 @@ L_1098244:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098260: 0x1098260: sw    v0, 60(sp)
+// 0x010988a8: 0x10988a8: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4169,8 +4169,8 @@ L_1098244:
 	add
 	ldloc 5
 	stelem.i4
-L_1098264:
-// 0x01098264: 0x1098264: lw    v0, 48(s3)
+L_10988ac:
+// 0x010988ac: 0x10988ac: lw    v0, 48(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -4179,17 +4179,17 @@ L_1098264:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098268: 0x1098268: sll   zero, zero, 0
-// 0x0109826c: 0x109826c: andi  v0, v0, 8192
+// 0x010988b0: 0x10988b0: sll   zero, zero, 0
+// 0x010988b4: 0x10988b4: andi  v0, v0, 8192
 	ldloc 5
 	ldc.i4 8192
 	and
 	stloc 5
-// 0x01098270: 0x1098270: beq   v0, zero, 0x109829c sll   zero, zero, 0
+// 0x010988b8: 0x10988b8: beq   v0, zero, 0x10988e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109829c
+	brfalse L_10988e4
 // --- basic block ---
-// 0x01098278: 0x1098278: lw    v0, 20(s3)
+// 0x010988c0: 0x10988c0: lw    v0, 20(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -4198,19 +4198,19 @@ L_1098264:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109827c: 0x109827c: sll   zero, zero, 0
-// 0x01098280: 0x1098280: lb    v0, 0(v0)
+// 0x010988c4: 0x10988c4: sll   zero, zero, 0
+// 0x010988c8: 0x10988c8: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01098284: 0x1098284: sll   zero, zero, 0
-// 0x01098288: 0x1098288: beq   v0, zero, 0x109829c lui   s0, 0x20000
+// 0x010988cc: 0x10988cc: sll   zero, zero, 0
+// 0x010988d0: 0x10988d0: beq   v0, zero, 0x10988e4 lui   s0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 9
-	brfalse L_109829c
+	brfalse L_10988e4
 // --- basic block ---
-// 0x01098290: 0x1098290: sw    zero, 104(s2)
+// 0x010988d8: 0x10988d8: sw    zero, 104(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4219,15 +4219,15 @@ L_1098264:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01098294: 0x1098294: j	 0x10982a0 addiu s0, s0, -2824
+// 0x010988dc: 0x10988dc: j	 0x10988e8 addiu s0, s0, -2360
 	ldloc 9
-	ldc.i4 -2824
+	ldc.i4 -2360
 	add
 	stloc 9
-	br L_10982a0
+	br L_10988e8
 // --- basic block ---
-L_109829c:
-// 0x0109829c: 0x109829c: lw    s0, 20(s3)
+L_10988e4:
+// 0x010988e4: 0x10988e4: lw    s0, 20(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -4236,8 +4236,8 @@ L_109829c:
 	add
 	ldelem.i4
 	stloc 9
-L_10982a0:
-// 0x010982a0: 0x10982a0: lw    v0, 104(s2)
+L_10988e8:
+// 0x010988e8: 0x10988e8: lw    v0, 104(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4246,12 +4246,12 @@ L_10982a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010982a4: 0x10982a4: sll   zero, zero, 0
-// 0x010982a8: 0x10982a8: beq   v0, zero, 0x10982b4 sll   zero, zero, 0
+// 0x010988ec: 0x10988ec: sll   zero, zero, 0
+// 0x010988f0: 0x10988f0: beq   v0, zero, 0x10988fc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10982b4
+	brfalse L_10988fc
 // --- basic block ---
-// 0x010982b0: 0x10982b0: sw    s0, 32(s2)
+// 0x010988f8: 0x10988f8: sw    s0, 32(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4260,8 +4260,8 @@ L_10982a0:
 	add
 	ldloc 9
 	stelem.i4
-L_10982b4:
-// 0x010982b4: 0x10982b4: lw    v0, 48(s3)
+L_10988fc:
+// 0x010988fc: 0x10988fc: lw    v0, 48(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -4270,20 +4270,20 @@ L_10982b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010982b8: 0x10982b8: addu  s6, zero, zero
+// 0x01098900: 0x1098900: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x010982bc: 0x10982bc: andi  v0, v0, 32768
+// 0x01098904: 0x1098904: andi  v0, v0, 32768
 	ldloc 5
 	ldc.i4 32768
 	and
 	stloc 5
-// 0x010982c0: 0x10982c0: sltu  v0, zero, v0
+// 0x01098908: 0x1098908: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010982c4: 0x10982c4: sw    v0, 584(sp)
+// 0x0109890c: 0x109890c: sw    v0, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4292,7 +4292,7 @@ L_10982b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010982c8: 0x10982c8: lw    v1, 584(sp)
+// 0x01098910: 0x1098910: lw    v1, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4301,15 +4301,15 @@ L_10982b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010982cc: 0x10982cc: addiu v0, zero, 2
+// 0x01098914: 0x1098914: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010982d0: 0x10982d0: subu  v1, v0, v1
+// 0x01098918: 0x1098918: subu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 7
-// 0x010982d4: 0x10982d4: sw    v1, 584(sp)
+// 0x0109891c: 0x109891c: sw    v1, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4318,7 +4318,7 @@ L_10982b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010982d8: 0x10982d8: sw    zero, 592(sp)
+// 0x01098920: 0x1098920: sw    zero, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4327,7 +4327,7 @@ L_10982b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010982dc: 0x10982dc: sw    zero, 596(sp)
+// 0x01098924: 0x1098924: sw    zero, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4336,7 +4336,7 @@ L_10982b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010982e0: 0x10982e0: sw    zero, 588(sp)
+// 0x01098928: 0x1098928: sw    zero, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4345,12 +4345,12 @@ L_10982b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010982e4: 0x10982e4: addiu s4, sp, 72
+// 0x0109892c: 0x109892c: addiu s4, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 14
-// 0x010982e8: 0x10982e8: j	 0x109873c sw    s1, 604(sp)
+// 0x01098930: 0x1098930: j	 0x1098d84 sw    s1, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4359,10 +4359,10 @@ L_10982b4:
 	add
 	ldloc 8
 	stelem.i4
-	br L_109873c
+	br L_1098d84
 // --- basic block ---
-L_10982f0:
-// 0x010982f0: 0x10982f0: jal   0x1001a5c addiu a1, zero, 10
+L_1098938:
+// 0x01098938: 0x1098938: jal   0x1001a5c addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
 	ldloc.1
@@ -4372,7 +4372,7 @@ L_10982f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010982f8: 0x10982f8: lw    a0, 600(sp)
+// 0x01098940: 0x1098940: lw    a0, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4381,14 +4381,14 @@ L_10982f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010982fc: 0x10982fc: sll   zero, zero, 0
-// 0x01098300: 0x1098300: bne   a0, zero, 0x1098318 addu  s1, v0, zero
+// 0x01098944: 0x1098944: sll   zero, zero, 0
+// 0x01098948: 0x1098948: bne   a0, zero, 0x1098960 addu  s1, v0, zero
 	ldloc.1
 	ldloc 5
 	stloc 8
-	brtrue L_1098318
+	brtrue L_1098960
 // --- basic block ---
-// 0x01098308: 0x1098308: lw    a1, 608(sp)
+// 0x01098950: 0x1098950: lw    a1, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4397,21 +4397,21 @@ L_10982f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109830c: 0x109830c: sll   zero, zero, 0
-// 0x01098310: 0x1098310: beq   a1, zero, 0x1098320 addu  a0, s0, zero
+// 0x01098954: 0x1098954: sll   zero, zero, 0
+// 0x01098958: 0x1098958: beq   a1, zero, 0x1098968 addu  a0, s0, zero
 	ldloc.2
 	ldloc 9
 	stloc.1
-	brfalse L_1098320
+	brfalse L_1098968
 // --- basic block ---
-L_1098318:
-// 0x01098318: 0x1098318: j	 0x109832c addu  s7, zero, zero
+L_1098960:
+// 0x01098960: 0x1098960: j	 0x1098974 addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 12
-	br L_109832c
+	br L_1098974
 // --- basic block ---
-L_1098320:
-// 0x01098320: 0x1098320: jal   0x1001a5c addiu a1, zero, 32
+L_1098968:
+// 0x01098968: 0x1098968: jal   0x1001a5c addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.2
 	ldloc.1
@@ -4421,15 +4421,15 @@ L_1098320:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098328: 0x1098328: addu  s7, v0, zero
+// 0x01098970: 0x1098970: addu  s7, v0, zero
 	ldloc 5
 	stloc 12
-L_109832c:
-// 0x0109832c: 0x109832c: bne   s5, zero, 0x1098344 sll   zero, zero, 0
+L_1098974:
+// 0x01098974: 0x1098974: bne   s5, zero, 0x109898c sll   zero, zero, 0
 	ldloc 10
-	brtrue L_1098344
+	brtrue L_109898c
 // --- basic block ---
-// 0x01098334: 0x1098334: jal   0x1001b48 addu  a0, s4, zero
+// 0x0109897c: 0x109897c: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
@@ -4438,48 +4438,48 @@ L_109832c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109833c: 0x109833c: j	 0x1098400 addu  v1, v0, zero
+// 0x01098984: 0x1098984: j	 0x1098a48 addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-	br L_1098400
+	br L_1098a48
 // --- basic block ---
-L_1098344:
-// 0x01098344: 0x1098344: beq   s1, zero, 0x1098364 sll   zero, zero, 0
+L_109898c:
+// 0x0109898c: 0x109898c: beq   s1, zero, 0x10989ac sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1098364
+	brfalse L_10989ac
 // --- basic block ---
-// 0x0109834c: 0x109834c: beq   s7, zero, 0x10987d8 sltu  v0, s1, s7
+// 0x01098994: 0x1098994: beq   s7, zero, 0x1098e20 sltu  v0, s1, s7
 	ldloc 12
 	ldloc 8
 	ldloc 12
 	clt.un
 	stloc 5
-	brfalse L_10987d8
+	brfalse L_1098e20
 // --- basic block ---
-// 0x01098354: 0x1098354: bne   v0, zero, 0x10987d8 sll   zero, zero, 0
+// 0x0109899c: 0x109899c: bne   v0, zero, 0x1098e20 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10987d8
+	brtrue L_1098e20
 // --- basic block ---
-// 0x0109835c: 0x109835c: j	 0x109836c addu  s1, zero, zero
+// 0x010989a4: 0x10989a4: j	 0x10989b4 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_109836c
+	br L_10989b4
 // --- basic block ---
-L_1098364:
-// 0x01098364: 0x1098364: beq   s7, zero, 0x1098374 sll   zero, zero, 0
+L_10989ac:
+// 0x010989ac: 0x10989ac: beq   s7, zero, 0x10989bc sll   zero, zero, 0
 	ldloc 12
-	brfalse L_1098374
+	brfalse L_10989bc
 // --- basic block ---
-L_109836c:
-// 0x0109836c: 0x109836c: j	 0x1098380 subu  v1, s7, s0
+L_10989b4:
+// 0x010989b4: 0x10989b4: j	 0x10989c8 subu  v1, s7, s0
 	ldloc 12
 	ldloc 9
 	sub
 	stloc 7
-	br L_1098380
+	br L_10989c8
 // --- basic block ---
-L_1098374:
-// 0x01098374: 0x1098374: jal   0x1001b48 addu  a0, s0, zero
+L_10989bc:
+// 0x010989bc: 0x10989bc: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -4488,14 +4488,14 @@ L_1098374:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109837c: 0x109837c: addu  v1, v0, zero
+// 0x010989c4: 0x10989c4: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_1098380:
-// 0x01098380: 0x1098380: addu  a0, s4, zero
+L_10989c8:
+// 0x010989c8: 0x10989c8: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x01098384: 0x1098384: jal   0x1001b48 sw    v1, 616(sp)
+// 0x010989cc: 0x10989cc: jal   0x1001b48 sw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4510,10 +4510,10 @@ L_1098380:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109838c: 0x109838c: addiu a0, zero, 511
+// 0x010989d4: 0x10989d4: addiu a0, zero, 511
 	ldc.i4 511
 	stloc.1
-// 0x01098390: 0x1098390: lw    v1, 616(sp)
+// 0x010989d8: 0x10989d8: lw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4522,43 +4522,43 @@ L_1098380:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098394: 0x1098394: subu  s5, a0, v0
+// 0x010989dc: 0x10989dc: subu  s5, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 10
-// 0x01098398: 0x1098398: sltu  v0, v1, s5
+// 0x010989e0: 0x10989e0: sltu  v0, v1, s5
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc 5
-// 0x0109839c: 0x109839c: beq   v0, zero, 0x10983a8 sll   zero, zero, 0
+// 0x010989e4: 0x10989e4: beq   v0, zero, 0x10989f0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10983a8
+	brfalse L_10989f0
 // --- basic block ---
-// 0x010983a4: 0x10983a4: addu  s5, v1, zero
+// 0x010989ec: 0x10989ec: addu  s5, v1, zero
 	ldloc 7
 	stloc 10
-L_10983a8:
-// 0x010983a8: 0x10983a8: lb    v0, 72(sp)
+L_10989f0:
+// 0x010989f0: 0x10989f0: lb    v0, 72(sp)
 	ldloc.0
 	ldc.i4.s 72
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010983ac: 0x10983ac: sll   zero, zero, 0
-// 0x010983b0: 0x10983b0: beq   v0, zero, 0x10983c4 lui   a1, 0x20000
+// 0x010989f4: 0x10989f4: sll   zero, zero, 0
+// 0x010989f8: 0x10989f8: beq   v0, zero, 0x1098a0c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10983c4
+	brfalse L_1098a0c
 // --- basic block ---
-// 0x010983b8: 0x10983b8: addu  a0, s4, zero
+// 0x01098a00: 0x1098a00: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x010983bc: 0x10983bc: jal   0x1001ac4 addiu a1, a1, 48
+// 0x01098a04: 0x1098a04: jal   0x1001ac4 addiu a1, a1, 512
 	ldloc.2
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
 	ldloc.1
@@ -4566,8 +4566,8 @@ L_10983a8:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-L_10983c4:
-// 0x010983c4: 0x10983c4: jal   0x1001b48 addu  a0, s4, zero
+L_1098a0c:
+// 0x01098a0c: 0x1098a0c: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
@@ -4576,23 +4576,23 @@ L_10983c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010983cc: 0x10983cc: addu  v1, v0, s5
+// 0x01098a14: 0x1098a14: addu  v1, v0, s5
 	ldloc 5
 	ldloc 10
 	add
 	stloc 7
-// 0x010983d0: 0x10983d0: addu  a1, s0, zero
+// 0x01098a18: 0x1098a18: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010983d4: 0x10983d4: addu  a0, s4, v0
+// 0x01098a1c: 0x1098a1c: addu  a0, s4, v0
 	ldloc 14
 	ldloc 5
 	add
 	stloc.1
-// 0x010983d8: 0x10983d8: addu  a2, s5, zero
+// 0x01098a20: 0x1098a20: addu  a2, s5, zero
 	ldloc 10
 	stloc.3
-// 0x010983dc: 0x10983dc: jal   0x1001af8 sw    v1, 616(sp)
+// 0x01098a24: 0x1098a24: jal   0x1001af8 sw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4607,7 +4607,7 @@ L_10983c4:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010983e4: 0x10983e4: lw    v1, 616(sp)
+// 0x01098a2c: 0x1098a2c: lw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4616,51 +4616,51 @@ L_10983c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010983e8: 0x10983e8: addiu a1, sp, 32
+// 0x01098a30: 0x1098a30: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010983ec: 0x10983ec: addu  s0, s0, s5
+// 0x01098a34: 0x1098a34: addu  s0, s0, s5
 	ldloc 9
 	ldloc 10
 	add
 	stloc 9
-// 0x010983f0: 0x10983f0: addu  a0, a1, v1
+// 0x01098a38: 0x1098a38: addu  a0, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc.1
-// 0x010983f4: 0x10983f4: sltu  v0, zero, s7
+// 0x01098a3c: 0x1098a3c: sltu  v0, zero, s7
 	ldc.i4.s 0
 	ldloc 12
 	clt.un
 	stloc 5
-// 0x010983f8: 0x10983f8: sb    zero, 40(a0)
+// 0x01098a40: 0x1098a40: sb    zero, 40(a0)
 	ldloc.1
 	ldc.i4.s 40
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010983fc: 0x10983fc: addu  s0, s0, v0
+// 0x01098a44: 0x1098a44: addu  s0, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-L_1098400:
-// 0x01098400: 0x1098400: addiu v0, sp, 40
+L_1098a48:
+// 0x01098a48: 0x1098a48: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x01098404: 0x1098404: lw    a1, 0(s2)
+// 0x01098a4c: 0x1098a4c: lw    a1, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01098408: 0x1098408: sw    v0, 16(sp)
+// 0x01098a50: 0x1098a50: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4669,7 +4669,7 @@ L_1098400:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109840c: 0x109840c: lw    v0, 584(sp)
+// 0x01098a54: 0x1098a54: lw    v0, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4678,20 +4678,20 @@ L_1098400:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098410: 0x1098410: addu  a0, s4, zero
+// 0x01098a58: 0x1098a58: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x01098414: 0x1098414: addiu a2, sp, 32
+// 0x01098a5c: 0x1098a5c: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x01098418: 0x1098418: addiu a3, sp, 36
+// 0x01098a60: 0x1098a60: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x0109841c: 0x109841c: sw    v0, 24(sp)
+// 0x01098a64: 0x1098a64: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4700,7 +4700,7 @@ L_1098400:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098420: 0x1098420: sw    v1, 616(sp)
+// 0x01098a68: 0x1098a68: sw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4709,7 +4709,7 @@ L_1098400:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098424: 0x1098424: jal   0x104ec44 sw    zero, 20(sp)
+// 0x01098a6c: 0x1098a6c: jal   0x104ec54 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4723,16 +4723,16 @@ L_1098400:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_formated_text_extents_104ec44(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_formated_text_extents_104ec54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109842c: 0x109842c: lb    v0, 0(s0)
+// 0x01098a74: 0x1098a74: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01098430: 0x1098430: lw    v1, 616(sp)
+// 0x01098a78: 0x1098a78: lw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4741,15 +4741,15 @@ L_1098400:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098434: 0x1098434: beq   v0, zero, 0x1098458 sll   zero, zero, 0
+// 0x01098a7c: 0x1098a7c: beq   v0, zero, 0x1098aa0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098458
+	brfalse L_1098aa0
 // --- basic block ---
-// 0x0109843c: 0x109843c: bne   s1, zero, 0x1098458 sll   zero, zero, 0
+// 0x01098a84: 0x1098a84: bne   s1, zero, 0x1098aa0 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1098458
+	brtrue L_1098aa0
 // --- basic block ---
-// 0x01098444: 0x1098444: lw    v0, 32(sp)
+// 0x01098a8c: 0x1098a8c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4758,18 +4758,18 @@ L_1098400:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098448: 0x1098448: sll   zero, zero, 0
-// 0x0109844c: 0x109844c: slt   v0, s8, v0
+// 0x01098a90: 0x1098a90: sll   zero, zero, 0
+// 0x01098a94: 0x1098a94: slt   v0, s8, v0
 	ldloc 16
 	ldloc 5
 	clt
 	stloc 5
-// 0x01098450: 0x1098450: beq   v0, zero, 0x109873c sll   zero, zero, 0
+// 0x01098a98: 0x1098a98: beq   v0, zero, 0x1098d84 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109873c
+	brfalse L_1098d84
 // --- basic block ---
-L_1098458:
-// 0x01098458: 0x1098458: lw    v0, 32(sp)
+L_1098aa0:
+// 0x01098aa0: 0x1098aa0: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4778,72 +4778,72 @@ L_1098458:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109845c: 0x109845c: sll   zero, zero, 0
-// 0x01098460: 0x1098460: slt   v0, s8, v0
+// 0x01098aa4: 0x1098aa4: sll   zero, zero, 0
+// 0x01098aa8: 0x1098aa8: slt   v0, s8, v0
 	ldloc 16
 	ldloc 5
 	clt
 	stloc 5
-// 0x01098464: 0x1098464: beq   v0, zero, 0x10984cc addiu s1, v1, -1
+// 0x01098aac: 0x1098aac: beq   v0, zero, 0x1098b14 addiu s1, v1, -1
 	ldloc 5
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 8
-	brfalse L_10984cc
+	brfalse L_1098b14
 // --- basic block ---
-// 0x0109846c: 0x109846c: sltu  v0, s5, v1
+// 0x01098ab4: 0x1098ab4: sltu  v0, s5, v1
 	ldloc 10
 	ldloc 7
 	clt.un
 	stloc 5
-// 0x01098470: 0x1098470: beq   v0, zero, 0x10984d0 sltiu v0, s1, 511
+// 0x01098ab8: 0x1098ab8: beq   v0, zero, 0x1098b18 sltiu v0, s1, 511
 	ldloc 5
 	ldloc 8
 	ldc.i4 511
 	clt.un
 	stloc 5
-	brfalse L_10984d0
+	brfalse L_1098b18
 // --- basic block ---
-// 0x01098478: 0x1098478: addiu v0, v1, -1
+// 0x01098ac0: 0x1098ac0: addiu v0, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0109847c: 0x109847c: addiu a0, sp, 32
+// 0x01098ac4: 0x1098ac4: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01098480: 0x1098480: subu  v0, v0, s5
+// 0x01098ac8: 0x1098ac8: subu  v0, v0, s5
 	ldloc 5
 	ldloc 10
 	sub
 	stloc 5
-// 0x01098484: 0x1098484: addu  v0, a0, v0
+// 0x01098acc: 0x1098acc: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01098488: 0x1098488: sb    zero, 40(v0)
+// 0x01098ad0: 0x1098ad0: sb    zero, 40(v0)
 	ldloc 5
 	ldc.i4.s 40
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0109848c: 0x109848c: addiu v0, sp, 40
+// 0x01098ad4: 0x1098ad4: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x01098490: 0x1098490: lw    a1, 0(s2)
+// 0x01098ad8: 0x1098ad8: lw    a1, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01098494: 0x1098494: sw    v0, 16(sp)
+// 0x01098adc: 0x1098adc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4852,7 +4852,7 @@ L_1098458:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098498: 0x1098498: lw    v0, 584(sp)
+// 0x01098ae0: 0x1098ae0: lw    v0, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4861,20 +4861,20 @@ L_1098458:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109849c: 0x109849c: addu  a0, s4, zero
+// 0x01098ae4: 0x1098ae4: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x010984a0: 0x10984a0: addiu a2, sp, 32
+// 0x01098ae8: 0x1098ae8: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x010984a4: 0x10984a4: addiu a3, sp, 36
+// 0x01098aec: 0x1098aec: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x010984a8: 0x10984a8: sw    v1, 616(sp)
+// 0x01098af0: 0x1098af0: sw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4883,17 +4883,17 @@ L_1098458:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010984ac: 0x10984ac: subu  s0, s0, s5
+// 0x01098af4: 0x1098af4: subu  s0, s0, s5
 	ldloc 9
 	ldloc 10
 	sub
 	stloc 9
-// 0x010984b0: 0x10984b0: sltu  s7, zero, s7
+// 0x01098af8: 0x1098af8: sltu  s7, zero, s7
 	ldc.i4.s 0
 	ldloc 12
 	clt.un
 	stloc 12
-// 0x010984b4: 0x10984b4: sw    zero, 20(sp)
+// 0x01098afc: 0x1098afc: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4902,7 +4902,7 @@ L_1098458:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010984b8: 0x10984b8: jal   0x104ec44 sw    v0, 24(sp)
+// 0x01098b00: 0x1098b00: jal   0x104ec54 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4916,12 +4916,12 @@ L_1098458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_formated_text_extents_104ec44(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_formated_text_extents_104ec54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010984c0: 0x10984c0: lw    v1, 616(sp)
+// 0x01098b08: 0x1098b08: lw    v1, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4930,32 +4930,32 @@ L_1098458:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010984c4: 0x10984c4: subu  s0, s0, s7
+// 0x01098b0c: 0x1098b0c: subu  s0, s0, s7
 	ldloc 9
 	ldloc 12
 	sub
 	stloc 9
-// 0x010984c8: 0x10984c8: addiu s1, v1, -1
+// 0x01098b10: 0x1098b10: addiu s1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 8
-L_10984cc:
-// 0x010984cc: 0x10984cc: sltiu v0, s1, 511
+L_1098b14:
+// 0x01098b14: 0x1098b14: sltiu v0, s1, 511
 	ldloc 8
 	ldc.i4 511
 	clt.un
 	stloc 5
-L_10984d0:
-// 0x010984d0: 0x10984d0: bne   v0, zero, 0x10984dc sll   zero, zero, 0
+L_1098b18:
+// 0x01098b18: 0x1098b18: bne   v0, zero, 0x1098b24 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10984dc
+	brtrue L_1098b24
 // --- basic block ---
-// 0x010984d8: 0x10984d8: addiu s1, zero, 511
+// 0x01098b20: 0x1098b20: addiu s1, zero, 511
 	ldc.i4 511
 	stloc 8
-L_10984dc:
-// 0x010984dc: 0x10984dc: lw    v0, 32(sp)
+L_1098b24:
+// 0x01098b24: 0x1098b24: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4964,26 +4964,26 @@ L_10984dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010984e0: 0x10984e0: sll   zero, zero, 0
-// 0x010984e4: 0x10984e4: slt   v0, s8, v0
+// 0x01098b28: 0x1098b28: sll   zero, zero, 0
+// 0x01098b2c: 0x1098b2c: slt   v0, s8, v0
 	ldloc 16
 	ldloc 5
 	clt
 	stloc 5
-// 0x010984e8: 0x10984e8: beq   v0, zero, 0x1098590 sll   zero, zero, 0
+// 0x01098b30: 0x1098b30: beq   v0, zero, 0x1098bd8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098590
+	brfalse L_1098bd8
 // --- basic block ---
-// 0x010984f0: 0x10984f0: beq   s1, zero, 0x1098590 sll   zero, zero, 0
+// 0x01098b38: 0x1098b38: beq   s1, zero, 0x1098bd8 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1098590
+	brfalse L_1098bd8
 // --- basic block ---
-// 0x010984f8: 0x10984f8: addiu s5, s1, -1
+// 0x01098b40: 0x1098b40: addiu s5, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x010984fc: 0x10984fc: lw    s7, 592(sp)
+// 0x01098b44: 0x1098b44: lw    s7, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4992,15 +4992,15 @@ L_10984dc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01098500: 0x1098500: j	 0x1098570 addu  s5, s4, s5
+// 0x01098b48: 0x1098b48: j	 0x1098bb8 addu  s5, s4, s5
 	ldloc 14
 	ldloc 10
 	add
 	stloc 10
-	br L_1098570
+	br L_1098bb8
 // --- basic block ---
-L_1098508:
-// 0x01098508: 0x1098508: lw    v1, 600(sp)
+L_1098b50:
+// 0x01098b50: 0x1098b50: lw    v1, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5009,54 +5009,54 @@ L_1098508:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109850c: 0x109850c: sll   zero, zero, 0
-// 0x01098510: 0x1098510: beq   v1, zero, 0x1098520 sltiu v0, s1, 3
+// 0x01098b54: 0x1098b54: sll   zero, zero, 0
+// 0x01098b58: 0x1098b58: beq   v1, zero, 0x1098b68 sltiu v0, s1, 3
 	ldloc 7
 	ldloc 8
 	ldc.i4.3
 	clt.un
 	stloc 5
-	brfalse L_1098520
+	brfalse L_1098b68
 // --- basic block ---
-// 0x01098518: 0x1098518: j	 0x1098534 addiu s7, s7, 1
+// 0x01098b60: 0x1098b60: j	 0x1098b7c addiu s7, s7, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-	br L_1098534
+	br L_1098b7c
 // --- basic block ---
-L_1098520:
-// 0x01098520: 0x1098520: bne   v0, zero, 0x1098534 sb    zero, 0(s5)
+L_1098b68:
+// 0x01098b68: 0x1098b68: bne   v0, zero, 0x1098b7c sb    zero, 0(s5)
 	ldloc 5
 	ldloc 10
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brtrue L_1098534
+	brtrue L_1098b7c
 // --- basic block ---
-// 0x01098528: 0x1098528: addiu a0, zero, 46
+// 0x01098b70: 0x1098b70: addiu a0, zero, 46
 	ldc.i4.s 46
 	stloc.1
-// 0x0109852c: 0x109852c: sb    a0, -1(s5)
+// 0x01098b74: 0x1098b74: sb    a0, -1(s5)
 	ldloc 10
 	ldc.i4.m1
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01098530: 0x1098530: sb    a0, -2(s5)
+// 0x01098b78: 0x1098b78: sb    a0, -2(s5)
 	ldloc 10
 	ldc.i4.s -2
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1098534:
-// 0x01098534: 0x1098534: lw    a1, 0(s2)
+L_1098b7c:
+// 0x01098b7c: 0x1098b7c: lw    a1, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01098538: 0x1098538: lw    v1, 584(sp)
+// 0x01098b80: 0x1098b80: lw    v1, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5065,27 +5065,27 @@ L_1098534:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109853c: 0x109853c: addiu v0, sp, 52
+// 0x01098b84: 0x1098b84: addiu v0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 5
-// 0x01098540: 0x1098540: addu  a0, s4, s7
+// 0x01098b88: 0x1098b88: addu  a0, s4, s7
 	ldloc 14
 	ldloc 12
 	add
 	stloc.1
-// 0x01098544: 0x1098544: addiu a2, sp, 44
+// 0x01098b8c: 0x1098b8c: addiu a2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.3
-// 0x01098548: 0x1098548: addiu a3, sp, 48
+// 0x01098b90: 0x1098b90: addiu a3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 4
-// 0x0109854c: 0x109854c: sw    v0, 16(sp)
+// 0x01098b94: 0x1098b94: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5094,7 +5094,7 @@ L_1098534:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098550: 0x1098550: sw    zero, 20(sp)
+// 0x01098b98: 0x1098b98: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5103,7 +5103,7 @@ L_1098534:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01098554: 0x1098554: jal   0x104ec44 sw    v1, 24(sp)
+// 0x01098b9c: 0x1098b9c: jal   0x104ec54 sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5117,12 +5117,12 @@ L_1098534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_formated_text_extents_104ec44(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_formated_text_extents_104ec54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109855c: 0x109855c: lw    v0, 44(sp)
+// 0x01098ba4: 0x1098ba4: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5131,16 +5131,16 @@ L_1098534:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098560: 0x1098560: sll   zero, zero, 0
-// 0x01098564: 0x1098564: beq   v0, zero, 0x10987e0 addiu s5, s5, -1
+// 0x01098ba8: 0x1098ba8: sll   zero, zero, 0
+// 0x01098bac: 0x1098bac: beq   v0, zero, 0x1098e28 addiu s5, s5, -1
 	ldloc 5
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-	brfalse L_10987e0
+	brfalse L_1098e28
 // --- basic block ---
-// 0x0109856c: 0x109856c: sw    v0, 32(sp)
+// 0x01098bb4: 0x1098bb4: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5149,8 +5149,8 @@ L_1098534:
 	add
 	ldloc 5
 	stelem.i4
-L_1098570:
-// 0x01098570: 0x1098570: lw    v0, 32(sp)
+L_1098bb8:
+// 0x01098bb8: 0x1098bb8: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5159,26 +5159,26 @@ L_1098570:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098574: 0x1098574: sll   zero, zero, 0
-// 0x01098578: 0x1098578: slt   v0, s8, v0
+// 0x01098bbc: 0x1098bbc: sll   zero, zero, 0
+// 0x01098bc0: 0x1098bc0: slt   v0, s8, v0
 	ldloc 16
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109857c: 0x109857c: beq   v0, zero, 0x109858c sll   zero, zero, 0
+// 0x01098bc4: 0x1098bc4: beq   v0, zero, 0x1098bd4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109858c
+	brfalse L_1098bd4
 // --- basic block ---
-// 0x01098584: 0x1098584: bne   s1, zero, 0x1098508 addiu s1, s1, -1
+// 0x01098bcc: 0x1098bcc: bne   s1, zero, 0x1098b50 addiu s1, s1, -1
 	ldloc 8
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-	brtrue L_1098508
+	brtrue L_1098b50
 // --- basic block ---
-L_109858c:
-// 0x0109858c: 0x109858c: sw    s7, 592(sp)
+L_1098bd4:
+// 0x01098bd4: 0x1098bd4: sw    s7, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5187,8 +5187,8 @@ L_109858c:
 	add
 	ldloc 12
 	stelem.i4
-L_1098590:
-// 0x01098590: 0x1098590: lw    v1, 36(sp)
+L_1098bd8:
+// 0x01098bd8: 0x1098bd8: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5197,7 +5197,7 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098594: 0x1098594: lw    a0, 40(sp)
+// 0x01098bdc: 0x1098bdc: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5206,7 +5206,7 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098598: 0x1098598: lw    v0, 24(s2)
+// 0x01098be0: 0x1098be0: lw    v0, 24(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5215,12 +5215,12 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109859c: 0x109859c: addu  a0, a0, v1
+// 0x01098be4: 0x1098be4: addu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-// 0x010985a0: 0x10985a0: jal   0x10c09ac addu  a0, a0, v0
+// 0x01098be8: 0x1098be8: jal   0x10c0fec addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
@@ -5230,31 +5230,31 @@ L_1098590:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010985a8: 0x10985a8: addu  a0, v0, zero
+// 0x01098bf0: 0x1098bf0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010985ac: 0x10985ac: lui   v0, 0x20000
+// 0x01098bf4: 0x1098bf4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010985b0: 0x10985b0: addiu v0, v0, 23688
+// 0x01098bf8: 0x1098bf8: addiu v0, v0, 24148
 	ldloc 5
-	ldc.i4 23688
+	ldc.i4 24148
 	add
 	stloc 5
-// 0x010985b4: 0x10985b4: lw    a1, 0(v0)
+// 0x01098bfc: 0x1098bfc: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010985b8: 0x10985b8: jal   0x10c0780 sll   zero, zero, 0
+// 0x01098c00: 0x1098c00: jal   0x10c0dc0 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010985c0: 0x10985c0: jal   0x10c08bc addu  a0, v0, zero
+// 0x01098c08: 0x1098c08: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -5262,7 +5262,7 @@ L_1098590:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x010985c8: 0x10985c8: lw    v1, 668(sp)
+// 0x01098c10: 0x1098c10: lw    v1, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5271,14 +5271,14 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010985cc: 0x10985cc: sll   zero, zero, 0
-// 0x010985d0: 0x10985d0: beq   v1, zero, 0x109868c addu  s1, v0, zero
+// 0x01098c14: 0x1098c14: sll   zero, zero, 0
+// 0x01098c18: 0x1098c18: beq   v1, zero, 0x1098cd4 addu  s1, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc 8
-	brfalse L_109868c
+	brfalse L_1098cd4
 // --- basic block ---
-// 0x010985d8: 0x10985d8: lw    a0, 604(sp)
+// 0x01098c20: 0x1098c20: lw    a0, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5287,7 +5287,7 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010985dc: 0x10985dc: lw    v0, 48(s3)
+// 0x01098c24: 0x1098c24: lw    v0, 48(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5296,14 +5296,14 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010985e0: 0x10985e0: lw    v1, 0(a0)
+// 0x01098c28: 0x1098c28: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010985e4: 0x10985e4: lw    a0, 60(sp)
+// 0x01098c2c: 0x1098c2c: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5312,17 +5312,17 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010985e8: 0x10985e8: andi  v0, v0, 1
+// 0x01098c30: 0x1098c30: andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010985ec: 0x10985ec: addu  a0, a0, s1
+// 0x01098c34: 0x1098c34: addu  a0, a0, s1
 	ldloc.1
 	ldloc 8
 	add
 	stloc.1
-// 0x010985f0: 0x10985f0: sw    a0, 60(sp)
+// 0x01098c38: 0x1098c38: sw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5331,7 +5331,7 @@ L_1098590:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010985f4: 0x10985f4: beq   v0, zero, 0x1098628 sw    v1, 56(sp)
+// 0x01098c3c: 0x1098c3c: beq   v0, zero, 0x1098c70 sw    v1, 56(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5341,9 +5341,9 @@ L_1098590:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1098628
+	brfalse L_1098c70
 // --- basic block ---
-// 0x010985fc: 0x10985fc: jal   0x109a424 addu  a0, zero, zero
+// 0x01098c44: 0x1098c44: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5351,12 +5351,12 @@ L_1098590:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098604: 0x1098604: lw    a0, 32(sp)
+// 0x01098c4c: 0x1098c4c: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5365,20 +5365,20 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098608: 0x1098608: addiu v0, zero, 2
+// 0x01098c50: 0x1098c50: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0109860c: 0x109860c: subu  a0, s8, a0
+// 0x01098c54: 0x1098c54: subu  a0, s8, a0
 	ldloc 16
 	ldloc.1
 	sub
 	stloc.1
-// 0x01098610: 0x1098610: div   a0, v0
+// 0x01098c58: 0x1098c58: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 17
-// 0x01098614: 0x1098614: lw    v1, 56(sp)
+// 0x01098c5c: 0x1098c5c: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5387,15 +5387,15 @@ L_1098590:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098618: 0x1098618: mflo  lo
+// 0x01098c60: 0x1098c60: mflo  lo
 	ldloc 17
 	stloc.1
-// 0x0109861c: 0x109861c: addu  v1, v1, a0
+// 0x01098c64: 0x1098c64: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01098620: 0x1098620: j	 0x1098650 sw    v1, 56(sp)
+// 0x01098c68: 0x1098c68: j	 0x1098c98 sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5404,10 +5404,10 @@ L_1098590:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1098650
+	br L_1098c98
 // --- basic block ---
-L_1098628:
-// 0x01098628: 0x1098628: jal   0x109a424 addu  a0, zero, zero
+L_1098c70:
+// 0x01098c70: 0x1098c70: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5415,16 +5415,16 @@ L_1098628:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098630: 0x1098630: beq   v0, zero, 0x1098650 sll   zero, zero, 0
+// 0x01098c78: 0x1098c78: beq   v0, zero, 0x1098c98 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098650
+	brfalse L_1098c98
 // --- basic block ---
-// 0x01098638: 0x1098638: lw    v1, 56(sp)
+// 0x01098c80: 0x1098c80: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5433,7 +5433,7 @@ L_1098628:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109863c: 0x109863c: lw    v0, 32(sp)
+// 0x01098c84: 0x1098c84: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5442,18 +5442,18 @@ L_1098628:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098640: 0x1098640: sll   zero, zero, 0
-// 0x01098644: 0x1098644: subu  v0, v1, v0
+// 0x01098c88: 0x1098c88: sll   zero, zero, 0
+// 0x01098c8c: 0x1098c8c: subu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x01098648: 0x1098648: addu  v0, v0, s8
+// 0x01098c90: 0x1098c90: addu  v0, v0, s8
 	ldloc 5
 	ldloc 16
 	add
 	stloc 5
-// 0x0109864c: 0x109864c: sw    v0, 56(sp)
+// 0x01098c94: 0x1098c94: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5462,8 +5462,8 @@ L_1098628:
 	add
 	ldloc 5
 	stelem.i4
-L_1098650:
-// 0x01098650: 0x1098650: lw    v1, 588(sp)
+L_1098c98:
+// 0x01098c98: 0x1098c98: lw    v1, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5472,7 +5472,7 @@ L_1098650:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098654: 0x1098654: lw    a0, 612(sp)
+// 0x01098c9c: 0x1098c9c: lw    a0, 612(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5481,25 +5481,25 @@ L_1098650:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098658: 0x1098658: addu  v0, v1, s1
+// 0x01098ca0: 0x1098ca0: addu  v0, v1, s1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 5
-// 0x0109865c: 0x109865c: slt   v0, a0, v0
+// 0x01098ca4: 0x1098ca4: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x01098660: 0x1098660: bne   v0, zero, 0x109868c addiu a0, sp, 56
+// 0x01098ca8: 0x1098ca8: bne   v0, zero, 0x1098cd4 addiu a0, sp, 56
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-	brtrue L_109868c
+	brtrue L_1098cd4
 // --- basic block ---
-// 0x01098668: 0x1098668: lw    a1, 592(sp)
+// 0x01098cb0: 0x1098cb0: lw    a1, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5508,19 +5508,19 @@ L_1098650:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109866c: 0x109866c: lw    a3, 0(s2)
+// 0x01098cb4: 0x1098cb4: lw    a3, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01098670: 0x1098670: addu  v0, s4, a1
+// 0x01098cb8: 0x1098cb8: addu  v0, s4, a1
 	ldloc 14
 	ldloc.2
 	add
 	stloc 5
-// 0x01098674: 0x1098674: sw    v0, 20(sp)
+// 0x01098cbc: 0x1098cbc: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5529,7 +5529,7 @@ L_1098650:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098678: 0x1098678: lw    v0, 584(sp)
+// 0x01098cc0: 0x1098cc0: lw    v0, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5538,13 +5538,13 @@ L_1098650:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109867c: 0x109867c: addu  a1, zero, zero
+// 0x01098cc4: 0x1098cc4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01098680: 0x1098680: addu  a2, zero, zero
+// 0x01098cc8: 0x1098cc8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01098684: 0x1098684: jal   0x104e944 sw    v0, 16(sp)
+// 0x01098ccc: 0x1098ccc: jal   0x104e954 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5558,13 +5558,13 @@ L_1098650:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_formated_string_angle_104e944(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_formated_string_angle_104e954(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109868c:
-// 0x0109868c: 0x109868c: lw    v0, 104(s2)
+L_1098cd4:
+// 0x01098cd4: 0x1098cd4: lw    v0, 104(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5573,24 +5573,24 @@ L_109868c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098690: 0x1098690: sll   zero, zero, 0
-// 0x01098694: 0x1098694: beq   v0, zero, 0x1098710 slti  v0, s6, 5
+// 0x01098cd8: 0x1098cd8: sll   zero, zero, 0
+// 0x01098cdc: 0x1098cdc: beq   v0, zero, 0x1098d58 slti  v0, s6, 5
 	ldloc 5
 	ldloc 15
 	ldc.i4.5
 	clt
 	stloc 5
-	brfalse L_1098710
+	brfalse L_1098d58
 // --- basic block ---
-// 0x0109869c: 0x109869c: beq   v0, zero, 0x1098700 addiu v0, s6, 7
+// 0x01098ce4: 0x1098ce4: beq   v0, zero, 0x1098d48 addiu v0, s6, 7
 	ldloc 5
 	ldloc 15
 	ldc.i4.7
 	add
 	stloc 5
-	brfalse L_1098700
+	brfalse L_1098d48
 // --- basic block ---
-// 0x010986a4: 0x10986a4: lw    v1, 32(sp)
+// 0x01098cec: 0x1098cec: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5599,27 +5599,27 @@ L_109868c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010986a8: 0x10986a8: sll   v0, v0, 3
+// 0x01098cf0: 0x1098cf0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010986ac: 0x10986ac: addu  v0, s2, v0
+// 0x01098cf4: 0x1098cf4: addu  v0, s2, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x010986b0: 0x10986b0: sw    v1, 0(v0)
+// 0x01098cf8: 0x1098cf8: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010986b4: 0x10986b4: addiu v1, zero, 4
+// 0x01098cfc: 0x1098cfc: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 7
-// 0x010986b8: 0x10986b8: beq   s6, v1, 0x10986ec sw    s1, 4(v0)
+// 0x01098d00: 0x1098d00: beq   s6, v1, 0x1098d34 sw    s1, 4(v0)
 	ldloc 15
 	ldloc 7
 	ldloc 6
@@ -5630,71 +5630,71 @@ L_109868c:
 	add
 	ldloc 8
 	stelem.i4
-	beq  L_10986ec
+	beq  L_1098d34
 // --- basic block ---
-// 0x010986c0: 0x10986c0: lb    v0, 0(s0)
+// 0x01098d08: 0x1098d08: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010986c4: 0x10986c4: sll   zero, zero, 0
-// 0x010986c8: 0x10986c8: beq   v0, zero, 0x10986ec addiu v0, s6, 9
+// 0x01098d0c: 0x1098d0c: sll   zero, zero, 0
+// 0x01098d10: 0x1098d10: beq   v0, zero, 0x1098d34 addiu v0, s6, 9
 	ldloc 5
 	ldloc 15
 	ldc.i4.s 9
 	add
 	stloc 5
-	brfalse L_10986ec
+	brfalse L_1098d34
 // --- basic block ---
-// 0x010986d0: 0x10986d0: sll   v0, v0, 2
+// 0x01098d18: 0x1098d18: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010986d4: 0x10986d4: addu  v0, s2, v0
+// 0x01098d1c: 0x1098d1c: addu  v0, s2, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x010986d8: 0x10986d8: sw    s0, 0(v0)
+// 0x01098d20: 0x1098d20: sw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010986dc: 0x10986dc: lbu   v1, -1(s0)
+// 0x01098d24: 0x1098d24: lbu   v1, -1(s0)
 	ldloc 9
 	ldc.i4.m1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x010986e0: 0x10986e0: addu  v0, s2, s6
+// 0x01098d28: 0x1098d28: addu  v0, s2, s6
 	ldloc 11
 	ldloc 15
 	add
 	stloc 5
-// 0x010986e4: 0x10986e4: sb    v1, 52(v0)
+// 0x01098d2c: 0x1098d2c: sb    v1, 52(v0)
 	ldloc 5
 	ldc.i4.s 52
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010986e8: 0x10986e8: sb    zero, -1(s0)
+// 0x01098d30: 0x1098d30: sb    zero, -1(s0)
 	ldloc 9
 	ldc.i4.m1
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10986ec:
-// 0x010986ec: 0x10986ec: addiu s6, s6, 1
+L_1098d34:
+// 0x01098d34: 0x1098d34: addiu s6, s6, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x010986f0: 0x10986f0: addiu a0, zero, 1
+// 0x01098d38: 0x1098d38: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010986f4: 0x10986f4: sw    s6, 96(s2)
+// 0x01098d3c: 0x1098d3c: sw    s6, 96(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5703,7 +5703,7 @@ L_10986ec:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010986f8: 0x10986f8: j	 0x1098710 sw    a0, 100(s2)
+// 0x01098d40: 0x1098d40: j	 0x1098d58 sw    a0, 100(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5712,22 +5712,22 @@ L_10986ec:
 	add
 	ldloc.1
 	stelem.i4
-	br L_1098710
+	br L_1098d58
 // --- basic block ---
-L_1098700:
-// 0x01098700: 0x1098700: jal   0x1097b3c addu  a0, s3, zero
+L_1098d48:
+// 0x01098d48: 0x1098d48: jal   0x1098184 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::reset_line_cache_1097b3c(int32,int32,int32,int32)
+	call int32 Cibyl113::reset_line_cache_1098184(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098708: 0x1098708: sw    zero, 104(s2)
+// 0x01098d50: 0x1098d50: sw    zero, 104(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5736,7 +5736,7 @@ L_1098700:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109870c: 0x109870c: sw    zero, 100(s2)
+// 0x01098d54: 0x1098d54: sw    zero, 100(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5745,8 +5745,8 @@ L_1098700:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1098710:
-// 0x01098710: 0x1098710: lw    v0, 32(sp)
+L_1098d58:
+// 0x01098d58: 0x1098d58: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5755,7 +5755,7 @@ L_1098710:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098714: 0x1098714: lw    a1, 596(sp)
+// 0x01098d5c: 0x1098d5c: lw    a1, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5764,22 +5764,22 @@ L_1098710:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01098718: 0x1098718: sll   zero, zero, 0
-// 0x0109871c: 0x109871c: slt   v1, a1, v0
+// 0x01098d60: 0x1098d60: sll   zero, zero, 0
+// 0x01098d64: 0x1098d64: slt   v1, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 7
-// 0x01098720: 0x1098720: beq   v1, zero, 0x109872c sb    zero, 72(sp)
+// 0x01098d68: 0x1098d68: beq   v1, zero, 0x1098d74 sb    zero, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 72
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brfalse L_109872c
+	brfalse L_1098d74
 // --- basic block ---
-// 0x01098728: 0x1098728: sw    v0, 596(sp)
+// 0x01098d70: 0x1098d70: sw    v0, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5788,8 +5788,8 @@ L_1098710:
 	add
 	ldloc 5
 	stelem.i4
-L_109872c:
-// 0x0109872c: 0x109872c: lw    v0, 588(sp)
+L_1098d74:
+// 0x01098d74: 0x1098d74: lw    v0, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5798,13 +5798,13 @@ L_109872c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098730: 0x1098730: sll   zero, zero, 0
-// 0x01098734: 0x1098734: addu  v0, v0, s1
+// 0x01098d78: 0x1098d78: sll   zero, zero, 0
+// 0x01098d7c: 0x1098d7c: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x01098738: 0x1098738: sw    v0, 588(sp)
+// 0x01098d80: 0x1098d80: sw    v0, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5813,30 +5813,30 @@ L_109872c:
 	add
 	ldloc 5
 	stelem.i4
-L_109873c:
-// 0x0109873c: 0x109873c: lb    s5, 0(s0)
+L_1098d84:
+// 0x01098d84: 0x1098d84: lb    s5, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x01098740: 0x1098740: sll   zero, zero, 0
-// 0x01098744: 0x1098744: bne   s5, zero, 0x10982f0 addu  a0, s0, zero
+// 0x01098d88: 0x1098d88: sll   zero, zero, 0
+// 0x01098d8c: 0x1098d8c: bne   s5, zero, 0x1098938 addu  a0, s0, zero
 	ldloc 10
 	ldloc 9
 	stloc.1
-	brtrue L_10982f0
+	brtrue L_1098938
 // --- basic block ---
-// 0x0109874c: 0x109874c: lb    v0, 72(sp)
+// 0x01098d94: 0x1098d94: lb    v0, 72(sp)
 	ldloc.0
 	ldc.i4.s 72
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01098750: 0x1098750: sll   zero, zero, 0
-// 0x01098754: 0x1098754: bne   v0, zero, 0x10982f0 sll   zero, zero, 0
+// 0x01098d98: 0x1098d98: sll   zero, zero, 0
+// 0x01098d9c: 0x1098d9c: bne   v0, zero, 0x1098938 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10982f0
+	brtrue L_1098938
 // --- basic block ---
-// 0x0109875c: 0x109875c: lw    s1, 604(sp)
+// 0x01098da4: 0x1098da4: lw    s1, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5845,7 +5845,7 @@ L_109873c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01098760: 0x1098760: lw    v1, 596(sp)
+// 0x01098da8: 0x1098da8: lw    v1, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5854,25 +5854,25 @@ L_109873c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098764: 0x1098764: lw    v0, 0(s1)
+// 0x01098dac: 0x1098dac: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01098768: 0x1098768: sll   zero, zero, 0
-// 0x0109876c: 0x109876c: addiu v0, v0, -1
+// 0x01098db0: 0x1098db0: sll   zero, zero, 0
+// 0x01098db4: 0x1098db4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01098770: 0x1098770: addu  v0, v0, v1
+// 0x01098db8: 0x1098db8: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01098774: 0x1098774: sw    v0, 8(s1)
+// 0x01098dbc: 0x1098dbc: sw    v0, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5881,7 +5881,7 @@ L_109873c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098778: 0x1098778: lw    a0, 668(sp)
+// 0x01098dc0: 0x1098dc0: lw    a0, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5890,12 +5890,12 @@ L_109873c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109877c: 0x109877c: sll   zero, zero, 0
-// 0x01098780: 0x1098780: bne   a0, zero, 0x10987c0 sll   zero, zero, 0
+// 0x01098dc4: 0x1098dc4: sll   zero, zero, 0
+// 0x01098dc8: 0x1098dc8: bne   a0, zero, 0x1098e08 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10987c0
+	brtrue L_1098e08
 // --- basic block ---
-// 0x01098788: 0x1098788: lw    v0, 4(s3)
+// 0x01098dd0: 0x1098dd0: lw    v0, 4(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5904,12 +5904,12 @@ L_109873c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109878c: 0x109878c: sll   zero, zero, 0
-// 0x01098790: 0x1098790: beq   v0, zero, 0x10987c0 sll   zero, zero, 0
+// 0x01098dd4: 0x1098dd4: sll   zero, zero, 0
+// 0x01098dd8: 0x1098dd8: beq   v0, zero, 0x1098e08 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10987c0
+	brfalse L_1098e08
 // --- basic block ---
-// 0x01098798: 0x1098798: lw    v0, 28(v0)
+// 0x01098de0: 0x1098de0: lw    v0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5918,13 +5918,13 @@ L_109873c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109879c: 0x109879c: sll   zero, zero, 0
-// 0x010987a0: 0x10987a0: bltz  v0, 0x10987c0 sll   zero, zero, 0
+// 0x01098de4: 0x1098de4: sll   zero, zero, 0
+// 0x01098de8: 0x1098de8: bltz  v0, 0x1098e08 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	blt L_10987c0
+	blt L_1098e08
 // --- basic block ---
-// 0x010987a8: 0x10987a8: lw    a1, 588(sp)
+// 0x01098df0: 0x1098df0: lw    a1, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5933,17 +5933,17 @@ L_109873c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010987ac: 0x10987ac: sll   zero, zero, 0
-// 0x010987b0: 0x10987b0: slt   v1, v0, a1
+// 0x01098df4: 0x1098df4: sll   zero, zero, 0
+// 0x01098df8: 0x1098df8: slt   v1, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 7
-// 0x010987b4: 0x10987b4: beq   v1, zero, 0x10987c0 sll   zero, zero, 0
+// 0x01098dfc: 0x1098dfc: beq   v1, zero, 0x1098e08 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10987c0
+	brfalse L_1098e08
 // --- basic block ---
-// 0x010987bc: 0x10987bc: sw    v0, 588(sp)
+// 0x01098e04: 0x1098e04: sw    v0, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5952,8 +5952,8 @@ L_109873c:
 	add
 	ldloc 5
 	stelem.i4
-L_10987c0:
-// 0x010987c0: 0x10987c0: lw    v0, 4(s1)
+L_1098e08:
+// 0x01098e08: 0x1098e08: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5962,7 +5962,7 @@ L_10987c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010987c4: 0x10987c4: lw    v1, 588(sp)
+// 0x01098e0c: 0x1098e0c: lw    v1, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5971,17 +5971,17 @@ L_10987c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010987c8: 0x10987c8: addiu v0, v0, -1
+// 0x01098e10: 0x1098e10: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010987cc: 0x10987cc: addu  v0, v0, v1
+// 0x01098e14: 0x1098e14: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010987d0: 0x10987d0: j	 0x10987e0 sw    v0, 12(s1)
+// 0x01098e18: 0x1098e18: j	 0x1098e28 sw    v0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5990,20 +5990,20 @@ L_10987c0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10987e0
+	br L_1098e28
 // --- basic block ---
-L_10987d8:
-// 0x010987d8: 0x10987d8: j	 0x109836c addu  s7, s1, zero
+L_1098e20:
+// 0x01098e20: 0x1098e20: j	 0x10989b4 addu  s7, s1, zero
 	ldloc 8
 	stloc 12
-	br L_109836c
+	br L_10989b4
 // --- basic block ---
-L_10987e0:
-// 0x010987e0: 0x10987e0: lw    ra, 660(sp)
-// 0x010987e4: 0x10987e4: addu  v0, zero, zero
+L_1098e28:
+// 0x01098e28: 0x1098e28: lw    ra, 660(sp)
+// 0x01098e2c: 0x1098e2c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010987e8: 0x10987e8: lw    s8, 656(sp)
+// 0x01098e30: 0x1098e30: lw    s8, 656(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6012,7 +6012,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010987ec: 0x10987ec: lw    s7, 652(sp)
+// 0x01098e34: 0x1098e34: lw    s7, 652(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6021,7 +6021,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010987f0: 0x10987f0: lw    s6, 648(sp)
+// 0x01098e38: 0x1098e38: lw    s6, 648(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6030,7 +6030,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010987f4: 0x10987f4: lw    s5, 644(sp)
+// 0x01098e3c: 0x1098e3c: lw    s5, 644(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6039,7 +6039,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010987f8: 0x10987f8: lw    s4, 640(sp)
+// 0x01098e40: 0x1098e40: lw    s4, 640(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6048,7 +6048,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010987fc: 0x10987fc: lw    s3, 636(sp)
+// 0x01098e44: 0x1098e44: lw    s3, 636(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6057,7 +6057,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01098800: 0x1098800: lw    s2, 632(sp)
+// 0x01098e48: 0x1098e48: lw    s2, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6066,7 +6066,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01098804: 0x1098804: lw    s1, 628(sp)
+// 0x01098e4c: 0x1098e4c: lw    s1, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6075,7 +6075,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01098808: 0x1098808: lw    s0, 624(sp)
+// 0x01098e50: 0x1098e50: lw    s0, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6084,7 +6084,7 @@ L_10987e0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109880c: 0x109880c: jr    ra addiu sp, sp, 664
+// 0x01098e54: 0x1098e54: jr    ra addiu sp, sp, 664
 	ldloc.0
 	ldc.i4 664
 	add
@@ -6096,7 +6096,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_1098814(int32,int32,int32,int32,int32)
+.method public static int32 draw_1098e5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -6149,7 +6149,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098814: 0x1098814: lw    v0, 20(a0)
+// 0x01098e5c: 0x1098e5c: lw    v0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6158,12 +6158,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098818: 0x1098818: addiu sp, sp, -56
+// 0x01098e60: 0x1098e60: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0109881c: 0x109881c: sw    s5, 48(sp)
+// 0x01098e64: 0x1098e64: sw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6172,7 +6172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01098820: 0x1098820: sw    s3, 40(sp)
+// 0x01098e68: 0x1098e68: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6181,7 +6181,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01098824: 0x1098824: sw    s1, 32(sp)
+// 0x01098e6c: 0x1098e6c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6190,7 +6190,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01098828: 0x1098828: sw    s0, 28(sp)
+// 0x01098e70: 0x1098e70: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6199,8 +6199,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109882c: 0x109882c: sw    ra, 52(sp)
-// 0x01098830: 0x1098830: sw    s4, 44(sp)
+// 0x01098e74: 0x1098e74: sw    ra, 52(sp)
+// 0x01098e78: 0x1098e78: sw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6209,7 +6209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01098834: 0x1098834: sw    s2, 36(sp)
+// 0x01098e7c: 0x1098e7c: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6218,13 +6218,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01098838: 0x1098838: addu  s0, a0, zero
+// 0x01098e80: 0x1098e80: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0109883c: 0x109883c: addu  s1, a1, zero
+// 0x01098e84: 0x1098e84: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01098840: 0x1098840: lw    s3, 164(a0)
+// 0x01098e88: 0x1098e88: lw    s3, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6233,13 +6233,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01098844: 0x1098844: beq   v0, zero, 0x1098978 addu  s5, a2, zero
+// 0x01098e8c: 0x1098e8c: beq   v0, zero, 0x1098fc0 addu  s5, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 13
-	brfalse L_1098978
+	brfalse L_1098fc0
 // --- basic block ---
-// 0x0109884c: 0x109884c: lw    v0, 4(a0)
+// 0x01098e94: 0x1098e94: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6248,12 +6248,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098850: 0x1098850: sll   zero, zero, 0
-// 0x01098854: 0x1098854: beq   v0, zero, 0x1098978 sll   zero, zero, 0
+// 0x01098e98: 0x1098e98: sll   zero, zero, 0
+// 0x01098e9c: 0x1098e9c: beq   v0, zero, 0x1098fc0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098978
+	brfalse L_1098fc0
 // --- basic block ---
-// 0x0109885c: 0x109885c: lw    v1, 12(s3)
+// 0x01098ea4: 0x1098ea4: lw    v1, 12(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6262,12 +6262,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098860: 0x1098860: sll   zero, zero, 0
-// 0x01098864: 0x1098864: beq   v1, zero, 0x1098978 sll   zero, zero, 0
+// 0x01098ea8: 0x1098ea8: sll   zero, zero, 0
+// 0x01098eac: 0x1098eac: beq   v1, zero, 0x1098fc0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1098978
+	brfalse L_1098fc0
 // --- basic block ---
-// 0x0109886c: 0x109886c: lw    v1, 16(s3)
+// 0x01098eb4: 0x1098eb4: lw    v1, 16(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6276,12 +6276,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098870: 0x1098870: sll   zero, zero, 0
-// 0x01098874: 0x1098874: bne   v1, zero, 0x1098978 sll   zero, zero, 0
+// 0x01098eb8: 0x1098eb8: sll   zero, zero, 0
+// 0x01098ebc: 0x1098ebc: bne   v1, zero, 0x1098fc0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1098978
+	brtrue L_1098fc0
 // --- basic block ---
-// 0x0109887c: 0x109887c: lw    s2, 28(v0)
+// 0x01098ec4: 0x1098ec4: lw    s2, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6290,13 +6290,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01098880: 0x1098880: sll   zero, zero, 0
-// 0x01098884: 0x1098884: bgtz  s2, 0x109889c sll   zero, zero, 0
+// 0x01098ec8: 0x1098ec8: sll   zero, zero, 0
+// 0x01098ecc: 0x1098ecc: bgtz  s2, 0x1098ee4 sll   zero, zero, 0
 	ldloc 10
 	ldc.i4.s 0
-	bgt L_109889c
+	bgt L_1098ee4
 // --- basic block ---
-// 0x0109888c: 0x109888c: lw    s2, 36(v0)
+// 0x01098ed4: 0x1098ed4: lw    s2, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6305,48 +6305,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01098890: 0x1098890: sll   zero, zero, 0
-// 0x01098894: 0x1098894: blez  s2, 0x1098978 sll   zero, zero, 0
+// 0x01098ed8: 0x1098ed8: sll   zero, zero, 0
+// 0x01098edc: 0x1098edc: blez  s2, 0x1098fc0 sll   zero, zero, 0
 	ldloc 10
 	ldc.i4.s 0
-	ble L_1098978
+	ble L_1098fc0
 // --- basic block ---
-L_109889c:
-// 0x0109889c: 0x109889c: jal   0x10c09c0 addu  a0, s2, zero
+L_1098ee4:
+// 0x01098ee4: 0x1098ee4: jal   0x10c1000 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010988a4: 0x10988a4: lui   a0, 0x20000
+// 0x01098eec: 0x1098eec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010988a8: 0x10988a8: lw    a3, 23764(a0)
+// 0x01098ef0: 0x1098ef0: lw    a3, 24228(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5941
+	ldc.i4 6057
 	add
 	ldelem.i4
 	stloc 4
-// 0x010988ac: 0x10988ac: lw    a2, 23760(a0)
+// 0x01098ef4: 0x1098ef4: lw    a2, 24224(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5940
+	ldc.i4 6056
 	add
 	ldelem.i4
 	stloc.3
-// 0x010988b0: 0x10988b0: addu  a1, v1, zero
+// 0x01098ef8: 0x1098ef8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010988b4: 0x10988b4: jal   0x10c06e8 addu  a0, v0, zero
+// 0x01098efc: 0x1098efc: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6354,36 +6354,36 @@ L_109889c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010988bc: 0x10988bc: lui   a0, 0x20000
+// 0x01098f04: 0x1098f04: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010988c0: 0x10988c0: lw    a3, 23716(a0)
+// 0x01098f08: 0x1098f08: lw    a3, 24180(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5929
+	ldc.i4 6045
 	add
 	ldelem.i4
 	stloc 4
-// 0x010988c4: 0x10988c4: lw    a2, 23712(a0)
+// 0x01098f0c: 0x1098f0c: lw    a2, 24176(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5928
+	ldc.i4 6044
 	add
 	ldelem.i4
 	stloc.3
-// 0x010988c8: 0x10988c8: addu  a1, v1, zero
+// 0x01098f10: 0x1098f10: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010988cc: 0x10988cc: jal   0x10c0798 addu  a0, v0, zero
+// 0x01098f14: 0x1098f14: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6391,70 +6391,70 @@ L_109889c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010988d4: 0x10988d4: addu  a1, v1, zero
+// 0x01098f1c: 0x1098f1c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010988d8: 0x10988d8: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01098f20: 0x1098f20: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010988e0: 0x10988e0: jal   0x101fa28 addu  s4, v0, zero
+// 0x01098f28: 0x1098f28: jal   0x101fa38 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010988e8: 0x10988e8: beq   v0, zero, 0x1098920 sll   zero, zero, 0
+// 0x01098f30: 0x1098f30: beq   v0, zero, 0x1098f68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098920
+	brfalse L_1098f68
 // --- basic block ---
-// 0x010988f0: 0x10988f0: jal   0x10c09c0 addu  a0, s4, zero
+// 0x01098f38: 0x1098f38: jal   0x10c1000 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010988f8: 0x10988f8: lui   a0, 0x20000
+// 0x01098f40: 0x1098f40: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010988fc: 0x10988fc: lw    a3, 23804(a0)
+// 0x01098f44: 0x1098f44: lw    a3, 24268(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5951
+	ldc.i4 6067
 	add
 	ldelem.i4
 	stloc 4
-// 0x01098900: 0x1098900: lw    a2, 23800(a0)
+// 0x01098f48: 0x1098f48: lw    a2, 24264(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5950
+	ldc.i4 6066
 	add
 	ldelem.i4
 	stloc.3
-// 0x01098904: 0x1098904: addu  a1, v1, zero
+// 0x01098f4c: 0x1098f4c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01098908: 0x1098908: jal   0x10c0798 addu  a0, v0, zero
+// 0x01098f50: 0x1098f50: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6462,66 +6462,66 @@ L_109889c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098910: 0x1098910: addu  a0, v0, zero
+// 0x01098f58: 0x1098f58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01098914: 0x1098914: jal   0x10c08d0 addu  a1, v1, zero
+// 0x01098f5c: 0x1098f5c: jal   0x10c0f10 addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109891c: 0x109891c: addu  s4, v0, zero
+// 0x01098f64: 0x1098f64: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-L_1098920:
-// 0x01098920: 0x1098920: jal   0x10c09c0 subu  a0, s2, s4
+L_1098f68:
+// 0x01098f68: 0x1098f68: jal   0x10c1000 subu  a0, s2, s4
 	ldloc 10
 	ldloc 12
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098928: 0x1098928: lui   a0, 0x20000
+// 0x01098f70: 0x1098f70: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109892c: 0x109892c: lw    a3, 23764(a0)
+// 0x01098f74: 0x1098f74: lw    a3, 24228(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5941
+	ldc.i4 6057
 	add
 	ldelem.i4
 	stloc 4
-// 0x01098930: 0x1098930: lw    a2, 23760(a0)
+// 0x01098f78: 0x1098f78: lw    a2, 24224(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5940
+	ldc.i4 6056
 	add
 	ldelem.i4
 	stloc.3
-// 0x01098934: 0x1098934: addu  a1, v1, zero
+// 0x01098f7c: 0x1098f7c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01098938: 0x1098938: jal   0x10c06e8 addu  a0, v0, zero
+// 0x01098f80: 0x1098f80: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6529,36 +6529,36 @@ L_1098920:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098940: 0x1098940: lui   a0, 0x20000
+// 0x01098f88: 0x1098f88: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01098944: 0x1098944: lw    a3, 23716(a0)
+// 0x01098f8c: 0x1098f8c: lw    a3, 24180(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5929
+	ldc.i4 6045
 	add
 	ldelem.i4
 	stloc 4
-// 0x01098948: 0x1098948: lw    a2, 23712(a0)
+// 0x01098f90: 0x1098f90: lw    a2, 24176(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5928
+	ldc.i4 6044
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109894c: 0x109894c: addu  a1, v1, zero
+// 0x01098f94: 0x1098f94: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01098950: 0x1098950: jal   0x10c0798 addu  a0, v0, zero
+// 0x01098f98: 0x1098f98: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6566,33 +6566,33 @@ L_1098920:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098958: 0x1098958: addu  a1, v1, zero
+// 0x01098fa0: 0x1098fa0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0109895c: 0x109895c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01098fa4: 0x1098fa4: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098964: 0x1098964: sw    s4, 0(s3)
+// 0x01098fac: 0x1098fac: sw    s4, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x01098968: 0x1098968: sw    v0, 44(s0)
+// 0x01098fb0: 0x1098fb0: sw    v0, 44(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6601,7 +6601,7 @@ L_1098920:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109896c: 0x109896c: sw    v0, 40(s0)
+// 0x01098fb4: 0x1098fb4: sw    v0, 40(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6610,10 +6610,10 @@ L_1098920:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098970: 0x1098970: addiu v0, zero, 1
+// 0x01098fb8: 0x1098fb8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01098974: 0x1098974: sw    v0, 16(s3)
+// 0x01098fbc: 0x1098fbc: sw    v0, 16(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6622,19 +6622,19 @@ L_1098920:
 	add
 	ldloc 5
 	stelem.i4
-L_1098978:
-// 0x01098978: 0x1098978: andi  s5, s5, 1
+L_1098fc0:
+// 0x01098fc0: 0x1098fc0: andi  s5, s5, 1
 	ldloc 13
 	ldc.i4.1
 	and
 	stloc 13
-// 0x0109897c: 0x109897c: beq   s5, zero, 0x1098a00 lui   v0, 0x10000
+// 0x01098fc4: 0x1098fc4: beq   s5, zero, 0x1099048 lui   v0, 0x10000
 	ldloc 13
 	ldc.i4 65536
 	stloc 5
-	brfalse L_1098a00
+	brfalse L_1099048
 // --- basic block ---
-// 0x01098984: 0x1098984: lw    v1, 48(s0)
+// 0x01098fcc: 0x1098fcc: lw    v1, 48(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6643,19 +6643,19 @@ L_1098978:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098988: 0x1098988: sll   zero, zero, 0
-// 0x0109898c: 0x109898c: and   v0, v1, v0
+// 0x01098fd0: 0x1098fd0: sll   zero, zero, 0
+// 0x01098fd4: 0x1098fd4: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01098990: 0x1098990: beq   v0, zero, 0x10989ec addu  a0, s0, zero
+// 0x01098fd8: 0x1098fd8: beq   v0, zero, 0x1099034 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brfalse L_10989ec
+	brfalse L_1099034
 // --- basic block ---
-// 0x01098998: 0x1098998: jal   0x109a424 addu  a0, zero, zero
+// 0x01098fe0: 0x1098fe0: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6663,27 +6663,27 @@ L_1098978:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010989a0: 0x10989a0: bne   v0, zero, 0x10989bc lui   v0, 0x80000
+// 0x01098fe8: 0x1098fe8: bne   v0, zero, 0x1099004 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10989bc
+	brtrue L_1099004
 // --- basic block ---
-// 0x010989a8: 0x10989a8: lw    v0, 9796(v0)
+// 0x01098ff0: 0x1098ff0: lw    v0, 10260(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2449
+	ldc.i4 2565
 	add
 	ldelem.i4
 	stloc 5
-// 0x010989ac: 0x10989ac: lw    v1, 8(s1)
+// 0x01098ff4: 0x1098ff4: lw    v1, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6692,13 +6692,13 @@ L_1098978:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010989b0: 0x10989b0: sll   zero, zero, 0
-// 0x010989b4: 0x10989b4: subu  v0, v1, v0
+// 0x01098ff8: 0x1098ff8: sll   zero, zero, 0
+// 0x01098ffc: 0x1098ffc: subu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x010989b8: 0x10989b8: sw    v0, 8(s1)
+// 0x01099000: 0x1099000: sw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6707,8 +6707,8 @@ L_1098978:
 	add
 	ldloc 5
 	stelem.i4
-L_10989bc:
-// 0x010989bc: 0x10989bc: lw    v0, 20(s0)
+L_1099004:
+// 0x01099004: 0x1099004: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6717,30 +6717,30 @@ L_10989bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010989c0: 0x10989c0: sll   zero, zero, 0
-// 0x010989c4: 0x10989c4: lb    v0, 0(v0)
+// 0x01099008: 0x1099008: sll   zero, zero, 0
+// 0x0109900c: 0x109900c: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010989c8: 0x10989c8: sll   zero, zero, 0
-// 0x010989cc: 0x10989cc: bne   v0, zero, 0x10989e8 sll   zero, zero, 0
+// 0x01099010: 0x1099010: sll   zero, zero, 0
+// 0x01099014: 0x1099014: bne   v0, zero, 0x1099030 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10989e8
+	brtrue L_1099030
 // --- basic block ---
-// 0x010989d4: 0x10989d4: lw    v0, 0(s1)
+// 0x0109901c: 0x109901c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010989d8: 0x10989d8: sll   zero, zero, 0
-// 0x010989dc: 0x10989dc: addiu v0, v0, 1
+// 0x01099020: 0x1099020: sll   zero, zero, 0
+// 0x01099024: 0x1099024: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010989e0: 0x10989e0: j	 0x1098b24 sw    v0, 8(s1)
+// 0x01099028: 0x1099028: j	 0x109916c sw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6749,17 +6749,17 @@ L_10989bc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1098b24
+	br L_109916c
 // --- basic block ---
-L_10989e8:
-// 0x010989e8: 0x10989e8: addu  a0, s0, zero
+L_1099030:
+// 0x01099030: 0x1099030: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_10989ec:
-// 0x010989ec: 0x10989ec: addu  a2, s1, zero
+L_1099034:
+// 0x01099034: 0x1099034: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010989f0: 0x10989f0: jal   0x1097f94 addu  a1, zero, zero
+// 0x01099038: 0x1099038: jal   0x10985dc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6767,16 +6767,16 @@ L_10989ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::format_text_1097f94(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::format_text_10985dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010989f8: 0x10989f8: j	 0x1098b24 sll   zero, zero, 0
-	br L_1098b24
+// 0x01099040: 0x1099040: j	 0x109916c sll   zero, zero, 0
+	br L_109916c
 // --- basic block ---
-L_1098a00:
-// 0x01098a00: 0x1098a00: lw    v0, 4(s1)
+L_1099048:
+// 0x01099048: 0x1099048: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6785,24 +6785,24 @@ L_1098a00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098a04: 0x1098a04: lui   v1, 0x80000
+// 0x0109904c: 0x109904c: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01098a08: 0x1098a08: addiu v0, v0, -2
+// 0x01099050: 0x1099050: addiu v0, v0, -2
 	ldloc 5
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x01098a0c: 0x1098a0c: lw    a0, 9808(v1)
+// 0x01099054: 0x1099054: lw    a0, 10272(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2452
+	ldc.i4 2568
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098a10: 0x1098a10: jal   0x104e35c sw    v0, 4(s1)
+// 0x01099058: 0x1099058: jal   0x104e36c sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6816,12 +6816,12 @@ L_1098a00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098a18: 0x1098a18: lw    v0, 104(s0)
+// 0x01099060: 0x1099060: lw    v0, 104(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6830,25 +6830,25 @@ L_1098a00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098a1c: 0x1098a1c: sll   zero, zero, 0
-// 0x01098a20: 0x1098a20: bne   v0, zero, 0x1098a30 sll   zero, zero, 0
+// 0x01099064: 0x1099064: sll   zero, zero, 0
+// 0x01099068: 0x1099068: bne   v0, zero, 0x1099078 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1098a30
+	brtrue L_1099078
 // --- basic block ---
-// 0x01098a28: 0x1098a28: lui   v0, 0x20000
+// 0x01099070: 0x1099070: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01098a2c: 0x1098a2c: lw    v0, 29620(v0)
+// 0x01099074: 0x1099074: lw    v0, 30084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7405
+	ldc.i4 7521
 	add
 	ldelem.i4
 	stloc 5
-L_1098a30:
-// 0x01098a30: 0x1098a30: lw    v1, 4(s0)
+L_1099078:
+// 0x01099078: 0x1099078: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6857,14 +6857,14 @@ L_1098a30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098a34: 0x1098a34: sll   zero, zero, 0
-// 0x01098a38: 0x1098a38: beq   v1, zero, 0x1098a64 addu  a0, v0, zero
+// 0x0109907c: 0x109907c: sll   zero, zero, 0
+// 0x01099080: 0x1099080: beq   v1, zero, 0x10990ac addu  a0, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brfalse L_1098a64
+	brfalse L_10990ac
 // --- basic block ---
-// 0x01098a40: 0x1098a40: lw    v1, 60(v1)
+// 0x01099088: 0x1099088: lw    v1, 60(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6873,12 +6873,12 @@ L_1098a30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098a44: 0x1098a44: sll   zero, zero, 0
-// 0x01098a48: 0x1098a48: beq   v1, zero, 0x1098a64 sll   zero, zero, 0
+// 0x0109908c: 0x109908c: sll   zero, zero, 0
+// 0x01099090: 0x1099090: beq   v1, zero, 0x10990ac sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1098a64
+	brfalse L_10990ac
 // --- basic block ---
-// 0x01098a50: 0x1098a50: lw    a0, 108(s0)
+// 0x01099098: 0x1099098: lw    a0, 108(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6887,33 +6887,33 @@ L_1098a30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098a54: 0x1098a54: sll   zero, zero, 0
-// 0x01098a58: 0x1098a58: bne   a0, zero, 0x1098a64 sll   zero, zero, 0
+// 0x0109909c: 0x109909c: sll   zero, zero, 0
+// 0x010990a0: 0x10990a0: bne   a0, zero, 0x10990ac sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1098a64
+	brtrue L_10990ac
 // --- basic block ---
-// 0x01098a60: 0x1098a60: addu  a0, v0, zero
+// 0x010990a8: 0x10990a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_1098a64:
-// 0x01098a64: 0x1098a64: jal   0x104edb0 sll   zero, zero, 0
+L_10990ac:
+// 0x010990ac: 0x10990ac: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098a6c: 0x1098a6c: addu  a0, s0, zero
+// 0x010990b4: 0x10990b4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01098a70: 0x1098a70: addiu a1, zero, 1
+// 0x010990b8: 0x10990b8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01098a74: 0x1098a74: jal   0x1097f94 addu  a2, s1, zero
+// 0x010990bc: 0x10990bc: jal   0x10985dc addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -6921,12 +6921,12 @@ L_1098a64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::format_text_1097f94(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::format_text_10985dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098a7c: 0x1098a7c: lw    v0, 4(s0)
+// 0x010990c4: 0x10990c4: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6935,14 +6935,14 @@ L_1098a64:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098a80: 0x1098a80: sll   zero, zero, 0
-// 0x01098a84: 0x1098a84: beq   v0, zero, 0x1098b14 lui   v0, 0x10000
+// 0x010990c8: 0x10990c8: sll   zero, zero, 0
+// 0x010990cc: 0x10990cc: beq   v0, zero, 0x109915c lui   v0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	brfalse L_1098b14
+	brfalse L_109915c
 // --- basic block ---
-// 0x01098a8c: 0x1098a8c: lw    v1, 48(s0)
+// 0x010990d4: 0x10990d4: lw    v1, 48(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6951,27 +6951,27 @@ L_1098a64:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098a90: 0x1098a90: sll   zero, zero, 0
-// 0x01098a94: 0x1098a94: and   v0, v1, v0
+// 0x010990d8: 0x10990d8: sll   zero, zero, 0
+// 0x010990dc: 0x10990dc: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01098a98: 0x1098a98: beq   v0, zero, 0x1098b14 lui   a2, 0x20000
+// 0x010990e0: 0x10990e0: beq   v0, zero, 0x109915c lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brfalse L_1098b14
+	brfalse L_109915c
 // --- basic block ---
-// 0x01098aa0: 0x1098aa0: addu  a0, zero, zero
+// 0x010990e8: 0x10990e8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01098aa4: 0x1098aa4: addiu a2, a2, -2816
+// 0x010990ec: 0x10990ec: addiu a2, a2, -2352
 	ldloc.3
-	ldc.i4 -2816
+	ldc.i4 -2352
 	add
 	stloc.3
-// 0x01098aa8: 0x1098aa8: jal   0x10a1918 addiu a1, zero, 1
+// 0x010990f0: 0x10990f0: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6979,12 +6979,12 @@ L_1098a64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098ab0: 0x1098ab0: lw    v1, 4(s0)
+// 0x010990f8: 0x10990f8: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6993,13 +6993,13 @@ L_1098a64:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098ab4: 0x1098ab4: addu  s2, v0, zero
+// 0x010990fc: 0x10990fc: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01098ab8: 0x1098ab8: lui   v0, 0x80000
+// 0x01099100: 0x1099100: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01098abc: 0x1098abc: lw    a0, 28(v1)
+// 0x01099104: 0x1099104: lw    a0, 28(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7008,16 +7008,16 @@ L_1098a64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098ac0: 0x1098ac0: lw    v0, 9800(v0)
+// 0x01099108: 0x1099108: lw    v0, 10264(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2450
+	ldc.i4 2566
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098ac4: 0x1098ac4: lw    v1, 124(v1)
+// 0x0109910c: 0x109910c: lw    v1, 124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7026,25 +7026,25 @@ L_1098a64:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098ac8: 0x1098ac8: subu  v0, a0, v0
+// 0x01099110: 0x1099110: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01098acc: 0x1098acc: sra   v0, v0, 1
+// 0x01099114: 0x1099114: sra   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shr
 	stloc 5
-// 0x01098ad0: 0x1098ad0: addu  v0, v0, v1
+// 0x01099118: 0x1099118: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01098ad4: 0x1098ad4: addu  a0, zero, zero
+// 0x0109911c: 0x109911c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01098ad8: 0x1098ad8: jal   0x109a424 sw    v0, 20(sp)
+// 0x01099120: 0x1099120: jal   0x109aa6c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7058,42 +7058,42 @@ L_1098a64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098ae0: 0x1098ae0: beq   v0, zero, 0x1098af8 lui   v0, 0x80000
+// 0x01099128: 0x1099128: beq   v0, zero, 0x1099140 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1098af8
+	brfalse L_1099140
 // --- basic block ---
-// 0x01098ae8: 0x1098ae8: lw    v0, 9796(v0)
+// 0x01099130: 0x1099130: lw    v0, 10260(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2449
+	ldc.i4 2565
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098aec: 0x1098aec: lw    v1, 0(s1)
+// 0x01099134: 0x1099134: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01098af0: 0x1098af0: j	 0x1098afc subu  v0, v1, v0
+// 0x01099138: 0x1099138: j	 0x1099144 subu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-	br L_1098afc
+	br L_1099144
 // --- basic block ---
-L_1098af8:
-// 0x01098af8: 0x1098af8: lw    v0, 8(s1)
+L_1099140:
+// 0x01099140: 0x1099140: lw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7102,22 +7102,22 @@ L_1098af8:
 	add
 	ldelem.i4
 	stloc 5
-L_1098afc:
-// 0x01098afc: 0x1098afc: addu  a0, s2, zero
+L_1099144:
+// 0x01099144: 0x1099144: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01098b00: 0x1098b00: addiu a1, sp, 16
+// 0x01099148: 0x1099148: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01098b04: 0x1098b04: addu  a2, zero, zero
+// 0x0109914c: 0x109914c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01098b08: 0x1098b08: addu  a3, zero, zero
+// 0x01099150: 0x1099150: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01098b0c: 0x1098b0c: jal   0x104f4a8 sw    v0, 16(sp)
+// 0x01099154: 0x1099154: jal   0x104f4b8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7131,13 +7131,13 @@ L_1098afc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1098b14:
-// 0x01098b14: 0x1098b14: lw    v0, 4(s1)
+L_109915c:
+// 0x0109915c: 0x109915c: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7146,13 +7146,13 @@ L_1098b14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098b18: 0x1098b18: sll   zero, zero, 0
-// 0x01098b1c: 0x1098b1c: addiu v0, v0, 2
+// 0x01099160: 0x1099160: sll   zero, zero, 0
+// 0x01099164: 0x1099164: addiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 5
-// 0x01098b20: 0x1098b20: sw    v0, 4(s1)
+// 0x01099168: 0x1099168: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7161,9 +7161,9 @@ L_1098b14:
 	add
 	ldloc 5
 	stelem.i4
-L_1098b24:
-// 0x01098b24: 0x1098b24: lw    ra, 52(sp)
-// 0x01098b28: 0x1098b28: lw    s5, 48(sp)
+L_109916c:
+// 0x0109916c: 0x109916c: lw    ra, 52(sp)
+// 0x01099170: 0x1099170: lw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7172,7 +7172,7 @@ L_1098b24:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01098b2c: 0x1098b2c: lw    s4, 44(sp)
+// 0x01099174: 0x1099174: lw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7181,7 +7181,7 @@ L_1098b24:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01098b30: 0x1098b30: lw    s3, 40(sp)
+// 0x01099178: 0x1099178: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7190,7 +7190,7 @@ L_1098b24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01098b34: 0x1098b34: lw    s2, 36(sp)
+// 0x0109917c: 0x109917c: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7199,7 +7199,7 @@ L_1098b24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01098b38: 0x1098b38: lw    s1, 32(sp)
+// 0x01099180: 0x1099180: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7208,7 +7208,7 @@ L_1098b24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01098b3c: 0x1098b3c: lw    s0, 28(sp)
+// 0x01099184: 0x1099184: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7217,7 +7217,7 @@ L_1098b24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01098b40: 0x1098b40: jr    ra addiu sp, sp, 56
+// 0x01099188: 0x1099188: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl114.j b/converted/Cibyl114.j
index 17fba2e..0f61a50 100644
--- a/converted/Cibyl114.j
+++ b/converted/Cibyl114.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl114::.ctor
 
-.method public static int32 ssd_text_on_key_pressed_1098b48(int32,int32,int32,int32,int32)
+.method public static int32 ssd_text_on_key_pressed_1099190(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -82,7 +82,7 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098b48: 0x1098b48: lw    v0, 48(a0)
+// 0x01099190: 0x1099190: lw    v0, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -91,17 +91,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098b4c: 0x1098b4c: addiu sp, sp, -296
+// 0x01099194: 0x1099194: addiu sp, sp, -296
 	ldloc.0
 	ldc.i4 -296
 	add
 	stloc.0
-// 0x01098b50: 0x1098b50: andi  v0, v0, 16384
+// 0x01099198: 0x1099198: andi  v0, v0, 16384
 	ldloc 5
 	ldc.i4 16384
 	and
 	stloc 5
-// 0x01098b54: 0x1098b54: sw    s1, 288(sp)
+// 0x0109919c: 0x109919c: sw    s1, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -110,7 +110,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098b58: 0x1098b58: sw    s0, 284(sp)
+// 0x010991a0: 0x10991a0: sw    s0, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -119,57 +119,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01098b5c: 0x1098b5c: sw    ra, 292(sp)
-// 0x01098b60: 0x1098b60: addu  s0, a0, zero
+// 0x010991a4: 0x10991a4: sw    ra, 292(sp)
+// 0x010991a8: 0x10991a8: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01098b64: 0x1098b64: addu  a3, a1, zero
+// 0x010991ac: 0x10991ac: addu  a3, a1, zero
 	ldloc.2
 	stloc 4
-// 0x01098b68: 0x1098b68: bne   v0, zero, 0x1098c6c addu  s1, a2, zero
+// 0x010991b0: 0x10991b0: bne   v0, zero, 0x10992b4 addu  s1, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 7
-	brtrue L_1098c6c
+	brtrue L_10992b4
 // --- basic block ---
-// 0x01098b70: 0x1098b70: andi  v0, a2, 1
+// 0x010991b8: 0x10991b8: andi  v0, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc 5
-// 0x01098b74: 0x1098b74: bne   v0, zero, 0x1098c6c andi  v0, a2, 2
+// 0x010991bc: 0x10991bc: bne   v0, zero, 0x10992b4 andi  v0, a2, 2
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc 5
-	brtrue L_1098c6c
+	brtrue L_10992b4
 // --- basic block ---
-// 0x01098b7c: 0x1098b7c: beq   v0, zero, 0x1098b9c addiu v1, zero, 27
+// 0x010991c4: 0x10991c4: beq   v0, zero, 0x10991e4 addiu v1, zero, 27
 	ldloc 5
 	ldc.i4.s 27
 	stloc 8
-	brfalse L_1098b9c
+	brfalse L_10991e4
 // --- basic block ---
-// 0x01098b84: 0x1098b84: lb    v0, 0(a1)
+// 0x010991cc: 0x10991cc: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01098b88: 0x1098b88: sll   zero, zero, 0
-// 0x01098b8c: 0x1098b8c: beq   v0, v1, 0x1098c6c addiu v1, zero, 8
+// 0x010991d0: 0x10991d0: sll   zero, zero, 0
+// 0x010991d4: 0x10991d4: beq   v0, v1, 0x10992b4 addiu v1, zero, 8
 	ldloc 5
 	ldloc 8
 	ldc.i4.8
 	stloc 8
-	beq  L_1098c6c
+	beq  L_10992b4
 // --- basic block ---
-// 0x01098b94: 0x1098b94: beq   v0, v1, 0x1098c24 sll   zero, zero, 0
+// 0x010991dc: 0x10991dc: beq   v0, v1, 0x109926c sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	beq  L_1098c24
+	beq  L_109926c
 // --- basic block ---
-L_1098b9c:
-// 0x01098b9c: 0x1098b9c: lw    a2, 20(s0)
+L_10991e4:
+// 0x010991e4: 0x10991e4: lw    a2, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -178,31 +178,31 @@ L_1098b9c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01098ba0: 0x1098ba0: sll   zero, zero, 0
-// 0x01098ba4: 0x1098ba4: beq   a2, zero, 0x1098bd4 addu  a1, a3, zero
+// 0x010991e8: 0x10991e8: sll   zero, zero, 0
+// 0x010991ec: 0x10991ec: beq   a2, zero, 0x109921c addu  a1, a3, zero
 	ldloc.3
 	ldloc 4
 	stloc.2
-	brfalse L_1098bd4
+	brfalse L_109921c
 // --- basic block ---
-// 0x01098bac: 0x1098bac: lb    v0, 0(a2)
+// 0x010991f4: 0x10991f4: lb    v0, 0(a2)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01098bb0: 0x1098bb0: sll   zero, zero, 0
-// 0x01098bb4: 0x1098bb4: beq   v0, zero, 0x1098bd4 sll   zero, zero, 0
+// 0x010991f8: 0x10991f8: sll   zero, zero, 0
+// 0x010991fc: 0x10991fc: beq   v0, zero, 0x109921c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1098bd4
+	brfalse L_109921c
 // --- basic block ---
-// 0x01098bbc: 0x1098bbc: lui   a1, 0x20000
+// 0x01099204: 0x1099204: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01098bc0: 0x1098bc0: addiu a1, a1, 21592
+// 0x01099208: 0x1099208: addiu a1, a1, 22052
 	ldloc.2
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.2
-// 0x01098bc4: 0x1098bc4: jal   0x1000f64 addiu a0, sp, 24
+// 0x0109920c: 0x109920c: jal   0x1000f64 addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -217,15 +217,15 @@ L_1098b9c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01098bcc: 0x1098bcc: j	 0x1098be0 andi  s1, s1, 8192
+// 0x01099214: 0x1099214: j	 0x1099228 andi  s1, s1, 8192
 	ldloc 7
 	ldc.i4 8192
 	and
 	stloc 7
-	br L_1098be0
+	br L_1099228
 // --- basic block ---
-L_1098bd4:
-// 0x01098bd4: 0x1098bd4: jal   0x1001b68 addiu a0, sp, 24
+L_109921c:
+// 0x0109921c: 0x109921c: jal   0x1001b68 addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -237,63 +237,63 @@ L_1098bd4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01098bdc: 0x1098bdc: andi  s1, s1, 8192
+// 0x01099224: 0x1099224: andi  s1, s1, 8192
 	ldloc 7
 	ldc.i4 8192
 	and
 	stloc 7
-L_1098be0:
-// 0x01098be0: 0x1098be0: addiu a1, sp, 24
+L_1099228:
+// 0x01099228: 0x1099228: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01098be4: 0x1098be4: lui   a0, 0x10000
+// 0x0109922c: 0x109922c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01098be8: 0x1098be8: beq   s1, zero, 0x1098c04 lui   a2, 0x1090000
+// 0x01099230: 0x1099230: beq   s1, zero, 0x109924c lui   a2, 0x10a0000
 	ldloc 7
-	ldc.i4 17367040
+	ldc.i4 17432576
 	stloc.3
-	brfalse L_1098c04
+	brfalse L_109924c
 // --- basic block ---
-// 0x01098bf0: 0x1098bf0: addiu a0, a0, 18500
+// 0x01099238: 0x1099238: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x01098bf4: 0x1098bf4: addiu a2, a2, 32460
+// 0x0109923c: 0x109923c: addiu a2, a2, -31468
 	ldloc.3
-	ldc.i4 32460
+	ldc.i4 -31468
 	add
 	stloc.3
-// 0x01098bf8: 0x1098bf8: addu  a3, s0, zero
+// 0x01099240: 0x1099240: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x01098bfc: 0x1098bfc: j	 0x1098c14 addiu v0, zero, 2
+// 0x01099244: 0x1099244: j	 0x109925c addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-	br L_1098c14
+	br L_109925c
 // --- basic block ---
-L_1098c04:
-// 0x01098c04: 0x1098c04: addiu a0, a0, 18500
+L_109924c:
+// 0x0109924c: 0x109924c: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x01098c08: 0x1098c08: addiu a2, a2, 32460
+// 0x01099250: 0x1099250: addiu a2, a2, -31468
 	ldloc.3
-	ldc.i4 32460
+	ldc.i4 -31468
 	add
 	stloc.3
-// 0x01098c0c: 0x1098c0c: addu  a3, s0, zero
+// 0x01099254: 0x1099254: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x01098c10: 0x1098c10: addiu v0, zero, 1
+// 0x01099258: 0x1099258: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1098c14:
-// 0x01098c14: 0x1098c14: jal   0x1052e08 sw    v0, 16(sp)
+L_109925c:
+// 0x0109925c: 0x109925c: jal   0x1052e18 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -307,16 +307,16 @@ L_1098c14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01098c1c: 0x1098c1c: j	 0x1098c70 sll   zero, zero, 0
-	br L_1098c70
+// 0x01099264: 0x1099264: j	 0x10992b8 sll   zero, zero, 0
+	br L_10992b8
 // --- basic block ---
-L_1098c24:
-// 0x01098c24: 0x1098c24: lw    a0, 20(a0)
+L_109926c:
+// 0x0109926c: 0x109926c: lw    a0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -325,50 +325,50 @@ L_1098c24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098c28: 0x1098c28: sll   zero, zero, 0
-// 0x01098c2c: 0x1098c2c: beq   a0, zero, 0x1098c70 addu  v0, zero, zero
+// 0x01099270: 0x1099270: sll   zero, zero, 0
+// 0x01099274: 0x1099274: beq   a0, zero, 0x10992b8 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1098c70
+	brfalse L_10992b8
 // --- basic block ---
-// 0x01098c34: 0x1098c34: lb    v0, 0(a0)
+// 0x0109927c: 0x109927c: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01098c38: 0x1098c38: sll   zero, zero, 0
-// 0x01098c3c: 0x1098c3c: beq   v0, zero, 0x1098c6c andi  s1, a2, 8
+// 0x01099280: 0x1099280: sll   zero, zero, 0
+// 0x01099284: 0x1099284: beq   v0, zero, 0x10992b4 andi  s1, a2, 8
 	ldloc 5
 	ldloc.3
 	ldc.i4.8
 	and
 	stloc 7
-	brfalse L_1098c6c
+	brfalse L_10992b4
 // --- basic block ---
-// 0x01098c44: 0x1098c44: beq   s1, zero, 0x1098c54 sll   zero, zero, 0
+// 0x0109928c: 0x109928c: beq   s1, zero, 0x109929c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1098c54
+	brfalse L_109929c
 // --- basic block ---
-// 0x01098c4c: 0x1098c4c: j	 0x1098c5c sb    zero, 0(a0)
+// 0x01099294: 0x1099294: j	 0x10992a4 sb    zero, 0(a0)
 	ldloc.1
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1098c5c
+	br L_10992a4
 // --- basic block ---
-L_1098c54:
-// 0x01098c54: 0x1098c54: jal   0x1041de4 sll   zero, zero, 0
+L_109929c:
+// 0x0109929c: 0x109929c: jal   0x1041df4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::sttstr_trim_last_char_1041de4(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::sttstr_trim_last_char_1041df4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1098c5c:
-// 0x01098c5c: 0x1098c5c: jal   0x1098ff8 addu  a0, s0, zero
+L_10992a4:
+// 0x010992a4: 0x10992a4: jal   0x1099640 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -376,23 +376,23 @@ L_1098c5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01098c64: 0x1098c64: j	 0x1098c70 addiu v0, zero, 1
+// 0x010992ac: 0x10992ac: j	 0x10992b8 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1098c70
+	br L_10992b8
 // --- basic block ---
-L_1098c6c:
-// 0x01098c6c: 0x1098c6c: addu  v0, zero, zero
+L_10992b4:
+// 0x010992b4: 0x10992b4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1098c70:
-// 0x01098c70: 0x1098c70: lw    ra, 292(sp)
-// 0x01098c74: 0x1098c74: lw    s1, 288(sp)
+L_10992b8:
+// 0x010992b8: 0x10992b8: lw    ra, 292(sp)
+// 0x010992bc: 0x10992bc: lw    s1, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -401,7 +401,7 @@ L_1098c70:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098c78: 0x1098c78: lw    s0, 284(sp)
+// 0x010992c0: 0x10992c0: lw    s0, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -410,7 +410,7 @@ L_1098c70:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01098c7c: 0x1098c7c: jr    ra addiu sp, sp, 296
+// 0x010992c4: 0x10992c4: jr    ra addiu sp, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
@@ -422,7 +422,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_35_1098c84(int32,int32,int32,int32,int32)
+.method public static int32 T_35_10992cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -460,13 +460,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098c84: 0x1098c84: addiu sp, sp, -32
+// 0x010992cc: 0x10992cc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01098c88: 0x1098c88: sw    ra, 28(sp)
-// 0x01098c8c: 0x1098c8c: sw    s0, 24(sp)
+// 0x010992d0: 0x10992d0: sw    ra, 28(sp)
+// 0x010992d4: 0x10992d4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -475,7 +475,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098c90: 0x1098c90: jal   0x1000910 sw    a0, 16(sp)
+// 0x010992d8: 0x10992d8: jal   0x1000910 sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -494,7 +494,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01098c98: 0x1098c98: lw    a2, 16(sp)
+// 0x010992e0: 0x10992e0: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -503,13 +503,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01098c9c: 0x1098c9c: addu  a0, v0, zero
+// 0x010992e4: 0x10992e4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01098ca0: 0x1098ca0: addu  a1, zero, zero
+// 0x010992e8: 0x10992e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01098ca4: 0x1098ca4: jal   0x100177c addu  s0, v0, zero
+// 0x010992ec: 0x10992ec: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -521,11 +521,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01098cac: 0x1098cac: lw    ra, 28(sp)
-// 0x01098cb0: 0x1098cb0: addu  v0, s0, zero
+// 0x010992f4: 0x10992f4: lw    ra, 28(sp)
+// 0x010992f8: 0x10992f8: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01098cb4: 0x1098cb4: lw    s0, 24(sp)
+// 0x010992fc: 0x10992fc: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -534,7 +534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098cb8: 0x1098cb8: jr    ra addiu sp, sp, 32
+// 0x01099300: 0x1099300: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -546,7 +546,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_text_set_text_size_1098cc0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_text_set_text_size_1099308(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -587,12 +587,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098cc0: 0x1098cc0: addiu sp, sp, -32
+// 0x01099308: 0x1099308: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01098cc4: 0x1098cc4: sw    s1, 24(sp)
+// 0x0109930c: 0x109930c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -601,7 +601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01098cc8: 0x1098cc8: sw    s0, 20(sp)
+// 0x01099310: 0x1099310: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -610,7 +610,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098ccc: 0x1098ccc: lw    s1, 164(a0)
+// 0x01099314: 0x1099314: lw    s1, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -619,10 +619,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01098cd0: 0x1098cd0: addu  s0, a0, zero
+// 0x01099318: 0x1099318: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01098cd4: 0x1098cd4: lw    a0, 20(a0)
+// 0x0109931c: 0x109931c: lw    a0, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -631,8 +631,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098cd8: 0x1098cd8: sw    ra, 28(sp)
-// 0x01098cdc: 0x1098cdc: beq   a0, zero, 0x1098cec sw    a1, 28(s1)
+// 0x01099320: 0x1099320: sw    ra, 28(sp)
+// 0x01099324: 0x1099324: beq   a0, zero, 0x1099334 sw    a1, 28(s1)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -642,9 +642,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_1098cec
+	brfalse L_1099334
 // --- basic block ---
-// 0x01098ce4: 0x1098ce4: jal   0x1000930 sll   zero, zero, 0
+// 0x0109932c: 0x109932c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -655,8 +655,8 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 8
 // --- basic block ---
-L_1098cec:
-// 0x01098cec: 0x1098cec: lw    a0, 28(s1)
+L_1099334:
+// 0x01099334: 0x1099334: lw    a0, 28(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -665,7 +665,7 @@ L_1098cec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098cf0: 0x1098cf0: jal   0x1098c84 addiu a0, a0, 1
+// 0x01099338: 0x1099338: jal   0x10992cc addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
@@ -675,13 +675,13 @@ L_1098cec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::T_35_1098c84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::T_35_10992cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01098cf8: 0x1098cf8: lw    ra, 28(sp)
-// 0x01098cfc: 0x1098cfc: sw    v0, 20(s0)
+// 0x01099340: 0x1099340: lw    ra, 28(sp)
+// 0x01099344: 0x1099344: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -690,7 +690,7 @@ L_1098cec:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01098d00: 0x1098d00: lw    s1, 24(sp)
+// 0x01099348: 0x1099348: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -699,7 +699,7 @@ L_1098cec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01098d04: 0x1098d04: lw    s0, 20(sp)
+// 0x0109934c: 0x109934c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -708,7 +708,7 @@ L_1098cec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098d08: 0x1098d08: jr    ra addiu sp, sp, 32
+// 0x01099350: 0x1099350: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -720,7 +720,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+.method public static int32 ssd_text_new_1099358(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s0,int32 s6,int32 ra)
@@ -776,12 +776,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098d10: 0x1098d10: addiu sp, sp, -56
+// 0x01099358: 0x1099358: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01098d14: 0x1098d14: sw    s1, 28(sp)
+// 0x0109935c: 0x109935c: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -790,13 +790,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01098d18: 0x1098d18: addu  s1, a0, zero
+// 0x01099360: 0x1099360: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01098d1c: 0x1098d1c: addiu a0, zero, 108
+// 0x01099364: 0x1099364: addiu a0, zero, 108
 	ldc.i4.s 108
 	stloc.1
-// 0x01098d20: 0x1098d20: sw    a2, 16(sp)
+// 0x01099368: 0x1099368: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -805,8 +805,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01098d24: 0x1098d24: sw    ra, 52(sp)
-// 0x01098d28: 0x1098d28: sw    s5, 44(sp)
+// 0x0109936c: 0x109936c: sw    ra, 52(sp)
+// 0x01099370: 0x1099370: sw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -815,7 +815,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01098d2c: 0x1098d2c: sw    s4, 40(sp)
+// 0x01099374: 0x1099374: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -824,7 +824,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01098d30: 0x1098d30: sw    s3, 36(sp)
+// 0x01099378: 0x1099378: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -833,7 +833,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01098d34: 0x1098d34: sw    s2, 32(sp)
+// 0x0109937c: 0x109937c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -842,7 +842,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01098d38: 0x1098d38: sw    s0, 24(sp)
+// 0x01099380: 0x1099380: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -851,13 +851,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01098d3c: 0x1098d3c: addu  s3, a3, zero
+// 0x01099384: 0x1099384: addu  s3, a3, zero
 	ldloc 4
 	stloc 10
-// 0x01098d40: 0x1098d40: addu  s0, a1, zero
+// 0x01099388: 0x1099388: addu  s0, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01098d44: 0x1098d44: jal   0x1098c84 sw    s6, 48(sp)
+// 0x0109938c: 0x109938c: jal   0x10992cc sw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -871,18 +871,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::T_35_1098c84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::T_35_10992cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098d4c: 0x1098d4c: addu  a0, v0, zero
+// 0x01099394: 0x1099394: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01098d50: 0x1098d50: lui   s4, 0x80000
+// 0x01099398: 0x1099398: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 11
-// 0x01098d54: 0x1098d54: jal   0x1097d74 addu  s2, v0, zero
+// 0x0109939c: 0x109939c: jal   0x10983bc addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -890,21 +890,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::text_ctx_init_1097d74(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::text_ctx_init_10983bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098d5c: 0x1098d5c: lw    v0, 9804(s4)
+// 0x010993a4: 0x10993a4: lw    v0, 10268(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2451
+	ldc.i4 2567
 	add
 	ldelem.i4
 	stloc 5
-// 0x01098d60: 0x1098d60: lw    a2, 16(sp)
+// 0x010993a8: 0x10993a8: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -913,17 +913,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01098d64: 0x1098d64: addiu s5, zero, 1
+// 0x010993ac: 0x10993ac: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x01098d68: 0x1098d68: sw    a2, 0(s2)
+// 0x010993b0: 0x10993b0: sw    a2, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01098d6c: 0x1098d6c: sw    zero, 100(s2)
+// 0x010993b4: 0x10993b4: sw    zero, 100(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -932,7 +932,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01098d70: 0x1098d70: bne   v0, zero, 0x1098dd8 sw    s5, 104(s2)
+// 0x010993b8: 0x10993b8: bne   v0, zero, 0x1099420 sw    s5, 104(s2)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -942,17 +942,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-	brtrue L_1098dd8
+	brtrue L_1099420
 // --- basic block ---
-// 0x01098d78: 0x1098d78: lui   a0, 0x20000
+// 0x010993c0: 0x10993c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01098d7c: 0x1098d7c: addu  a1, zero, zero
+// 0x010993c4: 0x10993c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01098d80: 0x1098d80: jal   0x104ef00 addiu a0, a0, -2808
+// 0x010993c8: 0x10993c8: jal   0x104ef10 addiu a0, a0, -2344
 	ldloc.1
-	ldc.i4 -2808
+	ldc.i4 -2344
 	add
 	stloc.1
 	ldloc.0
@@ -960,32 +960,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098d88: 0x1098d88: lui   v1, 0x20000
+// 0x010993d0: 0x10993d0: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01098d8c: 0x1098d8c: lw    a0, 29620(v1)
+// 0x010993d4: 0x10993d4: lw    a0, 30084(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7405
+	ldc.i4 7521
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098d90: 0x1098d90: lui   v1, 0x80000
+// 0x010993d8: 0x10993d8: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01098d94: 0x1098d94: jal   0x104edb0 sw    v0, 9808(v1)
+// 0x010993dc: 0x10993dc: jal   0x104edc0 sw    v0, 10272(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2452
+	ldc.i4 2568
 	add
 	ldloc 5
 	stelem.i4
@@ -994,23 +994,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098d9c: 0x1098d9c: lui   a2, 0x20000
+// 0x010993e4: 0x10993e4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01098da0: 0x1098da0: addiu a2, a2, -2816
+// 0x010993e8: 0x10993e8: addiu a2, a2, -2352
 	ldloc.3
-	ldc.i4 -2816
+	ldc.i4 -2352
 	add
 	stloc.3
-// 0x01098da4: 0x1098da4: addiu a1, zero, 1
+// 0x010993ec: 0x10993ec: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01098da8: 0x1098da8: jal   0x10a1918 addu  a0, zero, zero
+// 0x010993f0: 0x10993f0: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1018,83 +1018,83 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098db0: 0x1098db0: addu  s6, v0, zero
+// 0x010993f8: 0x10993f8: addu  s6, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01098db4: 0x1098db4: jal   0x104dffc addu  a0, v0, zero
+// 0x010993fc: 0x10993fc: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098dbc: 0x1098dbc: lui   v1, 0x80000
+// 0x01099404: 0x1099404: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01098dc0: 0x1098dc0: addu  a0, s6, zero
+// 0x01099408: 0x1099408: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01098dc4: 0x1098dc4: jal   0x104e020 sw    v0, 9796(v1)
+// 0x0109940c: 0x109940c: jal   0x104e030 sw    v0, 10260(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2449
+	ldc.i4 2565
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098dcc: 0x1098dcc: lui   v1, 0x80000
+// 0x01099414: 0x1099414: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01098dd0: 0x1098dd0: sw    v0, 9800(v1)
+// 0x01099418: 0x1099418: sw    v0, 10264(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2450
+	ldc.i4 2566
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098dd4: 0x1098dd4: sw    s5, 9804(s4)
+// 0x0109941c: 0x109941c: sw    s5, 10268(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2451
+	ldc.i4 2567
 	add
 	ldloc 12
 	stelem.i4
-L_1098dd8:
-// 0x01098dd8: 0x1098dd8: ori   s3, s3, 16384
+L_1099420:
+// 0x01099420: 0x1099420: ori   s3, s3, 16384
 	ldloc 10
 	ldc.i4 16384
 	or
 	stloc 10
-// 0x01098ddc: 0x1098ddc: lui   a1, 0x10a0000
+// 0x01099424: 0x1099424: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x01098de0: 0x1098de0: addu  a2, s3, zero
+// 0x01099428: 0x1099428: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01098de4: 0x1098de4: addiu a1, a1, -29880
+// 0x0109942c: 0x109942c: addiu a1, a1, -28272
 	ldloc.2
-	ldc.i4 -29880
+	ldc.i4 -28272
 	add
 	stloc.2
-// 0x01098de8: 0x1098de8: jal   0x109a45c addu  a0, s1, zero
+// 0x01099430: 0x1099430: jal   0x109aaa4 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1102,15 +1102,15 @@ L_1098dd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098df0: 0x1098df0: addu  s1, v0, zero
+// 0x01099438: 0x1099438: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01098df4: 0x1098df4: sw    s3, 48(v0)
+// 0x0109943c: 0x109943c: sw    s3, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1119,30 +1119,30 @@ L_1098dd8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01098df8: 0x1098df8: lui   v0, 0x20000
+// 0x01099440: 0x1099440: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01098dfc: 0x1098dfc: addiu v0, v0, -568
+// 0x01099444: 0x1099444: addiu v0, v0, -104
 	ldloc 5
-	ldc.i4 -568
+	ldc.i4.s -104
 	add
 	stloc 5
-// 0x01098e00: 0x1098e00: sw    v0, 0(s1)
+// 0x01099448: 0x1099448: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01098e04: 0x1098e04: lui   v0, 0x10a0000
+// 0x0109944c: 0x109944c: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x01098e08: 0x1098e08: addiu v0, v0, -30700
+// 0x01099450: 0x1099450: addiu v0, v0, -29092
 	ldloc 5
-	ldc.i4 -30700
+	ldc.i4 -29092
 	add
 	stloc 5
-// 0x01098e0c: 0x1098e0c: sw    v0, 184(s1)
+// 0x01099454: 0x1099454: sw    v0, 184(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1151,15 +1151,15 @@ L_1098dd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098e10: 0x1098e10: lui   v0, 0x1090000
-	ldc.i4 17367040
+// 0x01099458: 0x1099458: lui   v0, 0x10a0000
+	ldc.i4 17432576
 	stloc 5
-// 0x01098e14: 0x1098e14: addiu v0, v0, 32576
+// 0x0109945c: 0x109945c: addiu v0, v0, -31352
 	ldloc 5
-	ldc.i4 32576
+	ldc.i4 -31352
 	add
 	stloc 5
-// 0x01098e18: 0x1098e18: lw    a0, 28(s2)
+// 0x01099460: 0x1099460: lw    a0, 28(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1168,7 +1168,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098e1c: 0x1098e1c: sw    v0, 220(s1)
+// 0x01099464: 0x1099464: sw    v0, 220(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1177,15 +1177,15 @@ L_1098dd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098e20: 0x1098e20: lui   v0, 0x1090000
-	ldc.i4 17367040
+// 0x01099468: 0x1099468: lui   v0, 0x10a0000
+	ldc.i4 17432576
 	stloc 5
-// 0x01098e24: 0x1098e24: addiu v0, v0, 32172
+// 0x0109946c: 0x109946c: addiu v0, v0, -31756
 	ldloc 5
-	ldc.i4 32172
+	ldc.i4 -31756
 	add
 	stloc 5
-// 0x01098e28: 0x1098e28: sw    s2, 164(s1)
+// 0x01099470: 0x1099470: sw    s2, 164(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1194,7 +1194,7 @@ L_1098dd8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01098e2c: 0x1098e2c: sw    v0, 176(s1)
+// 0x01099474: 0x1099474: sw    v0, 176(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1203,7 +1203,7 @@ L_1098dd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098e30: 0x1098e30: jal   0x1098c84 addiu a0, a0, 1
+// 0x01099478: 0x1099478: jal   0x10992cc addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
@@ -1213,20 +1213,20 @@ L_1098dd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::T_35_1098c84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::T_35_10992cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098e38: 0x1098e38: lui   v1, 0x1090000
-	ldc.i4 17367040
+// 0x01099480: 0x1099480: lui   v1, 0x10a0000
+	ldc.i4 17432576
 	stloc 7
-// 0x01098e3c: 0x1098e3c: addiu v1, v1, 31796
+// 0x01099484: 0x1099484: addiu v1, v1, -32132
 	ldloc 7
-	ldc.i4 31796
+	ldc.i4 -32132
 	add
 	stloc 7
-// 0x01098e40: 0x1098e40: sw    v1, 224(s1)
+// 0x01099488: 0x1099488: sw    v1, 224(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1235,15 +1235,15 @@ L_1098dd8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098e44: 0x1098e44: lui   v1, 0x1090000
-	ldc.i4 17367040
+// 0x0109948c: 0x109948c: lui   v1, 0x10a0000
+	ldc.i4 17432576
 	stloc 7
-// 0x01098e48: 0x1098e48: addiu v1, v1, 31688
+// 0x01099490: 0x1099490: addiu v1, v1, -32240
 	ldloc 7
-	ldc.i4 31688
+	ldc.i4 -32240
 	add
 	stloc 7
-// 0x01098e4c: 0x1098e4c: sw    v1, 168(s1)
+// 0x01099494: 0x1099494: sw    v1, 168(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1252,7 +1252,7 @@ L_1098dd8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098e50: 0x1098e50: sw    v0, 20(s1)
+// 0x01099498: 0x1099498: sw    v0, 20(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1261,16 +1261,16 @@ L_1098dd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01098e54: 0x1098e54: jal   0x1041dd0 addu  a0, v0, zero
+// 0x0109949c: 0x109949c: jal   0x1041de0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call void Cibyl48::sttstr_reset_1041dd0(int32)
+	call void Cibyl48::sttstr_reset_1041de0(int32)
 // --- basic block ---
-// 0x01098e5c: 0x1098e5c: addu  a0, s1, zero
+// 0x010994a4: 0x10994a4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01098e60: 0x1098e60: jal   0x1097dac addu  a1, s0, zero
+// 0x010994a8: 0x10994a8: jal   0x10983f4 addu  a1, s0, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -1278,16 +1278,16 @@ L_1098dd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::set_value_1097dac(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::set_value_10983f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01098e68: 0x1098e68: lw    ra, 52(sp)
-// 0x01098e6c: 0x1098e6c: addu  v0, s1, zero
+// 0x010994b0: 0x10994b0: lw    ra, 52(sp)
+// 0x010994b4: 0x10994b4: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-// 0x01098e70: 0x1098e70: lw    s6, 48(sp)
+// 0x010994b8: 0x10994b8: lw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1296,7 +1296,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01098e74: 0x1098e74: lw    s5, 44(sp)
+// 0x010994bc: 0x10994bc: lw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1305,7 +1305,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01098e78: 0x1098e78: lw    s4, 40(sp)
+// 0x010994c0: 0x10994c0: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1314,7 +1314,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01098e7c: 0x1098e7c: lw    s3, 36(sp)
+// 0x010994c4: 0x10994c4: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1323,7 +1323,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01098e80: 0x1098e80: lw    s2, 32(sp)
+// 0x010994c8: 0x10994c8: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1332,7 +1332,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01098e84: 0x1098e84: lw    s1, 28(sp)
+// 0x010994cc: 0x10994cc: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1341,7 +1341,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01098e88: 0x1098e88: lw    s0, 24(sp)
+// 0x010994d0: 0x10994d0: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1350,7 +1350,7 @@ L_1098dd8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01098e8c: 0x1098e8c: jr    ra addiu sp, sp, 56
+// 0x010994d4: 0x10994d4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1362,7 +1362,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_default_on_key_pressed_1098e94()
+.method public static int32 ssd_widget_default_on_key_pressed_10994dc()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1376,7 +1376,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098e94: 0x1098e94: jr    ra addu  v0, zero, zero
+// 0x010994dc: 0x10994dc: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1384,7 +1384,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void ssd_widget_set_callback_1098e9c(int32,int32)
+.method public static void ssd_widget_set_callback_10994e4(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 ra,int32[] mem)
@@ -1404,7 +1404,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098e9c: 0x1098e9c: jr    ra sw    a1, 112(a0)
+// 0x010994e4: 0x10994e4: jr    ra sw    a1, 112(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1417,7 +1417,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ssd_widget_add_1098ec4(int32,int32)
+.method public static int32 ssd_widget_add_109950c(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1443,7 +1443,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098ec4: 0x1098ec4: lw    v0, 12(a0)
+// 0x0109950c: 0x109950c: lw    v0, 12(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1452,8 +1452,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01098ec8: 0x1098ec8: sll   zero, zero, 0
-// 0x01098ecc: 0x1098ecc: bne   v0, zero, 0x1098edc sw    a0, 4(a1)
+// 0x01099510: 0x1099510: sll   zero, zero, 0
+// 0x01099514: 0x1099514: bne   v0, zero, 0x1099524 sw    a0, 4(a1)
 	ldloc.2
 	ldloc 3
 	ldloc.1
@@ -1463,9 +1463,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.0
 	stelem.i4
-	brtrue L_1098edc
+	brtrue L_1099524
 // --- basic block ---
-// 0x01098ed4: 0x1098ed4: jr    ra sw    a1, 12(a0)
+// 0x0109951c: 0x109951c: jr    ra sw    a1, 12(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1476,11 +1476,11 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1098edc:
-// 0x01098edc: 0x1098edc: addu  v1, v0, zero
+L_1099524:
+// 0x01099524: 0x1099524: addu  v1, v0, zero
 	ldloc.2
 	stloc 4
-// 0x01098ee0: 0x1098ee0: lw    v0, 8(v0)
+// 0x01099528: 0x1099528: lw    v0, 8(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -1489,12 +1489,12 @@ L_1098edc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01098ee4: 0x1098ee4: sll   zero, zero, 0
-// 0x01098ee8: 0x1098ee8: bne   v0, zero, 0x1098edc sll   zero, zero, 0
+// 0x0109952c: 0x109952c: sll   zero, zero, 0
+// 0x01099530: 0x1099530: bne   v0, zero, 0x1099524 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1098edc
+	brtrue L_1099524
 // --- basic block ---
-// 0x01098ef0: 0x1098ef0: jr    ra sw    a1, 8(v1)
+// 0x01099538: 0x1099538: jr    ra sw    a1, 8(v1)
 	ldloc 3
 	ldloc 4
 	ldc.i4.2
@@ -1510,7 +1510,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static void ssd_widget_set_size_1098ef8(int32,int32,int32)
+.method public static void ssd_widget_set_size_1099540(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32[] mem,int32 ra)
@@ -1533,7 +1533,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098ef8: 0x1098ef8: sw    a2, 28(a0)
+// 0x01099540: 0x1099540: sw    a2, 28(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1542,7 +1542,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01098efc: 0x1098efc: jr    ra sw    a1, 24(a0)
+// 0x01099544: 0x1099544: jr    ra sw    a1, 24(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1555,7 +1555,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ssd_widget_move_child_positions_1098f04(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_move_child_positions_109954c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra,int32 v1)
@@ -1599,7 +1599,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098f04: 0x1098f04: lw    v0, 120(a0)
+// 0x0109954c: 0x109954c: lw    v0, 120(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1608,12 +1608,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01098f08: 0x1098f08: addiu sp, sp, -32
+// 0x01099550: 0x1099550: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01098f0c: 0x1098f0c: sw    s2, 24(sp)
+// 0x01099554: 0x1099554: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1622,7 +1622,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01098f10: 0x1098f10: sw    s1, 20(sp)
+// 0x01099558: 0x1099558: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1631,7 +1631,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01098f14: 0x1098f14: sw    s0, 16(sp)
+// 0x0109955c: 0x109955c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1640,11 +1640,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098f18: 0x1098f18: sw    ra, 28(sp)
-// 0x01098f1c: 0x1098f1c: addu  s2, a1, zero
+// 0x01099560: 0x1099560: sw    ra, 28(sp)
+// 0x01099564: 0x1099564: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01098f20: 0x1098f20: lw    s0, 12(a0)
+// 0x01099568: 0x1099568: lw    s0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1653,18 +1653,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098f24: 0x1098f24: beq   v0, zero, 0x1098f34 addu  s1, a2, zero
+// 0x0109956c: 0x109956c: beq   v0, zero, 0x109957c addu  s1, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 8
-	brfalse L_1098f34
+	brfalse L_109957c
 // --- basic block ---
-// 0x01098f2c: 0x1098f2c: addu  v0, a1, v0
+// 0x01099574: 0x1099574: addu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x01098f30: 0x1098f30: sw    v0, 120(a0)
+// 0x01099578: 0x1099578: sw    v0, 120(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1673,8 +1673,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_1098f34:
-// 0x01098f34: 0x1098f34: lw    v0, 124(a0)
+L_109957c:
+// 0x0109957c: 0x109957c: lw    v0, 124(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1683,16 +1683,16 @@ L_1098f34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01098f38: 0x1098f38: sll   zero, zero, 0
-// 0x01098f3c: 0x1098f3c: beq   v0, zero, 0x1098f5c addu  v0, s1, v0
+// 0x01099580: 0x1099580: sll   zero, zero, 0
+// 0x01099584: 0x1099584: beq   v0, zero, 0x10995a4 addu  v0, s1, v0
 	ldloc 6
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-	brfalse L_1098f5c
+	brfalse L_10995a4
 // --- basic block ---
-// 0x01098f44: 0x1098f44: j	 0x1098f5c sw    v0, 124(a0)
+// 0x0109958c: 0x109958c: j	 0x10995a4 sw    v0, 124(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1701,21 +1701,21 @@ L_1098f34:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1098f5c
+	br L_10995a4
 // --- basic block ---
-L_1098f4c:
-// 0x01098f4c: 0x1098f4c: jal   0x1098f04 sll   zero, zero, 0
+L_1099594:
+// 0x01099594: 0x1099594: jal   0x109954c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_move_child_positions_1098f04(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_move_child_positions_109954c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01098f54: 0x1098f54: lw    s0, 8(s0)
+// 0x0109959c: 0x109959c: lw    s0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1724,22 +1724,22 @@ L_1098f4c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098f58: 0x1098f58: sll   zero, zero, 0
-L_1098f5c:
-// 0x01098f5c: 0x1098f5c: addu  a0, s0, zero
+// 0x010995a0: 0x10995a0: sll   zero, zero, 0
+L_10995a4:
+// 0x010995a4: 0x10995a4: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01098f60: 0x1098f60: addu  a1, s2, zero
+// 0x010995a8: 0x10995a8: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x01098f64: 0x1098f64: bne   s0, zero, 0x1098f4c addu  a2, s1, zero
+// 0x010995ac: 0x10995ac: bne   s0, zero, 0x1099594 addu  a2, s1, zero
 	ldloc 7
 	ldloc 8
 	stloc.3
-	brtrue L_1098f4c
+	brtrue L_1099594
 // --- basic block ---
-// 0x01098f6c: 0x1098f6c: lw    ra, 28(sp)
-// 0x01098f70: 0x1098f70: lw    s2, 24(sp)
+// 0x010995b4: 0x10995b4: lw    ra, 28(sp)
+// 0x010995b8: 0x10995b8: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1748,7 +1748,7 @@ L_1098f5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01098f74: 0x1098f74: lw    s1, 20(sp)
+// 0x010995bc: 0x10995bc: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1757,7 +1757,7 @@ L_1098f5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01098f78: 0x1098f78: lw    s0, 16(sp)
+// 0x010995c0: 0x10995c0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1766,7 +1766,7 @@ L_1098f5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098f7c: 0x1098f7c: jr    ra addiu sp, sp, 32
+// 0x010995c4: 0x10995c4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1778,7 +1778,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v0,int32 v1,int32 ra)
@@ -1822,7 +1822,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098f84: 0x1098f84: lw    v1, 40(a0)
+// 0x010995cc: 0x10995cc: lw    v1, 40(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1831,7 +1831,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01098f88: 0x1098f88: lw    v0, 44(a0)
+// 0x010995d0: 0x10995d0: lw    v0, 44(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1840,12 +1840,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01098f8c: 0x1098f8c: addiu sp, sp, -32
+// 0x010995d4: 0x10995d4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01098f90: 0x1098f90: sw    s2, 24(sp)
+// 0x010995d8: 0x10995d8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1854,7 +1854,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01098f94: 0x1098f94: sw    s1, 20(sp)
+// 0x010995dc: 0x10995dc: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1863,24 +1863,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098f98: 0x1098f98: addu  s2, a2, zero
+// 0x010995e0: 0x10995e0: addu  s2, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01098f9c: 0x1098f9c: addu  s1, a1, zero
+// 0x010995e4: 0x10995e4: addu  s1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01098fa0: 0x1098fa0: subu  a2, a2, v0
+// 0x010995e8: 0x10995e8: subu  a2, a2, v0
 	ldloc.3
 	ldloc 9
 	sub
 	stloc.3
-// 0x01098fa4: 0x1098fa4: subu  a1, a1, v1
+// 0x010995ec: 0x10995ec: subu  a1, a1, v1
 	ldloc.2
 	ldloc 10
 	sub
 	stloc.2
-// 0x01098fa8: 0x1098fa8: sw    ra, 28(sp)
-// 0x01098fac: 0x1098fac: sw    s0, 16(sp)
+// 0x010995f0: 0x10995f0: sw    ra, 28(sp)
+// 0x010995f4: 0x10995f4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1889,7 +1889,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01098fb0: 0x1098fb0: jal   0x1098f04 addu  s0, a0, zero
+// 0x010995f8: 0x10995f8: jal   0x109954c addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.0
@@ -1897,13 +1897,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_move_child_positions_1098f04(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_move_child_positions_109954c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01098fb8: 0x1098fb8: lw    ra, 28(sp)
-// 0x01098fbc: 0x1098fbc: sw    s2, 44(s0)
+// 0x01099600: 0x1099600: lw    ra, 28(sp)
+// 0x01099604: 0x1099604: sw    s2, 44(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1912,7 +1912,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01098fc0: 0x1098fc0: sw    s1, 40(s0)
+// 0x01099608: 0x1099608: sw    s1, 40(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1921,7 +1921,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01098fc4: 0x1098fc4: lw    s2, 24(sp)
+// 0x0109960c: 0x109960c: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1930,7 +1930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01098fc8: 0x1098fc8: lw    s1, 20(sp)
+// 0x01099610: 0x1099610: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1939,7 +1939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01098fcc: 0x1098fcc: lw    s0, 16(sp)
+// 0x01099614: 0x1099614: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1948,7 +1948,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01098fd0: 0x1098fd0: jr    ra addiu sp, sp, 32
+// 0x01099618: 0x1099618: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1960,7 +1960,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static void ssd_widget_set_context_1098fd8(int32,int32)
+.method public static void ssd_widget_set_context_1099620(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 ra,int32[] mem)
@@ -1980,7 +1980,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098fd8: 0x1098fd8: jr    ra sw    a1, 116(a0)
+// 0x01099620: 0x1099620: jr    ra sw    a1, 116(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1993,7 +1993,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static void ssd_widget_set_color_1098fe0(int32,int32,int32)
+.method public static void ssd_widget_set_color_1099628(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32[] mem,int32 ra)
@@ -2016,7 +2016,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098fe0: 0x1098fe0: sw    a2, 108(a0)
+// 0x01099628: 0x1099628: sw    a2, 108(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2025,7 +2025,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01098fe4: 0x1098fe4: jr    ra sw    a1, 104(a0)
+// 0x0109962c: 0x109962c: jr    ra sw    a1, 104(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2038,7 +2038,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ssd_widget_get_context_1098fec(int32)
+.method public static int32 ssd_widget_get_context_1099634(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2058,7 +2058,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098fec: 0x1098fec: lw    v0, 116(a0)
+// 0x01099634: 0x1099634: lw    v0, 116(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2067,13 +2067,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01098ff0: 0x1098ff0: jr    ra sll   zero, zero, 0
+// 0x01099638: 0x1099638: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -2111,15 +2111,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01098ff8: 0x1098ff8: addiu sp, sp, -24
+// 0x01099640: 0x1099640: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01098ffc: 0x1098ffc: addiu v0, zero, -1
+// 0x01099644: 0x1099644: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01099000: 0x1099000: sw    s0, 16(sp)
+// 0x01099648: 0x1099648: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2128,8 +2128,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01099004: 0x1099004: sw    ra, 20(sp)
-// 0x01099008: 0x1099008: sw    v0, 32(a0)
+// 0x0109964c: 0x109964c: sw    ra, 20(sp)
+// 0x01099650: 0x1099650: sw    v0, 32(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2138,7 +2138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109900c: 0x109900c: sw    v0, 36(a0)
+// 0x01099654: 0x1099654: sw    v0, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2147,7 +2147,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099010: 0x1099010: lw    s0, 12(a0)
+// 0x01099658: 0x1099658: lw    s0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2156,24 +2156,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099014: 0x1099014: j	 0x1099030 addu  a0, s0, zero
+// 0x0109965c: 0x109965c: j	 0x1099678 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-	br L_1099030
+	br L_1099678
 // --- basic block ---
-L_109901c:
-// 0x0109901c: 0x109901c: jal   0x1098ff8 sll   zero, zero, 0
+L_1099664:
+// 0x01099664: 0x1099664: jal   0x1099640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01099024: 0x1099024: lw    s0, 8(s0)
+// 0x0109966c: 0x109966c: lw    s0, 8(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2182,17 +2182,17 @@ L_109901c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099028: 0x1099028: sll   zero, zero, 0
-// 0x0109902c: 0x109902c: addu  a0, s0, zero
+// 0x01099670: 0x1099670: sll   zero, zero, 0
+// 0x01099674: 0x1099674: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-L_1099030:
-// 0x01099030: 0x1099030: bne   s0, zero, 0x109901c sll   zero, zero, 0
+L_1099678:
+// 0x01099678: 0x1099678: bne   s0, zero, 0x1099664 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109901c
+	brtrue L_1099664
 // --- basic block ---
-// 0x01099038: 0x1099038: lw    ra, 20(sp)
-// 0x0109903c: 0x109903c: lw    s0, 16(sp)
+// 0x01099680: 0x1099680: lw    ra, 20(sp)
+// 0x01099684: 0x1099684: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2201,7 +2201,7 @@ L_1099030:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099040: 0x1099040: jr    ra addiu sp, sp, 24
+// 0x01099688: 0x1099688: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2213,7 +2213,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -2251,15 +2251,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099048: 0x1099048: addiu sp, sp, -24
+// 0x01099690: 0x1099690: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109904c: 0x109904c: addiu v0, zero, -1
+// 0x01099694: 0x1099694: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01099050: 0x1099050: sw    s0, 16(sp)
+// 0x01099698: 0x1099698: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2268,8 +2268,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01099054: 0x1099054: sw    ra, 20(sp)
-// 0x01099058: 0x1099058: sw    v0, 124(a0)
+// 0x0109969c: 0x109969c: sw    ra, 20(sp)
+// 0x010996a0: 0x10996a0: sw    v0, 124(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2278,7 +2278,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109905c: 0x109905c: sw    v0, 120(a0)
+// 0x010996a4: 0x10996a4: sw    v0, 120(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2287,7 +2287,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099060: 0x1099060: lw    s0, 12(a0)
+// 0x010996a8: 0x10996a8: lw    s0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2296,24 +2296,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099064: 0x1099064: j	 0x1099080 addu  a0, s0, zero
+// 0x010996ac: 0x10996ac: j	 0x10996c8 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-	br L_1099080
+	br L_10996c8
 // --- basic block ---
-L_109906c:
-// 0x0109906c: 0x109906c: jal   0x1099048 sll   zero, zero, 0
+L_10996b4:
+// 0x010996b4: 0x10996b4: jal   0x1099690 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01099074: 0x1099074: lw    s0, 8(s0)
+// 0x010996bc: 0x10996bc: lw    s0, 8(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2322,17 +2322,17 @@ L_109906c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099078: 0x1099078: sll   zero, zero, 0
-// 0x0109907c: 0x109907c: addu  a0, s0, zero
+// 0x010996c0: 0x10996c0: sll   zero, zero, 0
+// 0x010996c4: 0x10996c4: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-L_1099080:
-// 0x01099080: 0x1099080: bne   s0, zero, 0x109906c sll   zero, zero, 0
+L_10996c8:
+// 0x010996c8: 0x10996c8: bne   s0, zero, 0x10996b4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109906c
+	brtrue L_10996b4
 // --- basic block ---
-// 0x01099088: 0x1099088: lw    ra, 20(sp)
-// 0x0109908c: 0x109908c: lw    s0, 16(sp)
+// 0x010996d0: 0x10996d0: lw    ra, 20(sp)
+// 0x010996d4: 0x10996d4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2341,7 +2341,7 @@ L_1099080:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099090: 0x1099090: jr    ra addiu sp, sp, 24
+// 0x010996d8: 0x10996d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2353,7 +2353,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_widget_hide_1099098(int32)
+.method public static int32 ssd_widget_hide_10996e0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -2373,7 +2373,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099098: 0x1099098: lw    v0, 48(a0)
+// 0x010996e0: 0x10996e0: lw    v0, 48(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2382,13 +2382,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109909c: 0x109909c: sll   zero, zero, 0
-// 0x010990a0: 0x10990a0: ori   v0, v0, 256
+// 0x010996e4: 0x10996e4: sll   zero, zero, 0
+// 0x010996e8: 0x10996e8: ori   v0, v0, 256
 	ldloc.1
 	ldc.i4 256
 	or
 	stloc.1
-// 0x010990a4: 0x10990a4: jr    ra sw    v0, 48(a0)
+// 0x010996ec: 0x10996ec: jr    ra sw    v0, 48(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2402,7 +2402,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_widget_show_10990ac(int32)
+.method public static int32 ssd_widget_show_10996f4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2425,7 +2425,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010990ac: 0x10990ac: lw    v1, 48(a0)
+// 0x010996f4: 0x10996f4: lw    v1, 48(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2434,15 +2434,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010990b0: 0x10990b0: addiu v0, zero, -257
+// 0x010996f8: 0x10996f8: addiu v0, zero, -257
 	ldc.i4 -257
 	stloc.1
-// 0x010990b4: 0x10990b4: and   v0, v1, v0
+// 0x010996fc: 0x10996fc: and   v0, v1, v0
 	ldloc.2
 	ldloc.1
 	and
 	stloc.1
-// 0x010990b8: 0x10990b8: jr    ra sw    v0, 48(a0)
+// 0x01099700: 0x1099700: jr    ra sw    v0, 48(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2458,7 +2458,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_widget_set_flags_10990cc(int32,int32)
+.method public static int32 ssd_widget_set_flags_1099714(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2484,27 +2484,27 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010990cc: 0x10990cc: srl   v0, a1, 20
+// 0x01099714: 0x1099714: srl   v0, a1, 20
 	ldloc.1
 	ldc.i4.s 20
 	shr.un
 	stloc.2
-// 0x010990d0: 0x10990d0: srl   v1, a1, 21
+// 0x01099718: 0x1099718: srl   v1, a1, 21
 	ldloc.1
 	ldc.i4.s 21
 	shr.un
 	stloc.3
-// 0x010990d4: 0x10990d4: andi  v1, v1, 1
+// 0x0109971c: 0x109971c: andi  v1, v1, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc.3
-// 0x010990d8: 0x10990d8: andi  v0, v0, 1
+// 0x01099720: 0x1099720: andi  v0, v0, 1
 	ldloc.2
 	ldc.i4.1
 	and
 	stloc.2
-// 0x010990dc: 0x10990dc: sw    v0, 52(a0)
+// 0x01099724: 0x1099724: sw    v0, 52(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2513,7 +2513,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010990e0: 0x10990e0: sw    v1, 56(a0)
+// 0x01099728: 0x1099728: sw    v1, 56(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2522,7 +2522,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010990e4: 0x10990e4: jr    ra sw    a1, 48(a0)
+// 0x0109972c: 0x109972c: jr    ra sw    a1, 48(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2538,7 +2538,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 ssd_widget_on_key_pressed_10990ec(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_on_key_pressed_1099734(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra,int32 v1)
@@ -2582,7 +2582,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010990ec: 0x10990ec: lw    v0, 216(a0)
+// 0x01099734: 0x1099734: lw    v0, 216(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2591,12 +2591,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010990f0: 0x10990f0: addiu sp, sp, -32
+// 0x01099738: 0x1099738: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010990f4: 0x10990f4: sw    s2, 24(sp)
+// 0x0109973c: 0x109973c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2605,7 +2605,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010990f8: 0x10990f8: sw    s1, 20(sp)
+// 0x01099740: 0x1099740: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2614,7 +2614,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010990fc: 0x10990fc: sw    s0, 16(sp)
+// 0x01099744: 0x1099744: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2623,20 +2623,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099100: 0x1099100: sw    ra, 28(sp)
-// 0x01099104: 0x1099104: addu  s0, a0, zero
+// 0x01099748: 0x1099748: sw    ra, 28(sp)
+// 0x0109974c: 0x109974c: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01099108: 0x1099108: addu  s1, a1, zero
+// 0x01099750: 0x1099750: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0109910c: 0x109910c: beq   v0, zero, 0x1099124 addu  s2, a2, zero
+// 0x01099754: 0x1099754: beq   v0, zero, 0x109976c addu  s2, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 9
-	brfalse L_1099124
+	brfalse L_109976c
 // --- basic block ---
-// 0x01099114: 0x1099114: jalr  v0 sll   zero, zero, 0
+// 0x0109975c: 0x109975c: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -2648,14 +2648,14 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0109911c: 0x109911c: bne   v0, zero, 0x109915c addiu v0, zero, 1
+// 0x01099764: 0x1099764: bne   v0, zero, 0x10997a4 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_109915c
+	brtrue L_10997a4
 // --- basic block ---
-L_1099124:
-// 0x01099124: 0x1099124: lw    s0, 12(s0)
+L_109976c:
+// 0x0109976c: 0x109976c: lw    s0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2664,30 +2664,30 @@ L_1099124:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099128: 0x1099128: j	 0x109914c addu  a0, s0, zero
+// 0x01099770: 0x1099770: j	 0x1099794 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-	br L_109914c
+	br L_1099794
 // --- basic block ---
-L_1099130:
-// 0x01099130: 0x1099130: jal   0x10990ec sll   zero, zero, 0
+L_1099778:
+// 0x01099778: 0x1099778: jal   0x1099734 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_on_key_pressed_10990ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_on_key_pressed_1099734(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01099138: 0x1099138: bne   v0, zero, 0x109915c addiu v0, zero, 1
+// 0x01099780: 0x1099780: bne   v0, zero, 0x10997a4 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_109915c
+	brtrue L_10997a4
 // --- basic block ---
-// 0x01099140: 0x1099140: lw    s0, 8(s0)
+// 0x01099788: 0x1099788: lw    s0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2696,26 +2696,26 @@ L_1099130:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099144: 0x1099144: sll   zero, zero, 0
-// 0x01099148: 0x1099148: addu  a0, s0, zero
+// 0x0109978c: 0x109978c: sll   zero, zero, 0
+// 0x01099790: 0x1099790: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-L_109914c:
-// 0x0109914c: 0x109914c: addu  a1, s1, zero
+L_1099794:
+// 0x01099794: 0x1099794: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01099150: 0x1099150: bne   s0, zero, 0x1099130 addu  a2, s2, zero
+// 0x01099798: 0x1099798: bne   s0, zero, 0x1099778 addu  a2, s2, zero
 	ldloc 7
 	ldloc 9
 	stloc.3
-	brtrue L_1099130
+	brtrue L_1099778
 // --- basic block ---
-// 0x01099158: 0x1099158: addu  v0, zero, zero
+// 0x010997a0: 0x10997a0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_109915c:
-// 0x0109915c: 0x109915c: lw    ra, 28(sp)
-// 0x01099160: 0x1099160: lw    s2, 24(sp)
+L_10997a4:
+// 0x010997a4: 0x10997a4: lw    ra, 28(sp)
+// 0x010997a8: 0x10997a8: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2724,7 +2724,7 @@ L_109915c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01099164: 0x1099164: lw    s1, 20(sp)
+// 0x010997ac: 0x10997ac: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2733,7 +2733,7 @@ L_109915c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099168: 0x1099168: lw    s0, 16(sp)
+// 0x010997b0: 0x10997b0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2742,7 +2742,7 @@ L_109915c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109916c: 0x109916c: jr    ra addiu sp, sp, 32
+// 0x010997b4: 0x10997b4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2754,7 +2754,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+.method public static void ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 ra,int32[] mem)
@@ -2774,7 +2774,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099174: 0x1099174: jr    ra sw    a1, 160(a0)
+// 0x010997bc: 0x10997bc: jr    ra sw    a1, 160(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2787,7 +2787,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static void ssd_widget_set_right_softkey_callback_109917c(int32,int32)
+.method public static void ssd_widget_set_right_softkey_callback_10997c4(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 ra,int32[] mem)
@@ -2807,7 +2807,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109917c: 0x109917c: jr    ra sw    a1, 156(a0)
+// 0x010997c4: 0x10997c4: jr    ra sw    a1, 156(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2820,7 +2820,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ssd_widget_pointer_down_force_click_1099184(int32)
+.method public static int32 ssd_widget_pointer_down_force_click_10997cc(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2840,10 +2840,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099184: 0x1099184: addiu v0, zero, 1
+// 0x010997cc: 0x10997cc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01099188: 0x1099188: jr    ra sw    v0, 136(a0)
+// 0x010997d0: 0x10997d0: jr    ra sw    v0, 136(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2857,7 +2857,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_widget_set_pointer_force_click_1099190(int32)
+.method public static int32 ssd_widget_set_pointer_force_click_10997d8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -2877,15 +2877,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099190: 0x1099190: lui   v0, 0x10a0000
+// 0x010997d8: 0x10997d8: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x01099194: 0x1099194: addiu v0, v0, -26560
+// 0x010997dc: 0x10997dc: addiu v0, v0, -24952
 	ldloc.1
-	ldc.i4 -26560
+	ldc.i4 -24952
 	add
 	stloc.1
-// 0x01099198: 0x1099198: sw    v0, 192(a0)
+// 0x010997e0: 0x10997e0: sw    v0, 192(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2894,15 +2894,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109919c: 0x109919c: lui   v0, 0x10a0000
+// 0x010997e4: 0x10997e4: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010991a0: 0x10991a0: addiu v0, v0, -28284
+// 0x010997e8: 0x10997e8: addiu v0, v0, -26676
 	ldloc.1
-	ldc.i4 -28284
+	ldc.i4 -26676
 	add
 	stloc.1
-// 0x010991a4: 0x10991a4: jr    ra sw    v0, 188(a0)
+// 0x010997ec: 0x10997ec: jr    ra sw    v0, 188(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2916,7 +2916,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2951,18 +2951,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010991ac: 0x10991ac: addiu sp, sp, -24
+// 0x010997f4: 0x10997f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010991b0: 0x10991b0: addiu a0, a0, 140
+// 0x010997f8: 0x10997f8: addiu a0, a0, 140
 	ldloc.1
 	ldc.i4 140
 	add
 	stloc.1
-// 0x010991b4: 0x10991b4: sw    ra, 20(sp)
-// 0x010991b8: 0x10991b8: jal   0x1001800 addiu a2, zero, 16
+// 0x010997fc: 0x10997fc: sw    ra, 20(sp)
+// 0x01099800: 0x1099800: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -2974,9 +2974,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010991c0: 0x10991c0: lw    ra, 20(sp)
-// 0x010991c4: 0x10991c4: sll   zero, zero, 0
-// 0x010991c8: 0x10991c8: jr    ra addiu sp, sp, 24
+// 0x01099808: 0x1099808: lw    ra, 20(sp)
+// 0x0109980c: 0x109980c: sll   zero, zero, 0
+// 0x01099810: 0x1099810: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2988,7 +2988,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_widget_set_click_offsets_ext_10991d0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_click_offsets_ext_1099818(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra)
@@ -3020,7 +3020,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010991d0: 0x10991d0: lw    v0, 16(sp)
+// 0x01099818: 0x1099818: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3029,7 +3029,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010991d4: 0x10991d4: sw    a1, 140(a0)
+// 0x0109981c: 0x109981c: sw    a1, 140(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3038,7 +3038,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010991d8: 0x10991d8: sw    v0, 152(a0)
+// 0x01099820: 0x1099820: sw    v0, 152(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3047,7 +3047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010991dc: 0x10991dc: sw    a2, 144(a0)
+// 0x01099824: 0x1099824: sw    a2, 144(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3056,7 +3056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010991e0: 0x10991e0: jr    ra sw    a3, 148(a0)
+// 0x01099828: 0x1099828: jr    ra sw    a3, 148(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3070,7 +3070,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void ssd_widget_set_focus_highlight_10991e8(int32,int32)
+.method public static void ssd_widget_set_focus_highlight_1099830(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 ra,int32[] mem)
@@ -3090,7 +3090,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010991e8: 0x10991e8: jr    ra sw    a1, 64(a0)
+// 0x01099830: 0x1099830: jr    ra sw    a1, 64(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -3103,7 +3103,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ssd_widget_set_recalculate_10991f0(int32)
+.method public static int32 ssd_widget_set_recalculate_1099838(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -3123,15 +3123,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010991f0: 0x10991f0: lui   v0, 0x80000
+// 0x01099838: 0x1099838: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010991f4: 0x10991f4: jr    ra sw    a0, 9812(v0)
+// 0x0109983c: 0x109983c: jr    ra sw    a0, 10276(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2453
+	ldc.i4 2569
 	add
 	ldloc.0
 	stelem.i4
@@ -3140,7 +3140,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_widget_free_node_10991fc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_free_node_1099844(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -3178,7 +3178,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010991fc: 0x10991fc: lw    v0, 220(a0)
+// 0x01099844: 0x1099844: lw    v0, 220(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3187,12 +3187,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099200: 0x1099200: addiu sp, sp, -24
+// 0x01099848: 0x1099848: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01099204: 0x1099204: sw    s0, 16(sp)
+// 0x0109984c: 0x109984c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3201,14 +3201,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099208: 0x1099208: sw    ra, 20(sp)
-// 0x0109920c: 0x109920c: beq   v0, zero, 0x109921c addu  s0, a0, zero
+// 0x01099850: 0x1099850: sw    ra, 20(sp)
+// 0x01099854: 0x1099854: beq   v0, zero, 0x1099864 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_109921c
+	brfalse L_1099864
 // --- basic block ---
-// 0x01099214: 0x1099214: jalr  v0 sll   zero, zero, 0
+// 0x0109985c: 0x109985c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3220,8 +3220,8 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_109921c:
-// 0x0109921c: 0x109921c: lw    a0, 16(s0)
+L_1099864:
+// 0x01099864: 0x1099864: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3230,7 +3230,7 @@ L_109921c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01099220: 0x1099220: jal   0x1000930 sll   zero, zero, 0
+// 0x01099868: 0x1099868: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3241,7 +3241,7 @@ L_109921c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01099228: 0x1099228: jal   0x1000930 addu  a0, s0, zero
+// 0x01099870: 0x1099870: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3254,8 +3254,8 @@ L_109921c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01099230: 0x1099230: lw    ra, 20(sp)
-// 0x01099234: 0x1099234: lw    s0, 16(sp)
+// 0x01099878: 0x1099878: lw    ra, 20(sp)
+// 0x0109987c: 0x109987c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3264,7 +3264,7 @@ L_109921c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099238: 0x1099238: jr    ra addiu sp, sp, 24
+// 0x01099880: 0x1099880: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3276,7 +3276,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_free_all_1099240(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_free_all_1099888(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -3317,13 +3317,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099240: 0x1099240: addiu sp, sp, -32
+// 0x01099888: 0x1099888: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01099244: 0x1099244: sw    ra, 28(sp)
-// 0x01099248: 0x1099248: sw    s1, 24(sp)
+// 0x0109988c: 0x109988c: sw    ra, 28(sp)
+// 0x01099890: 0x1099890: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3332,7 +3332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109924c: 0x109924c: beq   a0, zero, 0x1099294 sw    s0, 20(sp)
+// 0x01099894: 0x1099894: beq   a0, zero, 0x10998dc sw    s0, 20(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -3342,9 +3342,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1099294
+	brfalse L_10998dc
 // --- basic block ---
-// 0x01099254: 0x1099254: lw    v0, 48(a0)
+// 0x0109989c: 0x109989c: lw    v0, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3353,20 +3353,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099258: 0x1099258: sll   zero, zero, 0
-// 0x0109925c: 0x109925c: andi  v0, v0, 2048
+// 0x010998a0: 0x10998a0: sll   zero, zero, 0
+// 0x010998a4: 0x10998a4: andi  v0, v0, 2048
 	ldloc 5
 	ldc.i4 2048
 	and
 	stloc 5
-// 0x01099260: 0x1099260: bne   v0, zero, 0x1099294 addu  s0, a0, zero
+// 0x010998a8: 0x10998a8: bne   v0, zero, 0x10998dc addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brtrue L_1099294
+	brtrue L_10998dc
 // --- basic block ---
-L_1099268:
-// 0x01099268: 0x1099268: lw    v0, 12(s0)
+L_10998b0:
+// 0x010998b0: 0x10998b0: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3375,7 +3375,7 @@ L_1099268:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109926c: 0x109926c: lw    s1, 8(s0)
+// 0x010998b4: 0x10998b4: lw    s1, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3384,28 +3384,28 @@ L_1099268:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099270: 0x1099270: beq   v0, zero, 0x1099280 addu  a0, v0, zero
+// 0x010998b8: 0x10998b8: beq   v0, zero, 0x10998c8 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1099280
+	brfalse L_10998c8
 // --- basic block ---
-// 0x01099278: 0x1099278: jal   0x1099240 sll   zero, zero, 0
+// 0x010998c0: 0x10998c0: jal   0x1099888 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_all_1099240(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_all_1099888(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_1099280:
-// 0x01099280: 0x1099280: addu  a0, s0, zero
+L_10998c8:
+// 0x010998c8: 0x10998c8: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01099284: 0x1099284: jal   0x10991fc addu  s0, s1, zero
+// 0x010998cc: 0x10998cc: jal   0x1099844 addu  s0, s1, zero
 	ldloc 8
 	stloc 7
 	ldloc.0
@@ -3413,18 +3413,18 @@ L_1099280:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_node_10991fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_node_1099844(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109928c: 0x109928c: bne   s1, zero, 0x1099268 sll   zero, zero, 0
+// 0x010998d4: 0x10998d4: bne   s1, zero, 0x10998b0 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1099268
+	brtrue L_10998b0
 // --- basic block ---
-L_1099294:
-// 0x01099294: 0x1099294: lw    ra, 28(sp)
-// 0x01099298: 0x1099298: lw    s1, 24(sp)
+L_10998dc:
+// 0x010998dc: 0x10998dc: lw    ra, 28(sp)
+// 0x010998e0: 0x10998e0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3433,7 +3433,7 @@ L_1099294:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109929c: 0x109929c: lw    s0, 20(sp)
+// 0x010998e4: 0x10998e4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3442,7 +3442,7 @@ L_1099294:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010992a0: 0x10992a0: jr    ra addiu sp, sp, 32
+// 0x010998e8: 0x10998e8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3454,7 +3454,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_free_10992a8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_free_10998f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3492,12 +3492,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010992a8: 0x10992a8: addiu sp, sp, -24
+// 0x010998f0: 0x10998f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010992ac: 0x10992ac: sw    s0, 16(sp)
+// 0x010998f4: 0x10998f4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3506,14 +3506,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010992b0: 0x10992b0: sw    ra, 20(sp)
-// 0x010992b4: 0x10992b4: bne   a1, zero, 0x10992d0 addu  s0, a0, zero
+// 0x010998f8: 0x10998f8: sw    ra, 20(sp)
+// 0x010998fc: 0x10998fc: bne   a1, zero, 0x1099918 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 8
-	brtrue L_10992d0
+	brtrue L_1099918
 // --- basic block ---
-// 0x010992bc: 0x10992bc: lw    v0, 48(a0)
+// 0x01099904: 0x1099904: lw    v0, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3522,22 +3522,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010992c0: 0x10992c0: sll   zero, zero, 0
-// 0x010992c4: 0x10992c4: andi  v0, v0, 2048
+// 0x01099908: 0x1099908: sll   zero, zero, 0
+// 0x0109990c: 0x109990c: andi  v0, v0, 2048
 	ldloc 5
 	ldc.i4 2048
 	and
 	stloc 5
-// 0x010992c8: 0x10992c8: bne   v0, zero, 0x1099340 sll   zero, zero, 0
+// 0x01099910: 0x1099910: bne   v0, zero, 0x1099988 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1099340
+	brtrue L_1099988
 // --- basic block ---
-L_10992d0:
-// 0x010992d0: 0x10992d0: beq   a2, zero, 0x109932c sll   zero, zero, 0
+L_1099918:
+// 0x01099918: 0x1099918: beq   a2, zero, 0x1099974 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_109932c
+	brfalse L_1099974
 // --- basic block ---
-// 0x010992d8: 0x10992d8: lw    v1, 4(s0)
+// 0x01099920: 0x1099920: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3546,12 +3546,12 @@ L_10992d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010992dc: 0x10992dc: sll   zero, zero, 0
-// 0x010992e0: 0x10992e0: beq   v1, zero, 0x109932c sll   zero, zero, 0
+// 0x01099924: 0x1099924: sll   zero, zero, 0
+// 0x01099928: 0x1099928: beq   v1, zero, 0x1099974 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109932c
+	brfalse L_1099974
 // --- basic block ---
-// 0x010992e8: 0x10992e8: lw    v0, 12(v1)
+// 0x01099930: 0x1099930: lw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3560,13 +3560,13 @@ L_10992d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010992ec: 0x10992ec: sll   zero, zero, 0
-// 0x010992f0: 0x10992f0: bne   v0, s0, 0x1099324 sll   zero, zero, 0
+// 0x01099934: 0x1099934: sll   zero, zero, 0
+// 0x01099938: 0x1099938: bne   v0, s0, 0x109996c sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_1099324
+	bne.un L_109996c
 // --- basic block ---
-// 0x010992f8: 0x10992f8: lw    v0, 8(s0)
+// 0x01099940: 0x1099940: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3575,7 +3575,7 @@ L_10992d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010992fc: 0x10992fc: j	 0x109932c sw    v0, 12(v1)
+// 0x01099944: 0x1099944: j	 0x1099974 sw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3584,10 +3584,10 @@ L_10992d0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109932c
+	br L_1099974
 // --- basic block ---
-L_1099304:
-// 0x01099304: 0x1099304: lw    v1, 8(v0)
+L_109994c:
+// 0x0109994c: 0x109994c: lw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3596,13 +3596,13 @@ L_1099304:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099308: 0x1099308: sll   zero, zero, 0
-// 0x0109930c: 0x109930c: bne   v1, s0, 0x1099320 sll   zero, zero, 0
+// 0x01099950: 0x1099950: sll   zero, zero, 0
+// 0x01099954: 0x1099954: bne   v1, s0, 0x1099968 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1099320
+	bne.un L_1099968
 // --- basic block ---
-// 0x01099314: 0x1099314: lw    v1, 8(s0)
+// 0x0109995c: 0x109995c: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3611,7 +3611,7 @@ L_1099304:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099318: 0x1099318: j	 0x109932c sw    v1, 8(v0)
+// 0x01099960: 0x1099960: j	 0x1099974 sw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3620,19 +3620,19 @@ L_1099304:
 	add
 	ldloc 7
 	stelem.i4
-	br L_109932c
+	br L_1099974
 // --- basic block ---
-L_1099320:
-// 0x01099320: 0x1099320: addu  v0, v1, zero
+L_1099968:
+// 0x01099968: 0x1099968: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-L_1099324:
-// 0x01099324: 0x1099324: bne   v0, zero, 0x1099304 sll   zero, zero, 0
+L_109996c:
+// 0x0109996c: 0x109996c: bne   v0, zero, 0x109994c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1099304
+	brtrue L_109994c
 // --- basic block ---
-L_109932c:
-// 0x0109932c: 0x109932c: lw    a0, 12(s0)
+L_1099974:
+// 0x01099974: 0x1099974: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3641,18 +3641,18 @@ L_109932c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01099330: 0x1099330: jal   0x1099240 sll   zero, zero, 0
+// 0x01099978: 0x1099978: jal   0x1099888 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_all_1099240(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_all_1099888(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01099338: 0x1099338: jal   0x10991fc addu  a0, s0, zero
+// 0x01099980: 0x1099980: jal   0x1099844 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3660,14 +3660,14 @@ L_109932c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_node_10991fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_node_1099844(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1099340:
-// 0x01099340: 0x1099340: lw    ra, 20(sp)
-// 0x01099344: 0x1099344: lw    s0, 16(sp)
+L_1099988:
+// 0x01099988: 0x1099988: lw    ra, 20(sp)
+// 0x0109998c: 0x109998c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3676,7 +3676,7 @@ L_1099340:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099348: 0x1099348: jr    ra addiu sp, sp, 24
+// 0x01099990: 0x1099990: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3688,7 +3688,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 s3,int32 ra)
@@ -3738,7 +3738,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099350: 0x1099350: lw    v0, 24(a0)
+// 0x01099998: 0x1099998: lw    v0, 24(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3747,19 +3747,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099354: 0x1099354: addiu sp, sp, -80
+// 0x0109999c: 0x109999c: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01099358: 0x1099358: sw    v0, 0(a1)
+// 0x010999a0: 0x10999a0: sw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0109935c: 0x109935c: lw    v0, 28(a0)
+// 0x010999a4: 0x10999a4: lw    v0, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3768,7 +3768,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099360: 0x1099360: sw    s1, 60(sp)
+// 0x010999a8: 0x10999a8: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3777,7 +3777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01099364: 0x1099364: sw    v0, 4(a1)
+// 0x010999ac: 0x10999ac: sw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01099368: 0x1099368: lw    v0, 28(a0)
+// 0x010999b0: 0x10999b0: lw    v0, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3795,7 +3795,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109936c: 0x109936c: sw    s0, 56(sp)
+// 0x010999b4: 0x10999b4: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3804,8 +3804,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099370: 0x1099370: sw    ra, 76(sp)
-// 0x01099374: 0x1099374: sw    s4, 72(sp)
+// 0x010999b8: 0x10999b8: sw    ra, 76(sp)
+// 0x010999bc: 0x10999bc: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3814,7 +3814,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01099378: 0x1099378: sw    s3, 68(sp)
+// 0x010999c0: 0x10999c0: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3823,7 +3823,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109937c: 0x109937c: sw    s2, 64(sp)
+// 0x010999c4: 0x10999c4: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3832,13 +3832,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01099380: 0x1099380: addu  s1, a0, zero
+// 0x010999c8: 0x10999c8: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01099384: 0x1099384: addu  s0, a1, zero
+// 0x010999cc: 0x10999cc: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01099388: 0x1099388: sw    zero, 16(sp)
+// 0x010999d0: 0x10999d0: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3847,7 +3847,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109938c: 0x109938c: bltz  v0, 0x10993a4 sw    zero, 20(sp)
+// 0x010999d4: 0x10999d4: bltz  v0, 0x10999ec sw    zero, 20(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3858,9 +3858,9 @@ __CIBYL_javamethod_begin:
 	ldc.i4.s 0
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10993a4
+	blt L_10999ec
 // --- basic block ---
-// 0x01099394: 0x1099394: lw    v0, 24(a0)
+// 0x010999dc: 0x10999dc: lw    v0, 24(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3869,14 +3869,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099398: 0x1099398: sll   zero, zero, 0
-// 0x0109939c: 0x109939c: bgez  v0, 0x1099614 sll   zero, zero, 0
+// 0x010999e0: 0x10999e0: sll   zero, zero, 0
+// 0x010999e4: 0x10999e4: bgez  v0, 0x1099c5c sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1099614
+	bge L_1099c5c
 // --- basic block ---
-L_10993a4:
-// 0x010993a4: 0x10993a4: sw    zero, 40(sp)
+L_10999ec:
+// 0x010999ec: 0x10999ec: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3885,7 +3885,7 @@ L_10993a4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010993a8: 0x10993a8: sw    zero, 44(sp)
+// 0x010999f0: 0x10999f0: sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3894,7 +3894,7 @@ L_10993a4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010993ac: 0x10993ac: sw    zero, 48(sp)
+// 0x010999f4: 0x10999f4: sw    zero, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3903,7 +3903,7 @@ L_10993a4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010993b0: 0x10993b0: bne   a2, zero, 0x10993f0 sw    zero, 52(sp)
+// 0x010999f8: 0x10999f8: bne   a2, zero, 0x1099a38 sw    zero, 52(sp)
 	ldloc.3
 	ldloc 6
 	ldloc.0
@@ -3913,9 +3913,9 @@ L_10993a4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_10993f0
+	brtrue L_1099a38
 // --- basic block ---
-// 0x010993b8: 0x10993b8: lw    v0, 32(s1)
+// 0x01099a00: 0x1099a00: lw    v0, 32(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3924,68 +3924,68 @@ L_10993a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010993bc: 0x10993bc: sll   zero, zero, 0
-// 0x010993c0: 0x10993c0: bgez  v0, 0x10993f8 addiu a2, s1, 32
+// 0x01099a04: 0x1099a04: sll   zero, zero, 0
+// 0x01099a08: 0x1099a08: bgez  v0, 0x1099a40 addiu a2, s1, 32
 	ldloc 5
 	ldloc 9
 	ldc.i4.s 32
 	add
 	stloc.3
 	ldc.i4.s 0
-	bge L_10993f8
+	bge L_1099a40
 // --- basic block ---
-// 0x010993c8: 0x10993c8: lui   v0, 0xf0000
+// 0x01099a10: 0x1099a10: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010993cc: 0x10993cc: lw    v0, -30068(v0)
+// 0x01099a14: 0x1099a14: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x010993d0: 0x10993d0: lui   v1, 0xf0000
+// 0x01099a18: 0x1099a18: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x010993d4: 0x10993d4: lw    s3, -30072(v1)
+// 0x01099a1c: 0x1099a1c: lw    s3, -29608(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 12
-// 0x010993d8: 0x10993d8: lui   s2, 0x80000
+// 0x01099a20: 0x1099a20: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x010993dc: 0x10993dc: jal   0x1042430 sw    v0, 9816(s2)
+// 0x01099a24: 0x1099a24: jal   0x1042440 sw    v0, 10280(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2454
+	ldc.i4 2570
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010993e4: 0x10993e4: subu  v0, s3, v0
+// 0x01099a2c: 0x1099a2c: subu  v0, s3, v0
 	ldloc 12
 	ldloc 5
 	sub
 	stloc 5
-// 0x010993e8: 0x10993e8: addiu a2, s2, 9816
+// 0x01099a30: 0x1099a30: addiu a2, s2, 10280
 	ldloc 10
-	ldc.i4 9816
+	ldc.i4 10280
 	add
 	stloc.3
-// 0x010993ec: 0x10993ec: sw    v0, 4(a2)
+// 0x01099a34: 0x1099a34: sw    v0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -3994,8 +3994,8 @@ L_10993a4:
 	add
 	ldloc 5
 	stelem.i4
-L_10993f0:
-// 0x010993f0: 0x10993f0: lw    v0, 32(s1)
+L_1099a38:
+// 0x01099a38: 0x1099a38: lw    v0, 32(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4004,14 +4004,14 @@ L_10993f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010993f4: 0x10993f4: sll   zero, zero, 0
-L_10993f8:
-// 0x010993f8: 0x10993f8: bltz  v0, 0x1099420 sll   zero, zero, 0
+// 0x01099a3c: 0x1099a3c: sll   zero, zero, 0
+L_1099a40:
+// 0x01099a40: 0x1099a40: bltz  v0, 0x1099a68 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	blt L_1099420
+	blt L_1099a68
 // --- basic block ---
-// 0x01099400: 0x1099400: lw    v1, 36(s1)
+// 0x01099a48: 0x1099a48: lw    v1, 36(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4020,20 +4020,20 @@ L_10993f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099404: 0x1099404: sll   zero, zero, 0
-// 0x01099408: 0x1099408: bltz  v1, 0x1099420 sll   zero, zero, 0
+// 0x01099a4c: 0x1099a4c: sll   zero, zero, 0
+// 0x01099a50: 0x1099a50: bltz  v1, 0x1099a68 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	blt L_1099420
+	blt L_1099a68
 // --- basic block ---
-// 0x01099410: 0x1099410: sw    v0, 0(s0)
+// 0x01099a58: 0x1099a58: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01099414: 0x1099414: lw    v0, 36(s1)
+// 0x01099a5c: 0x1099a5c: lw    v0, 36(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4042,7 +4042,7 @@ L_10993f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099418: 0x1099418: j	 0x1099614 sw    v0, 4(s0)
+// 0x01099a60: 0x1099a60: j	 0x1099c5c sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4051,10 +4051,10 @@ L_10993f8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1099614
+	br L_1099c5c
 // --- basic block ---
-L_1099420:
-// 0x01099420: 0x1099420: lw    a0, 48(s1)
+L_1099a68:
+// 0x01099a68: 0x1099a68: lw    a0, 48(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4063,149 +4063,149 @@ L_1099420:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01099424: 0x1099424: lui   v0, 0x30000
+// 0x01099a6c: 0x1099a6c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01099428: 0x1099428: and   a0, a0, v0
+// 0x01099a70: 0x1099a70: and   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	and
 	stloc.1
-// 0x0109942c: 0x109942c: lui   v1, 0x10000
+// 0x01099a74: 0x1099a74: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01099430: 0x1099430: lw    v0, 0(s0)
+// 0x01099a78: 0x1099a78: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01099434: 0x1099434: bne   a0, v1, 0x1099490 addiu v1, zero, -2
+// 0x01099a7c: 0x1099a7c: bne   a0, v1, 0x1099ad8 addiu v1, zero, -2
 	ldloc.1
 	ldloc 7
 	ldc.i4.s -2
 	stloc 7
-	bne.un L_1099490
+	bne.un L_1099ad8
 // --- basic block ---
-// 0x0109943c: 0x109943c: bne   v0, v1, 0x10994a4 lui   v0, 0xf0000
+// 0x01099a84: 0x1099a84: bne   v0, v1, 0x1099aec lui   v0, 0xf0000
 	ldloc 5
 	ldloc 7
 	ldc.i4 983040
 	stloc 5
-	bne.un L_10994a4
+	bne.un L_1099aec
 // --- basic block ---
-// 0x01099444: 0x1099444: lw    v1, -30068(v0)
+// 0x01099a8c: 0x1099a8c: lw    v1, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099448: 0x1099448: lw    v0, 0(a2)
+// 0x01099a90: 0x1099a90: lw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109944c: 0x109944c: sll   zero, zero, 0
-// 0x01099450: 0x1099450: slt   a0, v0, v1
+// 0x01099a94: 0x1099a94: sll   zero, zero, 0
+// 0x01099a98: 0x1099a98: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x01099454: 0x1099454: beq   a0, zero, 0x1099470 lui   a0, 0xf0000
+// 0x01099a9c: 0x1099a9c: beq   a0, zero, 0x1099ab8 lui   a0, 0xf0000
 	ldloc.1
 	ldc.i4 983040
 	stloc.1
-	brfalse L_1099470
+	brfalse L_1099ab8
 // --- basic block ---
-// 0x0109945c: 0x109945c: lw    a0, -30072(a0)
+// 0x01099aa4: 0x1099aa4: lw    a0, -29608(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x01099460: 0x1099460: sll   zero, zero, 0
-// 0x01099464: 0x1099464: slt   a0, v0, a0
+// 0x01099aa8: 0x1099aa8: sll   zero, zero, 0
+// 0x01099aac: 0x1099aac: slt   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.1
-// 0x01099468: 0x1099468: bne   a0, zero, 0x10994a0 addiu v0, v0, -20
+// 0x01099ab0: 0x1099ab0: bne   a0, zero, 0x1099ae8 addiu v0, v0, -20
 	ldloc.1
 	ldloc 5
 	ldc.i4.s -20
 	add
 	stloc 5
-	brtrue L_10994a0
+	brtrue L_1099ae8
 // --- basic block ---
-L_1099470:
-// 0x01099470: 0x1099470: lui   v0, 0xf0000
+L_1099ab8:
+// 0x01099ab8: 0x1099ab8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01099474: 0x1099474: lw    v0, -30072(v0)
+// 0x01099abc: 0x1099abc: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099478: 0x1099478: sll   zero, zero, 0
-// 0x0109947c: 0x109947c: slt   a0, v0, v1
+// 0x01099ac0: 0x1099ac0: sll   zero, zero, 0
+// 0x01099ac4: 0x1099ac4: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x01099480: 0x1099480: bne   a0, zero, 0x10994a0 addiu v1, v1, -20
+// 0x01099ac8: 0x1099ac8: bne   a0, zero, 0x1099ae8 addiu v1, v1, -20
 	ldloc.1
 	ldloc 7
 	ldc.i4.s -20
 	add
 	stloc 7
-	brtrue L_10994a0
+	brtrue L_1099ae8
 // --- basic block ---
-// 0x01099488: 0x1099488: j	 0x10994a4 sw    v1, 0(s0)
+// 0x01099ad0: 0x1099ad0: j	 0x1099aec sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_10994a4
+	br L_1099aec
 // --- basic block ---
-L_1099490:
-// 0x01099490: 0x1099490: bne   v0, v1, 0x10994a4 sll   zero, zero, 0
+L_1099ad8:
+// 0x01099ad8: 0x1099ad8: bne   v0, v1, 0x1099aec sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_10994a4
+	bne.un L_1099aec
 // --- basic block ---
-// 0x01099498: 0x1099498: lw    v0, 0(a2)
+// 0x01099ae0: 0x1099ae0: lw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109949c: 0x109949c: sll   zero, zero, 0
-L_10994a0:
-// 0x010994a0: 0x10994a0: sw    v0, 0(s0)
+// 0x01099ae4: 0x1099ae4: sll   zero, zero, 0
+L_1099ae8:
+// 0x01099ae8: 0x1099ae8: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10994a4:
-// 0x010994a4: 0x10994a4: lw    v1, 4(s0)
+L_1099aec:
+// 0x01099aec: 0x1099aec: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4214,15 +4214,15 @@ L_10994a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010994a8: 0x10994a8: addiu v0, zero, -2
+// 0x01099af0: 0x1099af0: addiu v0, zero, -2
 	ldc.i4.s -2
 	stloc 5
-// 0x010994ac: 0x10994ac: bne   v1, v0, 0x10994c0 sll   zero, zero, 0
+// 0x01099af4: 0x1099af4: bne   v1, v0, 0x1099b08 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10994c0
+	bne.un L_1099b08
 // --- basic block ---
-// 0x010994b4: 0x10994b4: lw    v0, 4(a2)
+// 0x01099afc: 0x1099afc: lw    v0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4231,8 +4231,8 @@ L_10994a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010994b8: 0x10994b8: sll   zero, zero, 0
-// 0x010994bc: 0x10994bc: sw    v0, 4(s0)
+// 0x01099b00: 0x1099b00: sll   zero, zero, 0
+// 0x01099b04: 0x1099b04: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4241,8 +4241,8 @@ L_10994a4:
 	add
 	ldloc 5
 	stelem.i4
-L_10994c0:
-// 0x010994c0: 0x10994c0: lw    v0, 4(s0)
+L_1099b08:
+// 0x01099b08: 0x1099b08: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4251,26 +4251,26 @@ L_10994c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010994c4: 0x10994c4: sll   zero, zero, 0
-// 0x010994c8: 0x10994c8: bltz  v0, 0x10994e8 sll   zero, zero, 0
+// 0x01099b0c: 0x1099b0c: sll   zero, zero, 0
+// 0x01099b10: 0x1099b10: bltz  v0, 0x1099b30 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	blt L_10994e8
+	blt L_1099b30
 // --- basic block ---
-// 0x010994d0: 0x10994d0: lw    v1, 0(s0)
+// 0x01099b18: 0x1099b18: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010994d4: 0x10994d4: sll   zero, zero, 0
-// 0x010994d8: 0x10994d8: bltz  v1, 0x10994f0 sll   zero, zero, 0
+// 0x01099b1c: 0x1099b1c: sll   zero, zero, 0
+// 0x01099b20: 0x1099b20: bltz  v1, 0x1099b38 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	blt L_10994f0
+	blt L_1099b38
 // --- basic block ---
-// 0x010994e0: 0x10994e0: j	 0x1099608 sw    v1, 32(s1)
+// 0x01099b28: 0x1099b28: j	 0x1099c50 sw    v1, 32(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4279,42 +4279,42 @@ L_10994c0:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1099608
+	br L_1099c50
 // --- basic block ---
-L_10994e8:
-// 0x010994e8: 0x10994e8: lw    v1, 0(s0)
+L_1099b30:
+// 0x01099b30: 0x1099b30: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010994ec: 0x10994ec: sll   zero, zero, 0
-L_10994f0:
-// 0x010994f0: 0x10994f0: bgez  v1, 0x1099504 addiu v1, v1, -1
+// 0x01099b34: 0x1099b34: sll   zero, zero, 0
+L_1099b38:
+// 0x01099b38: 0x1099b38: bgez  v1, 0x1099b4c addiu v1, v1, -1
 	ldloc 7
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
 	ldc.i4.s 0
-	bge L_1099504
+	bge L_1099b4c
 // --- basic block ---
-// 0x010994f8: 0x10994f8: lw    v1, 0(a2)
+// 0x01099b40: 0x1099b40: lw    v1, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010994fc: 0x10994fc: sll   zero, zero, 0
-// 0x01099500: 0x1099500: addiu v1, v1, -1
+// 0x01099b44: 0x1099b44: sll   zero, zero, 0
+// 0x01099b48: 0x1099b48: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-L_1099504:
-// 0x01099504: 0x1099504: bgez  v0, 0x1099510 sw    v1, 48(sp)
+L_1099b4c:
+// 0x01099b4c: 0x1099b4c: bgez  v0, 0x1099b58 sw    v1, 48(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4325,9 +4325,9 @@ L_1099504:
 	ldloc 7
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1099510
+	bge L_1099b58
 // --- basic block ---
-// 0x0109950c: 0x109950c: lw    v0, 4(a2)
+// 0x01099b54: 0x1099b54: lw    v0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4336,37 +4336,37 @@ L_1099504:
 	add
 	ldelem.i4
 	stloc 5
-L_1099510:
-// 0x01099510: 0x1099510: addiu s4, sp, 40
+L_1099b58:
+// 0x01099b58: 0x1099b58: addiu s4, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 11
-// 0x01099514: 0x1099514: addiu s2, sp, 24
+// 0x01099b5c: 0x1099b5c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01099518: 0x1099518: addiu v0, v0, -1
+// 0x01099b60: 0x1099b60: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0109951c: 0x109951c: addu  a1, s4, zero
+// 0x01099b64: 0x1099b64: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x01099520: 0x1099520: addiu a2, zero, 16
+// 0x01099b68: 0x1099b68: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01099524: 0x1099524: addu  a0, s2, zero
+// 0x01099b6c: 0x1099b6c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01099528: 0x1099528: addiu s3, sp, 16
+// 0x01099b70: 0x1099b70: addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-// 0x0109952c: 0x109952c: jal   0x1001800 sw    v0, 52(sp)
+// 0x01099b74: 0x1099b74: jal   0x1001800 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4384,13 +4384,13 @@ L_1099510:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01099534: 0x1099534: addu  a0, s1, zero
+// 0x01099b7c: 0x1099b7c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01099538: 0x1099538: addu  a2, s4, zero
+// 0x01099b80: 0x1099b80: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x0109953c: 0x109953c: jal   0x1099c38 addu  a1, s3, zero
+// 0x01099b84: 0x1099b84: jal   0x109a280 addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -4398,12 +4398,12 @@ L_1099510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::get_size_1099c38(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::get_size_109a280(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01099544: 0x1099544: lw    v0, 48(s1)
+// 0x01099b8c: 0x1099b8c: lw    v0, 48(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4412,59 +4412,59 @@ L_1099510:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099548: 0x1099548: sll   zero, zero, 0
-// 0x0109954c: 0x109954c: bgez  v0, 0x10995c4 lui   v0, 0xf0000
+// 0x01099b90: 0x1099b90: sll   zero, zero, 0
+// 0x01099b94: 0x1099b94: bgez  v0, 0x1099c0c lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
 	ldc.i4.s 0
-	bge L_10995c4
+	bge L_1099c0c
 // --- basic block ---
-// 0x01099554: 0x1099554: lui   s4, 0xf0000
+// 0x01099b9c: 0x1099b9c: lui   s4, 0xf0000
 	ldc.i4 983040
 	stloc 11
-// 0x01099558: 0x1099558: lw    v1, -30072(v0)
+// 0x01099ba0: 0x1099ba0: lw    v1, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109955c: 0x109955c: lw    v0, -30068(s4)
+// 0x01099ba4: 0x1099ba4: lw    v0, -29604(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099560: 0x1099560: sll   zero, zero, 0
-// 0x01099564: 0x1099564: slt   v0, v1, v0
+// 0x01099ba8: 0x1099ba8: sll   zero, zero, 0
+// 0x01099bac: 0x1099bac: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01099568: 0x1099568: beq   v0, zero, 0x10995c4 sll   zero, zero, 0
+// 0x01099bb0: 0x1099bb0: beq   v0, zero, 0x1099c0c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10995c4
+	brfalse L_1099c0c
 // --- basic block ---
-// 0x01099570: 0x1099570: lw    v0, 0(s0)
+// 0x01099bb8: 0x1099bb8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01099574: 0x1099574: sll   zero, zero, 0
-// 0x01099578: 0x1099578: bne   v0, v1, 0x10995c4 sll   zero, zero, 0
+// 0x01099bbc: 0x1099bbc: sll   zero, zero, 0
+// 0x01099bc0: 0x1099bc0: bne   v0, v1, 0x1099c0c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_10995c4
+	bne.un L_1099c0c
 // --- basic block ---
-// 0x01099580: 0x1099580: lw    v1, 20(sp)
+// 0x01099bc8: 0x1099bc8: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4473,17 +4473,17 @@ L_1099510:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099584: 0x1099584: sll   zero, zero, 0
-// 0x01099588: 0x1099588: slt   v0, v0, v1
+// 0x01099bcc: 0x1099bcc: sll   zero, zero, 0
+// 0x01099bd0: 0x1099bd0: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x0109958c: 0x109958c: beq   v0, zero, 0x10995c4 sll   zero, zero, 0
+// 0x01099bd4: 0x1099bd4: beq   v0, zero, 0x1099c0c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10995c4
+	brfalse L_1099c0c
 // --- basic block ---
-// 0x01099594: 0x1099594: jal   0x1098ff8 addu  a0, s1, zero
+// 0x01099bdc: 0x1099bdc: jal   0x1099640 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4491,42 +4491,42 @@ L_1099510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109959c: 0x109959c: lw    v1, -30068(s4)
+// 0x01099be4: 0x1099be4: lw    v1, -29604(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x010995a0: 0x10995a0: addu  a1, s3, zero
+// 0x01099be8: 0x1099be8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010995a4: 0x10995a4: sw    v1, 0(s0)
+// 0x01099bec: 0x1099bec: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010995a8: 0x10995a8: addiu v0, v1, -1
+// 0x01099bf0: 0x1099bf0: addiu v0, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010995ac: 0x10995ac: addu  a2, s2, zero
+// 0x01099bf4: 0x1099bf4: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010995b0: 0x10995b0: addu  a0, s1, zero
+// 0x01099bf8: 0x1099bf8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010995b4: 0x10995b4: sw    v0, 32(sp)
+// 0x01099bfc: 0x1099bfc: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4535,7 +4535,7 @@ L_1099510:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010995b8: 0x10995b8: sw    zero, 20(sp)
+// 0x01099c00: 0x1099c00: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4544,7 +4544,7 @@ L_1099510:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010995bc: 0x10995bc: jal   0x1099c38 sw    zero, 16(sp)
+// 0x01099c04: 0x1099c04: jal   0x109a280 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4558,13 +4558,13 @@ L_1099510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::get_size_1099c38(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::get_size_109a280(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10995c4:
-// 0x010995c4: 0x10995c4: lw    v0, 4(s0)
+L_1099c0c:
+// 0x01099c0c: 0x1099c0c: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4573,13 +4573,13 @@ L_10995c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010995c8: 0x10995c8: sll   zero, zero, 0
-// 0x010995cc: 0x10995cc: bgez  v0, 0x10995e0 sll   zero, zero, 0
+// 0x01099c10: 0x1099c10: sll   zero, zero, 0
+// 0x01099c14: 0x1099c14: bgez  v0, 0x1099c28 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_10995e0
+	bge L_1099c28
 // --- basic block ---
-// 0x010995d4: 0x10995d4: lw    v0, 20(sp)
+// 0x01099c1c: 0x1099c1c: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4588,8 +4588,8 @@ L_10995c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010995d8: 0x10995d8: sll   zero, zero, 0
-// 0x010995dc: 0x10995dc: sw    v0, 4(s0)
+// 0x01099c20: 0x1099c20: sll   zero, zero, 0
+// 0x01099c24: 0x1099c24: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4598,21 +4598,21 @@ L_10995c4:
 	add
 	ldloc 5
 	stelem.i4
-L_10995e0:
-// 0x010995e0: 0x10995e0: lw    v0, 0(s0)
+L_1099c28:
+// 0x01099c28: 0x1099c28: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010995e4: 0x10995e4: sll   zero, zero, 0
-// 0x010995e8: 0x10995e8: bgez  v0, 0x1099604 sll   zero, zero, 0
+// 0x01099c2c: 0x1099c2c: sll   zero, zero, 0
+// 0x01099c30: 0x1099c30: bgez  v0, 0x1099c4c sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1099604
+	bge L_1099c4c
 // --- basic block ---
-// 0x010995f0: 0x10995f0: lw    v0, 16(sp)
+// 0x01099c38: 0x1099c38: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4621,24 +4621,24 @@ L_10995e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010995f4: 0x10995f4: sll   zero, zero, 0
-// 0x010995f8: 0x10995f8: sw    v0, 0(s0)
+// 0x01099c3c: 0x1099c3c: sll   zero, zero, 0
+// 0x01099c40: 0x1099c40: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010995fc: 0x10995fc: lw    v0, 0(s0)
+// 0x01099c44: 0x1099c44: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01099600: 0x1099600: sll   zero, zero, 0
-L_1099604:
-// 0x01099604: 0x1099604: sw    v0, 32(s1)
+// 0x01099c48: 0x1099c48: sll   zero, zero, 0
+L_1099c4c:
+// 0x01099c4c: 0x1099c4c: sw    v0, 32(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4647,8 +4647,8 @@ L_1099604:
 	add
 	ldloc 5
 	stelem.i4
-L_1099608:
-// 0x01099608: 0x1099608: lw    v0, 4(s0)
+L_1099c50:
+// 0x01099c50: 0x1099c50: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4657,8 +4657,8 @@ L_1099608:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109960c: 0x109960c: sll   zero, zero, 0
-// 0x01099610: 0x1099610: sw    v0, 36(s1)
+// 0x01099c54: 0x1099c54: sll   zero, zero, 0
+// 0x01099c58: 0x1099c58: sw    v0, 36(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4667,9 +4667,9 @@ L_1099608:
 	add
 	ldloc 5
 	stelem.i4
-L_1099614:
-// 0x01099614: 0x1099614: lw    ra, 76(sp)
-// 0x01099618: 0x1099618: lw    s4, 72(sp)
+L_1099c5c:
+// 0x01099c5c: 0x1099c5c: lw    ra, 76(sp)
+// 0x01099c60: 0x1099c60: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4678,7 +4678,7 @@ L_1099614:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109961c: 0x109961c: lw    s3, 68(sp)
+// 0x01099c64: 0x1099c64: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4687,7 +4687,7 @@ L_1099614:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01099620: 0x1099620: lw    s2, 64(sp)
+// 0x01099c68: 0x1099c68: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4696,7 +4696,7 @@ L_1099614:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01099624: 0x1099624: lw    s1, 60(sp)
+// 0x01099c6c: 0x1099c6c: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4705,7 +4705,7 @@ L_1099614:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01099628: 0x1099628: lw    s0, 56(sp)
+// 0x01099c70: 0x1099c70: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4714,7 +4714,7 @@ L_1099614:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109962c: 0x109962c: jr    ra addiu sp, sp, 80
+// 0x01099c74: 0x1099c74: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -4726,7 +4726,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_contains_point_109973c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_contains_point_1099d84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 lo,int32 s2,int32 ra)
@@ -4773,12 +4773,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109973c: 0x109973c: addiu sp, sp, -40
+// 0x01099d84: 0x1099d84: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01099740: 0x1099740: sw    s2, 32(sp)
+// 0x01099d88: 0x1099d88: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4787,7 +4787,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01099744: 0x1099744: sw    s1, 28(sp)
+// 0x01099d8c: 0x1099d8c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4796,7 +4796,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099748: 0x1099748: sw    s0, 24(sp)
+// 0x01099d90: 0x1099d90: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4805,22 +4805,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109974c: 0x109974c: addu  s2, a1, zero
+// 0x01099d94: 0x1099d94: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01099750: 0x1099750: addu  s0, a0, zero
+// 0x01099d98: 0x1099d98: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01099754: 0x1099754: addu  s1, a2, zero
+// 0x01099d9c: 0x1099d9c: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01099758: 0x1099758: addiu a1, sp, 16
+// 0x01099da0: 0x1099da0: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0109975c: 0x109975c: sw    ra, 36(sp)
-// 0x01099760: 0x1099760: jal   0x1099350 addu  a2, zero, zero
+// 0x01099da4: 0x1099da4: sw    ra, 36(sp)
+// 0x01099da8: 0x1099da8: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4828,12 +4828,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01099768: 0x1099768: lw    v1, 48(s0)
+// 0x01099db0: 0x1099db0: lw    v1, 48(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4842,19 +4842,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109976c: 0x109976c: sll   zero, zero, 0
-// 0x01099770: 0x1099770: andi  v1, v1, 256
+// 0x01099db4: 0x1099db4: sll   zero, zero, 0
+// 0x01099db8: 0x1099db8: andi  v1, v1, 256
 	ldloc 7
 	ldc.i4 256
 	and
 	stloc 7
-// 0x01099774: 0x1099774: bne   v1, zero, 0x1099828 addu  v0, zero, zero
+// 0x01099dbc: 0x1099dbc: bne   v1, zero, 0x1099e70 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1099828
+	brtrue L_1099e70
 // --- basic block ---
-// 0x0109977c: 0x109977c: lw    v0, 140(s0)
+// 0x01099dc4: 0x1099dc4: lw    v0, 140(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4863,7 +4863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099780: 0x1099780: lw    a1, 120(s0)
+// 0x01099dc8: 0x1099dc8: lw    a1, 120(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4872,38 +4872,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01099784: 0x1099784: mult  s1, v0
+// 0x01099dcc: 0x1099dcc: mult  s1, v0
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 10
-// 0x01099788: 0x1099788: lw    a0, 0(s2)
+// 0x01099dd0: 0x1099dd0: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109978c: 0x109978c: mflo  lo
+// 0x01099dd4: 0x1099dd4: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01099790: 0x1099790: addu  v0, v0, a1
+// 0x01099dd8: 0x1099dd8: addu  v0, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x01099794: 0x1099794: slt   v0, a0, v0
+// 0x01099ddc: 0x1099ddc: slt   v0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01099798: 0x1099798: bne   v0, zero, 0x1099828 addu  v0, zero, zero
+// 0x01099de0: 0x1099de0: bne   v0, zero, 0x1099e70 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1099828
+	brtrue L_1099e70
 // --- basic block ---
-// 0x010997a0: 0x10997a0: lw    a2, 144(s0)
+// 0x01099de8: 0x1099de8: lw    a2, 144(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4912,7 +4912,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010997a4: 0x10997a4: lw    v1, 124(s0)
+// 0x01099dec: 0x1099dec: lw    v1, 124(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4921,12 +4921,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010997a8: 0x10997a8: mult  s1, a2
+// 0x01099df0: 0x1099df0: mult  s1, a2
 	ldloc 8
 	ldloc.3
 	mul
 	stloc 10
-// 0x010997ac: 0x10997ac: lw    v0, 4(s2)
+// 0x01099df4: 0x1099df4: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4935,24 +4935,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010997b0: 0x10997b0: mflo  lo
+// 0x01099df8: 0x1099df8: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x010997b4: 0x10997b4: addu  a2, a2, v1
+// 0x01099dfc: 0x1099dfc: addu  a2, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc.3
-// 0x010997b8: 0x10997b8: slt   a2, v0, a2
+// 0x01099e00: 0x1099e00: slt   a2, v0, a2
 	ldloc 6
 	ldloc.3
 	clt
 	stloc.3
-// 0x010997bc: 0x10997bc: bne   a2, zero, 0x1099824 sll   zero, zero, 0
+// 0x01099e04: 0x1099e04: bne   a2, zero, 0x1099e6c sll   zero, zero, 0
 	ldloc.3
-	brtrue L_1099824
+	brtrue L_1099e6c
 // --- basic block ---
-// 0x010997c4: 0x10997c4: lw    a2, 148(s0)
+// 0x01099e0c: 0x1099e0c: lw    a2, 148(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4961,13 +4961,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010997c8: 0x10997c8: sll   zero, zero, 0
-// 0x010997cc: 0x10997cc: mult  s1, a2
+// 0x01099e10: 0x1099e10: sll   zero, zero, 0
+// 0x01099e14: 0x1099e14: mult  s1, a2
 	ldloc 8
 	ldloc.3
 	mul
 	stloc 10
-// 0x010997d0: 0x10997d0: lw    a2, 16(sp)
+// 0x01099e18: 0x1099e18: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4976,35 +4976,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010997d4: 0x10997d4: sll   zero, zero, 0
-// 0x010997d8: 0x10997d8: addu  a1, a1, a2
+// 0x01099e1c: 0x1099e1c: sll   zero, zero, 0
+// 0x01099e20: 0x1099e20: addu  a1, a1, a2
 	ldloc.2
 	ldloc.3
 	add
 	stloc.2
-// 0x010997dc: 0x10997dc: addiu a1, a1, -1
+// 0x01099e24: 0x1099e24: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x010997e0: 0x10997e0: mflo  lo
+// 0x01099e28: 0x1099e28: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x010997e4: 0x10997e4: addu  a1, a1, a2
+// 0x01099e2c: 0x1099e2c: addu  a1, a1, a2
 	ldloc.2
 	ldloc.3
 	add
 	stloc.2
-// 0x010997e8: 0x10997e8: slt   a0, a1, a0
+// 0x01099e30: 0x1099e30: slt   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.1
-// 0x010997ec: 0x10997ec: bne   a0, zero, 0x1099824 sll   zero, zero, 0
+// 0x01099e34: 0x1099e34: bne   a0, zero, 0x1099e6c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1099824
+	brtrue L_1099e6c
 // --- basic block ---
-// 0x010997f4: 0x10997f4: lw    a0, 152(s0)
+// 0x01099e3c: 0x1099e3c: lw    a0, 152(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5013,13 +5013,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010997f8: 0x10997f8: sll   zero, zero, 0
-// 0x010997fc: 0x10997fc: mult  s1, a0
+// 0x01099e40: 0x1099e40: sll   zero, zero, 0
+// 0x01099e44: 0x1099e44: mult  s1, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 10
-// 0x01099800: 0x1099800: lw    a0, 20(sp)
+// 0x01099e48: 0x1099e48: lw    a0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5028,44 +5028,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01099804: 0x1099804: sll   zero, zero, 0
-// 0x01099808: 0x1099808: addu  v1, v1, a0
+// 0x01099e4c: 0x1099e4c: sll   zero, zero, 0
+// 0x01099e50: 0x1099e50: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x0109980c: 0x109980c: addiu v1, v1, -1
+// 0x01099e54: 0x1099e54: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01099810: 0x1099810: mflo  lo
+// 0x01099e58: 0x1099e58: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x01099814: 0x1099814: addu  s1, v1, s1
+// 0x01099e5c: 0x1099e5c: addu  s1, v1, s1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 8
-// 0x01099818: 0x1099818: slt   v0, s1, v0
+// 0x01099e60: 0x1099e60: slt   v0, s1, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109981c: 0x109981c: j	 0x1099828 xori  v0, v0, 1
+// 0x01099e64: 0x1099e64: j	 0x1099e70 xori  v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	xor
 	stloc 6
-	br L_1099828
+	br L_1099e70
 // --- basic block ---
-L_1099824:
-// 0x01099824: 0x1099824: addu  v0, zero, zero
+L_1099e6c:
+// 0x01099e6c: 0x1099e6c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1099828:
-// 0x01099828: 0x1099828: lw    ra, 36(sp)
-// 0x0109982c: 0x109982c: lw    s2, 32(sp)
+L_1099e70:
+// 0x01099e70: 0x1099e70: lw    ra, 36(sp)
+// 0x01099e74: 0x1099e74: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5074,7 +5074,7 @@ L_1099828:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01099830: 0x1099830: lw    s1, 28(sp)
+// 0x01099e78: 0x1099e78: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5083,7 +5083,7 @@ L_1099828:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099834: 0x1099834: lw    s0, 24(sp)
+// 0x01099e7c: 0x1099e7c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5092,7 +5092,7 @@ L_1099828:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01099838: 0x1099838: jr    ra addiu sp, sp, 40
+// 0x01099e80: 0x1099e80: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5104,7 +5104,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_pointer_up_force_click_1099840(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_pointer_up_force_click_1099e88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s4,int32 s0,int32 s1,int32 s3,int32 s5,int32 ra)
@@ -5157,10 +5157,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099840: 0x1099840: lui   v0, 0x0
+// 0x01099e88: 0x1099e88: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01099844: 0x1099844: lw    v1, 136(a0)
+// 0x01099e8c: 0x1099e8c: lw    v1, 136(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5169,17 +5169,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099848: 0x1099848: addiu sp, sp, -48
+// 0x01099e90: 0x1099e90: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109984c: 0x109984c: addiu a2, v0, 17516
+// 0x01099e94: 0x1099e94: addiu a2, v0, 17516
 	ldloc 5
 	ldc.i4 17516
 	add
 	stloc.3
-// 0x01099850: 0x1099850: sw    s5, 40(sp)
+// 0x01099e98: 0x1099e98: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5188,7 +5188,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01099854: 0x1099854: sw    s4, 36(sp)
+// 0x01099e9c: 0x1099e9c: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5197,7 +5197,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01099858: 0x1099858: sw    s3, 32(sp)
+// 0x01099ea0: 0x1099ea0: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5206,7 +5206,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109985c: 0x109985c: sw    s2, 28(sp)
+// 0x01099ea4: 0x1099ea4: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5215,7 +5215,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099860: 0x1099860: sw    s1, 24(sp)
+// 0x01099ea8: 0x1099ea8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5224,7 +5224,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01099864: 0x1099864: sw    s0, 20(sp)
+// 0x01099eac: 0x1099eac: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5233,11 +5233,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01099868: 0x1099868: sw    ra, 44(sp)
-// 0x0109986c: 0x109986c: addu  s0, a0, zero
+// 0x01099eb0: 0x1099eb0: sw    ra, 44(sp)
+// 0x01099eb4: 0x1099eb4: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01099870: 0x1099870: lw    s5, 4(a2)
+// 0x01099eb8: 0x1099eb8: lw    s5, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -5246,7 +5246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01099874: 0x1099874: lw    s3, 17516(v0)
+// 0x01099ebc: 0x1099ebc: lw    s3, 17516(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5255,14 +5255,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01099878: 0x1099878: lw    s2, 0(a1)
+// 0x01099ec0: 0x1099ec0: lw    s2, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0109987c: 0x109987c: lw    s4, 4(a1)
+// 0x01099ec4: 0x1099ec4: lw    s4, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5271,13 +5271,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01099880: 0x1099880: beq   v1, zero, 0x109990c addu  s1, a1, zero
+// 0x01099ec8: 0x1099ec8: beq   v1, zero, 0x1099f54 addu  s1, a1, zero
 	ldloc 7
 	ldloc.2
 	stloc 11
-	brfalse L_109990c
+	brfalse L_1099f54
 // --- basic block ---
-// 0x01099888: 0x1099888: jal   0x109973c addiu a2, zero, 1
+// 0x01099ed0: 0x1099ed0: jal   0x1099d84 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5285,69 +5285,69 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_contains_point_109973c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_contains_point_1099d84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01099890: 0x1099890: beq   v0, zero, 0x109990c subu  s4, s5, s4
+// 0x01099ed8: 0x1099ed8: beq   v0, zero, 0x1099f54 subu  s4, s5, s4
 	ldloc 5
 	ldloc 13
 	ldloc 9
 	sub
 	stloc 9
-	brfalse L_109990c
+	brfalse L_1099f54
 // --- basic block ---
-// 0x01099898: 0x1099898: subu  s2, s3, s2
+// 0x01099ee0: 0x1099ee0: subu  s2, s3, s2
 	ldloc 12
 	ldloc 8
 	sub
 	stloc 8
-// 0x0109989c: 0x109989c: sra   v1, s4, 31
+// 0x01099ee4: 0x1099ee4: sra   v1, s4, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr
 	stloc 7
-// 0x010998a0: 0x10998a0: sra   v0, s2, 31
+// 0x01099ee8: 0x1099ee8: sra   v0, s2, 31
 	ldloc 8
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x010998a4: 0x10998a4: xor   s4, v1, s4
+// 0x01099eec: 0x1099eec: xor   s4, v1, s4
 	ldloc 7
 	ldloc 9
 	xor
 	stloc 9
-// 0x010998a8: 0x10998a8: xor   s2, v0, s2
+// 0x01099ef0: 0x1099ef0: xor   s2, v0, s2
 	ldloc 5
 	ldloc 8
 	xor
 	stloc 8
-// 0x010998ac: 0x10998ac: subu  v1, s4, v1
+// 0x01099ef4: 0x1099ef4: subu  v1, s4, v1
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 7
-// 0x010998b0: 0x10998b0: subu  v0, s2, v0
+// 0x01099ef8: 0x1099ef8: subu  v0, s2, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 5
-// 0x010998b4: 0x10998b4: addu  v0, v1, v0
+// 0x01099efc: 0x1099efc: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010998b8: 0x10998b8: slti  v0, v0, 100
+// 0x01099f00: 0x1099f00: slti  v0, v0, 100
 	ldloc 5
 	ldc.i4.s 100
 	clt
 	stloc 5
-// 0x010998bc: 0x10998bc: beq   v0, zero, 0x109990c sll   zero, zero, 0
+// 0x01099f04: 0x1099f04: beq   v0, zero, 0x1099f54 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109990c
+	brfalse L_1099f54
 // --- basic block ---
-// 0x010998c4: 0x10998c4: lw    v0, 200(s0)
+// 0x01099f0c: 0x1099f0c: lw    v0, 200(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5356,22 +5356,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010998c8: 0x10998c8: sll   zero, zero, 0
-// 0x010998cc: 0x10998cc: beq   v0, zero, 0x10998f0 sll   zero, zero, 0
+// 0x01099f10: 0x1099f10: sll   zero, zero, 0
+// 0x01099f14: 0x1099f14: beq   v0, zero, 0x1099f38 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10998f0
+	brfalse L_1099f38
 // --- basic block ---
-// 0x010998d4: 0x10998d4: jal   0x104b670 sll   zero, zero, 0
-	call int32 Cibyl55::roadmap_pointer_long_click_expired_104b670()
+// 0x01099f1c: 0x1099f1c: jal   0x104b680 sll   zero, zero, 0
+	call int32 Cibyl55::roadmap_pointer_long_click_expired_104b680()
 	stloc 5
 // --- basic block ---
-// 0x010998dc: 0x10998dc: beq   v0, zero, 0x10998f0 addu  a1, s1, zero
+// 0x01099f24: 0x1099f24: beq   v0, zero, 0x1099f38 addu  a1, s1, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brfalse L_10998f0
+	brfalse L_1099f38
 // --- basic block ---
-// 0x010998e4: 0x10998e4: lw    v0, 200(s0)
+// 0x01099f2c: 0x1099f2c: lw    v0, 200(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5380,11 +5380,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010998e8: 0x10998e8: j	 0x1099900 sll   zero, zero, 0
-	br L_1099900
+// 0x01099f30: 0x1099f30: j	 0x1099f48 sll   zero, zero, 0
+	br L_1099f48
 // --- basic block ---
-L_10998f0:
-// 0x010998f0: 0x10998f0: lw    v0, 196(s0)
+L_1099f38:
+// 0x01099f38: 0x1099f38: lw    v0, 196(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5393,15 +5393,15 @@ L_10998f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010998f4: 0x10998f4: sll   zero, zero, 0
-// 0x010998f8: 0x10998f8: beq   v0, zero, 0x1099908 addu  a1, s1, zero
+// 0x01099f3c: 0x1099f3c: sll   zero, zero, 0
+// 0x01099f40: 0x1099f40: beq   v0, zero, 0x1099f50 addu  a1, s1, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brfalse L_1099908
+	brfalse L_1099f50
 // --- basic block ---
-L_1099900:
-// 0x01099900: 0x1099900: jalr  v0 addu  a0, s0, zero
+L_1099f48:
+// 0x01099f48: 0x1099f48: jalr  v0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
@@ -5415,8 +5415,8 @@ L_1099900:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1099908:
-// 0x01099908: 0x1099908: sw    zero, 136(s0)
+L_1099f50:
+// 0x01099f50: 0x1099f50: sw    zero, 136(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5425,12 +5425,12 @@ L_1099908:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_109990c:
-// 0x0109990c: 0x109990c: lw    ra, 44(sp)
-// 0x01099910: 0x1099910: addiu v0, zero, 1
+L_1099f54:
+// 0x01099f54: 0x1099f54: lw    ra, 44(sp)
+// 0x01099f58: 0x1099f58: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01099914: 0x1099914: lw    s5, 40(sp)
+// 0x01099f5c: 0x1099f5c: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5439,7 +5439,7 @@ L_109990c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01099918: 0x1099918: lw    s4, 36(sp)
+// 0x01099f60: 0x1099f60: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5448,7 +5448,7 @@ L_109990c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109991c: 0x109991c: lw    s3, 32(sp)
+// 0x01099f64: 0x1099f64: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5457,7 +5457,7 @@ L_109990c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01099920: 0x1099920: lw    s2, 28(sp)
+// 0x01099f68: 0x1099f68: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5466,7 +5466,7 @@ L_109990c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099924: 0x1099924: lw    s1, 24(sp)
+// 0x01099f6c: 0x1099f6c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5475,7 +5475,7 @@ L_109990c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01099928: 0x1099928: lw    s0, 20(sp)
+// 0x01099f70: 0x1099f70: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5484,7 +5484,7 @@ L_109990c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109992c: 0x109992c: jr    ra addiu sp, sp, 48
+// 0x01099f74: 0x1099f74: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5496,7 +5496,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_long_click_1099934(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_long_click_1099f7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
@@ -5537,12 +5537,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099934: 0x1099934: addiu sp, sp, -32
+// 0x01099f7c: 0x1099f7c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01099938: 0x1099938: sw    s1, 24(sp)
+// 0x01099f80: 0x1099f80: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5551,8 +5551,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109993c: 0x109993c: sw    ra, 28(sp)
-// 0x01099940: 0x1099940: sw    s0, 20(sp)
+// 0x01099f84: 0x1099f84: sw    ra, 28(sp)
+// 0x01099f88: 0x1099f88: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5561,23 +5561,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01099944: 0x1099944: beq   a0, zero, 0x10999b8 addu  s1, a1, zero
+// 0x01099f8c: 0x1099f8c: beq   a0, zero, 0x109a000 addu  s1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 8
-	brfalse L_10999b8
+	brfalse L_109a000
 // --- basic block ---
-// 0x0109994c: 0x109994c: addu  s0, a0, zero
+// 0x01099f94: 0x1099f94: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01099950: 0x1099950: addu  a0, s0, zero
+// 0x01099f98: 0x1099f98: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-L_1099954:
-// 0x01099954: 0x1099954: addu  a1, s1, zero
+L_1099f9c:
+// 0x01099f9c: 0x1099f9c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01099958: 0x1099958: jal   0x109973c addiu a2, zero, 1
+// 0x01099fa0: 0x1099fa0: jal   0x1099d84 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5585,18 +5585,18 @@ L_1099954:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_contains_point_109973c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_contains_point_1099d84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01099960: 0x1099960: beq   v0, zero, 0x10999a8 addu  a0, s0, zero
+// 0x01099fa8: 0x1099fa8: beq   v0, zero, 0x1099ff0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brfalse L_10999a8
+	brfalse L_1099ff0
 // --- basic block ---
-// 0x01099968: 0x1099968: lw    v0, 200(s0)
+// 0x01099fb0: 0x1099fb0: lw    v0, 200(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5605,14 +5605,14 @@ L_1099954:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109996c: 0x109996c: sll   zero, zero, 0
-// 0x01099970: 0x1099970: beq   v0, zero, 0x1099988 addu  a1, s1, zero
+// 0x01099fb4: 0x1099fb4: sll   zero, zero, 0
+// 0x01099fb8: 0x1099fb8: beq   v0, zero, 0x1099fd0 addu  a1, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
-	brfalse L_1099988
+	brfalse L_1099fd0
 // --- basic block ---
-// 0x01099978: 0x1099978: jalr  v0 sll   zero, zero, 0
+// 0x01099fc0: 0x1099fc0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5624,14 +5624,14 @@ L_1099954:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01099980: 0x1099980: bne   v0, zero, 0x10999bc addiu v0, zero, 1
+// 0x01099fc8: 0x1099fc8: bne   v0, zero, 0x109a004 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10999bc
+	brtrue L_109a004
 // --- basic block ---
-L_1099988:
-// 0x01099988: 0x1099988: lw    v0, 12(s0)
+L_1099fd0:
+// 0x01099fd0: 0x1099fd0: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5640,34 +5640,34 @@ L_1099988:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109998c: 0x109998c: addu  a1, s1, zero
+// 0x01099fd4: 0x1099fd4: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01099990: 0x1099990: beq   v0, zero, 0x10999a8 addu  a0, v0, zero
+// 0x01099fd8: 0x1099fd8: beq   v0, zero, 0x1099ff0 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_10999a8
+	brfalse L_1099ff0
 // --- basic block ---
-// 0x01099998: 0x1099998: jal   0x1099934 sll   zero, zero, 0
+// 0x01099fe0: 0x1099fe0: jal   0x1099f7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_long_click_1099934(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_long_click_1099f7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010999a0: 0x10999a0: bne   v0, zero, 0x10999bc addiu v0, zero, 1
+// 0x01099fe8: 0x1099fe8: bne   v0, zero, 0x109a004 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10999bc
+	brtrue L_109a004
 // --- basic block ---
-L_10999a8:
-// 0x010999a8: 0x10999a8: lw    s0, 8(s0)
+L_1099ff0:
+// 0x01099ff0: 0x1099ff0: lw    s0, 8(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5676,20 +5676,20 @@ L_10999a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010999ac: 0x10999ac: sll   zero, zero, 0
-// 0x010999b0: 0x10999b0: bne   s0, zero, 0x1099954 addu  a0, s0, zero
+// 0x01099ff4: 0x1099ff4: sll   zero, zero, 0
+// 0x01099ff8: 0x1099ff8: bne   s0, zero, 0x1099f9c addu  a0, s0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brtrue L_1099954
+	brtrue L_1099f9c
 // --- basic block ---
-L_10999b8:
-// 0x010999b8: 0x10999b8: addu  v0, zero, zero
+L_109a000:
+// 0x0109a000: 0x109a000: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10999bc:
-// 0x010999bc: 0x10999bc: lw    ra, 28(sp)
-// 0x010999c0: 0x10999c0: lw    s1, 24(sp)
+L_109a004:
+// 0x0109a004: 0x109a004: lw    ra, 28(sp)
+// 0x0109a008: 0x109a008: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5698,7 +5698,7 @@ L_10999bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010999c4: 0x10999c4: lw    s0, 20(sp)
+// 0x0109a00c: 0x109a00c: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5707,7 +5707,7 @@ L_10999bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010999c8: 0x10999c8: jr    ra addiu sp, sp, 32
+// 0x0109a010: 0x109a010: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5719,7 +5719,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_short_click_10999d0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_short_click_109a018(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
@@ -5760,12 +5760,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010999d0: 0x10999d0: addiu sp, sp, -32
+// 0x0109a018: 0x109a018: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010999d4: 0x10999d4: sw    s1, 24(sp)
+// 0x0109a01c: 0x109a01c: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5774,8 +5774,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010999d8: 0x10999d8: sw    ra, 28(sp)
-// 0x010999dc: 0x10999dc: sw    s0, 20(sp)
+// 0x0109a020: 0x109a020: sw    ra, 28(sp)
+// 0x0109a024: 0x109a024: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5784,23 +5784,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010999e0: 0x10999e0: beq   a0, zero, 0x1099a54 addu  s1, a1, zero
+// 0x0109a028: 0x109a028: beq   a0, zero, 0x109a09c addu  s1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 8
-	brfalse L_1099a54
+	brfalse L_109a09c
 // --- basic block ---
-// 0x010999e8: 0x10999e8: addu  s0, a0, zero
+// 0x0109a030: 0x109a030: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010999ec: 0x10999ec: addu  a0, s0, zero
+// 0x0109a034: 0x109a034: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-L_10999f0:
-// 0x010999f0: 0x10999f0: addu  a1, s1, zero
+L_109a038:
+// 0x0109a038: 0x109a038: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010999f4: 0x10999f4: jal   0x109973c addiu a2, zero, 1
+// 0x0109a03c: 0x109a03c: jal   0x1099d84 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5808,18 +5808,18 @@ L_10999f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_contains_point_109973c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_contains_point_1099d84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010999fc: 0x10999fc: beq   v0, zero, 0x1099a44 addu  a0, s0, zero
+// 0x0109a044: 0x109a044: beq   v0, zero, 0x109a08c addu  a0, s0, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brfalse L_1099a44
+	brfalse L_109a08c
 // --- basic block ---
-// 0x01099a04: 0x1099a04: lw    v0, 196(s0)
+// 0x0109a04c: 0x109a04c: lw    v0, 196(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5828,14 +5828,14 @@ L_10999f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099a08: 0x1099a08: sll   zero, zero, 0
-// 0x01099a0c: 0x1099a0c: beq   v0, zero, 0x1099a24 addu  a1, s1, zero
+// 0x0109a050: 0x109a050: sll   zero, zero, 0
+// 0x0109a054: 0x109a054: beq   v0, zero, 0x109a06c addu  a1, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
-	brfalse L_1099a24
+	brfalse L_109a06c
 // --- basic block ---
-// 0x01099a14: 0x1099a14: jalr  v0 sll   zero, zero, 0
+// 0x0109a05c: 0x109a05c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5847,14 +5847,14 @@ L_10999f0:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01099a1c: 0x1099a1c: bne   v0, zero, 0x1099a58 addiu v0, zero, 1
+// 0x0109a064: 0x109a064: bne   v0, zero, 0x109a0a0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_1099a58
+	brtrue L_109a0a0
 // --- basic block ---
-L_1099a24:
-// 0x01099a24: 0x1099a24: lw    v0, 12(s0)
+L_109a06c:
+// 0x0109a06c: 0x109a06c: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5863,34 +5863,34 @@ L_1099a24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099a28: 0x1099a28: addu  a1, s1, zero
+// 0x0109a070: 0x109a070: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01099a2c: 0x1099a2c: beq   v0, zero, 0x1099a44 addu  a0, v0, zero
+// 0x0109a074: 0x109a074: beq   v0, zero, 0x109a08c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1099a44
+	brfalse L_109a08c
 // --- basic block ---
-// 0x01099a34: 0x1099a34: jal   0x10999d0 sll   zero, zero, 0
+// 0x0109a07c: 0x109a07c: jal   0x109a018 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_short_click_10999d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_short_click_109a018(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01099a3c: 0x1099a3c: bne   v0, zero, 0x1099a58 addiu v0, zero, 1
+// 0x0109a084: 0x109a084: bne   v0, zero, 0x109a0a0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_1099a58
+	brtrue L_109a0a0
 // --- basic block ---
-L_1099a44:
-// 0x01099a44: 0x1099a44: lw    s0, 8(s0)
+L_109a08c:
+// 0x0109a08c: 0x109a08c: lw    s0, 8(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5899,20 +5899,20 @@ L_1099a44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099a48: 0x1099a48: sll   zero, zero, 0
-// 0x01099a4c: 0x1099a4c: bne   s0, zero, 0x10999f0 addu  a0, s0, zero
+// 0x0109a090: 0x109a090: sll   zero, zero, 0
+// 0x0109a094: 0x109a094: bne   s0, zero, 0x109a038 addu  a0, s0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brtrue L_10999f0
+	brtrue L_109a038
 // --- basic block ---
-L_1099a54:
-// 0x01099a54: 0x1099a54: addu  v0, zero, zero
+L_109a09c:
+// 0x0109a09c: 0x109a09c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1099a58:
-// 0x01099a58: 0x1099a58: lw    ra, 28(sp)
-// 0x01099a5c: 0x1099a5c: lw    s1, 24(sp)
+L_109a0a0:
+// 0x0109a0a0: 0x109a0a0: lw    ra, 28(sp)
+// 0x0109a0a4: 0x109a0a4: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5921,7 +5921,7 @@ L_1099a58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099a60: 0x1099a60: lw    s0, 20(sp)
+// 0x0109a0a8: 0x109a0a8: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5930,7 +5930,7 @@ L_1099a58:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099a64: 0x1099a64: jr    ra addiu sp, sp, 32
+// 0x0109a0ac: 0x109a0ac: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5942,7 +5942,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_pointer_up_1099a6c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_pointer_up_109a0b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
@@ -5983,12 +5983,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099a6c: 0x1099a6c: addiu sp, sp, -32
+// 0x0109a0b4: 0x109a0b4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01099a70: 0x1099a70: sw    s1, 24(sp)
+// 0x0109a0b8: 0x109a0b8: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5997,8 +5997,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099a74: 0x1099a74: sw    ra, 28(sp)
-// 0x01099a78: 0x1099a78: sw    s0, 20(sp)
+// 0x0109a0bc: 0x109a0bc: sw    ra, 28(sp)
+// 0x0109a0c0: 0x109a0c0: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6007,23 +6007,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01099a7c: 0x1099a7c: beq   a0, zero, 0x1099af0 addu  s1, a1, zero
+// 0x0109a0c4: 0x109a0c4: beq   a0, zero, 0x109a138 addu  s1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 8
-	brfalse L_1099af0
+	brfalse L_109a138
 // --- basic block ---
-// 0x01099a84: 0x1099a84: addu  s0, a0, zero
+// 0x0109a0cc: 0x109a0cc: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01099a88: 0x1099a88: addu  a0, s0, zero
+// 0x0109a0d0: 0x109a0d0: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-L_1099a8c:
-// 0x01099a8c: 0x1099a8c: addu  a1, s1, zero
+L_109a0d4:
+// 0x0109a0d4: 0x109a0d4: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01099a90: 0x1099a90: jal   0x109973c addiu a2, zero, 1
+// 0x0109a0d8: 0x109a0d8: jal   0x1099d84 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -6031,18 +6031,18 @@ L_1099a8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_contains_point_109973c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_contains_point_1099d84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01099a98: 0x1099a98: beq   v0, zero, 0x1099ae0 addu  a0, s0, zero
+// 0x0109a0e0: 0x109a0e0: beq   v0, zero, 0x109a128 addu  a0, s0, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brfalse L_1099ae0
+	brfalse L_109a128
 // --- basic block ---
-// 0x01099aa0: 0x1099aa0: lw    v0, 192(s0)
+// 0x0109a0e8: 0x109a0e8: lw    v0, 192(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6051,14 +6051,14 @@ L_1099a8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099aa4: 0x1099aa4: sll   zero, zero, 0
-// 0x01099aa8: 0x1099aa8: beq   v0, zero, 0x1099ac0 addu  a1, s1, zero
+// 0x0109a0ec: 0x109a0ec: sll   zero, zero, 0
+// 0x0109a0f0: 0x109a0f0: beq   v0, zero, 0x109a108 addu  a1, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
-	brfalse L_1099ac0
+	brfalse L_109a108
 // --- basic block ---
-// 0x01099ab0: 0x1099ab0: jalr  v0 sll   zero, zero, 0
+// 0x0109a0f8: 0x109a0f8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -6070,14 +6070,14 @@ L_1099a8c:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01099ab8: 0x1099ab8: bne   v0, zero, 0x1099af4 addiu v0, zero, 1
+// 0x0109a100: 0x109a100: bne   v0, zero, 0x109a13c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_1099af4
+	brtrue L_109a13c
 // --- basic block ---
-L_1099ac0:
-// 0x01099ac0: 0x1099ac0: lw    v0, 12(s0)
+L_109a108:
+// 0x0109a108: 0x109a108: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6086,34 +6086,34 @@ L_1099ac0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099ac4: 0x1099ac4: addu  a1, s1, zero
+// 0x0109a10c: 0x109a10c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01099ac8: 0x1099ac8: beq   v0, zero, 0x1099ae0 addu  a0, v0, zero
+// 0x0109a110: 0x109a110: beq   v0, zero, 0x109a128 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1099ae0
+	brfalse L_109a128
 // --- basic block ---
-// 0x01099ad0: 0x1099ad0: jal   0x1099a6c sll   zero, zero, 0
+// 0x0109a118: 0x109a118: jal   0x109a0b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_pointer_up_1099a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_pointer_up_109a0b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01099ad8: 0x1099ad8: bne   v0, zero, 0x1099af4 addiu v0, zero, 1
+// 0x0109a120: 0x109a120: bne   v0, zero, 0x109a13c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_1099af4
+	brtrue L_109a13c
 // --- basic block ---
-L_1099ae0:
-// 0x01099ae0: 0x1099ae0: lw    s0, 8(s0)
+L_109a128:
+// 0x0109a128: 0x109a128: lw    s0, 8(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6122,20 +6122,20 @@ L_1099ae0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099ae4: 0x1099ae4: sll   zero, zero, 0
-// 0x01099ae8: 0x1099ae8: bne   s0, zero, 0x1099a8c addu  a0, s0, zero
+// 0x0109a12c: 0x109a12c: sll   zero, zero, 0
+// 0x0109a130: 0x109a130: bne   s0, zero, 0x109a0d4 addu  a0, s0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brtrue L_1099a8c
+	brtrue L_109a0d4
 // --- basic block ---
-L_1099af0:
-// 0x01099af0: 0x1099af0: addu  v0, zero, zero
+L_109a138:
+// 0x0109a138: 0x109a138: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1099af4:
-// 0x01099af4: 0x1099af4: lw    ra, 28(sp)
-// 0x01099af8: 0x1099af8: lw    s1, 24(sp)
+L_109a13c:
+// 0x0109a13c: 0x109a13c: lw    ra, 28(sp)
+// 0x0109a140: 0x109a140: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6144,7 +6144,7 @@ L_1099af4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099afc: 0x1099afc: lw    s0, 20(sp)
+// 0x0109a144: 0x109a144: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6153,7 +6153,7 @@ L_1099af4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099b00: 0x1099b00: jr    ra addiu sp, sp, 32
+// 0x0109a148: 0x109a148: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6165,7 +6165,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_pointer_down_1099b08(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_pointer_down_109a150(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -6206,12 +6206,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099b08: 0x1099b08: addiu sp, sp, -32
+// 0x0109a150: 0x109a150: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01099b0c: 0x1099b0c: sw    s1, 24(sp)
+// 0x0109a154: 0x109a154: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6220,8 +6220,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01099b10: 0x1099b10: sw    ra, 28(sp)
-// 0x01099b14: 0x1099b14: sw    s0, 20(sp)
+// 0x0109a158: 0x109a158: sw    ra, 28(sp)
+// 0x0109a15c: 0x109a15c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6230,23 +6230,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099b18: 0x1099b18: beq   a0, zero, 0x1099ba4 addu  s1, a1, zero
+// 0x0109a160: 0x109a160: beq   a0, zero, 0x109a1ec addu  s1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 9
-	brfalse L_1099ba4
+	brfalse L_109a1ec
 // --- basic block ---
-// 0x01099b20: 0x1099b20: lw    v1, 0(a1)
+// 0x0109a168: 0x109a168: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01099b24: 0x1099b24: lui   v0, 0x0
+// 0x0109a16c: 0x109a16c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01099b28: 0x1099b28: sw    v1, 17516(v0)
+// 0x0109a170: 0x109a170: sw    v1, 17516(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6255,7 +6255,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099b2c: 0x1099b2c: lw    v1, 4(a1)
+// 0x0109a174: 0x109a174: lw    v1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6264,12 +6264,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099b30: 0x1099b30: addiu v0, v0, 17516
+// 0x0109a178: 0x109a178: addiu v0, v0, 17516
 	ldloc 5
 	ldc.i4 17516
 	add
 	stloc 5
-// 0x01099b34: 0x1099b34: sw    v1, 4(v0)
+// 0x0109a17c: 0x109a17c: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6278,17 +6278,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099b38: 0x1099b38: addu  s0, a0, zero
+// 0x0109a180: 0x109a180: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01099b3c: 0x1099b3c: addu  a0, s0, zero
+// 0x0109a184: 0x109a184: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-L_1099b40:
-// 0x01099b40: 0x1099b40: addu  a1, s1, zero
+L_109a188:
+// 0x0109a188: 0x109a188: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01099b44: 0x1099b44: jal   0x109973c addiu a2, zero, 1
+// 0x0109a18c: 0x109a18c: jal   0x1099d84 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -6296,18 +6296,18 @@ L_1099b40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_contains_point_109973c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_contains_point_1099d84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01099b4c: 0x1099b4c: beq   v0, zero, 0x1099b94 addu  a0, s0, zero
+// 0x0109a194: 0x109a194: beq   v0, zero, 0x109a1dc addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_1099b94
+	brfalse L_109a1dc
 // --- basic block ---
-// 0x01099b54: 0x1099b54: lw    v0, 188(s0)
+// 0x0109a19c: 0x109a19c: lw    v0, 188(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6316,14 +6316,14 @@ L_1099b40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099b58: 0x1099b58: sll   zero, zero, 0
-// 0x01099b5c: 0x1099b5c: beq   v0, zero, 0x1099b74 addu  a1, s1, zero
+// 0x0109a1a0: 0x109a1a0: sll   zero, zero, 0
+// 0x0109a1a4: 0x109a1a4: beq   v0, zero, 0x109a1bc addu  a1, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brfalse L_1099b74
+	brfalse L_109a1bc
 // --- basic block ---
-// 0x01099b64: 0x1099b64: jalr  v0 sll   zero, zero, 0
+// 0x0109a1ac: 0x109a1ac: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -6335,14 +6335,14 @@ L_1099b40:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01099b6c: 0x1099b6c: bne   v0, zero, 0x1099ba8 addiu v0, zero, 1
+// 0x0109a1b4: 0x109a1b4: bne   v0, zero, 0x109a1f0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_1099ba8
+	brtrue L_109a1f0
 // --- basic block ---
-L_1099b74:
-// 0x01099b74: 0x1099b74: lw    v0, 12(s0)
+L_109a1bc:
+// 0x0109a1bc: 0x109a1bc: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6351,34 +6351,34 @@ L_1099b74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01099b78: 0x1099b78: addu  a1, s1, zero
+// 0x0109a1c0: 0x109a1c0: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01099b7c: 0x1099b7c: beq   v0, zero, 0x1099b94 addu  a0, v0, zero
+// 0x0109a1c4: 0x109a1c4: beq   v0, zero, 0x109a1dc addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1099b94
+	brfalse L_109a1dc
 // --- basic block ---
-// 0x01099b84: 0x1099b84: jal   0x1099b08 sll   zero, zero, 0
+// 0x0109a1cc: 0x109a1cc: jal   0x109a150 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_pointer_down_1099b08(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_pointer_down_109a150(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01099b8c: 0x1099b8c: bne   v0, zero, 0x1099ba8 addiu v0, zero, 1
+// 0x0109a1d4: 0x109a1d4: bne   v0, zero, 0x109a1f0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_1099ba8
+	brtrue L_109a1f0
 // --- basic block ---
-L_1099b94:
-// 0x01099b94: 0x1099b94: lw    s0, 8(s0)
+L_109a1dc:
+// 0x0109a1dc: 0x109a1dc: lw    s0, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6387,20 +6387,20 @@ L_1099b94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099b98: 0x1099b98: sll   zero, zero, 0
-// 0x01099b9c: 0x1099b9c: bne   s0, zero, 0x1099b40 addu  a0, s0, zero
+// 0x0109a1e0: 0x109a1e0: sll   zero, zero, 0
+// 0x0109a1e4: 0x109a1e4: bne   s0, zero, 0x109a188 addu  a0, s0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_1099b40
+	brtrue L_109a188
 // --- basic block ---
-L_1099ba4:
-// 0x01099ba4: 0x1099ba4: addu  v0, zero, zero
+L_109a1ec:
+// 0x0109a1ec: 0x109a1ec: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1099ba8:
-// 0x01099ba8: 0x1099ba8: lw    ra, 28(sp)
-// 0x01099bac: 0x1099bac: lw    s1, 24(sp)
+L_109a1f0:
+// 0x0109a1f0: 0x109a1f0: lw    ra, 28(sp)
+// 0x0109a1f4: 0x109a1f4: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6409,7 +6409,7 @@ L_1099ba8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01099bb0: 0x1099bb0: lw    s0, 20(sp)
+// 0x0109a1f8: 0x109a1f8: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6418,7 +6418,7 @@ L_1099ba8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099bb4: 0x1099bb4: jr    ra addiu sp, sp, 32
+// 0x0109a1fc: 0x109a1fc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6430,7 +6430,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_find_by_pos_1099bbc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_find_by_pos_109a204(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 s2,int32 ra,int32 v1)
@@ -6474,12 +6474,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099bbc: 0x1099bbc: addiu sp, sp, -32
+// 0x0109a204: 0x109a204: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01099bc0: 0x1099bc0: sw    s2, 24(sp)
+// 0x0109a208: 0x109a208: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6488,7 +6488,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01099bc4: 0x1099bc4: sw    s1, 20(sp)
+// 0x0109a20c: 0x109a20c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6497,7 +6497,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099bc8: 0x1099bc8: sw    s0, 16(sp)
+// 0x0109a210: 0x109a210: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6506,20 +6506,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01099bcc: 0x1099bcc: sw    ra, 28(sp)
-// 0x01099bd0: 0x1099bd0: addu  s0, a0, zero
+// 0x0109a214: 0x109a214: sw    ra, 28(sp)
+// 0x0109a218: 0x109a218: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01099bd4: 0x1099bd4: addu  s2, a1, zero
+// 0x0109a21c: 0x109a21c: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01099bd8: 0x1099bd8: j	 0x1099c0c addu  s1, a2, zero
+// 0x0109a220: 0x109a220: j	 0x109a254 addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-	br L_1099c0c
+	br L_109a254
 // --- basic block ---
-L_1099be0:
-// 0x01099be0: 0x1099be0: lw    v0, 48(s0)
+L_109a228:
+// 0x0109a228: 0x109a228: lw    v0, 48(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6528,33 +6528,33 @@ L_1099be0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099be4: 0x1099be4: sll   zero, zero, 0
-// 0x01099be8: 0x1099be8: andi  v0, v0, 256
+// 0x0109a22c: 0x109a22c: sll   zero, zero, 0
+// 0x0109a230: 0x109a230: andi  v0, v0, 256
 	ldloc 7
 	ldc.i4 256
 	and
 	stloc 7
-// 0x01099bec: 0x1099bec: bne   v0, zero, 0x1099c04 sll   zero, zero, 0
+// 0x0109a234: 0x109a234: bne   v0, zero, 0x109a24c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1099c04
+	brtrue L_109a24c
 // --- basic block ---
-// 0x01099bf4: 0x1099bf4: jal   0x109973c sll   zero, zero, 0
+// 0x0109a23c: 0x109a23c: jal   0x1099d84 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_contains_point_109973c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_contains_point_1099d84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x01099bfc: 0x1099bfc: bne   v0, zero, 0x1099c1c sll   zero, zero, 0
+// 0x0109a244: 0x109a244: bne   v0, zero, 0x109a264 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1099c1c
+	brtrue L_109a264
 // --- basic block ---
-L_1099c04:
-// 0x01099c04: 0x1099c04: lw    s0, 8(s0)
+L_109a24c:
+// 0x0109a24c: 0x109a24c: lw    s0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6563,26 +6563,26 @@ L_1099c04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099c08: 0x1099c08: sll   zero, zero, 0
-L_1099c0c:
-// 0x01099c0c: 0x1099c0c: addu  a0, s0, zero
+// 0x0109a250: 0x109a250: sll   zero, zero, 0
+L_109a254:
+// 0x0109a254: 0x109a254: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01099c10: 0x1099c10: addu  a1, s2, zero
+// 0x0109a258: 0x109a258: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x01099c14: 0x1099c14: bne   s0, zero, 0x1099be0 addu  a2, s1, zero
+// 0x0109a25c: 0x109a25c: bne   s0, zero, 0x109a228 addu  a2, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.3
-	brtrue L_1099be0
+	brtrue L_109a228
 // --- basic block ---
-L_1099c1c:
-// 0x01099c1c: 0x1099c1c: lw    ra, 28(sp)
-// 0x01099c20: 0x1099c20: addu  v0, s0, zero
+L_109a264:
+// 0x0109a264: 0x109a264: lw    ra, 28(sp)
+// 0x0109a268: 0x109a268: addu  v0, s0, zero
 	ldloc 6
 	stloc 7
-// 0x01099c24: 0x1099c24: lw    s2, 24(sp)
+// 0x0109a26c: 0x109a26c: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6591,7 +6591,7 @@ L_1099c1c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01099c28: 0x1099c28: lw    s1, 20(sp)
+// 0x0109a270: 0x109a270: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6600,7 +6600,7 @@ L_1099c1c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01099c2c: 0x1099c2c: lw    s0, 16(sp)
+// 0x0109a274: 0x109a274: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6609,7 +6609,7 @@ L_1099c1c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099c30: 0x1099c30: jr    ra addiu sp, sp, 32
+// 0x0109a278: 0x109a278: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6621,7 +6621,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 get_size_1099c38(int32,int32,int32,int32,int32)
+.method public static int32 get_size_109a280(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s6,int32 s1,int32 s2,int32 s7,int32 s3,int32 s5,int32 s4,int32 s8,int32 ra)
@@ -6683,7 +6683,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01099c38: 0x1099c38: lw    v0, 48(a0)
+// 0x0109a280: 0x109a280: lw    v0, 48(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6692,17 +6692,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099c3c: 0x1099c3c: addiu sp, sp, -112
+// 0x0109a284: 0x109a284: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x01099c40: 0x1099c40: andi  v0, v0, 64
+// 0x0109a288: 0x109a288: andi  v0, v0, 64
 	ldloc 6
 	ldc.i4.s 64
 	and
 	stloc 6
-// 0x01099c44: 0x1099c44: sw    s8, 104(sp)
+// 0x0109a28c: 0x109a28c: sw    s8, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6711,7 +6711,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01099c48: 0x1099c48: sw    s1, 76(sp)
+// 0x0109a290: 0x109a290: sw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6720,7 +6720,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01099c4c: 0x1099c4c: sw    s0, 72(sp)
+// 0x0109a294: 0x109a294: sw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6729,8 +6729,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01099c50: 0x1099c50: sw    ra, 108(sp)
-// 0x01099c54: 0x1099c54: sw    s7, 100(sp)
+// 0x0109a298: 0x109a298: sw    ra, 108(sp)
+// 0x0109a29c: 0x109a29c: sw    s7, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6739,7 +6739,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01099c58: 0x1099c58: sw    s6, 96(sp)
+// 0x0109a2a0: 0x109a2a0: sw    s6, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6748,7 +6748,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01099c5c: 0x1099c5c: sw    s5, 92(sp)
+// 0x0109a2a4: 0x109a2a4: sw    s5, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6757,7 +6757,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01099c60: 0x1099c60: sw    s4, 88(sp)
+// 0x0109a2a8: 0x109a2a8: sw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6766,7 +6766,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01099c64: 0x1099c64: sw    s3, 84(sp)
+// 0x0109a2ac: 0x109a2ac: sw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6775,7 +6775,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01099c68: 0x1099c68: sw    s2, 80(sp)
+// 0x0109a2b0: 0x109a2b0: sw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6784,19 +6784,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01099c6c: 0x1099c6c: addu  s1, a0, zero
+// 0x0109a2b4: 0x109a2b4: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01099c70: 0x1099c70: addu  s8, a1, zero
+// 0x0109a2b8: 0x109a2b8: addu  s8, a1, zero
 	ldloc.2
 	stloc 16
-// 0x01099c74: 0x1099c74: bne   v0, zero, 0x1099ff8 addu  s0, a2, zero
+// 0x0109a2bc: 0x109a2bc: bne   v0, zero, 0x109a640 addu  s0, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 8
-	brtrue L_1099ff8
+	brtrue L_109a640
 // --- basic block ---
-// 0x01099c7c: 0x1099c7c: lw    v0, 12(a0)
+// 0x0109a2c4: 0x109a2c4: lw    v0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6805,14 +6805,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099c80: 0x1099c80: sll   zero, zero, 0
-// 0x01099c84: 0x1099c84: beq   v0, zero, 0x1099ff8 addu  a1, a2, zero
+// 0x0109a2c8: 0x109a2c8: sll   zero, zero, 0
+// 0x0109a2cc: 0x109a2cc: beq   v0, zero, 0x109a640 addu  a1, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc.2
-	brfalse L_1099ff8
+	brfalse L_109a640
 // --- basic block ---
-// 0x01099c8c: 0x1099c8c: lw    v1, 12(s0)
+// 0x0109a2d4: 0x109a2d4: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6821,7 +6821,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099c90: 0x1099c90: lw    v0, 184(a0)
+// 0x0109a2d8: 0x109a2d8: lw    v0, 184(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6830,7 +6830,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099c94: 0x1099c94: sw    v1, 60(sp)
+// 0x0109a2dc: 0x109a2dc: sw    v1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6839,7 +6839,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099c98: 0x1099c98: lw    v1, 4(s0)
+// 0x0109a2e0: 0x109a2e0: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6848,8 +6848,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099c9c: 0x1099c9c: sll   zero, zero, 0
-// 0x01099ca0: 0x1099ca0: sw    v1, 56(sp)
+// 0x0109a2e4: 0x109a2e4: sll   zero, zero, 0
+// 0x0109a2e8: 0x109a2e8: sw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6858,7 +6858,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099ca4: 0x1099ca4: lw    v1, 8(s0)
+// 0x0109a2ec: 0x109a2ec: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6867,10 +6867,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099ca8: 0x1099ca8: addiu a2, zero, 1
+// 0x0109a2f0: 0x109a2f0: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01099cac: 0x1099cac: sw    v1, 52(sp)
+// 0x0109a2f4: 0x109a2f4: sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6879,17 +6879,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099cb0: 0x1099cb0: lw    v1, 0(s0)
+// 0x0109a2f8: 0x109a2f8: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01099cb4: 0x1099cb4: addu  s3, zero, zero
+// 0x0109a2fc: 0x109a2fc: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x01099cb8: 0x1099cb8: jalr  v0 sw    v1, 48(sp)
+// 0x0109a300: 0x109a300: jalr  v0 sw    v1, 48(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -6909,7 +6909,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01099cc0: 0x1099cc0: lw    a1, 8(s0)
+// 0x0109a308: 0x109a308: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6918,14 +6918,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01099cc4: 0x1099cc4: lw    a2, 0(s0)
+// 0x0109a30c: 0x109a30c: lw    a2, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01099cc8: 0x1099cc8: lw    v0, 4(s0)
+// 0x0109a310: 0x109a310: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6934,7 +6934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099ccc: 0x1099ccc: lw    v1, 12(s0)
+// 0x0109a314: 0x109a314: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6943,12 +6943,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099cd0: 0x1099cd0: addiu s7, a1, 1
+// 0x0109a318: 0x109a318: addiu s7, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc 12
-// 0x01099cd4: 0x1099cd4: lw    s2, 12(s1)
+// 0x0109a31c: 0x109a31c: lw    s2, 12(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -6957,7 +6957,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01099cd8: 0x1099cd8: sw    v0, 36(sp)
+// 0x0109a320: 0x109a320: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6966,7 +6966,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01099cdc: 0x1099cdc: sw    a1, 40(sp)
+// 0x0109a324: 0x109a324: sw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6975,7 +6975,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01099ce0: 0x1099ce0: sw    a2, 44(sp)
+// 0x0109a328: 0x109a328: sw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6984,12 +6984,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01099ce4: 0x1099ce4: subu  s7, s7, a2
+// 0x0109a32c: 0x109a32c: subu  s7, s7, a2
 	ldloc 12
 	ldloc.3
 	sub
 	stloc 12
-// 0x01099ce8: 0x1099ce8: sw    v1, 32(sp)
+// 0x0109a330: 0x109a330: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6998,25 +6998,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099cec: 0x1099cec: addu  v0, zero, zero
+// 0x0109a334: 0x109a334: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01099cf0: 0x1099cf0: addu  s4, zero, zero
+// 0x0109a338: 0x109a338: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01099cf4: 0x1099cf4: addu  s5, zero, zero
+// 0x0109a33c: 0x109a33c: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x01099cf8: 0x1099cf8: addu  s6, zero, zero
+// 0x0109a340: 0x109a340: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01099cfc: 0x1099cfc: j	 0x1099f38 addu  s1, zero, zero
+// 0x0109a344: 0x109a344: j	 0x109a580 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1099f38
+	br L_109a580
 // --- basic block ---
-L_1099d04:
-// 0x01099d04: 0x1099d04: sw    zero, 24(sp)
+L_109a34c:
+// 0x0109a34c: 0x109a34c: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7025,7 +7025,7 @@ L_1099d04:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01099d08: 0x1099d08: sw    zero, 28(sp)
+// 0x0109a350: 0x109a350: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7034,7 +7034,7 @@ L_1099d04:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01099d0c: 0x1099d0c: lw    v1, 48(s2)
+// 0x0109a354: 0x109a354: lw    v1, 48(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7043,17 +7043,17 @@ L_1099d04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099d10: 0x1099d10: sll   zero, zero, 0
-// 0x01099d14: 0x1099d14: andi  a0, v1, 256
+// 0x0109a358: 0x109a358: sll   zero, zero, 0
+// 0x0109a35c: 0x109a35c: andi  a0, v1, 256
 	ldloc 7
 	ldc.i4 256
 	and
 	stloc.1
-// 0x01099d18: 0x1099d18: beq   a0, zero, 0x1099d2c sll   zero, zero, 0
+// 0x0109a360: 0x109a360: beq   a0, zero, 0x109a374 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1099d2c
+	brfalse L_109a374
 // --- basic block ---
-// 0x01099d20: 0x1099d20: lw    v1, 8(s2)
+// 0x0109a368: 0x109a368: lw    v1, 8(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7062,21 +7062,21 @@ L_1099d04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099d24: 0x1099d24: j	 0x1099f30 addu  s2, v0, zero
+// 0x0109a36c: 0x109a36c: j	 0x109a578 addu  s2, v0, zero
 	ldloc 6
 	stloc 11
-	br L_1099f30
+	br L_109a578
 // --- basic block ---
-L_1099d2c:
-// 0x01099d2c: 0x1099d2c: bne   s4, zero, 0x1099d5c andi  v1, v1, 128
+L_109a374:
+// 0x0109a374: 0x109a374: bne   s4, zero, 0x109a3a4 andi  v1, v1, 128
 	ldloc 15
 	ldloc 7
 	ldc.i4 128
 	and
 	stloc 7
-	brtrue L_1099d5c
+	brtrue L_109a3a4
 // --- basic block ---
-// 0x01099d34: 0x1099d34: lw    s7, 8(s0)
+// 0x0109a37c: 0x109a37c: lw    s7, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7085,27 +7085,27 @@ L_1099d2c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01099d38: 0x1099d38: lw    a0, 0(s0)
+// 0x0109a380: 0x109a380: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01099d3c: 0x1099d3c: addiu s7, s7, 1
+// 0x0109a384: 0x109a384: addiu s7, s7, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x01099d40: 0x1099d40: beq   v1, zero, 0x1099d5c subu  s7, s7, a0
+// 0x0109a388: 0x109a388: beq   v1, zero, 0x109a3a4 subu  s7, s7, a0
 	ldloc 7
 	ldloc 12
 	ldloc.1
 	sub
 	stloc 12
-	brfalse L_1099d5c
+	brfalse L_109a3a4
 // --- basic block ---
-// 0x01099d48: 0x1099d48: lw    v1, 4(s0)
+// 0x0109a390: 0x109a390: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7114,17 +7114,17 @@ L_1099d2c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099d4c: 0x1099d4c: addiu s7, s7, -2
+// 0x0109a394: 0x109a394: addiu s7, s7, -2
 	ldloc 12
 	ldc.i4.s -2
 	add
 	stloc 12
-// 0x01099d50: 0x1099d50: addiu v1, v1, 2
+// 0x0109a398: 0x109a398: addiu v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x01099d54: 0x1099d54: sw    v1, 4(s0)
+// 0x0109a39c: 0x109a39c: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7133,13 +7133,13 @@ L_1099d2c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099d58: 0x1099d58: addiu s1, s1, 2
+// 0x0109a3a0: 0x109a3a0: addiu s1, s1, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-L_1099d5c:
-// 0x01099d5c: 0x1099d5c: lw    v1, 48(s2)
+L_109a3a4:
+// 0x0109a3a4: 0x109a3a4: lw    v1, 48(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7148,19 +7148,19 @@ L_1099d5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099d60: 0x1099d60: sll   zero, zero, 0
-// 0x01099d64: 0x1099d64: andi  v1, v1, 4
+// 0x0109a3a8: 0x109a3a8: sll   zero, zero, 0
+// 0x0109a3ac: 0x109a3ac: andi  v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	and
 	stloc 7
-// 0x01099d68: 0x1099d68: bne   v1, zero, 0x1099da4 addiu a1, zero, 100
+// 0x0109a3b0: 0x109a3b0: bne   v1, zero, 0x109a3ec addiu a1, zero, 100
 	ldloc 7
 	ldc.i4.s 100
 	stloc.2
-	brtrue L_1099da4
+	brtrue L_109a3ec
 // --- basic block ---
-// 0x01099d70: 0x1099d70: lw    v1, 12(s0)
+// 0x0109a3b8: 0x109a3b8: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7169,7 +7169,7 @@ L_1099d5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099d74: 0x1099d74: lw    a0, 4(s0)
+// 0x0109a3bc: 0x109a3bc: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7178,30 +7178,30 @@ L_1099d5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01099d78: 0x1099d78: addiu v1, v1, 1
+// 0x0109a3c0: 0x109a3c0: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01099d7c: 0x1099d7c: subu  v1, v1, a0
+// 0x0109a3c4: 0x109a3c4: subu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 7
-// 0x01099d80: 0x1099d80: addiu a1, sp, 24
+// 0x0109a3c8: 0x109a3c8: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01099d84: 0x1099d84: addu  a0, s2, zero
+// 0x0109a3cc: 0x109a3cc: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01099d88: 0x1099d88: addiu a2, sp, 16
+// 0x0109a3d0: 0x109a3d0: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x01099d8c: 0x1099d8c: sw    v0, 64(sp)
+// 0x0109a3d4: 0x109a3d4: sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7210,7 +7210,7 @@ L_1099d5c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01099d90: 0x1099d90: sw    v1, 20(sp)
+// 0x0109a3d8: 0x109a3d8: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7219,7 +7219,7 @@ L_1099d5c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01099d94: 0x1099d94: jal   0x1099350 sw    s7, 16(sp)
+// 0x0109a3dc: 0x109a3dc: jal   0x1099998 sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7233,12 +7233,12 @@ L_1099d5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01099d9c: 0x1099d9c: lw    v0, 64(sp)
+// 0x0109a3e4: 0x109a3e4: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7247,20 +7247,20 @@ L_1099d5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099da0: 0x1099da0: addiu a1, zero, 100
+// 0x0109a3e8: 0x109a3e8: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-L_1099da4:
-// 0x01099da4: 0x1099da4: beq   s4, a1, 0x1099de0 sll   zero, zero, 0
+L_109a3ec:
+// 0x0109a3ec: 0x109a3ec: beq   s4, a1, 0x109a428 sll   zero, zero, 0
 	ldloc 15
 	ldloc.2
-	beq  L_1099de0
+	beq  L_109a428
 // --- basic block ---
-// 0x01099dac: 0x1099dac: beq   s4, zero, 0x1099dcc sll   zero, zero, 0
+// 0x0109a3f4: 0x109a3f4: beq   s4, zero, 0x109a414 sll   zero, zero, 0
 	ldloc 15
-	brfalse L_1099dcc
+	brfalse L_109a414
 // --- basic block ---
-// 0x01099db4: 0x1099db4: lw    v1, 24(sp)
+// 0x0109a3fc: 0x109a3fc: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7269,23 +7269,23 @@ L_1099da4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099db8: 0x1099db8: sll   zero, zero, 0
-// 0x01099dbc: 0x1099dbc: addu  v1, s1, v1
+// 0x0109a400: 0x109a400: sll   zero, zero, 0
+// 0x0109a404: 0x109a404: addu  v1, s1, v1
 	ldloc 10
 	ldloc 7
 	add
 	stloc 7
-// 0x01099dc0: 0x1099dc0: slt   v1, s7, v1
+// 0x0109a408: 0x109a408: slt   v1, s7, v1
 	ldloc 12
 	ldloc 7
 	clt
 	stloc 7
-// 0x01099dc4: 0x1099dc4: bne   v1, zero, 0x1099de0 sll   zero, zero, 0
+// 0x0109a40c: 0x109a40c: bne   v1, zero, 0x109a428 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1099de0
+	brtrue L_109a428
 // --- basic block ---
-L_1099dcc:
-// 0x01099dcc: 0x1099dcc: lw    v1, 48(s2)
+L_109a414:
+// 0x0109a414: 0x109a414: lw    v1, 48(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7294,22 +7294,22 @@ L_1099dcc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099dd0: 0x1099dd0: sll   zero, zero, 0
-// 0x01099dd4: 0x1099dd4: andi  v1, v1, 4
+// 0x0109a418: 0x109a418: sll   zero, zero, 0
+// 0x0109a41c: 0x109a41c: andi  v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	and
 	stloc 7
-// 0x01099dd8: 0x1099dd8: beq   v1, zero, 0x1099e8c sll   zero, zero, 0
+// 0x0109a420: 0x109a420: beq   v1, zero, 0x109a4d4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1099e8c
+	brfalse L_109a4d4
 // --- basic block ---
-L_1099de0:
-// 0x01099de0: 0x1099de0: beq   s3, zero, 0x1099e0c sll   zero, zero, 0
+L_109a428:
+// 0x0109a428: 0x109a428: beq   s3, zero, 0x109a454 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1099e0c
+	brfalse L_109a454
 // --- basic block ---
-// 0x01099de8: 0x1099de8: lw    v0, 48(s3)
+// 0x0109a430: 0x109a430: lw    v0, 48(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -7318,17 +7318,17 @@ L_1099de0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099dec: 0x1099dec: sll   zero, zero, 0
-// 0x01099df0: 0x1099df0: andi  v0, v0, 128
+// 0x0109a434: 0x109a434: sll   zero, zero, 0
+// 0x0109a438: 0x109a438: andi  v0, v0, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x01099df4: 0x1099df4: beq   v0, zero, 0x1099e0c sll   zero, zero, 0
+// 0x0109a43c: 0x109a43c: beq   v0, zero, 0x109a454 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1099e0c
+	brfalse L_109a454
 // --- basic block ---
-// 0x01099dfc: 0x1099dfc: lw    v0, 4(s0)
+// 0x0109a444: 0x109a444: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7337,13 +7337,13 @@ L_1099de0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099e00: 0x1099e00: sll   zero, zero, 0
-// 0x01099e04: 0x1099e04: addiu v0, v0, 2
+// 0x0109a448: 0x109a448: sll   zero, zero, 0
+// 0x0109a44c: 0x109a44c: addiu v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	add
 	stloc 6
-// 0x01099e08: 0x1099e08: sw    v0, 4(s0)
+// 0x0109a450: 0x109a450: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7352,8 +7352,8 @@ L_1099de0:
 	add
 	ldloc 6
 	stelem.i4
-L_1099e0c:
-// 0x01099e0c: 0x1099e0c: lw    v0, 4(s0)
+L_109a454:
+// 0x0109a454: 0x109a454: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7362,13 +7362,13 @@ L_1099e0c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099e10: 0x1099e10: sll   zero, zero, 0
-// 0x01099e14: 0x1099e14: addu  s6, s6, v0
+// 0x0109a458: 0x109a458: sll   zero, zero, 0
+// 0x0109a45c: 0x109a45c: addu  s6, s6, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01099e18: 0x1099e18: sw    s6, 4(s0)
+// 0x0109a460: 0x109a460: sw    s6, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7377,7 +7377,7 @@ L_1099e0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01099e1c: 0x1099e1c: lw    v0, 48(s2)
+// 0x0109a464: 0x109a464: lw    v0, 48(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7386,24 +7386,24 @@ L_1099e0c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099e20: 0x1099e20: sll   zero, zero, 0
-// 0x01099e24: 0x1099e24: andi  v0, v0, 128
+// 0x0109a468: 0x109a468: sll   zero, zero, 0
+// 0x0109a46c: 0x109a46c: andi  v0, v0, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x01099e28: 0x1099e28: beq   v0, zero, 0x1099e40 addu  s3, zero, zero
+// 0x0109a470: 0x109a470: beq   v0, zero, 0x109a488 addu  s3, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 13
-	brfalse L_1099e40
+	brfalse L_109a488
 // --- basic block ---
-// 0x01099e30: 0x1099e30: addiu s6, s6, 2
+// 0x0109a478: 0x109a478: addiu s6, s6, 2
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 9
-// 0x01099e34: 0x1099e34: sw    s6, 4(s0)
+// 0x0109a47c: 0x109a47c: sw    s6, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7412,29 +7412,29 @@ L_1099e0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01099e38: 0x1099e38: addiu s7, s7, -2
+// 0x0109a480: 0x109a480: addiu s7, s7, -2
 	ldloc 12
 	ldc.i4.s -2
 	add
 	stloc 12
-// 0x01099e3c: 0x1099e3c: addiu s3, zero, 2
+// 0x0109a484: 0x109a484: addiu s3, zero, 2
 	ldc.i4.2
 	stloc 13
-L_1099e40:
-// 0x01099e40: 0x1099e40: slt   v0, s5, s1
+L_109a488:
+// 0x0109a488: 0x109a488: slt   v0, s5, s1
 	ldloc 14
 	ldloc 10
 	clt
 	stloc 6
-// 0x01099e44: 0x1099e44: beq   v0, zero, 0x1099e50 sll   zero, zero, 0
+// 0x0109a48c: 0x109a48c: beq   v0, zero, 0x109a498 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1099e50
+	brfalse L_109a498
 // --- basic block ---
-// 0x01099e4c: 0x1099e4c: addu  s5, s1, zero
+// 0x0109a494: 0x109a494: addu  s5, s1, zero
 	ldloc 10
 	stloc 14
-L_1099e50:
-// 0x01099e50: 0x1099e50: lw    v0, 12(s0)
+L_109a498:
+// 0x0109a498: 0x109a498: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7443,7 +7443,7 @@ L_1099e50:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099e54: 0x1099e54: lw    v1, 4(s0)
+// 0x0109a49c: 0x109a49c: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7452,30 +7452,30 @@ L_1099e50:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099e58: 0x1099e58: addiu v0, v0, 1
+// 0x0109a4a0: 0x109a4a0: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01099e5c: 0x1099e5c: subu  v0, v0, v1
+// 0x0109a4a4: 0x109a4a4: subu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	sub
 	stloc 6
-// 0x01099e60: 0x1099e60: addu  a0, s2, zero
+// 0x0109a4a8: 0x109a4a8: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01099e64: 0x1099e64: addiu a1, sp, 24
+// 0x0109a4ac: 0x109a4ac: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01099e68: 0x1099e68: addiu a2, sp, 16
+// 0x0109a4b0: 0x109a4b0: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x01099e6c: 0x1099e6c: sw    v0, 20(sp)
+// 0x0109a4b4: 0x109a4b4: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7484,7 +7484,7 @@ L_1099e50:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01099e70: 0x1099e70: sw    s7, 16(sp)
+// 0x0109a4b8: 0x109a4b8: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7493,7 +7493,7 @@ L_1099e50:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01099e74: 0x1099e74: jal   0x1099350 addu  s1, s3, zero
+// 0x0109a4bc: 0x109a4bc: jal   0x1099998 addu  s1, s3, zero
 	ldloc 13
 	stloc 10
 	ldloc.0
@@ -7501,25 +7501,25 @@ L_1099e50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01099e7c: 0x1099e7c: addu  s3, s2, zero
+// 0x0109a4c4: 0x109a4c4: addu  s3, s2, zero
 	ldloc 11
 	stloc 13
-// 0x01099e80: 0x1099e80: addu  v0, zero, zero
+// 0x0109a4c8: 0x109a4c8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01099e84: 0x1099e84: addu  s4, zero, zero
+// 0x0109a4cc: 0x109a4cc: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01099e88: 0x1099e88: addu  s6, zero, zero
+// 0x0109a4d0: 0x109a4d0: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_1099e8c:
-// 0x01099e8c: 0x1099e8c: lw    v1, 24(sp)
+L_109a4d4:
+// 0x0109a4d4: 0x109a4d4: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7528,15 +7528,15 @@ L_1099e8c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099e90: 0x1099e90: beq   v0, zero, 0x1099eb0 addu  s1, s1, v1
+// 0x0109a4d8: 0x109a4d8: beq   v0, zero, 0x109a4f8 addu  s1, s1, v1
 	ldloc 6
 	ldloc 10
 	ldloc 7
 	add
 	stloc 10
-	brfalse L_1099eb0
+	brfalse L_109a4f8
 // --- basic block ---
-// 0x01099e98: 0x1099e98: lw    v0, 48(v0)
+// 0x0109a4e0: 0x109a4e0: lw    v0, 48(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7545,23 +7545,23 @@ L_1099e8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099e9c: 0x1099e9c: sll   zero, zero, 0
-// 0x01099ea0: 0x1099ea0: andi  v0, v0, 128
+// 0x0109a4e4: 0x109a4e4: sll   zero, zero, 0
+// 0x0109a4e8: 0x109a4e8: andi  v0, v0, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x01099ea4: 0x1099ea4: beq   v0, zero, 0x1099eb0 sll   zero, zero, 0
+// 0x0109a4ec: 0x109a4ec: beq   v0, zero, 0x109a4f8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1099eb0
+	brfalse L_109a4f8
 // --- basic block ---
-// 0x01099eac: 0x1099eac: addiu s1, s1, 2
+// 0x0109a4f4: 0x109a4f4: addiu s1, s1, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-L_1099eb0:
-// 0x01099eb0: 0x1099eb0: lw    v0, 28(sp)
+L_109a4f8:
+// 0x0109a4f8: 0x109a4f8: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7570,21 +7570,21 @@ L_1099eb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099eb4: 0x1099eb4: sll   zero, zero, 0
-// 0x01099eb8: 0x1099eb8: slt   v1, s6, v0
+// 0x0109a4fc: 0x109a4fc: sll   zero, zero, 0
+// 0x0109a500: 0x109a500: slt   v1, s6, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 7
-// 0x01099ebc: 0x1099ebc: beq   v1, zero, 0x1099ec8 sll   zero, zero, 0
+// 0x0109a504: 0x109a504: beq   v1, zero, 0x109a510 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1099ec8
+	brfalse L_109a510
 // --- basic block ---
-// 0x01099ec4: 0x1099ec4: addu  s6, v0, zero
+// 0x0109a50c: 0x109a50c: addu  s6, v0, zero
 	ldloc 6
 	stloc 9
-L_1099ec8:
-// 0x01099ec8: 0x1099ec8: lw    v0, 48(s2)
+L_109a510:
+// 0x0109a510: 0x109a510: lw    v0, 48(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7593,34 +7593,34 @@ L_1099ec8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099ecc: 0x1099ecc: sll   zero, zero, 0
-// 0x01099ed0: 0x1099ed0: andi  v0, v0, 8
+// 0x0109a514: 0x109a514: sll   zero, zero, 0
+// 0x0109a518: 0x109a518: andi  v0, v0, 8
 	ldloc 6
 	ldc.i4.8
 	and
 	stloc 6
-// 0x01099ed4: 0x1099ed4: beq   v0, zero, 0x1099f2c addiu s4, s4, 1
+// 0x0109a51c: 0x109a51c: beq   v0, zero, 0x109a574 addiu s4, s4, 1
 	ldloc 6
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-	brfalse L_1099f2c
+	brfalse L_109a574
 // --- basic block ---
-// 0x01099edc: 0x1099edc: slt   v0, s5, s1
+// 0x0109a524: 0x109a524: slt   v0, s5, s1
 	ldloc 14
 	ldloc 10
 	clt
 	stloc 6
-// 0x01099ee0: 0x1099ee0: beq   v0, zero, 0x1099eec sll   zero, zero, 0
+// 0x0109a528: 0x109a528: beq   v0, zero, 0x109a534 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1099eec
+	brfalse L_109a534
 // --- basic block ---
-// 0x01099ee8: 0x1099ee8: addu  s5, s1, zero
+// 0x0109a530: 0x109a530: addu  s5, s1, zero
 	ldloc 10
 	stloc 14
-L_1099eec:
-// 0x01099eec: 0x1099eec: lw    v0, 4(s0)
+L_109a534:
+// 0x0109a534: 0x109a534: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7629,13 +7629,13 @@ L_1099eec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099ef0: 0x1099ef0: sll   zero, zero, 0
-// 0x01099ef4: 0x1099ef4: addu  s6, s6, v0
+// 0x0109a538: 0x109a538: sll   zero, zero, 0
+// 0x0109a53c: 0x109a53c: addu  s6, s6, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01099ef8: 0x1099ef8: beq   s3, zero, 0x1099f1c sw    s6, 4(s0)
+// 0x0109a540: 0x109a540: beq   s3, zero, 0x109a564 sw    s6, 4(s0)
 	ldloc 13
 	ldloc 5
 	ldloc 8
@@ -7645,9 +7645,9 @@ L_1099eec:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_1099f1c
+	brfalse L_109a564
 // --- basic block ---
-// 0x01099f00: 0x1099f00: lw    v0, 48(s3)
+// 0x0109a548: 0x109a548: lw    v0, 48(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -7656,24 +7656,24 @@ L_1099eec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099f04: 0x1099f04: sll   zero, zero, 0
-// 0x01099f08: 0x1099f08: andi  v0, v0, 128
+// 0x0109a54c: 0x109a54c: sll   zero, zero, 0
+// 0x0109a550: 0x109a550: andi  v0, v0, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x01099f0c: 0x1099f0c: beq   v0, zero, 0x1099f20 addu  s3, s2, zero
+// 0x0109a554: 0x109a554: beq   v0, zero, 0x109a568 addu  s3, s2, zero
 	ldloc 6
 	ldloc 11
 	stloc 13
-	brfalse L_1099f20
+	brfalse L_109a568
 // --- basic block ---
-// 0x01099f14: 0x1099f14: addiu s6, s6, 2
+// 0x0109a55c: 0x109a55c: addiu s6, s6, 2
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 9
-// 0x01099f18: 0x1099f18: sw    s6, 4(s0)
+// 0x0109a560: 0x109a560: sw    s6, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7682,22 +7682,22 @@ L_1099eec:
 	add
 	ldloc 9
 	stelem.i4
-L_1099f1c:
-// 0x01099f1c: 0x1099f1c: addu  s3, s2, zero
+L_109a564:
+// 0x0109a564: 0x109a564: addu  s3, s2, zero
 	ldloc 11
 	stloc 13
-L_1099f20:
-// 0x01099f20: 0x1099f20: addu  s4, zero, zero
+L_109a568:
+// 0x0109a568: 0x109a568: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01099f24: 0x1099f24: addu  s6, zero, zero
+// 0x0109a56c: 0x109a56c: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01099f28: 0x1099f28: addu  s1, zero, zero
+// 0x0109a570: 0x109a570: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_1099f2c:
-// 0x01099f2c: 0x1099f2c: lw    v1, 8(s2)
+L_109a574:
+// 0x0109a574: 0x109a574: lw    v1, 8(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7706,35 +7706,35 @@ L_1099f2c:
 	add
 	ldelem.i4
 	stloc 7
-L_1099f30:
-// 0x01099f30: 0x1099f30: addu  v0, s2, zero
+L_109a578:
+// 0x0109a578: 0x109a578: addu  v0, s2, zero
 	ldloc 11
 	stloc 6
-// 0x01099f34: 0x1099f34: addu  s2, v1, zero
+// 0x0109a57c: 0x109a57c: addu  s2, v1, zero
 	ldloc 7
 	stloc 11
-L_1099f38:
-// 0x01099f38: 0x1099f38: bne   s2, zero, 0x1099d04 sll   zero, zero, 0
+L_109a580:
+// 0x0109a580: 0x109a580: bne   s2, zero, 0x109a34c sll   zero, zero, 0
 	ldloc 11
-	brtrue L_1099d04
+	brtrue L_109a34c
 // --- basic block ---
-// 0x01099f40: 0x1099f40: beq   s4, zero, 0x1099f80 slt   v0, s5, s1
+// 0x0109a588: 0x109a588: beq   s4, zero, 0x109a5c8 slt   v0, s5, s1
 	ldloc 15
 	ldloc 14
 	ldloc 10
 	clt
 	stloc 6
-	brfalse L_1099f80
+	brfalse L_109a5c8
 // --- basic block ---
-// 0x01099f48: 0x1099f48: beq   v0, zero, 0x1099f54 sll   zero, zero, 0
+// 0x0109a590: 0x109a590: beq   v0, zero, 0x109a59c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1099f54
+	brfalse L_109a59c
 // --- basic block ---
-// 0x01099f50: 0x1099f50: addu  s5, s1, zero
+// 0x0109a598: 0x109a598: addu  s5, s1, zero
 	ldloc 10
 	stloc 14
-L_1099f54:
-// 0x01099f54: 0x1099f54: lw    v0, 4(s0)
+L_109a59c:
+// 0x0109a59c: 0x109a59c: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7743,13 +7743,13 @@ L_1099f54:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099f58: 0x1099f58: sll   zero, zero, 0
-// 0x01099f5c: 0x1099f5c: addu  s6, s6, v0
+// 0x0109a5a0: 0x109a5a0: sll   zero, zero, 0
+// 0x0109a5a4: 0x109a5a4: addu  s6, s6, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01099f60: 0x1099f60: beq   s3, zero, 0x1099f80 sw    s6, 4(s0)
+// 0x0109a5a8: 0x109a5a8: beq   s3, zero, 0x109a5c8 sw    s6, 4(s0)
 	ldloc 13
 	ldloc 5
 	ldloc 8
@@ -7759,9 +7759,9 @@ L_1099f54:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_1099f80
+	brfalse L_109a5c8
 // --- basic block ---
-// 0x01099f68: 0x1099f68: lw    v0, 48(s3)
+// 0x0109a5b0: 0x109a5b0: lw    v0, 48(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -7770,21 +7770,21 @@ L_1099f54:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099f6c: 0x1099f6c: sll   zero, zero, 0
-// 0x01099f70: 0x1099f70: andi  v0, v0, 128
+// 0x0109a5b4: 0x109a5b4: sll   zero, zero, 0
+// 0x0109a5b8: 0x109a5b8: andi  v0, v0, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x01099f74: 0x1099f74: beq   v0, zero, 0x1099f80 addiu s6, s6, 2
+// 0x0109a5bc: 0x109a5bc: beq   v0, zero, 0x109a5c8 addiu s6, s6, 2
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 9
-	brfalse L_1099f80
+	brfalse L_109a5c8
 // --- basic block ---
-// 0x01099f7c: 0x1099f7c: sw    s6, 4(s0)
+// 0x0109a5c4: 0x109a5c4: sw    s6, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7793,15 +7793,15 @@ L_1099f54:
 	add
 	ldloc 9
 	stelem.i4
-L_1099f80:
-// 0x01099f80: 0x1099f80: sw    s5, 0(s8)
+L_109a5c8:
+// 0x0109a5c8: 0x109a5c8: sw    s5, 0(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-// 0x01099f84: 0x1099f84: lw    v1, 4(s0)
+// 0x0109a5cc: 0x109a5cc: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7810,7 +7810,7 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01099f88: 0x1099f88: lw    a2, 52(sp)
+// 0x0109a5d0: 0x109a5d0: lw    a2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7819,7 +7819,7 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01099f8c: 0x1099f8c: lw    v0, 44(sp)
+// 0x0109a5d4: 0x109a5d4: lw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7828,7 +7828,7 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099f90: 0x1099f90: lw    a1, 32(sp)
+// 0x0109a5d8: 0x109a5d8: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7837,17 +7837,17 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01099f94: 0x1099f94: addu  a0, a2, v0
+// 0x0109a5dc: 0x109a5dc: addu  a0, a2, v0
 	ldloc.3
 	ldloc 6
 	add
 	stloc.1
-// 0x01099f98: 0x1099f98: addu  v1, a1, v1
+// 0x0109a5e0: 0x109a5e0: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x01099f9c: 0x1099f9c: lw    a2, 60(sp)
+// 0x0109a5e4: 0x109a5e4: lw    a2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7856,7 +7856,7 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01099fa0: 0x1099fa0: lw    a1, 36(sp)
+// 0x0109a5e8: 0x109a5e8: lw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7865,17 +7865,17 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01099fa4: 0x1099fa4: addiu v1, v1, 1
+// 0x0109a5ec: 0x109a5ec: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01099fa8: 0x1099fa8: addu  v0, a2, a1
+// 0x0109a5f0: 0x109a5f0: addu  v0, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc 6
-// 0x01099fac: 0x1099fac: lw    a2, 48(sp)
+// 0x0109a5f4: 0x109a5f4: lw    a2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7884,7 +7884,7 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01099fb0: 0x1099fb0: lw    a1, 12(s0)
+// 0x0109a5f8: 0x109a5f8: lw    a1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7893,12 +7893,12 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01099fb4: 0x1099fb4: subu  a0, a0, a2
+// 0x0109a5fc: 0x109a5fc: subu  a0, a0, a2
 	ldloc.1
 	ldloc.3
 	sub
 	stloc.1
-// 0x01099fb8: 0x1099fb8: lw    a2, 32(sp)
+// 0x0109a600: 0x109a600: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7907,13 +7907,13 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01099fbc: 0x1099fbc: sll   zero, zero, 0
-// 0x01099fc0: 0x1099fc0: subu  v0, v0, a2
+// 0x0109a604: 0x109a604: sll   zero, zero, 0
+// 0x0109a608: 0x109a608: subu  v0, v0, a2
 	ldloc 6
 	ldloc.3
 	sub
 	stloc 6
-// 0x01099fc4: 0x1099fc4: lw    a2, 36(sp)
+// 0x0109a60c: 0x109a60c: lw    a2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7922,18 +7922,18 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01099fc8: 0x1099fc8: sll   zero, zero, 0
-// 0x01099fcc: 0x1099fcc: subu  v1, v1, a2
+// 0x0109a610: 0x109a610: sll   zero, zero, 0
+// 0x0109a614: 0x109a614: subu  v1, v1, a2
 	ldloc 7
 	ldloc.3
 	sub
 	stloc 7
-// 0x01099fd0: 0x1099fd0: subu  v1, v1, a1
+// 0x0109a618: 0x109a618: subu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	sub
 	stloc 7
-// 0x01099fd4: 0x1099fd4: lw    a2, 56(sp)
+// 0x0109a61c: 0x109a61c: lw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7942,7 +7942,7 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01099fd8: 0x1099fd8: lw    a1, 40(sp)
+// 0x0109a620: 0x109a620: lw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7951,27 +7951,27 @@ L_1099f80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01099fdc: 0x1099fdc: subu  v0, v0, a2
+// 0x0109a624: 0x109a624: subu  v0, v0, a2
 	ldloc 6
 	ldloc.3
 	sub
 	stloc 6
-// 0x01099fe0: 0x1099fe0: subu  a0, a0, a1
+// 0x0109a628: 0x109a628: subu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.1
-// 0x01099fe4: 0x1099fe4: addu  s5, a0, s5
+// 0x0109a62c: 0x109a62c: addu  s5, a0, s5
 	ldloc.1
 	ldloc 14
 	add
 	stloc 14
-// 0x01099fe8: 0x1099fe8: addu  v0, v0, v1
+// 0x0109a630: 0x109a630: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x01099fec: 0x1099fec: sw    v0, 4(s8)
+// 0x0109a634: 0x109a634: sw    v0, 4(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -7980,17 +7980,17 @@ L_1099f80:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01099ff0: 0x1099ff0: j	 0x109a034 sw    s5, 0(s8)
+// 0x0109a638: 0x109a638: j	 0x109a67c sw    s5, 0(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-	br L_109a034
+	br L_109a67c
 // --- basic block ---
-L_1099ff8:
-// 0x01099ff8: 0x1099ff8: lw    v0, 184(s1)
+L_109a640:
+// 0x0109a640: 0x109a640: lw    v0, 184(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7999,13 +7999,13 @@ L_1099ff8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01099ffc: 0x1099ffc: addu  a0, s1, zero
+// 0x0109a644: 0x109a644: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0109a000: 0x109a000: addu  a1, s0, zero
+// 0x0109a648: 0x109a648: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0109a004: 0x109a004: jalr  v0 addiu a2, zero, 1
+// 0x0109a64c: 0x109a64c: jalr  v0 addiu a2, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.3
@@ -8019,7 +8019,7 @@ L_1099ff8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109a00c: 0x109a00c: lw    v0, 8(s0)
+// 0x0109a654: 0x109a654: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -8028,31 +8028,31 @@ L_1099ff8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a010: 0x109a010: lw    v1, 0(s0)
+// 0x0109a658: 0x109a658: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109a014: 0x109a014: addiu v0, v0, 1
+// 0x0109a65c: 0x109a65c: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0109a018: 0x109a018: subu  v0, v0, v1
+// 0x0109a660: 0x109a660: subu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	sub
 	stloc 6
-// 0x0109a01c: 0x109a01c: sw    v0, 0(s8)
+// 0x0109a664: 0x109a664: sw    v0, 0(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0109a020: 0x109a020: lw    v0, 12(s0)
+// 0x0109a668: 0x109a668: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -8061,7 +8061,7 @@ L_1099ff8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a024: 0x109a024: lw    v1, 4(s0)
+// 0x0109a66c: 0x109a66c: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -8070,17 +8070,17 @@ L_1099ff8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a028: 0x109a028: addiu v0, v0, 1
+// 0x0109a670: 0x109a670: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0109a02c: 0x109a02c: subu  v0, v0, v1
+// 0x0109a674: 0x109a674: subu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	sub
 	stloc 6
-// 0x0109a030: 0x109a030: sw    v0, 4(s8)
+// 0x0109a678: 0x109a678: sw    v0, 4(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -8089,9 +8089,9 @@ L_1099ff8:
 	add
 	ldloc 6
 	stelem.i4
-L_109a034:
-// 0x0109a034: 0x109a034: lw    ra, 108(sp)
-// 0x0109a038: 0x109a038: lw    s8, 104(sp)
+L_109a67c:
+// 0x0109a67c: 0x109a67c: lw    ra, 108(sp)
+// 0x0109a680: 0x109a680: lw    s8, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8100,7 +8100,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109a03c: 0x109a03c: lw    s7, 100(sp)
+// 0x0109a684: 0x109a684: lw    s7, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8109,7 +8109,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109a040: 0x109a040: lw    s6, 96(sp)
+// 0x0109a688: 0x109a688: lw    s6, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8118,7 +8118,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109a044: 0x109a044: lw    s5, 92(sp)
+// 0x0109a68c: 0x109a68c: lw    s5, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8127,7 +8127,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109a048: 0x109a048: lw    s4, 88(sp)
+// 0x0109a690: 0x109a690: lw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8136,7 +8136,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109a04c: 0x109a04c: lw    s3, 84(sp)
+// 0x0109a694: 0x109a694: lw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8145,7 +8145,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109a050: 0x109a050: lw    s2, 80(sp)
+// 0x0109a698: 0x109a698: lw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8154,7 +8154,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109a054: 0x109a054: lw    s1, 76(sp)
+// 0x0109a69c: 0x109a69c: lw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8163,7 +8163,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109a058: 0x109a058: lw    s0, 72(sp)
+// 0x0109a6a0: 0x109a6a0: lw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8172,7 +8172,7 @@ L_109a034:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109a05c: 0x109a05c: jr    ra addiu sp, sp, 112
+// 0x0109a6a4: 0x109a6a4: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
diff --git a/converted/Cibyl115.j b/converted/Cibyl115.j
index 1aa7d47..af5e9dd 100644
--- a/converted/Cibyl115.j
+++ b/converted/Cibyl115.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl115::.ctor
 
-.method public static int32 ssd_widget_find_clickable_by_pos_109a120(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_find_clickable_by_pos_109a768(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -91,12 +91,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109a120: 0x109a120: addiu sp, sp, -48
+// 0x0109a768: 0x109a768: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109a124: 0x109a124: sw    s4, 40(sp)
+// 0x0109a76c: 0x109a76c: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -105,7 +105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109a128: 0x109a128: sw    s3, 36(sp)
+// 0x0109a770: 0x109a770: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -114,7 +114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109a12c: 0x109a12c: sw    s2, 32(sp)
+// 0x0109a774: 0x109a774: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -123,7 +123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109a130: 0x109a130: sw    s1, 28(sp)
+// 0x0109a778: 0x109a778: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -132,7 +132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109a134: 0x109a134: sw    s0, 24(sp)
+// 0x0109a77c: 0x109a77c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -141,31 +141,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a138: 0x109a138: sw    ra, 44(sp)
-// 0x0109a13c: 0x109a13c: addu  s0, a0, zero
+// 0x0109a780: 0x109a780: sw    ra, 44(sp)
+// 0x0109a784: 0x109a784: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0109a140: 0x109a140: addu  s1, a1, zero
+// 0x0109a788: 0x109a788: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0109a144: 0x109a144: addu  s3, a2, zero
+// 0x0109a78c: 0x109a78c: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0109a148: 0x109a148: addu  s2, a3, zero
+// 0x0109a790: 0x109a790: addu  s2, a3, zero
 	ldloc 4
 	stloc 10
-// 0x0109a14c: 0x109a14c: j	 0x109a20c addiu s4, sp, 16
+// 0x0109a794: 0x109a794: j	 0x109a854 addiu s4, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-	br L_109a20c
+	br L_109a854
 // --- basic block ---
-L_109a154:
-// 0x0109a154: 0x109a154: addu  a1, s4, zero
+L_109a79c:
+// 0x0109a79c: 0x109a79c: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x0109a158: 0x109a158: jal   0x1099350 addu  a2, zero, zero
+// 0x0109a7a0: 0x109a7a0: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -173,12 +173,12 @@ L_109a154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109a160: 0x109a160: lw    v1, 120(s0)
+// 0x0109a7a8: 0x109a7a8: lw    v1, 120(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -187,24 +187,24 @@ L_109a154:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109a164: 0x109a164: lw    v0, 0(s1)
+// 0x0109a7ac: 0x109a7ac: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109a168: 0x109a168: sll   zero, zero, 0
-// 0x0109a16c: 0x109a16c: slt   a0, v0, v1
+// 0x0109a7b0: 0x109a7b0: sll   zero, zero, 0
+// 0x0109a7b4: 0x109a7b4: slt   a0, v0, v1
 	ldloc 6
 	ldloc 8
 	clt
 	stloc.1
-// 0x0109a170: 0x109a170: bne   a0, zero, 0x109a204 sll   zero, zero, 0
+// 0x0109a7b8: 0x109a7b8: bne   a0, zero, 0x109a84c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_109a204
+	brtrue L_109a84c
 // --- basic block ---
-// 0x0109a178: 0x109a178: lw    a0, 16(sp)
+// 0x0109a7c0: 0x109a7c0: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -213,22 +213,22 @@ L_109a154:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a17c: 0x109a17c: sll   zero, zero, 0
-// 0x0109a180: 0x109a180: addu  v1, v1, a0
+// 0x0109a7c4: 0x109a7c4: sll   zero, zero, 0
+// 0x0109a7c8: 0x109a7c8: addu  v1, v1, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-// 0x0109a184: 0x109a184: slt   v0, v1, v0
+// 0x0109a7cc: 0x109a7cc: slt   v0, v1, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109a188: 0x109a188: bne   v0, zero, 0x109a204 sll   zero, zero, 0
+// 0x0109a7d0: 0x109a7d0: bne   v0, zero, 0x109a84c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109a204
+	brtrue L_109a84c
 // --- basic block ---
-// 0x0109a190: 0x109a190: lw    v1, 124(s0)
+// 0x0109a7d8: 0x109a7d8: lw    v1, 124(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -237,7 +237,7 @@ L_109a154:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109a194: 0x109a194: lw    v0, 4(s1)
+// 0x0109a7dc: 0x109a7dc: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -246,17 +246,17 @@ L_109a154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a198: 0x109a198: sll   zero, zero, 0
-// 0x0109a19c: 0x109a19c: slt   a0, v0, v1
+// 0x0109a7e0: 0x109a7e0: sll   zero, zero, 0
+// 0x0109a7e4: 0x109a7e4: slt   a0, v0, v1
 	ldloc 6
 	ldloc 8
 	clt
 	stloc.1
-// 0x0109a1a0: 0x109a1a0: bne   a0, zero, 0x109a204 sll   zero, zero, 0
+// 0x0109a7e8: 0x109a7e8: bne   a0, zero, 0x109a84c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_109a204
+	brtrue L_109a84c
 // --- basic block ---
-// 0x0109a1a8: 0x109a1a8: lw    a0, 20(sp)
+// 0x0109a7f0: 0x109a7f0: lw    a0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -265,22 +265,22 @@ L_109a154:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a1ac: 0x109a1ac: sll   zero, zero, 0
-// 0x0109a1b0: 0x109a1b0: addu  v1, v1, a0
+// 0x0109a7f4: 0x109a7f4: sll   zero, zero, 0
+// 0x0109a7f8: 0x109a7f8: addu  v1, v1, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-// 0x0109a1b4: 0x109a1b4: slt   v0, v1, v0
+// 0x0109a7fc: 0x109a7fc: slt   v0, v1, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109a1b8: 0x109a1b8: bne   v0, zero, 0x109a204 sll   zero, zero, 0
+// 0x0109a800: 0x109a800: bne   v0, zero, 0x109a84c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109a204
+	brtrue L_109a84c
 // --- basic block ---
-// 0x0109a1c0: 0x109a1c0: lw    v0, 196(s0)
+// 0x0109a808: 0x109a808: lw    v0, 196(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -289,20 +289,20 @@ L_109a154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a1c4: 0x109a1c4: sll   zero, zero, 0
-// 0x0109a1c8: 0x109a1c8: beq   v0, zero, 0x109a1d4 sll   zero, zero, 0
+// 0x0109a80c: 0x109a80c: sll   zero, zero, 0
+// 0x0109a810: 0x109a810: beq   v0, zero, 0x109a81c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109a1d4
+	brfalse L_109a81c
 // --- basic block ---
-// 0x0109a1d0: 0x109a1d0: sw    s0, 0(s3)
+// 0x0109a818: 0x109a818: sw    s0, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_109a1d4:
-// 0x0109a1d4: 0x109a1d4: lw    v0, 200(s0)
+L_109a81c:
+// 0x0109a81c: 0x109a81c: lw    v0, 200(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -311,20 +311,20 @@ L_109a1d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a1d8: 0x109a1d8: sll   zero, zero, 0
-// 0x0109a1dc: 0x109a1dc: beq   v0, zero, 0x109a1e8 sll   zero, zero, 0
+// 0x0109a820: 0x109a820: sll   zero, zero, 0
+// 0x0109a824: 0x109a824: beq   v0, zero, 0x109a830 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109a1e8
+	brfalse L_109a830
 // --- basic block ---
-// 0x0109a1e4: 0x109a1e4: sw    s0, 0(s2)
+// 0x0109a82c: 0x109a82c: sw    s0, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_109a1e8:
-// 0x0109a1e8: 0x109a1e8: lw    a0, 12(s0)
+L_109a830:
+// 0x0109a830: 0x109a830: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -333,13 +333,13 @@ L_109a1e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a1ec: 0x109a1ec: addu  a1, s1, zero
+// 0x0109a834: 0x109a834: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0109a1f0: 0x109a1f0: addu  a2, s3, zero
+// 0x0109a838: 0x109a838: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x0109a1f4: 0x109a1f4: jal   0x109a120 addu  a3, s2, zero
+// 0x0109a83c: 0x109a83c: jal   0x109a768 addu  a3, s2, zero
 	ldloc 10
 	stloc 4
 	ldloc.0
@@ -347,19 +347,19 @@ L_109a1e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_find_clickable_by_pos_109a120(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_find_clickable_by_pos_109a768(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109a1fc: 0x109a1fc: bne   v0, zero, 0x109a218 addiu v0, zero, 1
+// 0x0109a844: 0x109a844: bne   v0, zero, 0x109a860 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_109a218
+	brtrue L_109a860
 // --- basic block ---
-L_109a204:
-// 0x0109a204: 0x109a204: lw    s0, 8(s0)
+L_109a84c:
+// 0x0109a84c: 0x109a84c: lw    s0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -368,20 +368,20 @@ L_109a204:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a208: 0x109a208: sll   zero, zero, 0
-L_109a20c:
-// 0x0109a20c: 0x109a20c: bne   s0, zero, 0x109a154 addu  a0, s0, zero
+// 0x0109a850: 0x109a850: sll   zero, zero, 0
+L_109a854:
+// 0x0109a854: 0x109a854: bne   s0, zero, 0x109a79c addu  a0, s0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_109a154
+	brtrue L_109a79c
 // --- basic block ---
-// 0x0109a214: 0x109a214: addu  v0, zero, zero
+// 0x0109a85c: 0x109a85c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_109a218:
-// 0x0109a218: 0x109a218: lw    ra, 44(sp)
-// 0x0109a21c: 0x109a21c: lw    s4, 40(sp)
+L_109a860:
+// 0x0109a860: 0x109a860: lw    ra, 44(sp)
+// 0x0109a864: 0x109a864: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -390,7 +390,7 @@ L_109a218:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109a220: 0x109a220: lw    s3, 36(sp)
+// 0x0109a868: 0x109a868: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -399,7 +399,7 @@ L_109a218:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109a224: 0x109a224: lw    s2, 32(sp)
+// 0x0109a86c: 0x109a86c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -408,7 +408,7 @@ L_109a218:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109a228: 0x109a228: lw    s1, 28(sp)
+// 0x0109a870: 0x109a870: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -417,7 +417,7 @@ L_109a218:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109a22c: 0x109a22c: lw    s0, 24(sp)
+// 0x0109a874: 0x109a874: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -426,7 +426,7 @@ L_109a218:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a230: 0x109a230: jr    ra addiu sp, sp, 48
+// 0x0109a878: 0x109a878: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -438,7 +438,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_container_size_109a238(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_container_size_109a880(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -482,12 +482,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109a238: 0x109a238: addiu sp, sp, -56
+// 0x0109a880: 0x109a880: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0109a23c: 0x109a23c: sw    s1, 44(sp)
+// 0x0109a884: 0x109a884: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -496,10 +496,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109a240: 0x109a240: addu  s1, a0, zero
+// 0x0109a888: 0x109a888: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109a244: 0x109a244: lw    a0, 4(a0)
+// 0x0109a88c: 0x109a88c: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -508,7 +508,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a248: 0x109a248: sw    s0, 40(sp)
+// 0x0109a890: 0x109a890: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -517,8 +517,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109a24c: 0x109a24c: sw    ra, 52(sp)
-// 0x0109a250: 0x109a250: sw    s2, 48(sp)
+// 0x0109a894: 0x109a894: sw    ra, 52(sp)
+// 0x0109a898: 0x109a898: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -527,31 +527,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109a254: 0x109a254: beq   a0, zero, 0x109a274 addu  s0, a1, zero
+// 0x0109a89c: 0x109a89c: beq   a0, zero, 0x109a8bc addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 8
-	brfalse L_109a274
+	brfalse L_109a8bc
 // --- basic block ---
-// 0x0109a25c: 0x109a25c: jal   0x109a238 sll   zero, zero, 0
+// 0x0109a8a4: 0x109a8a4: jal   0x109a880 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_container_size_109a238(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_container_size_109a880(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109a264: 0x109a264: lw    v1, 0(s0)
+// 0x0109a8ac: 0x109a8ac: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109a268: 0x109a268: lw    v0, 4(s0)
+// 0x0109a8b0: 0x109a8b0: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -560,7 +560,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a26c: 0x109a26c: j	 0x109a290 sw    v1, 16(sp)
+// 0x0109a8b4: 0x109a8b4: j	 0x109a8d8 sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -569,34 +569,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	br L_109a290
+	br L_109a8d8
 // --- basic block ---
-L_109a274:
-// 0x0109a274: 0x109a274: lui   v0, 0xf0000
+L_109a8bc:
+// 0x0109a8bc: 0x109a8bc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0109a278: 0x109a278: lw    v0, -30068(v0)
+// 0x0109a8c0: 0x109a8c0: lw    v0, -29604(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a27c: 0x109a27c: lui   v1, 0xf0000
+// 0x0109a8c4: 0x109a8c4: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0109a280: 0x109a280: lw    s2, -30072(v1)
+// 0x0109a8c8: 0x109a8c8: lw    s2, -29608(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109a284: 0x109a284: jal   0x1042430 sw    v0, 16(sp)
+// 0x0109a8cc: 0x109a8cc: jal   0x1042440 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -605,29 +605,29 @@ L_109a274:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109a28c: 0x109a28c: subu  v0, s2, v0
+// 0x0109a8d4: 0x109a8d4: subu  v0, s2, v0
 	ldloc 10
 	ldloc 6
 	sub
 	stloc 6
-L_109a290:
-// 0x0109a290: 0x109a290: addu  a0, s1, zero
+L_109a8d8:
+// 0x0109a8d8: 0x109a8d8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109a294: 0x109a294: addu  a1, s0, zero
+// 0x0109a8dc: 0x109a8dc: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0109a298: 0x109a298: addiu a2, sp, 16
+// 0x0109a8e0: 0x109a8e0: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x0109a29c: 0x109a29c: jal   0x1099350 sw    v0, 20(sp)
+// 0x0109a8e4: 0x109a8e4: jal   0x1099998 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -641,12 +641,12 @@ L_109a290:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109a2a4: 0x109a2a4: lw    v0, 184(s1)
+// 0x0109a8ec: 0x109a8ec: lw    v0, 184(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -655,23 +655,23 @@ L_109a290:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a2a8: 0x109a2a8: sll   zero, zero, 0
-// 0x0109a2ac: 0x109a2ac: beq   v0, zero, 0x109a308 addiu a1, sp, 24
+// 0x0109a8f0: 0x109a8f0: sll   zero, zero, 0
+// 0x0109a8f4: 0x109a8f4: beq   v0, zero, 0x109a950 addiu a1, sp, 24
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-	brfalse L_109a308
+	brfalse L_109a950
 // --- basic block ---
-// 0x0109a2b4: 0x109a2b4: lw    a0, 0(s0)
+// 0x0109a8fc: 0x109a8fc: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a2b8: 0x109a2b8: lw    v1, 4(s0)
+// 0x0109a900: 0x109a900: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -680,17 +680,17 @@ L_109a290:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a2bc: 0x109a2bc: addiu a0, a0, -1
+// 0x0109a904: 0x109a904: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x0109a2c0: 0x109a2c0: addiu v1, v1, -1
+// 0x0109a908: 0x109a908: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0109a2c4: 0x109a2c4: sw    a0, 32(sp)
+// 0x0109a90c: 0x109a90c: sw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -699,7 +699,7 @@ L_109a290:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109a2c8: 0x109a2c8: sw    v1, 36(sp)
+// 0x0109a910: 0x109a910: sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -708,10 +708,10 @@ L_109a290:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a2cc: 0x109a2cc: addu  a0, s1, zero
+// 0x0109a914: 0x109a914: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109a2d0: 0x109a2d0: sw    zero, 24(sp)
+// 0x0109a918: 0x109a918: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -720,7 +720,7 @@ L_109a290:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a2d4: 0x109a2d4: sw    zero, 28(sp)
+// 0x0109a91c: 0x109a91c: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -729,7 +729,7 @@ L_109a290:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a2d8: 0x109a2d8: jalr  v0 addiu a2, zero, 3
+// 0x0109a920: 0x109a920: jalr  v0 addiu a2, zero, 3
 	ldloc 6
 	ldc.i4.3
 	stloc.3
@@ -743,7 +743,7 @@ L_109a290:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109a2e0: 0x109a2e0: lw    v0, 32(sp)
+// 0x0109a928: 0x109a928: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -752,7 +752,7 @@ L_109a290:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a2e4: 0x109a2e4: lw    a0, 24(sp)
+// 0x0109a92c: 0x109a92c: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -761,7 +761,7 @@ L_109a290:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a2e8: 0x109a2e8: lw    v1, 36(sp)
+// 0x0109a930: 0x109a930: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -770,17 +770,17 @@ L_109a290:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a2ec: 0x109a2ec: addiu v0, v0, 1
+// 0x0109a934: 0x109a934: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0109a2f0: 0x109a2f0: subu  v0, v0, a0
+// 0x0109a938: 0x109a938: subu  v0, v0, a0
 	ldloc 6
 	ldloc.1
 	sub
 	stloc 6
-// 0x0109a2f4: 0x109a2f4: lw    a0, 28(sp)
+// 0x0109a93c: 0x109a93c: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -789,17 +789,17 @@ L_109a290:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a2f8: 0x109a2f8: addiu v1, v1, 1
+// 0x0109a940: 0x109a940: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109a2fc: 0x109a2fc: subu  v1, v1, a0
+// 0x0109a944: 0x109a944: subu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 7
-// 0x0109a300: 0x109a300: sw    v1, 4(s0)
+// 0x0109a948: 0x109a948: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -808,16 +808,16 @@ L_109a290:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a304: 0x109a304: sw    v0, 0(s0)
+// 0x0109a94c: 0x109a94c: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_109a308:
-// 0x0109a308: 0x109a308: lw    ra, 52(sp)
-// 0x0109a30c: 0x109a30c: lw    s2, 48(sp)
+L_109a950:
+// 0x0109a950: 0x109a950: lw    ra, 52(sp)
+// 0x0109a954: 0x109a954: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -826,7 +826,7 @@ L_109a308:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109a310: 0x109a310: lw    s1, 44(sp)
+// 0x0109a958: 0x109a958: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -835,7 +835,7 @@ L_109a308:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109a314: 0x109a314: lw    s0, 40(sp)
+// 0x0109a95c: 0x109a95c: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -844,7 +844,7 @@ L_109a308:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109a318: 0x109a318: jr    ra addiu sp, sp, 56
+// 0x0109a960: 0x109a960: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -856,7 +856,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_replace_109a320(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_replace_109a968(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -891,16 +891,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109a320: 0x109a320: addiu sp, sp, -32
+// 0x0109a968: 0x109a968: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109a324: 0x109a324: addu  v0, a1, zero
+// 0x0109a96c: 0x109a96c: addu  v0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x0109a328: 0x109a328: sw    ra, 28(sp)
-// 0x0109a32c: 0x109a32c: lw    v1, 12(a0)
+// 0x0109a970: 0x109a970: sw    ra, 28(sp)
+// 0x0109a974: 0x109a974: lw    v1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -909,22 +909,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a330: 0x109a330: j	 0x109a38c addu  a1, zero, zero
+// 0x0109a978: 0x109a978: j	 0x109a9d4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_109a38c
+	br L_109a9d4
 // --- basic block ---
-L_109a338:
-// 0x0109a338: 0x109a338: bne   v1, v0, 0x109a380 sll   zero, zero, 0
+L_109a980:
+// 0x0109a980: 0x109a980: bne   v1, v0, 0x109a9c8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	bne.un L_109a380
+	bne.un L_109a9c8
 // --- basic block ---
-// 0x0109a340: 0x109a340: beq   a1, zero, 0x109a350 sll   zero, zero, 0
+// 0x0109a988: 0x109a988: beq   a1, zero, 0x109a998 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_109a350
+	brfalse L_109a998
 // --- basic block ---
-// 0x0109a348: 0x109a348: j	 0x109a354 sw    a2, 8(a1)
+// 0x0109a990: 0x109a990: j	 0x109a99c sw    a2, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -933,10 +933,10 @@ L_109a338:
 	add
 	ldloc.3
 	stelem.i4
-	br L_109a354
+	br L_109a99c
 // --- basic block ---
-L_109a350:
-// 0x0109a350: 0x109a350: sw    a2, 12(a0)
+L_109a998:
+// 0x0109a998: 0x109a998: sw    a2, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -945,8 +945,8 @@ L_109a350:
 	add
 	ldloc.3
 	stelem.i4
-L_109a354:
-// 0x0109a354: 0x109a354: lw    a0, 8(v0)
+L_109a99c:
+// 0x0109a99c: 0x109a99c: lw    a0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -955,7 +955,7 @@ L_109a354:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a358: 0x109a358: lw    v1, 4(v0)
+// 0x0109a9a0: 0x109a9a0: lw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -964,7 +964,7 @@ L_109a354:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a35c: 0x109a35c: sw    a0, 8(a2)
+// 0x0109a9a4: 0x109a9a4: sw    a0, 8(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -973,7 +973,7 @@ L_109a354:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109a360: 0x109a360: sw    v1, 4(a2)
+// 0x0109a9a8: 0x109a9a8: sw    v1, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -982,7 +982,7 @@ L_109a354:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a364: 0x109a364: sw    zero, 8(v0)
+// 0x0109a9ac: 0x109a9ac: sw    zero, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -991,7 +991,7 @@ L_109a354:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a368: 0x109a368: sw    zero, 4(v0)
+// 0x0109a9b0: 0x109a9b0: sw    zero, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1000,7 +1000,7 @@ L_109a354:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a36c: 0x109a36c: jal   0x10945f0 sw    v0, 16(sp)
+// 0x0109a9b4: 0x109a9b4: jal   0x1094c14 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1014,12 +1014,12 @@ L_109a354:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_10945f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_1094c14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109a374: 0x109a374: lw    v0, 16(sp)
+// 0x0109a9bc: 0x109a9bc: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1028,14 +1028,14 @@ L_109a354:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a378: 0x109a378: j	 0x109a398 sll   zero, zero, 0
-	br L_109a398
+// 0x0109a9c0: 0x109a9c0: j	 0x109a9e0 sll   zero, zero, 0
+	br L_109a9e0
 // --- basic block ---
-L_109a380:
-// 0x0109a380: 0x109a380: addu  a1, v1, zero
+L_109a9c8:
+// 0x0109a9c8: 0x109a9c8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0109a384: 0x109a384: lw    v1, 8(v1)
+// 0x0109a9cc: 0x109a9cc: lw    v1, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1044,19 +1044,19 @@ L_109a380:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a388: 0x109a388: sll   zero, zero, 0
-L_109a38c:
-// 0x0109a38c: 0x109a38c: bne   v1, zero, 0x109a338 sll   zero, zero, 0
+// 0x0109a9d0: 0x109a9d0: sll   zero, zero, 0
+L_109a9d4:
+// 0x0109a9d4: 0x109a9d4: bne   v1, zero, 0x109a980 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_109a338
+	brtrue L_109a980
 // --- basic block ---
-// 0x0109a394: 0x109a394: addu  v0, zero, zero
+// 0x0109a9dc: 0x109a9dc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_109a398:
-// 0x0109a398: 0x109a398: lw    ra, 28(sp)
-// 0x0109a39c: 0x109a39c: sll   zero, zero, 0
-// 0x0109a3a0: 0x109a3a0: jr    ra addiu sp, sp, 32
+L_109a9e0:
+// 0x0109a9e0: 0x109a9e0: lw    ra, 28(sp)
+// 0x0109a9e4: 0x109a9e4: sll   zero, zero, 0
+// 0x0109a9e8: 0x109a9e8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1068,7 +1068,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_remove_109a3a8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_remove_109a9f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -1103,16 +1103,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109a3a8: 0x109a3a8: addiu sp, sp, -32
+// 0x0109a9f0: 0x109a9f0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109a3ac: 0x109a3ac: addu  v0, a1, zero
+// 0x0109a9f4: 0x109a9f4: addu  v0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0109a3b0: 0x109a3b0: sw    ra, 28(sp)
-// 0x0109a3b4: 0x109a3b4: lw    v1, 12(a0)
+// 0x0109a9f8: 0x109a9f8: sw    ra, 28(sp)
+// 0x0109a9fc: 0x109a9fc: lw    v1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1121,18 +1121,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a3b8: 0x109a3b8: j	 0x109a408 addu  a1, zero, zero
+// 0x0109aa00: 0x109aa00: j	 0x109aa50 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_109a408
+	br L_109aa50
 // --- basic block ---
-L_109a3c0:
-// 0x0109a3c0: 0x109a3c0: bne   v1, v0, 0x109a3fc sll   zero, zero, 0
+L_109aa08:
+// 0x0109aa08: 0x109aa08: bne   v1, v0, 0x109aa44 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_109a3fc
+	bne.un L_109aa44
 // --- basic block ---
-// 0x0109a3c8: 0x109a3c8: lw    v1, 8(v0)
+// 0x0109aa10: 0x109aa10: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1141,11 +1141,11 @@ L_109a3c0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a3cc: 0x109a3cc: beq   a1, zero, 0x109a3dc sll   zero, zero, 0
+// 0x0109aa14: 0x109aa14: beq   a1, zero, 0x109aa24 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_109a3dc
+	brfalse L_109aa24
 // --- basic block ---
-// 0x0109a3d4: 0x109a3d4: j	 0x109a3e0 sw    v1, 8(a1)
+// 0x0109aa1c: 0x109aa1c: j	 0x109aa28 sw    v1, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -1154,10 +1154,10 @@ L_109a3c0:
 	add
 	ldloc 6
 	stelem.i4
-	br L_109a3e0
+	br L_109aa28
 // --- basic block ---
-L_109a3dc:
-// 0x0109a3dc: 0x109a3dc: sw    v1, 12(a0)
+L_109aa24:
+// 0x0109aa24: 0x109aa24: sw    v1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1166,8 +1166,8 @@ L_109a3dc:
 	add
 	ldloc 6
 	stelem.i4
-L_109a3e0:
-// 0x0109a3e0: 0x109a3e0: sw    zero, 8(v0)
+L_109aa28:
+// 0x0109aa28: 0x109aa28: sw    zero, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1176,7 +1176,7 @@ L_109a3e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a3e4: 0x109a3e4: sw    zero, 4(v0)
+// 0x0109aa2c: 0x109aa2c: sw    zero, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1185,7 +1185,7 @@ L_109a3e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a3e8: 0x109a3e8: jal   0x10945f0 sw    v0, 16(sp)
+// 0x0109aa30: 0x109aa30: jal   0x1094c14 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1199,12 +1199,12 @@ L_109a3e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_10945f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_1094c14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0109a3f0: 0x109a3f0: lw    v0, 16(sp)
+// 0x0109aa38: 0x109aa38: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1213,14 +1213,14 @@ L_109a3e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a3f4: 0x109a3f4: j	 0x109a414 sll   zero, zero, 0
-	br L_109a414
+// 0x0109aa3c: 0x109aa3c: j	 0x109aa5c sll   zero, zero, 0
+	br L_109aa5c
 // --- basic block ---
-L_109a3fc:
-// 0x0109a3fc: 0x109a3fc: addu  a1, v1, zero
+L_109aa44:
+// 0x0109aa44: 0x109aa44: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x0109a400: 0x109a400: lw    v1, 8(v1)
+// 0x0109aa48: 0x109aa48: lw    v1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1229,19 +1229,19 @@ L_109a3fc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a404: 0x109a404: sll   zero, zero, 0
-L_109a408:
-// 0x0109a408: 0x109a408: bne   v1, zero, 0x109a3c0 sll   zero, zero, 0
+// 0x0109aa4c: 0x109aa4c: sll   zero, zero, 0
+L_109aa50:
+// 0x0109aa50: 0x109aa50: bne   v1, zero, 0x109aa08 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109a3c0
+	brtrue L_109aa08
 // --- basic block ---
-// 0x0109a410: 0x109a410: addu  v0, zero, zero
+// 0x0109aa58: 0x109aa58: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_109a414:
-// 0x0109a414: 0x109a414: lw    ra, 28(sp)
-// 0x0109a418: 0x109a418: sll   zero, zero, 0
-// 0x0109a41c: 0x109a41c: jr    ra addiu sp, sp, 32
+L_109aa5c:
+// 0x0109aa5c: 0x109aa5c: lw    ra, 28(sp)
+// 0x0109aa60: 0x109aa60: sll   zero, zero, 0
+// 0x0109aa64: 0x109aa64: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1253,7 +1253,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 ra,int32[] mem,int32 v0)
@@ -1288,16 +1288,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109a424: 0x109a424: addiu sp, sp, -24
+// 0x0109aa6c: 0x109aa6c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109a428: 0x109a428: beq   a0, zero, 0x109a444 sw    ra, 20(sp)
+// 0x0109aa70: 0x109aa70: beq   a0, zero, 0x109aa8c sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_109a444
+	brfalse L_109aa8c
 // --- basic block ---
-// 0x0109a430: 0x109a430: lw    v1, 48(a0)
+// 0x0109aa78: 0x109aa78: lw    v1, 48(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1306,27 +1306,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a434: 0x109a434: sll   zero, zero, 0
-// 0x0109a438: 0x109a438: andi  v1, v1, 1024
+// 0x0109aa7c: 0x109aa7c: sll   zero, zero, 0
+// 0x0109aa80: 0x109aa80: andi  v1, v1, 1024
 	ldloc 5
 	ldc.i4 1024
 	and
 	stloc 5
-// 0x0109a43c: 0x109a43c: bne   v1, zero, 0x109a44c addu  v0, zero, zero
+// 0x0109aa84: 0x109aa84: bne   v1, zero, 0x109aa94 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_109a44c
+	brtrue L_109aa94
 // --- basic block ---
-L_109a444:
-// 0x0109a444: 0x109a444: jal   0x101cc04 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_lang_rtl_101cc04()
+L_109aa8c:
+// 0x0109aa8c: 0x109aa8c: jal   0x101cc14 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_lang_rtl_101cc14()
 	stloc 8
 // --- basic block ---
-L_109a44c:
-// 0x0109a44c: 0x109a44c: lw    ra, 20(sp)
-// 0x0109a450: 0x109a450: sll   zero, zero, 0
-// 0x0109a454: 0x109a454: jr    ra addiu sp, sp, 24
+L_109aa94:
+// 0x0109aa94: 0x109aa94: lw    ra, 20(sp)
+// 0x0109aa98: 0x109aa98: sll   zero, zero, 0
+// 0x0109aa9c: 0x109aa9c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1338,7 +1338,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s2,int32 v1,int32 s1,int32 s3,int32 ra,int32 t0)
@@ -1388,12 +1388,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109a45c: 0x109a45c: addiu sp, sp, -40
+// 0x0109aaa4: 0x109aaa4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109a460: 0x109a460: sw    s3, 32(sp)
+// 0x0109aaa8: 0x109aaa8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1402,14 +1402,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109a464: 0x109a464: addu  s3, a0, zero
+// 0x0109aaac: 0x109aaac: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0109a468: 0x109a468: addiu a0, zero, 228
+// 0x0109aab0: 0x109aab0: addiu a0, zero, 228
 	ldc.i4 228
 	stloc.1
-// 0x0109a46c: 0x109a46c: sw    ra, 36(sp)
-// 0x0109a470: 0x109a470: sw    s2, 28(sp)
+// 0x0109aab4: 0x109aab4: sw    ra, 36(sp)
+// 0x0109aab8: 0x109aab8: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1418,7 +1418,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109a474: 0x109a474: sw    s1, 24(sp)
+// 0x0109aabc: 0x109aabc: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1427,10 +1427,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109a478: 0x109a478: addu  s2, a2, zero
+// 0x0109aac0: 0x109aac0: addu  s2, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0109a47c: 0x109a47c: sw    s0, 20(sp)
+// 0x0109aac4: 0x109aac4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1439,7 +1439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109a480: 0x109a480: jal   0x1000910 addu  s1, a1, zero
+// 0x0109aac8: 0x109aac8: jal   0x1000910 addu  s1, a1, zero
 	ldloc.2
 	stloc 10
 	ldloc.0
@@ -1452,16 +1452,16 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109a488: 0x109a488: addu  a0, v0, zero
+// 0x0109aad0: 0x109aad0: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x0109a48c: 0x109a48c: addu  a1, zero, zero
+// 0x0109aad4: 0x109aad4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109a490: 0x109a490: addiu a2, zero, 228
+// 0x0109aad8: 0x109aad8: addiu a2, zero, 228
 	ldc.i4 228
 	stloc.3
-// 0x0109a494: 0x109a494: jal   0x100177c addu  s0, v0, zero
+// 0x0109aadc: 0x109aadc: jal   0x100177c addu  s0, v0, zero
 	ldloc 7
 	stloc 6
 	ldloc.1
@@ -1473,18 +1473,18 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109a49c: 0x109a49c: lui   a0, 0x20000
+// 0x0109aae4: 0x109aae4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109a4a0: 0x109a4a0: addiu a1, zero, 681
+// 0x0109aae8: 0x109aae8: addiu a1, zero, 681
 	ldc.i4 681
 	stloc.2
-// 0x0109a4a4: 0x109a4a4: addu  a2, s0, zero
+// 0x0109aaec: 0x109aaec: addu  a2, s0, zero
 	ldloc 6
 	stloc.3
-// 0x0109a4a8: 0x109a4a8: jal   0x1004a38 addiu a0, a0, -2792
+// 0x0109aaf0: 0x109aaf0: jal   0x1004a48 addiu a0, a0, -2328
 	ldloc.1
-	ldc.i4 -2792
+	ldc.i4 -2328
 	add
 	stloc.1
 	ldloc.0
@@ -1492,12 +1492,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109a4b0: 0x109a4b0: jal   0x1001ba8 addu  a0, s3, zero
+// 0x0109aaf8: 0x109aaf8: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -1510,52 +1510,52 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109a4b8: 0x109a4b8: lui   a2, 0x80000
+// 0x0109ab00: 0x109ab00: lui   a2, 0x80000
 	ldc.i4 524288
 	stloc.3
-// 0x0109a4bc: 0x109a4bc: lw    a0, 9824(a2)
+// 0x0109ab04: 0x109ab04: lw    a0, 10288(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2456
+	ldc.i4 2572
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a4c0: 0x109a4c0: srl   a3, s2, 20
+// 0x0109ab08: 0x109ab08: srl   a3, s2, 20
 	ldloc 8
 	ldc.i4.s 20
 	shr.un
 	stloc 4
-// 0x0109a4c4: 0x109a4c4: srl   s2, s2, 21
+// 0x0109ab0c: 0x109ab0c: srl   s2, s2, 21
 	ldloc 8
 	ldc.i4.s 21
 	shr.un
 	stloc 8
-// 0x0109a4c8: 0x109a4c8: addiu v1, s0, 140
+// 0x0109ab10: 0x109ab10: addiu v1, s0, 140
 	ldloc 6
 	ldc.i4 140
 	add
 	stloc 9
-// 0x0109a4cc: 0x109a4cc: addiu a1, zero, -1
+// 0x0109ab14: 0x109ab14: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0109a4d0: 0x109a4d0: andi  s2, s2, 1
+// 0x0109ab18: 0x109ab18: andi  s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	and
 	stloc 8
-// 0x0109a4d4: 0x109a4d4: andi  a3, a3, 1
+// 0x0109ab1c: 0x109ab1c: andi  a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	and
 	stloc 4
-// 0x0109a4d8: 0x109a4d8: addiu t0, a0, 1
+// 0x0109ab20: 0x109ab20: addiu t0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc 13
-// 0x0109a4dc: 0x109a4dc: sw    v0, 16(s0)
+// 0x0109ab24: 0x109ab24: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1564,19 +1564,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a4e0: 0x109a4e0: addiu v0, zero, 1
+// 0x0109ab28: 0x109ab28: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0109a4e4: 0x109a4e4: sw    t0, 9824(a2)
+// 0x0109ab2c: 0x109ab2c: sw    t0, 10288(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2456
+	ldc.i4 2572
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109a4e8: 0x109a4e8: sw    zero, 140(s0)
+// 0x0109ab30: 0x109ab30: sw    zero, 140(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1585,7 +1585,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a4ec: 0x109a4ec: sw    a1, 24(s0)
+// 0x0109ab34: 0x109ab34: sw    a1, 24(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1594,7 +1594,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109a4f0: 0x109a4f0: sw    v0, 64(s0)
+// 0x0109ab38: 0x109ab38: sw    v0, 64(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1603,7 +1603,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a4f4: 0x109a4f4: sw    s2, 56(s0)
+// 0x0109ab3c: 0x109ab3c: sw    s2, 56(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1612,7 +1612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109a4f8: 0x109a4f8: sw    a3, 52(s0)
+// 0x0109ab40: 0x109ab40: sw    a3, 52(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1621,7 +1621,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109a4fc: 0x109a4fc: sw    zero, 12(v1)
+// 0x0109ab44: 0x109ab44: sw    zero, 12(v1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1630,7 +1630,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a500: 0x109a500: sw    a1, 28(s0)
+// 0x0109ab48: 0x109ab48: sw    a1, 28(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1639,7 +1639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109a504: 0x109a504: sw    zero, 60(s0)
+// 0x0109ab4c: 0x109ab4c: sw    zero, 60(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1648,7 +1648,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a508: 0x109a508: sw    zero, 76(s0)
+// 0x0109ab50: 0x109ab50: sw    zero, 76(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1657,7 +1657,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a50c: 0x109a50c: sw    zero, 80(s0)
+// 0x0109ab54: 0x109ab54: sw    zero, 80(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1666,7 +1666,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a510: 0x109a510: sw    zero, 84(s0)
+// 0x0109ab58: 0x109ab58: sw    zero, 84(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1675,7 +1675,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a514: 0x109a514: sw    zero, 88(s0)
+// 0x0109ab5c: 0x109ab5c: sw    zero, 88(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1684,7 +1684,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a518: 0x109a518: sw    zero, 92(s0)
+// 0x0109ab60: 0x109ab60: sw    zero, 92(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1693,7 +1693,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a51c: 0x109a51c: sw    zero, 96(s0)
+// 0x0109ab64: 0x109ab64: sw    zero, 96(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1702,7 +1702,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a520: 0x109a520: sw    zero, 100(s0)
+// 0x0109ab68: 0x109ab68: sw    zero, 100(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1711,7 +1711,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a524: 0x109a524: sw    zero, 224(s0)
+// 0x0109ab6c: 0x109ab6c: sw    zero, 224(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1720,7 +1720,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a528: 0x109a528: sw    zero, 188(s0)
+// 0x0109ab70: 0x109ab70: sw    zero, 188(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1729,7 +1729,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a52c: 0x109a52c: sw    zero, 192(s0)
+// 0x0109ab74: 0x109ab74: sw    zero, 192(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1738,7 +1738,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a530: 0x109a530: sw    zero, 220(s0)
+// 0x0109ab78: 0x109ab78: sw    zero, 220(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1747,7 +1747,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a534: 0x109a534: sw    a0, 72(s0)
+// 0x0109ab7c: 0x109ab7c: sw    a0, 72(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1756,7 +1756,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109a538: 0x109a538: sw    zero, 136(s0)
+// 0x0109ab80: 0x109ab80: sw    zero, 136(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1765,7 +1765,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a53c: 0x109a53c: sw    zero, 4(v1)
+// 0x0109ab84: 0x109ab84: sw    zero, 4(v1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1774,7 +1774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a540: 0x109a540: beq   s1, zero, 0x109a550 sw    zero, 8(v1)
+// 0x0109ab88: 0x109ab88: beq   s1, zero, 0x109ab98 sw    zero, 8(v1)
 	ldloc 10
 	ldloc 5
 	ldloc 9
@@ -1784,9 +1784,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_109a550
+	brfalse L_109ab98
 // --- basic block ---
-// 0x0109a548: 0x109a548: j	 0x109a55c sw    s1, 216(s0)
+// 0x0109ab90: 0x109ab90: j	 0x109aba4 sw    s1, 216(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1795,18 +1795,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	br L_109a55c
+	br L_109aba4
 // --- basic block ---
-L_109a550:
-// 0x0109a550: 0x109a550: lui   v0, 0x10a0000
+L_109ab98:
+// 0x0109ab98: 0x109ab98: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 7
-// 0x0109a554: 0x109a554: addiu v0, v0, -29036
+// 0x0109ab9c: 0x109ab9c: addiu v0, v0, -27428
 	ldloc 7
-	ldc.i4 -29036
+	ldc.i4 -27428
 	add
 	stloc 7
-// 0x0109a558: 0x109a558: sw    v0, 216(s0)
+// 0x0109aba0: 0x109aba0: sw    v0, 216(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1815,12 +1815,12 @@ L_109a550:
 	add
 	ldloc 7
 	stelem.i4
-L_109a55c:
-// 0x0109a55c: 0x109a55c: lw    ra, 36(sp)
-// 0x0109a560: 0x109a560: addiu v0, zero, -1
+L_109aba4:
+// 0x0109aba4: 0x109aba4: lw    ra, 36(sp)
+// 0x0109aba8: 0x109aba8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0109a564: 0x109a564: sw    v0, 36(s0)
+// 0x0109abac: 0x109abac: sw    v0, 36(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1829,7 +1829,7 @@ L_109a55c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a568: 0x109a568: sw    v0, 32(s0)
+// 0x0109abb0: 0x109abb0: sw    v0, 32(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1838,7 +1838,7 @@ L_109a55c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a56c: 0x109a56c: lw    s3, 32(sp)
+// 0x0109abb4: 0x109abb4: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1847,10 +1847,10 @@ L_109a55c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109a570: 0x109a570: addu  v0, s0, zero
+// 0x0109abb8: 0x109abb8: addu  v0, s0, zero
 	ldloc 6
 	stloc 7
-// 0x0109a574: 0x109a574: lw    s2, 28(sp)
+// 0x0109abbc: 0x109abbc: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1859,7 +1859,7 @@ L_109a55c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109a578: 0x109a578: lw    s1, 24(sp)
+// 0x0109abc0: 0x109abc0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1868,7 +1868,7 @@ L_109a55c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109a57c: 0x109a57c: lw    s0, 20(sp)
+// 0x0109abc4: 0x109abc4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1877,7 +1877,7 @@ L_109a55c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109a580: 0x109a580: jr    ra addiu sp, sp, 40
+// 0x0109abc8: 0x109abc8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1889,7 +1889,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_widget_draw_row_109a588(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_draw_row_109abd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s8,int32 s0,int32 s7,int32 s3,int32 s2,int32 s4,int32 s5,int32 s6,int32 lo,int32 t0,int32 ra,int32 t1)
@@ -1960,19 +1960,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109a588: 0x109a588: lw    v0, 0(a0)
+// 0x0109abd0: 0x109abd0: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109a58c: 0x109a58c: addiu sp, sp, -96
+// 0x0109abd4: 0x109abd4: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0109a590: 0x109a590: sw    s7, 84(sp)
+// 0x0109abd8: 0x109abd8: sw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1981,10 +1981,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109a594: 0x109a594: addu  s7, a0, zero
+// 0x0109abdc: 0x109abdc: addu  s7, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0109a598: 0x109a598: lw    a0, 4(v0)
+// 0x0109abe0: 0x109abe0: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1993,7 +1993,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a59c: 0x109a59c: sw    s6, 80(sp)
+// 0x0109abe4: 0x109abe4: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2002,7 +2002,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109a5a0: 0x109a5a0: sw    s5, 76(sp)
+// 0x0109abe8: 0x109abe8: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2011,7 +2011,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109a5a4: 0x109a5a4: sw    s4, 72(sp)
+// 0x0109abec: 0x109abec: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2020,7 +2020,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109a5a8: 0x109a5a8: sw    s3, 68(sp)
+// 0x0109abf0: 0x109abf0: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2029,7 +2029,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109a5ac: 0x109a5ac: sw    s2, 64(sp)
+// 0x0109abf4: 0x109abf4: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2038,7 +2038,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109a5b0: 0x109a5b0: sw    s1, 60(sp)
+// 0x0109abf8: 0x109abf8: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2047,7 +2047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109a5b4: 0x109a5b4: sw    s0, 56(sp)
+// 0x0109abfc: 0x109abfc: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2056,7 +2056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109a5b8: 0x109a5b8: lw    s3, 116(sp)
+// 0x0109ac00: 0x109ac00: lw    s3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2065,8 +2065,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109a5bc: 0x109a5bc: sw    ra, 92(sp)
-// 0x0109a5c0: 0x109a5c0: sw    s8, 88(sp)
+// 0x0109ac04: 0x109ac04: sw    ra, 92(sp)
+// 0x0109ac08: 0x109ac08: sw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2075,13 +2075,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109a5c4: 0x109a5c4: addu  s0, a1, zero
+// 0x0109ac0c: 0x109ac0c: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109a5c8: 0x109a5c8: addu  s6, a2, zero
+// 0x0109ac10: 0x109ac10: addu  s6, a2, zero
 	ldloc.3
 	stloc 16
-// 0x0109a5cc: 0x109a5cc: lw    s5, 112(sp)
+// 0x0109ac14: 0x109ac14: lw    s5, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2090,7 +2090,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109a5d0: 0x109a5d0: jal   0x109a424 addu  s1, a3, zero
+// 0x0109ac18: 0x109ac18: jal   0x109aa6c addu  s1, a3, zero
 	ldloc 4
 	stloc 8
 	ldloc.0
@@ -2098,47 +2098,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a5d8: 0x109a5d8: addu  s4, v0, zero
+// 0x0109ac20: 0x109ac20: addu  s4, v0, zero
 	ldloc 5
 	stloc 14
-// 0x0109a5dc: 0x109a5dc: lui   v0, 0xf0000
+// 0x0109ac24: 0x109ac24: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0109a5e0: 0x109a5e0: lw    v0, -30072(v0)
+// 0x0109ac28: 0x109ac28: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a5e4: 0x109a5e4: sll   zero, zero, 0
-// 0x0109a5e8: 0x109a5e8: slt   v0, v0, s3
+// 0x0109ac2c: 0x109ac2c: sll   zero, zero, 0
+// 0x0109ac30: 0x109ac30: slt   v0, v0, s3
 	ldloc 5
 	ldloc 12
 	clt
 	stloc 5
-// 0x0109a5ec: 0x109a5ec: bne   v0, zero, 0x109aa8c addu  s2, zero, zero
+// 0x0109ac34: 0x109ac34: bne   v0, zero, 0x109b0d4 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 13
-	brtrue L_109aa8c
+	brtrue L_109b0d4
 // --- basic block ---
-// 0x0109a5f4: 0x109a5f4: lw    v0, 0(s7)
+// 0x0109ac3c: 0x109ac3c: lw    v0, 0(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109a5f8: 0x109a5f8: sll   zero, zero, 0
-// 0x0109a5fc: 0x109a5fc: lw    v0, 48(v0)
+// 0x0109ac40: 0x109ac40: sll   zero, zero, 0
+// 0x0109ac44: 0x109ac44: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2147,67 +2147,67 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a600: 0x109a600: sll   zero, zero, 0
-// 0x0109a604: 0x109a604: andi  v0, v0, 1024
+// 0x0109ac48: 0x109ac48: sll   zero, zero, 0
+// 0x0109ac4c: 0x109ac4c: andi  v0, v0, 1024
 	ldloc 5
 	ldc.i4 1024
 	and
 	stloc 5
-// 0x0109a608: 0x109a608: bne   v0, zero, 0x109a61c addu  s8, s5, s6
+// 0x0109ac50: 0x109ac50: bne   v0, zero, 0x109ac64 addu  s8, s5, s6
 	ldloc 5
 	ldloc 15
 	ldloc 16
 	add
 	stloc 9
-	brtrue L_109a61c
+	brtrue L_109ac64
 // --- basic block ---
-// 0x0109a610: 0x109a610: bne   s4, zero, 0x109a620 addu  s8, s5, zero
+// 0x0109ac58: 0x109ac58: bne   s4, zero, 0x109ac68 addu  s8, s5, zero
 	ldloc 14
 	ldloc 15
 	stloc 9
-	brtrue L_109a620
+	brtrue L_109ac68
 // --- basic block ---
-// 0x0109a618: 0x109a618: addu  s8, s5, s6
+// 0x0109ac60: 0x109ac60: addu  s8, s5, s6
 	ldloc 15
 	ldloc 16
 	add
 	stloc 9
-L_109a61c:
-// 0x0109a61c: 0x109a61c: addu  s4, zero, zero
+L_109ac64:
+// 0x0109ac64: 0x109ac64: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 14
-L_109a620:
-// 0x0109a620: 0x109a620: addu  v0, s7, zero
+L_109ac68:
+// 0x0109ac68: 0x109ac68: addu  v0, s7, zero
 	ldloc 11
 	stloc 5
-// 0x0109a624: 0x109a624: addu  v1, zero, zero
+// 0x0109ac6c: 0x109ac6c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0109a628: 0x109a628: addu  t0, zero, zero
+// 0x0109ac70: 0x109ac70: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 18
-// 0x0109a62c: 0x109a62c: addu  a3, zero, zero
+// 0x0109ac74: 0x109ac74: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109a630: 0x109a630: j	 0x109a6a0 addu  s2, zero, zero
+// 0x0109ac78: 0x109ac78: j	 0x109ace8 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_109a6a0
+	br L_109ace8
 // --- basic block ---
-L_109a638:
-// 0x0109a638: 0x109a638: lw    a0, 0(v0)
+L_109ac80:
+// 0x0109ac80: 0x109ac80: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a63c: 0x109a63c: addiu v1, v1, 1
+// 0x0109ac84: 0x109ac84: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109a640: 0x109a640: sw    v0, 44(sp)
+// 0x0109ac88: 0x109ac88: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2216,7 +2216,7 @@ L_109a638:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109a644: 0x109a644: sw    v1, 48(sp)
+// 0x0109ac8c: 0x109ac8c: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2225,7 +2225,7 @@ L_109a638:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109a648: 0x109a648: sw    a3, 40(sp)
+// 0x0109ac90: 0x109ac90: sw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2234,7 +2234,7 @@ L_109a638:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109a64c: 0x109a64c: jal   0x1099350 sw    t0, 36(sp)
+// 0x0109ac94: 0x109ac94: jal   0x1099998 sw    t0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2248,12 +2248,12 @@ L_109a638:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a654: 0x109a654: lw    v0, 44(sp)
+// 0x0109ac9c: 0x109ac9c: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2262,7 +2262,7 @@ L_109a638:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a658: 0x109a658: lw    v1, 48(sp)
+// 0x0109aca0: 0x109aca0: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2271,14 +2271,14 @@ L_109a638:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a65c: 0x109a65c: lw    a0, 0(v0)
+// 0x0109aca4: 0x109aca4: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a660: 0x109a660: lw    a3, 40(sp)
+// 0x0109aca8: 0x109aca8: lw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2287,7 +2287,7 @@ L_109a638:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109a664: 0x109a664: lw    a1, 48(a0)
+// 0x0109acac: 0x109acac: lw    a1, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2296,7 +2296,7 @@ L_109a638:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109a668: 0x109a668: lw    a0, 20(sp)
+// 0x0109acb0: 0x109acb0: lw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2305,22 +2305,22 @@ L_109a638:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a66c: 0x109a66c: andi  t1, a1, 512
+// 0x0109acb4: 0x109acb4: andi  t1, a1, 512
 	ldloc.2
 	ldc.i4 512
 	and
 	stloc 20
-// 0x0109a670: 0x109a670: andi  a1, a1, 16
+// 0x0109acb8: 0x109acb8: andi  a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	and
 	stloc.2
-// 0x0109a674: 0x109a674: addiu v0, v0, 4
+// 0x0109acbc: 0x109acbc: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x0109a678: 0x109a678: lw    t0, 36(sp)
+// 0x0109acc0: 0x109acc0: lw    t0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2329,113 +2329,113 @@ L_109a638:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0109a67c: 0x109a67c: beq   a1, zero, 0x109a688 slt   a2, s2, a0
+// 0x0109acc4: 0x109acc4: beq   a1, zero, 0x109acd0 slt   a2, s2, a0
 	ldloc.2
 	ldloc 13
 	ldloc.1
 	clt
 	stloc.3
-	brfalse L_109a688
+	brfalse L_109acd0
 // --- basic block ---
-// 0x0109a684: 0x109a684: addiu a3, zero, 1
+// 0x0109accc: 0x109accc: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-L_109a688:
-// 0x0109a688: 0x109a688: beq   t1, zero, 0x109a694 sll   zero, zero, 0
+L_109acd0:
+// 0x0109acd0: 0x109acd0: beq   t1, zero, 0x109acdc sll   zero, zero, 0
 	ldloc 20
-	brfalse L_109a694
+	brfalse L_109acdc
 // --- basic block ---
-// 0x0109a690: 0x109a690: addiu t0, zero, 1
+// 0x0109acd8: 0x109acd8: addiu t0, zero, 1
 	ldc.i4.1
 	stloc 18
-L_109a694:
-// 0x0109a694: 0x109a694: beq   a2, zero, 0x109a6a0 sll   zero, zero, 0
+L_109acdc:
+// 0x0109acdc: 0x109acdc: beq   a2, zero, 0x109ace8 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_109a6a0
+	brfalse L_109ace8
 // --- basic block ---
-// 0x0109a69c: 0x109a69c: addu  s2, a0, zero
+// 0x0109ace4: 0x109ace4: addu  s2, a0, zero
 	ldloc.1
 	stloc 13
-L_109a6a0:
-// 0x0109a6a0: 0x109a6a0: slt   a0, v1, s0
+L_109ace8:
+// 0x0109ace8: 0x109ace8: slt   a0, v1, s0
 	ldloc 7
 	ldloc 10
 	clt
 	stloc.1
-// 0x0109a6a4: 0x109a6a4: addiu a1, sp, 16
+// 0x0109acec: 0x109acec: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0109a6a8: 0x109a6a8: bne   a0, zero, 0x109a638 addu  a2, zero, zero
+// 0x0109acf0: 0x109acf0: bne   a0, zero, 0x109ac80 addu  a2, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_109a638
+	brtrue L_109ac80
 // --- basic block ---
-// 0x0109a6b0: 0x109a6b0: beq   t0, zero, 0x109a6c4 sll   zero, zero, 0
+// 0x0109acf8: 0x109acf8: beq   t0, zero, 0x109ad0c sll   zero, zero, 0
 	ldloc 18
-	brfalse L_109a6c4
+	brfalse L_109ad0c
 // --- basic block ---
-// 0x0109a6b8: 0x109a6b8: addu  s3, s3, s1
+// 0x0109ad00: 0x109ad00: addu  s3, s3, s1
 	ldloc 12
 	ldloc 8
 	add
 	stloc 12
-// 0x0109a6bc: 0x109a6bc: j	 0x109a6dc subu  s3, s3, s2
+// 0x0109ad04: 0x109ad04: j	 0x109ad24 subu  s3, s3, s2
 	ldloc 12
 	ldloc 13
 	sub
 	stloc 12
-	br L_109a6dc
+	br L_109ad24
 // --- basic block ---
-L_109a6c4:
-// 0x0109a6c4: 0x109a6c4: beq   a3, zero, 0x109a6dc addiu v0, zero, 2
+L_109ad0c:
+// 0x0109ad0c: 0x109ad0c: beq   a3, zero, 0x109ad24 addiu v0, zero, 2
 	ldloc 4
 	ldc.i4.2
 	stloc 5
-	brfalse L_109a6dc
+	brfalse L_109ad24
 // --- basic block ---
-// 0x0109a6cc: 0x109a6cc: subu  s1, s1, s2
+// 0x0109ad14: 0x109ad14: subu  s1, s1, s2
 	ldloc 8
 	ldloc 13
 	sub
 	stloc 8
-// 0x0109a6d0: 0x109a6d0: div   s1, v0
+// 0x0109ad18: 0x109ad18: div   s1, v0
 	ldloc 8
 	ldloc 5
 	div
 	stloc 17
-// 0x0109a6d4: 0x109a6d4: mflo  lo
+// 0x0109ad1c: 0x109ad1c: mflo  lo
 	ldloc 17
 	stloc 8
-// 0x0109a6d8: 0x109a6d8: addu  s3, s3, s1
+// 0x0109ad20: 0x109ad20: addu  s3, s3, s1
 	ldloc 12
 	ldloc 8
 	add
 	stloc 12
-L_109a6dc:
-// 0x0109a6dc: 0x109a6dc: addiu s1, s0, -1
+L_109ad24:
+// 0x0109ad24: 0x109ad24: addiu s1, s0, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x0109a6e0: 0x109a6e0: sll   v0, s1, 2
+// 0x0109ad28: 0x109ad28: sll   v0, s1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0109a6e4: 0x109a6e4: sll   v1, s0, 2
+// 0x0109ad2c: 0x109ad2c: sll   v1, s0, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0109a6e8: 0x109a6e8: addu  v0, s7, v0
+// 0x0109ad30: 0x109ad30: addu  v0, s7, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0109a6ec: 0x109a6ec: sw    v0, 24(sp)
+// 0x0109ad34: 0x109ad34: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2444,15 +2444,15 @@ L_109a6dc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109a6f0: 0x109a6f0: j	 0x109a814 addu  v1, s7, v1
+// 0x0109ad38: 0x109ad38: j	 0x109ae5c addu  v1, s7, v1
 	ldloc 11
 	ldloc 7
 	add
 	stloc 7
-	br L_109a814
+	br L_109ae5c
 // --- basic block ---
-L_109a6f8:
-// 0x0109a6f8: 0x109a6f8: lw    v0, 24(sp)
+L_109ad40:
+// 0x0109ad40: 0x109ad40: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2461,18 +2461,18 @@ L_109a6f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a6fc: 0x109a6fc: sll   zero, zero, 0
-// 0x0109a700: 0x109a700: lw    a0, 0(v0)
+// 0x0109ad44: 0x109ad44: sll   zero, zero, 0
+// 0x0109ad48: 0x109ad48: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a704: 0x109a704: addu  a2, zero, zero
+// 0x0109ad4c: 0x109ad4c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109a708: 0x109a708: jal   0x1099350 sw    v1, 48(sp)
+// 0x0109ad50: 0x109ad50: jal   0x1099998 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2486,12 +2486,12 @@ L_109a6f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a710: 0x109a710: lw    a1, 24(sp)
+// 0x0109ad58: 0x109ad58: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2500,7 +2500,7 @@ L_109a6f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109a714: 0x109a714: lw    v1, 48(sp)
+// 0x0109ad5c: 0x109ad5c: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2509,15 +2509,15 @@ L_109a6f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a718: 0x109a718: lw    a0, 0(a1)
+// 0x0109ad60: 0x109ad60: lw    a0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a71c: 0x109a71c: sll   zero, zero, 0
-// 0x0109a720: 0x109a720: lw    v0, 48(a0)
+// 0x0109ad64: 0x109ad64: sll   zero, zero, 0
+// 0x0109ad68: 0x109ad68: lw    v0, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2526,21 +2526,21 @@ L_109a6f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a724: 0x109a724: sll   zero, zero, 0
-// 0x0109a728: 0x109a728: andi  v0, v0, 2
+// 0x0109ad6c: 0x109ad6c: sll   zero, zero, 0
+// 0x0109ad70: 0x109ad70: andi  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	and
 	stloc 5
-// 0x0109a72c: 0x109a72c: beq   v0, zero, 0x109a800 addiu v0, s0, -1
+// 0x0109ad74: 0x109ad74: beq   v0, zero, 0x109ae48 addiu v0, s0, -1
 	ldloc 5
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 5
-	brfalse L_109a800
+	brfalse L_109ae48
 // --- basic block ---
-// 0x0109a734: 0x109a734: lw    a1, 40(a0)
+// 0x0109ad7c: 0x109ad7c: lw    a1, 40(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2549,32 +2549,32 @@ L_109a6f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109a738: 0x109a738: beq   s4, zero, 0x109a790 addu  s8, s8, a1
+// 0x0109ad80: 0x109ad80: beq   s4, zero, 0x109add8 addu  s8, s8, a1
 	ldloc 14
 	ldloc 9
 	ldloc.2
 	add
 	stloc 9
-	brfalse L_109a790
+	brfalse L_109add8
 // --- basic block ---
-// 0x0109a740: 0x109a740: slt   v0, s1, v0
+// 0x0109ad88: 0x109ad88: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109a744: 0x109a744: beq   v0, zero, 0x109a76c sll   zero, zero, 0
+// 0x0109ad8c: 0x109ad8c: beq   v0, zero, 0x109adb4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109a76c
+	brfalse L_109adb4
 // --- basic block ---
-// 0x0109a74c: 0x109a74c: lw    v0, 0(v1)
+// 0x0109ad94: 0x109ad94: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109a750: 0x109a750: sll   zero, zero, 0
-// 0x0109a754: 0x109a754: lw    v0, 48(v0)
+// 0x0109ad98: 0x109ad98: sll   zero, zero, 0
+// 0x0109ad9c: 0x109ad9c: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2583,23 +2583,23 @@ L_109a6f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a758: 0x109a758: sll   zero, zero, 0
-// 0x0109a75c: 0x109a75c: andi  v0, v0, 128
+// 0x0109ada0: 0x109ada0: sll   zero, zero, 0
+// 0x0109ada4: 0x109ada4: andi  v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	and
 	stloc 5
-// 0x0109a760: 0x109a760: beq   v0, zero, 0x109a76c sll   zero, zero, 0
+// 0x0109ada8: 0x109ada8: beq   v0, zero, 0x109adb4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109a76c
+	brfalse L_109adb4
 // --- basic block ---
-// 0x0109a768: 0x109a768: addiu s8, s8, 2
+// 0x0109adb0: 0x109adb0: addiu s8, s8, 2
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 9
-L_109a76c:
-// 0x0109a76c: 0x109a76c: lw    a2, 44(a0)
+L_109adb4:
+// 0x0109adb4: 0x109adb4: lw    a2, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2608,18 +2608,18 @@ L_109a76c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109a770: 0x109a770: addu  a1, s8, zero
+// 0x0109adb8: 0x109adb8: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x0109a774: 0x109a774: addu  a2, s3, a2
+// 0x0109adbc: 0x109adbc: addu  a2, s3, a2
 	ldloc 12
 	ldloc.3
 	add
 	stloc.3
-// 0x0109a778: 0x109a778: addu  a3, s2, zero
+// 0x0109adc0: 0x109adc0: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0109a77c: 0x109a77c: jal   0x109adf8 sw    v1, 48(sp)
+// 0x0109adc4: 0x109adc4: jal   0x109b440 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2633,12 +2633,12 @@ L_109a76c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a784: 0x109a784: lw    v0, 16(sp)
+// 0x0109adcc: 0x109adcc: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2647,15 +2647,15 @@ L_109a76c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a788: 0x109a788: j	 0x109a7d8 addu  s8, s8, v0
+// 0x0109add0: 0x109add0: j	 0x109ae20 addu  s8, s8, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-	br L_109a7d8
+	br L_109ae20
 // --- basic block ---
-L_109a790:
-// 0x0109a790: 0x109a790: lw    a1, 16(sp)
+L_109add8:
+// 0x0109add8: 0x109add8: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2664,28 +2664,28 @@ L_109a790:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109a794: 0x109a794: slt   v0, s1, v0
+// 0x0109addc: 0x109addc: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109a798: 0x109a798: beq   v0, zero, 0x109a7c0 subu  s8, s8, a1
+// 0x0109ade0: 0x109ade0: beq   v0, zero, 0x109ae08 subu  s8, s8, a1
 	ldloc 5
 	ldloc 9
 	ldloc.2
 	sub
 	stloc 9
-	brfalse L_109a7c0
+	brfalse L_109ae08
 // --- basic block ---
-// 0x0109a7a0: 0x109a7a0: lw    v0, 0(v1)
+// 0x0109ade8: 0x109ade8: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109a7a4: 0x109a7a4: sll   zero, zero, 0
-// 0x0109a7a8: 0x109a7a8: lw    v0, 48(v0)
+// 0x0109adec: 0x109adec: sll   zero, zero, 0
+// 0x0109adf0: 0x109adf0: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2694,23 +2694,23 @@ L_109a790:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a7ac: 0x109a7ac: sll   zero, zero, 0
-// 0x0109a7b0: 0x109a7b0: andi  v0, v0, 128
+// 0x0109adf4: 0x109adf4: sll   zero, zero, 0
+// 0x0109adf8: 0x109adf8: andi  v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	and
 	stloc 5
-// 0x0109a7b4: 0x109a7b4: beq   v0, zero, 0x109a7c0 sll   zero, zero, 0
+// 0x0109adfc: 0x109adfc: beq   v0, zero, 0x109ae08 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109a7c0
+	brfalse L_109ae08
 // --- basic block ---
-// 0x0109a7bc: 0x109a7bc: addiu s8, s8, -2
+// 0x0109ae04: 0x109ae04: addiu s8, s8, -2
 	ldloc 9
 	ldc.i4.s -2
 	add
 	stloc 9
-L_109a7c0:
-// 0x0109a7c0: 0x109a7c0: lw    a2, 44(a0)
+L_109ae08:
+// 0x0109ae08: 0x109ae08: lw    a2, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2719,18 +2719,18 @@ L_109a7c0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109a7c4: 0x109a7c4: addu  a1, s8, zero
+// 0x0109ae0c: 0x109ae0c: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x0109a7c8: 0x109a7c8: addu  a2, s3, a2
+// 0x0109ae10: 0x109ae10: addu  a2, s3, a2
 	ldloc 12
 	ldloc.3
 	add
 	stloc.3
-// 0x0109a7cc: 0x109a7cc: addu  a3, s2, zero
+// 0x0109ae14: 0x109ae14: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0109a7d0: 0x109a7d0: jal   0x109adf8 sw    v1, 48(sp)
+// 0x0109ae18: 0x109ae18: jal   0x109b440 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2744,18 +2744,18 @@ L_109a7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109a7d8:
-// 0x0109a7d8: 0x109a7d8: addiu s0, s0, -1
+L_109ae20:
+// 0x0109ae20: 0x109ae20: addiu s0, s0, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0109a7dc: 0x109a7dc: lw    v1, 48(sp)
+// 0x0109ae24: 0x109ae24: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2764,16 +2764,16 @@ L_109a7d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a7e0: 0x109a7e0: beq   s1, s0, 0x109a800 sll   a2, s0, 2
+// 0x0109ae28: 0x109ae28: beq   s1, s0, 0x109ae48 sll   a2, s0, 2
 	ldloc 8
 	ldloc 10
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc.3
-	beq  L_109a800
+	beq  L_109ae48
 // --- basic block ---
-// 0x0109a7e8: 0x109a7e8: lw    a0, 24(sp)
+// 0x0109ae30: 0x109ae30: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2782,15 +2782,15 @@ L_109a7d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a7ec: 0x109a7ec: addu  a1, v1, zero
+// 0x0109ae34: 0x109ae34: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0109a7f0: 0x109a7f0: subu  a2, a2, s1
+// 0x0109ae38: 0x109ae38: subu  a2, a2, s1
 	ldloc.3
 	ldloc 8
 	sub
 	stloc.3
-// 0x0109a7f4: 0x109a7f4: jal   0x100186c sw    v1, 48(sp)
+// 0x0109ae3c: 0x109ae3c: jal   0x100186c sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2808,7 +2808,7 @@ L_109a7d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a7fc: 0x109a7fc: lw    v1, 48(sp)
+// 0x0109ae44: 0x109ae44: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2817,8 +2817,8 @@ L_109a7d8:
 	add
 	ldelem.i4
 	stloc 7
-L_109a800:
-// 0x0109a800: 0x109a800: lw    v0, 24(sp)
+L_109ae48:
+// 0x0109ae48: 0x109ae48: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2827,17 +2827,17 @@ L_109a800:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a804: 0x109a804: addiu s1, s1, -1
+// 0x0109ae4c: 0x109ae4c: addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x0109a808: 0x109a808: addiu v0, v0, -4
+// 0x0109ae50: 0x109ae50: addiu v0, v0, -4
 	ldloc 5
 	ldc.i4.s -4
 	add
 	stloc 5
-// 0x0109a80c: 0x109a80c: sw    v0, 24(sp)
+// 0x0109ae54: 0x109ae54: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2846,34 +2846,34 @@ L_109a800:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109a810: 0x109a810: addiu v1, v1, -4
+// 0x0109ae58: 0x109ae58: addiu v1, v1, -4
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 7
-L_109a814:
-// 0x0109a814: 0x109a814: bgez  s1, 0x109a6f8 addiu a1, sp, 16
+L_109ae5c:
+// 0x0109ae5c: 0x109ae5c: bgez  s1, 0x109ad40 addiu a1, sp, 16
 	ldloc 8
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
 	ldc.i4.s 0
-	bge L_109a6f8
+	bge L_109ad40
 // --- basic block ---
-// 0x0109a81c: 0x109a81c: bne   s4, zero, 0x109a828 addu  s1, s5, s6
+// 0x0109ae64: 0x109ae64: bne   s4, zero, 0x109ae70 addu  s1, s5, s6
 	ldloc 14
 	ldloc 15
 	ldloc 16
 	add
 	stloc 8
-	brtrue L_109a828
+	brtrue L_109ae70
 // --- basic block ---
-// 0x0109a824: 0x109a824: addu  s1, s5, zero
+// 0x0109ae6c: 0x109ae6c: addu  s1, s5, zero
 	ldloc 15
 	stloc 8
-L_109a828:
-// 0x0109a828: 0x109a828: sw    s6, 24(sp)
+L_109ae70:
+// 0x0109ae70: 0x109ae70: sw    s6, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2882,21 +2882,21 @@ L_109a828:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109a82c: 0x109a82c: j	 0x109a92c addu  s8, zero, zero
+// 0x0109ae74: 0x109ae74: j	 0x109af74 addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_109a92c
+	br L_109af74
 // --- basic block ---
-L_109a834:
-// 0x0109a834: 0x109a834: lw    a0, 0(s7)
+L_109ae7c:
+// 0x0109ae7c: 0x109ae7c: lw    a0, 0(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a838: 0x109a838: sll   zero, zero, 0
-// 0x0109a83c: 0x109a83c: lw    v0, 48(a0)
+// 0x0109ae80: 0x109ae80: sll   zero, zero, 0
+// 0x0109ae84: 0x109ae84: lw    v0, 48(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2905,21 +2905,21 @@ L_109a834:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a840: 0x109a840: sll   zero, zero, 0
-// 0x0109a844: 0x109a844: andi  v0, v0, 1
+// 0x0109ae88: 0x109ae88: sll   zero, zero, 0
+// 0x0109ae8c: 0x109ae8c: andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-// 0x0109a848: 0x109a848: bne   v0, zero, 0x109a93c addiu a1, sp, 16
+// 0x0109ae90: 0x109ae90: bne   v0, zero, 0x109af84 addiu a1, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-	brtrue L_109a93c
+	brtrue L_109af84
 // --- basic block ---
-// 0x0109a850: 0x109a850: jal   0x1099350 addu  a2, zero, zero
+// 0x0109ae98: 0x109ae98: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2927,23 +2927,23 @@ L_109a834:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a858: 0x109a858: lw    a0, 0(s7)
+// 0x0109aea0: 0x109aea0: lw    a0, 0(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a85c: 0x109a85c: beq   s4, zero, 0x109a8ac sll   zero, zero, 0
+// 0x0109aea4: 0x109aea4: beq   s4, zero, 0x109aef4 sll   zero, zero, 0
 	ldloc 14
-	brfalse L_109a8ac
+	brfalse L_109aef4
 // --- basic block ---
-// 0x0109a864: 0x109a864: lw    v1, 16(sp)
+// 0x0109aeac: 0x109aeac: lw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2952,7 +2952,7 @@ L_109a834:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a868: 0x109a868: lw    v0, 40(a0)
+// 0x0109aeb0: 0x109aeb0: lw    v0, 40(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2961,20 +2961,20 @@ L_109a834:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a86c: 0x109a86c: subu  s1, s1, v1
+// 0x0109aeb4: 0x109aeb4: subu  s1, s1, v1
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-// 0x0109a870: 0x109a870: beq   s8, zero, 0x109a890 subu  s1, s1, v0
+// 0x0109aeb8: 0x109aeb8: beq   s8, zero, 0x109aed8 subu  s1, s1, v0
 	ldloc 9
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-	brfalse L_109a890
+	brfalse L_109aed8
 // --- basic block ---
-// 0x0109a878: 0x109a878: lw    v0, 48(s8)
+// 0x0109aec0: 0x109aec0: lw    v0, 48(s8)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2983,23 +2983,23 @@ L_109a834:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a87c: 0x109a87c: sll   zero, zero, 0
-// 0x0109a880: 0x109a880: andi  v0, v0, 128
+// 0x0109aec4: 0x109aec4: sll   zero, zero, 0
+// 0x0109aec8: 0x109aec8: andi  v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	and
 	stloc 5
-// 0x0109a884: 0x109a884: beq   v0, zero, 0x109a890 sll   zero, zero, 0
+// 0x0109aecc: 0x109aecc: beq   v0, zero, 0x109aed8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109a890
+	brfalse L_109aed8
 // --- basic block ---
-// 0x0109a88c: 0x109a88c: addiu s1, s1, -2
+// 0x0109aed4: 0x109aed4: addiu s1, s1, -2
 	ldloc 8
 	ldc.i4.s -2
 	add
 	stloc 8
-L_109a890:
-// 0x0109a890: 0x109a890: lw    a2, 44(a0)
+L_109aed8:
+// 0x0109aed8: 0x109aed8: lw    a2, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3008,15 +3008,15 @@ L_109a890:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109a894: 0x109a894: addu  a1, s1, zero
+// 0x0109aedc: 0x109aedc: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0109a898: 0x109a898: addu  a2, s3, a2
+// 0x0109aee0: 0x109aee0: addu  a2, s3, a2
 	ldloc 12
 	ldloc.3
 	add
 	stloc.3
-// 0x0109a89c: 0x109a89c: jal   0x109adf8 addu  a3, s2, zero
+// 0x0109aee4: 0x109aee4: jal   0x109b440 addu  a3, s2, zero
 	ldloc 13
 	stloc 4
 	ldloc.0
@@ -3024,16 +3024,16 @@ L_109a890:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a8a4: 0x109a8a4: j	 0x109a8f0 sll   zero, zero, 0
-	br L_109a8f0
+// 0x0109aeec: 0x109aeec: j	 0x109af38 sll   zero, zero, 0
+	br L_109af38
 // --- basic block ---
-L_109a8ac:
-// 0x0109a8ac: 0x109a8ac: lw    v0, 40(a0)
+L_109aef4:
+// 0x0109aef4: 0x109aef4: lw    v0, 40(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3042,15 +3042,15 @@ L_109a8ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a8b0: 0x109a8b0: beq   s8, zero, 0x109a8d0 addu  s1, s1, v0
+// 0x0109aef8: 0x109aef8: beq   s8, zero, 0x109af18 addu  s1, s1, v0
 	ldloc 9
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-	brfalse L_109a8d0
+	brfalse L_109af18
 // --- basic block ---
-// 0x0109a8b8: 0x109a8b8: lw    v0, 48(s8)
+// 0x0109af00: 0x109af00: lw    v0, 48(s8)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3059,23 +3059,23 @@ L_109a8ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a8bc: 0x109a8bc: sll   zero, zero, 0
-// 0x0109a8c0: 0x109a8c0: andi  v0, v0, 128
+// 0x0109af04: 0x109af04: sll   zero, zero, 0
+// 0x0109af08: 0x109af08: andi  v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	and
 	stloc 5
-// 0x0109a8c4: 0x109a8c4: beq   v0, zero, 0x109a8d0 sll   zero, zero, 0
+// 0x0109af0c: 0x109af0c: beq   v0, zero, 0x109af18 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109a8d0
+	brfalse L_109af18
 // --- basic block ---
-// 0x0109a8cc: 0x109a8cc: addiu s1, s1, 2
+// 0x0109af14: 0x109af14: addiu s1, s1, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 8
-L_109a8d0:
-// 0x0109a8d0: 0x109a8d0: lw    a2, 44(a0)
+L_109af18:
+// 0x0109af18: 0x109af18: lw    a2, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3084,15 +3084,15 @@ L_109a8d0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109a8d4: 0x109a8d4: addu  a1, s1, zero
+// 0x0109af1c: 0x109af1c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0109a8d8: 0x109a8d8: addu  a2, s3, a2
+// 0x0109af20: 0x109af20: addu  a2, s3, a2
 	ldloc 12
 	ldloc.3
 	add
 	stloc.3
-// 0x0109a8dc: 0x109a8dc: jal   0x109adf8 addu  a3, s2, zero
+// 0x0109af24: 0x109af24: jal   0x109b440 addu  a3, s2, zero
 	ldloc 13
 	stloc 4
 	ldloc.0
@@ -3100,12 +3100,12 @@ L_109a8d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a8e4: 0x109a8e4: lw    v0, 16(sp)
+// 0x0109af2c: 0x109af2c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3114,14 +3114,14 @@ L_109a8d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a8e8: 0x109a8e8: sll   zero, zero, 0
-// 0x0109a8ec: 0x109a8ec: addu  s1, s1, v0
+// 0x0109af30: 0x109af30: sll   zero, zero, 0
+// 0x0109af34: 0x109af34: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_109a8f0:
-// 0x0109a8f0: 0x109a8f0: lw    v1, 24(sp)
+L_109af38:
+// 0x0109af38: 0x109af38: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3130,7 +3130,7 @@ L_109a8f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a8f4: 0x109a8f4: lw    v0, 16(sp)
+// 0x0109af3c: 0x109af3c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3139,13 +3139,13 @@ L_109a8f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a8f8: 0x109a8f8: sll   zero, zero, 0
-// 0x0109a8fc: 0x109a8fc: subu  v1, v1, v0
+// 0x0109af40: 0x109af40: sll   zero, zero, 0
+// 0x0109af44: 0x109af44: subu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 7
-// 0x0109a900: 0x109a900: beq   s8, zero, 0x109a920 sw    v1, 24(sp)
+// 0x0109af48: 0x109af48: beq   s8, zero, 0x109af68 sw    v1, 24(sp)
 	ldloc 9
 	ldloc 6
 	ldloc.0
@@ -3155,9 +3155,9 @@ L_109a8f0:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_109a920
+	brfalse L_109af68
 // --- basic block ---
-// 0x0109a908: 0x109a908: lw    v0, 48(s8)
+// 0x0109af50: 0x109af50: lw    v0, 48(s8)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3166,21 +3166,21 @@ L_109a8f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a90c: 0x109a90c: sll   zero, zero, 0
-// 0x0109a910: 0x109a910: andi  v0, v0, 128
+// 0x0109af54: 0x109af54: sll   zero, zero, 0
+// 0x0109af58: 0x109af58: andi  v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	and
 	stloc 5
-// 0x0109a914: 0x109a914: beq   v0, zero, 0x109a920 addiu v1, v1, -2
+// 0x0109af5c: 0x109af5c: beq   v0, zero, 0x109af68 addiu v1, v1, -2
 	ldloc 5
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc 7
-	brfalse L_109a920
+	brfalse L_109af68
 // --- basic block ---
-// 0x0109a91c: 0x109a91c: sw    v1, 24(sp)
+// 0x0109af64: 0x109af64: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3189,60 +3189,60 @@ L_109a8f0:
 	add
 	ldloc 7
 	stelem.i4
-L_109a920:
-// 0x0109a920: 0x109a920: lw    s8, 0(s7)
+L_109af68:
+// 0x0109af68: 0x109af68: lw    s8, 0(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0109a924: 0x109a924: addiu s0, s0, -1
+// 0x0109af6c: 0x109af6c: addiu s0, s0, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0109a928: 0x109a928: addiu s7, s7, 4
+// 0x0109af70: 0x109af70: addiu s7, s7, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-L_109a92c:
-// 0x0109a92c: 0x109a92c: bgtz  s0, 0x109a834 sll   zero, zero, 0
+L_109af74:
+// 0x0109af74: 0x109af74: bgtz  s0, 0x109ae7c sll   zero, zero, 0
 	ldloc 10
 	ldc.i4.s 0
-	bgt L_109a834
+	bgt L_109ae7c
 // --- basic block ---
-// 0x0109a934: 0x109a934: beq   s0, zero, 0x109aa8c sll   zero, zero, 0
+// 0x0109af7c: 0x109af7c: beq   s0, zero, 0x109b0d4 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_109aa8c
+	brfalse L_109b0d4
 // --- basic block ---
-L_109a93c:
-// 0x0109a93c: 0x109a93c: addu  v1, s7, zero
+L_109af84:
+// 0x0109af84: 0x109af84: addu  v1, s7, zero
 	ldloc 11
 	stloc 7
-// 0x0109a940: 0x109a940: addu  v0, zero, zero
+// 0x0109af88: 0x109af88: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0109a944: 0x109a944: j	 0x109a974 addu  s8, zero, zero
+// 0x0109af8c: 0x109af8c: j	 0x109afbc addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_109a974
+	br L_109afbc
 // --- basic block ---
-L_109a94c:
-// 0x0109a94c: 0x109a94c: lw    a0, 0(v1)
+L_109af94:
+// 0x0109af94: 0x109af94: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a950: 0x109a950: addiu v0, v0, 1
+// 0x0109af98: 0x109af98: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0109a954: 0x109a954: sw    v0, 44(sp)
+// 0x0109af9c: 0x109af9c: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3251,7 +3251,7 @@ L_109a94c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109a958: 0x109a958: jal   0x1099350 sw    v1, 48(sp)
+// 0x0109afa0: 0x109afa0: jal   0x1099998 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3265,12 +3265,12 @@ L_109a94c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a960: 0x109a960: lw    v1, 48(sp)
+// 0x0109afa8: 0x109afa8: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3279,7 +3279,7 @@ L_109a94c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a964: 0x109a964: lw    a0, 16(sp)
+// 0x0109afac: 0x109afac: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3288,7 +3288,7 @@ L_109a94c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a968: 0x109a968: lw    v0, 44(sp)
+// 0x0109afb0: 0x109afb0: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3297,34 +3297,34 @@ L_109a94c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a96c: 0x109a96c: addiu v1, v1, 4
+// 0x0109afb4: 0x109afb4: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0109a970: 0x109a970: addu  s8, s8, a0
+// 0x0109afb8: 0x109afb8: addu  s8, s8, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc 9
-L_109a974:
-// 0x0109a974: 0x109a974: slt   a0, v0, s0
+L_109afbc:
+// 0x0109afbc: 0x109afbc: slt   a0, v0, s0
 	ldloc 5
 	ldloc 10
 	clt
 	stloc.1
-// 0x0109a978: 0x109a978: addiu a1, sp, 16
+// 0x0109afc0: 0x109afc0: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0109a97c: 0x109a97c: bne   a0, zero, 0x109a94c addu  a2, zero, zero
+// 0x0109afc4: 0x109afc4: bne   a0, zero, 0x109af94 addu  a2, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_109a94c
+	brtrue L_109af94
 // --- basic block ---
-// 0x0109a984: 0x109a984: lw    a1, 24(sp)
+// 0x0109afcc: 0x109afcc: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3333,7 +3333,7 @@ L_109a974:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109a988: 0x109a988: sw    zero, 24(sp)
+// 0x0109afd0: 0x109afd0: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3342,27 +3342,27 @@ L_109a974:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109a98c: 0x109a98c: subu  v0, a1, s8
+// 0x0109afd4: 0x109afd4: subu  v0, a1, s8
 	ldloc.2
 	ldloc 9
 	sub
 	stloc 5
-// 0x0109a990: 0x109a990: addiu s8, s0, 1
+// 0x0109afd8: 0x109afd8: addiu s8, s0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0109a994: 0x109a994: div   v0, s8
+// 0x0109afdc: 0x109afdc: div   v0, s8
 	ldloc 5
 	ldloc 9
 	div
 	stloc 17
-// 0x0109a998: 0x109a998: addu  a1, s5, s6
+// 0x0109afe0: 0x109afe0: addu  a1, s5, s6
 	ldloc 15
 	ldloc 16
 	add
 	stloc.2
-// 0x0109a99c: 0x109a99c: sw    a1, 32(sp)
+// 0x0109afe4: 0x109afe4: sw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3371,10 +3371,10 @@ L_109a974:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109a9a0: 0x109a9a0: mflo  lo
+// 0x0109afe8: 0x109afe8: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x0109a9a4: 0x109a9a4: j	 0x109aa78 sw    v1, 28(sp)
+// 0x0109afec: 0x109afec: j	 0x109b0c0 sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3383,38 +3383,38 @@ L_109a974:
 	add
 	ldloc 7
 	stelem.i4
-	br L_109aa78
+	br L_109b0c0
 // --- basic block ---
-L_109a9ac:
-// 0x0109a9ac: 0x109a9ac: lw    a0, 0(s7)
+L_109aff4:
+// 0x0109aff4: 0x109aff4: lw    a0, 0(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109a9b0: 0x109a9b0: jal   0x1099350 sll   zero, zero, 0
+// 0x0109aff8: 0x109aff8: jal   0x1099998 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109a9b8: 0x109a9b8: lw    v1, 0(s7)
+// 0x0109b000: 0x109b000: lw    v1, 0(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109a9bc: 0x109a9bc: lui   a1, 0x10000
+// 0x0109b004: 0x109b004: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0109a9c0: 0x109a9c0: lw    a0, 16(v1)
+// 0x0109b008: 0x109b008: lw    a0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3423,12 +3423,12 @@ L_109a9ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109a9c4: 0x109a9c4: addiu a1, a1, 328
+// 0x0109b00c: 0x109b00c: addiu a1, a1, 324
 	ldloc.2
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
-// 0x0109a9c8: 0x109a9c8: jal   0x1001b14 sw    v1, 48(sp)
+// 0x0109b010: 0x109b010: jal   0x1001b14 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3442,7 +3442,7 @@ L_109a9ac:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109a9d0: 0x109a9d0: lw    v1, 48(sp)
+// 0x0109b018: 0x109b018: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3451,16 +3451,16 @@ L_109a9ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109a9d4: 0x109a9d4: addu  a3, s2, zero
+// 0x0109b01c: 0x109b01c: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0109a9d8: 0x109a9d8: bne   v0, zero, 0x109aa04 addu  a0, v1, zero
+// 0x0109b020: 0x109b020: bne   v0, zero, 0x109b04c addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brtrue L_109aa04
+	brtrue L_109b04c
 // --- basic block ---
-// 0x0109a9e0: 0x109a9e0: lw    s1, 32(sp)
+// 0x0109b028: 0x109b028: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3469,7 +3469,7 @@ L_109a9ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109a9e4: 0x109a9e4: lw    v0, 16(sp)
+// 0x0109b02c: 0x109b02c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3478,28 +3478,28 @@ L_109a9ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109a9e8: 0x109a9e8: bne   s4, zero, 0x109a9f4 sll   zero, zero, 0
+// 0x0109b030: 0x109b030: bne   s4, zero, 0x109b03c sll   zero, zero, 0
 	ldloc 14
-	brtrue L_109a9f4
+	brtrue L_109b03c
 // --- basic block ---
-// 0x0109a9f0: 0x109a9f0: addu  s1, s5, zero
+// 0x0109b038: 0x109b038: addu  s1, s5, zero
 	ldloc 15
 	stloc 8
-L_109a9f4:
-// 0x0109a9f4: 0x109a9f4: subu  v0, s6, v0
+L_109b03c:
+// 0x0109b03c: 0x109b03c: subu  v0, s6, v0
 	ldloc 16
 	ldloc 5
 	sub
 	stloc 5
-// 0x0109a9f8: 0x109a9f8: div   v0, s8
+// 0x0109b040: 0x109b040: div   v0, s8
 	ldloc 5
 	ldloc 9
 	div
 	stloc 17
-// 0x0109a9fc: 0x109a9fc: mflo  lo
+// 0x0109b044: 0x109b044: mflo  lo
 	ldloc 17
 	stloc.2
-// 0x0109aa00: 0x109aa00: sw    a1, 28(sp)
+// 0x0109b048: 0x109b048: sw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3508,8 +3508,8 @@ L_109a9f4:
 	add
 	ldloc.2
 	stelem.i4
-L_109aa04:
-// 0x0109aa04: 0x109aa04: lw    v0, 40(v1)
+L_109b04c:
+// 0x0109b04c: 0x109b04c: lw    v0, 40(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3518,7 +3518,7 @@ L_109aa04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109aa08: 0x109aa08: lw    a2, 44(v1)
+// 0x0109b050: 0x109b050: lw    a2, 44(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3527,14 +3527,14 @@ L_109aa04:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109aa0c: 0x109aa0c: beq   s4, zero, 0x109aa44 sll   zero, zero, 0
+// 0x0109b054: 0x109b054: beq   s4, zero, 0x109b08c sll   zero, zero, 0
 	ldloc 14
-	brfalse L_109aa44
+	brfalse L_109b08c
 // --- basic block ---
-// 0x0109aa14: 0x109aa14: addu  a0, v1, zero
+// 0x0109b05c: 0x109b05c: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0109aa18: 0x109aa18: lw    v1, 28(sp)
+// 0x0109b060: 0x109b060: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3543,17 +3543,17 @@ L_109aa04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109aa1c: 0x109aa1c: addu  a2, s3, a2
+// 0x0109b064: 0x109b064: addu  a2, s3, a2
 	ldloc 12
 	ldloc.3
 	add
 	stloc.3
-// 0x0109aa20: 0x109aa20: subu  s1, s1, v1
+// 0x0109b068: 0x109b068: subu  s1, s1, v1
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-// 0x0109aa24: 0x109aa24: lw    v1, 16(sp)
+// 0x0109b06c: 0x109b06c: lw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3562,20 +3562,20 @@ L_109aa04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109aa28: 0x109aa28: addu  a3, s2, zero
+// 0x0109b070: 0x109b070: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0109aa2c: 0x109aa2c: subu  s1, s1, v1
+// 0x0109b074: 0x109b074: subu  s1, s1, v1
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-// 0x0109aa30: 0x109aa30: subu  s1, s1, v0
+// 0x0109b078: 0x109b078: subu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x0109aa34: 0x109aa34: jal   0x109adf8 addu  a1, s1, zero
+// 0x0109b07c: 0x109b07c: jal   0x109b440 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3583,16 +3583,16 @@ L_109aa04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109aa3c: 0x109aa3c: j	 0x109aa68 sll   zero, zero, 0
-	br L_109aa68
+// 0x0109b084: 0x109b084: j	 0x109b0b0 sll   zero, zero, 0
+	br L_109b0b0
 // --- basic block ---
-L_109aa44:
-// 0x0109aa44: 0x109aa44: lw    a1, 28(sp)
+L_109b08c:
+// 0x0109b08c: 0x109b08c: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3601,22 +3601,22 @@ L_109aa44:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109aa48: 0x109aa48: addu  a2, s3, a2
+// 0x0109b090: 0x109b090: addu  a2, s3, a2
 	ldloc 12
 	ldloc.3
 	add
 	stloc.3
-// 0x0109aa4c: 0x109aa4c: addu  s1, s1, a1
+// 0x0109b094: 0x109b094: addu  s1, s1, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc 8
-// 0x0109aa50: 0x109aa50: addu  s1, s1, v0
+// 0x0109b098: 0x109b098: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0109aa54: 0x109aa54: jal   0x109adf8 addu  a1, s1, zero
+// 0x0109b09c: 0x109b09c: jal   0x109b440 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3624,12 +3624,12 @@ L_109aa44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109aa5c: 0x109aa5c: lw    v0, 16(sp)
+// 0x0109b0a4: 0x109b0a4: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3638,14 +3638,14 @@ L_109aa44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109aa60: 0x109aa60: sll   zero, zero, 0
-// 0x0109aa64: 0x109aa64: addu  s1, s1, v0
+// 0x0109b0a8: 0x109b0a8: sll   zero, zero, 0
+// 0x0109b0ac: 0x109b0ac: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_109aa68:
-// 0x0109aa68: 0x109aa68: lw    v0, 24(sp)
+L_109b0b0:
+// 0x0109b0b0: 0x109b0b0: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3654,17 +3654,17 @@ L_109aa68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109aa6c: 0x109aa6c: addiu s7, s7, 4
+// 0x0109b0b4: 0x109b0b4: addiu s7, s7, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-// 0x0109aa70: 0x109aa70: addiu v0, v0, 1
+// 0x0109b0b8: 0x109b0b8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0109aa74: 0x109aa74: sw    v0, 24(sp)
+// 0x0109b0bc: 0x109b0bc: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3673,8 +3673,8 @@ L_109aa68:
 	add
 	ldloc 5
 	stelem.i4
-L_109aa78:
-// 0x0109aa78: 0x109aa78: lw    v1, 24(sp)
+L_109b0c0:
+// 0x0109b0c0: 0x109b0c0: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3683,28 +3683,28 @@ L_109aa78:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109aa7c: 0x109aa7c: addiu a1, sp, 16
+// 0x0109b0c4: 0x109b0c4: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0109aa80: 0x109aa80: slt   v0, v1, s0
+// 0x0109b0c8: 0x109b0c8: slt   v0, v1, s0
 	ldloc 7
 	ldloc 10
 	clt
 	stloc 5
-// 0x0109aa84: 0x109aa84: bne   v0, zero, 0x109a9ac addu  a2, zero, zero
+// 0x0109b0cc: 0x109b0cc: bne   v0, zero, 0x109aff4 addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_109a9ac
+	brtrue L_109aff4
 // --- basic block ---
-L_109aa8c:
-// 0x0109aa8c: 0x109aa8c: lw    ra, 92(sp)
-// 0x0109aa90: 0x109aa90: addu  v0, s2, zero
+L_109b0d4:
+// 0x0109b0d4: 0x109b0d4: lw    ra, 92(sp)
+// 0x0109b0d8: 0x109b0d8: addu  v0, s2, zero
 	ldloc 13
 	stloc 5
-// 0x0109aa94: 0x109aa94: lw    s8, 88(sp)
+// 0x0109b0dc: 0x109b0dc: lw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3713,7 +3713,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109aa98: 0x109aa98: lw    s7, 84(sp)
+// 0x0109b0e0: 0x109b0e0: lw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3722,7 +3722,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109aa9c: 0x109aa9c: lw    s6, 80(sp)
+// 0x0109b0e4: 0x109b0e4: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3731,7 +3731,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109aaa0: 0x109aaa0: lw    s5, 76(sp)
+// 0x0109b0e8: 0x109b0e8: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3740,7 +3740,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109aaa4: 0x109aaa4: lw    s4, 72(sp)
+// 0x0109b0ec: 0x109b0ec: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3749,7 +3749,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109aaa8: 0x109aaa8: lw    s3, 68(sp)
+// 0x0109b0f0: 0x109b0f0: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3758,7 +3758,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109aaac: 0x109aaac: lw    s2, 64(sp)
+// 0x0109b0f4: 0x109b0f4: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3767,7 +3767,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109aab0: 0x109aab0: lw    s1, 60(sp)
+// 0x0109b0f8: 0x109b0f8: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3776,7 +3776,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109aab4: 0x109aab4: lw    s0, 56(sp)
+// 0x0109b0fc: 0x109b0fc: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3785,7 +3785,7 @@ L_109aa8c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109aab8: 0x109aab8: jr    ra addiu sp, sp, 96
+// 0x0109b100: 0x109b100: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -3797,7 +3797,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_draw_pack_109aac0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_draw_pack_109b108(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 s3,int32 s4,int32 v0,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 t0)
@@ -3862,12 +3862,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109aac0: 0x109aac0: addiu sp, sp, -496
+// 0x0109b108: 0x109b108: addiu sp, sp, -496
 	ldloc.0
 	ldc.i4 -496
 	add
 	stloc.0
-// 0x0109aac4: 0x109aac4: sw    s4, 472(sp)
+// 0x0109b10c: 0x109b10c: sw    s4, 472(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3876,7 +3876,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109aac8: 0x109aac8: sw    s3, 468(sp)
+// 0x0109b110: 0x109b110: sw    s3, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3885,7 +3885,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109aacc: 0x109aacc: lw    s4, 12(a1)
+// 0x0109b114: 0x109b114: lw    s4, 12(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3894,7 +3894,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109aad0: 0x109aad0: lw    s3, 8(a1)
+// 0x0109b118: 0x109b118: lw    s3, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3903,7 +3903,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109aad4: 0x109aad4: sw    s2, 464(sp)
+// 0x0109b11c: 0x109b11c: sw    s2, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3912,7 +3912,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109aad8: 0x109aad8: sw    s0, 456(sp)
+// 0x0109b120: 0x109b120: sw    s0, 456(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3921,14 +3921,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109aadc: 0x109aadc: lw    s2, 0(a1)
+// 0x0109b124: 0x109b124: lw    s2, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x0109aae0: 0x109aae0: lw    s0, 4(a1)
+// 0x0109b128: 0x109b128: lw    s0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3937,17 +3937,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109aae4: 0x109aae4: addiu s3, s3, 1
+// 0x0109b12c: 0x109b12c: addiu s3, s3, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109aae8: 0x109aae8: addiu s4, s4, 1
+// 0x0109b130: 0x109b130: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0109aaec: 0x109aaec: sw    s8, 488(sp)
+// 0x0109b134: 0x109b134: sw    s8, 488(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3956,7 +3956,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109aaf0: 0x109aaf0: sw    s7, 484(sp)
+// 0x0109b138: 0x109b138: sw    s7, 484(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3965,7 +3965,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109aaf4: 0x109aaf4: sw    s6, 480(sp)
+// 0x0109b13c: 0x109b13c: sw    s6, 480(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3974,7 +3974,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109aaf8: 0x109aaf8: sw    s5, 476(sp)
+// 0x0109b140: 0x109b140: sw    s5, 476(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3983,7 +3983,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109aafc: 0x109aafc: sw    s1, 460(sp)
+// 0x0109b144: 0x109b144: sw    s1, 460(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3992,49 +3992,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109ab00: 0x109ab00: sw    ra, 492(sp)
-// 0x0109ab04: 0x109ab04: addu  s5, a1, zero
+// 0x0109b148: 0x109b148: sw    ra, 492(sp)
+// 0x0109b14c: 0x109b14c: addu  s5, a1, zero
 	ldloc.2
 	stloc 13
-// 0x0109ab08: 0x109ab08: addu  s1, a0, zero
+// 0x0109b150: 0x109b150: addu  s1, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0109ab0c: 0x109ab0c: subu  s3, s3, s2
+// 0x0109b154: 0x109b154: subu  s3, s3, s2
 	ldloc 7
 	ldloc 12
 	sub
 	stloc 7
-// 0x0109ab10: 0x109ab10: subu  s4, s4, s0
+// 0x0109b158: 0x109b158: subu  s4, s4, s0
 	ldloc 8
 	ldloc 10
 	sub
 	stloc 8
-// 0x0109ab14: 0x109ab14: addu  s6, zero, zero
+// 0x0109b15c: 0x109b15c: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x0109ab18: 0x109ab18: addu  v1, zero, zero
+// 0x0109b160: 0x109b160: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0109ab1c: 0x109ab1c: addu  v0, zero, zero
+// 0x0109b164: 0x109b164: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0109ab20: 0x109ab20: addu  a3, zero, zero
+// 0x0109b168: 0x109b168: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109ab24: 0x109ab24: addiu s7, sp, 24
+// 0x0109b16c: 0x109b16c: addiu s7, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-// 0x0109ab28: 0x109ab28: j	 0x109ad44 addiu s8, sp, 32
+// 0x0109b170: 0x109b170: j	 0x109b38c addiu s8, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 16
-	br L_109ad44
+	br L_109b38c
 // --- basic block ---
-L_109ab30:
-// 0x0109ab30: 0x109ab30: sw    zero, 24(sp)
+L_109b178:
+// 0x0109b178: 0x109b178: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4043,7 +4043,7 @@ L_109ab30:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109ab34: 0x109ab34: sw    zero, 28(sp)
+// 0x0109b17c: 0x109b17c: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4052,7 +4052,7 @@ L_109ab30:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109ab38: 0x109ab38: lw    a0, 48(s1)
+// 0x0109b180: 0x109b180: lw    a0, 48(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4061,25 +4061,25 @@ L_109ab30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ab3c: 0x109ab3c: sll   zero, zero, 0
-// 0x0109ab40: 0x109ab40: andi  a1, a0, 256
+// 0x0109b184: 0x109b184: sll   zero, zero, 0
+// 0x0109b188: 0x109b188: andi  a1, a0, 256
 	ldloc.1
 	ldc.i4 256
 	and
 	stloc.2
-// 0x0109ab44: 0x109ab44: bne   a1, zero, 0x109ad3c sll   zero, zero, 0
+// 0x0109b18c: 0x109b18c: bne   a1, zero, 0x109b384 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_109ad3c
+	brtrue L_109b384
 // --- basic block ---
-// 0x0109ab4c: 0x109ab4c: bne   v0, zero, 0x109ab84 andi  a1, a0, 128
+// 0x0109b194: 0x109b194: bne   v0, zero, 0x109b1cc andi  a1, a0, 128
 	ldloc 9
 	ldloc.1
 	ldc.i4 128
 	and
 	stloc.2
-	brtrue L_109ab84
+	brtrue L_109b1cc
 // --- basic block ---
-// 0x0109ab54: 0x109ab54: lw    s3, 8(s5)
+// 0x0109b19c: 0x109b19c: lw    s3, 8(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4088,7 +4088,7 @@ L_109ab30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ab58: 0x109ab58: lw    s4, 12(s5)
+// 0x0109b1a0: 0x109b1a0: lw    s4, 12(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4097,83 +4097,83 @@ L_109ab30:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ab5c: 0x109ab5c: lw    s2, 0(s5)
+// 0x0109b1a4: 0x109b1a4: lw    s2, 0(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x0109ab60: 0x109ab60: addiu s3, s3, 1
+// 0x0109b1a8: 0x109b1a8: addiu s3, s3, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109ab64: 0x109ab64: addiu s4, s4, 1
+// 0x0109b1ac: 0x109b1ac: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0109ab68: 0x109ab68: subu  s3, s3, s2
+// 0x0109b1b0: 0x109b1b0: subu  s3, s3, s2
 	ldloc 7
 	ldloc 12
 	sub
 	stloc 7
-// 0x0109ab6c: 0x109ab6c: beq   a1, zero, 0x109ab84 subu  s4, s4, s0
+// 0x0109b1b4: 0x109b1b4: beq   a1, zero, 0x109b1cc subu  s4, s4, s0
 	ldloc.2
 	ldloc 8
 	ldloc 10
 	sub
 	stloc 8
-	brfalse L_109ab84
+	brfalse L_109b1cc
 // --- basic block ---
-// 0x0109ab74: 0x109ab74: addiu s3, s3, -4
+// 0x0109b1bc: 0x109b1bc: addiu s3, s3, -4
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 7
-// 0x0109ab78: 0x109ab78: addiu s4, s4, -2
+// 0x0109b1c0: 0x109b1c0: addiu s4, s4, -2
 	ldloc 8
 	ldc.i4.s -2
 	add
 	stloc 8
-// 0x0109ab7c: 0x109ab7c: addiu s0, s0, 2
+// 0x0109b1c4: 0x109b1c4: addiu s0, s0, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x0109ab80: 0x109ab80: addiu s2, s2, 2
+// 0x0109b1c8: 0x109b1c8: addiu s2, s2, 2
 	ldloc 12
 	ldc.i4.2
 	add
 	stloc 12
-L_109ab84:
-// 0x0109ab84: 0x109ab84: andi  a0, a0, 4
+L_109b1cc:
+// 0x0109b1cc: 0x109b1cc: andi  a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	and
 	stloc.1
-// 0x0109ab88: 0x109ab88: bne   a0, zero, 0x109abc8 addiu a0, zero, 100
+// 0x0109b1d0: 0x109b1d0: bne   a0, zero, 0x109b210 addiu a0, zero, 100
 	ldloc.1
 	ldc.i4.s 100
 	stloc.1
-	brtrue L_109abc8
+	brtrue L_109b210
 // --- basic block ---
-// 0x0109ab90: 0x109ab90: subu  t0, s3, a3
+// 0x0109b1d8: 0x109b1d8: subu  t0, s3, a3
 	ldloc 7
 	ldloc 4
 	sub
 	stloc 18
-// 0x0109ab94: 0x109ab94: addu  a0, s1, zero
+// 0x0109b1dc: 0x109b1dc: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0109ab98: 0x109ab98: addu  a1, s7, zero
+// 0x0109b1e0: 0x109b1e0: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x0109ab9c: 0x109ab9c: addu  a2, s8, zero
+// 0x0109b1e4: 0x109b1e4: addu  a2, s8, zero
 	ldloc 16
 	stloc.3
-// 0x0109aba0: 0x109aba0: sw    v0, 444(sp)
+// 0x0109b1e8: 0x109b1e8: sw    v0, 444(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4182,7 +4182,7 @@ L_109ab84:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109aba4: 0x109aba4: sw    v1, 440(sp)
+// 0x0109b1ec: 0x109b1ec: sw    v1, 440(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4191,7 +4191,7 @@ L_109ab84:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109aba8: 0x109aba8: sw    a3, 448(sp)
+// 0x0109b1f0: 0x109b1f0: sw    a3, 448(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4200,7 +4200,7 @@ L_109ab84:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109abac: 0x109abac: sw    t0, 32(sp)
+// 0x0109b1f4: 0x109b1f4: sw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4209,7 +4209,7 @@ L_109ab84:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0109abb0: 0x109abb0: jal   0x1099350 sw    s4, 36(sp)
+// 0x0109b1f8: 0x109b1f8: jal   0x1099998 sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4223,12 +4223,12 @@ L_109ab84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x0109abb8: 0x109abb8: lw    a3, 448(sp)
+// 0x0109b200: 0x109b200: lw    a3, 448(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4237,7 +4237,7 @@ L_109ab84:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109abbc: 0x109abbc: lw    v1, 440(sp)
+// 0x0109b204: 0x109b204: lw    v1, 440(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4246,7 +4246,7 @@ L_109ab84:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109abc0: 0x109abc0: lw    v0, 444(sp)
+// 0x0109b208: 0x109b208: lw    v0, 444(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4255,24 +4255,24 @@ L_109ab84:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109abc4: 0x109abc4: addiu a0, zero, 100
+// 0x0109b20c: 0x109b20c: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-L_109abc8:
-// 0x0109abc8: 0x109abc8: beq   v0, a0, 0x109ac04 sll   zero, zero, 0
+L_109b210:
+// 0x0109b210: 0x109b210: beq   v0, a0, 0x109b24c sll   zero, zero, 0
 	ldloc 9
 	ldloc.1
-	beq  L_109ac04
+	beq  L_109b24c
 // --- basic block ---
-// 0x0109abd0: 0x109abd0: beq   v0, zero, 0x109aca8 sll   a0, v0, 2
+// 0x0109b218: 0x109b218: beq   v0, zero, 0x109b2f0 sll   a0, v0, 2
 	ldloc 9
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.1
-	brfalse L_109aca8
+	brfalse L_109b2f0
 // --- basic block ---
-// 0x0109abd8: 0x109abd8: lw    a0, 24(sp)
+// 0x0109b220: 0x109b220: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4281,22 +4281,22 @@ L_109abc8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109abdc: 0x109abdc: sll   zero, zero, 0
-// 0x0109abe0: 0x109abe0: addu  a0, a3, a0
+// 0x0109b224: 0x109b224: sll   zero, zero, 0
+// 0x0109b228: 0x109b228: addu  a0, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc.1
-// 0x0109abe4: 0x109abe4: slt   a0, s3, a0
+// 0x0109b22c: 0x109b22c: slt   a0, s3, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x0109abe8: 0x109abe8: bne   a0, zero, 0x109ac04 sll   zero, zero, 0
+// 0x0109b230: 0x109b230: bne   a0, zero, 0x109b24c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_109ac04
+	brtrue L_109b24c
 // --- basic block ---
-// 0x0109abf0: 0x109abf0: lw    a0, 48(s1)
+// 0x0109b238: 0x109b238: lw    a0, 48(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4305,28 +4305,28 @@ L_109abc8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109abf4: 0x109abf4: sll   zero, zero, 0
-// 0x0109abf8: 0x109abf8: andi  a0, a0, 4
+// 0x0109b23c: 0x109b23c: sll   zero, zero, 0
+// 0x0109b240: 0x109b240: andi  a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	and
 	stloc.1
-// 0x0109abfc: 0x109abfc: beq   a0, zero, 0x109aca8 sll   a0, v0, 2
+// 0x0109b244: 0x109b244: beq   a0, zero, 0x109b2f0 sll   a0, v0, 2
 	ldloc.1
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.1
-	brfalse L_109aca8
+	brfalse L_109b2f0
 // --- basic block ---
-L_109ac04:
-// 0x0109ac04: 0x109ac04: beq   v1, zero, 0x109ac28 addu  a2, s3, zero
+L_109b24c:
+// 0x0109b24c: 0x109b24c: beq   v1, zero, 0x109b270 addu  a2, s3, zero
 	ldloc 6
 	ldloc 7
 	stloc.3
-	brfalse L_109ac28
+	brfalse L_109b270
 // --- basic block ---
-// 0x0109ac0c: 0x109ac0c: lw    v1, 48(v1)
+// 0x0109b254: 0x109b254: lw    v1, 48(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4335,40 +4335,40 @@ L_109ac04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ac10: 0x109ac10: sll   zero, zero, 0
-// 0x0109ac14: 0x109ac14: andi  v1, v1, 128
+// 0x0109b258: 0x109b258: sll   zero, zero, 0
+// 0x0109b25c: 0x109b25c: andi  v1, v1, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x0109ac18: 0x109ac18: beq   v1, zero, 0x109ac2c addu  a3, s4, zero
+// 0x0109b260: 0x109b260: beq   v1, zero, 0x109b274 addu  a3, s4, zero
 	ldloc 6
 	ldloc 8
 	stloc 4
-	brfalse L_109ac2c
+	brfalse L_109b274
 // --- basic block ---
-// 0x0109ac20: 0x109ac20: addiu s0, s0, 2
+// 0x0109b268: 0x109b268: addiu s0, s0, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x0109ac24: 0x109ac24: addu  a2, s3, zero
+// 0x0109b26c: 0x109b26c: addu  a2, s3, zero
 	ldloc 7
 	stloc.3
-L_109ac28:
-// 0x0109ac28: 0x109ac28: addu  a3, s4, zero
+L_109b270:
+// 0x0109b270: 0x109b270: addu  a3, s4, zero
 	ldloc 8
 	stloc 4
-L_109ac2c:
-// 0x0109ac2c: 0x109ac2c: addu  a1, v0, zero
+L_109b274:
+// 0x0109b274: 0x109b274: addu  a1, v0, zero
 	ldloc 9
 	stloc.2
-// 0x0109ac30: 0x109ac30: addiu a0, sp, 40
+// 0x0109b278: 0x109b278: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0109ac34: 0x109ac34: sw    s2, 16(sp)
+// 0x0109b27c: 0x109b27c: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4377,7 +4377,7 @@ L_109ac2c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109ac38: 0x109ac38: jal   0x109a588 sw    s0, 20(sp)
+// 0x0109b280: 0x109b280: jal   0x109abd0 sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4391,12 +4391,12 @@ L_109ac2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_row_109a588(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_row_109abd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x0109ac40: 0x109ac40: lw    s3, 8(s5)
+// 0x0109b288: 0x109b288: lw    s3, 8(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4405,7 +4405,7 @@ L_109ac2c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ac44: 0x109ac44: lw    s4, 12(s5)
+// 0x0109b28c: 0x109b28c: lw    s4, 12(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4414,7 +4414,7 @@ L_109ac2c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ac48: 0x109ac48: lw    v1, 48(s1)
+// 0x0109b290: 0x109b290: lw    v1, 48(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4423,77 +4423,77 @@ L_109ac2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ac4c: 0x109ac4c: lw    s2, 0(s5)
+// 0x0109b294: 0x109b294: lw    s2, 0(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x0109ac50: 0x109ac50: addu  s0, s0, v0
+// 0x0109b298: 0x109b298: addu  s0, s0, v0
 	ldloc 10
 	ldloc 9
 	add
 	stloc 10
-// 0x0109ac54: 0x109ac54: addiu s3, s3, 1
+// 0x0109b29c: 0x109b29c: addiu s3, s3, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109ac58: 0x109ac58: addiu s4, s4, 1
+// 0x0109b2a0: 0x109b2a0: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0109ac5c: 0x109ac5c: andi  v1, v1, 128
+// 0x0109b2a4: 0x109b2a4: andi  v1, v1, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x0109ac60: 0x109ac60: subu  s3, s3, s2
+// 0x0109b2a8: 0x109b2a8: subu  s3, s3, s2
 	ldloc 7
 	ldloc 12
 	sub
 	stloc 7
-// 0x0109ac64: 0x109ac64: beq   v1, zero, 0x109ac7c subu  s4, s4, s0
+// 0x0109b2ac: 0x109b2ac: beq   v1, zero, 0x109b2c4 subu  s4, s4, s0
 	ldloc 6
 	ldloc 8
 	ldloc 10
 	sub
 	stloc 8
-	brfalse L_109ac7c
+	brfalse L_109b2c4
 // --- basic block ---
-// 0x0109ac6c: 0x109ac6c: addiu s3, s3, -4
+// 0x0109b2b4: 0x109b2b4: addiu s3, s3, -4
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 7
-// 0x0109ac70: 0x109ac70: addiu s4, s4, -2
+// 0x0109b2b8: 0x109b2b8: addiu s4, s4, -2
 	ldloc 8
 	ldc.i4.s -2
 	add
 	stloc 8
-// 0x0109ac74: 0x109ac74: addiu s0, s0, 2
+// 0x0109b2bc: 0x109b2bc: addiu s0, s0, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x0109ac78: 0x109ac78: addiu s2, s2, 2
+// 0x0109b2c0: 0x109b2c0: addiu s2, s2, 2
 	ldloc 12
 	ldc.i4.2
 	add
 	stloc 12
-L_109ac7c:
-// 0x0109ac7c: 0x109ac7c: addu  a0, s1, zero
+L_109b2c4:
+// 0x0109b2c4: 0x109b2c4: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0109ac80: 0x109ac80: addu  a1, s7, zero
+// 0x0109b2c8: 0x109b2c8: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x0109ac84: 0x109ac84: addu  a2, s8, zero
+// 0x0109b2cc: 0x109b2cc: addu  a2, s8, zero
 	ldloc 16
 	stloc.3
-// 0x0109ac88: 0x109ac88: sw    s3, 32(sp)
+// 0x0109b2d0: 0x109b2d0: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4502,7 +4502,7 @@ L_109ac7c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109ac8c: 0x109ac8c: jal   0x1099350 sw    s4, 36(sp)
+// 0x0109b2d4: 0x109b2d4: jal   0x1099998 sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4516,35 +4516,35 @@ L_109ac7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x0109ac94: 0x109ac94: addu  v1, s6, zero
+// 0x0109b2dc: 0x109b2dc: addu  v1, s6, zero
 	ldloc 14
 	stloc 6
-// 0x0109ac98: 0x109ac98: addu  v0, zero, zero
+// 0x0109b2e0: 0x109b2e0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0109ac9c: 0x109ac9c: addu  s6, zero, zero
+// 0x0109b2e4: 0x109b2e4: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x0109aca0: 0x109aca0: addu  a3, zero, zero
+// 0x0109b2e8: 0x109b2e8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109aca4: 0x109aca4: sll   a0, v0, 2
+// 0x0109b2ec: 0x109b2ec: sll   a0, v0, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.1
-L_109aca8:
-// 0x0109aca8: 0x109aca8: addu  a0, s7, a0
+L_109b2f0:
+// 0x0109b2f0: 0x109b2f0: addu  a0, s7, a0
 	ldloc 15
 	ldloc.1
 	add
 	stloc.1
-// 0x0109acac: 0x109acac: sw    s1, 16(a0)
+// 0x0109b2f4: 0x109b2f4: sw    s1, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4553,7 +4553,7 @@ L_109aca8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109acb0: 0x109acb0: lw    a0, 24(sp)
+// 0x0109b2f8: 0x109b2f8: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4562,20 +4562,20 @@ L_109aca8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109acb4: 0x109acb4: addiu v0, v0, 1
+// 0x0109b2fc: 0x109b2fc: addiu v0, v0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0109acb8: 0x109acb8: beq   s6, zero, 0x109acd8 addu  a3, a3, a0
+// 0x0109b300: 0x109b300: beq   s6, zero, 0x109b320 addu  a3, a3, a0
 	ldloc 14
 	ldloc 4
 	ldloc.1
 	add
 	stloc 4
-	brfalse L_109acd8
+	brfalse L_109b320
 // --- basic block ---
-// 0x0109acc0: 0x109acc0: lw    a0, 48(s6)
+// 0x0109b308: 0x109b308: lw    a0, 48(s6)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -4584,23 +4584,23 @@ L_109aca8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109acc4: 0x109acc4: sll   zero, zero, 0
-// 0x0109acc8: 0x109acc8: andi  a0, a0, 128
+// 0x0109b30c: 0x109b30c: sll   zero, zero, 0
+// 0x0109b310: 0x109b310: andi  a0, a0, 128
 	ldloc.1
 	ldc.i4 128
 	and
 	stloc.1
-// 0x0109accc: 0x109accc: beq   a0, zero, 0x109acd8 sll   zero, zero, 0
+// 0x0109b314: 0x109b314: beq   a0, zero, 0x109b320 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109acd8
+	brfalse L_109b320
 // --- basic block ---
-// 0x0109acd4: 0x109acd4: addiu a3, a3, 2
+// 0x0109b31c: 0x109b31c: addiu a3, a3, 2
 	ldloc 4
 	ldc.i4.2
 	add
 	stloc 4
-L_109acd8:
-// 0x0109acd8: 0x109acd8: lw    a0, 48(s1)
+L_109b320:
+// 0x0109b320: 0x109b320: lw    a0, 48(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4609,25 +4609,25 @@ L_109acd8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109acdc: 0x109acdc: sll   zero, zero, 0
-// 0x0109ace0: 0x109ace0: andi  a0, a0, 8
+// 0x0109b324: 0x109b324: sll   zero, zero, 0
+// 0x0109b328: 0x109b328: andi  a0, a0, 8
 	ldloc.1
 	ldc.i4.8
 	and
 	stloc.1
-// 0x0109ace4: 0x109ace4: beq   a0, zero, 0x109ad3c addu  s6, s1, zero
+// 0x0109b32c: 0x109b32c: beq   a0, zero, 0x109b384 addu  s6, s1, zero
 	ldloc.1
 	ldloc 11
 	stloc 14
-	brfalse L_109ad3c
+	brfalse L_109b384
 // --- basic block ---
-// 0x0109acec: 0x109acec: beq   v1, zero, 0x109ad10 addu  a3, s4, zero
+// 0x0109b334: 0x109b334: beq   v1, zero, 0x109b358 addu  a3, s4, zero
 	ldloc 6
 	ldloc 8
 	stloc 4
-	brfalse L_109ad10
+	brfalse L_109b358
 // --- basic block ---
-// 0x0109acf4: 0x109acf4: lw    v1, 48(v1)
+// 0x0109b33c: 0x109b33c: lw    v1, 48(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4636,40 +4636,40 @@ L_109acd8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109acf8: 0x109acf8: sll   zero, zero, 0
-// 0x0109acfc: 0x109acfc: andi  v1, v1, 128
+// 0x0109b340: 0x109b340: sll   zero, zero, 0
+// 0x0109b344: 0x109b344: andi  v1, v1, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x0109ad00: 0x109ad00: beq   v1, zero, 0x109ad14 addu  a1, v0, zero
+// 0x0109b348: 0x109b348: beq   v1, zero, 0x109b35c addu  a1, v0, zero
 	ldloc 6
 	ldloc 9
 	stloc.2
-	brfalse L_109ad14
+	brfalse L_109b35c
 // --- basic block ---
-// 0x0109ad08: 0x109ad08: addiu s0, s0, 2
+// 0x0109b350: 0x109b350: addiu s0, s0, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x0109ad0c: 0x109ad0c: addu  a3, s4, zero
+// 0x0109b354: 0x109b354: addu  a3, s4, zero
 	ldloc 8
 	stloc 4
-L_109ad10:
-// 0x0109ad10: 0x109ad10: addu  a1, v0, zero
+L_109b358:
+// 0x0109b358: 0x109b358: addu  a1, v0, zero
 	ldloc 9
 	stloc.2
-L_109ad14:
-// 0x0109ad14: 0x109ad14: addiu a0, sp, 40
+L_109b35c:
+// 0x0109b35c: 0x109b35c: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0109ad18: 0x109ad18: addu  a2, s3, zero
+// 0x0109b360: 0x109b360: addu  a2, s3, zero
 	ldloc 7
 	stloc.3
-// 0x0109ad1c: 0x109ad1c: sw    s0, 20(sp)
+// 0x0109b364: 0x109b364: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4678,7 +4678,7 @@ L_109ad14:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109ad20: 0x109ad20: jal   0x109a588 sw    s2, 16(sp)
+// 0x0109b368: 0x109b368: jal   0x109abd0 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4692,30 +4692,30 @@ L_109ad14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_row_109a588(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_row_109abd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x0109ad28: 0x109ad28: addu  s0, s0, v0
+// 0x0109b370: 0x109b370: addu  s0, s0, v0
 	ldloc 10
 	ldloc 9
 	add
 	stloc 10
-// 0x0109ad2c: 0x109ad2c: addu  v1, s1, zero
+// 0x0109b374: 0x109b374: addu  v1, s1, zero
 	ldloc 11
 	stloc 6
-// 0x0109ad30: 0x109ad30: addu  v0, zero, zero
+// 0x0109b378: 0x109b378: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0109ad34: 0x109ad34: addu  a3, zero, zero
+// 0x0109b37c: 0x109b37c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109ad38: 0x109ad38: addu  s6, s1, zero
+// 0x0109b380: 0x109b380: addu  s6, s1, zero
 	ldloc 11
 	stloc 14
-L_109ad3c:
-// 0x0109ad3c: 0x109ad3c: lw    s1, 8(s1)
+L_109b384:
+// 0x0109b384: 0x109b384: lw    s1, 8(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4724,23 +4724,23 @@ L_109ad3c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109ad40: 0x109ad40: sll   zero, zero, 0
-L_109ad44:
-// 0x0109ad44: 0x109ad44: bne   s1, zero, 0x109ab30 sll   zero, zero, 0
+// 0x0109b388: 0x109b388: sll   zero, zero, 0
+L_109b38c:
+// 0x0109b38c: 0x109b38c: bne   s1, zero, 0x109b178 sll   zero, zero, 0
 	ldloc 11
-	brtrue L_109ab30
+	brtrue L_109b178
 // --- basic block ---
-// 0x0109ad4c: 0x109ad4c: beq   v0, zero, 0x109ad90 sll   zero, zero, 0
+// 0x0109b394: 0x109b394: beq   v0, zero, 0x109b3d8 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_109ad90
+	brfalse L_109b3d8
 // --- basic block ---
-// 0x0109ad54: 0x109ad54: beq   v1, zero, 0x109ad78 addu  a1, v0, zero
+// 0x0109b39c: 0x109b39c: beq   v1, zero, 0x109b3c0 addu  a1, v0, zero
 	ldloc 6
 	ldloc 9
 	stloc.2
-	brfalse L_109ad78
+	brfalse L_109b3c0
 // --- basic block ---
-// 0x0109ad5c: 0x109ad5c: lw    v1, 48(v1)
+// 0x0109b3a4: 0x109b3a4: lw    v1, 48(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4749,40 +4749,40 @@ L_109ad44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ad60: 0x109ad60: sll   zero, zero, 0
-// 0x0109ad64: 0x109ad64: andi  v1, v1, 128
+// 0x0109b3a8: 0x109b3a8: sll   zero, zero, 0
+// 0x0109b3ac: 0x109b3ac: andi  v1, v1, 128
 	ldloc 6
 	ldc.i4 128
 	and
 	stloc 6
-// 0x0109ad68: 0x109ad68: beq   v1, zero, 0x109ad7c addu  a2, s3, zero
+// 0x0109b3b0: 0x109b3b0: beq   v1, zero, 0x109b3c4 addu  a2, s3, zero
 	ldloc 6
 	ldloc 7
 	stloc.3
-	brfalse L_109ad7c
+	brfalse L_109b3c4
 // --- basic block ---
-// 0x0109ad70: 0x109ad70: addiu s0, s0, 2
+// 0x0109b3b8: 0x109b3b8: addiu s0, s0, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x0109ad74: 0x109ad74: addu  a1, v0, zero
+// 0x0109b3bc: 0x109b3bc: addu  a1, v0, zero
 	ldloc 9
 	stloc.2
-L_109ad78:
-// 0x0109ad78: 0x109ad78: addu  a2, s3, zero
+L_109b3c0:
+// 0x0109b3c0: 0x109b3c0: addu  a2, s3, zero
 	ldloc 7
 	stloc.3
-L_109ad7c:
-// 0x0109ad7c: 0x109ad7c: addu  a3, s4, zero
+L_109b3c4:
+// 0x0109b3c4: 0x109b3c4: addu  a3, s4, zero
 	ldloc 8
 	stloc 4
-// 0x0109ad80: 0x109ad80: addiu a0, sp, 40
+// 0x0109b3c8: 0x109b3c8: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0109ad84: 0x109ad84: sw    s2, 16(sp)
+// 0x0109b3cc: 0x109b3cc: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4791,7 +4791,7 @@ L_109ad7c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109ad88: 0x109ad88: jal   0x109a588 sw    s0, 20(sp)
+// 0x0109b3d0: 0x109b3d0: jal   0x109abd0 sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4805,14 +4805,14 @@ L_109ad7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_row_109a588(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_row_109abd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 9
 // --- basic block ---
-L_109ad90:
-// 0x0109ad90: 0x109ad90: lw    ra, 492(sp)
-// 0x0109ad94: 0x109ad94: lw    s8, 488(sp)
+L_109b3d8:
+// 0x0109b3d8: 0x109b3d8: lw    ra, 492(sp)
+// 0x0109b3dc: 0x109b3dc: lw    s8, 488(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4821,7 +4821,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109ad98: 0x109ad98: lw    s7, 484(sp)
+// 0x0109b3e0: 0x109b3e0: lw    s7, 484(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4830,7 +4830,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109ad9c: 0x109ad9c: lw    s6, 480(sp)
+// 0x0109b3e4: 0x109b3e4: lw    s6, 480(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4839,7 +4839,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109ada0: 0x109ada0: lw    s5, 476(sp)
+// 0x0109b3e8: 0x109b3e8: lw    s5, 476(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4848,7 +4848,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109ada4: 0x109ada4: lw    s4, 472(sp)
+// 0x0109b3ec: 0x109b3ec: lw    s4, 472(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4857,7 +4857,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ada8: 0x109ada8: lw    s3, 468(sp)
+// 0x0109b3f0: 0x109b3f0: lw    s3, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4866,7 +4866,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109adac: 0x109adac: lw    s2, 464(sp)
+// 0x0109b3f4: 0x109b3f4: lw    s2, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4875,7 +4875,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109adb0: 0x109adb0: lw    s1, 460(sp)
+// 0x0109b3f8: 0x109b3f8: lw    s1, 460(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4884,7 +4884,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109adb4: 0x109adb4: lw    s0, 456(sp)
+// 0x0109b3fc: 0x109b3fc: lw    s0, 456(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4893,7 +4893,7 @@ L_109ad90:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109adb8: 0x109adb8: jr    ra addiu sp, sp, 496
+// 0x0109b400: 0x109b400: jr    ra addiu sp, sp, 496
 	ldloc.0
 	ldc.i4 496
 	add
@@ -4905,7 +4905,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 ssd_widget_draw_109adc0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_draw_109b408(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4940,50 +4940,50 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109adc0: 0x109adc0: addiu sp, sp, -24
+// 0x0109b408: 0x109b408: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109adc4: 0x109adc4: andi  a2, a2, 32
+// 0x0109b40c: 0x109b40c: andi  a2, a2, 32
 	ldloc.3
 	ldc.i4.s 32
 	and
 	stloc.3
-// 0x0109adc8: 0x109adc8: beq   a2, zero, 0x109ade0 sw    ra, 20(sp)
+// 0x0109b410: 0x109b410: beq   a2, zero, 0x109b428 sw    ra, 20(sp)
 	ldloc.3
-	brfalse L_109ade0
+	brfalse L_109b428
 // --- basic block ---
-// 0x0109add0: 0x109add0: jal   0x109af20 sll   zero, zero, 0
+// 0x0109b418: 0x109b418: jal   0x109b568 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_grid_109af20(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_grid_109b568(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109add8: 0x109add8: j	 0x109ade8 sll   zero, zero, 0
-	br L_109ade8
+// 0x0109b420: 0x109b420: j	 0x109b430 sll   zero, zero, 0
+	br L_109b430
 // --- basic block ---
-L_109ade0:
-// 0x0109ade0: 0x109ade0: jal   0x109aac0 sll   zero, zero, 0
+L_109b428:
+// 0x0109b428: 0x109b428: jal   0x109b108 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_pack_109aac0(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_pack_109b108(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_109ade8:
-// 0x0109ade8: 0x109ade8: lw    ra, 20(sp)
-// 0x0109adec: 0x109adec: sll   zero, zero, 0
-// 0x0109adf0: 0x109adf0: jr    ra addiu sp, sp, 24
+L_109b430:
+// 0x0109b430: 0x109b430: lw    ra, 20(sp)
+// 0x0109b434: 0x109b434: sll   zero, zero, 0
+// 0x0109b438: 0x109b438: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4995,7 +4995,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra,int32 lo)
@@ -5042,12 +5042,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109adf8: 0x109adf8: addiu sp, sp, -64
+// 0x0109b440: 0x109b440: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0109adfc: 0x109adfc: sw    s2, 56(sp)
+// 0x0109b444: 0x109b444: sw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5056,7 +5056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109ae00: 0x109ae00: sw    s1, 52(sp)
+// 0x0109b448: 0x109b448: sw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5065,7 +5065,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109ae04: 0x109ae04: sw    s0, 48(sp)
+// 0x0109b44c: 0x109b44c: sw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5074,21 +5074,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109ae08: 0x109ae08: addu  s2, a1, zero
+// 0x0109b450: 0x109b450: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109ae0c: 0x109ae0c: addu  s0, a0, zero
+// 0x0109b454: 0x109b454: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109ae10: 0x109ae10: addu  s1, a2, zero
+// 0x0109b458: 0x109b458: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0109ae14: 0x109ae14: addiu a1, sp, 16
+// 0x0109b45c: 0x109b45c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0109ae18: 0x109ae18: sw    a3, 40(sp)
+// 0x0109b460: 0x109b460: sw    a3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5097,8 +5097,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109ae1c: 0x109ae1c: sw    ra, 60(sp)
-// 0x0109ae20: 0x109ae20: jal   0x1099350 addu  a2, zero, zero
+// 0x0109b464: 0x109b464: sw    ra, 60(sp)
+// 0x0109b468: 0x109b468: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5106,12 +5106,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109ae28: 0x109ae28: lw    v0, 48(s0)
+// 0x0109b470: 0x109b470: lw    v0, 48(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5120,7 +5120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ae2c: 0x109ae2c: lw    a3, 40(sp)
+// 0x0109b474: 0x109b474: lw    a3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5129,18 +5129,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109ae30: 0x109ae30: andi  v0, v0, 16
+// 0x0109b478: 0x109b478: andi  v0, v0, 16
 	ldloc 6
 	ldc.i4.s 16
 	and
 	stloc 6
-// 0x0109ae34: 0x109ae34: beq   v0, zero, 0x109ae54 addiu v1, zero, 2
+// 0x0109b47c: 0x109b47c: beq   v0, zero, 0x109b49c addiu v1, zero, 2
 	ldloc 6
 	ldc.i4.2
 	stloc 7
-	brfalse L_109ae54
+	brfalse L_109b49c
 // --- basic block ---
-// 0x0109ae3c: 0x109ae3c: lw    v0, 20(sp)
+// 0x0109b484: 0x109b484: lw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5149,27 +5149,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ae40: 0x109ae40: sll   zero, zero, 0
-// 0x0109ae44: 0x109ae44: subu  a3, a3, v0
+// 0x0109b488: 0x109b488: sll   zero, zero, 0
+// 0x0109b48c: 0x109b48c: subu  a3, a3, v0
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 4
-// 0x0109ae48: 0x109ae48: div   a3, v1
+// 0x0109b490: 0x109b490: div   a3, v1
 	ldloc 4
 	ldloc 7
 	div
 	stloc 12
-// 0x0109ae4c: 0x109ae4c: mflo  lo
+// 0x0109b494: 0x109b494: mflo  lo
 	ldloc 12
 	stloc 4
-// 0x0109ae50: 0x109ae50: addu  s1, s1, a3
+// 0x0109b498: 0x109b498: addu  s1, s1, a3
 	ldloc 8
 	ldloc 4
 	add
 	stloc 8
-L_109ae54:
-// 0x0109ae54: 0x109ae54: lw    v0, 16(sp)
+L_109b49c:
+// 0x0109b49c: 0x109b49c: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5178,7 +5178,7 @@ L_109ae54:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ae58: 0x109ae58: sw    s2, 120(s0)
+// 0x0109b4a0: 0x109b4a0: sw    s2, 120(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5187,7 +5187,7 @@ L_109ae54:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109ae5c: 0x109ae5c: beq   v0, zero, 0x109af08 sw    s1, 124(s0)
+// 0x0109b4a4: 0x109b4a4: beq   v0, zero, 0x109b550 sw    s1, 124(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 9
@@ -5197,9 +5197,9 @@ L_109ae54:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_109af08
+	brfalse L_109b550
 // --- basic block ---
-// 0x0109ae64: 0x109ae64: lw    v1, 20(sp)
+// 0x0109b4ac: 0x109b4ac: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5208,43 +5208,43 @@ L_109ae54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ae68: 0x109ae68: sll   zero, zero, 0
-// 0x0109ae6c: 0x109ae6c: beq   v1, zero, 0x109af08 lui   a0, 0x80000
+// 0x0109b4b0: 0x109b4b0: sll   zero, zero, 0
+// 0x0109b4b4: 0x109b4b4: beq   v1, zero, 0x109b550 lui   a0, 0x80000
 	ldloc 7
 	ldc.i4 524288
 	stloc.1
-	brfalse L_109af08
+	brfalse L_109b550
 // --- basic block ---
-// 0x0109ae74: 0x109ae74: addiu v0, v0, -1
+// 0x0109b4bc: 0x109b4bc: addiu v0, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0109ae78: 0x109ae78: addiu v1, v1, -1
+// 0x0109b4c0: 0x109b4c0: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0109ae7c: 0x109ae7c: lw    a0, 9812(a0)
+// 0x0109b4c4: 0x109b4c4: lw    a0, 10276(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2453
+	ldc.i4 2569
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ae80: 0x109ae80: addu  v0, v0, s2
+// 0x0109b4c8: 0x109b4c8: addu  v0, v0, s2
 	ldloc 6
 	ldloc 10
 	add
 	stloc 6
-// 0x0109ae84: 0x109ae84: addu  v1, v1, s1
+// 0x0109b4cc: 0x109b4cc: addu  v1, v1, s1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 7
-// 0x0109ae88: 0x109ae88: sw    s2, 24(sp)
+// 0x0109b4d0: 0x109b4d0: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5253,7 +5253,7 @@ L_109ae54:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109ae8c: 0x109ae8c: sw    s1, 28(sp)
+// 0x0109b4d4: 0x109b4d4: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5262,7 +5262,7 @@ L_109ae54:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109ae90: 0x109ae90: sw    v0, 32(sp)
+// 0x0109b4d8: 0x109b4d8: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5271,7 +5271,7 @@ L_109ae54:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109ae94: 0x109ae94: bne   a0, zero, 0x109aecc sw    v1, 36(sp)
+// 0x0109b4dc: 0x109b4dc: bne   a0, zero, 0x109b514 sw    v1, 36(sp)
 	ldloc.1
 	ldloc 5
 	ldloc.0
@@ -5281,62 +5281,62 @@ L_109ae54:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_109aecc
+	brtrue L_109b514
 // --- basic block ---
-// 0x0109ae9c: 0x109ae9c: lui   a0, 0xf0000
+// 0x0109b4e4: 0x109b4e4: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0109aea0: 0x109aea0: lui   a1, 0xf0000
+// 0x0109b4e8: 0x109b4e8: lui   a1, 0xf0000
 	ldc.i4 983040
 	stloc.2
-// 0x0109aea4: 0x109aea4: lw    a0, -30068(a0)
+// 0x0109b4ec: 0x109b4ec: lw    a0, -29604(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109aea8: 0x109aea8: lw    a1, -30072(a1)
+// 0x0109b4f0: 0x109b4f0: lw    a1, -29608(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109aeac: 0x109aeac: blez  v1, 0x109aecc slt   s1, a1, s1
+// 0x0109b4f4: 0x109b4f4: blez  v1, 0x109b514 slt   s1, a1, s1
 	ldloc 7
 	ldloc.2
 	ldloc 8
 	clt
 	stloc 8
 	ldc.i4.s 0
-	ble L_109aecc
+	ble L_109b514
 // --- basic block ---
-// 0x0109aeb4: 0x109aeb4: bne   s1, zero, 0x109aecc sll   zero, zero, 0
+// 0x0109b4fc: 0x109b4fc: bne   s1, zero, 0x109b514 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_109aecc
+	brtrue L_109b514
 // --- basic block ---
-// 0x0109aebc: 0x109aebc: blez  v0, 0x109aecc slt   s2, a0, s2
+// 0x0109b504: 0x109b504: blez  v0, 0x109b514 slt   s2, a0, s2
 	ldloc 6
 	ldloc.1
 	ldloc 10
 	clt
 	stloc 10
 	ldc.i4.s 0
-	ble L_109aecc
+	ble L_109b514
 // --- basic block ---
-// 0x0109aec4: 0x109aec4: beq   s2, zero, 0x109aef0 addu  a0, s0, zero
+// 0x0109b50c: 0x109b50c: beq   s2, zero, 0x109b538 addu  a0, s0, zero
 	ldloc 10
 	ldloc 9
 	stloc.1
-	brfalse L_109aef0
+	brfalse L_109b538
 // --- basic block ---
-L_109aecc:
-// 0x0109aecc: 0x109aecc: lw    a0, 12(s0)
+L_109b514:
+// 0x0109b514: 0x109b514: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5345,12 +5345,12 @@ L_109aecc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109aed0: 0x109aed0: sll   zero, zero, 0
-// 0x0109aed4: 0x109aed4: beq   a0, zero, 0x109af08 sll   zero, zero, 0
+// 0x0109b518: 0x109b518: sll   zero, zero, 0
+// 0x0109b51c: 0x109b51c: beq   a0, zero, 0x109b550 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109af08
+	brfalse L_109b550
 // --- basic block ---
-// 0x0109aedc: 0x109aedc: lw    a2, 48(s0)
+// 0x0109b524: 0x109b524: lw    a2, 48(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5359,7 +5359,7 @@ L_109aecc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109aee0: 0x109aee0: jal   0x109adc0 addiu a1, sp, 24
+// 0x0109b528: 0x109b528: jal   0x109b408 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5369,16 +5369,16 @@ L_109aecc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_109adc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_109b408(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109aee8: 0x109aee8: j	 0x109af08 sll   zero, zero, 0
-	br L_109af08
+// 0x0109b530: 0x109b530: j	 0x109b550 sll   zero, zero, 0
+	br L_109b550
 // --- basic block ---
-L_109aef0:
-// 0x0109aef0: 0x109aef0: lw    v0, 184(s0)
+L_109b538:
+// 0x0109b538: 0x109b538: lw    v0, 184(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5387,12 +5387,12 @@ L_109aef0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109aef4: 0x109aef4: addiu a1, sp, 24
+// 0x0109b53c: 0x109b53c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0109aef8: 0x109aef8: jalr  v0 addu  a2, zero, zero
+// 0x0109b540: 0x109b540: jalr  v0 addu  a2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.3
@@ -5406,12 +5406,12 @@ L_109aef0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109af00: 0x109af00: j	 0x109aecc sll   zero, zero, 0
-	br L_109aecc
+// 0x0109b548: 0x109b548: j	 0x109b514 sll   zero, zero, 0
+	br L_109b514
 // --- basic block ---
-L_109af08:
-// 0x0109af08: 0x109af08: lw    ra, 60(sp)
-// 0x0109af0c: 0x109af0c: lw    s2, 56(sp)
+L_109b550:
+// 0x0109b550: 0x109b550: lw    ra, 60(sp)
+// 0x0109b554: 0x109b554: lw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5420,7 +5420,7 @@ L_109af08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109af10: 0x109af10: lw    s1, 52(sp)
+// 0x0109b558: 0x109b558: lw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5429,7 +5429,7 @@ L_109af08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109af14: 0x109af14: lw    s0, 48(sp)
+// 0x0109b55c: 0x109b55c: lw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5438,7 +5438,7 @@ L_109af08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109af18: 0x109af18: jr    ra addiu sp, sp, 64
+// 0x0109b560: 0x109b560: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5450,7 +5450,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_draw_grid_109af20(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_draw_grid_109b568(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s3,int32 lo,int32 t0,int32 s1,int32 s2,int32 s4,int32 s0,int32 s5,int32 s8,int32 s7,int32 s6,int32 ra)
@@ -5518,12 +5518,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109af20: 0x109af20: addiu sp, sp, -512
+// 0x0109b568: 0x109b568: addiu sp, sp, -512
 	ldloc.0
 	ldc.i4 -512
 	add
 	stloc.0
-// 0x0109af24: 0x109af24: lw    v0, 12(a1)
+// 0x0109b56c: 0x109b56c: lw    v0, 12(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5532,7 +5532,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109af28: 0x109af28: sw    s8, 504(sp)
+// 0x0109b570: 0x109b570: sw    s8, 504(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5541,7 +5541,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109af2c: 0x109af2c: lw    s8, 8(a1)
+// 0x0109b574: 0x109b574: lw    s8, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5550,14 +5550,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109af30: 0x109af30: lw    v1, 0(a1)
+// 0x0109b578: 0x109b578: lw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109af34: 0x109af34: sw    s6, 496(sp)
+// 0x0109b57c: 0x109b57c: sw    s6, 496(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5566,10 +5566,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0109af38: 0x109af38: addu  s6, a1, zero
+// 0x0109b580: 0x109b580: addu  s6, a1, zero
 	ldloc.2
 	stloc 18
-// 0x0109af3c: 0x109af3c: lw    a1, 4(a1)
+// 0x0109b584: 0x109b584: lw    a1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5578,17 +5578,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109af40: 0x109af40: addiu s8, s8, 1
+// 0x0109b588: 0x109b588: addiu s8, s8, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x0109af44: 0x109af44: addiu v0, v0, 1
+// 0x0109b58c: 0x109b58c: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0109af48: 0x109af48: sw    s7, 500(sp)
+// 0x0109b590: 0x109b590: sw    s7, 500(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5597,22 +5597,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0109af4c: 0x109af4c: subu  s8, s8, v1
+// 0x0109b594: 0x109b594: subu  s8, s8, v1
 	ldloc 16
 	ldloc 7
 	sub
 	stloc 16
-// 0x0109af50: 0x109af50: subu  v0, v0, a1
+// 0x0109b598: 0x109b598: subu  v0, v0, a1
 	ldloc 6
 	ldloc.2
 	sub
 	stloc 6
-// 0x0109af54: 0x109af54: addiu s7, sp, 32
+// 0x0109b59c: 0x109b59c: addiu s7, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 17
-// 0x0109af58: 0x109af58: sw    s4, 488(sp)
+// 0x0109b5a0: 0x109b5a0: sw    s4, 488(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5621,7 +5621,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109af5c: 0x109af5c: sw    s3, 484(sp)
+// 0x0109b5a4: 0x109b5a4: sw    s3, 484(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5630,7 +5630,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109af60: 0x109af60: sw    s2, 480(sp)
+// 0x0109b5a8: 0x109b5a8: sw    s2, 480(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5639,7 +5639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109af64: 0x109af64: sw    s1, 476(sp)
+// 0x0109b5ac: 0x109b5ac: sw    s1, 476(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5648,7 +5648,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109af68: 0x109af68: sw    s0, 472(sp)
+// 0x0109b5b0: 0x109b5b0: sw    s0, 472(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5657,8 +5657,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109af6c: 0x109af6c: sw    ra, 508(sp)
-// 0x0109af70: 0x109af70: sw    s5, 492(sp)
+// 0x0109b5b4: 0x109b5b4: sw    ra, 508(sp)
+// 0x0109b5b8: 0x109b5b8: sw    s5, 492(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5667,7 +5667,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109af74: 0x109af74: sw    a1, 432(sp)
+// 0x0109b5bc: 0x109b5bc: sw    a1, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5676,10 +5676,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109af78: 0x109af78: addu  s1, a0, zero
+// 0x0109b5c0: 0x109b5c0: addu  s1, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0109af7c: 0x109af7c: sw    s8, 16(sp)
+// 0x0109b5c4: 0x109b5c4: sw    s8, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5688,7 +5688,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109af80: 0x109af80: sw    v0, 20(sp)
+// 0x0109b5c8: 0x109b5c8: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5697,22 +5697,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109af84: 0x109af84: addu  s3, s7, zero
+// 0x0109b5cc: 0x109b5cc: addu  s3, s7, zero
 	ldloc 17
 	stloc 8
-// 0x0109af88: 0x109af88: addu  s0, zero, zero
+// 0x0109b5d0: 0x109b5d0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x0109af8c: 0x109af8c: addu  s2, zero, zero
+// 0x0109b5d4: 0x109b5d4: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x0109af90: 0x109af90: j	 0x109b000 addu  s4, zero, zero
+// 0x0109b5d8: 0x109b5d8: j	 0x109b648 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_109b000
+	br L_109b648
 // --- basic block ---
-L_109af98:
-// 0x0109af98: 0x109af98: sw    v0, 464(sp)
+L_109b5e0:
+// 0x0109b5e0: 0x109b5e0: sw    v0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5721,7 +5721,7 @@ L_109af98:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109af9c: 0x109af9c: jal   0x1099350 addiu s0, s0, 1
+// 0x0109b5e4: 0x109b5e4: jal   0x1099998 addiu s0, s0, 1
 	ldloc 14
 	ldc.i4.1
 	add
@@ -5731,22 +5731,22 @@ L_109af98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109afa4: 0x109afa4: addiu a3, zero, 100
+// 0x0109b5ec: 0x109b5ec: addiu a3, zero, 100
 	ldc.i4.s 100
 	stloc 4
-// 0x0109afa8: 0x109afa8: sw    s1, 0(s3)
+// 0x0109b5f0: 0x109b5f0: sw    s1, 0(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x0109afac: 0x109afac: lw    s5, 28(sp)
+// 0x0109b5f4: 0x109b5f4: lw    s5, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5755,7 +5755,7 @@ L_109af98:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109afb0: 0x109afb0: lw    v1, 24(sp)
+// 0x0109b5f8: 0x109b5f8: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5764,7 +5764,7 @@ L_109af98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109afb4: 0x109afb4: lw    v0, 464(sp)
+// 0x0109b5fc: 0x109b5fc: lw    v0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5773,38 +5773,38 @@ L_109af98:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109afb8: 0x109afb8: bne   s0, a3, 0x109afe8 addiu s3, s3, 4
+// 0x0109b600: 0x109b600: bne   s0, a3, 0x109b630 addiu s3, s3, 4
 	ldloc 14
 	ldloc 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	bne.un L_109afe8
+	bne.un L_109b630
 // --- basic block ---
-// 0x0109afc0: 0x109afc0: lui   a1, 0x20000
+// 0x0109b608: 0x109b608: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109afc4: 0x109afc4: lui   a3, 0x20000
+// 0x0109b60c: 0x109b60c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109afc8: 0x109afc8: addiu a0, zero, 5
+// 0x0109b610: 0x109b610: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0109afcc: 0x109afcc: addiu a1, a1, -2792
+// 0x0109b614: 0x109b614: addiu a1, a1, -2328
 	ldloc.2
-	ldc.i4 -2792
+	ldc.i4 -2328
 	add
 	stloc.2
-// 0x0109afd0: 0x109afd0: addiu a2, zero, 497
+// 0x0109b618: 0x109b618: addiu a2, zero, 497
 	ldc.i4 497
 	stloc.3
-// 0x0109afd4: 0x109afd4: addiu a3, a3, -2764
+// 0x0109b61c: 0x109b61c: addiu a3, a3, -2300
 	ldloc 4
-	ldc.i4 -2764
+	ldc.i4 -2300
 	add
 	stloc 4
-// 0x0109afd8: 0x109afd8: jal   0x100449c sw    v1, 468(sp)
+// 0x0109b620: 0x109b620: jal   0x100449c sw    v1, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5823,7 +5823,7 @@ L_109af98:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109afe0: 0x109afe0: lw    v1, 468(sp)
+// 0x0109b628: 0x109b628: lw    v1, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5832,7 +5832,7 @@ L_109af98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109afe4: 0x109afe4: lw    v0, 464(sp)
+// 0x0109b62c: 0x109b62c: lw    v0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5841,21 +5841,21 @@ L_109af98:
 	add
 	ldelem.i4
 	stloc 6
-L_109afe8:
-// 0x0109afe8: 0x109afe8: slt   a0, s4, s5
+L_109b630:
+// 0x0109b630: 0x109b630: slt   a0, s4, s5
 	ldloc 13
 	ldloc 15
 	clt
 	stloc.1
-// 0x0109afec: 0x109afec: beq   a0, zero, 0x109aff8 sll   zero, zero, 0
+// 0x0109b634: 0x109b634: beq   a0, zero, 0x109b640 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109aff8
+	brfalse L_109b640
 // --- basic block ---
-// 0x0109aff4: 0x109aff4: addu  s4, s5, zero
+// 0x0109b63c: 0x109b63c: addu  s4, s5, zero
 	ldloc 15
 	stloc 13
-L_109aff8:
-// 0x0109aff8: 0x109aff8: lw    s1, 8(s1)
+L_109b640:
+// 0x0109b640: 0x109b640: lw    s1, 8(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -5864,179 +5864,179 @@ L_109aff8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109affc: 0x109affc: addu  s2, s2, v1
+// 0x0109b644: 0x109b644: addu  s2, s2, v1
 	ldloc 12
 	ldloc 7
 	add
 	stloc 12
-L_109b000:
-// 0x0109b000: 0x109b000: addu  a0, s1, zero
+L_109b648:
+// 0x0109b648: 0x109b648: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0109b004: 0x109b004: addiu a1, sp, 24
+// 0x0109b64c: 0x109b64c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0109b008: 0x109b008: bne   s1, zero, 0x109af98 addiu a2, sp, 16
+// 0x0109b650: 0x109b650: bne   s1, zero, 0x109b5e0 addiu a2, sp, 16
 	ldloc 11
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-	brtrue L_109af98
+	brtrue L_109b5e0
 // --- basic block ---
-// 0x0109b010: 0x109b010: div   s2, s0
+// 0x0109b658: 0x109b658: div   s2, s0
 	ldloc 12
 	ldloc 14
 	div
 	stloc 9
-// 0x0109b014: 0x109b014: addiu a0, zero, 3
+// 0x0109b65c: 0x109b65c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0109b018: 0x109b018: addiu v1, zero, 5
+// 0x0109b660: 0x109b660: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-// 0x0109b01c: 0x109b01c: addiu s4, s4, 2
+// 0x0109b664: 0x109b664: addiu s4, s4, 2
 	ldloc 13
 	ldc.i4.2
 	add
 	stloc 13
-// 0x0109b020: 0x109b020: mflo  lo
+// 0x0109b668: 0x109b668: mflo  lo
 	ldloc 9
 	stloc 12
-// 0x0109b024: 0x109b024: addiu s2, s2, 1
+// 0x0109b66c: 0x109b66c: addiu s2, s2, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x0109b028: 0x109b028: sll   zero, zero, 0
-// 0x0109b02c: 0x109b02c: mult  s8, a0
+// 0x0109b670: 0x109b670: sll   zero, zero, 0
+// 0x0109b674: 0x109b674: mult  s8, a0
 	ldloc 16
 	ldloc.1
 	mul
 	stloc 9
-// 0x0109b030: 0x109b030: mflo  lo
+// 0x0109b678: 0x109b678: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0109b034: 0x109b034: sll   zero, zero, 0
-// 0x0109b038: 0x109b038: sll   zero, zero, 0
-// 0x0109b03c: 0x109b03c: div   a0, v1
+// 0x0109b67c: 0x109b67c: sll   zero, zero, 0
+// 0x0109b680: 0x109b680: sll   zero, zero, 0
+// 0x0109b684: 0x109b684: div   a0, v1
 	ldloc.1
 	ldloc 7
 	div
 	stloc 9
-// 0x0109b040: 0x109b040: mflo  lo
+// 0x0109b688: 0x109b688: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0109b044: 0x109b044: sll   zero, zero, 0
-// 0x0109b048: 0x109b048: sll   zero, zero, 0
-// 0x0109b04c: 0x109b04c: div   v0, s4
+// 0x0109b68c: 0x109b68c: sll   zero, zero, 0
+// 0x0109b690: 0x109b690: sll   zero, zero, 0
+// 0x0109b694: 0x109b694: div   v0, s4
 	ldloc 6
 	ldloc 13
 	div
 	stloc 9
-// 0x0109b050: 0x109b050: mflo  lo
+// 0x0109b698: 0x109b698: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0109b054: 0x109b054: sll   zero, zero, 0
-// 0x0109b058: 0x109b058: sll   zero, zero, 0
-// 0x0109b05c: 0x109b05c: mult  s2, s0
+// 0x0109b69c: 0x109b69c: sll   zero, zero, 0
+// 0x0109b6a0: 0x109b6a0: sll   zero, zero, 0
+// 0x0109b6a4: 0x109b6a4: mult  s2, s0
 	ldloc 12
 	ldloc 14
 	mul
 	stloc 9
-// 0x0109b060: 0x109b060: mflo  lo
+// 0x0109b6a8: 0x109b6a8: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x0109b064: 0x109b064: j	 0x109b070 slti  a2, a0, 2
+// 0x0109b6ac: 0x109b6ac: j	 0x109b6b8 slti  a2, a0, 2
 	ldloc.1
 	ldc.i4.2
 	clt
 	stloc.3
-	br L_109b070
+	br L_109b6b8
 // --- basic block ---
-L_109b06c:
-// 0x0109b06c: 0x109b06c: slti  a2, a0, 2
+L_109b6b4:
+// 0x0109b6b4: 0x109b6b4: slti  a2, a0, 2
 	ldloc.1
 	ldc.i4.2
 	clt
 	stloc.3
-L_109b070:
-// 0x0109b070: 0x109b070: bne   a2, zero, 0x109b098 addiu a2, zero, 1
+L_109b6b8:
+// 0x0109b6b8: 0x109b6b8: bne   a2, zero, 0x109b6e0 addiu a2, zero, 1
 	ldloc.3
 	ldc.i4.1
 	stloc.3
-	brtrue L_109b098
+	brtrue L_109b6e0
 // --- basic block ---
-// 0x0109b078: 0x109b078: div   a1, a0
+// 0x0109b6c0: 0x109b6c0: div   a1, a0
 	ldloc.2
 	ldloc.1
 	div
 	stloc 9
-// 0x0109b07c: 0x109b07c: mflo  lo
+// 0x0109b6c4: 0x109b6c4: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0109b080: 0x109b080: slt   a2, a3, v1
+// 0x0109b6c8: 0x109b6c8: slt   a2, a3, v1
 	ldloc 4
 	ldloc 7
 	clt
 	stloc.3
-// 0x0109b084: 0x109b084: bne   a2, zero, 0x109b06c addiu a0, a0, -1
+// 0x0109b6cc: 0x109b6cc: bne   a2, zero, 0x109b6b4 addiu a0, a0, -1
 	ldloc.3
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-	brtrue L_109b06c
+	brtrue L_109b6b4
 // --- basic block ---
-// 0x0109b08c: 0x109b08c: addiu a0, a0, 1
+// 0x0109b6d4: 0x109b6d4: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0109b090: 0x109b090: j	 0x109b0b0 addu  v1, a0, zero
+// 0x0109b6d8: 0x109b6d8: j	 0x109b6f8 addu  v1, a0, zero
 	ldloc.1
 	stloc 7
-	br L_109b0b0
+	br L_109b6f8
 // --- basic block ---
-L_109b098:
-// 0x0109b098: 0x109b098: bne   a0, a2, 0x109b0b0 addu  v1, a0, zero
+L_109b6e0:
+// 0x0109b6e0: 0x109b6e0: bne   a0, a2, 0x109b6f8 addu  v1, a0, zero
 	ldloc.1
 	ldloc.3
 	ldloc.1
 	stloc 7
-	bne.un L_109b0b0
+	bne.un L_109b6f8
 // --- basic block ---
-// 0x0109b0a0: 0x109b0a0: slti  a0, s0, 3
+// 0x0109b6e8: 0x109b6e8: slti  a0, s0, 3
 	ldloc 14
 	ldc.i4.3
 	clt
 	stloc.1
-// 0x0109b0a4: 0x109b0a4: bne   a0, zero, 0x109b0b4 mult  v1, s4
+// 0x0109b6ec: 0x109b6ec: bne   a0, zero, 0x109b6fc mult  v1, s4
 	ldloc.1
 	ldloc 7
 	ldloc 13
 	mul
 	stloc 9
-	brtrue L_109b0b4
+	brtrue L_109b6fc
 // --- basic block ---
-// 0x0109b0ac: 0x109b0ac: addiu v1, zero, 2
+// 0x0109b6f4: 0x109b6f4: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-L_109b0b0:
-// 0x0109b0b0: 0x109b0b0: mult  v1, s4
+L_109b6f8:
+// 0x0109b6f8: 0x109b6f8: mult  v1, s4
 	ldloc 7
 	ldloc 13
 	mul
 	stloc 9
-L_109b0b4:
-// 0x0109b0b4: 0x109b0b4: addiu a3, s0, -1
+L_109b6fc:
+// 0x0109b6fc: 0x109b6fc: addiu a3, s0, -1
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 4
-// 0x0109b0b8: 0x109b0b8: sw    a3, 460(sp)
+// 0x0109b700: 0x109b700: sw    a3, 460(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6045,41 +6045,41 @@ L_109b0b4:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109b0bc: 0x109b0bc: addiu a2, v1, 1
+// 0x0109b704: 0x109b704: addiu a2, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0109b0c0: 0x109b0c0: addu  a0, s2, zero
+// 0x0109b708: 0x109b708: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x0109b0c4: 0x109b0c4: addu  s5, zero, zero
+// 0x0109b70c: 0x109b70c: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x0109b0c8: 0x109b0c8: addu  s1, zero, zero
+// 0x0109b710: 0x109b710: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x0109b0cc: 0x109b0cc: addu  s3, zero, zero
+// 0x0109b714: 0x109b714: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0109b0d0: 0x109b0d0: mflo  lo
+// 0x0109b718: 0x109b718: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0109b0d4: 0x109b0d4: subu  v0, v0, a3
+// 0x0109b71c: 0x109b71c: subu  v0, v0, a3
 	ldloc 6
 	ldloc 4
 	sub
 	stloc 6
-// 0x0109b0d8: 0x109b0d8: sll   zero, zero, 0
-// 0x0109b0dc: 0x109b0dc: div   a1, v1
+// 0x0109b720: 0x109b720: sll   zero, zero, 0
+// 0x0109b724: 0x109b724: div   a1, v1
 	ldloc.2
 	ldloc 7
 	div
 	stloc 9
-// 0x0109b0e0: 0x109b0e0: mflo  lo
+// 0x0109b728: 0x109b728: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0109b0e4: 0x109b0e4: sw    a3, 444(sp)
+// 0x0109b72c: 0x109b72c: sw    a3, 444(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6088,16 +6088,16 @@ L_109b0b4:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109b0e8: 0x109b0e8: sll   zero, zero, 0
-// 0x0109b0ec: 0x109b0ec: div   v0, a2
+// 0x0109b730: 0x109b730: sll   zero, zero, 0
+// 0x0109b734: 0x109b734: div   v0, a2
 	ldloc 6
 	ldloc.3
 	div
 	stloc 9
-// 0x0109b0f0: 0x109b0f0: mflo  lo
+// 0x0109b738: 0x109b738: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0109b0f4: 0x109b0f4: jal   0x10c09c0 sw    v1, 448(sp)
+// 0x0109b73c: 0x109b73c: jal   0x10c1000 sw    v1, 448(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6108,36 +6108,36 @@ L_109b0b4:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b0fc: 0x109b0fc: lui   a0, 0x20000
+// 0x0109b744: 0x109b744: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109b100: 0x109b100: lw    a3, 23828(a0)
+// 0x0109b748: 0x109b748: lw    a3, 24292(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5957
+	ldc.i4 6073
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109b104: 0x109b104: lw    a2, 23824(a0)
+// 0x0109b74c: 0x109b74c: lw    a2, 24288(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5956
+	ldc.i4 6072
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b108: 0x109b108: addu  a1, v1, zero
+// 0x0109b750: 0x109b750: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0109b10c: 0x109b10c: jal   0x10c0798 addu  a0, v0, zero
+// 0x0109b754: 0x109b754: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6145,12 +6145,12 @@ L_109b0b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b114: 0x109b114: sw    v0, 452(sp)
+// 0x0109b75c: 0x109b75c: sw    v0, 452(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6159,7 +6159,7 @@ L_109b0b4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109b118: 0x109b118: j	 0x109b2c8 sw    v1, 456(sp)
+// 0x0109b760: 0x109b760: j	 0x109b910 sw    v1, 456(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6168,17 +6168,17 @@ L_109b0b4:
 	add
 	ldloc 7
 	stelem.i4
-	br L_109b2c8
+	br L_109b910
 // --- basic block ---
-L_109b120:
-// 0x0109b120: 0x109b120: lw    a0, 0(s7)
+L_109b768:
+// 0x0109b768: 0x109b768: lw    a0, 0(s7)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109b124: 0x109b124: jal   0x1099350 addiu a1, sp, 24
+// 0x0109b76c: 0x109b76c: jal   0x1099998 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6188,12 +6188,12 @@ L_109b120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b12c: 0x109b12c: lw    a0, 24(sp)
+// 0x0109b774: 0x109b774: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6202,22 +6202,22 @@ L_109b120:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109b130: 0x109b130: jal   0x10c09c0 addu  s3, s3, s2
+// 0x0109b778: 0x109b778: jal   0x10c1000 addu  s3, s3, s2
 	ldloc 8
 	ldloc 12
 	add
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b138: 0x109b138: addu  a0, v0, zero
+// 0x0109b780: 0x109b780: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0109b13c: 0x109b13c: lw    v0, 452(sp)
+// 0x0109b784: 0x109b784: lw    v0, 452(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6226,13 +6226,13 @@ L_109b120:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b140: 0x109b140: addu  a1, v1, zero
+// 0x0109b788: 0x109b788: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0109b144: 0x109b144: addu  a2, v0, zero
+// 0x0109b78c: 0x109b78c: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0109b148: 0x109b148: lw    v0, 456(sp)
+// 0x0109b790: 0x109b790: lw    v0, 456(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6241,7 +6241,7 @@ L_109b120:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b14c: 0x109b14c: jal   0x10c17ac addu  a3, v0, zero
+// 0x0109b794: 0x109b794: jal   0x10c1dec addu  a3, v0, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -6249,23 +6249,23 @@ L_109b120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b154: 0x109b154: blez  v0, 0x109b160 sll   zero, zero, 0
+// 0x0109b79c: 0x109b79c: blez  v0, 0x109b7a8 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	ble L_109b160
+	ble L_109b7a8
 // --- basic block ---
-// 0x0109b15c: 0x109b15c: addu  s3, s3, s2
+// 0x0109b7a4: 0x109b7a4: addu  s3, s3, s2
 	ldloc 8
 	ldloc 12
 	add
 	stloc 8
-L_109b160:
-// 0x0109b160: 0x109b160: lw    a0, 444(sp)
+L_109b7a8:
+// 0x0109b7a8: 0x109b7a8: lw    a0, 444(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6274,21 +6274,21 @@ L_109b160:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109b164: 0x109b164: sll   zero, zero, 0
-// 0x0109b168: 0x109b168: slt   v0, s3, a0
+// 0x0109b7ac: 0x109b7ac: sll   zero, zero, 0
+// 0x0109b7b0: 0x109b7b0: slt   v0, s3, a0
 	ldloc 8
 	ldloc.1
 	clt
 	stloc 6
-// 0x0109b16c: 0x109b16c: beq   v0, zero, 0x109b184 addiu s1, s1, 1
+// 0x0109b7b4: 0x109b7b4: beq   v0, zero, 0x109b7cc addiu s1, s1, 1
 	ldloc 6
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brfalse L_109b184
+	brfalse L_109b7cc
 // --- basic block ---
-// 0x0109b174: 0x109b174: lw    a1, 460(sp)
+// 0x0109b7bc: 0x109b7bc: lw    a1, 460(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6297,46 +6297,46 @@ L_109b160:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109b178: 0x109b178: sll   zero, zero, 0
-// 0x0109b17c: 0x109b17c: bne   s5, a1, 0x109b2c0 sll   zero, zero, 0
+// 0x0109b7c0: 0x109b7c0: sll   zero, zero, 0
+// 0x0109b7c4: 0x109b7c4: bne   s5, a1, 0x109b908 sll   zero, zero, 0
 	ldloc 15
 	ldloc.2
-	bne.un L_109b2c0
+	bne.un L_109b908
 // --- basic block ---
-L_109b184:
-// 0x0109b184: 0x109b184: subu  t0, s5, s1
+L_109b7cc:
+// 0x0109b7cc: 0x109b7cc: subu  t0, s5, s1
 	ldloc 15
 	ldloc 11
 	sub
 	stloc 10
-// 0x0109b188: 0x109b188: addiu t0, t0, 1
+// 0x0109b7d0: 0x109b7d0: addiu t0, t0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0109b18c: 0x109b18c: addiu a3, sp, 32
+// 0x0109b7d4: 0x109b7d4: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x0109b190: 0x109b190: sll   t0, t0, 2
+// 0x0109b7d8: 0x109b7d8: sll   t0, t0, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x0109b194: 0x109b194: addu  t0, a3, t0
+// 0x0109b7dc: 0x109b7dc: addu  t0, a3, t0
 	ldloc 4
 	ldloc 10
 	add
 	stloc 10
-// 0x0109b198: 0x109b198: lw    v0, 0(t0)
+// 0x0109b7e0: 0x109b7e0: lw    v0, 0(t0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109b19c: 0x109b19c: lw    v1, 448(sp)
+// 0x0109b7e4: 0x109b7e4: lw    v1, 448(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6345,7 +6345,7 @@ L_109b184:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b1a0: 0x109b1a0: lw    a0, 4(v0)
+// 0x0109b7e8: 0x109b7e8: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6354,7 +6354,7 @@ L_109b184:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109b1a4: 0x109b1a4: lw    v0, 432(sp)
+// 0x0109b7ec: 0x109b7ec: lw    v0, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6363,7 +6363,7 @@ L_109b184:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b1a8: 0x109b1a8: sw    t0, 464(sp)
+// 0x0109b7f0: 0x109b7f0: sw    t0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6372,19 +6372,19 @@ L_109b184:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109b1ac: 0x109b1ac: addu  v0, v0, v1
+// 0x0109b7f4: 0x109b7f4: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0109b1b0: 0x109b1b0: lw    s3, 0(s6)
+// 0x0109b7f8: 0x109b7f8: lw    s3, 0(s6)
 	ldloc 5
 	ldloc 18
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0109b1b4: 0x109b1b4: jal   0x109a424 sw    v0, 432(sp)
+// 0x0109b7fc: 0x109b7fc: jal   0x109aa6c sw    v0, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6398,17 +6398,17 @@ L_109b184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b1bc: 0x109b1bc: mult  s1, s2
+// 0x0109b804: 0x109b804: mult  s1, s2
 	ldloc 11
 	ldloc 12
 	mul
 	stloc 9
-// 0x0109b1c0: 0x109b1c0: lw    t0, 464(sp)
+// 0x0109b808: 0x109b808: lw    t0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6417,20 +6417,20 @@ L_109b184:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109b1c4: 0x109b1c4: addiu v1, s1, 1
+// 0x0109b80c: 0x109b80c: addiu v1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109b1c8: 0x109b1c8: lw    a0, 0(t0)
+// 0x0109b810: 0x109b810: lw    a0, 0(t0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109b1cc: 0x109b1cc: sll   zero, zero, 0
-// 0x0109b1d0: 0x109b1d0: lw    a0, 48(a0)
+// 0x0109b814: 0x109b814: sll   zero, zero, 0
+// 0x0109b818: 0x109b818: lw    a0, 48(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6439,27 +6439,27 @@ L_109b184:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109b1d4: 0x109b1d4: sll   zero, zero, 0
-// 0x0109b1d8: 0x109b1d8: andi  a0, a0, 1024
+// 0x0109b81c: 0x109b81c: sll   zero, zero, 0
+// 0x0109b820: 0x109b820: andi  a0, a0, 1024
 	ldloc.1
 	ldc.i4 1024
 	and
 	stloc.1
-// 0x0109b1dc: 0x109b1dc: sltiu a0, a0, 1
+// 0x0109b824: 0x109b824: sltiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
 	stloc.1
-// 0x0109b1e0: 0x109b1e0: subu  a0, zero, a0
+// 0x0109b828: 0x109b828: subu  a0, zero, a0
 	ldloc.1
 	neg
 	stloc.1
-// 0x0109b1e4: 0x109b1e4: and   a0, v0, a0
+// 0x0109b82c: 0x109b82c: and   a0, v0, a0
 	ldloc 6
 	ldloc.1
 	and
 	stloc.1
-// 0x0109b1e8: 0x109b1e8: sw    a0, 436(sp)
+// 0x0109b830: 0x109b830: sw    a0, 436(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6468,10 +6468,10 @@ L_109b184:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109b1ec: 0x109b1ec: mflo  lo
+// 0x0109b834: 0x109b834: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0109b1f0: 0x109b1f0: lw    a1, 436(sp)
+// 0x0109b838: 0x109b838: lw    a1, 436(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6480,20 +6480,20 @@ L_109b184:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109b1f4: 0x109b1f4: subu  v0, s8, a0
+// 0x0109b83c: 0x109b83c: subu  v0, s8, a0
 	ldloc 16
 	ldloc.1
 	sub
 	stloc 6
-// 0x0109b1f8: 0x109b1f8: div   v0, v1
+// 0x0109b840: 0x109b840: div   v0, v1
 	ldloc 6
 	ldloc 7
 	div
 	stloc 9
-// 0x0109b1fc: 0x109b1fc: mflo  lo
+// 0x0109b844: 0x109b844: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0109b200: 0x109b200: beq   a1, zero, 0x109b20c sw    a0, 440(sp)
+// 0x0109b848: 0x109b848: beq   a1, zero, 0x109b854 sw    a0, 440(sp)
 	ldloc.2
 	ldloc 5
 	ldloc.0
@@ -6503,19 +6503,19 @@ L_109b184:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_109b20c
+	brfalse L_109b854
 // --- basic block ---
-// 0x0109b208: 0x109b208: addu  s3, s3, s8
+// 0x0109b850: 0x109b850: addu  s3, s3, s8
 	ldloc 8
 	ldloc 16
 	add
 	stloc 8
-L_109b20c:
-// 0x0109b20c: 0x109b20c: addu  v1, zero, zero
+L_109b854:
+// 0x0109b854: 0x109b854: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_109b210:
-// 0x0109b210: 0x109b210: lw    a3, 440(sp)
+L_109b858:
+// 0x0109b858: 0x109b858: lw    a3, 440(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6524,7 +6524,7 @@ L_109b210:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109b214: 0x109b214: lw    a1, 436(sp)
+// 0x0109b85c: 0x109b85c: lw    a1, 436(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6533,30 +6533,30 @@ L_109b210:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109b218: 0x109b218: subu  v0, s3, a3
+// 0x0109b860: 0x109b860: subu  v0, s3, a3
 	ldloc 8
 	ldloc 4
 	sub
 	stloc 6
-// 0x0109b21c: 0x109b21c: subu  v0, v0, s2
+// 0x0109b864: 0x109b864: subu  v0, v0, s2
 	ldloc 6
 	ldloc 12
 	sub
 	stloc 6
-// 0x0109b220: 0x109b220: lw    a0, 0(t0)
+// 0x0109b868: 0x109b868: lw    a0, 0(t0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109b224: 0x109b224: beq   a1, zero, 0x109b260 addu  a3, s4, zero
+// 0x0109b86c: 0x109b86c: beq   a1, zero, 0x109b8a8 addu  a3, s4, zero
 	ldloc.2
 	ldloc 13
 	stloc 4
-	brfalse L_109b260
+	brfalse L_109b8a8
 // --- basic block ---
-// 0x0109b22c: 0x109b22c: lw    s3, 40(a0)
+// 0x0109b874: 0x109b874: lw    s3, 40(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6565,7 +6565,7 @@ L_109b210:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109b230: 0x109b230: lw    a2, 44(a0)
+// 0x0109b878: 0x109b878: lw    a2, 44(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6574,12 +6574,12 @@ L_109b210:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b234: 0x109b234: subu  s3, v0, s3
+// 0x0109b87c: 0x109b87c: subu  s3, v0, s3
 	ldloc 6
 	ldloc 8
 	sub
 	stloc 8
-// 0x0109b238: 0x109b238: lw    v0, 432(sp)
+// 0x0109b880: 0x109b880: lw    v0, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6588,15 +6588,15 @@ L_109b210:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b23c: 0x109b23c: addu  a1, s3, zero
+// 0x0109b884: 0x109b884: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x0109b240: 0x109b240: addu  a2, v0, a2
+// 0x0109b888: 0x109b888: addu  a2, v0, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc.3
-// 0x0109b244: 0x109b244: sw    v1, 468(sp)
+// 0x0109b88c: 0x109b88c: sw    v1, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6605,7 +6605,7 @@ L_109b210:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109b248: 0x109b248: jal   0x109adf8 sw    t0, 464(sp)
+// 0x0109b890: 0x109b890: jal   0x109b440 sw    t0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6619,12 +6619,12 @@ L_109b210:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b250: 0x109b250: lw    v1, 468(sp)
+// 0x0109b898: 0x109b898: lw    v1, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6633,7 +6633,7 @@ L_109b210:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b254: 0x109b254: lw    t0, 464(sp)
+// 0x0109b89c: 0x109b89c: lw    t0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6642,15 +6642,15 @@ L_109b210:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109b258: 0x109b258: j	 0x109b2a0 addiu v1, v1, 1
+// 0x0109b8a0: 0x109b8a0: j	 0x109b8e8 addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_109b2a0
+	br L_109b8e8
 // --- basic block ---
-L_109b260:
-// 0x0109b260: 0x109b260: lw    a1, 440(sp)
+L_109b8a8:
+// 0x0109b8a8: 0x109b8a8: lw    a1, 440(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6659,7 +6659,7 @@ L_109b260:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109b264: 0x109b264: lw    v0, 40(a0)
+// 0x0109b8ac: 0x109b8ac: lw    v0, 40(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6668,7 +6668,7 @@ L_109b260:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b268: 0x109b268: lw    a3, 432(sp)
+// 0x0109b8b0: 0x109b8b0: lw    a3, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6677,12 +6677,12 @@ L_109b260:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109b26c: 0x109b26c: addu  v0, a1, v0
+// 0x0109b8b4: 0x109b8b4: addu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x0109b270: 0x109b270: lw    a2, 44(a0)
+// 0x0109b8b8: 0x109b8b8: lw    a2, 44(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6691,23 +6691,23 @@ L_109b260:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b274: 0x109b274: addu  s3, v0, s3
+// 0x0109b8bc: 0x109b8bc: addu  s3, v0, s3
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x0109b278: 0x109b278: addu  a2, a3, a2
+// 0x0109b8c0: 0x109b8c0: addu  a2, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x0109b27c: 0x109b27c: addu  a1, s3, zero
+// 0x0109b8c4: 0x109b8c4: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x0109b280: 0x109b280: addu  a3, s4, zero
+// 0x0109b8c8: 0x109b8c8: addu  a3, s4, zero
 	ldloc 13
 	stloc 4
-// 0x0109b284: 0x109b284: sw    v1, 468(sp)
+// 0x0109b8cc: 0x109b8cc: sw    v1, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6716,7 +6716,7 @@ L_109b260:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109b288: 0x109b288: jal   0x109adf8 sw    t0, 464(sp)
+// 0x0109b8d0: 0x109b8d0: jal   0x109b440 sw    t0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6730,12 +6730,12 @@ L_109b260:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_draw_one_109adf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_draw_one_109b440(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109b290: 0x109b290: lw    t0, 464(sp)
+// 0x0109b8d8: 0x109b8d8: lw    t0, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6744,7 +6744,7 @@ L_109b260:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109b294: 0x109b294: lw    v1, 468(sp)
+// 0x0109b8dc: 0x109b8dc: lw    v1, 468(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6753,31 +6753,31 @@ L_109b260:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b298: 0x109b298: addu  s3, s3, s2
+// 0x0109b8e0: 0x109b8e0: addu  s3, s3, s2
 	ldloc 8
 	ldloc 12
 	add
 	stloc 8
-// 0x0109b29c: 0x109b29c: addiu v1, v1, 1
+// 0x0109b8e4: 0x109b8e4: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_109b2a0:
-// 0x0109b2a0: 0x109b2a0: slt   v0, v1, s1
+L_109b8e8:
+// 0x0109b8e8: 0x109b8e8: slt   v0, v1, s1
 	ldloc 7
 	ldloc 11
 	clt
 	stloc 6
-// 0x0109b2a4: 0x109b2a4: bne   v0, zero, 0x109b210 addiu t0, t0, 4
+// 0x0109b8ec: 0x109b8ec: bne   v0, zero, 0x109b858 addiu t0, t0, 4
 	ldloc 6
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-	brtrue L_109b210
+	brtrue L_109b858
 // --- basic block ---
-// 0x0109b2ac: 0x109b2ac: lw    v0, 432(sp)
+// 0x0109b8f4: 0x109b8f4: lw    v0, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6786,15 +6786,15 @@ L_109b2a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b2b0: 0x109b2b0: addu  s1, zero, zero
+// 0x0109b8f8: 0x109b8f8: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x0109b2b4: 0x109b2b4: addu  v0, v0, s4
+// 0x0109b8fc: 0x109b8fc: addu  v0, v0, s4
 	ldloc 6
 	ldloc 13
 	add
 	stloc 6
-// 0x0109b2b8: 0x109b2b8: sw    v0, 432(sp)
+// 0x0109b900: 0x109b900: sw    v0, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6803,34 +6803,34 @@ L_109b2a0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109b2bc: 0x109b2bc: addu  s3, zero, zero
+// 0x0109b904: 0x109b904: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_109b2c0:
-// 0x0109b2c0: 0x109b2c0: addiu s5, s5, 1
+L_109b908:
+// 0x0109b908: 0x109b908: addiu s5, s5, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x0109b2c4: 0x109b2c4: addiu s7, s7, 4
+// 0x0109b90c: 0x109b90c: addiu s7, s7, 4
 	ldloc 17
 	ldc.i4.4
 	add
 	stloc 17
-L_109b2c8:
-// 0x0109b2c8: 0x109b2c8: slt   v0, s5, s0
+L_109b910:
+// 0x0109b910: 0x109b910: slt   v0, s5, s0
 	ldloc 15
 	ldloc 14
 	clt
 	stloc 6
-// 0x0109b2cc: 0x109b2cc: bne   v0, zero, 0x109b120 addu  a2, zero, zero
+// 0x0109b914: 0x109b914: bne   v0, zero, 0x109b768 addu  a2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_109b120
+	brtrue L_109b768
 // --- basic block ---
-// 0x0109b2d4: 0x109b2d4: lw    ra, 508(sp)
-// 0x0109b2d8: 0x109b2d8: lw    s8, 504(sp)
+// 0x0109b91c: 0x109b91c: lw    ra, 508(sp)
+// 0x0109b920: 0x109b920: lw    s8, 504(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6839,7 +6839,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109b2dc: 0x109b2dc: lw    s7, 500(sp)
+// 0x0109b924: 0x109b924: lw    s7, 500(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6848,7 +6848,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0109b2e0: 0x109b2e0: lw    s6, 496(sp)
+// 0x0109b928: 0x109b928: lw    s6, 496(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6857,7 +6857,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0109b2e4: 0x109b2e4: lw    s5, 492(sp)
+// 0x0109b92c: 0x109b92c: lw    s5, 492(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6866,7 +6866,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109b2e8: 0x109b2e8: lw    s4, 488(sp)
+// 0x0109b930: 0x109b930: lw    s4, 488(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6875,7 +6875,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109b2ec: 0x109b2ec: lw    s3, 484(sp)
+// 0x0109b934: 0x109b934: lw    s3, 484(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6884,7 +6884,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109b2f0: 0x109b2f0: lw    s2, 480(sp)
+// 0x0109b938: 0x109b938: lw    s2, 480(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6893,7 +6893,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109b2f4: 0x109b2f4: lw    s1, 476(sp)
+// 0x0109b93c: 0x109b93c: lw    s1, 476(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6902,7 +6902,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109b2f8: 0x109b2f8: lw    s0, 472(sp)
+// 0x0109b940: 0x109b940: lw    s0, 472(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6911,7 +6911,7 @@ L_109b2c8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109b2fc: 0x109b2fc: jr    ra addiu sp, sp, 512
+// 0x0109b944: 0x109b944: jr    ra addiu sp, sp, 512
 	ldloc.0
 	ldc.i4 512
 	add
@@ -6923,7 +6923,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 s1,int32 ra,int32 v1)
@@ -6964,12 +6964,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b304: 0x109b304: addiu sp, sp, -32
+// 0x0109b94c: 0x109b94c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109b308: 0x109b308: sw    s1, 24(sp)
+// 0x0109b950: 0x109b950: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6978,7 +6978,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109b30c: 0x109b30c: sw    s0, 20(sp)
+// 0x0109b954: 0x109b954: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6987,23 +6987,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109b310: 0x109b310: sw    ra, 28(sp)
-// 0x0109b314: 0x109b314: addu  s1, a1, zero
+// 0x0109b958: 0x109b958: sw    ra, 28(sp)
+// 0x0109b95c: 0x109b95c: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0109b318: 0x109b318: beq   a1, zero, 0x109b374 addu  s0, a0, zero
+// 0x0109b960: 0x109b960: beq   a1, zero, 0x109b9bc addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 5
-	brfalse L_109b374
+	brfalse L_109b9bc
 // --- basic block ---
-// 0x0109b320: 0x109b320: j	 0x109b36c addu  a1, s1, zero
+// 0x0109b968: 0x109b968: j	 0x109b9b4 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-	br L_109b36c
+	br L_109b9b4
 // --- basic block ---
-L_109b328:
-// 0x0109b328: 0x109b328: lw    a0, 16(s0)
+L_109b970:
+// 0x0109b970: 0x109b970: lw    a0, 16(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7012,19 +7012,19 @@ L_109b328:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109b32c: 0x109b32c: jal   0x1001b14 sll   zero, zero, 0
+// 0x0109b974: 0x109b974: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0109b334: 0x109b334: beq   v0, zero, 0x109b374 addu  a1, s1, zero
+// 0x0109b97c: 0x109b97c: beq   v0, zero, 0x109b9bc addu  a1, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brfalse L_109b374
+	brfalse L_109b9bc
 // --- basic block ---
-// 0x0109b33c: 0x109b33c: lw    v0, 12(s0)
+// 0x0109b984: 0x109b984: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7033,35 +7033,35 @@ L_109b328:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b340: 0x109b340: sll   zero, zero, 0
-// 0x0109b344: 0x109b344: beq   v0, zero, 0x109b364 addu  a0, v0, zero
+// 0x0109b988: 0x109b988: sll   zero, zero, 0
+// 0x0109b98c: 0x109b98c: beq   v0, zero, 0x109b9ac addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_109b364
+	brfalse L_109b9ac
 // --- basic block ---
-// 0x0109b34c: 0x109b34c: jal   0x109b304 sll   zero, zero, 0
+// 0x0109b994: 0x109b994: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0109b354: 0x109b354: beq   v0, zero, 0x109b364 sll   zero, zero, 0
+// 0x0109b99c: 0x109b99c: beq   v0, zero, 0x109b9ac sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109b364
+	brfalse L_109b9ac
 // --- basic block ---
-// 0x0109b35c: 0x109b35c: j	 0x109b374 addu  s0, v0, zero
+// 0x0109b9a4: 0x109b9a4: j	 0x109b9bc addu  s0, v0, zero
 	ldloc 6
 	stloc 5
-	br L_109b374
+	br L_109b9bc
 // --- basic block ---
-L_109b364:
-// 0x0109b364: 0x109b364: lw    s0, 8(s0)
+L_109b9ac:
+// 0x0109b9ac: 0x109b9ac: lw    s0, 8(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7070,20 +7070,20 @@ L_109b364:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b368: 0x109b368: addu  a1, s1, zero
+// 0x0109b9b0: 0x109b9b0: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-L_109b36c:
-// 0x0109b36c: 0x109b36c: bne   s0, zero, 0x109b328 sll   zero, zero, 0
+L_109b9b4:
+// 0x0109b9b4: 0x109b9b4: bne   s0, zero, 0x109b970 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109b328
+	brtrue L_109b970
 // --- basic block ---
-L_109b374:
-// 0x0109b374: 0x109b374: lw    ra, 28(sp)
-// 0x0109b378: 0x109b378: addu  v0, s0, zero
+L_109b9bc:
+// 0x0109b9bc: 0x109b9bc: lw    ra, 28(sp)
+// 0x0109b9c0: 0x109b9c0: addu  v0, s0, zero
 	ldloc 5
 	stloc 6
-// 0x0109b37c: 0x109b37c: lw    s1, 24(sp)
+// 0x0109b9c4: 0x109b9c4: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7092,7 +7092,7 @@ L_109b374:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109b380: 0x109b380: lw    s0, 20(sp)
+// 0x0109b9c8: 0x109b9c8: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7101,7 +7101,7 @@ L_109b374:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b384: 0x109b384: jr    ra addiu sp, sp, 32
+// 0x0109b9cc: 0x109b9cc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl116.j b/converted/Cibyl116.j
index 5293e9a..855463b 100644
--- a/converted/Cibyl116.j
+++ b/converted/Cibyl116.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl116::.ctor
 
-.method public static int32 ssd_widget_set_data_109b38c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_data_109b9d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,12 +76,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b38c: 0x109b38c: addiu sp, sp, -32
+// 0x0109b9d4: 0x109b9d4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109b390: 0x109b390: sw    a2, 16(sp)
+// 0x0109b9d8: 0x109b9d8: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -90,19 +90,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0109b394: 0x109b394: sw    ra, 28(sp)
-// 0x0109b398: 0x109b398: jal   0x109b304 sll   zero, zero, 0
+// 0x0109b9dc: 0x109b9dc: sw    ra, 28(sp)
+// 0x0109b9e0: 0x109b9e0: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109b3a0: 0x109b3a0: lw    a2, 16(sp)
+// 0x0109b9e8: 0x109b9e8: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -111,11 +111,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b3a4: 0x109b3a4: beq   v0, zero, 0x109b3cc sll   zero, zero, 0
+// 0x0109b9ec: 0x109b9ec: beq   v0, zero, 0x109ba14 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109b3cc
+	brfalse L_109ba14
 // --- basic block ---
-// 0x0109b3ac: 0x109b3ac: lw    v1, 180(v0)
+// 0x0109b9f4: 0x109b9f4: lw    v1, 180(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -124,14 +124,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b3b0: 0x109b3b0: sll   zero, zero, 0
-// 0x0109b3b4: 0x109b3b4: beq   v1, zero, 0x109b3cc addu  a0, v0, zero
+// 0x0109b9f8: 0x109b9f8: sll   zero, zero, 0
+// 0x0109b9fc: 0x109b9fc: beq   v1, zero, 0x109ba14 addu  a0, v0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
-	brfalse L_109b3cc
+	brfalse L_109ba14
 // --- basic block ---
-// 0x0109b3bc: 0x109b3bc: jalr  v1 addu  a1, a2, zero
+// 0x0109ba04: 0x109ba04: jalr  v1 addu  a1, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc.2
@@ -145,17 +145,17 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109b3c4: 0x109b3c4: j	 0x109b3d0 sll   zero, zero, 0
-	br L_109b3d0
+// 0x0109ba0c: 0x109ba0c: j	 0x109ba18 sll   zero, zero, 0
+	br L_109ba18
 // --- basic block ---
-L_109b3cc:
-// 0x0109b3cc: 0x109b3cc: addiu v0, zero, -1
+L_109ba14:
+// 0x0109ba14: 0x109ba14: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_109b3d0:
-// 0x0109b3d0: 0x109b3d0: lw    ra, 28(sp)
-// 0x0109b3d4: 0x109b3d4: sll   zero, zero, 0
-// 0x0109b3d8: 0x109b3d8: jr    ra addiu sp, sp, 32
+L_109ba18:
+// 0x0109ba18: 0x109ba18: lw    ra, 28(sp)
+// 0x0109ba1c: 0x109ba1c: sll   zero, zero, 0
+// 0x0109ba20: 0x109ba20: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -167,7 +167,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -202,12 +202,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b3e0: 0x109b3e0: addiu sp, sp, -32
+// 0x0109ba28: 0x109ba28: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109b3e4: 0x109b3e4: sw    a2, 16(sp)
+// 0x0109ba2c: 0x109ba2c: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -216,19 +216,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0109b3e8: 0x109b3e8: sw    ra, 28(sp)
-// 0x0109b3ec: 0x109b3ec: jal   0x109b304 sll   zero, zero, 0
+// 0x0109ba30: 0x109ba30: sw    ra, 28(sp)
+// 0x0109ba34: 0x109ba34: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109b3f4: 0x109b3f4: lw    a2, 16(sp)
+// 0x0109ba3c: 0x109ba3c: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -237,11 +237,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b3f8: 0x109b3f8: beq   v0, zero, 0x109b420 sll   zero, zero, 0
+// 0x0109ba40: 0x109ba40: beq   v0, zero, 0x109ba68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109b420
+	brfalse L_109ba68
 // --- basic block ---
-// 0x0109b400: 0x109b400: lw    v1, 176(v0)
+// 0x0109ba48: 0x109ba48: lw    v1, 176(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -250,14 +250,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b404: 0x109b404: sll   zero, zero, 0
-// 0x0109b408: 0x109b408: beq   v1, zero, 0x109b420 addu  a0, v0, zero
+// 0x0109ba4c: 0x109ba4c: sll   zero, zero, 0
+// 0x0109ba50: 0x109ba50: beq   v1, zero, 0x109ba68 addu  a0, v0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
-	brfalse L_109b420
+	brfalse L_109ba68
 // --- basic block ---
-// 0x0109b410: 0x109b410: jalr  v1 addu  a1, a2, zero
+// 0x0109ba58: 0x109ba58: jalr  v1 addu  a1, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc.2
@@ -271,17 +271,17 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109b418: 0x109b418: j	 0x109b424 sll   zero, zero, 0
-	br L_109b424
+// 0x0109ba60: 0x109ba60: j	 0x109ba6c sll   zero, zero, 0
+	br L_109ba6c
 // --- basic block ---
-L_109b420:
-// 0x0109b420: 0x109b420: addiu v0, zero, -1
+L_109ba68:
+// 0x0109ba68: 0x109ba68: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_109b424:
-// 0x0109b424: 0x109b424: lw    ra, 28(sp)
-// 0x0109b428: 0x109b428: sll   zero, zero, 0
-// 0x0109b42c: 0x109b42c: jr    ra addiu sp, sp, 32
+L_109ba6c:
+// 0x0109ba6c: 0x109ba6c: lw    ra, 28(sp)
+// 0x0109ba70: 0x109ba70: sll   zero, zero, 0
+// 0x0109ba74: 0x109ba74: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -293,7 +293,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -334,12 +334,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b434: 0x109b434: addiu sp, sp, -32
+// 0x0109ba7c: 0x109ba7c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109b438: 0x109b438: sw    s1, 24(sp)
+// 0x0109ba80: 0x109ba80: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -348,10 +348,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109b43c: 0x109b43c: addu  s1, a0, zero
+// 0x0109ba84: 0x109ba84: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0109b440: 0x109b440: sw    a1, 132(s1)
+// 0x0109ba88: 0x109ba88: sw    a1, 132(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -360,7 +360,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109b444: 0x109b444: sw    s0, 20(sp)
+// 0x0109ba8c: 0x109ba8c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -369,36 +369,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109b448: 0x109b448: sw    ra, 28(sp)
-// 0x0109b44c: 0x109b44c: jal   0x103fa14 addu  s0, a1, zero
+// 0x0109ba90: 0x109ba90: sw    ra, 28(sp)
+// 0x0109ba94: 0x109ba94: jal   0x103fa24 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-	call int32 Cibyl47::roadmap_softkeys_orientation_103fa14()
+	call int32 Cibyl47::roadmap_softkeys_orientation_103fa24()
 	stloc 5
 // --- basic block ---
-// 0x0109b454: 0x109b454: beq   v0, zero, 0x109b470 addu  v1, v0, zero
+// 0x0109ba9c: 0x109ba9c: beq   v0, zero, 0x109bab8 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_109b470
+	brfalse L_109bab8
 // --- basic block ---
-// 0x0109b45c: 0x109b45c: addiu a0, zero, 1
+// 0x0109baa4: 0x109baa4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0109b460: 0x109b460: bne   v1, a0, 0x109b4f8 addiu v0, zero, -1
+// 0x0109baa8: 0x109baa8: bne   v1, a0, 0x109bb40 addiu v0, zero, -1
 	ldloc 9
 	ldloc.1
 	ldc.i4.m1
 	stloc 5
-	bne.un L_109b4f8
+	bne.un L_109bb40
 // --- basic block ---
-// 0x0109b468: 0x109b468: j	 0x109b4b0 lui   a1, 0x20000
+// 0x0109bab0: 0x109bab0: j	 0x109baf8 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_109b4b0
+	br L_109baf8
 // --- basic block ---
-L_109b470:
-// 0x0109b470: 0x109b470: lw    a2, 128(s1)
+L_109bab8:
+// 0x0109bab8: 0x109bab8: lw    a2, 128(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -407,19 +407,19 @@ L_109b470:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b474: 0x109b474: sll   zero, zero, 0
-// 0x0109b478: 0x109b478: beq   a2, zero, 0x109b48c lui   a1, 0x20000
+// 0x0109babc: 0x109babc: sll   zero, zero, 0
+// 0x0109bac0: 0x109bac0: beq   a2, zero, 0x109bad4 lui   a1, 0x20000
 	ldloc.3
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109b48c
+	brfalse L_109bad4
 // --- basic block ---
-// 0x0109b480: 0x109b480: addiu a1, a1, -2736
+// 0x0109bac8: 0x109bac8: addiu a1, a1, -2272
 	ldloc.2
-	ldc.i4 -2736
+	ldc.i4 -2272
 	add
 	stloc.2
-// 0x0109b484: 0x109b484: jal   0x109b3e0 addu  a0, s1, zero
+// 0x0109bacc: 0x109bacc: jal   0x109ba28 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -427,54 +427,54 @@ L_109b470:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_109b48c:
-// 0x0109b48c: 0x109b48c: beq   s0, zero, 0x109b4f8 addu  v0, zero, zero
+L_109bad4:
+// 0x0109bad4: 0x109bad4: beq   s0, zero, 0x109bb40 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109b4f8
+	brfalse L_109bb40
 // --- basic block ---
-// 0x0109b494: 0x109b494: lb    v0, 0(s0)
+// 0x0109badc: 0x109badc: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109b498: 0x109b498: sll   zero, zero, 0
-// 0x0109b49c: 0x109b49c: beq   v0, zero, 0x109b4f4 lui   a1, 0x20000
+// 0x0109bae0: 0x109bae0: sll   zero, zero, 0
+// 0x0109bae4: 0x109bae4: beq   v0, zero, 0x109bb3c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109b4f4
+	brfalse L_109bb3c
 // --- basic block ---
-// 0x0109b4a4: 0x109b4a4: addu  a0, s1, zero
+// 0x0109baec: 0x109baec: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109b4a8: 0x109b4a8: j	 0x109b4e4 addiu a1, a1, -2716
+// 0x0109baf0: 0x109baf0: j	 0x109bb2c addiu a1, a1, -2252
 	ldloc.2
-	ldc.i4 -2716
+	ldc.i4 -2252
 	add
 	stloc.2
-	br L_109b4e4
+	br L_109bb2c
 // --- basic block ---
-L_109b4b0:
-// 0x0109b4b0: 0x109b4b0: lui   a2, 0x10000
+L_109baf8:
+// 0x0109baf8: 0x109baf8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0109b4b4: 0x109b4b4: addiu a1, a1, -2716
+// 0x0109bafc: 0x109bafc: addiu a1, a1, -2252
 	ldloc.2
-	ldc.i4 -2716
+	ldc.i4 -2252
 	add
 	stloc.2
-// 0x0109b4b8: 0x109b4b8: addiu a2, a2, 18500
+// 0x0109bb00: 0x109bb00: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0109b4bc: 0x109b4bc: jal   0x109b3e0 addu  a0, s1, zero
+// 0x0109bb04: 0x109bb04: jal   0x109ba28 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -482,38 +482,38 @@ L_109b4b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109b4c4: 0x109b4c4: beq   s0, zero, 0x109b4f8 addu  v0, zero, zero
+// 0x0109bb0c: 0x109bb0c: beq   s0, zero, 0x109bb40 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109b4f8
+	brfalse L_109bb40
 // --- basic block ---
-// 0x0109b4cc: 0x109b4cc: lb    v0, 0(s0)
+// 0x0109bb14: 0x109bb14: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109b4d0: 0x109b4d0: sll   zero, zero, 0
-// 0x0109b4d4: 0x109b4d4: beq   v0, zero, 0x109b4f4 lui   a1, 0x20000
+// 0x0109bb18: 0x109bb18: sll   zero, zero, 0
+// 0x0109bb1c: 0x109bb1c: beq   v0, zero, 0x109bb3c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109b4f4
+	brfalse L_109bb3c
 // --- basic block ---
-// 0x0109b4dc: 0x109b4dc: addu  a0, s1, zero
+// 0x0109bb24: 0x109bb24: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109b4e0: 0x109b4e0: addiu a1, a1, -2736
+// 0x0109bb28: 0x109bb28: addiu a1, a1, -2272
 	ldloc.2
-	ldc.i4 -2736
+	ldc.i4 -2272
 	add
 	stloc.2
-L_109b4e4:
-// 0x0109b4e4: 0x109b4e4: jal   0x109b3e0 addu  a2, s0, zero
+L_109bb2c:
+// 0x0109bb2c: 0x109bb2c: jal   0x109ba28 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -521,21 +521,21 @@ L_109b4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109b4ec: 0x109b4ec: j	 0x109b4f8 sll   zero, zero, 0
-	br L_109b4f8
+// 0x0109bb34: 0x109bb34: j	 0x109bb40 sll   zero, zero, 0
+	br L_109bb40
 // --- basic block ---
-L_109b4f4:
-// 0x0109b4f4: 0x109b4f4: addu  v0, zero, zero
+L_109bb3c:
+// 0x0109bb3c: 0x109bb3c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_109b4f8:
-// 0x0109b4f8: 0x109b4f8: lw    ra, 28(sp)
-// 0x0109b4fc: 0x109b4fc: lw    s1, 24(sp)
+L_109bb40:
+// 0x0109bb40: 0x109bb40: lw    ra, 28(sp)
+// 0x0109bb44: 0x109bb44: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -544,7 +544,7 @@ L_109b4f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b500: 0x109b500: lw    s0, 20(sp)
+// 0x0109bb48: 0x109bb48: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -553,7 +553,7 @@ L_109b4f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109b504: 0x109b504: jr    ra addiu sp, sp, 32
+// 0x0109bb4c: 0x109bb4c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -565,7 +565,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -606,12 +606,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b50c: 0x109b50c: addiu sp, sp, -32
+// 0x0109bb54: 0x109bb54: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109b510: 0x109b510: sw    s1, 24(sp)
+// 0x0109bb58: 0x109bb58: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -620,10 +620,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109b514: 0x109b514: addu  s1, a0, zero
+// 0x0109bb5c: 0x109bb5c: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0109b518: 0x109b518: sw    a1, 128(s1)
+// 0x0109bb60: 0x109bb60: sw    a1, 128(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -632,7 +632,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109b51c: 0x109b51c: sw    s0, 20(sp)
+// 0x0109bb64: 0x109bb64: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -641,50 +641,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109b520: 0x109b520: sw    ra, 28(sp)
-// 0x0109b524: 0x109b524: jal   0x103fa14 addu  s0, a1, zero
+// 0x0109bb68: 0x109bb68: sw    ra, 28(sp)
+// 0x0109bb6c: 0x109bb6c: jal   0x103fa24 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-	call int32 Cibyl47::roadmap_softkeys_orientation_103fa14()
+	call int32 Cibyl47::roadmap_softkeys_orientation_103fa24()
 	stloc 5
 // --- basic block ---
-// 0x0109b52c: 0x109b52c: beq   v0, zero, 0x109b548 addu  v1, v0, zero
+// 0x0109bb74: 0x109bb74: beq   v0, zero, 0x109bb90 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_109b548
+	brfalse L_109bb90
 // --- basic block ---
-// 0x0109b534: 0x109b534: addiu a0, zero, 1
+// 0x0109bb7c: 0x109bb7c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0109b538: 0x109b538: bne   v1, a0, 0x109b5d4 addiu v0, zero, -1
+// 0x0109bb80: 0x109bb80: bne   v1, a0, 0x109bc1c addiu v0, zero, -1
 	ldloc 9
 	ldloc.1
 	ldc.i4.m1
 	stloc 5
-	bne.un L_109b5d4
+	bne.un L_109bc1c
 // --- basic block ---
-// 0x0109b540: 0x109b540: j	 0x109b584 sll   zero, zero, 0
-	br L_109b584
+// 0x0109bb88: 0x109bb88: j	 0x109bbcc sll   zero, zero, 0
+	br L_109bbcc
 // --- basic block ---
-L_109b548:
-// 0x0109b548: 0x109b548: lui   a1, 0x20000
+L_109bb90:
+// 0x0109bb90: 0x109bb90: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109b54c: 0x109b54c: lui   a2, 0x10000
+// 0x0109bb94: 0x109bb94: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0109b550: 0x109b550: addiu a1, a1, -2696
+// 0x0109bb98: 0x109bb98: addiu a1, a1, -2232
 	ldloc.2
-	ldc.i4 -2696
+	ldc.i4 -2232
 	add
 	stloc.2
-// 0x0109b554: 0x109b554: addiu a2, a2, 18500
+// 0x0109bb9c: 0x109bb9c: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0109b558: 0x109b558: jal   0x109b3e0 addu  a0, s1, zero
+// 0x0109bba0: 0x109bba0: jal   0x109ba28 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -692,40 +692,40 @@ L_109b548:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109b560: 0x109b560: beq   s0, zero, 0x109b5d4 addu  v0, zero, zero
+// 0x0109bba8: 0x109bba8: beq   s0, zero, 0x109bc1c addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109b5d4
+	brfalse L_109bc1c
 // --- basic block ---
-// 0x0109b568: 0x109b568: lb    v0, 0(s0)
+// 0x0109bbb0: 0x109bbb0: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109b56c: 0x109b56c: sll   zero, zero, 0
-// 0x0109b570: 0x109b570: beq   v0, zero, 0x109b5d0 lui   a1, 0x20000
+// 0x0109bbb4: 0x109bbb4: sll   zero, zero, 0
+// 0x0109bbb8: 0x109bbb8: beq   v0, zero, 0x109bc18 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109b5d0
+	brfalse L_109bc18
 // --- basic block ---
-// 0x0109b578: 0x109b578: addu  a0, s1, zero
+// 0x0109bbc0: 0x109bbc0: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109b57c: 0x109b57c: j	 0x109b5c0 addiu a1, a1, -2736
+// 0x0109bbc4: 0x109bbc4: j	 0x109bc08 addiu a1, a1, -2272
 	ldloc.2
-	ldc.i4 -2736
+	ldc.i4 -2272
 	add
 	stloc.2
-	br L_109b5c0
+	br L_109bc08
 // --- basic block ---
-L_109b584:
-// 0x0109b584: 0x109b584: lw    a2, 132(s1)
+L_109bbcc:
+// 0x0109bbcc: 0x109bbcc: lw    a2, 132(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -734,19 +734,19 @@ L_109b584:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b588: 0x109b588: sll   zero, zero, 0
-// 0x0109b58c: 0x109b58c: beq   a2, zero, 0x109b5a0 lui   a1, 0x20000
+// 0x0109bbd0: 0x109bbd0: sll   zero, zero, 0
+// 0x0109bbd4: 0x109bbd4: beq   a2, zero, 0x109bbe8 lui   a1, 0x20000
 	ldloc.3
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109b5a0
+	brfalse L_109bbe8
 // --- basic block ---
-// 0x0109b594: 0x109b594: addiu a1, a1, -2736
+// 0x0109bbdc: 0x109bbdc: addiu a1, a1, -2272
 	ldloc.2
-	ldc.i4 -2736
+	ldc.i4 -2272
 	add
 	stloc.2
-// 0x0109b598: 0x109b598: jal   0x109b3e0 addu  a0, s1, zero
+// 0x0109bbe0: 0x109bbe0: jal   0x109ba28 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -754,39 +754,39 @@ L_109b584:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_109b5a0:
-// 0x0109b5a0: 0x109b5a0: beq   s0, zero, 0x109b5d4 addu  v0, zero, zero
+L_109bbe8:
+// 0x0109bbe8: 0x109bbe8: beq   s0, zero, 0x109bc1c addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109b5d4
+	brfalse L_109bc1c
 // --- basic block ---
-// 0x0109b5a8: 0x109b5a8: lb    v0, 0(s0)
+// 0x0109bbf0: 0x109bbf0: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109b5ac: 0x109b5ac: sll   zero, zero, 0
-// 0x0109b5b0: 0x109b5b0: beq   v0, zero, 0x109b5d0 lui   a1, 0x20000
+// 0x0109bbf4: 0x109bbf4: sll   zero, zero, 0
+// 0x0109bbf8: 0x109bbf8: beq   v0, zero, 0x109bc18 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109b5d0
+	brfalse L_109bc18
 // --- basic block ---
-// 0x0109b5b8: 0x109b5b8: addu  a0, s1, zero
+// 0x0109bc00: 0x109bc00: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109b5bc: 0x109b5bc: addiu a1, a1, -2696
+// 0x0109bc04: 0x109bc04: addiu a1, a1, -2232
 	ldloc.2
-	ldc.i4 -2696
+	ldc.i4 -2232
 	add
 	stloc.2
-L_109b5c0:
-// 0x0109b5c0: 0x109b5c0: jal   0x109b3e0 addu  a2, s0, zero
+L_109bc08:
+// 0x0109bc08: 0x109bc08: jal   0x109ba28 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -794,21 +794,21 @@ L_109b5c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109b5c8: 0x109b5c8: j	 0x109b5d4 sll   zero, zero, 0
-	br L_109b5d4
+// 0x0109bc10: 0x109bc10: j	 0x109bc1c sll   zero, zero, 0
+	br L_109bc1c
 // --- basic block ---
-L_109b5d0:
-// 0x0109b5d0: 0x109b5d0: addu  v0, zero, zero
+L_109bc18:
+// 0x0109bc18: 0x109bc18: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_109b5d4:
-// 0x0109b5d4: 0x109b5d4: lw    ra, 28(sp)
-// 0x0109b5d8: 0x109b5d8: lw    s1, 24(sp)
+L_109bc1c:
+// 0x0109bc1c: 0x109bc1c: lw    ra, 28(sp)
+// 0x0109bc20: 0x109bc20: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -817,7 +817,7 @@ L_109b5d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b5dc: 0x109b5dc: lw    s0, 20(sp)
+// 0x0109bc24: 0x109bc24: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -826,7 +826,7 @@ L_109b5d4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109b5e0: 0x109b5e0: jr    ra addiu sp, sp, 32
+// 0x0109bc28: 0x109bc28: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -838,7 +838,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_get_data_109b5e8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_get_data_109bc30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -873,28 +873,28 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b5e8: 0x109b5e8: addiu sp, sp, -24
+// 0x0109bc30: 0x109bc30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109b5ec: 0x109b5ec: sw    ra, 20(sp)
-// 0x0109b5f0: 0x109b5f0: jal   0x109b304 sll   zero, zero, 0
+// 0x0109bc34: 0x109bc34: sw    ra, 20(sp)
+// 0x0109bc38: 0x109bc38: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109b5f8: 0x109b5f8: beq   v0, zero, 0x109b620 sll   zero, zero, 0
+// 0x0109bc40: 0x109bc40: beq   v0, zero, 0x109bc68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109b620
+	brfalse L_109bc68
 // --- basic block ---
-// 0x0109b600: 0x109b600: lw    v1, 172(v0)
+// 0x0109bc48: 0x109bc48: lw    v1, 172(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -903,12 +903,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b604: 0x109b604: sll   zero, zero, 0
-// 0x0109b608: 0x109b608: beq   v1, zero, 0x109b620 sll   zero, zero, 0
+// 0x0109bc4c: 0x109bc4c: sll   zero, zero, 0
+// 0x0109bc50: 0x109bc50: beq   v1, zero, 0x109bc68 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109b620
+	brfalse L_109bc68
 // --- basic block ---
-// 0x0109b610: 0x109b610: jalr  v1 addu  a0, v0, zero
+// 0x0109bc58: 0x109bc58: jalr  v1 addu  a0, v0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
@@ -922,17 +922,17 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109b618: 0x109b618: j	 0x109b624 sll   zero, zero, 0
-	br L_109b624
+// 0x0109bc60: 0x109bc60: j	 0x109bc6c sll   zero, zero, 0
+	br L_109bc6c
 // --- basic block ---
-L_109b620:
-// 0x0109b620: 0x109b620: addu  v0, zero, zero
+L_109bc68:
+// 0x0109bc68: 0x109bc68: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_109b624:
-// 0x0109b624: 0x109b624: lw    ra, 20(sp)
-// 0x0109b628: 0x109b628: sll   zero, zero, 0
-// 0x0109b62c: 0x109b62c: jr    ra addiu sp, sp, 24
+L_109bc6c:
+// 0x0109bc6c: 0x109bc6c: lw    ra, 20(sp)
+// 0x0109bc70: 0x109bc70: sll   zero, zero, 0
+// 0x0109bc74: 0x109bc74: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -944,7 +944,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -979,46 +979,46 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b634: 0x109b634: addiu sp, sp, -24
+// 0x0109bc7c: 0x109bc7c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109b638: 0x109b638: sw    ra, 20(sp)
-// 0x0109b63c: 0x109b63c: beq   a1, zero, 0x109b64c addu  v0, a0, zero
+// 0x0109bc80: 0x109bc80: sw    ra, 20(sp)
+// 0x0109bc84: 0x109bc84: beq   a1, zero, 0x109bc94 addu  v0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 5
-	brfalse L_109b64c
+	brfalse L_109bc94
 // --- basic block ---
-// 0x0109b644: 0x109b644: jal   0x109b304 sll   zero, zero, 0
+// 0x0109bc8c: 0x109bc8c: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_109b64c:
-// 0x0109b64c: 0x109b64c: bne   v0, zero, 0x109b660 sll   zero, zero, 0
+L_109bc94:
+// 0x0109bc94: 0x109bc94: bne   v0, zero, 0x109bca8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109b660
+	brtrue L_109bca8
 // --- basic block ---
-// 0x0109b654: 0x109b654: lui   v0, 0x10000
+// 0x0109bc9c: 0x109bc9c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0109b658: 0x109b658: j	 0x109b684 addiu v0, v0, 18500
+// 0x0109bca0: 0x109bca0: j	 0x109bccc addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_109b684
+	br L_109bccc
 // --- basic block ---
-L_109b660:
-// 0x0109b660: 0x109b660: lw    v1, 168(v0)
+L_109bca8:
+// 0x0109bca8: 0x109bca8: lw    v1, 168(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1027,12 +1027,12 @@ L_109b660:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109b664: 0x109b664: sll   zero, zero, 0
-// 0x0109b668: 0x109b668: beq   v1, zero, 0x109b680 sll   zero, zero, 0
+// 0x0109bcac: 0x109bcac: sll   zero, zero, 0
+// 0x0109bcb0: 0x109bcb0: beq   v1, zero, 0x109bcc8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109b680
+	brfalse L_109bcc8
 // --- basic block ---
-// 0x0109b670: 0x109b670: jalr  v1 addu  a0, v0, zero
+// 0x0109bcb8: 0x109bcb8: jalr  v1 addu  a0, v0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
@@ -1046,11 +1046,11 @@ L_109b660:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109b678: 0x109b678: j	 0x109b684 sll   zero, zero, 0
-	br L_109b684
+// 0x0109bcc0: 0x109bcc0: j	 0x109bccc sll   zero, zero, 0
+	br L_109bccc
 // --- basic block ---
-L_109b680:
-// 0x0109b680: 0x109b680: lw    v0, 20(v0)
+L_109bcc8:
+// 0x0109bcc8: 0x109bcc8: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1059,10 +1059,10 @@ L_109b680:
 	add
 	ldelem.i4
 	stloc 5
-L_109b684:
-// 0x0109b684: 0x109b684: lw    ra, 20(sp)
-// 0x0109b688: 0x109b688: sll   zero, zero, 0
-// 0x0109b68c: 0x109b68c: jr    ra addiu sp, sp, 24
+L_109bccc:
+// 0x0109bccc: 0x109bccc: lw    ra, 20(sp)
+// 0x0109bcd0: 0x109bcd0: sll   zero, zero, 0
+// 0x0109bcd4: 0x109bcd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1074,7 +1074,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_progress_set_value_109b694(int32,int32)
+.method public static int32 ssd_progress_set_value_109bcdc(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1100,12 +1100,12 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b694: 0x109b694: slti  v0, a1, 101
+// 0x0109bcdc: 0x109bcdc: slti  v0, a1, 101
 	ldloc.1
 	ldc.i4.s 101
 	clt
 	stloc.2
-// 0x0109b698: 0x109b698: lw    v1, 164(a0)
+// 0x0109bce0: 0x109bce0: lw    v1, 164(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -1114,32 +1114,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109b69c: 0x109b69c: bne   v0, zero, 0x109b6ac nor   v0, zero, a1
+// 0x0109bce4: 0x109bce4: bne   v0, zero, 0x109bcf4 nor   v0, zero, a1
 	ldloc.2
 	ldloc.1
 	ldc.i4.m1
 	xor
 	stloc.2
-	brtrue L_109b6ac
+	brtrue L_109bcf4
 // --- basic block ---
-// 0x0109b6a4: 0x109b6a4: j	 0x109b6b4 addiu a1, zero, 100
+// 0x0109bcec: 0x109bcec: j	 0x109bcfc addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.1
-	br L_109b6b4
+	br L_109bcfc
 // --- basic block ---
-L_109b6ac:
-// 0x0109b6ac: 0x109b6ac: sra   v0, v0, 31
+L_109bcf4:
+// 0x0109bcf4: 0x109bcf4: sra   v0, v0, 31
 	ldloc.2
 	ldc.i4.s 31
 	shr
 	stloc.2
-// 0x0109b6b0: 0x109b6b0: and   a1, a1, v0
+// 0x0109bcf8: 0x109bcf8: and   a1, a1, v0
 	ldloc.1
 	ldloc.2
 	and
 	stloc.1
-L_109b6b4:
-// 0x0109b6b4: 0x109b6b4: jr    ra sw    a1, 0(v1)
+L_109bcfc:
+// 0x0109bcfc: 0x109bcfc: jr    ra sw    a1, 0(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
@@ -1153,7 +1153,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 ssd_progress_new_109b6bc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_progress_new_109bd04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 ra,int32 v1)
@@ -1194,16 +1194,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b6bc: 0x109b6bc: addiu sp, sp, -32
+// 0x0109bd04: 0x109bd04: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109b6c0: 0x109b6c0: addu  a1, zero, zero
+// 0x0109bd08: 0x109bd08: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109b6c4: 0x109b6c4: sw    ra, 28(sp)
-// 0x0109b6c8: 0x109b6c8: sw    s1, 24(sp)
+// 0x0109bd0c: 0x109bd0c: sw    ra, 28(sp)
+// 0x0109bd10: 0x109bd10: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1212,7 +1212,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109b6cc: 0x109b6cc: sw    s0, 20(sp)
+// 0x0109bd14: 0x109bd14: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1221,7 +1221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109b6d0: 0x109b6d0: jal   0x109a45c addu  s0, a2, zero
+// 0x0109bd18: 0x109bd18: jal   0x109aaa4 addu  s0, a2, zero
 	ldloc.3
 	stloc 8
 	ldloc.0
@@ -1229,15 +1229,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109b6d8: 0x109b6d8: addiu a0, zero, 4
+// 0x0109bd20: 0x109bd20: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109b6dc: 0x109b6dc: jal   0x1000910 addu  s1, v0, zero
+// 0x0109bd24: 0x109bd24: jal   0x1000910 addu  s1, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -1250,7 +1250,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109b6e4: 0x109b6e4: sw    v0, 164(s1)
+// 0x0109bd2c: 0x109bd2c: sw    v0, 164(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1259,31 +1259,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109b6e8: 0x109b6e8: lui   v0, 0x10000
+// 0x0109bd30: 0x109bd30: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0109b6ec: 0x109b6ec: addiu v0, v0, 11108
+// 0x0109bd34: 0x109bd34: addiu v0, v0, 11104
 	ldloc 5
-	ldc.i4 11108
+	ldc.i4 11104
 	add
 	stloc 5
-// 0x0109b6f0: 0x109b6f0: sw    v0, 0(s1)
+// 0x0109bd38: 0x109bd38: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0109b6f4: 0x109b6f4: lw    ra, 28(sp)
-// 0x0109b6f8: 0x109b6f8: lui   v0, 0x10a0000
+// 0x0109bd3c: 0x109bd3c: lw    ra, 28(sp)
+// 0x0109bd40: 0x109bd40: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109b6fc: 0x109b6fc: addiu v0, v0, -18660
+// 0x0109bd44: 0x109bd44: addiu v0, v0, -17052
 	ldloc 5
-	ldc.i4 -18660
+	ldc.i4 -17052
 	add
 	stloc 5
-// 0x0109b700: 0x109b700: sw    v0, 184(s1)
+// 0x0109bd48: 0x109bd48: sw    v0, 184(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1292,7 +1292,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109b704: 0x109b704: sw    s0, 48(s1)
+// 0x0109bd4c: 0x109bd4c: sw    s0, 48(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1301,10 +1301,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109b708: 0x109b708: addu  v0, s1, zero
+// 0x0109bd50: 0x109bd50: addu  v0, s1, zero
 	ldloc 7
 	stloc 5
-// 0x0109b70c: 0x109b70c: lw    s1, 24(sp)
+// 0x0109bd54: 0x109bd54: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1313,7 +1313,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b710: 0x109b710: lw    s0, 20(sp)
+// 0x0109bd58: 0x109bd58: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1322,7 +1322,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109b714: 0x109b714: jr    ra addiu sp, sp, 32
+// 0x0109bd5c: 0x109bd5c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1334,7 +1334,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_109b71c(int32,int32,int32,int32,int32)
+.method public static int32 draw_109bd64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 t0,int32 s2,int32 lo,int32 s5,int32 t1,int32 t3,int32 s4,int32 s7,int32 s6,int32 s8,int32 t2,int32 ra)
@@ -1411,12 +1411,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109b71c: 0x109b71c: addiu sp, sp, -104
+// 0x0109bd64: 0x109bd64: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x0109b720: 0x109b720: lw    a0, 164(a0)
+// 0x0109bd68: 0x109bd68: lw    a0, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1425,7 +1425,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109b724: 0x109b724: sw    s3, 76(sp)
+// 0x0109bd6c: 0x109bd6c: sw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1434,13 +1434,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109b728: 0x109b728: addu  s3, a2, zero
+// 0x0109bd70: 0x109bd70: addu  s3, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0109b72c: 0x109b72c: lui   a2, 0x20000
+// 0x0109bd74: 0x109bd74: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109b730: 0x109b730: sw    s0, 64(sp)
+// 0x0109bd78: 0x109bd78: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1449,7 +1449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109b734: 0x109b734: sw    a0, 40(sp)
+// 0x0109bd7c: 0x109bd7c: sw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1458,22 +1458,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109b738: 0x109b738: addiu a2, a2, -2676
+// 0x0109bd80: 0x109bd80: addiu a2, a2, -2212
 	ldloc.3
-	ldc.i4 -2676
+	ldc.i4 -2212
 	add
 	stloc.3
-// 0x0109b73c: 0x109b73c: addu  a0, zero, zero
+// 0x0109bd84: 0x109bd84: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b740: 0x109b740: addu  s0, a1, zero
+// 0x0109bd88: 0x109bd88: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0109b744: 0x109b744: addiu a1, zero, 1
+// 0x0109bd8c: 0x109bd8c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109b748: 0x109b748: sw    ra, 100(sp)
-// 0x0109b74c: 0x109b74c: sw    s7, 92(sp)
+// 0x0109bd90: 0x109bd90: sw    ra, 100(sp)
+// 0x0109bd94: 0x109bd94: sw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1482,7 +1482,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0109b750: 0x109b750: sw    s5, 84(sp)
+// 0x0109bd98: 0x109bd98: sw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1491,7 +1491,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109b754: 0x109b754: sw    s1, 68(sp)
+// 0x0109bd9c: 0x109bd9c: sw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1500,7 +1500,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109b758: 0x109b758: sw    s8, 96(sp)
+// 0x0109bda0: 0x109bda0: sw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1509,7 +1509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0109b75c: 0x109b75c: sw    s6, 88(sp)
+// 0x0109bda4: 0x109bda4: sw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1518,7 +1518,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0109b760: 0x109b760: sw    s4, 80(sp)
+// 0x0109bda8: 0x109bda8: sw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1527,7 +1527,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0109b764: 0x109b764: jal   0x10a1918 sw    s2, 72(sp)
+// 0x0109bdac: 0x109bdac: jal   0x10a1f60 sw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1541,26 +1541,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b76c: 0x109b76c: lui   a2, 0x20000
+// 0x0109bdb4: 0x109bdb4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109b770: 0x109b770: addiu a2, a2, -2660
+// 0x0109bdb8: 0x109bdb8: addiu a2, a2, -2196
 	ldloc.3
-	ldc.i4 -2660
+	ldc.i4 -2196
 	add
 	stloc.3
-// 0x0109b774: 0x109b774: addu  a0, zero, zero
+// 0x0109bdbc: 0x109bdbc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b778: 0x109b778: addiu a1, zero, 1
+// 0x0109bdc0: 0x109bdc0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109b77c: 0x109b77c: jal   0x10a1918 addu  s5, v0, zero
+// 0x0109bdc4: 0x109bdc4: jal   0x10a1f60 addu  s5, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -1568,26 +1568,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b784: 0x109b784: lui   a2, 0x20000
+// 0x0109bdcc: 0x109bdcc: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109b788: 0x109b788: addiu a2, a2, -2644
+// 0x0109bdd0: 0x109bdd0: addiu a2, a2, -2180
 	ldloc.3
-	ldc.i4 -2644
+	ldc.i4 -2180
 	add
 	stloc.3
-// 0x0109b78c: 0x109b78c: addu  a0, zero, zero
+// 0x0109bdd4: 0x109bdd4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b790: 0x109b790: addiu a1, zero, 1
+// 0x0109bdd8: 0x109bdd8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109b794: 0x109b794: jal   0x10a1918 sw    v0, 32(sp)
+// 0x0109bddc: 0x109bddc: jal   0x10a1f60 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1601,26 +1601,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b79c: 0x109b79c: lui   a2, 0x20000
+// 0x0109bde4: 0x109bde4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109b7a0: 0x109b7a0: addiu a2, a2, -2628
+// 0x0109bde8: 0x109bde8: addiu a2, a2, -2164
 	ldloc.3
-	ldc.i4 -2628
+	ldc.i4 -2164
 	add
 	stloc.3
-// 0x0109b7a4: 0x109b7a4: addu  a0, zero, zero
+// 0x0109bdec: 0x109bdec: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b7a8: 0x109b7a8: addiu a1, zero, 1
+// 0x0109bdf0: 0x109bdf0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109b7ac: 0x109b7ac: jal   0x10a1918 addu  s7, v0, zero
+// 0x0109bdf4: 0x109bdf4: jal   0x10a1f60 addu  s7, v0, zero
 	ldloc 5
 	stloc 18
 	ldloc.0
@@ -1628,15 +1628,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b7b4: 0x109b7b4: addu  a0, zero, zero
+// 0x0109bdfc: 0x109bdfc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b7b8: 0x109b7b8: jal   0x109a424 sw    v0, 36(sp)
+// 0x0109be00: 0x109be00: jal   0x109aa6c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1650,29 +1650,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b7c0: 0x109b7c0: bne   v0, zero, 0x109b7e0 addu  s1, zero, zero
+// 0x0109be08: 0x109be08: bne   v0, zero, 0x109be28 addu  s1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brtrue L_109b7e0
+	brtrue L_109be28
 // --- basic block ---
-// 0x0109b7c8: 0x109b7c8: lui   a2, 0x20000
+// 0x0109be10: 0x109be10: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109b7cc: 0x109b7cc: addiu a2, a2, -2612
+// 0x0109be14: 0x109be14: addiu a2, a2, -2148
 	ldloc.3
-	ldc.i4 -2612
+	ldc.i4 -2148
 	add
 	stloc.3
-// 0x0109b7d0: 0x109b7d0: addu  a0, zero, zero
+// 0x0109be18: 0x109be18: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b7d4: 0x109b7d4: jal   0x10a1918 addiu a1, zero, 1
+// 0x0109be1c: 0x109be1c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1680,16 +1680,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b7dc: 0x109b7dc: addu  s1, v0, zero
+// 0x0109be24: 0x109be24: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-L_109b7e0:
-// 0x0109b7e0: 0x109b7e0: jal   0x109a424 addu  a0, zero, zero
+L_109be28:
+// 0x0109be28: 0x109be28: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1697,29 +1697,29 @@ L_109b7e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b7e8: 0x109b7e8: beq   v0, zero, 0x109b808 addu  s2, zero, zero
+// 0x0109be30: 0x109be30: beq   v0, zero, 0x109be50 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	brfalse L_109b808
+	brfalse L_109be50
 // --- basic block ---
-// 0x0109b7f0: 0x109b7f0: lui   a2, 0x20000
+// 0x0109be38: 0x109be38: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109b7f4: 0x109b7f4: addiu a2, a2, -2592
+// 0x0109be3c: 0x109be3c: addiu a2, a2, -2128
 	ldloc.3
-	ldc.i4 -2592
+	ldc.i4 -2128
 	add
 	stloc.3
-// 0x0109b7f8: 0x109b7f8: addu  a0, zero, zero
+// 0x0109be40: 0x109be40: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b7fc: 0x109b7fc: jal   0x10a1918 addiu a1, zero, 1
+// 0x0109be44: 0x109be44: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1727,27 +1727,27 @@ L_109b7e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b804: 0x109b804: addu  s2, v0, zero
+// 0x0109be4c: 0x109be4c: addu  s2, v0, zero
 	ldloc 5
 	stloc 12
-L_109b808:
-// 0x0109b808: 0x109b808: lui   a2, 0x20000
+L_109be50:
+// 0x0109be50: 0x109be50: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109b80c: 0x109b80c: addiu a2, a2, -2572
+// 0x0109be54: 0x109be54: addiu a2, a2, -2108
 	ldloc.3
-	ldc.i4 -2572
+	ldc.i4 -2108
 	add
 	stloc.3
-// 0x0109b810: 0x109b810: addu  a0, zero, zero
+// 0x0109be58: 0x109be58: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b814: 0x109b814: jal   0x10a1918 addiu a1, zero, 1
+// 0x0109be5c: 0x109be5c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1755,18 +1755,18 @@ L_109b808:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b81c: 0x109b81c: beq   s5, zero, 0x109bb30 addu  s4, v0, zero
+// 0x0109be64: 0x109be64: beq   s5, zero, 0x109c178 addu  s4, v0, zero
 	ldloc 14
 	ldloc 5
 	stloc 17
-	brfalse L_109bb30
+	brfalse L_109c178
 // --- basic block ---
-// 0x0109b824: 0x109b824: lw    v0, 32(sp)
+// 0x0109be6c: 0x109be6c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1775,16 +1775,16 @@ L_109b808:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b828: 0x109b828: sll   zero, zero, 0
-// 0x0109b82c: 0x109b82c: beq   v0, zero, 0x109bb30 sll   zero, zero, 0
+// 0x0109be70: 0x109be70: sll   zero, zero, 0
+// 0x0109be74: 0x109be74: beq   v0, zero, 0x109c178 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109bb30
+	brfalse L_109c178
 // --- basic block ---
-// 0x0109b834: 0x109b834: beq   s7, zero, 0x109bb30 sll   zero, zero, 0
+// 0x0109be7c: 0x109be7c: beq   s7, zero, 0x109c178 sll   zero, zero, 0
 	ldloc 18
-	brfalse L_109bb30
+	brfalse L_109c178
 // --- basic block ---
-// 0x0109b83c: 0x109b83c: lw    v1, 36(sp)
+// 0x0109be84: 0x109be84: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1793,24 +1793,24 @@ L_109b808:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b840: 0x109b840: sll   zero, zero, 0
-// 0x0109b844: 0x109b844: beq   v1, zero, 0x109bb30 sll   zero, zero, 0
+// 0x0109be88: 0x109be88: sll   zero, zero, 0
+// 0x0109be8c: 0x109be8c: beq   v1, zero, 0x109c178 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109bb30
+	brfalse L_109c178
 // --- basic block ---
-// 0x0109b84c: 0x109b84c: jal   0x104dffc addu  a0, v0, zero
+// 0x0109be94: 0x109be94: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b854: 0x109b854: addu  a0, s5, zero
+// 0x0109be9c: 0x109be9c: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x0109b858: 0x109b858: jal   0x104dffc sw    v0, 28(sp)
+// 0x0109bea0: 0x109bea0: jal   0x104e00c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1820,15 +1820,15 @@ L_109b808:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b860: 0x109b860: addu  a0, s7, zero
+// 0x0109bea8: 0x109bea8: addu  a0, s7, zero
 	ldloc 18
 	stloc.1
-// 0x0109b864: 0x109b864: jal   0x104dffc sw    v0, 44(sp)
+// 0x0109beac: 0x109beac: jal   0x104e00c sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1838,15 +1838,15 @@ L_109b808:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b86c: 0x109b86c: addu  s6, v0, zero
+// 0x0109beb4: 0x109beb4: addu  s6, v0, zero
 	ldloc 5
 	stloc 19
-// 0x0109b870: 0x109b870: beq   s1, zero, 0x109b884 sw    zero, 24(sp)
+// 0x0109beb8: 0x109beb8: beq   s1, zero, 0x109becc sw    zero, 24(sp)
 	ldloc 9
 	ldloc 6
 	ldloc.0
@@ -1856,18 +1856,18 @@ L_109b808:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_109b884
+	brfalse L_109becc
 // --- basic block ---
-// 0x0109b878: 0x109b878: jal   0x104dffc addu  a0, s1, zero
+// 0x0109bec0: 0x109bec0: jal   0x104e00c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b880: 0x109b880: sw    v0, 24(sp)
+// 0x0109bec8: 0x109bec8: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1876,32 +1876,32 @@ L_109b808:
 	add
 	ldloc 5
 	stelem.i4
-L_109b884:
-// 0x0109b884: 0x109b884: beq   s2, zero, 0x109b898 addu  s8, zero, zero
+L_109becc:
+// 0x0109becc: 0x109becc: beq   s2, zero, 0x109bee0 addu  s8, zero, zero
 	ldloc 12
 	ldc.i4.s 0
 	stloc 20
-	brfalse L_109b898
+	brfalse L_109bee0
 // --- basic block ---
-// 0x0109b88c: 0x109b88c: jal   0x104dffc addu  a0, s2, zero
+// 0x0109bed4: 0x109bed4: jal   0x104e00c addu  a0, s2, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b894: 0x109b894: addu  s8, v0, zero
+// 0x0109bedc: 0x109bedc: addu  s8, v0, zero
 	ldloc 5
 	stloc 20
-L_109b898:
-// 0x0109b898: 0x109b898: andi  v0, s3, 1
+L_109bee0:
+// 0x0109bee0: 0x109bee0: andi  v0, s3, 1
 	ldloc 10
 	ldc.i4.1
 	and
 	stloc 5
-// 0x0109b89c: 0x109b89c: lw    s3, 4(s0)
+// 0x0109bee4: 0x109bee4: lw    s3, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1910,34 +1910,34 @@ L_109b898:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109b8a0: 0x109b8a0: beq   v0, zero, 0x109b8c0 addiu v0, sp, 16
+// 0x0109bee8: 0x109bee8: beq   v0, zero, 0x109bf08 addiu v0, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-	brfalse L_109b8c0
+	brfalse L_109bf08
 // --- basic block ---
-// 0x0109b8a8: 0x109b8a8: jal   0x104e020 addu  a0, s7, zero
+// 0x0109bef0: 0x109bef0: jal   0x104e030 addu  a0, s7, zero
 	ldloc 18
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b8b0: 0x109b8b0: addiu s3, s3, 5
+// 0x0109bef8: 0x109bef8: addiu s3, s3, 5
 	ldloc 10
 	ldc.i4.5
 	add
 	stloc 10
-// 0x0109b8b4: 0x109b8b4: addu  s3, s3, v0
+// 0x0109befc: 0x109befc: addu  s3, s3, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x0109b8b8: 0x109b8b8: j	 0x109bb30 sw    s3, 12(s0)
+// 0x0109bf00: 0x109bf00: j	 0x109c178 sw    s3, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1946,35 +1946,35 @@ L_109b898:
 	add
 	ldloc 10
 	stelem.i4
-	br L_109bb30
+	br L_109c178
 // --- basic block ---
-L_109b8c0:
-// 0x0109b8c0: 0x109b8c0: lw    v1, 0(s0)
+L_109bf08:
+// 0x0109bf08: 0x109bf08: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109b8c4: 0x109b8c4: sll   zero, zero, 0
-// 0x0109b8c8: 0x109b8c8: addiu v1, v1, 30
+// 0x0109bf0c: 0x109bf0c: sll   zero, zero, 0
+// 0x0109bf10: 0x109bf10: addiu v1, v1, 30
 	ldloc 7
 	ldc.i4.s 30
 	add
 	stloc 7
-// 0x0109b8cc: 0x109b8cc: addu  a0, s5, zero
+// 0x0109bf14: 0x109bf14: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x0109b8d0: 0x109b8d0: addu  a1, v0, zero
+// 0x0109bf18: 0x109bf18: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0109b8d4: 0x109b8d4: addu  a2, zero, zero
+// 0x0109bf1c: 0x109bf1c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109b8d8: 0x109b8d8: addu  a3, zero, zero
+// 0x0109bf20: 0x109bf20: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109b8dc: 0x109b8dc: sw    v1, 16(sp)
+// 0x0109bf24: 0x109bf24: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1983,7 +1983,7 @@ L_109b8c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109b8e0: 0x109b8e0: sw    v0, 56(sp)
+// 0x0109bf28: 0x109bf28: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1992,7 +1992,7 @@ L_109b8c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109b8e4: 0x109b8e4: jal   0x104f4a8 sw    s3, 20(sp)
+// 0x0109bf2c: 0x109bf2c: jal   0x104f4b8 sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2006,19 +2006,19 @@ L_109b8c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b8ec: 0x109b8ec: lw    v1, 0(s0)
+// 0x0109bf34: 0x109bf34: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109b8f0: 0x109b8f0: lw    v0, 56(sp)
+// 0x0109bf38: 0x109bf38: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2027,7 +2027,7 @@ L_109b8c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b8f4: 0x109b8f4: lw    t0, 8(s0)
+// 0x0109bf3c: 0x109bf3c: lw    t0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2036,7 +2036,7 @@ L_109b8c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109b8f8: 0x109b8f8: lw    t3, 28(sp)
+// 0x0109bf40: 0x109bf40: lw    t3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2045,15 +2045,15 @@ L_109b8c0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109b8fc: 0x109b8fc: subu  t0, t0, v1
+// 0x0109bf44: 0x109bf44: subu  t0, t0, v1
 	ldloc 11
 	ldloc 7
 	sub
 	stloc 11
-// 0x0109b900: 0x109b900: addu  s5, v0, zero
+// 0x0109bf48: 0x109bf48: addu  s5, v0, zero
 	ldloc 5
 	stloc 14
-// 0x0109b904: 0x109b904: lw    v0, 44(sp)
+// 0x0109bf4c: 0x109bf4c: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2062,46 +2062,46 @@ L_109b8c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b908: 0x109b908: subu  t0, t0, t3
+// 0x0109bf50: 0x109bf50: subu  t0, t0, t3
 	ldloc 11
 	ldloc 16
 	sub
 	stloc 11
-// 0x0109b90c: 0x109b90c: subu  t0, t0, v0
+// 0x0109bf54: 0x109bf54: subu  t0, t0, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 11
-// 0x0109b910: 0x109b910: addiu t0, t0, -60
+// 0x0109bf58: 0x109bf58: addiu t0, t0, -60
 	ldloc 11
 	ldc.i4.s -60
 	add
 	stloc 11
-// 0x0109b914: 0x109b914: div   t0, s6
+// 0x0109bf5c: 0x109bf5c: div   t0, s6
 	ldloc 11
 	ldloc 19
 	div
 	stloc 13
-// 0x0109b918: 0x109b918: addu  v1, zero, zero
+// 0x0109bf60: 0x109bf60: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0109b91c: 0x109b91c: mflo  lo
+// 0x0109bf64: 0x109bf64: mflo  lo
 	ldloc 13
 	stloc 11
-// 0x0109b920: 0x109b920: j	 0x109b964 addu  v0, zero, zero
+// 0x0109bf68: 0x109bf68: j	 0x109bfac addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_109b964
+	br L_109bfac
 // --- basic block ---
-L_109b928:
-// 0x0109b928: 0x109b928: lw    t1, 0(s0)
+L_109bf70:
+// 0x0109bf70: 0x109bf70: lw    t1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x0109b92c: 0x109b92c: lw    t3, 28(sp)
+// 0x0109bf74: 0x109bf74: lw    t3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2110,22 +2110,22 @@ L_109b928:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109b930: 0x109b930: addiu t1, t1, 30
+// 0x0109bf78: 0x109bf78: addiu t1, t1, 30
 	ldloc 15
 	ldc.i4.s 30
 	add
 	stloc 15
-// 0x0109b934: 0x109b934: addu  t1, t1, t3
+// 0x0109bf7c: 0x109bf7c: addu  t1, t1, t3
 	ldloc 15
 	ldloc 16
 	add
 	stloc 15
-// 0x0109b938: 0x109b938: addu  t2, t1, t2
+// 0x0109bf80: 0x109bf80: addu  t2, t1, t2
 	ldloc 15
 	ldloc 21
 	add
 	stloc 21
-// 0x0109b93c: 0x109b93c: sw    v0, 56(sp)
+// 0x0109bf84: 0x109bf84: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2134,7 +2134,7 @@ L_109b928:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109b940: 0x109b940: sw    v1, 48(sp)
+// 0x0109bf88: 0x109bf88: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2143,7 +2143,7 @@ L_109b928:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109b944: 0x109b944: sw    t0, 52(sp)
+// 0x0109bf8c: 0x109bf8c: sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2152,7 +2152,7 @@ L_109b928:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109b948: 0x109b948: sw    s3, 20(sp)
+// 0x0109bf90: 0x109bf90: sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2161,7 +2161,7 @@ L_109b928:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109b94c: 0x109b94c: jal   0x104f4a8 sw    t2, 16(sp)
+// 0x0109bf94: 0x109bf94: jal   0x104f4b8 sw    t2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2175,12 +2175,12 @@ L_109b928:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b954: 0x109b954: lw    t0, 52(sp)
+// 0x0109bf9c: 0x109bf9c: lw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2189,7 +2189,7 @@ L_109b928:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109b958: 0x109b958: lw    v1, 48(sp)
+// 0x0109bfa0: 0x109bfa0: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2198,7 +2198,7 @@ L_109b928:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b95c: 0x109b95c: lw    v0, 56(sp)
+// 0x0109bfa4: 0x109bfa4: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2207,36 +2207,36 @@ L_109b928:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b960: 0x109b960: sll   zero, zero, 0
-L_109b964:
-// 0x0109b964: 0x109b964: slt   t1, v0, t0
+// 0x0109bfa8: 0x109bfa8: sll   zero, zero, 0
+L_109bfac:
+// 0x0109bfac: 0x109bfac: slt   t1, v0, t0
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 15
-// 0x0109b968: 0x109b968: addu  v1, v1, s6
+// 0x0109bfb0: 0x109bfb0: addu  v1, v1, s6
 	ldloc 7
 	ldloc 19
 	add
 	stloc 7
-// 0x0109b96c: 0x109b96c: addu  a0, s7, zero
+// 0x0109bfb4: 0x109bfb4: addu  a0, s7, zero
 	ldloc 18
 	stloc.1
-// 0x0109b970: 0x109b970: addu  a1, s5, zero
+// 0x0109bfb8: 0x109bfb8: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x0109b974: 0x109b974: addu  a2, zero, zero
+// 0x0109bfbc: 0x109bfbc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109b978: 0x109b978: addu  a3, zero, zero
+// 0x0109bfc0: 0x109bfc0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109b97c: 0x109b97c: subu  t2, v1, s6
+// 0x0109bfc4: 0x109bfc4: subu  t2, v1, s6
 	ldloc 7
 	ldloc 19
 	sub
 	stloc 21
-// 0x0109b980: 0x109b980: lw    s3, 4(s0)
+// 0x0109bfc8: 0x109bfc8: lw    s3, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2245,15 +2245,15 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109b984: 0x109b984: bne   t1, zero, 0x109b928 addiu v0, v0, 1
+// 0x0109bfcc: 0x109bfcc: bne   t1, zero, 0x109bf70 addiu v0, v0, 1
 	ldloc 15
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_109b928
+	brtrue L_109bf70
 // --- basic block ---
-// 0x0109b98c: 0x109b98c: lw    v0, 8(s0)
+// 0x0109bfd4: 0x109bfd4: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2262,7 +2262,7 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b990: 0x109b990: lw    v1, 28(sp)
+// 0x0109bfd8: 0x109bfd8: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2271,7 +2271,7 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109b994: 0x109b994: lw    a0, 32(sp)
+// 0x0109bfdc: 0x109bfdc: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2280,17 +2280,17 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109b998: 0x109b998: addiu v0, v0, -30
+// 0x0109bfe0: 0x109bfe0: addiu v0, v0, -30
 	ldloc 5
 	ldc.i4.s -30
 	add
 	stloc 5
-// 0x0109b99c: 0x109b99c: subu  v0, v0, v1
+// 0x0109bfe4: 0x109bfe4: subu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 5
-// 0x0109b9a0: 0x109b9a0: sw    v0, 16(sp)
+// 0x0109bfe8: 0x109bfe8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2299,7 +2299,7 @@ L_109b964:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109b9a4: 0x109b9a4: jal   0x104f4a8 sw    s3, 20(sp)
+// 0x0109bfec: 0x109bfec: jal   0x104f4b8 sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2313,12 +2313,12 @@ L_109b964:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b9ac: 0x109b9ac: lw    v0, 8(s0)
+// 0x0109bff4: 0x109bff4: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2327,7 +2327,7 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b9b0: 0x109b9b0: lw    t3, 40(sp)
+// 0x0109bff8: 0x109bff8: lw    t3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2336,52 +2336,52 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109b9b4: 0x109b9b4: lw    a1, 0(s0)
+// 0x0109bffc: 0x109bffc: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0109b9b8: 0x109b9b8: lw    a0, 0(t3)
+// 0x0109c000: 0x109c000: lw    a0, 0(t3)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109b9bc: 0x109b9bc: addiu v0, v0, -62
+// 0x0109c004: 0x109c004: addiu v0, v0, -62
 	ldloc 5
 	ldc.i4.s -62
 	add
 	stloc 5
-// 0x0109b9c0: 0x109b9c0: subu  v0, v0, a1
+// 0x0109c008: 0x109c008: subu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	sub
 	stloc 5
-// 0x0109b9c4: 0x109b9c4: mult  v0, a0
+// 0x0109c00c: 0x109c00c: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 13
-// 0x0109b9c8: 0x109b9c8: addiu v1, zero, 100
+// 0x0109c010: 0x109c010: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x0109b9cc: 0x109b9cc: addu  a0, zero, zero
+// 0x0109c014: 0x109c014: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109b9d0: 0x109b9d0: mflo  lo
+// 0x0109c018: 0x109c018: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0109b9d4: 0x109b9d4: sll   zero, zero, 0
-// 0x0109b9d8: 0x109b9d8: sll   zero, zero, 0
-// 0x0109b9dc: 0x109b9dc: div   v0, v1
+// 0x0109c01c: 0x109c01c: sll   zero, zero, 0
+// 0x0109c020: 0x109c020: sll   zero, zero, 0
+// 0x0109c024: 0x109c024: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 13
-// 0x0109b9e0: 0x109b9e0: lw    v0, 24(sp)
+// 0x0109c028: 0x109c028: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2390,10 +2390,10 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109b9e4: 0x109b9e4: mflo  lo
+// 0x0109c02c: 0x109c02c: mflo  lo
 	ldloc 13
 	stloc 10
-// 0x0109b9e8: 0x109b9e8: jal   0x109a424 subu  s3, s3, v0
+// 0x0109c030: 0x109c030: jal   0x109aa6c subu  s3, s3, v0
 	ldloc 10
 	ldloc 5
 	sub
@@ -2403,22 +2403,22 @@ L_109b964:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109b9f0: 0x109b9f0: beq   v0, zero, 0x109ba30 sll   zero, zero, 0
+// 0x0109c038: 0x109c038: beq   v0, zero, 0x109c078 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109ba30
+	brfalse L_109c078
 // --- basic block ---
-// 0x0109b9f8: 0x109b9f8: beq   s2, zero, 0x109ba24 addu  a0, s2, zero
+// 0x0109c040: 0x109c040: beq   s2, zero, 0x109c06c addu  a0, s2, zero
 	ldloc 12
 	ldloc 12
 	stloc.1
-	brfalse L_109ba24
+	brfalse L_109c06c
 // --- basic block ---
-// 0x0109ba00: 0x109ba00: lw    v0, 8(s0)
+// 0x0109c048: 0x109c048: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2427,28 +2427,28 @@ L_109b964:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ba04: 0x109ba04: sll   zero, zero, 0
-// 0x0109ba08: 0x109ba08: addiu v0, v0, -30
+// 0x0109c04c: 0x109c04c: sll   zero, zero, 0
+// 0x0109c050: 0x109c050: addiu v0, v0, -30
 	ldloc 5
 	ldc.i4.s -30
 	add
 	stloc 5
-// 0x0109ba0c: 0x109ba0c: subu  v0, v0, s8
+// 0x0109c054: 0x109c054: subu  v0, v0, s8
 	ldloc 5
 	ldloc 20
 	sub
 	stloc 5
-L_109ba10:
-// 0x0109ba10: 0x109ba10: addu  a1, s5, zero
+L_109c058:
+// 0x0109c058: 0x109c058: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x0109ba14: 0x109ba14: addu  a2, zero, zero
+// 0x0109c05c: 0x109c05c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109ba18: 0x109ba18: addu  a3, zero, zero
+// 0x0109c060: 0x109c060: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109ba1c: 0x109ba1c: jal   0x104f4a8 sw    v0, 16(sp)
+// 0x0109c064: 0x109c064: jal   0x104f4b8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2462,60 +2462,60 @@ L_109ba10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109ba24:
-// 0x0109ba24: 0x109ba24: addu  s1, zero, zero
+L_109c06c:
+// 0x0109c06c: 0x109c06c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0109ba28: 0x109ba28: j	 0x109baa4 addiu s2, sp, 16
+// 0x0109c070: 0x109c070: j	 0x109c0ec addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-	br L_109baa4
+	br L_109c0ec
 // --- basic block ---
-L_109ba30:
-// 0x0109ba30: 0x109ba30: beq   s1, zero, 0x109ba24 addu  a0, s1, zero
+L_109c078:
+// 0x0109c078: 0x109c078: beq   s1, zero, 0x109c06c addu  a0, s1, zero
 	ldloc 9
 	ldloc 9
 	stloc.1
-	brfalse L_109ba24
+	brfalse L_109c06c
 // --- basic block ---
-// 0x0109ba38: 0x109ba38: lw    v0, 0(s0)
+// 0x0109c080: 0x109c080: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109ba3c: 0x109ba3c: j	 0x109ba10 addiu v0, v0, 30
+// 0x0109c084: 0x109c084: j	 0x109c058 addiu v0, v0, 30
 	ldloc 5
 	ldc.i4.s 30
 	add
 	stloc 5
-	br L_109ba10
+	br L_109c058
 // --- basic block ---
-L_109ba44:
-// 0x0109ba44: 0x109ba44: jal   0x109a424 sll   zero, zero, 0
+L_109c08c:
+// 0x0109c08c: 0x109c08c: jal   0x109aa6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ba4c: 0x109ba4c: beq   v0, zero, 0x109ba6c sll   zero, zero, 0
+// 0x0109c094: 0x109c094: beq   v0, zero, 0x109c0b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109ba6c
+	brfalse L_109c0b4
 // --- basic block ---
-// 0x0109ba54: 0x109ba54: lw    v0, 8(s0)
+// 0x0109c09c: 0x109c09c: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2524,33 +2524,33 @@ L_109ba44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ba58: 0x109ba58: sll   zero, zero, 0
-// 0x0109ba5c: 0x109ba5c: addiu v0, v0, -30
+// 0x0109c0a0: 0x109c0a0: sll   zero, zero, 0
+// 0x0109c0a4: 0x109c0a4: addiu v0, v0, -30
 	ldloc 5
 	ldc.i4.s -30
 	add
 	stloc 5
-// 0x0109ba60: 0x109ba60: subu  v0, v0, s8
+// 0x0109c0a8: 0x109c0a8: subu  v0, v0, s8
 	ldloc 5
 	ldloc 20
 	sub
 	stloc 5
-// 0x0109ba64: 0x109ba64: j	 0x109ba80 subu  v0, v0, s1
+// 0x0109c0ac: 0x109c0ac: j	 0x109c0c8 subu  v0, v0, s1
 	ldloc 5
 	ldloc 9
 	sub
 	stloc 5
-	br L_109ba80
+	br L_109c0c8
 // --- basic block ---
-L_109ba6c:
-// 0x0109ba6c: 0x109ba6c: lw    v0, 0(s0)
+L_109c0b4:
+// 0x0109c0b4: 0x109c0b4: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109ba70: 0x109ba70: lw    v1, 24(sp)
+// 0x0109c0b8: 0x109c0b8: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2559,23 +2559,23 @@ L_109ba6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ba74: 0x109ba74: addiu v0, v0, 30
+// 0x0109c0bc: 0x109c0bc: addiu v0, v0, 30
 	ldloc 5
 	ldc.i4.s 30
 	add
 	stloc 5
-// 0x0109ba78: 0x109ba78: addu  v0, v0, v1
+// 0x0109c0c0: 0x109c0c0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0109ba7c: 0x109ba7c: addu  v0, v0, s1
+// 0x0109c0c4: 0x109c0c4: addu  v0, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-L_109ba80:
-// 0x0109ba80: 0x109ba80: sw    v0, 16(sp)
+L_109c0c8:
+// 0x0109c0c8: 0x109c0c8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2584,7 +2584,7 @@ L_109ba80:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109ba84: 0x109ba84: lw    v0, 4(s0)
+// 0x0109c0cc: 0x109c0cc: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2593,7 +2593,7 @@ L_109ba80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ba88: 0x109ba88: lw    a0, 36(sp)
+// 0x0109c0d0: 0x109c0d0: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2602,16 +2602,16 @@ L_109ba80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ba8c: 0x109ba8c: addu  a1, s2, zero
+// 0x0109c0d4: 0x109c0d4: addu  a1, s2, zero
 	ldloc 12
 	stloc.2
-// 0x0109ba90: 0x109ba90: addu  a2, zero, zero
+// 0x0109c0d8: 0x109c0d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109ba94: 0x109ba94: addu  a3, zero, zero
+// 0x0109c0dc: 0x109c0dc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109ba98: 0x109ba98: sw    v0, 20(sp)
+// 0x0109c0e0: 0x109c0e0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2620,7 +2620,7 @@ L_109ba80:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109ba9c: 0x109ba9c: jal   0x104f4a8 addiu s1, s1, 1
+// 0x0109c0e4: 0x109c0e4: jal   0x104f4b8 addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -2630,24 +2630,24 @@ L_109ba80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109baa4:
-// 0x0109baa4: 0x109baa4: slt   v0, s1, s3
+L_109c0ec:
+// 0x0109c0ec: 0x109c0ec: slt   v0, s1, s3
 	ldloc 9
 	ldloc 10
 	clt
 	stloc 5
-// 0x0109baa8: 0x109baa8: bne   v0, zero, 0x109ba44 addu  a0, zero, zero
+// 0x0109c0f0: 0x109c0f0: bne   v0, zero, 0x109c08c addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_109ba44
+	brtrue L_109c08c
 // --- basic block ---
-// 0x0109bab0: 0x109bab0: lw    t3, 40(sp)
+// 0x0109c0f8: 0x109c0f8: lw    t3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2656,27 +2656,27 @@ L_109baa4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109bab4: 0x109bab4: sll   zero, zero, 0
-// 0x0109bab8: 0x109bab8: lw    v0, 0(t3)
+// 0x0109c0fc: 0x109c0fc: sll   zero, zero, 0
+// 0x0109c100: 0x109c100: lw    v0, 0(t3)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109babc: 0x109babc: sll   zero, zero, 0
-// 0x0109bac0: 0x109bac0: bne   v0, zero, 0x109badc sll   zero, zero, 0
+// 0x0109c104: 0x109c104: sll   zero, zero, 0
+// 0x0109c108: 0x109c108: bne   v0, zero, 0x109c124 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109badc
+	brtrue L_109c124
 // --- basic block ---
-// 0x0109bac8: 0x109bac8: lw    v1, 0(s0)
+// 0x0109c110: 0x109c110: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109bacc: 0x109bacc: lw    v0, 4(s0)
+// 0x0109c114: 0x109c114: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2685,12 +2685,12 @@ L_109baa4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109bad0: 0x109bad0: addiu v1, v1, 30
+// 0x0109c118: 0x109c118: addiu v1, v1, 30
 	ldloc 7
 	ldc.i4.s 30
 	add
 	stloc 7
-// 0x0109bad4: 0x109bad4: sw    v1, 16(sp)
+// 0x0109c11c: 0x109c11c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2699,7 +2699,7 @@ L_109baa4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109bad8: 0x109bad8: sw    v0, 20(sp)
+// 0x0109c120: 0x109c120: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2708,14 +2708,14 @@ L_109baa4:
 	add
 	ldloc 5
 	stelem.i4
-L_109badc:
-// 0x0109badc: 0x109badc: beq   s4, zero, 0x109bb30 addu  a0, s4, zero
+L_109c124:
+// 0x0109c124: 0x109c124: beq   s4, zero, 0x109c178 addu  a0, s4, zero
 	ldloc 17
 	ldloc 17
 	stloc.1
-	brfalse L_109bb30
+	brfalse L_109c178
 // --- basic block ---
-// 0x0109bae4: 0x109bae4: lw    s2, 16(sp)
+// 0x0109c12c: 0x109c12c: lw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2724,24 +2724,24 @@ L_109badc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109bae8: 0x109bae8: jal   0x104dffc addiu s1, zero, 2
+// 0x0109c130: 0x109c130: jal   0x104e00c addiu s1, zero, 2
 	ldc.i4.2
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109baf0: 0x109baf0: div   v0, s1
+// 0x0109c138: 0x109c138: div   v0, s1
 	ldloc 5
 	ldloc 9
 	div
 	stloc 13
-// 0x0109baf4: 0x109baf4: addu  a0, s4, zero
+// 0x0109c13c: 0x109c13c: addu  a0, s4, zero
 	ldloc 17
 	stloc.1
-// 0x0109baf8: 0x109baf8: lw    s0, 20(sp)
+// 0x0109c140: 0x109c140: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2750,15 +2750,15 @@ L_109badc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109bafc: 0x109bafc: mflo  lo
+// 0x0109c144: 0x109c144: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0109bb00: 0x109bb00: subu  s2, s2, v0
+// 0x0109c148: 0x109c148: subu  s2, s2, v0
 	ldloc 12
 	ldloc 5
 	sub
 	stloc 12
-// 0x0109bb04: 0x109bb04: jal   0x104e020 sw    s2, 16(sp)
+// 0x0109c14c: 0x109c14c: jal   0x104e030 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2768,39 +2768,39 @@ L_109badc:
 	ldloc 12
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109bb0c: 0x109bb0c: div   v0, s1
+// 0x0109c154: 0x109c154: div   v0, s1
 	ldloc 5
 	ldloc 9
 	div
 	stloc 13
-// 0x0109bb10: 0x109bb10: addu  a0, s4, zero
+// 0x0109c158: 0x109c158: addu  a0, s4, zero
 	ldloc 17
 	stloc.1
-// 0x0109bb14: 0x109bb14: addiu a1, sp, 16
+// 0x0109c15c: 0x109c15c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0109bb18: 0x109bb18: addu  a2, zero, zero
+// 0x0109c160: 0x109c160: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109bb1c: 0x109bb1c: addu  a3, zero, zero
+// 0x0109c164: 0x109c164: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109bb20: 0x109bb20: mflo  lo
+// 0x0109c168: 0x109c168: mflo  lo
 	ldloc 13
 	stloc 9
-// 0x0109bb24: 0x109bb24: subu  s0, s0, s1
+// 0x0109c16c: 0x109c16c: subu  s0, s0, s1
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 8
-// 0x0109bb28: 0x109bb28: jal   0x104f4a8 sw    s0, 20(sp)
+// 0x0109c170: 0x109c170: jal   0x104f4b8 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2814,14 +2814,14 @@ L_109badc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109bb30:
-// 0x0109bb30: 0x109bb30: lw    ra, 100(sp)
-// 0x0109bb34: 0x109bb34: lw    s8, 96(sp)
+L_109c178:
+// 0x0109c178: 0x109c178: lw    ra, 100(sp)
+// 0x0109c17c: 0x109c17c: lw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2830,7 +2830,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 20
-// 0x0109bb38: 0x109bb38: lw    s7, 92(sp)
+// 0x0109c180: 0x109c180: lw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2839,7 +2839,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0109bb3c: 0x109bb3c: lw    s6, 88(sp)
+// 0x0109c184: 0x109c184: lw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2848,7 +2848,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0109bb40: 0x109bb40: lw    s5, 84(sp)
+// 0x0109c188: 0x109c188: lw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2857,7 +2857,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109bb44: 0x109bb44: lw    s4, 80(sp)
+// 0x0109c18c: 0x109c18c: lw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2866,7 +2866,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0109bb48: 0x109bb48: lw    s3, 76(sp)
+// 0x0109c190: 0x109c190: lw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2875,7 +2875,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109bb4c: 0x109bb4c: lw    s2, 72(sp)
+// 0x0109c194: 0x109c194: lw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2884,7 +2884,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109bb50: 0x109bb50: lw    s1, 68(sp)
+// 0x0109c198: 0x109c198: lw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2893,7 +2893,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109bb54: 0x109bb54: lw    s0, 64(sp)
+// 0x0109c19c: 0x109c19c: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2902,7 +2902,7 @@ L_109bb30:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109bb58: 0x109bb58: jr    ra addiu sp, sp, 104
+// 0x0109c1a0: 0x109c1a0: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -2914,7 +2914,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 list_callback_109bb60(int32,int32,int32,int32,int32)
+.method public static int32 list_callback_109c1a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 ra,int32 v0)
@@ -2949,7 +2949,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109bb60: 0x109bb60: lw    v1, 4(a0)
+// 0x0109c1a8: 0x109c1a8: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2958,12 +2958,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109bb64: 0x109bb64: addiu sp, sp, -24
+// 0x0109c1ac: 0x109c1ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109bb68: 0x109bb68: lw    a3, 116(v1)
+// 0x0109c1b0: 0x109c1b0: lw    a3, 116(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2972,22 +2972,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109bb6c: 0x109bb6c: sw    ra, 20(sp)
-// 0x0109bb70: 0x109bb70: lw    v1, 0(a3)
+// 0x0109c1b4: 0x109c1b4: sw    ra, 20(sp)
+// 0x0109c1b8: 0x109c1b8: lw    v1, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109bb74: 0x109bb74: sll   zero, zero, 0
-// 0x0109bb78: 0x109bb78: beq   v1, zero, 0x109bb8c addu  v0, zero, zero
+// 0x0109c1bc: 0x109c1bc: sll   zero, zero, 0
+// 0x0109c1c0: 0x109c1c0: beq   v1, zero, 0x109c1d4 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_109bb8c
+	brfalse L_109c1d4
 // --- basic block ---
-// 0x0109bb80: 0x109bb80: lw    a3, 12(a3)
+// 0x0109c1c8: 0x109c1c8: lw    a3, 12(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -2996,7 +2996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109bb84: 0x109bb84: jalr  v1 sll   zero, zero, 0
+// 0x0109c1cc: 0x109c1cc: jalr  v1 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3008,10 +3008,10 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 8
 // --- basic block ---
-L_109bb8c:
-// 0x0109bb8c: 0x109bb8c: lw    ra, 20(sp)
-// 0x0109bb90: 0x109bb90: sll   zero, zero, 0
-// 0x0109bb94: 0x109bb94: jr    ra addiu sp, sp, 24
+L_109c1d4:
+// 0x0109c1d4: 0x109c1d4: lw    ra, 20(sp)
+// 0x0109c1d8: 0x109c1d8: sll   zero, zero, 0
+// 0x0109c1dc: 0x109c1dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3023,7 +3023,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 del_callback_109bb9c(int32,int32,int32,int32,int32)
+.method public static int32 del_callback_109c1e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 ra,int32 v0)
@@ -3058,7 +3058,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109bb9c: 0x109bb9c: lw    v1, 4(a0)
+// 0x0109c1e4: 0x109c1e4: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3067,12 +3067,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109bba0: 0x109bba0: addiu sp, sp, -24
+// 0x0109c1e8: 0x109c1e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109bba4: 0x109bba4: lw    a3, 116(v1)
+// 0x0109c1ec: 0x109c1ec: lw    a3, 116(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3081,8 +3081,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109bba8: 0x109bba8: sw    ra, 20(sp)
-// 0x0109bbac: 0x109bbac: lw    v1, 4(a3)
+// 0x0109c1f0: 0x109c1f0: sw    ra, 20(sp)
+// 0x0109c1f4: 0x109c1f4: lw    v1, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -3091,14 +3091,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109bbb0: 0x109bbb0: sll   zero, zero, 0
-// 0x0109bbb4: 0x109bbb4: beq   v1, zero, 0x109bbc8 addu  v0, zero, zero
+// 0x0109c1f8: 0x109c1f8: sll   zero, zero, 0
+// 0x0109c1fc: 0x109c1fc: beq   v1, zero, 0x109c210 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_109bbc8
+	brfalse L_109c210
 // --- basic block ---
-// 0x0109bbbc: 0x109bbbc: lw    a3, 12(a3)
+// 0x0109c204: 0x109c204: lw    a3, 12(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -3107,7 +3107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109bbc0: 0x109bbc0: jalr  v1 sll   zero, zero, 0
+// 0x0109c208: 0x109c208: jalr  v1 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3119,10 +3119,10 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 8
 // --- basic block ---
-L_109bbc8:
-// 0x0109bbc8: 0x109bbc8: lw    ra, 20(sp)
-// 0x0109bbcc: 0x109bbcc: sll   zero, zero, 0
-// 0x0109bbd0: 0x109bbd0: jr    ra addiu sp, sp, 24
+L_109c210:
+// 0x0109c210: 0x109c210: lw    ra, 20(sp)
+// 0x0109c214: 0x109c214: sll   zero, zero, 0
+// 0x0109c218: 0x109c218: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3134,7 +3134,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 list_left_softkey_callback_109bbd8(int32,int32,int32,int32,int32)
+.method public static int32 list_left_softkey_callback_109c220(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 ra,int32 v0)
@@ -3169,7 +3169,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109bbd8: 0x109bbd8: lw    a2, 116(a0)
+// 0x0109c220: 0x109c220: lw    a2, 116(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3178,12 +3178,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109bbdc: 0x109bbdc: addiu sp, sp, -24
+// 0x0109c224: 0x109c224: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109bbe0: 0x109bbe0: lw    v1, 8(a2)
+// 0x0109c228: 0x109c228: lw    v1, 8(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3192,14 +3192,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109bbe4: 0x109bbe4: sw    ra, 20(sp)
-// 0x0109bbe8: 0x109bbe8: beq   v1, zero, 0x109bbfc addu  v0, zero, zero
+// 0x0109c22c: 0x109c22c: sw    ra, 20(sp)
+// 0x0109c230: 0x109c230: beq   v1, zero, 0x109c244 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_109bbfc
+	brfalse L_109c244
 // --- basic block ---
-// 0x0109bbf0: 0x109bbf0: lw    a2, 12(a2)
+// 0x0109c238: 0x109c238: lw    a2, 12(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3208,7 +3208,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109bbf4: 0x109bbf4: jalr  v1 sll   zero, zero, 0
+// 0x0109c23c: 0x109c23c: jalr  v1 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -3220,10 +3220,10 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 8
 // --- basic block ---
-L_109bbfc:
-// 0x0109bbfc: 0x109bbfc: lw    ra, 20(sp)
-// 0x0109bc00: 0x109bc00: sll   zero, zero, 0
-// 0x0109bc04: 0x109bc04: jr    ra addiu sp, sp, 24
+L_109c244:
+// 0x0109c244: 0x109c244: lw    ra, 20(sp)
+// 0x0109c248: 0x109c248: sll   zero, zero, 0
+// 0x0109c24c: 0x109c24c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3235,7 +3235,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_generic_list_dialog_hide_all_109bc0c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_generic_list_dialog_hide_all_109c254(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3270,13 +3270,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109bc0c: 0x109bc0c: addiu sp, sp, -24
+// 0x0109c254: 0x109c254: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109bc10: 0x109bc10: sw    ra, 20(sp)
-// 0x0109bc14: 0x109bc14: jal   0x1094a94 addu  a0, zero, zero
+// 0x0109c258: 0x109c258: sw    ra, 20(sp)
+// 0x0109c25c: 0x109c25c: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3284,14 +3284,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109bc1c: 0x109bc1c: lw    ra, 20(sp)
-// 0x0109bc20: 0x109bc20: sll   zero, zero, 0
-// 0x0109bc24: 0x109bc24: jr    ra addiu sp, sp, 24
+// 0x0109c264: 0x109c264: lw    ra, 20(sp)
+// 0x0109c268: 0x109c268: sll   zero, zero, 0
+// 0x0109c26c: 0x109c26c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3303,7 +3303,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_generic_list_dialog_hide_109bc2c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_generic_list_dialog_hide_109c274(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3338,21 +3338,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109bc2c: 0x109bc2c: lui   a0, 0x20000
+// 0x0109c274: 0x109c274: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109bc30: 0x109bc30: addiu sp, sp, -24
+// 0x0109c278: 0x109c278: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109bc34: 0x109bc34: addiu a0, a0, -2556
+// 0x0109c27c: 0x109c27c: addiu a0, a0, -2092
 	ldloc.1
-	ldc.i4 -2556
+	ldc.i4 -2092
 	add
 	stloc.1
-// 0x0109bc38: 0x109bc38: sw    ra, 20(sp)
-// 0x0109bc3c: 0x109bc3c: jal   0x1094884 addu  a1, zero, zero
+// 0x0109c280: 0x109c280: sw    ra, 20(sp)
+// 0x0109c284: 0x109c284: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3360,14 +3360,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109bc44: 0x109bc44: lw    ra, 20(sp)
-// 0x0109bc48: 0x109bc48: sll   zero, zero, 0
-// 0x0109bc4c: 0x109bc4c: jr    ra addiu sp, sp, 24
+// 0x0109c28c: 0x109c28c: lw    ra, 20(sp)
+// 0x0109c290: 0x109c290: sll   zero, zero, 0
+// 0x0109c294: 0x109c294: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3379,7 +3379,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_dialog_closed_109bce4(int32,int32,int32,int32,int32)
+.method public static int32 on_dialog_closed_109c32c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3414,34 +3414,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109bce4: 0x109bce4: lui   v0, 0x80000
+// 0x0109c32c: 0x109c32c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109bce8: 0x109bce8: lw    a0, 9828(v0)
+// 0x0109c330: 0x109c330: lw    a0, 10292(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109bcec: 0x109bcec: addiu sp, sp, -24
+// 0x0109c334: 0x109c334: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109bcf0: 0x109bcf0: sw    ra, 20(sp)
-// 0x0109bcf4: 0x109bcf4: jal   0x1099174 addu  a1, zero, zero
+// 0x0109c338: 0x109c338: sw    ra, 20(sp)
+// 0x0109c33c: 0x109c33c: jal   0x10997bc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x0109bcfc: 0x109bcfc: lw    ra, 20(sp)
-// 0x0109bd00: 0x109bd00: sll   zero, zero, 0
-// 0x0109bd04: 0x109bd04: jr    ra addiu sp, sp, 24
+// 0x0109c344: 0x109c344: lw    ra, 20(sp)
+// 0x0109c348: 0x109c348: sll   zero, zero, 0
+// 0x0109c34c: 0x109c34c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3453,7 +3453,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_generic_list_dialog_show_109bf18(int32,int32,int32,int32,int32)
+.method public static int32 ssd_generic_list_dialog_show_109c560(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s5,int32 s1,int32 s2,int32 s3,int32 s4,int32 s6,int32 ra,int32 t0,int32 t1)
@@ -3515,12 +3515,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109bf18: 0x109bf18: addiu sp, sp, -72
+// 0x0109c560: 0x109c560: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0109bf1c: 0x109bf1c: lw    t1, 88(sp)
+// 0x0109c564: 0x109c564: lw    t1, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3529,24 +3529,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0109bf20: 0x109bf20: lui   v1, 0x80000
+// 0x0109c568: 0x109c568: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109bf24: 0x109bf24: addiu v0, v1, 9848
+// 0x0109c56c: 0x109c56c: addiu v0, v1, 10312
 	ldloc 7
-	ldc.i4 9848
+	ldc.i4 10312
 	add
 	stloc 6
-// 0x0109bf28: 0x109bf28: sw    t1, 9848(v1)
+// 0x0109c570: 0x109c570: sw    t1, 10312(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2462
+	ldc.i4 2578
 	add
 	ldloc 17
 	stelem.i4
-// 0x0109bf2c: 0x109bf2c: lw    v1, 92(sp)
+// 0x0109c574: 0x109c574: lw    v1, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3555,7 +3555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109bf30: 0x109bf30: sw    s0, 40(sp)
+// 0x0109c578: 0x109c578: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3564,10 +3564,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109bf34: 0x109bf34: lui   s0, 0x80000
+// 0x0109c57c: 0x109c57c: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0109bf38: 0x109bf38: sw    v1, 4(v0)
+// 0x0109c580: 0x109c580: sw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3576,16 +3576,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109bf3c: 0x109bf3c: lw    t0, 9828(s0)
+// 0x0109c584: 0x109c584: lw    t0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109bf40: 0x109bf40: lw    v1, 96(sp)
+// 0x0109c588: 0x109c588: lw    v1, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3594,7 +3594,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109bf44: 0x109bf44: sw    s4, 56(sp)
+// 0x0109c58c: 0x109c58c: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3603,7 +3603,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109bf48: 0x109bf48: sw    s3, 52(sp)
+// 0x0109c590: 0x109c590: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3612,7 +3612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109bf4c: 0x109bf4c: sw    s2, 48(sp)
+// 0x0109c594: 0x109c594: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3621,7 +3621,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109bf50: 0x109bf50: sw    s1, 44(sp)
+// 0x0109c598: 0x109c598: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3630,8 +3630,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109bf54: 0x109bf54: sw    ra, 68(sp)
-// 0x0109bf58: 0x109bf58: sw    s6, 64(sp)
+// 0x0109c59c: 0x109c59c: sw    ra, 68(sp)
+// 0x0109c5a0: 0x109c5a0: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3640,7 +3640,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109bf5c: 0x109bf5c: sw    s5, 60(sp)
+// 0x0109c5a4: 0x109c5a4: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3649,7 +3649,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109bf60: 0x109bf60: sw    v1, 12(v0)
+// 0x0109c5a8: 0x109c5a8: sw    v1, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3658,7 +3658,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109bf64: 0x109bf64: sw    zero, 8(v0)
+// 0x0109c5ac: 0x109c5ac: sw    zero, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3667,46 +3667,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109bf68: 0x109bf68: addu  s4, a0, zero
+// 0x0109c5b0: 0x109c5b0: addu  s4, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0109bf6c: 0x109bf6c: addu  s3, a1, zero
+// 0x0109c5b4: 0x109c5b4: addu  s3, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0109bf70: 0x109bf70: addu  s2, a2, zero
+// 0x0109c5b8: 0x109c5b8: addu  s2, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0109bf74: 0x109bf74: bne   t0, zero, 0x109bfd0 addu  s1, a3, zero
+// 0x0109c5bc: 0x109c5bc: bne   t0, zero, 0x109c618 addu  s1, a3, zero
 	ldloc 16
 	ldloc 4
 	stloc 10
-	brtrue L_109bfd0
+	brtrue L_109c618
 // --- basic block ---
-// 0x0109bf7c: 0x109bf7c: lui   a0, 0x20000
+// 0x0109c5c4: 0x109c5c4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109bf80: 0x109bf80: lui   a1, 0x10000
+// 0x0109c5c8: 0x109c5c8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0109bf84: 0x109bf84: lui   a2, 0x10a0000
+// 0x0109c5cc: 0x109c5cc: lui   a2, 0x10a0000
 	ldc.i4 17432576
 	stloc.3
-// 0x0109bf88: 0x109bf88: addiu a0, a0, -2556
+// 0x0109c5d0: 0x109c5d0: addiu a0, a0, -2092
 	ldloc.1
-	ldc.i4 -2556
+	ldc.i4 -2092
 	add
 	stloc.1
-// 0x0109bf8c: 0x109bf8c: addiu a1, a1, 18500
+// 0x0109c5d4: 0x109c5d4: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109bf90: 0x109bf90: addiu a2, a2, -17180
+// 0x0109c5d8: 0x109c5d8: addiu a2, a2, -15572
 	ldloc.3
-	ldc.i4 -17180
+	ldc.i4 -15572
 	add
 	stloc.3
-// 0x0109bf94: 0x109bf94: jal   0x1095a08 addiu a3, zero, 8192
+// 0x0109c5dc: 0x109c5dc: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -3714,38 +3714,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109bf9c: 0x109bf9c: lui   a0, 0x10000
+// 0x0109c5e4: 0x109c5e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0109bfa0: 0x109bfa0: addiu a0, a0, -7504
+// 0x0109c5e8: 0x109c5e8: addiu a0, a0, -7508
 	ldloc.1
-	ldc.i4 -7504
+	ldc.i4 -7508
 	add
 	stloc.1
-// 0x0109bfa4: 0x109bfa4: addiu a1, zero, -2
+// 0x0109c5ec: 0x109c5ec: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x0109bfa8: 0x109bfa8: addiu a2, zero, -2
+// 0x0109c5f0: 0x109c5f0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0109bfac: 0x109bfac: addu  a3, zero, zero
+// 0x0109c5f4: 0x109c5f4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109bfb0: 0x109bfb0: sw    v0, 9828(s0)
+// 0x0109c5f8: 0x109c5f8: sw    v0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109bfb4: 0x109bfb4: sw    zero, 16(sp)
+// 0x0109c5fc: 0x109c5fc: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3754,7 +3754,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109bfb8: 0x109bfb8: jal   0x1092750 sw    zero, 20(sp)
+// 0x0109c600: 0x109c600: jal   0x1092d74 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3768,49 +3768,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_new_1092750(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109bfc0: 0x109bfc0: lw    a0, 9828(s0)
+// 0x0109c608: 0x109c608: lw    a0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109bfc4: 0x109bfc4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0109c60c: 0x109c60c: jal   0x109950c addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109bfcc: 0x109bfcc: lui   s0, 0x80000
+// 0x0109c614: 0x109c614: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_109bfd0:
-// 0x0109bfd0: 0x109bfd0: lw    a0, 9828(s0)
+L_109c618:
+// 0x0109c618: 0x109c618: lw    a0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109bfd4: 0x109bfd4: lui   a1, 0x10000
+// 0x0109c61c: 0x109c61c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0109bfd8: 0x109bfd8: jal   0x109b304 addiu a1, a1, -7504
+// 0x0109c620: 0x109c620: jal   0x109b94c addiu a1, a1, -7508
 	ldloc.2
-	ldc.i4 -7504
+	ldc.i4 -7508
 	add
 	stloc.2
 	ldloc.0
@@ -3818,27 +3818,27 @@ L_109bfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109bfe0: 0x109bfe0: lw    a0, 9828(s0)
+// 0x0109c628: 0x109c628: lw    a0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109bfe4: 0x109bfe4: addu  a2, zero, zero
+// 0x0109c62c: 0x109c62c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109bfe8: 0x109bfe8: addu  a1, zero, zero
+// 0x0109c630: 0x109c630: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109bfec: 0x109bfec: jal   0x1098f84 addu  s5, v0, zero
+// 0x0109c634: 0x109c634: jal   0x10995cc addu  s5, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -3846,26 +3846,26 @@ L_109bfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109bff4: 0x109bff4: lui   a0, 0x20000
+// 0x0109c63c: 0x109c63c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109bff8: 0x109bff8: lw    s6, 9828(s0)
+// 0x0109c640: 0x109c640: lw    s6, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109bffc: 0x109bffc: jal   0x101cd60 addiu a0, a0, -3216
+// 0x0109c644: 0x109c644: jal   0x101cd70 addiu a0, a0, -2752
 	ldloc.1
-	ldc.i4 -3216
+	ldc.i4 -2752
 	add
 	stloc.1
 	ldloc.0
@@ -3873,15 +3873,15 @@ L_109bfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c004: 0x109c004: addu  a1, v0, zero
+// 0x0109c64c: 0x109c64c: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x0109c008: 0x109c008: jal   0x109b434 addu  a0, s6, zero
+// 0x0109c650: 0x109c650: jal   0x109ba7c addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -3889,38 +3889,38 @@ L_109bfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c010: 0x109c010: lw    a0, 9828(s0)
+// 0x0109c658: 0x109c658: lw    a0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c014: 0x109c014: jal   0x1099174 addu  a1, zero, zero
+// 0x0109c65c: 0x109c65c: jal   0x10997bc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x0109c01c: 0x109c01c: lw    v0, 9828(s0)
+// 0x0109c664: 0x109c664: lw    v0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c020: 0x109c020: sll   zero, zero, 0
-// 0x0109c024: 0x109c024: lw    a0, 4(v0)
+// 0x0109c668: 0x109c668: sll   zero, zero, 0
+// 0x0109c66c: 0x109c66c: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3929,7 +3929,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c028: 0x109c028: lw    v0, 176(v0)
+// 0x0109c670: 0x109c670: lw    v0, 176(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3938,8 +3938,8 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c02c: 0x109c02c: sll   zero, zero, 0
-// 0x0109c030: 0x109c030: jalr  v0 addu  a1, s4, zero
+// 0x0109c674: 0x109c674: sll   zero, zero, 0
+// 0x0109c678: 0x109c678: jalr  v0 addu  a1, s4, zero
 	ldloc 6
 	ldloc 13
 	stloc.2
@@ -3953,28 +3953,28 @@ L_109bfd0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c038: 0x109c038: lw    a0, 9828(s0)
+// 0x0109c680: 0x109c680: lw    a0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c03c: 0x109c03c: lui   a1, 0x80000
+// 0x0109c684: 0x109c684: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x0109c040: 0x109c040: jal   0x1098fd8 addiu a1, a1, 9848
+// 0x0109c688: 0x109c688: jal   0x1099620 addiu a1, a1, 10312
 	ldloc.2
-	ldc.i4 9848
+	ldc.i4 10312
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_context_1098fd8(int32,int32)
+	call void Cibyl114::ssd_widget_set_context_1099620(int32,int32)
 // --- basic block ---
-// 0x0109c048: 0x109c048: lw    a0, 4(s5)
+// 0x0109c690: 0x109c690: lw    a0, 4(s5)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3983,38 +3983,38 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c04c: 0x109c04c: jal   0x1098ff8 sll   zero, zero, 0
+// 0x0109c694: 0x109c694: jal   0x1099640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c054: 0x109c054: lw    a0, 9828(s0)
+// 0x0109c69c: 0x109c69c: lw    a0, 10292(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2457
+	ldc.i4 2573
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c058: 0x109c058: jal   0x1099048 sll   zero, zero, 0
+// 0x0109c6a0: 0x109c6a0: jal   0x1099690 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c060: 0x109c060: lw    a1, 100(sp)
+// 0x0109c6a8: 0x109c6a8: lw    a1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4023,7 +4023,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109c064: 0x109c064: jal   0x1091748 addu  a0, s5, zero
+// 0x0109c6ac: 0x109c6ac: jal   0x1091d6c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4031,20 +4031,20 @@ L_109bfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c06c: 0x109c06c: lui   v0, 0x10a0000
+// 0x0109c6b4: 0x109c6b4: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x0109c070: 0x109c070: addiu v0, v0, -17568
+// 0x0109c6b8: 0x109c6b8: addiu v0, v0, -15960
 	ldloc 6
-	ldc.i4 -17568
+	ldc.i4 -15960
 	add
 	stloc 6
-// 0x0109c074: 0x109c074: sw    v0, 24(sp)
+// 0x0109c6bc: 0x109c6bc: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4053,27 +4053,27 @@ L_109bfd0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109c078: 0x109c078: lui   v0, 0x10a0000
+// 0x0109c6c0: 0x109c6c0: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x0109c07c: 0x109c07c: addu  a2, s2, zero
+// 0x0109c6c4: 0x109c6c4: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x0109c080: 0x109c080: addu  a3, s1, zero
+// 0x0109c6c8: 0x109c6c8: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x0109c084: 0x109c084: addu  a0, s5, zero
+// 0x0109c6cc: 0x109c6cc: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x0109c088: 0x109c088: addu  a1, s3, zero
+// 0x0109c6d0: 0x109c6d0: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x0109c08c: 0x109c08c: addiu v0, v0, -17508
+// 0x0109c6d4: 0x109c6d4: addiu v0, v0, -15900
 	ldloc 6
-	ldc.i4 -17508
+	ldc.i4 -15900
 	add
 	stloc 6
-// 0x0109c090: 0x109c090: sw    v0, 28(sp)
+// 0x0109c6d8: 0x109c6d8: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4082,7 +4082,7 @@ L_109bfd0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109c094: 0x109c094: sw    zero, 16(sp)
+// 0x0109c6dc: 0x109c6dc: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4091,7 +4091,7 @@ L_109bfd0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109c098: 0x109c098: sw    zero, 20(sp)
+// 0x0109c6e0: 0x109c6e0: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4100,7 +4100,7 @@ L_109bfd0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109c09c: 0x109c09c: jal   0x10924c8 sw    zero, 32(sp)
+// 0x0109c6e4: 0x109c6e4: jal   0x1092aec sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4114,20 +4114,20 @@ L_109bfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_10924c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_1092aec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c0a4: 0x109c0a4: lui   a0, 0x20000
+// 0x0109c6ec: 0x109c6ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109c0a8: 0x109c0a8: addiu a0, a0, -2556
+// 0x0109c6f0: 0x109c6f0: addiu a0, a0, -2092
 	ldloc.1
-	ldc.i4 -2556
+	ldc.i4 -2092
 	add
 	stloc.1
-// 0x0109c0ac: 0x109c0ac: jal   0x1095eec addu  a1, zero, zero
+// 0x0109c6f4: 0x109c6f4: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4135,24 +4135,24 @@ L_109bfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c0b4: 0x109c0b4: jal   0x109483c sll   zero, zero, 0
+// 0x0109c6fc: 0x109c6fc: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c0bc: 0x109c0bc: lw    ra, 68(sp)
-// 0x0109c0c0: 0x109c0c0: lw    s6, 64(sp)
+// 0x0109c704: 0x109c704: lw    ra, 68(sp)
+// 0x0109c708: 0x109c708: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4161,7 +4161,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109c0c4: 0x109c0c4: lw    s5, 60(sp)
+// 0x0109c70c: 0x109c70c: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4170,7 +4170,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c0c8: 0x109c0c8: lw    s4, 56(sp)
+// 0x0109c710: 0x109c710: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4179,7 +4179,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109c0cc: 0x109c0cc: lw    s3, 52(sp)
+// 0x0109c714: 0x109c714: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4188,7 +4188,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109c0d0: 0x109c0d0: lw    s2, 48(sp)
+// 0x0109c718: 0x109c718: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4197,7 +4197,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c0d4: 0x109c0d4: lw    s1, 44(sp)
+// 0x0109c71c: 0x109c71c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4206,7 +4206,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c0d8: 0x109c0d8: lw    s0, 40(sp)
+// 0x0109c720: 0x109c720: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4215,7 +4215,7 @@ L_109bfd0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c0dc: 0x109c0dc: jr    ra addiu sp, sp, 72
+// 0x0109c724: 0x109c724: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -4227,7 +4227,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 get_value_109c0e4(int32)
+.method public static int32 get_value_109c72c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -4247,7 +4247,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c0e4: 0x109c0e4: lw    v0, 4(a0)
+// 0x0109c72c: 0x109c72c: lw    v0, 4(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -4256,8 +4256,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c0e8: 0x109c0e8: sll   zero, zero, 0
-// 0x0109c0ec: 0x109c0ec: lw    v0, 164(v0)
+// 0x0109c730: 0x109c730: sll   zero, zero, 0
+// 0x0109c734: 0x109c734: lw    v0, 164(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -4266,8 +4266,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c0f0: 0x109c0f0: sll   zero, zero, 0
-// 0x0109c0f4: 0x109c0f4: lw    v0, 12(v0)
+// 0x0109c738: 0x109c738: sll   zero, zero, 0
+// 0x0109c73c: 0x109c73c: lw    v0, 12(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -4276,28 +4276,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c0f8: 0x109c0f8: sll   zero, zero, 0
-// 0x0109c0fc: 0x109c0fc: beq   v0, zero, 0x109c110 sll   zero, zero, 0
+// 0x0109c740: 0x109c740: sll   zero, zero, 0
+// 0x0109c744: 0x109c744: beq   v0, zero, 0x109c758 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109c110
+	brfalse L_109c758
 // --- basic block ---
-// 0x0109c104: 0x109c104: lui   v0, 0x0
+// 0x0109c74c: 0x109c74c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0109c108: 0x109c108: jr    ra addiu v0, v0, 20820
+// 0x0109c750: 0x109c750: jr    ra addiu v0, v0, 20820
 	ldloc.1
 	ldc.i4 20820
 	add
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_109c110:
-// 0x0109c110: 0x109c110: lui   v0, 0x20000
+L_109c758:
+// 0x0109c758: 0x109c758: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109c114: 0x109c114: jr    ra addiu v0, v0, 9464
+// 0x0109c75c: 0x109c75c: jr    ra addiu v0, v0, 9928
 	ldloc.1
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.1
 	br __CIBYL_function_return
@@ -4305,7 +4305,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 get_data_109c11c(int32)
+.method public static int32 get_data_109c764(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -4325,7 +4325,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c11c: 0x109c11c: lw    v0, 164(a0)
+// 0x0109c764: 0x109c764: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4334,8 +4334,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c120: 0x109c120: sll   zero, zero, 0
-// 0x0109c124: 0x109c124: lw    v0, 12(v0)
+// 0x0109c768: 0x109c768: sll   zero, zero, 0
+// 0x0109c76c: 0x109c76c: lw    v0, 12(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4344,28 +4344,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c128: 0x109c128: sll   zero, zero, 0
-// 0x0109c12c: 0x109c12c: beq   v0, zero, 0x109c140 sll   zero, zero, 0
+// 0x0109c770: 0x109c770: sll   zero, zero, 0
+// 0x0109c774: 0x109c774: beq   v0, zero, 0x109c788 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109c140
+	brfalse L_109c788
 // --- basic block ---
-// 0x0109c134: 0x109c134: lui   v0, 0x0
+// 0x0109c77c: 0x109c77c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0109c138: 0x109c138: jr    ra addiu v0, v0, 20820
+// 0x0109c780: 0x109c780: jr    ra addiu v0, v0, 20820
 	ldloc.1
 	ldc.i4 20820
 	add
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_109c140:
-// 0x0109c140: 0x109c140: lui   v0, 0x20000
+L_109c788:
+// 0x0109c788: 0x109c788: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109c144: 0x109c144: jr    ra addiu v0, v0, 9464
+// 0x0109c78c: 0x109c78c: jr    ra addiu v0, v0, 9928
 	ldloc.1
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.1
 	br __CIBYL_function_return
@@ -4373,7 +4373,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s5,int32 s2,int32 s3,int32 s4,int32 s6,int32 s7,int32 ra)
@@ -4432,12 +4432,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c14c: 0x109c14c: addiu sp, sp, -72
+// 0x0109c794: 0x109c794: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0109c150: 0x109c150: sw    s7, 64(sp)
+// 0x0109c798: 0x109c798: sw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4446,14 +4446,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109c154: 0x109c154: addu  s7, a0, zero
+// 0x0109c79c: 0x109c79c: addu  s7, a0, zero
 	ldloc.1
 	stloc 15
-// 0x0109c158: 0x109c158: addiu a0, zero, 20
+// 0x0109c7a0: 0x109c7a0: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0109c15c: 0x109c15c: sw    ra, 68(sp)
-// 0x0109c160: 0x109c160: sw    s6, 60(sp)
+// 0x0109c7a4: 0x109c7a4: sw    ra, 68(sp)
+// 0x0109c7a8: 0x109c7a8: sw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4462,7 +4462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109c164: 0x109c164: sw    s5, 56(sp)
+// 0x0109c7ac: 0x109c7ac: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4471,10 +4471,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c168: 0x109c168: addu  s6, a3, zero
+// 0x0109c7b0: 0x109c7b0: addu  s6, a3, zero
 	ldloc 4
 	stloc 14
-// 0x0109c16c: 0x109c16c: sw    s4, 52(sp)
+// 0x0109c7b4: 0x109c7b4: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4483,7 +4483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109c170: 0x109c170: sw    s3, 48(sp)
+// 0x0109c7b8: 0x109c7b8: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4492,7 +4492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109c174: 0x109c174: sw    s2, 44(sp)
+// 0x0109c7bc: 0x109c7bc: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4501,7 +4501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c178: 0x109c178: sw    s1, 40(sp)
+// 0x0109c7c0: 0x109c7c0: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4510,10 +4510,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c17c: 0x109c17c: addu  s2, a1, zero
+// 0x0109c7c4: 0x109c7c4: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0109c180: 0x109c180: sw    s0, 36(sp)
+// 0x0109c7c8: 0x109c7c8: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4522,7 +4522,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c184: 0x109c184: lw    s5, 96(sp)
+// 0x0109c7cc: 0x109c7cc: lw    s5, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4531,7 +4531,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c188: 0x109c188: lw    s4, 88(sp)
+// 0x0109c7d0: 0x109c7d0: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4540,7 +4540,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109c18c: 0x109c18c: lw    s3, 92(sp)
+// 0x0109c7d4: 0x109c7d4: lw    s3, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4549,7 +4549,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109c190: 0x109c190: jal   0x1000910 addu  s1, a2, zero
+// 0x0109c7d8: 0x109c7d8: jal   0x1000910 addu  s1, a2, zero
 	ldloc.3
 	stloc 9
 	ldloc.0
@@ -4562,16 +4562,16 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109c198: 0x109c198: addu  a0, v0, zero
+// 0x0109c7e0: 0x109c7e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109c19c: 0x109c19c: addu  a1, zero, zero
+// 0x0109c7e4: 0x109c7e4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109c1a0: 0x109c1a0: addiu a2, zero, 20
+// 0x0109c7e8: 0x109c7e8: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x0109c1a4: 0x109c1a4: jal   0x100177c addu  s0, v0, zero
+// 0x0109c7ec: 0x109c7ec: jal   0x100177c addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.1
@@ -4583,19 +4583,19 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109c1ac: 0x109c1ac: addu  a0, s7, zero
+// 0x0109c7f4: 0x109c7f4: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-// 0x0109c1b0: 0x109c1b0: addu  a1, zero, zero
+// 0x0109c7f8: 0x109c7f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109c1b4: 0x109c1b4: addiu a2, zero, -1
+// 0x0109c7fc: 0x109c7fc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0109c1b8: 0x109c1b8: addiu a3, zero, -1
+// 0x0109c800: 0x109c800: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0109c1bc: 0x109c1bc: jal   0x1093a24 sw    s1, 16(sp)
+// 0x0109c804: 0x109c804: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4609,37 +4609,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109c1c4: 0x109c1c4: addu  a0, v0, zero
+// 0x0109c80c: 0x109c80c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109c1c8: 0x109c1c8: addu  a1, zero, zero
+// 0x0109c810: 0x109c810: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109c1cc: 0x109c1cc: addu  a2, zero, zero
+// 0x0109c814: 0x109c814: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109c1d0: 0x109c1d0: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0109c818: 0x109c818: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109c1d8: 0x109c1d8: lui   v0, 0x10a0000
+// 0x0109c820: 0x109c820: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109c1dc: 0x109c1dc: addiu v0, v0, -16156
+// 0x0109c824: 0x109c824: addiu v0, v0, -14548
 	ldloc 5
-	ldc.i4 -16156
+	ldc.i4 -14548
 	add
 	stloc 5
-// 0x0109c1e0: 0x109c1e0: sw    v0, 168(s1)
+// 0x0109c828: 0x109c828: sw    v0, 168(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4648,15 +4648,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109c1e4: 0x109c1e4: lui   v0, 0x10a0000
+// 0x0109c82c: 0x109c82c: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109c1e8: 0x109c1e8: addiu v0, v0, -16100
+// 0x0109c830: 0x109c830: addiu v0, v0, -14492
 	ldloc 5
-	ldc.i4 -16100
+	ldc.i4 -14492
 	add
 	stloc 5
-// 0x0109c1ec: 0x109c1ec: sw    v0, 172(s1)
+// 0x0109c834: 0x109c834: sw    v0, 172(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4665,22 +4665,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109c1f0: 0x109c1f0: lui   v0, 0x10a0000
+// 0x0109c838: 0x109c838: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109c1f4: 0x109c1f4: addiu v0, v0, -15280
+// 0x0109c83c: 0x109c83c: addiu v0, v0, -13672
 	ldloc 5
-	ldc.i4 -15280
+	ldc.i4 -13672
 	add
 	stloc 5
-// 0x0109c1f8: 0x109c1f8: sw    s6, 0(s0)
+// 0x0109c840: 0x109c840: sw    s6, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-// 0x0109c1fc: 0x109c1fc: sw    v0, 176(s1)
+// 0x0109c844: 0x109c844: sw    v0, 176(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4689,15 +4689,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109c200: 0x109c200: lui   v0, 0x10a0000
+// 0x0109c848: 0x109c848: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109c204: 0x109c204: addiu v0, v0, -15480
+// 0x0109c84c: 0x109c84c: addiu v0, v0, -13872
 	ldloc 5
-	ldc.i4 -15480
+	ldc.i4 -13872
 	add
 	stloc 5
-// 0x0109c208: 0x109c208: sw    v0, 180(s1)
+// 0x0109c850: 0x109c850: sw    v0, 180(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4706,7 +4706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109c20c: 0x109c20c: sw    s2, 12(s0)
+// 0x0109c854: 0x109c854: sw    s2, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4715,7 +4715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c210: 0x109c210: sw    s5, 16(s0)
+// 0x0109c858: 0x109c858: sw    s5, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4724,7 +4724,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c214: 0x109c214: sw    s0, 164(s1)
+// 0x0109c85c: 0x109c85c: sw    s0, 164(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4733,7 +4733,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c218: 0x109c218: bne   s4, zero, 0x109c23c sw    zero, 108(s1)
+// 0x0109c860: 0x109c860: bne   s4, zero, 0x109c884 sw    zero, 108(s1)
 	ldloc 13
 	ldloc 6
 	ldloc 9
@@ -4743,34 +4743,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_109c23c
+	brtrue L_109c884
 // --- basic block ---
-// 0x0109c220: 0x109c220: lui   v0, 0x20000
+// 0x0109c868: 0x109c868: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0109c224: 0x109c224: addiu v0, v0, 29624
+// 0x0109c86c: 0x109c86c: addiu v0, v0, 30088
 	ldloc 5
-	ldc.i4 29624
+	ldc.i4 30088
 	add
 	stloc 5
-// 0x0109c228: 0x109c228: sll   s5, s5, 2
+// 0x0109c870: 0x109c870: sll   s5, s5, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x0109c22c: 0x109c22c: addu  s5, s5, v0
+// 0x0109c874: 0x109c874: addu  s5, s5, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x0109c230: 0x109c230: lw    v0, 0(s5)
+// 0x0109c878: 0x109c878: lw    v0, 0(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109c234: 0x109c234: j	 0x109c240 sw    v0, 4(s0)
+// 0x0109c87c: 0x109c87c: j	 0x109c888 sw    v0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4779,10 +4779,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109c240
+	br L_109c888
 // --- basic block ---
-L_109c23c:
-// 0x0109c23c: 0x109c23c: sw    s4, 4(s0)
+L_109c884:
+// 0x0109c884: 0x109c884: sw    s4, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4791,14 +4791,14 @@ L_109c23c:
 	add
 	ldloc 13
 	stelem.i4
-L_109c240:
-// 0x0109c240: 0x109c240: bne   s3, zero, 0x109c268 lui   v0, 0x20000
+L_109c888:
+// 0x0109c888: 0x109c888: bne   s3, zero, 0x109c8b0 lui   v0, 0x20000
 	ldloc 12
 	ldc.i4 131072
 	stloc 5
-	brtrue L_109c268
+	brtrue L_109c8b0
 // --- basic block ---
-// 0x0109c248: 0x109c248: lw    v1, 16(s0)
+// 0x0109c890: 0x109c890: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4807,30 +4807,30 @@ L_109c240:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c24c: 0x109c24c: sll   zero, zero, 0
-// 0x0109c250: 0x109c250: sll   v1, v1, 2
+// 0x0109c894: 0x109c894: sll   zero, zero, 0
+// 0x0109c898: 0x109c898: sll   v1, v1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x0109c254: 0x109c254: addiu v0, v0, 29636
+// 0x0109c89c: 0x109c89c: addiu v0, v0, 30100
 	ldloc 5
-	ldc.i4 29636
+	ldc.i4 30100
 	add
 	stloc 5
-// 0x0109c258: 0x109c258: addu  v0, v1, v0
+// 0x0109c8a0: 0x109c8a0: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x0109c25c: 0x109c25c: lw    v0, 0(v0)
+// 0x0109c8a4: 0x109c8a4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109c260: 0x109c260: j	 0x109c26c sw    v0, 8(s0)
+// 0x0109c8a8: 0x109c8a8: j	 0x109c8b4 sw    v0, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4839,10 +4839,10 @@ L_109c240:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109c26c
+	br L_109c8b4
 // --- basic block ---
-L_109c268:
-// 0x0109c268: 0x109c268: sw    s3, 8(s0)
+L_109c8b0:
+// 0x0109c8b0: 0x109c8b0: sw    s3, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4851,65 +4851,65 @@ L_109c268:
 	add
 	ldloc 12
 	stelem.i4
-L_109c26c:
-// 0x0109c26c: 0x109c26c: lui   v0, 0x10a0000
+L_109c8b4:
+// 0x0109c8b4: 0x109c8b4: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109c270: 0x109c270: addiu v0, v0, -15600
+// 0x0109c8b8: 0x109c8b8: addiu v0, v0, -13992
 	ldloc 5
-	ldc.i4 -15600
+	ldc.i4 -13992
 	add
 	stloc 5
-// 0x0109c274: 0x109c274: lui   a0, 0x20000
+// 0x0109c8bc: 0x109c8bc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109c278: 0x109c278: beq   s2, zero, 0x109c290 lui   a1, 0x10000
+// 0x0109c8c0: 0x109c8c0: beq   s2, zero, 0x109c8d8 lui   a1, 0x10000
 	ldloc 11
 	ldc.i4 65536
 	stloc.2
-	brfalse L_109c290
+	brfalse L_109c8d8
 // --- basic block ---
-// 0x0109c280: 0x109c280: addiu a0, a0, -2540
+// 0x0109c8c8: 0x109c8c8: addiu a0, a0, -2076
 	ldloc.1
-	ldc.i4 -2540
+	ldc.i4 -2076
 	add
 	stloc.1
-// 0x0109c284: 0x109c284: addiu a1, a1, 18500
+// 0x0109c8cc: 0x109c8cc: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109c288: 0x109c288: j	 0x109c29c addiu a2, s0, 4
+// 0x0109c8d0: 0x109c8d0: j	 0x109c8e4 addiu a2, s0, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc.3
-	br L_109c29c
+	br L_109c8e4
 // --- basic block ---
-L_109c290:
-// 0x0109c290: 0x109c290: addiu a0, a0, -2540
+L_109c8d8:
+// 0x0109c8d8: 0x109c8d8: addiu a0, a0, -2076
 	ldloc.1
-	ldc.i4 -2540
+	ldc.i4 -2076
 	add
 	stloc.1
-// 0x0109c294: 0x109c294: addiu a1, a1, 18500
+// 0x0109c8dc: 0x109c8dc: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109c298: 0x109c298: addiu a2, s0, 8
+// 0x0109c8e0: 0x109c8e0: addiu a2, s0, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc.3
-L_109c29c:
-// 0x0109c29c: 0x109c29c: addiu v1, zero, 16
+L_109c8e4:
+// 0x0109c8e4: 0x109c8e4: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 8
-// 0x0109c2a0: 0x109c2a0: addiu a3, zero, 1
+// 0x0109c8e8: 0x109c8e8: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0109c2a4: 0x109c2a4: sw    v1, 16(sp)
+// 0x0109c8ec: 0x109c8ec: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4918,7 +4918,7 @@ L_109c29c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c2a8: 0x109c2a8: jal   0x1090ecc sw    v0, 20(sp)
+// 0x0109c8f0: 0x109c8f0: jal   0x10914f0 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4932,18 +4932,18 @@ L_109c29c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109c2b0: 0x109c2b0: addu  a1, v0, zero
+// 0x0109c8f8: 0x109c8f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0109c2b4: 0x109c2b4: addu  a0, s1, zero
+// 0x0109c8fc: 0x109c8fc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109c2b8: 0x109c2b8: jal   0x1098ec4 sw    v0, 24(sp)
+// 0x0109c900: 0x109c900: jal   0x109950c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4954,12 +4954,12 @@ L_109c29c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109c2c0: 0x109c2c0: lw    v0, 24(sp)
+// 0x0109c908: 0x109c908: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4968,13 +4968,13 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109c2c4: 0x109c2c4: lui   s0, 0x0
+// 0x0109c90c: 0x109c90c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0109c2c8: 0x109c2c8: addu  a0, v0, zero
+// 0x0109c910: 0x109c910: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109c2cc: 0x109c2cc: jal   0x10991ac addiu a1, s0, 17524
+// 0x0109c914: 0x109c914: jal   0x10997f4 addiu a1, s0, 17524
 	ldloc 7
 	ldc.i4 17524
 	add
@@ -4984,15 +4984,15 @@ L_109c29c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109c2d4: 0x109c2d4: addu  a0, s1, zero
+// 0x0109c91c: 0x109c91c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109c2d8: 0x109c2d8: jal   0x10991ac addiu a1, s0, 17524
+// 0x0109c920: 0x109c920: jal   0x10997f4 addiu a1, s0, 17524
 	ldloc 7
 	ldc.i4 17524
 	add
@@ -5002,16 +5002,16 @@ L_109c29c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109c2e0: 0x109c2e0: lw    ra, 68(sp)
-// 0x0109c2e4: 0x109c2e4: addu  v0, s1, zero
+// 0x0109c928: 0x109c928: lw    ra, 68(sp)
+// 0x0109c92c: 0x109c92c: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-// 0x0109c2e8: 0x109c2e8: lw    s7, 64(sp)
+// 0x0109c930: 0x109c930: lw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5020,7 +5020,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109c2ec: 0x109c2ec: lw    s6, 60(sp)
+// 0x0109c934: 0x109c934: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5029,7 +5029,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109c2f0: 0x109c2f0: lw    s5, 56(sp)
+// 0x0109c938: 0x109c938: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5038,7 +5038,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c2f4: 0x109c2f4: lw    s4, 52(sp)
+// 0x0109c93c: 0x109c93c: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5047,7 +5047,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109c2f8: 0x109c2f8: lw    s3, 48(sp)
+// 0x0109c940: 0x109c940: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5056,7 +5056,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109c2fc: 0x109c2fc: lw    s2, 44(sp)
+// 0x0109c944: 0x109c944: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5065,7 +5065,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c300: 0x109c300: lw    s1, 40(sp)
+// 0x0109c948: 0x109c948: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5074,7 +5074,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c304: 0x109c304: lw    s0, 36(sp)
+// 0x0109c94c: 0x109c94c: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5083,7 +5083,7 @@ L_109c29c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c308: 0x109c308: jr    ra addiu sp, sp, 72
+// 0x0109c950: 0x109c950: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -5095,7 +5095,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 choice_callback_109c310(int32,int32,int32,int32,int32)
+.method public static int32 choice_callback_109c958(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -5139,7 +5139,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c310: 0x109c310: lw    v0, 4(a0)
+// 0x0109c958: 0x109c958: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5148,12 +5148,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c314: 0x109c314: addiu sp, sp, -32
+// 0x0109c95c: 0x109c95c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109c318: 0x109c318: sw    s0, 16(sp)
+// 0x0109c960: 0x109c960: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5162,7 +5162,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c31c: 0x109c31c: lw    s0, 164(v0)
+// 0x0109c964: 0x109c964: lw    s0, 164(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5171,7 +5171,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c320: 0x109c320: sw    s2, 24(sp)
+// 0x0109c968: 0x109c968: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5180,7 +5180,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c324: 0x109c324: lw    v0, 12(s0)
+// 0x0109c96c: 0x109c96c: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5189,7 +5189,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c328: 0x109c328: sw    s1, 20(sp)
+// 0x0109c970: 0x109c970: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5198,28 +5198,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c32c: 0x109c32c: addu  s2, a1, zero
+// 0x0109c974: 0x109c974: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109c330: 0x109c330: sw    ra, 28(sp)
-// 0x0109c334: 0x109c334: addu  s1, a0, zero
+// 0x0109c978: 0x109c978: sw    ra, 28(sp)
+// 0x0109c97c: 0x109c97c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109c338: 0x109c338: bne   v0, zero, 0x109c344 addiu a1, s0, 8
+// 0x0109c980: 0x109c980: bne   v0, zero, 0x109c98c addiu a1, s0, 8
 	ldloc 6
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc.2
-	brtrue L_109c344
+	brtrue L_109c98c
 // --- basic block ---
-// 0x0109c340: 0x109c340: addiu a1, s0, 4
+// 0x0109c988: 0x109c988: addiu a1, s0, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc.2
-L_109c344:
-// 0x0109c344: 0x109c344: jal   0x1090cbc addiu a2, zero, 1
+L_109c98c:
+// 0x0109c98c: 0x109c98c: jal   0x10912e0 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5227,12 +5227,12 @@ L_109c344:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_icon_1090cbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_icon_10912e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109c34c: 0x109c34c: lw    v1, 12(s0)
+// 0x0109c994: 0x109c994: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5241,19 +5241,19 @@ L_109c344:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c350: 0x109c350: lw    v0, 0(s0)
+// 0x0109c998: 0x109c998: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109c354: 0x109c354: sltiu v1, v1, 1
+// 0x0109c99c: 0x109c99c: sltiu v1, v1, 1
 	ldloc 8
 	ldc.i4.1
 	clt.un
 	stloc 8
-// 0x0109c358: 0x109c358: beq   v0, zero, 0x109c36c sw    v1, 12(s0)
+// 0x0109c9a0: 0x109c9a0: beq   v0, zero, 0x109c9b4 sw    v1, 12(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -5263,12 +5263,12 @@ L_109c344:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_109c36c
+	brfalse L_109c9b4
 // --- basic block ---
-// 0x0109c360: 0x109c360: addu  a0, s1, zero
+// 0x0109c9a8: 0x109c9a8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109c364: 0x109c364: jalr  v0 addu  a1, s2, zero
+// 0x0109c9ac: 0x109c9ac: jalr  v0 addu  a1, s2, zero
 	ldloc 6
 	ldloc 10
 	stloc.2
@@ -5282,12 +5282,12 @@ L_109c344:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_109c36c:
-// 0x0109c36c: 0x109c36c: lw    ra, 28(sp)
-// 0x0109c370: 0x109c370: addiu v0, zero, 1
+L_109c9b4:
+// 0x0109c9b4: 0x109c9b4: lw    ra, 28(sp)
+// 0x0109c9b8: 0x109c9b8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0109c374: 0x109c374: lw    s2, 24(sp)
+// 0x0109c9bc: 0x109c9bc: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5296,7 +5296,7 @@ L_109c36c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c378: 0x109c378: lw    s1, 20(sp)
+// 0x0109c9c0: 0x109c9c0: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5305,7 +5305,7 @@ L_109c36c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c37c: 0x109c37c: lw    s0, 16(sp)
+// 0x0109c9c4: 0x109c9c4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5314,7 +5314,7 @@ L_109c36c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c380: 0x109c380: jr    ra addiu sp, sp, 32
+// 0x0109c9c8: 0x109c9c8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5326,7 +5326,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 set_data_109c388(int32,int32,int32,int32,int32)
+.method public static int32 set_data_109c9d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -5370,12 +5370,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c388: 0x109c388: addiu sp, sp, -40
+// 0x0109c9d0: 0x109c9d0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109c38c: 0x109c38c: sw    s2, 32(sp)
+// 0x0109c9d4: 0x109c9d4: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5384,13 +5384,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c390: 0x109c390: addu  s2, a1, zero
+// 0x0109c9d8: 0x109c9d8: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109c394: 0x109c394: lui   a1, 0x0
+// 0x0109c9dc: 0x109c9dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0109c398: 0x109c398: sw    s1, 28(sp)
+// 0x0109c9e0: 0x109c9e0: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5399,15 +5399,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c39c: 0x109c39c: addiu a1, a1, 32116
+// 0x0109c9e4: 0x109c9e4: addiu a1, a1, 32116
 	ldloc.2
 	ldc.i4 32116
 	add
 	stloc.2
-// 0x0109c3a0: 0x109c3a0: addu  s1, a0, zero
+// 0x0109c9e8: 0x109c9e8: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109c3a4: 0x109c3a4: sw    s0, 24(sp)
+// 0x0109c9ec: 0x109c9ec: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5416,8 +5416,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c3a8: 0x109c3a8: sw    ra, 36(sp)
-// 0x0109c3ac: 0x109c3ac: lw    s0, 164(s1)
+// 0x0109c9f0: 0x109c9f0: sw    ra, 36(sp)
+// 0x0109c9f4: 0x109c9f4: lw    s0, 164(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5426,7 +5426,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c3b0: 0x109c3b0: jal   0x1001b14 addu  a0, s2, zero
+// 0x0109c9f8: 0x109c9f8: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -5434,16 +5434,16 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109c3b8: 0x109c3b8: beq   v0, zero, 0x109c3d4 lui   a1, 0x0
+// 0x0109ca00: 0x109ca00: beq   v0, zero, 0x109ca1c lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_109c3d4
+	brfalse L_109ca1c
 // --- basic block ---
-// 0x0109c3c0: 0x109c3c0: addu  a0, s2, zero
+// 0x0109ca08: 0x109ca08: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0109c3c4: 0x109c3c4: jal   0x1001b14 addiu a1, a1, 20820
+// 0x0109ca0c: 0x109ca0c: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5453,12 +5453,12 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109c3cc: 0x109c3cc: bne   v0, zero, 0x109c3f8 sll   zero, zero, 0
+// 0x0109ca14: 0x109ca14: bne   v0, zero, 0x109ca40 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109c3f8
+	brtrue L_109ca40
 // --- basic block ---
-L_109c3d4:
-// 0x0109c3d4: 0x109c3d4: lw    v0, 4(s0)
+L_109ca1c:
+// 0x0109ca1c: 0x109ca1c: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5467,10 +5467,10 @@ L_109c3d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109c3d8: 0x109c3d8: addiu v1, zero, 1
+// 0x0109ca20: 0x109ca20: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0109c3dc: 0x109c3dc: bne   v0, zero, 0x109c420 sw    v1, 12(s0)
+// 0x0109ca24: 0x109ca24: bne   v0, zero, 0x109ca68 sw    v1, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -5480,9 +5480,9 @@ L_109c3d4:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_109c420
+	brtrue L_109ca68
 // --- basic block ---
-// 0x0109c3e4: 0x109c3e4: lw    v1, 16(s0)
+// 0x0109ca2c: 0x109ca2c: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5491,23 +5491,23 @@ L_109c3d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c3e8: 0x109c3e8: lui   v0, 0x20000
+// 0x0109ca30: 0x109ca30: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0109c3ec: 0x109c3ec: sll   v1, v1, 2
+// 0x0109ca34: 0x109ca34: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0109c3f0: 0x109c3f0: j	 0x109c418 addiu v0, v0, 29624
+// 0x0109ca38: 0x109ca38: j	 0x109ca60 addiu v0, v0, 30088
 	ldloc 5
-	ldc.i4 29624
+	ldc.i4 30088
 	add
 	stloc 5
-	br L_109c418
+	br L_109ca60
 // --- basic block ---
-L_109c3f8:
-// 0x0109c3f8: 0x109c3f8: lw    v0, 8(s0)
+L_109ca40:
+// 0x0109ca40: 0x109ca40: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5516,8 +5516,8 @@ L_109c3f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109c3fc: 0x109c3fc: sll   zero, zero, 0
-// 0x0109c400: 0x109c400: bne   v0, zero, 0x109c420 sw    zero, 12(s0)
+// 0x0109ca44: 0x109ca44: sll   zero, zero, 0
+// 0x0109ca48: 0x109ca48: bne   v0, zero, 0x109ca68 sw    zero, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -5527,9 +5527,9 @@ L_109c3f8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_109c420
+	brtrue L_109ca68
 // --- basic block ---
-// 0x0109c408: 0x109c408: lw    v1, 16(s0)
+// 0x0109ca50: 0x109ca50: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5538,34 +5538,34 @@ L_109c3f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c40c: 0x109c40c: lui   v0, 0x20000
+// 0x0109ca54: 0x109ca54: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0109c410: 0x109c410: sll   v1, v1, 2
+// 0x0109ca58: 0x109ca58: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0109c414: 0x109c414: addiu v0, v0, 29636
+// 0x0109ca5c: 0x109ca5c: addiu v0, v0, 30100
 	ldloc 5
-	ldc.i4 29636
+	ldc.i4 30100
 	add
 	stloc 5
-L_109c418:
-// 0x0109c418: 0x109c418: addu  v0, v1, v0
+L_109ca60:
+// 0x0109ca60: 0x109ca60: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0109c41c: 0x109c41c: lw    v0, 0(v0)
+// 0x0109ca64: 0x109ca64: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-L_109c420:
-// 0x0109c420: 0x109c420: lw    a0, 12(s1)
+L_109ca68:
+// 0x0109ca68: 0x109ca68: lw    a0, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5574,15 +5574,15 @@ L_109c420:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c424: 0x109c424: addiu a1, sp, 16
+// 0x0109ca6c: 0x109ca6c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0109c428: 0x109c428: addiu a2, zero, 1
+// 0x0109ca70: 0x109ca70: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0109c42c: 0x109c42c: jal   0x1090cbc sw    v0, 16(sp)
+// 0x0109ca74: 0x109ca74: jal   0x10912e0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5596,16 +5596,16 @@ L_109c420:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_icon_1090cbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_icon_10912e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109c434: 0x109c434: lw    ra, 36(sp)
-// 0x0109c438: 0x109c438: addiu v0, zero, 1
+// 0x0109ca7c: 0x109ca7c: lw    ra, 36(sp)
+// 0x0109ca80: 0x109ca80: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109c43c: 0x109c43c: lw    s2, 32(sp)
+// 0x0109ca84: 0x109ca84: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5614,7 +5614,7 @@ L_109c420:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c440: 0x109c440: lw    s1, 28(sp)
+// 0x0109ca88: 0x109ca88: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5623,7 +5623,7 @@ L_109c420:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c444: 0x109c444: lw    s0, 24(sp)
+// 0x0109ca8c: 0x109ca8c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5632,7 +5632,7 @@ L_109c420:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c448: 0x109c448: jr    ra addiu sp, sp, 40
+// 0x0109ca90: 0x109ca90: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5644,7 +5644,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_value_109c450(int32,int32,int32,int32,int32)
+.method public static int32 set_value_109ca98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -5682,7 +5682,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c450: 0x109c450: lw    v0, 164(a0)
+// 0x0109ca98: 0x109ca98: lw    v0, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5691,19 +5691,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109c454: 0x109c454: addiu sp, sp, -32
+// 0x0109ca9c: 0x109ca9c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109c458: 0x109c458: lw    v0, 0(v0)
+// 0x0109caa0: 0x109caa0: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109c45c: 0x109c45c: sw    s0, 24(sp)
+// 0x0109caa4: 0x109caa4: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5712,17 +5712,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c460: 0x109c460: sw    ra, 28(sp)
-// 0x0109c464: 0x109c464: addu  s0, a0, zero
+// 0x0109caa8: 0x109caa8: sw    ra, 28(sp)
+// 0x0109caac: 0x109caac: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0109c468: 0x109c468: beq   v0, zero, 0x109c484 addu  a2, a1, zero
+// 0x0109cab0: 0x109cab0: beq   v0, zero, 0x109cacc addu  a2, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc.3
-	brfalse L_109c484
+	brfalse L_109cacc
 // --- basic block ---
-// 0x0109c470: 0x109c470: jalr  v0 sw    a1, 16(sp)
+// 0x0109cab8: 0x109cab8: jalr  v0 sw    a1, 16(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5742,7 +5742,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109c478: 0x109c478: lw    a2, 16(sp)
+// 0x0109cac0: 0x109cac0: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5751,22 +5751,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109c47c: 0x109c47c: beq   v0, zero, 0x109c498 addu  v1, zero, zero
+// 0x0109cac4: 0x109cac4: beq   v0, zero, 0x109cae0 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_109c498
+	brfalse L_109cae0
 // --- basic block ---
-L_109c484:
-// 0x0109c484: 0x109c484: lui   a1, 0x20000
+L_109cacc:
+// 0x0109cacc: 0x109cacc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109c488: 0x109c488: addu  a0, s0, zero
+// 0x0109cad0: 0x109cad0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109c48c: 0x109c48c: jal   0x109b3e0 addiu a1, a1, 9016
+// 0x0109cad4: 0x109cad4: jal   0x109ba28 addiu a1, a1, 9480
 	ldloc.2
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.2
 	ldloc.0
@@ -5774,20 +5774,20 @@ L_109c484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109c494: 0x109c494: addu  v1, v0, zero
+// 0x0109cadc: 0x109cadc: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_109c498:
-// 0x0109c498: 0x109c498: lw    ra, 28(sp)
-// 0x0109c49c: 0x109c49c: addu  v0, v1, zero
+L_109cae0:
+// 0x0109cae0: 0x109cae0: lw    ra, 28(sp)
+// 0x0109cae4: 0x109cae4: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x0109c4a0: 0x109c4a0: lw    s0, 24(sp)
+// 0x0109cae8: 0x109cae8: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5796,7 +5796,7 @@ L_109c498:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c4a4: 0x109c4a4: jr    ra addiu sp, sp, 32
+// 0x0109caec: 0x109caec: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5808,7 +5808,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+.method public static int32 ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra,int32 lo)
@@ -5867,12 +5867,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c504: 0x109c504: addiu sp, sp, -48
+// 0x0109cb4c: 0x109cb4c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109c508: 0x109c508: sw    s6, 40(sp)
+// 0x0109cb50: 0x109cb50: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5881,7 +5881,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109c50c: 0x109c50c: sw    s5, 36(sp)
+// 0x0109cb54: 0x109cb54: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5890,7 +5890,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109c510: 0x109c510: sw    s4, 32(sp)
+// 0x0109cb58: 0x109cb58: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5899,7 +5899,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109c514: 0x109c514: sw    s3, 28(sp)
+// 0x0109cb5c: 0x109cb5c: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5908,7 +5908,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c518: 0x109c518: sw    s2, 24(sp)
+// 0x0109cb60: 0x109cb60: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5917,7 +5917,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c51c: 0x109c51c: sw    s1, 20(sp)
+// 0x0109cb64: 0x109cb64: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5926,7 +5926,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c520: 0x109c520: sw    s0, 16(sp)
+// 0x0109cb68: 0x109cb68: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5935,69 +5935,69 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c524: 0x109c524: sw    ra, 44(sp)
-// 0x0109c528: 0x109c528: addu  s3, a0, zero
+// 0x0109cb6c: 0x109cb6c: sw    ra, 44(sp)
+// 0x0109cb70: 0x109cb70: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0109c52c: 0x109c52c: addu  s2, a1, zero
+// 0x0109cb74: 0x109cb74: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109c530: 0x109c530: addu  s1, a2, zero
+// 0x0109cb78: 0x109cb78: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0109c534: 0x109c534: addu  s6, a3, zero
+// 0x0109cb7c: 0x109cb7c: addu  s6, a3, zero
 	ldloc 4
 	stloc 14
-// 0x0109c538: 0x109c538: addu  s0, zero, zero
+// 0x0109cb80: 0x109cb80: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0109c53c: 0x109c53c: addiu s5, zero, 28
+// 0x0109cb84: 0x109cb84: addiu s5, zero, 28
 	ldc.i4.s 28
 	stloc 13
-// 0x0109c540: 0x109c540: j	 0x109c5b0 addiu s4, zero, -3
+// 0x0109cb88: 0x109cb88: j	 0x109cbf8 addiu s4, zero, -3
 	ldc.i4.s -3
 	stloc 12
-	br L_109c5b0
+	br L_109cbf8
 // --- basic block ---
-L_109c548:
-// 0x0109c548: 0x109c548: lw    v0, 0(s3)
+L_109cb90:
+// 0x0109cb90: 0x109cb90: lw    v0, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109c54c: 0x109c54c: mflo  lo
+// 0x0109cb94: 0x109cb94: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x0109c550: 0x109c550: addu  v0, v0, v1
+// 0x0109cb98: 0x109cb98: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0109c554: 0x109c554: lbu   v1, 8(v0)
+// 0x0109cb9c: 0x109cb9c: lbu   v1, 8(v0)
 	ldloc 6
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x0109c558: 0x109c558: sll   zero, zero, 0
-// 0x0109c55c: 0x109c55c: andi  a0, v1, 1
+// 0x0109cba0: 0x109cba0: sll   zero, zero, 0
+// 0x0109cba4: 0x109cba4: andi  a0, v1, 1
 	ldloc 7
 	ldc.i4.1
 	and
 	stloc.1
-// 0x0109c560: 0x109c560: beq   a0, zero, 0x109c588 sll   zero, zero, 0
+// 0x0109cba8: 0x109cba8: beq   a0, zero, 0x109cbd0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109c588
+	brfalse L_109cbd0
 // --- basic block ---
-// 0x0109c568: 0x109c568: beq   s6, zero, 0x109c5ac addu  a1, s2, zero
+// 0x0109cbb0: 0x109cbb0: beq   s6, zero, 0x109cbf4 addu  a1, s2, zero
 	ldloc 14
 	ldloc 10
 	stloc.2
-	brfalse L_109c5ac
+	brfalse L_109cbf4
 // --- basic block ---
-// 0x0109c570: 0x109c570: lw    a0, 24(v0)
+// 0x0109cbb8: 0x109cbb8: lw    a0, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6006,10 +6006,10 @@ L_109c548:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c574: 0x109c574: addu  a2, s1, zero
+// 0x0109cbbc: 0x109cbbc: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0109c578: 0x109c578: jal   0x109c504 addiu a3, zero, 1
+// 0x0109cbc0: 0x109cbc0: jal   0x109cb4c addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -6017,20 +6017,20 @@ L_109c548:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c580: 0x109c580: j	 0x109c5b0 addiu s0, s0, 1
+// 0x0109cbc8: 0x109cbc8: j	 0x109cbf8 addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_109c5b0
+	br L_109cbf8
 // --- basic block ---
-L_109c588:
-// 0x0109c588: 0x109c588: lw    a0, 20(v0)
+L_109cbd0:
+// 0x0109cbd0: 0x109cbd0: lw    a0, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6039,47 +6039,47 @@ L_109c588:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c58c: 0x109c58c: sll   zero, zero, 0
-// 0x0109c590: 0x109c590: bne   a0, s2, 0x109c5ac and   a0, v1, s4
+// 0x0109cbd4: 0x109cbd4: sll   zero, zero, 0
+// 0x0109cbd8: 0x109cbd8: bne   a0, s2, 0x109cbf4 and   a0, v1, s4
 	ldloc.1
 	ldloc 10
 	ldloc 7
 	ldloc 12
 	and
 	stloc.1
-	bne.un L_109c5ac
+	bne.un L_109cbf4
 // --- basic block ---
-// 0x0109c598: 0x109c598: beq   s1, zero, 0x109c5a8 ori   v1, v1, 2
+// 0x0109cbe0: 0x109cbe0: beq   s1, zero, 0x109cbf0 ori   v1, v1, 2
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
 	or
 	stloc 7
-	brfalse L_109c5a8
+	brfalse L_109cbf0
 // --- basic block ---
-// 0x0109c5a0: 0x109c5a0: j	 0x109c5ac sb    a0, 8(v0)
+// 0x0109cbe8: 0x109cbe8: j	 0x109cbf4 sb    a0, 8(v0)
 	ldloc 6
 	ldc.i4.8
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_109c5ac
+	br L_109cbf4
 // --- basic block ---
-L_109c5a8:
-// 0x0109c5a8: 0x109c5a8: sb    v1, 8(v0)
+L_109cbf0:
+// 0x0109cbf0: 0x109cbf0: sb    v1, 8(v0)
 	ldloc 6
 	ldc.i4.8
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_109c5ac:
-// 0x0109c5ac: 0x109c5ac: addiu s0, s0, 1
+L_109cbf4:
+// 0x0109cbf4: 0x109cbf4: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_109c5b0:
-// 0x0109c5b0: 0x109c5b0: lw    v0, 4(s3)
+L_109cbf8:
+// 0x0109cbf8: 0x109cbf8: lw    v0, 4(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6088,22 +6088,22 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c5b4: 0x109c5b4: sll   zero, zero, 0
-// 0x0109c5b8: 0x109c5b8: slt   v0, s0, v0
+// 0x0109cbfc: 0x109cbfc: sll   zero, zero, 0
+// 0x0109cc00: 0x109cc00: slt   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109c5bc: 0x109c5bc: bne   v0, zero, 0x109c548 mult  s0, s5
+// 0x0109cc04: 0x109cc04: bne   v0, zero, 0x109cb90 mult  s0, s5
 	ldloc 6
 	ldloc 8
 	ldloc 13
 	mul
 	stloc 16
-	brtrue L_109c548
+	brtrue L_109cb90
 // --- basic block ---
-// 0x0109c5c4: 0x109c5c4: lw    ra, 44(sp)
-// 0x0109c5c8: 0x109c5c8: lw    s6, 40(sp)
+// 0x0109cc0c: 0x109cc0c: lw    ra, 44(sp)
+// 0x0109cc10: 0x109cc10: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6112,7 +6112,7 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109c5cc: 0x109c5cc: lw    s5, 36(sp)
+// 0x0109cc14: 0x109cc14: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6121,7 +6121,7 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109c5d0: 0x109c5d0: lw    s4, 32(sp)
+// 0x0109cc18: 0x109cc18: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6130,7 +6130,7 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109c5d4: 0x109c5d4: lw    s3, 28(sp)
+// 0x0109cc1c: 0x109cc1c: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6139,7 +6139,7 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c5d8: 0x109c5d8: lw    s2, 24(sp)
+// 0x0109cc20: 0x109cc20: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6148,7 +6148,7 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c5dc: 0x109c5dc: lw    s1, 20(sp)
+// 0x0109cc24: 0x109cc24: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6157,7 +6157,7 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c5e0: 0x109c5e0: lw    s0, 16(sp)
+// 0x0109cc28: 0x109cc28: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6166,7 +6166,7 @@ L_109c5b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c5e4: 0x109c5e4: jr    ra addiu sp, sp, 48
+// 0x0109cc2c: 0x109cc2c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6178,7 +6178,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+.method public static int32 ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6213,52 +6213,52 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c5ec: 0x109c5ec: addiu sp, sp, -24
+// 0x0109cc34: 0x109cc34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109c5f0: 0x109c5f0: addu  a2, a0, zero
+// 0x0109cc38: 0x109cc38: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x0109c5f4: 0x109c5f4: sw    ra, 20(sp)
-// 0x0109c5f8: 0x109c5f8: beq   a2, zero, 0x109c608 lui   a0, 0x10a0000
+// 0x0109cc3c: 0x109cc3c: sw    ra, 20(sp)
+// 0x0109cc40: 0x109cc40: beq   a2, zero, 0x109cc50 lui   a0, 0x10a0000
 	ldloc.3
 	ldc.i4 17432576
 	stloc.1
-	brfalse L_109c608
+	brfalse L_109cc50
 // --- basic block ---
-// 0x0109c600: 0x109c600: j	 0x109c610 addiu a0, a0, -14808
+// 0x0109cc48: 0x109cc48: j	 0x109cc58 addiu a0, a0, -13200
 	ldloc.1
-	ldc.i4 -14808
+	ldc.i4 -13200
 	add
 	stloc.1
-	br L_109c610
+	br L_109cc58
 // --- basic block ---
-L_109c608:
-// 0x0109c608: 0x109c608: addiu a0, a0, -14808
+L_109cc50:
+// 0x0109cc50: 0x109cc50: addiu a0, a0, -13200
 	ldloc.1
-	ldc.i4 -14808
+	ldc.i4 -13200
 	add
 	stloc.1
-// 0x0109c60c: 0x109c60c: addu  a2, zero, zero
+// 0x0109cc54: 0x109cc54: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_109c610:
-// 0x0109c610: 0x109c610: jal   0x10514e0 sll   zero, zero, 0
+L_109cc58:
+// 0x0109cc58: 0x109cc58: jal   0x10514f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_menu_button_register_10514e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_menu_button_register_10514f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109c618: 0x109c618: lw    ra, 20(sp)
-// 0x0109c61c: 0x109c61c: sll   zero, zero, 0
-// 0x0109c620: 0x109c620: jr    ra addiu sp, sp, 24
+// 0x0109cc60: 0x109cc60: lw    ra, 20(sp)
+// 0x0109cc64: 0x109cc64: sll   zero, zero, 0
+// 0x0109cc68: 0x109cc68: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6270,7 +6270,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_options_wrapper_109c628(int32,int32,int32,int32,int32)
+.method public static int32 on_options_wrapper_109cc70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -6308,12 +6308,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c628: 0x109c628: addiu sp, sp, -24
+// 0x0109cc70: 0x109cc70: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109c62c: 0x109c62c: sw    s0, 16(sp)
+// 0x0109cc74: 0x109cc74: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6322,22 +6322,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c630: 0x109c630: sw    ra, 20(sp)
-// 0x0109c634: 0x109c634: jal   0x1093fe0 addu  s0, a0, zero
+// 0x0109cc78: 0x109cc78: sw    ra, 20(sp)
+// 0x0109cc7c: 0x109cc7c: jal   0x1094604 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-	call int32 Cibyl110::ssd_dialog_get_current_container_1093fe0()
+	call int32 Cibyl110::ssd_dialog_get_current_container_1094604()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109c63c: 0x109c63c: beq   v0, zero, 0x109c654 addu  a0, v0, zero
+// 0x0109cc84: 0x109cc84: beq   v0, zero, 0x109cc9c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_109c654
+	brfalse L_109cc9c
 // --- basic block ---
-// 0x0109c644: 0x109c644: lw    a1, 16(v0)
+// 0x0109cc8c: 0x109cc8c: lw    a1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6346,7 +6346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109c648: 0x109c648: lw    a2, 116(v0)
+// 0x0109cc90: 0x109cc90: lw    a2, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6355,21 +6355,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109c64c: 0x109c64c: j	 0x109c660 sll   zero, zero, 0
-	br L_109c660
+// 0x0109cc94: 0x109cc94: j	 0x109cca8 sll   zero, zero, 0
+	br L_109cca8
 // --- basic block ---
-L_109c654:
-// 0x0109c654: 0x109c654: addu  a0, zero, zero
+L_109cc9c:
+// 0x0109cc9c: 0x109cc9c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109c658: 0x109c658: addu  a1, zero, zero
+// 0x0109cca0: 0x109cca0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109c65c: 0x109c65c: addu  a2, zero, zero
+// 0x0109cca4: 0x109cca4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_109c660:
-// 0x0109c660: 0x109c660: jalr  s0 sll   zero, zero, 0
+L_109cca8:
+// 0x0109cca8: 0x109cca8: jalr  s0 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
 	ldloc.1
@@ -6381,8 +6381,8 @@ L_109c660:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109c668: 0x109c668: lw    ra, 20(sp)
-// 0x0109c66c: 0x109c66c: lw    s0, 16(sp)
+// 0x0109ccb0: 0x109ccb0: lw    ra, 20(sp)
+// 0x0109ccb4: 0x109ccb4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6391,7 +6391,7 @@ L_109c660:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c670: 0x109c670: jr    ra addiu sp, sp, 24
+// 0x0109ccb8: 0x109ccb8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6403,7 +6403,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 close_all_popup_menus_109c678(int32,int32,int32,int32,int32)
+.method public static int32 close_all_popup_menus_109ccc0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 v1,int32 s1,int32 s3,int32 ra,int32 lo)
@@ -6453,12 +6453,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c678: 0x109c678: addiu sp, sp, -40
+// 0x0109ccc0: 0x109ccc0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109c67c: 0x109c67c: sw    s1, 24(sp)
+// 0x0109ccc4: 0x109ccc4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6467,8 +6467,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c680: 0x109c680: sw    ra, 36(sp)
-// 0x0109c684: 0x109c684: sw    s3, 32(sp)
+// 0x0109ccc8: 0x109ccc8: sw    ra, 36(sp)
+// 0x0109cccc: 0x109cccc: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6477,7 +6477,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c688: 0x109c688: sw    s2, 28(sp)
+// 0x0109ccd0: 0x109ccd0: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6486,7 +6486,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c68c: 0x109c68c: sw    s0, 20(sp)
+// 0x0109ccd4: 0x109ccd4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6495,57 +6495,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c690: 0x109c690: beq   a0, zero, 0x109c704 addu  s1, a0, zero
+// 0x0109ccd8: 0x109ccd8: beq   a0, zero, 0x109cd4c addu  s1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 10
-	brfalse L_109c704
+	brfalse L_109cd4c
 // --- basic block ---
-// 0x0109c698: 0x109c698: addu  s0, zero, zero
+// 0x0109cce0: 0x109cce0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0109c69c: 0x109c69c: j	 0x109c6f0 addiu s3, zero, 28
+// 0x0109cce4: 0x109cce4: j	 0x109cd38 addiu s3, zero, 28
 	ldc.i4.s 28
 	stloc 11
-	br L_109c6f0
+	br L_109cd38
 // --- basic block ---
-L_109c6a4:
-// 0x0109c6a4: 0x109c6a4: lw    v0, 0(s1)
+L_109ccec:
+// 0x0109ccec: 0x109ccec: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109c6a8: 0x109c6a8: mflo  lo
+// 0x0109ccf0: 0x109ccf0: mflo  lo
 	ldloc 13
 	stloc 8
-// 0x0109c6ac: 0x109c6ac: addu  v0, v0, s2
+// 0x0109ccf4: 0x109ccf4: addu  v0, v0, s2
 	ldloc 6
 	ldloc 8
 	add
 	stloc 6
-// 0x0109c6b0: 0x109c6b0: lbu   v1, 8(v0)
+// 0x0109ccf8: 0x109ccf8: lbu   v1, 8(v0)
 	ldloc 6
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 9
-// 0x0109c6b4: 0x109c6b4: sll   zero, zero, 0
-// 0x0109c6b8: 0x109c6b8: andi  v1, v1, 1
+// 0x0109ccfc: 0x109ccfc: sll   zero, zero, 0
+// 0x0109cd00: 0x109cd00: andi  v1, v1, 1
 	ldloc 9
 	ldc.i4.1
 	and
 	stloc 9
-// 0x0109c6bc: 0x109c6bc: beq   v1, zero, 0x109c6f0 addiu s0, s0, 1
+// 0x0109cd04: 0x109cd04: beq   v1, zero, 0x109cd38 addiu s0, s0, 1
 	ldloc 9
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brfalse L_109c6f0
+	brfalse L_109cd38
 // --- basic block ---
-// 0x0109c6c4: 0x109c6c4: lw    a0, 24(v0)
+// 0x0109cd0c: 0x109cd0c: lw    a0, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6554,31 +6554,31 @@ L_109c6a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c6c8: 0x109c6c8: jal   0x109c678 sll   zero, zero, 0
+// 0x0109cd10: 0x109cd10: jal   0x109ccc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::close_all_popup_menus_109c678(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::close_all_popup_menus_109ccc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109c6d0: 0x109c6d0: lw    v0, 0(s1)
+// 0x0109cd18: 0x109cd18: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109c6d4: 0x109c6d4: sll   zero, zero, 0
-// 0x0109c6d8: 0x109c6d8: addu  s2, v0, s2
+// 0x0109cd1c: 0x109cd1c: sll   zero, zero, 0
+// 0x0109cd20: 0x109cd20: addu  s2, v0, s2
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x0109c6dc: 0x109c6dc: lw    v0, 24(s2)
+// 0x0109cd24: 0x109cd24: lw    v0, 24(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6587,8 +6587,8 @@ L_109c6a4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c6e0: 0x109c6e0: sll   zero, zero, 0
-// 0x0109c6e4: 0x109c6e4: lw    a0, 12(v0)
+// 0x0109cd28: 0x109cd28: sll   zero, zero, 0
+// 0x0109cd2c: 0x109cd2c: lw    a0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6597,13 +6597,13 @@ L_109c6a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c6e8: 0x109c6e8: jal   0x1099098 sll   zero, zero, 0
+// 0x0109cd30: 0x109cd30: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 6
 // --- basic block ---
-L_109c6f0:
-// 0x0109c6f0: 0x109c6f0: lw    v0, 4(s1)
+L_109cd38:
+// 0x0109cd38: 0x109cd38: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -6612,23 +6612,23 @@ L_109c6f0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c6f4: 0x109c6f4: sll   zero, zero, 0
-// 0x0109c6f8: 0x109c6f8: slt   v0, s0, v0
+// 0x0109cd3c: 0x109cd3c: sll   zero, zero, 0
+// 0x0109cd40: 0x109cd40: slt   v0, s0, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109c6fc: 0x109c6fc: bne   v0, zero, 0x109c6a4 mult  s0, s3
+// 0x0109cd44: 0x109cd44: bne   v0, zero, 0x109ccec mult  s0, s3
 	ldloc 6
 	ldloc 7
 	ldloc 11
 	mul
 	stloc 13
-	brtrue L_109c6a4
+	brtrue L_109ccec
 // --- basic block ---
-L_109c704:
-// 0x0109c704: 0x109c704: lw    ra, 36(sp)
-// 0x0109c708: 0x109c708: lw    s3, 32(sp)
+L_109cd4c:
+// 0x0109cd4c: 0x109cd4c: lw    ra, 36(sp)
+// 0x0109cd50: 0x109cd50: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6637,7 +6637,7 @@ L_109c704:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c70c: 0x109c70c: lw    s2, 28(sp)
+// 0x0109cd54: 0x109cd54: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6646,7 +6646,7 @@ L_109c704:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c710: 0x109c710: lw    s1, 24(sp)
+// 0x0109cd58: 0x109cd58: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6655,7 +6655,7 @@ L_109c704:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c714: 0x109c714: lw    s0, 20(sp)
+// 0x0109cd5c: 0x109cd5c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6664,7 +6664,7 @@ L_109c704:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c718: 0x109c718: jr    ra addiu sp, sp, 40
+// 0x0109cd60: 0x109cd60: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6676,7 +6676,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 exit_context_menu_109c720(int32,int32,int32,int32,int32)
+.method public static int32 exit_context_menu_109cd68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -6723,20 +6723,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c720: 0x109c720: lui   v0, 0x0
+// 0x0109cd68: 0x109cd68: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0109c724: 0x109c724: addiu sp, sp, -48
+// 0x0109cd6c: 0x109cd6c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109c728: 0x109c728: addiu v1, v0, 17540
+// 0x0109cd70: 0x109cd70: addiu v1, v0, 17540
 	ldloc 6
 	ldc.i4 17540
 	add
 	stloc 7
-// 0x0109c72c: 0x109c72c: sw    s3, 40(sp)
+// 0x0109cd74: 0x109cd74: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6745,7 +6745,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c730: 0x109c730: sw    s2, 36(sp)
+// 0x0109cd78: 0x109cd78: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6754,7 +6754,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c734: 0x109c734: sw    s1, 32(sp)
+// 0x0109cd7c: 0x109cd7c: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6763,7 +6763,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c738: 0x109c738: sw    s0, 28(sp)
+// 0x0109cd80: 0x109cd80: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6772,11 +6772,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c73c: 0x109c73c: sw    ra, 44(sp)
-// 0x0109c740: 0x109c740: addu  s1, a0, zero
+// 0x0109cd84: 0x109cd84: sw    ra, 44(sp)
+// 0x0109cd88: 0x109cd88: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109c744: 0x109c744: lw    s0, 17540(v0)
+// 0x0109cd8c: 0x109cd8c: lw    s0, 17540(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6785,7 +6785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c748: 0x109c748: lw    s3, 4(v1)
+// 0x0109cd90: 0x109cd90: lw    s3, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6794,7 +6794,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c74c: 0x109c74c: lw    a2, 20(v1)
+// 0x0109cd94: 0x109cd94: lw    a2, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6803,13 +6803,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109c750: 0x109c750: beq   a0, zero, 0x109c768 addu  s2, a1, zero
+// 0x0109cd98: 0x109cd98: beq   a0, zero, 0x109cdb0 addu  s2, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 10
-	brfalse L_109c768
+	brfalse L_109cdb0
 // --- basic block ---
-// 0x0109c758: 0x109c758: lw    v0, 28(v1)
+// 0x0109cda0: 0x109cda0: lw    v0, 28(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6818,24 +6818,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c75c: 0x109c75c: sll   zero, zero, 0
-// 0x0109c760: 0x109c760: beq   v0, zero, 0x109c788 sll   zero, zero, 0
+// 0x0109cda4: 0x109cda4: sll   zero, zero, 0
+// 0x0109cda8: 0x109cda8: beq   v0, zero, 0x109cdd0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109c788
+	brfalse L_109cdd0
 // --- basic block ---
-L_109c768:
-// 0x0109c768: 0x109c768: lui   a0, 0x80000
+L_109cdb0:
+// 0x0109cdb0: 0x109cdb0: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0109c76c: 0x109c76c: addiu a0, a0, 9864
+// 0x0109cdb4: 0x109cdb4: addiu a0, a0, 10328
 	ldloc.1
-	ldc.i4 9864
+	ldc.i4 10328
 	add
 	stloc.1
-// 0x0109c770: 0x109c770: addiu a1, zero, 1
+// 0x0109cdb8: 0x109cdb8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109c774: 0x109c774: jal   0x1094884 sw    a2, 16(sp)
+// 0x0109cdbc: 0x109cdbc: jal   0x1094ff4 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6849,12 +6849,12 @@ L_109c768:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c77c: 0x109c77c: jal   0x109c678 addu  a0, s3, zero
+// 0x0109cdc4: 0x109cdc4: jal   0x109ccc0 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -6862,12 +6862,12 @@ L_109c768:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::close_all_popup_menus_109c678(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::close_all_popup_menus_109ccc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c784: 0x109c784: lw    a2, 16(sp)
+// 0x0109cdcc: 0x109cdcc: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6876,11 +6876,11 @@ L_109c768:
 	add
 	ldelem.i4
 	stloc.3
-L_109c788:
-// 0x0109c788: 0x109c788: addu  a0, s1, zero
+L_109cdd0:
+// 0x0109cdd0: 0x109cdd0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109c78c: 0x109c78c: jalr  s0 addu  a1, s2, zero
+// 0x0109cdd4: 0x109cdd4: jalr  s0 addu  a1, s2, zero
 	ldloc 8
 	ldloc 10
 	stloc.2
@@ -6894,8 +6894,8 @@ L_109c788:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109c794: 0x109c794: lw    ra, 44(sp)
-// 0x0109c798: 0x109c798: lw    s3, 40(sp)
+// 0x0109cddc: 0x109cddc: lw    ra, 44(sp)
+// 0x0109cde0: 0x109cde0: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6904,7 +6904,7 @@ L_109c788:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c79c: 0x109c79c: lw    s2, 36(sp)
+// 0x0109cde4: 0x109cde4: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6913,7 +6913,7 @@ L_109c788:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c7a0: 0x109c7a0: lw    s1, 32(sp)
+// 0x0109cde8: 0x109cde8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6922,7 +6922,7 @@ L_109c788:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c7a4: 0x109c7a4: lw    s0, 28(sp)
+// 0x0109cdec: 0x109cdec: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6931,7 +6931,7 @@ L_109c788:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c7a8: 0x109c7a8: jr    ra addiu sp, sp, 48
+// 0x0109cdf0: 0x109cdf0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6943,7 +6943,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 native_menu_item_callback_109c7b0(int32,int32,int32,int32,int32)
+.method public static int32 native_menu_item_callback_109cdf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 lo,int32 v1)
@@ -6981,23 +6981,23 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c7b0: 0x109c7b0: addiu a0, a0, -1
+// 0x0109cdf8: 0x109cdf8: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x0109c7b4: 0x109c7b4: addiu v0, zero, 28
+// 0x0109cdfc: 0x109cdfc: addiu v0, zero, 28
 	ldc.i4.s 28
 	stloc 5
-// 0x0109c7b8: 0x109c7b8: mult  a0, v0
+// 0x0109ce00: 0x109ce00: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 8
-// 0x0109c7bc: 0x109c7bc: lui   v0, 0x0
+// 0x0109ce04: 0x109ce04: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109c7c0: 0x109c7c0: lw    v0, 17544(v0)
+// 0x0109ce08: 0x109ce08: lw    v0, 17544(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7006,26 +7006,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109c7c4: 0x109c7c4: addiu sp, sp, -24
+// 0x0109ce0c: 0x109ce0c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109c7c8: 0x109c7c8: lw    a1, 0(v0)
+// 0x0109ce10: 0x109ce10: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0109c7cc: 0x109c7cc: addiu a0, zero, 1
+// 0x0109ce14: 0x109ce14: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0109c7d0: 0x109c7d0: sw    ra, 20(sp)
-// 0x0109c7d4: 0x109c7d4: mflo  lo
+// 0x0109ce18: 0x109ce18: sw    ra, 20(sp)
+// 0x0109ce1c: 0x109ce1c: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x0109c7d8: 0x109c7d8: jal   0x109c720 addu  a1, a1, v0
+// 0x0109ce20: 0x109ce20: jal   0x109cd68 addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
@@ -7035,14 +7035,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::exit_context_menu_109c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::exit_context_menu_109cd68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109c7e0: 0x109c7e0: lw    ra, 20(sp)
-// 0x0109c7e4: 0x109c7e4: sll   zero, zero, 0
-// 0x0109c7e8: 0x109c7e8: jr    ra addiu sp, sp, 24
+// 0x0109ce28: 0x109ce28: lw    ra, 20(sp)
+// 0x0109ce2c: 0x109ce2c: sll   zero, zero, 0
+// 0x0109ce30: 0x109ce30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7054,7 +7054,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s3,int32 s2,int32 ra,int32 lo)
@@ -7104,10 +7104,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c7f0: 0x109c7f0: lui   v0, 0x0
+// 0x0109ce38: 0x109ce38: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109c7f4: 0x109c7f4: lw    v1, 17540(v0)
+// 0x0109ce3c: 0x109ce3c: lw    v1, 17540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7116,12 +7116,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c7f8: 0x109c7f8: addiu sp, sp, -48
+// 0x0109ce40: 0x109ce40: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109c7fc: 0x109c7fc: sw    s0, 28(sp)
+// 0x0109ce44: 0x109ce44: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7130,8 +7130,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c800: 0x109c800: sw    ra, 44(sp)
-// 0x0109c804: 0x109c804: sw    s3, 40(sp)
+// 0x0109ce48: 0x109ce48: sw    ra, 44(sp)
+// 0x0109ce4c: 0x109ce4c: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7140,7 +7140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c808: 0x109c808: sw    s2, 36(sp)
+// 0x0109ce50: 0x109ce50: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7149,7 +7149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c80c: 0x109c80c: sw    s1, 32(sp)
+// 0x0109ce54: 0x109ce54: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7158,18 +7158,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c810: 0x109c810: bne   v1, zero, 0x109c82c addu  s0, a2, zero
+// 0x0109ce58: 0x109ce58: bne   v1, zero, 0x109ce74 addu  s0, a2, zero
 	ldloc 7
 	ldloc.3
 	stloc 9
-	brtrue L_109c82c
+	brtrue L_109ce74
 // --- basic block ---
-// 0x0109c818: 0x109c818: addiu v0, v0, 17540
+// 0x0109ce60: 0x109ce60: addiu v0, v0, 17540
 	ldloc 5
 	ldc.i4 17540
 	add
 	stloc 5
-// 0x0109c81c: 0x109c81c: lw    v0, 4(v0)
+// 0x0109ce64: 0x109ce64: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7178,21 +7178,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109c820: 0x109c820: sll   zero, zero, 0
-// 0x0109c824: 0x109c824: beq   v0, zero, 0x109c844 lui   v1, 0x0
+// 0x0109ce68: 0x109ce68: sll   zero, zero, 0
+// 0x0109ce6c: 0x109ce6c: beq   v0, zero, 0x109ce8c lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_109c844
+	brfalse L_109ce8c
 // --- basic block ---
-L_109c82c:
-// 0x0109c82c: 0x109c82c: addu  a0, zero, zero
+L_109ce74:
+// 0x0109ce74: 0x109ce74: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109c830: 0x109c830: addu  a1, zero, zero
+// 0x0109ce78: 0x109ce78: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109c834: 0x109c834: jal   0x109c720 sw    a3, 16(sp)
+// 0x0109ce7c: 0x109ce7c: jal   0x109cd68 sw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7206,12 +7206,12 @@ L_109c82c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::exit_context_menu_109c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::exit_context_menu_109cd68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109c83c: 0x109c83c: lw    a3, 16(sp)
+// 0x0109ce84: 0x109ce84: lw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7220,16 +7220,16 @@ L_109c82c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109c840: 0x109c840: lui   v1, 0x0
+// 0x0109ce88: 0x109ce88: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-L_109c844:
-// 0x0109c844: 0x109c844: addiu v0, v1, 17540
+L_109ce8c:
+// 0x0109ce8c: 0x109ce8c: addiu v0, v1, 17540
 	ldloc 7
 	ldc.i4 17540
 	add
 	stloc 5
-// 0x0109c848: 0x109c848: sw    a3, 17540(v1)
+// 0x0109ce90: 0x109ce90: sw    a3, 17540(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7238,7 +7238,7 @@ L_109c844:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109c84c: 0x109c84c: lw    v1, 76(sp)
+// 0x0109ce94: 0x109ce94: lw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7247,10 +7247,10 @@ L_109c844:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c850: 0x109c850: lui   s3, 0x10a0000
+// 0x0109ce98: 0x109ce98: lui   s3, 0x10a0000
 	ldc.i4 17432576
 	stloc 10
-// 0x0109c854: 0x109c854: sw    v1, 28(v0)
+// 0x0109ce9c: 0x109ce9c: sw    v1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7259,7 +7259,7 @@ L_109c844:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c858: 0x109c858: lw    v1, 64(sp)
+// 0x0109cea0: 0x109cea0: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7268,7 +7268,7 @@ L_109c844:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c85c: 0x109c85c: sw    s0, 4(v0)
+// 0x0109cea4: 0x109cea4: sw    s0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7277,7 +7277,7 @@ L_109c844:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c860: 0x109c860: sw    v1, 20(v0)
+// 0x0109cea8: 0x109cea8: sw    v1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7286,78 +7286,78 @@ L_109c844:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c864: 0x109c864: addiu s3, s3, -14416
+// 0x0109ceac: 0x109ceac: addiu s3, s3, -12808
 	ldloc 10
-	ldc.i4 -14416
+	ldc.i4 -12808
 	add
 	stloc 10
-// 0x0109c868: 0x109c868: addu  s1, zero, zero
+// 0x0109ceb0: 0x109ceb0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0109c86c: 0x109c86c: j	 0x109c8b4 addiu s2, zero, 28
+// 0x0109ceb4: 0x109ceb4: j	 0x109cefc addiu s2, zero, 28
 	ldc.i4.s 28
 	stloc 11
-	br L_109c8b4
+	br L_109cefc
 // --- basic block ---
-L_109c874:
-// 0x0109c874: 0x109c874: lw    v0, 0(s0)
+L_109cebc:
+// 0x0109cebc: 0x109cebc: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109c878: 0x109c878: mflo  lo
+// 0x0109cec0: 0x109cec0: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x0109c87c: 0x109c87c: addu  v0, v0, v1
+// 0x0109cec4: 0x109cec4: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0109c880: 0x109c880: lbu   v1, 8(v0)
+// 0x0109cec8: 0x109cec8: lbu   v1, 8(v0)
 	ldloc 5
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x0109c884: 0x109c884: sll   zero, zero, 0
-// 0x0109c888: 0x109c888: andi  v1, v1, 2
+// 0x0109cecc: 0x109cecc: sll   zero, zero, 0
+// 0x0109ced0: 0x109ced0: andi  v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	and
 	stloc 7
-// 0x0109c88c: 0x109c88c: bne   v1, zero, 0x109c8b0 sll   zero, zero, 0
+// 0x0109ced4: 0x109ced4: bne   v1, zero, 0x109cef8 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_109c8b0
+	brtrue L_109cef8
 // --- basic block ---
-// 0x0109c894: 0x109c894: lw    a0, 0(v0)
+// 0x0109cedc: 0x109cedc: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109c898: 0x109c898: jal   0x101cd60 sll   zero, zero, 0
+// 0x0109cee0: 0x109cee0: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109c8a0: 0x109c8a0: addu  a1, v0, zero
+// 0x0109cee8: 0x109cee8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0109c8a4: 0x109c8a4: addiu a0, s1, 1
+// 0x0109ceec: 0x109ceec: addiu a0, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0109c8a8: 0x109c8a8: jal   0x1050764 addu  a2, s3, zero
+// 0x0109cef0: 0x109cef0: jal   0x1050774 addu  a2, s3, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -7365,19 +7365,19 @@ L_109c874:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_context_menu_set_1050764(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_context_menu_set_1050774(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109c8b0:
-// 0x0109c8b0: 0x109c8b0: addiu s1, s1, 1
+L_109cef8:
+// 0x0109cef8: 0x109cef8: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_109c8b4:
-// 0x0109c8b4: 0x109c8b4: lw    v0, 4(s0)
+L_109cefc:
+// 0x0109cefc: 0x109cefc: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7386,22 +7386,22 @@ L_109c8b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109c8b8: 0x109c8b8: sll   zero, zero, 0
-// 0x0109c8bc: 0x109c8bc: slt   v0, s1, v0
+// 0x0109cf00: 0x109cf00: sll   zero, zero, 0
+// 0x0109cf04: 0x109cf04: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109c8c0: 0x109c8c0: bne   v0, zero, 0x109c874 mult  s1, s2
+// 0x0109cf08: 0x109cf08: bne   v0, zero, 0x109cebc mult  s1, s2
 	ldloc 5
 	ldloc 8
 	ldloc 11
 	mul
 	stloc 13
-	brtrue L_109c874
+	brtrue L_109cebc
 // --- basic block ---
-// 0x0109c8c8: 0x109c8c8: lw    ra, 44(sp)
-// 0x0109c8cc: 0x109c8cc: lw    s3, 40(sp)
+// 0x0109cf10: 0x109cf10: lw    ra, 44(sp)
+// 0x0109cf14: 0x109cf14: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7410,7 +7410,7 @@ L_109c8b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109c8d0: 0x109c8d0: lw    s2, 36(sp)
+// 0x0109cf18: 0x109cf18: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7419,7 +7419,7 @@ L_109c8b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c8d4: 0x109c8d4: lw    s1, 32(sp)
+// 0x0109cf1c: 0x109cf1c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7428,7 +7428,7 @@ L_109c8b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c8d8: 0x109c8d8: lw    s0, 28(sp)
+// 0x0109cf20: 0x109cf20: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7437,7 +7437,7 @@ L_109c8b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c8dc: 0x109c8dc: jr    ra addiu sp, sp, 48
+// 0x0109cf24: 0x109cf24: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
diff --git a/converted/Cibyl117.j b/converted/Cibyl117.j
index 3f1a00a..46c8903 100644
--- a/converted/Cibyl117.j
+++ b/converted/Cibyl117.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl117::.ctor
 
-.method public static int32 ssd_contextmenu_delete_109c8e4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_contextmenu_delete_109cf2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s1,int32 v1,int32 s3,int32 s4,int32 ra,int32 lo)
@@ -94,12 +94,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c8e4: 0x109c8e4: addiu sp, sp, -40
+// 0x0109cf2c: 0x109cf2c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109c8e8: 0x109c8e8: sw    s3, 28(sp)
+// 0x0109cf30: 0x109cf30: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -108,7 +108,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c8ec: 0x109c8ec: sw    s0, 16(sp)
+// 0x0109cf34: 0x109cf34: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -117,8 +117,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c8f0: 0x109c8f0: sw    ra, 36(sp)
-// 0x0109c8f4: 0x109c8f4: sw    s4, 32(sp)
+// 0x0109cf38: 0x109cf38: sw    ra, 36(sp)
+// 0x0109cf3c: 0x109cf3c: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -127,7 +127,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109c8f8: 0x109c8f8: sw    s2, 24(sp)
+// 0x0109cf40: 0x109cf40: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -136,7 +136,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c8fc: 0x109c8fc: sw    s1, 20(sp)
+// 0x0109cf44: 0x109cf44: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -145,53 +145,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c900: 0x109c900: addu  s0, a0, zero
+// 0x0109cf48: 0x109cf48: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0109c904: 0x109c904: beq   a0, zero, 0x109c984 addu  s3, a1, zero
+// 0x0109cf4c: 0x109cf4c: beq   a0, zero, 0x109cfcc addu  s3, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 11
-	brfalse L_109c984
+	brfalse L_109cfcc
 // --- basic block ---
-// 0x0109c90c: 0x109c90c: addu  s1, zero, zero
+// 0x0109cf54: 0x109cf54: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0109c910: 0x109c910: j	 0x109c960 addiu s4, zero, 28
+// 0x0109cf58: 0x109cf58: j	 0x109cfa8 addiu s4, zero, 28
 	ldc.i4.s 28
 	stloc 12
-	br L_109c960
+	br L_109cfa8
 // --- basic block ---
-L_109c918:
-// 0x0109c918: 0x109c918: mflo  lo
+L_109cf60:
+// 0x0109cf60: 0x109cf60: mflo  lo
 	ldloc 14
 	stloc 7
-// 0x0109c91c: 0x109c91c: addu  s2, a0, s2
+// 0x0109cf64: 0x109cf64: addu  s2, a0, s2
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0109c920: 0x109c920: lbu   v0, 8(s2)
+// 0x0109cf68: 0x109cf68: lbu   v0, 8(s2)
 	ldloc 7
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x0109c924: 0x109c924: sll   zero, zero, 0
-// 0x0109c928: 0x109c928: andi  v0, v0, 1
+// 0x0109cf6c: 0x109cf6c: sll   zero, zero, 0
+// 0x0109cf70: 0x109cf70: andi  v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	and
 	stloc 6
-// 0x0109c92c: 0x109c92c: beq   v0, zero, 0x109c94c addiu s1, s1, 1
+// 0x0109cf74: 0x109cf74: beq   v0, zero, 0x109cf94 addiu s1, s1, 1
 	ldloc 6
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brfalse L_109c94c
+	brfalse L_109cf94
 // --- basic block ---
-// 0x0109c934: 0x109c934: lw    a0, 24(s2)
+// 0x0109cf7c: 0x109cf7c: lw    a0, 24(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -200,7 +200,7 @@ L_109c918:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c938: 0x109c938: jal   0x109c8e4 addu  a1, s3, zero
+// 0x0109cf80: 0x109cf80: jal   0x109cf2c addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -208,12 +208,12 @@ L_109c918:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_contextmenu_delete_109c8e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_contextmenu_delete_109cf2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0109c940: 0x109c940: lw    a0, 24(s2)
+// 0x0109cf88: 0x109cf88: lw    a0, 24(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -222,7 +222,7 @@ L_109c918:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109c944: 0x109c944: jal   0x1000930 sll   zero, zero, 0
+// 0x0109cf8c: 0x109cf8c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -233,19 +233,19 @@ L_109c918:
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_109c94c:
-// 0x0109c94c: 0x109c94c: beq   s3, zero, 0x109c960 sll   zero, zero, 0
+L_109cf94:
+// 0x0109cf94: 0x109cf94: beq   s3, zero, 0x109cfa8 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_109c960
+	brfalse L_109cfa8
 // --- basic block ---
-// 0x0109c954: 0x109c954: lw    a0, 0(s2)
+// 0x0109cf9c: 0x109cf9c: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109c958: 0x109c958: jal   0x1000930 sll   zero, zero, 0
+// 0x0109cfa0: 0x109cfa0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -256,8 +256,8 @@ L_109c94c:
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_109c960:
-// 0x0109c960: 0x109c960: lw    v0, 4(s0)
+L_109cfa8:
+// 0x0109cfa8: 0x109cfa8: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -266,27 +266,27 @@ L_109c960:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c964: 0x109c964: lw    a0, 0(s0)
+// 0x0109cfac: 0x109cfac: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109c968: 0x109c968: slt   v0, s1, v0
+// 0x0109cfb0: 0x109cfb0: slt   v0, s1, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109c96c: 0x109c96c: bne   v0, zero, 0x109c918 mult  s1, s4
+// 0x0109cfb4: 0x109cfb4: bne   v0, zero, 0x109cf60 mult  s1, s4
 	ldloc 6
 	ldloc 9
 	ldloc 12
 	mul
 	stloc 14
-	brtrue L_109c918
+	brtrue L_109cf60
 // --- basic block ---
-// 0x0109c974: 0x109c974: jal   0x1000930 sw    zero, 12(s0)
+// 0x0109cfbc: 0x109cfbc: jal   0x1000930 sw    zero, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -305,7 +305,7 @@ L_109c960:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0109c97c: 0x109c97c: jal   0x1000930 addu  a0, s0, zero
+// 0x0109cfc4: 0x109cfc4: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -318,9 +318,9 @@ L_109c960:
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_109c984:
-// 0x0109c984: 0x109c984: lw    ra, 36(sp)
-// 0x0109c988: 0x109c988: lw    s4, 32(sp)
+L_109cfcc:
+// 0x0109cfcc: 0x109cfcc: lw    ra, 36(sp)
+// 0x0109cfd0: 0x109cfd0: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -329,7 +329,7 @@ L_109c984:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109c98c: 0x109c98c: lw    s3, 28(sp)
+// 0x0109cfd4: 0x109cfd4: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -338,7 +338,7 @@ L_109c984:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109c990: 0x109c990: lw    s2, 24(sp)
+// 0x0109cfd8: 0x109cfd8: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -347,7 +347,7 @@ L_109c984:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109c994: 0x109c994: lw    s1, 20(sp)
+// 0x0109cfdc: 0x109cfdc: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -356,7 +356,7 @@ L_109c984:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109c998: 0x109c998: lw    s0, 16(sp)
+// 0x0109cfe0: 0x109cfe0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -365,7 +365,7 @@ L_109c984:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109c99c: 0x109c99c: jr    ra addiu sp, sp, 40
+// 0x0109cfe4: 0x109cfe4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -377,7 +377,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_contextmenu_set_separator_109c9a4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_contextmenu_set_separator_109cfec(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra,int32 lo,int32 v1)
@@ -430,12 +430,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109c9a4: 0x109c9a4: addiu sp, sp, -40
+// 0x0109cfec: 0x109cfec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109c9a8: 0x109c9a8: sw    s4, 32(sp)
+// 0x0109cff0: 0x109cff0: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -444,7 +444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109c9ac: 0x109c9ac: sw    s3, 28(sp)
+// 0x0109cff4: 0x109cff4: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -453,7 +453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109c9b0: 0x109c9b0: sw    s2, 24(sp)
+// 0x0109cff8: 0x109cff8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -462,7 +462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109c9b4: 0x109c9b4: sw    s0, 16(sp)
+// 0x0109cffc: 0x109cffc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -471,8 +471,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109c9b8: 0x109c9b8: sw    ra, 36(sp)
-// 0x0109c9bc: 0x109c9bc: sw    s1, 20(sp)
+// 0x0109d000: 0x109d000: sw    ra, 36(sp)
+// 0x0109d004: 0x109d004: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -481,42 +481,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109c9c0: 0x109c9c0: addu  s2, a0, zero
+// 0x0109d008: 0x109d008: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109c9c4: 0x109c9c4: addu  s4, a1, zero
+// 0x0109d00c: 0x109d00c: addu  s4, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0109c9c8: 0x109c9c8: addu  s0, zero, zero
+// 0x0109d010: 0x109d010: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0109c9cc: 0x109c9cc: j	 0x109ca18 addiu s3, zero, 28
+// 0x0109d014: 0x109d014: j	 0x109d060 addiu s3, zero, 28
 	ldc.i4.s 28
 	stloc 10
-	br L_109ca18
+	br L_109d060
 // --- basic block ---
-L_109c9d4:
-// 0x0109c9d4: 0x109c9d4: mult  s0, s3
+L_109d01c:
+// 0x0109d01c: 0x109d01c: mult  s0, s3
 	ldloc 8
 	ldloc 10
 	mul
 	stloc 13
-// 0x0109c9d8: 0x109c9d8: lw    s1, 0(s2)
+// 0x0109d020: 0x109d020: lw    s1, 0(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109c9dc: 0x109c9dc: mflo  lo
+// 0x0109d024: 0x109d024: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x0109c9e0: 0x109c9e0: addu  s1, s1, v0
+// 0x0109d028: 0x109d028: addu  s1, s1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0109c9e4: 0x109c9e4: lw    v0, 16(s1)
+// 0x0109d02c: 0x109d02c: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -525,52 +525,52 @@ L_109c9d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109c9e8: 0x109c9e8: sll   zero, zero, 0
-// 0x0109c9ec: 0x109c9ec: beq   v0, zero, 0x109ca18 addiu s0, s0, 1
+// 0x0109d030: 0x109d030: sll   zero, zero, 0
+// 0x0109d034: 0x109d034: beq   v0, zero, 0x109d060 addiu s0, s0, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_109ca18
+	brfalse L_109d060
 // --- basic block ---
-// 0x0109c9f4: 0x109c9f4: lw    a0, 0(v0)
+// 0x0109d03c: 0x109d03c: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109c9f8: 0x109c9f8: jal   0x1001b14 sll   zero, zero, 0
+// 0x0109d040: 0x109d040: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0109ca00: 0x109ca00: bne   v0, zero, 0x109ca18 sll   zero, zero, 0
+// 0x0109d048: 0x109d048: bne   v0, zero, 0x109d060 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109ca18
+	brtrue L_109d060
 // --- basic block ---
-// 0x0109ca08: 0x109ca08: lbu   v0, 8(s1)
+// 0x0109d050: 0x109d050: lbu   v0, 8(s1)
 	ldloc 7
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x0109ca0c: 0x109ca0c: sll   zero, zero, 0
-// 0x0109ca10: 0x109ca10: ori   v0, v0, 4
+// 0x0109d054: 0x109d054: sll   zero, zero, 0
+// 0x0109d058: 0x109d058: ori   v0, v0, 4
 	ldloc 6
 	ldc.i4.4
 	or
 	stloc 6
-// 0x0109ca14: 0x109ca14: sb    v0, 8(s1)
+// 0x0109d05c: 0x109d05c: sb    v0, 8(s1)
 	ldloc 7
 	ldc.i4.8
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_109ca18:
-// 0x0109ca18: 0x109ca18: lw    v0, 4(s2)
+L_109d060:
+// 0x0109d060: 0x109d060: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -579,20 +579,20 @@ L_109ca18:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ca1c: 0x109ca1c: sll   zero, zero, 0
-// 0x0109ca20: 0x109ca20: slt   v0, s0, v0
+// 0x0109d064: 0x109d064: sll   zero, zero, 0
+// 0x0109d068: 0x109d068: slt   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109ca24: 0x109ca24: bne   v0, zero, 0x109c9d4 addu  a1, s4, zero
+// 0x0109d06c: 0x109d06c: bne   v0, zero, 0x109d01c addu  a1, s4, zero
 	ldloc 6
 	ldloc 11
 	stloc.2
-	brtrue L_109c9d4
+	brtrue L_109d01c
 // --- basic block ---
-// 0x0109ca2c: 0x109ca2c: lw    ra, 36(sp)
-// 0x0109ca30: 0x109ca30: lw    s4, 32(sp)
+// 0x0109d074: 0x109d074: lw    ra, 36(sp)
+// 0x0109d078: 0x109d078: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -601,7 +601,7 @@ L_109ca18:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109ca34: 0x109ca34: lw    s3, 28(sp)
+// 0x0109d07c: 0x109d07c: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -610,7 +610,7 @@ L_109ca18:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109ca38: 0x109ca38: lw    s2, 24(sp)
+// 0x0109d080: 0x109d080: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -619,7 +619,7 @@ L_109ca18:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109ca3c: 0x109ca3c: lw    s1, 20(sp)
+// 0x0109d084: 0x109d084: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -628,7 +628,7 @@ L_109ca18:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ca40: 0x109ca40: lw    s0, 16(sp)
+// 0x0109d088: 0x109d088: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -637,7 +637,7 @@ L_109ca18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ca44: 0x109ca44: jr    ra addiu sp, sp, 40
+// 0x0109d08c: 0x109d08c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -649,7 +649,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_contextmenu_show_item__by_action_name_109ca4c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_contextmenu_show_item__by_action_name_109d094(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s7,int32 s0,int32 s8,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 s6,int32 ra,int32 v1,int32 lo)
@@ -714,12 +714,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ca4c: 0x109ca4c: addiu sp, sp, -56
+// 0x0109d094: 0x109d094: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0109ca50: 0x109ca50: sw    s6, 40(sp)
+// 0x0109d098: 0x109d098: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -728,7 +728,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109ca54: 0x109ca54: sw    s5, 36(sp)
+// 0x0109d09c: 0x109d09c: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -737,7 +737,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109ca58: 0x109ca58: sw    s4, 32(sp)
+// 0x0109d0a0: 0x109d0a0: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -746,7 +746,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109ca5c: 0x109ca5c: sw    s3, 28(sp)
+// 0x0109d0a4: 0x109d0a4: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -755,7 +755,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109ca60: 0x109ca60: sw    s2, 24(sp)
+// 0x0109d0a8: 0x109d0a8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -764,7 +764,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109ca64: 0x109ca64: sw    s1, 20(sp)
+// 0x0109d0ac: 0x109d0ac: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -773,7 +773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109ca68: 0x109ca68: sw    s0, 16(sp)
+// 0x0109d0b0: 0x109d0b0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -782,8 +782,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109ca6c: 0x109ca6c: sw    ra, 52(sp)
-// 0x0109ca70: 0x109ca70: sw    s8, 48(sp)
+// 0x0109d0b4: 0x109d0b4: sw    ra, 52(sp)
+// 0x0109d0b8: 0x109d0b8: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -792,7 +792,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109ca74: 0x109ca74: sw    s7, 44(sp)
+// 0x0109d0bc: 0x109d0bc: sw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -801,70 +801,70 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109ca78: 0x109ca78: addu  s3, a0, zero
+// 0x0109d0c0: 0x109d0c0: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0109ca7c: 0x109ca7c: addu  s2, a1, zero
+// 0x0109d0c4: 0x109d0c4: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0109ca80: 0x109ca80: addu  s1, a2, zero
+// 0x0109d0c8: 0x109d0c8: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0109ca84: 0x109ca84: addu  s6, a3, zero
+// 0x0109d0cc: 0x109d0cc: addu  s6, a3, zero
 	ldloc 4
 	stloc 15
-// 0x0109ca88: 0x109ca88: addu  s0, zero, zero
+// 0x0109d0d0: 0x109d0d0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0109ca8c: 0x109ca8c: addiu s5, zero, 28
+// 0x0109d0d4: 0x109d0d4: addiu s5, zero, 28
 	ldc.i4.s 28
 	stloc 14
-// 0x0109ca90: 0x109ca90: j	 0x109cb10 addiu s4, zero, -3
+// 0x0109d0d8: 0x109d0d8: j	 0x109d158 addiu s4, zero, -3
 	ldc.i4.s -3
 	stloc 13
-	br L_109cb10
+	br L_109d158
 // --- basic block ---
-L_109ca98:
-// 0x0109ca98: 0x109ca98: lw    s7, 0(s3)
+L_109d0e0:
+// 0x0109d0e0: 0x109d0e0: lw    s7, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109ca9c: 0x109ca9c: mflo  lo
+// 0x0109d0e4: 0x109d0e4: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x0109caa0: 0x109caa0: addu  s7, s7, v0
+// 0x0109d0e8: 0x109d0e8: addu  s7, s7, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0109caa4: 0x109caa4: lbu   s8, 8(s7)
+// 0x0109d0ec: 0x109d0ec: lbu   s8, 8(s7)
 	ldloc 7
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 9
-// 0x0109caa8: 0x109caa8: sll   zero, zero, 0
-// 0x0109caac: 0x109caac: andi  v0, s8, 1
+// 0x0109d0f0: 0x109d0f0: sll   zero, zero, 0
+// 0x0109d0f4: 0x109d0f4: andi  v0, s8, 1
 	ldloc 9
 	ldc.i4.1
 	and
 	stloc 6
-// 0x0109cab0: 0x109cab0: beq   v0, zero, 0x109cad4 addu  a1, s2, zero
+// 0x0109d0f8: 0x109d0f8: beq   v0, zero, 0x109d11c addu  a1, s2, zero
 	ldloc 6
 	ldloc 12
 	stloc.2
-	brfalse L_109cad4
+	brfalse L_109d11c
 // --- basic block ---
-// 0x0109cab8: 0x109cab8: beq   s6, zero, 0x109cb0c addu  a2, s1, zero
+// 0x0109d100: 0x109d100: beq   s6, zero, 0x109d154 addu  a2, s1, zero
 	ldloc 15
 	ldloc 10
 	stloc.3
-	brfalse L_109cb0c
+	brfalse L_109d154
 // --- basic block ---
-// 0x0109cac0: 0x109cac0: lw    a0, 24(s7)
+// 0x0109d108: 0x109d108: lw    a0, 24(s7)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -873,7 +873,7 @@ L_109ca98:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109cac4: 0x109cac4: jal   0x109ca4c addiu a3, zero, 1
+// 0x0109d10c: 0x109d10c: jal   0x109d094 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -881,20 +881,20 @@ L_109ca98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_contextmenu_show_item__by_action_name_109ca4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_contextmenu_show_item__by_action_name_109d094(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 17
 	stloc 6
 // --- basic block ---
-// 0x0109cacc: 0x109cacc: j	 0x109cb10 addiu s0, s0, 1
+// 0x0109d114: 0x109d114: j	 0x109d158 addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_109cb10
+	br L_109d158
 // --- basic block ---
-L_109cad4:
-// 0x0109cad4: 0x109cad4: lw    v0, 16(s7)
+L_109d11c:
+// 0x0109d11c: 0x109d11c: lw    v0, 16(s7)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -903,63 +903,63 @@ L_109cad4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109cad8: 0x109cad8: sll   zero, zero, 0
-// 0x0109cadc: 0x109cadc: beq   v0, zero, 0x109cb0c sll   zero, zero, 0
+// 0x0109d120: 0x109d120: sll   zero, zero, 0
+// 0x0109d124: 0x109d124: beq   v0, zero, 0x109d154 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109cb0c
+	brfalse L_109d154
 // --- basic block ---
-// 0x0109cae4: 0x109cae4: lw    a0, 0(v0)
+// 0x0109d12c: 0x109d12c: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109cae8: 0x109cae8: jal   0x1001b14 sll   zero, zero, 0
+// 0x0109d130: 0x109d130: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0109caf0: 0x109caf0: bne   v0, zero, 0x109cb0c and   v0, s8, s4
+// 0x0109d138: 0x109d138: bne   v0, zero, 0x109d154 and   v0, s8, s4
 	ldloc 6
 	ldloc 9
 	ldloc 13
 	and
 	stloc 6
-	brtrue L_109cb0c
+	brtrue L_109d154
 // --- basic block ---
-// 0x0109caf8: 0x109caf8: beq   s1, zero, 0x109cb08 ori   s8, s8, 2
+// 0x0109d140: 0x109d140: beq   s1, zero, 0x109d150 ori   s8, s8, 2
 	ldloc 10
 	ldloc 9
 	ldc.i4.2
 	or
 	stloc 9
-	brfalse L_109cb08
+	brfalse L_109d150
 // --- basic block ---
-// 0x0109cb00: 0x109cb00: j	 0x109cb0c sb    v0, 8(s7)
+// 0x0109d148: 0x109d148: j	 0x109d154 sb    v0, 8(s7)
 	ldloc 7
 	ldc.i4.8
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_109cb0c
+	br L_109d154
 // --- basic block ---
-L_109cb08:
-// 0x0109cb08: 0x109cb08: sb    s8, 8(s7)
+L_109d150:
+// 0x0109d150: 0x109d150: sb    s8, 8(s7)
 	ldloc 7
 	ldc.i4.8
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_109cb0c:
-// 0x0109cb0c: 0x109cb0c: addiu s0, s0, 1
+L_109d154:
+// 0x0109d154: 0x109d154: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_109cb10:
-// 0x0109cb10: 0x109cb10: lw    v0, 4(s3)
+L_109d158:
+// 0x0109d158: 0x109d158: lw    v0, 4(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -968,22 +968,22 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109cb14: 0x109cb14: sll   zero, zero, 0
-// 0x0109cb18: 0x109cb18: slt   v0, s0, v0
+// 0x0109d15c: 0x109d15c: sll   zero, zero, 0
+// 0x0109d160: 0x109d160: slt   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109cb1c: 0x109cb1c: bne   v0, zero, 0x109ca98 mult  s0, s5
+// 0x0109d164: 0x109d164: bne   v0, zero, 0x109d0e0 mult  s0, s5
 	ldloc 6
 	ldloc 8
 	ldloc 14
 	mul
 	stloc 18
-	brtrue L_109ca98
+	brtrue L_109d0e0
 // --- basic block ---
-// 0x0109cb24: 0x109cb24: lw    ra, 52(sp)
-// 0x0109cb28: 0x109cb28: lw    s8, 48(sp)
+// 0x0109d16c: 0x109d16c: lw    ra, 52(sp)
+// 0x0109d170: 0x109d170: lw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -992,7 +992,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109cb2c: 0x109cb2c: lw    s7, 44(sp)
+// 0x0109d174: 0x109d174: lw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1001,7 +1001,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109cb30: 0x109cb30: lw    s6, 40(sp)
+// 0x0109d178: 0x109d178: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1010,7 +1010,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109cb34: 0x109cb34: lw    s5, 36(sp)
+// 0x0109d17c: 0x109d17c: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1019,7 +1019,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109cb38: 0x109cb38: lw    s4, 32(sp)
+// 0x0109d180: 0x109d180: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1028,7 +1028,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109cb3c: 0x109cb3c: lw    s3, 28(sp)
+// 0x0109d184: 0x109d184: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1037,7 +1037,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109cb40: 0x109cb40: lw    s2, 24(sp)
+// 0x0109d188: 0x109d188: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1046,7 +1046,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109cb44: 0x109cb44: lw    s1, 20(sp)
+// 0x0109d18c: 0x109d18c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1055,7 +1055,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109cb48: 0x109cb48: lw    s0, 16(sp)
+// 0x0109d190: 0x109d190: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1064,7 +1064,7 @@ L_109cb10:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109cb4c: 0x109cb4c: jr    ra addiu sp, sp, 56
+// 0x0109d194: 0x109d194: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1076,7 +1076,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_dialog_closed_109cbc8(int32,int32,int32,int32,int32)
+.method public static int32 on_dialog_closed_109d210(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1111,7 +1111,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cbc8: 0x109cbc8: lw    v0, 28(a1)
+// 0x0109d210: 0x109d210: lw    v0, 28(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -1120,16 +1120,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cbcc: 0x109cbcc: addiu sp, sp, -24
+// 0x0109d214: 0x109d214: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109cbd0: 0x109cbd0: beq   v0, zero, 0x109cbe0 sw    ra, 20(sp)
+// 0x0109d218: 0x109d218: beq   v0, zero, 0x109d228 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_109cbe0
+	brfalse L_109d228
 // --- basic block ---
-// 0x0109cbd8: 0x109cbd8: jalr  v0 sll   zero, zero, 0
+// 0x0109d220: 0x109d220: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1141,10 +1141,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_109cbe0:
-// 0x0109cbe0: 0x109cbe0: lw    ra, 20(sp)
-// 0x0109cbe4: 0x109cbe4: sll   zero, zero, 0
-// 0x0109cbe8: 0x109cbe8: jr    ra addiu sp, sp, 24
+L_109d228:
+// 0x0109d228: 0x109d228: lw    ra, 20(sp)
+// 0x0109d22c: 0x109d22c: sll   zero, zero, 0
+// 0x0109d230: 0x109d230: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1156,7 +1156,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_device_event_109cc04(int32)
+.method public static int32 on_device_event_109d24c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1179,42 +1179,42 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cc04: 0x109cc04: addiu v0, zero, 10
+// 0x0109d24c: 0x109d24c: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x0109cc08: 0x109cc08: bne   a0, v0, 0x109cc20 lui   v0, 0x80000
+// 0x0109d250: 0x109d250: bne   a0, v0, 0x109d268 lui   v0, 0x80000
 	ldloc.0
 	ldloc.1
 	ldc.i4 524288
 	stloc.1
-	bne.un L_109cc20
+	bne.un L_109d268
 // --- basic block ---
-// 0x0109cc10: 0x109cc10: lw    v1, 9988(v0)
+// 0x0109d258: 0x109d258: lw    v1, 10452(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2497
+	ldc.i4 2613
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109cc14: 0x109cc14: sll   zero, zero, 0
-// 0x0109cc18: 0x109cc18: addiu v1, v1, 1
+// 0x0109d25c: 0x109d25c: sll   zero, zero, 0
+// 0x0109d260: 0x109d260: addiu v1, v1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0109cc1c: 0x109cc1c: sw    v1, 9988(v0)
+// 0x0109d264: 0x109d264: sw    v1, 10452(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2497
+	ldc.i4 2613
 	add
 	ldloc.2
 	stelem.i4
-L_109cc20:
-// 0x0109cc20: 0x109cc20: jr    ra sll   zero, zero, 0
+L_109d268:
+// 0x0109d268: 0x109d268: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -1222,7 +1222,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_tabcontrol_get_dialog_109cc28(int32)
+.method public static int32 ssd_tabcontrol_get_dialog_109d270(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -1242,7 +1242,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cc28: 0x109cc28: lw    v0, 20(a0)
+// 0x0109d270: 0x109d270: lw    v0, 20(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1251,13 +1251,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109cc2c: 0x109cc2c: jr    ra sll   zero, zero, 0
+// 0x0109d274: 0x109d274: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 get_arrow_size_109cc34(int32,int32,int32,int32,int32)
+.method public static int32 get_arrow_size_109d27c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -1295,25 +1295,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cc34: 0x109cc34: lui   v0, 0x80000
+// 0x0109d27c: 0x109d27c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109cc38: 0x109cc38: lw    v1, 9980(v0)
+// 0x0109d280: 0x109d280: lw    v1, 10444(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2495
+	ldc.i4 2611
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109cc3c: 0x109cc3c: addiu sp, sp, -24
+// 0x0109d284: 0x109d284: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109cc40: 0x109cc40: sw    ra, 20(sp)
-// 0x0109cc44: 0x109cc44: bne   v1, zero, 0x109ccb0 sw    s0, 16(sp)
+// 0x0109d288: 0x109d288: sw    ra, 20(sp)
+// 0x0109d28c: 0x109d28c: bne   v1, zero, 0x109d2f8 sw    s0, 16(sp)
 	ldloc 8
 	ldloc 7
 	ldloc.0
@@ -1323,14 +1323,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_109ccb0
+	brtrue L_109d2f8
 // --- basic block ---
-// 0x0109cc4c: 0x109cc4c: addiu v0, v0, 9980
+// 0x0109d294: 0x109d294: addiu v0, v0, 10444
 	ldloc 5
-	ldc.i4 9980
+	ldc.i4 10444
 	add
 	stloc 5
-// 0x0109cc50: 0x109cc50: lw    v0, 4(v0)
+// 0x0109d298: 0x109d298: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1339,50 +1339,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cc54: 0x109cc54: sll   zero, zero, 0
-// 0x0109cc58: 0x109cc58: bne   v0, zero, 0x109ccb0 lui   v0, 0x80000
+// 0x0109d29c: 0x109d29c: sll   zero, zero, 0
+// 0x0109d2a0: 0x109d2a0: bne   v0, zero, 0x109d2f8 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_109ccb0
+	brtrue L_109d2f8
 // --- basic block ---
-// 0x0109cc60: 0x109cc60: lw    v0, 9976(v0)
+// 0x0109d2a8: 0x109d2a8: lw    v0, 10440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2494
+	ldc.i4 2610
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cc64: 0x109cc64: sll   zero, zero, 0
-// 0x0109cc68: 0x109cc68: bne   v0, zero, 0x109cc78 lui   a2, 0x20000
+// 0x0109d2ac: 0x109d2ac: sll   zero, zero, 0
+// 0x0109d2b0: 0x109d2b0: bne   v0, zero, 0x109d2c0 lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_109cc78
+	brtrue L_109d2c0
 // --- basic block ---
-// 0x0109cc70: 0x109cc70: j	 0x109cc80 addiu a2, a2, -2428
+// 0x0109d2b8: 0x109d2b8: j	 0x109d2c8 addiu a2, a2, -1964
 	ldloc.3
-	ldc.i4 -2428
+	ldc.i4 -1964
 	add
 	stloc.3
-	br L_109cc80
+	br L_109d2c8
 // --- basic block ---
-L_109cc78:
-// 0x0109cc78: 0x109cc78: lui   a2, 0x20000
+L_109d2c0:
+// 0x0109d2c0: 0x109d2c0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0109cc7c: 0x109cc7c: addiu a2, a2, -2416
+// 0x0109d2c4: 0x109d2c4: addiu a2, a2, -1952
 	ldloc.3
-	ldc.i4 -2416
+	ldc.i4 -1952
 	add
 	stloc.3
-L_109cc80:
-// 0x0109cc80: 0x109cc80: addiu a1, zero, 1
+L_109d2c8:
+// 0x0109d2c8: 0x109d2c8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109cc84: 0x109cc84: jal   0x10a1918 addu  a0, zero, zero
+// 0x0109d2cc: 0x109d2cc: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1390,50 +1390,50 @@ L_109cc80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109cc8c: 0x109cc8c: addu  s0, v0, zero
+// 0x0109d2d4: 0x109d2d4: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0109cc90: 0x109cc90: jal   0x104dffc addu  a0, v0, zero
+// 0x0109d2d8: 0x109d2d8: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109cc98: 0x109cc98: addu  a0, s0, zero
+// 0x0109d2e0: 0x109d2e0: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x0109cc9c: 0x109cc9c: lui   s0, 0x80000
+// 0x0109d2e4: 0x109d2e4: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0109cca0: 0x109cca0: jal   0x104e020 sw    v0, 9980(s0)
+// 0x0109d2e8: 0x109d2e8: jal   0x104e030 sw    v0, 10444(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2495
+	ldc.i4 2611
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109cca8: 0x109cca8: addiu s0, s0, 9980
+// 0x0109d2f0: 0x109d2f0: addiu s0, s0, 10444
 	ldloc 6
-	ldc.i4 9980
+	ldc.i4 10444
 	add
 	stloc 6
-// 0x0109ccac: 0x109ccac: sw    v0, 4(s0)
+// 0x0109d2f4: 0x109d2f4: sw    v0, 4(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1442,17 +1442,17 @@ L_109cc80:
 	add
 	ldloc 5
 	stelem.i4
-L_109ccb0:
-// 0x0109ccb0: 0x109ccb0: lw    ra, 20(sp)
-// 0x0109ccb4: 0x109ccb4: lui   v0, 0x80000
+L_109d2f8:
+// 0x0109d2f8: 0x109d2f8: lw    ra, 20(sp)
+// 0x0109d2fc: 0x109d2fc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109ccb8: 0x109ccb8: addiu v0, v0, 9980
+// 0x0109d300: 0x109d300: addiu v0, v0, 10444
 	ldloc 5
-	ldc.i4 9980
+	ldc.i4 10444
 	add
 	stloc 5
-// 0x0109ccbc: 0x109ccbc: lw    s0, 16(sp)
+// 0x0109d304: 0x109d304: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1461,7 +1461,7 @@ L_109ccb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ccc0: 0x109ccc0: jr    ra addiu sp, sp, 24
+// 0x0109d308: 0x109d308: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1473,7 +1473,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_tabcontrol_get_height_109ccc8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_get_height_109d310(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1508,25 +1508,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ccc8: 0x109ccc8: addiu sp, sp, -24
+// 0x0109d310: 0x109d310: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109cccc: 0x109cccc: sw    ra, 20(sp)
-// 0x0109ccd0: 0x109ccd0: jal   0x109cc34 sll   zero, zero, 0
+// 0x0109d314: 0x109d314: sw    ra, 20(sp)
+// 0x0109d318: 0x109d318: jal   0x109d27c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::get_arrow_size_109cc34(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::get_arrow_size_109d27c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109ccd8: 0x109ccd8: lw    ra, 20(sp)
-// 0x0109ccdc: 0x109ccdc: lw    v0, 4(v0)
+// 0x0109d320: 0x109d320: lw    ra, 20(sp)
+// 0x0109d324: 0x109d324: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1535,7 +1535,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cce0: 0x109cce0: jr    ra addiu sp, sp, 24
+// 0x0109d328: 0x109d328: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1547,7 +1547,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_tabcontrol_get_tab_109cce8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_get_tab_109d330(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 lo)
@@ -1585,20 +1585,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cce8: 0x109cce8: addiu sp, sp, -32
+// 0x0109d330: 0x109d330: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109ccec: 0x109ccec: sw    ra, 28(sp)
-// 0x0109ccf0: 0x109ccf0: bltz  a1, 0x109cd0c addu  v0, a1, zero
+// 0x0109d334: 0x109d334: sw    ra, 28(sp)
+// 0x0109d338: 0x109d338: bltz  a1, 0x109d354 addu  v0, a1, zero
 	ldloc.2
 	ldloc.2
 	stloc 6
 	ldc.i4.s 0
-	blt L_109cd0c
+	blt L_109d354
 // --- basic block ---
-// 0x0109ccf8: 0x109ccf8: lw    v1, 128(a0)
+// 0x0109d340: 0x109d340: lw    v1, 128(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1607,20 +1607,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ccfc: 0x109ccfc: sll   zero, zero, 0
-// 0x0109cd00: 0x109cd00: slt   v1, a1, v1
+// 0x0109d344: 0x109d344: sll   zero, zero, 0
+// 0x0109d348: 0x109d348: slt   v1, a1, v1
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109cd04: 0x109cd04: bne   v1, zero, 0x109cd3c addiu v1, zero, 12
+// 0x0109d34c: 0x109d34c: bne   v1, zero, 0x109d384 addiu v1, zero, 12
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	brtrue L_109cd3c
+	brtrue L_109d384
 // --- basic block ---
-L_109cd0c:
-// 0x0109cd0c: 0x109cd0c: lw    v1, 128(a0)
+L_109d354:
+// 0x0109d354: 0x109d354: lw    v1, 128(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1629,29 +1629,29 @@ L_109cd0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cd10: 0x109cd10: lui   a1, 0x20000
+// 0x0109d358: 0x109d358: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109cd14: 0x109cd14: lui   a3, 0x20000
+// 0x0109d35c: 0x109d35c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109cd18: 0x109cd18: addiu a1, a1, -2404
+// 0x0109d360: 0x109d360: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109cd1c: 0x109cd1c: addiu a3, a3, -2372
+// 0x0109d364: 0x109d364: addiu a3, a3, -1908
 	ldloc 4
-	ldc.i4 -2372
+	ldc.i4 -1908
 	add
 	stloc 4
-// 0x0109cd20: 0x109cd20: addiu a0, zero, 4
+// 0x0109d368: 0x109d368: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109cd24: 0x109cd24: addiu a2, zero, 102
+// 0x0109d36c: 0x109d36c: addiu a2, zero, 102
 	ldc.i4.s 102
 	stloc.3
-// 0x0109cd28: 0x109cd28: sw    v0, 16(sp)
+// 0x0109d370: 0x109d370: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1660,7 +1660,7 @@ L_109cd0c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109cd2c: 0x109cd2c: jal   0x100449c sw    v1, 20(sp)
+// 0x0109d374: 0x109d374: jal   0x100449c sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1679,26 +1679,26 @@ L_109cd0c:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0109cd34: 0x109cd34: j	 0x109cd4c addu  v0, zero, zero
+// 0x0109d37c: 0x109d37c: j	 0x109d394 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_109cd4c
+	br L_109d394
 // --- basic block ---
-L_109cd3c:
-// 0x0109cd3c: 0x109cd3c: mult  a1, v1
+L_109d384:
+// 0x0109d384: 0x109d384: mult  a1, v1
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 9
-// 0x0109cd40: 0x109cd40: mflo  lo
+// 0x0109d388: 0x109d388: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0109cd44: 0x109cd44: addu  a0, a0, v0
+// 0x0109d38c: 0x109d38c: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x0109cd48: 0x109cd48: lw    v0, 48(a0)
+// 0x0109d390: 0x109d390: lw    v0, 48(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1707,10 +1707,10 @@ L_109cd3c:
 	add
 	ldelem.i4
 	stloc 6
-L_109cd4c:
-// 0x0109cd4c: 0x109cd4c: lw    ra, 28(sp)
-// 0x0109cd50: 0x109cd50: sll   zero, zero, 0
-// 0x0109cd54: 0x109cd54: jr    ra addiu sp, sp, 32
+L_109d394:
+// 0x0109d394: 0x109d394: lw    ra, 28(sp)
+// 0x0109d398: 0x109d398: sll   zero, zero, 0
+// 0x0109d39c: 0x109d39c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1722,7 +1722,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_tabcontrol_get_active_tab_109cd5c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_get_active_tab_109d3a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1757,7 +1757,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cd5c: 0x109cd5c: lw    a1, 132(a0)
+// 0x0109d3a4: 0x109d3a4: lw    a1, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1766,26 +1766,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109cd60: 0x109cd60: addiu sp, sp, -24
+// 0x0109d3a8: 0x109d3a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109cd64: 0x109cd64: sw    ra, 20(sp)
-// 0x0109cd68: 0x109cd68: jal   0x109cce8 sll   zero, zero, 0
+// 0x0109d3ac: 0x109d3ac: sw    ra, 20(sp)
+// 0x0109d3b0: 0x109d3b0: jal   0x109d330 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_get_tab_109cce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_get_tab_109d330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109cd70: 0x109cd70: lw    ra, 20(sp)
-// 0x0109cd74: 0x109cd74: sll   zero, zero, 0
-// 0x0109cd78: 0x109cd78: jr    ra addiu sp, sp, 24
+// 0x0109d3b8: 0x109d3b8: lw    ra, 20(sp)
+// 0x0109d3bc: 0x109d3bc: sll   zero, zero, 0
+// 0x0109d3c0: 0x109d3c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1797,7 +1797,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 tabsline_set_text_109cd80(int32,int32,int32,int32,int32)
+.method public static int32 tabsline_set_text_109d3c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -1835,12 +1835,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cd80: 0x109cd80: addiu sp, sp, -24
+// 0x0109d3c8: 0x109d3c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109cd84: 0x109cd84: sw    s0, 16(sp)
+// 0x0109d3cc: 0x109d3cc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1849,55 +1849,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109cd88: 0x109cd88: sw    ra, 20(sp)
-// 0x0109cd8c: 0x109cd8c: lw    a0, 0(a0)
+// 0x0109d3d0: 0x109d3d0: sw    ra, 20(sp)
+// 0x0109d3d4: 0x109d3d4: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109cd90: 0x109cd90: bne   a1, zero, 0x109cda4 addu  s0, a2, zero
+// 0x0109d3d8: 0x109d3d8: bne   a1, zero, 0x109d3ec addu  s0, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 6
-	brtrue L_109cda4
+	brtrue L_109d3ec
 // --- basic block ---
-// 0x0109cd98: 0x109cd98: lui   a1, 0x20000
+// 0x0109d3e0: 0x109d3e0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109cd9c: 0x109cd9c: j	 0x109cdac addiu a1, a1, -2300
+// 0x0109d3e4: 0x109d3e4: j	 0x109d3f4 addiu a1, a1, -1836
 	ldloc.2
-	ldc.i4 -2300
+	ldc.i4 -1836
 	add
 	stloc.2
-	br L_109cdac
+	br L_109d3f4
 // --- basic block ---
-L_109cda4:
-// 0x0109cda4: 0x109cda4: lui   a1, 0x20000
+L_109d3ec:
+// 0x0109d3ec: 0x109d3ec: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109cda8: 0x109cda8: addiu a1, a1, -2268
+// 0x0109d3f0: 0x109d3f0: addiu a1, a1, -1804
 	ldloc.2
-	ldc.i4 -2268
+	ldc.i4 -1804
 	add
 	stloc.2
-L_109cdac:
-// 0x0109cdac: 0x109cdac: jal   0x109b304 sll   zero, zero, 0
+L_109d3f4:
+// 0x0109d3f4: 0x109d3f4: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109cdb4: 0x109cdb4: addu  a0, v0, zero
+// 0x0109d3fc: 0x109d3fc: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x0109cdb8: 0x109cdb8: jal   0x1097e5c addu  a1, s0, zero
+// 0x0109d400: 0x109d400: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -1905,13 +1905,13 @@ L_109cdac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109cdc0: 0x109cdc0: lw    ra, 20(sp)
-// 0x0109cdc4: 0x109cdc4: lw    s0, 16(sp)
+// 0x0109d408: 0x109d408: lw    ra, 20(sp)
+// 0x0109d40c: 0x109d40c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1920,7 +1920,7 @@ L_109cdac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109cdc8: 0x109cdc8: jr    ra addiu sp, sp, 24
+// 0x0109d410: 0x109d410: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1932,7 +1932,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 tabsline_select_tab_109cdd0(int32,int32,int32,int32,int32)
+.method public static int32 tabsline_select_tab_109d418(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -1976,12 +1976,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cdd0: 0x109cdd0: addiu sp, sp, -32
+// 0x0109d418: 0x109d418: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109cdd4: 0x109cdd4: sw    s2, 24(sp)
+// 0x0109d41c: 0x109d41c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1990,7 +1990,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109cdd8: 0x109cdd8: sw    s0, 16(sp)
+// 0x0109d420: 0x109d420: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1999,11 +1999,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109cddc: 0x109cddc: sw    ra, 28(sp)
-// 0x0109cde0: 0x109cde0: addu  s0, a0, zero
+// 0x0109d424: 0x109d424: sw    ra, 28(sp)
+// 0x0109d428: 0x109d428: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0109cde4: 0x109cde4: sw    s1, 20(sp)
+// 0x0109d42c: 0x109d42c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2012,25 +2012,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109cde8: 0x109cde8: lw    a0, 0(a0)
+// 0x0109d430: 0x109d430: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109cdec: 0x109cdec: bne   a1, zero, 0x109ce14 addu  s2, a2, zero
+// 0x0109d434: 0x109d434: bne   a1, zero, 0x109d45c addu  s2, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 10
-	brtrue L_109ce14
+	brtrue L_109d45c
 // --- basic block ---
-// 0x0109cdf4: 0x109cdf4: lui   a1, 0x20000
+// 0x0109d43c: 0x109d43c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109cdf8: 0x109cdf8: jal   0x109b304 addiu a1, a1, -2236
+// 0x0109d440: 0x109d440: jal   0x109b94c addiu a1, a1, -1772
 	ldloc.2
-	ldc.i4 -2236
+	ldc.i4 -1772
 	add
 	stloc.2
 	ldloc.0
@@ -2038,38 +2038,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109ce00: 0x109ce00: lui   a1, 0x20000
+// 0x0109d448: 0x109d448: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109ce04: 0x109ce04: addu  s1, v0, zero
+// 0x0109d44c: 0x109d44c: addu  s1, v0, zero
 	ldloc 7
 	stloc 9
-// 0x0109ce08: 0x109ce08: lw    a0, 0(s0)
+// 0x0109d450: 0x109d450: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109ce0c: 0x109ce0c: j	 0x109ce30 addiu a1, a1, -2300
+// 0x0109d454: 0x109d454: j	 0x109d478 addiu a1, a1, -1836
 	ldloc.2
-	ldc.i4 -2300
+	ldc.i4 -1836
 	add
 	stloc.2
-	br L_109ce30
+	br L_109d478
 // --- basic block ---
-L_109ce14:
-// 0x0109ce14: 0x109ce14: lui   a1, 0x20000
+L_109d45c:
+// 0x0109d45c: 0x109d45c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109ce18: 0x109ce18: jal   0x109b304 addiu a1, a1, -2208
+// 0x0109d460: 0x109d460: jal   0x109b94c addiu a1, a1, -1744
 	ldloc.2
-	ldc.i4 -2208
+	ldc.i4 -1744
 	add
 	stloc.2
 	ldloc.0
@@ -2077,113 +2077,113 @@ L_109ce14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109ce20: 0x109ce20: lui   a1, 0x20000
+// 0x0109d468: 0x109d468: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109ce24: 0x109ce24: lw    a0, 0(s0)
+// 0x0109d46c: 0x109d46c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109ce28: 0x109ce28: addu  s1, v0, zero
+// 0x0109d470: 0x109d470: addu  s1, v0, zero
 	ldloc 7
 	stloc 9
-// 0x0109ce2c: 0x109ce2c: addiu a1, a1, -2268
+// 0x0109d474: 0x109d474: addiu a1, a1, -1804
 	ldloc.2
-	ldc.i4 -2268
+	ldc.i4 -1804
 	add
 	stloc.2
-L_109ce30:
-// 0x0109ce30: 0x109ce30: jal   0x109b304 sll   zero, zero, 0
+L_109d478:
+// 0x0109d478: 0x109d478: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109ce38: 0x109ce38: beq   s2, zero, 0x109ce60 addu  s0, v0, zero
+// 0x0109d480: 0x109d480: beq   s2, zero, 0x109d4a8 addu  s0, v0, zero
 	ldloc 10
 	ldloc 7
 	stloc 6
-	brfalse L_109ce60
+	brfalse L_109d4a8
 // --- basic block ---
-// 0x0109ce40: 0x109ce40: addu  a0, s1, zero
+// 0x0109d488: 0x109d488: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109ce44: 0x109ce44: jal   0x109e8c4 addiu a1, zero, 1
+// 0x0109d48c: 0x109d48c: jal   0x109ef0c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_state_109e8c4(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_state_109ef0c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109ce4c: 0x109ce4c: beq   s0, zero, 0x109ce84 lui   a1, 0x0
+// 0x0109d494: 0x109d494: beq   s0, zero, 0x109d4cc lui   a1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_109ce84
+	brfalse L_109d4cc
 // --- basic block ---
-// 0x0109ce54: 0x109ce54: addu  a0, s0, zero
+// 0x0109d49c: 0x109d49c: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x0109ce58: 0x109ce58: j	 0x109ce7c addiu a1, a1, 31980
+// 0x0109d4a0: 0x109d4a0: j	 0x109d4c4 addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-	br L_109ce7c
+	br L_109d4c4
 // --- basic block ---
-L_109ce60:
-// 0x0109ce60: 0x109ce60: addu  a0, s1, zero
+L_109d4a8:
+// 0x0109d4a8: 0x109d4a8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0109ce64: 0x109ce64: jal   0x109e8c4 addu  a1, zero, zero
+// 0x0109d4ac: 0x109d4ac: jal   0x109ef0c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_state_109e8c4(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_state_109ef0c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109ce6c: 0x109ce6c: beq   s0, zero, 0x109ce84 lui   a1, 0x20000
+// 0x0109d4b4: 0x109d4b4: beq   s0, zero, 0x109d4cc lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109ce84
+	brfalse L_109d4cc
 // --- basic block ---
-// 0x0109ce74: 0x109ce74: addu  a0, s0, zero
+// 0x0109d4bc: 0x109d4bc: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x0109ce78: 0x109ce78: addiu a1, a1, -2180
+// 0x0109d4c0: 0x109d4c0: addiu a1, a1, -1716
 	ldloc.2
-	ldc.i4 -2180
+	ldc.i4 -1716
 	add
 	stloc.2
-L_109ce7c:
-// 0x0109ce7c: 0x109ce7c: jal   0x1097af8 sll   zero, zero, 0
+L_109d4c4:
+// 0x0109d4c4: 0x109d4c4: jal   0x1098140 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-L_109ce84:
-// 0x0109ce84: 0x109ce84: lw    ra, 28(sp)
-// 0x0109ce88: 0x109ce88: lw    s2, 24(sp)
+L_109d4cc:
+// 0x0109d4cc: 0x109d4cc: lw    ra, 28(sp)
+// 0x0109d4d0: 0x109d4d0: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2192,7 +2192,7 @@ L_109ce84:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109ce8c: 0x109ce8c: lw    s1, 20(sp)
+// 0x0109d4d4: 0x109d4d4: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2201,7 +2201,7 @@ L_109ce84:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109ce90: 0x109ce90: lw    s0, 16(sp)
+// 0x0109d4d8: 0x109d4d8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2210,7 +2210,7 @@ L_109ce84:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ce94: 0x109ce94: jr    ra addiu sp, sp, 32
+// 0x0109d4dc: 0x109d4dc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2222,7 +2222,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 tabsline_enable_arrow_109ce9c(int32,int32,int32,int32,int32)
+.method public static int32 tabsline_enable_arrow_109d4e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -2260,12 +2260,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ce9c: 0x109ce9c: addiu sp, sp, -24
+// 0x0109d4e4: 0x109d4e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109cea0: 0x109cea0: sw    s0, 16(sp)
+// 0x0109d4e8: 0x109d4e8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2274,77 +2274,77 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109cea4: 0x109cea4: sw    ra, 20(sp)
-// 0x0109cea8: 0x109cea8: lw    a0, 0(a0)
+// 0x0109d4ec: 0x109d4ec: sw    ra, 20(sp)
+// 0x0109d4f0: 0x109d4f0: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109ceac: 0x109ceac: bne   a1, zero, 0x109cec0 addu  s0, a2, zero
+// 0x0109d4f4: 0x109d4f4: bne   a1, zero, 0x109d508 addu  s0, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 6
-	brtrue L_109cec0
+	brtrue L_109d508
 // --- basic block ---
-// 0x0109ceb4: 0x109ceb4: lui   a1, 0x20000
+// 0x0109d4fc: 0x109d4fc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109ceb8: 0x109ceb8: j	 0x109cec8 addiu a1, a1, -2172
+// 0x0109d500: 0x109d500: j	 0x109d510 addiu a1, a1, -1708
 	ldloc.2
-	ldc.i4 -2172
+	ldc.i4 -1708
 	add
 	stloc.2
-	br L_109cec8
+	br L_109d510
 // --- basic block ---
-L_109cec0:
-// 0x0109cec0: 0x109cec0: lui   a1, 0x20000
+L_109d508:
+// 0x0109d508: 0x109d508: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109cec4: 0x109cec4: addiu a1, a1, -2144
+// 0x0109d50c: 0x109d50c: addiu a1, a1, -1680
 	ldloc.2
-	ldc.i4 -2144
+	ldc.i4 -1680
 	add
 	stloc.2
-L_109cec8:
-// 0x0109cec8: 0x109cec8: jal   0x109b304 sll   zero, zero, 0
+L_109d510:
+// 0x0109d510: 0x109d510: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109ced0: 0x109ced0: beq   s0, zero, 0x109cee0 addu  a0, v0, zero
+// 0x0109d518: 0x109d518: beq   s0, zero, 0x109d528 addu  a0, v0, zero
 	ldloc 6
 	ldloc 7
 	stloc.1
-	brfalse L_109cee0
+	brfalse L_109d528
 // --- basic block ---
-// 0x0109ced8: 0x109ced8: j	 0x109cee4 addu  a1, zero, zero
+// 0x0109d520: 0x109d520: j	 0x109d52c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_109cee4
+	br L_109d52c
 // --- basic block ---
-L_109cee0:
-// 0x0109cee0: 0x109cee0: addiu a1, zero, 1
+L_109d528:
+// 0x0109d528: 0x109d528: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-L_109cee4:
-// 0x0109cee4: 0x109cee4: jal   0x109e8c4 sll   zero, zero, 0
+L_109d52c:
+// 0x0109d52c: 0x109d52c: jal   0x109ef0c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_state_109e8c4(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_state_109ef0c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0109ceec: 0x109ceec: lw    ra, 20(sp)
-// 0x0109cef0: 0x109cef0: lw    s0, 16(sp)
+// 0x0109d534: 0x109d534: lw    ra, 20(sp)
+// 0x0109d538: 0x109d538: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2353,7 +2353,7 @@ L_109cee4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109cef4: 0x109cef4: jr    ra addiu sp, sp, 24
+// 0x0109d53c: 0x109d53c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2365,7 +2365,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 initialize_tabsline_109cefc(int32,int32,int32,int32,int32)
+.method public static int32 initialize_tabsline_109d544(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 s1,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -2406,12 +2406,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cefc: 0x109cefc: addiu sp, sp, -32
+// 0x0109d544: 0x109d544: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109cf00: 0x109cf00: sw    s0, 20(sp)
+// 0x0109d548: 0x109d548: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2420,14 +2420,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109cf04: 0x109cf04: addu  a1, zero, zero
+// 0x0109d54c: 0x109d54c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109cf08: 0x109cf08: addu  s0, a0, zero
+// 0x0109d550: 0x109d550: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0109cf0c: 0x109cf0c: sw    ra, 28(sp)
-// 0x0109cf10: 0x109cf10: sw    s1, 24(sp)
+// 0x0109d554: 0x109d554: sw    ra, 28(sp)
+// 0x0109d558: 0x109d558: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2436,7 +2436,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109cf14: 0x109cf14: lw    s1, 128(a0)
+// 0x0109d55c: 0x109d55c: lw    s1, 128(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2445,7 +2445,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109cf18: 0x109cf18: jal   0x109cdd0 addiu a2, zero, 1
+// 0x0109d560: 0x109d560: jal   0x109d418 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -2453,18 +2453,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_select_tab_109cdd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_select_tab_109d418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109cf20: 0x109cf20: addu  a0, s0, zero
+// 0x0109d568: 0x109d568: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109cf24: 0x109cf24: addiu a1, zero, 1
+// 0x0109d56c: 0x109d56c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109cf28: 0x109cf28: jal   0x109cdd0 addu  a2, zero, zero
+// 0x0109d570: 0x109d570: jal   0x109d418 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2472,12 +2472,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_select_tab_109cdd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_select_tab_109d418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109cf30: 0x109cf30: lw    a2, 44(s0)
+// 0x0109d578: 0x109d578: lw    a2, 44(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2486,13 +2486,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109cf34: 0x109cf34: addu  a0, s0, zero
+// 0x0109d57c: 0x109d57c: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109cf38: 0x109cf38: addu  a1, zero, zero
+// 0x0109d580: 0x109d580: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109cf3c: 0x109cf3c: jal   0x109cd80 slti  s1, s1, 2
+// 0x0109d584: 0x109d584: jal   0x109d3c8 slti  s1, s1, 2
 	ldloc 6
 	ldc.i4.2
 	clt
@@ -2502,23 +2502,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_set_text_109cd80(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_set_text_109d3c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109cf44: 0x109cf44: xori  s1, s1, 1
+// 0x0109d58c: 0x109d58c: xori  s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	xor
 	stloc 6
-// 0x0109cf48: 0x109cf48: addu  a0, s0, zero
+// 0x0109d590: 0x109d590: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109cf4c: 0x109cf4c: addu  a1, zero, zero
+// 0x0109d594: 0x109d594: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109cf50: 0x109cf50: jal   0x109ce9c addu  a2, zero, zero
+// 0x0109d598: 0x109d598: jal   0x109d4e4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2526,18 +2526,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_enable_arrow_109ce9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_enable_arrow_109d4e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109cf58: 0x109cf58: beq   s1, zero, 0x109cf74 addu  a2, s1, zero
+// 0x0109d5a0: 0x109d5a0: beq   s1, zero, 0x109d5bc addu  a2, s1, zero
 	ldloc 6
 	ldloc 6
 	stloc.3
-	brfalse L_109cf74
+	brfalse L_109d5bc
 // --- basic block ---
-// 0x0109cf60: 0x109cf60: lw    a2, 56(s0)
+// 0x0109d5a8: 0x109d5a8: lw    a2, 56(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2546,10 +2546,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109cf64: 0x109cf64: addu  a0, s0, zero
+// 0x0109d5ac: 0x109d5ac: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109cf68: 0x109cf68: jal   0x109cd80 addiu a1, zero, 1
+// 0x0109d5b0: 0x109d5b0: jal   0x109d3c8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2557,19 +2557,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_set_text_109cd80(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_set_text_109d3c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109cf70: 0x109cf70: addu  a2, s1, zero
+// 0x0109d5b8: 0x109d5b8: addu  a2, s1, zero
 	ldloc 6
 	stloc.3
-L_109cf74:
-// 0x0109cf74: 0x109cf74: addu  a0, s0, zero
+L_109d5bc:
+// 0x0109d5bc: 0x109d5bc: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109cf78: 0x109cf78: jal   0x109ce9c addiu a1, zero, 1
+// 0x0109d5c0: 0x109d5c0: jal   0x109d4e4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2577,16 +2577,16 @@ L_109cf74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_enable_arrow_109ce9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_enable_arrow_109d4e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109cf80: 0x109cf80: lw    ra, 28(sp)
-// 0x0109cf84: 0x109cf84: addiu v0, zero, 1
+// 0x0109d5c8: 0x109d5c8: lw    ra, 28(sp)
+// 0x0109d5cc: 0x109d5cc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0109cf88: 0x109cf88: sw    v0, 12(s0)
+// 0x0109d5d0: 0x109d5d0: sw    v0, 12(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2595,7 +2595,7 @@ L_109cf74:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109cf8c: 0x109cf8c: lw    s1, 24(sp)
+// 0x0109d5d4: 0x109d5d4: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2604,7 +2604,7 @@ L_109cf74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109cf90: 0x109cf90: lw    s0, 20(sp)
+// 0x0109d5d8: 0x109d5d8: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2613,7 +2613,7 @@ L_109cf74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cf94: 0x109cf94: jr    ra addiu sp, sp, 32
+// 0x0109d5dc: 0x109d5dc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2625,7 +2625,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 tabs_draw_109cf9c(int32,int32,int32,int32,int32)
+.method public static int32 tabs_draw_109d5e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 s3,int32 ra,int32 lo)
@@ -2684,7 +2684,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109cf9c: 0x109cf9c: lw    v0, 4(a0)
+// 0x0109d5e4: 0x109d5e4: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2693,17 +2693,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cfa0: 0x109cfa0: addiu sp, sp, -48
+// 0x0109d5e8: 0x109d5e8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109cfa4: 0x109cfa4: andi  a2, a2, 1
+// 0x0109d5ec: 0x109d5ec: andi  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc.3
-// 0x0109cfa8: 0x109cfa8: sw    s1, 20(sp)
+// 0x0109d5f0: 0x109d5f0: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2712,7 +2712,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109cfac: 0x109cfac: sw    s0, 16(sp)
+// 0x0109d5f4: 0x109d5f4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2721,8 +2721,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109cfb0: 0x109cfb0: sw    ra, 44(sp)
-// 0x0109cfb4: 0x109cfb4: sw    s6, 40(sp)
+// 0x0109d5f8: 0x109d5f8: sw    ra, 44(sp)
+// 0x0109d5fc: 0x109d5fc: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2731,7 +2731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109cfb8: 0x109cfb8: sw    s5, 36(sp)
+// 0x0109d600: 0x109d600: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2740,7 +2740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109cfbc: 0x109cfbc: sw    s4, 32(sp)
+// 0x0109d604: 0x109d604: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2749,7 +2749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109cfc0: 0x109cfc0: sw    s3, 28(sp)
+// 0x0109d608: 0x109d608: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2758,7 +2758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109cfc4: 0x109cfc4: sw    s2, 24(sp)
+// 0x0109d60c: 0x109d60c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2767,7 +2767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109cfc8: 0x109cfc8: lw    s0, 116(v0)
+// 0x0109d610: 0x109d610: lw    s0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2776,25 +2776,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109cfcc: 0x109cfcc: bne   a2, zero, 0x109d194 addu  s1, a0, zero
+// 0x0109d614: 0x109d614: bne   a2, zero, 0x109d7dc addu  s1, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 10
-	brtrue L_109d194
+	brtrue L_109d7dc
 // --- basic block ---
-// 0x0109cfd4: 0x109cfd4: lui   v0, 0x80000
+// 0x0109d61c: 0x109d61c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109cfd8: 0x109cfd8: lw    v0, 9988(v0)
+// 0x0109d620: 0x109d620: lw    v0, 10452(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2497
+	ldc.i4 2613
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cfdc: 0x109cfdc: lw    v1, 136(s0)
+// 0x0109d624: 0x109d624: lw    v1, 136(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2803,13 +2803,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109cfe0: 0x109cfe0: sll   zero, zero, 0
-// 0x0109cfe4: 0x109cfe4: beq   v1, v0, 0x109cff4 sll   zero, zero, 0
+// 0x0109d628: 0x109d628: sll   zero, zero, 0
+// 0x0109d62c: 0x109d62c: beq   v1, v0, 0x109d63c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_109cff4
+	beq  L_109d63c
 // --- basic block ---
-// 0x0109cfec: 0x109cfec: sw    v0, 136(s0)
+// 0x0109d634: 0x109d634: sw    v0, 136(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2818,7 +2818,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109cff0: 0x109cff0: sw    zero, 8(s0)
+// 0x0109d638: 0x109d638: sw    zero, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2827,8 +2827,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_109cff4:
-// 0x0109cff4: 0x109cff4: lw    v0, 8(s0)
+L_109d63c:
+// 0x0109d63c: 0x109d63c: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2837,26 +2837,26 @@ L_109cff4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109cff8: 0x109cff8: sll   zero, zero, 0
-// 0x0109cffc: 0x109cffc: bne   v0, zero, 0x109d194 lui   s2, 0x80000
+// 0x0109d640: 0x109d640: sll   zero, zero, 0
+// 0x0109d644: 0x109d644: bne   v0, zero, 0x109d7dc lui   s2, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 11
-	brtrue L_109d194
+	brtrue L_109d7dc
 // --- basic block ---
-// 0x0109d004: 0x109d004: lw    v0, 10000(s2)
+// 0x0109d64c: 0x109d64c: lw    v0, 10464(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2500
+	ldc.i4 2616
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d008: 0x109d008: addiu v1, zero, 1
+// 0x0109d650: 0x109d650: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0109d00c: 0x109d00c: bne   v0, zero, 0x109d034 sw    v1, 8(s0)
+// 0x0109d654: 0x109d654: bne   v0, zero, 0x109d67c sw    v1, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -2866,27 +2866,27 @@ L_109cff4:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_109d034
+	brtrue L_109d67c
 // --- basic block ---
-// 0x0109d014: 0x109d014: jal   0x109cc34 sll   zero, zero, 0
+// 0x0109d65c: 0x109d65c: jal   0x109d27c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::get_arrow_size_109cc34(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::get_arrow_size_109d27c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d01c: 0x109d01c: lw    v1, 0(v0)
+// 0x0109d664: 0x109d664: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109d020: 0x109d020: lw    a0, 4(v0)
+// 0x0109d668: 0x109d668: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2895,49 +2895,49 @@ L_109cff4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d024: 0x109d024: sll   v0, v1, 1
+// 0x0109d66c: 0x109d66c: sll   v0, v1, 1
 	ldloc 7
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x0109d028: 0x109d028: lui   v1, 0x80000
+// 0x0109d670: 0x109d670: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109d02c: 0x109d02c: sw    a0, 9996(v1)
+// 0x0109d674: 0x109d674: sw    a0, 10460(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2499
+	ldc.i4 2615
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109d030: 0x109d030: sw    v0, 10000(s2)
+// 0x0109d678: 0x109d678: sw    v0, 10464(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2500
+	ldc.i4 2616
 	add
 	ldloc 5
 	stelem.i4
-L_109d034:
-// 0x0109d034: 0x109d034: lui   v0, 0x80000
+L_109d67c:
+// 0x0109d67c: 0x109d67c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109d038: 0x109d038: lw    v0, 9996(v0)
+// 0x0109d680: 0x109d680: lw    v0, 10460(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2499
+	ldc.i4 2615
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d03c: 0x109d03c: addiu s6, zero, 2
+// 0x0109d684: 0x109d684: addiu s6, zero, 2
 	ldc.i4.2
 	stloc 13
-// 0x0109d040: 0x109d040: sw    v0, 4(s0)
+// 0x0109d688: 0x109d688: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2946,19 +2946,19 @@ L_109d034:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109d044: 0x109d044: lui   v0, 0x80000
+// 0x0109d68c: 0x109d68c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109d048: 0x109d048: lw    v0, 10000(v0)
+// 0x0109d690: 0x109d690: lw    v0, 10464(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2500
+	ldc.i4 2616
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d04c: 0x109d04c: lw    s4, 32(s1)
+// 0x0109d694: 0x109d694: lw    s4, 32(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2967,31 +2967,31 @@ L_109d034:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109d050: 0x109d050: lui   a1, 0x20000
+// 0x0109d698: 0x109d698: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d054: 0x109d054: subu  s4, s4, v0
+// 0x0109d69c: 0x109d69c: subu  s4, s4, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x0109d058: 0x109d058: div   s4, s6
+// 0x0109d6a0: 0x109d6a0: div   s4, s6
 	ldloc 8
 	ldloc 13
 	div
 	stloc 16
-// 0x0109d05c: 0x109d05c: addiu a1, a1, -2236
+// 0x0109d6a4: 0x109d6a4: addiu a1, a1, -1772
 	ldloc.2
-	ldc.i4 -2236
+	ldc.i4 -1772
 	add
 	stloc.2
-// 0x0109d060: 0x109d060: addu  a0, s1, zero
+// 0x0109d6a8: 0x109d6a8: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0109d064: 0x109d064: mflo  lo
+// 0x0109d6ac: 0x109d6ac: mflo  lo
 	ldloc 16
 	stloc 13
-// 0x0109d068: 0x109d068: jal   0x109b304 lui   s5, 0x20000
+// 0x0109d6b0: 0x109d6b0: jal   0x109b94c lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 12
 	ldloc.0
@@ -2999,23 +2999,23 @@ L_109d034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d070: 0x109d070: lui   a1, 0x20000
+// 0x0109d6b8: 0x109d6b8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d074: 0x109d074: addu  s2, v0, zero
+// 0x0109d6bc: 0x109d6bc: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0109d078: 0x109d078: addu  a0, s1, zero
+// 0x0109d6c0: 0x109d6c0: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0109d07c: 0x109d07c: jal   0x109b304 addiu a1, a1, -2208
+// 0x0109d6c4: 0x109d6c4: jal   0x109b94c addiu a1, a1, -1744
 	ldloc.2
-	ldc.i4 -2208
+	ldc.i4 -1744
 	add
 	stloc.2
 	ldloc.0
@@ -3023,26 +3023,26 @@ L_109d034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d084: 0x109d084: addu  a0, s2, zero
+// 0x0109d6cc: 0x109d6cc: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0109d088: 0x109d088: addu  a1, s6, zero
+// 0x0109d6d0: 0x109d6d0: addu  a1, s6, zero
 	ldloc 13
 	stloc.2
-// 0x0109d08c: 0x109d08c: jal   0x109e89c addu  s3, v0, zero
+// 0x0109d6d4: 0x109d6d4: jal   0x109eee4 addu  s3, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_width_109e89c(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_width_109eee4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109d094: 0x109d094: lw    a2, 4(s0)
+// 0x0109d6dc: 0x109d6dc: lw    a2, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3051,34 +3051,34 @@ L_109d034:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109d098: 0x109d098: subu  s4, s4, s6
+// 0x0109d6e0: 0x109d6e0: subu  s4, s4, s6
 	ldloc 8
 	ldloc 13
 	sub
 	stloc 8
-// 0x0109d09c: 0x109d09c: addu  a0, s2, zero
+// 0x0109d6e4: 0x109d6e4: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0109d0a0: 0x109d0a0: jal   0x1098ef8 addu  a1, s6, zero
+// 0x0109d6e8: 0x109d6e8: jal   0x1099540 addu  a1, s6, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x0109d0a8: 0x109d0a8: addu  a0, s3, zero
+// 0x0109d6f0: 0x109d6f0: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x0109d0ac: 0x109d0ac: jal   0x109e89c addu  a1, s4, zero
+// 0x0109d6f4: 0x109d6f4: jal   0x109eee4 addu  a1, s4, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_width_109e89c(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_width_109eee4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109d0b4: 0x109d0b4: lw    a2, 4(s0)
+// 0x0109d6fc: 0x109d6fc: lw    a2, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3087,23 +3087,23 @@ L_109d034:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109d0b8: 0x109d0b8: addu  a0, s3, zero
+// 0x0109d700: 0x109d700: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x0109d0bc: 0x109d0bc: jal   0x1098ef8 addu  a1, s4, zero
+// 0x0109d704: 0x109d704: jal   0x1099540 addu  a1, s4, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x0109d0c4: 0x109d0c4: addu  a0, s2, zero
+// 0x0109d70c: 0x109d70c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0109d0c8: 0x109d0c8: jal   0x109b304 addiu a1, s5, -2300
+// 0x0109d710: 0x109d710: jal   0x109b94c addiu a1, s5, -1836
 	ldloc 12
-	ldc.i4 -2300
+	ldc.i4 -1836
 	add
 	stloc.2
 	ldloc.0
@@ -3111,31 +3111,31 @@ L_109d034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d0d0: 0x109d0d0: bne   v0, zero, 0x109d194 lui   s4, 0x10000
+// 0x0109d718: 0x109d718: bne   v0, zero, 0x109d7dc lui   s4, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brtrue L_109d194
+	brtrue L_109d7dc
 // --- basic block ---
-// 0x0109d0d8: 0x109d0d8: addiu a0, s5, -2300
+// 0x0109d720: 0x109d720: addiu a0, s5, -1836
 	ldloc 12
-	ldc.i4 -2300
+	ldc.i4 -1836
 	add
 	stloc.1
-// 0x0109d0dc: 0x109d0dc: addiu a1, s4, 18500
+// 0x0109d724: 0x109d724: addiu a1, s4, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109d0e0: 0x109d0e0: addiu a2, zero, 5
+// 0x0109d728: 0x109d728: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x0109d0e4: 0x109d0e4: jal   0x1098d10 addiu a3, zero, 16384
+// 0x0109d72c: 0x109d72c: jal   0x1099358 addiu a3, zero, 16384
 	ldc.i4 16384
 	stloc 4
 	ldloc.0
@@ -3143,31 +3143,31 @@ L_109d034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d0ec: 0x109d0ec: lui   a0, 0x20000
+// 0x0109d734: 0x109d734: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109d0f0: 0x109d0f0: addiu a2, zero, 5
+// 0x0109d738: 0x109d738: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x0109d0f4: 0x109d0f4: addiu a3, zero, 16384
+// 0x0109d73c: 0x109d73c: addiu a3, zero, 16384
 	ldc.i4 16384
 	stloc 4
-// 0x0109d0f8: 0x109d0f8: addiu a1, s4, 18500
+// 0x0109d740: 0x109d740: addiu a1, s4, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109d0fc: 0x109d0fc: addiu a0, a0, -2268
+// 0x0109d744: 0x109d744: addiu a0, a0, -1804
 	ldloc.1
-	ldc.i4 -2268
+	ldc.i4 -1804
 	add
 	stloc.1
-// 0x0109d100: 0x109d100: jal   0x1098d10 addu  s1, v0, zero
+// 0x0109d748: 0x109d748: jal   0x1099358 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -3175,104 +3175,104 @@ L_109d034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d108: 0x109d108: addu  s4, v0, zero
+// 0x0109d750: 0x109d750: addu  s4, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109d10c: 0x109d10c: jal   0x1097ad8 addu  a0, s1, zero
+// 0x0109d754: 0x109d754: jal   0x1098120 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl113::ssd_text_set_auto_size_1097ad8(int32)
+	call int32 Cibyl113::ssd_text_set_auto_size_1098120(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d114: 0x109d114: jal   0x1097ad8 addu  a0, s4, zero
+// 0x0109d75c: 0x109d75c: jal   0x1098120 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl113::ssd_text_set_auto_size_1097ad8(int32)
+	call int32 Cibyl113::ssd_text_set_auto_size_1098120(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d11c: 0x109d11c: jal   0x1097ae8 addu  a0, s1, zero
+// 0x0109d764: 0x109d764: jal   0x1098130 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl113::ssd_text_set_auto_trim_1097ae8(int32)
+	call int32 Cibyl113::ssd_text_set_auto_trim_1098130(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d124: 0x109d124: lui   s5, 0x20000
+// 0x0109d76c: 0x109d76c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x0109d128: 0x109d128: jal   0x1097ae8 addu  a0, s4, zero
+// 0x0109d770: 0x109d770: jal   0x1098130 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl113::ssd_text_set_auto_trim_1097ae8(int32)
+	call int32 Cibyl113::ssd_text_set_auto_trim_1098130(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d130: 0x109d130: addu  a0, s1, zero
+// 0x0109d778: 0x109d778: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0109d134: 0x109d134: jal   0x1097af8 addiu a1, s5, -2180
+// 0x0109d77c: 0x109d77c: jal   0x1098140 addiu a1, s5, -1716
 	ldloc 12
-	ldc.i4 -2180
+	ldc.i4 -1716
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0109d13c: 0x109d13c: addu  a0, s4, zero
+// 0x0109d784: 0x109d784: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x0109d140: 0x109d140: jal   0x1097af8 addiu a1, s5, -2180
+// 0x0109d788: 0x109d788: jal   0x1098140 addiu a1, s5, -1716
 	ldloc 12
-	ldc.i4 -2180
+	ldc.i4 -1716
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0109d148: 0x109d148: addu  a0, s2, zero
+// 0x0109d790: 0x109d790: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0109d14c: 0x109d14c: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0109d794: 0x109d794: jal   0x109950c addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d154: 0x109d154: addu  a0, s3, zero
+// 0x0109d79c: 0x109d79c: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x0109d158: 0x109d158: jal   0x1098ec4 addu  a1, s4, zero
+// 0x0109d7a0: 0x109d7a0: jal   0x109950c addu  a1, s4, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d160: 0x109d160: lw    a1, 44(s0)
+// 0x0109d7a8: 0x109d7a8: lw    a1, 44(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3281,7 +3281,7 @@ L_109d034:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d164: 0x109d164: jal   0x1097e5c addu  a0, s1, zero
+// 0x0109d7ac: 0x109d7ac: jal   0x10984a4 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -3289,12 +3289,12 @@ L_109d034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d16c: 0x109d16c: lw    v0, 128(s0)
+// 0x0109d7b4: 0x109d7b4: lw    v0, 128(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3303,17 +3303,17 @@ L_109d034:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d170: 0x109d170: sll   zero, zero, 0
-// 0x0109d174: 0x109d174: slti  v0, v0, 2
+// 0x0109d7b8: 0x109d7b8: sll   zero, zero, 0
+// 0x0109d7bc: 0x109d7bc: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0109d178: 0x109d178: bne   v0, zero, 0x109d18c sll   zero, zero, 0
+// 0x0109d7c0: 0x109d7c0: bne   v0, zero, 0x109d7d4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109d18c
+	brtrue L_109d7d4
 // --- basic block ---
-// 0x0109d180: 0x109d180: lw    a1, 56(s0)
+// 0x0109d7c8: 0x109d7c8: lw    a1, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3322,7 +3322,7 @@ L_109d034:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d184: 0x109d184: jal   0x1097e5c addu  a0, s4, zero
+// 0x0109d7cc: 0x109d7cc: jal   0x10984a4 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3330,13 +3330,13 @@ L_109d034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109d18c:
-// 0x0109d18c: 0x109d18c: jal   0x109cefc addu  a0, s0, zero
+L_109d7d4:
+// 0x0109d7d4: 0x109d7d4: jal   0x109d544 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3344,14 +3344,14 @@ L_109d18c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::initialize_tabsline_109cefc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::initialize_tabsline_109d544(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109d194:
-// 0x0109d194: 0x109d194: lw    ra, 44(sp)
-// 0x0109d198: 0x109d198: lw    s6, 40(sp)
+L_109d7dc:
+// 0x0109d7dc: 0x109d7dc: lw    ra, 44(sp)
+// 0x0109d7e0: 0x109d7e0: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3360,7 +3360,7 @@ L_109d194:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109d19c: 0x109d19c: lw    s5, 36(sp)
+// 0x0109d7e4: 0x109d7e4: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3369,7 +3369,7 @@ L_109d194:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109d1a0: 0x109d1a0: lw    s4, 32(sp)
+// 0x0109d7e8: 0x109d7e8: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3378,7 +3378,7 @@ L_109d194:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109d1a4: 0x109d1a4: lw    s3, 28(sp)
+// 0x0109d7ec: 0x109d7ec: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3387,7 +3387,7 @@ L_109d194:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109d1a8: 0x109d1a8: lw    s2, 24(sp)
+// 0x0109d7f0: 0x109d7f0: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3396,7 +3396,7 @@ L_109d194:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109d1ac: 0x109d1ac: lw    s1, 20(sp)
+// 0x0109d7f4: 0x109d7f4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3405,7 +3405,7 @@ L_109d194:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109d1b0: 0x109d1b0: lw    s0, 16(sp)
+// 0x0109d7f8: 0x109d7f8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3414,7 +3414,7 @@ L_109d194:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109d1b4: 0x109d1b4: jr    ra addiu sp, sp, 48
+// 0x0109d7fc: 0x109d7fc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3426,7 +3426,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s2,int32 s0,int32 lo,int32 ra)
@@ -3473,12 +3473,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d1bc: 0x109d1bc: addiu sp, sp, -48
+// 0x0109d804: 0x109d804: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109d1c0: 0x109d1c0: sw    s2, 40(sp)
+// 0x0109d808: 0x109d808: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3487,7 +3487,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109d1c4: 0x109d1c4: lw    s2, 132(a0)
+// 0x0109d80c: 0x109d80c: lw    s2, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3496,10 +3496,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109d1c8: 0x109d1c8: addiu v0, zero, -1
+// 0x0109d810: 0x109d810: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109d1cc: 0x109d1cc: sw    s1, 36(sp)
+// 0x0109d814: 0x109d814: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3508,7 +3508,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109d1d0: 0x109d1d0: sw    s0, 32(sp)
+// 0x0109d818: 0x109d818: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3517,18 +3517,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109d1d4: 0x109d1d4: sw    ra, 44(sp)
-// 0x0109d1d8: 0x109d1d8: addu  s1, a0, zero
+// 0x0109d81c: 0x109d81c: sw    ra, 44(sp)
+// 0x0109d820: 0x109d820: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0109d1dc: 0x109d1dc: beq   s2, v0, 0x109d204 addu  s0, a1, zero
+// 0x0109d824: 0x109d824: beq   s2, v0, 0x109d84c addu  s0, a1, zero
 	ldloc 9
 	ldloc 5
 	ldloc.2
 	stloc 10
-	beq  L_109d204
+	beq  L_109d84c
 // --- basic block ---
-// 0x0109d1e4: 0x109d1e4: lw    v0, 20(a0)
+// 0x0109d82c: 0x109d82c: lw    v0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3537,12 +3537,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d1e8: 0x109d1e8: sll   zero, zero, 0
-// 0x0109d1ec: 0x109d1ec: beq   v0, zero, 0x109d204 sll   zero, zero, 0
+// 0x0109d830: 0x109d830: sll   zero, zero, 0
+// 0x0109d834: 0x109d834: beq   v0, zero, 0x109d84c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d204
+	brfalse L_109d84c
 // --- basic block ---
-// 0x0109d1f4: 0x109d1f4: lw    v0, 24(a0)
+// 0x0109d83c: 0x109d83c: lw    v0, 24(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3551,32 +3551,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d1f8: 0x109d1f8: sll   zero, zero, 0
-// 0x0109d1fc: 0x109d1fc: bne   v0, zero, 0x109d228 sll   zero, zero, 0
+// 0x0109d840: 0x109d840: sll   zero, zero, 0
+// 0x0109d844: 0x109d844: bne   v0, zero, 0x109d870 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109d228
+	brtrue L_109d870
 // --- basic block ---
-L_109d204:
-// 0x0109d204: 0x109d204: lui   a1, 0x20000
+L_109d84c:
+// 0x0109d84c: 0x109d84c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d208: 0x109d208: lui   a3, 0x20000
+// 0x0109d850: 0x109d850: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109d20c: 0x109d20c: addiu a1, a1, -2404
+// 0x0109d854: 0x109d854: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109d210: 0x109d210: addiu a3, a3, -2116
+// 0x0109d858: 0x109d858: addiu a3, a3, -1652
 	ldloc 4
-	ldc.i4 -2116
+	ldc.i4 -1652
 	add
 	stloc 4
-// 0x0109d214: 0x109d214: addiu a0, zero, 4
+// 0x0109d85c: 0x109d85c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109d218: 0x109d218: jal   0x100449c addiu a2, zero, 285
+// 0x0109d860: 0x109d860: jal   0x100449c addiu a2, zero, 285
 	ldc.i4 285
 	stloc.3
 	ldloc.0
@@ -3589,16 +3589,16 @@ L_109d204:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d220: 0x109d220: j	 0x109d454 sll   zero, zero, 0
-	br L_109d454
+// 0x0109d868: 0x109d868: j	 0x109da9c sll   zero, zero, 0
+	br L_109da9c
 // --- basic block ---
-L_109d228:
-// 0x0109d228: 0x109d228: bltz  a1, 0x109d244 sll   zero, zero, 0
+L_109d870:
+// 0x0109d870: 0x109d870: bltz  a1, 0x109d88c sll   zero, zero, 0
 	ldloc.2
 	ldc.i4.s 0
-	blt L_109d244
+	blt L_109d88c
 // --- basic block ---
-// 0x0109d230: 0x109d230: lw    v0, 128(a0)
+// 0x0109d878: 0x109d878: lw    v0, 128(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3607,18 +3607,18 @@ L_109d228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d234: 0x109d234: sll   zero, zero, 0
-// 0x0109d238: 0x109d238: slt   v0, a1, v0
+// 0x0109d87c: 0x109d87c: sll   zero, zero, 0
+// 0x0109d880: 0x109d880: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109d23c: 0x109d23c: bne   v0, zero, 0x109d26c sll   zero, zero, 0
+// 0x0109d884: 0x109d884: bne   v0, zero, 0x109d8b4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109d26c
+	brtrue L_109d8b4
 // --- basic block ---
-L_109d244:
-// 0x0109d244: 0x109d244: lw    v0, 128(s1)
+L_109d88c:
+// 0x0109d88c: 0x109d88c: lw    v0, 128(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3627,29 +3627,29 @@ L_109d244:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d248: 0x109d248: lui   a1, 0x20000
+// 0x0109d890: 0x109d890: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d24c: 0x109d24c: lui   a3, 0x20000
+// 0x0109d894: 0x109d894: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109d250: 0x109d250: addiu a1, a1, -2404
+// 0x0109d898: 0x109d898: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109d254: 0x109d254: addiu a3, a3, -2060
+// 0x0109d89c: 0x109d89c: addiu a3, a3, -1596
 	ldloc 4
-	ldc.i4 -2060
+	ldc.i4 -1596
 	add
 	stloc 4
-// 0x0109d258: 0x109d258: addiu a0, zero, 4
+// 0x0109d8a0: 0x109d8a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109d25c: 0x109d25c: addiu a2, zero, 291
+// 0x0109d8a4: 0x109d8a4: addiu a2, zero, 291
 	ldc.i4 291
 	stloc.3
-// 0x0109d260: 0x109d260: sw    s0, 16(sp)
+// 0x0109d8a8: 0x109d8a8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3658,7 +3658,7 @@ L_109d244:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109d264: 0x109d264: j	 0x109d2b0 sw    v0, 20(sp)
+// 0x0109d8ac: 0x109d8ac: j	 0x109d8f8 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3667,15 +3667,15 @@ L_109d244:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109d2b0
+	br L_109d8f8
 // --- basic block ---
-L_109d26c:
-// 0x0109d26c: 0x109d26c: beq   a1, s2, 0x109d304 sll   zero, zero, 0
+L_109d8b4:
+// 0x0109d8b4: 0x109d8b4: beq   a1, s2, 0x109d94c sll   zero, zero, 0
 	ldloc.2
 	ldloc 9
-	beq  L_109d304
+	beq  L_109d94c
 // --- basic block ---
-// 0x0109d274: 0x109d274: lw    v0, 32(a0)
+// 0x0109d8bc: 0x109d8bc: lw    v0, 32(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3684,12 +3684,12 @@ L_109d26c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d278: 0x109d278: sll   zero, zero, 0
-// 0x0109d27c: 0x109d27c: beq   v0, zero, 0x109d2c0 sll   zero, zero, 0
+// 0x0109d8c0: 0x109d8c0: sll   zero, zero, 0
+// 0x0109d8c4: 0x109d8c4: beq   v0, zero, 0x109d908 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d2c0
+	brfalse L_109d908
 // --- basic block ---
-// 0x0109d284: 0x109d284: jalr  v0 addu  a0, s2, zero
+// 0x0109d8cc: 0x109d8cc: jalr  v0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -3703,13 +3703,13 @@ L_109d26c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d28c: 0x109d28c: bne   v0, zero, 0x109d2c0 lui   a1, 0x20000
+// 0x0109d8d4: 0x109d8d4: bne   v0, zero, 0x109d908 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_109d2c0
+	brtrue L_109d908
 // --- basic block ---
-// 0x0109d294: 0x109d294: lw    v0, 132(s1)
+// 0x0109d8dc: 0x109d8dc: lw    v0, 132(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3718,26 +3718,26 @@ L_109d26c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d298: 0x109d298: lui   a3, 0x20000
+// 0x0109d8e0: 0x109d8e0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109d29c: 0x109d29c: addiu a1, a1, -2404
+// 0x0109d8e4: 0x109d8e4: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109d2a0: 0x109d2a0: addiu a3, a3, -1972
+// 0x0109d8e8: 0x109d8e8: addiu a3, a3, -1508
 	ldloc 4
-	ldc.i4 -1972
+	ldc.i4 -1508
 	add
 	stloc 4
-// 0x0109d2a4: 0x109d2a4: addiu a0, zero, 1
+// 0x0109d8ec: 0x109d8ec: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0109d2a8: 0x109d2a8: addiu a2, zero, 301
+// 0x0109d8f0: 0x109d8f0: addiu a2, zero, 301
 	ldc.i4 301
 	stloc.3
-// 0x0109d2ac: 0x109d2ac: sw    v0, 16(sp)
+// 0x0109d8f4: 0x109d8f4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3746,8 +3746,8 @@ L_109d26c:
 	add
 	ldloc 5
 	stelem.i4
-L_109d2b0:
-// 0x0109d2b0: 0x109d2b0: jal   0x100449c sll   zero, zero, 0
+L_109d8f8:
+// 0x0109d8f8: 0x109d8f8: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3758,11 +3758,11 @@ L_109d2b0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d2b8: 0x109d2b8: j	 0x109d454 sll   zero, zero, 0
-	br L_109d454
+// 0x0109d900: 0x109d900: j	 0x109da9c sll   zero, zero, 0
+	br L_109da9c
 // --- basic block ---
-L_109d2c0:
-// 0x0109d2c0: 0x109d2c0: jal   0x109cd5c addu  a0, s1, zero
+L_109d908:
+// 0x0109d908: 0x109d908: jal   0x109d3a4 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3770,15 +3770,15 @@ L_109d2c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_get_active_tab_109cd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_get_active_tab_109d3a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d2c8: 0x109d2c8: addu  a0, s1, zero
+// 0x0109d910: 0x109d910: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d2cc: 0x109d2cc: sw    s0, 132(s1)
+// 0x0109d914: 0x109d914: sw    s0, 132(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3787,7 +3787,7 @@ L_109d2c0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109d2d0: 0x109d2d0: jal   0x109cd5c sw    v0, 24(sp)
+// 0x0109d918: 0x109d918: jal   0x109d3a4 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3801,12 +3801,12 @@ L_109d2c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_get_active_tab_109cd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_get_active_tab_109d3a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d2d8: 0x109d2d8: lw    a0, 24(s1)
+// 0x0109d920: 0x109d920: lw    a0, 24(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3815,7 +3815,7 @@ L_109d2c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d2dc: 0x109d2dc: lw    a1, 24(sp)
+// 0x0109d924: 0x109d924: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3824,7 +3824,7 @@ L_109d2c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d2e0: 0x109d2e0: jal   0x109a320 addu  a2, v0, zero
+// 0x0109d928: 0x109d928: jal   0x109a968 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3832,12 +3832,12 @@ L_109d2c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_replace_109a320(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_replace_109a968(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d2e8: 0x109d2e8: lw    v0, 36(s1)
+// 0x0109d930: 0x109d930: lw    v0, 36(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3846,12 +3846,12 @@ L_109d2c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d2ec: 0x109d2ec: sll   zero, zero, 0
-// 0x0109d2f0: 0x109d2f0: beq   v0, zero, 0x109d304 sll   zero, zero, 0
+// 0x0109d934: 0x109d934: sll   zero, zero, 0
+// 0x0109d938: 0x109d938: beq   v0, zero, 0x109d94c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d304
+	brfalse L_109d94c
 // --- basic block ---
-// 0x0109d2f8: 0x109d2f8: lw    a0, 132(s1)
+// 0x0109d940: 0x109d940: lw    a0, 132(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3860,7 +3860,7 @@ L_109d2c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d2fc: 0x109d2fc: jalr  v0 sll   zero, zero, 0
+// 0x0109d944: 0x109d944: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3872,8 +3872,8 @@ L_109d2c0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_109d304:
-// 0x0109d304: 0x109d304: lw    a0, 20(s1)
+L_109d94c:
+// 0x0109d94c: 0x109d94c: lw    a0, 20(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3882,10 +3882,10 @@ L_109d304:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d308: 0x109d308: addu  a1, zero, zero
+// 0x0109d950: 0x109d950: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d30c: 0x109d30c: jal   0x1098f84 addu  a2, zero, zero
+// 0x0109d954: 0x109d954: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3893,12 +3893,12 @@ L_109d304:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d314: 0x109d314: lw    a0, 20(s1)
+// 0x0109d95c: 0x109d95c: lw    a0, 20(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3907,33 +3907,33 @@ L_109d304:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d318: 0x109d318: jal   0x1099048 sll   zero, zero, 0
+// 0x0109d960: 0x109d960: jal   0x1099690 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d320: 0x109d320: jal   0x10961b0 sll   zero, zero, 0
+// 0x0109d968: 0x109d968: jal   0x10967f8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_resort_tab_order_10961b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_resort_tab_order_10967f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d328: 0x109d328: bne   s0, zero, 0x109d340 sll   zero, zero, 0
+// 0x0109d970: 0x109d970: bne   s0, zero, 0x109d988 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_109d340
+	brtrue L_109d988
 // --- basic block ---
-// 0x0109d330: 0x109d330: jal   0x109cefc addu  a0, s1, zero
+// 0x0109d978: 0x109d978: jal   0x109d544 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3941,21 +3941,21 @@ L_109d304:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::initialize_tabsline_109cefc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::initialize_tabsline_109d544(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d338: 0x109d338: j	 0x109d454 sll   zero, zero, 0
-	br L_109d454
+// 0x0109d980: 0x109d980: j	 0x109da9c sll   zero, zero, 0
+	br L_109da9c
 // --- basic block ---
-L_109d340:
-// 0x0109d340: 0x109d340: beq   s2, s0, 0x109d454 sll   zero, zero, 0
+L_109d988:
+// 0x0109d988: 0x109d988: beq   s2, s0, 0x109da9c sll   zero, zero, 0
 	ldloc 9
 	ldloc 10
-	beq  L_109d454
+	beq  L_109da9c
 // --- basic block ---
-// 0x0109d348: 0x109d348: lw    v1, 12(s1)
+// 0x0109d990: 0x109d990: lw    v1, 12(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3964,28 +3964,28 @@ L_109d340:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109d34c: 0x109d34c: sll   zero, zero, 0
-// 0x0109d350: 0x109d350: beq   v1, zero, 0x109d3b4 slt   v0, s2, s0
+// 0x0109d994: 0x109d994: sll   zero, zero, 0
+// 0x0109d998: 0x109d998: beq   v1, zero, 0x109d9fc slt   v0, s2, s0
 	ldloc 8
 	ldloc 9
 	ldloc 10
 	clt
 	stloc 5
-	brfalse L_109d3b4
+	brfalse L_109d9fc
 // --- basic block ---
-// 0x0109d358: 0x109d358: beq   v0, zero, 0x109d388 addiu v0, zero, 12
+// 0x0109d9a0: 0x109d9a0: beq   v0, zero, 0x109d9d0 addiu v0, zero, 12
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	brfalse L_109d388
+	brfalse L_109d9d0
 // --- basic block ---
-// 0x0109d360: 0x109d360: addiu a1, zero, 1
+// 0x0109d9a8: 0x109d9a8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109d364: 0x109d364: addiu a2, zero, 1
+// 0x0109d9ac: 0x109d9ac: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0109d368: 0x109d368: jal   0x109cdd0 addu  a0, s1, zero
+// 0x0109d9b0: 0x109d9b0: jal   0x109d418 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3993,18 +3993,18 @@ L_109d340:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_select_tab_109cdd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_select_tab_109d418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d370: 0x109d370: addu  a0, s1, zero
+// 0x0109d9b8: 0x109d9b8: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d374: 0x109d374: addu  a1, zero, zero
+// 0x0109d9bc: 0x109d9bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d378: 0x109d378: jal   0x109cdd0 addu  a2, zero, zero
+// 0x0109d9c0: 0x109d9c0: jal   0x109d418 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4012,12 +4012,12 @@ L_109d340:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_select_tab_109cdd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_select_tab_109d418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d380: 0x109d380: j	 0x109d428 sw    zero, 12(s1)
+// 0x0109d9c8: 0x109d9c8: j	 0x109da70 sw    zero, 12(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4026,26 +4026,26 @@ L_109d340:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_109d428
+	br L_109da70
 // --- basic block ---
-L_109d388:
-// 0x0109d388: 0x109d388: mult  s2, v0
+L_109d9d0:
+// 0x0109d9d0: 0x109d9d0: mult  s2, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 11
-// 0x0109d38c: 0x109d38c: addu  a0, s1, zero
+// 0x0109d9d4: 0x109d9d4: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d390: 0x109d390: mflo  lo
+// 0x0109d9d8: 0x109d9d8: mflo  lo
 	ldloc 11
 	stloc 9
-// 0x0109d394: 0x109d394: addu  s2, s1, s2
+// 0x0109d9dc: 0x109d9dc: addu  s2, s1, s2
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-// 0x0109d398: 0x109d398: lw    s2, 44(s2)
+// 0x0109d9e0: 0x109d9e0: lw    s2, 44(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4054,20 +4054,20 @@ L_109d388:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109d39c: 0x109d39c: mult  s0, v0
+// 0x0109d9e4: 0x109d9e4: mult  s0, v0
 	ldloc 10
 	ldloc 5
 	mul
 	stloc 11
-// 0x0109d3a0: 0x109d3a0: mflo  lo
+// 0x0109d9e8: 0x109d9e8: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0109d3a4: 0x109d3a4: addu  v0, s1, v0
+// 0x0109d9ec: 0x109d9ec: addu  v0, s1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0109d3a8: 0x109d3a8: lw    a2, 44(v0)
+// 0x0109d9f0: 0x109d9f0: lw    a2, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4076,25 +4076,25 @@ L_109d388:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109d3ac: 0x109d3ac: j	 0x109d410 addu  a1, zero, zero
+// 0x0109d9f4: 0x109d9f4: j	 0x109da58 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_109d410
+	br L_109da58
 // --- basic block ---
-L_109d3b4:
-// 0x0109d3b4: 0x109d3b4: bne   v0, zero, 0x109d3e8 addiu v0, zero, 12
+L_109d9fc:
+// 0x0109d9fc: 0x109d9fc: bne   v0, zero, 0x109da30 addiu v0, zero, 12
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	brtrue L_109d3e8
+	brtrue L_109da30
 // --- basic block ---
-// 0x0109d3bc: 0x109d3bc: addu  a1, zero, zero
+// 0x0109da04: 0x109da04: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d3c0: 0x109d3c0: addiu a2, zero, 1
+// 0x0109da08: 0x109da08: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0109d3c4: 0x109d3c4: jal   0x109cdd0 addu  a0, s1, zero
+// 0x0109da0c: 0x109da0c: jal   0x109d418 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4102,18 +4102,18 @@ L_109d3b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_select_tab_109cdd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_select_tab_109d418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d3cc: 0x109d3cc: addu  a0, s1, zero
+// 0x0109da14: 0x109da14: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d3d0: 0x109d3d0: addiu a1, zero, 1
+// 0x0109da18: 0x109da18: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109d3d4: 0x109d3d4: jal   0x109cdd0 addu  a2, zero, zero
+// 0x0109da1c: 0x109da1c: jal   0x109d418 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4121,15 +4121,15 @@ L_109d3b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_select_tab_109cdd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_select_tab_109d418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d3dc: 0x109d3dc: addiu v0, zero, 1
+// 0x0109da24: 0x109da24: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109d3e0: 0x109d3e0: j	 0x109d428 sw    v0, 12(s1)
+// 0x0109da28: 0x109da28: j	 0x109da70 sw    v0, 12(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4138,29 +4138,29 @@ L_109d3b4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109d428
+	br L_109da70
 // --- basic block ---
-L_109d3e8:
-// 0x0109d3e8: 0x109d3e8: mult  s2, v0
+L_109da30:
+// 0x0109da30: 0x109da30: mult  s2, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 11
-// 0x0109d3ec: 0x109d3ec: addu  a1, zero, zero
+// 0x0109da34: 0x109da34: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d3f0: 0x109d3f0: addu  a0, s1, zero
+// 0x0109da38: 0x109da38: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d3f4: 0x109d3f4: mflo  lo
+// 0x0109da3c: 0x109da3c: mflo  lo
 	ldloc 11
 	stloc 9
-// 0x0109d3f8: 0x109d3f8: addu  s2, s1, s2
+// 0x0109da40: 0x109da40: addu  s2, s1, s2
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-// 0x0109d3fc: 0x109d3fc: lw    a2, 44(s2)
+// 0x0109da44: 0x109da44: lw    a2, 44(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4169,20 +4169,20 @@ L_109d3e8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109d400: 0x109d400: mult  s0, v0
+// 0x0109da48: 0x109da48: mult  s0, v0
 	ldloc 10
 	ldloc 5
 	mul
 	stloc 11
-// 0x0109d404: 0x109d404: mflo  lo
+// 0x0109da4c: 0x109da4c: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0109d408: 0x109d408: addu  v0, s1, v0
+// 0x0109da50: 0x109da50: addu  v0, s1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0109d40c: 0x109d40c: lw    s2, 44(v0)
+// 0x0109da54: 0x109da54: lw    s2, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4191,25 +4191,25 @@ L_109d3e8:
 	add
 	ldelem.i4
 	stloc 9
-L_109d410:
-// 0x0109d410: 0x109d410: jal   0x109cd80 sll   zero, zero, 0
+L_109da58:
+// 0x0109da58: 0x109da58: jal   0x109d3c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_set_text_109cd80(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_set_text_109d3c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d418: 0x109d418: addu  a0, s1, zero
+// 0x0109da60: 0x109da60: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d41c: 0x109d41c: addu  a2, s2, zero
+// 0x0109da64: 0x109da64: addu  a2, s2, zero
 	ldloc 9
 	stloc.3
-// 0x0109d420: 0x109d420: jal   0x109cd80 addiu a1, zero, 1
+// 0x0109da68: 0x109da68: jal   0x109d3c8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4217,19 +4217,19 @@ L_109d410:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_set_text_109cd80(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_set_text_109d3c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_109d428:
-// 0x0109d428: 0x109d428: addu  a0, s1, zero
+L_109da70:
+// 0x0109da70: 0x109da70: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d42c: 0x109d42c: addu  a1, zero, zero
+// 0x0109da74: 0x109da74: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d430: 0x109d430: jal   0x109ce9c addiu a2, zero, 1
+// 0x0109da78: 0x109da78: jal   0x109d4e4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -4237,12 +4237,12 @@ L_109d428:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_enable_arrow_109ce9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_enable_arrow_109d4e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109d438: 0x109d438: lw    v0, 128(s1)
+// 0x0109da80: 0x109da80: lw    v0, 128(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4251,25 +4251,25 @@ L_109d428:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d43c: 0x109d43c: addu  a0, s1, zero
+// 0x0109da84: 0x109da84: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0109d440: 0x109d440: addiu v0, v0, -1
+// 0x0109da88: 0x109da88: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0109d444: 0x109d444: xor   s0, v0, s0
+// 0x0109da8c: 0x109da8c: xor   s0, v0, s0
 	ldloc 5
 	ldloc 10
 	xor
 	stloc 10
-// 0x0109d448: 0x109d448: sltu  a2, zero, s0
+// 0x0109da90: 0x109da90: sltu  a2, zero, s0
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc.3
-// 0x0109d44c: 0x109d44c: jal   0x109ce9c addiu a1, zero, 1
+// 0x0109da94: 0x109da94: jal   0x109d4e4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4277,14 +4277,14 @@ L_109d428:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabsline_enable_arrow_109ce9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabsline_enable_arrow_109d4e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_109d454:
-// 0x0109d454: 0x109d454: lw    ra, 44(sp)
-// 0x0109d458: 0x109d458: lw    s2, 40(sp)
+L_109da9c:
+// 0x0109da9c: 0x109da9c: lw    ra, 44(sp)
+// 0x0109daa0: 0x109daa0: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4293,7 +4293,7 @@ L_109d454:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109d45c: 0x109d45c: lw    s1, 36(sp)
+// 0x0109daa4: 0x109daa4: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4302,7 +4302,7 @@ L_109d454:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d460: 0x109d460: lw    s0, 32(sp)
+// 0x0109daa8: 0x109daa8: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4311,7 +4311,7 @@ L_109d454:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109d464: 0x109d464: jr    ra addiu sp, sp, 48
+// 0x0109daac: 0x109daac: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4323,7 +4323,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_right_arrow_109d46c(int32,int32,int32,int32,int32)
+.method public static int32 on_right_arrow_109dab4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4358,7 +4358,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d46c: 0x109d46c: lw    v0, 4(a0)
+// 0x0109dab4: 0x109dab4: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4367,12 +4367,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d470: 0x109d470: addiu sp, sp, -24
+// 0x0109dab8: 0x109dab8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d474: 0x109d474: lw    v0, 4(v0)
+// 0x0109dabc: 0x109dabc: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4381,8 +4381,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d478: 0x109d478: sw    ra, 20(sp)
-// 0x0109d47c: 0x109d47c: lw    a0, 116(v0)
+// 0x0109dac0: 0x109dac0: sw    ra, 20(sp)
+// 0x0109dac4: 0x109dac4: lw    a0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4391,8 +4391,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d480: 0x109d480: sll   zero, zero, 0
-// 0x0109d484: 0x109d484: lw    v0, 128(a0)
+// 0x0109dac8: 0x109dac8: sll   zero, zero, 0
+// 0x0109dacc: 0x109dacc: lw    v0, 128(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4401,7 +4401,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d488: 0x109d488: lw    a1, 132(a0)
+// 0x0109dad0: 0x109dad0: lw    a1, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4410,46 +4410,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d48c: 0x109d48c: addiu v1, v0, -1
+// 0x0109dad4: 0x109dad4: addiu v1, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0109d490: 0x109d490: beq   v1, a1, 0x109d4ac addiu a1, a1, 1
+// 0x0109dad8: 0x109dad8: beq   v1, a1, 0x109daf4 addiu a1, a1, 1
 	ldloc 7
 	ldloc.2
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	beq  L_109d4ac
+	beq  L_109daf4
 // --- basic block ---
-// 0x0109d498: 0x109d498: slt   v0, a1, v0
+// 0x0109dae0: 0x109dae0: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109d49c: 0x109d49c: beq   v0, zero, 0x109d4ac sll   zero, zero, 0
+// 0x0109dae4: 0x109dae4: beq   v0, zero, 0x109daf4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d4ac
+	brfalse L_109daf4
 // --- basic block ---
-// 0x0109d4a4: 0x109d4a4: jal   0x109d1bc sll   zero, zero, 0
+// 0x0109daec: 0x109daec: jal   0x109d804 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109d4ac:
-// 0x0109d4ac: 0x109d4ac: lw    ra, 20(sp)
-// 0x0109d4b0: 0x109d4b0: addu  v0, zero, zero
+L_109daf4:
+// 0x0109daf4: 0x109daf4: lw    ra, 20(sp)
+// 0x0109daf8: 0x109daf8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0109d4b4: 0x109d4b4: jr    ra addiu sp, sp, 24
+// 0x0109dafc: 0x109dafc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4461,7 +4461,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_right_arrow_p_109d4bc(int32,int32,int32,int32,int32)
+.method public static int32 on_right_arrow_p_109db04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4496,13 +4496,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d4bc: 0x109d4bc: addiu sp, sp, -24
+// 0x0109db04: 0x109db04: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d4c0: 0x109d4c0: sw    ra, 20(sp)
-// 0x0109d4c4: 0x109d4c4: jal   0x109d46c addu  a1, zero, zero
+// 0x0109db08: 0x109db08: sw    ra, 20(sp)
+// 0x0109db0c: 0x109db0c: jal   0x109dab4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4510,14 +4510,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::on_right_arrow_109d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::on_right_arrow_109dab4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109d4cc: 0x109d4cc: lw    ra, 20(sp)
-// 0x0109d4d0: 0x109d4d0: sll   zero, zero, 0
-// 0x0109d4d4: 0x109d4d4: jr    ra addiu sp, sp, 24
+// 0x0109db14: 0x109db14: lw    ra, 20(sp)
+// 0x0109db18: 0x109db18: sll   zero, zero, 0
+// 0x0109db1c: 0x109db1c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4529,7 +4529,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_tab_109d4dc(int32,int32,int32,int32,int32)
+.method public static int32 on_tab_109db24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4564,7 +4564,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d4dc: 0x109d4dc: lw    v0, 4(a0)
+// 0x0109db24: 0x109db24: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4573,7 +4573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d4e0: 0x109d4e0: lw    v1, 20(a0)
+// 0x0109db28: 0x109db28: lw    v1, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4582,7 +4582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d4e4: 0x109d4e4: lw    v0, 4(v0)
+// 0x0109db2c: 0x109db2c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4591,12 +4591,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d4e8: 0x109d4e8: addiu sp, sp, -24
+// 0x0109db30: 0x109db30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d4ec: 0x109d4ec: lw    a0, 116(v0)
+// 0x0109db34: 0x109db34: lw    a0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4605,8 +4605,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d4f0: 0x109d4f0: sw    ra, 20(sp)
-// 0x0109d4f4: 0x109d4f4: lw    v0, 12(a0)
+// 0x0109db38: 0x109db38: sw    ra, 20(sp)
+// 0x0109db3c: 0x109db3c: lw    v0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4615,15 +4615,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d4f8: 0x109d4f8: bne   v1, zero, 0x109d524 sll   zero, zero, 0
+// 0x0109db40: 0x109db40: bne   v1, zero, 0x109db6c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_109d524
+	brtrue L_109db6c
 // --- basic block ---
-// 0x0109d500: 0x109d500: bne   v0, zero, 0x109d54c sll   zero, zero, 0
+// 0x0109db48: 0x109db48: bne   v0, zero, 0x109db94 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109d54c
+	brtrue L_109db94
 // --- basic block ---
-// 0x0109d508: 0x109d508: lw    a1, 132(a0)
+// 0x0109db50: 0x109db50: lw    a1, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4632,26 +4632,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d50c: 0x109d50c: sll   zero, zero, 0
-// 0x0109d510: 0x109d510: addiu a1, a1, -1
+// 0x0109db54: 0x109db54: sll   zero, zero, 0
+// 0x0109db58: 0x109db58: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x0109d514: 0x109d514: bgez  a1, 0x109d544 sll   zero, zero, 0
+// 0x0109db5c: 0x109db5c: bgez  a1, 0x109db8c sll   zero, zero, 0
 	ldloc.2
 	ldc.i4.s 0
-	bge L_109d544
+	bge L_109db8c
 // --- basic block ---
-// 0x0109d51c: 0x109d51c: j	 0x109d54c sll   zero, zero, 0
-	br L_109d54c
+// 0x0109db64: 0x109db64: j	 0x109db94 sll   zero, zero, 0
+	br L_109db94
 // --- basic block ---
-L_109d524:
-// 0x0109d524: 0x109d524: beq   v0, zero, 0x109d54c sll   zero, zero, 0
+L_109db6c:
+// 0x0109db6c: 0x109db6c: beq   v0, zero, 0x109db94 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d54c
+	brfalse L_109db94
 // --- basic block ---
-// 0x0109d52c: 0x109d52c: lw    a1, 132(a0)
+// 0x0109db74: 0x109db74: lw    a1, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4660,7 +4660,7 @@ L_109d524:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d530: 0x109d530: lw    v0, 128(a0)
+// 0x0109db78: 0x109db78: lw    v0, 128(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4669,38 +4669,38 @@ L_109d524:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d534: 0x109d534: addiu a1, a1, 1
+// 0x0109db7c: 0x109db7c: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0109d538: 0x109d538: slt   v0, a1, v0
+// 0x0109db80: 0x109db80: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109d53c: 0x109d53c: beq   v0, zero, 0x109d54c sll   zero, zero, 0
+// 0x0109db84: 0x109db84: beq   v0, zero, 0x109db94 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d54c
+	brfalse L_109db94
 // --- basic block ---
-L_109d544:
-// 0x0109d544: 0x109d544: jal   0x109d1bc sll   zero, zero, 0
+L_109db8c:
+// 0x0109db8c: 0x109db8c: jal   0x109d804 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109d54c:
-// 0x0109d54c: 0x109d54c: lw    ra, 20(sp)
-// 0x0109d550: 0x109d550: addu  v0, zero, zero
+L_109db94:
+// 0x0109db94: 0x109db94: lw    ra, 20(sp)
+// 0x0109db98: 0x109db98: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0109d554: 0x109d554: jr    ra addiu sp, sp, 24
+// 0x0109db9c: 0x109db9c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4712,7 +4712,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_tab_p_109d55c(int32,int32,int32,int32,int32)
+.method public static int32 on_tab_p_109dba4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4747,13 +4747,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d55c: 0x109d55c: addiu sp, sp, -24
+// 0x0109dba4: 0x109dba4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d560: 0x109d560: sw    ra, 20(sp)
-// 0x0109d564: 0x109d564: jal   0x109d4dc addu  a1, zero, zero
+// 0x0109dba8: 0x109dba8: sw    ra, 20(sp)
+// 0x0109dbac: 0x109dbac: jal   0x109db24 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4761,14 +4761,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::on_tab_109d4dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::on_tab_109db24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109d56c: 0x109d56c: lw    ra, 20(sp)
-// 0x0109d570: 0x109d570: sll   zero, zero, 0
-// 0x0109d574: 0x109d574: jr    ra addiu sp, sp, 24
+// 0x0109dbb4: 0x109dbb4: lw    ra, 20(sp)
+// 0x0109dbb8: 0x109dbb8: sll   zero, zero, 0
+// 0x0109dbbc: 0x109dbbc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4780,7 +4780,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_left_arrow_109d57c(int32,int32,int32,int32,int32)
+.method public static int32 on_left_arrow_109dbc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4815,7 +4815,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d57c: 0x109d57c: lw    v0, 4(a0)
+// 0x0109dbc4: 0x109dbc4: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4824,12 +4824,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d580: 0x109d580: addiu sp, sp, -24
+// 0x0109dbc8: 0x109dbc8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d584: 0x109d584: lw    v0, 4(v0)
+// 0x0109dbcc: 0x109dbcc: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4838,8 +4838,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d588: 0x109d588: sw    ra, 20(sp)
-// 0x0109d58c: 0x109d58c: lw    a0, 116(v0)
+// 0x0109dbd0: 0x109dbd0: sw    ra, 20(sp)
+// 0x0109dbd4: 0x109dbd4: lw    a0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4848,8 +4848,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d590: 0x109d590: sll   zero, zero, 0
-// 0x0109d594: 0x109d594: lw    a1, 132(a0)
+// 0x0109dbd8: 0x109dbd8: sll   zero, zero, 0
+// 0x0109dbdc: 0x109dbdc: lw    a1, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4858,37 +4858,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d598: 0x109d598: sll   zero, zero, 0
-// 0x0109d59c: 0x109d59c: beq   a1, zero, 0x109d5b4 addiu a1, a1, -1
+// 0x0109dbe0: 0x109dbe0: sll   zero, zero, 0
+// 0x0109dbe4: 0x109dbe4: beq   a1, zero, 0x109dbfc addiu a1, a1, -1
 	ldloc.2
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-	brfalse L_109d5b4
+	brfalse L_109dbfc
 // --- basic block ---
-// 0x0109d5a4: 0x109d5a4: bltz  a1, 0x109d5b4 sll   zero, zero, 0
+// 0x0109dbec: 0x109dbec: bltz  a1, 0x109dbfc sll   zero, zero, 0
 	ldloc.2
 	ldc.i4.s 0
-	blt L_109d5b4
+	blt L_109dbfc
 // --- basic block ---
-// 0x0109d5ac: 0x109d5ac: jal   0x109d1bc sll   zero, zero, 0
+// 0x0109dbf4: 0x109dbf4: jal   0x109d804 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_109d5b4:
-// 0x0109d5b4: 0x109d5b4: lw    ra, 20(sp)
-// 0x0109d5b8: 0x109d5b8: addu  v0, zero, zero
+L_109dbfc:
+// 0x0109dbfc: 0x109dbfc: lw    ra, 20(sp)
+// 0x0109dc00: 0x109dc00: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0109d5bc: 0x109d5bc: jr    ra addiu sp, sp, 24
+// 0x0109dc04: 0x109dc04: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4900,7 +4900,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_left_arrow_p_109d5c4(int32,int32,int32,int32,int32)
+.method public static int32 on_left_arrow_p_109dc0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4935,13 +4935,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d5c4: 0x109d5c4: addiu sp, sp, -24
+// 0x0109dc0c: 0x109dc0c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d5c8: 0x109d5c8: sw    ra, 20(sp)
-// 0x0109d5cc: 0x109d5cc: jal   0x109d57c addu  a1, zero, zero
+// 0x0109dc10: 0x109dc10: sw    ra, 20(sp)
+// 0x0109dc14: 0x109dc14: jal   0x109dbc4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4949,14 +4949,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::on_left_arrow_109d57c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::on_left_arrow_109dbc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109d5d4: 0x109d5d4: lw    ra, 20(sp)
-// 0x0109d5d8: 0x109d5d8: sll   zero, zero, 0
-// 0x0109d5dc: 0x109d5dc: jr    ra addiu sp, sp, 24
+// 0x0109dc1c: 0x109dc1c: lw    ra, 20(sp)
+// 0x0109dc20: 0x109dc20: sll   zero, zero, 0
+// 0x0109dc24: 0x109dc24: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4968,7 +4968,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 move_one_tab_left_109d5e4(int32,int32,int32,int32,int32)
+.method public static int32 move_one_tab_left_109dc2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5003,25 +5003,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d5e4: 0x109d5e4: lui   v0, 0x80000
+// 0x0109dc2c: 0x109dc2c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109d5e8: 0x109d5e8: lw    v1, 9976(v0)
+// 0x0109dc30: 0x109dc30: lw    v1, 10440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2494
+	ldc.i4 2610
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d5ec: 0x109d5ec: addiu sp, sp, -24
+// 0x0109dc34: 0x109dc34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d5f0: 0x109d5f0: sw    ra, 20(sp)
-// 0x0109d5f4: 0x109d5f4: lw    a1, 132(a0)
+// 0x0109dc38: 0x109dc38: sw    ra, 20(sp)
+// 0x0109dc3c: 0x109dc3c: lw    a1, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5030,11 +5030,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d5f8: 0x109d5f8: beq   v1, zero, 0x109d61c sll   zero, zero, 0
+// 0x0109dc40: 0x109dc40: beq   v1, zero, 0x109dc64 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109d61c
+	brfalse L_109dc64
 // --- basic block ---
-// 0x0109d600: 0x109d600: lw    v0, 128(a0)
+// 0x0109dc48: 0x109dc48: lw    v0, 128(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5043,50 +5043,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d604: 0x109d604: addiu a1, a1, 1
+// 0x0109dc4c: 0x109dc4c: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0109d608: 0x109d608: slt   v0, a1, v0
+// 0x0109dc50: 0x109dc50: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109d60c: 0x109d60c: beq   v0, zero, 0x109d630 sll   zero, zero, 0
+// 0x0109dc54: 0x109dc54: beq   v0, zero, 0x109dc78 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d630
+	brfalse L_109dc78
 // --- basic block ---
-// 0x0109d614: 0x109d614: j	 0x109d628 sll   zero, zero, 0
-	br L_109d628
+// 0x0109dc5c: 0x109dc5c: j	 0x109dc70 sll   zero, zero, 0
+	br L_109dc70
 // --- basic block ---
-L_109d61c:
-// 0x0109d61c: 0x109d61c: addiu a1, a1, -1
+L_109dc64:
+// 0x0109dc64: 0x109dc64: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x0109d620: 0x109d620: bltz  a1, 0x109d630 sll   zero, zero, 0
+// 0x0109dc68: 0x109dc68: bltz  a1, 0x109dc78 sll   zero, zero, 0
 	ldloc.2
 	ldc.i4.s 0
-	blt L_109d630
+	blt L_109dc78
 // --- basic block ---
-L_109d628:
-// 0x0109d628: 0x109d628: jal   0x109d1bc sll   zero, zero, 0
+L_109dc70:
+// 0x0109dc70: 0x109dc70: jal   0x109d804 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109d630:
-// 0x0109d630: 0x109d630: lw    ra, 20(sp)
-// 0x0109d634: 0x109d634: sll   zero, zero, 0
-// 0x0109d638: 0x109d638: jr    ra addiu sp, sp, 24
+L_109dc78:
+// 0x0109dc78: 0x109dc78: lw    ra, 20(sp)
+// 0x0109dc7c: 0x109dc7c: sll   zero, zero, 0
+// 0x0109dc80: 0x109dc80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5098,7 +5098,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_tabcontrol_move_tab_left_109d640(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_move_tab_left_109dc88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -5136,19 +5136,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d640: 0x109d640: addiu sp, sp, -24
+// 0x0109dc88: 0x109dc88: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d644: 0x109d644: addu  a2, zero, zero
+// 0x0109dc8c: 0x109dc8c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109d648: 0x109d648: addu  a1, zero, zero
+// 0x0109dc90: 0x109dc90: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d64c: 0x109d64c: sw    ra, 20(sp)
-// 0x0109d650: 0x109d650: sw    s0, 16(sp)
+// 0x0109dc94: 0x109dc94: sw    ra, 20(sp)
+// 0x0109dc98: 0x109dc98: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5157,7 +5157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109d654: 0x109d654: jal   0x1098f84 addu  s0, a0, zero
+// 0x0109dc9c: 0x109dc9c: jal   0x10995cc addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -5165,20 +5165,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109d65c: 0x109d65c: lui   a1, 0x20000
+// 0x0109dca4: 0x109dca4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d660: 0x109d660: addu  a0, s0, zero
+// 0x0109dca8: 0x109dca8: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0109d664: 0x109d664: jal   0x109b304 addiu a1, a1, -1896
+// 0x0109dcac: 0x109dcac: jal   0x109b94c addiu a1, a1, -1432
 	ldloc.2
-	ldc.i4 -1896
+	ldc.i4 -1432
 	add
 	stloc.2
 	ldloc.0
@@ -5186,12 +5186,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109d66c: 0x109d66c: lw    a0, 116(v0)
+// 0x0109dcb4: 0x109dcb4: lw    a0, 116(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5200,19 +5200,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d670: 0x109d670: jal   0x109d5e4 sll   zero, zero, 0
+// 0x0109dcb8: 0x109dcb8: jal   0x109dc2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::move_one_tab_left_109d5e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::move_one_tab_left_109dc2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109d678: 0x109d678: lw    ra, 20(sp)
-// 0x0109d67c: 0x109d67c: lw    s0, 16(sp)
+// 0x0109dcc0: 0x109dcc0: lw    ra, 20(sp)
+// 0x0109dcc4: 0x109dcc4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5221,7 +5221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d680: 0x109d680: jr    ra addiu sp, sp, 24
+// 0x0109dcc8: 0x109dcc8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5233,7 +5233,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 move_one_tab_right_109d688(int32,int32,int32,int32,int32)
+.method public static int32 move_one_tab_right_109dcd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5268,25 +5268,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d688: 0x109d688: lui   v0, 0x80000
+// 0x0109dcd0: 0x109dcd0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109d68c: 0x109d68c: lw    v1, 9976(v0)
+// 0x0109dcd4: 0x109dcd4: lw    v1, 10440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2494
+	ldc.i4 2610
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d690: 0x109d690: addiu sp, sp, -24
+// 0x0109dcd8: 0x109dcd8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d694: 0x109d694: sw    ra, 20(sp)
-// 0x0109d698: 0x109d698: lw    a1, 132(a0)
+// 0x0109dcdc: 0x109dcdc: sw    ra, 20(sp)
+// 0x0109dce0: 0x109dce0: lw    a1, 132(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5295,25 +5295,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d69c: 0x109d69c: beq   v1, zero, 0x109d6b8 sll   zero, zero, 0
+// 0x0109dce4: 0x109dce4: beq   v1, zero, 0x109dd00 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109d6b8
+	brfalse L_109dd00
 // --- basic block ---
-// 0x0109d6a4: 0x109d6a4: addiu a1, a1, -1
+// 0x0109dcec: 0x109dcec: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x0109d6a8: 0x109d6a8: bgez  a1, 0x109d6cc sll   zero, zero, 0
+// 0x0109dcf0: 0x109dcf0: bgez  a1, 0x109dd14 sll   zero, zero, 0
 	ldloc.2
 	ldc.i4.s 0
-	bge L_109d6cc
+	bge L_109dd14
 // --- basic block ---
-// 0x0109d6b0: 0x109d6b0: j	 0x109d6d4 sll   zero, zero, 0
-	br L_109d6d4
+// 0x0109dcf8: 0x109dcf8: j	 0x109dd1c sll   zero, zero, 0
+	br L_109dd1c
 // --- basic block ---
-L_109d6b8:
-// 0x0109d6b8: 0x109d6b8: lw    v0, 128(a0)
+L_109dd00:
+// 0x0109dd00: 0x109dd00: lw    v0, 128(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5322,36 +5322,36 @@ L_109d6b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d6bc: 0x109d6bc: addiu a1, a1, 1
+// 0x0109dd04: 0x109dd04: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0109d6c0: 0x109d6c0: slt   v0, a1, v0
+// 0x0109dd08: 0x109dd08: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x0109d6c4: 0x109d6c4: beq   v0, zero, 0x109d6d4 sll   zero, zero, 0
+// 0x0109dd0c: 0x109dd0c: beq   v0, zero, 0x109dd1c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109d6d4
+	brfalse L_109dd1c
 // --- basic block ---
-L_109d6cc:
-// 0x0109d6cc: 0x109d6cc: jal   0x109d1bc sll   zero, zero, 0
+L_109dd14:
+// 0x0109dd14: 0x109dd14: jal   0x109d804 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109d6d4:
-// 0x0109d6d4: 0x109d6d4: lw    ra, 20(sp)
-// 0x0109d6d8: 0x109d6d8: sll   zero, zero, 0
-// 0x0109d6dc: 0x109d6dc: jr    ra addiu sp, sp, 24
+L_109dd1c:
+// 0x0109dd1c: 0x109dd1c: lw    ra, 20(sp)
+// 0x0109dd20: 0x109dd20: sll   zero, zero, 0
+// 0x0109dd24: 0x109dd24: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5363,7 +5363,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnKeyPressed_109d6e4(int32,int32,int32,int32,int32)
+.method public static int32 OnKeyPressed_109dd2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5398,18 +5398,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d6e4: 0x109d6e4: addiu sp, sp, -24
+// 0x0109dd2c: 0x109dd2c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d6e8: 0x109d6e8: andi  v0, a2, 1
+// 0x0109dd30: 0x109dd30: andi  v0, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc 5
-// 0x0109d6ec: 0x109d6ec: sw    ra, 20(sp)
-// 0x0109d6f0: 0x109d6f0: lw    a0, 116(a0)
+// 0x0109dd34: 0x109dd34: sw    ra, 20(sp)
+// 0x0109dd38: 0x109dd38: lw    a0, 116(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5418,109 +5418,109 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d6f4: 0x109d6f4: beq   v0, zero, 0x109d768 addiu v1, zero, 4
+// 0x0109dd3c: 0x109dd3c: beq   v0, zero, 0x109ddb0 addiu v1, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 6
-	brfalse L_109d768
+	brfalse L_109ddb0
 // --- basic block ---
-// 0x0109d6fc: 0x109d6fc: lb    v0, 0(a1)
+// 0x0109dd44: 0x109dd44: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109d700: 0x109d700: sll   zero, zero, 0
-// 0x0109d704: 0x109d704: beq   v0, v1, 0x109d74c addiu v1, zero, 5
+// 0x0109dd48: 0x109dd48: sll   zero, zero, 0
+// 0x0109dd4c: 0x109dd4c: beq   v0, v1, 0x109dd94 addiu v1, zero, 5
 	ldloc 5
 	ldloc 6
 	ldc.i4.5
 	stloc 6
-	beq  L_109d74c
+	beq  L_109dd94
 // --- basic block ---
-// 0x0109d70c: 0x109d70c: beq   v0, v1, 0x109d754 addiu v1, zero, 6
+// 0x0109dd54: 0x109dd54: beq   v0, v1, 0x109dd9c addiu v1, zero, 6
 	ldloc 5
 	ldloc 6
 	ldc.i4.6
 	stloc 6
-	beq  L_109d754
+	beq  L_109dd9c
 // --- basic block ---
-// 0x0109d714: 0x109d714: beq   v0, v1, 0x109d72c addiu v1, zero, 7
+// 0x0109dd5c: 0x109dd5c: beq   v0, v1, 0x109dd74 addiu v1, zero, 7
 	ldloc 5
 	ldloc 6
 	ldc.i4.7
 	stloc 6
-	beq  L_109d72c
+	beq  L_109dd74
 // --- basic block ---
-// 0x0109d71c: 0x109d71c: bne   v0, v1, 0x109d768 sll   zero, zero, 0
+// 0x0109dd64: 0x109dd64: bne   v0, v1, 0x109ddb0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_109d768
+	bne.un L_109ddb0
 // --- basic block ---
-// 0x0109d724: 0x109d724: j	 0x109d73c sll   zero, zero, 0
-	br L_109d73c
+// 0x0109dd6c: 0x109dd6c: j	 0x109dd84 sll   zero, zero, 0
+	br L_109dd84
 // --- basic block ---
-L_109d72c:
-// 0x0109d72c: 0x109d72c: jal   0x109d5e4 sll   zero, zero, 0
+L_109dd74:
+// 0x0109dd74: 0x109dd74: jal   0x109dc2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::move_one_tab_left_109d5e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::move_one_tab_left_109dc2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109d734: 0x109d734: j	 0x109d784 addiu v0, zero, 1
+// 0x0109dd7c: 0x109dd7c: j	 0x109ddcc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_109d784
+	br L_109ddcc
 // --- basic block ---
-L_109d73c:
-// 0x0109d73c: 0x109d73c: jal   0x109d688 sll   zero, zero, 0
+L_109dd84:
+// 0x0109dd84: 0x109dd84: jal   0x109dcd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::move_one_tab_right_109d688(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::move_one_tab_right_109dcd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109d744: 0x109d744: j	 0x109d784 addiu v0, zero, 1
+// 0x0109dd8c: 0x109dd8c: j	 0x109ddcc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_109d784
+	br L_109ddcc
 // --- basic block ---
-L_109d74c:
-// 0x0109d74c: 0x109d74c: j	 0x109d758 addiu a0, zero, 4
+L_109dd94:
+// 0x0109dd94: 0x109dd94: j	 0x109dda0 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-	br L_109d758
+	br L_109dda0
 // --- basic block ---
-L_109d754:
-// 0x0109d754: 0x109d754: addiu a0, zero, 5
+L_109dd9c:
+// 0x0109dd9c: 0x109dd9c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-L_109d758:
-// 0x0109d758: 0x109d758: jal   0x1096264 sll   zero, zero, 0
+L_109dda0:
+// 0x0109dda0: 0x109dda0: jal   0x10968ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_move_focus_1096264(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_move_focus_10968ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109d760: 0x109d760: j	 0x109d784 addiu v0, zero, 1
+// 0x0109dda8: 0x109dda8: j	 0x109ddcc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_109d784
+	br L_109ddcc
 // --- basic block ---
-L_109d768:
-// 0x0109d768: 0x109d768: lw    v1, 40(a0)
+L_109ddb0:
+// 0x0109ddb0: 0x109ddb0: lw    v1, 40(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5529,14 +5529,14 @@ L_109d768:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109d76c: 0x109d76c: sll   zero, zero, 0
-// 0x0109d770: 0x109d770: beq   v1, zero, 0x109d784 addu  v0, zero, zero
+// 0x0109ddb4: 0x109ddb4: sll   zero, zero, 0
+// 0x0109ddb8: 0x109ddb8: beq   v1, zero, 0x109ddcc addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109d784
+	brfalse L_109ddcc
 // --- basic block ---
-// 0x0109d778: 0x109d778: lw    a0, 132(a0)
+// 0x0109ddc0: 0x109ddc0: lw    a0, 132(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5545,7 +5545,7 @@ L_109d768:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d77c: 0x109d77c: jalr  v1 sll   zero, zero, 0
+// 0x0109ddc4: 0x109ddc4: jalr  v1 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -5557,10 +5557,10 @@ L_109d768:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_109d784:
-// 0x0109d784: 0x109d784: lw    ra, 20(sp)
-// 0x0109d788: 0x109d788: sll   zero, zero, 0
-// 0x0109d78c: 0x109d78c: jr    ra addiu sp, sp, 24
+L_109ddcc:
+// 0x0109ddcc: 0x109ddcc: lw    ra, 20(sp)
+// 0x0109ddd0: 0x109ddd0: sll   zero, zero, 0
+// 0x0109ddd4: 0x109ddd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5572,7 +5572,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnTabLineKeyPressed_109d794(int32,int32,int32,int32,int32)
+.method public static int32 OnTabLineKeyPressed_109dddc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -5607,7 +5607,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d794: 0x109d794: lw    v0, 4(a0)
+// 0x0109dddc: 0x109dddc: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5616,12 +5616,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109d798: 0x109d798: addiu sp, sp, -24
+// 0x0109dde0: 0x109dde0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d79c: 0x109d79c: lw    a0, 4(v0)
+// 0x0109dde4: 0x109dde4: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5630,21 +5630,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d7a0: 0x109d7a0: sw    ra, 20(sp)
-// 0x0109d7a4: 0x109d7a4: jal   0x109d6e4 sll   zero, zero, 0
+// 0x0109dde8: 0x109dde8: sw    ra, 20(sp)
+// 0x0109ddec: 0x109ddec: jal   0x109dd2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::OnKeyPressed_109d6e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::OnKeyPressed_109dd2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109d7ac: 0x109d7ac: lw    ra, 20(sp)
-// 0x0109d7b0: 0x109d7b0: sll   zero, zero, 0
-// 0x0109d7b4: 0x109d7b4: jr    ra addiu sp, sp, 24
+// 0x0109ddf4: 0x109ddf4: lw    ra, 20(sp)
+// 0x0109ddf8: 0x109ddf8: sll   zero, zero, 0
+// 0x0109ddfc: 0x109ddfc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5656,7 +5656,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_tabcontrol_move_tab_right_109d7bc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_move_tab_right_109de04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -5694,19 +5694,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d7bc: 0x109d7bc: addiu sp, sp, -24
+// 0x0109de04: 0x109de04: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d7c0: 0x109d7c0: addu  a2, zero, zero
+// 0x0109de08: 0x109de08: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109d7c4: 0x109d7c4: addu  a1, zero, zero
+// 0x0109de0c: 0x109de0c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d7c8: 0x109d7c8: sw    ra, 20(sp)
-// 0x0109d7cc: 0x109d7cc: sw    s0, 16(sp)
+// 0x0109de10: 0x109de10: sw    ra, 20(sp)
+// 0x0109de14: 0x109de14: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5715,7 +5715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109d7d0: 0x109d7d0: jal   0x1098f84 addu  s0, a0, zero
+// 0x0109de18: 0x109de18: jal   0x10995cc addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -5723,20 +5723,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109d7d8: 0x109d7d8: lui   a1, 0x20000
+// 0x0109de20: 0x109de20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d7dc: 0x109d7dc: addu  a0, s0, zero
+// 0x0109de24: 0x109de24: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0109d7e0: 0x109d7e0: jal   0x109b304 addiu a1, a1, -1896
+// 0x0109de28: 0x109de28: jal   0x109b94c addiu a1, a1, -1432
 	ldloc.2
-	ldc.i4 -1896
+	ldc.i4 -1432
 	add
 	stloc.2
 	ldloc.0
@@ -5744,12 +5744,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109d7e8: 0x109d7e8: lw    a0, 116(v0)
+// 0x0109de30: 0x109de30: lw    a0, 116(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5758,19 +5758,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d7ec: 0x109d7ec: jal   0x109d688 sll   zero, zero, 0
+// 0x0109de34: 0x109de34: jal   0x109dcd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::move_one_tab_right_109d688(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::move_one_tab_right_109dcd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109d7f4: 0x109d7f4: lw    ra, 20(sp)
-// 0x0109d7f8: 0x109d7f8: lw    s0, 16(sp)
+// 0x0109de3c: 0x109de3c: lw    ra, 20(sp)
+// 0x0109de40: 0x109de40: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5779,7 +5779,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d7fc: 0x109d7fc: jr    ra addiu sp, sp, 24
+// 0x0109de44: 0x109de44: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5791,7 +5791,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_tabcontrol_show_109d804(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_show_109de4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -5829,12 +5829,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d804: 0x109d804: addiu sp, sp, -24
+// 0x0109de4c: 0x109de4c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d808: 0x109d808: sw    s0, 16(sp)
+// 0x0109de50: 0x109de50: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5843,10 +5843,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109d80c: 0x109d80c: addu  s0, a0, zero
+// 0x0109de54: 0x109de54: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0109d810: 0x109d810: lw    a0, 20(a0)
+// 0x0109de58: 0x109de58: lw    a0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5855,11 +5855,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d814: 0x109d814: addu  a2, zero, zero
+// 0x0109de5c: 0x109de5c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109d818: 0x109d818: sw    ra, 20(sp)
-// 0x0109d81c: 0x109d81c: jal   0x1098f84 addu  a1, zero, zero
+// 0x0109de60: 0x109de60: sw    ra, 20(sp)
+// 0x0109de64: 0x109de64: jal   0x10995cc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5867,12 +5867,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109d824: 0x109d824: lw    a1, 132(s0)
+// 0x0109de6c: 0x109de6c: lw    a1, 132(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5881,7 +5881,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d828: 0x109d828: jal   0x109d1bc addu  a0, s0, zero
+// 0x0109de70: 0x109de70: jal   0x109d804 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5889,12 +5889,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109d830: 0x109d830: lw    a0, 16(s0)
+// 0x0109de78: 0x109de78: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5903,7 +5903,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109d834: 0x109d834: jal   0x1095eec addu  a1, s0, zero
+// 0x0109de7c: 0x109de7c: jal   0x1096534 addu  a1, s0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5911,24 +5911,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109d83c: 0x109d83c: jal   0x109483c sll   zero, zero, 0
+// 0x0109de84: 0x109de84: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109d844: 0x109d844: lw    ra, 20(sp)
-// 0x0109d848: 0x109d848: lw    s0, 16(sp)
+// 0x0109de8c: 0x109de8c: lw    ra, 20(sp)
+// 0x0109de90: 0x109de90: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5937,7 +5937,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109d84c: 0x109d84c: jr    ra addiu sp, sp, 24
+// 0x0109de94: 0x109de94: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5949,7 +5949,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 tabcontrol_info_init_109d854(int32,int32,int32,int32,int32)
+.method public static int32 tabcontrol_info_init_109de9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -5987,19 +5987,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d854: 0x109d854: addiu sp, sp, -24
+// 0x0109de9c: 0x109de9c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109d858: 0x109d858: addu  a1, zero, zero
+// 0x0109dea0: 0x109dea0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109d85c: 0x109d85c: addiu a2, zero, 156
+// 0x0109dea4: 0x109dea4: addiu a2, zero, 156
 	ldc.i4 156
 	stloc.3
-// 0x0109d860: 0x109d860: sw    ra, 20(sp)
-// 0x0109d864: 0x109d864: sw    s0, 16(sp)
+// 0x0109dea8: 0x109dea8: sw    ra, 20(sp)
+// 0x0109deac: 0x109deac: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6008,7 +6008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109d868: 0x109d868: jal   0x100177c addu  s0, a0, zero
+// 0x0109deb0: 0x109deb0: jal   0x100177c addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.1
@@ -6020,11 +6020,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109d870: 0x109d870: addiu v0, zero, 1
+// 0x0109deb8: 0x109deb8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0109d874: 0x109d874: lw    ra, 20(sp)
-// 0x0109d878: 0x109d878: sw    v0, 12(s0)
+// 0x0109debc: 0x109debc: lw    ra, 20(sp)
+// 0x0109dec0: 0x109dec0: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6033,10 +6033,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109d87c: 0x109d87c: addiu v0, zero, -1
+// 0x0109dec4: 0x109dec4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0109d880: 0x109d880: sw    v0, 132(s0)
+// 0x0109dec8: 0x109dec8: sw    v0, 132(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6045,7 +6045,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109d884: 0x109d884: lw    s0, 16(sp)
+// 0x0109decc: 0x109decc: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6054,7 +6054,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d888: 0x109d888: jr    ra addiu sp, sp, 24
+// 0x0109ded0: 0x109ded0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6066,7 +6066,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_tabcontrol_new_109d890(int32,int32,int32,int32,int32)
+.method public static int32 ssd_tabcontrol_new_109ded8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s8,int32 s7,int32 ra,int32 lo)
@@ -6131,12 +6131,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109d890: 0x109d890: addiu sp, sp, -248
+// 0x0109ded8: 0x109ded8: addiu sp, sp, -248
 	ldloc.0
 	ldc.i4 -248
 	add
 	stloc.0
-// 0x0109d894: 0x109d894: sw    s0, 208(sp)
+// 0x0109dedc: 0x109dedc: sw    s0, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6145,7 +6145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109d898: 0x109d898: lw    s0, 280(sp)
+// 0x0109dee0: 0x109dee0: lw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6154,7 +6154,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109d89c: 0x109d89c: sw    s5, 228(sp)
+// 0x0109dee4: 0x109dee4: sw    s5, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6163,15 +6163,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109d8a0: 0x109d8a0: addu  s5, a0, zero
+// 0x0109dee8: 0x109dee8: addu  s5, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0109d8a4: 0x109d8a4: addiu a0, sp, 32
+// 0x0109deec: 0x109deec: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0109d8a8: 0x109d8a8: sw    s7, 236(sp)
+// 0x0109def0: 0x109def0: sw    s7, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6180,7 +6180,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109d8ac: 0x109d8ac: sw    s6, 232(sp)
+// 0x0109def4: 0x109def4: sw    s6, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6189,7 +6189,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109d8b0: 0x109d8b0: sw    s4, 224(sp)
+// 0x0109def8: 0x109def8: sw    s4, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6198,7 +6198,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109d8b4: 0x109d8b4: sw    s1, 212(sp)
+// 0x0109defc: 0x109defc: sw    s1, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6207,8 +6207,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109d8b8: 0x109d8b8: sw    ra, 244(sp)
-// 0x0109d8bc: 0x109d8bc: sw    s8, 240(sp)
+// 0x0109df00: 0x109df00: sw    ra, 244(sp)
+// 0x0109df04: 0x109df04: sw    s8, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6217,7 +6217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109d8c0: 0x109d8c0: sw    s3, 220(sp)
+// 0x0109df08: 0x109df08: sw    s3, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6226,7 +6226,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109d8c4: 0x109d8c4: sw    s2, 216(sp)
+// 0x0109df0c: 0x109df0c: sw    s2, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6235,13 +6235,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109d8c8: 0x109d8c8: addu  s1, a1, zero
+// 0x0109df10: 0x109df10: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0109d8cc: 0x109d8cc: addu  s7, a2, zero
+// 0x0109df14: 0x109df14: addu  s7, a2, zero
 	ldloc.3
 	stloc 16
-// 0x0109d8d0: 0x109d8d0: lw    s4, 284(sp)
+// 0x0109df18: 0x109df18: lw    s4, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6250,7 +6250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109d8d4: 0x109d8d4: jal   0x109d854 addu  s6, a3, zero
+// 0x0109df1c: 0x109df1c: jal   0x109de9c addu  s6, a3, zero
 	ldloc 4
 	stloc 14
 	ldloc.0
@@ -6258,47 +6258,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabcontrol_info_init_109d854(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabcontrol_info_init_109de9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d8dc: 0x109d8dc: addiu v0, s0, -2
+// 0x0109df24: 0x109df24: addiu v0, s0, -2
 	ldloc 9
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x0109d8e0: 0x109d8e0: sltiu v0, v0, 6
+// 0x0109df28: 0x109df28: sltiu v0, v0, 6
 	ldloc 5
 	ldc.i4.6
 	clt.un
 	stloc 5
-// 0x0109d8e4: 0x109d8e4: bne   v0, zero, 0x109d90c lui   a1, 0x20000
+// 0x0109df2c: 0x109df2c: bne   v0, zero, 0x109df54 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_109d90c
+	brtrue L_109df54
 // --- basic block ---
-// 0x0109d8ec: 0x109d8ec: lui   a3, 0x20000
+// 0x0109df34: 0x109df34: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109d8f0: 0x109d8f0: addiu a1, a1, -2404
+// 0x0109df38: 0x109df38: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109d8f4: 0x109d8f4: addiu a3, a3, -1872
+// 0x0109df3c: 0x109df3c: addiu a3, a3, -1408
 	ldloc 4
-	ldc.i4 -1872
+	ldc.i4 -1408
 	add
 	stloc 4
-// 0x0109d8f8: 0x109d8f8: addiu a0, zero, 4
+// 0x0109df40: 0x109df40: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109d8fc: 0x109d8fc: addiu a2, zero, 695
+// 0x0109df44: 0x109df44: addiu a2, zero, 695
 	ldc.i4 695
 	stloc.3
-// 0x0109d900: 0x109d900: sw    s1, 16(sp)
+// 0x0109df48: 0x109df48: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6307,7 +6307,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109d904: 0x109d904: j	 0x109da08 sw    s0, 20(sp)
+// 0x0109df4c: 0x109df4c: j	 0x109e050 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6316,53 +6316,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	br L_109da08
+	br L_109e050
 // --- basic block ---
-L_109d90c:
-// 0x0109d90c: 0x109d90c: bltz  s4, 0x109d928 lui   a3, 0x20000
+L_109df54:
+// 0x0109df54: 0x109df54: bltz  s4, 0x109df70 lui   a3, 0x20000
 	ldloc 12
 	ldc.i4 131072
 	stloc 4
 	ldc.i4.s 0
-	blt L_109d928
+	blt L_109df70
 // --- basic block ---
-// 0x0109d914: 0x109d914: slt   v0, s4, s0
+// 0x0109df5c: 0x109df5c: slt   v0, s4, s0
 	ldloc 12
 	ldloc 9
 	clt
 	stloc 5
-// 0x0109d918: 0x109d918: bne   v0, zero, 0x109d954 addiu s8, sp, 76
+// 0x0109df60: 0x109df60: bne   v0, zero, 0x109df9c addiu s8, sp, 76
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 15
-	brtrue L_109d954
+	brtrue L_109df9c
 // --- basic block ---
-// 0x0109d920: 0x109d920: lui   a1, 0x20000
+// 0x0109df68: 0x109df68: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d924: 0x109d924: lui   a3, 0x20000
+// 0x0109df6c: 0x109df6c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-L_109d928:
-// 0x0109d928: 0x109d928: addiu a1, a1, -2404
+L_109df70:
+// 0x0109df70: 0x109df70: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109d92c: 0x109d92c: addiu a3, a3, -1824
+// 0x0109df74: 0x109df74: addiu a3, a3, -1360
 	ldloc 4
-	ldc.i4 -1824
+	ldc.i4 -1360
 	add
 	stloc 4
-// 0x0109d930: 0x109d930: addiu a0, zero, 4
+// 0x0109df78: 0x109df78: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109d934: 0x109d934: addiu a2, zero, 701
+// 0x0109df7c: 0x109df7c: addiu a2, zero, 701
 	ldc.i4 701
 	stloc.3
-// 0x0109d938: 0x109d938: sw    s1, 16(sp)
+// 0x0109df80: 0x109df80: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6371,7 +6371,7 @@ L_109d928:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109d93c: 0x109d93c: sw    s4, 20(sp)
+// 0x0109df84: 0x109df84: sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6380,7 +6380,7 @@ L_109d928:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109d940: 0x109d940: sw    s0, 24(sp)
+// 0x0109df88: 0x109df88: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6389,8 +6389,8 @@ L_109d928:
 	add
 	ldloc 9
 	stelem.i4
-L_109d944:
-// 0x0109d944: 0x109d944: jal   0x100449c sll   zero, zero, 0
+L_109df8c:
+// 0x0109df8c: 0x109df8c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6401,13 +6401,13 @@ L_109d944:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d94c: 0x109d94c: j	 0x109dd54 addu  v0, zero, zero
+// 0x0109df94: 0x109df94: j	 0x109e39c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_109dd54
+	br L_109e39c
 // --- basic block ---
-L_109d954:
-// 0x0109d954: 0x109d954: lw    a1, 272(sp)
+L_109df9c:
+// 0x0109df9c: 0x109df9c: lw    a1, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6416,7 +6416,7 @@ L_109d954:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d958: 0x109d958: lw    v1, 276(sp)
+// 0x0109dfa0: 0x109dfa0: lw    v1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6425,49 +6425,49 @@ L_109d954:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d95c: 0x109d95c: addu  s2, zero, zero
+// 0x0109dfa4: 0x109dfa4: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_109d960:
-// 0x0109d960: 0x109d960: lw    s3, 0(a1)
+L_109dfa8:
+// 0x0109dfa8: 0x109dfa8: lw    s3, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0109d964: 0x109d964: lw    a2, 0(v1)
+// 0x0109dfac: 0x109dfac: lw    a2, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0109d968: 0x109d968: addiu a1, a1, 4
+// 0x0109dfb0: 0x109dfb0: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x0109d96c: 0x109d96c: beq   s3, zero, 0x109d9ac addu  a0, s3, zero
+// 0x0109dfb4: 0x109dfb4: beq   s3, zero, 0x109dff4 addu  a0, s3, zero
 	ldloc 11
 	ldloc 11
 	stloc.1
-	brfalse L_109d9ac
+	brfalse L_109dff4
 // --- basic block ---
-// 0x0109d974: 0x109d974: lb    v0, 0(s3)
+// 0x0109dfbc: 0x109dfbc: lb    v0, 0(s3)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109d978: 0x109d978: sll   zero, zero, 0
-// 0x0109d97c: 0x109d97c: beq   v0, zero, 0x109d9ac addiu v1, v1, 4
+// 0x0109dfc0: 0x109dfc0: sll   zero, zero, 0
+// 0x0109dfc4: 0x109dfc4: beq   v0, zero, 0x109dff4 addiu v1, v1, 4
 	ldloc 5
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	brfalse L_109d9ac
+	brfalse L_109dff4
 // --- basic block ---
-// 0x0109d984: 0x109d984: sw    v1, 192(sp)
+// 0x0109dfcc: 0x109dfcc: sw    v1, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6476,7 +6476,7 @@ L_109d960:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109d988: 0x109d988: sw    a1, 196(sp)
+// 0x0109dfd0: 0x109dfd0: sw    a1, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6485,7 +6485,7 @@ L_109d960:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109d98c: 0x109d98c: jal   0x10384b0 sw    a2, 200(sp)
+// 0x0109dfd4: 0x109dfd4: jal   0x10384c0 sw    a2, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6497,17 +6497,17 @@ L_109d960:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl41::utf8_strlen_10384b0(int32,int32,int32)
+	call int32 Cibyl41::utf8_strlen_10384c0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109d994: 0x109d994: slti  v0, v0, 25
+// 0x0109dfdc: 0x109dfdc: slti  v0, v0, 25
 	ldloc 5
 	ldc.i4.s 25
 	clt
 	stloc 5
-// 0x0109d998: 0x109d998: lw    v1, 192(sp)
+// 0x0109dfe0: 0x109dfe0: lw    v1, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6516,7 +6516,7 @@ L_109d960:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109d99c: 0x109d99c: lw    a1, 196(sp)
+// 0x0109dfe4: 0x109dfe4: lw    a1, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6525,7 +6525,7 @@ L_109d960:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109d9a0: 0x109d9a0: lw    a2, 200(sp)
+// 0x0109dfe8: 0x109dfe8: lw    a2, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6534,37 +6534,37 @@ L_109d960:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109d9a4: 0x109d9a4: bne   v0, zero, 0x109d9dc sll   zero, zero, 0
+// 0x0109dfec: 0x109dfec: bne   v0, zero, 0x109e024 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109d9dc
+	brtrue L_109e024
 // --- basic block ---
-L_109d9ac:
-// 0x0109d9ac: 0x109d9ac: lui   a1, 0x20000
+L_109dff4:
+// 0x0109dff4: 0x109dff4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d9b0: 0x109d9b0: lui   a3, 0x20000
+// 0x0109dff8: 0x109dff8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109d9b4: 0x109d9b4: addiu v0, zero, 24
+// 0x0109dffc: 0x109dffc: addiu v0, zero, 24
 	ldc.i4.s 24
 	stloc 5
-// 0x0109d9b8: 0x109d9b8: addiu a1, a1, -2404
+// 0x0109e000: 0x109e000: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109d9bc: 0x109d9bc: addiu a3, a3, -1752
+// 0x0109e004: 0x109e004: addiu a3, a3, -1288
 	ldloc 4
-	ldc.i4 -1752
+	ldc.i4 -1288
 	add
 	stloc 4
-// 0x0109d9c0: 0x109d9c0: addiu a0, zero, 4
+// 0x0109e008: 0x109e008: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109d9c4: 0x109d9c4: addiu a2, zero, 714
+// 0x0109e00c: 0x109e00c: addiu a2, zero, 714
 	ldc.i4 714
 	stloc.3
-// 0x0109d9c8: 0x109d9c8: sw    s1, 16(sp)
+// 0x0109e010: 0x109e010: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6573,7 +6573,7 @@ L_109d9ac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109d9cc: 0x109d9cc: sw    s2, 20(sp)
+// 0x0109e014: 0x109e014: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6582,7 +6582,7 @@ L_109d9ac:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109d9d0: 0x109d9d0: sw    s3, 24(sp)
+// 0x0109e018: 0x109e018: sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6591,7 +6591,7 @@ L_109d9ac:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109d9d4: 0x109d9d4: j	 0x109d944 sw    v0, 28(sp)
+// 0x0109e01c: 0x109e01c: j	 0x109df8c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6600,45 +6600,45 @@ L_109d9ac:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109d944
+	br L_109df8c
 // --- basic block ---
-L_109d9dc:
-// 0x0109d9dc: 0x109d9dc: bne   a2, zero, 0x109da18 addiu s2, s2, 1
+L_109e024:
+// 0x0109e024: 0x109e024: bne   a2, zero, 0x109e060 addiu s2, s2, 1
 	ldloc.3
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	brtrue L_109da18
+	brtrue L_109e060
 // --- basic block ---
-// 0x0109d9e4: 0x109d9e4: addiu s2, s2, -1
+// 0x0109e02c: 0x109e02c: addiu s2, s2, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0109d9e8: 0x109d9e8: lui   a1, 0x20000
+// 0x0109e030: 0x109e030: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109d9ec: 0x109d9ec: lui   a3, 0x20000
+// 0x0109e034: 0x109e034: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109d9f0: 0x109d9f0: addiu a1, a1, -2404
+// 0x0109e038: 0x109e038: addiu a1, a1, -1940
 	ldloc.2
-	ldc.i4 -2404
+	ldc.i4 -1940
 	add
 	stloc.2
-// 0x0109d9f4: 0x109d9f4: addiu a3, a3, -1672
+// 0x0109e03c: 0x109e03c: addiu a3, a3, -1208
 	ldloc 4
-	ldc.i4 -1672
+	ldc.i4 -1208
 	add
 	stloc 4
-// 0x0109d9f8: 0x109d9f8: addiu a0, zero, 4
+// 0x0109e040: 0x109e040: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109d9fc: 0x109d9fc: addiu a2, zero, 723
+// 0x0109e044: 0x109e044: addiu a2, zero, 723
 	ldc.i4 723
 	stloc.3
-// 0x0109da00: 0x109da00: sw    s1, 16(sp)
+// 0x0109e048: 0x109e048: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6647,7 +6647,7 @@ L_109d9dc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109da04: 0x109da04: sw    s2, 20(sp)
+// 0x0109e04c: 0x109e04c: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6656,8 +6656,8 @@ L_109d9dc:
 	add
 	ldloc 10
 	stelem.i4
-L_109da08:
-// 0x0109da08: 0x109da08: jal   0x100449c sll   zero, zero, 0
+L_109e050:
+// 0x0109e050: 0x109e050: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6668,25 +6668,25 @@ L_109da08:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109da10: 0x109da10: j	 0x109dd54 addu  v0, zero, zero
+// 0x0109e058: 0x109e058: j	 0x109e39c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_109dd54
+	br L_109e39c
 // --- basic block ---
-L_109da18:
-// 0x0109da18: 0x109da18: slt   v0, s2, s0
+L_109e060:
+// 0x0109e060: 0x109e060: slt   v0, s2, s0
 	ldloc 10
 	ldloc 9
 	clt
 	stloc 5
-// 0x0109da1c: 0x109da1c: sw    s3, 0(s8)
+// 0x0109e064: 0x109e064: sw    s3, 0(s8)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x0109da20: 0x109da20: sw    a2, 4(s8)
+// 0x0109e068: 0x109e068: sw    a2, 4(s8)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -6695,30 +6695,30 @@ L_109da18:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0109da24: 0x109da24: bne   v0, zero, 0x109d960 addiu s8, s8, 12
+// 0x0109e06c: 0x109e06c: bne   v0, zero, 0x109dfa8 addiu s8, s8, 12
 	ldloc 5
 	ldloc 15
 	ldc.i4.s 12
 	add
 	stloc 15
-	brtrue L_109d960
+	brtrue L_109dfa8
 // --- basic block ---
-// 0x0109da2c: 0x109da2c: lui   v0, 0x80000
+// 0x0109e074: 0x109e074: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109da30: 0x109da30: lw    v0, 9988(v0)
+// 0x0109e078: 0x109e078: lw    v0, 10452(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2497
+	ldc.i4 2613
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109da34: 0x109da34: lui   a2, 0x10a0000
+// 0x0109e07c: 0x109e07c: lui   a2, 0x10a0000
 	ldc.i4 17432576
 	stloc.3
-// 0x0109da38: 0x109da38: sw    v0, 168(sp)
+// 0x0109e080: 0x109e080: sw    v0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6727,7 +6727,7 @@ L_109da18:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109da3c: 0x109da3c: lw    v0, 264(sp)
+// 0x0109e084: 0x109e084: lw    v0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6736,10 +6736,10 @@ L_109da18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109da40: 0x109da40: lui   a3, 0x400000
+// 0x0109e088: 0x109e088: lui   a3, 0x400000
 	ldc.i4 4194304
 	stloc 4
-// 0x0109da44: 0x109da44: sw    v0, 68(sp)
+// 0x0109e08c: 0x109e08c: sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6748,7 +6748,7 @@ L_109da18:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109da48: 0x109da48: lw    v0, 268(sp)
+// 0x0109e090: 0x109e090: lw    v0, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6757,23 +6757,23 @@ L_109da18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109da4c: 0x109da4c: addu  a1, s1, zero
+// 0x0109e094: 0x109e094: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0109da50: 0x109da50: addu  a0, s5, zero
+// 0x0109e098: 0x109e098: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x0109da54: 0x109da54: addiu a2, a2, -13368
+// 0x0109e09c: 0x109e09c: addiu a2, a2, -11760
 	ldloc.3
-	ldc.i4 -13368
+	ldc.i4 -11760
 	add
 	stloc.3
-// 0x0109da58: 0x109da58: ori   a3, a3, 8209
+// 0x0109e0a0: 0x109e0a0: ori   a3, a3, 8209
 	ldloc 4
 	ldc.i4 8209
 	or
 	stloc 4
-// 0x0109da5c: 0x109da5c: sw    s4, 164(sp)
+// 0x0109e0a4: 0x109e0a4: sw    s4, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6782,7 +6782,7 @@ L_109da18:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109da60: 0x109da60: sw    s7, 60(sp)
+// 0x0109e0a8: 0x109e0a8: sw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6791,7 +6791,7 @@ L_109da18:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109da64: 0x109da64: sw    s6, 64(sp)
+// 0x0109e0ac: 0x109e0ac: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6800,7 +6800,7 @@ L_109da18:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109da68: 0x109da68: sw    v0, 72(sp)
+// 0x0109e0b0: 0x109e0b0: sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6809,7 +6809,7 @@ L_109da18:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109da6c: 0x109da6c: sw    s0, 160(sp)
+// 0x0109e0b4: 0x109e0b4: sw    s0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6818,7 +6818,7 @@ L_109da18:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109da70: 0x109da70: jal   0x1095a08 sw    s5, 48(sp)
+// 0x0109e0b8: 0x109e0b8: jal   0x1096050 sw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6832,29 +6832,29 @@ L_109da18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109da78: 0x109da78: lui   a0, 0x20000
+// 0x0109e0c0: 0x109e0c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109da7c: 0x109da7c: addiu a3, zero, -2
+// 0x0109e0c4: 0x109e0c4: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x0109da80: 0x109da80: addiu a0, a0, -1896
+// 0x0109e0c8: 0x109e0c8: addiu a0, a0, -1432
 	ldloc.1
-	ldc.i4 -1896
+	ldc.i4 -1432
 	add
 	stloc.1
-// 0x0109da84: 0x109da84: addu  a1, zero, zero
+// 0x0109e0cc: 0x109e0cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109da88: 0x109da88: addiu a2, zero, -2
+// 0x0109e0d0: 0x109e0d0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0109da8c: 0x109da8c: sw    v0, 52(sp)
+// 0x0109e0d4: 0x109e0d4: sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6863,10 +6863,10 @@ L_109da18:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109da90: 0x109da90: addiu v0, zero, 4096
+// 0x0109e0d8: 0x109e0d8: addiu v0, zero, 4096
 	ldc.i4 4096
 	stloc 5
-// 0x0109da94: 0x109da94: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0109e0dc: 0x109e0dc: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6880,21 +6880,21 @@ L_109da18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109da9c: 0x109da9c: addu  a0, v0, zero
+// 0x0109e0e4: 0x109e0e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109daa0: 0x109daa0: addu  a1, zero, zero
+// 0x0109e0e8: 0x109e0e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109daa4: 0x109daa4: addu  a2, zero, zero
+// 0x0109e0ec: 0x109e0ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109daa8: 0x109daa8: jal   0x1098fe0 sw    v0, 56(sp)
+// 0x0109e0f0: 0x109e0f0: jal   0x1099628 sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6906,9 +6906,9 @@ L_109da18:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109dab0: 0x109dab0: lw    v0, 56(sp)
+// 0x0109e0f8: 0x109e0f8: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6917,15 +6917,15 @@ L_109da18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109dab4: 0x109dab4: lui   v1, 0x10a0000
+// 0x0109e0fc: 0x109e0fc: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 7
-// 0x0109dab8: 0x109dab8: addiu v1, v1, -10524
+// 0x0109e100: 0x109e100: addiu v1, v1, -8916
 	ldloc 7
-	ldc.i4 -10524
+	ldc.i4 -8916
 	add
 	stloc 7
-// 0x0109dabc: 0x109dabc: jal   0x101cc04 sw    v1, 216(v0)
+// 0x0109e104: 0x109e104: jal   0x101cc14 sw    v1, 216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6934,76 +6934,76 @@ L_109da18:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl21::roadmap_lang_rtl_101cc04()
+	call int32 Cibyl21::roadmap_lang_rtl_101cc14()
 	stloc 5
 // --- basic block ---
-// 0x0109dac4: 0x109dac4: lui   v1, 0x80000
+// 0x0109e10c: 0x109e10c: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109dac8: 0x109dac8: sw    v0, 9976(v1)
+// 0x0109e110: 0x109e110: sw    v0, 10440(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2494
+	ldc.i4 2610
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109dacc: 0x109dacc: lui   v1, 0x0
+// 0x0109e114: 0x109e114: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0109dad0: 0x109dad0: addiu v1, v1, 17592
+// 0x0109e118: 0x109e118: addiu v1, v1, 17592
 	ldloc 7
 	ldc.i4 17592
 	add
 	stloc 7
-// 0x0109dad4: 0x109dad4: lui   s1, 0x0
+// 0x0109e11c: 0x109e11c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0109dad8: 0x109dad8: addiu s1, s1, 17576
+// 0x0109e120: 0x109e120: addiu s1, s1, 17576
 	ldloc 8
 	ldc.i4 17576
 	add
 	stloc 8
-// 0x0109dadc: 0x109dadc: beq   v0, zero, 0x109daec addu  s2, v1, zero
+// 0x0109e124: 0x109e124: beq   v0, zero, 0x109e134 addu  s2, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc 10
-	brfalse L_109daec
+	brfalse L_109e134
 // --- basic block ---
-// 0x0109dae4: 0x109dae4: addu  s2, s1, zero
+// 0x0109e12c: 0x109e12c: addu  s2, s1, zero
 	ldloc 8
 	stloc 10
-// 0x0109dae8: 0x109dae8: addu  s1, v1, zero
+// 0x0109e130: 0x109e130: addu  s1, v1, zero
 	ldloc 7
 	stloc 8
-L_109daec:
-// 0x0109daec: 0x109daec: lui   a0, 0x20000
+L_109e134:
+// 0x0109e134: 0x109e134: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109daf0: 0x109daf0: lui   a1, 0x10000
+// 0x0109e138: 0x109e138: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0109daf4: 0x109daf4: addiu a3, zero, -1
+// 0x0109e13c: 0x109e13c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0109daf8: 0x109daf8: addiu a0, a0, -1632
+// 0x0109e140: 0x109e140: addiu a0, a0, -1168
 	ldloc.1
-	ldc.i4 -1632
+	ldc.i4 -1168
 	add
 	stloc.1
-// 0x0109dafc: 0x109dafc: addiu a1, a1, 18500
+// 0x0109e144: 0x109e144: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109db00: 0x109db00: addiu a2, zero, -2
+// 0x0109e148: 0x109e148: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0109db04: 0x109db04: addiu v0, zero, 4104
+// 0x0109e14c: 0x109e14c: addiu v0, zero, 4104
 	ldc.i4 4104
 	stloc 5
-// 0x0109db08: 0x109db08: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0109e150: 0x109e150: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7017,21 +7017,21 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109db10: 0x109db10: addu  a0, v0, zero
+// 0x0109e158: 0x109e158: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109db14: 0x109db14: addu  a1, zero, zero
+// 0x0109e15c: 0x109e15c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109db18: 0x109db18: addu  a2, zero, zero
+// 0x0109e160: 0x109e160: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109db1c: 0x109db1c: jal   0x1098fe0 sw    v0, 32(sp)
+// 0x0109e164: 0x109e164: jal   0x1099628 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7043,9 +7043,9 @@ L_109daec:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109db24: 0x109db24: lw    v0, 32(sp)
+// 0x0109e16c: 0x109e16c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7054,18 +7054,18 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109db28: 0x109db28: lui   v1, 0x10a0000
+// 0x0109e170: 0x109e170: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 7
-// 0x0109db2c: 0x109db2c: addiu v1, v1, -12388
+// 0x0109e174: 0x109e174: addiu v1, v1, -10780
 	ldloc 7
-	ldc.i4 -12388
+	ldc.i4 -10780
 	add
 	stloc 7
-// 0x0109db30: 0x109db30: lui   a0, 0x20000
+// 0x0109e178: 0x109e178: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109db34: 0x109db34: sw    v1, 184(v0)
+// 0x0109e17c: 0x109e17c: sw    v1, 184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7074,15 +7074,15 @@ L_109daec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109db38: 0x109db38: addiu a0, a0, -2172
+// 0x0109e180: 0x109e180: addiu a0, a0, -1708
 	ldloc.1
-	ldc.i4 -2172
+	ldc.i4 -1708
 	add
 	stloc.1
-// 0x0109db3c: 0x109db3c: addu  a1, zero, zero
+// 0x0109e184: 0x109e184: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109db40: 0x109db40: jal   0x109f054 addu  a2, zero, zero
+// 0x0109e188: 0x109e188: jal   0x109f69c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -7090,26 +7090,26 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_icon_create_109f054(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_icon_create_109f69c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109db48: 0x109db48: lui   a0, 0x20000
+// 0x0109e190: 0x109e190: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109db4c: 0x109db4c: addiu a0, a0, -2236
+// 0x0109e194: 0x109e194: addiu a0, a0, -1772
 	ldloc.1
-	ldc.i4 -2236
+	ldc.i4 -1772
 	add
 	stloc.1
-// 0x0109db50: 0x109db50: addiu a1, zero, 1
+// 0x0109e198: 0x109e198: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109db54: 0x109db54: addu  a2, zero, zero
+// 0x0109e19c: 0x109e19c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109db58: 0x109db58: jal   0x109f054 addu  s5, v0, zero
+// 0x0109e1a0: 0x109e1a0: jal   0x109f69c addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -7117,26 +7117,26 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_icon_create_109f054(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_icon_create_109f69c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109db60: 0x109db60: lui   a0, 0x20000
+// 0x0109e1a8: 0x109e1a8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109db64: 0x109db64: addiu a0, a0, -2208
+// 0x0109e1ac: 0x109e1ac: addiu a0, a0, -1744
 	ldloc.1
-	ldc.i4 -2208
+	ldc.i4 -1744
 	add
 	stloc.1
-// 0x0109db68: 0x109db68: addiu a1, zero, 1
+// 0x0109e1b0: 0x109e1b0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109db6c: 0x109db6c: addu  a2, zero, zero
+// 0x0109e1b4: 0x109e1b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109db70: 0x109db70: jal   0x109f054 addu  s4, v0, zero
+// 0x0109e1b8: 0x109e1b8: jal   0x109f69c addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -7144,26 +7144,26 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_icon_create_109f054(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_icon_create_109f69c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109db78: 0x109db78: lui   a0, 0x20000
+// 0x0109e1c0: 0x109e1c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109db7c: 0x109db7c: addiu a0, a0, -2144
+// 0x0109e1c4: 0x109e1c4: addiu a0, a0, -1680
 	ldloc.1
-	ldc.i4 -2144
+	ldc.i4 -1680
 	add
 	stloc.1
-// 0x0109db80: 0x109db80: addu  a2, zero, zero
+// 0x0109e1c8: 0x109e1c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109db84: 0x109db84: addu  a1, zero, zero
+// 0x0109e1cc: 0x109e1cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109db88: 0x109db88: jal   0x109f054 addu  s3, v0, zero
+// 0x0109e1d0: 0x109e1d0: jal   0x109f69c addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -7171,24 +7171,24 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_icon_create_109f054(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_icon_create_109f69c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109db90: 0x109db90: addu  a1, s2, zero
+// 0x0109e1d8: 0x109e1d8: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0109db94: 0x109db94: addu  a0, s5, zero
+// 0x0109e1dc: 0x109e1dc: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x0109db98: 0x109db98: lui   s2, 0x0
+// 0x0109e1e0: 0x109e1e0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0109db9c: 0x109db9c: addiu a2, zero, 2
+// 0x0109e1e4: 0x109e1e4: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0109dba0: 0x109dba0: jal   0x109ecb4 addu  s6, v0, zero
+// 0x0109e1e8: 0x109e1e8: jal   0x109f2fc addu  s6, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -7196,20 +7196,20 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_icon_set_images_109ecb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_icon_set_images_109f2fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dba8: 0x109dba8: addiu a1, s2, 17608
+// 0x0109e1f0: 0x109e1f0: addiu a1, s2, 17608
 	ldloc 10
 	ldc.i4 17608
 	add
 	stloc.2
-// 0x0109dbac: 0x109dbac: addu  a0, s4, zero
+// 0x0109e1f4: 0x109e1f4: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0109dbb0: 0x109dbb0: jal   0x109ef58 addiu a2, zero, 2
+// 0x0109e1f8: 0x109e1f8: jal   0x109f5a0 addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -7217,20 +7217,20 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_icon_set_wimages_109ef58(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_icon_set_wimages_109f5a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dbb8: 0x109dbb8: addiu a1, s2, 17608
+// 0x0109e200: 0x109e200: addiu a1, s2, 17608
 	ldloc 10
 	ldc.i4 17608
 	add
 	stloc.2
-// 0x0109dbbc: 0x109dbbc: addu  a0, s3, zero
+// 0x0109e204: 0x109e204: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0109dbc0: 0x109dbc0: jal   0x109ef58 addiu a2, zero, 2
+// 0x0109e208: 0x109e208: jal   0x109f5a0 addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -7238,18 +7238,18 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_icon_set_wimages_109ef58(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_icon_set_wimages_109f5a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dbc8: 0x109dbc8: addiu a2, zero, 2
+// 0x0109e210: 0x109e210: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0109dbcc: 0x109dbcc: addu  a1, s1, zero
+// 0x0109e214: 0x109e214: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0109dbd0: 0x109dbd0: jal   0x109ecb4 addu  a0, s6, zero
+// 0x0109e218: 0x109e218: jal   0x109f2fc addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -7257,20 +7257,20 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_icon_set_images_109ecb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_icon_set_images_109f2fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dbd8: 0x109dbd8: lui   a0, 0x10a0000
+// 0x0109e220: 0x109e220: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x0109dbdc: 0x109dbdc: addiu a0, a0, -10884
+// 0x0109e224: 0x109e224: addiu a0, a0, -9276
 	ldloc.1
-	ldc.i4 -10884
+	ldc.i4 -9276
 	add
 	stloc.1
-// 0x0109dbe0: 0x109dbe0: sw    a0, 112(s5)
+// 0x0109e228: 0x109e228: sw    a0, 112(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -7279,26 +7279,26 @@ L_109daec:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109dbe4: 0x109dbe4: lui   v0, 0x10a0000
+// 0x0109e22c: 0x109e22c: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109dbe8: 0x109dbe8: lui   a0, 0x10a0000
+// 0x0109e230: 0x109e230: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x0109dbec: 0x109dbec: addiu v0, v0, -10916
+// 0x0109e234: 0x109e234: addiu v0, v0, -9308
 	ldloc 5
-	ldc.i4 -10916
+	ldc.i4 -9308
 	add
 	stloc 5
-// 0x0109dbf0: 0x109dbf0: addiu a0, a0, -10812
+// 0x0109e238: 0x109e238: addiu a0, a0, -9204
 	ldloc.1
-	ldc.i4 -10812
+	ldc.i4 -9204
 	add
 	stloc.1
-// 0x0109dbf4: 0x109dbf4: lui   v1, 0x10a0000
+// 0x0109e23c: 0x109e23c: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 7
-// 0x0109dbf8: 0x109dbf8: sw    a0, 188(s5)
+// 0x0109e240: 0x109e240: sw    a0, 188(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -7307,12 +7307,12 @@ L_109daec:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109dbfc: 0x109dbfc: addiu v1, v1, -11044
+// 0x0109e244: 0x109e244: addiu v1, v1, -9436
 	ldloc 7
-	ldc.i4 -11044
+	ldc.i4 -9436
 	add
 	stloc 7
-// 0x0109dc00: 0x109dc00: sw    v0, 188(s4)
+// 0x0109e248: 0x109e248: sw    v0, 188(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -7321,7 +7321,7 @@ L_109daec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109dc04: 0x109dc04: sw    v0, 188(s3)
+// 0x0109e24c: 0x109e24c: sw    v0, 188(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7330,10 +7330,10 @@ L_109daec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109dc08: 0x109dc08: lui   v0, 0x10a0000
+// 0x0109e250: 0x109e250: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109dc0c: 0x109dc0c: sw    v1, 112(s4)
+// 0x0109e254: 0x109e254: sw    v1, 112(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -7342,12 +7342,12 @@ L_109daec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109dc10: 0x109dc10: addiu v0, v0, -11076
+// 0x0109e258: 0x109e258: addiu v0, v0, -9468
 	ldloc 5
-	ldc.i4 -11076
+	ldc.i4 -9468
 	add
 	stloc 5
-// 0x0109dc14: 0x109dc14: sw    v1, 112(s3)
+// 0x0109e25c: 0x109e25c: sw    v1, 112(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7356,18 +7356,18 @@ L_109daec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109dc18: 0x109dc18: lui   v1, 0x10a0000
+// 0x0109e260: 0x109e260: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 7
-// 0x0109dc1c: 0x109dc1c: addiu v1, v1, -11156
+// 0x0109e264: 0x109e264: addiu v1, v1, -9548
 	ldloc 7
-	ldc.i4 -11156
+	ldc.i4 -9548
 	add
 	stloc 7
-// 0x0109dc20: 0x109dc20: lui   s1, 0x10a0000
+// 0x0109e268: 0x109e268: lui   s1, 0x10a0000
 	ldc.i4 17432576
 	stloc 8
-// 0x0109dc24: 0x109dc24: sw    v0, 188(s6)
+// 0x0109e26c: 0x109e26c: sw    v0, 188(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7376,10 +7376,10 @@ L_109daec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109dc28: 0x109dc28: addiu v0, zero, 1
+// 0x0109e270: 0x109e270: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109dc2c: 0x109dc2c: sw    v1, 112(s6)
+// 0x0109e274: 0x109e274: sw    v1, 112(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7388,12 +7388,12 @@ L_109daec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109dc30: 0x109dc30: addiu a1, s1, -10348
+// 0x0109e278: 0x109e278: addiu a1, s1, -8740
 	ldloc 8
-	ldc.i4 -10348
+	ldc.i4 -8740
 	add
 	stloc.2
-// 0x0109dc34: 0x109dc34: sw    zero, 20(s4)
+// 0x0109e27c: 0x109e27c: sw    zero, 20(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -7402,10 +7402,10 @@ L_109daec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109dc38: 0x109dc38: addu  a0, s5, zero
+// 0x0109e280: 0x109e280: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x0109dc3c: 0x109dc3c: jal   0x109e8d8 sw    v0, 20(s3)
+// 0x0109e284: 0x109e284: jal   0x109ef20 sw    v0, 20(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7416,49 +7416,49 @@ L_109daec:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109e8d8(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109ef20(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109dc44: 0x109dc44: addiu a1, s1, -10348
+// 0x0109e28c: 0x109e28c: addiu a1, s1, -8740
 	ldloc 8
-	ldc.i4 -10348
+	ldc.i4 -8740
 	add
 	stloc.2
-// 0x0109dc48: 0x109dc48: jal   0x109e8d8 addu  a0, s4, zero
+// 0x0109e290: 0x109e290: jal   0x109ef20 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109e8d8(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109ef20(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109dc50: 0x109dc50: addiu a1, s1, -10348
+// 0x0109e298: 0x109e298: addiu a1, s1, -8740
 	ldloc 8
-	ldc.i4 -10348
+	ldc.i4 -8740
 	add
 	stloc.2
-// 0x0109dc54: 0x109dc54: jal   0x109e8d8 addu  a0, s3, zero
+// 0x0109e29c: 0x109e29c: jal   0x109ef20 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109e8d8(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109ef20(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109dc5c: 0x109dc5c: addiu a1, s1, -10348
+// 0x0109e2a4: 0x109e2a4: addiu a1, s1, -8740
 	ldloc 8
-	ldc.i4 -10348
+	ldc.i4 -8740
 	add
 	stloc.2
-// 0x0109dc60: 0x109dc60: jal   0x109e8d8 addu  a0, s6, zero
+// 0x0109e2a8: 0x109e2a8: jal   0x109ef20 addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109e8d8(int32,int32)
+	call int32 Cibyl118::ssd_icon_set_unhandled_key_press_109ef20(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0109dc68: 0x109dc68: lw    a0, 32(sp)
+// 0x0109e2b0: 0x109e2b0: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7467,17 +7467,17 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109dc6c: 0x109dc6c: jal   0x1098ec4 addu  a1, s5, zero
+// 0x0109e2b4: 0x109e2b4: jal   0x109950c addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dc74: 0x109dc74: lw    a0, 32(sp)
+// 0x0109e2bc: 0x109e2bc: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7486,17 +7486,17 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109dc78: 0x109dc78: jal   0x1098ec4 addu  a1, s4, zero
+// 0x0109e2c0: 0x109e2c0: jal   0x109950c addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dc80: 0x109dc80: lw    a0, 32(sp)
+// 0x0109e2c8: 0x109e2c8: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7505,17 +7505,17 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109dc84: 0x109dc84: jal   0x1098ec4 addu  a1, s3, zero
+// 0x0109e2cc: 0x109e2cc: jal   0x109950c addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dc8c: 0x109dc8c: lw    a0, 32(sp)
+// 0x0109e2d4: 0x109e2d4: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7524,17 +7524,17 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109dc90: 0x109dc90: jal   0x1098ec4 addu  a1, s6, zero
+// 0x0109e2d8: 0x109e2d8: jal   0x109950c addu  a1, s6, zero
 	ldloc 14
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dc98: 0x109dc98: lw    a1, 32(sp)
+// 0x0109e2e0: 0x109e2e0: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7543,7 +7543,7 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109dc9c: 0x109dc9c: lw    a0, 56(sp)
+// 0x0109e2e4: 0x109e2e4: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7552,19 +7552,19 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109dca0: 0x109dca0: jal   0x1098ec4 addiu s1, sp, 32
+// 0x0109e2e8: 0x109e2e8: jal   0x109950c addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dca8: 0x109dca8: lw    s2, 56(sp)
+// 0x0109e2f0: 0x109e2f0: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7573,7 +7573,7 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109dcac: 0x109dcac: jal   0x109cd5c addu  a0, s1, zero
+// 0x0109e2f4: 0x109e2f4: jal   0x109d3a4 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7581,25 +7581,25 @@ L_109daec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_get_active_tab_109cd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_get_active_tab_109d3a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dcb4: 0x109dcb4: addu  a1, v0, zero
+// 0x0109e2fc: 0x109e2fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0109dcb8: 0x109dcb8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x0109e300: 0x109e300: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dcc0: 0x109dcc0: lw    a0, 52(sp)
+// 0x0109e308: 0x109e308: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7608,7 +7608,7 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109dcc4: 0x109dcc4: lw    a1, 56(sp)
+// 0x0109e30c: 0x109e30c: lw    a1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7617,23 +7617,23 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109dcc8: 0x109dcc8: jal   0x1098ec4 sll   zero, zero, 0
+// 0x0109e310: 0x109e310: jal   0x109950c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dcd0: 0x109dcd0: addiu v0, zero, 12
+// 0x0109e318: 0x109e318: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x0109dcd4: 0x109dcd4: mult  s0, v0
+// 0x0109e31c: 0x109e31c: mult  s0, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 18
-// 0x0109dcd8: 0x109dcd8: lw    v0, 56(sp)
+// 0x0109e320: 0x109e320: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7642,16 +7642,16 @@ L_109daec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109dcdc: 0x109dcdc: mflo  lo
+// 0x0109e324: 0x109e324: mflo  lo
 	ldloc 18
 	stloc 9
-// 0x0109dce0: 0x109dce0: addu  s0, s1, s0
+// 0x0109e328: 0x109e328: addu  s0, s1, s0
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-L_109dce4:
-// 0x0109dce4: 0x109dce4: lw    v1, 48(s1)
+L_109e32c:
+// 0x0109e32c: 0x109e32c: lw    v1, 48(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7660,12 +7660,12 @@ L_109dce4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109dce8: 0x109dce8: addiu s1, s1, 12
+// 0x0109e330: 0x109e330: addiu s1, s1, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 8
-// 0x0109dcec: 0x109dcec: bne   s1, s0, 0x109dce4 sw    v0, 4(v1)
+// 0x0109e334: 0x109e334: bne   s1, s0, 0x109e32c sw    v0, 4(v1)
 	ldloc 8
 	ldloc 9
 	ldloc 6
@@ -7676,9 +7676,9 @@ L_109dce4:
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_109dce4
+	bne.un L_109e32c
 // --- basic block ---
-// 0x0109dcf4: 0x109dcf4: jal   0x1000910 addiu a0, zero, 156
+// 0x0109e33c: 0x109e33c: jal   0x1000910 addiu a0, zero, 156
 	ldc.i4 156
 	stloc.1
 	ldloc.0
@@ -7691,21 +7691,21 @@ L_109dce4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dcfc: 0x109dcfc: addiu s1, sp, 32
+// 0x0109e344: 0x109e344: addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
-// 0x0109dd00: 0x109dd00: addu  a1, s1, zero
+// 0x0109e348: 0x109e348: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0109dd04: 0x109dd04: addu  a0, v0, zero
+// 0x0109e34c: 0x109e34c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109dd08: 0x109dd08: addiu a2, zero, 156
+// 0x0109e350: 0x109e350: addiu a2, zero, 156
 	ldc.i4 156
 	stloc.3
-// 0x0109dd0c: 0x109dd0c: jal   0x1001800 addu  s0, v0, zero
+// 0x0109e354: 0x109e354: jal   0x1001800 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -7717,7 +7717,7 @@ L_109dce4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dd14: 0x109dd14: lw    v0, 56(sp)
+// 0x0109e35c: 0x109e35c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7726,10 +7726,10 @@ L_109dce4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109dd18: 0x109dd18: addu  a0, s1, zero
+// 0x0109e360: 0x109e360: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0109dd1c: 0x109dd1c: sw    s0, 116(v0)
+// 0x0109e364: 0x109e364: sw    s0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7738,7 +7738,7 @@ L_109dce4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109dd20: 0x109dd20: jal   0x109d854 lui   s1, 0x80000
+// 0x0109e368: 0x109e368: jal   0x109de9c lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
 	ldloc.0
@@ -7746,36 +7746,36 @@ L_109dce4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::tabcontrol_info_init_109d854(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::tabcontrol_info_init_109de9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dd28: 0x109dd28: lw    v0, 9992(s1)
+// 0x0109e370: 0x109e370: lw    v0, 10456(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2498
+	ldc.i4 2614
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109dd2c: 0x109dd2c: sll   zero, zero, 0
-// 0x0109dd30: 0x109dd30: bne   v0, zero, 0x109dd54 addu  v0, s0, zero
+// 0x0109e374: 0x109e374: sll   zero, zero, 0
+// 0x0109e378: 0x109e378: bne   v0, zero, 0x109e39c addu  v0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc 5
-	brtrue L_109dd54
+	brtrue L_109e39c
 // --- basic block ---
-// 0x0109dd38: 0x109dd38: lui   a0, 0x10a0000
+// 0x0109e380: 0x109e380: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x0109dd3c: 0x109dd3c: addiu a0, a0, -13308
+// 0x0109e384: 0x109e384: addiu a0, a0, -11700
 	ldloc.1
-	ldc.i4 -13308
+	ldc.i4 -11700
 	add
 	stloc.1
-// 0x0109dd40: 0x109dd40: jal   0x10400d8 addu  a1, zero, zero
+// 0x0109e388: 0x109e388: jal   0x10400e8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7783,29 +7783,29 @@ L_109dce4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_events_register_10400d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_events_register_10400e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109dd48: 0x109dd48: addiu v0, zero, 1
+// 0x0109e390: 0x109e390: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109dd4c: 0x109dd4c: sw    v0, 9992(s1)
+// 0x0109e394: 0x109e394: sw    v0, 10456(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2498
+	ldc.i4 2614
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109dd50: 0x109dd50: addu  v0, s0, zero
+// 0x0109e398: 0x109e398: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-L_109dd54:
-// 0x0109dd54: 0x109dd54: lw    ra, 244(sp)
-// 0x0109dd58: 0x109dd58: lw    s8, 240(sp)
+L_109e39c:
+// 0x0109e39c: 0x109e39c: lw    ra, 244(sp)
+// 0x0109e3a0: 0x109e3a0: lw    s8, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7814,7 +7814,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109dd5c: 0x109dd5c: lw    s7, 236(sp)
+// 0x0109e3a4: 0x109e3a4: lw    s7, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7823,7 +7823,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109dd60: 0x109dd60: lw    s6, 232(sp)
+// 0x0109e3a8: 0x109e3a8: lw    s6, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7832,7 +7832,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109dd64: 0x109dd64: lw    s5, 228(sp)
+// 0x0109e3ac: 0x109e3ac: lw    s5, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7841,7 +7841,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109dd68: 0x109dd68: lw    s4, 224(sp)
+// 0x0109e3b0: 0x109e3b0: lw    s4, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7850,7 +7850,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109dd6c: 0x109dd6c: lw    s3, 220(sp)
+// 0x0109e3b4: 0x109e3b4: lw    s3, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7859,7 +7859,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109dd70: 0x109dd70: lw    s2, 216(sp)
+// 0x0109e3b8: 0x109e3b8: lw    s2, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7868,7 +7868,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109dd74: 0x109dd74: lw    s1, 212(sp)
+// 0x0109e3bc: 0x109e3bc: lw    s1, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7877,7 +7877,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109dd78: 0x109dd78: lw    s0, 208(sp)
+// 0x0109e3c0: 0x109e3c0: lw    s0, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7886,7 +7886,7 @@ L_109dd54:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109dd7c: 0x109dd7c: jr    ra addiu sp, sp, 248
+// 0x0109e3c4: 0x109e3c4: jr    ra addiu sp, sp, 248
 	ldloc.0
 	ldc.i4 248
 	add
diff --git a/converted/Cibyl118.j b/converted/Cibyl118.j
index e89d044..b690629 100644
--- a/converted/Cibyl118.j
+++ b/converted/Cibyl118.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl118::.ctor
 
-.method public static int32 ssd_bitmap_remove_overlays_109dde0(int32)
+.method public static int32 ssd_bitmap_remove_overlays_109e428(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -61,7 +61,7 @@
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109dde0: 0x109dde0: lw    v0, 164(a0)
+// 0x0109e428: 0x109e428: lw    v0, 164(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -70,7 +70,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109dde4: 0x109dde4: jr    ra sw    zero, 260(v0)
+// 0x0109e42c: 0x109e42c: jr    ra sw    zero, 260(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -84,7 +84,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_bitmap_add_overlay_109ddec(int32,int32,int32,int32,int32)
+.method public static int32 ssd_bitmap_add_overlay_109e434(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -125,12 +125,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ddec: 0x109ddec: addiu sp, sp, -40
+// 0x0109e434: 0x109e434: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109ddf0: 0x109ddf0: sw    s0, 28(sp)
+// 0x0109e438: 0x109e438: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109ddf4: 0x109ddf4: lw    s0, 164(a0)
+// 0x0109e43c: 0x109e43c: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -148,7 +148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ddf8: 0x109ddf8: sw    s1, 32(sp)
+// 0x0109e440: 0x109e440: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -157,7 +157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109ddfc: 0x109ddfc: lw    s1, 260(s0)
+// 0x0109e444: 0x109e444: lw    s1, 260(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -166,18 +166,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109de00: 0x109de00: addiu v0, zero, 3
+// 0x0109e448: 0x109e448: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x0109de04: 0x109de04: beq   s1, v0, 0x109de44 sw    ra, 36(sp)
+// 0x0109e44c: 0x109e44c: beq   s1, v0, 0x109e48c sw    ra, 36(sp)
 	ldloc 8
 	ldloc 6
-	beq  L_109de44
+	beq  L_109e48c
 // --- basic block ---
-// 0x0109de0c: 0x109de0c: addu  a0, a1, zero
+// 0x0109e454: 0x109e454: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0109de10: 0x109de10: jal   0x1001b48 sw    a1, 16(sp)
+// 0x0109e458: 0x109e458: jal   0x1001b48 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -192,12 +192,12 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0109de18: 0x109de18: sltiu v0, v0, 65
+// 0x0109e460: 0x109e460: sltiu v0, v0, 65
 	ldloc 6
 	ldc.i4.s 65
 	clt.un
 	stloc 6
-// 0x0109de1c: 0x109de1c: lw    a1, 16(sp)
+// 0x0109e464: 0x109e464: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -206,20 +206,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109de20: 0x109de20: beq   v0, zero, 0x109de44 sll   s1, s1, 6
+// 0x0109e468: 0x109e468: beq   v0, zero, 0x109e48c sll   s1, s1, 6
 	ldloc 6
 	ldloc 8
 	ldc.i4.6
 	shl
 	stloc 8
-	brfalse L_109de44
+	brfalse L_109e48c
 // --- basic block ---
-// 0x0109de28: 0x109de28: addiu a0, s0, 64
+// 0x0109e470: 0x109e470: addiu a0, s0, 64
 	ldloc 7
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x0109de2c: 0x109de2c: jal   0x1001b68 addu  a0, a0, s1
+// 0x0109e474: 0x109e474: jal   0x1001b68 addu  a0, a0, s1
 	ldloc.1
 	ldloc 8
 	add
@@ -231,7 +231,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0109de34: 0x109de34: lw    v0, 260(s0)
+// 0x0109e47c: 0x109e47c: lw    v0, 260(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -240,13 +240,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109de38: 0x109de38: sll   zero, zero, 0
-// 0x0109de3c: 0x109de3c: addiu v0, v0, 1
+// 0x0109e480: 0x109e480: sll   zero, zero, 0
+// 0x0109e484: 0x109e484: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0109de40: 0x109de40: sw    v0, 260(s0)
+// 0x0109e488: 0x109e488: sw    v0, 260(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -255,9 +255,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_109de44:
-// 0x0109de44: 0x109de44: lw    ra, 36(sp)
-// 0x0109de48: 0x109de48: lw    s1, 32(sp)
+L_109e48c:
+// 0x0109e48c: 0x109e48c: lw    ra, 36(sp)
+// 0x0109e490: 0x109e490: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -266,7 +266,7 @@ L_109de44:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109de4c: 0x109de4c: lw    s0, 28(sp)
+// 0x0109e494: 0x109e494: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -275,7 +275,7 @@ L_109de44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109de50: 0x109de50: jr    ra addiu sp, sp, 40
+// 0x0109e498: 0x109e498: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -287,7 +287,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 close_splash_109de58(int32,int32,int32,int32,int32)
+.method public static int32 close_splash_109e4a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -322,18 +322,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109de58: 0x109de58: lui   a0, 0x10a0000
+// 0x0109e4a0: 0x109e4a0: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x0109de5c: 0x109de5c: addiu sp, sp, -24
+// 0x0109e4a4: 0x109e4a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109de60: 0x109de60: sw    ra, 20(sp)
-// 0x0109de64: 0x109de64: jal   0x104fd00 addiu a0, a0, -8616
+// 0x0109e4a8: 0x109e4a8: sw    ra, 20(sp)
+// 0x0109e4ac: 0x109e4ac: jal   0x104fd10 addiu a0, a0, -7008
 	ldloc.1
-	ldc.i4 -8616
+	ldc.i4 -7008
 	add
 	stloc.1
 	ldloc.0
@@ -341,20 +341,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109de6c: 0x109de6c: lui   a0, 0x20000
+// 0x0109e4b4: 0x109e4b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109de70: 0x109de70: addiu a0, a0, -1368
+// 0x0109e4b8: 0x109e4b8: addiu a0, a0, -904
 	ldloc.1
-	ldc.i4 -1368
+	ldc.i4 -904
 	add
 	stloc.1
-// 0x0109de74: 0x109de74: jal   0x1094884 addiu a1, zero, 1
+// 0x0109e4bc: 0x109e4bc: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -362,25 +362,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109de7c: 0x109de7c: jal   0x1021900 sll   zero, zero, 0
+// 0x0109e4c4: 0x109e4c4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109de84: 0x109de84: lw    ra, 20(sp)
-// 0x0109de88: 0x109de88: sll   zero, zero, 0
-// 0x0109de8c: 0x109de8c: jr    ra addiu sp, sp, 24
+// 0x0109e4cc: 0x109e4cc: lw    ra, 20(sp)
+// 0x0109e4d0: 0x109e4d0: sll   zero, zero, 0
+// 0x0109e4d4: 0x109e4d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -392,7 +392,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_bitmap_name_109de94(int32,int32,int32,int32,int32)
+.method public static int32 set_bitmap_name_109e4dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -433,12 +433,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109de94: 0x109de94: addiu sp, sp, -40
+// 0x0109e4dc: 0x109e4dc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109de98: 0x109de98: sw    s1, 32(sp)
+// 0x0109e4e0: 0x109e4e0: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -447,13 +447,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109de9c: 0x109de9c: addu  s1, a0, zero
+// 0x0109e4e4: 0x109e4e4: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0109dea0: 0x109dea0: addu  a0, a1, zero
+// 0x0109e4e8: 0x109e4e8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0109dea4: 0x109dea4: sw    s0, 28(sp)
+// 0x0109e4ec: 0x109e4ec: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -462,8 +462,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109dea8: 0x109dea8: sw    ra, 36(sp)
-// 0x0109deac: 0x109deac: jal   0x1001b48 addu  s0, a1, zero
+// 0x0109e4f0: 0x109e4f0: sw    ra, 36(sp)
+// 0x0109e4f4: 0x109e4f4: jal   0x1001b48 addu  s0, a1, zero
 	ldloc.2
 	stloc 7
 	ldloc.1
@@ -472,21 +472,21 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109deb4: 0x109deb4: sltiu v0, v0, 65
+// 0x0109e4fc: 0x109e4fc: sltiu v0, v0, 65
 	ldloc 5
 	ldc.i4.s 65
 	clt.un
 	stloc 5
-// 0x0109deb8: 0x109deb8: beq   v0, zero, 0x109ded8 lui   a1, 0x20000
+// 0x0109e500: 0x109e500: beq   v0, zero, 0x109e520 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_109ded8
+	brfalse L_109e520
 // --- basic block ---
-// 0x0109dec0: 0x109dec0: addu  a1, s0, zero
+// 0x0109e508: 0x109e508: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0109dec4: 0x109dec4: jal   0x1001b68 addu  a0, s1, zero
+// 0x0109e50c: 0x109e50c: jal   0x1001b68 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -496,10 +496,10 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109decc: 0x109decc: addiu v0, zero, -1
+// 0x0109e514: 0x109e514: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109ded0: 0x109ded0: j	 0x109defc sw    v0, 264(s1)
+// 0x0109e518: 0x109e518: j	 0x109e544 sw    v0, 264(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -508,32 +508,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109defc
+	br L_109e544
 // --- basic block ---
-L_109ded8:
-// 0x0109ded8: 0x109ded8: lui   a3, 0x20000
+L_109e520:
+// 0x0109e520: 0x109e520: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109dedc: 0x109dedc: addiu v0, zero, 64
+// 0x0109e524: 0x109e524: addiu v0, zero, 64
 	ldc.i4.s 64
 	stloc 5
-// 0x0109dee0: 0x109dee0: addiu a1, a1, -1352
+// 0x0109e528: 0x109e528: addiu a1, a1, -888
 	ldloc.2
-	ldc.i4 -1352
+	ldc.i4 -888
 	add
 	stloc.2
-// 0x0109dee4: 0x109dee4: addiu a3, a3, -3840
+// 0x0109e52c: 0x109e52c: addiu a3, a3, -3376
 	ldloc 4
-	ldc.i4 -3840
+	ldc.i4 -3376
 	add
 	stloc 4
-// 0x0109dee8: 0x109dee8: addiu a0, zero, 4
+// 0x0109e530: 0x109e530: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109deec: 0x109deec: addiu a2, zero, 143
+// 0x0109e534: 0x109e534: addiu a2, zero, 143
 	ldc.i4 143
 	stloc.3
-// 0x0109def0: 0x109def0: sw    s0, 16(sp)
+// 0x0109e538: 0x109e538: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -542,7 +542,7 @@ L_109ded8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109def4: 0x109def4: jal   0x100449c sw    v0, 20(sp)
+// 0x0109e53c: 0x109e53c: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -561,9 +561,9 @@ L_109ded8:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_109defc:
-// 0x0109defc: 0x109defc: lw    ra, 36(sp)
-// 0x0109df00: 0x109df00: lw    s1, 32(sp)
+L_109e544:
+// 0x0109e544: 0x109e544: lw    ra, 36(sp)
+// 0x0109e548: 0x109e548: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -572,7 +572,7 @@ L_109defc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109df04: 0x109df04: lw    s0, 28(sp)
+// 0x0109e54c: 0x109e54c: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -581,7 +581,7 @@ L_109defc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109df08: 0x109df08: jr    ra addiu sp, sp, 40
+// 0x0109e550: 0x109e550: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -593,7 +593,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+.method public static int32 ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -631,12 +631,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109df10: 0x109df10: addiu sp, sp, -24
+// 0x0109e558: 0x109e558: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109df14: 0x109df14: sw    s0, 16(sp)
+// 0x0109e55c: 0x109e55c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -645,7 +645,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109df18: 0x109df18: lw    s0, 164(a0)
+// 0x0109e560: 0x109e560: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -654,8 +654,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109df1c: 0x109df1c: sw    ra, 20(sp)
-// 0x0109df20: 0x109df20: jal   0x109de94 addu  a0, s0, zero
+// 0x0109e564: 0x109e564: sw    ra, 20(sp)
+// 0x0109e568: 0x109e568: jal   0x109e4dc addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -663,13 +663,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::set_bitmap_name_109de94(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::set_bitmap_name_109e4dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109df28: 0x109df28: lw    ra, 20(sp)
-// 0x0109df2c: 0x109df2c: sw    zero, 256(s0)
+// 0x0109e570: 0x109e570: lw    ra, 20(sp)
+// 0x0109e574: 0x109e574: sw    zero, 256(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -678,7 +678,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109df30: 0x109df30: lw    s0, 16(sp)
+// 0x0109e578: 0x109e578: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -687,7 +687,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109df34: 0x109df34: jr    ra addiu sp, sp, 24
+// 0x0109e57c: 0x109e57c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -699,7 +699,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_bitmap_image_update_109df3c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_bitmap_image_update_109e584(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -740,12 +740,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109df3c: 0x109df3c: addiu sp, sp, -32
+// 0x0109e584: 0x109e584: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109df40: 0x109df40: sw    s0, 20(sp)
+// 0x0109e588: 0x109e588: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -754,7 +754,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109df44: 0x109df44: lw    s0, 164(a0)
+// 0x0109e58c: 0x109e58c: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -763,7 +763,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109df48: 0x109df48: sw    s1, 24(sp)
+// 0x0109e590: 0x109e590: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -772,16 +772,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109df4c: 0x109df4c: addiu v0, zero, -1
+// 0x0109e594: 0x109e594: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0109df50: 0x109df50: addu  s1, a1, zero
+// 0x0109e598: 0x109e598: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0109df54: 0x109df54: lui   a1, 0x10000
+// 0x0109e59c: 0x109e59c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0109df58: 0x109df58: sw    v0, 268(s0)
+// 0x0109e5a0: 0x109e5a0: sw    v0, 268(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -790,7 +790,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109df5c: 0x109df5c: sw    zero, 256(s0)
+// 0x0109e5a4: 0x109e5a4: sw    zero, 256(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -799,7 +799,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109df60: 0x109df60: sw    v0, 264(s0)
+// 0x0109e5a8: 0x109e5a8: sw    v0, 264(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -808,7 +808,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109df64: 0x109df64: sw    zero, 260(s0)
+// 0x0109e5ac: 0x109e5ac: sw    zero, 260(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -817,13 +817,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109df68: 0x109df68: addu  a0, s0, zero
+// 0x0109e5b0: 0x109e5b0: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x0109df6c: 0x109df6c: sw    ra, 28(sp)
-// 0x0109df70: 0x109df70: jal   0x109de94 addiu a1, a1, 18500
+// 0x0109e5b4: 0x109e5b4: sw    ra, 28(sp)
+// 0x0109e5b8: 0x109e5b8: jal   0x109e4dc addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -831,13 +831,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::set_bitmap_name_109de94(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::set_bitmap_name_109e4dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0109df78: 0x109df78: lw    ra, 28(sp)
-// 0x0109df7c: 0x109df7c: sw    s1, 256(s0)
+// 0x0109e5c0: 0x109e5c0: lw    ra, 28(sp)
+// 0x0109e5c4: 0x109e5c4: sw    s1, 256(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -846,7 +846,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109df80: 0x109df80: lw    s1, 24(sp)
+// 0x0109e5c8: 0x109e5c8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -855,7 +855,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109df84: 0x109df84: lw    s0, 20(sp)
+// 0x0109e5cc: 0x109e5cc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -864,7 +864,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109df88: 0x109df88: jr    ra addiu sp, sp, 32
+// 0x0109e5d0: 0x109e5d0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -876,7 +876,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_bitmap_image_new_109df90(int32,int32,int32,int32,int32)
+.method public static int32 ssd_bitmap_image_new_109e5d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -923,12 +923,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109df90: 0x109df90: addiu sp, sp, -48
+// 0x0109e5d8: 0x109e5d8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109df94: 0x109df94: sw    s2, 36(sp)
+// 0x0109e5dc: 0x109e5dc: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -937,14 +937,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109df98: 0x109df98: addu  s2, a0, zero
+// 0x0109e5e0: 0x109e5e0: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0109df9c: 0x109df9c: addiu a0, zero, 272
+// 0x0109e5e4: 0x109e5e4: addiu a0, zero, 272
 	ldc.i4 272
 	stloc.1
-// 0x0109dfa0: 0x109dfa0: sw    ra, 44(sp)
-// 0x0109dfa4: 0x109dfa4: sw    s3, 40(sp)
+// 0x0109e5e8: 0x109e5e8: sw    ra, 44(sp)
+// 0x0109e5ec: 0x109e5ec: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -953,7 +953,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109dfa8: 0x109dfa8: sw    s1, 32(sp)
+// 0x0109e5f0: 0x109e5f0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -962,13 +962,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109dfac: 0x109dfac: addu  s3, a1, zero
+// 0x0109e5f4: 0x109e5f4: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0109dfb0: 0x109dfb0: addu  s1, a2, zero
+// 0x0109e5f8: 0x109e5f8: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0109dfb4: 0x109dfb4: jal   0x1000910 sw    s0, 28(sp)
+// 0x0109e5fc: 0x109e5fc: jal   0x1000910 sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -987,16 +987,16 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0109dfbc: 0x109dfbc: addu  s0, v0, zero
+// 0x0109e604: 0x109e604: addu  s0, v0, zero
 	ldloc 7
 	stloc 8
-// 0x0109dfc0: 0x109dfc0: addu  a0, s2, zero
+// 0x0109e608: 0x109e608: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0109dfc4: 0x109dfc4: addu  a2, s1, zero
+// 0x0109e60c: 0x109e60c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0109dfc8: 0x109dfc8: jal   0x109a45c addu  a1, zero, zero
+// 0x0109e610: 0x109e610: jal   0x109aaa4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1004,21 +1004,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0109dfd0: 0x109dfd0: addiu v1, zero, -1
+// 0x0109e618: 0x109e618: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0109dfd4: 0x109dfd4: addu  a1, s2, zero
+// 0x0109e61c: 0x109e61c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0109dfd8: 0x109dfd8: addu  a0, s0, zero
+// 0x0109e620: 0x109e620: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109dfdc: 0x109dfdc: sw    v1, 268(s0)
+// 0x0109e624: 0x109e624: sw    v1, 268(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1027,7 +1027,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109dfe0: 0x109dfe0: sw    v1, 264(s0)
+// 0x0109e628: 0x109e628: sw    v1, 264(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1036,7 +1036,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109dfe4: 0x109dfe4: sw    v0, 16(sp)
+// 0x0109e62c: 0x109e62c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1045,7 +1045,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109dfe8: 0x109dfe8: sw    zero, 256(s0)
+// 0x0109e630: 0x109e630: sw    zero, 256(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1054,7 +1054,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109dfec: 0x109dfec: jal   0x109de94 sw    zero, 260(s0)
+// 0x0109e634: 0x109e634: jal   0x109e4dc sw    zero, 260(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1068,12 +1068,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::set_bitmap_name_109de94(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::set_bitmap_name_109e4dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0109dff4: 0x109dff4: lw    v0, 16(sp)
+// 0x0109e63c: 0x109e63c: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1082,30 +1082,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109dff8: 0x109dff8: lui   v1, 0x20000
+// 0x0109e640: 0x109e640: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0109dffc: 0x109dffc: addiu v1, v1, -1324
+// 0x0109e644: 0x109e644: addiu v1, v1, -860
 	ldloc 6
-	ldc.i4 -1324
+	ldc.i4 -860
 	add
 	stloc 6
-// 0x0109e000: 0x109e000: sw    v1, 0(v0)
+// 0x0109e648: 0x109e648: sw    v1, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0109e004: 0x109e004: lui   v1, 0x10a0000
+// 0x0109e64c: 0x109e64c: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x0109e008: 0x109e008: addiu v1, v1, -7564
+// 0x0109e650: 0x109e650: addiu v1, v1, -5956
 	ldloc 6
-	ldc.i4 -7564
+	ldc.i4 -5956
 	add
 	stloc 6
-// 0x0109e00c: 0x109e00c: sw    v1, 184(v0)
+// 0x0109e654: 0x109e654: sw    v1, 184(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1114,15 +1114,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e010: 0x109e010: lui   v1, 0x10a0000
+// 0x0109e658: 0x109e658: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x0109e014: 0x109e014: addiu v1, v1, -8056
+// 0x0109e65c: 0x109e65c: addiu v1, v1, -6448
 	ldloc 6
-	ldc.i4 -8056
+	ldc.i4 -6448
 	add
 	stloc 6
-// 0x0109e018: 0x109e018: sw    v1, 176(v0)
+// 0x0109e660: 0x109e660: sw    v1, 176(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1131,16 +1131,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e01c: 0x109e01c: lw    ra, 44(sp)
-// 0x0109e020: 0x109e020: lui   v1, 0x10a0000
+// 0x0109e664: 0x109e664: lw    ra, 44(sp)
+// 0x0109e668: 0x109e668: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x0109e024: 0x109e024: addiu v1, v1, -8112
+// 0x0109e66c: 0x109e66c: addiu v1, v1, -6504
 	ldloc 6
-	ldc.i4 -8112
+	ldc.i4 -6504
 	add
 	stloc 6
-// 0x0109e028: 0x109e028: sw    s3, 256(s0)
+// 0x0109e670: 0x109e670: sw    s3, 256(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1149,7 +1149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109e02c: 0x109e02c: sw    s1, 48(v0)
+// 0x0109e674: 0x109e674: sw    s1, 48(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1158,7 +1158,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e030: 0x109e030: sw    s0, 164(v0)
+// 0x0109e678: 0x109e678: sw    s0, 164(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e034: 0x109e034: lw    s3, 40(sp)
+// 0x0109e67c: 0x109e67c: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1176,7 +1176,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109e038: 0x109e038: lw    s2, 36(sp)
+// 0x0109e680: 0x109e680: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1185,7 +1185,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109e03c: 0x109e03c: lw    s1, 32(sp)
+// 0x0109e684: 0x109e684: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1194,7 +1194,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e040: 0x109e040: lw    s0, 28(sp)
+// 0x0109e688: 0x109e688: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1203,7 +1203,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e044: 0x109e044: sw    v1, 220(v0)
+// 0x0109e68c: 0x109e68c: sw    v1, 220(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1212,7 +1212,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e048: 0x109e048: jr    ra addiu sp, sp, 48
+// 0x0109e690: 0x109e690: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1224,7 +1224,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 release_109e050(int32,int32,int32,int32,int32)
+.method public static int32 release_109e698(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -1262,12 +1262,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e050: 0x109e050: addiu sp, sp, -24
+// 0x0109e698: 0x109e698: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109e054: 0x109e054: sw    s0, 16(sp)
+// 0x0109e69c: 0x109e69c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1276,10 +1276,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e058: 0x109e058: addu  s0, a0, zero
+// 0x0109e6a0: 0x109e6a0: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0109e05c: 0x109e05c: lw    a0, 164(a0)
+// 0x0109e6a4: 0x109e6a4: lw    a0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1288,12 +1288,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109e060: 0x109e060: sll   zero, zero, 0
-// 0x0109e064: 0x109e064: beq   a0, zero, 0x109e078 sw    ra, 20(sp)
+// 0x0109e6a8: 0x109e6a8: sll   zero, zero, 0
+// 0x0109e6ac: 0x109e6ac: beq   a0, zero, 0x109e6c0 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_109e078
+	brfalse L_109e6c0
 // --- basic block ---
-// 0x0109e06c: 0x109e06c: jal   0x1000930 sll   zero, zero, 0
+// 0x0109e6b4: 0x109e6b4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1304,7 +1304,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0109e074: 0x109e074: sw    zero, 164(s0)
+// 0x0109e6bc: 0x109e6bc: sw    zero, 164(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1313,9 +1313,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_109e078:
-// 0x0109e078: 0x109e078: lw    ra, 20(sp)
-// 0x0109e07c: 0x109e07c: lw    s0, 16(sp)
+L_109e6c0:
+// 0x0109e6c0: 0x109e6c0: lw    ra, 20(sp)
+// 0x0109e6c4: 0x109e6c4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1324,7 +1324,7 @@ L_109e078:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e080: 0x109e080: jr    ra addiu sp, sp, 24
+// 0x0109e6c8: 0x109e6c8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1336,7 +1336,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 set_value_109e088(int32,int32,int32,int32,int32)
+.method public static int32 set_value_109e6d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -1377,12 +1377,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e088: 0x109e088: addiu sp, sp, -40
+// 0x0109e6d0: 0x109e6d0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109e08c: 0x109e08c: sw    s0, 28(sp)
+// 0x0109e6d4: 0x109e6d4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1391,10 +1391,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e090: 0x109e090: addu  s0, a0, zero
+// 0x0109e6d8: 0x109e6d8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0109e094: 0x109e094: sw    s1, 32(sp)
+// 0x0109e6dc: 0x109e6dc: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1403,7 +1403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e098: 0x109e098: sw    a1, 16(sp)
+// 0x0109e6e0: 0x109e6e0: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1412,8 +1412,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0109e09c: 0x109e09c: sw    ra, 36(sp)
-// 0x0109e0a0: 0x109e0a0: jal   0x1000910 addiu a0, zero, 272
+// 0x0109e6e4: 0x109e6e4: sw    ra, 36(sp)
+// 0x0109e6e8: 0x109e6e8: jal   0x1000910 addiu a0, zero, 272
 	ldc.i4 272
 	stloc.1
 	ldloc.0
@@ -1426,7 +1426,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109e0a8: 0x109e0a8: lw    a0, 164(s0)
+// 0x0109e6f0: 0x109e6f0: lw    a0, 164(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1435,13 +1435,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109e0ac: 0x109e0ac: addu  s1, v0, zero
+// 0x0109e6f4: 0x109e6f4: addu  s1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0109e0b0: 0x109e0b0: addiu v0, zero, -1
+// 0x0109e6f8: 0x109e6f8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0109e0b4: 0x109e0b4: sw    v0, 268(s1)
+// 0x0109e6fc: 0x109e6fc: sw    v0, 268(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1450,7 +1450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e0b8: 0x109e0b8: sw    zero, 256(s1)
+// 0x0109e700: 0x109e700: sw    zero, 256(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1459,7 +1459,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109e0bc: 0x109e0bc: sw    v0, 264(s1)
+// 0x0109e704: 0x109e704: sw    v0, 264(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1468,7 +1468,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e0c0: 0x109e0c0: sw    zero, 260(s1)
+// 0x0109e708: 0x109e708: sw    zero, 260(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1477,7 +1477,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109e0c4: 0x109e0c4: lw    a1, 16(sp)
+// 0x0109e70c: 0x109e70c: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1486,11 +1486,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109e0c8: 0x109e0c8: beq   a0, zero, 0x109e0dc sll   zero, zero, 0
+// 0x0109e710: 0x109e710: beq   a0, zero, 0x109e724 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109e0dc
+	brfalse L_109e724
 // --- basic block ---
-// 0x0109e0d0: 0x109e0d0: jal   0x1000930 sll   zero, zero, 0
+// 0x0109e718: 0x109e718: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1501,7 +1501,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109e0d8: 0x109e0d8: lw    a1, 16(sp)
+// 0x0109e720: 0x109e720: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1510,8 +1510,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_109e0dc:
-// 0x0109e0dc: 0x109e0dc: jal   0x109de94 addu  a0, s1, zero
+L_109e724:
+// 0x0109e724: 0x109e724: jal   0x109e4dc addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1519,16 +1519,16 @@ L_109e0dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::set_bitmap_name_109de94(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::set_bitmap_name_109e4dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109e0e4: 0x109e0e4: lb    v0, 0(s1)
+// 0x0109e72c: 0x109e72c: lb    v0, 0(s1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0109e0e8: 0x109e0e8: sw    zero, 256(s1)
+// 0x0109e730: 0x109e730: sw    zero, 256(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1537,7 +1537,7 @@ L_109e0dc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109e0ec: 0x109e0ec: beq   v0, zero, 0x109e124 sw    s1, 164(s0)
+// 0x0109e734: 0x109e734: beq   v0, zero, 0x109e76c sw    s1, 164(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 8
@@ -1547,15 +1547,15 @@ L_109e0dc:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_109e124
+	brfalse L_109e76c
 // --- basic block ---
-// 0x0109e0f4: 0x109e0f4: addu  a2, s1, zero
+// 0x0109e73c: 0x109e73c: addu  a2, s1, zero
 	ldloc 7
 	stloc.3
-// 0x0109e0f8: 0x109e0f8: addu  a0, zero, zero
+// 0x0109e740: 0x109e740: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109e0fc: 0x109e0fc: jal   0x10a1918 addiu a1, zero, 1
+// 0x0109e744: 0x109e744: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1563,27 +1563,27 @@ L_109e0dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109e104: 0x109e104: beq   v0, zero, 0x109e124 addu  s1, v0, zero
+// 0x0109e74c: 0x109e74c: beq   v0, zero, 0x109e76c addu  s1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
-	brfalse L_109e124
+	brfalse L_109e76c
 // --- basic block ---
-// 0x0109e10c: 0x109e10c: jal   0x104e020 addu  a0, v0, zero
+// 0x0109e754: 0x109e754: jal   0x104e030 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109e114: 0x109e114: sw    v0, 28(s0)
+// 0x0109e75c: 0x109e75c: sw    v0, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1592,16 +1592,16 @@ L_109e0dc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e118: 0x109e118: jal   0x104dffc addu  a0, s1, zero
+// 0x0109e760: 0x109e760: jal   0x104e00c addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109e120: 0x109e120: sw    v0, 24(s0)
+// 0x0109e768: 0x109e768: sw    v0, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1610,12 +1610,12 @@ L_109e0dc:
 	add
 	ldloc 6
 	stelem.i4
-L_109e124:
-// 0x0109e124: 0x109e124: lw    ra, 36(sp)
-// 0x0109e128: 0x109e128: addiu v0, zero, 1
+L_109e76c:
+// 0x0109e76c: 0x109e76c: lw    ra, 36(sp)
+// 0x0109e770: 0x109e770: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0109e12c: 0x109e12c: lw    s1, 32(sp)
+// 0x0109e774: 0x109e774: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1624,7 +1624,7 @@ L_109e124:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e130: 0x109e130: lw    s0, 28(sp)
+// 0x0109e778: 0x109e778: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1633,7 +1633,7 @@ L_109e124:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e134: 0x109e134: jr    ra addiu sp, sp, 40
+// 0x0109e77c: 0x109e77c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1645,7 +1645,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -1689,12 +1689,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e13c: 0x109e13c: addiu sp, sp, -32
+// 0x0109e784: 0x109e784: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109e140: 0x109e140: sw    s0, 16(sp)
+// 0x0109e788: 0x109e788: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1703,14 +1703,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e144: 0x109e144: addu  s0, a1, zero
+// 0x0109e78c: 0x109e78c: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0109e148: 0x109e148: addu  a1, zero, zero
+// 0x0109e790: 0x109e790: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e14c: 0x109e14c: sw    ra, 28(sp)
-// 0x0109e150: 0x109e150: sw    s2, 24(sp)
+// 0x0109e794: 0x109e794: sw    ra, 28(sp)
+// 0x0109e798: 0x109e798: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1719,7 +1719,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e154: 0x109e154: sw    s1, 20(sp)
+// 0x0109e79c: 0x109e79c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1728,7 +1728,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e158: 0x109e158: jal   0x109a45c addu  s1, a2, zero
+// 0x0109e7a0: 0x109e7a0: jal   0x109aaa4 addu  s1, a2, zero
 	ldloc.3
 	stloc 9
 	ldloc.0
@@ -1736,38 +1736,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x0109e160: 0x109e160: addu  s2, v0, zero
+// 0x0109e7a8: 0x109e7a8: addu  s2, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0109e164: 0x109e164: lui   v0, 0x20000
+// 0x0109e7ac: 0x109e7ac: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0109e168: 0x109e168: addiu v0, v0, -1324
+// 0x0109e7b0: 0x109e7b0: addiu v0, v0, -860
 	ldloc 5
-	ldc.i4 -1324
+	ldc.i4 -860
 	add
 	stloc 5
-// 0x0109e16c: 0x109e16c: sw    v0, 0(s2)
+// 0x0109e7b4: 0x109e7b4: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0109e170: 0x109e170: lui   v0, 0x10a0000
+// 0x0109e7b8: 0x109e7b8: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109e174: 0x109e174: addiu v0, v0, -7564
+// 0x0109e7bc: 0x109e7bc: addiu v0, v0, -5956
 	ldloc 5
-	ldc.i4 -7564
+	ldc.i4 -5956
 	add
 	stloc 5
-// 0x0109e178: 0x109e178: sw    v0, 184(s2)
+// 0x0109e7c0: 0x109e7c0: sw    v0, 184(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1776,15 +1776,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109e17c: 0x109e17c: lui   v0, 0x10a0000
+// 0x0109e7c4: 0x109e7c4: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109e180: 0x109e180: addiu v0, v0, -8112
+// 0x0109e7c8: 0x109e7c8: addiu v0, v0, -6504
 	ldloc 5
-	ldc.i4 -8112
+	ldc.i4 -6504
 	add
 	stloc 5
-// 0x0109e184: 0x109e184: sw    v0, 220(s2)
+// 0x0109e7cc: 0x109e7cc: sw    v0, 220(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1793,15 +1793,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109e188: 0x109e188: lui   v0, 0x10a0000
+// 0x0109e7d0: 0x109e7d0: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109e18c: 0x109e18c: addiu v0, v0, -8056
+// 0x0109e7d4: 0x109e7d4: addiu v0, v0, -6448
 	ldloc 5
-	ldc.i4 -8056
+	ldc.i4 -6448
 	add
 	stloc 5
-// 0x0109e190: 0x109e190: sw    s1, 48(s2)
+// 0x0109e7d8: 0x109e7d8: sw    s1, 48(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1810,7 +1810,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e194: 0x109e194: sw    v0, 176(s2)
+// 0x0109e7dc: 0x109e7dc: sw    v0, 176(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1819,10 +1819,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109e198: 0x109e198: addu  a1, s0, zero
+// 0x0109e7e0: 0x109e7e0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0109e19c: 0x109e19c: jal   0x109e088 addu  a0, s2, zero
+// 0x0109e7e4: 0x109e7e4: jal   0x109e6d0 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1830,16 +1830,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::set_value_109e088(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::set_value_109e6d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x0109e1a4: 0x109e1a4: lw    ra, 28(sp)
-// 0x0109e1a8: 0x109e1a8: addu  v0, s2, zero
+// 0x0109e7ec: 0x109e7ec: lw    ra, 28(sp)
+// 0x0109e7f0: 0x109e7f0: addu  v0, s2, zero
 	ldloc 7
 	stloc 5
-// 0x0109e1ac: 0x109e1ac: lw    s2, 24(sp)
+// 0x0109e7f4: 0x109e7f4: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1848,7 +1848,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e1b0: 0x109e1b0: lw    s1, 20(sp)
+// 0x0109e7f8: 0x109e7f8: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1857,7 +1857,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e1b4: 0x109e1b4: lw    s0, 16(sp)
+// 0x0109e7fc: 0x109e7fc: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1866,7 +1866,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e1b8: 0x109e1b8: jr    ra addiu sp, sp, 32
+// 0x0109e800: 0x109e800: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1878,7 +1878,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_bitmap_splash_109e1c0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_bitmap_splash_109e808(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -1928,12 +1928,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e1c0: 0x109e1c0: addiu sp, sp, -40
+// 0x0109e808: 0x109e808: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109e1c4: 0x109e1c4: sw    s1, 24(sp)
+// 0x0109e80c: 0x109e80c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1942,7 +1942,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e1c8: 0x109e1c8: sw    s0, 20(sp)
+// 0x0109e810: 0x109e810: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1951,24 +1951,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e1cc: 0x109e1cc: addu  s1, a1, zero
+// 0x0109e814: 0x109e814: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0109e1d0: 0x109e1d0: lui   s0, 0x20000
+// 0x0109e818: 0x109e818: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0109e1d4: 0x109e1d4: lui   a3, 0x10000
+// 0x0109e81c: 0x109e81c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0109e1d8: 0x109e1d8: lui   a1, 0x10000
+// 0x0109e820: 0x109e820: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0109e1dc: 0x109e1dc: ori   a3, a3, 17
+// 0x0109e824: 0x109e824: ori   a3, a3, 17
 	ldloc 4
 	ldc.i4.s 17
 	or
 	stloc 4
-// 0x0109e1e0: 0x109e1e0: sw    s2, 28(sp)
+// 0x0109e828: 0x109e828: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1977,24 +1977,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109e1e4: 0x109e1e4: addiu a1, a1, 18500
+// 0x0109e82c: 0x109e82c: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109e1e8: 0x109e1e8: addu  s2, a0, zero
+// 0x0109e830: 0x109e830: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0109e1ec: 0x109e1ec: addu  a2, zero, zero
+// 0x0109e834: 0x109e834: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109e1f0: 0x109e1f0: addiu a0, s0, -1368
+// 0x0109e838: 0x109e838: addiu a0, s0, -904
 	ldloc 8
-	ldc.i4 -1368
+	ldc.i4 -904
 	add
 	stloc.1
-// 0x0109e1f4: 0x109e1f4: sw    ra, 36(sp)
-// 0x0109e1f8: 0x109e1f8: jal   0x1095a08 sw    s3, 32(sp)
+// 0x0109e83c: 0x109e83c: sw    ra, 36(sp)
+// 0x0109e840: 0x109e840: jal   0x1096050 sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2008,42 +2008,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e200: 0x109e200: lui   a1, 0x0
+// 0x0109e848: 0x109e848: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e204: 0x109e204: addu  a0, v0, zero
+// 0x0109e84c: 0x109e84c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0109e208: 0x109e208: addiu a1, a1, 31980
+// 0x0109e850: 0x109e850: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x0109e20c: 0x109e20c: addu  a2, zero, zero
+// 0x0109e854: 0x109e854: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109e210: 0x109e210: jal   0x1098fe0 addu  s3, v0, zero
+// 0x0109e858: 0x109e858: jal   0x1099628 addu  s3, v0, zero
 	ldloc 6
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109e218: 0x109e218: addiu a2, zero, 17
+// 0x0109e860: 0x109e860: addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
-// 0x0109e21c: 0x109e21c: addu  a1, s2, zero
+// 0x0109e864: 0x109e864: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0109e220: 0x109e220: jal   0x109e13c addiu a0, s0, -1368
+// 0x0109e868: 0x109e868: jal   0x109e784 addiu a0, s0, -904
 	ldloc 8
-	ldc.i4 -1368
+	ldc.i4 -904
 	add
 	stloc.1
 	ldloc.0
@@ -2051,30 +2051,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e228: 0x109e228: addu  a1, v0, zero
+// 0x0109e870: 0x109e870: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x0109e22c: 0x109e22c: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0109e874: 0x109e874: jal   0x109950c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e234: 0x109e234: addiu a0, s0, -1368
+// 0x0109e87c: 0x109e87c: addiu a0, s0, -904
 	ldloc 8
-	ldc.i4 -1368
+	ldc.i4 -904
 	add
 	stloc.1
-// 0x0109e238: 0x109e238: jal   0x1095eec addu  a1, zero, zero
+// 0x0109e880: 0x109e880: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2082,28 +2082,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e240: 0x109e240: addiu a0, zero, 1000
+// 0x0109e888: 0x109e888: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x0109e244: 0x109e244: mult  s1, a0
+// 0x0109e88c: 0x109e88c: mult  s1, a0
 	ldloc 9
 	ldloc.1
 	mul
 	stloc 13
-// 0x0109e248: 0x109e248: lui   a1, 0x10a0000
+// 0x0109e890: 0x109e890: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x0109e24c: 0x109e24c: mflo  lo
+// 0x0109e894: 0x109e894: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x0109e250: 0x109e250: jal   0x104fe98 addiu a1, a1, -8616
+// 0x0109e898: 0x109e898: jal   0x104fea8 addiu a1, a1, -7008
 	ldloc.2
-	ldc.i4 -8616
+	ldc.i4 -7008
 	add
 	stloc.2
 	ldloc.0
@@ -2111,13 +2111,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e258: 0x109e258: lw    ra, 36(sp)
-// 0x0109e25c: 0x109e25c: lw    s3, 32(sp)
+// 0x0109e8a0: 0x109e8a0: lw    ra, 36(sp)
+// 0x0109e8a4: 0x109e8a4: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2126,7 +2126,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109e260: 0x109e260: lw    s2, 28(sp)
+// 0x0109e8a8: 0x109e8a8: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2135,7 +2135,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109e264: 0x109e264: lw    s1, 24(sp)
+// 0x0109e8ac: 0x109e8ac: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2144,7 +2144,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e268: 0x109e268: lw    s0, 20(sp)
+// 0x0109e8b0: 0x109e8b0: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2153,7 +2153,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e26c: 0x109e26c: jr    ra addiu sp, sp, 40
+// 0x0109e8b4: 0x109e8b4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2165,7 +2165,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 draw_109e274(int32,int32,int32,int32,int32)
+.method public static int32 draw_109e8bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s4,int32 s3,int32 s6,int32 s7,int32 s5,int32 s1,int32 ra)
@@ -2224,12 +2224,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e274: 0x109e274: addiu sp, sp, -88
+// 0x0109e8bc: 0x109e8bc: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x0109e278: 0x109e278: sw    s0, 52(sp)
+// 0x0109e8c0: 0x109e8c0: sw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2238,7 +2238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e27c: 0x109e27c: lw    s0, 164(a0)
+// 0x0109e8c4: 0x109e8c4: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2247,7 +2247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e280: 0x109e280: sw    zero, 32(sp)
+// 0x0109e8c8: 0x109e8c8: sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2256,7 +2256,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109e284: 0x109e284: sw    zero, 36(sp)
+// 0x0109e8cc: 0x109e8cc: sw    zero, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2265,7 +2265,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109e288: 0x109e288: sw    zero, 40(sp)
+// 0x0109e8d0: 0x109e8d0: sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2274,14 +2274,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109e28c: 0x109e28c: lw    v1, 0(a1)
+// 0x0109e8d4: 0x109e8d4: lw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109e290: 0x109e290: lw    v0, 4(a1)
+// 0x0109e8d8: 0x109e8d8: lw    v0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2290,7 +2290,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e294: 0x109e294: sw    s2, 60(sp)
+// 0x0109e8dc: 0x109e8dc: sw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2299,7 +2299,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e298: 0x109e298: lw    s2, 256(s0)
+// 0x0109e8e0: 0x109e8e0: lw    s2, 256(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2308,7 +2308,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e29c: 0x109e29c: sw    s7, 80(sp)
+// 0x0109e8e4: 0x109e8e4: sw    s7, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2317,7 +2317,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109e2a0: 0x109e2a0: sw    s3, 64(sp)
+// 0x0109e8e8: 0x109e8e8: sw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2326,7 +2326,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109e2a4: 0x109e2a4: sw    s1, 56(sp)
+// 0x0109e8ec: 0x109e8ec: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2335,8 +2335,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109e2a8: 0x109e2a8: sw    ra, 84(sp)
-// 0x0109e2ac: 0x109e2ac: sw    s6, 76(sp)
+// 0x0109e8f0: 0x109e8f0: sw    ra, 84(sp)
+// 0x0109e8f4: 0x109e8f4: sw    s6, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2345,7 +2345,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109e2b0: 0x109e2b0: sw    s5, 72(sp)
+// 0x0109e8f8: 0x109e8f8: sw    s5, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2354,7 +2354,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109e2b4: 0x109e2b4: sw    s4, 68(sp)
+// 0x0109e8fc: 0x109e8fc: sw    s4, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2363,13 +2363,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109e2b8: 0x109e2b8: addu  s1, a0, zero
+// 0x0109e900: 0x109e900: addu  s1, a0, zero
 	ldloc.1
 	stloc 15
-// 0x0109e2bc: 0x109e2bc: addu  s3, a1, zero
+// 0x0109e904: 0x109e904: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0109e2c0: 0x109e2c0: sw    v1, 24(sp)
+// 0x0109e908: 0x109e908: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2378,7 +2378,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e2c4: 0x109e2c4: sw    v0, 28(sp)
+// 0x0109e90c: 0x109e90c: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2387,27 +2387,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e2c8: 0x109e2c8: bne   s2, zero, 0x109e2f0 addu  s7, a2, zero
+// 0x0109e910: 0x109e910: bne   s2, zero, 0x109e938 addu  s7, a2, zero
 	ldloc 9
 	ldloc.3
 	stloc 13
-	brtrue L_109e2f0
+	brtrue L_109e938
 // --- basic block ---
-// 0x0109e2d0: 0x109e2d0: lb    v0, 0(s0)
+// 0x0109e918: 0x109e918: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0109e2d4: 0x109e2d4: sll   zero, zero, 0
-// 0x0109e2d8: 0x109e2d8: beq   v0, zero, 0x109e2f0 addu  a0, zero, zero
+// 0x0109e91c: 0x109e91c: sll   zero, zero, 0
+// 0x0109e920: 0x109e920: beq   v0, zero, 0x109e938 addu  a0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_109e2f0
+	brfalse L_109e938
 // --- basic block ---
-// 0x0109e2e0: 0x109e2e0: addiu a1, zero, 1
+// 0x0109e928: 0x109e928: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0109e2e4: 0x109e2e4: jal   0x10a1918 addu  a2, s0, zero
+// 0x0109e92c: 0x109e92c: jal   0x10a1f60 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -2415,16 +2415,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e2ec: 0x109e2ec: addu  s2, v0, zero
+// 0x0109e934: 0x109e934: addu  s2, v0, zero
 	ldloc 6
 	stloc 9
-L_109e2f0:
-// 0x0109e2f0: 0x109e2f0: lw    v0, 260(s0)
+L_109e938:
+// 0x0109e938: 0x109e938: lw    v0, 260(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2433,29 +2433,29 @@ L_109e2f0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e2f4: 0x109e2f4: sll   zero, zero, 0
-// 0x0109e2f8: 0x109e2f8: blez  v0, 0x109e33c sll   zero, zero, 0
+// 0x0109e93c: 0x109e93c: sll   zero, zero, 0
+// 0x0109e940: 0x109e940: blez  v0, 0x109e984 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	ble L_109e33c
+	ble L_109e984
 // --- basic block ---
-// 0x0109e300: 0x109e300: addiu s6, s0, 64
+// 0x0109e948: 0x109e948: addiu s6, s0, 64
 	ldloc 8
 	ldc.i4.s 64
 	add
 	stloc 12
-// 0x0109e304: 0x109e304: addiu s5, sp, 32
+// 0x0109e94c: 0x109e94c: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 14
-// 0x0109e308: 0x109e308: j	 0x109e328 addu  s4, zero, zero
+// 0x0109e950: 0x109e950: j	 0x109e970 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_109e328
+	br L_109e970
 // --- basic block ---
-L_109e310:
-// 0x0109e310: 0x109e310: jal   0x10a1918 addiu s4, s4, 1
+L_109e958:
+// 0x0109e958: 0x109e958: jal   0x10a1f60 addiu s4, s4, 1
 	ldloc 10
 	ldc.i4.1
 	add
@@ -2465,29 +2465,29 @@ L_109e310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e318: 0x109e318: sw    v0, 0(s5)
+// 0x0109e960: 0x109e960: sw    v0, 0(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0109e31c: 0x109e31c: addiu s6, s6, 64
+// 0x0109e964: 0x109e964: addiu s6, s6, 64
 	ldloc 12
 	ldc.i4.s 64
 	add
 	stloc 12
-// 0x0109e320: 0x109e320: addiu s5, s5, 4
+// 0x0109e968: 0x109e968: addiu s5, s5, 4
 	ldloc 14
 	ldc.i4.4
 	add
 	stloc 14
-// 0x0109e324: 0x109e324: lw    v0, 260(s0)
+// 0x0109e96c: 0x109e96c: lw    v0, 260(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2496,26 +2496,26 @@ L_109e310:
 	add
 	ldelem.i4
 	stloc 6
-L_109e328:
-// 0x0109e328: 0x109e328: addu  a2, s6, zero
+L_109e970:
+// 0x0109e970: 0x109e970: addu  a2, s6, zero
 	ldloc 12
 	stloc.3
-// 0x0109e32c: 0x109e32c: slt   v0, s4, v0
+// 0x0109e974: 0x109e974: slt   v0, s4, v0
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109e330: 0x109e330: addu  a0, zero, zero
+// 0x0109e978: 0x109e978: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109e334: 0x109e334: bne   v0, zero, 0x109e310 addiu a1, zero, 1
+// 0x0109e97c: 0x109e97c: bne   v0, zero, 0x109e958 addiu a1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.2
-	brtrue L_109e310
+	brtrue L_109e958
 // --- basic block ---
-L_109e33c:
-// 0x0109e33c: 0x109e33c: lw    v1, 264(s0)
+L_109e984:
+// 0x0109e984: 0x109e984: lw    v1, 264(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2524,28 +2524,28 @@ L_109e33c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e340: 0x109e340: addiu v0, zero, -1
+// 0x0109e988: 0x109e988: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0109e344: 0x109e344: bne   v1, v0, 0x109e36c sll   zero, zero, 0
+// 0x0109e98c: 0x109e98c: bne   v1, v0, 0x109e9b4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	bne.un L_109e36c
+	bne.un L_109e9b4
 // --- basic block ---
-// 0x0109e34c: 0x109e34c: beq   s2, zero, 0x109e36c sll   zero, zero, 0
+// 0x0109e994: 0x109e994: beq   s2, zero, 0x109e9b4 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_109e36c
+	brfalse L_109e9b4
 // --- basic block ---
-// 0x0109e354: 0x109e354: jal   0x104dffc addu  a0, s2, zero
+// 0x0109e99c: 0x109e99c: jal   0x104e00c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e35c: 0x109e35c: sw    v0, 264(s0)
+// 0x0109e9a4: 0x109e9a4: sw    v0, 264(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2554,16 +2554,16 @@ L_109e33c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e360: 0x109e360: jal   0x104e020 addu  a0, s2, zero
+// 0x0109e9a8: 0x109e9a8: jal   0x104e030 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e368: 0x109e368: sw    v0, 268(s0)
+// 0x0109e9b0: 0x109e9b0: sw    v0, 268(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2572,17 +2572,17 @@ L_109e33c:
 	add
 	ldloc 6
 	stelem.i4
-L_109e36c:
-// 0x0109e36c: 0x109e36c: andi  s7, s7, 1
+L_109e9b4:
+// 0x0109e9b4: 0x109e9b4: andi  s7, s7, 1
 	ldloc 13
 	ldc.i4.1
 	and
 	stloc 13
-// 0x0109e370: 0x109e370: beq   s7, zero, 0x109e3a0 sll   zero, zero, 0
+// 0x0109e9b8: 0x109e9b8: beq   s7, zero, 0x109e9e8 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_109e3a0
+	brfalse L_109e9e8
 // --- basic block ---
-// 0x0109e378: 0x109e378: lw    a0, 264(s0)
+// 0x0109e9c0: 0x109e9c0: lw    a0, 264(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2591,14 +2591,14 @@ L_109e36c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109e37c: 0x109e37c: lw    v1, 0(s3)
+// 0x0109e9c4: 0x109e9c4: lw    v1, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109e380: 0x109e380: lw    v0, 4(s3)
+// 0x0109e9c8: 0x109e9c8: lw    v0, 4(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -2607,12 +2607,12 @@ L_109e36c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e384: 0x109e384: addu  v1, a0, v1
+// 0x0109e9cc: 0x109e9cc: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0109e388: 0x109e388: sw    v1, 8(s3)
+// 0x0109e9d0: 0x109e9d0: sw    v1, 8(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -2621,7 +2621,7 @@ L_109e36c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e38c: 0x109e38c: lw    v1, 268(s0)
+// 0x0109e9d4: 0x109e9d4: lw    v1, 268(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2630,13 +2630,13 @@ L_109e36c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e390: 0x109e390: sll   zero, zero, 0
-// 0x0109e394: 0x109e394: addu  v0, v1, v0
+// 0x0109e9d8: 0x109e9d8: sll   zero, zero, 0
+// 0x0109e9dc: 0x109e9dc: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x0109e398: 0x109e398: j	 0x109e47c sw    v0, 12(s3)
+// 0x0109e9e0: 0x109e9e0: j	 0x109eac4 sw    v0, 12(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -2645,24 +2645,24 @@ L_109e36c:
 	add
 	ldloc 6
 	stelem.i4
-	br L_109e47c
+	br L_109eac4
 // --- basic block ---
-L_109e3a0:
-// 0x0109e3a0: 0x109e3a0: beq   s2, zero, 0x109e3c0 addu  a0, s2, zero
+L_109e9e8:
+// 0x0109e9e8: 0x109e9e8: beq   s2, zero, 0x109ea08 addu  a0, s2, zero
 	ldloc 9
 	ldloc 9
 	stloc.1
-	brfalse L_109e3c0
+	brfalse L_109ea08
 // --- basic block ---
-// 0x0109e3a8: 0x109e3a8: addiu a1, sp, 24
+// 0x0109e9f0: 0x109e9f0: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0109e3ac: 0x109e3ac: addu  a2, zero, zero
+// 0x0109e9f4: 0x109e9f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109e3b0: 0x109e3b0: jal   0x104f4a8 addu  a3, zero, zero
+// 0x0109e9f8: 0x109e9f8: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2670,16 +2670,16 @@ L_109e3a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e3b8: 0x109e3b8: j	 0x109e3e8 sll   zero, zero, 0
-	br L_109e3e8
+// 0x0109ea00: 0x109ea00: j	 0x109ea30 sll   zero, zero, 0
+	br L_109ea30
 // --- basic block ---
-L_109e3c0:
-// 0x0109e3c0: 0x109e3c0: lw    v0, 16(s1)
+L_109ea08:
+// 0x0109ea08: 0x109ea08: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -2688,29 +2688,29 @@ L_109e3c0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e3c4: 0x109e3c4: lui   a1, 0x20000
+// 0x0109ea0c: 0x109ea0c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109e3c8: 0x109e3c8: lui   a3, 0x20000
+// 0x0109ea10: 0x109ea10: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0109e3cc: 0x109e3cc: addiu a1, a1, -1352
+// 0x0109ea14: 0x109ea14: addiu a1, a1, -888
 	ldloc.2
-	ldc.i4 -1352
+	ldc.i4 -888
 	add
 	stloc.2
-// 0x0109e3d0: 0x109e3d0: addiu a3, a3, -1316
+// 0x0109ea18: 0x109ea18: addiu a3, a3, -852
 	ldloc 4
-	ldc.i4 -1316
+	ldc.i4 -852
 	add
 	stloc 4
-// 0x0109e3d4: 0x109e3d4: addiu a0, zero, 4
+// 0x0109ea1c: 0x109ea1c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109e3d8: 0x109e3d8: addiu a2, zero, 113
+// 0x0109ea20: 0x109ea20: addiu a2, zero, 113
 	ldc.i4.s 113
 	stloc.3
-// 0x0109e3dc: 0x109e3dc: sw    v0, 16(sp)
+// 0x0109ea24: 0x109ea24: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2719,7 +2719,7 @@ L_109e3c0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e3e0: 0x109e3e0: jal   0x100449c sw    s0, 20(sp)
+// 0x0109ea28: 0x109ea28: jal   0x100449c sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2738,8 +2738,8 @@ L_109e3c0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_109e3e8:
-// 0x0109e3e8: 0x109e3e8: lw    v0, 260(s0)
+L_109ea30:
+// 0x0109ea30: 0x109ea30: lw    v0, 260(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2748,63 +2748,63 @@ L_109e3e8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e3ec: 0x109e3ec: sll   zero, zero, 0
-// 0x0109e3f0: 0x109e3f0: blez  v0, 0x109e47c lui   s7, 0x20000
+// 0x0109ea34: 0x109ea34: sll   zero, zero, 0
+// 0x0109ea38: 0x109ea38: blez  v0, 0x109eac4 lui   s7, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 13
 	ldc.i4.s 0
-	ble L_109e47c
+	ble L_109eac4
 // --- basic block ---
-// 0x0109e3f8: 0x109e3f8: lui   s6, 0x20000
+// 0x0109ea40: 0x109ea40: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x0109e3fc: 0x109e3fc: addiu s7, s7, -1352
+// 0x0109ea44: 0x109ea44: addiu s7, s7, -888
 	ldloc 13
-	ldc.i4 -1352
+	ldc.i4 -888
 	add
 	stloc 13
-// 0x0109e400: 0x109e400: addiu s6, s6, -1264
+// 0x0109ea48: 0x109ea48: addiu s6, s6, -800
 	ldloc 12
-	ldc.i4 -1264
+	ldc.i4 -800
 	add
 	stloc 12
-// 0x0109e404: 0x109e404: addiu s4, s0, 64
+// 0x0109ea4c: 0x109ea4c: addiu s4, s0, 64
 	ldloc 8
 	ldc.i4.s 64
 	add
 	stloc 10
-// 0x0109e408: 0x109e408: addiu s3, sp, 32
+// 0x0109ea50: 0x109ea50: addiu s3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 11
-// 0x0109e40c: 0x109e40c: addu  s2, zero, zero
+// 0x0109ea54: 0x109ea54: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0109e410: 0x109e410: j	 0x109e468 addiu s5, sp, 24
+// 0x0109ea58: 0x109ea58: j	 0x109eab0 addiu s5, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-	br L_109e468
+	br L_109eab0
 // --- basic block ---
-L_109e418:
-// 0x0109e418: 0x109e418: lw    v0, 0(s3)
+L_109ea60:
+// 0x0109ea60: 0x109ea60: lw    v0, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109e41c: 0x109e41c: sll   zero, zero, 0
-// 0x0109e420: 0x109e420: beq   v0, zero, 0x109e438 addu  a0, v0, zero
+// 0x0109ea64: 0x109ea64: sll   zero, zero, 0
+// 0x0109ea68: 0x109ea68: beq   v0, zero, 0x109ea80 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_109e438
+	brfalse L_109ea80
 // --- basic block ---
-// 0x0109e428: 0x109e428: jal   0x104f4a8 addiu s2, s2, 1
+// 0x0109ea70: 0x109ea70: jal   0x104f4b8 addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -2814,20 +2814,20 @@ L_109e418:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e430: 0x109e430: j	 0x109e460 addiu s4, s4, 64
+// 0x0109ea78: 0x109ea78: j	 0x109eaa8 addiu s4, s4, 64
 	ldloc 10
 	ldc.i4.s 64
 	add
 	stloc 10
-	br L_109e460
+	br L_109eaa8
 // --- basic block ---
-L_109e438:
-// 0x0109e438: 0x109e438: lw    v0, 16(s1)
+L_109ea80:
+// 0x0109ea80: 0x109ea80: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -2836,19 +2836,19 @@ L_109e438:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e43c: 0x109e43c: addiu a0, zero, 4
+// 0x0109ea84: 0x109ea84: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0109e440: 0x109e440: addu  a1, s7, zero
+// 0x0109ea88: 0x109ea88: addu  a1, s7, zero
 	ldloc 13
 	stloc.2
-// 0x0109e444: 0x109e444: addiu a2, zero, 125
+// 0x0109ea8c: 0x109ea8c: addiu a2, zero, 125
 	ldc.i4.s 125
 	stloc.3
-// 0x0109e448: 0x109e448: addu  a3, s6, zero
+// 0x0109ea90: 0x109ea90: addu  a3, s6, zero
 	ldloc 12
 	stloc 4
-// 0x0109e44c: 0x109e44c: sw    v0, 16(sp)
+// 0x0109ea94: 0x109ea94: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2857,7 +2857,7 @@ L_109e438:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e450: 0x109e450: jal   0x100449c sw    s4, 20(sp)
+// 0x0109ea98: 0x109ea98: jal   0x100449c sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2876,23 +2876,23 @@ L_109e438:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109e458: 0x109e458: addiu s2, s2, 1
+// 0x0109eaa0: 0x109eaa0: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0109e45c: 0x109e45c: addiu s4, s4, 64
+// 0x0109eaa4: 0x109eaa4: addiu s4, s4, 64
 	ldloc 10
 	ldc.i4.s 64
 	add
 	stloc 10
-L_109e460:
-// 0x0109e460: 0x109e460: addiu s3, s3, 4
+L_109eaa8:
+// 0x0109eaa8: 0x109eaa8: addiu s3, s3, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-// 0x0109e464: 0x109e464: lw    v0, 260(s0)
+// 0x0109eaac: 0x109eaac: lw    v0, 260(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2901,27 +2901,27 @@ L_109e460:
 	add
 	ldelem.i4
 	stloc 6
-L_109e468:
-// 0x0109e468: 0x109e468: addu  a1, s5, zero
+L_109eab0:
+// 0x0109eab0: 0x109eab0: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x0109e46c: 0x109e46c: slt   v0, s2, v0
+// 0x0109eab4: 0x109eab4: slt   v0, s2, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x0109e470: 0x109e470: addu  a2, zero, zero
+// 0x0109eab8: 0x109eab8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109e474: 0x109e474: bne   v0, zero, 0x109e418 addu  a3, zero, zero
+// 0x0109eabc: 0x109eabc: bne   v0, zero, 0x109ea60 addu  a3, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_109e418
+	brtrue L_109ea60
 // --- basic block ---
-L_109e47c:
-// 0x0109e47c: 0x109e47c: lw    ra, 84(sp)
-// 0x0109e480: 0x109e480: lw    s7, 80(sp)
+L_109eac4:
+// 0x0109eac4: 0x109eac4: lw    ra, 84(sp)
+// 0x0109eac8: 0x109eac8: lw    s7, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2930,7 +2930,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109e484: 0x109e484: lw    s6, 76(sp)
+// 0x0109eacc: 0x109eacc: lw    s6, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2939,7 +2939,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109e488: 0x109e488: lw    s5, 72(sp)
+// 0x0109ead0: 0x109ead0: lw    s5, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2948,7 +2948,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109e48c: 0x109e48c: lw    s4, 68(sp)
+// 0x0109ead4: 0x109ead4: lw    s4, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2957,7 +2957,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109e490: 0x109e490: lw    s3, 64(sp)
+// 0x0109ead8: 0x109ead8: lw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2966,7 +2966,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109e494: 0x109e494: lw    s2, 60(sp)
+// 0x0109eadc: 0x109eadc: lw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2975,7 +2975,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e498: 0x109e498: lw    s1, 56(sp)
+// 0x0109eae0: 0x109eae0: lw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2984,7 +2984,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109e49c: 0x109e49c: lw    s0, 52(sp)
+// 0x0109eae4: 0x109eae4: lw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2993,7 +2993,7 @@ L_109e47c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e4a0: 0x109e4a0: jr    ra addiu sp, sp, 88
+// 0x0109eae8: 0x109eae8: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -3005,7 +3005,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 draw_109e4a8(int32,int32,int32,int32,int32)
+.method public static int32 draw_109eaf0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -3040,7 +3040,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e4a8: 0x109e4a8: lw    v1, 164(a0)
+// 0x0109eaf0: 0x109eaf0: lw    v1, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3049,7 +3049,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109e4ac: 0x109e4ac: lw    a3, 4(a0)
+// 0x0109eaf4: 0x109eaf4: lw    a3, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3058,12 +3058,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109e4b0: 0x109e4b0: addiu sp, sp, -24
+// 0x0109eaf8: 0x109eaf8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109e4b4: 0x109e4b4: lw    v0, 4(v1)
+// 0x0109eafc: 0x109eafc: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3072,13 +3072,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e4b8: 0x109e4b8: addiu v1, v1, 8
+// 0x0109eb00: 0x109eb00: addiu v1, v1, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0109e4bc: 0x109e4bc: sw    ra, 20(sp)
-// 0x0109e4c0: 0x109e4c0: jalr  v0 sw    v1, 116(a3)
+// 0x0109eb04: 0x109eb04: sw    ra, 20(sp)
+// 0x0109eb08: 0x109eb08: jalr  v0 sw    v1, 116(a3)
 	ldloc 7
 	ldloc 6
 	ldloc 4
@@ -3098,9 +3098,9 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0109e4c8: 0x109e4c8: lw    ra, 20(sp)
-// 0x0109e4cc: 0x109e4cc: sll   zero, zero, 0
-// 0x0109e4d0: 0x109e4d0: jr    ra addiu sp, sp, 24
+// 0x0109eb10: 0x109eb10: lw    ra, 20(sp)
+// 0x0109eb14: 0x109eb14: sll   zero, zero, 0
+// 0x0109eb18: 0x109eb18: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3112,7 +3112,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_popup_update_location_109e4d8(int32,int32)
+.method public static int32 ssd_popup_update_location_109eb20(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -3138,7 +3138,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e4d8: 0x109e4d8: lw    v0, 164(a0)
+// 0x0109eb20: 0x109eb20: lw    v0, 164(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -3147,7 +3147,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109e4dc: 0x109e4dc: lw    v1, 4(a1)
+// 0x0109eb24: 0x109eb24: lw    v1, 4(a1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -3156,14 +3156,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109e4e0: 0x109e4e0: lw    a0, 0(a1)
+// 0x0109eb28: 0x109eb28: lw    a0, 0(a1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x0109e4e4: 0x109e4e4: sw    v1, 12(v0)
+// 0x0109eb2c: 0x109eb2c: sw    v1, 12(v0)
 	ldloc 2
 	ldloc.3
 	ldc.i4.2
@@ -3172,7 +3172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0109e4e8: 0x109e4e8: jr    ra sw    a0, 8(v0)
+// 0x0109eb30: 0x109eb30: jr    ra sw    a0, 8(v0)
 	ldloc 2
 	ldloc.3
 	ldc.i4.2
@@ -3188,7 +3188,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s5,int32 s3,int32 s4,int32 s6,int32 ra)
@@ -3244,12 +3244,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e4f0: 0x109e4f0: addiu sp, sp, -64
+// 0x0109eb38: 0x109eb38: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0109e4f4: 0x109e4f4: sw    s4, 48(sp)
+// 0x0109eb3c: 0x109eb3c: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3258,14 +3258,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109e4f8: 0x109e4f8: addu  s4, a0, zero
+// 0x0109eb40: 0x109eb40: addu  s4, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0109e4fc: 0x109e4fc: addiu a0, zero, 16
+// 0x0109eb44: 0x109eb44: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-// 0x0109e500: 0x109e500: sw    ra, 60(sp)
-// 0x0109e504: 0x109e504: sw    s6, 56(sp)
+// 0x0109eb48: 0x109eb48: sw    ra, 60(sp)
+// 0x0109eb4c: 0x109eb4c: sw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3274,7 +3274,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109e508: 0x109e508: sw    s5, 52(sp)
+// 0x0109eb50: 0x109eb50: sw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3283,13 +3283,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109e50c: 0x109e50c: addu  s6, a3, zero
+// 0x0109eb54: 0x109eb54: addu  s6, a3, zero
 	ldloc 4
 	stloc 14
-// 0x0109e510: 0x109e510: addu  s5, a2, zero
+// 0x0109eb58: 0x109eb58: addu  s5, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0109e514: 0x109e514: sw    s3, 44(sp)
+// 0x0109eb5c: 0x109eb5c: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3298,7 +3298,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109e518: 0x109e518: sw    s2, 40(sp)
+// 0x0109eb60: 0x109eb60: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3307,7 +3307,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e51c: 0x109e51c: sw    s1, 36(sp)
+// 0x0109eb64: 0x109eb64: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3316,7 +3316,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109e520: 0x109e520: sw    s0, 32(sp)
+// 0x0109eb68: 0x109eb68: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3325,7 +3325,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e524: 0x109e524: lw    s0, 88(sp)
+// 0x0109eb6c: 0x109eb6c: lw    s0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3334,7 +3334,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e528: 0x109e528: lw    s3, 84(sp)
+// 0x0109eb70: 0x109eb70: lw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3343,7 +3343,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109e52c: 0x109e52c: jal   0x1000910 addu  s1, a1, zero
+// 0x0109eb74: 0x109eb74: jal   0x1000910 addu  s1, a1, zero
 	ldloc.2
 	stloc 10
 	ldloc.0
@@ -3356,16 +3356,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e534: 0x109e534: addu  a0, v0, zero
+// 0x0109eb7c: 0x109eb7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109e538: 0x109e538: addu  a1, zero, zero
+// 0x0109eb80: 0x109eb80: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e53c: 0x109e53c: addiu a2, zero, 16
+// 0x0109eb84: 0x109eb84: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0109e540: 0x109e540: jal   0x100177c addu  s2, v0, zero
+// 0x0109eb88: 0x109eb88: jal   0x100177c addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -3377,26 +3377,26 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e548: 0x109e548: lui   a3, 0x10000
+// 0x0109eb90: 0x109eb90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0109e54c: 0x109e54c: ori   a3, a3, 20481
+// 0x0109eb94: 0x109eb94: ori   a3, a3, 20481
 	ldloc 4
 	ldc.i4 20481
 	or
 	stloc 4
-// 0x0109e550: 0x109e550: addu  a2, s5, zero
+// 0x0109eb98: 0x109eb98: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x0109e554: 0x109e554: or    a3, s0, a3
+// 0x0109eb9c: 0x109eb9c: or    a3, s0, a3
 	ldloc 8
 	ldloc 4
 	or
 	stloc 4
-// 0x0109e558: 0x109e558: addu  a0, s4, zero
+// 0x0109eba0: 0x109eba0: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x0109e55c: 0x109e55c: jal   0x1095a08 addu  a1, s1, zero
+// 0x0109eba4: 0x109eba4: jal   0x1096050 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3404,12 +3404,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e564: 0x109e564: lw    a3, 80(sp)
+// 0x0109ebac: 0x109ebac: lw    a3, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3418,16 +3418,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109e568: 0x109e568: addu  a2, s6, zero
+// 0x0109ebb0: 0x109ebb0: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x0109e56c: 0x109e56c: addu  a0, s4, zero
+// 0x0109ebb4: 0x109ebb4: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x0109e570: 0x109e570: addu  a1, s1, zero
+// 0x0109ebb8: 0x109ebb8: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0109e574: 0x109e574: sw    s0, 16(sp)
+// 0x0109ebbc: 0x109ebbc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3436,7 +3436,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e578: 0x109e578: jal   0x1093a24 addu  s5, v0, zero
+// 0x0109ebc0: 0x109ebc0: jal   0x1094048 addu  s5, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -3444,33 +3444,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e580: 0x109e580: addu  a0, v0, zero
+// 0x0109ebc8: 0x109ebc8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109e584: 0x109e584: addu  a1, zero, zero
+// 0x0109ebcc: 0x109ebcc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e588: 0x109e588: addu  a2, zero, zero
+// 0x0109ebd0: 0x109ebd0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109e58c: 0x109e58c: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0109ebd4: 0x109ebd4: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109e594: 0x109e594: beq   s3, zero, 0x109e5c4 sll   zero, zero, 0
+// 0x0109ebdc: 0x109ebdc: beq   s3, zero, 0x109ec0c sll   zero, zero, 0
 	ldloc 12
-	brfalse L_109e5c4
+	brfalse L_109ec0c
 // --- basic block ---
-// 0x0109e59c: 0x109e59c: lw    v1, 4(s3)
+// 0x0109ebe4: 0x109ebe4: lw    v1, 4(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3479,24 +3479,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e5a0: 0x109e5a0: sll   zero, zero, 0
-// 0x0109e5a4: 0x109e5a4: beq   v1, zero, 0x109e5c4 sll   zero, zero, 0
+// 0x0109ebe8: 0x109ebe8: sll   zero, zero, 0
+// 0x0109ebec: 0x109ebec: beq   v1, zero, 0x109ec0c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109e5c4
+	brfalse L_109ec0c
 // --- basic block ---
-// 0x0109e5ac: 0x109e5ac: lw    v0, 0(s3)
+// 0x0109ebf4: 0x109ebf4: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109e5b0: 0x109e5b0: sll   zero, zero, 0
-// 0x0109e5b4: 0x109e5b4: beq   v0, zero, 0x109e5c4 sll   zero, zero, 0
+// 0x0109ebf8: 0x109ebf8: sll   zero, zero, 0
+// 0x0109ebfc: 0x109ebfc: beq   v0, zero, 0x109ec0c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109e5c4
+	brfalse L_109ec0c
 // --- basic block ---
-// 0x0109e5bc: 0x109e5bc: sw    v1, 12(s2)
+// 0x0109ec04: 0x109ec04: sw    v1, 12(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3505,7 +3505,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e5c0: 0x109e5c0: sw    v0, 8(s2)
+// 0x0109ec08: 0x109ec08: sw    v0, 8(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3514,8 +3514,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_109e5c4:
-// 0x0109e5c4: 0x109e5c4: lw    v0, 184(s0)
+L_109ec0c:
+// 0x0109ec0c: 0x109ec0c: lw    v0, 184(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3524,7 +3524,7 @@ L_109e5c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109e5c8: 0x109e5c8: sw    s2, 164(s0)
+// 0x0109ec10: 0x109ec10: sw    s2, 164(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3533,7 +3533,7 @@ L_109e5c4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e5cc: 0x109e5cc: sw    v0, 4(s2)
+// 0x0109ec14: 0x109ec14: sw    v0, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3542,15 +3542,15 @@ L_109e5c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109e5d0: 0x109e5d0: lui   v0, 0x10a0000
+// 0x0109ec18: 0x109ec18: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109e5d4: 0x109e5d4: addiu v0, v0, -7000
+// 0x0109ec1c: 0x109ec1c: addiu v0, v0, -5392
 	ldloc 5
-	ldc.i4 -7000
+	ldc.i4 -5392
 	add
 	stloc 5
-// 0x0109e5d8: 0x109e5d8: sw    v0, 184(s0)
+// 0x0109ec20: 0x109ec20: sw    v0, 184(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3559,7 +3559,7 @@ L_109e5c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109e5dc: 0x109e5dc: beq   s1, zero, 0x109e698 sw    zero, 108(s0)
+// 0x0109ec24: 0x109ec24: beq   s1, zero, 0x109ece0 sw    zero, 108(s0)
 	ldloc 10
 	ldloc 6
 	ldloc 8
@@ -3569,56 +3569,56 @@ L_109e5c4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_109e698
+	brfalse L_109ece0
 // --- basic block ---
-// 0x0109e5e4: 0x109e5e4: lb    v0, 0(s1)
+// 0x0109ec2c: 0x109ec2c: lb    v0, 0(s1)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109e5e8: 0x109e5e8: sll   zero, zero, 0
-// 0x0109e5ec: 0x109e5ec: beq   v0, zero, 0x109e69c addu  a0, s5, zero
+// 0x0109ec30: 0x109ec30: sll   zero, zero, 0
+// 0x0109ec34: 0x109ec34: beq   v0, zero, 0x109ece4 addu  a0, s5, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brfalse L_109e69c
+	brfalse L_109ece4
 // --- basic block ---
-// 0x0109e5f4: 0x109e5f4: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0109ec3c: 0x109ec3c: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0109e5fc: 0x109e5fc: beq   v0, zero, 0x109e608 addiu a3, zero, 30
+// 0x0109ec44: 0x109ec44: beq   v0, zero, 0x109ec50 addiu a3, zero, 30
 	ldloc 5
 	ldc.i4.s 30
 	stloc 4
-	brfalse L_109e608
+	brfalse L_109ec50
 // --- basic block ---
-// 0x0109e604: 0x109e604: addiu a3, zero, 45
+// 0x0109ec4c: 0x109ec4c: addiu a3, zero, 45
 	ldc.i4.s 45
 	stloc 4
-L_109e608:
-// 0x0109e608: 0x109e608: lui   a1, 0x10000
+L_109ec50:
+// 0x0109ec50: 0x109ec50: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0109e60c: 0x109e60c: lui   a0, 0x20000
+// 0x0109ec54: 0x109ec54: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109e610: 0x109e610: addiu a1, a1, 18500
+// 0x0109ec58: 0x109ec58: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109e614: 0x109e614: addiu a0, a0, -1200
+// 0x0109ec5c: 0x109ec5c: addiu a0, a0, -736
 	ldloc.1
-	ldc.i4 -1200
+	ldc.i4 -736
 	add
 	stloc.1
-// 0x0109e618: 0x109e618: addiu a2, zero, -1
+// 0x0109ec60: 0x109ec60: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0109e61c: 0x109e61c: addiu v0, zero, 8
+// 0x0109ec64: 0x109ec64: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0109e620: 0x109e620: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0109ec68: 0x109ec68: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3632,35 +3632,35 @@ L_109e608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e628: 0x109e628: addu  a0, v0, zero
+// 0x0109ec70: 0x109ec70: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109e62c: 0x109e62c: addu  a2, zero, zero
+// 0x0109ec74: 0x109ec74: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109e630: 0x109e630: addu  a1, zero, zero
+// 0x0109ec78: 0x109ec78: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e634: 0x109e634: jal   0x1098fe0 addu  s2, v0, zero
+// 0x0109ec7c: 0x109ec7c: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109e63c: 0x109e63c: lui   a1, 0x0
+// 0x0109ec84: 0x109ec84: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e640: 0x109e640: addu  a0, s2, zero
+// 0x0109ec88: 0x109ec88: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0109e644: 0x109e644: jal   0x10991ac addiu a1, a1, 17648
+// 0x0109ec8c: 0x109ec8c: jal   0x10997f4 addiu a1, a1, 17648
 	ldloc.2
 	ldc.i4 17648
 	add
@@ -3670,26 +3670,26 @@ L_109e608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e64c: 0x109e64c: lui   a0, 0x20000
+// 0x0109ec94: 0x109ec94: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109e650: 0x109e650: addiu a3, zero, 24
+// 0x0109ec98: 0x109ec98: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0109e654: 0x109e654: addu  a1, s1, zero
+// 0x0109ec9c: 0x109ec9c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0109e658: 0x109e658: addiu a0, a0, -25160
+// 0x0109eca0: 0x109eca0: addiu a0, a0, -24696
 	ldloc.1
-	ldc.i4 -25160
+	ldc.i4 -24696
 	add
 	stloc.1
-// 0x0109e65c: 0x109e65c: jal   0x1098d10 addiu a2, zero, 20
+// 0x0109eca4: 0x109eca4: jal   0x1099358 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.0
@@ -3697,26 +3697,26 @@ L_109e608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e664: 0x109e664: lui   a1, 0x0
+// 0x0109ecac: 0x109ecac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e668: 0x109e668: addu  a0, v0, zero
+// 0x0109ecb0: 0x109ecb0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109e66c: 0x109e66c: addiu a1, a1, 23000
+// 0x0109ecb4: 0x109ecb4: addiu a1, a1, 23000
 	ldloc.2
 	ldc.i4 23000
 	add
 	stloc.2
-// 0x0109e670: 0x109e670: addu  a2, zero, zero
+// 0x0109ecb8: 0x109ecb8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109e674: 0x109e674: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x0109ecbc: 0x109ecbc: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3728,9 +3728,9 @@ L_109e608:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109e67c: 0x109e67c: lw    v0, 24(sp)
+// 0x0109ecc4: 0x109ecc4: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3739,52 +3739,52 @@ L_109e608:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109e680: 0x109e680: addu  a0, s2, zero
+// 0x0109ecc8: 0x109ecc8: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0109e684: 0x109e684: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0109eccc: 0x109eccc: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e68c: 0x109e68c: addu  a0, s0, zero
+// 0x0109ecd4: 0x109ecd4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109e690: 0x109e690: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0109ecd8: 0x109ecd8: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109e698:
-// 0x0109e698: 0x109e698: addu  a0, s5, zero
+L_109ece0:
+// 0x0109ece0: 0x109ece0: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-L_109e69c:
-// 0x0109e69c: 0x109e69c: jal   0x1098ec4 addu  a1, s0, zero
+L_109ece4:
+// 0x0109ece4: 0x109ece4: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109e6a4: 0x109e6a4: lw    ra, 60(sp)
-// 0x0109e6a8: 0x109e6a8: addu  v0, s0, zero
+// 0x0109ecec: 0x109ecec: lw    ra, 60(sp)
+// 0x0109ecf0: 0x109ecf0: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0109e6ac: 0x109e6ac: lw    s6, 56(sp)
+// 0x0109ecf4: 0x109ecf4: lw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3793,7 +3793,7 @@ L_109e69c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109e6b0: 0x109e6b0: lw    s5, 52(sp)
+// 0x0109ecf8: 0x109ecf8: lw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3802,7 +3802,7 @@ L_109e69c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109e6b4: 0x109e6b4: lw    s4, 48(sp)
+// 0x0109ecfc: 0x109ecfc: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3811,7 +3811,7 @@ L_109e69c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109e6b8: 0x109e6b8: lw    s3, 44(sp)
+// 0x0109ed00: 0x109ed00: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3820,7 +3820,7 @@ L_109e69c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109e6bc: 0x109e6bc: lw    s2, 40(sp)
+// 0x0109ed04: 0x109ed04: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3829,7 +3829,7 @@ L_109e69c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e6c0: 0x109e6c0: lw    s1, 36(sp)
+// 0x0109ed08: 0x109ed08: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3838,7 +3838,7 @@ L_109e69c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109e6c4: 0x109e6c4: lw    s0, 32(sp)
+// 0x0109ed0c: 0x109ed0c: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3847,7 +3847,7 @@ L_109e69c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e6c8: 0x109e6c8: jr    ra addiu sp, sp, 64
+// 0x0109ed10: 0x109ed10: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3859,7 +3859,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+.method public static int32 ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -3897,12 +3897,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e6d0: 0x109e6d0: addiu sp, sp, -24
+// 0x0109ed18: 0x109ed18: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109e6d4: 0x109e6d4: sw    s0, 16(sp)
+// 0x0109ed1c: 0x109ed1c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3911,14 +3911,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e6d8: 0x109e6d8: addu  a2, a1, zero
+// 0x0109ed20: 0x109ed20: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0109e6dc: 0x109e6dc: addu  s0, a1, zero
+// 0x0109ed24: 0x109ed24: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0109e6e0: 0x109e6e0: sw    ra, 20(sp)
-// 0x0109e6e4: 0x109e6e4: jal   0x109a45c addu  a1, zero, zero
+// 0x0109ed28: 0x109ed28: sw    ra, 20(sp)
+// 0x0109ed2c: 0x109ed2c: jal   0x109aaa4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3926,36 +3926,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109e6ec: 0x109e6ec: lui   a0, 0x20000
+// 0x0109ed34: 0x109ed34: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109e6f0: 0x109e6f0: addiu a0, a0, -1324
+// 0x0109ed38: 0x109ed38: addiu a0, a0, -860
 	ldloc.1
-	ldc.i4 -1324
+	ldc.i4 -860
 	add
 	stloc.1
-// 0x0109e6f4: 0x109e6f4: sw    a0, 0(v0)
+// 0x0109ed3c: 0x109ed3c: sw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0109e6f8: 0x109e6f8: lw    ra, 20(sp)
-// 0x0109e6fc: 0x109e6fc: lui   a0, 0x10a0000
+// 0x0109ed40: 0x109ed40: lw    ra, 20(sp)
+// 0x0109ed44: 0x109ed44: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x0109e700: 0x109e700: addiu a0, a0, -6376
+// 0x0109ed48: 0x109ed48: addiu a0, a0, -4768
 	ldloc.1
-	ldc.i4 -6376
+	ldc.i4 -4768
 	add
 	stloc.1
-// 0x0109e704: 0x109e704: sw    s0, 48(v0)
+// 0x0109ed4c: 0x109ed4c: sw    s0, 48(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3964,7 +3964,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e708: 0x109e708: sw    a0, 184(v0)
+// 0x0109ed50: 0x109ed50: sw    a0, 184(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3973,7 +3973,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109e70c: 0x109e70c: lw    s0, 16(sp)
+// 0x0109ed54: 0x109ed54: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3982,7 +3982,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e710: 0x109e710: jr    ra addiu sp, sp, 24
+// 0x0109ed58: 0x109ed58: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3994,7 +3994,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 draw_109e718(int32,int32,int32,int32,int32)
+.method public static int32 draw_109ed60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 s0,int32 v0,int32 s1,int32 ra)
@@ -4035,24 +4035,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e718: 0x109e718: lui   v0, 0x80000
+// 0x0109ed60: 0x109ed60: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0109e71c: 0x109e71c: lw    a0, 10004(v0)
+// 0x0109ed64: 0x109ed64: lw    a0, 10468(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2501
+	ldc.i4 2617
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109e720: 0x109e720: addiu sp, sp, -32
+// 0x0109ed68: 0x109ed68: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109e724: 0x109e724: sw    s1, 24(sp)
+// 0x0109ed6c: 0x109ed6c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4061,7 +4061,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109e728: 0x109e728: sw    s0, 20(sp)
+// 0x0109ed70: 0x109ed70: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4070,23 +4070,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e72c: 0x109e72c: sw    ra, 28(sp)
-// 0x0109e730: 0x109e730: addu  s0, a1, zero
+// 0x0109ed74: 0x109ed74: sw    ra, 28(sp)
+// 0x0109ed78: 0x109ed78: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0109e734: 0x109e734: bne   a0, zero, 0x109e768 addu  s1, a2, zero
+// 0x0109ed7c: 0x109ed7c: bne   a0, zero, 0x109edb0 addu  s1, a2, zero
 	ldloc.1
 	ldloc.3
 	stloc 9
-	brtrue L_109e768
+	brtrue L_109edb0
 // --- basic block ---
-// 0x0109e73c: 0x109e73c: lui   a0, 0x0
+// 0x0109ed84: 0x109ed84: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0109e740: 0x109e740: addu  a1, zero, zero
+// 0x0109ed88: 0x109ed88: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109e744: 0x109e744: jal   0x104ef00 addiu a0, a0, 32244
+// 0x0109ed8c: 0x109ed8c: jal   0x104ef10 addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
@@ -4096,17 +4096,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x0109e74c: 0x109e74c: lui   a0, 0x20000
+// 0x0109ed94: 0x109ed94: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109e750: 0x109e750: jal   0x104edb0 addiu a0, a0, -1180
+// 0x0109ed98: 0x109ed98: jal   0x104edc0 addiu a0, a0, -716
 	ldloc.1
-	ldc.i4 -1180
+	ldc.i4 -716
 	add
 	stloc.1
 	ldloc.0
@@ -4114,37 +4114,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x0109e758: 0x109e758: jal   0x104dd5c addiu a0, zero, 1
+// 0x0109eda0: 0x109eda0: jal   0x104dd6c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x0109e760: 0x109e760: j	 0x109e770 sll   zero, zero, 0
-	br L_109e770
+// 0x0109eda8: 0x109eda8: j	 0x109edb8 sll   zero, zero, 0
+	br L_109edb8
 // --- basic block ---
-L_109e768:
-// 0x0109e768: 0x109e768: jal   0x104e35c sll   zero, zero, 0
+L_109edb0:
+// 0x0109edb0: 0x109edb0: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-L_109e770:
-// 0x0109e770: 0x109e770: lw    v0, 4(s0)
+L_109edb8:
+// 0x0109edb8: 0x109edb8: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4153,17 +4153,17 @@ L_109e770:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e774: 0x109e774: andi  s1, s1, 1
+// 0x0109edbc: 0x109edbc: andi  s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	and
 	stloc 9
-// 0x0109e778: 0x109e778: addiu v1, v0, 1
+// 0x0109edc0: 0x109edc0: addiu v1, v0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0109e77c: 0x109e77c: bne   s1, zero, 0x109e7a8 sw    v1, 12(s0)
+// 0x0109edc4: 0x109edc4: bne   s1, zero, 0x109edf0 sw    v1, 12(s0)
 	ldloc 9
 	ldloc 5
 	ldloc 7
@@ -4173,16 +4173,16 @@ L_109e770:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_109e7a8
+	brtrue L_109edf0
 // --- basic block ---
-// 0x0109e784: 0x109e784: lw    a0, 0(s0)
+// 0x0109edcc: 0x109edcc: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109e788: 0x109e788: lw    v1, 8(s0)
+// 0x0109edd0: 0x109edd0: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4191,24 +4191,24 @@ L_109e770:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e78c: 0x109e78c: addiu a0, a0, 5
+// 0x0109edd4: 0x109edd4: addiu a0, a0, 5
 	ldloc.1
 	ldc.i4.5
 	add
 	stloc.1
-// 0x0109e790: 0x109e790: addiu v1, v1, -5
+// 0x0109edd8: 0x109edd8: addiu v1, v1, -5
 	ldloc 6
 	ldc.i4.s -5
 	add
 	stloc 6
-// 0x0109e794: 0x109e794: sw    a0, 0(s0)
+// 0x0109eddc: 0x109eddc: sw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0109e798: 0x109e798: sw    v1, 8(s0)
+// 0x0109ede0: 0x109ede0: sw    v1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4217,7 +4217,7 @@ L_109e770:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e79c: 0x109e79c: sw    v0, 12(s0)
+// 0x0109ede4: 0x109ede4: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4226,21 +4226,21 @@ L_109e770:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e7a0: 0x109e7a0: jal   0x104dde4 addu  a0, s0, zero
+// 0x0109ede8: 0x109ede8: jal   0x104ddf4 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_erase_area_104dde4(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_erase_area_104ddf4(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-L_109e7a8:
-// 0x0109e7a8: 0x109e7a8: lw    ra, 28(sp)
-// 0x0109e7ac: 0x109e7ac: lw    s1, 24(sp)
+L_109edf0:
+// 0x0109edf0: 0x109edf0: lw    ra, 28(sp)
+// 0x0109edf4: 0x109edf4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4249,7 +4249,7 @@ L_109e7a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e7b0: 0x109e7b0: lw    s0, 20(sp)
+// 0x0109edf8: 0x109edf8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4258,7 +4258,7 @@ L_109e7a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e7b4: 0x109e7b4: jr    ra addiu sp, sp, 32
+// 0x0109edfc: 0x109edfc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4270,7 +4270,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_icon_wimage_is_valid_109e7bc(int32,int32)
+.method public static int32 ssd_icon_wimage_is_valid_109ee04(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4296,22 +4296,22 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e7bc: 0x109e7bc: beq   a0, zero, 0x109e820 sll   zero, zero, 0
+// 0x0109ee04: 0x109ee04: beq   a0, zero, 0x109ee68 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_109e820
-// 0x0109e7c4: 0x109e7c4: lw    a1, 0(a0)
+	brfalse L_109ee68
+// 0x0109ee0c: 0x109ee0c: lw    a1, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109e7c8: 0x109e7c8: sll   zero, zero, 0
-// 0x0109e7cc: 0x109e7cc: beq   a1, zero, 0x109e820 sll   zero, zero, 0
+// 0x0109ee10: 0x109ee10: sll   zero, zero, 0
+// 0x0109ee14: 0x109ee14: beq   a1, zero, 0x109ee68 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109e820
+	brfalse L_109ee68
 // --- basic block ---
-// 0x0109e7d4: 0x109e7d4: lw    v1, 4(a0)
+// 0x0109ee1c: 0x109ee1c: lw    v1, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4320,12 +4320,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109e7d8: 0x109e7d8: sll   zero, zero, 0
-// 0x0109e7dc: 0x109e7dc: beq   v1, zero, 0x109e820 sll   zero, zero, 0
+// 0x0109ee20: 0x109ee20: sll   zero, zero, 0
+// 0x0109ee24: 0x109ee24: beq   v1, zero, 0x109ee68 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_109e820
+	brfalse L_109ee68
 // --- basic block ---
-// 0x0109e7e4: 0x109e7e4: lw    v0, 8(a0)
+// 0x0109ee2c: 0x109ee2c: lw    v0, 8(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4334,42 +4334,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109e7e8: 0x109e7e8: sll   zero, zero, 0
-// 0x0109e7ec: 0x109e7ec: beq   v0, zero, 0x109e820 sll   zero, zero, 0
+// 0x0109ee30: 0x109ee30: sll   zero, zero, 0
+// 0x0109ee34: 0x109ee34: beq   v0, zero, 0x109ee68 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_109e820
+	brfalse L_109ee68
 // --- basic block ---
-// 0x0109e7f4: 0x109e7f4: lb    a0, 0(a1)
+// 0x0109ee3c: 0x109ee3c: lb    a0, 0(a1)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.0
-// 0x0109e7f8: 0x109e7f8: sll   zero, zero, 0
-// 0x0109e7fc: 0x109e7fc: beq   a0, zero, 0x109e820 sll   zero, zero, 0
+// 0x0109ee40: 0x109ee40: sll   zero, zero, 0
+// 0x0109ee44: 0x109ee44: beq   a0, zero, 0x109ee68 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_109e820
+	brfalse L_109ee68
 // --- basic block ---
-// 0x0109e804: 0x109e804: lb    v1, 0(v1)
+// 0x0109ee4c: 0x109ee4c: lb    v1, 0(v1)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x0109e808: 0x109e808: sll   zero, zero, 0
-// 0x0109e80c: 0x109e80c: beq   v1, zero, 0x109e820 sll   zero, zero, 0
+// 0x0109ee50: 0x109ee50: sll   zero, zero, 0
+// 0x0109ee54: 0x109ee54: beq   v1, zero, 0x109ee68 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_109e820
+	brfalse L_109ee68
 // --- basic block ---
-// 0x0109e814: 0x109e814: lb    v0, 0(v0)
+// 0x0109ee5c: 0x109ee5c: lb    v0, 0(v0)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0109e818: 0x109e818: jr    ra sltu  v0, zero, v0
+// 0x0109ee60: 0x109ee60: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
 	br __CIBYL_function_return
 // --- basic block ---
-L_109e820:
-// 0x0109e820: 0x109e820: jr    ra addu  v0, zero, zero
+L_109ee68:
+// 0x0109ee68: 0x109ee68: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	br __CIBYL_function_return
@@ -4379,7 +4379,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 on_key_pressed_109e828(int32,int32,int32,int32,int32)
+.method public static int32 on_key_pressed_109ee70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
@@ -4417,18 +4417,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e828: 0x109e828: addiu sp, sp, -24
+// 0x0109ee70: 0x109ee70: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109e82c: 0x109e82c: andi  v0, a2, 2
+// 0x0109ee74: 0x109ee74: andi  v0, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc 5
-// 0x0109e830: 0x109e830: sw    ra, 20(sp)
-// 0x0109e834: 0x109e834: lw    v1, 164(a0)
+// 0x0109ee78: 0x109ee78: sw    ra, 20(sp)
+// 0x0109ee7c: 0x109ee7c: lw    v1, 164(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4437,25 +4437,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e838: 0x109e838: beq   v0, zero, 0x109e874 addu  a3, a0, zero
+// 0x0109ee80: 0x109ee80: beq   v0, zero, 0x109eebc addu  a3, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 4
-	brfalse L_109e874
+	brfalse L_109eebc
 // --- basic block ---
-// 0x0109e840: 0x109e840: lb    t0, 0(a1)
+// 0x0109ee88: 0x109ee88: lb    t0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x0109e844: 0x109e844: addiu v0, zero, 13
+// 0x0109ee8c: 0x109ee8c: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x0109e848: 0x109e848: bne   t0, v0, 0x109e874 sll   zero, zero, 0
+// 0x0109ee90: 0x109ee90: bne   t0, v0, 0x109eebc sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	bne.un L_109e874
+	bne.un L_109eebc
 // --- basic block ---
-// 0x0109e850: 0x109e850: lw    v0, 112(a0)
+// 0x0109ee98: 0x109ee98: lw    v0, 112(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4464,18 +4464,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109e854: 0x109e854: sll   zero, zero, 0
-// 0x0109e858: 0x109e858: beq   v0, zero, 0x109e874 sll   zero, zero, 0
+// 0x0109ee9c: 0x109ee9c: sll   zero, zero, 0
+// 0x0109eea0: 0x109eea0: beq   v0, zero, 0x109eebc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109e874
+	brfalse L_109eebc
 // --- basic block ---
-// 0x0109e860: 0x109e860: lui   a1, 0x20000
+// 0x0109eea8: 0x109eea8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0109e864: 0x109e864: jalr  v0 addiu a1, a1, -3888
+// 0x0109eeac: 0x109eeac: jalr  v0 addiu a1, a1, -3424
 	ldloc 5
 	ldloc.2
-	ldc.i4 -3888
+	ldc.i4 -3424
 	add
 	stloc.2
 	ldloc.0
@@ -4488,13 +4488,13 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0109e86c: 0x109e86c: j	 0x109e88c addiu v0, zero, 1
+// 0x0109eeb4: 0x109eeb4: j	 0x109eed4 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_109e88c
+	br L_109eed4
 // --- basic block ---
-L_109e874:
-// 0x0109e874: 0x109e874: lw    v1, 348(v1)
+L_109eebc:
+// 0x0109eebc: 0x109eebc: lw    v1, 348(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4503,14 +4503,14 @@ L_109e874:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e878: 0x109e878: sll   zero, zero, 0
-// 0x0109e87c: 0x109e87c: beq   v1, zero, 0x109e88c addu  v0, zero, zero
+// 0x0109eec0: 0x109eec0: sll   zero, zero, 0
+// 0x0109eec4: 0x109eec4: beq   v1, zero, 0x109eed4 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109e88c
+	brfalse L_109eed4
 // --- basic block ---
-// 0x0109e884: 0x109e884: jalr  v1 addu  a0, a3, zero
+// 0x0109eecc: 0x109eecc: jalr  v1 addu  a0, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc.1
@@ -4524,10 +4524,10 @@ L_109e874:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_109e88c:
-// 0x0109e88c: 0x109e88c: lw    ra, 20(sp)
-// 0x0109e890: 0x109e890: sll   zero, zero, 0
-// 0x0109e894: 0x109e894: jr    ra addiu sp, sp, 24
+L_109eed4:
+// 0x0109eed4: 0x109eed4: lw    ra, 20(sp)
+// 0x0109eed8: 0x109eed8: sll   zero, zero, 0
+// 0x0109eedc: 0x109eedc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4539,7 +4539,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_icon_set_width_109e89c(int32,int32)
+.method public static int32 ssd_icon_set_width_109eee4(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -4562,7 +4562,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e89c: 0x109e89c: lw    v0, 164(a0)
+// 0x0109eee4: 0x109eee4: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4571,8 +4571,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109e8a0: 0x109e8a0: sll   zero, zero, 0
-// 0x0109e8a4: 0x109e8a4: sw    a1, 332(v0)
+// 0x0109eee8: 0x109eee8: sll   zero, zero, 0
+// 0x0109eeec: 0x109eeec: sw    a1, 332(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4581,7 +4581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109e8a8: 0x109e8a8: jr    ra sw    a1, 328(v0)
+// 0x0109eef0: 0x109eef0: jr    ra sw    a1, 328(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4595,7 +4595,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 ssd_icon_set_state_109e8c4(int32,int32)
+.method public static int32 ssd_icon_set_state_109ef0c(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -4621,7 +4621,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e8c4: 0x109e8c4: lw    v1, 164(a0)
+// 0x0109ef0c: 0x109ef0c: lw    v1, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4630,8 +4630,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109e8c8: 0x109e8c8: sll   zero, zero, 0
-// 0x0109e8cc: 0x109e8cc: lw    v0, 340(v1)
+// 0x0109ef10: 0x109ef10: sll   zero, zero, 0
+// 0x0109ef14: 0x109ef14: lw    v0, 340(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4640,7 +4640,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109e8d0: 0x109e8d0: jr    ra sw    a1, 340(v1)
+// 0x0109ef18: 0x109ef18: jr    ra sw    a1, 340(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4656,7 +4656,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 ssd_icon_set_unhandled_key_press_109e8d8(int32,int32)
+.method public static int32 ssd_icon_set_unhandled_key_press_109ef20(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -4679,7 +4679,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e8d8: 0x109e8d8: lw    v0, 164(a0)
+// 0x0109ef20: 0x109ef20: lw    v0, 164(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4688,7 +4688,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109e8dc: 0x109e8dc: jr    ra sw    a1, 348(v0)
+// 0x0109ef24: 0x109ef24: jr    ra sw    a1, 348(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4702,7 +4702,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 on_pointer_down_109e8e4(int32,int32,int32,int32,int32)
+.method public static int32 on_pointer_down_109ef2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -4743,7 +4743,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e8e4: 0x109e8e4: lw    v0, 52(a0)
+// 0x0109ef2c: 0x109ef2c: lw    v0, 52(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4752,12 +4752,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109e8e8: 0x109e8e8: addiu sp, sp, -40
+// 0x0109ef30: 0x109ef30: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109e8ec: 0x109e8ec: sw    s1, 32(sp)
+// 0x0109ef34: 0x109ef34: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4766,7 +4766,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e8f0: 0x109e8f0: sw    s0, 28(sp)
+// 0x0109ef38: 0x109ef38: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4775,17 +4775,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e8f4: 0x109e8f4: sw    ra, 36(sp)
-// 0x0109e8f8: 0x109e8f8: addu  s1, a0, zero
+// 0x0109ef3c: 0x109ef3c: sw    ra, 36(sp)
+// 0x0109ef40: 0x109ef40: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0109e8fc: 0x109e8fc: beq   v0, zero, 0x109e920 addu  s0, zero, zero
+// 0x0109ef44: 0x109ef44: beq   v0, zero, 0x109ef68 addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_109e920
+	brfalse L_109ef68
 // --- basic block ---
-// 0x0109e904: 0x109e904: lw    v0, 60(a0)
+// 0x0109ef4c: 0x109ef4c: lw    v0, 60(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4794,14 +4794,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109e908: 0x109e908: sll   zero, zero, 0
-// 0x0109e90c: 0x109e90c: bne   v0, zero, 0x109e920 addiu s0, zero, 1
+// 0x0109ef50: 0x109ef50: sll   zero, zero, 0
+// 0x0109ef54: 0x109ef54: bne   v0, zero, 0x109ef68 addiu s0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brtrue L_109e920
+	brtrue L_109ef68
 // --- basic block ---
-// 0x0109e914: 0x109e914: jal   0x109617c sw    a1, 16(sp)
+// 0x0109ef5c: 0x109ef5c: jal   0x10967c4 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4815,12 +4815,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109e91c: 0x109e91c: lw    a1, 16(sp)
+// 0x0109ef64: 0x109ef64: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4829,8 +4829,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_109e920:
-// 0x0109e920: 0x109e920: lw    v0, 196(s1)
+L_109ef68:
+// 0x0109ef68: 0x109ef68: lw    v0, 196(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4839,12 +4839,12 @@ L_109e920:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109e924: 0x109e924: sll   zero, zero, 0
-// 0x0109e928: 0x109e928: beq   v0, zero, 0x109e944 sll   zero, zero, 0
+// 0x0109ef6c: 0x109ef6c: sll   zero, zero, 0
+// 0x0109ef70: 0x109ef70: beq   v0, zero, 0x109ef8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109e944
+	brfalse L_109ef8c
 // --- basic block ---
-// 0x0109e930: 0x109e930: jalr  v0 addu  a0, s1, zero
+// 0x0109ef78: 0x109ef78: jalr  v0 addu  a0, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
@@ -4858,19 +4858,19 @@ L_109e920:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109e938: 0x109e938: beq   v0, zero, 0x109e944 sll   zero, zero, 0
+// 0x0109ef80: 0x109ef80: beq   v0, zero, 0x109ef8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109e944
+	brfalse L_109ef8c
 // --- basic block ---
-// 0x0109e940: 0x109e940: addiu s0, zero, 1
+// 0x0109ef88: 0x109ef88: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_109e944:
-// 0x0109e944: 0x109e944: lw    ra, 36(sp)
-// 0x0109e948: 0x109e948: addu  v0, s0, zero
+L_109ef8c:
+// 0x0109ef8c: 0x109ef8c: lw    ra, 36(sp)
+// 0x0109ef90: 0x109ef90: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0109e94c: 0x109e94c: lw    s1, 32(sp)
+// 0x0109ef94: 0x109ef94: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4879,7 +4879,7 @@ L_109e944:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e950: 0x109e950: lw    s0, 28(sp)
+// 0x0109ef98: 0x109ef98: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4888,7 +4888,7 @@ L_109e944:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109e954: 0x109e954: jr    ra addiu sp, sp, 40
+// 0x0109ef9c: 0x109ef9c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4900,7 +4900,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_109e95c(int32,int32,int32,int32,int32)
+.method public static int32 draw_109efa4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 s5,int32 s4,int32 s7,int32 s2,int32 s6,int32 s8,int32 s3,int32 lo,int32 ra)
@@ -4965,12 +4965,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109e95c: 0x109e95c: addiu sp, sp, -64
+// 0x0109efa4: 0x109efa4: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0109e960: 0x109e960: sw    s0, 24(sp)
+// 0x0109efa8: 0x109efa8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4979,7 +4979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109e964: 0x109e964: lw    s0, 164(a0)
+// 0x0109efac: 0x109efac: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4988,8 +4988,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109e968: 0x109e968: sw    ra, 60(sp)
-// 0x0109e96c: 0x109e96c: lw    v0, 332(s0)
+// 0x0109efb0: 0x109efb0: sw    ra, 60(sp)
+// 0x0109efb4: 0x109efb4: lw    v0, 332(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4998,7 +4998,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e970: 0x109e970: sw    s8, 56(sp)
+// 0x0109efb8: 0x109efb8: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5007,7 +5007,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109e974: 0x109e974: sw    s7, 52(sp)
+// 0x0109efbc: 0x109efbc: sw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5016,7 +5016,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109e978: 0x109e978: sw    s6, 48(sp)
+// 0x0109efc0: 0x109efc0: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5025,7 +5025,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109e97c: 0x109e97c: sw    s5, 44(sp)
+// 0x0109efc4: 0x109efc4: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5034,7 +5034,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109e980: 0x109e980: sw    s4, 40(sp)
+// 0x0109efc8: 0x109efc8: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5043,7 +5043,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109e984: 0x109e984: sw    s3, 36(sp)
+// 0x0109efcc: 0x109efcc: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5052,7 +5052,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109e988: 0x109e988: sw    s2, 32(sp)
+// 0x0109efd0: 0x109efd0: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5061,7 +5061,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109e98c: 0x109e98c: sw    s1, 28(sp)
+// 0x0109efd4: 0x109efd4: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5070,27 +5070,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109e990: 0x109e990: lw    v1, 0(a1)
+// 0x0109efd8: 0x109efd8: lw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0109e994: 0x109e994: beq   v0, zero, 0x109e9a8 addu  v0, v0, v1
+// 0x0109efdc: 0x109efdc: beq   v0, zero, 0x109eff0 addu  v0, v0, v1
 	ldloc 6
 	ldloc 6
 	ldloc 9
 	add
 	stloc 6
-	brfalse L_109e9a8
+	brfalse L_109eff0
 // --- basic block ---
-// 0x0109e99c: 0x109e99c: addiu v0, v0, -1
+// 0x0109efe4: 0x109efe4: addiu v0, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0109e9a0: 0x109e9a0: j	 0x109e9ac sw    v0, 8(a1)
+// 0x0109efe8: 0x109efe8: j	 0x109eff4 sw    v0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5099,10 +5099,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	br L_109e9ac
+	br L_109eff4
 // --- basic block ---
-L_109e9a8:
-// 0x0109e9a8: 0x109e9a8: sw    v1, 8(a1)
+L_109eff0:
+// 0x0109eff0: 0x109eff0: sw    v1, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5111,8 +5111,8 @@ L_109e9a8:
 	add
 	ldloc 9
 	stelem.i4
-L_109e9ac:
-// 0x0109e9ac: 0x109e9ac: lw    v0, 336(s0)
+L_109eff4:
+// 0x0109eff4: 0x109eff4: lw    v0, 336(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5121,12 +5121,12 @@ L_109e9ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e9b0: 0x109e9b0: sll   zero, zero, 0
-// 0x0109e9b4: 0x109e9b4: beq   v0, zero, 0x109e9d0 sll   zero, zero, 0
+// 0x0109eff8: 0x109eff8: sll   zero, zero, 0
+// 0x0109effc: 0x109effc: beq   v0, zero, 0x109f018 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109e9d0
+	brfalse L_109f018
 // --- basic block ---
-// 0x0109e9bc: 0x109e9bc: lw    v1, 4(a1)
+// 0x0109f004: 0x109f004: lw    v1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5135,18 +5135,18 @@ L_109e9ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e9c0: 0x109e9c0: sll   zero, zero, 0
-// 0x0109e9c4: 0x109e9c4: addu  v0, v0, v1
+// 0x0109f008: 0x109f008: sll   zero, zero, 0
+// 0x0109f00c: 0x109f00c: addu  v0, v0, v1
 	ldloc 6
 	ldloc 9
 	add
 	stloc 6
-// 0x0109e9c8: 0x109e9c8: addiu v0, v0, -1
+// 0x0109f010: 0x109f010: addiu v0, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0109e9cc: 0x109e9cc: sw    v0, 12(a1)
+// 0x0109f014: 0x109f014: sw    v0, 12(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5155,17 +5155,17 @@ L_109e9ac:
 	add
 	ldloc 6
 	stelem.i4
-L_109e9d0:
-// 0x0109e9d0: 0x109e9d0: andi  a2, a2, 1
+L_109f018:
+// 0x0109f018: 0x109f018: andi  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc.3
-// 0x0109e9d4: 0x109e9d4: bne   a2, zero, 0x109eb28 sll   zero, zero, 0
+// 0x0109f01c: 0x109f01c: bne   a2, zero, 0x109f170 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_109eb28
+	brtrue L_109f170
 // --- basic block ---
-// 0x0109e9dc: 0x109e9dc: lw    v0, 4(a1)
+// 0x0109f024: 0x109f024: lw    v0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5174,14 +5174,14 @@ L_109e9d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e9e0: 0x109e9e0: lw    s4, 0(a1)
+// 0x0109f028: 0x109f028: lw    s4, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0109e9e4: 0x109e9e4: sw    v0, 20(sp)
+// 0x0109f02c: 0x109f02c: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5190,7 +5190,7 @@ L_109e9d0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109e9e8: 0x109e9e8: sw    s4, 16(sp)
+// 0x0109f030: 0x109f030: sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5199,7 +5199,7 @@ L_109e9d0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109e9ec: 0x109e9ec: lw    v1, 324(s0)
+// 0x0109f034: 0x109f034: lw    v1, 324(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5208,7 +5208,7 @@ L_109e9d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109e9f0: 0x109e9f0: lw    v0, 60(a0)
+// 0x0109f038: 0x109f038: lw    v0, 60(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5217,11 +5217,11 @@ L_109e9d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109e9f4: 0x109e9f4: bne   v1, zero, 0x109ea40 sll   zero, zero, 0
+// 0x0109f03c: 0x109f03c: bne   v1, zero, 0x109f088 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_109ea40
+	brtrue L_109f088
 // --- basic block ---
-// 0x0109e9fc: 0x109e9fc: lw    s1, 340(s0)
+// 0x0109f044: 0x109f044: lw    s1, 340(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5230,26 +5230,26 @@ L_109e9d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ea00: 0x109ea00: beq   v0, zero, 0x109ea20 sll   zero, zero, 0
+// 0x0109f048: 0x109f048: beq   v0, zero, 0x109f068 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109ea20
+	brfalse L_109f068
 // --- basic block ---
-// 0x0109ea08: 0x109ea08: addiu s1, s1, 30
+// 0x0109f050: 0x109f050: addiu s1, s1, 30
 	ldloc 7
 	ldc.i4.s 30
 	add
 	stloc 7
-// 0x0109ea0c: 0x109ea0c: sll   s1, s1, 3
+// 0x0109f054: 0x109f054: sll   s1, s1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x0109ea10: 0x109ea10: addu  s0, s0, s1
+// 0x0109f058: 0x109f058: addu  s0, s0, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x0109ea14: 0x109ea14: lw    a0, 4(s0)
+// 0x0109f05c: 0x109f05c: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5258,52 +5258,52 @@ L_109e9d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ea18: 0x109ea18: j	 0x109ea34 addiu a1, sp, 16
+// 0x0109f060: 0x109f060: j	 0x109f07c addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-	br L_109ea34
+	br L_109f07c
 // --- basic block ---
-L_109ea20:
-// 0x0109ea20: 0x109ea20: addiu s1, s1, 30
+L_109f068:
+// 0x0109f068: 0x109f068: addiu s1, s1, 30
 	ldloc 7
 	ldc.i4.s 30
 	add
 	stloc 7
-// 0x0109ea24: 0x109ea24: sll   s1, s1, 3
+// 0x0109f06c: 0x109f06c: sll   s1, s1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x0109ea28: 0x109ea28: addu  s0, s0, s1
+// 0x0109f070: 0x109f070: addu  s0, s0, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x0109ea2c: 0x109ea2c: lw    a0, 0(s0)
+// 0x0109f074: 0x109f074: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109ea30: 0x109ea30: addiu a1, sp, 16
+// 0x0109f078: 0x109f078: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-L_109ea34:
-// 0x0109ea34: 0x109ea34: addu  a2, zero, zero
+L_109f07c:
+// 0x0109f07c: 0x109f07c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109ea38: 0x109ea38: j	 0x109eb20 addu  a3, zero, zero
+// 0x0109f080: 0x109f080: j	 0x109f168 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_109eb20
+	br L_109f168
 // --- basic block ---
-L_109ea40:
-// 0x0109ea40: 0x109ea40: lw    s1, 340(s0)
+L_109f088:
+// 0x0109f088: 0x109f088: lw    s1, 340(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5312,79 +5312,79 @@ L_109ea40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ea44: 0x109ea44: beq   v0, zero, 0x109ea6c addiu v0, zero, 24
+// 0x0109f08c: 0x109f08c: beq   v0, zero, 0x109f0b4 addiu v0, zero, 24
 	ldloc 6
 	ldc.i4.s 24
 	stloc 6
-	brfalse L_109ea6c
+	brfalse L_109f0b4
 // --- basic block ---
-// 0x0109ea4c: 0x109ea4c: addiu v0, zero, 3
+// 0x0109f094: 0x109f094: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x0109ea50: 0x109ea50: mult  s1, v0
+// 0x0109f098: 0x109f098: mult  s1, v0
 	ldloc 7
 	ldloc 6
 	mul
 	stloc 17
-// 0x0109ea54: 0x109ea54: mflo  lo
+// 0x0109f09c: 0x109f09c: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x0109ea58: 0x109ea58: addiu s1, s1, 1
+// 0x0109f0a0: 0x109f0a0: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0109ea5c: 0x109ea5c: sll   s1, s1, 3
+// 0x0109f0a4: 0x109f0a4: sll   s1, s1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x0109ea60: 0x109ea60: addu  s1, s0, s1
+// 0x0109f0a8: 0x109f0a8: addu  s1, s0, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x0109ea64: 0x109ea64: j	 0x109ea78 addiu s1, s1, 4
+// 0x0109f0ac: 0x109f0ac: j	 0x109f0c0 addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	br L_109ea78
+	br L_109f0c0
 // --- basic block ---
-L_109ea6c:
-// 0x0109ea6c: 0x109ea6c: mult  s1, v0
+L_109f0b4:
+// 0x0109f0b4: 0x109f0b4: mult  s1, v0
 	ldloc 7
 	ldloc 6
 	mul
 	stloc 17
-// 0x0109ea70: 0x109ea70: mflo  lo
+// 0x0109f0b8: 0x109f0b8: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x0109ea74: 0x109ea74: addu  s1, s0, s1
+// 0x0109f0bc: 0x109f0bc: addu  s1, s0, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-L_109ea78:
-// 0x0109ea78: 0x109ea78: lw    a0, 0(s1)
+L_109f0c0:
+// 0x0109f0c0: 0x109f0c0: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109ea7c: 0x109ea7c: jal   0x104dffc addiu s8, sp, 16
+// 0x0109f0c4: 0x109f0c4: jal   0x104e00c addiu s8, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 15
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109ea84: 0x109ea84: lw    a0, 4(s1)
+// 0x0109f0cc: 0x109f0cc: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5393,16 +5393,16 @@ L_109ea78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ea88: 0x109ea88: jal   0x104dffc addu  s5, v0, zero
+// 0x0109f0d0: 0x109f0d0: jal   0x104e00c addu  s5, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109ea90: 0x109ea90: lw    a0, 8(s1)
+// 0x0109f0d8: 0x109f0d8: lw    a0, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5411,32 +5411,32 @@ L_109ea78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ea94: 0x109ea94: jal   0x104dffc addu  s6, v0, zero
+// 0x0109f0dc: 0x109f0dc: jal   0x104e00c addu  s6, v0, zero
 	ldloc 6
 	stloc 14
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109ea9c: 0x109ea9c: lw    a0, 0(s1)
+// 0x0109f0e4: 0x109f0e4: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0109eaa0: 0x109eaa0: addu  a1, s8, zero
+// 0x0109f0e8: 0x109f0e8: addu  a1, s8, zero
 	ldloc 15
 	stloc.2
-// 0x0109eaa4: 0x109eaa4: addu  a2, zero, zero
+// 0x0109f0ec: 0x109f0ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109eaa8: 0x109eaa8: addu  a3, zero, zero
+// 0x0109f0f0: 0x109f0f0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0109eaac: 0x109eaac: jal   0x104f4a8 addu  s7, v0, zero
+// 0x0109f0f4: 0x109f0f4: jal   0x104f4b8 addu  s7, v0, zero
 	ldloc 6
 	stloc 12
 	ldloc.0
@@ -5444,12 +5444,12 @@ L_109ea78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109eab4: 0x109eab4: lw    v0, 16(sp)
+// 0x0109f0fc: 0x109f0fc: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5458,16 +5458,16 @@ L_109ea78:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109eab8: 0x109eab8: subu  v1, zero, s7
+// 0x0109f100: 0x109f100: subu  v1, zero, s7
 	ldloc 12
 	neg
 	stloc 9
-// 0x0109eabc: 0x109eabc: addu  v0, v0, s5
+// 0x0109f104: 0x109f104: addu  v0, v0, s5
 	ldloc 6
 	ldloc 10
 	add
 	stloc 6
-// 0x0109eac0: 0x109eac0: sw    v0, 16(sp)
+// 0x0109f108: 0x109f108: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5476,7 +5476,7 @@ L_109ea78:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109eac4: 0x109eac4: lw    v0, 328(s0)
+// 0x0109f10c: 0x109f10c: lw    v0, 328(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5485,26 +5485,26 @@ L_109ea78:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109eac8: 0x109eac8: subu  s5, v1, s5
+// 0x0109f110: 0x109f110: subu  s5, v1, s5
 	ldloc 9
 	ldloc 10
 	sub
 	stloc 10
-// 0x0109eacc: 0x109eacc: addu  s3, s8, zero
+// 0x0109f114: 0x109f114: addu  s3, s8, zero
 	ldloc 15
 	stloc 16
-// 0x0109ead0: 0x109ead0: addu  s2, zero, zero
+// 0x0109f118: 0x109f118: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x0109ead4: 0x109ead4: j	 0x109eaf8 addu  s5, s5, v0
+// 0x0109f11c: 0x109f11c: j	 0x109f140 addu  s5, s5, v0
 	ldloc 10
 	ldloc 6
 	add
 	stloc 10
-	br L_109eaf8
+	br L_109f140
 // --- basic block ---
-L_109eadc:
-// 0x0109eadc: 0x109eadc: lw    a0, 4(s1)
+L_109f124:
+// 0x0109f124: 0x109f124: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5513,7 +5513,7 @@ L_109eadc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109eae0: 0x109eae0: jal   0x104f4a8 addu  s2, s2, s6
+// 0x0109f128: 0x109f128: jal   0x104f4b8 addu  s2, s2, s6
 	ldloc 13
 	ldloc 14
 	add
@@ -5523,12 +5523,12 @@ L_109eadc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109eae8: 0x109eae8: lw    v0, 16(sp)
+// 0x0109f130: 0x109f130: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5537,13 +5537,13 @@ L_109eadc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109eaec: 0x109eaec: sll   zero, zero, 0
-// 0x0109eaf0: 0x109eaf0: addu  v0, v0, s6
+// 0x0109f134: 0x109f134: sll   zero, zero, 0
+// 0x0109f138: 0x109f138: addu  v0, v0, s6
 	ldloc 6
 	ldloc 14
 	add
 	stloc 6
-// 0x0109eaf4: 0x109eaf4: sw    v0, 16(sp)
+// 0x0109f13c: 0x109f13c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5552,25 +5552,25 @@ L_109eadc:
 	add
 	ldloc 6
 	stelem.i4
-L_109eaf8:
-// 0x0109eaf8: 0x109eaf8: slt   v0, s2, s5
+L_109f140:
+// 0x0109f140: 0x109f140: slt   v0, s2, s5
 	ldloc 13
 	ldloc 10
 	clt
 	stloc 6
-// 0x0109eafc: 0x109eafc: addu  a1, s3, zero
+// 0x0109f144: 0x109f144: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x0109eb00: 0x109eb00: addu  a2, zero, zero
+// 0x0109f148: 0x109f148: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109eb04: 0x109eb04: bne   v0, zero, 0x109eadc addu  a3, zero, zero
+// 0x0109f14c: 0x109f14c: bne   v0, zero, 0x109f124 addu  a3, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_109eadc
+	brtrue L_109f124
 // --- basic block ---
-// 0x0109eb0c: 0x109eb0c: lw    v0, 328(s0)
+// 0x0109f154: 0x109f154: lw    v0, 328(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5579,7 +5579,7 @@ L_109eaf8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109eb10: 0x109eb10: lw    a0, 8(s1)
+// 0x0109f158: 0x109f158: lw    a0, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5588,17 +5588,17 @@ L_109eaf8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109eb14: 0x109eb14: addu  s4, s4, v0
+// 0x0109f15c: 0x109f15c: addu  s4, s4, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 11
-// 0x0109eb18: 0x109eb18: subu  s7, s4, s7
+// 0x0109f160: 0x109f160: subu  s7, s4, s7
 	ldloc 11
 	ldloc 12
 	sub
 	stloc 12
-// 0x0109eb1c: 0x109eb1c: sw    s7, 16(sp)
+// 0x0109f164: 0x109f164: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5607,21 +5607,21 @@ L_109eaf8:
 	add
 	ldloc 12
 	stelem.i4
-L_109eb20:
-// 0x0109eb20: 0x109eb20: jal   0x104f4a8 sll   zero, zero, 0
+L_109f168:
+// 0x0109f168: 0x109f168: jal   0x104f4b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_109eb28:
-// 0x0109eb28: 0x109eb28: lw    ra, 60(sp)
-// 0x0109eb2c: 0x109eb2c: lw    s8, 56(sp)
+L_109f170:
+// 0x0109f170: 0x109f170: lw    ra, 60(sp)
+// 0x0109f174: 0x109f174: lw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5630,7 +5630,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109eb30: 0x109eb30: lw    s7, 52(sp)
+// 0x0109f178: 0x109f178: lw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5639,7 +5639,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109eb34: 0x109eb34: lw    s6, 48(sp)
+// 0x0109f17c: 0x109f17c: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5648,7 +5648,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109eb38: 0x109eb38: lw    s5, 44(sp)
+// 0x0109f180: 0x109f180: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109eb3c: 0x109eb3c: lw    s4, 40(sp)
+// 0x0109f184: 0x109f184: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5666,7 +5666,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109eb40: 0x109eb40: lw    s3, 36(sp)
+// 0x0109f188: 0x109f188: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5675,7 +5675,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0109eb44: 0x109eb44: lw    s2, 32(sp)
+// 0x0109f18c: 0x109f18c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5684,7 +5684,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109eb48: 0x109eb48: lw    s1, 28(sp)
+// 0x0109f190: 0x109f190: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5693,7 +5693,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109eb4c: 0x109eb4c: lw    s0, 24(sp)
+// 0x0109f194: 0x109f194: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5702,7 +5702,7 @@ L_109eb28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109eb50: 0x109eb50: jr    ra addiu sp, sp, 64
+// 0x0109f198: 0x109f198: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5714,7 +5714,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 load_image_109eb58(int32,int32,int32,int32,int32)
+.method public static int32 load_image_109f1a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -5758,13 +5758,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109eb58: 0x109eb58: addiu sp, sp, -32
+// 0x0109f1a0: 0x109f1a0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109eb5c: 0x109eb5c: sw    ra, 28(sp)
-// 0x0109eb60: 0x109eb60: sw    s2, 24(sp)
+// 0x0109f1a4: 0x109f1a4: sw    ra, 28(sp)
+// 0x0109f1a8: 0x109f1a8: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5773,7 +5773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109eb64: 0x109eb64: sw    s1, 20(sp)
+// 0x0109f1ac: 0x109f1ac: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5782,7 +5782,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109eb68: 0x109eb68: beq   a0, zero, 0x109ec00 sw    s0, 16(sp)
+// 0x0109f1b0: 0x109f1b0: beq   a0, zero, 0x109f248 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -5792,26 +5792,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_109ec00
+	brfalse L_109f248
 // --- basic block ---
-// 0x0109eb70: 0x109eb70: lb    v0, 0(a0)
+// 0x0109f1b8: 0x109f1b8: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0109eb74: 0x109eb74: sll   zero, zero, 0
-// 0x0109eb78: 0x109eb78: beq   v0, zero, 0x109ec04 addu  s0, zero, zero
+// 0x0109f1bc: 0x109f1bc: sll   zero, zero, 0
+// 0x0109f1c0: 0x109f1c0: beq   v0, zero, 0x109f24c addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_109ec04
+	brfalse L_109f24c
 // --- basic block ---
-// 0x0109eb80: 0x109eb80: addu  a2, a0, zero
+// 0x0109f1c8: 0x109f1c8: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x0109eb84: 0x109eb84: addiu a1, zero, 3
+// 0x0109f1cc: 0x109f1cc: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0109eb88: 0x109eb88: jal   0x10a1918 addu  a0, zero, zero
+// 0x0109f1d0: 0x109f1d0: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5819,21 +5819,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109eb90: 0x109eb90: beq   v0, zero, 0x109ec04 addu  s0, v0, zero
+// 0x0109f1d8: 0x109f1d8: beq   v0, zero, 0x109f24c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_109ec04
+	brfalse L_109f24c
 // --- basic block ---
-// 0x0109eb98: 0x109eb98: lui   s2, 0x0
+// 0x0109f1e0: 0x109f1e0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0109eb9c: 0x109eb9c: lw    s1, 17664(s2)
+// 0x0109f1e4: 0x109f1e4: lw    s1, 17664(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5842,24 +5842,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109eba0: 0x109eba0: addiu v0, zero, -1
+// 0x0109f1e8: 0x109f1e8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109eba4: 0x109eba4: bne   s1, v0, 0x109ebbc sll   zero, zero, 0
+// 0x0109f1ec: 0x109f1ec: bne   s1, v0, 0x109f204 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_109ebbc
+	bne.un L_109f204
 // --- basic block ---
-// 0x0109ebac: 0x109ebac: jal   0x104dffc addu  a0, s0, zero
+// 0x0109f1f4: 0x109f1f4: jal   0x104e00c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109ebb4: 0x109ebb4: j	 0x109ebcc sw    v0, 17664(s2)
+// 0x0109f1fc: 0x109f1fc: j	 0x109f214 sw    v0, 17664(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5868,28 +5868,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109ebcc
+	br L_109f214
 // --- basic block ---
-L_109ebbc:
-// 0x0109ebbc: 0x109ebbc: jal   0x104dffc addu  a0, s0, zero
+L_109f204:
+// 0x0109f204: 0x109f204: jal   0x104e00c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109ebc4: 0x109ebc4: bne   s1, v0, 0x109ec00 sll   zero, zero, 0
+// 0x0109f20c: 0x109f20c: bne   s1, v0, 0x109f248 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_109ec00
+	bne.un L_109f248
 // --- basic block ---
-L_109ebcc:
-// 0x0109ebcc: 0x109ebcc: lui   s2, 0x0
+L_109f214:
+// 0x0109f214: 0x109f214: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0109ebd0: 0x109ebd0: lw    s1, 17668(s2)
+// 0x0109f218: 0x109f218: lw    s1, 17668(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5898,24 +5898,24 @@ L_109ebcc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ebd4: 0x109ebd4: addiu v0, zero, -1
+// 0x0109f21c: 0x109f21c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109ebd8: 0x109ebd8: bne   s1, v0, 0x109ebf0 sll   zero, zero, 0
+// 0x0109f220: 0x109f220: bne   s1, v0, 0x109f238 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_109ebf0
+	bne.un L_109f238
 // --- basic block ---
-// 0x0109ebe0: 0x109ebe0: jal   0x104e020 addu  a0, s0, zero
+// 0x0109f228: 0x109f228: jal   0x104e030 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109ebe8: 0x109ebe8: j	 0x109ec04 sw    v0, 17668(s2)
+// 0x0109f230: 0x109f230: j	 0x109f24c sw    v0, 17668(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5924,33 +5924,33 @@ L_109ebcc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109ec04
+	br L_109f24c
 // --- basic block ---
-L_109ebf0:
-// 0x0109ebf0: 0x109ebf0: jal   0x104e020 addu  a0, s0, zero
+L_109f238:
+// 0x0109f238: 0x109f238: jal   0x104e030 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0109ebf8: 0x109ebf8: beq   s1, v0, 0x109ec04 sll   zero, zero, 0
+// 0x0109f240: 0x109f240: beq   s1, v0, 0x109f24c sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	beq  L_109ec04
+	beq  L_109f24c
 // --- basic block ---
-L_109ec00:
-// 0x0109ec00: 0x109ec00: addu  s0, zero, zero
+L_109f248:
+// 0x0109f248: 0x109f248: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_109ec04:
-// 0x0109ec04: 0x109ec04: lw    ra, 28(sp)
-// 0x0109ec08: 0x109ec08: addu  v0, s0, zero
+L_109f24c:
+// 0x0109f24c: 0x109f24c: lw    ra, 28(sp)
+// 0x0109f250: 0x109f250: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0109ec0c: 0x109ec0c: lw    s2, 24(sp)
+// 0x0109f254: 0x109f254: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5959,7 +5959,7 @@ L_109ec04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109ec10: 0x109ec10: lw    s1, 20(sp)
+// 0x0109f258: 0x109f258: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5968,7 +5968,7 @@ L_109ec04:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ec14: 0x109ec14: lw    s0, 16(sp)
+// 0x0109f25c: 0x109f25c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5977,7 +5977,7 @@ L_109ec04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ec18: 0x109ec18: jr    ra addiu sp, sp, 32
+// 0x0109f260: 0x109f260: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5989,7 +5989,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 imageset_info_load_109ec20(int32,int32,int32,int32,int32)
+.method public static int32 imageset_info_load_109f268(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -6027,19 +6027,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ec20: 0x109ec20: lw    v0, 0(a1)
+// 0x0109f268: 0x109f268: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109ec24: 0x109ec24: addiu sp, sp, -32
+// 0x0109f26c: 0x109f26c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109ec28: 0x109ec28: sw    s0, 24(sp)
+// 0x0109f270: 0x109f270: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6048,25 +6048,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109ec2c: 0x109ec2c: sw    ra, 28(sp)
-// 0x0109ec30: 0x109ec30: beq   v0, zero, 0x109eca0 addu  s0, a0, zero
+// 0x0109f274: 0x109f274: sw    ra, 28(sp)
+// 0x0109f278: 0x109f278: beq   v0, zero, 0x109f2e8 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_109eca0
+	brfalse L_109f2e8
 // --- basic block ---
-// 0x0109ec38: 0x109ec38: lb    v1, 0(v0)
+// 0x0109f280: 0x109f280: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0109ec3c: 0x109ec3c: sll   zero, zero, 0
-// 0x0109ec40: 0x109ec40: beq   v1, zero, 0x109eca0 addu  a0, v0, zero
+// 0x0109f284: 0x109f284: sll   zero, zero, 0
+// 0x0109f288: 0x109f288: beq   v1, zero, 0x109f2e8 addu  a0, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.1
-	brfalse L_109eca0
+	brfalse L_109f2e8
 // --- basic block ---
-// 0x0109ec48: 0x109ec48: jal   0x109eb58 sw    a1, 16(sp)
+// 0x0109f290: 0x109f290: jal   0x109f1a0 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6080,19 +6080,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::load_image_109eb58(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::load_image_109f1a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ec50: 0x109ec50: sw    v0, 0(s0)
+// 0x0109f298: 0x109f298: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0109ec54: 0x109ec54: lw    a1, 16(sp)
+// 0x0109f29c: 0x109f29c: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6101,11 +6101,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109ec58: 0x109ec58: beq   v0, zero, 0x109eca0 sll   zero, zero, 0
+// 0x0109f2a0: 0x109f2a0: beq   v0, zero, 0x109f2e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109eca0
+	brfalse L_109f2e8
 // --- basic block ---
-// 0x0109ec60: 0x109ec60: lw    a0, 4(a1)
+// 0x0109f2a8: 0x109f2a8: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6114,32 +6114,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ec64: 0x109ec64: sll   zero, zero, 0
-// 0x0109ec68: 0x109ec68: beq   a0, zero, 0x109ec94 sll   zero, zero, 0
+// 0x0109f2ac: 0x109f2ac: sll   zero, zero, 0
+// 0x0109f2b0: 0x109f2b0: beq   a0, zero, 0x109f2dc sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109ec94
+	brfalse L_109f2dc
 // --- basic block ---
-// 0x0109ec70: 0x109ec70: lb    v1, 0(a0)
+// 0x0109f2b8: 0x109f2b8: lb    v1, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0109ec74: 0x109ec74: sll   zero, zero, 0
-// 0x0109ec78: 0x109ec78: beq   v1, zero, 0x109ec94 sll   zero, zero, 0
+// 0x0109f2bc: 0x109f2bc: sll   zero, zero, 0
+// 0x0109f2c0: 0x109f2c0: beq   v1, zero, 0x109f2dc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109ec94
+	brfalse L_109f2dc
 // --- basic block ---
-// 0x0109ec80: 0x109ec80: jal   0x109eb58 sll   zero, zero, 0
+// 0x0109f2c8: 0x109f2c8: jal   0x109f1a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::load_image_109eb58(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::load_image_109f1a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ec88: 0x109ec88: sw    v0, 4(s0)
+// 0x0109f2d0: 0x109f2d0: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6148,15 +6148,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109ec8c: 0x109ec8c: j	 0x109eca4 sltu  v0, zero, v0
+// 0x0109f2d4: 0x109f2d4: j	 0x109f2ec sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	br L_109eca4
+	br L_109f2ec
 // --- basic block ---
-L_109ec94:
-// 0x0109ec94: 0x109ec94: sw    v0, 4(s0)
+L_109f2dc:
+// 0x0109f2dc: 0x109f2dc: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6165,18 +6165,18 @@ L_109ec94:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109ec98: 0x109ec98: j	 0x109eca4 addiu v0, zero, 1
+// 0x0109f2e0: 0x109f2e0: j	 0x109f2ec addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_109eca4
+	br L_109f2ec
 // --- basic block ---
-L_109eca0:
-// 0x0109eca0: 0x109eca0: addu  v0, zero, zero
+L_109f2e8:
+// 0x0109f2e8: 0x109f2e8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_109eca4:
-// 0x0109eca4: 0x109eca4: lw    ra, 28(sp)
-// 0x0109eca8: 0x109eca8: lw    s0, 24(sp)
+L_109f2ec:
+// 0x0109f2ec: 0x109f2ec: lw    ra, 28(sp)
+// 0x0109f2f0: 0x109f2f0: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6185,7 +6185,7 @@ L_109eca4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ecac: 0x109ecac: jr    ra addiu sp, sp, 32
+// 0x0109f2f4: 0x109f2f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6197,7 +6197,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_icon_set_images_109ecb4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_icon_set_images_109f2fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -6241,12 +6241,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ecb4: 0x109ecb4: addiu sp, sp, -40
+// 0x0109f2fc: 0x109f2fc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109ecb8: 0x109ecb8: sw    s0, 24(sp)
+// 0x0109f300: 0x109f300: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6255,7 +6255,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109ecbc: 0x109ecbc: lw    s0, 164(a0)
+// 0x0109f304: 0x109f304: lw    s0, 164(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6264,8 +6264,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ecc0: 0x109ecc0: sw    ra, 36(sp)
-// 0x0109ecc4: 0x109ecc4: lw    v0, 324(s0)
+// 0x0109f308: 0x109f308: sw    ra, 36(sp)
+// 0x0109f30c: 0x109f30c: lw    v0, 324(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6274,7 +6274,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ecc8: 0x109ecc8: sw    s2, 32(sp)
+// 0x0109f310: 0x109f310: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6283,7 +6283,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109eccc: 0x109eccc: bne   v0, zero, 0x109ed6c sw    s1, 28(sp)
+// 0x0109f314: 0x109f314: bne   v0, zero, 0x109f3b4 sw    s1, 28(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6293,9 +6293,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_109ed6c
+	brtrue L_109f3b4
 // --- basic block ---
-// 0x0109ecd4: 0x109ecd4: lw    v0, 344(s0)
+// 0x0109f31c: 0x109f31c: lw    v0, 344(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6304,30 +6304,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ecd8: 0x109ecd8: sll   zero, zero, 0
-// 0x0109ecdc: 0x109ecdc: bne   v0, zero, 0x109ed6c sll   zero, zero, 0
+// 0x0109f320: 0x109f320: sll   zero, zero, 0
+// 0x0109f324: 0x109f324: bne   v0, zero, 0x109f3b4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109ed6c
+	brtrue L_109f3b4
 // --- basic block ---
-// 0x0109ece4: 0x109ece4: bltz  a2, 0x109ed6c slti  v0, a2, 11
+// 0x0109f32c: 0x109f32c: bltz  a2, 0x109f3b4 slti  v0, a2, 11
 	ldloc.3
 	ldloc.3
 	ldc.i4.s 11
 	clt
 	stloc 5
 	ldc.i4.s 0
-	blt L_109ed6c
+	blt L_109f3b4
 // --- basic block ---
-// 0x0109ecec: 0x109ecec: beq   v0, zero, 0x109ed6c addiu v0, zero, -1
+// 0x0109f334: 0x109f334: beq   v0, zero, 0x109f3b4 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_109ed6c
+	brfalse L_109f3b4
 // --- basic block ---
-// 0x0109ecf4: 0x109ecf4: lui   v1, 0x0
+// 0x0109f33c: 0x109f33c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0109ecf8: 0x109ecf8: sw    v0, 17668(v1)
+// 0x0109f340: 0x109f340: sw    v0, 17668(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6336,10 +6336,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109ecfc: 0x109ecfc: lui   v1, 0x0
+// 0x0109f344: 0x109f344: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0109ed00: 0x109ed00: sw    v0, 17664(v1)
+// 0x0109f348: 0x109f348: sw    v0, 17664(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6348,16 +6348,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109ed04: 0x109ed04: addu  s2, a1, zero
+// 0x0109f34c: 0x109f34c: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109ed08: 0x109ed08: j	 0x109ed34 addu  s1, zero, zero
+// 0x0109f350: 0x109f350: j	 0x109f37c addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_109ed34
+	br L_109f37c
 // --- basic block ---
-L_109ed10:
-// 0x0109ed10: 0x109ed10: jal   0x109ec20 sw    a2, 16(sp)
+L_109f358:
+// 0x0109f358: 0x109f358: jal   0x109f268 sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6371,12 +6371,12 @@ L_109ed10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::imageset_info_load_109ec20(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::imageset_info_load_109f268(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109ed18: 0x109ed18: lw    a2, 16(sp)
+// 0x0109f360: 0x109f360: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6385,15 +6385,15 @@ L_109ed10:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109ed1c: 0x109ed1c: beq   v0, zero, 0x109ed6c addiu s2, s2, 8
+// 0x0109f364: 0x109f364: beq   v0, zero, 0x109f3b4 addiu s2, s2, 8
 	ldloc 5
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc 10
-	brfalse L_109ed6c
+	brfalse L_109f3b4
 // --- basic block ---
-// 0x0109ed24: 0x109ed24: lw    v0, 320(s0)
+// 0x0109f36c: 0x109f36c: lw    v0, 320(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6402,17 +6402,17 @@ L_109ed10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ed28: 0x109ed28: addiu s1, s1, 1
+// 0x0109f370: 0x109f370: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0109ed2c: 0x109ed2c: addiu v0, v0, 1
+// 0x0109f374: 0x109f374: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0109ed30: 0x109ed30: sw    v0, 320(s0)
+// 0x0109f378: 0x109f378: sw    v0, 320(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6421,37 +6421,37 @@ L_109ed10:
 	add
 	ldloc 5
 	stelem.i4
-L_109ed34:
-// 0x0109ed34: 0x109ed34: addiu a0, s1, 30
+L_109f37c:
+// 0x0109f37c: 0x109f37c: addiu a0, s1, 30
 	ldloc 9
 	ldc.i4.s 30
 	add
 	stloc.1
-// 0x0109ed38: 0x109ed38: sll   a0, a0, 3
+// 0x0109f380: 0x109f380: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0109ed3c: 0x109ed3c: slt   v0, s1, a2
+// 0x0109f384: 0x109f384: slt   v0, s1, a2
 	ldloc 9
 	ldloc.3
 	clt
 	stloc 5
-// 0x0109ed40: 0x109ed40: addu  a0, s0, a0
+// 0x0109f388: 0x109f388: addu  a0, s0, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x0109ed44: 0x109ed44: bne   v0, zero, 0x109ed10 addu  a1, s2, zero
+// 0x0109f38c: 0x109f38c: bne   v0, zero, 0x109f358 addu  a1, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brtrue L_109ed10
+	brtrue L_109f358
 // --- basic block ---
-// 0x0109ed4c: 0x109ed4c: lui   v0, 0x0
+// 0x0109f394: 0x109f394: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109ed50: 0x109ed50: lw    v1, 17664(v0)
+// 0x0109f398: 0x109f398: lw    v1, 17664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6460,10 +6460,10 @@ L_109ed34:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ed54: 0x109ed54: lui   v0, 0x0
+// 0x0109f39c: 0x109f39c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109ed58: 0x109ed58: lw    v0, 17668(v0)
+// 0x0109f3a0: 0x109f3a0: lw    v0, 17668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6472,10 +6472,10 @@ L_109ed34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109ed5c: 0x109ed5c: addiu a0, zero, 1
+// 0x0109f3a4: 0x109f3a4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0109ed60: 0x109ed60: sw    a0, 344(s0)
+// 0x0109f3a8: 0x109f3a8: sw    a0, 344(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6484,7 +6484,7 @@ L_109ed34:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109ed64: 0x109ed64: sw    v1, 332(s0)
+// 0x0109f3ac: 0x109f3ac: sw    v1, 332(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6493,7 +6493,7 @@ L_109ed34:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109ed68: 0x109ed68: sw    v0, 336(s0)
+// 0x0109f3b0: 0x109f3b0: sw    v0, 336(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6502,9 +6502,9 @@ L_109ed34:
 	add
 	ldloc 5
 	stelem.i4
-L_109ed6c:
-// 0x0109ed6c: 0x109ed6c: lw    ra, 36(sp)
-// 0x0109ed70: 0x109ed70: lw    s2, 32(sp)
+L_109f3b4:
+// 0x0109f3b4: 0x109f3b4: lw    ra, 36(sp)
+// 0x0109f3b8: 0x109f3b8: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6513,7 +6513,7 @@ L_109ed6c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109ed74: 0x109ed74: lw    s1, 28(sp)
+// 0x0109f3bc: 0x109f3bc: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6522,7 +6522,7 @@ L_109ed6c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109ed78: 0x109ed78: lw    s0, 24(sp)
+// 0x0109f3c0: 0x109f3c0: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6531,7 +6531,7 @@ L_109ed6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ed7c: 0x109ed7c: jr    ra addiu sp, sp, 40
+// 0x0109f3c4: 0x109f3c4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6543,7 +6543,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 wimage_info_load_109ed84(int32,int32,int32,int32,int32)
+.method public static int32 wimage_info_load_109f3cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -6590,12 +6590,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ed84: 0x109ed84: addiu sp, sp, -40
+// 0x0109f3cc: 0x109f3cc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109ed88: 0x109ed88: sw    s1, 24(sp)
+// 0x0109f3d0: 0x109f3d0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6604,13 +6604,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109ed8c: 0x109ed8c: addu  s1, a0, zero
+// 0x0109f3d4: 0x109f3d4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109ed90: 0x109ed90: addu  a0, a1, zero
+// 0x0109f3d8: 0x109f3d8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0109ed94: 0x109ed94: sw    s0, 20(sp)
+// 0x0109f3dc: 0x109f3dc: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6619,8 +6619,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109ed98: 0x109ed98: sw    ra, 36(sp)
-// 0x0109ed9c: 0x109ed9c: sw    s3, 32(sp)
+// 0x0109f3e0: 0x109f3e0: sw    ra, 36(sp)
+// 0x0109f3e4: 0x109f3e4: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6629,7 +6629,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109eda0: 0x109eda0: sw    s2, 28(sp)
+// 0x0109f3e8: 0x109f3e8: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6638,33 +6638,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109eda4: 0x109eda4: jal   0x109e7bc addu  s0, a1, zero
+// 0x0109f3ec: 0x109f3ec: jal   0x109ee04 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_wimage_is_valid_109e7bc(int32,int32)
+	call int32 Cibyl118::ssd_icon_wimage_is_valid_109ee04(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109edac: 0x109edac: beq   v0, zero, 0x109eeb0 addu  v0, zero, zero
+// 0x0109f3f4: 0x109f3f4: beq   v0, zero, 0x109f4f8 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109eeb0
+	brfalse L_109f4f8
 // --- basic block ---
-// 0x0109edb4: 0x109edb4: lw    a2, 0(s0)
+// 0x0109f3fc: 0x109f3fc: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0109edb8: 0x109edb8: addu  a0, zero, zero
+// 0x0109f400: 0x109f400: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109edbc: 0x109edbc: jal   0x10a1918 addiu a1, zero, 3
+// 0x0109f404: 0x109f404: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6672,15 +6672,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109edc4: 0x109edc4: addu  a0, v0, zero
+// 0x0109f40c: 0x109f40c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109edc8: 0x109edc8: beq   v0, zero, 0x109eeac sw    v0, 0(s1)
+// 0x0109f410: 0x109f410: beq   v0, zero, 0x109f4f4 sw    v0, 0(s1)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -6688,12 +6688,12 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldloc 5
 	stelem.i4
-	brfalse L_109eeac
+	brfalse L_109f4f4
 // --- basic block ---
-// 0x0109edd0: 0x109edd0: lui   s3, 0x0
+// 0x0109f418: 0x109f418: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0109edd4: 0x109edd4: lw    s2, 17668(s3)
+// 0x0109f41c: 0x109f41c: lw    s2, 17668(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6702,22 +6702,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109edd8: 0x109edd8: addiu v0, zero, -1
+// 0x0109f420: 0x109f420: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109eddc: 0x109eddc: bne   s2, v0, 0x109edf4 sll   zero, zero, 0
+// 0x0109f424: 0x109f424: bne   s2, v0, 0x109f43c sll   zero, zero, 0
 	ldloc 10
 	ldloc 5
-	bne.un L_109edf4
+	bne.un L_109f43c
 // --- basic block ---
-// 0x0109ede4: 0x109ede4: jal   0x104e020 sll   zero, zero, 0
+// 0x0109f42c: 0x109f42c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109edec: 0x109edec: j	 0x109ee04 sw    v0, 17668(s3)
+// 0x0109f434: 0x109f434: j	 0x109f44c sw    v0, 17668(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6726,25 +6726,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109ee04
+	br L_109f44c
 // --- basic block ---
-L_109edf4:
-// 0x0109edf4: 0x109edf4: jal   0x104e020 sll   zero, zero, 0
+L_109f43c:
+// 0x0109f43c: 0x109f43c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109edfc: 0x109edfc: bne   s2, v0, 0x109eeb0 addu  v0, zero, zero
+// 0x0109f444: 0x109f444: bne   s2, v0, 0x109f4f8 addu  v0, zero, zero
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_109eeb0
+	bne.un L_109f4f8
 // --- basic block ---
-L_109ee04:
-// 0x0109ee04: 0x109ee04: lw    a2, 4(s0)
+L_109f44c:
+// 0x0109f44c: 0x109f44c: lw    a2, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6753,10 +6753,10 @@ L_109ee04:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109ee08: 0x109ee08: addu  a0, zero, zero
+// 0x0109f450: 0x109f450: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109ee0c: 0x109ee0c: jal   0x10a1918 addiu a1, zero, 3
+// 0x0109f454: 0x109f454: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6764,15 +6764,15 @@ L_109ee04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ee14: 0x109ee14: addu  a0, v0, zero
+// 0x0109f45c: 0x109f45c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109ee18: 0x109ee18: beq   v0, zero, 0x109eeac sw    v0, 4(s1)
+// 0x0109f460: 0x109f460: beq   v0, zero, 0x109f4f4 sw    v0, 4(s1)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -6782,12 +6782,12 @@ L_109ee04:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_109eeac
+	brfalse L_109f4f4
 // --- basic block ---
-// 0x0109ee20: 0x109ee20: lui   s3, 0x0
+// 0x0109f468: 0x109f468: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0109ee24: 0x109ee24: lw    s2, 17668(s3)
+// 0x0109f46c: 0x109f46c: lw    s2, 17668(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6796,22 +6796,22 @@ L_109ee04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109ee28: 0x109ee28: addiu v0, zero, -1
+// 0x0109f470: 0x109f470: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109ee2c: 0x109ee2c: bne   s2, v0, 0x109ee44 sll   zero, zero, 0
+// 0x0109f474: 0x109f474: bne   s2, v0, 0x109f48c sll   zero, zero, 0
 	ldloc 10
 	ldloc 5
-	bne.un L_109ee44
+	bne.un L_109f48c
 // --- basic block ---
-// 0x0109ee34: 0x109ee34: jal   0x104e020 sll   zero, zero, 0
+// 0x0109f47c: 0x109f47c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ee3c: 0x109ee3c: j	 0x109ee54 sw    v0, 17668(s3)
+// 0x0109f484: 0x109f484: j	 0x109f49c sw    v0, 17668(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6820,25 +6820,25 @@ L_109ee04:
 	add
 	ldloc 5
 	stelem.i4
-	br L_109ee54
+	br L_109f49c
 // --- basic block ---
-L_109ee44:
-// 0x0109ee44: 0x109ee44: jal   0x104e020 sll   zero, zero, 0
+L_109f48c:
+// 0x0109f48c: 0x109f48c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ee4c: 0x109ee4c: bne   s2, v0, 0x109eeb0 addu  v0, zero, zero
+// 0x0109f494: 0x109f494: bne   s2, v0, 0x109f4f8 addu  v0, zero, zero
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_109eeb0
+	bne.un L_109f4f8
 // --- basic block ---
-L_109ee54:
-// 0x0109ee54: 0x109ee54: lw    a2, 8(s0)
+L_109f49c:
+// 0x0109f49c: 0x109f49c: lw    a2, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6847,10 +6847,10 @@ L_109ee54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109ee58: 0x109ee58: addu  a0, zero, zero
+// 0x0109f4a0: 0x109f4a0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0109ee5c: 0x109ee5c: jal   0x10a1918 addiu a1, zero, 3
+// 0x0109f4a4: 0x109f4a4: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6858,15 +6858,15 @@ L_109ee54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ee64: 0x109ee64: addu  a0, v0, zero
+// 0x0109f4ac: 0x109f4ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109ee68: 0x109ee68: beq   v0, zero, 0x109eeac sw    v0, 8(s1)
+// 0x0109f4b0: 0x109f4b0: beq   v0, zero, 0x109f4f4 sw    v0, 8(s1)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -6876,12 +6876,12 @@ L_109ee54:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_109eeac
+	brfalse L_109f4f4
 // --- basic block ---
-// 0x0109ee70: 0x109ee70: lui   s1, 0x0
+// 0x0109f4b8: 0x109f4b8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0109ee74: 0x109ee74: lw    s0, 17668(s1)
+// 0x0109f4bc: 0x109f4bc: lw    s0, 17668(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6890,22 +6890,22 @@ L_109ee54:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ee78: 0x109ee78: addiu v0, zero, -1
+// 0x0109f4c0: 0x109f4c0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0109ee7c: 0x109ee7c: bne   s0, v0, 0x109ee98 sll   zero, zero, 0
+// 0x0109f4c4: 0x109f4c4: bne   s0, v0, 0x109f4e0 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_109ee98
+	bne.un L_109f4e0
 // --- basic block ---
-// 0x0109ee84: 0x109ee84: jal   0x104e020 sll   zero, zero, 0
+// 0x0109f4cc: 0x109f4cc: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ee8c: 0x109ee8c: sw    v0, 17668(s1)
+// 0x0109f4d4: 0x109f4d4: sw    v0, 17668(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6914,38 +6914,38 @@ L_109ee54:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109ee90: 0x109ee90: j	 0x109eeb0 addiu v0, zero, 1
+// 0x0109f4d8: 0x109f4d8: j	 0x109f4f8 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_109eeb0
+	br L_109f4f8
 // --- basic block ---
-L_109ee98:
-// 0x0109ee98: 0x109ee98: jal   0x104e020 sll   zero, zero, 0
+L_109f4e0:
+// 0x0109f4e0: 0x109f4e0: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109eea0: 0x109eea0: xor   v0, s0, v0
+// 0x0109f4e8: 0x109f4e8: xor   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	xor
 	stloc 5
-// 0x0109eea4: 0x109eea4: j	 0x109eeb0 sltiu v0, v0, 1
+// 0x0109f4ec: 0x109f4ec: j	 0x109f4f8 sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-	br L_109eeb0
+	br L_109f4f8
 // --- basic block ---
-L_109eeac:
-// 0x0109eeac: 0x109eeac: addu  v0, zero, zero
+L_109f4f4:
+// 0x0109f4f4: 0x109f4f4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_109eeb0:
-// 0x0109eeb0: 0x109eeb0: lw    ra, 36(sp)
-// 0x0109eeb4: 0x109eeb4: lw    s3, 32(sp)
+L_109f4f8:
+// 0x0109f4f8: 0x109f4f8: lw    ra, 36(sp)
+// 0x0109f4fc: 0x109f4fc: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6954,7 +6954,7 @@ L_109eeb0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109eeb8: 0x109eeb8: lw    s2, 28(sp)
+// 0x0109f500: 0x109f500: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6963,7 +6963,7 @@ L_109eeb0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109eebc: 0x109eebc: lw    s1, 24(sp)
+// 0x0109f504: 0x109f504: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6972,7 +6972,7 @@ L_109eeb0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109eec0: 0x109eec0: lw    s0, 20(sp)
+// 0x0109f508: 0x109f508: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6981,7 +6981,7 @@ L_109eeb0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109eec4: 0x109eec4: jr    ra addiu sp, sp, 40
+// 0x0109f50c: 0x109f50c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6993,7 +6993,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 wimageset_info_load_109eecc(int32,int32,int32,int32,int32)
+.method public static int32 wimageset_info_load_109f514(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -7034,12 +7034,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109eecc: 0x109eecc: addiu sp, sp, -40
+// 0x0109f514: 0x109f514: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0109eed0: 0x109eed0: sw    s1, 32(sp)
+// 0x0109f518: 0x109f518: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7048,17 +7048,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109eed4: 0x109eed4: addu  s1, a1, zero
+// 0x0109f51c: 0x109f51c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0109eed8: 0x109eed8: lw    a1, 0(a1)
+// 0x0109f520: 0x109f520: lw    a1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0109eedc: 0x109eedc: sw    s0, 28(sp)
+// 0x0109f524: 0x109f524: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7067,8 +7067,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109eee0: 0x109eee0: sw    ra, 36(sp)
-// 0x0109eee4: 0x109eee4: jal   0x109ed84 addu  s0, a0, zero
+// 0x0109f528: 0x109f528: sw    ra, 36(sp)
+// 0x0109f52c: 0x109f52c: jal   0x109f3cc addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -7076,18 +7076,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::wimage_info_load_109ed84(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::wimage_info_load_109f3cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109eeec: 0x109eeec: beq   v0, zero, 0x109ef40 addu  v1, zero, zero
+// 0x0109f534: 0x109f534: beq   v0, zero, 0x109f588 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_109ef40
+	brfalse L_109f588
 // --- basic block ---
-// 0x0109eef4: 0x109eef4: lw    a1, 4(s1)
+// 0x0109f53c: 0x109f53c: lw    a1, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7096,11 +7096,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109eef8: 0x109eef8: sll   zero, zero, 0
-// 0x0109eefc: 0x109eefc: addu  a0, a1, zero
+// 0x0109f540: 0x109f540: sll   zero, zero, 0
+// 0x0109f544: 0x109f544: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0109ef00: 0x109ef00: jal   0x109e7bc sw    a1, 16(sp)
+// 0x0109f548: 0x109f548: jal   0x109ee04 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7111,12 +7111,12 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_icon_wimage_is_valid_109e7bc(int32,int32)
+	call int32 Cibyl118::ssd_icon_wimage_is_valid_109ee04(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109ef08: 0x109ef08: lw    a1, 16(sp)
+// 0x0109f550: 0x109f550: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7125,41 +7125,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109ef0c: 0x109ef0c: beq   v0, zero, 0x109ef24 addiu a0, s0, 12
+// 0x0109f554: 0x109f554: beq   v0, zero, 0x109f56c addiu a0, s0, 12
 	ldloc 6
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc.1
-	brfalse L_109ef24
+	brfalse L_109f56c
 // --- basic block ---
-// 0x0109ef14: 0x109ef14: jal   0x109ed84 sll   zero, zero, 0
+// 0x0109f55c: 0x109f55c: jal   0x109f3cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::wimage_info_load_109ed84(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::wimage_info_load_109f3cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0109ef1c: 0x109ef1c: j	 0x109ef40 sltu  v1, zero, v0
+// 0x0109f564: 0x109f564: j	 0x109f588 sltu  v1, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 7
-	br L_109ef40
+	br L_109f588
 // --- basic block ---
-L_109ef24:
-// 0x0109ef24: 0x109ef24: lw    v1, 0(s0)
+L_109f56c:
+// 0x0109f56c: 0x109f56c: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109ef28: 0x109ef28: lw    v0, 4(s0)
+// 0x0109f570: 0x109f570: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7168,7 +7168,7 @@ L_109ef24:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ef2c: 0x109ef2c: sw    v1, 12(s0)
+// 0x0109f574: 0x109f574: sw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7177,7 +7177,7 @@ L_109ef24:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109ef30: 0x109ef30: sw    v0, 4(a0)
+// 0x0109f578: 0x109f578: sw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7186,7 +7186,7 @@ L_109ef24:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109ef34: 0x109ef34: lw    v0, 8(s0)
+// 0x0109f57c: 0x109f57c: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7195,10 +7195,10 @@ L_109ef24:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ef38: 0x109ef38: addiu v1, zero, 1
+// 0x0109f580: 0x109f580: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0109ef3c: 0x109ef3c: sw    v0, 8(a0)
+// 0x0109f584: 0x109f584: sw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7207,12 +7207,12 @@ L_109ef24:
 	add
 	ldloc 6
 	stelem.i4
-L_109ef40:
-// 0x0109ef40: 0x109ef40: lw    ra, 36(sp)
-// 0x0109ef44: 0x109ef44: addu  v0, v1, zero
+L_109f588:
+// 0x0109f588: 0x109f588: lw    ra, 36(sp)
+// 0x0109f58c: 0x109f58c: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x0109ef48: 0x109ef48: lw    s1, 32(sp)
+// 0x0109f590: 0x109f590: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7221,7 +7221,7 @@ L_109ef40:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109ef4c: 0x109ef4c: lw    s0, 28(sp)
+// 0x0109f594: 0x109f594: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7230,7 +7230,7 @@ L_109ef40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ef50: 0x109ef50: jr    ra addiu sp, sp, 40
+// 0x0109f598: 0x109f598: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -7242,7 +7242,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_icon_set_wimages_109ef58(int32,int32,int32,int32,int32)
+.method public static int32 ssd_icon_set_wimages_109f5a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -7292,12 +7292,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109ef58: 0x109ef58: addiu sp, sp, -48
+// 0x0109f5a0: 0x109f5a0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109ef5c: 0x109ef5c: sw    s0, 28(sp)
+// 0x0109f5a4: 0x109f5a4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7306,7 +7306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109ef60: 0x109ef60: lw    s0, 164(a0)
+// 0x0109f5a8: 0x109f5a8: lw    s0, 164(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7315,8 +7315,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109ef64: 0x109ef64: sw    ra, 44(sp)
-// 0x0109ef68: 0x109ef68: lw    v0, 324(s0)
+// 0x0109f5ac: 0x109f5ac: sw    ra, 44(sp)
+// 0x0109f5b0: 0x109f5b0: lw    v0, 324(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7325,7 +7325,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ef6c: 0x109ef6c: sw    s3, 40(sp)
+// 0x0109f5b4: 0x109f5b4: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7334,7 +7334,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109ef70: 0x109ef70: sw    s2, 36(sp)
+// 0x0109f5b8: 0x109f5b8: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7343,7 +7343,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109ef74: 0x109ef74: beq   v0, zero, 0x109f014 sw    s1, 32(sp)
+// 0x0109f5bc: 0x109f5bc: beq   v0, zero, 0x109f65c sw    s1, 32(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -7353,9 +7353,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_109f014
+	brfalse L_109f65c
 // --- basic block ---
-// 0x0109ef7c: 0x109ef7c: lw    v0, 344(s0)
+// 0x0109f5c4: 0x109f5c4: lw    v0, 344(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7364,30 +7364,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109ef80: 0x109ef80: sll   zero, zero, 0
-// 0x0109ef84: 0x109ef84: bne   v0, zero, 0x109f014 sll   zero, zero, 0
+// 0x0109f5c8: 0x109f5c8: sll   zero, zero, 0
+// 0x0109f5cc: 0x109f5cc: bne   v0, zero, 0x109f65c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f014
+	brtrue L_109f65c
 // --- basic block ---
-// 0x0109ef8c: 0x109ef8c: bltz  a2, 0x109f014 slti  v0, a2, 11
+// 0x0109f5d4: 0x109f5d4: bltz  a2, 0x109f65c slti  v0, a2, 11
 	ldloc.3
 	ldloc.3
 	ldc.i4.s 11
 	clt
 	stloc 6
 	ldc.i4.s 0
-	blt L_109f014
+	blt L_109f65c
 // --- basic block ---
-// 0x0109ef94: 0x109ef94: beq   v0, zero, 0x109f014 addiu v0, zero, -1
+// 0x0109f5dc: 0x109f5dc: beq   v0, zero, 0x109f65c addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brfalse L_109f014
+	brfalse L_109f65c
 // --- basic block ---
-// 0x0109ef9c: 0x109ef9c: lui   v1, 0x0
+// 0x0109f5e4: 0x109f5e4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0109efa0: 0x109efa0: sw    v0, 17668(v1)
+// 0x0109f5e8: 0x109f5e8: sw    v0, 17668(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7396,10 +7396,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109efa4: 0x109efa4: lui   v1, 0x0
+// 0x0109f5ec: 0x109f5ec: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0109efa8: 0x109efa8: sw    v0, 17664(v1)
+// 0x0109f5f0: 0x109f5f0: sw    v0, 17664(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7408,24 +7408,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109efac: 0x109efac: addu  s2, a1, zero
+// 0x0109f5f4: 0x109f5f4: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109efb0: 0x109efb0: addu  s1, zero, zero
+// 0x0109f5f8: 0x109f5f8: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0109efb4: 0x109efb4: j	 0x109eff4 addiu s3, zero, 24
+// 0x0109f5fc: 0x109f5fc: j	 0x109f63c addiu s3, zero, 24
 	ldc.i4.s 24
 	stloc 11
-	br L_109eff4
+	br L_109f63c
 // --- basic block ---
-L_109efbc:
-// 0x0109efbc: 0x109efbc: mult  s1, s3
+L_109f604:
+// 0x0109f604: 0x109f604: mult  s1, s3
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 13
-// 0x0109efc0: 0x109efc0: sw    a2, 16(sp)
+// 0x0109f608: 0x109f608: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7434,20 +7434,20 @@ L_109efbc:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0109efc4: 0x109efc4: addiu s2, s2, 8
+// 0x0109f60c: 0x109f60c: addiu s2, s2, 8
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc 10
-// 0x0109efc8: 0x109efc8: addiu s1, s1, 1
+// 0x0109f610: 0x109f610: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0109efcc: 0x109efcc: mflo  lo
+// 0x0109f614: 0x109f614: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x0109efd0: 0x109efd0: jal   0x109eecc addu  a0, s0, a0
+// 0x0109f618: 0x109f618: jal   0x109f514 addu  a0, s0, a0
 	ldloc 7
 	ldloc.1
 	add
@@ -7457,12 +7457,12 @@ L_109efbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::wimageset_info_load_109eecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::wimageset_info_load_109f514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0109efd8: 0x109efd8: lw    a2, 16(sp)
+// 0x0109f620: 0x109f620: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7471,11 +7471,11 @@ L_109efbc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109efdc: 0x109efdc: beq   v0, zero, 0x109f014 sll   zero, zero, 0
+// 0x0109f624: 0x109f624: beq   v0, zero, 0x109f65c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109f014
+	brfalse L_109f65c
 // --- basic block ---
-// 0x0109efe4: 0x109efe4: lw    v0, 320(s0)
+// 0x0109f62c: 0x109f62c: lw    v0, 320(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7484,13 +7484,13 @@ L_109efbc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109efe8: 0x109efe8: sll   zero, zero, 0
-// 0x0109efec: 0x109efec: addiu v0, v0, 1
+// 0x0109f630: 0x109f630: sll   zero, zero, 0
+// 0x0109f634: 0x109f634: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0109eff0: 0x109eff0: sw    v0, 320(s0)
+// 0x0109f638: 0x109f638: sw    v0, 320(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7499,22 +7499,22 @@ L_109efbc:
 	add
 	ldloc 6
 	stelem.i4
-L_109eff4:
-// 0x0109eff4: 0x109eff4: slt   v0, s1, a2
+L_109f63c:
+// 0x0109f63c: 0x109f63c: slt   v0, s1, a2
 	ldloc 9
 	ldloc.3
 	clt
 	stloc 6
-// 0x0109eff8: 0x109eff8: bne   v0, zero, 0x109efbc addu  a1, s2, zero
+// 0x0109f640: 0x109f640: bne   v0, zero, 0x109f604 addu  a1, s2, zero
 	ldloc 6
 	ldloc 10
 	stloc.2
-	brtrue L_109efbc
+	brtrue L_109f604
 // --- basic block ---
-// 0x0109f000: 0x109f000: lui   v0, 0x0
+// 0x0109f648: 0x109f648: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0109f004: 0x109f004: lw    v0, 17668(v0)
+// 0x0109f64c: 0x109f64c: lw    v0, 17668(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7523,10 +7523,10 @@ L_109eff4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f008: 0x109f008: addiu v1, zero, 1
+// 0x0109f650: 0x109f650: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0109f00c: 0x109f00c: sw    v1, 344(s0)
+// 0x0109f654: 0x109f654: sw    v1, 344(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7535,7 +7535,7 @@ L_109eff4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109f010: 0x109f010: sw    v0, 336(s0)
+// 0x0109f658: 0x109f658: sw    v0, 336(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7544,9 +7544,9 @@ L_109eff4:
 	add
 	ldloc 6
 	stelem.i4
-L_109f014:
-// 0x0109f014: 0x109f014: lw    ra, 44(sp)
-// 0x0109f018: 0x109f018: lw    s3, 40(sp)
+L_109f65c:
+// 0x0109f65c: 0x109f65c: lw    ra, 44(sp)
+// 0x0109f660: 0x109f660: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7555,7 +7555,7 @@ L_109f014:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109f01c: 0x109f01c: lw    s2, 36(sp)
+// 0x0109f664: 0x109f664: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7564,7 +7564,7 @@ L_109f014:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109f020: 0x109f020: lw    s1, 32(sp)
+// 0x0109f668: 0x109f668: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7573,7 +7573,7 @@ L_109f014:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109f024: 0x109f024: lw    s0, 28(sp)
+// 0x0109f66c: 0x109f66c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7582,7 +7582,7 @@ L_109f014:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f028: 0x109f028: jr    ra addiu sp, sp, 48
+// 0x0109f670: 0x109f670: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
diff --git a/converted/Cibyl119.j b/converted/Cibyl119.j
index f820354..642eb07 100644
--- a/converted/Cibyl119.j
+++ b/converted/Cibyl119.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl119::.ctor
 
-.method public static int32 icon_ctx_init_109f030(int32,int32,int32,int32,int32)
+.method public static int32 icon_ctx_init_109f678(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -76,16 +76,16 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f030: 0x109f030: addiu sp, sp, -24
+// 0x0109f678: 0x109f678: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109f034: 0x109f034: addu  a1, zero, zero
+// 0x0109f67c: 0x109f67c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109f038: 0x109f038: sw    ra, 20(sp)
-// 0x0109f03c: 0x109f03c: jal   0x100177c addiu a2, zero, 352
+// 0x0109f680: 0x109f680: sw    ra, 20(sp)
+// 0x0109f684: 0x109f684: jal   0x100177c addiu a2, zero, 352
 	ldc.i4 352
 	stloc.3
 	ldloc.1
@@ -97,9 +97,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109f044: 0x109f044: lw    ra, 20(sp)
-// 0x0109f048: 0x109f048: sll   zero, zero, 0
-// 0x0109f04c: 0x109f04c: jr    ra addiu sp, sp, 24
+// 0x0109f68c: 0x109f68c: lw    ra, 20(sp)
+// 0x0109f690: 0x109f690: sll   zero, zero, 0
+// 0x0109f694: 0x109f694: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -111,7 +111,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_icon_create_109f054(int32,int32,int32,int32,int32)
+.method public static int32 ssd_icon_create_109f69c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -158,12 +158,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f054: 0x109f054: addiu sp, sp, -48
+// 0x0109f69c: 0x109f69c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109f058: 0x109f058: sw    s3, 40(sp)
+// 0x0109f6a0: 0x109f6a0: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -172,14 +172,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109f05c: 0x109f05c: addu  s3, a0, zero
+// 0x0109f6a4: 0x109f6a4: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0109f060: 0x109f060: addiu a0, zero, 352
+// 0x0109f6a8: 0x109f6a8: addiu a0, zero, 352
 	ldc.i4 352
 	stloc.1
-// 0x0109f064: 0x109f064: sw    ra, 44(sp)
-// 0x0109f068: 0x109f068: sw    s2, 36(sp)
+// 0x0109f6ac: 0x109f6ac: sw    ra, 44(sp)
+// 0x0109f6b0: 0x109f6b0: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -188,7 +188,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109f06c: 0x109f06c: sw    s1, 32(sp)
+// 0x0109f6b4: 0x109f6b4: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -197,13 +197,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109f070: 0x109f070: addu  s2, a1, zero
+// 0x0109f6b8: 0x109f6b8: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109f074: 0x109f074: addu  s1, a2, zero
+// 0x0109f6bc: 0x109f6bc: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0109f078: 0x109f078: jal   0x1000910 sw    s0, 28(sp)
+// 0x0109f6c0: 0x109f6c0: jal   0x1000910 sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -222,21 +222,21 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0109f080: 0x109f080: lui   a1, 0x10a0000
+// 0x0109f6c8: 0x109f6c8: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x0109f084: 0x109f084: addu  s0, v0, zero
+// 0x0109f6cc: 0x109f6cc: addu  s0, v0, zero
 	ldloc 7
 	stloc 8
-// 0x0109f088: 0x109f088: addu  a0, s3, zero
+// 0x0109f6d0: 0x109f6d0: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0109f08c: 0x109f08c: addu  a2, s1, zero
+// 0x0109f6d4: 0x109f6d4: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0109f090: 0x109f090: jal   0x109a45c addiu a1, a1, -6104
+// 0x0109f6d8: 0x109f6d8: jal   0x109aaa4 addiu a1, a1, -4496
 	ldloc.2
-	ldc.i4 -6104
+	ldc.i4 -4496
 	add
 	stloc.2
 	ldloc.0
@@ -244,15 +244,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_new_109a45c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_new_109aaa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0109f098: 0x109f098: addu  a0, s0, zero
+// 0x0109f6e0: 0x109f6e0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0109f09c: 0x109f09c: jal   0x109f030 sw    v0, 16(sp)
+// 0x0109f6e4: 0x109f6e4: jal   0x109f678 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -266,12 +266,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::icon_ctx_init_109f030(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::icon_ctx_init_109f678(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0109f0a4: 0x109f0a4: lw    v0, 16(sp)
+// 0x0109f6ec: 0x109f6ec: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -280,30 +280,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f0a8: 0x109f0a8: lui   v1, 0x20000
+// 0x0109f6f0: 0x109f6f0: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0109f0ac: 0x109f0ac: addiu v1, v1, -1172
+// 0x0109f6f4: 0x109f6f4: addiu v1, v1, -708
 	ldloc 6
-	ldc.i4 -1172
+	ldc.i4 -708
 	add
 	stloc 6
-// 0x0109f0b0: 0x109f0b0: sw    v1, 0(v0)
+// 0x0109f6f8: 0x109f6f8: sw    v1, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0109f0b4: 0x109f0b4: lui   v1, 0x10a0000
+// 0x0109f6fc: 0x109f6fc: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x0109f0b8: 0x109f0b8: addiu v1, v1, -5796
+// 0x0109f700: 0x109f700: addiu v1, v1, -4188
 	ldloc 6
-	ldc.i4 -5796
+	ldc.i4 -4188
 	add
 	stloc 6
-// 0x0109f0bc: 0x109f0bc: sw    v1, 184(v0)
+// 0x0109f704: 0x109f704: sw    v1, 184(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -312,16 +312,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109f0c0: 0x109f0c0: lw    ra, 44(sp)
-// 0x0109f0c4: 0x109f0c4: lui   v1, 0x10a0000
+// 0x0109f708: 0x109f708: lw    ra, 44(sp)
+// 0x0109f70c: 0x109f70c: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x0109f0c8: 0x109f0c8: addiu v1, v1, -5916
+// 0x0109f710: 0x109f710: addiu v1, v1, -4308
 	ldloc 6
-	ldc.i4 -5916
+	ldc.i4 -4308
 	add
 	stloc 6
-// 0x0109f0cc: 0x109f0cc: sw    s2, 324(s0)
+// 0x0109f714: 0x109f714: sw    s2, 324(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -330,7 +330,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109f0d0: 0x109f0d0: sw    s0, 164(v0)
+// 0x0109f718: 0x109f718: sw    s0, 164(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -339,7 +339,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109f0d4: 0x109f0d4: sw    s1, 48(v0)
+// 0x0109f71c: 0x109f71c: sw    s1, 48(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -348,7 +348,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109f0d8: 0x109f0d8: lw    s3, 40(sp)
+// 0x0109f720: 0x109f720: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -357,7 +357,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109f0dc: 0x109f0dc: lw    s2, 36(sp)
+// 0x0109f724: 0x109f724: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -366,7 +366,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109f0e0: 0x109f0e0: lw    s1, 32(sp)
+// 0x0109f728: 0x109f728: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -375,7 +375,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109f0e4: 0x109f0e4: lw    s0, 28(sp)
+// 0x0109f72c: 0x109f72c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -384,7 +384,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f0e8: 0x109f0e8: sw    v1, 188(v0)
+// 0x0109f730: 0x109f730: sw    v1, 188(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -393,7 +393,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109f0ec: 0x109f0ec: jr    ra addiu sp, sp, 48
+// 0x0109f734: 0x109f734: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -405,7 +405,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 widget_get_next_focus_109f12c(int32,int32,int32,int32,int32)
+.method public static int32 widget_get_next_focus_109f774(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -446,19 +446,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f12c: 0x109f12c: lw    v0, 0(a1)
+// 0x0109f774: 0x109f774: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109f130: 0x109f130: addiu sp, sp, -32
+// 0x0109f778: 0x109f778: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109f134: 0x109f134: sw    s1, 24(sp)
+// 0x0109f77c: 0x109f77c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -467,8 +467,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109f138: 0x109f138: sw    ra, 28(sp)
-// 0x0109f13c: 0x109f13c: sw    s0, 20(sp)
+// 0x0109f780: 0x109f780: sw    ra, 28(sp)
+// 0x0109f784: 0x109f784: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -477,13 +477,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109f140: 0x109f140: beq   v0, zero, 0x109f1b4 addu  s1, a1, zero
+// 0x0109f788: 0x109f788: beq   v0, zero, 0x109f7fc addu  s1, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 8
-	brfalse L_109f1b4
+	brfalse L_109f7fc
 // --- basic block ---
-// 0x0109f148: 0x109f148: lw    v0, 56(v0)
+// 0x0109f790: 0x109f790: lw    v0, 56(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -492,18 +492,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f14c: 0x109f14c: sll   zero, zero, 0
-// 0x0109f150: 0x109f150: beq   v0, zero, 0x109f1b8 addu  s0, a0, zero
+// 0x0109f794: 0x109f794: sll   zero, zero, 0
+// 0x0109f798: 0x109f798: beq   v0, zero, 0x109f800 addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brfalse L_109f1b8
+	brfalse L_109f800
 // --- basic block ---
-// 0x0109f158: 0x109f158: j	 0x109f1c4 sll   zero, zero, 0
-	br L_109f1c4
+// 0x0109f7a0: 0x109f7a0: j	 0x109f80c sll   zero, zero, 0
+	br L_109f80c
 // --- basic block ---
-L_109f160:
-// 0x0109f160: 0x109f160: lw    v0, 52(s0)
+L_109f7a8:
+// 0x0109f7a8: 0x109f7a8: lw    v0, 52(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -512,12 +512,12 @@ L_109f160:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f164: 0x109f164: sll   zero, zero, 0
-// 0x0109f168: 0x109f168: beq   v0, zero, 0x109f19c sll   zero, zero, 0
+// 0x0109f7ac: 0x109f7ac: sll   zero, zero, 0
+// 0x0109f7b0: 0x109f7b0: beq   v0, zero, 0x109f7e4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109f19c
+	brfalse L_109f7e4
 // --- basic block ---
-// 0x0109f170: 0x109f170: lw    v0, 56(s0)
+// 0x0109f7b8: 0x109f7b8: lw    v0, 56(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -526,42 +526,42 @@ L_109f160:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f174: 0x109f174: sll   zero, zero, 0
-// 0x0109f178: 0x109f178: beq   v0, zero, 0x109f188 sll   zero, zero, 0
+// 0x0109f7bc: 0x109f7bc: sll   zero, zero, 0
+// 0x0109f7c0: 0x109f7c0: beq   v0, zero, 0x109f7d0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109f188
+	brfalse L_109f7d0
 // --- basic block ---
-// 0x0109f180: 0x109f180: j	 0x109f1c4 sw    s0, 0(s1)
+// 0x0109f7c8: 0x109f7c8: j	 0x109f80c sw    s0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_109f1c4
+	br L_109f80c
 // --- basic block ---
-L_109f188:
-// 0x0109f188: 0x109f188: lw    v0, 0(s1)
+L_109f7d0:
+// 0x0109f7d0: 0x109f7d0: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109f18c: 0x109f18c: sll   zero, zero, 0
-// 0x0109f190: 0x109f190: bne   v0, zero, 0x109f19c sll   zero, zero, 0
+// 0x0109f7d4: 0x109f7d4: sll   zero, zero, 0
+// 0x0109f7d8: 0x109f7d8: bne   v0, zero, 0x109f7e4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f19c
+	brtrue L_109f7e4
 // --- basic block ---
-// 0x0109f198: 0x109f198: sw    s0, 0(s1)
+// 0x0109f7e0: 0x109f7e0: sw    s0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_109f19c:
-// 0x0109f19c: 0x109f19c: lw    a0, 12(s0)
+L_109f7e4:
+// 0x0109f7e4: 0x109f7e4: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -570,18 +570,18 @@ L_109f19c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109f1a0: 0x109f1a0: jal   0x109f12c sll   zero, zero, 0
+// 0x0109f7e8: 0x109f7e8: jal   0x109f774 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::widget_get_next_focus_109f12c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::widget_get_next_focus_109f774(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0109f1a8: 0x109f1a8: lw    s0, 8(s0)
+// 0x0109f7f0: 0x109f7f0: lw    s0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -590,27 +590,27 @@ L_109f19c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f1ac: 0x109f1ac: j	 0x109f1bc addu  a1, s1, zero
+// 0x0109f7f4: 0x109f7f4: j	 0x109f804 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-	br L_109f1bc
+	br L_109f804
 // --- basic block ---
-L_109f1b4:
-// 0x0109f1b4: 0x109f1b4: addu  s0, a0, zero
+L_109f7fc:
+// 0x0109f7fc: 0x109f7fc: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-L_109f1b8:
-// 0x0109f1b8: 0x109f1b8: addu  a1, s1, zero
+L_109f800:
+// 0x0109f800: 0x109f800: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-L_109f1bc:
-// 0x0109f1bc: 0x109f1bc: bne   s0, zero, 0x109f160 sll   zero, zero, 0
+L_109f804:
+// 0x0109f804: 0x109f804: bne   s0, zero, 0x109f7a8 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_109f160
+	brtrue L_109f7a8
 // --- basic block ---
-L_109f1c4:
-// 0x0109f1c4: 0x109f1c4: lw    ra, 28(sp)
-// 0x0109f1c8: 0x109f1c8: lw    s1, 24(sp)
+L_109f80c:
+// 0x0109f80c: 0x109f80c: lw    ra, 28(sp)
+// 0x0109f810: 0x109f810: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -619,7 +619,7 @@ L_109f1c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f1cc: 0x109f1cc: lw    s0, 20(sp)
+// 0x0109f814: 0x109f814: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -628,7 +628,7 @@ L_109f1c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f1d0: 0x109f1d0: jr    ra addiu sp, sp, 32
+// 0x0109f818: 0x109f818: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -640,7 +640,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_widget_get_input_type_109f1fc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_get_input_type_109f844(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -678,7 +678,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f1fc: 0x109f1fc: lw    v0, 224(a0)
+// 0x0109f844: 0x109f844: lw    v0, 224(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -687,12 +687,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f200: 0x109f200: addiu sp, sp, -24
+// 0x0109f848: 0x109f848: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109f204: 0x109f204: sw    s0, 16(sp)
+// 0x0109f84c: 0x109f84c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -701,14 +701,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109f208: 0x109f208: sw    ra, 20(sp)
-// 0x0109f20c: 0x109f20c: beq   v0, zero, 0x109f224 addu  s0, a0, zero
+// 0x0109f850: 0x109f850: sw    ra, 20(sp)
+// 0x0109f854: 0x109f854: beq   v0, zero, 0x109f86c addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 5
-	brfalse L_109f224
+	brfalse L_109f86c
 // --- basic block ---
-// 0x0109f214: 0x109f214: jalr  v0 sll   zero, zero, 0
+// 0x0109f85c: 0x109f85c: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -720,12 +720,12 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109f21c: 0x109f21c: bne   v0, zero, 0x109f250 sll   zero, zero, 0
+// 0x0109f864: 0x109f864: bne   v0, zero, 0x109f898 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f250
+	brtrue L_109f898
 // --- basic block ---
-L_109f224:
-// 0x0109f224: 0x109f224: lw    s0, 12(s0)
+L_109f86c:
+// 0x0109f86c: 0x109f86c: lw    s0, 12(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -734,24 +734,24 @@ L_109f224:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f228: 0x109f228: j	 0x109f248 addu  a0, s0, zero
+// 0x0109f870: 0x109f870: j	 0x109f890 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-	br L_109f248
+	br L_109f890
 // --- basic block ---
-L_109f230:
-// 0x0109f230: 0x109f230: jal   0x109f1fc sll   zero, zero, 0
+L_109f878:
+// 0x0109f878: 0x109f878: jal   0x109f844 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_get_input_type_109f1fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_get_input_type_109f844(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0109f238: 0x109f238: lw    s0, 8(s0)
+// 0x0109f880: 0x109f880: lw    s0, 8(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -760,23 +760,23 @@ L_109f230:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f23c: 0x109f23c: bne   v0, zero, 0x109f250 sll   zero, zero, 0
+// 0x0109f884: 0x109f884: bne   v0, zero, 0x109f898 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f250
+	brtrue L_109f898
 // --- basic block ---
-// 0x0109f244: 0x109f244: addu  a0, s0, zero
+// 0x0109f88c: 0x109f88c: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-L_109f248:
-// 0x0109f248: 0x109f248: bne   s0, zero, 0x109f230 addu  v0, zero, zero
+L_109f890:
+// 0x0109f890: 0x109f890: bne   s0, zero, 0x109f878 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_109f230
+	brtrue L_109f878
 // --- basic block ---
-L_109f250:
-// 0x0109f250: 0x109f250: lw    ra, 20(sp)
-// 0x0109f254: 0x109f254: lw    s0, 16(sp)
+L_109f898:
+// 0x0109f898: 0x109f898: lw    ra, 20(sp)
+// 0x0109f89c: 0x109f89c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -785,7 +785,7 @@ L_109f250:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f258: 0x109f258: jr    ra addiu sp, sp, 24
+// 0x0109f8a0: 0x109f8a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -797,7 +797,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void ssd_widget_loose_focus_109f260(int32)
+.method public static void ssd_widget_loose_focus_109f8a8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 ra)
@@ -814,7 +814,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f260: 0x109f260: sw    zero, 68(a0)
+// 0x0109f8a8: 0x109f8a8: sw    zero, 68(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -823,7 +823,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f264: 0x109f264: jr    ra sw    zero, 60(a0)
+// 0x0109f8ac: 0x109f8ac: jr    ra sw    zero, 60(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -836,7 +836,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ssd_widget_sort_gui_tab_order__fix_corners_109f39c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_sort_gui_tab_order__fix_corners_109f9e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 t0,int32[] mem,int32 s0,int32 t9,int32 v1,int32 t8,int32 t1,int32 t2,int32 t3,int32 s1,int32 t4,int32 t5,int32 t6,int32 t7,int32 ra)
@@ -907,15 +907,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f39c: 0x109f39c: addiu sp, sp, -8
+// 0x0109f9e4: 0x109f9e4: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x0109f3a0: 0x109f3a0: addiu v0, zero, 1
+// 0x0109f9e8: 0x109f9e8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109f3a4: 0x109f3a4: sw    s1, 4(sp)
+// 0x0109f9ec: 0x109f9ec: sw    s1, 4(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -924,155 +924,155 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109f3a8: 0x109f3a8: sw    s0, 0(sp)
+// 0x0109f9f0: 0x109f9f0: sw    s0, 0(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0109f3ac: 0x109f3ac: beq   a1, v0, 0x109f3e0 addiu v1, a0, 88
+// 0x0109f9f4: 0x109f9f4: beq   a1, v0, 0x109fa28 addiu v1, a0, 88
 	ldloc.2
 	ldloc 5
 	ldloc.1
 	ldc.i4.s 88
 	add
 	stloc 10
-	beq  L_109f3e0
+	beq  L_109fa28
 // --- basic block ---
-// 0x0109f3b4: 0x109f3b4: addiu v0, zero, 2
+// 0x0109f9fc: 0x109f9fc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0109f3b8: 0x109f3b8: beq   a1, v0, 0x109f3e0 addiu v1, a0, 84
+// 0x0109fa00: 0x109fa00: beq   a1, v0, 0x109fa28 addiu v1, a0, 84
 	ldloc.2
 	ldloc 5
 	ldloc.1
 	ldc.i4.s 84
 	add
 	stloc 10
-	beq  L_109f3e0
+	beq  L_109fa28
 // --- basic block ---
-// 0x0109f3c0: 0x109f3c0: addiu v0, zero, 3
+// 0x0109fa08: 0x109fa08: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0109f3c4: 0x109f3c4: beq   a1, v0, 0x109f3e0 addiu v1, a0, 92
+// 0x0109fa0c: 0x109fa0c: beq   a1, v0, 0x109fa28 addiu v1, a0, 92
 	ldloc.2
 	ldloc 5
 	ldloc.1
 	ldc.i4.s 92
 	add
 	stloc 10
-	beq  L_109f3e0
+	beq  L_109fa28
 // --- basic block ---
-// 0x0109f3cc: 0x109f3cc: xori  v0, a1, 4
+// 0x0109fa14: 0x109fa14: xori  v0, a1, 4
 	ldloc.2
 	ldc.i4.4
 	xor
 	stloc 5
-// 0x0109f3d0: 0x109f3d0: sltiu v0, v0, 1
+// 0x0109fa18: 0x109fa18: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0109f3d4: 0x109f3d4: subu  v0, zero, v0
+// 0x0109fa1c: 0x109fa1c: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x0109f3d8: 0x109f3d8: addiu v1, a0, 96
+// 0x0109fa20: 0x109fa20: addiu v1, a0, 96
 	ldloc.1
 	ldc.i4.s 96
 	add
 	stloc 10
-// 0x0109f3dc: 0x109f3dc: and   v1, v1, v0
+// 0x0109fa24: 0x109fa24: and   v1, v1, v0
 	ldloc 10
 	ldloc 5
 	and
 	stloc 10
-L_109f3e0:
-// 0x0109f3e0: 0x109f3e0: addiu a3, zero, 1
+L_109fa28:
+// 0x0109fa28: 0x109fa28: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0109f3e4: 0x109f3e4: lw    a2, 0(v1)
+// 0x0109fa2c: 0x109fa2c: lw    a2, 0(v1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0109f3e8: 0x109f3e8: beq   a1, a3, 0x109f41c addiu v0, a0, 84
+// 0x0109fa30: 0x109fa30: beq   a1, a3, 0x109fa64 addiu v0, a0, 84
 	ldloc.2
 	ldloc 4
 	ldloc.1
 	ldc.i4.s 84
 	add
 	stloc 5
-	beq  L_109f41c
+	beq  L_109fa64
 // --- basic block ---
-// 0x0109f3f0: 0x109f3f0: addiu a3, zero, 2
+// 0x0109fa38: 0x109fa38: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x0109f3f4: 0x109f3f4: beq   a1, a3, 0x109f41c addiu v0, a0, 88
+// 0x0109fa3c: 0x109fa3c: beq   a1, a3, 0x109fa64 addiu v0, a0, 88
 	ldloc.2
 	ldloc 4
 	ldloc.1
 	ldc.i4.s 88
 	add
 	stloc 5
-	beq  L_109f41c
+	beq  L_109fa64
 // --- basic block ---
-// 0x0109f3fc: 0x109f3fc: addiu a3, zero, 3
+// 0x0109fa44: 0x109fa44: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x0109f400: 0x109f400: beq   a1, a3, 0x109f41c addiu v0, a0, 96
+// 0x0109fa48: 0x109fa48: beq   a1, a3, 0x109fa64 addiu v0, a0, 96
 	ldloc.2
 	ldloc 4
 	ldloc.1
 	ldc.i4.s 96
 	add
 	stloc 5
-	beq  L_109f41c
+	beq  L_109fa64
 // --- basic block ---
-// 0x0109f408: 0x109f408: xori  a3, a1, 4
+// 0x0109fa50: 0x109fa50: xori  a3, a1, 4
 	ldloc.2
 	ldc.i4.4
 	xor
 	stloc 4
-// 0x0109f40c: 0x109f40c: sltiu a3, a3, 1
+// 0x0109fa54: 0x109fa54: sltiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	clt.un
 	stloc 4
-// 0x0109f410: 0x109f410: subu  a3, zero, a3
+// 0x0109fa58: 0x109fa58: subu  a3, zero, a3
 	ldloc 4
 	neg
 	stloc 4
-// 0x0109f414: 0x109f414: addiu v0, a0, 92
+// 0x0109fa5c: 0x109fa5c: addiu v0, a0, 92
 	ldloc.1
 	ldc.i4.s 92
 	add
 	stloc 5
-// 0x0109f418: 0x109f418: and   v0, v0, a3
+// 0x0109fa60: 0x109fa60: and   v0, v0, a3
 	ldloc 5
 	ldloc 4
 	and
 	stloc 5
-L_109f41c:
-// 0x0109f41c: 0x109f41c: lw    v0, 0(v0)
+L_109fa64:
+// 0x0109fa64: 0x109fa64: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0109f420: 0x109f420: bne   a2, zero, 0x109f618 sll   zero, zero, 0
+// 0x0109fa68: 0x109fa68: bne   a2, zero, 0x109fc60 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_109f618
+	brtrue L_109fc60
 // --- basic block ---
-// 0x0109f428: 0x109f428: beq   v0, zero, 0x109f618 sll   zero, zero, 0
+// 0x0109fa70: 0x109fa70: beq   v0, zero, 0x109fc60 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109f618
+	brfalse L_109fc60
 // --- basic block ---
-// 0x0109f430: 0x109f430: lw    t3, 24(a0)
+// 0x0109fa78: 0x109fa78: lw    t3, 24(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1081,13 +1081,13 @@ L_109f41c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0109f434: 0x109f434: sll   zero, zero, 0
-// 0x0109f438: 0x109f438: blez  t3, 0x109f450 sll   zero, zero, 0
+// 0x0109fa7c: 0x109fa7c: sll   zero, zero, 0
+// 0x0109fa80: 0x109fa80: blez  t3, 0x109fa98 sll   zero, zero, 0
 	ldloc 14
 	ldc.i4.s 0
-	ble L_109f450
+	ble L_109fa98
 // --- basic block ---
-// 0x0109f440: 0x109f440: lw    a2, 28(a0)
+// 0x0109fa88: 0x109fa88: lw    a2, 28(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1096,18 +1096,18 @@ L_109f41c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109f444: 0x109f444: sll   zero, zero, 0
-// 0x0109f448: 0x109f448: bgtz  a2, 0x109f470 xori  t8, a1, 4
+// 0x0109fa8c: 0x109fa8c: sll   zero, zero, 0
+// 0x0109fa90: 0x109fa90: bgtz  a2, 0x109fab8 xori  t8, a1, 4
 	ldloc.3
 	ldloc.2
 	ldc.i4.4
 	xor
 	stloc 11
 	ldc.i4.s 0
-	bgt L_109f470
+	bgt L_109fab8
 // --- basic block ---
-L_109f450:
-// 0x0109f450: 0x109f450: lw    a2, 32(a0)
+L_109fa98:
+// 0x0109fa98: 0x109fa98: lw    a2, 32(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1116,13 +1116,13 @@ L_109f450:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109f454: 0x109f454: sll   zero, zero, 0
-// 0x0109f458: 0x109f458: blez  a2, 0x109f618 sll   zero, zero, 0
+// 0x0109fa9c: 0x109fa9c: sll   zero, zero, 0
+// 0x0109faa0: 0x109faa0: blez  a2, 0x109fc60 sll   zero, zero, 0
 	ldloc.3
 	ldc.i4.s 0
-	ble L_109f618
+	ble L_109fc60
 // --- basic block ---
-// 0x0109f460: 0x109f460: lw    a2, 36(a0)
+// 0x0109faa8: 0x109faa8: lw    a2, 36(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1131,64 +1131,64 @@ L_109f450:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109f464: 0x109f464: sll   zero, zero, 0
-// 0x0109f468: 0x109f468: blez  a2, 0x109f618 xori  t8, a1, 4
+// 0x0109faac: 0x109faac: sll   zero, zero, 0
+// 0x0109fab0: 0x109fab0: blez  a2, 0x109fc60 xori  t8, a1, 4
 	ldloc.3
 	ldloc.2
 	ldc.i4.4
 	xor
 	stloc 11
 	ldc.i4.s 0
-	ble L_109f618
+	ble L_109fc60
 // --- basic block ---
-L_109f470:
-// 0x0109f470: 0x109f470: sltiu t8, t8, 1
+L_109fab8:
+// 0x0109fab8: 0x109fab8: sltiu t8, t8, 1
 	ldloc 11
 	ldc.i4.1
 	clt.un
 	stloc 11
-// 0x0109f474: 0x109f474: subu  t8, zero, t8
+// 0x0109fabc: 0x109fabc: subu  t8, zero, t8
 	ldloc 11
 	neg
 	stloc 11
-// 0x0109f478: 0x109f478: addu  a2, a0, zero
+// 0x0109fac0: 0x109fac0: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x0109f47c: 0x109f47c: addu  a3, a0, zero
+// 0x0109fac4: 0x109fac4: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x0109f480: 0x109f480: addu  t2, zero, zero
+// 0x0109fac8: 0x109fac8: addu  t2, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x0109f484: 0x109f484: addu  t7, zero, zero
+// 0x0109facc: 0x109facc: addu  t7, zero, zero
 	ldc.i4.s 0
 	stloc 19
-// 0x0109f488: 0x109f488: addu  t1, zero, zero
+// 0x0109fad0: 0x109fad0: addu  t1, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x0109f48c: 0x109f48c: addiu t6, zero, 1
+// 0x0109fad4: 0x109fad4: addiu t6, zero, 1
 	ldc.i4.1
 	stloc 18
-// 0x0109f490: 0x109f490: addiu t5, zero, 2
+// 0x0109fad8: 0x109fad8: addiu t5, zero, 2
 	ldc.i4.2
 	stloc 17
-// 0x0109f494: 0x109f494: addiu t4, zero, 3
+// 0x0109fadc: 0x109fadc: addiu t4, zero, 3
 	ldc.i4.3
 	stloc 16
-L_109f498:
-// 0x0109f498: 0x109f498: beq   v0, a0, 0x109f614 sll   zero, zero, 0
+L_109fae0:
+// 0x0109fae0: 0x109fae0: beq   v0, a0, 0x109fc5c sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	beq  L_109f614
+	beq  L_109fc5c
 // --- basic block ---
-// 0x0109f4a0: 0x109f4a0: bgtz  t3, 0x109f4bc addu  t0, t3, zero
+// 0x0109fae8: 0x109fae8: bgtz  t3, 0x109fb04 addu  t0, t3, zero
 	ldloc 14
 	ldloc 14
 	stloc 6
 	ldc.i4.s 0
-	bgt L_109f4bc
+	bgt L_109fb04
 // --- basic block ---
-// 0x0109f4a8: 0x109f4a8: lw    t0, 32(a0)
+// 0x0109faf0: 0x109faf0: lw    t0, 32(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1197,24 +1197,24 @@ L_109f498:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f4ac: 0x109f4ac: sll   zero, zero, 0
-// 0x0109f4b0: 0x109f4b0: nor   a3, zero, t0
+// 0x0109faf4: 0x109faf4: sll   zero, zero, 0
+// 0x0109faf8: 0x109faf8: nor   a3, zero, t0
 	ldloc 6
 	ldc.i4.m1
 	xor
 	stloc 4
-// 0x0109f4b4: 0x109f4b4: sra   a3, a3, 31
+// 0x0109fafc: 0x109fafc: sra   a3, a3, 31
 	ldloc 4
 	ldc.i4.s 31
 	shr
 	stloc 4
-// 0x0109f4b8: 0x109f4b8: and   t0, t0, a3
+// 0x0109fb00: 0x109fb00: and   t0, t0, a3
 	ldloc 6
 	ldloc 4
 	and
 	stloc 6
-L_109f4bc:
-// 0x0109f4bc: 0x109f4bc: lw    t9, 120(a0)
+L_109fb04:
+// 0x0109fb04: 0x109fb04: lw    t9, 120(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1223,7 +1223,7 @@ L_109f4bc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109f4c0: 0x109f4c0: lw    a3, 24(v0)
+// 0x0109fb08: 0x109fb08: lw    a3, 24(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1232,21 +1232,21 @@ L_109f4bc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109f4c4: 0x109f4c4: sra   t0, t0, 1
+// 0x0109fb0c: 0x109fb0c: sra   t0, t0, 1
 	ldloc 6
 	ldc.i4.1
 	shr
 	stloc 6
-// 0x0109f4c8: 0x109f4c8: bgtz  a3, 0x109f4e4 addu  t0, t0, t9
+// 0x0109fb10: 0x109fb10: bgtz  a3, 0x109fb2c addu  t0, t0, t9
 	ldloc 4
 	ldloc 6
 	ldloc 9
 	add
 	stloc 6
 	ldc.i4.s 0
-	bgt L_109f4e4
+	bgt L_109fb2c
 // --- basic block ---
-// 0x0109f4d0: 0x109f4d0: lw    a3, 32(v0)
+// 0x0109fb18: 0x109fb18: lw    a3, 32(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1255,24 +1255,24 @@ L_109f4bc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109f4d4: 0x109f4d4: sll   zero, zero, 0
-// 0x0109f4d8: 0x109f4d8: nor   t9, zero, a3
+// 0x0109fb1c: 0x109fb1c: sll   zero, zero, 0
+// 0x0109fb20: 0x109fb20: nor   t9, zero, a3
 	ldloc 4
 	ldc.i4.m1
 	xor
 	stloc 9
-// 0x0109f4dc: 0x109f4dc: sra   t9, t9, 31
+// 0x0109fb24: 0x109fb24: sra   t9, t9, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr
 	stloc 9
-// 0x0109f4e0: 0x109f4e0: and   a3, a3, t9
+// 0x0109fb28: 0x109fb28: and   a3, a3, t9
 	ldloc 4
 	ldloc 9
 	and
 	stloc 4
-L_109f4e4:
-// 0x0109f4e4: 0x109f4e4: lw    t9, 120(v0)
+L_109fb2c:
+// 0x0109fb2c: 0x109fb2c: lw    t9, 120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1281,36 +1281,36 @@ L_109f4e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109f4e8: 0x109f4e8: sra   a3, a3, 1
+// 0x0109fb30: 0x109fb30: sra   a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	shr
 	stloc 4
-// 0x0109f4ec: 0x109f4ec: addu  a3, a3, t9
+// 0x0109fb34: 0x109fb34: addu  a3, a3, t9
 	ldloc 4
 	ldloc 9
 	add
 	stloc 4
-// 0x0109f4f0: 0x109f4f0: slt   s0, t0, a3
+// 0x0109fb38: 0x109fb38: slt   s0, t0, a3
 	ldloc 6
 	ldloc 4
 	clt
 	stloc 8
-// 0x0109f4f4: 0x109f4f4: beq   s0, zero, 0x109f500 subu  t9, t0, a3
+// 0x0109fb3c: 0x109fb3c: beq   s0, zero, 0x109fb48 subu  t9, t0, a3
 	ldloc 8
 	ldloc 6
 	ldloc 4
 	sub
 	stloc 9
-	brfalse L_109f500
+	brfalse L_109fb48
 // --- basic block ---
-// 0x0109f4fc: 0x109f4fc: subu  t9, a3, t0
+// 0x0109fb44: 0x109fb44: subu  t9, a3, t0
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 9
-L_109f500:
-// 0x0109f500: 0x109f500: lw    t0, 28(a0)
+L_109fb48:
+// 0x0109fb48: 0x109fb48: lw    t0, 28(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1319,13 +1319,13 @@ L_109f500:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f504: 0x109f504: sll   zero, zero, 0
-// 0x0109f508: 0x109f508: bgtz  t0, 0x109f524 sll   zero, zero, 0
+// 0x0109fb4c: 0x109fb4c: sll   zero, zero, 0
+// 0x0109fb50: 0x109fb50: bgtz  t0, 0x109fb6c sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bgt L_109f524
+	bgt L_109fb6c
 // --- basic block ---
-// 0x0109f510: 0x109f510: lw    t0, 36(a0)
+// 0x0109fb58: 0x109fb58: lw    t0, 36(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1334,24 +1334,24 @@ L_109f500:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f514: 0x109f514: sll   zero, zero, 0
-// 0x0109f518: 0x109f518: nor   a3, zero, t0
+// 0x0109fb5c: 0x109fb5c: sll   zero, zero, 0
+// 0x0109fb60: 0x109fb60: nor   a3, zero, t0
 	ldloc 6
 	ldc.i4.m1
 	xor
 	stloc 4
-// 0x0109f51c: 0x109f51c: sra   a3, a3, 31
+// 0x0109fb64: 0x109fb64: sra   a3, a3, 31
 	ldloc 4
 	ldc.i4.s 31
 	shr
 	stloc 4
-// 0x0109f520: 0x109f520: and   t0, t0, a3
+// 0x0109fb68: 0x109fb68: and   t0, t0, a3
 	ldloc 6
 	ldloc 4
 	and
 	stloc 6
-L_109f524:
-// 0x0109f524: 0x109f524: lw    s0, 124(a0)
+L_109fb6c:
+// 0x0109fb6c: 0x109fb6c: lw    s0, 124(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1360,7 +1360,7 @@ L_109f524:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f528: 0x109f528: lw    a3, 28(v0)
+// 0x0109fb70: 0x109fb70: lw    a3, 28(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1369,21 +1369,21 @@ L_109f524:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109f52c: 0x109f52c: sra   t0, t0, 1
+// 0x0109fb74: 0x109fb74: sra   t0, t0, 1
 	ldloc 6
 	ldc.i4.1
 	shr
 	stloc 6
-// 0x0109f530: 0x109f530: bgtz  a3, 0x109f54c addu  t0, t0, s0
+// 0x0109fb78: 0x109fb78: bgtz  a3, 0x109fb94 addu  t0, t0, s0
 	ldloc 4
 	ldloc 6
 	ldloc 8
 	add
 	stloc 6
 	ldc.i4.s 0
-	bgt L_109f54c
+	bgt L_109fb94
 // --- basic block ---
-// 0x0109f538: 0x109f538: lw    a3, 36(v0)
+// 0x0109fb80: 0x109fb80: lw    a3, 36(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1392,24 +1392,24 @@ L_109f524:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0109f53c: 0x109f53c: sll   zero, zero, 0
-// 0x0109f540: 0x109f540: nor   s0, zero, a3
+// 0x0109fb84: 0x109fb84: sll   zero, zero, 0
+// 0x0109fb88: 0x109fb88: nor   s0, zero, a3
 	ldloc 4
 	ldc.i4.m1
 	xor
 	stloc 8
-// 0x0109f544: 0x109f544: sra   s0, s0, 31
+// 0x0109fb8c: 0x109fb8c: sra   s0, s0, 31
 	ldloc 8
 	ldc.i4.s 31
 	shr
 	stloc 8
-// 0x0109f548: 0x109f548: and   a3, a3, s0
+// 0x0109fb90: 0x109fb90: and   a3, a3, s0
 	ldloc 4
 	ldloc 8
 	and
 	stloc 4
-L_109f54c:
-// 0x0109f54c: 0x109f54c: lw    s0, 124(v0)
+L_109fb94:
+// 0x0109fb94: 0x109fb94: lw    s0, 124(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1418,205 +1418,205 @@ L_109f54c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f550: 0x109f550: sra   a3, a3, 1
+// 0x0109fb98: 0x109fb98: sra   a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	shr
 	stloc 4
-// 0x0109f554: 0x109f554: addu  a3, a3, s0
+// 0x0109fb9c: 0x109fb9c: addu  a3, a3, s0
 	ldloc 4
 	ldloc 8
 	add
 	stloc 4
-// 0x0109f558: 0x109f558: slt   s1, t0, a3
+// 0x0109fba0: 0x109fba0: slt   s1, t0, a3
 	ldloc 6
 	ldloc 4
 	clt
 	stloc 15
-// 0x0109f55c: 0x109f55c: beq   s1, zero, 0x109f568 subu  s0, t0, a3
+// 0x0109fba4: 0x109fba4: beq   s1, zero, 0x109fbb0 subu  s0, t0, a3
 	ldloc 15
 	ldloc 6
 	ldloc 4
 	sub
 	stloc 8
-	brfalse L_109f568
+	brfalse L_109fbb0
 // --- basic block ---
-// 0x0109f564: 0x109f564: subu  s0, a3, t0
+// 0x0109fbac: 0x109fbac: subu  s0, a3, t0
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 8
-L_109f568:
-// 0x0109f568: 0x109f568: addu  a3, s0, t9
+L_109fbb0:
+// 0x0109fbb0: 0x109fbb0: addu  a3, s0, t9
 	ldloc 8
 	ldloc 9
 	add
 	stloc 4
-// 0x0109f56c: 0x109f56c: slt   t0, t7, a3
+// 0x0109fbb4: 0x109fbb4: slt   t0, t7, a3
 	ldloc 19
 	ldloc 4
 	clt
 	stloc 6
-// 0x0109f570: 0x109f570: beq   t0, zero, 0x109f580 sll   zero, zero, 0
+// 0x0109fbb8: 0x109fbb8: beq   t0, zero, 0x109fbc8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109f580
+	brfalse L_109fbc8
 // --- basic block ---
-// 0x0109f578: 0x109f578: addu  t7, a3, zero
+// 0x0109fbc0: 0x109fbc0: addu  t7, a3, zero
 	ldloc 4
 	stloc 19
-// 0x0109f57c: 0x109f57c: addu  t1, v0, zero
+// 0x0109fbc4: 0x109fbc4: addu  t1, v0, zero
 	ldloc 5
 	stloc 12
-L_109f580:
-// 0x0109f580: 0x109f580: bne   a2, v0, 0x109f5a0 sll   zero, zero, 0
+L_109fbc8:
+// 0x0109fbc8: 0x109fbc8: bne   a2, v0, 0x109fbe8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 5
-	bne.un L_109f5a0
+	bne.un L_109fbe8
 // --- basic block ---
-// 0x0109f588: 0x109f588: beq   t1, zero, 0x109f618 sll   zero, zero, 0
+// 0x0109fbd0: 0x109fbd0: beq   t1, zero, 0x109fc60 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_109f618
+	brfalse L_109fc60
 // --- basic block ---
-// 0x0109f590: 0x109f590: bne   t1, a0, 0x109f614 addu  a3, t1, zero
+// 0x0109fbd8: 0x109fbd8: bne   t1, a0, 0x109fc5c addu  a3, t1, zero
 	ldloc 12
 	ldloc.1
 	ldloc 12
 	stloc 4
-	bne.un L_109f614
+	bne.un L_109fc5c
 // --- basic block ---
-// 0x0109f598: 0x109f598: j	 0x109f618 sll   zero, zero, 0
-	br L_109f618
+// 0x0109fbe0: 0x109fbe0: j	 0x109fc60 sll   zero, zero, 0
+	br L_109fc60
 // --- basic block ---
-L_109f5a0:
-// 0x0109f5a0: 0x109f5a0: beq   t2, zero, 0x109f5cc sll   zero, zero, 0
+L_109fbe8:
+// 0x0109fbe8: 0x109fbe8: beq   t2, zero, 0x109fc14 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_109f5cc
+	brfalse L_109fc14
 // --- basic block ---
-// 0x0109f5a8: 0x109f5a8: beq   a1, t6, 0x109f5c8 addiu a3, a2, 84
+// 0x0109fbf0: 0x109fbf0: beq   a1, t6, 0x109fc10 addiu a3, a2, 84
 	ldloc.2
 	ldloc 18
 	ldloc.3
 	ldc.i4.s 84
 	add
 	stloc 4
-	beq  L_109f5c8
+	beq  L_109fc10
 // --- basic block ---
-// 0x0109f5b0: 0x109f5b0: beq   a1, t5, 0x109f5c8 addiu a3, a2, 88
+// 0x0109fbf8: 0x109fbf8: beq   a1, t5, 0x109fc10 addiu a3, a2, 88
 	ldloc.2
 	ldloc 17
 	ldloc.3
 	ldc.i4.s 88
 	add
 	stloc 4
-	beq  L_109f5c8
+	beq  L_109fc10
 // --- basic block ---
-// 0x0109f5b8: 0x109f5b8: beq   a1, t4, 0x109f5c8 addiu a3, a2, 96
+// 0x0109fc00: 0x109fc00: beq   a1, t4, 0x109fc10 addiu a3, a2, 96
 	ldloc.2
 	ldloc 16
 	ldloc.3
 	ldc.i4.s 96
 	add
 	stloc 4
-	beq  L_109f5c8
+	beq  L_109fc10
 // --- basic block ---
-// 0x0109f5c0: 0x109f5c0: addiu a3, a2, 92
+// 0x0109fc08: 0x109fc08: addiu a3, a2, 92
 	ldloc.3
 	ldc.i4.s 92
 	add
 	stloc 4
-// 0x0109f5c4: 0x109f5c4: and   a3, a3, t8
+// 0x0109fc0c: 0x109fc0c: and   a3, a3, t8
 	ldloc 4
 	ldloc 11
 	and
 	stloc 4
-L_109f5c8:
-// 0x0109f5c8: 0x109f5c8: lw    a2, 0(a3)
+L_109fc10:
+// 0x0109fc10: 0x109fc10: lw    a2, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-L_109f5cc:
-// 0x0109f5cc: 0x109f5cc: beq   a1, t6, 0x109f5ec addiu a3, v0, 84
+L_109fc14:
+// 0x0109fc14: 0x109fc14: beq   a1, t6, 0x109fc34 addiu a3, v0, 84
 	ldloc.2
 	ldloc 18
 	ldloc 5
 	ldc.i4.s 84
 	add
 	stloc 4
-	beq  L_109f5ec
+	beq  L_109fc34
 // --- basic block ---
-// 0x0109f5d4: 0x109f5d4: beq   a1, t5, 0x109f5ec addiu a3, v0, 88
+// 0x0109fc1c: 0x109fc1c: beq   a1, t5, 0x109fc34 addiu a3, v0, 88
 	ldloc.2
 	ldloc 17
 	ldloc 5
 	ldc.i4.s 88
 	add
 	stloc 4
-	beq  L_109f5ec
+	beq  L_109fc34
 // --- basic block ---
-// 0x0109f5dc: 0x109f5dc: beq   a1, t4, 0x109f5ec addiu a3, v0, 96
+// 0x0109fc24: 0x109fc24: beq   a1, t4, 0x109fc34 addiu a3, v0, 96
 	ldloc.2
 	ldloc 16
 	ldloc 5
 	ldc.i4.s 96
 	add
 	stloc 4
-	beq  L_109f5ec
+	beq  L_109fc34
 // --- basic block ---
-// 0x0109f5e4: 0x109f5e4: addiu a3, v0, 92
+// 0x0109fc2c: 0x109fc2c: addiu a3, v0, 92
 	ldloc 5
 	ldc.i4.s 92
 	add
 	stloc 4
-// 0x0109f5e8: 0x109f5e8: and   a3, a3, t8
+// 0x0109fc30: 0x109fc30: and   a3, a3, t8
 	ldloc 4
 	ldloc 11
 	and
 	stloc 4
-L_109f5ec:
-// 0x0109f5ec: 0x109f5ec: lw    t0, 0(a3)
+L_109fc34:
+// 0x0109fc34: 0x109fc34: lw    t0, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109f5f0: 0x109f5f0: sll   zero, zero, 0
-// 0x0109f5f4: 0x109f5f4: bne   t0, zero, 0x109f604 sll   zero, zero, 0
+// 0x0109fc38: 0x109fc38: sll   zero, zero, 0
+// 0x0109fc3c: 0x109fc3c: bne   t0, zero, 0x109fc4c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f604
+	brtrue L_109fc4c
 // --- basic block ---
-// 0x0109f5fc: 0x109f5fc: j	 0x109f614 addu  a3, v0, zero
+// 0x0109fc44: 0x109fc44: j	 0x109fc5c addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-	br L_109f614
+	br L_109fc5c
 // --- basic block ---
-L_109f604:
-// 0x0109f604: 0x109f604: addu  a3, v0, zero
+L_109fc4c:
+// 0x0109fc4c: 0x109fc4c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0109f608: 0x109f608: xori  t2, t2, 1
+// 0x0109fc50: 0x109fc50: xori  t2, t2, 1
 	ldloc 13
 	ldc.i4.1
 	xor
 	stloc 13
-// 0x0109f60c: 0x109f60c: j	 0x109f498 addu  v0, t0, zero
+// 0x0109fc54: 0x109fc54: j	 0x109fae0 addu  v0, t0, zero
 	ldloc 6
 	stloc 5
-	br L_109f498
+	br L_109fae0
 // --- basic block ---
-L_109f614:
-// 0x0109f614: 0x109f614: sw    a3, 0(v1)
+L_109fc5c:
+// 0x0109fc5c: 0x109fc5c: sw    a3, 0(v1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-L_109f618:
-// 0x0109f618: 0x109f618: lw    s1, 4(sp)
+L_109fc60:
+// 0x0109fc60: 0x109fc60: lw    s1, 4(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1625,14 +1625,14 @@ L_109f618:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0109f61c: 0x109f61c: lw    s0, 0(sp)
+// 0x0109fc64: 0x109fc64: lw    s0, 0(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0109f620: 0x109f620: jr    ra addiu sp, sp, 8
+// 0x0109fc68: 0x109fc68: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -1644,7 +1644,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_sort_gui_tab_order__fix_orphan_pointers_109f628(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_sort_gui_tab_order__fix_orphan_pointers_109fc70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 s1,int32 ra)
@@ -1685,12 +1685,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f628: 0x109f628: addiu sp, sp, -32
+// 0x0109fc70: 0x109fc70: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109f62c: 0x109f62c: sw    s1, 24(sp)
+// 0x0109fc74: 0x109fc74: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1699,7 +1699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109f630: 0x109f630: sw    s0, 20(sp)
+// 0x0109fc78: 0x109fc78: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1708,18 +1708,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109f634: 0x109f634: sw    ra, 28(sp)
-// 0x0109f638: 0x109f638: addu  s1, a0, zero
+// 0x0109fc7c: 0x109fc7c: sw    ra, 28(sp)
+// 0x0109fc80: 0x109fc80: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0109f63c: 0x109f63c: addu  s0, a0, zero
+// 0x0109fc84: 0x109fc84: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0109f640: 0x109f640: addu  a0, s0, zero
+// 0x0109fc88: 0x109fc88: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-L_109f644:
-// 0x0109f644: 0x109f644: jal   0x109f39c addiu a1, zero, 1
+L_109fc8c:
+// 0x0109fc8c: 0x109fc8c: jal   0x109f9e4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1727,15 +1727,15 @@ L_109f644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f39c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f9e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109f64c: 0x109f64c: addu  a0, s0, zero
+// 0x0109fc94: 0x109fc94: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109f650: 0x109f650: jal   0x109f39c addiu a1, zero, 2
+// 0x0109fc98: 0x109fc98: jal   0x109f9e4 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -1743,15 +1743,15 @@ L_109f644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f39c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f9e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109f658: 0x109f658: addu  a0, s0, zero
+// 0x0109fca0: 0x109fca0: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109f65c: 0x109f65c: jal   0x109f39c addiu a1, zero, 3
+// 0x0109fca4: 0x109fca4: jal   0x109f9e4 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -1759,15 +1759,15 @@ L_109f644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f39c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f9e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109f664: 0x109f664: addu  a0, s0, zero
+// 0x0109fcac: 0x109fcac: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x0109f668: 0x109f668: jal   0x109f39c addiu a1, zero, 4
+// 0x0109fcb0: 0x109fcb0: jal   0x109f9e4 addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
 	ldloc.0
@@ -1775,12 +1775,12 @@ L_109f644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f39c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_corners_109f9e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0109f670: 0x109f670: lw    s0, 80(s0)
+// 0x0109fcb8: 0x109fcb8: lw    s0, 80(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1789,21 +1789,21 @@ L_109f644:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f674: 0x109f674: sll   zero, zero, 0
-// 0x0109f678: 0x109f678: beq   s0, zero, 0x109f688 sll   zero, zero, 0
+// 0x0109fcbc: 0x109fcbc: sll   zero, zero, 0
+// 0x0109fcc0: 0x109fcc0: beq   s0, zero, 0x109fcd0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109f688
+	brfalse L_109fcd0
 // --- basic block ---
-// 0x0109f680: 0x109f680: bne   s0, s1, 0x109f644 addu  a0, s0, zero
+// 0x0109fcc8: 0x109fcc8: bne   s0, s1, 0x109fc8c addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	ldloc 5
 	stloc.1
-	bne.un L_109f644
+	bne.un L_109fc8c
 // --- basic block ---
-L_109f688:
-// 0x0109f688: 0x109f688: lw    ra, 28(sp)
-// 0x0109f68c: 0x109f68c: lw    s1, 24(sp)
+L_109fcd0:
+// 0x0109fcd0: 0x109fcd0: lw    ra, 28(sp)
+// 0x0109fcd4: 0x109fcd4: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1812,7 +1812,7 @@ L_109f688:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109f690: 0x109f690: lw    s0, 20(sp)
+// 0x0109fcd8: 0x109fcd8: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1821,7 +1821,7 @@ L_109f688:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f694: 0x109f694: jr    ra addiu sp, sp, 32
+// 0x0109fcdc: 0x109fcdc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1833,7 +1833,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_widget_sort_gui_tab_order_109f69c(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_sort_gui_tab_order_109fce4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1871,13 +1871,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f69c: 0x109f69c: addiu sp, sp, -24
+// 0x0109fce4: 0x109fce4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109f6a0: 0x109f6a0: sw    ra, 20(sp)
-// 0x0109f6a4: 0x109f6a4: beq   a0, zero, 0x109f7a4 sw    s0, 16(sp)
+// 0x0109fce8: 0x109fce8: sw    ra, 20(sp)
+// 0x0109fcec: 0x109fcec: beq   a0, zero, 0x109fdec sw    s0, 16(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -1887,9 +1887,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_109f7a4
+	brfalse L_109fdec
 // --- basic block ---
-// 0x0109f6ac: 0x109f6ac: lw    v0, 80(a0)
+// 0x0109fcf4: 0x109fcf4: lw    v0, 80(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1898,14 +1898,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f6b0: 0x109f6b0: sll   zero, zero, 0
-// 0x0109f6b4: 0x109f6b4: bne   v0, zero, 0x109f704 addu  v0, a0, zero
+// 0x0109fcf8: 0x109fcf8: sll   zero, zero, 0
+// 0x0109fcfc: 0x109fcfc: bne   v0, zero, 0x109fd4c addu  v0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 5
-	brtrue L_109f704
+	brtrue L_109fd4c
 // --- basic block ---
-// 0x0109f6bc: 0x109f6bc: lw    v0, 24(a0)
+// 0x0109fd04: 0x109fd04: lw    v0, 24(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1914,13 +1914,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f6c0: 0x109f6c0: sll   zero, zero, 0
-// 0x0109f6c4: 0x109f6c4: blez  v0, 0x109f6dc sll   zero, zero, 0
+// 0x0109fd08: 0x109fd08: sll   zero, zero, 0
+// 0x0109fd0c: 0x109fd0c: blez  v0, 0x109fd24 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_109f6dc
+	ble L_109fd24
 // --- basic block ---
-// 0x0109f6cc: 0x109f6cc: lw    v0, 28(a0)
+// 0x0109fd14: 0x109fd14: lw    v0, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1929,14 +1929,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f6d0: 0x109f6d0: sll   zero, zero, 0
-// 0x0109f6d4: 0x109f6d4: bgtz  v0, 0x109f7a4 sll   zero, zero, 0
+// 0x0109fd18: 0x109fd18: sll   zero, zero, 0
+// 0x0109fd1c: 0x109fd1c: bgtz  v0, 0x109fdec sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_109f7a4
+	bgt L_109fdec
 // --- basic block ---
-L_109f6dc:
-// 0x0109f6dc: 0x109f6dc: lw    v0, 32(a0)
+L_109fd24:
+// 0x0109fd24: 0x109fd24: lw    v0, 32(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1945,13 +1945,13 @@ L_109f6dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f6e0: 0x109f6e0: sll   zero, zero, 0
-// 0x0109f6e4: 0x109f6e4: blez  v0, 0x109f7a0 sll   zero, zero, 0
+// 0x0109fd28: 0x109fd28: sll   zero, zero, 0
+// 0x0109fd2c: 0x109fd2c: blez  v0, 0x109fde8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_109f7a0
+	ble L_109fde8
 // --- basic block ---
-// 0x0109f6ec: 0x109f6ec: lw    v0, 36(a0)
+// 0x0109fd34: 0x109fd34: lw    v0, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1960,23 +1960,23 @@ L_109f6dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f6f0: 0x109f6f0: sll   zero, zero, 0
-// 0x0109f6f4: 0x109f6f4: bgtz  v0, 0x109f7a4 sll   zero, zero, 0
+// 0x0109fd38: 0x109fd38: sll   zero, zero, 0
+// 0x0109fd3c: 0x109fd3c: bgtz  v0, 0x109fdec sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_109f7a4
+	bgt L_109fdec
 // --- basic block ---
-// 0x0109f6fc: 0x109f6fc: j	 0x109f7a4 addu  a0, zero, zero
+// 0x0109fd44: 0x109fd44: j	 0x109fdec addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_109f7a4
+	br L_109fdec
 // --- basic block ---
-L_109f704:
-// 0x0109f704: 0x109f704: addu  s0, zero, zero
+L_109fd4c:
+// 0x0109fd4c: 0x109fd4c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_109f708:
-// 0x0109f708: 0x109f708: lw    v1, 24(v0)
+L_109fd50:
+// 0x0109fd50: 0x109fd50: lw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1985,13 +1985,13 @@ L_109f708:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f70c: 0x109f70c: sll   zero, zero, 0
-// 0x0109f710: 0x109f710: blez  v1, 0x109f728 sll   zero, zero, 0
+// 0x0109fd54: 0x109fd54: sll   zero, zero, 0
+// 0x0109fd58: 0x109fd58: blez  v1, 0x109fd70 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	ble L_109f728
+	ble L_109fd70
 // --- basic block ---
-// 0x0109f718: 0x109f718: lw    v1, 28(v0)
+// 0x0109fd60: 0x109fd60: lw    v1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2000,14 +2000,14 @@ L_109f708:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f71c: 0x109f71c: sll   zero, zero, 0
-// 0x0109f720: 0x109f720: bgtz  v1, 0x109f748 sll   zero, zero, 0
+// 0x0109fd64: 0x109fd64: sll   zero, zero, 0
+// 0x0109fd68: 0x109fd68: bgtz  v1, 0x109fd90 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bgt L_109f748
+	bgt L_109fd90
 // --- basic block ---
-L_109f728:
-// 0x0109f728: 0x109f728: lw    v1, 32(v0)
+L_109fd70:
+// 0x0109fd70: 0x109fd70: lw    v1, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2016,13 +2016,13 @@ L_109f728:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f72c: 0x109f72c: sll   zero, zero, 0
-// 0x0109f730: 0x109f730: blez  v1, 0x109f778 sll   zero, zero, 0
+// 0x0109fd74: 0x109fd74: sll   zero, zero, 0
+// 0x0109fd78: 0x109fd78: blez  v1, 0x109fdc0 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	ble L_109f778
+	ble L_109fdc0
 // --- basic block ---
-// 0x0109f738: 0x109f738: lw    v1, 36(v0)
+// 0x0109fd80: 0x109fd80: lw    v1, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2031,14 +2031,14 @@ L_109f728:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f73c: 0x109f73c: sll   zero, zero, 0
-// 0x0109f740: 0x109f740: blez  v1, 0x109f778 sll   zero, zero, 0
+// 0x0109fd84: 0x109fd84: sll   zero, zero, 0
+// 0x0109fd88: 0x109fd88: blez  v1, 0x109fdc0 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	ble L_109f778
+	ble L_109fdc0
 // --- basic block ---
-L_109f748:
-// 0x0109f748: 0x109f748: lw    v1, 80(v0)
+L_109fd90:
+// 0x0109fd90: 0x109fd90: lw    v1, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2047,20 +2047,20 @@ L_109f748:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f74c: 0x109f74c: bne   s0, zero, 0x109f758 sll   zero, zero, 0
+// 0x0109fd94: 0x109fd94: bne   s0, zero, 0x109fda0 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_109f758
+	brtrue L_109fda0
 // --- basic block ---
-// 0x0109f754: 0x109f754: addu  s0, v0, zero
+// 0x0109fd9c: 0x109fd9c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_109f758:
-// 0x0109f758: 0x109f758: beq   v1, zero, 0x109f778 sll   zero, zero, 0
+L_109fda0:
+// 0x0109fda0: 0x109fda0: beq   v1, zero, 0x109fdc0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109f778
+	brfalse L_109fdc0
 // --- basic block ---
-L_109f760:
-// 0x0109f760: 0x109f760: lw    v1, 80(v1)
+L_109fda8:
+// 0x0109fda8: 0x109fda8: lw    v1, 80(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2069,18 +2069,18 @@ L_109f760:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f764: 0x109f764: sll   zero, zero, 0
-// 0x0109f768: 0x109f768: beq   v1, zero, 0x109f778 sll   zero, zero, 0
+// 0x0109fdac: 0x109fdac: sll   zero, zero, 0
+// 0x0109fdb0: 0x109fdb0: beq   v1, zero, 0x109fdc0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_109f778
+	brfalse L_109fdc0
 // --- basic block ---
-// 0x0109f770: 0x109f770: bne   v1, v0, 0x109f760 sll   zero, zero, 0
+// 0x0109fdb8: 0x109fdb8: bne   v1, v0, 0x109fda8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_109f760
+	bne.un L_109fda8
 // --- basic block ---
-L_109f778:
-// 0x0109f778: 0x109f778: lw    v0, 80(v0)
+L_109fdc0:
+// 0x0109fdc0: 0x109fdc0: lw    v0, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2089,43 +2089,43 @@ L_109f778:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109f77c: 0x109f77c: sll   zero, zero, 0
-// 0x0109f780: 0x109f780: beq   v0, zero, 0x109f790 sll   zero, zero, 0
+// 0x0109fdc4: 0x109fdc4: sll   zero, zero, 0
+// 0x0109fdc8: 0x109fdc8: beq   v0, zero, 0x109fdd8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109f790
+	brfalse L_109fdd8
 // --- basic block ---
-// 0x0109f788: 0x109f788: bne   v0, a0, 0x109f708 sll   zero, zero, 0
+// 0x0109fdd0: 0x109fdd0: bne   v0, a0, 0x109fd50 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_109f708
+	bne.un L_109fd50
 // --- basic block ---
-L_109f790:
-// 0x0109f790: 0x109f790: jal   0x109f628 sll   zero, zero, 0
+L_109fdd8:
+// 0x0109fdd8: 0x109fdd8: jal   0x109fc70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_orphan_pointers_109f628(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_gui_tab_order__fix_orphan_pointers_109fc70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109f798: 0x109f798: j	 0x109f7a4 addu  a0, s0, zero
+// 0x0109fde0: 0x109fde0: j	 0x109fdec addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-	br L_109f7a4
+	br L_109fdec
 // --- basic block ---
-L_109f7a0:
-// 0x0109f7a0: 0x109f7a0: addu  a0, zero, zero
+L_109fde8:
+// 0x0109fde8: 0x109fde8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_109f7a4:
-// 0x0109f7a4: 0x109f7a4: lw    ra, 20(sp)
-// 0x0109f7a8: 0x109f7a8: addu  v0, a0, zero
+L_109fdec:
+// 0x0109fdec: 0x109fdec: lw    ra, 20(sp)
+// 0x0109fdf0: 0x109fdf0: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0109f7ac: 0x109f7ac: lw    s0, 16(sp)
+// 0x0109fdf4: 0x109fdf4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2134,7 +2134,7 @@ L_109f7a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f7b0: 0x109f7b0: jr    ra addiu sp, sp, 24
+// 0x0109fdf8: 0x109fdf8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2146,7 +2146,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_reset_tab_order_recursive_109f7b8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_reset_tab_order_recursive_109fe00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -2187,12 +2187,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f7b8: 0x109f7b8: addiu sp, sp, -32
+// 0x0109fe00: 0x109fe00: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0109f7bc: 0x109f7bc: sw    s1, 24(sp)
+// 0x0109fe04: 0x109fe04: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2201,7 +2201,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0109f7c0: 0x109f7c0: sw    s0, 20(sp)
+// 0x0109fe08: 0x109fe08: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2210,8 +2210,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109f7c4: 0x109f7c4: sw    ra, 28(sp)
-// 0x0109f7c8: 0x109f7c8: sw    zero, 76(a0)
+// 0x0109fe0c: 0x109fe0c: sw    ra, 28(sp)
+// 0x0109fe10: 0x109fe10: sw    zero, 76(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2220,7 +2220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f7cc: 0x109f7cc: sw    zero, 80(a0)
+// 0x0109fe14: 0x109fe14: sw    zero, 80(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2229,7 +2229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f7d0: 0x109f7d0: sw    zero, 84(a0)
+// 0x0109fe18: 0x109fe18: sw    zero, 84(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2238,7 +2238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f7d4: 0x109f7d4: sw    zero, 88(a0)
+// 0x0109fe1c: 0x109fe1c: sw    zero, 88(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2247,7 +2247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f7d8: 0x109f7d8: sw    zero, 92(a0)
+// 0x0109fe20: 0x109fe20: sw    zero, 92(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2256,7 +2256,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f7dc: 0x109f7dc: sw    zero, 96(a0)
+// 0x0109fe24: 0x109fe24: sw    zero, 96(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2265,7 +2265,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f7e0: 0x109f7e0: sw    zero, 60(a0)
+// 0x0109fe28: 0x109fe28: sw    zero, 60(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2274,7 +2274,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109f7e4: 0x109f7e4: lw    s1, 12(a0)
+// 0x0109fe2c: 0x109fe2c: lw    s1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2283,24 +2283,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f7e8: 0x109f7e8: j	 0x109f800 addu  s0, a0, zero
+// 0x0109fe30: 0x109fe30: j	 0x109fe48 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-	br L_109f800
+	br L_109fe48
 // --- basic block ---
-L_109f7f0:
-// 0x0109f7f0: 0x109f7f0: jal   0x109f7b8 sll   zero, zero, 0
+L_109fe38:
+// 0x0109fe38: 0x109fe38: jal   0x109fe00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_reset_tab_order_recursive_109f7b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_reset_tab_order_recursive_109fe00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x0109f7f8: 0x109f7f8: lw    s1, 8(s1)
+// 0x0109fe40: 0x109fe40: lw    s1, 8(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2309,15 +2309,15 @@ L_109f7f0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f7fc: 0x109f7fc: sll   zero, zero, 0
-L_109f800:
-// 0x0109f800: 0x109f800: bne   s1, zero, 0x109f7f0 addu  a0, s1, zero
+// 0x0109fe44: 0x109fe44: sll   zero, zero, 0
+L_109fe48:
+// 0x0109fe48: 0x109fe48: bne   s1, zero, 0x109fe38 addu  a0, s1, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brtrue L_109f7f0
+	brtrue L_109fe38
 // --- basic block ---
-// 0x0109f808: 0x109f808: lw    v0, 4(s0)
+// 0x0109fe50: 0x109fe50: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2326,12 +2326,12 @@ L_109f800:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f80c: 0x109f80c: sll   zero, zero, 0
-// 0x0109f810: 0x109f810: bne   v0, zero, 0x109f830 sll   zero, zero, 0
+// 0x0109fe54: 0x109fe54: sll   zero, zero, 0
+// 0x0109fe58: 0x109fe58: bne   v0, zero, 0x109fe78 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_109f830
+	brtrue L_109fe78
 // --- basic block ---
-// 0x0109f818: 0x109f818: lw    a0, 8(s0)
+// 0x0109fe60: 0x109fe60: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2340,25 +2340,25 @@ L_109f800:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109f81c: 0x109f81c: sll   zero, zero, 0
-// 0x0109f820: 0x109f820: beq   a0, zero, 0x109f830 sll   zero, zero, 0
+// 0x0109fe64: 0x109fe64: sll   zero, zero, 0
+// 0x0109fe68: 0x109fe68: beq   a0, zero, 0x109fe78 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_109f830
+	brfalse L_109fe78
 // --- basic block ---
-// 0x0109f828: 0x109f828: jal   0x109f7b8 sll   zero, zero, 0
+// 0x0109fe70: 0x109fe70: jal   0x109fe00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_reset_tab_order_recursive_109f7b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_reset_tab_order_recursive_109fe00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-L_109f830:
-// 0x0109f830: 0x109f830: lw    ra, 28(sp)
-// 0x0109f834: 0x109f834: lw    s1, 24(sp)
+L_109fe78:
+// 0x0109fe78: 0x109fe78: lw    ra, 28(sp)
+// 0x0109fe7c: 0x109fe7c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2367,7 +2367,7 @@ L_109f830:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f838: 0x109f838: lw    s0, 20(sp)
+// 0x0109fe80: 0x109fe80: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2376,7 +2376,7 @@ L_109f830:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f83c: 0x109f83c: jr    ra addiu sp, sp, 32
+// 0x0109fe84: 0x109fe84: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2388,7 +2388,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 ssd_widget_reset_tab_order_109f844(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_reset_tab_order_109fe8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2423,30 +2423,30 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f844: 0x109f844: addiu sp, sp, -24
+// 0x0109fe8c: 0x109fe8c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109f848: 0x109f848: beq   a0, zero, 0x109f858 sw    ra, 20(sp)
+// 0x0109fe90: 0x109fe90: beq   a0, zero, 0x109fea0 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_109f858
+	brfalse L_109fea0
 // --- basic block ---
-// 0x0109f850: 0x109f850: jal   0x109f7b8 sll   zero, zero, 0
+// 0x0109fe98: 0x109fe98: jal   0x109fe00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_reset_tab_order_recursive_109f7b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_reset_tab_order_recursive_109fe00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_109f858:
-// 0x0109f858: 0x109f858: lw    ra, 20(sp)
-// 0x0109f85c: 0x109f85c: sll   zero, zero, 0
-// 0x0109f860: 0x109f860: jr    ra addiu sp, sp, 24
+L_109fea0:
+// 0x0109fea0: 0x109fea0: lw    ra, 20(sp)
+// 0x0109fea4: 0x109fea4: sll   zero, zero, 0
+// 0x0109fea8: 0x109fea8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2458,7 +2458,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ssd_widget_sort_tab_order_recursive_109f868(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_sort_tab_order_recursive_109feb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s3,int32 s1,int32 s2,int32 s4,int32 s5,int32 s6,int32 ra,int32 v1)
@@ -2514,12 +2514,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109f868: 0x109f868: addiu sp, sp, -56
+// 0x0109feb0: 0x109feb0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0109f86c: 0x109f86c: lw    v0, 52(a1)
+// 0x0109feb4: 0x109feb4: lw    v0, 52(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2528,7 +2528,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f870: 0x109f870: sw    s0, 24(sp)
+// 0x0109feb8: 0x109feb8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2537,10 +2537,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109f874: 0x109f874: addu  s0, a1, zero
+// 0x0109febc: 0x109febc: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0109f878: 0x109f878: sw    s6, 48(sp)
+// 0x0109fec0: 0x109fec0: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2549,7 +2549,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109f87c: 0x109f87c: sw    s5, 44(sp)
+// 0x0109fec4: 0x109fec4: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2558,7 +2558,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109f880: 0x109f880: sw    s4, 40(sp)
+// 0x0109fec8: 0x109fec8: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2567,7 +2567,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109f884: 0x109f884: sw    s2, 32(sp)
+// 0x0109fecc: 0x109fecc: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2576,7 +2576,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109f888: 0x109f888: sw    s1, 28(sp)
+// 0x0109fed0: 0x109fed0: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2585,8 +2585,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109f88c: 0x109f88c: sw    ra, 52(sp)
-// 0x0109f890: 0x109f890: sw    s3, 36(sp)
+// 0x0109fed4: 0x109fed4: sw    ra, 52(sp)
+// 0x0109fed8: 0x109fed8: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2595,13 +2595,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109f894: 0x109f894: addu  s6, a0, zero
+// 0x0109fedc: 0x109fedc: addu  s6, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0109f898: 0x109f898: addu  s1, a2, zero
+// 0x0109fee0: 0x109fee0: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0109f89c: 0x109f89c: sw    a0, 100(s0)
+// 0x0109fee4: 0x109fee4: sw    a0, 100(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2610,7 +2610,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109f8a0: 0x109f8a0: lw    s2, 72(sp)
+// 0x0109fee8: 0x109fee8: lw    s2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2619,7 +2619,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109f8a4: 0x109f8a4: lw    s4, 76(sp)
+// 0x0109feec: 0x109feec: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2628,13 +2628,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109f8a8: 0x109f8a8: beq   v0, zero, 0x109f900 addu  s5, a3, zero
+// 0x0109fef0: 0x109fef0: beq   v0, zero, 0x109ff48 addu  s5, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 12
-	brfalse L_109f900
+	brfalse L_109ff48
 // --- basic block ---
-// 0x0109f8b0: 0x109f8b0: lw    v0, 48(a1)
+// 0x0109fef8: 0x109fef8: lw    v0, 48(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2643,56 +2643,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f8b4: 0x109f8b4: sll   zero, zero, 0
-// 0x0109f8b8: 0x109f8b8: andi  v0, v0, 256
+// 0x0109fefc: 0x109fefc: sll   zero, zero, 0
+// 0x0109ff00: 0x109ff00: andi  v0, v0, 256
 	ldloc 6
 	ldc.i4 256
 	and
 	stloc 6
-// 0x0109f8bc: 0x109f8bc: bne   v0, zero, 0x109f900 sll   zero, zero, 0
+// 0x0109ff04: 0x109ff04: bne   v0, zero, 0x109ff48 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f900
+	brtrue L_109ff48
 // --- basic block ---
-// 0x0109f8c4: 0x109f8c4: lw    v0, 0(s2)
+// 0x0109ff0c: 0x109ff0c: lw    v0, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109f8c8: 0x109f8c8: sll   zero, zero, 0
-// 0x0109f8cc: 0x109f8cc: bne   v0, zero, 0x109f8d8 sll   zero, zero, 0
+// 0x0109ff10: 0x109ff10: sll   zero, zero, 0
+// 0x0109ff14: 0x109ff14: bne   v0, zero, 0x109ff20 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f8d8
+	brtrue L_109ff20
 // --- basic block ---
-// 0x0109f8d4: 0x109f8d4: sw    a1, 0(s2)
+// 0x0109ff1c: 0x109ff1c: sw    a1, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-L_109f8d8:
-// 0x0109f8d8: 0x109f8d8: sw    s0, 0(s4)
+L_109ff20:
+// 0x0109ff20: 0x109ff20: sw    s0, 0(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0109f8dc: 0x109f8dc: lw    v0, 0(s1)
+// 0x0109ff24: 0x109ff24: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109f8e0: 0x109f8e0: sll   zero, zero, 0
-// 0x0109f8e4: 0x109f8e4: beq   v0, zero, 0x109f8fc sll   zero, zero, 0
+// 0x0109ff28: 0x109ff28: sll   zero, zero, 0
+// 0x0109ff2c: 0x109ff2c: beq   v0, zero, 0x109ff44 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109f8fc
+	brfalse L_109ff44
 // --- basic block ---
-// 0x0109f8ec: 0x109f8ec: sw    s0, 80(v0)
+// 0x0109ff34: 0x109ff34: sw    s0, 80(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2701,15 +2701,15 @@ L_109f8d8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109f8f0: 0x109f8f0: lw    v0, 0(s1)
+// 0x0109ff38: 0x109ff38: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0109f8f4: 0x109f8f4: sll   zero, zero, 0
-// 0x0109f8f8: 0x109f8f8: sw    v0, 76(s0)
+// 0x0109ff3c: 0x109ff3c: sll   zero, zero, 0
+// 0x0109ff40: 0x109ff40: sw    v0, 76(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2718,16 +2718,16 @@ L_109f8d8:
 	add
 	ldloc 6
 	stelem.i4
-L_109f8fc:
-// 0x0109f8fc: 0x109f8fc: sw    s0, 0(s1)
+L_109ff44:
+// 0x0109ff44: 0x109ff44: sw    s0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_109f900:
-// 0x0109f900: 0x109f900: lw    v0, 56(s0)
+L_109ff48:
+// 0x0109ff48: 0x109ff48: lw    v0, 56(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2736,20 +2736,20 @@ L_109f900:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f904: 0x109f904: sll   zero, zero, 0
-// 0x0109f908: 0x109f908: beq   v0, zero, 0x109f914 sll   zero, zero, 0
+// 0x0109ff4c: 0x109ff4c: sll   zero, zero, 0
+// 0x0109ff50: 0x109ff50: beq   v0, zero, 0x109ff5c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_109f914
+	brfalse L_109ff5c
 // --- basic block ---
-// 0x0109f910: 0x109f910: sw    s0, 0(s5)
+// 0x0109ff58: 0x109ff58: sw    s0, 0(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_109f914:
-// 0x0109f914: 0x109f914: lw    s3, 12(s0)
+L_109ff5c:
+// 0x0109ff5c: 0x109ff5c: lw    s3, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2758,13 +2758,13 @@ L_109f914:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f918: 0x109f918: j	 0x109f938 addu  a1, s3, zero
+// 0x0109ff60: 0x109ff60: j	 0x109ff80 addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-	br L_109f938
+	br L_109ff80
 // --- basic block ---
-L_109f920:
-// 0x0109f920: 0x109f920: sw    s2, 16(sp)
+L_109ff68:
+// 0x0109ff68: 0x109ff68: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2773,7 +2773,7 @@ L_109f920:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109f924: 0x109f924: jal   0x109f868 sw    s4, 20(sp)
+// 0x0109ff6c: 0x109ff6c: jal   0x109feb0 sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2787,12 +2787,12 @@ L_109f920:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_tab_order_recursive_109f868(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_tab_order_recursive_109feb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x0109f92c: 0x109f92c: lw    s3, 8(s3)
+// 0x0109ff74: 0x109ff74: lw    s3, 8(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2801,24 +2801,24 @@ L_109f920:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f930: 0x109f930: sll   zero, zero, 0
-// 0x0109f934: 0x109f934: addu  a1, s3, zero
+// 0x0109ff78: 0x109ff78: sll   zero, zero, 0
+// 0x0109ff7c: 0x109ff7c: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-L_109f938:
-// 0x0109f938: 0x109f938: addu  a0, s6, zero
+L_109ff80:
+// 0x0109ff80: 0x109ff80: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x0109f93c: 0x109f93c: addu  a2, s1, zero
+// 0x0109ff84: 0x109ff84: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0109f940: 0x109f940: bne   s3, zero, 0x109f920 addu  a3, s5, zero
+// 0x0109ff88: 0x109ff88: bne   s3, zero, 0x109ff68 addu  a3, s5, zero
 	ldloc 8
 	ldloc 12
 	stloc 4
-	brtrue L_109f920
+	brtrue L_109ff68
 // --- basic block ---
-// 0x0109f948: 0x109f948: lw    v0, 4(s0)
+// 0x0109ff90: 0x109ff90: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2827,12 +2827,12 @@ L_109f938:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0109f94c: 0x109f94c: sll   zero, zero, 0
-// 0x0109f950: 0x109f950: bne   v0, zero, 0x109f974 sll   zero, zero, 0
+// 0x0109ff94: 0x109ff94: sll   zero, zero, 0
+// 0x0109ff98: 0x109ff98: bne   v0, zero, 0x109ffbc sll   zero, zero, 0
 	ldloc 6
-	brtrue L_109f974
+	brtrue L_109ffbc
 // --- basic block ---
-// 0x0109f958: 0x109f958: lw    a1, 8(s0)
+// 0x0109ffa0: 0x109ffa0: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2841,12 +2841,12 @@ L_109f938:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109f95c: 0x109f95c: sll   zero, zero, 0
-// 0x0109f960: 0x109f960: beq   a1, zero, 0x109f974 sll   zero, zero, 0
+// 0x0109ffa4: 0x109ffa4: sll   zero, zero, 0
+// 0x0109ffa8: 0x109ffa8: beq   a1, zero, 0x109ffbc sll   zero, zero, 0
 	ldloc.2
-	brfalse L_109f974
+	brfalse L_109ffbc
 // --- basic block ---
-// 0x0109f968: 0x109f968: sw    s2, 16(sp)
+// 0x0109ffb0: 0x109ffb0: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2855,7 +2855,7 @@ L_109f938:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109f96c: 0x109f96c: jal   0x109f868 sw    s4, 20(sp)
+// 0x0109ffb4: 0x109ffb4: jal   0x109feb0 sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2869,14 +2869,14 @@ L_109f938:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_tab_order_recursive_109f868(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_tab_order_recursive_109feb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 15
 	stloc 6
 // --- basic block ---
-L_109f974:
-// 0x0109f974: 0x109f974: lw    ra, 52(sp)
-// 0x0109f978: 0x109f978: lw    s6, 48(sp)
+L_109ffbc:
+// 0x0109ffbc: 0x109ffbc: lw    ra, 52(sp)
+// 0x0109ffc0: 0x109ffc0: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2885,7 +2885,7 @@ L_109f974:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0109f97c: 0x109f97c: lw    s5, 44(sp)
+// 0x0109ffc4: 0x109ffc4: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2894,7 +2894,7 @@ L_109f974:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0109f980: 0x109f980: lw    s4, 40(sp)
+// 0x0109ffc8: 0x109ffc8: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2903,7 +2903,7 @@ L_109f974:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0109f984: 0x109f984: lw    s3, 36(sp)
+// 0x0109ffcc: 0x109ffcc: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2912,7 +2912,7 @@ L_109f974:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109f988: 0x109f988: lw    s2, 32(sp)
+// 0x0109ffd0: 0x109ffd0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2921,7 +2921,7 @@ L_109f974:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0109f98c: 0x109f98c: lw    s1, 28(sp)
+// 0x0109ffd4: 0x109ffd4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2930,7 +2930,7 @@ L_109f974:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0109f990: 0x109f990: lw    s0, 24(sp)
+// 0x0109ffd8: 0x109ffd8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2939,7 +2939,7 @@ L_109f974:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109f994: 0x109f994: jr    ra addiu sp, sp, 56
+// 0x0109ffdc: 0x109ffdc: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2951,7 +2951,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 fix_widget_tab_order_sequence_109fa40(int32)
+.method public static int32 fix_widget_tab_order_sequence_10a0088(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -2971,7 +2971,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109fa40: 0x109fa40: lw    v0, 80(a0)
+// 0x010a0088: 0x10a0088: lw    v0, 80(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2980,11 +2980,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fa44: 0x109fa44: j	 0x109fa54 sll   zero, zero, 0
-	br L_109fa54
+// 0x010a008c: 0x10a008c: j	 0x10a009c sll   zero, zero, 0
+	br L_10a009c
 // --- basic block ---
-L_109fa4c:
-// 0x0109fa4c: 0x109fa4c: lw    v0, 80(v0)
+L_10a0094:
+// 0x010a0094: 0x10a0094: lw    v0, 80(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2993,20 +2993,20 @@ L_109fa4c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fa50: 0x109fa50: sll   zero, zero, 0
-L_109fa54:
-// 0x0109fa54: 0x109fa54: bne   v0, a0, 0x109fa4c sll   zero, zero, 0
+// 0x010a0098: 0x10a0098: sll   zero, zero, 0
+L_10a009c:
+// 0x010a009c: 0x10a009c: bne   v0, a0, 0x10a0094 sll   zero, zero, 0
 	ldloc.1
 	ldloc.0
-	bne.un L_109fa4c
+	bne.un L_10a0094
 // --- basic block ---
-// 0x0109fa5c: 0x109fa5c: jr    ra sll   zero, zero, 0
+// 0x010a00a4: 0x10a00a4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -3044,7 +3044,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109faac: 0x109faac: lw    v0, 52(a0)
+// 0x010a00f4: 0x10a00f4: lw    v0, 52(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3053,12 +3053,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fab0: 0x109fab0: addiu sp, sp, -24
+// 0x010a00f8: 0x10a00f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109fab4: 0x109fab4: sw    s0, 16(sp)
+// 0x010a00fc: 0x10a00fc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3067,17 +3067,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109fab8: 0x109fab8: sw    ra, 20(sp)
-// 0x0109fabc: 0x109fabc: beq   v0, zero, 0x109fae0 addu  s0, a0, zero
+// 0x010a0100: 0x10a0100: sw    ra, 20(sp)
+// 0x010a0104: 0x10a0104: beq   v0, zero, 0x10a0128 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_109fae0
+	brfalse L_10a0128
 // --- basic block ---
-// 0x0109fac4: 0x109fac4: addiu v0, zero, 1
+// 0x010a010c: 0x10a010c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109fac8: 0x109fac8: jal   0x109f1fc sw    v0, 60(a0)
+// 0x010a0110: 0x10a0110: jal   0x109f844 sw    v0, 60(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3091,16 +3091,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_get_input_type_109f1fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_get_input_type_109f844(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0109fad0: 0x109fad0: beq   v0, zero, 0x109fae0 sll   zero, zero, 0
+// 0x010a0118: 0x10a0118: beq   v0, zero, 0x10a0128 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109fae0
+	brfalse L_10a0128
 // --- basic block ---
-// 0x0109fad8: 0x109fad8: jal   0x10516e0 addu  a0, v0, zero
+// 0x010a0120: 0x10a0120: jal   0x10516f0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3108,14 +3108,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_109fae0:
-// 0x0109fae0: 0x109fae0: lw    ra, 20(sp)
-// 0x0109fae4: 0x109fae4: lw    v0, 60(s0)
+L_10a0128:
+// 0x010a0128: 0x10a0128: lw    ra, 20(sp)
+// 0x010a012c: 0x10a012c: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3124,7 +3124,7 @@ L_109fae0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fae8: 0x109fae8: sw    zero, 68(s0)
+// 0x010a0130: 0x10a0130: sw    zero, 68(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3133,7 +3133,7 @@ L_109fae0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109faec: 0x109faec: lw    s0, 16(sp)
+// 0x010a0134: 0x10a0134: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3142,7 +3142,7 @@ L_109fae0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109faf0: 0x109faf0: jr    ra addiu sp, sp, 24
+// 0x010a0138: 0x10a0138: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3154,7 +3154,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_sort_tab_order_109faf8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_sort_tab_order_10a0140(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3189,21 +3189,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109faf8: 0x109faf8: addiu sp, sp, -48
+// 0x010a0140: 0x10a0140: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0109fafc: 0x109fafc: beq   a1, zero, 0x109fb84 sw    ra, 44(sp)
+// 0x010a0144: 0x10a0144: beq   a1, zero, 0x10a01cc sw    ra, 44(sp)
 	ldloc.2
-	brfalse L_109fb84
+	brfalse L_10a01cc
 // --- basic block ---
-// 0x0109fb04: 0x109fb04: addiu v0, sp, 32
+// 0x010a014c: 0x10a014c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0109fb08: 0x109fb08: sw    v0, 16(sp)
+// 0x010a0150: 0x10a0150: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3212,22 +3212,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109fb0c: 0x109fb0c: addiu a2, sp, 24
+// 0x010a0154: 0x10a0154: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0109fb10: 0x109fb10: addiu v0, sp, 36
+// 0x010a0158: 0x10a0158: addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-// 0x0109fb14: 0x109fb14: addiu a3, sp, 28
+// 0x010a015c: 0x10a015c: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0109fb18: 0x109fb18: sw    v0, 20(sp)
+// 0x010a0160: 0x10a0160: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3236,7 +3236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109fb1c: 0x109fb1c: sw    zero, 36(sp)
+// 0x010a0164: 0x10a0164: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3245,7 +3245,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fb20: 0x109fb20: sw    zero, 32(sp)
+// 0x010a0168: 0x10a0168: sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3254,7 +3254,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fb24: 0x109fb24: sw    zero, 28(sp)
+// 0x010a016c: 0x10a016c: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3263,7 +3263,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fb28: 0x109fb28: jal   0x109f868 sw    zero, 24(sp)
+// 0x010a0170: 0x10a0170: jal   0x109feb0 sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3277,12 +3277,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_sort_tab_order_recursive_109f868(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_sort_tab_order_recursive_109feb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109fb30: 0x109fb30: lw    v0, 36(sp)
+// 0x010a0178: 0x10a0178: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3291,14 +3291,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fb34: 0x109fb34: sll   zero, zero, 0
-// 0x0109fb38: 0x109fb38: beq   v0, zero, 0x109fb88 addu  v0, zero, zero
+// 0x010a017c: 0x10a017c: sll   zero, zero, 0
+// 0x010a0180: 0x10a0180: beq   v0, zero, 0x10a01d0 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_109fb88
+	brfalse L_10a01d0
 // --- basic block ---
-// 0x0109fb40: 0x109fb40: lw    v0, 28(sp)
+// 0x010a0188: 0x10a0188: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3307,12 +3307,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fb44: 0x109fb44: sll   zero, zero, 0
-// 0x0109fb48: 0x109fb48: bne   v0, zero, 0x109fb5c sll   zero, zero, 0
+// 0x010a018c: 0x10a018c: sll   zero, zero, 0
+// 0x010a0190: 0x10a0190: bne   v0, zero, 0x10a01a4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109fb5c
+	brtrue L_10a01a4
 // --- basic block ---
-// 0x0109fb50: 0x109fb50: lw    v0, 32(sp)
+// 0x010a0198: 0x10a0198: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3321,8 +3321,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fb54: 0x109fb54: sll   zero, zero, 0
-// 0x0109fb58: 0x109fb58: sw    v0, 28(sp)
+// 0x010a019c: 0x10a019c: sll   zero, zero, 0
+// 0x010a01a0: 0x10a01a0: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3331,8 +3331,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_109fb5c:
-// 0x0109fb5c: 0x109fb5c: lw    a0, 28(sp)
+L_10a01a4:
+// 0x010a01a4: 0x10a01a4: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3341,12 +3341,12 @@ L_109fb5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fb60: 0x109fb60: sll   zero, zero, 0
-// 0x0109fb64: 0x109fb64: bne   a0, zero, 0x109fb70 sll   zero, zero, 0
+// 0x010a01a8: 0x10a01a8: sll   zero, zero, 0
+// 0x010a01ac: 0x10a01ac: bne   a0, zero, 0x10a01b8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_109fb70
+	brtrue L_10a01b8
 // --- basic block ---
-// 0x0109fb6c: 0x109fb6c: lw    a0, 32(sp)
+// 0x010a01b4: 0x10a01b4: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3355,19 +3355,19 @@ L_109fb5c:
 	add
 	ldelem.i4
 	stloc.1
-L_109fb70:
-// 0x0109fb70: 0x109fb70: jal   0x109faac sll   zero, zero, 0
+L_10a01b8:
+// 0x010a01b8: 0x10a01b8: jal   0x10a00f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0109fb78: 0x109fb78: lw    v0, 28(sp)
+// 0x010a01c0: 0x10a01c0: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3376,17 +3376,17 @@ L_109fb70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fb7c: 0x109fb7c: j	 0x109fb88 sll   zero, zero, 0
-	br L_109fb88
+// 0x010a01c4: 0x10a01c4: j	 0x10a01d0 sll   zero, zero, 0
+	br L_10a01d0
 // --- basic block ---
-L_109fb84:
-// 0x0109fb84: 0x109fb84: addu  v0, zero, zero
+L_10a01cc:
+// 0x010a01cc: 0x10a01cc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_109fb88:
-// 0x0109fb88: 0x109fb88: lw    ra, 44(sp)
-// 0x0109fb8c: 0x109fb8c: sll   zero, zero, 0
-// 0x0109fb90: 0x109fb90: jr    ra addiu sp, sp, 48
+L_10a01d0:
+// 0x010a01d0: 0x10a01d0: lw    ra, 44(sp)
+// 0x010a01d4: 0x10a01d4: sll   zero, zero, 0
+// 0x010a01d8: 0x10a01d8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3398,7 +3398,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_widget_move_focus_109fb98(int32,int32,int32,int32,int32)
+.method public static int32 ssd_widget_move_focus_10a01e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -3436,13 +3436,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109fb98: 0x109fb98: addiu sp, sp, -24
+// 0x010a01e0: 0x10a01e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109fb9c: 0x109fb9c: sw    ra, 20(sp)
-// 0x0109fba0: 0x109fba0: sw    s0, 16(sp)
+// 0x010a01e4: 0x10a01e4: sw    ra, 20(sp)
+// 0x010a01e8: 0x10a01e8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3451,55 +3451,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109fba4: 0x109fba4: beq   a0, zero, 0x109fc48 addu  v0, a0, zero
+// 0x010a01ec: 0x10a01ec: beq   a0, zero, 0x10a0290 addu  v0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_109fc48
+	brfalse L_10a0290
 // --- basic block ---
-// 0x0109fbac: 0x109fbac: sltiu v1, a1, 6
+// 0x010a01f4: 0x10a01f4: sltiu v1, a1, 6
 	ldloc.2
 	ldc.i4.6
 	clt.un
 	stloc 7
-// 0x0109fbb0: 0x109fbb0: beq   v1, zero, 0x109fc2c addu  s0, a0, zero
+// 0x010a01f8: 0x10a01f8: beq   v1, zero, 0x10a0274 addu  s0, a0, zero
 	ldloc 7
 	ldloc.1
 	stloc 5
-	brfalse L_109fc2c
+	brfalse L_10a0274
 // --- basic block ---
-// 0x0109fbb8: 0x109fbb8: lui   v1, 0x20000
+// 0x010a0200: 0x10a0200: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0109fbbc: 0x109fbbc: addiu v1, v1, 29648
+// 0x010a0204: 0x10a0204: addiu v1, v1, 30112
 	ldloc 7
-	ldc.i4 29648
+	ldc.i4 30112
 	add
 	stloc 7
-// 0x0109fbc0: 0x109fbc0: sll   a1, a1, 2
+// 0x010a0208: 0x10a0208: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0109fbc4: 0x109fbc4: addu  a1, v1, a1
+// 0x010a020c: 0x10a020c: addu  a1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc.2
-// 0x0109fbc8: 0x109fbc8: lw    v1, 0(a1)
+// 0x010a0210: 0x10a0210: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0109fbcc: 0x109fbcc: sll   zero, zero, 0
-// 0x0109fbd0: 0x109fbd0: jr    v1 sll   zero, zero, 0
+// 0x010a0214: 0x10a0214: sll   zero, zero, 0
+// 0x010a0218: 0x10a0218: jr    v1 sll   zero, zero, 0
 	ldloc 7
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_109fbd8:
-// 0x0109fbd8: 0x109fbd8: lw    s0, 92(a0)
+L_10a0220:
+// 0x010a0220: 0x10a0220: lw    s0, 92(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3508,11 +3508,11 @@ L_109fbd8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fbdc: 0x109fbdc: j	 0x109fbf8 sll   zero, zero, 0
-	br L_109fbf8
+// 0x010a0224: 0x10a0224: j	 0x10a0240 sll   zero, zero, 0
+	br L_10a0240
 // --- basic block ---
-L_109fbe4:
-// 0x0109fbe4: 0x109fbe4: lw    s0, 96(a0)
+L_10a022c:
+// 0x010a022c: 0x10a022c: lw    s0, 96(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3521,11 +3521,11 @@ L_109fbe4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fbe8: 0x109fbe8: j	 0x109fc14 sll   zero, zero, 0
-	br L_109fc14
+// 0x010a0230: 0x10a0230: j	 0x10a025c sll   zero, zero, 0
+	br L_10a025c
 // --- basic block ---
-L_109fbf0:
-// 0x0109fbf0: 0x109fbf0: lw    s0, 84(a0)
+L_10a0238:
+// 0x010a0238: 0x10a0238: lw    s0, 84(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3534,14 +3534,14 @@ L_109fbf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fbf4: 0x109fbf4: sll   zero, zero, 0
-L_109fbf8:
-// 0x0109fbf8: 0x109fbf8: bne   s0, zero, 0x109fc2c sll   zero, zero, 0
+// 0x010a023c: 0x10a023c: sll   zero, zero, 0
+L_10a0240:
+// 0x010a0240: 0x10a0240: bne   s0, zero, 0x10a0274 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109fc2c
+	brtrue L_10a0274
 // --- basic block ---
-L_109fc00:
-// 0x0109fc00: 0x109fc00: lw    s0, 76(v0)
+L_10a0248:
+// 0x010a0248: 0x10a0248: lw    s0, 76(v0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3550,11 +3550,11 @@ L_109fc00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fc04: 0x109fc04: j	 0x109fc24 sll   zero, zero, 0
-	br L_109fc24
+// 0x010a024c: 0x10a024c: j	 0x10a026c sll   zero, zero, 0
+	br L_10a026c
 // --- basic block ---
-L_109fc0c:
-// 0x0109fc0c: 0x109fc0c: lw    s0, 88(a0)
+L_10a0254:
+// 0x010a0254: 0x10a0254: lw    s0, 88(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3563,14 +3563,14 @@ L_109fc0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fc10: 0x109fc10: sll   zero, zero, 0
-L_109fc14:
-// 0x0109fc14: 0x109fc14: bne   s0, zero, 0x109fc2c sll   zero, zero, 0
+// 0x010a0258: 0x10a0258: sll   zero, zero, 0
+L_10a025c:
+// 0x010a025c: 0x10a025c: bne   s0, zero, 0x10a0274 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_109fc2c
+	brtrue L_10a0274
 // --- basic block ---
-L_109fc1c:
-// 0x0109fc1c: 0x109fc1c: lw    s0, 80(v0)
+L_10a0264:
+// 0x010a0264: 0x10a0264: lw    s0, 80(v0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3579,19 +3579,19 @@ L_109fc1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fc20: 0x109fc20: sll   zero, zero, 0
-L_109fc24:
-// 0x0109fc24: 0x109fc24: beq   s0, zero, 0x109fc48 sll   zero, zero, 0
+// 0x010a0268: 0x10a0268: sll   zero, zero, 0
+L_10a026c:
+// 0x010a026c: 0x10a026c: beq   s0, zero, 0x10a0290 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_109fc48
+	brfalse L_10a0290
 // --- basic block ---
-L_109fc2c:
-// 0x0109fc2c: 0x109fc2c: beq   v0, s0, 0x109fc48 sll   zero, zero, 0
+L_10a0274:
+// 0x010a0274: 0x10a0274: beq   v0, s0, 0x10a0290 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	beq  L_109fc48
+	beq  L_10a0290
 // --- basic block ---
-// 0x0109fc34: 0x109fc34: sw    zero, 68(v0)
+// 0x010a027c: 0x10a027c: sw    zero, 68(v0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3600,7 +3600,7 @@ L_109fc2c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fc38: 0x109fc38: sw    zero, 60(v0)
+// 0x010a0280: 0x10a0280: sw    zero, 60(v0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3609,7 +3609,7 @@ L_109fc2c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fc3c: 0x109fc3c: jal   0x109faac addu  a0, s0, zero
+// 0x010a0284: 0x10a0284: jal   0x10a00f4 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3617,17 +3617,17 @@ L_109fc2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::ssd_widget_set_focus_109faac(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::ssd_widget_set_focus_10a00f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x0109fc44: 0x109fc44: addu  v0, s0, zero
+// 0x010a028c: 0x10a028c: addu  v0, s0, zero
 	ldloc 5
 	stloc 8
-L_109fc48:
-// 0x0109fc48: 0x109fc48: lw    ra, 20(sp)
-// 0x0109fc4c: 0x109fc4c: lw    s0, 16(sp)
+L_10a0290:
+// 0x010a0290: 0x10a0290: lw    ra, 20(sp)
+// 0x010a0294: 0x10a0294: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3636,7 +3636,7 @@ L_109fc48:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fc50: 0x109fc50: jr    ra addiu sp, sp, 24
+// 0x010a0298: 0x10a0298: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3646,23 +3646,23 @@ L_109fc48:
 __CIBYL_local_jumptab:
 	stloc 7
 	ldloc 7
-	ldc.i4 17431512
-	beq  L_109fbd8
+	ldc.i4 17433120
+	beq  L_10a0220
 	ldloc 7
-	ldc.i4 17431524
-	beq  L_109fbe4
+	ldc.i4 17433132
+	beq  L_10a022c
 	ldloc 7
-	ldc.i4 17431536
-	beq  L_109fbf0
+	ldc.i4 17433144
+	beq  L_10a0238
 	ldloc 7
-	ldc.i4 17431552
-	beq  L_109fc00
+	ldc.i4 17433160
+	beq  L_10a0248
 	ldloc 7
-	ldc.i4 17431564
-	beq  L_109fc0c
+	ldc.i4 17433172
+	beq  L_10a0254
 	ldloc 7
-	ldc.i4 17431580
-	beq  L_109fc1c
+	ldc.i4 17433188
+	beq  L_10a0264
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -3670,7 +3670,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 on_dialog_closed_109fc68(int32,int32,int32,int32,int32)
+.method public static int32 on_dialog_closed_10a02b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3705,56 +3705,56 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109fc68: 0x109fc68: addiu sp, sp, -24
+// 0x010a02b0: 0x10a02b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0109fc6c: 0x109fc6c: addiu v0, zero, 1
+// 0x010a02b4: 0x10a02b4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0109fc70: 0x109fc70: beq   a0, v0, 0x109fc98 sw    ra, 20(sp)
+// 0x010a02b8: 0x10a02b8: beq   a0, v0, 0x10a02e0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_109fc98
+	beq  L_10a02e0
 // --- basic block ---
-// 0x0109fc78: 0x109fc78: lui   v1, 0x80000
+// 0x010a02c0: 0x10a02c0: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109fc7c: 0x109fc7c: lui   v0, 0x80000
+// 0x010a02c4: 0x10a02c4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109fc80: 0x109fc80: lw    a1, 10008(v1)
+// 0x010a02c8: 0x10a02c8: lw    a1, 10472(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109fc84: 0x109fc84: lui   v1, 0x80000
+// 0x010a02cc: 0x10a02cc: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109fc88: 0x109fc88: lw    v0, 10012(v0)
+// 0x010a02d0: 0x10a02d0: lw    v0, 10476(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fc8c: 0x109fc8c: lw    a2, 10016(v1)
+// 0x010a02d4: 0x10a02d4: lw    a2, 10480(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldelem.i4
 	stloc.3
-// 0x0109fc90: 0x109fc90: jalr  v0 addiu a0, zero, 2
+// 0x010a02d8: 0x10a02d8: jalr  v0 addiu a0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc.1
@@ -3768,45 +3768,45 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_109fc98:
-// 0x0109fc98: 0x109fc98: lui   v0, 0x80000
+L_10a02e0:
+// 0x010a02e0: 0x10a02e0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109fc9c: 0x109fc9c: sw    zero, 10012(v0)
+// 0x010a02e4: 0x10a02e4: sw    zero, 10476(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fca0: 0x109fca0: lw    ra, 20(sp)
-// 0x0109fca4: 0x109fca4: lui   v0, 0x80000
+// 0x010a02e8: 0x10a02e8: lw    ra, 20(sp)
+// 0x010a02ec: 0x10a02ec: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109fca8: 0x109fca8: sw    zero, 10008(v0)
+// 0x010a02f0: 0x10a02f0: sw    zero, 10472(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fcac: 0x109fcac: lui   v0, 0x80000
+// 0x010a02f4: 0x10a02f4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109fcb0: 0x109fcb0: sw    zero, 10016(v0)
+// 0x010a02f8: 0x10a02f8: sw    zero, 10480(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0109fcb4: 0x109fcb4: jr    ra addiu sp, sp, 24
+// 0x010a02fc: 0x10a02fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3818,7 +3818,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_show_keyboard_dialog_ext_109fcc4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_show_keyboard_dialog_ext_10a030c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s5,int32 s0,int32 s3,int32 s4,int32 s1,int32 s2,int32 s7,int32 s6,int32 s8,int32 t0,int32 t1,int32 ra)
@@ -3886,12 +3886,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0109fcc4: 0x109fcc4: addiu sp, sp, -104
+// 0x010a030c: 0x10a030c: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x0109fcc8: 0x109fcc8: sw    s6, 88(sp)
+// 0x010a0310: 0x10a0310: sw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3900,7 +3900,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0109fccc: 0x109fccc: sw    s3, 76(sp)
+// 0x010a0314: 0x10a0314: sw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3909,7 +3909,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109fcd0: 0x109fcd0: sw    s2, 72(sp)
+// 0x010a0318: 0x10a0318: sw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3918,7 +3918,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0109fcd4: 0x109fcd4: sw    s1, 68(sp)
+// 0x010a031c: 0x10a031c: sw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3927,11 +3927,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0109fcd8: 0x109fcd8: addu  s3, a1, zero
+// 0x010a0320: 0x10a0320: addu  s3, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0109fcdc: 0x109fcdc: sw    ra, 100(sp)
-// 0x0109fce0: 0x109fce0: sw    s8, 96(sp)
+// 0x010a0324: 0x10a0324: sw    ra, 100(sp)
+// 0x010a0328: 0x10a0328: sw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3940,7 +3940,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0109fce4: 0x109fce4: sw    s7, 92(sp)
+// 0x010a032c: 0x10a032c: sw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3949,7 +3949,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0109fce8: 0x109fce8: sw    s5, 84(sp)
+// 0x010a0330: 0x10a0330: sw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3958,7 +3958,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0109fcec: 0x109fcec: sw    s4, 80(sp)
+// 0x010a0334: 0x10a0334: sw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3967,7 +3967,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0109fcf0: 0x109fcf0: sw    s0, 64(sp)
+// 0x010a0338: 0x10a0338: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3976,7 +3976,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0109fcf4: 0x109fcf4: sw    a0, 104(sp)
+// 0x010a033c: 0x10a033c: sw    a0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3985,10 +3985,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0109fcf8: 0x109fcf8: addu  s6, a2, zero
+// 0x010a0340: 0x10a0340: addu  s6, a2, zero
 	ldloc.3
 	stloc 15
-// 0x0109fcfc: 0x109fcfc: jal   0x10939c0 sw    a3, 116(sp)
+// 0x010a0344: 0x10a0344: jal   0x1093fe4 sw    a3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4002,12 +4002,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_get_txtbox_height_10939c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_get_txtbox_height_1093fe4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fd04: 0x109fd04: lw    v1, 120(sp)
+// 0x010a034c: 0x10a034c: lw    v1, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4016,22 +4016,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109fd08: 0x109fd08: addu  s2, v0, zero
+// 0x010a0350: 0x10a0350: addu  s2, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0109fd0c: 0x109fd0c: lui   v0, 0x80000
+// 0x010a0354: 0x10a0354: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109fd10: 0x109fd10: sw    v1, 10012(v0)
+// 0x010a0358: 0x10a0358: sw    v1, 10476(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109fd14: 0x109fd14: lw    v1, 124(sp)
+// 0x010a035c: 0x10a035c: lw    v1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4040,61 +4040,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0109fd18: 0x109fd18: lui   v0, 0x80000
+// 0x010a0360: 0x10a0360: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109fd1c: 0x109fd1c: sw    v1, 10016(v0)
+// 0x010a0364: 0x10a0364: sw    v1, 10480(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109fd20: 0x109fd20: lui   v0, 0x80000
+// 0x010a0368: 0x10a0368: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0109fd24: 0x109fd24: sw    s3, 10008(v0)
+// 0x010a036c: 0x10a036c: sw    s3, 10472(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldloc 10
 	stelem.i4
-// 0x0109fd28: 0x109fd28: beq   s6, zero, 0x109fd34 addiu s1, zero, -2
+// 0x010a0370: 0x10a0370: beq   s6, zero, 0x10a037c addiu s1, zero, -2
 	ldloc 15
 	ldc.i4.s -2
 	stloc 12
-	brfalse L_109fd34
+	brfalse L_10a037c
 // --- basic block ---
-// 0x0109fd30: 0x109fd30: addiu s1, zero, 190
+// 0x010a0378: 0x10a0378: addiu s1, zero, 190
 	ldc.i4 190
 	stloc 12
-L_109fd34:
-// 0x0109fd34: 0x109fd34: jal   0x1052d34 sll   zero, zero, 0
-	call int32 Cibyl61::roadmap_native_keyboard_enabled_1052d34()
+L_10a037c:
+// 0x010a037c: 0x10a037c: jal   0x1052d44 sll   zero, zero, 0
+	call int32 Cibyl61::roadmap_native_keyboard_enabled_1052d44()
 	stloc 5
 // --- basic block ---
-// 0x0109fd3c: 0x109fd3c: jal   0x101fa28 sltiu s7, v0, 1
+// 0x010a0384: 0x10a0384: jal   0x101fa38 sltiu s7, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 14
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0109fd44: 0x109fd44: addiu v1, zero, 100
+// 0x010a038c: 0x10a038c: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x0109fd48: 0x109fd48: addiu s7, s7, -2
+// 0x010a0390: 0x10a0390: addiu s7, s7, -2
 	ldloc 14
 	ldc.i4.s -2
 	add
 	stloc 14
-// 0x0109fd4c: 0x109fd4c: beq   v0, zero, 0x109fd70 sw    v1, 40(sp)
+// 0x010a0394: 0x10a0394: beq   v0, zero, 0x10a03b8 sw    v1, 40(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4104,9 +4104,9 @@ L_109fd34:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_109fd70
+	brfalse L_10a03b8
 // --- basic block ---
-// 0x0109fd54: 0x109fd54: jal   0x1020388 addiu a0, zero, 100
+// 0x010a039c: 0x10a039c: jal   0x1020398 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -4114,12 +4114,12 @@ L_109fd34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_adjust_width_1020388(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_adjust_width_1020398(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fd5c: 0x109fd5c: blez  s1, 0x109fd70 sw    v0, 40(sp)
+// 0x010a03a4: 0x10a03a4: blez  s1, 0x10a03b8 sw    v0, 40(sp)
 	ldloc 12
 	ldloc 6
 	ldloc.0
@@ -4130,9 +4130,9 @@ L_109fd34:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	ble L_109fd70
+	ble L_10a03b8
 // --- basic block ---
-// 0x0109fd64: 0x109fd64: jal   0x1020388 addu  a0, s1, zero
+// 0x010a03ac: 0x10a03ac: jal   0x1020398 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -4140,16 +4140,16 @@ L_109fd34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_adjust_width_1020388(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_adjust_width_1020398(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fd6c: 0x109fd6c: addu  s1, v0, zero
+// 0x010a03b4: 0x10a03b4: addu  s1, v0, zero
 	ldloc 5
 	stloc 12
-L_109fd70:
-// 0x0109fd70: 0x109fd70: lw    v0, 128(sp)
+L_10a03b8:
+// 0x010a03b8: 0x10a03b8: lw    v0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4158,24 +4158,24 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fd74: 0x109fd74: lui   s0, 0x0
+// 0x010a03bc: 0x10a03bc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0109fd78: 0x109fd78: srl   a0, v0, 3
+// 0x010a03c0: 0x10a03c0: srl   a0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shr.un
 	stloc.1
-// 0x0109fd7c: 0x109fd7c: jal   0x1038b20 andi  a0, a0, 1
+// 0x010a03c4: 0x10a03c4: jal   0x1038b30 andi  a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	and
 	stloc.1
 	ldloc.1
-	call int32 Cibyl41::roadmap_keyboard_set_typing_lock_enable_1038b20(int32)
+	call int32 Cibyl41::roadmap_keyboard_set_typing_lock_enable_1038b30(int32)
 	stloc 5
 // --- basic block ---
-// 0x0109fd84: 0x109fd84: lw    a0, 17672(s0)
+// 0x010a03cc: 0x10a03cc: lw    a0, 17672(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4184,27 +4184,27 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fd88: 0x109fd88: jal   0x10941a4 sll   zero, zero, 0
+// 0x010a03d0: 0x10a03d0: jal   0x10947c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_exists_10941a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_exists_10947c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fd90: 0x109fd90: bne   v0, zero, 0x10a0060 lui   s5, 0x80000
+// 0x010a03d8: 0x10a03d8: bne   v0, zero, 0x10a06a8 lui   s5, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brtrue L_10a0060
+	brtrue L_10a06a8
 // --- basic block ---
-// 0x0109fd98: 0x109fd98: lui   t0, 0x100000
+// 0x010a03e0: 0x10a03e0: lui   t0, 0x100000
 	ldc.i4 1048576
 	stloc 17
-// 0x0109fd9c: 0x109fd9c: lw    a0, 17672(s0)
+// 0x010a03e4: 0x10a03e4: lw    a0, 17672(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4213,7 +4213,7 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fda0: 0x109fda0: lw    a1, 104(sp)
+// 0x010a03e8: 0x10a03e8: lw    a1, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4222,20 +4222,20 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0109fda4: 0x109fda4: lui   a2, 0x10a0000
+// 0x010a03ec: 0x10a03ec: lui   a2, 0x10a0000
 	ldc.i4 17432576
 	stloc.3
-// 0x0109fda8: 0x109fda8: ori   a3, t0, 12288
+// 0x010a03f0: 0x10a03f0: ori   a3, t0, 12288
 	ldloc 17
 	ldc.i4 12288
 	or
 	stloc 4
-// 0x0109fdac: 0x109fdac: addiu a2, a2, -920
+// 0x010a03f4: 0x10a03f4: addiu a2, a2, 688
 	ldloc.3
-	ldc.i4 -920
+	ldc.i4 688
 	add
 	stloc.3
-// 0x0109fdb0: 0x109fdb0: jal   0x1095a08 sw    t0, 52(sp)
+// 0x010a03f8: 0x10a03f8: jal   0x1096050 sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4249,15 +4249,15 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fdb8: 0x109fdb8: lui   v1, 0x0
+// 0x010a0400: 0x10a0400: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0109fdbc: 0x109fdbc: lw    a0, 17676(v1)
+// 0x010a0404: 0x10a0404: lw    a0, 17676(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4266,31 +4266,31 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fdc0: 0x109fdc0: lui   v1, 0x80000
+// 0x010a0408: 0x10a0408: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0109fdc4: 0x109fdc4: sw    v0, 10020(v1)
+// 0x010a040c: 0x10a040c: sw    v0, 10484(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109fdc8: 0x109fdc8: addiu a3, zero, -1
+// 0x010a0410: 0x10a0410: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0109fdcc: 0x109fdcc: addu  a1, zero, zero
+// 0x010a0414: 0x10a0414: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109fdd0: 0x109fdd0: addiu a2, zero, -2
+// 0x010a0418: 0x10a0418: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0109fdd4: 0x109fdd4: addiu v0, zero, 9
+// 0x010a041c: 0x10a041c: addiu v0, zero, 9
 	ldc.i4.s 9
 	stloc 5
-// 0x0109fdd8: 0x109fdd8: sw    v1, 56(sp)
+// 0x010a0420: 0x10a0420: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4299,7 +4299,7 @@ L_109fd70:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0109fddc: 0x109fddc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a0424: 0x10a0424: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4313,35 +4313,35 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fde4: 0x109fde4: addu  s0, v0, zero
+// 0x010a042c: 0x10a042c: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0109fde8: 0x109fde8: addu  a0, v0, zero
+// 0x010a0430: 0x10a0430: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109fdec: 0x109fdec: addu  a1, zero, zero
+// 0x010a0434: 0x10a0434: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109fdf0: 0x109fdf0: jal   0x1098fe0 addu  a2, zero, zero
+// 0x010a0438: 0x10a0438: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109fdf8: 0x109fdf8: addu  a0, s0, zero
+// 0x010a0440: 0x10a0440: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0109fdfc: 0x109fdfc: addu  a1, zero, zero
+// 0x010a0444: 0x10a0444: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109fe00: 0x109fe00: jal   0x1098f84 addiu a2, zero, -1
+// 0x010a0448: 0x10a0448: jal   0x10995cc addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -4349,18 +4349,18 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fe08: 0x109fe08: addu  a0, s0, zero
+// 0x010a0450: 0x10a0450: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0109fe0c: 0x109fe0c: addiu a1, zero, 5
+// 0x010a0454: 0x10a0454: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0109fe10: 0x109fe10: jal   0x10942e8 addu  a2, zero, zero
+// 0x010a0458: 0x10a0458: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4368,15 +4368,15 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fe18: 0x109fe18: lui   v0, 0x0
+// 0x010a0460: 0x10a0460: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109fe1c: 0x109fe1c: lw    a0, 17684(v0)
+// 0x010a0464: 0x10a0464: lw    a0, 17684(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4385,19 +4385,19 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fe20: 0x109fe20: addu  a3, s2, zero
+// 0x010a0468: 0x10a0468: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0109fe24: 0x109fe24: addu  a1, zero, zero
+// 0x010a046c: 0x10a046c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109fe28: 0x109fe28: addu  a2, s1, zero
+// 0x010a0470: 0x10a0470: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x0109fe2c: 0x109fe2c: lui   v0, 0x20100000
+// 0x010a0474: 0x10a0474: lui   v0, 0x20100000
 	ldc.i4 537919488
 	stloc 5
-// 0x0109fe30: 0x109fe30: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a0478: 0x10a0478: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4411,35 +4411,35 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fe38: 0x109fe38: addu  a0, v0, zero
+// 0x010a0480: 0x10a0480: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109fe3c: 0x109fe3c: addu  a1, zero, zero
+// 0x010a0484: 0x10a0484: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109fe40: 0x109fe40: addu  a2, zero, zero
+// 0x010a0488: 0x10a0488: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109fe44: 0x109fe44: jal   0x1098fe0 addu  s4, v0, zero
+// 0x010a048c: 0x10a048c: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109fe4c: 0x109fe4c: lui   v0, 0x0
+// 0x010a0494: 0x10a0494: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109fe50: 0x109fe50: lui   s8, 0x10000
+// 0x010a0498: 0x10a0498: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x0109fe54: 0x109fe54: lw    a0, 17680(v0)
+// 0x010a049c: 0x10a049c: lw    a0, 17680(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4448,20 +4448,20 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fe58: 0x109fe58: lui   a3, 0x10000
+// 0x010a04a0: 0x10a04a0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0109fe5c: 0x109fe5c: ori   a3, a3, 16
+// 0x010a04a4: 0x10a04a4: ori   a3, a3, 16
 	ldloc 4
 	ldc.i4.s 16
 	or
 	stloc 4
-// 0x0109fe60: 0x109fe60: addiu a2, zero, 15
+// 0x010a04a8: 0x10a04a8: addiu a2, zero, 15
 	ldc.i4.s 15
 	stloc.3
-// 0x0109fe64: 0x109fe64: jal   0x1098d10 addiu a1, s8, 18500
+// 0x010a04ac: 0x10a04ac: jal   0x1099358 addiu a1, s8, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -4469,50 +4469,50 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fe6c: 0x109fe6c: addu  s5, v0, zero
+// 0x010a04b4: 0x10a04b4: addu  s5, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109fe70: 0x109fe70: addu  a0, v0, zero
+// 0x010a04b8: 0x10a04b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109fe74: 0x109fe74: jal   0x1097b00 addiu a1, zero, 31
+// 0x010a04bc: 0x10a04bc: jal   0x1098148 addiu a1, zero, 31
 	ldc.i4.s 31
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl113::ssd_text_set_input_type_1097b00(int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_input_type_1098148(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fe7c: 0x109fe7c: addu  a0, s5, zero
+// 0x010a04c4: 0x10a04c4: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0109fe80: 0x109fe80: jal   0x1097c48 addu  a1, zero, zero
+// 0x010a04c8: 0x10a04c8: jal   0x1098290 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl113::ssd_text_set_readonly_1097c48(int32,int32)
+	call int32 Cibyl113::ssd_text_set_readonly_1098290(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fe88: 0x109fe88: lui   v0, 0x10a0000
+// 0x010a04d0: 0x10a04d0: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x0109fe8c: 0x109fe8c: addiu v0, v0, 1024
+// 0x010a04d4: 0x10a04d4: addiu v0, v0, 2632
 	ldloc 5
-	ldc.i4 1024
+	ldc.i4 2632
 	add
 	stloc 5
-// 0x0109fe90: 0x109fe90: sw    v0, 216(s4)
+// 0x010a04d8: 0x10a04d8: sw    v0, 216(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4521,23 +4521,23 @@ L_109fd70:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0109fe94: 0x109fe94: addu  a1, s5, zero
+// 0x010a04dc: 0x10a04dc: addu  a1, s5, zero
 	ldloc 8
 	stloc.2
-// 0x0109fe98: 0x109fe98: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a04e0: 0x10a04e0: jal   0x109950c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fea0: 0x109fea0: lui   v0, 0x0
+// 0x010a04e8: 0x10a04e8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109fea4: 0x109fea4: lw    a0, 17696(v0)
+// 0x010a04ec: 0x10a04ec: lw    a0, 17696(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4546,19 +4546,19 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fea8: 0x109fea8: addiu t1, zero, 128
+// 0x010a04f0: 0x10a04f0: addiu t1, zero, 128
 	ldc.i4 128
 	stloc 18
-// 0x0109feac: 0x109feac: addu  a1, zero, zero
+// 0x010a04f4: 0x10a04f4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109feb0: 0x109feb0: addiu a2, zero, -1
+// 0x010a04f8: 0x10a04f8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0109feb4: 0x109feb4: addiu a3, zero, -1
+// 0x010a04fc: 0x10a04fc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0109feb8: 0x109feb8: sw    t1, 16(sp)
+// 0x010a0500: 0x10a0500: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4567,7 +4567,7 @@ L_109fd70:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0109febc: 0x109febc: jal   0x1093a24 sw    t1, 48(sp)
+// 0x010a0504: 0x10a0504: jal   0x1094048 sw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4581,18 +4581,18 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fec4: 0x109fec4: addu  s5, v0, zero
+// 0x010a050c: 0x10a050c: addu  s5, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109fec8: 0x109fec8: lui   v0, 0x0
+// 0x010a0510: 0x10a0510: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109fecc: 0x109fecc: lw    a0, 17700(v0)
+// 0x010a0514: 0x10a0514: lw    a0, 17700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4601,15 +4601,15 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109fed0: 0x109fed0: addiu a3, zero, 4112
+// 0x010a0518: 0x10a0518: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x0109fed4: 0x109fed4: addiu a1, s8, 18500
+// 0x010a051c: 0x10a051c: addiu a1, s8, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0109fed8: 0x109fed8: jal   0x1098d10 addiu a2, zero, 16
+// 0x010a0520: 0x10a0520: jal   0x1099358 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.0
@@ -4617,21 +4617,21 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fee0: 0x109fee0: addu  a0, s5, zero
+// 0x010a0528: 0x10a0528: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0109fee4: 0x109fee4: addu  a2, zero, zero
+// 0x010a052c: 0x10a052c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109fee8: 0x109fee8: addu  a1, zero, zero
+// 0x010a0530: 0x10a0530: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109feec: 0x109feec: jal   0x1098fe0 sw    v0, 44(sp)
+// 0x010a0534: 0x10a0534: jal   0x1099628 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4643,9 +4643,9 @@ L_109fd70:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109fef4: 0x109fef4: lw    v0, 44(sp)
+// 0x010a053c: 0x10a053c: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4654,26 +4654,26 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0109fef8: 0x109fef8: addu  a0, s5, zero
+// 0x010a0540: 0x10a0540: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0109fefc: 0x109fefc: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a0544: 0x10a0544: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff04: 0x109ff04: addiu a2, zero, 16
+// 0x010a054c: 0x10a054c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0109ff08: 0x109ff08: addu  a0, s5, zero
+// 0x010a0550: 0x10a0550: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0109ff0c: 0x109ff0c: jal   0x109434c addiu a1, zero, 10
+// 0x010a0554: 0x10a0554: jal   0x1094970 addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
 	ldloc.0
@@ -4681,41 +4681,41 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff14: 0x109ff14: addu  a1, s5, zero
+// 0x010a055c: 0x10a055c: addu  a1, s5, zero
 	ldloc 8
 	stloc.2
-// 0x0109ff18: 0x109ff18: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a0560: 0x10a0560: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff20: 0x109ff20: addu  a1, s4, zero
+// 0x010a0568: 0x10a0568: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x0109ff24: 0x109ff24: addu  a0, s0, zero
+// 0x010a056c: 0x10a056c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0109ff28: 0x109ff28: jal   0x1098ec4 lui   s4, 0x0
+// 0x010a0570: 0x10a0570: jal   0x109950c lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff30: 0x109ff30: lw    t1, 48(sp)
+// 0x010a0578: 0x10a0578: lw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4724,7 +4724,7 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0109ff34: 0x109ff34: lw    a0, 17704(s4)
+// 0x010a057c: 0x10a057c: lw    a0, 17704(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4733,16 +4733,16 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ff38: 0x109ff38: addiu a3, zero, 1
+// 0x010a0580: 0x10a0580: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0109ff3c: 0x109ff3c: addu  a1, zero, zero
+// 0x010a0584: 0x10a0584: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109ff40: 0x109ff40: addu  a2, s1, zero
+// 0x010a0588: 0x10a0588: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x0109ff44: 0x109ff44: jal   0x1093a24 sw    t1, 16(sp)
+// 0x010a058c: 0x10a058c: jal   0x1094048 sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4756,35 +4756,35 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff4c: 0x109ff4c: addu  s5, v0, zero
+// 0x010a0594: 0x10a0594: addu  s5, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0109ff50: 0x109ff50: addu  a0, v0, zero
+// 0x010a0598: 0x10a0598: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109ff54: 0x109ff54: addu  a1, zero, zero
+// 0x010a059c: 0x10a059c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109ff58: 0x109ff58: jal   0x1098fe0 addu  a2, zero, zero
+// 0x010a05a0: 0x10a05a0: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109ff60: 0x109ff60: addu  a0, s5, zero
+// 0x010a05a8: 0x10a05a8: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0109ff64: 0x109ff64: addiu a1, zero, 10
+// 0x010a05ac: 0x10a05ac: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0109ff68: 0x109ff68: jal   0x109434c addiu a2, zero, 10
+// 0x010a05b0: 0x10a05b0: jal   0x1094970 addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
 	ldloc.0
@@ -4792,15 +4792,15 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff70: 0x109ff70: lui   v0, 0x0
+// 0x010a05b8: 0x10a05b8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109ff74: 0x109ff74: lw    a0, 17708(v0)
+// 0x010a05bc: 0x10a05bc: lw    a0, 17708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4809,15 +4809,15 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ff78: 0x109ff78: addiu a3, zero, 4112
+// 0x010a05c0: 0x10a05c0: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x0109ff7c: 0x109ff7c: addiu a2, zero, -1
+// 0x010a05c4: 0x10a05c4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0109ff80: 0x109ff80: jal   0x1098d10 addiu a1, s8, 18500
+// 0x010a05c8: 0x10a05c8: jal   0x1099358 addiu a1, s8, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -4825,44 +4825,44 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff88: 0x109ff88: addu  a1, v0, zero
+// 0x010a05d0: 0x10a05d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0109ff8c: 0x109ff8c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a05d4: 0x10a05d4: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ff94: 0x109ff94: addu  a1, s5, zero
+// 0x010a05dc: 0x10a05dc: addu  a1, s5, zero
 	ldloc 8
 	stloc.2
-// 0x0109ff98: 0x109ff98: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a05e0: 0x10a05e0: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ffa0: 0x109ffa0: addu  a0, s0, zero
+// 0x010a05e8: 0x10a05e8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0109ffa4: 0x109ffa4: addiu a1, zero, 10
+// 0x010a05ec: 0x10a05ec: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0109ffa8: 0x109ffa8: jal   0x109434c addiu a2, zero, 8
+// 0x010a05f0: 0x10a05f0: jal   0x1094970 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -4870,12 +4870,12 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ffb0: 0x109ffb0: lw    a0, 17704(s4)
+// 0x010a05f8: 0x10a05f8: lw    a0, 17704(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4884,19 +4884,19 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0109ffb4: 0x109ffb4: addiu a3, zero, 35
+// 0x010a05fc: 0x10a05fc: addiu a3, zero, 35
 	ldc.i4.s 35
 	stloc 4
-// 0x0109ffb8: 0x109ffb8: addu  a1, zero, zero
+// 0x010a0600: 0x10a0600: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109ffbc: 0x109ffbc: addiu a2, zero, -1
+// 0x010a0604: 0x10a0604: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0109ffc0: 0x109ffc0: addiu v0, zero, 130
+// 0x010a0608: 0x10a0608: addiu v0, zero, 130
 	ldc.i4 130
 	stloc 5
-// 0x0109ffc4: 0x109ffc4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a060c: 0x10a060c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4910,35 +4910,35 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109ffcc: 0x109ffcc: addu  a0, v0, zero
+// 0x010a0614: 0x10a0614: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0109ffd0: 0x109ffd0: addu  a2, zero, zero
+// 0x010a0618: 0x10a0618: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0109ffd4: 0x109ffd4: addu  a1, zero, zero
+// 0x010a061c: 0x10a061c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0109ffd8: 0x109ffd8: jal   0x1098fe0 addu  s4, v0, zero
+// 0x010a0620: 0x10a0620: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0109ffe0: 0x109ffe0: lui   a0, 0x20000
+// 0x010a0628: 0x10a0628: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0109ffe4: 0x109ffe4: lui   v0, 0x0
+// 0x010a062c: 0x10a062c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0109ffe8: 0x109ffe8: lw    s5, 17688(v0)
+// 0x010a0630: 0x10a0630: lw    s5, 17688(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4947,9 +4947,9 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0109ffec: 0x109ffec: jal   0x101cd60 addiu a0, a0, -1164
+// 0x010a0634: 0x10a0634: jal   0x101cd70 addiu a0, a0, -700
 	ldloc.1
-	ldc.i4 -1164
+	ldc.i4 -700
 	add
 	stloc.1
 	ldloc.0
@@ -4957,12 +4957,12 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0109fff4: 0x109fff4: lw    t0, 52(sp)
+// 0x010a063c: 0x10a063c: lw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4971,23 +4971,23 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0109fff8: 0x109fff8: lui   a3, 0x10a0000
+// 0x010a0640: 0x10a0640: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x0109fffc: 0x109fffc: ori   a2, t0, 144
+// 0x010a0644: 0x10a0644: ori   a2, t0, 144
 	ldloc 17
 	ldc.i4 144
 	or
 	stloc.3
-// 0x010a0000: 0x10a0000: addiu a3, a3, 980
+// 0x010a0648: 0x10a0648: addiu a3, a3, 2588
 	ldloc 4
-	ldc.i4 980
+	ldc.i4 2588
 	add
 	stloc 4
-// 0x010a0004: 0x10a0004: addu  a0, s5, zero
+// 0x010a064c: 0x10a064c: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x010a0008: 0x10a0008: jal   0x1091088 addu  a1, v0, zero
+// 0x010a0650: 0x10a0650: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4995,44 +4995,44 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0010: 0x10a0010: addu  a1, v0, zero
+// 0x010a0658: 0x10a0658: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0014: 0x10a0014: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a065c: 0x10a065c: jal   0x109950c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a001c: 0x10a001c: addu  a0, s0, zero
+// 0x010a0664: 0x10a0664: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a0020: 0x10a0020: jal   0x1098ec4 addu  a1, s4, zero
+// 0x010a0668: 0x10a0668: jal   0x109950c addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0028: 0x10a0028: addu  a0, s0, zero
+// 0x010a0670: 0x10a0670: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a002c: 0x10a002c: addiu a1, zero, 10
+// 0x010a0674: 0x10a0674: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010a0030: 0x10a0030: jal   0x109434c addiu a2, zero, 10
+// 0x010a0678: 0x10a0678: jal   0x1094970 addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
 	ldloc.0
@@ -5040,18 +5040,18 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0038: 0x10a0038: addu  a0, s0, zero
+// 0x010a0680: 0x10a0680: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a003c: 0x10a003c: addiu a1, zero, 15
+// 0x010a0684: 0x10a0684: addiu a1, zero, 15
 	ldc.i4.s 15
 	stloc.2
-// 0x010a0040: 0x10a0040: jal   0x10942e8 addu  a2, zero, zero
+// 0x010a0688: 0x10a0688: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5059,12 +5059,12 @@ L_109fd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0048: 0x10a0048: lw    v1, 56(sp)
+// 0x010a0690: 0x10a0690: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5073,43 +5073,43 @@ L_109fd70:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a004c: 0x10a004c: sll   zero, zero, 0
-// 0x010a0050: 0x10a0050: lw    a0, 10020(v1)
+// 0x010a0694: 0x10a0694: sll   zero, zero, 0
+// 0x010a0698: 0x10a0698: lw    a0, 10484(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0054: 0x10a0054: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a069c: 0x10a069c: jal   0x109950c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a005c: 0x10a005c: lui   s5, 0x80000
+// 0x010a06a4: 0x10a06a4: lui   s5, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_10a0060:
-// 0x010a0060: 0x10a0060: lui   v0, 0x0
+L_10a06a8:
+// 0x010a06a8: 0x10a06a8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0064: 0x10a0064: lw    a0, 10020(s5)
+// 0x010a06ac: 0x10a06ac: lw    a0, 10484(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0068: 0x10a0068: lw    a1, 17684(v0)
+// 0x010a06b0: 0x10a06b0: lw    a1, 17684(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5118,33 +5118,33 @@ L_10a0060:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a006c: 0x10a006c: jal   0x109b304 sll   zero, zero, 0
+// 0x010a06b4: 0x10a06b4: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0074: 0x10a0074: addu  s4, v0, zero
+// 0x010a06bc: 0x10a06bc: addu  s4, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a0078: 0x10a0078: lui   v0, 0x0
+// 0x010a06c0: 0x10a06c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a007c: 0x10a007c: lw    a0, 10020(s5)
+// 0x010a06c4: 0x10a06c4: lw    a0, 10484(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0080: 0x10a0080: lw    a1, 17680(v0)
+// 0x010a06c8: 0x10a06c8: lw    a1, 17680(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5153,33 +5153,33 @@ L_10a0060:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0084: 0x10a0084: jal   0x109b304 sll   zero, zero, 0
+// 0x010a06cc: 0x10a06cc: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a008c: 0x10a008c: addu  s0, v0, zero
+// 0x010a06d4: 0x10a06d4: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a0090: 0x10a0090: lui   v0, 0x0
+// 0x010a06d8: 0x10a06d8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0094: 0x10a0094: lw    a0, 10020(s5)
+// 0x010a06dc: 0x10a06dc: lw    a0, 10484(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0098: 0x10a0098: lw    a1, 17676(v0)
+// 0x010a06e0: 0x10a06e0: lw    a1, 17676(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5188,18 +5188,18 @@ L_10a0060:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a009c: 0x10a009c: jal   0x109b304 sll   zero, zero, 0
+// 0x010a06e4: 0x10a06e4: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a00a4: 0x10a00a4: lw    v1, 128(sp)
+// 0x010a06ec: 0x10a06ec: lw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5208,81 +5208,81 @@ L_10a0060:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a00a8: 0x10a00a8: addu  s5, v0, zero
+// 0x010a06f0: 0x10a06f0: addu  s5, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a00ac: 0x10a00ac: andi  v0, v1, 4
+// 0x010a06f4: 0x10a06f4: andi  v0, v1, 4
 	ldloc 7
 	ldc.i4.4
 	and
 	stloc 5
-// 0x010a00b0: 0x10a00b0: beq   v0, zero, 0x10a00c0 addu  a0, s0, zero
+// 0x010a06f8: 0x10a06f8: beq   v0, zero, 0x10a0708 addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_10a00c0
+	brfalse L_10a0708
 // --- basic block ---
-// 0x010a00b8: 0x10a00b8: j	 0x10a00c4 addiu a1, zero, 15
+// 0x010a0700: 0x10a0700: j	 0x10a070c addiu a1, zero, 15
 	ldc.i4.s 15
 	stloc.2
-	br L_10a00c4
+	br L_10a070c
 // --- basic block ---
-L_10a00c0:
-// 0x010a00c0: 0x10a00c0: addiu a1, zero, 31
+L_10a0708:
+// 0x010a0708: 0x10a0708: addiu a1, zero, 31
 	ldc.i4.s 31
 	stloc.2
-L_10a00c4:
-// 0x010a00c4: 0x10a00c4: jal   0x1097b00 sll   zero, zero, 0
+L_10a070c:
+// 0x010a070c: 0x10a070c: jal   0x1098148 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl113::ssd_text_set_input_type_1097b00(int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_input_type_1098148(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a00cc: 0x10a00cc: addu  a0, s5, zero
+// 0x010a0714: 0x10a0714: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x010a00d0: 0x10a00d0: addu  a2, s7, zero
+// 0x010a0718: 0x10a0718: addu  a2, s7, zero
 	ldloc 14
 	stloc.3
-// 0x010a00d4: 0x10a00d4: jal   0x1098ef8 addiu a1, zero, -2
+// 0x010a071c: 0x10a071c: jal   0x1099540 addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x010a00dc: 0x10a00dc: beq   s3, zero, 0x10a00f8 lui   a1, 0x10000
+// 0x010a0724: 0x10a0724: beq   s3, zero, 0x10a0740 lui   a1, 0x10000
 	ldloc 10
 	ldc.i4 65536
 	stloc.2
-	brfalse L_10a00f8
+	brfalse L_10a0740
 // --- basic block ---
-// 0x010a00e4: 0x10a00e4: lb    v0, 0(s3)
+// 0x010a072c: 0x10a072c: lb    v0, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a00e8: 0x10a00e8: sll   zero, zero, 0
-// 0x010a00ec: 0x10a00ec: bne   v0, zero, 0x10a00fc addu  a1, s3, zero
+// 0x010a0730: 0x10a0730: sll   zero, zero, 0
+// 0x010a0734: 0x10a0734: bne   v0, zero, 0x10a0744 addu  a1, s3, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brtrue L_10a00fc
+	brtrue L_10a0744
 // --- basic block ---
-// 0x010a00f4: 0x10a00f4: lui   a1, 0x10000
+// 0x010a073c: 0x10a073c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_10a00f8:
-// 0x010a00f8: 0x10a00f8: addiu a1, a1, 18500
+L_10a0740:
+// 0x010a0740: 0x10a0740: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-L_10a00fc:
-// 0x010a00fc: 0x10a00fc: jal   0x1097e5c addu  a0, s0, zero
+L_10a0744:
+// 0x010a0744: 0x10a0744: jal   0x10984a4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5290,27 +5290,27 @@ L_10a00fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0104: 0x10a0104: lui   v0, 0x80000
+// 0x010a074c: 0x10a074c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a0108: 0x10a0108: lw    a0, 10020(v0)
+// 0x010a0750: 0x10a0750: lw    a0, 10484(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a010c: 0x10a010c: lui   v0, 0x0
+// 0x010a0754: 0x10a0754: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0110: 0x10a0110: lw    a1, 17688(v0)
+// 0x010a0758: 0x10a0758: lw    a1, 17688(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5319,18 +5319,18 @@ L_10a00fc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0114: 0x10a0114: jal   0x109b304 sll   zero, zero, 0
+// 0x010a075c: 0x10a075c: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a011c: 0x10a011c: lw    v1, 128(sp)
+// 0x010a0764: 0x10a0764: lw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5339,24 +5339,24 @@ L_10a00fc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a0120: 0x10a0120: addu  s3, v0, zero
+// 0x010a0768: 0x10a0768: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010a0124: 0x10a0124: andi  v0, v1, 1
+// 0x010a076c: 0x10a076c: andi  v0, v1, 1
 	ldloc 7
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010a0128: 0x10a0128: lui   a1, 0x0
+// 0x010a0770: 0x10a0770: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a012c: 0x10a012c: beq   v0, zero, 0x10a0164 lui   v1, 0x0
+// 0x010a0774: 0x10a0774: beq   v0, zero, 0x10a07ac lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10a0164
+	brfalse L_10a07ac
 // --- basic block ---
-// 0x010a0134: 0x10a0134: lw    v0, 17712(a1)
+// 0x010a077c: 0x10a077c: lw    v0, 17712(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5365,7 +5365,7 @@ L_10a00fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a0138: 0x10a0138: lw    a0, 17672(v1)
+// 0x010a0780: 0x10a0780: lw    a0, 17672(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5374,7 +5374,7 @@ L_10a00fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a013c: 0x10a013c: sw    v0, 24(sp)
+// 0x010a0784: 0x10a0784: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5383,15 +5383,15 @@ L_10a00fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a0140: 0x10a0140: addiu a1, sp, 24
+// 0x010a0788: 0x10a0788: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010a0144: 0x10a0144: addiu v0, zero, 3
+// 0x010a078c: 0x10a078c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010a0148: 0x10a0148: sw    v0, 32(sp)
+// 0x010a0790: 0x10a0790: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5400,7 +5400,7 @@ L_10a00fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a014c: 0x10a014c: jal   0x10943b4 sw    zero, 28(sp)
+// 0x010a0794: 0x10a0794: jal   0x10949d8 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5414,27 +5414,27 @@ L_10a00fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_ntv_keyboard_params_10943b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_ntv_keyboard_params_10949d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0154: 0x10a0154: jal   0x10990ac addu  a0, s3, zero
+// 0x010a079c: 0x10a079c: jal   0x10996f4 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a015c: 0x10a015c: j	 0x10a017c lui   v0, 0x0
+// 0x010a07a4: 0x10a07a4: j	 0x10a07c4 lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-	br L_10a017c
+	br L_10a07c4
 // --- basic block ---
-L_10a0164:
-// 0x010a0164: 0x10a0164: lw    a0, 17672(v1)
+L_10a07ac:
+// 0x010a07ac: 0x10a07ac: lw    a0, 17672(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5443,7 +5443,7 @@ L_10a0164:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0168: 0x10a0168: jal   0x10943b4 addiu a1, a1, 17712
+// 0x010a07b0: 0x10a07b0: jal   0x10949d8 addiu a1, a1, 17712
 	ldloc.2
 	ldc.i4 17712
 	add
@@ -5453,26 +5453,26 @@ L_10a0164:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_ntv_keyboard_params_10943b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_ntv_keyboard_params_10949d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0170: 0x10a0170: jal   0x1099098 addu  a0, s3, zero
+// 0x010a07b8: 0x10a07b8: jal   0x10996e0 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a0178: 0x10a0178: lui   v0, 0x0
+// 0x010a07c0: 0x10a07c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10a017c:
-// 0x010a017c: 0x10a017c: lui   s5, 0x80000
+L_10a07c4:
+// 0x010a07c4: 0x10a07c4: lui   s5, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010a0180: 0x10a0180: lw    a1, 17684(v0)
+// 0x010a07c8: 0x10a07c8: lw    a1, 17684(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5481,36 +5481,36 @@ L_10a017c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0184: 0x10a0184: lw    a0, 10020(s5)
+// 0x010a07cc: 0x10a07cc: lw    a0, 10484(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0188: 0x10a0188: jal   0x109b304 sll   zero, zero, 0
+// 0x010a07d0: 0x10a07d0: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0190: 0x10a0190: addu  s7, v0, zero
+// 0x010a07d8: 0x10a07d8: addu  s7, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010a0194: 0x10a0194: bne   s6, zero, 0x10a01cc lui   v0, 0x0
+// 0x010a07dc: 0x10a07dc: bne   s6, zero, 0x10a0814 lui   v0, 0x0
 	ldloc 15
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10a01cc
+	brtrue L_10a0814
 // --- basic block ---
-// 0x010a019c: 0x10a019c: lw    a1, 17696(v0)
+// 0x010a07e4: 0x10a07e4: lw    a1, 17696(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5519,54 +5519,54 @@ L_10a017c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a01a0: 0x10a01a0: lw    a0, 10020(s5)
+// 0x010a07e8: 0x10a07e8: lw    a0, 10484(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a01a4: 0x10a01a4: jal   0x109b304 sll   zero, zero, 0
+// 0x010a07ec: 0x10a07ec: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a01ac: 0x10a01ac: jal   0x1099098 addu  a0, v0, zero
+// 0x010a07f4: 0x10a07f4: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a01b4: 0x10a01b4: addu  a0, s7, zero
+// 0x010a07fc: 0x10a07fc: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x010a01b8: 0x10a01b8: addu  a1, s1, zero
+// 0x010a0800: 0x10a0800: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x010a01bc: 0x10a01bc: jal   0x1098ef8 addu  a2, s2, zero
+// 0x010a0804: 0x10a0804: jal   0x1099540 addu  a2, s2, zero
 	ldloc 13
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x010a01c4: 0x10a01c4: j	 0x10a0234 lui   s2, 0x80000
+// 0x010a080c: 0x10a080c: j	 0x10a087c lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 13
-	br L_10a0234
+	br L_10a087c
 // --- basic block ---
-L_10a01cc:
-// 0x010a01cc: 0x10a01cc: lw    a1, 17696(v0)
+L_10a0814:
+// 0x010a0814: 0x10a0814: lw    a1, 17696(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5575,33 +5575,33 @@ L_10a01cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a01d0: 0x10a01d0: lw    a0, 10020(s5)
+// 0x010a0818: 0x10a0818: lw    a0, 10484(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a01d4: 0x10a01d4: jal   0x109b304 sll   zero, zero, 0
+// 0x010a081c: 0x10a081c: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a01dc: 0x10a01dc: addu  s3, v0, zero
+// 0x010a0824: 0x10a0824: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010a01e0: 0x10a01e0: lui   v0, 0x0
+// 0x010a0828: 0x10a0828: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a01e4: 0x10a01e4: lw    a1, 17700(v0)
+// 0x010a082c: 0x10a082c: lw    a1, 17700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5610,30 +5610,30 @@ L_10a01cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a01e8: 0x10a01e8: lw    a0, 10020(s5)
+// 0x010a0830: 0x10a0830: lw    a0, 10484(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a01ec: 0x10a01ec: jal   0x109b304 sll   zero, zero, 0
+// 0x010a0834: 0x10a0834: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a01f4: 0x10a01f4: addu  a0, s3, zero
+// 0x010a083c: 0x10a083c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010a01f8: 0x10a01f8: jal   0x10990ac sw    v0, 44(sp)
+// 0x010a0840: 0x10a0840: jal   0x10996f4 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5643,26 +5643,26 @@ L_10a01cc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0200: 0x10a0200: addu  a0, s7, zero
+// 0x010a0848: 0x10a0848: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x010a0204: 0x10a0204: addu  a1, s1, zero
+// 0x010a084c: 0x10a084c: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x010a0208: 0x10a0208: jal   0x1098ef8 addu  a2, s2, zero
+// 0x010a0850: 0x10a0850: jal   0x1099540 addu  a2, s2, zero
 	ldloc 13
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x010a0210: 0x10a0210: lw    a1, 40(sp)
+// 0x010a0858: 0x10a0858: lw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5671,18 +5671,18 @@ L_10a01cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0214: 0x10a0214: addu  a0, s3, zero
+// 0x010a085c: 0x10a085c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010a0218: 0x10a0218: jal   0x1098ef8 addu  a2, s2, zero
+// 0x010a0860: 0x10a0860: jal   0x1099540 addu  a2, s2, zero
 	ldloc 13
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x010a0220: 0x10a0220: lw    v0, 44(sp)
+// 0x010a0868: 0x10a0868: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5691,10 +5691,10 @@ L_10a01cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a0224: 0x10a0224: addu  a1, s6, zero
+// 0x010a086c: 0x10a086c: addu  a1, s6, zero
 	ldloc 15
 	stloc.2
-// 0x010a0228: 0x10a0228: jal   0x1097e5c addu  a0, v0, zero
+// 0x010a0870: 0x10a0870: jal   0x10984a4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5702,28 +5702,28 @@ L_10a01cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0230: 0x10a0230: lui   s2, 0x80000
+// 0x010a0878: 0x10a0878: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 13
-L_10a0234:
-// 0x010a0234: 0x10a0234: lui   s5, 0x0
+L_10a087c:
+// 0x010a087c: 0x10a087c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a0238: 0x10a0238: lw    a0, 10020(s2)
+// 0x010a0880: 0x10a0880: lw    a0, 10484(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a023c: 0x10a023c: lw    a1, 17704(s5)
+// 0x010a0884: 0x10a0884: lw    a1, 17704(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5732,21 +5732,21 @@ L_10a0234:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0240: 0x10a0240: jal   0x109b304 sll   zero, zero, 0
+// 0x010a0888: 0x10a0888: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0248: 0x10a0248: addu  s3, v0, zero
+// 0x010a0890: 0x10a0890: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010a024c: 0x10a024c: lw    v0, 116(sp)
+// 0x010a0894: 0x10a0894: lw    v0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5755,23 +5755,23 @@ L_10a0234:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a0250: 0x10a0250: sll   zero, zero, 0
-// 0x010a0254: 0x10a0254: bne   v0, zero, 0x10a027c lui   v0, 0x0
+// 0x010a0898: 0x10a0898: sll   zero, zero, 0
+// 0x010a089c: 0x10a089c: bne   v0, zero, 0x10a08c4 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10a027c
+	brtrue L_10a08c4
 // --- basic block ---
-// 0x010a025c: 0x10a025c: lw    a0, 10020(s2)
+// 0x010a08a4: 0x10a08a4: lw    a0, 10484(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0260: 0x10a0260: lw    a1, 17704(s5)
+// 0x010a08a8: 0x10a08a8: lw    a1, 17704(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5780,31 +5780,31 @@ L_10a0234:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0264: 0x10a0264: jal   0x109b304 sll   zero, zero, 0
+// 0x010a08ac: 0x10a08ac: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a026c: 0x10a026c: jal   0x1099098 addu  a0, v0, zero
+// 0x010a08b4: 0x10a08b4: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a0274: 0x10a0274: j	 0x10a02ac addiu a2, zero, -1
+// 0x010a08bc: 0x10a08bc: j	 0x10a08f4 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-	br L_10a02ac
+	br L_10a08f4
 // --- basic block ---
-L_10a027c:
-// 0x010a027c: 0x10a027c: lw    a1, 17708(v0)
+L_10a08c4:
+// 0x010a08c4: 0x10a08c4: lw    a1, 17708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5813,30 +5813,30 @@ L_10a027c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0280: 0x10a0280: lw    a0, 10020(s2)
+// 0x010a08c8: 0x10a08c8: lw    a0, 10484(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0284: 0x10a0284: jal   0x109b304 sll   zero, zero, 0
+// 0x010a08cc: 0x10a08cc: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a028c: 0x10a028c: addu  a0, s3, zero
+// 0x010a08d4: 0x10a08d4: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010a0290: 0x10a0290: jal   0x10990ac sw    v0, 44(sp)
+// 0x010a08d8: 0x10a08d8: jal   0x10996f4 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5846,12 +5846,12 @@ L_10a027c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0298: 0x10a0298: lw    v0, 44(sp)
+// 0x010a08e0: 0x10a08e0: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5860,7 +5860,7 @@ L_10a027c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a029c: 0x10a029c: lw    a1, 116(sp)
+// 0x010a08e4: 0x10a08e4: lw    a1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5869,7 +5869,7 @@ L_10a027c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a02a0: 0x10a02a0: jal   0x1097e5c addu  a0, v0, zero
+// 0x010a08e8: 0x10a08e8: jal   0x10984a4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5877,30 +5877,30 @@ L_10a027c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a02a8: 0x10a02a8: addiu a2, zero, -1
+// 0x010a08f0: 0x10a08f0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-L_10a02ac:
-// 0x010a02ac: 0x10a02ac: addu  a0, s3, zero
+L_10a08f4:
+// 0x010a08f4: 0x10a08f4: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010a02b0: 0x10a02b0: jal   0x1098ef8 addu  a1, s1, zero
+// 0x010a08f8: 0x10a08f8: jal   0x1099540 addu  a1, s1, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-// 0x010a02b8: 0x10a02b8: lui   v0, 0x0
+// 0x010a0900: 0x10a0900: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a02bc: 0x10a02bc: lw    a0, 17672(v0)
+// 0x010a0904: 0x10a0904: lw    a0, 17672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5909,7 +5909,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a02c0: 0x10a02c0: jal   0x1095eec addu  a1, zero, zero
+// 0x010a0908: 0x10a0908: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5917,12 +5917,12 @@ L_10a02ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a02c8: 0x10a02c8: lw    a0, 104(sp)
+// 0x010a0910: 0x10a0910: lw    a0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5931,26 +5931,26 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a02cc: 0x10a02cc: jal   0x101cd60 sll   zero, zero, 0
+// 0x010a0914: 0x10a0914: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a02d4: 0x10a02d4: lui   a0, 0x10000
+// 0x010a091c: 0x10a091c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a02d8: 0x10a02d8: addu  a1, v0, zero
+// 0x010a0920: 0x10a0920: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a02dc: 0x10a02dc: jal   0x1094770 addiu a0, a0, 328
+// 0x010a0924: 0x10a0924: jal   0x1094d94 addiu a0, a0, 324
 	ldloc.1
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.1
 	ldloc.0
@@ -5958,32 +5958,32 @@ L_10a02ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a02e4: 0x10a02e4: addu  a0, s4, zero
+// 0x010a092c: 0x10a092c: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010a02e8: 0x10a02e8: jal   0x10991e8 addu  a1, zero, zero
+// 0x010a0930: 0x10a0930: jal   0x1099830 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_focus_highlight_10991e8(int32,int32)
+	call void Cibyl114::ssd_widget_set_focus_highlight_1099830(int32,int32)
 // --- basic block ---
-// 0x010a02f0: 0x10a02f0: addu  a0, s0, zero
+// 0x010a0938: 0x10a0938: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a02f4: 0x10a02f4: jal   0x10991e8 addu  a1, zero, zero
+// 0x010a093c: 0x10a093c: jal   0x1099830 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_focus_highlight_10991e8(int32,int32)
+	call void Cibyl114::ssd_widget_set_focus_highlight_1099830(int32,int32)
 // --- basic block ---
-// 0x010a02fc: 0x10a02fc: jal   0x109617c addu  a0, s4, zero
+// 0x010a0944: 0x10a0944: jal   0x10967c4 addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -5991,24 +5991,24 @@ L_10a02ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0304: 0x10a0304: jal   0x109483c sll   zero, zero, 0
+// 0x010a094c: 0x10a094c: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a030c: 0x10a030c: lw    ra, 100(sp)
-// 0x010a0310: 0x10a0310: lw    s8, 96(sp)
+// 0x010a0954: 0x10a0954: lw    ra, 100(sp)
+// 0x010a0958: 0x10a0958: lw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6017,7 +6017,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a0314: 0x10a0314: lw    s7, 92(sp)
+// 0x010a095c: 0x10a095c: lw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6026,7 +6026,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a0318: 0x10a0318: lw    s6, 88(sp)
+// 0x010a0960: 0x10a0960: lw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6035,7 +6035,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a031c: 0x10a031c: lw    s5, 84(sp)
+// 0x010a0964: 0x10a0964: lw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6044,7 +6044,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a0320: 0x10a0320: lw    s4, 80(sp)
+// 0x010a0968: 0x10a0968: lw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6053,7 +6053,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a0324: 0x10a0324: lw    s3, 76(sp)
+// 0x010a096c: 0x10a096c: lw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6062,7 +6062,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a0328: 0x10a0328: lw    s2, 72(sp)
+// 0x010a0970: 0x10a0970: lw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6071,7 +6071,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a032c: 0x10a032c: lw    s1, 68(sp)
+// 0x010a0974: 0x10a0974: lw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6080,7 +6080,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a0330: 0x10a0330: lw    s0, 64(sp)
+// 0x010a0978: 0x10a0978: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6089,7 +6089,7 @@ L_10a02ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a0334: 0x10a0334: jr    ra addiu sp, sp, 104
+// 0x010a097c: 0x10a097c: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -6101,7 +6101,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_done_10a036c(int32,int32,int32,int32,int32)
+.method public static int32 on_done_10a09b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6136,10 +6136,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a036c: 0x10a036c: lui   v0, 0x0
+// 0x010a09b4: 0x10a09b4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0370: 0x10a0370: lw    a1, 17680(v0)
+// 0x010a09b8: 0x10a09b8: lw    a1, 17680(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6148,36 +6148,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0374: 0x10a0374: lui   v0, 0x80000
+// 0x010a09bc: 0x10a09bc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a0378: 0x10a0378: lw    a0, 10020(v0)
+// 0x010a09c0: 0x10a09c0: lw    a0, 10484(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a037c: 0x10a037c: addiu sp, sp, -24
+// 0x010a09c4: 0x10a09c4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a0380: 0x10a0380: sw    ra, 20(sp)
-// 0x010a0384: 0x10a0384: jal   0x109b304 sll   zero, zero, 0
+// 0x010a09c8: 0x10a09c8: sw    ra, 20(sp)
+// 0x010a09cc: 0x10a09cc: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a038c: 0x10a038c: jal   0x1097c00 addu  a0, v0, zero
+// 0x010a09d4: 0x10a09d4: jal   0x1098248 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6185,39 +6185,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0394: 0x10a0394: lui   a0, 0x80000
+// 0x010a09dc: 0x10a09dc: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a0398: 0x10a0398: lui   v1, 0x80000
+// 0x010a09e0: 0x10a09e0: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a039c: 0x10a039c: lw    a2, 10016(a0)
+// 0x010a09e4: 0x10a09e4: lw    a2, 10480(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a03a0: 0x10a03a0: lw    v1, 10012(v1)
+// 0x010a09e8: 0x10a09e8: lw    v1, 10476(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a03a4: 0x10a03a4: addu  a1, v0, zero
+// 0x010a09ec: 0x10a09ec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a03a8: 0x10a03a8: jalr  v1 addiu a0, zero, 1
+// 0x010a09f0: 0x10a09f0: jalr  v1 addiu a0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.1
@@ -6231,13 +6231,13 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a03b0: 0x10a03b0: beq   v0, zero, 0x10a03c4 lui   v0, 0x0
+// 0x010a09f8: 0x10a09f8: beq   v0, zero, 0x10a0a0c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10a03c4
+	brfalse L_10a0a0c
 // --- basic block ---
-// 0x010a03b8: 0x10a03b8: lw    a0, 17672(v0)
+// 0x010a0a00: 0x10a0a00: lw    a0, 17672(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6246,7 +6246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a03bc: 0x10a03bc: jal   0x1094884 addiu a1, zero, 1
+// 0x010a0a04: 0x10a0a04: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6254,15 +6254,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a03c4:
-// 0x010a03c4: 0x10a03c4: lw    ra, 20(sp)
-// 0x010a03c8: 0x10a03c8: sll   zero, zero, 0
-// 0x010a03cc: 0x10a03cc: jr    ra addiu sp, sp, 24
+L_10a0a0c:
+// 0x010a0a0c: 0x10a0a0c: lw    ra, 20(sp)
+// 0x010a0a10: 0x10a0a10: sll   zero, zero, 0
+// 0x010a0a14: 0x10a0a14: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6274,7 +6274,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 btn_callback_10a03d4(int32,int32,int32,int32,int32)
+.method public static int32 btn_callback_10a0a1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -6309,30 +6309,30 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a03d4: 0x10a03d4: lui   v0, 0x80000
+// 0x010a0a1c: 0x10a0a1c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a03d8: 0x10a03d8: lw    a0, 10016(v0)
+// 0x010a0a20: 0x10a0a20: lw    a0, 10480(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a03dc: 0x10a03dc: lui   a1, 0x10000
+// 0x010a0a24: 0x10a0a24: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a03e0: 0x10a03e0: addiu sp, sp, -24
+// 0x010a0a28: 0x10a0a28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a03e4: 0x10a03e4: sw    ra, 20(sp)
-// 0x010a03e8: 0x10a03e8: jal   0x10a036c addiu a1, a1, 18500
+// 0x010a0a2c: 0x10a0a2c: sw    ra, 20(sp)
+// 0x010a0a30: 0x10a0a30: jal   0x10a09b4 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6340,16 +6340,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::on_done_10a036c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::on_done_10a09b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a03f0: 0x10a03f0: lw    ra, 20(sp)
-// 0x010a03f4: 0x10a03f4: addiu v0, zero, 1
+// 0x010a0a38: 0x10a0a38: lw    ra, 20(sp)
+// 0x010a0a3c: 0x10a0a3c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a03f8: 0x10a03f8: jr    ra addiu sp, sp, 24
+// 0x010a0a40: 0x10a0a40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6361,7 +6361,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_key_pressed__delegate_to_editbox_10a0400(int32,int32,int32,int32,int32)
+.method public static int32 on_key_pressed__delegate_to_editbox_10a0a48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 ra)
@@ -6399,18 +6399,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a0400: 0x10a0400: addiu sp, sp, -32
+// 0x010a0a48: 0x10a0a48: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a0404: 0x10a0404: andi  v0, a2, 2
+// 0x010a0a4c: 0x10a0a4c: andi  v0, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc 6
-// 0x010a0408: 0x10a0408: sw    ra, 28(sp)
-// 0x010a040c: 0x10a040c: beq   v0, zero, 0x10a0438 sw    s0, 24(sp)
+// 0x010a0a50: 0x10a0a50: sw    ra, 28(sp)
+// 0x010a0a54: 0x10a0a54: beq   v0, zero, 0x10a0a80 sw    s0, 24(sp)
 	ldloc 6
 	ldloc 7
 	ldloc.0
@@ -6420,24 +6420,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_10a0438
+	brfalse L_10a0a80
 // --- basic block ---
-// 0x010a0414: 0x10a0414: lb    a3, 0(a1)
+// 0x010a0a5c: 0x10a0a5c: lb    a3, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x010a0418: 0x10a0418: addiu v1, zero, 13
+// 0x010a0a60: 0x10a0a60: addiu v1, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x010a041c: 0x10a041c: bne   a3, v1, 0x10a0438 sll   zero, zero, 0
+// 0x010a0a64: 0x10a0a64: bne   a3, v1, 0x10a0a80 sll   zero, zero, 0
 	ldloc 4
 	ldloc 5
-	bne.un L_10a0438
+	bne.un L_10a0a80
 // --- basic block ---
-// 0x010a0424: 0x10a0424: addu  a0, zero, zero
+// 0x010a0a6c: 0x10a0a6c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a0428: 0x10a0428: jal   0x10a036c addu  a1, zero, zero
+// 0x010a0a70: 0x10a0a70: jal   0x10a09b4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6445,23 +6445,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::on_done_10a036c(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::on_done_10a09b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010a0430: 0x10a0430: j	 0x10a04b0 addiu v1, zero, 1
+// 0x010a0a78: 0x10a0a78: j	 0x10a0af8 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10a04b0
+	br L_10a0af8
 // --- basic block ---
-L_10a0438:
-// 0x010a0438: 0x10a0438: andi  v1, a2, 1
+L_10a0a80:
+// 0x010a0a80: 0x10a0a80: andi  v1, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010a043c: 0x10a043c: lw    s0, 12(a0)
+// 0x010a0a84: 0x10a0a84: lw    s0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6470,56 +6470,56 @@ L_10a0438:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a0440: 0x10a0440: beq   v1, zero, 0x10a0464 sll   zero, zero, 0
+// 0x010a0a88: 0x10a0a88: beq   v1, zero, 0x10a0aac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a0464
+	brfalse L_10a0aac
 // --- basic block ---
-// 0x010a0448: 0x10a0448: lbu   v1, 0(a1)
+// 0x010a0a90: 0x10a0a90: lbu   v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010a044c: 0x10a044c: sll   zero, zero, 0
-// 0x010a0450: 0x10a0450: addiu v1, v1, -2
+// 0x010a0a94: 0x10a0a94: sll   zero, zero, 0
+// 0x010a0a98: 0x10a0a98: addiu v1, v1, -2
 	ldloc 5
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x010a0454: 0x10a0454: andi  v1, v1, 255
+// 0x010a0a9c: 0x10a0a9c: andi  v1, v1, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x010a0458: 0x10a0458: sltiu v1, v1, 2
+// 0x010a0aa0: 0x10a0aa0: sltiu v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x010a045c: 0x10a045c: bne   v1, zero, 0x10a049c sll   zero, zero, 0
+// 0x010a0aa4: 0x10a0aa4: bne   v1, zero, 0x10a0ae4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a049c
+	brtrue L_10a0ae4
 // --- basic block ---
-L_10a0464:
-// 0x010a0464: 0x10a0464: beq   v0, zero, 0x10a047c addiu v0, zero, 27
+L_10a0aac:
+// 0x010a0aac: 0x10a0aac: beq   v0, zero, 0x10a0ac4 addiu v0, zero, 27
 	ldloc 6
 	ldc.i4.s 27
 	stloc 6
-	brfalse L_10a047c
+	brfalse L_10a0ac4
 // --- basic block ---
-// 0x010a046c: 0x10a046c: lb    v1, 0(a1)
+// 0x010a0ab4: 0x10a0ab4: lb    v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a0470: 0x10a0470: sll   zero, zero, 0
-// 0x010a0474: 0x10a0474: beq   v1, v0, 0x10a049c sll   zero, zero, 0
+// 0x010a0ab8: 0x10a0ab8: sll   zero, zero, 0
+// 0x010a0abc: 0x10a0abc: beq   v1, v0, 0x10a0ae4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	beq  L_10a049c
+	beq  L_10a0ae4
 // --- basic block ---
-L_10a047c:
-// 0x010a047c: 0x10a047c: addiu a0, zero, 1
+L_10a0ac4:
+// 0x010a0ac4: 0x10a0ac4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a0480: 0x10a0480: sw    a1, 16(sp)
+// 0x010a0ac8: 0x10a0ac8: sw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6528,7 +6528,7 @@ L_10a047c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a0484: 0x10a0484: jal   0x1038b3c sw    a2, 20(sp)
+// 0x010a0acc: 0x10a0acc: jal   0x1038b4c sw    a2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6542,12 +6542,12 @@ L_10a047c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_typing_locked_1038b3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_typing_locked_1038b4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010a048c: 0x10a048c: lw    a1, 16(sp)
+// 0x010a0ad4: 0x10a0ad4: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6556,7 +6556,7 @@ L_10a047c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0490: 0x10a0490: lw    a2, 20(sp)
+// 0x010a0ad8: 0x10a0ad8: lw    a2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6565,14 +6565,14 @@ L_10a047c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a0494: 0x10a0494: bne   v0, zero, 0x10a04b0 addiu v1, zero, 1
+// 0x010a0adc: 0x10a0adc: bne   v0, zero, 0x10a0af8 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brtrue L_10a04b0
+	brtrue L_10a0af8
 // --- basic block ---
-L_10a049c:
-// 0x010a049c: 0x10a049c: lw    v0, 216(s0)
+L_10a0ae4:
+// 0x010a0ae4: 0x10a0ae4: lw    v0, 216(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6581,8 +6581,8 @@ L_10a049c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a04a0: 0x10a04a0: sll   zero, zero, 0
-// 0x010a04a4: 0x10a04a4: jalr  v0 addu  a0, s0, zero
+// 0x010a0ae8: 0x10a0ae8: sll   zero, zero, 0
+// 0x010a0aec: 0x10a0aec: jalr  v0 addu  a0, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
@@ -6596,15 +6596,15 @@ L_10a049c:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010a04ac: 0x10a04ac: addu  v1, v0, zero
+// 0x010a0af4: 0x10a0af4: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-L_10a04b0:
-// 0x010a04b0: 0x10a04b0: lw    ra, 28(sp)
-// 0x010a04b4: 0x10a04b4: addu  v0, v1, zero
+L_10a0af8:
+// 0x010a0af8: 0x10a0af8: lw    ra, 28(sp)
+// 0x010a0afc: 0x10a0afc: addu  v0, v1, zero
 	ldloc 5
 	stloc 6
-// 0x010a04b8: 0x10a04b8: lw    s0, 24(sp)
+// 0x010a0b00: 0x10a0b00: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6613,7 +6613,7 @@ L_10a04b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a04bc: 0x10a04bc: jr    ra addiu sp, sp, 32
+// 0x010a0b04: 0x10a0b04: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6625,7 +6625,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_login_new_existing_dlg_10a04e4(int32,int32,int32,int32)
+.method public static int32 roadmap_login_new_existing_dlg_10a0b2c(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 t0,int32 t1,int32[] mem,int32 ra)
@@ -6663,171 +6663,171 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a04e4: 0x10a04e4: lui   v0, 0x80000
+// 0x010a0b2c: 0x10a0b2c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x010a04e8: 0x10a04e8: lw    v0, 10024(v0)
+// 0x010a0b30: 0x10a0b30: lw    v0, 10488(v0)
 	ldloc 8
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a04ec: 0x10a04ec: sll   zero, zero, 0
-// 0x010a04f0: 0x10a04f0: bne   v0, zero, 0x10a0598 lui   v1, 0x80000
+// 0x010a0b34: 0x10a0b34: sll   zero, zero, 0
+// 0x010a0b38: 0x10a0b38: bne   v0, zero, 0x10a0be0 lui   v1, 0x80000
 	ldloc 4
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10a0598
+	brtrue L_10a0be0
 // --- basic block ---
-// 0x010a04f8: 0x10a04f8: lw    v0, 10036(v1)
+// 0x010a0b40: 0x10a0b40: lw    v0, 10500(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2509
+	ldc.i4 2625
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a04fc: 0x10a04fc: sll   zero, zero, 0
-// 0x010a0500: 0x10a0500: bne   v0, zero, 0x10a0564 lui   a1, 0x10a0000
+// 0x010a0b44: 0x10a0b44: sll   zero, zero, 0
+// 0x010a0b48: 0x10a0b48: bne   v0, zero, 0x10a0bac lui   a1, 0x10a0000
 	ldloc 4
 	ldc.i4 17432576
 	stloc.1
-	brtrue L_10a0564
+	brtrue L_10a0bac
 // --- basic block ---
-// 0x010a0508: 0x10a0508: lui   t1, 0x80000
+// 0x010a0b50: 0x10a0b50: lui   t1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010a050c: 0x10a050c: lui   t0, 0x80000
+// 0x010a0b54: 0x10a0b54: lui   t0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a0510: 0x10a0510: lui   a3, 0x80000
+// 0x010a0b58: 0x10a0b58: lui   a3, 0x80000
 	ldc.i4 524288
 	stloc.3
-// 0x010a0514: 0x10a0514: lui   a2, 0x80000
+// 0x010a0b5c: 0x10a0b5c: lui   a2, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a0518: 0x10a0518: lui   a1, 0x80000
+// 0x010a0b60: 0x10a0b60: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a051c: 0x10a051c: lui   a0, 0x80000
+// 0x010a0b64: 0x10a0b64: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x010a0520: 0x10a0520: addiu t1, t1, 15052
+// 0x010a0b68: 0x10a0b68: addiu t1, t1, 15516
 	ldloc 7
-	ldc.i4 15052
+	ldc.i4 15516
 	add
 	stloc 7
-// 0x010a0524: 0x10a0524: addiu t0, t0, 14052
+// 0x010a0b6c: 0x10a0b6c: addiu t0, t0, 14516
 	ldloc 6
-	ldc.i4 14052
+	ldc.i4 14516
 	add
 	stloc 6
-// 0x010a0528: 0x10a0528: addiu a3, a3, 13052
+// 0x010a0b70: 0x10a0b70: addiu a3, a3, 13516
 	ldloc.3
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc.3
-// 0x010a052c: 0x10a052c: addiu a2, a2, 12052
+// 0x010a0b74: 0x10a0b74: addiu a2, a2, 12516
 	ldloc.2
-	ldc.i4 12052
+	ldc.i4 12516
 	add
 	stloc.2
-// 0x010a0530: 0x10a0530: addiu a1, a1, 11052
+// 0x010a0b78: 0x10a0b78: addiu a1, a1, 11516
 	ldloc.1
-	ldc.i4 11052
+	ldc.i4 11516
 	add
 	stloc.1
-// 0x010a0534: 0x10a0534: addiu a0, a0, 10052
+// 0x010a0b7c: 0x10a0b7c: addiu a0, a0, 10516
 	ldloc.0
-	ldc.i4 10052
+	ldc.i4 10516
 	add
 	stloc.0
-// 0x010a0538: 0x10a0538: cibyl_sysc_arg 0x4
+// 0x010a0b80: 0x10a0b80: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010a053c: 0x10a053c: cibyl_sysc_arg 0x5
+// 0x010a0b84: 0x10a0b84: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010a0540: 0x10a0540: cibyl_sysc_arg 0x6
+// 0x010a0b88: 0x10a0b88: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x010a0544: 0x10a0544: cibyl_sysc_arg 0x7
+// 0x010a0b8c: 0x10a0b8c: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x010a0548: 0x10a0548: cibyl_sysc_arg 0x8
+// 0x010a0b90: 0x10a0b90: cibyl_sysc_arg 0x8
 	ldloc 6
-// 0x010a054c: 0x10a054c: cibyl_sysc_arg 0x9
+// 0x010a0b94: 0x10a0b94: cibyl_sysc_arg 0x9
 	ldloc 7
-// 0x010a0550: 0x10a0550: cibyl_sysc 0x2148
+// 0x010a0b98: 0x10a0b98: cibyl_sysc 0x2148
 	call void [WazeWP7]Syscalls::NOPH_SignInUpDialogs_registerTextAddrs(int32,int32,int32,int32,int32,int32)
-// 0x010a0554: 0x10a0554: addu  a0, v0, zero
+// 0x010a0b9c: 0x10a0b9c: addu  a0, v0, zero
 	ldloc 4
 	stloc.0
-// 0x010a0558: 0x10a0558: addiu v0, zero, 1
+// 0x010a0ba0: 0x10a0ba0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010a055c: 0x10a055c: sw    v0, 10036(v1)
+// 0x010a0ba4: 0x10a0ba4: sw    v0, 10500(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2509
+	ldc.i4 2625
 	add
 	ldloc 4
 	stelem.i4
-// 0x010a0560: 0x10a0560: lui   a1, 0x10a0000
+// 0x010a0ba8: 0x10a0ba8: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-L_10a0564:
-// 0x010a0564: 0x10a0564: lui   a0, 0x10a0000
+L_10a0bac:
+// 0x010a0bac: 0x10a0bac: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.0
-// 0x010a0568: 0x10a0568: lui   v1, 0x10b0000
+// 0x010a0bb0: 0x10a0bb0: lui   v1, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010a056c: 0x10a056c: addiu a1, a1, 4924
+// 0x010a0bb4: 0x10a0bb4: addiu a1, a1, 6532
 	ldloc.1
-	ldc.i4 4924
+	ldc.i4 6532
 	add
 	stloc.1
-// 0x010a0570: 0x10a0570: addiu a0, a0, 5316
+// 0x010a0bb8: 0x10a0bb8: addiu a0, a0, 6924
 	ldloc.0
-	ldc.i4 5316
+	ldc.i4 6924
 	add
 	stloc.0
-// 0x010a0574: 0x10a0574: addiu v1, v1, -27792
+// 0x010a0bbc: 0x10a0bbc: addiu v1, v1, -26184
 	ldloc 5
-	ldc.i4 -27792
+	ldc.i4 -26184
 	add
 	stloc 5
-// 0x010a0578: 0x10a0578: cibyl_sysc_arg 0x3
+// 0x010a0bc0: 0x10a0bc0: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x010a057c: 0x10a057c: cibyl_sysc_arg 0x4
+// 0x010a0bc4: 0x10a0bc4: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010a0580: 0x10a0580: cibyl_sysc_arg 0x5
+// 0x010a0bc8: 0x10a0bc8: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010a0584: 0x10a0584: cibyl_sysc 0x216f
+// 0x010a0bcc: 0x10a0bcc: cibyl_sysc 0x216f
 	call void [WazeWP7]Syscalls::NOPH_SignInUpDialogs_showWelcomeDialog(int32,int32,int32)
-// 0x010a0588: 0x10a0588: addu  v1, v0, zero
+// 0x010a0bd0: 0x10a0bd0: addu  v1, v0, zero
 	ldloc 4
 	stloc 5
-// 0x010a058c: 0x10a058c: addiu v1, zero, 1
+// 0x010a0bd4: 0x10a0bd4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a0590: 0x10a0590: lui   v0, 0x80000
+// 0x010a0bd8: 0x10a0bd8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x010a0594: 0x10a0594: sw    v1, 10024(v0)
+// 0x010a0bdc: 0x10a0bdc: sw    v1, 10488(v0)
 	ldloc 8
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldloc 5
 	stelem.i4
-L_10a0598:
-// 0x010a0598: 0x10a0598: jr    ra sll   zero, zero, 0
+L_10a0be0:
+// 0x010a0be0: 0x10a0be0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
diff --git a/converted/Cibyl12.j b/converted/Cibyl12.j
index 987b3c5..7aad740 100644
--- a/converted/Cibyl12.j
+++ b/converted/Cibyl12.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl12::.ctor
 
-.method public static int32 roadmap_layer_initialize_101098c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_layer_initialize_101099c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101098c: 0x101098c: addiu sp, sp, -40
+// 0x0101099c: 0x101099c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01010990: 0x1010990: sw    s1, 32(sp)
+// 0x010109a0: 0x10109a0: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -96,20 +96,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01010994: 0x1010994: lui   s1, 0xe0000
+// 0x010109a4: 0x10109a4: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x01010998: 0x1010998: lw    v0, 29728(s1)
+// 0x010109a8: 0x10109a8: lw    v0, 30192(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101099c: 0x101099c: sw    ra, 36(sp)
-// 0x010109a0: 0x10109a0: bne   v0, zero, 0x1010a38 sw    s0, 28(sp)
+// 0x010109ac: 0x10109ac: sw    ra, 36(sp)
+// 0x010109b0: 0x10109b0: bne   v0, zero, 0x1010a48 sw    s0, 28(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -119,23 +119,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1010a38
+	brtrue L_1010a48
 // --- basic block ---
-// 0x010109a8: 0x10109a8: addiu v1, zero, 20
+// 0x010109b8: 0x10109b8: addiu v1, zero, 20
 	ldc.i4.s 20
 	stloc 7
-// 0x010109ac: 0x10109ac: addiu a0, zero, 4032
+// 0x010109bc: 0x10109bc: addiu a0, zero, 4032
 	ldc.i4 4032
 	stloc.1
-// 0x010109b0: 0x10109b0: lui   v0, 0x30000
+// 0x010109c0: 0x10109c0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010109b4: 0x10109b4: jal   0x1000910 sw    v1, -30632(v0)
+// 0x010109c4: 0x10109c4: jal   0x1000910 sw    v1, -30168(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7658
+	ldc.i4 -7542
 	add
 	ldloc 7
 	stelem.i4
@@ -149,16 +149,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010109bc: 0x10109bc: addu  a0, v0, zero
+// 0x010109cc: 0x10109cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010109c0: 0x10109c0: addu  a1, zero, zero
+// 0x010109d0: 0x10109d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010109c4: 0x10109c4: addiu a2, zero, 4032
+// 0x010109d4: 0x10109d4: addiu a2, zero, 4032
 	ldc.i4 4032
 	stloc.3
-// 0x010109c8: 0x10109c8: jal   0x100177c addu  s0, v0, zero
+// 0x010109d8: 0x10109d8: jal   0x100177c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -170,26 +170,26 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010109d0: 0x10109d0: lui   a0, 0x0
+// 0x010109e0: 0x10109e0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010109d4: 0x10109d4: addiu a0, a0, 27360
+// 0x010109e4: 0x10109e4: addiu a0, a0, 27360
 	ldloc.1
 	ldc.i4 27360
 	add
 	stloc.1
-// 0x010109d8: 0x10109d8: addu  a2, s0, zero
+// 0x010109e8: 0x10109e8: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010109dc: 0x10109dc: addiu a1, zero, 545
+// 0x010109ec: 0x10109ec: addiu a1, zero, 545
 	ldc.i4 545
 	stloc.2
-// 0x010109e0: 0x10109e0: jal   0x1004a38 sw    s0, 29728(s1)
+// 0x010109f0: 0x10109f0: jal   0x1004a48 sw    s0, 30192(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldloc 8
 	stelem.i4
@@ -198,47 +198,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010109e8: 0x10109e8: lui   a0, 0x10000
+// 0x010109f8: 0x10109f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010109ec: 0x10109ec: lui   a1, 0x0
+// 0x010109fc: 0x10109fc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010109f0: 0x10109f0: lui   a3, 0x0
+// 0x01010a00: 0x1010a00: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010109f4: 0x10109f4: lui   v0, 0x20000
+// 0x01010a04: 0x1010a04: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010109f8: 0x10109f8: addiu a0, a0, 12560
+// 0x01010a08: 0x1010a08: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010109fc: 0x10109fc: addiu a1, a1, 1776
+// 0x01010a0c: 0x1010a0c: addiu a1, a1, 1776
 	ldloc.2
 	ldc.i4 1776
 	add
 	stloc.2
-// 0x01010a00: 0x1010a00: addiu a3, a3, 20820
+// 0x01010a10: 0x1010a10: addiu a3, a3, 20820
 	ldloc 4
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01010a04: 0x1010a04: addu  a2, zero, zero
+// 0x01010a14: 0x1010a14: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01010a08: 0x1010a08: addiu v0, v0, 9464
+// 0x01010a18: 0x1010a18: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x01010a0c: 0x1010a0c: sw    v0, 16(sp)
+// 0x01010a1c: 0x1010a1c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -247,7 +247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01010a10: 0x1010a10: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01010a20: 0x1010a20: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -261,57 +261,57 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010a18: 0x1010a18: jal   0x1010314 sll   zero, zero, 0
+// 0x01010a28: 0x1010a28: jal   0x1010324 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_reload_internal_1010314(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_reload_internal_1010324(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010a20: 0x1010a20: lui   a0, 0x1010000
+// 0x01010a30: 0x1010a30: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01010a24: 0x1010a24: jal   0x1014064 addiu a0, a0, 716
+// 0x01010a34: 0x1010a34: jal   0x1014074 addiu a0, a0, 732
 	ldloc.1
-	ldc.i4 716
+	ldc.i4 732
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010a2c: 0x1010a2c: lui   a0, 0x1010000
+// 0x01010a3c: 0x1010a3c: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01010a30: 0x1010a30: jal   0x1014064 addiu a0, a0, 3396
+// 0x01010a40: 0x1010a40: jal   0x1014074 addiu a0, a0, 3412
 	ldloc.1
-	ldc.i4 3396
+	ldc.i4 3412
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1010a38:
-// 0x01010a38: 0x1010a38: lw    ra, 36(sp)
-// 0x01010a3c: 0x1010a3c: lw    s1, 32(sp)
+L_1010a48:
+// 0x01010a48: 0x1010a48: lw    ra, 36(sp)
+// 0x01010a4c: 0x1010a4c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -320,7 +320,7 @@ L_1010a38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01010a40: 0x1010a40: lw    s0, 28(sp)
+// 0x01010a50: 0x1010a50: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -329,7 +329,7 @@ L_1010a38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01010a44: 0x1010a44: jr    ra addiu sp, sp, 40
+// 0x01010a54: 0x1010a54: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -341,7 +341,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 lo,int32 s5,int32 s6,int32 s8,int32 s7,int32 ra)
@@ -406,12 +406,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010a4c: 0x1010a4c: addiu sp, sp, -72
+// 0x01010a5c: 0x1010a5c: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01010a50: 0x1010a50: sw    s0, 32(sp)
+// 0x01010a60: 0x1010a60: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -420,10 +420,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01010a54: 0x1010a54: lui   s0, 0x0
+// 0x01010a64: 0x1010a64: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01010a58: 0x1010a58: sw    s1, 36(sp)
+// 0x01010a68: 0x1010a68: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -432,7 +432,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01010a5c: 0x1010a5c: lw    s1, 1796(s0)
+// 0x01010a6c: 0x1010a6c: lw    s1, 1796(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -441,8 +441,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01010a60: 0x1010a60: sw    ra, 68(sp)
-// 0x01010a64: 0x1010a64: sw    s8, 64(sp)
+// 0x01010a70: 0x1010a70: sw    ra, 68(sp)
+// 0x01010a74: 0x1010a74: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -451,7 +451,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01010a68: 0x1010a68: sw    s7, 60(sp)
+// 0x01010a78: 0x1010a78: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -460,7 +460,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01010a6c: 0x1010a6c: sw    s6, 56(sp)
+// 0x01010a7c: 0x1010a7c: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -469,7 +469,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01010a70: 0x1010a70: sw    s5, 52(sp)
+// 0x01010a80: 0x1010a80: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -478,7 +478,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01010a74: 0x1010a74: sw    s4, 48(sp)
+// 0x01010a84: 0x1010a84: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -487,7 +487,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01010a78: 0x1010a78: sw    s3, 44(sp)
+// 0x01010a88: 0x1010a88: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -496,7 +496,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01010a7c: 0x1010a7c: jal   0x1007a5c sw    s2, 40(sp)
+// 0x01010a8c: 0x1010a8c: jal   0x1007a6c sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -505,55 +505,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_get_zoom_1007a5c()
+	call int32 Cibyl5::roadmap_math_get_zoom_1007a6c()
 	stloc 6
 // --- basic block ---
-// 0x01010a84: 0x1010a84: beq   s1, v0, 0x1010d14 lui   s1, 0x30000
+// 0x01010a94: 0x1010a94: beq   s1, v0, 0x1010d24 lui   s1, 0x30000
 	ldloc 9
 	ldloc 6
 	ldc.i4 196608
 	stloc 9
-	beq  L_1010d14
+	beq  L_1010d24
 // --- basic block ---
-// 0x01010a8c: 0x1010a8c: lw    v0, -30632(s1)
+// 0x01010a9c: 0x1010a9c: lw    v0, -30168(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7658
+	ldc.i4 -7542
 	add
 	ldelem.i4
 	stloc 6
-// 0x01010a90: 0x1010a90: sll   zero, zero, 0
-// 0x01010a94: 0x1010a94: beq   v0, zero, 0x1010d14 sll   zero, zero, 0
+// 0x01010aa0: 0x1010aa0: sll   zero, zero, 0
+// 0x01010aa4: 0x1010aa4: beq   v0, zero, 0x1010d24 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1010d14
+	brfalse L_1010d24
 // --- basic block ---
-// 0x01010a9c: 0x1010a9c: jal   0x1007a5c addiu s3, zero, 192
+// 0x01010aac: 0x1010aac: jal   0x1007a6c addiu s3, zero, 192
 	ldc.i4 192
 	stloc 10
-	call int32 Cibyl5::roadmap_math_get_zoom_1007a5c()
+	call int32 Cibyl5::roadmap_math_get_zoom_1007a6c()
 	stloc 6
 // --- basic block ---
-// 0x01010aa4: 0x1010aa4: lw    s2, -30632(s1)
+// 0x01010ab4: 0x1010ab4: lw    s2, -30168(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7658
+	ldc.i4 -7542
 	add
 	ldelem.i4
 	stloc 11
-// 0x01010aa8: 0x1010aa8: sll   zero, zero, 0
-// 0x01010aac: 0x1010aac: mult  s2, s3
+// 0x01010ab8: 0x1010ab8: sll   zero, zero, 0
+// 0x01010abc: 0x1010abc: mult  s2, s3
 	ldloc 11
 	ldloc 10
 	mul
 	stloc 13
-// 0x01010ab0: 0x1010ab0: lui   s7, 0xe0000
+// 0x01010ac0: 0x1010ac0: lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 17
-// 0x01010ab4: 0x1010ab4: sw    v0, 1796(s0)
+// 0x01010ac4: 0x1010ac4: sw    v0, 1796(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -562,56 +562,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01010ab8: 0x1010ab8: lui   s8, 0xe0000
+// 0x01010ac8: 0x1010ac8: lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 16
-// 0x01010abc: 0x1010abc: addiu s6, zero, 1
+// 0x01010acc: 0x1010acc: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 15
-// 0x01010ac0: 0x1010ac0: mflo  lo
+// 0x01010ad0: 0x1010ad0: mflo  lo
 	ldloc 13
 	stloc 10
-// 0x01010ac4: 0x1010ac4: j	 0x1010d0c addiu s5, zero, 6
+// 0x01010ad4: 0x1010ad4: j	 0x1010d1c addiu s5, zero, 6
 	ldc.i4.6
 	stloc 14
-	br L_1010d0c
+	br L_1010d1c
 // --- basic block ---
-L_1010acc:
-// 0x01010acc: 0x1010acc: lw    s0, 29728(s8)
+L_1010adc:
+// 0x01010adc: 0x1010adc: lw    s0, 30192(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 8
-// 0x01010ad0: 0x1010ad0: sll   zero, zero, 0
-// 0x01010ad4: 0x1010ad4: addu  s0, s0, s3
+// 0x01010ae0: 0x1010ae0: sll   zero, zero, 0
+// 0x01010ae4: 0x1010ae4: addu  s0, s0, s3
 	ldloc 8
 	ldloc 10
 	add
 	stloc 8
-// 0x01010ad8: 0x1010ad8: addu  s4, s0, zero
+// 0x01010ae8: 0x1010ae8: addu  s4, s0, zero
 	ldloc 8
 	stloc 12
-L_1010adc:
-// 0x01010adc: 0x1010adc: lw    v0, 29728(s8)
+L_1010aec:
+// 0x01010aec: 0x1010aec: lw    v0, 30192(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 6
-// 0x01010ae0: 0x1010ae0: sll   zero, zero, 0
-// 0x01010ae4: 0x1010ae4: addu  v0, v0, s3
+// 0x01010af0: 0x1010af0: sll   zero, zero, 0
+// 0x01010af4: 0x1010af4: addu  v0, v0, s3
 	ldloc 6
 	ldloc 10
 	add
 	stloc 6
-// 0x01010ae8: 0x1010ae8: lw    v1, 8(v0)
+// 0x01010af8: 0x1010af8: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -620,20 +620,20 @@ L_1010adc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010aec: 0x1010aec: sll   zero, zero, 0
-// 0x01010af0: 0x1010af0: beq   v1, zero, 0x1010cf8 sll   zero, zero, 0
+// 0x01010afc: 0x1010afc: sll   zero, zero, 0
+// 0x01010b00: 0x1010b00: beq   v1, zero, 0x1010d08 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1010cf8
+	brfalse L_1010d08
 // --- basic block ---
-// 0x01010af8: 0x1010af8: lui   v1, 0xe0000
+// 0x01010b08: 0x1010b08: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01010afc: 0x1010afc: addiu v1, v1, 29604
+// 0x01010b0c: 0x1010b0c: addiu v1, v1, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x01010b00: 0x1010b00: lw    a0, 120(v1)
+// 0x01010b10: 0x1010b10: lw    a0, 120(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -642,16 +642,16 @@ L_1010adc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010b04: 0x1010b04: lw    a1, 29604(s7)
+// 0x01010b14: 0x1010b14: lw    a1, 30068(s7)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.2
-// 0x01010b08: 0x1010b08: lw    v1, 16(v0)
+// 0x01010b18: 0x1010b18: lw    v1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -660,72 +660,72 @@ L_1010adc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010b0c: 0x1010b0c: bne   a0, zero, 0x1010b2c addiu v0, zero, 1
+// 0x01010b1c: 0x1010b1c: bne   a0, zero, 0x1010b3c addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 6
-	brtrue L_1010b2c
+	brtrue L_1010b3c
 // --- basic block ---
-// 0x01010b14: 0x1010b14: j	 0x1010b48 slt   v1, a1, v1
+// 0x01010b24: 0x1010b24: j	 0x1010b58 slt   v1, a1, v1
 	ldloc.2
 	ldloc 7
 	clt
 	stloc 7
-	br L_1010b48
+	br L_1010b58
 // --- basic block ---
-L_1010b1c:
-// 0x01010b1c: 0x1010b1c: addiu a2, zero, 3
+L_1010b2c:
+// 0x01010b2c: 0x1010b2c: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x01010b20: 0x1010b20: div   a0, a2
+// 0x01010b30: 0x1010b30: div   a0, a2
 	ldloc.1
 	ldloc.3
 	div
 	stloc 13
-// 0x01010b24: 0x1010b24: addiu v0, v0, 1
+// 0x01010b34: 0x1010b34: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01010b28: 0x1010b28: mflo  lo
+// 0x01010b38: 0x1010b38: mflo  lo
 	ldloc 13
 	stloc.2
-L_1010b2c:
-// 0x01010b2c: 0x1010b2c: slt   a2, s1, v0
+L_1010b3c:
+// 0x01010b3c: 0x1010b3c: slt   a2, s1, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc.3
-// 0x01010b30: 0x1010b30: beq   a2, zero, 0x1010b1c sll   a0, a1, 2
+// 0x01010b40: 0x1010b40: beq   a2, zero, 0x1010b2c sll   a0, a1, 2
 	ldloc.3
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.1
-	brfalse L_1010b1c
+	brfalse L_1010b2c
 // --- basic block ---
-// 0x01010b38: 0x1010b38: bne   v0, s5, 0x1010b44 sll   zero, zero, 0
+// 0x01010b48: 0x1010b48: bne   v0, s5, 0x1010b54 sll   zero, zero, 0
 	ldloc 6
 	ldloc 14
-	bne.un L_1010b44
+	bne.un L_1010b54
 // --- basic block ---
-// 0x01010b40: 0x1010b40: sll   a1, a1, 1
+// 0x01010b50: 0x1010b50: sll   a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	shl
 	stloc.2
-L_1010b44:
-// 0x01010b44: 0x1010b44: slt   v1, a1, v1
+L_1010b54:
+// 0x01010b54: 0x1010b54: slt   v1, a1, v1
 	ldloc.2
 	ldloc 7
 	clt
 	stloc 7
-L_1010b48:
-// 0x01010b48: 0x1010b48: beq   v1, zero, 0x1010cf8 sll   zero, zero, 0
+L_1010b58:
+// 0x01010b58: 0x1010b58: beq   v1, zero, 0x1010d08 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1010cf8
+	brfalse L_1010d08
 // --- basic block ---
-// 0x01010b50: 0x1010b50: lw    a3, 12(s0)
+// 0x01010b60: 0x1010b60: lw    a3, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -734,7 +734,7 @@ L_1010b48:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01010b54: 0x1010b54: lw    a0, 20(s0)
+// 0x01010b64: 0x1010b64: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -743,12 +743,12 @@ L_1010b48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010b58: 0x1010b58: slti  a3, a3, 2
+// 0x01010b68: 0x1010b68: slti  a3, a3, 2
 	ldloc 4
 	ldc.i4.2
 	clt
 	stloc 4
-// 0x01010b5c: 0x1010b5c: lw    a1, 16(s0)
+// 0x01010b6c: 0x1010b6c: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -757,12 +757,12 @@ L_1010b48:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01010b60: 0x1010b60: xori  a3, a3, 1
+// 0x01010b70: 0x1010b70: xori  a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	xor
 	stloc 4
-// 0x01010b64: 0x1010b64: jal   0x100777c addiu a2, s1, 1
+// 0x01010b74: 0x1010b74: jal   0x100778c addiu a2, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -772,44 +772,44 @@ L_1010b48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_thickness_100777c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_thickness_100778c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010b6c: 0x1010b6c: blez  v0, 0x1010be0 addu  v1, v0, zero
+// 0x01010b7c: 0x1010b7c: blez  v0, 0x1010bf0 addu  v1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
 	ldc.i4.s 0
-	ble L_1010be0
+	ble L_1010bf0
 // --- basic block ---
-// 0x01010b74: 0x1010b74: slti  v0, v0, 41
+// 0x01010b84: 0x1010b84: slti  v0, v0, 41
 	ldloc 6
 	ldc.i4.s 41
 	clt
 	stloc 6
-// 0x01010b78: 0x1010b78: bne   v0, zero, 0x1010b88 sll   zero, zero, 0
+// 0x01010b88: 0x1010b88: bne   v0, zero, 0x1010b98 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1010b88
+	brtrue L_1010b98
 // --- basic block ---
-// 0x01010b80: 0x1010b80: j	 0x1010b94 addiu v1, zero, 40
+// 0x01010b90: 0x1010b90: j	 0x1010ba4 addiu v1, zero, 40
 	ldc.i4.s 40
 	stloc 7
-	br L_1010b94
+	br L_1010ba4
 // --- basic block ---
-L_1010b88:
-// 0x01010b88: 0x1010b88: slti  v0, v1, 5
+L_1010b98:
+// 0x01010b98: 0x1010b98: slti  v0, v1, 5
 	ldloc 7
 	ldc.i4.5
 	clt
 	stloc 6
-// 0x01010b8c: 0x1010b8c: bne   v0, zero, 0x1010be0 sll   zero, zero, 0
+// 0x01010b9c: 0x1010b9c: bne   v0, zero, 0x1010bf0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1010be0
+	brtrue L_1010bf0
 // --- basic block ---
-L_1010b94:
-// 0x01010b94: 0x1010b94: lw    a2, 12(s0)
+L_1010ba4:
+// 0x01010ba4: 0x1010ba4: lw    a2, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -818,16 +818,16 @@ L_1010b94:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01010b98: 0x1010b98: addu  a0, s0, zero
+// 0x01010ba8: 0x1010ba8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01010b9c: 0x1010b9c: j	 0x1010bcc addiu v0, zero, 1
+// 0x01010bac: 0x1010bac: j	 0x1010bdc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_1010bcc
+	br L_1010bdc
 // --- basic block ---
-L_1010ba4:
-// 0x01010ba4: 0x1010ba4: lw    a1, 40(a0)
+L_1010bb4:
+// 0x01010bb4: 0x1010bb4: lw    a1, 40(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -836,17 +836,17 @@ L_1010ba4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01010ba8: 0x1010ba8: sll   zero, zero, 0
-// 0x01010bac: 0x1010bac: bgtz  a1, 0x1010be4 addiu v0, v0, 1
+// 0x01010bb8: 0x1010bb8: sll   zero, zero, 0
+// 0x01010bbc: 0x1010bbc: bgtz  a1, 0x1010bf4 addiu v0, v0, 1
 	ldloc.2
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
 	ldc.i4.s 0
-	bgt L_1010be4
+	bgt L_1010bf4
 // --- basic block ---
-// 0x01010bb4: 0x1010bb4: lw    a3, 20(s0)
+// 0x01010bc4: 0x1010bc4: lw    a3, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -855,54 +855,54 @@ L_1010ba4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01010bb8: 0x1010bb8: addiu a0, a0, 4
+// 0x01010bc8: 0x1010bc8: addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x01010bbc: 0x1010bbc: addu  a1, a1, a3
+// 0x01010bcc: 0x1010bcc: addu  a1, a1, a3
 	ldloc.2
 	ldloc 4
 	add
 	stloc.2
-// 0x01010bc0: 0x1010bc0: xori  a1, a1, 1
+// 0x01010bd0: 0x1010bd0: xori  a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	xor
 	stloc.2
-// 0x01010bc4: 0x1010bc4: sltiu a1, a1, 1
+// 0x01010bd4: 0x1010bd4: sltiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x01010bc8: 0x1010bc8: addu  v1, v1, a1
+// 0x01010bd8: 0x1010bd8: addu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-L_1010bcc:
-// 0x01010bcc: 0x1010bcc: slt   a1, v0, a2
+L_1010bdc:
+// 0x01010bdc: 0x1010bdc: slt   a1, v0, a2
 	ldloc 6
 	ldloc.3
 	clt
 	stloc.2
-// 0x01010bd0: 0x1010bd0: bne   a1, zero, 0x1010ba4 sll   zero, zero, 0
+// 0x01010be0: 0x1010be0: bne   a1, zero, 0x1010bb4 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1010ba4
+	brtrue L_1010bb4
 // --- basic block ---
-// 0x01010bd8: 0x1010bd8: j	 0x1010be4 sll   zero, zero, 0
-	br L_1010be4
+// 0x01010be8: 0x1010be8: j	 0x1010bf4 sll   zero, zero, 0
+	br L_1010bf4
 // --- basic block ---
-L_1010be0:
-// 0x01010be0: 0x1010be0: addiu v1, zero, 1
+L_1010bf0:
+// 0x01010bf0: 0x1010bf0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1010be4:
-// 0x01010be4: 0x1010be4: bne   s1, zero, 0x1010c04 sll   zero, zero, 0
+L_1010bf4:
+// 0x01010bf4: 0x1010bf4: bne   s1, zero, 0x1010c14 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_1010c04
+	brtrue L_1010c14
 // --- basic block ---
-// 0x01010bec: 0x1010bec: lw    a2, 12(s0)
+// 0x01010bfc: 0x1010bfc: lw    a2, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -911,13 +911,13 @@ L_1010be4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01010bf0: 0x1010bf0: addu  a1, v1, zero
+// 0x01010c00: 0x1010c00: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01010bf4: 0x1010bf4: addu  a0, s2, zero
+// 0x01010c04: 0x1010c04: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01010bf8: 0x1010bf8: jal   0x10148d0 sw    v1, 28(sp)
+// 0x01010c08: 0x1010c08: jal   0x10148e0 sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -931,12 +931,12 @@ L_1010be4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_adjust_layer_10148d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_adjust_layer_10148e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010c00: 0x1010c00: lw    v1, 28(sp)
+// 0x01010c10: 0x1010c10: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -945,8 +945,8 @@ L_1010be4:
 	add
 	ldelem.i4
 	stloc 7
-L_1010c04:
-// 0x01010c04: 0x1010c04: lw    a0, 48(s4)
+L_1010c14:
+// 0x01010c14: 0x1010c14: lw    a0, 48(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -955,7 +955,7 @@ L_1010c04:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010c08: 0x1010c08: sw    v1, 28(sp)
+// 0x01010c18: 0x1010c18: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -964,7 +964,7 @@ L_1010c04:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01010c0c: 0x1010c0c: jal   0x104e35c sw    s0, 24(sp)
+// 0x01010c1c: 0x1010c1c: jal   0x104e36c sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -978,12 +978,12 @@ L_1010c04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010c14: 0x1010c14: lw    v1, 28(sp)
+// 0x01010c24: 0x1010c24: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -992,24 +992,24 @@ L_1010c04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010c18: 0x1010c18: jal   0x104dd5c addu  a0, v1, zero
+// 0x01010c28: 0x1010c28: jal   0x104dd6c addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010c20: 0x1010c20: addiu v0, zero, 12
+// 0x01010c30: 0x1010c30: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 6
-// 0x01010c24: 0x1010c24: mult  s1, v0
+// 0x01010c34: 0x1010c34: mult  s1, v0
 	ldloc 9
 	ldloc 6
 	mul
 	stloc 13
-// 0x01010c28: 0x1010c28: sw    s6, 120(s4)
+// 0x01010c38: 0x1010c38: sw    s6, 120(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -1018,10 +1018,10 @@ L_1010c04:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01010c2c: 0x1010c2c: addiu a2, zero, 1
+// 0x01010c3c: 0x1010c3c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01010c30: 0x1010c30: lw    v1, 28(sp)
+// 0x01010c40: 0x1010c40: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1030,7 +1030,7 @@ L_1010c04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010c34: 0x1010c34: lw    a3, 24(sp)
+// 0x01010c44: 0x1010c44: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1039,27 +1039,27 @@ L_1010c04:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01010c38: 0x1010c38: mflo  lo
+// 0x01010c48: 0x1010c48: mflo  lo
 	ldloc 13
 	stloc.2
-// 0x01010c3c: 0x1010c3c: addiu a1, a1, 124
+// 0x01010c4c: 0x1010c4c: addiu a1, a1, 124
 	ldloc.2
 	ldc.i4.s 124
 	add
 	stloc.2
-// 0x01010c40: 0x1010c40: j	 0x1010ce4 addu  a1, s0, a1
+// 0x01010c50: 0x1010c50: j	 0x1010cf4 addu  a1, s0, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc.2
-	br L_1010ce4
+	br L_1010cf4
 // --- basic block ---
-L_1010c48:
-// 0x01010c48: 0x1010c48: bne   v0, zero, 0x1010c98 sll   zero, zero, 0
+L_1010c58:
+// 0x01010c58: 0x1010c58: bne   v0, zero, 0x1010ca8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1010c98
+	brtrue L_1010ca8
 // --- basic block ---
-// 0x01010c50: 0x1010c50: lw    v0, 40(a3)
+// 0x01010c60: 0x1010c60: lw    v0, 40(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -1068,74 +1068,74 @@ L_1010c48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01010c54: 0x1010c54: sll   zero, zero, 0
-// 0x01010c58: 0x1010c58: bgez  v0, 0x1010c68 sll   zero, zero, 0
+// 0x01010c64: 0x1010c64: sll   zero, zero, 0
+// 0x01010c68: 0x1010c68: bgez  v0, 0x1010c78 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_1010c68
+	bge L_1010c78
 // --- basic block ---
-// 0x01010c60: 0x1010c60: j	 0x1010c90 addu  v1, v1, v0
+// 0x01010c70: 0x1010c70: j	 0x1010ca0 addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-	br L_1010c90
+	br L_1010ca0
 // --- basic block ---
-L_1010c68:
-// 0x01010c68: 0x1010c68: sra   v1, v1, 1
+L_1010c78:
+// 0x01010c78: 0x1010c78: sra   v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	shr
 	stloc 7
-// 0x01010c6c: 0x1010c6c: slt   a0, v0, v1
+// 0x01010c7c: 0x1010c7c: slt   a0, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc.1
-// 0x01010c70: 0x1010c70: bne   a0, zero, 0x1010c90 addu  v1, v0, zero
+// 0x01010c80: 0x1010c80: bne   a0, zero, 0x1010ca0 addu  v1, v0, zero
 	ldloc.1
 	ldloc 6
 	stloc 7
-	brtrue L_1010c90
+	brtrue L_1010ca0
 // --- basic block ---
-// 0x01010c78: 0x1010c78: addiu v0, zero, 2
+// 0x01010c88: 0x1010c88: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01010c7c: 0x1010c7c: beq   a2, v0, 0x1010ca0 sll   zero, zero, 0
+// 0x01010c8c: 0x1010c8c: beq   a2, v0, 0x1010cb0 sll   zero, zero, 0
 	ldloc.3
 	ldloc 6
-	beq  L_1010ca0
+	beq  L_1010cb0
 // --- basic block ---
-// 0x01010c84: 0x1010c84: sw    zero, 0(a1)
+// 0x01010c94: 0x1010c94: sw    zero, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01010c88: 0x1010c88: j	 0x1010cd8 addiu v1, zero, 1
+// 0x01010c98: 0x1010c98: j	 0x1010ce8 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1010cd8
+	br L_1010ce8
 // --- basic block ---
-L_1010c90:
-// 0x01010c90: 0x1010c90: bgtz  v1, 0x1010ca0 sll   zero, zero, 0
+L_1010ca0:
+// 0x01010ca0: 0x1010ca0: bgtz  v1, 0x1010cb0 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bgt L_1010ca0
+	bgt L_1010cb0
 // --- basic block ---
-L_1010c98:
-// 0x01010c98: 0x1010c98: j	 0x1010cd8 sw    zero, 0(a1)
+L_1010ca8:
+// 0x01010ca8: 0x1010ca8: j	 0x1010ce8 sw    zero, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_1010cd8
+	br L_1010ce8
 // --- basic block ---
-L_1010ca0:
-// 0x01010ca0: 0x1010ca0: lw    a0, -72(a1)
+L_1010cb0:
+// 0x01010cb0: 0x1010cb0: lw    a0, -72(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -1144,7 +1144,7 @@ L_1010ca0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01010ca4: 0x1010ca4: sw    a1, 20(sp)
+// 0x01010cb4: 0x1010cb4: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1153,7 +1153,7 @@ L_1010ca0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01010ca8: 0x1010ca8: sw    a2, 16(sp)
+// 0x01010cb8: 0x1010cb8: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1162,7 +1162,7 @@ L_1010ca0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01010cac: 0x1010cac: sw    a3, 24(sp)
+// 0x01010cbc: 0x1010cbc: sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1171,7 +1171,7 @@ L_1010ca0:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01010cb0: 0x1010cb0: jal   0x104e35c sw    v1, 28(sp)
+// 0x01010cc0: 0x1010cc0: jal   0x104e36c sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1185,12 +1185,12 @@ L_1010ca0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010cb8: 0x1010cb8: lw    v1, 28(sp)
+// 0x01010cc8: 0x1010cc8: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1199,16 +1199,16 @@ L_1010ca0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010cbc: 0x1010cbc: jal   0x104dd5c addu  a0, v1, zero
+// 0x01010ccc: 0x1010ccc: jal   0x104dd6c addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010cc4: 0x1010cc4: lw    a1, 20(sp)
+// 0x01010cd4: 0x1010cd4: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1217,7 +1217,7 @@ L_1010ca0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01010cc8: 0x1010cc8: lw    a3, 24(sp)
+// 0x01010cd8: 0x1010cd8: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1226,7 +1226,7 @@ L_1010ca0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01010ccc: 0x1010ccc: lw    a2, 16(sp)
+// 0x01010cdc: 0x1010cdc: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1235,7 +1235,7 @@ L_1010ca0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01010cd0: 0x1010cd0: lw    v1, 28(sp)
+// 0x01010ce0: 0x1010ce0: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1244,31 +1244,31 @@ L_1010ca0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010cd4: 0x1010cd4: sw    s6, 0(a1)
+// 0x01010ce4: 0x1010ce4: sw    s6, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 15
 	stelem.i4
-L_1010cd8:
-// 0x01010cd8: 0x1010cd8: addiu a2, a2, 1
+L_1010ce8:
+// 0x01010ce8: 0x1010ce8: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01010cdc: 0x1010cdc: addiu a1, a1, 4
+// 0x01010cec: 0x1010cec: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01010ce0: 0x1010ce0: addiu a3, a3, 4
+// 0x01010cf0: 0x1010cf0: addiu a3, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-L_1010ce4:
-// 0x01010ce4: 0x1010ce4: lw    v0, 12(s0)
+L_1010cf4:
+// 0x01010cf4: 0x1010cf4: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1277,56 +1277,56 @@ L_1010ce4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01010ce8: 0x1010ce8: sll   zero, zero, 0
-// 0x01010cec: 0x1010cec: slt   v0, a2, v0
+// 0x01010cf8: 0x1010cf8: sll   zero, zero, 0
+// 0x01010cfc: 0x1010cfc: slt   v0, a2, v0
 	ldloc.3
 	ldloc 6
 	clt
 	stloc 6
-// 0x01010cf0: 0x1010cf0: bne   v0, zero, 0x1010c48 slti  v0, v1, 2
+// 0x01010d00: 0x1010d00: bne   v0, zero, 0x1010c58 slti  v0, v1, 2
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	clt
 	stloc 6
-	brtrue L_1010c48
+	brtrue L_1010c58
 // --- basic block ---
-L_1010cf8:
-// 0x01010cf8: 0x1010cf8: addiu s1, s1, 1
+L_1010d08:
+// 0x01010d08: 0x1010d08: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01010cfc: 0x1010cfc: bne   s1, s5, 0x1010adc addiu s4, s4, 12
+// 0x01010d0c: 0x1010d0c: bne   s1, s5, 0x1010aec addiu s4, s4, 12
 	ldloc 9
 	ldloc 14
 	ldloc 12
 	ldc.i4.s 12
 	add
 	stloc 12
-	bne.un L_1010adc
+	bne.un L_1010aec
 // --- basic block ---
-// 0x01010d04: 0x1010d04: addiu s2, s2, -1
+// 0x01010d14: 0x1010d14: addiu s2, s2, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-// 0x01010d08: 0x1010d08: addiu s3, s3, -192
+// 0x01010d18: 0x1010d18: addiu s3, s3, -192
 	ldloc 10
 	ldc.i4 -192
 	add
 	stloc 10
-L_1010d0c:
-// 0x01010d0c: 0x1010d0c: bgtz  s2, 0x1010acc addu  s1, zero, zero
+L_1010d1c:
+// 0x01010d1c: 0x1010d1c: bgtz  s2, 0x1010adc addu  s1, zero, zero
 	ldloc 11
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	bgt L_1010acc
+	bgt L_1010adc
 // --- basic block ---
-L_1010d14:
-// 0x01010d14: 0x1010d14: lw    ra, 68(sp)
-// 0x01010d18: 0x1010d18: lw    s8, 64(sp)
+L_1010d24:
+// 0x01010d24: 0x1010d24: lw    ra, 68(sp)
+// 0x01010d28: 0x1010d28: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1335,7 +1335,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01010d1c: 0x1010d1c: lw    s7, 60(sp)
+// 0x01010d2c: 0x1010d2c: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1344,7 +1344,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01010d20: 0x1010d20: lw    s6, 56(sp)
+// 0x01010d30: 0x1010d30: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1353,7 +1353,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01010d24: 0x1010d24: lw    s5, 52(sp)
+// 0x01010d34: 0x1010d34: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1362,7 +1362,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01010d28: 0x1010d28: lw    s4, 48(sp)
+// 0x01010d38: 0x1010d38: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1371,7 +1371,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01010d2c: 0x1010d2c: lw    s3, 44(sp)
+// 0x01010d3c: 0x1010d3c: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1380,7 +1380,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01010d30: 0x1010d30: lw    s2, 40(sp)
+// 0x01010d40: 0x1010d40: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1389,7 +1389,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01010d34: 0x1010d34: lw    s1, 36(sp)
+// 0x01010d44: 0x1010d44: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1398,7 +1398,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01010d38: 0x1010d38: lw    s0, 32(sp)
+// 0x01010d48: 0x1010d48: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1407,7 +1407,7 @@ L_1010d14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01010d3c: 0x1010d3c: jr    ra addiu sp, sp, 72
+// 0x01010d4c: 0x1010d4c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1419,7 +1419,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_layer_reload_1010d44(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_layer_reload_1010d54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -1454,37 +1454,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010d44: 0x1010d44: addiu sp, sp, -24
+// 0x01010d54: 0x1010d54: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01010d48: 0x1010d48: sw    ra, 20(sp)
-// 0x01010d4c: 0x1010d4c: jal   0x1010314 sll   zero, zero, 0
+// 0x01010d58: 0x1010d58: sw    ra, 20(sp)
+// 0x01010d5c: 0x1010d5c: jal   0x1010324 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_reload_internal_1010314(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_reload_internal_1010324(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010d54: 0x1010d54: jal   0x1010a4c sll   zero, zero, 0
+// 0x01010d64: 0x1010d64: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01010d5c: 0x1010d5c: lw    ra, 20(sp)
-// 0x01010d60: 0x1010d60: sll   zero, zero, 0
-// 0x01010d64: 0x1010d64: jr    ra addiu sp, sp, 24
+// 0x01010d6c: 0x1010d6c: lw    ra, 20(sp)
+// 0x01010d70: 0x1010d70: sll   zero, zero, 0
+// 0x01010d74: 0x1010d74: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1496,7 +1496,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_street_get_street_t2s_1010d84()
+.method public static int32 roadmap_street_get_street_t2s_1010d94()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1510,12 +1510,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010d84: 0x1010d84: lui   v0, 0x10000
+// 0x01010d94: 0x1010d94: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc.0
-// 0x01010d88: 0x1010d88: jr    ra addiu v0, v0, 18500
+// 0x01010d98: 0x1010d98: jr    ra addiu v0, v0, 18768
 	ldloc.0
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -1523,7 +1523,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_street_get_street_range_1010d9c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_range_1010dac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1558,38 +1558,38 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01010d9c: 0x1010d9c: addiu sp, sp, -32
+// 0x01010dac: 0x1010dac: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01010da0: 0x1010da0: addiu v1, zero, 1
+// 0x01010db0: 0x1010db0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01010da4: 0x1010da4: sw    ra, 28(sp)
-// 0x01010da8: 0x1010da8: bne   a1, v1, 0x1010dc8 addu  v0, a1, zero
+// 0x01010db4: 0x1010db4: sw    ra, 28(sp)
+// 0x01010db8: 0x1010db8: bne   a1, v1, 0x1010dd8 addu  v0, a1, zero
 	ldloc.2
 	ldloc 7
 	ldloc.2
 	stloc 5
-	bne.un L_1010dc8
+	bne.un L_1010dd8
 // --- basic block ---
-// 0x01010db0: 0x1010db0: lw    v0, 0(a0)
+// 0x01010dc0: 0x1010dc0: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01010db4: 0x1010db4: sll   zero, zero, 0
-// 0x01010db8: 0x1010db8: sw    v0, 0(a2)
+// 0x01010dc4: 0x1010dc4: sll   zero, zero, 0
+// 0x01010dc8: 0x1010dc8: sw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01010dbc: 0x1010dbc: lw    v0, 4(a0)
+// 0x01010dcc: 0x1010dcc: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1598,27 +1598,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010dc0: 0x1010dc0: j	 0x1010e08 sw    v0, 0(a3)
+// 0x01010dd0: 0x1010dd0: j	 0x1010e18 sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1010e08
+	br L_1010e18
 // --- basic block ---
-L_1010dc8:
-// 0x01010dc8: 0x1010dc8: addiu v1, zero, 2
+L_1010dd8:
+// 0x01010dd8: 0x1010dd8: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01010dcc: 0x1010dcc: bne   a1, v1, 0x1010dec lui   a1, 0x0
+// 0x01010ddc: 0x1010ddc: bne   a1, v1, 0x1010dfc lui   a1, 0x0
 	ldloc.2
 	ldloc 7
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_1010dec
+	bne.un L_1010dfc
 // --- basic block ---
-// 0x01010dd4: 0x1010dd4: lw    v0, 8(a0)
+// 0x01010de4: 0x1010de4: lw    v0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1627,15 +1627,15 @@ L_1010dc8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010dd8: 0x1010dd8: sll   zero, zero, 0
-// 0x01010ddc: 0x1010ddc: sw    v0, 0(a2)
+// 0x01010de8: 0x1010de8: sll   zero, zero, 0
+// 0x01010dec: 0x1010dec: sw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01010de0: 0x1010de0: lw    v0, 12(a0)
+// 0x01010df0: 0x1010df0: lw    v0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1644,36 +1644,36 @@ L_1010dc8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010de4: 0x1010de4: j	 0x1010e08 sw    v0, 0(a3)
+// 0x01010df4: 0x1010df4: j	 0x1010e18 sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1010e08
+	br L_1010e18
 // --- basic block ---
-L_1010dec:
-// 0x01010dec: 0x1010dec: lui   a3, 0x0
+L_1010dfc:
+// 0x01010dfc: 0x1010dfc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01010df0: 0x1010df0: addiu a1, a1, 27620
+// 0x01010e00: 0x1010e00: addiu a1, a1, 27620
 	ldloc.2
 	ldc.i4 27620
 	add
 	stloc.2
-// 0x01010df4: 0x1010df4: addiu a3, a3, 27648
+// 0x01010e04: 0x1010e04: addiu a3, a3, 27648
 	ldloc 4
 	ldc.i4 27648
 	add
 	stloc 4
-// 0x01010df8: 0x1010df8: addiu a0, zero, 4
+// 0x01010e08: 0x1010e08: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01010dfc: 0x1010dfc: addiu a2, zero, 1652
+// 0x01010e0c: 0x1010e0c: addiu a2, zero, 1652
 	ldc.i4 1652
 	stloc.3
-// 0x01010e00: 0x1010e00: jal   0x100449c sw    v0, 16(sp)
+// 0x01010e10: 0x1010e10: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1692,10 +1692,10 @@ L_1010dec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1010e08:
-// 0x01010e08: 0x1010e08: lw    ra, 28(sp)
-// 0x01010e0c: 0x1010e0c: sll   zero, zero, 0
-// 0x01010e10: 0x1010e10: jr    ra addiu sp, sp, 32
+L_1010e18:
+// 0x01010e18: 0x1010e18: lw    ra, 28(sp)
+// 0x01010e1c: 0x1010e1c: sll   zero, zero, 0
+// 0x01010e20: 0x1010e20: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1707,7 +1707,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_unmap_1010e18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_unmap_1010e28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1745,32 +1745,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1010e18:
-// 0x01010e18: 0x1010e18: lui   v0, 0x20000
+L_1010e28:
+// 0x01010e28: 0x1010e28: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01010e1c: 0x1010e1c: lw    v1, 0(a0)
+// 0x01010e2c: 0x1010e2c: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01010e20: 0x1010e20: lw    v0, 24780(v0)
+// 0x01010e30: 0x1010e30: lw    v0, 25244(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6195
+	ldc.i4 6311
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010e24: 0x1010e24: addiu sp, sp, -24
+// 0x01010e34: 0x1010e34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01010e28: 0x1010e28: sw    s0, 16(sp)
+// 0x01010e38: 0x1010e38: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1779,34 +1779,34 @@ L_1010e18:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01010e2c: 0x1010e2c: sw    ra, 20(sp)
-// 0x01010e30: 0x1010e30: beq   v1, v0, 0x1010e54 addu  s0, a0, zero
+// 0x01010e3c: 0x1010e3c: sw    ra, 20(sp)
+// 0x01010e40: 0x1010e40: beq   v1, v0, 0x1010e64 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_1010e54
+	beq  L_1010e64
 // --- basic block ---
-// 0x01010e38: 0x1010e38: lui   a1, 0x0
+// 0x01010e48: 0x1010e48: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01010e3c: 0x1010e3c: lui   a3, 0x0
+// 0x01010e4c: 0x1010e4c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01010e40: 0x1010e40: addiu a1, a1, 27620
+// 0x01010e50: 0x1010e50: addiu a1, a1, 27620
 	ldloc.2
 	ldc.i4 27620
 	add
 	stloc.2
-// 0x01010e44: 0x1010e44: addiu a3, a3, 24632
+// 0x01010e54: 0x1010e54: addiu a3, a3, 24632
 	ldloc 4
 	ldc.i4 24632
 	add
 	stloc 4
-// 0x01010e48: 0x1010e48: addiu a0, zero, 5
+// 0x01010e58: 0x1010e58: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01010e4c: 0x1010e4c: jal   0x100449c addiu a2, zero, 178
+// 0x01010e5c: 0x1010e5c: jal   0x100449c addiu a2, zero, 178
 	ldc.i4 178
 	stloc.3
 	ldloc.0
@@ -1819,36 +1819,36 @@ L_1010e18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1010e54:
-// 0x01010e54: 0x1010e54: lui   v0, 0x30000
+L_1010e64:
+// 0x01010e64: 0x1010e64: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01010e58: 0x1010e58: lw    v1, -30624(v0)
+// 0x01010e68: 0x1010e68: lw    v1, -30160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 7
-// 0x01010e5c: 0x1010e5c: sll   zero, zero, 0
-// 0x01010e60: 0x1010e60: bne   v1, s0, 0x1010e6c sll   zero, zero, 0
+// 0x01010e6c: 0x1010e6c: sll   zero, zero, 0
+// 0x01010e70: 0x1010e70: bne   v1, s0, 0x1010e7c sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1010e6c
+	bne.un L_1010e7c
 // --- basic block ---
-// 0x01010e68: 0x1010e68: sw    zero, -30624(v0)
+// 0x01010e78: 0x1010e78: sw    zero, -30160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1010e6c:
-// 0x01010e6c: 0x1010e6c: jal   0x1000930 addu  a0, s0, zero
+L_1010e7c:
+// 0x01010e7c: 0x1010e7c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1861,8 +1861,8 @@ L_1010e6c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01010e74: 0x1010e74: lw    ra, 20(sp)
-// 0x01010e78: 0x1010e78: lw    s0, 16(sp)
+// 0x01010e84: 0x1010e84: lw    ra, 20(sp)
+// 0x01010e88: 0x1010e88: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1871,7 +1871,7 @@ L_1010e6c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01010e7c: 0x1010e7c: jr    ra addiu sp, sp, 24
+// 0x01010e8c: 0x1010e8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1883,7 +1883,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_activate_1010e84(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_activate_1010e94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1921,13 +1921,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1010e84:
-// 0x01010e84: 0x1010e84: addiu sp, sp, -24
+L_1010e94:
+// 0x01010e94: 0x1010e94: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01010e88: 0x1010e88: sw    s0, 16(sp)
+// 0x01010e98: 0x1010e98: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1936,57 +1936,57 @@ L_1010e84:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01010e8c: 0x1010e8c: sw    ra, 20(sp)
-// 0x01010e90: 0x1010e90: beq   a0, zero, 0x1010ec8 addu  s0, a0, zero
+// 0x01010e9c: 0x1010e9c: sw    ra, 20(sp)
+// 0x01010ea0: 0x1010ea0: beq   a0, zero, 0x1010ed8 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1010ec8
+	brfalse L_1010ed8
 // --- basic block ---
-// 0x01010e98: 0x1010e98: lui   v0, 0x20000
+// 0x01010ea8: 0x1010ea8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01010e9c: 0x1010e9c: lw    v1, 0(a0)
+// 0x01010eac: 0x1010eac: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01010ea0: 0x1010ea0: lw    v0, 24780(v0)
+// 0x01010eb0: 0x1010eb0: lw    v0, 25244(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6195
+	ldc.i4 6311
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010ea4: 0x1010ea4: sll   zero, zero, 0
-// 0x01010ea8: 0x1010ea8: beq   v1, v0, 0x1010ec8 lui   a1, 0x0
+// 0x01010eb4: 0x1010eb4: sll   zero, zero, 0
+// 0x01010eb8: 0x1010eb8: beq   v1, v0, 0x1010ed8 lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_1010ec8
+	beq  L_1010ed8
 // --- basic block ---
-// 0x01010eb0: 0x1010eb0: lui   a3, 0x0
+// 0x01010ec0: 0x1010ec0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01010eb4: 0x1010eb4: addiu a1, a1, 27620
+// 0x01010ec4: 0x1010ec4: addiu a1, a1, 27620
 	ldloc.2
 	ldc.i4 27620
 	add
 	stloc.2
-// 0x01010eb8: 0x1010eb8: addiu a3, a3, 27676
+// 0x01010ec8: 0x1010ec8: addiu a3, a3, 27676
 	ldloc 4
 	ldc.i4 27676
 	add
 	stloc 4
-// 0x01010ebc: 0x1010ebc: addiu a0, zero, 5
+// 0x01010ecc: 0x1010ecc: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01010ec0: 0x1010ec0: jal   0x100449c addiu a2, zero, 141
+// 0x01010ed0: 0x1010ed0: jal   0x100449c addiu a2, zero, 141
 	ldc.i4 141
 	stloc.3
 	ldloc.0
@@ -1999,8 +1999,8 @@ L_1010e84:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1010ec8:
-// 0x01010ec8: 0x1010ec8: lw    v0, 24(s0)
+L_1010ed8:
+// 0x01010ed8: 0x1010ed8: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2009,17 +2009,17 @@ L_1010ec8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010ecc: 0x1010ecc: sll   zero, zero, 0
-// 0x01010ed0: 0x1010ed0: bne   v0, zero, 0x1010ee8 sll   zero, zero, 0
+// 0x01010edc: 0x1010edc: sll   zero, zero, 0
+// 0x01010ee0: 0x1010ee0: bne   v0, zero, 0x1010ef8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010ee8
+	brtrue L_1010ef8
 // --- basic block ---
-// 0x01010ed8: 0x1010ed8: lui   a0, 0x10000
+// 0x01010ee8: 0x1010ee8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01010edc: 0x1010edc: jal   0x1006ba0 addiu a0, a0, 2844
+// 0x01010eec: 0x1010eec: jal   0x1006bb0 addiu a0, a0, 2840
 	ldloc.1
-	ldc.i4 2844
+	ldc.i4 2840
 	add
 	stloc.1
 	ldloc.0
@@ -2027,12 +2027,12 @@ L_1010ec8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01010ee4: 0x1010ee4: sw    v0, 24(s0)
+// 0x01010ef4: 0x1010ef4: sw    v0, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2041,8 +2041,8 @@ L_1010ec8:
 	add
 	ldloc 5
 	stelem.i4
-L_1010ee8:
-// 0x01010ee8: 0x1010ee8: lw    v0, 28(s0)
+L_1010ef8:
+// 0x01010ef8: 0x1010ef8: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2051,17 +2051,17 @@ L_1010ee8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010eec: 0x1010eec: sll   zero, zero, 0
-// 0x01010ef0: 0x1010ef0: bne   v0, zero, 0x1010f08 sll   zero, zero, 0
+// 0x01010efc: 0x1010efc: sll   zero, zero, 0
+// 0x01010f00: 0x1010f00: bne   v0, zero, 0x1010f18 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010f08
+	brtrue L_1010f18
 // --- basic block ---
-// 0x01010ef8: 0x1010ef8: lui   a0, 0x10000
+// 0x01010f08: 0x1010f08: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01010efc: 0x1010efc: jal   0x1006ba0 addiu a0, a0, 13528
+// 0x01010f0c: 0x1010f0c: jal   0x1006bb0 addiu a0, a0, 13524
 	ldloc.1
-	ldc.i4 13528
+	ldc.i4 13524
 	add
 	stloc.1
 	ldloc.0
@@ -2069,12 +2069,12 @@ L_1010ee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01010f04: 0x1010f04: sw    v0, 28(s0)
+// 0x01010f14: 0x1010f14: sw    v0, 28(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2083,8 +2083,8 @@ L_1010ee8:
 	add
 	ldloc 5
 	stelem.i4
-L_1010f08:
-// 0x01010f08: 0x1010f08: lw    v0, 32(s0)
+L_1010f18:
+// 0x01010f18: 0x1010f18: lw    v0, 32(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2093,15 +2093,15 @@ L_1010f08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010f0c: 0x1010f0c: sll   zero, zero, 0
-// 0x01010f10: 0x1010f10: bne   v0, zero, 0x1010f28 sll   zero, zero, 0
+// 0x01010f1c: 0x1010f1c: sll   zero, zero, 0
+// 0x01010f20: 0x1010f20: bne   v0, zero, 0x1010f38 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010f28
+	brtrue L_1010f38
 // --- basic block ---
-// 0x01010f18: 0x1010f18: lui   a0, 0x0
+// 0x01010f28: 0x1010f28: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01010f1c: 0x1010f1c: jal   0x1006ba0 addiu a0, a0, 23732
+// 0x01010f2c: 0x1010f2c: jal   0x1006bb0 addiu a0, a0, 23732
 	ldloc.1
 	ldc.i4 23732
 	add
@@ -2111,12 +2111,12 @@ L_1010f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01010f24: 0x1010f24: sw    v0, 32(s0)
+// 0x01010f34: 0x1010f34: sw    v0, 32(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2125,8 +2125,8 @@ L_1010f08:
 	add
 	ldloc 5
 	stelem.i4
-L_1010f28:
-// 0x01010f28: 0x1010f28: lw    v0, 36(s0)
+L_1010f38:
+// 0x01010f38: 0x1010f38: lw    v0, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2135,17 +2135,17 @@ L_1010f28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010f2c: 0x1010f2c: sll   zero, zero, 0
-// 0x01010f30: 0x1010f30: bne   v0, zero, 0x1010f48 sll   zero, zero, 0
+// 0x01010f3c: 0x1010f3c: sll   zero, zero, 0
+// 0x01010f40: 0x1010f40: bne   v0, zero, 0x1010f58 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010f48
+	brtrue L_1010f58
 // --- basic block ---
-// 0x01010f38: 0x1010f38: lui   a0, 0x20000
+// 0x01010f48: 0x1010f48: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01010f3c: 0x1010f3c: jal   0x1006ba0 addiu a0, a0, -11180
+// 0x01010f4c: 0x1010f4c: jal   0x1006bb0 addiu a0, a0, -10716
 	ldloc.1
-	ldc.i4 -11180
+	ldc.i4 -10716
 	add
 	stloc.1
 	ldloc.0
@@ -2153,12 +2153,12 @@ L_1010f28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01010f44: 0x1010f44: sw    v0, 36(s0)
+// 0x01010f54: 0x1010f54: sw    v0, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2167,8 +2167,8 @@ L_1010f28:
 	add
 	ldloc 5
 	stelem.i4
-L_1010f48:
-// 0x01010f48: 0x1010f48: lw    v0, 40(s0)
+L_1010f58:
+// 0x01010f58: 0x1010f58: lw    v0, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2177,15 +2177,15 @@ L_1010f48:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010f4c: 0x1010f4c: sll   zero, zero, 0
-// 0x01010f50: 0x1010f50: bne   v0, zero, 0x1010f68 sll   zero, zero, 0
+// 0x01010f5c: 0x1010f5c: sll   zero, zero, 0
+// 0x01010f60: 0x1010f60: bne   v0, zero, 0x1010f78 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010f68
+	brtrue L_1010f78
 // --- basic block ---
-// 0x01010f58: 0x1010f58: lui   a0, 0x0
+// 0x01010f68: 0x1010f68: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01010f5c: 0x1010f5c: jal   0x1006ba0 addiu a0, a0, 23744
+// 0x01010f6c: 0x1010f6c: jal   0x1006bb0 addiu a0, a0, 23744
 	ldloc.1
 	ldc.i4 23744
 	add
@@ -2195,12 +2195,12 @@ L_1010f48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01010f64: 0x1010f64: sw    v0, 40(s0)
+// 0x01010f74: 0x1010f74: sw    v0, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2209,8 +2209,8 @@ L_1010f48:
 	add
 	ldloc 5
 	stelem.i4
-L_1010f68:
-// 0x01010f68: 0x1010f68: lw    v0, 20(s0)
+L_1010f78:
+// 0x01010f78: 0x1010f78: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2219,15 +2219,15 @@ L_1010f68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010f6c: 0x1010f6c: sll   zero, zero, 0
-// 0x01010f70: 0x1010f70: bne   v0, zero, 0x1010f88 sll   zero, zero, 0
+// 0x01010f7c: 0x1010f7c: sll   zero, zero, 0
+// 0x01010f80: 0x1010f80: bne   v0, zero, 0x1010f98 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010f88
+	brtrue L_1010f98
 // --- basic block ---
-// 0x01010f78: 0x1010f78: lui   a0, 0x10000
+// 0x01010f88: 0x1010f88: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01010f7c: 0x1010f7c: jal   0x1006ba0 addiu a0, a0, -26948
+// 0x01010f8c: 0x1010f8c: jal   0x1006bb0 addiu a0, a0, -26948
 	ldloc.1
 	ldc.i4 -26948
 	add
@@ -2237,12 +2237,12 @@ L_1010f68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01010f84: 0x1010f84: sw    v0, 20(s0)
+// 0x01010f94: 0x1010f94: sw    v0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2251,8 +2251,8 @@ L_1010f68:
 	add
 	ldloc 5
 	stelem.i4
-L_1010f88:
-// 0x01010f88: 0x1010f88: lw    v0, 28(s0)
+L_1010f98:
+// 0x01010f98: 0x1010f98: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2261,14 +2261,14 @@ L_1010f88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010f8c: 0x1010f8c: sll   zero, zero, 0
-// 0x01010f90: 0x1010f90: beq   v0, zero, 0x1010fd8 lui   a1, 0x0
+// 0x01010f9c: 0x1010f9c: sll   zero, zero, 0
+// 0x01010fa0: 0x1010fa0: beq   v0, zero, 0x1010fe8 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1010fd8
+	brfalse L_1010fe8
 // --- basic block ---
-// 0x01010f98: 0x1010f98: lw    v0, 24(s0)
+// 0x01010fa8: 0x1010fa8: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2277,14 +2277,14 @@ L_1010f88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010f9c: 0x1010f9c: sll   zero, zero, 0
-// 0x01010fa0: 0x1010fa0: beq   v0, zero, 0x1010fdc lui   a3, 0x0
+// 0x01010fac: 0x1010fac: sll   zero, zero, 0
+// 0x01010fb0: 0x1010fb0: beq   v0, zero, 0x1010fec lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_1010fdc
+	brfalse L_1010fec
 // --- basic block ---
-// 0x01010fa8: 0x1010fa8: lw    v0, 36(s0)
+// 0x01010fb8: 0x1010fb8: lw    v0, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2293,12 +2293,12 @@ L_1010f88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010fac: 0x1010fac: sll   zero, zero, 0
-// 0x01010fb0: 0x1010fb0: beq   v0, zero, 0x1010fdc sll   zero, zero, 0
+// 0x01010fbc: 0x1010fbc: sll   zero, zero, 0
+// 0x01010fc0: 0x1010fc0: beq   v0, zero, 0x1010fec sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1010fdc
+	brfalse L_1010fec
 // --- basic block ---
-// 0x01010fb8: 0x1010fb8: lw    v0, 40(s0)
+// 0x01010fc8: 0x1010fc8: lw    v0, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2307,12 +2307,12 @@ L_1010f88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010fbc: 0x1010fbc: sll   zero, zero, 0
-// 0x01010fc0: 0x1010fc0: beq   v0, zero, 0x1010fdc sll   zero, zero, 0
+// 0x01010fcc: 0x1010fcc: sll   zero, zero, 0
+// 0x01010fd0: 0x1010fd0: beq   v0, zero, 0x1010fec sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1010fdc
+	brfalse L_1010fec
 // --- basic block ---
-// 0x01010fc8: 0x1010fc8: lw    v0, 20(s0)
+// 0x01010fd8: 0x1010fd8: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2321,30 +2321,30 @@ L_1010f88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01010fcc: 0x1010fcc: sll   zero, zero, 0
-// 0x01010fd0: 0x1010fd0: bne   v0, zero, 0x1010ff0 sll   zero, zero, 0
+// 0x01010fdc: 0x1010fdc: sll   zero, zero, 0
+// 0x01010fe0: 0x1010fe0: bne   v0, zero, 0x1011000 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1010ff0
+	brtrue L_1011000
 // --- basic block ---
-L_1010fd8:
-// 0x01010fd8: 0x1010fd8: lui   a3, 0x0
+L_1010fe8:
+// 0x01010fe8: 0x1010fe8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-L_1010fdc:
-// 0x01010fdc: 0x1010fdc: addiu a1, a1, 27620
+L_1010fec:
+// 0x01010fec: 0x1010fec: addiu a1, a1, 27620
 	ldloc.2
 	ldc.i4 27620
 	add
 	stloc.2
-// 0x01010fe0: 0x1010fe0: addiu a3, a3, 27712
+// 0x01010ff0: 0x1010ff0: addiu a3, a3, 27712
 	ldloc 4
 	ldc.i4 27712
 	add
 	stloc 4
-// 0x01010fe4: 0x1010fe4: addiu a0, zero, 5
+// 0x01010ff4: 0x1010ff4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01010fe8: 0x1010fe8: jal   0x100449c addiu a2, zero, 167
+// 0x01010ff8: 0x1010ff8: jal   0x100449c addiu a2, zero, 167
 	ldc.i4 167
 	stloc.3
 	ldloc.0
@@ -2357,21 +2357,21 @@ L_1010fdc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1010ff0:
-// 0x01010ff0: 0x1010ff0: lw    ra, 20(sp)
-// 0x01010ff4: 0x1010ff4: lui   v0, 0x30000
+L_1011000:
+// 0x01011000: 0x1011000: lw    ra, 20(sp)
+// 0x01011004: 0x1011004: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01010ff8: 0x1010ff8: sw    s0, -30624(v0)
+// 0x01011008: 0x1011008: sw    s0, -30160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldloc 7
 	stelem.i4
-// 0x01010ffc: 0x1010ffc: lw    s0, 16(sp)
+// 0x0101100c: 0x101100c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2380,7 +2380,7 @@ L_1010ff0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011000: 0x1011000: jr    ra addiu sp, sp, 24
+// 0x01011010: 0x1011010: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2392,7 +2392,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_map_1011008(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_map_1011018(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -2436,13 +2436,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1011008:
-// 0x01011008: 0x1011008: addiu sp, sp, -40
+L_1011018:
+// 0x01011018: 0x1011018: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101100c: 0x101100c: sw    s1, 28(sp)
+// 0x0101101c: 0x101101c: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2451,14 +2451,14 @@ L_1011008:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01011010: 0x1011010: addu  s1, a0, zero
+// 0x01011020: 0x1011020: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01011014: 0x1011014: addiu a0, zero, 44
+// 0x01011024: 0x1011024: addiu a0, zero, 44
 	ldc.i4.s 44
 	stloc.1
-// 0x01011018: 0x1011018: sw    ra, 36(sp)
-// 0x0101101c: 0x101101c: sw    s2, 32(sp)
+// 0x01011028: 0x1011028: sw    ra, 36(sp)
+// 0x0101102c: 0x101102c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2467,7 +2467,7 @@ L_1011008:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01011020: 0x1011020: sw    s0, 24(sp)
+// 0x01011030: 0x1011030: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2476,7 +2476,7 @@ L_1011008:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01011024: 0x1011024: jal   0x1000910 lui   s2, 0x0
+// 0x01011034: 0x1011034: jal   0x1000910 lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -2489,18 +2489,18 @@ L_1011008:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101102c: 0x101102c: addu  a2, v0, zero
+// 0x0101103c: 0x101103c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01011030: 0x1011030: addiu a0, s2, 27620
+// 0x01011040: 0x1011040: addiu a0, s2, 27620
 	ldloc 10
 	ldc.i4 27620
 	add
 	stloc.1
-// 0x01011034: 0x1011034: addiu a1, zero, 105
+// 0x01011044: 0x1011044: addiu a1, zero, 105
 	ldc.i4.s 105
 	stloc.2
-// 0x01011038: 0x1011038: jal   0x1004a38 addu  s0, v0, zero
+// 0x01011048: 0x1011048: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -2508,50 +2508,50 @@ L_1011008:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01011040: 0x1011040: lui   v1, 0x20000
+// 0x01011050: 0x1011050: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01011044: 0x1011044: lw    v1, 24780(v1)
+// 0x01011054: 0x1011054: lw    v1, 25244(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6195
+	ldc.i4 6311
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011048: 0x1011048: addiu v0, s0, 8
+// 0x01011058: 0x1011058: addiu v0, s0, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0101104c: 0x101104c: addu  a0, s1, zero
+// 0x0101105c: 0x101105c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01011050: 0x1011050: addiu a1, zero, 16
+// 0x01011060: 0x1011060: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-// 0x01011054: 0x1011054: addiu a2, zero, 8
+// 0x01011064: 0x1011064: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x01011058: 0x1011058: addiu a3, s0, 4
+// 0x01011068: 0x1011068: addiu a3, s0, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0101105c: 0x101105c: sw    v1, 0(s0)
+// 0x0101106c: 0x101106c: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01011060: 0x1011060: sw    v0, 16(sp)
+// 0x01011070: 0x1011070: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2560,7 +2560,7 @@ L_1011008:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01011064: 0x1011064: sw    zero, 24(s0)
+// 0x01011074: 0x1011074: sw    zero, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2569,7 +2569,7 @@ L_1011008:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01011068: 0x1011068: sw    zero, 28(s0)
+// 0x01011078: 0x1011078: sw    zero, 28(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2578,7 +2578,7 @@ L_1011008:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101106c: 0x101106c: sw    zero, 32(s0)
+// 0x0101107c: 0x101107c: sw    zero, 32(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2587,7 +2587,7 @@ L_1011008:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01011070: 0x1011070: sw    zero, 36(s0)
+// 0x01011080: 0x1011080: sw    zero, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2596,7 +2596,7 @@ L_1011008:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01011074: 0x1011074: sw    zero, 40(s0)
+// 0x01011084: 0x1011084: sw    zero, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2605,7 +2605,7 @@ L_1011008:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01011078: 0x1011078: jal   0x10031b0 sw    zero, 20(s0)
+// 0x01011088: 0x1011088: jal   0x10031b0 sw    zero, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2624,31 +2624,31 @@ L_1011008:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01011080: 0x1011080: bne   v0, zero, 0x10110a4 addiu v0, s0, 16
+// 0x01011090: 0x1011090: bne   v0, zero, 0x10110b4 addiu v0, s0, 16
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 16
 	add
 	stloc 5
-	brtrue L_10110a4
+	brtrue L_10110b4
 // --- basic block ---
-// 0x01011088: 0x1011088: lui   a3, 0x0
+// 0x01011098: 0x1011098: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101108c: 0x101108c: addiu a1, s2, 27620
+// 0x0101109c: 0x101109c: addiu a1, s2, 27620
 	ldloc 10
 	ldc.i4 27620
 	add
 	stloc.2
-// 0x01011090: 0x1011090: addiu a3, a3, 27736
+// 0x010110a0: 0x10110a0: addiu a3, a3, 27736
 	ldloc 4
 	ldc.i4 27736
 	add
 	stloc 4
-// 0x01011094: 0x1011094: addiu a0, zero, 5
+// 0x010110a4: 0x10110a4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01011098: 0x1011098: jal   0x100449c addiu a2, zero, 120
+// 0x010110a8: 0x10110a8: jal   0x100449c addiu a2, zero, 120
 	ldc.i4.s 120
 	stloc.3
 	ldloc.0
@@ -2661,27 +2661,27 @@ L_1011008:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010110a0: 0x10110a0: addiu v0, s0, 16
+// 0x010110b0: 0x10110b0: addiu v0, s0, 16
 	ldloc 7
 	ldc.i4.s 16
 	add
 	stloc 5
-L_10110a4:
-// 0x010110a4: 0x10110a4: addu  a0, s1, zero
+L_10110b4:
+// 0x010110b4: 0x10110b4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010110a8: 0x10110a8: addiu a1, zero, 17
+// 0x010110b8: 0x10110b8: addiu a1, zero, 17
 	ldc.i4.s 17
 	stloc.2
-// 0x010110ac: 0x10110ac: addiu a2, zero, 4
+// 0x010110bc: 0x10110bc: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x010110b0: 0x10110b0: addiu a3, s0, 12
+// 0x010110c0: 0x10110c0: addiu a3, s0, 12
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 4
-// 0x010110b4: 0x10110b4: jal   0x10031b0 sw    v0, 16(sp)
+// 0x010110c4: 0x10110c4: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2700,29 +2700,29 @@ L_10110a4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010110bc: 0x10110bc: bne   v0, zero, 0x10110dc lui   a1, 0x0
+// 0x010110cc: 0x10110cc: bne   v0, zero, 0x10110ec lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_10110dc
+	brtrue L_10110ec
 // --- basic block ---
-// 0x010110c4: 0x10110c4: lui   a3, 0x0
+// 0x010110d4: 0x10110d4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010110c8: 0x10110c8: addiu a1, a1, 27620
+// 0x010110d8: 0x10110d8: addiu a1, a1, 27620
 	ldloc.2
 	ldc.i4 27620
 	add
 	stloc.2
-// 0x010110cc: 0x10110cc: addiu a3, a3, 27768
+// 0x010110dc: 0x10110dc: addiu a3, a3, 27768
 	ldloc 4
 	ldc.i4 27768
 	add
 	stloc 4
-// 0x010110d0: 0x10110d0: addiu a0, zero, 5
+// 0x010110e0: 0x10110e0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010110d4: 0x10110d4: jal   0x100449c addiu a2, zero, 128
+// 0x010110e4: 0x10110e4: jal   0x100449c addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.0
@@ -2735,8 +2735,8 @@ L_10110a4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10110dc:
-// 0x010110dc: 0x10110dc: lw    v0, 16(s0)
+L_10110ec:
+// 0x010110ec: 0x10110ec: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2745,17 +2745,17 @@ L_10110dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010110e0: 0x10110e0: sll   zero, zero, 0
-// 0x010110e4: 0x10110e4: blez  v0, 0x10110f0 addiu v0, v0, -1
+// 0x010110f0: 0x10110f0: sll   zero, zero, 0
+// 0x010110f4: 0x10110f4: blez  v0, 0x1011100 addiu v0, v0, -1
 	ldloc 5
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
 	ldc.i4.s 0
-	ble L_10110f0
+	ble L_1011100
 // --- basic block ---
-// 0x010110ec: 0x10110ec: sw    v0, 16(s0)
+// 0x010110fc: 0x10110fc: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2764,12 +2764,12 @@ L_10110dc:
 	add
 	ldloc 5
 	stelem.i4
-L_10110f0:
-// 0x010110f0: 0x10110f0: lw    ra, 36(sp)
-// 0x010110f4: 0x10110f4: addu  v0, s0, zero
+L_1011100:
+// 0x01011100: 0x1011100: lw    ra, 36(sp)
+// 0x01011104: 0x1011104: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x010110f8: 0x10110f8: lw    s2, 32(sp)
+// 0x01011108: 0x1011108: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2778,7 +2778,7 @@ L_10110f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010110fc: 0x10110fc: lw    s1, 28(sp)
+// 0x0101110c: 0x101110c: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2787,7 +2787,7 @@ L_10110f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01011100: 0x1011100: lw    s0, 24(sp)
+// 0x01011110: 0x1011110: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2796,7 +2796,7 @@ L_10110f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011104: 0x1011104: jr    ra addiu sp, sp, 40
+// 0x01011114: 0x1011114: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2808,7 +2808,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_street_fetype_10111ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_fetype_10111bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2843,7 +2843,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010111ac: 0x10111ac: lw    v0, 16(a0)
+// 0x010111bc: 0x10111bc: lw    v0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2852,45 +2852,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010111b0: 0x10111b0: addiu sp, sp, -24
+// 0x010111c0: 0x10111c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010111b4: 0x10111b4: bgez  v0, 0x10111c8 sw    ra, 20(sp)
+// 0x010111c4: 0x10111c4: bgez  v0, 0x10111d8 sw    ra, 20(sp)
 	ldloc 5
 	ldc.i4.s 0
-	bge L_10111c8
+	bge L_10111d8
 // --- basic block ---
-// 0x010111bc: 0x10111bc: lui   v0, 0x10000
+// 0x010111cc: 0x10111cc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010111c0: 0x10111c0: j	 0x10111ec addiu v0, v0, 18500
+// 0x010111d0: 0x10111d0: j	 0x10111fc addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_10111ec
+	br L_10111fc
 // --- basic block ---
-L_10111c8:
-// 0x010111c8: 0x10111c8: lui   v1, 0x30000
+L_10111d8:
+// 0x010111d8: 0x10111d8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x010111cc: 0x10111cc: lw    a0, -30624(v1)
+// 0x010111dc: 0x10111dc: lw    a0, -30160(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc.1
-// 0x010111d0: 0x10111d0: sll   v0, v0, 3
+// 0x010111e0: 0x10111e0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010111d4: 0x10111d4: lw    v1, 4(a0)
+// 0x010111e4: 0x10111e4: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2899,7 +2899,7 @@ L_10111c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010111d8: 0x10111d8: lw    a0, 36(a0)
+// 0x010111e8: 0x10111e8: lw    a0, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2908,27 +2908,27 @@ L_10111c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010111dc: 0x10111dc: addu  v0, v1, v0
+// 0x010111ec: 0x10111ec: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010111e0: 0x10111e0: lhu   a1, 4(v0)
+// 0x010111f0: 0x10111f0: lhu   a1, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x010111e4: 0x10111e4: jal   0x10057e8 sll   zero, zero, 0
+// 0x010111f4: 0x10111f4: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-L_10111ec:
-// 0x010111ec: 0x10111ec: lw    ra, 20(sp)
-// 0x010111f0: 0x10111f0: sll   zero, zero, 0
-// 0x010111f4: 0x10111f4: jr    ra addiu sp, sp, 24
+L_10111fc:
+// 0x010111fc: 0x10111fc: lw    ra, 20(sp)
+// 0x01011200: 0x1011200: sll   zero, zero, 0
+// 0x01011204: 0x1011204: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2940,7 +2940,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_street_fename_10111fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_fename_101120c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2975,7 +2975,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010111fc: 0x10111fc: lw    v0, 16(a0)
+// 0x0101120c: 0x101120c: lw    v0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2984,45 +2984,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011200: 0x1011200: addiu sp, sp, -24
+// 0x01011210: 0x1011210: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01011204: 0x1011204: bgez  v0, 0x1011218 sw    ra, 20(sp)
+// 0x01011214: 0x1011214: bgez  v0, 0x1011228 sw    ra, 20(sp)
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1011218
+	bge L_1011228
 // --- basic block ---
-// 0x0101120c: 0x101120c: lui   v0, 0x10000
+// 0x0101121c: 0x101121c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01011210: 0x1011210: j	 0x101123c addiu v0, v0, 18500
+// 0x01011220: 0x1011220: j	 0x101124c addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_101123c
+	br L_101124c
 // --- basic block ---
-L_1011218:
-// 0x01011218: 0x1011218: lui   v1, 0x30000
+L_1011228:
+// 0x01011228: 0x1011228: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101121c: 0x101121c: lw    a0, -30624(v1)
+// 0x0101122c: 0x101122c: lw    a0, -30160(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011220: 0x1011220: sll   v0, v0, 3
+// 0x01011230: 0x1011230: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01011224: 0x1011224: lw    v1, 4(a0)
+// 0x01011234: 0x1011234: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3031,7 +3031,7 @@ L_1011218:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011228: 0x1011228: lw    a0, 28(a0)
+// 0x01011238: 0x1011238: lw    a0, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3040,27 +3040,27 @@ L_1011218:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101122c: 0x101122c: addu  v0, v1, v0
+// 0x0101123c: 0x101123c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01011230: 0x1011230: lhu   a1, 2(v0)
+// 0x01011240: 0x1011240: lhu   a1, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01011234: 0x1011234: jal   0x10057e8 sll   zero, zero, 0
+// 0x01011244: 0x1011244: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-L_101123c:
-// 0x0101123c: 0x101123c: lw    ra, 20(sp)
-// 0x01011240: 0x1011240: sll   zero, zero, 0
-// 0x01011244: 0x1011244: jr    ra addiu sp, sp, 24
+L_101124c:
+// 0x0101124c: 0x101124c: lw    ra, 20(sp)
+// 0x01011250: 0x1011250: sll   zero, zero, 0
+// 0x01011254: 0x1011254: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3072,7 +3072,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_city_name_101124c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_city_name_101125c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3107,57 +3107,57 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101124c: 0x101124c: lui   v0, 0x30000
+// 0x0101125c: 0x101125c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01011250: 0x1011250: lw    v1, -30624(v0)
+// 0x01011260: 0x1011260: lw    v1, -30160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011254: 0x1011254: addiu sp, sp, -24
+// 0x01011264: 0x1011264: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01011258: 0x1011258: sw    ra, 20(sp)
-// 0x0101125c: 0x101125c: beq   v1, zero, 0x1011288 addu  v0, zero, zero
+// 0x01011268: 0x1011268: sw    ra, 20(sp)
+// 0x0101126c: 0x101126c: beq   v1, zero, 0x1011298 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1011288
+	brfalse L_1011298
 // --- basic block ---
-// 0x01011264: 0x1011264: lhu   a1, 20(a0)
+// 0x01011274: 0x1011274: lhu   a1, 20(a0)
 	ldloc.1
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01011268: 0x1011268: ori   v0, zero, 65535
+// 0x01011278: 0x1011278: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x0101126c: 0x101126c: bne   a1, v0, 0x101127c lui   v0, 0x10000
+// 0x0101127c: 0x101127c: bne   a1, v0, 0x101128c lui   v0, 0x10000
 	ldloc.2
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	bne.un L_101127c
+	bne.un L_101128c
 // --- basic block ---
-// 0x01011274: 0x1011274: j	 0x1011288 addiu v0, v0, 18500
+// 0x01011284: 0x1011284: j	 0x1011298 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_1011288
+	br L_1011298
 // --- basic block ---
-L_101127c:
-// 0x0101127c: 0x101127c: lw    a0, 20(v1)
+L_101128c:
+// 0x0101128c: 0x101128c: lw    a0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3166,16 +3166,16 @@ L_101127c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011280: 0x1011280: jal   0x10057e8 sll   zero, zero, 0
+// 0x01011290: 0x1011290: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-L_1011288:
-// 0x01011288: 0x1011288: lw    ra, 20(sp)
-// 0x0101128c: 0x101128c: sll   zero, zero, 0
-// 0x01011290: 0x1011290: jr    ra addiu sp, sp, 24
+L_1011298:
+// 0x01011298: 0x1011298: lw    ra, 20(sp)
+// 0x0101129c: 0x101129c: sll   zero, zero, 0
+// 0x010112a0: 0x10112a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3187,7 +3187,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3222,26 +3222,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011298: 0x1011298: addiu sp, sp, -24
+// 0x010112a8: 0x10112a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101129c: 0x101129c: sw    ra, 20(sp)
-// 0x010112a0: 0x10112a0: jal   0x101124c sll   zero, zero, 0
+// 0x010112ac: 0x10112ac: sw    ra, 20(sp)
+// 0x010112b0: 0x10112b0: jal   0x101125c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_city_name_101124c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_city_name_101125c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010112a8: 0x10112a8: lw    ra, 20(sp)
-// 0x010112ac: 0x10112ac: sll   zero, zero, 0
-// 0x010112b0: 0x10112b0: jr    ra addiu sp, sp, 24
+// 0x010112b8: 0x10112b8: lw    ra, 20(sp)
+// 0x010112bc: 0x10112bc: sll   zero, zero, 0
+// 0x010112c0: 0x10112c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3253,7 +3253,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_street_search_city_1011348(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_search_city_1011358(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3288,26 +3288,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011348: 0x1011348: addiu sp, sp, -24
+// 0x01011358: 0x1011358: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101134c: 0x101134c: sw    ra, 20(sp)
-// 0x01011350: 0x1011350: jal   0x1040fdc sll   zero, zero, 0
+// 0x0101135c: 0x101135c: sw    ra, 20(sp)
+// 0x01011360: 0x1011360: jal   0x1040fec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_search_1040fdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_search_1040fec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01011358: 0x1011358: lw    ra, 20(sp)
-// 0x0101135c: 0x101135c: sll   zero, zero, 0
-// 0x01011360: 0x1011360: jr    ra addiu sp, sp, 24
+// 0x01011368: 0x1011368: lw    ra, 20(sp)
+// 0x0101136c: 0x101136c: sll   zero, zero, 0
+// 0x01011370: 0x1011370: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3319,7 +3319,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_street_append_1011368(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_append_1011378(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 v1,int32 ra)
@@ -3366,12 +3366,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011368: 0x1011368: addiu sp, sp, -48
+// 0x01011378: 0x1011378: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101136c: 0x101136c: sw    s3, 40(sp)
+// 0x0101137c: 0x101137c: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3380,7 +3380,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01011370: 0x1011370: sw    s0, 28(sp)
+// 0x01011380: 0x1011380: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3389,8 +3389,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01011374: 0x1011374: sw    ra, 44(sp)
-// 0x01011378: 0x1011378: sw    s2, 36(sp)
+// 0x01011384: 0x1011384: sw    ra, 44(sp)
+// 0x01011388: 0x1011388: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3399,7 +3399,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101137c: 0x101137c: sw    s1, 32(sp)
+// 0x0101138c: 0x101138c: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3408,25 +3408,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01011380: 0x1011380: addu  s3, a1, zero
+// 0x01011390: 0x1011390: addu  s3, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01011384: 0x1011384: beq   a2, zero, 0x10113fc addu  s0, a0, zero
+// 0x01011394: 0x1011394: beq   a2, zero, 0x101140c addu  s0, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 8
-	brfalse L_10113fc
+	brfalse L_101140c
 // --- basic block ---
-// 0x0101138c: 0x101138c: lb    v0, 0(a2)
+// 0x0101139c: 0x101139c: lb    v0, 0(a2)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01011390: 0x1011390: sll   zero, zero, 0
-// 0x01011394: 0x1011394: beq   v0, zero, 0x10113fc sll   zero, zero, 0
+// 0x010113a0: 0x10113a0: sll   zero, zero, 0
+// 0x010113a4: 0x10113a4: beq   v0, zero, 0x101140c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10113fc
+	brfalse L_101140c
 // --- basic block ---
-// 0x0101139c: 0x101139c: jal   0x1001b48 sw    a2, 16(sp)
+// 0x010113ac: 0x10113ac: jal   0x1001b48 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3441,7 +3441,7 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010113a4: 0x10113a4: lw    a2, 16(sp)
+// 0x010113b4: 0x10113b4: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3450,31 +3450,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010113a8: 0x10113a8: subu  s1, s3, v0
+// 0x010113b8: 0x10113b8: subu  s1, s3, v0
 	ldloc 10
 	ldloc 6
 	sub
 	stloc 7
-// 0x010113ac: 0x10113ac: addu  a1, a2, zero
+// 0x010113bc: 0x10113bc: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x010113b0: 0x10113b0: addu  s2, v0, zero
+// 0x010113c0: 0x10113c0: addu  s2, v0, zero
 	ldloc 6
 	stloc 9
-// 0x010113b4: 0x10113b4: addu  a2, s1, zero
+// 0x010113c4: 0x10113c4: addu  a2, s1, zero
 	ldloc 7
 	stloc.3
-// 0x010113b8: 0x10113b8: addu  s1, s0, s1
+// 0x010113c8: 0x10113c8: addu  s1, s0, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x010113bc: 0x10113bc: addu  a0, s0, v0
+// 0x010113cc: 0x10113cc: addu  a0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc.1
-// 0x010113c0: 0x10113c0: jal   0x1001af8 addu  s2, s1, s2
+// 0x010113d0: 0x10113d0: jal   0x1001af8 addu  s2, s1, s2
 	ldloc 7
 	ldloc 9
 	add
@@ -3485,10 +3485,10 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010113c8: 0x10113c8: addu  a0, s0, zero
+// 0x010113d8: 0x10113d8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010113cc: 0x10113cc: jal   0x1001b48 sb    zero, -1(s2)
+// 0x010113dc: 0x10113dc: jal   0x1001b48 sb    zero, -1(s2)
 	ldloc 9
 	ldc.i4.m1
 	add
@@ -3500,36 +3500,36 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010113d4: 0x10113d4: subu  s2, s3, v0
+// 0x010113e4: 0x10113e4: subu  s2, s3, v0
 	ldloc 10
 	ldloc 6
 	sub
 	stloc 9
-// 0x010113d8: 0x10113d8: addu  s1, v0, zero
+// 0x010113e8: 0x10113e8: addu  s1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x010113dc: 0x10113dc: addu  a0, s0, v0
+// 0x010113ec: 0x10113ec: addu  a0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc.1
-// 0x010113e0: 0x10113e0: lui   a1, 0x20000
+// 0x010113f0: 0x10113f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010113e4: 0x10113e4: addu  s0, s0, s2
+// 0x010113f4: 0x10113f4: addu  s0, s0, s2
 	ldloc 8
 	ldloc 9
 	add
 	stloc 8
-// 0x010113e8: 0x10113e8: addiu a1, a1, 48
+// 0x010113f8: 0x10113f8: addiu a1, a1, 512
 	ldloc.2
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
-// 0x010113ec: 0x10113ec: addu  a2, s2, zero
+// 0x010113fc: 0x10113fc: addu  a2, s2, zero
 	ldloc 9
 	stloc.3
-// 0x010113f0: 0x10113f0: jal   0x1001af8 addu  s1, s0, s1
+// 0x01011400: 0x1011400: jal   0x1001af8 addu  s1, s0, s1
 	ldloc 8
 	ldloc 7
 	add
@@ -3540,15 +3540,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010113f8: 0x10113f8: sb    zero, -1(s1)
+// 0x01011408: 0x1011408: sb    zero, -1(s1)
 	ldloc 7
 	ldc.i4.m1
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10113fc:
-// 0x010113fc: 0x10113fc: lw    ra, 44(sp)
-// 0x01011400: 0x1011400: lw    s3, 40(sp)
+L_101140c:
+// 0x0101140c: 0x101140c: lw    ra, 44(sp)
+// 0x01011410: 0x1011410: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3557,7 +3557,7 @@ L_10113fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01011404: 0x1011404: lw    s2, 36(sp)
+// 0x01011414: 0x1011414: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3566,7 +3566,7 @@ L_10113fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01011408: 0x1011408: lw    s1, 32(sp)
+// 0x01011418: 0x1011418: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3575,7 +3575,7 @@ L_10113fc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101140c: 0x101140c: lw    s0, 28(sp)
+// 0x0101141c: 0x101141c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3584,7 +3584,7 @@ L_10113fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011410: 0x1011410: jr    ra addiu sp, sp, 48
+// 0x01011420: 0x1011420: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3596,7 +3596,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_street_get_street_name_from_id_safe_1011418(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_name_from_id_safe_1011428(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
@@ -3643,12 +3643,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011418: 0x1011418: addiu sp, sp, -40
+// 0x01011428: 0x1011428: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101141c: 0x101141c: sw    s1, 24(sp)
+// 0x0101142c: 0x101142c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3657,7 +3657,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01011420: 0x1011420: sw    s0, 20(sp)
+// 0x01011430: 0x1011430: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3666,8 +3666,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01011424: 0x1011424: sw    ra, 36(sp)
-// 0x01011428: 0x1011428: sw    s3, 32(sp)
+// 0x01011434: 0x1011434: sw    ra, 36(sp)
+// 0x01011438: 0x1011438: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3676,7 +3676,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101142c: 0x101142c: sw    s2, 28(sp)
+// 0x0101143c: 0x101143c: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3685,38 +3685,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01011430: 0x1011430: addu  s0, a1, zero
+// 0x01011440: 0x1011440: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01011434: 0x1011434: addu  s1, a2, zero
+// 0x01011444: 0x1011444: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01011438: 0x1011438: bltz  a0, 0x1011524 sb    zero, 0(a1)
+// 0x01011448: 0x1011448: bltz  a0, 0x1011534 sb    zero, 0(a1)
 	ldloc.1
 	ldloc.2
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldc.i4.s 0
-	blt L_1011524
+	blt L_1011534
 // --- basic block ---
-// 0x01011440: 0x1011440: lui   s3, 0x30000
+// 0x01011450: 0x1011450: lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 11
-// 0x01011444: 0x1011444: lw    v1, -30624(s3)
+// 0x01011454: 0x1011454: lw    v1, -30160(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011448: 0x1011448: sll   s2, a0, 3
+// 0x01011458: 0x1011458: sll   s2, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc 9
-// 0x0101144c: 0x101144c: lw    v0, 4(v1)
+// 0x0101145c: 0x101145c: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3725,7 +3725,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011450: 0x1011450: lw    a0, 24(v1)
+// 0x01011460: 0x1011460: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3734,28 +3734,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011454: 0x1011454: addu  s2, v0, s2
+// 0x01011464: 0x1011464: addu  s2, v0, s2
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x01011458: 0x1011458: lhu   a1, 0(s2)
+// 0x01011468: 0x1011468: lhu   a1, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x0101145c: 0x101145c: jal   0x10057e8 sll   zero, zero, 0
+// 0x0101146c: 0x101146c: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01011464: 0x1011464: addu  a2, v0, zero
+// 0x01011474: 0x1011474: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01011468: 0x1011468: addu  a0, s0, zero
+// 0x01011478: 0x1011478: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0101146c: 0x101146c: jal   0x1011368 addu  a1, s1, zero
+// 0x0101147c: 0x101147c: jal   0x1011378 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3763,27 +3763,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_append_1011368(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_append_1011378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01011474: 0x1011474: lw    v0, -30624(s3)
+// 0x01011484: 0x1011484: lw    v0, -30160(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011478: 0x1011478: lhu   a1, 2(s2)
+// 0x01011488: 0x1011488: lhu   a1, 2(s2)
 	ldloc 9
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x0101147c: 0x101147c: lw    a0, 28(v0)
+// 0x0101148c: 0x101148c: lw    a0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3792,19 +3792,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011480: 0x1011480: jal   0x10057e8 sll   zero, zero, 0
+// 0x01011490: 0x1011490: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01011488: 0x1011488: addu  a2, v0, zero
+// 0x01011498: 0x1011498: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101148c: 0x101148c: addu  a0, s0, zero
+// 0x0101149c: 0x101149c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01011490: 0x1011490: jal   0x1011368 addu  a1, s1, zero
+// 0x010114a0: 0x10114a0: jal   0x1011378 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3812,27 +3812,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_append_1011368(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_append_1011378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01011498: 0x1011498: lw    v0, -30624(s3)
+// 0x010114a8: 0x10114a8: lw    v0, -30160(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101149c: 0x101149c: lhu   a1, 4(s2)
+// 0x010114ac: 0x10114ac: lhu   a1, 4(s2)
 	ldloc 9
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x010114a0: 0x10114a0: lw    a0, 36(v0)
+// 0x010114b0: 0x10114b0: lw    a0, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3841,19 +3841,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010114a4: 0x10114a4: jal   0x10057e8 sll   zero, zero, 0
+// 0x010114b4: 0x10114b4: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010114ac: 0x10114ac: addu  a2, v0, zero
+// 0x010114bc: 0x10114bc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010114b0: 0x10114b0: addu  a0, s0, zero
+// 0x010114c0: 0x10114c0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010114b4: 0x10114b4: jal   0x1011368 addu  a1, s1, zero
+// 0x010114c4: 0x10114c4: jal   0x1011378 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3861,27 +3861,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_append_1011368(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_append_1011378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010114bc: 0x10114bc: lw    v0, -30624(s3)
+// 0x010114cc: 0x10114cc: lw    v0, -30160(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 5
-// 0x010114c0: 0x10114c0: lhu   a1, 6(s2)
+// 0x010114d0: 0x10114d0: lhu   a1, 6(s2)
 	ldloc 9
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x010114c4: 0x10114c4: lw    a0, 40(v0)
+// 0x010114d4: 0x10114d4: lw    a0, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3890,19 +3890,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010114c8: 0x10114c8: jal   0x10057e8 sll   zero, zero, 0
+// 0x010114d8: 0x10114d8: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010114d0: 0x10114d0: addu  a2, v0, zero
+// 0x010114e0: 0x10114e0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010114d4: 0x10114d4: addu  a0, s0, zero
+// 0x010114e4: 0x10114e4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010114d8: 0x10114d8: jal   0x1011368 addu  a1, s1, zero
+// 0x010114e8: 0x10114e8: jal   0x1011378 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3910,12 +3910,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_append_1011368(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_append_1011378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010114e0: 0x10114e0: jal   0x1001b48 addu  a0, s0, zero
+// 0x010114f0: 0x10114f0: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -3924,63 +3924,63 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010114e8: 0x10114e8: addiu v0, v0, -1
+// 0x010114f8: 0x10114f8: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010114ec: 0x10114ec: addu  v0, s0, v0
+// 0x010114fc: 0x10114fc: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x010114f0: 0x10114f0: j	 0x1011500 addiu v1, zero, 32
+// 0x01011500: 0x1011500: j	 0x1011510 addiu v1, zero, 32
 	ldc.i4.s 32
 	stloc 7
-	br L_1011500
+	br L_1011510
 // --- basic block ---
-L_10114f8:
-// 0x010114f8: 0x10114f8: sb    zero, 0(v0)
+L_1011508:
+// 0x01011508: 0x1011508: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010114fc: 0x10114fc: addiu v0, v0, -1
+// 0x0101150c: 0x101150c: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-L_1011500:
-// 0x01011500: 0x1011500: lb    a0, 0(v0)
+L_1011510:
+// 0x01011510: 0x1011510: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01011504: 0x1011504: sll   zero, zero, 0
-// 0x01011508: 0x1011508: beq   a0, v1, 0x10114f8 sll   zero, zero, 0
+// 0x01011514: 0x1011514: sll   zero, zero, 0
+// 0x01011518: 0x1011518: beq   a0, v1, 0x1011508 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_10114f8
+	beq  L_1011508
 // --- basic block ---
-// 0x01011510: 0x1011510: addiu v0, zero, 32
+// 0x01011520: 0x1011520: addiu v0, zero, 32
 	ldc.i4.s 32
 	stloc 5
-L_1011514:
-// 0x01011514: 0x1011514: lb    v1, 0(s0)
+L_1011524:
+// 0x01011524: 0x1011524: lb    v1, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01011518: 0x1011518: sll   zero, zero, 0
-// 0x0101151c: 0x101151c: beq   v1, v0, 0x1011514 addiu s0, s0, 1
+// 0x01011528: 0x1011528: sll   zero, zero, 0
+// 0x0101152c: 0x101152c: beq   v1, v0, 0x1011524 addiu s0, s0, 1
 	ldloc 7
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	beq  L_1011514
+	beq  L_1011524
 // --- basic block ---
-L_1011524:
-// 0x01011524: 0x1011524: lw    ra, 36(sp)
-// 0x01011528: 0x1011528: lw    s3, 32(sp)
+L_1011534:
+// 0x01011534: 0x1011534: lw    ra, 36(sp)
+// 0x01011538: 0x1011538: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3989,7 +3989,7 @@ L_1011524:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101152c: 0x101152c: lw    s2, 28(sp)
+// 0x0101153c: 0x101153c: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3998,7 +3998,7 @@ L_1011524:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01011530: 0x1011530: lw    s1, 24(sp)
+// 0x01011540: 0x1011540: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4007,7 +4007,7 @@ L_1011524:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01011534: 0x1011534: lw    s0, 20(sp)
+// 0x01011544: 0x1011544: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4016,7 +4016,7 @@ L_1011524:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011538: 0x1011538: jr    ra addiu sp, sp, 40
+// 0x01011548: 0x1011548: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4028,7 +4028,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -4066,12 +4066,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011818: 0x1011818: addiu sp, sp, -24
+// 0x01011828: 0x1011828: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101181c: 0x101181c: sw    s0, 16(sp)
+// 0x0101182c: 0x101182c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4080,7 +4080,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01011820: 0x1011820: lw    a0, 16(a0)
+// 0x01011830: 0x1011830: lw    a0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4089,16 +4089,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011824: 0x1011824: lui   s0, 0x30000
+// 0x01011834: 0x1011834: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01011828: 0x1011828: addiu a1, s0, -30620
+// 0x01011838: 0x1011838: addiu a1, s0, -30156
 	ldloc 5
-	ldc.i4 -30620
+	ldc.i4 -30156
 	add
 	stloc.2
-// 0x0101182c: 0x101182c: sw    ra, 20(sp)
-// 0x01011830: 0x1011830: jal   0x1011418 addiu a2, zero, 512
+// 0x0101183c: 0x101183c: sw    ra, 20(sp)
+// 0x01011840: 0x1011840: jal   0x1011428 addiu a2, zero, 512
 	ldc.i4 512
 	stloc.3
 	ldloc.0
@@ -4106,18 +4106,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_from_id_safe_1011418(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_from_id_safe_1011428(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01011838: 0x1011838: lw    ra, 20(sp)
-// 0x0101183c: 0x101183c: addiu v0, s0, -30620
+// 0x01011848: 0x1011848: lw    ra, 20(sp)
+// 0x0101184c: 0x101184c: addiu v0, s0, -30156
 	ldloc 5
-	ldc.i4 -30620
+	ldc.i4 -30156
 	add
 	stloc 8
-// 0x01011840: 0x1011840: lw    s0, 16(sp)
+// 0x01011850: 0x1011850: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4126,7 +4126,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011844: 0x1011844: jr    ra addiu sp, sp, 24
+// 0x01011854: 0x1011854: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4138,7 +4138,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_street_get_street_address_101184c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_address_101185c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -4176,23 +4176,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101184c: 0x101184c: lw    a2, 0(a0)
+// 0x0101185c: 0x101185c: lw    a2, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01011850: 0x1011850: addiu sp, sp, -24
+// 0x01011860: 0x1011860: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01011854: 0x1011854: addiu v0, zero, -1
+// 0x01011864: 0x1011864: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01011858: 0x1011858: sw    ra, 20(sp)
-// 0x0101185c: 0x101185c: bne   a2, v0, 0x101188c sw    s0, 16(sp)
+// 0x01011868: 0x1011868: sw    ra, 20(sp)
+// 0x0101186c: 0x101186c: bne   a2, v0, 0x101189c sw    s0, 16(sp)
 	ldloc.3
 	ldloc 5
 	ldloc 7
@@ -4203,9 +4203,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_101188c
+	bne.un L_101189c
 // --- basic block ---
-// 0x01011864: 0x1011864: lw    v0, 8(a0)
+// 0x01011874: 0x1011874: lw    v0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4214,37 +4214,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011868: 0x1011868: sll   zero, zero, 0
-// 0x0101186c: 0x101186c: bne   v0, a2, 0x1011880 lui   a2, 0xff0000
+// 0x01011878: 0x1011878: sll   zero, zero, 0
+// 0x0101187c: 0x101187c: bne   v0, a2, 0x1011890 lui   a2, 0xff0000
 	ldloc 5
 	ldloc.3
 	ldc.i4 16711680
 	stloc.3
-	bne.un L_1011880
+	bne.un L_1011890
 // --- basic block ---
-// 0x01011874: 0x1011874: lui   v0, 0x10000
+// 0x01011884: 0x1011884: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01011878: 0x1011878: j	 0x1011910 addiu v0, v0, 18500
+// 0x01011888: 0x1011888: j	 0x1011920 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_1011910
+	br L_1011920
 // --- basic block ---
-L_1011880:
-// 0x01011880: 0x1011880: ori   a2, a2, 65535
+L_1011890:
+// 0x01011890: 0x1011890: ori   a2, a2, 65535
 	ldloc.3
 	ldc.i4 65535
 	or
 	stloc.3
-// 0x01011884: 0x1011884: j	 0x10118a8 addu  a3, zero, zero
+// 0x01011894: 0x1011894: j	 0x10118b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_10118a8
+	br L_10118b8
 // --- basic block ---
-L_101188c:
-// 0x0101188c: 0x101188c: lw    v0, 4(a0)
+L_101189c:
+// 0x0101189c: 0x101189c: lw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4253,26 +4253,26 @@ L_101188c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011890: 0x1011890: sll   zero, zero, 0
-// 0x01011894: 0x1011894: slt   v1, v0, a2
+// 0x010118a0: 0x10118a0: sll   zero, zero, 0
+// 0x010118a4: 0x10118a4: slt   v1, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 6
-// 0x01011898: 0x1011898: beq   v1, zero, 0x10118a8 addu  a3, v0, zero
+// 0x010118a8: 0x10118a8: beq   v1, zero, 0x10118b8 addu  a3, v0, zero
 	ldloc 6
 	ldloc 5
 	stloc 4
-	brfalse L_10118a8
+	brfalse L_10118b8
 // --- basic block ---
-// 0x010118a0: 0x10118a0: addu  a3, a2, zero
+// 0x010118b0: 0x10118b0: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x010118a4: 0x10118a4: addu  a2, v0, zero
+// 0x010118b4: 0x10118b4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_10118a8:
-// 0x010118a8: 0x10118a8: lw    v0, 8(a0)
+L_10118b8:
+// 0x010118b8: 0x10118b8: lw    v0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4281,29 +4281,29 @@ L_10118a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010118ac: 0x10118ac: addiu v1, zero, -1
+// 0x010118bc: 0x10118bc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010118b0: 0x10118b0: beq   v0, v1, 0x10118f8 slt   a1, a3, v0
+// 0x010118c0: 0x10118c0: beq   v0, v1, 0x1011908 slt   a1, a3, v0
 	ldloc 5
 	ldloc 6
 	ldloc 4
 	ldloc 5
 	clt
 	stloc.2
-	beq  L_10118f8
+	beq  L_1011908
 // --- basic block ---
-// 0x010118b8: 0x10118b8: beq   a1, zero, 0x10118c4 addu  v1, a3, zero
+// 0x010118c8: 0x10118c8: beq   a1, zero, 0x10118d4 addu  v1, a3, zero
 	ldloc.2
 	ldloc 4
 	stloc 6
-	brfalse L_10118c4
+	brfalse L_10118d4
 // --- basic block ---
-// 0x010118c0: 0x10118c0: addu  v1, v0, zero
+// 0x010118d0: 0x10118d0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_10118c4:
-// 0x010118c4: 0x10118c4: lw    a3, 12(a0)
+L_10118d4:
+// 0x010118d4: 0x10118d4: lw    a3, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4312,64 +4312,64 @@ L_10118c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010118c8: 0x10118c8: sll   zero, zero, 0
-// 0x010118cc: 0x10118cc: slt   a1, v0, a3
+// 0x010118d8: 0x10118d8: sll   zero, zero, 0
+// 0x010118dc: 0x10118dc: slt   a1, v0, a3
 	ldloc 5
 	ldloc 4
 	clt
 	stloc.2
-// 0x010118d0: 0x10118d0: beq   a1, zero, 0x10118dc addu  a0, a3, zero
+// 0x010118e0: 0x10118e0: beq   a1, zero, 0x10118ec addu  a0, a3, zero
 	ldloc.2
 	ldloc 4
 	stloc.1
-	brfalse L_10118dc
+	brfalse L_10118ec
 // --- basic block ---
-// 0x010118d8: 0x10118d8: addu  a0, v0, zero
+// 0x010118e8: 0x10118e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_10118dc:
-// 0x010118dc: 0x10118dc: slt   v0, a0, a2
+L_10118ec:
+// 0x010118ec: 0x10118ec: slt   v0, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc 5
-// 0x010118e0: 0x10118e0: beq   v0, zero, 0x10118ec slt   v0, v1, a3
+// 0x010118f0: 0x10118f0: beq   v0, zero, 0x10118fc slt   v0, v1, a3
 	ldloc 5
 	ldloc 6
 	ldloc 4
 	clt
 	stloc 5
-	brfalse L_10118ec
+	brfalse L_10118fc
 // --- basic block ---
-// 0x010118e8: 0x10118e8: addu  a2, a0, zero
+// 0x010118f8: 0x10118f8: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-L_10118ec:
-// 0x010118ec: 0x10118ec: bne   v0, zero, 0x10118fc lui   s0, 0x30000
+L_10118fc:
+// 0x010118fc: 0x10118fc: bne   v0, zero, 0x101190c lui   s0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 8
-	brtrue L_10118fc
+	brtrue L_101190c
 // --- basic block ---
-// 0x010118f4: 0x10118f4: addu  a3, v1, zero
+// 0x01011904: 0x1011904: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-L_10118f8:
-// 0x010118f8: 0x10118f8: lui   s0, 0x30000
+L_1011908:
+// 0x01011908: 0x1011908: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-L_10118fc:
-// 0x010118fc: 0x10118fc: lui   a1, 0x0
+L_101190c:
+// 0x0101190c: 0x101190c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01011900: 0x1011900: addiu a1, a1, 27800
+// 0x01011910: 0x1011910: addiu a1, a1, 27800
 	ldloc.2
 	ldc.i4 27800
 	add
 	stloc.2
-// 0x01011904: 0x1011904: jal   0x1000f64 addiu a0, s0, -29084
+// 0x01011914: 0x1011914: jal   0x1000f64 addiu a0, s0, -28620
 	ldloc 8
-	ldc.i4 -29084
+	ldc.i4 -28620
 	add
 	stloc.1
 	ldloc.0
@@ -4382,14 +4382,14 @@ L_10118fc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101190c: 0x101190c: addiu v0, s0, -29084
+// 0x0101191c: 0x101191c: addiu v0, s0, -28620
 	ldloc 8
-	ldc.i4 -29084
+	ldc.i4 -28620
 	add
 	stloc 5
-L_1011910:
-// 0x01011910: 0x1011910: lw    ra, 20(sp)
-// 0x01011914: 0x1011914: lw    s0, 16(sp)
+L_1011920:
+// 0x01011920: 0x1011920: lw    ra, 20(sp)
+// 0x01011924: 0x1011924: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4398,7 +4398,7 @@ L_1011910:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011918: 0x1011918: jr    ra addiu sp, sp, 24
+// 0x01011928: 0x1011928: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4410,7 +4410,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_full_name_1011920(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_full_name_1011930(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra)
@@ -4457,7 +4457,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011920: 0x1011920: lw    v0, 16(a0)
+// 0x01011930: 0x1011930: lw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4466,12 +4466,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011924: 0x1011924: addiu sp, sp, -56
+// 0x01011934: 0x1011934: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01011928: 0x1011928: sw    s1, 40(sp)
+// 0x01011938: 0x1011938: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4480,8 +4480,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101192c: 0x101192c: sw    ra, 52(sp)
-// 0x01011930: 0x1011930: sw    s3, 48(sp)
+// 0x0101193c: 0x101193c: sw    ra, 52(sp)
+// 0x01011940: 0x1011940: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4490,7 +4490,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01011934: 0x1011934: sw    s2, 44(sp)
+// 0x01011944: 0x1011944: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4499,7 +4499,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01011938: 0x1011938: sw    s0, 36(sp)
+// 0x01011948: 0x1011948: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4508,65 +4508,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101193c: 0x101193c: bgez  v0, 0x1011950 addu  s1, a0, zero
+// 0x0101194c: 0x101194c: bgez  v0, 0x1011960 addu  s1, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 8
 	ldc.i4.s 0
-	bge L_1011950
+	bge L_1011960
 // --- basic block ---
-// 0x01011944: 0x1011944: lui   v0, 0x10000
+// 0x01011954: 0x1011954: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01011948: 0x1011948: j	 0x10119f8 addiu v0, v0, 18500
+// 0x01011958: 0x1011958: j	 0x1011a08 addiu v0, v0, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-	br L_10119f8
+	br L_1011a08
 // --- basic block ---
-L_1011950:
-// 0x01011950: 0x1011950: jal   0x101184c sll   zero, zero, 0
+L_1011960:
+// 0x01011960: 0x1011960: jal   0x101185c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_address_101184c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_address_101185c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01011958: 0x1011958: lhu   v1, 20(s1)
+// 0x01011968: 0x1011968: lhu   v1, 20(s1)
 	ldloc 8
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x0101195c: 0x101195c: addu  s3, v0, zero
+// 0x0101196c: 0x101196c: addu  s3, v0, zero
 	ldloc 6
 	stloc 11
-// 0x01011960: 0x1011960: ori   v0, zero, 65535
+// 0x01011970: 0x1011970: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-// 0x01011964: 0x1011964: bne   v1, v0, 0x1011974 lui   s0, 0x10000
+// 0x01011974: 0x1011974: bne   v1, v0, 0x1011984 lui   s0, 0x10000
 	ldloc 7
 	ldloc 6
 	ldc.i4 65536
 	stloc 10
-	bne.un L_1011974
+	bne.un L_1011984
 // --- basic block ---
-// 0x0101196c: 0x101196c: j	 0x1011980 addiu s0, s0, 18500
+// 0x0101197c: 0x101197c: j	 0x1011990 addiu s0, s0, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 10
-	br L_1011980
+	br L_1011990
 // --- basic block ---
-L_1011974:
-// 0x01011974: 0x1011974: jal   0x101124c addu  a0, s1, zero
+L_1011984:
+// 0x01011984: 0x1011984: jal   0x101125c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4574,44 +4574,44 @@ L_1011974:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_city_name_101124c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_city_name_101125c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101197c: 0x101197c: addu  s0, v0, zero
+// 0x0101198c: 0x101198c: addu  s0, v0, zero
 	ldloc 6
 	stloc 10
-L_1011980:
-// 0x01011980: 0x1011980: lb    v0, 0(s3)
+L_1011990:
+// 0x01011990: 0x1011990: lb    v0, 0(s3)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01011984: 0x1011984: sll   zero, zero, 0
-// 0x01011988: 0x1011988: bne   v0, zero, 0x1011998 lui   s2, 0x10000
+// 0x01011994: 0x1011994: sll   zero, zero, 0
+// 0x01011998: 0x1011998: bne   v0, zero, 0x10119a8 lui   s2, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 9
-	brtrue L_1011998
+	brtrue L_10119a8
 // --- basic block ---
-// 0x01011990: 0x1011990: j	 0x10119a0 addiu s2, s2, 18500
+// 0x010119a0: 0x10119a0: j	 0x10119b0 addiu s2, s2, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 9
-	br L_10119a0
+	br L_10119b0
 // --- basic block ---
-L_1011998:
-// 0x01011998: 0x1011998: lui   s2, 0x20000
+L_10119a8:
+// 0x010119a8: 0x10119a8: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x0101199c: 0x101199c: addiu s2, s2, 48
+// 0x010119ac: 0x10119ac: addiu s2, s2, 512
 	ldloc 9
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc 9
-L_10119a0:
-// 0x010119a0: 0x10119a0: jal   0x1011818 addu  a0, s1, zero
+L_10119b0:
+// 0x010119b0: 0x10119b0: jal   0x1011828 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4619,62 +4619,62 @@ L_10119a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010119a8: 0x10119a8: lb    v1, 0(s0)
+// 0x010119b8: 0x10119b8: lb    v1, 0(s0)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010119ac: 0x10119ac: sll   zero, zero, 0
-// 0x010119b0: 0x10119b0: bne   v1, zero, 0x10119c0 lui   v1, 0x10000
+// 0x010119bc: 0x10119bc: sll   zero, zero, 0
+// 0x010119c0: 0x10119c0: bne   v1, zero, 0x10119d0 lui   v1, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc 7
-	brtrue L_10119c0
+	brtrue L_10119d0
 // --- basic block ---
-// 0x010119b8: 0x10119b8: j	 0x10119c8 addiu v1, v1, 18500
+// 0x010119c8: 0x10119c8: j	 0x10119d8 addiu v1, v1, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-	br L_10119c8
+	br L_10119d8
 // --- basic block ---
-L_10119c0:
-// 0x010119c0: 0x10119c0: lui   v1, 0x0
+L_10119d0:
+// 0x010119d0: 0x10119d0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010119c4: 0x10119c4: addiu v1, v1, 27808
+// 0x010119d4: 0x10119d4: addiu v1, v1, 27808
 	ldloc 7
 	ldc.i4 27808
 	add
 	stloc 7
-L_10119c8:
-// 0x010119c8: 0x10119c8: lui   s1, 0x30000
+L_10119d8:
+// 0x010119d8: 0x10119d8: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x010119cc: 0x10119cc: lui   a2, 0x0
+// 0x010119dc: 0x10119dc: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010119d0: 0x10119d0: addiu a2, a2, 27812
+// 0x010119e0: 0x10119e0: addiu a2, a2, 27812
 	ldloc.3
 	ldc.i4 27812
 	add
 	stloc.3
-// 0x010119d4: 0x10119d4: addu  a3, s3, zero
+// 0x010119e4: 0x10119e4: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010119d8: 0x10119d8: addiu a0, s1, -29596
+// 0x010119e8: 0x10119e8: addiu a0, s1, -29132
 	ldloc 8
-	ldc.i4 -29596
+	ldc.i4 -29132
 	add
 	stloc.1
-// 0x010119dc: 0x10119dc: addiu a1, zero, 512
+// 0x010119ec: 0x10119ec: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010119e0: 0x10119e0: sw    s2, 16(sp)
+// 0x010119f0: 0x10119f0: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4683,7 +4683,7 @@ L_10119c8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010119e4: 0x10119e4: sw    v0, 20(sp)
+// 0x010119f4: 0x10119f4: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4692,7 +4692,7 @@ L_10119c8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010119e8: 0x10119e8: sw    v1, 24(sp)
+// 0x010119f8: 0x10119f8: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4701,7 +4701,7 @@ L_10119c8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010119ec: 0x10119ec: jal   0x1000f9c sw    s0, 28(sp)
+// 0x010119fc: 0x10119fc: jal   0x1000f9c sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4720,14 +4720,14 @@ L_10119c8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010119f4: 0x10119f4: addiu v0, s1, -29596
+// 0x01011a04: 0x1011a04: addiu v0, s1, -29132
 	ldloc 8
-	ldc.i4 -29596
+	ldc.i4 -29132
 	add
 	stloc 6
-L_10119f8:
-// 0x010119f8: 0x10119f8: lw    ra, 52(sp)
-// 0x010119fc: 0x10119fc: lw    s3, 48(sp)
+L_1011a08:
+// 0x01011a08: 0x1011a08: lw    ra, 52(sp)
+// 0x01011a0c: 0x1011a0c: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4736,7 +4736,7 @@ L_10119f8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01011a00: 0x1011a00: lw    s2, 44(sp)
+// 0x01011a10: 0x1011a10: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4745,7 +4745,7 @@ L_10119f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01011a04: 0x1011a04: lw    s1, 40(sp)
+// 0x01011a14: 0x1011a14: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4754,7 +4754,7 @@ L_10119f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011a08: 0x1011a08: lw    s0, 36(sp)
+// 0x01011a18: 0x1011a18: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4763,7 +4763,7 @@ L_10119f8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01011a0c: 0x1011a0c: jr    ra addiu sp, sp, 56
+// 0x01011a1c: 0x1011a1c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4775,7 +4775,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_street_get_street_1011a14(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_street_1011a24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4810,28 +4810,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011a14: 0x1011a14: lui   v0, 0x30000
+// 0x01011a24: 0x1011a24: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01011a18: 0x1011a18: lw    v0, -30624(v0)
+// 0x01011a28: 0x1011a28: lw    v0, -30160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011a1c: 0x1011a1c: addiu sp, sp, -32
+// 0x01011a2c: 0x1011a2c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01011a20: 0x1011a20: beq   v0, zero, 0x1011a3c sw    ra, 28(sp)
+// 0x01011a30: 0x1011a30: beq   v0, zero, 0x1011a4c sw    ra, 28(sp)
 	ldloc 5
-	brfalse L_1011a3c
+	brfalse L_1011a4c
 // --- basic block ---
-// 0x01011a28: 0x1011a28: jal   0x1004034 sw    a1, 16(sp)
+// 0x01011a38: 0x1011a38: jal   0x1004034 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4850,7 +4850,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01011a30: 0x1011a30: lw    a1, 16(sp)
+// 0x01011a40: 0x1011a40: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4859,8 +4859,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011a34: 0x1011a34: sll   zero, zero, 0
-// 0x01011a38: 0x1011a38: sw    v0, 16(a1)
+// 0x01011a44: 0x1011a44: sll   zero, zero, 0
+// 0x01011a48: 0x1011a48: sw    v0, 16(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -4869,10 +4869,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_1011a3c:
-// 0x01011a3c: 0x1011a3c: lw    ra, 28(sp)
-// 0x01011a40: 0x1011a40: sll   zero, zero, 0
-// 0x01011a44: 0x1011a44: jr    ra addiu sp, sp, 32
+L_1011a4c:
+// 0x01011a4c: 0x1011a4c: lw    ra, 28(sp)
+// 0x01011a50: 0x1011a50: sll   zero, zero, 0
+// 0x01011a54: 0x1011a54: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4884,7 +4884,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4928,12 +4928,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011a4c: 0x1011a4c: addiu sp, sp, -32
+// 0x01011a5c: 0x1011a5c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01011a50: 0x1011a50: sw    s0, 16(sp)
+// 0x01011a60: 0x1011a60: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4942,11 +4942,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01011a54: 0x1011a54: addu  s0, a1, zero
+// 0x01011a64: 0x1011a64: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01011a58: 0x1011a58: sw    ra, 28(sp)
-// 0x01011a5c: 0x1011a5c: sw    s2, 24(sp)
+// 0x01011a68: 0x1011a68: sw    ra, 28(sp)
+// 0x01011a6c: 0x1011a6c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4955,7 +4955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01011a60: 0x1011a60: jal   0x1003ce8 sw    s1, 20(sp)
+// 0x01011a70: 0x1011a70: jal   0x1003ce8 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4974,19 +4974,19 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01011a68: 0x1011a68: lui   s1, 0x30000
+// 0x01011a78: 0x1011a78: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x01011a6c: 0x1011a6c: addu  a0, s0, zero
+// 0x01011a7c: 0x1011a7c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01011a70: 0x1011a70: addiu a1, zero, -1
+// 0x01011a80: 0x1011a80: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x01011a74: 0x1011a74: addiu a2, zero, 24
+// 0x01011a84: 0x1011a84: addiu a2, zero, 24
 	ldc.i4.s 24
 	stloc.3
-// 0x01011a78: 0x1011a78: jal   0x100177c addu  s2, v0, zero
+// 0x01011a88: 0x1011a88: jal   0x100177c addu  s2, v0, zero
 	ldloc 7
 	stloc 10
 	ldloc.1
@@ -4998,28 +4998,28 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01011a80: 0x1011a80: lw    v0, -30624(s1)
+// 0x01011a90: 0x1011a90: lw    v0, -30160(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011a84: 0x1011a84: sll   zero, zero, 0
-// 0x01011a88: 0x1011a88: beq   v0, zero, 0x1011b08 addiu a2, s0, 8
+// 0x01011a94: 0x1011a94: sll   zero, zero, 0
+// 0x01011a98: 0x1011a98: beq   v0, zero, 0x1011b18 addiu a2, s0, 8
 	ldloc 7
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc.3
-	brfalse L_1011b08
+	brfalse L_1011b18
 // --- basic block ---
-// 0x01011a90: 0x1011a90: addu  a1, s0, zero
+// 0x01011aa0: 0x1011aa0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01011a94: 0x1011a94: jal   0x10419f8 addu  a0, s2, zero
+// 0x01011aa4: 0x1011aa4: jal   0x1041a08 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5027,41 +5027,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_range_get_address_10419f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_range_get_address_1041a08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01011a9c: 0x1011a9c: jal   0x1041920 addu  a0, s2, zero
+// 0x01011aac: 0x1011aac: jal   0x1041930 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl48::roadmap_range_get_street_1041920(int32)
+	call int32 Cibyl48::roadmap_range_get_street_1041930(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01011aa4: 0x1011aa4: addiu a0, zero, -1
+// 0x01011ab4: 0x1011ab4: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01011aa8: 0x1011aa8: beq   v0, a0, 0x1011b00 addiu v1, zero, -1
+// 0x01011ab8: 0x1011ab8: beq   v0, a0, 0x1011b10 addiu v1, zero, -1
 	ldloc 7
 	ldloc.1
 	ldc.i4.m1
 	stloc 5
-	beq  L_1011b00
+	beq  L_1011b10
 // --- basic block ---
-// 0x01011ab0: 0x1011ab0: lw    a0, -30624(s1)
+// 0x01011ac0: 0x1011ac0: lw    a0, -30160(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011ab4: 0x1011ab4: sll   zero, zero, 0
-// 0x01011ab8: 0x1011ab8: lw    v1, 16(a0)
+// 0x01011ac4: 0x1011ac4: sll   zero, zero, 0
+// 0x01011ac8: 0x1011ac8: lw    v1, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5070,26 +5070,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011abc: 0x1011abc: j	 0x1011ac8 sll   a1, v1, 2
+// 0x01011acc: 0x1011acc: j	 0x1011ad8 sll   a1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.2
-	br L_1011ac8
+	br L_1011ad8
 // --- basic block ---
-L_1011ac4:
-// 0x01011ac4: 0x1011ac4: addiu v1, v1, -1
+L_1011ad4:
+// 0x01011ad4: 0x1011ad4: addiu v1, v1, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-L_1011ac8:
-// 0x01011ac8: 0x1011ac8: bltz  v1, 0x1011af0 sll   zero, zero, 0
+L_1011ad8:
+// 0x01011ad8: 0x1011ad8: bltz  v1, 0x1011b00 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	blt L_1011af0
+	blt L_1011b00
 // --- basic block ---
-// 0x01011ad0: 0x1011ad0: lw    a2, 12(a0)
+// 0x01011ae0: 0x1011ae0: lw    a2, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5098,34 +5098,34 @@ L_1011ac8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01011ad4: 0x1011ad4: sll   zero, zero, 0
-// 0x01011ad8: 0x1011ad8: addu  a2, a2, a1
+// 0x01011ae4: 0x1011ae4: sll   zero, zero, 0
+// 0x01011ae8: 0x1011ae8: addu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.3
-// 0x01011adc: 0x1011adc: lhu   a2, 2(a2)
+// 0x01011aec: 0x1011aec: lhu   a2, 2(a2)
 	ldloc.3
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x01011ae0: 0x1011ae0: sll   zero, zero, 0
-// 0x01011ae4: 0x1011ae4: slt   a2, v0, a2
+// 0x01011af0: 0x1011af0: sll   zero, zero, 0
+// 0x01011af4: 0x1011af4: slt   a2, v0, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc.3
-// 0x01011ae8: 0x1011ae8: bne   a2, zero, 0x1011ac4 addiu a1, a1, -4
+// 0x01011af8: 0x1011af8: bne   a2, zero, 0x1011ad4 addiu a1, a1, -4
 	ldloc.3
 	ldloc.2
 	ldc.i4.s -4
 	add
 	stloc.2
-	brtrue L_1011ac4
+	brtrue L_1011ad4
 // --- basic block ---
-L_1011af0:
-// 0x01011af0: 0x1011af0: lw    a0, 12(a0)
+L_1011b00:
+// 0x01011b00: 0x1011b00: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5134,22 +5134,22 @@ L_1011af0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011af4: 0x1011af4: sll   v1, v1, 2
+// 0x01011b04: 0x1011b04: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01011af8: 0x1011af8: addu  v1, a0, v1
+// 0x01011b08: 0x1011b08: addu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01011afc: 0x1011afc: lhu   v1, 0(v1)
+// 0x01011b0c: 0x1011b0c: lhu   v1, 0(v1)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-L_1011b00:
-// 0x01011b00: 0x1011b00: sw    v0, 16(s0)
+L_1011b10:
+// 0x01011b10: 0x1011b10: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5158,15 +5158,15 @@ L_1011b00:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01011b04: 0x1011b04: sh    v1, 20(s0)
+// 0x01011b14: 0x1011b14: sh    v1, 20(s0)
 	ldloc 8
 	ldc.i4.s 20
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_1011b08:
-// 0x01011b08: 0x1011b08: lw    ra, 28(sp)
-// 0x01011b0c: 0x1011b0c: lw    s2, 24(sp)
+L_1011b18:
+// 0x01011b18: 0x1011b18: lw    ra, 28(sp)
+// 0x01011b1c: 0x1011b1c: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5175,7 +5175,7 @@ L_1011b08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01011b10: 0x1011b10: lw    s1, 20(sp)
+// 0x01011b20: 0x1011b20: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5184,7 +5184,7 @@ L_1011b08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01011b14: 0x1011b14: lw    s0, 16(sp)
+// 0x01011b24: 0x1011b24: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5193,7 +5193,7 @@ L_1011b08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011b18: 0x1011b18: jr    ra addiu sp, sp, 32
+// 0x01011b28: 0x1011b28: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5205,7 +5205,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s3,int32 lo,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -5255,25 +5255,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011b20: 0x1011b20: addiu v1, a1, -1
+// 0x01011b30: 0x1011b30: addiu v1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01011b24: 0x1011b24: addiu v0, zero, 48
+// 0x01011b34: 0x1011b34: addiu v0, zero, 48
 	ldc.i4.s 48
 	stloc 7
-// 0x01011b28: 0x1011b28: mult  v1, v0
+// 0x01011b38: 0x1011b38: mult  v1, v0
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 9
-// 0x01011b2c: 0x1011b2c: addiu sp, sp, -48
+// 0x01011b3c: 0x1011b3c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01011b30: 0x1011b30: sw    s3, 40(sp)
+// 0x01011b40: 0x1011b40: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5282,7 +5282,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01011b34: 0x1011b34: sw    s2, 36(sp)
+// 0x01011b44: 0x1011b44: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01011b38: 0x1011b38: sw    s1, 32(sp)
+// 0x01011b48: 0x1011b48: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5300,7 +5300,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01011b3c: 0x1011b3c: sw    s0, 28(sp)
+// 0x01011b4c: 0x1011b4c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5309,54 +5309,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01011b40: 0x1011b40: sw    ra, 44(sp)
-// 0x01011b44: 0x1011b44: addu  s0, a1, zero
+// 0x01011b50: 0x1011b50: sw    ra, 44(sp)
+// 0x01011b54: 0x1011b54: addu  s0, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01011b48: 0x1011b48: addu  s2, a0, zero
+// 0x01011b58: 0x1011b58: addu  s2, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01011b4c: 0x1011b4c: addu  s1, a2, zero
+// 0x01011b5c: 0x1011b5c: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01011b50: 0x1011b50: addu  s3, a1, zero
+// 0x01011b60: 0x1011b60: addu  s3, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01011b54: 0x1011b54: mflo  lo
+// 0x01011b64: 0x1011b64: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x01011b58: 0x1011b58: addu  v0, a0, v1
+// 0x01011b68: 0x1011b68: addu  v0, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 7
-// 0x01011b5c: 0x1011b5c: j	 0x1011b68 addiu v0, v0, 20
+// 0x01011b6c: 0x1011b6c: j	 0x1011b78 addiu v0, v0, 20
 	ldloc 7
 	ldc.i4.s 20
 	add
 	stloc 7
-	br L_1011b68
+	br L_1011b78
 // --- basic block ---
-L_1011b64:
-// 0x01011b64: 0x1011b64: addiu s3, s3, -1
+L_1011b74:
+// 0x01011b74: 0x1011b74: addiu s3, s3, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_1011b68:
-// 0x01011b68: 0x1011b68: blez  s3, 0x1011b88 sll   zero, zero, 0
+L_1011b78:
+// 0x01011b78: 0x1011b78: blez  s3, 0x1011b98 sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	ble L_1011b88
+	ble L_1011b98
 // --- basic block ---
-// 0x01011b70: 0x1011b70: lw    a0, 0(v0)
+// 0x01011b80: 0x1011b80: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01011b74: 0x1011b74: lw    v1, 20(a3)
+// 0x01011b84: 0x1011b84: lw    v1, 20(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5365,62 +5365,62 @@ L_1011b68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011b78: 0x1011b78: sll   zero, zero, 0
-// 0x01011b7c: 0x1011b7c: slt   v1, v1, a0
+// 0x01011b88: 0x1011b88: sll   zero, zero, 0
+// 0x01011b8c: 0x1011b8c: slt   v1, v1, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x01011b80: 0x1011b80: bne   v1, zero, 0x1011b64 addiu v0, v0, -48
+// 0x01011b90: 0x1011b90: bne   v1, zero, 0x1011b74 addiu v0, v0, -48
 	ldloc 5
 	ldloc 7
 	ldc.i4.s -48
 	add
 	stloc 7
-	brtrue L_1011b64
+	brtrue L_1011b74
 // --- basic block ---
-L_1011b88:
-// 0x01011b88: 0x1011b88: beq   s3, s1, 0x1011d0c addiu v1, zero, 48
+L_1011b98:
+// 0x01011b98: 0x1011b98: beq   s3, s1, 0x1011d1c addiu v1, zero, 48
 	ldloc 8
 	ldloc 10
 	ldc.i4.s 48
 	stloc 5
-	beq  L_1011d0c
+	beq  L_1011d1c
 // --- basic block ---
-// 0x01011b90: 0x1011b90: addiu v0, s3, -1
+// 0x01011ba0: 0x1011ba0: addiu v0, s3, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01011b94: 0x1011b94: mult  v0, v1
+// 0x01011ba4: 0x1011ba4: mult  v0, v1
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 9
-// 0x01011b98: 0x1011b98: mflo  lo
+// 0x01011ba8: 0x1011ba8: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x01011b9c: 0x1011b9c: addu  v1, s2, v1
+// 0x01011bac: 0x1011bac: addu  v1, s2, v1
 	ldloc 12
 	ldloc 5
 	add
 	stloc 5
-// 0x01011ba0: 0x1011ba0: j	 0x1011c60 addiu v1, v1, 24
+// 0x01011bb0: 0x1011bb0: j	 0x1011c70 addiu v1, v1, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 5
-	br L_1011c60
+	br L_1011c70
 // --- basic block ---
-L_1011ba8:
-// 0x01011ba8: 0x1011ba8: lw    a1, 0(v1)
+L_1011bb8:
+// 0x01011bb8: 0x1011bb8: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01011bac: 0x1011bac: lw    a0, 24(a3)
+// 0x01011bbc: 0x1011bbc: lw    a0, 24(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5429,13 +5429,13 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011bb0: 0x1011bb0: sll   zero, zero, 0
-// 0x01011bb4: 0x1011bb4: bne   a1, a0, 0x1011c58 sll   zero, zero, 0
+// 0x01011bc0: 0x1011bc0: sll   zero, zero, 0
+// 0x01011bc4: 0x1011bc4: bne   a1, a0, 0x1011c68 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_1011c58
+	bne.un L_1011c68
 // --- basic block ---
-// 0x01011bbc: 0x1011bbc: lw    a1, 4(v1)
+// 0x01011bcc: 0x1011bcc: lw    a1, 4(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5444,7 +5444,7 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011bc0: 0x1011bc0: lw    a0, 28(a3)
+// 0x01011bd0: 0x1011bd0: lw    a0, 28(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5453,13 +5453,13 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011bc4: 0x1011bc4: sll   zero, zero, 0
-// 0x01011bc8: 0x1011bc8: bne   a1, a0, 0x1011c58 sll   zero, zero, 0
+// 0x01011bd4: 0x1011bd4: sll   zero, zero, 0
+// 0x01011bd8: 0x1011bd8: bne   a1, a0, 0x1011c68 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_1011c58
+	bne.un L_1011c68
 // --- basic block ---
-// 0x01011bd0: 0x1011bd0: lw    a1, 8(v1)
+// 0x01011be0: 0x1011be0: lw    a1, 8(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5468,7 +5468,7 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011bd4: 0x1011bd4: lw    a0, 32(a3)
+// 0x01011be4: 0x1011be4: lw    a0, 32(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5477,13 +5477,13 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011bd8: 0x1011bd8: sll   zero, zero, 0
-// 0x01011bdc: 0x1011bdc: bne   a1, a0, 0x1011c58 sll   zero, zero, 0
+// 0x01011be8: 0x1011be8: sll   zero, zero, 0
+// 0x01011bec: 0x1011bec: bne   a1, a0, 0x1011c68 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_1011c58
+	bne.un L_1011c68
 // --- basic block ---
-// 0x01011be4: 0x1011be4: lw    a1, 12(v1)
+// 0x01011bf4: 0x1011bf4: lw    a1, 12(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5492,7 +5492,7 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011be8: 0x1011be8: lw    a0, 36(a3)
+// 0x01011bf8: 0x1011bf8: lw    a0, 36(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5501,13 +5501,13 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011bec: 0x1011bec: sll   zero, zero, 0
-// 0x01011bf0: 0x1011bf0: bne   a1, a0, 0x1011c58 sll   zero, zero, 0
+// 0x01011bfc: 0x1011bfc: sll   zero, zero, 0
+// 0x01011c00: 0x1011c00: bne   a1, a0, 0x1011c68 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_1011c58
+	bne.un L_1011c68
 // --- basic block ---
-// 0x01011bf8: 0x1011bf8: lw    a0, -24(v1)
+// 0x01011c08: 0x1011c08: lw    a0, -24(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5516,24 +5516,24 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011bfc: 0x1011bfc: lw    a1, 0(a3)
+// 0x01011c0c: 0x1011c0c: lw    a1, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01011c00: 0x1011c00: sll   zero, zero, 0
-// 0x01011c04: 0x1011c04: bne   a0, a1, 0x1011c58 sll   zero, zero, 0
+// 0x01011c10: 0x1011c10: sll   zero, zero, 0
+// 0x01011c14: 0x1011c14: bne   a0, a1, 0x1011c68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	bne.un L_1011c58
+	bne.un L_1011c68
 // --- basic block ---
-// 0x01011c0c: 0x1011c0c: bne   a0, zero, 0x1011c28 sll   zero, zero, 0
+// 0x01011c1c: 0x1011c1c: bne   a0, zero, 0x1011c38 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1011c28
+	brtrue L_1011c38
 // --- basic block ---
-// 0x01011c14: 0x1011c14: lw    a1, -12(v1)
+// 0x01011c24: 0x1011c24: lw    a1, -12(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5542,7 +5542,7 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011c18: 0x1011c18: lw    a0, 12(a3)
+// 0x01011c28: 0x1011c28: lw    a0, 12(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5551,14 +5551,14 @@ L_1011ba8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011c1c: 0x1011c1c: sll   zero, zero, 0
-// 0x01011c20: 0x1011c20: bne   a1, a0, 0x1011c58 sll   zero, zero, 0
+// 0x01011c2c: 0x1011c2c: sll   zero, zero, 0
+// 0x01011c30: 0x1011c30: bne   a1, a0, 0x1011c68 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_1011c58
+	bne.un L_1011c68
 // --- basic block ---
-L_1011c28:
-// 0x01011c28: 0x1011c28: lw    a1, -20(v1)
+L_1011c38:
+// 0x01011c38: 0x1011c38: lw    a1, -20(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5567,7 +5567,7 @@ L_1011c28:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011c2c: 0x1011c2c: lw    a0, 4(a3)
+// 0x01011c3c: 0x1011c3c: lw    a0, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5576,13 +5576,13 @@ L_1011c28:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011c30: 0x1011c30: sll   zero, zero, 0
-// 0x01011c34: 0x1011c34: bne   a1, a0, 0x1011c58 sll   zero, zero, 0
+// 0x01011c40: 0x1011c40: sll   zero, zero, 0
+// 0x01011c44: 0x1011c44: bne   a1, a0, 0x1011c68 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_1011c58
+	bne.un L_1011c68
 // --- basic block ---
-// 0x01011c3c: 0x1011c3c: lw    a1, -8(v1)
+// 0x01011c4c: 0x1011c4c: lw    a1, -8(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5591,7 +5591,7 @@ L_1011c28:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011c40: 0x1011c40: lw    a0, 16(a3)
+// 0x01011c50: 0x1011c50: lw    a0, 16(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5600,40 +5600,40 @@ L_1011c28:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011c44: 0x1011c44: sll   zero, zero, 0
-// 0x01011c48: 0x1011c48: bne   a1, a0, 0x1011c5c addiu v0, v0, -1
+// 0x01011c54: 0x1011c54: sll   zero, zero, 0
+// 0x01011c58: 0x1011c58: bne   a1, a0, 0x1011c6c addiu v0, v0, -1
 	ldloc.2
 	ldloc.1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-	bne.un L_1011c5c
+	bne.un L_1011c6c
 // --- basic block ---
-// 0x01011c50: 0x1011c50: j	 0x1011d0c addu  s1, s0, zero
+// 0x01011c60: 0x1011c60: j	 0x1011d1c addu  s1, s0, zero
 	ldloc 11
 	stloc 10
-	br L_1011d0c
+	br L_1011d1c
 // --- basic block ---
-L_1011c58:
-// 0x01011c58: 0x1011c58: addiu v0, v0, -1
+L_1011c68:
+// 0x01011c68: 0x1011c68: addiu v0, v0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-L_1011c5c:
-// 0x01011c5c: 0x1011c5c: addiu v1, v1, -48
+L_1011c6c:
+// 0x01011c6c: 0x1011c6c: addiu v1, v1, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 5
-L_1011c60:
-// 0x01011c60: 0x1011c60: bltz  v0, 0x1011c7c sll   zero, zero, 0
+L_1011c70:
+// 0x01011c70: 0x1011c70: bltz  v0, 0x1011c8c sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	blt L_1011c7c
+	blt L_1011c8c
 // --- basic block ---
-// 0x01011c68: 0x1011c68: lw    a1, -4(v1)
+// 0x01011c78: 0x1011c78: lw    a1, -4(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5642,7 +5642,7 @@ L_1011c60:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011c6c: 0x1011c6c: lw    a0, 20(a3)
+// 0x01011c7c: 0x1011c7c: lw    a0, 20(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5651,67 +5651,67 @@ L_1011c60:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011c70: 0x1011c70: sll   zero, zero, 0
-// 0x01011c74: 0x1011c74: beq   a1, a0, 0x1011ba8 sll   zero, zero, 0
+// 0x01011c80: 0x1011c80: sll   zero, zero, 0
+// 0x01011c84: 0x1011c84: beq   a1, a0, 0x1011bb8 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	beq  L_1011ba8
+	beq  L_1011bb8
 // --- basic block ---
-L_1011c7c:
-// 0x01011c7c: 0x1011c7c: slt   v0, s3, s0
+L_1011c8c:
+// 0x01011c8c: 0x1011c8c: slt   v0, s3, s0
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 7
-// 0x01011c80: 0x1011c80: beq   v0, zero, 0x1011ce4 addiu v0, zero, 48
+// 0x01011c90: 0x1011c90: beq   v0, zero, 0x1011cf4 addiu v0, zero, 48
 	ldloc 7
 	ldc.i4.s 48
 	stloc 7
-	brfalse L_1011ce4
+	brfalse L_1011cf4
 // --- basic block ---
-// 0x01011c88: 0x1011c88: addiu v0, s1, -1
+// 0x01011c98: 0x1011c98: addiu v0, s1, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01011c8c: 0x1011c8c: beq   s3, v0, 0x1011ce0 addiu v0, zero, 48
+// 0x01011c9c: 0x1011c9c: beq   s3, v0, 0x1011cf0 addiu v0, zero, 48
 	ldloc 8
 	ldloc 7
 	ldc.i4.s 48
 	stloc 7
-	beq  L_1011ce0
+	beq  L_1011cf0
 // --- basic block ---
-// 0x01011c94: 0x1011c94: mult  s3, v0
+// 0x01011ca4: 0x1011ca4: mult  s3, v0
 	ldloc 8
 	ldloc 7
 	mul
 	stloc 9
-// 0x01011c98: 0x1011c98: addiu a0, s3, 1
+// 0x01011ca8: 0x1011ca8: addiu a0, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01011c9c: 0x1011c9c: xor   v1, s0, s1
+// 0x01011cac: 0x1011cac: xor   v1, s0, s1
 	ldloc 11
 	ldloc 10
 	xor
 	stloc 5
-// 0x01011ca0: 0x1011ca0: sltiu v1, v1, 1
+// 0x01011cb0: 0x1011cb0: sltiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01011ca4: 0x1011ca4: subu  a2, s0, s3
+// 0x01011cb4: 0x1011cb4: subu  a2, s0, s3
 	ldloc 11
 	ldloc 8
 	sub
 	stloc.3
-// 0x01011ca8: 0x1011ca8: subu  a2, a2, v1
+// 0x01011cb8: 0x1011cb8: subu  a2, a2, v1
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01011cac: 0x1011cac: sw    a3, 16(sp)
+// 0x01011cbc: 0x1011cbc: sw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5720,34 +5720,34 @@ L_1011c7c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01011cb0: 0x1011cb0: mflo  lo
+// 0x01011cc0: 0x1011cc0: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x01011cb4: 0x1011cb4: addu  a1, s2, a1
+// 0x01011cc4: 0x1011cc4: addu  a1, s2, a1
 	ldloc 12
 	ldloc.2
 	add
 	stloc.2
-// 0x01011cb8: 0x1011cb8: sll   zero, zero, 0
-// 0x01011cbc: 0x1011cbc: mult  a0, v0
+// 0x01011cc8: 0x1011cc8: sll   zero, zero, 0
+// 0x01011ccc: 0x1011ccc: mult  a0, v0
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 9
-// 0x01011cc0: 0x1011cc0: mflo  lo
+// 0x01011cd0: 0x1011cd0: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x01011cc4: 0x1011cc4: sll   zero, zero, 0
-// 0x01011cc8: 0x1011cc8: sll   zero, zero, 0
-// 0x01011ccc: 0x1011ccc: mult  a2, v0
+// 0x01011cd4: 0x1011cd4: sll   zero, zero, 0
+// 0x01011cd8: 0x1011cd8: sll   zero, zero, 0
+// 0x01011cdc: 0x1011cdc: mult  a2, v0
 	ldloc.3
 	ldloc 7
 	mul
 	stloc 9
-// 0x01011cd0: 0x1011cd0: mflo  lo
+// 0x01011ce0: 0x1011ce0: mflo  lo
 	ldloc 9
 	stloc.3
-// 0x01011cd4: 0x1011cd4: jal   0x100186c addu  a0, s2, a0
+// 0x01011ce4: 0x1011ce4: jal   0x100186c addu  a0, s2, a0
 	ldloc 12
 	ldloc.1
 	add
@@ -5761,7 +5761,7 @@ L_1011c7c:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01011cdc: 0x1011cdc: lw    a3, 16(sp)
+// 0x01011cec: 0x1011cec: lw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5770,26 +5770,26 @@ L_1011c7c:
 	add
 	ldelem.i4
 	stloc 4
-L_1011ce0:
-// 0x01011ce0: 0x1011ce0: addiu v0, zero, 48
+L_1011cf0:
+// 0x01011cf0: 0x1011cf0: addiu v0, zero, 48
 	ldc.i4.s 48
 	stloc 7
-L_1011ce4:
-// 0x01011ce4: 0x1011ce4: mult  s3, v0
+L_1011cf4:
+// 0x01011cf4: 0x1011cf4: mult  s3, v0
 	ldloc 8
 	ldloc 7
 	mul
 	stloc 9
-// 0x01011ce8: 0x1011ce8: addu  a1, a3, zero
+// 0x01011cf8: 0x1011cf8: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01011cec: 0x1011cec: addiu a2, zero, 48
+// 0x01011cfc: 0x1011cfc: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x01011cf0: 0x1011cf0: mflo  lo
+// 0x01011d00: 0x1011d00: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01011cf4: 0x1011cf4: jal   0x1001800 addu  a0, s2, s3
+// 0x01011d04: 0x1011d04: jal   0x1001800 addu  a0, s2, s3
 	ldloc 12
 	ldloc 8
 	add
@@ -5803,26 +5803,26 @@ L_1011ce4:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01011cfc: 0x1011cfc: slt   v0, s0, s1
+// 0x01011d0c: 0x1011d0c: slt   v0, s0, s1
 	ldloc 11
 	ldloc 10
 	clt
 	stloc 7
-// 0x01011d00: 0x1011d00: beq   v0, zero, 0x1011d0c sll   zero, zero, 0
+// 0x01011d10: 0x1011d10: beq   v0, zero, 0x1011d1c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1011d0c
+	brfalse L_1011d1c
 // --- basic block ---
-// 0x01011d08: 0x1011d08: addiu s1, s0, 1
+// 0x01011d18: 0x1011d18: addiu s1, s0, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 10
-L_1011d0c:
-// 0x01011d0c: 0x1011d0c: lw    ra, 44(sp)
-// 0x01011d10: 0x1011d10: addu  v0, s1, zero
+L_1011d1c:
+// 0x01011d1c: 0x1011d1c: lw    ra, 44(sp)
+// 0x01011d20: 0x1011d20: addu  v0, s1, zero
 	ldloc 10
 	stloc 7
-// 0x01011d14: 0x1011d14: lw    s3, 40(sp)
+// 0x01011d24: 0x1011d24: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5831,7 +5831,7 @@ L_1011d0c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011d18: 0x1011d18: lw    s2, 36(sp)
+// 0x01011d28: 0x1011d28: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5840,7 +5840,7 @@ L_1011d0c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01011d1c: 0x1011d1c: lw    s1, 32(sp)
+// 0x01011d2c: 0x1011d2c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5849,7 +5849,7 @@ L_1011d0c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01011d20: 0x1011d20: lw    s0, 28(sp)
+// 0x01011d30: 0x1011d30: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5858,7 +5858,7 @@ L_1011d0c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01011d24: 0x1011d24: jr    ra addiu sp, sp, 48
+// 0x01011d34: 0x1011d34: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5870,7 +5870,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_street_distance_position_1011d2c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_distance_position_1011d3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s4,int32 lo,int32 s1,int32 s2,int32 s3,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -5935,24 +5935,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011d2c: 0x1011d2c: lui   v0, 0x20000
+// 0x01011d3c: 0x1011d3c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01011d30: 0x1011d30: addiu sp, sp, -80
+// 0x01011d40: 0x1011d40: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01011d34: 0x1011d34: lw    v0, 31152(v0)
+// 0x01011d44: 0x1011d44: lw    v0, 31616(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011d38: 0x1011d38: sw    s1, 44(sp)
+// 0x01011d48: 0x1011d48: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5961,55 +5961,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01011d3c: 0x1011d3c: sll   s1, a0, 3
+// 0x01011d4c: 0x1011d4c: sll   s1, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc 11
-// 0x01011d40: 0x1011d40: addu  v0, v0, s1
+// 0x01011d50: 0x1011d50: addu  v0, v0, s1
 	ldloc 6
 	ldloc 11
 	add
 	stloc 6
-// 0x01011d44: 0x1011d44: lhu   a3, 0(v0)
+// 0x01011d54: 0x1011d54: lhu   a3, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x01011d48: 0x1011d48: lui   v1, 0x20000
+// 0x01011d58: 0x1011d58: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01011d4c: 0x1011d4c: lw    a0, 31228(v1)
+// 0x01011d5c: 0x1011d5c: lw    a0, 31692(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011d50: 0x1011d50: andi  a3, a3, 32767
+// 0x01011d60: 0x1011d60: andi  a3, a3, 32767
 	ldloc 4
 	ldc.i4 32767
 	and
 	stloc 4
-// 0x01011d54: 0x1011d54: sll   a3, a3, 3
+// 0x01011d64: 0x1011d64: sll   a3, a3, 3
 	ldloc 4
 	ldc.i4.3
 	shl
 	stloc 4
-// 0x01011d58: 0x1011d58: addu  a3, a0, a3
+// 0x01011d68: 0x1011d68: addu  a3, a0, a3
 	ldloc.1
 	ldloc 4
 	add
 	stloc 4
-// 0x01011d5c: 0x1011d5c: lw    v1, 0(a3)
+// 0x01011d6c: 0x1011d6c: lw    v1, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01011d60: 0x1011d60: sw    s0, 40(sp)
+// 0x01011d70: 0x1011d70: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6018,7 +6018,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01011d64: 0x1011d64: sw    v1, 16(sp)
+// 0x01011d74: 0x1011d74: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6027,10 +6027,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01011d68: 0x1011d68: addu  s0, a1, zero
+// 0x01011d78: 0x1011d78: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01011d6c: 0x1011d6c: lw    a1, 4(a3)
+// 0x01011d7c: 0x1011d7c: lw    a1, 4(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -6039,7 +6039,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011d70: 0x1011d70: sw    s2, 48(sp)
+// 0x01011d80: 0x1011d80: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6048,8 +6048,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01011d74: 0x1011d74: sw    ra, 76(sp)
-// 0x01011d78: 0x1011d78: sw    s8, 72(sp)
+// 0x01011d84: 0x1011d84: sw    ra, 76(sp)
+// 0x01011d88: 0x1011d88: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6058,7 +6058,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01011d7c: 0x1011d7c: sw    s7, 68(sp)
+// 0x01011d8c: 0x1011d8c: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6067,7 +6067,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01011d80: 0x1011d80: sw    s6, 64(sp)
+// 0x01011d90: 0x1011d90: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6076,7 +6076,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01011d84: 0x1011d84: sw    s5, 60(sp)
+// 0x01011d94: 0x1011d94: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6085,7 +6085,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01011d88: 0x1011d88: sw    s4, 56(sp)
+// 0x01011d98: 0x1011d98: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6094,7 +6094,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01011d8c: 0x1011d8c: sw    s3, 52(sp)
+// 0x01011d9c: 0x1011d9c: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6103,10 +6103,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01011d90: 0x1011d90: addu  s2, a2, zero
+// 0x01011da0: 0x1011da0: addu  s2, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01011d94: 0x1011d94: bne   s0, zero, 0x1011da4 sw    a1, 20(sp)
+// 0x01011da4: 0x1011da4: bne   s0, zero, 0x1011db4 sw    a1, 20(sp)
 	ldloc 8
 	ldloc 5
 	ldloc.0
@@ -6116,9 +6116,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	brtrue L_1011da4
+	brtrue L_1011db4
 // --- basic block ---
-// 0x01011d9c: 0x1011d9c: j	 0x1011f70 sw    a1, 4(a2)
+// 0x01011dac: 0x1011dac: j	 0x1011f80 sw    a1, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6127,45 +6127,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	br L_1011f70
+	br L_1011f80
 // --- basic block ---
-L_1011da4:
-// 0x01011da4: 0x1011da4: lhu   a2, 2(v0)
+L_1011db4:
+// 0x01011db4: 0x1011db4: lhu   a2, 2(v0)
 	ldloc 6
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x01011da8: 0x1011da8: lhu   s4, 4(v0)
+// 0x01011db8: 0x1011db8: lhu   s4, 4(v0)
 	ldloc 6
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 9
-// 0x01011dac: 0x1011dac: andi  v0, a2, 32767
+// 0x01011dbc: 0x1011dbc: andi  v0, a2, 32767
 	ldloc.3
 	ldc.i4 32767
 	and
 	stloc 6
-// 0x01011db0: 0x1011db0: sll   v0, v0, 3
+// 0x01011dc0: 0x1011dc0: sll   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x01011db4: 0x1011db4: addu  a0, a0, v0
+// 0x01011dc4: 0x1011dc4: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x01011db8: 0x1011db8: lw    v0, 0(a0)
+// 0x01011dc8: 0x1011dc8: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01011dbc: 0x1011dbc: sll   zero, zero, 0
-// 0x01011dc0: 0x1011dc0: sw    v0, 24(sp)
+// 0x01011dcc: 0x1011dcc: sll   zero, zero, 0
+// 0x01011dd0: 0x1011dd0: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6174,7 +6174,7 @@ L_1011da4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01011dc4: 0x1011dc4: lw    v0, 4(a0)
+// 0x01011dd4: 0x1011dd4: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6183,8 +6183,8 @@ L_1011da4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011dc8: 0x1011dc8: sll   zero, zero, 0
-// 0x01011dcc: 0x1011dcc: sw    v0, 28(sp)
+// 0x01011dd8: 0x1011dd8: sll   zero, zero, 0
+// 0x01011ddc: 0x1011ddc: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6193,55 +6193,55 @@ L_1011da4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01011dd0: 0x1011dd0: ori   v0, zero, 65535
+// 0x01011de0: 0x1011de0: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-// 0x01011dd4: 0x1011dd4: beq   s4, v0, 0x1011eec lui   v0, 0x20000
+// 0x01011de4: 0x1011de4: beq   s4, v0, 0x1011efc lui   v0, 0x20000
 	ldloc 9
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	beq  L_1011eec
+	beq  L_1011efc
 // --- basic block ---
-// 0x01011ddc: 0x1011ddc: lw    a2, 31240(v0)
+// 0x01011dec: 0x1011dec: lw    a2, 31704(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.3
-// 0x01011de0: 0x1011de0: sll   a0, s4, 2
+// 0x01011df0: 0x1011df0: sll   a0, s4, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01011de4: 0x1011de4: addu  a0, a2, a0
+// 0x01011df4: 0x1011df4: addu  a0, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x01011de8: 0x1011de8: lw    a0, 0(a0)
+// 0x01011df8: 0x1011df8: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01011dec: 0x1011dec: addiu s4, s4, 1
+// 0x01011dfc: 0x1011dfc: addiu s4, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01011df0: 0x1011df0: addu  a0, s4, a0
+// 0x01011e00: 0x1011e00: addu  a0, s4, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc.1
-// 0x01011df4: 0x1011df4: sw    s4, 36(sp)
+// 0x01011e04: 0x1011e04: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6250,7 +6250,7 @@ L_1011da4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01011df8: 0x1011df8: sw    v1, 24(sp)
+// 0x01011e08: 0x1011e08: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6259,7 +6259,7 @@ L_1011da4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01011dfc: 0x1011dfc: sw    a1, 28(sp)
+// 0x01011e0c: 0x1011e0c: sw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6268,7 +6268,7 @@ L_1011da4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01011e00: 0x1011e00: sw    a0, 32(sp)
+// 0x01011e10: 0x1011e10: sw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6277,34 +6277,34 @@ L_1011da4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01011e04: 0x1011e04: sll   s4, s4, 2
+// 0x01011e14: 0x1011e14: sll   s4, s4, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x01011e08: 0x1011e08: addu  s3, zero, zero
+// 0x01011e18: 0x1011e18: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x01011e0c: 0x1011e0c: lui   s6, 0x0
+// 0x01011e1c: 0x1011e1c: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x01011e10: 0x1011e10: lui   s5, 0x0
+// 0x01011e20: 0x1011e20: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x01011e14: 0x1011e14: addiu s8, sp, 24
+// 0x01011e24: 0x1011e24: addiu s8, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 17
-// 0x01011e18: 0x1011e18: j	 0x1011ec4 addiu s7, sp, 16
+// 0x01011e28: 0x1011e28: j	 0x1011ed4 addiu s7, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 16
-	br L_1011ec4
+	br L_1011ed4
 // --- basic block ---
-L_1011e20:
-// 0x01011e20: 0x1011e20: lw    v0, 576(v1)
+L_1011e30:
+// 0x01011e30: 0x1011e30: lw    v0, 576(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6313,7 +6313,7 @@ L_1011e20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011e24: 0x1011e24: lw    v1, 548(s6)
+// 0x01011e34: 0x1011e34: lw    v1, 548(s6)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -6322,17 +6322,17 @@ L_1011e20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011e28: 0x1011e28: sll   zero, zero, 0
-// 0x01011e2c: 0x1011e2c: beq   v0, v1, 0x1011e40 addiu s3, s3, 1
+// 0x01011e38: 0x1011e38: sll   zero, zero, 0
+// 0x01011e3c: 0x1011e3c: beq   v0, v1, 0x1011e50 addiu s3, s3, 1
 	ldloc 6
 	ldloc 7
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	beq  L_1011e40
+	beq  L_1011e50
 // --- basic block ---
-// 0x01011e34: 0x1011e34: jal   0x100ae78 sw    v0, 548(s6)
+// 0x01011e44: 0x1011e44: jal   0x100ae88 sw    v0, 548(s6)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -6346,12 +6346,12 @@ L_1011e20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01011e3c: 0x1011e3c: sw    v0, 552(s5)
+// 0x01011e4c: 0x1011e4c: sw    v0, 552(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -6360,20 +6360,20 @@ L_1011e20:
 	add
 	ldloc 6
 	stelem.i4
-L_1011e40:
-// 0x01011e40: 0x1011e40: lui   v0, 0x20000
+L_1011e50:
+// 0x01011e50: 0x1011e50: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01011e44: 0x1011e44: lw    a0, 31240(v0)
+// 0x01011e54: 0x1011e54: lw    a0, 31704(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011e48: 0x1011e48: lw    v0, 552(s5)
+// 0x01011e58: 0x1011e58: lw    v0, 552(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -6382,48 +6382,48 @@ L_1011e40:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011e4c: 0x1011e4c: addu  a0, a0, s4
+// 0x01011e5c: 0x1011e5c: addu  a0, a0, s4
 	ldloc.1
 	ldloc 9
 	add
 	stloc.1
-// 0x01011e50: 0x1011e50: lh    v1, 2(a0)
+// 0x01011e60: 0x1011e60: lh    v1, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01011e54: 0x1011e54: lh    a2, 0(a0)
+// 0x01011e64: 0x1011e64: lh    a2, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x01011e58: 0x1011e58: mult  v1, v0
+// 0x01011e68: 0x1011e68: mult  v1, v0
 	ldloc 7
 	ldloc 6
 	mul
 	stloc 10
-// 0x01011e5c: 0x1011e5c: addu  a0, s7, zero
+// 0x01011e6c: 0x1011e6c: addu  a0, s7, zero
 	ldloc 16
 	stloc.1
-// 0x01011e60: 0x1011e60: addu  a1, s8, zero
+// 0x01011e70: 0x1011e70: addu  a1, s8, zero
 	ldloc 17
 	stloc.2
-// 0x01011e64: 0x1011e64: addiu s4, s4, 4
+// 0x01011e74: 0x1011e74: addiu s4, s4, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-// 0x01011e68: 0x1011e68: mflo  lo
+// 0x01011e78: 0x1011e78: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x01011e6c: 0x1011e6c: sll   zero, zero, 0
-// 0x01011e70: 0x1011e70: sll   zero, zero, 0
-// 0x01011e74: 0x1011e74: mult  a2, v0
+// 0x01011e7c: 0x1011e7c: sll   zero, zero, 0
+// 0x01011e80: 0x1011e80: sll   zero, zero, 0
+// 0x01011e84: 0x1011e84: mult  a2, v0
 	ldloc.3
 	ldloc 6
 	mul
 	stloc 10
-// 0x01011e78: 0x1011e78: lw    a2, 28(sp)
+// 0x01011e88: 0x1011e88: lw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6432,13 +6432,13 @@ L_1011e40:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01011e7c: 0x1011e7c: sll   zero, zero, 0
-// 0x01011e80: 0x1011e80: addu  v1, a2, v1
+// 0x01011e8c: 0x1011e8c: sll   zero, zero, 0
+// 0x01011e90: 0x1011e90: addu  v1, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x01011e84: 0x1011e84: lw    a2, 24(sp)
+// 0x01011e94: 0x1011e94: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6447,7 +6447,7 @@ L_1011e40:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01011e88: 0x1011e88: sw    v1, 28(sp)
+// 0x01011e98: 0x1011e98: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6456,15 +6456,15 @@ L_1011e40:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01011e8c: 0x1011e8c: mflo  lo
+// 0x01011e9c: 0x1011e9c: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01011e90: 0x1011e90: addu  v0, a2, v0
+// 0x01011ea0: 0x1011ea0: addu  v0, a2, v0
 	ldloc.3
 	ldloc 6
 	add
 	stloc 6
-// 0x01011e94: 0x1011e94: jal   0x1008eb0 sw    v0, 24(sp)
+// 0x01011ea4: 0x1011ea4: jal   0x1008ec0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6478,30 +6478,30 @@ L_1011e40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01011e9c: 0x1011e9c: slt   v1, v0, s0
+// 0x01011eac: 0x1011eac: slt   v1, v0, s0
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 7
-// 0x01011ea0: 0x1011ea0: beq   v1, zero, 0x1011ef0 addiu a0, sp, 16
+// 0x01011eb0: 0x1011eb0: beq   v1, zero, 0x1011f00 addiu a0, sp, 16
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	brfalse L_1011ef0
+	brfalse L_1011f00
 // --- basic block ---
-// 0x01011ea8: 0x1011ea8: subu  s0, s0, v0
+// 0x01011eb8: 0x1011eb8: subu  s0, s0, v0
 	ldloc 8
 	ldloc 6
 	sub
 	stloc 8
-// 0x01011eac: 0x1011eac: lw    v0, 24(sp)
+// 0x01011ebc: 0x1011ebc: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6510,8 +6510,8 @@ L_1011e40:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011eb0: 0x1011eb0: sll   zero, zero, 0
-// 0x01011eb4: 0x1011eb4: sw    v0, 16(sp)
+// 0x01011ec0: 0x1011ec0: sll   zero, zero, 0
+// 0x01011ec4: 0x1011ec4: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6520,7 +6520,7 @@ L_1011e40:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01011eb8: 0x1011eb8: lw    v0, 28(sp)
+// 0x01011ec8: 0x1011ec8: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6529,8 +6529,8 @@ L_1011e40:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011ebc: 0x1011ebc: sll   zero, zero, 0
-// 0x01011ec0: 0x1011ec0: sw    v0, 20(sp)
+// 0x01011ecc: 0x1011ecc: sll   zero, zero, 0
+// 0x01011ed0: 0x1011ed0: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6539,8 +6539,8 @@ L_1011e40:
 	add
 	ldloc 6
 	stelem.i4
-L_1011ec4:
-// 0x01011ec4: 0x1011ec4: lw    v1, 36(sp)
+L_1011ed4:
+// 0x01011ed4: 0x1011ed4: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6549,13 +6549,13 @@ L_1011ec4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011ec8: 0x1011ec8: sll   zero, zero, 0
-// 0x01011ecc: 0x1011ecc: addu  v0, v1, s3
+// 0x01011ed8: 0x1011ed8: sll   zero, zero, 0
+// 0x01011edc: 0x1011edc: addu  v0, v1, s3
 	ldloc 7
 	ldloc 13
 	add
 	stloc 6
-// 0x01011ed0: 0x1011ed0: lw    v1, 32(sp)
+// 0x01011ee0: 0x1011ee0: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6564,31 +6564,31 @@ L_1011ec4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011ed4: 0x1011ed4: sll   zero, zero, 0
-// 0x01011ed8: 0x1011ed8: slt   v0, v0, v1
+// 0x01011ee4: 0x1011ee4: sll   zero, zero, 0
+// 0x01011ee8: 0x1011ee8: slt   v0, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x01011edc: 0x1011edc: bne   v0, zero, 0x1011e20 lui   v1, 0x0
+// 0x01011eec: 0x1011eec: bne   v0, zero, 0x1011e30 lui   v1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1011e20
+	brtrue L_1011e30
 // --- basic block ---
-// 0x01011ee4: 0x1011ee4: j	 0x1011f78 lui   v0, 0x20000
+// 0x01011ef4: 0x1011ef4: j	 0x1011f88 lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-	br L_1011f78
+	br L_1011f88
 // --- basic block ---
-L_1011eec:
-// 0x01011eec: 0x1011eec: addiu a0, sp, 16
+L_1011efc:
+// 0x01011efc: 0x1011efc: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-L_1011ef0:
-// 0x01011ef0: 0x1011ef0: jal   0x1008eb0 addiu a1, sp, 24
+L_1011f00:
+// 0x01011f00: 0x1011f00: jal   0x1008ec0 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6598,21 +6598,21 @@ L_1011ef0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01011ef8: 0x1011ef8: slt   v1, s0, v0
+// 0x01011f08: 0x1011f08: slt   v1, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 7
-// 0x01011efc: 0x1011efc: bne   v1, zero, 0x1011f18 sll   zero, zero, 0
+// 0x01011f0c: 0x1011f0c: bne   v1, zero, 0x1011f28 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1011f18
+	brtrue L_1011f28
 // --- basic block ---
-// 0x01011f04: 0x1011f04: lw    v0, 28(sp)
+// 0x01011f14: 0x1011f14: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6621,7 +6621,7 @@ L_1011ef0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011f08: 0x1011f08: lw    v1, 24(sp)
+// 0x01011f18: 0x1011f18: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6630,7 +6630,7 @@ L_1011ef0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011f0c: 0x1011f0c: sw    v0, 4(s2)
+// 0x01011f1c: 0x1011f1c: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -6639,17 +6639,17 @@ L_1011ef0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01011f10: 0x1011f10: j	 0x1011fb0 sw    v1, 0(s2)
+// 0x01011f20: 0x1011f20: j	 0x1011fc0 sw    v1, 0(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1011fb0
+	br L_1011fc0
 // --- basic block ---
-L_1011f18:
-// 0x01011f18: 0x1011f18: lw    v1, 16(sp)
+L_1011f28:
+// 0x01011f28: 0x1011f28: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6658,7 +6658,7 @@ L_1011f18:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011f1c: 0x1011f1c: lw    a1, 24(sp)
+// 0x01011f2c: 0x1011f2c: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6667,7 +6667,7 @@ L_1011f18:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01011f20: 0x1011f20: lw    a0, 20(sp)
+// 0x01011f30: 0x1011f30: lw    a0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6676,17 +6676,17 @@ L_1011f18:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01011f24: 0x1011f24: subu  a1, a1, v1
+// 0x01011f34: 0x1011f34: subu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	sub
 	stloc.2
-// 0x01011f28: 0x1011f28: mult  s0, a1
+// 0x01011f38: 0x1011f38: mult  s0, a1
 	ldloc 8
 	ldloc.2
 	mul
 	stloc 10
-// 0x01011f2c: 0x1011f2c: lw    a2, 28(sp)
+// 0x01011f3c: 0x1011f3c: lw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6695,41 +6695,41 @@ L_1011f18:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01011f30: 0x1011f30: sll   zero, zero, 0
-// 0x01011f34: 0x1011f34: subu  a2, a2, a0
+// 0x01011f40: 0x1011f40: sll   zero, zero, 0
+// 0x01011f44: 0x1011f44: subu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	sub
 	stloc.3
-// 0x01011f38: 0x1011f38: mflo  lo
+// 0x01011f48: 0x1011f48: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x01011f3c: 0x1011f3c: sll   zero, zero, 0
-// 0x01011f40: 0x1011f40: sll   zero, zero, 0
-// 0x01011f44: 0x1011f44: mult  s0, a2
+// 0x01011f4c: 0x1011f4c: sll   zero, zero, 0
+// 0x01011f50: 0x1011f50: sll   zero, zero, 0
+// 0x01011f54: 0x1011f54: mult  s0, a2
 	ldloc 8
 	ldloc.3
 	mul
 	stloc 10
-// 0x01011f48: 0x1011f48: mflo  lo
+// 0x01011f58: 0x1011f58: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x01011f4c: 0x1011f4c: sll   zero, zero, 0
-// 0x01011f50: 0x1011f50: sll   zero, zero, 0
-// 0x01011f54: 0x1011f54: div   s0, v0
+// 0x01011f5c: 0x1011f5c: sll   zero, zero, 0
+// 0x01011f60: 0x1011f60: sll   zero, zero, 0
+// 0x01011f64: 0x1011f64: div   s0, v0
 	ldloc 8
 	ldloc 6
 	div
 	stloc 10
-// 0x01011f58: 0x1011f58: mflo  lo
+// 0x01011f68: 0x1011f68: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x01011f5c: 0x1011f5c: addu  s0, s0, a0
+// 0x01011f6c: 0x1011f6c: addu  s0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-// 0x01011f60: 0x1011f60: sw    s0, 4(s2)
+// 0x01011f70: 0x1011f70: sw    s0, 4(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -6738,86 +6738,86 @@ L_1011f18:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01011f64: 0x1011f64: div   a1, v0
+// 0x01011f74: 0x1011f74: div   a1, v0
 	ldloc.2
 	ldloc 6
 	div
 	stloc 10
-// 0x01011f68: 0x1011f68: mflo  lo
+// 0x01011f78: 0x1011f78: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01011f6c: 0x1011f6c: addu  v1, v0, v1
+// 0x01011f7c: 0x1011f7c: addu  v1, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-L_1011f70:
-// 0x01011f70: 0x1011f70: j	 0x1011fb0 sw    v1, 0(s2)
+L_1011f80:
+// 0x01011f80: 0x1011f80: j	 0x1011fc0 sw    v1, 0(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1011fb0
+	br L_1011fc0
 // --- basic block ---
-L_1011f78:
-// 0x01011f78: 0x1011f78: lw    v0, 31152(v0)
+L_1011f88:
+// 0x01011f88: 0x1011f88: lw    v0, 31616(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011f7c: 0x1011f7c: lui   v1, 0x20000
+// 0x01011f8c: 0x1011f8c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01011f80: 0x1011f80: addu  s1, v0, s1
+// 0x01011f90: 0x1011f90: addu  s1, v0, s1
 	ldloc 6
 	ldloc 11
 	add
 	stloc 11
-// 0x01011f84: 0x1011f84: lhu   v0, 2(s1)
+// 0x01011f94: 0x1011f94: lhu   v0, 2(s1)
 	ldloc 11
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01011f88: 0x1011f88: lw    v1, 31228(v1)
+// 0x01011f98: 0x1011f98: lw    v1, 31692(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01011f8c: 0x1011f8c: andi  v0, v0, 32767
+// 0x01011f9c: 0x1011f9c: andi  v0, v0, 32767
 	ldloc 6
 	ldc.i4 32767
 	and
 	stloc 6
-// 0x01011f90: 0x1011f90: sll   v0, v0, 3
+// 0x01011fa0: 0x1011fa0: sll   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x01011f94: 0x1011f94: addu  v0, v1, v0
+// 0x01011fa4: 0x1011fa4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x01011f98: 0x1011f98: lw    v1, 0(v0)
+// 0x01011fa8: 0x1011fa8: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01011f9c: 0x1011f9c: sll   zero, zero, 0
-// 0x01011fa0: 0x1011fa0: sw    v1, 24(sp)
+// 0x01011fac: 0x1011fac: sll   zero, zero, 0
+// 0x01011fb0: 0x1011fb0: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6826,7 +6826,7 @@ L_1011f78:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01011fa4: 0x1011fa4: lw    v0, 4(v0)
+// 0x01011fb4: 0x1011fb4: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6835,7 +6835,7 @@ L_1011f78:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01011fa8: 0x1011fa8: j	 0x1011eec sw    v0, 28(sp)
+// 0x01011fb8: 0x1011fb8: j	 0x1011efc sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6844,11 +6844,11 @@ L_1011f78:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1011eec
+	br L_1011efc
 // --- basic block ---
-L_1011fb0:
-// 0x01011fb0: 0x1011fb0: lw    ra, 76(sp)
-// 0x01011fb4: 0x1011fb4: lw    s8, 72(sp)
+L_1011fc0:
+// 0x01011fc0: 0x1011fc0: lw    ra, 76(sp)
+// 0x01011fc4: 0x1011fc4: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6857,7 +6857,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01011fb8: 0x1011fb8: lw    s7, 68(sp)
+// 0x01011fc8: 0x1011fc8: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6866,7 +6866,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01011fbc: 0x1011fbc: lw    s6, 64(sp)
+// 0x01011fcc: 0x1011fcc: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6875,7 +6875,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01011fc0: 0x1011fc0: lw    s5, 60(sp)
+// 0x01011fd0: 0x1011fd0: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6884,7 +6884,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01011fc4: 0x1011fc4: lw    s4, 56(sp)
+// 0x01011fd4: 0x1011fd4: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6893,7 +6893,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01011fc8: 0x1011fc8: lw    s3, 52(sp)
+// 0x01011fd8: 0x1011fd8: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6902,7 +6902,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01011fcc: 0x1011fcc: lw    s2, 48(sp)
+// 0x01011fdc: 0x1011fdc: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6911,7 +6911,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01011fd0: 0x1011fd0: lw    s1, 44(sp)
+// 0x01011fe0: 0x1011fe0: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6920,7 +6920,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01011fd4: 0x1011fd4: lw    s0, 40(sp)
+// 0x01011fe4: 0x1011fe4: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6929,7 +6929,7 @@ L_1011fb0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01011fd8: 0x1011fd8: jr    ra addiu sp, sp, 80
+// 0x01011fe8: 0x1011fe8: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
diff --git a/converted/Cibyl120.j b/converted/Cibyl120.j
index 0ffae40..6fb6177 100644
--- a/converted/Cibyl120.j
+++ b/converted/Cibyl120.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl120::.ctor
 
-.method public static int32 roadmap_login_ssd_on_login_cb_10a05a0(int32)
+.method public static int32 roadmap_login_ssd_on_login_cb_10a0be8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -64,39 +64,39 @@
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a05a0: 0x10a05a0: beq   a0, zero, 0x10a05bc lui   v0, 0x80000
+// 0x010a0be8: 0x10a0be8: beq   a0, zero, 0x10a0c04 lui   v0, 0x80000
 	ldloc.0
 	ldc.i4 524288
 	stloc.1
-	brfalse L_10a05bc
-// 0x010a05a8: 0x10a05a8: sw    zero, 10024(v0)
+	brfalse L_10a0c04
+// 0x010a0bf0: 0x10a0bf0: sw    zero, 10488(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a05ac: 0x10a05ac: cibyl_sysc 0x2196
+// 0x010a0bf4: 0x10a0bf4: cibyl_sysc 0x2196
 	call void [WazeWP7]Syscalls::NOPH_SignInUpDialogs_signInSuccessful()
-// 0x010a05b0: 0x10a05b0: addu  v1, v0, zero
+// 0x010a0bf8: 0x10a0bf8: addu  v1, v0, zero
 	ldloc.1
 	stloc.3
-// 0x010a05b4: 0x10a05b4: lui   v0, 0x80000
+// 0x010a0bfc: 0x10a0bfc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a05b8: 0x10a05b8: sw    zero, 10032(v0)
+// 0x010a0c00: 0x10a0c00: sw    zero, 10496(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2508
+	ldc.i4 2624
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10a05bc:
-// 0x010a05bc: 0x10a05bc: jr    ra sll   zero, zero, 0
+L_10a0c04:
+// 0x010a0c04: 0x10a0c04: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -104,7 +104,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_login_is_login_active_10a05c4()
+.method public static int32 roadmap_login_is_login_active_10a0c0c()
 {
 .maxstack 8
 .locals init (int32 v0,int32 v1,int32 ra)
@@ -121,18 +121,18 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a05c4: 0x10a05c4: cibyl_sysc 0x21bc
+// 0x010a0c0c: 0x10a0c0c: cibyl_sysc 0x21bc
 	call int32 [WazeWP7]Syscalls::NOPH_SignInUpDialogs_isLoginActive()
 	stloc.0
-// 0x010a05c8: 0x10a05c8: addu  v1, v0, zero
+// 0x010a0c10: 0x10a0c10: addu  v1, v0, zero
 	ldloc.0
 	stloc.1
-// 0x010a05cc: 0x10a05cc: xori  v0, v1, 1
+// 0x010a0c14: 0x10a0c14: xori  v0, v1, 1
 	ldloc.1
 	ldc.i4.1
 	xor
 	stloc.0
-// 0x010a05d0: 0x10a05d0: jr    ra sltiu v0, v0, 1
+// 0x010a0c18: 0x10a0c18: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -144,7 +144,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_login_dlg_get_username_10a05d8()
+.method public static int32 roadmap_login_dlg_get_username_10a0c20()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -158,12 +158,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a05d8: 0x10a05d8: lui   v0, 0x80000
+// 0x010a0c20: 0x10a0c20: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x010a05dc: 0x10a05dc: jr    ra addiu v0, v0, 10052
+// 0x010a0c24: 0x10a0c24: jr    ra addiu v0, v0, 10516
 	ldloc.0
-	ldc.i4 10052
+	ldc.i4 10516
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -171,7 +171,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_login_dlg_get_password_10a05e4()
+.method public static int32 roadmap_login_dlg_get_password_10a0c2c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -185,12 +185,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a05e4: 0x10a05e4: lui   v0, 0x80000
+// 0x010a0c2c: 0x10a0c2c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x010a05e8: 0x10a05e8: jr    ra addiu v0, v0, 11052
+// 0x010a0c30: 0x10a0c30: jr    ra addiu v0, v0, 11516
 	ldloc.0
-	ldc.i4 11052
+	ldc.i4 11516
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -198,7 +198,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_login_dlg_get_nickname_10a05f0()
+.method public static int32 roadmap_login_dlg_get_nickname_10a0c38()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -212,12 +212,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a05f0: 0x10a05f0: lui   v0, 0x80000
+// 0x010a0c38: 0x10a0c38: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x010a05f4: 0x10a05f4: jr    ra addiu v0, v0, 14052
+// 0x010a0c3c: 0x10a0c3c: jr    ra addiu v0, v0, 14516
 	ldloc.0
-	ldc.i4 14052
+	ldc.i4 14516
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -225,7 +225,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_login_ssd_on_signup_skip_10a05fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_ssd_on_signup_skip_10a0c44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -260,19 +260,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a05fc: 0x10a05fc: addiu sp, sp, -32
+// 0x010a0c44: 0x10a0c44: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a0600: 0x10a0600: addu  a2, a0, zero
+// 0x010a0c48: 0x10a0c48: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010a0604: 0x10a0604: addiu a0, zero, 2
+// 0x010a0c4c: 0x10a0c4c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a0608: 0x10a0608: sw    ra, 28(sp)
-// 0x010a060c: 0x10a060c: jal   0x1094a94 sw    a2, 16(sp)
+// 0x010a0c50: 0x10a0c50: sw    ra, 28(sp)
+// 0x010a0c54: 0x10a0c54: jal   0x10950dc sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -286,12 +286,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a0614: 0x10a0614: lw    a2, 16(sp)
+// 0x010a0c5c: 0x10a0c5c: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -300,20 +300,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a0618: 0x10a0618: lui   a0, 0x10000
+// 0x010a0c60: 0x10a0c60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a061c: 0x10a061c: lui   a1, 0x20000
+// 0x010a0c64: 0x10a0c64: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a0620: 0x10a0620: addiu a0, a0, 18500
+// 0x010a0c68: 0x10a0c68: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x010a0624: 0x10a0624: jal   0x104c058 addiu a1, a1, -792
+// 0x010a0c6c: 0x10a0c6c: jal   0x104c068 addiu a1, a1, -328
 	ldloc.2
-	ldc.i4 -792
+	ldc.i4 -328
 	add
 	stloc.2
 	ldloc.0
@@ -321,25 +321,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a062c: 0x10a062c: lw    ra, 28(sp)
-// 0x010a0630: 0x10a0630: lui   v0, 0x80000
+// 0x010a0c74: 0x10a0c74: lw    ra, 28(sp)
+// 0x010a0c78: 0x10a0c78: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a0634: 0x10a0634: sw    zero, 10024(v0)
+// 0x010a0c7c: 0x10a0c7c: sw    zero, 10488(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a0638: 0x10a0638: jr    ra addiu sp, sp, 32
+// 0x010a0c80: 0x10a0c80: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -351,7 +351,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_login_dlg_get_allowPing_10a0640(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_dlg_get_allowPing_10a0c88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -386,30 +386,30 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a0640: 0x10a0640: lui   v0, 0x80000
+// 0x010a0c88: 0x10a0c88: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a0644: 0x10a0644: lw    a0, 10028(v0)
+// 0x010a0c8c: 0x10a0c8c: lw    a0, 10492(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0648: 0x10a0648: lui   a1, 0x20000
+// 0x010a0c90: 0x10a0c90: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a064c: 0x10a064c: addiu sp, sp, -24
+// 0x010a0c94: 0x10a0c94: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a0650: 0x10a0650: sw    ra, 20(sp)
-// 0x010a0654: 0x10a0654: jal   0x109b5e8 addiu a1, a1, -736
+// 0x010a0c98: 0x10a0c98: sw    ra, 20(sp)
+// 0x010a0c9c: 0x10a0c9c: jal   0x109bc30 addiu a1, a1, -272
 	ldloc.2
-	ldc.i4 -736
+	ldc.i4 -272
 	add
 	stloc.2
 	ldloc.0
@@ -417,14 +417,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_data_109b5e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_data_109bc30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a065c: 0x10a065c: lw    ra, 20(sp)
-// 0x010a0660: 0x10a0660: sll   zero, zero, 0
-// 0x010a0664: 0x10a0664: jr    ra addiu sp, sp, 24
+// 0x010a0ca4: 0x10a0ca4: lw    ra, 20(sp)
+// 0x010a0ca8: 0x10a0ca8: sll   zero, zero, 0
+// 0x010a0cac: 0x10a0cac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -436,7 +436,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_button_group_10a066c(int32,int32,int32,int32,int32)
+.method public static int32 create_button_group_10a0cb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -483,15 +483,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a066c: 0x10a066c: addiu sp, sp, -56
+// 0x010a0cb4: 0x10a0cb4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010a0670: 0x10a0670: lui   v0, 0x100000
+// 0x010a0cb8: 0x10a0cb8: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010a0674: 0x10a0674: sw    s3, 48(sp)
+// 0x010a0cbc: 0x10a0cbc: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -500,7 +500,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a0678: 0x10a0678: sw    s2, 44(sp)
+// 0x010a0cc0: 0x10a0cc0: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -509,10 +509,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a067c: 0x10a067c: addu  s3, a3, zero
+// 0x010a0cc4: 0x10a0cc4: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x010a0680: 0x10a0680: sw    s1, 40(sp)
+// 0x010a0cc8: 0x10a0cc8: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -521,28 +521,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a0684: 0x10a0684: addu  s2, a1, zero
+// 0x010a0ccc: 0x10a0ccc: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010a0688: 0x10a0688: addu  s1, a2, zero
+// 0x010a0cd0: 0x10a0cd0: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010a068c: 0x10a068c: addu  a1, zero, zero
+// 0x010a0cd4: 0x10a0cd4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0690: 0x10a0690: addiu a2, zero, -2
+// 0x010a0cd8: 0x10a0cd8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0694: 0x10a0694: addiu a3, zero, -1
+// 0x010a0cdc: 0x10a0cdc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0698: 0x10a0698: ori   v0, v0, 136
+// 0x010a0ce0: 0x10a0ce0: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010a069c: 0x10a069c: sw    ra, 52(sp)
-// 0x010a06a0: 0x10a06a0: sw    s0, 36(sp)
+// 0x010a0ce4: 0x10a0ce4: sw    ra, 52(sp)
+// 0x010a0ce8: 0x10a0ce8: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -551,7 +551,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a06a4: 0x10a06a4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a0cec: 0x10a0cec: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -565,35 +565,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a06ac: 0x10a06ac: lui   a0, 0x10000
+// 0x010a0cf4: 0x10a0cf4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a06b0: 0x10a06b0: addu  s0, v0, zero
+// 0x010a0cf8: 0x10a0cf8: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a06b4: 0x10a06b4: addiu a3, zero, -1
+// 0x010a0cfc: 0x10a0cfc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a06b8: 0x10a06b8: addiu a0, a0, 1764
+// 0x010a0d00: 0x10a0d00: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x010a06bc: 0x10a06bc: addu  a1, zero, zero
+// 0x010a0d04: 0x10a0d04: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a06c0: 0x10a06c0: addiu a2, zero, 47
+// 0x010a0d08: 0x10a0d08: addiu a2, zero, 47
 	ldc.i4.s 47
 	stloc.3
-// 0x010a06c4: 0x10a06c4: addiu v0, zero, 16
+// 0x010a0d0c: 0x10a0d0c: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a06c8: 0x10a06c8: sw    s2, 24(sp)
+// 0x010a0d10: 0x10a0d10: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -602,7 +602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a06cc: 0x10a06cc: sw    v0, 16(sp)
+// 0x010a0d14: 0x10a0d14: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -611,7 +611,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a06d0: 0x10a06d0: jal   0x1093a24 sw    zero, 28(sp)
+// 0x010a0d18: 0x10a0d18: jal   0x1094048 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -625,46 +625,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a06d8: 0x10a06d8: addu  a0, v0, zero
+// 0x010a0d20: 0x10a0d20: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a06dc: 0x10a06dc: addu  a1, zero, zero
+// 0x010a0d24: 0x10a0d24: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a06e0: 0x10a06e0: addu  a2, zero, zero
+// 0x010a0d28: 0x10a0d28: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a06e4: 0x10a06e4: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010a0d2c: 0x10a0d2c: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a06ec: 0x10a06ec: addiu a2, sp, 24
+// 0x010a0d34: 0x10a0d34: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010a06f0: 0x10a06f0: addiu a3, zero, 1
+// 0x010a0d38: 0x10a0d38: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010a06f4: 0x10a06f4: addu  a0, s1, zero
+// 0x010a0d3c: 0x10a0d3c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a06f8: 0x10a06f8: addu  a1, s1, zero
+// 0x010a0d40: 0x10a0d40: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010a06fc: 0x10a06fc: addiu v0, zero, 20
+// 0x010a0d44: 0x10a0d44: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x010a0700: 0x10a0700: sw    s3, 20(sp)
+// 0x010a0d48: 0x10a0d48: sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -673,7 +673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a0704: 0x10a0704: jal   0x1090ecc sw    v0, 16(sp)
+// 0x010a0d4c: 0x10a0d4c: jal   0x10914f0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -687,25 +687,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a070c: 0x10a070c: addu  a1, v0, zero
+// 0x010a0d54: 0x10a0d54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0710: 0x10a0710: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a0d58: 0x10a0d58: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0718: 0x10a0718: sw    s3, 112(s0)
+// 0x010a0d60: 0x10a0d60: sw    s3, 112(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -714,29 +714,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a071c: 0x10a071c: addu  a1, s2, zero
+// 0x010a0d64: 0x10a0d64: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010a0720: 0x10a0720: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a0d68: 0x10a0d68: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0728: 0x10a0728: addu  a0, s1, zero
+// 0x010a0d70: 0x10a0d70: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a072c: 0x10a072c: addu  a1, s1, zero
+// 0x010a0d74: 0x10a0d74: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010a0730: 0x10a0730: addiu a2, zero, -1
+// 0x010a0d78: 0x10a0d78: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a0734: 0x10a0734: jal   0x1098d10 addiu a3, zero, 16
+// 0x010a0d7c: 0x10a0d7c: jal   0x1099358 addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
 	ldloc.0
@@ -744,29 +744,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a073c: 0x10a073c: addu  a1, v0, zero
+// 0x010a0d84: 0x10a0d84: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0740: 0x10a0740: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a0d88: 0x10a0d88: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a0748: 0x10a0748: lw    ra, 52(sp)
-// 0x010a074c: 0x10a074c: addu  v0, s0, zero
+// 0x010a0d90: 0x10a0d90: lw    ra, 52(sp)
+// 0x010a0d94: 0x10a0d94: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010a0750: 0x10a0750: lw    s3, 48(sp)
+// 0x010a0d98: 0x10a0d98: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -775,7 +775,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a0754: 0x10a0754: lw    s2, 44(sp)
+// 0x010a0d9c: 0x10a0d9c: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -784,7 +784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a0758: 0x10a0758: lw    s1, 40(sp)
+// 0x010a0da0: 0x10a0da0: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -793,7 +793,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a075c: 0x10a075c: lw    s0, 36(sp)
+// 0x010a0da4: 0x10a0da4: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -802,7 +802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a0760: 0x10a0760: jr    ra addiu sp, sp, 56
+// 0x010a0da8: 0x10a0da8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -814,7 +814,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_profile_dialog_show_10a0768(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_profile_dialog_show_10a0db0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s1,int32 s5,int32 s0,int32 s7,int32 t0,int32 s8,int32 s2,int32 s4,int32 s6,int32 t1,int32 t2,int32 t3,int32 lo,int32 ra)
@@ -891,20 +891,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a0768: 0x10a0768: lui   a0, 0x10a0000
+// 0x010a0db0: 0x10a0db0: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a076c: 0x10a076c: addiu sp, sp, -112
+// 0x010a0db4: 0x10a0db4: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x010a0770: 0x10a0770: addiu a0, a0, 1896
+// 0x010a0db8: 0x10a0db8: addiu a0, a0, 3504
 	ldloc.1
-	ldc.i4 1896
+	ldc.i4 3504
 	add
 	stloc.1
-// 0x010a0774: 0x10a0774: sw    s0, 72(sp)
+// 0x010a0dbc: 0x10a0dbc: sw    s0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -913,8 +913,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a0778: 0x10a0778: sw    ra, 108(sp)
-// 0x010a077c: 0x10a077c: sw    s8, 104(sp)
+// 0x010a0dc0: 0x10a0dc0: sw    ra, 108(sp)
+// 0x010a0dc4: 0x10a0dc4: sw    s8, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -923,7 +923,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a0780: 0x10a0780: sw    s7, 100(sp)
+// 0x010a0dc8: 0x10a0dc8: sw    s7, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -932,7 +932,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a0784: 0x10a0784: sw    s6, 96(sp)
+// 0x010a0dcc: 0x10a0dcc: sw    s6, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -941,7 +941,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010a0788: 0x10a0788: sw    s5, 92(sp)
+// 0x010a0dd0: 0x10a0dd0: sw    s5, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -950,7 +950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a078c: 0x10a078c: sw    s4, 88(sp)
+// 0x010a0dd4: 0x10a0dd4: sw    s4, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -959,7 +959,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a0790: 0x10a0790: sw    s3, 84(sp)
+// 0x010a0dd8: 0x10a0dd8: sw    s3, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -968,7 +968,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a0794: 0x10a0794: sw    s2, 80(sp)
+// 0x010a0ddc: 0x10a0ddc: sw    s2, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -977,7 +977,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a0798: 0x10a0798: jal   0x10a90f8 sw    s1, 76(sp)
+// 0x010a0de0: 0x10a0de0: jal   0x10a9740 sw    s1, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -987,23 +987,23 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl126::roadmap_login_set_show_function_10a90f8(int32)
+	call int32 Cibyl126::roadmap_login_set_show_function_10a9740(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a07a0: 0x10a07a0: lui   v0, 0x20000
+// 0x010a0de8: 0x10a0de8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a07a4: 0x10a07a4: lw    v0, 29688(v0)
+// 0x010a0dec: 0x10a0dec: lw    v0, 30152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7422
+	ldc.i4 7538
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a07a8: 0x10a07a8: sll   zero, zero, 0
-// 0x010a07ac: 0x10a07ac: sw    v0, 40(sp)
+// 0x010a0df0: 0x10a0df0: sll   zero, zero, 0
+// 0x010a0df4: 0x10a0df4: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1012,61 +1012,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a07b0: 0x10a07b0: addu  a0, v0, zero
+// 0x010a0df8: 0x10a0df8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a07b4: 0x10a07b4: lui   v0, 0xf0000
+// 0x010a0dfc: 0x10a0dfc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a07b8: 0x10a07b8: lw    s0, -30068(v0)
+// 0x010a0e00: 0x10a0e00: lw    s0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a07bc: 0x10a07bc: jal   0x10941a4 sll   zero, zero, 0
+// 0x010a0e04: 0x10a0e04: jal   0x10947c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_exists_10941a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_exists_10947c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a07c4: 0x10a07c4: bne   v0, zero, 0x10a0fd8 lui   v0, 0x80000
+// 0x010a0e0c: 0x10a0e0c: bne   v0, zero, 0x10a1620 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10a0fd8
+	brtrue L_10a1620
 // --- basic block ---
-// 0x010a07cc: 0x10a07cc: jal   0x101fa28 addiu s6, zero, 45
+// 0x010a0e14: 0x10a0e14: jal   0x101fa38 addiu s6, zero, 45
 	ldc.i4.s 45
 	stloc 17
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010a07d4: 0x10a07d4: beq   v0, zero, 0x10a07e0 sll   zero, zero, 0
+// 0x010a0e1c: 0x10a0e1c: beq   v0, zero, 0x10a0e28 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a07e0
+	brfalse L_10a0e28
 // --- basic block ---
-// 0x010a07dc: 0x10a07dc: addiu s6, zero, 65
+// 0x010a0e24: 0x10a0e24: addiu s6, zero, 65
 	ldc.i4.s 65
 	stloc 17
-L_10a07e0:
-// 0x010a07e0: 0x10a07e0: addiu s7, zero, 2
+L_10a0e28:
+// 0x010a0e28: 0x10a0e28: addiu s7, zero, 2
 	ldc.i4.2
 	stloc 12
-// 0x010a07e4: 0x10a07e4: div   s0, s7
+// 0x010a0e2c: 0x10a0e2c: div   s0, s7
 	ldloc 11
 	ldloc 12
 	div
 	stloc 21
-// 0x010a07e8: 0x10a07e8: lw    a0, 40(sp)
+// 0x010a0e30: 0x10a0e30: lw    a0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1075,19 +1075,19 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a07ec: 0x10a07ec: lui   s2, 0x0
+// 0x010a0e34: 0x10a0e34: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x010a07f0: 0x10a07f0: lui   s1, 0x0
+// 0x010a0e38: 0x10a0e38: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010a07f4: 0x10a07f4: lui   s5, 0x20000
+// 0x010a0e3c: 0x10a0e3c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010a07f8: 0x10a07f8: mflo  lo
+// 0x010a0e40: 0x10a0e40: mflo  lo
 	ldloc 21
 	stloc 12
-// 0x010a07fc: 0x10a07fc: jal   0x101cd60 lui   s8, 0x10000
+// 0x010a0e44: 0x10a0e44: jal   0x101cd70 lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 14
 	ldloc.0
@@ -1095,12 +1095,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0804: 0x10a0804: lw    a0, 40(sp)
+// 0x010a0e4c: 0x10a0e4c: lw    a0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1109,18 +1109,18 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0808: 0x10a0808: lui   a2, 0x10a0000
+// 0x010a0e50: 0x10a0e50: lui   a2, 0x10a0000
 	ldc.i4 17432576
 	stloc.3
-// 0x010a080c: 0x10a080c: addu  a1, v0, zero
+// 0x010a0e54: 0x10a0e54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0810: 0x10a0810: addiu a2, a2, 4696
+// 0x010a0e58: 0x10a0e58: addiu a2, a2, 6304
 	ldloc.3
-	ldc.i4 4696
+	ldc.i4 6304
 	add
 	stloc.3
-// 0x010a0814: 0x10a0814: jal   0x1095a08 addiu a3, zero, 8192
+// 0x010a0e5c: 0x10a0e5c: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -1128,37 +1128,37 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a081c: 0x10a081c: lui   t3, 0x41000000
+// 0x010a0e64: 0x10a0e64: lui   t3, 0x41000000
 	ldc.i4 1090519040
 	stloc 20
-// 0x010a0820: 0x10a0820: lui   a0, 0x20000
+// 0x010a0e68: 0x10a0e68: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0824: 0x10a0824: ori   t3, t3, 20616
+// 0x010a0e6c: 0x10a0e6c: ori   t3, t3, 20616
 	ldloc 20
 	ldc.i4 20616
 	or
 	stloc 20
-// 0x010a0828: 0x10a0828: addiu a0, a0, -724
+// 0x010a0e70: 0x10a0e70: addiu a0, a0, -260
 	ldloc.1
-	ldc.i4 -724
+	ldc.i4 -260
 	add
 	stloc.1
-// 0x010a082c: 0x10a082c: addu  a1, zero, zero
+// 0x010a0e74: 0x10a0e74: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0830: 0x10a0830: addiu a2, zero, -2
+// 0x010a0e78: 0x10a0e78: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0834: 0x10a0834: addiu a3, zero, -1
+// 0x010a0e7c: 0x10a0e7c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0838: 0x10a0838: sw    t3, 16(sp)
+// 0x010a0e80: 0x10a0e80: sw    t3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ L_10a07e0:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010a083c: 0x10a083c: sw    t3, 64(sp)
+// 0x010a0e84: 0x10a0e84: sw    t3, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1176,7 +1176,7 @@ L_10a07e0:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010a0840: 0x10a0840: jal   0x1093a24 addu  s0, v0, zero
+// 0x010a0e88: 0x10a0e88: jal   0x1094048 addu  s0, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -1184,37 +1184,37 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0848: 0x10a0848: lui   t0, 0x100000
+// 0x010a0e90: 0x10a0e90: lui   t0, 0x100000
 	ldc.i4 1048576
 	stloc 13
-// 0x010a084c: 0x10a084c: lui   a0, 0x10000
+// 0x010a0e94: 0x10a0e94: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a0850: 0x10a0850: ori   t0, t0, 136
+// 0x010a0e98: 0x10a0e98: ori   t0, t0, 136
 	ldloc 13
 	ldc.i4 136
 	or
 	stloc 13
-// 0x010a0854: 0x10a0854: addiu a3, zero, -1
+// 0x010a0e9c: 0x10a0e9c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0858: 0x10a0858: addiu a0, a0, -27724
+// 0x010a0ea0: 0x10a0ea0: addiu a0, a0, -27724
 	ldloc.1
 	ldc.i4 -27724
 	add
 	stloc.1
-// 0x010a085c: 0x10a085c: addu  a1, zero, zero
+// 0x010a0ea4: 0x10a0ea4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0860: 0x10a0860: addiu a2, zero, -2
+// 0x010a0ea8: 0x10a0ea8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0864: 0x10a0864: sw    t0, 16(sp)
+// 0x010a0eac: 0x10a0eac: sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1223,7 +1223,7 @@ L_10a07e0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a0868: 0x10a0868: sw    t0, 56(sp)
+// 0x010a0eb0: 0x10a0eb0: sw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1232,7 +1232,7 @@ L_10a07e0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a086c: 0x10a086c: jal   0x1093a24 addu  s4, v0, zero
+// 0x010a0eb4: 0x10a0eb4: jal   0x1094048 addu  s4, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -1240,35 +1240,35 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0874: 0x10a0874: addu  a0, v0, zero
+// 0x010a0ebc: 0x10a0ebc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0878: 0x10a0878: addiu a1, s2, 31980
+// 0x010a0ec0: 0x10a0ec0: addiu a1, s2, 31980
 	ldloc 15
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a087c: 0x10a087c: addiu a2, s1, 23008
+// 0x010a0ec4: 0x10a0ec4: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a0880: 0x10a0880: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a0ec8: 0x10a0ec8: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a0888: 0x10a0888: jal   0x101cd60 addiu a0, s5, -712
+// 0x010a0ed0: 0x10a0ed0: jal   0x101cd70 addiu a0, s5, -248
 	ldloc 10
-	ldc.i4 -712
+	ldc.i4 -248
 	add
 	stloc.1
 	ldloc.0
@@ -1276,29 +1276,29 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0890: 0x10a0890: lui   v1, 0x20000
+// 0x010a0ed8: 0x10a0ed8: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010a0894: 0x10a0894: addiu a0, v1, 9016
+// 0x010a0edc: 0x10a0edc: addiu a0, v1, 9480
 	ldloc 6
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x010a0898: 0x10a0898: addiu a2, zero, 12
+// 0x010a0ee0: 0x10a0ee0: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x010a089c: 0x10a089c: addiu a3, zero, 4112
+// 0x010a0ee4: 0x10a0ee4: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a08a0: 0x10a08a0: addu  a1, v0, zero
+// 0x010a0ee8: 0x10a0ee8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a08a4: 0x10a08a4: jal   0x1098d10 sw    v1, 60(sp)
+// 0x010a0eec: 0x10a0eec: jal   0x1099358 sw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1312,30 +1312,30 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a08ac: 0x10a08ac: addu  a1, v0, zero
+// 0x010a0ef4: 0x10a0ef4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a08b0: 0x10a08b0: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a0ef8: 0x10a0ef8: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a08b8: 0x10a08b8: lui   a0, 0x20000
+// 0x010a0f00: 0x10a0f00: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a08bc: 0x10a08bc: jal   0x101cd60 addiu a0, a0, -700
+// 0x010a0f04: 0x10a0f04: jal   0x101cd70 addiu a0, a0, -236
 	ldloc.1
-	ldc.i4 -700
+	ldc.i4 -236
 	add
 	stloc.1
 	ldloc.0
@@ -1343,17 +1343,17 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a08c4: 0x10a08c4: addiu a0, s5, -712
+// 0x010a0f0c: 0x10a0f0c: addiu a0, s5, -248
 	ldloc 10
-	ldc.i4 -712
+	ldc.i4 -248
 	add
 	stloc.1
-// 0x010a08c8: 0x10a08c8: jal   0x101cd60 sw    v0, 48(sp)
+// 0x010a0f10: 0x10a0f10: jal   0x101cd70 sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1367,12 +1367,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a08d0: 0x10a08d0: lw    t2, 48(sp)
+// 0x010a0f18: 0x10a0f18: lw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1381,26 +1381,26 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010a08d4: 0x10a08d4: addiu t1, zero, -1
+// 0x010a0f1c: 0x10a0f1c: addiu t1, zero, -1
 	ldc.i4.m1
 	stloc 18
-// 0x010a08d8: 0x10a08d8: addiu a1, s8, 18500
+// 0x010a0f20: 0x10a0f20: addiu a1, s8, 18768
 	ldloc 14
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a08dc: 0x10a08dc: addiu a0, s5, -712
+// 0x010a0f24: 0x10a0f24: addiu a0, s5, -248
 	ldloc 10
-	ldc.i4 -712
+	ldc.i4 -248
 	add
 	stloc.1
-// 0x010a08e0: 0x10a08e0: addiu a2, zero, 18
+// 0x010a0f28: 0x10a0f28: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a08e4: 0x10a08e4: addu  a3, zero, zero
+// 0x010a0f2c: 0x10a0f2c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a08e8: 0x10a08e8: sw    t1, 20(sp)
+// 0x010a0f30: 0x10a0f30: sw    t1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1409,7 +1409,7 @@ L_10a07e0:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010a08ec: 0x10a08ec: sw    t1, 52(sp)
+// 0x010a0f34: 0x10a0f34: sw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1418,7 +1418,7 @@ L_10a07e0:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010a08f0: 0x10a08f0: sw    t2, 24(sp)
+// 0x010a0f38: 0x10a0f38: sw    t2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1427,7 +1427,7 @@ L_10a07e0:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010a08f4: 0x10a08f4: sw    s7, 16(sp)
+// 0x010a0f3c: 0x10a0f3c: sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1436,7 +1436,7 @@ L_10a07e0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a08f8: 0x10a08f8: jal   0x1096acc sw    v0, 28(sp)
+// 0x010a0f40: 0x10a0f40: jal   0x1097114 sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1450,18 +1450,18 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_confirmed_entry_new_1096acc(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_confirmed_entry_new_1097114(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0900: 0x10a0900: addu  s5, v0, zero
+// 0x010a0f48: 0x10a0f48: addu  s5, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010a0904: 0x10a0904: lui   v0, 0x0
+// 0x010a0f4c: 0x10a0f4c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0908: 0x10a0908: jal   0x101cd60 addiu a0, v0, 32704
+// 0x010a0f50: 0x10a0f50: jal   0x101cd70 addiu a0, v0, 32704
 	ldloc 5
 	ldc.i4 32704
 	add
@@ -1471,27 +1471,27 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0910: 0x10a0910: addu  a1, v0, zero
+// 0x010a0f58: 0x10a0f58: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0914: 0x10a0914: addiu t2, zero, 4
+// 0x010a0f5c: 0x10a0f5c: addiu t2, zero, 4
 	ldc.i4.4
 	stloc 19
-// 0x010a0918: 0x10a0918: addu  a2, zero, zero
+// 0x010a0f60: 0x10a0f60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a091c: 0x10a091c: addu  a3, zero, zero
+// 0x010a0f64: 0x10a0f64: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a0920: 0x10a0920: addu  a0, s5, zero
+// 0x010a0f68: 0x10a0f68: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-// 0x010a0924: 0x10a0924: sw    t2, 20(sp)
+// 0x010a0f6c: 0x10a0f6c: sw    t2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1500,7 +1500,7 @@ L_10a07e0:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010a0928: 0x10a0928: sw    t2, 48(sp)
+// 0x010a0f70: 0x10a0f70: sw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1509,7 +1509,7 @@ L_10a07e0:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010a092c: 0x10a092c: jal   0x10964f4 sw    zero, 16(sp)
+// 0x010a0f74: 0x10a0f74: jal   0x1096b3c sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1523,15 +1523,15 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_set_kb_params_10964f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_set_kb_params_1096b3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0934: 0x10a0934: lui   v0, 0x0
+// 0x010a0f7c: 0x10a0f7c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0938: 0x10a0938: jal   0x101cd60 addiu a0, v0, 32704
+// 0x010a0f80: 0x10a0f80: jal   0x101cd70 addiu a0, v0, 32704
 	ldloc 5
 	ldc.i4 32704
 	add
@@ -1541,49 +1541,49 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0940: 0x10a0940: addu  a1, v0, zero
+// 0x010a0f88: 0x10a0f88: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0944: 0x10a0944: jal   0x1096544 addu  a0, s5, zero
+// 0x010a0f8c: 0x10a0f8c: jal   0x1096b8c addu  a0, s5, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl112::ssd_entry_set_editbox_title_1096544(int32,int32)
+	call int32 Cibyl112::ssd_entry_set_editbox_title_1096b8c(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a094c: 0x10a094c: addu  a0, s3, zero
+// 0x010a0f94: 0x10a0f94: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010a0950: 0x10a0950: jal   0x1098ec4 addu  a1, s5, zero
+// 0x010a0f98: 0x10a0f98: jal   0x109950c addu  a1, s5, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0958: 0x10a0958: addu  a0, s4, zero
+// 0x010a0fa0: 0x10a0fa0: addu  a0, s4, zero
 	ldloc 16
 	stloc.1
-// 0x010a095c: 0x10a095c: jal   0x1098ec4 addu  a1, s3, zero
+// 0x010a0fa4: 0x10a0fa4: jal   0x109950c addu  a1, s3, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0964: 0x10a0964: lw    t0, 56(sp)
+// 0x010a0fac: 0x10a0fac: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1592,24 +1592,24 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a0968: 0x10a0968: lui   a0, 0x10000
+// 0x010a0fb0: 0x10a0fb0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a096c: 0x10a096c: addiu a3, zero, -1
+// 0x010a0fb4: 0x10a0fb4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0970: 0x10a0970: addiu a0, a0, -27704
+// 0x010a0fb8: 0x10a0fb8: addiu a0, a0, -27704
 	ldloc.1
 	ldc.i4 -27704
 	add
 	stloc.1
-// 0x010a0974: 0x10a0974: addu  a1, zero, zero
+// 0x010a0fbc: 0x10a0fbc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0978: 0x10a0978: addiu a2, zero, -2
+// 0x010a0fc0: 0x10a0fc0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a097c: 0x10a097c: jal   0x1093a24 sw    t0, 16(sp)
+// 0x010a0fc4: 0x10a0fc4: jal   0x1094048 sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1623,36 +1623,36 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0984: 0x10a0984: lui   s3, 0x0
+// 0x010a0fcc: 0x10a0fcc: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a0988: 0x10a0988: addiu a1, s2, 31980
+// 0x010a0fd0: 0x10a0fd0: addiu a1, s2, 31980
 	ldloc 15
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a098c: 0x10a098c: addiu a2, s1, 23008
+// 0x010a0fd4: 0x10a0fd4: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a0990: 0x10a0990: addu  a0, v0, zero
+// 0x010a0fd8: 0x10a0fd8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0994: 0x10a0994: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010a0fdc: 0x10a0fdc: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a099c: 0x10a099c: jal   0x101cd60 addiu a0, s3, 32736
+// 0x010a0fe4: 0x10a0fe4: jal   0x101cd70 addiu a0, s3, 32736
 	ldloc 8
 	ldc.i4 32736
 	add
@@ -1662,12 +1662,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a09a4: 0x10a09a4: lw    v1, 60(sp)
+// 0x010a0fec: 0x10a0fec: lw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1676,18 +1676,18 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a09a8: 0x10a09a8: addiu a2, zero, 12
+// 0x010a0ff0: 0x10a0ff0: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x010a09ac: 0x10a09ac: addiu a0, v1, 9016
+// 0x010a0ff4: 0x10a0ff4: addiu a0, v1, 9480
 	ldloc 6
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x010a09b0: 0x10a09b0: addiu a3, zero, 4112
+// 0x010a0ff8: 0x10a0ff8: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a09b4: 0x10a09b4: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a0ffc: 0x10a0ffc: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1695,25 +1695,25 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a09bc: 0x10a09bc: addu  a1, v0, zero
+// 0x010a1004: 0x10a1004: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a09c0: 0x10a09c0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a1008: 0x10a1008: jal   0x109950c addu  a0, s5, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a09c8: 0x10a09c8: jal   0x101cd60 addiu a0, s3, 32736
+// 0x010a1010: 0x10a1010: jal   0x101cd70 addiu a0, s3, 32736
 	ldloc 8
 	ldc.i4 32736
 	add
@@ -1723,12 +1723,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a09d0: 0x10a09d0: lw    t1, 52(sp)
+// 0x010a1018: 0x10a1018: lw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1737,23 +1737,23 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010a09d4: 0x10a09d4: addiu a1, s8, 18500
+// 0x010a101c: 0x10a101c: addiu a1, s8, 18768
 	ldloc 14
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a09d8: 0x10a09d8: addiu a2, zero, 18
+// 0x010a1020: 0x10a1020: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a09dc: 0x10a09dc: addiu a3, zero, 8192
+// 0x010a1024: 0x10a1024: addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
-// 0x010a09e0: 0x10a09e0: addiu a0, s3, 32736
+// 0x010a1028: 0x10a1028: addiu a0, s3, 32736
 	ldloc 8
 	ldc.i4 32736
 	add
 	stloc.1
-// 0x010a09e4: 0x10a09e4: sw    t1, 20(sp)
+// 0x010a102c: 0x10a102c: sw    t1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1762,7 +1762,7 @@ L_10a07e0:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010a09e8: 0x10a09e8: sw    s7, 16(sp)
+// 0x010a1030: 0x10a1030: sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1771,7 +1771,7 @@ L_10a07e0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a09ec: 0x10a09ec: jal   0x109683c sw    v0, 24(sp)
+// 0x010a1034: 0x10a1034: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1785,17 +1785,17 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a09f4: 0x10a09f4: addiu a0, s3, 32736
+// 0x010a103c: 0x10a103c: addiu a0, s3, 32736
 	ldloc 8
 	ldc.i4 32736
 	add
 	stloc.1
-// 0x010a09f8: 0x10a09f8: jal   0x101cd60 sw    v0, 44(sp)
+// 0x010a1040: 0x10a1040: jal   0x101cd70 sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1809,12 +1809,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0a00: 0x10a0a00: lw    t2, 48(sp)
+// 0x010a1048: 0x10a1048: lw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1823,7 +1823,7 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010a0a04: 0x10a0a04: lw    a0, 44(sp)
+// 0x010a104c: 0x10a104c: lw    a0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1832,16 +1832,16 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0a08: 0x10a0a08: addu  a2, zero, zero
+// 0x010a1050: 0x10a1050: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a0a0c: 0x10a0a0c: addu  a3, zero, zero
+// 0x010a1054: 0x10a1054: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a0a10: 0x10a0a10: addu  a1, v0, zero
+// 0x010a1058: 0x10a1058: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0a14: 0x10a0a14: sw    t2, 20(sp)
+// 0x010a105c: 0x10a105c: sw    t2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1850,7 +1850,7 @@ L_10a07e0:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010a0a18: 0x10a0a18: jal   0x10964f4 sw    zero, 16(sp)
+// 0x010a1060: 0x10a1060: jal   0x1096b3c sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1864,12 +1864,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_set_kb_params_10964f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_set_kb_params_1096b3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0a20: 0x10a0a20: jal   0x101cd60 addiu a0, s3, 32736
+// 0x010a1068: 0x10a1068: jal   0x101cd70 addiu a0, s3, 32736
 	ldloc 8
 	ldc.i4 32736
 	add
@@ -1879,12 +1879,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0a28: 0x10a0a28: lw    a0, 44(sp)
+// 0x010a1070: 0x10a1070: lw    a0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1893,15 +1893,15 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a0a2c: 0x10a0a2c: jal   0x1096544 addu  a1, v0, zero
+// 0x010a1074: 0x10a1074: jal   0x1096b8c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl112::ssd_entry_set_editbox_title_1096544(int32,int32)
+	call int32 Cibyl112::ssd_entry_set_editbox_title_1096b8c(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a0a34: 0x10a0a34: lw    a1, 44(sp)
+// 0x010a107c: 0x10a107c: lw    a1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1910,30 +1910,30 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0a38: 0x10a0a38: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a1080: 0x10a1080: jal   0x109950c addu  a0, s5, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0a40: 0x10a0a40: addu  a0, s4, zero
+// 0x010a1088: 0x10a1088: addu  a0, s4, zero
 	ldloc 16
 	stloc.1
-// 0x010a0a44: 0x10a0a44: jal   0x1098ec4 addu  a1, s5, zero
+// 0x010a108c: 0x10a108c: jal   0x109950c addu  a1, s5, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0a4c: 0x10a0a4c: lw    t0, 56(sp)
+// 0x010a1094: 0x10a1094: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1942,24 +1942,24 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a0a50: 0x10a0a50: lui   a0, 0x20000
+// 0x010a1098: 0x10a1098: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0a54: 0x10a0a54: addiu a3, zero, -1
+// 0x010a109c: 0x10a109c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0a58: 0x10a0a58: addiu a0, a0, -596
+// 0x010a10a0: 0x10a10a0: addiu a0, a0, -132
 	ldloc.1
-	ldc.i4 -596
+	ldc.i4 -132
 	add
 	stloc.1
-// 0x010a0a5c: 0x10a0a5c: addu  a1, zero, zero
+// 0x010a10a4: 0x10a10a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0a60: 0x10a0a60: addiu a2, zero, -2
+// 0x010a10a8: 0x10a10a8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0a64: 0x10a0a64: jal   0x1093a24 sw    t0, 16(sp)
+// 0x010a10ac: 0x10a10ac: jal   0x1094048 sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1973,38 +1973,38 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0a6c: 0x10a0a6c: lui   s5, 0x10000
+// 0x010a10b4: 0x10a10b4: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010a0a70: 0x10a0a70: addiu a1, s2, 31980
+// 0x010a10b8: 0x10a10b8: addiu a1, s2, 31980
 	ldloc 15
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a0a74: 0x10a0a74: addiu a2, s1, 23008
+// 0x010a10bc: 0x10a10bc: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a0a78: 0x10a0a78: addu  a0, v0, zero
+// 0x010a10c0: 0x10a10c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0a7c: 0x10a0a7c: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a10c4: 0x10a10c4: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a0a84: 0x10a0a84: jal   0x101cd60 addiu a0, s5, 31740
+// 0x010a10cc: 0x10a10cc: jal   0x101cd70 addiu a0, s5, 32204
 	ldloc 10
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.1
 	ldloc.0
@@ -2012,12 +2012,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0a8c: 0x10a0a8c: lw    v1, 60(sp)
+// 0x010a10d4: 0x10a10d4: lw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2026,18 +2026,18 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a0a90: 0x10a0a90: addiu a2, zero, 12
+// 0x010a10d8: 0x10a10d8: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x010a0a94: 0x10a0a94: addiu a0, v1, 9016
+// 0x010a10dc: 0x10a10dc: addiu a0, v1, 9480
 	ldloc 6
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x010a0a98: 0x10a0a98: addiu a3, zero, 4112
+// 0x010a10e0: 0x10a10e0: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a0a9c: 0x10a0a9c: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a10e4: 0x10a10e4: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2045,27 +2045,27 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0aa4: 0x10a0aa4: addu  a1, v0, zero
+// 0x010a10ec: 0x10a10ec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0aa8: 0x10a0aa8: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a10f0: 0x10a10f0: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ab0: 0x10a0ab0: jal   0x101cd60 addiu a0, s5, 31740
+// 0x010a10f8: 0x10a10f8: jal   0x101cd70 addiu a0, s5, 32204
 	ldloc 10
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.1
 	ldloc.0
@@ -2073,12 +2073,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ab8: 0x10a0ab8: lw    t1, 52(sp)
+// 0x010a1100: 0x10a1100: lw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2087,23 +2087,23 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010a0abc: 0x10a0abc: addiu a2, zero, 18
+// 0x010a1104: 0x10a1104: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a0ac0: 0x10a0ac0: addu  a3, zero, zero
+// 0x010a1108: 0x10a1108: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a0ac4: 0x10a0ac4: addiu a1, s8, 18500
+// 0x010a110c: 0x10a110c: addiu a1, s8, 18768
 	ldloc 14
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a0ac8: 0x10a0ac8: addiu a0, s5, 31740
+// 0x010a1110: 0x10a1110: addiu a0, s5, 32204
 	ldloc 10
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.1
-// 0x010a0acc: 0x10a0acc: sw    t1, 20(sp)
+// 0x010a1114: 0x10a1114: sw    t1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2112,7 +2112,7 @@ L_10a07e0:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010a0ad0: 0x10a0ad0: sw    s7, 16(sp)
+// 0x010a1118: 0x10a1118: sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2121,7 +2121,7 @@ L_10a07e0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a0ad4: 0x10a0ad4: jal   0x109683c sw    v0, 24(sp)
+// 0x010a111c: 0x10a111c: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2135,17 +2135,17 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0adc: 0x10a0adc: addiu a0, s5, 31740
+// 0x010a1124: 0x10a1124: addiu a0, s5, 32204
 	ldloc 10
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.1
-// 0x010a0ae0: 0x10a0ae0: jal   0x101cd60 addu  s7, v0, zero
+// 0x010a1128: 0x10a1128: jal   0x101cd70 addu  s7, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2153,87 +2153,87 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ae8: 0x10a0ae8: addu  a1, v0, zero
+// 0x010a1130: 0x10a1130: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0aec: 0x10a0aec: jal   0x1096544 addu  a0, s7, zero
+// 0x010a1134: 0x10a1134: jal   0x1096b8c addu  a0, s7, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl112::ssd_entry_set_editbox_title_1096544(int32,int32)
+	call int32 Cibyl112::ssd_entry_set_editbox_title_1096b8c(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a0af4: 0x10a0af4: addu  a0, s3, zero
+// 0x010a113c: 0x10a113c: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010a0af8: 0x10a0af8: jal   0x1098ec4 addu  a1, s7, zero
+// 0x010a1140: 0x10a1140: jal   0x109950c addu  a1, s7, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b00: 0x10a0b00: addu  a0, s4, zero
+// 0x010a1148: 0x10a1148: addu  a0, s4, zero
 	ldloc 16
 	stloc.1
-// 0x010a0b04: 0x10a0b04: jal   0x1098ec4 addu  a1, s3, zero
+// 0x010a114c: 0x10a114c: jal   0x109950c addu  a1, s3, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b0c: 0x10a0b0c: addu  a1, s4, zero
+// 0x010a1154: 0x10a1154: addu  a1, s4, zero
 	ldloc 16
 	stloc.2
-// 0x010a0b10: 0x10a0b10: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a1158: 0x10a1158: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b18: 0x10a0b18: lui   s4, 0x41100000
+// 0x010a1160: 0x10a1160: lui   s4, 0x41100000
 	ldc.i4 1091567616
 	stloc 16
-// 0x010a0b1c: 0x10a0b1c: lui   v1, 0x20000
+// 0x010a1164: 0x10a1164: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010a0b20: 0x10a0b20: addiu a0, v1, -584
+// 0x010a1168: 0x10a1168: addiu a0, v1, -120
 	ldloc 6
-	ldc.i4 -584
+	ldc.i4.s -120
 	add
 	stloc.1
-// 0x010a0b24: 0x10a0b24: addiu a3, zero, -1
+// 0x010a116c: 0x10a116c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0b28: 0x10a0b28: ori   s4, s4, 20616
+// 0x010a1170: 0x10a1170: ori   s4, s4, 20616
 	ldloc 16
 	ldc.i4 20616
 	or
 	stloc 16
-// 0x010a0b2c: 0x10a0b2c: addu  a1, zero, zero
+// 0x010a1174: 0x10a1174: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0b30: 0x10a0b30: addiu a2, zero, -2
+// 0x010a1178: 0x10a1178: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0b34: 0x10a0b34: sw    v1, 60(sp)
+// 0x010a117c: 0x10a117c: sw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2242,7 +2242,7 @@ L_10a07e0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a0b38: 0x10a0b38: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010a1180: 0x10a1180: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2256,36 +2256,36 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b40: 0x10a0b40: addu  a0, v0, zero
+// 0x010a1188: 0x10a1188: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0b44: 0x10a0b44: addiu a1, s2, 31980
+// 0x010a118c: 0x10a118c: addiu a1, s2, 31980
 	ldloc 15
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a0b48: 0x10a0b48: addiu a2, s1, 23008
+// 0x010a1190: 0x10a1190: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a0b4c: 0x10a0b4c: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a1194: 0x10a1194: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a0b54: 0x10a0b54: lui   a0, 0x0
+// 0x010a119c: 0x10a119c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a0b58: 0x10a0b58: jal   0x100e348 addiu a0, a0, 17724
+// 0x010a11a0: 0x10a11a0: jal   0x100e358 addiu a0, a0, 17724
 	ldloc.1
 	ldc.i4 17724
 	add
@@ -2295,27 +2295,27 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b60: 0x10a0b60: lui   s8, 0x10000
+// 0x010a11a8: 0x10a11a8: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010a0b64: 0x10a0b64: addiu a1, zero, 10
+// 0x010a11ac: 0x10a11ac: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010a0b68: 0x10a0b68: addu  a2, zero, zero
+// 0x010a11b0: 0x10a11b0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a0b6c: 0x10a0b6c: addu  a0, s3, zero
+// 0x010a11b4: 0x10a11b4: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010a0b70: 0x10a0b70: addu  s7, v0, zero
+// 0x010a11b8: 0x10a11b8: addu  s7, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010a0b74: 0x10a0b74: sw    v0, 32(sp)
+// 0x010a11bc: 0x10a11bc: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2324,7 +2324,7 @@ L_10a07e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a0b78: 0x10a0b78: jal   0x109434c sw    zero, 36(sp)
+// 0x010a11c0: 0x10a11c0: jal   0x1094970 sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2338,12 +2338,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b80: 0x10a0b80: jal   0x101cd60 addiu a0, s8, -29596
+// 0x010a11c8: 0x10a11c8: jal   0x101cd70 addiu a0, s8, -29596
 	ldloc 14
 	ldc.i4 -29596
 	add
@@ -2353,15 +2353,15 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b88: 0x10a0b88: addu  a0, s7, zero
+// 0x010a11d0: 0x10a11d0: addu  a0, s7, zero
 	ldloc 12
 	stloc.1
-// 0x010a0b8c: 0x10a0b8c: jal   0x101cd60 sw    v0, 48(sp)
+// 0x010a11d4: 0x10a11d4: jal   0x101cd70 sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2375,12 +2375,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0b94: 0x10a0b94: lw    a1, 48(sp)
+// 0x010a11dc: 0x10a11dc: lw    a1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2389,32 +2389,32 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a0b98: 0x10a0b98: addiu s5, sp, 32
+// 0x010a11e0: 0x10a11e0: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x010a0b9c: 0x10a0b9c: lui   t0, 0x10a0000
+// 0x010a11e4: 0x10a11e4: lui   t0, 0x10a0000
 	ldc.i4 17432576
 	stloc 13
-// 0x010a0ba0: 0x10a0ba0: addiu t0, t0, 4580
+// 0x010a11e8: 0x10a11e8: addiu t0, t0, 6188
 	ldloc 13
-	ldc.i4 4580
+	ldc.i4 6188
 	add
 	stloc 13
-// 0x010a0ba4: 0x10a0ba4: addiu a3, zero, 1
+// 0x010a11ec: 0x10a11ec: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010a0ba8: 0x10a0ba8: addu  a0, a1, zero
+// 0x010a11f0: 0x10a11f0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010a0bac: 0x10a0bac: addu  a2, s5, zero
+// 0x010a11f4: 0x10a11f4: addu  a2, s5, zero
 	ldloc 10
 	stloc.3
-// 0x010a0bb0: 0x10a0bb0: addu  a1, v0, zero
+// 0x010a11f8: 0x10a11f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0bb4: 0x10a0bb4: sw    t0, 20(sp)
+// 0x010a11fc: 0x10a11fc: sw    t0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2423,7 +2423,7 @@ L_10a07e0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a0bb8: 0x10a0bb8: sw    t0, 56(sp)
+// 0x010a1200: 0x10a1200: sw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2432,7 +2432,7 @@ L_10a07e0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a0bbc: 0x10a0bbc: jal   0x1090ecc sw    zero, 16(sp)
+// 0x010a1204: 0x10a1204: jal   0x10914f0 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2446,31 +2446,31 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0bc4: 0x10a0bc4: addu  a1, v0, zero
+// 0x010a120c: 0x10a120c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0bc8: 0x10a0bc8: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a1210: 0x10a1210: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0bd0: 0x10a0bd0: addu  a0, s3, zero
+// 0x010a1218: 0x10a1218: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010a0bd4: 0x10a0bd4: addiu a1, zero, 10
+// 0x010a121c: 0x10a121c: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010a0bd8: 0x10a0bd8: jal   0x109434c addu  a2, zero, zero
+// 0x010a1220: 0x10a1220: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2478,12 +2478,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0be0: 0x10a0be0: jal   0x101cd60 addiu a0, s8, -29596
+// 0x010a1228: 0x10a1228: jal   0x101cd70 addiu a0, s8, -29596
 	ldloc 14
 	ldc.i4 -29596
 	add
@@ -2493,26 +2493,26 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0be8: 0x10a0be8: lui   a0, 0x20000
+// 0x010a1230: 0x10a1230: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0bec: 0x10a0bec: addiu a2, zero, 12
+// 0x010a1234: 0x10a1234: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x010a0bf0: 0x10a0bf0: addiu a3, zero, 4112
+// 0x010a1238: 0x10a1238: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a0bf4: 0x10a0bf4: addiu a0, a0, -572
+// 0x010a123c: 0x10a123c: addiu a0, a0, -108
 	ldloc.1
-	ldc.i4 -572
+	ldc.i4.s -108
 	add
 	stloc.1
-// 0x010a0bf8: 0x10a0bf8: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a1240: 0x10a1240: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2520,25 +2520,25 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c00: 0x10a0c00: addu  a1, v0, zero
+// 0x010a1248: 0x10a1248: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0c04: 0x10a0c04: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a124c: 0x10a124c: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c0c: 0x10a0c0c: lw    t0, 56(sp)
+// 0x010a1254: 0x10a1254: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2547,10 +2547,10 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a0c10: 0x10a0c10: addu  a1, s3, zero
+// 0x010a1258: 0x10a1258: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x010a0c14: 0x10a0c14: sw    t0, 112(s3)
+// 0x010a125c: 0x10a125c: sw    t0, 112(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2559,34 +2559,34 @@ L_10a07e0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a0c18: 0x10a0c18: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a1260: 0x10a1260: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c20: 0x10a0c20: lui   a0, 0x20000
+// 0x010a1268: 0x10a1268: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0c24: 0x10a0c24: addiu a3, zero, -1
+// 0x010a126c: 0x10a126c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0c28: 0x10a0c28: addiu a0, a0, -560
+// 0x010a1270: 0x10a1270: addiu a0, a0, -96
 	ldloc.1
-	ldc.i4 -560
+	ldc.i4.s -96
 	add
 	stloc.1
-// 0x010a0c2c: 0x10a0c2c: addu  a1, zero, zero
+// 0x010a1274: 0x10a1274: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0c30: 0x10a0c30: addiu a2, zero, -2
+// 0x010a1278: 0x10a1278: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0c34: 0x10a0c34: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010a127c: 0x10a127c: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2600,46 +2600,46 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c3c: 0x10a0c3c: addu  a0, v0, zero
+// 0x010a1284: 0x10a1284: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0c40: 0x10a0c40: addiu a1, s2, 31980
+// 0x010a1288: 0x10a1288: addiu a1, s2, 31980
 	ldloc 15
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a0c44: 0x10a0c44: addiu a2, s1, 23008
+// 0x010a128c: 0x10a128c: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a0c48: 0x10a0c48: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a1290: 0x10a1290: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a0c50: 0x10a0c50: lui   v0, 0x10000
+// 0x010a1298: 0x10a1298: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a0c54: 0x10a0c54: addiu a0, s8, -29596
+// 0x010a129c: 0x10a129c: addiu a0, s8, -29596
 	ldloc 14
 	ldc.i4 -29596
 	add
 	stloc.1
-// 0x010a0c58: 0x10a0c58: addiu v0, v0, -18640
+// 0x010a12a0: 0x10a12a0: addiu v0, v0, -18640
 	ldloc 5
 	ldc.i4 -18640
 	add
 	stloc 5
-// 0x010a0c5c: 0x10a0c5c: sw    v0, 32(sp)
+// 0x010a12a4: 0x10a12a4: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2648,7 +2648,7 @@ L_10a07e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a0c60: 0x10a0c60: jal   0x101cd60 sw    zero, 36(sp)
+// 0x010a12a8: 0x10a12a8: jal   0x101cd70 sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2662,15 +2662,15 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c68: 0x10a0c68: addu  a0, s7, zero
+// 0x010a12b0: 0x10a12b0: addu  a0, s7, zero
 	ldloc 12
 	stloc.1
-// 0x010a0c6c: 0x10a0c6c: jal   0x101cd60 addu  s8, v0, zero
+// 0x010a12b4: 0x10a12b4: jal   0x101cd70 addu  s8, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -2678,24 +2678,24 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c74: 0x10a0c74: addu  a1, v0, zero
+// 0x010a12bc: 0x10a12bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0c78: 0x10a0c78: addu  a2, s5, zero
+// 0x010a12c0: 0x10a12c0: addu  a2, s5, zero
 	ldloc 10
 	stloc.3
-// 0x010a0c7c: 0x10a0c7c: addiu a3, zero, 1
+// 0x010a12c4: 0x10a12c4: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010a0c80: 0x10a0c80: addu  a0, s8, zero
+// 0x010a12c8: 0x10a12c8: addu  a0, s8, zero
 	ldloc 14
 	stloc.1
-// 0x010a0c84: 0x10a0c84: sw    zero, 16(sp)
+// 0x010a12cc: 0x10a12cc: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2704,7 +2704,7 @@ L_10a07e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a0c88: 0x10a0c88: jal   0x1090ecc sw    zero, 20(sp)
+// 0x010a12d0: 0x10a12d0: jal   0x10914f0 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2718,28 +2718,28 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c90: 0x10a0c90: addu  a1, v0, zero
+// 0x010a12d8: 0x10a12d8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0c94: 0x10a0c94: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a12dc: 0x10a12dc: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0c9c: 0x10a0c9c: lui   a0, 0x10000
+// 0x010a12e4: 0x10a12e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a0ca0: 0x10a0ca0: jal   0x101cd60 addiu a0, a0, -18620
+// 0x010a12e8: 0x10a12e8: jal   0x101cd70 addiu a0, a0, -18620
 	ldloc.1
 	ldc.i4 -18620
 	add
@@ -2749,26 +2749,26 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ca8: 0x10a0ca8: lui   a0, 0x20000
+// 0x010a12f0: 0x10a12f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0cac: 0x10a0cac: addiu a2, zero, -1
+// 0x010a12f4: 0x10a12f4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a0cb0: 0x10a0cb0: addiu a3, zero, 4112
+// 0x010a12f8: 0x10a12f8: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a0cb4: 0x10a0cb4: addiu a0, a0, -544
+// 0x010a12fc: 0x10a12fc: addiu a0, a0, -80
 	ldloc.1
-	ldc.i4 -544
+	ldc.i4.s -80
 	add
 	stloc.1
-// 0x010a0cb8: 0x10a0cb8: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a1300: 0x10a1300: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2776,33 +2776,33 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0cc0: 0x10a0cc0: addu  a1, v0, zero
+// 0x010a1308: 0x10a1308: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0cc4: 0x10a0cc4: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a130c: 0x10a130c: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ccc: 0x10a0ccc: lui   v0, 0x1090000
+// 0x010a1314: 0x10a1314: lui   v0, 0x1090000
 	ldc.i4 17367040
 	stloc 5
-// 0x010a0cd0: 0x10a0cd0: addiu v0, v0, -7864
+// 0x010a1318: 0x10a1318: addiu v0, v0, -6292
 	ldloc 5
-	ldc.i4 -7864
+	ldc.i4 -6292
 	add
 	stloc 5
-// 0x010a0cd4: 0x10a0cd4: sw    v0, 112(s3)
+// 0x010a131c: 0x10a131c: sw    v0, 112(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2811,37 +2811,37 @@ L_10a07e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a0cd8: 0x10a0cd8: addu  a1, s3, zero
+// 0x010a1320: 0x10a1320: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x010a0cdc: 0x10a0cdc: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a1324: 0x10a1324: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ce4: 0x10a0ce4: lui   a0, 0x20000
+// 0x010a132c: 0x10a132c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0ce8: 0x10a0ce8: addu  a3, s6, zero
+// 0x010a1330: 0x10a1330: addu  a3, s6, zero
 	ldloc 17
 	stloc 4
-// 0x010a0cec: 0x10a0cec: addiu a0, a0, -528
+// 0x010a1334: 0x10a1334: addiu a0, a0, -64
 	ldloc.1
-	ldc.i4 -528
+	ldc.i4.s -64
 	add
 	stloc.1
-// 0x010a0cf0: 0x10a0cf0: addu  a1, zero, zero
+// 0x010a1338: 0x10a1338: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0cf4: 0x10a0cf4: addiu a2, zero, -2
+// 0x010a133c: 0x10a133c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0cf8: 0x10a0cf8: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010a1340: 0x10a1340: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2855,71 +2855,71 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0d00: 0x10a0d00: addu  a0, v0, zero
+// 0x010a1348: 0x10a1348: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0d04: 0x10a0d04: addu  a1, zero, zero
+// 0x010a134c: 0x10a134c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0d08: 0x10a0d08: addu  a2, zero, zero
+// 0x010a1350: 0x10a1350: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a0d0c: 0x10a0d0c: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a1354: 0x10a1354: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a0d14: 0x10a0d14: lui   v0, 0xf0000
+// 0x010a135c: 0x10a135c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a0d18: 0x10a0d18: lw    a2, -30068(v0)
+// 0x010a1360: 0x10a1360: lw    a2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a0d1c: 0x10a0d1c: addiu a0, zero, 3
+// 0x010a1364: 0x10a1364: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010a0d20: 0x10a0d20: sll   a2, a2, 1
+// 0x010a1368: 0x10a1368: sll   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x010a0d24: 0x10a0d24: div   a2, a0
+// 0x010a136c: 0x10a136c: div   a2, a0
 	ldloc.3
 	ldloc.1
 	div
 	stloc 21
-// 0x010a0d28: 0x10a0d28: lui   a0, 0x10000
+// 0x010a1370: 0x10a1370: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a0d2c: 0x10a0d2c: addu  a3, s6, zero
+// 0x010a1374: 0x10a1374: addu  a3, s6, zero
 	ldloc 17
 	stloc 4
-// 0x010a0d30: 0x10a0d30: addiu a0, a0, -27636
+// 0x010a1378: 0x10a1378: addiu a0, a0, -27636
 	ldloc.1
 	ldc.i4 -27636
 	add
 	stloc.1
-// 0x010a0d34: 0x10a0d34: addu  a1, zero, zero
+// 0x010a137c: 0x10a137c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0d38: 0x10a0d38: addiu v0, zero, 16
+// 0x010a1380: 0x10a1380: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a0d3c: 0x10a0d3c: sw    v0, 16(sp)
+// 0x010a1384: 0x10a1384: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2928,13 +2928,13 @@ L_10a07e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a0d40: 0x10a0d40: lui   s7, 0x10000
+// 0x010a1388: 0x10a1388: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x010a0d44: 0x10a0d44: mflo  lo
+// 0x010a138c: 0x10a138c: mflo  lo
 	ldloc 21
 	stloc.3
-// 0x010a0d48: 0x10a0d48: jal   0x1093a24 lui   s6, 0x0
+// 0x010a1390: 0x10a1390: jal   0x1094048 lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 17
 	ldloc.0
@@ -2942,34 +2942,34 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0d50: 0x10a0d50: addu  a0, v0, zero
+// 0x010a1398: 0x10a1398: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0d54: 0x10a0d54: addu  a1, zero, zero
+// 0x010a139c: 0x10a139c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0d58: 0x10a0d58: addu  a2, zero, zero
+// 0x010a13a0: 0x10a13a0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a0d5c: 0x10a0d5c: jal   0x1098fe0 addu  s8, v0, zero
+// 0x010a13a4: 0x10a13a4: jal   0x1099628 addu  s8, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a0d64: 0x10a0d64: lui   a0, 0x20000
+// 0x010a13ac: 0x10a13ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0d68: 0x10a0d68: jal   0x101cd60 addiu a0, a0, -512
+// 0x010a13b0: 0x10a13b0: jal   0x101cd70 addiu a0, a0, -48
 	ldloc.1
-	ldc.i4 -512
+	ldc.i4.s -48
 	add
 	stloc.1
 	ldloc.0
@@ -2977,26 +2977,26 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0d70: 0x10a0d70: lui   a0, 0x20000
+// 0x010a13b8: 0x10a13b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0d74: 0x10a0d74: addiu a2, zero, -1
+// 0x010a13bc: 0x10a13bc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a0d78: 0x10a0d78: addiu a3, zero, 4240
+// 0x010a13c0: 0x10a13c0: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a0d7c: 0x10a0d7c: addiu a0, a0, -488
+// 0x010a13c4: 0x10a13c4: addiu a0, a0, -24
 	ldloc.1
-	ldc.i4 -488
+	ldc.i4.s -24
 	add
 	stloc.1
-// 0x010a0d80: 0x10a0d80: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a13c8: 0x10a13c8: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3004,55 +3004,55 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0d88: 0x10a0d88: addu  a1, v0, zero
+// 0x010a13d0: 0x10a13d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0d8c: 0x10a0d8c: jal   0x1098ec4 addu  a0, s8, zero
+// 0x010a13d4: 0x10a13d4: jal   0x109950c addu  a0, s8, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0d94: 0x10a0d94: addu  a0, s3, zero
+// 0x010a13dc: 0x10a13dc: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010a0d98: 0x10a0d98: jal   0x1098ec4 addu  a1, s8, zero
+// 0x010a13e0: 0x10a13e0: jal   0x109950c addu  a1, s8, zero
 	ldloc 14
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0da0: 0x10a0da0: lui   a0, 0x20000
+// 0x010a13e8: 0x10a13e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0da4: 0x10a0da4: addiu a2, zero, 18
+// 0x010a13ec: 0x10a13ec: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a0da8: 0x10a0da8: addu  a3, zero, zero
+// 0x010a13f0: 0x10a13f0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a0dac: 0x10a0dac: addiu a0, a0, -736
+// 0x010a13f4: 0x10a13f4: addiu a0, a0, -272
 	ldloc.1
-	ldc.i4 -736
+	ldc.i4 -272
 	add
 	stloc.1
-// 0x010a0db0: 0x10a0db0: addiu a1, zero, 1
+// 0x010a13f8: 0x10a13f8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a0db4: 0x10a0db4: sw    zero, 16(sp)
+// 0x010a13fc: 0x10a13fc: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3061,7 +3061,7 @@ L_10a07e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a0db8: 0x10a0db8: sw    zero, 20(sp)
+// 0x010a1400: 0x10a1400: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3070,7 +3070,7 @@ L_10a07e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a0dbc: 0x10a0dbc: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a1404: 0x10a1404: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3084,38 +3084,38 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0dc4: 0x10a0dc4: addu  a1, v0, zero
+// 0x010a140c: 0x10a140c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0dc8: 0x10a0dc8: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a1410: 0x10a1410: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0dd0: 0x10a0dd0: addu  a1, s3, zero
+// 0x010a1418: 0x10a1418: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x010a0dd4: 0x10a0dd4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a141c: 0x10a141c: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ddc: 0x10a0ddc: lw    v1, 60(sp)
+// 0x010a1424: 0x10a1424: lw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3124,21 +3124,21 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a0de0: 0x10a0de0: addiu a3, zero, -1
+// 0x010a1428: 0x10a1428: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0de4: 0x10a0de4: addiu a0, v1, -584
+// 0x010a142c: 0x10a142c: addiu a0, v1, -120
 	ldloc 6
-	ldc.i4 -584
+	ldc.i4.s -120
 	add
 	stloc.1
-// 0x010a0de8: 0x10a0de8: addu  a1, zero, zero
+// 0x010a1430: 0x10a1430: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0dec: 0x10a0dec: addiu a2, zero, -2
+// 0x010a1434: 0x10a1434: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0df0: 0x10a0df0: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010a1438: 0x10a1438: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3152,33 +3152,33 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0df8: 0x10a0df8: addu  a0, v0, zero
+// 0x010a1440: 0x10a1440: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a0dfc: 0x10a0dfc: addiu a1, s2, 31980
+// 0x010a1444: 0x10a1444: addiu a1, s2, 31980
 	ldloc 15
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a0e00: 0x10a0e00: addiu a2, s1, 23008
+// 0x010a1448: 0x10a1448: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a0e04: 0x10a0e04: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a144c: 0x10a144c: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a0e0c: 0x10a0e0c: jal   0x1034d94 lui   s1, 0x10a0000
+// 0x010a1454: 0x10a1454: jal   0x1034da4 lui   s1, 0x10a0000
 	ldc.i4 17432576
 	stloc 9
 	ldloc.0
@@ -3186,17 +3186,17 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_get_1034d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_get_1034da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e14: 0x10a0e14: addiu a0, s7, -13468
+// 0x010a145c: 0x10a145c: addiu a0, s7, -13472
 	ldloc 12
-	ldc.i4 -13468
+	ldc.i4 -13472
 	add
 	stloc.1
-// 0x010a0e18: 0x10a0e18: sw    v0, 32(sp)
+// 0x010a1460: 0x10a1460: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3205,7 +3205,7 @@ L_10a07e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a0e1c: 0x10a0e1c: jal   0x101cd60 sw    zero, 36(sp)
+// 0x010a1464: 0x10a1464: jal   0x101cd70 sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3219,26 +3219,26 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e24: 0x10a0e24: lui   a0, 0x20000
+// 0x010a146c: 0x10a146c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0e28: 0x10a0e28: addiu a2, zero, 12
+// 0x010a1470: 0x10a1470: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x010a0e2c: 0x10a0e2c: addiu a3, zero, 4112
+// 0x010a1474: 0x10a1474: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a0e30: 0x10a0e30: addiu a0, a0, -472
+// 0x010a1478: 0x10a1478: addiu a0, a0, -8
 	ldloc.1
-	ldc.i4 -472
+	ldc.i4.s -8
 	add
 	stloc.1
-// 0x010a0e34: 0x10a0e34: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a147c: 0x10a147c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3246,27 +3246,27 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e3c: 0x10a0e3c: addu  a1, v0, zero
+// 0x010a1484: 0x10a1484: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0e40: 0x10a0e40: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a1488: 0x10a1488: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e48: 0x10a0e48: jal   0x101cd60 addiu a0, s7, -13468
+// 0x010a1490: 0x10a1490: jal   0x101cd70 addiu a0, s7, -13472
 	ldloc 12
-	ldc.i4 -13468
+	ldc.i4 -13472
 	add
 	stloc.1
 	ldloc.0
@@ -3274,12 +3274,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e50: 0x10a0e50: jal   0x1034d94 addu  s2, v0, zero
+// 0x010a1498: 0x10a1498: jal   0x1034da4 addu  s2, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -3287,12 +3287,12 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_get_1034d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_get_1034da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e58: 0x10a0e58: jal   0x101cd60 addu  a0, v0, zero
+// 0x010a14a0: 0x10a14a0: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3300,32 +3300,32 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e60: 0x10a0e60: addu  a2, s5, zero
+// 0x010a14a8: 0x10a14a8: addu  a2, s5, zero
 	ldloc 10
 	stloc.3
-// 0x010a0e64: 0x10a0e64: addiu a3, zero, 1
+// 0x010a14ac: 0x10a14ac: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010a0e68: 0x10a0e68: addiu s1, s1, 4476
+// 0x010a14b0: 0x10a14b0: addiu s1, s1, 6084
 	ldloc 9
-	ldc.i4 4476
+	ldc.i4 6084
 	add
 	stloc 9
-// 0x010a0e6c: 0x10a0e6c: addu  a1, v0, zero
+// 0x010a14b4: 0x10a14b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0e70: 0x10a0e70: addu  a0, s2, zero
+// 0x010a14b8: 0x10a14b8: addu  a0, s2, zero
 	ldloc 15
 	stloc.1
-// 0x010a0e74: 0x10a0e74: addiu v0, zero, 1
+// 0x010a14bc: 0x10a14bc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a0e78: 0x10a0e78: sw    s1, 20(sp)
+// 0x010a14c0: 0x10a14c0: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3334,7 +3334,7 @@ L_10a07e0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a0e7c: 0x10a0e7c: jal   0x1090ecc sw    v0, 16(sp)
+// 0x010a14c4: 0x10a14c4: jal   0x10914f0 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3348,25 +3348,25 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e84: 0x10a0e84: addu  a1, v0, zero
+// 0x010a14cc: 0x10a14cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0e88: 0x10a0e88: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a14d0: 0x10a14d0: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0e90: 0x10a0e90: sw    s1, 112(s3)
+// 0x010a14d8: 0x10a14d8: sw    s1, 112(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3375,20 +3375,20 @@ L_10a07e0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a0e94: 0x10a0e94: addu  a1, s3, zero
+// 0x010a14dc: 0x10a14dc: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x010a0e98: 0x10a0e98: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a14e0: 0x10a14e0: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ea0: 0x10a0ea0: lw    t3, 64(sp)
+// 0x010a14e8: 0x10a14e8: lw    t3, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3397,24 +3397,24 @@ L_10a07e0:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010a0ea4: 0x10a0ea4: lui   a0, 0x20000
+// 0x010a14ec: 0x10a14ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0ea8: 0x10a0ea8: addiu a0, a0, -460
+// 0x010a14f0: 0x10a14f0: addiu a0, a0, 4
 	ldloc.1
-	ldc.i4 -460
+	ldc.i4.4
 	add
 	stloc.1
-// 0x010a0eac: 0x10a0eac: addu  a1, zero, zero
+// 0x010a14f4: 0x10a14f4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a0eb0: 0x10a0eb0: addiu a2, zero, -2
+// 0x010a14f8: 0x10a14f8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a0eb4: 0x10a0eb4: addiu a3, zero, -1
+// 0x010a14fc: 0x10a14fc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a0eb8: 0x10a0eb8: jal   0x1093a24 sw    t3, 16(sp)
+// 0x010a1500: 0x10a1500: jal   0x1094048 sw    t3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3428,44 +3428,44 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ec0: 0x10a0ec0: lui   a2, 0x10000
+// 0x010a1508: 0x10a1508: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010a0ec4: 0x10a0ec4: lui   a3, 0x10a0000
+// 0x010a150c: 0x10a150c: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x010a0ec8: 0x10a0ec8: lui   a0, 0x20000
+// 0x010a1510: 0x10a1510: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0ecc: 0x10a0ecc: lui   a1, 0x20000
+// 0x010a1514: 0x10a1514: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a0ed0: 0x10a0ed0: addiu a2, a2, -27864
+// 0x010a1518: 0x10a1518: addiu a2, a2, -27864
 	ldloc.3
 	ldc.i4 -27864
 	add
 	stloc.3
-// 0x010a0ed4: 0x10a0ed4: addiu a3, a3, 4444
+// 0x010a151c: 0x10a151c: addiu a3, a3, 6052
 	ldloc 4
-	ldc.i4 4444
+	ldc.i4 6052
 	add
 	stloc 4
-// 0x010a0ed8: 0x10a0ed8: addiu a0, a0, -444
+// 0x010a1520: 0x10a1520: addiu a0, a0, 20
 	ldloc.1
-	ldc.i4 -444
+	ldc.i4.s 20
 	add
 	stloc.1
-// 0x010a0edc: 0x10a0edc: addiu a1, a1, -428
+// 0x010a1524: 0x10a1524: addiu a1, a1, 36
 	ldloc.2
-	ldc.i4 -428
+	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010a0ee0: 0x10a0ee0: jal   0x10a066c addu  s1, v0, zero
+// 0x010a1528: 0x10a1528: jal   0x10a0cb4 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -3473,30 +3473,30 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::create_button_group_10a066c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::create_button_group_10a0cb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ee8: 0x10a0ee8: addu  a1, v0, zero
+// 0x010a1530: 0x10a1530: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0eec: 0x10a0eec: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a1534: 0x10a1534: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0ef4: 0x10a0ef4: addiu a0, s6, 32244
+// 0x010a153c: 0x10a153c: addiu a0, s6, 32244
 	ldloc 17
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a0ef8: 0x10a0ef8: jal   0x109e6d0 addu  a1, zero, zero
+// 0x010a1540: 0x10a1540: jal   0x109ed18 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3504,52 +3504,52 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f00: 0x10a0f00: addu  a1, v0, zero
+// 0x010a1548: 0x10a1548: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0f04: 0x10a0f04: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a154c: 0x10a154c: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f0c: 0x10a0f0c: lui   a2, 0x10000
+// 0x010a1554: 0x10a1554: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010a0f10: 0x10a0f10: lui   a3, 0x10a0000
+// 0x010a1558: 0x10a1558: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x010a0f14: 0x10a0f14: lui   a0, 0x20000
+// 0x010a155c: 0x10a155c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0f18: 0x10a0f18: lui   a1, 0x10000
+// 0x010a1560: 0x10a1560: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a0f1c: 0x10a0f1c: addiu a2, a2, -27836
+// 0x010a1564: 0x10a1564: addiu a2, a2, -27836
 	ldloc.3
 	ldc.i4 -27836
 	add
 	stloc.3
-// 0x010a0f20: 0x10a0f20: addiu a3, a3, 4412
+// 0x010a1568: 0x10a1568: addiu a3, a3, 6020
 	ldloc 4
-	ldc.i4 4412
+	ldc.i4 6020
 	add
 	stloc 4
-// 0x010a0f24: 0x10a0f24: addiu a0, a0, -412
+// 0x010a156c: 0x10a156c: addiu a0, a0, 52
 	ldloc.1
-	ldc.i4 -412
+	ldc.i4.s 52
 	add
 	stloc.1
-// 0x010a0f28: 0x10a0f28: jal   0x10a066c addiu a1, a1, -28748
+// 0x010a1570: 0x10a1570: jal   0x10a0cb4 addiu a1, a1, -28748
 	ldloc.2
 	ldc.i4 -28748
 	add
@@ -3559,47 +3559,47 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::create_button_group_10a066c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::create_button_group_10a0cb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f30: 0x10a0f30: addu  a1, v0, zero
+// 0x010a1578: 0x10a1578: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0f34: 0x10a0f34: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a157c: 0x10a157c: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f3c: 0x10a0f3c: jal   0x1017a54 sll   zero, zero, 0
+// 0x010a1584: 0x10a1584: jal   0x1017a64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_is_enabled_1017a54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_is_enabled_1017a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f44: 0x10a0f44: beq   v0, zero, 0x10a0f98 addu  a1, s1, zero
+// 0x010a158c: 0x10a158c: beq   v0, zero, 0x10a15e0 addu  a1, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brfalse L_10a0f98
+	brfalse L_10a15e0
 // --- basic block ---
-// 0x010a0f4c: 0x10a0f4c: addiu a0, s6, 32244
+// 0x010a1594: 0x10a1594: addiu a0, s6, 32244
 	ldloc 17
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a0f50: 0x10a0f50: jal   0x109e6d0 addu  a1, zero, zero
+// 0x010a1598: 0x10a1598: jal   0x109ed18 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3607,54 +3607,54 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f58: 0x10a0f58: addu  a1, v0, zero
+// 0x010a15a0: 0x10a15a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0f5c: 0x10a0f5c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a15a4: 0x10a15a4: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f64: 0x10a0f64: lui   a0, 0x20000
+// 0x010a15ac: 0x10a15ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a0f68: 0x10a0f68: lui   a1, 0x20000
+// 0x010a15b0: 0x10a15b0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a0f6c: 0x10a0f6c: lui   a2, 0x0
+// 0x010a15b4: 0x10a15b4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010a0f70: 0x10a0f70: lui   a3, 0x10a0000
+// 0x010a15b8: 0x10a15b8: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x010a0f74: 0x10a0f74: addiu a0, a0, -396
+// 0x010a15bc: 0x10a15bc: addiu a0, a0, 68
 	ldloc.1
-	ldc.i4 -396
+	ldc.i4.s 68
 	add
 	stloc.1
-// 0x010a0f78: 0x10a0f78: addiu a1, a1, -376
+// 0x010a15c0: 0x10a15c0: addiu a1, a1, 88
 	ldloc.2
-	ldc.i4 -376
+	ldc.i4.s 88
 	add
 	stloc.2
-// 0x010a0f7c: 0x10a0f7c: addiu a2, a2, 30444
+// 0x010a15c4: 0x10a15c4: addiu a2, a2, 30444
 	ldloc.3
 	ldc.i4 30444
 	add
 	stloc.3
-// 0x010a0f80: 0x10a0f80: jal   0x10a066c addiu a3, a3, 4380
+// 0x010a15c8: 0x10a15c8: jal   0x10a0cb4 addiu a3, a3, 5988
 	ldloc 4
-	ldc.i4 4380
+	ldc.i4 5988
 	add
 	stloc 4
 	ldloc.0
@@ -3662,63 +3662,63 @@ L_10a07e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::create_button_group_10a066c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::create_button_group_10a0cb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f88: 0x10a0f88: addu  a1, v0, zero
+// 0x010a15d0: 0x10a15d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0f8c: 0x10a0f8c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a15d4: 0x10a15d4: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0f94: 0x10a0f94: addu  a1, s1, zero
+// 0x010a15dc: 0x10a15dc: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-L_10a0f98:
-// 0x010a0f98: 0x10a0f98: jal   0x1098ec4 addu  a0, s0, zero
+L_10a15e0:
+// 0x010a15e0: 0x10a15e0: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0fa0: 0x10a0fa0: lui   a0, 0x10000
+// 0x010a15e8: 0x10a15e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a0fa4: 0x10a0fa4: addiu a0, a0, -21272
+// 0x010a15ec: 0x10a15ec: addiu a0, a0, -21272
 	ldloc.1
 	ldc.i4 -21272
 	add
 	stloc.1
-// 0x010a0fa8: 0x10a0fa8: lui   a2, 0x300000
+// 0x010a15f0: 0x10a15f0: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x010a0fac: 0x10a0fac: lui   a3, 0x10a0000
+// 0x010a15f4: 0x10a15f4: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x010a0fb0: 0x10a0fb0: addu  a1, a0, zero
+// 0x010a15f8: 0x10a15f8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010a0fb4: 0x10a0fb4: ori   a2, a2, 26
+// 0x010a15fc: 0x10a15fc: ori   a2, a2, 26
 	ldloc.3
 	ldc.i4.s 26
 	or
 	stloc.3
-// 0x010a0fb8: 0x10a0fb8: jal   0x1091088 addiu a3, a3, 4340
+// 0x010a1600: 0x10a1600: jal   0x10916ac addiu a3, a3, 5948
 	ldloc 4
-	ldc.i4 4340
+	ldc.i4 5948
 	add
 	stloc 4
 	ldloc.0
@@ -3726,110 +3726,110 @@ L_10a0f98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0fc0: 0x10a0fc0: addu  a1, v0, zero
+// 0x010a1608: 0x10a1608: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a0fc4: 0x10a0fc4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a160c: 0x10a160c: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a0fcc: 0x10a0fcc: lui   v0, 0x80000
+// 0x010a1614: 0x10a1614: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a0fd0: 0x10a0fd0: sw    s0, 10028(v0)
+// 0x010a1618: 0x10a1618: sw    s0, 10492(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a0fd4: 0x10a0fd4: lui   v0, 0x80000
+// 0x010a161c: 0x10a161c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_10a0fd8:
-// 0x010a0fd8: 0x10a0fd8: lw    v0, 10032(v0)
+L_10a1620:
+// 0x010a1620: 0x10a1620: lw    v0, 10496(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2508
+	ldc.i4 2624
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a0fdc: 0x10a0fdc: sll   zero, zero, 0
-// 0x010a0fe0: 0x10a0fe0: bne   v0, zero, 0x10a10ac addiu v1, zero, 1
+// 0x010a1624: 0x10a1624: sll   zero, zero, 0
+// 0x010a1628: 0x10a1628: bne   v0, zero, 0x10a16f4 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_10a10ac
+	brtrue L_10a16f4
 // --- basic block ---
-// 0x010a0fe8: 0x10a0fe8: lui   v0, 0x0
+// 0x010a1630: 0x10a1630: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0fec: 0x10a0fec: lui   s0, 0x80000
+// 0x010a1634: 0x10a1634: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 11
-// 0x010a0ff0: 0x10a0ff0: addiu v0, v0, 32116
+// 0x010a1638: 0x10a1638: addiu v0, v0, 32116
 	ldloc 5
 	ldc.i4 32116
 	add
 	stloc 5
-// 0x010a0ff4: 0x10a0ff4: sw    v0, 10044(s0)
+// 0x010a163c: 0x10a163c: sw    v0, 10508(s0)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2511
+	ldc.i4 2627
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a0ff8: 0x10a0ff8: lui   v0, 0x0
+// 0x010a1640: 0x10a1640: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a0ffc: 0x10a0ffc: lui   s1, 0x80000
+// 0x010a1644: 0x10a1644: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x010a1000: 0x10a1000: addiu v0, v0, 32120
+// 0x010a1648: 0x10a1648: addiu v0, v0, 32120
 	ldloc 5
 	ldc.i4 32120
 	add
 	stloc 5
-// 0x010a1004: 0x10a1004: lui   a0, 0x0
+// 0x010a164c: 0x10a164c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a1008: 0x10a1008: addiu s2, s0, 10044
+// 0x010a1650: 0x10a1650: addiu s2, s0, 10508
 	ldloc 11
-	ldc.i4 10044
+	ldc.i4 10508
 	add
 	stloc 15
-// 0x010a100c: 0x10a100c: lw    s3, 10028(s1)
+// 0x010a1654: 0x10a1654: lw    s3, 10492(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a1010: 0x10a1010: addiu a0, a0, 18668
+// 0x010a1658: 0x10a1658: addiu a0, a0, 18668
 	ldloc.1
 	ldc.i4 18668
 	add
 	stloc.1
-// 0x010a1014: 0x10a1014: jal   0x100e348 sw    v0, 4(s2)
+// 0x010a165c: 0x10a165c: jal   0x100e358 sw    v0, 4(s2)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -3843,23 +3843,23 @@ L_10a0fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a101c: 0x10a101c: lui   a1, 0x20000
+// 0x010a1664: 0x10a1664: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a1020: 0x10a1020: addu  a0, s3, zero
+// 0x010a1668: 0x10a1668: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010a1024: 0x10a1024: addiu a1, a1, -712
+// 0x010a166c: 0x10a166c: addiu a1, a1, -248
 	ldloc.2
-	ldc.i4 -712
+	ldc.i4 -248
 	add
 	stloc.2
-// 0x010a1028: 0x10a1028: jal   0x109b3e0 addu  a2, v0, zero
+// 0x010a1670: 0x10a1670: jal   0x109ba28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3867,24 +3867,24 @@ L_10a0fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1030: 0x10a1030: lui   a0, 0x0
+// 0x010a1678: 0x10a1678: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a1034: 0x10a1034: lw    s3, 10028(s1)
+// 0x010a167c: 0x10a167c: lw    s3, 10492(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a1038: 0x10a1038: jal   0x100e348 addiu a0, a0, 18700
+// 0x010a1680: 0x10a1680: jal   0x100e358 addiu a0, a0, 18700
 	ldloc.1
 	ldc.i4 18700
 	add
@@ -3894,23 +3894,23 @@ L_10a0fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1040: 0x10a1040: lui   a1, 0x0
+// 0x010a1688: 0x10a1688: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a1044: 0x10a1044: addiu a1, a1, 32736
+// 0x010a168c: 0x10a168c: addiu a1, a1, 32736
 	ldloc.2
 	ldc.i4 32736
 	add
 	stloc.2
-// 0x010a1048: 0x10a1048: addu  a2, v0, zero
+// 0x010a1690: 0x10a1690: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a104c: 0x10a104c: jal   0x109b3e0 addu  a0, s3, zero
+// 0x010a1694: 0x10a1694: jal   0x109ba28 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3918,24 +3918,24 @@ L_10a0fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1054: 0x10a1054: lui   a0, 0x0
+// 0x010a169c: 0x10a169c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a1058: 0x10a1058: lw    s1, 10028(s1)
+// 0x010a16a0: 0x10a16a0: lw    s1, 10492(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a105c: 0x10a105c: jal   0x100e348 addiu a0, a0, 18684
+// 0x010a16a4: 0x10a16a4: jal   0x100e358 addiu a0, a0, 18684
 	ldloc.1
 	ldc.i4 18684
 	add
@@ -3945,23 +3945,23 @@ L_10a0fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1064: 0x10a1064: lui   a1, 0x10000
+// 0x010a16ac: 0x10a16ac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a1068: 0x10a1068: addu  a0, s1, zero
+// 0x010a16b0: 0x10a16b0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a106c: 0x10a106c: addiu a1, a1, 31740
+// 0x010a16b4: 0x10a16b4: addiu a1, a1, 32204
 	ldloc.2
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.2
-// 0x010a1070: 0x10a1070: jal   0x109b3e0 addu  a2, v0, zero
+// 0x010a16b8: 0x10a16b8: jal   0x109ba28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3969,44 +3969,44 @@ L_10a0fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1078: 0x10a1078: jal   0x106ac4c sll   zero, zero, 0
+// 0x010a16c0: 0x10a16c0: jal   0x106b270 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_AllowPing_106ac4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_AllowPing_106b270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1080: 0x10a1080: beq   v0, zero, 0x10a1094 lui   v0, 0x80000
+// 0x010a16c8: 0x10a16c8: beq   v0, zero, 0x10a16dc lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_10a1094
+	brfalse L_10a16dc
 // --- basic block ---
-// 0x010a1088: 0x10a1088: lw    a2, 10044(s0)
+// 0x010a16d0: 0x10a16d0: lw    a2, 10508(s0)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2511
+	ldc.i4 2627
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a108c: 0x10a108c: j	 0x10a109c lui   a1, 0x20000
+// 0x010a16d4: 0x10a16d4: j	 0x10a16e4 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_10a109c
+	br L_10a16e4
 // --- basic block ---
-L_10a1094:
-// 0x010a1094: 0x10a1094: lw    a2, 4(s2)
+L_10a16dc:
+// 0x010a16dc: 0x10a16dc: lw    a2, 4(s2)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -4015,22 +4015,22 @@ L_10a1094:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a1098: 0x10a1098: lui   a1, 0x20000
+// 0x010a16e0: 0x10a16e0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10a109c:
-// 0x010a109c: 0x10a109c: lw    a0, 10028(v0)
+L_10a16e4:
+// 0x010a16e4: 0x10a16e4: lw    a0, 10492(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a10a0: 0x10a10a0: jal   0x109b38c addiu a1, a1, -736
+// 0x010a16e8: 0x10a16e8: jal   0x109b9d4 addiu a1, a1, -272
 	ldloc.2
-	ldc.i4 -736
+	ldc.i4 -272
 	add
 	stloc.2
 	ldloc.0
@@ -4038,24 +4038,24 @@ L_10a109c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_data_109b38c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_data_109b9d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a10a8: 0x10a10a8: addiu v1, zero, 1
+// 0x010a16f0: 0x10a16f0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_10a10ac:
-// 0x010a10ac: 0x10a10ac: lui   v0, 0x80000
+L_10a16f4:
+// 0x010a16f4: 0x10a16f4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a10b0: 0x10a10b0: jal   0x109483c sw    v1, 10032(v0)
+// 0x010a16f8: 0x10a16f8: jal   0x1094e60 sw    v1, 10496(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2508
+	ldc.i4 2624
 	add
 	ldloc 6
 	stelem.i4
@@ -4064,12 +4064,12 @@ L_10a10ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a10b8: 0x10a10b8: lw    a0, 40(sp)
+// 0x010a1700: 0x10a1700: lw    a0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4078,7 +4078,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a10bc: 0x10a10bc: jal   0x1095eec addu  a1, zero, zero
+// 0x010a1704: 0x10a1704: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4086,13 +4086,13 @@ L_10a10ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a10c4: 0x10a10c4: lw    ra, 108(sp)
-// 0x010a10c8: 0x10a10c8: lw    s8, 104(sp)
+// 0x010a170c: 0x10a170c: lw    ra, 108(sp)
+// 0x010a1710: 0x10a1710: lw    s8, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4101,7 +4101,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a10cc: 0x10a10cc: lw    s7, 100(sp)
+// 0x010a1714: 0x10a1714: lw    s7, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4110,7 +4110,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a10d0: 0x10a10d0: lw    s6, 96(sp)
+// 0x010a1718: 0x10a1718: lw    s6, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4119,7 +4119,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a10d4: 0x10a10d4: lw    s5, 92(sp)
+// 0x010a171c: 0x10a171c: lw    s5, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4128,7 +4128,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a10d8: 0x10a10d8: lw    s4, 88(sp)
+// 0x010a1720: 0x10a1720: lw    s4, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4137,7 +4137,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a10dc: 0x10a10dc: lw    s3, 84(sp)
+// 0x010a1724: 0x10a1724: lw    s3, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4146,7 +4146,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a10e0: 0x10a10e0: lw    s2, 80(sp)
+// 0x010a1728: 0x10a1728: lw    s2, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4155,7 +4155,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a10e4: 0x10a10e4: lw    s1, 76(sp)
+// 0x010a172c: 0x10a172c: lw    s1, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4164,7 +4164,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a10e8: 0x10a10e8: lw    s0, 72(sp)
+// 0x010a1730: 0x10a1730: lw    s0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4173,7 +4173,7 @@ L_10a10ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a10ec: 0x10a10ec: jr    ra addiu sp, sp, 112
+// 0x010a1734: 0x10a1734: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -4185,7 +4185,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_ok_softkey_10a10f4(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_softkey_10a173c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -4220,24 +4220,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a10f4: 0x10a10f4: addiu sp, sp, -24
+// 0x010a173c: 0x10a173c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a10f8: 0x10a10f8: sw    ra, 20(sp)
-// 0x010a10fc: 0x10a10fc: jal   0x10a98b4 sll   zero, zero, 0
+// 0x010a1740: 0x10a1740: sw    ra, 20(sp)
+// 0x010a1744: 0x10a1744: jal   0x10a9efc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_on_ok_10a98b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_on_ok_10a9efc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1104: 0x10a1104: jal   0x1094a94 addiu a0, zero, 1
+// 0x010a174c: 0x10a174c: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -4245,16 +4245,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a110c: 0x10a110c: lw    ra, 20(sp)
-// 0x010a1110: 0x10a1110: addu  v0, zero, zero
+// 0x010a1754: 0x10a1754: lw    ra, 20(sp)
+// 0x010a1758: 0x10a1758: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a1114: 0x10a1114: jr    ra addiu sp, sp, 24
+// 0x010a175c: 0x10a175c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4266,7 +4266,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 foursquare_button_cb_10a111c(int32,int32,int32,int32,int32)
+.method public static int32 foursquare_button_cb_10a1764(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -4301,28 +4301,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a111c: 0x10a111c: addiu sp, sp, -24
+// 0x010a1764: 0x10a1764: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1120: 0x10a1120: sw    ra, 20(sp)
-// 0x010a1124: 0x10a1124: jal   0x1018418 sll   zero, zero, 0
+// 0x010a1768: 0x10a1768: sw    ra, 20(sp)
+// 0x010a176c: 0x10a176c: jal   0x1018428 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_login_dialog_1018418(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_login_dialog_1018428(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a112c: 0x10a112c: lw    ra, 20(sp)
-// 0x010a1130: 0x10a1130: addu  v0, zero, zero
+// 0x010a1774: 0x10a1774: lw    ra, 20(sp)
+// 0x010a1778: 0x10a1778: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010a1134: 0x10a1134: jr    ra addiu sp, sp, 24
+// 0x010a177c: 0x10a177c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4334,7 +4334,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 facebook_button_cb_10a113c(int32,int32,int32,int32,int32)
+.method public static int32 facebook_button_cb_10a1784(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -4369,28 +4369,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a113c: 0x10a113c: addiu sp, sp, -24
+// 0x010a1784: 0x10a1784: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1140: 0x10a1140: sw    ra, 20(sp)
-// 0x010a1144: 0x10a1144: jal   0x1028aa4 sll   zero, zero, 0
+// 0x010a1788: 0x10a1788: sw    ra, 20(sp)
+// 0x010a178c: 0x10a178c: jal   0x1028ab4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_facebook_setting_dialog_1028aa4(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_facebook_setting_dialog_1028ab4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a114c: 0x10a114c: lw    ra, 20(sp)
-// 0x010a1150: 0x10a1150: addu  v0, zero, zero
+// 0x010a1794: 0x10a1794: lw    ra, 20(sp)
+// 0x010a1798: 0x10a1798: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010a1154: 0x10a1154: jr    ra addiu sp, sp, 24
+// 0x010a179c: 0x10a179c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4402,7 +4402,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 twitter_button_cb_10a115c(int32,int32,int32,int32,int32)
+.method public static int32 twitter_button_cb_10a17a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -4437,28 +4437,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a115c: 0x10a115c: addiu sp, sp, -24
+// 0x010a17a4: 0x10a17a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1160: 0x10a1160: sw    ra, 20(sp)
-// 0x010a1164: 0x10a1164: jal   0x1028b9c sll   zero, zero, 0
+// 0x010a17a8: 0x10a17a8: sw    ra, 20(sp)
+// 0x010a17ac: 0x10a17ac: jal   0x1028bac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_twitter_setting_dialog_1028b9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_twitter_setting_dialog_1028bac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a116c: 0x10a116c: lw    ra, 20(sp)
-// 0x010a1170: 0x10a1170: addu  v0, zero, zero
+// 0x010a17b4: 0x10a17b4: lw    ra, 20(sp)
+// 0x010a17b8: 0x10a17b8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010a1174: 0x10a1174: jr    ra addiu sp, sp, 24
+// 0x010a17bc: 0x10a17bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4470,7 +4470,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_mood_select_10a117c(int32,int32,int32,int32,int32)
+.method public static int32 on_mood_select_10a17c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -4505,18 +4505,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a117c: 0x10a117c: lui   a0, 0x10a0000
+// 0x010a17c4: 0x10a17c4: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a1180: 0x10a1180: addiu sp, sp, -24
+// 0x010a17c8: 0x10a17c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1184: 0x10a1184: sw    ra, 20(sp)
-// 0x010a1188: 0x10a1188: jal   0x1034e48 addiu a0, a0, 4512
+// 0x010a17cc: 0x10a17cc: sw    ra, 20(sp)
+// 0x010a17d0: 0x10a17d0: jal   0x1034e58 addiu a0, a0, 6120
 	ldloc.1
-	ldc.i4 4512
+	ldc.i4 6120
 	add
 	stloc.1
 	ldloc.0
@@ -4524,16 +4524,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_dialog_1034e48(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_dialog_1034e58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a1190: 0x10a1190: lw    ra, 20(sp)
-// 0x010a1194: 0x10a1194: addu  v0, zero, zero
+// 0x010a17d8: 0x10a17d8: lw    ra, 20(sp)
+// 0x010a17dc: 0x10a17dc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010a1198: 0x10a1198: jr    ra addiu sp, sp, 24
+// 0x010a17e0: 0x10a17e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4545,7 +4545,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_mood_changed_10a11a0(int32,int32,int32,int32,int32)
+.method public static int32 on_mood_changed_10a17e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4580,32 +4580,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a11a0: 0x10a11a0: addiu sp, sp, -32
+// 0x010a17e8: 0x10a17e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a11a4: 0x10a11a4: sw    ra, 28(sp)
-// 0x010a11a8: 0x10a11a8: jal   0x1034d94 sll   zero, zero, 0
+// 0x010a17ec: 0x10a17ec: sw    ra, 28(sp)
+// 0x010a17f0: 0x10a17f0: jal   0x1034da4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_get_1034d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_get_1034da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a11b0: 0x10a11b0: lui   a0, 0x10000
+// 0x010a17f8: 0x10a17f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a11b4: 0x10a11b4: addiu a0, a0, -13468
+// 0x010a17fc: 0x10a17fc: addiu a0, a0, -13472
 	ldloc.1
-	ldc.i4 -13468
+	ldc.i4 -13472
 	add
 	stloc.1
-// 0x010a11b8: 0x10a11b8: sw    v0, 16(sp)
+// 0x010a1800: 0x10a1800: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4614,7 +4614,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a11bc: 0x10a11bc: jal   0x101cd60 sw    zero, 20(sp)
+// 0x010a1804: 0x10a1804: jal   0x101cd70 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4628,20 +4628,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a11c4: 0x10a11c4: addu  a0, v0, zero
+// 0x010a180c: 0x10a180c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a11c8: 0x10a11c8: addiu a1, sp, 16
+// 0x010a1810: 0x10a1810: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010a11cc: 0x10a11cc: jal   0x109590c addiu a2, zero, 1
+// 0x010a1814: 0x10a1814: jal   0x1095f54 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -4649,14 +4649,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_change_button_109590c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_change_button_1095f54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a11d4: 0x10a11d4: lw    ra, 28(sp)
-// 0x010a11d8: 0x10a11d8: sll   zero, zero, 0
-// 0x010a11dc: 0x10a11dc: jr    ra addiu sp, sp, 32
+// 0x010a181c: 0x10a181c: lw    ra, 28(sp)
+// 0x010a1820: 0x10a1820: sll   zero, zero, 0
+// 0x010a1824: 0x10a1824: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4668,7 +4668,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_car_select_10a11e4(int32,int32,int32,int32,int32)
+.method public static int32 on_car_select_10a182c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -4703,18 +4703,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a11e4: 0x10a11e4: lui   a0, 0x10a0000
+// 0x010a182c: 0x10a182c: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a11e8: 0x10a11e8: addiu sp, sp, -24
+// 0x010a1830: 0x10a1830: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a11ec: 0x10a11ec: sw    ra, 20(sp)
-// 0x010a11f0: 0x10a11f0: jal   0x103560c addiu a0, a0, 4616
+// 0x010a1834: 0x10a1834: sw    ra, 20(sp)
+// 0x010a1838: 0x10a1838: jal   0x103561c addiu a0, a0, 6224
 	ldloc.1
-	ldc.i4 4616
+	ldc.i4 6224
 	add
 	stloc.1
 	ldloc.0
@@ -4722,16 +4722,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_car_dialog_103560c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_car_dialog_103561c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a11f8: 0x10a11f8: lw    ra, 20(sp)
-// 0x010a11fc: 0x10a11fc: addu  v0, zero, zero
+// 0x010a1840: 0x10a1840: lw    ra, 20(sp)
+// 0x010a1844: 0x10a1844: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010a1200: 0x10a1200: jr    ra addiu sp, sp, 24
+// 0x010a1848: 0x10a1848: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4743,7 +4743,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_car_changed_10a1208(int32,int32,int32,int32,int32)
+.method public static int32 on_car_changed_10a1850(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4778,16 +4778,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1208: 0x10a1208: lui   a0, 0x0
+// 0x010a1850: 0x10a1850: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a120c: 0x10a120c: addiu sp, sp, -32
+// 0x010a1854: 0x10a1854: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a1210: 0x10a1210: sw    ra, 28(sp)
-// 0x010a1214: 0x10a1214: jal   0x100e348 addiu a0, a0, 17724
+// 0x010a1858: 0x10a1858: sw    ra, 28(sp)
+// 0x010a185c: 0x10a185c: jal   0x100e358 addiu a0, a0, 17724
 	ldloc.1
 	ldc.i4 17724
 	add
@@ -4797,12 +4797,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a121c: 0x10a121c: jal   0x1001ba8 addu  a0, v0, zero
+// 0x010a1864: 0x10a1864: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4815,15 +4815,15 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1224: 0x10a1224: lui   a0, 0x10000
+// 0x010a186c: 0x10a186c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a1228: 0x10a1228: addiu a0, a0, -29596
+// 0x010a1870: 0x10a1870: addiu a0, a0, -29596
 	ldloc.1
 	ldc.i4 -29596
 	add
 	stloc.1
-// 0x010a122c: 0x10a122c: sw    v0, 16(sp)
+// 0x010a1874: 0x10a1874: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4832,7 +4832,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1230: 0x10a1230: jal   0x101cd60 sw    zero, 20(sp)
+// 0x010a1878: 0x10a1878: jal   0x101cd70 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4846,20 +4846,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1238: 0x10a1238: addu  a0, v0, zero
+// 0x010a1880: 0x10a1880: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a123c: 0x10a123c: addiu a1, sp, 16
+// 0x010a1884: 0x10a1884: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010a1240: 0x10a1240: jal   0x109590c addiu a2, zero, 1
+// 0x010a1888: 0x10a1888: jal   0x1095f54 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -4867,14 +4867,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_change_button_109590c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_change_button_1095f54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1248: 0x10a1248: lw    ra, 28(sp)
-// 0x010a124c: 0x10a124c: sll   zero, zero, 0
-// 0x010a1250: 0x10a1250: jr    ra addiu sp, sp, 32
+// 0x010a1890: 0x10a1890: lw    ra, 28(sp)
+// 0x010a1894: 0x10a1894: sll   zero, zero, 0
+// 0x010a1898: 0x10a1898: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4886,7 +4886,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_close_dialog_10a1258(int32,int32,int32,int32,int32)
+.method public static int32 on_close_dialog_10a18a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4921,39 +4921,39 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1258: 0x10a1258: addiu sp, sp, -24
+// 0x010a18a0: 0x10a18a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a125c: 0x10a125c: addiu v0, zero, 2
+// 0x010a18a4: 0x10a18a4: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a1260: 0x10a1260: beq   a0, v0, 0x10a1280 sw    ra, 20(sp)
+// 0x010a18a8: 0x10a18a8: beq   a0, v0, 0x10a18c8 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_10a1280
+	beq  L_10a18c8
 // --- basic block ---
-// 0x010a1268: 0x10a1268: lui   a1, 0x10a0000
+// 0x010a18b0: 0x10a18b0: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a126c: 0x10a126c: lui   v0, 0x80000
+// 0x010a18b4: 0x10a18b4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a1270: 0x10a1270: addiu a1, a1, 4752
+// 0x010a18b8: 0x10a18b8: addiu a1, a1, 6360
 	ldloc.2
-	ldc.i4 4752
+	ldc.i4 6360
 	add
 	stloc.2
-// 0x010a1274: 0x10a1274: addiu a0, zero, 10
+// 0x010a18bc: 0x10a18bc: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x010a1278: 0x10a1278: jal   0x104fe98 sw    zero, 10032(v0)
+// 0x010a18c0: 0x10a18c0: jal   0x104fea8 sw    zero, 10496(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2508
+	ldc.i4 2624
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4962,15 +4962,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a1280:
-// 0x010a1280: 0x10a1280: lw    ra, 20(sp)
-// 0x010a1284: 0x10a1284: sll   zero, zero, 0
-// 0x010a1288: 0x10a1288: jr    ra addiu sp, sp, 24
+L_10a18c8:
+// 0x010a18c8: 0x10a18c8: lw    ra, 20(sp)
+// 0x010a18cc: 0x10a18cc: sll   zero, zero, 0
+// 0x010a18d0: 0x10a18d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4982,7 +4982,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 close_timeout_10a1290(int32,int32,int32,int32,int32)
+.method public static int32 close_timeout_10a18d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -5017,18 +5017,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1290: 0x10a1290: lui   a0, 0x10a0000
+// 0x010a18d8: 0x10a18d8: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a1294: 0x10a1294: addiu sp, sp, -24
+// 0x010a18dc: 0x10a18dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1298: 0x10a1298: sw    ra, 20(sp)
-// 0x010a129c: 0x10a129c: jal   0x104fd00 addiu a0, a0, 4752
+// 0x010a18e0: 0x10a18e0: sw    ra, 20(sp)
+// 0x010a18e4: 0x10a18e4: jal   0x104fd10 addiu a0, a0, 6360
 	ldloc.1
-	ldc.i4 4752
+	ldc.i4 6360
 	add
 	stloc.1
 	ldloc.0
@@ -5036,15 +5036,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a12a4: 0x10a12a4: addu  a0, zero, zero
+// 0x010a18ec: 0x10a18ec: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a12a8: 0x10a12a8: jal   0x10a98b4 addu  a1, zero, zero
+// 0x010a18f0: 0x10a18f0: jal   0x10a9efc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5052,14 +5052,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_on_ok_10a98b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_on_ok_10a9efc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a12b0: 0x10a12b0: lw    ra, 20(sp)
-// 0x010a12b4: 0x10a12b4: sll   zero, zero, 0
-// 0x010a12b8: 0x10a12b8: jr    ra addiu sp, sp, 24
+// 0x010a18f8: 0x10a18f8: lw    ra, 20(sp)
+// 0x010a18fc: 0x10a18fc: sll   zero, zero, 0
+// 0x010a1900: 0x10a1900: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5071,7 +5071,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_login_details_dialog_show_un_pw_10a12c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_details_dialog_show_un_pw_10a1908(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -5109,21 +5109,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a12c0: 0x10a12c0: lui   a0, 0x10a0000
+// 0x010a1908: 0x10a1908: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a12c4: 0x10a12c4: addiu sp, sp, -24
+// 0x010a190c: 0x10a190c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a12c8: 0x10a12c8: addiu a0, a0, 4800
+// 0x010a1910: 0x10a1910: addiu a0, a0, 6408
 	ldloc.1
-	ldc.i4 4800
+	ldc.i4 6408
 	add
 	stloc.1
-// 0x010a12cc: 0x10a12cc: sw    ra, 20(sp)
-// 0x010a12d0: 0x10a12d0: jal   0x10a90f8 sw    s0, 16(sp)
+// 0x010a1914: 0x10a1914: sw    ra, 20(sp)
+// 0x010a1918: 0x10a1918: jal   0x10a9740 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5133,36 +5133,36 @@ __CIBYL_javamethod_begin:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl126::roadmap_login_set_show_function_10a90f8(int32)
+	call int32 Cibyl126::roadmap_login_set_show_function_10a9740(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a12d8: 0x10a12d8: jal   0x106b068 sll   zero, zero, 0
+// 0x010a1920: 0x10a1920: jal   0x106b68c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a12e0: 0x10a12e0: beq   v0, zero, 0x10a12f0 addu  v1, zero, zero
+// 0x010a1928: 0x10a1928: beq   v0, zero, 0x10a1938 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10a12f0
+	brfalse L_10a1938
 // --- basic block ---
-// 0x010a12e8: 0x10a12e8: j	 0x10a1310 addu  s0, zero, zero
+// 0x010a1930: 0x10a1930: j	 0x10a1958 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10a1310
+	br L_10a1958
 // --- basic block ---
-L_10a12f0:
-// 0x010a12f0: 0x10a12f0: lui   a0, 0x0
+L_10a1938:
+// 0x010a1938: 0x10a1938: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a12f4: 0x10a12f4: jal   0x100e348 addiu a0, a0, 18668
+// 0x010a193c: 0x10a193c: jal   0x100e358 addiu a0, a0, 18668
 	ldloc.1
 	ldc.i4 18668
 	add
@@ -5172,20 +5172,20 @@ L_10a12f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a12fc: 0x10a12fc: lui   a0, 0x0
+// 0x010a1944: 0x10a1944: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a1300: 0x10a1300: addiu a0, a0, 18700
+// 0x010a1948: 0x10a1948: addiu a0, a0, 18700
 	ldloc.1
 	ldc.i4 18700
 	add
 	stloc.1
-// 0x010a1304: 0x10a1304: jal   0x100e348 addu  s0, v0, zero
+// 0x010a194c: 0x10a194c: jal   0x100e358 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -5193,36 +5193,36 @@ L_10a12f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a130c: 0x10a130c: addu  v1, v0, zero
+// 0x010a1954: 0x10a1954: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_10a1310:
-// 0x010a1310: 0x10a1310: lui   a0, 0x10b0000
+L_10a1958:
+// 0x010a1958: 0x10a1958: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010a1314: 0x10a1314: addiu a0, a0, -27792
+// 0x010a195c: 0x10a195c: addiu a0, a0, -26184
 	ldloc.1
-	ldc.i4 -27792
+	ldc.i4 -26184
 	add
 	stloc.1
-// 0x010a1318: 0x10a1318: cibyl_sysc_arg 0x4
+// 0x010a1960: 0x10a1960: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010a131c: 0x10a131c: cibyl_sysc_arg 0x10
+// 0x010a1964: 0x10a1964: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x010a1320: 0x10a1320: cibyl_sysc_arg 0x3
+// 0x010a1968: 0x10a1968: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010a1324: 0x10a1324: cibyl_sysc 0x21df
+// 0x010a196c: 0x10a196c: cibyl_sysc 0x21df
 	call void [WazeWP7]Syscalls::NOPH_SignInUpDialogs_showSignInDialog(int32,int32,int32)
-// 0x010a1328: 0x10a1328: addu  s0, v0, zero
+// 0x010a1970: 0x10a1970: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010a132c: 0x10a132c: lw    ra, 20(sp)
-// 0x010a1330: 0x10a1330: lw    s0, 16(sp)
+// 0x010a1974: 0x10a1974: lw    ra, 20(sp)
+// 0x010a1978: 0x10a1978: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ L_10a1310:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1334: 0x10a1334: jr    ra addiu sp, sp, 24
+// 0x010a197c: 0x10a197c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5243,7 +5243,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_signup_skip_10a133c(int32,int32,int32,int32,int32)
+.method public static int32 on_signup_skip_10a1984(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -5278,28 +5278,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a133c: 0x10a133c: addiu sp, sp, -24
+// 0x010a1984: 0x10a1984: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1340: 0x10a1340: sw    ra, 20(sp)
-// 0x010a1344: 0x10a1344: jal   0x10a97f4 sll   zero, zero, 0
+// 0x010a1988: 0x10a1988: sw    ra, 20(sp)
+// 0x010a198c: 0x10a198c: jal   0x10a9e3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_on_signup_skip_10a97f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_on_signup_skip_10a9e3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a134c: 0x10a134c: lw    ra, 20(sp)
-// 0x010a1350: 0x10a1350: addiu v0, zero, 1
+// 0x010a1994: 0x10a1994: lw    ra, 20(sp)
+// 0x010a1998: 0x10a1998: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010a1354: 0x10a1354: jr    ra addiu sp, sp, 24
+// 0x010a199c: 0x10a199c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5311,7 +5311,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_login_update_dlg_show_10a135c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_update_dlg_show_10a19a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -5346,125 +5346,125 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a135c: 0x10a135c: lui   v0, 0x80000
+// 0x010a19a4: 0x10a19a4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a1360: 0x10a1360: lw    v1, 10040(v0)
+// 0x010a19a8: 0x10a19a8: lw    v1, 10504(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2510
+	ldc.i4 2626
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1364: 0x10a1364: addiu sp, sp, -24
+// 0x010a19ac: 0x10a19ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1368: 0x10a1368: addiu v0, zero, 1
+// 0x010a19b0: 0x10a19b0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010a136c: 0x10a136c: beq   v1, v0, 0x10a13d8 sw    ra, 20(sp)
+// 0x010a19b4: 0x10a19b4: beq   v1, v0, 0x10a1a20 sw    ra, 20(sp)
 	ldloc 5
 	ldloc 6
-	beq  L_10a13d8
+	beq  L_10a1a20
 // --- basic block ---
-// 0x010a1374: 0x10a1374: jal   0x106ac04 sll   zero, zero, 0
+// 0x010a19bc: 0x10a19bc: jal   0x106b228 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::RealTime_GetUserName_106ac04(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::RealTime_GetUserName_106b228(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010a137c: 0x10a137c: beq   v0, zero, 0x10a13b0 lui   v1, 0x10a0000
+// 0x010a19c4: 0x10a19c4: beq   v0, zero, 0x10a19f8 lui   v1, 0x10a0000
 	ldloc 6
 	ldc.i4 17432576
 	stloc 5
-	brfalse L_10a13b0
+	brfalse L_10a19f8
 // --- basic block ---
-// 0x010a1384: 0x10a1384: lb    v0, 0(v0)
+// 0x010a19cc: 0x10a19cc: lb    v0, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010a1388: 0x10a1388: sll   zero, zero, 0
-// 0x010a138c: 0x10a138c: beq   v0, zero, 0x10a13b4 addiu v1, v1, 5184
+// 0x010a19d0: 0x10a19d0: sll   zero, zero, 0
+// 0x010a19d4: 0x10a19d4: beq   v0, zero, 0x10a19fc addiu v1, v1, 6792
 	ldloc 6
 	ldloc 5
-	ldc.i4 5184
+	ldc.i4 6792
 	add
 	stloc 5
-	brfalse L_10a13b4
+	brfalse L_10a19fc
 // --- basic block ---
-// 0x010a1394: 0x10a1394: jal   0x106aab8 sll   zero, zero, 0
-	call int32 Cibyl79::Realtime_IsLoggedIn_106aab8()
+// 0x010a19dc: 0x10a19dc: jal   0x106b0dc sll   zero, zero, 0
+	call int32 Cibyl79::Realtime_IsLoggedIn_106b0dc()
 	stloc 6
 // --- basic block ---
-// 0x010a139c: 0x10a139c: beq   v0, zero, 0x10a13ac lui   v1, 0x10a0000
+// 0x010a19e4: 0x10a19e4: beq   v0, zero, 0x10a19f4 lui   v1, 0x10a0000
 	ldloc 6
 	ldc.i4 17432576
 	stloc 5
-	brfalse L_10a13ac
+	brfalse L_10a19f4
 // --- basic block ---
-// 0x010a13a4: 0x10a13a4: j	 0x10a13b4 addiu v1, v1, 5368
+// 0x010a19ec: 0x10a19ec: j	 0x10a19fc addiu v1, v1, 6976
 	ldloc 5
-	ldc.i4 5368
+	ldc.i4 6976
 	add
 	stloc 5
-	br L_10a13b4
+	br L_10a19fc
 // --- basic block ---
-L_10a13ac:
-// 0x010a13ac: 0x10a13ac: lui   v1, 0x10a0000
+L_10a19f4:
+// 0x010a19f4: 0x10a19f4: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-L_10a13b0:
-// 0x010a13b0: 0x10a13b0: addiu v1, v1, 5184
+L_10a19f8:
+// 0x010a19f8: 0x10a19f8: addiu v1, v1, 6792
 	ldloc 5
-	ldc.i4 5184
+	ldc.i4 6792
 	add
 	stloc 5
-L_10a13b4:
-// 0x010a13b4: 0x10a13b4: lui   a0, 0x10a0000
+L_10a19fc:
+// 0x010a19fc: 0x10a19fc: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a13b8: 0x10a13b8: addiu a0, a0, 4924
+// 0x010a1a00: 0x10a1a00: addiu a0, a0, 6532
 	ldloc.1
-	ldc.i4 4924
+	ldc.i4 6532
 	add
 	stloc.1
-// 0x010a13bc: 0x10a13bc: cibyl_sysc_arg 0x3
+// 0x010a1a04: 0x10a1a04: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x010a13c0: 0x10a13c0: cibyl_sysc_arg 0x4
+// 0x010a1a08: 0x10a1a08: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010a13c4: 0x10a13c4: cibyl_sysc 0x2205
+// 0x010a1a0c: 0x10a1a0c: cibyl_sysc 0x2205
 	call void [WazeWP7]Syscalls::NOPH_SignInUpDialogs_showSignUpDialog(int32,int32)
-// 0x010a13c8: 0x10a13c8: addu  v1, v0, zero
+// 0x010a1a10: 0x10a1a10: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x010a13cc: 0x10a13cc: addiu v1, zero, 1
+// 0x010a1a14: 0x10a1a14: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a13d0: 0x10a13d0: lui   v0, 0x80000
+// 0x010a1a18: 0x10a1a18: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a13d4: 0x10a13d4: sw    v1, 10040(v0)
+// 0x010a1a1c: 0x10a1a1c: sw    v1, 10504(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2510
+	ldc.i4 2626
 	add
 	ldloc 5
 	stelem.i4
-L_10a13d8:
-// 0x010a13d8: 0x10a13d8: lw    ra, 20(sp)
-// 0x010a13dc: 0x10a13dc: sll   zero, zero, 0
-// 0x010a13e0: 0x10a13e0: jr    ra addiu sp, sp, 24
+L_10a1a20:
+// 0x010a1a20: 0x10a1a20: lw    ra, 20(sp)
+// 0x010a1a24: 0x10a1a24: sll   zero, zero, 0
+// 0x010a1a28: 0x10a1a28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5476,7 +5476,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 T_62_10a13e8(int32,int32,int32,int32,int32)
+.method public static int32 T_62_10a1a30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5511,18 +5511,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a13e8: 0x10a13e8: lui   a0, 0x80000
+// 0x010a1a30: 0x10a1a30: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a13ec: 0x10a13ec: addiu sp, sp, -24
+// 0x010a1a34: 0x10a1a34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a13f0: 0x10a13f0: sw    ra, 20(sp)
-// 0x010a13f4: 0x10a13f4: jal   0x10a956c addiu a0, a0, 10052
+// 0x010a1a38: 0x10a1a38: sw    ra, 20(sp)
+// 0x010a1a3c: 0x10a1a3c: jal   0x10a9bb4 addiu a0, a0, 10516
 	ldloc.1
-	ldc.i4 10052
+	ldc.i4 10516
 	add
 	stloc.1
 	ldloc.0
@@ -5530,28 +5530,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_validate_username_10a956c(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_validate_username_10a9bb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a13fc: 0x10a13fc: beq   v0, zero, 0x10a142c lui   a0, 0x80000
+// 0x010a1a44: 0x10a1a44: beq   v0, zero, 0x10a1a74 lui   a0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc.1
-	brfalse L_10a142c
+	brfalse L_10a1a74
 // --- basic block ---
-// 0x010a1404: 0x10a1404: lui   a1, 0x80000
+// 0x010a1a4c: 0x10a1a4c: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a1408: 0x10a1408: addiu a0, a0, 11052
+// 0x010a1a50: 0x10a1a50: addiu a0, a0, 11516
 	ldloc.1
-	ldc.i4 11052
+	ldc.i4 11516
 	add
 	stloc.1
-// 0x010a140c: 0x10a140c: jal   0x10a9648 addiu a1, a1, 12052
+// 0x010a1a54: 0x10a1a54: jal   0x10a9c90 addiu a1, a1, 12516
 	ldloc.2
-	ldc.i4 12052
+	ldc.i4 12516
 	add
 	stloc.2
 	ldloc.0
@@ -5559,20 +5559,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_validate_password_10a9648(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_validate_password_10a9c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1414: 0x10a1414: beq   v0, zero, 0x10a142c lui   a0, 0x80000
+// 0x010a1a5c: 0x10a1a5c: beq   v0, zero, 0x10a1a74 lui   a0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc.1
-	brfalse L_10a142c
+	brfalse L_10a1a74
 // --- basic block ---
-// 0x010a141c: 0x10a141c: jal   0x10a95ec addiu a0, a0, 13052
+// 0x010a1a64: 0x10a1a64: jal   0x10a9c34 addiu a0, a0, 13516
 	ldloc.1
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc.1
 	ldloc.0
@@ -5580,26 +5580,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_validate_email_10a95ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_validate_email_10a9c34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1424: 0x10a1424: j	 0x10a1430 sltu  v0, zero, v0
+// 0x010a1a6c: 0x10a1a6c: j	 0x10a1a78 sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	br L_10a1430
+	br L_10a1a78
 // --- basic block ---
-L_10a142c:
-// 0x010a142c: 0x10a142c: addu  v0, zero, zero
+L_10a1a74:
+// 0x010a1a74: 0x10a1a74: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10a1430:
-// 0x010a1430: 0x10a1430: lw    ra, 20(sp)
-// 0x010a1434: 0x10a1434: sll   zero, zero, 0
-// 0x010a1438: 0x10a1438: jr    ra addiu sp, sp, 24
+L_10a1a78:
+// 0x010a1a78: 0x10a1a78: lw    ra, 20(sp)
+// 0x010a1a7c: 0x10a1a7c: sll   zero, zero, 0
+// 0x010a1a80: 0x10a1a80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5611,7 +5611,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_create_10a1440(int32,int32,int32,int32,int32)
+.method public static int32 on_create_10a1a88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5649,29 +5649,29 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1440: 0x10a1440: lui   a0, 0x80000
+// 0x010a1a88: 0x10a1a88: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a1444: 0x10a1444: lui   a1, 0x0
+// 0x010a1a8c: 0x10a1a8c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a1448: 0x10a1448: addiu sp, sp, -24
+// 0x010a1a90: 0x10a1a90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a144c: 0x10a144c: addiu a0, a0, 15052
+// 0x010a1a94: 0x10a1a94: addiu a0, a0, 15516
 	ldloc.1
-	ldc.i4 15052
+	ldc.i4 15516
 	add
 	stloc.1
-// 0x010a1450: 0x10a1450: addiu a1, a1, 20820
+// 0x010a1a98: 0x10a1a98: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a1454: 0x10a1454: sw    ra, 20(sp)
-// 0x010a1458: 0x10a1458: jal   0x1001b14 sw    s0, 16(sp)
+// 0x010a1a9c: 0x10a1a9c: sw    ra, 20(sp)
+// 0x010a1aa0: 0x10a1aa0: jal   0x1001b14 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5685,7 +5685,7 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a1460: 0x10a1460: jal   0x10a13e8 addu  s0, v0, zero
+// 0x010a1aa8: 0x10a1aa8: jal   0x10a1a30 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5693,31 +5693,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::T_62_10a13e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::T_62_10a1a30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1468: 0x10a1468: beq   v0, zero, 0x10a14b0 addiu v1, zero, 1
+// 0x010a1ab0: 0x10a1ab0: beq   v0, zero, 0x10a1af8 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_10a14b0
+	brfalse L_10a1af8
 // --- basic block ---
-// 0x010a1470: 0x10a1470: lui   a0, 0x0
+// 0x010a1ab8: 0x10a1ab8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a1474: 0x10a1474: lui   a1, 0x80000
+// 0x010a1abc: 0x10a1abc: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a1478: 0x10a1478: addiu a0, a0, 18684
+// 0x010a1ac0: 0x10a1ac0: addiu a0, a0, 18684
 	ldloc.1
 	ldc.i4 18684
 	add
 	stloc.1
-// 0x010a147c: 0x10a147c: jal   0x100e5c0 addiu a1, a1, 14052
+// 0x010a1ac4: 0x10a1ac4: jal   0x100e5d0 addiu a1, a1, 14516
 	ldloc.2
-	ldc.i4 14052
+	ldc.i4 14516
 	add
 	stloc.2
 	ldloc.0
@@ -5725,36 +5725,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1484: 0x10a1484: lui   a0, 0x80000
+// 0x010a1acc: 0x10a1acc: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a1488: 0x10a1488: lui   a1, 0x80000
+// 0x010a1ad0: 0x10a1ad0: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a148c: 0x10a148c: lui   a2, 0x80000
+// 0x010a1ad4: 0x10a1ad4: lui   a2, 0x80000
 	ldc.i4 524288
 	stloc.3
-// 0x010a1490: 0x10a1490: addiu a0, a0, 10052
+// 0x010a1ad8: 0x10a1ad8: addiu a0, a0, 10516
 	ldloc.1
-	ldc.i4 10052
+	ldc.i4 10516
 	add
 	stloc.1
-// 0x010a1494: 0x10a1494: addiu a1, a1, 11052
+// 0x010a1adc: 0x10a1adc: addiu a1, a1, 11516
 	ldloc.2
-	ldc.i4 11052
+	ldc.i4 11516
 	add
 	stloc.2
-// 0x010a1498: 0x10a1498: addiu a2, a2, 13052
+// 0x010a1ae0: 0x10a1ae0: addiu a2, a2, 13516
 	ldloc.3
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc.3
-// 0x010a149c: 0x10a149c: jal   0x10a9774 sltiu a3, s0, 1
+// 0x010a1ae4: 0x10a1ae4: jal   0x10a9dbc sltiu a3, s0, 1
 	ldloc 8
 	ldc.i4.1
 	clt.un
@@ -5764,32 +5764,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_on_create_10a9774(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_on_create_10a9dbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a14a4: 0x10a14a4: lui   v0, 0x80000
+// 0x010a1aec: 0x10a1aec: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a14a8: 0x10a14a8: sw    zero, 10040(v0)
+// 0x010a1af0: 0x10a1af0: sw    zero, 10504(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2510
+	ldc.i4 2626
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a14ac: 0x10a14ac: addu  v1, zero, zero
+// 0x010a1af4: 0x10a1af4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10a14b0:
-// 0x010a14b0: 0x10a14b0: lw    ra, 20(sp)
-// 0x010a14b4: 0x10a14b4: addu  v0, v1, zero
+L_10a1af8:
+// 0x010a1af8: 0x10a1af8: lw    ra, 20(sp)
+// 0x010a1afc: 0x10a1afc: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010a14b8: 0x10a14b8: lw    s0, 16(sp)
+// 0x010a1b00: 0x10a1b00: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5798,7 +5798,7 @@ L_10a14b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a14bc: 0x10a14bc: jr    ra addiu sp, sp, 24
+// 0x010a1b04: 0x10a1b04: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5810,7 +5810,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_next_10a14c4(int32,int32,int32,int32,int32)
+.method public static int32 on_next_10a1b0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -5845,21 +5845,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a14c4: 0x10a14c4: lui   a0, 0x10000
+// 0x010a1b0c: 0x10a1b0c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a14c8: 0x10a14c8: addiu sp, sp, -24
+// 0x010a1b10: 0x10a1b10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a14cc: 0x10a14cc: addiu a0, a0, -15872
+// 0x010a1b14: 0x10a1b14: addiu a0, a0, -15872
 	ldloc.1
 	ldc.i4 -15872
 	add
 	stloc.1
-// 0x010a14d0: 0x10a14d0: sw    ra, 20(sp)
-// 0x010a14d4: 0x10a14d4: jal   0x104c3fc addiu a1, zero, 1
+// 0x010a1b18: 0x10a1b18: sw    ra, 20(sp)
+// 0x010a1b1c: 0x10a1b1c: jal   0x104c40c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5867,15 +5867,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_timed_104c3fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_timed_104c40c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a14dc: 0x10a14dc: addu  a0, zero, zero
+// 0x010a1b24: 0x10a1b24: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a14e0: 0x10a14e0: jal   0x10a1440 addu  a1, zero, zero
+// 0x010a1b28: 0x10a1b28: jal   0x10a1a88 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5883,14 +5883,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::on_create_10a1440(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::on_create_10a1a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a14e8: 0x10a14e8: lw    ra, 20(sp)
-// 0x010a14ec: 0x10a14ec: sll   zero, zero, 0
-// 0x010a14f0: 0x10a14f0: jr    ra addiu sp, sp, 24
+// 0x010a1b30: 0x10a1b30: lw    ra, 20(sp)
+// 0x010a1b34: 0x10a1b34: sll   zero, zero, 0
+// 0x010a1b38: 0x10a1b38: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5902,7 +5902,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_update_10a14f8(int32,int32,int32,int32,int32)
+.method public static int32 on_update_10a1b40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5940,29 +5940,29 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a14f8: 0x10a14f8: lui   a0, 0x80000
+// 0x010a1b40: 0x10a1b40: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a14fc: 0x10a14fc: lui   a1, 0x0
+// 0x010a1b44: 0x10a1b44: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a1500: 0x10a1500: addiu sp, sp, -24
+// 0x010a1b48: 0x10a1b48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a1504: 0x10a1504: addiu a0, a0, 15052
+// 0x010a1b4c: 0x10a1b4c: addiu a0, a0, 15516
 	ldloc.1
-	ldc.i4 15052
+	ldc.i4 15516
 	add
 	stloc.1
-// 0x010a1508: 0x10a1508: addiu a1, a1, 20820
+// 0x010a1b50: 0x10a1b50: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a150c: 0x10a150c: sw    ra, 20(sp)
-// 0x010a1510: 0x10a1510: jal   0x1001b14 sw    s0, 16(sp)
+// 0x010a1b54: 0x10a1b54: sw    ra, 20(sp)
+// 0x010a1b58: 0x10a1b58: jal   0x1001b14 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5976,7 +5976,7 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a1518: 0x10a1518: jal   0x10a13e8 addu  s0, v0, zero
+// 0x010a1b60: 0x10a1b60: jal   0x10a1a30 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5984,31 +5984,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::T_62_10a13e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::T_62_10a1a30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a1520: 0x10a1520: beq   v0, zero, 0x10a1568 addiu v1, zero, 1
+// 0x010a1b68: 0x10a1b68: beq   v0, zero, 0x10a1bb0 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_10a1568
+	brfalse L_10a1bb0
 // --- basic block ---
-// 0x010a1528: 0x10a1528: lui   a0, 0x0
+// 0x010a1b70: 0x10a1b70: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a152c: 0x10a152c: lui   a1, 0x80000
+// 0x010a1b74: 0x10a1b74: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a1530: 0x10a1530: addiu a0, a0, 18684
+// 0x010a1b78: 0x10a1b78: addiu a0, a0, 18684
 	ldloc.1
 	ldc.i4 18684
 	add
 	stloc.1
-// 0x010a1534: 0x10a1534: jal   0x100e5c0 addiu a1, a1, 14052
+// 0x010a1b7c: 0x10a1b7c: jal   0x100e5d0 addiu a1, a1, 14516
 	ldloc.2
-	ldc.i4 14052
+	ldc.i4 14516
 	add
 	stloc.2
 	ldloc.0
@@ -6016,36 +6016,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a153c: 0x10a153c: lui   a0, 0x80000
+// 0x010a1b84: 0x10a1b84: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a1540: 0x10a1540: lui   a1, 0x80000
+// 0x010a1b88: 0x10a1b88: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a1544: 0x10a1544: lui   a2, 0x80000
+// 0x010a1b8c: 0x10a1b8c: lui   a2, 0x80000
 	ldc.i4 524288
 	stloc.3
-// 0x010a1548: 0x10a1548: addiu a0, a0, 10052
+// 0x010a1b90: 0x10a1b90: addiu a0, a0, 10516
 	ldloc.1
-	ldc.i4 10052
+	ldc.i4 10516
 	add
 	stloc.1
-// 0x010a154c: 0x10a154c: addiu a1, a1, 11052
+// 0x010a1b94: 0x10a1b94: addiu a1, a1, 11516
 	ldloc.2
-	ldc.i4 11052
+	ldc.i4 11516
 	add
 	stloc.2
-// 0x010a1550: 0x10a1550: addiu a2, a2, 13052
+// 0x010a1b98: 0x10a1b98: addiu a2, a2, 13516
 	ldloc.3
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc.3
-// 0x010a1554: 0x10a1554: jal   0x10a96f4 sltiu a3, s0, 1
+// 0x010a1b9c: 0x10a1b9c: jal   0x10a9d3c sltiu a3, s0, 1
 	ldloc 8
 	ldc.i4.1
 	clt.un
@@ -6055,32 +6055,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_on_update_10a96f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_on_update_10a9d3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a155c: 0x10a155c: addu  v1, v0, zero
+// 0x010a1ba4: 0x10a1ba4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010a1560: 0x10a1560: lui   v0, 0x80000
+// 0x010a1ba8: 0x10a1ba8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a1564: 0x10a1564: sw    zero, 10040(v0)
+// 0x010a1bac: 0x10a1bac: sw    zero, 10504(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2510
+	ldc.i4 2626
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10a1568:
-// 0x010a1568: 0x10a1568: lw    ra, 20(sp)
-// 0x010a156c: 0x10a156c: addu  v0, v1, zero
+L_10a1bb0:
+// 0x010a1bb0: 0x10a1bb0: lw    ra, 20(sp)
+// 0x010a1bb4: 0x10a1bb4: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010a1570: 0x10a1570: lw    s0, 16(sp)
+// 0x010a1bb8: 0x10a1bb8: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6089,7 +6089,7 @@ L_10a1568:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a1574: 0x10a1574: jr    ra addiu sp, sp, 24
+// 0x010a1bbc: 0x10a1bbc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6101,7 +6101,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_res_invalidate_10a15d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_res_invalidate_10a1c18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 s2,int32 s0,int32 ra,int32 v1,int32 lo)
@@ -6148,12 +6148,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a15d0: 0x10a15d0: addiu sp, sp, -40
+// 0x010a1c18: 0x10a1c18: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a15d4: 0x10a15d4: sw    s1, 28(sp)
+// 0x010a1c1c: 0x10a1c1c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6162,15 +6162,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a15d8: 0x10a15d8: addiu s1, zero, 3628
+// 0x010a1c20: 0x10a1c20: addiu s1, zero, 3628
 	ldc.i4 3628
 	stloc 6
-// 0x010a15dc: 0x10a15dc: mult  a0, s1
+// 0x010a1c24: 0x10a1c24: mult  a0, s1
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 12
-// 0x010a15e0: 0x10a15e0: sw    s2, 32(sp)
+// 0x010a1c28: 0x10a1c28: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6179,15 +6179,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a15e4: 0x10a15e4: lui   s2, 0x80000
+// 0x010a1c2c: 0x10a1c2c: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010a15e8: 0x10a15e8: addiu s2, s2, 16564
+// 0x010a1c30: 0x10a1c30: addiu s2, s2, 17028
 	ldloc 8
-	ldc.i4 16564
+	ldc.i4 17028
 	add
 	stloc 8
-// 0x010a15ec: 0x10a15ec: sw    s0, 24(sp)
+// 0x010a1c34: 0x10a1c34: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6196,31 +6196,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a15f0: 0x10a15f0: sw    ra, 36(sp)
-// 0x010a15f4: 0x10a15f4: addu  v0, a0, zero
+// 0x010a1c38: 0x10a1c38: sw    ra, 36(sp)
+// 0x010a1c3c: 0x10a1c3c: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010a15f8: 0x10a15f8: addu  s0, zero, zero
+// 0x010a1c40: 0x10a1c40: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010a15fc: 0x10a15fc: mflo  lo
+// 0x010a1c44: 0x10a1c44: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x010a1600: 0x10a1600: beq   a0, zero, 0x10a161c addu  s1, s2, s1
+// 0x010a1c48: 0x10a1c48: beq   a0, zero, 0x10a1c64 addu  s1, s2, s1
 	ldloc.1
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-	brfalse L_10a161c
+	brfalse L_10a1c64
 // --- basic block ---
-// 0x010a1608: 0x10a1608: j	 0x10a1638 lui   a1, 0x20000
+// 0x010a1c50: 0x10a1c50: j	 0x10a1c80 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_10a1638
+	br L_10a1c80
 // --- basic block ---
-L_10a1610:
-// 0x010a1610: 0x10a1610: lw    a0, 1804(s1)
+L_10a1c58:
+// 0x010a1c58: 0x10a1c58: lw    a0, 1804(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6229,15 +6229,15 @@ L_10a1610:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a1614: 0x10a1614: jal   0x104e114 addiu s0, s0, 1
+// 0x010a1c5c: 0x10a1c5c: jal   0x104e124 addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	call void Cibyl57::roadmap_canvas_image_invalidate_104e114()
+	call void Cibyl57::roadmap_canvas_image_invalidate_104e124()
 // --- basic block ---
-L_10a161c:
-// 0x010a161c: 0x10a161c: lw    v0, 3612(s2)
+L_10a1c64:
+// 0x010a1c64: 0x10a1c64: lw    v0, 3612(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6246,44 +6246,44 @@ L_10a161c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1620: 0x10a1620: sll   zero, zero, 0
-// 0x010a1624: 0x10a1624: slt   v0, s0, v0
+// 0x010a1c68: 0x10a1c68: sll   zero, zero, 0
+// 0x010a1c6c: 0x10a1c6c: slt   v0, s0, v0
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 7
-// 0x010a1628: 0x10a1628: bne   v0, zero, 0x10a1610 addiu s1, s1, 12
+// 0x010a1c70: 0x10a1c70: bne   v0, zero, 0x10a1c58 addiu s1, s1, 12
 	ldloc 7
 	ldloc 6
 	ldc.i4.s 12
 	add
 	stloc 6
-	brtrue L_10a1610
+	brtrue L_10a1c58
 // --- basic block ---
-// 0x010a1630: 0x10a1630: j	 0x10a1654 sll   zero, zero, 0
-	br L_10a1654
+// 0x010a1c78: 0x10a1c78: j	 0x10a1c9c sll   zero, zero, 0
+	br L_10a1c9c
 // --- basic block ---
-L_10a1638:
-// 0x010a1638: 0x10a1638: lui   a3, 0x20000
+L_10a1c80:
+// 0x010a1c80: 0x10a1c80: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a163c: 0x10a163c: addiu a1, a1, -356
+// 0x010a1c84: 0x10a1c84: addiu a1, a1, 108
 	ldloc.2
-	ldc.i4 -356
+	ldc.i4.s 108
 	add
 	stloc.2
-// 0x010a1640: 0x10a1640: addiu a3, a3, -332
+// 0x010a1c88: 0x10a1c88: addiu a3, a3, 132
 	ldloc 4
-	ldc.i4 -332
+	ldc.i4 132
 	add
 	stloc 4
-// 0x010a1644: 0x10a1644: addiu a0, zero, 3
+// 0x010a1c8c: 0x10a1c8c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010a1648: 0x10a1648: addiu a2, zero, 507
+// 0x010a1c90: 0x10a1c90: addiu a2, zero, 507
 	ldc.i4 507
 	stloc.3
-// 0x010a164c: 0x10a164c: jal   0x100449c sw    v0, 16(sp)
+// 0x010a1c94: 0x10a1c94: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6302,9 +6302,9 @@ L_10a1638:
 	stloc 11
 	stloc 7
 // --- basic block ---
-L_10a1654:
-// 0x010a1654: 0x10a1654: lw    ra, 36(sp)
-// 0x010a1658: 0x10a1658: lw    s2, 32(sp)
+L_10a1c9c:
+// 0x010a1c9c: 0x10a1c9c: lw    ra, 36(sp)
+// 0x010a1ca0: 0x10a1ca0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6313,7 +6313,7 @@ L_10a1654:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a165c: 0x10a165c: lw    s1, 28(sp)
+// 0x010a1ca4: 0x10a1ca4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6322,7 +6322,7 @@ L_10a1654:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a1660: 0x10a1660: lw    s0, 24(sp)
+// 0x010a1ca8: 0x10a1ca8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6331,7 +6331,7 @@ L_10a1654:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a1664: 0x10a1664: jr    ra addiu sp, sp, 40
+// 0x010a1cac: 0x10a1cac: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6343,7 +6343,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 free_resource_10a166c(int32,int32,int32,int32,int32)
+.method public static int32 free_resource_10a1cb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 lo,int32 ra)
@@ -6387,20 +6387,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a166c: 0x10a166c: addiu v0, zero, 12
+// 0x010a1cb4: 0x10a1cb4: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x010a1670: 0x10a1670: mult  a1, v0
+// 0x010a1cb8: 0x10a1cb8: mult  a1, v0
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1674: 0x10a1674: addiu sp, sp, -32
+// 0x010a1cbc: 0x10a1cbc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a1678: 0x10a1678: sw    s0, 20(sp)
+// 0x010a1cc0: 0x10a1cc0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6409,10 +6409,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a167c: 0x10a167c: addu  s0, a0, zero
+// 0x010a1cc4: 0x10a1cc4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010a1680: 0x10a1680: sw    s1, 24(sp)
+// 0x010a1cc8: 0x10a1cc8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6421,16 +6421,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1684: 0x10a1684: sw    ra, 28(sp)
-// 0x010a1688: 0x10a1688: mflo  lo
+// 0x010a1ccc: 0x10a1ccc: sw    ra, 28(sp)
+// 0x010a1cd0: 0x10a1cd0: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x010a168c: 0x10a168c: addu  v0, a0, v1
+// 0x010a1cd4: 0x10a1cd4: addu  v0, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 5
-// 0x010a1690: 0x10a1690: lw    a0, 1816(v0)
+// 0x010a1cd8: 0x10a1cd8: lw    a0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6439,14 +6439,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a1694: 0x10a1694: sll   zero, zero, 0
-// 0x010a1698: 0x10a1698: beq   a0, zero, 0x10a16d8 addu  s1, a1, zero
+// 0x010a1cdc: 0x10a1cdc: sll   zero, zero, 0
+// 0x010a1ce0: 0x10a1ce0: beq   a0, zero, 0x10a1d20 addu  s1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 9
-	brfalse L_10a16d8
+	brfalse L_10a1d20
 // --- basic block ---
-// 0x010a16a0: 0x10a16a0: lw    v0, 1808(s0)
+// 0x010a1ce8: 0x10a1ce8: lw    v0, 1808(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6455,64 +6455,64 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a16a4: 0x10a16a4: sll   zero, zero, 0
-// 0x010a16a8: 0x10a16a8: beq   v0, zero, 0x10a16c0 addiu v1, zero, 1
+// 0x010a1cec: 0x10a1cec: sll   zero, zero, 0
+// 0x010a1cf0: 0x10a1cf0: beq   v0, zero, 0x10a1d08 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_10a16c0
+	brfalse L_10a1d08
 // --- basic block ---
-// 0x010a16b0: 0x10a16b0: bne   v0, v1, 0x10a16dc addiu v0, zero, 12
+// 0x010a1cf8: 0x10a1cf8: bne   v0, v1, 0x10a1d24 addiu v0, zero, 12
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 12
 	stloc 5
-	bne.un L_10a16dc
+	bne.un L_10a1d24
 // --- basic block ---
-// 0x010a16b8: 0x10a16b8: j	 0x10a16d0 sll   zero, zero, 0
-	br L_10a16d0
+// 0x010a1d00: 0x10a1d00: j	 0x10a1d18 sll   zero, zero, 0
+	br L_10a1d18
 // --- basic block ---
-L_10a16c0:
-// 0x010a16c0: 0x10a16c0: jal   0x104ec70 sll   zero, zero, 0
+L_10a1d08:
+// 0x010a1d08: 0x10a1d08: jal   0x104ec80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a16c8: 0x10a16c8: j	 0x10a16dc addiu v0, zero, 12
+// 0x010a1d10: 0x10a1d10: j	 0x10a1d24 addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-	br L_10a16dc
+	br L_10a1d24
 // --- basic block ---
-L_10a16d0:
-// 0x010a16d0: 0x10a16d0: jal   0x10518a0 sll   zero, zero, 0
-	call int32 Cibyl60::roadmap_sound_free_10518a0()
+L_10a1d18:
+// 0x010a1d18: 0x10a1d18: jal   0x10518b0 sll   zero, zero, 0
+	call int32 Cibyl60::roadmap_sound_free_10518b0()
 	stloc 5
 // --- basic block ---
-L_10a16d8:
-// 0x010a16d8: 0x10a16d8: addiu v0, zero, 12
+L_10a1d20:
+// 0x010a1d20: 0x10a1d20: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-L_10a16dc:
-// 0x010a16dc: 0x10a16dc: mult  s1, v0
+L_10a1d24:
+// 0x010a1d24: 0x10a1d24: mult  s1, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a16e0: 0x10a16e0: mflo  lo
+// 0x010a1d28: 0x10a1d28: mflo  lo
 	ldloc 10
 	stloc 9
-// 0x010a16e4: 0x10a16e4: addu  s0, s0, s1
+// 0x010a1d2c: 0x10a1d2c: addu  s0, s0, s1
 	ldloc 8
 	ldloc 9
 	add
 	stloc 8
-// 0x010a16e8: 0x10a16e8: lw    a0, 1812(s0)
+// 0x010a1d30: 0x10a1d30: lw    a0, 1812(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6521,7 +6521,7 @@ L_10a16dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a16ec: 0x10a16ec: jal   0x1000930 sll   zero, zero, 0
+// 0x010a1d34: 0x10a1d34: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6532,8 +6532,8 @@ L_10a16dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a16f4: 0x10a16f4: lw    ra, 28(sp)
-// 0x010a16f8: 0x10a16f8: lw    s1, 24(sp)
+// 0x010a1d3c: 0x10a1d3c: lw    ra, 28(sp)
+// 0x010a1d40: 0x10a1d40: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6542,7 +6542,7 @@ L_10a16dc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a16fc: 0x10a16fc: lw    s0, 20(sp)
+// 0x010a1d44: 0x10a1d44: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6551,7 +6551,7 @@ L_10a16dc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a1700: 0x10a1700: jr    ra addiu sp, sp, 32
+// 0x010a1d48: 0x10a1d48: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6563,7 +6563,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_res_shutdown_10a1708(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_res_shutdown_10a1d50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 s2,int32 ra,int32 v1)
@@ -6607,12 +6607,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1708: 0x10a1708: addiu sp, sp, -32
+// 0x010a1d50: 0x10a1d50: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a170c: 0x10a170c: sw    s0, 16(sp)
+// 0x010a1d54: 0x10a1d54: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6621,15 +6621,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1710: 0x10a1710: lui   s0, 0x80000
+// 0x010a1d58: 0x10a1d58: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a1714: 0x10a1714: addiu s0, s0, 16564
+// 0x010a1d5c: 0x10a1d5c: addiu s0, s0, 17028
 	ldloc 5
-	ldc.i4 16564
+	ldc.i4 17028
 	add
 	stloc 5
-// 0x010a1718: 0x10a1718: sw    s2, 24(sp)
+// 0x010a1d60: 0x10a1d60: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6638,8 +6638,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a171c: 0x10a171c: sw    ra, 28(sp)
-// 0x010a1720: 0x10a1720: sw    s1, 20(sp)
+// 0x010a1d64: 0x10a1d64: sw    ra, 28(sp)
+// 0x010a1d68: 0x10a1d68: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6648,18 +6648,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a1724: 0x10a1724: addiu s2, s0, 10884
+// 0x010a1d6c: 0x10a1d6c: addiu s2, s0, 10884
 	ldloc 5
 	ldc.i4 10884
 	add
 	stloc 9
-// 0x010a1728: 0x10a1728: j	 0x10a1738 addu  s1, zero, zero
+// 0x010a1d70: 0x10a1d70: j	 0x10a1d80 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10a1738
+	br L_10a1d80
 // --- basic block ---
-L_10a1730:
-// 0x010a1730: 0x10a1730: jal   0x10a166c addiu s1, s1, 1
+L_10a1d78:
+// 0x010a1d78: 0x10a1d78: jal   0x10a1cb4 addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
@@ -6669,13 +6669,13 @@ L_10a1730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::free_resource_10a166c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::free_resource_10a1cb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 8
 // --- basic block ---
-L_10a1738:
-// 0x010a1738: 0x10a1738: lw    v0, 3612(s0)
+L_10a1d80:
+// 0x010a1d80: 0x10a1d80: lw    v0, 3612(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6684,29 +6684,29 @@ L_10a1738:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a173c: 0x10a173c: addu  a1, s1, zero
+// 0x010a1d84: 0x10a1d84: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x010a1740: 0x10a1740: slt   v0, s1, v0
+// 0x010a1d88: 0x10a1d88: slt   v0, s1, v0
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 8
-// 0x010a1744: 0x10a1744: bne   v0, zero, 0x10a1730 addu  a0, s0, zero
+// 0x010a1d8c: 0x10a1d8c: bne   v0, zero, 0x10a1d78 addu  a0, s0, zero
 	ldloc 8
 	ldloc 5
 	stloc.1
-	brtrue L_10a1730
+	brtrue L_10a1d78
 // --- basic block ---
-// 0x010a174c: 0x10a174c: lw    a0, 0(s0)
+// 0x010a1d94: 0x10a1d94: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a1750: 0x10a1750: sll   zero, zero, 0
-// 0x010a1754: 0x10a1754: beq   a0, zero, 0x10a1764 sw    zero, 3612(s0)
+// 0x010a1d98: 0x10a1d98: sll   zero, zero, 0
+// 0x010a1d9c: 0x10a1d9c: beq   a0, zero, 0x10a1dac sw    zero, 3612(s0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
@@ -6716,34 +6716,34 @@ L_10a1738:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10a1764
+	brfalse L_10a1dac
 // --- basic block ---
-// 0x010a175c: 0x10a175c: jal   0x1015a90 sll   zero, zero, 0
+// 0x010a1da4: 0x10a1da4: jal   0x1015aa0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_free_1015a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_free_1015aa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 8
 // --- basic block ---
-L_10a1764:
-// 0x010a1764: 0x10a1764: addiu s0, s0, 3628
+L_10a1dac:
+// 0x010a1dac: 0x10a1dac: addiu s0, s0, 3628
 	ldloc 5
 	ldc.i4 3628
 	add
 	stloc 5
-// 0x010a1768: 0x10a1768: bne   s0, s2, 0x10a1738 addu  s1, zero, zero
+// 0x010a1db0: 0x10a1db0: bne   s0, s2, 0x10a1d80 addu  s1, zero, zero
 	ldloc 5
 	ldloc 9
 	ldc.i4.s 0
 	stloc 7
-	bne.un L_10a1738
+	bne.un L_10a1d80
 // --- basic block ---
-// 0x010a1770: 0x10a1770: lw    ra, 28(sp)
-// 0x010a1774: 0x10a1774: lw    s2, 24(sp)
+// 0x010a1db8: 0x10a1db8: lw    ra, 28(sp)
+// 0x010a1dbc: 0x10a1dbc: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6752,7 +6752,7 @@ L_10a1764:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a1778: 0x10a1778: lw    s1, 20(sp)
+// 0x010a1dc0: 0x10a1dc0: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6761,7 +6761,7 @@ L_10a1764:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a177c: 0x10a177c: lw    s0, 16(sp)
+// 0x010a1dc4: 0x10a1dc4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6770,7 +6770,7 @@ L_10a1764:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1780: 0x10a1780: jr    ra addiu sp, sp, 32
+// 0x010a1dc8: 0x10a1dc8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6782,7 +6782,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 load_resource_10a1788(int32,int32,int32,int32,int32)
+.method public static int32 load_resource_10a1dd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32 v1,int32[] mem,int32 s3,int32 s0,int32 s2,int32 s4,int32 ra)
@@ -6832,17 +6832,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1788: 0x10a1788: addiu sp, sp, -552
+// 0x010a1dd0: 0x10a1dd0: addiu sp, sp, -552
 	ldloc.0
 	ldc.i4 -552
 	add
 	stloc.0
-// 0x010a178c: 0x10a178c: andi  a1, a1, 1
+// 0x010a1dd4: 0x10a1dd4: andi  a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	and
 	stloc.2
-// 0x010a1790: 0x10a1790: sw    s3, 540(sp)
+// 0x010a1dd8: 0x10a1dd8: sw    s3, 540(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6851,7 +6851,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1794: 0x10a1794: sw    s2, 536(sp)
+// 0x010a1ddc: 0x10a1ddc: sw    s2, 536(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6860,7 +6860,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a1798: 0x10a1798: sw    s0, 528(sp)
+// 0x010a1de0: 0x10a1de0: sw    s0, 528(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6869,8 +6869,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a179c: 0x10a179c: sw    ra, 548(sp)
-// 0x010a17a0: 0x10a17a0: sw    s4, 544(sp)
+// 0x010a1de4: 0x10a1de4: sw    ra, 548(sp)
+// 0x010a1de8: 0x10a1de8: sw    s4, 544(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6879,7 +6879,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a17a4: 0x10a17a4: sw    s1, 532(sp)
+// 0x010a1dec: 0x10a1dec: sw    s1, 532(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6888,27 +6888,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a17a8: 0x10a17a8: addu  s3, a0, zero
+// 0x010a1df0: 0x10a1df0: addu  s3, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a17ac: 0x10a17ac: addu  s0, a2, zero
+// 0x010a1df4: 0x10a1df4: addu  s0, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010a17b0: 0x10a17b0: beq   a1, zero, 0x10a1858 addu  s2, a3, zero
+// 0x010a1df8: 0x10a1df8: beq   a1, zero, 0x10a1ea0 addu  s2, a3, zero
 	ldloc.2
 	ldloc 4
 	stloc 11
-	brfalse L_10a1858
+	brfalse L_10a1ea0
 // --- basic block ---
-// 0x010a17b8: 0x10a17b8: lui   a1, 0x20000
+// 0x010a1e00: 0x10a1e00: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a17bc: 0x10a17bc: addiu a1, a1, -272
+// 0x010a1e04: 0x10a1e04: addiu a1, a1, 192
 	ldloc.2
-	ldc.i4 -272
+	ldc.i4 192
 	add
 	stloc.2
-// 0x010a17c0: 0x10a17c0: jal   0x1000420 addu  a0, a2, zero
+// 0x010a1e08: 0x10a1e08: jal   0x1000420 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -6921,16 +6921,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a17c8: 0x10a17c8: beq   v0, zero, 0x10a1828 lui   s4, 0x0
+// 0x010a1e10: 0x10a1e10: beq   v0, zero, 0x10a1e70 lui   s4, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	brfalse L_10a1828
+	brfalse L_10a1e70
 // --- basic block ---
-// 0x010a17d0: 0x10a17d0: lui   s1, 0x80000
+// 0x010a1e18: 0x10a1e18: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a17d4: 0x10a17d4: lw    v0, 17752(s4)
+// 0x010a1e1c: 0x10a1e1c: lw    v0, 17752(s4)
 	ldloc 8
 	ldloc 12
 	ldc.i4.2
@@ -6939,43 +6939,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a17d8: 0x10a17d8: addiu s1, s1, 16052
+// 0x010a1e20: 0x10a1e20: addiu s1, s1, 16516
 	ldloc 6
-	ldc.i4 16052
+	ldc.i4 16516
 	add
 	stloc 6
-// 0x010a17dc: 0x10a17dc: beq   v0, zero, 0x10a1838 addu  a0, s1, zero
+// 0x010a1e24: 0x10a1e24: beq   v0, zero, 0x10a1e80 addu  a0, s1, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brfalse L_10a1838
+	brfalse L_10a1e80
 // --- basic block ---
-// 0x010a17e4: 0x10a17e4: jal   0x104c524 sll   zero, zero, 0
+// 0x010a1e2c: 0x10a1e2c: jal   0x104c534 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a17ec: 0x10a17ec: lui   a3, 0x20000
+// 0x010a1e34: 0x10a1e34: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a17f0: 0x10a17f0: addu  a2, v0, zero
+// 0x010a1e38: 0x10a1e38: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a17f4: 0x10a17f4: addu  a0, s1, zero
+// 0x010a1e3c: 0x10a1e3c: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x010a17f8: 0x10a17f8: addiu a3, a3, -264
+// 0x010a1e40: 0x10a1e40: addiu a3, a3, 200
 	ldloc 4
-	ldc.i4 -264
+	ldc.i4 200
 	add
 	stloc 4
-// 0x010a17fc: 0x10a17fc: jal   0x104ccb4 addiu a1, zero, 512
+// 0x010a1e44: 0x10a1e44: jal   0x104ccc4 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -6983,26 +6983,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1804: 0x10a1804: lui   a3, 0x0
+// 0x010a1e4c: 0x10a1e4c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010a1808: 0x10a1808: addu  a0, s1, zero
+// 0x010a1e50: 0x10a1e50: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x010a180c: 0x10a180c: addiu a3, a3, 28132
+// 0x010a1e54: 0x10a1e54: addiu a3, a3, 28132
 	ldloc 4
 	ldc.i4 28132
 	add
 	stloc 4
-// 0x010a1810: 0x10a1810: addiu a1, zero, 512
+// 0x010a1e58: 0x10a1e58: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010a1814: 0x10a1814: jal   0x104ccb4 addu  a2, s1, zero
+// 0x010a1e5c: 0x10a1e5c: jal   0x104ccc4 addu  a2, s1, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -7010,12 +7010,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a181c: 0x10a181c: sw    zero, 17752(s4)
+// 0x010a1e64: 0x10a1e64: sw    zero, 17752(s4)
 	ldloc 8
 	ldloc 12
 	ldc.i4.2
@@ -7024,18 +7024,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a1820: 0x10a1820: j	 0x10a1838 addu  a0, s1, zero
+// 0x010a1e68: 0x10a1e68: j	 0x10a1e80 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-	br L_10a1838
+	br L_10a1e80
 // --- basic block ---
-L_10a1828:
-// 0x010a1828: 0x10a1828: lui   a0, 0x20000
+L_10a1e70:
+// 0x010a1e70: 0x10a1e70: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a182c: 0x10a182c: jal   0x104d04c addiu a0, a0, -26888
+// 0x010a1e74: 0x10a1e74: jal   0x104d05c addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
 	ldloc.0
@@ -7043,99 +7043,99 @@ L_10a1828:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_preferred_104d04c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_preferred_104d05c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1834: 0x10a1834: addu  a0, v0, zero
+// 0x010a1e7c: 0x10a1e7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_10a1838:
-// 0x010a1838: 0x10a1838: beq   s3, zero, 0x10a1850 addiu v1, zero, 1
+L_10a1e80:
+// 0x010a1e80: 0x10a1e80: beq   s3, zero, 0x10a1e98 addiu v1, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 7
-	brfalse L_10a1850
+	brfalse L_10a1e98
 // --- basic block ---
-// 0x010a1840: 0x10a1840: bne   s3, v1, 0x10a18f8 addu  v0, zero, zero
+// 0x010a1e88: 0x10a1e88: bne   s3, v1, 0x10a1f40 addu  v0, zero, zero
 	ldloc 9
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_10a18f8
+	bne.un L_10a1f40
 // --- basic block ---
-// 0x010a1848: 0x10a1848: j	 0x10a18f0 addu  a1, s0, zero
+// 0x010a1e90: 0x10a1e90: j	 0x10a1f38 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-	br L_10a18f0
+	br L_10a1f38
 // --- basic block ---
-L_10a1850:
-// 0x010a1850: 0x10a1850: j	 0x10a189c sw    zero, 0(s2)
+L_10a1e98:
+// 0x010a1e98: 0x10a1e98: j	 0x10a1ee4 sw    zero, 0(s2)
 	ldloc 8
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_10a189c
+	br L_10a1ee4
 // --- basic block ---
-L_10a1858:
-// 0x010a1858: 0x10a1858: jal   0x104c564 sll   zero, zero, 0
+L_10a1ea0:
+// 0x010a1ea0: 0x10a1ea0: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1860: 0x10a1860: beq   s3, zero, 0x10a187c addiu s1, sp, 16
+// 0x010a1ea8: 0x10a1ea8: beq   s3, zero, 0x10a1ec4 addiu s1, sp, 16
 	ldloc 9
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-	brfalse L_10a187c
+	brfalse L_10a1ec4
 // --- basic block ---
-// 0x010a1868: 0x10a1868: addiu v1, zero, 1
+// 0x010a1eb0: 0x10a1eb0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010a186c: 0x10a186c: bne   s3, v1, 0x10a18f8 addu  v0, zero, zero
+// 0x010a1eb4: 0x10a1eb4: bne   s3, v1, 0x10a1f40 addu  v0, zero, zero
 	ldloc 9
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_10a18f8
+	bne.un L_10a1f40
 // --- basic block ---
-// 0x010a1874: 0x10a1874: j	 0x10a18ac sll   zero, zero, 0
-	br L_10a18ac
+// 0x010a1ebc: 0x10a1ebc: j	 0x10a1ef4 sll   zero, zero, 0
+	br L_10a1ef4
 // --- basic block ---
-L_10a187c:
-// 0x010a187c: 0x10a187c: lui   a3, 0x10000
+L_10a1ec4:
+// 0x010a1ec4: 0x10a1ec4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010a1880: 0x10a1880: addu  a0, s1, zero
+// 0x010a1ec8: 0x10a1ec8: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x010a1884: 0x10a1884: sw    zero, 0(s2)
+// 0x010a1ecc: 0x10a1ecc: sw    zero, 0(s2)
 	ldloc 8
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a1888: 0x10a1888: addu  a2, v0, zero
+// 0x010a1ed0: 0x10a1ed0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a188c: 0x10a188c: addiu a3, a3, -29420
+// 0x010a1ed4: 0x10a1ed4: addiu a3, a3, -29420
 	ldloc 4
 	ldc.i4 -29420
 	add
 	stloc 4
-// 0x010a1890: 0x10a1890: jal   0x104ccb4 addiu a1, zero, 512
+// 0x010a1ed8: 0x10a1ed8: jal   0x104ccc4 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -7143,16 +7143,16 @@ L_10a187c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1898: 0x10a1898: addu  a0, s1, zero
+// 0x010a1ee0: 0x10a1ee0: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-L_10a189c:
-// 0x010a189c: 0x10a189c: jal   0x104eca0 addu  a1, s0, zero
+L_10a1ee4:
+// 0x010a1ee4: 0x10a1ee4: jal   0x104ecb0 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -7160,16 +7160,16 @@ L_10a189c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_load_image_104eca0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_load_image_104ecb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a18a4: 0x10a18a4: j	 0x10a18f8 sll   zero, zero, 0
-	br L_10a18f8
+// 0x010a1eec: 0x10a1eec: j	 0x10a1f40 sll   zero, zero, 0
+	br L_10a1f40
 // --- basic block ---
-L_10a18ac:
-// 0x010a18ac: 0x10a18ac: jal   0x104c524 addiu s1, sp, 16
+L_10a1ef4:
+// 0x010a1ef4: 0x10a1ef4: jal   0x104c534 addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -7179,26 +7179,26 @@ L_10a18ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a18b4: 0x10a18b4: lui   a3, 0x10000
+// 0x010a1efc: 0x10a1efc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010a18b8: 0x10a18b8: addu  a2, v0, zero
+// 0x010a1f00: 0x10a1f00: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a18bc: 0x10a18bc: addiu a3, a3, 5092
+// 0x010a1f04: 0x10a1f04: addiu a3, a3, 5088
 	ldloc 4
-	ldc.i4 5092
+	ldc.i4 5088
 	add
 	stloc 4
-// 0x010a18c0: 0x10a18c0: addiu a1, zero, 512
+// 0x010a1f08: 0x10a1f08: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010a18c4: 0x10a18c4: jal   0x104ccb4 addu  a0, s1, zero
+// 0x010a1f0c: 0x10a1f0c: jal   0x104ccc4 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -7206,32 +7206,32 @@ L_10a18ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a18cc: 0x10a18cc: jal   0x1044134 sll   zero, zero, 0
+// 0x010a1f14: 0x10a1f14: jal   0x1044144 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a18d4: 0x10a18d4: addu  a3, v0, zero
+// 0x010a1f1c: 0x10a1f1c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a18d8: 0x10a18d8: addu  a0, s1, zero
+// 0x010a1f20: 0x10a1f20: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x010a18dc: 0x10a18dc: addiu a1, zero, 512
+// 0x010a1f24: 0x10a1f24: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010a18e0: 0x10a18e0: jal   0x104ccb4 addu  a2, s1, zero
+// 0x010a1f28: 0x10a1f28: jal   0x104ccc4 addu  a2, s1, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -7239,27 +7239,27 @@ L_10a18ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a18e8: 0x10a18e8: addu  a0, s1, zero
+// 0x010a1f30: 0x10a1f30: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x010a18ec: 0x10a18ec: addu  a1, s0, zero
+// 0x010a1f34: 0x10a1f34: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-L_10a18f0:
-// 0x010a18f0: 0x10a18f0: jal   0x1051898 addu  a2, s2, zero
+L_10a1f38:
+// 0x010a1f38: 0x10a1f38: jal   0x10518a8 addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-	call int32 Cibyl60::roadmap_sound_load_1051898()
+	call int32 Cibyl60::roadmap_sound_load_10518a8()
 	stloc 5
 // --- basic block ---
-L_10a18f8:
-// 0x010a18f8: 0x10a18f8: lw    ra, 548(sp)
-// 0x010a18fc: 0x10a18fc: lw    s4, 544(sp)
+L_10a1f40:
+// 0x010a1f40: 0x10a1f40: lw    ra, 548(sp)
+// 0x010a1f44: 0x10a1f44: lw    s4, 544(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7268,7 +7268,7 @@ L_10a18f8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a1900: 0x10a1900: lw    s3, 540(sp)
+// 0x010a1f48: 0x10a1f48: lw    s3, 540(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7277,7 +7277,7 @@ L_10a18f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a1904: 0x10a1904: lw    s2, 536(sp)
+// 0x010a1f4c: 0x10a1f4c: lw    s2, 536(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7286,7 +7286,7 @@ L_10a18f8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a1908: 0x10a1908: lw    s1, 532(sp)
+// 0x010a1f50: 0x10a1f50: lw    s1, 532(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7295,7 +7295,7 @@ L_10a18f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a190c: 0x10a190c: lw    s0, 528(sp)
+// 0x010a1f54: 0x10a1f54: lw    s0, 528(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7304,7 +7304,7 @@ L_10a18f8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a1910: 0x10a1910: jr    ra addiu sp, sp, 552
+// 0x010a1f58: 0x10a1f58: jr    ra addiu sp, sp, 552
 	ldloc.0
 	ldc.i4 552
 	add
diff --git a/converted/Cibyl121.j b/converted/Cibyl121.j
index baf6952..6e67ab5 100644
--- a/converted/Cibyl121.j
+++ b/converted/Cibyl121.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl121::.ctor
 
-.method public static int32 roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 lo,int32 s5,int32 s3,int32 s6,int32 s7,int32 s2,int32 s4,int32 s8,int32 ra)
@@ -106,12 +106,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1918: 0x10a1918: addiu sp, sp, -80
+// 0x010a1f60: 0x10a1f60: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010a191c: 0x10a191c: sw    s4, 56(sp)
+// 0x010a1f64: 0x10a1f64: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -120,7 +120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a1920: 0x10a1920: sw    s2, 48(sp)
+// 0x010a1f68: 0x10a1f68: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -129,7 +129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a1924: 0x10a1924: sw    s1, 44(sp)
+// 0x010a1f6c: 0x10a1f6c: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -138,8 +138,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1928: 0x10a1928: sw    ra, 76(sp)
-// 0x010a192c: 0x10a192c: sw    s8, 72(sp)
+// 0x010a1f70: 0x10a1f70: sw    ra, 76(sp)
+// 0x010a1f74: 0x10a1f74: sw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -148,7 +148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010a1930: 0x10a1930: sw    s7, 68(sp)
+// 0x010a1f78: 0x10a1f78: sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -157,7 +157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a1934: 0x10a1934: sw    s6, 64(sp)
+// 0x010a1f7c: 0x10a1f7c: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -166,7 +166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a1938: 0x10a1938: sw    s5, 60(sp)
+// 0x010a1f80: 0x10a1f80: sw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -175,7 +175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a193c: 0x10a193c: sw    s3, 52(sp)
+// 0x010a1f84: 0x10a1f84: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -184,7 +184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a1940: 0x10a1940: sw    s0, 40(sp)
+// 0x010a1f88: 0x10a1f88: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -193,95 +193,95 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a1944: 0x10a1944: addu  s2, a2, zero
+// 0x010a1f8c: 0x10a1f8c: addu  s2, a2, zero
 	ldloc.3
 	stloc 15
-// 0x010a1948: 0x10a1948: addu  s1, a0, zero
+// 0x010a1f90: 0x10a1f90: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a194c: 0x10a194c: beq   a2, zero, 0x10a1ed0 addu  s4, a1, zero
+// 0x010a1f94: 0x10a1f94: beq   a2, zero, 0x10a2518 addu  s4, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 16
-	brfalse L_10a1ed0
+	brfalse L_10a2518
 // --- basic block ---
-// 0x010a1954: 0x10a1954: lb    v0, 0(a2)
+// 0x010a1f9c: 0x10a1f9c: lb    v0, 0(a2)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a1958: 0x10a1958: sll   zero, zero, 0
-// 0x010a195c: 0x10a195c: beq   v0, zero, 0x10a1ed0 addiu s0, zero, 3628
+// 0x010a1fa0: 0x10a1fa0: sll   zero, zero, 0
+// 0x010a1fa4: 0x10a1fa4: beq   v0, zero, 0x10a2518 addiu s0, zero, 3628
 	ldloc 5
 	ldc.i4 3628
 	stloc 8
-	brfalse L_10a1ed0
+	brfalse L_10a2518
 // --- basic block ---
-// 0x010a1964: 0x10a1964: mult  a0, s0
+// 0x010a1fac: 0x10a1fac: mult  a0, s0
 	ldloc.1
 	ldloc 8
 	mul
 	stloc 10
-// 0x010a1968: 0x10a1968: lui   s0, 0x80000
+// 0x010a1fb0: 0x10a1fb0: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010a196c: 0x10a196c: addiu s0, s0, 16564
+// 0x010a1fb4: 0x10a1fb4: addiu s0, s0, 17028
 	ldloc 8
-	ldc.i4 16564
+	ldc.i4 17028
 	add
 	stloc 8
-// 0x010a1970: 0x10a1970: mflo  lo
+// 0x010a1fb8: 0x10a1fb8: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010a1974: 0x10a1974: addu  s0, s0, v0
+// 0x010a1fbc: 0x10a1fbc: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x010a1978: 0x10a1978: lw    v0, 0(s0)
+// 0x010a1fc0: 0x10a1fc0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010a197c: 0x10a197c: sll   zero, zero, 0
-// 0x010a1980: 0x10a1980: bne   v0, zero, 0x10a19e8 andi  s6, s4, 2
+// 0x010a1fc4: 0x10a1fc4: sll   zero, zero, 0
+// 0x010a1fc8: 0x10a1fc8: bne   v0, zero, 0x10a2030 andi  s6, s4, 2
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	and
 	stloc 13
-	brtrue L_10a19e8
+	brtrue L_10a2030
 // --- basic block ---
-// 0x010a1988: 0x10a1988: lui   v0, 0x0
+// 0x010a1fd0: 0x10a1fd0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a198c: 0x10a198c: sll   v1, a0, 2
+// 0x010a1fd4: 0x10a1fd4: sll   v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010a1990: 0x10a1990: addiu v0, v0, 17740
+// 0x010a1fd8: 0x10a1fd8: addiu v0, v0, 17740
 	ldloc 5
 	ldc.i4 17740
 	add
 	stloc 5
-// 0x010a1994: 0x10a1994: addu  v0, v1, v0
+// 0x010a1fdc: 0x10a1fdc: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010a1998: 0x10a1998: lw    a0, 0(v0)
+// 0x010a1fe0: 0x10a1fe0: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a199c: 0x10a199c: addiu a1, zero, 150
+// 0x010a1fe4: 0x10a1fe4: addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
-// 0x010a19a0: 0x10a19a0: jal   0x10158bc sw    s1, 1808(s0)
+// 0x010a1fe8: 0x10a1fe8: jal   0x10158cc sw    s1, 1808(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -295,37 +295,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_new_10158bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_new_10158cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a19a8: 0x10a19a8: sw    v0, 0(s0)
+// 0x010a1ff0: 0x10a1ff0: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010a19ac: 0x10a19ac: addiu v1, zero, 1
+// 0x010a1ff4: 0x10a1ff4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010a19b0: 0x10a19b0: addu  v0, s0, zero
+// 0x010a1ff8: 0x10a1ff8: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010a19b4: 0x10a19b4: addiu a0, zero, -1
+// 0x010a1ffc: 0x10a1ffc: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010a19b8: 0x10a19b8: addiu a1, zero, 150
+// 0x010a2000: 0x10a2000: addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
-L_10a19bc:
-// 0x010a19bc: 0x10a19bc: addiu v1, v1, 1
+L_10a2004:
+// 0x010a2004: 0x10a2004: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010a19c0: 0x10a19c0: sw    a0, 16(v0)
+// 0x010a2008: 0x10a2008: sw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -334,7 +334,7 @@ L_10a19bc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a19c4: 0x10a19c4: sw    a0, 20(v0)
+// 0x010a200c: 0x10a200c: sw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -343,7 +343,7 @@ L_10a19bc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a19c8: 0x10a19c8: sw    a0, 24(v0)
+// 0x010a2010: 0x10a2010: sw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -352,16 +352,16 @@ L_10a19bc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a19cc: 0x10a19cc: bne   v1, a1, 0x10a19bc addiu v0, v0, 12
+// 0x010a2014: 0x10a2014: bne   v1, a1, 0x10a2004 addiu v0, v0, 12
 	ldloc 7
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 12
 	add
 	stloc 5
-	bne.un L_10a19bc
+	bne.un L_10a2004
 // --- basic block ---
-// 0x010a19d4: 0x10a19d4: sw    v1, 3616(s0)
+// 0x010a201c: 0x10a201c: sw    v1, 3616(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -370,7 +370,7 @@ L_10a19bc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a19d8: 0x10a19d8: sw    zero, 1804(s0)
+// 0x010a2020: 0x10a2020: sw    zero, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -379,7 +379,7 @@ L_10a19bc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a19dc: 0x10a19dc: sw    zero, 8(s0)
+// 0x010a2024: 0x10a2024: sw    zero, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -388,7 +388,7 @@ L_10a19bc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a19e0: 0x10a19e0: sw    zero, 12(s0)
+// 0x010a2028: 0x10a2028: sw    zero, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -397,21 +397,21 @@ L_10a19bc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a19e4: 0x10a19e4: andi  s6, s4, 2
+// 0x010a202c: 0x10a202c: andi  s6, s4, 2
 	ldloc 16
 	ldc.i4.2
 	and
 	stloc 13
-L_10a19e8:
-// 0x010a19e8: 0x10a19e8: bne   s6, zero, 0x10a1aec andi  v0, s4, 4
+L_10a2030:
+// 0x010a2030: 0x10a2030: bne   s6, zero, 0x10a2134 andi  v0, s4, 4
 	ldloc 13
 	ldloc 16
 	ldc.i4.4
 	and
 	stloc 5
-	brtrue L_10a1aec
+	brtrue L_10a2134
 // --- basic block ---
-// 0x010a19f0: 0x10a19f0: lw    v0, 3612(s0)
+// 0x010a2038: 0x10a2038: lw    v0, 3612(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -420,63 +420,63 @@ L_10a19e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a19f4: 0x10a19f4: sll   zero, zero, 0
-// 0x010a19f8: 0x10a19f8: beq   v0, zero, 0x10a1aec andi  v0, s4, 4
+// 0x010a203c: 0x10a203c: sll   zero, zero, 0
+// 0x010a2040: 0x10a2040: beq   v0, zero, 0x10a2134 andi  v0, s4, 4
 	ldloc 5
 	ldloc 16
 	ldc.i4.4
 	and
 	stloc 5
-	brfalse L_10a1aec
+	brfalse L_10a2134
 // --- basic block ---
-// 0x010a1a00: 0x10a1a00: jal   0x10155ac addu  a0, s2, zero
+// 0x010a2048: 0x10a2048: jal   0x10155bc addu  a0, s2, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_string_10155ac(int32,int32)
+	call int32 Cibyl15::roadmap_hash_string_10155bc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1a08: 0x10a1a08: lw    a0, 0(s0)
+// 0x010a2050: 0x10a2050: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a1a0c: 0x10a1a0c: jal   0x1015518 addu  a1, v0, zero
+// 0x010a2054: 0x10a2054: jal   0x1015528 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_get_first_1015518(int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_first_1015528(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a1a14: 0x10a1a14: addu  s3, v0, zero
+// 0x010a205c: 0x10a205c: addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010a1a18: 0x10a1a18: j	 0x10a1a50 addiu s8, zero, 12
+// 0x010a2060: 0x10a2060: j	 0x10a2098 addiu s8, zero, 12
 	ldc.i4.s 12
 	stloc 17
-	br L_10a1a50
+	br L_10a2098
 // --- basic block ---
-L_10a1a20:
-// 0x010a1a20: 0x10a1a20: mult  s3, s8
+L_10a2068:
+// 0x010a2068: 0x10a2068: mult  s3, s8
 	ldloc 12
 	ldloc 17
 	mul
 	stloc 10
-// 0x010a1a24: 0x10a1a24: mflo  lo
+// 0x010a206c: 0x10a206c: mflo  lo
 	ldloc 10
 	stloc 11
-// 0x010a1a28: 0x10a1a28: addu  s5, s0, s5
+// 0x010a2070: 0x10a2070: addu  s5, s0, s5
 	ldloc 8
 	ldloc 11
 	add
 	stloc 11
-// 0x010a1a2c: 0x10a1a2c: lw    a1, 1812(s5)
+// 0x010a2074: 0x10a2074: lw    a1, 1812(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -485,68 +485,68 @@ L_10a1a20:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a1a30: 0x10a1a30: jal   0x1001b14 sll   zero, zero, 0
+// 0x010a2078: 0x10a2078: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a1a38: 0x10a1a38: beq   v0, zero, 0x10a1f08 addu  a1, s3, zero
+// 0x010a2080: 0x10a2080: beq   v0, zero, 0x10a2550 addu  a1, s3, zero
 	ldloc 5
 	ldloc 12
 	stloc.2
-	brfalse L_10a1f08
+	brfalse L_10a2550
 // --- basic block ---
-// 0x010a1a40: 0x10a1a40: lw    a0, 0(s0)
+// 0x010a2088: 0x10a2088: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a1a44: 0x10a1a44: jal   0x1015744 sll   zero, zero, 0
+// 0x010a208c: 0x10a208c: jal   0x1015754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1a4c: 0x10a1a4c: addu  s3, v0, zero
+// 0x010a2094: 0x10a2094: addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-L_10a1a50:
-// 0x010a1a50: 0x10a1a50: addu  a0, s2, zero
+L_10a2098:
+// 0x010a2098: 0x10a2098: addu  a0, s2, zero
 	ldloc 15
 	stloc.1
-// 0x010a1a54: 0x10a1a54: bgez  s3, 0x10a1a20 addiu s7, zero, 12
+// 0x010a209c: 0x10a209c: bgez  s3, 0x10a2068 addiu s7, zero, 12
 	ldloc 12
 	ldc.i4.s 12
 	stloc 14
 	ldc.i4.s 0
-	bge L_10a1a20
+	bge L_10a2068
 // --- basic block ---
-// 0x010a1a5c: 0x10a1a5c: j	 0x10a1aec andi  v0, s4, 4
+// 0x010a20a4: 0x10a20a4: j	 0x10a2134 andi  v0, s4, 4
 	ldloc 16
 	ldc.i4.4
 	and
 	stloc 5
-	br L_10a1aec
+	br L_10a2134
 // --- basic block ---
-L_10a1a64:
-// 0x010a1a64: 0x10a1a64: beq   v0, s3, 0x10a1ab4 mult  v0, s7
+L_10a20ac:
+// 0x010a20ac: 0x10a20ac: beq   v0, s3, 0x10a20fc mult  v0, s7
 	ldloc 5
 	ldloc 12
 	ldloc 5
 	ldloc 14
 	mul
 	stloc 10
-	beq  L_10a1ab4
+	beq  L_10a20fc
 // --- basic block ---
-// 0x010a1a6c: 0x10a1a6c: sw    v0, 8(s5)
+// 0x010a20b4: 0x10a20b4: sw    v0, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -555,7 +555,7 @@ L_10a1a64:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1a70: 0x10a1a70: lw    v0, 1804(s0)
+// 0x010a20b8: 0x10a20b8: lw    v0, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -564,8 +564,8 @@ L_10a1a64:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1a74: 0x10a1a74: sll   zero, zero, 0
-// 0x010a1a78: 0x10a1a78: sw    v0, 12(s5)
+// 0x010a20bc: 0x10a20bc: sll   zero, zero, 0
+// 0x010a20c0: 0x10a20c0: sw    v0, 12(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -574,15 +574,15 @@ L_10a1a64:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1a7c: 0x10a1a7c: mflo  lo
+// 0x010a20c4: 0x10a20c4: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x010a1a80: 0x10a1a80: addu  v0, s0, a1
+// 0x010a20c8: 0x10a20c8: addu  v0, s0, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc 5
-// 0x010a1a84: 0x10a1a84: bltz  a0, 0x10a1a9c sw    s3, 12(v0)
+// 0x010a20cc: 0x10a20cc: bltz  a0, 0x10a20e4 sw    s3, 12(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
@@ -593,22 +593,22 @@ L_10a1a64:
 	ldloc 12
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10a1a9c
+	blt L_10a20e4
 // --- basic block ---
-// 0x010a1a8c: 0x10a1a8c: mult  a0, s7
+// 0x010a20d4: 0x10a20d4: mult  a0, s7
 	ldloc.1
 	ldloc 14
 	mul
 	stloc 10
-// 0x010a1a90: 0x10a1a90: mflo  lo
+// 0x010a20d8: 0x10a20d8: mflo  lo
 	ldloc 10
 	stloc 14
-// 0x010a1a94: 0x10a1a94: addu  s7, s0, s7
+// 0x010a20dc: 0x10a20dc: addu  s7, s0, s7
 	ldloc 8
 	ldloc 14
 	add
 	stloc 14
-// 0x010a1a98: 0x10a1a98: sw    v1, 12(s7)
+// 0x010a20e0: 0x10a20e0: sw    v1, 12(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -617,28 +617,28 @@ L_10a1a64:
 	add
 	ldloc 7
 	stelem.i4
-L_10a1a9c:
-// 0x010a1a9c: 0x10a1a9c: bltz  v1, 0x10a1ab4 addiu v0, zero, 12
+L_10a20e4:
+// 0x010a20e4: 0x10a20e4: bltz  v1, 0x10a20fc addiu v0, zero, 12
 	ldloc 7
 	ldc.i4.s 12
 	stloc 5
 	ldc.i4.s 0
-	blt L_10a1ab4
+	blt L_10a20fc
 // --- basic block ---
-// 0x010a1aa4: 0x10a1aa4: mult  v1, v0
+// 0x010a20ec: 0x10a20ec: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1aa8: 0x10a1aa8: mflo  lo
+// 0x010a20f0: 0x10a20f0: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x010a1aac: 0x10a1aac: addu  v1, s0, v1
+// 0x010a20f4: 0x10a20f4: addu  v1, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x010a1ab0: 0x10a1ab0: sw    a0, 8(v1)
+// 0x010a20f8: 0x10a20f8: sw    a0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -647,8 +647,8 @@ L_10a1a9c:
 	add
 	ldloc.1
 	stelem.i4
-L_10a1ab4:
-// 0x010a1ab4: 0x10a1ab4: lw    v1, 1804(s0)
+L_10a20fc:
+// 0x010a20fc: 0x10a20fc: lw    v1, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -657,23 +657,23 @@ L_10a1ab4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1ab8: 0x10a1ab8: addiu v0, zero, 12
+// 0x010a2100: 0x10a2100: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x010a1abc: 0x10a1abc: mult  v1, v0
+// 0x010a2104: 0x10a2104: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1ac0: 0x10a1ac0: mflo  lo
+// 0x010a2108: 0x10a2108: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010a1ac4: 0x10a1ac4: addu  v0, s0, v0
+// 0x010a210c: 0x10a210c: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x010a1ac8: 0x10a1ac8: sw    s3, 8(v0)
+// 0x010a2110: 0x10a2110: sw    s3, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -682,7 +682,7 @@ L_10a1ab4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a1acc: 0x10a1acc: sw    s3, 1804(s0)
+// 0x010a2114: 0x10a2114: sw    s3, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -691,24 +691,24 @@ L_10a1ab4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a1ad0: 0x10a1ad0: addiu v0, zero, 12
+// 0x010a2118: 0x10a2118: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-L_10a1ad4:
-// 0x010a1ad4: 0x10a1ad4: mult  s3, v0
+L_10a211c:
+// 0x010a211c: 0x10a211c: mult  s3, v0
 	ldloc 12
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1ad8: 0x10a1ad8: mflo  lo
+// 0x010a2120: 0x10a2120: mflo  lo
 	ldloc 10
 	stloc 12
-// 0x010a1adc: 0x10a1adc: addu  s0, s0, s3
+// 0x010a2124: 0x10a2124: addu  s0, s0, s3
 	ldloc 8
 	ldloc 12
 	add
 	stloc 8
-// 0x010a1ae0: 0x10a1ae0: lw    s3, 1816(s0)
+// 0x010a2128: 0x10a2128: lw    s3, 1816(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -717,37 +717,37 @@ L_10a1ad4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a1ae4: 0x10a1ae4: j	 0x10a1ed4 sll   zero, zero, 0
-	br L_10a1ed4
+// 0x010a212c: 0x10a212c: j	 0x10a251c sll   zero, zero, 0
+	br L_10a251c
 // --- basic block ---
-L_10a1aec:
-// 0x010a1aec: 0x10a1aec: bne   v0, zero, 0x10a1ed4 addu  s3, zero, zero
+L_10a2134:
+// 0x010a2134: 0x10a2134: bne   v0, zero, 0x10a251c addu  s3, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	brtrue L_10a1ed4
+	brtrue L_10a251c
 // --- basic block ---
-// 0x010a1af4: 0x10a1af4: beq   s1, zero, 0x10a1b0c addu  a0, s2, zero
+// 0x010a213c: 0x10a213c: beq   s1, zero, 0x10a2154 addu  a0, s2, zero
 	ldloc 9
 	ldloc 15
 	stloc.1
-	brfalse L_10a1b0c
+	brfalse L_10a2154
 // --- basic block ---
-// 0x010a1afc: 0x10a1afc: addiu v0, zero, 2
+// 0x010a2144: 0x10a2144: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a1b00: 0x10a1b00: bne   s1, v0, 0x10a1bdc addu  a0, s1, zero
+// 0x010a2148: 0x10a2148: bne   s1, v0, 0x10a2224 addu  a0, s1, zero
 	ldloc 9
 	ldloc 5
 	ldloc 9
 	stloc.1
-	bne.un L_10a1bdc
+	bne.un L_10a2224
 // --- basic block ---
-// 0x010a1b08: 0x10a1b08: addu  a0, s2, zero
+// 0x010a2150: 0x10a2150: addu  a0, s2, zero
 	ldloc 15
 	stloc.1
-L_10a1b0c:
-// 0x010a1b0c: 0x10a1b0c: jal   0x1001a5c addiu a1, zero, 46
+L_10a2154:
+// 0x010a2154: 0x10a2154: jal   0x1001a5c addiu a1, zero, 46
 	ldc.i4.s 46
 	stloc.2
 	ldloc.1
@@ -757,13 +757,13 @@ L_10a1b0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1b14: 0x10a1b14: bne   v0, zero, 0x10a1bdc addu  a0, s1, zero
+// 0x010a215c: 0x10a215c: bne   v0, zero, 0x10a2224 addu  a0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_10a1bdc
+	brtrue L_10a2224
 // --- basic block ---
-// 0x010a1b1c: 0x10a1b1c: jal   0x1001b48 addu  a0, s2, zero
+// 0x010a2164: 0x10a2164: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
@@ -772,7 +772,7 @@ L_10a1b0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1b24: 0x10a1b24: jal   0x1000910 addiu a0, v0, 5
+// 0x010a216c: 0x10a216c: jal   0x1000910 addiu a0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	add
@@ -787,32 +787,32 @@ L_10a1b0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1b2c: 0x10a1b2c: addu  s5, v0, zero
+// 0x010a2174: 0x10a2174: addu  s5, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a1b30: 0x10a1b30: andi  v0, s4, 16
+// 0x010a2178: 0x10a2178: andi  v0, s4, 16
 	ldloc 16
 	ldc.i4.s 16
 	and
 	stloc 5
-// 0x010a1b34: 0x10a1b34: beq   v0, zero, 0x10a1b70 lui   a1, 0x20000
+// 0x010a217c: 0x10a217c: beq   v0, zero, 0x10a21b8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10a1b70
+	brfalse L_10a21b8
 // --- basic block ---
-// 0x010a1b3c: 0x10a1b3c: lui   a1, 0x20000
+// 0x010a2184: 0x10a2184: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a1b40: 0x10a1b40: addiu a1, a1, -256
+// 0x010a2188: 0x10a2188: addiu a1, a1, 208
 	ldloc.2
-	ldc.i4 -256
+	ldc.i4 208
 	add
 	stloc.2
-// 0x010a1b44: 0x10a1b44: addu  a0, s5, zero
+// 0x010a218c: 0x10a218c: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x010a1b48: 0x10a1b48: jal   0x1000f64 addu  a2, s2, zero
+// 0x010a2190: 0x10a2190: jal   0x1000f64 addu  a2, s2, zero
 	ldloc 15
 	stloc.3
 	ldloc.0
@@ -825,16 +825,16 @@ L_10a1b0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1b50: 0x10a1b50: addu  a0, s1, zero
+// 0x010a2198: 0x10a2198: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a1b54: 0x10a1b54: addu  a1, s4, zero
+// 0x010a219c: 0x10a219c: addu  a1, s4, zero
 	ldloc 16
 	stloc.2
-// 0x010a1b58: 0x10a1b58: addu  a2, s5, zero
+// 0x010a21a0: 0x10a21a0: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x010a1b5c: 0x10a1b5c: jal   0x10a1788 addiu a3, sp, 32
+// 0x010a21a4: 0x10a21a4: jal   0x10a1dd0 addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -844,33 +844,33 @@ L_10a1b0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::load_resource_10a1788(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::load_resource_10a1dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1b64: 0x10a1b64: bne   v0, zero, 0x10a1bcc addu  s3, v0, zero
+// 0x010a21ac: 0x10a21ac: bne   v0, zero, 0x10a2214 addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
-	brtrue L_10a1bcc
+	brtrue L_10a2214
 // --- basic block ---
-// 0x010a1b6c: 0x10a1b6c: lui   a1, 0x20000
+// 0x010a21b4: 0x10a21b4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10a1b70:
-// 0x010a1b70: 0x10a1b70: addiu a1, a1, -248
+L_10a21b8:
+// 0x010a21b8: 0x10a21b8: addiu a1, a1, 216
 	ldloc.2
-	ldc.i4 -248
+	ldc.i4 216
 	add
 	stloc.2
-// 0x010a1b74: 0x10a1b74: addu  a0, s5, zero
+// 0x010a21bc: 0x10a21bc: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x010a1b78: 0x10a1b78: addu  a2, s2, zero
+// 0x010a21c0: 0x10a21c0: addu  a2, s2, zero
 	ldloc 15
 	stloc.3
-// 0x010a1b7c: 0x10a1b7c: jal   0x1000f64 addiu s7, sp, 32
+// 0x010a21c4: 0x10a21c4: jal   0x1000f64 addiu s7, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -885,16 +885,16 @@ L_10a1b70:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1b84: 0x10a1b84: addu  a0, s1, zero
+// 0x010a21cc: 0x10a21cc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a1b88: 0x10a1b88: addu  a1, s4, zero
+// 0x010a21d0: 0x10a21d0: addu  a1, s4, zero
 	ldloc 16
 	stloc.2
-// 0x010a1b8c: 0x10a1b8c: addu  a2, s5, zero
+// 0x010a21d4: 0x10a21d4: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x010a1b90: 0x10a1b90: jal   0x10a1788 addu  a3, s7, zero
+// 0x010a21d8: 0x10a21d8: jal   0x10a1dd0 addu  a3, s7, zero
 	ldloc 14
 	stloc 4
 	ldloc.0
@@ -902,29 +902,29 @@ L_10a1b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::load_resource_10a1788(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::load_resource_10a1dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1b98: 0x10a1b98: bne   v0, zero, 0x10a1bcc addu  s3, v0, zero
+// 0x010a21e0: 0x10a21e0: bne   v0, zero, 0x10a2214 addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
-	brtrue L_10a1bcc
+	brtrue L_10a2214
 // --- basic block ---
-// 0x010a1ba0: 0x10a1ba0: lui   a1, 0x20000
+// 0x010a21e8: 0x10a21e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a1ba4: 0x10a1ba4: addiu a1, a1, -256
+// 0x010a21ec: 0x10a21ec: addiu a1, a1, 208
 	ldloc.2
-	ldc.i4 -256
+	ldc.i4 208
 	add
 	stloc.2
-// 0x010a1ba8: 0x10a1ba8: addu  a0, s5, zero
+// 0x010a21f0: 0x10a21f0: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x010a1bac: 0x10a1bac: jal   0x1000f64 addu  a2, s2, zero
+// 0x010a21f4: 0x10a21f4: jal   0x1000f64 addu  a2, s2, zero
 	ldloc 15
 	stloc.3
 	ldloc.0
@@ -937,16 +937,16 @@ L_10a1b70:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1bb4: 0x10a1bb4: addu  a0, s1, zero
+// 0x010a21fc: 0x10a21fc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a1bb8: 0x10a1bb8: addu  a1, s4, zero
+// 0x010a2200: 0x10a2200: addu  a1, s4, zero
 	ldloc 16
 	stloc.2
-// 0x010a1bbc: 0x10a1bbc: addu  a2, s5, zero
+// 0x010a2204: 0x10a2204: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x010a1bc0: 0x10a1bc0: jal   0x10a1788 addu  a3, s7, zero
+// 0x010a2208: 0x10a2208: jal   0x10a1dd0 addu  a3, s7, zero
 	ldloc 14
 	stloc 4
 	ldloc.0
@@ -954,16 +954,16 @@ L_10a1b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::load_resource_10a1788(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::load_resource_10a1dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1bc8: 0x10a1bc8: addu  s3, v0, zero
+// 0x010a2210: 0x10a2210: addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-L_10a1bcc:
-// 0x010a1bcc: 0x10a1bcc: jal   0x1000930 addu  a0, s5, zero
+L_10a2214:
+// 0x010a2214: 0x10a2214: jal   0x1000930 addu  a0, s5, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -976,17 +976,17 @@ L_10a1bcc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1bd4: 0x10a1bd4: j	 0x10a1bf0 sll   zero, zero, 0
-	br L_10a1bf0
+// 0x010a221c: 0x10a221c: j	 0x10a2238 sll   zero, zero, 0
+	br L_10a2238
 // --- basic block ---
-L_10a1bdc:
-// 0x010a1bdc: 0x10a1bdc: addu  a1, s4, zero
+L_10a2224:
+// 0x010a2224: 0x10a2224: addu  a1, s4, zero
 	ldloc 16
 	stloc.2
-// 0x010a1be0: 0x10a1be0: addu  a2, s2, zero
+// 0x010a2228: 0x10a2228: addu  a2, s2, zero
 	ldloc 15
 	stloc.3
-// 0x010a1be4: 0x10a1be4: jal   0x10a1788 addiu a3, sp, 32
+// 0x010a222c: 0x10a222c: jal   0x10a1dd0 addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -996,48 +996,48 @@ L_10a1bdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::load_resource_10a1788(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::load_resource_10a1dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1bec: 0x10a1bec: addu  s3, v0, zero
+// 0x010a2234: 0x10a2234: addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-L_10a1bf0:
-// 0x010a1bf0: 0x10a1bf0: bne   s3, zero, 0x10a1c28 addiu v0, zero, 1
+L_10a2238:
+// 0x010a2238: 0x10a2238: bne   s3, zero, 0x10a2270 addiu v0, zero, 1
 	ldloc 12
 	ldc.i4.1
 	stloc 5
-	brtrue L_10a1c28
+	brtrue L_10a2270
 // --- basic block ---
-// 0x010a1bf8: 0x10a1bf8: beq   s1, v0, 0x10a1ed4 lui   a1, 0x20000
+// 0x010a2240: 0x10a2240: beq   s1, v0, 0x10a251c lui   a1, 0x20000
 	ldloc 9
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	beq  L_10a1ed4
+	beq  L_10a251c
 // --- basic block ---
-// 0x010a1c00: 0x10a1c00: lui   a3, 0x20000
+// 0x010a2248: 0x10a2248: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a1c04: 0x10a1c04: addiu a1, a1, -356
+// 0x010a224c: 0x10a224c: addiu a1, a1, 108
 	ldloc.2
-	ldc.i4 -356
+	ldc.i4.s 108
 	add
 	stloc.2
-// 0x010a1c08: 0x10a1c08: addiu a3, a3, -240
+// 0x010a2250: 0x10a2250: addiu a3, a3, 224
 	ldloc 4
-	ldc.i4 -240
+	ldc.i4 224
 	add
 	stloc 4
-// 0x010a1c0c: 0x10a1c0c: addiu a0, zero, 4
+// 0x010a2254: 0x10a2254: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a1c10: 0x10a1c10: addiu a2, zero, 325
+// 0x010a2258: 0x10a2258: addiu a2, zero, 325
 	ldc.i4 325
 	stloc.3
-// 0x010a1c14: 0x10a1c14: sw    s2, 16(sp)
+// 0x010a225c: 0x10a225c: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1046,7 +1046,7 @@ L_10a1bf0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a1c18: 0x10a1c18: jal   0x100449c sw    s1, 20(sp)
+// 0x010a2260: 0x10a2260: jal   0x100449c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1065,38 +1065,38 @@ L_10a1bf0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1c20: 0x10a1c20: j	 0x10a1ed4 sll   zero, zero, 0
-	br L_10a1ed4
+// 0x010a2268: 0x10a2268: j	 0x10a251c sll   zero, zero, 0
+	br L_10a251c
 // --- basic block ---
-L_10a1c28:
-// 0x010a1c28: 0x10a1c28: beq   s6, zero, 0x10a1c48 sll   zero, zero, 0
+L_10a2270:
+// 0x010a2270: 0x10a2270: beq   s6, zero, 0x10a2290 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_10a1c48
+	brfalse L_10a2290
 // --- basic block ---
-// 0x010a1c30: 0x10a1c30: bne   s1, zero, 0x10a1ed4 sll   zero, zero, 0
+// 0x010a2278: 0x10a2278: bne   s1, zero, 0x10a251c sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10a1ed4
+	brtrue L_10a251c
 // --- basic block ---
-// 0x010a1c38: 0x10a1c38: jal   0x104e11c addu  a0, s3, zero
+// 0x010a2280: 0x10a2280: jal   0x104e12c addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-	call void Cibyl57::roadmap_canvas_unmanaged_list_add_104e11c()
+	call void Cibyl57::roadmap_canvas_unmanaged_list_add_104e12c()
 // --- basic block ---
-// 0x010a1c40: 0x10a1c40: j	 0x10a1ed4 sll   zero, zero, 0
-	br L_10a1ed4
+// 0x010a2288: 0x10a2288: j	 0x10a251c sll   zero, zero, 0
+	br L_10a251c
 // --- basic block ---
-L_10a1c48:
-// 0x010a1c48: 0x10a1c48: jal   0x10155ac addu  a0, s2, zero
+L_10a2290:
+// 0x010a2290: 0x10a2290: jal   0x10155bc addu  a0, s2, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_string_10155ac(int32,int32)
+	call int32 Cibyl15::roadmap_hash_string_10155bc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1c50: 0x10a1c50: lw    s1, 3612(s0)
+// 0x010a2298: 0x10a2298: lw    s1, 3612(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1105,26 +1105,26 @@ L_10a1c48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a1c54: 0x10a1c54: addu  s7, v0, zero
+// 0x010a229c: 0x10a229c: addu  s7, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010a1c58: 0x10a1c58: slti  v0, s1, 150
+// 0x010a22a0: 0x10a22a0: slti  v0, s1, 150
 	ldloc 9
 	ldc.i4 150
 	clt
 	stloc 5
-// 0x010a1c5c: 0x10a1c5c: beq   v0, zero, 0x10a1c70 addiu a0, zero, 12
+// 0x010a22a4: 0x10a22a4: beq   v0, zero, 0x10a22b8 addiu a0, zero, 12
 	ldloc 5
 	ldc.i4.s 12
 	stloc.1
-	brfalse L_10a1c70
+	brfalse L_10a22b8
 // --- basic block ---
-// 0x010a1c64: 0x10a1c64: addiu v0, s1, 1
+// 0x010a22ac: 0x10a22ac: addiu v0, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010a1c68: 0x10a1c68: j	 0x10a1da8 sw    v0, 3612(s0)
+// 0x010a22b0: 0x10a22b0: j	 0x10a23f0 sw    v0, 3612(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1133,10 +1133,10 @@ L_10a1c48:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10a1da8
+	br L_10a23f0
 // --- basic block ---
-L_10a1c70:
-// 0x010a1c70: 0x10a1c70: lw    v0, 1804(s0)
+L_10a22b8:
+// 0x010a22b8: 0x10a22b8: lw    v0, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1145,25 +1145,25 @@ L_10a1c70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1c74: 0x10a1c74: sll   zero, zero, 0
-// 0x010a1c78: 0x10a1c78: mult  v0, a0
+// 0x010a22bc: 0x10a22bc: sll   zero, zero, 0
+// 0x010a22c0: 0x10a22c0: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 10
-// 0x010a1c7c: 0x10a1c7c: addiu v1, zero, 12
+// 0x010a22c4: 0x10a22c4: addiu v1, zero, 12
 	ldc.i4.s 12
 	stloc 7
-// 0x010a1c80: 0x10a1c80: mflo  lo
+// 0x010a22c8: 0x10a22c8: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010a1c84: 0x10a1c84: addu  a0, s0, a0
+// 0x010a22cc: 0x10a22cc: addu  a0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc.1
-L_10a1c88:
-// 0x010a1c88: 0x10a1c88: lw    s1, 8(a0)
+L_10a22d0:
+// 0x010a22d0: 0x10a22d0: lw    s1, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1172,21 +1172,21 @@ L_10a1c88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a1c8c: 0x10a1c8c: sll   zero, zero, 0
-// 0x010a1c90: 0x10a1c90: mult  s1, v1
+// 0x010a22d4: 0x10a22d4: sll   zero, zero, 0
+// 0x010a22d8: 0x10a22d8: mult  s1, v1
 	ldloc 9
 	ldloc 7
 	mul
 	stloc 10
-// 0x010a1c94: 0x10a1c94: mflo  lo
+// 0x010a22dc: 0x10a22dc: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010a1c98: 0x10a1c98: addu  a0, s0, a0
+// 0x010a22e0: 0x10a22e0: addu  a0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc.1
-// 0x010a1c9c: 0x10a1c9c: lw    a1, 1820(a0)
+// 0x010a22e4: 0x10a22e4: lw    a1, 1820(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1195,45 +1195,45 @@ L_10a1c88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a1ca0: 0x10a1ca0: sll   zero, zero, 0
-// 0x010a1ca4: 0x10a1ca4: andi  a1, a1, 8
+// 0x010a22e8: 0x10a22e8: sll   zero, zero, 0
+// 0x010a22ec: 0x10a22ec: andi  a1, a1, 8
 	ldloc.2
 	ldc.i4.8
 	and
 	stloc.2
-// 0x010a1ca8: 0x10a1ca8: bne   a1, zero, 0x10a1c88 addiu s8, zero, 12
+// 0x010a22f0: 0x10a22f0: bne   a1, zero, 0x10a22d0 addiu s8, zero, 12
 	ldloc.2
 	ldc.i4.s 12
 	stloc 17
-	brtrue L_10a1c88
+	brtrue L_10a22d0
 // --- basic block ---
-// 0x010a1cb0: 0x10a1cb0: bne   s1, v0, 0x10a1d80 addiu v0, zero, 12
+// 0x010a22f8: 0x10a22f8: bne   s1, v0, 0x10a23c8 addiu v0, zero, 12
 	ldloc 9
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	bne.un L_10a1d80
+	bne.un L_10a23c8
 // --- basic block ---
-// 0x010a1cb8: 0x10a1cb8: lui   s1, 0x20000
+// 0x010a2300: 0x10a2300: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x010a1cbc: 0x10a1cbc: lui   a3, 0x20000
+// 0x010a2304: 0x10a2304: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a1cc0: 0x10a1cc0: addiu a1, s1, -356
+// 0x010a2308: 0x10a2308: addiu a1, s1, 108
 	ldloc 9
-	ldc.i4 -356
+	ldc.i4.s 108
 	add
 	stloc.2
-// 0x010a1cc4: 0x10a1cc4: addiu a3, a3, -188
+// 0x010a230c: 0x10a230c: addiu a3, a3, 276
 	ldloc 4
-	ldc.i4 -188
+	ldc.i4 276
 	add
 	stloc 4
-// 0x010a1cc8: 0x10a1cc8: addiu a0, zero, 4
+// 0x010a2310: 0x10a2310: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a1ccc: 0x10a1ccc: jal   0x100449c addiu a2, zero, 435
+// 0x010a2314: 0x10a2314: jal   0x100449c addiu a2, zero, 435
 	ldc.i4 435
 	stloc.3
 	ldloc.0
@@ -1246,7 +1246,7 @@ L_10a1c88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1cd4: 0x10a1cd4: lw    s6, 1804(s0)
+// 0x010a231c: 0x10a231c: lw    s6, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1255,7 +1255,7 @@ L_10a1c88:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a1cd8: 0x10a1cd8: lw    v0, 3612(s0)
+// 0x010a2320: 0x10a2320: lw    v0, 3612(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1264,17 +1264,17 @@ L_10a1c88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1cdc: 0x10a1cdc: mult  s6, s8
+// 0x010a2324: 0x10a2324: mult  s6, s8
 	ldloc 13
 	ldloc 17
 	mul
 	stloc 10
-// 0x010a1ce0: 0x10a1ce0: addiu a1, s1, -356
+// 0x010a2328: 0x10a2328: addiu a1, s1, 108
 	ldloc 9
-	ldc.i4 -356
+	ldc.i4.s 108
 	add
 	stloc.2
-// 0x010a1ce4: 0x10a1ce4: sw    v0, 16(sp)
+// 0x010a232c: 0x10a232c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1283,15 +1283,15 @@ L_10a1c88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1ce8: 0x10a1ce8: lui   v0, 0x10000
+// 0x010a2330: 0x10a2330: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a1cec: 0x10a1cec: addiu v0, v0, 18500
+// 0x010a2334: 0x10a2334: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010a1cf0: 0x10a1cf0: sw    v0, 28(sp)
+// 0x010a2338: 0x10a2338: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1300,32 +1300,32 @@ L_10a1c88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1cf4: 0x10a1cf4: lui   a3, 0x20000
+// 0x010a233c: 0x10a233c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a1cf8: 0x10a1cf8: addiu a3, a3, -128
+// 0x010a2340: 0x10a2340: addiu a3, a3, 336
 	ldloc 4
-	ldc.i4.s -128
+	ldc.i4 336
 	add
 	stloc 4
-// 0x010a1cfc: 0x10a1cfc: addiu a0, zero, 3
+// 0x010a2344: 0x10a2344: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010a1d00: 0x10a1d00: addiu a2, zero, 521
+// 0x010a2348: 0x10a2348: addiu a2, zero, 521
 	ldc.i4 521
 	stloc.3
-// 0x010a1d04: 0x10a1d04: addu  s5, zero, zero
+// 0x010a234c: 0x10a234c: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010a1d08: 0x10a1d08: mflo  lo
+// 0x010a2350: 0x10a2350: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x010a1d0c: 0x10a1d0c: addu  v0, s0, v1
+// 0x010a2354: 0x10a2354: addu  v0, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 5
-// 0x010a1d10: 0x10a1d10: lw    s1, 8(v0)
+// 0x010a2358: 0x10a2358: lw    s1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1334,13 +1334,13 @@ L_10a1c88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a1d14: 0x10a1d14: sll   zero, zero, 0
-// 0x010a1d18: 0x10a1d18: mult  s1, s8
+// 0x010a235c: 0x10a235c: sll   zero, zero, 0
+// 0x010a2360: 0x10a2360: mult  s1, s8
 	ldloc 9
 	ldloc 17
 	mul
 	stloc 10
-// 0x010a1d1c: 0x10a1d1c: sw    s1, 20(sp)
+// 0x010a2364: 0x10a2364: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1349,15 +1349,15 @@ L_10a1c88:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1d20: 0x10a1d20: mflo  lo
+// 0x010a2368: 0x10a2368: mflo  lo
 	ldloc 10
 	stloc 17
-// 0x010a1d24: 0x10a1d24: addu  s8, s0, s8
+// 0x010a236c: 0x10a236c: addu  s8, s0, s8
 	ldloc 8
 	ldloc 17
 	add
 	stloc 17
-// 0x010a1d28: 0x10a1d28: lw    v0, 1812(s8)
+// 0x010a2370: 0x10a2370: lw    v0, 1812(s8)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
@@ -1366,10 +1366,10 @@ L_10a1c88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1d2c: 0x10a1d2c: lui   s8, 0x20000
+// 0x010a2374: 0x10a2374: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 17
-// 0x010a1d30: 0x10a1d30: sw    v0, 24(sp)
+// 0x010a2378: 0x10a2378: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1378,9 +1378,9 @@ L_10a1c88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1d34: 0x10a1d34: jal   0x100449c addiu s8, s8, -48
+// 0x010a237c: 0x10a237c: jal   0x100449c addiu s8, s8, 416
 	ldloc 17
-	ldc.i4.s -48
+	ldc.i4 416
 	add
 	stloc 17
 	ldloc.0
@@ -1393,16 +1393,16 @@ L_10a1c88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1d3c: 0x10a1d3c: addiu v0, zero, 12
+// 0x010a2384: 0x10a2384: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-L_10a1d40:
-// 0x010a1d40: 0x10a1d40: mult  s6, v0
+L_10a2388:
+// 0x010a2388: 0x10a2388: mult  s6, v0
 	ldloc 13
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1d44: 0x10a1d44: sw    s6, 16(sp)
+// 0x010a238c: 0x10a238c: sw    s6, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1411,26 +1411,26 @@ L_10a1d40:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a1d48: 0x10a1d48: addu  a1, s5, zero
+// 0x010a2390: 0x10a2390: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x010a1d4c: 0x10a1d4c: addu  a0, s8, zero
+// 0x010a2394: 0x10a2394: addu  a0, s8, zero
 	ldloc 17
 	stloc.1
-// 0x010a1d50: 0x10a1d50: addiu s5, s5, 1
+// 0x010a2398: 0x10a2398: addiu s5, s5, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010a1d54: 0x10a1d54: mflo  lo
+// 0x010a239c: 0x10a239c: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x010a1d58: 0x10a1d58: addu  s6, s0, v1
+// 0x010a23a0: 0x10a23a0: addu  s6, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 13
-// 0x010a1d5c: 0x10a1d5c: lw    a2, 8(s6)
+// 0x010a23a4: 0x10a23a4: lw    a2, 8(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -1439,7 +1439,7 @@ L_10a1d40:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a1d60: 0x10a1d60: lw    a3, 12(s6)
+// 0x010a23a8: 0x10a23a8: lw    a3, 12(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -1448,7 +1448,7 @@ L_10a1d40:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a1d64: 0x10a1d64: lw    v0, 1812(s6)
+// 0x010a23ac: 0x10a23ac: lw    v0, 1812(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -1457,7 +1457,7 @@ L_10a1d40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1d68: 0x10a1d68: jal   0x1004310 sw    v0, 20(sp)
+// 0x010a23b0: 0x10a23b0: jal   0x1004310 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1476,10 +1476,10 @@ L_10a1d40:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1d70: 0x10a1d70: addiu a1, zero, 150
+// 0x010a23b8: 0x10a23b8: addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
-// 0x010a1d74: 0x10a1d74: lw    s6, 12(s6)
+// 0x010a23bc: 0x10a23bc: lw    s6, 12(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -1488,35 +1488,35 @@ L_10a1d40:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a1d78: 0x10a1d78: bne   s5, a1, 0x10a1d40 addiu v0, zero, 12
+// 0x010a23c0: 0x10a23c0: bne   s5, a1, 0x10a2388 addiu v0, zero, 12
 	ldloc 11
 	ldloc.2
 	ldc.i4.s 12
 	stloc 5
-	bne.un L_10a1d40
+	bne.un L_10a2388
 // --- basic block ---
-L_10a1d80:
-// 0x010a1d80: 0x10a1d80: mult  s1, v0
+L_10a23c8:
+// 0x010a23c8: 0x10a23c8: mult  s1, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1d84: 0x10a1d84: lw    a0, 0(s0)
+// 0x010a23cc: 0x10a23cc: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a1d88: 0x10a1d88: mflo  lo
+// 0x010a23d0: 0x10a23d0: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010a1d8c: 0x10a1d8c: addu  v0, s0, v0
+// 0x010a23d4: 0x10a23d4: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x010a1d90: 0x10a1d90: lw    a1, 4(v0)
+// 0x010a23d8: 0x10a23d8: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1525,7 +1525,7 @@ L_10a1d80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a1d94: 0x10a1d94: jal   0x1015668 addu  a2, s1, zero
+// 0x010a23dc: 0x10a23dc: jal   0x1015678 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -1533,15 +1533,15 @@ L_10a1d80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_remove_1015668(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_remove_1015678(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1d9c: 0x10a1d9c: addu  a0, s0, zero
+// 0x010a23e4: 0x10a23e4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a1da0: 0x10a1da0: jal   0x10a166c addu  a1, s1, zero
+// 0x010a23e8: 0x10a23e8: jal   0x10a1cb4 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -1549,42 +1549,42 @@ L_10a1d80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::free_resource_10a166c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::free_resource_10a1cb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a1da8:
-// 0x010a1da8: 0x10a1da8: addiu s6, zero, 12
+L_10a23f0:
+// 0x010a23f0: 0x10a23f0: addiu s6, zero, 12
 	ldc.i4.s 12
 	stloc 13
-// 0x010a1dac: 0x10a1dac: mult  s1, s6
+// 0x010a23f4: 0x10a23f4: mult  s1, s6
 	ldloc 9
 	ldloc 13
 	mul
 	stloc 10
-// 0x010a1db0: 0x10a1db0: lw    a0, 0(s0)
+// 0x010a23f8: 0x10a23f8: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a1db4: 0x10a1db4: addu  a1, s7, zero
+// 0x010a23fc: 0x10a23fc: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x010a1db8: 0x10a1db8: addu  a2, s1, zero
+// 0x010a2400: 0x10a2400: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010a1dbc: 0x10a1dbc: mflo  lo
+// 0x010a2404: 0x10a2404: mflo  lo
 	ldloc 10
 	stloc 11
-// 0x010a1dc0: 0x10a1dc0: addu  s5, s0, s5
+// 0x010a2408: 0x10a2408: addu  s5, s0, s5
 	ldloc 8
 	ldloc 11
 	add
 	stloc 11
-// 0x010a1dc4: 0x10a1dc4: jal   0x10157cc sw    s7, 4(s5)
+// 0x010a240c: 0x10a240c: jal   0x10157dc sw    s7, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1598,12 +1598,12 @@ L_10a1da8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1dcc: 0x10a1dcc: lw    v0, 3612(s0)
+// 0x010a2414: 0x10a2414: lw    v0, 3612(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1612,19 +1612,19 @@ L_10a1da8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1dd0: 0x10a1dd0: sll   zero, zero, 0
-// 0x010a1dd4: 0x10a1dd4: slti  v0, v0, 2
+// 0x010a2418: 0x10a2418: sll   zero, zero, 0
+// 0x010a241c: 0x10a241c: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010a1dd8: 0x10a1dd8: bne   v0, zero, 0x10a1e74 lui   a1, 0x20000
+// 0x010a2420: 0x10a2420: bne   v0, zero, 0x10a24bc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10a1e74
+	brtrue L_10a24bc
 // --- basic block ---
-// 0x010a1de0: 0x10a1de0: lw    a1, 1804(s0)
+// 0x010a2428: 0x10a2428: lw    a1, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1633,7 +1633,7 @@ L_10a1da8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a1de4: 0x10a1de4: lw    v0, 8(s5)
+// 0x010a242c: 0x10a242c: lw    v0, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1642,12 +1642,12 @@ L_10a1da8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1de8: 0x10a1de8: mult  a1, s6
+// 0x010a2430: 0x10a2430: mult  a1, s6
 	ldloc.2
 	ldloc 13
 	mul
 	stloc 10
-// 0x010a1dec: 0x10a1dec: lw    v1, 12(s5)
+// 0x010a2434: 0x10a2434: lw    v1, 12(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1656,15 +1656,15 @@ L_10a1da8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1df0: 0x10a1df0: mflo  lo
+// 0x010a2438: 0x10a2438: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010a1df4: 0x10a1df4: addu  a0, s0, a0
+// 0x010a243c: 0x10a243c: addu  a0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc.1
-// 0x010a1df8: 0x10a1df8: lw    a0, 8(a0)
+// 0x010a2440: 0x10a2440: lw    a0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1673,23 +1673,23 @@ L_10a1da8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a1dfc: 0x10a1dfc: beq   s1, a1, 0x10a1e74 lui   a1, 0x20000
+// 0x010a2444: 0x10a2444: beq   s1, a1, 0x10a24bc lui   a1, 0x20000
 	ldloc 9
 	ldloc.2
 	ldc.i4 131072
 	stloc.2
-	beq  L_10a1e74
+	beq  L_10a24bc
 // --- basic block ---
-// 0x010a1e04: 0x10a1e04: beq   a0, s1, 0x10a1e54 mult  a0, s6
+// 0x010a244c: 0x10a244c: beq   a0, s1, 0x10a249c mult  a0, s6
 	ldloc.1
 	ldloc 9
 	ldloc.1
 	ldloc 13
 	mul
 	stloc 10
-	beq  L_10a1e54
+	beq  L_10a249c
 // --- basic block ---
-// 0x010a1e0c: 0x10a1e0c: sw    a0, 8(s5)
+// 0x010a2454: 0x10a2454: sw    a0, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1698,7 +1698,7 @@ L_10a1da8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a1e10: 0x10a1e10: lw    a0, 1804(s0)
+// 0x010a2458: 0x10a2458: lw    a0, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1707,8 +1707,8 @@ L_10a1da8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a1e14: 0x10a1e14: sll   zero, zero, 0
-// 0x010a1e18: 0x10a1e18: sw    a0, 12(s5)
+// 0x010a245c: 0x10a245c: sll   zero, zero, 0
+// 0x010a2460: 0x10a2460: sw    a0, 12(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1717,15 +1717,15 @@ L_10a1da8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a1e1c: 0x10a1e1c: mflo  lo
+// 0x010a2464: 0x10a2464: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x010a1e20: 0x10a1e20: addu  a0, s0, a1
+// 0x010a2468: 0x10a2468: addu  a0, s0, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc.1
-// 0x010a1e24: 0x10a1e24: bltz  v0, 0x10a1e3c sw    s1, 12(a0)
+// 0x010a246c: 0x10a246c: bltz  v0, 0x10a2484 sw    s1, 12(a0)
 	ldloc 5
 	ldloc 6
 	ldloc.1
@@ -1736,22 +1736,22 @@ L_10a1da8:
 	ldloc 9
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10a1e3c
+	blt L_10a2484
 // --- basic block ---
-// 0x010a1e2c: 0x10a1e2c: mult  v0, s6
+// 0x010a2474: 0x10a2474: mult  v0, s6
 	ldloc 5
 	ldloc 13
 	mul
 	stloc 10
-// 0x010a1e30: 0x10a1e30: mflo  lo
+// 0x010a2478: 0x10a2478: mflo  lo
 	ldloc 10
 	stloc 13
-// 0x010a1e34: 0x10a1e34: addu  s6, s0, s6
+// 0x010a247c: 0x10a247c: addu  s6, s0, s6
 	ldloc 8
 	ldloc 13
 	add
 	stloc 13
-// 0x010a1e38: 0x10a1e38: sw    v1, 12(s6)
+// 0x010a2480: 0x10a2480: sw    v1, 12(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -1760,28 +1760,28 @@ L_10a1da8:
 	add
 	ldloc 7
 	stelem.i4
-L_10a1e3c:
-// 0x010a1e3c: 0x10a1e3c: bltz  v1, 0x10a1e54 addiu a0, zero, 12
+L_10a2484:
+// 0x010a2484: 0x10a2484: bltz  v1, 0x10a249c addiu a0, zero, 12
 	ldloc 7
 	ldc.i4.s 12
 	stloc.1
 	ldc.i4.s 0
-	blt L_10a1e54
+	blt L_10a249c
 // --- basic block ---
-// 0x010a1e44: 0x10a1e44: mult  v1, a0
+// 0x010a248c: 0x10a248c: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 10
-// 0x010a1e48: 0x10a1e48: mflo  lo
+// 0x010a2490: 0x10a2490: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x010a1e4c: 0x10a1e4c: addu  v1, s0, v1
+// 0x010a2494: 0x10a2494: addu  v1, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x010a1e50: 0x10a1e50: sw    v0, 8(v1)
+// 0x010a2498: 0x10a2498: sw    v0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1790,8 +1790,8 @@ L_10a1e3c:
 	add
 	ldloc 5
 	stelem.i4
-L_10a1e54:
-// 0x010a1e54: 0x10a1e54: lw    v1, 1804(s0)
+L_10a249c:
+// 0x010a249c: 0x10a249c: lw    v1, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1800,23 +1800,23 @@ L_10a1e54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1e58: 0x10a1e58: addiu v0, zero, 12
+// 0x010a24a0: 0x10a24a0: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x010a1e5c: 0x10a1e5c: mult  v1, v0
+// 0x010a24a4: 0x10a24a4: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1e60: 0x10a1e60: mflo  lo
+// 0x010a24a8: 0x10a24a8: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010a1e64: 0x10a1e64: addu  v0, s0, v0
+// 0x010a24ac: 0x10a24ac: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x010a1e68: 0x10a1e68: sw    s1, 8(v0)
+// 0x010a24b0: 0x10a24b0: sw    s1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1825,7 +1825,7 @@ L_10a1e54:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1e6c: 0x10a1e6c: sw    s1, 1804(s0)
+// 0x010a24b4: 0x10a24b4: sw    s1, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1834,30 +1834,30 @@ L_10a1e54:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1e70: 0x10a1e70: lui   a1, 0x20000
+// 0x010a24b8: 0x10a24b8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10a1e74:
-// 0x010a1e74: 0x10a1e74: lui   a3, 0x20000
+L_10a24bc:
+// 0x010a24bc: 0x10a24bc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a1e78: 0x10a1e78: addiu a1, a1, -356
+// 0x010a24c0: 0x10a24c0: addiu a1, a1, 108
 	ldloc.2
-	ldc.i4 -356
+	ldc.i4.s 108
 	add
 	stloc.2
-// 0x010a1e7c: 0x10a1e7c: addiu a3, a3, 4
+// 0x010a24c4: 0x10a24c4: addiu a3, a3, 468
 	ldloc 4
-	ldc.i4.4
+	ldc.i4 468
 	add
 	stloc 4
-// 0x010a1e80: 0x10a1e80: addiu a0, zero, 1
+// 0x010a24c8: 0x10a24c8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a1e84: 0x10a1e84: addiu a2, zero, 340
+// 0x010a24cc: 0x10a24cc: addiu a2, zero, 340
 	ldc.i4 340
 	stloc.3
-// 0x010a1e88: 0x10a1e88: sw    s1, 16(sp)
+// 0x010a24d0: 0x10a24d0: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1866,7 +1866,7 @@ L_10a1e74:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1e8c: 0x10a1e8c: jal   0x100449c sw    s4, 20(sp)
+// 0x010a24d4: 0x10a24d4: jal   0x100449c sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1885,26 +1885,26 @@ L_10a1e74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1e94: 0x10a1e94: addiu v0, zero, 12
+// 0x010a24dc: 0x10a24dc: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x010a1e98: 0x10a1e98: mult  s1, v0
+// 0x010a24e0: 0x10a24e0: mult  s1, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 10
-// 0x010a1e9c: 0x10a1e9c: addu  a0, s2, zero
+// 0x010a24e4: 0x10a24e4: addu  a0, s2, zero
 	ldloc 15
 	stloc.1
-// 0x010a1ea0: 0x10a1ea0: mflo  lo
+// 0x010a24e8: 0x10a24e8: mflo  lo
 	ldloc 10
 	stloc 9
-// 0x010a1ea4: 0x10a1ea4: addu  s1, s0, s1
+// 0x010a24ec: 0x10a24ec: addu  s1, s0, s1
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-// 0x010a1ea8: 0x10a1ea8: jal   0x1001ba8 sw    s3, 1816(s1)
+// 0x010a24f0: 0x10a24f0: jal   0x1001ba8 sw    s3, 1816(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1923,7 +1923,7 @@ L_10a1e74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a1eb0: 0x10a1eb0: sw    s4, 1820(s1)
+// 0x010a24f8: 0x10a24f8: sw    s4, 1820(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1932,7 +1932,7 @@ L_10a1e74:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a1eb4: 0x10a1eb4: lw    v1, 3620(s0)
+// 0x010a24fc: 0x10a24fc: lw    v1, 3620(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1941,7 +1941,7 @@ L_10a1e74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1eb8: 0x10a1eb8: sw    v0, 1812(s1)
+// 0x010a2500: 0x10a2500: sw    v0, 1812(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1950,7 +1950,7 @@ L_10a1e74:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1ebc: 0x10a1ebc: lw    v0, 32(sp)
+// 0x010a2504: 0x10a2504: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1959,13 +1959,13 @@ L_10a1e74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1ec0: 0x10a1ec0: sll   zero, zero, 0
-// 0x010a1ec4: 0x10a1ec4: addu  v1, v1, v0
+// 0x010a2508: 0x10a2508: sll   zero, zero, 0
+// 0x010a250c: 0x10a250c: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010a1ec8: 0x10a1ec8: j	 0x10a1ed4 sw    v1, 3620(s0)
+// 0x010a2510: 0x10a2510: j	 0x10a251c sw    v1, 3620(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1974,18 +1974,18 @@ L_10a1e74:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10a1ed4
+	br L_10a251c
 // --- basic block ---
-L_10a1ed0:
-// 0x010a1ed0: 0x10a1ed0: addu  s3, zero, zero
+L_10a2518:
+// 0x010a2518: 0x10a2518: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 12
-L_10a1ed4:
-// 0x010a1ed4: 0x10a1ed4: lw    ra, 76(sp)
-// 0x010a1ed8: 0x10a1ed8: addu  v0, s3, zero
+L_10a251c:
+// 0x010a251c: 0x10a251c: lw    ra, 76(sp)
+// 0x010a2520: 0x10a2520: addu  v0, s3, zero
 	ldloc 12
 	stloc 5
-// 0x010a1edc: 0x10a1edc: lw    s8, 72(sp)
+// 0x010a2524: 0x10a2524: lw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1994,7 +1994,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a1ee0: 0x10a1ee0: lw    s7, 68(sp)
+// 0x010a2528: 0x10a2528: lw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2003,7 +2003,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a1ee4: 0x10a1ee4: lw    s6, 64(sp)
+// 0x010a252c: 0x10a252c: lw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2012,7 +2012,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a1ee8: 0x10a1ee8: lw    s5, 60(sp)
+// 0x010a2530: 0x10a2530: lw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2021,7 +2021,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a1eec: 0x10a1eec: lw    s4, 56(sp)
+// 0x010a2534: 0x10a2534: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2030,7 +2030,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a1ef0: 0x10a1ef0: lw    s3, 52(sp)
+// 0x010a2538: 0x10a2538: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2039,7 +2039,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a1ef4: 0x10a1ef4: lw    s2, 48(sp)
+// 0x010a253c: 0x10a253c: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2048,7 +2048,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a1ef8: 0x10a1ef8: lw    s1, 44(sp)
+// 0x010a2540: 0x10a2540: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2057,7 +2057,7 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a1efc: 0x10a1efc: lw    s0, 40(sp)
+// 0x010a2544: 0x10a2544: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2066,15 +2066,15 @@ L_10a1ed4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a1f00: 0x10a1f00: jr    ra addiu sp, sp, 80
+// 0x010a2548: 0x10a2548: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10a1f08:
-// 0x010a1f08: 0x10a1f08: lw    a1, 1804(s0)
+L_10a2550:
+// 0x010a2550: 0x10a2550: lw    a1, 1804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2083,7 +2083,7 @@ L_10a1f08:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a1f0c: 0x10a1f0c: lw    a0, 8(s5)
+// 0x010a2554: 0x10a2554: lw    a0, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2092,12 +2092,12 @@ L_10a1f08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a1f10: 0x10a1f10: mult  a1, s7
+// 0x010a2558: 0x10a2558: mult  a1, s7
 	ldloc.2
 	ldloc 14
 	mul
 	stloc 10
-// 0x010a1f14: 0x10a1f14: lw    v1, 12(s5)
+// 0x010a255c: 0x10a255c: lw    v1, 12(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2106,15 +2106,15 @@ L_10a1f08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1f18: 0x10a1f18: mflo  lo
+// 0x010a2560: 0x10a2560: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010a1f1c: 0x10a1f1c: addu  v0, s0, v0
+// 0x010a2564: 0x10a2564: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x010a1f20: 0x10a1f20: lw    v0, 8(v0)
+// 0x010a2568: 0x10a2568: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2123,22 +2123,22 @@ L_10a1f08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1f24: 0x10a1f24: bne   s3, a1, 0x10a1a64 sll   zero, zero, 0
+// 0x010a256c: 0x10a256c: bne   s3, a1, 0x10a20ac sll   zero, zero, 0
 	ldloc 12
 	ldloc.2
-	bne.un L_10a1a64
+	bne.un L_10a20ac
 // --- basic block ---
-// 0x010a1f2c: 0x10a1f2c: j	 0x10a1ad4 addiu v0, zero, 12
+// 0x010a2574: 0x10a2574: j	 0x10a211c addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-	br L_10a1ad4
+	br L_10a211c
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 download_size_callback_10a1f74(int32,int32,int32,int32,int32)
+.method public static int32 download_size_callback_10a25bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -2176,13 +2176,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a1f74:
-// 0x010a1f74: 0x10a1f74: addiu sp, sp, -32
+L_10a25bc:
+// 0x010a25bc: 0x10a25bc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a1f78: 0x10a1f78: sw    s0, 24(sp)
+// 0x010a25c0: 0x10a25c0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2191,17 +2191,17 @@ L_10a1f74:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a1f7c: 0x10a1f7c: sw    ra, 28(sp)
-// 0x010a1f80: 0x10a1f80: beq   a1, zero, 0x10a1fa0 addu  s0, a0, zero
+// 0x010a25c4: 0x10a25c4: sw    ra, 28(sp)
+// 0x010a25c8: 0x10a25c8: beq   a1, zero, 0x10a25e8 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 6
-	brfalse L_10a1fa0
+	brfalse L_10a25e8
 // --- basic block ---
-// 0x010a1f88: 0x10a1f88: addu  a0, a1, zero
+// 0x010a25d0: 0x10a25d0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010a1f8c: 0x10a1f8c: jal   0x1000910 sw    a1, 16(sp)
+// 0x010a25d4: 0x10a25d4: jal   0x1000910 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2220,7 +2220,7 @@ L_10a1f74:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010a1f94: 0x10a1f94: lw    a1, 16(sp)
+// 0x010a25dc: 0x10a25dc: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2229,7 +2229,7 @@ L_10a1f74:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a1f98: 0x10a1f98: sw    v0, 4(s0)
+// 0x010a25e0: 0x10a25e0: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2238,7 +2238,7 @@ L_10a1f74:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a1f9c: 0x10a1f9c: sw    zero, 8(s0)
+// 0x010a25e4: 0x10a25e4: sw    zero, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2247,12 +2247,12 @@ L_10a1f74:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10a1fa0:
-// 0x010a1fa0: 0x10a1fa0: lw    ra, 28(sp)
-// 0x010a1fa4: 0x10a1fa4: addu  v0, a1, zero
+L_10a25e8:
+// 0x010a25e8: 0x10a25e8: lw    ra, 28(sp)
+// 0x010a25ec: 0x10a25ec: addu  v0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010a1fa8: 0x10a1fa8: lw    s0, 24(sp)
+// 0x010a25f0: 0x10a25f0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2261,7 +2261,7 @@ L_10a1fa0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a1fac: 0x10a1fac: jr    ra addiu sp, sp, 32
+// 0x010a25f4: 0x10a25f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2273,7 +2273,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 PopOldest_10a1fb4(int32,int32,int32,int32,int32)
+.method public static int32 PopOldest_10a25fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -2314,25 +2314,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a1fb4: 0x10a1fb4: lui   v0, 0x80000
+// 0x010a25fc: 0x10a25fc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a1fb8: 0x10a1fb8: lw    v0, 27456(v0)
+// 0x010a2600: 0x10a2600: lw    v0, 27920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a1fbc: 0x10a1fbc: addiu sp, sp, -32
+// 0x010a2604: 0x10a2604: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a1fc0: 0x10a1fc0: sw    ra, 28(sp)
-// 0x010a1fc4: 0x10a1fc4: sw    s1, 24(sp)
+// 0x010a2608: 0x10a2608: sw    ra, 28(sp)
+// 0x010a260c: 0x10a260c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2341,7 +2341,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a1fc8: 0x10a1fc8: sw    s0, 20(sp)
+// 0x010a2610: 0x10a2610: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2350,16 +2350,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a1fcc: 0x10a1fcc: beq   v0, zero, 0x10a1fe8 addu  v1, a0, zero
+// 0x010a2614: 0x10a2614: beq   v0, zero, 0x10a2630 addu  v1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_10a1fe8
+	brfalse L_10a2630
 // --- basic block ---
-// 0x010a1fd4: 0x10a1fd4: lui   v0, 0x0
+// 0x010a261c: 0x10a261c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a1fd8: 0x10a1fd8: lw    s0, 17932(v0)
+// 0x010a2620: 0x10a2620: lw    s0, 17932(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2368,29 +2368,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a1fdc: 0x10a1fdc: addiu s1, zero, -1
+// 0x010a2624: 0x10a2624: addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 9
-// 0x010a1fe0: 0x10a1fe0: bne   s0, s1, 0x10a2014 sll   s0, s0, 5
+// 0x010a2628: 0x10a2628: bne   s0, s1, 0x10a265c sll   s0, s0, 5
 	ldloc 7
 	ldloc 9
 	ldloc 7
 	ldc.i4.5
 	shl
 	stloc 7
-	bne.un L_10a2014
+	bne.un L_10a265c
 // --- basic block ---
-L_10a1fe8:
-// 0x010a1fe8: 0x10a1fe8: beq   v1, zero, 0x10a20d8 addu  v0, zero, zero
+L_10a2630:
+// 0x010a2630: 0x10a2630: beq   v1, zero, 0x10a2720 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10a20d8
+	brfalse L_10a2720
 // --- basic block ---
-// 0x010a1ff0: 0x10a1ff0: addiu v0, zero, -1
+// 0x010a2638: 0x10a2638: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010a1ff4: 0x10a1ff4: sw    v0, 8(v1)
+// 0x010a263c: 0x10a263c: sw    v0, 8(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2399,7 +2399,7 @@ L_10a1fe8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a1ff8: 0x10a1ff8: sw    zero, 24(v1)
+// 0x010a2640: 0x10a2640: sw    zero, 24(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2408,7 +2408,7 @@ L_10a1fe8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a1ffc: 0x10a1ffc: sw    zero, 28(v1)
+// 0x010a2644: 0x10a2644: sw    zero, 28(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2417,14 +2417,14 @@ L_10a1fe8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2000: 0x10a2000: sw    zero, 0(v1)
+// 0x010a2648: 0x10a2648: sw    zero, 0(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2004: 0x10a2004: sw    zero, 4(v1)
+// 0x010a264c: 0x10a264c: sw    zero, 4(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2433,7 +2433,7 @@ L_10a1fe8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2008: 0x10a2008: sw    zero, 12(v1)
+// 0x010a2650: 0x10a2650: sw    zero, 12(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2442,32 +2442,32 @@ L_10a1fe8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a200c: 0x10a200c: j	 0x10a20d8 addu  v0, zero, zero
+// 0x010a2654: 0x10a2654: j	 0x10a2720 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10a20d8
+	br L_10a2720
 // --- basic block ---
-L_10a2014:
-// 0x010a2014: 0x10a2014: lui   v0, 0x80000
+L_10a265c:
+// 0x010a265c: 0x10a265c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a2018: 0x10a2018: addiu v0, v0, 27460
+// 0x010a2660: 0x10a2660: addiu v0, v0, 27924
 	ldloc 5
-	ldc.i4 27460
+	ldc.i4 27924
 	add
 	stloc 5
-// 0x010a201c: 0x10a201c: beq   a0, zero, 0x10a2038 addu  s0, v0, s0
+// 0x010a2664: 0x10a2664: beq   a0, zero, 0x10a2680 addu  s0, v0, s0
 	ldloc.1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-	brfalse L_10a2038
+	brfalse L_10a2680
 // --- basic block ---
-// 0x010a2024: 0x10a2024: addu  a1, s0, zero
+// 0x010a266c: 0x10a266c: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010a2028: 0x10a2028: jal   0x1001800 addiu a2, zero, 32
+// 0x010a2670: 0x10a2670: jal   0x1001800 addiu a2, zero, 32
 	ldc.i4.s 32
 	stloc.3
 	ldloc.1
@@ -2479,7 +2479,7 @@ L_10a2014:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2030: 0x10a2030: j	 0x10a207c sw    s1, 8(s0)
+// 0x010a2678: 0x10a2678: j	 0x10a26c4 sw    s1, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2488,17 +2488,17 @@ L_10a2014:
 	add
 	ldloc 9
 	stelem.i4
-	br L_10a207c
+	br L_10a26c4
 // --- basic block ---
-L_10a2038:
-// 0x010a2038: 0x10a2038: lw    a0, 0(s0)
+L_10a2680:
+// 0x010a2680: 0x10a2680: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a203c: 0x10a203c: jal   0x1000930 sll   zero, zero, 0
+// 0x010a2684: 0x10a2684: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2509,7 +2509,7 @@ L_10a2038:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2044: 0x10a2044: lw    a0, 12(s0)
+// 0x010a268c: 0x10a268c: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2518,12 +2518,12 @@ L_10a2038:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2048: 0x10a2048: sll   zero, zero, 0
-// 0x010a204c: 0x10a204c: beq   a0, zero, 0x10a205c sll   zero, zero, 0
+// 0x010a2690: 0x10a2690: sll   zero, zero, 0
+// 0x010a2694: 0x10a2694: beq   a0, zero, 0x10a26a4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10a205c
+	brfalse L_10a26a4
 // --- basic block ---
-// 0x010a2054: 0x10a2054: jal   0x1000930 sll   zero, zero, 0
+// 0x010a269c: 0x10a269c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2534,8 +2534,8 @@ L_10a2038:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a205c:
-// 0x010a205c: 0x10a205c: lw    a0, 4(s0)
+L_10a26a4:
+// 0x010a26a4: 0x10a26a4: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2544,14 +2544,14 @@ L_10a205c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2060: 0x10a2060: sll   zero, zero, 0
-// 0x010a2064: 0x10a2064: beq   a0, zero, 0x10a2078 addiu v0, zero, -1
+// 0x010a26a8: 0x10a26a8: sll   zero, zero, 0
+// 0x010a26ac: 0x10a26ac: beq   a0, zero, 0x10a26c0 addiu v0, zero, -1
 	ldloc.1
 	ldc.i4.m1
 	stloc 5
-	brfalse L_10a2078
+	brfalse L_10a26c0
 // --- basic block ---
-// 0x010a206c: 0x10a206c: jal   0x1000930 sll   zero, zero, 0
+// 0x010a26b4: 0x10a26b4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2562,11 +2562,11 @@ L_10a205c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2074: 0x10a2074: addiu v0, zero, -1
+// 0x010a26bc: 0x10a26bc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10a2078:
-// 0x010a2078: 0x10a2078: sw    v0, 8(s0)
+L_10a26c0:
+// 0x010a26c0: 0x10a26c0: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2575,23 +2575,23 @@ L_10a2078:
 	add
 	ldloc 5
 	stelem.i4
-L_10a207c:
-// 0x010a207c: 0x10a207c: lui   a0, 0x80000
+L_10a26c4:
+// 0x010a26c4: 0x10a26c4: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a2080: 0x10a2080: lw    a1, 27456(a0)
+// 0x010a26c8: 0x10a26c8: lw    a1, 27920(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a2084: 0x10a2084: addiu v0, zero, 1
+// 0x010a26cc: 0x10a26cc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a2088: 0x10a2088: sw    zero, 24(s0)
+// 0x010a26d0: 0x10a26d0: sw    zero, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2600,7 +2600,7 @@ L_10a207c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a208c: 0x10a208c: sw    zero, 28(s0)
+// 0x010a26d4: 0x10a26d4: sw    zero, 28(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2609,14 +2609,14 @@ L_10a207c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2090: 0x10a2090: sw    zero, 0(s0)
+// 0x010a26d8: 0x10a26d8: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2094: 0x10a2094: sw    zero, 4(s0)
+// 0x010a26dc: 0x10a26dc: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2625,7 +2625,7 @@ L_10a207c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2098: 0x10a2098: sw    zero, 12(s0)
+// 0x010a26e0: 0x10a26e0: sw    zero, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2634,17 +2634,17 @@ L_10a207c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a209c: 0x10a209c: bne   a1, v0, 0x10a20b4 lui   v1, 0x0
+// 0x010a26e4: 0x10a26e4: bne   a1, v0, 0x10a26fc lui   v1, 0x0
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	bne.un L_10a20b4
+	bne.un L_10a26fc
 // --- basic block ---
-// 0x010a20a4: 0x10a20a4: addiu v0, zero, -1
+// 0x010a26ec: 0x10a26ec: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010a20a8: 0x10a20a8: sw    v0, 17932(v1)
+// 0x010a26f0: 0x10a26f0: sw    v0, 17932(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2653,19 +2653,19 @@ L_10a207c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a20ac: 0x10a20ac: j	 0x10a20d4 sw    zero, 27456(a0)
+// 0x010a26f4: 0x10a26f4: j	 0x10a271c sw    zero, 27920(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10a20d4
+	br L_10a271c
 // --- basic block ---
-L_10a20b4:
-// 0x010a20b4: 0x10a20b4: lw    v0, 17932(v1)
+L_10a26fc:
+// 0x010a26fc: 0x10a26fc: lw    v0, 17932(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2674,40 +2674,40 @@ L_10a20b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a20b8: 0x10a20b8: addiu a1, a1, -1
+// 0x010a2700: 0x10a2700: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x010a20bc: 0x10a20bc: addiu v0, v0, 1
+// 0x010a2704: 0x10a2704: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010a20c0: 0x10a20c0: slti  a2, v0, 100
+// 0x010a2708: 0x10a2708: slti  a2, v0, 100
 	ldloc 5
 	ldc.i4.s 100
 	clt
 	stloc.3
-// 0x010a20c4: 0x10a20c4: subu  a2, zero, a2
+// 0x010a270c: 0x10a270c: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x010a20c8: 0x10a20c8: and   v0, v0, a2
+// 0x010a2710: 0x10a2710: and   v0, v0, a2
 	ldloc 5
 	ldloc.3
 	and
 	stloc 5
-// 0x010a20cc: 0x10a20cc: sw    a1, 27456(a0)
+// 0x010a2714: 0x10a2714: sw    a1, 27920(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a20d0: 0x10a20d0: sw    v0, 17932(v1)
+// 0x010a2718: 0x10a2718: sw    v0, 17932(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2716,13 +2716,13 @@ L_10a20b4:
 	add
 	ldloc 5
 	stelem.i4
-L_10a20d4:
-// 0x010a20d4: 0x10a20d4: addiu v0, zero, 1
+L_10a271c:
+// 0x010a271c: 0x10a271c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10a20d8:
-// 0x010a20d8: 0x10a20d8: lw    ra, 28(sp)
-// 0x010a20dc: 0x10a20dc: lw    s1, 24(sp)
+L_10a2720:
+// 0x010a2720: 0x10a2720: lw    ra, 28(sp)
+// 0x010a2724: 0x10a2724: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2731,7 +2731,7 @@ L_10a20d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a20e0: 0x10a20e0: lw    s0, 20(sp)
+// 0x010a2728: 0x10a2728: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2740,7 +2740,7 @@ L_10a20d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a20e4: 0x10a20e4: jr    ra addiu sp, sp, 32
+// 0x010a272c: 0x10a272c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2752,7 +2752,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ResDataQueue_Push_10a210c(int32,int32,int32,int32,int32)
+.method public static int32 ResDataQueue_Push_10a2754(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra,int32 t0,int32 t1,int32 t2)
@@ -2799,27 +2799,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a210c: 0x10a210c: lui   v0, 0x80000
+// 0x010a2754: 0x10a2754: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a2110: 0x10a2110: lw    v0, 27456(v0)
+// 0x010a2758: 0x10a2758: lw    v0, 27920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2114: 0x10a2114: addiu sp, sp, -24
+// 0x010a275c: 0x10a275c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a2118: 0x10a2118: addiu v1, zero, 100
+// 0x010a2760: 0x10a2760: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x010a211c: 0x10a211c: sw    s0, 16(sp)
+// 0x010a2764: 0x10a2764: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2828,15 +2828,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a2120: 0x10a2120: sw    ra, 20(sp)
-// 0x010a2124: 0x10a2124: bne   v0, v1, 0x10a2134 addu  s0, a0, zero
+// 0x010a2768: 0x10a2768: sw    ra, 20(sp)
+// 0x010a276c: 0x10a276c: bne   v0, v1, 0x10a277c addu  s0, a0, zero
 	ldloc 5
 	ldloc 7
 	ldloc.1
 	stloc 8
-	bne.un L_10a2134
+	bne.un L_10a277c
 // --- basic block ---
-// 0x010a212c: 0x10a212c: jal   0x10a1fb4 addu  a0, zero, zero
+// 0x010a2774: 0x10a2774: jal   0x10a25fc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2844,35 +2844,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::PopOldest_10a1fb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::PopOldest_10a25fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a2134:
-// 0x010a2134: 0x10a2134: lui   v1, 0x80000
+L_10a277c:
+// 0x010a277c: 0x10a277c: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010a2138: 0x10a2138: lw    a0, 27456(v1)
+// 0x010a2780: 0x10a2780: lw    a0, 27920(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a213c: 0x10a213c: addiu v0, zero, 100
+// 0x010a2784: 0x10a2784: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x010a2140: 0x10a2140: beq   a0, v0, 0x10a21c0 lui   a2, 0x0
+// 0x010a2788: 0x10a2788: beq   a0, v0, 0x10a2808 lui   a2, 0x0
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	beq  L_10a21c0
+	beq  L_10a2808
 // --- basic block ---
-// 0x010a2148: 0x10a2148: lw    v0, 17932(a2)
+// 0x010a2790: 0x10a2790: lw    v0, 17932(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2881,27 +2881,27 @@ L_10a2134:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a214c: 0x10a214c: addiu a1, zero, -1
+// 0x010a2794: 0x10a2794: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010a2150: 0x10a2150: bne   v0, a1, 0x10a216c sll   zero, zero, 0
+// 0x010a2798: 0x10a2798: bne   v0, a1, 0x10a27b4 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	bne.un L_10a216c
+	bne.un L_10a27b4
 // --- basic block ---
-// 0x010a2158: 0x10a2158: addiu v0, zero, 1
+// 0x010a27a0: 0x10a27a0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a215c: 0x10a215c: sw    v0, 27456(v1)
+// 0x010a27a4: 0x10a27a4: sw    v0, 27920(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a2160: 0x10a2160: sw    zero, 17932(a2)
+// 0x010a27a8: 0x10a27a8: sw    zero, 17932(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2910,75 +2910,75 @@ L_10a2134:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2164: 0x10a2164: j	 0x10a2190 addu  v0, zero, zero
+// 0x010a27ac: 0x10a27ac: j	 0x10a27d8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10a2190
+	br L_10a27d8
 // --- basic block ---
-L_10a216c:
-// 0x010a216c: 0x10a216c: addu  v0, v0, a0
+L_10a27b4:
+// 0x010a27b4: 0x10a27b4: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x010a2170: 0x10a2170: slti  a2, v0, 100
+// 0x010a27b8: 0x10a27b8: slti  a2, v0, 100
 	ldloc 5
 	ldc.i4.s 100
 	clt
 	stloc.3
-// 0x010a2174: 0x10a2174: addiu a0, a0, 1
+// 0x010a27bc: 0x10a27bc: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010a2178: 0x10a2178: bne   a2, zero, 0x10a2188 sw    a0, 27456(v1)
+// 0x010a27c0: 0x10a27c0: bne   a2, zero, 0x10a27d0 sw    a0, 27920(v1)
 	ldloc.3
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_10a2188
+	brtrue L_10a27d0
 // --- basic block ---
-// 0x010a2180: 0x10a2180: j	 0x10a2190 addiu v0, v0, -100
+// 0x010a27c8: 0x10a27c8: j	 0x10a27d8 addiu v0, v0, -100
 	ldloc 5
 	ldc.i4.s -100
 	add
 	stloc 5
-	br L_10a2190
+	br L_10a27d8
 // --- basic block ---
-L_10a2188:
-// 0x010a2188: 0x10a2188: beq   v0, a1, 0x10a21c0 sll   zero, zero, 0
+L_10a27d0:
+// 0x010a27d0: 0x10a27d0: beq   v0, a1, 0x10a2808 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	beq  L_10a21c0
+	beq  L_10a2808
 // --- basic block ---
-L_10a2190:
-// 0x010a2190: 0x10a2190: lui   v1, 0x80000
+L_10a27d8:
+// 0x010a27d8: 0x10a27d8: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010a2194: 0x10a2194: addiu v1, v1, 27460
+// 0x010a27dc: 0x10a27dc: addiu v1, v1, 27924
 	ldloc 7
-	ldc.i4 27460
+	ldc.i4 27924
 	add
 	stloc 7
-// 0x010a2198: 0x10a2198: sll   v0, v0, 5
+// 0x010a27e0: 0x10a27e0: sll   v0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	shl
 	stloc 5
-// 0x010a219c: 0x10a219c: addu  v0, v1, v0
+// 0x010a27e4: 0x10a27e4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010a21a0: 0x10a21a0: addiu v1, zero, -1
+// 0x010a27e8: 0x10a27e8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010a21a4: 0x10a21a4: sw    v1, 8(v0)
+// 0x010a27ec: 0x10a27ec: sw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2987,7 +2987,7 @@ L_10a2190:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a21a8: 0x10a21a8: sw    zero, 24(v0)
+// 0x010a27f0: 0x10a27f0: sw    zero, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2996,7 +2996,7 @@ L_10a2190:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a21ac: 0x10a21ac: sw    zero, 28(v0)
+// 0x010a27f4: 0x10a27f4: sw    zero, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3005,14 +3005,14 @@ L_10a2190:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a21b0: 0x10a21b0: sw    zero, 0(v0)
+// 0x010a27f8: 0x10a27f8: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a21b4: 0x10a21b4: sw    zero, 4(v0)
+// 0x010a27fc: 0x10a27fc: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3021,7 +3021,7 @@ L_10a2190:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a21b8: 0x10a21b8: j	 0x10a21c4 sw    zero, 12(v0)
+// 0x010a2800: 0x10a2800: j	 0x10a280c sw    zero, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3030,14 +3030,14 @@ L_10a2190:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10a21c4
+	br L_10a280c
 // --- basic block ---
-L_10a21c0:
-// 0x010a21c0: 0x10a21c0: addu  v0, zero, zero
+L_10a2808:
+// 0x010a2808: 0x10a2808: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10a21c4:
-// 0x010a21c4: 0x10a21c4: lw    t2, 24(s0)
+L_10a280c:
+// 0x010a280c: 0x10a280c: lw    t2, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3046,14 +3046,14 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a21c8: 0x10a21c8: lw    t1, 0(s0)
+// 0x010a2810: 0x10a2810: lw    t1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x010a21cc: 0x10a21cc: lw    t0, 4(s0)
+// 0x010a2814: 0x10a2814: lw    t0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3062,7 +3062,7 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a21d0: 0x10a21d0: lw    a3, 8(s0)
+// 0x010a2818: 0x10a2818: lw    a3, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3071,7 +3071,7 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a21d4: 0x10a21d4: lw    a2, 16(s0)
+// 0x010a281c: 0x10a281c: lw    a2, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3080,7 +3080,7 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a21d8: 0x10a21d8: lw    a1, 20(s0)
+// 0x010a2820: 0x10a2820: lw    a1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3089,7 +3089,7 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a21dc: 0x10a21dc: lw    a0, 28(s0)
+// 0x010a2824: 0x10a2824: lw    a0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3098,7 +3098,7 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a21e0: 0x10a21e0: lw    v1, 12(s0)
+// 0x010a2828: 0x10a2828: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3107,8 +3107,8 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a21e4: 0x10a21e4: lw    ra, 20(sp)
-// 0x010a21e8: 0x10a21e8: lw    s0, 16(sp)
+// 0x010a282c: 0x10a282c: lw    ra, 20(sp)
+// 0x010a2830: 0x10a2830: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3117,7 +3117,7 @@ L_10a21c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a21ec: 0x10a21ec: sw    t2, 24(v0)
+// 0x010a2834: 0x10a2834: sw    t2, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3126,14 +3126,14 @@ L_10a21c4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a21f0: 0x10a21f0: sw    t1, 0(v0)
+// 0x010a2838: 0x10a2838: sw    t1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x010a21f4: 0x10a21f4: sw    t0, 4(v0)
+// 0x010a283c: 0x10a283c: sw    t0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3142,7 +3142,7 @@ L_10a21c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a21f8: 0x10a21f8: sw    a3, 8(v0)
+// 0x010a2840: 0x10a2840: sw    a3, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3151,7 +3151,7 @@ L_10a21c4:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010a21fc: 0x10a21fc: sw    a2, 16(v0)
+// 0x010a2844: 0x10a2844: sw    a2, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3160,7 +3160,7 @@ L_10a21c4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010a2200: 0x10a2200: sw    a1, 20(v0)
+// 0x010a2848: 0x10a2848: sw    a1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3169,7 +3169,7 @@ L_10a21c4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a2204: 0x10a2204: sw    a0, 28(v0)
+// 0x010a284c: 0x10a284c: sw    a0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3178,7 +3178,7 @@ L_10a21c4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a2208: 0x10a2208: sw    v1, 12(v0)
+// 0x010a2850: 0x10a2850: sw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3187,7 +3187,7 @@ L_10a21c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a220c: 0x10a220c: jr    ra addiu sp, sp, 24
+// 0x010a2854: 0x10a2854: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3199,7 +3199,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 download_progress_callback_10a2214(int32,int32,int32,int32,int32)
+.method public static int32 download_progress_callback_10a285c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 ra,int32 v1)
@@ -3240,8 +3240,8 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a2214:
-// 0x010a2214: 0x10a2214: lw    v0, 4(a0)
+L_10a285c:
+// 0x010a285c: 0x10a285c: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3250,12 +3250,12 @@ L_10a2214:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a2218: 0x10a2218: addiu sp, sp, -32
+// 0x010a2860: 0x10a2860: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a221c: 0x10a221c: sw    s1, 24(sp)
+// 0x010a2864: 0x10a2864: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3264,7 +3264,7 @@ L_10a2214:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a2220: 0x10a2220: sw    s0, 20(sp)
+// 0x010a2868: 0x10a2868: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3273,17 +3273,17 @@ L_10a2214:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a2224: 0x10a2224: sw    ra, 28(sp)
-// 0x010a2228: 0x10a2228: addu  s0, a0, zero
+// 0x010a286c: 0x10a286c: sw    ra, 28(sp)
+// 0x010a2870: 0x10a2870: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010a222c: 0x10a222c: beq   v0, zero, 0x10a2250 addu  s1, a2, zero
+// 0x010a2874: 0x10a2874: beq   v0, zero, 0x10a2898 addu  s1, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 7
-	brfalse L_10a2250
+	brfalse L_10a2898
 // --- basic block ---
-// 0x010a2234: 0x10a2234: lw    a0, 8(a0)
+// 0x010a287c: 0x10a287c: lw    a0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3292,7 +3292,7 @@ L_10a2214:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2238: 0x10a2238: jal   0x1001800 addu  a0, v0, a0
+// 0x010a2880: 0x10a2880: jal   0x1001800 addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
@@ -3306,7 +3306,7 @@ L_10a2214:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010a2240: 0x10a2240: lw    v0, 8(s0)
+// 0x010a2888: 0x10a2888: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3315,13 +3315,13 @@ L_10a2214:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a2244: 0x10a2244: sll   zero, zero, 0
-// 0x010a2248: 0x10a2248: addu  s1, v0, s1
+// 0x010a288c: 0x10a288c: sll   zero, zero, 0
+// 0x010a2890: 0x10a2890: addu  s1, v0, s1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x010a224c: 0x10a224c: sw    s1, 8(s0)
+// 0x010a2894: 0x10a2894: sw    s1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3330,9 +3330,9 @@ L_10a2214:
 	add
 	ldloc 7
 	stelem.i4
-L_10a2250:
-// 0x010a2250: 0x10a2250: lw    ra, 28(sp)
-// 0x010a2254: 0x10a2254: lw    s1, 24(sp)
+L_10a2898:
+// 0x010a2898: 0x10a2898: lw    ra, 28(sp)
+// 0x010a289c: 0x10a289c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3341,7 +3341,7 @@ L_10a2250:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a2258: 0x10a2258: lw    s0, 20(sp)
+// 0x010a28a0: 0x10a28a0: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3350,7 +3350,7 @@ L_10a2250:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a225c: 0x10a225c: jr    ra addiu sp, sp, 32
+// 0x010a28a4: 0x10a28a4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3362,7 +3362,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 get_images_output_path_10a2264(int32,int32,int32,int32,int32)
+.method public static int32 get_images_output_path_10a28ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 s1,int32 ra)
@@ -3403,13 +3403,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2264: 0x10a2264: addiu sp, sp, -544
+// 0x010a28ac: 0x10a28ac: addiu sp, sp, -544
 	ldloc.0
 	ldc.i4 -544
 	add
 	stloc.0
-// 0x010a2268: 0x10a2268: sw    ra, 540(sp)
-// 0x010a226c: 0x10a226c: sw    s1, 536(sp)
+// 0x010a28b0: 0x10a28b0: sw    ra, 540(sp)
+// 0x010a28b4: 0x10a28b4: sw    s1, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3418,7 +3418,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a2270: 0x10a2270: sw    s0, 532(sp)
+// 0x010a28b8: 0x10a28b8: sw    s0, 532(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3427,10 +3427,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a2274: 0x10a2274: addu  s1, a0, zero
+// 0x010a28bc: 0x10a28bc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a2278: 0x10a2278: jal   0x104c524 addiu s0, sp, 16
+// 0x010a28c0: 0x10a28c0: jal   0x104c534 addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3440,26 +3440,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a2280: 0x10a2280: lui   a3, 0x20000
+// 0x010a28c8: 0x10a28c8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a2284: 0x10a2284: addu  a2, v0, zero
+// 0x010a28cc: 0x10a28cc: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x010a2288: 0x10a2288: addu  a0, s0, zero
+// 0x010a28d0: 0x10a28d0: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a228c: 0x10a228c: addiu a3, a3, -264
+// 0x010a28d4: 0x10a28d4: addiu a3, a3, 200
 	ldloc 4
-	ldc.i4 -264
+	ldc.i4 200
 	add
 	stloc 4
-// 0x010a2290: 0x10a2290: jal   0x104ccb4 addiu a1, zero, 512
+// 0x010a28d8: 0x10a28d8: jal   0x104ccc4 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3467,26 +3467,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a2298: 0x10a2298: lui   a3, 0x0
+// 0x010a28e0: 0x10a28e0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010a229c: 0x10a229c: addu  a0, s0, zero
+// 0x010a28e4: 0x10a28e4: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a22a0: 0x10a22a0: addu  a2, s0, zero
+// 0x010a28e8: 0x10a28e8: addu  a2, s0, zero
 	ldloc 5
 	stloc.3
-// 0x010a22a4: 0x10a22a4: addiu a3, a3, 28132
+// 0x010a28ec: 0x10a28ec: addiu a3, a3, 28132
 	ldloc 4
 	ldc.i4 28132
 	add
 	stloc 4
-// 0x010a22a8: 0x10a22a8: jal   0x104ccb4 addiu a1, zero, 512
+// 0x010a28f0: 0x10a28f0: jal   0x104ccc4 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3494,15 +3494,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a22b0: 0x10a22b0: addu  a0, s0, zero
+// 0x010a28f8: 0x10a28f8: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a22b4: 0x10a22b4: jal   0x104cb30 addu  a1, s1, zero
+// 0x010a28fc: 0x10a28fc: jal   0x104cb40 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -3510,13 +3510,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a22bc: 0x10a22bc: lw    ra, 540(sp)
-// 0x010a22c0: 0x10a22c0: lw    s1, 536(sp)
+// 0x010a2904: 0x10a2904: lw    ra, 540(sp)
+// 0x010a2908: 0x10a2908: lw    s1, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3525,7 +3525,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a22c4: 0x10a22c4: lw    s0, 532(sp)
+// 0x010a290c: 0x10a290c: lw    s0, 532(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3534,7 +3534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a22c8: 0x10a22c8: jr    ra addiu sp, sp, 544
+// 0x010a2910: 0x10a2910: jr    ra addiu sp, sp, 544
 	ldloc.0
 	ldc.i4 544
 	add
@@ -3546,7 +3546,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 get_sound_output_path_10a22d0(int32,int32,int32,int32,int32)
+.method public static int32 get_sound_output_path_10a2918(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -3590,12 +3590,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a22d0: 0x10a22d0: addiu sp, sp, -544
+// 0x010a2918: 0x10a2918: addiu sp, sp, -544
 	ldloc.0
 	ldc.i4 -544
 	add
 	stloc.0
-// 0x010a22d4: 0x10a22d4: sw    s2, 536(sp)
+// 0x010a291c: 0x10a291c: sw    s2, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3604,7 +3604,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a22d8: 0x10a22d8: sw    s1, 532(sp)
+// 0x010a2920: 0x10a2920: sw    s1, 532(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3613,8 +3613,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a22dc: 0x10a22dc: sw    ra, 540(sp)
-// 0x010a22e0: 0x10a22e0: sw    s0, 528(sp)
+// 0x010a2924: 0x10a2924: sw    ra, 540(sp)
+// 0x010a2928: 0x10a2928: sw    s0, 528(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3623,25 +3623,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a22e4: 0x10a22e4: addu  s1, a0, zero
+// 0x010a292c: 0x10a292c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a22e8: 0x10a22e8: beq   a0, zero, 0x10a233c addu  s2, a1, zero
+// 0x010a2930: 0x10a2930: beq   a0, zero, 0x10a2984 addu  s2, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 10
-	brfalse L_10a233c
+	brfalse L_10a2984
 // --- basic block ---
-// 0x010a22f0: 0x10a22f0: lb    v0, 0(a0)
+// 0x010a2938: 0x10a2938: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a22f4: 0x10a22f4: sll   zero, zero, 0
-// 0x010a22f8: 0x10a22f8: beq   v0, zero, 0x10a233c sll   zero, zero, 0
+// 0x010a293c: 0x10a293c: sll   zero, zero, 0
+// 0x010a2940: 0x10a2940: beq   v0, zero, 0x10a2984 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a233c
+	brfalse L_10a2984
 // --- basic block ---
-// 0x010a2300: 0x10a2300: jal   0x104c524 addiu s0, sp, 16
+// 0x010a2948: 0x10a2948: jal   0x104c534 addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3651,26 +3651,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2308: 0x10a2308: lui   a3, 0x10000
+// 0x010a2950: 0x10a2950: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010a230c: 0x10a230c: addu  a2, v0, zero
+// 0x010a2954: 0x10a2954: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a2310: 0x10a2310: addiu a3, a3, 5092
+// 0x010a2958: 0x10a2958: addiu a3, a3, 5088
 	ldloc 4
-	ldc.i4 5092
+	ldc.i4 5088
 	add
 	stloc 4
-// 0x010a2314: 0x10a2314: addiu a1, zero, 512
+// 0x010a295c: 0x10a295c: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010a2318: 0x10a2318: jal   0x104ccb4 addu  a0, s0, zero
+// 0x010a2960: 0x10a2960: jal   0x104ccc4 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3678,21 +3678,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2320: 0x10a2320: addu  a0, s0, zero
+// 0x010a2968: 0x10a2968: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010a2324: 0x10a2324: addu  a3, s1, zero
+// 0x010a296c: 0x10a296c: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x010a2328: 0x10a2328: addu  a2, s0, zero
+// 0x010a2970: 0x10a2970: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x010a232c: 0x10a232c: jal   0x104ccb4 addiu a1, zero, 512
+// 0x010a2974: 0x10a2974: jal   0x104ccc4 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3700,33 +3700,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2334: 0x10a2334: j	 0x10a2348 addu  a0, s0, zero
+// 0x010a297c: 0x10a297c: j	 0x10a2990 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-	br L_10a2348
+	br L_10a2990
 // --- basic block ---
-L_10a233c:
-// 0x010a233c: 0x10a233c: jal   0x104c524 sll   zero, zero, 0
+L_10a2984:
+// 0x010a2984: 0x10a2984: jal   0x104c534 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2344: 0x10a2344: addu  a0, v0, zero
+// 0x010a298c: 0x10a298c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_10a2348:
-// 0x010a2348: 0x10a2348: jal   0x104cb30 addu  a1, s2, zero
+L_10a2990:
+// 0x010a2990: 0x10a2990: jal   0x104cb40 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3734,13 +3734,13 @@ L_10a2348:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2350: 0x10a2350: lw    ra, 540(sp)
-// 0x010a2354: 0x10a2354: lw    s2, 536(sp)
+// 0x010a2998: 0x10a2998: lw    ra, 540(sp)
+// 0x010a299c: 0x10a299c: lw    s2, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3749,7 +3749,7 @@ L_10a2348:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a2358: 0x10a2358: lw    s1, 532(sp)
+// 0x010a29a0: 0x10a29a0: lw    s1, 532(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3758,7 +3758,7 @@ L_10a2348:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a235c: 0x10a235c: lw    s0, 528(sp)
+// 0x010a29a4: 0x10a29a4: lw    s0, 528(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3767,7 +3767,7 @@ L_10a2348:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a2360: 0x10a2360: jr    ra addiu sp, sp, 544
+// 0x010a29a8: 0x10a29a8: jr    ra addiu sp, sp, 544
 	ldloc.0
 	ldc.i4 544
 	add
@@ -3779,7 +3779,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_download_start_10a2368(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_download_start_10a29b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 t2,int32 s6,int32 s2,int32 s4,int32 s5,int32 s8,int32 s3,int32 s7,int32 t0,int32 t1,int32 ra)
@@ -3850,12 +3850,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2368: 0x10a2368: addiu sp, sp, -112
+// 0x010a29b0: 0x10a29b0: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x010a236c: 0x10a236c: sw    s0, 72(sp)
+// 0x010a29b4: 0x10a29b4: sw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3864,20 +3864,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a2370: 0x10a2370: lui   s0, 0x80000
+// 0x010a29b8: 0x10a29b8: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010a2374: 0x10a2374: lw    v0, 27452(s0)
+// 0x010a29bc: 0x10a29bc: lw    v0, 27916(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6863
+	ldc.i4 6979
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2378: 0x10a2378: sw    ra, 108(sp)
-// 0x010a237c: 0x10a237c: sw    s8, 104(sp)
+// 0x010a29c0: 0x10a29c0: sw    ra, 108(sp)
+// 0x010a29c4: 0x10a29c4: sw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3886,7 +3886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a2380: 0x10a2380: sw    s7, 100(sp)
+// 0x010a29c8: 0x10a29c8: sw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3895,7 +3895,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010a2384: 0x10a2384: sw    s6, 96(sp)
+// 0x010a29cc: 0x10a29cc: sw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3904,7 +3904,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a2388: 0x10a2388: sw    s5, 92(sp)
+// 0x010a29d0: 0x10a29d0: sw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3913,7 +3913,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a238c: 0x10a238c: sw    s4, 88(sp)
+// 0x010a29d4: 0x10a29d4: sw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3922,7 +3922,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a2390: 0x10a2390: sw    s3, 84(sp)
+// 0x010a29d8: 0x10a29d8: sw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3931,7 +3931,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a2394: 0x10a2394: sw    s2, 80(sp)
+// 0x010a29dc: 0x10a29dc: sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3940,7 +3940,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a2398: 0x10a2398: bne   v0, zero, 0x10a2870 sw    s1, 76(sp)
+// 0x010a29e0: 0x10a29e0: bne   v0, zero, 0x10a2eb8 sw    s1, 76(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3950,9 +3950,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_10a2870
+	brtrue L_10a2eb8
 // --- basic block ---
-// 0x010a23a0: 0x10a23a0: jal   0x10a1fb4 addiu a0, sp, 32
+// 0x010a29e8: 0x10a29e8: jal   0x10a25fc addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3962,18 +3962,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::PopOldest_10a1fb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::PopOldest_10a25fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a23a8: 0x10a23a8: beq   v0, zero, 0x10a2870 addiu s1, zero, 1
+// 0x010a29f0: 0x10a29f0: beq   v0, zero, 0x10a2eb8 addiu s1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 9
-	brfalse L_10a2870
+	brfalse L_10a2eb8
 // --- basic block ---
-// 0x010a23b0: 0x10a23b0: lw    a0, 36(sp)
+// 0x010a29f8: 0x10a29f8: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3982,12 +3982,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a23b4: 0x10a23b4: jal   0x1001b48 sw    s1, 27452(s0)
+// 0x010a29fc: 0x10a29fc: jal   0x1001b48 sw    s1, 27916(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6863
+	ldc.i4 6979
 	add
 	ldloc 9
 	stelem.i4
@@ -3997,7 +3997,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a23bc: 0x10a23bc: jal   0x1000910 addiu a0, v0, 5
+// 0x010a2a04: 0x10a2a04: jal   0x1000910 addiu a0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	add
@@ -4012,7 +4012,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a23c4: 0x10a23c4: lw    a1, 36(sp)
+// 0x010a2a0c: 0x10a2a0c: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4021,10 +4021,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a23c8: 0x10a23c8: addu  a0, v0, zero
+// 0x010a2a10: 0x10a2a10: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a23cc: 0x10a23cc: jal   0x1001b68 addu  s0, v0, zero
+// 0x010a2a14: 0x10a2a14: jal   0x1001b68 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -4034,7 +4034,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a23d4: 0x10a23d4: lw    v0, 40(sp)
+// 0x010a2a1c: 0x10a2a1c: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4043,28 +4043,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a23d8: 0x10a23d8: sll   zero, zero, 0
-// 0x010a23dc: 0x10a23dc: beq   v0, zero, 0x10a23ec addiu v1, zero, 4
+// 0x010a2a20: 0x10a2a20: sll   zero, zero, 0
+// 0x010a2a24: 0x10a2a24: beq   v0, zero, 0x10a2a34 addiu v1, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 7
-	brfalse L_10a23ec
+	brfalse L_10a2a34
 // --- basic block ---
-// 0x010a23e4: 0x10a23e4: bne   v0, v1, 0x10a240c sll   zero, zero, 0
+// 0x010a2a2c: 0x10a2a2c: bne   v0, v1, 0x10a2a54 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_10a240c
+	bne.un L_10a2a54
 // --- basic block ---
-L_10a23ec:
-// 0x010a23ec: 0x10a23ec: lui   a1, 0x20000
+L_10a2a34:
+// 0x010a2a34: 0x10a2a34: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a23f0: 0x10a23f0: addu  a0, s0, zero
+// 0x010a2a38: 0x10a2a38: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a23f4: 0x10a23f4: jal   0x1001ac4 addiu a1, a1, -272
+// 0x010a2a3c: 0x10a2a3c: jal   0x1001ac4 addiu a1, a1, 192
 	ldloc.2
-	ldc.i4 -272
+	ldc.i4 192
 	add
 	stloc.2
 	ldloc.1
@@ -4072,7 +4072,7 @@ L_10a23ec:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a23fc: 0x10a23fc: jal   0x10a2264 addu  a0, s0, zero
+// 0x010a2a44: 0x10a2a44: jal   0x10a28ac addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4080,30 +4080,30 @@ L_10a23ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::get_images_output_path_10a2264(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::get_images_output_path_10a28ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2404: 0x10a2404: j	 0x10a244c addu  a0, zero, zero
+// 0x010a2a4c: 0x10a2a4c: j	 0x10a2a94 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10a244c
+	br L_10a2a94
 // --- basic block ---
-L_10a240c:
-// 0x010a240c: 0x10a240c: bne   v0, s1, 0x10a2434 lui   a1, 0x20000
+L_10a2a54:
+// 0x010a2a54: 0x10a2a54: bne   v0, s1, 0x10a2a7c lui   a1, 0x20000
 	ldloc 5
 	ldloc 9
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10a2434
+	bne.un L_10a2a7c
 // --- basic block ---
-// 0x010a2414: 0x10a2414: addu  a0, s0, zero
+// 0x010a2a5c: 0x10a2a5c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a2418: 0x10a2418: jal   0x1001ac4 addiu a1, a1, 92
+// 0x010a2a60: 0x10a2a60: jal   0x1001ac4 addiu a1, a1, 556
 	ldloc.2
-	ldc.i4.s 92
+	ldc.i4 556
 	add
 	stloc.2
 	ldloc.1
@@ -4111,7 +4111,7 @@ L_10a240c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a2420: 0x10a2420: lw    a0, 44(sp)
+// 0x010a2a68: 0x10a2a68: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4120,7 +4120,7 @@ L_10a240c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2424: 0x10a2424: jal   0x10a22d0 addu  a1, s0, zero
+// 0x010a2a6c: 0x10a2a6c: jal   0x10a2918 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4128,32 +4128,32 @@ L_10a240c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::get_sound_output_path_10a22d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::get_sound_output_path_10a2918(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a242c: 0x10a242c: j	 0x10a244c addu  a0, zero, zero
+// 0x010a2a74: 0x10a2a74: j	 0x10a2a94 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10a244c
+	br L_10a2a94
 // --- basic block ---
-L_10a2434:
-// 0x010a2434: 0x10a2434: jal   0x104c524 sll   zero, zero, 0
+L_10a2a7c:
+// 0x010a2a7c: 0x10a2a7c: jal   0x104c534 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a243c: 0x10a243c: addu  a0, v0, zero
+// 0x010a2a84: 0x10a2a84: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a2440: 0x10a2440: jal   0x104cb30 addu  a1, s0, zero
+// 0x010a2a88: 0x10a2a88: jal   0x104cb40 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4161,19 +4161,19 @@ L_10a2434:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2448: 0x10a2448: addu  a0, zero, zero
+// 0x010a2a90: 0x10a2a90: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_10a244c:
-// 0x010a244c: 0x10a244c: addu  a1, v0, zero
+L_10a2a94:
+// 0x010a2a94: 0x10a2a94: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2450: 0x10a2450: jal   0x104d690 addu  s3, v0, zero
+// 0x010a2a98: 0x10a2a98: jal   0x104d6a0 addu  s3, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -4181,16 +4181,16 @@ L_10a244c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2458: 0x10a2458: beq   v0, zero, 0x10a249c sll   zero, zero, 0
+// 0x010a2aa0: 0x10a2aa0: beq   v0, zero, 0x10a2ae4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a249c
+	brfalse L_10a2ae4
 // --- basic block ---
-// 0x010a2460: 0x10a2460: lw    v0, 48(sp)
+// 0x010a2aa8: 0x10a2aa8: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4199,12 +4199,12 @@ L_10a244c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2464: 0x10a2464: sll   zero, zero, 0
-// 0x010a2468: 0x10a2468: bne   v0, zero, 0x10a249c sll   zero, zero, 0
+// 0x010a2aac: 0x10a2aac: sll   zero, zero, 0
+// 0x010a2ab0: 0x10a2ab0: bne   v0, zero, 0x10a2ae4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a249c
+	brtrue L_10a2ae4
 // --- basic block ---
-// 0x010a2470: 0x10a2470: lw    v0, 56(sp)
+// 0x010a2ab8: 0x10a2ab8: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4213,14 +4213,14 @@ L_10a244c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2474: 0x10a2474: sll   zero, zero, 0
-// 0x010a2478: 0x10a2478: beq   v0, zero, 0x10a2494 lui   a3, 0x10000
+// 0x010a2abc: 0x10a2abc: sll   zero, zero, 0
+// 0x010a2ac0: 0x10a2ac0: beq   v0, zero, 0x10a2adc lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brfalse L_10a2494
+	brfalse L_10a2adc
 // --- basic block ---
-// 0x010a2480: 0x10a2480: lw    a0, 32(sp)
+// 0x010a2ac8: 0x10a2ac8: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4229,7 +4229,7 @@ L_10a244c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2484: 0x10a2484: lw    a2, 60(sp)
+// 0x010a2acc: 0x10a2acc: lw    a2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4238,12 +4238,12 @@ L_10a244c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a2488: 0x10a2488: addiu a3, a3, 18500
+// 0x010a2ad0: 0x10a2ad0: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x010a248c: 0x10a248c: jalr  v0 addiu a1, zero, 1
+// 0x010a2ad4: 0x10a2ad4: jalr  v0 addiu a1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.2
@@ -4257,14 +4257,14 @@ L_10a244c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a2494:
-// 0x010a2494: 0x10a2494: j	 0x10a27a0 addu  a0, s0, zero
+L_10a2adc:
+// 0x010a2adc: 0x10a2adc: j	 0x10a2de8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-	br L_10a27a0
+	br L_10a2de8
 // --- basic block ---
-L_10a249c:
-// 0x010a249c: 0x10a249c: jal   0x1000930 addu  a0, s0, zero
+L_10a2ae4:
+// 0x010a2ae4: 0x10a2ae4: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4277,7 +4277,7 @@ L_10a249c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a24a4: 0x10a24a4: lw    a0, 32(sp)
+// 0x010a2aec: 0x10a2aec: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4286,14 +4286,14 @@ L_10a249c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a24a8: 0x10a24a8: jal   0x1001b48 sll   zero, zero, 0
+// 0x010a2af0: 0x10a2af0: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a24b0: 0x10a24b0: jal   0x1000910 addiu a0, v0, 5
+// 0x010a2af8: 0x10a2af8: jal   0x1000910 addiu a0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	add
@@ -4308,7 +4308,7 @@ L_10a249c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a24b8: 0x10a24b8: lw    a1, 32(sp)
+// 0x010a2b00: 0x10a2b00: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4317,10 +4317,10 @@ L_10a249c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a24bc: 0x10a24bc: addu  a0, v0, zero
+// 0x010a2b04: 0x10a2b04: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a24c0: 0x10a24c0: jal   0x1001b68 addu  s2, v0, zero
+// 0x010a2b08: 0x10a2b08: jal   0x1001b68 addu  s2, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
@@ -4330,7 +4330,7 @@ L_10a249c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a24c8: 0x10a24c8: lw    v0, 40(sp)
+// 0x010a2b10: 0x10a2b10: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4339,46 +4339,46 @@ L_10a249c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a24cc: 0x10a24cc: sll   zero, zero, 0
-// 0x010a24d0: 0x10a24d0: beq   v0, zero, 0x10a24e0 addiu v1, zero, 4
+// 0x010a2b14: 0x10a2b14: sll   zero, zero, 0
+// 0x010a2b18: 0x10a2b18: beq   v0, zero, 0x10a2b28 addiu v1, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 7
-	brfalse L_10a24e0
+	brfalse L_10a2b28
 // --- basic block ---
-// 0x010a24d8: 0x10a24d8: bne   v0, v1, 0x10a24ec addiu v1, zero, 1
+// 0x010a2b20: 0x10a2b20: bne   v0, v1, 0x10a2b34 addiu v1, zero, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	stloc 7
-	bne.un L_10a24ec
+	bne.un L_10a2b34
 // --- basic block ---
-L_10a24e0:
-// 0x010a24e0: 0x10a24e0: lui   a1, 0x10000
+L_10a2b28:
+// 0x010a2b28: 0x10a2b28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a24e4: 0x10a24e4: j	 0x10a24f8 addiu a1, a1, 3076
+// 0x010a2b2c: 0x10a2b2c: j	 0x10a2b40 addiu a1, a1, 3072
 	ldloc.2
-	ldc.i4 3076
+	ldc.i4 3072
 	add
 	stloc.2
-	br L_10a24f8
+	br L_10a2b40
 // --- basic block ---
-L_10a24ec:
-// 0x010a24ec: 0x10a24ec: bne   v0, v1, 0x10a2500 lui   a1, 0x20000
+L_10a2b34:
+// 0x010a2b34: 0x10a2b34: bne   v0, v1, 0x10a2b48 lui   a1, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10a2500
+	bne.un L_10a2b48
 // --- basic block ---
-// 0x010a24f4: 0x10a24f4: addiu a1, a1, 92
+// 0x010a2b3c: 0x10a2b3c: addiu a1, a1, 556
 	ldloc.2
-	ldc.i4.s 92
+	ldc.i4 556
 	add
 	stloc.2
-L_10a24f8:
-// 0x010a24f8: 0x10a24f8: jal   0x1001ac4 addu  a0, s2, zero
+L_10a2b40:
+// 0x010a2b40: 0x10a2b40: jal   0x1001ac4 addu  a0, s2, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
@@ -4386,8 +4386,8 @@ L_10a24f8:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-L_10a2500:
-// 0x010a2500: 0x10a2500: lw    s1, 40(sp)
+L_10a2b48:
+// 0x010a2b48: 0x10a2b48: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4396,7 +4396,7 @@ L_10a2500:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a2504: 0x10a2504: lw    s4, 44(sp)
+// 0x010a2b4c: 0x10a2b4c: lw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4405,41 +4405,41 @@ L_10a2500:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a2508: 0x10a2508: beq   s1, zero, 0x10a2530 addiu v0, zero, 1
+// 0x010a2b50: 0x10a2b50: beq   s1, zero, 0x10a2b78 addiu v0, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 5
-	brfalse L_10a2530
+	brfalse L_10a2b78
 // --- basic block ---
-// 0x010a2510: 0x10a2510: beq   s1, v0, 0x10a2564 addiu v0, zero, 3
+// 0x010a2b58: 0x10a2b58: beq   s1, v0, 0x10a2bac addiu v0, zero, 3
 	ldloc 9
 	ldloc 5
 	ldc.i4.3
 	stloc 5
-	beq  L_10a2564
+	beq  L_10a2bac
 // --- basic block ---
-// 0x010a2518: 0x10a2518: beq   s1, v0, 0x10a2580 addiu v0, zero, 4
+// 0x010a2b60: 0x10a2b60: beq   s1, v0, 0x10a2bc8 addiu v0, zero, 4
 	ldloc 9
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	beq  L_10a2580
+	beq  L_10a2bc8
 // --- basic block ---
-// 0x010a2520: 0x10a2520: bne   s1, v0, 0x10a259c sll   zero, zero, 0
+// 0x010a2b68: 0x10a2b68: bne   s1, v0, 0x10a2be4 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	bne.un L_10a259c
+	bne.un L_10a2be4
 // --- basic block ---
-// 0x010a2528: 0x10a2528: j	 0x10a254c lui   a0, 0x0
+// 0x010a2b70: 0x10a2b70: j	 0x10a2b94 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_10a254c
+	br L_10a2b94
 // --- basic block ---
-L_10a2530:
-// 0x010a2530: 0x10a2530: lui   a0, 0x0
+L_10a2b78:
+// 0x010a2b78: 0x10a2b78: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2534: 0x10a2534: jal   0x100e348 addiu a0, a0, 17772
+// 0x010a2b7c: 0x10a2b7c: jal   0x100e358 addiu a0, a0, 17772
 	ldloc.1
 	ldc.i4 17772
 	add
@@ -4449,26 +4449,26 @@ L_10a2530:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a253c: 0x10a253c: lui   a0, 0x0
+// 0x010a2b84: 0x10a2b84: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2540: 0x10a2540: addu  s6, v0, zero
+// 0x010a2b88: 0x10a2b88: addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a2544: 0x10a2544: j	 0x10a25b4 addiu a0, a0, 17788
+// 0x010a2b8c: 0x10a2b8c: j	 0x10a2bfc addiu a0, a0, 17788
 	ldloc.1
 	ldc.i4 17788
 	add
 	stloc.1
-	br L_10a25b4
+	br L_10a2bfc
 // --- basic block ---
-L_10a254c:
-// 0x010a254c: 0x10a254c: jal   0x100e348 addiu a0, a0, 17804
+L_10a2b94:
+// 0x010a2b94: 0x10a2b94: jal   0x100e358 addiu a0, a0, 17804
 	ldloc.1
 	ldc.i4 17804
 	add
@@ -4478,29 +4478,29 @@ L_10a254c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2554: 0x10a2554: lui   a0, 0x0
+// 0x010a2b9c: 0x10a2b9c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2558: 0x10a2558: addu  s6, v0, zero
+// 0x010a2ba0: 0x10a2ba0: addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a255c: 0x10a255c: j	 0x10a25b4 addiu a0, a0, 17820
+// 0x010a2ba4: 0x10a2ba4: j	 0x10a2bfc addiu a0, a0, 17820
 	ldloc.1
 	ldc.i4 17820
 	add
 	stloc.1
-	br L_10a25b4
+	br L_10a2bfc
 // --- basic block ---
-L_10a2564:
-// 0x010a2564: 0x10a2564: lui   a0, 0x0
+L_10a2bac:
+// 0x010a2bac: 0x10a2bac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2568: 0x10a2568: jal   0x100e348 addiu a0, a0, 17836
+// 0x010a2bb0: 0x10a2bb0: jal   0x100e358 addiu a0, a0, 17836
 	ldloc.1
 	ldc.i4 17836
 	add
@@ -4510,29 +4510,29 @@ L_10a2564:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2570: 0x10a2570: lui   a0, 0x0
+// 0x010a2bb8: 0x10a2bb8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2574: 0x10a2574: addu  s6, v0, zero
+// 0x010a2bbc: 0x10a2bbc: addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a2578: 0x10a2578: j	 0x10a25b4 addiu a0, a0, 17852
+// 0x010a2bc0: 0x10a2bc0: j	 0x10a2bfc addiu a0, a0, 17852
 	ldloc.1
 	ldc.i4 17852
 	add
 	stloc.1
-	br L_10a25b4
+	br L_10a2bfc
 // --- basic block ---
-L_10a2580:
-// 0x010a2580: 0x10a2580: lui   a0, 0x0
+L_10a2bc8:
+// 0x010a2bc8: 0x10a2bc8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2584: 0x10a2584: jal   0x100e348 addiu a0, a0, 17868
+// 0x010a2bcc: 0x10a2bcc: jal   0x100e358 addiu a0, a0, 17868
 	ldloc.1
 	ldc.i4 17868
 	add
@@ -4542,29 +4542,29 @@ L_10a2580:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a258c: 0x10a258c: lui   a0, 0x0
+// 0x010a2bd4: 0x10a2bd4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2590: 0x10a2590: addu  s6, v0, zero
+// 0x010a2bd8: 0x10a2bd8: addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a2594: 0x10a2594: j	 0x10a25b4 addiu a0, a0, 17884
+// 0x010a2bdc: 0x10a2bdc: j	 0x10a2bfc addiu a0, a0, 17884
 	ldloc.1
 	ldc.i4 17884
 	add
 	stloc.1
-	br L_10a25b4
+	br L_10a2bfc
 // --- basic block ---
-L_10a259c:
-// 0x010a259c: 0x10a259c: lui   a0, 0x0
+L_10a2be4:
+// 0x010a2be4: 0x10a2be4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a25a0: 0x10a25a0: jal   0x100e348 addiu a0, a0, 17900
+// 0x010a2be8: 0x10a2be8: jal   0x100e358 addiu a0, a0, 17900
 	ldloc.1
 	ldc.i4 17900
 	add
@@ -4574,24 +4574,24 @@ L_10a259c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a25a8: 0x10a25a8: lui   a0, 0x0
+// 0x010a2bf0: 0x10a2bf0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a25ac: 0x10a25ac: addu  s6, v0, zero
+// 0x010a2bf4: 0x10a2bf4: addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a25b0: 0x10a25b0: addiu a0, a0, 17916
+// 0x010a2bf8: 0x10a2bf8: addiu a0, a0, 17916
 	ldloc.1
 	ldc.i4 17916
 	add
 	stloc.1
-L_10a25b4:
-// 0x010a25b4: 0x10a25b4: jal   0x100e348 lui   s7, 0x20000
+L_10a2bfc:
+// 0x010a2bfc: 0x10a2bfc: jal   0x100e358 lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 17
 	ldloc.0
@@ -4599,42 +4599,42 @@ L_10a25b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a25bc: 0x10a25bc: addu  s5, v0, zero
+// 0x010a2c04: 0x10a2c04: addu  s5, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010a25c0: 0x10a25c0: lb    v0, 0(s6)
+// 0x010a2c08: 0x10a2c08: lb    v0, 0(s6)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a25c4: 0x10a25c4: sll   zero, zero, 0
-// 0x010a25c8: 0x10a25c8: bne   v0, zero, 0x10a25f8 lui   a3, 0x20000
+// 0x010a2c0c: 0x10a2c0c: sll   zero, zero, 0
+// 0x010a2c10: 0x10a2c10: bne   v0, zero, 0x10a2c40 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10a25f8
+	brtrue L_10a2c40
 // --- basic block ---
-// 0x010a25d0: 0x10a25d0: addiu a1, s7, 100
+// 0x010a2c18: 0x10a2c18: addiu a1, s7, 564
 	ldloc 17
-	ldc.i4.s 100
+	ldc.i4 564
 	add
 	stloc.2
-// 0x010a25d4: 0x10a25d4: addiu a3, a3, 136
+// 0x010a2c1c: 0x10a2c1c: addiu a3, a3, 600
 	ldloc 4
-	ldc.i4 136
+	ldc.i4 600
 	add
 	stloc 4
-// 0x010a25d8: 0x10a25d8: addiu a0, zero, 4
+// 0x010a2c20: 0x10a2c20: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a25dc: 0x10a25dc: addiu a2, zero, 223
+// 0x010a2c24: 0x10a2c24: addiu a2, zero, 223
 	ldc.i4 223
 	stloc.3
-// 0x010a25e0: 0x10a25e0: sw    s1, 16(sp)
+// 0x010a2c28: 0x10a2c28: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4643,7 +4643,7 @@ L_10a25b4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a25e4: 0x10a25e4: sw    s4, 20(sp)
+// 0x010a2c2c: 0x10a2c2c: sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4652,7 +4652,7 @@ L_10a25b4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a25e8: 0x10a25e8: jal   0x100449c sw    s2, 24(sp)
+// 0x010a2c30: 0x10a2c30: jal   0x100449c sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4671,11 +4671,11 @@ L_10a25b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a25f0: 0x10a25f0: j	 0x10a2778 sll   zero, zero, 0
-	br L_10a2778
+// 0x010a2c38: 0x10a2c38: j	 0x10a2dc0 sll   zero, zero, 0
+	br L_10a2dc0
 // --- basic block ---
-L_10a25f8:
-// 0x010a25f8: 0x10a25f8: jal   0x1001b48 addu  a0, s6, zero
+L_10a2c40:
+// 0x010a2c40: 0x10a2c40: jal   0x1001b48 addu  a0, s6, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -4684,10 +4684,10 @@ L_10a25f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2600: 0x10a2600: addu  a0, s5, zero
+// 0x010a2c48: 0x10a2c48: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010a2604: 0x10a2604: jal   0x1001b48 sw    v0, 68(sp)
+// 0x010a2c4c: 0x10a2c4c: jal   0x1001b48 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4702,10 +4702,10 @@ L_10a25f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a260c: 0x10a260c: addu  a0, s2, zero
+// 0x010a2c54: 0x10a2c54: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x010a2610: 0x10a2610: jal   0x1001b48 sw    v0, 64(sp)
+// 0x010a2c58: 0x10a2c58: jal   0x1001b48 sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4720,10 +4720,10 @@ L_10a25f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2618: 0x10a2618: addu  a0, s4, zero
+// 0x010a2c60: 0x10a2c60: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010a261c: 0x10a261c: jal   0x1001b48 addu  s8, v0, zero
+// 0x010a2c64: 0x10a2c64: jal   0x1001b48 addu  s8, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.1
@@ -4732,7 +4732,7 @@ L_10a25f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2624: 0x10a2624: jal   0x10aa980 addu  s0, v0, zero
+// 0x010a2c6c: 0x10a2c6c: jal   0x10aafc8 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4740,12 +4740,12 @@ L_10a25f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_get_server_id_10aa980(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_get_server_id_10aafc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a262c: 0x10a262c: jal   0x1001b48 addu  a0, v0, zero
+// 0x010a2c74: 0x10a2c74: jal   0x1001b48 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -4754,7 +4754,7 @@ L_10a25f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2634: 0x10a2634: lw    a1, 68(sp)
+// 0x010a2c7c: 0x10a2c7c: lw    a1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4763,7 +4763,7 @@ L_10a25f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a2638: 0x10a2638: lw    v1, 64(sp)
+// 0x010a2c80: 0x10a2c80: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4772,28 +4772,28 @@ L_10a25f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a263c: 0x10a263c: sll   zero, zero, 0
-// 0x010a2640: 0x10a2640: addu  v1, a1, v1
+// 0x010a2c84: 0x10a2c84: sll   zero, zero, 0
+// 0x010a2c88: 0x10a2c88: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x010a2644: 0x10a2644: addiu v1, v1, 10
+// 0x010a2c8c: 0x10a2c8c: addiu v1, v1, 10
 	ldloc 7
 	ldc.i4.s 10
 	add
 	stloc 7
-// 0x010a2648: 0x10a2648: addu  s8, v1, s8
+// 0x010a2c90: 0x10a2c90: addu  s8, v1, s8
 	ldloc 7
 	ldloc 15
 	add
 	stloc 15
-// 0x010a264c: 0x10a264c: addu  s0, s8, s0
+// 0x010a2c94: 0x10a2c94: addu  s0, s8, s0
 	ldloc 15
 	ldloc 8
 	add
 	stloc 8
-// 0x010a2650: 0x10a2650: jal   0x1000910 addu  a0, s0, v0
+// 0x010a2c98: 0x10a2c98: jal   0x1000910 addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
@@ -4808,18 +4808,18 @@ L_10a25f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2658: 0x10a2658: addu  s0, v0, zero
+// 0x010a2ca0: 0x10a2ca0: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a265c: 0x10a265c: addiu a0, s7, 100
+// 0x010a2ca4: 0x10a2ca4: addiu a0, s7, 564
 	ldloc 17
-	ldc.i4.s 100
+	ldc.i4 564
 	add
 	stloc.1
-// 0x010a2660: 0x10a2660: addu  a2, v0, zero
+// 0x010a2ca8: 0x10a2ca8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a2664: 0x10a2664: jal   0x1004a38 addiu a1, zero, 230
+// 0x010a2cac: 0x10a2cac: jal   0x1004a48 addiu a1, zero, 230
 	ldc.i4 230
 	stloc.2
 	ldloc.0
@@ -4827,15 +4827,15 @@ L_10a25f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a266c: 0x10a266c: addu  a0, s0, zero
+// 0x010a2cb4: 0x10a2cb4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a2670: 0x10a2670: jal   0x1001b68 addu  a1, s6, zero
+// 0x010a2cb8: 0x10a2cb8: jal   0x1001b68 addu  a1, s6, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -4845,19 +4845,19 @@ L_10a25f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2678: 0x10a2678: lb    v0, 0(s5)
+// 0x010a2cc0: 0x10a2cc0: lb    v0, 0(s5)
 	ldloc 14
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a267c: 0x10a267c: sll   zero, zero, 0
-// 0x010a2680: 0x10a2680: beq   v0, zero, 0x10a26a4 sll   zero, zero, 0
+// 0x010a2cc4: 0x10a2cc4: sll   zero, zero, 0
+// 0x010a2cc8: 0x10a2cc8: beq   v0, zero, 0x10a2cec sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a26a4
+	brfalse L_10a2cec
 // --- basic block ---
-// 0x010a2688: 0x10a2688: addu  a1, s5, zero
+// 0x010a2cd0: 0x10a2cd0: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x010a268c: 0x10a268c: jal   0x1001ac4 addu  a0, s0, zero
+// 0x010a2cd4: 0x10a2cd4: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4865,15 +4865,15 @@ L_10a25f8:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a2694: 0x10a2694: lui   a1, 0x20000
+// 0x010a2cdc: 0x10a2cdc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a2698: 0x10a2698: addu  a0, s0, zero
+// 0x010a2ce0: 0x10a2ce0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a269c: 0x10a269c: jal   0x1001ac4 addiu a1, a1, 23444
+// 0x010a2ce4: 0x10a2ce4: jal   0x1001ac4 addiu a1, a1, 23904
 	ldloc.2
-	ldc.i4 23444
+	ldc.i4 23904
 	add
 	stloc.2
 	ldloc.1
@@ -4881,28 +4881,28 @@ L_10a25f8:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-L_10a26a4:
-// 0x010a26a4: 0x10a26a4: beq   s4, zero, 0x10a26dc addiu v0, zero, 2
+L_10a2cec:
+// 0x010a2cec: 0x10a2cec: beq   s4, zero, 0x10a2d24 addiu v0, zero, 2
 	ldloc 13
 	ldc.i4.2
 	stloc 5
-	brfalse L_10a26dc
+	brfalse L_10a2d24
 // --- basic block ---
-// 0x010a26ac: 0x10a26ac: lb    v0, 0(s4)
+// 0x010a2cf4: 0x10a2cf4: lb    v0, 0(s4)
 	ldloc 13
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a26b0: 0x10a26b0: sll   zero, zero, 0
-// 0x010a26b4: 0x10a26b4: beq   v0, zero, 0x10a26dc addiu v0, zero, 2
+// 0x010a2cf8: 0x10a2cf8: sll   zero, zero, 0
+// 0x010a2cfc: 0x10a2cfc: beq   v0, zero, 0x10a2d24 addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brfalse L_10a26dc
+	brfalse L_10a2d24
 // --- basic block ---
-// 0x010a26bc: 0x10a26bc: addu  a1, s4, zero
+// 0x010a2d04: 0x10a2d04: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010a26c0: 0x10a26c0: jal   0x1001ac4 addu  a0, s0, zero
+// 0x010a2d08: 0x10a2d08: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4910,15 +4910,15 @@ L_10a26a4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a26c8: 0x10a26c8: lui   a1, 0x20000
+// 0x010a2d10: 0x10a2d10: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a26cc: 0x10a26cc: addu  a0, s0, zero
+// 0x010a2d14: 0x10a2d14: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a26d0: 0x10a26d0: jal   0x1001ac4 addiu a1, a1, 23444
+// 0x010a2d18: 0x10a2d18: jal   0x1001ac4 addiu a1, a1, 23904
 	ldloc.2
-	ldc.i4 23444
+	ldc.i4 23904
 	add
 	stloc.2
 	ldloc.1
@@ -4926,30 +4926,30 @@ L_10a26a4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a26d8: 0x10a26d8: addiu v0, zero, 2
+// 0x010a2d20: 0x10a2d20: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-L_10a26dc:
-// 0x010a26dc: 0x10a26dc: bne   s1, v0, 0x10a2708 sll   zero, zero, 0
+L_10a2d24:
+// 0x010a2d24: 0x10a2d24: bne   s1, v0, 0x10a2d50 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	bne.un L_10a2708
+	bne.un L_10a2d50
 // --- basic block ---
-// 0x010a26e4: 0x10a26e4: jal   0x10aa980 sll   zero, zero, 0
+// 0x010a2d2c: 0x10a2d2c: jal   0x10aafc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_get_server_id_10aa980(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_get_server_id_10aafc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a26ec: 0x10a26ec: addu  a1, v0, zero
+// 0x010a2d34: 0x10a2d34: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a26f0: 0x10a26f0: jal   0x1001ac4 addu  a0, s0, zero
+// 0x010a2d38: 0x10a2d38: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4957,15 +4957,15 @@ L_10a26dc:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a26f8: 0x10a26f8: lui   a1, 0x20000
+// 0x010a2d40: 0x10a2d40: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a26fc: 0x10a26fc: addu  a0, s0, zero
+// 0x010a2d44: 0x10a2d44: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a2700: 0x10a2700: jal   0x1001ac4 addiu a1, a1, 23444
+// 0x010a2d48: 0x10a2d48: jal   0x1001ac4 addiu a1, a1, 23904
 	ldloc.2
-	ldc.i4 23444
+	ldc.i4 23904
 	add
 	stloc.2
 	ldloc.1
@@ -4973,64 +4973,64 @@ L_10a26dc:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-L_10a2708:
-// 0x010a2708: 0x10a2708: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+L_10a2d50:
+// 0x010a2d50: 0x10a2d50: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010a2710: 0x10a2710: beq   v0, zero, 0x10a2734 sll   zero, zero, 0
+// 0x010a2d58: 0x10a2d58: beq   v0, zero, 0x10a2d7c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a2734
+	brfalse L_10a2d7c
 // --- basic block ---
-// 0x010a2718: 0x10a2718: beq   s1, zero, 0x10a2728 addiu v0, zero, 4
+// 0x010a2d60: 0x10a2d60: beq   s1, zero, 0x10a2d70 addiu v0, zero, 4
 	ldloc 9
 	ldc.i4.4
 	stloc 5
-	brfalse L_10a2728
+	brfalse L_10a2d70
 // --- basic block ---
-// 0x010a2720: 0x10a2720: bne   s1, v0, 0x10a2768 addu  a0, s0, zero
+// 0x010a2d68: 0x10a2d68: bne   s1, v0, 0x10a2db0 addu  a0, s0, zero
 	ldloc 9
 	ldloc 5
 	ldloc 8
 	stloc.1
-	bne.un L_10a2768
+	bne.un L_10a2db0
 // --- basic block ---
-L_10a2728:
-// 0x010a2728: 0x10a2728: lui   a1, 0x20000
+L_10a2d70:
+// 0x010a2d70: 0x10a2d70: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a272c: 0x10a272c: j	 0x10a274c addiu a1, a1, 212
+// 0x010a2d74: 0x10a2d74: j	 0x10a2d94 addiu a1, a1, 676
 	ldloc.2
-	ldc.i4 212
+	ldc.i4 676
 	add
 	stloc.2
-	br L_10a274c
+	br L_10a2d94
 // --- basic block ---
-L_10a2734:
-// 0x010a2734: 0x10a2734: beq   s1, zero, 0x10a2744 addiu v0, zero, 4
+L_10a2d7c:
+// 0x010a2d7c: 0x10a2d7c: beq   s1, zero, 0x10a2d8c addiu v0, zero, 4
 	ldloc 9
 	ldc.i4.4
 	stloc 5
-	brfalse L_10a2744
+	brfalse L_10a2d8c
 // --- basic block ---
-// 0x010a273c: 0x10a273c: bne   s1, v0, 0x10a2768 addu  a0, s0, zero
+// 0x010a2d84: 0x10a2d84: bne   s1, v0, 0x10a2db0 addu  a0, s0, zero
 	ldloc 9
 	ldloc 5
 	ldloc 8
 	stloc.1
-	bne.un L_10a2768
+	bne.un L_10a2db0
 // --- basic block ---
-L_10a2744:
-// 0x010a2744: 0x10a2744: lui   a1, 0x20000
+L_10a2d8c:
+// 0x010a2d8c: 0x10a2d8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a2748: 0x10a2748: addiu a1, a1, 216
+// 0x010a2d90: 0x10a2d90: addiu a1, a1, 680
 	ldloc.2
-	ldc.i4 216
+	ldc.i4 680
 	add
 	stloc.2
-L_10a274c:
-// 0x010a274c: 0x10a274c: jal   0x1001ac4 addu  a0, s0, zero
+L_10a2d94:
+// 0x010a2d94: 0x10a2d94: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5038,15 +5038,15 @@ L_10a274c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a2754: 0x10a2754: lui   a1, 0x20000
+// 0x010a2d9c: 0x10a2d9c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a2758: 0x10a2758: addu  a0, s0, zero
+// 0x010a2da0: 0x10a2da0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a275c: 0x10a275c: jal   0x1001ac4 addiu a1, a1, 23444
+// 0x010a2da4: 0x10a2da4: jal   0x1001ac4 addiu a1, a1, 23904
 	ldloc.2
-	ldc.i4 23444
+	ldc.i4 23904
 	add
 	stloc.2
 	ldloc.1
@@ -5054,11 +5054,11 @@ L_10a274c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a2764: 0x10a2764: addu  a0, s0, zero
+// 0x010a2dac: 0x10a2dac: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_10a2768:
-// 0x010a2768: 0x10a2768: jal   0x1001ac4 addu  a1, s2, zero
+L_10a2db0:
+// 0x010a2db0: 0x10a2db0: jal   0x1001ac4 addu  a1, s2, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
@@ -5066,12 +5066,12 @@ L_10a2768:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a2770: 0x10a2770: bne   s0, zero, 0x10a27c4 sll   zero, zero, 0
+// 0x010a2db8: 0x10a2db8: bne   s0, zero, 0x10a2e0c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_10a27c4
+	brtrue L_10a2e0c
 // --- basic block ---
-L_10a2778:
-// 0x010a2778: 0x10a2778: lw    v0, 56(sp)
+L_10a2dc0:
+// 0x010a2dc0: 0x10a2dc0: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5080,14 +5080,14 @@ L_10a2778:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a277c: 0x10a277c: sll   zero, zero, 0
-// 0x010a2780: 0x10a2780: beq   v0, zero, 0x10a279c lui   a3, 0x10000
+// 0x010a2dc4: 0x10a2dc4: sll   zero, zero, 0
+// 0x010a2dc8: 0x10a2dc8: beq   v0, zero, 0x10a2de4 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brfalse L_10a279c
+	brfalse L_10a2de4
 // --- basic block ---
-// 0x010a2788: 0x10a2788: lw    a0, 32(sp)
+// 0x010a2dd0: 0x10a2dd0: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5096,7 +5096,7 @@ L_10a2778:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a278c: 0x10a278c: lw    a2, 60(sp)
+// 0x010a2dd4: 0x10a2dd4: lw    a2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5105,12 +5105,12 @@ L_10a2778:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a2790: 0x10a2790: addiu a3, a3, 18500
+// 0x010a2dd8: 0x10a2dd8: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x010a2794: 0x10a2794: jalr  v0 addiu a1, zero, 1
+// 0x010a2ddc: 0x10a2ddc: jalr  v0 addiu a1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.2
@@ -5124,12 +5124,12 @@ L_10a2778:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a279c:
-// 0x010a279c: 0x10a279c: addu  a0, s2, zero
+L_10a2de4:
+// 0x010a2de4: 0x10a2de4: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-L_10a27a0:
-// 0x010a27a0: 0x10a27a0: jal   0x1000930 sll   zero, zero, 0
+L_10a2de8:
+// 0x010a2de8: 0x10a2de8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5140,7 +5140,7 @@ L_10a27a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a27a8: 0x10a27a8: jal   0x1000930 addu  a0, s3, zero
+// 0x010a2df0: 0x10a2df0: jal   0x1000930 addu  a0, s3, zero
 	ldloc 16
 	stloc.1
 	ldloc.0
@@ -5153,15 +5153,15 @@ L_10a27a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a27b0: 0x10a27b0: lui   v0, 0x80000
+// 0x010a2df8: 0x10a2df8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a27b4: 0x10a27b4: jal   0x10a2368 sw    zero, 27452(v0)
+// 0x010a2dfc: 0x10a2dfc: jal   0x10a29b0 sw    zero, 27916(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6863
+	ldc.i4 6979
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5170,16 +5170,16 @@ L_10a27a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_download_start_10a2368(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_download_start_10a29b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a27bc: 0x10a27bc: j	 0x10a2870 sll   zero, zero, 0
-	br L_10a2870
+// 0x010a2e04: 0x10a2e04: j	 0x10a2eb8 sll   zero, zero, 0
+	br L_10a2eb8
 // --- basic block ---
-L_10a27c4:
-// 0x010a27c4: 0x10a27c4: jal   0x1000910 addiu a0, zero, 44
+L_10a2e0c:
+// 0x010a2e0c: 0x10a2e0c: jal   0x1000910 addiu a0, zero, 44
 	ldc.i4.s 44
 	stloc.1
 	ldloc.0
@@ -5192,7 +5192,7 @@ L_10a27c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a27cc: 0x10a27cc: lw    t1, 32(sp)
+// 0x010a2e14: 0x10a2e14: lw    t1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5201,7 +5201,7 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010a27d0: 0x10a27d0: lw    v1, 44(sp)
+// 0x010a2e18: 0x10a2e18: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5210,14 +5210,14 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a27d4: 0x10a27d4: sw    s3, 0(v0)
+// 0x010a2e1c: 0x10a2e1c: sw    s3, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 16
 	stelem.i4
-// 0x010a27d8: 0x10a27d8: lw    t2, 36(sp)
+// 0x010a2e20: 0x10a2e20: lw    t2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5226,7 +5226,7 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a27dc: 0x10a27dc: lw    t0, 40(sp)
+// 0x010a2e24: 0x10a2e24: lw    t0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5235,7 +5235,7 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010a27e0: 0x10a27e0: sw    t2, 16(v0)
+// 0x010a2e28: 0x10a2e28: sw    t2, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5244,7 +5244,7 @@ L_10a27c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a27e4: 0x10a27e4: lw    t2, 56(sp)
+// 0x010a2e2c: 0x10a2e2c: lw    t2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5253,10 +5253,10 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a27e8: 0x10a27e8: lui   a1, 0x20000
+// 0x010a2e30: 0x10a2e30: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a27ec: 0x10a27ec: sw    t2, 36(v0)
+// 0x010a2e34: 0x10a2e34: sw    t2, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5265,7 +5265,7 @@ L_10a27c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a27f0: 0x10a27f0: lw    t2, 48(sp)
+// 0x010a2e38: 0x10a2e38: lw    t2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5274,10 +5274,10 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a27f4: 0x10a27f4: lui   a3, 0x20000
+// 0x010a2e3c: 0x10a2e3c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a27f8: 0x10a27f8: sw    t2, 28(v0)
+// 0x010a2e40: 0x10a2e40: sw    t2, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5286,7 +5286,7 @@ L_10a27c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a27fc: 0x10a27fc: lw    t2, 52(sp)
+// 0x010a2e44: 0x10a2e44: lw    t2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5295,12 +5295,12 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a2800: 0x10a2800: addiu a1, a1, 100
+// 0x010a2e48: 0x10a2e48: addiu a1, a1, 564
 	ldloc.2
-	ldc.i4.s 100
+	ldc.i4 564
 	add
 	stloc.2
-// 0x010a2804: 0x10a2804: sw    t2, 32(v0)
+// 0x010a2e4c: 0x10a2e4c: sw    t2, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5309,7 +5309,7 @@ L_10a27c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a2808: 0x10a2808: lw    t2, 60(sp)
+// 0x010a2e50: 0x10a2e50: lw    t2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5318,12 +5318,12 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a280c: 0x10a280c: addiu a3, a3, 228
+// 0x010a2e54: 0x10a2e54: addiu a3, a3, 692
 	ldloc 4
-	ldc.i4 228
+	ldc.i4 692
 	add
 	stloc 4
-// 0x010a2810: 0x10a2810: sw    t2, 40(v0)
+// 0x010a2e58: 0x10a2e58: sw    t2, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5332,10 +5332,10 @@ L_10a27c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a2814: 0x10a2814: addiu a0, zero, 1
+// 0x010a2e5c: 0x10a2e5c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a2818: 0x10a2818: sw    t0, 16(sp)
+// 0x010a2e60: 0x10a2e60: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5344,7 +5344,7 @@ L_10a27c4:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010a281c: 0x10a281c: sw    t1, 20(sp)
+// 0x010a2e64: 0x10a2e64: sw    t1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5353,7 +5353,7 @@ L_10a27c4:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010a2820: 0x10a2820: sw    v1, 24(sp)
+// 0x010a2e68: 0x10a2e68: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5362,10 +5362,10 @@ L_10a27c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a2824: 0x10a2824: addiu a2, zero, 531
+// 0x010a2e6c: 0x10a2e6c: addiu a2, zero, 531
 	ldc.i4 531
 	stloc.3
-// 0x010a2828: 0x10a2828: sw    t1, 12(v0)
+// 0x010a2e70: 0x10a2e70: sw    t1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5374,7 +5374,7 @@ L_10a27c4:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010a282c: 0x10a282c: sw    t0, 20(v0)
+// 0x010a2e74: 0x10a2e74: sw    t0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5383,7 +5383,7 @@ L_10a27c4:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010a2830: 0x10a2830: sw    v1, 24(v0)
+// 0x010a2e78: 0x10a2e78: sw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5392,7 +5392,7 @@ L_10a27c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a2834: 0x10a2834: sw    zero, 4(v0)
+// 0x010a2e7c: 0x10a2e7c: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5401,7 +5401,7 @@ L_10a27c4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a2838: 0x10a2838: sw    v0, 64(sp)
+// 0x010a2e80: 0x10a2e80: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5410,7 +5410,7 @@ L_10a27c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a283c: 0x10a283c: jal   0x100449c sw    s0, 28(sp)
+// 0x010a2e84: 0x10a2e84: jal   0x100449c sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5429,7 +5429,7 @@ L_10a27c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2844: 0x10a2844: lw    v0, 64(sp)
+// 0x010a2e8c: 0x10a2e8c: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5438,7 +5438,7 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2848: 0x10a2848: lw    a3, 52(sp)
+// 0x010a2e90: 0x10a2e90: lw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5447,18 +5447,18 @@ L_10a27c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a284c: 0x10a284c: lui   a0, 0x0
+// 0x010a2e94: 0x10a2e94: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2850: 0x10a2850: addu  a1, v0, zero
+// 0x010a2e98: 0x10a2e98: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2854: 0x10a2854: addiu a0, a0, 17756
+// 0x010a2e9c: 0x10a2e9c: addiu a0, a0, 17756
 	ldloc.1
 	ldc.i4 17756
 	add
 	stloc.1
-// 0x010a2858: 0x10a2858: jal   0x1045dd0 addu  a2, s0, zero
+// 0x010a2ea0: 0x10a2ea0: jal   0x1045de0 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -5466,12 +5466,12 @@ L_10a27c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_http_async_copy_1045dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_http_async_copy_1045de0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2860: 0x10a2860: jal   0x1000930 addu  a0, s0, zero
+// 0x010a2ea8: 0x10a2ea8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5484,7 +5484,7 @@ L_10a27c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2868: 0x10a2868: jal   0x1000930 addu  a0, s2, zero
+// 0x010a2eb0: 0x10a2eb0: jal   0x1000930 addu  a0, s2, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -5497,9 +5497,9 @@ L_10a27c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a2870:
-// 0x010a2870: 0x10a2870: lw    ra, 108(sp)
-// 0x010a2874: 0x10a2874: lw    s8, 104(sp)
+L_10a2eb8:
+// 0x010a2eb8: 0x10a2eb8: lw    ra, 108(sp)
+// 0x010a2ebc: 0x10a2ebc: lw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5508,7 +5508,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a2878: 0x10a2878: lw    s7, 100(sp)
+// 0x010a2ec0: 0x10a2ec0: lw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5517,7 +5517,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a287c: 0x10a287c: lw    s6, 96(sp)
+// 0x010a2ec4: 0x10a2ec4: lw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5526,7 +5526,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a2880: 0x10a2880: lw    s5, 92(sp)
+// 0x010a2ec8: 0x10a2ec8: lw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5535,7 +5535,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a2884: 0x10a2884: lw    s4, 88(sp)
+// 0x010a2ecc: 0x10a2ecc: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5544,7 +5544,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a2888: 0x10a2888: lw    s3, 84(sp)
+// 0x010a2ed0: 0x10a2ed0: lw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5553,7 +5553,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a288c: 0x10a288c: lw    s2, 80(sp)
+// 0x010a2ed4: 0x10a2ed4: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5562,7 +5562,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a2890: 0x10a2890: lw    s1, 76(sp)
+// 0x010a2ed8: 0x10a2ed8: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5571,7 +5571,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a2894: 0x10a2894: lw    s0, 72(sp)
+// 0x010a2edc: 0x10a2edc: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5580,7 +5580,7 @@ L_10a2870:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a2898: 0x10a2898: jr    ra addiu sp, sp, 112
+// 0x010a2ee0: 0x10a2ee0: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -5592,7 +5592,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 download_done_callback_10a28a0(int32,int32,int32,int32,int32)
+.method public static int32 download_done_callback_10a2ee8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 ra)
@@ -5642,13 +5642,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a28a0:
-// 0x010a28a0: 0x10a28a0: addiu sp, sp, -56
+L_10a2ee8:
+// 0x010a2ee8: 0x10a2ee8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010a28a4: 0x10a28a4: lw    v0, 8(a0)
+// 0x010a2eec: 0x10a2eec: lw    v0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ L_10a28a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a28a8: 0x10a28a8: sw    s4, 48(sp)
+// 0x010a2ef0: 0x10a2ef0: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5666,7 +5666,7 @@ L_10a28a0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a28ac: 0x10a28ac: sw    s1, 36(sp)
+// 0x010a2ef4: 0x10a2ef4: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5675,20 +5675,20 @@ L_10a28a0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a28b0: 0x10a28b0: lui   s4, 0x20000
+// 0x010a2ef8: 0x10a2ef8: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x010a28b4: 0x10a28b4: lw    s1, 0(a0)
+// 0x010a2efc: 0x10a2efc: lw    s1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010a28b8: 0x10a28b8: lui   a3, 0x20000
+// 0x010a2f00: 0x10a2f00: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a28bc: 0x10a28bc: sw    s3, 44(sp)
+// 0x010a2f04: 0x10a2f04: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5697,7 +5697,7 @@ L_10a28a0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a28c0: 0x10a28c0: sw    s0, 32(sp)
+// 0x010a2f08: 0x10a2f08: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5706,30 +5706,30 @@ L_10a28a0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a28c4: 0x10a28c4: addu  s3, a1, zero
+// 0x010a2f0c: 0x10a2f0c: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010a28c8: 0x10a28c8: addiu a3, a3, 284
+// 0x010a2f10: 0x10a2f10: addiu a3, a3, 748
 	ldloc 4
-	ldc.i4 284
+	ldc.i4 748
 	add
 	stloc 4
-// 0x010a28cc: 0x10a28cc: addiu a1, s4, 100
+// 0x010a2f14: 0x10a2f14: addiu a1, s4, 564
 	ldloc 12
-	ldc.i4.s 100
+	ldc.i4 564
 	add
 	stloc.2
-// 0x010a28d0: 0x10a28d0: addiu a2, zero, 652
+// 0x010a2f18: 0x10a2f18: addiu a2, zero, 652
 	ldc.i4 652
 	stloc.3
-// 0x010a28d4: 0x10a28d4: addu  s0, a0, zero
+// 0x010a2f1c: 0x10a2f1c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010a28d8: 0x10a28d8: addiu a0, zero, 4
+// 0x010a2f20: 0x10a2f20: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a28dc: 0x10a28dc: sw    ra, 52(sp)
-// 0x010a28e0: 0x10a28e0: sw    s2, 40(sp)
+// 0x010a2f24: 0x10a2f24: sw    ra, 52(sp)
+// 0x010a2f28: 0x10a2f28: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5738,7 +5738,7 @@ L_10a28a0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a28e4: 0x10a28e4: sw    v0, 20(sp)
+// 0x010a2f2c: 0x10a2f2c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5747,7 +5747,7 @@ L_10a28a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a28e8: 0x10a28e8: sw    s1, 16(sp)
+// 0x010a2f30: 0x10a2f30: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5756,7 +5756,7 @@ L_10a28a0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a28ec: 0x10a28ec: jal   0x100449c sw    s3, 24(sp)
+// 0x010a2f34: 0x10a2f34: jal   0x100449c sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5775,10 +5775,10 @@ L_10a28a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a28f4: 0x10a28f4: addu  a1, s1, zero
+// 0x010a2f3c: 0x10a2f3c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010a28f8: 0x10a28f8: jal   0x104cc64 addu  a0, zero, zero
+// 0x010a2f40: 0x10a2f40: jal   0x104cc74 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5786,23 +5786,23 @@ L_10a28a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_parent_104cc64(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_parent_104cc74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2900: 0x10a2900: lui   a1, 0x10000
+// 0x010a2f48: 0x10a2f48: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a2904: 0x10a2904: addu  a0, v0, zero
+// 0x010a2f4c: 0x10a2f4c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a2908: 0x10a2908: addiu a1, a1, 18500
+// 0x010a2f50: 0x10a2f50: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a290c: 0x10a290c: jal   0x104d690 addu  s2, v0, zero
+// 0x010a2f54: 0x10a2f54: jal   0x104d6a0 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -5810,34 +5810,34 @@ L_10a28a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2914: 0x10a2914: bne   v0, zero, 0x10a293c lui   a3, 0x20000
+// 0x010a2f5c: 0x10a2f5c: bne   v0, zero, 0x10a2f84 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10a293c
+	brtrue L_10a2f84
 // --- basic block ---
-// 0x010a291c: 0x10a291c: addiu a0, zero, 1
+// 0x010a2f64: 0x10a2f64: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a2920: 0x10a2920: addiu a1, s4, 100
+// 0x010a2f68: 0x10a2f68: addiu a1, s4, 564
 	ldloc 12
-	ldc.i4.s 100
+	ldc.i4 564
 	add
 	stloc.2
-// 0x010a2924: 0x10a2924: addiu a3, a3, 356
+// 0x010a2f6c: 0x10a2f6c: addiu a3, a3, 820
 	ldloc 4
-	ldc.i4 356
+	ldc.i4 820
 	add
 	stloc 4
-// 0x010a2928: 0x10a2928: addiu a2, zero, 655
+// 0x010a2f70: 0x10a2f70: addiu a2, zero, 655
 	ldc.i4 655
 	stloc.3
-// 0x010a292c: 0x10a292c: jal   0x100449c sw    s2, 16(sp)
+// 0x010a2f74: 0x10a2f74: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5856,7 +5856,7 @@ L_10a28a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2934: 0x10a2934: jal   0x104c6f4 addu  a0, s2, zero
+// 0x010a2f7c: 0x10a2f7c: jal   0x104c704 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5864,13 +5864,13 @@ L_10a28a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_create_104c6f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_create_104c704(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a293c:
-// 0x010a293c: 0x10a293c: jal   0x104c670 addu  a0, s2, zero
+L_10a2f84:
+// 0x010a2f84: 0x10a2f84: jal   0x104c680 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5878,18 +5878,18 @@ L_10a293c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2944: 0x10a2944: lui   a1, 0x0
+// 0x010a2f8c: 0x10a2f8c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2948: 0x10a2948: addu  a0, s1, zero
+// 0x010a2f90: 0x10a2f90: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010a294c: 0x10a294c: jal   0x104dd10 addiu a1, a1, 28940
+// 0x010a2f94: 0x10a2f94: jal   0x104dd20 addiu a1, a1, 28940
 	ldloc.2
 	ldc.i4 28940
 	add
@@ -5899,18 +5899,18 @@ L_10a293c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2954: 0x10a2954: beq   v0, zero, 0x10a299c addu  s2, v0, zero
+// 0x010a2f9c: 0x10a2f9c: beq   v0, zero, 0x10a2fe4 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_10a299c
+	brfalse L_10a2fe4
 // --- basic block ---
-// 0x010a295c: 0x10a295c: lw    a1, 4(s0)
+// 0x010a2fa4: 0x10a2fa4: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5919,7 +5919,7 @@ L_10a293c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a2960: 0x10a2960: lw    a2, 8(s0)
+// 0x010a2fa8: 0x10a2fa8: lw    a2, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5928,7 +5928,7 @@ L_10a293c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a2964: 0x10a2964: jal   0x104d46c addu  a0, v0, zero
+// 0x010a2fac: 0x10a2fac: jal   0x104d47c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5936,12 +5936,12 @@ L_10a293c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a296c: 0x10a296c: jal   0x104d44c addu  a0, s2, zero
+// 0x010a2fb4: 0x10a2fb4: jal   0x104d45c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5949,12 +5949,12 @@ L_10a293c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2974: 0x10a2974: lw    v0, 36(s0)
+// 0x010a2fbc: 0x10a2fbc: lw    v0, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5963,14 +5963,14 @@ L_10a293c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2978: 0x10a2978: sll   zero, zero, 0
-// 0x010a297c: 0x10a297c: beq   v0, zero, 0x10a29bc addu  a3, s3, zero
+// 0x010a2fc0: 0x10a2fc0: sll   zero, zero, 0
+// 0x010a2fc4: 0x10a2fc4: beq   v0, zero, 0x10a3004 addu  a3, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc 4
-	brfalse L_10a29bc
+	brfalse L_10a3004
 // --- basic block ---
-// 0x010a2984: 0x10a2984: lw    a0, 12(s0)
+// 0x010a2fcc: 0x10a2fcc: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5979,7 +5979,7 @@ L_10a293c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2988: 0x10a2988: lw    a2, 40(s0)
+// 0x010a2fd0: 0x10a2fd0: lw    a2, 40(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5988,7 +5988,7 @@ L_10a293c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a298c: 0x10a298c: jalr  v0 addiu a1, zero, 1
+// 0x010a2fd4: 0x10a2fd4: jalr  v0 addiu a1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.2
@@ -6002,35 +6002,35 @@ L_10a293c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2994: 0x10a2994: j	 0x10a29c0 lui   v0, 0x80000
+// 0x010a2fdc: 0x10a2fdc: j	 0x10a3008 lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-	br L_10a29c0
+	br L_10a3008
 // --- basic block ---
-L_10a299c:
-// 0x010a299c: 0x10a299c: lui   a1, 0x20000
+L_10a2fe4:
+// 0x010a2fe4: 0x10a2fe4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a29a0: 0x10a29a0: lui   a3, 0x0
+// 0x010a2fe8: 0x10a2fe8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010a29a4: 0x10a29a4: addiu a1, a1, 100
+// 0x010a2fec: 0x10a2fec: addiu a1, a1, 564
 	ldloc.2
-	ldc.i4.s 100
+	ldc.i4 564
 	add
 	stloc.2
-// 0x010a29a8: 0x10a29a8: addiu a3, a3, 27060
+// 0x010a2ff0: 0x10a2ff0: addiu a3, a3, 27060
 	ldloc 4
 	ldc.i4 27060
 	add
 	stloc 4
-// 0x010a29ac: 0x10a29ac: addiu a0, zero, 4
+// 0x010a2ff4: 0x10a2ff4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a29b0: 0x10a29b0: addiu a2, zero, 671
+// 0x010a2ff8: 0x10a2ff8: addiu a2, zero, 671
 	ldc.i4 671
 	stloc.3
-// 0x010a29b4: 0x10a29b4: jal   0x100449c sw    s1, 16(sp)
+// 0x010a2ffc: 0x10a2ffc: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6049,17 +6049,17 @@ L_10a299c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a29bc:
-// 0x010a29bc: 0x10a29bc: lui   v0, 0x80000
+L_10a3004:
+// 0x010a3004: 0x10a3004: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_10a29c0:
-// 0x010a29c0: 0x10a29c0: jal   0x10a2368 sw    zero, 27452(v0)
+L_10a3008:
+// 0x010a3008: 0x10a3008: jal   0x10a29b0 sw    zero, 27916(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6863
+	ldc.i4 6979
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6068,12 +6068,12 @@ L_10a29c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_download_start_10a2368(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_download_start_10a29b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a29c8: 0x10a29c8: lw    a0, 16(s0)
+// 0x010a3010: 0x10a3010: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6082,7 +6082,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a29cc: 0x10a29cc: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3014: 0x10a3014: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6093,7 +6093,7 @@ L_10a29c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a29d4: 0x10a29d4: lw    a0, 12(s0)
+// 0x010a301c: 0x10a301c: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6102,7 +6102,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a29d8: 0x10a29d8: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3020: 0x10a3020: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6113,7 +6113,7 @@ L_10a29c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a29e0: 0x10a29e0: lw    a0, 24(s0)
+// 0x010a3028: 0x10a3028: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6122,7 +6122,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a29e4: 0x10a29e4: jal   0x1000930 sll   zero, zero, 0
+// 0x010a302c: 0x10a302c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6133,7 +6133,7 @@ L_10a29c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a29ec: 0x10a29ec: lw    a0, 4(s0)
+// 0x010a3034: 0x10a3034: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6142,7 +6142,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a29f0: 0x10a29f0: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3038: 0x10a3038: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6153,14 +6153,14 @@ L_10a29c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a29f8: 0x10a29f8: lw    a0, 0(s0)
+// 0x010a3040: 0x10a3040: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a29fc: 0x10a29fc: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3044: 0x10a3044: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6171,7 +6171,7 @@ L_10a29c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2a04: 0x10a2a04: jal   0x1000930 addu  a0, s0, zero
+// 0x010a304c: 0x10a304c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6184,8 +6184,8 @@ L_10a29c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a2a0c: 0x10a2a0c: lw    ra, 52(sp)
-// 0x010a2a10: 0x10a2a10: lw    s4, 48(sp)
+// 0x010a3054: 0x10a3054: lw    ra, 52(sp)
+// 0x010a3058: 0x10a3058: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6194,7 +6194,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a2a14: 0x10a2a14: lw    s3, 44(sp)
+// 0x010a305c: 0x10a305c: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6203,7 +6203,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a2a18: 0x10a2a18: lw    s2, 40(sp)
+// 0x010a3060: 0x10a3060: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6212,7 +6212,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a2a1c: 0x10a2a1c: lw    s1, 36(sp)
+// 0x010a3064: 0x10a3064: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6221,7 +6221,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a2a20: 0x10a2a20: lw    s0, 32(sp)
+// 0x010a3068: 0x10a3068: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6230,7 +6230,7 @@ L_10a29c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a2a24: 0x10a2a24: jr    ra addiu sp, sp, 56
+// 0x010a306c: 0x10a306c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6242,7 +6242,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 download_error_callback_10a2a2c(int32,int32,int32,int32,int32)
+.method public static int32 download_error_callback_10a3074(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -6283,18 +6283,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a2a2c:
-// 0x010a2a2c: 0x10a2a2c: addiu sp, sp, -1072
+L_10a3074:
+// 0x010a3074: 0x10a3074: addiu sp, sp, -1072
 	ldloc.0
 	ldc.i4 -1072
 	add
 	stloc.0
-// 0x010a2a30: 0x10a2a30: addiu v0, sp, 1084
+// 0x010a3078: 0x10a3078: addiu v0, sp, 1084
 	ldloc.0
 	ldc.i4 1084
 	add
 	stloc 6
-// 0x010a2a34: 0x10a2a34: sw    s1, 1064(sp)
+// 0x010a307c: 0x10a307c: sw    s1, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6303,12 +6303,12 @@ L_10a2a2c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a2a38: 0x10a2a38: addiu s1, sp, 28
+// 0x010a3080: 0x10a3080: addiu s1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x010a2a3c: 0x10a2a3c: sw    s0, 1060(sp)
+// 0x010a3084: 0x10a3084: sw    s0, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6317,7 +6317,7 @@ L_10a2a2c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a2a40: 0x10a2a40: sw    a3, 1084(sp)
+// 0x010a3088: 0x10a3088: sw    a3, 1084(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6326,20 +6326,20 @@ L_10a2a2c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010a2a44: 0x10a2a44: addu  s0, a0, zero
+// 0x010a308c: 0x10a308c: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010a2a48: 0x10a2a48: addu  a3, v0, zero
+// 0x010a3090: 0x10a3090: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x010a2a4c: 0x10a2a4c: addu  a0, s1, zero
+// 0x010a3094: 0x10a3094: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a2a50: 0x10a2a50: addiu a1, zero, 1024
+// 0x010a3098: 0x10a3098: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x010a2a54: 0x10a2a54: sw    ra, 1068(sp)
-// 0x010a2a58: 0x10a2a58: jal   0x10c0a70 sw    v0, 24(sp)
+// 0x010a309c: 0x10a309c: sw    ra, 1068(sp)
+// 0x010a30a0: 0x10a30a0: jal   0x10c10b0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6353,41 +6353,41 @@ L_10a2a2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2a60: 0x10a2a60: lw    v0, 0(s0)
+// 0x010a30a8: 0x10a30a8: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010a2a64: 0x10a2a64: lui   a1, 0x20000
+// 0x010a30ac: 0x10a30ac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a2a68: 0x10a2a68: lui   a3, 0x20000
+// 0x010a30b0: 0x10a30b0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a2a6c: 0x10a2a6c: addiu a1, a1, 100
+// 0x010a30b4: 0x10a30b4: addiu a1, a1, 564
 	ldloc.2
-	ldc.i4.s 100
+	ldc.i4 564
 	add
 	stloc.2
-// 0x010a2a70: 0x10a2a70: addiu a3, a3, 404
+// 0x010a30b8: 0x10a30b8: addiu a3, a3, 868
 	ldloc 4
-	ldc.i4 404
+	ldc.i4 868
 	add
 	stloc 4
-// 0x010a2a74: 0x10a2a74: addiu a0, zero, 1
+// 0x010a30bc: 0x10a30bc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a2a78: 0x10a2a78: addiu a2, zero, 626
+// 0x010a30c0: 0x10a30c0: addiu a2, zero, 626
 	ldc.i4 626
 	stloc.3
-// 0x010a2a7c: 0x10a2a7c: sw    v0, 16(sp)
+// 0x010a30c4: 0x10a30c4: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6396,7 +6396,7 @@ L_10a2a2c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a2a80: 0x10a2a80: jal   0x100449c sw    s1, 20(sp)
+// 0x010a30c8: 0x10a30c8: jal   0x100449c sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6415,7 +6415,7 @@ L_10a2a2c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2a88: 0x10a2a88: lw    v0, 36(s0)
+// 0x010a30d0: 0x10a30d0: lw    v0, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6424,14 +6424,14 @@ L_10a2a2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a2a8c: 0x10a2a8c: sll   zero, zero, 0
-// 0x010a2a90: 0x10a2a90: beq   v0, zero, 0x10a2aac lui   a3, 0x10000
+// 0x010a30d4: 0x10a30d4: sll   zero, zero, 0
+// 0x010a30d8: 0x10a30d8: beq   v0, zero, 0x10a30f4 lui   a3, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 4
-	brfalse L_10a2aac
+	brfalse L_10a30f4
 // --- basic block ---
-// 0x010a2a98: 0x10a2a98: lw    a0, 12(s0)
+// 0x010a30e0: 0x10a30e0: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6440,7 +6440,7 @@ L_10a2a2c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2a9c: 0x10a2a9c: lw    a2, 40(s0)
+// 0x010a30e4: 0x10a30e4: lw    a2, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6449,12 +6449,12 @@ L_10a2a2c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a2aa0: 0x10a2aa0: addiu a3, a3, 18500
+// 0x010a30e8: 0x10a30e8: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x010a2aa4: 0x10a2aa4: jalr  v0 addu  a1, zero, zero
+// 0x010a30ec: 0x10a30ec: jalr  v0 addu  a1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
@@ -6468,8 +6468,8 @@ L_10a2a2c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10a2aac:
-// 0x010a2aac: 0x10a2aac: lw    a0, 4(s0)
+L_10a30f4:
+// 0x010a30f4: 0x10a30f4: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6478,12 +6478,12 @@ L_10a2aac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2ab0: 0x10a2ab0: sll   zero, zero, 0
-// 0x010a2ab4: 0x10a2ab4: beq   a0, zero, 0x10a2ac8 sll   zero, zero, 0
+// 0x010a30f8: 0x10a30f8: sll   zero, zero, 0
+// 0x010a30fc: 0x10a30fc: beq   a0, zero, 0x10a3110 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10a2ac8
+	brfalse L_10a3110
 // --- basic block ---
-// 0x010a2abc: 0x10a2abc: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3104: 0x10a3104: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6494,7 +6494,7 @@ L_10a2aac:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2ac4: 0x10a2ac4: sw    zero, 4(s0)
+// 0x010a310c: 0x10a310c: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6503,8 +6503,8 @@ L_10a2aac:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10a2ac8:
-// 0x010a2ac8: 0x10a2ac8: lw    a0, 16(s0)
+L_10a3110:
+// 0x010a3110: 0x10a3110: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6513,7 +6513,7 @@ L_10a2ac8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2acc: 0x10a2acc: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3114: 0x10a3114: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6524,7 +6524,7 @@ L_10a2ac8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2ad4: 0x10a2ad4: lw    a0, 12(s0)
+// 0x010a311c: 0x10a311c: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6533,7 +6533,7 @@ L_10a2ac8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2ad8: 0x10a2ad8: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3120: 0x10a3120: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6544,7 +6544,7 @@ L_10a2ac8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2ae0: 0x10a2ae0: lw    a0, 24(s0)
+// 0x010a3128: 0x10a3128: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6553,7 +6553,7 @@ L_10a2ac8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a2ae4: 0x10a2ae4: jal   0x1000930 sll   zero, zero, 0
+// 0x010a312c: 0x10a312c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6564,14 +6564,14 @@ L_10a2ac8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2aec: 0x10a2aec: lw    a0, 0(s0)
+// 0x010a3134: 0x10a3134: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a2af0: 0x10a2af0: jal   0x1000930 sll   zero, zero, 0
+// 0x010a3138: 0x10a3138: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6582,7 +6582,7 @@ L_10a2ac8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2af8: 0x10a2af8: jal   0x1000930 addu  a0, s0, zero
+// 0x010a3140: 0x10a3140: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6595,15 +6595,15 @@ L_10a2ac8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2b00: 0x10a2b00: lui   v0, 0x80000
+// 0x010a3148: 0x10a3148: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a2b04: 0x10a2b04: jal   0x10a2368 sw    zero, 27452(v0)
+// 0x010a314c: 0x10a314c: jal   0x10a29b0 sw    zero, 27916(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6863
+	ldc.i4 6979
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6612,13 +6612,13 @@ L_10a2ac8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_download_start_10a2368(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_download_start_10a29b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a2b0c: 0x10a2b0c: lw    ra, 1068(sp)
-// 0x010a2b10: 0x10a2b10: lw    s1, 1064(sp)
+// 0x010a3154: 0x10a3154: lw    ra, 1068(sp)
+// 0x010a3158: 0x10a3158: lw    s1, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6627,7 +6627,7 @@ L_10a2ac8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a2b14: 0x10a2b14: lw    s0, 1060(sp)
+// 0x010a315c: 0x10a315c: lw    s0, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6636,7 +6636,7 @@ L_10a2ac8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a2b18: 0x10a2b18: jr    ra addiu sp, sp, 1072
+// 0x010a3160: 0x10a3160: jr    ra addiu sp, sp, 1072
 	ldloc.0
 	ldc.i4 1072
 	add
@@ -6648,7 +6648,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_res_download_init_10a2b20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_res_download_init_10a3168(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32 v1,int32 s1,int32[] mem,int32 ra)
@@ -6689,12 +6689,12 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2b20: 0x10a2b20: addiu sp, sp, -32
+// 0x010a3168: 0x10a3168: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a2b24: 0x10a2b24: sw    s0, 20(sp)
+// 0x010a316c: 0x10a316c: sw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6703,35 +6703,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a2b28: 0x10a2b28: lui   a1, 0x0
+// 0x010a3170: 0x10a3170: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2b2c: 0x10a2b2c: lui   s0, 0x10000
+// 0x010a3174: 0x10a3174: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a2b30: 0x10a2b30: lui   a2, 0x20000
+// 0x010a3178: 0x10a3178: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a2b34: 0x10a2b34: addiu a0, s0, 12560
+// 0x010a317c: 0x10a317c: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2b38: 0x10a2b38: addiu a1, a1, 17772
+// 0x010a3180: 0x10a3180: addiu a1, a1, 17772
 	ldloc.2
 	ldc.i4 17772
 	add
 	stloc.2
-// 0x010a2b3c: 0x10a2b3c: addiu a2, a2, 440
+// 0x010a3184: 0x10a3184: addiu a2, a2, 904
 	ldloc.3
-	ldc.i4 440
+	ldc.i4 904
 	add
 	stloc.3
-// 0x010a2b40: 0x10a2b40: addu  a3, zero, zero
+// 0x010a3188: 0x10a3188: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a2b44: 0x10a2b44: sw    ra, 28(sp)
-// 0x010a2b48: 0x10a2b48: jal   0x100edb0 sw    s1, 24(sp)
+// 0x010a318c: 0x10a318c: sw    ra, 28(sp)
+// 0x010a3190: 0x10a3190: jal   0x100edc0 sw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6745,33 +6745,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2b50: 0x10a2b50: lui   a1, 0x0
+// 0x010a3198: 0x10a3198: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2b54: 0x10a2b54: lui   a2, 0x20000
+// 0x010a319c: 0x10a319c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a2b58: 0x10a2b58: addiu a0, s0, 12560
+// 0x010a31a0: 0x10a31a0: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2b5c: 0x10a2b5c: addiu a1, a1, 17836
+// 0x010a31a4: 0x10a31a4: addiu a1, a1, 17836
 	ldloc.2
 	ldc.i4 17836
 	add
 	stloc.2
-// 0x010a2b60: 0x10a2b60: addiu a2, a2, 496
+// 0x010a31a8: 0x10a31a8: addiu a2, a2, 960
 	ldloc.3
-	ldc.i4 496
+	ldc.i4 960
 	add
 	stloc.3
-// 0x010a2b64: 0x10a2b64: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a31ac: 0x10a31ac: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6779,33 +6779,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2b6c: 0x10a2b6c: lui   a1, 0x0
+// 0x010a31b4: 0x10a31b4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2b70: 0x10a2b70: lui   a2, 0x20000
+// 0x010a31b8: 0x10a31b8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a2b74: 0x10a2b74: addiu a0, s0, 12560
+// 0x010a31bc: 0x10a31bc: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2b78: 0x10a2b78: addiu a1, a1, 17900
+// 0x010a31c0: 0x10a31c0: addiu a1, a1, 17900
 	ldloc.2
 	ldc.i4 17900
 	add
 	stloc.2
-// 0x010a2b7c: 0x10a2b7c: addiu a2, a2, 552
+// 0x010a31c4: 0x10a31c4: addiu a2, a2, 1016
 	ldloc.3
-	ldc.i4 552
+	ldc.i4 1016
 	add
 	stloc.3
-// 0x010a2b80: 0x10a2b80: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a31c8: 0x10a31c8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6813,33 +6813,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2b88: 0x10a2b88: lui   a1, 0x0
+// 0x010a31d0: 0x10a31d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2b8c: 0x10a2b8c: lui   a2, 0x20000
+// 0x010a31d4: 0x10a31d4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a2b90: 0x10a2b90: addiu a0, s0, 12560
+// 0x010a31d8: 0x10a31d8: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2b94: 0x10a2b94: addiu a1, a1, 17868
+// 0x010a31dc: 0x10a31dc: addiu a1, a1, 17868
 	ldloc.2
 	ldc.i4 17868
 	add
 	stloc.2
-// 0x010a2b98: 0x10a2b98: addiu a2, a2, 608
+// 0x010a31e0: 0x10a31e0: addiu a2, a2, 1072
 	ldloc.3
-	ldc.i4 608
+	ldc.i4 1072
 	add
 	stloc.3
-// 0x010a2b9c: 0x10a2b9c: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a31e4: 0x10a31e4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6847,33 +6847,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2ba4: 0x10a2ba4: lui   s1, 0x10000
+// 0x010a31ec: 0x10a31ec: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010a2ba8: 0x10a2ba8: lui   a1, 0x0
+// 0x010a31f0: 0x10a31f0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2bac: 0x10a2bac: addiu a0, s0, 12560
+// 0x010a31f4: 0x10a31f4: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2bb0: 0x10a2bb0: addiu a2, s1, 18500
+// 0x010a31f8: 0x10a31f8: addiu a2, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a2bb4: 0x10a2bb4: addiu a1, a1, 17804
+// 0x010a31fc: 0x10a31fc: addiu a1, a1, 17804
 	ldloc.2
 	ldc.i4 17804
 	add
 	stloc.2
-// 0x010a2bb8: 0x10a2bb8: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a3200: 0x10a3200: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6881,30 +6881,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2bc0: 0x10a2bc0: lui   a1, 0x0
+// 0x010a3208: 0x10a3208: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2bc4: 0x10a2bc4: addiu a0, s0, 12560
+// 0x010a320c: 0x10a320c: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2bc8: 0x10a2bc8: addiu a2, s1, 18500
+// 0x010a3210: 0x10a3210: addiu a2, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a2bcc: 0x10a2bcc: addiu a1, a1, 17788
+// 0x010a3214: 0x10a3214: addiu a1, a1, 17788
 	ldloc.2
 	ldc.i4 17788
 	add
 	stloc.2
-// 0x010a2bd0: 0x10a2bd0: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a3218: 0x10a3218: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6912,30 +6912,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2bd8: 0x10a2bd8: lui   a1, 0x0
+// 0x010a3220: 0x10a3220: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2bdc: 0x10a2bdc: addiu a0, s0, 12560
+// 0x010a3224: 0x10a3224: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2be0: 0x10a2be0: addiu a2, s1, 18500
+// 0x010a3228: 0x10a3228: addiu a2, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a2be4: 0x10a2be4: addiu a1, a1, 17820
+// 0x010a322c: 0x10a322c: addiu a1, a1, 17820
 	ldloc.2
 	ldc.i4 17820
 	add
 	stloc.2
-// 0x010a2be8: 0x10a2be8: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a3230: 0x10a3230: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6943,30 +6943,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2bf0: 0x10a2bf0: lui   a1, 0x0
+// 0x010a3238: 0x10a3238: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2bf4: 0x10a2bf4: addiu a0, s0, 12560
+// 0x010a323c: 0x10a323c: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2bf8: 0x10a2bf8: addiu a2, s1, 18500
+// 0x010a3240: 0x10a3240: addiu a2, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a2bfc: 0x10a2bfc: addiu a1, a1, 17852
+// 0x010a3244: 0x10a3244: addiu a1, a1, 17852
 	ldloc.2
 	ldc.i4 17852
 	add
 	stloc.2
-// 0x010a2c00: 0x10a2c00: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a3248: 0x10a3248: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6974,30 +6974,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2c08: 0x10a2c08: lui   a1, 0x0
+// 0x010a3250: 0x10a3250: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2c0c: 0x10a2c0c: addiu a0, s0, 12560
+// 0x010a3254: 0x10a3254: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2c10: 0x10a2c10: addiu a2, s1, 18500
+// 0x010a3258: 0x10a3258: addiu a2, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a2c14: 0x10a2c14: addiu a1, a1, 17916
+// 0x010a325c: 0x10a325c: addiu a1, a1, 17916
 	ldloc.2
 	ldc.i4 17916
 	add
 	stloc.2
-// 0x010a2c18: 0x10a2c18: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a3260: 0x10a3260: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -7005,30 +7005,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2c20: 0x10a2c20: lui   a1, 0x0
+// 0x010a3268: 0x10a3268: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2c24: 0x10a2c24: addiu a0, s0, 12560
+// 0x010a326c: 0x10a326c: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a2c28: 0x10a2c28: addiu a2, s1, 18500
+// 0x010a3270: 0x10a3270: addiu a2, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a2c2c: 0x10a2c2c: addiu a1, a1, 17884
+// 0x010a3274: 0x10a3274: addiu a1, a1, 17884
 	ldloc.2
 	ldc.i4 17884
 	add
 	stloc.2
-// 0x010a2c30: 0x10a2c30: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a3278: 0x10a3278: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -7036,19 +7036,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2c38: 0x10a2c38: lw    ra, 28(sp)
-// 0x010a2c3c: 0x10a2c3c: addiu v1, zero, 1
+// 0x010a3280: 0x10a3280: lw    ra, 28(sp)
+// 0x010a3284: 0x10a3284: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010a2c40: 0x10a2c40: lui   v0, 0x80000
+// 0x010a3288: 0x10a3288: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a2c44: 0x10a2c44: lw    s1, 24(sp)
+// 0x010a328c: 0x10a328c: lw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -7057,7 +7057,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a2c48: 0x10a2c48: lw    s0, 20(sp)
+// 0x010a3290: 0x10a3290: lw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -7066,16 +7066,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2c4c: 0x10a2c4c: sw    v1, 27448(v0)
+// 0x010a3294: 0x10a3294: sw    v1, 27912(v0)
 	ldloc 9
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6862
+	ldc.i4 6978
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a2c50: 0x10a2c50: jr    ra addiu sp, sp, 32
+// 0x010a3298: 0x10a3298: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl122.j b/converted/Cibyl122.j
index ddffa12..db2e7e0 100644
--- a/converted/Cibyl122.j
+++ b/converted/Cibyl122.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl122::.ctor
 
-.method public static int32 roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -100,24 +100,24 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2c58: 0x10a2c58: lui   v0, 0x80000
+// 0x010a32a0: 0x10a32a0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a2c5c: 0x10a2c5c: lw    v0, 27448(v0)
+// 0x010a32a4: 0x10a32a4: lw    v0, 27912(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6862
+	ldc.i4 6978
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a2c60: 0x10a2c60: addiu sp, sp, -88
+// 0x010a32a8: 0x10a32a8: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010a2c64: 0x10a2c64: sw    s7, 80(sp)
+// 0x010a32ac: 0x10a32ac: sw    s7, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -126,7 +126,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a2c68: 0x10a2c68: sw    s6, 76(sp)
+// 0x010a32b0: 0x10a32b0: sw    s6, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -135,7 +135,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a2c6c: 0x10a2c6c: sw    s5, 72(sp)
+// 0x010a32b4: 0x10a32b4: sw    s5, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -144,7 +144,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a2c70: 0x10a2c70: sw    s4, 68(sp)
+// 0x010a32b8: 0x10a32b8: sw    s4, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -153,7 +153,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a2c74: 0x10a2c74: sw    s3, 64(sp)
+// 0x010a32bc: 0x10a32bc: sw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -162,7 +162,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a2c78: 0x10a2c78: sw    s2, 60(sp)
+// 0x010a32c0: 0x10a32c0: sw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -171,7 +171,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a2c7c: 0x10a2c7c: sw    s1, 56(sp)
+// 0x010a32c4: 0x10a32c4: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -180,7 +180,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a2c80: 0x10a2c80: sw    s0, 52(sp)
+// 0x010a32c8: 0x10a32c8: sw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -189,17 +189,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a2c84: 0x10a2c84: sw    ra, 84(sp)
-// 0x010a2c88: 0x10a2c88: addu  s1, a0, zero
+// 0x010a32cc: 0x10a32cc: sw    ra, 84(sp)
+// 0x010a32d0: 0x10a32d0: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010a2c8c: 0x10a2c8c: addu  s0, a1, zero
+// 0x010a32d4: 0x10a32d4: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010a2c90: 0x10a2c90: addu  s2, a2, zero
+// 0x010a32d8: 0x10a32d8: addu  s2, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010a2c94: 0x10a2c94: lw    s5, 104(sp)
+// 0x010a32dc: 0x10a32dc: lw    s5, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -208,7 +208,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a2c98: 0x10a2c98: lw    s4, 108(sp)
+// 0x010a32e0: 0x10a32e0: lw    s4, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -217,7 +217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a2c9c: 0x10a2c9c: lw    s7, 112(sp)
+// 0x010a32e4: 0x10a32e4: lw    s7, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -226,7 +226,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a2ca0: 0x10a2ca0: lw    s3, 116(sp)
+// 0x010a32e8: 0x10a32e8: lw    s3, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -235,45 +235,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a2ca4: 0x10a2ca4: bne   v0, zero, 0x10a2cb4 addu  s6, a3, zero
+// 0x010a32ec: 0x10a32ec: bne   v0, zero, 0x10a32fc addu  s6, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 14
-	brtrue L_10a2cb4
+	brtrue L_10a32fc
 // --- basic block ---
-// 0x010a2cac: 0x10a2cac: jal   0x10a2b20 sll   zero, zero, 0
+// 0x010a32f4: 0x10a32f4: jal   0x10a3168 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_download_init_10a2b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_download_init_10a3168(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10a2cb4:
-// 0x010a2cb4: 0x10a2cb4: lui   v0, 0x80000
+L_10a32fc:
+// 0x010a32fc: 0x10a32fc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a2cb8: 0x10a2cb8: lw    v0, 27456(v0)
+// 0x010a3300: 0x10a3300: lw    v0, 27920(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6864
+	ldc.i4 6980
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a2cbc: 0x10a2cbc: sll   zero, zero, 0
-// 0x010a2cc0: 0x10a2cc0: bne   v0, zero, 0x10a2d24 sll   zero, zero, 0
+// 0x010a3304: 0x10a3304: sll   zero, zero, 0
+// 0x010a3308: 0x10a3308: bne   v0, zero, 0x10a336c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10a2d24
+	brtrue L_10a336c
 // --- basic block ---
-// 0x010a2cc8: 0x10a2cc8: addu  a0, s0, zero
+// 0x010a3310: 0x10a3310: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a2ccc: 0x10a2ccc: sw    s7, 40(sp)
+// 0x010a3314: 0x10a3314: sw    s7, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -282,7 +282,7 @@ L_10a2cb4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a2cd0: 0x10a2cd0: jal   0x1001ba8 sw    s1, 24(sp)
+// 0x010a3318: 0x10a3318: jal   0x1001ba8 sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -301,7 +301,7 @@ L_10a2cb4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2cd8: 0x10a2cd8: sw    v0, 16(sp)
+// 0x010a3320: 0x10a3320: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -310,17 +310,17 @@ L_10a2cb4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a2cdc: 0x10a2cdc: bne   s2, zero, 0x10a2ce8 addu  a0, s2, zero
+// 0x010a3324: 0x10a3324: bne   s2, zero, 0x10a3330 addu  a0, s2, zero
 	ldloc 9
 	ldloc 9
 	stloc.1
-	brtrue L_10a2ce8
+	brtrue L_10a3330
 // --- basic block ---
-// 0x010a2ce4: 0x10a2ce4: addu  a0, s0, zero
+// 0x010a332c: 0x10a332c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_10a2ce8:
-// 0x010a2ce8: 0x10a2ce8: jal   0x1001ba8 sll   zero, zero, 0
+L_10a3330:
+// 0x010a3330: 0x10a3330: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -331,10 +331,10 @@ L_10a2ce8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2cf0: 0x10a2cf0: addu  a0, s6, zero
+// 0x010a3338: 0x10a3338: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x010a2cf4: 0x10a2cf4: jal   0x1001ba8 sw    v0, 20(sp)
+// 0x010a333c: 0x10a333c: jal   0x1001ba8 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -353,12 +353,12 @@ L_10a2ce8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2cfc: 0x10a2cfc: addiu a0, sp, 16
+// 0x010a3344: 0x10a3344: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010a2d00: 0x10a2d00: sw    v0, 28(sp)
+// 0x010a3348: 0x10a3348: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -367,7 +367,7 @@ L_10a2ce8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a2d04: 0x10a2d04: sw    s5, 32(sp)
+// 0x010a334c: 0x10a334c: sw    s5, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -376,7 +376,7 @@ L_10a2ce8:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a2d08: 0x10a2d08: sw    s3, 44(sp)
+// 0x010a3350: 0x10a3350: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -385,7 +385,7 @@ L_10a2ce8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a2d0c: 0x10a2d0c: jal   0x10a210c sw    s4, 36(sp)
+// 0x010a3354: 0x10a3354: jal   0x10a2754 sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -399,30 +399,30 @@ L_10a2ce8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::ResDataQueue_Push_10a210c(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::ResDataQueue_Push_10a2754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2d14: 0x10a2d14: jal   0x10a2368 sll   zero, zero, 0
+// 0x010a335c: 0x10a335c: jal   0x10a29b0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_download_start_10a2368(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_download_start_10a29b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2d1c: 0x10a2d1c: j	 0x10a2d70 sll   zero, zero, 0
-	br L_10a2d70
+// 0x010a3364: 0x10a3364: j	 0x10a33b8 sll   zero, zero, 0
+	br L_10a33b8
 // --- basic block ---
-L_10a2d24:
-// 0x010a2d24: 0x10a2d24: addu  a0, s0, zero
+L_10a336c:
+// 0x010a336c: 0x10a336c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a2d28: 0x10a2d28: sw    s7, 40(sp)
+// 0x010a3370: 0x10a3370: sw    s7, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -431,7 +431,7 @@ L_10a2d24:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a2d2c: 0x10a2d2c: jal   0x1001ba8 sw    s1, 24(sp)
+// 0x010a3374: 0x10a3374: jal   0x1001ba8 sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -450,7 +450,7 @@ L_10a2d24:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2d34: 0x10a2d34: sw    v0, 16(sp)
+// 0x010a337c: 0x10a337c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -459,17 +459,17 @@ L_10a2d24:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a2d38: 0x10a2d38: bne   s2, zero, 0x10a2d44 addu  a0, s2, zero
+// 0x010a3380: 0x10a3380: bne   s2, zero, 0x10a338c addu  a0, s2, zero
 	ldloc 9
 	ldloc 9
 	stloc.1
-	brtrue L_10a2d44
+	brtrue L_10a338c
 // --- basic block ---
-// 0x010a2d40: 0x10a2d40: addu  a0, s0, zero
+// 0x010a3388: 0x10a3388: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_10a2d44:
-// 0x010a2d44: 0x10a2d44: jal   0x1001ba8 sll   zero, zero, 0
+L_10a338c:
+// 0x010a338c: 0x10a338c: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -480,10 +480,10 @@ L_10a2d44:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2d4c: 0x10a2d4c: addu  a0, s6, zero
+// 0x010a3394: 0x10a3394: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x010a2d50: 0x10a2d50: jal   0x1001ba8 sw    v0, 20(sp)
+// 0x010a3398: 0x10a3398: jal   0x1001ba8 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -502,12 +502,12 @@ L_10a2d44:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a2d58: 0x10a2d58: addiu a0, sp, 16
+// 0x010a33a0: 0x10a33a0: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010a2d5c: 0x10a2d5c: sw    v0, 28(sp)
+// 0x010a33a4: 0x10a33a4: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -516,7 +516,7 @@ L_10a2d44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a2d60: 0x10a2d60: sw    s5, 32(sp)
+// 0x010a33a8: 0x10a33a8: sw    s5, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -525,7 +525,7 @@ L_10a2d44:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a2d64: 0x10a2d64: sw    s4, 36(sp)
+// 0x010a33ac: 0x10a33ac: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -534,7 +534,7 @@ L_10a2d44:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a2d68: 0x10a2d68: jal   0x10a210c sw    s3, 44(sp)
+// 0x010a33b0: 0x10a33b0: jal   0x10a2754 sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -548,14 +548,14 @@ L_10a2d44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::ResDataQueue_Push_10a210c(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::ResDataQueue_Push_10a2754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10a2d70:
-// 0x010a2d70: 0x10a2d70: lw    ra, 84(sp)
-// 0x010a2d74: 0x10a2d74: lw    s7, 80(sp)
+L_10a33b8:
+// 0x010a33b8: 0x10a33b8: lw    ra, 84(sp)
+// 0x010a33bc: 0x10a33bc: lw    s7, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -564,7 +564,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a2d78: 0x10a2d78: lw    s6, 76(sp)
+// 0x010a33c0: 0x10a33c0: lw    s6, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -573,7 +573,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a2d7c: 0x10a2d7c: lw    s5, 72(sp)
+// 0x010a33c4: 0x10a33c4: lw    s5, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -582,7 +582,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a2d80: 0x10a2d80: lw    s4, 68(sp)
+// 0x010a33c8: 0x10a33c8: lw    s4, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -591,7 +591,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a2d84: 0x10a2d84: lw    s3, 64(sp)
+// 0x010a33cc: 0x10a33cc: lw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -600,7 +600,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a2d88: 0x10a2d88: lw    s2, 60(sp)
+// 0x010a33d0: 0x10a33d0: lw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -609,7 +609,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a2d8c: 0x10a2d8c: lw    s1, 56(sp)
+// 0x010a33d4: 0x10a33d4: lw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -618,7 +618,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a2d90: 0x10a2d90: lw    s0, 52(sp)
+// 0x010a33d8: 0x10a33d8: lw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -627,7 +627,7 @@ L_10a2d70:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a2d94: 0x10a2d94: jr    ra addiu sp, sp, 88
+// 0x010a33dc: 0x10a33dc: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -639,7 +639,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 intro_screen_left_key_callback_10a2d9c()
+.method public static int32 intro_screen_left_key_callback_10a33e4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -653,7 +653,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2d9c: 0x10a2d9c: jr    ra addiu v0, zero, 1
+// 0x010a33e4: 0x10a33e4: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -661,7 +661,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void on_dialog_closed_10a2da4()
+.method public static void on_dialog_closed_10a33ec()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -672,12 +672,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2da4: 0x10a2da4: jr    ra sll   zero, zero, 0
+// 0x010a33ec: 0x10a33ec: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void on_dialog_closed_terms_of_use_10a2dac()
+.method public static void on_dialog_closed_terms_of_use_10a33f4()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -688,12 +688,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2dac: 0x10a2dac: jr    ra sll   zero, zero, 0
+// 0x010a33f4: 0x10a33f4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 OnKeyPressed_10a2db4(int32)
+.method public static int32 OnKeyPressed_10a33fc(int32)
 {
 .maxstack 8
 .locals init (int32 a1,int32 v0,int32 ra,int32[] mem)
@@ -713,17 +713,17 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2db4: 0x10a2db4: lb    v0, 0(a1)
+// 0x010a33fc: 0x10a33fc: lb    v0, 0(a1)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010a2db8: 0x10a2db8: sll   zero, zero, 0
-// 0x010a2dbc: 0x10a2dbc: xori  v0, v0, 5
+// 0x010a3400: 0x10a3400: sll   zero, zero, 0
+// 0x010a3404: 0x10a3404: xori  v0, v0, 5
 	ldloc.1
 	ldc.i4.5
 	xor
 	stloc.1
-// 0x010a2dc0: 0x10a2dc0: jr    ra sltiu v0, v0, 1
+// 0x010a3408: 0x10a3408: jr    ra sltiu v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
@@ -733,7 +733,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_welcome_guided_tour_10a2dc8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_welcome_guided_tour_10a3410(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -768,32 +768,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2dc8: 0x10a2dc8: lui   a1, 0x20000
+// 0x010a3410: 0x10a3410: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a2dcc: 0x10a2dcc: lui   a3, 0x20000
+// 0x010a3414: 0x10a3414: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a2dd0: 0x10a2dd0: addiu sp, sp, -24
+// 0x010a3418: 0x10a3418: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a2dd4: 0x10a2dd4: addiu a1, a1, 788
+// 0x010a341c: 0x10a341c: addiu a1, a1, 1252
 	ldloc.2
-	ldc.i4 788
+	ldc.i4 1252
 	add
 	stloc.2
-// 0x010a2dd8: 0x10a2dd8: addiu a3, a3, 824
+// 0x010a3420: 0x10a3420: addiu a3, a3, 1288
 	ldloc 4
-	ldc.i4 824
+	ldc.i4 1288
 	add
 	stloc 4
-// 0x010a2ddc: 0x10a2ddc: addiu a0, zero, 3
+// 0x010a3424: 0x10a3424: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010a2de0: 0x10a2de0: sw    ra, 20(sp)
-// 0x010a2de4: 0x10a2de4: jal   0x100449c addiu a2, zero, 1944
+// 0x010a3428: 0x10a3428: sw    ra, 20(sp)
+// 0x010a342c: 0x10a342c: jal   0x100449c addiu a2, zero, 1944
 	ldc.i4 1944
 	stloc.3
 	ldloc.0
@@ -806,9 +806,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a2dec: 0x10a2dec: lw    ra, 20(sp)
-// 0x010a2df0: 0x10a2df0: sll   zero, zero, 0
-// 0x010a2df4: 0x10a2df4: jr    ra addiu sp, sp, 24
+// 0x010a3434: 0x10a3434: lw    ra, 20(sp)
+// 0x010a3438: 0x10a3438: sll   zero, zero, 0
+// 0x010a343c: 0x10a343c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -820,7 +820,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 space_10a2dfc(int32,int32,int32,int32,int32)
+.method public static int32 space_10a3444(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -855,33 +855,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2dfc: 0x10a2dfc: addu  a3, a0, zero
+// 0x010a3444: 0x10a3444: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x010a2e00: 0x10a2e00: lui   a0, 0x0
+// 0x010a3448: 0x10a3448: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a2e04: 0x10a2e04: addiu sp, sp, -40
+// 0x010a344c: 0x10a344c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a2e08: 0x10a2e08: addiu a0, a0, 32124
+// 0x010a3450: 0x10a3450: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x010a2e0c: 0x10a2e0c: addu  a1, zero, zero
+// 0x010a3454: 0x10a3454: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2e10: 0x10a2e10: addiu a2, zero, -2
+// 0x010a3458: 0x10a3458: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a2e14: 0x10a2e14: addiu v0, zero, 136
+// 0x010a345c: 0x10a345c: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a2e18: 0x10a2e18: sw    ra, 36(sp)
-// 0x010a2e1c: 0x10a2e1c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a3460: 0x10a3460: sw    ra, 36(sp)
+// 0x010a3464: 0x10a3464: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -895,21 +895,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a2e24: 0x10a2e24: addu  a0, v0, zero
+// 0x010a346c: 0x10a346c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a2e28: 0x10a2e28: addu  a1, zero, zero
+// 0x010a3470: 0x10a3470: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2e2c: 0x10a2e2c: addu  a2, zero, zero
+// 0x010a3474: 0x10a3474: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a2e30: 0x10a2e30: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010a3478: 0x10a3478: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -921,10 +921,10 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a2e38: 0x10a2e38: lw    ra, 36(sp)
-// 0x010a2e3c: 0x10a2e3c: lw    v0, 24(sp)
+// 0x010a3480: 0x10a3480: lw    ra, 36(sp)
+// 0x010a3484: 0x10a3484: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -933,7 +933,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a2e40: 0x10a2e40: jr    ra addiu sp, sp, 40
+// 0x010a3488: 0x10a3488: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -945,7 +945,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_welcome_personalize_dialog_10a2e48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_welcome_personalize_dialog_10a3490(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -1004,12 +1004,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a2e48: 0x10a2e48: addiu sp, sp, -88
+// 0x010a3490: 0x10a3490: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010a2e4c: 0x10a2e4c: sw    s6, 76(sp)
+// 0x010a3494: 0x10a3494: sw    s6, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1018,27 +1018,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a2e50: 0x10a2e50: lui   a1, 0x20000
+// 0x010a3498: 0x10a3498: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a2e54: 0x10a2e54: addiu s6, sp, 24
+// 0x010a349c: 0x10a349c: addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-// 0x010a2e58: 0x10a2e58: addiu a1, a1, 29692
+// 0x010a34a0: 0x10a34a0: addiu a1, a1, 30156
 	ldloc.2
-	ldc.i4 29692
+	ldc.i4 30156
 	add
 	stloc.2
-// 0x010a2e5c: 0x10a2e5c: addiu a2, zero, 16
+// 0x010a34a4: 0x10a34a4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a2e60: 0x10a2e60: addu  a0, s6, zero
+// 0x010a34a8: 0x10a34a8: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x010a2e64: 0x10a2e64: sw    ra, 84(sp)
-// 0x010a2e68: 0x10a2e68: sw    s7, 80(sp)
+// 0x010a34ac: 0x10a34ac: sw    ra, 84(sp)
+// 0x010a34b0: 0x10a34b0: sw    s7, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1047,7 +1047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a2e6c: 0x10a2e6c: sw    s5, 72(sp)
+// 0x010a34b4: 0x10a34b4: sw    s5, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1056,7 +1056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a2e70: 0x10a2e70: sw    s4, 68(sp)
+// 0x010a34b8: 0x10a34b8: sw    s4, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1065,7 +1065,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a2e74: 0x10a2e74: sw    s3, 64(sp)
+// 0x010a34bc: 0x10a34bc: sw    s3, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1074,7 +1074,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a2e78: 0x10a2e78: sw    s2, 60(sp)
+// 0x010a34c0: 0x10a34c0: sw    s2, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1083,7 +1083,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a2e7c: 0x10a2e7c: sw    s1, 56(sp)
+// 0x010a34c4: 0x10a34c4: sw    s1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1092,7 +1092,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a2e80: 0x10a2e80: jal   0x1001800 sw    s0, 52(sp)
+// 0x010a34c8: 0x10a34c8: jal   0x1001800 sw    s0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1110,12 +1110,12 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2e88: 0x10a2e88: lui   a0, 0x20000
+// 0x010a34d0: 0x10a34d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a2e8c: 0x10a2e8c: jal   0x101cd60 addiu a0, a0, 876
+// 0x010a34d4: 0x10a34d4: jal   0x101cd70 addiu a0, a0, 1340
 	ldloc.1
-	ldc.i4 876
+	ldc.i4 1340
 	add
 	stloc.1
 	ldloc.0
@@ -1123,31 +1123,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2e94: 0x10a2e94: lui   s2, 0x100000
+// 0x010a34dc: 0x10a34dc: lui   s2, 0x100000
 	ldc.i4 1048576
 	stloc 11
-// 0x010a2e98: 0x10a2e98: lui   s4, 0x20000
+// 0x010a34e0: 0x10a34e0: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x010a2e9c: 0x10a2e9c: ori   a3, s2, 8192
+// 0x010a34e4: 0x10a34e4: ori   a3, s2, 8192
 	ldloc 11
 	ldc.i4 8192
 	or
 	stloc 4
-// 0x010a2ea0: 0x10a2ea0: addu  a2, zero, zero
+// 0x010a34e8: 0x10a34e8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a2ea4: 0x10a2ea4: addu  a1, v0, zero
+// 0x010a34ec: 0x10a34ec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2ea8: 0x10a2ea8: jal   0x1095a08 addiu a0, s4, 904
+// 0x010a34f0: 0x10a34f0: jal   0x1096050 addiu a0, s4, 1368
 	ldloc 12
-	ldc.i4 904
+	ldc.i4 1368
 	add
 	stloc.1
 	ldloc.0
@@ -1155,15 +1155,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2eb0: 0x10a2eb0: addiu a0, zero, 5
+// 0x010a34f8: 0x10a34f8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010a2eb4: 0x10a2eb4: jal   0x10a2dfc addu  s5, v0, zero
+// 0x010a34fc: 0x10a34fc: jal   0x10a3444 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -1171,50 +1171,50 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2ebc: 0x10a2ebc: addu  a1, v0, zero
+// 0x010a3504: 0x10a3504: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2ec0: 0x10a2ec0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a3508: 0x10a3508: jal   0x109950c addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2ec8: 0x10a2ec8: lui   a0, 0x20000
+// 0x010a3510: 0x10a3510: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a2ecc: 0x10a2ecc: lui   v0, 0x40000000
+// 0x010a3514: 0x10a3514: lui   v0, 0x40000000
 	ldc.i4 1073741824
 	stloc 5
-// 0x010a2ed0: 0x10a2ed0: addiu a3, zero, -1
+// 0x010a3518: 0x10a3518: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a2ed4: 0x10a2ed4: addiu a0, a0, 912
+// 0x010a351c: 0x10a351c: addiu a0, a0, 1376
 	ldloc.1
-	ldc.i4 912
+	ldc.i4 1376
 	add
 	stloc.1
-// 0x010a2ed8: 0x10a2ed8: addu  a1, zero, zero
+// 0x010a3520: 0x10a3520: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2edc: 0x10a2edc: addiu a2, zero, -2
+// 0x010a3524: 0x10a3524: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a2ee0: 0x10a2ee0: ori   v0, v0, 20616
+// 0x010a3528: 0x10a3528: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010a2ee4: 0x10a2ee4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a352c: 0x10a352c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1228,29 +1228,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2eec: 0x10a2eec: addu  a0, v0, zero
+// 0x010a3534: 0x10a3534: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a2ef0: 0x10a2ef0: addu  a2, zero, zero
+// 0x010a3538: 0x10a3538: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a2ef4: 0x10a2ef4: addu  a1, zero, zero
+// 0x010a353c: 0x10a353c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2ef8: 0x10a2ef8: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a3540: 0x10a3540: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a2f00: 0x10a2f00: jal   0x10a2dfc addiu a0, zero, 10
+// 0x010a3548: 0x10a3548: jal   0x10a3444 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -1258,45 +1258,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2f08: 0x10a2f08: addu  a1, v0, zero
+// 0x010a3550: 0x10a3550: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2f0c: 0x10a2f0c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3554: 0x10a3554: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2f14: 0x10a2f14: lui   a0, 0x10000
+// 0x010a355c: 0x10a355c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a2f18: 0x10a2f18: addiu a3, zero, -1
+// 0x010a3560: 0x10a3560: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a2f1c: 0x10a2f1c: addiu a0, a0, -27036
+// 0x010a3564: 0x10a3564: addiu a0, a0, -27036
 	ldloc.1
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010a2f20: 0x10a2f20: addu  a1, zero, zero
+// 0x010a3568: 0x10a3568: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2f24: 0x10a2f24: addiu a2, zero, -1
+// 0x010a356c: 0x10a356c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a2f28: 0x10a2f28: addiu v0, zero, 136
+// 0x010a3570: 0x10a3570: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a2f2c: 0x10a2f2c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a3574: 0x10a3574: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1310,43 +1310,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2f34: 0x10a2f34: addu  a0, v0, zero
+// 0x010a357c: 0x10a357c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a2f38: 0x10a2f38: addu  a1, zero, zero
+// 0x010a3580: 0x10a3580: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2f3c: 0x10a2f3c: addu  a2, zero, zero
+// 0x010a3584: 0x10a3584: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a2f40: 0x10a2f40: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010a3588: 0x10a3588: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a2f48: 0x10a2f48: lui   a0, 0x20000
+// 0x010a3590: 0x10a3590: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a2f4c: 0x10a2f4c: lui   a1, 0x10000
+// 0x010a3594: 0x10a3594: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a2f50: 0x10a2f50: addu  a2, zero, zero
+// 0x010a3598: 0x10a3598: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a2f54: 0x10a2f54: addiu a0, a0, 9396
+// 0x010a359c: 0x10a359c: addiu a0, a0, 9860
 	ldloc.1
-	ldc.i4 9396
+	ldc.i4 9860
 	add
 	stloc.1
-// 0x010a2f58: 0x10a2f58: jal   0x109e13c addiu a1, a1, -30972
+// 0x010a35a0: 0x10a35a0: jal   0x109e784 addiu a1, a1, -30972
 	ldloc.2
 	ldc.i4 -30972
 	add
@@ -1356,31 +1356,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2f60: 0x10a2f60: addu  a1, v0, zero
+// 0x010a35a8: 0x10a35a8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2f64: 0x10a2f64: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a35ac: 0x10a35ac: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2f6c: 0x10a2f6c: addu  a0, s1, zero
+// 0x010a35b4: 0x10a35b4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a2f70: 0x10a2f70: addiu a1, zero, 10
+// 0x010a35b8: 0x10a35b8: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010a2f74: 0x10a2f74: jal   0x109434c addu  a2, zero, zero
+// 0x010a35bc: 0x10a35bc: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1388,17 +1388,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2f7c: 0x10a2f7c: lui   a0, 0x20000
+// 0x010a35c4: 0x10a35c4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a2f80: 0x10a2f80: jal   0x101cd60 addiu a0, a0, 928
+// 0x010a35c8: 0x10a35c8: jal   0x101cd70 addiu a0, a0, 1392
 	ldloc.1
-	ldc.i4 928
+	ldc.i4 1392
 	add
 	stloc.1
 	ldloc.0
@@ -1406,26 +1406,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2f88: 0x10a2f88: lui   s3, 0x20000
+// 0x010a35d0: 0x10a35d0: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010a2f8c: 0x10a2f8c: addiu a3, zero, 8
+// 0x010a35d4: 0x10a35d4: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010a2f90: 0x10a2f90: addiu a2, zero, 18
+// 0x010a35d8: 0x10a35d8: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a2f94: 0x10a2f94: addiu a0, s3, 9016
+// 0x010a35dc: 0x10a35dc: addiu a0, s3, 9480
 	ldloc 10
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x010a2f98: 0x10a2f98: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a35e0: 0x10a35e0: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1433,38 +1433,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2fa0: 0x10a2fa0: addu  a1, v0, zero
+// 0x010a35e8: 0x10a35e8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2fa4: 0x10a2fa4: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a35ec: 0x10a35ec: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2fac: 0x10a2fac: addu  a1, s1, zero
+// 0x010a35f4: 0x10a35f4: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010a2fb0: 0x10a2fb0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a35f8: 0x10a35f8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2fb8: 0x10a2fb8: jal   0x10a2dfc addiu a0, zero, 10
+// 0x010a3600: 0x10a3600: jal   0x10a3444 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -1472,31 +1472,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2fc0: 0x10a2fc0: addu  a1, v0, zero
+// 0x010a3608: 0x10a3608: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a2fc4: 0x10a2fc4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a360c: 0x10a360c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2fcc: 0x10a2fcc: addu  a0, s0, zero
+// 0x010a3614: 0x10a3614: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a2fd0: 0x10a2fd0: addiu a1, zero, 5
+// 0x010a3618: 0x10a3618: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x010a2fd4: 0x10a2fd4: jal   0x10942e8 addu  a2, zero, zero
+// 0x010a361c: 0x10a361c: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1504,32 +1504,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2fdc: 0x10a2fdc: lui   a0, 0x20000
+// 0x010a3624: 0x10a3624: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a2fe0: 0x10a2fe0: addiu a3, zero, -1
+// 0x010a3628: 0x10a3628: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a2fe4: 0x10a2fe4: addiu a0, a0, 980
+// 0x010a362c: 0x10a362c: addiu a0, a0, 1444
 	ldloc.1
-	ldc.i4 980
+	ldc.i4 1444
 	add
 	stloc.1
-// 0x010a2fe8: 0x10a2fe8: addu  a1, zero, zero
+// 0x010a3630: 0x10a3630: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a2fec: 0x10a2fec: addiu a2, zero, -2
+// 0x010a3634: 0x10a3634: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a2ff0: 0x10a2ff0: addiu v0, zero, 8
+// 0x010a3638: 0x10a3638: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x010a2ff4: 0x10a2ff4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a363c: 0x10a363c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1543,21 +1543,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a2ffc: 0x10a2ffc: addu  a0, v0, zero
+// 0x010a3644: 0x10a3644: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3000: 0x10a3000: addiu a1, zero, 1
+// 0x010a3648: 0x10a3648: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a3004: 0x10a3004: addu  a2, zero, zero
+// 0x010a364c: 0x10a364c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a3008: 0x10a3008: jal   0x109434c addu  s1, v0, zero
+// 0x010a3650: 0x10a3650: jal   0x1094970 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -1565,17 +1565,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3010: 0x10a3010: lui   a0, 0x20000
+// 0x010a3658: 0x10a3658: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3014: 0x10a3014: jal   0x101cd60 addiu a0, a0, 996
+// 0x010a365c: 0x10a365c: jal   0x101cd70 addiu a0, a0, 1460
 	ldloc.1
-	ldc.i4 996
+	ldc.i4 1460
 	add
 	stloc.1
 	ldloc.0
@@ -1583,23 +1583,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a301c: 0x10a301c: addu  a1, v0, zero
+// 0x010a3664: 0x10a3664: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3020: 0x10a3020: addiu a2, zero, 18
+// 0x010a3668: 0x10a3668: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a3024: 0x10a3024: addiu a3, zero, 4240
+// 0x010a366c: 0x10a366c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a3028: 0x10a3028: jal   0x1098d10 addiu a0, s3, 9016
+// 0x010a3670: 0x10a3670: jal   0x1099358 addiu a0, s3, 9480
 	ldloc 10
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -1607,30 +1607,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3030: 0x10a3030: addu  a1, v0, zero
+// 0x010a3678: 0x10a3678: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3034: 0x10a3034: addu  a0, s1, zero
+// 0x010a367c: 0x10a367c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a3038: 0x10a3038: jal   0x1098ec4 lui   s7, 0x20000
+// 0x010a3680: 0x10a3680: jal   0x109950c lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 15
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3040: 0x10a3040: jal   0x101cd60 addiu a0, s7, 1020
+// 0x010a3688: 0x10a3688: jal   0x101cd70 addiu a0, s7, 1484
 	ldloc 15
-	ldc.i4 1020
+	ldc.i4 1484
 	add
 	stloc.1
 	ldloc.0
@@ -1638,23 +1638,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3048: 0x10a3048: addu  a1, v0, zero
+// 0x010a3690: 0x10a3690: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a304c: 0x10a304c: addiu a3, zero, 16
+// 0x010a3694: 0x10a3694: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x010a3050: 0x10a3050: addiu a2, zero, 18
+// 0x010a3698: 0x10a3698: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a3054: 0x10a3054: jal   0x1098d10 addiu a0, s7, 1020
+// 0x010a369c: 0x10a369c: jal   0x1099358 addiu a0, s7, 1484
 	ldloc 15
-	ldc.i4 1020
+	ldc.i4 1484
 	add
 	stloc.1
 	ldloc.0
@@ -1662,23 +1662,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a305c: 0x10a305c: lui   a1, 0x20000
+// 0x010a36a4: 0x10a36a4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a3060: 0x10a3060: addu  a0, v0, zero
+// 0x010a36a8: 0x10a36a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3064: 0x10a3064: addiu a1, a1, 1028
+// 0x010a36ac: 0x10a36ac: addiu a1, a1, 1492
 	ldloc.2
-	ldc.i4 1028
+	ldc.i4 1492
 	add
 	stloc.2
-// 0x010a3068: 0x10a3068: jal   0x1097af8 sw    v0, 40(sp)
+// 0x010a36b0: 0x10a36b0: jal   0x1098140 sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1689,9 +1689,9 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010a3070: 0x10a3070: lw    v0, 40(sp)
+// 0x010a36b8: 0x10a36b8: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1700,36 +1700,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a3074: 0x10a3074: addu  a0, s1, zero
+// 0x010a36bc: 0x10a36bc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a3078: 0x10a3078: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a36c0: 0x10a36c0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3080: 0x10a3080: addu  a0, s0, zero
+// 0x010a36c8: 0x10a36c8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a3084: 0x10a3084: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010a36cc: 0x10a36cc: jal   0x109950c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a308c: 0x10a308c: addu  a0, s1, zero
+// 0x010a36d4: 0x10a36d4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a3090: 0x10a3090: jal   0x10991ac addu  a1, s6, zero
+// 0x010a36d8: 0x10a36d8: jal   0x10997f4 addu  a1, s6, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -1737,33 +1737,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3098: 0x10a3098: lui   a1, 0x10a0000
+// 0x010a36e0: 0x10a36e0: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a309c: 0x10a309c: addu  a0, s1, zero
+// 0x010a36e4: 0x10a36e4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a30a0: 0x10a30a0: jal   0x1098e9c addiu a1, a1, 13060
+// 0x010a36e8: 0x10a36e8: jal   0x10994e4 addiu a1, a1, 14668
 	ldloc.2
-	ldc.i4 13060
+	ldc.i4 14668
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_callback_1098e9c(int32,int32)
+	call void Cibyl114::ssd_widget_set_callback_10994e4(int32,int32)
 // --- basic block ---
-// 0x010a30a8: 0x10a30a8: addu  a2, zero, zero
+// 0x010a36f0: 0x10a36f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a30ac: 0x10a30ac: addu  a0, s0, zero
+// 0x010a36f4: 0x10a36f4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a30b0: 0x10a30b0: jal   0x10942e8 addiu a1, zero, 3
+// 0x010a36f8: 0x10a36f8: jal   0x109490c addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -1771,12 +1771,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a30b8: 0x10a30b8: jal   0x10a2dfc addiu a0, zero, 10
+// 0x010a3700: 0x10a3700: jal   0x10a3444 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -1784,30 +1784,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a30c0: 0x10a30c0: addu  a1, v0, zero
+// 0x010a3708: 0x10a3708: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a30c4: 0x10a30c4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a370c: 0x10a370c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a30cc: 0x10a30cc: lui   a0, 0x20000
+// 0x010a3714: 0x10a3714: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a30d0: 0x10a30d0: jal   0x101cd60 addiu a0, a0, 1036
+// 0x010a3718: 0x10a3718: jal   0x101cd70 addiu a0, a0, 1500
 	ldloc.1
-	ldc.i4 1036
+	ldc.i4 1500
 	add
 	stloc.1
 	ldloc.0
@@ -1815,23 +1815,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a30d8: 0x10a30d8: addu  a1, v0, zero
+// 0x010a3720: 0x10a3720: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a30dc: 0x10a30dc: addiu a2, zero, 14
+// 0x010a3724: 0x10a3724: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010a30e0: 0x10a30e0: addiu a3, zero, 8
+// 0x010a3728: 0x10a3728: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010a30e4: 0x10a30e4: jal   0x1098d10 addiu a0, s3, 9016
+// 0x010a372c: 0x10a372c: jal   0x1099358 addiu a0, s3, 9480
 	ldloc 10
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -1839,25 +1839,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a30ec: 0x10a30ec: addu  a1, v0, zero
+// 0x010a3734: 0x10a3734: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a30f0: 0x10a30f0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3738: 0x10a3738: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a30f8: 0x10a30f8: jal   0x10a2dfc addiu a0, zero, 10
+// 0x010a3740: 0x10a3740: jal   0x10a3444 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -1865,30 +1865,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3100: 0x10a3100: addu  a1, v0, zero
+// 0x010a3748: 0x10a3748: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3104: 0x10a3104: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a374c: 0x10a374c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a310c: 0x10a310c: lui   a0, 0x10000
+// 0x010a3754: 0x10a3754: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3110: 0x10a3110: jal   0x101cd60 addiu a0, a0, 20556
+// 0x010a3758: 0x10a3758: jal   0x101cd70 addiu a0, a0, 21020
 	ldloc.1
-	ldc.i4 20556
+	ldc.i4 21020
 	add
 	stloc.1
 	ldloc.0
@@ -1896,33 +1896,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3118: 0x10a3118: lui   s3, 0x10a0000
+// 0x010a3760: 0x10a3760: lui   s3, 0x10a0000
 	ldc.i4 17432576
 	stloc 10
-// 0x010a311c: 0x10a311c: lui   a0, 0x20000
+// 0x010a3764: 0x10a3764: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3120: 0x10a3120: ori   a2, s2, 5
+// 0x010a3768: 0x10a3768: ori   a2, s2, 5
 	ldloc 11
 	ldc.i4.5
 	or
 	stloc.3
-// 0x010a3124: 0x10a3124: addiu a3, s3, 12896
+// 0x010a376c: 0x10a376c: addiu a3, s3, 14504
 	ldloc 10
-	ldc.i4 12896
+	ldc.i4 14504
 	add
 	stloc 4
-// 0x010a3128: 0x10a3128: addiu a0, a0, 1128
+// 0x010a3770: 0x10a3770: addiu a0, a0, 1592
 	ldloc.1
-	ldc.i4 1128
+	ldc.i4 1592
 	add
 	stloc.1
-// 0x010a312c: 0x10a312c: jal   0x1091088 addu  a1, v0, zero
+// 0x010a3774: 0x10a3774: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1930,30 +1930,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3134: 0x10a3134: addu  a1, v0, zero
+// 0x010a377c: 0x10a377c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3138: 0x10a3138: addu  a0, s0, zero
+// 0x010a3780: 0x10a3780: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a313c: 0x10a313c: jal   0x1098ec4 lui   s1, 0x20000
+// 0x010a3784: 0x10a3784: jal   0x109950c lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3144: 0x10a3144: jal   0x101cd60 addiu a0, s1, 1136
+// 0x010a378c: 0x10a378c: jal   0x101cd70 addiu a0, s1, 1600
 	ldloc 9
-	ldc.i4 1136
+	ldc.i4 1600
 	add
 	stloc.1
 	ldloc.0
@@ -1961,27 +1961,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a314c: 0x10a314c: addu  a1, v0, zero
+// 0x010a3794: 0x10a3794: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3150: 0x10a3150: ori   a2, s2, 1
+// 0x010a3798: 0x10a3798: ori   a2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	or
 	stloc.3
-// 0x010a3154: 0x10a3154: addiu a3, s3, 12896
+// 0x010a379c: 0x10a379c: addiu a3, s3, 14504
 	ldloc 10
-	ldc.i4 12896
+	ldc.i4 14504
 	add
 	stloc 4
-// 0x010a3158: 0x10a3158: jal   0x1091088 addiu a0, s1, 1136
+// 0x010a37a0: 0x10a37a0: jal   0x10916ac addiu a0, s1, 1600
 	ldloc 9
-	ldc.i4 1136
+	ldc.i4 1600
 	add
 	stloc.1
 	ldloc.0
@@ -1989,25 +1989,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3160: 0x10a3160: addu  a1, v0, zero
+// 0x010a37a8: 0x10a37a8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3164: 0x10a3164: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a37ac: 0x10a37ac: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a316c: 0x10a316c: jal   0x10a2dfc addiu a0, zero, 20
+// 0x010a37b4: 0x10a37b4: jal   0x10a3444 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -2015,43 +2015,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3174: 0x10a3174: addu  a1, v0, zero
+// 0x010a37bc: 0x10a37bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3178: 0x10a3178: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a37c0: 0x10a37c0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3180: 0x10a3180: addu  a0, s5, zero
+// 0x010a37c8: 0x10a37c8: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010a3184: 0x10a3184: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a37cc: 0x10a37cc: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a318c: 0x10a318c: addiu a0, s4, 904
+// 0x010a37d4: 0x10a37d4: addiu a0, s4, 1368
 	ldloc 12
-	ldc.i4 904
+	ldc.i4 1368
 	add
 	stloc.1
-// 0x010a3190: 0x10a3190: jal   0x1095eec addu  a1, zero, zero
+// 0x010a37d8: 0x10a37d8: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2059,17 +2059,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3198: 0x10a3198: lui   a0, 0x10a0000
+// 0x010a37e0: 0x10a37e0: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a319c: 0x10a319c: jal   0x109468c addiu a0, a0, 11684
+// 0x010a37e4: 0x10a37e4: jal   0x1094cb0 addiu a0, a0, 13292
 	ldloc.1
-	ldc.i4 11684
+	ldc.i4 13292
 	add
 	stloc.1
 	ldloc.0
@@ -2077,24 +2077,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_callback_109468c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_callback_1094cb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a31a4: 0x10a31a4: jal   0x102146c sll   zero, zero, 0
+// 0x010a37ec: 0x10a37ec: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a31ac: 0x10a31ac: lw    ra, 84(sp)
-// 0x010a31b0: 0x10a31b0: lw    s7, 80(sp)
+// 0x010a37f4: 0x10a37f4: lw    ra, 84(sp)
+// 0x010a37f8: 0x10a37f8: lw    s7, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2103,7 +2103,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a31b4: 0x10a31b4: lw    s6, 76(sp)
+// 0x010a37fc: 0x10a37fc: lw    s6, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2112,7 +2112,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a31b8: 0x10a31b8: lw    s5, 72(sp)
+// 0x010a3800: 0x10a3800: lw    s5, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2121,7 +2121,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a31bc: 0x10a31bc: lw    s4, 68(sp)
+// 0x010a3804: 0x10a3804: lw    s4, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2130,7 +2130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a31c0: 0x10a31c0: lw    s3, 64(sp)
+// 0x010a3808: 0x10a3808: lw    s3, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2139,7 +2139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a31c4: 0x10a31c4: lw    s2, 60(sp)
+// 0x010a380c: 0x10a380c: lw    s2, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2148,7 +2148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a31c8: 0x10a31c8: lw    s1, 56(sp)
+// 0x010a3810: 0x10a3810: lw    s1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2157,7 +2157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a31cc: 0x10a31cc: lw    s0, 52(sp)
+// 0x010a3814: 0x10a3814: lw    s0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2166,7 +2166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a31d0: 0x10a31d0: jr    ra addiu sp, sp, 88
+// 0x010a3818: 0x10a3818: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -2178,7 +2178,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_personalize_10a320c(int32,int32,int32,int32,int32)
+.method public static int32 on_personalize_10a3854(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -2213,28 +2213,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a320c: 0x10a320c: addiu sp, sp, -24
+// 0x010a3854: 0x10a3854: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3210: 0x10a3210: sw    ra, 20(sp)
-// 0x010a3214: 0x10a3214: jal   0x10a135c sll   zero, zero, 0
+// 0x010a3858: 0x10a3858: sw    ra, 20(sp)
+// 0x010a385c: 0x10a385c: jal   0x10a19a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_login_update_dlg_show_10a135c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_login_update_dlg_show_10a19a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a321c: 0x10a321c: lw    ra, 20(sp)
-// 0x010a3220: 0x10a3220: addu  v0, zero, zero
+// 0x010a3864: 0x10a3864: lw    ra, 20(sp)
+// 0x010a3868: 0x10a3868: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010a3224: 0x10a3224: jr    ra addiu sp, sp, 24
+// 0x010a386c: 0x10a386c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2246,7 +2246,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 set_first_time_no_10a322c(int32,int32,int32,int32,int32)
+.method public static int32 set_first_time_no_10a3874(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -2281,26 +2281,26 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a322c: 0x10a322c: lui   a0, 0x0
+// 0x010a3874: 0x10a3874: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a3230: 0x10a3230: lui   a1, 0x20000
+// 0x010a3878: 0x10a3878: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a3234: 0x10a3234: addiu sp, sp, -24
+// 0x010a387c: 0x10a387c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3238: 0x10a3238: addiu a0, a0, 17936
+// 0x010a3880: 0x10a3880: addiu a0, a0, 17936
 	ldloc.1
 	ldc.i4 17936
 	add
 	stloc.1
-// 0x010a323c: 0x10a323c: sw    ra, 20(sp)
-// 0x010a3240: 0x10a3240: jal   0x100e5c0 addiu a1, a1, 9464
+// 0x010a3884: 0x10a3884: sw    ra, 20(sp)
+// 0x010a3888: 0x10a3888: jal   0x100e5d0 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -2308,12 +2308,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a3248: 0x10a3248: jal   0x100ea50 addu  a0, zero, zero
+// 0x010a3890: 0x10a3890: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2321,14 +2321,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a3250: 0x10a3250: lw    ra, 20(sp)
-// 0x010a3254: 0x10a3254: sll   zero, zero, 0
-// 0x010a3258: 0x10a3258: jr    ra addiu sp, sp, 24
+// 0x010a3898: 0x10a3898: lw    ra, 20(sp)
+// 0x010a389c: 0x10a389c: sll   zero, zero, 0
+// 0x010a38a0: 0x10a38a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2340,7 +2340,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 personalize_buttons_callback_10a3260(int32,int32,int32,int32,int32)
+.method public static int32 personalize_buttons_callback_10a38a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -2378,12 +2378,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3260: 0x10a3260: addiu sp, sp, -24
+// 0x010a38a8: 0x10a38a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3264: 0x10a3264: sw    s0, 16(sp)
+// 0x010a38ac: 0x10a38ac: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2392,7 +2392,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a3268: 0x10a3268: lw    s0, 16(a0)
+// 0x010a38b0: 0x10a38b0: lw    s0, 16(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -2401,16 +2401,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a326c: 0x10a326c: lui   a1, 0x20000
+// 0x010a38b4: 0x10a38b4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a3270: 0x10a3270: addiu a1, a1, 1128
+// 0x010a38b8: 0x10a38b8: addiu a1, a1, 1592
 	ldloc.2
-	ldc.i4 1128
+	ldc.i4 1592
 	add
 	stloc.2
-// 0x010a3274: 0x10a3274: sw    ra, 20(sp)
-// 0x010a3278: 0x10a3278: jal   0x1001b14 addu  a0, s0, zero
+// 0x010a38bc: 0x10a38bc: sw    ra, 20(sp)
+// 0x010a38c0: 0x10a38c0: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -2418,24 +2418,24 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a3280: 0x10a3280: bne   v0, zero, 0x10a32a0 lui   a1, 0x20000
+// 0x010a38c8: 0x10a38c8: bne   v0, zero, 0x10a38e8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10a32a0
+	brtrue L_10a38e8
 // --- basic block ---
-// 0x010a3288: 0x10a3288: jal   0x10a322c sll   zero, zero, 0
+// 0x010a38d0: 0x10a38d0: jal   0x10a3874 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::set_first_time_no_10a322c(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::set_first_time_no_10a3874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3290: 0x10a3290: jal   0x1094b64 addu  a0, zero, zero
+// 0x010a38d8: 0x10a38d8: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2443,21 +2443,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3298: 0x10a3298: j	 0x10a32bc sll   zero, zero, 0
-	br L_10a32bc
+// 0x010a38e0: 0x10a38e0: j	 0x10a3904 sll   zero, zero, 0
+	br L_10a3904
 // --- basic block ---
-L_10a32a0:
-// 0x010a32a0: 0x10a32a0: addu  a0, s0, zero
+L_10a38e8:
+// 0x010a38e8: 0x10a38e8: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010a32a4: 0x10a32a4: jal   0x1001b14 addiu a1, a1, 1136
+// 0x010a38ec: 0x10a38ec: jal   0x1001b14 addiu a1, a1, 1600
 	ldloc.2
-	ldc.i4 1136
+	ldc.i4 1600
 	add
 	stloc.2
 	ldloc.1
@@ -2465,27 +2465,27 @@ L_10a32a0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a32ac: 0x10a32ac: bne   v0, zero, 0x10a32bc sll   zero, zero, 0
+// 0x010a38f4: 0x10a38f4: bne   v0, zero, 0x10a3904 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a32bc
+	brtrue L_10a3904
 // --- basic block ---
-// 0x010a32b4: 0x10a32b4: jal   0x10a135c sll   zero, zero, 0
+// 0x010a38fc: 0x10a38fc: jal   0x10a19a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_login_update_dlg_show_10a135c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_login_update_dlg_show_10a19a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a32bc:
-// 0x010a32bc: 0x10a32bc: lw    ra, 20(sp)
-// 0x010a32c0: 0x10a32c0: addiu v0, zero, 1
+L_10a3904:
+// 0x010a3904: 0x10a3904: lw    ra, 20(sp)
+// 0x010a3908: 0x10a3908: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a32c4: 0x10a32c4: lw    s0, 16(sp)
+// 0x010a390c: 0x10a390c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2494,7 +2494,7 @@ L_10a32bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a32c8: 0x10a32c8: jr    ra addiu sp, sp, 24
+// 0x010a3910: 0x10a3910: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2506,7 +2506,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_terms_accepted_10a32d0(int32,int32,int32,int32,int32)
+.method public static int32 set_terms_accepted_10a3918(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -2541,24 +2541,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a32d0: 0x10a32d0: lui   a0, 0x0
+// 0x010a3918: 0x10a3918: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a32d4: 0x10a32d4: lui   a1, 0x0
+// 0x010a391c: 0x10a391c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a32d8: 0x10a32d8: addiu sp, sp, -24
+// 0x010a3920: 0x10a3920: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a32dc: 0x10a32dc: addiu a0, a0, 17984
+// 0x010a3924: 0x10a3924: addiu a0, a0, 17984
 	ldloc.1
 	ldc.i4 17984
 	add
 	stloc.1
-// 0x010a32e0: 0x10a32e0: sw    ra, 20(sp)
-// 0x010a32e4: 0x10a32e4: jal   0x100e5c0 addiu a1, a1, 20820
+// 0x010a3928: 0x10a3928: sw    ra, 20(sp)
+// 0x010a392c: 0x10a392c: jal   0x100e5d0 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2568,12 +2568,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a32ec: 0x10a32ec: jal   0x100ea50 addu  a0, zero, zero
+// 0x010a3934: 0x10a3934: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2581,14 +2581,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a32f4: 0x10a32f4: lw    ra, 20(sp)
-// 0x010a32f8: 0x10a32f8: sll   zero, zero, 0
-// 0x010a32fc: 0x10a32fc: jr    ra addiu sp, sp, 24
+// 0x010a393c: 0x10a393c: lw    ra, 20(sp)
+// 0x010a3940: 0x10a3940: sll   zero, zero, 0
+// 0x010a3944: 0x10a3944: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2600,7 +2600,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 personalize_signin_callback_10a3304(int32,int32,int32,int32,int32)
+.method public static int32 personalize_signin_callback_10a394c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -2635,28 +2635,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3304: 0x10a3304: addiu sp, sp, -24
+// 0x010a394c: 0x10a394c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3308: 0x10a3308: sw    ra, 20(sp)
-// 0x010a330c: 0x10a330c: jal   0x10a12c0 sll   zero, zero, 0
+// 0x010a3950: 0x10a3950: sw    ra, 20(sp)
+// 0x010a3954: 0x10a3954: jal   0x10a1908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_login_details_dialog_show_un_pw_10a12c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_login_details_dialog_show_un_pw_10a1908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a3314: 0x10a3314: lw    ra, 20(sp)
-// 0x010a3318: 0x10a3318: addiu v0, zero, 1
+// 0x010a395c: 0x10a395c: lw    ra, 20(sp)
+// 0x010a3960: 0x10a3960: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010a331c: 0x10a331c: jr    ra addiu sp, sp, 24
+// 0x010a3964: 0x10a3964: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2668,7 +2668,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 is_show_intro_screen_10a3324(int32,int32,int32,int32,int32)
+.method public static int32 is_show_intro_screen_10a396c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 v1,int32 ra)
@@ -2709,12 +2709,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3324: 0x10a3324: addiu sp, sp, -40
+// 0x010a396c: 0x10a396c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a3328: 0x10a3328: sw    s1, 32(sp)
+// 0x010a3970: 0x10a3970: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2723,7 +2723,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a332c: 0x10a332c: sw    s0, 28(sp)
+// 0x010a3974: 0x10a3974: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2732,43 +2732,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a3330: 0x10a3330: lui   s1, 0x0
+// 0x010a3978: 0x10a3978: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a3334: 0x10a3334: lui   s0, 0x0
+// 0x010a397c: 0x10a397c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a3338: 0x10a3338: lui   a3, 0x20000
+// 0x010a3980: 0x10a3980: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a333c: 0x10a333c: lui   a0, 0x10000
+// 0x010a3984: 0x10a3984: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3340: 0x10a3340: addiu a1, s1, 18168
+// 0x010a3988: 0x10a3988: addiu a1, s1, 18168
 	ldloc 8
 	ldc.i4 18168
 	add
 	stloc.2
-// 0x010a3344: 0x10a3344: addiu s0, s0, 20820
+// 0x010a398c: 0x10a398c: addiu s0, s0, 20820
 	ldloc 6
 	ldc.i4 20820
 	add
 	stloc 6
-// 0x010a3348: 0x10a3348: addiu a3, a3, 9464
+// 0x010a3990: 0x10a3990: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010a334c: 0x10a334c: addu  a2, zero, zero
+// 0x010a3994: 0x10a3994: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a3350: 0x10a3350: addiu a0, a0, 12560
+// 0x010a3998: 0x10a3998: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a3354: 0x10a3354: sw    ra, 36(sp)
-// 0x010a3358: 0x10a3358: sw    s0, 16(sp)
+// 0x010a399c: 0x10a399c: sw    ra, 36(sp)
+// 0x010a39a0: 0x10a39a0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2777,7 +2777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a335c: 0x10a335c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a39a4: 0x10a39a4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2791,12 +2791,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010a3364: 0x10a3364: jal   0x100e348 addiu a0, s1, 18168
+// 0x010a39ac: 0x10a39ac: jal   0x100e358 addiu a0, s1, 18168
 	ldloc 8
 	ldc.i4 18168
 	add
@@ -2806,15 +2806,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010a336c: 0x10a336c: addu  a0, v0, zero
+// 0x010a39b4: 0x10a39b4: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x010a3370: 0x10a3370: jal   0x1001b14 addu  a1, s0, zero
+// 0x010a39b8: 0x10a39b8: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.1
@@ -2822,13 +2822,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x010a3378: 0x10a3378: lw    ra, 36(sp)
-// 0x010a337c: 0x10a337c: sltiu v0, v0, 1
+// 0x010a39c0: 0x10a39c0: lw    ra, 36(sp)
+// 0x010a39c4: 0x10a39c4: sltiu v0, v0, 1
 	ldloc 7
 	ldc.i4.1
 	clt.un
 	stloc 7
-// 0x010a3380: 0x10a3380: lw    s1, 32(sp)
+// 0x010a39c8: 0x10a39c8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2837,7 +2837,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a3384: 0x10a3384: lw    s0, 28(sp)
+// 0x010a39cc: 0x10a39cc: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2846,7 +2846,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a3388: 0x10a3388: jr    ra addiu sp, sp, 40
+// 0x010a39d0: 0x10a39d0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2858,7 +2858,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 welcome_dialog_10a34ec(int32,int32,int32,int32,int32)
+.method public static int32 welcome_dialog_10a3b34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s1,int32 s3,int32 s2,int32 ra)
@@ -2905,21 +2905,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a34ec: 0x10a34ec: lui   a0, 0x20000
+// 0x010a3b34: 0x10a3b34: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a34f0: 0x10a34f0: addiu sp, sp, -48
+// 0x010a3b38: 0x10a3b38: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010a34f4: 0x10a34f4: addiu a0, a0, 876
+// 0x010a3b3c: 0x10a3b3c: addiu a0, a0, 1340
 	ldloc.1
-	ldc.i4 876
+	ldc.i4 1340
 	add
 	stloc.1
-// 0x010a34f8: 0x10a34f8: sw    ra, 44(sp)
-// 0x010a34fc: 0x10a34fc: sw    s3, 40(sp)
+// 0x010a3b40: 0x10a3b40: sw    ra, 44(sp)
+// 0x010a3b44: 0x10a3b44: sw    s3, 40(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2928,7 +2928,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a3500: 0x10a3500: sw    s2, 36(sp)
+// 0x010a3b48: 0x10a3b48: sw    s2, 36(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2937,7 +2937,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a3504: 0x10a3504: sw    s1, 32(sp)
+// 0x010a3b4c: 0x10a3b4c: sw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2946,7 +2946,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a3508: 0x10a3508: sw    s0, 28(sp)
+// 0x010a3b50: 0x10a3b50: sw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2955,7 +2955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a350c: 0x10a350c: jal   0x101cd60 lui   s2, 0x20000
+// 0x010a3b54: 0x10a3b54: jal   0x101cd70 lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 11
 	ldloc.0
@@ -2963,28 +2963,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3514: 0x10a3514: lui   a3, 0x100000
+// 0x010a3b5c: 0x10a3b5c: lui   a3, 0x100000
 	ldc.i4 1048576
 	stloc 4
-// 0x010a3518: 0x10a3518: addu  a1, v0, zero
+// 0x010a3b60: 0x10a3b60: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a351c: 0x10a351c: ori   a3, a3, 8192
+// 0x010a3b64: 0x10a3b64: ori   a3, a3, 8192
 	ldloc 4
 	ldc.i4 8192
 	or
 	stloc 4
-// 0x010a3520: 0x10a3520: addiu a0, s2, 904
+// 0x010a3b68: 0x10a3b68: addiu a0, s2, 1368
 	ldloc 11
-	ldc.i4 904
+	ldc.i4 1368
 	add
 	stloc.1
-// 0x010a3524: 0x10a3524: jal   0x1095a08 addu  a2, zero, zero
+// 0x010a3b6c: 0x10a3b6c: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2992,40 +2992,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a352c: 0x10a352c: addu  s1, v0, zero
+// 0x010a3b74: 0x10a3b74: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a3530: 0x10a3530: lui   a0, 0x20000
+// 0x010a3b78: 0x10a3b78: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3534: 0x10a3534: lui   v0, 0x40000000
+// 0x010a3b7c: 0x10a3b7c: lui   v0, 0x40000000
 	ldc.i4 1073741824
 	stloc 5
-// 0x010a3538: 0x10a3538: addiu a3, zero, -1
+// 0x010a3b80: 0x10a3b80: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a353c: 0x10a353c: addiu a0, a0, 912
+// 0x010a3b84: 0x10a3b84: addiu a0, a0, 1376
 	ldloc.1
-	ldc.i4 912
+	ldc.i4 1376
 	add
 	stloc.1
-// 0x010a3540: 0x10a3540: addu  a1, zero, zero
+// 0x010a3b88: 0x10a3b88: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3544: 0x10a3544: addiu a2, zero, -2
+// 0x010a3b8c: 0x10a3b8c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a3548: 0x10a3548: ori   v0, v0, 20616
+// 0x010a3b90: 0x10a3b90: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010a354c: 0x10a354c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a3b94: 0x10a3b94: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3039,29 +3039,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3554: 0x10a3554: addu  a0, v0, zero
+// 0x010a3b9c: 0x10a3b9c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3558: 0x10a3558: addu  a2, zero, zero
+// 0x010a3ba0: 0x10a3ba0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a355c: 0x10a355c: addu  a1, zero, zero
+// 0x010a3ba4: 0x10a3ba4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3560: 0x10a3560: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a3ba8: 0x10a3ba8: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a3568: 0x10a3568: jal   0x10a2dfc addiu a0, zero, 10
+// 0x010a3bb0: 0x10a3bb0: jal   0x10a3444 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -3069,45 +3069,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3570: 0x10a3570: addu  a1, v0, zero
+// 0x010a3bb8: 0x10a3bb8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3574: 0x10a3574: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3bbc: 0x10a3bbc: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a357c: 0x10a357c: lui   a0, 0x10000
+// 0x010a3bc4: 0x10a3bc4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3580: 0x10a3580: addiu a3, zero, -1
+// 0x010a3bc8: 0x10a3bc8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a3584: 0x10a3584: addiu a0, a0, -27036
+// 0x010a3bcc: 0x10a3bcc: addiu a0, a0, -27036
 	ldloc.1
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010a3588: 0x10a3588: addu  a1, zero, zero
+// 0x010a3bd0: 0x10a3bd0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a358c: 0x10a358c: addiu a2, zero, -1
+// 0x010a3bd4: 0x10a3bd4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a3590: 0x10a3590: addiu v0, zero, 136
+// 0x010a3bd8: 0x10a3bd8: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a3594: 0x10a3594: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a3bdc: 0x10a3bdc: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3121,43 +3121,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a359c: 0x10a359c: addu  a0, v0, zero
+// 0x010a3be4: 0x10a3be4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a35a0: 0x10a35a0: addu  a1, zero, zero
+// 0x010a3be8: 0x10a3be8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a35a4: 0x10a35a4: addu  a2, zero, zero
+// 0x010a3bec: 0x10a3bec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a35a8: 0x10a35a8: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a3bf0: 0x10a3bf0: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a35b0: 0x10a35b0: lui   a0, 0x20000
+// 0x010a3bf8: 0x10a3bf8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a35b4: 0x10a35b4: lui   a1, 0x10000
+// 0x010a3bfc: 0x10a3bfc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a35b8: 0x10a35b8: addiu a2, zero, 8
+// 0x010a3c00: 0x10a3c00: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x010a35bc: 0x10a35bc: addiu a0, a0, 9396
+// 0x010a3c04: 0x10a3c04: addiu a0, a0, 9860
 	ldloc.1
-	ldc.i4 9396
+	ldc.i4 9860
 	add
 	stloc.1
-// 0x010a35c0: 0x10a35c0: jal   0x109e13c addiu a1, a1, -30972
+// 0x010a3c08: 0x10a3c08: jal   0x109e784 addiu a1, a1, -30972
 	ldloc.2
 	ldc.i4 -30972
 	add
@@ -3167,38 +3167,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a35c8: 0x10a35c8: addu  a1, v0, zero
+// 0x010a3c10: 0x10a3c10: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a35cc: 0x10a35cc: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a3c14: 0x10a3c14: jal   0x109950c addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a35d4: 0x10a35d4: addu  a1, s3, zero
+// 0x010a3c1c: 0x10a3c1c: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x010a35d8: 0x10a35d8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3c20: 0x10a3c20: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a35e0: 0x10a35e0: jal   0x10a2dfc addiu a0, zero, 20
+// 0x010a3c28: 0x10a3c28: jal   0x10a3444 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -3206,30 +3206,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a35e8: 0x10a35e8: addu  a1, v0, zero
+// 0x010a3c30: 0x10a3c30: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a35ec: 0x10a35ec: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3c34: 0x10a3c34: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a35f4: 0x10a35f4: lui   a0, 0x20000
+// 0x010a3c3c: 0x10a3c3c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a35f8: 0x10a35f8: jal   0x101cd60 addiu a0, a0, 928
+// 0x010a3c40: 0x10a3c40: jal   0x101cd70 addiu a0, a0, 1392
 	ldloc.1
-	ldc.i4 928
+	ldc.i4 1392
 	add
 	stloc.1
 	ldloc.0
@@ -3237,26 +3237,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3600: 0x10a3600: lui   s3, 0x20000
+// 0x010a3c48: 0x10a3c48: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010a3604: 0x10a3604: addiu a2, zero, 18
+// 0x010a3c4c: 0x10a3c4c: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a3608: 0x10a3608: addiu a3, zero, 10
+// 0x010a3c50: 0x10a3c50: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010a360c: 0x10a360c: addu  a1, v0, zero
+// 0x010a3c54: 0x10a3c54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3610: 0x10a3610: jal   0x1098d10 addiu a0, s3, 9016
+// 0x010a3c58: 0x10a3c58: jal   0x1099358 addiu a0, s3, 9480
 	ldloc 10
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -3264,25 +3264,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3618: 0x10a3618: addu  a1, v0, zero
+// 0x010a3c60: 0x10a3c60: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a361c: 0x10a361c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3c64: 0x10a3c64: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3624: 0x10a3624: jal   0x10a2dfc addiu a0, zero, 20
+// 0x010a3c6c: 0x10a3c6c: jal   0x10a3444 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -3290,30 +3290,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a362c: 0x10a362c: addu  a1, v0, zero
+// 0x010a3c74: 0x10a3c74: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3630: 0x10a3630: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3c78: 0x10a3c78: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3638: 0x10a3638: lui   a0, 0x20000
+// 0x010a3c80: 0x10a3c80: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a363c: 0x10a363c: jal   0x101cd60 addiu a0, a0, 1036
+// 0x010a3c84: 0x10a3c84: jal   0x101cd70 addiu a0, a0, 1500
 	ldloc.1
-	ldc.i4 1036
+	ldc.i4 1500
 	add
 	stloc.1
 	ldloc.0
@@ -3321,23 +3321,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3644: 0x10a3644: addu  a1, v0, zero
+// 0x010a3c8c: 0x10a3c8c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3648: 0x10a3648: addiu a2, zero, 14
+// 0x010a3c90: 0x10a3c90: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010a364c: 0x10a364c: addiu a3, zero, 10
+// 0x010a3c94: 0x10a3c94: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010a3650: 0x10a3650: jal   0x1098d10 addiu a0, s3, 9016
+// 0x010a3c98: 0x10a3c98: jal   0x1099358 addiu a0, s3, 9480
 	ldloc 10
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -3345,25 +3345,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3658: 0x10a3658: addu  a1, v0, zero
+// 0x010a3ca0: 0x10a3ca0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a365c: 0x10a365c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3ca4: 0x10a3ca4: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3664: 0x10a3664: jal   0x10a2dfc addiu a0, zero, 20
+// 0x010a3cac: 0x10a3cac: jal   0x10a3444 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -3371,30 +3371,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a366c: 0x10a366c: addu  a1, v0, zero
+// 0x010a3cb4: 0x10a3cb4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3670: 0x10a3670: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3cb8: 0x10a3cb8: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3678: 0x10a3678: lui   a0, 0x20000
+// 0x010a3cc0: 0x10a3cc0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a367c: 0x10a367c: jal   0x101cd60 addiu a0, a0, 1128
+// 0x010a3cc4: 0x10a3cc4: jal   0x101cd70 addiu a0, a0, 1592
 	ldloc.1
-	ldc.i4 1128
+	ldc.i4 1592
 	add
 	stloc.1
 	ldloc.0
@@ -3402,15 +3402,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3684: 0x10a3684: addu  a1, v0, zero
+// 0x010a3ccc: 0x10a3ccc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3688: 0x10a3688: jal   0x109b50c addu  a0, s1, zero
+// 0x010a3cd0: 0x10a3cd0: jal   0x109bb54 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3418,32 +3418,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3690: 0x10a3690: lui   a1, 0x10a0000
+// 0x010a3cd8: 0x10a3cd8: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a3694: 0x10a3694: addiu a1, a1, 14148
+// 0x010a3cdc: 0x10a3cdc: addiu a1, a1, 15756
 	ldloc.2
-	ldc.i4 14148
+	ldc.i4 15756
 	add
 	stloc.2
-// 0x010a3698: 0x10a3698: jal   0x109917c addu  a0, s1, zero
+// 0x010a3ce0: 0x10a3ce0: jal   0x10997c4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_right_softkey_callback_109917c(int32,int32)
+	call void Cibyl114::ssd_widget_set_right_softkey_callback_10997c4(int32,int32)
 // --- basic block ---
-// 0x010a36a0: 0x10a36a0: lui   a0, 0x20000
+// 0x010a3ce8: 0x10a3ce8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a36a4: 0x10a36a4: jal   0x101cd60 addiu a0, a0, 1136
+// 0x010a3cec: 0x10a3cec: jal   0x101cd70 addiu a0, a0, 1600
 	ldloc.1
-	ldc.i4 1136
+	ldc.i4 1600
 	add
 	stloc.1
 	ldloc.0
@@ -3451,15 +3451,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a36ac: 0x10a36ac: addu  a1, v0, zero
+// 0x010a3cf4: 0x10a3cf4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a36b0: 0x10a36b0: jal   0x109b434 addu  a0, s1, zero
+// 0x010a3cf8: 0x10a3cf8: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3467,27 +3467,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a36b8: 0x10a36b8: lui   a1, 0x10a0000
+// 0x010a3d00: 0x10a3d00: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a36bc: 0x10a36bc: addiu a1, a1, 12812
+// 0x010a3d04: 0x10a3d04: addiu a1, a1, 14420
 	ldloc.2
-	ldc.i4 12812
+	ldc.i4 14420
 	add
 	stloc.2
-// 0x010a36c0: 0x10a36c0: jal   0x1099174 addu  a0, s1, zero
+// 0x010a3d08: 0x10a3d08: jal   0x10997bc addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x010a36c8: 0x10a36c8: jal   0x10a2dfc addiu a0, zero, 20
+// 0x010a3d10: 0x10a3d10: jal   0x10a3444 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -3495,43 +3495,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a36d0: 0x10a36d0: addu  a1, v0, zero
+// 0x010a3d18: 0x10a3d18: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a36d4: 0x10a36d4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a3d1c: 0x10a3d1c: jal   0x109950c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a36dc: 0x10a36dc: addu  a1, s0, zero
+// 0x010a3d24: 0x10a3d24: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010a36e0: 0x10a36e0: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a3d28: 0x10a3d28: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a36e8: 0x10a36e8: addiu a0, s2, 904
+// 0x010a3d30: 0x10a3d30: addiu a0, s2, 1368
 	ldloc 11
-	ldc.i4 904
+	ldc.i4 1368
 	add
 	stloc.1
-// 0x010a36ec: 0x10a36ec: jal   0x1095eec addu  a1, zero, zero
+// 0x010a3d34: 0x10a3d34: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3539,20 +3539,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a36f4: 0x10a36f4: lui   a0, 0x10a0000
+// 0x010a3d3c: 0x10a3d3c: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a36f8: 0x10a36f8: addiu a0, a0, 11684
+// 0x010a3d40: 0x10a3d40: addiu a0, a0, 13292
 	ldloc.1
-	ldc.i4 11684
+	ldc.i4 13292
 	add
 	stloc.1
-// 0x010a36fc: 0x10a36fc: jal   0x109468c lui   s0, 0x80000
+// 0x010a3d44: 0x10a3d44: jal   0x1094cb0 lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
 	ldloc.0
@@ -3560,26 +3560,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_callback_109468c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_callback_1094cb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3704: 0x10a3704: lw    v0, 30660(s0)
+// 0x010a3d4c: 0x10a3d4c: lw    v0, 31124(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7665
+	ldc.i4 7781
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a3708: 0x10a3708: sll   zero, zero, 0
-// 0x010a370c: 0x10a370c: beq   v0, zero, 0x10a3720 sll   zero, zero, 0
+// 0x010a3d50: 0x10a3d50: sll   zero, zero, 0
+// 0x010a3d54: 0x10a3d54: beq   v0, zero, 0x10a3d68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a3720
+	brfalse L_10a3d68
 // --- basic block ---
-// 0x010a3714: 0x10a3714: jalr  v0 sll   zero, zero, 0
+// 0x010a3d5c: 0x10a3d5c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3591,29 +3591,29 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a371c: 0x10a371c: sw    zero, 30660(s0)
+// 0x010a3d64: 0x10a3d64: sw    zero, 31124(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7665
+	ldc.i4 7781
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10a3720:
-// 0x010a3720: 0x10a3720: jal   0x102146c sll   zero, zero, 0
+L_10a3d68:
+// 0x010a3d68: 0x10a3d68: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3728: 0x10a3728: lw    ra, 44(sp)
-// 0x010a372c: 0x10a372c: lw    s3, 40(sp)
+// 0x010a3d70: 0x10a3d70: lw    ra, 44(sp)
+// 0x010a3d74: 0x10a3d74: lw    s3, 40(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3622,7 +3622,7 @@ L_10a3720:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a3730: 0x10a3730: lw    s2, 36(sp)
+// 0x010a3d78: 0x10a3d78: lw    s2, 36(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3631,7 +3631,7 @@ L_10a3720:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a3734: 0x10a3734: lw    s1, 32(sp)
+// 0x010a3d7c: 0x10a3d7c: lw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3640,7 +3640,7 @@ L_10a3720:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a3738: 0x10a3738: lw    s0, 28(sp)
+// 0x010a3d80: 0x10a3d80: lw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3649,7 +3649,7 @@ L_10a3720:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a373c: 0x10a373c: jr    ra addiu sp, sp, 48
+// 0x010a3d84: 0x10a3d84: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3661,7 +3661,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_skip_welcome_10a3744(int32,int32,int32,int32,int32)
+.method public static int32 on_skip_welcome_10a3d8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -3696,24 +3696,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3744: 0x10a3744: addiu sp, sp, -24
+// 0x010a3d8c: 0x10a3d8c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3748: 0x10a3748: sw    ra, 20(sp)
-// 0x010a374c: 0x10a374c: jal   0x10a322c sll   zero, zero, 0
+// 0x010a3d90: 0x10a3d90: sw    ra, 20(sp)
+// 0x010a3d94: 0x10a3d94: jal   0x10a3874 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::set_first_time_no_10a322c(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::set_first_time_no_10a3874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3754: 0x10a3754: jal   0x1094a94 addu  a0, zero, zero
+// 0x010a3d9c: 0x10a3d9c: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3721,16 +3721,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a375c: 0x10a375c: lw    ra, 20(sp)
-// 0x010a3760: 0x10a3760: addu  v0, zero, zero
+// 0x010a3da4: 0x10a3da4: lw    ra, 20(sp)
+// 0x010a3da8: 0x10a3da8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a3764: 0x10a3764: jr    ra addiu sp, sp, 24
+// 0x010a3dac: 0x10a3dac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3742,7 +3742,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 callGlobalCallback_10a376c(int32,int32,int32,int32,int32)
+.method public static int32 callGlobalCallback_10a3db4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3777,13 +3777,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a376c: 0x10a376c: addiu sp, sp, -24
+// 0x010a3db4: 0x10a3db4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3770: 0x10a3770: sw    ra, 20(sp)
-// 0x010a3774: 0x10a3774: jal   0x1094a94 addu  a0, zero, zero
+// 0x010a3db8: 0x10a3db8: sw    ra, 20(sp)
+// 0x010a3dbc: 0x10a3dbc: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3791,29 +3791,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a377c: 0x10a377c: lui   v0, 0x80000
+// 0x010a3dc4: 0x10a3dc4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a3780: 0x10a3780: lw    v0, 30668(v0)
+// 0x010a3dc8: 0x10a3dc8: lw    v0, 31132(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7667
+	ldc.i4 7783
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a3784: 0x10a3784: sll   zero, zero, 0
-// 0x010a3788: 0x10a3788: beq   v0, zero, 0x10a3798 sll   zero, zero, 0
+// 0x010a3dcc: 0x10a3dcc: sll   zero, zero, 0
+// 0x010a3dd0: 0x10a3dd0: beq   v0, zero, 0x10a3de0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a3798
+	brfalse L_10a3de0
 // --- basic block ---
-// 0x010a3790: 0x10a3790: jalr  v0 sll   zero, zero, 0
+// 0x010a3dd8: 0x10a3dd8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3825,12 +3825,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a3798:
-// 0x010a3798: 0x10a3798: lw    ra, 20(sp)
-// 0x010a379c: 0x10a379c: addiu v0, zero, 1
+L_10a3de0:
+// 0x010a3de0: 0x10a3de0: lw    ra, 20(sp)
+// 0x010a3de4: 0x10a3de4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a37a0: 0x10a37a0: jr    ra addiu sp, sp, 24
+// 0x010a3de8: 0x10a3de8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3842,7 +3842,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_softkey_finish_10a37a8(int32,int32,int32,int32,int32)
+.method public static int32 on_softkey_finish_10a3df0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3877,24 +3877,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a37a8: 0x10a37a8: addiu sp, sp, -24
+// 0x010a3df0: 0x10a3df0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a37ac: 0x10a37ac: sw    ra, 20(sp)
-// 0x010a37b0: 0x10a37b0: jal   0x10a322c sll   zero, zero, 0
+// 0x010a3df4: 0x10a3df4: sw    ra, 20(sp)
+// 0x010a3df8: 0x10a3df8: jal   0x10a3874 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::set_first_time_no_10a322c(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::set_first_time_no_10a3874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a37b8: 0x10a37b8: jal   0x1094a94 addiu a0, zero, 1
+// 0x010a3e00: 0x10a3e00: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3902,27 +3902,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a37c0: 0x10a37c0: jal   0x10a2dc8 sll   zero, zero, 0
+// 0x010a3e08: 0x10a3e08: jal   0x10a3410 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_welcome_guided_tour_10a2dc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_welcome_guided_tour_10a3410(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a37c8: 0x10a37c8: lw    ra, 20(sp)
-// 0x010a37cc: 0x10a37cc: addu  v0, zero, zero
+// 0x010a3e10: 0x10a3e10: lw    ra, 20(sp)
+// 0x010a3e14: 0x10a3e14: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a37d0: 0x10a37d0: jr    ra addiu sp, sp, 24
+// 0x010a3e18: 0x10a3e18: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3934,7 +3934,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 terms_of_use_native_10a37d8(int32,int32,int32,int32,int32)
+.method public static int32 terms_of_use_native_10a3e20(int32,int32,int32,int32,int32)
 {
 .maxstack 11
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s4,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 s7,int32 s8,int32 t0,int32 ra,int32 lo)
@@ -4002,12 +4002,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a37d8: 0x10a37d8: addiu sp, sp, -6064
+// 0x010a3e20: 0x10a3e20: addiu sp, sp, -6064
 	ldloc.0
 	ldc.i4 -6064
 	add
 	stloc.0
-// 0x010a37dc: 0x10a37dc: sw    s0, 6024(sp)
+// 0x010a3e24: 0x10a3e24: sw    s0, 6024(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4016,8 +4016,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a37e0: 0x10a37e0: sw    ra, 6060(sp)
-// 0x010a37e4: 0x10a37e4: sw    s8, 6056(sp)
+// 0x010a3e28: 0x10a3e28: sw    ra, 6060(sp)
+// 0x010a3e2c: 0x10a3e2c: sw    s8, 6056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4026,7 +4026,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a37e8: 0x10a37e8: sw    s7, 6052(sp)
+// 0x010a3e30: 0x10a3e30: sw    s7, 6052(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4035,7 +4035,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a37ec: 0x10a37ec: sw    s6, 6048(sp)
+// 0x010a3e34: 0x10a3e34: sw    s6, 6048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4044,7 +4044,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a37f0: 0x10a37f0: sw    s5, 6044(sp)
+// 0x010a3e38: 0x10a3e38: sw    s5, 6044(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4053,7 +4053,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a37f4: 0x10a37f4: sw    s4, 6040(sp)
+// 0x010a3e3c: 0x10a3e3c: sw    s4, 6040(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4062,7 +4062,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a37f8: 0x10a37f8: sw    s3, 6036(sp)
+// 0x010a3e40: 0x10a3e40: sw    s3, 6036(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4071,7 +4071,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a37fc: 0x10a37fc: sw    s2, 6032(sp)
+// 0x010a3e44: 0x10a3e44: sw    s2, 6032(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4080,7 +4080,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a3800: 0x10a3800: sw    s1, 6028(sp)
+// 0x010a3e48: 0x10a3e48: sw    s1, 6028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4089,7 +4089,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a3804: 0x10a3804: jal   0x101d484 sb    zero, 16(sp)
+// 0x010a3e4c: 0x10a3e4c: jal   0x101d494 sb    zero, 16(sp)
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4100,23 +4100,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a380c: 0x10a380c: lui   a1, 0x10000
+// 0x010a3e54: 0x10a3e54: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a3810: 0x10a3810: addu  a0, v0, zero
+// 0x010a3e58: 0x10a3e58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3814: 0x10a3814: addiu a1, a1, 5016
+// 0x010a3e5c: 0x10a3e5c: addiu a1, a1, 5012
 	ldloc.2
-	ldc.i4 5016
+	ldc.i4 5012
 	add
 	stloc.2
-// 0x010a3818: 0x10a3818: jal   0x1000420 addu  s0, v0, zero
+// 0x010a3e60: 0x10a3e60: jal   0x1000420 addu  s0, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -4129,29 +4129,29 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3820: 0x10a3820: beq   v0, zero, 0x10a3830 lui   s3, 0x0
+// 0x010a3e68: 0x10a3e68: beq   v0, zero, 0x10a3e78 lui   s3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_10a3830
+	brfalse L_10a3e78
 // --- basic block ---
-// 0x010a3828: 0x10a3828: j	 0x10a385c addiu s3, s3, 18000
+// 0x010a3e70: 0x10a3e70: j	 0x10a3ea4 addiu s3, s3, 18000
 	ldloc 8
 	ldc.i4 18000
 	add
 	stloc 8
-	br L_10a385c
+	br L_10a3ea4
 // --- basic block ---
-L_10a3830:
-// 0x010a3830: 0x10a3830: lui   a0, 0x10000
+L_10a3e78:
+// 0x010a3e78: 0x10a3e78: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3834: 0x10a3834: addiu a0, a0, -7400
+// 0x010a3e7c: 0x10a3e7c: addiu a0, a0, -7404
 	ldloc.1
-	ldc.i4 -7400
+	ldc.i4 -7404
 	add
 	stloc.1
-// 0x010a3838: 0x10a3838: jal   0x1001b14 addu  a1, s0, zero
+// 0x010a3e80: 0x10a3e80: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
@@ -4159,31 +4159,31 @@ L_10a3830:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a3840: 0x10a3840: bne   v0, zero, 0x10a3854 sll   zero, zero, 0
+// 0x010a3e88: 0x10a3e88: bne   v0, zero, 0x10a3e9c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a3854
+	brtrue L_10a3e9c
 // --- basic block ---
-// 0x010a3848: 0x10a3848: lui   s3, 0x0
+// 0x010a3e90: 0x10a3e90: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a384c: 0x10a384c: j	 0x10a385c addiu s3, s3, 18056
+// 0x010a3e94: 0x10a3e94: j	 0x10a3ea4 addiu s3, s3, 18056
 	ldloc 8
 	ldc.i4 18056
 	add
 	stloc 8
-	br L_10a385c
+	br L_10a3ea4
 // --- basic block ---
-L_10a3854:
-// 0x010a3854: 0x10a3854: lui   s3, 0x0
+L_10a3e9c:
+// 0x010a3e9c: 0x10a3e9c: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a3858: 0x10a3858: addiu s3, s3, 18112
+// 0x010a3ea0: 0x10a3ea0: addiu s3, s3, 18112
 	ldloc 8
 	ldc.i4 18112
 	add
 	stloc 8
-L_10a385c:
-// 0x010a385c: 0x10a385c: jal   0x10a3324 addiu s2, sp, 16
+L_10a3ea4:
+// 0x010a3ea4: 0x10a3ea4: jal   0x10a396c addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4193,53 +4193,53 @@ L_10a385c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::is_show_intro_screen_10a3324(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::is_show_intro_screen_10a396c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3864: 0x10a3864: sltu  s0, zero, v0
+// 0x010a3eac: 0x10a3eac: sltu  s0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 10
-// 0x010a3868: 0x10a3868: addiu s1, zero, 6000
+// 0x010a3eb0: 0x10a3eb0: addiu s1, zero, 6000
 	ldc.i4 6000
 	stloc 11
-// 0x010a386c: 0x10a386c: j	 0x10a38e8 addiu s7, zero, 7
+// 0x010a3eb4: 0x10a3eb4: j	 0x10a3f30 addiu s7, zero, 7
 	ldc.i4.7
 	stloc 15
-	br L_10a38e8
+	br L_10a3f30
 // --- basic block ---
-L_10a3874:
-// 0x010a3874: 0x10a3874: lw    a1, 0(s4)
+L_10a3ebc:
+// 0x010a3ebc: 0x10a3ebc: lw    a1, 0(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010a3878: 0x10a3878: addiu s5, s5, 1
+// 0x010a3ec0: 0x10a3ec0: addiu s5, s5, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-// 0x010a387c: 0x10a387c: lbu   v0, 0(a1)
+// 0x010a3ec4: 0x10a3ec4: lbu   v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010a3880: 0x10a3880: addu  a0, a1, zero
+// 0x010a3ec8: 0x10a3ec8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010a3884: 0x10a3884: beq   v0, zero, 0x10a38dc addiu s4, s4, 4
+// 0x010a3ecc: 0x10a3ecc: beq   v0, zero, 0x10a3f24 addiu s4, s4, 4
 	ldloc 5
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	brfalse L_10a38dc
+	brfalse L_10a3f24
 // --- basic block ---
-// 0x010a388c: 0x10a388c: jal   0x1001b48 sw    a1, 6016(sp)
+// 0x010a3ed4: 0x10a3ed4: jal   0x1001b48 sw    a1, 6016(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4254,20 +4254,20 @@ L_10a3874:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3894: 0x10a3894: addu  s6, v0, zero
+// 0x010a3edc: 0x10a3edc: addu  s6, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010a3898: 0x10a3898: addu  s8, s2, v0
+// 0x010a3ee0: 0x10a3ee0: addu  s8, s2, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 16
-// 0x010a389c: 0x10a389c: slt   v0, v0, s1
+// 0x010a3ee4: 0x10a3ee4: slt   v0, v0, s1
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 5
-// 0x010a38a0: 0x10a38a0: lw    a1, 6016(sp)
+// 0x010a3ee8: 0x10a3ee8: lw    a1, 6016(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4276,19 +4276,19 @@ L_10a3874:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a38a4: 0x10a38a4: bne   v0, zero, 0x10a38b4 addu  a0, s2, zero
+// 0x010a3eec: 0x10a3eec: bne   v0, zero, 0x10a3efc addu  a0, s2, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_10a38b4
+	brtrue L_10a3efc
 // --- basic block ---
-// 0x010a38ac: 0x10a38ac: j	 0x10a38e0 addiu v0, zero, 2
+// 0x010a3ef4: 0x10a3ef4: j	 0x10a3f28 addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-	br L_10a38e0
+	br L_10a3f28
 // --- basic block ---
-L_10a38b4:
-// 0x010a38b4: 0x10a38b4: jal   0x1001ac4 addiu s2, s8, 2
+L_10a3efc:
+// 0x010a3efc: 0x10a3efc: jal   0x1001ac4 addiu s2, s8, 2
 	ldloc 16
 	ldc.i4.2
 	add
@@ -4298,15 +4298,15 @@ L_10a38b4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a38bc: 0x10a38bc: lui   a1, 0x20000
+// 0x010a3f04: 0x10a3f04: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a38c0: 0x10a38c0: addu  a0, s8, zero
+// 0x010a3f08: 0x10a3f08: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x010a38c4: 0x10a38c4: jal   0x1001ac4 addiu a1, a1, 1156
+// 0x010a3f0c: 0x10a3f0c: jal   0x1001ac4 addiu a1, a1, 1620
 	ldloc.2
-	ldc.i4 1156
+	ldc.i4 1620
 	add
 	stloc.2
 	ldloc.1
@@ -4314,65 +4314,65 @@ L_10a38b4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a38cc: 0x10a38cc: addiu v0, zero, -2
+// 0x010a3f14: 0x10a3f14: addiu v0, zero, -2
 	ldc.i4.s -2
 	stloc 5
-// 0x010a38d0: 0x10a38d0: subu  s6, v0, s6
+// 0x010a3f18: 0x10a3f18: subu  s6, v0, s6
 	ldloc 5
 	ldloc 14
 	sub
 	stloc 14
-// 0x010a38d4: 0x10a38d4: bne   s5, s7, 0x10a3874 addu  s1, s1, s6
+// 0x010a3f1c: 0x10a3f1c: bne   s5, s7, 0x10a3ebc addu  s1, s1, s6
 	ldloc 13
 	ldloc 15
 	ldloc 11
 	ldloc 14
 	add
 	stloc 11
-	bne.un L_10a3874
+	bne.un L_10a3ebc
 // --- basic block ---
-L_10a38dc:
-// 0x010a38dc: 0x10a38dc: addu  v0, s0, zero
+L_10a3f24:
+// 0x010a3f24: 0x10a3f24: addu  v0, s0, zero
 	ldloc 10
 	stloc 5
-L_10a38e0:
-// 0x010a38e0: 0x10a38e0: bne   v0, zero, 0x10a3900 addiu s0, zero, 1
+L_10a3f28:
+// 0x010a3f28: 0x10a3f28: bne   v0, zero, 0x10a3f48 addiu s0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 10
-	brtrue L_10a3900
+	brtrue L_10a3f48
 // --- basic block ---
-L_10a38e8:
-// 0x010a38e8: 0x10a38e8: mult  s0, s7
+L_10a3f30:
+// 0x010a3f30: 0x10a3f30: mult  s0, s7
 	ldloc 10
 	ldloc 15
 	mul
 	stloc 19
-// 0x010a38ec: 0x10a38ec: addu  s5, zero, zero
+// 0x010a3f34: 0x10a3f34: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010a38f0: 0x10a38f0: mflo  lo
+// 0x010a3f38: 0x10a3f38: mflo  lo
 	ldloc 19
 	stloc 9
-// 0x010a38f4: 0x10a38f4: sll   s4, s4, 2
+// 0x010a3f3c: 0x10a3f3c: sll   s4, s4, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x010a38f8: 0x10a38f8: j	 0x10a3874 addu  s4, s3, s4
+// 0x010a3f40: 0x10a3f40: j	 0x10a3ebc addu  s4, s3, s4
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-	br L_10a3874
+	br L_10a3ebc
 // --- basic block ---
-L_10a3900:
-// 0x010a3900: 0x10a3900: lui   a0, 0x20000
+L_10a3f48:
+// 0x010a3f48: 0x10a3f48: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3904: 0x10a3904: jal   0x101cd60 addiu a0, a0, 1160
+// 0x010a3f4c: 0x10a3f4c: jal   0x101cd70 addiu a0, a0, 1624
 	ldloc.1
-	ldc.i4 1160
+	ldc.i4 1624
 	add
 	stloc.1
 	ldloc.0
@@ -4380,20 +4380,20 @@ L_10a3900:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a390c: 0x10a390c: lui   a0, 0x20000
+// 0x010a3f54: 0x10a3f54: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3910: 0x10a3910: addiu a0, a0, 1168
+// 0x010a3f58: 0x10a3f58: addiu a0, a0, 1632
 	ldloc.1
-	ldc.i4 1168
+	ldc.i4 1632
 	add
 	stloc.1
-// 0x010a3914: 0x10a3914: jal   0x101cd60 addu  s1, v0, zero
+// 0x010a3f5c: 0x10a3f5c: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4401,71 +4401,71 @@ L_10a3900:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a391c: 0x10a391c: lui   t0, 0x10a0000
+// 0x010a3f64: 0x10a3f64: lui   t0, 0x10a0000
 	ldc.i4 17432576
 	stloc 17
-// 0x010a3920: 0x10a3920: lui   a3, 0x10a0000
+// 0x010a3f68: 0x10a3f68: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x010a3924: 0x10a3924: lui   a0, 0x10000
+// 0x010a3f6c: 0x10a3f6c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3928: 0x10a3928: addu  a2, v0, zero
+// 0x010a3f70: 0x10a3f70: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a392c: 0x10a392c: addu  v1, zero, zero
+// 0x010a3f74: 0x10a3f74: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010a3930: 0x10a3930: addiu a1, sp, 16
+// 0x010a3f78: 0x10a3f78: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010a3934: 0x10a3934: addiu t0, t0, 14904
+// 0x010a3f7c: 0x10a3f7c: addiu t0, t0, 16512
 	ldloc 17
-	ldc.i4 14904
+	ldc.i4 16512
 	add
 	stloc 17
-// 0x010a3938: 0x10a3938: addiu a3, a3, 15704
+// 0x010a3f80: 0x10a3f80: addiu a3, a3, 17312
 	ldloc 4
-	ldc.i4 15704
+	ldc.i4 17312
 	add
 	stloc 4
-// 0x010a393c: 0x10a393c: addiu a0, a0, 18500
+// 0x010a3f84: 0x10a3f84: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x010a3940: 0x10a3940: cibyl_sysc_arg 0x4
+// 0x010a3f88: 0x10a3f88: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010a3944: 0x10a3944: cibyl_sysc_arg 0x5
+// 0x010a3f8c: 0x10a3f8c: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010a3948: 0x10a3948: cibyl_sysc_arg 0x10
+// 0x010a3f90: 0x10a3f90: cibyl_sysc_arg 0x10
 	ldloc 10
-// 0x010a394c: 0x10a394c: cibyl_sysc_arg 0x11
+// 0x010a3f94: 0x10a3f94: cibyl_sysc_arg 0x11
 	ldloc 11
-// 0x010a3950: 0x10a3950: cibyl_sysc_arg 0x6
+// 0x010a3f98: 0x10a3f98: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x010a3954: 0x10a3954: cibyl_sysc_arg 0x3
+// 0x010a3f9c: 0x10a3f9c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010a3958: 0x10a3958: cibyl_sysc_arg 0x7
+// 0x010a3fa0: 0x10a3fa0: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x010a395c: 0x10a395c: cibyl_sysc_arg 0x8
+// 0x010a3fa4: 0x10a3fa4: cibyl_sysc_arg 0x8
 	ldloc 17
-// 0x010a3960: 0x10a3960: cibyl_sysc_arg 0x3
+// 0x010a3fa8: 0x10a3fa8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010a3964: 0x10a3964: cibyl_sysc 0x2230
+// 0x010a3fac: 0x10a3fac: cibyl_sysc 0x2230
 	call void [WazeWP7]Syscalls::NOPH_ConfirmDialog_CreateDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x010a3968: 0x10a3968: addu  v1, v0, zero
+// 0x010a3fb0: 0x10a3fb0: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010a396c: 0x10a396c: lw    ra, 6060(sp)
-// 0x010a3970: 0x10a3970: lw    s8, 6056(sp)
+// 0x010a3fb4: 0x10a3fb4: lw    ra, 6060(sp)
+// 0x010a3fb8: 0x10a3fb8: lw    s8, 6056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4474,7 +4474,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a3974: 0x10a3974: lw    s7, 6052(sp)
+// 0x010a3fbc: 0x10a3fbc: lw    s7, 6052(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4483,7 +4483,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a3978: 0x10a3978: lw    s6, 6048(sp)
+// 0x010a3fc0: 0x10a3fc0: lw    s6, 6048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4492,7 +4492,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a397c: 0x10a397c: lw    s5, 6044(sp)
+// 0x010a3fc4: 0x10a3fc4: lw    s5, 6044(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4501,7 +4501,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a3980: 0x10a3980: lw    s4, 6040(sp)
+// 0x010a3fc8: 0x10a3fc8: lw    s4, 6040(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4510,7 +4510,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a3984: 0x10a3984: lw    s3, 6036(sp)
+// 0x010a3fcc: 0x10a3fcc: lw    s3, 6036(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4519,7 +4519,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a3988: 0x10a3988: lw    s2, 6032(sp)
+// 0x010a3fd0: 0x10a3fd0: lw    s2, 6032(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4528,7 +4528,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a398c: 0x10a398c: lw    s1, 6028(sp)
+// 0x010a3fd4: 0x10a3fd4: lw    s1, 6028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4537,7 +4537,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a3990: 0x10a3990: lw    s0, 6024(sp)
+// 0x010a3fd8: 0x10a3fd8: lw    s0, 6024(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4546,7 +4546,7 @@ L_10a3900:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a3994: 0x10a3994: jr    ra addiu sp, sp, 6064
+// 0x010a3fdc: 0x10a3fdc: jr    ra addiu sp, sp, 6064
 	ldloc.0
 	ldc.i4 6064
 	add
@@ -4558,7 +4558,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_term_of_use_10a399c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_term_of_use_10a3fe4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 s2,int32 ra)
@@ -4602,12 +4602,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a399c: 0x10a399c: addiu sp, sp, -40
+// 0x010a3fe4: 0x10a3fe4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a39a0: 0x10a39a0: sw    s2, 32(sp)
+// 0x010a3fe8: 0x10a3fe8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4616,7 +4616,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a39a4: 0x10a39a4: sw    s1, 28(sp)
+// 0x010a3fec: 0x10a3fec: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4625,7 +4625,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a39a8: 0x10a39a8: sw    s0, 24(sp)
+// 0x010a3ff0: 0x10a3ff0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4634,46 +4634,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a39ac: 0x10a39ac: lui   s2, 0x0
+// 0x010a3ff4: 0x10a3ff4: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010a39b0: 0x10a39b0: lui   s1, 0x0
+// 0x010a3ff8: 0x10a3ff8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010a39b4: 0x10a39b4: lui   a3, 0x20000
+// 0x010a3ffc: 0x10a3ffc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a39b8: 0x10a39b8: addu  s0, a0, zero
+// 0x010a4000: 0x10a4000: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010a39bc: 0x10a39bc: lui   a0, 0x20000
+// 0x010a4004: 0x10a4004: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a39c0: 0x10a39c0: addiu a1, s2, 17984
+// 0x010a4008: 0x10a4008: addiu a1, s2, 17984
 	ldloc 10
 	ldc.i4 17984
 	add
 	stloc.2
-// 0x010a39c4: 0x10a39c4: addiu s1, s1, 20820
+// 0x010a400c: 0x10a400c: addiu s1, s1, 20820
 	ldloc 7
 	ldc.i4 20820
 	add
 	stloc 7
-// 0x010a39c8: 0x10a39c8: addiu a3, a3, 9464
+// 0x010a4010: 0x10a4010: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010a39cc: 0x10a39cc: addiu a0, a0, -26888
+// 0x010a4014: 0x10a4014: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a39d0: 0x10a39d0: addu  a2, zero, zero
+// 0x010a4018: 0x10a4018: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a39d4: 0x10a39d4: sw    ra, 36(sp)
-// 0x010a39d8: 0x10a39d8: sw    s1, 16(sp)
+// 0x010a401c: 0x10a401c: sw    ra, 36(sp)
+// 0x010a4020: 0x10a4020: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4682,7 +4682,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a39dc: 0x10a39dc: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a4024: 0x10a4024: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4696,12 +4696,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a39e4: 0x10a39e4: jal   0x100e348 addiu a0, s2, 17984
+// 0x010a402c: 0x10a402c: jal   0x100e358 addiu a0, s2, 17984
 	ldloc 10
 	ldc.i4 17984
 	add
@@ -4711,15 +4711,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a39ec: 0x10a39ec: addu  a0, v0, zero
+// 0x010a4034: 0x10a4034: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010a39f0: 0x10a39f0: jal   0x1001b14 addu  a1, s1, zero
+// 0x010a4038: 0x10a4038: jal   0x1001b14 addu  a1, s1, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -4727,17 +4727,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010a39f8: 0x10a39f8: bne   v0, zero, 0x10a3a18 lui   v0, 0x80000
+// 0x010a4040: 0x10a4040: bne   v0, zero, 0x10a4060 lui   v0, 0x80000
 	ldloc 6
 	ldc.i4 524288
 	stloc 6
-	brtrue L_10a3a18
+	brtrue L_10a4060
 // --- basic block ---
-// 0x010a3a00: 0x10a3a00: beq   s0, zero, 0x10a3a20 sll   zero, zero, 0
+// 0x010a4048: 0x10a4048: beq   s0, zero, 0x10a4068 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10a3a20
+	brfalse L_10a4068
 // --- basic block ---
-// 0x010a3a08: 0x10a3a08: jalr  s0 sll   zero, zero, 0
+// 0x010a4050: 0x10a4050: jalr  s0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -4749,16 +4749,16 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a3a10: 0x10a3a10: j	 0x10a3a20 sll   zero, zero, 0
-	br L_10a3a20
+// 0x010a4058: 0x10a4058: j	 0x10a4068 sll   zero, zero, 0
+	br L_10a4068
 // --- basic block ---
-L_10a3a18:
-// 0x010a3a18: 0x10a3a18: jal   0x10a37d8 sw    s0, 30668(v0)
+L_10a4060:
+// 0x010a4060: 0x10a4060: jal   0x10a3e20 sw    s0, 31132(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7667
+	ldc.i4 7783
 	add
 	ldloc 8
 	stelem.i4
@@ -4767,14 +4767,14 @@ L_10a3a18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::terms_of_use_native_10a37d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::terms_of_use_native_10a3e20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10a3a20:
-// 0x010a3a20: 0x10a3a20: lw    ra, 36(sp)
-// 0x010a3a24: 0x10a3a24: lw    s2, 32(sp)
+L_10a4068:
+// 0x010a4068: 0x10a4068: lw    ra, 36(sp)
+// 0x010a406c: 0x10a406c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4783,7 +4783,7 @@ L_10a3a20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a3a28: 0x10a3a28: lw    s1, 28(sp)
+// 0x010a4070: 0x10a4070: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4792,7 +4792,7 @@ L_10a3a20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a3a2c: 0x10a3a2c: lw    s0, 24(sp)
+// 0x010a4074: 0x10a4074: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4801,7 +4801,7 @@ L_10a3a20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a3a30: 0x10a3a30: jr    ra addiu sp, sp, 40
+// 0x010a4078: 0x10a4078: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4813,7 +4813,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 rim_terms_of_use_declined_10a3a38(int32,int32,int32,int32,int32)
+.method public static int32 rim_terms_of_use_declined_10a4080(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4848,32 +4848,32 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3a38: 0x10a3a38: lui   a1, 0x20000
+// 0x010a4080: 0x10a4080: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a3a3c: 0x10a3a3c: lui   a3, 0x20000
+// 0x010a4084: 0x10a4084: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a3a40: 0x10a3a40: addiu sp, sp, -24
+// 0x010a4088: 0x10a4088: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3a44: 0x10a3a44: addiu a1, a1, 788
+// 0x010a408c: 0x10a408c: addiu a1, a1, 1252
 	ldloc.2
-	ldc.i4 788
+	ldc.i4 1252
 	add
 	stloc.2
-// 0x010a3a48: 0x10a3a48: addiu a3, a3, 1176
+// 0x010a4090: 0x10a4090: addiu a3, a3, 1640
 	ldloc 4
-	ldc.i4 1176
+	ldc.i4 1640
 	add
 	stloc 4
-// 0x010a3a4c: 0x10a3a4c: addiu a0, zero, 4
+// 0x010a4094: 0x10a4094: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a3a50: 0x10a3a50: sw    ra, 20(sp)
-// 0x010a3a54: 0x10a3a54: jal   0x100449c addiu a2, zero, 72
+// 0x010a4098: 0x10a4098: sw    ra, 20(sp)
+// 0x010a409c: 0x10a409c: jal   0x100449c addiu a2, zero, 72
 	ldc.i4.s 72
 	stloc.3
 	ldloc.0
@@ -4886,20 +4886,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a3a5c: 0x10a3a5c: jal   0x1050b24 sll   zero, zero, 0
+// 0x010a40a4: 0x10a40a4: jal   0x1050b34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a3a64: 0x10a3a64: lw    ra, 20(sp)
-// 0x010a3a68: 0x10a3a68: sll   zero, zero, 0
-// 0x010a3a6c: 0x10a3a6c: jr    ra addiu sp, sp, 24
+// 0x010a40ac: 0x10a40ac: lw    ra, 20(sp)
+// 0x010a40b0: 0x10a40b0: sll   zero, zero, 0
+// 0x010a40b4: 0x10a40b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4911,7 +4911,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 terms_of_use_declined_10a3a74(int32,int32,int32,int32,int32)
+.method public static int32 terms_of_use_declined_10a40bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -4946,28 +4946,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3a74: 0x10a3a74: addiu sp, sp, -24
+// 0x010a40bc: 0x10a40bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3a78: 0x10a3a78: sw    ra, 20(sp)
-// 0x010a3a7c: 0x10a3a7c: jal   0x1050b24 sll   zero, zero, 0
+// 0x010a40c0: 0x10a40c0: sw    ra, 20(sp)
+// 0x010a40c4: 0x10a40c4: jal   0x1050b34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a3a84: 0x10a3a84: lw    ra, 20(sp)
-// 0x010a3a88: 0x10a3a88: addiu v0, zero, 1
+// 0x010a40cc: 0x10a40cc: lw    ra, 20(sp)
+// 0x010a40d0: 0x10a40d0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010a3a8c: 0x10a3a8c: jr    ra addiu sp, sp, 24
+// 0x010a40d4: 0x10a40d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4979,7 +4979,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 add_text_to_group_10a3a94(int32,int32,int32,int32,int32)
+.method public static int32 add_text_to_group_10a40dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 ra)
@@ -5023,12 +5023,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3a94: 0x10a3a94: addiu sp, sp, -32
+// 0x010a40dc: 0x10a40dc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a3a98: 0x10a3a98: lw    v1, 48(sp)
+// 0x010a40e0: 0x10a40e0: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5037,7 +5037,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a3a9c: 0x10a3a9c: sw    s1, 20(sp)
+// 0x010a40e4: 0x10a40e4: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5046,7 +5046,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a3aa0: 0x10a3aa0: sw    s0, 16(sp)
+// 0x010a40e8: 0x10a40e8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5055,17 +5055,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a3aa4: 0x10a3aa4: addu  s1, a0, zero
+// 0x010a40ec: 0x10a40ec: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010a3aa8: 0x10a3aa8: addu  s0, a1, zero
+// 0x010a40f0: 0x10a40f0: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010a3aac: 0x10a3aac: addu  v0, a2, zero
+// 0x010a40f4: 0x10a40f4: addu  v0, a2, zero
 	ldloc.3
 	stloc 5
-// 0x010a3ab0: 0x10a3ab0: sw    ra, 28(sp)
-// 0x010a3ab4: 0x10a3ab4: sw    s2, 24(sp)
+// 0x010a40f8: 0x10a40f8: sw    ra, 28(sp)
+// 0x010a40fc: 0x10a40fc: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5074,10 +5074,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a3ab8: 0x10a3ab8: addu  a2, a3, zero
+// 0x010a4100: 0x10a4100: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x010a3abc: 0x10a3abc: lw    a0, 52(sp)
+// 0x010a4104: 0x10a4104: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5086,52 +5086,52 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a3ac0: 0x10a3ac0: beq   v1, zero, 0x10a3ad8 lui   a1, 0x10000
+// 0x010a4108: 0x10a4108: beq   v1, zero, 0x10a4120 lui   a1, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc.2
-	brfalse L_10a3ad8
+	brfalse L_10a4120
 // --- basic block ---
-// 0x010a3ac8: 0x10a3ac8: lui   a3, 0x200000
+// 0x010a4110: 0x10a4110: lui   a3, 0x200000
 	ldc.i4 2097152
 	stloc 4
-// 0x010a3acc: 0x10a3acc: or    a3, v0, a3
+// 0x010a4114: 0x10a4114: or    a3, v0, a3
 	ldloc 5
 	ldloc 4
 	or
 	stloc 4
-// 0x010a3ad0: 0x10a3ad0: j	 0x10a3ae0 addiu a1, a1, 18500
+// 0x010a4118: 0x10a4118: j	 0x10a4128 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-	br L_10a3ae0
+	br L_10a4128
 // --- basic block ---
-L_10a3ad8:
-// 0x010a3ad8: 0x10a3ad8: addiu a1, a1, 18500
+L_10a4120:
+// 0x010a4120: 0x10a4120: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a3adc: 0x10a3adc: addu  a3, v0, zero
+// 0x010a4124: 0x10a4124: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-L_10a3ae0:
-// 0x010a3ae0: 0x10a3ae0: jal   0x1098d10 sll   zero, zero, 0
+L_10a4128:
+// 0x010a4128: 0x10a4128: jal   0x1099358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3ae8: 0x10a3ae8: addu  a0, s1, zero
+// 0x010a4130: 0x10a4130: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010a3aec: 0x10a3aec: jal   0x1001b48 addu  s2, v0, zero
+// 0x010a4134: 0x10a4134: jal   0x1001b48 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -5140,10 +5140,10 @@ L_10a3ae0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3af4: 0x10a3af4: addu  a1, v0, zero
+// 0x010a413c: 0x10a413c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3af8: 0x10a3af8: jal   0x1098cc0 addu  a0, s2, zero
+// 0x010a4140: 0x10a4140: jal   0x1099308 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5151,15 +5151,15 @@ L_10a3ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_set_text_size_1098cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_set_text_size_1099308(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3b00: 0x10a3b00: addu  a0, s2, zero
+// 0x010a4148: 0x10a4148: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010a3b04: 0x10a3b04: jal   0x1097e5c addu  a1, s1, zero
+// 0x010a414c: 0x10a414c: jal   0x10984a4 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5167,25 +5167,25 @@ L_10a3ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3b0c: 0x10a3b0c: addu  a1, s2, zero
+// 0x010a4154: 0x10a4154: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x010a3b10: 0x10a3b10: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4158: 0x10a4158: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3b18: 0x10a3b18: jal   0x10a2dfc addiu a0, zero, 8
+// 0x010a4160: 0x10a4160: jal   0x10a3444 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
 	ldloc.0
@@ -5193,29 +5193,29 @@ L_10a3ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3b20: 0x10a3b20: addu  a1, v0, zero
+// 0x010a4168: 0x10a4168: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3b24: 0x10a3b24: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a416c: 0x10a416c: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a3b2c: 0x10a3b2c: lw    ra, 28(sp)
-// 0x010a3b30: 0x10a3b30: addu  v0, s2, zero
+// 0x010a4174: 0x10a4174: lw    ra, 28(sp)
+// 0x010a4178: 0x10a4178: addu  v0, s2, zero
 	ldloc 8
 	stloc 5
-// 0x010a3b34: 0x10a3b34: lw    s2, 24(sp)
+// 0x010a417c: 0x10a417c: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5224,7 +5224,7 @@ L_10a3ae0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a3b38: 0x10a3b38: lw    s1, 20(sp)
+// 0x010a4180: 0x10a4180: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5233,7 +5233,7 @@ L_10a3ae0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a3b3c: 0x10a3b3c: lw    s0, 16(sp)
+// 0x010a4184: 0x10a4184: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5242,7 +5242,7 @@ L_10a3ae0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a3b40: 0x10a3b40: jr    ra addiu sp, sp, 32
+// 0x010a4188: 0x10a4188: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5254,7 +5254,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_intro_screen_10a3b48(int32,int32,int32,int32,int32)
+.method public static int32 create_intro_screen_10a4190(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s0,int32 s1,int32 s2,int32 s7,int32 s4,int32 s5,int32 s6,int32 ra)
@@ -5313,24 +5313,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3b48: 0x10a3b48: lui   a0, 0x10000
+// 0x010a4190: 0x10a4190: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3b4c: 0x10a3b4c: addiu sp, sp, -120
+// 0x010a4194: 0x10a4194: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x010a3b50: 0x10a3b50: lui   v0, 0xf0000
+// 0x010a4198: 0x10a4198: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a3b54: 0x10a3b54: addiu a0, a0, -2024
+// 0x010a419c: 0x10a419c: addiu a0, a0, -2028
 	ldloc.1
-	ldc.i4 -2024
+	ldc.i4 -2028
 	add
 	stloc.1
-// 0x010a3b58: 0x10a3b58: sw    ra, 116(sp)
-// 0x010a3b5c: 0x10a3b5c: sw    s1, 88(sp)
+// 0x010a41a0: 0x10a41a0: sw    ra, 116(sp)
+// 0x010a41a4: 0x10a41a4: sw    s1, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5339,7 +5339,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a3b60: 0x10a3b60: sw    s0, 84(sp)
+// 0x010a41a8: 0x10a41a8: sw    s0, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5348,7 +5348,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a3b64: 0x10a3b64: sw    s7, 112(sp)
+// 0x010a41ac: 0x10a41ac: sw    s7, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5357,16 +5357,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a3b68: 0x10a3b68: lw    s0, -30068(v0)
+// 0x010a41b0: 0x10a41b0: lw    s0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a3b6c: 0x10a3b6c: sw    s6, 108(sp)
+// 0x010a41b4: 0x10a41b4: sw    s6, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5375,7 +5375,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a3b70: 0x10a3b70: sw    s5, 104(sp)
+// 0x010a41b8: 0x10a41b8: sw    s5, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5384,7 +5384,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a3b74: 0x10a3b74: sw    s4, 100(sp)
+// 0x010a41bc: 0x10a41bc: sw    s4, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5393,7 +5393,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a3b78: 0x10a3b78: sw    s3, 96(sp)
+// 0x010a41c0: 0x10a41c0: sw    s3, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5402,7 +5402,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a3b7c: 0x10a3b7c: jal   0x101cd60 sw    s2, 92(sp)
+// 0x010a41c4: 0x10a41c4: jal   0x101cd70 sw    s2, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5416,17 +5416,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3b84: 0x10a3b84: lui   a0, 0x20000
+// 0x010a41cc: 0x10a41cc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3b88: 0x10a3b88: jal   0x101cd60 addiu a0, a0, 1204
+// 0x010a41d0: 0x10a41d0: jal   0x101cd70 addiu a0, a0, 1668
 	ldloc.1
-	ldc.i4 1204
+	ldc.i4 1668
 	add
 	stloc.1
 	ldloc.0
@@ -5434,31 +5434,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3b90: 0x10a3b90: lui   a0, 0x20000
+// 0x010a41d8: 0x10a41d8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3b94: 0x10a3b94: lui   a3, 0x200000
+// 0x010a41dc: 0x10a41dc: lui   a3, 0x200000
 	ldc.i4 2097152
 	stloc 4
-// 0x010a3b98: 0x10a3b98: addiu a0, a0, 1216
+// 0x010a41e0: 0x10a41e0: addiu a0, a0, 1680
 	ldloc.1
-	ldc.i4 1216
+	ldc.i4 1680
 	add
 	stloc.1
-// 0x010a3b9c: 0x10a3b9c: addu  a1, v0, zero
+// 0x010a41e4: 0x10a41e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3ba0: 0x10a3ba0: ori   a3, a3, 8192
+// 0x010a41e8: 0x10a41e8: ori   a3, a3, 8192
 	ldloc 4
 	ldc.i4 8192
 	or
 	stloc 4
-// 0x010a3ba4: 0x10a3ba4: jal   0x1095a08 addu  a2, zero, zero
+// 0x010a41ec: 0x10a41ec: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5466,45 +5466,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3bac: 0x10a3bac: addiu s0, s0, -10
+// 0x010a41f4: 0x10a41f4: addiu s0, s0, -10
 	ldloc 9
 	ldc.i4.s -10
 	add
 	stloc 9
-// 0x010a3bb0: 0x10a3bb0: addu  s1, v0, zero
+// 0x010a41f8: 0x10a41f8: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010a3bb4: 0x10a3bb4: lui   a0, 0x20000
+// 0x010a41fc: 0x10a41fc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3bb8: 0x10a3bb8: lui   v0, 0x40000000
+// 0x010a4200: 0x10a4200: lui   v0, 0x40000000
 	ldc.i4 1073741824
 	stloc 5
-// 0x010a3bbc: 0x10a3bbc: addiu a3, zero, -1
+// 0x010a4204: 0x10a4204: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a3bc0: 0x10a3bc0: addu  a2, s0, zero
+// 0x010a4208: 0x10a4208: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x010a3bc4: 0x10a3bc4: addiu a0, a0, 904
+// 0x010a420c: 0x10a420c: addiu a0, a0, 1368
 	ldloc.1
-	ldc.i4 904
+	ldc.i4 1368
 	add
 	stloc.1
-// 0x010a3bc8: 0x10a3bc8: addu  a1, zero, zero
+// 0x010a4210: 0x10a4210: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3bcc: 0x10a3bcc: ori   v0, v0, 20633
+// 0x010a4214: 0x10a4214: ori   v0, v0, 20633
 	ldloc 5
 	ldc.i4 20633
 	or
 	stloc 5
-// 0x010a3bd0: 0x10a3bd0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a4218: 0x10a4218: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5518,29 +5518,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3bd8: 0x10a3bd8: addu  a0, v0, zero
+// 0x010a4220: 0x10a4220: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3bdc: 0x10a3bdc: addu  a2, zero, zero
+// 0x010a4224: 0x10a4224: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a3be0: 0x10a3be0: addu  a1, zero, zero
+// 0x010a4228: 0x10a4228: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3be4: 0x10a3be4: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a422c: 0x10a422c: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a3bec: 0x10a3bec: jal   0x10a2dfc addiu a0, zero, 8
+// 0x010a4234: 0x10a4234: jal   0x10a3444 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
 	ldloc.0
@@ -5548,44 +5548,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3bf4: 0x10a3bf4: addu  a1, v0, zero
+// 0x010a423c: 0x10a423c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3bf8: 0x10a3bf8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4240: 0x10a4240: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3c00: 0x10a3c00: jal   0x101d484 sll   zero, zero, 0
+// 0x010a4248: 0x10a4248: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3c08: 0x10a3c08: lui   a1, 0x10000
+// 0x010a4250: 0x10a4250: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a3c0c: 0x10a3c0c: addu  a0, v0, zero
+// 0x010a4254: 0x10a4254: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3c10: 0x10a3c10: jal   0x1000420 addiu a1, a1, 5016
+// 0x010a4258: 0x10a4258: jal   0x1000420 addiu a1, a1, 5012
 	ldloc.2
-	ldc.i4 5016
+	ldc.i4 5012
 	add
 	stloc.2
 	ldloc.0
@@ -5598,84 +5598,84 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3c18: 0x10a3c18: bne   v0, zero, 0x10a3c28 lui   s3, 0x0
+// 0x010a4260: 0x10a4260: bne   v0, zero, 0x10a4270 lui   s3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_10a3c28
+	brtrue L_10a4270
 // --- basic block ---
-// 0x010a3c20: 0x10a3c20: j	 0x10a3c30 addiu s3, s3, 18204
+// 0x010a4268: 0x10a4268: j	 0x10a4278 addiu s3, s3, 18204
 	ldloc 8
 	ldc.i4 18204
 	add
 	stloc 8
-	br L_10a3c30
+	br L_10a4278
 // --- basic block ---
-L_10a3c28:
-// 0x010a3c28: 0x10a3c28: lui   s3, 0x0
+L_10a4270:
+// 0x010a4270: 0x10a4270: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a3c2c: 0x10a3c2c: addiu s3, s3, 18184
+// 0x010a4274: 0x10a4274: addiu s3, s3, 18184
 	ldloc 8
 	ldc.i4 18184
 	add
 	stloc 8
-L_10a3c30:
-// 0x010a3c30: 0x10a3c30: lui   s7, 0x20000
+L_10a4278:
+// 0x010a4278: 0x10a4278: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x010a3c34: 0x10a3c34: addiu s7, s7, 1232
+// 0x010a427c: 0x10a427c: addiu s7, s7, 1696
 	ldloc 12
-	ldc.i4 1232
+	ldc.i4 1696
 	add
 	stloc 12
-// 0x010a3c38: 0x10a3c38: addu  v0, zero, zero
+// 0x010a4280: 0x10a4280: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a3c3c: 0x10a3c3c: addiu s5, zero, 1
+// 0x010a4284: 0x10a4284: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 14
-// 0x010a3c40: 0x10a3c40: addu  s2, zero, zero
+// 0x010a4288: 0x10a4288: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010a3c44: 0x10a3c44: addiu s4, sp, 24
+// 0x010a428c: 0x10a428c: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 13
-// 0x010a3c48: 0x10a3c48: addiu s6, zero, 5
+// 0x010a4290: 0x10a4290: addiu s6, zero, 5
 	ldc.i4.5
 	stloc 15
-L_10a3c4c:
-// 0x010a3c4c: 0x10a3c4c: lw    v1, 0(s3)
+L_10a4294:
+// 0x010a4294: 0x10a4294: lw    v1, 0(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010a3c50: 0x10a3c50: addu  a2, s2, zero
+// 0x010a4298: 0x10a4298: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x010a3c54: 0x10a3c54: lbu   v1, 0(v1)
+// 0x010a429c: 0x10a429c: lbu   v1, 0(v1)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x010a3c58: 0x10a3c58: addu  a0, s4, zero
+// 0x010a42a0: 0x10a42a0: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010a3c5c: 0x10a3c5c: addu  a1, s7, zero
+// 0x010a42a4: 0x10a42a4: addu  a1, s7, zero
 	ldloc 12
 	stloc.2
-// 0x010a3c60: 0x10a3c60: beq   v1, zero, 0x10a3c98 addiu s2, s2, 1
+// 0x010a42a8: 0x10a42a8: beq   v1, zero, 0x10a42e0 addiu s2, s2, 1
 	ldloc 6
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brfalse L_10a3c98
+	brfalse L_10a42e0
 // --- basic block ---
-// 0x010a3c68: 0x10a3c68: jal   0x1000f64 sll   zero, zero, 0
+// 0x010a42b0: 0x10a42b0: jal   0x1000f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5686,23 +5686,23 @@ L_10a3c4c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3c70: 0x10a3c70: lw    a0, 0(s3)
+// 0x010a42b8: 0x10a42b8: lw    a0, 0(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a3c74: 0x10a3c74: addu  a1, s0, zero
+// 0x010a42bc: 0x10a42bc: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010a3c78: 0x10a3c78: lui   a2, 0x100000
+// 0x010a42c0: 0x10a42c0: lui   a2, 0x100000
 	ldc.i4 1048576
 	stloc.3
-// 0x010a3c7c: 0x10a3c7c: addiu a3, zero, 12
+// 0x010a42c4: 0x10a42c4: addiu a3, zero, 12
 	ldc.i4.s 12
 	stloc 4
-// 0x010a3c80: 0x10a3c80: sw    s5, 16(sp)
+// 0x010a42c8: 0x10a42c8: sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5711,7 +5711,7 @@ L_10a3c4c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a3c84: 0x10a3c84: sw    s4, 20(sp)
+// 0x010a42cc: 0x10a42cc: sw    s4, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5720,7 +5720,7 @@ L_10a3c4c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a3c88: 0x10a3c88: jal   0x10a3a94 addiu s3, s3, 4
+// 0x010a42d0: 0x10a42d0: jal   0x10a40dc addiu s3, s3, 4
 	ldloc 8
 	ldc.i4.4
 	add
@@ -5730,31 +5730,31 @@ L_10a3c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::add_text_to_group_10a3a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::add_text_to_group_10a40dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3c90: 0x10a3c90: bne   s2, s6, 0x10a3c4c addu  s5, zero, zero
+// 0x010a42d8: 0x10a42d8: bne   s2, s6, 0x10a4294 addu  s5, zero, zero
 	ldloc 11
 	ldloc 15
 	ldc.i4.s 0
 	stloc 14
-	bne.un L_10a3c4c
+	bne.un L_10a4294
 // --- basic block ---
-L_10a3c98:
-// 0x010a3c98: 0x10a3c98: lui   v1, 0x10a0000
+L_10a42e0:
+// 0x010a42e0: 0x10a42e0: lui   v1, 0x10a0000
 	ldc.i4 17432576
 	stloc 6
-// 0x010a3c9c: 0x10a3c9c: addiu v1, v1, 11700
+// 0x010a42e4: 0x10a42e4: addiu v1, v1, 13308
 	ldloc 6
-	ldc.i4 11700
+	ldc.i4 13308
 	add
 	stloc 6
-// 0x010a3ca0: 0x10a3ca0: lui   a0, 0x20000
+// 0x010a42e8: 0x10a42e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3ca4: 0x10a3ca4: sw    v1, 216(v0)
+// 0x010a42ec: 0x10a42ec: sw    v1, 216(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5763,9 +5763,9 @@ L_10a3c98:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a3ca8: 0x10a3ca8: jal   0x101cd60 addiu a0, a0, -1164
+// 0x010a42f0: 0x10a42f0: jal   0x101cd70 addiu a0, a0, -700
 	ldloc.1
-	ldc.i4 -1164
+	ldc.i4 -700
 	add
 	stloc.1
 	ldloc.0
@@ -5773,15 +5773,15 @@ L_10a3c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3cb0: 0x10a3cb0: addu  a1, v0, zero
+// 0x010a42f8: 0x10a42f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3cb4: 0x10a3cb4: jal   0x109b50c addu  a0, s1, zero
+// 0x010a42fc: 0x10a42fc: jal   0x109bb54 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5789,32 +5789,32 @@ L_10a3c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3cbc: 0x10a3cbc: lui   a1, 0x10a0000
+// 0x010a4304: 0x10a4304: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a3cc0: 0x10a3cc0: addu  a0, s1, zero
+// 0x010a4308: 0x10a4308: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010a3cc4: 0x10a3cc4: jal   0x109917c addiu a1, a1, 14188
+// 0x010a430c: 0x10a430c: jal   0x10997c4 addiu a1, a1, 15796
 	ldloc.2
-	ldc.i4 14188
+	ldc.i4 15796
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_right_softkey_callback_109917c(int32,int32)
+	call void Cibyl114::ssd_widget_set_right_softkey_callback_10997c4(int32,int32)
 // --- basic block ---
-// 0x010a3ccc: 0x10a3ccc: lui   a0, 0x10000
+// 0x010a4314: 0x10a4314: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3cd0: 0x10a3cd0: jal   0x101cd60 addiu a0, a0, 18500
+// 0x010a4318: 0x10a4318: jal   0x101cd70 addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -5822,15 +5822,15 @@ L_10a3c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3cd8: 0x10a3cd8: addu  a1, v0, zero
+// 0x010a4320: 0x10a4320: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3cdc: 0x10a3cdc: jal   0x109b434 addu  a0, s1, zero
+// 0x010a4324: 0x10a4324: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5838,27 +5838,27 @@ L_10a3c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3ce4: 0x10a3ce4: lui   a1, 0x10a0000
+// 0x010a432c: 0x10a432c: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a3ce8: 0x10a3ce8: addu  a0, s1, zero
+// 0x010a4330: 0x10a4330: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010a3cec: 0x10a3cec: jal   0x1099174 addiu a1, a1, 11676
+// 0x010a4334: 0x10a4334: jal   0x10997bc addiu a1, a1, 13284
 	ldloc.2
-	ldc.i4 11676
+	ldc.i4 13284
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x010a3cf4: 0x10a3cf4: jal   0x10a2dfc addiu a0, zero, 20
+// 0x010a433c: 0x10a433c: jal   0x10a3444 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -5866,46 +5866,46 @@ L_10a3c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3cfc: 0x10a3cfc: addu  a1, v0, zero
+// 0x010a4344: 0x10a4344: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3d00: 0x10a3d00: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4348: 0x10a4348: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3d08: 0x10a3d08: addu  a0, s1, zero
+// 0x010a4350: 0x10a4350: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010a3d0c: 0x10a3d0c: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a4354: 0x10a4354: jal   0x109950c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3d14: 0x10a3d14: lui   a0, 0x20000
+// 0x010a435c: 0x10a435c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3d18: 0x10a3d18: addiu a0, a0, 1216
+// 0x010a4360: 0x10a4360: addiu a0, a0, 1680
 	ldloc.1
-	ldc.i4 1216
+	ldc.i4 1680
 	add
 	stloc.1
-// 0x010a3d1c: 0x10a3d1c: jal   0x1095eec addu  a1, zero, zero
+// 0x010a4364: 0x10a4364: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5913,24 +5913,24 @@ L_10a3c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3d24: 0x10a3d24: jal   0x1021900 sll   zero, zero, 0
+// 0x010a436c: 0x10a436c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3d2c: 0x10a3d2c: lw    ra, 116(sp)
-// 0x010a3d30: 0x10a3d30: lw    s7, 112(sp)
+// 0x010a4374: 0x10a4374: lw    ra, 116(sp)
+// 0x010a4378: 0x10a4378: lw    s7, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5939,7 +5939,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a3d34: 0x10a3d34: lw    s6, 108(sp)
+// 0x010a437c: 0x10a437c: lw    s6, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5948,7 +5948,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a3d38: 0x10a3d38: lw    s5, 104(sp)
+// 0x010a4380: 0x10a4380: lw    s5, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5957,7 +5957,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a3d3c: 0x10a3d3c: lw    s4, 100(sp)
+// 0x010a4384: 0x10a4384: lw    s4, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5966,7 +5966,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a3d40: 0x10a3d40: lw    s3, 96(sp)
+// 0x010a4388: 0x10a4388: lw    s3, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5975,7 +5975,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a3d44: 0x10a3d44: lw    s2, 92(sp)
+// 0x010a438c: 0x10a438c: lw    s2, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5984,7 +5984,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a3d48: 0x10a3d48: lw    s1, 88(sp)
+// 0x010a4390: 0x10a4390: lw    s1, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5993,7 +5993,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a3d4c: 0x10a3d4c: lw    s0, 84(sp)
+// 0x010a4394: 0x10a4394: lw    s0, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6002,7 +6002,7 @@ L_10a3c98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a3d50: 0x10a3d50: jr    ra addiu sp, sp, 120
+// 0x010a4398: 0x10a4398: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
@@ -6014,7 +6014,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rim_terms_of_use_accepted_10a3d58(int32,int32,int32,int32,int32)
+.method public static int32 rim_terms_of_use_accepted_10a43a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6049,59 +6049,59 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3d58: 0x10a3d58: addiu sp, sp, -24
+// 0x010a43a0: 0x10a43a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3d5c: 0x10a3d5c: sw    ra, 20(sp)
-// 0x010a3d60: 0x10a3d60: jal   0x10a32d0 sll   zero, zero, 0
+// 0x010a43a4: 0x10a43a4: sw    ra, 20(sp)
+// 0x010a43a8: 0x10a43a8: jal   0x10a3918 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::set_terms_accepted_10a32d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::set_terms_accepted_10a3918(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3d68: 0x10a3d68: jal   0x10a3324 sll   zero, zero, 0
+// 0x010a43b0: 0x10a43b0: jal   0x10a396c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::is_show_intro_screen_10a3324(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::is_show_intro_screen_10a396c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3d70: 0x10a3d70: beq   v0, zero, 0x10a3d88 addu  a0, zero, zero
+// 0x010a43b8: 0x10a43b8: beq   v0, zero, 0x10a43d0 addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a3d88
+	brfalse L_10a43d0
 // --- basic block ---
-// 0x010a3d78: 0x10a3d78: jal   0x10a3b48 sll   zero, zero, 0
+// 0x010a43c0: 0x10a43c0: jal   0x10a4190 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::create_intro_screen_10a3b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::create_intro_screen_10a4190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3d80: 0x10a3d80: j	 0x10a3d94 sll   zero, zero, 0
-	br L_10a3d94
+// 0x010a43c8: 0x10a43c8: j	 0x10a43dc sll   zero, zero, 0
+	br L_10a43dc
 // --- basic block ---
-L_10a3d88:
-// 0x010a3d88: 0x10a3d88: addu  a1, zero, zero
+L_10a43d0:
+// 0x010a43d0: 0x10a43d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3d8c: 0x10a3d8c: jal   0x10a376c addu  a2, zero, zero
+// 0x010a43d4: 0x10a43d4: jal   0x10a3db4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6109,15 +6109,15 @@ L_10a3d88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::callGlobalCallback_10a376c(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::callGlobalCallback_10a3db4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a3d94:
-// 0x010a3d94: 0x10a3d94: lw    ra, 20(sp)
-// 0x010a3d98: 0x10a3d98: sll   zero, zero, 0
-// 0x010a3d9c: 0x10a3d9c: jr    ra addiu sp, sp, 24
+L_10a43dc:
+// 0x010a43dc: 0x10a43dc: lw    ra, 20(sp)
+// 0x010a43e0: 0x10a43e0: sll   zero, zero, 0
+// 0x010a43e4: 0x10a43e4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6129,7 +6129,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 terms_of_use_accepted_10a3da4(int32,int32,int32,int32,int32)
+.method public static int32 terms_of_use_accepted_10a43ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6164,59 +6164,59 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3da4: 0x10a3da4: addiu sp, sp, -24
+// 0x010a43ec: 0x10a43ec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a3da8: 0x10a3da8: sw    ra, 20(sp)
-// 0x010a3dac: 0x10a3dac: jal   0x10a32d0 sll   zero, zero, 0
+// 0x010a43f0: 0x10a43f0: sw    ra, 20(sp)
+// 0x010a43f4: 0x10a43f4: jal   0x10a3918 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::set_terms_accepted_10a32d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::set_terms_accepted_10a3918(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3db4: 0x10a3db4: jal   0x10a3324 sll   zero, zero, 0
+// 0x010a43fc: 0x10a43fc: jal   0x10a396c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::is_show_intro_screen_10a3324(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::is_show_intro_screen_10a396c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3dbc: 0x10a3dbc: beq   v0, zero, 0x10a3dd4 addu  a0, zero, zero
+// 0x010a4404: 0x10a4404: beq   v0, zero, 0x10a441c addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a3dd4
+	brfalse L_10a441c
 // --- basic block ---
-// 0x010a3dc4: 0x10a3dc4: jal   0x10a3b48 sll   zero, zero, 0
+// 0x010a440c: 0x10a440c: jal   0x10a4190 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::create_intro_screen_10a3b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::create_intro_screen_10a4190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3dcc: 0x10a3dcc: j	 0x10a3de0 sll   zero, zero, 0
-	br L_10a3de0
+// 0x010a4414: 0x10a4414: j	 0x10a4428 sll   zero, zero, 0
+	br L_10a4428
 // --- basic block ---
-L_10a3dd4:
-// 0x010a3dd4: 0x10a3dd4: addu  a1, zero, zero
+L_10a441c:
+// 0x010a441c: 0x10a441c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3dd8: 0x10a3dd8: jal   0x10a376c addu  a2, zero, zero
+// 0x010a4420: 0x10a4420: jal   0x10a3db4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6224,17 +6224,17 @@ L_10a3dd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::callGlobalCallback_10a376c(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::callGlobalCallback_10a3db4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a3de0:
-// 0x010a3de0: 0x10a3de0: lw    ra, 20(sp)
-// 0x010a3de4: 0x10a3de4: addiu v0, zero, 1
+L_10a4428:
+// 0x010a4428: 0x10a4428: lw    ra, 20(sp)
+// 0x010a442c: 0x10a442c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a3de8: 0x10a3de8: jr    ra addiu sp, sp, 24
+// 0x010a4430: 0x10a4430: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6246,7 +6246,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 welcome_wizard_twitter_dialog_10a3df0(int32,int32,int32,int32,int32)
+.method public static int32 welcome_wizard_twitter_dialog_10a4438(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s8,int32 s5,int32 s6,int32 s2,int32 s3,int32 s4,int32 s7,int32 ra,int32 lo)
@@ -6311,15 +6311,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a3df0: 0x10a3df0: addiu sp, sp, -80
+// 0x010a4438: 0x10a4438: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010a3df4: 0x10a3df4: lui   v0, 0xf0000
+// 0x010a443c: 0x10a443c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a3df8: 0x10a3df8: sw    s6, 64(sp)
+// 0x010a4440: 0x10a4440: sw    s6, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6328,25 +6328,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a3dfc: 0x10a3dfc: lw    s6, -30068(v0)
+// 0x010a4444: 0x10a4444: lw    s6, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a3e00: 0x10a3e00: addiu v0, zero, 2
+// 0x010a4448: 0x10a4448: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a3e04: 0x10a3e04: div   s6, v0
+// 0x010a444c: 0x10a444c: div   s6, v0
 	ldloc 12
 	ldloc 5
 	div
 	stloc 18
-// 0x010a3e08: 0x10a3e08: sw    ra, 76(sp)
-// 0x010a3e0c: 0x10a3e0c: sw    s8, 72(sp)
+// 0x010a4450: 0x10a4450: sw    ra, 76(sp)
+// 0x010a4454: 0x10a4454: sw    s8, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6355,7 +6355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a3e10: 0x10a3e10: sw    s7, 68(sp)
+// 0x010a4458: 0x10a4458: sw    s7, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6364,7 +6364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a3e14: 0x10a3e14: sw    s5, 60(sp)
+// 0x010a445c: 0x10a445c: sw    s5, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6373,7 +6373,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a3e18: 0x10a3e18: sw    s4, 56(sp)
+// 0x010a4460: 0x10a4460: sw    s4, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6382,7 +6382,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a3e1c: 0x10a3e1c: sw    s3, 52(sp)
+// 0x010a4464: 0x10a4464: sw    s3, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6391,7 +6391,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a3e20: 0x10a3e20: sw    s2, 48(sp)
+// 0x010a4468: 0x10a4468: sw    s2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6400,7 +6400,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a3e24: 0x10a3e24: sw    s1, 44(sp)
+// 0x010a446c: 0x10a446c: sw    s1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6409,7 +6409,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a3e28: 0x10a3e28: sw    s0, 40(sp)
+// 0x010a4470: 0x10a4470: sw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6418,25 +6418,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a3e2c: 0x10a3e2c: lui   s4, 0x10000
+// 0x010a4474: 0x10a4474: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 15
-// 0x010a3e30: 0x10a3e30: lui   s8, 0x100000
+// 0x010a4478: 0x10a4478: lui   s8, 0x100000
 	ldc.i4 1048576
 	stloc 10
-// 0x010a3e34: 0x10a3e34: lui   s1, 0x20000
+// 0x010a447c: 0x10a447c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010a3e38: 0x10a3e38: lui   s3, 0x20000
+// 0x010a4480: 0x10a4480: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x010a3e3c: 0x10a3e3c: lui   s5, 0x0
+// 0x010a4484: 0x10a4484: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010a3e40: 0x10a3e40: mflo  lo
+// 0x010a4488: 0x10a4488: mflo  lo
 	ldloc 18
 	stloc 12
-// 0x010a3e44: 0x10a3e44: jal   0x10a322c lui   s7, 0x10000
+// 0x010a448c: 0x10a448c: jal   0x10a3874 lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 16
 	ldloc.0
@@ -6444,17 +6444,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::set_first_time_no_10a322c(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::set_first_time_no_10a3874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3e4c: 0x10a3e4c: lui   a0, 0x20000
+// 0x010a4494: 0x10a4494: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3e50: 0x10a3e50: jal   0x101cd60 addiu a0, a0, 1256
+// 0x010a4498: 0x10a4498: jal   0x101cd70 addiu a0, a0, 1720
 	ldloc.1
-	ldc.i4 1256
+	ldc.i4 1720
 	add
 	stloc.1
 	ldloc.0
@@ -6462,25 +6462,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3e58: 0x10a3e58: addu  a1, v0, zero
+// 0x010a44a0: 0x10a44a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3e5c: 0x10a3e5c: addiu a0, s4, -27864
+// 0x010a44a4: 0x10a44a4: addiu a0, s4, -27864
 	ldloc 15
 	ldc.i4 -27864
 	add
 	stloc.1
-// 0x010a3e60: 0x10a3e60: ori   a3, s8, 8192
+// 0x010a44a8: 0x10a44a8: ori   a3, s8, 8192
 	ldloc 10
 	ldc.i4 8192
 	or
 	stloc 4
-// 0x010a3e64: 0x10a3e64: jal   0x1095a08 addu  a2, zero, zero
+// 0x010a44ac: 0x10a44ac: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6488,37 +6488,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3e6c: 0x10a3e6c: addu  s2, v0, zero
+// 0x010a44b4: 0x10a44b4: addu  s2, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010a3e70: 0x10a3e70: lui   v0, 0x40000000
+// 0x010a44b8: 0x10a44b8: lui   v0, 0x40000000
 	ldc.i4 1073741824
 	stloc 5
-// 0x010a3e74: 0x10a3e74: addiu a3, zero, -1
+// 0x010a44bc: 0x10a44bc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a3e78: 0x10a3e78: addiu a0, s1, 1280
+// 0x010a44c0: 0x10a44c0: addiu a0, s1, 1744
 	ldloc 8
-	ldc.i4 1280
+	ldc.i4 1744
 	add
 	stloc.1
-// 0x010a3e7c: 0x10a3e7c: addu  a1, zero, zero
+// 0x010a44c4: 0x10a44c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3e80: 0x10a3e80: addiu a2, zero, -2
+// 0x010a44c8: 0x10a44c8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a3e84: 0x10a3e84: ori   v0, v0, 20632
+// 0x010a44cc: 0x10a44cc: ori   v0, v0, 20632
 	ldloc 5
 	ldc.i4 20632
 	or
 	stloc 5
-// 0x010a3e88: 0x10a3e88: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a44d0: 0x10a44d0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6532,29 +6532,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3e90: 0x10a3e90: addu  a0, v0, zero
+// 0x010a44d8: 0x10a44d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3e94: 0x10a3e94: addu  a2, zero, zero
+// 0x010a44dc: 0x10a44dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a3e98: 0x10a3e98: addu  a1, zero, zero
+// 0x010a44e0: 0x10a44e0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3e9c: 0x10a3e9c: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a44e4: 0x10a44e4: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a3ea4: 0x10a3ea4: jal   0x10a2dfc addiu a0, zero, 5
+// 0x010a44ec: 0x10a44ec: jal   0x10a3444 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -6562,42 +6562,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3eac: 0x10a3eac: addu  a1, v0, zero
+// 0x010a44f4: 0x10a44f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3eb0: 0x10a3eb0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a44f8: 0x10a44f8: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3eb8: 0x10a3eb8: addiu a3, zero, -1
+// 0x010a4500: 0x10a4500: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a3ebc: 0x10a3ebc: addiu a0, s1, 1280
+// 0x010a4504: 0x10a4504: addiu a0, s1, 1744
 	ldloc 8
-	ldc.i4 1280
+	ldc.i4 1744
 	add
 	stloc.1
-// 0x010a3ec0: 0x10a3ec0: addu  a1, zero, zero
+// 0x010a4508: 0x10a4508: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3ec4: 0x10a3ec4: addiu a2, zero, -2
+// 0x010a450c: 0x10a450c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a3ec8: 0x10a3ec8: addiu v0, zero, 136
+// 0x010a4510: 0x10a4510: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a3ecc: 0x10a3ecc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a4514: 0x10a4514: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6611,43 +6611,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3ed4: 0x10a3ed4: addu  a0, v0, zero
+// 0x010a451c: 0x10a451c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3ed8: 0x10a3ed8: addu  a1, zero, zero
+// 0x010a4520: 0x10a4520: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3edc: 0x10a3edc: addu  a2, zero, zero
+// 0x010a4524: 0x10a4524: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a3ee0: 0x10a3ee0: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010a4528: 0x10a4528: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a3ee8: 0x10a3ee8: lui   a0, 0x20000
+// 0x010a4530: 0x10a4530: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3eec: 0x10a3eec: lui   a1, 0x10000
+// 0x010a4534: 0x10a4534: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a3ef0: 0x10a3ef0: addiu a2, zero, 16
+// 0x010a4538: 0x10a4538: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a3ef4: 0x10a3ef4: addiu a0, a0, 1300
+// 0x010a453c: 0x10a453c: addiu a0, a0, 1764
 	ldloc.1
-	ldc.i4 1300
+	ldc.i4 1764
 	add
 	stloc.1
-// 0x010a3ef8: 0x10a3ef8: jal   0x109e13c addiu a1, a1, -27776
+// 0x010a4540: 0x10a4540: jal   0x109e784 addiu a1, a1, -27776
 	ldloc.2
 	ldc.i4 -27776
 	add
@@ -6657,30 +6657,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f00: 0x10a3f00: addu  a1, v0, zero
+// 0x010a4548: 0x10a4548: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3f04: 0x10a3f04: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a454c: 0x10a454c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f0c: 0x10a3f0c: lui   a0, 0x20000
+// 0x010a4554: 0x10a4554: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a3f10: 0x10a3f10: jal   0x101cd60 addiu a0, a0, 1316
+// 0x010a4558: 0x10a4558: jal   0x101cd70 addiu a0, a0, 1780
 	ldloc.1
-	ldc.i4 1316
+	ldc.i4 1780
 	add
 	stloc.1
 	ldloc.0
@@ -6688,23 +6688,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f18: 0x10a3f18: addu  a1, v0, zero
+// 0x010a4560: 0x10a4560: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3f1c: 0x10a3f1c: addiu a3, zero, 4112
+// 0x010a4564: 0x10a4564: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a3f20: 0x10a3f20: addiu a0, s3, 9016
+// 0x010a4568: 0x10a4568: addiu a0, s3, 9480
 	ldloc 14
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x010a3f24: 0x10a3f24: jal   0x1098d10 addiu a2, zero, 18
+// 0x010a456c: 0x10a456c: jal   0x1099358 addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
 	ldloc.0
@@ -6712,26 +6712,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f2c: 0x10a3f2c: lui   a1, 0x20000
+// 0x010a4574: 0x10a4574: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a3f30: 0x10a3f30: addiu a1, a1, 1340
+// 0x010a4578: 0x10a4578: addiu a1, a1, 1804
 	ldloc.2
-	ldc.i4 1340
+	ldc.i4 1804
 	add
 	stloc.2
-// 0x010a3f34: 0x10a3f34: addu  a2, a1, zero
+// 0x010a457c: 0x10a457c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010a3f38: 0x10a3f38: addu  a0, v0, zero
+// 0x010a4580: 0x10a4580: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3f3c: 0x10a3f3c: jal   0x1098fe0 sw    v0, 32(sp)
+// 0x010a4584: 0x10a4584: jal   0x1099628 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6743,9 +6743,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a3f44: 0x10a3f44: lw    v0, 32(sp)
+// 0x010a458c: 0x10a458c: lw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6754,33 +6754,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a3f48: 0x10a3f48: addu  a0, s1, zero
+// 0x010a4590: 0x10a4590: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a3f4c: 0x10a3f4c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a4594: 0x10a4594: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f54: 0x10a3f54: addu  a1, s1, zero
+// 0x010a459c: 0x10a459c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010a3f58: 0x10a3f58: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a45a0: 0x10a45a0: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f60: 0x10a3f60: jal   0x10a2dfc addiu a0, zero, 5
+// 0x010a45a8: 0x10a45a8: jal   0x10a3444 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -6788,25 +6788,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f68: 0x10a3f68: addu  a1, v0, zero
+// 0x010a45b0: 0x10a45b0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3f6c: 0x10a3f6c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a45b4: 0x10a45b4: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f74: 0x10a3f74: jal   0x10939c0 ori   s8, s8, 136
+// 0x010a45bc: 0x10a45bc: jal   0x1093fe4 ori   s8, s8, 136
 	ldloc 10
 	ldc.i4 136
 	or
@@ -6816,37 +6816,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_get_txtbox_height_10939c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_get_txtbox_height_1093fe4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3f7c: 0x10a3f7c: addu  a3, v0, zero
+// 0x010a45c4: 0x10a45c4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a3f80: 0x10a3f80: lui   a0, 0x10000
+// 0x010a45c8: 0x10a45c8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3f84: 0x10a3f84: lui   v0, 0x300000
+// 0x010a45cc: 0x10a45cc: lui   v0, 0x300000
 	ldc.i4 3145728
 	stloc 5
-// 0x010a3f88: 0x10a3f88: addiu a0, a0, -27732
+// 0x010a45d0: 0x10a45d0: addiu a0, a0, -27732
 	ldloc.1
 	ldc.i4 -27732
 	add
 	stloc.1
-// 0x010a3f8c: 0x10a3f8c: addu  a1, zero, zero
+// 0x010a45d4: 0x10a45d4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3f90: 0x10a3f90: addiu a2, zero, -2
+// 0x010a45d8: 0x10a45d8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a3f94: 0x10a3f94: ori   v0, v0, 136
+// 0x010a45dc: 0x10a45dc: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010a3f98: 0x10a3f98: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a45e0: 0x10a45e0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6860,29 +6860,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3fa0: 0x10a3fa0: addu  a0, v0, zero
+// 0x010a45e8: 0x10a45e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a3fa4: 0x10a3fa4: addu  a1, zero, zero
+// 0x010a45ec: 0x10a45ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a3fa8: 0x10a3fa8: addu  a2, zero, zero
+// 0x010a45f0: 0x10a45f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a3fac: 0x10a3fac: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010a45f4: 0x10a45f4: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a3fb4: 0x10a3fb4: jal   0x101cd60 addiu a0, s5, 32704
+// 0x010a45fc: 0x10a45fc: jal   0x101cd70 addiu a0, s5, 32704
 	ldloc 11
 	ldc.i4 32704
 	add
@@ -6892,23 +6892,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3fbc: 0x10a3fbc: addu  a1, v0, zero
+// 0x010a4604: 0x10a4604: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3fc0: 0x10a3fc0: addiu a2, zero, 18
+// 0x010a4608: 0x10a4608: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a3fc4: 0x10a3fc4: addiu a3, zero, 4112
+// 0x010a460c: 0x10a460c: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a3fc8: 0x10a3fc8: jal   0x1098d10 addiu a0, s3, 9016
+// 0x010a4610: 0x10a4610: jal   0x1099358 addiu a0, s3, 9480
 	ldloc 14
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -6916,25 +6916,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3fd0: 0x10a3fd0: addu  a1, v0, zero
+// 0x010a4618: 0x10a4618: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a3fd4: 0x10a3fd4: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a461c: 0x10a461c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3fdc: 0x10a3fdc: jal   0x101cd60 addiu a0, s5, 32704
+// 0x010a4624: 0x10a4624: jal   0x101cd70 addiu a0, s5, 32704
 	ldloc 11
 	ldc.i4 32704
 	add
@@ -6944,34 +6944,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a3fe4: 0x10a3fe4: lui   a0, 0x10000
+// 0x010a462c: 0x10a462c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a3fe8: 0x10a3fe8: addiu a2, zero, 18
+// 0x010a4630: 0x10a4630: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a3fec: 0x10a3fec: addu  a3, zero, zero
+// 0x010a4634: 0x10a4634: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a3ff0: 0x10a3ff0: addiu s5, zero, -1
+// 0x010a4638: 0x10a4638: addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x010a3ff4: 0x10a3ff4: addiu a1, s7, 18500
+// 0x010a463c: 0x10a463c: addiu a1, s7, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a3ff8: 0x10a3ff8: addiu a0, a0, -28668
+// 0x010a4640: 0x10a4640: addiu a0, a0, -28668
 	ldloc.1
 	ldc.i4 -28668
 	add
 	stloc.1
-// 0x010a3ffc: 0x10a3ffc: sw    s6, 16(sp)
+// 0x010a4644: 0x10a4644: sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6980,7 +6980,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a4000: 0x10a4000: sw    s5, 20(sp)
+// 0x010a4648: 0x10a4648: sw    s5, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6989,7 +6989,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a4004: 0x10a4004: jal   0x109683c sw    v0, 24(sp)
+// 0x010a464c: 0x10a464c: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7003,38 +7003,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a400c: 0x10a400c: addu  a1, v0, zero
+// 0x010a4654: 0x10a4654: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4010: 0x10a4010: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a4658: 0x10a4658: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4018: 0x10a4018: addu  a1, s1, zero
+// 0x010a4660: 0x10a4660: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010a401c: 0x10a401c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4664: 0x10a4664: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4024: 0x10a4024: jal   0x10a2dfc addiu a0, zero, 5
+// 0x010a466c: 0x10a466c: jal   0x10a3444 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -7042,53 +7042,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a402c: 0x10a402c: addu  a1, v0, zero
+// 0x010a4674: 0x10a4674: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4030: 0x10a4030: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4678: 0x10a4678: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4038: 0x10a4038: jal   0x10939c0 sll   zero, zero, 0
+// 0x010a4680: 0x10a4680: jal   0x1093fe4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_get_txtbox_height_10939c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_get_txtbox_height_1093fe4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4040: 0x10a4040: lui   a0, 0x20000
+// 0x010a4688: 0x10a4688: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a4044: 0x10a4044: addu  a3, v0, zero
+// 0x010a468c: 0x10a468c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a4048: 0x10a4048: addiu a0, a0, 1348
+// 0x010a4690: 0x10a4690: addiu a0, a0, 1812
 	ldloc.1
-	ldc.i4 1348
+	ldc.i4 1812
 	add
 	stloc.1
-// 0x010a404c: 0x10a404c: addu  a1, zero, zero
+// 0x010a4694: 0x10a4694: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4050: 0x10a4050: addiu a2, zero, -2
+// 0x010a4698: 0x10a4698: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a4054: 0x10a4054: jal   0x1093a24 sw    s8, 16(sp)
+// 0x010a469c: 0x10a469c: jal   0x1094048 sw    s8, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7102,32 +7102,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a405c: 0x10a405c: addu  a0, v0, zero
+// 0x010a46a4: 0x10a46a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a4060: 0x10a4060: addu  a1, zero, zero
+// 0x010a46a8: 0x10a46a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4064: 0x10a4064: addu  a2, zero, zero
+// 0x010a46ac: 0x10a46ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a4068: 0x10a4068: lui   s8, 0x0
+// 0x010a46b0: 0x10a46b0: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010a406c: 0x10a406c: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010a46b4: 0x10a46b4: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a4074: 0x10a4074: jal   0x101cd60 addiu a0, s8, 32736
+// 0x010a46bc: 0x10a46bc: jal   0x101cd70 addiu a0, s8, 32736
 	ldloc 10
 	ldc.i4 32736
 	add
@@ -7137,23 +7137,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a407c: 0x10a407c: addu  a1, v0, zero
+// 0x010a46c4: 0x10a46c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4080: 0x10a4080: addiu a2, zero, 18
+// 0x010a46c8: 0x10a46c8: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a4084: 0x10a4084: addiu a3, zero, 4112
+// 0x010a46cc: 0x10a46cc: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a4088: 0x10a4088: jal   0x1098d10 addiu a0, s3, 9016
+// 0x010a46d0: 0x10a46d0: jal   0x1099358 addiu a0, s3, 9480
 	ldloc 14
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -7161,25 +7161,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4090: 0x10a4090: addu  a1, v0, zero
+// 0x010a46d8: 0x10a46d8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4094: 0x10a4094: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a46dc: 0x10a46dc: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a409c: 0x10a409c: jal   0x101cd60 addiu a0, s8, 32736
+// 0x010a46e4: 0x10a46e4: jal   0x101cd70 addiu a0, s8, 32736
 	ldloc 10
 	ldc.i4 32736
 	add
@@ -7189,31 +7189,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a40a4: 0x10a40a4: lui   a0, 0x10000
+// 0x010a46ec: 0x10a46ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a40a8: 0x10a40a8: addiu a2, zero, 18
+// 0x010a46f0: 0x10a46f0: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a40ac: 0x10a40ac: addiu a3, zero, 8192
+// 0x010a46f4: 0x10a46f4: addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
-// 0x010a40b0: 0x10a40b0: addiu a1, s7, 18500
+// 0x010a46f8: 0x10a46f8: addiu a1, s7, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a40b4: 0x10a40b4: addiu a0, a0, -28652
+// 0x010a46fc: 0x10a46fc: addiu a0, a0, -28652
 	ldloc.1
 	ldc.i4 -28652
 	add
 	stloc.1
-// 0x010a40b8: 0x10a40b8: sw    s6, 16(sp)
+// 0x010a4700: 0x10a4700: sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7222,7 +7222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a40bc: 0x10a40bc: sw    s5, 20(sp)
+// 0x010a4704: 0x10a4704: sw    s5, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7231,7 +7231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a40c0: 0x10a40c0: jal   0x109683c sw    v0, 24(sp)
+// 0x010a4708: 0x10a4708: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7245,43 +7245,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a40c8: 0x10a40c8: addu  a1, v0, zero
+// 0x010a4710: 0x10a4710: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a40cc: 0x10a40cc: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a4714: 0x10a4714: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a40d4: 0x10a40d4: addu  a1, s1, zero
+// 0x010a471c: 0x10a471c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010a40d8: 0x10a40d8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4720: 0x10a4720: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a40e0: 0x10a40e0: lui   a0, 0x20000
+// 0x010a4728: 0x10a4728: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a40e4: 0x10a40e4: jal   0x101cd60 addiu a0, a0, -1164
+// 0x010a472c: 0x10a472c: jal   0x101cd70 addiu a0, a0, -700
 	ldloc.1
-	ldc.i4 -1164
+	ldc.i4 -700
 	add
 	stloc.1
 	ldloc.0
@@ -7289,15 +7289,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a40ec: 0x10a40ec: addu  a1, v0, zero
+// 0x010a4734: 0x10a4734: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a40f0: 0x10a40f0: jal   0x109b434 addu  a0, s2, zero
+// 0x010a4738: 0x10a4738: jal   0x109ba7c addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -7305,45 +7305,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a40f8: 0x10a40f8: lui   a1, 0x10a0000
+// 0x010a4740: 0x10a4740: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a40fc: 0x10a40fc: addu  a0, s2, zero
+// 0x010a4744: 0x10a4744: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x010a4100: 0x10a4100: jal   0x1099174 addiu a1, a1, 16752
+// 0x010a4748: 0x10a4748: jal   0x10997bc addiu a1, a1, 18360
 	ldloc.2
-	ldc.i4 16752
+	ldc.i4 18360
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x010a4108: 0x10a4108: addu  a0, s2, zero
+// 0x010a4750: 0x10a4750: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x010a410c: 0x10a410c: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a4754: 0x10a4754: jal   0x109950c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4114: 0x10a4114: addiu a0, s4, -27864
+// 0x010a475c: 0x10a475c: addiu a0, s4, -27864
 	ldloc 15
 	ldc.i4 -27864
 	add
 	stloc.1
-// 0x010a4118: 0x10a4118: jal   0x1095eec addu  a1, zero, zero
+// 0x010a4760: 0x10a4760: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7351,31 +7351,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4120: 0x10a4120: jal   0x1021900 sll   zero, zero, 0
+// 0x010a4768: 0x10a4768: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4128: 0x10a4128: lui   a1, 0x20000
+// 0x010a4770: 0x10a4770: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a412c: 0x10a412c: addu  a0, s0, zero
+// 0x010a4774: 0x10a4774: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a4130: 0x10a4130: jal   0x109b304 addiu a1, a1, 1372
+// 0x010a4778: 0x10a4778: jal   0x109b94c addiu a1, a1, 1836
 	ldloc.2
-	ldc.i4 1372
+	ldc.i4 1836
 	add
 	stloc.2
 	ldloc.0
@@ -7383,12 +7383,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4138: 0x10a4138: jal   0x109617c addu  a0, v0, zero
+// 0x010a4780: 0x10a4780: jal   0x10967c4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7396,13 +7396,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4140: 0x10a4140: lw    ra, 76(sp)
-// 0x010a4144: 0x10a4144: lw    s8, 72(sp)
+// 0x010a4788: 0x10a4788: lw    ra, 76(sp)
+// 0x010a478c: 0x10a478c: lw    s8, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7411,7 +7411,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a4148: 0x10a4148: lw    s7, 68(sp)
+// 0x010a4790: 0x10a4790: lw    s7, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7420,7 +7420,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a414c: 0x10a414c: lw    s6, 64(sp)
+// 0x010a4794: 0x10a4794: lw    s6, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7429,7 +7429,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a4150: 0x10a4150: lw    s5, 60(sp)
+// 0x010a4798: 0x10a4798: lw    s5, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7438,7 +7438,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a4154: 0x10a4154: lw    s4, 56(sp)
+// 0x010a479c: 0x10a479c: lw    s4, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7447,7 +7447,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a4158: 0x10a4158: lw    s3, 52(sp)
+// 0x010a47a0: 0x10a47a0: lw    s3, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7456,7 +7456,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a415c: 0x10a415c: lw    s2, 48(sp)
+// 0x010a47a4: 0x10a47a4: lw    s2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7465,7 +7465,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a4160: 0x10a4160: lw    s1, 44(sp)
+// 0x010a47a8: 0x10a47a8: lw    s1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7474,7 +7474,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a4164: 0x10a4164: lw    s0, 40(sp)
+// 0x010a47ac: 0x10a47ac: lw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7483,7 +7483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a4168: 0x10a4168: jr    ra addiu sp, sp, 80
+// 0x010a47b0: 0x10a47b0: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
diff --git a/converted/Cibyl123.j b/converted/Cibyl123.j
index 9b2c414..7d8dc0f 100644
--- a/converted/Cibyl123.j
+++ b/converted/Cibyl123.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl123::.ctor
 
-.method public static int32 on_softkey_next_twitter_10a4170(int32,int32,int32,int32,int32)
+.method public static int32 on_softkey_next_twitter_10a47b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -88,21 +88,21 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4170: 0x10a4170: lui   a0, 0x10000
+// 0x010a47b8: 0x10a47b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a4174: 0x10a4174: addiu sp, sp, -56
+// 0x010a47bc: 0x10a47bc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010a4178: 0x10a4178: addiu a0, a0, -28668
+// 0x010a47c0: 0x10a47c0: addiu a0, a0, -28668
 	ldloc.1
 	ldc.i4 -28668
 	add
 	stloc.1
-// 0x010a417c: 0x10a417c: sw    ra, 52(sp)
-// 0x010a4180: 0x10a4180: sw    s3, 48(sp)
+// 0x010a47c4: 0x10a47c4: sw    ra, 52(sp)
+// 0x010a47c8: 0x10a47c8: sw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -111,7 +111,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a4184: 0x10a4184: sw    s2, 44(sp)
+// 0x010a47cc: 0x10a47cc: sw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -120,7 +120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a4188: 0x10a4188: sw    s1, 40(sp)
+// 0x010a47d0: 0x10a47d0: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -129,7 +129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a418c: 0x10a418c: jal   0x10947dc sw    s0, 36(sp)
+// 0x010a47d4: 0x10a47d4: jal   0x1094e00 sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -143,12 +143,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4194: 0x10a4194: jal   0x10268c0 addu  a0, v0, zero
+// 0x010a47dc: 0x10a47dc: jal   0x10268d0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -156,15 +156,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_username_10268c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_username_10268d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a419c: 0x10a419c: lui   a0, 0x10000
+// 0x010a47e4: 0x10a47e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a41a0: 0x10a41a0: jal   0x10947dc addiu a0, a0, -28652
+// 0x010a47e8: 0x10a47e8: jal   0x1094e00 addiu a0, a0, -28652
 	ldloc.1
 	ldc.i4 -28652
 	add
@@ -174,12 +174,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a41a8: 0x10a41a8: jal   0x102688c addu  a0, v0, zero
+// 0x010a47f0: 0x10a47f0: jal   0x102689c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -187,12 +187,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_password_102688c(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_password_102689c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a41b0: 0x10a41b0: jal   0x100ea50 addu  a0, zero, zero
+// 0x010a47f8: 0x10a47f8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -200,17 +200,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a41b8: 0x10a41b8: lui   a0, 0x20000
+// 0x010a4800: 0x10a4800: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a41bc: 0x10a41bc: jal   0x101cd60 addiu a0, a0, 1396
+// 0x010a4804: 0x10a4804: jal   0x101cd70 addiu a0, a0, 1860
 	ldloc.1
-	ldc.i4 1396
+	ldc.i4 1860
 	add
 	stloc.1
 	ldloc.0
@@ -218,31 +218,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a41c4: 0x10a41c4: lui   s2, 0x20000
+// 0x010a480c: 0x10a480c: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010a41c8: 0x10a41c8: lui   a3, 0x100000
+// 0x010a4810: 0x10a4810: lui   a3, 0x100000
 	ldc.i4 1048576
 	stloc 4
-// 0x010a41cc: 0x10a41cc: addiu a0, s2, 1392
+// 0x010a4814: 0x10a4814: addiu a0, s2, 1856
 	ldloc 10
-	ldc.i4 1392
+	ldc.i4 1856
 	add
 	stloc.1
-// 0x010a41d0: 0x10a41d0: addu  a1, v0, zero
+// 0x010a4818: 0x10a4818: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a41d4: 0x10a41d4: ori   a3, a3, 8192
+// 0x010a481c: 0x10a481c: ori   a3, a3, 8192
 	ldloc 4
 	ldc.i4 8192
 	or
 	stloc 4
-// 0x010a41d8: 0x10a41d8: jal   0x1095a08 addu  a2, zero, zero
+// 0x010a4820: 0x10a4820: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -250,40 +250,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a41e0: 0x10a41e0: addu  s1, v0, zero
+// 0x010a4828: 0x10a4828: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a41e4: 0x10a41e4: lui   a0, 0x20000
+// 0x010a482c: 0x10a482c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a41e8: 0x10a41e8: lui   v0, 0x40000000
+// 0x010a4830: 0x10a4830: lui   v0, 0x40000000
 	ldc.i4 1073741824
 	stloc 5
-// 0x010a41ec: 0x10a41ec: addiu a3, zero, -1
+// 0x010a4834: 0x10a4834: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a41f0: 0x10a41f0: addiu a0, a0, 1400
+// 0x010a4838: 0x10a4838: addiu a0, a0, 1864
 	ldloc.1
-	ldc.i4 1400
+	ldc.i4 1864
 	add
 	stloc.1
-// 0x010a41f4: 0x10a41f4: addu  a1, zero, zero
+// 0x010a483c: 0x10a483c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a41f8: 0x10a41f8: addiu a2, zero, -1
+// 0x010a4840: 0x10a4840: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a41fc: 0x10a41fc: ori   v0, v0, 20632
+// 0x010a4844: 0x10a4844: ori   v0, v0, 20632
 	ldloc 5
 	ldc.i4 20632
 	or
 	stloc 5
-// 0x010a4200: 0x10a4200: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a4848: 0x10a4848: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -297,29 +297,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4208: 0x10a4208: addu  a0, v0, zero
+// 0x010a4850: 0x10a4850: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a420c: 0x10a420c: addu  a2, zero, zero
+// 0x010a4854: 0x10a4854: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a4210: 0x10a4210: addu  a1, zero, zero
+// 0x010a4858: 0x10a4858: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4214: 0x10a4214: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a485c: 0x10a485c: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a421c: 0x10a421c: jal   0x10a2dfc addiu a0, zero, 10
+// 0x010a4864: 0x10a4864: jal   0x10a3444 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -327,30 +327,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4224: 0x10a4224: addu  a1, v0, zero
+// 0x010a486c: 0x10a486c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4228: 0x10a4228: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4870: 0x10a4870: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4230: 0x10a4230: lui   a0, 0x20000
+// 0x010a4878: 0x10a4878: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a4234: 0x10a4234: jal   0x101cd60 addiu a0, a0, 1408
+// 0x010a487c: 0x10a487c: jal   0x101cd70 addiu a0, a0, 1872
 	ldloc.1
-	ldc.i4 1408
+	ldc.i4 1872
 	add
 	stloc.1
 	ldloc.0
@@ -358,26 +358,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a423c: 0x10a423c: lui   s3, 0x20000
+// 0x010a4884: 0x10a4884: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x010a4240: 0x10a4240: addiu a3, zero, 9
+// 0x010a4888: 0x10a4888: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x010a4244: 0x10a4244: addiu a0, s3, 9016
+// 0x010a488c: 0x10a488c: addiu a0, s3, 9480
 	ldloc 11
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x010a4248: 0x10a4248: addu  a1, v0, zero
+// 0x010a4890: 0x10a4890: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a424c: 0x10a424c: jal   0x1098d10 addiu a2, zero, 22
+// 0x010a4894: 0x10a4894: jal   0x1099358 addiu a2, zero, 22
 	ldc.i4.s 22
 	stloc.3
 	ldloc.0
@@ -385,26 +385,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4254: 0x10a4254: lui   a1, 0x20000
+// 0x010a489c: 0x10a489c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4258: 0x10a4258: addiu a1, a1, 1420
+// 0x010a48a0: 0x10a48a0: addiu a1, a1, 1884
 	ldloc.2
-	ldc.i4 1420
+	ldc.i4 1884
 	add
 	stloc.2
-// 0x010a425c: 0x10a425c: addu  a2, a1, zero
+// 0x010a48a4: 0x10a48a4: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010a4260: 0x10a4260: addu  a0, v0, zero
+// 0x010a48a8: 0x10a48a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a4264: 0x10a4264: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010a48ac: 0x10a48ac: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -416,9 +416,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a426c: 0x10a426c: lw    v0, 24(sp)
+// 0x010a48b4: 0x10a48b4: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -427,20 +427,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a4270: 0x10a4270: addu  a0, s0, zero
+// 0x010a48b8: 0x10a48b8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a4274: 0x10a4274: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a48bc: 0x10a48bc: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a427c: 0x10a427c: jal   0x10a2dfc addiu a0, zero, 10
+// 0x010a48c4: 0x10a48c4: jal   0x10a3444 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -448,30 +448,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4284: 0x10a4284: addu  a1, v0, zero
+// 0x010a48cc: 0x10a48cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4288: 0x10a4288: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a48d0: 0x10a48d0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4290: 0x10a4290: lui   a0, 0x20000
+// 0x010a48d8: 0x10a48d8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a4294: 0x10a4294: jal   0x101cd60 addiu a0, a0, 1428
+// 0x010a48dc: 0x10a48dc: jal   0x101cd70 addiu a0, a0, 1892
 	ldloc.1
-	ldc.i4 1428
+	ldc.i4 1892
 	add
 	stloc.1
 	ldloc.0
@@ -479,23 +479,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a429c: 0x10a429c: addu  a1, v0, zero
+// 0x010a48e4: 0x10a48e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a42a0: 0x10a42a0: addiu a2, zero, 18
+// 0x010a48e8: 0x10a48e8: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a42a4: 0x10a42a4: addiu a3, zero, 9
+// 0x010a48ec: 0x10a48ec: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x010a42a8: 0x10a42a8: jal   0x1098d10 addiu a0, s3, 9016
+// 0x010a48f0: 0x10a48f0: jal   0x1099358 addiu a0, s3, 9480
 	ldloc 11
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -503,25 +503,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a42b0: 0x10a42b0: addu  a1, v0, zero
+// 0x010a48f8: 0x10a48f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a42b4: 0x10a42b4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a48fc: 0x10a48fc: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a42bc: 0x10a42bc: jal   0x10a2dfc addiu a0, zero, 20
+// 0x010a4904: 0x10a4904: jal   0x10a3444 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -529,30 +529,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::space_10a2dfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::space_10a3444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a42c4: 0x10a42c4: addu  a1, v0, zero
+// 0x010a490c: 0x10a490c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a42c8: 0x10a42c8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a4910: 0x10a4910: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a42d0: 0x10a42d0: lui   a0, 0x20000
+// 0x010a4918: 0x10a4918: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a42d4: 0x10a42d4: jal   0x101cd60 addiu a0, a0, 1460
+// 0x010a491c: 0x10a491c: jal   0x101cd70 addiu a0, a0, 1924
 	ldloc.1
-	ldc.i4 1460
+	ldc.i4 1924
 	add
 	stloc.1
 	ldloc.0
@@ -560,15 +560,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a42dc: 0x10a42dc: addu  a1, v0, zero
+// 0x010a4924: 0x10a4924: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a42e0: 0x10a42e0: jal   0x109b434 addu  a0, s1, zero
+// 0x010a4928: 0x10a4928: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -576,45 +576,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a42e8: 0x10a42e8: lui   a1, 0x10a0000
+// 0x010a4930: 0x10a4930: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a42ec: 0x10a42ec: addu  a0, s1, zero
+// 0x010a4934: 0x10a4934: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a42f0: 0x10a42f0: jal   0x1099174 addiu a1, a1, 14248
+// 0x010a4938: 0x10a4938: jal   0x10997bc addiu a1, a1, 15856
 	ldloc.2
-	ldc.i4 14248
+	ldc.i4 15856
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x010a42f8: 0x10a42f8: addu  a0, s1, zero
+// 0x010a4940: 0x10a4940: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a42fc: 0x10a42fc: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a4944: 0x10a4944: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4304: 0x10a4304: addiu a0, s2, 1392
+// 0x010a494c: 0x10a494c: addiu a0, s2, 1856
 	ldloc 10
-	ldc.i4 1392
+	ldc.i4 1856
 	add
 	stloc.1
-// 0x010a4308: 0x10a4308: jal   0x1095eec addu  a1, zero, zero
+// 0x010a4950: 0x10a4950: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -622,27 +622,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4310: 0x10a4310: jal   0x1021900 sll   zero, zero, 0
+// 0x010a4958: 0x10a4958: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4318: 0x10a4318: lw    ra, 52(sp)
-// 0x010a431c: 0x10a431c: addu  v0, zero, zero
+// 0x010a4960: 0x10a4960: lw    ra, 52(sp)
+// 0x010a4964: 0x10a4964: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a4320: 0x10a4320: lw    s3, 48(sp)
+// 0x010a4968: 0x10a4968: lw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -651,7 +651,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a4324: 0x10a4324: lw    s2, 44(sp)
+// 0x010a496c: 0x10a496c: lw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -660,7 +660,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a4328: 0x10a4328: lw    s1, 40(sp)
+// 0x010a4970: 0x10a4970: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -669,7 +669,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a432c: 0x10a432c: lw    s0, 36(sp)
+// 0x010a4974: 0x10a4974: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -678,7 +678,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a4330: 0x10a4330: jr    ra addiu sp, sp, 56
+// 0x010a4978: 0x10a4978: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -690,7 +690,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_location_set_overall_score_10a45b0(int32)
+.method public static int32 roadmap_geo_location_set_overall_score_10a4bf8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -710,15 +710,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a45b0: 0x10a45b0: lui   v0, 0x80000
+// 0x010a4bf8: 0x10a4bf8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a45b4: 0x10a45b4: jr    ra sw    a0, 31000(v0)
+// 0x010a4bfc: 0x10a4bfc: jr    ra sw    a0, 31464(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7750
+	ldc.i4 7866
 	add
 	ldloc.0
 	stelem.i4
@@ -727,7 +727,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static void roadmap_geo_location_info_10a45bc()
+.method public static void roadmap_geo_location_info_10a4c04()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -738,12 +738,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a45bc: 0x10a45bc: jr    ra sll   zero, zero, 0
+// 0x010a4c04: 0x10a4c04: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 on_softkey_10a45c4(int32,int32,int32,int32,int32)
+.method public static int32 on_softkey_10a4c0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -778,24 +778,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a45c4: 0x10a45c4: lui   a1, 0x0
+// 0x010a4c0c: 0x10a4c0c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a45c8: 0x10a45c8: lui   a0, 0x0
+// 0x010a4c10: 0x10a4c10: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a45cc: 0x10a45cc: addiu sp, sp, -24
+// 0x010a4c14: 0x10a4c14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a45d0: 0x10a45d0: addiu a1, a1, 20820
+// 0x010a4c18: 0x10a4c18: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a45d4: 0x10a45d4: sw    ra, 20(sp)
-// 0x010a45d8: 0x10a45d8: jal   0x100e5c0 addiu a0, a0, 18224
+// 0x010a4c1c: 0x10a4c1c: sw    ra, 20(sp)
+// 0x010a4c20: 0x10a4c20: jal   0x100e5d0 addiu a0, a0, 18224
 	ldloc.1
 	ldc.i4 18224
 	add
@@ -805,12 +805,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a45e0: 0x10a45e0: jal   0x100ea50 addu  a0, zero, zero
+// 0x010a4c28: 0x10a4c28: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -818,12 +818,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a45e8: 0x10a45e8: jal   0x1094b64 addiu a0, zero, 1
+// 0x010a4c30: 0x10a4c30: jal   0x10951ac addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -831,16 +831,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a45f0: 0x10a45f0: lw    ra, 20(sp)
-// 0x010a45f4: 0x10a45f4: addiu v0, zero, 1
+// 0x010a4c38: 0x10a4c38: lw    ra, 20(sp)
+// 0x010a4c3c: 0x10a4c3c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a45f8: 0x10a45f8: jr    ra addiu sp, sp, 24
+// 0x010a4c40: 0x10a4c40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -852,7 +852,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_location_set_usage_score_str_10a4600(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_usage_score_str_10a4c48(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -887,24 +887,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4600: 0x10a4600: addu  a1, a0, zero
+// 0x010a4c48: 0x10a4c48: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010a4604: 0x10a4604: lui   a0, 0x80000
+// 0x010a4c4c: 0x10a4c4c: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4608: 0x10a4608: addiu sp, sp, -24
+// 0x010a4c50: 0x10a4c50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a460c: 0x10a460c: addiu a0, a0, 30950
+// 0x010a4c54: 0x10a4c54: addiu a0, a0, 31414
 	ldloc.1
-	ldc.i4 30950
+	ldc.i4 31414
 	add
 	stloc.1
-// 0x010a4610: 0x10a4610: sw    ra, 20(sp)
-// 0x010a4614: 0x10a4614: jal   0x1001af8 addiu a2, zero, 50
+// 0x010a4c58: 0x10a4c58: sw    ra, 20(sp)
+// 0x010a4c5c: 0x10a4c5c: jal   0x1001af8 addiu a2, zero, 50
 	ldc.i4.s 50
 	stloc.3
 	ldloc.1
@@ -913,17 +913,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a461c: 0x10a461c: lw    ra, 20(sp)
-// 0x010a4620: 0x10a4620: lui   v0, 0x80000
+// 0x010a4c64: 0x10a4c64: lw    ra, 20(sp)
+// 0x010a4c68: 0x10a4c68: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4624: 0x10a4624: sb    zero, 30999(v0)
+// 0x010a4c6c: 0x10a4c6c: sb    zero, 31463(v0)
 	ldloc 5
-	ldc.i4 30999
+	ldc.i4 31463
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010a4628: 0x10a4628: jr    ra addiu sp, sp, 24
+// 0x010a4c70: 0x10a4c70: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -935,7 +935,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_location_set_traffic_score_str_10a4630(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_traffic_score_str_10a4c78(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -970,24 +970,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4630: 0x10a4630: addu  a1, a0, zero
+// 0x010a4c78: 0x10a4c78: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010a4634: 0x10a4634: lui   a0, 0x80000
+// 0x010a4c7c: 0x10a4c7c: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4638: 0x10a4638: addiu sp, sp, -24
+// 0x010a4c80: 0x10a4c80: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a463c: 0x10a463c: addiu a0, a0, 30900
+// 0x010a4c84: 0x10a4c84: addiu a0, a0, 31364
 	ldloc.1
-	ldc.i4 30900
+	ldc.i4 31364
 	add
 	stloc.1
-// 0x010a4640: 0x10a4640: sw    ra, 20(sp)
-// 0x010a4644: 0x10a4644: jal   0x1001af8 addiu a2, zero, 50
+// 0x010a4c88: 0x10a4c88: sw    ra, 20(sp)
+// 0x010a4c8c: 0x10a4c8c: jal   0x1001af8 addiu a2, zero, 50
 	ldc.i4.s 50
 	stloc.3
 	ldloc.1
@@ -996,17 +996,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a464c: 0x10a464c: lw    ra, 20(sp)
-// 0x010a4650: 0x10a4650: lui   v0, 0x80000
+// 0x010a4c94: 0x10a4c94: lw    ra, 20(sp)
+// 0x010a4c98: 0x10a4c98: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4654: 0x10a4654: sb    zero, 30949(v0)
+// 0x010a4c9c: 0x10a4c9c: sb    zero, 31413(v0)
 	ldloc 5
-	ldc.i4 30949
+	ldc.i4 31413
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010a4658: 0x10a4658: jr    ra addiu sp, sp, 24
+// 0x010a4ca0: 0x10a4ca0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1018,7 +1018,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_location_set_map_score_str_10a4660(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_map_score_str_10a4ca8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1053,24 +1053,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4660: 0x10a4660: addu  a1, a0, zero
+// 0x010a4ca8: 0x10a4ca8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010a4664: 0x10a4664: lui   a0, 0x80000
+// 0x010a4cac: 0x10a4cac: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4668: 0x10a4668: addiu sp, sp, -24
+// 0x010a4cb0: 0x10a4cb0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a466c: 0x10a466c: addiu a0, a0, 30850
+// 0x010a4cb4: 0x10a4cb4: addiu a0, a0, 31314
 	ldloc.1
-	ldc.i4 30850
+	ldc.i4 31314
 	add
 	stloc.1
-// 0x010a4670: 0x10a4670: sw    ra, 20(sp)
-// 0x010a4674: 0x10a4674: jal   0x1001af8 addiu a2, zero, 50
+// 0x010a4cb8: 0x10a4cb8: sw    ra, 20(sp)
+// 0x010a4cbc: 0x10a4cbc: jal   0x1001af8 addiu a2, zero, 50
 	ldc.i4.s 50
 	stloc.3
 	ldloc.1
@@ -1079,17 +1079,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a467c: 0x10a467c: lw    ra, 20(sp)
-// 0x010a4680: 0x10a4680: lui   v0, 0x80000
+// 0x010a4cc4: 0x10a4cc4: lw    ra, 20(sp)
+// 0x010a4cc8: 0x10a4cc8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4684: 0x10a4684: sb    zero, 30899(v0)
+// 0x010a4ccc: 0x10a4ccc: sb    zero, 31363(v0)
 	ldloc 5
-	ldc.i4 30899
+	ldc.i4 31363
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010a4688: 0x10a4688: jr    ra addiu sp, sp, 24
+// 0x010a4cd0: 0x10a4cd0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1101,7 +1101,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_location_set_usage_score_10a4690(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_usage_score_10a4cd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1136,29 +1136,29 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4690: 0x10a4690: addu  a2, a0, zero
+// 0x010a4cd8: 0x10a4cd8: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010a4694: 0x10a4694: lui   a1, 0x20000
+// 0x010a4cdc: 0x10a4cdc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4698: 0x10a4698: lui   a0, 0x80000
+// 0x010a4ce0: 0x10a4ce0: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a469c: 0x10a469c: addiu sp, sp, -24
+// 0x010a4ce4: 0x10a4ce4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a46a0: 0x10a46a0: addiu a0, a0, 30950
+// 0x010a4ce8: 0x10a4ce8: addiu a0, a0, 31414
 	ldloc.1
-	ldc.i4 30950
+	ldc.i4 31414
 	add
 	stloc.1
-// 0x010a46a4: 0x10a46a4: sw    ra, 20(sp)
-// 0x010a46a8: 0x10a46a8: jal   0x1000f64 addiu a1, a1, 6780
+// 0x010a4cec: 0x10a4cec: sw    ra, 20(sp)
+// 0x010a4cf0: 0x10a4cf0: jal   0x1000f64 addiu a1, a1, 7244
 	ldloc.2
-	ldc.i4 6780
+	ldc.i4 7244
 	add
 	stloc.2
 	ldloc.0
@@ -1171,9 +1171,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a46b0: 0x10a46b0: lw    ra, 20(sp)
-// 0x010a46b4: 0x10a46b4: sll   zero, zero, 0
-// 0x010a46b8: 0x10a46b8: jr    ra addiu sp, sp, 24
+// 0x010a4cf8: 0x10a4cf8: lw    ra, 20(sp)
+// 0x010a4cfc: 0x10a4cfc: sll   zero, zero, 0
+// 0x010a4d00: 0x10a4d00: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1185,7 +1185,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_geo_location_set_traffic_score_10a46c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_traffic_score_10a4d08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1220,29 +1220,29 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a46c0: 0x10a46c0: addu  a2, a0, zero
+// 0x010a4d08: 0x10a4d08: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010a46c4: 0x10a46c4: lui   a1, 0x20000
+// 0x010a4d0c: 0x10a4d0c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a46c8: 0x10a46c8: lui   a0, 0x80000
+// 0x010a4d10: 0x10a4d10: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a46cc: 0x10a46cc: addiu sp, sp, -24
+// 0x010a4d14: 0x10a4d14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a46d0: 0x10a46d0: addiu a0, a0, 30900
+// 0x010a4d18: 0x10a4d18: addiu a0, a0, 31364
 	ldloc.1
-	ldc.i4 30900
+	ldc.i4 31364
 	add
 	stloc.1
-// 0x010a46d4: 0x10a46d4: sw    ra, 20(sp)
-// 0x010a46d8: 0x10a46d8: jal   0x1000f64 addiu a1, a1, 6780
+// 0x010a4d1c: 0x10a4d1c: sw    ra, 20(sp)
+// 0x010a4d20: 0x10a4d20: jal   0x1000f64 addiu a1, a1, 7244
 	ldloc.2
-	ldc.i4 6780
+	ldc.i4 7244
 	add
 	stloc.2
 	ldloc.0
@@ -1255,9 +1255,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a46e0: 0x10a46e0: lw    ra, 20(sp)
-// 0x010a46e4: 0x10a46e4: sll   zero, zero, 0
-// 0x010a46e8: 0x10a46e8: jr    ra addiu sp, sp, 24
+// 0x010a4d28: 0x10a4d28: lw    ra, 20(sp)
+// 0x010a4d2c: 0x10a4d2c: sll   zero, zero, 0
+// 0x010a4d30: 0x10a4d30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1269,7 +1269,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_geo_location_set_map_score_10a46f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_map_score_10a4d38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1304,29 +1304,29 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a46f0: 0x10a46f0: addu  a2, a0, zero
+// 0x010a4d38: 0x10a4d38: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010a46f4: 0x10a46f4: lui   a1, 0x20000
+// 0x010a4d3c: 0x10a4d3c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a46f8: 0x10a46f8: lui   a0, 0x80000
+// 0x010a4d40: 0x10a4d40: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a46fc: 0x10a46fc: addiu sp, sp, -24
+// 0x010a4d44: 0x10a4d44: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a4700: 0x10a4700: addiu a0, a0, 30850
+// 0x010a4d48: 0x10a4d48: addiu a0, a0, 31314
 	ldloc.1
-	ldc.i4 30850
+	ldc.i4 31314
 	add
 	stloc.1
-// 0x010a4704: 0x10a4704: sw    ra, 20(sp)
-// 0x010a4708: 0x10a4708: jal   0x1000f64 addiu a1, a1, 6780
+// 0x010a4d4c: 0x10a4d4c: sw    ra, 20(sp)
+// 0x010a4d50: 0x10a4d50: jal   0x1000f64 addiu a1, a1, 7244
 	ldloc.2
-	ldc.i4 6780
+	ldc.i4 7244
 	add
 	stloc.2
 	ldloc.0
@@ -1339,9 +1339,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a4710: 0x10a4710: lw    ra, 20(sp)
-// 0x010a4714: 0x10a4714: sll   zero, zero, 0
-// 0x010a4718: 0x10a4718: jr    ra addiu sp, sp, 24
+// 0x010a4d58: 0x10a4d58: lw    ra, 20(sp)
+// 0x010a4d5c: 0x10a4d5c: sll   zero, zero, 0
+// 0x010a4d60: 0x10a4d60: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1353,7 +1353,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_geo_location_set_state_10a4720(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_state_10a4d68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1388,24 +1388,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4720: 0x10a4720: addiu sp, sp, -24
+// 0x010a4d68: 0x10a4d68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a4724: 0x10a4724: sw    ra, 20(sp)
-// 0x010a4728: 0x10a4728: beq   a0, zero, 0x10a473c addu  a1, a0, zero
+// 0x010a4d6c: 0x10a4d6c: sw    ra, 20(sp)
+// 0x010a4d70: 0x10a4d70: beq   a0, zero, 0x10a4d84 addu  a1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
-	brfalse L_10a473c
+	brfalse L_10a4d84
 // --- basic block ---
-// 0x010a4730: 0x10a4730: lui   a0, 0x80000
+// 0x010a4d78: 0x10a4d78: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4734: 0x10a4734: jal   0x1001b68 addiu a0, a0, 30800
+// 0x010a4d7c: 0x10a4d7c: jal   0x1001b68 addiu a0, a0, 31264
 	ldloc.1
-	ldc.i4 30800
+	ldc.i4 31264
 	add
 	stloc.1
 	ldloc.1
@@ -1415,10 +1415,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_10a473c:
-// 0x010a473c: 0x10a473c: lw    ra, 20(sp)
-// 0x010a4740: 0x10a4740: sll   zero, zero, 0
-// 0x010a4744: 0x10a4744: jr    ra addiu sp, sp, 24
+L_10a4d84:
+// 0x010a4d84: 0x10a4d84: lw    ra, 20(sp)
+// 0x010a4d88: 0x10a4d88: sll   zero, zero, 0
+// 0x010a4d8c: 0x10a4d8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1430,7 +1430,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_geo_location_set_metropolitan_10a474c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_location_set_metropolitan_10a4d94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1465,24 +1465,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a474c: 0x10a474c: addiu sp, sp, -24
+// 0x010a4d94: 0x10a4d94: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a4750: 0x10a4750: sw    ra, 20(sp)
-// 0x010a4754: 0x10a4754: beq   a0, zero, 0x10a4768 addu  a1, a0, zero
+// 0x010a4d98: 0x10a4d98: sw    ra, 20(sp)
+// 0x010a4d9c: 0x10a4d9c: beq   a0, zero, 0x10a4db0 addu  a1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
-	brfalse L_10a4768
+	brfalse L_10a4db0
 // --- basic block ---
-// 0x010a475c: 0x10a475c: lui   a0, 0x80000
+// 0x010a4da4: 0x10a4da4: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4760: 0x10a4760: jal   0x1001b68 addiu a0, a0, 30672
+// 0x010a4da8: 0x10a4da8: jal   0x1001b68 addiu a0, a0, 31136
 	ldloc.1
-	ldc.i4 30672
+	ldc.i4 31136
 	add
 	stloc.1
 	ldloc.1
@@ -1492,10 +1492,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_10a4768:
-// 0x010a4768: 0x10a4768: lw    ra, 20(sp)
-// 0x010a476c: 0x10a476c: sll   zero, zero, 0
-// 0x010a4770: 0x10a4770: jr    ra addiu sp, sp, 24
+L_10a4db0:
+// 0x010a4db0: 0x10a4db0: lw    ra, 20(sp)
+// 0x010a4db4: 0x10a4db4: sll   zero, zero, 0
+// 0x010a4db8: 0x10a4db8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1507,7 +1507,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_general_settings_init_10a4778(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_general_settings_init_10a4dc0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -1548,12 +1548,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4778: 0x10a4778: addiu sp, sp, -56
+// 0x010a4dc0: 0x10a4dc0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010a477c: 0x10a477c: sw    s1, 48(sp)
+// 0x010a4dc4: 0x10a4dc4: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1562,7 +1562,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a4780: 0x10a4780: sw    s0, 44(sp)
+// 0x010a4dc8: 0x10a4dc8: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1571,32 +1571,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a4784: 0x10a4784: lui   s1, 0x0
+// 0x010a4dcc: 0x10a4dcc: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010a4788: 0x10a4788: lui   s0, 0x20000
+// 0x010a4dd0: 0x10a4dd0: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010a478c: 0x10a478c: lui   a1, 0x0
+// 0x010a4dd4: 0x10a4dd4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4790: 0x10a4790: addiu a0, s0, -26888
+// 0x010a4dd8: 0x10a4dd8: addiu a0, s0, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a4794: 0x10a4794: addiu a2, s1, 20820
+// 0x010a4ddc: 0x10a4ddc: addiu a2, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc.3
-// 0x010a4798: 0x10a4798: addiu a1, a1, 18256
+// 0x010a4de0: 0x10a4de0: addiu a1, a1, 18256
 	ldloc.2
 	ldc.i4 18256
 	add
 	stloc.2
-// 0x010a479c: 0x10a479c: sw    ra, 52(sp)
-// 0x010a47a0: 0x10a47a0: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a4de4: 0x10a4de4: sw    ra, 52(sp)
+// 0x010a4de8: 0x10a4de8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1604,30 +1604,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a47a8: 0x10a47a8: lui   a1, 0x0
+// 0x010a4df0: 0x10a4df0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a47ac: 0x10a47ac: addiu a0, s0, -26888
+// 0x010a4df4: 0x10a4df4: addiu a0, s0, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a47b0: 0x10a47b0: addiu a2, s1, 20820
+// 0x010a4df8: 0x10a4df8: addiu a2, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc.3
-// 0x010a47b4: 0x10a47b4: addiu a1, a1, 18272
+// 0x010a4dfc: 0x10a4dfc: addiu a1, a1, 18272
 	ldloc.2
 	ldc.i4 18272
 	add
 	stloc.2
-// 0x010a47b8: 0x10a47b8: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a4e00: 0x10a4e00: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1635,15 +1635,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a47c0: 0x10a47c0: lui   v0, 0x0
+// 0x010a4e08: 0x10a4e08: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a47c4: 0x10a47c4: lw    a2, 13852(v0)
+// 0x010a4e0c: 0x10a4e0c: lw    a2, 13852(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1652,20 +1652,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a47c8: 0x10a47c8: lui   a1, 0x0
+// 0x010a4e10: 0x10a4e10: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a47cc: 0x10a47cc: addiu a0, s0, -26888
+// 0x010a4e14: 0x10a4e14: addiu a0, s0, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a47d0: 0x10a47d0: addiu a1, a1, 18288
+// 0x010a4e18: 0x10a4e18: addiu a1, a1, 18288
 	ldloc.2
 	ldc.i4 18288
 	add
 	stloc.2
-// 0x010a47d4: 0x10a47d4: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a4e1c: 0x10a4e1c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1673,47 +1673,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a47dc: 0x10a47dc: lui   a0, 0x10000
+// 0x010a4e24: 0x10a4e24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a47e0: 0x10a47e0: lui   a1, 0x0
+// 0x010a4e28: 0x10a4e28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a47e4: 0x10a47e4: lui   a3, 0x20000
+// 0x010a4e2c: 0x10a4e2c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a47e8: 0x10a47e8: lui   v0, 0x0
+// 0x010a4e30: 0x10a4e30: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a47ec: 0x10a47ec: addiu a0, a0, 12560
+// 0x010a4e34: 0x10a4e34: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a47f0: 0x10a47f0: addiu a1, a1, 18304
+// 0x010a4e38: 0x10a4e38: addiu a1, a1, 18304
 	ldloc.2
 	ldc.i4 18304
 	add
 	stloc.2
-// 0x010a47f4: 0x10a47f4: addiu a3, a3, 6872
+// 0x010a4e3c: 0x10a4e3c: addiu a3, a3, 7336
 	ldloc 4
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc 4
-// 0x010a47f8: 0x10a47f8: addu  a2, zero, zero
+// 0x010a4e40: 0x10a4e40: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a47fc: 0x10a47fc: addiu v0, v0, 28376
+// 0x010a4e44: 0x10a4e44: addiu v0, v0, 28376
 	ldloc 5
 	ldc.i4 28376
 	add
 	stloc 5
-// 0x010a4800: 0x10a4800: sw    v0, 16(sp)
+// 0x010a4e48: 0x10a4e48: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1722,7 +1722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a4804: 0x10a4804: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a4e4c: 0x10a4e4c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1736,41 +1736,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a480c: 0x10a480c: lui   a1, 0x0
+// 0x010a4e54: 0x10a4e54: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4810: 0x10a4810: lui   v0, 0x20000
+// 0x010a4e58: 0x10a4e58: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a4814: 0x10a4814: addiu a3, s1, 20820
+// 0x010a4e5c: 0x10a4e5c: addiu a3, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x010a4818: 0x10a4818: addiu a0, s0, -26888
+// 0x010a4e60: 0x10a4e60: addiu a0, s0, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a481c: 0x10a481c: addiu a1, a1, 18320
+// 0x010a4e64: 0x10a4e64: addiu a1, a1, 18320
 	ldloc.2
 	ldc.i4 18320
 	add
 	stloc.2
-// 0x010a4820: 0x10a4820: addu  a2, zero, zero
+// 0x010a4e68: 0x10a4e68: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a4824: 0x10a4824: addiu v0, v0, 9464
+// 0x010a4e6c: 0x10a4e6c: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x010a4828: 0x10a4828: sw    v0, 16(sp)
+// 0x010a4e70: 0x10a4e70: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1779,7 +1779,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a482c: 0x10a482c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a4e74: 0x10a4e74: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1793,20 +1793,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a4834: 0x10a4834: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x010a4e7c: 0x10a4e7c: lui   v0, 0x10000
+	ldc.i4 65536
 	stloc 5
-// 0x010a4838: 0x10a4838: addiu v0, v0, -6904
+// 0x010a4e80: 0x10a4e80: addiu v0, v0, 19584
 	ldloc 5
-	ldc.i4 -6904
+	ldc.i4 19584
 	add
 	stloc 5
-// 0x010a483c: 0x10a483c: sw    v0, 16(sp)
+// 0x010a4e84: 0x10a4e84: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1815,15 +1815,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a4840: 0x10a4840: lui   v0, 0x20000
+// 0x010a4e88: 0x10a4e88: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a4844: 0x10a4844: addiu v0, v0, 6816
+// 0x010a4e8c: 0x10a4e8c: addiu v0, v0, 7280
 	ldloc 5
-	ldc.i4 6816
+	ldc.i4 7280
 	add
 	stloc 5
-// 0x010a4848: 0x10a4848: sw    v0, 20(sp)
+// 0x010a4e90: 0x10a4e90: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1832,15 +1832,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a484c: 0x10a484c: lui   v0, 0x10000
+// 0x010a4e94: 0x10a4e94: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a4850: 0x10a4850: addiu v0, v0, -25516
+// 0x010a4e98: 0x10a4e98: addiu v0, v0, -25516
 	ldloc 5
 	ldc.i4 -25516
 	add
 	stloc 5
-// 0x010a4854: 0x10a4854: sw    v0, 24(sp)
+// 0x010a4e9c: 0x10a4e9c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1849,15 +1849,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a4858: 0x10a4858: lui   v0, 0x10000
+// 0x010a4ea0: 0x10a4ea0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a485c: 0x10a485c: addiu v0, v0, 1944
+// 0x010a4ea4: 0x10a4ea4: addiu v0, v0, 1940
 	ldloc 5
-	ldc.i4 1944
+	ldc.i4 1940
 	add
 	stloc 5
-// 0x010a4860: 0x10a4860: sw    v0, 28(sp)
+// 0x010a4ea8: 0x10a4ea8: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1866,39 +1866,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a4864: 0x10a4864: lui   a1, 0x0
+// 0x010a4eac: 0x10a4eac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4868: 0x10a4868: lui   a3, 0x10000
+// 0x010a4eb0: 0x10a4eb0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010a486c: 0x10a486c: lui   v0, 0x0
+// 0x010a4eb4: 0x10a4eb4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a4870: 0x10a4870: addiu a0, s0, -26888
+// 0x010a4eb8: 0x10a4eb8: addiu a0, s0, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a4874: 0x10a4874: addiu a1, a1, 18336
+// 0x010a4ebc: 0x10a4ebc: addiu a1, a1, 18336
 	ldloc.2
 	ldc.i4 18336
 	add
 	stloc.2
-// 0x010a4878: 0x10a4878: addiu a3, a3, 9424
+// 0x010a4ec0: 0x10a4ec0: addiu a3, a3, 9420
 	ldloc 4
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc 4
-// 0x010a487c: 0x10a487c: addu  a2, zero, zero
+// 0x010a4ec4: 0x10a4ec4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a4880: 0x10a4880: addiu v0, v0, 28440
+// 0x010a4ec8: 0x10a4ec8: addiu v0, v0, 28440
 	ldloc 5
 	ldc.i4 28440
 	add
 	stloc 5
-// 0x010a4884: 0x10a4884: sw    v0, 32(sp)
+// 0x010a4ecc: 0x10a4ecc: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1907,7 +1907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a4888: 0x10a4888: jal   0x100edf8 sw    zero, 36(sp)
+// 0x010a4ed0: 0x10a4ed0: jal   0x100ee08 sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1921,44 +1921,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a4890: 0x10a4890: lui   a1, 0x0
+// 0x010a4ed8: 0x10a4ed8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4894: 0x10a4894: lui   a3, 0x20000
+// 0x010a4edc: 0x10a4edc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a4898: 0x10a4898: lui   v0, 0x20000
+// 0x010a4ee0: 0x10a4ee0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a489c: 0x10a489c: addiu a0, s0, -26888
+// 0x010a4ee4: 0x10a4ee4: addiu a0, s0, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a48a0: 0x10a48a0: addiu v0, v0, 6828
+// 0x010a4ee8: 0x10a4ee8: addiu v0, v0, 7292
 	ldloc 5
-	ldc.i4 6828
+	ldc.i4 7292
 	add
 	stloc 5
-// 0x010a48a4: 0x10a48a4: addiu a1, a1, 18352
+// 0x010a4eec: 0x10a4eec: addiu a1, a1, 18352
 	ldloc.2
 	ldc.i4 18352
 	add
 	stloc.2
-// 0x010a48a8: 0x10a48a8: addiu a3, a3, 6820
+// 0x010a4ef0: 0x10a4ef0: addiu a3, a3, 7284
 	ldloc 4
-	ldc.i4 6820
+	ldc.i4 7284
 	add
 	stloc 4
-// 0x010a48ac: 0x10a48ac: addu  a2, zero, zero
+// 0x010a4ef4: 0x10a4ef4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a48b0: 0x10a48b0: sw    v0, 16(sp)
+// 0x010a4ef8: 0x10a4ef8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1967,7 +1967,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a48b4: 0x10a48b4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a4efc: 0x10a4efc: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1981,13 +1981,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a48bc: 0x10a48bc: lw    ra, 52(sp)
-// 0x010a48c0: 0x10a48c0: lw    s1, 48(sp)
+// 0x010a4f04: 0x10a4f04: lw    ra, 52(sp)
+// 0x010a4f08: 0x10a4f08: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1996,7 +1996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a48c4: 0x10a48c4: lw    s0, 44(sp)
+// 0x010a4f0c: 0x10a4f0c: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2005,7 +2005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a48c8: 0x10a48c8: jr    ra addiu sp, sp, 56
+// 0x010a4f10: 0x10a4f10: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2017,7 +2017,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_general_settings_events_radius_10a48d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_general_settings_events_radius_10a4f18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2052,16 +2052,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a48d0: 0x10a48d0: lui   a0, 0x0
+// 0x010a4f18: 0x10a4f18: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a48d4: 0x10a48d4: addiu sp, sp, -24
+// 0x010a4f1c: 0x10a4f1c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a48d8: 0x10a48d8: sw    ra, 20(sp)
-// 0x010a48dc: 0x10a48dc: jal   0x100e788 addiu a0, a0, 18336
+// 0x010a4f20: 0x10a4f20: sw    ra, 20(sp)
+// 0x010a4f24: 0x10a4f24: jal   0x100e798 addiu a0, a0, 18336
 	ldloc.1
 	ldc.i4 18336
 	add
@@ -2071,14 +2071,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a48e4: 0x10a48e4: lw    ra, 20(sp)
-// 0x010a48e8: 0x10a48e8: sll   zero, zero, 0
-// 0x010a48ec: 0x10a48ec: jr    ra addiu sp, sp, 24
+// 0x010a4f2c: 0x10a4f2c: lw    ra, 20(sp)
+// 0x010a4f30: 0x10a4f30: sll   zero, zero, 0
+// 0x010a4f34: 0x10a4f34: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2090,7 +2090,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_general_settings_is_24_hour_clock_10a48f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_general_settings_is_24_hour_clock_10a4f3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2125,26 +2125,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a48f4: 0x10a48f4: lui   a0, 0x0
+// 0x010a4f3c: 0x10a4f3c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a48f8: 0x10a48f8: lui   a1, 0x20000
+// 0x010a4f40: 0x10a4f40: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a48fc: 0x10a48fc: addiu sp, sp, -24
+// 0x010a4f44: 0x10a4f44: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a4900: 0x10a4900: addiu a0, a0, 18352
+// 0x010a4f48: 0x10a4f48: addiu a0, a0, 18352
 	ldloc.1
 	ldc.i4 18352
 	add
 	stloc.1
-// 0x010a4904: 0x10a4904: sw    ra, 20(sp)
-// 0x010a4908: 0x10a4908: jal   0x100e7f4 addiu a1, a1, 6828
+// 0x010a4f4c: 0x10a4f4c: sw    ra, 20(sp)
+// 0x010a4f50: 0x10a4f50: jal   0x100e804 addiu a1, a1, 7292
 	ldloc.2
-	ldc.i4 6828
+	ldc.i4 7292
 	add
 	stloc.2
 	ldloc.0
@@ -2152,14 +2152,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a4910: 0x10a4910: lw    ra, 20(sp)
-// 0x010a4914: 0x10a4914: sll   zero, zero, 0
-// 0x010a4918: 0x10a4918: jr    ra addiu sp, sp, 24
+// 0x010a4f58: 0x10a4f58: lw    ra, 20(sp)
+// 0x010a4f5c: 0x10a4f5c: sll   zero, zero, 0
+// 0x010a4f60: 0x10a4f60: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2171,7 +2171,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_ok_10a4920(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_10a4f68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s1,int32 s3,int32 ra)
@@ -2218,13 +2218,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4920: 0x10a4920: addiu sp, sp, -40
+// 0x010a4f68: 0x10a4f68: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a4924: 0x10a4924: sw    ra, 36(sp)
-// 0x010a4928: 0x10a4928: sw    s3, 32(sp)
+// 0x010a4f6c: 0x10a4f6c: sw    ra, 36(sp)
+// 0x010a4f70: 0x10a4f70: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2233,7 +2233,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a492c: 0x10a492c: sw    s0, 20(sp)
+// 0x010a4f74: 0x10a4f74: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2242,7 +2242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a4930: 0x10a4930: sw    s2, 28(sp)
+// 0x010a4f78: 0x10a4f78: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2251,7 +2251,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a4934: 0x10a4934: jal   0x101d484 sw    s1, 24(sp)
+// 0x010a4f7c: 0x10a4f7c: jal   0x101d494 sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2265,20 +2265,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a493c: 0x10a493c: lui   a0, 0x10000
+// 0x010a4f84: 0x10a4f84: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a4940: 0x10a4940: addiu a0, a0, -2024
+// 0x010a4f88: 0x10a4f88: addiu a0, a0, -2028
 	ldloc.1
-	ldc.i4 -2024
+	ldc.i4 -2028
 	add
 	stloc.1
-// 0x010a4944: 0x10a4944: jal   0x10947ac addu  s3, v0, zero
+// 0x010a4f8c: 0x10a4f8c: jal   0x1094dd0 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2286,20 +2286,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a494c: 0x10a494c: lui   a0, 0x10000
+// 0x010a4f94: 0x10a4f94: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a4950: 0x10a4950: addiu a0, a0, -2044
+// 0x010a4f98: 0x10a4f98: addiu a0, a0, -2048
 	ldloc.1
-	ldc.i4 -2044
+	ldc.i4 -2048
 	add
 	stloc.1
-// 0x010a4954: 0x10a4954: jal   0x10947ac addu  s0, v0, zero
+// 0x010a4f9c: 0x10a4f9c: jal   0x1094dd0 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2307,16 +2307,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a495c: 0x10a495c: beq   v0, zero, 0x10a496c sll   zero, zero, 0
+// 0x010a4fa4: 0x10a4fa4: beq   v0, zero, 0x10a4fb4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a496c
+	brfalse L_10a4fb4
 // --- basic block ---
-// 0x010a4964: 0x10a4964: jal   0x10444c8 addu  a0, v0, zero
+// 0x010a4fac: 0x10a4fac: jal   0x10444d8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2324,18 +2324,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_name_10444c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_name_10444d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a496c:
-// 0x010a496c: 0x10a496c: lui   a0, 0x20000
+L_10a4fb4:
+// 0x010a4fb4: 0x10a4fb4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a4970: 0x10a4970: jal   0x10947ac addiu a0, a0, 6836
+// 0x010a4fb8: 0x10a4fb8: jal   0x1094dd0 addiu a0, a0, 7300
 	ldloc.1
-	ldc.i4 6836
+	ldc.i4 7300
 	add
 	stloc.1
 	ldloc.0
@@ -2343,18 +2343,18 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4978: 0x10a4978: lui   a0, 0x0
+// 0x010a4fc0: 0x10a4fc0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a497c: 0x10a497c: addu  a1, v0, zero
+// 0x010a4fc4: 0x10a4fc4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4980: 0x10a4980: jal   0x100e5c0 addiu a0, a0, 14100
+// 0x010a4fc8: 0x10a4fc8: jal   0x100e5d0 addiu a0, a0, 14100
 	ldloc.1
 	ldc.i4 14100
 	add
@@ -2364,17 +2364,17 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4988: 0x10a4988: lui   a0, 0x20000
+// 0x010a4fd0: 0x10a4fd0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a498c: 0x10a498c: jal   0x10947ac addiu a0, a0, 6848
+// 0x010a4fd4: 0x10a4fd4: jal   0x1094dd0 addiu a0, a0, 7312
 	ldloc.1
-	ldc.i4 6848
+	ldc.i4 7312
 	add
 	stloc.1
 	ldloc.0
@@ -2382,23 +2382,23 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4994: 0x10a4994: lui   a0, 0x0
+// 0x010a4fdc: 0x10a4fdc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4998: 0x10a4998: addu  a1, v0, zero
+// 0x010a4fe0: 0x10a4fe0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a499c: 0x10a499c: addiu a0, a0, 14116
+// 0x010a4fe4: 0x10a4fe4: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x010a49a0: 0x10a49a0: jal   0x100e5c0 lui   s2, 0x10000
+// 0x010a4fe8: 0x10a4fe8: jal   0x100e5d0 lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 8
 	ldloc.0
@@ -2406,12 +2406,12 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a49a8: 0x10a49a8: jal   0x10947ac addiu a0, s2, -17576
+// 0x010a4ff0: 0x10a4ff0: jal   0x1094dd0 addiu a0, s2, -17576
 	ldloc 8
 	ldc.i4 -17576
 	add
@@ -2421,18 +2421,18 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a49b0: 0x10a49b0: lui   s1, 0x0
+// 0x010a4ff8: 0x10a4ff8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010a49b4: 0x10a49b4: addu  a1, v0, zero
+// 0x010a4ffc: 0x10a4ffc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a49b8: 0x10a49b8: jal   0x100e5c0 addiu a0, s1, 18320
+// 0x010a5000: 0x10a5000: jal   0x100e5d0 addiu a0, s1, 18320
 	ldloc 10
 	ldc.i4 18320
 	add
@@ -2442,12 +2442,12 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a49c0: 0x10a49c0: jal   0x10947ac addiu a0, s2, -17576
+// 0x010a5008: 0x10a5008: jal   0x1094dd0 addiu a0, s2, -17576
 	ldloc 8
 	ldc.i4 -17576
 	add
@@ -2457,15 +2457,15 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a49c8: 0x10a49c8: addu  a1, v0, zero
+// 0x010a5010: 0x10a5010: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a49cc: 0x10a49cc: jal   0x100e5c0 addiu a0, s1, 18320
+// 0x010a5014: 0x10a5014: jal   0x100e5d0 addiu a0, s1, 18320
 	ldloc 10
 	ldc.i4 18320
 	add
@@ -2475,17 +2475,17 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a49d4: 0x10a49d4: lui   a0, 0x20000
+// 0x010a501c: 0x10a501c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a49d8: 0x10a49d8: jal   0x10947ac addiu a0, a0, 6868
+// 0x010a5020: 0x10a5020: jal   0x1094dd0 addiu a0, a0, 7332
 	ldloc.1
-	ldc.i4 6868
+	ldc.i4 7332
 	add
 	stloc.1
 	ldloc.0
@@ -2493,24 +2493,24 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a49e0: 0x10a49e0: lui   v1, 0x80000
+// 0x010a5028: 0x10a5028: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a49e4: 0x10a49e4: lw    a1, 31068(v1)
+// 0x010a502c: 0x10a502c: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a49e8: 0x10a49e8: jal   0x1001c08 addu  a0, v0, zero
+// 0x010a5030: 0x10a5030: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2523,23 +2523,23 @@ L_10a496c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a49f0: 0x10a49f0: bne   v0, zero, 0x10a4a18 lui   a0, 0x0
+// 0x010a5038: 0x10a5038: bne   v0, zero, 0x10a5060 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10a4a18
+	brtrue L_10a5060
 // --- basic block ---
-// 0x010a49f8: 0x10a49f8: lui   a1, 0x20000
+// 0x010a5040: 0x10a5040: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a49fc: 0x10a49fc: addiu a0, a0, 18304
+// 0x010a5044: 0x10a5044: addiu a0, a0, 18304
 	ldloc.1
 	ldc.i4 18304
 	add
 	stloc.1
-// 0x010a4a00: 0x10a4a00: jal   0x100e5c0 addiu a1, a1, 6872
+// 0x010a5048: 0x10a5048: jal   0x100e5d0 addiu a1, a1, 7336
 	ldloc.2
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc.2
 	ldloc.0
@@ -2547,37 +2547,37 @@ L_10a496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a08: 0x10a4a08: jal   0x1007630 sll   zero, zero, 0
+// 0x010a5050: 0x10a5050: jal   0x1007640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_use_metric_1007630(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_use_metric_1007640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a10: 0x10a4a10: j	 0x10a4a34 lui   a0, 0x20000
+// 0x010a5058: 0x10a5058: j	 0x10a507c lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a4a34
+	br L_10a507c
 // --- basic block ---
-L_10a4a18:
-// 0x010a4a18: 0x10a4a18: lui   a1, 0x0
+L_10a5060:
+// 0x010a5060: 0x10a5060: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4a1c: 0x10a4a1c: addiu a0, a0, 18304
+// 0x010a5064: 0x10a5064: addiu a0, a0, 18304
 	ldloc.1
 	ldc.i4 18304
 	add
 	stloc.1
-// 0x010a4a20: 0x10a4a20: jal   0x100e5c0 addiu a1, a1, 28376
+// 0x010a5068: 0x10a5068: jal   0x100e5d0 addiu a1, a1, 28376
 	ldloc.2
 	ldc.i4 28376
 	add
@@ -2587,29 +2587,29 @@ L_10a4a18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a28: 0x10a4a28: jal   0x100766c sll   zero, zero, 0
+// 0x010a5070: 0x10a5070: jal   0x100767c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_use_imperial_100766c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_use_imperial_100767c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a30: 0x10a4a30: lui   a0, 0x20000
+// 0x010a5078: 0x10a5078: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a4a34:
-// 0x010a4a34: 0x10a4a34: jal   0x10947ac addiu a0, a0, 6880
+L_10a507c:
+// 0x010a507c: 0x10a507c: jal   0x1094dd0 addiu a0, a0, 7344
 	ldloc.1
-	ldc.i4 6880
+	ldc.i4 7344
 	add
 	stloc.1
 	ldloc.0
@@ -2617,24 +2617,24 @@ L_10a4a34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a3c: 0x10a4a3c: lui   v1, 0x80000
+// 0x010a5084: 0x10a5084: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a4a40: 0x10a4a40: lw    a1, 31068(v1)
+// 0x010a5088: 0x10a5088: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4a44: 0x10a4a44: jal   0x1001c08 addu  a0, v0, zero
+// 0x010a508c: 0x10a508c: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2647,74 +2647,74 @@ L_10a4a34:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a4c: 0x10a4a4c: bne   v0, zero, 0x10a4a64 lui   a0, 0x0
+// 0x010a5094: 0x10a5094: bne   v0, zero, 0x10a50ac lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10a4a64
+	brtrue L_10a50ac
 // --- basic block ---
-// 0x010a4a54: 0x10a4a54: lui   a1, 0x20000
+// 0x010a509c: 0x10a509c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4a58: 0x10a4a58: addiu a0, a0, 18352
+// 0x010a50a0: 0x10a50a0: addiu a0, a0, 18352
 	ldloc.1
 	ldc.i4 18352
 	add
 	stloc.1
-// 0x010a4a5c: 0x10a4a5c: j	 0x10a4a70 addiu a1, a1, 6820
+// 0x010a50a4: 0x10a50a4: j	 0x10a50b8 addiu a1, a1, 7284
 	ldloc.2
-	ldc.i4 6820
+	ldc.i4 7284
 	add
 	stloc.2
-	br L_10a4a70
+	br L_10a50b8
 // --- basic block ---
-L_10a4a64:
-// 0x010a4a64: 0x10a4a64: lui   a1, 0x20000
+L_10a50ac:
+// 0x010a50ac: 0x10a50ac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4a68: 0x10a4a68: addiu a0, a0, 18352
+// 0x010a50b0: 0x10a50b0: addiu a0, a0, 18352
 	ldloc.1
 	ldc.i4 18352
 	add
 	stloc.1
-// 0x010a4a6c: 0x10a4a6c: addiu a1, a1, 6828
+// 0x010a50b4: 0x10a50b4: addiu a1, a1, 7292
 	ldloc.2
-	ldc.i4 6828
+	ldc.i4 7292
 	add
 	stloc.2
-L_10a4a70:
-// 0x010a4a70: 0x10a4a70: jal   0x100e5c0 sll   zero, zero, 0
+L_10a50b8:
+// 0x010a50b8: 0x10a50b8: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a78: 0x10a4a78: jal   0x1048c0c sll   zero, zero, 0
+// 0x010a50c0: 0x10a50c0: jal   0x1048c1c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a80: 0x10a4a80: beq   v0, zero, 0x10a4ab8 sll   zero, zero, 0
+// 0x010a50c8: 0x10a50c8: beq   v0, zero, 0x10a5100 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a4ab8
+	brfalse L_10a5100
 // --- basic block ---
-// 0x010a4a88: 0x10a4a88: lui   a0, 0x20000
+// 0x010a50d0: 0x10a50d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a4a8c: 0x10a4a8c: jal   0x10947ac addiu a0, a0, 6896
+// 0x010a50d4: 0x10a50d4: jal   0x1094dd0 addiu a0, a0, 7360
 	ldloc.1
-	ldc.i4 6896
+	ldc.i4 7360
 	add
 	stloc.1
 	ldloc.0
@@ -2722,24 +2722,24 @@ L_10a4a70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4a94: 0x10a4a94: lui   v1, 0x80000
+// 0x010a50dc: 0x10a50dc: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a4a98: 0x10a4a98: lw    a1, 31068(v1)
+// 0x010a50e0: 0x10a50e0: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4a9c: 0x10a4a9c: jal   0x1001c08 addu  a0, v0, zero
+// 0x010a50e4: 0x10a50e4: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2752,34 +2752,34 @@ L_10a4a70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4aa4: 0x10a4aa4: beq   v0, zero, 0x10a4ab0 addiu a0, zero, 1
+// 0x010a50ec: 0x10a50ec: beq   v0, zero, 0x10a50f8 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brfalse L_10a4ab0
+	brfalse L_10a50f8
 // --- basic block ---
-// 0x010a4aac: 0x10a4aac: addu  a0, zero, zero
+// 0x010a50f4: 0x10a50f4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_10a4ab0:
-// 0x010a4ab0: 0x10a4ab0: jal   0x1048b80 sll   zero, zero, 0
+L_10a50f8:
+// 0x010a50f8: 0x10a50f8: jal   0x1048b90 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_routes_set_suggest_routes_1048b80(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_routes_set_suggest_routes_1048b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a4ab8:
-// 0x010a4ab8: 0x10a4ab8: lui   a0, 0x20000
+L_10a5100:
+// 0x010a5100: 0x10a5100: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a4abc: 0x10a4abc: jal   0x10947ac addiu a0, a0, 6924
+// 0x010a5104: 0x10a5104: jal   0x1094dd0 addiu a0, a0, 7388
 	ldloc.1
-	ldc.i4 6924
+	ldc.i4 7388
 	add
 	stloc.1
 	ldloc.0
@@ -2787,23 +2787,23 @@ L_10a4ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ac4: 0x10a4ac4: lui   s2, 0x0
+// 0x010a510c: 0x10a510c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a4ac8: 0x10a4ac8: addiu a0, s2, 18336
+// 0x010a5110: 0x10a5110: addiu a0, s2, 18336
 	ldloc 8
 	ldc.i4 18336
 	add
 	stloc.1
-// 0x010a4acc: 0x10a4acc: addu  a1, v0, zero
+// 0x010a5114: 0x10a5114: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a4ad0: 0x10a4ad0: jal   0x100e7f4 addu  s1, v0, zero
+// 0x010a5118: 0x10a5118: jal   0x100e804 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -2811,20 +2811,20 @@ L_10a4ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ad8: 0x10a4ad8: bne   v0, zero, 0x10a4af0 addiu a0, s2, 18336
+// 0x010a5120: 0x10a5120: bne   v0, zero, 0x10a5138 addiu a0, s2, 18336
 	ldloc 5
 	ldloc 8
 	ldc.i4 18336
 	add
 	stloc.1
-	brtrue L_10a4af0
+	brtrue L_10a5138
 // --- basic block ---
-// 0x010a4ae0: 0x10a4ae0: jal   0x100e5c0 addu  a1, s1, zero
+// 0x010a5128: 0x10a5128: jal   0x100e5d0 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -2832,24 +2832,24 @@ L_10a4ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ae8: 0x10a4ae8: jal   0x106e298 sll   zero, zero, 0
+// 0x010a5130: 0x10a5130: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a4af0:
-// 0x010a4af0: 0x10a4af0: jal   0x100ea50 addu  a0, zero, zero
+L_10a5138:
+// 0x010a5138: 0x10a5138: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2857,30 +2857,30 @@ L_10a4af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4af8: 0x10a4af8: lui   v0, 0x80000
+// 0x010a5140: 0x10a5140: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4afc: 0x10a4afc: beq   s0, zero, 0x10a4b4c sw    zero, 31004(v0)
+// 0x010a5144: 0x10a5144: beq   s0, zero, 0x10a5194 sw    zero, 31468(v0)
 	ldloc 9
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7751
+	ldc.i4 7867
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10a4b4c
+	brfalse L_10a5194
 // --- basic block ---
-// 0x010a4b04: 0x10a4b04: addu  a0, s3, zero
+// 0x010a514c: 0x10a514c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010a4b08: 0x10a4b08: jal   0x1001b14 addu  a1, s0, zero
+// 0x010a5150: 0x10a5150: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -2888,13 +2888,13 @@ L_10a4af0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a4b10: 0x10a4b10: beq   v0, zero, 0x10a4b4c addu  a1, zero, zero
+// 0x010a5158: 0x10a5158: beq   v0, zero, 0x10a5194 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10a4b4c
+	brfalse L_10a5194
 // --- basic block ---
-// 0x010a4b18: 0x10a4b18: jal   0x101d164 addu  a0, s0, zero
+// 0x010a5160: 0x10a5160: jal   0x101d174 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2902,15 +2902,15 @@ L_10a4af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_download_lang_file_101d164(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_download_lang_file_101d174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4b20: 0x10a4b20: addu  a1, zero, zero
+// 0x010a5168: 0x10a5168: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4b24: 0x10a4b24: jal   0x101da7c addu  a0, s0, zero
+// 0x010a516c: 0x10a516c: jal   0x101da8c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2918,12 +2918,12 @@ L_10a4af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4b2c: 0x10a4b2c: jal   0x1094a94 addu  a0, zero, zero
+// 0x010a5174: 0x10a5174: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2931,31 +2931,31 @@ L_10a4af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4b34: 0x10a4b34: jal   0x1021900 sll   zero, zero, 0
+// 0x010a517c: 0x10a517c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4b3c: 0x10a4b3c: lui   a1, 0x10a0000
+// 0x010a5184: 0x10a5184: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a4b40: 0x10a4b40: addiu a1, a1, 19392
+// 0x010a5188: 0x10a5188: addiu a1, a1, 21000
 	ldloc.2
-	ldc.i4 19392
+	ldc.i4 21000
 	add
 	stloc.2
-// 0x010a4b44: 0x10a4b44: jal   0x104fe98 addiu a0, zero, 5000
+// 0x010a518c: 0x10a518c: jal   0x104fea8 addiu a0, zero, 5000
 	ldc.i4 5000
 	stloc.1
 	ldloc.0
@@ -2963,17 +2963,17 @@ L_10a4af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a4b4c:
-// 0x010a4b4c: 0x10a4b4c: lw    ra, 36(sp)
-// 0x010a4b50: 0x10a4b50: addu  v0, zero, zero
+L_10a5194:
+// 0x010a5194: 0x10a5194: lw    ra, 36(sp)
+// 0x010a5198: 0x10a5198: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a4b54: 0x10a4b54: lw    s3, 32(sp)
+// 0x010a519c: 0x10a519c: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2982,7 +2982,7 @@ L_10a4b4c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a4b58: 0x10a4b58: lw    s2, 28(sp)
+// 0x010a51a0: 0x10a51a0: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2991,7 +2991,7 @@ L_10a4b4c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a4b5c: 0x10a4b5c: lw    s1, 24(sp)
+// 0x010a51a4: 0x10a51a4: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3000,7 +3000,7 @@ L_10a4b4c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a4b60: 0x10a4b60: lw    s0, 20(sp)
+// 0x010a51a8: 0x10a51a8: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3009,7 +3009,7 @@ L_10a4b4c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a4b64: 0x10a4b64: jr    ra addiu sp, sp, 40
+// 0x010a51ac: 0x10a51ac: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3021,7 +3021,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_ok_softkey_10a4b6c(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_softkey_10a51b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -3056,24 +3056,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4b6c: 0x10a4b6c: addiu sp, sp, -24
+// 0x010a51b4: 0x10a51b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a4b70: 0x10a4b70: sw    ra, 20(sp)
-// 0x010a4b74: 0x10a4b74: jal   0x10a4920 sll   zero, zero, 0
+// 0x010a51b8: 0x10a51b8: sw    ra, 20(sp)
+// 0x010a51bc: 0x10a51bc: jal   0x10a4f68 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::on_ok_10a4920(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::on_ok_10a4f68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a4b7c: 0x10a4b7c: jal   0x1094a94 addiu a0, zero, 1
+// 0x010a51c4: 0x10a51c4: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3081,16 +3081,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a4b84: 0x10a4b84: lw    ra, 20(sp)
-// 0x010a4b88: 0x10a4b88: addu  v0, zero, zero
+// 0x010a51cc: 0x10a51cc: lw    ra, 20(sp)
+// 0x010a51d0: 0x10a51d0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a4b8c: 0x10a4b8c: jr    ra addiu sp, sp, 24
+// 0x010a51d4: 0x10a51d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3102,7 +3102,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_close_dialog_10a4b94(int32,int32,int32,int32,int32)
+.method public static int32 on_close_dialog_10a51dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3137,23 +3137,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4b94: 0x10a4b94: addiu sp, sp, -24
+// 0x010a51dc: 0x10a51dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a4b98: 0x10a4b98: addiu v0, zero, 1
+// 0x010a51e0: 0x10a51e0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a4b9c: 0x10a4b9c: bne   a0, v0, 0x10a4bb0 sw    ra, 20(sp)
+// 0x010a51e4: 0x10a51e4: bne   a0, v0, 0x10a51f8 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_10a4bb0
+	bne.un L_10a51f8
 // --- basic block ---
-// 0x010a4ba4: 0x10a4ba4: addu  a0, zero, zero
+// 0x010a51ec: 0x10a51ec: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4ba8: 0x10a4ba8: jal   0x10a4920 addu  a1, zero, zero
+// 0x010a51f0: 0x10a51f0: jal   0x10a4f68 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3161,15 +3161,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::on_ok_10a4920(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::on_ok_10a4f68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a4bb0:
-// 0x010a4bb0: 0x10a4bb0: lw    ra, 20(sp)
-// 0x010a4bb4: 0x10a4bb4: sll   zero, zero, 0
-// 0x010a4bb8: 0x10a4bb8: jr    ra addiu sp, sp, 24
+L_10a51f8:
+// 0x010a51f8: 0x10a51f8: lw    ra, 20(sp)
+// 0x010a51fc: 0x10a51fc: sll   zero, zero, 0
+// 0x010a5200: 0x10a5200: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3181,7 +3181,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 lang_changed_delayed_message_10a4bc0(int32,int32,int32,int32,int32)
+.method public static int32 lang_changed_delayed_message_10a5208(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -3216,18 +3216,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4bc0: 0x10a4bc0: lui   a0, 0x10a0000
+// 0x010a5208: 0x10a5208: lui   a0, 0x10a0000
 	ldc.i4 17432576
 	stloc.1
-// 0x010a4bc4: 0x10a4bc4: addiu sp, sp, -24
+// 0x010a520c: 0x10a520c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a4bc8: 0x10a4bc8: sw    ra, 20(sp)
-// 0x010a4bcc: 0x10a4bcc: jal   0x104fd00 addiu a0, a0, 19392
+// 0x010a5210: 0x10a5210: sw    ra, 20(sp)
+// 0x010a5214: 0x10a5214: jal   0x104fd10 addiu a0, a0, 21000
 	ldloc.1
-	ldc.i4 19392
+	ldc.i4 21000
 	add
 	stloc.1
 	ldloc.0
@@ -3235,28 +3235,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a4bd4: 0x10a4bd4: lui   a0, 0x10000
+// 0x010a521c: 0x10a521c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a4bd8: 0x10a4bd8: lui   a1, 0x20000
+// 0x010a5220: 0x10a5220: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4bdc: 0x10a4bdc: addiu a0, a0, 18500
+// 0x010a5224: 0x10a5224: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x010a4be0: 0x10a4be0: addiu a1, a1, 6940
+// 0x010a5228: 0x10a5228: addiu a1, a1, 7404
 	ldloc.2
-	ldc.i4 6940
+	ldc.i4 7404
 	add
 	stloc.2
-// 0x010a4be4: 0x10a4be4: jal   0x104bfe4 addiu a2, zero, 5
+// 0x010a522c: 0x10a522c: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -3264,14 +3264,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a4bec: 0x10a4bec: lw    ra, 20(sp)
-// 0x010a4bf0: 0x10a4bf0: sll   zero, zero, 0
-// 0x010a4bf4: 0x10a4bf4: jr    ra addiu sp, sp, 24
+// 0x010a5234: 0x10a5234: lw    ra, 20(sp)
+// 0x010a5238: 0x10a5238: sll   zero, zero, 0
+// 0x010a523c: 0x10a523c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3283,7 +3283,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 update_reports_dont_show_10a4bfc(int32,int32,int32,int32,int32)
+.method public static int32 update_reports_dont_show_10a5244(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s2,int32 s1,int32 s3,int32 ra,int32 lo)
@@ -3333,20 +3333,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4bfc: 0x10a4bfc: lui   v1, 0x0
+// 0x010a5244: 0x10a5244: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a4c00: 0x10a4c00: addiu sp, sp, -48
+// 0x010a5248: 0x10a5248: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010a4c04: 0x10a4c04: addiu v0, v1, 18480
+// 0x010a524c: 0x10a524c: addiu v0, v1, 18480
 	ldloc 8
 	ldc.i4 18480
 	add
 	stloc 5
-// 0x010a4c08: 0x10a4c08: sw    s3, 40(sp)
+// 0x010a5250: 0x10a5250: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3355,7 +3355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a4c0c: 0x10a4c0c: sw    s2, 36(sp)
+// 0x010a5254: 0x10a5254: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3364,7 +3364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a4c10: 0x10a4c10: sw    s1, 32(sp)
+// 0x010a5258: 0x10a5258: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3373,7 +3373,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a4c14: 0x10a4c14: sw    s0, 28(sp)
+// 0x010a525c: 0x10a525c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3382,19 +3382,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a4c18: 0x10a4c18: addu  s2, a0, zero
+// 0x010a5260: 0x10a5260: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a4c1c: 0x10a4c1c: addu  s3, a1, zero
+// 0x010a5264: 0x10a5264: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010a4c20: 0x10a4c20: addu  s1, a2, zero
+// 0x010a5268: 0x10a5268: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010a4c24: 0x10a4c24: addu  s0, a3, zero
+// 0x010a526c: 0x10a526c: addu  s0, a3, zero
 	ldloc 4
 	stloc 7
-// 0x010a4c28: 0x10a4c28: lw    a0, 18480(v1)
+// 0x010a5270: 0x10a5270: lw    a0, 18480(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3403,7 +3403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a4c2c: 0x10a4c2c: lw    a3, 12(v0)
+// 0x010a5274: 0x10a5274: lw    a3, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3412,7 +3412,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a4c30: 0x10a4c30: lw    a1, 4(v0)
+// 0x010a5278: 0x10a5278: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3421,7 +3421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4c34: 0x10a4c34: lw    a2, 8(v0)
+// 0x010a527c: 0x10a527c: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3430,67 +3430,67 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a4c38: 0x10a4c38: sw    ra, 44(sp)
-// 0x010a4c3c: 0x10a4c3c: jal   0x10a6e98 sll   zero, zero, 0
+// 0x010a5280: 0x10a5280: sw    ra, 44(sp)
+// 0x010a5284: 0x10a5284: jal   0x10a74e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a4c44: 0x10a4c44: bne   v0, zero, 0x10a4c58 addiu a0, zero, 44
+// 0x010a528c: 0x10a528c: bne   v0, zero, 0x10a52a0 addiu a0, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc.1
-	brtrue L_10a4c58
+	brtrue L_10a52a0
 // --- basic block ---
-// 0x010a4c4c: 0x10a4c4c: addiu v0, zero, 23
+// 0x010a5294: 0x10a5294: addiu v0, zero, 23
 	ldc.i4.s 23
 	stloc 5
-// 0x010a4c50: 0x10a4c50: beq   s2, v0, 0x10a4cc8 sll   zero, zero, 0
+// 0x010a5298: 0x10a5298: beq   s2, v0, 0x10a5310 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	beq  L_10a4cc8
+	beq  L_10a5310
 // --- basic block ---
-L_10a4c58:
-// 0x010a4c58: 0x10a4c58: mult  s2, a0
+L_10a52a0:
+// 0x010a52a0: 0x10a52a0: mult  s2, a0
 	ldloc 9
 	ldloc.1
 	mul
 	stloc 13
-// 0x010a4c5c: 0x10a4c5c: lui   a0, 0x80000
+// 0x010a52a4: 0x10a52a4: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4c60: 0x10a4c60: lui   v0, 0x80000
+// 0x010a52a8: 0x10a52a8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4c64: 0x10a4c64: addiu a0, a0, 31076
+// 0x010a52ac: 0x10a52ac: addiu a0, a0, 31540
 	ldloc.1
-	ldc.i4 31076
+	ldc.i4 31540
 	add
 	stloc.1
-// 0x010a4c68: 0x10a4c68: lw    a1, 31068(v0)
+// 0x010a52b0: 0x10a52b0: lw    a1, 31532(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4c6c: 0x10a4c6c: mflo  lo
+// 0x010a52b4: 0x10a52b4: mflo  lo
 	ldloc 13
 	stloc 9
-// 0x010a4c70: 0x10a4c70: addu  a0, a0, s2
+// 0x010a52b8: 0x10a52b8: addu  a0, a0, s2
 	ldloc.1
 	ldloc 9
 	add
 	stloc.1
-// 0x010a4c74: 0x10a4c74: jal   0x1001c08 addiu a0, a0, 4
+// 0x010a52bc: 0x10a52bc: jal   0x1001c08 addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
@@ -3505,27 +3505,27 @@ L_10a4c58:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a4c7c: 0x10a4c7c: beq   v0, zero, 0x10a4cc8 sll   zero, zero, 0
+// 0x010a52c4: 0x10a52c4: beq   v0, zero, 0x10a5310 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a4cc8
+	brfalse L_10a5310
 // --- basic block ---
-// 0x010a4c84: 0x10a4c84: bne   s0, zero, 0x10a4ca0 addiu s0, sp, 16
+// 0x010a52cc: 0x10a52cc: bne   s0, zero, 0x10a52e8 addiu s0, sp, 16
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-	brtrue L_10a4ca0
+	brtrue L_10a52e8
 // --- basic block ---
-// 0x010a4c8c: 0x10a4c8c: lui   a1, 0x10000
+// 0x010a52d4: 0x10a52d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a4c90: 0x10a4c90: addiu a1, a1, -22604
+// 0x010a52d8: 0x10a52d8: addiu a1, a1, -22604
 	ldloc.2
 	ldc.i4 -22604
 	add
 	stloc.2
-// 0x010a4c94: 0x10a4c94: jal   0x1001ac4 addu  a0, s1, zero
+// 0x010a52dc: 0x10a52dc: jal   0x1001ac4 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -3533,27 +3533,27 @@ L_10a4c58:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a4c9c: 0x10a4c9c: addiu s0, sp, 16
+// 0x010a52e4: 0x10a52e4: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-L_10a4ca0:
-// 0x010a4ca0: 0x10a4ca0: lui   a2, 0x20000
-	ldc.i4 131072
+L_10a52e8:
+// 0x010a52e8: 0x10a52e8: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x010a4ca4: 0x10a4ca4: addu  a0, s0, zero
+// 0x010a52ec: 0x10a52ec: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010a4ca8: 0x10a4ca8: addiu a2, a2, -13884
+// 0x010a52f0: 0x10a52f0: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x010a4cac: 0x10a4cac: addu  a3, s3, zero
+// 0x010a52f4: 0x10a52f4: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010a4cb0: 0x10a4cb0: jal   0x1000f9c addiu a1, zero, 5
+// 0x010a52f8: 0x10a52f8: jal   0x1000f9c addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
 	ldloc.0
@@ -3566,10 +3566,10 @@ L_10a4ca0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a4cb8: 0x10a4cb8: addu  a1, s0, zero
+// 0x010a5300: 0x10a5300: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010a4cbc: 0x10a4cbc: jal   0x1001ac4 addu  a0, s1, zero
+// 0x010a5304: 0x10a5304: jal   0x1001ac4 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -3577,15 +3577,15 @@ L_10a4ca0:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a4cc4: 0x10a4cc4: addu  s0, zero, zero
+// 0x010a530c: 0x10a530c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10a4cc8:
-// 0x010a4cc8: 0x10a4cc8: lw    ra, 44(sp)
-// 0x010a4ccc: 0x10a4ccc: addu  v0, s0, zero
+L_10a5310:
+// 0x010a5310: 0x10a5310: lw    ra, 44(sp)
+// 0x010a5314: 0x10a5314: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x010a4cd0: 0x10a4cd0: lw    s3, 40(sp)
+// 0x010a5318: 0x10a5318: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3594,7 +3594,7 @@ L_10a4cc8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a4cd4: 0x10a4cd4: lw    s2, 36(sp)
+// 0x010a531c: 0x10a531c: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3603,7 +3603,7 @@ L_10a4cc8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a4cd8: 0x10a4cd8: lw    s1, 32(sp)
+// 0x010a5320: 0x10a5320: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3612,7 +3612,7 @@ L_10a4cc8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a4cdc: 0x10a4cdc: lw    s0, 28(sp)
+// 0x010a5324: 0x10a5324: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3621,7 +3621,7 @@ L_10a4cc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a4ce0: 0x10a4ce0: jr    ra addiu sp, sp, 48
+// 0x010a5328: 0x10a5328: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3633,7 +3633,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+.method public static int32 set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 s2,int32 ra,int32 v1,int32 lo)
@@ -3680,12 +3680,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4ce8: 0x10a4ce8: addiu sp, sp, -48
+// 0x010a5330: 0x10a5330: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010a4cec: 0x10a4cec: sw    s0, 32(sp)
+// 0x010a5334: 0x10a5334: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3694,23 +3694,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a4cf0: 0x10a4cf0: addiu s0, zero, 44
+// 0x010a5338: 0x10a5338: addiu s0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x010a4cf4: 0x10a4cf4: mult  a0, s0
+// 0x010a533c: 0x10a533c: mult  a0, s0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 12
-// 0x010a4cf8: 0x10a4cf8: lui   s0, 0x80000
+// 0x010a5340: 0x10a5340: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4cfc: 0x10a4cfc: addiu s0, s0, 31076
+// 0x010a5344: 0x10a5344: addiu s0, s0, 31540
 	ldloc 5
-	ldc.i4 31076
+	ldc.i4 31540
 	add
 	stloc 5
-// 0x010a4d00: 0x10a4d00: sw    s2, 40(sp)
+// 0x010a5348: 0x10a5348: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3719,7 +3719,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a4d04: 0x10a4d04: sw    s1, 36(sp)
+// 0x010a534c: 0x10a534c: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3728,57 +3728,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a4d08: 0x10a4d08: sw    ra, 44(sp)
-// 0x010a4d0c: 0x10a4d0c: addu  s1, a0, zero
+// 0x010a5350: 0x10a5350: sw    ra, 44(sp)
+// 0x010a5354: 0x10a5354: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010a4d10: 0x10a4d10: addu  s2, a1, zero
+// 0x010a5358: 0x10a5358: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010a4d14: 0x10a4d14: mflo  lo
+// 0x010a535c: 0x10a535c: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x010a4d18: 0x10a4d18: addu  s0, v0, s0
+// 0x010a5360: 0x10a5360: addu  s0, v0, s0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010a4d1c: 0x10a4d1c: sw    a1, 0(s0)
+// 0x010a5364: 0x10a5364: sw    a1, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010a4d20: 0x10a4d20: bne   a2, zero, 0x10a4d34 addiu s0, s0, 4
+// 0x010a5368: 0x10a5368: bne   a2, zero, 0x10a537c addiu s0, s0, 4
 	ldloc.3
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brtrue L_10a4d34
+	brtrue L_10a537c
 // --- basic block ---
-// 0x010a4d28: 0x10a4d28: lui   a1, 0x0
+// 0x010a5370: 0x10a5370: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4d2c: 0x10a4d2c: j	 0x10a4d3c addiu a1, a1, 32120
+// 0x010a5374: 0x10a5374: j	 0x10a5384 addiu a1, a1, 32120
 	ldloc.2
 	ldc.i4 32120
 	add
 	stloc.2
-	br L_10a4d3c
+	br L_10a5384
 // --- basic block ---
-L_10a4d34:
-// 0x010a4d34: 0x10a4d34: lui   a1, 0x0
+L_10a537c:
+// 0x010a537c: 0x10a537c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4d38: 0x10a4d38: addiu a1, a1, 32116
+// 0x010a5380: 0x10a5380: addiu a1, a1, 32116
 	ldloc.2
 	ldc.i4 32116
 	add
 	stloc.2
-L_10a4d3c:
-// 0x010a4d3c: 0x10a4d3c: jal   0x1001b68 addu  a0, s0, zero
+L_10a5384:
+// 0x010a5384: 0x10a5384: jal   0x1001b68 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -3788,52 +3788,52 @@ L_10a4d3c:
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x010a4d44: 0x10a4d44: bne   s2, zero, 0x10a4d54 lui   v0, 0x20000
+// 0x010a538c: 0x10a538c: bne   s2, zero, 0x10a539c lui   v0, 0x20000
 	ldloc 9
 	ldc.i4 131072
 	stloc 7
-	brtrue L_10a4d54
+	brtrue L_10a539c
 // --- basic block ---
-// 0x010a4d4c: 0x10a4d4c: j	 0x10a4d5c addiu v0, v0, 6980
+// 0x010a5394: 0x10a5394: j	 0x10a53a4 addiu v0, v0, 7444
 	ldloc 7
-	ldc.i4 6980
+	ldc.i4 7444
 	add
 	stloc 7
-	br L_10a4d5c
+	br L_10a53a4
 // --- basic block ---
-L_10a4d54:
-// 0x010a4d54: 0x10a4d54: lui   v0, 0x10000
+L_10a539c:
+// 0x010a539c: 0x10a539c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010a4d58: 0x10a4d58: addiu v0, v0, 18500
+// 0x010a53a0: 0x10a53a0: addiu v0, v0, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-L_10a4d5c:
-// 0x010a4d5c: 0x10a4d5c: lui   a1, 0x20000
+L_10a53a4:
+// 0x010a53a4: 0x10a53a4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4d60: 0x10a4d60: lui   a3, 0x20000
+// 0x010a53a8: 0x10a53a8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a4d64: 0x10a4d64: addiu a1, a1, 6992
+// 0x010a53ac: 0x10a53ac: addiu a1, a1, 7456
 	ldloc.2
-	ldc.i4 6992
+	ldc.i4 7456
 	add
 	stloc.2
-// 0x010a4d68: 0x10a4d68: addiu a3, a3, 7032
+// 0x010a53b0: 0x10a53b0: addiu a3, a3, 7496
 	ldloc 4
-	ldc.i4 7032
+	ldc.i4 7496
 	add
 	stloc 4
-// 0x010a4d6c: 0x10a4d6c: addiu a0, zero, 2
+// 0x010a53b4: 0x10a53b4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a4d70: 0x10a4d70: addiu a2, zero, 469
+// 0x010a53b8: 0x10a53b8: addiu a2, zero, 469
 	ldc.i4 469
 	stloc.3
-// 0x010a4d74: 0x10a4d74: sw    s1, 16(sp)
+// 0x010a53bc: 0x10a53bc: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3842,7 +3842,7 @@ L_10a4d5c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a4d78: 0x10a4d78: sw    s0, 20(sp)
+// 0x010a53c0: 0x10a53c0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3851,7 +3851,7 @@ L_10a4d5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a4d7c: 0x10a4d7c: jal   0x100449c sw    v0, 24(sp)
+// 0x010a53c4: 0x10a53c4: jal   0x100449c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3870,8 +3870,8 @@ L_10a4d5c:
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x010a4d84: 0x10a4d84: lw    ra, 44(sp)
-// 0x010a4d88: 0x10a4d88: lw    s2, 40(sp)
+// 0x010a53cc: 0x10a53cc: lw    ra, 44(sp)
+// 0x010a53d0: 0x10a53d0: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3880,7 +3880,7 @@ L_10a4d5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a4d8c: 0x10a4d8c: lw    s1, 36(sp)
+// 0x010a53d4: 0x10a53d4: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3889,7 +3889,7 @@ L_10a4d5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a4d90: 0x10a4d90: lw    s0, 32(sp)
+// 0x010a53d8: 0x10a53d8: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3898,7 +3898,7 @@ L_10a4d5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a4d94: 0x10a4d94: jr    ra addiu sp, sp, 48
+// 0x010a53dc: 0x10a53dc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3910,7 +3910,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_all_setting_saved_10a4d9c(int32,int32,int32,int32,int32)
+.method public static int32 on_all_setting_saved_10a53e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32 s1,int32[] mem,int32 s2,int32 s3,int32 ra)
@@ -3957,12 +3957,12 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a4d9c: 0x10a4d9c: addiu sp, sp, -144
+// 0x010a53e4: 0x10a53e4: addiu sp, sp, -144
 	ldloc.0
 	ldc.i4 -144
 	add
 	stloc.0
-// 0x010a4da0: 0x10a4da0: sw    s1, 128(sp)
+// 0x010a53e8: 0x10a53e8: sw    s1, 128(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -3971,23 +3971,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a4da4: 0x10a4da4: lui   v1, 0x0
+// 0x010a53ec: 0x10a53ec: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a4da8: 0x10a4da8: lui   s1, 0x80000
+// 0x010a53f0: 0x10a53f0: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010a4dac: 0x10a4dac: addiu v1, v1, 32120
+// 0x010a53f4: 0x10a53f4: addiu v1, v1, 32120
 	ldloc 6
 	ldc.i4 32120
 	add
 	stloc 6
-// 0x010a4db0: 0x10a4db0: addiu v0, s1, 31068
+// 0x010a53f8: 0x10a53f8: addiu v0, s1, 31532
 	ldloc 8
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 5
-// 0x010a4db4: 0x10a4db4: sw    v1, 4(v0)
+// 0x010a53fc: 0x10a53fc: sw    v1, 4(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
@@ -3996,16 +3996,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a4db8: 0x10a4db8: lui   v0, 0x0
+// 0x010a5400: 0x10a5400: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a4dbc: 0x10a4dbc: addiu v0, v0, 32116
+// 0x010a5404: 0x10a5404: addiu v0, v0, 32116
 	ldloc 5
 	ldc.i4 32116
 	add
 	stloc 5
-// 0x010a4dc0: 0x10a4dc0: sw    ra, 140(sp)
-// 0x010a4dc4: 0x10a4dc4: sw    s3, 136(sp)
+// 0x010a5408: 0x10a5408: sw    ra, 140(sp)
+// 0x010a540c: 0x10a540c: sw    s3, 136(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4014,7 +4014,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a4dc8: 0x10a4dc8: sw    s0, 124(sp)
+// 0x010a5410: 0x10a5410: sw    s0, 124(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4023,7 +4023,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a4dcc: 0x10a4dcc: sw    s2, 132(sp)
+// 0x010a5414: 0x10a5414: sw    s2, 132(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4032,12 +4032,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a4dd0: 0x10a4dd0: jal   0x101d484 sw    v0, 31068(s1)
+// 0x010a5418: 0x10a5418: jal   0x101d494 sw    v0, 31532(s1)
 	ldloc 9
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldloc 5
 	stelem.i4
@@ -4046,20 +4046,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4dd8: 0x10a4dd8: lui   a0, 0x80000
+// 0x010a5420: 0x10a5420: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4ddc: 0x10a4ddc: addiu a0, a0, 31124
+// 0x010a5424: 0x10a5424: addiu a0, a0, 31588
 	ldloc.1
-	ldc.i4 31124
+	ldc.i4 31588
 	add
 	stloc.1
-// 0x010a4de0: 0x10a4de0: jal   0x10444c8 addu  s3, v0, zero
+// 0x010a5428: 0x10a5428: jal   0x10444d8 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4067,25 +4067,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_name_10444c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_name_10444d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4de8: 0x10a4de8: lui   a0, 0x0
+// 0x010a5430: 0x10a5430: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4dec: 0x10a4dec: lui   a1, 0x80000
+// 0x010a5434: 0x10a5434: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a4df0: 0x10a4df0: addiu a0, a0, 14100
+// 0x010a5438: 0x10a5438: addiu a0, a0, 14100
 	ldloc.1
 	ldc.i4 14100
 	add
 	stloc.1
-// 0x010a4df4: 0x10a4df4: jal   0x100e5c0 addiu a1, a1, 31212
+// 0x010a543c: 0x10a543c: jal   0x100e5d0 addiu a1, a1, 31676
 	ldloc.2
-	ldc.i4 31212
+	ldc.i4 31676
 	add
 	stloc.2
 	ldloc.0
@@ -4093,25 +4093,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4dfc: 0x10a4dfc: lui   a0, 0x0
+// 0x010a5444: 0x10a5444: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4e00: 0x10a4e00: lui   a1, 0x80000
+// 0x010a5448: 0x10a5448: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a4e04: 0x10a4e04: addiu a0, a0, 14116
+// 0x010a544c: 0x10a544c: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x010a4e08: 0x10a4e08: jal   0x100e5c0 addiu a1, a1, 31256
+// 0x010a5450: 0x10a5450: jal   0x100e5d0 addiu a1, a1, 31720
 	ldloc.2
-	ldc.i4 31256
+	ldc.i4 31720
 	add
 	stloc.2
 	ldloc.0
@@ -4119,25 +4119,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e10: 0x10a4e10: lui   a0, 0x0
+// 0x010a5458: 0x10a5458: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4e14: 0x10a4e14: lui   a1, 0x80000
+// 0x010a545c: 0x10a545c: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a4e18: 0x10a4e18: addiu a0, a0, 18320
+// 0x010a5460: 0x10a5460: addiu a0, a0, 18320
 	ldloc.1
 	ldc.i4 18320
 	add
 	stloc.1
-// 0x010a4e1c: 0x10a4e1c: jal   0x100e5c0 addiu a1, a1, 31300
+// 0x010a5464: 0x10a5464: jal   0x100e5d0 addiu a1, a1, 31764
 	ldloc.2
-	ldc.i4 31300
+	ldc.i4 31764
 	add
 	stloc.2
 	ldloc.0
@@ -4145,29 +4145,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e24: 0x10a4e24: lw    a1, 31068(s1)
+// 0x010a546c: 0x10a546c: lw    a1, 31532(s1)
 	ldloc 9
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4e28: 0x10a4e28: lui   a0, 0x80000
+// 0x010a5470: 0x10a5470: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4e2c: 0x10a4e2c: addiu a0, a0, 31168
+// 0x010a5474: 0x10a5474: addiu a0, a0, 31632
 	ldloc.1
-	ldc.i4 31168
+	ldc.i4 31632
 	add
 	stloc.1
-// 0x010a4e30: 0x10a4e30: jal   0x1001c08 lui   s0, 0x80000
+// 0x010a5478: 0x10a5478: jal   0x1001c08 lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
 	ldloc.0
@@ -4180,28 +4180,28 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e38: 0x10a4e38: addiu s0, s0, 31080
+// 0x010a5480: 0x10a5480: addiu s0, s0, 31544
 	ldloc 7
-	ldc.i4 31080
+	ldc.i4 31544
 	add
 	stloc 7
-// 0x010a4e3c: 0x10a4e3c: bne   v0, zero, 0x10a4e64 lui   a0, 0x0
+// 0x010a5484: 0x10a5484: bne   v0, zero, 0x10a54ac lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10a4e64
+	brtrue L_10a54ac
 // --- basic block ---
-// 0x010a4e44: 0x10a4e44: lui   a1, 0x20000
+// 0x010a548c: 0x10a548c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4e48: 0x10a4e48: addiu a0, a0, 18304
+// 0x010a5490: 0x10a5490: addiu a0, a0, 18304
 	ldloc.1
 	ldc.i4 18304
 	add
 	stloc.1
-// 0x010a4e4c: 0x10a4e4c: jal   0x100e5c0 addiu a1, a1, 6872
+// 0x010a5494: 0x10a5494: jal   0x100e5d0 addiu a1, a1, 7336
 	ldloc.2
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc.2
 	ldloc.0
@@ -4209,37 +4209,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e54: 0x10a4e54: jal   0x1007630 sll   zero, zero, 0
+// 0x010a549c: 0x10a549c: jal   0x1007640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_use_metric_1007630(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_use_metric_1007640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e5c: 0x10a4e5c: j	 0x10a4e80 lui   v0, 0x80000
+// 0x010a54a4: 0x10a54a4: j	 0x10a54c8 lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-	br L_10a4e80
+	br L_10a54c8
 // --- basic block ---
-L_10a4e64:
-// 0x010a4e64: 0x10a4e64: lui   a1, 0x0
+L_10a54ac:
+// 0x010a54ac: 0x10a54ac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4e68: 0x10a4e68: addiu a0, a0, 18304
+// 0x010a54b0: 0x10a54b0: addiu a0, a0, 18304
 	ldloc.1
 	ldc.i4 18304
 	add
 	stloc.1
-// 0x010a4e6c: 0x10a4e6c: jal   0x100e5c0 addiu a1, a1, 28376
+// 0x010a54b4: 0x10a54b4: jal   0x100e5d0 addiu a1, a1, 28376
 	ldloc.2
 	ldc.i4 28376
 	add
@@ -4249,41 +4249,41 @@ L_10a4e64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e74: 0x10a4e74: jal   0x100766c sll   zero, zero, 0
+// 0x010a54bc: 0x10a54bc: jal   0x100767c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_use_imperial_100766c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_use_imperial_100767c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e7c: 0x10a4e7c: lui   v0, 0x80000
+// 0x010a54c4: 0x10a54c4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_10a4e80:
-// 0x010a4e80: 0x10a4e80: lui   a0, 0x80000
+L_10a54c8:
+// 0x010a54c8: 0x10a54c8: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4e84: 0x10a4e84: lw    a1, 31068(v0)
+// 0x010a54cc: 0x10a54cc: lw    a1, 31532(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4e88: 0x10a4e88: jal   0x1001c08 addiu a0, a0, 31344
+// 0x010a54d0: 0x10a54d0: jal   0x1001c08 addiu a0, a0, 31808
 	ldloc.1
-	ldc.i4 31344
+	ldc.i4 31808
 	add
 	stloc.1
 	ldloc.0
@@ -4296,33 +4296,33 @@ L_10a4e80:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4e90: 0x10a4e90: beq   v0, zero, 0x10a4ea0 lui   a1, 0x20000
+// 0x010a54d8: 0x10a54d8: beq   v0, zero, 0x10a54e8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10a4ea0
+	brfalse L_10a54e8
 // --- basic block ---
-// 0x010a4e98: 0x10a4e98: j	 0x10a4ea8 addiu a1, a1, 6820
+// 0x010a54e0: 0x10a54e0: j	 0x10a54f0 addiu a1, a1, 7284
 	ldloc.2
-	ldc.i4 6820
+	ldc.i4 7284
 	add
 	stloc.2
-	br L_10a4ea8
+	br L_10a54f0
 // --- basic block ---
-L_10a4ea0:
-// 0x010a4ea0: 0x10a4ea0: lui   a1, 0x20000
+L_10a54e8:
+// 0x010a54e8: 0x10a54e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a4ea4: 0x10a4ea4: addiu a1, a1, 6828
+// 0x010a54ec: 0x10a54ec: addiu a1, a1, 7292
 	ldloc.2
-	ldc.i4 6828
+	ldc.i4 7292
 	add
 	stloc.2
-L_10a4ea8:
-// 0x010a4ea8: 0x10a4ea8: lui   a0, 0x0
+L_10a54f0:
+// 0x010a54f0: 0x10a54f0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4eac: 0x10a4eac: jal   0x100e5c0 addiu a0, a0, 18352
+// 0x010a54f4: 0x10a54f4: jal   0x100e5d0 addiu a0, a0, 18352
 	ldloc.1
 	ldc.i4 18352
 	add
@@ -4332,46 +4332,46 @@ L_10a4ea8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4eb4: 0x10a4eb4: jal   0x1048c0c sll   zero, zero, 0
+// 0x010a54fc: 0x10a54fc: jal   0x1048c1c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ebc: 0x10a4ebc: beq   v0, zero, 0x10a4ee4 lui   s1, 0x80000
+// 0x010a5504: 0x10a5504: beq   v0, zero, 0x10a552c lui   s1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brfalse L_10a4ee4
+	brfalse L_10a552c
 // --- basic block ---
-// 0x010a4ec4: 0x10a4ec4: lui   v0, 0x80000
+// 0x010a550c: 0x10a550c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4ec8: 0x10a4ec8: lw    a1, 31068(v0)
+// 0x010a5510: 0x10a5510: lw    a1, 31532(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4ecc: 0x10a4ecc: lui   a0, 0x80000
+// 0x010a5514: 0x10a5514: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4ed0: 0x10a4ed0: jal   0x1001c08 addiu a0, a0, 31388
+// 0x010a5518: 0x10a5518: jal   0x1001c08 addiu a0, a0, 31852
 	ldloc.1
-	ldc.i4 31388
+	ldc.i4 31852
 	add
 	stloc.1
 	ldloc.0
@@ -4384,7 +4384,7 @@ L_10a4ea8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ed8: 0x10a4ed8: jal   0x1048b80 sltiu a0, v0, 1
+// 0x010a5520: 0x10a5520: jal   0x1048b90 sltiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
@@ -4394,29 +4394,29 @@ L_10a4ea8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_routes_set_suggest_routes_1048b80(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_routes_set_suggest_routes_1048b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ee0: 0x10a4ee0: lui   s1, 0x80000
+// 0x010a5528: 0x10a5528: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_10a4ee4:
-// 0x010a4ee4: 0x10a4ee4: addiu s1, s1, 31432
+L_10a552c:
+// 0x010a552c: 0x10a552c: addiu s1, s1, 31896
 	ldloc 8
-	ldc.i4 31432
+	ldc.i4 31896
 	add
 	stloc 8
-// 0x010a4ee8: 0x10a4ee8: lui   s2, 0x0
+// 0x010a5530: 0x10a5530: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010a4eec: 0x10a4eec: addiu a0, s2, 18336
+// 0x010a5534: 0x10a5534: addiu a0, s2, 18336
 	ldloc 10
 	ldc.i4 18336
 	add
 	stloc.1
-// 0x010a4ef0: 0x10a4ef0: jal   0x100e7f4 addu  a1, s1, zero
+// 0x010a5538: 0x10a5538: jal   0x100e804 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4424,23 +4424,23 @@ L_10a4ee4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ef8: 0x10a4ef8: bne   v0, zero, 0x10a4f18 addu  a0, s3, zero
+// 0x010a5540: 0x10a5540: bne   v0, zero, 0x10a5560 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brtrue L_10a4f18
+	brtrue L_10a5560
 // --- basic block ---
-// 0x010a4f00: 0x10a4f00: addiu a0, s2, 18336
+// 0x010a5548: 0x10a5548: addiu a0, s2, 18336
 	ldloc 10
 	ldc.i4 18336
 	add
 	stloc.1
-// 0x010a4f04: 0x10a4f04: jal   0x100e5c0 addu  a1, s1, zero
+// 0x010a554c: 0x10a554c: jal   0x100e5d0 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4448,27 +4448,27 @@ L_10a4ee4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f0c: 0x10a4f0c: jal   0x106e298 sll   zero, zero, 0
+// 0x010a5554: 0x10a5554: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f14: 0x10a4f14: addu  a0, s3, zero
+// 0x010a555c: 0x10a555c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-L_10a4f18:
-// 0x010a4f18: 0x10a4f18: jal   0x1001b14 addu  a1, s0, zero
+L_10a5560:
+// 0x010a5560: 0x10a5560: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -4476,14 +4476,14 @@ L_10a4f18:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a4f20: 0x10a4f20: beq   v0, zero, 0x10a4f58 sll   zero, zero, 0
+// 0x010a5568: 0x10a5568: beq   v0, zero, 0x10a55a0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a4f58
+	brfalse L_10a55a0
 // --- basic block ---
-// 0x010a4f28: 0x10a4f28: addu  a1, zero, zero
+// 0x010a5570: 0x10a5570: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a4f2c: 0x10a4f2c: jal   0x101d164 addu  a0, s0, zero
+// 0x010a5574: 0x10a5574: jal   0x101d174 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4491,15 +4491,15 @@ L_10a4f18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_download_lang_file_101d164(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_download_lang_file_101d174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f34: 0x10a4f34: addu  a0, s0, zero
+// 0x010a557c: 0x10a557c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010a4f38: 0x10a4f38: jal   0x101da7c addu  a1, zero, zero
+// 0x010a5580: 0x10a5580: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4507,31 +4507,31 @@ L_10a4f18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f40: 0x10a4f40: jal   0x1021900 sll   zero, zero, 0
+// 0x010a5588: 0x10a5588: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f48: 0x10a4f48: lui   a1, 0x10a0000
+// 0x010a5590: 0x10a5590: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a4f4c: 0x10a4f4c: addiu a1, a1, 19392
+// 0x010a5594: 0x10a5594: addiu a1, a1, 21000
 	ldloc.2
-	ldc.i4 19392
+	ldc.i4 21000
 	add
 	stloc.2
-// 0x010a4f50: 0x10a4f50: jal   0x104fe98 addiu a0, zero, 5000
+// 0x010a5598: 0x10a5598: jal   0x104fea8 addiu a0, zero, 5000
 	ldc.i4 5000
 	stloc.1
 	ldloc.0
@@ -4539,18 +4539,18 @@ L_10a4f18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a4f58:
-// 0x010a4f58: 0x10a4f58: lui   a0, 0x80000
+L_10a55a0:
+// 0x010a55a0: 0x10a55a0: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a4f5c: 0x10a4f5c: jal   0x10145d4 addiu a0, a0, 31476
+// 0x010a55a4: 0x10a55a4: jal   0x10145e4 addiu a0, a0, 31940
 	ldloc.1
-	ldc.i4 31476
+	ldc.i4 31940
 	add
 	stloc.1
 	ldloc.0
@@ -4558,25 +4558,25 @@ L_10a4f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_scheme_10145d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_scheme_10145e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f64: 0x10a4f64: lui   a0, 0x0
+// 0x010a55ac: 0x10a55ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4f68: 0x10a4f68: lui   a1, 0x80000
+// 0x010a55b0: 0x10a55b0: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a4f6c: 0x10a4f6c: addiu a0, a0, 18368
+// 0x010a55b4: 0x10a55b4: addiu a0, a0, 18368
 	ldloc.1
 	ldc.i4 18368
 	add
 	stloc.1
-// 0x010a4f70: 0x10a4f70: jal   0x100e5c0 addiu a1, a1, 31564
+// 0x010a55b8: 0x10a55b8: jal   0x100e5d0 addiu a1, a1, 32028
 	ldloc.2
-	ldc.i4 31564
+	ldc.i4 32028
 	add
 	stloc.2
 	ldloc.0
@@ -4584,25 +4584,25 @@ L_10a4f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f78: 0x10a4f78: lui   a0, 0x0
+// 0x010a55c0: 0x10a55c0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4f7c: 0x10a4f7c: lui   a1, 0x80000
+// 0x010a55c4: 0x10a55c4: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a4f80: 0x10a4f80: addiu a0, a0, 18384
+// 0x010a55c8: 0x10a55c8: addiu a0, a0, 18384
 	ldloc.1
 	ldc.i4 18384
 	add
 	stloc.1
-// 0x010a4f84: 0x10a4f84: jal   0x100e5c0 addiu a1, a1, 31608
+// 0x010a55cc: 0x10a55cc: jal   0x100e5d0 addiu a1, a1, 32072
 	ldloc.2
-	ldc.i4 31608
+	ldc.i4 32072
 	add
 	stloc.2
 	ldloc.0
@@ -4610,45 +4610,45 @@ L_10a4f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f8c: 0x10a4f8c: jal   0x10140b0 sll   zero, zero, 0
+// 0x010a55d4: 0x10a55d4: jal   0x10140c0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4f94: 0x10a4f94: beq   v0, zero, 0x10a4fe4 lui   s0, 0x80000
+// 0x010a55dc: 0x10a55dc: beq   v0, zero, 0x10a562c lui   s0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 7
-	brfalse L_10a4fe4
+	brfalse L_10a562c
 // --- basic block ---
-// 0x010a4f9c: 0x10a4f9c: lui   s0, 0x80000
+// 0x010a55e4: 0x10a55e4: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010a4fa0: 0x10a4fa0: addiu s0, s0, 31520
+// 0x010a55e8: 0x10a55e8: addiu s0, s0, 31984
 	ldloc 7
-	ldc.i4 31520
+	ldc.i4 31984
 	add
 	stloc 7
-// 0x010a4fa4: 0x10a4fa4: lui   a0, 0x0
+// 0x010a55ec: 0x10a55ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a4fa8: 0x10a4fa8: addiu a0, a0, 1860
+// 0x010a55f0: 0x10a55f0: addiu a0, a0, 1860
 	ldloc.1
 	ldc.i4 1860
 	add
 	stloc.1
-// 0x010a4fac: 0x10a4fac: jal   0x100e5c0 addu  a1, s0, zero
+// 0x010a55f4: 0x10a55f4: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -4656,24 +4656,24 @@ L_10a4f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4fb4: 0x10a4fb4: lui   v0, 0x80000
+// 0x010a55fc: 0x10a55fc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a4fb8: 0x10a4fb8: lw    a1, 31068(v0)
+// 0x010a5600: 0x10a5600: lw    a1, 31532(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a4fbc: 0x10a4fbc: jal   0x1001c08 addu  a0, s0, zero
+// 0x010a5604: 0x10a5604: jal   0x1001c08 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4686,11 +4686,11 @@ L_10a4f58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4fc4: 0x10a4fc4: bne   v0, zero, 0x10a4fdc sll   zero, zero, 0
+// 0x010a560c: 0x10a560c: bne   v0, zero, 0x10a5624 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a4fdc
+	brtrue L_10a5624
 // --- basic block ---
-// 0x010a4fcc: 0x10a4fcc: jal   0x10140e4 lui   s0, 0x80000
+// 0x010a5614: 0x10a5614: jal   0x10140f4 lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
 	ldloc.0
@@ -4698,20 +4698,20 @@ L_10a4f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_mode_10140e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_mode_10140f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4fd4: 0x10a4fd4: j	 0x10a4fe8 addiu s0, s0, 31696
+// 0x010a561c: 0x10a561c: j	 0x10a5630 addiu s0, s0, 32160
 	ldloc 7
-	ldc.i4 31696
+	ldc.i4 32160
 	add
 	stloc 7
-	br L_10a4fe8
+	br L_10a5630
 // --- basic block ---
-L_10a4fdc:
-// 0x010a4fdc: 0x10a4fdc: jal   0x10141e4 lui   s0, 0x80000
+L_10a5624:
+// 0x010a5624: 0x10a5624: jal   0x10141f4 lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
 	ldloc.0
@@ -4719,27 +4719,27 @@ L_10a4fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_mode_kill_timer_10141e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_mode_kill_timer_10141f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a4fe4:
-// 0x010a4fe4: 0x10a4fe4: addiu s0, s0, 31696
+L_10a562c:
+// 0x010a562c: 0x10a562c: addiu s0, s0, 32160
 	ldloc 7
-	ldc.i4 31696
+	ldc.i4 32160
 	add
 	stloc 7
-L_10a4fe8:
-// 0x010a4fe8: 0x10a4fe8: lui   s1, 0x0
+L_10a5630:
+// 0x010a5630: 0x10a5630: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a4fec: 0x10a4fec: addiu a0, s1, 18416
+// 0x010a5634: 0x10a5634: addiu a0, s1, 18416
 	ldloc 8
 	ldc.i4 18416
 	add
 	stloc.1
-// 0x010a4ff0: 0x10a4ff0: jal   0x100e7f4 addu  a1, s0, zero
+// 0x010a5638: 0x10a5638: jal   0x100e804 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -4747,21 +4747,21 @@ L_10a4fe8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a4ff8: 0x10a4ff8: bne   v0, zero, 0x10a5014 sll   zero, zero, 0
+// 0x010a5640: 0x10a5640: bne   v0, zero, 0x10a565c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a5014
+	brtrue L_10a565c
 // --- basic block ---
-// 0x010a5000: 0x10a5000: addiu a0, s1, 18416
+// 0x010a5648: 0x10a5648: addiu a0, s1, 18416
 	ldloc 8
 	ldc.i4 18416
 	add
 	stloc.1
-// 0x010a5004: 0x10a5004: jal   0x100e5c0 addu  a1, s0, zero
+// 0x010a564c: 0x10a564c: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -4769,37 +4769,37 @@ L_10a4fe8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a500c: 0x10a500c: jal   0x106e298 sll   zero, zero, 0
+// 0x010a5654: 0x10a5654: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a5014:
-// 0x010a5014: 0x10a5014: lui   a0, 0x0
+L_10a565c:
+// 0x010a565c: 0x10a565c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5018: 0x10a5018: lui   a1, 0x80000
+// 0x010a5660: 0x10a5660: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a501c: 0x10a501c: addiu a0, a0, 18448
+// 0x010a5664: 0x10a5664: addiu a0, a0, 18448
 	ldloc.1
 	ldc.i4 18448
 	add
 	stloc.1
-// 0x010a5020: 0x10a5020: jal   0x100e5c0 addiu a1, a1, 31740
+// 0x010a5668: 0x10a5668: jal   0x100e5d0 addiu a1, a1, 32204
 	ldloc.2
-	ldc.i4 31740
+	ldc.i4 32204
 	add
 	stloc.2
 	ldloc.0
@@ -4807,25 +4807,25 @@ L_10a5014:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5028: 0x10a5028: lui   a0, 0x0
+// 0x010a5670: 0x10a5670: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a502c: 0x10a502c: lui   a1, 0x80000
+// 0x010a5674: 0x10a5674: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a5030: 0x10a5030: addiu a0, a0, 18432
+// 0x010a5678: 0x10a5678: addiu a0, a0, 18432
 	ldloc.1
 	ldc.i4 18432
 	add
 	stloc.1
-// 0x010a5034: 0x10a5034: jal   0x100e5c0 addiu a1, a1, 31784
+// 0x010a567c: 0x10a567c: jal   0x100e5d0 addiu a1, a1, 32248
 	ldloc.2
-	ldc.i4 31784
+	ldc.i4 32248
 	add
 	stloc.2
 	ldloc.0
@@ -4833,28 +4833,28 @@ L_10a5014:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a503c: 0x10a503c: lui   a0, 0x0
+// 0x010a5684: 0x10a5684: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5040: 0x10a5040: lui   a1, 0x80000
+// 0x010a5688: 0x10a5688: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a5044: 0x10a5044: addiu a0, a0, 18496
+// 0x010a568c: 0x10a568c: addiu a0, a0, 18496
 	ldloc.1
 	ldc.i4 18496
 	add
 	stloc.1
-// 0x010a5048: 0x10a5048: addiu a1, a1, 31652
+// 0x010a5690: 0x10a5690: addiu a1, a1, 32116
 	ldloc.2
-	ldc.i4 31652
+	ldc.i4 32116
 	add
 	stloc.2
-// 0x010a504c: 0x10a504c: jal   0x100e5c0 lui   s0, 0x80000
+// 0x010a5694: 0x10a5694: jal   0x100e5d0 lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
 	ldloc.0
@@ -4862,25 +4862,25 @@ L_10a5014:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5054: 0x10a5054: addiu s0, s0, 31828
+// 0x010a569c: 0x10a569c: addiu s0, s0, 32292
 	ldloc 7
-	ldc.i4 31828
+	ldc.i4 32292
 	add
 	stloc 7
-// 0x010a5058: 0x10a5058: lui   a0, 0x0
+// 0x010a56a0: 0x10a56a0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a505c: 0x10a505c: addiu a0, a0, 18512
+// 0x010a56a4: 0x10a56a4: addiu a0, a0, 18512
 	ldloc.1
 	ldc.i4 18512
 	add
 	stloc.1
-// 0x010a5060: 0x10a5060: jal   0x100e5c0 addu  a1, s0, zero
+// 0x010a56a8: 0x10a56a8: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -4888,24 +4888,24 @@ L_10a5014:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5068: 0x10a5068: lui   v0, 0x80000
+// 0x010a56b0: 0x10a56b0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a506c: 0x10a506c: lw    a1, 31072(v0)
+// 0x010a56b4: 0x10a56b4: lw    a1, 31536(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7768
+	ldc.i4 7884
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5070: 0x10a5070: jal   0x1001c08 addu  a0, s0, zero
+// 0x010a56b8: 0x10a56b8: jal   0x1001c08 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4918,35 +4918,35 @@ L_10a5014:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5078: 0x10a5078: bne   v0, zero, 0x10a5088 addiu s0, sp, 16
+// 0x010a56c0: 0x10a56c0: bne   v0, zero, 0x10a56d0 addiu s0, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-	brtrue L_10a5088
+	brtrue L_10a56d0
 // --- basic block ---
-// 0x010a5080: 0x10a5080: jal   0x1075ba0 sll   zero, zero, 0
+// 0x010a56c8: 0x10a56c8: jal   0x10761c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RealtimeBonus_Term_1075ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RealtimeBonus_Term_10761c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a5088:
-// 0x010a5088: 0x10a5088: lui   a1, 0x10000
+L_10a56d0:
+// 0x010a56d0: 0x10a56d0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a508c: 0x10a508c: addiu a1, a1, 18500
+// 0x010a56d4: 0x10a56d4: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a5090: 0x10a5090: jal   0x1001b68 addu  a0, s0, zero
+// 0x010a56d8: 0x10a56d8: jal   0x1001b68 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4956,16 +4956,16 @@ L_10a5088:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5098: 0x10a5098: addiu a0, zero, 18
+// 0x010a56e0: 0x10a56e0: addiu a0, zero, 18
 	ldc.i4.s 18
 	stloc.1
-// 0x010a509c: 0x10a509c: addu  a1, zero, zero
+// 0x010a56e4: 0x10a56e4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a50a0: 0x10a50a0: addu  a2, s0, zero
+// 0x010a56e8: 0x10a56e8: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x010a50a4: 0x10a50a4: jal   0x10a4bfc addiu a3, zero, 1
+// 0x010a56ec: 0x10a56ec: jal   0x10a5244 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -4973,21 +4973,21 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::update_reports_dont_show_10a4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::update_reports_dont_show_10a5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a50ac: 0x10a50ac: addu  a3, v0, zero
+// 0x010a56f4: 0x10a56f4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a50b0: 0x10a50b0: addiu a0, zero, 19
+// 0x010a56f8: 0x10a56f8: addiu a0, zero, 19
 	ldc.i4.s 19
 	stloc.1
-// 0x010a50b4: 0x10a50b4: addiu a1, zero, 1
+// 0x010a56fc: 0x10a56fc: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a50b8: 0x10a50b8: jal   0x10a4bfc addu  a2, s0, zero
+// 0x010a5700: 0x10a5700: jal   0x10a5244 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -4995,21 +4995,21 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::update_reports_dont_show_10a4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::update_reports_dont_show_10a5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a50c0: 0x10a50c0: addu  a3, v0, zero
+// 0x010a5708: 0x10a5708: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a50c4: 0x10a50c4: addiu a0, zero, 20
+// 0x010a570c: 0x10a570c: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x010a50c8: 0x10a50c8: addiu a1, zero, 2
+// 0x010a5710: 0x10a5710: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010a50cc: 0x10a50cc: jal   0x10a4bfc addu  a2, s0, zero
+// 0x010a5714: 0x10a5714: jal   0x10a5244 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -5017,21 +5017,21 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::update_reports_dont_show_10a4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::update_reports_dont_show_10a5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a50d4: 0x10a50d4: addu  a3, v0, zero
+// 0x010a571c: 0x10a571c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a50d8: 0x10a50d8: addiu a0, zero, 21
+// 0x010a5720: 0x10a5720: addiu a0, zero, 21
 	ldc.i4.s 21
 	stloc.1
-// 0x010a50dc: 0x10a50dc: addiu a1, zero, 3
+// 0x010a5724: 0x10a5724: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010a50e0: 0x10a50e0: jal   0x10a4bfc addu  a2, s0, zero
+// 0x010a5728: 0x10a5728: jal   0x10a5244 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -5039,21 +5039,21 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::update_reports_dont_show_10a4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::update_reports_dont_show_10a5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a50e8: 0x10a50e8: addu  a3, v0, zero
+// 0x010a5730: 0x10a5730: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a50ec: 0x10a50ec: addiu a0, zero, 22
+// 0x010a5734: 0x10a5734: addiu a0, zero, 22
 	ldc.i4.s 22
 	stloc.1
-// 0x010a50f0: 0x10a50f0: addiu a1, zero, 5
+// 0x010a5738: 0x10a5738: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x010a50f4: 0x10a50f4: jal   0x10a4bfc addu  a2, s0, zero
+// 0x010a573c: 0x10a573c: jal   0x10a5244 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -5061,21 +5061,21 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::update_reports_dont_show_10a4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::update_reports_dont_show_10a5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a50fc: 0x10a50fc: addu  a3, v0, zero
+// 0x010a5744: 0x10a5744: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010a5100: 0x10a5100: addu  a2, s0, zero
+// 0x010a5748: 0x10a5748: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x010a5104: 0x10a5104: addiu a0, zero, 23
+// 0x010a574c: 0x10a574c: addiu a0, zero, 23
 	ldc.i4.s 23
 	stloc.1
-// 0x010a5108: 0x10a5108: jal   0x10a4bfc addiu a1, zero, 7
+// 0x010a5750: 0x10a5750: jal   0x10a5244 addiu a1, zero, 7
 	ldc.i4.7
 	stloc.2
 	ldloc.0
@@ -5083,18 +5083,18 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::update_reports_dont_show_10a4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::update_reports_dont_show_10a5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5110: 0x10a5110: lui   a0, 0x0
+// 0x010a5758: 0x10a5758: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5114: 0x10a5114: addu  a1, s0, zero
+// 0x010a575c: 0x10a575c: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010a5118: 0x10a5118: jal   0x100e5c0 addiu a0, a0, 18464
+// 0x010a5760: 0x10a5760: jal   0x100e5d0 addiu a0, a0, 18464
 	ldloc.1
 	ldc.i4 18464
 	add
@@ -5104,28 +5104,28 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5120: 0x10a5120: jal   0x107b774 sll   zero, zero, 0
+// 0x010a5768: 0x10a5768: jal   0x107bd98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::RTAlerts_RefreshOnMap_107b774(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::RTAlerts_RefreshOnMap_107bd98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5128: 0x10a5128: lui   a0, 0x80000
+// 0x010a5770: 0x10a5770: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a512c: 0x10a512c: jal   0x10544d8 addiu a0, a0, 32136
+// 0x010a5774: 0x10a5774: jal   0x10544e8 addiu a0, a0, 32600
 	ldloc.1
-	ldc.i4 32136
+	ldc.i4 32600
 	add
 	stloc.1
 	ldloc.0
@@ -5133,17 +5133,17 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_set_popup_config_10544d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_set_popup_config_10544e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5134: 0x10a5134: lui   a0, 0x80000
+// 0x010a577c: 0x10a577c: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a5138: 0x10a5138: jal   0x10544b0 addiu a0, a0, 32180
+// 0x010a5780: 0x10a5780: jal   0x10544c0 addiu a0, a0, 32644
 	ldloc.1
-	ldc.i4 32180
+	ldc.i4 32644
 	add
 	stloc.1
 	ldloc.0
@@ -5151,25 +5151,25 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_set_show_wazer_config_10544b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_set_show_wazer_config_10544c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5140: 0x10a5140: lui   a0, 0x0
+// 0x010a5788: 0x10a5788: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5144: 0x10a5144: lui   a1, 0x80000
+// 0x010a578c: 0x10a578c: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a5148: 0x10a5148: addiu a0, a0, 14748
+// 0x010a5790: 0x10a5790: addiu a0, a0, 14748
 	ldloc.1
 	ldc.i4 14748
 	add
 	stloc.1
-// 0x010a514c: 0x10a514c: jal   0x100e5c0 addiu a1, a1, 32224
+// 0x010a5794: 0x10a5794: jal   0x100e5d0 addiu a1, a1, 32688
 	ldloc.2
-	ldc.i4 32224
+	ldc.i4 32688
 	add
 	stloc.2
 	ldloc.0
@@ -5177,23 +5177,23 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5154: 0x10a5154: lui   a0, 0x0
+// 0x010a579c: 0x10a579c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5158: 0x10a5158: lui   a1, 0x0
+// 0x010a57a0: 0x10a57a0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a515c: 0x10a515c: addiu a0, a0, 14892
+// 0x010a57a4: 0x10a57a4: addiu a0, a0, 14892
 	ldloc.1
 	ldc.i4 14892
 	add
 	stloc.1
-// 0x010a5160: 0x10a5160: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a57a8: 0x10a57a8: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5203,31 +5203,31 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5168: 0x10a5168: beq   v0, zero, 0x10a5188 lui   a0, 0x0
+// 0x010a57b0: 0x10a57b0: beq   v0, zero, 0x10a57d0 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a5188
+	brfalse L_10a57d0
 // --- basic block ---
-// 0x010a5170: 0x10a5170: lui   a0, 0x0
+// 0x010a57b8: 0x10a57b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5174: 0x10a5174: lui   a1, 0x80000
-	ldc.i4 524288
+// 0x010a57bc: 0x10a57bc: lui   a1, 0x90000
+	ldc.i4 589824
 	stloc.2
-// 0x010a5178: 0x10a5178: addiu a0, a0, 14796
+// 0x010a57c0: 0x10a57c0: addiu a0, a0, 14796
 	ldloc.1
 	ldc.i4 14796
 	add
 	stloc.1
-// 0x010a517c: 0x10a517c: jal   0x100e5c0 addiu a1, a1, 32400
+// 0x010a57c4: 0x10a57c4: jal   0x100e5d0 addiu a1, a1, -32672
 	ldloc.2
-	ldc.i4 32400
+	ldc.i4 -32672
 	add
 	stloc.2
 	ldloc.0
@@ -5235,24 +5235,24 @@ L_10a5088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5184: 0x10a5184: lui   a0, 0x0
+// 0x010a57cc: 0x10a57cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10a5188:
-// 0x010a5188: 0x10a5188: lui   a1, 0x0
+L_10a57d0:
+// 0x010a57d0: 0x10a57d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a518c: 0x10a518c: addiu a0, a0, 14908
+// 0x010a57d4: 0x10a57d4: addiu a0, a0, 14908
 	ldloc.1
 	ldc.i4 14908
 	add
 	stloc.1
-// 0x010a5190: 0x10a5190: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a57d8: 0x10a57d8: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5262,31 +5262,31 @@ L_10a5188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5198: 0x10a5198: beq   v0, zero, 0x10a51b8 lui   a0, 0x0
+// 0x010a57e0: 0x10a57e0: beq   v0, zero, 0x10a5800 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a51b8
+	brfalse L_10a5800
 // --- basic block ---
-// 0x010a51a0: 0x10a51a0: lui   a0, 0x0
+// 0x010a57e8: 0x10a57e8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a51a4: 0x10a51a4: lui   a1, 0x80000
-	ldc.i4 524288
+// 0x010a57ec: 0x10a57ec: lui   a1, 0x90000
+	ldc.i4 589824
 	stloc.2
-// 0x010a51a8: 0x10a51a8: addiu a0, a0, 14812
+// 0x010a57f0: 0x10a57f0: addiu a0, a0, 14812
 	ldloc.1
 	ldc.i4 14812
 	add
 	stloc.1
-// 0x010a51ac: 0x10a51ac: jal   0x100e5c0 addiu a1, a1, 32488
+// 0x010a57f4: 0x10a57f4: jal   0x100e5d0 addiu a1, a1, -32584
 	ldloc.2
-	ldc.i4 32488
+	ldc.i4 -32584
 	add
 	stloc.2
 	ldloc.0
@@ -5294,24 +5294,24 @@ L_10a5188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a51b4: 0x10a51b4: lui   a0, 0x0
+// 0x010a57fc: 0x10a57fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10a51b8:
-// 0x010a51b8: 0x10a51b8: lui   a1, 0x0
+L_10a5800:
+// 0x010a5800: 0x10a5800: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a51bc: 0x10a51bc: addiu a0, a0, 14876
+// 0x010a5804: 0x10a5804: addiu a0, a0, 14876
 	ldloc.1
 	ldc.i4 14876
 	add
 	stloc.1
-// 0x010a51c0: 0x10a51c0: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a5808: 0x10a5808: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5321,31 +5321,31 @@ L_10a51b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a51c8: 0x10a51c8: beq   v0, zero, 0x10a51e8 lui   a0, 0x0
+// 0x010a5810: 0x10a5810: beq   v0, zero, 0x10a5830 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a51e8
+	brfalse L_10a5830
 // --- basic block ---
-// 0x010a51d0: 0x10a51d0: lui   a0, 0x0
+// 0x010a5818: 0x10a5818: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a51d4: 0x10a51d4: lui   a1, 0x80000
-	ldc.i4 524288
+// 0x010a581c: 0x10a581c: lui   a1, 0x90000
+	ldc.i4 589824
 	stloc.2
-// 0x010a51d8: 0x10a51d8: addiu a0, a0, 14860
+// 0x010a5820: 0x10a5820: addiu a0, a0, 14860
 	ldloc.1
 	ldc.i4 14860
 	add
 	stloc.1
-// 0x010a51dc: 0x10a51dc: jal   0x100e5c0 addiu a1, a1, 32444
+// 0x010a5824: 0x10a5824: jal   0x100e5d0 addiu a1, a1, -32628
 	ldloc.2
-	ldc.i4 32444
+	ldc.i4 -32628
 	add
 	stloc.2
 	ldloc.0
@@ -5353,26 +5353,26 @@ L_10a51b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a51e4: 0x10a51e4: lui   a0, 0x0
+// 0x010a582c: 0x10a582c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10a51e8:
-// 0x010a51e8: 0x10a51e8: lui   a1, 0x80000
-	ldc.i4 524288
+L_10a5830:
+// 0x010a5830: 0x10a5830: lui   a1, 0x90000
+	ldc.i4 589824
 	stloc.2
-// 0x010a51ec: 0x10a51ec: addiu a0, a0, 14780
+// 0x010a5834: 0x10a5834: addiu a0, a0, 14780
 	ldloc.1
 	ldc.i4 14780
 	add
 	stloc.1
-// 0x010a51f0: 0x10a51f0: jal   0x100e5c0 addiu a1, a1, 32356
+// 0x010a5838: 0x10a5838: jal   0x100e5d0 addiu a1, a1, -32716
 	ldloc.2
-	ldc.i4 32356
+	ldc.i4 -32716
 	add
 	stloc.2
 	ldloc.0
@@ -5380,25 +5380,25 @@ L_10a51e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a51f8: 0x10a51f8: lui   a0, 0x0
+// 0x010a5840: 0x10a5840: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a51fc: 0x10a51fc: lui   a1, 0x80000
-	ldc.i4 524288
+// 0x010a5844: 0x10a5844: lui   a1, 0x90000
+	ldc.i4 589824
 	stloc.2
-// 0x010a5200: 0x10a5200: addiu a0, a0, 14764
+// 0x010a5848: 0x10a5848: addiu a0, a0, 14764
 	ldloc.1
 	ldc.i4 14764
 	add
 	stloc.1
-// 0x010a5204: 0x10a5204: jal   0x100e5c0 addiu a1, a1, 32312
+// 0x010a584c: 0x10a584c: jal   0x100e5d0 addiu a1, a1, -32760
 	ldloc.2
-	ldc.i4 32312
+	ldc.i4 -32760
 	add
 	stloc.2
 	ldloc.0
@@ -5406,36 +5406,36 @@ L_10a51e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a520c: 0x10a520c: lui   s0, 0x80000
-	ldc.i4 524288
+// 0x010a5854: 0x10a5854: lui   s0, 0x90000
+	ldc.i4 589824
 	stloc 7
-// 0x010a5210: 0x10a5210: lui   a0, 0x0
+// 0x010a5858: 0x10a5858: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5214: 0x10a5214: lui   a1, 0x80000
+// 0x010a585c: 0x10a585c: lui   a1, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x010a5218: 0x10a5218: addiu a0, a0, 14828
+// 0x010a5860: 0x10a5860: addiu a0, a0, 14828
 	ldloc.1
 	ldc.i4 14828
 	add
 	stloc.1
-// 0x010a521c: 0x10a521c: addiu a1, a1, 32268
+// 0x010a5864: 0x10a5864: addiu a1, a1, 32732
 	ldloc.2
-	ldc.i4 32268
+	ldc.i4 32732
 	add
 	stloc.2
-// 0x010a5220: 0x10a5220: addiu s0, s0, 32576
+// 0x010a5868: 0x10a5868: addiu s0, s0, -32496
 	ldloc 7
-	ldc.i4 32576
+	ldc.i4 -32496
 	add
 	stloc 7
-// 0x010a5224: 0x10a5224: jal   0x100e5c0 lui   s1, 0x0
+// 0x010a586c: 0x10a586c: jal   0x100e5d0 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -5443,17 +5443,17 @@ L_10a51e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a522c: 0x10a522c: addiu a0, s1, 18636
+// 0x010a5874: 0x10a5874: addiu a0, s1, 18636
 	ldloc 8
 	ldc.i4 18636
 	add
 	stloc.1
-// 0x010a5230: 0x10a5230: jal   0x100e7f4 addu  a1, s0, zero
+// 0x010a5878: 0x10a5878: jal   0x100e804 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -5461,23 +5461,23 @@ L_10a51e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5238: 0x10a5238: bne   v0, zero, 0x10a5258 lui   a1, 0x0
+// 0x010a5880: 0x10a5880: bne   v0, zero, 0x10a58a0 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_10a5258
+	brtrue L_10a58a0
 // --- basic block ---
-// 0x010a5240: 0x10a5240: addiu a0, s1, 18636
+// 0x010a5888: 0x10a5888: addiu a0, s1, 18636
 	ldloc 8
 	ldc.i4 18636
 	add
 	stloc.1
-// 0x010a5244: 0x10a5244: jal   0x100e5c0 addu  a1, s0, zero
+// 0x010a588c: 0x10a588c: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -5485,37 +5485,37 @@ L_10a51e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a524c: 0x10a524c: jal   0x106e298 sll   zero, zero, 0
+// 0x010a5894: 0x10a5894: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5254: 0x10a5254: lui   a1, 0x0
+// 0x010a589c: 0x10a589c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_10a5258:
-// 0x010a5258: 0x10a5258: lui   a0, 0x80000
-	ldc.i4 524288
+L_10a58a0:
+// 0x010a58a0: 0x10a58a0: lui   a0, 0x90000
+	ldc.i4 589824
 	stloc.1
-// 0x010a525c: 0x10a525c: addiu a1, a1, 20820
+// 0x010a58a4: 0x10a58a4: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a5260: 0x10a5260: jal   0x1001c08 addiu a0, a0, 32532
+// 0x010a58a8: 0x10a58a8: jal   0x1001c08 addiu a0, a0, -32540
 	ldloc.1
-	ldc.i4 32532
+	ldc.i4 -32540
 	add
 	stloc.1
 	ldloc.0
@@ -5528,16 +5528,16 @@ L_10a5258:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5268: 0x10a5268: jal   0x103f634 sltiu a0, v0, 1
+// 0x010a58b0: 0x10a58b0: jal   0x103f644 sltiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.1
 	ldloc.1
-	call int32 Cibyl47::roadmap_net_mon_set_enabled_103f634(int32)
+	call int32 Cibyl47::roadmap_net_mon_set_enabled_103f644(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a5270: 0x10a5270: jal   0x100ea50 addu  a0, zero, zero
+// 0x010a58b8: 0x10a58b8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5545,16 +5545,16 @@ L_10a5258:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5278: 0x10a5278: lw    ra, 140(sp)
-// 0x010a527c: 0x10a527c: addu  v0, zero, zero
+// 0x010a58c0: 0x10a58c0: lw    ra, 140(sp)
+// 0x010a58c4: 0x10a58c4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a5280: 0x10a5280: lw    s3, 136(sp)
+// 0x010a58c8: 0x10a58c8: lw    s3, 136(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5563,7 +5563,7 @@ L_10a5258:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a5284: 0x10a5284: lw    s2, 132(sp)
+// 0x010a58cc: 0x10a58cc: lw    s2, 132(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5572,7 +5572,7 @@ L_10a5258:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a5288: 0x10a5288: lw    s1, 128(sp)
+// 0x010a58d0: 0x10a58d0: lw    s1, 128(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5581,7 +5581,7 @@ L_10a5258:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a528c: 0x10a528c: lw    s0, 124(sp)
+// 0x010a58d4: 0x10a58d4: lw    s0, 124(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5590,7 +5590,7 @@ L_10a5258:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a5290: 0x10a5290: jr    ra addiu sp, sp, 144
+// 0x010a58d8: 0x10a58d8: jr    ra addiu sp, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
@@ -5602,7 +5602,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_prompts_selected_10a5298(int32,int32,int32,int32,int32)
+.method public static int32 on_prompts_selected_10a58e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5643,15 +5643,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a5298: 0x10a5298: addiu sp, sp, -304
+// 0x010a58e0: 0x10a58e0: addiu sp, sp, -304
 	ldloc.0
 	ldc.i4 -304
 	add
 	stloc.0
-// 0x010a529c: 0x10a529c: addu  a0, a1, zero
+// 0x010a58e4: 0x10a58e4: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010a52a0: 0x10a52a0: sw    s0, 292(sp)
+// 0x010a58e8: 0x10a58e8: sw    s0, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5660,8 +5660,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a52a4: 0x10a52a4: sw    ra, 300(sp)
-// 0x010a52a8: 0x10a52a8: sw    s1, 296(sp)
+// 0x010a58ec: 0x10a58ec: sw    ra, 300(sp)
+// 0x010a58f0: 0x10a58f0: sw    s1, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5670,7 +5670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a52ac: 0x10a52ac: jal   0x10442b8 addu  s0, a1, zero
+// 0x010a58f4: 0x10a58f4: jal   0x10442c8 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -5678,26 +5678,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_prompt_value_from_name_10442b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_prompt_value_from_name_10442c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a52b4: 0x10a52b4: jal   0x1043e68 addu  a0, v0, zero
+// 0x010a58fc: 0x10a58fc: jal   0x1043e78 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	call int32 Cibyl50::roadmap_prompts_exist_1043e68()
+	call int32 Cibyl50::roadmap_prompts_exist_1043e78()
 	stloc 5
 // --- basic block ---
-// 0x010a52bc: 0x10a52bc: bne   v0, zero, 0x10a5328 lui   a0, 0x20000
+// 0x010a5904: 0x10a5904: bne   v0, zero, 0x10a5970 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_10a5328
+	brtrue L_10a5970
 // --- basic block ---
-// 0x010a52c4: 0x10a52c4: jal   0x101cd60 addiu a0, a0, 7068
+// 0x010a590c: 0x10a590c: jal   0x101cd70 addiu a0, a0, 7532
 	ldloc.1
-	ldc.i4 7068
+	ldc.i4 7532
 	add
 	stloc.1
 	ldloc.0
@@ -5705,25 +5705,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a52cc: 0x10a52cc: lui   a0, 0x20000
+// 0x010a5914: 0x10a5914: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a52d0: 0x10a52d0: addiu a0, a0, 7080
+// 0x010a5918: 0x10a5918: addiu a0, a0, 7544
 	ldloc.1
-	ldc.i4 7080
+	ldc.i4 7544
 	add
 	stloc.1
-// 0x010a52d4: 0x10a52d4: addiu s1, sp, 24
+// 0x010a591c: 0x10a591c: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x010a52d8: 0x10a52d8: jal   0x101cd60 sw    v0, 280(sp)
+// 0x010a5920: 0x10a5920: jal   0x101cd70 sw    v0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5737,12 +5737,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a52e0: 0x10a52e0: lw    a3, 280(sp)
+// 0x010a5928: 0x10a5928: lw    a3, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5751,21 +5751,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a52e4: 0x10a52e4: lui   a2, 0x10000
+// 0x010a592c: 0x10a592c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010a52e8: 0x10a52e8: addiu a2, a2, -11372
+// 0x010a5930: 0x10a5930: addiu a2, a2, -11376
 	ldloc.3
-	ldc.i4 -11372
+	ldc.i4 -11376
 	add
 	stloc.3
-// 0x010a52ec: 0x10a52ec: addiu a1, zero, 256
+// 0x010a5934: 0x10a5934: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010a52f0: 0x10a52f0: addu  a0, s1, zero
+// 0x010a5938: 0x10a5938: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a52f4: 0x10a52f4: sw    v0, 20(sp)
+// 0x010a593c: 0x10a593c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5774,7 +5774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a52f8: 0x10a52f8: jal   0x1000f9c sw    s0, 16(sp)
+// 0x010a5940: 0x10a5940: jal   0x1000f9c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5793,7 +5793,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a5300: 0x10a5300: jal   0x10442b8 addu  a0, s0, zero
+// 0x010a5948: 0x10a5948: jal   0x10442c8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5801,34 +5801,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_prompt_value_from_name_10442b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_prompt_value_from_name_10442c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a5308: 0x10a5308: lui   a0, 0x10000
+// 0x010a5950: 0x10a5950: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a530c: 0x10a530c: lui   a3, 0x10a0000
+// 0x010a5954: 0x10a5954: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x010a5310: 0x10a5310: addiu a0, a0, 18500
+// 0x010a5958: 0x10a5958: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x010a5314: 0x10a5314: addu  a1, s1, zero
+// 0x010a595c: 0x10a595c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010a5318: 0x10a5318: addiu a3, a3, 21312
+// 0x010a5960: 0x10a5960: addiu a3, a3, 22920
 	ldloc 4
-	ldc.i4 21312
+	ldc.i4 22920
 	add
 	stloc 4
-// 0x010a531c: 0x10a531c: addu  a2, zero, zero
+// 0x010a5964: 0x10a5964: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a5320: 0x10a5320: jal   0x104c320 sw    v0, 16(sp)
+// 0x010a5968: 0x10a5968: jal   0x104c330 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5842,17 +5842,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a5328:
-// 0x010a5328: 0x10a5328: lw    ra, 300(sp)
-// 0x010a532c: 0x10a532c: addu  v0, zero, zero
+L_10a5970:
+// 0x010a5970: 0x10a5970: lw    ra, 300(sp)
+// 0x010a5974: 0x10a5974: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a5330: 0x10a5330: lw    s1, 296(sp)
+// 0x010a5978: 0x10a5978: lw    s1, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5861,7 +5861,7 @@ L_10a5328:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a5334: 0x10a5334: lw    s0, 292(sp)
+// 0x010a597c: 0x10a597c: lw    s0, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5870,7 +5870,7 @@ L_10a5328:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a5338: 0x10a5338: jr    ra addiu sp, sp, 304
+// 0x010a5980: 0x10a5980: jr    ra addiu sp, sp, 304
 	ldloc.0
 	ldc.i4 304
 	add
@@ -5882,7 +5882,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_download_lang_confirm_10a5340(int32,int32,int32,int32,int32)
+.method public static int32 on_download_lang_confirm_10a5988(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5917,20 +5917,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a5340: 0x10a5340: addiu sp, sp, -24
+// 0x010a5988: 0x10a5988: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a5344: 0x10a5344: addiu v0, zero, 3
+// 0x010a598c: 0x10a598c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010a5348: 0x10a5348: bne   a0, v0, 0x10a5358 sw    ra, 20(sp)
+// 0x010a5990: 0x10a5990: bne   a0, v0, 0x10a59a0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_10a5358
+	bne.un L_10a59a0
 // --- basic block ---
-// 0x010a5350: 0x10a5350: jal   0x10446e4 addu  a0, a1, zero
+// 0x010a5998: 0x10a5998: jal   0x10446f4 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -5938,15 +5938,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_download_10446e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_download_10446f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a5358:
-// 0x010a5358: 0x10a5358: lw    ra, 20(sp)
-// 0x010a535c: 0x10a535c: sll   zero, zero, 0
-// 0x010a5360: 0x10a5360: jr    ra addiu sp, sp, 24
+L_10a59a0:
+// 0x010a59a0: 0x10a59a0: lw    ra, 20(sp)
+// 0x010a59a4: 0x10a59a4: sll   zero, zero, 0
+// 0x010a59a8: 0x10a59a8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5958,7 +5958,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 callback_10a5368(int32,int32,int32,int32,int32)
+.method public static int32 callback_10a59b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5996,12 +5996,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a5368: 0x10a5368: addiu sp, sp, -24
+// 0x010a59b0: 0x10a59b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a536c: 0x10a536c: sw    s0, 16(sp)
+// 0x010a59b4: 0x10a59b4: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6010,23 +6010,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a5370: 0x10a5370: lui   v1, 0x0
+// 0x010a59b8: 0x10a59b8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a5374: 0x10a5374: lui   s0, 0x80000
+// 0x010a59bc: 0x10a59bc: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010a5378: 0x10a5378: addiu v0, s0, 31068
+// 0x010a59c0: 0x10a59c0: addiu v0, s0, 31532
 	ldloc 8
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 5
-// 0x010a537c: 0x10a537c: addiu v1, v1, 32120
+// 0x010a59c4: 0x10a59c4: addiu v1, v1, 32120
 	ldloc 6
 	ldc.i4 32120
 	add
 	stloc 6
-// 0x010a5380: 0x10a5380: sw    v1, 4(v0)
+// 0x010a59c8: 0x10a59c8: sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6035,29 +6035,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a5384: 0x10a5384: lui   a0, 0x10000
+// 0x010a59cc: 0x10a59cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a5388: 0x10a5388: lui   v0, 0x0
+// 0x010a59d0: 0x10a59d0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a538c: 0x10a538c: addiu a0, a0, -31236
+// 0x010a59d4: 0x10a59d4: addiu a0, a0, -31236
 	ldloc.1
 	ldc.i4 -31236
 	add
 	stloc.1
-// 0x010a5390: 0x10a5390: addiu v0, v0, 32116
+// 0x010a59d8: 0x10a59d8: addiu v0, v0, 32116
 	ldloc 5
 	ldc.i4 32116
 	add
 	stloc 5
-// 0x010a5394: 0x10a5394: sw    ra, 20(sp)
-// 0x010a5398: 0x10a5398: jal   0x10947ac sw    v0, 31068(s0)
+// 0x010a59dc: 0x10a59dc: sw    ra, 20(sp)
+// 0x010a59e0: 0x10a59e0: jal   0x1094dd0 sw    v0, 31532(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldloc 5
 	stelem.i4
@@ -6066,21 +6066,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a53a0: 0x10a53a0: lw    a1, 31068(s0)
+// 0x010a59e8: 0x10a59e8: lw    a1, 31532(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a53a4: 0x10a53a4: jal   0x1001c08 addu  a0, v0, zero
+// 0x010a59ec: 0x10a59ec: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6093,56 +6093,56 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a53ac: 0x10a53ac: bne   v0, zero, 0x10a53bc lui   a0, 0x0
+// 0x010a59f4: 0x10a59f4: bne   v0, zero, 0x10a5a04 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10a53bc
+	brtrue L_10a5a04
 // --- basic block ---
-// 0x010a53b4: 0x10a53b4: j	 0x10a53c4 addiu a0, a0, 28064
+// 0x010a59fc: 0x10a59fc: j	 0x10a5a0c addiu a0, a0, 28064
 	ldloc.1
 	ldc.i4 28064
 	add
 	stloc.1
-	br L_10a53c4
+	br L_10a5a0c
 // --- basic block ---
-L_10a53bc:
-// 0x010a53bc: 0x10a53bc: lui   a0, 0x0
+L_10a5a04:
+// 0x010a5a04: 0x10a5a04: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a53c0: 0x10a53c0: addiu a0, a0, 28068
+// 0x010a5a08: 0x10a5a08: addiu a0, a0, 28068
 	ldloc.1
 	ldc.i4 28068
 	add
 	stloc.1
-L_10a53c4:
-// 0x010a53c4: 0x10a53c4: jal   0x101424c sll   zero, zero, 0
+L_10a5a0c:
+// 0x010a5a0c: 0x10a5a0c: jal   0x101425c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_subskin_101424c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_subskin_101425c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a53cc: 0x10a53cc: jal   0x109483c sll   zero, zero, 0
+// 0x010a5a14: 0x10a5a14: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a53d4: 0x10a53d4: lw    ra, 20(sp)
-// 0x010a53d8: 0x10a53d8: addiu v0, zero, 1
+// 0x010a5a1c: 0x10a5a1c: lw    ra, 20(sp)
+// 0x010a5a20: 0x10a5a20: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a53dc: 0x10a53dc: lw    s0, 16(sp)
+// 0x010a5a24: 0x10a5a24: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6151,7 +6151,7 @@ L_10a53c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a53e0: 0x10a53e0: jr    ra addiu sp, sp, 24
+// 0x010a5a28: 0x10a5a28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6163,7 +6163,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_102_10a54c0(int32,int32,int32,int32,int32)
+.method public static int32 T_102_10a5b08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra,int32 lo)
@@ -6207,28 +6207,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a54c0: 0x10a54c0: addiu v0, zero, 44
+// 0x010a5b08: 0x10a5b08: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x010a54c4: 0x10a54c4: mult  a0, v0
+// 0x010a5b0c: 0x10a5b0c: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 11
-// 0x010a54c8: 0x10a54c8: lui   v0, 0x80000
+// 0x010a5b10: 0x10a5b10: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a54cc: 0x10a54cc: addiu v0, v0, 31076
+// 0x010a5b14: 0x10a5b14: addiu v0, v0, 31540
 	ldloc 5
-	ldc.i4 31076
+	ldc.i4 31540
 	add
 	stloc 5
-// 0x010a54d0: 0x10a54d0: addiu sp, sp, -48
+// 0x010a5b18: 0x10a5b18: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010a54d4: 0x10a54d4: sw    s0, 36(sp)
+// 0x010a5b1c: 0x10a5b1c: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6237,7 +6237,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a54d8: 0x10a54d8: sw    s1, 40(sp)
+// 0x010a5b20: 0x10a5b20: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6246,30 +6246,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a54dc: 0x10a54dc: addu  s1, a0, zero
+// 0x010a5b24: 0x10a5b24: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a54e0: 0x10a54e0: sw    ra, 44(sp)
-// 0x010a54e4: 0x10a54e4: mflo  lo
+// 0x010a5b28: 0x10a5b28: sw    ra, 44(sp)
+// 0x010a5b2c: 0x10a5b2c: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x010a54e8: 0x10a54e8: addu  v0, v1, v0
+// 0x010a5b30: 0x10a5b30: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010a54ec: 0x10a54ec: addiu s0, v0, 4
+// 0x010a5b34: 0x10a5b34: addiu s0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 8
-// 0x010a54f0: 0x10a54f0: addiu v1, zero, 1
+// 0x010a5b38: 0x10a5b38: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010a54f4: 0x10a54f4: addu  a0, s0, zero
+// 0x010a5b3c: 0x10a5b3c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a54f8: 0x10a54f8: jal   0x1001b68 sw    v1, 0(v0)
+// 0x010a5b40: 0x10a5b40: jal   0x1001b68 sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6283,37 +6283,37 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a5500: 0x10a5500: lui   a1, 0x20000
+// 0x010a5b48: 0x10a5b48: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a5504: 0x10a5504: lui   a3, 0x20000
+// 0x010a5b4c: 0x10a5b4c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a5508: 0x10a5508: lui   v0, 0x10000
+// 0x010a5b50: 0x10a5b50: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a550c: 0x10a550c: addiu v0, v0, 18500
+// 0x010a5b54: 0x10a5b54: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010a5510: 0x10a5510: addiu a1, a1, 6992
+// 0x010a5b58: 0x10a5b58: addiu a1, a1, 7456
 	ldloc.2
-	ldc.i4 6992
+	ldc.i4 7456
 	add
 	stloc.2
-// 0x010a5514: 0x10a5514: addiu a3, a3, 7032
+// 0x010a5b5c: 0x10a5b5c: addiu a3, a3, 7496
 	ldloc 4
-	ldc.i4 7032
+	ldc.i4 7496
 	add
 	stloc 4
-// 0x010a5518: 0x10a5518: addiu a0, zero, 2
+// 0x010a5b60: 0x10a5b60: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a551c: 0x10a551c: addiu a2, zero, 453
+// 0x010a5b64: 0x10a5b64: addiu a2, zero, 453
 	ldc.i4 453
 	stloc.3
-// 0x010a5520: 0x10a5520: sw    s1, 16(sp)
+// 0x010a5b68: 0x10a5b68: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6322,7 +6322,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a5524: 0x10a5524: sw    s0, 20(sp)
+// 0x010a5b6c: 0x10a5b6c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6331,7 +6331,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a5528: 0x10a5528: jal   0x100449c sw    v0, 24(sp)
+// 0x010a5b70: 0x10a5b70: jal   0x100449c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6350,8 +6350,8 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a5530: 0x10a5530: lw    ra, 44(sp)
-// 0x010a5534: 0x10a5534: lw    s1, 40(sp)
+// 0x010a5b78: 0x10a5b78: lw    ra, 44(sp)
+// 0x010a5b7c: 0x10a5b7c: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6360,7 +6360,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a5538: 0x10a5538: lw    s0, 36(sp)
+// 0x010a5b80: 0x10a5b80: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6369,7 +6369,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a553c: 0x10a553c: jr    ra addiu sp, sp, 48
+// 0x010a5b84: 0x10a5b84: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6381,7 +6381,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_all_settings_show_10a5544(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_all_settings_show_10a5b8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -6428,14 +6428,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a5544:
-// 0x010a5544: 0x10a5544: addiu sp, sp, -88
+L_10a5b8c:
+// 0x010a5b8c: 0x10a5b8c: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010a5548: 0x10a5548: sw    ra, 84(sp)
-// 0x010a554c: 0x10a554c: sw    s0, 68(sp)
+// 0x010a5b90: 0x10a5b90: sw    ra, 84(sp)
+// 0x010a5b94: 0x10a5b94: sw    s0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6444,7 +6444,7 @@ L_10a5544:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a5550: 0x10a5550: sw    s3, 80(sp)
+// 0x010a5b98: 0x10a5b98: sw    s3, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6453,7 +6453,7 @@ L_10a5544:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a5554: 0x10a5554: sw    s2, 76(sp)
+// 0x010a5b9c: 0x10a5b9c: sw    s2, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6462,7 +6462,7 @@ L_10a5544:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a5558: 0x10a5558: jal   0x101d484 sw    s1, 72(sp)
+// 0x010a5ba0: 0x10a5ba0: jal   0x101d494 sw    s1, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6476,12 +6476,12 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5560: 0x10a5560: jal   0x101ccd4 addu  a0, v0, zero
+// 0x010a5ba8: 0x10a5ba8: jal   0x101cce4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6489,15 +6489,15 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_lang_value_101ccd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_lang_value_101cce4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5568: 0x10a5568: addu  a1, v0, zero
+// 0x010a5bb0: 0x10a5bb0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a556c: 0x10a556c: jal   0x10a54c0 addu  a0, zero, zero
+// 0x010a5bb4: 0x10a5bb4: jal   0x10a5b08 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6505,12 +6505,12 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5574: 0x10a5574: jal   0x1044134 lui   s0, 0x0
+// 0x010a5bbc: 0x10a5bbc: jal   0x1044144 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -6518,12 +6518,12 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a557c: 0x10a557c: jal   0x1044368 addu  a0, v0, zero
+// 0x010a5bc4: 0x10a5bc4: jal   0x1044378 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6531,15 +6531,15 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_prompt_value_1044368(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_prompt_value_1044378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5584: 0x10a5584: addu  a1, v0, zero
+// 0x010a5bcc: 0x10a5bcc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a5588: 0x10a5588: jal   0x10a54c0 addiu a0, zero, 1
+// 0x010a5bd0: 0x10a5bd0: jal   0x10a5b08 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -6547,25 +6547,25 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5590: 0x10a5590: lui   a0, 0x0
+// 0x010a5bd8: 0x10a5bd8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5594: 0x10a5594: lui   a1, 0x20000
+// 0x010a5bdc: 0x10a5bdc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a5598: 0x10a5598: addiu a0, a0, 18304
+// 0x010a5be0: 0x10a5be0: addiu a0, a0, 18304
 	ldloc.1
 	ldc.i4 18304
 	add
 	stloc.1
-// 0x010a559c: 0x10a559c: jal   0x100e7f4 addiu a1, a1, 6872
+// 0x010a5be4: 0x10a5be4: jal   0x100e804 addiu a1, a1, 7336
 	ldloc.2
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc.2
 	ldloc.0
@@ -6573,18 +6573,18 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a55a4: 0x10a55a4: addu  a2, v0, zero
+// 0x010a5bec: 0x10a5bec: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a55a8: 0x10a55a8: addiu a0, zero, 2
+// 0x010a5bf0: 0x10a5bf0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a55ac: 0x10a55ac: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5bf4: 0x10a5bf4: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6592,20 +6592,20 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a55b4: 0x10a55b4: lui   a0, 0x0
+// 0x010a5bfc: 0x10a5bfc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a55b8: 0x10a55b8: addiu a1, s0, 20820
+// 0x010a5c00: 0x10a5c00: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a55bc: 0x10a55bc: jal   0x100e7f4 addiu a0, a0, 14100
+// 0x010a5c04: 0x10a5c04: jal   0x100e804 addiu a0, a0, 14100
 	ldloc.1
 	ldc.i4 14100
 	add
@@ -6615,18 +6615,18 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a55c4: 0x10a55c4: addu  a2, v0, zero
+// 0x010a5c0c: 0x10a5c0c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a55c8: 0x10a55c8: addiu a0, zero, 3
+// 0x010a5c10: 0x10a5c10: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010a55cc: 0x10a55cc: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5c14: 0x10a5c14: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6634,20 +6634,20 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a55d4: 0x10a55d4: lui   a0, 0x0
+// 0x010a5c1c: 0x10a5c1c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a55d8: 0x10a55d8: addiu a1, s0, 20820
+// 0x010a5c20: 0x10a5c20: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a55dc: 0x10a55dc: jal   0x100e7f4 addiu a0, a0, 14116
+// 0x010a5c24: 0x10a5c24: jal   0x100e804 addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
@@ -6657,18 +6657,18 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a55e4: 0x10a55e4: addu  a2, v0, zero
+// 0x010a5c2c: 0x10a5c2c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a55e8: 0x10a55e8: addiu a0, zero, 4
+// 0x010a5c30: 0x10a5c30: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a55ec: 0x10a55ec: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5c34: 0x10a5c34: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6676,20 +6676,20 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a55f4: 0x10a55f4: lui   a0, 0x0
+// 0x010a5c3c: 0x10a5c3c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a55f8: 0x10a55f8: addiu a1, s0, 20820
+// 0x010a5c40: 0x10a5c40: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a55fc: 0x10a55fc: jal   0x100e7f4 addiu a0, a0, 18320
+// 0x010a5c44: 0x10a5c44: jal   0x100e804 addiu a0, a0, 18320
 	ldloc.1
 	ldc.i4 18320
 	add
@@ -6699,18 +6699,18 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5604: 0x10a5604: addu  a2, v0, zero
+// 0x010a5c4c: 0x10a5c4c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5608: 0x10a5608: addiu a0, zero, 5
+// 0x010a5c50: 0x10a5c50: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010a560c: 0x10a560c: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5c54: 0x10a5c54: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6718,25 +6718,25 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5614: 0x10a5614: lui   a0, 0x0
+// 0x010a5c5c: 0x10a5c5c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5618: 0x10a5618: lui   a1, 0x20000
+// 0x010a5c60: 0x10a5c60: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a561c: 0x10a561c: addiu a0, a0, 18352
+// 0x010a5c64: 0x10a5c64: addiu a0, a0, 18352
 	ldloc.1
 	ldc.i4 18352
 	add
 	stloc.1
-// 0x010a5620: 0x10a5620: jal   0x100e7f4 addiu a1, a1, 6828
+// 0x010a5c68: 0x10a5c68: jal   0x100e804 addiu a1, a1, 7292
 	ldloc.2
-	ldc.i4 6828
+	ldc.i4 7292
 	add
 	stloc.2
 	ldloc.0
@@ -6744,18 +6744,18 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5628: 0x10a5628: addu  a2, v0, zero
+// 0x010a5c70: 0x10a5c70: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a562c: 0x10a562c: addiu a0, zero, 6
+// 0x010a5c74: 0x10a5c74: addiu a0, zero, 6
 	ldc.i4.6
 	stloc.1
-// 0x010a5630: 0x10a5630: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5c78: 0x10a5c78: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6763,12 +6763,12 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5638: 0x10a5638: jal   0x1048c0c lui   s0, 0x10000
+// 0x010a5c80: 0x10a5c80: jal   0x1048c1c lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
 	ldloc.0
@@ -6776,12 +6776,12 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5640: 0x10a5640: jal   0x1048c40 sw    v0, 56(sp)
+// 0x010a5c88: 0x10a5c88: jal   0x1048c50 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6795,12 +6795,12 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_routes_suggest_routes_1048c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_routes_suggest_routes_1048c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5648: 0x10a5648: lw    a1, 56(sp)
+// 0x010a5c90: 0x10a5c90: lw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6809,10 +6809,10 @@ L_10a5544:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a564c: 0x10a564c: addu  a2, v0, zero
+// 0x010a5c94: 0x10a5c94: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5650: 0x10a5650: jal   0x10a4ce8 addiu a0, zero, 7
+// 0x010a5c98: 0x10a5c98: jal   0x10a5330 addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
 	ldloc.0
@@ -6820,15 +6820,15 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5658: 0x10a5658: lui   a0, 0x0
+// 0x010a5ca0: 0x10a5ca0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a565c: 0x10a565c: jal   0x100e348 addiu a0, a0, 18336
+// 0x010a5ca4: 0x10a5ca4: jal   0x100e358 addiu a0, a0, 18336
 	ldloc.1
 	ldc.i4 18336
 	add
@@ -6838,15 +6838,15 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5664: 0x10a5664: addu  a1, v0, zero
+// 0x010a5cac: 0x10a5cac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a5668: 0x10a5668: jal   0x10a54c0 addiu a0, zero, 8
+// 0x010a5cb0: 0x10a5cb0: jal   0x10a5b08 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
 	ldloc.0
@@ -6854,32 +6854,32 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5670: 0x10a5670: jal   0x10141c0 sll   zero, zero, 0
+// 0x010a5cb8: 0x10a5cb8: jal   0x10141d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_get_scheme_10141c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_get_scheme_10141d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5678: 0x10a5678: bne   v0, zero, 0x10a5694 sll   zero, zero, 0
+// 0x010a5cc0: 0x10a5cc0: bne   v0, zero, 0x10a5cdc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a5694
+	brtrue L_10a5cdc
 // --- basic block ---
-// 0x010a5680: 0x10a5680: addiu a1, s0, 18500
+// 0x010a5cc8: 0x10a5cc8: addiu a1, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a5684: 0x10a5684: jal   0x10a54c0 addiu a0, zero, 9
+// 0x010a5ccc: 0x10a5ccc: jal   0x10a5b08 addiu a0, zero, 9
 	ldc.i4.s 9
 	stloc.1
 	ldloc.0
@@ -6887,16 +6887,16 @@ L_10a5544:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a568c: 0x10a568c: j	 0x10a56f0 sll   zero, zero, 0
-	br L_10a56f0
+// 0x010a5cd4: 0x10a5cd4: j	 0x10a5d38 sll   zero, zero, 0
+	br L_10a5d38
 // --- basic block ---
-L_10a5694:
-// 0x010a5694: 0x10a5694: jal   0x10141c0 lui   s1, 0x80000
+L_10a5cdc:
+// 0x010a5cdc: 0x10a5cdc: jal   0x10141d0 lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 9
 	ldloc.0
@@ -6904,39 +6904,39 @@ L_10a5694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_get_scheme_10141c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_get_scheme_10141d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a569c: 0x10a569c: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x010a5ce4: 0x10a5ce4: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x010a56a0: 0x10a56a0: addu  a2, v0, zero
+// 0x010a5ce8: 0x10a5ce8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a56a4: 0x10a56a4: addiu a0, s1, 31476
+// 0x010a5cec: 0x10a5cec: addiu a0, s1, 31940
 	ldloc 9
-	ldc.i4 31476
+	ldc.i4 31940
 	add
 	stloc.1
-// 0x010a56a8: 0x10a56a8: addiu a1, a1, -13884
+// 0x010a5cf0: 0x10a5cf0: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x010a56ac: 0x10a56ac: addiu v1, zero, 1
+// 0x010a5cf4: 0x10a5cf4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010a56b0: 0x10a56b0: lui   v0, 0x80000
+// 0x010a5cf8: 0x10a5cf8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a56b4: 0x10a56b4: jal   0x1000f64 sw    v1, 31472(v0)
+// 0x010a5cfc: 0x10a5cfc: jal   0x1000f64 sw    v1, 31936(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7868
+	ldc.i4 7984
 	add
 	ldloc 6
 	stelem.i4
@@ -6950,42 +6950,42 @@ L_10a5694:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a56bc: 0x10a56bc: lui   a1, 0x20000
+// 0x010a5d04: 0x10a5d04: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a56c0: 0x10a56c0: lui   a3, 0x20000
+// 0x010a5d08: 0x10a5d08: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a56c4: 0x10a56c4: addiu s1, s1, 31476
+// 0x010a5d0c: 0x10a5d0c: addiu s1, s1, 31940
 	ldloc 9
-	ldc.i4 31476
+	ldc.i4 31940
 	add
 	stloc 9
-// 0x010a56c8: 0x10a56c8: addiu s0, s0, 18500
+// 0x010a5d10: 0x10a5d10: addiu s0, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 8
-// 0x010a56cc: 0x10a56cc: addiu v0, zero, 9
+// 0x010a5d14: 0x10a5d14: addiu v0, zero, 9
 	ldc.i4.s 9
 	stloc 5
-// 0x010a56d0: 0x10a56d0: addiu a1, a1, 6992
+// 0x010a5d18: 0x10a5d18: addiu a1, a1, 7456
 	ldloc.2
-	ldc.i4 6992
+	ldc.i4 7456
 	add
 	stloc.2
-// 0x010a56d4: 0x10a56d4: addiu a3, a3, 7032
+// 0x010a5d1c: 0x10a5d1c: addiu a3, a3, 7496
 	ldloc 4
-	ldc.i4 7032
+	ldc.i4 7496
 	add
 	stloc 4
-// 0x010a56d8: 0x10a56d8: addiu a0, zero, 2
+// 0x010a5d20: 0x10a5d20: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a56dc: 0x10a56dc: addiu a2, zero, 461
+// 0x010a5d24: 0x10a5d24: addiu a2, zero, 461
 	ldc.i4 461
 	stloc.3
-// 0x010a56e0: 0x10a56e0: sw    v0, 16(sp)
+// 0x010a5d28: 0x10a5d28: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6994,7 +6994,7 @@ L_10a5694:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a56e4: 0x10a56e4: sw    s1, 20(sp)
+// 0x010a5d2c: 0x10a5d2c: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7003,7 +7003,7 @@ L_10a5694:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a56e8: 0x10a56e8: jal   0x100449c sw    s0, 24(sp)
+// 0x010a5d30: 0x10a5d30: jal   0x100449c sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7022,8 +7022,8 @@ L_10a5694:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a56f0:
-// 0x010a56f0: 0x10a56f0: jal   0x10140b0 lui   s0, 0x0
+L_10a5d38:
+// 0x010a5d38: 0x10a5d38: jal   0x10140c0 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -7031,25 +7031,25 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a56f8: 0x10a56f8: lui   a0, 0x0
+// 0x010a5d40: 0x10a5d40: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a56fc: 0x10a56fc: addiu a1, s0, 20820
+// 0x010a5d44: 0x10a5d44: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a5700: 0x10a5700: addiu a0, a0, 1860
+// 0x010a5d48: 0x10a5d48: addiu a0, a0, 1860
 	ldloc.1
 	ldc.i4 1860
 	add
 	stloc.1
-// 0x010a5704: 0x10a5704: jal   0x100e7f4 addu  s1, v0, zero
+// 0x010a5d4c: 0x10a5d4c: jal   0x100e804 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -7057,18 +7057,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a570c: 0x10a570c: addu  a2, v0, zero
+// 0x010a5d54: 0x10a5d54: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5710: 0x10a5710: addu  a1, s1, zero
+// 0x010a5d58: 0x10a5d58: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010a5714: 0x10a5714: jal   0x10a4ce8 addiu a0, zero, 10
+// 0x010a5d5c: 0x10a5d5c: jal   0x10a5330 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -7076,20 +7076,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a571c: 0x10a571c: lui   v1, 0x0
+// 0x010a5d64: 0x10a5d64: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a5720: 0x10a5720: addiu v0, v1, 18368
+// 0x010a5d68: 0x10a5d68: addiu v0, v1, 18368
 	ldloc 6
 	ldc.i4 18368
 	add
 	stloc 5
-// 0x010a5724: 0x10a5724: lw    a0, 18368(v1)
+// 0x010a5d6c: 0x10a5d6c: lw    a0, 18368(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7098,7 +7098,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a5728: 0x10a5728: lw    a3, 12(v0)
+// 0x010a5d70: 0x10a5d70: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7107,7 +7107,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a572c: 0x10a572c: lw    a1, 4(v0)
+// 0x010a5d74: 0x10a5d74: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7116,7 +7116,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5730: 0x10a5730: lw    a2, 8(v0)
+// 0x010a5d78: 0x10a5d78: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7125,7 +7125,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a5734: 0x10a5734: jal   0x10a6e98 lui   s3, 0x10000
+// 0x010a5d7c: 0x10a5d7c: jal   0x10a74e0 lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 11
 	ldloc.0
@@ -7133,18 +7133,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a573c: 0x10a573c: addu  a2, v0, zero
+// 0x010a5d84: 0x10a5d84: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5740: 0x10a5740: addiu a0, zero, 11
+// 0x010a5d88: 0x10a5d88: addiu a0, zero, 11
 	ldc.i4.s 11
 	stloc.1
-// 0x010a5744: 0x10a5744: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5d8c: 0x10a5d8c: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7152,20 +7152,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a574c: 0x10a574c: lui   v1, 0x0
+// 0x010a5d94: 0x10a5d94: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a5750: 0x10a5750: addiu v0, v1, 18384
+// 0x010a5d98: 0x10a5d98: addiu v0, v1, 18384
 	ldloc 6
 	ldc.i4 18384
 	add
 	stloc 5
-// 0x010a5754: 0x10a5754: lw    a0, 18384(v1)
+// 0x010a5d9c: 0x10a5d9c: lw    a0, 18384(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7174,7 +7174,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a5758: 0x10a5758: lw    a3, 12(v0)
+// 0x010a5da0: 0x10a5da0: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7183,7 +7183,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a575c: 0x10a575c: lw    a1, 4(v0)
+// 0x010a5da4: 0x10a5da4: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7192,7 +7192,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5760: 0x10a5760: lw    a2, 8(v0)
+// 0x010a5da8: 0x10a5da8: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7201,7 +7201,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a5764: 0x10a5764: jal   0x10a6e98 lui   s2, 0x10000
+// 0x010a5dac: 0x10a5dac: jal   0x10a74e0 lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
 	ldloc.0
@@ -7209,18 +7209,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a576c: 0x10a576c: addu  a2, v0, zero
+// 0x010a5db4: 0x10a5db4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5770: 0x10a5770: addiu a0, zero, 12
+// 0x010a5db8: 0x10a5db8: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x010a5774: 0x10a5774: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5dbc: 0x10a5dbc: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7228,20 +7228,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a577c: 0x10a577c: lui   v1, 0x0
+// 0x010a5dc4: 0x10a5dc4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a5780: 0x10a5780: addiu v0, v1, 18496
+// 0x010a5dc8: 0x10a5dc8: addiu v0, v1, 18496
 	ldloc 6
 	ldc.i4 18496
 	add
 	stloc 5
-// 0x010a5784: 0x10a5784: lw    a0, 18496(v1)
+// 0x010a5dcc: 0x10a5dcc: lw    a0, 18496(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7250,7 +7250,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a5788: 0x10a5788: lw    a3, 12(v0)
+// 0x010a5dd0: 0x10a5dd0: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7259,7 +7259,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a578c: 0x10a578c: lw    a1, 4(v0)
+// 0x010a5dd4: 0x10a5dd4: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7268,7 +7268,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5790: 0x10a5790: lw    a2, 8(v0)
+// 0x010a5dd8: 0x10a5dd8: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7277,9 +7277,9 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a5794: 0x10a5794: jal   0x10a6e98 addiu s3, s3, 5760
+// 0x010a5ddc: 0x10a5ddc: jal   0x10a74e0 addiu s3, s3, 5756
 	ldloc 11
-	ldc.i4 5760
+	ldc.i4 5756
 	add
 	stloc 11
 	ldloc.0
@@ -7287,18 +7287,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a579c: 0x10a579c: addu  a2, v0, zero
+// 0x010a5de4: 0x10a5de4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a57a0: 0x10a57a0: addiu a0, zero, 13
+// 0x010a5de8: 0x10a5de8: addiu a0, zero, 13
 	ldc.i4.s 13
 	stloc.1
-// 0x010a57a4: 0x10a57a4: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5dec: 0x10a5dec: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7306,20 +7306,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a57ac: 0x10a57ac: lui   v1, 0x0
+// 0x010a5df4: 0x10a5df4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a57b0: 0x10a57b0: addiu v0, v1, 18416
+// 0x010a5df8: 0x10a5df8: addiu v0, v1, 18416
 	ldloc 6
 	ldc.i4 18416
 	add
 	stloc 5
-// 0x010a57b4: 0x10a57b4: lw    a0, 18416(v1)
+// 0x010a5dfc: 0x10a5dfc: lw    a0, 18416(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7328,7 +7328,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a57b8: 0x10a57b8: lw    a3, 12(v0)
+// 0x010a5e00: 0x10a5e00: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7337,7 +7337,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a57bc: 0x10a57bc: lw    a1, 4(v0)
+// 0x010a5e04: 0x10a5e04: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7346,7 +7346,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a57c0: 0x10a57c0: lw    a2, 8(v0)
+// 0x010a5e08: 0x10a5e08: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7355,9 +7355,9 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a57c4: 0x10a57c4: jal   0x10a6e98 addiu s2, s2, 5752
+// 0x010a5e0c: 0x10a5e0c: jal   0x10a74e0 addiu s2, s2, 5748
 	ldloc 10
-	ldc.i4 5752
+	ldc.i4 5748
 	add
 	stloc 10
 	ldloc.0
@@ -7365,18 +7365,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a57cc: 0x10a57cc: addu  a2, v0, zero
+// 0x010a5e14: 0x10a5e14: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a57d0: 0x10a57d0: addiu a0, zero, 14
+// 0x010a5e18: 0x10a5e18: addiu a0, zero, 14
 	ldc.i4.s 14
 	stloc.1
-// 0x010a57d4: 0x10a57d4: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5e1c: 0x10a5e1c: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7384,20 +7384,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a57dc: 0x10a57dc: lui   v1, 0x0
+// 0x010a5e24: 0x10a5e24: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a57e0: 0x10a57e0: addiu v0, v1, 18448
+// 0x010a5e28: 0x10a5e28: addiu v0, v1, 18448
 	ldloc 6
 	ldc.i4 18448
 	add
 	stloc 5
-// 0x010a57e4: 0x10a57e4: lw    a0, 18448(v1)
+// 0x010a5e2c: 0x10a5e2c: lw    a0, 18448(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7406,7 +7406,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a57e8: 0x10a57e8: lw    a3, 12(v0)
+// 0x010a5e30: 0x10a5e30: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7415,7 +7415,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a57ec: 0x10a57ec: lw    a1, 4(v0)
+// 0x010a5e34: 0x10a5e34: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7424,7 +7424,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a57f0: 0x10a57f0: lw    a2, 8(v0)
+// 0x010a5e38: 0x10a5e38: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7433,7 +7433,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a57f4: 0x10a57f4: jal   0x10a6e98 addiu s1, sp, 32
+// 0x010a5e3c: 0x10a5e3c: jal   0x10a74e0 addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -7443,18 +7443,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a57fc: 0x10a57fc: addu  a2, v0, zero
+// 0x010a5e44: 0x10a5e44: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5800: 0x10a5800: addiu a0, zero, 15
+// 0x010a5e48: 0x10a5e48: addiu a0, zero, 15
 	ldc.i4.s 15
 	stloc.1
-// 0x010a5804: 0x10a5804: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5e4c: 0x10a5e4c: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7462,20 +7462,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a580c: 0x10a580c: lui   v1, 0x0
+// 0x010a5e54: 0x10a5e54: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a5810: 0x10a5810: addiu v0, v1, 18432
+// 0x010a5e58: 0x10a5e58: addiu v0, v1, 18432
 	ldloc 6
 	ldc.i4 18432
 	add
 	stloc 5
-// 0x010a5814: 0x10a5814: lw    a0, 18432(v1)
+// 0x010a5e5c: 0x10a5e5c: lw    a0, 18432(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7484,7 +7484,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a5818: 0x10a5818: lw    a3, 12(v0)
+// 0x010a5e60: 0x10a5e60: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7493,7 +7493,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a581c: 0x10a581c: lw    a1, 4(v0)
+// 0x010a5e64: 0x10a5e64: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7502,7 +7502,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5820: 0x10a5820: lw    a2, 8(v0)
+// 0x010a5e68: 0x10a5e68: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7511,24 +7511,24 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a5824: 0x10a5824: jal   0x10a6e98 sll   zero, zero, 0
+// 0x010a5e6c: 0x10a5e6c: jal   0x10a74e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a582c: 0x10a582c: addu  a2, v0, zero
+// 0x010a5e74: 0x10a5e74: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5830: 0x10a5830: addiu a0, zero, 16
+// 0x010a5e78: 0x10a5e78: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-// 0x010a5834: 0x10a5834: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5e7c: 0x10a5e7c: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7536,20 +7536,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a583c: 0x10a583c: lui   v1, 0x0
+// 0x010a5e84: 0x10a5e84: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a5840: 0x10a5840: addiu v0, v1, 18512
+// 0x010a5e88: 0x10a5e88: addiu v0, v1, 18512
 	ldloc 6
 	ldc.i4 18512
 	add
 	stloc 5
-// 0x010a5844: 0x10a5844: lw    a0, 18512(v1)
+// 0x010a5e8c: 0x10a5e8c: lw    a0, 18512(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7558,7 +7558,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a5848: 0x10a5848: lw    a3, 12(v0)
+// 0x010a5e90: 0x10a5e90: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7567,7 +7567,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a584c: 0x10a584c: lw    a1, 4(v0)
+// 0x010a5e94: 0x10a5e94: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7576,7 +7576,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5850: 0x10a5850: lw    a2, 8(v0)
+// 0x010a5e98: 0x10a5e98: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7585,24 +7585,24 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a5854: 0x10a5854: jal   0x10a6e98 sll   zero, zero, 0
+// 0x010a5e9c: 0x10a5e9c: jal   0x10a74e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a585c: 0x10a585c: addu  a2, v0, zero
+// 0x010a5ea4: 0x10a5ea4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5860: 0x10a5860: addiu a1, zero, 1
+// 0x010a5ea8: 0x10a5ea8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a5864: 0x10a5864: jal   0x10a4ce8 addiu a0, zero, 17
+// 0x010a5eac: 0x10a5eac: jal   0x10a5330 addiu a0, zero, 17
 	ldc.i4.s 17
 	stloc.1
 	ldloc.0
@@ -7610,12 +7610,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a586c: 0x10a586c: jal   0x10a6d54 addu  a0, zero, zero
+// 0x010a5eb4: 0x10a5eb4: jal   0x10a739c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7623,18 +7623,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5874: 0x10a5874: addu  a2, v0, zero
+// 0x010a5ebc: 0x10a5ebc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5878: 0x10a5878: addiu a1, zero, 1
+// 0x010a5ec0: 0x10a5ec0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a587c: 0x10a587c: jal   0x10a4ce8 addiu a0, zero, 18
+// 0x010a5ec4: 0x10a5ec4: jal   0x10a5330 addiu a0, zero, 18
 	ldc.i4.s 18
 	stloc.1
 	ldloc.0
@@ -7642,12 +7642,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5884: 0x10a5884: jal   0x10a6d54 addiu a0, zero, 1
+// 0x010a5ecc: 0x10a5ecc: jal   0x10a739c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -7655,18 +7655,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a588c: 0x10a588c: addu  a2, v0, zero
+// 0x010a5ed4: 0x10a5ed4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5890: 0x10a5890: addiu a1, zero, 1
+// 0x010a5ed8: 0x10a5ed8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a5894: 0x10a5894: jal   0x10a4ce8 addiu a0, zero, 19
+// 0x010a5edc: 0x10a5edc: jal   0x10a5330 addiu a0, zero, 19
 	ldc.i4.s 19
 	stloc.1
 	ldloc.0
@@ -7674,12 +7674,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a589c: 0x10a589c: jal   0x10a6d54 addiu a0, zero, 2
+// 0x010a5ee4: 0x10a5ee4: jal   0x10a739c addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -7687,18 +7687,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a58a4: 0x10a58a4: addu  a2, v0, zero
+// 0x010a5eec: 0x10a5eec: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a58a8: 0x10a58a8: addiu a1, zero, 1
+// 0x010a5ef0: 0x10a5ef0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a58ac: 0x10a58ac: jal   0x10a4ce8 addiu a0, zero, 20
+// 0x010a5ef4: 0x10a5ef4: jal   0x10a5330 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -7706,12 +7706,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a58b4: 0x10a58b4: jal   0x10a6d54 addiu a0, zero, 3
+// 0x010a5efc: 0x10a5efc: jal   0x10a739c addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.0
@@ -7719,18 +7719,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a58bc: 0x10a58bc: addu  a2, v0, zero
+// 0x010a5f04: 0x10a5f04: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a58c0: 0x10a58c0: addiu a1, zero, 1
+// 0x010a5f08: 0x10a5f08: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a58c4: 0x10a58c4: jal   0x10a4ce8 addiu a0, zero, 21
+// 0x010a5f0c: 0x10a5f0c: jal   0x10a5330 addiu a0, zero, 21
 	ldc.i4.s 21
 	stloc.1
 	ldloc.0
@@ -7738,12 +7738,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a58cc: 0x10a58cc: jal   0x10a6d54 addiu a0, zero, 5
+// 0x010a5f14: 0x10a5f14: jal   0x10a739c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -7751,18 +7751,18 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a58d4: 0x10a58d4: addu  a2, v0, zero
+// 0x010a5f1c: 0x10a5f1c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a58d8: 0x10a58d8: addiu a0, zero, 22
+// 0x010a5f20: 0x10a5f20: addiu a0, zero, 22
 	ldc.i4.s 22
 	stloc.1
-// 0x010a58dc: 0x10a58dc: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a5f24: 0x10a5f24: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7770,20 +7770,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a58e4: 0x10a58e4: lui   v0, 0x0
+// 0x010a5f2c: 0x10a5f2c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a58e8: 0x10a58e8: addiu v1, v0, 18480
+// 0x010a5f30: 0x10a5f30: addiu v1, v0, 18480
 	ldloc 5
 	ldc.i4 18480
 	add
 	stloc 6
-// 0x010a58ec: 0x10a58ec: lw    a3, 12(v1)
+// 0x010a5f34: 0x10a5f34: lw    a3, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7792,7 +7792,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a58f0: 0x10a58f0: lw    a1, 4(v1)
+// 0x010a5f38: 0x10a5f38: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7801,7 +7801,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a58f4: 0x10a58f4: lw    a2, 8(v1)
+// 0x010a5f3c: 0x10a5f3c: lw    a2, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7810,7 +7810,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a58f8: 0x10a58f8: lw    a0, 18480(v0)
+// 0x010a5f40: 0x10a5f40: lw    a0, 18480(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7819,21 +7819,21 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a58fc: 0x10a58fc: jal   0x10a6e98 sll   zero, zero, 0
+// 0x010a5f44: 0x10a5f44: jal   0x10a74e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5904: 0x10a5904: addiu a0, zero, 7
+// 0x010a5f4c: 0x10a5f4c: addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
-// 0x010a5908: 0x10a5908: jal   0x10a6d54 sw    v0, 56(sp)
+// 0x010a5f50: 0x10a5f50: jal   0x10a739c sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7847,12 +7847,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5910: 0x10a5910: lw    a1, 56(sp)
+// 0x010a5f58: 0x10a5f58: lw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7861,10 +7861,10 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5914: 0x10a5914: addu  a2, v0, zero
+// 0x010a5f5c: 0x10a5f5c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5918: 0x10a5918: jal   0x10a4ce8 addiu a0, zero, 23
+// 0x010a5f60: 0x10a5f60: jal   0x10a5330 addiu a0, zero, 23
 	ldc.i4.s 23
 	stloc.1
 	ldloc.0
@@ -7872,20 +7872,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5920: 0x10a5920: lui   v0, 0x10000
+// 0x010a5f68: 0x10a5f68: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a5924: 0x10a5924: addiu v0, v0, 5772
+// 0x010a5f6c: 0x10a5f6c: addiu v0, v0, 5768
 	ldloc 5
-	ldc.i4 5772
+	ldc.i4 5768
 	add
 	stloc 5
-// 0x010a5928: 0x10a5928: sw    v0, 32(sp)
+// 0x010a5f70: 0x10a5f70: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7894,7 +7894,7 @@ L_10a56f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a592c: 0x10a592c: sw    s3, 36(sp)
+// 0x010a5f74: 0x10a5f74: sw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7903,7 +7903,7 @@ L_10a56f0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a5930: 0x10a5930: jal   0x1054434 sw    s2, 40(sp)
+// 0x010a5f78: 0x10a5f78: jal   0x1054444 sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7917,29 +7917,29 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_popup_config_1054434(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_popup_config_1054444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5938: 0x10a5938: sll   v0, v0, 2
+// 0x010a5f80: 0x10a5f80: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010a593c: 0x10a593c: addu  v0, s1, v0
+// 0x010a5f84: 0x10a5f84: addu  v0, s1, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x010a5940: 0x10a5940: lw    a1, 0(v0)
+// 0x010a5f88: 0x10a5f88: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010a5944: 0x10a5944: jal   0x10a54c0 addiu a0, zero, 24
+// 0x010a5f8c: 0x10a5f8c: jal   0x10a5b08 addiu a0, zero, 24
 	ldc.i4.s 24
 	stloc.1
 	ldloc.0
@@ -7947,20 +7947,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a594c: 0x10a594c: lui   v0, 0x10000
+// 0x010a5f94: 0x10a5f94: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a5950: 0x10a5950: addiu v0, v0, 220
+// 0x010a5f98: 0x10a5f98: addiu v0, v0, 216
 	ldloc 5
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc 5
-// 0x010a5954: 0x10a5954: sw    v0, 44(sp)
+// 0x010a5f9c: 0x10a5f9c: sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7969,7 +7969,7 @@ L_10a56f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a5958: 0x10a5958: sw    s3, 48(sp)
+// 0x010a5fa0: 0x10a5fa0: sw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7978,7 +7978,7 @@ L_10a56f0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a595c: 0x10a595c: jal   0x10543d0 sw    s2, 52(sp)
+// 0x010a5fa4: 0x10a5fa4: jal   0x10543e0 sw    s2, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7992,22 +7992,22 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5964: 0x10a5964: sll   v0, v0, 2
+// 0x010a5fac: 0x10a5fac: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010a5968: 0x10a5968: addu  s1, s1, v0
+// 0x010a5fb0: 0x10a5fb0: addu  s1, s1, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x010a596c: 0x10a596c: lw    a1, 12(s1)
+// 0x010a5fb4: 0x10a5fb4: lw    a1, 12(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8016,7 +8016,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5970: 0x10a5970: jal   0x10a54c0 addiu a0, zero, 25
+// 0x010a5fb8: 0x10a5fb8: jal   0x10a5b08 addiu a0, zero, 25
 	ldc.i4.s 25
 	stloc.1
 	ldloc.0
@@ -8024,15 +8024,15 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5978: 0x10a5978: lui   a0, 0x0
+// 0x010a5fc0: 0x10a5fc0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a597c: 0x10a597c: jal   0x100e348 addiu a0, a0, 14748
+// 0x010a5fc4: 0x10a5fc4: jal   0x100e358 addiu a0, a0, 14748
 	ldloc.1
 	ldc.i4 14748
 	add
@@ -8042,15 +8042,15 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5984: 0x10a5984: addu  a1, v0, zero
+// 0x010a5fcc: 0x10a5fcc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a5988: 0x10a5988: jal   0x10a54c0 addiu a0, zero, 26
+// 0x010a5fd0: 0x10a5fd0: jal   0x10a5b08 addiu a0, zero, 26
 	ldc.i4.s 26
 	stloc.1
 	ldloc.0
@@ -8058,15 +8058,15 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5990: 0x10a5990: lui   a0, 0x0
+// 0x010a5fd8: 0x10a5fd8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5994: 0x10a5994: jal   0x100e348 addiu a0, a0, 14828
+// 0x010a5fdc: 0x10a5fdc: jal   0x100e358 addiu a0, a0, 14828
 	ldloc.1
 	ldc.i4 14828
 	add
@@ -8076,15 +8076,15 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a599c: 0x10a599c: addu  a1, v0, zero
+// 0x010a5fe4: 0x10a5fe4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a59a0: 0x10a59a0: jal   0x10a54c0 addiu a0, zero, 27
+// 0x010a5fe8: 0x10a5fe8: jal   0x10a5b08 addiu a0, zero, 27
 	ldc.i4.s 27
 	stloc.1
 	ldloc.0
@@ -8092,29 +8092,29 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::T_102_10a54c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::T_102_10a5b08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a59a8: 0x10a59a8: jal   0x106150c sll   zero, zero, 0
+// 0x010a5ff0: 0x10a5ff0: jal   0x106151c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_prefer_same_street_106150c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_prefer_same_street_106151c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a59b0: 0x10a59b0: addu  a2, v0, zero
+// 0x010a5ff8: 0x10a5ff8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a59b4: 0x10a59b4: addiu a0, zero, 28
+// 0x010a5ffc: 0x10a5ffc: addiu a0, zero, 28
 	ldc.i4.s 28
 	stloc.1
-// 0x010a59b8: 0x10a59b8: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a6000: 0x10a6000: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -8122,29 +8122,29 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a59c0: 0x10a59c0: jal   0x10614e0 sll   zero, zero, 0
+// 0x010a6008: 0x10a6008: jal   0x10614f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_primaries_10614e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_primaries_10614f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a59c8: 0x10a59c8: addu  a2, v0, zero
+// 0x010a6010: 0x10a6010: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a59cc: 0x10a59cc: addiu a0, zero, 29
+// 0x010a6014: 0x10a6014: addiu a0, zero, 29
 	ldc.i4.s 29
 	stloc.1
-// 0x010a59d0: 0x10a59d0: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a6018: 0x10a6018: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -8152,20 +8152,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a59d8: 0x10a59d8: lui   a0, 0x0
+// 0x010a6020: 0x10a6020: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a59dc: 0x10a59dc: addiu a1, s0, 20820
+// 0x010a6024: 0x10a6024: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a59e0: 0x10a59e0: jal   0x100e7f4 addiu a0, a0, 14892
+// 0x010a6028: 0x10a6028: jal   0x100e804 addiu a0, a0, 14892
 	ldloc.1
 	ldc.i4 14892
 	add
@@ -8175,12 +8175,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a59e8: 0x10a59e8: jal   0x10614b4 sw    v0, 56(sp)
+// 0x010a6030: 0x10a6030: jal   0x10614c4 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8194,12 +8194,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_toll_roads_10614b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_toll_roads_10614c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a59f0: 0x10a59f0: lw    a1, 56(sp)
+// 0x010a6038: 0x10a6038: lw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8208,10 +8208,10 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a59f4: 0x10a59f4: addu  a2, v0, zero
+// 0x010a603c: 0x10a603c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a59f8: 0x10a59f8: jal   0x10a4ce8 addiu a0, zero, 30
+// 0x010a6040: 0x10a6040: jal   0x10a5330 addiu a0, zero, 30
 	ldc.i4.s 30
 	stloc.1
 	ldloc.0
@@ -8219,20 +8219,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a00: 0x10a5a00: lui   a0, 0x0
+// 0x010a6048: 0x10a6048: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5a04: 0x10a5a04: addiu a1, s0, 20820
+// 0x010a604c: 0x10a604c: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a5a08: 0x10a5a08: jal   0x100e7f4 addiu a0, a0, 14876
+// 0x010a6050: 0x10a6050: jal   0x100e804 addiu a0, a0, 14876
 	ldloc.1
 	ldc.i4 14876
 	add
@@ -8242,12 +8242,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a10: 0x10a5a10: jal   0x1061408 sw    v0, 56(sp)
+// 0x010a6058: 0x10a6058: jal   0x1061418 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8261,12 +8261,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_palestinian_roads_1061408(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_palestinian_roads_1061418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a18: 0x10a5a18: lw    a1, 56(sp)
+// 0x010a6060: 0x10a6060: lw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8275,10 +8275,10 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5a1c: 0x10a5a1c: addu  a2, v0, zero
+// 0x010a6064: 0x10a6064: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5a20: 0x10a5a20: jal   0x10a4ce8 addiu a0, zero, 31
+// 0x010a6068: 0x10a6068: jal   0x10a5330 addiu a0, zero, 31
 	ldc.i4.s 31
 	stloc.1
 	ldloc.0
@@ -8286,20 +8286,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a28: 0x10a5a28: lui   a0, 0x0
+// 0x010a6070: 0x10a6070: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5a2c: 0x10a5a2c: addiu a1, s0, 20820
+// 0x010a6074: 0x10a6074: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a5a30: 0x10a5a30: jal   0x100e7f4 addiu a0, a0, 14908
+// 0x010a6078: 0x10a6078: jal   0x100e804 addiu a0, a0, 14908
 	ldloc.1
 	ldc.i4 14908
 	add
@@ -8309,12 +8309,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a38: 0x10a5a38: jal   0x1061488 sw    v0, 56(sp)
+// 0x010a6080: 0x10a6080: jal   0x1061498 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8328,12 +8328,12 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_prefer_unknown_directions_1061488(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_prefer_unknown_directions_1061498(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a40: 0x10a5a40: lw    a1, 56(sp)
+// 0x010a6088: 0x10a6088: lw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8342,10 +8342,10 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5a44: 0x10a5a44: addu  a2, v0, zero
+// 0x010a608c: 0x10a608c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5a48: 0x10a5a48: jal   0x10a4ce8 addiu a0, zero, 32
+// 0x010a6090: 0x10a6090: jal   0x10a5330 addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
 	ldloc.0
@@ -8353,22 +8353,22 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a50: 0x10a5a50: jal   0x103f640 sll   zero, zero, 0
-	call int32 Cibyl47::roadmap_net_mon_get_enabled_103f640()
+// 0x010a6098: 0x10a6098: jal   0x103f650 sll   zero, zero, 0
+	call int32 Cibyl47::roadmap_net_mon_get_enabled_103f650()
 	stloc 5
 // --- basic block ---
-// 0x010a5a58: 0x10a5a58: addu  a2, v0, zero
+// 0x010a60a0: 0x10a60a0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5a5c: 0x10a5a5c: addiu a0, zero, 33
+// 0x010a60a4: 0x10a60a4: addiu a0, zero, 33
 	ldc.i4.s 33
 	stloc.1
-// 0x010a5a60: 0x10a5a60: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a60a8: 0x10a60a8: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -8376,20 +8376,20 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a68: 0x10a5a68: lui   v1, 0x0
+// 0x010a60b0: 0x10a60b0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a5a6c: 0x10a5a6c: addiu v0, v1, 18636
+// 0x010a60b4: 0x10a60b4: addiu v0, v1, 18636
 	ldloc 6
 	ldc.i4 18636
 	add
 	stloc 5
-// 0x010a5a70: 0x10a5a70: lw    a0, 18636(v1)
+// 0x010a60b8: 0x10a60b8: lw    a0, 18636(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -8398,7 +8398,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a5a74: 0x10a5a74: lw    a3, 12(v0)
+// 0x010a60bc: 0x10a60bc: lw    a3, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8407,7 +8407,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a5a78: 0x10a5a78: lw    a1, 4(v0)
+// 0x010a60c0: 0x10a60c0: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8416,7 +8416,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a5a7c: 0x10a5a7c: lw    a2, 8(v0)
+// 0x010a60c4: 0x10a60c4: lw    a2, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8425,24 +8425,24 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a5a80: 0x10a5a80: jal   0x10a88e8 sll   zero, zero, 0
+// 0x010a60c8: 0x10a60c8: jal   0x10a8f30 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_download_settings_isEnabled_10a88e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_download_settings_isEnabled_10a8f30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a88: 0x10a5a88: addu  a2, v0, zero
+// 0x010a60d0: 0x10a60d0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010a5a8c: 0x10a5a8c: addiu a0, zero, 34
+// 0x010a60d4: 0x10a60d4: addiu a0, zero, 34
 	ldc.i4.s 34
 	stloc.1
-// 0x010a5a90: 0x10a5a90: jal   0x10a4ce8 addiu a1, zero, 1
+// 0x010a60d8: 0x10a60d8: jal   0x10a5330 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -8450,47 +8450,47 @@ L_10a56f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::set_checkbox_settings_10a4ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::set_checkbox_settings_10a5330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5a98: 0x10a5a98: jal   0x1008478 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_is_metric_1008478()
+// 0x010a60e0: 0x10a60e0: jal   0x1008488 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_is_metric_1008488()
 	stloc 5
 // --- basic block ---
-// 0x010a5aa0: 0x10a5aa0: lui   a1, 0x10a0000
+// 0x010a60e8: 0x10a60e8: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a5aa4: 0x10a5aa4: lui   v1, 0x80000
+// 0x010a60ec: 0x10a60ec: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a5aa8: 0x10a5aa8: addu  a0, v0, zero
+// 0x010a60f0: 0x10a60f0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a5aac: 0x10a5aac: addiu a1, a1, 19868
+// 0x010a60f4: 0x10a60f4: addiu a1, a1, 21476
 	ldloc.2
-	ldc.i4 19868
+	ldc.i4 21476
 	add
 	stloc.2
-// 0x010a5ab0: 0x10a5ab0: addiu v1, v1, 31076
+// 0x010a60f8: 0x10a60f8: addiu v1, v1, 31540
 	ldloc 6
-	ldc.i4 31076
+	ldc.i4 31540
 	add
 	stloc 6
-// 0x010a5ab4: 0x10a5ab4: cibyl_sysc_arg 0x3
+// 0x010a60fc: 0x10a60fc: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010a5ab8: 0x10a5ab8: cibyl_sysc_arg 0x4
+// 0x010a6100: 0x10a6100: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010a5abc: 0x10a5abc: cibyl_sysc_arg 0x5
+// 0x010a6104: 0x10a6104: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010a5ac0: 0x10a5ac0: cibyl_sysc 0x2250
+// 0x010a6108: 0x10a6108: cibyl_sysc 0x2250
 	call void [WazeWP7]Syscalls::NOPH_SettingsDialog_showDialog(int32,int32,int32)
-// 0x010a5ac4: 0x10a5ac4: addu  v1, v0, zero
+// 0x010a610c: 0x10a610c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010a5ac8: 0x10a5ac8: lw    ra, 84(sp)
-// 0x010a5acc: 0x10a5acc: lw    s3, 80(sp)
+// 0x010a6110: 0x10a6110: lw    ra, 84(sp)
+// 0x010a6114: 0x10a6114: lw    s3, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8499,7 +8499,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a5ad0: 0x10a5ad0: lw    s2, 76(sp)
+// 0x010a6118: 0x10a6118: lw    s2, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8508,7 +8508,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a5ad4: 0x10a5ad4: lw    s1, 72(sp)
+// 0x010a611c: 0x10a611c: lw    s1, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8517,7 +8517,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a5ad8: 0x10a5ad8: lw    s0, 68(sp)
+// 0x010a6120: 0x10a6120: lw    s0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8526,7 +8526,7 @@ L_10a56f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a5adc: 0x10a5adc: jr    ra addiu sp, sp, 88
+// 0x010a6124: 0x10a6124: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
diff --git a/converted/Cibyl124.j b/converted/Cibyl124.j
index 5a20dd1..ab7a09e 100644
--- a/converted/Cibyl124.j
+++ b/converted/Cibyl124.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl124::.ctor
 
-.method public static int32 T_103_10a5ae4(int32,int32,int32,int32,int32)
+.method public static int32 T_103_10a612c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -76,33 +76,33 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a5ae4: 0x10a5ae4: lui   a0, 0x0
+// 0x010a612c: 0x10a612c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a5ae8: 0x10a5ae8: addiu sp, sp, -40
+// 0x010a6130: 0x10a6130: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a5aec: 0x10a5aec: addiu a0, a0, 32124
+// 0x010a6134: 0x10a6134: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x010a5af0: 0x10a5af0: addu  a1, zero, zero
+// 0x010a6138: 0x10a6138: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a5af4: 0x10a5af4: addiu a2, zero, -2
+// 0x010a613c: 0x10a613c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a5af8: 0x10a5af8: addiu a3, zero, 1
+// 0x010a6140: 0x10a6140: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010a5afc: 0x10a5afc: addiu v0, zero, 136
+// 0x010a6144: 0x10a6144: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a5b00: 0x10a5b00: sw    ra, 36(sp)
-// 0x010a5b04: 0x10a5b04: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a6148: 0x10a6148: sw    ra, 36(sp)
+// 0x010a614c: 0x10a614c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -116,21 +116,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a5b0c: 0x10a5b0c: addu  a0, v0, zero
+// 0x010a6154: 0x10a6154: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a5b10: 0x10a5b10: addu  a1, zero, zero
+// 0x010a6158: 0x10a6158: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a5b14: 0x10a5b14: addu  a2, zero, zero
+// 0x010a615c: 0x10a615c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a5b18: 0x10a5b18: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010a6160: 0x10a6160: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -142,10 +142,10 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a5b20: 0x10a5b20: lw    ra, 36(sp)
-// 0x010a5b24: 0x10a5b24: lw    v0, 24(sp)
+// 0x010a6168: 0x10a6168: lw    ra, 36(sp)
+// 0x010a616c: 0x10a616c: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -154,7 +154,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a5b28: 0x10a5b28: jr    ra addiu sp, sp, 40
+// 0x010a6170: 0x10a6170: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -166,7 +166,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_general_settings_show_10a5e74(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_general_settings_show_10a64bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s7,int32 s0,int32 s2,int32 s4,int32 s1,int32 s6,int32 s5,int32 s3,int32 s8,int32 lo,int32 ra)
@@ -231,13 +231,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a5e74:
-// 0x010a5e74: 0x10a5e74: addiu sp, sp, -696
+L_10a64bc:
+// 0x010a64bc: 0x10a64bc: addiu sp, sp, -696
 	ldloc.0
 	ldc.i4 -696
 	add
 	stloc.0
-// 0x010a5e78: 0x10a5e78: sw    s0, 656(sp)
+// 0x010a64c0: 0x10a64c0: sw    s0, 656(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -246,8 +246,8 @@ L_10a5e74:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a5e7c: 0x10a5e7c: sw    ra, 692(sp)
-// 0x010a5e80: 0x10a5e80: sw    s8, 688(sp)
+// 0x010a64c4: 0x10a64c4: sw    ra, 692(sp)
+// 0x010a64c8: 0x10a64c8: sw    s8, 688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -256,7 +256,7 @@ L_10a5e74:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a5e84: 0x10a5e84: sw    s7, 684(sp)
+// 0x010a64cc: 0x10a64cc: sw    s7, 684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -265,7 +265,7 @@ L_10a5e74:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a5e88: 0x10a5e88: sw    s6, 680(sp)
+// 0x010a64d0: 0x10a64d0: sw    s6, 680(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -274,7 +274,7 @@ L_10a5e74:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a5e8c: 0x10a5e8c: sw    s5, 676(sp)
+// 0x010a64d4: 0x10a64d4: sw    s5, 676(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -283,7 +283,7 @@ L_10a5e74:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a5e90: 0x10a5e90: sw    s4, 672(sp)
+// 0x010a64d8: 0x10a64d8: sw    s4, 672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -292,7 +292,7 @@ L_10a5e74:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a5e94: 0x10a5e94: sw    s3, 668(sp)
+// 0x010a64dc: 0x10a64dc: sw    s3, 668(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -301,7 +301,7 @@ L_10a5e74:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a5e98: 0x10a5e98: sw    s2, 664(sp)
+// 0x010a64e0: 0x10a64e0: sw    s2, 664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -310,7 +310,7 @@ L_10a5e74:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a5e9c: 0x10a5e9c: jal   0x101fa28 sw    s1, 660(sp)
+// 0x010a64e4: 0x10a64e4: jal   0x101fa38 sw    s1, 660(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -319,59 +319,59 @@ L_10a5e74:
 	add
 	ldloc 12
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010a5ea4: 0x10a5ea4: beq   v0, zero, 0x10a5eb0 addiu s0, zero, 45
+// 0x010a64ec: 0x10a64ec: beq   v0, zero, 0x10a64f8 addiu s0, zero, 45
 	ldloc 5
 	ldc.i4.s 45
 	stloc 9
-	brfalse L_10a5eb0
+	brfalse L_10a64f8
 // --- basic block ---
-// 0x010a5eac: 0x10a5eac: addiu s0, zero, 65
+// 0x010a64f4: 0x10a64f4: addiu s0, zero, 65
 	ldc.i4.s 65
 	stloc 9
-L_10a5eb0:
-// 0x010a5eb0: 0x10a5eb0: lui   v0, 0x80000
+L_10a64f8:
+// 0x010a64f8: 0x10a64f8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a5eb4: 0x10a5eb4: lw    v1, 31056(v0)
+// 0x010a64fc: 0x10a64fc: lw    v1, 31520(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7764
+	ldc.i4 7880
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a5eb8: 0x10a5eb8: sll   zero, zero, 0
-// 0x010a5ebc: 0x10a5ebc: bne   v1, zero, 0x10a5f08 lui   s2, 0x0
+// 0x010a6500: 0x10a6500: sll   zero, zero, 0
+// 0x010a6504: 0x10a6504: bne   v1, zero, 0x10a6550 lui   s2, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 10
-	brtrue L_10a5f08
+	brtrue L_10a6550
 // --- basic block ---
-// 0x010a5ec4: 0x10a5ec4: addiu v1, zero, 1
+// 0x010a650c: 0x10a650c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010a5ec8: 0x10a5ec8: addiu a0, s2, 32116
+// 0x010a6510: 0x10a6510: addiu a0, s2, 32116
 	ldloc 10
 	ldc.i4 32116
 	add
 	stloc.1
-// 0x010a5ecc: 0x10a5ecc: lui   s1, 0x0
+// 0x010a6514: 0x10a6514: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010a5ed0: 0x10a5ed0: sw    v1, 31056(v0)
+// 0x010a6518: 0x10a6518: sw    v1, 31520(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7764
+	ldc.i4 7880
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a5ed4: 0x10a5ed4: jal   0x101cd60 lui   s3, 0x80000
+// 0x010a651c: 0x10a651c: jal   0x101cd70 lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 15
 	ldloc.0
@@ -379,22 +379,22 @@ L_10a5eb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5edc: 0x10a5edc: addiu a0, s1, 32120
+// 0x010a6524: 0x10a6524: addiu a0, s1, 32120
 	ldloc 12
 	ldc.i4 32120
 	add
 	stloc.1
-// 0x010a5ee0: 0x10a5ee0: jal   0x101cd60 sw    v0, 31060(s3)
+// 0x010a6528: 0x10a6528: jal   0x101cd70 sw    v0, 31524(s3)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7765
+	ldc.i4 7881
 	add
 	ldloc 5
 	stelem.i4
@@ -403,35 +403,35 @@ L_10a5eb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5ee8: 0x10a5ee8: lui   v1, 0x80000
+// 0x010a6530: 0x10a6530: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010a5eec: 0x10a5eec: addiu s3, s3, 31060
+// 0x010a6534: 0x10a6534: addiu s3, s3, 31524
 	ldloc 15
-	ldc.i4 31060
+	ldc.i4 31524
 	add
 	stloc 15
-// 0x010a5ef0: 0x10a5ef0: addiu s2, s2, 32116
+// 0x010a6538: 0x10a6538: addiu s2, s2, 32116
 	ldloc 10
 	ldc.i4 32116
 	add
 	stloc 10
-// 0x010a5ef4: 0x10a5ef4: addiu a0, v1, 31068
+// 0x010a653c: 0x10a653c: addiu a0, v1, 31532
 	ldloc 6
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc.1
-// 0x010a5ef8: 0x10a5ef8: addiu s1, s1, 32120
+// 0x010a6540: 0x10a6540: addiu s1, s1, 32120
 	ldloc 12
 	ldc.i4 32120
 	add
 	stloc 12
-// 0x010a5efc: 0x10a5efc: sw    v0, 4(s3)
+// 0x010a6544: 0x10a6544: sw    v0, 4(s3)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -440,7 +440,7 @@ L_10a5eb0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a5f00: 0x10a5f00: sw    s1, 4(a0)
+// 0x010a6548: 0x10a6548: sw    s1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -449,32 +449,32 @@ L_10a5eb0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a5f04: 0x10a5f04: sw    s2, 31068(v1)
+// 0x010a654c: 0x10a654c: sw    s2, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldloc 10
 	stelem.i4
-L_10a5f08:
-// 0x010a5f08: 0x10a5f08: lui   v0, 0x20000
+L_10a6550:
+// 0x010a6550: 0x10a6550: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a5f0c: 0x10a5f0c: lw    s3, 29708(v0)
+// 0x010a6554: 0x10a6554: lw    s3, 30172(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7427
+	ldc.i4 7543
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a5f10: 0x10a5f10: addu  a1, zero, zero
+// 0x010a6558: 0x10a6558: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a5f14: 0x10a5f14: jal   0x1095eec addu  a0, s3, zero
+// 0x010a655c: 0x10a655c: jal   0x1096534 addu  a0, s3, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -482,22 +482,22 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5f1c: 0x10a5f1c: bne   v0, zero, 0x10a6a74 lui   v0, 0x80000
+// 0x010a6564: 0x10a6564: bne   v0, zero, 0x10a70bc lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10a6a74
+	brtrue L_10a70bc
 // --- basic block ---
-// 0x010a5f24: 0x10a5f24: jal   0x101cc24 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_lang_get_available_langs_values_101cc24()
+// 0x010a656c: 0x10a656c: jal   0x101cc34 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_lang_get_available_langs_values_101cc34()
 	stloc 5
 // --- basic block ---
-// 0x010a5f2c: 0x10a5f2c: jal   0x101cc30 sw    v0, 644(sp)
+// 0x010a6574: 0x10a6574: jal   0x101cc40 sw    v0, 644(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -506,10 +506,10 @@ L_10a5f08:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl21::roadmap_lang_get_available_langs_labels_101cc30()
+	call int32 Cibyl21::roadmap_lang_get_available_langs_labels_101cc40()
 	stloc 5
 // --- basic block ---
-// 0x010a5f34: 0x10a5f34: jal   0x101cc14 sw    v0, 640(sp)
+// 0x010a657c: 0x10a657c: jal   0x101cc24 sw    v0, 640(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -518,16 +518,16 @@ L_10a5f08:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl21::roadmap_lang_get_available_langs_count_101cc14()
+	call int32 Cibyl21::roadmap_lang_get_available_langs_count_101cc24()
 	stloc 5
 // --- basic block ---
-// 0x010a5f3c: 0x10a5f3c: jal   0x1043e50 addu  s7, v0, zero
+// 0x010a6584: 0x10a6584: jal   0x1043e60 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl50::roadmap_prompts_get_values_1043e50()
+	call int32 Cibyl50::roadmap_prompts_get_values_1043e60()
 	stloc 5
 // --- basic block ---
-// 0x010a5f44: 0x10a5f44: jal   0x1043e5c sw    v0, 636(sp)
+// 0x010a658c: 0x10a658c: jal   0x1043e6c sw    v0, 636(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -536,10 +536,10 @@ L_10a5f08:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl50::roadmap_prompts_get_labels_1043e5c()
+	call int32 Cibyl50::roadmap_prompts_get_labels_1043e6c()
 	stloc 5
 // --- basic block ---
-// 0x010a5f4c: 0x10a5f4c: jal   0x1043e40 sw    v0, 632(sp)
+// 0x010a6594: 0x10a6594: jal   0x1043e50 sw    v0, 632(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -548,13 +548,13 @@ L_10a5f08:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl50::roadmap_prompts_get_count_1043e40()
+	call int32 Cibyl50::roadmap_prompts_get_count_1043e50()
 	stloc 5
 // --- basic block ---
-// 0x010a5f54: 0x10a5f54: addu  a0, s3, zero
+// 0x010a659c: 0x10a659c: addu  a0, s3, zero
 	ldloc 15
 	stloc.1
-// 0x010a5f58: 0x10a5f58: jal   0x101cd60 addu  s6, v0, zero
+// 0x010a65a0: 0x10a65a0: jal   0x101cd70 addu  s6, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -562,26 +562,26 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5f60: 0x10a5f60: lui   a2, 0x10a0000
+// 0x010a65a8: 0x10a65a8: lui   a2, 0x10a0000
 	ldc.i4 17432576
 	stloc.3
-// 0x010a5f64: 0x10a5f64: addu  a0, s3, zero
+// 0x010a65ac: 0x10a65ac: addu  a0, s3, zero
 	ldloc 15
 	stloc.1
-// 0x010a5f68: 0x10a5f68: addu  a1, v0, zero
+// 0x010a65b0: 0x10a65b0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a5f6c: 0x10a5f6c: addiu a2, a2, 19348
+// 0x010a65b4: 0x10a65b4: addiu a2, a2, 20956
 	ldloc.3
-	ldc.i4 19348
+	ldc.i4 20956
 	add
 	stloc.3
-// 0x010a5f70: 0x10a5f70: jal   0x1095a08 addiu a3, zero, 8192
+// 0x010a65b8: 0x10a65b8: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -589,40 +589,40 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5f78: 0x10a5f78: addu  s1, v0, zero
+// 0x010a65c0: 0x10a65c0: addu  s1, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010a5f7c: 0x10a5f7c: lui   a0, 0x20000
+// 0x010a65c4: 0x10a65c4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a5f80: 0x10a5f80: lui   v0, 0x41000000
+// 0x010a65c8: 0x10a65c8: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x010a5f84: 0x10a5f84: ori   v0, v0, 20616
+// 0x010a65cc: 0x10a65cc: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010a5f88: 0x10a5f88: addiu a0, a0, 7312
+// 0x010a65d0: 0x10a65d0: addiu a0, a0, 7776
 	ldloc.1
-	ldc.i4 7312
+	ldc.i4 7776
 	add
 	stloc.1
-// 0x010a5f8c: 0x10a5f8c: addu  a1, zero, zero
+// 0x010a65d4: 0x10a65d4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a5f90: 0x10a5f90: addiu a2, zero, -2
+// 0x010a65d8: 0x10a65d8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a5f94: 0x10a5f94: addiu a3, zero, -1
+// 0x010a65dc: 0x10a65dc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a5f98: 0x10a5f98: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a65e0: 0x10a65e0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -636,48 +636,48 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5fa0: 0x10a5fa0: addu  s4, v0, zero
+// 0x010a65e8: 0x10a65e8: addu  s4, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a5fa4: 0x10a5fa4: slti  v0, s7, 2
+// 0x010a65ec: 0x10a65ec: slti  v0, s7, 2
 	ldloc 8
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010a5fa8: 0x10a5fa8: bne   v0, zero, 0x10a60e0 lui   a0, 0x20000
+// 0x010a65f0: 0x10a65f0: bne   v0, zero, 0x10a6728 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_10a60e0
+	brtrue L_10a6728
 // --- basic block ---
-// 0x010a5fb0: 0x10a5fb0: lui   v0, 0x100000
+// 0x010a65f8: 0x10a65f8: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010a5fb4: 0x10a5fb4: addu  a3, s0, zero
+// 0x010a65fc: 0x10a65fc: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010a5fb8: 0x10a5fb8: addiu a0, a0, 7328
+// 0x010a6600: 0x10a6600: addiu a0, a0, 7792
 	ldloc.1
-	ldc.i4 7328
+	ldc.i4 7792
 	add
 	stloc.1
-// 0x010a5fbc: 0x10a5fbc: addu  a1, zero, zero
+// 0x010a6604: 0x10a6604: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a5fc0: 0x10a5fc0: addiu a2, zero, -2
+// 0x010a6608: 0x10a6608: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a5fc4: 0x10a5fc4: ori   v0, v0, 136
+// 0x010a660c: 0x10a660c: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010a5fc8: 0x10a5fc8: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a6610: 0x10a6610: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -691,66 +691,66 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a5fd0: 0x10a5fd0: addu  a0, v0, zero
+// 0x010a6618: 0x10a6618: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a5fd4: 0x10a5fd4: addu  a1, zero, zero
+// 0x010a661c: 0x10a661c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a5fd8: 0x10a5fd8: addu  a2, zero, zero
+// 0x010a6620: 0x10a6620: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a5fdc: 0x10a5fdc: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010a6624: 0x10a6624: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a5fe4: 0x10a5fe4: lui   v0, 0xf0000
+// 0x010a662c: 0x10a662c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a5fe8: 0x10a5fe8: lw    a2, -30068(v0)
+// 0x010a6630: 0x10a6630: lw    a2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a5fec: 0x10a5fec: addiu v0, zero, 3
+// 0x010a6634: 0x10a6634: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010a5ff0: 0x10a5ff0: div   a2, v0
+// 0x010a6638: 0x10a6638: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 17
-// 0x010a5ff4: 0x10a5ff4: lui   a0, 0x10000
+// 0x010a663c: 0x10a663c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a5ff8: 0x10a5ff8: addu  a3, s0, zero
+// 0x010a6640: 0x10a6640: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010a5ffc: 0x10a5ffc: addiu a0, a0, -32632
+// 0x010a6644: 0x10a6644: addiu a0, a0, -32632
 	ldloc.1
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x010a6000: 0x10a6000: addu  a1, zero, zero
+// 0x010a6648: 0x10a6648: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6004: 0x10a6004: addiu v0, zero, 16
+// 0x010a664c: 0x10a664c: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a6008: 0x10a6008: sw    v0, 16(sp)
+// 0x010a6650: 0x10a6650: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -759,10 +759,10 @@ L_10a5f08:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a600c: 0x10a600c: mflo  lo
+// 0x010a6654: 0x10a6654: mflo  lo
 	ldloc 17
 	stloc.3
-// 0x010a6010: 0x10a6010: jal   0x1093a24 lui   s8, 0x10000
+// 0x010a6658: 0x10a6658: jal   0x1094048 lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
 	ldloc.0
@@ -770,29 +770,29 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6018: 0x10a6018: addu  a0, v0, zero
+// 0x010a6660: 0x10a6660: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a601c: 0x10a601c: addu  a1, zero, zero
+// 0x010a6664: 0x10a6664: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6020: 0x10a6020: addu  a2, zero, zero
+// 0x010a6668: 0x10a6668: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a6024: 0x10a6024: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010a666c: 0x10a666c: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a602c: 0x10a602c: jal   0x101cd60 addiu a0, s8, -30084
+// 0x010a6674: 0x10a6674: jal   0x101cd70 addiu a0, s8, -30084
 	ldloc 16
 	ldc.i4 -30084
 	add
@@ -802,26 +802,26 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6034: 0x10a6034: lui   a0, 0x20000
+// 0x010a667c: 0x10a667c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6038: 0x10a6038: addiu a2, zero, -1
+// 0x010a6680: 0x10a6680: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a603c: 0x10a603c: addiu a3, zero, 4240
+// 0x010a6684: 0x10a6684: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a6040: 0x10a6040: addiu a0, a0, 7340
+// 0x010a6688: 0x10a6688: addiu a0, a0, 7804
 	ldloc.1
-	ldc.i4 7340
+	ldc.i4 7804
 	add
 	stloc.1
-// 0x010a6044: 0x10a6044: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a668c: 0x10a668c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -829,38 +829,38 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a604c: 0x10a604c: addu  a1, v0, zero
+// 0x010a6694: 0x10a6694: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6050: 0x10a6050: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a6698: 0x10a6698: jal   0x109950c addu  a0, s5, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6058: 0x10a6058: addu  a1, s5, zero
+// 0x010a66a0: 0x10a66a0: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x010a605c: 0x10a605c: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a66a4: 0x10a66a4: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6064: 0x10a6064: jal   0x101cd60 addiu a0, s8, -30084
+// 0x010a66ac: 0x10a66ac: jal   0x101cd70 addiu a0, s8, -30084
 	ldloc 16
 	ldc.i4 -30084
 	add
@@ -870,15 +870,15 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a606c: 0x10a606c: addu  a1, v0, zero
+// 0x010a66b4: 0x10a66b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6070: 0x10a6070: lw    v0, 644(sp)
+// 0x010a66b8: 0x10a66b8: lw    v0, 644(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -887,7 +887,7 @@ L_10a5f08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a6074: 0x10a6074: lw    a3, 640(sp)
+// 0x010a66bc: 0x10a66bc: lw    a3, 640(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -896,18 +896,18 @@ L_10a5f08:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a6078: 0x10a6078: lui   a0, 0x10000
+// 0x010a66c0: 0x10a66c0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a607c: 0x10a607c: addu  a2, s7, zero
+// 0x010a66c4: 0x10a66c4: addu  a2, s7, zero
 	ldloc 8
 	stloc.3
-// 0x010a6080: 0x10a6080: addiu a0, a0, -2024
+// 0x010a66c8: 0x10a66c8: addiu a0, a0, -2028
 	ldloc.1
-	ldc.i4 -2024
+	ldc.i4 -2028
 	add
 	stloc.1
-// 0x010a6084: 0x10a6084: sw    v0, 16(sp)
+// 0x010a66cc: 0x10a66cc: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -916,10 +916,10 @@ L_10a5f08:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6088: 0x10a6088: addiu v0, zero, 2
+// 0x010a66d0: 0x10a66d0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a608c: 0x10a608c: sw    v0, 20(sp)
+// 0x010a66d4: 0x10a66d4: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -928,7 +928,7 @@ L_10a5f08:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6090: 0x10a6090: jal   0x10929e0 sw    zero, 24(sp)
+// 0x010a66d8: 0x10a66d8: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -942,57 +942,57 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6098: 0x10a6098: addu  a1, v0, zero
+// 0x010a66e0: 0x10a66e0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a609c: 0x10a609c: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a66e4: 0x10a66e4: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a60a4: 0x10a60a4: jal   0x10a5ae4 sll   zero, zero, 0
+// 0x010a66ec: 0x10a66ec: jal   0x10a612c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::T_103_10a5ae4(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::T_103_10a612c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a60ac: 0x10a60ac: addu  a1, v0, zero
+// 0x010a66f4: 0x10a66f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a60b0: 0x10a60b0: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a66f8: 0x10a66f8: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a60b8: 0x10a60b8: lui   a0, 0x0
+// 0x010a6700: 0x10a6700: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a60bc: 0x10a60bc: addiu a0, a0, 32244
+// 0x010a6704: 0x10a6704: addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a60c0: 0x10a60c0: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a6708: 0x10a6708: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -1000,68 +1000,68 @@ L_10a5f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a60c8: 0x10a60c8: addu  a1, v0, zero
+// 0x010a6710: 0x10a6710: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a60cc: 0x10a60cc: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a6714: 0x10a6714: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a60d4: 0x10a60d4: addu  a0, s4, zero
+// 0x010a671c: 0x10a671c: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010a60d8: 0x10a60d8: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010a6720: 0x10a6720: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a60e0:
-// 0x010a60e0: 0x10a60e0: blez  s6, 0x10a61ec lui   v0, 0x100000
+L_10a6728:
+// 0x010a6728: 0x10a6728: blez  s6, 0x10a6834 lui   v0, 0x100000
 	ldloc 13
 	ldc.i4 1048576
 	stloc 5
 	ldc.i4.s 0
-	ble L_10a61ec
+	ble L_10a6834
 // --- basic block ---
-// 0x010a60e8: 0x10a60e8: lui   a0, 0x20000
+// 0x010a6730: 0x10a6730: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a60ec: 0x10a60ec: addu  a3, s0, zero
+// 0x010a6734: 0x10a6734: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010a60f0: 0x10a60f0: addiu a0, a0, 7352
+// 0x010a6738: 0x10a6738: addiu a0, a0, 7816
 	ldloc.1
-	ldc.i4 7352
+	ldc.i4 7816
 	add
 	stloc.1
-// 0x010a60f4: 0x10a60f4: addu  a1, zero, zero
+// 0x010a673c: 0x10a673c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a60f8: 0x10a60f8: addiu a2, zero, -2
+// 0x010a6740: 0x10a6740: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a60fc: 0x10a60fc: ori   v0, v0, 136
+// 0x010a6744: 0x10a6744: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010a6100: 0x10a6100: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a6748: 0x10a6748: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1075,66 +1075,66 @@ L_10a60e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6108: 0x10a6108: addu  a0, v0, zero
+// 0x010a6750: 0x10a6750: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a610c: 0x10a610c: addu  a1, zero, zero
+// 0x010a6754: 0x10a6754: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6110: 0x10a6110: addu  a2, zero, zero
+// 0x010a6758: 0x10a6758: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a6114: 0x10a6114: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010a675c: 0x10a675c: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a611c: 0x10a611c: lui   v0, 0xf0000
+// 0x010a6764: 0x10a6764: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a6120: 0x10a6120: lw    a2, -30068(v0)
+// 0x010a6768: 0x10a6768: lw    a2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a6124: 0x10a6124: addiu v0, zero, 3
+// 0x010a676c: 0x10a676c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010a6128: 0x10a6128: div   a2, v0
+// 0x010a6770: 0x10a6770: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 17
-// 0x010a612c: 0x10a612c: lui   a0, 0x10000
+// 0x010a6774: 0x10a6774: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a6130: 0x10a6130: addu  a3, s0, zero
+// 0x010a6778: 0x10a6778: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010a6134: 0x10a6134: addiu a0, a0, -32632
+// 0x010a677c: 0x10a677c: addiu a0, a0, -32632
 	ldloc.1
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x010a6138: 0x10a6138: addu  a1, zero, zero
+// 0x010a6780: 0x10a6780: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a613c: 0x10a613c: addiu v0, zero, 16
+// 0x010a6784: 0x10a6784: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a6140: 0x10a6140: sw    v0, 16(sp)
+// 0x010a6788: 0x10a6788: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1143,10 +1143,10 @@ L_10a60e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6144: 0x10a6144: mflo  lo
+// 0x010a678c: 0x10a678c: mflo  lo
 	ldloc 17
 	stloc.3
-// 0x010a6148: 0x10a6148: jal   0x1093a24 lui   s5, 0x10000
+// 0x010a6790: 0x10a6790: jal   0x1094048 lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 14
 	ldloc.0
@@ -1154,31 +1154,31 @@ L_10a60e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6150: 0x10a6150: addu  a0, v0, zero
+// 0x010a6798: 0x10a6798: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6154: 0x10a6154: addu  a1, zero, zero
+// 0x010a679c: 0x10a679c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6158: 0x10a6158: addu  a2, zero, zero
+// 0x010a67a0: 0x10a67a0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a615c: 0x10a615c: jal   0x1098fe0 addu  s7, v0, zero
+// 0x010a67a4: 0x10a67a4: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a6164: 0x10a6164: jal   0x101cd60 addiu a0, s5, -2044
+// 0x010a67ac: 0x10a67ac: jal   0x101cd70 addiu a0, s5, -2048
 	ldloc 14
-	ldc.i4 -2044
+	ldc.i4 -2048
 	add
 	stloc.1
 	ldloc.0
@@ -1186,26 +1186,26 @@ L_10a60e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a616c: 0x10a616c: lui   a0, 0x20000
+// 0x010a67b4: 0x10a67b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6170: 0x10a6170: addiu a2, zero, -1
+// 0x010a67b8: 0x10a67b8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a6174: 0x10a6174: addiu a3, zero, 4240
+// 0x010a67bc: 0x10a67bc: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a6178: 0x10a6178: addiu a0, a0, 7368
+// 0x010a67c0: 0x10a67c0: addiu a0, a0, 7832
 	ldloc.1
-	ldc.i4 7368
+	ldc.i4 7832
 	add
 	stloc.1
-// 0x010a617c: 0x10a617c: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a67c4: 0x10a67c4: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1213,40 +1213,40 @@ L_10a60e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6184: 0x10a6184: addu  a1, v0, zero
+// 0x010a67cc: 0x10a67cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6188: 0x10a6188: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a67d0: 0x10a67d0: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6190: 0x10a6190: addu  a1, s7, zero
+// 0x010a67d8: 0x10a67d8: addu  a1, s7, zero
 	ldloc 8
 	stloc.2
-// 0x010a6194: 0x10a6194: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a67dc: 0x10a67dc: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a619c: 0x10a619c: jal   0x101cd60 addiu a0, s5, -2044
+// 0x010a67e4: 0x10a67e4: jal   0x101cd70 addiu a0, s5, -2048
 	ldloc 14
-	ldc.i4 -2044
+	ldc.i4 -2048
 	add
 	stloc.1
 	ldloc.0
@@ -1254,15 +1254,15 @@ L_10a60e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a61a4: 0x10a61a4: addu  a1, v0, zero
+// 0x010a67ec: 0x10a67ec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a61a8: 0x10a61a8: lw    v0, 636(sp)
+// 0x010a67f0: 0x10a67f0: lw    v0, 636(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1271,7 +1271,7 @@ L_10a60e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a61ac: 0x10a61ac: lw    a3, 632(sp)
+// 0x010a67f4: 0x10a67f4: lw    a3, 632(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1280,7 +1280,7 @@ L_10a60e0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a61b0: 0x10a61b0: sw    v0, 16(sp)
+// 0x010a67f8: 0x10a67f8: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1289,10 +1289,10 @@ L_10a60e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a61b4: 0x10a61b4: addiu v0, zero, 2
+// 0x010a67fc: 0x10a67fc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a61b8: 0x10a61b8: sw    v0, 20(sp)
+// 0x010a6800: 0x10a6800: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1301,23 +1301,23 @@ L_10a60e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a61bc: 0x10a61bc: lui   v0, 0x10a0000
+// 0x010a6804: 0x10a6804: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x010a61c0: 0x10a61c0: addu  a2, s6, zero
+// 0x010a6808: 0x10a6808: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x010a61c4: 0x10a61c4: addiu a0, s5, -2044
+// 0x010a680c: 0x10a680c: addiu a0, s5, -2048
 	ldloc 14
-	ldc.i4 -2044
+	ldc.i4 -2048
 	add
 	stloc.1
-// 0x010a61c8: 0x10a61c8: addiu v0, v0, 21144
+// 0x010a6810: 0x10a6810: addiu v0, v0, 22752
 	ldloc 5
-	ldc.i4 21144
+	ldc.i4 22752
 	add
 	stloc 5
-// 0x010a61cc: 0x10a61cc: jal   0x10929e0 sw    v0, 24(sp)
+// 0x010a6814: 0x10a6814: jal   0x1093004 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1331,77 +1331,77 @@ L_10a60e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a61d4: 0x10a61d4: addu  a1, v0, zero
+// 0x010a681c: 0x10a681c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a61d8: 0x10a61d8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a6820: 0x10a6820: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a61e0: 0x10a61e0: addu  a0, s4, zero
+// 0x010a6828: 0x10a6828: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010a61e4: 0x10a61e4: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010a682c: 0x10a682c: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a61ec:
-// 0x010a61ec: 0x10a61ec: addu  a1, s4, zero
+L_10a6834:
+// 0x010a6834: 0x10a6834: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x010a61f0: 0x10a61f0: lui   s8, 0x20000
+// 0x010a6838: 0x10a6838: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 16
-// 0x010a61f4: 0x10a61f4: addu  a0, s1, zero
+// 0x010a683c: 0x10a683c: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x010a61f8: 0x10a61f8: jal   0x1098ec4 lui   s7, 0x41000000
+// 0x010a6840: 0x10a6840: jal   0x109950c lui   s7, 0x41000000
 	ldc.i4 1090519040
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6200: 0x10a6200: ori   s7, s7, 20616
+// 0x010a6848: 0x10a6848: ori   s7, s7, 20616
 	ldloc 8
 	ldc.i4 20616
 	or
 	stloc 8
-// 0x010a6204: 0x10a6204: addiu a0, s8, 7312
+// 0x010a684c: 0x10a684c: addiu a0, s8, 7776
 	ldloc 16
-	ldc.i4 7312
+	ldc.i4 7776
 	add
 	stloc.1
-// 0x010a6208: 0x10a6208: addu  a1, zero, zero
+// 0x010a6850: 0x10a6850: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a620c: 0x10a620c: addiu a2, zero, -2
+// 0x010a6854: 0x10a6854: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a6210: 0x10a6210: addiu a3, zero, -1
+// 0x010a6858: 0x10a6858: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a6214: 0x10a6214: sw    s7, 16(sp)
+// 0x010a685c: 0x10a685c: sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1410,7 +1410,7 @@ L_10a61ec:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a6218: 0x10a6218: jal   0x1093a24 lui   s6, 0x100000
+// 0x010a6860: 0x10a6860: jal   0x1094048 lui   s6, 0x100000
 	ldc.i4 1048576
 	stloc 13
 	ldloc.0
@@ -1418,40 +1418,40 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6220: 0x10a6220: lui   a0, 0x20000
+// 0x010a6868: 0x10a6868: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6224: 0x10a6224: ori   s6, s6, 136
+// 0x010a686c: 0x10a686c: ori   s6, s6, 136
 	ldloc 13
 	ldc.i4 136
 	or
 	stloc 13
-// 0x010a6228: 0x10a6228: addiu a3, zero, -1
+// 0x010a6870: 0x10a6870: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a622c: 0x10a622c: addiu a0, a0, 7384
+// 0x010a6874: 0x10a6874: addiu a0, a0, 7848
 	ldloc.1
-	ldc.i4 7384
+	ldc.i4 7848
 	add
 	stloc.1
-// 0x010a6230: 0x10a6230: addu  a1, zero, zero
+// 0x010a6878: 0x10a6878: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6234: 0x10a6234: addiu a2, zero, -2
+// 0x010a687c: 0x10a687c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a6238: 0x10a6238: lui   s5, 0x0
+// 0x010a6880: 0x10a6880: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x010a623c: 0x10a623c: lui   s4, 0x0
+// 0x010a6884: 0x10a6884: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010a6240: 0x10a6240: sw    v0, 632(sp)
+// 0x010a6888: 0x10a6888: sw    v0, 632(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1460,7 +1460,7 @@ L_10a61ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6244: 0x10a6244: jal   0x1093a24 sw    s6, 16(sp)
+// 0x010a688c: 0x10a688c: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1474,38 +1474,38 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a624c: 0x10a624c: addu  a0, v0, zero
+// 0x010a6894: 0x10a6894: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6250: 0x10a6250: addiu a1, s5, 31980
+// 0x010a6898: 0x10a6898: addiu a1, s5, 31980
 	ldloc 14
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a6254: 0x10a6254: addiu a2, s4, 23008
+// 0x010a689c: 0x10a689c: addiu a2, s4, 23008
 	ldloc 11
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a6258: 0x10a6258: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010a68a0: 0x10a68a0: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a6260: 0x10a6260: lui   a0, 0x20000
+// 0x010a68a8: 0x10a68a8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6264: 0x10a6264: jal   0x101cd60 addiu a0, a0, 7404
+// 0x010a68ac: 0x10a68ac: jal   0x101cd70 addiu a0, a0, 7868
 	ldloc.1
-	ldc.i4 7404
+	ldc.i4 7868
 	add
 	stloc.1
 	ldloc.0
@@ -1513,26 +1513,26 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a626c: 0x10a626c: lui   a0, 0x20000
+// 0x010a68b4: 0x10a68b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6270: 0x10a6270: addiu a2, zero, -1
+// 0x010a68b8: 0x10a68b8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a6274: 0x10a6274: addiu a3, zero, 4240
+// 0x010a68bc: 0x10a68bc: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a6278: 0x10a6278: addiu a0, a0, 7424
+// 0x010a68c0: 0x10a68c0: addiu a0, a0, 7888
 	ldloc.1
-	ldc.i4 7424
+	ldc.i4 7888
 	add
 	stloc.1
-// 0x010a627c: 0x10a627c: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a68c4: 0x10a68c4: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1540,33 +1540,33 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6284: 0x10a6284: addu  a1, v0, zero
+// 0x010a68cc: 0x10a68cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6288: 0x10a6288: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a68d0: 0x10a68d0: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6290: 0x10a6290: lui   v0, 0x20000
+// 0x010a68d8: 0x10a68d8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a6294: 0x10a6294: addiu v0, v0, 7444
+// 0x010a68dc: 0x10a68dc: addiu v0, v0, 7908
 	ldloc 5
-	ldc.i4 7444
+	ldc.i4 7908
 	add
 	stloc 5
-// 0x010a6298: 0x10a6298: sw    v0, 16(sp)
+// 0x010a68e0: 0x10a68e0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1575,32 +1575,32 @@ L_10a61ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a629c: 0x10a629c: lui   a0, 0x20000
+// 0x010a68e4: 0x10a68e4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a62a0: 0x10a62a0: lui   v0, 0x20000
+// 0x010a68e8: 0x10a68e8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a62a4: 0x10a62a4: addiu a2, zero, 2
+// 0x010a68ec: 0x10a68ec: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a62a8: 0x10a62a8: addu  a3, zero, zero
+// 0x010a68f0: 0x10a68f0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a62ac: 0x10a62ac: addiu a0, a0, 6868
+// 0x010a68f4: 0x10a68f4: addiu a0, a0, 7332
 	ldloc.1
-	ldc.i4 6868
+	ldc.i4 7332
 	add
 	stloc.1
-// 0x010a62b0: 0x10a62b0: addiu a1, zero, 1
+// 0x010a68f8: 0x10a68f8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a62b4: 0x10a62b4: addiu v0, v0, 7460
+// 0x010a68fc: 0x10a68fc: addiu v0, v0, 7924
 	ldloc 5
-	ldc.i4 7460
+	ldc.i4 7924
 	add
 	stloc 5
-// 0x010a62b8: 0x10a62b8: sw    v0, 20(sp)
+// 0x010a6900: 0x10a6900: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1609,7 +1609,7 @@ L_10a61ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a62bc: 0x10a62bc: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a6904: 0x10a6904: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1623,25 +1623,25 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a62c4: 0x10a62c4: addu  a1, v0, zero
+// 0x010a690c: 0x10a690c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a62c8: 0x10a62c8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a6910: 0x10a6910: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a62d0: 0x10a62d0: lw    a0, 632(sp)
+// 0x010a6918: 0x10a6918: lw    a0, 632(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1650,17 +1650,17 @@ L_10a61ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a62d4: 0x10a62d4: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010a691c: 0x10a691c: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a62dc: 0x10a62dc: lw    a1, 632(sp)
+// 0x010a6924: 0x10a6924: lw    a1, 632(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1669,31 +1669,31 @@ L_10a61ec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a62e0: 0x10a62e0: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a6928: 0x10a6928: jal   0x109950c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a62e8: 0x10a62e8: addiu a0, s8, 7312
+// 0x010a6930: 0x10a6930: addiu a0, s8, 7776
 	ldloc 16
-	ldc.i4 7312
+	ldc.i4 7776
 	add
 	stloc.1
-// 0x010a62ec: 0x10a62ec: addu  a1, zero, zero
+// 0x010a6934: 0x10a6934: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a62f0: 0x10a62f0: addiu a2, zero, -2
+// 0x010a6938: 0x10a6938: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a62f4: 0x10a62f4: addiu a3, zero, -1
+// 0x010a693c: 0x10a693c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a62f8: 0x10a62f8: jal   0x1093a24 sw    s7, 16(sp)
+// 0x010a6940: 0x10a6940: jal   0x1094048 sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1707,32 +1707,32 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6300: 0x10a6300: lui   a0, 0x20000
+// 0x010a6948: 0x10a6948: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6304: 0x10a6304: addiu a3, zero, -1
+// 0x010a694c: 0x10a694c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a6308: 0x10a6308: addiu a0, a0, 7476
+// 0x010a6950: 0x10a6950: addiu a0, a0, 7940
 	ldloc.1
-	ldc.i4 7476
+	ldc.i4 7940
 	add
 	stloc.1
-// 0x010a630c: 0x10a630c: addu  a1, zero, zero
+// 0x010a6954: 0x10a6954: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6310: 0x10a6310: addiu a2, zero, -2
+// 0x010a6958: 0x10a6958: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a6314: 0x10a6314: addu  s2, v0, zero
+// 0x010a695c: 0x10a695c: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010a6318: 0x10a6318: jal   0x1093a24 sw    s6, 16(sp)
+// 0x010a6960: 0x10a6960: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1746,38 +1746,38 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6320: 0x10a6320: addu  a0, v0, zero
+// 0x010a6968: 0x10a6968: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6324: 0x10a6324: addiu a1, s5, 31980
+// 0x010a696c: 0x10a696c: addiu a1, s5, 31980
 	ldloc 14
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a6328: 0x10a6328: addiu a2, s4, 23008
+// 0x010a6970: 0x10a6970: addiu a2, s4, 23008
 	ldloc 11
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a632c: 0x10a632c: jal   0x1098fe0 addu  s7, v0, zero
+// 0x010a6974: 0x10a6974: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a6334: 0x10a6334: lui   a0, 0x10000
+// 0x010a697c: 0x10a697c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a6338: 0x10a6338: jal   0x101cd60 addiu a0, a0, 11360
+// 0x010a6980: 0x10a6980: jal   0x101cd70 addiu a0, a0, 11356
 	ldloc.1
-	ldc.i4 11360
+	ldc.i4 11356
 	add
 	stloc.1
 	ldloc.0
@@ -1785,26 +1785,26 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6340: 0x10a6340: lui   a0, 0x20000
+// 0x010a6988: 0x10a6988: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6344: 0x10a6344: addiu a2, zero, -1
+// 0x010a698c: 0x10a698c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a6348: 0x10a6348: addiu a3, zero, 4240
+// 0x010a6990: 0x10a6990: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a634c: 0x10a634c: addiu a0, a0, 7492
+// 0x010a6994: 0x10a6994: addiu a0, a0, 7956
 	ldloc.1
-	ldc.i4 7492
+	ldc.i4 7956
 	add
 	stloc.1
-// 0x010a6350: 0x10a6350: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a6998: 0x10a6998: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1812,42 +1812,42 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6358: 0x10a6358: addu  a1, v0, zero
+// 0x010a69a0: 0x10a69a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a635c: 0x10a635c: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a69a4: 0x10a69a4: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6364: 0x10a6364: lui   a0, 0x20000
+// 0x010a69ac: 0x10a69ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6368: 0x10a6368: addiu a2, zero, 2
+// 0x010a69b0: 0x10a69b0: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a636c: 0x10a636c: addu  a3, zero, zero
+// 0x010a69b4: 0x10a69b4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a6370: 0x10a6370: addiu a0, a0, 6836
+// 0x010a69b8: 0x10a69b8: addiu a0, a0, 7300
 	ldloc.1
-	ldc.i4 6836
+	ldc.i4 7300
 	add
 	stloc.1
-// 0x010a6374: 0x10a6374: addiu a1, zero, 1
+// 0x010a69bc: 0x10a69bc: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a6378: 0x10a6378: sw    zero, 16(sp)
+// 0x010a69c0: 0x10a69c0: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1856,7 +1856,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a637c: 0x10a637c: sw    zero, 20(sp)
+// 0x010a69c4: 0x10a69c4: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1865,7 +1865,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a6380: 0x10a6380: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a69c8: 0x10a69c8: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1879,25 +1879,25 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6388: 0x10a6388: addu  a1, v0, zero
+// 0x010a69d0: 0x10a69d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a638c: 0x10a638c: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a69d4: 0x10a69d4: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6394: 0x10a6394: jal   0x10a5ae4 lui   s8, 0x0
+// 0x010a69dc: 0x10a69dc: jal   0x10a612c lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 16
 	ldloc.0
@@ -1905,30 +1905,30 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::T_103_10a5ae4(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::T_103_10a612c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a639c: 0x10a639c: addu  a0, s7, zero
+// 0x010a69e4: 0x10a69e4: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x010a63a0: 0x10a63a0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a69e8: 0x10a69e8: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a63a8: 0x10a63a8: addiu a0, s8, 32244
+// 0x010a69f0: 0x10a69f0: addiu a0, s8, 32244
 	ldloc 16
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a63ac: 0x10a63ac: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a69f4: 0x10a69f4: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -1936,55 +1936,55 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a63b4: 0x10a63b4: addu  a1, v0, zero
+// 0x010a69fc: 0x10a69fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a63b8: 0x10a63b8: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6a00: 0x10a6a00: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a63c0: 0x10a63c0: addu  a1, s7, zero
+// 0x010a6a08: 0x10a6a08: addu  a1, s7, zero
 	ldloc 8
 	stloc.2
-// 0x010a63c4: 0x10a63c4: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a6a0c: 0x10a6a0c: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a63cc: 0x10a63cc: lui   a0, 0x20000
+// 0x010a6a14: 0x10a6a14: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a63d0: 0x10a63d0: addiu a3, zero, -1
+// 0x010a6a18: 0x10a6a18: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a63d4: 0x10a63d4: addiu a0, a0, 7508
+// 0x010a6a1c: 0x10a6a1c: addiu a0, a0, 7972
 	ldloc.1
-	ldc.i4 7508
+	ldc.i4 7972
 	add
 	stloc.1
-// 0x010a63d8: 0x10a63d8: addu  a1, zero, zero
+// 0x010a6a20: 0x10a6a20: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a63dc: 0x10a63dc: addiu a2, zero, -2
+// 0x010a6a24: 0x10a6a24: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a63e0: 0x10a63e0: jal   0x1093a24 sw    s6, 16(sp)
+// 0x010a6a28: 0x10a6a28: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1998,38 +1998,38 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a63e8: 0x10a63e8: addu  a0, v0, zero
+// 0x010a6a30: 0x10a6a30: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a63ec: 0x10a63ec: addiu a1, s5, 31980
+// 0x010a6a34: 0x10a6a34: addiu a1, s5, 31980
 	ldloc 14
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a63f0: 0x10a63f0: addiu a2, s4, 23008
+// 0x010a6a38: 0x10a6a38: addiu a2, s4, 23008
 	ldloc 11
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a63f4: 0x10a63f4: jal   0x1098fe0 addu  s7, v0, zero
+// 0x010a6a3c: 0x10a6a3c: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a63fc: 0x10a63fc: lui   a0, 0x10000
+// 0x010a6a44: 0x10a6a44: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a6400: 0x10a6400: jal   0x101cd60 addiu a0, a0, 11372
+// 0x010a6a48: 0x10a6a48: jal   0x101cd70 addiu a0, a0, 11368
 	ldloc.1
-	ldc.i4 11372
+	ldc.i4 11368
 	add
 	stloc.1
 	ldloc.0
@@ -2037,26 +2037,26 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6408: 0x10a6408: lui   a0, 0x20000
+// 0x010a6a50: 0x10a6a50: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a640c: 0x10a640c: addiu a2, zero, -1
+// 0x010a6a54: 0x10a6a54: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a6410: 0x10a6410: addiu a3, zero, 4240
+// 0x010a6a58: 0x10a6a58: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a6414: 0x10a6414: addiu a0, a0, 7184
+// 0x010a6a5c: 0x10a6a5c: addiu a0, a0, 7648
 	ldloc.1
-	ldc.i4 7184
+	ldc.i4 7648
 	add
 	stloc.1
-// 0x010a6418: 0x10a6418: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a6a60: 0x10a6a60: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2064,42 +2064,42 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6420: 0x10a6420: addu  a1, v0, zero
+// 0x010a6a68: 0x10a6a68: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6424: 0x10a6424: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6a6c: 0x10a6a6c: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a642c: 0x10a642c: lui   a0, 0x20000
+// 0x010a6a74: 0x10a6a74: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6430: 0x10a6430: addiu a2, zero, 2
+// 0x010a6a78: 0x10a6a78: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a6434: 0x10a6434: addu  a3, zero, zero
+// 0x010a6a7c: 0x10a6a7c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a6438: 0x10a6438: addiu a0, a0, 6848
+// 0x010a6a80: 0x10a6a80: addiu a0, a0, 7312
 	ldloc.1
-	ldc.i4 6848
+	ldc.i4 7312
 	add
 	stloc.1
-// 0x010a643c: 0x10a643c: addiu a1, zero, 1
+// 0x010a6a84: 0x10a6a84: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a6440: 0x10a6440: sw    zero, 16(sp)
+// 0x010a6a88: 0x10a6a88: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2108,7 +2108,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a6444: 0x10a6444: sw    zero, 20(sp)
+// 0x010a6a8c: 0x10a6a8c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2117,7 +2117,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a6448: 0x10a6448: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a6a90: 0x10a6a90: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2131,54 +2131,54 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6450: 0x10a6450: addu  a1, v0, zero
+// 0x010a6a98: 0x10a6a98: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6454: 0x10a6454: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6a9c: 0x10a6a9c: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a645c: 0x10a645c: jal   0x10a5ae4 sll   zero, zero, 0
+// 0x010a6aa4: 0x10a6aa4: jal   0x10a612c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::T_103_10a5ae4(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::T_103_10a612c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6464: 0x10a6464: addu  a1, v0, zero
+// 0x010a6aac: 0x10a6aac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6468: 0x10a6468: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6ab0: 0x10a6ab0: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6470: 0x10a6470: addiu a0, s8, 32244
+// 0x010a6ab8: 0x10a6ab8: addiu a0, s8, 32244
 	ldloc 16
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a6474: 0x10a6474: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a6abc: 0x10a6abc: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -2186,55 +2186,55 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a647c: 0x10a647c: addu  a1, v0, zero
+// 0x010a6ac4: 0x10a6ac4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6480: 0x10a6480: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6ac8: 0x10a6ac8: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6488: 0x10a6488: addu  a1, s7, zero
+// 0x010a6ad0: 0x10a6ad0: addu  a1, s7, zero
 	ldloc 8
 	stloc.2
-// 0x010a648c: 0x10a648c: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a6ad4: 0x10a6ad4: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6494: 0x10a6494: lui   a0, 0x20000
+// 0x010a6adc: 0x10a6adc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6498: 0x10a6498: addiu a3, zero, -1
+// 0x010a6ae0: 0x10a6ae0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a649c: 0x10a649c: addiu a0, a0, 7536
+// 0x010a6ae4: 0x10a6ae4: addiu a0, a0, 8000
 	ldloc.1
-	ldc.i4 7536
+	ldc.i4 8000
 	add
 	stloc.1
-// 0x010a64a0: 0x10a64a0: addu  a1, zero, zero
+// 0x010a6ae8: 0x10a6ae8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a64a4: 0x10a64a4: addiu a2, zero, -2
+// 0x010a6aec: 0x10a6aec: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a64a8: 0x10a64a8: jal   0x1093a24 sw    s6, 16(sp)
+// 0x010a6af0: 0x10a6af0: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2248,36 +2248,36 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a64b0: 0x10a64b0: addu  a0, v0, zero
+// 0x010a6af8: 0x10a6af8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a64b4: 0x10a64b4: addiu a1, s5, 31980
+// 0x010a6afc: 0x10a6afc: addiu a1, s5, 31980
 	ldloc 14
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a64b8: 0x10a64b8: addiu a2, s4, 23008
+// 0x010a6b00: 0x10a6b00: addiu a2, s4, 23008
 	ldloc 11
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a64bc: 0x10a64bc: jal   0x1098fe0 addu  s7, v0, zero
+// 0x010a6b04: 0x10a6b04: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a64c4: 0x10a64c4: lui   a0, 0x0
+// 0x010a6b0c: 0x10a6b0c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a64c8: 0x10a64c8: jal   0x101cd60 addiu a0, a0, 30004
+// 0x010a6b10: 0x10a6b10: jal   0x101cd70 addiu a0, a0, 30004
 	ldloc.1
 	ldc.i4 30004
 	add
@@ -2287,26 +2287,26 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a64d0: 0x10a64d0: lui   a0, 0x20000
+// 0x010a6b18: 0x10a6b18: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a64d4: 0x10a64d4: addiu a2, zero, -1
+// 0x010a6b1c: 0x10a6b1c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a64d8: 0x10a64d8: addiu a3, zero, 4240
+// 0x010a6b20: 0x10a6b20: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a64dc: 0x10a64dc: addiu a0, a0, 7556
+// 0x010a6b24: 0x10a6b24: addiu a0, a0, 8020
 	ldloc.1
-	ldc.i4 7556
+	ldc.i4 8020
 	add
 	stloc.1
-// 0x010a64e0: 0x10a64e0: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a6b28: 0x10a6b28: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2314,42 +2314,42 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a64e8: 0x10a64e8: addu  a1, v0, zero
+// 0x010a6b30: 0x10a6b30: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a64ec: 0x10a64ec: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6b34: 0x10a6b34: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a64f4: 0x10a64f4: lui   a0, 0x10000
+// 0x010a6b3c: 0x10a6b3c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a64f8: 0x10a64f8: addiu a2, zero, 2
+// 0x010a6b40: 0x10a6b40: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a64fc: 0x10a64fc: addu  a3, zero, zero
+// 0x010a6b44: 0x10a6b44: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a6500: 0x10a6500: addiu a0, a0, -17576
+// 0x010a6b48: 0x10a6b48: addiu a0, a0, -17576
 	ldloc.1
 	ldc.i4 -17576
 	add
 	stloc.1
-// 0x010a6504: 0x10a6504: addiu a1, zero, 1
+// 0x010a6b4c: 0x10a6b4c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a6508: 0x10a6508: sw    zero, 16(sp)
+// 0x010a6b50: 0x10a6b50: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2358,7 +2358,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a650c: 0x10a650c: sw    zero, 20(sp)
+// 0x010a6b54: 0x10a6b54: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2367,7 +2367,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a6510: 0x10a6510: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a6b58: 0x10a6b58: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2381,54 +2381,54 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6518: 0x10a6518: addu  a1, v0, zero
+// 0x010a6b60: 0x10a6b60: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a651c: 0x10a651c: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6b64: 0x10a6b64: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6524: 0x10a6524: jal   0x10a5ae4 sll   zero, zero, 0
+// 0x010a6b6c: 0x10a6b6c: jal   0x10a612c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::T_103_10a5ae4(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::T_103_10a612c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a652c: 0x10a652c: addu  a1, v0, zero
+// 0x010a6b74: 0x10a6b74: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6530: 0x10a6530: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6b78: 0x10a6b78: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6538: 0x10a6538: addiu a0, s8, 32244
+// 0x010a6b80: 0x10a6b80: addiu a0, s8, 32244
 	ldloc 16
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a653c: 0x10a653c: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a6b84: 0x10a6b84: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -2436,55 +2436,55 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6544: 0x10a6544: addu  a1, v0, zero
+// 0x010a6b8c: 0x10a6b8c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6548: 0x10a6548: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6b90: 0x10a6b90: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6550: 0x10a6550: addu  a1, s7, zero
+// 0x010a6b98: 0x10a6b98: addu  a1, s7, zero
 	ldloc 8
 	stloc.2
-// 0x010a6554: 0x10a6554: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a6b9c: 0x10a6b9c: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a655c: 0x10a655c: lui   a0, 0x20000
+// 0x010a6ba4: 0x10a6ba4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6560: 0x10a6560: addiu a3, zero, -1
+// 0x010a6ba8: 0x10a6ba8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a6564: 0x10a6564: addiu a0, a0, 7576
+// 0x010a6bac: 0x10a6bac: addiu a0, a0, 8040
 	ldloc.1
-	ldc.i4 7576
+	ldc.i4 8040
 	add
 	stloc.1
-// 0x010a6568: 0x10a6568: addu  a1, zero, zero
+// 0x010a6bb0: 0x10a6bb0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a656c: 0x10a656c: addiu a2, zero, -2
+// 0x010a6bb4: 0x10a6bb4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a6570: 0x10a6570: jal   0x1093a24 sw    s6, 16(sp)
+// 0x010a6bb8: 0x10a6bb8: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2498,38 +2498,38 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6578: 0x10a6578: addu  a0, v0, zero
+// 0x010a6bc0: 0x10a6bc0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a657c: 0x10a657c: addiu a1, s5, 31980
+// 0x010a6bc4: 0x10a6bc4: addiu a1, s5, 31980
 	ldloc 14
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a6580: 0x10a6580: addiu a2, s4, 23008
+// 0x010a6bc8: 0x10a6bc8: addiu a2, s4, 23008
 	ldloc 11
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a6584: 0x10a6584: jal   0x1098fe0 addu  s7, v0, zero
+// 0x010a6bcc: 0x10a6bcc: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a658c: 0x10a658c: lui   a0, 0x20000
+// 0x010a6bd4: 0x10a6bd4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6590: 0x10a6590: jal   0x101cd60 addiu a0, a0, 7596
+// 0x010a6bd8: 0x10a6bd8: jal   0x101cd70 addiu a0, a0, 8060
 	ldloc.1
-	ldc.i4 7596
+	ldc.i4 8060
 	add
 	stloc.1
 	ldloc.0
@@ -2537,26 +2537,26 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6598: 0x10a6598: lui   a0, 0x20000
+// 0x010a6be0: 0x10a6be0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a659c: 0x10a659c: addiu a2, zero, -1
+// 0x010a6be4: 0x10a6be4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a65a0: 0x10a65a0: addiu a3, zero, 4240
+// 0x010a6be8: 0x10a6be8: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a65a4: 0x10a65a4: addiu a0, a0, 7612
+// 0x010a6bec: 0x10a6bec: addiu a0, a0, 8076
 	ldloc.1
-	ldc.i4 7612
+	ldc.i4 8076
 	add
 	stloc.1
-// 0x010a65a8: 0x10a65a8: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a6bf0: 0x10a6bf0: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2564,33 +2564,33 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a65b0: 0x10a65b0: addu  a1, v0, zero
+// 0x010a6bf8: 0x10a6bf8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a65b4: 0x10a65b4: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6bfc: 0x10a6bfc: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a65bc: 0x10a65bc: lui   v0, 0x20000
+// 0x010a6c04: 0x10a6c04: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a65c0: 0x10a65c0: addiu v0, v0, -2444
+// 0x010a6c08: 0x10a6c08: addiu v0, v0, -1980
 	ldloc 5
-	ldc.i4 -2444
+	ldc.i4 -1980
 	add
 	stloc 5
-// 0x010a65c4: 0x10a65c4: sw    v0, 16(sp)
+// 0x010a6c0c: 0x10a6c0c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2599,32 +2599,32 @@ L_10a61ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a65c8: 0x10a65c8: lui   a0, 0x20000
+// 0x010a6c10: 0x10a6c10: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a65cc: 0x10a65cc: lui   v0, 0x20000
+// 0x010a6c14: 0x10a6c14: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a65d0: 0x10a65d0: addiu a2, zero, 2
+// 0x010a6c18: 0x10a6c18: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a65d4: 0x10a65d4: addu  a3, zero, zero
+// 0x010a6c1c: 0x10a6c1c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a65d8: 0x10a65d8: addiu a0, a0, 6880
+// 0x010a6c20: 0x10a6c20: addiu a0, a0, 7344
 	ldloc.1
-	ldc.i4 6880
+	ldc.i4 7344
 	add
 	stloc.1
-// 0x010a65dc: 0x10a65dc: addiu a1, zero, 1
+// 0x010a6c24: 0x10a6c24: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a65e0: 0x10a65e0: addiu v0, v0, -2492
+// 0x010a6c28: 0x10a6c28: addiu v0, v0, -2028
 	ldloc 5
-	ldc.i4 -2492
+	ldc.i4 -2028
 	add
 	stloc 5
-// 0x010a65e4: 0x10a65e4: sw    v0, 20(sp)
+// 0x010a6c2c: 0x10a6c2c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2633,7 +2633,7 @@ L_10a61ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a65e8: 0x10a65e8: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a6c30: 0x10a6c30: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2647,54 +2647,54 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a65f0: 0x10a65f0: addu  a1, v0, zero
+// 0x010a6c38: 0x10a6c38: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a65f4: 0x10a65f4: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6c3c: 0x10a6c3c: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a65fc: 0x10a65fc: jal   0x10a5ae4 sll   zero, zero, 0
+// 0x010a6c44: 0x10a6c44: jal   0x10a612c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::T_103_10a5ae4(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::T_103_10a612c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6604: 0x10a6604: addu  a1, v0, zero
+// 0x010a6c4c: 0x10a6c4c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6608: 0x10a6608: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6c50: 0x10a6c50: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6610: 0x10a6610: addiu a0, s8, 32244
+// 0x010a6c58: 0x10a6c58: addiu a0, s8, 32244
 	ldloc 16
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a6614: 0x10a6614: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a6c5c: 0x10a6c5c: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -2702,69 +2702,69 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a661c: 0x10a661c: addu  a1, v0, zero
+// 0x010a6c64: 0x10a6c64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6620: 0x10a6620: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010a6c68: 0x10a6c68: jal   0x109950c addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6628: 0x10a6628: addu  a0, s2, zero
+// 0x010a6c70: 0x10a6c70: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a662c: 0x10a662c: jal   0x1098ec4 addu  a1, s7, zero
+// 0x010a6c74: 0x10a6c74: jal   0x109950c addu  a1, s7, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6634: 0x10a6634: jal   0x1048c0c sll   zero, zero, 0
+// 0x010a6c7c: 0x10a6c7c: jal   0x1048c1c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a663c: 0x10a663c: beq   v0, zero, 0x10a6730 addiu a3, zero, -1
+// 0x010a6c84: 0x10a6c84: beq   v0, zero, 0x10a6d78 addiu a3, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 4
-	brfalse L_10a6730
+	brfalse L_10a6d78
 // --- basic block ---
-// 0x010a6644: 0x10a6644: lui   a0, 0x20000
+// 0x010a6c8c: 0x10a6c8c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6648: 0x10a6648: addiu a0, a0, 7632
+// 0x010a6c90: 0x10a6c90: addiu a0, a0, 8096
 	ldloc.1
-	ldc.i4 7632
+	ldc.i4 8096
 	add
 	stloc.1
-// 0x010a664c: 0x10a664c: addu  a1, zero, zero
+// 0x010a6c94: 0x10a6c94: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6650: 0x10a6650: addiu a2, zero, -2
+// 0x010a6c98: 0x10a6c98: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a6654: 0x10a6654: jal   0x1093a24 sw    s6, 16(sp)
+// 0x010a6c9c: 0x10a6c9c: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2778,78 +2778,78 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a665c: 0x10a665c: addu  a0, v0, zero
+// 0x010a6ca4: 0x10a6ca4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6660: 0x10a6660: addiu a2, s4, 23008
+// 0x010a6ca8: 0x10a6ca8: addiu a2, s4, 23008
 	ldloc 11
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a6664: 0x10a6664: addiu a1, s5, 31980
+// 0x010a6cac: 0x10a6cac: addiu a1, s5, 31980
 	ldloc 14
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a6668: 0x10a6668: jal   0x1098fe0 addu  s6, v0, zero
+// 0x010a6cb0: 0x10a6cb0: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a6670: 0x10a6670: lui   v0, 0xf0000
+// 0x010a6cb8: 0x10a6cb8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a6674: 0x10a6674: lw    a2, -30068(v0)
+// 0x010a6cbc: 0x10a6cbc: lw    a2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a6678: 0x10a6678: addiu v1, zero, 3
+// 0x010a6cc0: 0x10a6cc0: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x010a667c: 0x10a667c: sll   a2, a2, 1
+// 0x010a6cc4: 0x10a6cc4: sll   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x010a6680: 0x10a6680: div   a2, v1
+// 0x010a6cc8: 0x10a6cc8: div   a2, v1
 	ldloc.3
 	ldloc 6
 	div
 	stloc 17
-// 0x010a6684: 0x10a6684: lui   a0, 0x10000
+// 0x010a6ccc: 0x10a6ccc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a6688: 0x10a6688: addu  a3, s0, zero
+// 0x010a6cd0: 0x10a6cd0: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010a668c: 0x10a668c: addiu a0, a0, -32632
+// 0x010a6cd4: 0x10a6cd4: addiu a0, a0, -32632
 	ldloc.1
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x010a6690: 0x10a6690: addu  a1, zero, zero
+// 0x010a6cd8: 0x10a6cd8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6694: 0x10a6694: addiu v0, zero, 16
+// 0x010a6cdc: 0x10a6cdc: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a6698: 0x10a6698: mflo  lo
+// 0x010a6ce0: 0x10a6ce0: mflo  lo
 	ldloc 17
 	stloc.3
-// 0x010a669c: 0x10a669c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a6ce4: 0x10a6ce4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2863,34 +2863,34 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a66a4: 0x10a66a4: addu  a0, v0, zero
+// 0x010a6cec: 0x10a6cec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a66a8: 0x10a66a8: addu  a1, zero, zero
+// 0x010a6cf0: 0x10a6cf0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a66ac: 0x10a66ac: addu  a2, zero, zero
+// 0x010a6cf4: 0x10a6cf4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a66b0: 0x10a66b0: jal   0x1098fe0 addu  s4, v0, zero
+// 0x010a6cf8: 0x10a6cf8: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a66b8: 0x10a66b8: lui   a0, 0x20000
+// 0x010a6d00: 0x10a6d00: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a66bc: 0x10a66bc: jal   0x101cd60 addiu a0, a0, 7656
+// 0x010a6d04: 0x10a6d04: jal   0x101cd70 addiu a0, a0, 8120
 	ldloc.1
-	ldc.i4 7656
+	ldc.i4 8120
 	add
 	stloc.1
 	ldloc.0
@@ -2898,26 +2898,26 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a66c4: 0x10a66c4: lui   a0, 0x20000
+// 0x010a6d0c: 0x10a6d0c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a66c8: 0x10a66c8: addiu a2, zero, -1
+// 0x010a6d10: 0x10a6d10: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a66cc: 0x10a66cc: addiu a3, zero, 4240
+// 0x010a6d14: 0x10a6d14: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a66d0: 0x10a66d0: addiu a0, a0, 7704
+// 0x010a6d18: 0x10a6d18: addiu a0, a0, 8168
 	ldloc.1
-	ldc.i4 7704
+	ldc.i4 8168
 	add
 	stloc.1
-// 0x010a66d4: 0x10a66d4: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a6d1c: 0x10a6d1c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2925,55 +2925,55 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a66dc: 0x10a66dc: addu  a1, v0, zero
+// 0x010a6d24: 0x10a6d24: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a66e0: 0x10a66e0: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a6d28: 0x10a6d28: jal   0x109950c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a66e8: 0x10a66e8: addu  a0, s6, zero
+// 0x010a6d30: 0x10a6d30: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010a66ec: 0x10a66ec: jal   0x1098ec4 addu  a1, s4, zero
+// 0x010a6d34: 0x10a6d34: jal   0x109950c addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a66f4: 0x10a66f4: lui   a0, 0x20000
+// 0x010a6d3c: 0x10a6d3c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a66f8: 0x10a66f8: addiu a0, a0, 6896
+// 0x010a6d40: 0x10a6d40: addiu a0, a0, 7360
 	ldloc.1
-	ldc.i4 6896
+	ldc.i4 7360
 	add
 	stloc.1
-// 0x010a66fc: 0x10a66fc: addiu a2, zero, 18
+// 0x010a6d44: 0x10a6d44: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010a6700: 0x10a6700: addu  a3, zero, zero
+// 0x010a6d48: 0x10a6d48: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a6704: 0x10a6704: addiu a1, zero, 1
+// 0x010a6d4c: 0x10a6d4c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010a6708: 0x10a6708: sw    zero, 16(sp)
+// 0x010a6d50: 0x10a6d50: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2982,7 +2982,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a670c: 0x10a670c: sw    zero, 20(sp)
+// 0x010a6d54: 0x10a6d54: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2991,7 +2991,7 @@ L_10a61ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a6710: 0x10a6710: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a6d58: 0x10a6d58: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3005,77 +3005,77 @@ L_10a61ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6718: 0x10a6718: addu  a1, v0, zero
+// 0x010a6d60: 0x10a6d60: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a671c: 0x10a671c: jal   0x1098ec4 addu  a0, s6, zero
+// 0x010a6d64: 0x10a6d64: jal   0x109950c addu  a0, s6, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6724: 0x10a6724: addu  a0, s2, zero
+// 0x010a6d6c: 0x10a6d6c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a6728: 0x10a6728: jal   0x1098ec4 addu  a1, s6, zero
+// 0x010a6d70: 0x10a6d70: jal   0x109950c addu  a1, s6, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a6730:
-// 0x010a6730: 0x10a6730: addu  a1, s2, zero
+L_10a6d78:
+// 0x010a6d78: 0x10a6d78: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010a6734: 0x10a6734: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a6d7c: 0x10a6d7c: jal   0x109950c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a673c: 0x10a673c: lui   a0, 0x20000
+// 0x010a6d84: 0x10a6d84: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6740: 0x10a6740: lui   v0, 0x41000000
+// 0x010a6d88: 0x10a6d88: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x010a6744: 0x10a6744: addiu a0, a0, 7728
+// 0x010a6d8c: 0x10a6d8c: addiu a0, a0, 8192
 	ldloc.1
-	ldc.i4 7728
+	ldc.i4 8192
 	add
 	stloc.1
-// 0x010a6748: 0x10a6748: addu  a1, zero, zero
+// 0x010a6d90: 0x10a6d90: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a674c: 0x10a674c: addiu a2, zero, -2
+// 0x010a6d94: 0x10a6d94: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a6750: 0x10a6750: addiu a3, zero, -1
+// 0x010a6d98: 0x10a6d98: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a6754: 0x10a6754: ori   v0, v0, 20616
+// 0x010a6d9c: 0x10a6d9c: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010a6758: 0x10a6758: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a6da0: 0x10a6da0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3089,40 +3089,40 @@ L_10a6730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6760: 0x10a6760: addu  s5, v0, zero
+// 0x010a6da8: 0x10a6da8: addu  s5, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010a6764: 0x10a6764: lui   a0, 0x20000
+// 0x010a6dac: 0x10a6dac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6768: 0x10a6768: lui   v0, 0x100000
+// 0x010a6db0: 0x10a6db0: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010a676c: 0x10a676c: addu  a3, s0, zero
+// 0x010a6db4: 0x10a6db4: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010a6770: 0x10a6770: addiu a0, a0, 7328
+// 0x010a6db8: 0x10a6db8: addiu a0, a0, 7792
 	ldloc.1
-	ldc.i4 7328
+	ldc.i4 7792
 	add
 	stloc.1
-// 0x010a6774: 0x10a6774: addu  a1, zero, zero
+// 0x010a6dbc: 0x10a6dbc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6778: 0x10a6778: addiu a2, zero, -2
+// 0x010a6dc0: 0x10a6dc0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a677c: 0x10a677c: ori   v0, v0, 136
+// 0x010a6dc4: 0x10a6dc4: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010a6780: 0x10a6780: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a6dc8: 0x10a6dc8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3136,66 +3136,66 @@ L_10a6730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6788: 0x10a6788: addu  a0, v0, zero
+// 0x010a6dd0: 0x10a6dd0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a678c: 0x10a678c: addu  a1, zero, zero
+// 0x010a6dd4: 0x10a6dd4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6790: 0x10a6790: addu  a2, zero, zero
+// 0x010a6dd8: 0x10a6dd8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a6794: 0x10a6794: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010a6ddc: 0x10a6ddc: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a679c: 0x10a679c: lui   v0, 0xf0000
+// 0x010a6de4: 0x10a6de4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a67a0: 0x10a67a0: lw    a2, -30068(v0)
+// 0x010a6de8: 0x10a6de8: lw    a2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a67a4: 0x10a67a4: addiu v0, zero, 2
+// 0x010a6dec: 0x10a6dec: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a67a8: 0x10a67a8: div   a2, v0
+// 0x010a6df0: 0x10a6df0: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 17
-// 0x010a67ac: 0x10a67ac: lui   a0, 0x10000
+// 0x010a6df4: 0x10a6df4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a67b0: 0x10a67b0: addu  a3, s0, zero
+// 0x010a6df8: 0x10a6df8: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010a67b4: 0x10a67b4: addiu a0, a0, -32632
+// 0x010a6dfc: 0x10a6dfc: addiu a0, a0, -32632
 	ldloc.1
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x010a67b8: 0x10a67b8: addu  a1, zero, zero
+// 0x010a6e00: 0x10a6e00: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a67bc: 0x10a67bc: addiu v0, zero, 16
+// 0x010a6e04: 0x10a6e04: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a67c0: 0x10a67c0: sw    v0, 16(sp)
+// 0x010a6e08: 0x10a6e08: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3204,15 +3204,15 @@ L_10a6730:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a67c4: 0x10a67c4: addiu s0, sp, 32
+// 0x010a6e0c: 0x10a6e0c: addiu s0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-// 0x010a67c8: 0x10a67c8: mflo  lo
+// 0x010a6e10: 0x10a6e10: mflo  lo
 	ldloc 17
 	stloc.3
-// 0x010a67cc: 0x10a67cc: jal   0x1093a24 addiu s6, sp, 532
+// 0x010a6e14: 0x10a6e14: jal   0x1094048 addiu s6, sp, 532
 	ldloc.0
 	ldc.i4 532
 	add
@@ -3222,34 +3222,34 @@ L_10a6730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a67d4: 0x10a67d4: addu  a0, v0, zero
+// 0x010a6e1c: 0x10a6e1c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a67d8: 0x10a67d8: addu  a1, zero, zero
+// 0x010a6e20: 0x10a6e20: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a67dc: 0x10a67dc: addu  a2, zero, zero
+// 0x010a6e24: 0x10a6e24: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a67e0: 0x10a67e0: jal   0x1098fe0 addu  s4, v0, zero
+// 0x010a6e28: 0x10a6e28: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a67e8: 0x10a67e8: lui   a0, 0x20000
+// 0x010a6e30: 0x10a6e30: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a67ec: 0x10a67ec: jal   0x101cd60 addiu a0, a0, 7752
+// 0x010a6e34: 0x10a6e34: jal   0x101cd70 addiu a0, a0, 8216
 	ldloc.1
-	ldc.i4 7752
+	ldc.i4 8216
 	add
 	stloc.1
 	ldloc.0
@@ -3257,26 +3257,26 @@ L_10a6730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a67f4: 0x10a67f4: lui   a0, 0x20000
+// 0x010a6e3c: 0x10a6e3c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a67f8: 0x10a67f8: addiu a3, zero, 4240
+// 0x010a6e40: 0x10a6e40: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a67fc: 0x10a67fc: addiu a2, zero, -1
+// 0x010a6e44: 0x10a6e44: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a6800: 0x10a6800: addiu a0, a0, 7768
+// 0x010a6e48: 0x10a6e48: addiu a0, a0, 8232
 	ldloc.1
-	ldc.i4 7768
+	ldc.i4 8232
 	add
 	stloc.1
-// 0x010a6804: 0x10a6804: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a6e4c: 0x10a6e4c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3284,49 +3284,49 @@ L_10a6730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a680c: 0x10a680c: addu  a1, v0, zero
+// 0x010a6e54: 0x10a6e54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6810: 0x10a6810: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a6e58: 0x10a6e58: jal   0x109950c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6818: 0x10a6818: addu  a1, s4, zero
+// 0x010a6e60: 0x10a6e60: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x010a681c: 0x10a681c: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a6e64: 0x10a6e64: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6824: 0x10a6824: lui   a2, 0x20000
+// 0x010a6e6c: 0x10a6e6c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a6828: 0x10a6828: addiu a2, a2, 7788
+// 0x010a6e70: 0x10a6e70: addiu a2, a2, 8252
 	ldloc.3
-	ldc.i4 7788
+	ldc.i4 8252
 	add
 	stloc.3
-// 0x010a682c: 0x10a682c: addu  a0, s0, zero
+// 0x010a6e74: 0x10a6e74: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a6830: 0x10a6830: jal   0x1000f9c addiu a1, zero, 100
+// 0x010a6e78: 0x10a6e78: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -3339,20 +3339,20 @@ L_10a6730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6838: 0x10a6838: lui   a2, 0x20000
+// 0x010a6e80: 0x10a6e80: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a683c: 0x10a683c: addiu a2, a2, 7792
+// 0x010a6e84: 0x10a6e84: addiu a2, a2, 8256
 	ldloc.3
-	ldc.i4 7792
+	ldc.i4 8256
 	add
 	stloc.3
-// 0x010a6840: 0x10a6840: addiu a0, sp, 132
+// 0x010a6e88: 0x10a6e88: addiu a0, sp, 132
 	ldloc.0
 	ldc.i4 132
 	add
 	stloc.1
-// 0x010a6844: 0x10a6844: jal   0x1000f9c addiu a1, zero, 100
+// 0x010a6e8c: 0x10a6e8c: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -3365,20 +3365,20 @@ L_10a6730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a684c: 0x10a684c: lui   a2, 0x20000
+// 0x010a6e94: 0x10a6e94: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a6850: 0x10a6850: addiu a2, a2, 7796
+// 0x010a6e98: 0x10a6e98: addiu a2, a2, 8260
 	ldloc.3
-	ldc.i4 7796
+	ldc.i4 8260
 	add
 	stloc.3
-// 0x010a6854: 0x10a6854: addiu a0, sp, 232
+// 0x010a6e9c: 0x10a6e9c: addiu a0, sp, 232
 	ldloc.0
 	ldc.i4 232
 	add
 	stloc.1
-// 0x010a6858: 0x10a6858: jal   0x1000f9c addiu a1, zero, 100
+// 0x010a6ea0: 0x10a6ea0: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -3391,20 +3391,20 @@ L_10a6730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6860: 0x10a6860: lui   a2, 0x20000
+// 0x010a6ea8: 0x10a6ea8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a6864: 0x10a6864: addiu a2, a2, 7800
+// 0x010a6eac: 0x10a6eac: addiu a2, a2, 8264
 	ldloc.3
-	ldc.i4 7800
+	ldc.i4 8264
 	add
 	stloc.3
-// 0x010a6868: 0x10a6868: addiu a0, sp, 332
+// 0x010a6eb0: 0x10a6eb0: addiu a0, sp, 332
 	ldloc.0
 	ldc.i4 332
 	add
 	stloc.1
-// 0x010a686c: 0x10a686c: jal   0x1000f9c addiu a1, zero, 100
+// 0x010a6eb4: 0x10a6eb4: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -3417,20 +3417,20 @@ L_10a6730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6874: 0x10a6874: lui   a2, 0x20000
+// 0x010a6ebc: 0x10a6ebc: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010a6878: 0x10a6878: addiu a0, sp, 432
+// 0x010a6ec0: 0x10a6ec0: addiu a0, sp, 432
 	ldloc.0
 	ldc.i4 432
 	add
 	stloc.1
-// 0x010a687c: 0x10a687c: addiu a1, zero, 100
+// 0x010a6ec4: 0x10a6ec4: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010a6880: 0x10a6880: jal   0x1000f9c addiu a2, a2, 7808
+// 0x010a6ec8: 0x10a6ec8: jal   0x1000f9c addiu a2, a2, 8272
 	ldloc.3
-	ldc.i4 7808
+	ldc.i4 8272
 	add
 	stloc.3
 	ldloc.0
@@ -3443,62 +3443,62 @@ L_10a6730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6888: 0x10a6888: jal   0x1008478 lui   s4, 0x80000
+// 0x010a6ed0: 0x10a6ed0: jal   0x1008488 lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 11
-	call int32 Cibyl5::roadmap_math_is_metric_1008478()
+	call int32 Cibyl5::roadmap_math_is_metric_1008488()
 	stloc 5
 // --- basic block ---
-// 0x010a6890: 0x10a6890: lui   a0, 0x80000
+// 0x010a6ed8: 0x10a6ed8: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010a6894: 0x10a6894: lui   a1, 0x10000
+// 0x010a6edc: 0x10a6edc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a6898: 0x10a6898: addiu a1, a1, 9424
+// 0x010a6ee0: 0x10a6ee0: addiu a1, a1, 9420
 	ldloc.2
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.2
-// 0x010a689c: 0x10a689c: addiu s4, s4, 31032
+// 0x010a6ee4: 0x10a6ee4: addiu s4, s4, 31496
 	ldloc 11
-	ldc.i4 31032
+	ldc.i4 31496
 	add
 	stloc 11
-// 0x010a68a0: 0x10a68a0: beq   v0, zero, 0x10a6924 addiu v1, a0, 31008
+// 0x010a6ee8: 0x10a6ee8: beq   v0, zero, 0x10a6f6c addiu v1, a0, 31472
 	ldloc 5
 	ldloc.1
-	ldc.i4 31008
+	ldc.i4 31472
 	add
 	stloc 6
-	brfalse L_10a6924
+	brfalse L_10a6f6c
 // --- basic block ---
-// 0x010a68a8: 0x10a68a8: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x010a6ef0: 0x10a6ef0: lui   v0, 0x10000
+	ldc.i4 65536
 	stloc 5
-// 0x010a68ac: 0x10a68ac: addiu v0, v0, -6904
+// 0x010a6ef4: 0x10a6ef4: addiu v0, v0, 19584
 	ldloc 5
-	ldc.i4 -6904
+	ldc.i4 19584
 	add
 	stloc 5
-// 0x010a68b0: 0x10a68b0: sw    v0, 31008(a0)
+// 0x010a6ef8: 0x10a6ef8: sw    v0, 31472(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7752
+	ldc.i4 7868
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a68b4: 0x10a68b4: lui   v0, 0x20000
+// 0x010a6efc: 0x10a6efc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a68b8: 0x10a68b8: addiu v0, v0, 6816
+// 0x010a6f00: 0x10a6f00: addiu v0, v0, 7280
 	ldloc 5
-	ldc.i4 6816
+	ldc.i4 7280
 	add
 	stloc 5
-// 0x010a68bc: 0x10a68bc: sw    v0, 4(v1)
+// 0x010a6f04: 0x10a6f04: sw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3507,15 +3507,15 @@ L_10a6730:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a68c0: 0x10a68c0: lui   v0, 0x10000
+// 0x010a6f08: 0x10a6f08: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a68c4: 0x10a68c4: addiu v0, v0, -25516
+// 0x010a6f0c: 0x10a6f0c: addiu v0, v0, -25516
 	ldloc 5
 	ldc.i4 -25516
 	add
 	stloc 5
-// 0x010a68c8: 0x10a68c8: sw    v0, 8(v1)
+// 0x010a6f10: 0x10a6f10: sw    v0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3524,15 +3524,15 @@ L_10a6730:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a68cc: 0x10a68cc: lui   v0, 0x10000
+// 0x010a6f14: 0x10a6f14: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a68d0: 0x10a68d0: addiu v0, v0, 1944
+// 0x010a6f18: 0x10a6f18: addiu v0, v0, 1940
 	ldloc 5
-	ldc.i4 1944
+	ldc.i4 1940
 	add
 	stloc 5
-// 0x010a68d4: 0x10a68d4: sw    v0, 12(v1)
+// 0x010a6f1c: 0x10a6f1c: sw    v0, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3541,18 +3541,18 @@ L_10a6730:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a68d8: 0x10a68d8: lui   v0, 0x0
+// 0x010a6f20: 0x10a6f20: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a68dc: 0x10a68dc: addiu v0, v0, 28440
+// 0x010a6f24: 0x10a6f24: addiu v0, v0, 28440
 	ldloc 5
 	ldc.i4 28440
 	add
 	stloc 5
-// 0x010a68e0: 0x10a68e0: lui   s7, 0x20000
+// 0x010a6f28: 0x10a6f28: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010a68e4: 0x10a68e4: sw    a1, 20(v1)
+// 0x010a6f2c: 0x10a6f2c: sw    a1, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3561,7 +3561,7 @@ L_10a6730:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a68e8: 0x10a68e8: sw    v0, 16(v1)
+// 0x010a6f30: 0x10a6f30: sw    v0, 16(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3570,13 +3570,13 @@ L_10a6730:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a68ec: 0x10a68ec: addiu s7, s7, 7816
+// 0x010a6f34: 0x10a6f34: addiu s7, s7, 8280
 	ldloc 8
-	ldc.i4 7816
+	ldc.i4 8280
 	add
 	stloc 8
-L_10a68f0:
-// 0x010a68f0: 0x10a68f0: jal   0x101cd60 addu  a0, s7, zero
+L_10a6f38:
+// 0x010a6f38: 0x10a6f38: jal   0x101cd70 addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3584,15 +3584,15 @@ L_10a68f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a68f8: 0x10a68f8: addu  a1, v0, zero
+// 0x010a6f40: 0x10a6f40: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a68fc: 0x10a68fc: jal   0x1001ac4 addu  a0, s0, zero
+// 0x010a6f44: 0x10a6f44: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -3600,7 +3600,7 @@ L_10a68f0:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a6904: 0x10a6904: jal   0x1001ba8 addu  a0, s0, zero
+// 0x010a6f4c: 0x10a6f4c: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3613,59 +3613,59 @@ L_10a68f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a690c: 0x10a690c: addiu s0, s0, 100
+// 0x010a6f54: 0x10a6f54: addiu s0, s0, 100
 	ldloc 9
 	ldc.i4.s 100
 	add
 	stloc 9
-// 0x010a6910: 0x10a6910: sw    v0, 0(s4)
+// 0x010a6f58: 0x10a6f58: sw    v0, 0(s4)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010a6914: 0x10a6914: bne   s0, s6, 0x10a68f0 addiu s4, s4, 4
+// 0x010a6f5c: 0x10a6f5c: bne   s0, s6, 0x10a6f38 addiu s4, s4, 4
 	ldloc 9
 	ldloc 13
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-	bne.un L_10a68f0
+	bne.un L_10a6f38
 // --- basic block ---
-// 0x010a691c: 0x10a691c: j	 0x10a699c lui   a0, 0x10000
+// 0x010a6f64: 0x10a6f64: j	 0x10a6fe4 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_10a699c
+	br L_10a6fe4
 // --- basic block ---
-L_10a6924:
-// 0x010a6924: 0x10a6924: lui   v0, 0x0
-	ldc.i4.s 0
+L_10a6f6c:
+// 0x010a6f6c: 0x10a6f6c: lui   v0, 0x10000
+	ldc.i4 65536
 	stloc 5
-// 0x010a6928: 0x10a6928: addiu v0, v0, 20620
+// 0x010a6f70: 0x10a6f70: addiu v0, v0, 18760
 	ldloc 5
-	ldc.i4 20620
+	ldc.i4 18760
 	add
 	stloc 5
-// 0x010a692c: 0x10a692c: sw    v0, 31008(a0)
+// 0x010a6f74: 0x10a6f74: sw    v0, 31472(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7752
+	ldc.i4 7868
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6930: 0x10a6930: lui   v0, 0x20000
+// 0x010a6f78: 0x10a6f78: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a6934: 0x10a6934: addiu v0, v0, 7820
+// 0x010a6f7c: 0x10a6f7c: addiu v0, v0, 8284
 	ldloc 5
-	ldc.i4 7820
+	ldc.i4 8284
 	add
 	stloc 5
-// 0x010a6938: 0x10a6938: sw    v0, 4(v1)
+// 0x010a6f80: 0x10a6f80: sw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3674,15 +3674,15 @@ L_10a6924:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a693c: 0x10a693c: lui   v0, 0x10000
+// 0x010a6f84: 0x10a6f84: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a6940: 0x10a6940: addiu v0, v0, 4488
+// 0x010a6f88: 0x10a6f88: addiu v0, v0, 4484
 	ldloc 5
-	ldc.i4 4488
+	ldc.i4 4484
 	add
 	stloc 5
-// 0x010a6944: 0x10a6944: sw    v0, 8(v1)
+// 0x010a6f8c: 0x10a6f8c: sw    v0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3691,15 +3691,15 @@ L_10a6924:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6948: 0x10a6948: lui   v0, 0x20000
+// 0x010a6f90: 0x10a6f90: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a694c: 0x10a694c: addiu v0, v0, 7824
+// 0x010a6f94: 0x10a6f94: addiu v0, v0, 8288
 	ldloc 5
-	ldc.i4 7824
+	ldc.i4 8288
 	add
 	stloc 5
-// 0x010a6950: 0x10a6950: sw    v0, 12(v1)
+// 0x010a6f98: 0x10a6f98: sw    v0, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3708,18 +3708,18 @@ L_10a6924:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6954: 0x10a6954: lui   v0, 0x0
+// 0x010a6f9c: 0x10a6f9c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a6958: 0x10a6958: addiu v0, v0, 21228
+// 0x010a6fa0: 0x10a6fa0: addiu v0, v0, 21228
 	ldloc 5
 	ldc.i4 21228
 	add
 	stloc 5
-// 0x010a695c: 0x10a695c: lui   s7, 0x20000
+// 0x010a6fa4: 0x10a6fa4: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010a6960: 0x10a6960: sw    a1, 20(v1)
+// 0x010a6fa8: 0x10a6fa8: sw    a1, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3728,7 +3728,7 @@ L_10a6924:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a6964: 0x10a6964: sw    v0, 16(v1)
+// 0x010a6fac: 0x10a6fac: sw    v0, 16(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3737,13 +3737,13 @@ L_10a6924:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6968: 0x10a6968: addiu s7, s7, 7828
+// 0x010a6fb0: 0x10a6fb0: addiu s7, s7, 8292
 	ldloc 8
-	ldc.i4 7828
+	ldc.i4 8292
 	add
 	stloc 8
-L_10a696c:
-// 0x010a696c: 0x10a696c: jal   0x101cd60 addu  a0, s7, zero
+L_10a6fb4:
+// 0x010a6fb4: 0x10a6fb4: jal   0x101cd70 addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3751,15 +3751,15 @@ L_10a696c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6974: 0x10a6974: addu  a1, v0, zero
+// 0x010a6fbc: 0x10a6fbc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6978: 0x10a6978: jal   0x1001ac4 addu  a0, s0, zero
+// 0x010a6fc0: 0x10a6fc0: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -3767,7 +3767,7 @@ L_10a696c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a6980: 0x10a6980: jal   0x1001ba8 addu  a0, s0, zero
+// 0x010a6fc8: 0x10a6fc8: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3780,34 +3780,34 @@ L_10a696c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6988: 0x10a6988: addiu s0, s0, 100
+// 0x010a6fd0: 0x10a6fd0: addiu s0, s0, 100
 	ldloc 9
 	ldc.i4.s 100
 	add
 	stloc 9
-// 0x010a698c: 0x10a698c: sw    v0, 0(s4)
+// 0x010a6fd4: 0x10a6fd4: sw    v0, 0(s4)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010a6990: 0x10a6990: bne   s0, s6, 0x10a696c addiu s4, s4, 4
+// 0x010a6fd8: 0x10a6fd8: bne   s0, s6, 0x10a6fb4 addiu s4, s4, 4
 	ldloc 9
 	ldloc 13
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-	bne.un L_10a696c
+	bne.un L_10a6fb4
 // --- basic block ---
-// 0x010a6998: 0x10a6998: lui   a0, 0x10000
+// 0x010a6fe0: 0x10a6fe0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10a699c:
-// 0x010a699c: 0x10a699c: jal   0x101cd60 addiu a0, a0, 220
+L_10a6fe4:
+// 0x010a6fe4: 0x10a6fe4: jal   0x101cd70 addiu a0, a0, 216
 	ldloc.1
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc.1
 	ldloc.0
@@ -3815,28 +3815,28 @@ L_10a699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a69a4: 0x10a69a4: lui   a3, 0x80000
+// 0x010a6fec: 0x10a6fec: lui   a3, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x010a69a8: 0x10a69a8: addiu a3, a3, 31032
+// 0x010a6ff0: 0x10a6ff0: addiu a3, a3, 31496
 	ldloc 4
-	ldc.i4 31032
+	ldc.i4 31496
 	add
 	stloc 4
-// 0x010a69ac: 0x10a69ac: lui   a0, 0x20000
+// 0x010a6ff4: 0x10a6ff4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a69b0: 0x10a69b0: addiu a0, a0, 7752
+// 0x010a6ff8: 0x10a6ff8: addiu a0, a0, 8216
 	ldloc.1
-	ldc.i4 7752
+	ldc.i4 8216
 	add
 	stloc.1
-// 0x010a69b4: 0x10a69b4: sw    v0, 20(a3)
+// 0x010a6ffc: 0x10a6ffc: sw    v0, 20(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
@@ -3845,7 +3845,7 @@ L_10a699c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a69b8: 0x10a69b8: jal   0x101cd60 sw    a3, 648(sp)
+// 0x010a7000: 0x10a7000: jal   0x101cd70 sw    a3, 648(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3859,18 +3859,18 @@ L_10a699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a69c0: 0x10a69c0: addu  a1, v0, zero
+// 0x010a7008: 0x10a7008: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a69c4: 0x10a69c4: lui   v0, 0x80000
+// 0x010a700c: 0x10a700c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a69c8: 0x10a69c8: lw    a3, 648(sp)
+// 0x010a7010: 0x10a7010: lw    a3, 648(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3879,23 +3879,23 @@ L_10a699c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a69cc: 0x10a69cc: addiu v0, v0, 31008
+// 0x010a7014: 0x10a7014: addiu v0, v0, 31472
 	ldloc 5
-	ldc.i4 31008
+	ldc.i4 31472
 	add
 	stloc 5
-// 0x010a69d0: 0x10a69d0: lui   a0, 0x20000
+// 0x010a7018: 0x10a7018: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a69d4: 0x10a69d4: addiu a2, zero, 6
+// 0x010a701c: 0x10a701c: addiu a2, zero, 6
 	ldc.i4.6
 	stloc.3
-// 0x010a69d8: 0x10a69d8: addiu a0, a0, 6924
+// 0x010a7020: 0x10a7020: addiu a0, a0, 7388
 	ldloc.1
-	ldc.i4 6924
+	ldc.i4 7388
 	add
 	stloc.1
-// 0x010a69dc: 0x10a69dc: sw    v0, 16(sp)
+// 0x010a7024: 0x10a7024: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3904,10 +3904,10 @@ L_10a699c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a69e0: 0x10a69e0: addiu v0, zero, 2
+// 0x010a7028: 0x10a7028: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a69e4: 0x10a69e4: sw    v0, 20(sp)
+// 0x010a702c: 0x10a702c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3916,7 +3916,7 @@ L_10a699c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a69e8: 0x10a69e8: jal   0x10929e0 sw    zero, 24(sp)
+// 0x010a7030: 0x10a7030: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3930,75 +3930,75 @@ L_10a699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a69f0: 0x10a69f0: addu  a1, v0, zero
+// 0x010a7038: 0x10a7038: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a69f4: 0x10a69f4: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a703c: 0x10a703c: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a69fc: 0x10a69fc: addu  a0, s5, zero
+// 0x010a7044: 0x10a7044: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010a6a00: 0x10a6a00: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010a7048: 0x10a7048: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a08: 0x10a6a08: addu  a0, s1, zero
+// 0x010a7050: 0x10a7050: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x010a6a0c: 0x10a6a0c: jal   0x1098ec4 addu  a1, s5, zero
+// 0x010a7054: 0x10a7054: jal   0x109950c addu  a1, s5, zero
 	ldloc 14
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a14: 0x10a6a14: lui   a0, 0x10000
+// 0x010a705c: 0x10a705c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a6a18: 0x10a6a18: addiu a0, a0, -21272
+// 0x010a7060: 0x10a7060: addiu a0, a0, -21272
 	ldloc.1
 	ldc.i4 -21272
 	add
 	stloc.1
-// 0x010a6a1c: 0x10a6a1c: lui   s0, 0x10a0000
+// 0x010a7064: 0x10a7064: lui   s0, 0x10a0000
 	ldc.i4 17432576
 	stloc 9
-// 0x010a6a20: 0x10a6a20: lui   a2, 0x300000
+// 0x010a7068: 0x10a7068: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x010a6a24: 0x10a6a24: ori   a2, a2, 26
+// 0x010a706c: 0x10a706c: ori   a2, a2, 26
 	ldloc.3
 	ldc.i4.s 26
 	or
 	stloc.3
-// 0x010a6a28: 0x10a6a28: addiu a3, s0, 19308
+// 0x010a7070: 0x10a7070: addiu a3, s0, 20916
 	ldloc 9
-	ldc.i4 19308
+	ldc.i4 20916
 	add
 	stloc 4
-// 0x010a6a2c: 0x10a6a2c: jal   0x1091088 addu  a1, a0, zero
+// 0x010a7074: 0x10a7074: jal   0x10916ac addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -4006,28 +4006,28 @@ L_10a699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a34: 0x10a6a34: addu  a1, v0, zero
+// 0x010a707c: 0x10a707c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6a38: 0x10a6a38: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a7080: 0x10a7080: jal   0x109950c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a40: 0x10a6a40: lui   a0, 0x0
+// 0x010a7088: 0x10a7088: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a6a44: 0x10a6a44: jal   0x101cd60 addiu a0, a0, 32524
+// 0x010a708c: 0x10a708c: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -4037,15 +4037,15 @@ L_10a699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a4c: 0x10a6a4c: addu  a1, v0, zero
+// 0x010a7094: 0x10a7094: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6a50: 0x10a6a50: jal   0x109b434 addu  a0, s1, zero
+// 0x010a7098: 0x10a7098: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -4053,27 +4053,27 @@ L_10a699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a58: 0x10a6a58: addu  a0, s1, zero
+// 0x010a70a0: 0x10a70a0: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x010a6a5c: 0x10a6a5c: jal   0x1099174 addiu a1, s0, 19308
+// 0x010a70a4: 0x10a70a4: jal   0x10997bc addiu a1, s0, 20916
 	ldloc 9
-	ldc.i4 19308
+	ldc.i4 20916
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x010a6a64: 0x10a6a64: addu  a0, s3, zero
+// 0x010a70ac: 0x10a70ac: addu  a0, s3, zero
 	ldloc 15
 	stloc.1
-// 0x010a6a68: 0x10a6a68: jal   0x1095eec addu  a1, zero, zero
+// 0x010a70b0: 0x10a70b0: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4081,43 +4081,43 @@ L_10a699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a70: 0x10a6a70: lui   v0, 0x80000
+// 0x010a70b8: 0x10a70b8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_10a6a74:
-// 0x010a6a74: 0x10a6a74: lw    v0, 31004(v0)
+L_10a70bc:
+// 0x010a70bc: 0x10a70bc: lw    v0, 31468(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7751
+	ldc.i4 7867
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a6a78: 0x10a6a78: sll   zero, zero, 0
-// 0x010a6a7c: 0x10a6a7c: bne   v0, zero, 0x10a6c30 lui   s1, 0x80000
+// 0x010a70c0: 0x10a70c0: sll   zero, zero, 0
+// 0x010a70c4: 0x10a70c4: bne   v0, zero, 0x10a7278 lui   s1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 12
-	brtrue L_10a6c30
+	brtrue L_10a7278
 // --- basic block ---
-// 0x010a6a84: 0x10a6a84: lui   a0, 0x0
+// 0x010a70cc: 0x10a70cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a6a88: 0x10a6a88: lui   a1, 0x0
+// 0x010a70d0: 0x10a70d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6a8c: 0x10a6a8c: addiu a0, a0, 14100
+// 0x010a70d4: 0x10a70d4: addiu a0, a0, 14100
 	ldloc.1
 	ldc.i4 14100
 	add
 	stloc.1
-// 0x010a6a90: 0x10a6a90: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a70d8: 0x10a70d8: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4127,38 +4127,38 @@ L_10a6a74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6a98: 0x10a6a98: beq   v0, zero, 0x10a6aac lui   v1, 0x80000
+// 0x010a70e0: 0x10a70e0: beq   v0, zero, 0x10a70f4 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brfalse L_10a6aac
+	brfalse L_10a70f4
 // --- basic block ---
-// 0x010a6aa0: 0x10a6aa0: lw    a1, 31068(v1)
+// 0x010a70e8: 0x10a70e8: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6aa4: 0x10a6aa4: j	 0x10a6ab8 lui   a0, 0x20000
+// 0x010a70ec: 0x10a70ec: j	 0x10a7100 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a6ab8
+	br L_10a7100
 // --- basic block ---
-L_10a6aac:
-// 0x010a6aac: 0x10a6aac: addiu v1, v1, 31068
+L_10a70f4:
+// 0x010a70f4: 0x10a70f4: addiu v1, v1, 31532
 	ldloc 6
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 6
-// 0x010a6ab0: 0x10a6ab0: lw    a1, 4(v1)
+// 0x010a70f8: 0x10a70f8: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4167,13 +4167,13 @@ L_10a6aac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6ab4: 0x10a6ab4: lui   a0, 0x20000
+// 0x010a70fc: 0x10a70fc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a6ab8:
-// 0x010a6ab8: 0x10a6ab8: jal   0x1094734 addiu a0, a0, 6836
+L_10a7100:
+// 0x010a7100: 0x10a7100: jal   0x1094d58 addiu a0, a0, 7300
 	ldloc.1
-	ldc.i4 6836
+	ldc.i4 7300
 	add
 	stloc.1
 	ldloc.0
@@ -4181,23 +4181,23 @@ L_10a6ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6ac0: 0x10a6ac0: lui   a0, 0x0
+// 0x010a7108: 0x10a7108: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a6ac4: 0x10a6ac4: lui   a1, 0x0
+// 0x010a710c: 0x10a710c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6ac8: 0x10a6ac8: addiu a0, a0, 14116
+// 0x010a7110: 0x10a7110: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x010a6acc: 0x10a6acc: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a7114: 0x10a7114: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4207,38 +4207,38 @@ L_10a6ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6ad4: 0x10a6ad4: beq   v0, zero, 0x10a6ae8 lui   v1, 0x80000
+// 0x010a711c: 0x10a711c: beq   v0, zero, 0x10a7130 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brfalse L_10a6ae8
+	brfalse L_10a7130
 // --- basic block ---
-// 0x010a6adc: 0x10a6adc: lw    a1, 31068(v1)
+// 0x010a7124: 0x10a7124: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6ae0: 0x10a6ae0: j	 0x10a6af4 lui   a0, 0x20000
+// 0x010a7128: 0x10a7128: j	 0x10a713c lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a6af4
+	br L_10a713c
 // --- basic block ---
-L_10a6ae8:
-// 0x010a6ae8: 0x10a6ae8: addiu v1, v1, 31068
+L_10a7130:
+// 0x010a7130: 0x10a7130: addiu v1, v1, 31532
 	ldloc 6
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 6
-// 0x010a6aec: 0x10a6aec: lw    a1, 4(v1)
+// 0x010a7134: 0x10a7134: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4247,13 +4247,13 @@ L_10a6ae8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6af0: 0x10a6af0: lui   a0, 0x20000
+// 0x010a7138: 0x10a7138: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a6af4:
-// 0x010a6af4: 0x10a6af4: jal   0x1094734 addiu a0, a0, 6848
+L_10a713c:
+// 0x010a713c: 0x10a713c: jal   0x1094d58 addiu a0, a0, 7312
 	ldloc.1
-	ldc.i4 6848
+	ldc.i4 7312
 	add
 	stloc.1
 	ldloc.0
@@ -4261,25 +4261,25 @@ L_10a6af4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6afc: 0x10a6afc: lui   a0, 0x0
+// 0x010a7144: 0x10a7144: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a6b00: 0x10a6b00: lui   a1, 0x20000
+// 0x010a7148: 0x10a7148: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a6b04: 0x10a6b04: addiu a0, a0, 18304
+// 0x010a714c: 0x10a714c: addiu a0, a0, 18304
 	ldloc.1
 	ldc.i4 18304
 	add
 	stloc.1
-// 0x010a6b08: 0x10a6b08: jal   0x100e7f4 addiu a1, a1, 6872
+// 0x010a7150: 0x10a7150: jal   0x100e804 addiu a1, a1, 7336
 	ldloc.2
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc.2
 	ldloc.0
@@ -4287,38 +4287,38 @@ L_10a6af4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6b10: 0x10a6b10: beq   v0, zero, 0x10a6b24 lui   v1, 0x80000
+// 0x010a7158: 0x10a7158: beq   v0, zero, 0x10a716c lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brfalse L_10a6b24
+	brfalse L_10a716c
 // --- basic block ---
-// 0x010a6b18: 0x10a6b18: lw    a1, 31068(v1)
+// 0x010a7160: 0x10a7160: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6b1c: 0x10a6b1c: j	 0x10a6b30 lui   a0, 0x20000
+// 0x010a7164: 0x10a7164: j	 0x10a7178 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a6b30
+	br L_10a7178
 // --- basic block ---
-L_10a6b24:
-// 0x010a6b24: 0x10a6b24: addiu v1, v1, 31068
+L_10a716c:
+// 0x010a716c: 0x10a716c: addiu v1, v1, 31532
 	ldloc 6
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 6
-// 0x010a6b28: 0x10a6b28: lw    a1, 4(v1)
+// 0x010a7170: 0x10a7170: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4327,13 +4327,13 @@ L_10a6b24:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6b2c: 0x10a6b2c: lui   a0, 0x20000
+// 0x010a7174: 0x10a7174: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a6b30:
-// 0x010a6b30: 0x10a6b30: jal   0x1094734 addiu a0, a0, 6868
+L_10a7178:
+// 0x010a7178: 0x10a7178: jal   0x1094d58 addiu a0, a0, 7332
 	ldloc.1
-	ldc.i4 6868
+	ldc.i4 7332
 	add
 	stloc.1
 	ldloc.0
@@ -4341,25 +4341,25 @@ L_10a6b30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6b38: 0x10a6b38: lui   a0, 0x0
+// 0x010a7180: 0x10a7180: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a6b3c: 0x10a6b3c: lui   a1, 0x20000
+// 0x010a7184: 0x10a7184: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a6b40: 0x10a6b40: addiu a0, a0, 18352
+// 0x010a7188: 0x10a7188: addiu a0, a0, 18352
 	ldloc.1
 	ldc.i4 18352
 	add
 	stloc.1
-// 0x010a6b44: 0x10a6b44: jal   0x100e7f4 addiu a1, a1, 6820
+// 0x010a718c: 0x10a718c: jal   0x100e804 addiu a1, a1, 7284
 	ldloc.2
-	ldc.i4 6820
+	ldc.i4 7284
 	add
 	stloc.2
 	ldloc.0
@@ -4367,38 +4367,38 @@ L_10a6b30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6b4c: 0x10a6b4c: beq   v0, zero, 0x10a6b60 lui   v1, 0x80000
+// 0x010a7194: 0x10a7194: beq   v0, zero, 0x10a71a8 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brfalse L_10a6b60
+	brfalse L_10a71a8
 // --- basic block ---
-// 0x010a6b54: 0x10a6b54: lw    a1, 31068(v1)
+// 0x010a719c: 0x10a719c: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6b58: 0x10a6b58: j	 0x10a6b6c lui   a0, 0x20000
+// 0x010a71a0: 0x10a71a0: j	 0x10a71b4 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a6b6c
+	br L_10a71b4
 // --- basic block ---
-L_10a6b60:
-// 0x010a6b60: 0x10a6b60: addiu v1, v1, 31068
+L_10a71a8:
+// 0x010a71a8: 0x10a71a8: addiu v1, v1, 31532
 	ldloc 6
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 6
-// 0x010a6b64: 0x10a6b64: lw    a1, 4(v1)
+// 0x010a71ac: 0x10a71ac: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4407,13 +4407,13 @@ L_10a6b60:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6b68: 0x10a6b68: lui   a0, 0x20000
+// 0x010a71b0: 0x10a71b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a6b6c:
-// 0x010a6b6c: 0x10a6b6c: jal   0x1094734 addiu a0, a0, 6880
+L_10a71b4:
+// 0x010a71b4: 0x10a71b4: jal   0x1094d58 addiu a0, a0, 7344
 	ldloc.1
-	ldc.i4 6880
+	ldc.i4 7344
 	add
 	stloc.1
 	ldloc.0
@@ -4421,66 +4421,66 @@ L_10a6b6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6b74: 0x10a6b74: jal   0x1048c0c sll   zero, zero, 0
+// 0x010a71bc: 0x10a71bc: jal   0x1048c1c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6b7c: 0x10a6b7c: beq   v0, zero, 0x10a6bb8 lui   a0, 0x0
+// 0x010a71c4: 0x10a71c4: beq   v0, zero, 0x10a7200 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a6bb8
+	brfalse L_10a7200
 // --- basic block ---
-// 0x010a6b84: 0x10a6b84: jal   0x1048c40 sll   zero, zero, 0
+// 0x010a71cc: 0x10a71cc: jal   0x1048c50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_routes_suggest_routes_1048c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_routes_suggest_routes_1048c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6b8c: 0x10a6b8c: beq   v0, zero, 0x10a6ba0 lui   v1, 0x80000
+// 0x010a71d4: 0x10a71d4: beq   v0, zero, 0x10a71e8 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brfalse L_10a6ba0
+	brfalse L_10a71e8
 // --- basic block ---
-// 0x010a6b94: 0x10a6b94: lw    a1, 31068(v1)
+// 0x010a71dc: 0x10a71dc: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6b98: 0x10a6b98: j	 0x10a6bac lui   a0, 0x20000
+// 0x010a71e0: 0x10a71e0: j	 0x10a71f4 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a6bac
+	br L_10a71f4
 // --- basic block ---
-L_10a6ba0:
-// 0x010a6ba0: 0x10a6ba0: addiu v1, v1, 31068
+L_10a71e8:
+// 0x010a71e8: 0x10a71e8: addiu v1, v1, 31532
 	ldloc 6
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 6
-// 0x010a6ba4: 0x10a6ba4: lw    a1, 4(v1)
+// 0x010a71ec: 0x10a71ec: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4489,13 +4489,13 @@ L_10a6ba0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6ba8: 0x10a6ba8: lui   a0, 0x20000
+// 0x010a71f0: 0x10a71f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a6bac:
-// 0x010a6bac: 0x10a6bac: jal   0x1094734 addiu a0, a0, 6896
+L_10a71f4:
+// 0x010a71f4: 0x10a71f4: jal   0x1094d58 addiu a0, a0, 7360
 	ldloc.1
-	ldc.i4 6896
+	ldc.i4 7360
 	add
 	stloc.1
 	ldloc.0
@@ -4503,24 +4503,24 @@ L_10a6bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6bb4: 0x10a6bb4: lui   a0, 0x0
+// 0x010a71fc: 0x10a71fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10a6bb8:
-// 0x010a6bb8: 0x10a6bb8: lui   a1, 0x0
+L_10a7200:
+// 0x010a7200: 0x10a7200: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6bbc: 0x10a6bbc: addiu a0, a0, 18320
+// 0x010a7204: 0x10a7204: addiu a0, a0, 18320
 	ldloc.1
 	ldc.i4 18320
 	add
 	stloc.1
-// 0x010a6bc0: 0x10a6bc0: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a7208: 0x10a7208: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4530,38 +4530,38 @@ L_10a6bb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6bc8: 0x10a6bc8: beq   v0, zero, 0x10a6bdc lui   v1, 0x80000
+// 0x010a7210: 0x10a7210: beq   v0, zero, 0x10a7224 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brfalse L_10a6bdc
+	brfalse L_10a7224
 // --- basic block ---
-// 0x010a6bd0: 0x10a6bd0: lw    a1, 31068(v1)
+// 0x010a7218: 0x10a7218: lw    a1, 31532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7767
+	ldc.i4 7883
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6bd4: 0x10a6bd4: j	 0x10a6be8 lui   a0, 0x10000
+// 0x010a721c: 0x10a721c: j	 0x10a7230 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_10a6be8
+	br L_10a7230
 // --- basic block ---
-L_10a6bdc:
-// 0x010a6bdc: 0x10a6bdc: addiu v1, v1, 31068
+L_10a7224:
+// 0x010a7224: 0x10a7224: addiu v1, v1, 31532
 	ldloc 6
-	ldc.i4 31068
+	ldc.i4 31532
 	add
 	stloc 6
-// 0x010a6be0: 0x10a6be0: lw    a1, 4(v1)
+// 0x010a7228: 0x10a7228: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4570,11 +4570,11 @@ L_10a6bdc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a6be4: 0x10a6be4: lui   a0, 0x10000
+// 0x010a722c: 0x10a722c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10a6be8:
-// 0x010a6be8: 0x10a6be8: jal   0x1094734 addiu a0, a0, -17576
+L_10a7230:
+// 0x010a7230: 0x10a7230: jal   0x1094d58 addiu a0, a0, -17576
 	ldloc.1
 	ldc.i4 -17576
 	add
@@ -4584,12 +4584,12 @@ L_10a6be8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6bf0: 0x10a6bf0: jal   0x101d484 lui   s1, 0x80000
+// 0x010a7238: 0x10a7238: jal   0x101d494 lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 12
 	ldloc.0
@@ -4597,12 +4597,12 @@ L_10a6be8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6bf8: 0x10a6bf8: jal   0x101ccd4 addu  a0, v0, zero
+// 0x010a7240: 0x10a7240: jal   0x101cce4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4610,20 +4610,20 @@ L_10a6be8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_lang_value_101ccd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_lang_value_101cce4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6c00: 0x10a6c00: lui   a0, 0x10000
+// 0x010a7248: 0x10a7248: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a6c04: 0x10a6c04: addu  a1, v0, zero
+// 0x010a724c: 0x10a724c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6c08: 0x10a6c08: jal   0x1094734 addiu a0, a0, -2024
+// 0x010a7250: 0x10a7250: jal   0x1094d58 addiu a0, a0, -2028
 	ldloc.1
-	ldc.i4 -2024
+	ldc.i4 -2028
 	add
 	stloc.1
 	ldloc.0
@@ -4631,23 +4631,23 @@ L_10a6be8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6c10: 0x10a6c10: jal   0x1044134 sll   zero, zero, 0
+// 0x010a7258: 0x10a7258: jal   0x1044144 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6c18: 0x10a6c18: jal   0x1044368 addu  a0, v0, zero
+// 0x010a7260: 0x10a7260: jal   0x1044378 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4655,20 +4655,20 @@ L_10a6be8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_prompt_value_1044368(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_prompt_value_1044378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6c20: 0x10a6c20: lui   a0, 0x10000
+// 0x010a7268: 0x10a7268: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a6c24: 0x10a6c24: addiu a0, a0, -2044
+// 0x010a726c: 0x10a726c: addiu a0, a0, -2048
 	ldloc.1
-	ldc.i4 -2044
+	ldc.i4 -2048
 	add
 	stloc.1
-// 0x010a6c28: 0x10a6c28: jal   0x1094734 addu  a1, v0, zero
+// 0x010a7270: 0x10a7270: jal   0x1094d58 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4676,40 +4676,40 @@ L_10a6be8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a6c30:
-// 0x010a6c30: 0x10a6c30: lui   s3, 0x0
+L_10a7278:
+// 0x010a7278: 0x10a7278: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x010a6c34: 0x10a6c34: addiu s1, s1, 31008
+// 0x010a727c: 0x10a727c: addiu s1, s1, 31472
 	ldloc 12
-	ldc.i4 31008
+	ldc.i4 31472
 	add
 	stloc 12
-// 0x010a6c38: 0x10a6c38: addiu s3, s3, 18336
+// 0x010a7280: 0x10a7280: addiu s3, s3, 18336
 	ldloc 15
 	ldc.i4 18336
 	add
 	stloc 15
-// 0x010a6c3c: 0x10a6c3c: addu  s0, zero, zero
+// 0x010a7284: 0x10a7284: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010a6c40: 0x10a6c40: addiu s2, zero, 6
+// 0x010a7288: 0x10a7288: addiu s2, zero, 6
 	ldc.i4.6
 	stloc 10
-L_10a6c44:
-// 0x010a6c44: 0x10a6c44: lw    s4, 0(s1)
+L_10a728c:
+// 0x010a728c: 0x10a728c: lw    s4, 0(s1)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x010a6c48: 0x10a6c48: jal   0x100e348 addu  a0, s3, zero
+// 0x010a7290: 0x10a7290: jal   0x100e358 addu  a0, s3, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -4717,15 +4717,15 @@ L_10a6c44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6c50: 0x10a6c50: addu  a1, v0, zero
+// 0x010a7298: 0x10a7298: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6c54: 0x10a6c54: jal   0x1001b14 addu  a0, s4, zero
+// 0x010a729c: 0x10a729c: jal   0x1001b14 addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -4733,58 +4733,58 @@ L_10a6c44:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a6c5c: 0x10a6c5c: beq   v0, zero, 0x10a6c74 lui   v0, 0x80000
+// 0x010a72a4: 0x10a72a4: beq   v0, zero, 0x10a72bc lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_10a6c74
+	brfalse L_10a72bc
 // --- basic block ---
-// 0x010a6c64: 0x10a6c64: addiu s0, s0, 1
+// 0x010a72ac: 0x10a72ac: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010a6c68: 0x10a6c68: bne   s0, s2, 0x10a6c44 addiu s1, s1, 4
+// 0x010a72b0: 0x10a72b0: bne   s0, s2, 0x10a728c addiu s1, s1, 4
 	ldloc 9
 	ldloc 10
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-	bne.un L_10a6c44
+	bne.un L_10a728c
 // --- basic block ---
-// 0x010a6c70: 0x10a6c70: lui   v0, 0x80000
+// 0x010a72b8: 0x10a72b8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_10a6c74:
-// 0x010a6c74: 0x10a6c74: addiu v0, v0, 31008
+L_10a72bc:
+// 0x010a72bc: 0x10a72bc: addiu v0, v0, 31472
 	ldloc 5
-	ldc.i4 31008
+	ldc.i4 31472
 	add
 	stloc 5
-// 0x010a6c78: 0x10a6c78: sll   s0, s0, 2
+// 0x010a72c0: 0x10a72c0: sll   s0, s0, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x010a6c7c: 0x10a6c7c: addu  s0, s0, v0
+// 0x010a72c4: 0x10a72c4: addu  s0, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x010a6c80: 0x10a6c80: lw    a1, 0(s0)
+// 0x010a72c8: 0x10a72c8: lw    a1, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010a6c84: 0x10a6c84: lui   a0, 0x20000
+// 0x010a72cc: 0x10a72cc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6c88: 0x10a6c88: jal   0x1094734 addiu a0, a0, 6924
+// 0x010a72d0: 0x10a72d0: jal   0x1094d58 addiu a0, a0, 7388
 	ldloc.1
-	ldc.i4 6924
+	ldc.i4 7388
 	add
 	stloc.1
 	ldloc.0
@@ -4792,23 +4792,23 @@ L_10a6c74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6c90: 0x10a6c90: addiu v1, zero, 1
+// 0x010a72d8: 0x10a72d8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010a6c94: 0x10a6c94: lui   v0, 0x80000
+// 0x010a72dc: 0x10a72dc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010a6c98: 0x10a6c98: jal   0x109483c sw    v1, 31004(v0)
+// 0x010a72e0: 0x10a72e0: jal   0x1094e60 sw    v1, 31468(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7751
+	ldc.i4 7867
 	add
 	ldloc 6
 	stelem.i4
@@ -4817,13 +4817,13 @@ L_10a6c74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a6ca0: 0x10a6ca0: lw    ra, 692(sp)
-// 0x010a6ca4: 0x10a6ca4: lw    s8, 688(sp)
+// 0x010a72e8: 0x10a72e8: lw    ra, 692(sp)
+// 0x010a72ec: 0x10a72ec: lw    s8, 688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4832,7 +4832,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a6ca8: 0x10a6ca8: lw    s7, 684(sp)
+// 0x010a72f0: 0x10a72f0: lw    s7, 684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4841,7 +4841,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a6cac: 0x10a6cac: lw    s6, 680(sp)
+// 0x010a72f4: 0x10a72f4: lw    s6, 680(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4850,7 +4850,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a6cb0: 0x10a6cb0: lw    s5, 676(sp)
+// 0x010a72f8: 0x10a72f8: lw    s5, 676(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4859,7 +4859,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a6cb4: 0x10a6cb4: lw    s4, 672(sp)
+// 0x010a72fc: 0x10a72fc: lw    s4, 672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4868,7 +4868,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a6cb8: 0x10a6cb8: lw    s3, 668(sp)
+// 0x010a7300: 0x10a7300: lw    s3, 668(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4877,7 +4877,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a6cbc: 0x10a6cbc: lw    s2, 664(sp)
+// 0x010a7304: 0x10a7304: lw    s2, 664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4886,7 +4886,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a6cc0: 0x10a6cc0: lw    s1, 660(sp)
+// 0x010a7308: 0x10a7308: lw    s1, 660(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4895,7 +4895,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a6cc4: 0x10a6cc4: lw    s0, 656(sp)
+// 0x010a730c: 0x10a730c: lw    s0, 656(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4904,7 +4904,7 @@ L_10a6c74:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a6cc8: 0x10a6cc8: jr    ra addiu sp, sp, 696
+// 0x010a7310: 0x10a7310: jr    ra addiu sp, sp, 696
 	ldloc.0
 	ldc.i4 696
 	add
@@ -4916,7 +4916,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -4960,12 +4960,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a6d54: 0x10a6d54: addiu sp, sp, -136
+// 0x010a739c: 0x10a739c: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x010a6d58: 0x10a6d58: sw    s2, 128(sp)
+// 0x010a73a0: 0x10a73a0: sw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4974,19 +4974,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a6d5c: 0x10a6d5c: addu  s2, a0, zero
+// 0x010a73a4: 0x10a73a4: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010a6d60: 0x10a6d60: lui   a0, 0x0
+// 0x010a73a8: 0x10a73a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a6d64: 0x10a6d64: addiu a0, a0, 18464
+// 0x010a73ac: 0x10a73ac: addiu a0, a0, 18464
 	ldloc.1
 	ldc.i4 18464
 	add
 	stloc.1
-// 0x010a6d68: 0x10a6d68: sw    ra, 132(sp)
-// 0x010a6d6c: 0x10a6d6c: sw    s1, 124(sp)
+// 0x010a73b0: 0x10a73b0: sw    ra, 132(sp)
+// 0x010a73b4: 0x10a73b4: sw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4995,7 +4995,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a6d70: 0x10a6d70: sw    s0, 120(sp)
+// 0x010a73b8: 0x10a73b8: sw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5004,7 +5004,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a6d74: 0x10a6d74: jal   0x100e348 addiu s1, sp, 16
+// 0x010a73bc: 0x10a73bc: jal   0x100e358 addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5014,18 +5014,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a6d7c: 0x10a6d7c: addu  a1, v0, zero
+// 0x010a73c4: 0x10a73c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a6d80: 0x10a6d80: lui   s0, 0x10000
+// 0x010a73c8: 0x10a73c8: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010a6d84: 0x10a6d84: jal   0x1001b68 addu  a0, s1, zero
+// 0x010a73cc: 0x10a73cc: jal   0x1001b68 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -5035,12 +5035,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a6d8c: 0x10a6d8c: addiu a1, s0, -22604
+// 0x010a73d4: 0x10a73d4: addiu a1, s0, -22604
 	ldloc 7
 	ldc.i4 -22604
 	add
 	stloc.2
-// 0x010a6d90: 0x10a6d90: jal   0x1001984 addu  a0, s1, zero
+// 0x010a73d8: 0x10a73d8: jal   0x1001984 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5053,15 +5053,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a6d98: 0x10a6d98: j	 0x10a6dc4 addiu s0, s0, -22604
+// 0x010a73e0: 0x10a73e0: j	 0x10a740c addiu s0, s0, -22604
 	ldloc 7
 	ldc.i4 -22604
 	add
 	stloc 7
-	br L_10a6dc4
+	br L_10a740c
 // --- basic block ---
-L_10a6da0:
-// 0x010a6da0: 0x10a6da0: jal   0x1000d8c sll   zero, zero, 0
+L_10a73e8:
+// 0x010a73e8: 0x10a73e8: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5072,23 +5072,23 @@ L_10a6da0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a6da8: 0x10a6da8: addu  a0, zero, zero
+// 0x010a73f0: 0x10a73f0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a6dac: 0x10a6dac: bne   v0, s2, 0x10a6dbc addu  a1, s0, zero
+// 0x010a73f4: 0x10a73f4: bne   v0, s2, 0x10a7404 addu  a1, s0, zero
 	ldloc 5
 	ldloc 10
 	ldloc 7
 	stloc.2
-	bne.un L_10a6dbc
+	bne.un L_10a7404
 // --- basic block ---
-// 0x010a6db4: 0x10a6db4: j	 0x10a6dd0 addu  v0, zero, zero
+// 0x010a73fc: 0x10a73fc: j	 0x10a7418 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10a6dd0
+	br L_10a7418
 // --- basic block ---
-L_10a6dbc:
-// 0x010a6dbc: 0x10a6dbc: jal   0x1001984 sll   zero, zero, 0
+L_10a7404:
+// 0x010a7404: 0x10a7404: jal   0x1001984 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5099,19 +5099,19 @@ L_10a6dbc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a6dc4:
-// 0x010a6dc4: 0x10a6dc4: bne   v0, zero, 0x10a6da0 addu  a0, v0, zero
+L_10a740c:
+// 0x010a740c: 0x10a740c: bne   v0, zero, 0x10a73e8 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brtrue L_10a6da0
+	brtrue L_10a73e8
 // --- basic block ---
-// 0x010a6dcc: 0x10a6dcc: addiu v0, zero, 1
+// 0x010a7414: 0x10a7414: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10a6dd0:
-// 0x010a6dd0: 0x10a6dd0: lw    ra, 132(sp)
-// 0x010a6dd4: 0x10a6dd4: lw    s2, 128(sp)
+L_10a7418:
+// 0x010a7418: 0x10a7418: lw    ra, 132(sp)
+// 0x010a741c: 0x10a741c: lw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5120,7 +5120,7 @@ L_10a6dd0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a6dd8: 0x10a6dd8: lw    s1, 124(sp)
+// 0x010a7420: 0x10a7420: lw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5129,7 +5129,7 @@ L_10a6dd0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a6ddc: 0x10a6ddc: lw    s0, 120(sp)
+// 0x010a7424: 0x10a7424: lw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5138,7 +5138,7 @@ L_10a6dd0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a6de0: 0x10a6de0: jr    ra addiu sp, sp, 136
+// 0x010a7428: 0x10a7428: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -5150,7 +5150,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_map_scheme_select_10a6de8(int32,int32,int32,int32,int32)
+.method public static int32 on_map_scheme_select_10a7430(int32,int32,int32,int32,int32)
 {
 .maxstack 12
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v1,int32 s1,int32 v0,int32 t0,int32 t1,int32 ra)
@@ -5197,12 +5197,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a6de8: 0x10a6de8: addiu sp, sp, -32
+// 0x010a7430: 0x10a7430: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a6dec: 0x10a6dec: sw    s1, 24(sp)
+// 0x010a7434: 0x10a7434: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5211,7 +5211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a6df0: 0x10a6df0: sw    s0, 20(sp)
+// 0x010a7438: 0x10a7438: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5220,134 +5220,134 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6df4: 0x10a6df4: lui   s1, 0x0
+// 0x010a743c: 0x10a743c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a6df8: 0x10a6df8: lui   s0, 0x0
+// 0x010a7440: 0x10a7440: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a6dfc: 0x10a6dfc: sw    ra, 28(sp)
-// 0x010a6e00: 0x10a6e00: addiu s0, s0, 18528
+// 0x010a7444: 0x10a7444: sw    ra, 28(sp)
+// 0x010a7448: 0x10a7448: addiu s0, s0, 18528
 	ldloc 5
 	ldc.i4 18528
 	add
 	stloc 5
-// 0x010a6e04: 0x10a6e04: addiu s1, s1, 18564
+// 0x010a744c: 0x10a744c: addiu s1, s1, 18564
 	ldloc 8
 	ldc.i4 18564
 	add
 	stloc 8
-L_10a6e08:
-// 0x010a6e08: 0x10a6e08: lw    a0, 0(s0)
+L_10a7450:
+// 0x010a7450: 0x10a7450: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a6e0c: 0x10a6e0c: jal   0x101cd60 sll   zero, zero, 0
+// 0x010a7454: 0x10a7454: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x010a6e14: 0x10a6e14: sw    v0, 0(s0)
+// 0x010a745c: 0x10a745c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010a6e18: 0x10a6e18: addiu s0, s0, 4
+// 0x010a7460: 0x10a7460: addiu s0, s0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010a6e1c: 0x10a6e1c: bne   s0, s1, 0x10a6e08 lui   t1, 0x0
+// 0x010a7464: 0x10a7464: bne   s0, s1, 0x10a7450 lui   t1, 0x0
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 0
 	stloc 11
-	bne.un L_10a6e08
+	bne.un L_10a7450
 // --- basic block ---
-// 0x010a6e24: 0x10a6e24: lui   t0, 0x0
+// 0x010a746c: 0x10a746c: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010a6e28: 0x10a6e28: lui   a3, 0x0
+// 0x010a7470: 0x10a7470: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010a6e2c: 0x10a6e2c: lui   a1, 0x10a0000
+// 0x010a7474: 0x10a7474: lui   a1, 0x10a0000
 	ldc.i4 17432576
 	stloc.2
-// 0x010a6e30: 0x10a6e30: lui   a0, 0x20000
+// 0x010a7478: 0x10a7478: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a6e34: 0x10a6e34: addu  v1, zero, zero
+// 0x010a747c: 0x10a747c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010a6e38: 0x10a6e38: addiu t1, t1, 18600
+// 0x010a7480: 0x10a7480: addiu t1, t1, 18600
 	ldloc 11
 	ldc.i4 18600
 	add
 	stloc 11
-// 0x010a6e3c: 0x10a6e3c: addiu t0, t0, 18564
+// 0x010a7484: 0x10a7484: addiu t0, t0, 18564
 	ldloc 10
 	ldc.i4 18564
 	add
 	stloc 10
-// 0x010a6e40: 0x10a6e40: addiu a3, a3, 18528
+// 0x010a7488: 0x10a7488: addiu a3, a3, 18528
 	ldloc 4
 	ldc.i4 18528
 	add
 	stloc 4
-// 0x010a6e44: 0x10a6e44: addiu a2, zero, 9
+// 0x010a748c: 0x10a748c: addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
-// 0x010a6e48: 0x10a6e48: addiu a1, a1, 29716
+// 0x010a7490: 0x10a7490: addiu a1, a1, 31324
 	ldloc.2
-	ldc.i4 29716
+	ldc.i4 31324
 	add
 	stloc.2
-// 0x010a6e4c: 0x10a6e4c: addiu a0, a0, 7932
+// 0x010a7494: 0x10a7494: addiu a0, a0, 8396
 	ldloc.1
-	ldc.i4 7932
+	ldc.i4 8396
 	add
 	stloc.1
-// 0x010a6e50: 0x10a6e50: cibyl_sysc_arg 0x4
+// 0x010a7498: 0x10a7498: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010a6e54: 0x10a6e54: cibyl_sysc_arg 0x5
+// 0x010a749c: 0x10a749c: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010a6e58: 0x10a6e58: cibyl_sysc_arg 0x6
+// 0x010a74a0: 0x10a74a0: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x010a6e5c: 0x10a6e5c: cibyl_sysc_arg 0x7
+// 0x010a74a4: 0x10a74a4: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x010a6e60: 0x10a6e60: cibyl_sysc_arg 0x8
+// 0x010a74a8: 0x10a74a8: cibyl_sysc_arg 0x8
 	ldloc 10
-// 0x010a6e64: 0x10a6e64: cibyl_sysc_arg 0x9
+// 0x010a74ac: 0x10a74ac: cibyl_sysc_arg 0x9
 	ldloc 11
-// 0x010a6e68: 0x10a6e68: cibyl_sysc_arg 0x3
+// 0x010a74b0: 0x10a74b0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010a6e6c: 0x10a6e6c: cibyl_sysc_arg 0x3
+// 0x010a74b4: 0x10a74b4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010a6e70: 0x10a6e70: cibyl_sysc_arg 0x3
+// 0x010a74b8: 0x10a74b8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010a6e74: 0x10a6e74: cibyl_sysc_arg 0x3
+// 0x010a74bc: 0x10a74bc: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010a6e78: 0x10a6e78: cibyl_sysc 0x226f
+// 0x010a74c0: 0x10a74c0: cibyl_sysc 0x226f
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_showDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x010a6e7c: 0x10a6e7c: addu  v1, v0, zero
+// 0x010a74c4: 0x10a74c4: addu  v1, v0, zero
 	ldloc 9
 	stloc 7
-// 0x010a6e80: 0x10a6e80: lw    ra, 28(sp)
-// 0x010a6e84: 0x10a6e84: addiu v0, zero, 1
+// 0x010a74c8: 0x10a74c8: lw    ra, 28(sp)
+// 0x010a74cc: 0x10a74cc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010a6e88: 0x10a6e88: lw    s1, 24(sp)
+// 0x010a74d0: 0x10a74d0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5356,7 +5356,7 @@ L_10a6e08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a6e8c: 0x10a6e8c: lw    s0, 20(sp)
+// 0x010a74d4: 0x10a74d4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5365,7 +5365,7 @@ L_10a6e08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a6e90: 0x10a6e90: jr    ra addiu sp, sp, 32
+// 0x010a74d8: 0x10a74d8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5377,7 +5377,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_map_settings_isEnabled_10a6e98(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_isEnabled_10a74e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -5412,12 +5412,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a6e98: 0x10a6e98: addiu sp, sp, -24
+// 0x010a74e0: 0x10a74e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a6e9c: 0x10a6e9c: sw    a1, 28(sp)
+// 0x010a74e4: 0x10a74e4: sw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5426,10 +5426,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a6ea0: 0x10a6ea0: lui   a1, 0x0
+// 0x010a74e8: 0x10a74e8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6ea4: 0x10a6ea4: sw    a0, 24(sp)
+// 0x010a74ec: 0x10a74ec: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5438,18 +5438,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a6ea8: 0x10a6ea8: addiu a1, a1, 20820
+// 0x010a74f0: 0x10a74f0: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a6eac: 0x10a6eac: addiu a0, sp, 24
+// 0x010a74f4: 0x10a74f4: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010a6eb0: 0x10a6eb0: sw    ra, 20(sp)
-// 0x010a6eb4: 0x10a6eb4: sw    a2, 32(sp)
+// 0x010a74f8: 0x10a74f8: sw    ra, 20(sp)
+// 0x010a74fc: 0x10a74fc: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5458,7 +5458,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010a6eb8: 0x10a6eb8: jal   0x100e7f4 sw    a3, 36(sp)
+// 0x010a7500: 0x10a7500: jal   0x100e804 sw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5472,18 +5472,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a6ec0: 0x10a6ec0: lw    ra, 20(sp)
-// 0x010a6ec4: 0x10a6ec4: sltu  v0, zero, v0
+// 0x010a7508: 0x10a7508: lw    ra, 20(sp)
+// 0x010a750c: 0x10a750c: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a6ec8: 0x10a6ec8: jr    ra addiu sp, sp, 24
+// 0x010a7510: 0x10a7510: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5495,7 +5495,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_map_settings_road_goodies_10a6ed0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_road_goodies_10a7518(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5533,12 +5533,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a6ed0: 0x10a6ed0: addiu sp, sp, -40
+// 0x010a7518: 0x10a7518: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a6ed4: 0x10a6ed4: sw    s0, 32(sp)
+// 0x010a751c: 0x10a751c: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5547,24 +5547,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6ed8: 0x10a6ed8: lui   a1, 0x0
+// 0x010a7520: 0x10a7520: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6edc: 0x10a6edc: addiu s0, sp, 16
+// 0x010a7524: 0x10a7524: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a6ee0: 0x10a6ee0: addu  a0, s0, zero
+// 0x010a7528: 0x10a7528: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6ee4: 0x10a6ee4: addiu a1, a1, 18512
+// 0x010a752c: 0x10a752c: addiu a1, a1, 18512
 	ldloc.2
 	ldc.i4 18512
 	add
 	stloc.2
-// 0x010a6ee8: 0x10a6ee8: sw    ra, 36(sp)
-// 0x010a6eec: 0x10a6eec: jal   0x1001800 addiu a2, zero, 16
+// 0x010a7530: 0x10a7530: sw    ra, 36(sp)
+// 0x010a7534: 0x10a7534: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -5576,13 +5576,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a6ef4: 0x10a6ef4: lui   a1, 0x0
+// 0x010a753c: 0x10a753c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6ef8: 0x10a6ef8: addu  a0, s0, zero
+// 0x010a7540: 0x10a7540: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6efc: 0x10a6efc: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a7544: 0x10a7544: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5592,18 +5592,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a6f04: 0x10a6f04: lw    ra, 36(sp)
-// 0x010a6f08: 0x10a6f08: sltu  v0, zero, v0
+// 0x010a754c: 0x10a754c: lw    ra, 36(sp)
+// 0x010a7550: 0x10a7550: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a6f0c: 0x10a6f0c: lw    s0, 32(sp)
+// 0x010a7554: 0x10a7554: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5612,7 +5612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a6f10: 0x10a6f10: jr    ra addiu sp, sp, 40
+// 0x010a7558: 0x10a7558: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5624,7 +5624,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_map_settings_color_roads_10a6f18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_color_roads_10a7560(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5662,12 +5662,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a6f18: 0x10a6f18: addiu sp, sp, -40
+// 0x010a7560: 0x10a7560: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a6f1c: 0x10a6f1c: sw    s0, 32(sp)
+// 0x010a7564: 0x10a7564: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5676,24 +5676,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6f20: 0x10a6f20: lui   a1, 0x0
+// 0x010a7568: 0x10a7568: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6f24: 0x10a6f24: addiu s0, sp, 16
+// 0x010a756c: 0x10a756c: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a6f28: 0x10a6f28: addu  a0, s0, zero
+// 0x010a7570: 0x10a7570: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6f2c: 0x10a6f2c: addiu a1, a1, 18448
+// 0x010a7574: 0x10a7574: addiu a1, a1, 18448
 	ldloc.2
 	ldc.i4 18448
 	add
 	stloc.2
-// 0x010a6f30: 0x10a6f30: sw    ra, 36(sp)
-// 0x010a6f34: 0x10a6f34: jal   0x1001800 addiu a2, zero, 16
+// 0x010a7578: 0x10a7578: sw    ra, 36(sp)
+// 0x010a757c: 0x10a757c: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -5705,13 +5705,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a6f3c: 0x10a6f3c: lui   a1, 0x0
+// 0x010a7584: 0x10a7584: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6f40: 0x10a6f40: addu  a0, s0, zero
+// 0x010a7588: 0x10a7588: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6f44: 0x10a6f44: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a758c: 0x10a758c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5721,18 +5721,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a6f4c: 0x10a6f4c: lw    ra, 36(sp)
-// 0x010a6f50: 0x10a6f50: sltu  v0, zero, v0
+// 0x010a7594: 0x10a7594: lw    ra, 36(sp)
+// 0x010a7598: 0x10a7598: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a6f54: 0x10a6f54: lw    s0, 32(sp)
+// 0x010a759c: 0x10a759c: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5741,7 +5741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a6f58: 0x10a6f58: jr    ra addiu sp, sp, 40
+// 0x010a75a0: 0x10a75a0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5753,7 +5753,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_map_settings_isShowSpeedometer_10a6f60(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_isShowSpeedometer_10a75a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5791,12 +5791,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a6f60: 0x10a6f60: addiu sp, sp, -40
+// 0x010a75a8: 0x10a75a8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a6f64: 0x10a6f64: sw    s0, 32(sp)
+// 0x010a75ac: 0x10a75ac: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5805,24 +5805,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6f68: 0x10a6f68: lui   a1, 0x0
+// 0x010a75b0: 0x10a75b0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6f6c: 0x10a6f6c: addiu s0, sp, 16
+// 0x010a75b4: 0x10a75b4: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a6f70: 0x10a6f70: addu  a0, s0, zero
+// 0x010a75b8: 0x10a75b8: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6f74: 0x10a6f74: addiu a1, a1, 18496
+// 0x010a75bc: 0x10a75bc: addiu a1, a1, 18496
 	ldloc.2
 	ldc.i4 18496
 	add
 	stloc.2
-// 0x010a6f78: 0x10a6f78: sw    ra, 36(sp)
-// 0x010a6f7c: 0x10a6f7c: jal   0x1001800 addiu a2, zero, 16
+// 0x010a75c0: 0x10a75c0: sw    ra, 36(sp)
+// 0x010a75c4: 0x10a75c4: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -5834,13 +5834,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a6f84: 0x10a6f84: lui   a1, 0x0
+// 0x010a75cc: 0x10a75cc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6f88: 0x10a6f88: addu  a0, s0, zero
+// 0x010a75d0: 0x10a75d0: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a6f8c: 0x10a6f8c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a75d4: 0x10a75d4: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5850,18 +5850,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a6f94: 0x10a6f94: lw    ra, 36(sp)
-// 0x010a6f98: 0x10a6f98: sltu  v0, zero, v0
+// 0x010a75dc: 0x10a75dc: lw    ra, 36(sp)
+// 0x010a75e0: 0x10a75e0: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a6f9c: 0x10a6f9c: lw    s0, 32(sp)
+// 0x010a75e4: 0x10a75e4: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5870,7 +5870,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a6fa0: 0x10a6fa0: jr    ra addiu sp, sp, 40
+// 0x010a75e8: 0x10a75e8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5882,7 +5882,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_map_settings_isShowTopBarOnTap_10a6ff0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_isShowTopBarOnTap_10a7638(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5920,12 +5920,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a6ff0: 0x10a6ff0: addiu sp, sp, -40
+// 0x010a7638: 0x10a7638: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a6ff4: 0x10a6ff4: sw    s0, 32(sp)
+// 0x010a763c: 0x10a763c: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5934,24 +5934,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a6ff8: 0x10a6ff8: lui   a1, 0x0
+// 0x010a7640: 0x10a7640: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a6ffc: 0x10a6ffc: addiu s0, sp, 16
+// 0x010a7644: 0x10a7644: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a7000: 0x10a7000: addu  a0, s0, zero
+// 0x010a7648: 0x10a7648: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7004: 0x10a7004: addiu a1, a1, 18384
+// 0x010a764c: 0x10a764c: addiu a1, a1, 18384
 	ldloc.2
 	ldc.i4 18384
 	add
 	stloc.2
-// 0x010a7008: 0x10a7008: sw    ra, 36(sp)
-// 0x010a700c: 0x10a700c: jal   0x1001800 addiu a2, zero, 16
+// 0x010a7650: 0x10a7650: sw    ra, 36(sp)
+// 0x010a7654: 0x10a7654: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -5963,13 +5963,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a7014: 0x10a7014: lui   a1, 0x0
+// 0x010a765c: 0x10a765c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7018: 0x10a7018: addu  a0, s0, zero
+// 0x010a7660: 0x10a7660: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a701c: 0x10a701c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a7664: 0x10a7664: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5979,18 +5979,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a7024: 0x10a7024: lw    ra, 36(sp)
-// 0x010a7028: 0x10a7028: sltu  v0, zero, v0
+// 0x010a766c: 0x10a766c: lw    ra, 36(sp)
+// 0x010a7670: 0x10a7670: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a702c: 0x10a702c: lw    s0, 32(sp)
+// 0x010a7674: 0x10a7674: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5999,7 +5999,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a7030: 0x10a7030: jr    ra addiu sp, sp, 40
+// 0x010a7678: 0x10a7678: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6011,7 +6011,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_map_settings_isShowSpeedCams_10a7038(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_isShowSpeedCams_10a7680(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6049,12 +6049,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a7038: 0x10a7038: addiu sp, sp, -40
+// 0x010a7680: 0x10a7680: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a703c: 0x10a703c: sw    s0, 32(sp)
+// 0x010a7684: 0x10a7684: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6063,24 +6063,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a7040: 0x10a7040: lui   a1, 0x0
+// 0x010a7688: 0x10a7688: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7044: 0x10a7044: addiu s0, sp, 16
+// 0x010a768c: 0x10a768c: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a7048: 0x10a7048: addu  a0, s0, zero
+// 0x010a7690: 0x10a7690: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a704c: 0x10a704c: addiu a1, a1, 18432
+// 0x010a7694: 0x10a7694: addiu a1, a1, 18432
 	ldloc.2
 	ldc.i4 18432
 	add
 	stloc.2
-// 0x010a7050: 0x10a7050: sw    ra, 36(sp)
-// 0x010a7054: 0x10a7054: jal   0x1001800 addiu a2, zero, 16
+// 0x010a7698: 0x10a7698: sw    ra, 36(sp)
+// 0x010a769c: 0x10a769c: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -6092,13 +6092,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a705c: 0x10a705c: lui   a1, 0x0
+// 0x010a76a4: 0x10a76a4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7060: 0x10a7060: addu  a0, s0, zero
+// 0x010a76a8: 0x10a76a8: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7064: 0x10a7064: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a76ac: 0x10a76ac: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6108,18 +6108,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a706c: 0x10a706c: lw    ra, 36(sp)
-// 0x010a7070: 0x10a7070: sltu  v0, zero, v0
+// 0x010a76b4: 0x10a76b4: lw    ra, 36(sp)
+// 0x010a76b8: 0x10a76b8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a7074: 0x10a7074: lw    s0, 32(sp)
+// 0x010a76bc: 0x10a76bc: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6128,7 +6128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a7078: 0x10a7078: jr    ra addiu sp, sp, 40
+// 0x010a76c0: 0x10a76c0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6140,7 +6140,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_map_settings_isShowWazers_10a7080(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_isShowWazers_10a76c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6178,12 +6178,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a7080: 0x10a7080: addiu sp, sp, -40
+// 0x010a76c8: 0x10a76c8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a7084: 0x10a7084: sw    s0, 32(sp)
+// 0x010a76cc: 0x10a76cc: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6192,24 +6192,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a7088: 0x10a7088: lui   a1, 0x0
+// 0x010a76d0: 0x10a76d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a708c: 0x10a708c: addiu s0, sp, 16
+// 0x010a76d4: 0x10a76d4: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a7090: 0x10a7090: addu  a0, s0, zero
+// 0x010a76d8: 0x10a76d8: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7094: 0x10a7094: addiu a1, a1, 18416
+// 0x010a76dc: 0x10a76dc: addiu a1, a1, 18416
 	ldloc.2
 	ldc.i4 18416
 	add
 	stloc.2
-// 0x010a7098: 0x10a7098: sw    ra, 36(sp)
-// 0x010a709c: 0x10a709c: jal   0x1001800 addiu a2, zero, 16
+// 0x010a76e0: 0x10a76e0: sw    ra, 36(sp)
+// 0x010a76e4: 0x10a76e4: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -6221,13 +6221,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a70a4: 0x10a70a4: lui   a1, 0x0
+// 0x010a76ec: 0x10a76ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a70a8: 0x10a70a8: addu  a0, s0, zero
+// 0x010a76f0: 0x10a76f0: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a70ac: 0x10a70ac: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a76f4: 0x10a76f4: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6237,18 +6237,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a70b4: 0x10a70b4: lw    ra, 36(sp)
-// 0x010a70b8: 0x10a70b8: sltu  v0, zero, v0
+// 0x010a76fc: 0x10a76fc: lw    ra, 36(sp)
+// 0x010a7700: 0x10a7700: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a70bc: 0x10a70bc: lw    s0, 32(sp)
+// 0x010a7704: 0x10a7704: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6257,7 +6257,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a70c0: 0x10a70c0: jr    ra addiu sp, sp, 40
+// 0x010a7708: 0x10a7708: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6269,7 +6269,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_ok_10a70c8(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_10a7710(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s5,int32 s3,int32 s4,int32 s6,int32 s7,int32 s8,int32 s2,int32 ra)
@@ -6331,13 +6331,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a70c8: 0x10a70c8: addiu sp, sp, -288
+// 0x010a7710: 0x10a7710: addiu sp, sp, -288
 	ldloc.0
 	ldc.i4 -288
 	add
 	stloc.0
-// 0x010a70cc: 0x10a70cc: sw    ra, 284(sp)
-// 0x010a70d0: 0x10a70d0: sw    s8, 280(sp)
+// 0x010a7714: 0x10a7714: sw    ra, 284(sp)
+// 0x010a7718: 0x10a7718: sw    s8, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6346,7 +6346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a70d4: 0x10a70d4: sw    s7, 276(sp)
+// 0x010a771c: 0x10a771c: sw    s7, 276(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6355,7 +6355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a70d8: 0x10a70d8: sw    s6, 272(sp)
+// 0x010a7720: 0x10a7720: sw    s6, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6364,7 +6364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a70dc: 0x10a70dc: sw    s5, 268(sp)
+// 0x010a7724: 0x10a7724: sw    s5, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6373,7 +6373,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a70e0: 0x10a70e0: sw    s4, 264(sp)
+// 0x010a7728: 0x10a7728: sw    s4, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6382,7 +6382,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a70e4: 0x10a70e4: sw    s3, 260(sp)
+// 0x010a772c: 0x10a772c: sw    s3, 260(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6391,7 +6391,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a70e8: 0x10a70e8: sw    s2, 256(sp)
+// 0x010a7730: 0x10a7730: sw    s2, 256(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6400,7 +6400,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a70ec: 0x10a70ec: sw    s1, 252(sp)
+// 0x010a7734: 0x10a7734: sw    s1, 252(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6409,7 +6409,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a70f0: 0x10a70f0: jal   0x10140b0 sw    s0, 248(sp)
+// 0x010a7738: 0x10a7738: jal   0x10140c0 sw    s0, 248(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6423,20 +6423,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a70f8: 0x10a70f8: beq   v0, zero, 0x10a7150 lui   s0, 0x20000
+// 0x010a7740: 0x10a7740: beq   v0, zero, 0x10a7798 lui   s0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 8
-	brfalse L_10a7150
+	brfalse L_10a7798
 // --- basic block ---
-// 0x010a7100: 0x10a7100: jal   0x10947ac addiu a0, s0, 7956
+// 0x010a7748: 0x10a7748: jal   0x1094dd0 addiu a0, s0, 8420
 	ldloc 8
-	ldc.i4 7956
+	ldc.i4 8420
 	add
 	stloc.1
 	ldloc.0
@@ -6444,18 +6444,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7108: 0x10a7108: lui   a0, 0x0
+// 0x010a7750: 0x10a7750: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a710c: 0x10a710c: addu  a1, v0, zero
+// 0x010a7754: 0x10a7754: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7110: 0x10a7110: jal   0x100e5c0 addiu a0, a0, 1860
+// 0x010a7758: 0x10a7758: jal   0x100e5d0 addiu a0, a0, 1860
 	ldloc.1
 	ldc.i4 1860
 	add
@@ -6465,14 +6465,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7118: 0x10a7118: jal   0x10947ac addiu a0, s0, 7956
+// 0x010a7760: 0x10a7760: jal   0x1094dd0 addiu a0, s0, 8420
 	ldloc 8
-	ldc.i4 7956
+	ldc.i4 8420
 	add
 	stloc.1
 	ldloc.0
@@ -6480,24 +6480,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7120: 0x10a7120: lui   v1, 0x80000
-	ldc.i4 524288
+// 0x010a7768: 0x10a7768: lui   v1, 0x90000
+	ldc.i4 589824
 	stloc 6
-// 0x010a7124: 0x10a7124: lw    a1, 32632(v1)
+// 0x010a776c: 0x10a776c: lw    a1, -32440(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8158
+	ldc.i4 -8110
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a7128: 0x10a7128: jal   0x1001c08 addu  a0, v0, zero
+// 0x010a7770: 0x10a7770: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6510,46 +6510,46 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7130: 0x10a7130: bne   v0, zero, 0x10a7148 sll   zero, zero, 0
+// 0x010a7778: 0x10a7778: bne   v0, zero, 0x10a7790 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a7148
+	brtrue L_10a7790
 // --- basic block ---
-// 0x010a7138: 0x10a7138: jal   0x10140e4 sll   zero, zero, 0
+// 0x010a7780: 0x10a7780: jal   0x10140f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_mode_10140e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_mode_10140f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7140: 0x10a7140: j	 0x10a7154 lui   a0, 0x20000
+// 0x010a7788: 0x10a7788: j	 0x10a779c lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a7154
+	br L_10a779c
 // --- basic block ---
-L_10a7148:
-// 0x010a7148: 0x10a7148: jal   0x10141e4 sll   zero, zero, 0
+L_10a7790:
+// 0x010a7790: 0x10a7790: jal   0x10141f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_mode_kill_timer_10141e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_mode_kill_timer_10141f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a7150:
-// 0x010a7150: 0x10a7150: lui   a0, 0x20000
+L_10a7798:
+// 0x010a7798: 0x10a7798: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a7154:
-// 0x010a7154: 0x10a7154: jal   0x10947ac addiu a0, a0, 7972
+L_10a779c:
+// 0x010a779c: 0x10a779c: jal   0x1094dd0 addiu a0, a0, 8436
 	ldloc.1
-	ldc.i4 7972
+	ldc.i4 8436
 	add
 	stloc.1
 	ldloc.0
@@ -6557,23 +6557,23 @@ L_10a7154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a715c: 0x10a715c: lui   s1, 0x0
+// 0x010a77a4: 0x10a77a4: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010a7160: 0x10a7160: addiu a0, s1, 18416
+// 0x010a77a8: 0x10a77a8: addiu a0, s1, 18416
 	ldloc 9
 	ldc.i4 18416
 	add
 	stloc.1
-// 0x010a7164: 0x10a7164: addu  a1, v0, zero
+// 0x010a77ac: 0x10a77ac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7168: 0x10a7168: jal   0x100e7f4 addu  s0, v0, zero
+// 0x010a77b0: 0x10a77b0: jal   0x100e804 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6581,21 +6581,21 @@ L_10a7154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7170: 0x10a7170: bne   v0, zero, 0x10a718c sll   zero, zero, 0
+// 0x010a77b8: 0x10a77b8: bne   v0, zero, 0x10a77d4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a718c
+	brtrue L_10a77d4
 // --- basic block ---
-// 0x010a7178: 0x10a7178: addiu a0, s1, 18416
+// 0x010a77c0: 0x10a77c0: addiu a0, s1, 18416
 	ldloc 9
 	ldc.i4 18416
 	add
 	stloc.1
-// 0x010a717c: 0x10a717c: jal   0x100e5c0 addu  a1, s0, zero
+// 0x010a77c4: 0x10a77c4: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -6603,29 +6603,29 @@ L_10a7154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7184: 0x10a7184: jal   0x106e298 sll   zero, zero, 0
+// 0x010a77cc: 0x10a77cc: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a718c:
-// 0x010a718c: 0x10a718c: lui   a0, 0x20000
+L_10a77d4:
+// 0x010a77d4: 0x10a77d4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7190: 0x10a7190: jal   0x10947ac addiu a0, a0, 7984
+// 0x010a77d8: 0x10a77d8: jal   0x1094dd0 addiu a0, a0, 8448
 	ldloc.1
-	ldc.i4 7984
+	ldc.i4 8448
 	add
 	stloc.1
 	ldloc.0
@@ -6633,18 +6633,18 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7198: 0x10a7198: lui   a0, 0x0
+// 0x010a77e0: 0x10a77e0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a719c: 0x10a719c: addu  a1, v0, zero
+// 0x010a77e4: 0x10a77e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a71a0: 0x10a71a0: jal   0x100e5c0 addiu a0, a0, 18448
+// 0x010a77e8: 0x10a77e8: jal   0x100e5d0 addiu a0, a0, 18448
 	ldloc.1
 	ldc.i4 18448
 	add
@@ -6654,17 +6654,17 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a71a8: 0x10a71a8: lui   a0, 0x20000
+// 0x010a77f0: 0x10a77f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a71ac: 0x10a71ac: jal   0x10947ac addiu a0, a0, 7996
+// 0x010a77f4: 0x10a77f4: jal   0x1094dd0 addiu a0, a0, 8460
 	ldloc.1
-	ldc.i4 7996
+	ldc.i4 8460
 	add
 	stloc.1
 	ldloc.0
@@ -6672,18 +6672,18 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a71b4: 0x10a71b4: lui   a0, 0x0
+// 0x010a77fc: 0x10a77fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a71b8: 0x10a71b8: addu  a1, v0, zero
+// 0x010a7800: 0x10a7800: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a71bc: 0x10a71bc: jal   0x100e5c0 addiu a0, a0, 18432
+// 0x010a7804: 0x10a7804: jal   0x100e5d0 addiu a0, a0, 18432
 	ldloc.1
 	ldc.i4 18432
 	add
@@ -6693,17 +6693,17 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a71c4: 0x10a71c4: lui   a0, 0x20000
+// 0x010a780c: 0x10a780c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a71c8: 0x10a71c8: jal   0x10947ac addiu a0, a0, 8008
+// 0x010a7810: 0x10a7810: jal   0x1094dd0 addiu a0, a0, 8472
 	ldloc.1
-	ldc.i4 8008
+	ldc.i4 8472
 	add
 	stloc.1
 	ldloc.0
@@ -6711,23 +6711,23 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a71d0: 0x10a71d0: lui   a0, 0x0
+// 0x010a7818: 0x10a7818: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a71d4: 0x10a71d4: addu  a1, v0, zero
+// 0x010a781c: 0x10a781c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a71d8: 0x10a71d8: addiu a0, a0, 18496
+// 0x010a7820: 0x10a7820: addiu a0, a0, 18496
 	ldloc.1
 	ldc.i4 18496
 	add
 	stloc.1
-// 0x010a71dc: 0x10a71dc: jal   0x100e5c0 lui   s0, 0x20000
+// 0x010a7824: 0x10a7824: jal   0x100e5d0 lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
 	ldloc.0
@@ -6735,14 +6735,14 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a71e4: 0x10a71e4: jal   0x10947ac addiu a0, s0, 8024
+// 0x010a782c: 0x10a782c: jal   0x1094dd0 addiu a0, s0, 8488
 	ldloc 8
-	ldc.i4 8024
+	ldc.i4 8488
 	add
 	stloc.1
 	ldloc.0
@@ -6750,18 +6750,18 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a71ec: 0x10a71ec: lui   a0, 0x0
+// 0x010a7834: 0x10a7834: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a71f0: 0x10a71f0: addu  a1, v0, zero
+// 0x010a7838: 0x10a7838: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a71f4: 0x10a71f4: jal   0x100e5c0 addiu a0, a0, 18512
+// 0x010a783c: 0x10a783c: jal   0x100e5d0 addiu a0, a0, 18512
 	ldloc.1
 	ldc.i4 18512
 	add
@@ -6771,14 +6771,14 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a71fc: 0x10a71fc: jal   0x10947ac addiu a0, s0, 8024
+// 0x010a7844: 0x10a7844: jal   0x1094dd0 addiu a0, s0, 8488
 	ldloc 8
-	ldc.i4 8024
+	ldc.i4 8488
 	add
 	stloc.1
 	ldloc.0
@@ -6786,20 +6786,20 @@ L_10a718c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7204: 0x10a7204: lui   a1, 0x20000
+// 0x010a784c: 0x10a784c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a7208: 0x10a7208: addu  a0, v0, zero
+// 0x010a7850: 0x10a7850: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a720c: 0x10a720c: jal   0x1001b14 addiu a1, a1, 9464
+// 0x010a7854: 0x10a7854: jal   0x1001b14 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.1
@@ -6807,35 +6807,35 @@ L_10a718c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a7214: 0x10a7214: bne   v0, zero, 0x10a7224 addiu s3, sp, 140
+// 0x010a785c: 0x10a785c: bne   v0, zero, 0x10a786c addiu s3, sp, 140
 	ldloc 5
 	ldloc.0
 	ldc.i4 140
 	add
 	stloc 11
-	brtrue L_10a7224
+	brtrue L_10a786c
 // --- basic block ---
-// 0x010a721c: 0x10a721c: jal   0x1075ba0 sll   zero, zero, 0
+// 0x010a7864: 0x10a7864: jal   0x10761c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RealtimeBonus_Term_1075ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RealtimeBonus_Term_10761c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a7224:
-// 0x010a7224: 0x10a7224: lui   a1, 0x10000
+L_10a786c:
+// 0x010a786c: 0x10a786c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a7228: 0x10a7228: addiu a1, a1, 18500
+// 0x010a7870: 0x10a7870: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a722c: 0x10a722c: jal   0x1001b68 addu  a0, s3, zero
+// 0x010a7874: 0x10a7874: jal   0x1001b68 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -6845,58 +6845,58 @@ L_10a7224:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7234: 0x10a7234: lui   s0, 0x20000
+// 0x010a787c: 0x10a787c: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010a7238: 0x10a7238: lui   s8, 0x20000
+// 0x010a7880: 0x10a7880: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 15
-// 0x010a723c: 0x10a723c: lui   s7, 0x20000
+// 0x010a7884: 0x10a7884: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x010a7240: 0x10a7240: lui   s6, 0x20000
+// 0x010a7888: 0x10a7888: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x010a7244: 0x10a7244: lui   s5, 0x20000
-	ldc.i4 131072
+// 0x010a788c: 0x10a788c: lui   s5, 0x10000
+	ldc.i4 65536
 	stloc 10
-// 0x010a7248: 0x10a7248: lui   s4, 0x10000
+// 0x010a7890: 0x10a7890: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x010a724c: 0x10a724c: addiu v0, zero, 1
+// 0x010a7894: 0x10a7894: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a7250: 0x10a7250: addiu s0, s0, 29748
+// 0x010a7898: 0x10a7898: addiu s0, s0, 30212
 	ldloc 8
-	ldc.i4 29748
+	ldc.i4 30212
 	add
 	stloc 8
-// 0x010a7254: 0x10a7254: addiu s8, s8, 8036
+// 0x010a789c: 0x10a789c: addiu s8, s8, 8500
 	ldloc 15
-	ldc.i4 8036
+	ldc.i4 8500
 	add
 	stloc 15
-// 0x010a7258: 0x10a7258: addiu s7, s7, 29712
+// 0x010a78a0: 0x10a78a0: addiu s7, s7, 30176
 	ldloc 14
-	ldc.i4 29712
+	ldc.i4 30176
 	add
 	stloc 14
-// 0x010a725c: 0x10a725c: addiu s6, s6, 8044
+// 0x010a78a4: 0x10a78a4: addiu s6, s6, 8508
 	ldloc 13
-	ldc.i4 8044
+	ldc.i4 8508
 	add
 	stloc 13
-// 0x010a7260: 0x10a7260: addiu s5, s5, -13884
+// 0x010a78a8: 0x10a78a8: addiu s5, s5, 19088
 	ldloc 10
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc 10
-// 0x010a7264: 0x10a7264: addiu s4, s4, -22604
+// 0x010a78ac: 0x10a78ac: addiu s4, s4, -22604
 	ldloc 12
 	ldc.i4 -22604
 	add
 	stloc 12
-// 0x010a7268: 0x10a7268: sw    v0, 240(sp)
+// 0x010a78b0: 0x10a78b0: sw    v0, 240(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6905,27 +6905,27 @@ L_10a7224:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a726c: 0x10a726c: addiu s2, sp, 24
+// 0x010a78b4: 0x10a78b4: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 16
-// 0x010a7270: 0x10a7270: addiu s1, sp, 40
+// 0x010a78b8: 0x10a78b8: addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 9
-// 0x010a7274: 0x10a7274: lui   a1, 0x0
+// 0x010a78bc: 0x10a78bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_10a7278:
-// 0x010a7278: 0x10a7278: addiu a2, zero, 16
+L_10a78c0:
+// 0x010a78c0: 0x10a78c0: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a727c: 0x10a727c: addu  a0, s2, zero
+// 0x010a78c4: 0x10a78c4: addu  a0, s2, zero
 	ldloc 16
 	stloc.1
-// 0x010a7280: 0x10a7280: jal   0x1001800 addiu a1, a1, 18480
+// 0x010a78c8: 0x10a78c8: jal   0x1001800 addiu a1, a1, 18480
 	ldloc.2
 	ldc.i4 18480
 	add
@@ -6939,13 +6939,13 @@ L_10a7278:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7288: 0x10a7288: lui   a1, 0x0
+// 0x010a78d0: 0x10a78d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a728c: 0x10a728c: addu  a0, s2, zero
+// 0x010a78d4: 0x10a78d4: addu  a0, s2, zero
 	ldloc 16
 	stloc.1
-// 0x010a7290: 0x10a7290: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a78d8: 0x10a78d8: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6955,22 +6955,22 @@ L_10a7278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7298: 0x10a7298: addu  a0, s1, zero
+// 0x010a78e0: 0x10a78e0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a729c: 0x10a729c: beq   v0, zero, 0x10a73a8 addu  a1, s8, zero
+// 0x010a78e4: 0x10a78e4: beq   v0, zero, 0x10a79f0 addu  a1, s8, zero
 	ldloc 5
 	ldloc 15
 	stloc.2
-	brfalse L_10a73a8
+	brfalse L_10a79f0
 // --- basic block ---
-L_10a72a4:
-// 0x010a72a4: 0x10a72a4: jal   0x1001b68 sll   zero, zero, 0
+L_10a78ec:
+// 0x010a78ec: 0x10a78ec: jal   0x1001b68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcpy_1001b68(int32,int32)
@@ -6978,34 +6978,34 @@ L_10a72a4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a72ac: 0x10a72ac: lw    a3, 0(s0)
+// 0x010a78f4: 0x10a78f4: lw    a3, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010a72b0: 0x10a72b0: addu  a0, s1, zero
+// 0x010a78f8: 0x10a78f8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a72b4: 0x10a72b4: sll   v0, a3, 2
+// 0x010a78fc: 0x10a78fc: sll   v0, a3, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010a72b8: 0x10a72b8: addu  v0, v0, s7
+// 0x010a7900: 0x10a7900: addu  v0, v0, s7
 	ldloc 5
 	ldloc 14
 	add
 	stloc 5
-// 0x010a72bc: 0x10a72bc: lw    a1, 0(v0)
+// 0x010a7904: 0x10a7904: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010a72c0: 0x10a72c0: jal   0x1001ac4 sw    a3, 244(sp)
+// 0x010a7908: 0x10a7908: jal   0x1001ac4 sw    a3, 244(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7019,10 +7019,10 @@ L_10a72a4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a72c8: 0x10a72c8: addu  a1, s6, zero
+// 0x010a7910: 0x10a7910: addu  a1, s6, zero
 	ldloc 13
 	stloc.2
-// 0x010a72cc: 0x10a72cc: jal   0x1001ac4 addu  a0, s1, zero
+// 0x010a7914: 0x10a7914: jal   0x1001ac4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -7030,7 +7030,7 @@ L_10a72a4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a72d4: 0x10a72d4: jal   0x10947ac addu  a0, s1, zero
+// 0x010a791c: 0x10a791c: jal   0x1094dd0 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7038,24 +7038,24 @@ L_10a72a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a72dc: 0x10a72dc: lui   v1, 0x80000
-	ldc.i4 524288
+// 0x010a7924: 0x10a7924: lui   v1, 0x90000
+	ldc.i4 589824
 	stloc 6
-// 0x010a72e0: 0x10a72e0: lw    a1, 32632(v1)
+// 0x010a7928: 0x10a7928: lw    a1, -32440(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8158
+	ldc.i4 -8110
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a72e4: 0x10a72e4: jal   0x1001c08 addu  a0, v0, zero
+// 0x010a792c: 0x10a792c: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7068,7 +7068,7 @@ L_10a72a4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a72ec: 0x10a72ec: lw    a3, 244(sp)
+// 0x010a7934: 0x10a7934: lw    a3, 244(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7077,13 +7077,13 @@ L_10a72a4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a72f0: 0x10a72f0: beq   v0, zero, 0x10a733c lui   v1, 0x20000
+// 0x010a7938: 0x10a7938: beq   v0, zero, 0x10a7984 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 6
-	brfalse L_10a733c
+	brfalse L_10a7984
 // --- basic block ---
-// 0x010a72f8: 0x10a72f8: lw    v0, 240(sp)
+// 0x010a7940: 0x10a7940: lw    v0, 240(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7092,17 +7092,17 @@ L_10a72a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a72fc: 0x10a72fc: sll   zero, zero, 0
-// 0x010a7300: 0x10a7300: bne   v0, zero, 0x10a731c addu  a2, s5, zero
+// 0x010a7944: 0x10a7944: sll   zero, zero, 0
+// 0x010a7948: 0x10a7948: bne   v0, zero, 0x10a7964 addu  a2, s5, zero
 	ldloc 5
 	ldloc 10
 	stloc.3
-	brtrue L_10a731c
+	brtrue L_10a7964
 // --- basic block ---
-// 0x010a7308: 0x10a7308: addu  a0, s3, zero
+// 0x010a7950: 0x10a7950: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010a730c: 0x10a730c: jal   0x1001ac4 addu  a1, s4, zero
+// 0x010a7954: 0x10a7954: jal   0x1001ac4 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
@@ -7110,7 +7110,7 @@ L_10a72a4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a7314: 0x10a7314: lw    a3, 244(sp)
+// 0x010a795c: 0x10a795c: lw    a3, 244(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7119,16 +7119,16 @@ L_10a72a4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a7318: 0x10a7318: addu  a2, s5, zero
+// 0x010a7960: 0x10a7960: addu  a2, s5, zero
 	ldloc 10
 	stloc.3
-L_10a731c:
-// 0x010a731c: 0x10a731c: addiu a0, sp, 16
+L_10a7964:
+// 0x010a7964: 0x10a7964: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010a7320: 0x10a7320: jal   0x1000f9c addiu a1, zero, 5
+// 0x010a7968: 0x10a7968: jal   0x1000f9c addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
 	ldloc.0
@@ -7141,10 +7141,10 @@ L_10a731c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7328: 0x10a7328: addu  a0, s3, zero
+// 0x010a7970: 0x10a7970: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010a732c: 0x10a732c: jal   0x1001ac4 addiu a1, sp, 16
+// 0x010a7974: 0x10a7974: jal   0x1001ac4 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -7154,7 +7154,7 @@ L_10a731c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a7334: 0x10a7334: sw    zero, 240(sp)
+// 0x010a797c: 0x10a797c: sw    zero, 240(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7163,37 +7163,37 @@ L_10a731c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7338: 0x10a7338: lui   v1, 0x20000
+// 0x010a7980: 0x10a7980: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-L_10a733c:
-// 0x010a733c: 0x10a733c: addiu s0, s0, 4
+L_10a7984:
+// 0x010a7984: 0x10a7984: addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_10a7340:
-// 0x010a7340: 0x10a7340: addiu v1, v1, 29772
+L_10a7988:
+// 0x010a7988: 0x10a7988: addiu v1, v1, 30236
 	ldloc 6
-	ldc.i4 29772
+	ldc.i4 30236
 	add
 	stloc 6
-// 0x010a7344: 0x10a7344: bne   s0, v1, 0x10a7278 lui   a1, 0x0
+// 0x010a798c: 0x10a798c: bne   s0, v1, 0x10a78c0 lui   a1, 0x0
 	ldloc 8
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_10a7278
+	bne.un L_10a78c0
 // --- basic block ---
-// 0x010a734c: 0x10a734c: lui   a0, 0x0
+// 0x010a7994: 0x10a7994: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a7350: 0x10a7350: addiu a1, sp, 140
+// 0x010a7998: 0x10a7998: addiu a1, sp, 140
 	ldloc.0
 	ldc.i4 140
 	add
 	stloc.2
-// 0x010a7354: 0x10a7354: jal   0x100e5c0 addiu a0, a0, 18464
+// 0x010a799c: 0x10a799c: jal   0x100e5d0 addiu a0, a0, 18464
 	ldloc.1
 	ldc.i4 18464
 	add
@@ -7203,23 +7203,23 @@ L_10a7340:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a735c: 0x10a735c: jal   0x107b774 sll   zero, zero, 0
+// 0x010a79a4: 0x10a79a4: jal   0x107bd98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::RTAlerts_RefreshOnMap_107b774(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::RTAlerts_RefreshOnMap_107bd98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7364: 0x10a7364: jal   0x100ea50 addu  a0, zero, zero
+// 0x010a79ac: 0x10a79ac: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7227,25 +7227,25 @@ L_10a7340:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a736c: 0x10a736c: lw    ra, 284(sp)
-// 0x010a7370: 0x10a7370: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a79b4: 0x10a79b4: lw    ra, 284(sp)
+// 0x010a79b8: 0x10a79b8: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-// 0x010a7374: 0x10a7374: sw    zero, 32620(v0)
+// 0x010a79bc: 0x10a79bc: sw    zero, -32452(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8155
+	ldc.i4 -8113
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7378: 0x10a7378: lw    s8, 280(sp)
+// 0x010a79c0: 0x10a79c0: lw    s8, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7254,10 +7254,10 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a737c: 0x10a737c: addu  v0, zero, zero
+// 0x010a79c4: 0x10a79c4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a7380: 0x10a7380: lw    s7, 276(sp)
+// 0x010a79c8: 0x10a79c8: lw    s7, 276(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7266,7 +7266,7 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a7384: 0x10a7384: lw    s6, 272(sp)
+// 0x010a79cc: 0x10a79cc: lw    s6, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7275,7 +7275,7 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a7388: 0x10a7388: lw    s5, 268(sp)
+// 0x010a79d0: 0x10a79d0: lw    s5, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7284,7 +7284,7 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a738c: 0x10a738c: lw    s4, 264(sp)
+// 0x010a79d4: 0x10a79d4: lw    s4, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7293,7 +7293,7 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a7390: 0x10a7390: lw    s3, 260(sp)
+// 0x010a79d8: 0x10a79d8: lw    s3, 260(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7302,7 +7302,7 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a7394: 0x10a7394: lw    s2, 256(sp)
+// 0x010a79dc: 0x10a79dc: lw    s2, 256(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7311,7 +7311,7 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a7398: 0x10a7398: lw    s1, 252(sp)
+// 0x010a79e0: 0x10a79e0: lw    s1, 252(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7320,7 +7320,7 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a739c: 0x10a739c: lw    s0, 248(sp)
+// 0x010a79e4: 0x10a79e4: lw    s0, 248(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7329,37 +7329,37 @@ L_10a7340:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a73a0: 0x10a73a0: jr    ra addiu sp, sp, 288
+// 0x010a79e8: 0x10a79e8: jr    ra addiu sp, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10a73a8:
-// 0x010a73a8: 0x10a73a8: lw    v0, 0(s0)
+L_10a79f0:
+// 0x010a79f0: 0x10a79f0: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010a73ac: 0x10a73ac: addiu v1, zero, 7
+// 0x010a79f4: 0x10a79f4: addiu v1, zero, 7
 	ldc.i4.7
 	stloc 6
-// 0x010a73b0: 0x10a73b0: bne   v0, v1, 0x10a72a4 lui   v1, 0x20000
+// 0x010a79f8: 0x10a79f8: bne   v0, v1, 0x10a78ec lui   v1, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	bne.un L_10a72a4
+	bne.un L_10a78ec
 // --- basic block ---
-// 0x010a73b8: 0x10a73b8: j	 0x10a7340 addiu s0, s0, 4
+// 0x010a7a00: 0x10a7a00: j	 0x10a7988 addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	br L_10a7340
+	br L_10a7988
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl125.j b/converted/Cibyl125.j
index 4a7bc5b..f4d39f2 100644
--- a/converted/Cibyl125.j
+++ b/converted/Cibyl125.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl125::.ctor
 
-.method public static int32 on_ok_softkey_10a73c0(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_softkey_10a7a08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -76,24 +76,24 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a73c0: 0x10a73c0: addiu sp, sp, -24
+// 0x010a7a08: 0x10a7a08: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a73c4: 0x10a73c4: sw    ra, 20(sp)
-// 0x010a73c8: 0x10a73c8: jal   0x10a70c8 sll   zero, zero, 0
+// 0x010a7a0c: 0x10a7a0c: sw    ra, 20(sp)
+// 0x010a7a10: 0x10a7a10: jal   0x10a7710 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::on_ok_10a70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::on_ok_10a7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a73d0: 0x10a73d0: jal   0x1094a94 addiu a0, zero, 1
+// 0x010a7a18: 0x10a7a18: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -101,16 +101,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a73d8: 0x10a73d8: lw    ra, 20(sp)
-// 0x010a73dc: 0x10a73dc: addu  v0, zero, zero
+// 0x010a7a20: 0x10a7a20: lw    ra, 20(sp)
+// 0x010a7a24: 0x10a7a24: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a73e0: 0x10a73e0: jr    ra addiu sp, sp, 24
+// 0x010a7a28: 0x10a7a28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -122,7 +122,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_close_dialog_10a73e8(int32,int32,int32,int32,int32)
+.method public static int32 on_close_dialog_10a7a30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -157,23 +157,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a73e8: 0x10a73e8: addiu sp, sp, -24
+// 0x010a7a30: 0x10a7a30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a73ec: 0x10a73ec: addiu v0, zero, 1
+// 0x010a7a34: 0x10a7a34: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a73f0: 0x10a73f0: bne   a0, v0, 0x10a7404 sw    ra, 20(sp)
+// 0x010a7a38: 0x10a7a38: bne   a0, v0, 0x10a7a4c sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_10a7404
+	bne.un L_10a7a4c
 // --- basic block ---
-// 0x010a73f8: 0x10a73f8: addu  a0, zero, zero
+// 0x010a7a40: 0x10a7a40: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a73fc: 0x10a73fc: jal   0x10a70c8 addu  a1, zero, zero
+// 0x010a7a44: 0x10a7a44: jal   0x10a7710 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -181,15 +181,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::on_ok_10a70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::on_ok_10a7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a7404:
-// 0x010a7404: 0x10a7404: lw    ra, 20(sp)
-// 0x010a7408: 0x10a7408: sll   zero, zero, 0
-// 0x010a740c: 0x10a740c: jr    ra addiu sp, sp, 24
+L_10a7a4c:
+// 0x010a7a4c: 0x10a7a4c: lw    ra, 20(sp)
+// 0x010a7a50: 0x10a7a50: sll   zero, zero, 0
+// 0x010a7a54: 0x10a7a54: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -201,7 +201,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 map_scheme_callback_10a7414(int32,int32,int32,int32,int32)
+.method public static int32 map_scheme_callback_10a7a5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 ra)
@@ -239,26 +239,26 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a7414: 0x10a7414: addiu sp, sp, -40
+// 0x010a7a5c: 0x10a7a5c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a7418: 0x10a7418: lw    v1, 0(a0)
+// 0x010a7a60: 0x10a7a60: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010a741c: 0x10a741c: lw    v0, 0(a1)
+// 0x010a7a64: 0x10a7a64: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010a7420: 0x10a7420: sw    s0, 32(sp)
+// 0x010a7a68: 0x10a7a68: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -267,16 +267,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a7424: 0x10a7424: lui   a3, 0x20000
+// 0x010a7a6c: 0x10a7a6c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a7428: 0x10a7428: addu  s0, a1, zero
+// 0x010a7a70: 0x10a7a70: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010a742c: 0x10a742c: lui   a1, 0x20000
+// 0x010a7a74: 0x10a7a74: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a7430: 0x10a7430: sw    a2, 20(sp)
+// 0x010a7a78: 0x10a7a78: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -285,23 +285,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010a7434: 0x10a7434: addiu a1, a1, 8052
+// 0x010a7a7c: 0x10a7a7c: addiu a1, a1, 8516
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8516
 	add
 	stloc.2
-// 0x010a7438: 0x10a7438: addiu a3, a3, 8088
+// 0x010a7a80: 0x10a7a80: addiu a3, a3, 8552
 	ldloc 4
-	ldc.i4 8088
+	ldc.i4 8552
 	add
 	stloc 4
-// 0x010a743c: 0x10a743c: addiu a2, zero, 181
+// 0x010a7a84: 0x10a7a84: addiu a2, zero, 181
 	ldc.i4 181
 	stloc.3
-// 0x010a7440: 0x10a7440: addiu a0, zero, 2
+// 0x010a7a88: 0x10a7a88: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a7444: 0x10a7444: sw    v1, 16(sp)
+// 0x010a7a8c: 0x10a7a8c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -310,8 +310,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7448: 0x10a7448: sw    ra, 36(sp)
-// 0x010a744c: 0x10a744c: jal   0x100449c sw    v0, 24(sp)
+// 0x010a7a90: 0x10a7a90: sw    ra, 36(sp)
+// 0x010a7a94: 0x10a7a94: jal   0x100449c sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -330,7 +330,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010a7454: 0x10a7454: jal   0x10145d4 addu  a0, s0, zero
+// 0x010a7a9c: 0x10a7a9c: jal   0x10145e4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -338,23 +338,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_scheme_10145d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_scheme_10145e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010a745c: 0x10a745c: addu  v1, zero, zero
+// 0x010a7aa4: 0x10a7aa4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010a7460: 0x10a7460: cibyl_sysc_arg 0x3
+// 0x010a7aa8: 0x10a7aa8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010a7464: 0x10a7464: cibyl_sysc 0x2292
+// 0x010a7aac: 0x10a7aac: cibyl_sysc 0x2292
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_closeDialog(int32)
-// 0x010a7468: 0x10a7468: addu  v1, v0, zero
+// 0x010a7ab0: 0x10a7ab0: addu  v1, v0, zero
 	ldloc 7
 	stloc 6
-// 0x010a746c: 0x10a746c: lw    ra, 36(sp)
-// 0x010a7470: 0x10a7470: lw    s0, 32(sp)
+// 0x010a7ab4: 0x10a7ab4: lw    ra, 36(sp)
+// 0x010a7ab8: 0x10a7ab8: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -363,7 +363,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a7474: 0x10a7474: jr    ra addiu sp, sp, 40
+// 0x010a7abc: 0x10a7abc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -375,7 +375,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_map_settings_init_10a747c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_init_10a7ac4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s2,int32 v1,int32 v0,int32 s1,int32 ra)
@@ -419,35 +419,35 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a747c: 0x10a747c: lui   a1, 0x20000
+// 0x010a7ac4: 0x10a7ac4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a7480: 0x10a7480: lui   a3, 0x20000
+// 0x010a7ac8: 0x10a7ac8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a7484: 0x10a7484: addiu sp, sp, -40
+// 0x010a7acc: 0x10a7acc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a7488: 0x10a7488: addiu a1, a1, 8052
+// 0x010a7ad0: 0x10a7ad0: addiu a1, a1, 8516
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8516
 	add
 	stloc.2
-// 0x010a748c: 0x10a748c: addiu a3, a3, 8224
+// 0x010a7ad4: 0x10a7ad4: addiu a3, a3, 8688
 	ldloc 4
-	ldc.i4 8224
+	ldc.i4 8688
 	add
 	stloc 4
-// 0x010a7490: 0x10a7490: addiu a0, zero, 1
+// 0x010a7ad8: 0x10a7ad8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a7494: 0x10a7494: addiu a2, zero, 116
+// 0x010a7adc: 0x10a7adc: addiu a2, zero, 116
 	ldc.i4.s 116
 	stloc.3
-// 0x010a7498: 0x10a7498: sw    ra, 36(sp)
-// 0x010a749c: 0x10a749c: sw    s2, 32(sp)
+// 0x010a7ae0: 0x10a7ae0: sw    ra, 36(sp)
+// 0x010a7ae4: 0x10a7ae4: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -456,7 +456,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a74a0: 0x10a74a0: sw    s1, 28(sp)
+// 0x010a7ae8: 0x10a7ae8: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -465,7 +465,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a74a4: 0x10a74a4: sw    s0, 24(sp)
+// 0x010a7aec: 0x10a7aec: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -474,7 +474,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a74a8: 0x10a74a8: jal   0x100449c lui   s1, 0x20000
+// 0x010a7af0: 0x10a7af0: jal   0x100449c lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 10
 	ldloc.0
@@ -487,54 +487,54 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a74b0: 0x10a74b0: lui   s2, 0x0
+// 0x010a7af8: 0x10a7af8: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010a74b4: 0x10a74b4: lui   s0, 0x20000
+// 0x010a7afc: 0x10a7afc: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010a74b8: 0x10a74b8: lui   a1, 0x0
+// 0x010a7b00: 0x10a7b00: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a74bc: 0x10a74bc: addiu v1, zero, 1
+// 0x010a7b04: 0x10a7b04: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010a74c0: 0x10a74c0: addiu s0, s0, 9464
+// 0x010a7b08: 0x10a7b08: addiu s0, s0, 9928
 	ldloc 6
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 6
-// 0x010a74c4: 0x10a74c4: addiu a0, s1, -26888
+// 0x010a7b0c: 0x10a7b0c: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a74c8: 0x10a74c8: addiu a3, s2, 20820
+// 0x010a7b10: 0x10a7b10: addiu a3, s2, 20820
 	ldloc 7
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x010a74cc: 0x10a74cc: addiu a1, a1, 18368
+// 0x010a7b14: 0x10a7b14: addiu a1, a1, 18368
 	ldloc.2
 	ldc.i4 18368
 	add
 	stloc.2
-// 0x010a74d0: 0x10a74d0: addu  a2, zero, zero
+// 0x010a7b18: 0x10a7b18: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a74d4: 0x10a74d4: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a7b1c: 0x10a7b1c: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 9
-// 0x010a74d8: 0x10a74d8: sw    v1, 32616(v0)
+// 0x010a7b20: 0x10a7b20: sw    v1, -32456(v0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 8154
+	ldc.i4 -8114
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a74dc: 0x10a74dc: sw    s0, 16(sp)
+// 0x010a7b24: 0x10a7b24: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -543,7 +543,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a74e0: 0x10a74e0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7b28: 0x10a7b28: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -557,36 +557,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a74e8: 0x10a74e8: lui   a1, 0x0
+// 0x010a7b30: 0x10a7b30: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a74ec: 0x10a74ec: addiu s2, s2, 20820
+// 0x010a7b34: 0x10a7b34: addiu s2, s2, 20820
 	ldloc 7
 	ldc.i4 20820
 	add
 	stloc 7
-// 0x010a74f0: 0x10a74f0: addiu a0, s1, -26888
+// 0x010a7b38: 0x10a7b38: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a74f4: 0x10a74f4: addu  a3, s0, zero
+// 0x010a7b3c: 0x10a7b3c: addu  a3, s0, zero
 	ldloc 6
 	stloc 4
-// 0x010a74f8: 0x10a74f8: addiu a1, a1, 18384
+// 0x010a7b40: 0x10a7b40: addiu a1, a1, 18384
 	ldloc.2
 	ldc.i4 18384
 	add
 	stloc.2
-// 0x010a74fc: 0x10a74fc: addu  a2, zero, zero
+// 0x010a7b44: 0x10a7b44: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7500: 0x10a7500: sw    s2, 16(sp)
+// 0x010a7b48: 0x10a7b48: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -595,7 +595,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a7504: 0x10a7504: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7b4c: 0x10a7b4c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -609,31 +609,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a750c: 0x10a750c: lui   a1, 0x0
+// 0x010a7b54: 0x10a7b54: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7510: 0x10a7510: addiu a0, s1, -26888
+// 0x010a7b58: 0x10a7b58: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a7514: 0x10a7514: addu  a3, s2, zero
+// 0x010a7b5c: 0x10a7b5c: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x010a7518: 0x10a7518: addiu a1, a1, 18400
+// 0x010a7b60: 0x10a7b60: addiu a1, a1, 18400
 	ldloc.2
 	ldc.i4 18400
 	add
 	stloc.2
-// 0x010a751c: 0x10a751c: addu  a2, zero, zero
+// 0x010a7b64: 0x10a7b64: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7520: 0x10a7520: sw    s0, 16(sp)
+// 0x010a7b68: 0x10a7b68: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -642,7 +642,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7524: 0x10a7524: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7b6c: 0x10a7b6c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -656,31 +656,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a752c: 0x10a752c: lui   a1, 0x0
+// 0x010a7b74: 0x10a7b74: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7530: 0x10a7530: addiu a0, s1, -26888
+// 0x010a7b78: 0x10a7b78: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a7534: 0x10a7534: addu  a3, s2, zero
+// 0x010a7b7c: 0x10a7b7c: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x010a7538: 0x10a7538: addiu a1, a1, 18416
+// 0x010a7b80: 0x10a7b80: addiu a1, a1, 18416
 	ldloc.2
 	ldc.i4 18416
 	add
 	stloc.2
-// 0x010a753c: 0x10a753c: addu  a2, zero, zero
+// 0x010a7b84: 0x10a7b84: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7540: 0x10a7540: sw    s0, 16(sp)
+// 0x010a7b88: 0x10a7b88: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -689,7 +689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7544: 0x10a7544: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7b8c: 0x10a7b8c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -703,31 +703,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a754c: 0x10a754c: lui   a1, 0x0
+// 0x010a7b94: 0x10a7b94: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7550: 0x10a7550: addiu a0, s1, -26888
+// 0x010a7b98: 0x10a7b98: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a7554: 0x10a7554: addu  a3, s2, zero
+// 0x010a7b9c: 0x10a7b9c: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x010a7558: 0x10a7558: addiu a1, a1, 18448
+// 0x010a7ba0: 0x10a7ba0: addiu a1, a1, 18448
 	ldloc.2
 	ldc.i4 18448
 	add
 	stloc.2
-// 0x010a755c: 0x10a755c: addu  a2, zero, zero
+// 0x010a7ba4: 0x10a7ba4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7560: 0x10a7560: sw    s0, 16(sp)
+// 0x010a7ba8: 0x10a7ba8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -736,7 +736,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7564: 0x10a7564: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7bac: 0x10a7bac: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -750,31 +750,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a756c: 0x10a756c: lui   a1, 0x0
+// 0x010a7bb4: 0x10a7bb4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7570: 0x10a7570: addiu a0, s1, -26888
+// 0x010a7bb8: 0x10a7bb8: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a7574: 0x10a7574: addu  a3, s2, zero
+// 0x010a7bbc: 0x10a7bbc: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x010a7578: 0x10a7578: addiu a1, a1, 18512
+// 0x010a7bc0: 0x10a7bc0: addiu a1, a1, 18512
 	ldloc.2
 	ldc.i4 18512
 	add
 	stloc.2
-// 0x010a757c: 0x10a757c: addu  a2, zero, zero
+// 0x010a7bc4: 0x10a7bc4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7580: 0x10a7580: sw    s0, 16(sp)
+// 0x010a7bc8: 0x10a7bc8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -783,7 +783,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7584: 0x10a7584: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7bcc: 0x10a7bcc: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -797,33 +797,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a758c: 0x10a758c: lui   a1, 0x0
+// 0x010a7bd4: 0x10a7bd4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7590: 0x10a7590: lui   a2, 0x10000
+// 0x010a7bd8: 0x10a7bd8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010a7594: 0x10a7594: addiu a0, s1, -26888
+// 0x010a7bdc: 0x10a7bdc: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a7598: 0x10a7598: addiu a1, a1, 18464
+// 0x010a7be0: 0x10a7be0: addiu a1, a1, 18464
 	ldloc.2
 	ldc.i4 18464
 	add
 	stloc.2
-// 0x010a759c: 0x10a759c: addiu a2, a2, 18500
+// 0x010a7be4: 0x10a7be4: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a75a0: 0x10a75a0: jal   0x100edb0 addu  a3, zero, zero
+// 0x010a7be8: 0x10a7be8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -831,31 +831,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a75a8: 0x10a75a8: lui   a1, 0x0
+// 0x010a7bf0: 0x10a7bf0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a75ac: 0x10a75ac: addiu a0, s1, -26888
+// 0x010a7bf4: 0x10a7bf4: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a75b0: 0x10a75b0: addu  a3, s2, zero
+// 0x010a7bf8: 0x10a7bf8: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x010a75b4: 0x10a75b4: addiu a1, a1, 18432
+// 0x010a7bfc: 0x10a7bfc: addiu a1, a1, 18432
 	ldloc.2
 	ldc.i4 18432
 	add
 	stloc.2
-// 0x010a75b8: 0x10a75b8: addu  a2, zero, zero
+// 0x010a7c00: 0x10a7c00: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a75bc: 0x10a75bc: sw    s0, 16(sp)
+// 0x010a7c04: 0x10a7c04: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -864,7 +864,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a75c0: 0x10a75c0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7c08: 0x10a7c08: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -878,31 +878,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a75c8: 0x10a75c8: lui   a1, 0x0
+// 0x010a7c10: 0x10a7c10: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a75cc: 0x10a75cc: addiu a0, s1, -26888
+// 0x010a7c14: 0x10a7c14: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a75d0: 0x10a75d0: addu  a3, s2, zero
+// 0x010a7c18: 0x10a7c18: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x010a75d4: 0x10a75d4: addiu a1, a1, 18496
+// 0x010a7c1c: 0x10a7c1c: addiu a1, a1, 18496
 	ldloc.2
 	ldc.i4 18496
 	add
 	stloc.2
-// 0x010a75d8: 0x10a75d8: addu  a2, zero, zero
+// 0x010a7c20: 0x10a7c20: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a75dc: 0x10a75dc: sw    s0, 16(sp)
+// 0x010a7c24: 0x10a7c24: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -911,7 +911,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a75e0: 0x10a75e0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a7c28: 0x10a7c28: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -925,37 +925,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a75e8: 0x10a75e8: lui   a1, 0x0
+// 0x010a7c30: 0x10a7c30: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a75ec: 0x10a75ec: lui   a0, 0x10000
+// 0x010a7c34: 0x10a7c34: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a75f0: 0x10a75f0: addu  a3, s2, zero
+// 0x010a7c38: 0x10a7c38: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x010a75f4: 0x10a75f4: addiu a1, a1, 18480
+// 0x010a7c3c: 0x10a7c3c: addiu a1, a1, 18480
 	ldloc.2
 	ldc.i4 18480
 	add
 	stloc.2
-// 0x010a75f8: 0x10a75f8: addu  a2, zero, zero
+// 0x010a7c40: 0x10a7c40: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a75fc: 0x10a75fc: addiu a0, a0, 12560
+// 0x010a7c44: 0x10a7c44: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a7600: 0x10a7600: lui   s1, 0x0
+// 0x010a7c48: 0x10a7c48: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010a7604: 0x10a7604: sw    s0, 16(sp)
+// 0x010a7c4c: 0x10a7c4c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -964,7 +964,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7608: 0x10a7608: sw    zero, 20(sp)
+// 0x010a7c50: 0x10a7c50: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -973,7 +973,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a760c: 0x10a760c: jal   0x100edf8 lui   s0, 0x0
+// 0x010a7c54: 0x10a7c54: jal   0x100ee08 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
 	ldloc.0
@@ -981,12 +981,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a7614: 0x10a7614: jal   0x101cd60 addiu a0, s1, 32116
+// 0x010a7c5c: 0x10a7c5c: jal   0x101cd70 addiu a0, s1, 32116
 	ldloc 10
 	ldc.i4 32116
 	add
@@ -996,25 +996,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a761c: 0x10a761c: lui   s2, 0x80000
-	ldc.i4 524288
+// 0x010a7c64: 0x10a7c64: lui   s2, 0x90000
+	ldc.i4 589824
 	stloc 7
-// 0x010a7620: 0x10a7620: addiu a0, s0, 32120
+// 0x010a7c68: 0x10a7c68: addiu a0, s0, 32120
 	ldloc 6
 	ldc.i4 32120
 	add
 	stloc.1
-// 0x010a7624: 0x10a7624: jal   0x101cd60 sw    v0, 32624(s2)
+// 0x010a7c6c: 0x10a7c6c: jal   0x101cd70 sw    v0, -32448(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 8156
+	ldc.i4 -8112
 	add
 	ldloc 9
 	stelem.i4
@@ -1023,36 +1023,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 9
 // --- basic block ---
-// 0x010a762c: 0x10a762c: lui   v1, 0x80000
-	ldc.i4 524288
+// 0x010a7c74: 0x10a7c74: lui   v1, 0x90000
+	ldc.i4 589824
 	stloc 8
-// 0x010a7630: 0x10a7630: lw    ra, 36(sp)
-// 0x010a7634: 0x10a7634: addiu s2, s2, 32624
+// 0x010a7c78: 0x10a7c78: lw    ra, 36(sp)
+// 0x010a7c7c: 0x10a7c7c: addiu s2, s2, -32448
 	ldloc 7
-	ldc.i4 32624
+	ldc.i4 -32448
 	add
 	stloc 7
-// 0x010a7638: 0x10a7638: addiu s1, s1, 32116
+// 0x010a7c80: 0x10a7c80: addiu s1, s1, 32116
 	ldloc 10
 	ldc.i4 32116
 	add
 	stloc 10
-// 0x010a763c: 0x10a763c: addiu s0, s0, 32120
+// 0x010a7c84: 0x10a7c84: addiu s0, s0, 32120
 	ldloc 6
 	ldc.i4 32120
 	add
 	stloc 6
-// 0x010a7640: 0x10a7640: addiu a0, v1, 32632
+// 0x010a7c88: 0x10a7c88: addiu a0, v1, -32440
 	ldloc 8
-	ldc.i4 32632
+	ldc.i4 -32440
 	add
 	stloc.1
-// 0x010a7644: 0x10a7644: sw    v0, 4(s2)
+// 0x010a7c8c: 0x10a7c8c: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1061,7 +1061,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a7648: 0x10a7648: sw    s0, 4(a0)
+// 0x010a7c90: 0x10a7c90: sw    s0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1070,16 +1070,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a764c: 0x10a764c: sw    s1, 32632(v1)
+// 0x010a7c94: 0x10a7c94: sw    s1, -32440(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8158
+	ldc.i4 -8110
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a7650: 0x10a7650: lw    s2, 32(sp)
+// 0x010a7c98: 0x10a7c98: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1088,7 +1088,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a7654: 0x10a7654: lw    s1, 28(sp)
+// 0x010a7c9c: 0x10a7c9c: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1097,7 +1097,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a7658: 0x10a7658: lw    s0, 24(sp)
+// 0x010a7ca0: 0x10a7ca0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1106,7 +1106,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a765c: 0x10a765c: jr    ra addiu sp, sp, 40
+// 0x010a7ca4: 0x10a7ca4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1118,7 +1118,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 T_59_10a7664(int32,int32,int32,int32,int32)
+.method public static int32 T_59_10a7cac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1153,33 +1153,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a7664: 0x10a7664: lui   a0, 0x0
+// 0x010a7cac: 0x10a7cac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a7668: 0x10a7668: addiu sp, sp, -40
+// 0x010a7cb0: 0x10a7cb0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a766c: 0x10a766c: addiu a0, a0, 32124
+// 0x010a7cb4: 0x10a7cb4: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x010a7670: 0x10a7670: addu  a1, zero, zero
+// 0x010a7cb8: 0x10a7cb8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7674: 0x10a7674: addiu a2, zero, -2
+// 0x010a7cbc: 0x10a7cbc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a7678: 0x10a7678: addiu a3, zero, 1
+// 0x010a7cc0: 0x10a7cc0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010a767c: 0x10a767c: addiu v0, zero, 136
+// 0x010a7cc4: 0x10a7cc4: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a7680: 0x10a7680: sw    ra, 36(sp)
-// 0x010a7684: 0x10a7684: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a7cc8: 0x10a7cc8: sw    ra, 36(sp)
+// 0x010a7ccc: 0x10a7ccc: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1193,21 +1193,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a768c: 0x10a768c: addu  a0, v0, zero
+// 0x010a7cd4: 0x10a7cd4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7690: 0x10a7690: addu  a1, zero, zero
+// 0x010a7cd8: 0x10a7cd8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7694: 0x10a7694: addu  a2, zero, zero
+// 0x010a7cdc: 0x10a7cdc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7698: 0x10a7698: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010a7ce0: 0x10a7ce0: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1219,10 +1219,10 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a76a0: 0x10a76a0: lw    ra, 36(sp)
-// 0x010a76a4: 0x10a76a4: lw    v0, 24(sp)
+// 0x010a7ce8: 0x10a7ce8: lw    ra, 36(sp)
+// 0x010a7cec: 0x10a7cec: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1231,7 +1231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a76a8: 0x10a76a8: jr    ra addiu sp, sp, 40
+// 0x010a7cf0: 0x10a7cf0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1243,7 +1243,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_map_settings_show_10a76b0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_map_settings_show_10a7cf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s5,int32 s2,int32 s1,int32 s3,int32 s7,int32 lo,int32 s6,int32 s4,int32 t0,int32 s8,int32 ra)
@@ -1311,14 +1311,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a76b0:
-// 0x010a76b0: 0x10a76b0: addiu sp, sp, -512
+L_10a7cf8:
+// 0x010a7cf8: 0x10a7cf8: addiu sp, sp, -512
 	ldloc.0
 	ldc.i4 -512
 	add
 	stloc.0
-// 0x010a76b4: 0x10a76b4: sw    ra, 508(sp)
-// 0x010a76b8: 0x10a76b8: sw    s8, 504(sp)
+// 0x010a7cfc: 0x10a7cfc: sw    ra, 508(sp)
+// 0x010a7d00: 0x10a7d00: sw    s8, 504(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1327,7 +1327,7 @@ L_10a76b0:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010a76bc: 0x10a76bc: sw    s7, 500(sp)
+// 0x010a7d04: 0x10a7d04: sw    s7, 500(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1336,7 +1336,7 @@ L_10a76b0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a76c0: 0x10a76c0: sw    s6, 496(sp)
+// 0x010a7d08: 0x10a7d08: sw    s6, 496(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1345,7 +1345,7 @@ L_10a76b0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a76c4: 0x10a76c4: sw    s5, 492(sp)
+// 0x010a7d0c: 0x10a7d0c: sw    s5, 492(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1354,7 +1354,7 @@ L_10a76b0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a76c8: 0x10a76c8: sw    s4, 488(sp)
+// 0x010a7d10: 0x10a7d10: sw    s4, 488(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1363,7 +1363,7 @@ L_10a76b0:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a76cc: 0x10a76cc: sw    s3, 484(sp)
+// 0x010a7d14: 0x10a7d14: sw    s3, 484(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1372,7 +1372,7 @@ L_10a76b0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a76d0: 0x10a76d0: sw    s2, 480(sp)
+// 0x010a7d18: 0x10a7d18: sw    s2, 480(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1381,7 +1381,7 @@ L_10a76b0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a76d4: 0x10a76d4: sw    s1, 476(sp)
+// 0x010a7d1c: 0x10a7d1c: sw    s1, 476(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1390,7 +1390,7 @@ L_10a76b0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a76d8: 0x10a76d8: jal   0x101fa28 sw    s0, 472(sp)
+// 0x010a7d20: 0x10a7d20: jal   0x101fa38 sw    s0, 472(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1399,13 +1399,13 @@ L_10a76b0:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010a76e0: 0x10a76e0: addiu v1, zero, 40
+// 0x010a7d28: 0x10a7d28: addiu v1, zero, 40
 	ldc.i4.s 40
 	stloc 6
-// 0x010a76e4: 0x10a76e4: beq   v0, zero, 0x10a76f4 sw    v1, 456(sp)
+// 0x010a7d2c: 0x10a7d2c: beq   v0, zero, 0x10a7d3c sw    v1, 456(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -1415,12 +1415,12 @@ L_10a76b0:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10a76f4
+	brfalse L_10a7d3c
 // --- basic block ---
-// 0x010a76ec: 0x10a76ec: addiu v0, zero, 53
+// 0x010a7d34: 0x10a7d34: addiu v0, zero, 53
 	ldc.i4.s 53
 	stloc 5
-// 0x010a76f0: 0x10a76f0: sw    v0, 456(sp)
+// 0x010a7d38: 0x10a7d38: sw    v0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1429,27 +1429,27 @@ L_10a76b0:
 	add
 	ldloc 5
 	stelem.i4
-L_10a76f4:
-// 0x010a76f4: 0x10a76f4: lui   a1, 0x20000
+L_10a7d3c:
+// 0x010a7d3c: 0x10a7d3c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a76f8: 0x10a76f8: lui   a3, 0x20000
+// 0x010a7d40: 0x10a7d40: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a76fc: 0x10a76fc: addiu a1, a1, 8052
+// 0x010a7d44: 0x10a7d44: addiu a1, a1, 8516
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8516
 	add
 	stloc.2
-// 0x010a7700: 0x10a7700: addiu a3, a3, 8252
+// 0x010a7d48: 0x10a7d48: addiu a3, a3, 8716
 	ldloc 4
-	ldc.i4 8252
+	ldc.i4 8716
 	add
 	stloc 4
-// 0x010a7704: 0x10a7704: addiu a0, zero, 1
+// 0x010a7d4c: 0x10a7d4c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a7708: 0x10a7708: jal   0x100449c addiu a2, zero, 223
+// 0x010a7d50: 0x10a7d50: jal   0x100449c addiu a2, zero, 223
 	ldc.i4 223
 	stloc.3
 	ldloc.0
@@ -1462,56 +1462,56 @@ L_10a76f4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7710: 0x10a7710: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a7d58: 0x10a7d58: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-// 0x010a7714: 0x10a7714: lw    v0, 32616(v0)
+// 0x010a7d5c: 0x10a7d5c: lw    v0, -32456(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8154
+	ldc.i4 -8114
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a7718: 0x10a7718: sll   zero, zero, 0
-// 0x010a771c: 0x10a771c: bne   v0, zero, 0x10a7730 lui   v0, 0x20000
+// 0x010a7d60: 0x10a7d60: sll   zero, zero, 0
+// 0x010a7d64: 0x10a7d64: bne   v0, zero, 0x10a7d78 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brtrue L_10a7730
+	brtrue L_10a7d78
 // --- basic block ---
-// 0x010a7724: 0x10a7724: jal   0x10a747c sll   zero, zero, 0
+// 0x010a7d6c: 0x10a7d6c: jal   0x10a7ac4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::roadmap_map_settings_init_10a747c(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::roadmap_map_settings_init_10a7ac4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a772c: 0x10a772c: lui   v0, 0x20000
+// 0x010a7d74: 0x10a7d74: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10a7730:
-// 0x010a7730: 0x10a7730: lw    v0, 29772(v0)
+L_10a7d78:
+// 0x010a7d78: 0x10a7d78: lw    v0, 30236(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7443
+	ldc.i4 7559
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a7734: 0x10a7734: addu  a1, zero, zero
+// 0x010a7d7c: 0x10a7d7c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7738: 0x10a7738: addu  a0, v0, zero
+// 0x010a7d80: 0x10a7d80: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a773c: 0x10a773c: jal   0x1095eec sw    v0, 460(sp)
+// 0x010a7d84: 0x10a7d84: jal   0x1096534 sw    v0, 460(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1525,18 +1525,18 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7744: 0x10a7744: bne   v0, zero, 0x10a8668 lui   v0, 0x80000
+// 0x010a7d8c: 0x10a7d8c: bne   v0, zero, 0x10a8cb0 lui   v0, 0x90000
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 5
-	brtrue L_10a8668
+	brtrue L_10a8cb0
 // --- basic block ---
-// 0x010a774c: 0x10a774c: lw    a0, 460(sp)
+// 0x010a7d94: 0x10a7d94: lw    a0, 460(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1545,18 +1545,18 @@ L_10a7730:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a7750: 0x10a7750: jal   0x101cd60 sll   zero, zero, 0
+// 0x010a7d98: 0x10a7d98: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7758: 0x10a7758: lw    a0, 460(sp)
+// 0x010a7da0: 0x10a7da0: lw    a0, 460(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1565,18 +1565,18 @@ L_10a7730:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a775c: 0x10a775c: lui   a2, 0x10a0000
+// 0x010a7da4: 0x10a7da4: lui   a2, 0x10a0000
 	ldc.i4 17432576
 	stloc.3
-// 0x010a7760: 0x10a7760: addu  a1, v0, zero
+// 0x010a7da8: 0x10a7da8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7764: 0x10a7764: addiu a2, a2, 29672
+// 0x010a7dac: 0x10a7dac: addiu a2, a2, 31280
 	ldloc.3
-	ldc.i4 29672
+	ldc.i4 31280
 	add
 	stloc.3
-// 0x010a7768: 0x10a7768: jal   0x1095a08 addiu a3, zero, 8192
+// 0x010a7db0: 0x10a7db0: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -1584,35 +1584,35 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7770: 0x10a7770: lui   a0, 0x20000
+// 0x010a7db8: 0x10a7db8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7774: 0x10a7774: addu  a1, zero, zero
+// 0x010a7dbc: 0x10a7dbc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7778: 0x10a7778: addiu a2, zero, -1
+// 0x010a7dc0: 0x10a7dc0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a777c: 0x10a777c: addiu a3, zero, -1
+// 0x010a7dc4: 0x10a7dc4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7780: 0x10a7780: addu  s8, v0, zero
+// 0x010a7dc8: 0x10a7dc8: addu  s8, v0, zero
 	ldloc 5
 	stloc 18
-// 0x010a7784: 0x10a7784: addiu a0, a0, 8280
+// 0x010a7dcc: 0x10a7dcc: addiu a0, a0, 8744
 	ldloc.1
-	ldc.i4 8280
+	ldc.i4 8744
 	add
 	stloc.1
-// 0x010a7788: 0x10a7788: addiu v0, zero, 136
+// 0x010a7dd0: 0x10a7dd0: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a778c: 0x10a778c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a7dd4: 0x10a7dd4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1626,20 +1626,20 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7794: 0x10a7794: lui   a0, 0x20000
+// 0x010a7ddc: 0x10a7ddc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7798: 0x10a7798: addiu a0, a0, 8308
+// 0x010a7de0: 0x10a7de0: addiu a0, a0, 8772
 	ldloc.1
-	ldc.i4 8308
+	ldc.i4 8772
 	add
 	stloc.1
-// 0x010a779c: 0x10a779c: jal   0x101cd60 addu  s0, v0, zero
+// 0x010a7de4: 0x10a7de4: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1647,26 +1647,26 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a77a4: 0x10a77a4: lui   a0, 0x20000
+// 0x010a7dec: 0x10a7dec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a77a8: 0x10a77a8: addiu a3, zero, 4240
+// 0x010a7df0: 0x10a7df0: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a77ac: 0x10a77ac: addiu a2, zero, 10
+// 0x010a7df4: 0x10a7df4: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010a77b0: 0x10a77b0: addiu a0, a0, 8332
+// 0x010a7df8: 0x10a7df8: addiu a0, a0, 8796
 	ldloc.1
-	ldc.i4 8332
+	ldc.i4 8796
 	add
 	stloc.1
-// 0x010a77b4: 0x10a77b4: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a7dfc: 0x10a7dfc: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1674,77 +1674,77 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a77bc: 0x10a77bc: addu  a1, v0, zero
+// 0x010a7e04: 0x10a7e04: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a77c0: 0x10a77c0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a7e08: 0x10a7e08: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a77c8: 0x10a77c8: addu  a2, zero, zero
+// 0x010a7e10: 0x10a7e10: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a77cc: 0x10a77cc: addu  a0, s0, zero
+// 0x010a7e14: 0x10a7e14: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a77d0: 0x10a77d0: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a7e18: 0x10a7e18: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a77d8: 0x10a77d8: addu  a0, s8, zero
+// 0x010a7e20: 0x10a7e20: addu  a0, s8, zero
 	ldloc 18
 	stloc.1
-// 0x010a77dc: 0x10a77dc: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a7e24: 0x10a7e24: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a77e4: 0x10a77e4: lui   a0, 0x20000
+// 0x010a7e2c: 0x10a7e2c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a77e8: 0x10a77e8: lui   v0, 0x41000000
+// 0x010a7e30: 0x10a7e30: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x010a77ec: 0x10a77ec: ori   v0, v0, 20616
+// 0x010a7e34: 0x10a7e34: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010a77f0: 0x10a77f0: addiu a0, a0, 8364
+// 0x010a7e38: 0x10a7e38: addiu a0, a0, 8828
 	ldloc.1
-	ldc.i4 8364
+	ldc.i4 8828
 	add
 	stloc.1
-// 0x010a77f4: 0x10a77f4: addu  a1, zero, zero
+// 0x010a7e3c: 0x10a7e3c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a77f8: 0x10a77f8: addiu a2, zero, -2
+// 0x010a7e40: 0x10a7e40: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a77fc: 0x10a77fc: addiu a3, zero, -1
+// 0x010a7e44: 0x10a7e44: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7800: 0x10a7800: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a7e48: 0x10a7e48: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1758,12 +1758,12 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7808: 0x10a7808: jal   0x10140b0 addu  s1, v0, zero
+// 0x010a7e50: 0x10a7e50: jal   0x10140c0 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -1771,40 +1771,40 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7810: 0x10a7810: beq   v0, zero, 0x10a78e8 lui   v0, 0x100000
+// 0x010a7e58: 0x10a7e58: beq   v0, zero, 0x10a7f30 lui   v0, 0x100000
 	ldloc 5
 	ldc.i4 1048576
 	stloc 5
-	brfalse L_10a78e8
+	brfalse L_10a7f30
 // --- basic block ---
-// 0x010a7818: 0x10a7818: lui   a0, 0x20000
+// 0x010a7e60: 0x10a7e60: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a781c: 0x10a781c: addiu a3, zero, -1
+// 0x010a7e64: 0x10a7e64: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7820: 0x10a7820: addiu a0, a0, 8380
+// 0x010a7e68: 0x10a7e68: addiu a0, a0, 8844
 	ldloc.1
-	ldc.i4 8380
+	ldc.i4 8844
 	add
 	stloc.1
-// 0x010a7824: 0x10a7824: addu  a1, zero, zero
+// 0x010a7e6c: 0x10a7e6c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7828: 0x10a7828: addiu a2, zero, -2
+// 0x010a7e70: 0x10a7e70: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a782c: 0x10a782c: ori   v0, v0, 136
+// 0x010a7e74: 0x10a7e74: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010a7830: 0x10a7830: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a7e78: 0x10a7e78: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1818,44 +1818,44 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7838: 0x10a7838: lui   a1, 0x0
+// 0x010a7e80: 0x10a7e80: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a783c: 0x10a783c: lui   a2, 0x0
+// 0x010a7e84: 0x10a7e84: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7840: 0x10a7840: addu  a0, v0, zero
+// 0x010a7e88: 0x10a7e88: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7844: 0x10a7844: addiu a1, a1, 31980
+// 0x010a7e8c: 0x10a7e8c: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7848: 0x10a7848: addiu a2, a2, 23008
+// 0x010a7e90: 0x10a7e90: addiu a2, a2, 23008
 	ldloc.3
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a784c: 0x10a784c: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a7e94: 0x10a7e94: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7854: 0x10a7854: lui   a0, 0x20000
+// 0x010a7e9c: 0x10a7e9c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7858: 0x10a7858: jal   0x101cd60 addiu a0, a0, 8404
+// 0x010a7ea0: 0x10a7ea0: jal   0x101cd70 addiu a0, a0, 8868
 	ldloc.1
-	ldc.i4 8404
+	ldc.i4 8868
 	add
 	stloc.1
 	ldloc.0
@@ -1863,26 +1863,26 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7860: 0x10a7860: lui   a0, 0x20000
+// 0x010a7ea8: 0x10a7ea8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7864: 0x10a7864: addiu a3, zero, 4112
+// 0x010a7eac: 0x10a7eac: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a7868: 0x10a7868: addiu a2, zero, -1
+// 0x010a7eb0: 0x10a7eb0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a786c: 0x10a786c: addiu a0, a0, 8428
+// 0x010a7eb4: 0x10a7eb4: addiu a0, a0, 8892
 	ldloc.1
-	ldc.i4 8428
+	ldc.i4 8892
 	add
 	stloc.1
-// 0x010a7870: 0x10a7870: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a7eb8: 0x10a7eb8: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1890,41 +1890,41 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7878: 0x10a7878: addu  a1, v0, zero
+// 0x010a7ec0: 0x10a7ec0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a787c: 0x10a787c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a7ec4: 0x10a7ec4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7884: 0x10a7884: addiu s2, sp, 40
+// 0x010a7ecc: 0x10a7ecc: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 10
-// 0x010a7888: 0x10a7888: lui   a1, 0x0
+// 0x010a7ed0: 0x10a7ed0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a788c: 0x10a788c: addiu a2, zero, 16
+// 0x010a7ed4: 0x10a7ed4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a7890: 0x10a7890: addiu a1, a1, 1860
+// 0x010a7ed8: 0x10a7ed8: addiu a1, a1, 1860
 	ldloc.2
 	ldc.i4 1860
 	add
 	stloc.2
-// 0x010a7894: 0x10a7894: jal   0x1001800 addu  a0, s2, zero
+// 0x010a7edc: 0x10a7edc: jal   0x1001800 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -1936,13 +1936,13 @@ L_10a7730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a789c: 0x10a789c: lui   a1, 0x0
+// 0x010a7ee4: 0x10a7ee4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a78a0: 0x10a78a0: addu  a0, s2, zero
+// 0x010a7ee8: 0x10a7ee8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a78a4: 0x10a78a4: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a7eec: 0x10a7eec: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -1952,31 +1952,31 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a78ac: 0x10a78ac: lui   a0, 0x20000
+// 0x010a7ef4: 0x10a7ef4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a78b0: 0x10a78b0: addiu a0, a0, 7956
+// 0x010a7ef8: 0x10a7ef8: addiu a0, a0, 8420
 	ldloc.1
-	ldc.i4 7956
+	ldc.i4 8420
 	add
 	stloc.1
-// 0x010a78b4: 0x10a78b4: sltu  a1, zero, v0
+// 0x010a7efc: 0x10a7efc: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a78b8: 0x10a78b8: addiu a2, zero, 2
+// 0x010a7f00: 0x10a7f00: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a78bc: 0x10a78bc: addu  a3, zero, zero
+// 0x010a7f04: 0x10a7f04: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a78c0: 0x10a78c0: sw    zero, 16(sp)
+// 0x010a7f08: 0x10a7f08: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1985,7 +1985,7 @@ L_10a7730:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a78c4: 0x10a78c4: sw    zero, 20(sp)
+// 0x010a7f0c: 0x10a7f0c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1994,7 +1994,7 @@ L_10a7730:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a78c8: 0x10a78c8: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a7f10: 0x10a7f10: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2008,39 +2008,39 @@ L_10a7730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a78d0: 0x10a78d0: addu  a1, v0, zero
+// 0x010a7f18: 0x10a7f18: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a78d4: 0x10a78d4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a7f1c: 0x10a7f1c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a78dc: 0x10a78dc: addu  a0, s1, zero
+// 0x010a7f24: 0x10a7f24: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010a78e0: 0x10a78e0: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a7f28: 0x10a7f28: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a78e8:
-// 0x010a78e8: 0x10a78e8: jal   0x10a7664 lui   s2, 0x20000
+L_10a7f30:
+// 0x010a7f30: 0x10a7f30: jal   0x10a7cac lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
 	ldloc.0
@@ -2048,47 +2048,47 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a78f0: 0x10a78f0: addu  a1, v0, zero
+// 0x010a7f38: 0x10a7f38: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a78f4: 0x10a78f4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a7f3c: 0x10a7f3c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a78fc: 0x10a78fc: lui   v1, 0x100000
+// 0x010a7f44: 0x10a7f44: lui   v1, 0x100000
 	ldc.i4 1048576
 	stloc 6
-// 0x010a7900: 0x10a7900: ori   v1, v1, 136
+// 0x010a7f48: 0x10a7f48: ori   v1, v1, 136
 	ldloc 6
 	ldc.i4 136
 	or
 	stloc 6
-// 0x010a7904: 0x10a7904: addiu a3, zero, -1
+// 0x010a7f4c: 0x10a7f4c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7908: 0x10a7908: addiu a0, s2, 8448
+// 0x010a7f50: 0x10a7f50: addiu a0, s2, 8912
 	ldloc 10
-	ldc.i4 8448
+	ldc.i4 8912
 	add
 	stloc.1
-// 0x010a790c: 0x10a790c: addu  a1, zero, zero
+// 0x010a7f54: 0x10a7f54: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7910: 0x10a7910: addiu a2, zero, -2
+// 0x010a7f58: 0x10a7f58: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a7914: 0x10a7914: sw    v1, 16(sp)
+// 0x010a7f5c: 0x10a7f5c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2097,7 +2097,7 @@ L_10a78e8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7918: 0x10a7918: sw    v1, 468(sp)
+// 0x010a7f60: 0x10a7f60: sw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2106,7 +2106,7 @@ L_10a78e8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a791c: 0x10a791c: jal   0x1093a24 lui   s7, 0x0
+// 0x010a7f64: 0x10a7f64: jal   0x1094048 lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 13
 	ldloc.0
@@ -2114,70 +2114,70 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7924: 0x10a7924: lui   s6, 0x0
+// 0x010a7f6c: 0x10a7f6c: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x010a7928: 0x10a7928: addu  a0, v0, zero
+// 0x010a7f70: 0x10a7f70: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a792c: 0x10a792c: lui   s5, 0xf0000
+// 0x010a7f74: 0x10a7f74: lui   s5, 0xf0000
 	ldc.i4 983040
 	stloc 9
-// 0x010a7930: 0x10a7930: addiu a1, s7, 31980
+// 0x010a7f78: 0x10a7f78: addiu a1, s7, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7934: 0x10a7934: addiu a2, s6, 23008
+// 0x010a7f7c: 0x10a7f7c: addiu a2, s6, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a7938: 0x10a7938: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a7f80: 0x10a7f80: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7940: 0x10a7940: lw    a2, -30068(s5)
+// 0x010a7f88: 0x10a7f88: lw    a2, -29604(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a7944: 0x10a7944: addiu s3, zero, 2
+// 0x010a7f8c: 0x10a7f8c: addiu s3, zero, 2
 	ldc.i4.2
 	stloc 12
-// 0x010a7948: 0x10a7948: div   a2, s3
+// 0x010a7f90: 0x10a7f90: div   a2, s3
 	ldloc.3
 	ldloc 12
 	div
 	stloc 14
-// 0x010a794c: 0x10a794c: addiu a3, zero, -1
+// 0x010a7f94: 0x10a7f94: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7950: 0x10a7950: addiu a0, s2, 8448
+// 0x010a7f98: 0x10a7f98: addiu a0, s2, 8912
 	ldloc 10
-	ldc.i4 8448
+	ldc.i4 8912
 	add
 	stloc.1
-// 0x010a7954: 0x10a7954: addiu s4, zero, 16
+// 0x010a7f9c: 0x10a7f9c: addiu s4, zero, 16
 	ldc.i4.s 16
 	stloc 16
-// 0x010a7958: 0x10a7958: addu  a1, zero, zero
+// 0x010a7fa0: 0x10a7fa0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a795c: 0x10a795c: sw    s4, 16(sp)
+// 0x010a7fa4: 0x10a7fa4: sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2186,10 +2186,10 @@ L_10a78e8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a7960: 0x10a7960: mflo  lo
+// 0x010a7fa8: 0x10a7fa8: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a7964: 0x10a7964: jal   0x1093a24 addiu s2, sp, 40
+// 0x010a7fac: 0x10a7fac: jal   0x1094048 addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2199,21 +2199,21 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a796c: 0x10a796c: addu  a0, v0, zero
+// 0x010a7fb4: 0x10a7fb4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7970: 0x10a7970: addu  a1, zero, zero
+// 0x010a7fb8: 0x10a7fb8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7974: 0x10a7974: addu  a2, zero, zero
+// 0x010a7fbc: 0x10a7fbc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7978: 0x10a7978: jal   0x1098fe0 sw    v0, 464(sp)
+// 0x010a7fc0: 0x10a7fc0: jal   0x1099628 sw    v0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2225,14 +2225,14 @@ L_10a78e8:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7980: 0x10a7980: lui   a0, 0x20000
+// 0x010a7fc8: 0x10a7fc8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7984: 0x10a7984: jal   0x101cd60 addiu a0, a0, 8468
+// 0x010a7fcc: 0x10a7fcc: jal   0x101cd70 addiu a0, a0, 8932
 	ldloc.1
-	ldc.i4 8468
+	ldc.i4 8932
 	add
 	stloc.1
 	ldloc.0
@@ -2240,26 +2240,26 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a798c: 0x10a798c: lui   a0, 0x20000
+// 0x010a7fd4: 0x10a7fd4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7990: 0x10a7990: addiu a3, zero, 4112
+// 0x010a7fd8: 0x10a7fd8: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a7994: 0x10a7994: addiu a2, zero, -1
+// 0x010a7fdc: 0x10a7fdc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a7998: 0x10a7998: addiu a0, a0, 8496
+// 0x010a7fe0: 0x10a7fe0: addiu a0, a0, 8960
 	ldloc.1
-	ldc.i4 8496
+	ldc.i4 8960
 	add
 	stloc.1
-// 0x010a799c: 0x10a799c: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a7fe4: 0x10a7fe4: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2267,12 +2267,12 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a79a4: 0x10a79a4: lw    t0, 464(sp)
+// 0x010a7fec: 0x10a7fec: lw    t0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2281,20 +2281,20 @@ L_10a78e8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a79a8: 0x10a79a8: addu  a1, v0, zero
+// 0x010a7ff0: 0x10a7ff0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a79ac: 0x10a79ac: jal   0x1098ec4 addu  a0, t0, zero
+// 0x010a7ff4: 0x10a7ff4: jal   0x109950c addu  a0, t0, zero
 	ldloc 17
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a79b4: 0x10a79b4: lw    t0, 464(sp)
+// 0x010a7ffc: 0x10a7ffc: lw    t0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2303,29 +2303,29 @@ L_10a78e8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a79b8: 0x10a79b8: addu  a0, s0, zero
+// 0x010a8000: 0x10a8000: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a79bc: 0x10a79bc: jal   0x1098ec4 addu  a1, t0, zero
+// 0x010a8004: 0x10a8004: jal   0x109950c addu  a1, t0, zero
 	ldloc 17
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a79c4: 0x10a79c4: lui   a1, 0x0
+// 0x010a800c: 0x10a800c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a79c8: 0x10a79c8: addiu a2, zero, 16
+// 0x010a8010: 0x10a8010: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a79cc: 0x10a79cc: addu  a0, s2, zero
+// 0x010a8014: 0x10a8014: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a79d0: 0x10a79d0: jal   0x1001800 addiu a1, a1, 18368
+// 0x010a8018: 0x10a8018: jal   0x1001800 addiu a1, a1, 18368
 	ldloc.2
 	ldc.i4 18368
 	add
@@ -2339,13 +2339,13 @@ L_10a78e8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a79d8: 0x10a79d8: lui   v0, 0x0
+// 0x010a8020: 0x10a8020: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a79dc: 0x10a79dc: addu  a0, s2, zero
+// 0x010a8024: 0x10a8024: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a79e0: 0x10a79e0: jal   0x100e7f4 addiu a1, v0, 20820
+// 0x010a8028: 0x10a8028: jal   0x100e804 addiu a1, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
@@ -2355,31 +2355,31 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a79e8: 0x10a79e8: lui   a0, 0x20000
+// 0x010a8030: 0x10a8030: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a79ec: 0x10a79ec: addiu a2, zero, 2
+// 0x010a8034: 0x10a8034: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a79f0: 0x10a79f0: addu  a3, zero, zero
+// 0x010a8038: 0x10a8038: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a79f4: 0x10a79f4: addiu a0, a0, 8516
+// 0x010a803c: 0x10a803c: addiu a0, a0, 8980
 	ldloc.1
-	ldc.i4 8516
+	ldc.i4 8980
 	add
 	stloc.1
-// 0x010a79f8: 0x10a79f8: sltu  a1, zero, v0
+// 0x010a8040: 0x10a8040: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a79fc: 0x10a79fc: sw    zero, 16(sp)
+// 0x010a8044: 0x10a8044: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2388,7 +2388,7 @@ L_10a78e8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7a00: 0x10a7a00: sw    zero, 20(sp)
+// 0x010a8048: 0x10a8048: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2397,7 +2397,7 @@ L_10a78e8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7a04: 0x10a7a04: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a804c: 0x10a804c: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2411,70 +2411,70 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a0c: 0x10a7a0c: addu  a1, v0, zero
+// 0x010a8054: 0x10a8054: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7a10: 0x10a7a10: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a8058: 0x10a8058: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a18: 0x10a7a18: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a8060: 0x10a8060: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a20: 0x10a7a20: addu  a1, v0, zero
+// 0x010a8068: 0x10a8068: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7a24: 0x10a7a24: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a806c: 0x10a806c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a2c: 0x10a7a2c: addu  a1, s0, zero
+// 0x010a8074: 0x10a8074: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010a7a30: 0x10a7a30: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a8078: 0x10a8078: jal   0x109950c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a38: 0x10a7a38: lui   v0, 0x0
+// 0x010a8080: 0x10a8080: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a7a3c: 0x10a7a3c: addiu a0, v0, 32244
+// 0x010a8084: 0x10a8084: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a7a40: 0x10a7a40: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a8088: 0x10a8088: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -2482,49 +2482,49 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a48: 0x10a7a48: addu  a1, v0, zero
+// 0x010a8090: 0x10a8090: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7a4c: 0x10a7a4c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a8094: 0x10a8094: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a54: 0x10a7a54: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a809c: 0x10a809c: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a5c: 0x10a7a5c: addu  a1, v0, zero
+// 0x010a80a4: 0x10a80a4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7a60: 0x10a7a60: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a80a8: 0x10a80a8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a68: 0x10a7a68: lw    v1, 468(sp)
+// 0x010a80b0: 0x10a80b0: lw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2533,24 +2533,24 @@ L_10a78e8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a7a6c: 0x10a7a6c: lui   a0, 0x20000
+// 0x010a80b4: 0x10a80b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7a70: 0x10a7a70: addiu a3, zero, -1
+// 0x010a80b8: 0x10a80b8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7a74: 0x10a7a74: addiu a0, a0, 8528
+// 0x010a80bc: 0x10a80bc: addiu a0, a0, 8992
 	ldloc.1
-	ldc.i4 8528
+	ldc.i4 8992
 	add
 	stloc.1
-// 0x010a7a78: 0x10a7a78: addu  a1, zero, zero
+// 0x010a80c0: 0x10a80c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7a7c: 0x10a7a7c: addiu a2, zero, -2
+// 0x010a80c4: 0x10a80c4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a7a80: 0x10a7a80: jal   0x1093a24 sw    v1, 16(sp)
+// 0x010a80c8: 0x10a80c8: jal   0x1094048 sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2564,64 +2564,64 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7a88: 0x10a7a88: addu  a0, v0, zero
+// 0x010a80d0: 0x10a80d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7a8c: 0x10a7a8c: addiu a1, s7, 31980
+// 0x010a80d4: 0x10a80d4: addiu a1, s7, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7a90: 0x10a7a90: addiu a2, s6, 23008
+// 0x010a80d8: 0x10a80d8: addiu a2, s6, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a7a94: 0x10a7a94: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a80dc: 0x10a80dc: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7a9c: 0x10a7a9c: lw    a2, -30068(s5)
+// 0x010a80e4: 0x10a80e4: lw    a2, -29604(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a7aa0: 0x10a7aa0: lui   a0, 0x20000
+// 0x010a80e8: 0x10a80e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7aa4: 0x10a7aa4: div   a2, s3
+// 0x010a80ec: 0x10a80ec: div   a2, s3
 	ldloc.3
 	ldloc 12
 	div
 	stloc 14
-// 0x010a7aa8: 0x10a7aa8: addiu a3, zero, -1
+// 0x010a80f0: 0x10a80f0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7aac: 0x10a7aac: addiu a0, a0, 8548
+// 0x010a80f4: 0x10a80f4: addiu a0, a0, 9012
 	ldloc.1
-	ldc.i4 8548
+	ldc.i4 9012
 	add
 	stloc.1
-// 0x010a7ab0: 0x10a7ab0: addu  a1, zero, zero
+// 0x010a80f8: 0x10a80f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7ab4: 0x10a7ab4: mflo  lo
+// 0x010a80fc: 0x10a80fc: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a7ab8: 0x10a7ab8: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010a8100: 0x10a8100: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2635,34 +2635,34 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ac0: 0x10a7ac0: addu  a0, v0, zero
+// 0x010a8108: 0x10a8108: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7ac4: 0x10a7ac4: addu  a1, zero, zero
+// 0x010a810c: 0x10a810c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7ac8: 0x10a7ac8: addu  a2, zero, zero
+// 0x010a8110: 0x10a8110: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7acc: 0x10a7acc: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010a8114: 0x10a8114: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7ad4: 0x10a7ad4: lui   a0, 0x20000
+// 0x010a811c: 0x10a811c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7ad8: 0x10a7ad8: jal   0x101cd60 addiu a0, a0, 8572
+// 0x010a8120: 0x10a8120: jal   0x101cd70 addiu a0, a0, 9036
 	ldloc.1
-	ldc.i4 8572
+	ldc.i4 9036
 	add
 	stloc.1
 	ldloc.0
@@ -2670,26 +2670,26 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ae0: 0x10a7ae0: lui   a0, 0x20000
+// 0x010a8128: 0x10a8128: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7ae4: 0x10a7ae4: addiu a3, zero, 4112
+// 0x010a812c: 0x10a812c: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a7ae8: 0x10a7ae8: addiu a2, zero, -1
+// 0x010a8130: 0x10a8130: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a7aec: 0x10a7aec: addiu a0, a0, 8596
+// 0x010a8134: 0x10a8134: addiu a0, a0, 9060
 	ldloc.1
-	ldc.i4 8596
+	ldc.i4 9060
 	add
 	stloc.1
-// 0x010a7af0: 0x10a7af0: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a8138: 0x10a8138: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2697,47 +2697,47 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7af8: 0x10a7af8: addu  a1, v0, zero
+// 0x010a8140: 0x10a8140: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7afc: 0x10a7afc: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010a8144: 0x10a8144: jal   0x109950c addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b04: 0x10a7b04: addu  a0, s0, zero
+// 0x010a814c: 0x10a814c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a7b08: 0x10a7b08: jal   0x1098ec4 addu  a1, s3, zero
+// 0x010a8150: 0x10a8150: jal   0x109950c addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b10: 0x10a7b10: lui   a1, 0x0
+// 0x010a8158: 0x10a8158: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7b14: 0x10a7b14: addiu a2, zero, 16
+// 0x010a815c: 0x10a815c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a7b18: 0x10a7b18: addu  a0, s2, zero
+// 0x010a8160: 0x10a8160: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a7b1c: 0x10a7b1c: jal   0x1001800 addiu a1, a1, 18384
+// 0x010a8164: 0x10a8164: jal   0x1001800 addiu a1, a1, 18384
 	ldloc.2
 	ldc.i4 18384
 	add
@@ -2751,13 +2751,13 @@ L_10a78e8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b24: 0x10a7b24: lui   v0, 0x0
+// 0x010a816c: 0x10a816c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a7b28: 0x10a7b28: addu  a0, s2, zero
+// 0x010a8170: 0x10a8170: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a7b2c: 0x10a7b2c: jal   0x100e7f4 addiu a1, v0, 20820
+// 0x010a8174: 0x10a8174: jal   0x100e804 addiu a1, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
@@ -2767,31 +2767,31 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b34: 0x10a7b34: lui   a0, 0x10000
+// 0x010a817c: 0x10a817c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a7b38: 0x10a7b38: addiu a2, zero, 2
+// 0x010a8180: 0x10a8180: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a7b3c: 0x10a7b3c: addu  a3, zero, zero
+// 0x010a8184: 0x10a8184: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a7b40: 0x10a7b40: addiu a0, a0, -29412
+// 0x010a8188: 0x10a8188: addiu a0, a0, -29412
 	ldloc.1
 	ldc.i4 -29412
 	add
 	stloc.1
-// 0x010a7b44: 0x10a7b44: sltu  a1, zero, v0
+// 0x010a818c: 0x10a818c: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a7b48: 0x10a7b48: sw    zero, 16(sp)
+// 0x010a8190: 0x10a8190: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2800,7 +2800,7 @@ L_10a78e8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7b4c: 0x10a7b4c: sw    zero, 20(sp)
+// 0x010a8194: 0x10a8194: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2809,7 +2809,7 @@ L_10a78e8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7b50: 0x10a7b50: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a8198: 0x10a8198: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2823,70 +2823,70 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b58: 0x10a7b58: addu  a1, v0, zero
+// 0x010a81a0: 0x10a81a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7b5c: 0x10a7b5c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a81a4: 0x10a81a4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b64: 0x10a7b64: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a81ac: 0x10a81ac: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b6c: 0x10a7b6c: addu  a1, v0, zero
+// 0x010a81b4: 0x10a81b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7b70: 0x10a7b70: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a81b8: 0x10a81b8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b78: 0x10a7b78: addu  a1, s0, zero
+// 0x010a81c0: 0x10a81c0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010a7b7c: 0x10a7b7c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a81c4: 0x10a81c4: jal   0x109950c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b84: 0x10a7b84: lui   v0, 0x0
+// 0x010a81cc: 0x10a81cc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a7b88: 0x10a7b88: addiu a0, v0, 32244
+// 0x010a81d0: 0x10a81d0: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a7b8c: 0x10a7b8c: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a81d4: 0x10a81d4: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -2894,49 +2894,49 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7b94: 0x10a7b94: addu  a1, v0, zero
+// 0x010a81dc: 0x10a81dc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7b98: 0x10a7b98: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a81e0: 0x10a81e0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ba0: 0x10a7ba0: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a81e8: 0x10a81e8: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ba8: 0x10a7ba8: addu  a1, v0, zero
+// 0x010a81f0: 0x10a81f0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7bac: 0x10a7bac: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a81f4: 0x10a81f4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7bb4: 0x10a7bb4: lw    v1, 468(sp)
+// 0x010a81fc: 0x10a81fc: lw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2945,7 +2945,7 @@ L_10a78e8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a7bb8: 0x10a7bb8: lw    a3, 456(sp)
+// 0x010a8200: 0x10a8200: lw    a3, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2954,21 +2954,21 @@ L_10a78e8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a7bbc: 0x10a7bbc: lui   a0, 0x20000
+// 0x010a8204: 0x10a8204: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7bc0: 0x10a7bc0: addiu a0, a0, 8616
+// 0x010a8208: 0x10a8208: addiu a0, a0, 9080
 	ldloc.1
-	ldc.i4 8616
+	ldc.i4 9080
 	add
 	stloc.1
-// 0x010a7bc4: 0x10a7bc4: addu  a1, zero, zero
+// 0x010a820c: 0x10a820c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7bc8: 0x10a7bc8: addiu a2, zero, -2
+// 0x010a8210: 0x10a8210: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a7bcc: 0x10a7bcc: jal   0x1093a24 sw    v1, 16(sp)
+// 0x010a8214: 0x10a8214: jal   0x1094048 sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2982,67 +2982,67 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7bd4: 0x10a7bd4: addu  a0, v0, zero
+// 0x010a821c: 0x10a821c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7bd8: 0x10a7bd8: addiu a1, s7, 31980
+// 0x010a8220: 0x10a8220: addiu a1, s7, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7bdc: 0x10a7bdc: addiu a2, s6, 23008
+// 0x010a8224: 0x10a8224: addiu a2, s6, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a7be0: 0x10a7be0: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010a8228: 0x10a8228: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7be8: 0x10a7be8: lw    a2, -30068(s5)
+// 0x010a8230: 0x10a8230: lw    a2, -29604(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a7bec: 0x10a7bec: addiu v0, zero, 3
+// 0x010a8234: 0x10a8234: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010a7bf0: 0x10a7bf0: div   a2, v0
+// 0x010a8238: 0x10a8238: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 14
-// 0x010a7bf4: 0x10a7bf4: lui   a0, 0x20000
+// 0x010a823c: 0x10a823c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7bf8: 0x10a7bf8: addiu a3, zero, -1
+// 0x010a8240: 0x10a8240: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7bfc: 0x10a7bfc: addiu a0, a0, 8632
+// 0x010a8244: 0x10a8244: addiu a0, a0, 9096
 	ldloc.1
-	ldc.i4 8632
+	ldc.i4 9096
 	add
 	stloc.1
-// 0x010a7c00: 0x10a7c00: addu  a1, zero, zero
+// 0x010a8248: 0x10a8248: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7c04: 0x10a7c04: mflo  lo
+// 0x010a824c: 0x10a824c: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a7c08: 0x10a7c08: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010a8250: 0x10a8250: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3056,34 +3056,34 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7c10: 0x10a7c10: addu  a0, v0, zero
+// 0x010a8258: 0x10a8258: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7c14: 0x10a7c14: addu  a1, zero, zero
+// 0x010a825c: 0x10a825c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7c18: 0x10a7c18: addu  a2, zero, zero
+// 0x010a8260: 0x10a8260: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7c1c: 0x10a7c1c: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010a8264: 0x10a8264: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7c24: 0x10a7c24: lui   a0, 0x20000
+// 0x010a826c: 0x10a826c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7c28: 0x10a7c28: jal   0x101cd60 addiu a0, a0, 8648
+// 0x010a8270: 0x10a8270: jal   0x101cd70 addiu a0, a0, 9112
 	ldloc.1
-	ldc.i4 8648
+	ldc.i4 9112
 	add
 	stloc.1
 	ldloc.0
@@ -3091,26 +3091,26 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7c30: 0x10a7c30: lui   a0, 0x20000
+// 0x010a8278: 0x10a8278: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7c34: 0x10a7c34: addiu a2, zero, -1
+// 0x010a827c: 0x10a827c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a7c38: 0x10a7c38: addiu a3, zero, 4112
+// 0x010a8280: 0x10a8280: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010a7c3c: 0x10a7c3c: addiu a0, a0, 8668
+// 0x010a8284: 0x10a8284: addiu a0, a0, 9132
 	ldloc.1
-	ldc.i4 8668
+	ldc.i4 9132
 	add
 	stloc.1
-// 0x010a7c40: 0x10a7c40: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a8288: 0x10a8288: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3118,38 +3118,38 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7c48: 0x10a7c48: addu  a1, v0, zero
+// 0x010a8290: 0x10a8290: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7c4c: 0x10a7c4c: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010a8294: 0x10a8294: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7c54: 0x10a7c54: addu  a0, s0, zero
+// 0x010a829c: 0x10a829c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a7c58: 0x10a7c58: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010a82a0: 0x10a82a0: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7c60: 0x10a7c60: jal   0x109a424 addu  a0, zero, zero
+// 0x010a82a8: 0x10a82a8: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3157,35 +3157,35 @@ L_10a78e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7c68: 0x10a7c68: bne   v0, zero, 0x10a7c78 lui   v0, 0x20000
+// 0x010a82b0: 0x10a82b0: bne   v0, zero, 0x10a82c0 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brtrue L_10a7c78
+	brtrue L_10a82c0
 // --- basic block ---
-// 0x010a7c70: 0x10a7c70: j	 0x10a7c80 addiu v0, v0, -3556
+// 0x010a82b8: 0x10a82b8: j	 0x10a82c8 addiu v0, v0, -3092
 	ldloc 5
-	ldc.i4 -3556
+	ldc.i4 -3092
 	add
 	stloc 5
-	br L_10a7c80
+	br L_10a82c8
 // --- basic block ---
-L_10a7c78:
-// 0x010a7c78: 0x10a7c78: lui   v0, 0x20000
+L_10a82c0:
+// 0x010a82c0: 0x10a82c0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a7c7c: 0x10a7c7c: addiu v0, v0, -3544
+// 0x010a82c4: 0x10a82c4: addiu v0, v0, -3080
 	ldloc 5
-	ldc.i4 -3544
+	ldc.i4 -3080
 	add
 	stloc 5
-L_10a7c80:
-// 0x010a7c80: 0x10a7c80: sw    v0, 36(sp)
+L_10a82c8:
+// 0x010a82c8: 0x10a82c8: sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3194,7 +3194,7 @@ L_10a7c80:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a7c84: 0x10a7c84: jal   0x10141c0 sw    v0, 32(sp)
+// 0x010a82cc: 0x10a82cc: jal   0x10141d0 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3208,37 +3208,37 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_get_scheme_10141c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_get_scheme_10141d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7c8c: 0x10a7c8c: lui   v1, 0x0
+// 0x010a82d4: 0x10a82d4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a7c90: 0x10a7c90: addiu v1, v1, 18528
+// 0x010a82d8: 0x10a82d8: addiu v1, v1, 18528
 	ldloc 6
 	ldc.i4 18528
 	add
 	stloc 6
-// 0x010a7c94: 0x10a7c94: sll   v0, v0, 2
+// 0x010a82dc: 0x10a82dc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010a7c98: 0x10a7c98: addu  v0, v0, v1
+// 0x010a82e0: 0x10a82e0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x010a7c9c: 0x10a7c9c: lw    a0, 0(v0)
+// 0x010a82e4: 0x10a82e4: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a7ca0: 0x10a7ca0: jal   0x101cd60 lui   s7, 0x100000
+// 0x010a82e8: 0x10a82e8: jal   0x101cd70 lui   s7, 0x100000
 	ldc.i4 1048576
 	stloc 13
 	ldloc.0
@@ -3246,26 +3246,26 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ca8: 0x10a7ca8: lui   a0, 0x20000
+// 0x010a82f0: 0x10a82f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7cac: 0x10a7cac: addiu a2, zero, -1
+// 0x010a82f4: 0x10a82f4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a7cb0: 0x10a7cb0: addiu a3, zero, 18
+// 0x010a82f8: 0x10a82f8: addiu a3, zero, 18
 	ldc.i4.s 18
 	stloc 4
-// 0x010a7cb4: 0x10a7cb4: addu  a1, v0, zero
+// 0x010a82fc: 0x10a82fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7cb8: 0x10a7cb8: jal   0x1098d10 addiu a0, a0, 8688
+// 0x010a8300: 0x10a8300: jal   0x1099358 addiu a0, a0, 9152
 	ldloc.1
-	ldc.i4 8688
+	ldc.i4 9152
 	add
 	stloc.1
 	ldloc.0
@@ -3273,23 +3273,23 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7cc0: 0x10a7cc0: lui   a1, 0x20000
+// 0x010a8308: 0x10a8308: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a7cc4: 0x10a7cc4: addu  a0, v0, zero
+// 0x010a830c: 0x10a830c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7cc8: 0x10a7cc8: addiu a1, a1, -3564
+// 0x010a8310: 0x10a8310: addiu a1, a1, -3100
 	ldloc.2
-	ldc.i4 -3564
+	ldc.i4 -3100
 	add
 	stloc.2
-// 0x010a7ccc: 0x10a7ccc: jal   0x1097af8 sw    v0, 464(sp)
+// 0x010a8314: 0x10a8314: jal   0x1098140 sw    v0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3300,9 +3300,9 @@ L_10a7c80:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010a7cd4: 0x10a7cd4: lw    v0, 464(sp)
+// 0x010a831c: 0x10a831c: lw    v0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3311,23 +3311,23 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a7cd8: 0x10a7cd8: addu  a0, s0, zero
+// 0x010a8320: 0x10a8320: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a7cdc: 0x10a7cdc: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a8324: 0x10a8324: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ce4: 0x10a7ce4: addiu v0, zero, 18
+// 0x010a832c: 0x10a832c: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x010a7ce8: 0x10a7ce8: sw    v0, 16(sp)
+// 0x010a8330: 0x10a8330: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3336,39 +3336,39 @@ L_10a7c80:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a7cec: 0x10a7cec: lui   a0, 0x20000
+// 0x010a8334: 0x10a8334: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7cf0: 0x10a7cf0: lui   a1, 0x10000
+// 0x010a8338: 0x10a8338: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a7cf4: 0x10a7cf4: lui   v0, 0x10a0000
+// 0x010a833c: 0x10a833c: lui   v0, 0x10a0000
 	ldc.i4 17432576
 	stloc 5
-// 0x010a7cf8: 0x10a7cf8: addiu a0, a0, -3532
+// 0x010a8340: 0x10a8340: addiu a0, a0, -3068
 	ldloc.1
-	ldc.i4 -3532
+	ldc.i4 -3068
 	add
 	stloc.1
-// 0x010a7cfc: 0x10a7cfc: addiu a1, a1, 18500
+// 0x010a8344: 0x10a8344: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010a7d00: 0x10a7d00: addiu a2, sp, 32
+// 0x010a8348: 0x10a8348: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x010a7d04: 0x10a7d04: addiu a3, zero, 2
+// 0x010a834c: 0x10a834c: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x010a7d08: 0x10a7d08: addiu v0, v0, 28136
+// 0x010a8350: 0x10a8350: addiu v0, v0, 29744
 	ldloc 5
-	ldc.i4 28136
+	ldc.i4 29744
 	add
 	stloc 5
-// 0x010a7d0c: 0x10a7d0c: jal   0x1090ecc sw    v0, 20(sp)
+// 0x010a8354: 0x10a8354: jal   0x10914f0 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3382,27 +3382,27 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7d14: 0x10a7d14: addu  a0, v0, zero
+// 0x010a835c: 0x10a835c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a7d18: 0x10a7d18: addiu v1, zero, 10
+// 0x010a8360: 0x10a8360: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x010a7d1c: 0x10a7d1c: addiu a2, zero, -10
+// 0x010a8364: 0x10a8364: addiu a2, zero, -10
 	ldc.i4.s -10
 	stloc.3
-// 0x010a7d20: 0x10a7d20: addiu a3, zero, 300
+// 0x010a8368: 0x10a8368: addiu a3, zero, 300
 	ldc.i4 300
 	stloc 4
-// 0x010a7d24: 0x10a7d24: addiu a1, zero, -300
+// 0x010a836c: 0x10a836c: addiu a1, zero, -300
 	ldc.i4 -300
 	stloc.2
-// 0x010a7d28: 0x10a7d28: sw    v1, 16(sp)
+// 0x010a8370: 0x10a8370: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3411,7 +3411,7 @@ L_10a7c80:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a7d2c: 0x10a7d2c: jal   0x10991d0 sw    v0, 464(sp)
+// 0x010a8374: 0x10a8374: jal   0x1099818 sw    v0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3425,10 +3425,10 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_10991d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_1099818(int32,int32,int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a7d34: 0x10a7d34: lw    v0, 464(sp)
+// 0x010a837c: 0x10a837c: lw    v0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3437,20 +3437,20 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a7d38: 0x10a7d38: addu  a0, s0, zero
+// 0x010a8380: 0x10a8380: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a7d3c: 0x10a7d3c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a8384: 0x10a8384: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7d44: 0x10a7d44: jal   0x10a7664 ori   s7, s7, 136
+// 0x010a838c: 0x10a838c: jal   0x10a7cac ori   s7, s7, 136
 	ldloc 13
 	ldc.i4 136
 	or
@@ -3460,76 +3460,76 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7d4c: 0x10a7d4c: addu  a1, v0, zero
+// 0x010a8394: 0x10a8394: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7d50: 0x10a7d50: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a8398: 0x10a8398: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7d58: 0x10a7d58: addu  a0, s1, zero
+// 0x010a83a0: 0x10a83a0: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010a7d5c: 0x10a7d5c: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a83a4: 0x10a83a4: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7d64: 0x10a7d64: addu  a1, s1, zero
+// 0x010a83ac: 0x10a83ac: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x010a7d68: 0x10a7d68: jal   0x1098ec4 addu  a0, s8, zero
+// 0x010a83b0: 0x10a83b0: jal   0x109950c addu  a0, s8, zero
 	ldloc 18
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7d70: 0x10a7d70: lui   a0, 0x20000
+// 0x010a83b8: 0x10a83b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7d74: 0x10a7d74: lui   v0, 0x41000000
+// 0x010a83bc: 0x10a83bc: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x010a7d78: 0x10a7d78: addiu a0, a0, 8712
+// 0x010a83c0: 0x10a83c0: addiu a0, a0, 9176
 	ldloc.1
-	ldc.i4 8712
+	ldc.i4 9176
 	add
 	stloc.1
-// 0x010a7d7c: 0x10a7d7c: addu  a1, zero, zero
+// 0x010a83c4: 0x10a83c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7d80: 0x10a7d80: addiu a2, zero, -2
+// 0x010a83c8: 0x10a83c8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a7d84: 0x10a7d84: addiu a3, zero, -1
+// 0x010a83cc: 0x10a83cc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7d88: 0x10a7d88: ori   v0, v0, 20616
+// 0x010a83d0: 0x10a83d0: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010a7d8c: 0x10a7d8c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a83d4: 0x10a83d4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3543,35 +3543,35 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7d94: 0x10a7d94: lui   a0, 0x20000
+// 0x010a83dc: 0x10a83dc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7d98: 0x10a7d98: addu  s4, v0, zero
+// 0x010a83e0: 0x10a83e0: addu  s4, v0, zero
 	ldloc 5
 	stloc 16
-// 0x010a7d9c: 0x10a7d9c: addu  a1, zero, zero
+// 0x010a83e4: 0x10a83e4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7da0: 0x10a7da0: addiu a2, zero, -1
+// 0x010a83e8: 0x10a83e8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a7da4: 0x10a7da4: addiu a3, zero, -1
+// 0x010a83ec: 0x10a83ec: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7da8: 0x10a7da8: addiu a0, a0, 8728
+// 0x010a83f0: 0x10a83f0: addiu a0, a0, 9192
 	ldloc.1
-	ldc.i4 8728
+	ldc.i4 9192
 	add
 	stloc.1
-// 0x010a7dac: 0x10a7dac: addiu v0, zero, 136
+// 0x010a83f4: 0x10a83f4: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a7db0: 0x10a7db0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a83f8: 0x10a83f8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3585,20 +3585,20 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7db8: 0x10a7db8: lui   a0, 0x10000
+// 0x010a8400: 0x10a8400: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a7dbc: 0x10a7dbc: addiu a0, a0, -10616
+// 0x010a8404: 0x10a8404: addiu a0, a0, -10620
 	ldloc.1
-	ldc.i4 -10616
+	ldc.i4 -10620
 	add
 	stloc.1
-// 0x010a7dc0: 0x10a7dc0: jal   0x101cd60 addu  s0, v0, zero
+// 0x010a8408: 0x10a8408: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -3606,26 +3606,26 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7dc8: 0x10a7dc8: lui   a0, 0x20000
+// 0x010a8410: 0x10a8410: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7dcc: 0x10a7dcc: addiu a3, zero, 4240
+// 0x010a8414: 0x10a8414: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a7dd0: 0x10a7dd0: addiu a2, zero, 10
+// 0x010a8418: 0x10a8418: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010a7dd4: 0x10a7dd4: addiu a0, a0, 8756
+// 0x010a841c: 0x10a841c: addiu a0, a0, 9220
 	ldloc.1
-	ldc.i4 8756
+	ldc.i4 9220
 	add
 	stloc.1
-// 0x010a7dd8: 0x10a7dd8: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a8420: 0x10a8420: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3633,69 +3633,69 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7de0: 0x10a7de0: addu  a1, v0, zero
+// 0x010a8428: 0x10a8428: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7de4: 0x10a7de4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a842c: 0x10a842c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7dec: 0x10a7dec: addu  a0, s0, zero
+// 0x010a8434: 0x10a8434: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a7df0: 0x10a7df0: addu  a2, zero, zero
+// 0x010a8438: 0x10a8438: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7df4: 0x10a7df4: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a843c: 0x10a843c: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7dfc: 0x10a7dfc: addu  a1, s0, zero
+// 0x010a8444: 0x10a8444: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010a7e00: 0x10a7e00: jal   0x1098ec4 addu  a0, s8, zero
+// 0x010a8448: 0x10a8448: jal   0x109950c addu  a0, s8, zero
 	ldloc 18
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7e08: 0x10a7e08: lui   a0, 0x20000
+// 0x010a8450: 0x10a8450: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7e0c: 0x10a7e0c: addiu a3, zero, -1
+// 0x010a8454: 0x10a8454: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7e10: 0x10a7e10: addiu a2, zero, -2
+// 0x010a8458: 0x10a8458: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a7e14: 0x10a7e14: addiu a0, a0, 8784
+// 0x010a845c: 0x10a845c: addiu a0, a0, 9248
 	ldloc.1
-	ldc.i4 8784
+	ldc.i4 9248
 	add
 	stloc.1
-// 0x010a7e18: 0x10a7e18: addu  a1, zero, zero
+// 0x010a8460: 0x10a8460: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7e1c: 0x10a7e1c: jal   0x1093a24 sw    s7, 16(sp)
+// 0x010a8464: 0x10a8464: jal   0x1094048 sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3709,23 +3709,23 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7e24: 0x10a7e24: addu  s5, v0, zero
+// 0x010a846c: 0x10a846c: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a7e28: 0x10a7e28: lui   v0, 0x0
+// 0x010a8470: 0x10a8470: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a7e2c: 0x10a7e2c: addiu a0, v0, 32244
+// 0x010a8474: 0x10a8474: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a7e30: 0x10a7e30: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a8478: 0x10a8478: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3733,47 +3733,47 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7e38: 0x10a7e38: lui   s3, 0x0
+// 0x010a8480: 0x10a8480: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010a7e3c: 0x10a7e3c: lui   s2, 0x0
+// 0x010a8484: 0x10a8484: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010a7e40: 0x10a7e40: addu  a1, v0, zero
+// 0x010a8488: 0x10a8488: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7e44: 0x10a7e44: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a848c: 0x10a848c: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7e4c: 0x10a7e4c: addu  a0, s5, zero
+// 0x010a8494: 0x10a8494: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a7e50: 0x10a7e50: lui   v1, 0xf0000
+// 0x010a8498: 0x10a8498: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010a7e54: 0x10a7e54: addiu a1, s3, 31980
+// 0x010a849c: 0x10a849c: addiu a1, s3, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7e58: 0x10a7e58: addiu a2, s2, 23008
+// 0x010a84a0: 0x10a84a0: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a7e5c: 0x10a7e5c: jal   0x1098fe0 sw    v1, 468(sp)
+// 0x010a84a4: 0x10a84a4: jal   0x1099628 sw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3785,9 +3785,9 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7e64: 0x10a7e64: lw    v1, 468(sp)
+// 0x010a84ac: 0x10a84ac: lw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3796,41 +3796,41 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a7e68: 0x10a7e68: addiu s1, zero, 2
+// 0x010a84b0: 0x10a84b0: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 11
-// 0x010a7e6c: 0x10a7e6c: lw    a2, -30068(v1)
+// 0x010a84b4: 0x10a84b4: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a7e70: 0x10a7e70: lui   a0, 0x20000
+// 0x010a84b8: 0x10a84b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7e74: 0x10a7e74: div   a2, s1
+// 0x010a84bc: 0x10a84bc: div   a2, s1
 	ldloc.3
 	ldloc 11
 	div
 	stloc 14
-// 0x010a7e78: 0x10a7e78: addiu a3, zero, -1
+// 0x010a84c0: 0x10a84c0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7e7c: 0x10a7e7c: addiu a0, a0, 8808
+// 0x010a84c4: 0x10a84c4: addiu a0, a0, 9272
 	ldloc.1
-	ldc.i4 8808
+	ldc.i4 9272
 	add
 	stloc.1
-// 0x010a7e80: 0x10a7e80: addu  a1, zero, zero
+// 0x010a84c8: 0x10a84c8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7e84: 0x10a7e84: addiu v0, zero, 16
+// 0x010a84cc: 0x10a84cc: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a7e88: 0x10a7e88: sw    v0, 16(sp)
+// 0x010a84d0: 0x10a84d0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3839,15 +3839,15 @@ L_10a7c80:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a7e8c: 0x10a7e8c: addiu s0, sp, 40
+// 0x010a84d4: 0x10a84d4: addiu s0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x010a7e90: 0x10a7e90: mflo  lo
+// 0x010a84d8: 0x10a84d8: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a7e94: 0x10a7e94: jal   0x1093a24 lui   s6, 0x0
+// 0x010a84dc: 0x10a84dc: jal   0x1094048 lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 15
 	ldloc.0
@@ -3855,25 +3855,25 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7e9c: 0x10a7e9c: addu  a0, s5, zero
+// 0x010a84e4: 0x10a84e4: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a7ea0: 0x10a7ea0: addiu a1, s3, 31980
+// 0x010a84e8: 0x10a84e8: addiu a1, s3, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7ea4: 0x10a7ea4: addiu a2, s2, 23008
+// 0x010a84ec: 0x10a84ec: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a7ea8: 0x10a7ea8: jal   0x1098fe0 sw    v0, 456(sp)
+// 0x010a84f0: 0x10a84f0: jal   0x1099628 sw    v0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3885,14 +3885,14 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7eb0: 0x10a7eb0: lui   a0, 0x20000
+// 0x010a84f8: 0x10a84f8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7eb4: 0x10a7eb4: jal   0x101cd60 addiu a0, a0, 8012
+// 0x010a84fc: 0x10a84fc: jal   0x101cd70 addiu a0, a0, 8476
 	ldloc.1
-	ldc.i4 8012
+	ldc.i4 8476
 	add
 	stloc.1
 	ldloc.0
@@ -3900,26 +3900,26 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ebc: 0x10a7ebc: lui   a0, 0x20000
+// 0x010a8504: 0x10a8504: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7ec0: 0x10a7ec0: addiu a3, zero, 4240
+// 0x010a8508: 0x10a8508: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a7ec4: 0x10a7ec4: addiu a2, zero, -1
+// 0x010a850c: 0x10a850c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a7ec8: 0x10a7ec8: addiu a0, a0, 8836
+// 0x010a8510: 0x10a8510: addiu a0, a0, 9300
 	ldloc.1
-	ldc.i4 8836
+	ldc.i4 9300
 	add
 	stloc.1
-// 0x010a7ecc: 0x10a7ecc: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a8514: 0x10a8514: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3927,12 +3927,12 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ed4: 0x10a7ed4: lw    a0, 456(sp)
+// 0x010a851c: 0x10a851c: lw    a0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3941,17 +3941,17 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a7ed8: 0x10a7ed8: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a8520: 0x10a8520: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7ee0: 0x10a7ee0: lw    a0, 456(sp)
+// 0x010a8528: 0x10a8528: lw    a0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3960,18 +3960,18 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a7ee4: 0x10a7ee4: addu  a2, zero, zero
+// 0x010a852c: 0x10a852c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a7ee8: 0x10a7ee8: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a8530: 0x10a8530: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7ef0: 0x10a7ef0: lw    a1, 456(sp)
+// 0x010a8538: 0x10a8538: lw    a1, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3980,28 +3980,28 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a7ef4: 0x10a7ef4: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a853c: 0x10a853c: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7efc: 0x10a7efc: lui   a1, 0x0
+// 0x010a8544: 0x10a8544: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7f00: 0x10a7f00: addiu a2, zero, 16
+// 0x010a8548: 0x10a8548: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a7f04: 0x10a7f04: addiu a1, a1, 18496
+// 0x010a854c: 0x10a854c: addiu a1, a1, 18496
 	ldloc.2
 	ldc.i4 18496
 	add
 	stloc.2
-// 0x010a7f08: 0x10a7f08: jal   0x1001800 addu  a0, s0, zero
+// 0x010a8550: 0x10a8550: jal   0x1001800 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4013,10 +4013,10 @@ L_10a7c80:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f10: 0x10a7f10: addu  a0, s0, zero
+// 0x010a8558: 0x10a8558: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a7f14: 0x10a7f14: jal   0x100e7f4 addiu a1, s6, 20820
+// 0x010a855c: 0x10a855c: jal   0x100e804 addiu a1, s6, 20820
 	ldloc 15
 	ldc.i4 20820
 	add
@@ -4026,31 +4026,31 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f1c: 0x10a7f1c: lui   a0, 0x20000
+// 0x010a8564: 0x10a8564: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7f20: 0x10a7f20: addiu a2, zero, 2
+// 0x010a8568: 0x10a8568: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a7f24: 0x10a7f24: addu  a3, zero, zero
+// 0x010a856c: 0x10a856c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a7f28: 0x10a7f28: addiu a0, a0, 8008
+// 0x010a8570: 0x10a8570: addiu a0, a0, 8472
 	ldloc.1
-	ldc.i4 8008
+	ldc.i4 8472
 	add
 	stloc.1
-// 0x010a7f2c: 0x10a7f2c: sltu  a1, zero, v0
+// 0x010a8574: 0x10a8574: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a7f30: 0x10a7f30: sw    zero, 16(sp)
+// 0x010a8578: 0x10a8578: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4059,7 +4059,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7f34: 0x10a7f34: sw    zero, 20(sp)
+// 0x010a857c: 0x10a857c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4068,7 +4068,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a7f38: 0x10a7f38: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a8580: 0x10a8580: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4082,79 +4082,79 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f40: 0x10a7f40: addu  a1, v0, zero
+// 0x010a8588: 0x10a8588: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7f44: 0x10a7f44: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a858c: 0x10a858c: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f4c: 0x10a7f4c: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a8594: 0x10a8594: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f54: 0x10a7f54: addu  a1, v0, zero
+// 0x010a859c: 0x10a859c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7f58: 0x10a7f58: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a85a0: 0x10a85a0: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f60: 0x10a7f60: addu  a1, s5, zero
+// 0x010a85a8: 0x10a85a8: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x010a7f64: 0x10a7f64: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a85ac: 0x10a85ac: jal   0x109950c addu  a0, s4, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f6c: 0x10a7f6c: lui   a0, 0x20000
+// 0x010a85b4: 0x10a85b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7f70: 0x10a7f70: addiu a3, zero, -1
+// 0x010a85b8: 0x10a85b8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7f74: 0x10a7f74: addiu a2, zero, -2
+// 0x010a85bc: 0x10a85bc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a7f78: 0x10a7f78: addiu a0, a0, 8860
+// 0x010a85c0: 0x10a85c0: addiu a0, a0, 9324
 	ldloc.1
-	ldc.i4 8860
+	ldc.i4 9324
 	add
 	stloc.1
-// 0x010a7f7c: 0x10a7f7c: addu  a1, zero, zero
+// 0x010a85c4: 0x10a85c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7f80: 0x10a7f80: jal   0x1093a24 sw    s7, 16(sp)
+// 0x010a85c8: 0x10a85c8: jal   0x1094048 sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4168,23 +4168,23 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f88: 0x10a7f88: addu  s5, v0, zero
+// 0x010a85d0: 0x10a85d0: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a7f8c: 0x10a7f8c: lui   v0, 0x0
+// 0x010a85d4: 0x10a85d4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a7f90: 0x10a7f90: addiu a0, v0, 32244
+// 0x010a85d8: 0x10a85d8: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a7f94: 0x10a7f94: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010a85dc: 0x10a85dc: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -4192,33 +4192,33 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7f9c: 0x10a7f9c: addu  a1, v0, zero
+// 0x010a85e4: 0x10a85e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a7fa0: 0x10a7fa0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a85e8: 0x10a85e8: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7fa8: 0x10a7fa8: addu  a0, s5, zero
+// 0x010a85f0: 0x10a85f0: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a7fac: 0x10a7fac: addiu a1, s3, 31980
+// 0x010a85f4: 0x10a85f4: addiu a1, s3, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7fb0: 0x10a7fb0: jal   0x1098fe0 addiu a2, s2, 23008
+// 0x010a85f8: 0x10a85f8: jal   0x1099628 addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
@@ -4226,9 +4226,9 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7fb8: 0x10a7fb8: lw    v1, 468(sp)
+// 0x010a8600: 0x10a8600: lw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4237,41 +4237,41 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a7fbc: 0x10a7fbc: lui   a0, 0x20000
+// 0x010a8604: 0x10a8604: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7fc0: 0x10a7fc0: lw    a2, -30068(v1)
+// 0x010a8608: 0x10a8608: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a7fc4: 0x10a7fc4: addiu a3, zero, -1
+// 0x010a860c: 0x10a860c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a7fc8: 0x10a7fc8: div   a2, s1
+// 0x010a8610: 0x10a8610: div   a2, s1
 	ldloc.3
 	ldloc 11
 	div
 	stloc 14
-// 0x010a7fcc: 0x10a7fcc: addiu a0, a0, 8880
+// 0x010a8614: 0x10a8614: addiu a0, a0, 9344
 	ldloc.1
-	ldc.i4 8880
+	ldc.i4 9344
 	add
 	stloc.1
-// 0x010a7fd0: 0x10a7fd0: addu  a1, zero, zero
+// 0x010a8618: 0x10a8618: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a7fd4: 0x10a7fd4: addiu v0, zero, 16
+// 0x010a861c: 0x10a861c: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a7fd8: 0x10a7fd8: mflo  lo
+// 0x010a8620: 0x10a8620: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a7fdc: 0x10a7fdc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a8624: 0x10a8624: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4285,25 +4285,25 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a7fe4: 0x10a7fe4: addu  a0, s5, zero
+// 0x010a862c: 0x10a862c: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a7fe8: 0x10a7fe8: addiu a1, s3, 31980
+// 0x010a8630: 0x10a8630: addiu a1, s3, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a7fec: 0x10a7fec: addiu a2, s2, 23008
+// 0x010a8634: 0x10a8634: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a7ff0: 0x10a7ff0: jal   0x1098fe0 sw    v0, 456(sp)
+// 0x010a8638: 0x10a8638: jal   0x1099628 sw    v0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4315,14 +4315,14 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a7ff8: 0x10a7ff8: lui   a0, 0x20000
+// 0x010a8640: 0x10a8640: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a7ffc: 0x10a7ffc: jal   0x101cd60 addiu a0, a0, 7976
+// 0x010a8644: 0x10a8644: jal   0x101cd70 addiu a0, a0, 8440
 	ldloc.1
-	ldc.i4 7976
+	ldc.i4 8440
 	add
 	stloc.1
 	ldloc.0
@@ -4330,26 +4330,26 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8004: 0x10a8004: lui   a0, 0x20000
+// 0x010a864c: 0x10a864c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8008: 0x10a8008: addiu a3, zero, 4240
+// 0x010a8650: 0x10a8650: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a800c: 0x10a800c: addiu a2, zero, -1
+// 0x010a8654: 0x10a8654: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a8010: 0x10a8010: addiu a0, a0, 8904
+// 0x010a8658: 0x10a8658: addiu a0, a0, 9368
 	ldloc.1
-	ldc.i4 8904
+	ldc.i4 9368
 	add
 	stloc.1
-// 0x010a8014: 0x10a8014: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a865c: 0x10a865c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4357,12 +4357,12 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a801c: 0x10a801c: lw    a0, 456(sp)
+// 0x010a8664: 0x10a8664: lw    a0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4371,17 +4371,17 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a8020: 0x10a8020: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a8668: 0x10a8668: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8028: 0x10a8028: lw    a0, 456(sp)
+// 0x010a8670: 0x10a8670: lw    a0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4390,18 +4390,18 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a802c: 0x10a802c: addu  a2, zero, zero
+// 0x010a8674: 0x10a8674: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8030: 0x10a8030: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a8678: 0x10a8678: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8038: 0x10a8038: lw    a1, 456(sp)
+// 0x010a8680: 0x10a8680: lw    a1, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4410,28 +4410,28 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a803c: 0x10a803c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a8684: 0x10a8684: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8044: 0x10a8044: lui   a1, 0x0
+// 0x010a868c: 0x10a868c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8048: 0x10a8048: addiu a2, zero, 16
+// 0x010a8690: 0x10a8690: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a804c: 0x10a804c: addiu a1, a1, 18416
+// 0x010a8694: 0x10a8694: addiu a1, a1, 18416
 	ldloc.2
 	ldc.i4 18416
 	add
 	stloc.2
-// 0x010a8050: 0x10a8050: jal   0x1001800 addu  a0, s0, zero
+// 0x010a8698: 0x10a8698: jal   0x1001800 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4443,10 +4443,10 @@ L_10a7c80:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8058: 0x10a8058: addu  a0, s0, zero
+// 0x010a86a0: 0x10a86a0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a805c: 0x10a805c: jal   0x100e7f4 addiu a1, s6, 20820
+// 0x010a86a4: 0x10a86a4: jal   0x100e804 addiu a1, s6, 20820
 	ldloc 15
 	ldc.i4 20820
 	add
@@ -4456,31 +4456,31 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8064: 0x10a8064: lui   a0, 0x20000
+// 0x010a86ac: 0x10a86ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8068: 0x10a8068: addiu a2, zero, 2
+// 0x010a86b0: 0x10a86b0: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a806c: 0x10a806c: addu  a3, zero, zero
+// 0x010a86b4: 0x10a86b4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a8070: 0x10a8070: addiu a0, a0, 7972
+// 0x010a86b8: 0x10a86b8: addiu a0, a0, 8436
 	ldloc.1
-	ldc.i4 7972
+	ldc.i4 8436
 	add
 	stloc.1
-// 0x010a8074: 0x10a8074: sltu  a1, zero, v0
+// 0x010a86bc: 0x10a86bc: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a8078: 0x10a8078: sw    zero, 16(sp)
+// 0x010a86c0: 0x10a86c0: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4489,7 +4489,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a807c: 0x10a807c: sw    zero, 20(sp)
+// 0x010a86c4: 0x10a86c4: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4498,7 +4498,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a8080: 0x10a8080: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a86c8: 0x10a86c8: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4512,79 +4512,79 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8088: 0x10a8088: addu  a1, v0, zero
+// 0x010a86d0: 0x10a86d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a808c: 0x10a808c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a86d4: 0x10a86d4: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8094: 0x10a8094: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a86dc: 0x10a86dc: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a809c: 0x10a809c: addu  a1, v0, zero
+// 0x010a86e4: 0x10a86e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a80a0: 0x10a80a0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a86e8: 0x10a86e8: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a80a8: 0x10a80a8: addu  a1, s5, zero
+// 0x010a86f0: 0x10a86f0: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x010a80ac: 0x10a80ac: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a86f4: 0x10a86f4: jal   0x109950c addu  a0, s4, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a80b4: 0x10a80b4: lui   a0, 0x20000
+// 0x010a86fc: 0x10a86fc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a80b8: 0x10a80b8: addiu a3, zero, -1
+// 0x010a8700: 0x10a8700: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a80bc: 0x10a80bc: addiu a0, a0, 8924
+// 0x010a8704: 0x10a8704: addiu a0, a0, 9388
 	ldloc.1
-	ldc.i4 8924
+	ldc.i4 9388
 	add
 	stloc.1
-// 0x010a80c0: 0x10a80c0: addu  a1, zero, zero
+// 0x010a8708: 0x10a8708: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a80c4: 0x10a80c4: addiu a2, zero, -2
+// 0x010a870c: 0x10a870c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a80c8: 0x10a80c8: jal   0x1093a24 sw    s7, 16(sp)
+// 0x010a8710: 0x10a8710: jal   0x1094048 sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4598,33 +4598,33 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a80d0: 0x10a80d0: addu  a0, v0, zero
+// 0x010a8718: 0x10a8718: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a80d4: 0x10a80d4: addiu a1, s3, 31980
+// 0x010a871c: 0x10a871c: addiu a1, s3, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a80d8: 0x10a80d8: addiu a2, s2, 23008
+// 0x010a8720: 0x10a8720: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a80dc: 0x10a80dc: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010a8724: 0x10a8724: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a80e4: 0x10a80e4: lw    v1, 468(sp)
+// 0x010a872c: 0x10a872c: lw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4633,41 +4633,41 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a80e8: 0x10a80e8: lui   a0, 0x20000
+// 0x010a8730: 0x10a8730: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a80ec: 0x10a80ec: lw    a2, -30068(v1)
+// 0x010a8734: 0x10a8734: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a80f0: 0x10a80f0: addiu a3, zero, -1
+// 0x010a8738: 0x10a8738: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a80f4: 0x10a80f4: div   a2, s1
+// 0x010a873c: 0x10a873c: div   a2, s1
 	ldloc.3
 	ldloc 11
 	div
 	stloc 14
-// 0x010a80f8: 0x10a80f8: addiu a0, a0, 8944
+// 0x010a8740: 0x10a8740: addiu a0, a0, 9408
 	ldloc.1
-	ldc.i4 8944
+	ldc.i4 9408
 	add
 	stloc.1
-// 0x010a80fc: 0x10a80fc: addu  a1, zero, zero
+// 0x010a8744: 0x10a8744: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8100: 0x10a8100: addiu v0, zero, 16
+// 0x010a8748: 0x10a8748: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a8104: 0x10a8104: mflo  lo
+// 0x010a874c: 0x10a874c: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a8108: 0x10a8108: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a8750: 0x10a8750: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4681,21 +4681,21 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8110: 0x10a8110: addu  a0, v0, zero
+// 0x010a8758: 0x10a8758: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8114: 0x10a8114: addu  a1, zero, zero
+// 0x010a875c: 0x10a875c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8118: 0x10a8118: addu  a2, zero, zero
+// 0x010a8760: 0x10a8760: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a811c: 0x10a811c: jal   0x1098fe0 sw    v0, 464(sp)
+// 0x010a8764: 0x10a8764: jal   0x1099628 sw    v0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4707,14 +4707,14 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8124: 0x10a8124: lui   a0, 0x20000
+// 0x010a876c: 0x10a876c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8128: 0x10a8128: jal   0x101cd60 addiu a0, a0, 8968
+// 0x010a8770: 0x10a8770: jal   0x101cd70 addiu a0, a0, 9432
 	ldloc.1
-	ldc.i4 8968
+	ldc.i4 9432
 	add
 	stloc.1
 	ldloc.0
@@ -4722,26 +4722,26 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8130: 0x10a8130: lui   a0, 0x20000
+// 0x010a8778: 0x10a8778: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8134: 0x10a8134: addiu a3, zero, 4240
+// 0x010a877c: 0x10a877c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a8138: 0x10a8138: addiu a2, zero, -1
+// 0x010a8780: 0x10a8780: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a813c: 0x10a813c: addiu a0, a0, 8996
+// 0x010a8784: 0x10a8784: addiu a0, a0, 9460
 	ldloc.1
-	ldc.i4 8996
+	ldc.i4 9460
 	add
 	stloc.1
-// 0x010a8140: 0x10a8140: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a8788: 0x10a8788: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4749,12 +4749,12 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8148: 0x10a8148: lw    t0, 464(sp)
+// 0x010a8790: 0x10a8790: lw    t0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4763,20 +4763,20 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a814c: 0x10a814c: addu  a1, v0, zero
+// 0x010a8794: 0x10a8794: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8150: 0x10a8150: jal   0x1098ec4 addu  a0, t0, zero
+// 0x010a8798: 0x10a8798: jal   0x109950c addu  a0, t0, zero
 	ldloc 17
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8158: 0x10a8158: lw    t0, 464(sp)
+// 0x010a87a0: 0x10a87a0: lw    t0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4785,31 +4785,31 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a815c: 0x10a815c: addu  a0, s5, zero
+// 0x010a87a4: 0x10a87a4: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a8160: 0x10a8160: jal   0x1098ec4 addu  a1, t0, zero
+// 0x010a87a8: 0x10a87a8: jal   0x109950c addu  a1, t0, zero
 	ldloc 17
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8168: 0x10a8168: lui   a1, 0x0
+// 0x010a87b0: 0x10a87b0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a816c: 0x10a816c: addiu a2, zero, 16
+// 0x010a87b4: 0x10a87b4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a8170: 0x10a8170: addiu a1, a1, 18448
+// 0x010a87b8: 0x10a87b8: addiu a1, a1, 18448
 	ldloc.2
 	ldc.i4 18448
 	add
 	stloc.2
-// 0x010a8174: 0x10a8174: jal   0x1001800 addu  a0, s0, zero
+// 0x010a87bc: 0x10a87bc: jal   0x1001800 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4821,10 +4821,10 @@ L_10a7c80:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a817c: 0x10a817c: addu  a0, s0, zero
+// 0x010a87c4: 0x10a87c4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a8180: 0x10a8180: jal   0x100e7f4 addiu a1, s6, 20820
+// 0x010a87c8: 0x10a87c8: jal   0x100e804 addiu a1, s6, 20820
 	ldloc 15
 	ldc.i4 20820
 	add
@@ -4834,31 +4834,31 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8188: 0x10a8188: lui   a0, 0x20000
+// 0x010a87d0: 0x10a87d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a818c: 0x10a818c: addiu a2, zero, 2
+// 0x010a87d4: 0x10a87d4: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a8190: 0x10a8190: addu  a3, zero, zero
+// 0x010a87d8: 0x10a87d8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a8194: 0x10a8194: addiu a0, a0, 7984
+// 0x010a87dc: 0x10a87dc: addiu a0, a0, 8448
 	ldloc.1
-	ldc.i4 7984
+	ldc.i4 8448
 	add
 	stloc.1
-// 0x010a8198: 0x10a8198: sltu  a1, zero, v0
+// 0x010a87e0: 0x10a87e0: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a819c: 0x10a819c: sw    zero, 16(sp)
+// 0x010a87e4: 0x10a87e4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4867,7 +4867,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a81a0: 0x10a81a0: sw    zero, 20(sp)
+// 0x010a87e8: 0x10a87e8: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4876,7 +4876,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a81a4: 0x10a81a4: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a87ec: 0x10a87ec: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4890,79 +4890,79 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a81ac: 0x10a81ac: addu  a1, v0, zero
+// 0x010a87f4: 0x10a87f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a81b0: 0x10a81b0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a87f8: 0x10a87f8: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a81b8: 0x10a81b8: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a8800: 0x10a8800: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a81c0: 0x10a81c0: addu  a1, v0, zero
+// 0x010a8808: 0x10a8808: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a81c4: 0x10a81c4: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a880c: 0x10a880c: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a81cc: 0x10a81cc: addu  a1, s5, zero
+// 0x010a8814: 0x10a8814: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x010a81d0: 0x10a81d0: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a8818: 0x10a8818: jal   0x109950c addu  a0, s4, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a81d8: 0x10a81d8: lui   a0, 0x20000
+// 0x010a8820: 0x10a8820: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a81dc: 0x10a81dc: addiu a3, zero, -1
+// 0x010a8824: 0x10a8824: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a81e0: 0x10a81e0: addiu a2, zero, -2
+// 0x010a8828: 0x10a8828: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a81e4: 0x10a81e4: addiu a0, a0, 9024
+// 0x010a882c: 0x10a882c: addiu a0, a0, 9488
 	ldloc.1
-	ldc.i4 9024
+	ldc.i4 9488
 	add
 	stloc.1
-// 0x010a81e8: 0x10a81e8: addu  a1, zero, zero
+// 0x010a8830: 0x10a8830: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a81ec: 0x10a81ec: jal   0x1093a24 sw    s7, 16(sp)
+// 0x010a8834: 0x10a8834: jal   0x1094048 sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4976,23 +4976,23 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a81f4: 0x10a81f4: addu  s5, v0, zero
+// 0x010a883c: 0x10a883c: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a81f8: 0x10a81f8: lui   v0, 0x0
+// 0x010a8840: 0x10a8840: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a81fc: 0x10a81fc: addiu a0, v0, 32244
+// 0x010a8844: 0x10a8844: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a8200: 0x10a8200: jal   0x109e6d0 addiu a1, zero, 1024
+// 0x010a8848: 0x10a8848: jal   0x109ed18 addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
 	ldloc.0
@@ -5000,33 +5000,33 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8208: 0x10a8208: addu  a1, v0, zero
+// 0x010a8850: 0x10a8850: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a820c: 0x10a820c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a8854: 0x10a8854: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8214: 0x10a8214: addu  a0, s5, zero
+// 0x010a885c: 0x10a885c: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a8218: 0x10a8218: addiu a1, s3, 31980
+// 0x010a8860: 0x10a8860: addiu a1, s3, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a821c: 0x10a821c: jal   0x1098fe0 addiu a2, s2, 23008
+// 0x010a8864: 0x10a8864: jal   0x1099628 addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
@@ -5034,9 +5034,9 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8224: 0x10a8224: lw    v1, 468(sp)
+// 0x010a886c: 0x10a886c: lw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5045,41 +5045,41 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a8228: 0x10a8228: lui   a0, 0x20000
+// 0x010a8870: 0x10a8870: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a822c: 0x10a822c: lw    a2, -30068(v1)
+// 0x010a8874: 0x10a8874: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a8230: 0x10a8230: addiu a3, zero, -1
+// 0x010a8878: 0x10a8878: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8234: 0x10a8234: div   a2, s1
+// 0x010a887c: 0x10a887c: div   a2, s1
 	ldloc.3
 	ldloc 11
 	div
 	stloc 14
-// 0x010a8238: 0x10a8238: addiu a0, a0, 9044
+// 0x010a8880: 0x10a8880: addiu a0, a0, 9508
 	ldloc.1
-	ldc.i4 9044
+	ldc.i4 9508
 	add
 	stloc.1
-// 0x010a823c: 0x10a823c: addu  a1, zero, zero
+// 0x010a8884: 0x10a8884: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8240: 0x10a8240: addiu v0, zero, 16
+// 0x010a8888: 0x10a8888: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a8244: 0x10a8244: mflo  lo
+// 0x010a888c: 0x10a888c: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a8248: 0x10a8248: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a8890: 0x10a8890: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5093,21 +5093,21 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8250: 0x10a8250: addu  a0, v0, zero
+// 0x010a8898: 0x10a8898: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8254: 0x10a8254: addu  a1, zero, zero
+// 0x010a889c: 0x10a889c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8258: 0x10a8258: addu  a2, zero, zero
+// 0x010a88a0: 0x10a88a0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a825c: 0x10a825c: jal   0x1098fe0 sw    v0, 464(sp)
+// 0x010a88a4: 0x10a88a4: jal   0x1099628 sw    v0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5119,14 +5119,14 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8264: 0x10a8264: lui   a0, 0x20000
+// 0x010a88ac: 0x10a88ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8268: 0x10a8268: jal   0x101cd60 addiu a0, a0, 9068
+// 0x010a88b0: 0x10a88b0: jal   0x101cd70 addiu a0, a0, 9532
 	ldloc.1
-	ldc.i4 9068
+	ldc.i4 9532
 	add
 	stloc.1
 	ldloc.0
@@ -5134,26 +5134,26 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8270: 0x10a8270: lui   a0, 0x20000
+// 0x010a88b8: 0x10a88b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8274: 0x10a8274: addiu a3, zero, 4240
+// 0x010a88bc: 0x10a88bc: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a8278: 0x10a8278: addiu a2, zero, -1
+// 0x010a88c0: 0x10a88c0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a827c: 0x10a827c: addiu a0, a0, 9080
+// 0x010a88c4: 0x10a88c4: addiu a0, a0, 9544
 	ldloc.1
-	ldc.i4 9080
+	ldc.i4 9544
 	add
 	stloc.1
-// 0x010a8280: 0x10a8280: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a88c8: 0x10a88c8: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5161,12 +5161,12 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8288: 0x10a8288: lw    t0, 464(sp)
+// 0x010a88d0: 0x10a88d0: lw    t0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5175,20 +5175,20 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a828c: 0x10a828c: addu  a1, v0, zero
+// 0x010a88d4: 0x10a88d4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8290: 0x10a8290: jal   0x1098ec4 addu  a0, t0, zero
+// 0x010a88d8: 0x10a88d8: jal   0x109950c addu  a0, t0, zero
 	ldloc 17
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8298: 0x10a8298: lw    t0, 464(sp)
+// 0x010a88e0: 0x10a88e0: lw    t0, 464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5197,31 +5197,31 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a829c: 0x10a829c: addu  a0, s5, zero
+// 0x010a88e4: 0x10a88e4: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a82a0: 0x10a82a0: jal   0x1098ec4 addu  a1, t0, zero
+// 0x010a88e8: 0x10a88e8: jal   0x109950c addu  a1, t0, zero
 	ldloc 17
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a82a8: 0x10a82a8: lui   a1, 0x0
+// 0x010a88f0: 0x10a88f0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a82ac: 0x10a82ac: addiu a2, zero, 16
+// 0x010a88f4: 0x10a88f4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a82b0: 0x10a82b0: addiu a1, a1, 18432
+// 0x010a88f8: 0x10a88f8: addiu a1, a1, 18432
 	ldloc.2
 	ldc.i4 18432
 	add
 	stloc.2
-// 0x010a82b4: 0x10a82b4: jal   0x1001800 addu  a0, s0, zero
+// 0x010a88fc: 0x10a88fc: jal   0x1001800 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5233,10 +5233,10 @@ L_10a7c80:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a82bc: 0x10a82bc: addu  a0, s0, zero
+// 0x010a8904: 0x10a8904: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a82c0: 0x10a82c0: jal   0x100e7f4 addiu a1, s6, 20820
+// 0x010a8908: 0x10a8908: jal   0x100e804 addiu a1, s6, 20820
 	ldloc 15
 	ldc.i4 20820
 	add
@@ -5246,31 +5246,31 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a82c8: 0x10a82c8: lui   a0, 0x20000
+// 0x010a8910: 0x10a8910: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a82cc: 0x10a82cc: addiu a2, zero, 2
+// 0x010a8914: 0x10a8914: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a82d0: 0x10a82d0: addu  a3, zero, zero
+// 0x010a8918: 0x10a8918: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a82d4: 0x10a82d4: addiu a0, a0, 7996
+// 0x010a891c: 0x10a891c: addiu a0, a0, 8460
 	ldloc.1
-	ldc.i4 7996
+	ldc.i4 8460
 	add
 	stloc.1
-// 0x010a82d8: 0x10a82d8: sltu  a1, zero, v0
+// 0x010a8920: 0x10a8920: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a82dc: 0x10a82dc: sw    zero, 16(sp)
+// 0x010a8924: 0x10a8924: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5279,7 +5279,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a82e0: 0x10a82e0: sw    zero, 20(sp)
+// 0x010a8928: 0x10a8928: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5288,7 +5288,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a82e4: 0x10a82e4: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a892c: 0x10a892c: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5302,79 +5302,79 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a82ec: 0x10a82ec: addu  a1, v0, zero
+// 0x010a8934: 0x10a8934: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a82f0: 0x10a82f0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a8938: 0x10a8938: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a82f8: 0x10a82f8: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a8940: 0x10a8940: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8300: 0x10a8300: addu  a1, v0, zero
+// 0x010a8948: 0x10a8948: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8304: 0x10a8304: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a894c: 0x10a894c: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a830c: 0x10a830c: addu  a1, s5, zero
+// 0x010a8954: 0x10a8954: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x010a8310: 0x10a8310: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010a8958: 0x10a8958: jal   0x109950c addu  a0, s4, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8318: 0x10a8318: lui   a0, 0x20000
+// 0x010a8960: 0x10a8960: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a831c: 0x10a831c: addiu a3, zero, -1
+// 0x010a8964: 0x10a8964: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8320: 0x10a8320: addiu a2, zero, -2
+// 0x010a8968: 0x10a8968: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a8324: 0x10a8324: addiu a0, a0, 9100
+// 0x010a896c: 0x10a896c: addiu a0, a0, 9564
 	ldloc.1
-	ldc.i4 9100
+	ldc.i4 9564
 	add
 	stloc.1
-// 0x010a8328: 0x10a8328: addu  a1, zero, zero
+// 0x010a8970: 0x10a8970: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a832c: 0x10a832c: jal   0x1093a24 sw    s7, 16(sp)
+// 0x010a8974: 0x10a8974: jal   0x1094048 sw    s7, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5388,23 +5388,23 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8334: 0x10a8334: addu  s5, v0, zero
+// 0x010a897c: 0x10a897c: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a8338: 0x10a8338: lui   v0, 0x0
+// 0x010a8980: 0x10a8980: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a833c: 0x10a833c: addiu a0, v0, 32244
+// 0x010a8984: 0x10a8984: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a8340: 0x10a8340: jal   0x109e6d0 addiu a1, zero, 1024
+// 0x010a8988: 0x10a8988: jal   0x109ed18 addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
 	ldloc.0
@@ -5412,33 +5412,33 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8348: 0x10a8348: addu  a1, v0, zero
+// 0x010a8990: 0x10a8990: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a834c: 0x10a834c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a8994: 0x10a8994: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8354: 0x10a8354: addu  a0, s5, zero
+// 0x010a899c: 0x10a899c: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a8358: 0x10a8358: addiu a1, s3, 31980
+// 0x010a89a0: 0x10a89a0: addiu a1, s3, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a835c: 0x10a835c: jal   0x1098fe0 addiu a2, s2, 23008
+// 0x010a89a4: 0x10a89a4: jal   0x1099628 addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
@@ -5446,9 +5446,9 @@ L_10a7c80:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8364: 0x10a8364: lw    v1, 468(sp)
+// 0x010a89ac: 0x10a89ac: lw    v1, 468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5457,41 +5457,41 @@ L_10a7c80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a8368: 0x10a8368: lui   a0, 0x20000
+// 0x010a89b0: 0x10a89b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a836c: 0x10a836c: lw    a2, -30068(v1)
+// 0x010a89b4: 0x10a89b4: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a8370: 0x10a8370: addiu a3, zero, -1
+// 0x010a89b8: 0x10a89b8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8374: 0x10a8374: div   a2, s1
+// 0x010a89bc: 0x10a89bc: div   a2, s1
 	ldloc.3
 	ldloc 11
 	div
 	stloc 14
-// 0x010a8378: 0x10a8378: addiu a0, a0, 9120
+// 0x010a89c0: 0x10a89c0: addiu a0, a0, 9584
 	ldloc.1
-	ldc.i4 9120
+	ldc.i4 9584
 	add
 	stloc.1
-// 0x010a837c: 0x10a837c: addu  a1, zero, zero
+// 0x010a89c4: 0x10a89c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8380: 0x10a8380: addiu v0, zero, 16
+// 0x010a89c8: 0x10a89c8: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010a8384: 0x10a8384: mflo  lo
+// 0x010a89cc: 0x10a89cc: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010a8388: 0x10a8388: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a89d0: 0x10a89d0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5505,34 +5505,34 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8390: 0x10a8390: addu  a0, v0, zero
+// 0x010a89d8: 0x10a89d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8394: 0x10a8394: addu  a1, zero, zero
+// 0x010a89dc: 0x10a89dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8398: 0x10a8398: addu  a2, zero, zero
+// 0x010a89e0: 0x10a89e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a839c: 0x10a839c: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010a89e4: 0x10a89e4: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a83a4: 0x10a83a4: lui   a0, 0x20000
+// 0x010a89ec: 0x10a89ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a83a8: 0x10a83a8: jal   0x101cd60 addiu a0, a0, 9144
+// 0x010a89f0: 0x10a89f0: jal   0x101cd70 addiu a0, a0, 9608
 	ldloc.1
-	ldc.i4 9144
+	ldc.i4 9608
 	add
 	stloc.1
 	ldloc.0
@@ -5540,26 +5540,26 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a83b0: 0x10a83b0: lui   a0, 0x20000
+// 0x010a89f8: 0x10a89f8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a83b4: 0x10a83b4: addiu a3, zero, 4240
+// 0x010a89fc: 0x10a89fc: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a83b8: 0x10a83b8: addiu a2, zero, -1
+// 0x010a8a00: 0x10a8a00: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a83bc: 0x10a83bc: addiu a0, a0, 9160
+// 0x010a8a04: 0x10a8a04: addiu a0, a0, 9624
 	ldloc.1
-	ldc.i4 9160
+	ldc.i4 9624
 	add
 	stloc.1
-// 0x010a83c0: 0x10a83c0: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a8a08: 0x10a8a08: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5567,49 +5567,49 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a83c8: 0x10a83c8: addu  a1, v0, zero
+// 0x010a8a10: 0x10a8a10: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a83cc: 0x10a83cc: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a8a14: 0x10a8a14: jal   0x109950c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a83d4: 0x10a83d4: addu  a0, s5, zero
+// 0x010a8a1c: 0x10a8a1c: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010a83d8: 0x10a83d8: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010a8a20: 0x10a8a20: jal   0x109950c addu  a1, s1, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a83e0: 0x10a83e0: lui   a1, 0x0
+// 0x010a8a28: 0x10a8a28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a83e4: 0x10a83e4: addiu a2, zero, 16
+// 0x010a8a2c: 0x10a8a2c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a83e8: 0x10a83e8: addiu a1, a1, 18512
+// 0x010a8a30: 0x10a8a30: addiu a1, a1, 18512
 	ldloc.2
 	ldc.i4 18512
 	add
 	stloc.2
-// 0x010a83ec: 0x10a83ec: jal   0x1001800 addu  a0, s0, zero
+// 0x010a8a34: 0x10a8a34: jal   0x1001800 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5621,10 +5621,10 @@ L_10a7c80:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a83f4: 0x10a83f4: addu  a0, s0, zero
+// 0x010a8a3c: 0x10a8a3c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a83f8: 0x10a83f8: jal   0x100e7f4 addiu a1, s6, 20820
+// 0x010a8a40: 0x10a8a40: jal   0x100e804 addiu a1, s6, 20820
 	ldloc 15
 	ldc.i4 20820
 	add
@@ -5634,31 +5634,31 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8400: 0x10a8400: lui   a0, 0x20000
+// 0x010a8a48: 0x10a8a48: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8404: 0x10a8404: addiu a2, zero, 2
+// 0x010a8a4c: 0x10a8a4c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a8408: 0x10a8408: addu  a3, zero, zero
+// 0x010a8a50: 0x10a8a50: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a840c: 0x10a840c: addiu a0, a0, 8024
+// 0x010a8a54: 0x10a8a54: addiu a0, a0, 8488
 	ldloc.1
-	ldc.i4 8024
+	ldc.i4 8488
 	add
 	stloc.1
-// 0x010a8410: 0x10a8410: sltu  a1, zero, v0
+// 0x010a8a58: 0x10a8a58: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a8414: 0x10a8414: sw    zero, 16(sp)
+// 0x010a8a5c: 0x10a8a5c: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5667,7 +5667,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a8418: 0x10a8418: sw    zero, 20(sp)
+// 0x010a8a60: 0x10a8a60: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5676,7 +5676,7 @@ L_10a7c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a841c: 0x10a841c: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a8a64: 0x10a8a64: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5690,25 +5690,25 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8424: 0x10a8424: addu  a1, v0, zero
+// 0x010a8a6c: 0x10a8a6c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8428: 0x10a8428: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a8a70: 0x10a8a70: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8430: 0x10a8430: jal   0x10a7664 lui   s1, 0x20000
+// 0x010a8a78: 0x10a8a78: jal   0x10a7cac lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 11
 	ldloc.0
@@ -5716,63 +5716,63 @@ L_10a7c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8438: 0x10a8438: addu  a1, v0, zero
+// 0x010a8a80: 0x10a8a80: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a843c: 0x10a843c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a8a84: 0x10a8a84: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8444: 0x10a8444: addu  a1, s5, zero
+// 0x010a8a8c: 0x10a8a8c: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x010a8448: 0x10a8448: addu  a0, s4, zero
+// 0x010a8a90: 0x10a8a90: addu  a0, s4, zero
 	ldloc 16
 	stloc.1
-// 0x010a844c: 0x10a844c: jal   0x1098ec4 lui   s5, 0x20000
+// 0x010a8a94: 0x10a8a94: jal   0x109950c lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8454: 0x10a8454: addiu s1, s1, 29748
+// 0x010a8a9c: 0x10a8a9c: addiu s1, s1, 30212
 	ldloc 11
-	ldc.i4 29748
+	ldc.i4 30212
 	add
 	stloc 11
-// 0x010a8458: 0x10a8458: addiu s5, s5, 8036
+// 0x010a8aa0: 0x10a8aa0: addiu s5, s5, 8500
 	ldloc 9
-	ldc.i4 8036
+	ldc.i4 8500
 	add
 	stloc 9
-L_10a845c:
-// 0x010a845c: 0x10a845c: lui   a1, 0x0
+L_10a8aa4:
+// 0x010a8aa4: 0x10a8aa4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8460: 0x10a8460: addiu a2, zero, 16
+// 0x010a8aa8: 0x10a8aa8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a8464: 0x10a8464: addiu a0, sp, 40
+// 0x010a8aac: 0x10a8aac: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010a8468: 0x10a8468: jal   0x1001800 addiu a1, a1, 18480
+// 0x010a8ab0: 0x10a8ab0: jal   0x1001800 addiu a1, a1, 18480
 	ldloc.2
 	ldc.i4 18480
 	add
@@ -5786,15 +5786,15 @@ L_10a845c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8470: 0x10a8470: lui   a1, 0x0
+// 0x010a8ab8: 0x10a8ab8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8474: 0x10a8474: addiu a0, sp, 40
+// 0x010a8abc: 0x10a8abc: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010a8478: 0x10a8478: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a8ac0: 0x10a8ac0: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5804,42 +5804,42 @@ L_10a845c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8480: 0x10a8480: addiu s0, sp, 56
+// 0x010a8ac8: 0x10a8ac8: addiu s0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 8
-// 0x010a8484: 0x10a8484: addiu s2, sp, 156
+// 0x010a8acc: 0x10a8acc: addiu s2, sp, 156
 	ldloc.0
 	ldc.i4 156
 	add
 	stloc 10
-// 0x010a8488: 0x10a8488: addiu s3, sp, 256
+// 0x010a8ad0: 0x10a8ad0: addiu s3, sp, 256
 	ldloc.0
 	ldc.i4 256
 	add
 	stloc 12
-// 0x010a848c: 0x10a848c: addiu s6, sp, 356
+// 0x010a8ad4: 0x10a8ad4: addiu s6, sp, 356
 	ldloc.0
 	ldc.i4 356
 	add
 	stloc 15
-// 0x010a8490: 0x10a8490: addu  a0, s0, zero
+// 0x010a8ad8: 0x10a8ad8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a8494: 0x10a8494: beq   v0, zero, 0x10a8740 addu  a1, s5, zero
+// 0x010a8adc: 0x10a8adc: beq   v0, zero, 0x10a8d88 addu  a1, s5, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brfalse L_10a8740
+	brfalse L_10a8d88
 // --- basic block ---
-L_10a849c:
-// 0x010a849c: 0x10a849c: jal   0x1001b68 sll   zero, zero, 0
+L_10a8ae4:
+// 0x010a8ae4: 0x10a8ae4: jal   0x1001b68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcpy_1001b68(int32,int32)
@@ -5847,45 +5847,45 @@ L_10a849c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a84a4: 0x10a84a4: lw    s7, 0(s1)
+// 0x010a8aec: 0x10a8aec: lw    s7, 0(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x010a84a8: 0x10a84a8: lui   v1, 0x20000
+// 0x010a8af0: 0x10a8af0: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010a84ac: 0x10a84ac: addiu v1, v1, 29712
+// 0x010a8af4: 0x10a8af4: addiu v1, v1, 30176
 	ldloc 6
-	ldc.i4 29712
+	ldc.i4 30176
 	add
 	stloc 6
-// 0x010a84b0: 0x10a84b0: sll   v0, s7, 2
+// 0x010a8af8: 0x10a8af8: sll   v0, s7, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010a84b4: 0x10a84b4: addu  v0, v0, v1
+// 0x010a8afc: 0x10a8afc: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x010a84b8: 0x10a84b8: lw    v0, 0(v0)
+// 0x010a8b00: 0x10a8b00: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010a84bc: 0x10a84bc: addu  a0, s0, zero
+// 0x010a8b04: 0x10a8b04: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a84c0: 0x10a84c0: addu  a1, v0, zero
+// 0x010a8b08: 0x10a8b08: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a84c4: 0x10a84c4: jal   0x1001ac4 sw    v0, 456(sp)
+// 0x010a8b0c: 0x10a8b0c: jal   0x1001ac4 sw    v0, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5899,15 +5899,15 @@ L_10a849c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a84cc: 0x10a84cc: lui   a1, 0x20000
+// 0x010a8b14: 0x10a8b14: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a84d0: 0x10a84d0: addu  a0, s0, zero
+// 0x010a8b18: 0x10a8b18: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a84d4: 0x10a84d4: jal   0x1001ac4 addiu a1, a1, 8936
+// 0x010a8b1c: 0x10a8b1c: jal   0x1001ac4 addiu a1, a1, 9400
 	ldloc.2
-	ldc.i4 8936
+	ldc.i4 9400
 	add
 	stloc.2
 	ldloc.1
@@ -5915,10 +5915,10 @@ L_10a849c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a84dc: 0x10a84dc: addu  a0, s2, zero
+// 0x010a8b24: 0x10a8b24: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a84e0: 0x10a84e0: jal   0x1001b68 addu  a1, s5, zero
+// 0x010a8b28: 0x10a8b28: jal   0x1001b68 addu  a1, s5, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -5928,7 +5928,7 @@ L_10a849c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a84e8: 0x10a84e8: lw    a1, 456(sp)
+// 0x010a8b30: 0x10a8b30: lw    a1, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5937,7 +5937,7 @@ L_10a849c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a84ec: 0x10a84ec: jal   0x1001ac4 addu  a0, s2, zero
+// 0x010a8b34: 0x10a8b34: jal   0x1001ac4 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -5945,15 +5945,15 @@ L_10a849c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a84f4: 0x10a84f4: lui   a1, 0x20000
+// 0x010a8b3c: 0x10a8b3c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a84f8: 0x10a84f8: addu  a0, s2, zero
+// 0x010a8b40: 0x10a8b40: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010a84fc: 0x10a84fc: jal   0x1001ac4 addiu a1, a1, 9016
+// 0x010a8b44: 0x10a8b44: jal   0x1001ac4 addiu a1, a1, 9480
 	ldloc.2
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.2
 	ldloc.1
@@ -5961,10 +5961,10 @@ L_10a849c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a8504: 0x10a8504: addu  a0, s3, zero
+// 0x010a8b4c: 0x10a8b4c: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010a8508: 0x10a8508: jal   0x1001b68 addu  a1, s5, zero
+// 0x010a8b50: 0x10a8b50: jal   0x1001b68 addu  a1, s5, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -5974,7 +5974,7 @@ L_10a849c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8510: 0x10a8510: lw    a1, 456(sp)
+// 0x010a8b58: 0x10a8b58: lw    a1, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5983,7 +5983,7 @@ L_10a849c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a8514: 0x10a8514: jal   0x1001ac4 addu  a0, s3, zero
+// 0x010a8b5c: 0x10a8b5c: jal   0x1001ac4 addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
@@ -5991,15 +5991,15 @@ L_10a849c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a851c: 0x10a851c: lui   a1, 0x20000
+// 0x010a8b64: 0x10a8b64: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a8520: 0x10a8520: addu  a0, s3, zero
+// 0x010a8b68: 0x10a8b68: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010a8524: 0x10a8524: jal   0x1001ac4 addiu a1, a1, 8044
+// 0x010a8b6c: 0x10a8b6c: jal   0x1001ac4 addiu a1, a1, 8508
 	ldloc.2
-	ldc.i4 8044
+	ldc.i4 8508
 	add
 	stloc.2
 	ldloc.1
@@ -6007,7 +6007,7 @@ L_10a849c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a852c: 0x10a852c: lw    a1, 456(sp)
+// 0x010a8b74: 0x10a8b74: lw    a1, 456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6016,7 +6016,7 @@ L_10a849c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a8530: 0x10a8530: jal   0x1001b68 addu  a0, s6, zero
+// 0x010a8b78: 0x10a8b78: jal   0x1001b68 addu  a0, s6, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
@@ -6026,27 +6026,27 @@ L_10a849c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8538: 0x10a8538: lui   v0, 0x100000
+// 0x010a8b80: 0x10a8b80: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010a853c: 0x10a853c: addiu a3, zero, -1
+// 0x010a8b84: 0x10a8b84: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8540: 0x10a8540: addiu a2, zero, -2
+// 0x010a8b88: 0x10a8b88: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a8544: 0x10a8544: addu  a0, s0, zero
+// 0x010a8b8c: 0x10a8b8c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a8548: 0x10a8548: addu  a1, zero, zero
+// 0x010a8b90: 0x10a8b90: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a854c: 0x10a854c: ori   v0, v0, 136
+// 0x010a8b94: 0x10a8b94: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010a8550: 0x10a8550: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a8b98: 0x10a8b98: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6060,23 +6060,23 @@ L_10a849c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8558: 0x10a8558: lui   a0, 0x0
+// 0x010a8ba0: 0x10a8ba0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a855c: 0x10a855c: addiu a0, a0, 32244
+// 0x010a8ba4: 0x10a8ba4: addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010a8560: 0x10a8560: addiu a1, zero, 1024
+// 0x010a8ba8: 0x10a8ba8: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x010a8564: 0x10a8564: jal   0x109e6d0 addu  s0, v0, zero
+// 0x010a8bac: 0x10a8bac: jal   0x109ed18 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6084,49 +6084,49 @@ L_10a849c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a856c: 0x10a856c: addu  a1, v0, zero
+// 0x010a8bb4: 0x10a8bb4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8570: 0x10a8570: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a8bb8: 0x10a8bb8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8578: 0x10a8578: lui   a1, 0x0
+// 0x010a8bc0: 0x10a8bc0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a857c: 0x10a857c: lui   a2, 0x0
+// 0x010a8bc4: 0x10a8bc4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8580: 0x10a8580: addiu a1, a1, 31980
+// 0x010a8bc8: 0x10a8bc8: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a8584: 0x10a8584: addiu a2, a2, 23008
+// 0x010a8bcc: 0x10a8bcc: addiu a2, a2, 23008
 	ldloc.3
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a8588: 0x10a8588: jal   0x1098fe0 addu  a0, s0, zero
+// 0x010a8bd0: 0x10a8bd0: jal   0x1099628 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8590: 0x10a8590: jal   0x101cd60 addu  a0, s6, zero
+// 0x010a8bd8: 0x10a8bd8: jal   0x101cd70 addu  a0, s6, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -6134,21 +6134,21 @@ L_10a849c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8598: 0x10a8598: addu  a1, v0, zero
+// 0x010a8be0: 0x10a8be0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a859c: 0x10a859c: addiu a2, zero, -1
+// 0x010a8be4: 0x10a8be4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a85a0: 0x10a85a0: addiu a3, zero, 4240
+// 0x010a8be8: 0x10a8be8: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a85a4: 0x10a85a4: jal   0x1098d10 addu  a0, s2, zero
+// 0x010a8bec: 0x10a8bec: jal   0x1099358 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6156,25 +6156,25 @@ L_10a849c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a85ac: 0x10a85ac: addu  a1, v0, zero
+// 0x010a8bf4: 0x10a8bf4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a85b0: 0x10a85b0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a8bf8: 0x10a8bf8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a85b8: 0x10a85b8: jal   0x10a6d54 addu  a0, s7, zero
+// 0x010a8c00: 0x10a8c00: jal   0x10a739c addu  a0, s7, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -6182,24 +6182,24 @@ L_10a849c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a85c0: 0x10a85c0: addu  a1, v0, zero
+// 0x010a8c08: 0x10a8c08: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a85c4: 0x10a85c4: addiu a2, zero, 2
+// 0x010a8c0c: 0x10a8c0c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a85c8: 0x10a85c8: addu  a3, zero, zero
+// 0x010a8c10: 0x10a8c10: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a85cc: 0x10a85cc: addu  a0, s3, zero
+// 0x010a8c14: 0x10a8c14: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010a85d0: 0x10a85d0: sw    zero, 16(sp)
+// 0x010a8c18: 0x10a8c18: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6208,7 +6208,7 @@ L_10a849c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a85d4: 0x10a85d4: sw    zero, 20(sp)
+// 0x010a8c1c: 0x10a8c1c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6217,7 +6217,7 @@ L_10a849c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a85d8: 0x10a85d8: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a8c20: 0x10a8c20: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6231,118 +6231,118 @@ L_10a849c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a85e0: 0x10a85e0: addu  a1, v0, zero
+// 0x010a8c28: 0x10a8c28: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a85e4: 0x10a85e4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a8c2c: 0x10a8c2c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a85ec: 0x10a85ec: jal   0x10a7664 sll   zero, zero, 0
+// 0x010a8c34: 0x10a8c34: jal   0x10a7cac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::T_59_10a7664(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::T_59_10a7cac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a85f4: 0x10a85f4: addu  a1, v0, zero
+// 0x010a8c3c: 0x10a8c3c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a85f8: 0x10a85f8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a8c40: 0x10a8c40: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8600: 0x10a8600: addu  a0, s4, zero
+// 0x010a8c48: 0x10a8c48: addu  a0, s4, zero
 	ldloc 16
 	stloc.1
-// 0x010a8604: 0x10a8604: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010a8c4c: 0x10a8c4c: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a860c: 0x10a860c: lui   v1, 0x20000
+// 0x010a8c54: 0x10a8c54: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010a8610: 0x10a8610: addiu s1, s1, 4
+// 0x010a8c58: 0x10a8c58: addiu s1, s1, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-L_10a8614:
-// 0x010a8614: 0x10a8614: addiu v1, v1, 29772
+L_10a8c5c:
+// 0x010a8c5c: 0x10a8c5c: addiu v1, v1, 30236
 	ldloc 6
-	ldc.i4 29772
+	ldc.i4 30236
 	add
 	stloc 6
-// 0x010a8618: 0x10a8618: bne   s1, v1, 0x10a845c sll   zero, zero, 0
+// 0x010a8c60: 0x10a8c60: bne   s1, v1, 0x10a8aa4 sll   zero, zero, 0
 	ldloc 11
 	ldloc 6
-	bne.un L_10a845c
+	bne.un L_10a8aa4
 // --- basic block ---
-// 0x010a8620: 0x10a8620: addu  a1, s4, zero
+// 0x010a8c68: 0x10a8c68: addu  a1, s4, zero
 	ldloc 16
 	stloc.2
-// 0x010a8624: 0x10a8624: jal   0x1098ec4 addu  a0, s8, zero
+// 0x010a8c6c: 0x10a8c6c: jal   0x109950c addu  a0, s8, zero
 	ldloc 18
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a862c: 0x10a862c: lui   a0, 0x10000
+// 0x010a8c74: 0x10a8c74: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a8630: 0x10a8630: addiu a0, a0, -21272
+// 0x010a8c78: 0x10a8c78: addiu a0, a0, -21272
 	ldloc.1
 	ldc.i4 -21272
 	add
 	stloc.1
-// 0x010a8634: 0x10a8634: lui   a2, 0x300000
+// 0x010a8c7c: 0x10a8c7c: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x010a8638: 0x10a8638: lui   a3, 0x10a0000
+// 0x010a8c80: 0x10a8c80: lui   a3, 0x10a0000
 	ldc.i4 17432576
 	stloc 4
-// 0x010a863c: 0x10a863c: addu  a1, a0, zero
+// 0x010a8c84: 0x10a8c84: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010a8640: 0x10a8640: ori   a2, a2, 26
+// 0x010a8c88: 0x10a8c88: ori   a2, a2, 26
 	ldloc.3
 	ldc.i4.s 26
 	or
 	stloc.3
-// 0x010a8644: 0x10a8644: jal   0x1091088 addiu a3, a3, 29632
+// 0x010a8c8c: 0x10a8c8c: jal   0x10916ac addiu a3, a3, 31240
 	ldloc 4
-	ldc.i4 29632
+	ldc.i4 31240
 	add
 	stloc 4
 	ldloc.0
@@ -6350,25 +6350,25 @@ L_10a8614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a864c: 0x10a864c: addu  a1, v0, zero
+// 0x010a8c94: 0x10a8c94: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8650: 0x10a8650: jal   0x1098ec4 addu  a0, s8, zero
+// 0x010a8c98: 0x10a8c98: jal   0x109950c addu  a0, s8, zero
 	ldloc 18
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8658: 0x10a8658: lw    a0, 460(sp)
+// 0x010a8ca0: 0x10a8ca0: lw    a0, 460(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6377,7 +6377,7 @@ L_10a8614:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a865c: 0x10a865c: jal   0x1095eec addu  a1, zero, zero
+// 0x010a8ca4: 0x10a8ca4: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6385,58 +6385,58 @@ L_10a8614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8664: 0x10a8664: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a8cac: 0x10a8cac: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-L_10a8668:
-// 0x010a8668: 0x10a8668: lw    v0, 32620(v0)
+L_10a8cb0:
+// 0x010a8cb0: 0x10a8cb0: lw    v0, -32452(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8155
+	ldc.i4 -8113
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a866c: 0x10a866c: sll   zero, zero, 0
-// 0x010a8670: 0x10a8670: bne   v0, zero, 0x10a86cc sll   zero, zero, 0
+// 0x010a8cb4: 0x10a8cb4: sll   zero, zero, 0
+// 0x010a8cb8: 0x10a8cb8: bne   v0, zero, 0x10a8d14 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a86cc
+	brtrue L_10a8d14
 // --- basic block ---
-// 0x010a8678: 0x10a8678: jal   0x10140b0 sll   zero, zero, 0
+// 0x010a8cc0: 0x10a8cc0: jal   0x10140c0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8680: 0x10a8680: beq   v0, zero, 0x10a8704 addiu v1, zero, 1
+// 0x010a8cc8: 0x10a8cc8: beq   v0, zero, 0x10a8d4c addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_10a8704
+	brfalse L_10a8d4c
 // --- basic block ---
-// 0x010a8688: 0x10a8688: lui   a0, 0x0
+// 0x010a8cd0: 0x10a8cd0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a868c: 0x10a868c: lui   a1, 0x0
+// 0x010a8cd4: 0x10a8cd4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8690: 0x10a8690: addiu a0, a0, 1860
+// 0x010a8cd8: 0x10a8cd8: addiu a0, a0, 1860
 	ldloc.1
 	ldc.i4 1860
 	add
 	stloc.1
-// 0x010a8694: 0x10a8694: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a8cdc: 0x10a8cdc: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6446,38 +6446,38 @@ L_10a8668:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a869c: 0x10a869c: beq   v0, zero, 0x10a86b0 lui   v1, 0x80000
+// 0x010a8ce4: 0x10a8ce4: beq   v0, zero, 0x10a8cf8 lui   v1, 0x90000
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 6
-	brfalse L_10a86b0
+	brfalse L_10a8cf8
 // --- basic block ---
-// 0x010a86a4: 0x10a86a4: lw    a1, 32632(v1)
+// 0x010a8cec: 0x10a8cec: lw    a1, -32440(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8158
+	ldc.i4 -8110
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a86a8: 0x10a86a8: j	 0x10a86bc lui   a0, 0x20000
+// 0x010a8cf0: 0x10a8cf0: j	 0x10a8d04 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_10a86bc
+	br L_10a8d04
 // --- basic block ---
-L_10a86b0:
-// 0x010a86b0: 0x10a86b0: addiu v1, v1, 32632
+L_10a8cf8:
+// 0x010a8cf8: 0x10a8cf8: addiu v1, v1, -32440
 	ldloc 6
-	ldc.i4 32632
+	ldc.i4 -32440
 	add
 	stloc 6
-// 0x010a86b4: 0x10a86b4: lw    a1, 4(v1)
+// 0x010a8cfc: 0x10a8cfc: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6486,13 +6486,13 @@ L_10a86b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a86b8: 0x10a86b8: lui   a0, 0x20000
+// 0x010a8d00: 0x10a8d00: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10a86bc:
-// 0x010a86bc: 0x10a86bc: jal   0x1094734 addiu a0, a0, 7956
+L_10a8d04:
+// 0x010a8d04: 0x10a8d04: jal   0x1094d58 addiu a0, a0, 8420
 	ldloc.1
-	ldc.i4 7956
+	ldc.i4 8420
 	add
 	stloc.1
 	ldloc.0
@@ -6500,73 +6500,73 @@ L_10a86bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a86c4: 0x10a86c4: j	 0x10a8704 addiu v1, zero, 1
+// 0x010a8d0c: 0x10a8d0c: j	 0x10a8d4c addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10a8704
+	br L_10a8d4c
 // --- basic block ---
-L_10a86cc:
-// 0x010a86cc: 0x10a86cc: jal   0x10141c0 sll   zero, zero, 0
+L_10a8d14:
+// 0x010a8d14: 0x10a8d14: jal   0x10141d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_get_scheme_10141c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_get_scheme_10141d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a86d4: 0x10a86d4: lui   v1, 0x0
+// 0x010a8d1c: 0x10a8d1c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010a86d8: 0x10a86d8: addiu v1, v1, 18528
+// 0x010a8d20: 0x10a8d20: addiu v1, v1, 18528
 	ldloc 6
 	ldc.i4 18528
 	add
 	stloc 6
-// 0x010a86dc: 0x10a86dc: sll   v0, v0, 2
+// 0x010a8d24: 0x10a8d24: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010a86e0: 0x10a86e0: addu  v0, v0, v1
+// 0x010a8d28: 0x10a8d28: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x010a86e4: 0x10a86e4: lw    a0, 0(v0)
+// 0x010a8d2c: 0x10a8d2c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010a86e8: 0x10a86e8: jal   0x101cd60 sll   zero, zero, 0
+// 0x010a8d30: 0x10a8d30: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a86f0: 0x10a86f0: lui   a0, 0x20000
+// 0x010a8d38: 0x10a8d38: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a86f4: 0x10a86f4: addiu a0, a0, 8688
+// 0x010a8d3c: 0x10a8d3c: addiu a0, a0, 9152
 	ldloc.1
-	ldc.i4 8688
+	ldc.i4 9152
 	add
 	stloc.1
-// 0x010a86f8: 0x10a86f8: jal   0x1094770 addu  a1, v0, zero
+// 0x010a8d40: 0x10a8d40: jal   0x1094d94 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6574,24 +6574,24 @@ L_10a86cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8700: 0x10a8700: addiu v1, zero, 1
+// 0x010a8d48: 0x10a8d48: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_10a8704:
-// 0x010a8704: 0x10a8704: lui   v0, 0x80000
-	ldc.i4 524288
+L_10a8d4c:
+// 0x010a8d4c: 0x10a8d4c: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-// 0x010a8708: 0x10a8708: jal   0x109483c sw    v1, 32620(v0)
+// 0x010a8d50: 0x10a8d50: jal   0x1094e60 sw    v1, -32452(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8155
+	ldc.i4 -8113
 	add
 	ldloc 6
 	stelem.i4
@@ -6600,13 +6600,13 @@ L_10a8704:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8710: 0x10a8710: lw    ra, 508(sp)
-// 0x010a8714: 0x10a8714: lw    s8, 504(sp)
+// 0x010a8d58: 0x10a8d58: lw    ra, 508(sp)
+// 0x010a8d5c: 0x10a8d5c: lw    s8, 504(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6615,7 +6615,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010a8718: 0x10a8718: lw    s7, 500(sp)
+// 0x010a8d60: 0x10a8d60: lw    s7, 500(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6624,7 +6624,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a871c: 0x10a871c: lw    s6, 496(sp)
+// 0x010a8d64: 0x10a8d64: lw    s6, 496(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6633,7 +6633,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a8720: 0x10a8720: lw    s5, 492(sp)
+// 0x010a8d68: 0x10a8d68: lw    s5, 492(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6642,7 +6642,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a8724: 0x10a8724: lw    s4, 488(sp)
+// 0x010a8d6c: 0x10a8d6c: lw    s4, 488(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6651,7 +6651,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a8728: 0x10a8728: lw    s3, 484(sp)
+// 0x010a8d70: 0x10a8d70: lw    s3, 484(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6660,7 +6660,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a872c: 0x10a872c: lw    s2, 480(sp)
+// 0x010a8d74: 0x10a8d74: lw    s2, 480(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6669,7 +6669,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a8730: 0x10a8730: lw    s1, 476(sp)
+// 0x010a8d78: 0x10a8d78: lw    s1, 476(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6678,7 +6678,7 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a8734: 0x10a8734: lw    s0, 472(sp)
+// 0x010a8d7c: 0x10a8d7c: lw    s0, 472(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6687,37 +6687,37 @@ L_10a8704:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a8738: 0x10a8738: jr    ra addiu sp, sp, 512
+// 0x010a8d80: 0x10a8d80: jr    ra addiu sp, sp, 512
 	ldloc.0
 	ldc.i4 512
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10a8740:
-// 0x010a8740: 0x10a8740: lw    v1, 0(s1)
+L_10a8d88:
+// 0x010a8d88: 0x10a8d88: lw    v1, 0(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010a8744: 0x10a8744: addiu v0, zero, 7
+// 0x010a8d8c: 0x10a8d8c: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x010a8748: 0x10a8748: bne   v1, v0, 0x10a849c lui   v1, 0x20000
+// 0x010a8d90: 0x10a8d90: bne   v1, v0, 0x10a8ae4 lui   v1, 0x20000
 	ldloc 6
 	ldloc 5
 	ldc.i4 131072
 	stloc 6
-	bne.un L_10a849c
+	bne.un L_10a8ae4
 // --- basic block ---
-// 0x010a8750: 0x10a8750: j	 0x10a8614 addiu s1, s1, 4
+// 0x010a8d98: 0x10a8d98: j	 0x10a8c5c addiu s1, s1, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-	br L_10a8614
+	br L_10a8c5c
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl126.j b/converted/Cibyl126.j
index 999c168..4a2d4c6 100644
--- a/converted/Cibyl126.j
+++ b/converted/Cibyl126.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl126::.ctor
 
-.method public static void on_close_dialog_10a8758()
+.method public static void on_close_dialog_10a8da0()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -52,12 +52,12 @@
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a8758: 0x10a8758: jr    ra sll   zero, zero, 0
+// 0x010a8da0: 0x10a8da0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_download_settings_isDownloadWazers_10a8760(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_download_settings_isDownloadWazers_10a8da8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -92,26 +92,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a8760: 0x10a8760: addiu sp, sp, -24
+// 0x010a8da8: 0x10a8da8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a8764: 0x10a8764: sw    ra, 20(sp)
-// 0x010a8768: 0x10a8768: jal   0x10a7080 sll   zero, zero, 0
+// 0x010a8dac: 0x10a8dac: sw    ra, 20(sp)
+// 0x010a8db0: 0x10a8db0: jal   0x10a76c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isShowWazers_10a7080(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isShowWazers_10a76c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a8770: 0x10a8770: lw    ra, 20(sp)
-// 0x010a8774: 0x10a8774: sll   zero, zero, 0
-// 0x010a8778: 0x10a8778: jr    ra addiu sp, sp, 24
+// 0x010a8db8: 0x10a8db8: lw    ra, 20(sp)
+// 0x010a8dbc: 0x10a8dbc: sll   zero, zero, 0
+// 0x010a8dc0: 0x10a8dc0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -123,7 +123,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 space_10a8780(int32,int32,int32,int32,int32)
+.method public static int32 space_10a8dc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -158,33 +158,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a8780: 0x10a8780: addu  a3, a0, zero
+// 0x010a8dc8: 0x10a8dc8: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x010a8784: 0x10a8784: lui   a0, 0x0
+// 0x010a8dcc: 0x10a8dcc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a8788: 0x10a8788: addiu sp, sp, -40
+// 0x010a8dd0: 0x10a8dd0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a878c: 0x10a878c: addiu a0, a0, 32124
+// 0x010a8dd4: 0x10a8dd4: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x010a8790: 0x10a8790: addu  a1, zero, zero
+// 0x010a8dd8: 0x10a8dd8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8794: 0x10a8794: addiu a2, zero, -2
+// 0x010a8ddc: 0x10a8ddc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a8798: 0x10a8798: addiu v0, zero, 136
+// 0x010a8de0: 0x10a8de0: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010a879c: 0x10a879c: sw    ra, 36(sp)
-// 0x010a87a0: 0x10a87a0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010a8de4: 0x10a8de4: sw    ra, 36(sp)
+// 0x010a8de8: 0x10a8de8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -198,21 +198,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a87a8: 0x10a87a8: addu  a0, v0, zero
+// 0x010a8df0: 0x10a8df0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a87ac: 0x10a87ac: addu  a1, zero, zero
+// 0x010a8df4: 0x10a8df4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a87b0: 0x10a87b0: addu  a2, zero, zero
+// 0x010a8df8: 0x10a8df8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a87b4: 0x10a87b4: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010a8dfc: 0x10a8dfc: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -224,10 +224,10 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a87bc: 0x10a87bc: lw    ra, 36(sp)
-// 0x010a87c0: 0x10a87c0: lw    v0, 24(sp)
+// 0x010a8e04: 0x10a8e04: lw    ra, 36(sp)
+// 0x010a8e08: 0x10a8e08: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -236,7 +236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a87c4: 0x10a87c4: jr    ra addiu sp, sp, 40
+// 0x010a8e0c: 0x10a8e0c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -248,7 +248,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_ok_softkey_10a87cc(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_softkey_10a8e14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -292,35 +292,35 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a87cc: 0x10a87cc: lui   a3, 0x20000
+// 0x010a8e14: 0x10a8e14: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a87d0: 0x10a87d0: lui   a1, 0x20000
+// 0x010a8e18: 0x10a8e18: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a87d4: 0x10a87d4: addiu sp, sp, -48
+// 0x010a8e1c: 0x10a8e1c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010a87d8: 0x10a87d8: addiu a3, a3, 9652
+// 0x010a8e20: 0x10a8e20: addiu a3, a3, 10112
 	ldloc 4
-	ldc.i4 9652
+	ldc.i4 10112
 	add
 	stloc 4
-// 0x010a87dc: 0x10a87dc: addiu a1, a1, 9612
+// 0x010a8e24: 0x10a8e24: addiu a1, a1, 10072
 	ldloc.2
-	ldc.i4 9612
+	ldc.i4 10072
 	add
 	stloc.2
-// 0x010a87e0: 0x10a87e0: addiu a0, zero, 1
+// 0x010a8e28: 0x10a8e28: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a87e4: 0x10a87e4: addiu a2, zero, 490
+// 0x010a8e2c: 0x10a8e2c: addiu a2, zero, 490
 	ldc.i4 490
 	stloc.3
-// 0x010a87e8: 0x10a87e8: sw    ra, 44(sp)
-// 0x010a87ec: 0x10a87ec: sw    s2, 40(sp)
+// 0x010a8e30: 0x10a8e30: sw    ra, 44(sp)
+// 0x010a8e34: 0x10a8e34: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -329,7 +329,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a87f0: 0x10a87f0: sw    s1, 36(sp)
+// 0x010a8e38: 0x10a8e38: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -338,7 +338,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a87f4: 0x10a87f4: jal   0x100449c sw    s0, 32(sp)
+// 0x010a8e3c: 0x10a8e3c: jal   0x100449c sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -357,34 +357,34 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a87fc: 0x10a87fc: addiu s0, sp, 16
+// 0x010a8e44: 0x10a8e44: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x010a8800: 0x10a8800: lui   a1, 0x0
+// 0x010a8e48: 0x10a8e48: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8804: 0x10a8804: addiu a1, a1, 18636
+// 0x010a8e4c: 0x10a8e4c: addiu a1, a1, 18636
 	ldloc.2
 	ldc.i4 18636
 	add
 	stloc.2
-// 0x010a8808: 0x10a8808: addu  a0, s0, zero
+// 0x010a8e50: 0x10a8e50: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a880c: 0x10a880c: addiu a2, zero, 16
+// 0x010a8e54: 0x10a8e54: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a8810: 0x10a8810: lui   s1, 0x80000
-	ldc.i4 524288
+// 0x010a8e58: 0x10a8e58: lui   s1, 0x90000
+	ldc.i4 589824
 	stloc 9
-// 0x010a8814: 0x10a8814: jal   0x1001800 sw    zero, 32644(s1)
+// 0x010a8e5c: 0x10a8e5c: jal   0x1001800 sw    zero, -32428(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 8161
+	ldc.i4 -8107
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -397,12 +397,12 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a881c: 0x10a881c: lui   a0, 0x20000
+// 0x010a8e64: 0x10a8e64: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8820: 0x10a8820: jal   0x10947ac addiu a0, a0, 9676
+// 0x010a8e68: 0x10a8e68: jal   0x1094dd0 addiu a0, a0, 10136
 	ldloc.1
-	ldc.i4 9676
+	ldc.i4 10136
 	add
 	stloc.1
 	ldloc.0
@@ -410,18 +410,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8828: 0x10a8828: addu  a1, v0, zero
+// 0x010a8e70: 0x10a8e70: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a882c: 0x10a882c: addu  a0, s0, zero
+// 0x010a8e74: 0x10a8e74: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a8830: 0x10a8830: jal   0x100e7f4 addu  s2, v0, zero
+// 0x010a8e78: 0x10a8e78: jal   0x100e804 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -429,21 +429,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8838: 0x10a8838: bne   v0, zero, 0x10a8858 lui   v0, 0x80000
+// 0x010a8e80: 0x10a8e80: bne   v0, zero, 0x10a8ea0 lui   v0, 0x90000
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 5
-	brtrue L_10a8858
+	brtrue L_10a8ea0
 // --- basic block ---
-// 0x010a8840: 0x10a8840: addu  a0, s0, zero
+// 0x010a8e88: 0x10a8e88: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a8844: 0x10a8844: jal   0x100e5c0 addu  a1, s2, zero
+// 0x010a8e8c: 0x10a8e8c: jal   0x100e5d0 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -451,59 +451,59 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a884c: 0x10a884c: addiu v0, zero, 1
+// 0x010a8e94: 0x10a8e94: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010a8850: 0x10a8850: sw    v0, 32644(s1)
+// 0x010a8e98: 0x10a8e98: sw    v0, -32428(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 8161
+	ldc.i4 -8107
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a8854: 0x10a8854: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a8e9c: 0x10a8e9c: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-L_10a8858:
-// 0x010a8858: 0x10a8858: lw    v0, 32644(v0)
+L_10a8ea0:
+// 0x010a8ea0: 0x10a8ea0: lw    v0, -32428(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8161
+	ldc.i4 -8107
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a885c: 0x10a885c: sll   zero, zero, 0
-// 0x010a8860: 0x10a8860: beq   v0, zero, 0x10a8870 sll   zero, zero, 0
+// 0x010a8ea4: 0x10a8ea4: sll   zero, zero, 0
+// 0x010a8ea8: 0x10a8ea8: beq   v0, zero, 0x10a8eb8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a8870
+	brfalse L_10a8eb8
 // --- basic block ---
-// 0x010a8868: 0x10a8868: jal   0x106e298 sll   zero, zero, 0
+// 0x010a8eb0: 0x10a8eb0: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a8870:
-// 0x010a8870: 0x10a8870: lui   a0, 0x20000
+L_10a8eb8:
+// 0x010a8eb8: 0x10a8eb8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8874: 0x10a8874: jal   0x10947ac addiu a0, a0, 9692
+// 0x010a8ebc: 0x10a8ebc: jal   0x1094dd0 addiu a0, a0, 10152
 	ldloc.1
-	ldc.i4 9692
+	ldc.i4 10152
 	add
 	stloc.1
 	ldloc.0
@@ -511,20 +511,20 @@ L_10a8870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a887c: 0x10a887c: lui   s0, 0x0
+// 0x010a8ec4: 0x10a8ec4: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a8880: 0x10a8880: addiu a1, s0, 20820
+// 0x010a8ec8: 0x10a8ec8: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a8884: 0x10a8884: jal   0x1001c08 addu  a0, v0, zero
+// 0x010a8ecc: 0x10a8ecc: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -537,21 +537,21 @@ L_10a8870:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a888c: 0x10a888c: jal   0x1051a64 sltiu a0, v0, 1
+// 0x010a8ed4: 0x10a8ed4: jal   0x1051a74 sltiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_net_set_compress_enabled_1051a64(int32)
+	call int32 Cibyl60::roadmap_net_set_compress_enabled_1051a74(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a8894: 0x10a8894: lui   a0, 0x20000
+// 0x010a8edc: 0x10a8edc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8898: 0x10a8898: jal   0x10947ac addiu a0, a0, 9708
+// 0x010a8ee0: 0x10a8ee0: jal   0x1094dd0 addiu a0, a0, 10168
 	ldloc.1
-	ldc.i4 9708
+	ldc.i4 10168
 	add
 	stloc.1
 	ldloc.0
@@ -559,15 +559,15 @@ L_10a8870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a88a0: 0x10a88a0: addu  a0, v0, zero
+// 0x010a8ee8: 0x10a8ee8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a88a4: 0x10a88a4: jal   0x1001c08 addiu a1, s0, 20820
+// 0x010a8eec: 0x10a8eec: jal   0x1001c08 addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
@@ -582,27 +582,27 @@ L_10a8870:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a88ac: 0x10a88ac: jal   0x103f634 sltiu a0, v0, 1
+// 0x010a8ef4: 0x10a8ef4: jal   0x103f644 sltiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.1
 	ldloc.1
-	call int32 Cibyl47::roadmap_net_mon_set_enabled_103f634(int32)
+	call int32 Cibyl47::roadmap_net_mon_set_enabled_103f644(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a88b4: 0x10a88b4: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a8efc: 0x10a8efc: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-// 0x010a88b8: 0x10a88b8: addu  a0, zero, zero
+// 0x010a8f00: 0x10a8f00: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a88bc: 0x10a88bc: jal   0x100ea50 sw    zero, 32644(v0)
+// 0x010a8f04: 0x10a8f04: jal   0x100ea60 sw    zero, -32428(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8161
+	ldc.i4 -8107
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -611,12 +611,12 @@ L_10a8870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a88c4: 0x10a88c4: jal   0x1094a94 addiu a0, zero, 1
+// 0x010a8f0c: 0x10a8f0c: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -624,16 +624,16 @@ L_10a8870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a88cc: 0x10a88cc: lw    ra, 44(sp)
-// 0x010a88d0: 0x10a88d0: addu  v0, zero, zero
+// 0x010a8f14: 0x10a8f14: lw    ra, 44(sp)
+// 0x010a8f18: 0x10a8f18: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a88d4: 0x10a88d4: lw    s2, 40(sp)
+// 0x010a8f1c: 0x10a8f1c: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -642,7 +642,7 @@ L_10a8870:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a88d8: 0x10a88d8: lw    s1, 36(sp)
+// 0x010a8f20: 0x10a8f20: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -651,7 +651,7 @@ L_10a8870:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a88dc: 0x10a88dc: lw    s0, 32(sp)
+// 0x010a8f24: 0x10a8f24: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -660,7 +660,7 @@ L_10a8870:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a88e0: 0x10a88e0: jr    ra addiu sp, sp, 48
+// 0x010a8f28: 0x10a8f28: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -672,7 +672,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_download_settings_isEnabled_10a88e8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_download_settings_isEnabled_10a8f30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -707,12 +707,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a88e8: 0x10a88e8: addiu sp, sp, -24
+// 0x010a8f30: 0x10a8f30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a88ec: 0x10a88ec: sw    a1, 28(sp)
+// 0x010a8f34: 0x10a8f34: sw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -721,10 +721,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a88f0: 0x10a88f0: lui   a1, 0x0
+// 0x010a8f38: 0x10a8f38: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a88f4: 0x10a88f4: sw    a0, 24(sp)
+// 0x010a8f3c: 0x10a8f3c: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -733,18 +733,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010a88f8: 0x10a88f8: addiu a1, a1, 20820
+// 0x010a8f40: 0x10a8f40: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010a88fc: 0x10a88fc: addiu a0, sp, 24
+// 0x010a8f44: 0x10a8f44: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010a8900: 0x10a8900: sw    ra, 20(sp)
-// 0x010a8904: 0x10a8904: sw    a2, 32(sp)
+// 0x010a8f48: 0x10a8f48: sw    ra, 20(sp)
+// 0x010a8f4c: 0x10a8f4c: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -753,7 +753,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010a8908: 0x10a8908: jal   0x100e7f4 sw    a3, 36(sp)
+// 0x010a8f50: 0x10a8f50: jal   0x100e804 sw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -767,18 +767,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010a8910: 0x10a8910: lw    ra, 20(sp)
-// 0x010a8914: 0x10a8914: sltu  v0, zero, v0
+// 0x010a8f58: 0x10a8f58: lw    ra, 20(sp)
+// 0x010a8f5c: 0x10a8f5c: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a8918: 0x10a8918: jr    ra addiu sp, sp, 24
+// 0x010a8f60: 0x10a8f60: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -790,7 +790,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_download_settings_isDownloadTraffic_10a8920(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_download_settings_isDownloadTraffic_10a8f68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -828,12 +828,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a8920: 0x10a8920: addiu sp, sp, -40
+// 0x010a8f68: 0x10a8f68: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a8924: 0x10a8924: sw    s0, 32(sp)
+// 0x010a8f6c: 0x10a8f6c: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -842,24 +842,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a8928: 0x10a8928: lui   a1, 0x0
+// 0x010a8f70: 0x10a8f70: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a892c: 0x10a892c: addiu s0, sp, 16
+// 0x010a8f74: 0x10a8f74: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a8930: 0x10a8930: addu  a0, s0, zero
+// 0x010a8f78: 0x10a8f78: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8934: 0x10a8934: addiu a1, a1, 18636
+// 0x010a8f7c: 0x10a8f7c: addiu a1, a1, 18636
 	ldloc.2
 	ldc.i4 18636
 	add
 	stloc.2
-// 0x010a8938: 0x10a8938: sw    ra, 36(sp)
-// 0x010a893c: 0x10a893c: jal   0x1001800 addiu a2, zero, 16
+// 0x010a8f80: 0x10a8f80: sw    ra, 36(sp)
+// 0x010a8f84: 0x10a8f84: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -871,13 +871,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a8944: 0x10a8944: lui   a1, 0x0
+// 0x010a8f8c: 0x10a8f8c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8948: 0x10a8948: addu  a0, s0, zero
+// 0x010a8f90: 0x10a8f90: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a894c: 0x10a894c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a8f94: 0x10a8f94: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -887,18 +887,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a8954: 0x10a8954: lw    ra, 36(sp)
-// 0x010a8958: 0x10a8958: sltu  v0, zero, v0
+// 0x010a8f9c: 0x10a8f9c: lw    ra, 36(sp)
+// 0x010a8fa0: 0x10a8fa0: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a895c: 0x10a895c: lw    s0, 32(sp)
+// 0x010a8fa4: 0x10a8fa4: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -907,7 +907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a8960: 0x10a8960: jr    ra addiu sp, sp, 40
+// 0x010a8fa8: 0x10a8fa8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -919,7 +919,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_download_settings_isDownloadReports_10a89cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_download_settings_isDownloadReports_10a9014(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -957,12 +957,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a89cc: 0x10a89cc: addiu sp, sp, -40
+// 0x010a9014: 0x10a9014: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a89d0: 0x10a89d0: sw    s0, 32(sp)
+// 0x010a9018: 0x10a9018: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -971,24 +971,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a89d4: 0x10a89d4: lui   a1, 0x0
+// 0x010a901c: 0x10a901c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a89d8: 0x10a89d8: addiu s0, sp, 16
+// 0x010a9020: 0x10a9020: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010a89dc: 0x10a89dc: addu  a0, s0, zero
+// 0x010a9024: 0x10a9024: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a89e0: 0x10a89e0: addiu a1, a1, 18636
+// 0x010a9028: 0x10a9028: addiu a1, a1, 18636
 	ldloc.2
 	ldc.i4 18636
 	add
 	stloc.2
-// 0x010a89e4: 0x10a89e4: sw    ra, 36(sp)
-// 0x010a89e8: 0x10a89e8: jal   0x1001800 addiu a2, zero, 16
+// 0x010a902c: 0x10a902c: sw    ra, 36(sp)
+// 0x010a9030: 0x10a9030: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -1000,13 +1000,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a89f0: 0x10a89f0: lui   a1, 0x0
+// 0x010a9038: 0x10a9038: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a89f4: 0x10a89f4: addu  a0, s0, zero
+// 0x010a903c: 0x10a903c: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010a89f8: 0x10a89f8: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a9040: 0x10a9040: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -1016,18 +1016,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010a8a00: 0x10a8a00: lw    ra, 36(sp)
-// 0x010a8a04: 0x10a8a04: sltu  v0, zero, v0
+// 0x010a9048: 0x10a9048: lw    ra, 36(sp)
+// 0x010a904c: 0x10a904c: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010a8a08: 0x10a8a08: lw    s0, 32(sp)
+// 0x010a9050: 0x10a9050: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1036,7 +1036,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a8a0c: 0x10a8a0c: jr    ra addiu sp, sp, 40
+// 0x010a9054: 0x10a9054: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1048,7 +1048,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_download_settings_init_10a8a3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_download_settings_init_10a9084(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 v1,int32 s0,int32 s2,int32 ra)
@@ -1092,35 +1092,35 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a8a3c: 0x10a8a3c: lui   a1, 0x20000
+// 0x010a9084: 0x10a9084: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a8a40: 0x10a8a40: lui   a3, 0x20000
+// 0x010a9088: 0x10a9088: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a8a44: 0x10a8a44: addiu sp, sp, -40
+// 0x010a908c: 0x10a908c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a8a48: 0x10a8a48: addiu a1, a1, 9612
+// 0x010a9090: 0x10a9090: addiu a1, a1, 10072
 	ldloc.2
-	ldc.i4 9612
+	ldc.i4 10072
 	add
 	stloc.2
-// 0x010a8a4c: 0x10a8a4c: addiu a3, a3, 8224
+// 0x010a9094: 0x10a9094: addiu a3, a3, 8688
 	ldloc 4
-	ldc.i4 8224
+	ldc.i4 8688
 	add
 	stloc 4
-// 0x010a8a50: 0x10a8a50: addiu a0, zero, 1
+// 0x010a9098: 0x10a9098: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a8a54: 0x10a8a54: addiu a2, zero, 83
+// 0x010a909c: 0x10a909c: addiu a2, zero, 83
 	ldc.i4.s 83
 	stloc.3
-// 0x010a8a58: 0x10a8a58: sw    ra, 36(sp)
-// 0x010a8a5c: 0x10a8a5c: sw    s2, 32(sp)
+// 0x010a90a0: 0x10a90a0: sw    ra, 36(sp)
+// 0x010a90a4: 0x10a90a4: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1129,7 +1129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a8a60: 0x10a8a60: sw    s1, 28(sp)
+// 0x010a90a8: 0x10a90a8: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1138,7 +1138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a8a64: 0x10a8a64: sw    s0, 24(sp)
+// 0x010a90ac: 0x10a90ac: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1147,7 +1147,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a8a68: 0x10a8a68: jal   0x100449c lui   s1, 0x20000
+// 0x010a90b0: 0x10a90b0: jal   0x100449c lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 6
 	ldloc.0
@@ -1160,54 +1160,54 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a8a70: 0x10a8a70: lui   s0, 0x0
+// 0x010a90b8: 0x10a90b8: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010a8a74: 0x10a8a74: lui   a0, 0x20000
+// 0x010a90bc: 0x10a90bc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8a78: 0x10a8a78: lui   a1, 0x0
+// 0x010a90c0: 0x10a90c0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8a7c: 0x10a8a7c: addiu v1, zero, 1
+// 0x010a90c4: 0x10a90c4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010a8a80: 0x10a8a80: addiu s1, s1, 9464
+// 0x010a90c8: 0x10a90c8: addiu s1, s1, 9928
 	ldloc 6
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 6
-// 0x010a8a84: 0x10a8a84: addiu a3, s0, 20820
+// 0x010a90cc: 0x10a90cc: addiu a3, s0, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x010a8a88: 0x10a8a88: addiu a0, a0, -26888
+// 0x010a90d0: 0x10a90d0: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a8a8c: 0x10a8a8c: addiu a1, a1, 18636
+// 0x010a90d4: 0x10a90d4: addiu a1, a1, 18636
 	ldloc.2
 	ldc.i4 18636
 	add
 	stloc.2
-// 0x010a8a90: 0x10a8a90: addu  a2, zero, zero
+// 0x010a90d8: 0x10a90d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8a94: 0x10a8a94: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a90dc: 0x10a90dc: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 7
-// 0x010a8a98: 0x10a8a98: sw    v1, 32640(v0)
+// 0x010a90e0: 0x10a90e0: sw    v1, -32432(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 8160
+	ldc.i4 -8108
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a8a9c: 0x10a8a9c: sw    s1, 16(sp)
+// 0x010a90e4: 0x10a90e4: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1216,7 +1216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a8aa0: 0x10a8aa0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010a90e8: 0x10a90e8: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1230,42 +1230,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a8aa8: 0x10a8aa8: lui   a1, 0x0
+// 0x010a90f0: 0x10a90f0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8aac: 0x10a8aac: lui   a0, 0x10000
+// 0x010a90f4: 0x10a90f4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a8ab0: 0x10a8ab0: addu  a3, s1, zero
+// 0x010a90f8: 0x10a90f8: addu  a3, s1, zero
 	ldloc 6
 	stloc 4
-// 0x010a8ab4: 0x10a8ab4: addiu a1, a1, 18652
+// 0x010a90fc: 0x10a90fc: addiu a1, a1, 18652
 	ldloc.2
 	ldc.i4 18652
 	add
 	stloc.2
-// 0x010a8ab8: 0x10a8ab8: addiu v0, s0, 20820
+// 0x010a9100: 0x10a9100: addiu v0, s0, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 7
-// 0x010a8abc: 0x10a8abc: addu  a2, zero, zero
+// 0x010a9104: 0x10a9104: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8ac0: 0x10a8ac0: addiu a0, a0, 12560
+// 0x010a9108: 0x10a9108: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010a8ac4: 0x10a8ac4: lui   s0, 0x0
+// 0x010a910c: 0x10a910c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010a8ac8: 0x10a8ac8: sw    v0, 16(sp)
+// 0x010a9110: 0x10a9110: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1274,7 +1274,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a8acc: 0x10a8acc: sw    zero, 20(sp)
+// 0x010a9114: 0x10a9114: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1283,7 +1283,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a8ad0: 0x10a8ad0: jal   0x100edf8 lui   s1, 0x0
+// 0x010a9118: 0x10a9118: jal   0x100ee08 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 6
 	ldloc.0
@@ -1291,12 +1291,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a8ad8: 0x10a8ad8: jal   0x101cd60 addiu a0, s0, 32116
+// 0x010a9120: 0x10a9120: jal   0x101cd70 addiu a0, s0, 32116
 	ldloc 9
 	ldc.i4 32116
 	add
@@ -1306,25 +1306,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a8ae0: 0x10a8ae0: lui   s2, 0x80000
-	ldc.i4 524288
+// 0x010a9128: 0x10a9128: lui   s2, 0x90000
+	ldc.i4 589824
 	stloc 10
-// 0x010a8ae4: 0x10a8ae4: addiu a0, s1, 32120
+// 0x010a912c: 0x10a912c: addiu a0, s1, 32120
 	ldloc 6
 	ldc.i4 32120
 	add
 	stloc.1
-// 0x010a8ae8: 0x10a8ae8: jal   0x101cd60 sw    v0, 32648(s2)
+// 0x010a9130: 0x10a9130: jal   0x101cd70 sw    v0, -32424(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 8162
+	ldc.i4 -8106
 	add
 	ldloc 7
 	stelem.i4
@@ -1333,36 +1333,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a8af0: 0x10a8af0: lui   v1, 0x80000
-	ldc.i4 524288
+// 0x010a9138: 0x10a9138: lui   v1, 0x90000
+	ldc.i4 589824
 	stloc 8
-// 0x010a8af4: 0x10a8af4: lw    ra, 36(sp)
-// 0x010a8af8: 0x10a8af8: addiu s2, s2, 32648
+// 0x010a913c: 0x10a913c: lw    ra, 36(sp)
+// 0x010a9140: 0x10a9140: addiu s2, s2, -32424
 	ldloc 10
-	ldc.i4 32648
+	ldc.i4 -32424
 	add
 	stloc 10
-// 0x010a8afc: 0x10a8afc: addiu s0, s0, 32116
+// 0x010a9144: 0x10a9144: addiu s0, s0, 32116
 	ldloc 9
 	ldc.i4 32116
 	add
 	stloc 9
-// 0x010a8b00: 0x10a8b00: addiu s1, s1, 32120
+// 0x010a9148: 0x10a9148: addiu s1, s1, 32120
 	ldloc 6
 	ldc.i4 32120
 	add
 	stloc 6
-// 0x010a8b04: 0x10a8b04: addiu a0, v1, 32656
+// 0x010a914c: 0x10a914c: addiu a0, v1, -32416
 	ldloc 8
-	ldc.i4 32656
+	ldc.i4 -32416
 	add
 	stloc.1
-// 0x010a8b08: 0x10a8b08: sw    v0, 4(s2)
+// 0x010a9150: 0x10a9150: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1371,7 +1371,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a8b0c: 0x10a8b0c: sw    s1, 4(a0)
+// 0x010a9154: 0x10a9154: sw    s1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1380,16 +1380,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a8b10: 0x10a8b10: sw    s0, 32656(v1)
+// 0x010a9158: 0x10a9158: sw    s0, -32416(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8164
+	ldc.i4 -8104
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a8b14: 0x10a8b14: lw    s2, 32(sp)
+// 0x010a915c: 0x10a915c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1398,7 +1398,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a8b18: 0x10a8b18: lw    s1, 28(sp)
+// 0x010a9160: 0x10a9160: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1407,7 +1407,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a8b1c: 0x10a8b1c: lw    s0, 24(sp)
+// 0x010a9164: 0x10a9164: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1416,7 +1416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a8b20: 0x10a8b20: jr    ra addiu sp, sp, 40
+// 0x010a9168: 0x10a9168: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1428,7 +1428,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_download_settings_show_10a8b28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_download_settings_show_10a9170(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s3,int32 s5,int32 s6,int32 s2,int32 s4,int32 t0,int32 s7,int32 s8,int32 lo,int32 ra)
@@ -1496,36 +1496,36 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a8b28:
-// 0x010a8b28: 0x10a8b28: lui   a1, 0x20000
+L_10a9170:
+// 0x010a9170: 0x10a9170: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a8b2c: 0x10a8b2c: lui   a3, 0x20000
+// 0x010a9174: 0x10a9174: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a8b30: 0x10a8b30: addiu sp, sp, -104
+// 0x010a9178: 0x10a9178: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x010a8b34: 0x10a8b34: addiu a1, a1, 9612
+// 0x010a917c: 0x10a917c: addiu a1, a1, 10072
 	ldloc.2
-	ldc.i4 9612
+	ldc.i4 10072
 	add
 	stloc.2
-// 0x010a8b38: 0x10a8b38: addiu a3, a3, 9720
+// 0x010a9180: 0x10a9180: addiu a3, a3, 10180
 	ldloc 4
-	ldc.i4 9720
+	ldc.i4 10180
 	add
 	stloc 4
-// 0x010a8b3c: 0x10a8b3c: addiu a0, zero, 1
+// 0x010a9184: 0x10a9184: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a8b40: 0x10a8b40: addiu a2, zero, 146
+// 0x010a9188: 0x10a9188: addiu a2, zero, 146
 	ldc.i4 146
 	stloc.3
-// 0x010a8b44: 0x10a8b44: sw    ra, 100(sp)
-// 0x010a8b48: 0x10a8b48: sw    s8, 96(sp)
+// 0x010a918c: 0x10a918c: sw    ra, 100(sp)
+// 0x010a9190: 0x10a9190: sw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1534,7 +1534,7 @@ L_10a8b28:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010a8b4c: 0x10a8b4c: sw    s7, 92(sp)
+// 0x010a9194: 0x10a9194: sw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1543,7 +1543,7 @@ L_10a8b28:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010a8b50: 0x10a8b50: sw    s6, 88(sp)
+// 0x010a9198: 0x10a9198: sw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1552,7 +1552,7 @@ L_10a8b28:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a8b54: 0x10a8b54: sw    s5, 84(sp)
+// 0x010a919c: 0x10a919c: sw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1561,7 +1561,7 @@ L_10a8b28:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a8b58: 0x10a8b58: sw    s4, 80(sp)
+// 0x010a91a0: 0x10a91a0: sw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1570,7 +1570,7 @@ L_10a8b28:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a8b5c: 0x10a8b5c: sw    s3, 76(sp)
+// 0x010a91a4: 0x10a91a4: sw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1579,7 +1579,7 @@ L_10a8b28:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a8b60: 0x10a8b60: sw    s2, 72(sp)
+// 0x010a91a8: 0x10a91a8: sw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1588,7 +1588,7 @@ L_10a8b28:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a8b64: 0x10a8b64: sw    s1, 68(sp)
+// 0x010a91ac: 0x10a91ac: sw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1597,7 +1597,7 @@ L_10a8b28:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a8b68: 0x10a8b68: jal   0x100449c sw    s0, 64(sp)
+// 0x010a91b0: 0x10a91b0: jal   0x100449c sw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1616,53 +1616,53 @@ L_10a8b28:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8b70: 0x10a8b70: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a91b8: 0x10a91b8: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-// 0x010a8b74: 0x10a8b74: lw    v0, 32640(v0)
+// 0x010a91bc: 0x10a91bc: lw    v0, -32432(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8160
+	ldc.i4 -8108
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a8b78: 0x10a8b78: sll   zero, zero, 0
-// 0x010a8b7c: 0x10a8b7c: bne   v0, zero, 0x10a8b90 lui   v0, 0x20000
+// 0x010a91c0: 0x10a91c0: sll   zero, zero, 0
+// 0x010a91c4: 0x10a91c4: bne   v0, zero, 0x10a91d8 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brtrue L_10a8b90
+	brtrue L_10a91d8
 // --- basic block ---
-// 0x010a8b84: 0x10a8b84: jal   0x10a8a3c sll   zero, zero, 0
+// 0x010a91cc: 0x10a91cc: jal   0x10a9084 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_download_settings_init_10a8a3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_download_settings_init_10a9084(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8b8c: 0x10a8b8c: lui   v0, 0x20000
+// 0x010a91d4: 0x10a91d4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10a8b90:
-// 0x010a8b90: 0x10a8b90: lw    s2, 29776(v0)
+L_10a91d8:
+// 0x010a91d8: 0x10a91d8: lw    s2, 30240(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7444
+	ldc.i4 7560
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a8b94: 0x10a8b94: addu  a1, zero, zero
+// 0x010a91dc: 0x10a91dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8b98: 0x10a8b98: jal   0x1095eec addu  a0, s2, zero
+// 0x010a91e0: 0x10a91e0: jal   0x1096534 addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -1670,16 +1670,16 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ba0: 0x10a8ba0: bne   v0, zero, 0x10a90c0 sll   zero, zero, 0
+// 0x010a91e8: 0x10a91e8: bne   v0, zero, 0x10a9708 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a90c0
+	brtrue L_10a9708
 // --- basic block ---
-// 0x010a8ba8: 0x10a8ba8: jal   0x101cd60 addu  a0, s2, zero
+// 0x010a91f0: 0x10a91f0: jal   0x101cd70 addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -1687,26 +1687,26 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8bb0: 0x10a8bb0: lui   a2, 0x10b0000
+// 0x010a91f8: 0x10a91f8: lui   a2, 0x10b0000
 	ldc.i4 17498112
 	stloc.3
-// 0x010a8bb4: 0x10a8bb4: addu  a0, s2, zero
+// 0x010a91fc: 0x10a91fc: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x010a8bb8: 0x10a8bb8: addu  a1, v0, zero
+// 0x010a9200: 0x10a9200: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8bbc: 0x10a8bbc: addiu a2, a2, -30888
+// 0x010a9204: 0x10a9204: addiu a2, a2, -29280
 	ldloc.3
-	ldc.i4 -30888
+	ldc.i4 -29280
 	add
 	stloc.3
-// 0x010a8bc0: 0x10a8bc0: jal   0x1095a08 addiu a3, zero, 8192
+// 0x010a9208: 0x10a9208: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -1714,32 +1714,32 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8bc8: 0x10a8bc8: lui   a0, 0x20000
+// 0x010a9210: 0x10a9210: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8bcc: 0x10a8bcc: addiu t0, zero, 136
+// 0x010a9214: 0x10a9214: addiu t0, zero, 136
 	ldc.i4 136
 	stloc 15
-// 0x010a8bd0: 0x10a8bd0: addu  a1, zero, zero
+// 0x010a9218: 0x10a9218: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8bd4: 0x10a8bd4: addiu a2, zero, -1
+// 0x010a921c: 0x10a921c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a8bd8: 0x10a8bd8: addiu a3, zero, -1
+// 0x010a9220: 0x10a9220: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8bdc: 0x10a8bdc: addiu a0, a0, 9756
+// 0x010a9224: 0x10a9224: addiu a0, a0, 10216
 	ldloc.1
-	ldc.i4 9756
+	ldc.i4 10216
 	add
 	stloc.1
-// 0x010a8be0: 0x10a8be0: sw    t0, 16(sp)
+// 0x010a9228: 0x10a9228: sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1748,7 +1748,7 @@ L_10a8b90:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a8be4: 0x10a8be4: sw    t0, 56(sp)
+// 0x010a922c: 0x10a922c: sw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1757,7 +1757,7 @@ L_10a8b90:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a8be8: 0x10a8be8: jal   0x1093a24 addu  s0, v0, zero
+// 0x010a9230: 0x10a9230: jal   0x1094048 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -1765,20 +1765,20 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8bf0: 0x10a8bf0: lui   a0, 0x20000
+// 0x010a9238: 0x10a9238: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8bf4: 0x10a8bf4: addiu a0, a0, 9780
+// 0x010a923c: 0x10a923c: addiu a0, a0, 10240
 	ldloc.1
-	ldc.i4 9780
+	ldc.i4 10240
 	add
 	stloc.1
-// 0x010a8bf8: 0x10a8bf8: jal   0x101cd60 addu  s1, v0, zero
+// 0x010a9240: 0x10a9240: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1786,26 +1786,26 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8c00: 0x10a8c00: lui   a0, 0x20000
+// 0x010a9248: 0x10a9248: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8c04: 0x10a8c04: addiu a3, zero, 4240
+// 0x010a924c: 0x10a924c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a8c08: 0x10a8c08: addiu a2, zero, 16
+// 0x010a9250: 0x10a9250: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a8c0c: 0x10a8c0c: addiu a0, a0, 9800
+// 0x010a9254: 0x10a9254: addiu a0, a0, 10260
 	ldloc.1
-	ldc.i4 9800
+	ldc.i4 10260
 	add
 	stloc.1
-// 0x010a8c10: 0x10a8c10: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a9258: 0x10a9258: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1813,52 +1813,52 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8c18: 0x10a8c18: addu  a1, v0, zero
+// 0x010a9260: 0x10a9260: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8c1c: 0x10a8c1c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a9264: 0x10a9264: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8c24: 0x10a8c24: addu  a2, zero, zero
+// 0x010a926c: 0x10a926c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8c28: 0x10a8c28: addu  a0, s1, zero
+// 0x010a9270: 0x10a9270: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a8c2c: 0x10a8c2c: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a9274: 0x10a9274: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8c34: 0x10a8c34: addu  a1, s1, zero
+// 0x010a927c: 0x10a927c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010a8c38: 0x10a8c38: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a9280: 0x10a9280: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8c40: 0x10a8c40: jal   0x10a8780 addiu a0, zero, 2
+// 0x010a9288: 0x10a9288: jal   0x10a8dc8 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1866,50 +1866,50 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::space_10a8780(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::space_10a8dc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8c48: 0x10a8c48: addu  a1, v0, zero
+// 0x010a9290: 0x10a9290: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8c4c: 0x10a8c4c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a9294: 0x10a9294: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8c54: 0x10a8c54: lui   v1, 0x41000000
+// 0x010a929c: 0x10a929c: lui   v1, 0x41000000
 	ldc.i4 1090519040
 	stloc 6
-// 0x010a8c58: 0x10a8c58: lui   a0, 0x20000
+// 0x010a92a0: 0x10a92a0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8c5c: 0x10a8c5c: ori   v1, v1, 20616
+// 0x010a92a4: 0x10a92a4: ori   v1, v1, 20616
 	ldloc 6
 	ldc.i4 20616
 	or
 	stloc 6
-// 0x010a8c60: 0x10a8c60: addiu a0, a0, 9828
+// 0x010a92a8: 0x10a92a8: addiu a0, a0, 10288
 	ldloc.1
-	ldc.i4 9828
+	ldc.i4 10288
 	add
 	stloc.1
-// 0x010a8c64: 0x10a8c64: addu  a1, zero, zero
+// 0x010a92ac: 0x10a92ac: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8c68: 0x10a8c68: addiu a2, zero, -2
+// 0x010a92b0: 0x10a92b0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a8c6c: 0x10a8c6c: addiu a3, zero, -1
+// 0x010a92b4: 0x10a92b4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8c70: 0x10a8c70: sw    v1, 16(sp)
+// 0x010a92b8: 0x10a92b8: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1918,7 +1918,7 @@ L_10a8b90:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a8c74: 0x10a8c74: sw    v1, 52(sp)
+// 0x010a92bc: 0x10a92bc: sw    v1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1927,7 +1927,7 @@ L_10a8b90:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a8c78: 0x10a8c78: jal   0x1093a24 lui   s3, 0x100000
+// 0x010a92c0: 0x10a92c0: jal   0x1094048 lui   s3, 0x100000
 	ldc.i4 1048576
 	stloc 10
 	ldloc.0
@@ -1935,34 +1935,34 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8c80: 0x10a8c80: lui   a0, 0x20000
+// 0x010a92c8: 0x10a92c8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8c84: 0x10a8c84: ori   s3, s3, 136
+// 0x010a92cc: 0x10a92cc: ori   s3, s3, 136
 	ldloc 10
 	ldc.i4 136
 	or
 	stloc 10
-// 0x010a8c88: 0x10a8c88: addiu a3, zero, -1
+// 0x010a92d0: 0x10a92d0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8c8c: 0x10a8c8c: addiu a0, a0, 9844
+// 0x010a92d4: 0x10a92d4: addiu a0, a0, 10304
 	ldloc.1
-	ldc.i4 9844
+	ldc.i4 10304
 	add
 	stloc.1
-// 0x010a8c90: 0x10a8c90: addu  a1, zero, zero
+// 0x010a92d8: 0x10a92d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8c94: 0x10a8c94: addiu a2, zero, -2
+// 0x010a92dc: 0x10a92dc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a8c98: 0x10a8c98: sw    v0, 48(sp)
+// 0x010a92e0: 0x10a92e0: sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1971,7 +1971,7 @@ L_10a8b90:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a8c9c: 0x10a8c9c: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010a92e4: 0x10a92e4: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1985,81 +1985,81 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ca4: 0x10a8ca4: addu  s1, v0, zero
+// 0x010a92ec: 0x10a92ec: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a8ca8: 0x10a8ca8: addu  a0, v0, zero
+// 0x010a92f0: 0x10a92f0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8cac: 0x10a8cac: lui   s8, 0x0
+// 0x010a92f4: 0x10a92f4: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 17
-// 0x010a8cb0: 0x10a8cb0: lui   v0, 0x0
+// 0x010a92f8: 0x10a92f8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a8cb4: 0x10a8cb4: addiu a1, v0, 31980
+// 0x010a92fc: 0x10a92fc: addiu a1, v0, 31980
 	ldloc 5
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a8cb8: 0x10a8cb8: addiu a2, s8, 23008
+// 0x010a9300: 0x10a9300: addiu a2, s8, 23008
 	ldloc 17
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010a8cbc: 0x10a8cbc: jal   0x1098fe0 lui   s7, 0xf0000
+// 0x010a9304: 0x10a9304: jal   0x1099628 lui   s7, 0xf0000
 	ldc.i4 983040
 	stloc 16
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8cc4: 0x10a8cc4: lw    a2, -30068(s7)
+// 0x010a930c: 0x10a930c: lw    a2, -29604(s7)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a8cc8: 0x10a8cc8: addiu a0, zero, 3
+// 0x010a9310: 0x10a9310: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010a8ccc: 0x10a8ccc: sll   a2, a2, 1
+// 0x010a9314: 0x10a9314: sll   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x010a8cd0: 0x10a8cd0: div   a2, a0
+// 0x010a9318: 0x10a9318: div   a2, a0
 	ldloc.3
 	ldloc.1
 	div
 	stloc 18
-// 0x010a8cd4: 0x10a8cd4: lui   a0, 0x20000
+// 0x010a931c: 0x10a931c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8cd8: 0x10a8cd8: addiu a3, zero, -1
+// 0x010a9320: 0x10a9320: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8cdc: 0x10a8cdc: addiu s6, zero, 16
+// 0x010a9324: 0x10a9324: addiu s6, zero, 16
 	ldc.i4.s 16
 	stloc 12
-// 0x010a8ce0: 0x10a8ce0: addiu a0, a0, 9868
+// 0x010a9328: 0x10a9328: addiu a0, a0, 10328
 	ldloc.1
-	ldc.i4 9868
+	ldc.i4 10328
 	add
 	stloc.1
-// 0x010a8ce4: 0x10a8ce4: addu  a1, zero, zero
+// 0x010a932c: 0x10a932c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8ce8: 0x10a8ce8: sw    s6, 16(sp)
+// 0x010a9330: 0x10a9330: sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2068,10 +2068,10 @@ L_10a8b90:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a8cec: 0x10a8cec: mflo  lo
+// 0x010a9334: 0x10a9334: mflo  lo
 	ldloc 18
 	stloc.3
-// 0x010a8cf0: 0x10a8cf0: jal   0x1093a24 lui   s4, 0x10000
+// 0x010a9338: 0x10a9338: jal   0x1094048 lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 14
 	ldloc.0
@@ -2079,34 +2079,34 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8cf8: 0x10a8cf8: addu  a0, v0, zero
+// 0x010a9340: 0x10a9340: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8cfc: 0x10a8cfc: addu  a1, zero, zero
+// 0x010a9344: 0x10a9344: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8d00: 0x10a8d00: addu  a2, zero, zero
+// 0x010a9348: 0x10a9348: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8d04: 0x10a8d04: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010a934c: 0x10a934c: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8d0c: 0x10a8d0c: lui   a0, 0x20000
+// 0x010a9354: 0x10a9354: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8d10: 0x10a8d10: jal   0x101cd60 addiu a0, a0, 9888
+// 0x010a9358: 0x10a9358: jal   0x101cd70 addiu a0, a0, 10348
 	ldloc.1
-	ldc.i4 9888
+	ldc.i4 10348
 	add
 	stloc.1
 	ldloc.0
@@ -2114,26 +2114,26 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d18: 0x10a8d18: lui   a0, 0x20000
+// 0x010a9360: 0x10a9360: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8d1c: 0x10a8d1c: addiu a2, zero, -1
+// 0x010a9364: 0x10a9364: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a8d20: 0x10a8d20: addiu a3, zero, 4240
+// 0x010a9368: 0x10a9368: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a8d24: 0x10a8d24: addiu a0, a0, 9912
+// 0x010a936c: 0x10a936c: addiu a0, a0, 10372
 	ldloc.1
-	ldc.i4 9912
+	ldc.i4 10372
 	add
 	stloc.1
-// 0x010a8d28: 0x10a8d28: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a9370: 0x10a9370: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2141,59 +2141,59 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d30: 0x10a8d30: addu  a1, v0, zero
+// 0x010a9378: 0x10a9378: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8d34: 0x10a8d34: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a937c: 0x10a937c: jal   0x109950c addu  a0, s5, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d3c: 0x10a8d3c: addu  a0, s1, zero
+// 0x010a9384: 0x10a9384: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a8d40: 0x10a8d40: jal   0x1098ec4 addu  a1, s5, zero
+// 0x010a9388: 0x10a9388: jal   0x109950c addu  a1, s5, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d48: 0x10a8d48: jal   0x103f640 sll   zero, zero, 0
-	call int32 Cibyl47::roadmap_net_mon_get_enabled_103f640()
+// 0x010a9390: 0x10a9390: jal   0x103f650 sll   zero, zero, 0
+	call int32 Cibyl47::roadmap_net_mon_get_enabled_103f650()
 	stloc 5
 // --- basic block ---
-// 0x010a8d50: 0x10a8d50: lui   a0, 0x20000
+// 0x010a9398: 0x10a9398: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8d54: 0x10a8d54: addiu a2, zero, 2
+// 0x010a939c: 0x10a939c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a8d58: 0x10a8d58: addu  a3, zero, zero
+// 0x010a93a0: 0x10a93a0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a8d5c: 0x10a8d5c: addiu a0, a0, 9708
+// 0x010a93a4: 0x10a93a4: addiu a0, a0, 10168
 	ldloc.1
-	ldc.i4 9708
+	ldc.i4 10168
 	add
 	stloc.1
-// 0x010a8d60: 0x10a8d60: addu  a1, v0, zero
+// 0x010a93a8: 0x10a93a8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8d64: 0x10a8d64: sw    zero, 16(sp)
+// 0x010a93ac: 0x10a93ac: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2202,7 +2202,7 @@ L_10a8b90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a8d68: 0x10a8d68: sw    zero, 20(sp)
+// 0x010a93b0: 0x10a93b0: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2211,7 +2211,7 @@ L_10a8b90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a8d6c: 0x10a8d6c: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a93b4: 0x10a93b4: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2225,25 +2225,25 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d74: 0x10a8d74: addu  a1, v0, zero
+// 0x010a93bc: 0x10a93bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8d78: 0x10a8d78: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a93c0: 0x10a93c0: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d80: 0x10a8d80: jal   0x10a8780 addiu a0, zero, 1
+// 0x010a93c8: 0x10a93c8: jal   0x10a8dc8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -2251,25 +2251,25 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::space_10a8780(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::space_10a8dc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d88: 0x10a8d88: addu  a1, v0, zero
+// 0x010a93d0: 0x10a93d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8d8c: 0x10a8d8c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a93d4: 0x10a93d4: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8d94: 0x10a8d94: lw    a0, 48(sp)
+// 0x010a93dc: 0x10a93dc: lw    a0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2278,17 +2278,17 @@ L_10a8b90:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a8d98: 0x10a8d98: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010a93e0: 0x10a93e0: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8da0: 0x10a8da0: lw    a1, 48(sp)
+// 0x010a93e8: 0x10a93e8: lw    a1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2297,17 +2297,17 @@ L_10a8b90:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a8da4: 0x10a8da4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a93ec: 0x10a93ec: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8dac: 0x10a8dac: lw    v1, 52(sp)
+// 0x010a93f4: 0x10a93f4: lw    v1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2316,24 +2316,24 @@ L_10a8b90:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a8db0: 0x10a8db0: lui   a0, 0x20000
+// 0x010a93f8: 0x10a93f8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8db4: 0x10a8db4: addiu a0, a0, 9928
+// 0x010a93fc: 0x10a93fc: addiu a0, a0, 10388
 	ldloc.1
-	ldc.i4 9928
+	ldc.i4 10388
 	add
 	stloc.1
-// 0x010a8db8: 0x10a8db8: addu  a1, zero, zero
+// 0x010a9400: 0x10a9400: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8dbc: 0x10a8dbc: addiu a2, zero, -2
+// 0x010a9404: 0x10a9404: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a8dc0: 0x10a8dc0: addiu a3, zero, -1
+// 0x010a9408: 0x10a9408: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8dc4: 0x10a8dc4: jal   0x1093a24 sw    v1, 16(sp)
+// 0x010a940c: 0x10a940c: jal   0x1094048 sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2347,32 +2347,32 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8dcc: 0x10a8dcc: lui   a0, 0x20000
+// 0x010a9414: 0x10a9414: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8dd0: 0x10a8dd0: addiu a3, zero, -1
+// 0x010a9418: 0x10a9418: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8dd4: 0x10a8dd4: addiu a0, a0, 9944
+// 0x010a941c: 0x10a941c: addiu a0, a0, 10404
 	ldloc.1
-	ldc.i4 9944
+	ldc.i4 10404
 	add
 	stloc.1
-// 0x010a8dd8: 0x10a8dd8: addu  a1, zero, zero
+// 0x010a9420: 0x10a9420: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8ddc: 0x10a8ddc: addiu a2, zero, -2
+// 0x010a9424: 0x10a9424: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010a8de0: 0x10a8de0: addu  s5, v0, zero
+// 0x010a9428: 0x10a9428: addu  s5, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010a8de4: 0x10a8de4: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010a942c: 0x10a942c: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2386,26 +2386,26 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8dec: 0x10a8dec: addu  s1, v0, zero
+// 0x010a9434: 0x10a9434: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a8df0: 0x10a8df0: addu  a0, v0, zero
+// 0x010a9438: 0x10a9438: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8df4: 0x10a8df4: lui   v0, 0x0
+// 0x010a943c: 0x10a943c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010a8df8: 0x10a8df8: addiu a1, v0, 31980
+// 0x010a9440: 0x10a9440: addiu a1, v0, 31980
 	ldloc 5
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010a8dfc: 0x10a8dfc: jal   0x1098fe0 addiu a2, s8, 23008
+// 0x010a9444: 0x10a9444: jal   0x1099628 addiu a2, s8, 23008
 	ldloc 17
 	ldc.i4 23008
 	add
@@ -2413,43 +2413,43 @@ L_10a8b90:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8e04: 0x10a8e04: lw    a2, -30068(s7)
+// 0x010a944c: 0x10a944c: lw    a2, -29604(s7)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a8e08: 0x10a8e08: addiu v0, zero, 2
+// 0x010a9450: 0x10a9450: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010a8e0c: 0x10a8e0c: div   a2, v0
+// 0x010a9454: 0x10a9454: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 18
-// 0x010a8e10: 0x10a8e10: lui   a0, 0x20000
+// 0x010a9458: 0x10a9458: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8e14: 0x10a8e14: addiu a3, zero, -1
+// 0x010a945c: 0x10a945c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8e18: 0x10a8e18: addiu a0, a0, 9968
+// 0x010a9460: 0x10a9460: addiu a0, a0, 10428
 	ldloc.1
-	ldc.i4 9968
+	ldc.i4 10428
 	add
 	stloc.1
-// 0x010a8e1c: 0x10a8e1c: addu  a1, zero, zero
+// 0x010a9464: 0x10a9464: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8e20: 0x10a8e20: mflo  lo
+// 0x010a9468: 0x10a9468: mflo  lo
 	ldloc 18
 	stloc.3
-// 0x010a8e24: 0x10a8e24: jal   0x1093a24 sw    s6, 16(sp)
+// 0x010a946c: 0x10a946c: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2463,34 +2463,34 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8e2c: 0x10a8e2c: addu  a0, v0, zero
+// 0x010a9474: 0x10a9474: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8e30: 0x10a8e30: addu  a1, zero, zero
+// 0x010a9478: 0x10a9478: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8e34: 0x10a8e34: addu  a2, zero, zero
+// 0x010a947c: 0x10a947c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8e38: 0x10a8e38: jal   0x1098fe0 addu  s6, v0, zero
+// 0x010a9480: 0x10a9480: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8e40: 0x10a8e40: lui   a0, 0x20000
+// 0x010a9488: 0x10a9488: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8e44: 0x10a8e44: jal   0x101cd60 addiu a0, a0, 9996
+// 0x010a948c: 0x10a948c: jal   0x101cd70 addiu a0, a0, 10456
 	ldloc.1
-	ldc.i4 9996
+	ldc.i4 10456
 	add
 	stloc.1
 	ldloc.0
@@ -2498,26 +2498,26 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8e4c: 0x10a8e4c: lui   a0, 0x20000
+// 0x010a9494: 0x10a9494: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8e50: 0x10a8e50: addiu a3, zero, 4240
+// 0x010a9498: 0x10a9498: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a8e54: 0x10a8e54: addiu a2, zero, -1
+// 0x010a949c: 0x10a949c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a8e58: 0x10a8e58: addiu a0, a0, 10020
+// 0x010a94a0: 0x10a94a0: addiu a0, a0, 10480
 	ldloc.1
-	ldc.i4 10020
+	ldc.i4 10480
 	add
 	stloc.1
-// 0x010a8e5c: 0x10a8e5c: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a94a4: 0x10a94a4: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2525,49 +2525,49 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8e64: 0x10a8e64: addu  a1, v0, zero
+// 0x010a94ac: 0x10a94ac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8e68: 0x10a8e68: jal   0x1098ec4 addu  a0, s6, zero
+// 0x010a94b0: 0x10a94b0: jal   0x109950c addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8e70: 0x10a8e70: addu  a0, s1, zero
+// 0x010a94b8: 0x10a94b8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a8e74: 0x10a8e74: jal   0x1098ec4 addu  a1, s6, zero
+// 0x010a94bc: 0x10a94bc: jal   0x109950c addu  a1, s6, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8e7c: 0x10a8e7c: lui   a1, 0x0
+// 0x010a94c4: 0x10a94c4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8e80: 0x10a8e80: addiu a2, zero, 16
+// 0x010a94c8: 0x10a94c8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010a8e84: 0x10a8e84: addiu a1, a1, 18636
+// 0x010a94cc: 0x10a94cc: addiu a1, a1, 18636
 	ldloc.2
 	ldc.i4 18636
 	add
 	stloc.2
-// 0x010a8e88: 0x10a8e88: jal   0x1001800 addiu a0, sp, 32
+// 0x010a94d0: 0x10a94d0: jal   0x1001800 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2581,15 +2581,15 @@ L_10a8b90:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8e90: 0x10a8e90: lui   a1, 0x0
+// 0x010a94d8: 0x10a94d8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8e94: 0x10a8e94: addiu a0, sp, 32
+// 0x010a94dc: 0x10a94dc: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x010a8e98: 0x10a8e98: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010a94e0: 0x10a94e0: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2599,31 +2599,31 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ea0: 0x10a8ea0: lui   a0, 0x20000
+// 0x010a94e8: 0x10a94e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8ea4: 0x10a8ea4: addiu a2, zero, 2
+// 0x010a94ec: 0x10a94ec: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010a8ea8: 0x10a8ea8: addu  a3, zero, zero
+// 0x010a94f0: 0x10a94f0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a8eac: 0x10a8eac: addiu a0, a0, 9676
+// 0x010a94f4: 0x10a94f4: addiu a0, a0, 10136
 	ldloc.1
-	ldc.i4 9676
+	ldc.i4 10136
 	add
 	stloc.1
-// 0x010a8eb0: 0x10a8eb0: sltu  a1, zero, v0
+// 0x010a94f8: 0x10a94f8: sltu  a1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x010a8eb4: 0x10a8eb4: sw    zero, 16(sp)
+// 0x010a94fc: 0x10a94fc: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2632,7 +2632,7 @@ L_10a8b90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a8eb8: 0x10a8eb8: sw    zero, 20(sp)
+// 0x010a9500: 0x10a9500: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2641,7 +2641,7 @@ L_10a8b90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a8ebc: 0x10a8ebc: jal   0x109c14c sw    zero, 24(sp)
+// 0x010a9504: 0x10a9504: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2655,25 +2655,25 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ec4: 0x10a8ec4: addu  a1, v0, zero
+// 0x010a950c: 0x10a950c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8ec8: 0x10a8ec8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a9510: 0x10a9510: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ed0: 0x10a8ed0: jal   0x10a8780 addiu a0, zero, 1
+// 0x010a9518: 0x10a9518: jal   0x10a8dc8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -2681,51 +2681,51 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::space_10a8780(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::space_10a8dc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ed8: 0x10a8ed8: addu  a1, v0, zero
+// 0x010a9520: 0x10a9520: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8edc: 0x10a8edc: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010a9524: 0x10a9524: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ee4: 0x10a8ee4: addu  a1, s1, zero
+// 0x010a952c: 0x10a952c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010a8ee8: 0x10a8ee8: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010a9530: 0x10a9530: jal   0x109950c addu  a0, s5, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8ef0: 0x10a8ef0: addu  a0, s0, zero
+// 0x010a9538: 0x10a9538: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a8ef4: 0x10a8ef4: jal   0x1098ec4 addu  a1, s5, zero
+// 0x010a953c: 0x10a953c: jal   0x109950c addu  a1, s5, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8efc: 0x10a8efc: lw    t0, 56(sp)
+// 0x010a9544: 0x10a9544: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2734,24 +2734,24 @@ L_10a8b90:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a8f00: 0x10a8f00: lui   a0, 0x20000
+// 0x010a9548: 0x10a9548: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8f04: 0x10a8f04: addu  a1, zero, zero
+// 0x010a954c: 0x10a954c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8f08: 0x10a8f08: addiu a2, zero, -1
+// 0x010a9550: 0x10a9550: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a8f0c: 0x10a8f0c: addiu a3, zero, -1
+// 0x010a9554: 0x10a9554: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8f10: 0x10a8f10: addiu a0, a0, 10044
+// 0x010a9558: 0x10a9558: addiu a0, a0, 10504
 	ldloc.1
-	ldc.i4 10044
+	ldc.i4 10504
 	add
 	stloc.1
-// 0x010a8f14: 0x10a8f14: jal   0x1093a24 sw    t0, 16(sp)
+// 0x010a955c: 0x10a955c: jal   0x1094048 sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2765,20 +2765,20 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8f1c: 0x10a8f1c: lui   a0, 0x20000
+// 0x010a9564: 0x10a9564: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8f20: 0x10a8f20: addiu a0, a0, 10056
+// 0x010a9568: 0x10a9568: addiu a0, a0, 10516
 	ldloc.1
-	ldc.i4 10056
+	ldc.i4 10516
 	add
 	stloc.1
-// 0x010a8f24: 0x10a8f24: jal   0x101cd60 addu  s1, v0, zero
+// 0x010a956c: 0x10a956c: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2786,26 +2786,26 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8f2c: 0x10a8f2c: lui   a0, 0x20000
+// 0x010a9574: 0x10a9574: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8f30: 0x10a8f30: addiu a3, zero, 4240
+// 0x010a9578: 0x10a9578: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a8f34: 0x10a8f34: addiu a2, zero, 14
+// 0x010a957c: 0x10a957c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010a8f38: 0x10a8f38: addu  a1, v0, zero
+// 0x010a9580: 0x10a9580: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8f3c: 0x10a8f3c: jal   0x1098d10 addiu a0, a0, 10064
+// 0x010a9584: 0x10a9584: jal   0x1099358 addiu a0, a0, 10524
 	ldloc.1
-	ldc.i4 10064
+	ldc.i4 10524
 	add
 	stloc.1
 	ldloc.0
@@ -2813,20 +2813,20 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8f44: 0x10a8f44: addu  a0, v0, zero
+// 0x010a958c: 0x10a958c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a8f48: 0x10a8f48: addiu a1, s4, -27176
+// 0x010a9590: 0x10a9590: addiu a1, s4, -27176
 	ldloc 14
 	ldc.i4 -27176
 	add
 	stloc.2
-// 0x010a8f4c: 0x10a8f4c: jal   0x1097af8 sw    v0, 52(sp)
+// 0x010a9594: 0x10a9594: jal   0x1098140 sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2837,9 +2837,9 @@ L_10a8b90:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010a8f54: 0x10a8f54: lw    v0, 52(sp)
+// 0x010a959c: 0x10a959c: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2848,64 +2848,64 @@ L_10a8b90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a8f58: 0x10a8f58: addu  a0, s1, zero
+// 0x010a95a0: 0x10a95a0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a8f5c: 0x10a8f5c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a95a4: 0x10a95a4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8f64: 0x10a8f64: addu  a0, s1, zero
+// 0x010a95ac: 0x10a95ac: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a8f68: 0x10a8f68: addu  a2, zero, zero
+// 0x010a95b0: 0x10a95b0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8f6c: 0x10a8f6c: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a95b4: 0x10a95b4: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8f74: 0x10a8f74: addu  a1, s1, zero
+// 0x010a95bc: 0x10a95bc: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010a8f78: 0x10a8f78: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a95c0: 0x10a95c0: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8f80: 0x10a8f80: lui   a0, 0x20000
+// 0x010a95c8: 0x10a95c8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8f84: 0x10a8f84: addu  a1, zero, zero
+// 0x010a95cc: 0x10a95cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a8f88: 0x10a8f88: addiu a2, zero, -1
+// 0x010a95d0: 0x10a95d0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a8f8c: 0x10a8f8c: addiu a3, zero, -1
+// 0x010a95d4: 0x10a95d4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a8f90: 0x10a8f90: addiu a0, a0, 10080
+// 0x010a95d8: 0x10a95d8: addiu a0, a0, 10540
 	ldloc.1
-	ldc.i4 10080
+	ldc.i4 10540
 	add
 	stloc.1
-// 0x010a8f94: 0x10a8f94: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010a95dc: 0x10a95dc: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2919,52 +2919,52 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8f9c: 0x10a8f9c: addu  s1, v0, zero
+// 0x010a95e4: 0x10a95e4: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a8fa0: 0x10a8fa0: lui   v0, 0x20000
+// 0x010a95e8: 0x10a95e8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a8fa4: 0x10a8fa4: lw    a0, 29780(v0)
+// 0x010a95ec: 0x10a95ec: lw    a0, 30244(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7445
+	ldc.i4 7561
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a8fa8: 0x10a8fa8: jal   0x101cd60 sll   zero, zero, 0
+// 0x010a95f0: 0x10a95f0: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8fb0: 0x10a8fb0: lui   a0, 0x20000
+// 0x010a95f8: 0x10a95f8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a8fb4: 0x10a8fb4: addiu a3, zero, 4240
+// 0x010a95fc: 0x10a95fc: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a8fb8: 0x10a8fb8: addiu a2, zero, 14
+// 0x010a9600: 0x10a9600: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010a8fbc: 0x10a8fbc: addiu a0, a0, 10092
+// 0x010a9604: 0x10a9604: addiu a0, a0, 10552
 	ldloc.1
-	ldc.i4 10092
+	ldc.i4 10552
 	add
 	stloc.1
-// 0x010a8fc0: 0x10a8fc0: jal   0x1098d10 addu  a1, v0, zero
+// 0x010a9608: 0x10a9608: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2972,18 +2972,18 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8fc8: 0x10a8fc8: addu  a1, v0, zero
+// 0x010a9610: 0x10a9610: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a8fcc: 0x10a8fcc: addu  a0, s1, zero
+// 0x010a9614: 0x10a9614: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a8fd0: 0x10a8fd0: jal   0x1098ec4 sw    v0, 52(sp)
+// 0x010a9618: 0x10a9618: jal   0x109950c sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2994,12 +2994,12 @@ L_10a8b90:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a8fd8: 0x10a8fd8: lw    v0, 52(sp)
+// 0x010a9620: 0x10a9620: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3008,63 +3008,63 @@ L_10a8b90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a8fdc: 0x10a8fdc: addiu a1, s4, -27176
+// 0x010a9624: 0x10a9624: addiu a1, s4, -27176
 	ldloc 14
 	ldc.i4 -27176
 	add
 	stloc.2
-// 0x010a8fe0: 0x10a8fe0: jal   0x1097af8 addu  a0, v0, zero
+// 0x010a9628: 0x10a9628: jal   0x1098140 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010a8fe8: 0x10a8fe8: addu  a0, s1, zero
+// 0x010a9630: 0x10a9630: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a8fec: 0x10a8fec: addu  a2, zero, zero
+// 0x010a9634: 0x10a9634: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a8ff0: 0x10a8ff0: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a9638: 0x10a9638: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a8ff8: 0x10a8ff8: addu  a1, s1, zero
+// 0x010a9640: 0x10a9640: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010a8ffc: 0x10a8ffc: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a9644: 0x10a9644: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9004: 0x10a9004: lui   a0, 0x20000
+// 0x010a964c: 0x10a964c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9008: 0x10a9008: addu  a1, zero, zero
+// 0x010a9650: 0x10a9650: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010a900c: 0x10a900c: addiu a2, zero, -1
+// 0x010a9654: 0x10a9654: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010a9010: 0x10a9010: addiu a3, zero, -1
+// 0x010a9658: 0x10a9658: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010a9014: 0x10a9014: addiu a0, a0, 10108
+// 0x010a965c: 0x10a965c: addiu a0, a0, 10568
 	ldloc.1
-	ldc.i4 10108
+	ldc.i4 10568
 	add
 	stloc.1
-// 0x010a9018: 0x10a9018: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010a9660: 0x10a9660: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3078,52 +3078,52 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9020: 0x10a9020: addu  s1, v0, zero
+// 0x010a9668: 0x10a9668: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a9024: 0x10a9024: lui   v0, 0x20000
+// 0x010a966c: 0x10a966c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010a9028: 0x10a9028: lw    a0, 29784(v0)
+// 0x010a9670: 0x10a9670: lw    a0, 30248(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7446
+	ldc.i4 7562
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a902c: 0x10a902c: jal   0x101cd60 sll   zero, zero, 0
+// 0x010a9674: 0x10a9674: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9034: 0x10a9034: lui   a0, 0x20000
+// 0x010a967c: 0x10a967c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9038: 0x10a9038: addiu a3, zero, 4240
+// 0x010a9680: 0x10a9680: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010a903c: 0x10a903c: addiu a2, zero, 14
+// 0x010a9684: 0x10a9684: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010a9040: 0x10a9040: addu  a1, v0, zero
+// 0x010a9688: 0x10a9688: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a9044: 0x10a9044: jal   0x1098d10 addiu a0, a0, 10120
+// 0x010a968c: 0x10a968c: jal   0x1099358 addiu a0, a0, 10580
 	ldloc.1
-	ldc.i4 10120
+	ldc.i4 10580
 	add
 	stloc.1
 	ldloc.0
@@ -3131,20 +3131,20 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a904c: 0x10a904c: addu  a0, v0, zero
+// 0x010a9694: 0x10a9694: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a9050: 0x10a9050: addiu a1, s4, -27176
+// 0x010a9698: 0x10a9698: addiu a1, s4, -27176
 	ldloc 14
 	ldc.i4 -27176
 	add
 	stloc.2
-// 0x010a9054: 0x10a9054: jal   0x1097af8 sw    v0, 52(sp)
+// 0x010a969c: 0x10a969c: jal   0x1098140 sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3155,9 +3155,9 @@ L_10a8b90:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010a905c: 0x10a905c: lw    v0, 52(sp)
+// 0x010a96a4: 0x10a96a4: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3166,71 +3166,71 @@ L_10a8b90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a9060: 0x10a9060: addu  a0, s1, zero
+// 0x010a96a8: 0x10a96a8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a9064: 0x10a9064: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010a96ac: 0x10a96ac: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a906c: 0x10a906c: addu  a2, zero, zero
+// 0x010a96b4: 0x10a96b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010a9070: 0x10a9070: addu  a0, s1, zero
+// 0x010a96b8: 0x10a96b8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010a9074: 0x10a9074: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010a96bc: 0x10a96bc: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010a907c: 0x10a907c: addu  a0, s0, zero
+// 0x010a96c4: 0x10a96c4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010a9080: 0x10a9080: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010a96c8: 0x10a96c8: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9088: 0x10a9088: lui   a0, 0x10000
+// 0x010a96d0: 0x10a96d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010a908c: 0x10a908c: addiu a0, a0, -21272
+// 0x010a96d4: 0x10a96d4: addiu a0, a0, -21272
 	ldloc.1
 	ldc.i4 -21272
 	add
 	stloc.1
-// 0x010a9090: 0x10a9090: lui   a2, 0x300000
+// 0x010a96d8: 0x10a96d8: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x010a9094: 0x10a9094: lui   a3, 0x10b0000
+// 0x010a96dc: 0x10a96dc: lui   a3, 0x10b0000
 	ldc.i4 17498112
 	stloc 4
-// 0x010a9098: 0x10a9098: addu  a1, a0, zero
+// 0x010a96e0: 0x10a96e0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010a909c: 0x10a909c: ori   a2, a2, 26
+// 0x010a96e4: 0x10a96e4: ori   a2, a2, 26
 	ldloc.3
 	ldc.i4.s 26
 	or
 	stloc.3
-// 0x010a90a0: 0x10a90a0: jal   0x1091088 addiu a3, a3, -30772
+// 0x010a96e8: 0x10a96e8: jal   0x10916ac addiu a3, a3, -29164
 	ldloc 4
-	ldc.i4 -30772
+	ldc.i4 -29164
 	add
 	stloc 4
 	ldloc.0
@@ -3238,28 +3238,28 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a90a8: 0x10a90a8: addu  a1, v0, zero
+// 0x010a96f0: 0x10a96f0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a90ac: 0x10a90ac: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010a96f4: 0x10a96f4: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a90b4: 0x10a90b4: addu  a0, s2, zero
+// 0x010a96fc: 0x10a96fc: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x010a90b8: 0x10a90b8: jal   0x1095eec addu  a1, zero, zero
+// 0x010a9700: 0x10a9700: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3267,25 +3267,25 @@ L_10a8b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a90c0:
-// 0x010a90c0: 0x10a90c0: jal   0x109483c sll   zero, zero, 0
+L_10a9708:
+// 0x010a9708: 0x10a9708: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a90c8: 0x10a90c8: lw    ra, 100(sp)
-// 0x010a90cc: 0x10a90cc: lw    s8, 96(sp)
+// 0x010a9710: 0x10a9710: lw    ra, 100(sp)
+// 0x010a9714: 0x10a9714: lw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3294,7 +3294,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010a90d0: 0x10a90d0: lw    s7, 92(sp)
+// 0x010a9718: 0x10a9718: lw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3303,7 +3303,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010a90d4: 0x10a90d4: lw    s6, 88(sp)
+// 0x010a971c: 0x10a971c: lw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3312,7 +3312,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a90d8: 0x10a90d8: lw    s5, 84(sp)
+// 0x010a9720: 0x10a9720: lw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3321,7 +3321,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a90dc: 0x10a90dc: lw    s4, 80(sp)
+// 0x010a9724: 0x10a9724: lw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3330,7 +3330,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a90e0: 0x10a90e0: lw    s3, 76(sp)
+// 0x010a9728: 0x10a9728: lw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3339,7 +3339,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a90e4: 0x10a90e4: lw    s2, 72(sp)
+// 0x010a972c: 0x10a972c: lw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3348,7 +3348,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a90e8: 0x10a90e8: lw    s1, 68(sp)
+// 0x010a9730: 0x10a9730: lw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3357,7 +3357,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a90ec: 0x10a90ec: lw    s0, 64(sp)
+// 0x010a9734: 0x10a9734: lw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3366,7 +3366,7 @@ L_10a90c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a90f0: 0x10a90f0: jr    ra addiu sp, sp, 104
+// 0x010a9738: 0x10a9738: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -3378,7 +3378,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_set_show_function_10a90f8(int32)
+.method public static int32 roadmap_login_set_show_function_10a9740(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -3398,15 +3398,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a90f8: 0x10a90f8: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010a9740: 0x10a9740: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc.1
-// 0x010a90fc: 0x10a90fc: jr    ra sw    a0, 32664(v0)
+// 0x010a9744: 0x10a9744: jr    ra sw    a0, -32408(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 8166
+	ldc.i4 -8102
 	add
 	ldloc.0
 	stelem.i4
@@ -3415,7 +3415,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_login_empty_10a9104(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_empty_10a974c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3453,21 +3453,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9104: 0x10a9104: lui   a0, 0x0
+// 0x010a974c: 0x10a974c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a9108: 0x10a9108: addiu sp, sp, -24
+// 0x010a9750: 0x10a9750: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a910c: 0x10a910c: addiu a0, a0, 18668
+// 0x010a9754: 0x10a9754: addiu a0, a0, 18668
 	ldloc.1
 	ldc.i4 18668
 	add
 	stloc.1
-// 0x010a9110: 0x10a9110: sw    ra, 20(sp)
-// 0x010a9114: 0x10a9114: jal   0x100e348 sw    s0, 16(sp)
+// 0x010a9758: 0x10a9758: sw    ra, 20(sp)
+// 0x010a975c: 0x10a975c: jal   0x100e358 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3481,18 +3481,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a911c: 0x10a911c: lui   a0, 0x0
+// 0x010a9764: 0x10a9764: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a9120: 0x10a9120: addu  s0, v0, zero
+// 0x010a9768: 0x10a9768: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010a9124: 0x10a9124: jal   0x100e348 addiu a0, a0, 18700
+// 0x010a976c: 0x10a976c: jal   0x100e358 addiu a0, a0, 18700
 	ldloc.1
 	ldc.i4 18700
 	add
@@ -3502,37 +3502,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a912c: 0x10a912c: lb    a0, 0(s0)
+// 0x010a9774: 0x10a9774: lb    a0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010a9130: 0x10a9130: addu  v1, v0, zero
+// 0x010a9778: 0x10a9778: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010a9134: 0x10a9134: beq   a0, zero, 0x10a9148 addiu v0, zero, 1
+// 0x010a977c: 0x10a977c: beq   a0, zero, 0x10a9790 addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	brfalse L_10a9148
+	brfalse L_10a9790
 // --- basic block ---
-// 0x010a913c: 0x10a913c: lb    v0, 0(v1)
+// 0x010a9784: 0x10a9784: lb    v0, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a9140: 0x10a9140: sll   zero, zero, 0
-// 0x010a9144: 0x10a9144: sltiu v0, v0, 1
+// 0x010a9788: 0x10a9788: sll   zero, zero, 0
+// 0x010a978c: 0x10a978c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-L_10a9148:
-// 0x010a9148: 0x10a9148: lw    ra, 20(sp)
-// 0x010a914c: 0x10a914c: lw    s0, 16(sp)
+L_10a9790:
+// 0x010a9790: 0x10a9790: lw    ra, 20(sp)
+// 0x010a9794: 0x10a9794: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3541,7 +3541,7 @@ L_10a9148:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a9150: 0x10a9150: jr    ra addiu sp, sp, 24
+// 0x010a9798: 0x10a9798: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3553,7 +3553,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_set_nickname_10a9158(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_set_nickname_10a97a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3588,18 +3588,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9158: 0x10a9158: addiu sp, sp, -24
+// 0x010a97a0: 0x10a97a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a915c: 0x10a915c: addiu a0, a0, 128
+// 0x010a97a4: 0x10a97a4: addiu a0, a0, 128
 	ldloc.1
 	ldc.i4 128
 	add
 	stloc.1
-// 0x010a9160: 0x10a9160: sw    ra, 20(sp)
-// 0x010a9164: 0x10a9164: jal   0x1001af8 addiu a2, zero, 64
+// 0x010a97a8: 0x10a97a8: sw    ra, 20(sp)
+// 0x010a97ac: 0x10a97ac: jal   0x1001af8 addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -3608,9 +3608,9 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x010a916c: 0x10a916c: lw    ra, 20(sp)
-// 0x010a9170: 0x10a9170: sll   zero, zero, 0
-// 0x010a9174: 0x10a9174: jr    ra addiu sp, sp, 24
+// 0x010a97b4: 0x10a97b4: lw    ra, 20(sp)
+// 0x010a97b8: 0x10a97b8: sll   zero, zero, 0
+// 0x010a97bc: 0x10a97bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3622,7 +3622,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_login_set_pwd_10a917c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_set_pwd_10a97c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3657,18 +3657,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a917c: 0x10a917c: addiu sp, sp, -24
+// 0x010a97c4: 0x10a97c4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9180: 0x10a9180: addiu a0, a0, 64
+// 0x010a97c8: 0x10a97c8: addiu a0, a0, 64
 	ldloc.1
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x010a9184: 0x10a9184: sw    ra, 20(sp)
-// 0x010a9188: 0x10a9188: jal   0x1001af8 addiu a2, zero, 64
+// 0x010a97cc: 0x10a97cc: sw    ra, 20(sp)
+// 0x010a97d0: 0x10a97d0: jal   0x1001af8 addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -3677,9 +3677,9 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x010a9190: 0x10a9190: lw    ra, 20(sp)
-// 0x010a9194: 0x10a9194: sll   zero, zero, 0
-// 0x010a9198: 0x10a9198: jr    ra addiu sp, sp, 24
+// 0x010a97d8: 0x10a97d8: lw    ra, 20(sp)
+// 0x010a97dc: 0x10a97dc: sll   zero, zero, 0
+// 0x010a97e0: 0x10a97e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3691,7 +3691,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_login_set_username_10a91a0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_set_username_10a97e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3726,13 +3726,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a91a0: 0x10a91a0: addiu sp, sp, -24
+// 0x010a97e8: 0x10a97e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a91a4: 0x10a91a4: sw    ra, 20(sp)
-// 0x010a91a8: 0x10a91a8: jal   0x1001af8 addiu a2, zero, 64
+// 0x010a97ec: 0x10a97ec: sw    ra, 20(sp)
+// 0x010a97f0: 0x10a97f0: jal   0x1001af8 addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -3741,9 +3741,9 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x010a91b0: 0x10a91b0: lw    ra, 20(sp)
-// 0x010a91b4: 0x10a91b4: sll   zero, zero, 0
-// 0x010a91b8: 0x10a91b8: jr    ra addiu sp, sp, 24
+// 0x010a97f8: 0x10a97f8: lw    ra, 20(sp)
+// 0x010a97fc: 0x10a97fc: sll   zero, zero, 0
+// 0x010a9800: 0x10a9800: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3755,7 +3755,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_login_details_update_profile_ok_repsonse_10a91c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_details_update_profile_ok_repsonse_10a9808(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3790,18 +3790,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a91c0: 0x10a91c0: lui   a0, 0x20000
+// 0x010a9808: 0x10a9808: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a91c4: 0x10a91c4: addiu sp, sp, -24
+// 0x010a980c: 0x10a980c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a91c8: 0x10a91c8: sw    ra, 20(sp)
-// 0x010a91cc: 0x10a91cc: jal   0x101cd60 addiu a0, a0, 10392
+// 0x010a9810: 0x10a9810: sw    ra, 20(sp)
+// 0x010a9814: 0x10a9814: jal   0x101cd70 addiu a0, a0, 10852
 	ldloc.1
-	ldc.i4 10392
+	ldc.i4 10852
 	add
 	stloc.1
 	ldloc.0
@@ -3809,23 +3809,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a91d4: 0x10a91d4: jal   0x104c3d0 addu  a0, v0, zero
+// 0x010a981c: 0x10a981c: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a91dc: 0x10a91dc: jal   0x10a05d8 sll   zero, zero, 0
-	call int32 Cibyl120::roadmap_login_dlg_get_username_10a05d8()
+// 0x010a9824: 0x10a9824: jal   0x10a0c20 sll   zero, zero, 0
+	call int32 Cibyl120::roadmap_login_dlg_get_username_10a0c20()
 	stloc 5
 // --- basic block ---
-// 0x010a91e4: 0x10a91e4: jal   0x106aee0 addu  a0, v0, zero
+// 0x010a982c: 0x10a982c: jal   0x106b504 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3833,16 +3833,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginUsername_106aee0(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginUsername_106b504(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a91ec: 0x10a91ec: jal   0x10a05e4 sll   zero, zero, 0
-	call int32 Cibyl120::roadmap_login_dlg_get_password_10a05e4()
+// 0x010a9834: 0x10a9834: jal   0x10a0c2c sll   zero, zero, 0
+	call int32 Cibyl120::roadmap_login_dlg_get_password_10a0c2c()
 	stloc 5
 // --- basic block ---
-// 0x010a91f4: 0x10a91f4: jal   0x106aeb8 addu  a0, v0, zero
+// 0x010a983c: 0x10a983c: jal   0x106b4dc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3850,16 +3850,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginPassword_106aeb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginPassword_106b4dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a91fc: 0x10a91fc: jal   0x10a05f0 sll   zero, zero, 0
-	call int32 Cibyl120::roadmap_login_dlg_get_nickname_10a05f0()
+// 0x010a9844: 0x10a9844: jal   0x10a0c38 sll   zero, zero, 0
+	call int32 Cibyl120::roadmap_login_dlg_get_nickname_10a0c38()
 	stloc 5
 // --- basic block ---
-// 0x010a9204: 0x10a9204: jal   0x106ae90 addu  a0, v0, zero
+// 0x010a984c: 0x10a984c: jal   0x106b4b4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3867,17 +3867,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginNickname_106ae90(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginNickname_106b4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a920c: 0x10a920c: lui   a0, 0x10b0000
+// 0x010a9854: 0x10a9854: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010a9210: 0x10a9210: jal   0x106bff0 addiu a0, a0, -25952
+// 0x010a9858: 0x10a9858: jal   0x106c614 addiu a0, a0, -24344
 	ldloc.1
-	ldc.i4 -25952
+	ldc.i4 -24344
 	add
 	stloc.1
 	ldloc.0
@@ -3885,14 +3885,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_VerifyLoginDetails_106bff0(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_VerifyLoginDetails_106c614(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9218: 0x10a9218: lw    ra, 20(sp)
-// 0x010a921c: 0x10a921c: sll   zero, zero, 0
-// 0x010a9220: 0x10a9220: jr    ra addiu sp, sp, 24
+// 0x010a9860: 0x10a9860: lw    ra, 20(sp)
+// 0x010a9864: 0x10a9864: sll   zero, zero, 0
+// 0x010a9868: 0x10a9868: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3904,7 +3904,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_update_details_on_response_10a9228(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_update_details_on_response_10a9870(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 s1,int32 ra)
@@ -3945,12 +3945,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9228: 0x10a9228: addiu sp, sp, -40
+// 0x010a9870: 0x10a9870: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a922c: 0x10a922c: sw    s0, 28(sp)
+// 0x010a9874: 0x10a9874: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3959,11 +3959,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a9230: 0x10a9230: addu  s0, a0, zero
+// 0x010a9878: 0x10a9878: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010a9234: 0x10a9234: sw    ra, 36(sp)
-// 0x010a9238: 0x10a9238: jal   0x104c3f0 sw    s1, 32(sp)
+// 0x010a987c: 0x10a987c: sw    ra, 36(sp)
+// 0x010a9880: 0x10a9880: jal   0x104c400 sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3972,37 +3972,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9240: 0x10a9240: beq   s0, zero, 0x10a92a0 lui   s1, 0x20000
+// 0x010a9888: 0x10a9888: beq   s0, zero, 0x10a98e8 lui   s1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 9
-	brfalse L_10a92a0
+	brfalse L_10a98e8
 // --- basic block ---
-// 0x010a9248: 0x10a9248: lui   a3, 0x20000
+// 0x010a9890: 0x10a9890: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a924c: 0x10a924c: addiu a3, a3, 10440
+// 0x010a9894: 0x10a9894: addiu a3, a3, 10900
 	ldloc 4
-	ldc.i4 10440
+	ldc.i4 10900
 	add
 	stloc 4
-// 0x010a9250: 0x10a9250: addiu a0, zero, 4
+// 0x010a9898: 0x10a9898: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a9254: 0x10a9254: addiu a1, s1, 10412
+// 0x010a989c: 0x10a989c: addiu a1, s1, 10872
 	ldloc 9
-	ldc.i4 10412
+	ldc.i4 10872
 	add
 	stloc.2
-// 0x010a9258: 0x10a9258: addiu a2, zero, 488
+// 0x010a98a0: 0x10a98a0: addiu a2, zero, 488
 	ldc.i4 488
 	stloc.3
-// 0x010a925c: 0x10a925c: jal   0x100449c sw    s0, 16(sp)
+// 0x010a98a4: 0x10a98a4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4021,207 +4021,207 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9264: 0x10a9264: addiu v0, zero, 30
+// 0x010a98ac: 0x10a98ac: addiu v0, zero, 30
 	ldc.i4.s 30
 	stloc 5
-// 0x010a9268: 0x10a9268: beq   s0, v0, 0x10a92b0 addiu v0, zero, 31
+// 0x010a98b0: 0x10a98b0: beq   s0, v0, 0x10a98f8 addiu v0, zero, 31
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 31
 	stloc 5
-	beq  L_10a92b0
+	beq  L_10a98f8
 // --- basic block ---
-// 0x010a9270: 0x10a9270: beq   s0, v0, 0x10a92c4 addiu v0, zero, 32
+// 0x010a98b8: 0x10a98b8: beq   s0, v0, 0x10a990c addiu v0, zero, 32
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 32
 	stloc 5
-	beq  L_10a92c4
+	beq  L_10a990c
 // --- basic block ---
-// 0x010a9278: 0x10a9278: beq   s0, v0, 0x10a92d8 addiu v0, zero, 33
+// 0x010a98c0: 0x10a98c0: beq   s0, v0, 0x10a9920 addiu v0, zero, 33
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 33
 	stloc 5
-	beq  L_10a92d8
+	beq  L_10a9920
 // --- basic block ---
-// 0x010a9280: 0x10a9280: beq   s0, v0, 0x10a92ec addiu v0, zero, 34
+// 0x010a98c8: 0x10a98c8: beq   s0, v0, 0x10a9934 addiu v0, zero, 34
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 34
 	stloc 5
-	beq  L_10a92ec
+	beq  L_10a9934
 // --- basic block ---
-// 0x010a9288: 0x10a9288: beq   s0, v0, 0x10a9300 addiu v0, zero, 35
+// 0x010a98d0: 0x10a98d0: beq   s0, v0, 0x10a9948 addiu v0, zero, 35
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 35
 	stloc 5
-	beq  L_10a9300
+	beq  L_10a9948
 // --- basic block ---
-// 0x010a9290: 0x10a9290: bne   s0, v0, 0x10a9330 lui   a1, 0x20000
+// 0x010a98d8: 0x10a98d8: bne   s0, v0, 0x10a9978 lui   a1, 0x20000
 	ldloc 6
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10a9330
+	bne.un L_10a9978
 // --- basic block ---
-// 0x010a9298: 0x10a9298: j	 0x10a9314 lui   a0, 0x0
+// 0x010a98e0: 0x10a98e0: j	 0x10a995c lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_10a9314
+	br L_10a995c
 // --- basic block ---
-L_10a92a0:
-// 0x010a92a0: 0x10a92a0: jal   0x10a91c0 sll   zero, zero, 0
+L_10a98e8:
+// 0x010a98e8: 0x10a98e8: jal   0x10a9808 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_details_update_profile_ok_repsonse_10a91c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_details_update_profile_ok_repsonse_10a9808(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a92a8: 0x10a92a8: j	 0x10a935c sll   zero, zero, 0
-	br L_10a935c
+// 0x010a98f0: 0x10a98f0: j	 0x10a99a4 sll   zero, zero, 0
+	br L_10a99a4
 // --- basic block ---
-L_10a92b0:
-// 0x010a92b0: 0x10a92b0: lui   a0, 0x0
+L_10a98f8:
+// 0x010a98f8: 0x10a98f8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a92b4: 0x10a92b4: lui   a1, 0x20000
+// 0x010a98fc: 0x10a98fc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a92b8: 0x10a92b8: addiu a0, a0, 30092
+// 0x010a9900: 0x10a9900: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a92bc: 0x10a92bc: j	 0x10a9320 addiu a1, a1, 10512
+// 0x010a9904: 0x10a9904: j	 0x10a9968 addiu a1, a1, 10972
 	ldloc.2
-	ldc.i4 10512
+	ldc.i4 10972
 	add
 	stloc.2
-	br L_10a9320
+	br L_10a9968
 // --- basic block ---
-L_10a92c4:
-// 0x010a92c4: 0x10a92c4: lui   a0, 0x0
+L_10a990c:
+// 0x010a990c: 0x10a990c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a92c8: 0x10a92c8: lui   a1, 0x20000
+// 0x010a9910: 0x10a9910: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a92cc: 0x10a92cc: addiu a0, a0, 30092
+// 0x010a9914: 0x10a9914: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a92d0: 0x10a92d0: j	 0x10a9320 addiu a1, a1, 10532
+// 0x010a9918: 0x10a9918: j	 0x10a9968 addiu a1, a1, 10992
 	ldloc.2
-	ldc.i4 10532
+	ldc.i4 10992
 	add
 	stloc.2
-	br L_10a9320
+	br L_10a9968
 // --- basic block ---
-L_10a92d8:
-// 0x010a92d8: 0x10a92d8: lui   a0, 0x0
+L_10a9920:
+// 0x010a9920: 0x10a9920: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a92dc: 0x10a92dc: lui   a1, 0x20000
+// 0x010a9924: 0x10a9924: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a92e0: 0x10a92e0: addiu a0, a0, 30092
+// 0x010a9928: 0x10a9928: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a92e4: 0x10a92e4: j	 0x10a9320 addiu a1, a1, 10588
+// 0x010a992c: 0x10a992c: j	 0x10a9968 addiu a1, a1, 11048
 	ldloc.2
-	ldc.i4 10588
+	ldc.i4 11048
 	add
 	stloc.2
-	br L_10a9320
+	br L_10a9968
 // --- basic block ---
-L_10a92ec:
-// 0x010a92ec: 0x10a92ec: lui   a0, 0x0
+L_10a9934:
+// 0x010a9934: 0x10a9934: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a92f0: 0x10a92f0: lui   a1, 0x20000
+// 0x010a9938: 0x10a9938: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a92f4: 0x10a92f4: addiu a0, a0, 30092
+// 0x010a993c: 0x10a993c: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a92f8: 0x10a92f8: j	 0x10a9320 addiu a1, a1, 10608
+// 0x010a9940: 0x10a9940: j	 0x10a9968 addiu a1, a1, 11068
 	ldloc.2
-	ldc.i4 10608
+	ldc.i4 11068
 	add
 	stloc.2
-	br L_10a9320
+	br L_10a9968
 // --- basic block ---
-L_10a9300:
-// 0x010a9300: 0x10a9300: lui   a0, 0x0
+L_10a9948:
+// 0x010a9948: 0x10a9948: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a9304: 0x10a9304: lui   a1, 0x20000
+// 0x010a994c: 0x10a994c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9308: 0x10a9308: addiu a0, a0, 30092
+// 0x010a9950: 0x10a9950: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a930c: 0x10a930c: j	 0x10a9320 addiu a1, a1, 10632
+// 0x010a9954: 0x10a9954: j	 0x10a9968 addiu a1, a1, 11092
 	ldloc.2
-	ldc.i4 10632
+	ldc.i4 11092
 	add
 	stloc.2
-	br L_10a9320
+	br L_10a9968
 // --- basic block ---
-L_10a9314:
-// 0x010a9314: 0x10a9314: lui   a1, 0x20000
+L_10a995c:
+// 0x010a995c: 0x10a995c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9318: 0x10a9318: addiu a0, a0, 30092
+// 0x010a9960: 0x10a9960: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a931c: 0x10a931c: addiu a1, a1, 10660
+// 0x010a9964: 0x10a9964: addiu a1, a1, 11120
 	ldloc.2
-	ldc.i4 10660
+	ldc.i4 11120
 	add
 	stloc.2
-L_10a9320:
-// 0x010a9320: 0x10a9320: jal   0x104c148 sll   zero, zero, 0
+L_10a9968:
+// 0x010a9968: 0x10a9968: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9328: 0x10a9328: j	 0x10a935c sll   zero, zero, 0
-	br L_10a935c
+// 0x010a9970: 0x10a9970: j	 0x10a99a4 sll   zero, zero, 0
+	br L_10a99a4
 // --- basic block ---
-L_10a9330:
-// 0x010a9330: 0x10a9330: lui   a0, 0x0
+L_10a9978:
+// 0x010a9978: 0x10a9978: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a9334: 0x10a9334: addiu a0, a0, 30152
+// 0x010a997c: 0x10a997c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010a9338: 0x10a9338: jal   0x104c148 addiu a1, a1, 10704
+// 0x010a9980: 0x10a9980: jal   0x104c158 addiu a1, a1, 11164
 	ldloc.2
-	ldc.i4 10704
+	ldc.i4 11164
 	add
 	stloc.2
 	ldloc.0
@@ -4229,31 +4229,31 @@ L_10a9330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9340: 0x10a9340: lui   a3, 0x20000
+// 0x010a9988: 0x10a9988: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a9344: 0x10a9344: addiu a1, s1, 10412
+// 0x010a998c: 0x10a998c: addiu a1, s1, 10872
 	ldloc 9
-	ldc.i4 10412
+	ldc.i4 10872
 	add
 	stloc.2
-// 0x010a9348: 0x10a9348: addiu a3, a3, 10788
+// 0x010a9990: 0x10a9990: addiu a3, a3, 11248
 	ldloc 4
-	ldc.i4 10788
+	ldc.i4 11248
 	add
 	stloc 4
-// 0x010a934c: 0x10a934c: addiu a0, zero, 4
+// 0x010a9994: 0x10a9994: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a9350: 0x10a9350: addiu a2, zero, 531
+// 0x010a9998: 0x10a9998: addiu a2, zero, 531
 	ldc.i4 531
 	stloc.3
-// 0x010a9354: 0x10a9354: jal   0x100449c sw    s0, 16(sp)
+// 0x010a999c: 0x10a999c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4272,9 +4272,9 @@ L_10a9330:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a935c:
-// 0x010a935c: 0x10a935c: lw    ra, 36(sp)
-// 0x010a9360: 0x10a9360: lw    s1, 32(sp)
+L_10a99a4:
+// 0x010a99a4: 0x10a99a4: lw    ra, 36(sp)
+// 0x010a99a8: 0x10a99a8: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4283,7 +4283,7 @@ L_10a935c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a9364: 0x10a9364: lw    s0, 28(sp)
+// 0x010a99ac: 0x10a99ac: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4292,7 +4292,7 @@ L_10a935c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a9368: 0x10a9368: jr    ra addiu sp, sp, 40
+// 0x010a99b0: 0x10a99b0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4304,7 +4304,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_on_login_10a9370(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_on_login_10a99b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -4348,12 +4348,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9370: 0x10a9370: addiu sp, sp, -40
+// 0x010a99b8: 0x10a99b8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a9374: 0x10a9374: sw    s2, 32(sp)
+// 0x010a99bc: 0x10a99bc: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4362,30 +4362,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a9378: 0x10a9378: lui   a3, 0x20000
+// 0x010a99c0: 0x10a99c0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a937c: 0x10a937c: lui   s2, 0x20000
+// 0x010a99c4: 0x10a99c4: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010a9380: 0x10a9380: addiu a3, a3, 10856
+// 0x010a99c8: 0x10a99c8: addiu a3, a3, 11316
 	ldloc 4
-	ldc.i4 10856
+	ldc.i4 11316
 	add
 	stloc 4
-// 0x010a9384: 0x10a9384: addiu a0, zero, 2
+// 0x010a99cc: 0x10a99cc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a9388: 0x10a9388: addiu a1, s2, 10412
+// 0x010a99d0: 0x10a99d0: addiu a1, s2, 10872
 	ldloc 10
-	ldc.i4 10412
+	ldc.i4 10872
 	add
 	stloc.2
-// 0x010a938c: 0x10a938c: addiu a2, zero, 207
+// 0x010a99d4: 0x10a99d4: addiu a2, zero, 207
 	ldc.i4 207
 	stloc.3
-// 0x010a9390: 0x10a9390: sw    ra, 36(sp)
-// 0x010a9394: 0x10a9394: sw    s1, 28(sp)
+// 0x010a99d8: 0x10a99d8: sw    ra, 36(sp)
+// 0x010a99dc: 0x10a99dc: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4394,7 +4394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a9398: 0x10a9398: jal   0x100449c sw    s0, 24(sp)
+// 0x010a99e0: 0x10a99e0: jal   0x100449c sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4413,39 +4413,39 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a93a0: 0x10a93a0: jal   0x10a05d8 sll   zero, zero, 0
-	call int32 Cibyl120::roadmap_login_dlg_get_username_10a05d8()
+// 0x010a99e8: 0x10a99e8: jal   0x10a0c20 sll   zero, zero, 0
+	call int32 Cibyl120::roadmap_login_dlg_get_username_10a0c20()
 	stloc 5
 // --- basic block ---
-// 0x010a93a8: 0x10a93a8: jal   0x10a05e4 addu  s1, v0, zero
+// 0x010a99f0: 0x10a99f0: jal   0x10a0c2c addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl120::roadmap_login_dlg_get_password_10a05e4()
+	call int32 Cibyl120::roadmap_login_dlg_get_password_10a0c2c()
 	stloc 5
 // --- basic block ---
-// 0x010a93b0: 0x10a93b0: lui   a3, 0x20000
+// 0x010a99f8: 0x10a99f8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a93b4: 0x10a93b4: addiu a1, s2, 10412
+// 0x010a99fc: 0x10a99fc: addiu a1, s2, 10872
 	ldloc 10
-	ldc.i4 10412
+	ldc.i4 10872
 	add
 	stloc.2
-// 0x010a93b8: 0x10a93b8: addiu a3, a3, 10912
+// 0x010a9a00: 0x10a9a00: addiu a3, a3, 11372
 	ldloc 4
-	ldc.i4 10912
+	ldc.i4 11372
 	add
 	stloc 4
-// 0x010a93bc: 0x10a93bc: addiu a0, zero, 2
+// 0x010a9a04: 0x10a9a04: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a93c0: 0x10a93c0: addiu a2, zero, 214
+// 0x010a9a08: 0x10a9a08: addiu a2, zero, 214
 	ldc.i4 214
 	stloc.3
-// 0x010a93c4: 0x10a93c4: addu  s0, v0, zero
+// 0x010a9a0c: 0x10a9a0c: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010a93c8: 0x10a93c8: sw    v0, 20(sp)
+// 0x010a9a10: 0x10a9a10: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4454,7 +4454,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a93cc: 0x10a93cc: jal   0x100449c sw    s1, 16(sp)
+// 0x010a9a14: 0x10a9a14: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4473,38 +4473,38 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a93d4: 0x10a93d4: lb    v0, 0(s1)
+// 0x010a9a1c: 0x10a9a1c: lb    v0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a93d8: 0x10a93d8: sll   zero, zero, 0
-// 0x010a93dc: 0x10a93dc: beq   v0, zero, 0x10a93f4 lui   a0, 0x20000
+// 0x010a9a20: 0x10a9a20: sll   zero, zero, 0
+// 0x010a9a24: 0x10a9a24: beq   v0, zero, 0x10a9a3c lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_10a93f4
+	brfalse L_10a9a3c
 // --- basic block ---
-// 0x010a93e4: 0x10a93e4: lb    v0, 0(s0)
+// 0x010a9a2c: 0x10a9a2c: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a93e8: 0x10a93e8: sll   zero, zero, 0
-// 0x010a93ec: 0x10a93ec: bne   v0, zero, 0x10a940c sll   zero, zero, 0
+// 0x010a9a30: 0x10a9a30: sll   zero, zero, 0
+// 0x010a9a34: 0x10a9a34: bne   v0, zero, 0x10a9a54 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a940c
+	brtrue L_10a9a54
 // --- basic block ---
-L_10a93f4:
-// 0x010a93f4: 0x10a93f4: lui   a1, 0x20000
+L_10a9a3c:
+// 0x010a9a3c: 0x10a9a3c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a93f8: 0x10a93f8: addiu a0, a0, 10956
+// 0x010a9a40: 0x10a9a40: addiu a0, a0, 11416
 	ldloc.1
-	ldc.i4 10956
+	ldc.i4 11416
 	add
 	stloc.1
-// 0x010a93fc: 0x10a93fc: jal   0x104c148 addiu a1, a1, 10984
+// 0x010a9a44: 0x10a9a44: jal   0x104c158 addiu a1, a1, 11444
 	ldloc.2
-	ldc.i4 10984
+	ldc.i4 11444
 	add
 	stloc.2
 	ldloc.0
@@ -4512,21 +4512,21 @@ L_10a93f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9404: 0x10a9404: j	 0x10a943c sll   zero, zero, 0
-	br L_10a943c
+// 0x010a9a4c: 0x10a9a4c: j	 0x10a9a84 sll   zero, zero, 0
+	br L_10a9a84
 // --- basic block ---
-L_10a940c:
-// 0x010a940c: 0x10a940c: lui   a0, 0x20000
+L_10a9a54:
+// 0x010a9a54: 0x10a9a54: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9410: 0x10a9410: jal   0x101cd60 addiu a0, a0, 10392
+// 0x010a9a58: 0x10a9a58: jal   0x101cd70 addiu a0, a0, 10852
 	ldloc.1
-	ldc.i4 10392
+	ldc.i4 10852
 	add
 	stloc.1
 	ldloc.0
@@ -4534,19 +4534,19 @@ L_10a940c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9418: 0x10a9418: jal   0x104c3d0 addu  a0, v0, zero
+// 0x010a9a60: 0x10a9a60: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a9420: 0x10a9420: jal   0x106aee0 addu  a0, s1, zero
+// 0x010a9a68: 0x10a9a68: jal   0x106b504 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4554,12 +4554,12 @@ L_10a940c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginUsername_106aee0(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginUsername_106b504(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9428: 0x10a9428: jal   0x106aeb8 addu  a0, s0, zero
+// 0x010a9a70: 0x10a9a70: jal   0x106b4dc addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4567,17 +4567,17 @@ L_10a940c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginPassword_106aeb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginPassword_106b4dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9430: 0x10a9430: lui   a0, 0x10b0000
+// 0x010a9a78: 0x10a9a78: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010a9434: 0x10a9434: jal   0x106bff0 addiu a0, a0, -26152
+// 0x010a9a7c: 0x10a9a7c: jal   0x106c614 addiu a0, a0, -24544
 	ldloc.1
-	ldc.i4 -26152
+	ldc.i4 -24544
 	add
 	stloc.1
 	ldloc.0
@@ -4585,17 +4585,17 @@ L_10a940c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_VerifyLoginDetails_106bff0(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_VerifyLoginDetails_106c614(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a943c:
-// 0x010a943c: 0x10a943c: lw    ra, 36(sp)
-// 0x010a9440: 0x10a9440: addu  v0, zero, zero
+L_10a9a84:
+// 0x010a9a84: 0x10a9a84: lw    ra, 36(sp)
+// 0x010a9a88: 0x10a9a88: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a9444: 0x10a9444: lw    s2, 32(sp)
+// 0x010a9a8c: 0x10a9a8c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4604,7 +4604,7 @@ L_10a943c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a9448: 0x10a9448: lw    s1, 28(sp)
+// 0x010a9a90: 0x10a9a90: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4613,7 +4613,7 @@ L_10a943c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a944c: 0x10a944c: lw    s0, 24(sp)
+// 0x010a9a94: 0x10a9a94: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4622,7 +4622,7 @@ L_10a943c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a9450: 0x10a9450: jr    ra addiu sp, sp, 40
+// 0x010a9a98: 0x10a9a98: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4634,7 +4634,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 check_alphanumeric_10a94c8(int32,int32,int32,int32,int32)
+.method public static int32 check_alphanumeric_10a9b10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 t0,int32 s0,int32 ra)
@@ -4675,12 +4675,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a94c8: 0x10a94c8: addiu sp, sp, -24
+// 0x010a9b10: 0x10a9b10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a94cc: 0x10a94cc: sw    s0, 16(sp)
+// 0x010a9b14: 0x10a9b14: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4689,8 +4689,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a94d0: 0x10a94d0: sw    ra, 20(sp)
-// 0x010a94d4: 0x10a94d4: jal   0x1001b48 addu  s0, a0, zero
+// 0x010a9b18: 0x10a9b18: sw    ra, 20(sp)
+// 0x010a9b1c: 0x10a9b1c: jal   0x1001b48 addu  s0, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.1
@@ -4699,103 +4699,103 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010a94dc: 0x10a94dc: addu  a0, zero, zero
+// 0x010a9b24: 0x10a9b24: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a94e0: 0x10a94e0: addiu a2, zero, 45
+// 0x010a9b28: 0x10a9b28: addiu a2, zero, 45
 	ldc.i4.s 45
 	stloc.3
-// 0x010a94e4: 0x10a94e4: j	 0x10a9530 addiu a1, zero, 95
+// 0x010a9b2c: 0x10a9b2c: j	 0x10a9b78 addiu a1, zero, 95
 	ldc.i4.s 95
 	stloc.2
-	br L_10a9530
+	br L_10a9b78
 // --- basic block ---
-L_10a94ec:
-// 0x010a94ec: 0x10a94ec: lb    v1, 0(a3)
+L_10a9b34:
+// 0x010a9b34: 0x10a9b34: lb    v1, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a94f0: 0x10a94f0: sll   zero, zero, 0
-// 0x010a94f4: 0x10a94f4: addiu t0, v1, -65
+// 0x010a9b38: 0x10a9b38: sll   zero, zero, 0
+// 0x010a9b3c: 0x10a9b3c: addiu t0, v1, -65
 	ldloc 5
 	ldc.i4.s -65
 	add
 	stloc 8
-// 0x010a94f8: 0x10a94f8: addiu a3, v1, -97
+// 0x010a9b40: 0x10a9b40: addiu a3, v1, -97
 	ldloc 5
 	ldc.i4.s -97
 	add
 	stloc 4
-// 0x010a94fc: 0x10a94fc: sltiu t0, t0, 26
+// 0x010a9b44: 0x10a9b44: sltiu t0, t0, 26
 	ldloc 8
 	ldc.i4.s 26
 	clt.un
 	stloc 8
-// 0x010a9500: 0x10a9500: bne   t0, zero, 0x10a952c sltiu a3, a3, 26
+// 0x010a9b48: 0x10a9b48: bne   t0, zero, 0x10a9b74 sltiu a3, a3, 26
 	ldloc 8
 	ldloc 4
 	ldc.i4.s 26
 	clt.un
 	stloc 4
-	brtrue L_10a952c
+	brtrue L_10a9b74
 // --- basic block ---
-// 0x010a9508: 0x10a9508: bne   a3, zero, 0x10a952c sll   zero, zero, 0
+// 0x010a9b50: 0x10a9b50: bne   a3, zero, 0x10a9b74 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_10a952c
+	brtrue L_10a9b74
 // --- basic block ---
-// 0x010a9510: 0x10a9510: j	 0x10a9550 addiu a3, v1, -48
+// 0x010a9b58: 0x10a9b58: j	 0x10a9b98 addiu a3, v1, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 4
-	br L_10a9550
+	br L_10a9b98
 // --- basic block ---
-L_10a9518:
-// 0x010a9518: 0x10a9518: beq   v1, a1, 0x10a9530 addiu a0, a0, 1
+L_10a9b60:
+// 0x010a9b60: 0x10a9b60: beq   v1, a1, 0x10a9b78 addiu a0, a0, 1
 	ldloc 5
 	ldloc.2
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	beq  L_10a9530
+	beq  L_10a9b78
 // --- basic block ---
-// 0x010a9520: 0x10a9520: addiu a0, a0, -1
+// 0x010a9b68: 0x10a9b68: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010a9524: 0x10a9524: j	 0x10a9540 addu  v0, zero, zero
+// 0x010a9b6c: 0x10a9b6c: j	 0x10a9b88 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10a9540
+	br L_10a9b88
 // --- basic block ---
-L_10a952c:
-// 0x010a952c: 0x10a952c: addiu a0, a0, 1
+L_10a9b74:
+// 0x010a9b74: 0x10a9b74: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-L_10a9530:
-// 0x010a9530: 0x10a9530: slt   v1, a0, v0
+L_10a9b78:
+// 0x010a9b78: 0x10a9b78: slt   v1, a0, v0
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 5
-// 0x010a9534: 0x10a9534: bne   v1, zero, 0x10a94ec addu  a3, s0, a0
+// 0x010a9b7c: 0x10a9b7c: bne   v1, zero, 0x10a9b34 addu  a3, s0, a0
 	ldloc 5
 	ldloc 9
 	ldloc.1
 	add
 	stloc 4
-	brtrue L_10a94ec
+	brtrue L_10a9b34
 // --- basic block ---
-// 0x010a953c: 0x10a953c: addiu v0, zero, 1
+// 0x010a9b84: 0x10a9b84: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_10a9540:
-// 0x010a9540: 0x10a9540: lw    ra, 20(sp)
-// 0x010a9544: 0x10a9544: lw    s0, 16(sp)
+L_10a9b88:
+// 0x010a9b88: 0x10a9b88: lw    ra, 20(sp)
+// 0x010a9b8c: 0x10a9b8c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4804,41 +4804,41 @@ L_10a9540:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a9548: 0x10a9548: jr    ra addiu sp, sp, 24
+// 0x010a9b90: 0x10a9b90: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10a9550:
-// 0x010a9550: 0x10a9550: sltiu a3, a3, 10
+L_10a9b98:
+// 0x010a9b98: 0x10a9b98: sltiu a3, a3, 10
 	ldloc 4
 	ldc.i4.s 10
 	clt.un
 	stloc 4
-// 0x010a9554: 0x10a9554: bne   a3, zero, 0x10a952c sll   zero, zero, 0
+// 0x010a9b9c: 0x10a9b9c: bne   a3, zero, 0x10a9b74 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_10a952c
+	brtrue L_10a9b74
 // --- basic block ---
-// 0x010a955c: 0x10a955c: bne   v1, a2, 0x10a9518 sll   zero, zero, 0
+// 0x010a9ba4: 0x10a9ba4: bne   v1, a2, 0x10a9b60 sll   zero, zero, 0
 	ldloc 5
 	ldloc.3
-	bne.un L_10a9518
+	bne.un L_10a9b60
 // --- basic block ---
-// 0x010a9564: 0x10a9564: j	 0x10a9530 addiu a0, a0, 1
+// 0x010a9bac: 0x10a9bac: j	 0x10a9b78 addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	br L_10a9530
+	br L_10a9b78
 __CIBYL_function_return:
 	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_login_validate_username_10a956c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_validate_username_10a9bb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4873,122 +4873,122 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a956c: 0x10a956c: addiu sp, sp, -24
+// 0x010a9bb4: 0x10a9bb4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9570: 0x10a9570: sw    ra, 20(sp)
-// 0x010a9574: 0x10a9574: lb    v0, 0(a0)
+// 0x010a9bb8: 0x10a9bb8: sw    ra, 20(sp)
+// 0x010a9bbc: 0x10a9bbc: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a9578: 0x10a9578: sll   zero, zero, 0
-// 0x010a957c: 0x10a957c: bne   v0, zero, 0x10a9598 addiu v1, v0, -65
+// 0x010a9bc0: 0x10a9bc0: sll   zero, zero, 0
+// 0x010a9bc4: 0x10a9bc4: bne   v0, zero, 0x10a9be0 addiu v1, v0, -65
 	ldloc 5
 	ldloc 5
 	ldc.i4.s -65
 	add
 	stloc 6
-	brtrue L_10a9598
+	brtrue L_10a9be0
 // --- basic block ---
-// 0x010a9584: 0x10a9584: lui   a0, 0x0
+// 0x010a9bcc: 0x10a9bcc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a9588: 0x10a9588: lui   a1, 0x20000
+// 0x010a9bd0: 0x10a9bd0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a958c: 0x10a958c: addiu a0, a0, 30152
+// 0x010a9bd4: 0x10a9bd4: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010a9590: 0x10a9590: j	 0x10a95d0 addiu a1, a1, 11116
+// 0x010a9bd8: 0x10a9bd8: j	 0x10a9c18 addiu a1, a1, 11576
 	ldloc.2
-	ldc.i4 11116
+	ldc.i4 11576
 	add
 	stloc.2
-	br L_10a95d0
+	br L_10a9c18
 // --- basic block ---
-L_10a9598:
-// 0x010a9598: 0x10a9598: sltiu v1, v1, 26
+L_10a9be0:
+// 0x010a9be0: 0x10a9be0: sltiu v1, v1, 26
 	ldloc 6
 	ldc.i4.s 26
 	clt.un
 	stloc 6
-// 0x010a959c: 0x10a959c: bne   v1, zero, 0x10a95b0 addiu v0, v0, -97
+// 0x010a9be4: 0x10a9be4: bne   v1, zero, 0x10a9bf8 addiu v0, v0, -97
 	ldloc 6
 	ldloc 5
 	ldc.i4.s -97
 	add
 	stloc 5
-	brtrue L_10a95b0
+	brtrue L_10a9bf8
 // --- basic block ---
-// 0x010a95a4: 0x10a95a4: sltiu v0, v0, 26
+// 0x010a9bec: 0x10a9bec: sltiu v0, v0, 26
 	ldloc 5
 	ldc.i4.s 26
 	clt.un
 	stloc 5
-// 0x010a95a8: 0x10a95a8: beq   v0, zero, 0x10a95c0 sll   zero, zero, 0
+// 0x010a9bf0: 0x10a9bf0: beq   v0, zero, 0x10a9c08 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a95c0
+	brfalse L_10a9c08
 // --- basic block ---
-L_10a95b0:
-// 0x010a95b0: 0x10a95b0: jal   0x10a94c8 sll   zero, zero, 0
+L_10a9bf8:
+// 0x010a9bf8: 0x10a9bf8: jal   0x10a9b10 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::check_alphanumeric_10a94c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::check_alphanumeric_10a9b10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a95b8: 0x10a95b8: bne   v0, zero, 0x10a95dc addiu v1, zero, 1
+// 0x010a9c00: 0x10a9c00: bne   v0, zero, 0x10a9c24 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_10a95dc
+	brtrue L_10a9c24
 // --- basic block ---
-L_10a95c0:
-// 0x010a95c0: 0x10a95c0: lui   a0, 0x0
+L_10a9c08:
+// 0x010a9c08: 0x10a9c08: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a95c4: 0x10a95c4: lui   a1, 0x20000
+// 0x010a9c0c: 0x10a9c0c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a95c8: 0x10a95c8: addiu a0, a0, 30152
+// 0x010a9c10: 0x10a9c10: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010a95cc: 0x10a95cc: addiu a1, a1, 11136
+// 0x010a9c14: 0x10a9c14: addiu a1, a1, 11596
 	ldloc.2
-	ldc.i4 11136
+	ldc.i4 11596
 	add
 	stloc.2
-L_10a95d0:
-// 0x010a95d0: 0x10a95d0: jal   0x104c148 sll   zero, zero, 0
+L_10a9c18:
+// 0x010a9c18: 0x10a9c18: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a95d8: 0x10a95d8: addu  v1, zero, zero
+// 0x010a9c20: 0x10a9c20: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10a95dc:
-// 0x010a95dc: 0x10a95dc: lw    ra, 20(sp)
-// 0x010a95e0: 0x10a95e0: addu  v0, v1, zero
+L_10a9c24:
+// 0x010a9c24: 0x10a9c24: lw    ra, 20(sp)
+// 0x010a9c28: 0x10a9c28: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010a95e4: 0x10a95e4: jr    ra addiu sp, sp, 24
+// 0x010a9c2c: 0x10a9c2c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5000,7 +5000,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_validate_email_10a95ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_validate_email_10a9c34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -5038,15 +5038,15 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a95ec: 0x10a95ec: addiu sp, sp, -24
+// 0x010a9c34: 0x10a9c34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a95f0: 0x10a95f0: addiu a1, zero, 64
+// 0x010a9c38: 0x10a9c38: addiu a1, zero, 64
 	ldc.i4.s 64
 	stloc.2
-// 0x010a95f4: 0x10a95f4: sw    s0, 16(sp)
+// 0x010a9c3c: 0x10a9c3c: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5055,8 +5055,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a95f8: 0x10a95f8: sw    ra, 20(sp)
-// 0x010a95fc: 0x10a95fc: jal   0x1001a5c addu  s0, a0, zero
+// 0x010a9c40: 0x10a9c40: sw    ra, 20(sp)
+// 0x010a9c44: 0x10a9c44: jal   0x1001a5c addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.1
@@ -5066,13 +5066,13 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9604: 0x10a9604: beq   v0, zero, 0x10a961c addu  a0, s0, zero
+// 0x010a9c4c: 0x10a9c4c: beq   v0, zero, 0x10a9c64 addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_10a961c
+	brfalse L_10a9c64
 // --- basic block ---
-// 0x010a960c: 0x10a960c: jal   0x1001a5c addiu a1, zero, 46
+// 0x010a9c54: 0x10a9c54: jal   0x1001a5c addiu a1, zero, 46
 	ldc.i4.s 46
 	stloc.2
 	ldloc.1
@@ -5082,27 +5082,27 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9614: 0x10a9614: bne   v0, zero, 0x10a9634 addiu v1, zero, 1
+// 0x010a9c5c: 0x10a9c5c: bne   v0, zero, 0x10a9c7c addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_10a9634
+	brtrue L_10a9c7c
 // --- basic block ---
-L_10a961c:
-// 0x010a961c: 0x10a961c: lui   a0, 0x0
+L_10a9c64:
+// 0x010a9c64: 0x10a9c64: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a9620: 0x10a9620: lui   a1, 0x20000
+// 0x010a9c68: 0x10a9c68: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9624: 0x10a9624: addiu a0, a0, 30152
+// 0x010a9c6c: 0x10a9c6c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010a9628: 0x10a9628: jal   0x104c148 addiu a1, a1, 10608
+// 0x010a9c70: 0x10a9c70: jal   0x104c158 addiu a1, a1, 11068
 	ldloc.2
-	ldc.i4 10608
+	ldc.i4 11068
 	add
 	stloc.2
 	ldloc.0
@@ -5110,20 +5110,20 @@ L_10a961c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9630: 0x10a9630: addu  v1, zero, zero
+// 0x010a9c78: 0x10a9c78: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10a9634:
-// 0x010a9634: 0x10a9634: lw    ra, 20(sp)
-// 0x010a9638: 0x10a9638: addu  v0, v1, zero
+L_10a9c7c:
+// 0x010a9c7c: 0x10a9c7c: lw    ra, 20(sp)
+// 0x010a9c80: 0x10a9c80: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010a963c: 0x10a963c: lw    s0, 16(sp)
+// 0x010a9c84: 0x10a9c84: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5132,7 +5132,7 @@ L_10a9634:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a9640: 0x10a9640: jr    ra addiu sp, sp, 24
+// 0x010a9c88: 0x10a9c88: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5144,7 +5144,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_validate_password_10a9648(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_validate_password_10a9c90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5182,12 +5182,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9648: 0x10a9648: addiu sp, sp, -32
+// 0x010a9c90: 0x10a9c90: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a964c: 0x10a964c: sw    s0, 24(sp)
+// 0x010a9c94: 0x10a9c94: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5196,7 +5196,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a9650: 0x10a9650: sw    a1, 16(sp)
+// 0x010a9c98: 0x10a9c98: sw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5205,8 +5205,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a9654: 0x10a9654: sw    ra, 28(sp)
-// 0x010a9658: 0x10a9658: jal   0x1001b48 addu  s0, a0, zero
+// 0x010a9c9c: 0x10a9c9c: sw    ra, 28(sp)
+// 0x010a9ca0: 0x10a9ca0: jal   0x1001b48 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
@@ -5215,12 +5215,12 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9660: 0x10a9660: sltiu v1, v0, 6
+// 0x010a9ca8: 0x10a9ca8: sltiu v1, v0, 6
 	ldloc 5
 	ldc.i4.6
 	clt.un
 	stloc 6
-// 0x010a9664: 0x10a9664: lw    a1, 16(sp)
+// 0x010a9cac: 0x10a9cac: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5229,24 +5229,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a9668: 0x10a9668: bne   v1, zero, 0x10a9690 sltiu v0, v0, 17
+// 0x010a9cb0: 0x10a9cb0: bne   v1, zero, 0x10a9cd8 sltiu v0, v0, 17
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 17
 	clt.un
 	stloc 5
-	brtrue L_10a9690
+	brtrue L_10a9cd8
 // --- basic block ---
-// 0x010a9670: 0x10a9670: beq   v0, zero, 0x10a9694 lui   a0, 0x0
+// 0x010a9cb8: 0x10a9cb8: beq   v0, zero, 0x10a9cdc lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a9694
+	brfalse L_10a9cdc
 // --- basic block ---
-// 0x010a9678: 0x10a9678: addu  a0, s0, zero
+// 0x010a9cc0: 0x10a9cc0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010a967c: 0x10a967c: jal   0x10a94c8 sw    a1, 16(sp)
+// 0x010a9cc4: 0x10a9cc4: jal   0x10a9b10 sw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5260,12 +5260,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::check_alphanumeric_10a94c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::check_alphanumeric_10a9b10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9684: 0x10a9684: lw    a1, 16(sp)
+// 0x010a9ccc: 0x10a9ccc: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5274,43 +5274,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a9688: 0x10a9688: bne   v0, zero, 0x10a96a4 sll   zero, zero, 0
+// 0x010a9cd0: 0x10a9cd0: bne   v0, zero, 0x10a9cec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a96a4
+	brtrue L_10a9cec
 // --- basic block ---
-L_10a9690:
-// 0x010a9690: 0x10a9690: lui   a0, 0x0
+L_10a9cd8:
+// 0x010a9cd8: 0x10a9cd8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10a9694:
-// 0x010a9694: 0x10a9694: lui   a1, 0x20000
+L_10a9cdc:
+// 0x010a9cdc: 0x10a9cdc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9698: 0x10a9698: addiu a0, a0, 30152
+// 0x010a9ce0: 0x10a9ce0: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010a969c: 0x10a969c: j	 0x10a96d4 addiu a1, a1, 11232
+// 0x010a9ce4: 0x10a9ce4: j	 0x10a9d1c addiu a1, a1, 11692
 	ldloc.2
-	ldc.i4 11232
+	ldc.i4 11692
 	add
 	stloc.2
-	br L_10a96d4
+	br L_10a9d1c
 // --- basic block ---
-L_10a96a4:
-// 0x010a96a4: 0x10a96a4: lb    v0, 0(a1)
+L_10a9cec:
+// 0x010a9cec: 0x10a9cec: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010a96a8: 0x10a96a8: sll   zero, zero, 0
-// 0x010a96ac: 0x10a96ac: beq   v0, zero, 0x10a96c8 lui   a0, 0x0
+// 0x010a9cf0: 0x10a9cf0: sll   zero, zero, 0
+// 0x010a9cf4: 0x10a9cf4: beq   v0, zero, 0x10a9d10 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10a96c8
+	brfalse L_10a9d10
 // --- basic block ---
-// 0x010a96b4: 0x10a96b4: jal   0x1001b14 addu  a0, s0, zero
+// 0x010a9cfc: 0x10a9cfc: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5318,50 +5318,50 @@ L_10a96a4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a96bc: 0x10a96bc: beq   v0, zero, 0x10a96e0 addiu v1, zero, 1
+// 0x010a9d04: 0x10a9d04: beq   v0, zero, 0x10a9d28 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_10a96e0
+	brfalse L_10a9d28
 // --- basic block ---
-// 0x010a96c4: 0x10a96c4: lui   a0, 0x0
+// 0x010a9d0c: 0x10a9d0c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10a96c8:
-// 0x010a96c8: 0x10a96c8: lui   a1, 0x20000
+L_10a9d10:
+// 0x010a9d10: 0x10a9d10: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a96cc: 0x10a96cc: addiu a0, a0, 30152
+// 0x010a9d14: 0x10a9d14: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010a96d0: 0x10a96d0: addiu a1, a1, 11328
+// 0x010a9d18: 0x10a9d18: addiu a1, a1, 11788
 	ldloc.2
-	ldc.i4 11328
+	ldc.i4 11788
 	add
 	stloc.2
-L_10a96d4:
-// 0x010a96d4: 0x10a96d4: jal   0x104c148 sll   zero, zero, 0
+L_10a9d1c:
+// 0x010a9d1c: 0x10a9d1c: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a96dc: 0x10a96dc: addu  v1, zero, zero
+// 0x010a9d24: 0x10a9d24: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10a96e0:
-// 0x010a96e0: 0x10a96e0: lw    ra, 28(sp)
-// 0x010a96e4: 0x10a96e4: addu  v0, v1, zero
+L_10a9d28:
+// 0x010a9d28: 0x10a9d28: lw    ra, 28(sp)
+// 0x010a9d2c: 0x10a9d2c: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010a96e8: 0x10a96e8: lw    s0, 24(sp)
+// 0x010a9d30: 0x10a9d30: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5370,7 +5370,7 @@ L_10a96e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a96ec: 0x10a96ec: jr    ra addiu sp, sp, 32
+// 0x010a9d34: 0x10a9d34: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5382,7 +5382,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_on_update_10a96f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_on_update_10a9d3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -5420,12 +5420,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a96f4: 0x10a96f4: addiu sp, sp, -40
+// 0x010a9d3c: 0x10a9d3c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a96f8: 0x10a96f8: sw    s0, 32(sp)
+// 0x010a9d40: 0x10a9d40: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5434,19 +5434,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a96fc: 0x10a96fc: addu  s0, a0, zero
+// 0x010a9d44: 0x10a9d44: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010a9700: 0x10a9700: lui   a0, 0x20000
+// 0x010a9d48: 0x10a9d48: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9704: 0x10a9704: addiu a0, a0, 11360
+// 0x010a9d4c: 0x10a9d4c: addiu a0, a0, 11820
 	ldloc.1
-	ldc.i4 11360
+	ldc.i4 11820
 	add
 	stloc.1
-// 0x010a9708: 0x10a9708: sw    ra, 36(sp)
-// 0x010a970c: 0x10a970c: sw    a1, 16(sp)
+// 0x010a9d50: 0x10a9d50: sw    ra, 36(sp)
+// 0x010a9d54: 0x10a9d54: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5455,7 +5455,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a9710: 0x10a9710: sw    a2, 20(sp)
+// 0x010a9d58: 0x10a9d58: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5464,7 +5464,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010a9714: 0x10a9714: jal   0x101cd60 sw    a3, 24(sp)
+// 0x010a9d5c: 0x10a9d5c: jal   0x101cd70 sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5478,19 +5478,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a971c: 0x10a971c: jal   0x104c3d0 addu  a0, v0, zero
+// 0x010a9d64: 0x10a9d64: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 6
 // --- basic block ---
-// 0x010a9724: 0x10a9724: lw    a1, 16(sp)
+// 0x010a9d6c: 0x10a9d6c: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5499,7 +5499,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a9728: 0x10a9728: lw    a2, 20(sp)
+// 0x010a9d70: 0x10a9d70: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5508,7 +5508,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a972c: 0x10a972c: lw    a3, 24(sp)
+// 0x010a9d74: 0x10a9d74: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5517,7 +5517,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a9730: 0x10a9730: jal   0x106c1d4 addu  a0, s0, zero
+// 0x010a9d78: 0x10a9d78: jal   0x106c7f8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5525,37 +5525,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_UpdateProfile_106c1d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_UpdateProfile_106c7f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9738: 0x10a9738: bne   v0, zero, 0x10a9760 addiu v1, zero, 1
+// 0x010a9d80: 0x10a9d80: bne   v0, zero, 0x10a9da8 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 7
-	brtrue L_10a9760
+	brtrue L_10a9da8
 // --- basic block ---
-// 0x010a9740: 0x10a9740: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010a9d88: 0x10a9d88: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9748: 0x10a9748: lui   a0, 0x0
+// 0x010a9d90: 0x10a9d90: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a974c: 0x10a974c: lui   a1, 0x20000
+// 0x010a9d94: 0x10a9d94: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9750: 0x10a9750: addiu a0, a0, 30092
+// 0x010a9d98: 0x10a9d98: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a9754: 0x10a9754: jal   0x104c148 addiu a1, a1, 11384
+// 0x010a9d9c: 0x10a9d9c: jal   0x104c158 addiu a1, a1, 11844
 	ldloc.2
-	ldc.i4 11384
+	ldc.i4 11844
 	add
 	stloc.2
 	ldloc.0
@@ -5563,20 +5563,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a975c: 0x10a975c: addu  v1, zero, zero
+// 0x010a9da4: 0x10a9da4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10a9760:
-// 0x010a9760: 0x10a9760: lw    ra, 36(sp)
-// 0x010a9764: 0x10a9764: addu  v0, v1, zero
+L_10a9da8:
+// 0x010a9da8: 0x10a9da8: lw    ra, 36(sp)
+// 0x010a9dac: 0x10a9dac: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010a9768: 0x10a9768: lw    s0, 32(sp)
+// 0x010a9db0: 0x10a9db0: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5585,7 +5585,7 @@ L_10a9760:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a976c: 0x10a976c: jr    ra addiu sp, sp, 40
+// 0x010a9db4: 0x10a9db4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5597,7 +5597,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_login_on_create_10a9774(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_on_create_10a9dbc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -5635,12 +5635,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9774: 0x10a9774: addiu sp, sp, -40
+// 0x010a9dbc: 0x10a9dbc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a9778: 0x10a9778: sw    s0, 32(sp)
+// 0x010a9dc0: 0x10a9dc0: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5649,19 +5649,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a977c: 0x10a977c: addu  s0, a0, zero
+// 0x010a9dc4: 0x10a9dc4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010a9780: 0x10a9780: lui   a0, 0x20000
+// 0x010a9dc8: 0x10a9dc8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9784: 0x10a9784: addiu a0, a0, 11440
+// 0x010a9dcc: 0x10a9dcc: addiu a0, a0, 11900
 	ldloc.1
-	ldc.i4 11440
+	ldc.i4 11900
 	add
 	stloc.1
-// 0x010a9788: 0x10a9788: sw    ra, 36(sp)
-// 0x010a978c: 0x10a978c: sw    a1, 16(sp)
+// 0x010a9dd0: 0x10a9dd0: sw    ra, 36(sp)
+// 0x010a9dd4: 0x10a9dd4: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5670,7 +5670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a9790: 0x10a9790: sw    a2, 20(sp)
+// 0x010a9dd8: 0x10a9dd8: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5679,7 +5679,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010a9794: 0x10a9794: jal   0x101cd60 sw    a3, 24(sp)
+// 0x010a9ddc: 0x10a9ddc: jal   0x101cd70 sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5693,19 +5693,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a979c: 0x10a979c: jal   0x104c3d0 addu  a0, v0, zero
+// 0x010a9de4: 0x10a9de4: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 6
 // --- basic block ---
-// 0x010a97a4: 0x10a97a4: lw    a1, 16(sp)
+// 0x010a9dec: 0x10a9dec: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5714,7 +5714,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a97a8: 0x10a97a8: lw    a2, 20(sp)
+// 0x010a9df0: 0x10a9df0: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5723,7 +5723,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a97ac: 0x10a97ac: lw    a3, 24(sp)
+// 0x010a9df4: 0x10a9df4: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5732,7 +5732,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010a97b0: 0x10a97b0: jal   0x106c230 addu  a0, s0, zero
+// 0x010a9df8: 0x10a9df8: jal   0x106c854 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5740,37 +5740,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_CreateAccount_106c230(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_CreateAccount_106c854(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a97b8: 0x10a97b8: bne   v0, zero, 0x10a97e0 addiu v1, zero, 1
+// 0x010a9e00: 0x10a9e00: bne   v0, zero, 0x10a9e28 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 7
-	brtrue L_10a97e0
+	brtrue L_10a9e28
 // --- basic block ---
-// 0x010a97c0: 0x10a97c0: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010a9e08: 0x10a9e08: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a97c8: 0x10a97c8: lui   a0, 0x0
+// 0x010a9e10: 0x10a9e10: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a97cc: 0x10a97cc: lui   a1, 0x20000
+// 0x010a9e14: 0x10a9e14: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a97d0: 0x10a97d0: addiu a0, a0, 30092
+// 0x010a9e18: 0x10a9e18: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010a97d4: 0x10a97d4: jal   0x104c148 addiu a1, a1, 11384
+// 0x010a9e1c: 0x10a9e1c: jal   0x104c158 addiu a1, a1, 11844
 	ldloc.2
-	ldc.i4 11384
+	ldc.i4 11844
 	add
 	stloc.2
 	ldloc.0
@@ -5778,20 +5778,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a97dc: 0x10a97dc: addu  v1, zero, zero
+// 0x010a9e24: 0x10a9e24: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10a97e0:
-// 0x010a97e0: 0x10a97e0: lw    ra, 36(sp)
-// 0x010a97e4: 0x10a97e4: addu  v0, v1, zero
+L_10a9e28:
+// 0x010a9e28: 0x10a9e28: lw    ra, 36(sp)
+// 0x010a9e2c: 0x10a9e2c: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010a97e8: 0x10a97e8: lw    s0, 32(sp)
+// 0x010a9e30: 0x10a9e30: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5800,7 +5800,7 @@ L_10a97e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a97ec: 0x10a97ec: jr    ra addiu sp, sp, 40
+// 0x010a9e34: 0x10a9e34: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5812,7 +5812,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_login_on_signup_skip_10a97f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_on_signup_skip_10a9e3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5847,56 +5847,56 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a97f4: 0x10a97f4: addiu sp, sp, -24
+// 0x010a9e3c: 0x10a9e3c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a97f8: 0x10a97f8: sw    ra, 20(sp)
-// 0x010a97fc: 0x10a97fc: jal   0x106aab8 sll   zero, zero, 0
-	call int32 Cibyl79::Realtime_IsLoggedIn_106aab8()
+// 0x010a9e40: 0x10a9e40: sw    ra, 20(sp)
+// 0x010a9e44: 0x10a9e44: jal   0x106b0dc sll   zero, zero, 0
+	call int32 Cibyl79::Realtime_IsLoggedIn_106b0dc()
 	stloc 5
 // --- basic block ---
-// 0x010a9804: 0x10a9804: bne   v0, zero, 0x10a981c addu  a0, zero, zero
+// 0x010a9e4c: 0x10a9e4c: bne   v0, zero, 0x10a9e64 addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10a981c
+	brtrue L_10a9e64
 // --- basic block ---
-// 0x010a980c: 0x10a980c: jal   0x106d980 sll   zero, zero, 0
+// 0x010a9e54: 0x10a9e54: jal   0x106dfa4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_RandomUserRegister_106d980(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_RandomUserRegister_106dfa4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9814: 0x10a9814: lui   a0, 0x10b0000
+// 0x010a9e5c: 0x10a9e5c: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010a9818: 0x10a9818: addiu a0, a0, -26572
+// 0x010a9e60: 0x10a9e60: addiu a0, a0, -24964
 	ldloc.1
-	ldc.i4 -26572
+	ldc.i4 -24964
 	add
 	stloc.1
-L_10a981c:
-// 0x010a981c: 0x10a981c: jal   0x10a05fc sll   zero, zero, 0
+L_10a9e64:
+// 0x010a9e64: 0x10a9e64: jal   0x10a0c44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_login_ssd_on_signup_skip_10a05fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_login_ssd_on_signup_skip_10a0c44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9824: 0x10a9824: lw    ra, 20(sp)
-// 0x010a9828: 0x10a9828: sll   zero, zero, 0
-// 0x010a982c: 0x10a982c: jr    ra addiu sp, sp, 24
+// 0x010a9e6c: 0x10a9e6c: lw    ra, 20(sp)
+// 0x010a9e70: 0x10a9e70: sll   zero, zero, 0
+// 0x010a9e74: 0x10a9e74: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5908,7 +5908,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_signup_skip_msgbox_closed_10a9834(int32,int32,int32,int32,int32)
+.method public static int32 on_signup_skip_msgbox_closed_10a9e7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5943,26 +5943,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9834: 0x10a9834: addiu sp, sp, -24
+// 0x010a9e7c: 0x10a9e7c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9838: 0x10a9838: sw    ra, 20(sp)
-// 0x010a983c: 0x10a983c: jal   0x10a2dc8 sll   zero, zero, 0
+// 0x010a9e80: 0x10a9e80: sw    ra, 20(sp)
+// 0x010a9e84: 0x10a9e84: jal   0x10a3410 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_welcome_guided_tour_10a2dc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_welcome_guided_tour_10a3410(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a9844: 0x10a9844: lw    ra, 20(sp)
-// 0x010a9848: 0x10a9848: sll   zero, zero, 0
-// 0x010a984c: 0x10a984c: jr    ra addiu sp, sp, 24
+// 0x010a9e8c: 0x10a9e8c: lw    ra, 20(sp)
+// 0x010a9e90: 0x10a9e90: sll   zero, zero, 0
+// 0x010a9e94: 0x10a9e94: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5974,7 +5974,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_login_details_dialog_show_10a9854(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_details_dialog_show_10a9e9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6009,87 +6009,87 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a9854:
-// 0x010a9854: 0x10a9854: addiu sp, sp, -24
+L_10a9e9c:
+// 0x010a9e9c: 0x10a9e9c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9858: 0x10a9858: sw    ra, 20(sp)
-// 0x010a985c: 0x10a985c: jal   0x106b068 sll   zero, zero, 0
+// 0x010a9ea0: 0x10a9ea0: sw    ra, 20(sp)
+// 0x010a9ea4: 0x10a9ea4: jal   0x106b68c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9864: 0x10a9864: beq   v0, zero, 0x10a987c sll   zero, zero, 0
+// 0x010a9eac: 0x10a9eac: beq   v0, zero, 0x10a9ec4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a987c
+	brfalse L_10a9ec4
 // --- basic block ---
-// 0x010a986c: 0x10a986c: jal   0x10a2e48 sll   zero, zero, 0
+// 0x010a9eb4: 0x10a9eb4: jal   0x10a3490 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_welcome_personalize_dialog_10a2e48(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_welcome_personalize_dialog_10a3490(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9874: 0x10a9874: j	 0x10a98a4 sll   zero, zero, 0
-	br L_10a98a4
+// 0x010a9ebc: 0x10a9ebc: j	 0x10a9eec sll   zero, zero, 0
+	br L_10a9eec
 // --- basic block ---
-L_10a987c:
-// 0x010a987c: 0x10a987c: jal   0x10a9104 sll   zero, zero, 0
+L_10a9ec4:
+// 0x010a9ec4: 0x10a9ec4: jal   0x10a974c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_empty_10a9104(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_empty_10a974c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9884: 0x10a9884: beq   v0, zero, 0x10a989c sll   zero, zero, 0
+// 0x010a9ecc: 0x10a9ecc: beq   v0, zero, 0x10a9ee4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a989c
+	brfalse L_10a9ee4
 // --- basic block ---
-// 0x010a988c: 0x10a988c: jal   0x10a04e4 sll   zero, zero, 0
+// 0x010a9ed4: 0x10a9ed4: jal   0x10a0b2c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl119::roadmap_login_new_existing_dlg_10a04e4(int32,int32,int32,int32)
+	call int32 Cibyl119::roadmap_login_new_existing_dlg_10a0b2c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9894: 0x10a9894: j	 0x10a98a4 sll   zero, zero, 0
-	br L_10a98a4
+// 0x010a9edc: 0x10a9edc: j	 0x10a9eec sll   zero, zero, 0
+	br L_10a9eec
 // --- basic block ---
-L_10a989c:
-// 0x010a989c: 0x10a989c: jal   0x10a0768 sll   zero, zero, 0
+L_10a9ee4:
+// 0x010a9ee4: 0x10a9ee4: jal   0x10a0db0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_login_profile_dialog_show_10a0768(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_login_profile_dialog_show_10a0db0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a98a4:
-// 0x010a98a4: 0x10a98a4: lw    ra, 20(sp)
-// 0x010a98a8: 0x10a98a8: sll   zero, zero, 0
-// 0x010a98ac: 0x10a98ac: jr    ra addiu sp, sp, 24
+L_10a9eec:
+// 0x010a9eec: 0x10a9eec: lw    ra, 20(sp)
+// 0x010a9ef0: 0x10a9ef0: sll   zero, zero, 0
+// 0x010a9ef4: 0x10a9ef4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6101,7 +6101,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_on_ok_10a98b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_on_ok_10a9efc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s1,int32 ra)
@@ -6145,13 +6145,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a98b4: 0x10a98b4: addiu sp, sp, -40
+// 0x010a9efc: 0x10a9efc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a98b8: 0x10a98b8: sw    ra, 36(sp)
-// 0x010a98bc: 0x10a98bc: sw    s2, 32(sp)
+// 0x010a9f00: 0x10a9f00: sw    ra, 36(sp)
+// 0x010a9f04: 0x10a9f04: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6160,7 +6160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a98c0: 0x10a98c0: sw    s1, 28(sp)
+// 0x010a9f08: 0x10a9f08: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6169,7 +6169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a98c4: 0x10a98c4: jal   0x10a0640 sw    s0, 24(sp)
+// 0x010a9f0c: 0x10a9f0c: jal   0x10a0c88 sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6183,18 +6183,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_login_dlg_get_allowPing_10a0640(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_login_dlg_get_allowPing_10a0c88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a98cc: 0x10a98cc: jal   0x10a05d8 addu  s1, v0, zero
+// 0x010a9f14: 0x10a9f14: jal   0x10a0c20 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-	call int32 Cibyl120::roadmap_login_dlg_get_username_10a05d8()
+	call int32 Cibyl120::roadmap_login_dlg_get_username_10a0c20()
 	stloc 5
 // --- basic block ---
-// 0x010a98d4: 0x10a98d4: jal   0x10a05e4 sw    v0, 16(sp)
+// 0x010a9f1c: 0x10a9f1c: jal   0x10a0c2c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6203,24 +6203,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl120::roadmap_login_dlg_get_password_10a05e4()
+	call int32 Cibyl120::roadmap_login_dlg_get_password_10a0c2c()
 	stloc 5
 // --- basic block ---
-// 0x010a98dc: 0x10a98dc: jal   0x10a05f0 addu  s2, v0, zero
+// 0x010a9f24: 0x10a9f24: jal   0x10a0c38 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl120::roadmap_login_dlg_get_nickname_10a05f0()
+	call int32 Cibyl120::roadmap_login_dlg_get_nickname_10a0c38()
 	stloc 5
 // --- basic block ---
-// 0x010a98e4: 0x10a98e4: lui   a0, 0x0
+// 0x010a9f2c: 0x10a9f2c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a98e8: 0x10a98e8: addiu a0, a0, 18668
+// 0x010a9f30: 0x10a9f30: addiu a0, a0, 18668
 	ldloc.1
 	ldc.i4 18668
 	add
 	stloc.1
-// 0x010a98ec: 0x10a98ec: jal   0x100e348 addu  s0, v0, zero
+// 0x010a9f34: 0x10a9f34: jal   0x100e358 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -6228,12 +6228,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a98f4: 0x10a98f4: lw    a1, 16(sp)
+// 0x010a9f3c: 0x10a9f3c: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6242,7 +6242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a98f8: 0x10a98f8: jal   0x1001b14 addu  a0, v0, zero
+// 0x010a9f40: 0x10a9f40: jal   0x1001b14 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -6250,14 +6250,14 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a9900: 0x10a9900: bne   v0, zero, 0x10a9938 sll   zero, zero, 0
+// 0x010a9f48: 0x10a9f48: bne   v0, zero, 0x10a9f80 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a9938
+	brtrue L_10a9f80
 // --- basic block ---
-// 0x010a9908: 0x10a9908: lui   a0, 0x0
+// 0x010a9f50: 0x10a9f50: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010a990c: 0x10a990c: jal   0x100e348 addiu a0, a0, 18700
+// 0x010a9f54: 0x10a9f54: jal   0x100e358 addiu a0, a0, 18700
 	ldloc.1
 	ldc.i4 18700
 	add
@@ -6267,15 +6267,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9914: 0x10a9914: addu  a0, v0, zero
+// 0x010a9f5c: 0x10a9f5c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a9918: 0x10a9918: jal   0x1001b14 addu  a1, s2, zero
+// 0x010a9f60: 0x10a9f60: jal   0x1001b14 addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -6283,29 +6283,29 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a9920: 0x10a9920: bne   v0, zero, 0x10a993c lui   a0, 0x0
+// 0x010a9f68: 0x10a9f68: bne   v0, zero, 0x10a9f84 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10a993c
+	brtrue L_10a9f84
 // --- basic block ---
-// 0x010a9928: 0x10a9928: jal   0x106aab8 sll   zero, zero, 0
-	call int32 Cibyl79::Realtime_IsLoggedIn_106aab8()
+// 0x010a9f70: 0x10a9f70: jal   0x106b0dc sll   zero, zero, 0
+	call int32 Cibyl79::Realtime_IsLoggedIn_106b0dc()
 	stloc 5
 // --- basic block ---
-// 0x010a9930: 0x10a9930: bne   v0, zero, 0x10a995c sll   zero, zero, 0
+// 0x010a9f78: 0x10a9f78: bne   v0, zero, 0x10a9fa4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10a995c
+	brtrue L_10a9fa4
 // --- basic block ---
-L_10a9938:
-// 0x010a9938: 0x10a9938: lui   a0, 0x0
+L_10a9f80:
+// 0x010a9f80: 0x10a9f80: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10a993c:
-// 0x010a993c: 0x10a993c: addu  a1, s0, zero
+L_10a9f84:
+// 0x010a9f84: 0x10a9f84: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010a9940: 0x10a9940: jal   0x100e5c0 addiu a0, a0, 18684
+// 0x010a9f88: 0x10a9f88: jal   0x100e5d0 addiu a0, a0, 18684
 	ldloc.1
 	ldc.i4 18684
 	add
@@ -6315,15 +6315,15 @@ L_10a993c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9948: 0x10a9948: addu  a0, zero, zero
+// 0x010a9f90: 0x10a9f90: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010a994c: 0x10a994c: jal   0x10a9370 addu  a1, zero, zero
+// 0x010a9f94: 0x10a9f94: jal   0x10a99b8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6331,19 +6331,19 @@ L_10a993c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_login_on_login_10a9370(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_on_login_10a99b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9954: 0x10a9954: j	 0x10a9994 sll   zero, zero, 0
-	br L_10a9994
+// 0x010a9f9c: 0x10a9f9c: j	 0x10a9fdc sll   zero, zero, 0
+	br L_10a9fdc
 // --- basic block ---
-L_10a995c:
-// 0x010a995c: 0x10a995c: lui   s2, 0x0
+L_10a9fa4:
+// 0x010a9fa4: 0x10a9fa4: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010a9960: 0x10a9960: jal   0x100e348 addiu a0, s2, 18684
+// 0x010a9fa8: 0x10a9fa8: jal   0x100e358 addiu a0, s2, 18684
 	ldloc 8
 	ldc.i4 18684
 	add
@@ -6353,15 +6353,15 @@ L_10a995c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9968: 0x10a9968: addu  a0, v0, zero
+// 0x010a9fb0: 0x10a9fb0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010a996c: 0x10a996c: jal   0x1001b14 addu  a1, s0, zero
+// 0x010a9fb4: 0x10a9fb4: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -6369,15 +6369,15 @@ L_10a995c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010a9974: 0x10a9974: beq   v0, zero, 0x10a9994 addiu a0, s2, 18684
+// 0x010a9fbc: 0x10a9fbc: beq   v0, zero, 0x10a9fdc addiu a0, s2, 18684
 	ldloc 5
 	ldloc 8
 	ldc.i4 18684
 	add
 	stloc.1
-	brfalse L_10a9994
+	brfalse L_10a9fdc
 // --- basic block ---
-// 0x010a997c: 0x10a997c: jal   0x100e5c0 addu  a1, s0, zero
+// 0x010a9fc4: 0x10a9fc4: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6385,12 +6385,12 @@ L_10a995c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9984: 0x10a9984: jal   0x100ea50 addu  a0, zero, zero
+// 0x010a9fcc: 0x10a9fcc: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6398,33 +6398,33 @@ L_10a995c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a998c: 0x10a998c: jal   0x106bc20 sll   zero, zero, 0
+// 0x010a9fd4: 0x10a9fd4: jal   0x106c244 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_Relogin_106bc20(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_Relogin_106c244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a9994:
-// 0x010a9994: 0x10a9994: beq   s1, zero, 0x10a99bc lui   a1, 0x0
+L_10a9fdc:
+// 0x010a9fdc: 0x10a9fdc: beq   s1, zero, 0x10aa004 lui   a1, 0x0
 	ldloc 10
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10a99bc
+	brfalse L_10aa004
 // --- basic block ---
-// 0x010a999c: 0x10a999c: addu  a0, s1, zero
+// 0x010a9fe4: 0x10a9fe4: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010a99a0: 0x10a99a0: jal   0x1001c08 addiu a1, a1, 32116
+// 0x010a9fe8: 0x10a9fe8: jal   0x1001c08 addiu a1, a1, 32116
 	ldloc.2
 	ldc.i4 32116
 	add
@@ -6439,33 +6439,33 @@ L_10a9994:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a99a8: 0x10a99a8: beq   v0, zero, 0x10a99b4 addiu a0, zero, 1
+// 0x010a9ff0: 0x10a9ff0: beq   v0, zero, 0x10a9ffc addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brfalse L_10a99b4
+	brfalse L_10a9ffc
 // --- basic block ---
-// 0x010a99b0: 0x10a99b0: addu  a0, zero, zero
+// 0x010a9ff8: 0x10a9ff8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_10a99b4:
-// 0x010a99b4: 0x10a99b4: jal   0x106ae44 sll   zero, zero, 0
+L_10a9ffc:
+// 0x010a9ffc: 0x10a9ffc: jal   0x106b468 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_Set_AllowPing_106ae44(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_Set_AllowPing_106b468(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a99bc:
-// 0x010a99bc: 0x10a99bc: lw    ra, 36(sp)
-// 0x010a99c0: 0x10a99c0: addu  v0, zero, zero
+L_10aa004:
+// 0x010aa004: 0x10aa004: lw    ra, 36(sp)
+// 0x010aa008: 0x10aa008: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010a99c4: 0x10a99c4: lw    s2, 32(sp)
+// 0x010aa00c: 0x10aa00c: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6474,7 +6474,7 @@ L_10a99bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a99c8: 0x10a99c8: lw    s1, 28(sp)
+// 0x010aa010: 0x10aa010: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6483,7 +6483,7 @@ L_10a99bc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a99cc: 0x10a99cc: lw    s0, 24(sp)
+// 0x010aa014: 0x10aa014: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6492,7 +6492,7 @@ L_10a99bc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a99d0: 0x10a99d0: jr    ra addiu sp, sp, 40
+// 0x010aa018: 0x10aa018: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6504,7 +6504,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_on_login_cb_10a99d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_on_login_cb_10aa020(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -6545,12 +6545,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a99d8: 0x10a99d8: addiu sp, sp, -40
+// 0x010aa020: 0x10aa020: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010a99dc: 0x10a99dc: sw    s0, 28(sp)
+// 0x010aa024: 0x10aa024: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6559,21 +6559,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a99e0: 0x10a99e0: lui   a3, 0x20000
+// 0x010aa028: 0x10aa028: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a99e4: 0x10a99e4: addu  s0, a1, zero
+// 0x010aa02c: 0x10aa02c: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010a99e8: 0x10a99e8: lui   a1, 0x20000
+// 0x010aa030: 0x10aa030: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a99ec: 0x10a99ec: addiu a1, a1, 10412
+// 0x010aa034: 0x10aa034: addiu a1, a1, 10872
 	ldloc.2
-	ldc.i4 10412
+	ldc.i4 10872
 	add
 	stloc.2
-// 0x010a99f0: 0x10a99f0: sw    s1, 32(sp)
+// 0x010aa038: 0x10aa038: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6582,22 +6582,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a99f4: 0x10a99f4: addiu a3, a3, 11460
+// 0x010aa03c: 0x10aa03c: addiu a3, a3, 11920
 	ldloc 4
-	ldc.i4 11460
+	ldc.i4 11920
 	add
 	stloc 4
-// 0x010a99f8: 0x10a99f8: addu  s1, a0, zero
+// 0x010aa040: 0x10aa040: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a99fc: 0x10a99fc: addiu a2, zero, 120
+// 0x010aa044: 0x10aa044: addiu a2, zero, 120
 	ldc.i4.s 120
 	stloc.3
-// 0x010a9a00: 0x10a9a00: addiu a0, zero, 2
+// 0x010aa048: 0x10aa048: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010a9a04: 0x10a9a04: sw    ra, 36(sp)
-// 0x010a9a08: 0x10a9a08: sw    s1, 16(sp)
+// 0x010aa04c: 0x10aa04c: sw    ra, 36(sp)
+// 0x010aa050: 0x10aa050: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6606,7 +6606,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a9a0c: 0x10a9a0c: jal   0x100449c sw    s0, 20(sp)
+// 0x010aa054: 0x10aa054: jal   0x100449c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6625,31 +6625,31 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9a14: 0x10a9a14: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010aa05c: 0x10aa05c: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9a1c: 0x10a9a1c: addu  a0, s1, zero
+// 0x010aa064: 0x10aa064: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a9a20: 0x10a9a20: jal   0x10a05a0 addu  a1, s0, zero
+// 0x010aa068: 0x10aa068: jal   0x10a0be8 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
-	call int32 Cibyl120::roadmap_login_ssd_on_login_cb_10a05a0(int32)
+	call int32 Cibyl120::roadmap_login_ssd_on_login_cb_10a0be8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9a28: 0x10a9a28: beq   s1, zero, 0x10a9a40 addiu v0, zero, 2
+// 0x010aa070: 0x10aa070: beq   s1, zero, 0x10aa088 addiu v0, zero, 2
 	ldloc 9
 	ldc.i4.2
 	stloc 5
-	brfalse L_10a9a40
+	brfalse L_10aa088
 // --- basic block ---
-// 0x010a9a30: 0x10a9a30: jal   0x106b014 addu  a0, zero, zero
+// 0x010aa078: 0x10aa078: jal   0x106b638 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6657,58 +6657,58 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_set_random_user_106b014(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_set_random_user_106b638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9a38: 0x10a9a38: j	 0x10a9a8c sll   zero, zero, 0
-	br L_10a9a8c
+// 0x010aa080: 0x10aa080: j	 0x10aa0d4 sll   zero, zero, 0
+	br L_10aa0d4
 // --- basic block ---
-L_10a9a40:
-// 0x010a9a40: 0x10a9a40: bne   s0, v0, 0x10a9a5c lui   v0, 0x80000
+L_10aa088:
+// 0x010aa088: 0x10aa088: bne   s0, v0, 0x10aa0a4 lui   v0, 0x90000
 	ldloc 8
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 5
-	bne.un L_10a9a5c
+	bne.un L_10aa0a4
 // --- basic block ---
-// 0x010a9a48: 0x10a9a48: lui   a0, 0x20000
+// 0x010aa090: 0x10aa090: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9a4c: 0x10a9a4c: lui   a1, 0x20000
+// 0x010aa094: 0x10aa094: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9a50: 0x10a9a50: addiu a0, a0, 11548
+// 0x010aa098: 0x10aa098: addiu a0, a0, 12008
 	ldloc.1
-	ldc.i4 11548
+	ldc.i4 12008
 	add
 	stloc.1
-// 0x010a9a54: 0x10a9a54: j	 0x10a9a84 addiu a1, a1, 11564
+// 0x010aa09c: 0x10aa09c: j	 0x10aa0cc addiu a1, a1, 12024
 	ldloc.2
-	ldc.i4 11564
+	ldc.i4 12024
 	add
 	stloc.2
-	br L_10a9a84
+	br L_10aa0cc
 // --- basic block ---
-L_10a9a5c:
-// 0x010a9a5c: 0x10a9a5c: lw    v0, 32664(v0)
+L_10aa0a4:
+// 0x010aa0a4: 0x10aa0a4: lw    v0, -32408(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8166
+	ldc.i4 -8102
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a9a60: 0x10a9a60: sll   zero, zero, 0
-// 0x010a9a64: 0x10a9a64: beq   v0, zero, 0x10a9a78 lui   a0, 0x10000
+// 0x010aa0a8: 0x10aa0a8: sll   zero, zero, 0
+// 0x010aa0ac: 0x10aa0ac: beq   v0, zero, 0x10aa0c0 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_10a9a78
+	brfalse L_10aa0c0
 // --- basic block ---
-// 0x010a9a6c: 0x10a9a6c: jalr  v0 sll   zero, zero, 0
+// 0x010aa0b4: 0x10aa0b4: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -6720,38 +6720,38 @@ L_10a9a5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9a74: 0x10a9a74: lui   a0, 0x10000
+// 0x010aa0bc: 0x10aa0bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10a9a78:
-// 0x010a9a78: 0x10a9a78: lui   a1, 0x10000
+L_10aa0c0:
+// 0x010aa0c0: 0x10aa0c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010a9a7c: 0x10a9a7c: addiu a0, a0, 24148
+// 0x010aa0c4: 0x10aa0c4: addiu a0, a0, 24612
 	ldloc.1
-	ldc.i4 24148
+	ldc.i4 24612
 	add
 	stloc.1
-// 0x010a9a80: 0x10a9a80: addiu a1, a1, 24184
+// 0x010aa0c8: 0x10aa0c8: addiu a1, a1, 24648
 	ldloc.2
-	ldc.i4 24184
+	ldc.i4 24648
 	add
 	stloc.2
-L_10a9a84:
-// 0x010a9a84: 0x10a9a84: jal   0x104c148 sll   zero, zero, 0
+L_10aa0cc:
+// 0x010aa0cc: 0x10aa0cc: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a9a8c:
-// 0x010a9a8c: 0x10a9a8c: lw    ra, 36(sp)
-// 0x010a9a90: 0x10a9a90: lw    s1, 32(sp)
+L_10aa0d4:
+// 0x010aa0d4: 0x10aa0d4: lw    ra, 36(sp)
+// 0x010aa0d8: 0x10aa0d8: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6760,7 +6760,7 @@ L_10a9a8c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a9a94: 0x10a9a94: lw    s0, 28(sp)
+// 0x010aa0dc: 0x10aa0dc: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6769,7 +6769,7 @@ L_10a9a8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a9a98: 0x10a9a98: jr    ra addiu sp, sp, 40
+// 0x010aa0e0: 0x10aa0e0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl127.j b/converted/Cibyl127.j
index 35a7454..8e009b5 100644
--- a/converted/Cibyl127.j
+++ b/converted/Cibyl127.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl127::.ctor
 
-.method public static int32 roadmap_login_update_login_cb_10a9aa0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_update_login_cb_10aa0e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9aa0: 0x10a9aa0: addiu sp, sp, -32
+// 0x010aa0e8: 0x10aa0e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a9aa4: 0x10a9aa4: sw    s1, 24(sp)
+// 0x010aa0ec: 0x10aa0ec: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -96,7 +96,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a9aa8: 0x10a9aa8: sw    s0, 20(sp)
+// 0x010aa0f0: 0x10aa0f0: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -105,37 +105,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a9aac: 0x10a9aac: addu  s1, a0, zero
+// 0x010aa0f4: 0x10aa0f4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010a9ab0: 0x10a9ab0: sw    ra, 28(sp)
-// 0x010a9ab4: 0x10a9ab4: jal   0x104c3f0 addu  s0, a1, zero
+// 0x010aa0f8: 0x10aa0f8: sw    ra, 28(sp)
+// 0x010aa0fc: 0x10aa0fc: jal   0x104c400 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9abc: 0x10a9abc: addu  a0, s1, zero
+// 0x010aa104: 0x10aa104: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010a9ac0: 0x10a9ac0: jal   0x10a05a0 addu  a1, s0, zero
+// 0x010aa108: 0x10aa108: jal   0x10a0be8 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
-	call int32 Cibyl120::roadmap_login_ssd_on_login_cb_10a05a0(int32)
+	call int32 Cibyl120::roadmap_login_ssd_on_login_cb_10a0be8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9ac8: 0x10a9ac8: beq   s1, zero, 0x10a9ae8 addiu v0, zero, 2
+// 0x010aa110: 0x10aa110: beq   s1, zero, 0x10aa130 addiu v0, zero, 2
 	ldloc 9
 	ldc.i4.2
 	stloc 5
-	brfalse L_10a9ae8
+	brfalse L_10aa130
 // --- basic block ---
-// 0x010a9ad0: 0x10a9ad0: jal   0x106b014 addu  a0, zero, zero
+// 0x010aa118: 0x10aa118: jal   0x106b638 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -143,44 +143,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_set_random_user_106b014(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_set_random_user_106b638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9ad8: 0x10a9ad8: jal   0x10a3df0 sll   zero, zero, 0
+// 0x010aa120: 0x10aa120: jal   0x10a4438 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::welcome_wizard_twitter_dialog_10a3df0(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::welcome_wizard_twitter_dialog_10a4438(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9ae0: 0x10a9ae0: j	 0x10a9b10 sll   zero, zero, 0
-	br L_10a9b10
+// 0x010aa128: 0x10aa128: j	 0x10aa158 sll   zero, zero, 0
+	br L_10aa158
 // --- basic block ---
-L_10a9ae8:
-// 0x010a9ae8: 0x10a9ae8: bne   s0, v0, 0x10a9b08 lui   a0, 0x20000
+L_10aa130:
+// 0x010aa130: 0x10aa130: bne   s0, v0, 0x10aa150 lui   a0, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	bne.un L_10a9b08
+	bne.un L_10aa150
 // --- basic block ---
-// 0x010a9af0: 0x10a9af0: lui   a1, 0x20000
+// 0x010aa138: 0x10aa138: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9af4: 0x10a9af4: addiu a0, a0, 11588
+// 0x010aa13c: 0x10aa13c: addiu a0, a0, 12048
 	ldloc.1
-	ldc.i4 11588
+	ldc.i4 12048
 	add
 	stloc.1
-// 0x010a9af8: 0x10a9af8: jal   0x104c148 addiu a1, a1, 11564
+// 0x010aa140: 0x10aa140: jal   0x104c158 addiu a1, a1, 12024
 	ldloc.2
-	ldc.i4 11564
+	ldc.i4 12024
 	add
 	stloc.2
 	ldloc.0
@@ -188,29 +188,29 @@ L_10a9ae8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9b00: 0x10a9b00: j	 0x10a9b10 sll   zero, zero, 0
-	br L_10a9b10
+// 0x010aa148: 0x10aa148: j	 0x10aa158 sll   zero, zero, 0
+	br L_10aa158
 // --- basic block ---
-L_10a9b08:
-// 0x010a9b08: 0x10a9b08: jal   0x10a135c sll   zero, zero, 0
+L_10aa150:
+// 0x010aa150: 0x10aa150: jal   0x10a19a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_login_update_dlg_show_10a135c(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_login_update_dlg_show_10a19a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10a9b10:
-// 0x010a9b10: 0x10a9b10: lw    ra, 28(sp)
-// 0x010a9b14: 0x10a9b14: lw    s1, 24(sp)
+L_10aa158:
+// 0x010aa158: 0x10aa158: lw    ra, 28(sp)
+// 0x010aa15c: 0x10aa15c: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -219,7 +219,7 @@ L_10a9b10:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a9b18: 0x10a9b18: lw    s0, 20(sp)
+// 0x010aa160: 0x10aa160: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -228,7 +228,7 @@ L_10a9b10:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a9b1c: 0x10a9b1c: jr    ra addiu sp, sp, 32
+// 0x010aa164: 0x10aa164: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -240,7 +240,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_login_initialize_10a9b24(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_login_initialize_10aa16c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 s1,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -281,12 +281,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9b24: 0x10a9b24: addiu sp, sp, -32
+// 0x010aa16c: 0x10aa16c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a9b28: 0x10a9b28: sw    s1, 24(sp)
+// 0x010aa170: 0x10aa170: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -295,7 +295,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a9b2c: 0x10a9b2c: sw    s0, 20(sp)
+// 0x010aa174: 0x10aa174: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -304,30 +304,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a9b30: 0x10a9b30: lui   s1, 0x20000
+// 0x010aa178: 0x10aa178: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010a9b34: 0x10a9b34: lui   s0, 0x10000
+// 0x010aa17c: 0x10aa17c: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010a9b38: 0x10a9b38: lui   a1, 0x0
+// 0x010aa180: 0x10aa180: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a9b3c: 0x10a9b3c: addu  a3, zero, zero
+// 0x010aa184: 0x10aa184: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010a9b40: 0x10a9b40: addiu a0, s1, -26888
+// 0x010aa188: 0x10aa188: addiu a0, s1, -26424
 	ldloc 6
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a9b44: 0x10a9b44: addiu a2, s0, 18500
+// 0x010aa18c: 0x10aa18c: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a9b48: 0x10a9b48: sw    ra, 28(sp)
-// 0x010a9b4c: 0x10a9b4c: jal   0x100edb0 addiu a1, a1, 18668
+// 0x010aa190: 0x10aa190: sw    ra, 28(sp)
+// 0x010aa194: 0x10aa194: jal   0x100edc0 addiu a1, a1, 18668
 	ldloc.2
 	ldc.i4 18668
 	add
@@ -337,25 +337,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010a9b54: 0x10a9b54: lui   a1, 0x0
+// 0x010aa19c: 0x10aa19c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a9b58: 0x10a9b58: addiu a0, s1, -26888
+// 0x010aa1a0: 0x10aa1a0: addiu a0, s1, -26424
 	ldloc 6
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a9b5c: 0x10a9b5c: addiu a2, s0, 18500
+// 0x010aa1a4: 0x10aa1a4: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a9b60: 0x10a9b60: jal   0x100ed70 addiu a1, a1, 18700
+// 0x010aa1a8: 0x10aa1a8: jal   0x100ed80 addiu a1, a1, 18700
 	ldloc.2
 	ldc.i4 18700
 	add
@@ -365,30 +365,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_password_100ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_password_100ed80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010a9b68: 0x10a9b68: lui   a1, 0x0
+// 0x010aa1b0: 0x10aa1b0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010a9b6c: 0x10a9b6c: addiu a0, s1, -26888
+// 0x010aa1b4: 0x10aa1b4: addiu a0, s1, -26424
 	ldloc 6
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010a9b70: 0x10a9b70: addiu a2, s0, 18500
+// 0x010aa1b8: 0x10aa1b8: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010a9b74: 0x10a9b74: addiu a1, a1, 18684
+// 0x010aa1bc: 0x10aa1bc: addiu a1, a1, 18684
 	ldloc.2
 	ldc.i4 18684
 	add
 	stloc.2
-// 0x010a9b78: 0x10a9b78: jal   0x100edb0 addu  a3, zero, zero
+// 0x010aa1c0: 0x10aa1c0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -396,13 +396,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010a9b80: 0x10a9b80: lw    ra, 28(sp)
-// 0x010a9b84: 0x10a9b84: lw    s1, 24(sp)
+// 0x010aa1c8: 0x10aa1c8: lw    ra, 28(sp)
+// 0x010aa1cc: 0x10aa1cc: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -411,7 +411,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a9b88: 0x10a9b88: lw    s0, 20(sp)
+// 0x010aa1d0: 0x10aa1d0: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -420,7 +420,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a9b8c: 0x10a9b8c: jr    ra addiu sp, sp, 32
+// 0x010aa1d4: 0x10aa1d4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -432,7 +432,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_trip_server_init_10a9b94(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_server_init_10aa1dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -467,49 +467,49 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9b94: 0x10a9b94: addiu sp, sp, -24
+// 0x010aa1dc: 0x10aa1dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9b98: 0x10a9b98: lui   v0, 0xf0000
+// 0x010aa1e0: 0x10aa1e0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010a9b9c: 0x10a9b9c: lui   v1, 0xf0000
+// 0x010aa1e4: 0x10aa1e4: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010a9ba0: 0x10a9ba0: sw    ra, 20(sp)
-// 0x010a9ba4: 0x10a9ba4: addiu v0, v0, -23344
+// 0x010aa1e8: 0x10aa1e8: sw    ra, 20(sp)
+// 0x010aa1ec: 0x10aa1ec: addiu v0, v0, -22880
 	ldloc 5
-	ldc.i4 -23344
+	ldc.i4 -22880
 	add
 	stloc 5
-// 0x010a9ba8: 0x10a9ba8: addiu v1, v1, -22944
+// 0x010aa1f0: 0x10aa1f0: addiu v1, v1, -22480
 	ldloc 6
-	ldc.i4 -22944
+	ldc.i4 -22480
 	add
 	stloc 6
-L_10a9bac:
-// 0x010a9bac: 0x10a9bac: sw    zero, 0(v0)
+L_10aa1f4:
+// 0x010aa1f4: 0x10aa1f4: sw    zero, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010a9bb0: 0x10a9bb0: addiu v0, v0, 4
+// 0x010aa1f8: 0x10aa1f8: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010a9bb4: 0x10a9bb4: bne   v0, v1, 0x10a9bac addiu a1, zero, 8
+// 0x010aa1fc: 0x10aa1fc: bne   v0, v1, 0x10aa1f4 addiu a1, zero, 8
 	ldloc 5
 	ldloc 6
 	ldc.i4.8
 	stloc.2
-	bne.un L_10a9bac
+	bne.un L_10aa1f4
 // --- basic block ---
-// 0x010a9bbc: 0x10a9bbc: jal   0x1037918 addiu a0, zero, 70
+// 0x010aa204: 0x10aa204: jal   0x1037928 addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
@@ -517,17 +517,17 @@ L_10a9bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9bc4: 0x10a9bc4: lui   a0, 0x10b0000
+// 0x010aa20c: 0x10aa20c: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010a9bc8: 0x10a9bc8: jal   0x106bcfc addiu a0, a0, -25608
+// 0x010aa210: 0x10aa210: jal   0x106c320 addiu a0, a0, -24000
 	ldloc.1
-	ldc.i4 -25608
+	ldc.i4 -24000
 	add
 	stloc.1
 	ldloc.0
@@ -535,51 +535,51 @@ L_10a9bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9bd0: 0x10a9bd0: lui   a0, 0x10b0000
+// 0x010aa218: 0x10aa218: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010a9bd4: 0x10a9bd4: lui   v1, 0x80000
-	ldc.i4 524288
+// 0x010aa21c: 0x10aa21c: lui   v1, 0x90000
+	ldc.i4 589824
 	stloc 6
-// 0x010a9bd8: 0x10a9bd8: addiu a0, a0, -24784
+// 0x010aa220: 0x10aa220: addiu a0, a0, -23176
 	ldloc.1
-	ldc.i4 -24784
+	ldc.i4 -23176
 	add
 	stloc.1
-// 0x010a9bdc: 0x10a9bdc: jal   0x106a9fc sw    v0, 32676(v1)
+// 0x010aa224: 0x10aa224: jal   0x106b020 sw    v0, -32396(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8169
+	ldc.i4 -8099
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl79::Realtime_NotifyOnLoginChanged_106a9fc(int32)
+	call int32 Cibyl79::Realtime_NotifyOnLoginChanged_106b020(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010a9be4: 0x10a9be4: lw    ra, 20(sp)
-// 0x010a9be8: 0x10a9be8: lui   v1, 0x80000
-	ldc.i4 524288
+// 0x010aa22c: 0x10aa22c: lw    ra, 20(sp)
+// 0x010aa230: 0x10aa230: lui   v1, 0x90000
+	ldc.i4 589824
 	stloc 6
-// 0x010a9bec: 0x10a9bec: sw    v0, 32680(v1)
+// 0x010aa234: 0x10aa234: sw    v0, -32392(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8170
+	ldc.i4 -8098
 	add
 	ldloc 5
 	stelem.i4
-// 0x010a9bf0: 0x10a9bf0: jr    ra addiu sp, sp, 24
+// 0x010aa238: 0x10aa238: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -591,7 +591,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_server_after_login_10a9bf8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_server_after_login_10aa240(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -626,21 +626,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9bf8: 0x10a9bf8: lui   a1, 0x10b0000
+// 0x010aa240: 0x10aa240: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010a9bfc: 0x10a9bfc: addiu sp, sp, -24
+// 0x010aa244: 0x10aa244: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9c00: 0x10a9c00: addiu a1, a1, -25248
+// 0x010aa248: 0x10aa248: addiu a1, a1, -23640
 	ldloc.2
-	ldc.i4 -25248
+	ldc.i4 -23640
 	add
 	stloc.2
-// 0x010a9c04: 0x10a9c04: sw    ra, 20(sp)
-// 0x010a9c08: 0x10a9c08: jal   0x104fe98 addiu a0, zero, 30000
+// 0x010aa24c: 0x10aa24c: sw    ra, 20(sp)
+// 0x010aa250: 0x10aa250: jal   0x104fea8 addiu a0, zero, 30000
 	ldc.i4 30000
 	stloc.1
 	ldloc.0
@@ -648,29 +648,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9c10: 0x10a9c10: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010aa258: 0x10aa258: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-// 0x010a9c14: 0x10a9c14: lw    v0, 32676(v0)
+// 0x010aa25c: 0x10aa25c: lw    v0, -32396(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8169
+	ldc.i4 -8099
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a9c18: 0x10a9c18: sll   zero, zero, 0
-// 0x010a9c1c: 0x10a9c1c: beq   v0, zero, 0x10a9c2c sll   zero, zero, 0
+// 0x010aa260: 0x10aa260: sll   zero, zero, 0
+// 0x010aa264: 0x10aa264: beq   v0, zero, 0x10aa274 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a9c2c
+	brfalse L_10aa274
 // --- basic block ---
-// 0x010a9c24: 0x10a9c24: jalr  v0 sll   zero, zero, 0
+// 0x010aa26c: 0x10aa26c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -682,10 +682,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10a9c2c:
-// 0x010a9c2c: 0x10a9c2c: lw    ra, 20(sp)
-// 0x010a9c30: 0x10a9c30: sll   zero, zero, 0
-// 0x010a9c34: 0x10a9c34: jr    ra addiu sp, sp, 24
+L_10aa274:
+// 0x010aa274: 0x10aa274: lw    ra, 20(sp)
+// 0x010aa278: 0x10aa278: sll   zero, zero, 0
+// 0x010aa27c: 0x10aa27c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -697,7 +697,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_poi_10a9c3c(int32,int32,int32,int32,int32)
+.method public static int32 create_poi_10aa284(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 t1,int32 s1,int32 v1,int32 s2,int32 s3,int32 ra,int32 t0)
@@ -750,15 +750,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9c3c: 0x10a9c3c: addiu sp, sp, -56
+// 0x010aa284: 0x10aa284: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010a9c40: 0x10a9c40: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010aa288: 0x10aa288: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 6
-// 0x010a9c44: 0x10a9c44: sw    s0, 36(sp)
+// 0x010aa28c: 0x10aa28c: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -767,16 +767,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a9c48: 0x10a9c48: lw    s0, 32672(v0)
+// 0x010aa290: 0x10aa290: lw    s0, -32400(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8168
+	ldc.i4 -8100
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a9c4c: 0x10a9c4c: sw    s3, 48(sp)
+// 0x010aa294: 0x10aa294: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -785,7 +785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a9c50: 0x10a9c50: sw    s2, 44(sp)
+// 0x010aa298: 0x10aa298: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -794,7 +794,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a9c54: 0x10a9c54: sw    s1, 40(sp)
+// 0x010aa29c: 0x10aa29c: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -803,132 +803,132 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a9c58: 0x10a9c58: sw    ra, 52(sp)
-// 0x010a9c5c: 0x10a9c5c: addu  s2, a0, zero
+// 0x010aa2a0: 0x10aa2a0: sw    ra, 52(sp)
+// 0x010aa2a4: 0x10aa2a4: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010a9c60: 0x10a9c60: addu  s1, a1, zero
+// 0x010aa2a8: 0x10aa2a8: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010a9c64: 0x10a9c64: addu  s3, a2, zero
+// 0x010aa2ac: 0x10aa2ac: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x010a9c68: 0x10a9c68: bne   s0, zero, 0x10a9c7c addu  v1, a3, zero
+// 0x010aa2b0: 0x10aa2b0: bne   s0, zero, 0x10aa2c4 addu  v1, a3, zero
 	ldloc 7
 	ldloc 4
 	stloc 10
-	brtrue L_10a9c7c
+	brtrue L_10aa2c4
 // --- basic block ---
-// 0x010a9c70: 0x10a9c70: addiu a0, zero, 1
+// 0x010aa2b8: 0x10aa2b8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a9c74: 0x10a9c74: j	 0x10a9ce8 sw    a0, 32672(v0)
+// 0x010aa2bc: 0x10aa2bc: j	 0x10aa330 sw    a0, -32400(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8168
+	ldc.i4 -8100
 	add
 	ldloc.1
 	stelem.i4
-	br L_10a9ce8
+	br L_10aa330
 // --- basic block ---
-L_10a9c7c:
-// 0x010a9c7c: 0x10a9c7c: slti  a0, s0, 99
+L_10aa2c4:
+// 0x010aa2c4: 0x10aa2c4: slti  a0, s0, 99
 	ldloc 7
 	ldc.i4.s 99
 	clt
 	stloc.1
-// 0x010a9c80: 0x10a9c80: beq   a0, zero, 0x10a9ca0 addiu a0, zero, 100
+// 0x010aa2c8: 0x10aa2c8: beq   a0, zero, 0x10aa2e8 addiu a0, zero, 100
 	ldloc.1
 	ldc.i4.s 100
 	stloc.1
-	brfalse L_10a9ca0
+	brfalse L_10aa2e8
 // --- basic block ---
-// 0x010a9c88: 0x10a9c88: addiu s0, s0, 1
+// 0x010aa2d0: 0x10aa2d0: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010a9c8c: 0x10a9c8c: sw    s0, 32672(v0)
+// 0x010aa2d4: 0x10aa2d4: sw    s0, -32400(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8168
+	ldc.i4 -8100
 	add
 	ldloc 7
 	stelem.i4
-// 0x010a9c90: 0x10a9c90: bltz  s0, 0x10a9d44 addu  v0, zero, zero
+// 0x010aa2d8: 0x10aa2d8: bltz  s0, 0x10aa38c addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	blt L_10a9d44
+	blt L_10aa38c
 // --- basic block ---
-// 0x010a9c98: 0x10a9c98: j	 0x10a9cec lui   t1, 0xf0000
+// 0x010aa2e0: 0x10aa2e0: j	 0x10aa334 lui   t1, 0xf0000
 	ldc.i4 983040
 	stloc 8
-	br L_10a9cec
+	br L_10aa334
 // --- basic block ---
-L_10a9ca0:
-// 0x010a9ca0: 0x10a9ca0: lui   v0, 0xf0000
+L_10aa2e8:
+// 0x010aa2e8: 0x10aa2e8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010a9ca4: 0x10a9ca4: addiu v0, v0, -23344
+// 0x010aa2ec: 0x10aa2ec: addiu v0, v0, -22880
 	ldloc 6
-	ldc.i4 -23344
+	ldc.i4 -22880
 	add
 	stloc 6
-// 0x010a9ca8: 0x10a9ca8: addu  s0, zero, zero
+// 0x010aa2f0: 0x10aa2f0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10a9cac:
-// 0x010a9cac: 0x10a9cac: lw    a1, 0(v0)
+L_10aa2f4:
+// 0x010aa2f4: 0x10aa2f4: lw    a1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010a9cb0: 0x10a9cb0: sll   zero, zero, 0
-// 0x010a9cb4: 0x10a9cb4: beq   a1, zero, 0x10a9ce8 addiu v0, v0, 4
+// 0x010aa2f8: 0x10aa2f8: sll   zero, zero, 0
+// 0x010aa2fc: 0x10aa2fc: beq   a1, zero, 0x10aa330 addiu v0, v0, 4
 	ldloc.2
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-	brfalse L_10a9ce8
+	brfalse L_10aa330
 // --- basic block ---
-// 0x010a9cbc: 0x10a9cbc: addiu s0, s0, 1
+// 0x010aa304: 0x10aa304: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010a9cc0: 0x10a9cc0: bne   s0, a0, 0x10a9cac lui   a1, 0x20000
+// 0x010aa308: 0x10aa308: bne   s0, a0, 0x10aa2f4 lui   a1, 0x20000
 	ldloc 7
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10a9cac
+	bne.un L_10aa2f4
 // --- basic block ---
-// 0x010a9cc8: 0x10a9cc8: lui   a3, 0x20000
+// 0x010aa310: 0x10aa310: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a9ccc: 0x10a9ccc: addiu a1, a1, 11604
+// 0x010aa314: 0x10aa314: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010a9cd0: 0x10a9cd0: addiu a3, a3, 11636
+// 0x010aa318: 0x10aa318: addiu a3, a3, 12096
 	ldloc 4
-	ldc.i4 11636
+	ldc.i4 12096
 	add
 	stloc 4
-// 0x010a9cd4: 0x10a9cd4: addiu a0, zero, 4
+// 0x010aa31c: 0x10aa31c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010a9cd8: 0x10a9cd8: jal   0x100449c addiu a2, zero, 416
+// 0x010aa320: 0x10aa320: jal   0x100449c addiu a2, zero, 416
 	ldc.i4 416
 	stloc.3
 	ldloc.0
@@ -941,27 +941,27 @@ L_10a9cac:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010a9ce0: 0x10a9ce0: j	 0x10a9d44 addu  v0, zero, zero
+// 0x010aa328: 0x10aa328: j	 0x10aa38c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10a9d44
+	br L_10aa38c
 // --- basic block ---
-L_10a9ce8:
-// 0x010a9ce8: 0x10a9ce8: lui   t1, 0xf0000
+L_10aa330:
+// 0x010aa330: 0x10aa330: lui   t1, 0xf0000
 	ldc.i4 983040
 	stloc 8
-L_10a9cec:
-// 0x010a9cec: 0x10a9cec: sll   a0, s0, 2
+L_10aa334:
+// 0x010aa334: 0x10aa334: sll   a0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010a9cf0: 0x10a9cf0: addiu t1, t1, -23344
+// 0x010aa338: 0x10aa338: addiu t1, t1, -22880
 	ldloc 8
-	ldc.i4 -23344
+	ldc.i4 -22880
 	add
 	stloc 8
-// 0x010a9cf4: 0x10a9cf4: lw    t0, 4(s1)
+// 0x010aa33c: 0x10aa33c: lw    t0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -970,48 +970,48 @@ L_10a9cec:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a9cf8: 0x10a9cf8: lw    v0, 0(s1)
+// 0x010aa340: 0x10aa340: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010a9cfc: 0x10a9cfc: addu  t1, a0, t1
+// 0x010aa344: 0x10aa344: addu  t1, a0, t1
 	ldloc.1
 	ldloc 8
 	add
 	stloc 8
-// 0x010a9d00: 0x10a9d00: lui   a1, 0x20000
+// 0x010aa348: 0x10aa348: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010a9d04: 0x10a9d04: lui   a3, 0x20000
+// 0x010aa34c: 0x10aa34c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a9d08: 0x10a9d08: sw    v1, 0(t1)
+// 0x010aa350: 0x10aa350: sw    v1, 0(t1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010a9d0c: 0x10a9d0c: addiu a1, a1, 11604
+// 0x010aa354: 0x10aa354: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010a9d10: 0x10a9d10: addiu a3, a3, 11684
+// 0x010aa358: 0x10aa358: addiu a3, a3, 12144
 	ldloc 4
-	ldc.i4 11684
+	ldc.i4 12144
 	add
 	stloc 4
-// 0x010a9d14: 0x10a9d14: addiu a0, zero, 1
+// 0x010aa35c: 0x10aa35c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a9d18: 0x10a9d18: addiu a2, zero, 425
+// 0x010aa360: 0x10aa360: addiu a2, zero, 425
 	ldc.i4 425
 	stloc.3
-// 0x010a9d1c: 0x10a9d1c: sw    t0, 20(sp)
+// 0x010aa364: 0x10aa364: sw    t0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1020,7 +1020,7 @@ L_10a9cec:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a9d20: 0x10a9d20: sw    v0, 24(sp)
+// 0x010aa368: 0x10aa368: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1029,7 +1029,7 @@ L_10a9cec:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a9d24: 0x10a9d24: sw    s2, 16(sp)
+// 0x010aa36c: 0x10aa36c: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1038,7 +1038,7 @@ L_10a9cec:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a9d28: 0x10a9d28: jal   0x100449c sw    s0, 28(sp)
+// 0x010aa370: 0x10aa370: jal   0x100449c sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1057,16 +1057,16 @@ L_10a9cec:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010a9d30: 0x10a9d30: addu  a0, s2, zero
+// 0x010aa378: 0x10aa378: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010a9d34: 0x10a9d34: addu  a1, s1, zero
+// 0x010aa37c: 0x10aa37c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010a9d38: 0x10a9d38: addu  a2, s3, zero
+// 0x010aa380: 0x10aa380: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x010a9d3c: 0x10a9d3c: jal   0x106cbc8 addu  a3, s0, zero
+// 0x010aa384: 0x10aa384: jal   0x106d1ec addu  a3, s0, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -1074,14 +1074,14 @@ L_10a9cec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_TripServer_CreatePOI_106cbc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TripServer_CreatePOI_106d1ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_10a9d44:
-// 0x010a9d44: 0x10a9d44: lw    ra, 52(sp)
-// 0x010a9d48: 0x10a9d48: lw    s3, 48(sp)
+L_10aa38c:
+// 0x010aa38c: 0x10aa38c: lw    ra, 52(sp)
+// 0x010aa390: 0x10aa390: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1090,7 +1090,7 @@ L_10a9d44:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a9d4c: 0x10a9d4c: lw    s2, 44(sp)
+// 0x010aa394: 0x10aa394: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1099,7 +1099,7 @@ L_10a9d44:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a9d50: 0x10a9d50: lw    s1, 40(sp)
+// 0x010aa398: 0x10aa398: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1108,7 +1108,7 @@ L_10a9d44:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a9d54: 0x10a9d54: lw    s0, 36(sp)
+// 0x010aa39c: 0x10aa39c: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1117,7 +1117,7 @@ L_10a9d44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a9d58: 0x10a9d58: jr    ra addiu sp, sp, 56
+// 0x010aa3a0: 0x10aa3a0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1129,7 +1129,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_server_after_login_delayed_10a9d60(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_server_after_login_delayed_10aa3a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s5,int32 s6,int32 s7,int32 s1,int32 s3,int32 s4,int32 ra)
@@ -1188,21 +1188,21 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9d60: 0x10a9d60: lui   a0, 0x10b0000
+// 0x010aa3a8: 0x10aa3a8: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010a9d64: 0x10a9d64: addiu sp, sp, -104
+// 0x010aa3ac: 0x10aa3ac: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x010a9d68: 0x10a9d68: addiu a0, a0, -25248
+// 0x010aa3b0: 0x10aa3b0: addiu a0, a0, -23640
 	ldloc.1
-	ldc.i4 -25248
+	ldc.i4 -23640
 	add
 	stloc.1
-// 0x010a9d6c: 0x10a9d6c: sw    ra, 100(sp)
-// 0x010a9d70: 0x10a9d70: sw    s2, 76(sp)
+// 0x010aa3b4: 0x10aa3b4: sw    ra, 100(sp)
+// 0x010aa3b8: 0x10aa3b8: sw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1211,7 +1211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010a9d74: 0x10a9d74: sw    s0, 68(sp)
+// 0x010aa3bc: 0x10aa3bc: sw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1220,7 +1220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a9d78: 0x10a9d78: sw    s7, 96(sp)
+// 0x010aa3c0: 0x10aa3c0: sw    s7, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1229,7 +1229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010a9d7c: 0x10a9d7c: sw    s6, 92(sp)
+// 0x010aa3c4: 0x10aa3c4: sw    s6, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1238,7 +1238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010a9d80: 0x10a9d80: sw    s5, 88(sp)
+// 0x010aa3c8: 0x10aa3c8: sw    s5, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1247,7 +1247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010a9d84: 0x10a9d84: sw    s4, 84(sp)
+// 0x010aa3cc: 0x10aa3cc: sw    s4, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1256,7 +1256,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010a9d88: 0x10a9d88: sw    s3, 80(sp)
+// 0x010aa3d0: 0x10aa3d0: sw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1265,7 +1265,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010a9d8c: 0x10a9d8c: sw    s1, 72(sp)
+// 0x010aa3d4: 0x10aa3d4: sw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1274,7 +1274,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010a9d90: 0x10a9d90: jal   0x104fd00 lui   s2, 0x20000
+// 0x010aa3d8: 0x10aa3d8: jal   0x104fd10 lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.0
@@ -1282,28 +1282,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9d98: 0x10a9d98: lui   a3, 0x20000
+// 0x010aa3e0: 0x10aa3e0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a9d9c: 0x10a9d9c: addiu a3, a3, 11732
+// 0x010aa3e4: 0x10aa3e4: addiu a3, a3, 12192
 	ldloc 4
-	ldc.i4 11732
+	ldc.i4 12192
 	add
 	stloc 4
-// 0x010a9da0: 0x10a9da0: addiu a0, zero, 1
+// 0x010aa3e8: 0x10aa3e8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a9da4: 0x10a9da4: addiu a1, s2, 11604
+// 0x010aa3ec: 0x10aa3ec: addiu a1, s2, 12064
 	ldloc 9
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010a9da8: 0x10a9da8: jal   0x100449c addiu a2, zero, 443
+// 0x010aa3f0: 0x10aa3f0: jal   0x100449c addiu a2, zero, 443
 	ldc.i4 443
 	stloc.3
 	ldloc.0
@@ -1316,72 +1316,72 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9db0: 0x10a9db0: jal   0x103772c addiu a0, zero, 70
+// 0x010aa3f8: 0x10aa3f8: jal   0x103773c addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl40::roadmap_history_latest_103772c(int32,int32)
+	call int32 Cibyl40::roadmap_history_latest_103773c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9db8: 0x10a9db8: beq   v0, zero, 0x10a9ec0 addu  s0, v0, zero
+// 0x010aa400: 0x10aa400: beq   v0, zero, 0x10aa508 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 8
-	brfalse L_10a9ec0
+	brfalse L_10aa508
 // --- basic block ---
-// 0x010a9dc0: 0x10a9dc0: lui   s7, 0x10000
+// 0x010aa408: 0x10aa408: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x010a9dc4: 0x10a9dc4: lui   s6, 0x20000
+// 0x010aa40c: 0x10aa40c: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x010a9dc8: 0x10a9dc8: lui   s5, 0x20000
+// 0x010aa410: 0x10aa410: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010a9dcc: 0x10a9dcc: addiu s7, s7, 32112
+// 0x010aa414: 0x10aa414: addiu s7, s7, 32576
 	ldloc 12
-	ldc.i4 32112
+	ldc.i4 32576
 	add
 	stloc 12
-// 0x010a9dd0: 0x10a9dd0: addiu s2, s2, 11604
+// 0x010aa418: 0x10aa418: addiu s2, s2, 12064
 	ldloc 9
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc 9
-// 0x010a9dd4: 0x10a9dd4: addiu s6, s6, 11764
+// 0x010aa41c: 0x10aa41c: addiu s6, s6, 12224
 	ldloc 11
-	ldc.i4 11764
+	ldc.i4 12224
 	add
 	stloc 11
-// 0x010a9dd8: 0x10a9dd8: addiu s5, s5, 11840
+// 0x010aa420: 0x10aa420: addiu s5, s5, 12300
 	ldloc 10
-	ldc.i4 11840
+	ldc.i4 12300
 	add
 	stloc 10
-// 0x010a9ddc: 0x10a9ddc: addiu s4, sp, 32
+// 0x010aa424: 0x10aa424: addiu s4, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 15
-// 0x010a9de0: 0x10a9de0: lui   s1, 0x80000
-	ldc.i4 524288
+// 0x010aa428: 0x10aa428: lui   s1, 0x90000
+	ldc.i4 589824
 	stloc 13
-// 0x010a9de4: 0x10a9de4: addiu s3, sp, 24
+// 0x010aa42c: 0x10aa42c: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-L_10a9de8:
-// 0x010a9de8: 0x10a9de8: addu  a2, s4, zero
+L_10aa430:
+// 0x010aa430: 0x10aa430: addu  a2, s4, zero
 	ldloc 15
 	stloc.3
-// 0x010a9dec: 0x10a9dec: addu  a1, s0, zero
+// 0x010aa434: 0x10aa434: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010a9df0: 0x10a9df0: jal   0x1037c10 addiu a0, zero, 70
+// 0x010aa438: 0x10aa438: jal   0x1037c20 addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
@@ -1389,12 +1389,12 @@ L_10a9de8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9df8: 0x10a9df8: lw    a0, 60(sp)
+// 0x010aa440: 0x10aa440: lw    a0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1403,7 +1403,7 @@ L_10a9de8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a9dfc: 0x10a9dfc: jal   0x1001b14 addu  a1, s7, zero
+// 0x010aa444: 0x10aa444: jal   0x1001b14 addu  a1, s7, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
@@ -1411,54 +1411,54 @@ L_10a9de8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010a9e04: 0x10a9e04: addu  a1, s2, zero
+// 0x010aa44c: 0x10aa44c: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010a9e08: 0x10a9e08: addu  a3, s6, zero
+// 0x010aa450: 0x10aa450: addu  a3, s6, zero
 	ldloc 11
 	stloc 4
-// 0x010a9e0c: 0x10a9e0c: addiu a2, zero, 458
+// 0x010aa454: 0x10aa454: addiu a2, zero, 458
 	ldc.i4 458
 	stloc.3
-// 0x010a9e10: 0x10a9e10: beq   v0, zero, 0x10a9e74 addiu a0, zero, 1
+// 0x010aa458: 0x10aa458: beq   v0, zero, 0x10aa4bc addiu a0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.1
-	brfalse L_10a9e74
+	brfalse L_10aa4bc
 // --- basic block ---
-// 0x010a9e18: 0x10a9e18: lw    v0, 32668(s1)
+// 0x010aa460: 0x10aa460: lw    v0, -32404(s1)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 8167
+	ldc.i4 -8101
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a9e1c: 0x10a9e1c: sll   zero, zero, 0
-// 0x010a9e20: 0x10a9e20: addiu v0, v0, 1
+// 0x010aa464: 0x10aa464: sll   zero, zero, 0
+// 0x010aa468: 0x10aa468: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010a9e24: 0x10a9e24: slti  v1, v0, 4
+// 0x010aa46c: 0x10aa46c: slti  v1, v0, 4
 	ldloc 6
 	ldc.i4.4
 	clt
 	stloc 7
-// 0x010a9e28: 0x10a9e28: beq   v1, zero, 0x10a9ec0 sw    v0, 32668(s1)
+// 0x010aa470: 0x10aa470: beq   v1, zero, 0x10aa508 sw    v0, -32404(s1)
 	ldloc 7
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 8167
+	ldc.i4 -8101
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10a9ec0
+	brfalse L_10aa508
 // --- basic block ---
-// 0x010a9e30: 0x10a9e30: lw    v0, 48(sp)
+// 0x010aa478: 0x10aa478: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1467,7 +1467,7 @@ L_10a9de8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a9e34: 0x10a9e34: jal   0x100449c sw    v0, 16(sp)
+// 0x010aa47c: 0x10aa47c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1486,7 +1486,7 @@ L_10a9de8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9e3c: 0x10a9e3c: lw    a0, 52(sp)
+// 0x010aa484: 0x10aa484: lw    a0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1495,7 +1495,7 @@ L_10a9de8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a9e40: 0x10a9e40: jal   0x1000d8c sll   zero, zero, 0
+// 0x010aa488: 0x10aa488: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1506,7 +1506,7 @@ L_10a9de8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9e48: 0x10a9e48: lw    a0, 56(sp)
+// 0x010aa490: 0x10aa490: lw    a0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1515,7 +1515,7 @@ L_10a9de8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a9e4c: 0x10a9e4c: jal   0x1000d8c sw    v0, 28(sp)
+// 0x010aa494: 0x10aa494: jal   0x1000d8c sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1534,7 +1534,7 @@ L_10a9de8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9e54: 0x10a9e54: lw    a0, 48(sp)
+// 0x010aa49c: 0x10aa49c: lw    a0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1543,16 +1543,16 @@ L_10a9de8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010a9e58: 0x10a9e58: addu  a1, s3, zero
+// 0x010aa4a0: 0x10aa4a0: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x010a9e5c: 0x10a9e5c: addiu a2, zero, 1
+// 0x010aa4a4: 0x10aa4a4: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010a9e60: 0x10a9e60: addu  a3, s0, zero
+// 0x010aa4a8: 0x10aa4a8: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x010a9e64: 0x10a9e64: jal   0x10a9c3c sw    v0, 24(sp)
+// 0x010aa4ac: 0x10aa4ac: jal   0x10aa284 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1566,18 +1566,18 @@ L_10a9de8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::create_poi_10a9c3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::create_poi_10aa284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9e6c: 0x10a9e6c: j	 0x10a9e90 addu  a1, s0, zero
+// 0x010aa4b4: 0x10aa4b4: j	 0x10aa4d8 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-	br L_10a9e90
+	br L_10aa4d8
 // --- basic block ---
-L_10a9e74:
-// 0x010a9e74: 0x10a9e74: lw    v0, 48(sp)
+L_10aa4bc:
+// 0x010aa4bc: 0x10aa4bc: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1586,16 +1586,16 @@ L_10a9e74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a9e78: 0x10a9e78: addu  a1, s2, zero
+// 0x010aa4c0: 0x10aa4c0: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010a9e7c: 0x10a9e7c: addiu a2, zero, 465
+// 0x010aa4c4: 0x10aa4c4: addiu a2, zero, 465
 	ldc.i4 465
 	stloc.3
-// 0x010a9e80: 0x10a9e80: addu  a3, s5, zero
+// 0x010aa4c8: 0x10aa4c8: addu  a3, s5, zero
 	ldloc 10
 	stloc 4
-// 0x010a9e84: 0x10a9e84: jal   0x100449c sw    v0, 16(sp)
+// 0x010aa4cc: 0x10aa4cc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1614,52 +1614,52 @@ L_10a9e74:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9e8c: 0x10a9e8c: addu  a1, s0, zero
+// 0x010aa4d4: 0x10aa4d4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-L_10a9e90:
-// 0x010a9e90: 0x10a9e90: jal   0x1037788 addiu a0, zero, 70
+L_10aa4d8:
+// 0x010aa4d8: 0x10aa4d8: jal   0x1037798 addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl40::roadmap_history_before_1037788(int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_before_1037798(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010a9e98: 0x10a9e98: beq   v0, s0, 0x10a9ea8 lui   a1, 0x20000
+// 0x010aa4e0: 0x10aa4e0: beq   v0, s0, 0x10aa4f0 lui   a1, 0x20000
 	ldloc 6
 	ldloc 8
 	ldc.i4 131072
 	stloc.2
-	beq  L_10a9ea8
+	beq  L_10aa4f0
 // --- basic block ---
-// 0x010a9ea0: 0x10a9ea0: bne   v0, zero, 0x10a9de8 addu  s0, v0, zero
+// 0x010aa4e8: 0x10aa4e8: bne   v0, zero, 0x10aa430 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 8
-	brtrue L_10a9de8
+	brtrue L_10aa430
 // --- basic block ---
-L_10a9ea8:
-// 0x010a9ea8: 0x10a9ea8: lui   a3, 0x20000
+L_10aa4f0:
+// 0x010aa4f0: 0x10aa4f0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010a9eac: 0x10a9eac: addiu a1, a1, 11604
+// 0x010aa4f4: 0x10aa4f4: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010a9eb0: 0x10a9eb0: addiu a3, a3, 11924
+// 0x010aa4f8: 0x10aa4f8: addiu a3, a3, 12384
 	ldloc 4
-	ldc.i4 11924
+	ldc.i4 12384
 	add
 	stloc 4
-// 0x010a9eb4: 0x10a9eb4: addiu a0, zero, 1
+// 0x010aa4fc: 0x10aa4fc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010a9eb8: 0x10a9eb8: jal   0x100449c addiu a2, zero, 472
+// 0x010aa500: 0x10aa500: jal   0x100449c addiu a2, zero, 472
 	ldc.i4 472
 	stloc.3
 	ldloc.0
@@ -1672,9 +1672,9 @@ L_10a9ea8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10a9ec0:
-// 0x010a9ec0: 0x10a9ec0: lw    ra, 100(sp)
-// 0x010a9ec4: 0x10a9ec4: lw    s7, 96(sp)
+L_10aa508:
+// 0x010aa508: 0x10aa508: lw    ra, 100(sp)
+// 0x010aa50c: 0x10aa50c: lw    s7, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1683,7 +1683,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010a9ec8: 0x10a9ec8: lw    s6, 92(sp)
+// 0x010aa510: 0x10aa510: lw    s6, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1692,7 +1692,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010a9ecc: 0x10a9ecc: lw    s5, 88(sp)
+// 0x010aa514: 0x10aa514: lw    s5, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1701,7 +1701,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010a9ed0: 0x10a9ed0: lw    s4, 84(sp)
+// 0x010aa518: 0x10aa518: lw    s4, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1710,7 +1710,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010a9ed4: 0x10a9ed4: lw    s3, 80(sp)
+// 0x010aa51c: 0x10aa51c: lw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1719,7 +1719,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010a9ed8: 0x10a9ed8: lw    s2, 76(sp)
+// 0x010aa520: 0x10aa520: lw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1728,7 +1728,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010a9edc: 0x10a9edc: lw    s1, 72(sp)
+// 0x010aa524: 0x10aa524: lw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1737,7 +1737,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010a9ee0: 0x10a9ee0: lw    s0, 68(sp)
+// 0x010aa528: 0x10aa528: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1746,7 +1746,7 @@ L_10a9ec0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a9ee4: 0x10a9ee4: jr    ra addiu sp, sp, 104
+// 0x010aa52c: 0x10aa52c: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -1758,7 +1758,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_server_create_poi_10a9eec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_server_create_poi_10aa534(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -1796,12 +1796,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9eec: 0x10a9eec: addiu sp, sp, -32
+// 0x010aa534: 0x10aa534: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a9ef0: 0x10a9ef0: sw    s0, 24(sp)
+// 0x010aa538: 0x10aa538: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1810,14 +1810,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010a9ef4: 0x10a9ef4: addu  s0, a0, zero
+// 0x010aa53c: 0x10aa53c: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010a9ef8: 0x10a9ef8: addiu a0, zero, 70
+// 0x010aa540: 0x10aa540: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x010a9efc: 0x10a9efc: sw    ra, 28(sp)
-// 0x010a9f00: 0x10a9f00: sw    a1, 16(sp)
+// 0x010aa544: 0x10aa544: sw    ra, 28(sp)
+// 0x010aa548: 0x10aa548: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1826,7 +1826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010a9f04: 0x10a9f04: jal   0x103772c sw    a2, 20(sp)
+// 0x010aa54c: 0x10aa54c: jal   0x103773c sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1837,12 +1837,12 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl40::roadmap_history_latest_103772c(int32,int32)
+	call int32 Cibyl40::roadmap_history_latest_103773c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010a9f0c: 0x10a9f0c: lw    a1, 16(sp)
+// 0x010aa554: 0x10aa554: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1851,7 +1851,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010a9f10: 0x10a9f10: lw    a2, 20(sp)
+// 0x010aa558: 0x10aa558: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1860,10 +1860,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010a9f14: 0x10a9f14: addu  a0, s0, zero
+// 0x010aa55c: 0x10aa55c: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x010a9f18: 0x10a9f18: jal   0x10a9c3c addu  a3, v0, zero
+// 0x010aa560: 0x10aa560: jal   0x10aa284 addu  a3, v0, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -1871,13 +1871,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::create_poi_10a9c3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::create_poi_10aa284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010a9f20: 0x10a9f20: lw    ra, 28(sp)
-// 0x010a9f24: 0x10a9f24: lw    s0, 24(sp)
+// 0x010aa568: 0x10aa568: lw    ra, 28(sp)
+// 0x010aa56c: 0x10aa56c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1886,7 +1886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010a9f28: 0x10a9f28: jr    ra addiu sp, sp, 32
+// 0x010aa570: 0x10aa570: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1898,7 +1898,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_trip_get_num_Pois_10a9f30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_get_num_Pois_10aa578(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1933,26 +1933,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9f30: 0x10a9f30: addiu sp, sp, -24
+// 0x010aa578: 0x10aa578: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9f34: 0x10a9f34: sw    ra, 20(sp)
-// 0x010a9f38: 0x10a9f38: jal   0x106cb70 sll   zero, zero, 0
+// 0x010aa57c: 0x10aa57c: sw    ra, 20(sp)
+// 0x010aa580: 0x10aa580: jal   0x106d194 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_TripServer_GetNumPOIs_106cb70(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TripServer_GetNumPOIs_106d194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010a9f40: 0x10a9f40: lw    ra, 20(sp)
-// 0x010a9f44: 0x10a9f44: sll   zero, zero, 0
-// 0x010a9f48: 0x10a9f48: jr    ra addiu sp, sp, 24
+// 0x010aa588: 0x10aa588: lw    ra, 20(sp)
+// 0x010aa58c: 0x10aa58c: sll   zero, zero, 0
+// 0x010aa590: 0x10aa590: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1964,7 +1964,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_trip_server_restore_favorites_10a9f50(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_server_restore_favorites_10aa598(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -2002,22 +2002,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10a9f50:
-// 0x010a9f50: 0x10a9f50: lui   a0, 0x20000
+L_10aa598:
+// 0x010aa598: 0x10aa598: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9f54: 0x10a9f54: addiu sp, sp, -32
+// 0x010aa59c: 0x10aa59c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010a9f58: 0x10a9f58: addiu a0, a0, 11968
+// 0x010aa5a0: 0x10aa5a0: addiu a0, a0, 12428
 	ldloc.1
-	ldc.i4 11968
+	ldc.i4 12428
 	add
 	stloc.1
-// 0x010a9f5c: 0x10a9f5c: sw    ra, 28(sp)
-// 0x010a9f60: 0x10a9f60: jal   0x101cd60 sw    s0, 24(sp)
+// 0x010aa5a4: 0x10aa5a4: sw    ra, 28(sp)
+// 0x010aa5a8: 0x10aa5a8: jal   0x101cd70 sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2031,20 +2031,20 @@ L_10a9f50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9f68: 0x10a9f68: lui   a0, 0x20000
+// 0x010aa5b0: 0x10aa5b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9f6c: 0x10a9f6c: addiu a0, a0, 11984
+// 0x010aa5b4: 0x10aa5b4: addiu a0, a0, 12444
 	ldloc.1
-	ldc.i4 11984
+	ldc.i4 12444
 	add
 	stloc.1
-// 0x010a9f70: 0x10a9f70: jal   0x101cd60 addu  s0, v0, zero
+// 0x010aa5b8: 0x10aa5b8: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -2052,29 +2052,29 @@ L_10a9f50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9f78: 0x10a9f78: lui   a3, 0x10b0000
+// 0x010aa5c0: 0x10aa5c0: lui   a3, 0x10b0000
 	ldc.i4 17498112
 	stloc 4
-// 0x010a9f7c: 0x10a9f7c: addu  a0, s0, zero
+// 0x010aa5c4: 0x10aa5c4: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010a9f80: 0x10a9f80: addu  a1, v0, zero
+// 0x010aa5c8: 0x10aa5c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010a9f84: 0x10a9f84: addiu a3, a3, -24668
+// 0x010aa5cc: 0x10aa5cc: addiu a3, a3, -23060
 	ldloc 4
-	ldc.i4 -24668
+	ldc.i4 -23060
 	add
 	stloc 4
-// 0x010a9f88: 0x10a9f88: addiu a2, zero, 1
+// 0x010aa5d0: 0x10aa5d0: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010a9f8c: 0x10a9f8c: jal   0x104c320 sw    zero, 16(sp)
+// 0x010aa5d4: 0x10aa5d4: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2088,13 +2088,13 @@ L_10a9f50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010a9f94: 0x10a9f94: lw    ra, 28(sp)
-// 0x010a9f98: 0x10a9f98: lw    s0, 24(sp)
+// 0x010aa5dc: 0x10aa5dc: lw    ra, 28(sp)
+// 0x010aa5e0: 0x10aa5e0: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2103,7 +2103,7 @@ L_10a9f50:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010a9f9c: 0x10a9f9c: jr    ra addiu sp, sp, 32
+// 0x010aa5e4: 0x10aa5e4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2115,7 +2115,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_server_restore_favorites_cb_10a9fa4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_server_restore_favorites_cb_10aa5ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2153,15 +2153,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010a9fa4: 0x10a9fa4: addiu sp, sp, -24
+// 0x010aa5ec: 0x10aa5ec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010a9fa8: 0x10a9fa8: addiu v0, zero, 3
+// 0x010aa5f0: 0x10aa5f0: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010a9fac: 0x10a9fac: sw    s0, 16(sp)
+// 0x010aa5f4: 0x10aa5f4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2170,20 +2170,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010a9fb0: 0x10a9fb0: sw    ra, 20(sp)
-// 0x010a9fb4: 0x10a9fb4: bne   a0, v0, 0x10a9fd8 lui   s0, 0x80000
+// 0x010aa5f8: 0x10aa5f8: sw    ra, 20(sp)
+// 0x010aa5fc: 0x10aa5fc: bne   a0, v0, 0x10aa620 lui   s0, 0x90000
 	ldloc.1
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 8
-	bne.un L_10a9fd8
+	bne.un L_10aa620
 // --- basic block ---
-// 0x010a9fbc: 0x10a9fbc: lui   a0, 0x20000
+// 0x010aa604: 0x10aa604: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010a9fc0: 0x10a9fc0: jal   0x101cd60 addiu a0, a0, 12028
+// 0x010aa608: 0x10aa608: jal   0x101cd70 addiu a0, a0, 12488
 	ldloc.1
-	ldc.i4 12028
+	ldc.i4 12488
 	add
 	stloc.1
 	ldloc.0
@@ -2191,45 +2191,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010a9fc8: 0x10a9fc8: jal   0x104c3d0 addu  a0, v0, zero
+// 0x010aa610: 0x10aa610: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010a9fd0: 0x10a9fd0: jal   0x106cb9c sll   zero, zero, 0
+// 0x010aa618: 0x10aa618: jal   0x106d1c0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_TripServer_GetPOIs_106cb9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TripServer_GetPOIs_106d1c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a9fd8:
-// 0x010a9fd8: 0x10a9fd8: lw    v0, 32680(s0)
+L_10aa620:
+// 0x010aa620: 0x10aa620: lw    v0, -32392(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8170
+	ldc.i4 -8098
 	add
 	ldelem.i4
 	stloc 5
-// 0x010a9fdc: 0x10a9fdc: sll   zero, zero, 0
-// 0x010a9fe0: 0x10a9fe0: beq   v0, zero, 0x10a9ff0 sll   zero, zero, 0
+// 0x010aa624: 0x10aa624: sll   zero, zero, 0
+// 0x010aa628: 0x10aa628: beq   v0, zero, 0x10aa638 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10a9ff0
+	brfalse L_10aa638
 // --- basic block ---
-// 0x010a9fe8: 0x10a9fe8: jalr  v0 sll   zero, zero, 0
+// 0x010aa630: 0x10aa630: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2241,9 +2241,9 @@ L_10a9fd8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10a9ff0:
-// 0x010a9ff0: 0x10a9ff0: lw    ra, 20(sp)
-// 0x010a9ff4: 0x10a9ff4: lw    s0, 16(sp)
+L_10aa638:
+// 0x010aa638: 0x10aa638: lw    ra, 20(sp)
+// 0x010aa63c: 0x10aa63c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2252,7 +2252,7 @@ L_10a9ff0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010a9ff8: 0x10a9ff8: jr    ra addiu sp, sp, 24
+// 0x010aa640: 0x10aa640: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2264,7 +2264,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tripserver_response_10aa000(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tripserver_response_10aa648(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s3,int32 s2,int32 s0,int32 s4,int32 s1,int32 v1,int32 s5,int32 s7,int32 s6,int32 ra)
@@ -2323,15 +2323,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aa000: 0x10aa000: addiu sp, sp, -200
+// 0x010aa648: 0x10aa648: addiu sp, sp, -200
 	ldloc.0
 	ldc.i4 -200
 	add
 	stloc.0
-// 0x010aa004: 0x10aa004: addiu v0, zero, 128
+// 0x010aa64c: 0x10aa64c: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x010aa008: 0x10aa008: sw    v0, 24(sp)
+// 0x010aa650: 0x10aa650: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2340,10 +2340,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa00c: 0x10aa00c: addiu v0, zero, 200
+// 0x010aa654: 0x10aa654: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x010aa010: 0x10aa010: sw    s2, 172(sp)
+// 0x010aa658: 0x10aa658: sw    s2, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2352,7 +2352,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aa014: 0x10aa014: sw    s1, 168(sp)
+// 0x010aa65c: 0x10aa65c: sw    s1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2361,7 +2361,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aa018: 0x10aa018: sw    s0, 164(sp)
+// 0x010aa660: 0x10aa660: sw    s0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2370,8 +2370,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aa01c: 0x10aa01c: sw    ra, 196(sp)
-// 0x010aa020: 0x10aa020: sw    s7, 192(sp)
+// 0x010aa664: 0x10aa664: sw    ra, 196(sp)
+// 0x010aa668: 0x10aa668: sw    s7, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2380,7 +2380,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010aa024: 0x10aa024: sw    s6, 188(sp)
+// 0x010aa66c: 0x10aa66c: sw    s6, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2389,7 +2389,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010aa028: 0x10aa028: sw    s5, 184(sp)
+// 0x010aa670: 0x10aa670: sw    s5, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2398,7 +2398,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010aa02c: 0x10aa02c: sw    s4, 180(sp)
+// 0x010aa674: 0x10aa674: sw    s4, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2407,7 +2407,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa030: 0x10aa030: sw    s3, 176(sp)
+// 0x010aa678: 0x10aa678: sw    s3, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2416,50 +2416,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aa034: 0x10aa034: addu  s2, a0, zero
+// 0x010aa67c: 0x10aa67c: addu  s2, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010aa038: 0x10aa038: addu  s1, a1, zero
+// 0x010aa680: 0x10aa680: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010aa03c: 0x10aa03c: beq   a0, v0, 0x10aa0f8 addu  s0, a2, zero
+// 0x010aa684: 0x10aa684: beq   a0, v0, 0x10aa740 addu  s0, a2, zero
 	ldloc.1
 	ldloc 5
 	ldloc.3
 	stloc 9
-	beq  L_10aa0f8
+	beq  L_10aa740
 // --- basic block ---
-// 0x010aa044: 0x10aa044: beq   a1, zero, 0x10aa17c addiu s3, sp, 28
+// 0x010aa68c: 0x10aa68c: beq   a1, zero, 0x10aa7c4 addiu s3, sp, 28
 	ldloc.2
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 7
-	brfalse L_10aa17c
+	brfalse L_10aa7c4
 // --- basic block ---
-// 0x010aa04c: 0x10aa04c: lui   a3, 0x0
+// 0x010aa694: 0x10aa694: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010aa050: 0x10aa050: addu  a0, a2, zero
+// 0x010aa698: 0x10aa698: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010aa054: 0x10aa054: addiu v0, zero, -1
+// 0x010aa69c: 0x10aa69c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010aa058: 0x10aa058: addiu a3, a3, 30268
+// 0x010aa6a0: 0x10aa6a0: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x010aa05c: 0x10aa05c: addu  a1, s3, zero
+// 0x010aa6a4: 0x10aa6a4: addu  a1, s3, zero
 	ldloc 7
 	stloc.2
-// 0x010aa060: 0x10aa060: addiu a2, sp, 24
+// 0x010aa6a8: 0x10aa6a8: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010aa064: 0x10aa064: jal   0x1068250 sw    v0, 16(sp)
+// 0x010aa6ac: 0x10aa6ac: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2473,44 +2473,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x010aa06c: 0x10aa06c: addu  s0, v0, zero
+// 0x010aa6b4: 0x10aa6b4: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010aa070: 0x10aa070: addiu v0, zero, 500
+// 0x010aa6b8: 0x10aa6b8: addiu v0, zero, 500
 	ldc.i4 500
 	stloc 5
-// 0x010aa074: 0x10aa074: beq   s2, v0, 0x10aa09c lui   a1, 0x20000
+// 0x010aa6bc: 0x10aa6bc: beq   s2, v0, 0x10aa6e4 lui   a1, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	beq  L_10aa09c
+	beq  L_10aa6e4
 // --- basic block ---
-// 0x010aa07c: 0x10aa07c: lui   a3, 0x20000
+// 0x010aa6c4: 0x10aa6c4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa080: 0x10aa080: addiu a1, a1, 11604
+// 0x010aa6c8: 0x10aa6c8: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa084: 0x10aa084: addiu a3, a3, 12052
+// 0x010aa6cc: 0x10aa6cc: addiu a3, a3, 12512
 	ldloc 4
-	ldc.i4 12052
+	ldc.i4 12512
 	add
 	stloc 4
-// 0x010aa088: 0x10aa088: addiu a0, zero, 4
+// 0x010aa6d0: 0x10aa6d0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa08c: 0x10aa08c: addiu a2, zero, 345
+// 0x010aa6d4: 0x10aa6d4: addiu a2, zero, 345
 	ldc.i4 345
 	stloc.3
-// 0x010aa090: 0x10aa090: sw    s2, 16(sp)
+// 0x010aa6d8: 0x10aa6d8: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2519,7 +2519,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aa094: 0x10aa094: jal   0x100449c sw    s3, 20(sp)
+// 0x010aa6dc: 0x10aa6dc: jal   0x100449c sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2538,43 +2538,43 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	stloc 5
 // --- basic block ---
-L_10aa09c:
-// 0x010aa09c: 0x10aa09c: lui   s7, 0x0
+L_10aa6e4:
+// 0x010aa6e4: 0x10aa6e4: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x010aa0a0: 0x10aa0a0: addiu s1, s1, -1
+// 0x010aa6e8: 0x10aa6e8: addiu s1, s1, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-// 0x010aa0a4: 0x10aa0a4: addiu s7, s7, 30268
+// 0x010aa6ec: 0x10aa6ec: addiu s7, s7, 30268
 	ldloc 14
 	ldc.i4 30268
 	add
 	stloc 14
-// 0x010aa0a8: 0x10aa0a8: addu  s2, zero, zero
+// 0x010aa6f0: 0x10aa6f0: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010aa0ac: 0x10aa0ac: addiu s6, zero, 128
+// 0x010aa6f4: 0x10aa6f4: addiu s6, zero, 128
 	ldc.i4 128
 	stloc 15
-// 0x010aa0b0: 0x10aa0b0: addiu s5, sp, 28
+// 0x010aa6f8: 0x10aa6f8: addiu s5, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 13
-// 0x010aa0b4: 0x10aa0b4: addiu s4, zero, -1
+// 0x010aa6fc: 0x10aa6fc: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x010aa0b8: 0x10aa0b8: j	 0x10aa0d8 addiu s3, sp, 24
+// 0x010aa700: 0x10aa700: j	 0x10aa720 addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-	br L_10aa0d8
+	br L_10aa720
 // --- basic block ---
-L_10aa0c0:
-// 0x010aa0c0: 0x10aa0c0: sw    s6, 24(sp)
+L_10aa708:
+// 0x010aa708: 0x10aa708: sw    s6, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2583,13 +2583,13 @@ L_10aa0c0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010aa0c4: 0x10aa0c4: sb    zero, 28(sp)
+// 0x010aa70c: 0x10aa70c: sb    zero, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010aa0c8: 0x10aa0c8: jal   0x1068250 sw    s4, 16(sp)
+// 0x010aa710: 0x10aa710: jal   0x1068260 sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2603,75 +2603,75 @@ L_10aa0c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x010aa0d0: 0x10aa0d0: addu  s0, v0, zero
+// 0x010aa718: 0x10aa718: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010aa0d4: 0x10aa0d4: addiu s2, s2, 1
+// 0x010aa71c: 0x10aa71c: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10aa0d8:
-// 0x010aa0d8: 0x10aa0d8: slt   v0, s2, s1
+L_10aa720:
+// 0x010aa720: 0x10aa720: slt   v0, s2, s1
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-// 0x010aa0dc: 0x10aa0dc: addu  a0, s0, zero
+// 0x010aa724: 0x10aa724: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010aa0e0: 0x10aa0e0: addu  a1, s5, zero
+// 0x010aa728: 0x10aa728: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x010aa0e4: 0x10aa0e4: addu  a2, s3, zero
+// 0x010aa72c: 0x10aa72c: addu  a2, s3, zero
 	ldloc 7
 	stloc.3
-// 0x010aa0e8: 0x10aa0e8: bne   v0, zero, 0x10aa0c0 addu  a3, s7, zero
+// 0x010aa730: 0x10aa730: bne   v0, zero, 0x10aa708 addu  a3, s7, zero
 	ldloc 5
 	ldloc 14
 	stloc 4
-	brtrue L_10aa0c0
+	brtrue L_10aa708
 // --- basic block ---
-// 0x010aa0f0: 0x10aa0f0: j	 0x10aa17c sll   zero, zero, 0
-	br L_10aa17c
+// 0x010aa738: 0x10aa738: j	 0x10aa7c4 sll   zero, zero, 0
+	br L_10aa7c4
 // --- basic block ---
-L_10aa0f8:
-// 0x010aa0f8: 0x10aa0f8: beq   a1, zero, 0x10aa17c addiu s2, sp, 28
+L_10aa740:
+// 0x010aa740: 0x10aa740: beq   a1, zero, 0x10aa7c4 addiu s2, sp, 28
 	ldloc.2
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 8
-	brfalse L_10aa17c
+	brfalse L_10aa7c4
 // --- basic block ---
-// 0x010aa100: 0x10aa100: lui   a3, 0x0
+// 0x010aa748: 0x10aa748: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010aa104: 0x10aa104: addu  a0, a2, zero
+// 0x010aa74c: 0x10aa74c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010aa108: 0x10aa108: addiu v0, zero, 1
+// 0x010aa750: 0x10aa750: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010aa10c: 0x10aa10c: addiu a3, a3, 30268
+// 0x010aa754: 0x10aa754: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x010aa110: 0x10aa110: addu  a1, s2, zero
+// 0x010aa758: 0x10aa758: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x010aa114: 0x10aa114: addiu a2, sp, 24
+// 0x010aa75c: 0x10aa75c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010aa118: 0x10aa118: sw    v0, 16(sp)
+// 0x010aa760: 0x10aa760: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2680,7 +2680,7 @@ L_10aa0f8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa11c: 0x10aa11c: jal   0x1068250 lui   s4, 0x20000
+// 0x010aa764: 0x10aa764: jal   0x1068260 lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 10
 	ldloc.0
@@ -2688,34 +2688,34 @@ L_10aa0f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x010aa124: 0x10aa124: addu  s0, v0, zero
+// 0x010aa76c: 0x10aa76c: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010aa128: 0x10aa128: addiu s4, s4, 29788
+// 0x010aa770: 0x10aa770: addiu s4, s4, 30252
 	ldloc 10
-	ldc.i4 29788
+	ldc.i4 30252
 	add
 	stloc 10
-// 0x010aa12c: 0x10aa12c: addu  s3, zero, zero
+// 0x010aa774: 0x10aa774: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010aa130: 0x10aa130: addiu s5, zero, 4
+// 0x010aa778: 0x10aa778: addiu s5, zero, 4
 	ldc.i4.4
 	stloc 13
-L_10aa134:
-// 0x010aa134: 0x10aa134: lw    a1, 0(s4)
+L_10aa77c:
+// 0x010aa77c: 0x10aa77c: lw    a1, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010aa138: 0x10aa138: jal   0x1001b14 addu  a0, s2, zero
+// 0x010aa780: 0x10aa780: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2723,38 +2723,38 @@ L_10aa134:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010aa140: 0x10aa140: bne   v0, zero, 0x10aa174 addiu s3, s3, 1
+// 0x010aa788: 0x10aa788: bne   v0, zero, 0x10aa7bc addiu s3, s3, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_10aa174
+	brtrue L_10aa7bc
 // --- basic block ---
-// 0x010aa148: 0x10aa148: addiu s3, s3, -1
+// 0x010aa790: 0x10aa790: addiu s3, s3, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x010aa14c: 0x10aa14c: lui   v0, 0x20000
+// 0x010aa794: 0x10aa794: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010aa150: 0x10aa150: addiu v0, v0, 29788
+// 0x010aa798: 0x10aa798: addiu v0, v0, 30252
 	ldloc 5
-	ldc.i4 29788
+	ldc.i4 30252
 	add
 	stloc 5
-// 0x010aa154: 0x10aa154: sll   s3, s3, 3
+// 0x010aa79c: 0x10aa79c: sll   s3, s3, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x010aa158: 0x10aa158: addu  s3, v0, s3
+// 0x010aa7a0: 0x10aa7a0: addu  s3, v0, s3
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x010aa15c: 0x10aa15c: lw    v0, 4(s3)
+// 0x010aa7a4: 0x10aa7a4: lw    v0, 4(s3)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2763,10 +2763,10 @@ L_10aa134:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa160: 0x10aa160: addu  a1, s0, zero
+// 0x010aa7a8: 0x10aa7a8: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010aa164: 0x10aa164: jalr  v0 addiu a0, s1, -1
+// 0x010aa7ac: 0x10aa7ac: jalr  v0 addiu a0, s1, -1
 	ldloc 5
 	ldloc 11
 	ldc.i4.m1
@@ -2782,27 +2782,27 @@ L_10aa134:
 	stloc 12
 	stloc 5
 // --- basic block ---
-// 0x010aa16c: 0x10aa16c: j	 0x10aa17c addu  s0, v0, zero
+// 0x010aa7b4: 0x10aa7b4: j	 0x10aa7c4 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-	br L_10aa17c
+	br L_10aa7c4
 // --- basic block ---
-L_10aa174:
-// 0x010aa174: 0x10aa174: bne   s3, s5, 0x10aa134 addiu s4, s4, 8
+L_10aa7bc:
+// 0x010aa7bc: 0x10aa7bc: bne   s3, s5, 0x10aa77c addiu s4, s4, 8
 	ldloc 7
 	ldloc 13
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc 10
-	bne.un L_10aa134
+	bne.un L_10aa77c
 // --- basic block ---
-L_10aa17c:
-// 0x010aa17c: 0x10aa17c: lw    ra, 196(sp)
-// 0x010aa180: 0x10aa180: addu  v0, s0, zero
+L_10aa7c4:
+// 0x010aa7c4: 0x10aa7c4: lw    ra, 196(sp)
+// 0x010aa7c8: 0x10aa7c8: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x010aa184: 0x10aa184: lw    s7, 192(sp)
+// 0x010aa7cc: 0x10aa7cc: lw    s7, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2811,7 +2811,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010aa188: 0x10aa188: lw    s6, 188(sp)
+// 0x010aa7d0: 0x10aa7d0: lw    s6, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2820,7 +2820,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010aa18c: 0x10aa18c: lw    s5, 184(sp)
+// 0x010aa7d4: 0x10aa7d4: lw    s5, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2829,7 +2829,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010aa190: 0x10aa190: lw    s4, 180(sp)
+// 0x010aa7d8: 0x10aa7d8: lw    s4, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2838,7 +2838,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aa194: 0x10aa194: lw    s3, 176(sp)
+// 0x010aa7dc: 0x10aa7dc: lw    s3, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2847,7 +2847,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aa198: 0x10aa198: lw    s2, 172(sp)
+// 0x010aa7e0: 0x10aa7e0: lw    s2, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2856,7 +2856,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aa19c: 0x10aa19c: lw    s1, 168(sp)
+// 0x010aa7e4: 0x10aa7e4: lw    s1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2865,7 +2865,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aa1a0: 0x10aa1a0: lw    s0, 164(sp)
+// 0x010aa7e8: 0x10aa7e8: lw    s0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2874,7 +2874,7 @@ L_10aa17c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aa1a4: 0x10aa1a4: jr    ra addiu sp, sp, 200
+// 0x010aa7ec: 0x10aa7ec: jr    ra addiu sp, sp, 200
 	ldloc.0
 	ldc.i4 200
 	add
@@ -2886,7 +2886,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_get_num_pois_res_10aa1ac(int32,int32,int32,int32,int32)
+.method public static int32 on_get_num_pois_res_10aa7f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2927,13 +2927,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10aa1ac:
-// 0x010aa1ac: 0x10aa1ac: addiu sp, sp, -56
+L_10aa7f4:
+// 0x010aa7f4: 0x10aa7f4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010aa1b0: 0x10aa1b0: sw    s0, 44(sp)
+// 0x010aa7f8: 0x10aa7f8: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2942,13 +2942,13 @@ L_10aa1ac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aa1b4: 0x10aa1b4: lui   a3, 0x20000
+// 0x010aa7fc: 0x10aa7fc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa1b8: 0x10aa1b8: lui   s0, 0x20000
+// 0x010aa800: 0x10aa800: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010aa1bc: 0x10aa1bc: sw    s1, 48(sp)
+// 0x010aa804: 0x10aa804: sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2957,7 +2957,7 @@ L_10aa1ac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aa1c0: 0x10aa1c0: sw    a0, 16(sp)
+// 0x010aa808: 0x10aa808: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2966,24 +2966,24 @@ L_10aa1ac:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010aa1c4: 0x10aa1c4: addu  s1, a1, zero
+// 0x010aa80c: 0x10aa80c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010aa1c8: 0x10aa1c8: addiu a3, a3, 12116
+// 0x010aa810: 0x10aa810: addiu a3, a3, 12576
 	ldloc 4
-	ldc.i4 12116
+	ldc.i4 12576
 	add
 	stloc 4
-// 0x010aa1cc: 0x10aa1cc: addiu a0, zero, 3
+// 0x010aa814: 0x10aa814: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010aa1d0: 0x10aa1d0: addiu a1, s0, 11604
+// 0x010aa818: 0x10aa818: addiu a1, s0, 12064
 	ldloc 8
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa1d4: 0x10aa1d4: sw    ra, 52(sp)
-// 0x010aa1d8: 0x10aa1d8: jal   0x100449c addiu a2, zero, 221
+// 0x010aa81c: 0x10aa81c: sw    ra, 52(sp)
+// 0x010aa820: 0x10aa820: jal   0x100449c addiu a2, zero, 221
 	ldc.i4 221
 	stloc.3
 	ldloc.0
@@ -2996,29 +2996,29 @@ L_10aa1ac:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aa1e0: 0x10aa1e0: lui   a1, 0x0
+// 0x010aa828: 0x10aa828: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aa1e4: 0x10aa1e4: addiu v0, zero, 1
+// 0x010aa82c: 0x10aa82c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010aa1e8: 0x10aa1e8: addu  a0, s1, zero
+// 0x010aa830: 0x10aa830: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010aa1ec: 0x10aa1ec: addiu a1, a1, 30268
+// 0x010aa834: 0x10aa834: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010aa1f0: 0x10aa1f0: addu  a2, zero, zero
+// 0x010aa838: 0x10aa838: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa1f4: 0x10aa1f4: addiu a3, sp, 24
+// 0x010aa83c: 0x10aa83c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x010aa1f8: 0x10aa1f8: jal   0x106855c sw    v0, 16(sp)
+// 0x010aa840: 0x10aa840: jal   0x106856c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3032,34 +3032,34 @@ L_10aa1ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aa200: 0x10aa200: bne   v0, zero, 0x10aa228 lui   a3, 0x20000
+// 0x010aa848: 0x10aa848: bne   v0, zero, 0x10aa870 lui   a3, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10aa228
+	brtrue L_10aa870
 // --- basic block ---
-// 0x010aa208: 0x10aa208: addiu a1, s0, 11604
+// 0x010aa850: 0x10aa850: addiu a1, s0, 12064
 	ldloc 8
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa20c: 0x10aa20c: addiu a3, a3, 12188
+// 0x010aa854: 0x10aa854: addiu a3, a3, 12648
 	ldloc 4
-	ldc.i4 12188
+	ldc.i4 12648
 	add
 	stloc 4
-// 0x010aa210: 0x10aa210: addiu a0, zero, 4
+// 0x010aa858: 0x10aa858: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa214: 0x10aa214: addiu a2, zero, 231
+// 0x010aa85c: 0x10aa85c: addiu a2, zero, 231
 	ldc.i4 231
 	stloc.3
-// 0x010aa218: 0x10aa218: jal   0x100449c sw    v0, 32(sp)
+// 0x010aa860: 0x10aa860: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3078,11 +3078,11 @@ L_10aa1ac:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aa220: 0x10aa220: j	 0x10aa240 sll   zero, zero, 0
-	br L_10aa240
+// 0x010aa868: 0x10aa868: j	 0x10aa888 sll   zero, zero, 0
+	br L_10aa888
 // --- basic block ---
-L_10aa228:
-// 0x010aa228: 0x10aa228: lw    v1, 24(sp)
+L_10aa870:
+// 0x010aa870: 0x10aa870: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3091,13 +3091,13 @@ L_10aa228:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aa22c: 0x10aa22c: sll   zero, zero, 0
-// 0x010aa230: 0x10aa230: blez  v1, 0x10aa244 sll   zero, zero, 0
+// 0x010aa874: 0x10aa874: sll   zero, zero, 0
+// 0x010aa878: 0x10aa878: blez  v1, 0x10aa88c sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	ble L_10aa244
+	ble L_10aa88c
 // --- basic block ---
-// 0x010aa238: 0x10aa238: jal   0x10a9f50 sw    v0, 32(sp)
+// 0x010aa880: 0x10aa880: jal   0x10aa598 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3111,13 +3111,13 @@ L_10aa228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_trip_server_restore_favorites_10a9f50(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_trip_server_restore_favorites_10aa598(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10aa240:
-// 0x010aa240: 0x10aa240: lw    v0, 32(sp)
+L_10aa888:
+// 0x010aa888: 0x10aa888: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3126,9 +3126,9 @@ L_10aa240:
 	add
 	ldelem.i4
 	stloc 6
-L_10aa244:
-// 0x010aa244: 0x10aa244: lw    ra, 52(sp)
-// 0x010aa248: 0x10aa248: lw    s1, 48(sp)
+L_10aa88c:
+// 0x010aa88c: 0x10aa88c: lw    ra, 52(sp)
+// 0x010aa890: 0x10aa890: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3137,7 +3137,7 @@ L_10aa244:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aa24c: 0x10aa24c: lw    s0, 44(sp)
+// 0x010aa894: 0x10aa894: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3146,7 +3146,7 @@ L_10aa244:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aa250: 0x10aa250: jr    ra addiu sp, sp, 56
+// 0x010aa898: 0x10aa898: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3158,7 +3158,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_get_pois_res_10aa258(int32,int32,int32,int32,int32)
+.method public static int32 on_get_pois_res_10aa8a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s4,int32 s0,int32 s7,int32 s3,int32 s6,int32 s5,int32 s8,int32 ra,int32 lo)
@@ -3223,13 +3223,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10aa258:
-// 0x010aa258: 0x10aa258: addiu sp, sp, -488
+L_10aa8a0:
+// 0x010aa8a0: 0x10aa8a0: addiu sp, sp, -488
 	ldloc.0
 	ldc.i4 -488
 	add
 	stloc.0
-// 0x010aa25c: 0x10aa25c: sw    s1, 452(sp)
+// 0x010aa8a4: 0x10aa8a4: sw    s1, 452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3238,15 +3238,15 @@ L_10aa258:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aa260: 0x10aa260: addiu s1, zero, 3
+// 0x010aa8a8: 0x10aa8a8: addiu s1, zero, 3
 	ldc.i4.3
 	stloc 9
-// 0x010aa264: 0x10aa264: div   a0, s1
+// 0x010aa8ac: 0x10aa8ac: div   a0, s1
 	ldloc.1
 	ldloc 9
 	div
 	stloc 18
-// 0x010aa268: 0x10aa268: sw    s2, 456(sp)
+// 0x010aa8b0: 0x10aa8b0: sw    s2, 456(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3255,16 +3255,16 @@ L_10aa258:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aa26c: 0x10aa26c: lui   a3, 0x20000
+// 0x010aa8b4: 0x10aa8b4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa270: 0x10aa270: lui   s2, 0x20000
+// 0x010aa8b8: 0x10aa8b8: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010aa274: 0x10aa274: addu  v0, a0, zero
+// 0x010aa8bc: 0x10aa8bc: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010aa278: 0x10aa278: sw    s0, 448(sp)
+// 0x010aa8c0: 0x10aa8c0: sw    s0, 448(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3273,27 +3273,27 @@ L_10aa258:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aa27c: 0x10aa27c: addiu a3, a3, 12248
+// 0x010aa8c4: 0x10aa8c4: addiu a3, a3, 12708
 	ldloc 4
-	ldc.i4 12248
+	ldc.i4 12708
 	add
 	stloc 4
-// 0x010aa280: 0x10aa280: addu  s0, a1, zero
+// 0x010aa8c8: 0x10aa8c8: addu  s0, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010aa284: 0x10aa284: addiu a0, zero, 3
+// 0x010aa8cc: 0x10aa8cc: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010aa288: 0x10aa288: addiu a1, s2, 11604
+// 0x010aa8d0: 0x10aa8d0: addiu a1, s2, 12064
 	ldloc 8
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa28c: 0x10aa28c: addiu a2, zero, 253
+// 0x010aa8d4: 0x10aa8d4: addiu a2, zero, 253
 	ldc.i4 253
 	stloc.3
-// 0x010aa290: 0x10aa290: sw    ra, 484(sp)
-// 0x010aa294: 0x10aa294: sw    s8, 480(sp)
+// 0x010aa8d8: 0x10aa8d8: sw    ra, 484(sp)
+// 0x010aa8dc: 0x10aa8dc: sw    s8, 480(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3302,7 +3302,7 @@ L_10aa258:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010aa298: 0x10aa298: sw    s7, 476(sp)
+// 0x010aa8e0: 0x10aa8e0: sw    s7, 476(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3311,7 +3311,7 @@ L_10aa258:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010aa29c: 0x10aa29c: sw    s6, 472(sp)
+// 0x010aa8e4: 0x10aa8e4: sw    s6, 472(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3320,7 +3320,7 @@ L_10aa258:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010aa2a0: 0x10aa2a0: sw    s5, 468(sp)
+// 0x010aa8e8: 0x10aa8e8: sw    s5, 468(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3329,7 +3329,7 @@ L_10aa258:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010aa2a4: 0x10aa2a4: sw    s4, 464(sp)
+// 0x010aa8ec: 0x10aa8ec: sw    s4, 464(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3338,7 +3338,7 @@ L_10aa258:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa2a8: 0x10aa2a8: sw    s3, 460(sp)
+// 0x010aa8f0: 0x10aa8f0: sw    s3, 460(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3347,10 +3347,10 @@ L_10aa258:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010aa2ac: 0x10aa2ac: mflo  lo
+// 0x010aa8f4: 0x10aa8f4: mflo  lo
 	ldloc 18
 	stloc 9
-// 0x010aa2b0: 0x10aa2b0: jal   0x100449c sw    v0, 16(sp)
+// 0x010aa8f8: 0x10aa8f8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3369,27 +3369,27 @@ L_10aa258:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa2b8: 0x10aa2b8: blez  s1, 0x10aa2f4 addiu a1, s2, 11604
+// 0x010aa900: 0x10aa900: blez  s1, 0x10aa93c addiu a1, s2, 12064
 	ldloc 9
 	ldloc 8
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
 	ldc.i4.s 0
-	ble L_10aa2f4
+	ble L_10aa93c
 // --- basic block ---
-// 0x010aa2c0: 0x10aa2c0: lui   a3, 0x20000
+// 0x010aa908: 0x10aa908: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa2c4: 0x10aa2c4: addiu a3, a3, 12316
+// 0x010aa90c: 0x10aa90c: addiu a3, a3, 12776
 	ldloc 4
-	ldc.i4 12316
+	ldc.i4 12776
 	add
 	stloc 4
-// 0x010aa2c8: 0x10aa2c8: addiu a0, zero, 3
+// 0x010aa910: 0x10aa910: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010aa2cc: 0x10aa2cc: jal   0x100449c addiu a2, zero, 174
+// 0x010aa914: 0x10aa914: jal   0x100449c addiu a2, zero, 174
 	ldc.i4 174
 	stloc.3
 	ldloc.0
@@ -3402,24 +3402,24 @@ L_10aa258:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aa2d4:
-// 0x010aa2d4: 0x10aa2d4: jal   0x103772c addiu a0, zero, 70
+L_10aa91c:
+// 0x010aa91c: 0x10aa91c: jal   0x103773c addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl40::roadmap_history_latest_103772c(int32,int32)
+	call int32 Cibyl40::roadmap_history_latest_103773c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa2dc: 0x10aa2dc: beq   v0, zero, 0x10aa2f8 lui   s7, 0x0
+// 0x010aa924: 0x10aa924: beq   v0, zero, 0x10aa940 lui   s7, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	brfalse L_10aa2f8
+	brfalse L_10aa940
 // --- basic block ---
-// 0x010aa2e4: 0x10aa2e4: jal   0x1037a90 addu  a0, v0, zero
+// 0x010aa92c: 0x10aa92c: jal   0x1037aa0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3427,60 +3427,60 @@ L_10aa2d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_delete_entry_1037a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_delete_entry_1037aa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa2ec: 0x10aa2ec: j	 0x10aa2d4 sll   zero, zero, 0
-	br L_10aa2d4
+// 0x010aa934: 0x10aa934: j	 0x10aa91c sll   zero, zero, 0
+	br L_10aa91c
 // --- basic block ---
-L_10aa2f4:
-// 0x010aa2f4: 0x10aa2f4: lui   s7, 0x0
+L_10aa93c:
+// 0x010aa93c: 0x10aa93c: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 12
-L_10aa2f8:
-// 0x010aa2f8: 0x10aa2f8: lui   s4, 0x10000
+L_10aa940:
+// 0x010aa940: 0x10aa940: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010aa2fc: 0x10aa2fc: lui   s6, 0x20000
-	ldc.i4 131072
+// 0x010aa944: 0x10aa944: lui   s6, 0x10000
+	ldc.i4 65536
 	stloc 14
-// 0x010aa300: 0x10aa300: addiu s7, s7, 28076
+// 0x010aa948: 0x10aa948: addiu s7, s7, 28076
 	ldloc 12
 	ldc.i4 28076
 	add
 	stloc 12
-// 0x010aa304: 0x10aa304: addiu s4, s4, 18500
+// 0x010aa94c: 0x10aa94c: addiu s4, s4, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 10
-// 0x010aa308: 0x10aa308: addiu s6, s6, -13884
+// 0x010aa950: 0x10aa950: addiu s6, s6, 19088
 	ldloc 14
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc 14
-// 0x010aa30c: 0x10aa30c: addu  s5, zero, zero
+// 0x010aa954: 0x10aa954: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x010aa310: 0x10aa310: addiu s2, sp, 196
+// 0x010aa958: 0x10aa958: addiu s2, sp, 196
 	ldloc.0
 	ldc.i4 196
 	add
 	stloc 8
-// 0x010aa314: 0x10aa314: j	 0x10aa47c addiu s3, sp, 44
+// 0x010aa95c: 0x10aa95c: j	 0x10aaac4 addiu s3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 13
-	br L_10aa47c
+	br L_10aaac4
 // --- basic block ---
-L_10aa31c:
-// 0x010aa31c: 0x10aa31c: addiu v0, zero, 250
+L_10aa964:
+// 0x010aa964: 0x10aa964: addiu v0, zero, 250
 	ldc.i4 250
 	stloc 5
-// 0x010aa320: 0x10aa320: sw    v0, 32(sp)
+// 0x010aa968: 0x10aa968: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3489,7 +3489,7 @@ L_10aa31c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa324: 0x10aa324: jal   0x1068250 sw    s8, 16(sp)
+// 0x010aa96c: 0x10aa96c: jal   0x1068260 sw    s8, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3503,51 +3503,51 @@ L_10aa31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa32c: 0x10aa32c: addu  s0, v0, zero
+// 0x010aa974: 0x10aa974: addu  s0, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010aa330: 0x10aa330: addu  a0, v0, zero
+// 0x010aa978: 0x10aa978: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa334: 0x10aa334: addu  a1, s7, zero
+// 0x010aa97c: 0x10aa97c: addu  a1, s7, zero
 	ldloc 12
 	stloc.2
-// 0x010aa338: 0x10aa338: addu  a2, zero, zero
+// 0x010aa980: 0x10aa980: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa33c: 0x10aa33c: bne   v0, zero, 0x10aa368 addiu a3, sp, 36
+// 0x010aa984: 0x10aa984: bne   v0, zero, 0x10aa9b0 addiu a3, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-	brtrue L_10aa368
+	brtrue L_10aa9b0
 // --- basic block ---
-// 0x010aa344: 0x10aa344: lui   a1, 0x20000
+// 0x010aa98c: 0x10aa98c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa348: 0x10aa348: lui   a3, 0x20000
+// 0x010aa990: 0x10aa990: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa34c: 0x10aa34c: addiu a1, a1, 11604
+// 0x010aa994: 0x10aa994: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa350: 0x10aa350: addiu a3, a3, 12348
+// 0x010aa998: 0x10aa998: addiu a3, a3, 12808
 	ldloc 4
-	ldc.i4 12348
+	ldc.i4 12808
 	add
 	stloc 4
-// 0x010aa354: 0x10aa354: addiu a0, zero, 4
+// 0x010aa99c: 0x10aa99c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa358: 0x10aa358: jal   0x100449c addiu a2, zero, 269
+// 0x010aa9a0: 0x10aa9a0: jal   0x100449c addiu a2, zero, 269
 	ldc.i4 269
 	stloc.3
 	ldloc.0
@@ -3560,11 +3560,11 @@ L_10aa31c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa360: 0x10aa360: j	 0x10aa52c sll   zero, zero, 0
-	br L_10aa52c
+// 0x010aa9a8: 0x10aa9a8: j	 0x10aab74 sll   zero, zero, 0
+	br L_10aab74
 // --- basic block ---
-L_10aa368:
-// 0x010aa368: 0x10aa368: jal   0x106855c sw    s8, 16(sp)
+L_10aa9b0:
+// 0x010aa9b0: 0x10aa9b0: jal   0x106856c sw    s8, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3578,65 +3578,65 @@ L_10aa368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa370: 0x10aa370: lui   a1, 0x0
+// 0x010aa9b8: 0x10aa9b8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aa374: 0x10aa374: addu  s0, v0, zero
+// 0x010aa9bc: 0x10aa9bc: addu  s0, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010aa378: 0x10aa378: addu  a0, v0, zero
+// 0x010aa9c0: 0x10aa9c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa37c: 0x10aa37c: addiu a3, sp, 40
+// 0x010aa9c4: 0x10aa9c4: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x010aa380: 0x10aa380: addiu a1, a1, 30268
+// 0x010aa9c8: 0x10aa9c8: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010aa384: 0x10aa384: bne   v0, zero, 0x10aa3a8 addu  a2, zero, zero
+// 0x010aa9cc: 0x10aa9cc: bne   v0, zero, 0x10aa9f0 addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_10aa3a8
+	brtrue L_10aa9f0
 // --- basic block ---
-// 0x010aa38c: 0x10aa38c: lui   a1, 0x20000
+// 0x010aa9d4: 0x10aa9d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa390: 0x10aa390: lui   a3, 0x20000
+// 0x010aa9d8: 0x10aa9d8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa394: 0x10aa394: addiu a1, a1, 11604
+// 0x010aa9dc: 0x10aa9dc: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa398: 0x10aa398: addiu a3, a3, 12404
+// 0x010aa9e0: 0x10aa9e0: addiu a3, a3, 12864
 	ldloc 4
-	ldc.i4 12404
+	ldc.i4 12864
 	add
 	stloc 4
-// 0x010aa39c: 0x10aa39c: addiu a0, zero, 4
+// 0x010aa9e4: 0x10aa9e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa3a0: 0x10aa3a0: j	 0x10aa3e0 addiu a2, zero, 281
+// 0x010aa9e8: 0x10aa9e8: j	 0x10aaa28 addiu a2, zero, 281
 	ldc.i4 281
 	stloc.3
-	br L_10aa3e0
+	br L_10aaa28
 // --- basic block ---
-L_10aa3a8:
-// 0x010aa3a8: 0x10aa3a8: addiu v0, zero, -1
+L_10aa9f0:
+// 0x010aa9f0: 0x10aa9f0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010aa3ac: 0x10aa3ac: jal   0x106855c sw    v0, 16(sp)
+// 0x010aa9f4: 0x10aa9f4: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3650,52 +3650,52 @@ L_10aa3a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa3b4: 0x10aa3b4: addu  s0, v0, zero
+// 0x010aa9fc: 0x10aa9fc: addu  s0, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010aa3b8: 0x10aa3b8: addu  a1, s6, zero
+// 0x010aaa00: 0x10aaa00: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x010aa3bc: 0x10aa3bc: addu  a0, s3, zero
+// 0x010aaa04: 0x10aaa04: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x010aa3c0: 0x10aa3c0: bne   v0, zero, 0x10aa3f0 addiu s5, s5, 1
+// 0x010aaa08: 0x10aaa08: bne   v0, zero, 0x10aaa38 addiu s5, s5, 1
 	ldloc 5
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-	brtrue L_10aa3f0
+	brtrue L_10aaa38
 // --- basic block ---
-// 0x010aa3c8: 0x10aa3c8: lui   a1, 0x20000
+// 0x010aaa10: 0x10aaa10: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa3cc: 0x10aa3cc: lui   a3, 0x20000
+// 0x010aaa14: 0x10aaa14: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa3d0: 0x10aa3d0: addiu a1, a1, 11604
+// 0x010aaa18: 0x10aaa18: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa3d4: 0x10aa3d4: addiu a3, a3, 12488
+// 0x010aaa1c: 0x10aaa1c: addiu a3, a3, 12948
 	ldloc 4
-	ldc.i4 12488
+	ldc.i4 12948
 	add
 	stloc 4
-// 0x010aa3d8: 0x10aa3d8: addiu a0, zero, 4
+// 0x010aaa20: 0x10aaa20: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa3dc: 0x10aa3dc: addiu a2, zero, 293
+// 0x010aaa24: 0x10aaa24: addiu a2, zero, 293
 	ldc.i4 293
 	stloc.3
-L_10aa3e0:
-// 0x010aa3e0: 0x10aa3e0: jal   0x100449c sw    s2, 16(sp)
+L_10aaa28:
+// 0x010aaa28: 0x10aaa28: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3714,11 +3714,11 @@ L_10aa3e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa3e8: 0x10aa3e8: j	 0x10aa52c sll   zero, zero, 0
-	br L_10aa52c
+// 0x010aaa30: 0x10aaa30: j	 0x10aab74 sll   zero, zero, 0
+	br L_10aab74
 // --- basic block ---
-L_10aa3f0:
-// 0x010aa3f0: 0x10aa3f0: lw    a2, 40(sp)
+L_10aaa38:
+// 0x010aaa38: 0x10aaa38: lw    a2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3727,7 +3727,7 @@ L_10aa3f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aa3f4: 0x10aa3f4: sw    s4, 64(sp)
+// 0x010aaa3c: 0x10aaa3c: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3736,7 +3736,7 @@ L_10aa3f0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa3f8: 0x10aa3f8: sw    s4, 68(sp)
+// 0x010aaa40: 0x10aaa40: sw    s4, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3745,7 +3745,7 @@ L_10aa3f0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa3fc: 0x10aa3fc: sw    s4, 72(sp)
+// 0x010aaa44: 0x10aaa44: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3754,7 +3754,7 @@ L_10aa3f0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa400: 0x10aa400: sw    s4, 76(sp)
+// 0x010aaa48: 0x10aaa48: sw    s4, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3763,7 +3763,7 @@ L_10aa3f0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa404: 0x10aa404: jal   0x1000f64 sw    s2, 80(sp)
+// 0x010aaa4c: 0x10aaa4c: jal   0x1000f64 sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3782,7 +3782,7 @@ L_10aa3f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa40c: 0x10aa40c: jal   0x1001ba8 addu  a0, s3, zero
+// 0x010aaa54: 0x10aaa54: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -3795,7 +3795,7 @@ L_10aa3f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa414: 0x10aa414: lw    a2, 36(sp)
+// 0x010aaa5c: 0x10aaa5c: lw    a2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3804,13 +3804,13 @@ L_10aa3f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aa418: 0x10aa418: addu  a1, s6, zero
+// 0x010aaa60: 0x10aaa60: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x010aa41c: 0x10aa41c: addu  a0, s3, zero
+// 0x010aaa64: 0x10aaa64: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x010aa420: 0x10aa420: jal   0x1000f64 sw    v0, 84(sp)
+// 0x010aaa68: 0x10aaa68: jal   0x1000f64 sw    v0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3829,7 +3829,7 @@ L_10aa3f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa428: 0x10aa428: jal   0x1001ba8 addu  a0, s3, zero
+// 0x010aaa70: 0x10aaa70: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -3842,7 +3842,7 @@ L_10aa3f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa430: 0x10aa430: lw    v1, 80(sp)
+// 0x010aaa78: 0x10aaa78: lw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3851,7 +3851,7 @@ L_10aa3f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aa434: 0x10aa434: sw    v0, 24(sp)
+// 0x010aaa7c: 0x10aaa7c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3860,7 +3860,7 @@ L_10aa3f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa438: 0x10aa438: sw    v1, 16(sp)
+// 0x010aaa80: 0x10aaa80: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3869,7 +3869,7 @@ L_10aa3f0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aa43c: 0x10aa43c: sw    v0, 88(sp)
+// 0x010aaa84: 0x10aaa84: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3878,7 +3878,7 @@ L_10aa3f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa440: 0x10aa440: lw    v1, 84(sp)
+// 0x010aaa88: 0x10aaa88: lw    v1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3887,37 +3887,37 @@ L_10aa3f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aa444: 0x10aa444: lui   a1, 0x20000
+// 0x010aaa8c: 0x10aaa8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa448: 0x10aa448: lui   a3, 0x20000
+// 0x010aaa90: 0x10aaa90: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa44c: 0x10aa44c: lui   v0, 0x10000
+// 0x010aaa94: 0x10aaa94: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010aa450: 0x10aa450: addiu a0, zero, 3
+// 0x010aaa98: 0x10aaa98: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010aa454: 0x10aa454: addiu a1, a1, 11604
+// 0x010aaa9c: 0x10aaa9c: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa458: 0x10aa458: addiu v0, v0, 32112
+// 0x010aaaa0: 0x10aaaa0: addiu v0, v0, 32576
 	ldloc 5
-	ldc.i4 32112
+	ldc.i4 32576
 	add
 	stloc 5
-// 0x010aa45c: 0x10aa45c: addiu a2, zero, 307
+// 0x010aaaa4: 0x10aaaa4: addiu a2, zero, 307
 	ldc.i4 307
 	stloc.3
-// 0x010aa460: 0x10aa460: addiu a3, a3, 12572
+// 0x010aaaa8: 0x10aaaa8: addiu a3, a3, 13032
 	ldloc 4
-	ldc.i4 12572
+	ldc.i4 13032
 	add
 	stloc 4
-// 0x010aa464: 0x10aa464: sw    v1, 20(sp)
+// 0x010aaaac: 0x10aaaac: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3926,7 +3926,7 @@ L_10aa3f0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aa468: 0x10aa468: jal   0x100449c sw    v0, 92(sp)
+// 0x010aaab0: 0x10aaab0: jal   0x100449c sw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3945,10 +3945,10 @@ L_10aa3f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa470: 0x10aa470: addiu a0, zero, 70
+// 0x010aaab8: 0x10aaab8: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x010aa474: 0x10aa474: jal   0x103822c addiu a1, sp, 64
+// 0x010aaabc: 0x10aaabc: jal   0x103823c addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3958,55 +3958,55 @@ L_10aa3f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aa47c:
-// 0x010aa47c: 0x10aa47c: slt   v0, s5, s1
+L_10aaac4:
+// 0x010aaac4: 0x10aaac4: slt   v0, s5, s1
 	ldloc 15
 	ldloc 9
 	clt
 	stloc 5
-// 0x010aa480: 0x10aa480: addu  a0, s0, zero
+// 0x010aaac8: 0x10aaac8: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010aa484: 0x10aa484: addiu s8, zero, 1
+// 0x010aaacc: 0x10aaacc: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x010aa488: 0x10aa488: addu  a1, s2, zero
+// 0x010aaad0: 0x10aaad0: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x010aa48c: 0x10aa48c: addiu a2, sp, 32
+// 0x010aaad4: 0x10aaad4: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x010aa490: 0x10aa490: bne   v0, zero, 0x10aa31c addu  a3, s7, zero
+// 0x010aaad8: 0x10aaad8: bne   v0, zero, 0x10aa964 addu  a3, s7, zero
 	ldloc 5
 	ldloc 12
 	stloc 4
-	brtrue L_10aa31c
+	brtrue L_10aa964
 // --- basic block ---
-// 0x010aa498: 0x10aa498: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010aaae0: 0x10aaae0: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa4a0: 0x10aa4a0: bne   s1, zero, 0x10aa4c0 addiu v0, zero, 1
+// 0x010aaae8: 0x10aaae8: bne   s1, zero, 0x10aab08 addiu v0, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 5
-	brtrue L_10aa4c0
+	brtrue L_10aab08
 // --- basic block ---
-// 0x010aa4a8: 0x10aa4a8: lui   a0, 0x20000
+// 0x010aaaf0: 0x10aaaf0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aa4ac: 0x10aa4ac: jal   0x101cd60 addiu a0, a0, 12656
+// 0x010aaaf4: 0x10aaaf4: jal   0x101cd70 addiu a0, a0, 13116
 	ldloc.1
-	ldc.i4 12656
+	ldc.i4 13116
 	add
 	stloc.1
 	ldloc.0
@@ -4014,37 +4014,37 @@ L_10aa47c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa4b4: 0x10aa4b4: addu  a1, v0, zero
+// 0x010aaafc: 0x10aaafc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010aa4b8: 0x10aa4b8: j	 0x10aa4dc addiu a0, sp, 96
+// 0x010aab00: 0x10aab00: j	 0x10aab24 addiu a0, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc.1
-	br L_10aa4dc
+	br L_10aab24
 // --- basic block ---
-L_10aa4c0:
-// 0x010aa4c0: 0x10aa4c0: bne   s1, v0, 0x10aa4ec addiu s2, sp, 96
+L_10aab08:
+// 0x010aab08: 0x10aab08: bne   s1, v0, 0x10aab34 addiu s2, sp, 96
 	ldloc 9
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 8
-	bne.un L_10aa4ec
+	bne.un L_10aab34
 // --- basic block ---
-// 0x010aa4c8: 0x10aa4c8: lui   a0, 0x20000
+// 0x010aab10: 0x10aab10: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aa4cc: 0x10aa4cc: jal   0x101cd60 addiu a0, a0, 12692
+// 0x010aab14: 0x10aab14: jal   0x101cd70 addiu a0, a0, 13152
 	ldloc.1
-	ldc.i4 12692
+	ldc.i4 13152
 	add
 	stloc.1
 	ldloc.0
@@ -4052,19 +4052,19 @@ L_10aa4c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa4d4: 0x10aa4d4: addu  a1, v0, zero
+// 0x010aab1c: 0x10aab1c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010aa4d8: 0x10aa4d8: addu  a0, s2, zero
+// 0x010aab20: 0x10aab20: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-L_10aa4dc:
-// 0x010aa4dc: 0x10aa4dc: jal   0x1001b68 sll   zero, zero, 0
+L_10aab24:
+// 0x010aab24: 0x10aab24: jal   0x1001b68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcpy_1001b68(int32,int32)
@@ -4072,18 +4072,18 @@ L_10aa4dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa4e4: 0x10aa4e4: j	 0x10aa514 lui   a0, 0x10000
+// 0x010aab2c: 0x10aab2c: j	 0x10aab5c lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_10aa514
+	br L_10aab5c
 // --- basic block ---
-L_10aa4ec:
-// 0x010aa4ec: 0x10aa4ec: lui   a0, 0x20000
+L_10aab34:
+// 0x010aab34: 0x10aab34: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aa4f0: 0x10aa4f0: jal   0x101cd60 addiu a0, a0, 12740
+// 0x010aab38: 0x10aab38: jal   0x101cd70 addiu a0, a0, 13200
 	ldloc.1
-	ldc.i4 12740
+	ldc.i4 13200
 	add
 	stloc.1
 	ldloc.0
@@ -4091,26 +4091,26 @@ L_10aa4ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa4f8: 0x10aa4f8: lui   a1, 0x20000
+// 0x010aab40: 0x10aab40: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa4fc: 0x10aa4fc: addu  a0, s2, zero
+// 0x010aab44: 0x10aab44: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010aa500: 0x10aa500: addiu a1, a1, 22696
+// 0x010aab48: 0x10aab48: addiu a1, a1, 23156
 	ldloc.2
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.2
-// 0x010aa504: 0x10aa504: addu  a2, s1, zero
+// 0x010aab4c: 0x10aab4c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010aa508: 0x10aa508: jal   0x1000f64 addu  a3, v0, zero
+// 0x010aab50: 0x10aab50: jal   0x1000f64 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -4123,21 +4123,21 @@ L_10aa4ec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa510: 0x10aa510: lui   a0, 0x10000
+// 0x010aab58: 0x10aab58: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10aa514:
-// 0x010aa514: 0x10aa514: addiu a0, a0, -22672
+L_10aab5c:
+// 0x010aab5c: 0x10aab5c: addiu a0, a0, -22672
 	ldloc.1
 	ldc.i4 -22672
 	add
 	stloc.1
-// 0x010aa518: 0x10aa518: addiu a1, sp, 96
+// 0x010aab60: 0x10aab60: addiu a1, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc.2
-// 0x010aa51c: 0x10aa51c: jal   0x104bfe4 addiu a2, zero, 5
+// 0x010aab64: 0x10aab64: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -4145,28 +4145,28 @@ L_10aa514:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa524: 0x10aa524: jal   0x103788c sll   zero, zero, 0
+// 0x010aab6c: 0x10aab6c: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aa52c:
-// 0x010aa52c: 0x10aa52c: lw    ra, 484(sp)
-// 0x010aa530: 0x10aa530: addu  v0, s0, zero
+L_10aab74:
+// 0x010aab74: 0x10aab74: lw    ra, 484(sp)
+// 0x010aab78: 0x10aab78: addu  v0, s0, zero
 	ldloc 11
 	stloc 5
-// 0x010aa534: 0x10aa534: lw    s8, 480(sp)
+// 0x010aab7c: 0x10aab7c: lw    s8, 480(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4175,7 +4175,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010aa538: 0x10aa538: lw    s7, 476(sp)
+// 0x010aab80: 0x10aab80: lw    s7, 476(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4184,7 +4184,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010aa53c: 0x10aa53c: lw    s6, 472(sp)
+// 0x010aab84: 0x10aab84: lw    s6, 472(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4193,7 +4193,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010aa540: 0x10aa540: lw    s5, 468(sp)
+// 0x010aab88: 0x10aab88: lw    s5, 468(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4202,7 +4202,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010aa544: 0x10aa544: lw    s4, 464(sp)
+// 0x010aab8c: 0x10aab8c: lw    s4, 464(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4211,7 +4211,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aa548: 0x10aa548: lw    s3, 460(sp)
+// 0x010aab90: 0x10aab90: lw    s3, 460(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4220,7 +4220,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010aa54c: 0x10aa54c: lw    s2, 456(sp)
+// 0x010aab94: 0x10aab94: lw    s2, 456(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4229,7 +4229,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aa550: 0x10aa550: lw    s1, 452(sp)
+// 0x010aab98: 0x10aab98: lw    s1, 452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4238,7 +4238,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aa554: 0x10aa554: lw    s0, 448(sp)
+// 0x010aab9c: 0x10aab9c: lw    s0, 448(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4247,7 +4247,7 @@ L_10aa52c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aa558: 0x10aa558: jr    ra addiu sp, sp, 488
+// 0x010aaba0: 0x10aaba0: jr    ra addiu sp, sp, 488
 	ldloc.0
 	ldc.i4 488
 	add
@@ -4259,7 +4259,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_create_poi_res_10aa560(int32,int32,int32,int32,int32)
+.method public static int32 on_create_poi_res_10aaba8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
@@ -4306,36 +4306,36 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10aa560:
-// 0x010aa560: 0x10aa560: addiu sp, sp, -96
+L_10aaba8:
+// 0x010aaba8: 0x10aaba8: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010aa564: 0x10aa564: addu  a0, a1, zero
+// 0x010aabac: 0x10aabac: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010aa568: 0x10aa568: lui   a1, 0x0
+// 0x010aabb0: 0x10aabb0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aa56c: 0x10aa56c: addiu v0, zero, -1
+// 0x010aabb4: 0x10aabb4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010aa570: 0x10aa570: addiu a1, a1, 30268
+// 0x010aabb8: 0x10aabb8: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010aa574: 0x10aa574: addu  a2, zero, zero
+// 0x010aabbc: 0x10aabbc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa578: 0x10aa578: addiu a3, sp, 24
+// 0x010aabc0: 0x10aabc0: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x010aa57c: 0x10aa57c: sw    ra, 92(sp)
-// 0x010aa580: 0x10aa580: sw    s3, 88(sp)
+// 0x010aabc4: 0x10aabc4: sw    ra, 92(sp)
+// 0x010aabc8: 0x10aabc8: sw    s3, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4344,7 +4344,7 @@ L_10aa560:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aa584: 0x10aa584: sw    s2, 84(sp)
+// 0x010aabcc: 0x10aabcc: sw    s2, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4353,7 +4353,7 @@ L_10aa560:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa588: 0x10aa588: sw    s1, 80(sp)
+// 0x010aabd0: 0x10aabd0: sw    s1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4362,7 +4362,7 @@ L_10aa560:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aa58c: 0x10aa58c: sw    s0, 76(sp)
+// 0x010aabd4: 0x10aabd4: sw    s0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4371,7 +4371,7 @@ L_10aa560:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aa590: 0x10aa590: jal   0x106855c sw    v0, 16(sp)
+// 0x010aabd8: 0x10aabd8: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4385,37 +4385,37 @@ L_10aa560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010aa598: 0x10aa598: bne   v0, zero, 0x10aa5c4 lui   a1, 0x20000
+// 0x010aabe0: 0x10aabe0: bne   v0, zero, 0x10aac0c lui   a1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10aa5c4
+	brtrue L_10aac0c
 // --- basic block ---
-// 0x010aa5a0: 0x10aa5a0: lui   a3, 0x20000
+// 0x010aabe8: 0x10aabe8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa5a4: 0x10aa5a4: addiu a1, a1, 11604
+// 0x010aabec: 0x10aabec: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa5a8: 0x10aa5a8: addiu a3, a3, 12788
+// 0x010aabf0: 0x10aabf0: addiu a3, a3, 13248
 	ldloc 4
-	ldc.i4 12788
+	ldc.i4 13248
 	add
 	stloc 4
-// 0x010aa5ac: 0x10aa5ac: addiu a0, zero, 4
+// 0x010aabf4: 0x10aabf4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa5b0: 0x10aa5b0: addiu a2, zero, 199
+// 0x010aabf8: 0x10aabf8: addiu a2, zero, 199
 	ldc.i4 199
 	stloc.3
-// 0x010aa5b4: 0x10aa5b4: jal   0x100449c sw    v0, 64(sp)
+// 0x010aabfc: 0x10aabfc: jal   0x100449c sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4434,11 +4434,11 @@ L_10aa560:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010aa5bc: 0x10aa5bc: j	 0x10aa68c sll   zero, zero, 0
-	br L_10aa68c
+// 0x010aac04: 0x10aac04: j	 0x10aacd4 sll   zero, zero, 0
+	br L_10aacd4
 // --- basic block ---
-L_10aa5c4:
-// 0x010aa5c4: 0x10aa5c4: lw    v1, 24(sp)
+L_10aac0c:
+// 0x010aac0c: 0x10aac0c: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4447,38 +4447,38 @@ L_10aa5c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa5c8: 0x10aa5c8: sll   zero, zero, 0
-// 0x010aa5cc: 0x10aa5cc: slti  a0, v1, 101
+// 0x010aac10: 0x10aac10: sll   zero, zero, 0
+// 0x010aac14: 0x10aac14: slti  a0, v1, 101
 	ldloc 5
 	ldc.i4.s 101
 	clt
 	stloc.1
-// 0x010aa5d0: 0x10aa5d0: beq   a0, zero, 0x10aa690 lui   s3, 0x20000
+// 0x010aac18: 0x10aac18: beq   a0, zero, 0x10aacd8 lui   s3, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc 11
-	brfalse L_10aa690
+	brfalse L_10aacd8
 // --- basic block ---
-// 0x010aa5d8: 0x10aa5d8: lui   a3, 0x20000
+// 0x010aac20: 0x10aac20: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa5dc: 0x10aa5dc: addiu a3, a3, 12840
+// 0x010aac24: 0x10aac24: addiu a3, a3, 13300
 	ldloc 4
-	ldc.i4 12840
+	ldc.i4 13300
 	add
 	stloc 4
-// 0x010aa5e0: 0x10aa5e0: addiu a0, zero, 1
+// 0x010aac28: 0x10aac28: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010aa5e4: 0x10aa5e4: addiu a1, s3, 11604
+// 0x010aac2c: 0x10aac2c: addiu a1, s3, 12064
 	ldloc 11
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa5e8: 0x10aa5e8: addiu a2, zero, 205
+// 0x010aac30: 0x10aac30: addiu a2, zero, 205
 	ldc.i4 205
 	stloc.3
-// 0x010aa5ec: 0x10aa5ec: sw    v1, 16(sp)
+// 0x010aac34: 0x10aac34: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4487,7 +4487,7 @@ L_10aa5c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa5f0: 0x10aa5f0: jal   0x100449c sw    v0, 64(sp)
+// 0x010aac38: 0x10aac38: jal   0x100449c sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4506,7 +4506,7 @@ L_10aa5c4:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010aa5f8: 0x10aa5f8: lw    v1, 24(sp)
+// 0x010aac40: 0x10aac40: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4515,32 +4515,32 @@ L_10aa5c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa5fc: 0x10aa5fc: lui   s1, 0xf0000
+// 0x010aac44: 0x10aac44: lui   s1, 0xf0000
 	ldc.i4 983040
 	stloc 8
-// 0x010aa600: 0x10aa600: sll   v1, v1, 2
+// 0x010aac48: 0x10aac48: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010aa604: 0x10aa604: addiu s1, s1, -23344
+// 0x010aac4c: 0x10aac4c: addiu s1, s1, -22880
 	ldloc 8
-	ldc.i4 -23344
+	ldc.i4 -22880
 	add
 	stloc 8
-// 0x010aa608: 0x10aa608: addu  v1, v1, s1
+// 0x010aac50: 0x10aac50: addu  v1, v1, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x010aa60c: 0x10aa60c: lw    s0, 0(v1)
+// 0x010aac54: 0x10aac54: lw    s0, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010aa610: 0x10aa610: lw    v0, 64(sp)
+// 0x010aac58: 0x10aac58: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4549,21 +4549,21 @@ L_10aa5c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aa614: 0x10aa614: beq   s0, zero, 0x10aa690 addiu s2, sp, 28
+// 0x010aac5c: 0x10aac5c: beq   s0, zero, 0x10aacd8 addiu s2, sp, 28
 	ldloc 9
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 10
-	brfalse L_10aa690
+	brfalse L_10aacd8
 // --- basic block ---
-// 0x010aa61c: 0x10aa61c: addiu a0, zero, 70
+// 0x010aac64: 0x10aac64: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x010aa620: 0x10aa620: addu  a1, s0, zero
+// 0x010aac68: 0x10aac68: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010aa624: 0x10aa624: jal   0x1037c10 addu  a2, s2, zero
+// 0x010aac6c: 0x10aac6c: jal   0x1037c20 addu  a2, s2, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -4571,12 +4571,12 @@ L_10aa5c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010aa62c: 0x10aa62c: lw    v1, 24(sp)
+// 0x010aac74: 0x10aac74: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4585,10 +4585,10 @@ L_10aa5c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa630: 0x10aa630: lui   a3, 0x20000
+// 0x010aac78: 0x10aac78: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa634: 0x10aa634: sw    v1, 16(sp)
+// 0x010aac7c: 0x10aac7c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4597,7 +4597,7 @@ L_10aa5c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa638: 0x10aa638: lw    v1, 44(sp)
+// 0x010aac80: 0x10aac80: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4606,23 +4606,23 @@ L_10aa5c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa63c: 0x10aa63c: addiu a3, a3, 12868
+// 0x010aac84: 0x10aac84: addiu a3, a3, 13328
 	ldloc 4
-	ldc.i4 12868
+	ldc.i4 13328
 	add
 	stloc 4
-// 0x010aa640: 0x10aa640: addiu a1, s3, 11604
+// 0x010aac88: 0x10aac88: addiu a1, s3, 12064
 	ldloc 11
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa644: 0x10aa644: addiu a0, zero, 1
+// 0x010aac8c: 0x10aac8c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010aa648: 0x10aa648: addiu a2, zero, 211
+// 0x010aac90: 0x10aac90: addiu a2, zero, 211
 	ldc.i4 211
 	stloc.3
-// 0x010aa64c: 0x10aa64c: jal   0x100449c sw    v1, 20(sp)
+// 0x010aac94: 0x10aac94: jal   0x100449c sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4641,24 +4641,24 @@ L_10aa5c4:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010aa654: 0x10aa654: lui   v1, 0x10000
+// 0x010aac9c: 0x10aac9c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010aa658: 0x10aa658: addiu v1, v1, 32112
+// 0x010aaca0: 0x10aaca0: addiu v1, v1, 32576
 	ldloc 5
-	ldc.i4 32112
+	ldc.i4 32576
 	add
 	stloc 5
-// 0x010aa65c: 0x10aa65c: addu  a0, s0, zero
+// 0x010aaca4: 0x10aaca4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010aa660: 0x10aa660: addu  a2, s2, zero
+// 0x010aaca8: 0x10aaca8: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010aa664: 0x10aa664: addiu a1, zero, 70
+// 0x010aacac: 0x10aacac: addiu a1, zero, 70
 	ldc.i4.s 70
 	stloc.2
-// 0x010aa668: 0x10aa668: jal   0x1037cd8 sw    v1, 56(sp)
+// 0x010aacb0: 0x10aacb0: jal   0x1037ce8 sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4672,23 +4672,23 @@ L_10aa5c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_update_1037cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_update_1037ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010aa670: 0x10aa670: jal   0x103788c sll   zero, zero, 0
+// 0x010aacb8: 0x10aacb8: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010aa678: 0x10aa678: lw    v1, 24(sp)
+// 0x010aacc0: 0x10aacc0: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4697,26 +4697,26 @@ L_10aa5c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa67c: 0x10aa67c: sll   zero, zero, 0
-// 0x010aa680: 0x10aa680: sll   v1, v1, 2
+// 0x010aacc4: 0x10aacc4: sll   zero, zero, 0
+// 0x010aacc8: 0x10aacc8: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010aa684: 0x10aa684: addu  s1, v1, s1
+// 0x010aaccc: 0x10aaccc: addu  s1, v1, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x010aa688: 0x10aa688: sw    zero, 0(s1)
+// 0x010aacd0: 0x10aacd0: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10aa68c:
-// 0x010aa68c: 0x10aa68c: lw    v0, 64(sp)
+L_10aacd4:
+// 0x010aacd4: 0x10aacd4: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4725,9 +4725,9 @@ L_10aa68c:
 	add
 	ldelem.i4
 	stloc 7
-L_10aa690:
-// 0x010aa690: 0x10aa690: lw    ra, 92(sp)
-// 0x010aa694: 0x10aa694: lw    s3, 88(sp)
+L_10aacd8:
+// 0x010aacd8: 0x10aacd8: lw    ra, 92(sp)
+// 0x010aacdc: 0x10aacdc: lw    s3, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4736,7 +4736,7 @@ L_10aa690:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aa698: 0x10aa698: lw    s2, 84(sp)
+// 0x010aace0: 0x10aace0: lw    s2, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4745,7 +4745,7 @@ L_10aa690:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aa69c: 0x10aa69c: lw    s1, 80(sp)
+// 0x010aace4: 0x10aace4: lw    s1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4754,7 +4754,7 @@ L_10aa690:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aa6a0: 0x10aa6a0: lw    s0, 76(sp)
+// 0x010aace8: 0x10aace8: lw    s0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4763,7 +4763,7 @@ L_10aa690:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aa6a4: 0x10aa6a4: jr    ra addiu sp, sp, 96
+// 0x010aacec: 0x10aacec: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -4775,7 +4775,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_suggested_trips_10aa6ac(int32,int32,int32,int32,int32)
+.method public static int32 on_suggested_trips_10aacf4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 hi,int32 lo)
@@ -4843,11 +4843,11 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10aa6ac:
-// 0x010aa6ac: 0x10aa6ac: addiu v0, zero, 7
+L_10aacf4:
+// 0x010aacf4: 0x10aacf4: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x010aa6b0: 0x10aa6b0: div   a0, v0
+// 0x010aacf8: 0x10aacf8: div   a0, v0
 	ldloc.1
 	ldloc 5
 	ldloc.1
@@ -4856,12 +4856,12 @@ L_10aa6ac:
 	stloc 19
 	rem
 	stloc 18
-// 0x010aa6b4: 0x10aa6b4: addiu sp, sp, -1008
+// 0x010aacfc: 0x10aacfc: addiu sp, sp, -1008
 	ldloc.0
 	ldc.i4 -1008
 	add
 	stloc.0
-// 0x010aa6b8: 0x10aa6b8: sw    s3, 980(sp)
+// 0x010aad00: 0x10aad00: sw    s3, 980(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4870,10 +4870,10 @@ L_10aa6ac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aa6bc: 0x10aa6bc: lui   s3, 0x0
+// 0x010aad04: 0x10aad04: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010aa6c0: 0x10aa6c0: sw    s8, 1000(sp)
+// 0x010aad08: 0x10aad08: sw    s8, 1000(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4882,7 +4882,7 @@ L_10aa6ac:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010aa6c4: 0x10aa6c4: sw    s7, 996(sp)
+// 0x010aad0c: 0x10aad0c: sw    s7, 996(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4891,7 +4891,7 @@ L_10aa6ac:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010aa6c8: 0x10aa6c8: sw    s6, 992(sp)
+// 0x010aad10: 0x10aad10: sw    s6, 992(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4900,7 +4900,7 @@ L_10aa6ac:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010aa6cc: 0x10aa6cc: sw    s5, 988(sp)
+// 0x010aad14: 0x10aad14: sw    s5, 988(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4909,7 +4909,7 @@ L_10aa6ac:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010aa6d0: 0x10aa6d0: sw    s4, 984(sp)
+// 0x010aad18: 0x10aad18: sw    s4, 984(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4918,7 +4918,7 @@ L_10aa6ac:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010aa6d4: 0x10aa6d4: sw    s2, 976(sp)
+// 0x010aad1c: 0x10aad1c: sw    s2, 976(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4927,7 +4927,7 @@ L_10aa6ac:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aa6d8: 0x10aa6d8: sw    s1, 972(sp)
+// 0x010aad20: 0x10aad20: sw    s1, 972(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4936,7 +4936,7 @@ L_10aa6ac:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa6dc: 0x10aa6dc: sw    s0, 968(sp)
+// 0x010aad24: 0x10aad24: sw    s0, 968(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4945,46 +4945,46 @@ L_10aa6ac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aa6e0: 0x10aa6e0: sw    ra, 1004(sp)
-// 0x010aa6e4: 0x10aa6e4: addu  s0, a1, zero
+// 0x010aad28: 0x10aad28: sw    ra, 1004(sp)
+// 0x010aad2c: 0x10aad2c: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010aa6e8: 0x10aa6e8: addiu s3, s3, 28076
+// 0x010aad30: 0x10aad30: addiu s3, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 9
-// 0x010aa6ec: 0x10aa6ec: addu  s2, zero, zero
+// 0x010aad34: 0x10aad34: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010aa6f0: 0x10aa6f0: addiu s4, sp, 28
+// 0x010aad38: 0x10aad38: addiu s4, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 12
-// 0x010aa6f4: 0x10aa6f4: addiu s1, zero, 1
+// 0x010aad3c: 0x10aad3c: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x010aa6f8: 0x10aa6f8: addiu s8, zero, 256
+// 0x010aad40: 0x10aad40: addiu s8, zero, 256
 	ldc.i4 256
 	stloc 16
-// 0x010aa6fc: 0x10aa6fc: addiu s7, sp, 24
+// 0x010aad44: 0x10aad44: addiu s7, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-// 0x010aa700: 0x10aa700: addiu s6, zero, -1
+// 0x010aad48: 0x10aad48: addiu s6, zero, -1
 	ldc.i4.m1
 	stloc 14
-// 0x010aa704: 0x10aa704: addiu s5, sp, 288
+// 0x010aad4c: 0x10aad4c: addiu s5, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 13
-// 0x010aa708: 0x10aa708: mflo  lo
+// 0x010aad50: 0x10aad50: mflo  lo
 	ldloc 19
 	stloc 7
-// 0x010aa70c: 0x10aa70c: j	 0x10aa928 sw    v1, 960(sp)
+// 0x010aad54: 0x10aad54: j	 0x10aaf70 sw    v1, 960(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4993,10 +4993,10 @@ L_10aa6ac:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10aa928
+	br L_10aaf70
 // --- basic block ---
-L_10aa714:
-// 0x010aa714: 0x10aa714: div   s2, v1
+L_10aad5c:
+// 0x010aad5c: 0x10aad5c: div   s2, v1
 	ldloc 11
 	ldloc 7
 	ldloc 11
@@ -5005,36 +5005,36 @@ L_10aa714:
 	stloc 19
 	rem
 	stloc 18
-// 0x010aa718: 0x10aa718: mfhi  hi
+// 0x010aad60: 0x10aad60: mfhi  hi
 	ldloc 18
 	stloc 5
-// 0x010aa71c: 0x10aa71c: bne   v0, zero, 0x10aa730 addu  a0, s0, zero
+// 0x010aad64: 0x10aad64: bne   v0, zero, 0x10aad78 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_10aa730
+	brtrue L_10aad78
 // --- basic block ---
-// 0x010aa724: 0x10aa724: jal   0x108e4ec addu  a0, s4, zero
+// 0x010aad6c: 0x10aad6c: jal   0x108eb10 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Init_Record_108e4ec(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Init_Record_108eb10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010aa72c: 0x10aa72c: addu  a0, s0, zero
+// 0x010aad74: 0x10aad74: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_10aa730:
-// 0x010aa730: 0x10aa730: addu  a1, s3, zero
+L_10aad78:
+// 0x010aad78: 0x10aad78: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010aa734: 0x10aa734: addu  a2, zero, zero
+// 0x010aad7c: 0x10aad7c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa738: 0x10aa738: addu  a3, s4, zero
+// 0x010aad80: 0x10aad80: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x010aa73c: 0x10aa73c: jal   0x106855c sw    s1, 16(sp)
+// 0x010aad84: 0x10aad84: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5048,37 +5048,37 @@ L_10aa730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa744: 0x10aa744: bne   v0, zero, 0x10aa770 addu  s0, v0, zero
+// 0x010aad8c: 0x10aad8c: bne   v0, zero, 0x10aadb8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10aa770
+	brtrue L_10aadb8
 // --- basic block ---
-// 0x010aa74c: 0x10aa74c: lui   a1, 0x20000
+// 0x010aad94: 0x10aad94: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa750: 0x10aa750: lui   a3, 0x20000
+// 0x010aad98: 0x10aad98: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa754: 0x10aa754: addiu a1, a1, 11604
+// 0x010aad9c: 0x10aad9c: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa758: 0x10aa758: addiu a3, a3, 12920
+// 0x010aada0: 0x10aada0: addiu a3, a3, 13380
 	ldloc 4
-	ldc.i4 12920
+	ldc.i4 13380
 	add
 	stloc 4
-// 0x010aa75c: 0x10aa75c: addiu a0, zero, 4
+// 0x010aada4: 0x10aada4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa760: 0x10aa760: jal   0x100449c addiu a2, zero, 86
+// 0x010aada8: 0x10aada8: jal   0x100449c addiu a2, zero, 86
 	ldc.i4.s 86
 	stloc.3
 	ldloc.0
@@ -5091,25 +5091,25 @@ L_10aa730:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa768: 0x10aa768: j	 0x10aa944 sll   zero, zero, 0
-	br L_10aa944
+// 0x010aadb0: 0x10aadb0: j	 0x10aaf8c sll   zero, zero, 0
+	br L_10aaf8c
 // --- basic block ---
-L_10aa770:
-// 0x010aa770: 0x10aa770: addu  a0, v0, zero
+L_10aadb8:
+// 0x010aadb8: 0x10aadb8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa774: 0x10aa774: addiu a1, sp, 544
+// 0x010aadbc: 0x10aadbc: addiu a1, sp, 544
 	ldloc.0
 	ldc.i4 544
 	add
 	stloc.2
-// 0x010aa778: 0x10aa778: addu  a2, s7, zero
+// 0x010aadc0: 0x10aadc0: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x010aa77c: 0x10aa77c: addu  a3, s3, zero
+// 0x010aadc4: 0x10aadc4: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x010aa780: 0x10aa780: sw    s8, 24(sp)
+// 0x010aadc8: 0x10aadc8: sw    s8, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5118,7 +5118,7 @@ L_10aa770:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010aa784: 0x10aa784: jal   0x1068250 sw    s1, 16(sp)
+// 0x010aadcc: 0x10aadcc: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5132,18 +5132,18 @@ L_10aa770:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa78c: 0x10aa78c: bne   v0, zero, 0x10aa7c0 addu  s0, v0, zero
+// 0x010aadd4: 0x10aadd4: bne   v0, zero, 0x10aae08 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10aa7c0
+	brtrue L_10aae08
 // --- basic block ---
-// 0x010aa794: 0x10aa794: lw    v0, 28(sp)
+// 0x010aaddc: 0x10aaddc: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5152,13 +5152,13 @@ L_10aa770:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa798: 0x10aa798: lui   a1, 0x20000
+// 0x010aade0: 0x10aade0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa79c: 0x10aa79c: lui   a3, 0x20000
+// 0x010aade4: 0x10aade4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa7a0: 0x10aa7a0: sw    v0, 16(sp)
+// 0x010aade8: 0x10aade8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5167,28 +5167,28 @@ L_10aa770:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa7a4: 0x10aa7a4: addiu v0, sp, 288
+// 0x010aadec: 0x10aadec: addiu v0, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 5
-// 0x010aa7a8: 0x10aa7a8: addiu a1, a1, 11604
+// 0x010aadf0: 0x10aadf0: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa7ac: 0x10aa7ac: addiu a3, a3, 12976
+// 0x010aadf4: 0x10aadf4: addiu a3, a3, 13436
 	ldloc 4
-	ldc.i4 12976
+	ldc.i4 13436
 	add
 	stloc 4
-// 0x010aa7b0: 0x10aa7b0: addiu a0, zero, 4
+// 0x010aadf8: 0x10aadf8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa7b4: 0x10aa7b4: addiu a2, zero, 99
+// 0x010aadfc: 0x10aadfc: addiu a2, zero, 99
 	ldc.i4.s 99
 	stloc.3
-// 0x010aa7b8: 0x10aa7b8: j	 0x10aa804 sw    v0, 20(sp)
+// 0x010aae00: 0x10aae00: j	 0x10aae4c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5197,24 +5197,24 @@ L_10aa770:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10aa804
+	br L_10aae4c
 // --- basic block ---
-L_10aa7c0:
-// 0x010aa7c0: 0x10aa7c0: addu  a0, v0, zero
+L_10aae08:
+// 0x010aae08: 0x10aae08: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa7c4: 0x10aa7c4: addu  a1, s3, zero
+// 0x010aae0c: 0x10aae0c: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010aa7c8: 0x10aa7c8: addu  a2, zero, zero
+// 0x010aae10: 0x10aae10: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa7cc: 0x10aa7cc: addiu a3, sp, 800
+// 0x010aae14: 0x10aae14: addiu a3, sp, 800
 	ldloc.0
 	ldc.i4 800
 	add
 	stloc 4
-// 0x010aa7d0: 0x10aa7d0: jal   0x106855c sw    s1, 16(sp)
+// 0x010aae18: 0x10aae18: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5228,41 +5228,41 @@ L_10aa7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa7d8: 0x10aa7d8: bne   v0, zero, 0x10aa814 addu  s0, v0, zero
+// 0x010aae20: 0x10aae20: bne   v0, zero, 0x10aae5c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10aa814
+	brtrue L_10aae5c
 // --- basic block ---
-// 0x010aa7e0: 0x10aa7e0: lui   a1, 0x20000
+// 0x010aae28: 0x10aae28: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa7e4: 0x10aa7e4: lui   a3, 0x20000
+// 0x010aae2c: 0x10aae2c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa7e8: 0x10aa7e8: addiu a1, a1, 11604
+// 0x010aae30: 0x10aae30: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa7ec: 0x10aa7ec: addiu a3, a3, 13044
+// 0x010aae34: 0x10aae34: addiu a3, a3, 13504
 	ldloc 4
-	ldc.i4 13044
+	ldc.i4 13504
 	add
 	stloc 4
-// 0x010aa7f0: 0x10aa7f0: addiu a0, zero, 4
+// 0x010aae38: 0x10aae38: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa7f4: 0x10aa7f4: addiu a2, zero, 111
+// 0x010aae3c: 0x10aae3c: addiu a2, zero, 111
 	ldc.i4.s 111
 	stloc.3
-L_10aa7f8:
-// 0x010aa7f8: 0x10aa7f8: lw    v0, 28(sp)
+L_10aae40:
+// 0x010aae40: 0x10aae40: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5271,8 +5271,8 @@ L_10aa7f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa7fc: 0x10aa7fc: sll   zero, zero, 0
-// 0x010aa800: 0x10aa800: sw    v0, 16(sp)
+// 0x010aae44: 0x10aae44: sll   zero, zero, 0
+// 0x010aae48: 0x10aae48: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5281,8 +5281,8 @@ L_10aa7f8:
 	add
 	ldloc 5
 	stelem.i4
-L_10aa804:
-// 0x010aa804: 0x10aa804: jal   0x100449c sll   zero, zero, 0
+L_10aae4c:
+// 0x010aae4c: 0x10aae4c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5293,30 +5293,30 @@ L_10aa804:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa80c: 0x10aa80c: j	 0x10aa944 sll   zero, zero, 0
-	br L_10aa944
+// 0x010aae54: 0x10aae54: j	 0x10aaf8c sll   zero, zero, 0
+	br L_10aaf8c
 // --- basic block ---
-L_10aa814:
-// 0x010aa814: 0x10aa814: lui   a1, 0x0
+L_10aae5c:
+// 0x010aae5c: 0x10aae5c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aa818: 0x10aa818: addu  a0, v0, zero
+// 0x010aae60: 0x10aae60: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa81c: 0x10aa81c: addiu a1, a1, 30268
+// 0x010aae64: 0x10aae64: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010aa820: 0x10aa820: addu  a2, zero, zero
+// 0x010aae68: 0x10aae68: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa824: 0x10aa824: addiu a3, sp, 804
+// 0x010aae6c: 0x10aae6c: addiu a3, sp, 804
 	ldloc.0
 	ldc.i4 804
 	add
 	stloc 4
-// 0x010aa828: 0x10aa828: jal   0x106855c sw    s6, 16(sp)
+// 0x010aae70: 0x10aae70: jal   0x106856c sw    s6, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5330,55 +5330,55 @@ L_10aa814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa830: 0x10aa830: bne   v0, zero, 0x10aa854 addu  s0, v0, zero
+// 0x010aae78: 0x10aae78: bne   v0, zero, 0x10aae9c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10aa854
+	brtrue L_10aae9c
 // --- basic block ---
-// 0x010aa838: 0x10aa838: lui   a1, 0x20000
+// 0x010aae80: 0x10aae80: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa83c: 0x10aa83c: lui   a3, 0x20000
+// 0x010aae84: 0x10aae84: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa840: 0x10aa840: addiu a1, a1, 11604
+// 0x010aae88: 0x10aae88: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa844: 0x10aa844: addiu a3, a3, 13116
+// 0x010aae8c: 0x10aae8c: addiu a3, a3, 13576
 	ldloc 4
-	ldc.i4 13116
+	ldc.i4 13576
 	add
 	stloc 4
-// 0x010aa848: 0x10aa848: addiu a0, zero, 4
+// 0x010aae90: 0x10aae90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa84c: 0x10aa84c: j	 0x10aa7f8 addiu a2, zero, 123
+// 0x010aae94: 0x10aae94: j	 0x10aae40 addiu a2, zero, 123
 	ldc.i4.s 123
 	stloc.3
-	br L_10aa7f8
+	br L_10aae40
 // --- basic block ---
-L_10aa854:
-// 0x010aa854: 0x10aa854: addu  a0, v0, zero
+L_10aae9c:
+// 0x010aae9c: 0x10aae9c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa858: 0x10aa858: addu  a1, s5, zero
+// 0x010aaea0: 0x10aaea0: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x010aa85c: 0x10aa85c: addu  a2, s7, zero
+// 0x010aaea4: 0x10aaea4: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x010aa860: 0x10aa860: addu  a3, s3, zero
+// 0x010aaea8: 0x10aaea8: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x010aa864: 0x10aa864: sw    s8, 24(sp)
+// 0x010aaeac: 0x10aaeac: sw    s8, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5387,7 +5387,7 @@ L_10aa854:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010aa868: 0x10aa868: jal   0x1068250 sw    s1, 16(sp)
+// 0x010aaeb0: 0x10aaeb0: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5401,18 +5401,18 @@ L_10aa854:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa870: 0x10aa870: bne   v0, zero, 0x10aa8a0 addu  s0, v0, zero
+// 0x010aaeb8: 0x10aaeb8: bne   v0, zero, 0x10aaee8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10aa8a0
+	brtrue L_10aaee8
 // --- basic block ---
-// 0x010aa878: 0x10aa878: lw    v0, 28(sp)
+// 0x010aaec0: 0x10aaec0: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5421,29 +5421,29 @@ L_10aa854:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aa87c: 0x10aa87c: lui   a1, 0x20000
+// 0x010aaec4: 0x10aaec4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa880: 0x10aa880: lui   a3, 0x20000
+// 0x010aaec8: 0x10aaec8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa884: 0x10aa884: addiu a1, a1, 11604
+// 0x010aaecc: 0x10aaecc: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa888: 0x10aa888: addiu a3, a3, 13188
+// 0x010aaed0: 0x10aaed0: addiu a3, a3, 13648
 	ldloc 4
-	ldc.i4 13188
+	ldc.i4 13648
 	add
 	stloc 4
-// 0x010aa88c: 0x10aa88c: addiu a0, zero, 4
+// 0x010aaed4: 0x10aaed4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa890: 0x10aa890: addiu a2, zero, 136
+// 0x010aaed8: 0x10aaed8: addiu a2, zero, 136
 	ldc.i4 136
 	stloc.3
-// 0x010aa894: 0x10aa894: sw    v0, 16(sp)
+// 0x010aaedc: 0x10aaedc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5452,7 +5452,7 @@ L_10aa854:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aa898: 0x10aa898: j	 0x10aa804 sw    s5, 20(sp)
+// 0x010aaee0: 0x10aaee0: j	 0x10aae4c sw    s5, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5461,24 +5461,24 @@ L_10aa854:
 	add
 	ldloc 13
 	stelem.i4
-	br L_10aa804
+	br L_10aae4c
 // --- basic block ---
-L_10aa8a0:
-// 0x010aa8a0: 0x10aa8a0: addu  a0, v0, zero
+L_10aaee8:
+// 0x010aaee8: 0x10aaee8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa8a4: 0x10aa8a4: addu  a1, s3, zero
+// 0x010aaeec: 0x10aaeec: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010aa8a8: 0x10aa8a8: addu  a2, zero, zero
+// 0x010aaef0: 0x10aaef0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa8ac: 0x10aa8ac: addiu a3, sp, 808
+// 0x010aaef4: 0x10aaef4: addiu a3, sp, 808
 	ldloc.0
 	ldc.i4 808
 	add
 	stloc 4
-// 0x010aa8b0: 0x10aa8b0: jal   0x106855c sw    s1, 16(sp)
+// 0x010aaef8: 0x10aaef8: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5492,62 +5492,62 @@ L_10aa8a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa8b8: 0x10aa8b8: bne   v0, zero, 0x10aa8dc addu  s0, v0, zero
+// 0x010aaf00: 0x10aaf00: bne   v0, zero, 0x10aaf24 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10aa8dc
+	brtrue L_10aaf24
 // --- basic block ---
-// 0x010aa8c0: 0x10aa8c0: lui   a1, 0x20000
+// 0x010aaf08: 0x10aaf08: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa8c4: 0x10aa8c4: lui   a3, 0x20000
+// 0x010aaf0c: 0x10aaf0c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa8c8: 0x10aa8c8: addiu a1, a1, 11604
+// 0x010aaf10: 0x10aaf10: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa8cc: 0x10aa8cc: addiu a3, a3, 13256
+// 0x010aaf14: 0x10aaf14: addiu a3, a3, 13716
 	ldloc 4
-	ldc.i4 13256
+	ldc.i4 13716
 	add
 	stloc 4
-// 0x010aa8d0: 0x10aa8d0: addiu a0, zero, 4
+// 0x010aaf18: 0x10aaf18: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa8d4: 0x10aa8d4: j	 0x10aa7f8 addiu a2, zero, 148
+// 0x010aaf1c: 0x10aaf1c: j	 0x10aae40 addiu a2, zero, 148
 	ldc.i4 148
 	stloc.3
-	br L_10aa7f8
+	br L_10aae40
 // --- basic block ---
-L_10aa8dc:
-// 0x010aa8dc: 0x10aa8dc: lui   a1, 0x0
+L_10aaf24:
+// 0x010aaf24: 0x10aaf24: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aa8e0: 0x10aa8e0: addu  a0, v0, zero
+// 0x010aaf28: 0x10aaf28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aa8e4: 0x10aa8e4: addiu a1, a1, 30268
+// 0x010aaf2c: 0x10aaf2c: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010aa8e8: 0x10aa8e8: addu  a2, zero, zero
+// 0x010aaf30: 0x10aaf30: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aa8ec: 0x10aa8ec: addiu a3, sp, 812
+// 0x010aaf34: 0x10aaf34: addiu a3, sp, 812
 	ldloc.0
 	ldc.i4 812
 	add
 	stloc 4
-// 0x010aa8f0: 0x10aa8f0: jal   0x106855c sw    s6, 16(sp)
+// 0x010aaf38: 0x10aaf38: jal   0x106856c sw    s6, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5561,43 +5561,43 @@ L_10aa8dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa8f8: 0x10aa8f8: bne   v0, zero, 0x10aa91c addu  s0, v0, zero
+// 0x010aaf40: 0x10aaf40: bne   v0, zero, 0x10aaf64 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10aa91c
+	brtrue L_10aaf64
 // --- basic block ---
-// 0x010aa900: 0x10aa900: lui   a1, 0x20000
+// 0x010aaf48: 0x10aaf48: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aa904: 0x10aa904: lui   a3, 0x20000
+// 0x010aaf4c: 0x10aaf4c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aa908: 0x10aa908: addiu a1, a1, 11604
+// 0x010aaf50: 0x10aaf50: addiu a1, a1, 12064
 	ldloc.2
-	ldc.i4 11604
+	ldc.i4 12064
 	add
 	stloc.2
-// 0x010aa90c: 0x10aa90c: addiu a3, a3, 13336
+// 0x010aaf54: 0x10aaf54: addiu a3, a3, 13796
 	ldloc 4
-	ldc.i4 13336
+	ldc.i4 13796
 	add
 	stloc 4
-// 0x010aa910: 0x10aa910: addiu a0, zero, 4
+// 0x010aaf58: 0x10aaf58: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aa914: 0x10aa914: j	 0x10aa7f8 addiu a2, zero, 160
+// 0x010aaf5c: 0x10aaf5c: j	 0x10aae40 addiu a2, zero, 160
 	ldc.i4 160
 	stloc.3
-	br L_10aa7f8
+	br L_10aae40
 // --- basic block ---
-L_10aa91c:
-// 0x010aa91c: 0x10aa91c: jal   0x108eba0 addu  a0, s4, zero
+L_10aaf64:
+// 0x010aaf64: 0x10aaf64: jal   0x108f1c4 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -5605,18 +5605,18 @@ L_10aa91c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeAltRoutes_Add_Route_108eba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Add_Route_108f1c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aa924: 0x10aa924: addiu s2, s2, 1
+// 0x010aaf6c: 0x10aaf6c: addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_10aa928:
-// 0x010aa928: 0x10aa928: lw    v1, 960(sp)
+L_10aaf70:
+// 0x010aaf70: 0x10aaf70: lw    v1, 960(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5625,35 +5625,35 @@ L_10aa928:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aa92c: 0x10aa92c: sll   zero, zero, 0
-// 0x010aa930: 0x10aa930: slt   v0, s2, v1
+// 0x010aaf74: 0x10aaf74: sll   zero, zero, 0
+// 0x010aaf78: 0x10aaf78: slt   v0, s2, v1
 	ldloc 11
 	ldloc 7
 	clt
 	stloc 5
-// 0x010aa934: 0x10aa934: bne   v0, zero, 0x10aa714 addiu v1, zero, 7
+// 0x010aaf7c: 0x10aaf7c: bne   v0, zero, 0x10aad5c addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 7
-	brtrue L_10aa714
+	brtrue L_10aad5c
 // --- basic block ---
-// 0x010aa93c: 0x10aa93c: jal   0x1046684 sll   zero, zero, 0
+// 0x010aaf84: 0x10aaf84: jal   0x1046694 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::roadmap_alternative_routes_suggested_trip_1046684(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::roadmap_alternative_routes_suggested_trip_1046694(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aa944:
-// 0x010aa944: 0x10aa944: lw    ra, 1004(sp)
-// 0x010aa948: 0x10aa948: addu  v0, s0, zero
+L_10aaf8c:
+// 0x010aaf8c: 0x10aaf8c: lw    ra, 1004(sp)
+// 0x010aaf90: 0x10aaf90: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010aa94c: 0x10aa94c: lw    s8, 1000(sp)
+// 0x010aaf94: 0x10aaf94: lw    s8, 1000(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5662,7 +5662,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010aa950: 0x10aa950: lw    s7, 996(sp)
+// 0x010aaf98: 0x10aaf98: lw    s7, 996(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5671,7 +5671,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010aa954: 0x10aa954: lw    s6, 992(sp)
+// 0x010aaf9c: 0x10aaf9c: lw    s6, 992(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5680,7 +5680,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010aa958: 0x10aa958: lw    s5, 988(sp)
+// 0x010aafa0: 0x10aafa0: lw    s5, 988(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5689,7 +5689,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010aa95c: 0x10aa95c: lw    s4, 984(sp)
+// 0x010aafa4: 0x10aafa4: lw    s4, 984(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5698,7 +5698,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010aa960: 0x10aa960: lw    s3, 980(sp)
+// 0x010aafa8: 0x10aafa8: lw    s3, 980(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5707,7 +5707,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aa964: 0x10aa964: lw    s2, 976(sp)
+// 0x010aafac: 0x10aafac: lw    s2, 976(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5716,7 +5716,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aa968: 0x10aa968: lw    s1, 972(sp)
+// 0x010aafb0: 0x10aafb0: lw    s1, 972(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5725,7 +5725,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aa96c: 0x10aa96c: lw    s0, 968(sp)
+// 0x010aafb4: 0x10aafb4: lw    s0, 968(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5734,7 +5734,7 @@ L_10aa944:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aa970: 0x10aa970: jr    ra addiu sp, sp, 1008
+// 0x010aafb8: 0x10aafb8: jr    ra addiu sp, sp, 1008
 	ldloc.0
 	ldc.i4 1008
 	add
@@ -5746,7 +5746,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void completed_10aa978()
+.method public static void completed_10aafc0()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -5757,12 +5757,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aa978: 0x10aa978: jr    ra sll   zero, zero, 0
+// 0x010aafc0: 0x10aafc0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_geo_config_get_server_id_10aa980(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_get_server_id_10aafc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5797,16 +5797,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aa980: 0x10aa980: lui   a0, 0x0
+// 0x010aafc8: 0x10aafc8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aa984: 0x10aa984: addiu sp, sp, -24
+// 0x010aafcc: 0x10aafcc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010aa988: 0x10aa988: sw    ra, 20(sp)
-// 0x010aa98c: 0x10aa98c: jal   0x100e348 addiu a0, a0, 18716
+// 0x010aafd0: 0x10aafd0: sw    ra, 20(sp)
+// 0x010aafd4: 0x10aafd4: jal   0x100e358 addiu a0, a0, 18716
 	ldloc.1
 	ldc.i4 18716
 	add
@@ -5816,14 +5816,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010aa994: 0x10aa994: lw    ra, 20(sp)
-// 0x010aa998: 0x10aa998: sll   zero, zero, 0
-// 0x010aa99c: 0x10aa99c: jr    ra addiu sp, sp, 24
+// 0x010aafdc: 0x10aafdc: lw    ra, 20(sp)
+// 0x010aafe0: 0x10aafe0: sll   zero, zero, 0
+// 0x010aafe4: 0x10aafe4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5835,7 +5835,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_geo_config_get_version_10aa9a4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_get_version_10aafec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5870,16 +5870,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aa9a4: 0x10aa9a4: lui   a0, 0x0
+// 0x010aafec: 0x10aafec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aa9a8: 0x10aa9a8: addiu sp, sp, -24
+// 0x010aaff0: 0x10aaff0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010aa9ac: 0x10aa9ac: sw    ra, 20(sp)
-// 0x010aa9b0: 0x10aa9b0: jal   0x100e348 addiu a0, a0, 18748
+// 0x010aaff4: 0x10aaff4: sw    ra, 20(sp)
+// 0x010aaff8: 0x10aaff8: jal   0x100e358 addiu a0, a0, 18748
 	ldloc.1
 	ldc.i4 18748
 	add
@@ -5889,14 +5889,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010aa9b8: 0x10aa9b8: lw    ra, 20(sp)
-// 0x010aa9bc: 0x10aa9bc: sll   zero, zero, 0
-// 0x010aa9c0: 0x10aa9c0: jr    ra addiu sp, sp, 24
+// 0x010ab000: 0x10ab000: lw    ra, 20(sp)
+// 0x010ab004: 0x10ab004: sll   zero, zero, 0
+// 0x010ab008: 0x10ab008: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5908,7 +5908,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_geo_config_init_10aa9c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_init_10ab010(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -5952,12 +5952,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aa9c8: 0x10aa9c8: addiu sp, sp, -40
+// 0x010ab010: 0x10ab010: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010aa9cc: 0x10aa9cc: sw    s2, 32(sp)
+// 0x010ab014: 0x10ab014: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5966,28 +5966,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aa9d0: 0x10aa9d0: lui   s2, 0x80000
-	ldc.i4 524288
+// 0x010ab018: 0x10ab018: lui   s2, 0x90000
+	ldc.i4 589824
 	stloc 10
-// 0x010aa9d4: 0x10aa9d4: lui   v0, 0x90000
+// 0x010ab01c: 0x10ab01c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010aa9d8: 0x10aa9d8: lw    v1, 32688(s2)
+// 0x010ab020: 0x10ab020: lw    v1, -32384(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 8172
+	ldc.i4 -8096
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aa9dc: 0x10aa9dc: addiu v0, v0, -32628
+// 0x010ab024: 0x10ab024: addiu v0, v0, -32164
 	ldloc 5
-	ldc.i4 -32628
+	ldc.i4 -32164
 	add
 	stloc 5
-// 0x010aa9e0: 0x10aa9e0: sw    ra, 36(sp)
-// 0x010aa9e4: 0x10aa9e4: sw    s1, 28(sp)
+// 0x010ab028: 0x10ab028: sw    ra, 36(sp)
+// 0x010ab02c: 0x10ab02c: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5996,7 +5996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aa9e8: 0x10aa9e8: sw    s0, 24(sp)
+// 0x010ab030: 0x10ab030: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6005,7 +6005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aa9ec: 0x10aa9ec: sw    zero, 104(v0)
+// 0x010ab034: 0x10ab034: sw    zero, 104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6014,13 +6014,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010aa9f0: 0x10aa9f0: sb    zero, 4(v0)
+// 0x010ab038: 0x10ab038: sb    zero, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010aa9f4: 0x10aa9f4: bne   v1, zero, 0x10aaaa8 sw    zero, 108(v0)
+// 0x010ab03c: 0x10ab03c: bne   v1, zero, 0x10ab0f0 sw    zero, 108(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
@@ -6030,33 +6030,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_10aaaa8
+	brtrue L_10ab0f0
 // --- basic block ---
-// 0x010aa9fc: 0x10aa9fc: lui   s0, 0x10000
+// 0x010ab044: 0x10ab044: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010aaa00: 0x10aaa00: lui   s1, 0x10000
+// 0x010ab048: 0x10ab048: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010aaa04: 0x10aaa04: lui   a1, 0x0
+// 0x010ab04c: 0x10ab04c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aaa08: 0x10aaa08: addiu a1, a1, 18732
+// 0x010ab050: 0x10ab050: addiu a1, a1, 18732
 	ldloc.2
 	ldc.i4 18732
 	add
 	stloc.2
-// 0x010aaa0c: 0x10aaa0c: addiu a0, s0, 12560
+// 0x010ab054: 0x10ab054: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010aaa10: 0x10aaa10: addiu a2, s1, 18500
+// 0x010ab058: 0x10ab058: addiu a2, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010aaa14: 0x10aaa14: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ab05c: 0x10ab05c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6064,33 +6064,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaa1c: 0x10aaa1c: lui   a1, 0x0
+// 0x010ab064: 0x10ab064: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aaa20: 0x10aaa20: lui   a2, 0x10000
+// 0x010ab068: 0x10ab068: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010aaa24: 0x10aaa24: addiu a1, a1, 18716
+// 0x010ab06c: 0x10ab06c: addiu a1, a1, 18716
 	ldloc.2
 	ldc.i4 18716
 	add
 	stloc.2
-// 0x010aaa28: 0x10aaa28: addiu a2, a2, 9424
+// 0x010ab070: 0x10ab070: addiu a2, a2, 9420
 	ldloc.3
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.3
-// 0x010aaa2c: 0x10aaa2c: addiu a0, s0, 12560
+// 0x010ab074: 0x10ab074: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010aaa30: 0x10aaa30: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ab078: 0x10ab078: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6098,33 +6098,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaa38: 0x10aaa38: lui   a1, 0x0
+// 0x010ab080: 0x10ab080: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aaa3c: 0x10aaa3c: lui   a2, 0x10000
+// 0x010ab084: 0x10ab084: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010aaa40: 0x10aaa40: addiu a1, a1, 18748
+// 0x010ab088: 0x10ab088: addiu a1, a1, 18748
 	ldloc.2
 	ldc.i4 18748
 	add
 	stloc.2
-// 0x010aaa44: 0x10aaa44: addiu a2, a2, -48
+// 0x010ab08c: 0x10ab08c: addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x010aaa48: 0x10aaa48: addiu a0, s0, 12560
+// 0x010ab090: 0x10ab090: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010aaa4c: 0x10aaa4c: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ab094: 0x10ab094: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6132,30 +6132,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaa54: 0x10aaa54: lui   a1, 0x0
+// 0x010ab09c: 0x10ab09c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aaa58: 0x10aaa58: addiu a1, a1, 18764
+// 0x010ab0a0: 0x10ab0a0: addiu a1, a1, 18764
 	ldloc.2
 	ldc.i4 18764
 	add
 	stloc.2
-// 0x010aaa5c: 0x10aaa5c: addiu a0, s0, 12560
+// 0x010ab0a4: 0x10ab0a4: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010aaa60: 0x10aaa60: addiu a2, s1, 18500
+// 0x010ab0a8: 0x10ab0a8: addiu a2, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010aaa64: 0x10aaa64: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ab0ac: 0x10ab0ac: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6163,30 +6163,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaa6c: 0x10aaa6c: lui   a1, 0x0
+// 0x010ab0b4: 0x10ab0b4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aaa70: 0x10aaa70: addiu a0, s0, 12560
+// 0x010ab0b8: 0x10ab0b8: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010aaa74: 0x10aaa74: addiu a1, a1, 18780
+// 0x010ab0bc: 0x10ab0bc: addiu a1, a1, 18780
 	ldloc.2
 	ldc.i4 18780
 	add
 	stloc.2
-// 0x010aaa78: 0x10aaa78: addiu a2, s1, 18500
+// 0x010ab0c0: 0x10ab0c0: addiu a2, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010aaa7c: 0x10aaa7c: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ab0c4: 0x10ab0c4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6194,33 +6194,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaa84: 0x10aaa84: lui   a0, 0x10000
+// 0x010ab0cc: 0x10ab0cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010aaa88: 0x10aaa88: lui   a1, 0x0
+// 0x010ab0d0: 0x10ab0d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010aaa8c: 0x10aaa8c: addiu a0, a0, 18248
+// 0x010ab0d4: 0x10ab0d4: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x010aaa90: 0x10aaa90: addiu a1, a1, 18796
+// 0x010ab0d8: 0x10ab0d8: addiu a1, a1, 18796
 	ldloc.2
 	ldc.i4 18796
 	add
 	stloc.2
-// 0x010aaa94: 0x10aaa94: addiu a2, s1, 18500
+// 0x010ab0dc: 0x10ab0dc: addiu a2, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010aaa98: 0x10aaa98: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ab0e0: 0x10ab0e0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6228,28 +6228,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaaa0: 0x10aaaa0: addiu v0, zero, 1
+// 0x010ab0e8: 0x10ab0e8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010aaaa4: 0x10aaaa4: sw    v0, 32688(s2)
+// 0x010ab0ec: 0x10ab0ec: sw    v0, -32384(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 8172
+	ldc.i4 -8096
 	add
 	ldloc 5
 	stelem.i4
-L_10aaaa8:
-// 0x010aaaa8: 0x10aaaa8: lui   a0, 0x0
+L_10ab0f0:
+// 0x010ab0f0: 0x10ab0f0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aaaac: 0x10aaaac: jal   0x100e348 addiu a0, a0, 18732
+// 0x010ab0f4: 0x10ab0f4: jal   0x100e358 addiu a0, a0, 18732
 	ldloc.1
 	ldc.i4 18732
 	add
@@ -6259,42 +6259,42 @@ L_10aaaa8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaab4: 0x10aaab4: lui   s1, 0x80000
-	ldc.i4 524288
+// 0x010ab0fc: 0x10ab0fc: lui   s1, 0x90000
+	ldc.i4 589824
 	stloc 9
-// 0x010aaab8: 0x10aaab8: addu  s0, v0, zero
+// 0x010ab100: 0x10ab100: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010aaabc: 0x10aaabc: lw    v0, 32684(s1)
+// 0x010ab104: 0x10ab104: lw    v0, -32388(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 8171
+	ldc.i4 -8097
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aaac0: 0x10aaac0: sll   zero, zero, 0
-// 0x010aaac4: 0x10aaac4: bne   v0, zero, 0x10aaae4 lui   v0, 0x80000
+// 0x010ab108: 0x10ab108: sll   zero, zero, 0
+// 0x010ab10c: 0x10ab10c: bne   v0, zero, 0x10ab12c lui   v0, 0x90000
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 5
-	brtrue L_10aaae4
+	brtrue L_10ab12c
 // --- basic block ---
-// 0x010aaacc: 0x10aaacc: lui   a1, 0x10000
+// 0x010ab114: 0x10ab114: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010aaad0: 0x10aaad0: addiu a1, a1, -28184
+// 0x010ab118: 0x10ab118: addiu a1, a1, -28184
 	ldloc.2
 	ldc.i4 -28184
 	add
 	stloc.2
-// 0x010aaad4: 0x10aaad4: jal   0x106a1ac addu  a0, s0, zero
+// 0x010ab11c: 0x10ab11c: jal   0x106a798 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6302,60 +6302,60 @@ L_10aaaa8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_init_106a1ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_init_106a798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aaadc: 0x10aaadc: sw    v0, 32684(s1)
+// 0x010ab124: 0x10ab124: sw    v0, -32388(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 8171
+	ldc.i4 -8097
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aaae0: 0x10aaae0: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010ab128: 0x10ab128: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-L_10aaae4:
-// 0x010aaae4: 0x10aaae4: lw    v0, 32684(v0)
+L_10ab12c:
+// 0x010ab12c: 0x10ab12c: lw    v0, -32388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 8171
+	ldc.i4 -8097
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aaae8: 0x10aaae8: sll   zero, zero, 0
-// 0x010aaaec: 0x10aaaec: beq   v0, zero, 0x10aab18 lui   a1, 0x20000
+// 0x010ab130: 0x10ab130: sll   zero, zero, 0
+// 0x010ab134: 0x10ab134: beq   v0, zero, 0x10ab160 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10aab18
+	brfalse L_10ab160
 // --- basic block ---
-// 0x010aaaf4: 0x10aaaf4: lui   a3, 0x20000
+// 0x010ab13c: 0x10ab13c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aaaf8: 0x10aaaf8: addiu a1, a1, 13476
+// 0x010ab140: 0x10ab140: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aaafc: 0x10aaafc: addiu a3, a3, 13508
+// 0x010ab144: 0x10ab144: addiu a3, a3, 13968
 	ldloc 4
-	ldc.i4 13508
+	ldc.i4 13968
 	add
 	stloc 4
-// 0x010aab00: 0x10aab00: addiu a0, zero, 1
+// 0x010ab148: 0x10ab148: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010aab04: 0x10aab04: addiu a2, zero, 990
+// 0x010ab14c: 0x10ab14c: addiu a2, zero, 990
 	ldc.i4 990
 	stloc.3
-// 0x010aab08: 0x10aab08: jal   0x100449c sw    s0, 16(sp)
+// 0x010ab150: 0x10ab150: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6374,27 +6374,27 @@ L_10aaae4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aab10: 0x10aab10: j	 0x10aab30 sll   zero, zero, 0
-	br L_10aab30
+// 0x010ab158: 0x10ab158: j	 0x10ab178 sll   zero, zero, 0
+	br L_10ab178
 // --- basic block ---
-L_10aab18:
-// 0x010aab18: 0x10aab18: lui   a3, 0x10000
+L_10ab160:
+// 0x010ab160: 0x10ab160: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010aab1c: 0x10aab1c: addiu a1, a1, 13476
+// 0x010ab164: 0x10ab164: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aab20: 0x10aab20: addiu a3, a3, -8240
+// 0x010ab168: 0x10ab168: addiu a3, a3, -8244
 	ldloc 4
-	ldc.i4 -8240
+	ldc.i4 -8244
 	add
 	stloc 4
-// 0x010aab24: 0x10aab24: addiu a0, zero, 4
+// 0x010ab16c: 0x10ab16c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aab28: 0x10aab28: jal   0x100449c addiu a2, zero, 996
+// 0x010ab170: 0x10ab170: jal   0x100449c addiu a2, zero, 996
 	ldc.i4 996
 	stloc.3
 	ldloc.0
@@ -6407,9 +6407,9 @@ L_10aab18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aab30:
-// 0x010aab30: 0x10aab30: lw    ra, 36(sp)
-// 0x010aab34: 0x10aab34: lw    s2, 32(sp)
+L_10ab178:
+// 0x010ab178: 0x10ab178: lw    ra, 36(sp)
+// 0x010ab17c: 0x10ab17c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6418,7 +6418,7 @@ L_10aab30:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aab38: 0x10aab38: lw    s1, 28(sp)
+// 0x010ab180: 0x10ab180: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6427,7 +6427,7 @@ L_10aab30:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aab3c: 0x10aab3c: lw    s0, 24(sp)
+// 0x010ab184: 0x10ab184: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6436,7 +6436,7 @@ L_10aab30:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aab40: 0x10aab40: jr    ra addiu sp, sp, 40
+// 0x010ab188: 0x10ab188: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6448,7 +6448,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_config_fixed_location_10aab48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_fixed_location_10ab190(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -6495,13 +6495,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aab48: 0x10aab48: addiu sp, sp, -48
+// 0x010ab190: 0x10ab190: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010aab4c: 0x10aab4c: sw    ra, 44(sp)
-// 0x010aab50: 0x10aab50: sw    s3, 40(sp)
+// 0x010ab194: 0x10ab194: sw    ra, 44(sp)
+// 0x010ab198: 0x10ab198: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6510,7 +6510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aab54: 0x10aab54: sw    s2, 36(sp)
+// 0x010ab19c: 0x10ab19c: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6519,13 +6519,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aab58: 0x10aab58: addu  s3, a2, zero
+// 0x010ab1a0: 0x10ab1a0: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010aab5c: 0x10aab5c: addu  s2, a0, zero
+// 0x010ab1a4: 0x10ab1a4: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010aab60: 0x10aab60: sw    s1, 32(sp)
+// 0x010ab1a8: 0x10ab1a8: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6534,7 +6534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aab64: 0x10aab64: sw    s0, 28(sp)
+// 0x010ab1ac: 0x10ab1ac: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6543,10 +6543,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aab68: 0x10aab68: addu  s1, a1, zero
+// 0x010ab1b0: 0x10ab1b0: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010aab6c: 0x10aab6c: jal   0x10aa9c8 lui   s0, 0x20000
+// 0x010ab1b4: 0x10ab1b4: jal   0x10ab010 lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
 	ldloc.0
@@ -6554,43 +6554,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_init_10aa9c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_init_10ab010(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aab74: 0x10aab74: lui   a3, 0x20000
+// 0x010ab1bc: 0x10ab1bc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aab78: 0x10aab78: lui   v0, 0x90000
+// 0x010ab1c0: 0x10ab1c0: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 6
-// 0x010aab7c: 0x10aab7c: addiu a0, zero, 2
+// 0x010ab1c4: 0x10ab1c4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010aab80: 0x10aab80: addiu a1, s0, 13476
+// 0x010ab1c8: 0x10ab1c8: addiu a1, s0, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aab84: 0x10aab84: addiu a2, zero, 1094
+// 0x010ab1cc: 0x10ab1cc: addiu a2, zero, 1094
 	ldc.i4 1094
 	stloc.3
-// 0x010aab88: 0x10aab88: addiu a3, a3, 13564
+// 0x010ab1d0: 0x10ab1d0: addiu a3, a3, 14024
 	ldloc 4
-	ldc.i4 13564
+	ldc.i4 14024
 	add
 	stloc 4
-// 0x010aab8c: 0x10aab8c: sw    s3, -32504(v0)
+// 0x010ab1d4: 0x10ab1d4: sw    s3, -32040(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aab90: 0x10aab90: jal   0x100449c sw    s1, 16(sp)
+// 0x010ab1d8: 0x10ab1d8: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6609,22 +6609,22 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aab98: 0x10aab98: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010ab1e0: 0x10ab1e0: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 6
-// 0x010aab9c: 0x10aab9c: lw    a2, 32684(v0)
+// 0x010ab1e4: 0x10ab1e4: lw    a2, -32388(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8171
+	ldc.i4 -8097
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aaba0: 0x10aaba0: addu  a0, s2, zero
+// 0x010ab1e8: 0x10ab1e8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010aaba4: 0x10aaba4: jal   0x106b68c addu  a1, s1, zero
+// 0x010ab1ec: 0x10ab1ec: jal   0x106bcb0 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6632,31 +6632,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_GetGeoConfig_106b68c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_GetGeoConfig_106bcb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aabac: 0x10aabac: bne   v0, zero, 0x10aabec lui   a3, 0x20000
+// 0x010ab1f4: 0x10ab1f4: bne   v0, zero, 0x10ab234 lui   a3, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10aabec
+	brtrue L_10ab234
 // --- basic block ---
-// 0x010aabb4: 0x10aabb4: addiu a1, s0, 13476
+// 0x010ab1fc: 0x10ab1fc: addiu a1, s0, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aabb8: 0x10aabb8: addiu a3, a3, 13604
+// 0x010ab200: 0x10ab200: addiu a3, a3, 14064
 	ldloc 4
-	ldc.i4 13604
+	ldc.i4 14064
 	add
 	stloc 4
-// 0x010aabbc: 0x10aabbc: addiu a2, zero, 1096
+// 0x010ab204: 0x10ab204: addiu a2, zero, 1096
 	ldc.i4 1096
 	stloc.3
-// 0x010aabc0: 0x10aabc0: jal   0x100449c addiu a0, zero, 4
+// 0x010ab208: 0x10ab208: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -6669,20 +6669,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aabc8: 0x10aabc8: lui   a0, 0x0
+// 0x010ab210: 0x10ab210: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aabcc: 0x10aabcc: lui   a1, 0x20000
+// 0x010ab214: 0x10ab214: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aabd0: 0x10aabd0: addiu a0, a0, 30092
+// 0x010ab218: 0x10ab218: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010aabd4: 0x10aabd4: jal   0x104c148 addiu a1, a1, 13640
+// 0x010ab21c: 0x10ab21c: jal   0x104c158 addiu a1, a1, 14100
 	ldloc.2
-	ldc.i4 13640
+	ldc.i4 14100
 	add
 	stloc.2
 	ldloc.0
@@ -6690,30 +6690,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aabdc: 0x10aabdc: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010ab224: 0x10ab224: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aabe4: 0x10aabe4: j	 0x10aabfc sll   zero, zero, 0
-	br L_10aabfc
+// 0x010ab22c: 0x10ab22c: j	 0x10ab244 sll   zero, zero, 0
+	br L_10ab244
 // --- basic block ---
-L_10aabec:
-// 0x010aabec: 0x10aabec: lui   a1, 0x10b0000
+L_10ab234:
+// 0x010ab234: 0x10ab234: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010aabf0: 0x10aabf0: addiu a1, a1, -15712
+// 0x010ab238: 0x10ab238: addiu a1, a1, -14104
 	ldloc.2
-	ldc.i4 -15712
+	ldc.i4 -14104
 	add
 	stloc.2
-// 0x010aabf4: 0x10aabf4: jal   0x104fe98 ori   a0, zero, 60000
+// 0x010ab23c: 0x10ab23c: jal   0x104fea8 ori   a0, zero, 60000
 	ldc.i4.s 0
 	ldc.i4 60000
 	or
@@ -6723,14 +6723,14 @@ L_10aabec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10aabfc:
-// 0x010aabfc: 0x10aabfc: lw    ra, 44(sp)
-// 0x010aac00: 0x10aac00: lw    s3, 40(sp)
+L_10ab244:
+// 0x010ab244: 0x10ab244: lw    ra, 44(sp)
+// 0x010ab248: 0x10ab248: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6739,7 +6739,7 @@ L_10aabfc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aac04: 0x10aac04: lw    s2, 36(sp)
+// 0x010ab24c: 0x10ab24c: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6748,7 +6748,7 @@ L_10aabfc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aac08: 0x10aac08: lw    s1, 32(sp)
+// 0x010ab250: 0x10ab250: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6757,7 +6757,7 @@ L_10aabfc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aac0c: 0x10aac0c: lw    s0, 28(sp)
+// 0x010ab254: 0x10ab254: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6766,7 +6766,7 @@ L_10aabfc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aac10: 0x10aac10: jr    ra addiu sp, sp, 48
+// 0x010ab258: 0x10ab258: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6778,7 +6778,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_geo_config_other_10aac18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_other_10ab260(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -6813,15 +6813,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aac18: 0x10aac18: addiu sp, sp, -40
+// 0x010ab260: 0x10ab260: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010aac1c: 0x10aac1c: addu  a2, a0, zero
+// 0x010ab264: 0x10ab264: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010aac20: 0x10aac20: sw    a2, 24(sp)
+// 0x010ab268: 0x10ab268: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6830,8 +6830,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010aac24: 0x10aac24: sw    ra, 36(sp)
-// 0x010aac28: 0x10aac28: jal   0x1094a94 addu  a0, zero, zero
+// 0x010ab26c: 0x10ab26c: sw    ra, 36(sp)
+// 0x010ab270: 0x10ab270: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6839,24 +6839,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aac30: 0x10aac30: lui   a0, 0x20000
+// 0x010ab278: 0x10ab278: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aac34: 0x10aac34: jal   0x104c3d0 addiu a0, a0, 13684
+// 0x010ab27c: 0x10ab27c: jal   0x104c3e0 addiu a0, a0, 14144
 	ldloc.1
-	ldc.i4 13684
+	ldc.i4 14144
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 6
 // --- basic block ---
-// 0x010aac3c: 0x10aac3c: lw    a2, 24(sp)
+// 0x010ab284: 0x10ab284: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6865,33 +6865,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aac40: 0x10aac40: sll   zero, zero, 0
-// 0x010aac44: 0x10aac44: bne   a2, zero, 0x10aac54 lui   a1, 0x20000
+// 0x010ab288: 0x10ab288: sll   zero, zero, 0
+// 0x010ab28c: 0x10ab28c: bne   a2, zero, 0x10ab29c lui   a1, 0x20000
 	ldloc.3
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10aac54
+	brtrue L_10ab29c
 // --- basic block ---
-// 0x010aac4c: 0x10aac4c: lui   a2, 0x10b0000
+// 0x010ab294: 0x10ab294: lui   a2, 0x10b0000
 	ldc.i4 17498112
 	stloc.3
-// 0x010aac50: 0x10aac50: addiu a2, a2, -22152
+// 0x010ab298: 0x10ab298: addiu a2, a2, -20544
 	ldloc.3
-	ldc.i4 -22152
+	ldc.i4 -20544
 	add
 	stloc.3
-L_10aac54:
-// 0x010aac54: 0x10aac54: addiu a0, sp, 16
+L_10ab29c:
+// 0x010ab29c: 0x10ab29c: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010aac58: 0x10aac58: addiu a1, a1, 13712
+// 0x010ab2a0: 0x10ab2a0: addiu a1, a1, 14172
 	ldloc.2
-	ldc.i4 13712
+	ldc.i4 14172
 	add
 	stloc.2
-// 0x010aac5c: 0x10aac5c: sw    zero, 20(sp)
+// 0x010ab2a4: 0x10ab2a4: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6900,7 +6900,7 @@ L_10aac54:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010aac60: 0x10aac60: jal   0x10aab48 sw    zero, 16(sp)
+// 0x010ab2a8: 0x10ab2a8: jal   0x10ab190 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6914,14 +6914,14 @@ L_10aac54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_fixed_location_10aab48(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_fixed_location_10ab190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aac68: 0x10aac68: lw    ra, 36(sp)
-// 0x010aac6c: 0x10aac6c: sll   zero, zero, 0
-// 0x010aac70: 0x10aac70: jr    ra addiu sp, sp, 40
+// 0x010ab2b0: 0x10ab2b0: lw    ra, 36(sp)
+// 0x010ab2b4: 0x10ab2b4: sll   zero, zero, 0
+// 0x010ab2b8: 0x10ab2b8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6933,7 +6933,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_geo_config_stg_10aac78(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_stg_10ab2c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -6968,15 +6968,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aac78: 0x10aac78: addiu sp, sp, -40
+// 0x010ab2c0: 0x10ab2c0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010aac7c: 0x10aac7c: addu  a2, a0, zero
+// 0x010ab2c4: 0x10ab2c4: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010aac80: 0x10aac80: sw    a2, 24(sp)
+// 0x010ab2c8: 0x10ab2c8: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6985,8 +6985,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010aac84: 0x10aac84: sw    ra, 36(sp)
-// 0x010aac88: 0x10aac88: jal   0x1094a94 addu  a0, zero, zero
+// 0x010ab2cc: 0x10ab2cc: sw    ra, 36(sp)
+// 0x010ab2d0: 0x10ab2d0: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6994,24 +6994,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aac90: 0x10aac90: lui   a0, 0x20000
+// 0x010ab2d8: 0x10ab2d8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aac94: 0x10aac94: jal   0x104c3d0 addiu a0, a0, 13684
+// 0x010ab2dc: 0x10ab2dc: jal   0x104c3e0 addiu a0, a0, 14144
 	ldloc.1
-	ldc.i4 13684
+	ldc.i4 14144
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 6
 // --- basic block ---
-// 0x010aac9c: 0x10aac9c: lw    a2, 24(sp)
+// 0x010ab2e4: 0x10ab2e4: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7020,33 +7020,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aaca0: 0x10aaca0: sll   zero, zero, 0
-// 0x010aaca4: 0x10aaca4: bne   a2, zero, 0x10aacb4 lui   a1, 0x20000
+// 0x010ab2e8: 0x10ab2e8: sll   zero, zero, 0
+// 0x010ab2ec: 0x10ab2ec: bne   a2, zero, 0x10ab2fc lui   a1, 0x20000
 	ldloc.3
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10aacb4
+	brtrue L_10ab2fc
 // --- basic block ---
-// 0x010aacac: 0x10aacac: lui   a2, 0x10b0000
+// 0x010ab2f4: 0x10ab2f4: lui   a2, 0x10b0000
 	ldc.i4 17498112
 	stloc.3
-// 0x010aacb0: 0x10aacb0: addiu a2, a2, -22152
+// 0x010ab2f8: 0x10ab2f8: addiu a2, a2, -20544
 	ldloc.3
-	ldc.i4 -22152
+	ldc.i4 -20544
 	add
 	stloc.3
-L_10aacb4:
-// 0x010aacb4: 0x10aacb4: addiu a0, sp, 16
+L_10ab2fc:
+// 0x010ab2fc: 0x10ab2fc: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010aacb8: 0x10aacb8: addiu a1, a1, 13720
+// 0x010ab300: 0x10ab300: addiu a1, a1, 14180
 	ldloc.2
-	ldc.i4 13720
+	ldc.i4 14180
 	add
 	stloc.2
-// 0x010aacbc: 0x10aacbc: sw    zero, 20(sp)
+// 0x010ab304: 0x10ab304: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7055,7 +7055,7 @@ L_10aacb4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010aacc0: 0x10aacc0: jal   0x10aab48 sw    zero, 16(sp)
+// 0x010ab308: 0x10ab308: jal   0x10ab190 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7069,14 +7069,14 @@ L_10aacb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_fixed_location_10aab48(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_fixed_location_10ab190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aacc8: 0x10aacc8: lw    ra, 36(sp)
-// 0x010aaccc: 0x10aaccc: sll   zero, zero, 0
-// 0x010aacd0: 0x10aacd0: jr    ra addiu sp, sp, 40
+// 0x010ab310: 0x10ab310: lw    ra, 36(sp)
+// 0x010ab314: 0x10ab314: sll   zero, zero, 0
+// 0x010ab318: 0x10ab318: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -7088,7 +7088,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_geo_config_usa_10aacd8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_usa_10ab320(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -7123,15 +7123,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aacd8: 0x10aacd8: addiu sp, sp, -40
+// 0x010ab320: 0x10ab320: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010aacdc: 0x10aacdc: addu  a2, a0, zero
+// 0x010ab324: 0x10ab324: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010aace0: 0x10aace0: sw    a2, 24(sp)
+// 0x010ab328: 0x10ab328: sw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7140,8 +7140,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010aace4: 0x10aace4: sw    ra, 36(sp)
-// 0x010aace8: 0x10aace8: jal   0x1094a94 addu  a0, zero, zero
+// 0x010ab32c: 0x10ab32c: sw    ra, 36(sp)
+// 0x010ab330: 0x10ab330: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7149,24 +7149,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aacf0: 0x10aacf0: lui   a0, 0x20000
+// 0x010ab338: 0x10ab338: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aacf4: 0x10aacf4: jal   0x104c3d0 addiu a0, a0, 13684
+// 0x010ab33c: 0x10ab33c: jal   0x104c3e0 addiu a0, a0, 14144
 	ldloc.1
-	ldc.i4 13684
+	ldc.i4 14144
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010aacfc: 0x10aacfc: lw    a2, 24(sp)
+// 0x010ab344: 0x10ab344: lw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7175,28 +7175,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aad00: 0x10aad00: sll   zero, zero, 0
-// 0x010aad04: 0x10aad04: bne   a2, zero, 0x10aad14 lui   v0, 0x23b0000
+// 0x010ab348: 0x10ab348: sll   zero, zero, 0
+// 0x010ab34c: 0x10ab34c: bne   a2, zero, 0x10ab35c lui   v0, 0x23b0000
 	ldloc.3
 	ldc.i4 37421056
 	stloc 5
-	brtrue L_10aad14
+	brtrue L_10ab35c
 // --- basic block ---
-// 0x010aad0c: 0x10aad0c: lui   a2, 0x10b0000
+// 0x010ab354: 0x10ab354: lui   a2, 0x10b0000
 	ldc.i4 17498112
 	stloc.3
-// 0x010aad10: 0x10aad10: addiu a2, a2, -22152
+// 0x010ab358: 0x10ab358: addiu a2, a2, -20544
 	ldloc.3
-	ldc.i4 -22152
+	ldc.i4 -20544
 	add
 	stloc.3
-L_10aad14:
-// 0x010aad14: 0x10aad14: ori   v0, v0, 298
+L_10ab35c:
+// 0x010ab35c: 0x10ab35c: ori   v0, v0, 298
 	ldloc 5
 	ldc.i4 298
 	or
 	stloc 5
-// 0x010aad18: 0x10aad18: sw    v0, 20(sp)
+// 0x010ab360: 0x10ab360: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7205,28 +7205,28 @@ L_10aad14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aad1c: 0x10aad1c: lui   a1, 0x20000
+// 0x010ab364: 0x10ab364: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aad20: 0x10aad20: lui   v0, 0xf8b90000
+// 0x010ab368: 0x10ab368: lui   v0, 0xf8b90000
 	ldc.i4 4172873728
 	stloc 5
-// 0x010aad24: 0x10aad24: addiu a0, sp, 16
+// 0x010ab36c: 0x10ab36c: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010aad28: 0x10aad28: ori   v0, v0, 5395
+// 0x010ab370: 0x10ab370: ori   v0, v0, 5395
 	ldloc 5
 	ldc.i4 5395
 	or
 	stloc 5
-// 0x010aad2c: 0x10aad2c: addiu a1, a1, 13724
+// 0x010ab374: 0x10ab374: addiu a1, a1, 14184
 	ldloc.2
-	ldc.i4 13724
+	ldc.i4 14184
 	add
 	stloc.2
-// 0x010aad30: 0x10aad30: jal   0x10aab48 sw    v0, 16(sp)
+// 0x010ab378: 0x10ab378: jal   0x10ab190 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7240,14 +7240,14 @@ L_10aad14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_fixed_location_10aab48(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_fixed_location_10ab190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aad38: 0x10aad38: lw    ra, 36(sp)
-// 0x010aad3c: 0x10aad3c: sll   zero, zero, 0
-// 0x010aad40: 0x10aad40: jr    ra addiu sp, sp, 40
+// 0x010ab380: 0x10ab380: lw    ra, 36(sp)
+// 0x010ab384: 0x10ab384: sll   zero, zero, 0
+// 0x010ab388: 0x10ab388: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl128.j b/converted/Cibyl128.j
index f2ad55c..74c7c62 100644
--- a/converted/Cibyl128.j
+++ b/converted/Cibyl128.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl128::.ctor
 
-.method public static int32 roadmap_geo_config_il_10aad48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_il_10ab390(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -76,15 +76,15 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aad48: 0x10aad48: addiu sp, sp, -40
+// 0x010ab390: 0x10ab390: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010aad4c: 0x10aad4c: addu  a2, a0, zero
+// 0x010ab394: 0x10ab394: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010aad50: 0x10aad50: sw    a2, 24(sp)
+// 0x010ab398: 0x10ab398: sw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -93,8 +93,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010aad54: 0x10aad54: sw    ra, 36(sp)
-// 0x010aad58: 0x10aad58: jal   0x1094a94 addu  a0, zero, zero
+// 0x010ab39c: 0x10ab39c: sw    ra, 36(sp)
+// 0x010ab3a0: 0x10ab3a0: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -102,24 +102,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aad60: 0x10aad60: lui   a0, 0x20000
+// 0x010ab3a8: 0x10ab3a8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aad64: 0x10aad64: jal   0x104c3d0 addiu a0, a0, 13684
+// 0x010ab3ac: 0x10ab3ac: jal   0x104c3e0 addiu a0, a0, 14144
 	ldloc.1
-	ldc.i4 13684
+	ldc.i4 14144
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010aad6c: 0x10aad6c: lw    a2, 24(sp)
+// 0x010ab3b4: 0x10ab3b4: lw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -128,28 +128,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aad70: 0x10aad70: sll   zero, zero, 0
-// 0x010aad74: 0x10aad74: bne   a2, zero, 0x10aad84 lui   v0, 0x1ed0000
+// 0x010ab3b8: 0x10ab3b8: sll   zero, zero, 0
+// 0x010ab3bc: 0x10ab3bc: bne   a2, zero, 0x10ab3cc lui   v0, 0x1ed0000
 	ldloc.3
 	ldc.i4 32309248
 	stloc 5
-	brtrue L_10aad84
+	brtrue L_10ab3cc
 // --- basic block ---
-// 0x010aad7c: 0x10aad7c: lui   a2, 0x10b0000
+// 0x010ab3c4: 0x10ab3c4: lui   a2, 0x10b0000
 	ldc.i4 17498112
 	stloc.3
-// 0x010aad80: 0x10aad80: addiu a2, a2, -22152
+// 0x010ab3c8: 0x10ab3c8: addiu a2, a2, -20544
 	ldloc.3
-	ldc.i4 -22152
+	ldc.i4 -20544
 	add
 	stloc.3
-L_10aad84:
-// 0x010aad84: 0x10aad84: ori   v0, v0, 21978
+L_10ab3cc:
+// 0x010ab3cc: 0x10ab3cc: ori   v0, v0, 21978
 	ldloc 5
 	ldc.i4 21978
 	or
 	stloc 5
-// 0x010aad88: 0x10aad88: sw    v0, 20(sp)
+// 0x010ab3d0: 0x10ab3d0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -158,28 +158,28 @@ L_10aad84:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aad8c: 0x10aad8c: lui   a1, 0x20000
+// 0x010ab3d4: 0x10ab3d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aad90: 0x10aad90: lui   v0, 0x2160000
+// 0x010ab3d8: 0x10ab3d8: lui   v0, 0x2160000
 	ldc.i4 34996224
 	stloc 5
-// 0x010aad94: 0x10aad94: addiu a0, sp, 16
+// 0x010ab3dc: 0x10ab3dc: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010aad98: 0x10aad98: ori   v0, v0, 15242
+// 0x010ab3e0: 0x10ab3e0: ori   v0, v0, 15242
 	ldloc 5
 	ldc.i4 15242
 	or
 	stloc 5
-// 0x010aad9c: 0x10aad9c: addiu a1, a1, 13728
+// 0x010ab3e4: 0x10ab3e4: addiu a1, a1, 14188
 	ldloc.2
-	ldc.i4 13728
+	ldc.i4 14188
 	add
 	stloc.2
-// 0x010aada0: 0x10aada0: jal   0x10aab48 sw    v0, 16(sp)
+// 0x010ab3e8: 0x10ab3e8: jal   0x10ab190 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -193,14 +193,14 @@ L_10aad84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_fixed_location_10aab48(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_fixed_location_10ab190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aada8: 0x10aada8: lw    ra, 36(sp)
-// 0x010aadac: 0x10aadac: sll   zero, zero, 0
-// 0x010aadb0: 0x10aadb0: jr    ra addiu sp, sp, 40
+// 0x010ab3f0: 0x10ab3f0: lw    ra, 36(sp)
+// 0x010ab3f4: 0x10ab3f4: sll   zero, zero, 0
+// 0x010ab3f8: 0x10ab3f8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -212,7 +212,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 lang_callback_new_10aadb8(int32,int32,int32,int32,int32)
+.method public static int32 lang_callback_new_10ab400(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -250,26 +250,26 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aadb8: 0x10aadb8: addiu sp, sp, -32
+// 0x010ab400: 0x10ab400: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010aadbc: 0x10aadbc: lui   a3, 0x20000
+// 0x010ab404: 0x10ab404: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aadc0: 0x10aadc0: lui   a1, 0x20000
+// 0x010ab408: 0x10ab408: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aadc4: 0x10aadc4: addiu a3, a3, 13736
+// 0x010ab40c: 0x10ab40c: addiu a3, a3, 14196
 	ldloc 4
-	ldc.i4 13736
+	ldc.i4 14196
 	add
 	stloc 4
-// 0x010aadc8: 0x10aadc8: addiu a2, zero, 766
+// 0x010ab410: 0x10ab410: addiu a2, zero, 766
 	ldc.i4 766
 	stloc.3
-// 0x010aadcc: 0x10aadcc: sw    s0, 24(sp)
+// 0x010ab414: 0x10ab414: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -278,19 +278,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010aadd0: 0x10aadd0: addiu a1, a1, 13476
+// 0x010ab418: 0x10ab418: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aadd4: 0x10aadd4: addu  s0, a0, zero
+// 0x010ab41c: 0x10ab41c: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010aadd8: 0x10aadd8: addiu a0, zero, 1
+// 0x010ab420: 0x10ab420: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010aaddc: 0x10aaddc: sw    ra, 28(sp)
-// 0x010aade0: 0x10aade0: jal   0x100449c sw    s0, 16(sp)
+// 0x010ab424: 0x10ab424: sw    ra, 28(sp)
+// 0x010ab428: 0x10ab428: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -309,15 +309,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010aade8: 0x10aade8: lui   a1, 0x10b0000
+// 0x010ab430: 0x10ab430: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010aadec: 0x10aadec: addu  a0, s0, zero
+// 0x010ab434: 0x10ab434: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x010aadf0: 0x10aadf0: jal   0x101da7c addiu a1, a1, -18636
+// 0x010ab438: 0x10ab438: jal   0x101da8c addiu a1, a1, -17028
 	ldloc.2
-	ldc.i4 -18636
+	ldc.i4 -17028
 	add
 	stloc.2
 	ldloc.0
@@ -325,31 +325,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010aadf8: 0x10aadf8: jal   0x1021900 sll   zero, zero, 0
+// 0x010ab440: 0x10ab440: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010aae00: 0x10aae00: lui   a1, 0x10b0000
+// 0x010ab448: 0x10ab448: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010aae04: 0x10aae04: addiu a1, a1, -20904
+// 0x010ab44c: 0x10ab44c: addiu a1, a1, -19296
 	ldloc.2
-	ldc.i4 -20904
+	ldc.i4 -19296
 	add
 	stloc.2
-// 0x010aae08: 0x10aae08: jal   0x104fe98 addiu a0, zero, 300
+// 0x010ab450: 0x10ab450: jal   0x104fea8 addiu a0, zero, 300
 	ldc.i4 300
 	stloc.1
 	ldloc.0
@@ -357,16 +357,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010aae10: 0x10aae10: lw    ra, 28(sp)
-// 0x010aae14: 0x10aae14: addiu v0, zero, 1
+// 0x010ab458: 0x10ab458: lw    ra, 28(sp)
+// 0x010ab45c: 0x10ab45c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010aae18: 0x10aae18: lw    s0, 24(sp)
+// 0x010ab460: 0x10ab460: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -375,7 +375,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010aae1c: 0x10aae1c: jr    ra addiu sp, sp, 32
+// 0x010ab464: 0x10ab464: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -387,7 +387,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 need_to_ask_server_10aae24(int32,int32,int32,int32,int32)
+.method public static int32 need_to_ask_server_10ab46c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -422,16 +422,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aae24: 0x10aae24: lui   a0, 0x0
+// 0x010ab46c: 0x10ab46c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aae28: 0x10aae28: addiu sp, sp, -24
+// 0x010ab470: 0x10ab470: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010aae2c: 0x10aae2c: sw    ra, 20(sp)
-// 0x010aae30: 0x10aae30: jal   0x100e348 addiu a0, a0, 18716
+// 0x010ab474: 0x10ab474: sw    ra, 20(sp)
+// 0x010ab478: 0x10ab478: jal   0x100e358 addiu a0, a0, 18716
 	ldloc.1
 	ldc.i4 18716
 	add
@@ -441,20 +441,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aae38: 0x10aae38: lui   a1, 0x10000
+// 0x010ab480: 0x10ab480: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010aae3c: 0x10aae3c: addu  a0, v0, zero
+// 0x010ab484: 0x10ab484: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010aae40: 0x10aae40: jal   0x1001b14 addiu a1, a1, 9424
+// 0x010ab488: 0x10ab488: jal   0x1001b14 addiu a1, a1, 9420
 	ldloc.2
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.2
 	ldloc.1
@@ -462,13 +462,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010aae48: 0x10aae48: lw    ra, 20(sp)
-// 0x010aae4c: 0x10aae4c: sltiu v0, v0, 1
+// 0x010ab490: 0x10ab490: lw    ra, 20(sp)
+// 0x010ab494: 0x10ab494: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010aae50: 0x10aae50: jr    ra addiu sp, sp, 24
+// 0x010ab498: 0x10ab498: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -480,7 +480,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 lang_selected_new_10aae58(int32,int32,int32,int32,int32)
+.method public static int32 lang_selected_new_10ab4a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -515,18 +515,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aae58: 0x10aae58: lui   a0, 0x10b0000
+// 0x010ab4a0: 0x10ab4a0: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010aae5c: 0x10aae5c: addiu sp, sp, -24
+// 0x010ab4a4: 0x10ab4a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010aae60: 0x10aae60: sw    ra, 20(sp)
-// 0x010aae64: 0x10aae64: jal   0x104fd00 addiu a0, a0, -20904
+// 0x010ab4a8: 0x10ab4a8: sw    ra, 20(sp)
+// 0x010ab4ac: 0x10ab4ac: jal   0x104fd10 addiu a0, a0, -19296
 	ldloc.1
-	ldc.i4 -20904
+	ldc.i4 -19296
 	add
 	stloc.1
 	ldloc.0
@@ -534,26 +534,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aae6c: 0x10aae6c: lui   a0, 0x20000
+// 0x010ab4b4: 0x10ab4b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aae70: 0x10aae70: jal   0x104c3d0 addiu a0, a0, 13764
+// 0x010ab4b8: 0x10ab4b8: jal   0x104c3e0 addiu a0, a0, 14224
 	ldloc.1
-	ldc.i4 13764
+	ldc.i4 14224
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 6
 // --- basic block ---
-// 0x010aae78: 0x10aae78: lw    ra, 20(sp)
-// 0x010aae7c: 0x10aae7c: sll   zero, zero, 0
-// 0x010aae80: 0x10aae80: jr    ra addiu sp, sp, 24
+// 0x010ab4c0: 0x10ab4c0: lw    ra, 20(sp)
+// 0x010ab4c4: 0x10ab4c4: sll   zero, zero, 0
+// 0x010ab4c8: 0x10ab4c8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -565,7 +565,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 request_geo_config_10aae88(int32,int32,int32,int32,int32)
+.method public static int32 request_geo_config_10ab4d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -624,13 +624,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aae88: 0x10aae88: addiu sp, sp, -72
+// 0x010ab4d0: 0x10ab4d0: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010aae8c: 0x10aae8c: sw    ra, 68(sp)
-// 0x010aae90: 0x10aae90: sw    s7, 64(sp)
+// 0x010ab4d4: 0x10ab4d4: sw    ra, 68(sp)
+// 0x010ab4d8: 0x10ab4d8: sw    s7, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -639,7 +639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010aae94: 0x10aae94: sw    s6, 60(sp)
+// 0x010ab4dc: 0x10ab4dc: sw    s6, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -648,7 +648,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010aae98: 0x10aae98: sw    s5, 56(sp)
+// 0x010ab4e0: 0x10ab4e0: sw    s5, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -657,7 +657,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010aae9c: 0x10aae9c: sw    s4, 52(sp)
+// 0x010ab4e4: 0x10ab4e4: sw    s4, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -666,7 +666,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010aaea0: 0x10aaea0: sw    s3, 48(sp)
+// 0x010ab4e8: 0x10ab4e8: sw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -675,7 +675,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aaea4: 0x10aaea4: sw    s2, 44(sp)
+// 0x010ab4ec: 0x10ab4ec: sw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -684,7 +684,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aaea8: 0x10aaea8: sw    s1, 40(sp)
+// 0x010ab4f0: 0x10ab4f0: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -693,7 +693,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aaeac: 0x10aaeac: jal   0x1030c08 sw    s0, 36(sp)
+// 0x010ab4f4: 0x10ab4f4: jal   0x1030c18 sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -702,53 +702,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x010aaeb4: 0x10aaeb4: addiu v1, zero, 1
+// 0x010ab4fc: 0x10ab4fc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010aaeb8: 0x10aaeb8: beq   v0, v1, 0x10aaed4 addu  s0, zero, zero
+// 0x010ab500: 0x10ab500: beq   v0, v1, 0x10ab51c addu  s0, zero, zero
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc 8
-	beq  L_10aaed4
+	beq  L_10ab51c
 // --- basic block ---
-// 0x010aaec0: 0x10aaec0: jal   0x1030c08 addiu s0, zero, 1
+// 0x010ab508: 0x10ab508: jal   0x1030c18 addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x010aaec8: 0x10aaec8: bne   v0, zero, 0x10aaed4 sll   zero, zero, 0
+// 0x010ab510: 0x10ab510: bne   v0, zero, 0x10ab51c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10aaed4
+	brtrue L_10ab51c
 // --- basic block ---
-// 0x010aaed0: 0x10aaed0: addu  s0, zero, zero
+// 0x010ab518: 0x10ab518: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_10aaed4:
-// 0x010aaed4: 0x10aaed4: lui   a1, 0x20000
+L_10ab51c:
+// 0x010ab51c: 0x10ab51c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aaed8: 0x10aaed8: lui   a3, 0x20000
+// 0x010ab520: 0x10ab520: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aaedc: 0x10aaedc: addiu a1, a1, 13476
+// 0x010ab524: 0x10ab524: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aaee0: 0x10aaee0: addiu a3, a3, 13788
+// 0x010ab528: 0x10ab528: addiu a3, a3, 14248
 	ldloc 4
-	ldc.i4 13788
+	ldc.i4 14248
 	add
 	stloc 4
-// 0x010aaee4: 0x10aaee4: addiu a0, zero, 2
+// 0x010ab52c: 0x10ab52c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010aaee8: 0x10aaee8: jal   0x100449c addiu a2, zero, 868
+// 0x010ab530: 0x10ab530: jal   0x100449c addiu a2, zero, 868
 	ldc.i4 868
 	stloc.3
 	ldloc.0
@@ -761,20 +761,20 @@ L_10aaed4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010aaef0: 0x10aaef0: lui   s1, 0x80000
-	ldc.i4 524288
+// 0x010ab538: 0x10ab538: lui   s1, 0x90000
+	ldc.i4 589824
 	stloc 9
-// 0x010aaef4: 0x10aaef4: lui   a0, 0x0
+// 0x010ab53c: 0x10ab53c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aaef8: 0x10aaef8: addiu a0, a0, 18796
+// 0x010ab540: 0x10ab540: addiu a0, a0, 18796
 	ldloc.1
 	ldc.i4 18796
 	add
 	stloc.1
-// 0x010aaefc: 0x10aaefc: jal   0x100e65c addiu a1, s1, 32700
+// 0x010ab544: 0x10ab544: jal   0x100e66c addiu a1, s1, -32372
 	ldloc 9
-	ldc.i4 32700
+	ldc.i4 -32372
 	add
 	stloc.2
 	ldloc.0
@@ -782,41 +782,41 @@ L_10aaed4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_position_100e65c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_position_100e66c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010aaf04: 0x10aaf04: lui   v1, 0x2120000
+// 0x010ab54c: 0x10ab54c: lui   v1, 0x2120000
 	ldc.i4 34734080
 	stloc 6
-// 0x010aaf08: 0x10aaf08: lw    v0, 32700(s1)
+// 0x010ab550: 0x10ab550: lw    v0, -32372(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 8175
+	ldc.i4 -8093
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aaf0c: 0x10aaf0c: ori   v1, v1, 60730
+// 0x010ab554: 0x10ab554: ori   v1, v1, 60730
 	ldloc 6
 	ldc.i4 60730
 	or
 	stloc 6
-// 0x010aaf10: 0x10aaf10: bne   v0, v1, 0x10ab4b4 addiu s1, s1, 32700
+// 0x010ab558: 0x10ab558: bne   v0, v1, 0x10abafc addiu s1, s1, -32372
 	ldloc 5
 	ldloc 6
 	ldloc 9
-	ldc.i4 32700
+	ldc.i4 -32372
 	add
 	stloc 9
-	bne.un L_10ab4b4
+	bne.un L_10abafc
 // --- basic block ---
-// 0x010aaf18: 0x10aaf18: lui   v1, 0x1e90000
+// 0x010ab560: 0x10ab560: lui   v1, 0x1e90000
 	ldc.i4 32047104
 	stloc 6
-// 0x010aaf1c: 0x10aaf1c: lw    a0, 4(s1)
+// 0x010ab564: 0x10ab564: lw    a0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -825,79 +825,79 @@ L_10aaed4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aaf20: 0x10aaf20: ori   v1, v1, 58906
+// 0x010ab568: 0x10ab568: ori   v1, v1, 58906
 	ldloc 6
 	ldc.i4 58906
 	or
 	stloc 6
-// 0x010aaf24: 0x10aaf24: bne   a0, v1, 0x10ab4b4 sll   zero, zero, 0
+// 0x010ab56c: 0x10ab56c: bne   a0, v1, 0x10abafc sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_10ab4b4
+	bne.un L_10abafc
 // --- basic block ---
-// 0x010aaf2c: 0x10aaf2c: beq   s0, zero, 0x10aaf3c lui   a0, 0x10000
+// 0x010ab574: 0x10ab574: beq   s0, zero, 0x10ab584 lui   a0, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc.1
-	brfalse L_10aaf3c
+	brfalse L_10ab584
 // --- basic block ---
-// 0x010aaf34: 0x10aaf34: j	 0x10aaf44 addiu a0, a0, -31052
+// 0x010ab57c: 0x10ab57c: j	 0x10ab58c addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
 	stloc.1
-	br L_10aaf44
+	br L_10ab58c
 // --- basic block ---
-L_10aaf3c:
-// 0x010aaf3c: 0x10aaf3c: lui   a0, 0x20000
+L_10ab584:
+// 0x010ab584: 0x10ab584: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010aaf40: 0x10aaf40: addiu a0, a0, 6792
+// 0x010ab588: 0x10ab588: addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
-L_10aaf44:
-// 0x010aaf44: 0x10aaf44: jal   0x101df50 sll   zero, zero, 0
+L_10ab58c:
+// 0x010ab58c: 0x10ab58c: jal   0x101df60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010aaf4c: 0x10aaf4c: beq   v0, zero, 0x10aaf78 lui   v1, 0x2120000
+// 0x010ab594: 0x10ab594: beq   v0, zero, 0x10ab5c0 lui   v1, 0x2120000
 	ldloc 5
 	ldc.i4 34734080
 	stloc 6
-	brfalse L_10aaf78
+	brfalse L_10ab5c0
 // --- basic block ---
-// 0x010aaf54: 0x10aaf54: lw    a0, 0(v0)
+// 0x010ab59c: 0x10ab59c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010aaf58: 0x10aaf58: ori   v1, v1, 60730
+// 0x010ab5a0: 0x10ab5a0: ori   v1, v1, 60730
 	ldloc 6
 	ldc.i4 60730
 	or
 	stloc 6
-// 0x010aaf5c: 0x10aaf5c: bne   a0, v1, 0x10ab350 lui   s0, 0x80000
+// 0x010ab5a4: 0x10ab5a4: bne   a0, v1, 0x10ab998 lui   s0, 0x90000
 	ldloc.1
 	ldloc 6
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 8
-	bne.un L_10ab350
+	bne.un L_10ab998
 // --- basic block ---
-// 0x010aaf64: 0x10aaf64: lui   v1, 0x1e90000
+// 0x010ab5ac: 0x10ab5ac: lui   v1, 0x1e90000
 	ldc.i4 32047104
 	stloc 6
-// 0x010aaf68: 0x10aaf68: lw    a0, 4(v0)
+// 0x010ab5b0: 0x10ab5b0: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -906,108 +906,108 @@ L_10aaf44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aaf6c: 0x10aaf6c: ori   v1, v1, 58906
+// 0x010ab5b4: 0x10ab5b4: ori   v1, v1, 58906
 	ldloc 6
 	ldc.i4 58906
 	or
 	stloc 6
-// 0x010aaf70: 0x10aaf70: bne   a0, v1, 0x10ab350 sll   zero, zero, 0
+// 0x010ab5b8: 0x10ab5b8: bne   a0, v1, 0x10ab998 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_10ab350
+	bne.un L_10ab998
 // --- basic block ---
-L_10aaf78:
-// 0x010aaf78: 0x10aaf78: lui   s0, 0x80000
-	ldc.i4 524288
+L_10ab5c0:
+// 0x010ab5c0: 0x10ab5c0: lui   s0, 0x90000
+	ldc.i4 589824
 	stloc 8
-// 0x010aaf7c: 0x10aaf7c: lw    v0, 32696(s0)
+// 0x010ab5c4: 0x10ab5c4: lw    v0, -32376(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8174
+	ldc.i4 -8094
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aaf80: 0x10aaf80: addiu v1, zero, 3
+// 0x010ab5c8: 0x10ab5c8: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x010aaf84: 0x10aaf84: addiu v0, v0, 1
+// 0x010ab5cc: 0x10ab5cc: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010aaf88: 0x10aaf88: bne   v0, v1, 0x10ab318 sw    v0, 32696(s0)
+// 0x010ab5d0: 0x10ab5d0: bne   v0, v1, 0x10ab960 sw    v0, -32376(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8174
+	ldc.i4 -8094
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_10ab318
+	bne.un L_10ab960
 // --- basic block ---
-// 0x010aaf90: 0x10aaf90: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x010ab5d8: 0x10ab5d8: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010aaf98: 0x10aaf98: beq   v0, zero, 0x10aafbc addiu s3, zero, 45
+// 0x010ab5e0: 0x10ab5e0: beq   v0, zero, 0x10ab604 addiu s3, zero, 45
 	ldloc 5
 	ldc.i4.s 45
 	stloc 11
-	brfalse L_10aafbc
+	brfalse L_10ab604
 // --- basic block ---
-// 0x010aafa0: 0x10aafa0: lui   v0, 0xf0000
+// 0x010ab5e8: 0x10ab5e8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010aafa4: 0x10aafa4: lw    v0, -30072(v0)
+// 0x010ab5ec: 0x10ab5ec: lw    v0, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aafa8: 0x10aafa8: sll   zero, zero, 0
-// 0x010aafac: 0x10aafac: slti  v0, v0, 361
+// 0x010ab5f0: 0x10ab5f0: sll   zero, zero, 0
+// 0x010ab5f4: 0x10ab5f4: slti  v0, v0, 361
 	ldloc 5
 	ldc.i4 361
 	clt
 	stloc 5
-// 0x010aafb0: 0x10aafb0: beq   v0, zero, 0x10aafbc addiu s3, zero, 90
+// 0x010ab5f8: 0x10ab5f8: beq   v0, zero, 0x10ab604 addiu s3, zero, 90
 	ldloc 5
 	ldc.i4.s 90
 	stloc 11
-	brfalse L_10aafbc
+	brfalse L_10ab604
 // --- basic block ---
-// 0x010aafb8: 0x10aafb8: addiu s3, zero, 45
+// 0x010ab600: 0x10ab600: addiu s3, zero, 45
 	ldc.i4.s 45
 	stloc 11
-L_10aafbc:
-// 0x010aafbc: 0x10aafbc: lui   a1, 0x20000
+L_10ab604:
+// 0x010ab604: 0x10ab604: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aafc0: 0x10aafc0: lui   a3, 0x20000
+// 0x010ab608: 0x10ab608: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aafc4: 0x10aafc4: addiu a1, a1, 13476
+// 0x010ab60c: 0x10ab60c: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aafc8: 0x10aafc8: addiu a3, a3, 13820
+// 0x010ab610: 0x10ab610: addiu a3, a3, 14280
 	ldloc 4
-	ldc.i4 13820
+	ldc.i4 14280
 	add
 	stloc 4
-// 0x010aafcc: 0x10aafcc: addiu a2, zero, 663
+// 0x010ab614: 0x10ab614: addiu a2, zero, 663
 	ldc.i4 663
 	stloc.3
-// 0x010aafd0: 0x10aafd0: jal   0x100449c addiu a0, zero, 4
+// 0x010ab618: 0x10ab618: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -1020,12 +1020,12 @@ L_10aafbc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010aafd8: 0x10aafd8: lui   a0, 0x10b0000
+// 0x010ab620: 0x10ab620: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010aafdc: 0x10aafdc: jal   0x104fd00 addiu a0, a0, -18684
+// 0x010ab624: 0x10ab624: jal   0x104fd10 addiu a0, a0, -17076
 	ldloc.1
-	ldc.i4 -18684
+	ldc.i4 -17076
 	add
 	stloc.1
 	ldloc.0
@@ -1033,36 +1033,36 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010aafe4: 0x10aafe4: lui   s6, 0x20000
+// 0x010ab62c: 0x10ab62c: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x010aafe8: 0x10aafe8: lui   a3, 0x10010000
+// 0x010ab630: 0x10ab630: lui   a3, 0x10010000
 	ldc.i4 268500992
 	stloc 4
-// 0x010aafec: 0x10aafec: lui   a1, 0x20000
+// 0x010ab634: 0x10ab634: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010aaff0: 0x10aaff0: ori   a3, a3, 20497
+// 0x010ab638: 0x10ab638: ori   a3, a3, 20497
 	ldloc 4
 	ldc.i4 20497
 	or
 	stloc 4
-// 0x010aaff4: 0x10aaff4: addiu a1, a1, 13884
+// 0x010ab63c: 0x10ab63c: addiu a1, a1, 14344
 	ldloc.2
-	ldc.i4 13884
+	ldc.i4 14344
 	add
 	stloc.2
-// 0x010aaff8: 0x10aaff8: addu  a2, zero, zero
+// 0x010ab640: 0x10ab640: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aaffc: 0x10aaffc: jal   0x1095a08 addiu a0, s6, 13860
+// 0x010ab644: 0x10ab644: jal   0x1096050 addiu a0, s6, 14320
 	ldloc 14
-	ldc.i4 13860
+	ldc.i4 14320
 	add
 	stloc.1
 	ldloc.0
@@ -1070,59 +1070,59 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab004: 0x10ab004: lui   a1, 0x0
+// 0x010ab64c: 0x10ab64c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab008: 0x10ab008: lui   a2, 0x10000
+// 0x010ab650: 0x10ab650: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010ab00c: 0x10ab00c: addu  a0, v0, zero
+// 0x010ab654: 0x10ab654: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab010: 0x10ab010: lui   s2, 0x10000
+// 0x010ab658: 0x10ab658: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010ab014: 0x10ab014: addiu a1, a1, 31980
+// 0x010ab65c: 0x10ab65c: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010ab018: 0x10ab018: addiu a2, a2, 7252
+// 0x010ab660: 0x10ab660: addiu a2, a2, 7248
 	ldloc.3
-	ldc.i4 7252
+	ldc.i4 7248
 	add
 	stloc.3
-// 0x010ab01c: 0x10ab01c: addu  s1, v0, zero
+// 0x010ab664: 0x10ab664: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010ab020: 0x10ab020: jal   0x1098fe0 addiu s0, zero, 8
+// 0x010ab668: 0x10ab668: jal   0x1099628 addiu s0, zero, 8
 	ldc.i4.8
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010ab028: 0x10ab028: addiu a3, zero, 10
+// 0x010ab670: 0x10ab670: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010ab02c: 0x10ab02c: addiu a0, s2, -25324
+// 0x010ab674: 0x10ab674: addiu a0, s2, -25324
 	ldloc 10
 	ldc.i4 -25324
 	add
 	stloc.1
-// 0x010ab030: 0x10ab030: addu  a1, zero, zero
+// 0x010ab678: 0x10ab678: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab034: 0x10ab034: addiu a2, zero, -2
+// 0x010ab67c: 0x10ab67c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010ab038: 0x10ab038: jal   0x1093a24 sw    s0, 16(sp)
+// 0x010ab680: 0x10ab680: jal   0x1094048 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1136,21 +1136,21 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab040: 0x10ab040: addu  a0, v0, zero
+// 0x010ab688: 0x10ab688: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab044: 0x10ab044: addu  a2, zero, zero
+// 0x010ab68c: 0x10ab68c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ab048: 0x10ab048: addu  a1, zero, zero
+// 0x010ab690: 0x10ab690: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab04c: 0x10ab04c: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010ab694: 0x10ab694: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1162,9 +1162,9 @@ L_10aafbc:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010ab054: 0x10ab054: lw    v0, 24(sp)
+// 0x010ab69c: 0x10ab69c: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1173,25 +1173,25 @@ L_10aafbc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab058: 0x10ab058: addu  a0, s1, zero
+// 0x010ab6a0: 0x10ab6a0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010ab05c: 0x10ab05c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010ab6a4: 0x10ab6a4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab064: 0x10ab064: lui   a0, 0x20000
+// 0x010ab6ac: 0x10ab6ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab068: 0x10ab068: jal   0x101cd60 addiu a0, a0, 13900
+// 0x010ab6b0: 0x10ab6b0: jal   0x101cd70 addiu a0, a0, 14360
 	ldloc.1
-	ldc.i4 13900
+	ldc.i4 14360
 	add
 	stloc.1
 	ldloc.0
@@ -1199,26 +1199,26 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab070: 0x10ab070: lui   a0, 0x20000
+// 0x010ab6b8: 0x10ab6b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab074: 0x10ab074: addiu a2, zero, -1
+// 0x010ab6bc: 0x10ab6bc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010ab078: 0x10ab078: addiu a3, zero, 8
+// 0x010ab6c0: 0x10ab6c0: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010ab07c: 0x10ab07c: addu  a1, v0, zero
+// 0x010ab6c4: 0x10ab6c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ab080: 0x10ab080: jal   0x1098d10 addiu a0, a0, 13956
+// 0x010ab6c8: 0x10ab6c8: jal   0x1099358 addiu a0, a0, 14416
 	ldloc.1
-	ldc.i4 13956
+	ldc.i4 14416
 	add
 	stloc.1
 	ldloc.0
@@ -1226,23 +1226,23 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab088: 0x10ab088: lui   a1, 0x0
+// 0x010ab6d0: 0x10ab6d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab08c: 0x10ab08c: addu  a0, v0, zero
+// 0x010ab6d4: 0x10ab6d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab090: 0x10ab090: addiu a1, a1, 23008
+// 0x010ab6d8: 0x10ab6d8: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010ab094: 0x10ab094: jal   0x1097af8 sw    v0, 24(sp)
+// 0x010ab6dc: 0x10ab6dc: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1253,9 +1253,9 @@ L_10aafbc:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010ab09c: 0x10ab09c: lw    v0, 24(sp)
+// 0x010ab6e4: 0x10ab6e4: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1264,34 +1264,34 @@ L_10aafbc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab0a0: 0x10ab0a0: addu  a0, s1, zero
+// 0x010ab6e8: 0x10ab6e8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010ab0a4: 0x10ab0a4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010ab6ec: 0x10ab6ec: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab0ac: 0x10ab0ac: addiu a3, zero, 10
+// 0x010ab6f4: 0x10ab6f4: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010ab0b0: 0x10ab0b0: addiu a0, s2, -25324
+// 0x010ab6f8: 0x10ab6f8: addiu a0, s2, -25324
 	ldloc 10
 	ldc.i4 -25324
 	add
 	stloc.1
-// 0x010ab0b4: 0x10ab0b4: addu  a1, zero, zero
+// 0x010ab6fc: 0x10ab6fc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab0b8: 0x10ab0b8: addiu a2, zero, -2
+// 0x010ab700: 0x10ab700: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010ab0bc: 0x10ab0bc: jal   0x1093a24 sw    s0, 16(sp)
+// 0x010ab704: 0x10ab704: jal   0x1094048 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1305,21 +1305,21 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab0c4: 0x10ab0c4: addu  a0, v0, zero
+// 0x010ab70c: 0x10ab70c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab0c8: 0x10ab0c8: addu  a2, zero, zero
+// 0x010ab710: 0x10ab710: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ab0cc: 0x10ab0cc: addu  a1, zero, zero
+// 0x010ab714: 0x10ab714: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab0d0: 0x10ab0d0: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010ab718: 0x10ab718: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1331,9 +1331,9 @@ L_10aafbc:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010ab0d8: 0x10ab0d8: lw    v0, 24(sp)
+// 0x010ab720: 0x10ab720: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1342,45 +1342,45 @@ L_10aafbc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab0dc: 0x10ab0dc: addu  a0, s1, zero
+// 0x010ab724: 0x10ab724: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010ab0e0: 0x10ab0e0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010ab728: 0x10ab728: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab0e8: 0x10ab0e8: lui   a0, 0x20000
+// 0x010ab730: 0x10ab730: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab0ec: 0x10ab0ec: lui   v0, 0x40000000
+// 0x010ab734: 0x10ab734: lui   v0, 0x40000000
 	ldc.i4 1073741824
 	stloc 5
-// 0x010ab0f0: 0x10ab0f0: addiu a0, a0, 13976
+// 0x010ab738: 0x10ab738: addiu a0, a0, 14436
 	ldloc.1
-	ldc.i4 13976
+	ldc.i4 14436
 	add
 	stloc.1
-// 0x010ab0f4: 0x10ab0f4: addu  a1, zero, zero
+// 0x010ab73c: 0x10ab73c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab0f8: 0x10ab0f8: addiu a2, zero, -1
+// 0x010ab740: 0x10ab740: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010ab0fc: 0x10ab0fc: addiu a3, zero, -1
+// 0x010ab744: 0x10ab744: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010ab100: 0x10ab100: ori   v0, v0, 20480
+// 0x010ab748: 0x10ab748: ori   v0, v0, 20480
 	ldloc 5
 	ldc.i4 20480
 	or
 	stloc 5
-// 0x010ab104: 0x10ab104: sw    v0, 16(sp)
+// 0x010ab74c: 0x10ab74c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1389,7 +1389,7 @@ L_10aafbc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab108: 0x10ab108: jal   0x1093a24 lui   s5, 0x100000
+// 0x010ab750: 0x10ab750: jal   0x1094048 lui   s5, 0x100000
 	ldc.i4 1048576
 	stloc 13
 	ldloc.0
@@ -1397,37 +1397,37 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab110: 0x10ab110: lui   a0, 0x20000
+// 0x010ab758: 0x10ab758: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab114: 0x10ab114: addu  a3, s3, zero
+// 0x010ab75c: 0x10ab75c: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010ab118: 0x10ab118: ori   s5, s5, 8
+// 0x010ab760: 0x10ab760: ori   s5, s5, 8
 	ldloc 13
 	ldc.i4.8
 	or
 	stloc 13
-// 0x010ab11c: 0x10ab11c: addiu a0, a0, 14000
+// 0x010ab764: 0x10ab764: addiu a0, a0, 14460
 	ldloc.1
-	ldc.i4 14000
+	ldc.i4 14460
 	add
 	stloc.1
-// 0x010ab120: 0x10ab120: addu  a1, zero, zero
+// 0x010ab768: 0x10ab768: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab124: 0x10ab124: addiu a2, zero, -2
+// 0x010ab76c: 0x10ab76c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010ab128: 0x10ab128: addu  s2, v0, zero
+// 0x010ab770: 0x10ab770: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010ab12c: 0x10ab12c: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010ab774: 0x10ab774: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1441,34 +1441,34 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab134: 0x10ab134: addu  a0, v0, zero
+// 0x010ab77c: 0x10ab77c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab138: 0x10ab138: addu  a1, zero, zero
+// 0x010ab780: 0x10ab780: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab13c: 0x10ab13c: addu  a2, zero, zero
+// 0x010ab784: 0x10ab784: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ab140: 0x10ab140: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010ab788: 0x10ab788: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010ab148: 0x10ab148: lui   a0, 0x20000
+// 0x010ab790: 0x10ab790: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab14c: 0x10ab14c: jal   0x101cd60 addiu a0, a0, 14008
+// 0x010ab794: 0x10ab794: jal   0x101cd70 addiu a0, a0, 14468
 	ldloc.1
-	ldc.i4 14008
+	ldc.i4 14468
 	add
 	stloc.1
 	ldloc.0
@@ -1476,26 +1476,26 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab154: 0x10ab154: lui   a0, 0x20000
+// 0x010ab79c: 0x10ab79c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab158: 0x10ab158: addiu a2, zero, 16
+// 0x010ab7a0: 0x10ab7a0: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010ab15c: 0x10ab15c: addiu a3, zero, 153
+// 0x010ab7a4: 0x10ab7a4: addiu a3, zero, 153
 	ldc.i4 153
 	stloc 4
-// 0x010ab160: 0x10ab160: addiu a0, a0, 14024
+// 0x010ab7a8: 0x10ab7a8: addiu a0, a0, 14484
 	ldloc.1
-	ldc.i4 14024
+	ldc.i4 14484
 	add
 	stloc.1
-// 0x010ab164: 0x10ab164: jal   0x1098d10 addu  a1, v0, zero
+// 0x010ab7ac: 0x10ab7ac: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1503,33 +1503,33 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab16c: 0x10ab16c: addu  a1, v0, zero
+// 0x010ab7b4: 0x10ab7b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ab170: 0x10ab170: addu  a0, s0, zero
+// 0x010ab7b8: 0x10ab7b8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010ab174: 0x10ab174: jal   0x1098ec4 lui   s7, 0x20000
+// 0x010ab7bc: 0x10ab7bc: jal   0x109950c lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 15
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab17c: 0x10ab17c: addiu a0, s7, -2856
+// 0x010ab7c4: 0x10ab7c4: addiu a0, s7, -2392
 	ldloc 15
-	ldc.i4 -2856
+	ldc.i4 -2392
 	add
 	stloc.1
-// 0x010ab180: 0x10ab180: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010ab7c8: 0x10ab7c8: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -1537,36 +1537,36 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab188: 0x10ab188: addu  a1, v0, zero
+// 0x010ab7d0: 0x10ab7d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ab18c: 0x10ab18c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010ab7d4: 0x10ab7d4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab194: 0x10ab194: lui   v0, 0x10b0000
+// 0x010ab7dc: 0x10ab7dc: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010ab198: 0x10ab198: addiu v0, v0, -18452
+// 0x010ab7e0: 0x10ab7e0: addiu v0, v0, -16844
 	ldloc 5
-	ldc.i4 -18452
+	ldc.i4 -16844
 	add
 	stloc 5
-// 0x010ab19c: 0x10ab19c: lui   s4, 0x10b0000
+// 0x010ab7e4: 0x10ab7e4: lui   s4, 0x10b0000
 	ldc.i4 17498112
 	stloc 12
-// 0x010ab1a0: 0x10ab1a0: sw    v0, 112(s0)
+// 0x010ab7e8: 0x10ab7e8: sw    v0, 112(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1575,22 +1575,22 @@ L_10aafbc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab1a4: 0x10ab1a4: addu  a0, s0, zero
+// 0x010ab7ec: 0x10ab7ec: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010ab1a8: 0x10ab1a8: jal   0x1099190 addiu s4, s4, -18396
+// 0x010ab7f0: 0x10ab7f0: jal   0x10997d8 addiu s4, s4, -16788
 	ldloc 12
-	ldc.i4 -18396
+	ldc.i4 -16788
 	add
 	stloc 12
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab1b0: 0x10ab1b0: addu  a1, s0, zero
+// 0x010ab7f8: 0x10ab7f8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010ab1b4: 0x10ab1b4: sw    s4, 188(s0)
+// 0x010ab7fc: 0x10ab7fc: sw    s4, 188(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1599,34 +1599,34 @@ L_10aafbc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ab1b8: 0x10ab1b8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010ab800: 0x10ab800: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab1c0: 0x10ab1c0: lui   a0, 0x20000
+// 0x010ab808: 0x10ab808: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab1c4: 0x10ab1c4: addu  a3, s3, zero
+// 0x010ab80c: 0x10ab80c: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010ab1c8: 0x10ab1c8: addiu a0, a0, 14032
+// 0x010ab810: 0x10ab810: addiu a0, a0, 14492
 	ldloc.1
-	ldc.i4 14032
+	ldc.i4 14492
 	add
 	stloc.1
-// 0x010ab1cc: 0x10ab1cc: addu  a1, zero, zero
+// 0x010ab814: 0x10ab814: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab1d0: 0x10ab1d0: addiu a2, zero, -2
+// 0x010ab818: 0x10ab818: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010ab1d4: 0x10ab1d4: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010ab81c: 0x10ab81c: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1640,34 +1640,34 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab1dc: 0x10ab1dc: addu  a0, v0, zero
+// 0x010ab824: 0x10ab824: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab1e0: 0x10ab1e0: addu  a1, zero, zero
+// 0x010ab828: 0x10ab828: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab1e4: 0x10ab1e4: addu  a2, zero, zero
+// 0x010ab82c: 0x10ab82c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ab1e8: 0x10ab1e8: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010ab830: 0x10ab830: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010ab1f0: 0x10ab1f0: lui   a0, 0x20000
+// 0x010ab838: 0x10ab838: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab1f4: 0x10ab1f4: jal   0x101cd60 addiu a0, a0, 14040
+// 0x010ab83c: 0x10ab83c: jal   0x101cd70 addiu a0, a0, 14500
 	ldloc.1
-	ldc.i4 14040
+	ldc.i4 14500
 	add
 	stloc.1
 	ldloc.0
@@ -1675,26 +1675,26 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab1fc: 0x10ab1fc: lui   a0, 0x20000
+// 0x010ab844: 0x10ab844: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab200: 0x10ab200: addiu a2, zero, 16
+// 0x010ab848: 0x10ab848: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010ab204: 0x10ab204: addiu a3, zero, 153
+// 0x010ab84c: 0x10ab84c: addiu a3, zero, 153
 	ldc.i4 153
 	stloc 4
-// 0x010ab208: 0x10ab208: addiu a0, a0, 14052
+// 0x010ab850: 0x10ab850: addiu a0, a0, 14512
 	ldloc.1
-	ldc.i4 14052
+	ldc.i4 14512
 	add
 	stloc.1
-// 0x010ab20c: 0x10ab20c: jal   0x1098d10 addu  a1, v0, zero
+// 0x010ab854: 0x10ab854: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1702,30 +1702,30 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab214: 0x10ab214: addu  a1, v0, zero
+// 0x010ab85c: 0x10ab85c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ab218: 0x10ab218: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010ab860: 0x10ab860: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab220: 0x10ab220: addiu a0, s7, -2856
+// 0x010ab868: 0x10ab868: addiu a0, s7, -2392
 	ldloc 15
-	ldc.i4 -2856
+	ldc.i4 -2392
 	add
 	stloc.1
-// 0x010ab224: 0x10ab224: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010ab86c: 0x10ab86c: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -1733,33 +1733,33 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab22c: 0x10ab22c: addu  a1, v0, zero
+// 0x010ab874: 0x10ab874: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ab230: 0x10ab230: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010ab878: 0x10ab878: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab238: 0x10ab238: lui   v0, 0x10b0000
+// 0x010ab880: 0x10ab880: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010ab23c: 0x10ab23c: addiu v0, v0, -18508
+// 0x010ab884: 0x10ab884: addiu v0, v0, -16900
 	ldloc 5
-	ldc.i4 -18508
+	ldc.i4 -16900
 	add
 	stloc 5
-// 0x010ab240: 0x10ab240: sw    v0, 112(s0)
+// 0x010ab888: 0x10ab888: sw    v0, 112(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1768,17 +1768,17 @@ L_10aafbc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab244: 0x10ab244: jal   0x1099190 addu  a0, s0, zero
+// 0x010ab88c: 0x10ab88c: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab24c: 0x10ab24c: addu  a1, s0, zero
+// 0x010ab894: 0x10ab894: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010ab250: 0x10ab250: sw    s4, 188(s0)
+// 0x010ab898: 0x10ab898: sw    s4, 188(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1787,34 +1787,34 @@ L_10aafbc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ab254: 0x10ab254: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010ab89c: 0x10ab89c: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab25c: 0x10ab25c: lui   a0, 0x20000
+// 0x010ab8a4: 0x10ab8a4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab260: 0x10ab260: addu  a3, s3, zero
+// 0x010ab8a8: 0x10ab8a8: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010ab264: 0x10ab264: addiu a0, a0, 14060
+// 0x010ab8ac: 0x10ab8ac: addiu a0, a0, 14520
 	ldloc.1
-	ldc.i4 14060
+	ldc.i4 14520
 	add
 	stloc.1
-// 0x010ab268: 0x10ab268: addu  a1, zero, zero
+// 0x010ab8b0: 0x10ab8b0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab26c: 0x10ab26c: addiu a2, zero, -2
+// 0x010ab8b4: 0x10ab8b4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010ab270: 0x10ab270: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010ab8b8: 0x10ab8b8: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1828,34 +1828,34 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab278: 0x10ab278: addu  a0, v0, zero
+// 0x010ab8c0: 0x10ab8c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab27c: 0x10ab27c: addu  a1, zero, zero
+// 0x010ab8c4: 0x10ab8c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ab280: 0x10ab280: addu  a2, zero, zero
+// 0x010ab8c8: 0x10ab8c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ab284: 0x10ab284: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010ab8cc: 0x10ab8cc: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010ab28c: 0x10ab28c: lui   a0, 0x20000
+// 0x010ab8d4: 0x10ab8d4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab290: 0x10ab290: jal   0x101cd60 addiu a0, a0, 14072
+// 0x010ab8d8: 0x10ab8d8: jal   0x101cd70 addiu a0, a0, 14532
 	ldloc.1
-	ldc.i4 14072
+	ldc.i4 14532
 	add
 	stloc.1
 	ldloc.0
@@ -1863,26 +1863,26 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab298: 0x10ab298: lui   a0, 0x20000
+// 0x010ab8e0: 0x10ab8e0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab29c: 0x10ab29c: addiu a2, zero, 16
+// 0x010ab8e4: 0x10ab8e4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010ab2a0: 0x10ab2a0: addiu a3, zero, 153
+// 0x010ab8e8: 0x10ab8e8: addiu a3, zero, 153
 	ldc.i4 153
 	stloc 4
-// 0x010ab2a4: 0x10ab2a4: addiu a0, a0, 14088
+// 0x010ab8ec: 0x10ab8ec: addiu a0, a0, 14548
 	ldloc.1
-	ldc.i4 14088
+	ldc.i4 14548
 	add
 	stloc.1
-// 0x010ab2a8: 0x10ab2a8: jal   0x1098d10 addu  a1, v0, zero
+// 0x010ab8f0: 0x10ab8f0: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1890,33 +1890,33 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab2b0: 0x10ab2b0: addu  a1, v0, zero
+// 0x010ab8f8: 0x10ab8f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ab2b4: 0x10ab2b4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010ab8fc: 0x10ab8fc: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab2bc: 0x10ab2bc: lui   v0, 0x10b0000
+// 0x010ab904: 0x10ab904: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010ab2c0: 0x10ab2c0: addiu v0, v0, -18564
+// 0x010ab908: 0x10ab908: addiu v0, v0, -16956
 	ldloc 5
-	ldc.i4 -18564
+	ldc.i4 -16956
 	add
 	stloc 5
-// 0x010ab2c4: 0x10ab2c4: sw    v0, 112(s0)
+// 0x010ab90c: 0x10ab90c: sw    v0, 112(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1925,20 +1925,20 @@ L_10aafbc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab2c8: 0x10ab2c8: jal   0x1099190 addu  a0, s0, zero
+// 0x010ab910: 0x10ab910: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab2d0: 0x10ab2d0: addu  a1, s0, zero
+// 0x010ab918: 0x10ab918: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010ab2d4: 0x10ab2d4: addu  a0, s2, zero
+// 0x010ab91c: 0x10ab91c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010ab2d8: 0x10ab2d8: jal   0x1098ec4 sw    s4, 188(s0)
+// 0x010ab920: 0x10ab920: jal   0x109950c sw    s4, 188(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1949,30 +1949,30 @@ L_10aafbc:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab2e0: 0x10ab2e0: addu  a0, s1, zero
+// 0x010ab928: 0x10ab928: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010ab2e4: 0x10ab2e4: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010ab92c: 0x10ab92c: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab2ec: 0x10ab2ec: addiu a0, s6, 13860
+// 0x010ab934: 0x10ab934: addiu a0, s6, 14320
 	ldloc 14
-	ldc.i4 13860
+	ldc.i4 14320
 	add
 	stloc.1
-// 0x010ab2f0: 0x10ab2f0: jal   0x1095eec addu  a1, zero, zero
+// 0x010ab938: 0x10ab938: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1980,50 +1980,50 @@ L_10aafbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab2f8: 0x10ab2f8: jal   0x102146c sll   zero, zero, 0
+// 0x010ab940: 0x10ab940: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab300: 0x10ab300: bne   v0, zero, 0x10ab47c sll   zero, zero, 0
+// 0x010ab948: 0x10ab948: bne   v0, zero, 0x10abac4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ab47c
+	brtrue L_10abac4
 // --- basic block ---
-// 0x010ab308: 0x10ab308: jal   0x1021900 sll   zero, zero, 0
+// 0x010ab950: 0x10ab950: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab310: 0x10ab310: j	 0x10ab488 addu  v0, zero, zero
+// 0x010ab958: 0x10ab958: j	 0x10abad0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10ab488
+	br L_10abad0
 // --- basic block ---
-L_10ab318:
-// 0x010ab318: 0x10ab318: lui   a1, 0x20000
+L_10ab960:
+// 0x010ab960: 0x10ab960: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ab31c: 0x10ab31c: lui   a3, 0x20000
+// 0x010ab964: 0x10ab964: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab320: 0x10ab320: sw    v0, 16(sp)
+// 0x010ab968: 0x10ab968: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2032,26 +2032,26 @@ L_10ab318:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab324: 0x10ab324: addiu a1, a1, 13476
+// 0x010ab96c: 0x10ab96c: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab328: 0x10ab328: addiu v0, zero, 5
+// 0x010ab970: 0x10ab970: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010ab32c: 0x10ab32c: addiu a3, a3, 14100
+// 0x010ab974: 0x10ab974: addiu a3, a3, 14560
 	ldloc 4
-	ldc.i4 14100
+	ldc.i4 14560
 	add
 	stloc 4
-// 0x010ab330: 0x10ab330: addiu a0, zero, 4
+// 0x010ab978: 0x10ab978: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ab334: 0x10ab334: addiu a2, zero, 892
+// 0x010ab97c: 0x10ab97c: addiu a2, zero, 892
 	ldc.i4 892
 	stloc.3
-// 0x010ab338: 0x10ab338: jal   0x100449c sw    v0, 20(sp)
+// 0x010ab980: 0x10ab980: jal   0x100449c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2070,48 +2070,48 @@ L_10ab318:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab340: 0x10ab340: lw    v1, 32696(s0)
+// 0x010ab988: 0x10ab988: lw    v1, -32376(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8174
+	ldc.i4 -8094
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ab344: 0x10ab344: j	 0x10ab440 addiu v0, zero, 1
+// 0x010ab98c: 0x10ab98c: j	 0x10aba88 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10ab440
+	br L_10aba88
 // --- basic block ---
-L_10ab34c:
-// 0x010ab34c: 0x10ab34c: lui   s0, 0x80000
-	ldc.i4 524288
+L_10ab994:
+// 0x010ab994: 0x10ab994: lui   s0, 0x90000
+	ldc.i4 589824
 	stloc 8
-L_10ab350:
-// 0x010ab350: 0x10ab350: lw    v1, 32696(s0)
+L_10ab998:
+// 0x010ab998: 0x10ab998: lw    v1, -32376(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8174
+	ldc.i4 -8094
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ab354: 0x10ab354: sll   zero, zero, 0
-// 0x010ab358: 0x10ab358: blez  v1, 0x10ab374 lui   a0, 0x10b0000
+// 0x010ab99c: 0x10ab99c: sll   zero, zero, 0
+// 0x010ab9a0: 0x10ab9a0: blez  v1, 0x10ab9bc lui   a0, 0x10b0000
 	ldloc 6
 	ldc.i4 17498112
 	stloc.1
 	ldc.i4.s 0
-	ble L_10ab374
+	ble L_10ab9bc
 // --- basic block ---
-// 0x010ab360: 0x10ab360: addiu a0, a0, -18684
+// 0x010ab9a8: 0x10ab9a8: addiu a0, a0, -17076
 	ldloc.1
-	ldc.i4 -18684
+	ldc.i4 -17076
 	add
 	stloc.1
-// 0x010ab364: 0x10ab364: jal   0x104fd00 sw    v0, 24(sp)
+// 0x010ab9ac: 0x10ab9ac: jal   0x104fd10 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2125,12 +2125,12 @@ L_10ab350:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab36c: 0x10ab36c: lw    v0, 24(sp)
+// 0x010ab9b4: 0x10ab9b4: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2139,37 +2139,37 @@ L_10ab350:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab370: 0x10ab370: sw    zero, 32696(s0)
+// 0x010ab9b8: 0x10ab9b8: sw    zero, -32376(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8174
+	ldc.i4 -8094
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10ab374:
-// 0x010ab374: 0x10ab374: lui   v1, 0x80000
-	ldc.i4 524288
+L_10ab9bc:
+// 0x010ab9bc: 0x10ab9bc: lui   v1, 0x90000
+	ldc.i4 589824
 	stloc 6
-// 0x010ab378: 0x10ab378: lw    a2, 32684(v1)
+// 0x010ab9c0: 0x10ab9c0: lw    a2, -32388(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 8171
+	ldc.i4 -8097
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ab37c: 0x10ab37c: lui   a1, 0x10000
+// 0x010ab9c4: 0x10ab9c4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010ab380: 0x10ab380: addu  a0, v0, zero
+// 0x010ab9c8: 0x10ab9c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab384: 0x10ab384: jal   0x106b68c addiu a1, a1, 18500
+// 0x010ab9cc: 0x10ab9cc: jal   0x106bcb0 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -2177,56 +2177,56 @@ L_10ab374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_GetGeoConfig_106b68c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_GetGeoConfig_106bcb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab38c: 0x10ab38c: bne   v0, zero, 0x10ab45c lui   s0, 0x80000
+// 0x010ab9d4: 0x10ab9d4: bne   v0, zero, 0x10abaa4 lui   s0, 0x90000
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4 589824
 	stloc 8
-	brtrue L_10ab45c
+	brtrue L_10abaa4
 // --- basic block ---
-// 0x010ab394: 0x10ab394: lw    v0, 32692(s0)
+// 0x010ab9dc: 0x10ab9dc: lw    v0, -32380(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8173
+	ldc.i4 -8095
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab398: 0x10ab398: addiu v1, zero, 3
+// 0x010ab9e0: 0x10ab9e0: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x010ab39c: 0x10ab39c: addiu v0, v0, 1
+// 0x010ab9e4: 0x10ab9e4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010ab3a0: 0x10ab3a0: sw    v0, 32692(s0)
+// 0x010ab9e8: 0x10ab9e8: sw    v0, -32380(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8173
+	ldc.i4 -8095
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab3a4: 0x10ab3a4: bne   v0, v1, 0x10ab414 lui   s1, 0x20000
+// 0x010ab9ec: 0x10ab9ec: bne   v0, v1, 0x10aba5c lui   s1, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc 9
-	bne.un L_10ab414
+	bne.un L_10aba5c
 // --- basic block ---
-// 0x010ab3ac: 0x10ab3ac: lui   a0, 0x10b0000
+// 0x010ab9f4: 0x10ab9f4: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010ab3b0: 0x10ab3b0: jal   0x104fd00 addiu a0, a0, -18684
+// 0x010ab9f8: 0x10ab9f8: jal   0x104fd10 addiu a0, a0, -17076
 	ldloc.1
-	ldc.i4 -18684
+	ldc.i4 -17076
 	add
 	stloc.1
 	ldloc.0
@@ -2234,28 +2234,28 @@ L_10ab374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab3b8: 0x10ab3b8: lui   a3, 0x20000
+// 0x010aba00: 0x10aba00: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab3bc: 0x10ab3bc: addiu a3, a3, 14176
+// 0x010aba04: 0x10aba04: addiu a3, a3, 14636
 	ldloc 4
-	ldc.i4 14176
+	ldc.i4 14636
 	add
 	stloc 4
-// 0x010ab3c0: 0x10ab3c0: addiu a2, zero, 912
+// 0x010aba08: 0x10aba08: addiu a2, zero, 912
 	ldc.i4 912
 	stloc.3
-// 0x010ab3c4: 0x10ab3c4: addiu a1, s1, 13476
+// 0x010aba0c: 0x10aba0c: addiu a1, s1, 13936
 	ldloc 9
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab3c8: 0x10ab3c8: jal   0x100449c addiu a0, zero, 4
+// 0x010aba10: 0x10aba10: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -2268,20 +2268,20 @@ L_10ab374:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab3d0: 0x10ab3d0: lui   a0, 0x0
+// 0x010aba18: 0x10aba18: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ab3d4: 0x10ab3d4: lui   a1, 0x20000
+// 0x010aba1c: 0x10aba1c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ab3d8: 0x10ab3d8: addiu a0, a0, 30092
+// 0x010aba20: 0x10aba20: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010ab3dc: 0x10ab3dc: jal   0x104c148 addiu a1, a1, 13640
+// 0x010aba24: 0x10aba24: jal   0x104c158 addiu a1, a1, 14100
 	ldloc.2
-	ldc.i4 13640
+	ldc.i4 14100
 	add
 	stloc.2
 	ldloc.0
@@ -2289,17 +2289,17 @@ L_10ab374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab3e4: 0x10ab3e4: lui   a0, 0x10b0000
+// 0x010aba2c: 0x10aba2c: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010ab3e8: 0x10ab3e8: jal   0x104fd00 addiu a0, a0, -15712
+// 0x010aba30: 0x10aba30: jal   0x104fd10 addiu a0, a0, -14104
 	ldloc.1
-	ldc.i4 -15712
+	ldc.i4 -14104
 	add
 	stloc.1
 	ldloc.0
@@ -2307,29 +2307,29 @@ L_10ab374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab3f0: 0x10ab3f0: lui   v0, 0x90000
+// 0x010aba38: 0x10aba38: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ab3f4: 0x10ab3f4: lw    v0, -32504(v0)
+// 0x010aba3c: 0x10aba3c: lw    v0, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab3f8: 0x10ab3f8: sll   zero, zero, 0
-// 0x010ab3fc: 0x10ab3fc: beq   v0, zero, 0x10ab47c sll   zero, zero, 0
+// 0x010aba40: 0x10aba40: sll   zero, zero, 0
+// 0x010aba44: 0x10aba44: beq   v0, zero, 0x10abac4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ab47c
+	brfalse L_10abac4
 // --- basic block ---
-// 0x010ab404: 0x10ab404: jalr  v0 sll   zero, zero, 0
+// 0x010aba4c: 0x10aba4c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2341,16 +2341,16 @@ L_10ab374:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab40c: 0x10ab40c: j	 0x10ab488 addu  v0, zero, zero
+// 0x010aba54: 0x10aba54: j	 0x10abad0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10ab488
+	br L_10abad0
 // --- basic block ---
-L_10ab414:
-// 0x010ab414: 0x10ab414: lui   a3, 0x20000
+L_10aba5c:
+// 0x010aba5c: 0x10aba5c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab418: 0x10ab418: sw    v0, 16(sp)
+// 0x010aba60: 0x10aba60: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2359,26 +2359,26 @@ L_10ab414:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab41c: 0x10ab41c: addiu a1, s1, 13476
+// 0x010aba64: 0x10aba64: addiu a1, s1, 13936
 	ldloc 9
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab420: 0x10ab420: addiu v0, zero, 5
+// 0x010aba68: 0x10aba68: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010ab424: 0x10ab424: addiu a3, a3, 14212
+// 0x010aba6c: 0x10aba6c: addiu a3, a3, 14672
 	ldloc 4
-	ldc.i4 14212
+	ldc.i4 14672
 	add
 	stloc 4
-// 0x010ab428: 0x10ab428: addiu a0, zero, 4
+// 0x010aba70: 0x10aba70: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ab42c: 0x10ab42c: addiu a2, zero, 920
+// 0x010aba74: 0x10aba74: addiu a2, zero, 920
 	ldc.i4 920
 	stloc.3
-// 0x010ab430: 0x10ab430: jal   0x100449c sw    v0, 20(sp)
+// 0x010aba78: 0x10aba78: jal   0x100449c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2397,32 +2397,32 @@ L_10ab414:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab438: 0x10ab438: lw    v1, 32692(s0)
+// 0x010aba80: 0x10aba80: lw    v1, -32380(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8173
+	ldc.i4 -8095
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ab43c: 0x10ab43c: addiu v0, zero, 1
+// 0x010aba84: 0x10aba84: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10ab440:
-// 0x010ab440: 0x10ab440: bne   v1, v0, 0x10ab484 lui   a1, 0x10b0000
+L_10aba88:
+// 0x010aba88: 0x10aba88: bne   v1, v0, 0x10abacc lui   a1, 0x10b0000
 	ldloc 6
 	ldloc 5
 	ldc.i4 17498112
 	stloc.2
-	bne.un L_10ab484
+	bne.un L_10abacc
 // --- basic block ---
-// 0x010ab448: 0x10ab448: addiu a1, a1, -18684
+// 0x010aba90: 0x10aba90: addiu a1, a1, -17076
 	ldloc.2
-	ldc.i4 -18684
+	ldc.i4 -17076
 	add
 	stloc.2
-// 0x010ab44c: 0x10ab44c: jal   0x104fe98 addiu a0, zero, 5000
+// 0x010aba94: 0x10aba94: jal   0x104fea8 addiu a0, zero, 5000
 	ldc.i4 5000
 	stloc.1
 	ldloc.0
@@ -2430,37 +2430,37 @@ L_10ab440:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab454: 0x10ab454: j	 0x10ab488 addiu v0, zero, 1
+// 0x010aba9c: 0x10aba9c: j	 0x10abad0 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10ab488
+	br L_10abad0
 // --- basic block ---
-L_10ab45c:
-// 0x010ab45c: 0x10ab45c: lw    v0, 32692(s0)
+L_10abaa4:
+// 0x010abaa4: 0x10abaa4: lw    v0, -32380(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 8173
+	ldc.i4 -8095
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab460: 0x10ab460: sll   zero, zero, 0
-// 0x010ab464: 0x10ab464: blez  v0, 0x10ab484 lui   a0, 0x10b0000
+// 0x010abaa8: 0x10abaa8: sll   zero, zero, 0
+// 0x010abaac: 0x10abaac: blez  v0, 0x10abacc lui   a0, 0x10b0000
 	ldloc 5
 	ldc.i4 17498112
 	stloc.1
 	ldc.i4.s 0
-	ble L_10ab484
+	ble L_10abacc
 // --- basic block ---
-// 0x010ab46c: 0x10ab46c: jal   0x104fd00 addiu a0, a0, -18684
+// 0x010abab4: 0x10abab4: jal   0x104fd10 addiu a0, a0, -17076
 	ldloc.1
-	ldc.i4 -18684
+	ldc.i4 -17076
 	add
 	stloc.1
 	ldloc.0
@@ -2468,29 +2468,29 @@ L_10ab45c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab474: 0x10ab474: j	 0x10ab488 addiu v0, zero, 1
+// 0x010ababc: 0x10ababc: j	 0x10abad0 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10ab488
+	br L_10abad0
 // --- basic block ---
-L_10ab47c:
-// 0x010ab47c: 0x10ab47c: j	 0x10ab488 addu  v0, zero, zero
+L_10abac4:
+// 0x010abac4: 0x10abac4: j	 0x10abad0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10ab488
+	br L_10abad0
 // --- basic block ---
-L_10ab484:
-// 0x010ab484: 0x10ab484: addiu v0, zero, 1
+L_10abacc:
+// 0x010abacc: 0x10abacc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10ab488:
-// 0x010ab488: 0x10ab488: lw    ra, 68(sp)
-// 0x010ab48c: 0x10ab48c: lw    s7, 64(sp)
+L_10abad0:
+// 0x010abad0: 0x10abad0: lw    ra, 68(sp)
+// 0x010abad4: 0x10abad4: lw    s7, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2499,7 +2499,7 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ab490: 0x10ab490: lw    s6, 60(sp)
+// 0x010abad8: 0x10abad8: lw    s6, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2508,7 +2508,7 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ab494: 0x10ab494: lw    s5, 56(sp)
+// 0x010abadc: 0x10abadc: lw    s5, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2517,7 +2517,7 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ab498: 0x10ab498: lw    s4, 52(sp)
+// 0x010abae0: 0x10abae0: lw    s4, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2526,7 +2526,7 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ab49c: 0x10ab49c: lw    s3, 48(sp)
+// 0x010abae4: 0x10abae4: lw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2535,7 +2535,7 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ab4a0: 0x10ab4a0: lw    s2, 44(sp)
+// 0x010abae8: 0x10abae8: lw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2544,7 +2544,7 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ab4a4: 0x10ab4a4: lw    s1, 40(sp)
+// 0x010abaec: 0x10abaec: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2553,7 +2553,7 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ab4a8: 0x10ab4a8: lw    s0, 36(sp)
+// 0x010abaf0: 0x10abaf0: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2562,23 +2562,23 @@ L_10ab488:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ab4ac: 0x10ab4ac: jr    ra addiu sp, sp, 72
+// 0x010abaf4: 0x10abaf4: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10ab4b4:
-// 0x010ab4b4: 0x10ab4b4: lui   s0, 0x80000
-	ldc.i4 524288
+L_10abafc:
+// 0x010abafc: 0x10abafc: lui   s0, 0x90000
+	ldc.i4 589824
 	stloc 8
-// 0x010ab4b8: 0x10ab4b8: addiu s0, s0, 32700
+// 0x010abb00: 0x10abb00: addiu s0, s0, -32372
 	ldloc 8
-	ldc.i4 32700
+	ldc.i4 -32372
 	add
 	stloc 8
-// 0x010ab4bc: 0x10ab4bc: lw    v1, 4(s0)
+// 0x010abb04: 0x10abb04: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2587,29 +2587,29 @@ L_10ab4b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ab4c0: 0x10ab4c0: lui   a1, 0x20000
+// 0x010abb08: 0x10abb08: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ab4c4: 0x10ab4c4: lui   a3, 0x20000
+// 0x010abb0c: 0x10abb0c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab4c8: 0x10ab4c8: addiu a1, a1, 13476
+// 0x010abb10: 0x10abb10: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab4cc: 0x10ab4cc: addiu a3, a3, 14296
+// 0x010abb14: 0x10abb14: addiu a3, a3, 14756
 	ldloc 4
-	ldc.i4 14296
+	ldc.i4 14756
 	add
 	stloc 4
-// 0x010ab4d0: 0x10ab4d0: addiu a0, zero, 2
+// 0x010abb18: 0x10abb18: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010ab4d4: 0x10ab4d4: addiu a2, zero, 899
+// 0x010abb1c: 0x10abb1c: addiu a2, zero, 899
 	ldc.i4 899
 	stloc.3
-// 0x010ab4d8: 0x10ab4d8: sw    v0, 20(sp)
+// 0x010abb20: 0x10abb20: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2618,7 +2618,7 @@ L_10ab4b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ab4dc: 0x10ab4dc: jal   0x100449c sw    v1, 16(sp)
+// 0x010abb24: 0x10abb24: jal   0x100449c sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2637,17 +2637,17 @@ L_10ab4b4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab4e4: 0x10ab4e4: j	 0x10ab34c addu  v0, s0, zero
+// 0x010abb2c: 0x10abb2c: j	 0x10ab994 addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-	br L_10ab34c
+	br L_10ab994
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_config_10ab4ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_10abb34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -2694,25 +2694,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ab4ec: 0x10ab4ec: addiu sp, sp, -48
+// 0x010abb34: 0x10abb34: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010ab4f0: 0x10ab4f0: lui   v0, 0x90000
+// 0x010abb38: 0x10abb38: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ab4f4: 0x10ab4f4: sw    ra, 44(sp)
-// 0x010ab4f8: 0x10ab4f8: sw    a0, -32504(v0)
+// 0x010abb3c: 0x10abb3c: sw    ra, 44(sp)
+// 0x010abb40: 0x10abb40: sw    a0, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldloc.1
 	stelem.i4
-// 0x010ab4fc: 0x10ab4fc: sw    s1, 32(sp)
+// 0x010abb44: 0x10abb44: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2721,7 +2721,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ab500: 0x10ab500: sw    s0, 28(sp)
+// 0x010abb48: 0x10abb48: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2730,7 +2730,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ab504: 0x10ab504: sw    s3, 40(sp)
+// 0x010abb4c: 0x10abb4c: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2739,10 +2739,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ab508: 0x10ab508: addu  s0, a0, zero
+// 0x010abb50: 0x10abb50: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010ab50c: 0x10ab50c: jal   0x10aa9c8 sw    s2, 36(sp)
+// 0x010abb54: 0x10abb54: jal   0x10ab010 sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2756,15 +2756,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_init_10aa9c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_init_10ab010(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab514: 0x10ab514: lui   a0, 0x0
+// 0x010abb5c: 0x10abb5c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ab518: 0x10ab518: jal   0x100e348 addiu a0, a0, 18764
+// 0x010abb60: 0x10abb60: jal   0x100e358 addiu a0, a0, 18764
 	ldloc.1
 	ldc.i4 18764
 	add
@@ -2774,20 +2774,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab520: 0x10ab520: lui   a0, 0x0
+// 0x010abb68: 0x10abb68: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ab524: 0x10ab524: addiu a0, a0, 18780
+// 0x010abb6c: 0x10abb6c: addiu a0, a0, 18780
 	ldloc.1
 	ldc.i4 18780
 	add
 	stloc.1
-// 0x010ab528: 0x10ab528: jal   0x100e348 addu  s1, v0, zero
+// 0x010abb70: 0x10abb70: jal   0x100e358 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2795,26 +2795,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab530: 0x10ab530: lbu   v1, 0(v0)
+// 0x010abb78: 0x10abb78: lbu   v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x010ab534: 0x10ab534: sll   zero, zero, 0
-// 0x010ab538: 0x10ab538: beq   v1, zero, 0x10ab550 lui   s2, 0x20000
+// 0x010abb7c: 0x10abb7c: sll   zero, zero, 0
+// 0x010abb80: 0x10abb80: beq   v1, zero, 0x10abb98 lui   s2, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 10
-	brfalse L_10ab550
+	brfalse L_10abb98
 // --- basic block ---
-// 0x010ab540: 0x10ab540: addu  a0, v0, zero
+// 0x010abb88: 0x10abb88: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ab544: 0x10ab544: jal   0x101da7c addu  a1, zero, zero
+// 0x010abb8c: 0x10abb8c: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2822,35 +2822,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab54c: 0x10ab54c: lui   s2, 0x20000
+// 0x010abb94: 0x10abb94: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-L_10ab550:
-// 0x010ab550: 0x10ab550: lui   a3, 0x20000
+L_10abb98:
+// 0x010abb98: 0x10abb98: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab554: 0x10ab554: addiu a3, a3, 14364
+// 0x010abb9c: 0x10abb9c: addiu a3, a3, 14824
 	ldloc 4
-	ldc.i4 14364
+	ldc.i4 14824
 	add
 	stloc 4
-// 0x010ab558: 0x10ab558: addiu a0, zero, 4
+// 0x010abba0: 0x10abba0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ab55c: 0x10ab55c: addiu a1, s2, 13476
+// 0x010abba4: 0x10abba4: addiu a1, s2, 13936
 	ldloc 10
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab560: 0x10ab560: addiu a2, zero, 1030
+// 0x010abba8: 0x10abba8: addiu a2, zero, 1030
 	ldc.i4 1030
 	stloc.3
-// 0x010ab564: 0x10ab564: jal   0x100449c sw    s1, 16(sp)
+// 0x010abbac: 0x10abbac: jal   0x100449c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2869,35 +2869,35 @@ L_10ab550:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab56c: 0x10ab56c: jal   0x10aae24 sll   zero, zero, 0
+// 0x010abbb4: 0x10abbb4: jal   0x10ab46c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::need_to_ask_server_10aae24(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::need_to_ask_server_10ab46c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab574: 0x10ab574: beq   v0, zero, 0x10ab674 sll   zero, zero, 0
+// 0x010abbbc: 0x10abbbc: beq   v0, zero, 0x10abcbc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ab674
+	brfalse L_10abcbc
 // --- basic block ---
-// 0x010ab57c: 0x10ab57c: lb    v0, 0(s1)
+// 0x010abbc4: 0x10abbc4: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010ab580: 0x10ab580: sll   zero, zero, 0
-// 0x010ab584: 0x10ab584: beq   v0, zero, 0x10ab674 lui   s3, 0x10000
+// 0x010abbc8: 0x10abbc8: sll   zero, zero, 0
+// 0x010abbcc: 0x10abbcc: beq   v0, zero, 0x10abcbc lui   s3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 11
-	brfalse L_10ab674
+	brfalse L_10abcbc
 // --- basic block ---
-// 0x010ab58c: 0x10ab58c: jal   0x101d270 addiu a0, s3, 18500
+// 0x010abbd4: 0x10abbd4: jal   0x101d280 addiu a0, s3, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -2905,14 +2905,14 @@ L_10ab550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_update_time_101d270(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_update_time_101d280(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab594: 0x10ab594: jal   0x1044488 addiu a0, s3, 18500
+// 0x010abbdc: 0x10abbdc: jal   0x1044498 addiu a0, s3, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -2920,31 +2920,31 @@ L_10ab550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_update_time_1044488(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_update_time_1044498(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab59c: 0x10ab59c: jal   0x1021900 sll   zero, zero, 0
+// 0x010abbe4: 0x10abbe4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab5a4: 0x10ab5a4: lui   a1, 0x20000
+// 0x010abbec: 0x10abbec: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ab5a8: 0x10ab5a8: addu  a0, s1, zero
+// 0x010abbf0: 0x10abbf0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010ab5ac: 0x10ab5ac: jal   0x1001b14 addiu a1, a1, 14388
+// 0x010abbf4: 0x10abbf4: jal   0x1001b14 addiu a1, a1, 14848
 	ldloc.2
-	ldc.i4 14388
+	ldc.i4 14848
 	add
 	stloc.2
 	ldloc.1
@@ -2952,29 +2952,29 @@ L_10ab550:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab5b4: 0x10ab5b4: bne   v0, zero, 0x10ab5e4 lui   a1, 0x20000
+// 0x010abbfc: 0x10abbfc: bne   v0, zero, 0x10abc2c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10ab5e4
+	brtrue L_10abc2c
 // --- basic block ---
-// 0x010ab5bc: 0x10ab5bc: lui   a3, 0x20000
+// 0x010abc04: 0x10abc04: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab5c0: 0x10ab5c0: addiu a1, s2, 13476
+// 0x010abc08: 0x10abc08: addiu a1, s2, 13936
 	ldloc 10
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab5c4: 0x10ab5c4: addiu a3, a3, 14392
+// 0x010abc0c: 0x10abc0c: addiu a3, a3, 14852
 	ldloc 4
-	ldc.i4 14392
+	ldc.i4 14852
 	add
 	stloc 4
-// 0x010ab5c8: 0x10ab5c8: addiu a2, zero, 1041
+// 0x010abc10: 0x10abc10: addiu a2, zero, 1041
 	ldc.i4 1041
 	stloc.3
-// 0x010ab5cc: 0x10ab5cc: jal   0x100449c addiu a0, zero, 4
+// 0x010abc14: 0x10abc14: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -2987,7 +2987,7 @@ L_10ab550:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab5d4: 0x10ab5d4: jal   0x10aad48 addu  a0, s0, zero
+// 0x010abc1c: 0x10abc1c: jal   0x10ab390 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2995,21 +2995,21 @@ L_10ab550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::roadmap_geo_config_il_10aad48(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::roadmap_geo_config_il_10ab390(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab5dc: 0x10ab5dc: j	 0x10ab6e8 sll   zero, zero, 0
-	br L_10ab6e8
+// 0x010abc24: 0x10abc24: j	 0x10abd30 sll   zero, zero, 0
+	br L_10abd30
 // --- basic block ---
-L_10ab5e4:
-// 0x010ab5e4: 0x10ab5e4: addiu a1, a1, 13724
+L_10abc2c:
+// 0x010abc2c: 0x10abc2c: addiu a1, a1, 14184
 	ldloc.2
-	ldc.i4 13724
+	ldc.i4 14184
 	add
 	stloc.2
-// 0x010ab5e8: 0x10ab5e8: jal   0x1001b14 addu  a0, s1, zero
+// 0x010abc30: 0x10abc30: jal   0x1001b14 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -3017,29 +3017,29 @@ L_10ab5e4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab5f0: 0x10ab5f0: bne   v0, zero, 0x10ab620 lui   a1, 0x20000
+// 0x010abc38: 0x10abc38: bne   v0, zero, 0x10abc68 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10ab620
+	brtrue L_10abc68
 // --- basic block ---
-// 0x010ab5f8: 0x10ab5f8: lui   a3, 0x20000
+// 0x010abc40: 0x10abc40: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab5fc: 0x10ab5fc: addiu a1, s2, 13476
+// 0x010abc44: 0x10abc44: addiu a1, s2, 13936
 	ldloc 10
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab600: 0x10ab600: addiu a3, a3, 14440
+// 0x010abc48: 0x10abc48: addiu a3, a3, 14900
 	ldloc 4
-	ldc.i4 14440
+	ldc.i4 14900
 	add
 	stloc 4
-// 0x010ab604: 0x10ab604: addiu a2, zero, 1046
+// 0x010abc4c: 0x10abc4c: addiu a2, zero, 1046
 	ldc.i4 1046
 	stloc.3
-// 0x010ab608: 0x10ab608: jal   0x100449c addiu a0, zero, 4
+// 0x010abc50: 0x10abc50: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -3052,7 +3052,7 @@ L_10ab5e4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab610: 0x10ab610: jal   0x10aacd8 addu  a0, s0, zero
+// 0x010abc58: 0x10abc58: jal   0x10ab320 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3060,21 +3060,21 @@ L_10ab5e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_usa_10aacd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_usa_10ab320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab618: 0x10ab618: j	 0x10ab6e8 sll   zero, zero, 0
-	br L_10ab6e8
+// 0x010abc60: 0x10abc60: j	 0x10abd30 sll   zero, zero, 0
+	br L_10abd30
 // --- basic block ---
-L_10ab620:
-// 0x010ab620: 0x10ab620: addiu a1, a1, -22960
+L_10abc68:
+// 0x010abc68: 0x10abc68: addiu a1, a1, -22496
 	ldloc.2
-	ldc.i4 -22960
+	ldc.i4 -22496
 	add
 	stloc.2
-// 0x010ab624: 0x10ab624: jal   0x1001b14 addu  a0, s1, zero
+// 0x010abc6c: 0x10abc6c: jal   0x1001b14 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -3082,29 +3082,29 @@ L_10ab620:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab62c: 0x10ab62c: bne   v0, zero, 0x10ab65c lui   a3, 0x20000
+// 0x010abc74: 0x10abc74: bne   v0, zero, 0x10abca4 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10ab65c
+	brtrue L_10abca4
 // --- basic block ---
-// 0x010ab634: 0x10ab634: lui   a3, 0x20000
+// 0x010abc7c: 0x10abc7c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab638: 0x10ab638: addiu a1, s2, 13476
+// 0x010abc80: 0x10abc80: addiu a1, s2, 13936
 	ldloc 10
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab63c: 0x10ab63c: addiu a3, a3, 14488
+// 0x010abc84: 0x10abc84: addiu a3, a3, 14948
 	ldloc 4
-	ldc.i4 14488
+	ldc.i4 14948
 	add
 	stloc 4
-// 0x010ab640: 0x10ab640: addiu a2, zero, 1051
+// 0x010abc88: 0x10abc88: addiu a2, zero, 1051
 	ldc.i4 1051
 	stloc.3
-// 0x010ab644: 0x10ab644: jal   0x100449c addiu a0, zero, 4
+// 0x010abc8c: 0x10abc8c: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -3117,7 +3117,7 @@ L_10ab620:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab64c: 0x10ab64c: jal   0x10aac18 addu  a0, s0, zero
+// 0x010abc94: 0x10abc94: jal   0x10ab260 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3125,32 +3125,32 @@ L_10ab620:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_other_10aac18(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_other_10ab260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab654: 0x10ab654: j	 0x10ab6e8 sll   zero, zero, 0
-	br L_10ab6e8
+// 0x010abc9c: 0x10abc9c: j	 0x10abd30 sll   zero, zero, 0
+	br L_10abd30
 // --- basic block ---
-L_10ab65c:
-// 0x010ab65c: 0x10ab65c: addiu a1, s2, 13476
+L_10abca4:
+// 0x010abca4: 0x10abca4: addiu a1, s2, 13936
 	ldloc 10
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab660: 0x10ab660: addiu a3, a3, 14540
+// 0x010abca8: 0x10abca8: addiu a3, a3, 15000
 	ldloc 4
-	ldc.i4 14540
+	ldc.i4 15000
 	add
 	stloc 4
-// 0x010ab664: 0x10ab664: addiu a0, zero, 4
+// 0x010abcac: 0x10abcac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ab668: 0x10ab668: addiu a2, zero, 1056
+// 0x010abcb0: 0x10abcb0: addiu a2, zero, 1056
 	ldc.i4 1056
 	stloc.3
-// 0x010ab66c: 0x10ab66c: jal   0x100449c sw    s1, 16(sp)
+// 0x010abcb4: 0x10abcb4: jal   0x100449c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3169,28 +3169,28 @@ L_10ab65c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10ab674:
-// 0x010ab674: 0x10ab674: jal   0x10aae24 sll   zero, zero, 0
+L_10abcbc:
+// 0x010abcbc: 0x10abcbc: jal   0x10ab46c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::need_to_ask_server_10aae24(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::need_to_ask_server_10ab46c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab67c: 0x10ab67c: beq   v0, zero, 0x10ab6d0 sll   zero, zero, 0
+// 0x010abcc4: 0x10abcc4: beq   v0, zero, 0x10abd18 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ab6d0
+	brfalse L_10abd18
 // --- basic block ---
-// 0x010ab684: 0x10ab684: lui   s0, 0x10000
+// 0x010abccc: 0x10abccc: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010ab688: 0x10ab688: jal   0x101d270 addiu a0, s0, 18500
+// 0x010abcd0: 0x10abcd0: jal   0x101d280 addiu a0, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -3198,14 +3198,14 @@ L_10ab674:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_update_time_101d270(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_update_time_101d280(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab690: 0x10ab690: jal   0x1044488 addiu a0, s0, 18500
+// 0x010abcd8: 0x10abcd8: jal   0x1044498 addiu a0, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -3213,57 +3213,57 @@ L_10ab674:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_update_time_1044488(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_update_time_1044498(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab698: 0x10ab698: jal   0x1021900 sll   zero, zero, 0
+// 0x010abce0: 0x10abce0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab6a0: 0x10ab6a0: jal   0x10aae88 sll   zero, zero, 0
+// 0x010abce8: 0x10abce8: jal   0x10ab4d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::request_geo_config_10aae88(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::request_geo_config_10ab4d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab6a8: 0x10ab6a8: beq   v0, zero, 0x10ab6e8 lui   a0, 0x20000
+// 0x010abcf0: 0x10abcf0: beq   v0, zero, 0x10abd30 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_10ab6e8
+	brfalse L_10abd30
 // --- basic block ---
-// 0x010ab6b0: 0x10ab6b0: jal   0x104c3d0 addiu a0, a0, 13684
+// 0x010abcf8: 0x10abcf8: jal   0x104c3e0 addiu a0, a0, 14144
 	ldloc.1
-	ldc.i4 13684
+	ldc.i4 14144
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab6b8: 0x10ab6b8: lui   a1, 0x10b0000
+// 0x010abd00: 0x10abd00: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010ab6bc: 0x10ab6bc: addiu a1, a1, -15712
+// 0x010abd04: 0x10abd04: addiu a1, a1, -14104
 	ldloc.2
-	ldc.i4 -15712
+	ldc.i4 -14104
 	add
 	stloc.2
-// 0x010ab6c0: 0x10ab6c0: jal   0x104fe98 ori   a0, zero, 60000
+// 0x010abd08: 0x10abd08: jal   0x104fea8 ori   a0, zero, 60000
 	ldc.i4.s 0
 	ldc.i4 60000
 	or
@@ -3273,22 +3273,22 @@ L_10ab674:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab6c8: 0x10ab6c8: j	 0x10ab6e8 sll   zero, zero, 0
-	br L_10ab6e8
+// 0x010abd10: 0x10abd10: j	 0x10abd30 sll   zero, zero, 0
+	br L_10abd30
 // --- basic block ---
-L_10ab6d0:
-// 0x010ab6d0: 0x10ab6d0: beq   s0, zero, 0x10ab6e4 lui   v0, 0x90000
+L_10abd18:
+// 0x010abd18: 0x10abd18: beq   s0, zero, 0x10abd2c lui   v0, 0x90000
 	ldloc 8
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10ab6e4
+	brfalse L_10abd2c
 // --- basic block ---
-// 0x010ab6d8: 0x10ab6d8: jalr  s0 sll   zero, zero, 0
+// 0x010abd20: 0x10abd20: jalr  s0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -3300,22 +3300,22 @@ L_10ab6d0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ab6e0: 0x10ab6e0: lui   v0, 0x90000
+// 0x010abd28: 0x10abd28: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10ab6e4:
-// 0x010ab6e4: 0x10ab6e4: sw    zero, -32504(v0)
+L_10abd2c:
+// 0x010abd2c: 0x10abd2c: sw    zero, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10ab6e8:
-// 0x010ab6e8: 0x10ab6e8: lw    ra, 44(sp)
-// 0x010ab6ec: 0x10ab6ec: lw    s3, 40(sp)
+L_10abd30:
+// 0x010abd30: 0x10abd30: lw    ra, 44(sp)
+// 0x010abd34: 0x10abd34: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3324,7 +3324,7 @@ L_10ab6e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ab6f0: 0x10ab6f0: lw    s2, 36(sp)
+// 0x010abd38: 0x10abd38: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3333,7 +3333,7 @@ L_10ab6e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ab6f4: 0x10ab6f4: lw    s1, 32(sp)
+// 0x010abd3c: 0x10abd3c: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3342,7 +3342,7 @@ L_10ab6e8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ab6f8: 0x10ab6f8: lw    s0, 28(sp)
+// 0x010abd40: 0x10abd40: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3351,7 +3351,7 @@ L_10ab6e8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ab6fc: 0x10ab6fc: jr    ra addiu sp, sp, 48
+// 0x010abd44: 0x10abd44: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3363,7 +3363,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 retry_10ab704(int32,int32,int32,int32,int32)
+.method public static int32 retry_10abd4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -3398,37 +3398,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ab704: 0x10ab704: addiu sp, sp, -24
+// 0x010abd4c: 0x10abd4c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ab708: 0x10ab708: sw    ra, 20(sp)
-// 0x010ab70c: 0x10ab70c: jal   0x10aae88 sll   zero, zero, 0
+// 0x010abd50: 0x10abd50: sw    ra, 20(sp)
+// 0x010abd54: 0x10abd54: jal   0x10ab4d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::request_geo_config_10aae88(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::request_geo_config_10ab4d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ab714: 0x10ab714: bne   v0, zero, 0x10ab724 sll   zero, zero, 0
+// 0x010abd5c: 0x10abd5c: bne   v0, zero, 0x10abd6c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ab724
+	brtrue L_10abd6c
 // --- basic block ---
-// 0x010ab71c: 0x10ab71c: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010abd64: 0x10abd64: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ab724:
-// 0x010ab724: 0x10ab724: lw    ra, 20(sp)
-// 0x010ab728: 0x10ab728: sll   zero, zero, 0
-// 0x010ab72c: 0x10ab72c: jr    ra addiu sp, sp, 24
+L_10abd6c:
+// 0x010abd6c: 0x10abd6c: lw    ra, 20(sp)
+// 0x010abd70: 0x10abd70: sll   zero, zero, 0
+// 0x010abd74: 0x10abd74: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3440,7 +3440,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 lang_loaded_10ab734(int32,int32,int32,int32,int32)
+.method public static int32 lang_loaded_10abd7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3475,47 +3475,47 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ab734: 0x10ab734: addiu sp, sp, -24
+// 0x010abd7c: 0x10abd7c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ab738: 0x10ab738: sw    ra, 20(sp)
-// 0x010ab73c: 0x10ab73c: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010abd80: 0x10abd80: sw    ra, 20(sp)
+// 0x010abd84: 0x10abd84: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ab744: 0x10ab744: jal   0x102146c sll   zero, zero, 0
+// 0x010abd8c: 0x10abd8c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ab74c: 0x10ab74c: lui   v0, 0x90000
+// 0x010abd94: 0x10abd94: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ab750: 0x10ab750: lw    v0, -32504(v0)
+// 0x010abd98: 0x10abd98: lw    v0, -32040(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab754: 0x10ab754: sll   zero, zero, 0
-// 0x010ab758: 0x10ab758: beq   v0, zero, 0x10ab768 sll   zero, zero, 0
+// 0x010abd9c: 0x10abd9c: sll   zero, zero, 0
+// 0x010abda0: 0x10abda0: beq   v0, zero, 0x10abdb0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ab768
+	brfalse L_10abdb0
 // --- basic block ---
-// 0x010ab760: 0x10ab760: jalr  v0 sll   zero, zero, 0
+// 0x010abda8: 0x10abda8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3527,21 +3527,21 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ab768:
-// 0x010ab768: 0x10ab768: lw    ra, 20(sp)
-// 0x010ab76c: 0x10ab76c: lui   v0, 0x90000
+L_10abdb0:
+// 0x010abdb0: 0x10abdb0: lw    ra, 20(sp)
+// 0x010abdb4: 0x10abdb4: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ab770: 0x10ab770: sw    zero, -32504(v0)
+// 0x010abdb8: 0x10abdb8: sw    zero, -32040(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ab774: 0x10ab774: jr    ra addiu sp, sp, 24
+// 0x010abdbc: 0x10abdbc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3553,7 +3553,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 other_callback_10ab77c(int32,int32,int32,int32,int32)
+.method public static int32 other_callback_10abdc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3588,44 +3588,44 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ab77c: 0x10ab77c: lui   v0, 0x90000
+// 0x010abdc4: 0x10abdc4: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ab780: 0x10ab780: lw    a0, -32504(v0)
+// 0x010abdc8: 0x10abdc8: lw    a0, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ab784: 0x10ab784: addiu sp, sp, -24
+// 0x010abdcc: 0x10abdcc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ab788: 0x10ab788: sw    ra, 20(sp)
-// 0x010ab78c: 0x10ab78c: jal   0x10aac18 sll   zero, zero, 0
+// 0x010abdd0: 0x10abdd0: sw    ra, 20(sp)
+// 0x010abdd4: 0x10abdd4: jal   0x10ab260 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_other_10aac18(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_other_10ab260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ab794: 0x10ab794: lui   a0, 0x20000
+// 0x010abddc: 0x10abddc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab798: 0x10ab798: addiu a0, a0, 13860
+// 0x010abde0: 0x10abde0: addiu a0, a0, 14320
 	ldloc.1
-	ldc.i4 13860
+	ldc.i4 14320
 	add
 	stloc.1
-// 0x010ab79c: 0x10ab79c: jal   0x1094884 addiu a1, zero, 1
+// 0x010abde4: 0x10abde4: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3633,16 +3633,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ab7a4: 0x10ab7a4: lw    ra, 20(sp)
-// 0x010ab7a8: 0x10ab7a8: addu  v0, zero, zero
+// 0x010abdec: 0x10abdec: lw    ra, 20(sp)
+// 0x010abdf0: 0x10abdf0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010ab7ac: 0x10ab7ac: jr    ra addiu sp, sp, 24
+// 0x010abdf4: 0x10abdf4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3654,7 +3654,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 il_callback_10ab7b4(int32,int32,int32,int32,int32)
+.method public static int32 il_callback_10abdfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3689,44 +3689,44 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ab7b4: 0x10ab7b4: lui   v0, 0x90000
+// 0x010abdfc: 0x10abdfc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ab7b8: 0x10ab7b8: lw    a0, -32504(v0)
+// 0x010abe00: 0x10abe00: lw    a0, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ab7bc: 0x10ab7bc: addiu sp, sp, -24
+// 0x010abe04: 0x10abe04: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ab7c0: 0x10ab7c0: sw    ra, 20(sp)
-// 0x010ab7c4: 0x10ab7c4: jal   0x10aad48 sll   zero, zero, 0
+// 0x010abe08: 0x10abe08: sw    ra, 20(sp)
+// 0x010abe0c: 0x10abe0c: jal   0x10ab390 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::roadmap_geo_config_il_10aad48(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::roadmap_geo_config_il_10ab390(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ab7cc: 0x10ab7cc: lui   a0, 0x20000
+// 0x010abe14: 0x10abe14: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab7d0: 0x10ab7d0: addiu a0, a0, 13860
+// 0x010abe18: 0x10abe18: addiu a0, a0, 14320
 	ldloc.1
-	ldc.i4 13860
+	ldc.i4 14320
 	add
 	stloc.1
-// 0x010ab7d4: 0x10ab7d4: jal   0x1094884 addiu a1, zero, 1
+// 0x010abe1c: 0x10abe1c: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3734,16 +3734,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ab7dc: 0x10ab7dc: lw    ra, 20(sp)
-// 0x010ab7e0: 0x10ab7e0: addu  v0, zero, zero
+// 0x010abe24: 0x10abe24: lw    ra, 20(sp)
+// 0x010abe28: 0x10abe28: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010ab7e4: 0x10ab7e4: jr    ra addiu sp, sp, 24
+// 0x010abe2c: 0x10abe2c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3755,7 +3755,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 usa_callback_10ab7ec(int32,int32,int32,int32,int32)
+.method public static int32 usa_callback_10abe34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3790,21 +3790,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ab7ec: 0x10ab7ec: lui   a0, 0x20000
+// 0x010abe34: 0x10abe34: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ab7f0: 0x10ab7f0: addiu sp, sp, -24
+// 0x010abe38: 0x10abe38: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ab7f4: 0x10ab7f4: addiu a0, a0, 13860
+// 0x010abe3c: 0x10abe3c: addiu a0, a0, 14320
 	ldloc.1
-	ldc.i4 13860
+	ldc.i4 14320
 	add
 	stloc.1
-// 0x010ab7f8: 0x10ab7f8: sw    ra, 20(sp)
-// 0x010ab7fc: 0x10ab7fc: jal   0x1094884 addiu a1, zero, 1
+// 0x010abe40: 0x10abe40: sw    ra, 20(sp)
+// 0x010abe44: 0x10abe44: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3812,39 +3812,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ab804: 0x10ab804: lui   v0, 0x90000
+// 0x010abe4c: 0x10abe4c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ab808: 0x10ab808: lw    a0, -32504(v0)
+// 0x010abe50: 0x10abe50: lw    a0, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ab80c: 0x10ab80c: jal   0x10aacd8 sll   zero, zero, 0
+// 0x010abe54: 0x10abe54: jal   0x10ab320 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_usa_10aacd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_usa_10ab320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ab814: 0x10ab814: lw    ra, 20(sp)
-// 0x010ab818: 0x10ab818: addu  v0, zero, zero
+// 0x010abe5c: 0x10abe5c: lw    ra, 20(sp)
+// 0x010abe60: 0x10abe60: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010ab81c: 0x10ab81c: jr    ra addiu sp, sp, 24
+// 0x010abe64: 0x10abe64: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3856,7 +3856,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_pointer_down_10ab824(int32,int32,int32,int32,int32)
+.method public static int32 on_pointer_down_10abe6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -3897,12 +3897,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ab824: 0x10ab824: addiu sp, sp, -32
+// 0x010abe6c: 0x10abe6c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010ab828: 0x10ab828: sw    s0, 20(sp)
+// 0x010abe70: 0x10abe70: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3911,13 +3911,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ab82c: 0x10ab82c: addu  s0, a0, zero
+// 0x010abe74: 0x10abe74: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010ab830: 0x10ab830: lui   a0, 0x10000
+// 0x010abe78: 0x10abe78: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010ab834: 0x10ab834: sw    s1, 24(sp)
+// 0x010abe7c: 0x10abe7c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3926,16 +3926,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ab838: 0x10ab838: addiu a0, a0, -15872
+// 0x010abe80: 0x10abe80: addiu a0, a0, -15872
 	ldloc.1
 	ldc.i4 -15872
 	add
 	stloc.1
-// 0x010ab83c: 0x10ab83c: addu  s1, a1, zero
+// 0x010abe84: 0x10abe84: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010ab840: 0x10ab840: sw    ra, 28(sp)
-// 0x010ab844: 0x10ab844: jal   0x104c3fc addiu a1, zero, 1
+// 0x010abe88: 0x10abe88: sw    ra, 28(sp)
+// 0x010abe8c: 0x10abe8c: jal   0x104c40c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3943,22 +3943,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_timed_104c3fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_timed_104c40c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ab84c: 0x10ab84c: addu  a0, s0, zero
+// 0x010abe94: 0x10abe94: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010ab850: 0x10ab850: jal   0x1099184 addu  a1, s1, zero
+// 0x010abe98: 0x10abe98: jal   0x10997cc addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_pointer_down_force_click_1099184(int32)
+	call int32 Cibyl114::ssd_widget_pointer_down_force_click_10997cc(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ab858: 0x10ab858: lw    v0, 52(s0)
+// 0x010abea0: 0x10abea0: lw    v0, 52(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3967,12 +3967,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab85c: 0x10ab85c: sll   zero, zero, 0
-// 0x010ab860: 0x10ab860: beq   v0, zero, 0x10ab888 sll   zero, zero, 0
+// 0x010abea4: 0x10abea4: sll   zero, zero, 0
+// 0x010abea8: 0x10abea8: beq   v0, zero, 0x10abed0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ab888
+	brfalse L_10abed0
 // --- basic block ---
-// 0x010ab868: 0x10ab868: lw    v0, 60(s0)
+// 0x010abeb0: 0x10abeb0: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3981,12 +3981,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ab86c: 0x10ab86c: sll   zero, zero, 0
-// 0x010ab870: 0x10ab870: bne   v0, zero, 0x10ab880 sll   zero, zero, 0
+// 0x010abeb4: 0x10abeb4: sll   zero, zero, 0
+// 0x010abeb8: 0x10abeb8: bne   v0, zero, 0x10abec8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ab880
+	brtrue L_10abec8
 // --- basic block ---
-// 0x010ab878: 0x10ab878: jal   0x109617c addu  a0, s0, zero
+// 0x010abec0: 0x10abec0: jal   0x10967c4 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3994,29 +3994,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10ab880:
-// 0x010ab880: 0x10ab880: jal   0x109483c sll   zero, zero, 0
+L_10abec8:
+// 0x010abec8: 0x10abec8: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10ab888:
-// 0x010ab888: 0x10ab888: lw    ra, 28(sp)
-// 0x010ab88c: 0x10ab88c: addu  v0, zero, zero
+L_10abed0:
+// 0x010abed0: 0x10abed0: lw    ra, 28(sp)
+// 0x010abed4: 0x10abed4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010ab890: 0x10ab890: lw    s1, 24(sp)
+// 0x010abed8: 0x10abed8: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4025,7 +4025,7 @@ L_10ab888:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ab894: 0x10ab894: lw    s0, 20(sp)
+// 0x010abedc: 0x10abedc: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4034,7 +4034,7 @@ L_10ab888:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ab898: 0x10ab898: jr    ra addiu sp, sp, 32
+// 0x010abee0: 0x10abee0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4046,7 +4046,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_update_config_10ab8a0(int32,int32,int32,int32,int32)
+.method public static int32 on_update_config_10abee8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s1,int32 s0,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -4108,13 +4108,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ab8a0:
-// 0x010ab8a0: 0x10ab8a0: addiu sp, sp, -1376
+L_10abee8:
+// 0x010abee8: 0x10abee8: addiu sp, sp, -1376
 	ldloc.0
 	ldc.i4 -1376
 	add
 	stloc.0
-// 0x010ab8a4: 0x10ab8a4: sw    s7, 1364(sp)
+// 0x010abeec: 0x10abeec: sw    s7, 1364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4123,7 +4123,7 @@ L_10ab8a0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010ab8a8: 0x10ab8a8: sw    s3, 1348(sp)
+// 0x010abef0: 0x10abef0: sw    s3, 1348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4132,7 +4132,7 @@ L_10ab8a0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ab8ac: 0x10ab8ac: sw    s1, 1340(sp)
+// 0x010abef4: 0x10abef4: sw    s1, 1340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4141,30 +4141,30 @@ L_10ab8a0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ab8b0: 0x10ab8b0: addiu v0, zero, 18
+// 0x010abef8: 0x10abef8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x010ab8b4: 0x10ab8b4: addiu s3, sp, 52
+// 0x010abefc: 0x10abefc: addiu s3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 11
-// 0x010ab8b8: 0x10ab8b8: addiu s1, sp, 32
+// 0x010abf00: 0x10abf00: addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-// 0x010ab8bc: 0x10ab8bc: lui   s7, 0x0
+// 0x010abf04: 0x10abf04: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x010ab8c0: 0x10ab8c0: sw    v0, 0(a3)
+// 0x010abf08: 0x10abf08: sw    v0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010ab8c4: 0x10ab8c4: sw    s8, 1368(sp)
+// 0x010abf0c: 0x10abf0c: sw    s8, 1368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4173,7 +4173,7 @@ L_10ab8a0:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010ab8c8: 0x10ab8c8: sw    s6, 1360(sp)
+// 0x010abf10: 0x10abf10: sw    s6, 1360(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4182,7 +4182,7 @@ L_10ab8a0:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ab8cc: 0x10ab8cc: sw    s2, 1344(sp)
+// 0x010abf14: 0x10abf14: sw    s2, 1344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4191,27 +4191,27 @@ L_10ab8a0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ab8d0: 0x10ab8d0: addu  s8, a3, zero
+// 0x010abf18: 0x10abf18: addu  s8, a3, zero
 	ldloc 4
 	stloc 16
-// 0x010ab8d4: 0x10ab8d4: addiu s6, zero, 256
+// 0x010abf1c: 0x10abf1c: addiu s6, zero, 256
 	ldc.i4 256
 	stloc 14
-// 0x010ab8d8: 0x10ab8d8: addiu s2, zero, 1
+// 0x010abf20: 0x10abf20: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010ab8dc: 0x10ab8dc: addu  a1, s3, zero
+// 0x010abf24: 0x10abf24: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010ab8e0: 0x10ab8e0: addu  a2, s1, zero
+// 0x010abf28: 0x10abf28: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010ab8e4: 0x10ab8e4: addiu a3, s7, 28076
+// 0x010abf2c: 0x10abf2c: addiu a3, s7, 28076
 	ldloc 15
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010ab8e8: 0x10ab8e8: sw    s0, 1336(sp)
+// 0x010abf30: 0x10abf30: sw    s0, 1336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4220,8 +4220,8 @@ L_10ab8a0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ab8ec: 0x10ab8ec: sw    ra, 1372(sp)
-// 0x010ab8f0: 0x10ab8f0: sw    s5, 1356(sp)
+// 0x010abf34: 0x10abf34: sw    ra, 1372(sp)
+// 0x010abf38: 0x10abf38: sw    s5, 1356(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4230,7 +4230,7 @@ L_10ab8a0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ab8f4: 0x10ab8f4: sw    s4, 1352(sp)
+// 0x010abf3c: 0x10abf3c: sw    s4, 1352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4239,7 +4239,7 @@ L_10ab8a0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ab8f8: 0x10ab8f8: sw    s6, 32(sp)
+// 0x010abf40: 0x10abf40: sw    s6, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4248,7 +4248,7 @@ L_10ab8a0:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ab8fc: 0x10ab8fc: jal   0x1068434 sw    s2, 16(sp)
+// 0x010abf44: 0x10abf44: jal   0x1068444 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4262,62 +4262,62 @@ L_10ab8a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ab904: 0x10ab904: bne   v0, zero, 0x10ab928 addu  s0, v0, zero
+// 0x010abf4c: 0x10abf4c: bne   v0, zero, 0x10abf70 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_10ab928
+	brtrue L_10abf70
 // --- basic block ---
-// 0x010ab90c: 0x10ab90c: lui   a1, 0x20000
+// 0x010abf54: 0x10abf54: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ab910: 0x10ab910: lui   a3, 0x20000
+// 0x010abf58: 0x10abf58: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab914: 0x10ab914: addiu a1, a1, 13476
+// 0x010abf5c: 0x10abf5c: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab918: 0x10ab918: addiu a3, a3, 14616
+// 0x010abf60: 0x10abf60: addiu a3, a3, 15076
 	ldloc 4
-	ldc.i4 14616
+	ldc.i4 15076
 	add
 	stloc 4
-// 0x010ab91c: 0x10ab91c: addiu a0, zero, 4
+// 0x010abf64: 0x10abf64: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ab920: 0x10ab920: j	 0x10ab968 addiu a2, zero, 534
+// 0x010abf68: 0x10abf68: j	 0x10abfb0 addiu a2, zero, 534
 	ldc.i4 534
 	stloc.3
-	br L_10ab968
+	br L_10abfb0
 // --- basic block ---
-L_10ab928:
-// 0x010ab928: 0x10ab928: addiu s5, sp, 308
+L_10abf70:
+// 0x010abf70: 0x10abf70: addiu s5, sp, 308
 	ldloc.0
 	ldc.i4 308
 	add
 	stloc 13
-// 0x010ab92c: 0x10ab92c: addu  a0, v0, zero
+// 0x010abf74: 0x10abf74: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010ab930: 0x10ab930: addu  a1, s5, zero
+// 0x010abf78: 0x10abf78: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x010ab934: 0x10ab934: addu  a2, s1, zero
+// 0x010abf7c: 0x10abf7c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010ab938: 0x10ab938: addiu a3, s7, 28076
+// 0x010abf80: 0x10abf80: addiu a3, s7, 28076
 	ldloc 15
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010ab93c: 0x10ab93c: sw    s6, 32(sp)
+// 0x010abf84: 0x10abf84: sw    s6, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4326,7 +4326,7 @@ L_10ab928:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ab940: 0x10ab940: jal   0x1068434 sw    s2, 16(sp)
+// 0x010abf88: 0x10abf88: jal   0x1068444 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4340,41 +4340,41 @@ L_10ab928:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ab948: 0x10ab948: bne   v0, zero, 0x10ab978 addu  s0, v0, zero
+// 0x010abf90: 0x10abf90: bne   v0, zero, 0x10abfc0 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_10ab978
+	brtrue L_10abfc0
 // --- basic block ---
-// 0x010ab950: 0x10ab950: lui   a1, 0x20000
+// 0x010abf98: 0x10abf98: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ab954: 0x10ab954: lui   a3, 0x20000
+// 0x010abf9c: 0x10abf9c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab958: 0x10ab958: addiu a1, a1, 13476
+// 0x010abfa0: 0x10abfa0: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab95c: 0x10ab95c: addiu a3, a3, 14660
+// 0x010abfa4: 0x10abfa4: addiu a3, a3, 15120
 	ldloc 4
-	ldc.i4 14660
+	ldc.i4 15120
 	add
 	stloc 4
-// 0x010ab960: 0x10ab960: addiu a0, zero, 4
+// 0x010abfa8: 0x10abfa8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ab964: 0x10ab964: addiu a2, zero, 542
+// 0x010abfac: 0x10abfac: addiu a2, zero, 542
 	ldc.i4 542
 	stloc.3
-L_10ab968:
-// 0x010ab968: 0x10ab968: jal   0x100449c sll   zero, zero, 0
+L_10abfb0:
+// 0x010abfb0: 0x10abfb0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4385,30 +4385,30 @@ L_10ab968:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ab970: 0x10ab970: j	 0x10aba94 sll   zero, zero, 0
-	br L_10aba94
+// 0x010abfb8: 0x10abfb8: j	 0x10ac0dc sll   zero, zero, 0
+	br L_10ac0dc
 // --- basic block ---
-L_10ab978:
-// 0x010ab978: 0x10ab978: addiu s4, sp, 564
+L_10abfc0:
+// 0x010abfc0: 0x10abfc0: addiu s4, sp, 564
 	ldloc.0
 	ldc.i4 564
 	add
 	stloc 12
-// 0x010ab97c: 0x10ab97c: addu  a0, v0, zero
+// 0x010abfc4: 0x10abfc4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010ab980: 0x10ab980: addiu a3, s7, 28076
+// 0x010abfc8: 0x10abfc8: addiu a3, s7, 28076
 	ldloc 15
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010ab984: 0x10ab984: addu  a1, s4, zero
+// 0x010abfcc: 0x10abfcc: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010ab988: 0x10ab988: addu  a2, s1, zero
+// 0x010abfd0: 0x10abfd0: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010ab98c: 0x10ab98c: sw    s6, 32(sp)
+// 0x010abfd4: 0x10abfd4: sw    s6, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4417,7 +4417,7 @@ L_10ab978:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ab990: 0x10ab990: jal   0x1068434 sw    s2, 16(sp)
+// 0x010abfd8: 0x10abfd8: jal   0x1068444 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4431,60 +4431,60 @@ L_10ab978:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ab998: 0x10ab998: bne   v0, zero, 0x10ab9bc addu  s0, v0, zero
+// 0x010abfe0: 0x10abfe0: bne   v0, zero, 0x10ac004 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brtrue L_10ab9bc
+	brtrue L_10ac004
 // --- basic block ---
-// 0x010ab9a0: 0x10ab9a0: lui   a1, 0x20000
+// 0x010abfe8: 0x10abfe8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ab9a4: 0x10ab9a4: lui   a3, 0x20000
+// 0x010abfec: 0x10abfec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab9a8: 0x10ab9a8: addiu a1, a1, 13476
+// 0x010abff0: 0x10abff0: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab9ac: 0x10ab9ac: addiu a3, a3, 14708
+// 0x010abff4: 0x10abff4: addiu a3, a3, 15168
 	ldloc 4
-	ldc.i4 14708
+	ldc.i4 15168
 	add
 	stloc 4
-// 0x010ab9b0: 0x10ab9b0: addiu a0, zero, 4
+// 0x010abff8: 0x10abff8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ab9b4: 0x10ab9b4: j	 0x10ab968 addiu a2, zero, 550
+// 0x010abffc: 0x10abffc: j	 0x10abfb0 addiu a2, zero, 550
 	ldc.i4 550
 	stloc.3
-	br L_10ab968
+	br L_10abfb0
 // --- basic block ---
-L_10ab9bc:
-// 0x010ab9bc: 0x10ab9bc: addu  a0, v0, zero
+L_10ac004:
+// 0x010ac004: 0x10ac004: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010ab9c0: 0x10ab9c0: addiu s2, sp, 820
+// 0x010ac008: 0x10ac008: addiu s2, sp, 820
 	ldloc.0
 	ldc.i4 820
 	add
 	stloc 8
-// 0x010ab9c4: 0x10ab9c4: addiu v0, zero, 512
+// 0x010ac00c: 0x10ac00c: addiu v0, zero, 512
 	ldc.i4 512
 	stloc 6
-// 0x010ab9c8: 0x10ab9c8: lui   a3, 0x0
+// 0x010ac010: 0x10ac010: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010ab9cc: 0x10ab9cc: addu  a1, s2, zero
+// 0x010ac014: 0x10ac014: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x010ab9d0: 0x10ab9d0: sw    v0, 32(sp)
+// 0x010ac018: 0x10ac018: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4493,18 +4493,18 @@ L_10ab9bc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010ab9d4: 0x10ab9d4: addu  a2, s1, zero
+// 0x010ac01c: 0x10ac01c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010ab9d8: 0x10ab9d8: addiu v0, zero, -1
+// 0x010ac020: 0x10ac020: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ab9dc: 0x10ab9dc: addiu a3, a3, 30268
+// 0x010ac024: 0x10ac024: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x010ab9e0: 0x10ab9e0: jal   0x1068434 sw    v0, 16(sp)
+// 0x010ac028: 0x10ac028: jal   0x1068444 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4518,69 +4518,69 @@ L_10ab9bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ab9e8: 0x10ab9e8: addu  s0, v0, zero
+// 0x010ac030: 0x10ac030: addu  s0, v0, zero
 	ldloc 6
 	stloc 10
-// 0x010ab9ec: 0x10ab9ec: bne   v0, zero, 0x10aba0c lui   a1, 0x20000
+// 0x010ac034: 0x10ac034: bne   v0, zero, 0x10ac054 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10aba0c
+	brtrue L_10ac054
 // --- basic block ---
-// 0x010ab9f4: 0x10ab9f4: lui   a3, 0x20000
+// 0x010ac03c: 0x10ac03c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ab9f8: 0x10ab9f8: addiu a1, a1, 13476
+// 0x010ac040: 0x10ac040: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ab9fc: 0x10ab9fc: addiu a3, a3, 14752
+// 0x010ac044: 0x10ac044: addiu a3, a3, 15212
 	ldloc 4
-	ldc.i4 14752
+	ldc.i4 15212
 	add
 	stloc 4
-// 0x010aba00: 0x10aba00: addiu a0, zero, 4
+// 0x010ac048: 0x10ac048: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010aba04: 0x10aba04: j	 0x10ab968 addiu a2, zero, 559
+// 0x010ac04c: 0x10ac04c: j	 0x10abfb0 addiu a2, zero, 559
 	ldc.i4 559
 	stloc.3
-	br L_10ab968
+	br L_10abfb0
 // --- basic block ---
-L_10aba0c:
-// 0x010aba0c: 0x10aba0c: lui   a3, 0x20000
+L_10ac054:
+// 0x010ac054: 0x10ac054: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010aba10: 0x10aba10: sw    zero, 0(s8)
+// 0x010ac058: 0x10ac058: sw    zero, 0(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010aba14: 0x10aba14: addiu a1, a1, 13476
+// 0x010ac05c: 0x10ac05c: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010aba18: 0x10aba18: addiu a3, a3, 14800
+// 0x010ac060: 0x10ac060: addiu a3, a3, 15260
 	ldloc 4
-	ldc.i4 14800
+	ldc.i4 15260
 	add
 	stloc 4
-// 0x010aba1c: 0x10aba1c: addiu a2, zero, 564
+// 0x010ac064: 0x10ac064: addiu a2, zero, 564
 	ldc.i4 564
 	stloc.3
-// 0x010aba20: 0x10aba20: addiu a0, zero, 2
+// 0x010ac068: 0x10ac068: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010aba24: 0x10aba24: sw    s3, 16(sp)
+// 0x010ac06c: 0x10ac06c: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4589,7 +4589,7 @@ L_10aba0c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aba28: 0x10aba28: sw    s5, 20(sp)
+// 0x010ac070: 0x10ac070: sw    s5, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4598,7 +4598,7 @@ L_10aba0c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010aba2c: 0x10aba2c: sw    s4, 24(sp)
+// 0x010ac074: 0x10ac074: sw    s4, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4607,7 +4607,7 @@ L_10aba0c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010aba30: 0x10aba30: jal   0x100449c sw    s2, 28(sp)
+// 0x010ac078: 0x10ac078: jal   0x100449c sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4626,7 +4626,7 @@ L_10aba0c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aba38: 0x10aba38: jal   0x1001ba8 addu  a0, s5, zero
+// 0x010ac080: 0x10ac080: jal   0x1001ba8 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -4639,10 +4639,10 @@ L_10aba0c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aba40: 0x10aba40: addu  a0, s4, zero
+// 0x010ac088: 0x10ac088: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010aba44: 0x10aba44: jal   0x1001ba8 sw    v0, 36(sp)
+// 0x010ac08c: 0x10ac08c: jal   0x1001ba8 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4661,26 +4661,26 @@ L_10aba0c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aba4c: 0x10aba4c: lui   a2, 0x10000
+// 0x010ac094: 0x10ac094: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010aba50: 0x10aba50: addu  a0, s3, zero
+// 0x010ac098: 0x10ac098: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010aba54: 0x10aba54: addiu a2, a2, 18500
+// 0x010ac09c: 0x10ac09c: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010aba58: 0x10aba58: addiu a1, sp, 36
+// 0x010ac0a0: 0x10ac0a0: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010aba5c: 0x10aba5c: addu  a3, zero, zero
+// 0x010ac0a4: 0x10ac0a4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010aba60: 0x10aba60: sw    v0, 40(sp)
+// 0x010ac0a8: 0x10ac0a8: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4689,7 +4689,7 @@ L_10aba0c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010aba64: 0x10aba64: jal   0x100edb0 addiu s1, zero, 32
+// 0x010ac0ac: 0x10ac0ac: jal   0x100edc0 addiu s1, zero, 32
 	ldc.i4.s 32
 	stloc 9
 	ldloc.0
@@ -4697,23 +4697,23 @@ L_10aba0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aba6c: 0x10aba6c: j	 0x10aba78 addu  a0, s2, zero
+// 0x010ac0b4: 0x10ac0b4: j	 0x10ac0c0 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-	br L_10aba78
+	br L_10ac0c0
 // --- basic block ---
-L_10aba74:
-// 0x010aba74: 0x10aba74: sb    s1, 0(v0)
+L_10ac0bc:
+// 0x010ac0bc: 0x10ac0bc: sb    s1, 0(v0)
 	ldloc 6
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10aba78:
-// 0x010aba78: 0x10aba78: jal   0x1001a5c addiu a1, zero, 35
+L_10ac0c0:
+// 0x010ac0c0: 0x10ac0c0: jal   0x1001a5c addiu a1, zero, 35
 	ldc.i4.s 35
 	stloc.2
 	ldloc.1
@@ -4723,20 +4723,20 @@ L_10aba78:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aba80: 0x10aba80: bne   v0, zero, 0x10aba74 addiu a0, v0, 1
+// 0x010ac0c8: 0x10ac0c8: bne   v0, zero, 0x10ac0bc addiu a0, v0, 1
 	ldloc 6
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc.1
-	brtrue L_10aba74
+	brtrue L_10ac0bc
 // --- basic block ---
-// 0x010aba88: 0x10aba88: addiu a0, sp, 36
+// 0x010ac0d0: 0x10ac0d0: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x010aba8c: 0x10aba8c: jal   0x100e5c0 addiu a1, sp, 820
+// 0x010ac0d4: 0x10ac0d4: jal   0x100e5d0 addiu a1, sp, 820
 	ldloc.0
 	ldc.i4 820
 	add
@@ -4746,17 +4746,17 @@ L_10aba78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10aba94:
-// 0x010aba94: 0x10aba94: lw    ra, 1372(sp)
-// 0x010aba98: 0x10aba98: addu  v0, s0, zero
+L_10ac0dc:
+// 0x010ac0dc: 0x10ac0dc: lw    ra, 1372(sp)
+// 0x010ac0e0: 0x10ac0e0: addu  v0, s0, zero
 	ldloc 10
 	stloc 6
-// 0x010aba9c: 0x10aba9c: lw    s8, 1368(sp)
+// 0x010ac0e4: 0x10ac0e4: lw    s8, 1368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4765,7 +4765,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010abaa0: 0x10abaa0: lw    s7, 1364(sp)
+// 0x010ac0e8: 0x10ac0e8: lw    s7, 1364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4774,7 +4774,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010abaa4: 0x10abaa4: lw    s6, 1360(sp)
+// 0x010ac0ec: 0x10ac0ec: lw    s6, 1360(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4783,7 +4783,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010abaa8: 0x10abaa8: lw    s5, 1356(sp)
+// 0x010ac0f0: 0x10ac0f0: lw    s5, 1356(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4792,7 +4792,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010abaac: 0x10abaac: lw    s4, 1352(sp)
+// 0x010ac0f4: 0x10ac0f4: lw    s4, 1352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4801,7 +4801,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010abab0: 0x10abab0: lw    s3, 1348(sp)
+// 0x010ac0f8: 0x10ac0f8: lw    s3, 1348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4810,7 +4810,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010abab4: 0x10abab4: lw    s2, 1344(sp)
+// 0x010ac0fc: 0x10ac0fc: lw    s2, 1344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4819,7 +4819,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010abab8: 0x10abab8: lw    s1, 1340(sp)
+// 0x010ac100: 0x10ac100: lw    s1, 1340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4828,7 +4828,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ababc: 0x10ababc: lw    s0, 1336(sp)
+// 0x010ac104: 0x10ac104: lw    s0, 1336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4837,7 +4837,7 @@ L_10aba94:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010abac0: 0x10abac0: jr    ra addiu sp, sp, 1376
+// 0x010ac108: 0x10ac108: jr    ra addiu sp, sp, 1376
 	ldloc.0
 	ldc.i4 1376
 	add
@@ -4849,7 +4849,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 clean_up_10abac8(int32,int32,int32,int32,int32)
+.method public static int32 clean_up_10ac110(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -4887,12 +4887,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010abac8: 0x10abac8: addiu sp, sp, -24
+// 0x010ac110: 0x10ac110: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010abacc: 0x10abacc: sw    s0, 16(sp)
+// 0x010ac114: 0x10ac114: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4901,54 +4901,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010abad0: 0x10abad0: lui   s0, 0x80000
-	ldc.i4 524288
+// 0x010ac118: 0x10ac118: lui   s0, 0x90000
+	ldc.i4 589824
 	stloc 7
-// 0x010abad4: 0x10abad4: lw    a0, 32684(s0)
+// 0x010ac11c: 0x10ac11c: lw    a0, -32388(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 8171
+	ldc.i4 -8097
 	add
 	ldelem.i4
 	stloc.1
-// 0x010abad8: 0x10abad8: sll   zero, zero, 0
-// 0x010abadc: 0x10abadc: beq   a0, zero, 0x10abaf0 sw    ra, 20(sp)
+// 0x010ac120: 0x10ac120: sll   zero, zero, 0
+// 0x010ac124: 0x10ac124: beq   a0, zero, 0x10ac138 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_10abaf0
+	brfalse L_10ac138
 // --- basic block ---
-// 0x010abae4: 0x10abae4: jal   0x106a494 sll   zero, zero, 0
+// 0x010ac12c: 0x10ac12c: jal   0x106aa9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_term_106a494(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_term_106aa9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010abaec: 0x10abaec: sw    zero, 32684(s0)
+// 0x010ac134: 0x10ac134: sw    zero, -32388(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 8171
+	ldc.i4 -8097
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10abaf0:
-// 0x010abaf0: 0x10abaf0: lui   v0, 0x90000
+L_10ac138:
+// 0x010ac138: 0x10ac138: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 6
-// 0x010abaf4: 0x10abaf4: lw    ra, 20(sp)
-// 0x010abaf8: 0x10abaf8: addiu v0, v0, -32628
+// 0x010ac13c: 0x10ac13c: lw    ra, 20(sp)
+// 0x010ac140: 0x10ac140: addiu v0, v0, -32164
 	ldloc 6
-	ldc.i4 -32628
+	ldc.i4 -32164
 	add
 	stloc 6
-// 0x010abafc: 0x10abafc: lw    s0, 16(sp)
+// 0x010ac144: 0x10ac144: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4957,13 +4957,13 @@ L_10abaf0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010abb00: 0x10abb00: sb    zero, 4(v0)
+// 0x010ac148: 0x10ac148: sb    zero, 4(v0)
 	ldloc 6
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010abb04: 0x10abb04: sw    zero, 104(v0)
+// 0x010ac14c: 0x10ac14c: sw    zero, 104(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4972,7 +4972,7 @@ L_10abaf0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010abb08: 0x10abb08: sw    zero, 108(v0)
+// 0x010ac150: 0x10ac150: sw    zero, 108(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4981,7 +4981,7 @@ L_10abaf0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010abb0c: 0x10abb0c: jr    ra addiu sp, sp, 24
+// 0x010ac154: 0x10ac154: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4993,7 +4993,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_recieved_completed_10abb14(int32,int32,int32,int32,int32)
+.method public static int32 on_recieved_completed_10ac15c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s0,int32 s4,int32 s3,int32 ra)
@@ -5043,13 +5043,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010abb14: 0x10abb14: addiu sp, sp, -48
+// 0x010ac15c: 0x10ac15c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010abb18: 0x10abb18: sw    ra, 44(sp)
-// 0x010abb1c: 0x10abb1c: sw    s4, 40(sp)
+// 0x010ac160: 0x10ac160: sw    ra, 44(sp)
+// 0x010ac164: 0x10ac164: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5058,7 +5058,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010abb20: 0x10abb20: sw    s3, 36(sp)
+// 0x010ac168: 0x10ac168: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5067,7 +5067,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010abb24: 0x10abb24: sw    s2, 32(sp)
+// 0x010ac16c: 0x10ac16c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5076,7 +5076,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010abb28: 0x10abb28: sw    s1, 28(sp)
+// 0x010ac170: 0x10ac170: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5085,7 +5085,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010abb2c: 0x10abb2c: jal   0x101d418 sw    s0, 24(sp)
+// 0x010ac174: 0x10ac174: jal   0x101d428 sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5099,26 +5099,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_user_lang_101d418(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_user_lang_101d428(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abb34: 0x10abb34: lui   a0, 0x0
+// 0x010ac17c: 0x10ac17c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010abb38: 0x10abb38: addiu a0, a0, 18780
+// 0x010ac180: 0x10ac180: addiu a0, a0, 18780
 	ldloc.1
 	ldc.i4 18780
 	add
 	stloc.1
-// 0x010abb3c: 0x10abb3c: lui   s4, 0x0
+// 0x010ac184: 0x10ac184: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010abb40: 0x10abb40: addu  s0, v0, zero
+// 0x010ac188: 0x10ac188: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010abb44: 0x10abb44: jal   0x100e348 lui   s2, 0x90000
+// 0x010ac18c: 0x10ac18c: jal   0x100e358 lui   s2, 0x90000
 	ldc.i4 589824
 	stloc 8
 	ldloc.0
@@ -5126,12 +5126,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abb4c: 0x10abb4c: jal   0x100e788 addiu a0, s4, 18716
+// 0x010ac194: 0x10ac194: jal   0x100e798 addiu a0, s4, 18716
 	ldloc 11
 	ldc.i4 18716
 	add
@@ -5141,34 +5141,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abb54: 0x10abb54: lw    s1, -32628(s2)
+// 0x010ac19c: 0x10ac19c: lw    s1, -32164(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8157
+	ldc.i4 -8041
 	add
 	ldelem.i4
 	stloc 9
-// 0x010abb58: 0x10abb58: addiu a0, s4, 18716
+// 0x010ac1a0: 0x10ac1a0: addiu a0, s4, 18716
 	ldloc 11
 	ldc.i4 18716
 	add
 	stloc.1
-// 0x010abb5c: 0x10abb5c: addu  a1, s1, zero
+// 0x010ac1a4: 0x10ac1a4: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010abb60: 0x10abb60: addiu s2, s2, -32628
+// 0x010ac1a8: 0x10ac1a8: addiu s2, s2, -32164
 	ldloc 8
-	ldc.i4 -32628
+	ldc.i4 -32164
 	add
 	stloc 8
-// 0x010abb64: 0x10abb64: jal   0x100e610 addu  s3, v0, zero
+// 0x010ac1ac: 0x10ac1ac: jal   0x100e620 addu  s3, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -5176,12 +5176,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abb6c: 0x10abb6c: lw    a1, 120(s2)
+// 0x010ac1b4: 0x10ac1b4: lw    a1, 120(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5190,10 +5190,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010abb70: 0x10abb70: lui   a0, 0x0
+// 0x010ac1b8: 0x10ac1b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010abb74: 0x10abb74: jal   0x100e610 addiu a0, a0, 18748
+// 0x010ac1bc: 0x10ac1bc: jal   0x100e620 addiu a0, a0, 18748
 	ldloc.1
 	ldc.i4 18748
 	add
@@ -5203,12 +5203,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abb7c: 0x10abb7c: jal   0x100ea50 addu  a0, zero, zero
+// 0x010ac1c4: 0x10ac1c4: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5216,17 +5216,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abb84: 0x10abb84: lui   a0, 0x10b0000
+// 0x010ac1cc: 0x10ac1cc: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010abb88: 0x10abb88: jal   0x104fd00 addiu a0, a0, -15712
+// 0x010ac1d0: 0x10ac1d0: jal   0x104fd10 addiu a0, a0, -14104
 	ldloc.1
-	ldc.i4 -15712
+	ldc.i4 -14104
 	add
 	stloc.1
 	ldloc.0
@@ -5234,31 +5234,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abb90: 0x10abb90: lui   s2, 0x20000
+// 0x010ac1d8: 0x10ac1d8: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010abb94: 0x10abb94: lui   a3, 0x20000
+// 0x010ac1dc: 0x10ac1dc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abb98: 0x10abb98: addiu a3, a3, 14880
+// 0x010ac1e0: 0x10ac1e0: addiu a3, a3, 15340
 	ldloc 4
-	ldc.i4 14880
+	ldc.i4 15340
 	add
 	stloc 4
-// 0x010abb9c: 0x10abb9c: addiu a0, zero, 1
+// 0x010ac1e4: 0x10ac1e4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010abba0: 0x10abba0: addiu a1, s2, 13476
+// 0x010ac1e8: 0x10ac1e8: addiu a1, s2, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abba4: 0x10abba4: jal   0x100449c addiu a2, zero, 298
+// 0x010ac1ec: 0x10ac1ec: jal   0x100449c addiu a2, zero, 298
 	ldc.i4 298
 	stloc.3
 	ldloc.0
@@ -5271,26 +5271,26 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abbac: 0x10abbac: lui   a3, 0x20000
+// 0x010ac1f4: 0x10ac1f4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abbb0: 0x10abbb0: addiu a1, s2, 13476
+// 0x010ac1f8: 0x10ac1f8: addiu a1, s2, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abbb4: 0x10abbb4: addiu a3, a3, 14932
+// 0x010ac1fc: 0x10ac1fc: addiu a3, a3, 15392
 	ldloc 4
-	ldc.i4 14932
+	ldc.i4 15392
 	add
 	stloc 4
-// 0x010abbb8: 0x10abbb8: addiu a0, zero, 2
+// 0x010ac200: 0x10ac200: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010abbbc: 0x10abbbc: addiu a2, zero, 299
+// 0x010ac204: 0x10ac204: addiu a2, zero, 299
 	ldc.i4 299
 	stloc.3
-// 0x010abbc0: 0x10abbc0: sw    s0, 16(sp)
+// 0x010ac208: 0x10ac208: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5299,7 +5299,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010abbc4: 0x10abbc4: jal   0x100449c sw    s1, 20(sp)
+// 0x010ac20c: 0x10ac20c: jal   0x100449c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5318,30 +5318,30 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abbcc: 0x10abbcc: lb    v0, 0(s0)
+// 0x010ac214: 0x10ac214: lb    v0, 0(s0)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010abbd0: 0x10abbd0: sll   zero, zero, 0
-// 0x010abbd4: 0x10abbd4: bne   v0, zero, 0x10abc0c addiu v0, zero, -1
+// 0x010ac218: 0x10ac218: sll   zero, zero, 0
+// 0x010ac21c: 0x10ac21c: bne   v0, zero, 0x10ac254 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_10abc0c
+	brtrue L_10ac254
 // --- basic block ---
-// 0x010abbdc: 0x10abbdc: addiu v0, zero, 2
+// 0x010ac224: 0x10ac224: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010abbe0: 0x10abbe0: beq   s1, v0, 0x10abbf8 lui   a0, 0x10b0000
+// 0x010ac228: 0x10ac228: beq   s1, v0, 0x10ac240 lui   a0, 0x10b0000
 	ldloc 9
 	ldloc 5
 	ldc.i4 17498112
 	stloc.1
-	beq  L_10abbf8
+	beq  L_10ac240
 // --- basic block ---
-// 0x010abbe8: 0x10abbe8: jal   0x101d350 addiu a0, a0, -15948
+// 0x010ac230: 0x10ac230: jal   0x101d360 addiu a0, a0, -14340
 	ldloc.1
-	ldc.i4 -15948
+	ldc.i4 -14340
 	add
 	stloc.1
 	ldloc.0
@@ -5349,24 +5349,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_download_conf_file_101d350(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_download_conf_file_101d360(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abbf0: 0x10abbf0: j	 0x10abc78 sll   zero, zero, 0
-	br L_10abc78
+// 0x010ac238: 0x10ac238: j	 0x10ac2c0 sll   zero, zero, 0
+	br L_10ac2c0
 // --- basic block ---
-L_10abbf8:
-// 0x010abbf8: 0x10abbf8: lui   a0, 0x90000
+L_10ac240:
+// 0x010ac240: 0x10ac240: lui   a0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010abbfc: 0x10abbfc: addiu a0, a0, -32516
+// 0x010ac244: 0x10ac244: addiu a0, a0, -32052
 	ldloc.1
-	ldc.i4 -32516
+	ldc.i4 -32052
 	add
 	stloc.1
-// 0x010abc00: 0x10abc00: jal   0x101da7c addu  a1, zero, zero
+// 0x010ac248: 0x10ac248: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5374,51 +5374,51 @@ L_10abbf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abc08: 0x10abc08: addiu v0, zero, -1
+// 0x010ac250: 0x10ac250: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10abc0c:
-// 0x010abc0c: 0x10abc0c: bne   s3, v0, 0x10abc3c lui   a0, 0x20000
+L_10ac254:
+// 0x010ac254: 0x10ac254: bne   s3, v0, 0x10ac284 lui   a0, 0x20000
 	ldloc 12
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	bne.un L_10abc3c
+	bne.un L_10ac284
 // --- basic block ---
-// 0x010abc14: 0x10abc14: jal   0x104c3d0 addiu a0, a0, 13764
+// 0x010ac25c: 0x10ac25c: jal   0x104c3e0 addiu a0, a0, 14224
 	ldloc.1
-	ldc.i4 13764
+	ldc.i4 14224
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010abc1c: 0x10abc1c: jal   0x101d484 sll   zero, zero, 0
+// 0x010ac264: 0x10ac264: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abc24: 0x10abc24: lui   a1, 0x10b0000
+// 0x010ac26c: 0x10ac26c: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010abc28: 0x10abc28: addu  a0, v0, zero
+// 0x010ac270: 0x10ac270: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010abc2c: 0x10abc2c: jal   0x101d164 addiu a1, a1, -16028
+// 0x010ac274: 0x10ac274: jal   0x101d174 addiu a1, a1, -14420
 	ldloc.2
-	ldc.i4 -16028
+	ldc.i4 -14420
 	add
 	stloc.2
 	ldloc.0
@@ -5426,61 +5426,61 @@ L_10abc0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_download_lang_file_101d164(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_download_lang_file_101d174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abc34: 0x10abc34: j	 0x10abc78 sll   zero, zero, 0
-	br L_10abc78
+// 0x010ac27c: 0x10ac27c: j	 0x10ac2c0 sll   zero, zero, 0
+	br L_10ac2c0
 // --- basic block ---
-L_10abc3c:
-// 0x010abc3c: 0x10abc3c: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+L_10ac284:
+// 0x010ac284: 0x10ac284: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abc44: 0x10abc44: jal   0x10abac8 sll   zero, zero, 0
+// 0x010ac28c: 0x10ac28c: jal   0x10ac110 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::clean_up_10abac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::clean_up_10ac110(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abc4c: 0x10abc4c: jal   0x102146c sll   zero, zero, 0
+// 0x010ac294: 0x10ac294: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abc54: 0x10abc54: lui   v0, 0x90000
+// 0x010ac29c: 0x10ac29c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010abc58: 0x10abc58: lw    v0, -32504(v0)
+// 0x010ac2a0: 0x10ac2a0: lw    v0, -32040(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc 5
-// 0x010abc5c: 0x10abc5c: sll   zero, zero, 0
-// 0x010abc60: 0x10abc60: beq   v0, zero, 0x10abc70 sll   zero, zero, 0
+// 0x010ac2a4: 0x10ac2a4: sll   zero, zero, 0
+// 0x010ac2a8: 0x10ac2a8: beq   v0, zero, 0x10ac2b8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10abc70
+	brfalse L_10ac2b8
 // --- basic block ---
-// 0x010abc68: 0x10abc68: jalr  v0 sll   zero, zero, 0
+// 0x010ac2b0: 0x10ac2b0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5492,22 +5492,22 @@ L_10abc3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10abc70:
-// 0x010abc70: 0x10abc70: lui   v0, 0x90000
+L_10ac2b8:
+// 0x010ac2b8: 0x10ac2b8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010abc74: 0x10abc74: sw    zero, -32504(v0)
+// 0x010ac2bc: 0x10ac2bc: sw    zero, -32040(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10abc78:
-// 0x010abc78: 0x10abc78: lw    ra, 44(sp)
-// 0x010abc7c: 0x10abc7c: lw    s4, 40(sp)
+L_10ac2c0:
+// 0x010ac2c0: 0x10ac2c0: lw    ra, 44(sp)
+// 0x010ac2c4: 0x10ac2c4: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5516,7 +5516,7 @@ L_10abc78:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010abc80: 0x10abc80: lw    s3, 36(sp)
+// 0x010ac2c8: 0x10ac2c8: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5525,7 +5525,7 @@ L_10abc78:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010abc84: 0x10abc84: lw    s2, 32(sp)
+// 0x010ac2cc: 0x10ac2cc: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5534,7 +5534,7 @@ L_10abc78:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010abc88: 0x10abc88: lw    s1, 28(sp)
+// 0x010ac2d0: 0x10ac2d0: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5543,7 +5543,7 @@ L_10abc78:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010abc8c: 0x10abc8c: lw    s0, 24(sp)
+// 0x010ac2d4: 0x10ac2d4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5552,7 +5552,7 @@ L_10abc78:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010abc90: 0x10abc90: jr    ra addiu sp, sp, 48
+// 0x010ac2d8: 0x10ac2d8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5564,7 +5564,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_server_config_10abc98(int32,int32,int32,int32,int32)
+.method public static int32 on_server_config_10ac2e0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s5,int32 s2,int32 s0,int32 s3,int32 s4,int32 s6,int32 s7,int32 s1,int32 ra)
@@ -5623,13 +5623,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10abc98:
-// 0x010abc98: 0x10abc98: addiu sp, sp, -872
+L_10ac2e0:
+// 0x010ac2e0: 0x10ac2e0: addiu sp, sp, -872
 	ldloc.0
 	ldc.i4 -872
 	add
 	stloc.0
-// 0x010abc9c: 0x10abc9c: sw    s7, 864(sp)
+// 0x010ac2e4: 0x10ac2e4: sw    s7, 864(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5638,20 +5638,20 @@ L_10abc98:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010abca0: 0x10abca0: addiu v0, zero, 18
+// 0x010ac2e8: 0x10ac2e8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x010abca4: 0x10abca4: lui   s7, 0x0
+// 0x010ac2ec: 0x10ac2ec: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x010abca8: 0x10abca8: sw    v0, 0(a3)
+// 0x010ac2f0: 0x10ac2f0: sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010abcac: 0x10abcac: sw    s2, 844(sp)
+// 0x010ac2f4: 0x10ac2f4: sw    s2, 844(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5660,7 +5660,7 @@ L_10abc98:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010abcb0: 0x10abcb0: sw    s1, 840(sp)
+// 0x010ac2f8: 0x10ac2f8: sw    s1, 840(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5669,26 +5669,26 @@ L_10abc98:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010abcb4: 0x10abcb4: addiu s2, zero, 1
+// 0x010ac2fc: 0x10ac2fc: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010abcb8: 0x10abcb8: addu  s1, a3, zero
+// 0x010ac300: 0x10ac300: addu  s1, a3, zero
 	ldloc 4
 	stloc 15
-// 0x010abcbc: 0x10abcbc: addiu a1, s7, 28076
+// 0x010ac304: 0x10ac304: addiu a1, s7, 28076
 	ldloc 14
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010abcc0: 0x10abcc0: addu  a2, zero, zero
+// 0x010ac308: 0x10ac308: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010abcc4: 0x10abcc4: addiu a3, sp, 40
+// 0x010ac30c: 0x10ac30c: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x010abcc8: 0x10abcc8: sw    s0, 836(sp)
+// 0x010ac310: 0x10ac310: sw    s0, 836(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5697,8 +5697,8 @@ L_10abc98:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010abccc: 0x10abccc: sw    ra, 868(sp)
-// 0x010abcd0: 0x10abcd0: sw    s6, 860(sp)
+// 0x010ac314: 0x10ac314: sw    ra, 868(sp)
+// 0x010ac318: 0x10ac318: sw    s6, 860(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5707,7 +5707,7 @@ L_10abc98:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010abcd4: 0x10abcd4: sw    s5, 856(sp)
+// 0x010ac31c: 0x10ac31c: sw    s5, 856(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5716,7 +5716,7 @@ L_10abc98:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010abcd8: 0x10abcd8: sw    s4, 852(sp)
+// 0x010ac320: 0x10ac320: sw    s4, 852(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5725,7 +5725,7 @@ L_10abc98:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010abcdc: 0x10abcdc: sw    s3, 848(sp)
+// 0x010ac324: 0x10ac324: sw    s3, 848(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5734,7 +5734,7 @@ L_10abc98:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010abce0: 0x10abce0: jal   0x106855c sw    s2, 16(sp)
+// 0x010ac328: 0x10ac328: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5748,37 +5748,37 @@ L_10abc98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abce8: 0x10abce8: bne   v0, zero, 0x10abd14 addu  s0, v0, zero
+// 0x010ac330: 0x10ac330: bne   v0, zero, 0x10ac35c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brtrue L_10abd14
+	brtrue L_10ac35c
 // --- basic block ---
-// 0x010abcf0: 0x10abcf0: lui   a1, 0x20000
+// 0x010ac338: 0x10ac338: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010abcf4: 0x10abcf4: lui   a3, 0x20000
+// 0x010ac33c: 0x10ac33c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abcf8: 0x10abcf8: addiu a1, a1, 13476
+// 0x010ac340: 0x10ac340: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abcfc: 0x10abcfc: addiu a3, a3, 14980
+// 0x010ac344: 0x10ac344: addiu a3, a3, 15440
 	ldloc 4
-	ldc.i4 14980
+	ldc.i4 15440
 	add
 	stloc 4
-// 0x010abd00: 0x10abd00: addiu a0, zero, 4
+// 0x010ac348: 0x10ac348: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010abd04: 0x10abd04: jal   0x100449c addiu a2, zero, 462
+// 0x010ac34c: 0x10ac34c: jal   0x100449c addiu a2, zero, 462
 	ldc.i4 462
 	stloc.3
 	ldloc.0
@@ -5791,38 +5791,38 @@ L_10abc98:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abd0c: 0x10abd0c: j	 0x10abef0 sll   zero, zero, 0
-	br L_10abef0
+// 0x010ac354: 0x10ac354: j	 0x10ac538 sll   zero, zero, 0
+	br L_10ac538
 // --- basic block ---
-L_10abd14:
-// 0x010abd14: 0x10abd14: addiu s4, sp, 64
+L_10ac35c:
+// 0x010ac35c: 0x10ac35c: addiu s4, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 12
-// 0x010abd18: 0x10abd18: addiu s6, sp, 44
+// 0x010ac360: 0x10ac360: addiu s6, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 13
-// 0x010abd1c: 0x10abd1c: addu  a0, v0, zero
+// 0x010ac364: 0x10ac364: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010abd20: 0x10abd20: addiu s5, zero, 256
+// 0x010ac368: 0x10ac368: addiu s5, zero, 256
 	ldc.i4 256
 	stloc 8
-// 0x010abd24: 0x10abd24: addu  a1, s4, zero
+// 0x010ac36c: 0x10ac36c: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010abd28: 0x10abd28: addu  a2, s6, zero
+// 0x010ac370: 0x10ac370: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x010abd2c: 0x10abd2c: addiu a3, s7, 28076
+// 0x010ac374: 0x10ac374: addiu a3, s7, 28076
 	ldloc 14
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010abd30: 0x10abd30: sw    s5, 44(sp)
+// 0x010ac378: 0x10ac378: sw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5831,7 +5831,7 @@ L_10abd14:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010abd34: 0x10abd34: jal   0x1068434 sw    s2, 16(sp)
+// 0x010ac37c: 0x10ac37c: jal   0x1068444 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5845,62 +5845,62 @@ L_10abd14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abd3c: 0x10abd3c: bne   v0, zero, 0x10abd60 addu  s0, v0, zero
+// 0x010ac384: 0x10ac384: bne   v0, zero, 0x10ac3a8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brtrue L_10abd60
+	brtrue L_10ac3a8
 // --- basic block ---
-// 0x010abd44: 0x10abd44: lui   a1, 0x20000
+// 0x010ac38c: 0x10ac38c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010abd48: 0x10abd48: lui   a3, 0x20000
+// 0x010ac390: 0x10ac390: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abd4c: 0x10abd4c: addiu a1, a1, 13476
+// 0x010ac394: 0x10ac394: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abd50: 0x10abd50: addiu a3, a3, 15024
+// 0x010ac398: 0x10ac398: addiu a3, a3, 15484
 	ldloc 4
-	ldc.i4 15024
+	ldc.i4 15484
 	add
 	stloc 4
-// 0x010abd54: 0x10abd54: addiu a0, zero, 4
+// 0x010ac39c: 0x10ac39c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010abd58: 0x10abd58: j	 0x10abda0 addiu a2, zero, 470
+// 0x010ac3a0: 0x10ac3a0: j	 0x10ac3e8 addiu a2, zero, 470
 	ldc.i4 470
 	stloc.3
-	br L_10abda0
+	br L_10ac3e8
 // --- basic block ---
-L_10abd60:
-// 0x010abd60: 0x10abd60: addiu s3, sp, 320
+L_10ac3a8:
+// 0x010ac3a8: 0x10ac3a8: addiu s3, sp, 320
 	ldloc.0
 	ldc.i4 320
 	add
 	stloc 11
-// 0x010abd64: 0x10abd64: addu  a0, v0, zero
+// 0x010ac3ac: 0x10ac3ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010abd68: 0x10abd68: addiu a3, s7, 28076
+// 0x010ac3b0: 0x10ac3b0: addiu a3, s7, 28076
 	ldloc 14
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010abd6c: 0x10abd6c: addu  a1, s3, zero
+// 0x010ac3b4: 0x10ac3b4: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010abd70: 0x10abd70: addu  a2, s6, zero
+// 0x010ac3b8: 0x10ac3b8: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x010abd74: 0x10abd74: sw    s2, 16(sp)
+// 0x010ac3bc: 0x10ac3bc: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5909,7 +5909,7 @@ L_10abd60:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010abd78: 0x10abd78: jal   0x1068434 sw    s5, 44(sp)
+// 0x010ac3c0: 0x10ac3c0: jal   0x1068444 sw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5923,41 +5923,41 @@ L_10abd60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abd80: 0x10abd80: bne   v0, zero, 0x10abdb4 addu  s0, v0, zero
+// 0x010ac3c8: 0x10ac3c8: bne   v0, zero, 0x10ac3fc addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brtrue L_10abdb4
+	brtrue L_10ac3fc
 // --- basic block ---
-// 0x010abd88: 0x10abd88: lui   a1, 0x20000
+// 0x010ac3d0: 0x10ac3d0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010abd8c: 0x10abd8c: lui   a3, 0x20000
+// 0x010ac3d4: 0x10ac3d4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abd90: 0x10abd90: addiu a1, a1, 13476
+// 0x010ac3d8: 0x10ac3d8: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abd94: 0x10abd94: addiu a3, a3, 15088
+// 0x010ac3dc: 0x10ac3dc: addiu a3, a3, 15548
 	ldloc 4
-	ldc.i4 15088
+	ldc.i4 15548
 	add
 	stloc 4
-// 0x010abd98: 0x10abd98: addiu a0, zero, 4
+// 0x010ac3e0: 0x10ac3e0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010abd9c: 0x10abd9c: addiu a2, zero, 478
+// 0x010ac3e4: 0x10ac3e4: addiu a2, zero, 478
 	ldc.i4 478
 	stloc.3
-L_10abda0:
-// 0x010abda0: 0x10abda0: lw    v0, 40(sp)
+L_10ac3e8:
+// 0x010ac3e8: 0x10ac3e8: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5966,8 +5966,8 @@ L_10abda0:
 	add
 	ldelem.i4
 	stloc 5
-L_10abda4:
-// 0x010abda4: 0x10abda4: jal   0x100449c sw    v0, 16(sp)
+L_10ac3ec:
+// 0x010ac3ec: 0x10ac3ec: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5986,36 +5986,36 @@ L_10abda4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abdac: 0x10abdac: j	 0x10abef0 sll   zero, zero, 0
-	br L_10abef0
+// 0x010ac3f4: 0x10ac3f4: j	 0x10ac538 sll   zero, zero, 0
+	br L_10ac538
 // --- basic block ---
-L_10abdb4:
-// 0x010abdb4: 0x10abdb4: addiu s2, sp, 576
+L_10ac3fc:
+// 0x010ac3fc: 0x10ac3fc: addiu s2, sp, 576
 	ldloc.0
 	ldc.i4 576
 	add
 	stloc 9
-// 0x010abdb8: 0x10abdb8: lui   a3, 0x0
+// 0x010ac400: 0x10ac400: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010abdbc: 0x10abdbc: addu  a0, v0, zero
+// 0x010ac404: 0x10ac404: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010abdc0: 0x10abdc0: addu  a1, s2, zero
+// 0x010ac408: 0x10ac408: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010abdc4: 0x10abdc4: addiu v0, zero, -1
+// 0x010ac40c: 0x10ac40c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010abdc8: 0x10abdc8: addu  a2, s6, zero
+// 0x010ac410: 0x10ac410: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x010abdcc: 0x10abdcc: addiu a3, a3, 30268
+// 0x010ac414: 0x10ac414: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x010abdd0: 0x10abdd0: sw    s5, 44(sp)
+// 0x010ac418: 0x10ac418: sw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6024,7 +6024,7 @@ L_10abdb4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010abdd4: 0x10abdd4: jal   0x1068434 sw    v0, 16(sp)
+// 0x010ac41c: 0x10ac41c: jal   0x1068444 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6038,15 +6038,15 @@ L_10abdb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abddc: 0x10abddc: addu  s0, v0, zero
+// 0x010ac424: 0x10ac424: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010abde0: 0x10abde0: lw    v0, 40(sp)
+// 0x010ac428: 0x10ac428: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6055,43 +6055,43 @@ L_10abdb4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010abde4: 0x10abde4: bne   s0, zero, 0x10abe04 lui   a1, 0x20000
+// 0x010ac42c: 0x10ac42c: bne   s0, zero, 0x10ac44c lui   a1, 0x20000
 	ldloc 10
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10abe04
+	brtrue L_10ac44c
 // --- basic block ---
-// 0x010abdec: 0x10abdec: lui   a3, 0x20000
+// 0x010ac434: 0x10ac434: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abdf0: 0x10abdf0: addiu a1, a1, 13476
+// 0x010ac438: 0x10ac438: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abdf4: 0x10abdf4: addiu a3, a3, 15148
+// 0x010ac43c: 0x10ac43c: addiu a3, a3, 15608
 	ldloc 4
-	ldc.i4 15148
+	ldc.i4 15608
 	add
 	stloc 4
-// 0x010abdf8: 0x10abdf8: addiu a0, zero, 4
+// 0x010ac440: 0x10ac440: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010abdfc: 0x10abdfc: j	 0x10abda4 addiu a2, zero, 486
+// 0x010ac444: 0x10ac444: j	 0x10ac3ec addiu a2, zero, 486
 	ldc.i4 486
 	stloc.3
-	br L_10abda4
+	br L_10ac3ec
 // --- basic block ---
-L_10abe04:
-// 0x010abe04: 0x10abe04: lui   s5, 0x90000
+L_10ac44c:
+// 0x010ac44c: 0x10ac44c: lui   s5, 0x90000
 	ldc.i4 589824
 	stloc 8
-// 0x010abe08: 0x10abe08: addiu s5, s5, -32628
+// 0x010ac450: 0x10ac450: addiu s5, s5, -32164
 	ldloc 8
-	ldc.i4 -32628
+	ldc.i4 -32164
 	add
 	stloc 8
-// 0x010abe0c: 0x10abe0c: lw    v1, 104(s5)
+// 0x010ac454: 0x10ac454: lw    v1, 104(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6100,38 +6100,38 @@ L_10abe04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010abe10: 0x10abe10: lui   a3, 0x20000
+// 0x010ac458: 0x10ac458: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abe14: 0x10abe14: sw    zero, 0(s1)
+// 0x010ac45c: 0x10ac45c: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010abe18: 0x10abe18: addiu a1, a1, 13476
+// 0x010ac460: 0x10ac460: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abe1c: 0x10abe1c: addiu a3, a3, 15208
+// 0x010ac464: 0x10ac464: addiu a3, a3, 15668
 	ldloc 4
-	ldc.i4 15208
+	ldc.i4 15668
 	add
 	stloc 4
-// 0x010abe20: 0x10abe20: addiu a2, zero, 491
+// 0x010ac468: 0x10ac468: addiu a2, zero, 491
 	ldc.i4 491
 	stloc.3
-// 0x010abe24: 0x10abe24: addiu v0, v0, 1
+// 0x010ac46c: 0x10ac46c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010abe28: 0x10abe28: addiu a0, zero, 2
+// 0x010ac470: 0x10ac470: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010abe2c: 0x10abe2c: sw    v1, 20(sp)
+// 0x010ac474: 0x10ac474: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6140,7 +6140,7 @@ L_10abe04:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010abe30: 0x10abe30: sw    v0, 16(sp)
+// 0x010ac478: 0x10ac478: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6149,7 +6149,7 @@ L_10abe04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010abe34: 0x10abe34: sw    s3, 28(sp)
+// 0x010ac47c: 0x10ac47c: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6158,7 +6158,7 @@ L_10abe04:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010abe38: 0x10abe38: sw    s4, 24(sp)
+// 0x010ac480: 0x10ac480: sw    s4, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6167,7 +6167,7 @@ L_10abe04:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010abe3c: 0x10abe3c: jal   0x100449c sw    s2, 32(sp)
+// 0x010ac484: 0x10ac484: jal   0x100449c sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6186,7 +6186,7 @@ L_10abe04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abe44: 0x10abe44: lw    v0, 108(s5)
+// 0x010ac48c: 0x10ac48c: lw    v0, 108(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6195,15 +6195,15 @@ L_10abe04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010abe48: 0x10abe48: addu  a0, s4, zero
+// 0x010ac490: 0x10ac490: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010abe4c: 0x10abe4c: addiu v0, v0, 1
+// 0x010ac494: 0x10ac494: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010abe50: 0x10abe50: jal   0x1001ba8 sw    v0, 108(s5)
+// 0x010ac498: 0x10ac498: jal   0x1001ba8 sw    v0, 108(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6222,10 +6222,10 @@ L_10abe04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abe58: 0x10abe58: addu  a0, s3, zero
+// 0x010ac4a0: 0x10ac4a0: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010abe5c: 0x10abe5c: jal   0x1001ba8 sw    v0, 48(sp)
+// 0x010ac4a4: 0x10ac4a4: jal   0x1001ba8 sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6244,31 +6244,31 @@ L_10abe04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abe64: 0x10abe64: lui   a0, 0x10000
+// 0x010ac4ac: 0x10ac4ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010abe68: 0x10abe68: lui   a2, 0x10000
+// 0x010ac4b0: 0x10ac4b0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010abe6c: 0x10abe6c: addiu a0, a0, 12560
+// 0x010ac4b4: 0x10ac4b4: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010abe70: 0x10abe70: addiu a2, a2, 18500
+// 0x010ac4b8: 0x10ac4b8: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010abe74: 0x10abe74: addiu a1, sp, 48
+// 0x010ac4bc: 0x10ac4bc: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x010abe78: 0x10abe78: addu  a3, zero, zero
+// 0x010ac4c0: 0x10ac4c0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010abe7c: 0x10abe7c: sw    v0, 52(sp)
+// 0x010ac4c4: 0x10ac4c4: sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6277,7 +6277,7 @@ L_10abe04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010abe80: 0x10abe80: jal   0x100edb0 addiu s3, zero, 32
+// 0x010ac4c8: 0x10ac4c8: jal   0x100edc0 addiu s3, zero, 32
 	ldc.i4.s 32
 	stloc 11
 	ldloc.0
@@ -6285,23 +6285,23 @@ L_10abe04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abe88: 0x10abe88: j	 0x10abe94 addu  a0, s2, zero
+// 0x010ac4d0: 0x10ac4d0: j	 0x10ac4dc addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-	br L_10abe94
+	br L_10ac4dc
 // --- basic block ---
-L_10abe90:
-// 0x010abe90: 0x10abe90: sb    s3, 0(v0)
+L_10ac4d8:
+// 0x010ac4d8: 0x10ac4d8: sb    s3, 0(v0)
 	ldloc 5
 	ldloc 11
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10abe94:
-// 0x010abe94: 0x10abe94: jal   0x1001a5c addiu a1, zero, 35
+L_10ac4dc:
+// 0x010ac4dc: 0x10ac4dc: jal   0x1001a5c addiu a1, zero, 35
 	ldc.i4.s 35
 	stloc.2
 	ldloc.1
@@ -6311,20 +6311,20 @@ L_10abe94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abe9c: 0x10abe9c: bne   v0, zero, 0x10abe90 addiu a0, v0, 1
+// 0x010ac4e4: 0x10ac4e4: bne   v0, zero, 0x10ac4d8 addiu a0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-	brtrue L_10abe90
+	brtrue L_10ac4d8
 // --- basic block ---
-// 0x010abea4: 0x10abea4: addiu a0, sp, 48
+// 0x010ac4ec: 0x10ac4ec: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010abea8: 0x10abea8: jal   0x100e5c0 addiu a1, sp, 576
+// 0x010ac4f0: 0x10ac4f0: jal   0x100e5d0 addiu a1, sp, 576
 	ldloc.0
 	ldc.i4 576
 	add
@@ -6334,20 +6334,20 @@ L_10abe94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abeb0: 0x10abeb0: lui   v0, 0x90000
+// 0x010ac4f8: 0x10ac4f8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010abeb4: 0x10abeb4: addiu v0, v0, -32628
+// 0x010ac4fc: 0x10ac4fc: addiu v0, v0, -32164
 	ldloc 5
-	ldc.i4 -32628
+	ldc.i4 -32164
 	add
 	stloc 5
-// 0x010abeb8: 0x10abeb8: lw    v1, 104(v0)
+// 0x010ac500: 0x10ac500: lw    v1, 104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6356,7 +6356,7 @@ L_10abe94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010abebc: 0x10abebc: lw    v0, 108(v0)
+// 0x010ac504: 0x10ac504: lw    v0, 108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6365,31 +6365,31 @@ L_10abe94:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010abec0: 0x10abec0: sll   zero, zero, 0
-// 0x010abec4: 0x10abec4: bne   v0, v1, 0x10abeec lui   a1, 0x20000
+// 0x010ac508: 0x10ac508: sll   zero, zero, 0
+// 0x010ac50c: 0x10ac50c: bne   v0, v1, 0x10ac534 lui   a1, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10abeec
+	bne.un L_10ac534
 // --- basic block ---
-// 0x010abecc: 0x10abecc: lui   a3, 0x20000
+// 0x010ac514: 0x10ac514: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abed0: 0x10abed0: addiu a1, a1, 13476
+// 0x010ac518: 0x10ac518: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abed4: 0x10abed4: addiu a3, a3, 15288
+// 0x010ac51c: 0x10ac51c: addiu a3, a3, 15748
 	ldloc 4
-	ldc.i4 15288
+	ldc.i4 15748
 	add
 	stloc 4
-// 0x010abed8: 0x10abed8: addiu a0, zero, 2
+// 0x010ac520: 0x10ac520: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010abedc: 0x10abedc: jal   0x100449c addiu a2, zero, 502
+// 0x010ac524: 0x10ac524: jal   0x100449c addiu a2, zero, 502
 	ldc.i4 502
 	stloc.3
 	ldloc.0
@@ -6402,31 +6402,31 @@ L_10abe94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010abee4: 0x10abee4: jal   0x10abb14 sll   zero, zero, 0
+// 0x010ac52c: 0x10ac52c: jal   0x10ac15c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::on_recieved_completed_10abb14(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::on_recieved_completed_10ac15c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10abeec:
-// 0x010abeec: 0x10abeec: sw    zero, 0(s1)
+L_10ac534:
+// 0x010ac534: 0x10ac534: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10abef0:
-// 0x010abef0: 0x10abef0: lw    ra, 868(sp)
-// 0x010abef4: 0x10abef4: addu  v0, s0, zero
+L_10ac538:
+// 0x010ac538: 0x10ac538: lw    ra, 868(sp)
+// 0x010ac53c: 0x10ac53c: addu  v0, s0, zero
 	ldloc 10
 	stloc 5
-// 0x010abef8: 0x10abef8: lw    s7, 864(sp)
+// 0x010ac540: 0x10ac540: lw    s7, 864(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6435,7 +6435,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010abefc: 0x10abefc: lw    s6, 860(sp)
+// 0x010ac544: 0x10ac544: lw    s6, 860(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6444,7 +6444,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010abf00: 0x10abf00: lw    s5, 856(sp)
+// 0x010ac548: 0x10ac548: lw    s5, 856(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6453,7 +6453,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010abf04: 0x10abf04: lw    s4, 852(sp)
+// 0x010ac54c: 0x10ac54c: lw    s4, 852(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6462,7 +6462,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010abf08: 0x10abf08: lw    s3, 848(sp)
+// 0x010ac550: 0x10ac550: lw    s3, 848(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6471,7 +6471,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010abf0c: 0x10abf0c: lw    s2, 844(sp)
+// 0x010ac554: 0x10ac554: lw    s2, 844(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6480,7 +6480,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010abf10: 0x10abf10: lw    s1, 840(sp)
+// 0x010ac558: 0x10ac558: lw    s1, 840(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6489,7 +6489,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010abf14: 0x10abf14: lw    s0, 836(sp)
+// 0x010ac55c: 0x10ac55c: lw    s0, 836(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6498,7 +6498,7 @@ L_10abef0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010abf18: 0x10abf18: jr    ra addiu sp, sp, 872
+// 0x010ac560: 0x10ac560: jr    ra addiu sp, sp, 872
 	ldloc.0
 	ldc.i4 872
 	add
@@ -6510,7 +6510,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_geo_server_config_10abf20(int32,int32,int32,int32,int32)
+.method public static int32 on_geo_server_config_10ac568(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s3,int32 ra,int32 t0,int32 t1)
@@ -6575,13 +6575,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10abf20:
-// 0x010abf20: 0x10abf20: addiu sp, sp, -96
+L_10ac568:
+// 0x010ac568: 0x10ac568: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010abf24: 0x10abf24: sw    s6, 84(sp)
+// 0x010ac56c: 0x10ac56c: sw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6590,10 +6590,10 @@ L_10abf20:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010abf28: 0x10abf28: lui   s6, 0x90000
+// 0x010ac570: 0x10ac570: lui   s6, 0x90000
 	ldc.i4 589824
 	stloc 13
-// 0x010abf2c: 0x10abf2c: sw    s2, 68(sp)
+// 0x010ac574: 0x10ac574: sw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6602,7 +6602,7 @@ L_10abf20:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010abf30: 0x10abf30: sw    s0, 60(sp)
+// 0x010ac578: 0x10ac578: sw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6611,25 +6611,25 @@ L_10abf20:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010abf34: 0x10abf34: lui   s2, 0x0
+// 0x010ac57c: 0x10ac57c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010abf38: 0x10abf38: addiu s0, s6, -32628
+// 0x010ac580: 0x10ac580: addiu s0, s6, -32164
 	ldloc 13
-	ldc.i4 -32628
+	ldc.i4 -32164
 	add
 	stloc 9
-// 0x010abf3c: 0x10abf3c: addiu v0, zero, 18
+// 0x010ac584: 0x10ac584: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x010abf40: 0x10abf40: sw    v0, 0(a3)
+// 0x010ac588: 0x10ac588: sw    v0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010abf44: 0x10abf44: sw    s3, 72(sp)
+// 0x010ac58c: 0x10ac58c: sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6638,7 +6638,7 @@ L_10abf20:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010abf48: 0x10abf48: sw    s1, 64(sp)
+// 0x010ac590: 0x10ac590: sw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6647,25 +6647,25 @@ L_10abf20:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010abf4c: 0x10abf4c: addu  s3, a3, zero
+// 0x010ac594: 0x10ac594: addu  s3, a3, zero
 	ldloc 4
 	stloc 15
-// 0x010abf50: 0x10abf50: addiu s1, zero, 1
+// 0x010ac598: 0x10ac598: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010abf54: 0x10abf54: addiu a1, s2, 28076
+// 0x010ac59c: 0x10ac59c: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010abf58: 0x10abf58: addu  a2, zero, zero
+// 0x010ac5a0: 0x10ac5a0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010abf5c: 0x10abf5c: addu  a3, s0, zero
+// 0x010ac5a4: 0x10ac5a4: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010abf60: 0x10abf60: sw    ra, 92(sp)
-// 0x010abf64: 0x10abf64: sw    s7, 88(sp)
+// 0x010ac5a8: 0x10ac5a8: sw    ra, 92(sp)
+// 0x010ac5ac: 0x10ac5ac: sw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6674,7 +6674,7 @@ L_10abf20:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010abf68: 0x10abf68: sw    s5, 80(sp)
+// 0x010ac5b0: 0x10ac5b0: sw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6683,7 +6683,7 @@ L_10abf20:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010abf6c: 0x10abf6c: sw    s4, 76(sp)
+// 0x010ac5b4: 0x10ac5b4: sw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6692,7 +6692,7 @@ L_10abf20:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010abf70: 0x10abf70: sw    zero, 104(s0)
+// 0x010ac5b8: 0x10ac5b8: sw    zero, 104(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -6701,7 +6701,7 @@ L_10abf20:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010abf74: 0x10abf74: sw    zero, 108(s0)
+// 0x010ac5bc: 0x10ac5bc: sw    zero, 108(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -6710,13 +6710,13 @@ L_10abf20:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010abf78: 0x10abf78: sb    zero, 4(s0)
+// 0x010ac5c0: 0x10ac5c0: sb    zero, 4(s0)
 	ldloc 9
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010abf7c: 0x10abf7c: jal   0x106855c sw    s1, 16(sp)
+// 0x010ac5c4: 0x10ac5c4: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6730,67 +6730,67 @@ L_10abf20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010abf84: 0x10abf84: bne   v0, zero, 0x10abfa8 lui   s5, 0x90000
+// 0x010ac5cc: 0x10ac5cc: bne   v0, zero, 0x10ac5f0 lui   s5, 0x90000
 	ldloc 6
 	ldc.i4 589824
 	stloc 12
-	brtrue L_10abfa8
+	brtrue L_10ac5f0
 // --- basic block ---
-// 0x010abf8c: 0x10abf8c: lui   a1, 0x20000
+// 0x010ac5d4: 0x10ac5d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010abf90: 0x10abf90: lui   a3, 0x20000
+// 0x010ac5d8: 0x10ac5d8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abf94: 0x10abf94: addiu a1, a1, 13476
+// 0x010ac5dc: 0x10ac5dc: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abf98: 0x10abf98: addiu a3, a3, 15328
+// 0x010ac5e0: 0x10ac5e0: addiu a3, a3, 15788
 	ldloc 4
-	ldc.i4 15328
+	ldc.i4 15788
 	add
 	stloc 4
-// 0x010abf9c: 0x10abf9c: addiu a0, zero, 4
+// 0x010ac5e4: 0x10ac5e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010abfa0: 0x10abfa0: j	 0x10abfec addiu a2, zero, 376
+// 0x010ac5e8: 0x10ac5e8: j	 0x10ac634 addiu a2, zero, 376
 	ldc.i4 376
 	stloc.3
-	br L_10abfec
+	br L_10ac634
 // --- basic block ---
-L_10abfa8:
-// 0x010abfa8: 0x10abfa8: addiu s7, sp, 40
+L_10ac5f0:
+// 0x010ac5f0: 0x10ac5f0: addiu s7, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 14
-// 0x010abfac: 0x10abfac: addu  a0, v0, zero
+// 0x010ac5f4: 0x10ac5f4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010abfb0: 0x10abfb0: addiu a1, s5, -32624
+// 0x010ac5f8: 0x10ac5f8: addiu a1, s5, -32160
 	ldloc 12
-	ldc.i4 -32624
+	ldc.i4 -32160
 	add
 	stloc.2
-// 0x010abfb4: 0x10abfb4: addiu v0, zero, 100
+// 0x010ac5fc: 0x10ac5fc: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 6
-// 0x010abfb8: 0x10abfb8: addu  a2, s7, zero
+// 0x010ac600: 0x10ac600: addu  a2, s7, zero
 	ldloc 14
 	stloc.3
-// 0x010abfbc: 0x10abfbc: addiu a3, s2, 28076
+// 0x010ac604: 0x10ac604: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010abfc0: 0x10abfc0: sw    v0, 40(sp)
+// 0x010ac608: 0x10ac608: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6799,7 +6799,7 @@ L_10abfa8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010abfc4: 0x10abfc4: jal   0x1068434 sw    s1, 16(sp)
+// 0x010ac60c: 0x10ac60c: jal   0x1068444 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6813,41 +6813,41 @@ L_10abfa8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010abfcc: 0x10abfcc: bne   v0, zero, 0x10ac000 lui   s4, 0x90000
+// 0x010ac614: 0x10ac614: bne   v0, zero, 0x10ac648 lui   s4, 0x90000
 	ldloc 6
 	ldc.i4 589824
 	stloc 11
-	brtrue L_10ac000
+	brtrue L_10ac648
 // --- basic block ---
-// 0x010abfd4: 0x10abfd4: lui   a1, 0x20000
+// 0x010ac61c: 0x10ac61c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010abfd8: 0x10abfd8: lui   a3, 0x20000
+// 0x010ac620: 0x10ac620: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010abfdc: 0x10abfdc: addiu a1, a1, 13476
+// 0x010ac624: 0x10ac624: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010abfe0: 0x10abfe0: addiu a3, a3, 15376
+// 0x010ac628: 0x10ac628: addiu a3, a3, 15836
 	ldloc 4
-	ldc.i4 15376
+	ldc.i4 15836
 	add
 	stloc 4
-// 0x010abfe4: 0x10abfe4: addiu a0, zero, 4
+// 0x010ac62c: 0x10ac62c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010abfe8: 0x10abfe8: addiu a2, zero, 384
+// 0x010ac630: 0x10ac630: addiu a2, zero, 384
 	ldc.i4 384
 	stloc.3
-L_10abfec:
-// 0x010abfec: 0x10abfec: jal   0x100449c sw    v0, 48(sp)
+L_10ac634:
+// 0x010ac634: 0x10ac634: jal   0x100449c sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6866,7 +6866,7 @@ L_10abfec:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010abff4: 0x10abff4: lw    v0, 48(sp)
+// 0x010ac63c: 0x10ac63c: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6875,30 +6875,30 @@ L_10abfec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010abff8: 0x10abff8: j	 0x10ac138 sll   zero, zero, 0
-	br L_10ac138
+// 0x010ac640: 0x10ac640: j	 0x10ac780 sll   zero, zero, 0
+	br L_10ac780
 // --- basic block ---
-L_10ac000:
-// 0x010ac000: 0x10ac000: addu  a0, v0, zero
+L_10ac648:
+// 0x010ac648: 0x10ac648: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010ac004: 0x10ac004: addu  a2, s7, zero
+// 0x010ac64c: 0x10ac64c: addu  a2, s7, zero
 	ldloc 14
 	stloc.3
-// 0x010ac008: 0x10ac008: addiu v0, zero, 6
+// 0x010ac650: 0x10ac650: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 6
-// 0x010ac00c: 0x10ac00c: addiu a1, s4, -32516
+// 0x010ac654: 0x10ac654: addiu a1, s4, -32052
 	ldloc 11
-	ldc.i4 -32516
+	ldc.i4 -32052
 	add
 	stloc.2
-// 0x010ac010: 0x10ac010: addiu a3, s2, 28076
+// 0x010ac658: 0x10ac658: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010ac014: 0x10ac014: sw    v0, 40(sp)
+// 0x010ac65c: 0x10ac65c: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6907,7 +6907,7 @@ L_10ac000:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010ac018: 0x10ac018: jal   0x1068434 sw    s1, 16(sp)
+// 0x010ac660: 0x10ac660: jal   0x1068444 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6921,59 +6921,59 @@ L_10ac000:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ac020: 0x10ac020: bne   v0, zero, 0x10ac040 lui   a1, 0x20000
+// 0x010ac668: 0x10ac668: bne   v0, zero, 0x10ac688 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10ac040
+	brtrue L_10ac688
 // --- basic block ---
-// 0x010ac028: 0x10ac028: lui   a3, 0x20000
+// 0x010ac670: 0x10ac670: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ac02c: 0x10ac02c: addiu a1, a1, 13476
+// 0x010ac674: 0x10ac674: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ac030: 0x10ac030: addiu a3, a3, 15424
+// 0x010ac678: 0x10ac678: addiu a3, a3, 15884
 	ldloc 4
-	ldc.i4 15424
+	ldc.i4 15884
 	add
 	stloc 4
-// 0x010ac034: 0x10ac034: addiu a0, zero, 4
+// 0x010ac67c: 0x10ac67c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ac038: 0x10ac038: j	 0x10abfec addiu a2, zero, 393
+// 0x010ac680: 0x10ac680: j	 0x10ac634 addiu a2, zero, 393
 	ldc.i4 393
 	stloc.3
-	br L_10abfec
+	br L_10ac634
 // --- basic block ---
-L_10ac040:
-// 0x010ac040: 0x10ac040: lui   a3, 0x90000
+L_10ac688:
+// 0x010ac688: 0x10ac688: lui   a3, 0x90000
 	ldc.i4 589824
 	stloc 4
-// 0x010ac044: 0x10ac044: addu  a0, v0, zero
+// 0x010ac68c: 0x10ac68c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010ac048: 0x10ac048: addiu a1, s2, 28076
+// 0x010ac690: 0x10ac690: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010ac04c: 0x10ac04c: addiu a3, a3, -32524
+// 0x010ac694: 0x10ac694: addiu a3, a3, -32060
 	ldloc 4
-	ldc.i4 -32524
+	ldc.i4 -32060
 	add
 	stloc 4
-// 0x010ac050: 0x10ac050: addu  a2, zero, zero
+// 0x010ac698: 0x10ac698: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ac054: 0x10ac054: jal   0x106855c sw    s1, 16(sp)
+// 0x010ac69c: 0x10ac69c: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6987,65 +6987,65 @@ L_10ac040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ac05c: 0x10ac05c: bne   v0, zero, 0x10ac07c lui   a1, 0x20000
+// 0x010ac6a4: 0x10ac6a4: bne   v0, zero, 0x10ac6c4 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10ac07c
+	brtrue L_10ac6c4
 // --- basic block ---
-// 0x010ac064: 0x10ac064: lui   a3, 0x20000
+// 0x010ac6ac: 0x10ac6ac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ac068: 0x10ac068: addiu a1, a1, 13476
+// 0x010ac6b0: 0x10ac6b0: addiu a1, a1, 13936
 	ldloc.2
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ac06c: 0x10ac06c: addiu a3, a3, 15472
+// 0x010ac6b4: 0x10ac6b4: addiu a3, a3, 15932
 	ldloc 4
-	ldc.i4 15472
+	ldc.i4 15932
 	add
 	stloc 4
-// 0x010ac070: 0x10ac070: addiu a0, zero, 4
+// 0x010ac6b8: 0x10ac6b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ac074: 0x10ac074: j	 0x10abfec addiu a2, zero, 407
+// 0x010ac6bc: 0x10ac6bc: j	 0x10ac634 addiu a2, zero, 407
 	ldc.i4 407
 	stloc.3
-	br L_10abfec
+	br L_10ac634
 // --- basic block ---
-L_10ac07c:
-// 0x010ac07c: 0x10ac07c: lui   a1, 0x0
+L_10ac6c4:
+// 0x010ac6c4: 0x10ac6c4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010ac080: 0x10ac080: lui   a3, 0x90000
+// 0x010ac6c8: 0x10ac6c8: lui   a3, 0x90000
 	ldc.i4 589824
 	stloc 4
-// 0x010ac084: 0x10ac084: addu  a0, v0, zero
+// 0x010ac6cc: 0x10ac6cc: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010ac088: 0x10ac088: addiu a1, a1, 30268
+// 0x010ac6d0: 0x10ac6d0: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010ac08c: 0x10ac08c: addiu v0, zero, -1
+// 0x010ac6d4: 0x10ac6d4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ac090: 0x10ac090: addiu a3, a3, -32508
+// 0x010ac6d8: 0x10ac6d8: addiu a3, a3, -32044
 	ldloc 4
-	ldc.i4 -32508
+	ldc.i4 -32044
 	add
 	stloc 4
-// 0x010ac094: 0x10ac094: addu  a2, zero, zero
+// 0x010ac6dc: 0x10ac6dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ac098: 0x10ac098: jal   0x106855c sw    v0, 16(sp)
+// 0x010ac6e0: 0x10ac6e0: jal   0x106856c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7059,40 +7059,40 @@ L_10ac07c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ac0a0: 0x10ac0a0: bne   v0, zero, 0x10ac0c0 lui   s1, 0x20000
+// 0x010ac6e8: 0x10ac6e8: bne   v0, zero, 0x10ac708 lui   s1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 8
-	brtrue L_10ac0c0
+	brtrue L_10ac708
 // --- basic block ---
-// 0x010ac0a8: 0x10ac0a8: lui   a3, 0x20000
+// 0x010ac6f0: 0x10ac6f0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ac0ac: 0x10ac0ac: addiu a1, s1, 13476
+// 0x010ac6f4: 0x10ac6f4: addiu a1, s1, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ac0b0: 0x10ac0b0: addiu a3, a3, 15532
+// 0x010ac6f8: 0x10ac6f8: addiu a3, a3, 15992
 	ldloc 4
-	ldc.i4 15532
+	ldc.i4 15992
 	add
 	stloc 4
-// 0x010ac0b4: 0x10ac0b4: addiu a0, zero, 4
+// 0x010ac6fc: 0x10ac6fc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ac0b8: 0x10ac0b8: j	 0x10abfec addiu a2, zero, 420
+// 0x010ac700: 0x10ac700: j	 0x10ac634 addiu a2, zero, 420
 	ldc.i4 420
 	stloc.3
-	br L_10abfec
+	br L_10ac634
 // --- basic block ---
-L_10ac0c0:
-// 0x010ac0c0: 0x10ac0c0: lw    v1, 120(s0)
+L_10ac708:
+// 0x010ac708: 0x10ac708: lw    v1, 120(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7101,16 +7101,16 @@ L_10ac0c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ac0c4: 0x10ac0c4: lw    t1, -32628(s6)
+// 0x010ac70c: 0x10ac70c: lw    t1, -32164(s6)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8157
+	ldc.i4 -8041
 	add
 	ldelem.i4
 	stloc 18
-// 0x010ac0c8: 0x10ac0c8: lw    t0, 104(s0)
+// 0x010ac710: 0x10ac710: lw    t0, 104(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7119,36 +7119,36 @@ L_10ac0c0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010ac0cc: 0x10ac0cc: lui   a3, 0x20000
+// 0x010ac714: 0x10ac714: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ac0d0: 0x10ac0d0: addiu s5, s5, -32624
+// 0x010ac718: 0x10ac718: addiu s5, s5, -32160
 	ldloc 12
-	ldc.i4 -32624
+	ldc.i4 -32160
 	add
 	stloc 12
-// 0x010ac0d4: 0x10ac0d4: addiu s4, s4, -32516
+// 0x010ac71c: 0x10ac71c: addiu s4, s4, -32052
 	ldloc 11
-	ldc.i4 -32516
+	ldc.i4 -32052
 	add
 	stloc 11
-// 0x010ac0d8: 0x10ac0d8: addiu a3, a3, 15584
+// 0x010ac720: 0x10ac720: addiu a3, a3, 16044
 	ldloc 4
-	ldc.i4 15584
+	ldc.i4 16044
 	add
 	stloc 4
-// 0x010ac0dc: 0x10ac0dc: addiu a0, zero, 1
+// 0x010ac724: 0x10ac724: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010ac0e0: 0x10ac0e0: addiu a1, s1, 13476
+// 0x010ac728: 0x10ac728: addiu a1, s1, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ac0e4: 0x10ac0e4: addiu a2, zero, 424
+// 0x010ac72c: 0x10ac72c: addiu a2, zero, 424
 	ldc.i4 424
 	stloc.3
-// 0x010ac0e8: 0x10ac0e8: sw    v1, 32(sp)
+// 0x010ac730: 0x10ac730: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7157,7 +7157,7 @@ L_10ac0c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ac0ec: 0x10ac0ec: sw    v0, 48(sp)
+// 0x010ac734: 0x10ac734: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7166,7 +7166,7 @@ L_10ac0c0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010ac0f0: 0x10ac0f0: sw    t1, 16(sp)
+// 0x010ac738: 0x10ac738: sw    t1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7175,7 +7175,7 @@ L_10ac0c0:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010ac0f4: 0x10ac0f4: sw    s5, 20(sp)
+// 0x010ac73c: 0x10ac73c: sw    s5, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7184,7 +7184,7 @@ L_10ac0c0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ac0f8: 0x10ac0f8: sw    s4, 24(sp)
+// 0x010ac740: 0x10ac740: sw    s4, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7193,7 +7193,7 @@ L_10ac0c0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ac0fc: 0x10ac0fc: jal   0x100449c sw    t0, 28(sp)
+// 0x010ac744: 0x10ac744: jal   0x100449c sw    t0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7212,7 +7212,7 @@ L_10ac0c0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ac104: 0x10ac104: lw    v1, 104(s0)
+// 0x010ac74c: 0x10ac74c: lw    v1, 104(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7221,7 +7221,7 @@ L_10ac0c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ac108: 0x10ac108: lw    v0, 48(sp)
+// 0x010ac750: 0x10ac750: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7230,26 +7230,26 @@ L_10ac0c0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ac10c: 0x10ac10c: bne   v1, zero, 0x10ac134 lui   a3, 0x20000
+// 0x010ac754: 0x10ac754: bne   v1, zero, 0x10ac77c lui   a3, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10ac134
+	brtrue L_10ac77c
 // --- basic block ---
-// 0x010ac114: 0x10ac114: addiu a1, s1, 13476
+// 0x010ac75c: 0x10ac75c: addiu a1, s1, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ac118: 0x10ac118: addiu a3, a3, 15668
+// 0x010ac760: 0x10ac760: addiu a3, a3, 16128
 	ldloc 4
-	ldc.i4 15668
+	ldc.i4 16128
 	add
 	stloc 4
-// 0x010ac11c: 0x10ac11c: addiu a0, zero, 1
+// 0x010ac764: 0x10ac764: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010ac120: 0x10ac120: jal   0x100449c addiu a2, zero, 426
+// 0x010ac768: 0x10ac768: jal   0x100449c addiu a2, zero, 426
 	ldc.i4 426
 	stloc.3
 	ldloc.0
@@ -7262,18 +7262,18 @@ L_10ac0c0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ac128: 0x10ac128: jal   0x10abb14 sll   zero, zero, 0
+// 0x010ac770: 0x10ac770: jal   0x10ac15c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::on_recieved_completed_10abb14(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::on_recieved_completed_10ac15c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ac130: 0x10ac130: lw    v0, 48(sp)
+// 0x010ac778: 0x10ac778: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7282,17 +7282,17 @@ L_10ac0c0:
 	add
 	ldelem.i4
 	stloc 6
-L_10ac134:
-// 0x010ac134: 0x10ac134: sw    zero, 0(s3)
+L_10ac77c:
+// 0x010ac77c: 0x10ac77c: sw    zero, 0(s3)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10ac138:
-// 0x010ac138: 0x10ac138: lw    ra, 92(sp)
-// 0x010ac13c: 0x10ac13c: lw    s7, 88(sp)
+L_10ac780:
+// 0x010ac780: 0x10ac780: lw    ra, 92(sp)
+// 0x010ac784: 0x10ac784: lw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7301,7 +7301,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ac140: 0x10ac140: lw    s6, 84(sp)
+// 0x010ac788: 0x10ac788: lw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7310,7 +7310,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ac144: 0x10ac144: lw    s5, 80(sp)
+// 0x010ac78c: 0x10ac78c: lw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7319,7 +7319,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ac148: 0x10ac148: lw    s4, 76(sp)
+// 0x010ac790: 0x10ac790: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7328,7 +7328,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ac14c: 0x10ac14c: lw    s3, 72(sp)
+// 0x010ac794: 0x10ac794: lw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7337,7 +7337,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ac150: 0x10ac150: lw    s2, 68(sp)
+// 0x010ac798: 0x10ac798: lw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7346,7 +7346,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ac154: 0x10ac154: lw    s1, 64(sp)
+// 0x010ac79c: 0x10ac79c: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7355,7 +7355,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ac158: 0x10ac158: lw    s0, 60(sp)
+// 0x010ac7a0: 0x10ac7a0: lw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7364,7 +7364,7 @@ L_10ac138:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ac15c: 0x10ac15c: jr    ra addiu sp, sp, 96
+// 0x010ac7a4: 0x10ac7a4: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
diff --git a/converted/Cibyl129.j b/converted/Cibyl129.j
index cf53245..4badb0c 100644
--- a/converted/Cibyl129.j
+++ b/converted/Cibyl129.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl129::.ctor
 
-.method public static int32 on_user_lang_downloaded_10ac164(int32,int32,int32,int32,int32)
+.method public static int32 on_user_lang_downloaded_10ac7ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,58 +76,58 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac164: 0x10ac164: addiu sp, sp, -24
+// 0x010ac7ac: 0x10ac7ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac168: 0x10ac168: sw    ra, 20(sp)
-// 0x010ac16c: 0x10ac16c: jal   0x10abac8 sll   zero, zero, 0
+// 0x010ac7b0: 0x10ac7b0: sw    ra, 20(sp)
+// 0x010ac7b4: 0x10ac7b4: jal   0x10ac110 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::clean_up_10abac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::clean_up_10ac110(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac174: 0x10ac174: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010ac7bc: 0x10ac7bc: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac17c: 0x10ac17c: jal   0x102146c sll   zero, zero, 0
+// 0x010ac7c4: 0x10ac7c4: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac184: 0x10ac184: lui   v0, 0x90000
+// 0x010ac7cc: 0x10ac7cc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ac188: 0x10ac188: lw    v0, -32504(v0)
+// 0x010ac7d0: 0x10ac7d0: lw    v0, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac18c: 0x10ac18c: sll   zero, zero, 0
-// 0x010ac190: 0x10ac190: beq   v0, zero, 0x10ac1a0 sll   zero, zero, 0
+// 0x010ac7d4: 0x10ac7d4: sll   zero, zero, 0
+// 0x010ac7d8: 0x10ac7d8: beq   v0, zero, 0x10ac7e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ac1a0
+	brfalse L_10ac7e8
 // --- basic block ---
-// 0x010ac198: 0x10ac198: jalr  v0 sll   zero, zero, 0
+// 0x010ac7e0: 0x10ac7e0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -139,21 +139,21 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10ac1a0:
-// 0x010ac1a0: 0x10ac1a0: lw    ra, 20(sp)
-// 0x010ac1a4: 0x10ac1a4: lui   v0, 0x90000
+L_10ac7e8:
+// 0x010ac7e8: 0x10ac7e8: lw    ra, 20(sp)
+// 0x010ac7ec: 0x10ac7ec: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ac1a8: 0x10ac1a8: sw    zero, -32504(v0)
+// 0x010ac7f0: 0x10ac7f0: sw    zero, -32040(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ac1ac: 0x10ac1ac: jr    ra addiu sp, sp, 24
+// 0x010ac7f4: 0x10ac7f4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -165,7 +165,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_lang_conf_downloaded_10ac1b4(int32,int32,int32,int32,int32)
+.method public static int32 on_lang_conf_downloaded_10ac7fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -206,13 +206,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac1b4: 0x10ac1b4: addiu sp, sp, -32
+// 0x010ac7fc: 0x10ac7fc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010ac1b8: 0x10ac1b8: sw    ra, 28(sp)
-// 0x010ac1bc: 0x10ac1bc: sw    s1, 24(sp)
+// 0x010ac800: 0x10ac800: sw    ra, 28(sp)
+// 0x010ac804: 0x10ac804: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -221,7 +221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ac1c0: 0x10ac1c0: jal   0x104c3f0 sw    s0, 20(sp)
+// 0x010ac808: 0x10ac808: jal   0x104c400 sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -230,74 +230,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac1c8: 0x10ac1c8: jal   0x10abac8 sll   zero, zero, 0
+// 0x010ac810: 0x10ac810: jal   0x10ac110 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::clean_up_10abac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::clean_up_10ac110(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac1d0: 0x10ac1d0: jal   0x101cc24 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_lang_get_available_langs_values_101cc24()
+// 0x010ac818: 0x10ac818: jal   0x101cc34 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_lang_get_available_langs_values_101cc34()
 	stloc 5
 // --- basic block ---
-// 0x010ac1d8: 0x10ac1d8: jal   0x101cc30 addu  s1, v0, zero
+// 0x010ac820: 0x10ac820: jal   0x101cc40 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-	call int32 Cibyl21::roadmap_lang_get_available_langs_labels_101cc30()
+	call int32 Cibyl21::roadmap_lang_get_available_langs_labels_101cc40()
 	stloc 5
 // --- basic block ---
-// 0x010ac1e0: 0x10ac1e0: jal   0x101cc14 addu  s0, v0, zero
+// 0x010ac828: 0x10ac828: jal   0x101cc24 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl21::roadmap_lang_get_available_langs_count_101cc14()
+	call int32 Cibyl21::roadmap_lang_get_available_langs_count_101cc24()
 	stloc 5
 // --- basic block ---
-// 0x010ac1e8: 0x10ac1e8: lui   a1, 0x10b0000
+// 0x010ac830: 0x10ac830: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010ac1ec: 0x10ac1ec: lui   a0, 0x80000
-	ldc.i4 524288
+// 0x010ac834: 0x10ac834: lui   a0, 0x90000
+	ldc.i4 589824
 	stloc.1
-// 0x010ac1f0: 0x10ac1f0: addu  v1, v0, zero
+// 0x010ac838: 0x10ac838: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010ac1f4: 0x10ac1f4: addiu a1, a1, -21064
+// 0x010ac83c: 0x10ac83c: addiu a1, a1, -19456
 	ldloc.2
-	ldc.i4 -21064
+	ldc.i4 -19456
 	add
 	stloc.2
-// 0x010ac1f8: 0x10ac1f8: addiu a0, a0, 32708
+// 0x010ac840: 0x10ac840: addiu a0, a0, -32364
 	ldloc.1
-	ldc.i4 32708
+	ldc.i4 -32364
 	add
 	stloc.1
-// 0x010ac1fc: 0x10ac1fc: cibyl_sysc_arg 0x10
+// 0x010ac844: 0x10ac844: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010ac200: 0x10ac200: cibyl_sysc_arg 0x11
+// 0x010ac848: 0x10ac848: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x010ac204: 0x10ac204: cibyl_sysc_arg 0x3
+// 0x010ac84c: 0x10ac84c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010ac208: 0x10ac208: cibyl_sysc_arg 0x4
+// 0x010ac850: 0x10ac850: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010ac20c: 0x10ac20c: cibyl_sysc_arg 0x5
+// 0x010ac854: 0x10ac854: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010ac210: 0x10ac210: cibyl_sysc 0x22b6
+// 0x010ac858: 0x10ac858: cibyl_sysc 0x22b6
 	call void [WazeWP7]Syscalls::NOPH_SelectLanguageDialog_showDialog(int32,int32,int32,int32,int32)
-// 0x010ac214: 0x10ac214: addu  s0, v0, zero
+// 0x010ac85c: 0x10ac85c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010ac218: 0x10ac218: lw    ra, 28(sp)
-// 0x010ac21c: 0x10ac21c: lw    s1, 24(sp)
+// 0x010ac860: 0x10ac860: lw    ra, 28(sp)
+// 0x010ac864: 0x10ac864: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -306,7 +306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ac220: 0x10ac220: lw    s0, 20(sp)
+// 0x010ac868: 0x10ac868: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -315,7 +315,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ac224: 0x10ac224: jr    ra addiu sp, sp, 32
+// 0x010ac86c: 0x10ac86c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -327,7 +327,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_config_transaction_failed_10ac22c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_transaction_failed_10ac874(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -362,38 +362,38 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac22c: 0x10ac22c: addiu sp, sp, -24
+// 0x010ac874: 0x10ac874: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac230: 0x10ac230: sw    ra, 20(sp)
-// 0x010ac234: 0x10ac234: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010ac878: 0x10ac878: sw    ra, 20(sp)
+// 0x010ac87c: 0x10ac87c: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac23c: 0x10ac23c: lui   a1, 0x20000
+// 0x010ac884: 0x10ac884: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ac240: 0x10ac240: lui   a2, 0x10b0000
+// 0x010ac888: 0x10ac888: lui   a2, 0x10b0000
 	ldc.i4 17498112
 	stloc.3
-// 0x010ac244: 0x10ac244: lui   a0, 0x0
+// 0x010ac88c: 0x10ac88c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ac248: 0x10ac248: addiu a1, a1, 15724
+// 0x010ac890: 0x10ac890: addiu a1, a1, 16184
 	ldloc.2
-	ldc.i4 15724
+	ldc.i4 16184
 	add
 	stloc.2
-// 0x010ac24c: 0x10ac24c: addiu a2, a2, -15540
+// 0x010ac894: 0x10ac894: addiu a2, a2, -13932
 	ldloc.3
-	ldc.i4 -15540
+	ldc.i4 -13932
 	add
 	stloc.3
-// 0x010ac250: 0x10ac250: jal   0x104c058 addiu a0, a0, 30092
+// 0x010ac898: 0x10ac898: jal   0x104c068 addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
@@ -403,28 +403,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac258: 0x10ac258: jal   0x10abac8 sll   zero, zero, 0
+// 0x010ac8a0: 0x10ac8a0: jal   0x10ac110 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::clean_up_10abac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::clean_up_10ac110(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac260: 0x10ac260: lui   a0, 0x10b0000
+// 0x010ac8a8: 0x10ac8a8: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010ac264: 0x10ac264: jal   0x104fd00 addiu a0, a0, -15712
+// 0x010ac8ac: 0x10ac8ac: jal   0x104fd10 addiu a0, a0, -14104
 	ldloc.1
-	ldc.i4 -15712
+	ldc.i4 -14104
 	add
 	stloc.1
 	ldloc.0
@@ -432,40 +432,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac26c: 0x10ac26c: jal   0x102146c sll   zero, zero, 0
+// 0x010ac8b4: 0x10ac8b4: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac274: 0x10ac274: lui   v0, 0x90000
+// 0x010ac8bc: 0x10ac8bc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ac278: 0x10ac278: lw    v0, -32504(v0)
+// 0x010ac8c0: 0x10ac8c0: lw    v0, -32040(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8126
+	ldc.i4 -8010
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac27c: 0x10ac27c: sll   zero, zero, 0
-// 0x010ac280: 0x10ac280: beq   v0, zero, 0x10ac290 sll   zero, zero, 0
+// 0x010ac8c4: 0x10ac8c4: sll   zero, zero, 0
+// 0x010ac8c8: 0x10ac8c8: beq   v0, zero, 0x10ac8d8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ac290
+	brfalse L_10ac8d8
 // --- basic block ---
-// 0x010ac288: 0x10ac288: jalr  v0 sll   zero, zero, 0
+// 0x010ac8d0: 0x10ac8d0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -477,10 +477,10 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10ac290:
-// 0x010ac290: 0x10ac290: lw    ra, 20(sp)
-// 0x010ac294: 0x10ac294: sll   zero, zero, 0
-// 0x010ac298: 0x10ac298: jr    ra addiu sp, sp, 24
+L_10ac8d8:
+// 0x010ac8d8: 0x10ac8d8: lw    ra, 20(sp)
+// 0x010ac8dc: 0x10ac8dc: sll   zero, zero, 0
+// 0x010ac8e0: 0x10ac8e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -492,7 +492,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 GeoConfigTimer_10ac2a0(int32,int32,int32,int32,int32)
+.method public static int32 GeoConfigTimer_10ac8e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -530,20 +530,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac2a0: 0x10ac2a0: lui   v0, 0x90000
+// 0x010ac8e8: 0x10ac8e8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ac2a4: 0x10ac2a4: addiu v0, v0, -32628
+// 0x010ac8ec: 0x10ac8ec: addiu v0, v0, -32164
 	ldloc 5
-	ldc.i4 -32628
+	ldc.i4 -32164
 	add
 	stloc 5
-// 0x010ac2a8: 0x10ac2a8: addiu sp, sp, -32
+// 0x010ac8f0: 0x10ac8f0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010ac2ac: 0x10ac2ac: lw    v1, 108(v0)
+// 0x010ac8f4: 0x10ac8f4: lw    v1, 108(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -552,7 +552,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ac2b0: 0x10ac2b0: sw    s0, 24(sp)
+// 0x010ac8f8: 0x10ac8f8: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -561,7 +561,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ac2b4: 0x10ac2b4: lw    v0, 104(v0)
+// 0x010ac8fc: 0x10ac8fc: lw    v0, 104(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -570,35 +570,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac2b8: 0x10ac2b8: lui   s0, 0x20000
+// 0x010ac900: 0x10ac900: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010ac2bc: 0x10ac2bc: lui   a3, 0x20000
+// 0x010ac904: 0x10ac904: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ac2c0: 0x10ac2c0: addiu v1, v1, 1
+// 0x010ac908: 0x10ac908: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010ac2c4: 0x10ac2c4: addiu a1, s0, 13476
+// 0x010ac90c: 0x10ac90c: addiu a1, s0, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ac2c8: 0x10ac2c8: addiu a3, a3, 15808
+// 0x010ac910: 0x10ac910: addiu a3, a3, 16268
 	ldloc 4
-	ldc.i4 15808
+	ldc.i4 16268
 	add
 	stloc 4
-// 0x010ac2cc: 0x10ac2cc: addiu a0, zero, 4
+// 0x010ac914: 0x10ac914: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ac2d0: 0x10ac2d0: addiu a2, zero, 180
+// 0x010ac918: 0x10ac918: addiu a2, zero, 180
 	ldc.i4 180
 	stloc.3
-// 0x010ac2d4: 0x10ac2d4: sw    ra, 28(sp)
-// 0x010ac2d8: 0x10ac2d8: sw    v1, 16(sp)
+// 0x010ac91c: 0x10ac91c: sw    ra, 28(sp)
+// 0x010ac920: 0x10ac920: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -607,7 +607,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010ac2dc: 0x10ac2dc: jal   0x100449c sw    v0, 20(sp)
+// 0x010ac924: 0x10ac924: jal   0x100449c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -626,29 +626,29 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac2e4: 0x10ac2e4: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010ac92c: 0x10ac92c: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac2ec: 0x10ac2ec: lui   a3, 0x20000
+// 0x010ac934: 0x10ac934: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ac2f0: 0x10ac2f0: addiu a3, a3, 15856
+// 0x010ac938: 0x10ac938: addiu a3, a3, 16316
 	ldloc 4
-	ldc.i4 15856
+	ldc.i4 16316
 	add
 	stloc 4
-// 0x010ac2f4: 0x10ac2f4: addiu a1, s0, 13476
+// 0x010ac93c: 0x10ac93c: addiu a1, s0, 13936
 	ldloc 8
-	ldc.i4 13476
+	ldc.i4 13936
 	add
 	stloc.2
-// 0x010ac2f8: 0x10ac2f8: addiu a0, zero, 4
+// 0x010ac940: 0x10ac940: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ac2fc: 0x10ac2fc: jal   0x100449c addiu a2, zero, 184
+// 0x010ac944: 0x10ac944: jal   0x100449c addiu a2, zero, 184
 	ldc.i4 184
 	stloc.3
 	ldloc.0
@@ -661,28 +661,28 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac304: 0x10ac304: lui   a0, 0x0
+// 0x010ac94c: 0x10ac94c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ac308: 0x10ac308: lui   a1, 0x20000
+// 0x010ac950: 0x10ac950: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ac30c: 0x10ac30c: lui   a2, 0x10b0000
+// 0x010ac954: 0x10ac954: lui   a2, 0x10b0000
 	ldc.i4 17498112
 	stloc.3
-// 0x010ac310: 0x10ac310: addiu a0, a0, 30092
+// 0x010ac958: 0x10ac958: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010ac314: 0x10ac314: addiu a1, a1, 15888
+// 0x010ac95c: 0x10ac95c: addiu a1, a1, 16348
 	ldloc.2
-	ldc.i4 15888
+	ldc.i4 16348
 	add
 	stloc.2
-// 0x010ac318: 0x10ac318: jal   0x104c058 addiu a2, a2, -15540
+// 0x010ac960: 0x10ac960: jal   0x104c068 addiu a2, a2, -13932
 	ldloc.3
-	ldc.i4 -15540
+	ldc.i4 -13932
 	add
 	stloc.3
 	ldloc.0
@@ -690,39 +690,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac320: 0x10ac320: jal   0x10abac8 sll   zero, zero, 0
+// 0x010ac968: 0x10ac968: jal   0x10ac110 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::clean_up_10abac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::clean_up_10ac110(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac328: 0x10ac328: jal   0x102146c sll   zero, zero, 0
+// 0x010ac970: 0x10ac970: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac330: 0x10ac330: lui   a0, 0x10b0000
+// 0x010ac978: 0x10ac978: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010ac334: 0x10ac334: jal   0x104fd00 addiu a0, a0, -15712
+// 0x010ac97c: 0x10ac97c: jal   0x104fd10 addiu a0, a0, -14104
 	ldloc.1
-	ldc.i4 -15712
+	ldc.i4 -14104
 	add
 	stloc.1
 	ldloc.0
@@ -730,13 +730,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac33c: 0x10ac33c: lw    ra, 28(sp)
-// 0x010ac340: 0x10ac340: lw    s0, 24(sp)
+// 0x010ac984: 0x10ac984: lw    ra, 28(sp)
+// 0x010ac988: 0x10ac988: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -745,7 +745,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ac344: 0x10ac344: jr    ra addiu sp, sp, 32
+// 0x010ac98c: 0x10ac98c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -757,7 +757,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geo_config_failed_cb_10ac34c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geo_config_failed_cb_10ac994(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -792,26 +792,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac34c: 0x10ac34c: addiu sp, sp, -24
+// 0x010ac994: 0x10ac994: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac350: 0x10ac350: sw    ra, 20(sp)
-// 0x010ac354: 0x10ac354: jal   0x1050b24 sll   zero, zero, 0
+// 0x010ac998: 0x10ac998: sw    ra, 20(sp)
+// 0x010ac99c: 0x10ac99c: jal   0x1050b34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010ac35c: 0x10ac35c: lw    ra, 20(sp)
-// 0x010ac360: 0x10ac360: sll   zero, zero, 0
-// 0x010ac364: 0x10ac364: jr    ra addiu sp, sp, 24
+// 0x010ac9a4: 0x10ac9a4: lw    ra, 20(sp)
+// 0x010ac9a8: 0x10ac9a8: sll   zero, zero, 0
+// 0x010ac9ac: 0x10ac9ac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -823,7 +823,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -861,18 +861,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac36c: 0x10ac36c: addiu sp, sp, -24
+// 0x010ac9b4: 0x10ac9b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac370: 0x10ac370: sltiu v0, a0, 42
+// 0x010ac9b8: 0x10ac9b8: sltiu v0, a0, 42
 	ldloc.1
 	ldc.i4.s 42
 	clt.un
 	stloc 5
-// 0x010ac374: 0x10ac374: sw    ra, 20(sp)
-// 0x010ac378: 0x10ac378: bne   v0, zero, 0x10ac38c sw    s0, 16(sp)
+// 0x010ac9bc: 0x10ac9bc: sw    ra, 20(sp)
+// 0x010ac9c0: 0x10ac9c0: bne   v0, zero, 0x10ac9d4 sw    s0, 16(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -882,343 +882,343 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_10ac38c
+	brtrue L_10ac9d4
 // --- basic block ---
-// 0x010ac380: 0x10ac380: lui   v0, 0x20000
+// 0x010ac9c8: 0x10ac9c8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac384: 0x10ac384: j	 0x10ac4f4 addiu v0, v0, 16032
+// 0x010ac9cc: 0x10ac9cc: j	 0x10acb3c addiu v0, v0, 16492
 	ldloc 5
-	ldc.i4 16032
+	ldc.i4 16492
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac38c:
-// 0x010ac38c: 0x10ac38c: sltiu v0, a0, 41
+L_10ac9d4:
+// 0x010ac9d4: 0x10ac9d4: sltiu v0, a0, 41
 	ldloc.1
 	ldc.i4.s 41
 	clt.un
 	stloc 5
-// 0x010ac390: 0x10ac390: beq   v0, zero, 0x10ac4dc lui   s0, 0x90000
+// 0x010ac9d8: 0x10ac9d8: beq   v0, zero, 0x10acb24 lui   s0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 6
-	brfalse L_10ac4dc
+	brfalse L_10acb24
 // --- basic block ---
-// 0x010ac398: 0x10ac398: lui   v0, 0x20000
+// 0x010ac9e0: 0x10ac9e0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac39c: 0x10ac39c: sll   v1, a0, 2
+// 0x010ac9e4: 0x10ac9e4: sll   v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x010ac3a0: 0x10ac3a0: addiu v0, v0, 29820
+// 0x010ac9e8: 0x10ac9e8: addiu v0, v0, 30284
 	ldloc 5
-	ldc.i4 29820
+	ldc.i4 30284
 	add
 	stloc 5
-// 0x010ac3a4: 0x10ac3a4: addu  v0, v0, v1
+// 0x010ac9ec: 0x10ac9ec: addu  v0, v0, v1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x010ac3a8: 0x10ac3a8: lw    v0, 0(v0)
+// 0x010ac9f0: 0x10ac9f0: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ac3ac: 0x10ac3ac: sll   zero, zero, 0
-// 0x010ac3b0: 0x10ac3b0: jr    v0 sll   zero, zero, 0
+// 0x010ac9f4: 0x10ac9f4: sll   zero, zero, 0
+// 0x010ac9f8: 0x10ac9f8: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_10ac3b8:
-// 0x010ac3b8: 0x10ac3b8: lui   v0, 0x20000
+L_10aca00:
+// 0x010aca00: 0x10aca00: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac3bc: 0x10ac3bc: j	 0x10ac4f4 addiu v0, v0, 16052
+// 0x010aca04: 0x10aca04: j	 0x10acb3c addiu v0, v0, 16512
 	ldloc 5
-	ldc.i4 16052
+	ldc.i4 16512
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac3c4:
-// 0x010ac3c4: 0x10ac3c4: lui   v0, 0x20000
+L_10aca0c:
+// 0x010aca0c: 0x10aca0c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac3c8: 0x10ac3c8: j	 0x10ac4f4 addiu v0, v0, 16072
+// 0x010aca10: 0x10aca10: j	 0x10acb3c addiu v0, v0, 16532
 	ldloc 5
-	ldc.i4 16072
+	ldc.i4 16532
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac3d0:
-// 0x010ac3d0: 0x10ac3d0: lui   v0, 0x20000
+L_10aca18:
+// 0x010aca18: 0x10aca18: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac3d4: 0x10ac3d4: j	 0x10ac4f4 addiu v0, v0, 16080
+// 0x010aca1c: 0x10aca1c: j	 0x10acb3c addiu v0, v0, 16540
 	ldloc 5
-	ldc.i4 16080
+	ldc.i4 16540
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac3dc:
-// 0x010ac3dc: 0x10ac3dc: lui   v0, 0x20000
+L_10aca24:
+// 0x010aca24: 0x10aca24: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac3e0: 0x10ac3e0: j	 0x10ac4f4 addiu v0, v0, 16096
+// 0x010aca28: 0x10aca28: j	 0x10acb3c addiu v0, v0, 16556
 	ldloc 5
-	ldc.i4 16096
+	ldc.i4 16556
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac3e8:
-// 0x010ac3e8: 0x10ac3e8: lui   v0, 0x20000
+L_10aca30:
+// 0x010aca30: 0x10aca30: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac3ec: 0x10ac3ec: j	 0x10ac4f4 addiu v0, v0, 16116
+// 0x010aca34: 0x10aca34: j	 0x10acb3c addiu v0, v0, 16576
 	ldloc 5
-	ldc.i4 16116
+	ldc.i4 16576
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac3f4:
-// 0x010ac3f4: 0x10ac3f4: lui   v0, 0x20000
+L_10aca3c:
+// 0x010aca3c: 0x10aca3c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac3f8: 0x10ac3f8: j	 0x10ac4f4 addiu v0, v0, 16136
+// 0x010aca40: 0x10aca40: j	 0x10acb3c addiu v0, v0, 16596
 	ldloc 5
-	ldc.i4 16136
+	ldc.i4 16596
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac400:
-// 0x010ac400: 0x10ac400: lui   v0, 0x20000
+L_10aca48:
+// 0x010aca48: 0x10aca48: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac404: 0x10ac404: j	 0x10ac4f4 addiu v0, v0, 16152
+// 0x010aca4c: 0x10aca4c: j	 0x10acb3c addiu v0, v0, 16612
 	ldloc 5
-	ldc.i4 16152
+	ldc.i4 16612
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac40c:
-// 0x010ac40c: 0x10ac40c: lui   v0, 0x20000
+L_10aca54:
+// 0x010aca54: 0x10aca54: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac410: 0x10ac410: j	 0x10ac4f4 addiu v0, v0, 16172
+// 0x010aca58: 0x10aca58: j	 0x10acb3c addiu v0, v0, 16632
 	ldloc 5
-	ldc.i4 16172
+	ldc.i4 16632
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac418:
-// 0x010ac418: 0x10ac418: lui   v0, 0x20000
+L_10aca60:
+// 0x010aca60: 0x10aca60: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac41c: 0x10ac41c: j	 0x10ac4f4 addiu v0, v0, 16188
+// 0x010aca64: 0x10aca64: j	 0x10acb3c addiu v0, v0, 16648
 	ldloc 5
-	ldc.i4 16188
+	ldc.i4 16648
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac424:
-// 0x010ac424: 0x10ac424: lui   v0, 0x20000
+L_10aca6c:
+// 0x010aca6c: 0x10aca6c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac428: 0x10ac428: j	 0x10ac4f4 addiu v0, v0, 16220
+// 0x010aca70: 0x10aca70: j	 0x10acb3c addiu v0, v0, 16680
 	ldloc 5
-	ldc.i4 16220
+	ldc.i4 16680
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac430:
-// 0x010ac430: 0x10ac430: lui   v0, 0x20000
+L_10aca78:
+// 0x010aca78: 0x10aca78: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac434: 0x10ac434: j	 0x10ac4f4 addiu v0, v0, 16244
+// 0x010aca7c: 0x10aca7c: j	 0x10acb3c addiu v0, v0, 16704
 	ldloc 5
-	ldc.i4 16244
+	ldc.i4 16704
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac43c:
-// 0x010ac43c: 0x10ac43c: lui   v0, 0x20000
+L_10aca84:
+// 0x010aca84: 0x10aca84: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac440: 0x10ac440: j	 0x10ac4f4 addiu v0, v0, 16264
+// 0x010aca88: 0x10aca88: j	 0x10acb3c addiu v0, v0, 16724
 	ldloc 5
-	ldc.i4 16264
+	ldc.i4 16724
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac448:
-// 0x010ac448: 0x10ac448: lui   v0, 0x20000
+L_10aca90:
+// 0x010aca90: 0x10aca90: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac44c: 0x10ac44c: j	 0x10ac4f4 addiu v0, v0, 16288
+// 0x010aca94: 0x10aca94: j	 0x10acb3c addiu v0, v0, 16748
 	ldloc 5
-	ldc.i4 16288
+	ldc.i4 16748
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac454:
-// 0x010ac454: 0x10ac454: lui   v0, 0x20000
+L_10aca9c:
+// 0x010aca9c: 0x10aca9c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac458: 0x10ac458: j	 0x10ac4f4 addiu v0, v0, 16316
+// 0x010acaa0: 0x10acaa0: j	 0x10acb3c addiu v0, v0, 16776
 	ldloc 5
-	ldc.i4 16316
+	ldc.i4 16776
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac460:
-// 0x010ac460: 0x10ac460: lui   v0, 0x20000
+L_10acaa8:
+// 0x010acaa8: 0x10acaa8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac464: 0x10ac464: j	 0x10ac4f4 addiu v0, v0, 16340
+// 0x010acaac: 0x10acaac: j	 0x10acb3c addiu v0, v0, 16800
 	ldloc 5
-	ldc.i4 16340
+	ldc.i4 16800
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac46c:
-// 0x010ac46c: 0x10ac46c: lui   v0, 0x20000
+L_10acab4:
+// 0x010acab4: 0x10acab4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac470: 0x10ac470: j	 0x10ac4f4 addiu v0, v0, 16356
+// 0x010acab8: 0x10acab8: j	 0x10acb3c addiu v0, v0, 16816
 	ldloc 5
-	ldc.i4 16356
+	ldc.i4 16816
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac478:
-// 0x010ac478: 0x10ac478: lui   v0, 0x20000
+L_10acac0:
+// 0x010acac0: 0x10acac0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac47c: 0x10ac47c: j	 0x10ac4f4 addiu v0, v0, 16400
+// 0x010acac4: 0x10acac4: j	 0x10acb3c addiu v0, v0, 16860
 	ldloc 5
-	ldc.i4 16400
+	ldc.i4 16860
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac484:
-// 0x010ac484: 0x10ac484: lui   v0, 0x20000
+L_10acacc:
+// 0x010acacc: 0x10acacc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac488: 0x10ac488: j	 0x10ac4f4 addiu v0, v0, 16420
+// 0x010acad0: 0x10acad0: j	 0x10acb3c addiu v0, v0, 16880
 	ldloc 5
-	ldc.i4 16420
+	ldc.i4 16880
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac490:
-// 0x010ac490: 0x10ac490: lui   v0, 0x20000
+L_10acad8:
+// 0x010acad8: 0x10acad8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac494: 0x10ac494: j	 0x10ac4f4 addiu v0, v0, 16440
+// 0x010acadc: 0x10acadc: j	 0x10acb3c addiu v0, v0, 16900
 	ldloc 5
-	ldc.i4 16440
+	ldc.i4 16900
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac49c:
-// 0x010ac49c: 0x10ac49c: lui   v0, 0x20000
+L_10acae4:
+// 0x010acae4: 0x10acae4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac4a0: 0x10ac4a0: j	 0x10ac4f4 addiu v0, v0, 16468
+// 0x010acae8: 0x10acae8: j	 0x10acb3c addiu v0, v0, 16928
 	ldloc 5
-	ldc.i4 16468
+	ldc.i4 16928
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac4a8:
-// 0x010ac4a8: 0x10ac4a8: lui   v0, 0x20000
+L_10acaf0:
+// 0x010acaf0: 0x10acaf0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac4ac: 0x10ac4ac: j	 0x10ac4f4 addiu v0, v0, 16496
+// 0x010acaf4: 0x10acaf4: j	 0x10acb3c addiu v0, v0, 16956
 	ldloc 5
-	ldc.i4 16496
+	ldc.i4 16956
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac4b4:
-// 0x010ac4b4: 0x10ac4b4: lui   v0, 0x20000
+L_10acafc:
+// 0x010acafc: 0x10acafc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac4b8: 0x10ac4b8: j	 0x10ac4f4 addiu v0, v0, 16520
+// 0x010acb00: 0x10acb00: j	 0x10acb3c addiu v0, v0, 16980
 	ldloc 5
-	ldc.i4 16520
+	ldc.i4 16980
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac4c0:
-// 0x010ac4c0: 0x10ac4c0: lui   v0, 0x20000
+L_10acb08:
+// 0x010acb08: 0x10acb08: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac4c4: 0x10ac4c4: j	 0x10ac4f4 addiu v0, v0, 16568
+// 0x010acb0c: 0x10acb0c: j	 0x10acb3c addiu v0, v0, 17028
 	ldloc 5
-	ldc.i4 16568
+	ldc.i4 17028
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac4cc:
-// 0x010ac4cc: 0x10ac4cc: lui   v0, 0x20000
+L_10acb14:
+// 0x010acb14: 0x10acb14: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010ac4d0: 0x10ac4d0: j	 0x10ac4f4 addiu v0, v0, 16616
+// 0x010acb18: 0x10acb18: j	 0x10acb3c addiu v0, v0, 17076
 	ldloc 5
-	ldc.i4 16616
+	ldc.i4 17076
 	add
 	stloc 5
-	br L_10ac4f4
+	br L_10acb3c
 // --- basic block ---
-L_10ac4d8:
-// 0x010ac4d8: 0x10ac4d8: lui   s0, 0x90000
+L_10acb20:
+// 0x010acb20: 0x10acb20: lui   s0, 0x90000
 	ldc.i4 589824
 	stloc 6
-L_10ac4dc:
-// 0x010ac4dc: 0x10ac4dc: lui   a1, 0x20000
+L_10acb24:
+// 0x010acb24: 0x10acb24: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ac4e0: 0x10ac4e0: addu  a2, a0, zero
+// 0x010acb28: 0x10acb28: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010ac4e4: 0x10ac4e4: addiu a1, a1, 16668
+// 0x010acb2c: 0x10acb2c: addiu a1, a1, 17128
 	ldloc.2
-	ldc.i4 16668
+	ldc.i4 17128
 	add
 	stloc.2
-// 0x010ac4e8: 0x10ac4e8: jal   0x1000f64 addiu a0, s0, -32500
+// 0x010acb30: 0x10acb30: jal   0x1000f64 addiu a0, s0, -32036
 	ldloc 6
-	ldc.i4 -32500
+	ldc.i4 -32036
 	add
 	stloc.1
 	ldloc.0
@@ -1231,14 +1231,14 @@ L_10ac4dc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ac4f0: 0x10ac4f0: addiu v0, s0, -32500
+// 0x010acb38: 0x10acb38: addiu v0, s0, -32036
 	ldloc 6
-	ldc.i4 -32500
+	ldc.i4 -32036
 	add
 	stloc 5
-L_10ac4f4:
-// 0x010ac4f4: 0x10ac4f4: lw    ra, 20(sp)
-// 0x010ac4f8: 0x10ac4f8: lw    s0, 16(sp)
+L_10acb3c:
+// 0x010acb3c: 0x10acb3c: lw    ra, 20(sp)
+// 0x010acb40: 0x10acb40: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1247,7 +1247,7 @@ L_10ac4f4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ac4fc: 0x10ac4fc: jr    ra addiu sp, sp, 24
+// 0x010acb44: 0x10acb44: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1257,80 +1257,80 @@ L_10ac4f4:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17482680
-	beq  L_10ac3b8
+	ldc.i4 17484288
+	beq  L_10aca00
 	ldloc 5
-	ldc.i4 17482692
-	beq  L_10ac3c4
+	ldc.i4 17484300
+	beq  L_10aca0c
 	ldloc 5
-	ldc.i4 17482704
-	beq  L_10ac3d0
+	ldc.i4 17484312
+	beq  L_10aca18
 	ldloc 5
-	ldc.i4 17482716
-	beq  L_10ac3dc
+	ldc.i4 17484324
+	beq  L_10aca24
 	ldloc 5
-	ldc.i4 17482728
-	beq  L_10ac3e8
+	ldc.i4 17484336
+	beq  L_10aca30
 	ldloc 5
-	ldc.i4 17482740
-	beq  L_10ac3f4
+	ldc.i4 17484348
+	beq  L_10aca3c
 	ldloc 5
-	ldc.i4 17482752
-	beq  L_10ac400
+	ldc.i4 17484360
+	beq  L_10aca48
 	ldloc 5
-	ldc.i4 17482764
-	beq  L_10ac40c
+	ldc.i4 17484372
+	beq  L_10aca54
 	ldloc 5
-	ldc.i4 17482776
-	beq  L_10ac418
+	ldc.i4 17484384
+	beq  L_10aca60
 	ldloc 5
-	ldc.i4 17482788
-	beq  L_10ac424
+	ldc.i4 17484396
+	beq  L_10aca6c
 	ldloc 5
-	ldc.i4 17482800
-	beq  L_10ac430
+	ldc.i4 17484408
+	beq  L_10aca78
 	ldloc 5
-	ldc.i4 17482812
-	beq  L_10ac43c
+	ldc.i4 17484420
+	beq  L_10aca84
 	ldloc 5
-	ldc.i4 17482824
-	beq  L_10ac448
+	ldc.i4 17484432
+	beq  L_10aca90
 	ldloc 5
-	ldc.i4 17482836
-	beq  L_10ac454
+	ldc.i4 17484444
+	beq  L_10aca9c
 	ldloc 5
-	ldc.i4 17482848
-	beq  L_10ac460
+	ldc.i4 17484456
+	beq  L_10acaa8
 	ldloc 5
-	ldc.i4 17482860
-	beq  L_10ac46c
+	ldc.i4 17484468
+	beq  L_10acab4
 	ldloc 5
-	ldc.i4 17482872
-	beq  L_10ac478
+	ldc.i4 17484480
+	beq  L_10acac0
 	ldloc 5
-	ldc.i4 17482884
-	beq  L_10ac484
+	ldc.i4 17484492
+	beq  L_10acacc
 	ldloc 5
-	ldc.i4 17482896
-	beq  L_10ac490
+	ldc.i4 17484504
+	beq  L_10acad8
 	ldloc 5
-	ldc.i4 17482908
-	beq  L_10ac49c
+	ldc.i4 17484516
+	beq  L_10acae4
 	ldloc 5
-	ldc.i4 17482920
-	beq  L_10ac4a8
+	ldc.i4 17484528
+	beq  L_10acaf0
 	ldloc 5
-	ldc.i4 17482932
-	beq  L_10ac4b4
+	ldc.i4 17484540
+	beq  L_10acafc
 	ldloc 5
-	ldc.i4 17482944
-	beq  L_10ac4c0
+	ldc.i4 17484552
+	beq  L_10acb08
 	ldloc 5
-	ldc.i4 17482956
-	beq  L_10ac4cc
+	ldc.i4 17484564
+	beq  L_10acb14
 	ldloc 5
-	ldc.i4 17482968
-	beq  L_10ac4d8
+	ldc.i4 17484576
+	beq  L_10acb20
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
@@ -1338,7 +1338,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_spawn_write_pipe_10ac504()
+.method public static int32 roadmap_spawn_write_pipe_10acb4c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1352,7 +1352,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac504: 0x10ac504: jr    ra addiu v0, zero, -1
+// 0x010acb4c: 0x10acb4c: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.0
 	br __CIBYL_function_return
@@ -1360,7 +1360,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_spawn_read_pipe_10ac50c()
+.method public static int32 roadmap_spawn_read_pipe_10acb54()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1374,7 +1374,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac50c: 0x10ac50c: jr    ra addiu v0, zero, -1
+// 0x010acb54: 0x10acb54: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.0
 	br __CIBYL_function_return
@@ -1382,7 +1382,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_spawn_close_pipe_10ac514()
+.method public static void roadmap_spawn_close_pipe_10acb5c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1393,12 +1393,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac514: 0x10ac514: jr    ra sll   zero, zero, 0
+// 0x010acb5c: 0x10acb5c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_device_events_os_init_10ac51c()
+.method public static int32 roadmap_device_events_os_init_10acb64()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1412,7 +1412,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac51c: 0x10ac51c: jr    ra addiu v0, zero, 1
+// 0x010acb64: 0x10acb64: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -1420,7 +1420,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_device_events_os_term_10ac524()
+.method public static void roadmap_device_events_os_term_10acb6c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1431,12 +1431,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac524: 0x10ac524: jr    ra sll   zero, zero, 0
+// 0x010acb6c: 0x10acb6c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_voice_initialize_10ac534()
+.method public static void roadmap_voice_initialize_10acb7c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1447,12 +1447,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac534: 0x10ac534: jr    ra sll   zero, zero, 0
+// 0x010acb7c: 0x10acb7c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_voice_announce_10ac53c()
+.method public static void roadmap_voice_announce_10acb84()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1463,12 +1463,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac53c: 0x10ac53c: jr    ra sll   zero, zero, 0
+// 0x010acb84: 0x10acb84: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_voice_mute_10ac544()
+.method public static void roadmap_voice_mute_10acb8c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1479,13 +1479,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac544:
-// 0x010ac544: 0x10ac544: jr    ra sll   zero, zero, 0
+L_10acb8c:
+// 0x010acb8c: 0x10acb8c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_voice_enable_10ac54c()
+.method public static void roadmap_voice_enable_10acb94()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1496,13 +1496,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac54c:
-// 0x010ac54c: 0x10ac54c: jr    ra sll   zero, zero, 0
+L_10acb94:
+// 0x010acb94: 0x10acb94: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_trip_load_10ac56c()
+.method public static int32 roadmap_trip_load_10acbb4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1516,7 +1516,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac56c: 0x10ac56c: jr    ra addu  v0, zero, zero
+// 0x010acbb4: 0x10acbb4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1524,7 +1524,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_trip_save_10ac574()
+.method public static void roadmap_trip_save_10acbbc()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1535,12 +1535,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac574: 0x10ac574: jr    ra sll   zero, zero, 0
+// 0x010acbbc: 0x10acbbc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_trip_save_screenshot_10ac57c()
+.method public static void roadmap_trip_save_screenshot_10acbc4()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1551,13 +1551,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac57c:
-// 0x010ac57c: 0x10ac57c: jr    ra sll   zero, zero, 0
+L_10acbc4:
+// 0x010acbc4: 0x10acbc4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_download_show_space_10ac584()
+.method public static void roadmap_download_show_space_10acbcc()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1568,13 +1568,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac584:
-// 0x010ac584: 0x10ac584: jr    ra sll   zero, zero, 0
+L_10acbcc:
+// 0x010acbcc: 0x10acbcc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_download_delete_10ac58c()
+.method public static void roadmap_download_delete_10acbd4()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1585,13 +1585,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac58c:
-// 0x010ac58c: 0x10ac58c: jr    ra sll   zero, zero, 0
+L_10acbd4:
+// 0x010acbd4: 0x10acbd4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_download_subscribe_protocol_10ac594()
+.method public static void roadmap_download_subscribe_protocol_10acbdc()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1602,12 +1602,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac594: 0x10ac594: jr    ra sll   zero, zero, 0
+// 0x010acbdc: 0x10acbdc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_download_subscribe_when_done_10ac59c()
+.method public static void roadmap_download_subscribe_when_done_10acbe4()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1618,12 +1618,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac59c: 0x10ac59c: jr    ra sll   zero, zero, 0
+// 0x010acbe4: 0x10acbe4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_download_enabled_10ac5a4()
+.method public static int32 roadmap_download_enabled_10acbec()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1637,7 +1637,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5a4: 0x10ac5a4: jr    ra addu  v0, zero, zero
+// 0x010acbec: 0x10acbec: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1645,7 +1645,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_download_initialize_10ac5ac()
+.method public static void roadmap_download_initialize_10acbf4()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1656,12 +1656,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5ac: 0x10ac5ac: jr    ra sll   zero, zero, 0
+// 0x010acbf4: 0x10acbf4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_download_block_10ac5b4()
+.method public static void roadmap_download_block_10acbfc()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1672,12 +1672,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5b4: 0x10ac5b4: jr    ra sll   zero, zero, 0
+// 0x010acbfc: 0x10acbfc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_download_unblock_all_10ac5c4()
+.method public static void roadmap_download_unblock_all_10acc0c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1688,12 +1688,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5c4: 0x10ac5c4: jr    ra sll   zero, zero, 0
+// 0x010acc0c: 0x10acc0c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_download_blocked_10ac5cc()
+.method public static int32 roadmap_download_blocked_10acc14()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1707,7 +1707,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5cc: 0x10ac5cc: jr    ra addu  v0, zero, zero
+// 0x010acc14: 0x10acc14: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1715,7 +1715,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_copy_init_10ac5d4()
+.method public static void roadmap_copy_init_10acc1c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1726,12 +1726,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5d4: 0x10ac5d4: jr    ra sll   zero, zero, 0
+// 0x010acc1c: 0x10acc1c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_httpcopy_init_10ac5dc()
+.method public static void roadmap_httpcopy_init_10acc24()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1742,12 +1742,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5dc: 0x10ac5dc: jr    ra sll   zero, zero, 0
+// 0x010acc24: 0x10acc24: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_spawn_check_10ac5e4()
+.method public static void roadmap_spawn_check_10acc2c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1758,12 +1758,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5e4: 0x10ac5e4: jr    ra sll   zero, zero, 0
+// 0x010acc2c: 0x10acc2c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_spawn_initialize_10ac5ec()
+.method public static void roadmap_spawn_initialize_10acc34()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1774,12 +1774,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5ec: 0x10ac5ec: jr    ra sll   zero, zero, 0
+// 0x010acc34: 0x10acc34: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_spawn_10ac5f4()
+.method public static int32 roadmap_spawn_10acc3c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1793,7 +1793,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac5f4: 0x10ac5f4: jr    ra addu  v0, zero, zero
+// 0x010acc3c: 0x10acc3c: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1801,7 +1801,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_crossing_dialog_10ac634()
+.method public static void roadmap_crossing_dialog_10acc7c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1812,13 +1812,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac634:
-// 0x010ac634: 0x10ac634: jr    ra sll   zero, zero, 0
+L_10acc7c:
+// 0x010acc7c: 0x10acc7c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_coord_dialog_10ac63c()
+.method public static void roadmap_coord_dialog_10acc84()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1829,13 +1829,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac63c:
-// 0x010ac63c: 0x10ac63c: jr    ra sll   zero, zero, 0
+L_10acc84:
+// 0x010acc84: 0x10acc84: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void edit_markers_dialog_10ac644()
+.method public static void edit_markers_dialog_10acc8c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1846,13 +1846,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac644:
-// 0x010ac644: 0x10ac644: jr    ra sll   zero, zero, 0
+L_10acc8c:
+// 0x010acc8c: 0x10acc8c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void editor_notes_add_quick_10ac64c()
+.method public static void editor_notes_add_quick_10acc94()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1863,13 +1863,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac64c:
-// 0x010ac64c: 0x10ac64c: jr    ra sll   zero, zero, 0
+L_10acc94:
+// 0x010acc94: 0x10acc94: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void editor_notes_add_edit_10ac654()
+.method public static void editor_notes_add_edit_10acc9c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1880,13 +1880,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac654:
-// 0x010ac654: 0x10ac654: jr    ra sll   zero, zero, 0
+L_10acc9c:
+// 0x010acc9c: 0x10acc9c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void editor_notes_add_voice_10ac65c()
+.method public static void editor_notes_add_voice_10acca4()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1897,13 +1897,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ac65c:
-// 0x010ac65c: 0x10ac65c: jr    ra sll   zero, zero, 0
+L_10acca4:
+// 0x010acca4: 0x10acca4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_file_rename_10ac66c()
+.method public static int32 roadmap_file_rename_10accb4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1917,7 +1917,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac66c: 0x10ac66c: jr    ra addu  v0, zero, zero
+// 0x010accb4: 0x10accb4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1925,7 +1925,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_net_initialize_10ac674()
+.method public static void roadmap_net_initialize_10accbc()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1936,12 +1936,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac674: 0x10ac674: jr    ra sll   zero, zero, 0
+// 0x010accbc: 0x10accbc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_device_initialize_10ac67c()
+.method public static int32 roadmap_device_initialize_10accc4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1955,7 +1955,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac67c: 0x10ac67c: jr    ra addu  v0, zero, zero
+// 0x010accc4: 0x10accc4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1963,7 +1963,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_screen_draw_line_direction_10ac684()
+.method public static void roadmap_screen_draw_line_direction_10acccc()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1974,12 +1974,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac684: 0x10ac684: jr    ra sll   zero, zero, 0
+// 0x010acccc: 0x10acccc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 editor_is_enabled_10ac694()
+.method public static int32 editor_is_enabled_10accdc()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1996,25 +1996,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac694: 0x10ac694: lui   v0, 0x90000
+// 0x010accdc: 0x10accdc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010ac698: 0x10ac698: lw    v0, -32436(v0)
+// 0x010acce0: 0x10acce0: lw    v0, -31972(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8109
+	ldc.i4 -7993
 	add
 	ldelem.i4
 	stloc.0
-// 0x010ac69c: 0x10ac69c: jr    ra sll   zero, zero, 0
+// 0x010acce4: 0x10acce4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_main_set_10ac6b4(int32,int32,int32,int32,int32)
+.method public static int32 editor_main_set_10accfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -2049,68 +2049,68 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac6b4: 0x10ac6b4: addiu sp, sp, -32
+// 0x010accfc: 0x10accfc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010ac6b8: 0x10ac6b8: sw    ra, 28(sp)
-// 0x010ac6bc: 0x10ac6bc: beq   a0, zero, 0x10ac6dc lui   v0, 0x90000
+// 0x010acd00: 0x10acd00: sw    ra, 28(sp)
+// 0x010acd04: 0x10acd04: beq   a0, zero, 0x10acd24 lui   v0, 0x90000
 	ldloc.1
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10ac6dc
+	brfalse L_10acd24
 // --- basic block ---
-// 0x010ac6c4: 0x10ac6c4: lw    v0, -32436(v0)
+// 0x010acd0c: 0x10acd0c: lw    v0, -31972(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8109
+	ldc.i4 -7993
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac6c8: 0x10ac6c8: sll   zero, zero, 0
-// 0x010ac6cc: 0x10ac6cc: beq   v0, zero, 0x10ac6ec lui   v0, 0x90000
+// 0x010acd10: 0x10acd10: sll   zero, zero, 0
+// 0x010acd14: 0x10acd14: beq   v0, zero, 0x10acd34 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10ac6ec
+	brfalse L_10acd34
 // --- basic block ---
-// 0x010ac6d4: 0x10ac6d4: j	 0x10ac708 sll   zero, zero, 0
-	br L_10ac708
+// 0x010acd1c: 0x10acd1c: j	 0x10acd50 sll   zero, zero, 0
+	br L_10acd50
 // --- basic block ---
-L_10ac6dc:
-// 0x010ac6dc: 0x10ac6dc: lw    v0, -32436(v0)
+L_10acd24:
+// 0x010acd24: 0x10acd24: lw    v0, -31972(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8109
+	ldc.i4 -7993
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac6e0: 0x10ac6e0: sll   zero, zero, 0
-// 0x010ac6e4: 0x10ac6e4: beq   v0, zero, 0x10ac708 lui   v0, 0x90000
+// 0x010acd28: 0x10acd28: sll   zero, zero, 0
+// 0x010acd2c: 0x10acd2c: beq   v0, zero, 0x10acd50 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10ac708
+	brfalse L_10acd50
 // --- basic block ---
-L_10ac6ec:
-// 0x010ac6ec: 0x10ac6ec: bne   a0, zero, 0x10ac700 sw    a0, -32436(v0)
+L_10acd34:
+// 0x010acd34: 0x10acd34: bne   a0, zero, 0x10acd48 sw    a0, -31972(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8109
+	ldc.i4 -7993
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_10ac700
+	brtrue L_10acd48
 // --- basic block ---
-// 0x010ac6f4: 0x10ac6f4: jal   0x10b1788 sw    a0, 16(sp)
+// 0x010acd3c: 0x10acd3c: jal   0x10b1dd0 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2124,12 +2124,12 @@ L_10ac6ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_end_10b1788(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_end_10b1dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ac6fc: 0x10ac6fc: lw    a0, 16(sp)
+// 0x010acd44: 0x10acd44: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2138,22 +2138,22 @@ L_10ac6ec:
 	add
 	ldelem.i4
 	stloc.1
-L_10ac700:
-// 0x010ac700: 0x10ac700: jal   0x10bdd04 sll   zero, zero, 0
+L_10acd48:
+// 0x010acd48: 0x10acd48: jal   0x10be34c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_set_10bdd04(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_set_10be34c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10ac708:
-// 0x010ac708: 0x10ac708: lw    ra, 28(sp)
-// 0x010ac70c: 0x10ac70c: sll   zero, zero, 0
-// 0x010ac710: 0x10ac710: jr    ra addiu sp, sp, 32
+L_10acd50:
+// 0x010acd50: 0x10acd50: lw    ra, 28(sp)
+// 0x010acd54: 0x10acd54: sll   zero, zero, 0
+// 0x010acd58: 0x10acd58: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2165,7 +2165,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_main_shutdown_10ac718(int32,int32,int32,int32,int32)
+.method public static int32 editor_main_shutdown_10acd60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2200,10 +2200,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac718: 0x10ac718: lui   v0, 0x0
+// 0x010acd60: 0x10acd60: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010ac71c: 0x10ac71c: lw    a0, 1816(v0)
+// 0x010acd64: 0x10acd64: lw    a0, 1816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2212,26 +2212,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ac720: 0x10ac720: addiu sp, sp, -24
+// 0x010acd68: 0x10acd68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac724: 0x10ac724: sw    ra, 20(sp)
-// 0x010ac728: 0x10ac728: jal   0x10b74d4 sll   zero, zero, 0
+// 0x010acd6c: 0x10acd6c: sw    ra, 20(sp)
+// 0x010acd70: 0x10acd70: jal   0x10b7b1c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_close_10b74d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_close_10b7b1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ac730: 0x10ac730: lw    ra, 20(sp)
-// 0x010ac734: 0x10ac734: sll   zero, zero, 0
-// 0x010ac738: 0x10ac738: jr    ra addiu sp, sp, 24
+// 0x010acd78: 0x10acd78: lw    ra, 20(sp)
+// 0x010acd7c: 0x10acd7c: sll   zero, zero, 0
+// 0x010acd80: 0x10acd80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2243,7 +2243,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_main_initialize_10ac740(int32,int32,int32,int32,int32)
+.method public static int32 editor_main_initialize_10acd88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -2278,93 +2278,93 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac740: 0x10ac740: addiu sp, sp, -24
+// 0x010acd88: 0x10acd88: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac744: 0x10ac744: sw    ra, 20(sp)
-// 0x010ac748: 0x10ac748: jal   0x10b9840 sll   zero, zero, 0
+// 0x010acd8c: 0x10acd8c: sw    ra, 20(sp)
+// 0x010acd90: 0x10acd90: jal   0x10b9e88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_upload_initialize_10b9840(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_upload_initialize_10b9e88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac750: 0x10ac750: jal   0x10bd46c sll   zero, zero, 0
+// 0x010acd98: 0x10acd98: jal   0x10bdab4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_gps_data_initialize_10bd46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_gps_data_initialize_10bdab4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac758: 0x10ac758: jal   0x10bd8e4 sll   zero, zero, 0
+// 0x010acda0: 0x10acda0: jal   0x10bdf2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_initialize_10bd8e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_initialize_10bdf2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac760: 0x10ac760: jal   0x10b0e10 sll   zero, zero, 0
+// 0x010acda8: 0x10acda8: jal   0x10b1458 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_initialize_10b0e10(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_initialize_10b1458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac768: 0x10ac768: jal   0x10ba9c0 sll   zero, zero, 0
+// 0x010acdb0: 0x10acdb0: jal   0x10bb008 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::update_range_initialize_10ba9c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::update_range_initialize_10bb008(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac770: 0x10ac770: jal   0x10b9c10 sll   zero, zero, 0
+// 0x010acdb8: 0x10acdb8: jal   0x10ba258 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::add_alert_initialize_10b9c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::add_alert_initialize_10ba258(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac778: 0x10ac778: jal   0x10b8308 sll   zero, zero, 0
+// 0x010acdc0: 0x10acdc0: jal   0x10b8950 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl137::editor_plugin_register_10b8308(int32,int32,int32,int32,int32)
+	call int32 Cibyl137::editor_plugin_register_10b8950(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac780: 0x10ac780: lui   v1, 0x0
+// 0x010acdc8: 0x10acdc8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010ac784: 0x10ac784: jal   0x1010a4c sw    v0, 18812(v1)
+// 0x010acdcc: 0x10acdcc: jal   0x1010a5c sw    v0, 18812(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -2378,25 +2378,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac78c: 0x10ac78c: jal   0x10b80c0 sll   zero, zero, 0
+// 0x010acdd4: 0x10acdd4: jal   0x10b8708 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl137::editor_bar_initialize_10b80c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl137::editor_bar_initialize_10b8708(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ac794: 0x10ac794: lw    ra, 20(sp)
-// 0x010ac798: 0x10ac798: sll   zero, zero, 0
-// 0x010ac79c: 0x10ac79c: jr    ra addiu sp, sp, 24
+// 0x010acddc: 0x10acddc: lw    ra, 20(sp)
+// 0x010acde0: 0x10acde0: sll   zero, zero, 0
+// 0x010acde4: 0x10acde4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2408,7 +2408,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_main_check_map_10ac7a4(int32,int32,int32,int32,int32)
+.method public static int32 editor_main_check_map_10acdec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2446,15 +2446,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac7a4: 0x10ac7a4: addiu sp, sp, -24
+// 0x010acdec: 0x10acdec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac7a8: 0x10ac7a8: lui   v0, 0x0
+// 0x010acdf0: 0x10acdf0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010ac7ac: 0x10ac7ac: sw    s0, 16(sp)
+// 0x010acdf4: 0x10acdf4: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2463,7 +2463,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ac7b0: 0x10ac7b0: lw    s0, 1816(v0)
+// 0x010acdf8: 0x10acdf8: lw    s0, 1816(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2472,22 +2472,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac7b4: 0x10ac7b4: sll   zero, zero, 0
-// 0x010ac7b8: 0x10ac7b8: bgtz  s0, 0x10ac7c8 sw    ra, 20(sp)
+// 0x010acdfc: 0x10acdfc: sll   zero, zero, 0
+// 0x010ace00: 0x10ace00: bgtz  s0, 0x10ace10 sw    ra, 20(sp)
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_10ac7c8
+	bgt L_10ace10
 // --- basic block ---
-// 0x010ac7c0: 0x10ac7c0: lui   s0, 0x10000
+// 0x010ace08: 0x10ace08: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010ac7c4: 0x10ac7c4: ori   s0, s0, 11465
+// 0x010ace0c: 0x10ace0c: ori   s0, s0, 11465
 	ldloc 5
 	ldc.i4 11465
 	or
 	stloc 5
-L_10ac7c8:
-// 0x010ac7c8: 0x10ac7c8: jal   0x1013c44 addu  a0, s0, zero
+L_10ace10:
+// 0x010ace10: 0x10ace10: jal   0x1013c54 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2495,28 +2495,28 @@ L_10ac7c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010ac7d0: 0x10ac7d0: beq   v0, zero, 0x10ac7e8 lui   a0, 0x20000
+// 0x010ace18: 0x10ace18: beq   v0, zero, 0x10ace30 lui   a0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.1
-	brfalse L_10ac7e8
+	brfalse L_10ace30
 // --- basic block ---
-// 0x010ac7d8: 0x10ac7d8: lui   a1, 0x20000
+// 0x010ace20: 0x10ace20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ac7dc: 0x10ac7dc: addiu a0, a0, 16676
+// 0x010ace24: 0x10ace24: addiu a0, a0, 17136
 	ldloc.1
-	ldc.i4 16676
+	ldc.i4 17136
 	add
 	stloc.1
-// 0x010ac7e0: 0x10ac7e0: jal   0x104c148 addiu a1, a1, 16684
+// 0x010ace28: 0x10ace28: jal   0x104c158 addiu a1, a1, 17144
 	ldloc.2
-	ldc.i4 16684
+	ldc.i4 17144
 	add
 	stloc.2
 	ldloc.0
@@ -2524,13 +2524,13 @@ L_10ac7c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10ac7e8:
-// 0x010ac7e8: 0x10ac7e8: jal   0x10b79b4 addu  a0, s0, zero
+L_10ace30:
+// 0x010ace30: 0x10ace30: jal   0x10b7ffc addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2538,13 +2538,13 @@ L_10ac7e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010ac7f0: 0x10ac7f0: lw    ra, 20(sp)
-// 0x010ac7f4: 0x10ac7f4: lw    s0, 16(sp)
+// 0x010ace38: 0x10ace38: lw    ra, 20(sp)
+// 0x010ace3c: 0x10ace3c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2553,7 +2553,7 @@ L_10ac7e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac7f8: 0x10ac7f8: jr    ra addiu sp, sp, 24
+// 0x010ace40: 0x10ace40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2565,7 +2565,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_points_get_total_points_10ac820()
+.method public static int32 editor_points_get_total_points_10ace68()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2585,31 +2585,31 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac820: 0x10ac820: lui   v0, 0x90000
+// 0x010ace68: 0x10ace68: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010ac824: 0x10ac824: lw    v1, -32428(v0)
+// 0x010ace6c: 0x10ace6c: lw    v1, -31964(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8107
+	ldc.i4 -7991
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ac828: 0x10ac828: lui   v0, 0x90000
+// 0x010ace70: 0x10ace70: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010ac82c: 0x10ac82c: lw    v0, -32424(v0)
+// 0x010ace74: 0x10ace74: lw    v0, -31960(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8106
+	ldc.i4 -7990
 	add
 	ldelem.i4
 	stloc.0
-// 0x010ac830: 0x10ac830: jr    ra addu  v0, v1, v0
+// 0x010ace78: 0x10ace78: jr    ra addu  v0, v1, v0
 	ldloc.1
 	ldloc.0
 	add
@@ -2621,7 +2621,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_points_reset_munching_10ac838()
+.method public static int32 editor_points_reset_munching_10ace80()
 {
 .maxstack 5
 .locals init (int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -2641,24 +2641,24 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac838: 0x10ac838: lui   v1, 0x90000
+// 0x010ace80: 0x10ace80: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010ac83c: 0x10ac83c: lw    v0, -32420(v1)
+// 0x010ace84: 0x10ace84: lw    v0, -31956(v1)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8105
+	ldc.i4 -7989
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ac840: 0x10ac840: jr    ra sw    zero, -32420(v1)
+// 0x010ace88: 0x10ace88: jr    ra sw    zero, -31956(v1)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8105
+	ldc.i4 -7989
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2669,7 +2669,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 editor_points_display_new_points_timed_10ac874(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_display_new_points_timed_10acebc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s2,int32 s1,int32 ra,int32 lo)
@@ -2716,15 +2716,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac874: 0x10ac874: addiu sp, sp, -32
+// 0x010acebc: 0x10acebc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010ac878: 0x10ac878: addiu v0, zero, -1
+// 0x010acec0: 0x10acec0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010ac87c: 0x10ac87c: sw    s1, 20(sp)
+// 0x010acec4: 0x10acec4: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2733,7 +2733,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ac880: 0x10ac880: sw    s0, 16(sp)
+// 0x010acec8: 0x10acec8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2742,8 +2742,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ac884: 0x10ac884: sw    ra, 28(sp)
-// 0x010ac888: 0x10ac888: sw    s2, 24(sp)
+// 0x010acecc: 0x10acecc: sw    ra, 28(sp)
+// 0x010aced0: 0x10aced0: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2752,28 +2752,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ac88c: 0x10ac88c: addu  s0, a1, zero
+// 0x010aced4: 0x10aced4: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010ac890: 0x10ac890: beq   a0, v0, 0x10ac8ac addu  s1, a2, zero
+// 0x010aced8: 0x10aced8: beq   a0, v0, 0x10acef4 addu  s1, a2, zero
 	ldloc.1
 	ldloc 5
 	ldloc.3
 	stloc 10
-	beq  L_10ac8ac
+	beq  L_10acef4
 // --- basic block ---
-// 0x010ac898: 0x10ac898: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x010acee0: 0x10acee0: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x010ac89c: 0x10ac89c: addu  a2, a0, zero
+// 0x010acee4: 0x10acee4: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010ac8a0: 0x10ac8a0: addiu a1, a1, -13884
+// 0x010acee8: 0x10acee8: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x010ac8a4: 0x10ac8a4: jal   0x101aec4 addiu a0, zero, 88
+// 0x010aceec: 0x10aceec: jal   0x101aed4 addiu a0, zero, 88
 	ldc.i4.s 88
 	stloc.1
 	ldloc.0
@@ -2781,34 +2781,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10ac8ac:
-// 0x010ac8ac: 0x10ac8ac: lui   s2, 0x90000
+L_10acef4:
+// 0x010acef4: 0x10acef4: lui   s2, 0x90000
 	ldc.i4 589824
 	stloc 9
-// 0x010ac8b0: 0x10ac8b0: lw    v0, -32432(s2)
+// 0x010acef8: 0x10acef8: lw    v0, -31968(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8108
+	ldc.i4 -7992
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ac8b4: 0x10ac8b4: sll   zero, zero, 0
-// 0x010ac8b8: 0x10ac8b8: beq   v0, zero, 0x10ac8cc lui   a0, 0x10b0000
+// 0x010acefc: 0x10acefc: sll   zero, zero, 0
+// 0x010acf00: 0x10acf00: beq   v0, zero, 0x10acf14 lui   a0, 0x10b0000
 	ldloc 5
 	ldc.i4 17498112
 	stloc.1
-	brfalse L_10ac8cc
+	brfalse L_10acf14
 // --- basic block ---
-// 0x010ac8c0: 0x10ac8c0: jal   0x104fd00 addiu a0, a0, -14024
+// 0x010acf08: 0x10acf08: jal   0x104fd10 addiu a0, a0, -12416
 	ldloc.1
-	ldc.i4 -14024
+	ldc.i4 -12416
 	add
 	stloc.1
 	ldloc.0
@@ -2816,61 +2816,61 @@ L_10ac8ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ac8c8: 0x10ac8c8: sw    zero, -32432(s2)
+// 0x010acf10: 0x10acf10: sw    zero, -31968(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8108
+	ldc.i4 -7992
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10ac8cc:
-// 0x010ac8cc: 0x10ac8cc: jal   0x101641c addu  a0, s1, zero
+L_10acf14:
+// 0x010acf14: 0x10acf14: jal   0x101642c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl16::roadmap_ticker_set_last_event_101641c(int32)
+	call int32 Cibyl16::roadmap_ticker_set_last_event_101642c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ac8d4: 0x10ac8d4: jal   0x1021900 sll   zero, zero, 0
+// 0x010acf1c: 0x10acf1c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ac8dc: 0x10ac8dc: addiu a0, zero, 1000
+// 0x010acf24: 0x10acf24: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x010ac8e0: 0x10ac8e0: mult  s0, a0
+// 0x010acf28: 0x10acf28: mult  s0, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 12
-// 0x010ac8e4: 0x10ac8e4: lui   s0, 0x10b0000
+// 0x010acf2c: 0x10acf2c: lui   s0, 0x10b0000
 	ldc.i4 17498112
 	stloc 7
-// 0x010ac8e8: 0x10ac8e8: addiu a1, s0, -14024
+// 0x010acf30: 0x10acf30: addiu a1, s0, -12416
 	ldloc 7
-	ldc.i4 -14024
+	ldc.i4 -12416
 	add
 	stloc.2
-// 0x010ac8ec: 0x10ac8ec: mflo  lo
+// 0x010acf34: 0x10acf34: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x010ac8f0: 0x10ac8f0: jal   0x104fe98 addiu s0, s0, -14024
+// 0x010acf38: 0x10acf38: jal   0x104fea8 addiu s0, s0, -12416
 	ldloc 7
-	ldc.i4 -14024
+	ldc.i4 -12416
 	add
 	stloc 7
 	ldloc.0
@@ -2878,25 +2878,25 @@ L_10ac8cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ac8f8: 0x10ac8f8: lw    ra, 28(sp)
-// 0x010ac8fc: 0x10ac8fc: lui   v0, 0x90000
+// 0x010acf40: 0x10acf40: lw    ra, 28(sp)
+// 0x010acf44: 0x10acf44: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ac900: 0x10ac900: sw    s0, -32432(v0)
+// 0x010acf48: 0x10acf48: sw    s0, -31968(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8108
+	ldc.i4 -7992
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ac904: 0x10ac904: lw    s2, 24(sp)
+// 0x010acf4c: 0x10acf4c: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2905,7 +2905,7 @@ L_10ac8cc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ac908: 0x10ac908: lw    s1, 20(sp)
+// 0x010acf50: 0x10acf50: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2914,7 +2914,7 @@ L_10ac8cc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ac90c: 0x10ac90c: lw    s0, 16(sp)
+// 0x010acf54: 0x10acf54: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2923,7 +2923,7 @@ L_10ac8cc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ac910: 0x10ac910: jr    ra addiu sp, sp, 32
+// 0x010acf58: 0x10acf58: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2935,7 +2935,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_points_hide_10ac918(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_hide_10acf60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2970,13 +2970,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac918: 0x10ac918: addiu sp, sp, -24
+// 0x010acf60: 0x10acf60: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac91c: 0x10ac91c: sw    ra, 20(sp)
-// 0x010ac920: 0x10ac920: jal   0x101ae54 addiu a0, zero, 42
+// 0x010acf64: 0x10acf64: sw    ra, 20(sp)
+// 0x010acf68: 0x10acf68: jal   0x101ae64 addiu a0, zero, 42
 	ldc.i4.s 42
 	stloc.1
 	ldloc.0
@@ -2984,14 +2984,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010ac928: 0x10ac928: lw    ra, 20(sp)
-// 0x010ac92c: 0x10ac92c: sll   zero, zero, 0
-// 0x010ac930: 0x10ac930: jr    ra addiu sp, sp, 24
+// 0x010acf70: 0x10acf70: lw    ra, 20(sp)
+// 0x010acf74: 0x10acf74: sll   zero, zero, 0
+// 0x010acf78: 0x10acf78: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3003,7 +3003,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 timer_cb_10ac938(int32,int32,int32,int32,int32)
+.method public static int32 timer_cb_10acf80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3038,13 +3038,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac938: 0x10ac938: addiu sp, sp, -24
+// 0x010acf80: 0x10acf80: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac93c: 0x10ac93c: sw    ra, 20(sp)
-// 0x010ac940: 0x10ac940: jal   0x101ae54 addiu a0, zero, 88
+// 0x010acf84: 0x10acf84: sw    ra, 20(sp)
+// 0x010acf88: 0x10acf88: jal   0x101ae64 addiu a0, zero, 88
 	ldc.i4.s 88
 	stloc.1
 	ldloc.0
@@ -3052,17 +3052,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac948: 0x10ac948: lui   a0, 0x10b0000
+// 0x010acf90: 0x10acf90: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010ac94c: 0x10ac94c: jal   0x104fd00 addiu a0, a0, -14024
+// 0x010acf94: 0x10acf94: jal   0x104fd10 addiu a0, a0, -12416
 	ldloc.1
-	ldc.i4 -14024
+	ldc.i4 -12416
 	add
 	stloc.1
 	ldloc.0
@@ -3070,20 +3070,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac954: 0x10ac954: lui   v0, 0x90000
+// 0x010acf9c: 0x10acf9c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ac958: 0x10ac958: jal   0x102146c sw    zero, -32432(v0)
+// 0x010acfa0: 0x10acfa0: jal   0x102147c sw    zero, -31968(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8108
+	ldc.i4 -7992
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3092,37 +3092,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ac960: 0x10ac960: bne   v0, zero, 0x10ac970 sll   zero, zero, 0
+// 0x010acfa8: 0x10acfa8: bne   v0, zero, 0x10acfb8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ac970
+	brtrue L_10acfb8
 // --- basic block ---
-// 0x010ac968: 0x10ac968: jal   0x1021900 sll   zero, zero, 0
+// 0x010acfb0: 0x10acfb0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10ac970:
-// 0x010ac970: 0x10ac970: jal   0x101641c addu  a0, zero, zero
+L_10acfb8:
+// 0x010acfb8: 0x10acfb8: jal   0x101642c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl16::roadmap_ticker_set_last_event_101641c(int32)
+	call int32 Cibyl16::roadmap_ticker_set_last_event_101642c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ac978: 0x10ac978: lw    ra, 20(sp)
-// 0x010ac97c: 0x10ac97c: sll   zero, zero, 0
-// 0x010ac980: 0x10ac980: jr    ra addiu sp, sp, 24
+// 0x010acfc0: 0x10acfc0: lw    ra, 20(sp)
+// 0x010acfc4: 0x10acfc4: sll   zero, zero, 0
+// 0x010acfc8: 0x10acfc8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3134,7 +3134,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_points_display_10ac988(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_display_10acfd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 ra,int32 v1,int32 lo)
@@ -3175,12 +3175,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac988: 0x10ac988: addiu sp, sp, -24
+// 0x010acfd0: 0x10acfd0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac98c: 0x10ac98c: sw    s0, 16(sp)
+// 0x010acfd4: 0x10acfd4: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3189,14 +3189,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010ac990: 0x10ac990: addu  s0, a0, zero
+// 0x010acfd8: 0x10acfd8: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010ac994: 0x10ac994: lui   a0, 0x0
+// 0x010acfdc: 0x10acfdc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ac998: 0x10ac998: sw    ra, 20(sp)
-// 0x010ac99c: 0x10ac99c: jal   0x100e788 addiu a0, a0, 18884
+// 0x010acfe0: 0x10acfe0: sw    ra, 20(sp)
+// 0x010acfe4: 0x10acfe4: jal   0x100e798 addiu a0, a0, 18884
 	ldloc.1
 	ldc.i4 18884
 	add
@@ -3206,40 +3206,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010ac9a4: 0x10ac9a4: bne   v0, zero, 0x10ac9b0 sll   zero, zero, 0
+// 0x010acfec: 0x10acfec: bne   v0, zero, 0x10acff8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ac9b0
+	brtrue L_10acff8
 // --- basic block ---
-// 0x010ac9ac: 0x10ac9ac: addiu v0, zero, 10
+// 0x010acff4: 0x10acff4: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-L_10ac9b0:
-// 0x010ac9b0: 0x10ac9b0: div   s0, v0
+L_10acff8:
+// 0x010acff8: 0x10acff8: div   s0, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 10
-// 0x010ac9b4: 0x10ac9b4: mflo  lo
+// 0x010acffc: 0x10acffc: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x010ac9b8: 0x10ac9b8: blez  a2, 0x10ac9cc lui   a1, 0x20000
+// 0x010ad000: 0x10ad000: blez  a2, 0x10ad014 lui   a1, 0x10000
 	ldloc.3
-	ldc.i4 131072
+	ldc.i4 65536
 	stloc.2
 	ldc.i4.s 0
-	ble L_10ac9cc
+	ble L_10ad014
 // --- basic block ---
-// 0x010ac9c0: 0x10ac9c0: addiu a1, a1, -13884
+// 0x010ad008: 0x10ad008: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x010ac9c4: 0x10ac9c4: jal   0x101aec4 addiu a0, zero, 42
+// 0x010ad00c: 0x10ad00c: jal   0x101aed4 addiu a0, zero, 42
 	ldc.i4.s 42
 	stloc.1
 	ldloc.0
@@ -3247,14 +3247,14 @@ L_10ac9b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_10ac9cc:
-// 0x010ac9cc: 0x10ac9cc: lw    ra, 20(sp)
-// 0x010ac9d0: 0x10ac9d0: lw    s0, 16(sp)
+L_10ad014:
+// 0x010ad014: 0x10ad014: lw    ra, 20(sp)
+// 0x010ad018: 0x10ad018: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3263,7 +3263,7 @@ L_10ac9cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ac9d4: 0x10ac9d4: jr    ra addiu sp, sp, 24
+// 0x010ad01c: 0x10ad01c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3275,7 +3275,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_last_points_update_time_10ac9dc(int32,int32,int32,int32,int32)
+.method public static int32 set_last_points_update_time_10ad024(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3310,29 +3310,29 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ac9dc: 0x10ac9dc: addiu sp, sp, -24
+// 0x010ad024: 0x10ad024: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ac9e0: 0x10ac9e0: sw    ra, 20(sp)
-// 0x010ac9e4: 0x10ac9e4: jal   0x1030d28 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_get_received_time_1030d28()
+// 0x010ad028: 0x10ad028: sw    ra, 20(sp)
+// 0x010ad02c: 0x10ad02c: jal   0x1030d38 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_get_received_time_1030d38()
 	stloc 5
 // --- basic block ---
-// 0x010ac9ec: 0x10ac9ec: beq   v0, zero, 0x10aca0c sll   zero, zero, 0
+// 0x010ad034: 0x10ad034: beq   v0, zero, 0x10ad054 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10aca0c
+	brfalse L_10ad054
 // --- basic block ---
-// 0x010ac9f4: 0x10ac9f4: lui   a0, 0x0
+// 0x010ad03c: 0x10ad03c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ac9f8: 0x10ac9f8: addiu a0, a0, 18868
+// 0x010ad040: 0x10ad040: addiu a0, a0, 18868
 	ldloc.1
 	ldc.i4 18868
 	add
 	stloc.1
-// 0x010ac9fc: 0x10ac9fc: jal   0x100e610 addu  a1, v0, zero
+// 0x010ad044: 0x10ad044: jal   0x100e620 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3340,12 +3340,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010aca04: 0x10aca04: jal   0x100ea50 addu  a0, zero, zero
+// 0x010ad04c: 0x10ad04c: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3353,15 +3353,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10aca0c:
-// 0x010aca0c: 0x10aca0c: lw    ra, 20(sp)
-// 0x010aca10: 0x10aca10: sll   zero, zero, 0
-// 0x010aca14: 0x10aca14: jr    ra addiu sp, sp, 24
+L_10ad054:
+// 0x010ad054: 0x10ad054: lw    ra, 20(sp)
+// 0x010ad058: 0x10ad058: sll   zero, zero, 0
+// 0x010ad05c: 0x10ad05c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3373,7 +3373,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_points_set_saved_new_points_10aca1c(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_set_saved_new_points_10ad064(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -3408,13 +3408,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aca1c: 0x10aca1c: addiu sp, sp, -32
+// 0x010ad064: 0x10ad064: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010aca20: 0x10aca20: sw    ra, 28(sp)
-// 0x010aca24: 0x10aca24: jal   0x10ac9dc sw    a0, 16(sp)
+// 0x010ad068: 0x10ad068: sw    ra, 28(sp)
+// 0x010ad06c: 0x10ad06c: jal   0x10ad024 sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3428,12 +3428,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::set_last_points_update_time_10ac9dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::set_last_points_update_time_10ad024(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aca2c: 0x10aca2c: lw    a1, 16(sp)
+// 0x010ad074: 0x10ad074: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3442,10 +3442,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010aca30: 0x10aca30: lui   a0, 0x0
+// 0x010ad078: 0x10ad078: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aca34: 0x10aca34: jal   0x100e610 addiu a0, a0, 18852
+// 0x010ad07c: 0x10ad07c: jal   0x100e620 addiu a0, a0, 18852
 	ldloc.1
 	ldc.i4 18852
 	add
@@ -3455,12 +3455,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aca3c: 0x10aca3c: jal   0x100ea50 addu  a0, zero, zero
+// 0x010ad084: 0x10ad084: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3468,14 +3468,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010aca44: 0x10aca44: lw    ra, 28(sp)
-// 0x010aca48: 0x10aca48: sll   zero, zero, 0
-// 0x010aca4c: 0x10aca4c: jr    ra addiu sp, sp, 32
+// 0x010ad08c: 0x10ad08c: lw    ra, 28(sp)
+// 0x010ad090: 0x10ad090: sll   zero, zero, 0
+// 0x010ad094: 0x10ad094: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3487,7 +3487,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_points_add_10aca54(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_add_10ad09c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -3528,12 +3528,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aca54: 0x10aca54: addiu sp, sp, -24
+// 0x010ad09c: 0x10ad09c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010aca58: 0x10aca58: sw    s0, 16(sp)
+// 0x010ad0a0: 0x10ad0a0: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3542,14 +3542,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010aca5c: 0x10aca5c: addu  s0, a0, zero
+// 0x010ad0a4: 0x10ad0a4: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010aca60: 0x10aca60: lui   a0, 0x0
+// 0x010ad0a8: 0x10ad0a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010aca64: 0x10aca64: sw    ra, 20(sp)
-// 0x010aca68: 0x10aca68: jal   0x100e788 addiu a0, a0, 18884
+// 0x010ad0ac: 0x10ad0ac: sw    ra, 20(sp)
+// 0x010ad0b0: 0x10ad0b0: jal   0x100e798 addiu a0, a0, 18884
 	ldloc.1
 	ldc.i4 18884
 	add
@@ -3559,63 +3559,63 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aca70: 0x10aca70: bne   v0, zero, 0x10aca7c sll   zero, zero, 0
+// 0x010ad0b8: 0x10ad0b8: bne   v0, zero, 0x10ad0c4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10aca7c
+	brtrue L_10ad0c4
 // --- basic block ---
-// 0x010aca78: 0x10aca78: addiu v0, zero, 10
+// 0x010ad0c0: 0x10ad0c0: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-L_10aca7c:
-// 0x010aca7c: 0x10aca7c: bltz  s0, 0x10acac0 sll   zero, zero, 0
+L_10ad0c4:
+// 0x010ad0c4: 0x10ad0c4: bltz  s0, 0x10ad108 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	blt L_10acac0
+	blt L_10ad108
 // --- basic block ---
-// 0x010aca84: 0x10aca84: div   s0, v0
+// 0x010ad0cc: 0x10ad0cc: div   s0, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 10
-// 0x010aca88: 0x10aca88: mflo  lo
+// 0x010ad0d0: 0x10ad0d0: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x010aca8c: 0x10aca8c: blez  s0, 0x10acac0 lui   v0, 0x90000
+// 0x010ad0d4: 0x10ad0d4: blez  s0, 0x10ad108 lui   v0, 0x90000
 	ldloc 6
 	ldc.i4 589824
 	stloc 5
 	ldc.i4.s 0
-	ble L_10acac0
+	ble L_10ad108
 // --- basic block ---
-// 0x010aca94: 0x10aca94: lw    v1, -32428(v0)
+// 0x010ad0dc: 0x10ad0dc: lw    v1, -31964(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8107
+	ldc.i4 -7991
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aca98: 0x10aca98: sll   zero, zero, 0
-// 0x010aca9c: 0x10aca9c: addu  v1, s0, v1
+// 0x010ad0e0: 0x10ad0e0: sll   zero, zero, 0
+// 0x010ad0e4: 0x10ad0e4: addu  v1, s0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x010acaa0: 0x10acaa0: addu  a0, v1, zero
+// 0x010ad0e8: 0x10ad0e8: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x010acaa4: 0x10acaa4: jal   0x10aca1c sw    v1, -32428(v0)
+// 0x010ad0ec: 0x10ad0ec: jal   0x10ad064 sw    v1, -31964(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8107
+	ldc.i4 -7991
 	add
 	ldloc 7
 	stelem.i4
@@ -3624,41 +3624,41 @@ L_10aca7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_set_saved_new_points_10aca1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_set_saved_new_points_10ad064(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acaac: 0x10acaac: lui   v0, 0x90000
+// 0x010ad0f4: 0x10ad0f4: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010acab0: 0x10acab0: lw    v1, -32420(v0)
+// 0x010ad0f8: 0x10ad0f8: lw    v1, -31956(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8105
+	ldc.i4 -7989
 	add
 	ldelem.i4
 	stloc 7
-// 0x010acab4: 0x10acab4: sll   zero, zero, 0
-// 0x010acab8: 0x10acab8: addu  s0, s0, v1
+// 0x010ad0fc: 0x10ad0fc: sll   zero, zero, 0
+// 0x010ad100: 0x10ad100: addu  s0, s0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x010acabc: 0x10acabc: sw    s0, -32420(v0)
+// 0x010ad104: 0x10ad104: sw    s0, -31956(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8105
+	ldc.i4 -7989
 	add
 	ldloc 6
 	stelem.i4
-L_10acac0:
-// 0x010acac0: 0x10acac0: lw    ra, 20(sp)
-// 0x010acac4: 0x10acac4: lw    s0, 16(sp)
+L_10ad108:
+// 0x010ad108: 0x10ad108: lw    ra, 20(sp)
+// 0x010ad10c: 0x10ad10c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3667,7 +3667,7 @@ L_10acac0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010acac8: 0x10acac8: jr    ra addiu sp, sp, 24
+// 0x010ad110: 0x10ad110: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3679,7 +3679,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -3714,38 +3714,38 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010acad0: 0x10acad0: lui   v0, 0x90000
+// 0x010ad118: 0x10ad118: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 6
-// 0x010acad4: 0x10acad4: lw    v1, -32428(v0)
+// 0x010ad11c: 0x10ad11c: lw    v1, -31964(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8107
+	ldc.i4 -7991
 	add
 	ldelem.i4
 	stloc 5
-// 0x010acad8: 0x10acad8: addiu sp, sp, -24
+// 0x010ad120: 0x10ad120: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010acadc: 0x10acadc: addu  v1, a0, v1
+// 0x010ad124: 0x10ad124: addu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x010acae0: 0x10acae0: addu  a0, v1, zero
+// 0x010ad128: 0x10ad128: addu  a0, v1, zero
 	ldloc 5
 	stloc.1
-// 0x010acae4: 0x10acae4: sw    ra, 20(sp)
-// 0x010acae8: 0x10acae8: jal   0x10aca1c sw    v1, -32428(v0)
+// 0x010ad12c: 0x10ad12c: sw    ra, 20(sp)
+// 0x010ad130: 0x10ad130: jal   0x10ad064 sw    v1, -31964(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8107
+	ldc.i4 -7991
 	add
 	ldloc 5
 	stelem.i4
@@ -3754,14 +3754,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_set_saved_new_points_10aca1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_set_saved_new_points_10ad064(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010acaf0: 0x10acaf0: lw    ra, 20(sp)
-// 0x010acaf4: 0x10acaf4: sll   zero, zero, 0
-// 0x010acaf8: 0x10acaf8: jr    ra addiu sp, sp, 24
+// 0x010ad138: 0x10ad138: lw    ra, 20(sp)
+// 0x010ad13c: 0x10ad13c: sll   zero, zero, 0
+// 0x010ad140: 0x10ad140: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3773,7 +3773,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_points_set_old_points_10acb00(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_set_old_points_10ad148(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -3820,12 +3820,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010acb00: 0x10acb00: addiu sp, sp, -48
+// 0x010ad148: 0x10ad148: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010acb04: 0x10acb04: sw    s2, 36(sp)
+// 0x010ad14c: 0x10ad14c: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3834,10 +3834,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010acb08: 0x10acb08: lui   s2, 0x0
+// 0x010ad150: 0x10ad150: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010acb0c: 0x10acb0c: sw    s1, 32(sp)
+// 0x010ad154: 0x10ad154: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3846,15 +3846,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010acb10: 0x10acb10: addu  s1, a0, zero
+// 0x010ad158: 0x10ad158: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010acb14: 0x10acb14: addiu a0, s2, 18820
+// 0x010ad15c: 0x10ad15c: addiu a0, s2, 18820
 	ldloc 10
 	ldc.i4 18820
 	add
 	stloc.1
-// 0x010acb18: 0x10acb18: sw    s0, 28(sp)
+// 0x010ad160: 0x10ad160: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3863,8 +3863,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010acb1c: 0x10acb1c: sw    ra, 44(sp)
-// 0x010acb20: 0x10acb20: sw    s3, 40(sp)
+// 0x010ad164: 0x10ad164: sw    ra, 44(sp)
+// 0x010ad168: 0x10ad168: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3873,7 +3873,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010acb24: 0x10acb24: jal   0x100e788 addu  s0, a1, zero
+// 0x010ad16c: 0x10ad16c: jal   0x100e798 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -3881,19 +3881,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb2c: 0x10acb2c: beq   v0, s1, 0x10acbc0 lui   s3, 0x0
+// 0x010ad174: 0x10ad174: beq   v0, s1, 0x10ad208 lui   s3, 0x0
 	ldloc 5
 	ldloc 9
 	ldc.i4.s 0
 	stloc 11
-	beq  L_10acbc0
+	beq  L_10ad208
 // --- basic block ---
-// 0x010acb34: 0x10acb34: jal   0x100e788 addiu a0, s3, 18868
+// 0x010ad17c: 0x10ad17c: jal   0x100e798 addiu a0, s3, 18868
 	ldloc 11
 	ldc.i4 18868
 	add
@@ -3903,26 +3903,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb3c: 0x10acb3c: slt   v0, v0, s0
+// 0x010ad184: 0x10ad184: slt   v0, v0, s0
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x010acb40: 0x10acb40: beq   v0, zero, 0x10acb94 lui   a0, 0x0
+// 0x010ad188: 0x10ad188: beq   v0, zero, 0x10ad1dc lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10acb94
+	brfalse L_10ad1dc
 // --- basic block ---
-// 0x010acb48: 0x10acb48: addu  a1, s0, zero
+// 0x010ad190: 0x10ad190: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010acb4c: 0x10acb4c: jal   0x100e610 addiu a0, a0, 18836
+// 0x010ad194: 0x10ad194: jal   0x100e620 addiu a0, a0, 18836
 	ldloc.1
 	ldc.i4 18836
 	add
@@ -3932,12 +3932,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb54: 0x10acb54: jal   0x100ea50 addu  a0, zero, zero
+// 0x010ad19c: 0x10ad19c: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3945,12 +3945,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb5c: 0x10acb5c: jal   0x10aca1c addu  a0, zero, zero
+// 0x010ad1a4: 0x10ad1a4: jal   0x10ad064 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3958,28 +3958,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_set_saved_new_points_10aca1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_set_saved_new_points_10ad064(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb64: 0x10acb64: jal   0x10ac9dc sll   zero, zero, 0
+// 0x010ad1ac: 0x10ad1ac: jal   0x10ad024 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::set_last_points_update_time_10ac9dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::set_last_points_update_time_10ad024(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb6c: 0x10acb6c: addiu a0, s2, 18820
+// 0x010ad1b4: 0x10ad1b4: addiu a0, s2, 18820
 	ldloc 10
 	ldc.i4 18820
 	add
 	stloc.1
-// 0x010acb70: 0x10acb70: jal   0x100e610 addu  a1, s1, zero
+// 0x010ad1b8: 0x10ad1b8: jal   0x100e620 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -3987,12 +3987,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb78: 0x10acb78: jal   0x100ea50 addu  a0, zero, zero
+// 0x010ad1c0: 0x10ad1c0: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4000,39 +4000,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb80: 0x10acb80: lui   v0, 0x90000
+// 0x010ad1c8: 0x10ad1c8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010acb84: 0x10acb84: sw    s1, -32424(v0)
+// 0x010ad1cc: 0x10ad1cc: sw    s1, -31960(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8106
+	ldc.i4 -7990
 	add
 	ldloc 9
 	stelem.i4
-// 0x010acb88: 0x10acb88: lui   v0, 0x90000
+// 0x010ad1d0: 0x10ad1d0: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010acb8c: 0x10acb8c: j	 0x10acbc0 sw    zero, -32428(v0)
+// 0x010ad1d4: 0x10ad1d4: j	 0x10ad208 sw    zero, -31964(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8107
+	ldc.i4 -7991
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10acbc0
+	br L_10ad208
 // --- basic block ---
-L_10acb94:
-// 0x010acb94: 0x10acb94: jal   0x100e788 addiu a0, s3, 18868
+L_10ad1dc:
+// 0x010ad1dc: 0x10ad1dc: jal   0x100e798 addiu a0, s3, 18868
 	ldloc 11
 	ldc.i4 18868
 	add
@@ -4042,34 +4042,34 @@ L_10acb94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010acb9c: 0x10acb9c: lui   a1, 0x20000
+// 0x010ad1e4: 0x10ad1e4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010acba0: 0x10acba0: lui   a3, 0x20000
+// 0x010ad1e8: 0x10ad1e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010acba4: 0x10acba4: addiu a1, a1, 16716
+// 0x010ad1ec: 0x10ad1ec: addiu a1, a1, 17176
 	ldloc.2
-	ldc.i4 16716
+	ldc.i4 17176
 	add
 	stloc.2
-// 0x010acba8: 0x10acba8: addiu a3, a3, 16752
+// 0x010ad1f0: 0x10ad1f0: addiu a3, a3, 17212
 	ldloc 4
-	ldc.i4 16752
+	ldc.i4 17212
 	add
 	stloc 4
-// 0x010acbac: 0x10acbac: addiu a0, zero, 1
+// 0x010ad1f4: 0x10ad1f4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010acbb0: 0x10acbb0: addiu a2, zero, 200
+// 0x010ad1f8: 0x10ad1f8: addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
-// 0x010acbb4: 0x10acbb4: sw    v0, 16(sp)
+// 0x010ad1fc: 0x10ad1fc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4078,7 +4078,7 @@ L_10acb94:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010acbb8: 0x10acbb8: jal   0x100449c sw    s0, 20(sp)
+// 0x010ad200: 0x10ad200: jal   0x100449c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4097,9 +4097,9 @@ L_10acb94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10acbc0:
-// 0x010acbc0: 0x10acbc0: lw    ra, 44(sp)
-// 0x010acbc4: 0x10acbc4: lw    s3, 40(sp)
+L_10ad208:
+// 0x010ad208: 0x10ad208: lw    ra, 44(sp)
+// 0x010ad20c: 0x10ad20c: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4108,7 +4108,7 @@ L_10acbc0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010acbc8: 0x10acbc8: lw    s2, 36(sp)
+// 0x010ad210: 0x10ad210: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4117,7 +4117,7 @@ L_10acbc0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010acbcc: 0x10acbcc: lw    s1, 32(sp)
+// 0x010ad214: 0x10ad214: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4126,7 +4126,7 @@ L_10acbc0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010acbd0: 0x10acbd0: lw    s0, 28(sp)
+// 0x010ad218: 0x10ad218: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4135,7 +4135,7 @@ L_10acbc0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010acbd4: 0x10acbd4: jr    ra addiu sp, sp, 48
+// 0x010ad21c: 0x10ad21c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4147,7 +4147,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_points_initialize_10acbdc(int32,int32,int32,int32,int32)
+.method public static int32 editor_points_initialize_10ad224(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra)
@@ -4194,12 +4194,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010acbdc: 0x10acbdc: addiu sp, sp, -40
+// 0x010ad224: 0x10ad224: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010acbe0: 0x10acbe0: sw    s2, 28(sp)
+// 0x010ad228: 0x10ad228: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4208,7 +4208,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010acbe4: 0x10acbe4: sw    s1, 24(sp)
+// 0x010ad22c: 0x10ad22c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4217,13 +4217,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010acbe8: 0x10acbe8: lui   s2, 0x10000
+// 0x010ad230: 0x10ad230: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010acbec: 0x10acbec: lui   s1, 0x10000
+// 0x010ad234: 0x10ad234: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010acbf0: 0x10acbf0: sw    s0, 20(sp)
+// 0x010ad238: 0x10ad238: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4232,10 +4232,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010acbf4: 0x10acbf4: lui   s0, 0x0
+// 0x010ad23c: 0x10ad23c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010acbf8: 0x10acbf8: sw    s3, 32(sp)
+// 0x010ad240: 0x10ad240: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4244,26 +4244,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010acbfc: 0x10acbfc: addiu a0, s2, 18248
+// 0x010ad244: 0x10ad244: addiu a0, s2, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x010acc00: 0x10acc00: addiu a1, s0, 18852
+// 0x010ad248: 0x10ad248: addiu a1, s0, 18852
 	ldloc 10
 	ldc.i4 18852
 	add
 	stloc.2
-// 0x010acc04: 0x10acc04: addiu a2, s1, -48
+// 0x010ad24c: 0x10ad24c: addiu a2, s1, -52
 	ldloc 8
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x010acc08: 0x10acc08: lui   s3, 0x0
+// 0x010ad250: 0x10ad250: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010acc0c: 0x10acc0c: sw    ra, 36(sp)
-// 0x010acc10: 0x10acc10: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ad254: 0x10ad254: sw    ra, 36(sp)
+// 0x010ad258: 0x10ad258: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4271,27 +4271,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010acc18: 0x10acc18: addiu a0, s2, 18248
+// 0x010ad260: 0x10ad260: addiu a0, s2, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x010acc1c: 0x10acc1c: addiu a1, s3, 18820
+// 0x010ad264: 0x10ad264: addiu a1, s3, 18820
 	ldloc 11
 	ldc.i4 18820
 	add
 	stloc.2
-// 0x010acc20: 0x10acc20: addiu a2, s1, -48
+// 0x010ad268: 0x10ad268: addiu a2, s1, -52
 	ldloc 8
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x010acc24: 0x10acc24: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ad26c: 0x10ad26c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4299,30 +4299,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010acc2c: 0x10acc2c: lui   a1, 0x0
+// 0x010ad274: 0x10ad274: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010acc30: 0x10acc30: addiu a0, s2, 18248
+// 0x010ad278: 0x10ad278: addiu a0, s2, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x010acc34: 0x10acc34: addiu a2, s1, -48
+// 0x010ad27c: 0x10ad27c: addiu a2, s1, -52
 	ldloc 8
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x010acc38: 0x10acc38: addiu a1, a1, 18836
+// 0x010ad280: 0x10ad280: addiu a1, a1, 18836
 	ldloc.2
 	ldc.i4 18836
 	add
 	stloc.2
-// 0x010acc3c: 0x10acc3c: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ad284: 0x10ad284: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4330,30 +4330,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010acc44: 0x10acc44: lui   a1, 0x0
+// 0x010ad28c: 0x10ad28c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010acc48: 0x10acc48: addiu a0, s2, 18248
+// 0x010ad290: 0x10ad290: addiu a0, s2, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x010acc4c: 0x10acc4c: addiu a2, s1, -48
+// 0x010ad294: 0x10ad294: addiu a2, s1, -52
 	ldloc 8
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x010acc50: 0x10acc50: addiu a1, a1, 18868
+// 0x010ad298: 0x10ad298: addiu a1, a1, 18868
 	ldloc.2
 	ldc.i4 18868
 	add
 	stloc.2
-// 0x010acc54: 0x10acc54: jal   0x100edb0 addu  a3, zero, zero
+// 0x010ad29c: 0x10ad29c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4361,36 +4361,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010acc5c: 0x10acc5c: lui   a1, 0x0
+// 0x010ad2a4: 0x10ad2a4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010acc60: 0x10acc60: lui   a2, 0x10000
+// 0x010ad2a8: 0x10ad2a8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010acc64: 0x10acc64: lui   a0, 0x10000
+// 0x010ad2ac: 0x10ad2ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010acc68: 0x10acc68: addiu a1, a1, 18884
+// 0x010ad2b0: 0x10ad2b0: addiu a1, a1, 18884
 	ldloc.2
 	ldc.i4 18884
 	add
 	stloc.2
-// 0x010acc6c: 0x10acc6c: addiu a2, a2, -30004
+// 0x010ad2b4: 0x10ad2b4: addiu a2, a2, -30004
 	ldloc.3
 	ldc.i4 -30004
 	add
 	stloc.3
-// 0x010acc70: 0x10acc70: addu  a3, zero, zero
+// 0x010ad2b8: 0x10ad2b8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010acc74: 0x10acc74: jal   0x100edb0 addiu a0, a0, 12560
+// 0x010ad2bc: 0x10ad2bc: jal   0x100edc0 addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
 	ldloc.0
@@ -4398,12 +4398,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010acc7c: 0x10acc7c: jal   0x100e788 addiu a0, s3, 18820
+// 0x010ad2c4: 0x10ad2c4: jal   0x100e798 addiu a0, s3, 18820
 	ldloc 11
 	ldc.i4 18820
 	add
@@ -4413,25 +4413,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010acc84: 0x10acc84: lui   v1, 0x90000
+// 0x010ad2cc: 0x10ad2cc: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010acc88: 0x10acc88: addiu a0, s0, 18852
+// 0x010ad2d0: 0x10ad2d0: addiu a0, s0, 18852
 	ldloc 10
 	ldc.i4 18852
 	add
 	stloc.1
-// 0x010acc8c: 0x10acc8c: jal   0x100e788 sw    v0, -32424(v1)
+// 0x010ad2d4: 0x10ad2d4: jal   0x100e798 sw    v0, -31960(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8106
+	ldc.i4 -7990
 	add
 	ldloc 6
 	stelem.i4
@@ -4440,28 +4440,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010acc94: 0x10acc94: lui   v1, 0x90000
+// 0x010ad2dc: 0x10ad2dc: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010acc98: 0x10acc98: lw    ra, 36(sp)
-// 0x010acc9c: 0x10acc9c: sw    v0, -32428(v1)
+// 0x010ad2e0: 0x10ad2e0: lw    ra, 36(sp)
+// 0x010ad2e4: 0x10ad2e4: sw    v0, -31964(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8107
+	ldc.i4 -7991
 	add
 	ldloc 6
 	stelem.i4
-// 0x010acca0: 0x10acca0: lui   v0, 0x90000
+// 0x010ad2e8: 0x10ad2e8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 6
-// 0x010acca4: 0x10acca4: lw    s3, 32(sp)
+// 0x010ad2ec: 0x10ad2ec: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4470,7 +4470,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010acca8: 0x10acca8: lw    s2, 28(sp)
+// 0x010ad2f0: 0x10ad2f0: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4479,7 +4479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010accac: 0x10accac: lw    s1, 24(sp)
+// 0x010ad2f4: 0x10ad2f4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4488,7 +4488,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010accb0: 0x10accb0: lw    s0, 20(sp)
+// 0x010ad2f8: 0x10ad2f8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4497,16 +4497,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010accb4: 0x10accb4: sw    zero, -32420(v0)
+// 0x010ad2fc: 0x10ad2fc: sw    zero, -31956(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -8105
+	ldc.i4 -7989
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010accb8: 0x10accb8: jr    ra addiu sp, sp, 40
+// 0x010ad300: 0x10ad300: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4518,7 +4518,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_filter_get_current_10acccc(int32,int32,int32)
+.method public static int32 editor_track_filter_get_current_10ad314(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -4547,7 +4547,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010acccc: 0x10acccc: lw    v1, 16(a0)
+// 0x010ad314: 0x10ad314: lw    v1, 16(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -4556,14 +4556,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010accd0: 0x10accd0: sll   zero, zero, 0
-// 0x010accd4: 0x10accd4: bne   v1, zero, 0x10acd00 addu  v0, zero, zero
+// 0x010ad318: 0x10ad318: sll   zero, zero, 0
+// 0x010ad31c: 0x10ad31c: bne   v1, zero, 0x10ad348 addu  v0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10acd00
+	brtrue L_10ad348
 // --- basic block ---
-// 0x010accdc: 0x10accdc: lw    v1, 52(a0)
+// 0x010ad324: 0x10ad324: lw    v1, 52(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -4572,17 +4572,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010acce0: 0x10acce0: addiu v0, zero, 1
+// 0x010ad328: 0x10ad328: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010acce4: 0x10acce4: sw    v1, 0(a1)
+// 0x010ad32c: 0x10ad32c: sw    v1, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x010acce8: 0x10acce8: lw    v1, 56(a0)
+// 0x010ad330: 0x10ad330: lw    v1, 56(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -4591,8 +4591,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010accec: 0x10accec: sll   zero, zero, 0
-// 0x010accf0: 0x10accf0: sw    v1, 4(a1)
+// 0x010ad334: 0x10ad334: sll   zero, zero, 0
+// 0x010ad338: 0x10ad338: sw    v1, 4(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -4601,7 +4601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010accf4: 0x10accf4: lw    v1, 40(a0)
+// 0x010ad33c: 0x10ad33c: lw    v1, 40(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -4610,16 +4610,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010accf8: 0x10accf8: sll   zero, zero, 0
-// 0x010accfc: 0x10accfc: sw    v1, 0(a2)
+// 0x010ad340: 0x10ad340: sll   zero, zero, 0
+// 0x010ad344: 0x10ad344: sw    v1, 0(a2)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-L_10acd00:
-// 0x010acd00: 0x10acd00: jr    ra sll   zero, zero, 0
+L_10ad348:
+// 0x010ad348: 0x10ad348: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -4627,7 +4627,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_filter_get_10acd08(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_filter_get_10ad350(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s3,int32 s1,int32 s2,int32 lo,int32 ra)
@@ -4677,12 +4677,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010acd08: 0x10acd08: addiu sp, sp, -64
+// 0x010ad350: 0x10ad350: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010acd0c: 0x10acd0c: sw    s3, 56(sp)
+// 0x010ad354: 0x10ad354: sw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4691,7 +4691,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010acd10: 0x10acd10: sw    s1, 48(sp)
+// 0x010ad358: 0x10ad358: sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4700,17 +4700,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010acd14: 0x10acd14: addiu s3, a0, 52
+// 0x010ad35c: 0x10ad35c: addiu s3, a0, 52
 	ldloc.1
 	ldc.i4.s 52
 	add
 	stloc 9
-// 0x010acd18: 0x10acd18: addiu s1, a0, 20
+// 0x010ad360: 0x10ad360: addiu s1, a0, 20
 	ldloc.1
 	ldc.i4.s 20
 	add
 	stloc 10
-// 0x010acd1c: 0x10acd1c: sw    s0, 44(sp)
+// 0x010ad364: 0x10ad364: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4719,17 +4719,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010acd20: 0x10acd20: addu  a1, s3, zero
+// 0x010ad368: 0x10ad368: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010acd24: 0x10acd24: addu  s0, a0, zero
+// 0x010ad36c: 0x10ad36c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010acd28: 0x10acd28: addu  a0, s1, zero
+// 0x010ad370: 0x10ad370: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010acd2c: 0x10acd2c: sw    ra, 60(sp)
-// 0x010acd30: 0x10acd30: jal   0x1008eb0 sw    s2, 52(sp)
+// 0x010ad374: 0x10ad374: sw    ra, 60(sp)
+// 0x010ad378: 0x10ad378: jal   0x1008ec0 sw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4743,12 +4743,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010acd38: 0x10acd38: lw    v1, 12(s0)
+// 0x010ad380: 0x10ad380: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4757,33 +4757,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010acd3c: 0x10acd3c: sll   zero, zero, 0
-// 0x010acd40: 0x10acd40: slt   v0, v0, v1
+// 0x010ad384: 0x10ad384: sll   zero, zero, 0
+// 0x010ad388: 0x10ad388: slt   v0, v0, v1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 7
-// 0x010acd44: 0x10acd44: beq   v0, zero, 0x10acd54 addiu s2, sp, 16
+// 0x010ad38c: 0x10ad38c: beq   v0, zero, 0x10ad39c addiu s2, sp, 16
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 11
-	brfalse L_10acd54
+	brfalse L_10ad39c
 // --- basic block ---
-// 0x010acd4c: 0x10acd4c: j	 0x10acdf0 addu  s1, zero, zero
+// 0x010ad394: 0x10ad394: j	 0x10ad438 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_10acdf0
+	br L_10ad438
 // --- basic block ---
-L_10acd54:
-// 0x010acd54: 0x10acd54: addu  a1, s3, zero
+L_10ad39c:
+// 0x010ad39c: 0x10ad39c: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010acd58: 0x10acd58: addu  a0, s2, zero
+// 0x010ad3a0: 0x10ad3a0: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010acd5c: 0x10acd5c: jal   0x1001800 addiu a2, zero, 20
+// 0x010ad3a4: 0x10ad3a4: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -4795,13 +4795,13 @@ L_10acd54:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010acd64: 0x10acd64: j	 0x10acdc0 addiu s3, zero, 2
+// 0x010ad3ac: 0x10ad3ac: j	 0x10ad408 addiu s3, zero, 2
 	ldc.i4.2
 	stloc 9
-	br L_10acdc0
+	br L_10ad408
 // --- basic block ---
-L_10acd6c:
-// 0x010acd6c: 0x10acd6c: lw    v1, 16(sp)
+L_10ad3b4:
+// 0x010ad3b4: 0x10ad3b4: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4810,7 +4810,7 @@ L_10acd6c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010acd70: 0x10acd70: lw    a0, 20(s0)
+// 0x010ad3b8: 0x10ad3b8: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4819,7 +4819,7 @@ L_10acd6c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010acd74: 0x10acd74: lw    a2, 24(s0)
+// 0x010ad3bc: 0x10ad3bc: lw    a2, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4828,17 +4828,17 @@ L_10acd6c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010acd78: 0x10acd78: addu  a0, a0, v1
+// 0x010ad3c0: 0x10ad3c0: addu  a0, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x010acd7c: 0x10acd7c: div   a0, s3
+// 0x010ad3c4: 0x10ad3c4: div   a0, s3
 	ldloc.1
 	ldloc 9
 	div
 	stloc 12
-// 0x010acd80: 0x10acd80: lw    v1, 20(sp)
+// 0x010ad3c8: 0x10ad3c8: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4847,7 +4847,7 @@ L_10acd6c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010acd84: 0x10acd84: lw    v0, 28(s0)
+// 0x010ad3cc: 0x10ad3cc: lw    v0, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4856,12 +4856,12 @@ L_10acd6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010acd88: 0x10acd88: addu  v1, a2, v1
+// 0x010ad3d0: 0x10ad3d0: addu  v1, a2, v1
 	ldloc.3
 	ldloc 6
 	add
 	stloc 6
-// 0x010acd8c: 0x10acd8c: lw    a1, 24(sp)
+// 0x010ad3d4: 0x10ad3d4: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4870,16 +4870,16 @@ L_10acd6c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010acd90: 0x10acd90: sll   zero, zero, 0
-// 0x010acd94: 0x10acd94: addu  v0, v0, a1
+// 0x010ad3d8: 0x10ad3d8: sll   zero, zero, 0
+// 0x010ad3dc: 0x10ad3dc: addu  v0, v0, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-// 0x010acd98: 0x10acd98: mflo  lo
+// 0x010ad3e0: 0x10ad3e0: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x010acd9c: 0x10acd9c: sw    a0, 16(sp)
+// 0x010ad3e4: 0x10ad3e4: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4888,16 +4888,16 @@ L_10acd6c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010acda0: 0x10acda0: sll   zero, zero, 0
-// 0x010acda4: 0x10acda4: div   v1, s3
+// 0x010ad3e8: 0x10ad3e8: sll   zero, zero, 0
+// 0x010ad3ec: 0x10ad3ec: div   v1, s3
 	ldloc 6
 	ldloc 9
 	div
 	stloc 12
-// 0x010acda8: 0x10acda8: mflo  lo
+// 0x010ad3f0: 0x10ad3f0: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x010acdac: 0x10acdac: sw    v1, 20(sp)
+// 0x010ad3f4: 0x10ad3f4: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4906,16 +4906,16 @@ L_10acd6c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010acdb0: 0x10acdb0: sll   zero, zero, 0
-// 0x010acdb4: 0x10acdb4: div   v0, s3
+// 0x010ad3f8: 0x10ad3f8: sll   zero, zero, 0
+// 0x010ad3fc: 0x10ad3fc: div   v0, s3
 	ldloc 7
 	ldloc 9
 	div
 	stloc 12
-// 0x010acdb8: 0x10acdb8: mflo  lo
+// 0x010ad400: 0x10ad400: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x010acdbc: 0x10acdbc: sw    v0, 24(sp)
+// 0x010ad404: 0x10ad404: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4924,11 +4924,11 @@ L_10acd6c:
 	add
 	ldloc 7
 	stelem.i4
-L_10acdc0:
-// 0x010acdc0: 0x10acdc0: addu  a0, s1, zero
+L_10ad408:
+// 0x010ad408: 0x10ad408: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010acdc4: 0x10acdc4: jal   0x1008eb0 addu  a1, s2, zero
+// 0x010ad40c: 0x10ad40c: jal   0x1008ec0 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -4936,12 +4936,12 @@ L_10acdc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010acdcc: 0x10acdcc: lw    v1, 12(s0)
+// 0x010ad414: 0x10ad414: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4950,29 +4950,29 @@ L_10acdc0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010acdd0: 0x10acdd0: sll   zero, zero, 0
-// 0x010acdd4: 0x10acdd4: sll   v1, v1, 1
+// 0x010ad418: 0x10ad418: sll   zero, zero, 0
+// 0x010ad41c: 0x10ad41c: sll   v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x010acdd8: 0x10acdd8: slt   v0, v0, v1
+// 0x010ad420: 0x10ad420: slt   v0, v0, v1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 7
-// 0x010acddc: 0x10acddc: beq   v0, zero, 0x10acd6c addiu a0, s0, 20
+// 0x010ad424: 0x10ad424: beq   v0, zero, 0x10ad3b4 addiu a0, s0, 20
 	ldloc 7
 	ldloc 8
 	ldc.i4.s 20
 	add
 	stloc.1
-	brfalse L_10acd6c
+	brfalse L_10ad3b4
 // --- basic block ---
-// 0x010acde4: 0x10acde4: addu  a1, s2, zero
+// 0x010ad42c: 0x10ad42c: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x010acde8: 0x10acde8: jal   0x1001800 addiu a2, zero, 20
+// 0x010ad430: 0x10ad430: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -4984,12 +4984,12 @@ L_10acdc0:
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_10acdf0:
-// 0x010acdf0: 0x10acdf0: lw    ra, 60(sp)
-// 0x010acdf4: 0x10acdf4: addu  v0, s1, zero
+L_10ad438:
+// 0x010ad438: 0x10ad438: lw    ra, 60(sp)
+// 0x010ad43c: 0x10ad43c: addu  v0, s1, zero
 	ldloc 10
 	stloc 7
-// 0x010acdf8: 0x10acdf8: lw    s3, 56(sp)
+// 0x010ad440: 0x10ad440: lw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4998,7 +4998,7 @@ L_10acdf0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010acdfc: 0x10acdfc: lw    s2, 52(sp)
+// 0x010ad444: 0x10ad444: lw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5007,7 +5007,7 @@ L_10acdf0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ace00: 0x10ace00: lw    s1, 48(sp)
+// 0x010ad448: 0x10ad448: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5016,7 +5016,7 @@ L_10acdf0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ace04: 0x10ace04: lw    s0, 44(sp)
+// 0x010ad44c: 0x10ad44c: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5025,7 +5025,7 @@ L_10acdf0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ace08: 0x10ace08: jr    ra addiu sp, sp, 64
+// 0x010ad450: 0x10ad450: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5037,7 +5037,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_track_filter_add_10ace10(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_filter_add_10ad458(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s2,int32 s1,int32 s3,int32 s4,int32 lo,int32 ra)
@@ -5090,7 +5090,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ace10: 0x10ace10: lw    v0, 16(a0)
+// 0x010ad458: 0x10ad458: lw    v0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5099,12 +5099,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ace14: 0x10ace14: addiu sp, sp, -40
+// 0x010ad45c: 0x10ad45c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010ace18: 0x10ace18: sw    s3, 28(sp)
+// 0x010ad460: 0x10ad460: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5113,7 +5113,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ace1c: 0x10ace1c: sw    s2, 24(sp)
+// 0x010ad464: 0x10ad464: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5122,7 +5122,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ace20: 0x10ace20: sw    s1, 20(sp)
+// 0x010ad468: 0x10ad468: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5131,7 +5131,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ace24: 0x10ace24: sw    s0, 16(sp)
+// 0x010ad46c: 0x10ad46c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5140,8 +5140,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ace28: 0x10ace28: sw    ra, 36(sp)
-// 0x010ace2c: 0x10ace2c: sw    s4, 32(sp)
+// 0x010ad470: 0x10ad470: sw    ra, 36(sp)
+// 0x010ad474: 0x10ad474: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5150,22 +5150,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ace30: 0x10ace30: addu  s0, a0, zero
+// 0x010ad478: 0x10ad478: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010ace34: 0x10ace34: addu  s2, a1, zero
+// 0x010ad47c: 0x10ad47c: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010ace38: 0x10ace38: addu  s3, a2, zero
+// 0x010ad480: 0x10ad480: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010ace3c: 0x10ace3c: beq   v0, zero, 0x10ace80 addu  s1, a3, zero
+// 0x010ad484: 0x10ad484: beq   v0, zero, 0x10ad4c8 addu  s1, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 10
-	brfalse L_10ace80
+	brfalse L_10ad4c8
 // --- basic block ---
-// 0x010ace44: 0x10ace44: sw    zero, 16(a0)
+// 0x010ad48c: 0x10ad48c: sw    zero, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5174,7 +5174,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ace48: 0x10ace48: lw    v0, 16(a3)
+// 0x010ad490: 0x10ad490: lw    v0, 16(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5183,15 +5183,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ace4c: 0x10ace4c: addu  a1, a3, zero
+// 0x010ad494: 0x10ad494: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010ace50: 0x10ace50: addiu a0, a0, 20
+// 0x010ad498: 0x10ad498: addiu a0, a0, 20
 	ldloc.1
 	ldc.i4.s 20
 	add
 	stloc.1
-// 0x010ace54: 0x10ace54: sw    v0, 48(s0)
+// 0x010ad49c: 0x10ad49c: sw    v0, 48(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5200,7 +5200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ace58: 0x10ace58: jal   0x1001800 addiu a2, zero, 20
+// 0x010ad4a0: 0x10ad4a0: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -5212,7 +5212,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ace60: 0x10ace60: sw    s2, 40(s0)
+// 0x010ad4a8: 0x10ad4a8: sw    s2, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5221,7 +5221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ace64: 0x10ace64: sw    s2, 44(s0)
+// 0x010ad4ac: 0x10ad4ac: sw    s2, 44(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5230,15 +5230,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ace68: 0x10ace68: addiu a0, s0, 52
+// 0x010ad4b0: 0x10ad4b0: addiu a0, s0, 52
 	ldloc 7
 	ldc.i4.s 52
 	add
 	stloc.1
-// 0x010ace6c: 0x10ace6c: addu  a1, s1, zero
+// 0x010ad4b4: 0x10ad4b4: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010ace70: 0x10ace70: jal   0x1001800 addiu a2, zero, 20
+// 0x010ad4b8: 0x10ad4b8: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -5250,13 +5250,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010ace78: 0x10ace78: j	 0x10ad014 addu  v0, zero, zero
+// 0x010ad4c0: 0x10ad4c0: j	 0x10ad65c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10ad014
+	br L_10ad65c
 // --- basic block ---
-L_10ace80:
-// 0x010ace80: 0x10ace80: lw    v1, 40(a0)
+L_10ad4c8:
+// 0x010ad4c8: 0x10ad4c8: lw    v1, 40(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5265,7 +5265,7 @@ L_10ace80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ace84: 0x10ace84: lw    v0, 8(a0)
+// 0x010ad4cc: 0x10ad4cc: lw    v0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5274,38 +5274,38 @@ L_10ace80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ace88: 0x10ace88: sll   zero, zero, 0
-// 0x010ace8c: 0x10ace8c: addu  a0, v0, v1
+// 0x010ad4d0: 0x10ad4d0: sll   zero, zero, 0
+// 0x010ad4d4: 0x10ad4d4: addu  a0, v0, v1
 	ldloc 5
 	ldloc 8
 	add
 	stloc.1
-// 0x010ace90: 0x10ace90: slt   a0, a0, a1
+// 0x010ad4d8: 0x10ad4d8: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.1
-// 0x010ace94: 0x10ace94: bne   a0, zero, 0x10acf44 sll   zero, zero, 0
+// 0x010ad4dc: 0x10ad4dc: bne   a0, zero, 0x10ad58c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10acf44
+	brtrue L_10ad58c
 // --- basic block ---
-// 0x010ace9c: 0x10ace9c: subu  v0, v1, v0
+// 0x010ad4e4: 0x10ad4e4: subu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 5
-// 0x010acea0: 0x10acea0: slt   v0, a1, v0
+// 0x010ad4e8: 0x10ad4e8: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x010acea4: 0x10acea4: bne   v0, zero, 0x10acf48 addiu v0, zero, 1
+// 0x010ad4ec: 0x10ad4ec: bne   v0, zero, 0x10ad590 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10acf48
+	brtrue L_10ad590
 // --- basic block ---
-// 0x010aceac: 0x10aceac: sw    a1, 40(s0)
+// 0x010ad4f4: 0x10ad4f4: sw    a1, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5314,7 +5314,7 @@ L_10ace80:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010aceb0: 0x10aceb0: lw    v1, 24(s0)
+// 0x010ad4f8: 0x10ad4f8: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5323,7 +5323,7 @@ L_10ace80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aceb4: 0x10aceb4: lw    v0, 4(a3)
+// 0x010ad4fc: 0x10ad4fc: lw    v0, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5332,15 +5332,15 @@ L_10ace80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aceb8: 0x10aceb8: sll   zero, zero, 0
-// 0x010acebc: 0x10acebc: bne   v1, v0, 0x10aced8 lui   v0, 0x20000
+// 0x010ad500: 0x10ad500: sll   zero, zero, 0
+// 0x010ad504: 0x10ad504: bne   v1, v0, 0x10ad520 lui   v0, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	bne.un L_10aced8
+	bne.un L_10ad520
 // --- basic block ---
-// 0x010acec4: 0x10acec4: lw    v1, 20(s0)
+// 0x010ad50c: 0x10ad50c: lw    v1, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5349,41 +5349,41 @@ L_10ace80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010acec8: 0x10acec8: lw    v0, 0(a3)
+// 0x010ad510: 0x10ad510: lw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010acecc: 0x10acecc: sll   zero, zero, 0
-// 0x010aced0: 0x10aced0: beq   v1, v0, 0x10ad010 lui   v0, 0x20000
+// 0x010ad514: 0x10ad514: sll   zero, zero, 0
+// 0x010ad518: 0x10ad518: beq   v1, v0, 0x10ad658 lui   v0, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_10ad010
+	beq  L_10ad658
 // --- basic block ---
-L_10aced8:
-// 0x010aced8: 0x10aced8: lw    a3, 23924(v0)
+L_10ad520:
+// 0x010ad520: 0x10ad520: lw    a3, 24388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5981
+	ldc.i4 6097
 	add
 	ldelem.i4
 	stloc 4
-// 0x010acedc: 0x10acedc: lw    a2, 23920(v0)
+// 0x010ad524: 0x10ad524: lw    a2, 24384(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5980
+	ldc.i4 6096
 	add
 	ldelem.i4
 	stloc.3
-// 0x010acee0: 0x10acee0: lw    a1, 20(s3)
+// 0x010ad528: 0x10ad528: lw    a1, 20(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5392,7 +5392,7 @@ L_10aced8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010acee4: 0x10acee4: lw    a0, 16(s3)
+// 0x010ad52c: 0x10ad52c: lw    a0, 16(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5401,33 +5401,33 @@ L_10aced8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010acee8: 0x10acee8: jal   0x10c17ac sll   zero, zero, 0
+// 0x010ad530: 0x10ad530: jal   0x10c1dec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010acef0: 0x10acef0: bgtz  v0, 0x10ad014 addu  v0, zero, zero
+// 0x010ad538: 0x10ad538: bgtz  v0, 0x10ad65c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	bgt L_10ad014
+	bgt L_10ad65c
 // --- basic block ---
-// 0x010acef8: 0x10acef8: addiu s4, s0, 20
+// 0x010ad540: 0x10ad540: addiu s4, s0, 20
 	ldloc 7
 	ldc.i4.s 20
 	add
 	stloc 12
-// 0x010acefc: 0x10acefc: addu  a0, s4, zero
+// 0x010ad544: 0x10ad544: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010acf00: 0x10acf00: jal   0x1008eb0 addu  a1, s1, zero
+// 0x010ad548: 0x10ad548: jal   0x1008ec0 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5435,31 +5435,31 @@ L_10aced8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010acf08: 0x10acf08: lw    v1, 0(s0)
+// 0x010ad550: 0x10ad550: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010acf0c: 0x10acf0c: sll   zero, zero, 0
-// 0x010acf10: 0x10acf10: slt   v0, v0, v1
+// 0x010ad554: 0x10ad554: sll   zero, zero, 0
+// 0x010ad558: 0x10ad558: slt   v0, v0, v1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x010acf14: 0x10acf14: beq   v0, zero, 0x10acf48 addiu v0, zero, 1
+// 0x010ad55c: 0x10ad55c: beq   v0, zero, 0x10ad590 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_10acf48
+	brfalse L_10ad590
 // --- basic block ---
-// 0x010acf1c: 0x10acf1c: lw    v0, 44(s0)
+// 0x010ad564: 0x10ad564: lw    v0, 44(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5468,17 +5468,17 @@ L_10aced8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010acf20: 0x10acf20: sll   zero, zero, 0
-// 0x010acf24: 0x10acf24: slt   v1, s2, v0
+// 0x010ad568: 0x10ad568: sll   zero, zero, 0
+// 0x010ad56c: 0x10ad56c: slt   v1, s2, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 8
-// 0x010acf28: 0x10acf28: bne   v1, zero, 0x10acf44 sll   zero, zero, 0
+// 0x010ad570: 0x10ad570: bne   v1, zero, 0x10ad58c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_10acf44
+	brtrue L_10ad58c
 // --- basic block ---
-// 0x010acf30: 0x10acf30: lw    v1, 4(s0)
+// 0x010ad578: 0x10ad578: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5487,26 +5487,26 @@ L_10aced8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010acf34: 0x10acf34: subu  v0, s2, v0
+// 0x010ad57c: 0x10ad57c: subu  v0, s2, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 5
-// 0x010acf38: 0x10acf38: slt   v0, v1, v0
+// 0x010ad580: 0x10ad580: slt   v0, v1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010acf3c: 0x10acf3c: beq   v0, zero, 0x10acf68 sll   zero, zero, 0
+// 0x010ad584: 0x10ad584: beq   v0, zero, 0x10ad5b0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10acf68
+	brfalse L_10ad5b0
 // --- basic block ---
-L_10acf44:
-// 0x010acf44: 0x10acf44: addiu v0, zero, 1
+L_10ad58c:
+// 0x010ad58c: 0x10ad58c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10acf48:
-// 0x010acf48: 0x10acf48: sw    v0, 16(s0)
+L_10ad590:
+// 0x010ad590: 0x10ad590: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5515,16 +5515,16 @@ L_10acf48:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010acf4c: 0x10acf4c: addu  a0, s0, zero
+// 0x010ad594: 0x10ad594: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010acf50: 0x10acf50: addu  a1, s2, zero
+// 0x010ad598: 0x10ad598: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010acf54: 0x10acf54: addu  a2, s3, zero
+// 0x010ad59c: 0x10ad59c: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x010acf58: 0x10acf58: jal   0x10ace10 addu  a3, s1, zero
+// 0x010ad5a0: 0x10ad5a0: jal   0x10ad458 addu  a3, s1, zero
 	ldloc 10
 	stloc 4
 	ldloc.0
@@ -5532,18 +5532,18 @@ L_10acf48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_track_filter_add_10ace10(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_track_filter_add_10ad458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010acf60: 0x10acf60: j	 0x10ad014 addiu v0, zero, 1
+// 0x010ad5a8: 0x10ad5a8: j	 0x10ad65c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10ad014
+	br L_10ad65c
 // --- basic block ---
-L_10acf68:
-// 0x010acf68: 0x10acf68: sw    s2, 44(s0)
+L_10ad5b0:
+// 0x010ad5b0: 0x10ad5b0: sw    s2, 44(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5552,7 +5552,7 @@ L_10acf68:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010acf6c: 0x10acf6c: lw    v0, 56(s0)
+// 0x010ad5b4: 0x10ad5b4: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5561,7 +5561,7 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010acf70: 0x10acf70: lw    a0, 60(s0)
+// 0x010ad5b8: 0x10ad5b8: lw    a0, 60(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5570,7 +5570,7 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010acf74: 0x10acf74: lw    v1, 4(s1)
+// 0x010ad5bc: 0x10ad5bc: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5579,7 +5579,7 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010acf78: 0x10acf78: lw    a3, 8(s1)
+// 0x010ad5c0: 0x10ad5c0: lw    a3, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5588,25 +5588,25 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010acf7c: 0x10acf7c: addu  v1, v1, v0
+// 0x010ad5c4: 0x10ad5c4: addu  v1, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x010acf80: 0x10acf80: addu  a3, a3, a0
+// 0x010ad5c8: 0x10ad5c8: addu  a3, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc 4
-// 0x010acf84: 0x10acf84: addiu v0, zero, 2
+// 0x010ad5cc: 0x10ad5cc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010acf88: 0x10acf88: div   a3, v0
+// 0x010ad5d0: 0x10ad5d0: div   a3, v0
 	ldloc 4
 	ldloc 5
 	div
 	stloc 13
-// 0x010acf8c: 0x10acf8c: lw    a1, 52(s0)
+// 0x010ad5d4: 0x10ad5d4: lw    a1, 52(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5615,14 +5615,14 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010acf90: 0x10acf90: lw    a2, 0(s1)
+// 0x010ad5d8: 0x10ad5d8: lw    a2, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010acf94: 0x10acf94: lw    a0, 12(s1)
+// 0x010ad5dc: 0x10ad5dc: lw    a0, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5631,17 +5631,17 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010acf98: 0x10acf98: addu  a2, a2, a1
+// 0x010ad5e0: 0x10ad5e0: addu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.3
-// 0x010acf9c: 0x10acf9c: addiu s3, s0, 52
+// 0x010ad5e4: 0x10ad5e4: addiu s3, s0, 52
 	ldloc 7
 	ldc.i4.s 52
 	add
 	stloc 11
-// 0x010acfa0: 0x10acfa0: sw    a0, 64(s0)
+// 0x010ad5e8: 0x10ad5e8: sw    a0, 64(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5650,16 +5650,16 @@ L_10acf68:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010acfa4: 0x10acfa4: addu  a1, s3, zero
+// 0x010ad5ec: 0x10ad5ec: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010acfa8: 0x10acfa8: addu  a0, s4, zero
+// 0x010ad5f0: 0x10ad5f0: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010acfac: 0x10acfac: mflo  lo
+// 0x010ad5f4: 0x10ad5f4: mflo  lo
 	ldloc 13
 	stloc 4
-// 0x010acfb0: 0x10acfb0: sw    a3, 60(s0)
+// 0x010ad5f8: 0x10ad5f8: sw    a3, 60(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5668,16 +5668,16 @@ L_10acf68:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010acfb4: 0x10acfb4: sll   zero, zero, 0
-// 0x010acfb8: 0x10acfb8: div   a2, v0
+// 0x010ad5fc: 0x10ad5fc: sll   zero, zero, 0
+// 0x010ad600: 0x10ad600: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 13
-// 0x010acfbc: 0x10acfbc: mflo  lo
+// 0x010ad604: 0x10ad604: mflo  lo
 	ldloc 13
 	stloc.3
-// 0x010acfc0: 0x10acfc0: sw    a2, 52(s0)
+// 0x010ad608: 0x10ad608: sw    a2, 52(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5686,16 +5686,16 @@ L_10acf68:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010acfc4: 0x10acfc4: sll   zero, zero, 0
-// 0x010acfc8: 0x10acfc8: div   v1, v0
+// 0x010ad60c: 0x10ad60c: sll   zero, zero, 0
+// 0x010ad610: 0x10ad610: div   v1, v0
 	ldloc 8
 	ldloc 5
 	div
 	stloc 13
-// 0x010acfcc: 0x10acfcc: mflo  lo
+// 0x010ad614: 0x10ad614: mflo  lo
 	ldloc 13
 	stloc 8
-// 0x010acfd0: 0x10acfd0: jal   0x1009824 sw    v1, 56(s0)
+// 0x010ad618: 0x10ad618: jal   0x1009834 sw    v1, 56(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5709,12 +5709,12 @@ L_10acf68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010acfd8: 0x10acfd8: sw    v0, 68(s0)
+// 0x010ad620: 0x10ad620: sw    v0, 68(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5723,10 +5723,10 @@ L_10acf68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010acfdc: 0x10acfdc: addu  s2, v0, zero
+// 0x010ad624: 0x10ad624: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010acfe0: 0x10acfe0: lw    v0, 16(s1)
+// 0x010ad628: 0x10ad628: lw    v0, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5735,7 +5735,7 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010acfe4: 0x10acfe4: lw    a1, 48(s0)
+// 0x010ad62c: 0x10ad62c: lw    a1, 48(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5744,7 +5744,7 @@ L_10acf68:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010acfe8: 0x10acfe8: sw    v0, 68(s0)
+// 0x010ad630: 0x10ad630: sw    v0, 68(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5753,29 +5753,29 @@ L_10acf68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010acfec: 0x10acfec: jal   0x1008410 addu  a0, s2, zero
+// 0x010ad634: 0x10ad634: jal   0x1008420 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010acff4: 0x10acff4: slti  v0, v0, 91
+// 0x010ad63c: 0x10ad63c: slti  v0, v0, 91
 	ldloc 5
 	ldc.i4.s 91
 	clt
 	stloc 5
-// 0x010acff8: 0x10acff8: bne   v0, zero, 0x10ad00c addu  a0, s4, zero
+// 0x010ad640: 0x10ad640: bne   v0, zero, 0x10ad654 addu  a0, s4, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_10ad00c
+	brtrue L_10ad654
 // --- basic block ---
-// 0x010ad000: 0x10ad000: addu  a1, s3, zero
+// 0x010ad648: 0x10ad648: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010ad004: 0x10ad004: jal   0x1001800 addiu a2, zero, 20
+// 0x010ad64c: 0x10ad64c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -5787,8 +5787,8 @@ L_10acf68:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10ad00c:
-// 0x010ad00c: 0x10ad00c: sw    s2, 48(s0)
+L_10ad654:
+// 0x010ad654: 0x10ad654: sw    s2, 48(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5797,13 +5797,13 @@ L_10ad00c:
 	add
 	ldloc 9
 	stelem.i4
-L_10ad010:
-// 0x010ad010: 0x10ad010: addu  v0, zero, zero
+L_10ad658:
+// 0x010ad658: 0x10ad658: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10ad014:
-// 0x010ad014: 0x10ad014: lw    ra, 36(sp)
-// 0x010ad018: 0x10ad018: lw    s4, 32(sp)
+L_10ad65c:
+// 0x010ad65c: 0x10ad65c: lw    ra, 36(sp)
+// 0x010ad660: 0x10ad660: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5812,7 +5812,7 @@ L_10ad014:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ad01c: 0x10ad01c: lw    s3, 28(sp)
+// 0x010ad664: 0x10ad664: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5821,7 +5821,7 @@ L_10ad014:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ad020: 0x10ad020: lw    s2, 24(sp)
+// 0x010ad668: 0x10ad668: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5830,7 +5830,7 @@ L_10ad014:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ad024: 0x10ad024: lw    s1, 20(sp)
+// 0x010ad66c: 0x10ad66c: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5839,7 +5839,7 @@ L_10ad014:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ad028: 0x10ad028: lw    s0, 16(sp)
+// 0x010ad670: 0x10ad670: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5848,7 +5848,7 @@ L_10ad014:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad02c: 0x10ad02c: jr    ra addiu sp, sp, 40
+// 0x010ad674: 0x10ad674: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5860,7 +5860,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_filter_new_10ad034(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_filter_new_10ad67c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -5898,12 +5898,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ad034: 0x10ad034: addiu sp, sp, -40
+// 0x010ad67c: 0x10ad67c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010ad038: 0x10ad038: sw    s0, 32(sp)
+// 0x010ad680: 0x10ad680: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5912,14 +5912,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad03c: 0x10ad03c: addu  s0, a0, zero
+// 0x010ad684: 0x10ad684: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010ad040: 0x10ad040: addiu a0, zero, 72
+// 0x010ad688: 0x10ad688: addiu a0, zero, 72
 	ldc.i4.s 72
 	stloc.1
-// 0x010ad044: 0x10ad044: sw    ra, 36(sp)
-// 0x010ad048: 0x10ad048: sw    a1, 16(sp)
+// 0x010ad68c: 0x10ad68c: sw    ra, 36(sp)
+// 0x010ad690: 0x10ad690: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5928,7 +5928,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010ad04c: 0x10ad04c: sw    a2, 20(sp)
+// 0x010ad694: 0x10ad694: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5937,7 +5937,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010ad050: 0x10ad050: jal   0x1000910 sw    a3, 24(sp)
+// 0x010ad698: 0x10ad698: jal   0x1000910 sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5956,7 +5956,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010ad058: 0x10ad058: lw    a1, 16(sp)
+// 0x010ad6a0: 0x10ad6a0: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5965,7 +5965,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad05c: 0x10ad05c: lw    a2, 20(sp)
+// 0x010ad6a4: 0x10ad6a4: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5974,7 +5974,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad060: 0x10ad060: lw    a3, 24(sp)
+// 0x010ad6a8: 0x10ad6a8: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5983,18 +5983,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ad064: 0x10ad064: lw    ra, 36(sp)
-// 0x010ad068: 0x10ad068: addiu a0, zero, 1
+// 0x010ad6ac: 0x10ad6ac: lw    ra, 36(sp)
+// 0x010ad6b0: 0x10ad6b0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010ad06c: 0x10ad06c: sw    s0, 0(v0)
+// 0x010ad6b4: 0x10ad6b4: sw    s0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010ad070: 0x10ad070: sw    a0, 16(v0)
+// 0x010ad6b8: 0x10ad6b8: sw    a0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6003,7 +6003,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010ad074: 0x10ad074: lw    s0, 32(sp)
+// 0x010ad6bc: 0x10ad6bc: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6012,7 +6012,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad078: 0x10ad078: sw    a1, 4(v0)
+// 0x010ad6c0: 0x10ad6c0: sw    a1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6021,7 +6021,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010ad07c: 0x10ad07c: sw    a2, 8(v0)
+// 0x010ad6c4: 0x10ad6c4: sw    a2, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6030,7 +6030,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010ad080: 0x10ad080: sw    a3, 12(v0)
+// 0x010ad6c8: 0x10ad6c8: sw    a3, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6039,7 +6039,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010ad084: 0x10ad084: jr    ra addiu sp, sp, 40
+// 0x010ad6cc: 0x10ad6cc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6051,7 +6051,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 resolve_add_10ad09c(int32,int32,int32,int32,int32)
+.method public static int32 resolve_add_10ad6e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 t0,int32 s1,int32 t1,int32 v0,int32 s0,int32 t2,int32 ra)
@@ -6101,7 +6101,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ad09c: 0x10ad09c: lw    v0, 1920(a0)
+// 0x010ad6e4: 0x10ad6e4: lw    v0, 1920(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6110,12 +6110,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ad0a0: 0x10ad0a0: addiu sp, sp, -40
+// 0x010ad6e8: 0x10ad6e8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010ad0a4: 0x10ad0a4: sw    s1, 32(sp)
+// 0x010ad6ec: 0x10ad6ec: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6124,8 +6124,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ad0a8: 0x10ad0a8: sw    ra, 36(sp)
-// 0x010ad0ac: 0x10ad0ac: sw    s0, 28(sp)
+// 0x010ad6f0: 0x10ad6f0: sw    ra, 36(sp)
+// 0x010ad6f4: 0x10ad6f4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6134,39 +6134,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ad0b0: 0x10ad0b0: bne   a2, zero, 0x10ad0c8 addiu s1, v0, -1
+// 0x010ad6f8: 0x10ad6f8: bne   a2, zero, 0x10ad710 addiu s1, v0, -1
 	ldloc.3
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 8
-	brtrue L_10ad0c8
+	brtrue L_10ad710
 // --- basic block ---
-L_10ad0b8:
-// 0x010ad0b8: 0x10ad0b8: addu  t1, a0, zero
+L_10ad700:
+// 0x010ad700: 0x10ad700: addu  t1, a0, zero
 	ldloc.1
 	stloc 9
-L_10ad0bc:
-// 0x010ad0bc: 0x10ad0bc: addu  v1, zero, zero
+L_10ad704:
+// 0x010ad704: 0x10ad704: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010ad0c0: 0x10ad0c0: j	 0x10ad144 addu  t0, zero, zero
+// 0x010ad708: 0x10ad708: j	 0x10ad78c addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10ad144
+	br L_10ad78c
 // --- basic block ---
-L_10ad0c8:
-// 0x010ad0c8: 0x10ad0c8: sll   v1, s1, 7
+L_10ad710:
+// 0x010ad710: 0x10ad710: sll   v1, s1, 7
 	ldloc 8
 	ldc.i4.7
 	shl
 	stloc 6
-// 0x010ad0cc: 0x10ad0cc: addu  v1, a0, v1
+// 0x010ad714: 0x10ad714: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x010ad0d0: 0x10ad0d0: lw    t0, 76(v1)
+// 0x010ad718: 0x10ad718: lw    t0, 76(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6175,24 +6175,24 @@ L_10ad0c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad0d4: 0x10ad0d4: lw    t1, 0(a2)
+// 0x010ad71c: 0x10ad71c: lw    t1, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010ad0d8: 0x10ad0d8: sll   zero, zero, 0
-// 0x010ad0dc: 0x10ad0dc: bne   t0, t1, 0x10ad0b8 sll   zero, zero, 0
+// 0x010ad720: 0x10ad720: sll   zero, zero, 0
+// 0x010ad724: 0x10ad724: bne   t0, t1, 0x10ad700 sll   zero, zero, 0
 	ldloc 7
 	ldloc 9
-	bne.un L_10ad0b8
+	bne.un L_10ad700
 // --- basic block ---
-// 0x010ad0e4: 0x10ad0e4: bne   t0, zero, 0x10ad100 sll   zero, zero, 0
+// 0x010ad72c: 0x10ad72c: bne   t0, zero, 0x10ad748 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10ad100
+	brtrue L_10ad748
 // --- basic block ---
-// 0x010ad0ec: 0x10ad0ec: lw    t0, 88(v1)
+// 0x010ad734: 0x10ad734: lw    t0, 88(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6201,7 +6201,7 @@ L_10ad0c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad0f0: 0x10ad0f0: lw    v1, 12(a2)
+// 0x010ad738: 0x10ad738: lw    v1, 12(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6210,26 +6210,26 @@ L_10ad0c8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ad0f4: 0x10ad0f4: sll   zero, zero, 0
-// 0x010ad0f8: 0x10ad0f8: bne   t0, v1, 0x10ad0bc addu  t1, a0, zero
+// 0x010ad73c: 0x10ad73c: sll   zero, zero, 0
+// 0x010ad740: 0x10ad740: bne   t0, v1, 0x10ad704 addu  t1, a0, zero
 	ldloc 7
 	ldloc 6
 	ldloc.1
 	stloc 9
-	bne.un L_10ad0bc
+	bne.un L_10ad704
 // --- basic block ---
-L_10ad100:
-// 0x010ad100: 0x10ad100: sll   v1, s1, 7
+L_10ad748:
+// 0x010ad748: 0x10ad748: sll   v1, s1, 7
 	ldloc 8
 	ldc.i4.7
 	shl
 	stloc 6
-// 0x010ad104: 0x10ad104: addu  v1, a0, v1
+// 0x010ad74c: 0x10ad74c: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x010ad108: 0x10ad108: lw    t1, 80(v1)
+// 0x010ad750: 0x10ad750: lw    t1, 80(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6238,7 +6238,7 @@ L_10ad100:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ad10c: 0x10ad10c: lw    t0, 4(a2)
+// 0x010ad754: 0x10ad754: lw    t0, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6247,13 +6247,13 @@ L_10ad100:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad110: 0x10ad110: sll   zero, zero, 0
-// 0x010ad114: 0x10ad114: bne   t1, t0, 0x10ad0b8 sll   zero, zero, 0
+// 0x010ad758: 0x10ad758: sll   zero, zero, 0
+// 0x010ad75c: 0x10ad75c: bne   t1, t0, 0x10ad700 sll   zero, zero, 0
 	ldloc 9
 	ldloc 7
-	bne.un L_10ad0b8
+	bne.un L_10ad700
 // --- basic block ---
-// 0x010ad11c: 0x10ad11c: lw    t0, 92(v1)
+// 0x010ad764: 0x10ad764: lw    t0, 92(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6262,7 +6262,7 @@ L_10ad100:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad120: 0x10ad120: lw    v1, 16(a2)
+// 0x010ad768: 0x10ad768: lw    v1, 16(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6271,23 +6271,23 @@ L_10ad100:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ad124: 0x10ad124: sll   zero, zero, 0
-// 0x010ad128: 0x10ad128: bne   t0, v1, 0x10ad0bc addu  t1, a0, zero
+// 0x010ad76c: 0x10ad76c: sll   zero, zero, 0
+// 0x010ad770: 0x10ad770: bne   t0, v1, 0x10ad704 addu  t1, a0, zero
 	ldloc 7
 	ldloc 6
 	ldloc.1
 	stloc 9
-	bne.un L_10ad0bc
+	bne.un L_10ad704
 // --- basic block ---
-// 0x010ad130: 0x10ad130: j	 0x10ad1c8 sll   s1, s1, 7
+// 0x010ad778: 0x10ad778: j	 0x10ad810 sll   s1, s1, 7
 	ldloc 8
 	ldc.i4.7
 	shl
 	stloc 8
-	br L_10ad1c8
+	br L_10ad810
 // --- basic block ---
-L_10ad138:
-// 0x010ad138: 0x10ad138: lw    t2, -4(t1)
+L_10ad780:
+// 0x010ad780: 0x10ad780: lw    t2, -4(t1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -6296,39 +6296,39 @@ L_10ad138:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ad13c: 0x10ad13c: addiu t0, t0, 1
+// 0x010ad784: 0x10ad784: addiu t0, t0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010ad140: 0x10ad140: addu  v1, v1, t2
+// 0x010ad788: 0x10ad788: addu  v1, v1, t2
 	ldloc 6
 	ldloc 12
 	add
 	stloc 6
-L_10ad144:
-// 0x010ad144: 0x10ad144: slt   t2, t0, v0
+L_10ad78c:
+// 0x010ad78c: 0x10ad78c: slt   t2, t0, v0
 	ldloc 7
 	ldloc 10
 	clt
 	stloc 12
-// 0x010ad148: 0x10ad148: bne   t2, zero, 0x10ad138 addiu t1, t1, 128
+// 0x010ad790: 0x10ad790: bne   t2, zero, 0x10ad780 addiu t1, t1, 128
 	ldloc 12
 	ldloc 9
 	ldc.i4 128
 	add
 	stloc 9
-	brtrue L_10ad138
+	brtrue L_10ad780
 // --- basic block ---
-// 0x010ad150: 0x10ad150: addiu t0, v0, 1
+// 0x010ad798: 0x10ad798: addiu t0, v0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010ad154: 0x10ad154: addiu t1, zero, 15
+// 0x010ad79c: 0x10ad79c: addiu t1, zero, 15
 	ldc.i4.s 15
 	stloc 9
-// 0x010ad158: 0x10ad158: sw    t0, 1920(a0)
+// 0x010ad7a0: 0x10ad7a0: sw    t0, 1920(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6337,34 +6337,34 @@ L_10ad144:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad15c: 0x10ad15c: beq   t0, t1, 0x10ad1b4 addiu v0, zero, -1
+// 0x010ad7a4: 0x10ad7a4: beq   t0, t1, 0x10ad7fc addiu v0, zero, -1
 	ldloc 7
 	ldloc 9
 	ldc.i4.m1
 	stloc 10
-	beq  L_10ad1b4
+	beq  L_10ad7fc
 // --- basic block ---
-// 0x010ad164: 0x10ad164: sll   s1, s1, 7
+// 0x010ad7ac: 0x10ad7ac: sll   s1, s1, 7
 	ldloc 8
 	ldc.i4.7
 	shl
 	stloc 8
-// 0x010ad168: 0x10ad168: addu  s1, a0, s1
+// 0x010ad7b0: 0x10ad7b0: addu  s1, a0, s1
 	ldloc.1
 	ldloc 8
 	add
 	stloc 8
-// 0x010ad16c: 0x10ad16c: subu  a1, a1, v1
+// 0x010ad7b4: 0x10ad7b4: subu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-// 0x010ad170: 0x10ad170: addiu s0, s1, 128
+// 0x010ad7b8: 0x10ad7b8: addiu s0, s1, 128
 	ldloc 8
 	ldc.i4 128
 	add
 	stloc 11
-// 0x010ad174: 0x10ad174: sw    a1, 124(s0)
+// 0x010ad7bc: 0x10ad7bc: sw    a1, 124(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6373,18 +6373,18 @@ L_10ad144:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010ad178: 0x10ad178: addiu a0, s1, 204
+// 0x010ad7c0: 0x10ad7c0: addiu a0, s1, 204
 	ldloc 8
 	ldc.i4 204
 	add
 	stloc.1
-// 0x010ad17c: 0x10ad17c: addu  a1, a2, zero
+// 0x010ad7c4: 0x10ad7c4: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x010ad180: 0x10ad180: addiu a2, zero, 48
+// 0x010ad7c8: 0x10ad7c8: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010ad184: 0x10ad184: jal   0x1001800 sw    a3, 16(sp)
+// 0x010ad7cc: 0x10ad7cc: jal   0x1001800 sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6402,7 +6402,7 @@ L_10ad144:
 	stloc 6
 	stloc 10
 // --- basic block ---
-// 0x010ad18c: 0x10ad18c: lw    a1, 56(sp)
+// 0x010ad7d4: 0x10ad7d4: lw    a1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6411,10 +6411,10 @@ L_10ad144:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad190: 0x10ad190: addu  a0, s0, zero
+// 0x010ad7d8: 0x10ad7d8: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010ad194: 0x10ad194: jal   0x1001800 addiu a2, zero, 76
+// 0x010ad7dc: 0x10ad7dc: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -6426,7 +6426,7 @@ L_10ad144:
 	stloc 6
 	stloc 10
 // --- basic block ---
-// 0x010ad19c: 0x10ad19c: lw    a3, 16(sp)
+// 0x010ad7e4: 0x10ad7e4: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6435,10 +6435,10 @@ L_10ad144:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ad1a0: 0x10ad1a0: addiu v0, zero, 1
+// 0x010ad7e8: 0x10ad7e8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x010ad1a4: 0x10ad1a4: sw    a3, 28(s0)
+// 0x010ad7ec: 0x10ad7ec: sw    a3, 28(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6447,7 +6447,7 @@ L_10ad144:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010ad1a8: 0x10ad1a8: sw    v0, 128(s1)
+// 0x010ad7f0: 0x10ad7f0: sw    v0, 128(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6456,7 +6456,7 @@ L_10ad144:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ad1ac: 0x10ad1ac: sw    a3, 32(s0)
+// 0x010ad7f4: 0x10ad7f4: sw    a3, 32(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6465,13 +6465,13 @@ L_10ad144:
 	add
 	ldloc 4
 	stelem.i4
-L_10ad1b0:
-// 0x010ad1b0: 0x10ad1b0: addu  v0, zero, zero
+L_10ad7f8:
+// 0x010ad7f8: 0x10ad7f8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_10ad1b4:
-// 0x010ad1b4: 0x10ad1b4: lw    ra, 36(sp)
-// 0x010ad1b8: 0x10ad1b8: lw    s1, 32(sp)
+L_10ad7fc:
+// 0x010ad7fc: 0x10ad7fc: lw    ra, 36(sp)
+// 0x010ad800: 0x10ad800: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6480,7 +6480,7 @@ L_10ad1b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ad1bc: 0x10ad1bc: lw    s0, 28(sp)
+// 0x010ad804: 0x10ad804: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6489,20 +6489,20 @@ L_10ad1b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ad1c0: 0x10ad1c0: jr    ra addiu sp, sp, 40
+// 0x010ad808: 0x10ad808: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10ad1c8:
-// 0x010ad1c8: 0x10ad1c8: addu  a0, a0, s1
+L_10ad810:
+// 0x010ad810: 0x10ad810: addu  a0, a0, s1
 	ldloc.1
 	ldloc 8
 	add
 	stloc.1
-// 0x010ad1cc: 0x10ad1cc: j	 0x10ad1b0 sw    a3, 32(a0)
+// 0x010ad814: 0x10ad814: j	 0x10ad7f8 sw    a3, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6511,14 +6511,14 @@ L_10ad1c8:
 	add
 	ldloc 4
 	stelem.i4
-	br L_10ad1b0
+	br L_10ad7f8
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 10
 	ret
 }
-.method public static int32 editor_track_known_resolve_10ad1d4()
+.method public static int32 editor_track_known_resolve_10ad81c()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6535,25 +6535,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ad1d4: 0x10ad1d4: lui   v0, 0x90000
+// 0x010ad81c: 0x10ad81c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010ad1d8: 0x10ad1d8: lw    v0, -13136(v0)
+// 0x010ad820: 0x10ad820: lw    v0, -12672(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc.0
-// 0x010ad1dc: 0x10ad1dc: sll   zero, zero, 0
-// 0x010ad1e0: 0x10ad1e0: xori  v0, v0, 1
+// 0x010ad824: 0x10ad824: sll   zero, zero, 0
+// 0x010ad828: 0x10ad828: xori  v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	xor
 	stloc.0
-// 0x010ad1e4: 0x10ad1e4: jr    ra sltiu v0, v0, 1
+// 0x010ad82c: 0x10ad82c: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -6563,7 +6563,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_track_known_reset_resolve_10ad1ec()
+.method public static int32 editor_track_known_reset_resolve_10ad834()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6580,15 +6580,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ad1ec: 0x10ad1ec: lui   v0, 0x90000
+// 0x010ad834: 0x10ad834: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010ad1f0: 0x10ad1f0: jr    ra sw    zero, -13136(v0)
+// 0x010ad838: 0x10ad838: jr    ra sw    zero, -12672(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6597,7 +6597,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_track_known_locate_point_10ad1f8(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_known_locate_point_10ad840(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 s4,int32 s1,int32 s7,int32 s0,int32 t1,int32 s3,int32 t0,int32 s2,int32 s8,int32 s5,int32 s6,int32 t2,int32 t3,int32 ra,int32 t4)
@@ -6677,12 +6677,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ad1f8: 0x10ad1f8: addiu sp, sp, -312
+// 0x010ad840: 0x10ad840: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x010ad1fc: 0x10ad1fc: sw    s2, 280(sp)
+// 0x010ad844: 0x10ad844: sw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6691,11 +6691,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010ad200: 0x10ad200: addu  s2, a0, zero
+// 0x010ad848: 0x10ad848: addu  s2, a0, zero
 	ldloc.1
 	stloc 16
-// 0x010ad204: 0x10ad204: sw    ra, 308(sp)
-// 0x010ad208: 0x10ad208: sw    s6, 296(sp)
+// 0x010ad84c: 0x10ad84c: sw    ra, 308(sp)
+// 0x010ad850: 0x10ad850: sw    s6, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6704,7 +6704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010ad20c: 0x10ad20c: sw    s5, 292(sp)
+// 0x010ad854: 0x10ad854: sw    s5, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6713,7 +6713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010ad210: 0x10ad210: sw    s4, 288(sp)
+// 0x010ad858: 0x10ad858: sw    s4, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6722,7 +6722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ad214: 0x10ad214: sw    s3, 284(sp)
+// 0x010ad85c: 0x10ad85c: sw    s3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6731,7 +6731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ad218: 0x10ad218: sw    s1, 276(sp)
+// 0x010ad860: 0x10ad860: sw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6740,7 +6740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ad21c: 0x10ad21c: sw    s0, 272(sp)
+// 0x010ad864: 0x10ad864: sw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6749,13 +6749,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ad220: 0x10ad220: addu  s6, a1, zero
+// 0x010ad868: 0x10ad868: addu  s6, a1, zero
 	ldloc.2
 	stloc 19
-// 0x010ad224: 0x10ad224: addu  s1, a2, zero
+// 0x010ad86c: 0x10ad86c: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010ad228: 0x10ad228: sw    s8, 304(sp)
+// 0x010ad870: 0x10ad870: sw    s8, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6764,7 +6764,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010ad22c: 0x10ad22c: sw    s7, 300(sp)
+// 0x010ad874: 0x10ad874: sw    s7, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6773,7 +6773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ad230: 0x10ad230: lw    s3, 328(sp)
+// 0x010ad878: 0x10ad878: lw    s3, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6782,7 +6782,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ad234: 0x10ad234: lw    s5, 332(sp)
+// 0x010ad87c: 0x10ad87c: lw    s5, 332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6791,19 +6791,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010ad238: 0x10ad238: jal   0x102be38 addu  s0, a3, zero
+// 0x010ad880: 0x10ad880: jal   0x102be48 addu  s0, a3, zero
 	ldloc 4
 	stloc 12
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x010ad240: 0x10ad240: addu  a0, s2, zero
+// 0x010ad888: 0x10ad888: addu  a0, s2, zero
 	ldloc 16
 	stloc.1
-// 0x010ad244: 0x10ad244: lui   s4, 0x90000
+// 0x010ad88c: 0x10ad88c: lui   s4, 0x90000
 	ldc.i4 589824
 	stloc 9
-// 0x010ad248: 0x10ad248: jal   0x10b07a0 sw    v0, 44(sp)
+// 0x010ad890: 0x10ad890: jal   0x10b0de8 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6813,10 +6813,10 @@ __CIBYL_javamethod_begin:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ad250: 0x10ad250: sw    v0, 244(sp)
+// 0x010ad898: 0x10ad898: sw    v0, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6825,62 +6825,62 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad254: 0x10ad254: lw    v0, -13136(s4)
+// 0x010ad89c: 0x10ad89c: lw    v0, -12672(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad258: 0x10ad258: sll   zero, zero, 0
-// 0x010ad25c: 0x10ad25c: slti  v0, v0, 2
+// 0x010ad8a0: 0x10ad8a0: sll   zero, zero, 0
+// 0x010ad8a4: 0x10ad8a4: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010ad260: 0x10ad260: bne   v0, zero, 0x10ad844 lui   v0, 0x90000
+// 0x010ad8a8: 0x10ad8a8: bne   v0, zero, 0x10ade8c lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brtrue L_10ad844
+	brtrue L_10ade8c
 // --- basic block ---
-// 0x010ad268: 0x10ad268: jal   0x102be38 sll   zero, zero, 0
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+// 0x010ad8b0: 0x10ad8b0: jal   0x102be48 sll   zero, zero, 0
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x010ad270: 0x10ad270: lw    a1, -13136(s4)
+// 0x010ad8b8: 0x10ad8b8: lw    a1, -12672(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad274: 0x10ad274: addiu a0, zero, 1928
+// 0x010ad8bc: 0x10ad8bc: addiu a0, zero, 1928
 	ldc.i4 1928
 	stloc.1
-// 0x010ad278: 0x10ad278: mult  a1, a0
+// 0x010ad8c0: 0x10ad8c0: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 8
-// 0x010ad27c: 0x10ad27c: addiu s8, a1, -1
+// 0x010ad8c4: 0x10ad8c4: addiu s8, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 17
-// 0x010ad280: 0x10ad280: lui   v1, 0x90000
+// 0x010ad8c8: 0x10ad8c8: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010ad284: 0x10ad284: addiu v1, v1, -32416
+// 0x010ad8cc: 0x10ad8cc: addiu v1, v1, -31952
 	ldloc 7
-	ldc.i4 -32416
+	ldc.i4 -31952
 	add
 	stloc 7
-// 0x010ad288: 0x10ad288: sw    v0, 56(sp)
+// 0x010ad8d0: 0x10ad8d0: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6889,10 +6889,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad28c: 0x10ad28c: addu  s7, v1, zero
+// 0x010ad8d4: 0x10ad8d4: addu  s7, v1, zero
 	ldloc 7
 	stloc 11
-// 0x010ad290: 0x10ad290: sw    s1, 236(sp)
+// 0x010ad8d8: 0x10ad8d8: sw    s1, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6901,15 +6901,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ad294: 0x10ad294: mflo  lo
+// 0x010ad8dc: 0x10ad8dc: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010ad298: 0x10ad298: addu  a1, v1, a1
+// 0x010ad8e0: 0x10ad8e0: addu  a1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc.2
-// 0x010ad29c: 0x10ad29c: sw    a1, 224(sp)
+// 0x010ad8e4: 0x10ad8e4: sw    a1, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6918,30 +6918,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010ad2a0: 0x10ad2a0: mult  s8, a0
+// 0x010ad8e8: 0x10ad8e8: mult  s8, a0
 	ldloc 17
 	ldloc.1
 	mul
 	stloc 8
-// 0x010ad2a4: 0x10ad2a4: mflo  lo
+// 0x010ad8ec: 0x10ad8ec: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010ad2a8: 0x10ad2a8: addiu v0, a0, 1920
+// 0x010ad8f0: 0x10ad8f0: addiu v0, a0, 1920
 	ldloc.1
 	ldc.i4 1920
 	add
 	stloc 5
-// 0x010ad2ac: 0x10ad2ac: addu  v0, v1, v0
+// 0x010ad8f4: 0x10ad8f4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010ad2b0: 0x10ad2b0: addu  v1, v1, a0
+// 0x010ad8f8: 0x10ad8f8: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x010ad2b4: 0x10ad2b4: sw    v0, 220(sp)
+// 0x010ad8fc: 0x10ad8fc: sw    v0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6950,7 +6950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad2b8: 0x10ad2b8: j	 0x10ad574 sw    v1, 216(sp)
+// 0x010ad900: 0x10ad900: j	 0x10adbbc sw    v1, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6959,18 +6959,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10ad574
+	br L_10adbbc
 // --- basic block ---
-L_10ad2c0:
-// 0x010ad2c0: 0x10ad2c0: addiu v0, zero, 1928
+L_10ad908:
+// 0x010ad908: 0x10ad908: addiu v0, zero, 1928
 	ldc.i4 1928
 	stloc 5
-// 0x010ad2c4: 0x10ad2c4: mult  s8, v0
+// 0x010ad90c: 0x10ad90c: mult  s8, v0
 	ldloc 17
 	ldloc 5
 	mul
 	stloc 8
-// 0x010ad2c8: 0x10ad2c8: lw    v1, 220(sp)
+// 0x010ad910: 0x10ad910: lw    v1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6979,27 +6979,27 @@ L_10ad2c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad2cc: 0x10ad2cc: lui   a2, 0x90000
+// 0x010ad914: 0x10ad914: lui   a2, 0x90000
 	ldc.i4 589824
 	stloc.3
-// 0x010ad2d0: 0x10ad2d0: lw    v0, 0(v1)
+// 0x010ad918: 0x10ad918: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ad2d4: 0x10ad2d4: addiu v1, sp, 52
+// 0x010ad91c: 0x10ad91c: addiu v1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 7
-// 0x010ad2d8: 0x10ad2d8: addiu v0, v0, -1
+// 0x010ad920: 0x10ad920: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010ad2dc: 0x10ad2dc: sw    v1, 24(sp)
+// 0x010ad924: 0x10ad924: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7008,17 +7008,17 @@ L_10ad2c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad2e0: 0x10ad2e0: sll   v0, v0, 7
+// 0x010ad928: 0x10ad928: sll   v0, v0, 7
 	ldloc 5
 	ldc.i4.7
 	shl
 	stloc 5
-// 0x010ad2e4: 0x10ad2e4: addiu a2, a2, -13132
+// 0x010ad92c: 0x10ad92c: addiu a2, a2, -12668
 	ldloc.3
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc.3
-// 0x010ad2e8: 0x10ad2e8: sw    a2, 16(sp)
+// 0x010ad930: 0x10ad930: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7027,18 +7027,18 @@ L_10ad2c0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010ad2ec: 0x10ad2ec: addiu a2, sp, 56
+// 0x010ad934: 0x10ad934: addiu a2, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.3
-// 0x010ad2f0: 0x10ad2f0: addu  a0, s6, zero
+// 0x010ad938: 0x10ad938: addu  a0, s6, zero
 	ldloc 19
 	stloc.1
-// 0x010ad2f4: 0x10ad2f4: mflo  lo
+// 0x010ad93c: 0x10ad93c: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x010ad2f8: 0x10ad2f8: sw    t1, 20(sp)
+// 0x010ad940: 0x10ad940: sw    t1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7047,27 +7047,27 @@ L_10ad2c0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ad2fc: 0x10ad2fc: addu  v0, v0, v1
+// 0x010ad944: 0x10ad944: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010ad300: 0x10ad300: addu  v1, s7, v0
+// 0x010ad948: 0x10ad948: addu  v1, s7, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 7
-// 0x010ad304: 0x10ad304: addiu v1, v1, 76
+// 0x010ad94c: 0x10ad94c: addiu v1, v1, 76
 	ldloc 7
 	ldc.i4.s 76
 	add
 	stloc 7
-// 0x010ad308: 0x10ad308: addu  v0, s7, v0
+// 0x010ad950: 0x10ad950: addu  v0, s7, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x010ad30c: 0x10ad30c: sw    a2, 28(sp)
+// 0x010ad954: 0x10ad954: sw    a2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7076,23 +7076,23 @@ L_10ad2c0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010ad310: 0x10ad310: addiu t1, sp, 60
+// 0x010ad958: 0x10ad958: addiu t1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 13
-// 0x010ad314: 0x10ad314: addiu a1, sp, 64
+// 0x010ad95c: 0x10ad95c: addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x010ad318: 0x10ad318: addu  a2, v0, zero
+// 0x010ad960: 0x10ad960: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010ad31c: 0x10ad31c: addu  a3, v1, zero
+// 0x010ad964: 0x10ad964: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010ad320: 0x10ad320: sw    t1, 32(sp)
+// 0x010ad968: 0x10ad968: sw    t1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7101,7 +7101,7 @@ L_10ad2c0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ad324: 0x10ad324: sw    v1, 232(sp)
+// 0x010ad96c: 0x10ad96c: sw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7110,7 +7110,7 @@ L_10ad2c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad328: 0x10ad328: jal   0x10af7e4 sw    v0, 228(sp)
+// 0x010ad970: 0x10ad970: jal   0x10afe2c sw    v0, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7124,12 +7124,12 @@ L_10ad2c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_find_street_10af7e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_find_street_10afe2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad330: 0x10ad330: lw    a0, 56(sp)
+// 0x010ad978: 0x10ad978: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7138,7 +7138,7 @@ L_10ad2c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad334: 0x10ad334: jal   0x102be58 sw    v0, 240(sp)
+// 0x010ad97c: 0x10ad97c: jal   0x102be68 sw    v0, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7148,35 +7148,35 @@ L_10ad2c0:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ad33c: 0x10ad33c: bne   v0, zero, 0x10ad398 lui   a0, 0x90000
+// 0x010ad984: 0x10ad984: bne   v0, zero, 0x10ad9e0 lui   a0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc.1
-	brtrue L_10ad398
+	brtrue L_10ad9e0
 // --- basic block ---
-// 0x010ad344: 0x10ad344: lw    a2, -13136(a0)
+// 0x010ad98c: 0x10ad98c: lw    a2, -12672(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad348: 0x10ad348: addiu t1, zero, 1
+// 0x010ad990: 0x10ad990: addiu t1, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x010ad34c: 0x10ad34c: bne   a2, t1, 0x10ad360 addiu v0, zero, 1928
+// 0x010ad994: 0x10ad994: bne   a2, t1, 0x10ad9a8 addiu v0, zero, 1928
 	ldloc.3
 	ldloc 13
 	ldc.i4 1928
 	stloc 5
-	bne.un L_10ad360
+	bne.un L_10ad9a8
 // --- basic block ---
-// 0x010ad354: 0x10ad354: lw    s1, 236(sp)
+// 0x010ad99c: 0x10ad99c: lw    s1, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7185,7 +7185,7 @@ L_10ad2c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ad358: 0x10ad358: j	 0x10ad810 sw    t1, 1924(s7)
+// 0x010ad9a0: 0x10ad9a0: j	 0x10ade58 sw    t1, 1924(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7194,25 +7194,25 @@ L_10ad2c0:
 	add
 	ldloc 13
 	stelem.i4
-	br L_10ad810
+	br L_10ade58
 // --- basic block ---
-L_10ad360:
-// 0x010ad360: 0x10ad360: addiu a2, a2, -1
+L_10ad9a8:
+// 0x010ad9a8: 0x10ad9a8: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x010ad364: 0x10ad364: subu  a2, a2, s8
+// 0x010ad9ac: 0x10ad9ac: subu  a2, a2, s8
 	ldloc.3
 	ldloc 17
 	sub
 	stloc.3
-// 0x010ad368: 0x10ad368: mult  a2, v0
+// 0x010ad9b0: 0x10ad9b0: mult  a2, v0
 	ldloc.3
 	ldloc 5
 	mul
 	stloc 8
-// 0x010ad36c: 0x10ad36c: lw    a0, 216(sp)
+// 0x010ad9b4: 0x10ad9b4: lw    a0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7221,7 +7221,7 @@ L_10ad360:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad370: 0x10ad370: lw    a1, 224(sp)
+// 0x010ad9b8: 0x10ad9b8: lw    a1, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7230,10 +7230,10 @@ L_10ad360:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad374: 0x10ad374: mflo  lo
+// 0x010ad9bc: 0x10ad9bc: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x010ad378: 0x10ad378: jal   0x100186c sll   zero, zero, 0
+// 0x010ad9c0: 0x10ad9c0: jal   0x100186c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -7243,37 +7243,37 @@ L_10ad360:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad380: 0x10ad380: lui   v1, 0x90000
+// 0x010ad9c8: 0x10ad9c8: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010ad384: 0x10ad384: lw    v0, -13136(v1)
+// 0x010ad9cc: 0x10ad9cc: lw    v0, -12672(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad388: 0x10ad388: sll   zero, zero, 0
-// 0x010ad38c: 0x10ad38c: addiu v0, v0, -1
+// 0x010ad9d0: 0x10ad9d0: sll   zero, zero, 0
+// 0x010ad9d4: 0x10ad9d4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010ad390: 0x10ad390: j	 0x10ad54c sw    v0, -13136(v1)
+// 0x010ad9d8: 0x10ad9d8: j	 0x10adb94 sw    v0, -12672(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldloc 5
 	stelem.i4
-	br L_10ad54c
+	br L_10adb94
 // --- basic block ---
-L_10ad398:
-// 0x010ad398: 0x10ad398: lw    a0, 60(sp)
+L_10ad9e0:
+// 0x010ad9e0: 0x10ad9e0: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7282,18 +7282,18 @@ L_10ad398:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad39c: 0x10ad39c: jal   0x102be58 sll   zero, zero, 0
+// 0x010ad9e4: 0x10ad9e4: jal   0x102be68 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ad3a4: 0x10ad3a4: beq   v0, zero, 0x10ad518 addiu v0, zero, 48
+// 0x010ad9ec: 0x10ad9ec: beq   v0, zero, 0x10adb60 addiu v0, zero, 48
 	ldloc 5
 	ldc.i4.s 48
 	stloc 5
-	brfalse L_10ad518
+	brfalse L_10adb60
 // --- basic block ---
-// 0x010ad3ac: 0x10ad3ac: lw    a1, 52(sp)
+// 0x010ad9f4: 0x10ad9f4: lw    a1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7302,21 +7302,21 @@ L_10ad398:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad3b0: 0x10ad3b0: sll   zero, zero, 0
-// 0x010ad3b4: 0x10ad3b4: mult  a1, v0
+// 0x010ad9f8: 0x10ad9f8: sll   zero, zero, 0
+// 0x010ad9fc: 0x10ad9fc: mult  a1, v0
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 8
-// 0x010ad3b8: 0x10ad3b8: lui   v1, 0x90000
+// 0x010ada00: 0x10ada00: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010ad3bc: 0x10ad3bc: addiu v1, v1, -13132
+// 0x010ada04: 0x10ada04: addiu v1, v1, -12668
 	ldloc 7
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 7
-// 0x010ad3c0: 0x10ad3c0: lw    a0, 232(sp)
+// 0x010ada08: 0x10ada08: lw    a0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7325,10 +7325,10 @@ L_10ad398:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad3c4: 0x10ad3c4: mflo  lo
+// 0x010ada0c: 0x10ada0c: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010ad3c8: 0x10ad3c8: jal   0x1014b10 addu  a1, v1, a1
+// 0x010ada10: 0x10ada10: jal   0x1014b20 addu  a1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
@@ -7338,21 +7338,21 @@ L_10ad398:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad3d0: 0x10ad3d0: bne   v0, zero, 0x10ad518 addu  v1, zero, zero
+// 0x010ada18: 0x10ada18: bne   v0, zero, 0x10adb60 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10ad518
+	brtrue L_10adb60
 // --- basic block ---
-// 0x010ad3d8: 0x10ad3d8: lui   s1, 0x90000
+// 0x010ada20: 0x10ada20: lui   s1, 0x90000
 	ldc.i4 589824
 	stloc 10
-// 0x010ad3dc: 0x10ad3dc: lw    s4, 228(sp)
+// 0x010ada24: 0x10ada24: lw    s4, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7361,15 +7361,15 @@ L_10ad398:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ad3e0: 0x10ad3e0: j	 0x10ad504 addiu s1, s1, -13132
+// 0x010ada28: 0x10ada28: j	 0x10adb4c addiu s1, s1, -12668
 	ldloc 10
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 10
-	br L_10ad504
+	br L_10adb4c
 // --- basic block ---
-L_10ad3e8:
-// 0x010ad3e8: 0x10ad3e8: lw    v0, 52(sp)
+L_10ada30:
+// 0x010ada30: 0x10ada30: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7378,15 +7378,15 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad3ec: 0x10ad3ec: sll   zero, zero, 0
-// 0x010ad3f0: 0x10ad3f0: beq   v1, v0, 0x10ad4fc addu  a3, s1, zero
+// 0x010ada34: 0x10ada34: sll   zero, zero, 0
+// 0x010ada38: 0x10ada38: beq   v1, v0, 0x10adb44 addu  a3, s1, zero
 	ldloc 7
 	ldloc 5
 	ldloc 10
 	stloc 4
-	beq  L_10ad4fc
+	beq  L_10adb44
 // --- basic block ---
-// 0x010ad3f8: 0x10ad3f8: lw    v0, 16(s6)
+// 0x010ada40: 0x10ada40: lw    v0, 16(s6)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
@@ -7395,7 +7395,7 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad3fc: 0x10ad3fc: lw    a1, 228(sp)
+// 0x010ada44: 0x10ada44: lw    a1, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7404,7 +7404,7 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad400: 0x10ad400: lw    a2, 232(sp)
+// 0x010ada48: 0x10ada48: lw    a2, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7413,12 +7413,12 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad404: 0x10ad404: addiu a0, sp, 140
+// 0x010ada4c: 0x10ada4c: addiu a0, sp, 140
 	ldloc.0
 	ldc.i4 140
 	add
 	stloc.1
-// 0x010ad408: 0x10ad408: sw    v1, 264(sp)
+// 0x010ada50: 0x10ada50: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7427,7 +7427,7 @@ L_10ad3e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad40c: 0x10ad40c: sw    v0, 20(sp)
+// 0x010ada54: 0x10ada54: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7436,7 +7436,7 @@ L_10ad3e8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad410: 0x10ad410: jal   0x102a3cc sw    zero, 16(sp)
+// 0x010ada58: 0x10ada58: jal   0x102a3dc sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7450,15 +7450,15 @@ L_10ad3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad418: 0x10ad418: addu  a0, v0, zero
+// 0x010ada60: 0x10ada60: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ad41c: 0x10ad41c: jal   0x102be58 sw    v0, 260(sp)
+// 0x010ada64: 0x10ada64: jal   0x102be68 sw    v0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7468,10 +7468,10 @@ L_10ad3e8:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ad424: 0x10ad424: lw    v1, 264(sp)
+// 0x010ada6c: 0x10ada6c: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7480,7 +7480,7 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad428: 0x10ad428: lw    a3, 260(sp)
+// 0x010ada70: 0x10ada70: lw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7489,11 +7489,11 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ad42c: 0x10ad42c: beq   v0, zero, 0x10ad4fc sll   zero, zero, 0
+// 0x010ada74: 0x10ada74: beq   v0, zero, 0x10adb44 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ad4fc
+	brfalse L_10adb44
 // --- basic block ---
-// 0x010ad434: 0x10ad434: lw    v0, 76(s4)
+// 0x010ada7c: 0x10ada7c: lw    v0, 76(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7502,26 +7502,26 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad438: 0x10ad438: lw    a0, 0(s1)
+// 0x010ada80: 0x10ada80: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010ad43c: 0x10ad43c: sll   zero, zero, 0
-// 0x010ad440: 0x10ad440: bne   v0, a0, 0x10ae020 lui   a2, 0x90000
+// 0x010ada84: 0x10ada84: sll   zero, zero, 0
+// 0x010ada88: 0x10ada88: bne   v0, a0, 0x10ae668 lui   a2, 0x90000
 	ldloc 5
 	ldloc.1
 	ldc.i4 589824
 	stloc.3
-	bne.un L_10ae020
+	bne.un L_10ae668
 // --- basic block ---
-// 0x010ad448: 0x10ad448: bne   v0, zero, 0x10ad464 sll   zero, zero, 0
+// 0x010ada90: 0x10ada90: bne   v0, zero, 0x10adaac sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ad464
+	brtrue L_10adaac
 // --- basic block ---
-// 0x010ad450: 0x10ad450: lw    a0, 88(s4)
+// 0x010ada98: 0x10ada98: lw    a0, 88(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7530,7 +7530,7 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad454: 0x10ad454: lw    v0, 12(s1)
+// 0x010ada9c: 0x10ada9c: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7539,14 +7539,14 @@ L_10ad3e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad458: 0x10ad458: sll   zero, zero, 0
-// 0x010ad45c: 0x10ad45c: bne   a0, v0, 0x10ae020 sll   zero, zero, 0
+// 0x010adaa0: 0x10adaa0: sll   zero, zero, 0
+// 0x010adaa4: 0x10adaa4: bne   a0, v0, 0x10ae668 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_10ae020
+	bne.un L_10ae668
 // --- basic block ---
-L_10ad464:
-// 0x010ad464: 0x10ad464: lw    a0, 80(s4)
+L_10adaac:
+// 0x010adaac: 0x10adaac: lw    a0, 80(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7555,7 +7555,7 @@ L_10ad464:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad468: 0x10ad468: lw    v0, 4(s1)
+// 0x010adab0: 0x10adab0: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7564,13 +7564,13 @@ L_10ad464:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad46c: 0x10ad46c: sll   zero, zero, 0
-// 0x010ad470: 0x10ad470: bne   a0, v0, 0x10ae01c sll   zero, zero, 0
+// 0x010adab4: 0x10adab4: sll   zero, zero, 0
+// 0x010adab8: 0x10adab8: bne   a0, v0, 0x10ae664 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_10ae01c
+	bne.un L_10ae664
 // --- basic block ---
-// 0x010ad478: 0x10ad478: lw    a0, 92(s4)
+// 0x010adac0: 0x10adac0: lw    a0, 92(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7579,7 +7579,7 @@ L_10ad464:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad47c: 0x10ad47c: lw    v0, 16(s1)
+// 0x010adac4: 0x10adac4: lw    v0, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7588,29 +7588,29 @@ L_10ad464:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad480: 0x10ad480: sll   zero, zero, 0
-// 0x010ad484: 0x10ad484: bne   a0, v0, 0x10ae01c sll   zero, zero, 0
+// 0x010adac8: 0x10adac8: sll   zero, zero, 0
+// 0x010adacc: 0x10adacc: bne   a0, v0, 0x10ae664 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_10ae01c
+	bne.un L_10ae664
 // --- basic block ---
-// 0x010ad48c: 0x10ad48c: j	 0x10ad500 addiu v1, v1, 1
+// 0x010adad4: 0x10adad4: j	 0x10adb48 addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_10ad500
+	br L_10adb48
 // --- basic block ---
-L_10ad494:
-// 0x010ad494: 0x10ad494: addiu v0, zero, 1928
+L_10adadc:
+// 0x010adadc: 0x10adadc: addiu v0, zero, 1928
 	ldc.i4 1928
 	stloc 5
-// 0x010ad498: 0x10ad498: mult  a0, v0
+// 0x010adae0: 0x10adae0: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 8
-// 0x010ad49c: 0x10ad49c: lw    a1, 216(sp)
+// 0x010adae4: 0x10adae4: lw    a1, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7619,7 +7619,7 @@ L_10ad494:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad4a0: 0x10ad4a0: sw    v1, 264(sp)
+// 0x010adae8: 0x10adae8: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7628,7 +7628,7 @@ L_10ad494:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad4a4: 0x10ad4a4: sw    a3, 260(sp)
+// 0x010adaec: 0x10adaec: sw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7637,10 +7637,10 @@ L_10ad494:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010ad4a8: 0x10ad4a8: mflo  lo
+// 0x010adaf0: 0x10adaf0: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010ad4ac: 0x10ad4ac: jal   0x1001800 addu  a0, s7, a0
+// 0x010adaf4: 0x10adaf4: jal   0x1001800 addu  a0, s7, a0
 	ldloc 11
 	ldloc.1
 	add
@@ -7654,27 +7654,27 @@ L_10ad494:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad4b4: 0x10ad4b4: lui   a0, 0x90000
+// 0x010adafc: 0x10adafc: lui   a0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010ad4b8: 0x10ad4b8: lw    t0, -13136(a0)
+// 0x010adb00: 0x10adb00: lw    t0, -12672(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ad4bc: 0x10ad4bc: addiu v0, zero, 1928
+// 0x010adb04: 0x10adb04: addiu v0, zero, 1928
 	ldc.i4 1928
 	stloc 5
-// 0x010ad4c0: 0x10ad4c0: mult  t0, v0
+// 0x010adb08: 0x10adb08: mult  t0, v0
 	ldloc 15
 	ldloc 5
 	mul
 	stloc 8
-// 0x010ad4c4: 0x10ad4c4: lw    a3, 260(sp)
+// 0x010adb0c: 0x10adb0c: lw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7683,18 +7683,18 @@ L_10ad494:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ad4c8: 0x10ad4c8: addiu t1, sp, 140
+// 0x010adb10: 0x10adb10: addiu t1, sp, 140
 	ldloc.0
 	ldc.i4 140
 	add
 	stloc 13
-// 0x010ad4cc: 0x10ad4cc: addu  a1, s2, zero
+// 0x010adb14: 0x10adb14: addu  a1, s2, zero
 	ldloc 16
 	stloc.2
-// 0x010ad4d0: 0x10ad4d0: addu  a2, s1, zero
+// 0x010adb18: 0x10adb18: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x010ad4d4: 0x10ad4d4: sw    t0, 256(sp)
+// 0x010adb1c: 0x10adb1c: sw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7703,7 +7703,7 @@ L_10ad494:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010ad4d8: 0x10ad4d8: sw    t1, 16(sp)
+// 0x010adb20: 0x10adb20: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7712,10 +7712,10 @@ L_10ad494:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ad4dc: 0x10ad4dc: mflo  lo
+// 0x010adb24: 0x10adb24: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010ad4e0: 0x10ad4e0: jal   0x10ad09c addu  a0, s7, a0
+// 0x010adb28: 0x10adb28: jal   0x10ad6e4 addu  a0, s7, a0
 	ldloc 11
 	ldloc.1
 	add
@@ -7725,12 +7725,12 @@ L_10ad494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::resolve_add_10ad09c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::resolve_add_10ad6e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad4e8: 0x10ad4e8: lw    t0, 256(sp)
+// 0x010adb30: 0x10adb30: lw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7739,15 +7739,15 @@ L_10ad494:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ad4ec: 0x10ad4ec: lui   v0, 0x90000
+// 0x010adb34: 0x10adb34: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ad4f0: 0x10ad4f0: addiu t0, t0, 1
+// 0x010adb38: 0x10adb38: addiu t0, t0, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x010ad4f4: 0x10ad4f4: lw    v1, 264(sp)
+// 0x010adb3c: 0x10adb3c: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7756,29 +7756,29 @@ L_10ad494:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad4f8: 0x10ad4f8: sw    t0, -13136(v0)
+// 0x010adb40: 0x10adb40: sw    t0, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldloc 15
 	stelem.i4
-L_10ad4fc:
-// 0x010ad4fc: 0x10ad4fc: addiu v1, v1, 1
+L_10adb44:
+// 0x010adb44: 0x10adb44: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_10ad500:
-// 0x010ad500: 0x10ad500: addiu s1, s1, 48
+L_10adb48:
+// 0x010adb48: 0x10adb48: addiu s1, s1, 48
 	ldloc 10
 	ldc.i4.s 48
 	add
 	stloc 10
-L_10ad504:
-// 0x010ad504: 0x10ad504: lw    a0, 240(sp)
+L_10adb4c:
+// 0x010adb4c: 0x10adb4c: lw    a0, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7787,18 +7787,18 @@ L_10ad504:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad508: 0x10ad508: sll   zero, zero, 0
-// 0x010ad50c: 0x10ad50c: slt   v0, v1, a0
+// 0x010adb50: 0x10adb50: sll   zero, zero, 0
+// 0x010adb54: 0x10adb54: slt   v0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 5
-// 0x010ad510: 0x10ad510: bne   v0, zero, 0x10ad3e8 sll   zero, zero, 0
+// 0x010adb58: 0x10adb58: bne   v0, zero, 0x10ada30 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ad3e8
+	brtrue L_10ada30
 // --- basic block ---
-L_10ad518:
-// 0x010ad518: 0x10ad518: lw    a2, 52(sp)
+L_10adb60:
+// 0x010adb60: 0x10adb60: lw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7807,23 +7807,23 @@ L_10ad518:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad51c: 0x10ad51c: addiu v0, zero, 48
+// 0x010adb64: 0x10adb64: addiu v0, zero, 48
 	ldc.i4.s 48
 	stloc 5
-// 0x010ad520: 0x10ad520: mult  a2, v0
+// 0x010adb68: 0x10adb68: mult  a2, v0
 	ldloc.3
 	ldloc 5
 	mul
 	stloc 8
-// 0x010ad524: 0x10ad524: lui   t1, 0x90000
+// 0x010adb6c: 0x10adb6c: lui   t1, 0x90000
 	ldc.i4 589824
 	stloc 13
-// 0x010ad528: 0x10ad528: addiu t1, t1, -13132
+// 0x010adb70: 0x10adb70: addiu t1, t1, -12668
 	ldloc 13
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 13
-// 0x010ad52c: 0x10ad52c: lw    a0, 216(sp)
+// 0x010adb74: 0x10adb74: lw    a0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7832,7 +7832,7 @@ L_10ad518:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad530: 0x10ad530: lw    a3, 56(sp)
+// 0x010adb78: 0x10adb78: lw    a3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7841,15 +7841,15 @@ L_10ad518:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ad534: 0x10ad534: addiu v1, sp, 64
+// 0x010adb7c: 0x10adb7c: addiu v1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 7
-// 0x010ad538: 0x10ad538: addu  a1, s2, zero
+// 0x010adb80: 0x10adb80: addu  a1, s2, zero
 	ldloc 16
 	stloc.2
-// 0x010ad53c: 0x10ad53c: sw    v1, 16(sp)
+// 0x010adb84: 0x10adb84: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7858,10 +7858,10 @@ L_10ad518:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad540: 0x10ad540: mflo  lo
+// 0x010adb88: 0x10adb88: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x010ad544: 0x10ad544: jal   0x10ad09c addu  a2, t1, a2
+// 0x010adb8c: 0x10adb8c: jal   0x10ad6e4 addu  a2, t1, a2
 	ldloc 13
 	ldloc.3
 	add
@@ -7871,13 +7871,13 @@ L_10ad518:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::resolve_add_10ad09c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::resolve_add_10ad6e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ad54c:
-// 0x010ad54c: 0x10ad54c: lw    v0, 216(sp)
+L_10adb94:
+// 0x010adb94: 0x10adb94: lw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7886,7 +7886,7 @@ L_10ad54c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad550: 0x10ad550: lw    v1, 224(sp)
+// 0x010adb98: 0x10adb98: lw    v1, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7895,7 +7895,7 @@ L_10ad54c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad554: 0x10ad554: lw    a0, 220(sp)
+// 0x010adb9c: 0x10adb9c: lw    a0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7904,27 +7904,27 @@ L_10ad54c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad558: 0x10ad558: addiu v0, v0, -1928
+// 0x010adba0: 0x10adba0: addiu v0, v0, -1928
 	ldloc 5
 	ldc.i4 -1928
 	add
 	stloc 5
-// 0x010ad55c: 0x10ad55c: addiu v1, v1, -1928
+// 0x010adba4: 0x10adba4: addiu v1, v1, -1928
 	ldloc 7
 	ldc.i4 -1928
 	add
 	stloc 7
-// 0x010ad560: 0x10ad560: addiu a0, a0, -1928
+// 0x010adba8: 0x10adba8: addiu a0, a0, -1928
 	ldloc.1
 	ldc.i4 -1928
 	add
 	stloc.1
-// 0x010ad564: 0x10ad564: addiu s8, s8, -1
+// 0x010adbac: 0x10adbac: addiu s8, s8, -1
 	ldloc 17
 	ldc.i4.m1
 	add
 	stloc 17
-// 0x010ad568: 0x10ad568: sw    v0, 216(sp)
+// 0x010adbb0: 0x10adbb0: sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7933,7 +7933,7 @@ L_10ad54c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad56c: 0x10ad56c: sw    v1, 224(sp)
+// 0x010adbb4: 0x10adbb4: sw    v1, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7942,7 +7942,7 @@ L_10ad54c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad570: 0x10ad570: sw    a0, 220(sp)
+// 0x010adbb8: 0x10adbb8: sw    a0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7951,18 +7951,18 @@ L_10ad54c:
 	add
 	ldloc.1
 	stelem.i4
-L_10ad574:
-// 0x010ad574: 0x10ad574: bgez  s8, 0x10ad2c0 addiu t1, zero, 16
+L_10adbbc:
+// 0x010adbbc: 0x10adbbc: bgez  s8, 0x10ad908 addiu t1, zero, 16
 	ldloc 17
 	ldc.i4.s 16
 	stloc 13
 	ldc.i4.s 0
-	bge L_10ad2c0
+	bge L_10ad908
 // --- basic block ---
-// 0x010ad57c: 0x10ad57c: addu  v1, s7, zero
+// 0x010adbc4: 0x10adbc4: addu  v1, s7, zero
 	ldloc 11
 	stloc 7
-// 0x010ad580: 0x10ad580: lw    s1, 236(sp)
+// 0x010adbc8: 0x10adbc8: lw    s1, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7971,22 +7971,22 @@ L_10ad574:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ad584: 0x10ad584: addu  v0, zero, zero
+// 0x010adbcc: 0x10adbcc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010ad588: 0x10ad588: lui   a3, 0x90000
+// 0x010adbd0: 0x10adbd0: lui   a3, 0x90000
 	ldc.i4 589824
 	stloc 4
-// 0x010ad58c: 0x10ad58c: addiu s7, zero, 1928
+// 0x010adbd4: 0x10adbd4: addiu s7, zero, 1928
 	ldc.i4 1928
 	stloc 11
-// 0x010ad590: 0x10ad590: j	 0x10ad7f8 addu  s8, v1, zero
+// 0x010adbd8: 0x10adbd8: j	 0x10ade40 addu  s8, v1, zero
 	ldloc 7
 	stloc 17
-	br L_10ad7f8
+	br L_10ade40
 // --- basic block ---
-L_10ad598:
-// 0x010ad598: 0x10ad598: lw    t0, 1920(v1)
+L_10adbe0:
+// 0x010adbe0: 0x10adbe0: lw    t0, 1920(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7995,22 +7995,22 @@ L_10ad598:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ad59c: 0x10ad59c: addiu v0, v0, 1
+// 0x010adbe4: 0x10adbe4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010ad5a0: 0x10ad5a0: addiu t0, t0, -1
+// 0x010adbe8: 0x10adbe8: addiu t0, t0, -1
 	ldloc 15
 	ldc.i4.m1
 	add
 	stloc 15
-// 0x010ad5a4: 0x10ad5a4: sll   t0, t0, 7
+// 0x010adbec: 0x10adbec: sll   t0, t0, 7
 	ldloc 15
 	ldc.i4.7
 	shl
 	stloc 15
-// 0x010ad5a8: 0x10ad5a8: sw    v0, 216(sp)
+// 0x010adbf0: 0x10adbf0: sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8019,33 +8019,33 @@ L_10ad598:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad5ac: 0x10ad5ac: addu  s4, v0, zero
+// 0x010adbf4: 0x10adbf4: addu  s4, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010ad5b0: 0x10ad5b0: mflo  lo
+// 0x010adbf8: 0x10adbf8: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010ad5b4: 0x10ad5b4: addu  t0, t0, a0
+// 0x010adbfc: 0x10adbfc: addu  t0, t0, a0
 	ldloc 15
 	ldloc.1
 	add
 	stloc 15
-// 0x010ad5b8: 0x10ad5b8: addu  a0, s8, a0
+// 0x010adc00: 0x10adc00: addu  a0, s8, a0
 	ldloc 17
 	ldloc.1
 	add
 	stloc.1
-// 0x010ad5bc: 0x10ad5bc: addiu a0, a0, 28
+// 0x010adc04: 0x10adc04: addiu a0, a0, 28
 	ldloc.1
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x010ad5c0: 0x10ad5c0: addu  t0, s8, t0
+// 0x010adc08: 0x10adc08: addu  t0, s8, t0
 	ldloc 17
 	ldloc 15
 	add
 	stloc 15
-// 0x010ad5c4: 0x10ad5c4: j	 0x10ad7dc sw    a0, 220(sp)
+// 0x010adc0c: 0x10adc0c: j	 0x10ade24 sw    a0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8054,10 +8054,10 @@ L_10ad598:
 	add
 	ldloc.1
 	stelem.i4
-	br L_10ad7dc
+	br L_10ade24
 // --- basic block ---
-L_10ad5cc:
-// 0x010ad5cc: 0x10ad5cc: lw    t1, 76(t0)
+L_10adc14:
+// 0x010adc14: 0x10adc14: lw    t1, 76(t0)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -8066,15 +8066,15 @@ L_10ad5cc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ad5d0: 0x10ad5d0: mflo  lo
+// 0x010adc18: 0x10adc18: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010ad5d4: 0x10ad5d4: addu  v0, a1, s8
+// 0x010adc1c: 0x10adc1c: addu  v0, a1, s8
 	ldloc.2
 	ldloc 17
 	add
 	stloc 5
-// 0x010ad5d8: 0x10ad5d8: lw    v0, 1920(v0)
+// 0x010adc20: 0x10adc20: lw    v0, 1920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8083,28 +8083,28 @@ L_10ad5cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad5dc: 0x10ad5dc: sll   zero, zero, 0
-// 0x010ad5e0: 0x10ad5e0: addiu a0, v0, -1
+// 0x010adc24: 0x10adc24: sll   zero, zero, 0
+// 0x010adc28: 0x10adc28: addiu a0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010ad5e4: 0x10ad5e4: sll   a2, a0, 7
+// 0x010adc2c: 0x10adc2c: sll   a2, a0, 7
 	ldloc.1
 	ldc.i4.7
 	shl
 	stloc.3
-// 0x010ad5e8: 0x10ad5e8: addu  a1, a2, a1
+// 0x010adc30: 0x10adc30: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x010ad5ec: 0x10ad5ec: addu  a1, s8, a1
+// 0x010adc34: 0x10adc34: addu  a1, s8, a1
 	ldloc 17
 	ldloc.2
 	add
 	stloc.2
-// 0x010ad5f0: 0x10ad5f0: lw    a2, 76(a1)
+// 0x010adc38: 0x10adc38: lw    a2, 76(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -8113,17 +8113,17 @@ L_10ad5cc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad5f4: 0x10ad5f4: sll   zero, zero, 0
-// 0x010ad5f8: 0x10ad5f8: bne   a2, t1, 0x10ad7d8 sll   zero, zero, 0
+// 0x010adc3c: 0x10adc3c: sll   zero, zero, 0
+// 0x010adc40: 0x10adc40: bne   a2, t1, 0x10ade20 sll   zero, zero, 0
 	ldloc.3
 	ldloc 13
-	bne.un L_10ad7d8
+	bne.un L_10ade20
 // --- basic block ---
-// 0x010ad600: 0x10ad600: bne   a2, zero, 0x10ad61c sll   zero, zero, 0
+// 0x010adc48: 0x10adc48: bne   a2, zero, 0x10adc64 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10ad61c
+	brtrue L_10adc64
 // --- basic block ---
-// 0x010ad608: 0x10ad608: lw    a2, 88(a1)
+// 0x010adc50: 0x10adc50: lw    a2, 88(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -8132,7 +8132,7 @@ L_10ad5cc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad60c: 0x10ad60c: lw    a1, 88(t0)
+// 0x010adc54: 0x10adc54: lw    a1, 88(t0)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -8141,19 +8141,19 @@ L_10ad5cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad610: 0x10ad610: sll   zero, zero, 0
-// 0x010ad614: 0x10ad614: bne   a2, a1, 0x10ad7d8 sll   zero, zero, 0
+// 0x010adc58: 0x10adc58: sll   zero, zero, 0
+// 0x010adc5c: 0x10adc5c: bne   a2, a1, 0x10ade20 sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	bne.un L_10ad7d8
+	bne.un L_10ade20
 // --- basic block ---
-L_10ad61c:
-// 0x010ad61c: 0x10ad61c: sll   a0, a0, 7
+L_10adc64:
+// 0x010adc64: 0x10adc64: sll   a0, a0, 7
 	ldloc.1
 	ldc.i4.7
 	shl
 	stloc.1
-// 0x010ad620: 0x10ad620: lw    a1, 80(t0)
+// 0x010adc68: 0x10adc68: lw    a1, 80(t0)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -8162,20 +8162,20 @@ L_10ad61c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad624: 0x10ad624: mflo  lo
+// 0x010adc6c: 0x10adc6c: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x010ad628: 0x10ad628: addu  a0, a0, a2
+// 0x010adc70: 0x10adc70: addu  a0, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc.1
-// 0x010ad62c: 0x10ad62c: addu  a0, s8, a0
+// 0x010adc74: 0x10adc74: addu  a0, s8, a0
 	ldloc 17
 	ldloc.1
 	add
 	stloc.1
-// 0x010ad630: 0x10ad630: lw    a2, 80(a0)
+// 0x010adc78: 0x10adc78: lw    a2, 80(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -8184,13 +8184,13 @@ L_10ad61c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad634: 0x10ad634: sll   zero, zero, 0
-// 0x010ad638: 0x10ad638: bne   a2, a1, 0x10ad7d8 sll   zero, zero, 0
+// 0x010adc7c: 0x10adc7c: sll   zero, zero, 0
+// 0x010adc80: 0x10adc80: bne   a2, a1, 0x10ade20 sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	bne.un L_10ad7d8
+	bne.un L_10ade20
 // --- basic block ---
-// 0x010ad640: 0x10ad640: lw    a1, 92(a0)
+// 0x010adc88: 0x10adc88: lw    a1, 92(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -8199,7 +8199,7 @@ L_10ad61c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad644: 0x10ad644: lw    a0, 92(t0)
+// 0x010adc8c: 0x10adc8c: lw    a0, 92(t0)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -8208,13 +8208,13 @@ L_10ad61c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad648: 0x10ad648: sll   zero, zero, 0
-// 0x010ad64c: 0x10ad64c: bne   a1, a0, 0x10ad7d8 sll   zero, zero, 0
+// 0x010adc90: 0x10adc90: sll   zero, zero, 0
+// 0x010adc94: 0x10adc94: bne   a1, a0, 0x10ade20 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_10ad7d8
+	bne.un L_10ade20
 // --- basic block ---
-// 0x010ad654: 0x10ad654: lw    a0, 1920(v1)
+// 0x010adc9c: 0x10adc9c: lw    a0, 1920(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -8223,43 +8223,43 @@ L_10ad61c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad658: 0x10ad658: sll   zero, zero, 0
-// 0x010ad65c: 0x10ad65c: beq   a0, v0, 0x10ad678 addiu a2, v0, -1
+// 0x010adca0: 0x10adca0: sll   zero, zero, 0
+// 0x010adca4: 0x10adca4: beq   a0, v0, 0x10adcc0 addiu a2, v0, -1
 	ldloc.1
 	ldloc 5
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc.3
-	beq  L_10ad678
+	beq  L_10adcc0
 // --- basic block ---
-// 0x010ad664: 0x10ad664: addu  a2, a0, zero
+// 0x010adcac: 0x10adcac: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010ad668: 0x10ad668: slt   a0, v0, a0
+// 0x010adcb0: 0x10adcb0: slt   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.1
-// 0x010ad66c: 0x10ad66c: beq   a0, zero, 0x10ad67c mult  s4, s7
+// 0x010adcb4: 0x10adcb4: beq   a0, zero, 0x10adcc4 mult  s4, s7
 	ldloc.1
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 8
-	brfalse L_10ad67c
+	brfalse L_10adcc4
 // --- basic block ---
-// 0x010ad674: 0x10ad674: addu  a2, v0, zero
+// 0x010adcbc: 0x10adcbc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_10ad678:
-// 0x010ad678: 0x10ad678: mult  s4, s7
+L_10adcc0:
+// 0x010adcc0: 0x10adcc0: mult  s4, s7
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 8
-L_10ad67c:
-// 0x010ad67c: 0x10ad67c: lw    t2, 220(sp)
+L_10adcc4:
+// 0x010adcc4: 0x10adcc4: lw    t2, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8268,103 +8268,103 @@ L_10ad67c:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010ad680: 0x10ad680: addu  t1, zero, zero
+// 0x010adcc8: 0x10adcc8: addu  t1, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010ad684: 0x10ad684: addu  a1, zero, zero
+// 0x010adccc: 0x10adccc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ad688: 0x10ad688: addu  a0, zero, zero
+// 0x010adcd0: 0x10adcd0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010ad68c: 0x10ad68c: mflo  lo
+// 0x010adcd4: 0x10adcd4: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010ad690: 0x10ad690: addu  v0, s8, v0
+// 0x010adcd8: 0x10adcd8: addu  v0, s8, v0
 	ldloc 17
 	ldloc 5
 	add
 	stloc 5
-// 0x010ad694: 0x10ad694: j	 0x10ad6b4 addiu v0, v0, 28
+// 0x010adcdc: 0x10adcdc: j	 0x10adcfc addiu v0, v0, 28
 	ldloc 5
 	ldc.i4.s 28
 	add
 	stloc 5
-	br L_10ad6b4
+	br L_10adcfc
 // --- basic block ---
-L_10ad69c:
-// 0x010ad69c: 0x10ad69c: lw    t4, 0(t2)
+L_10adce4:
+// 0x010adce4: 0x10adce4: lw    t4, 0(t2)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 23
-// 0x010ad6a0: 0x10ad6a0: lw    t3, 0(v0)
+// 0x010adce8: 0x10adce8: lw    t3, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 21
-// 0x010ad6a4: 0x10ad6a4: addu  a0, a0, t4
+// 0x010adcec: 0x10adcec: addu  a0, a0, t4
 	ldloc.1
 	ldloc 23
 	add
 	stloc.1
-// 0x010ad6a8: 0x10ad6a8: addu  a1, a1, t3
+// 0x010adcf0: 0x10adcf0: addu  a1, a1, t3
 	ldloc.2
 	ldloc 21
 	add
 	stloc.2
-// 0x010ad6ac: 0x10ad6ac: addiu t2, t2, 128
+// 0x010adcf4: 0x10adcf4: addiu t2, t2, 128
 	ldloc 20
 	ldc.i4 128
 	add
 	stloc 20
-// 0x010ad6b0: 0x10ad6b0: addiu v0, v0, 128
+// 0x010adcf8: 0x10adcf8: addiu v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	add
 	stloc 5
-L_10ad6b4:
-// 0x010ad6b4: 0x10ad6b4: slt   t3, t1, a2
+L_10adcfc:
+// 0x010adcfc: 0x10adcfc: slt   t3, t1, a2
 	ldloc 13
 	ldloc.3
 	clt
 	stloc 21
-// 0x010ad6b8: 0x10ad6b8: bne   t3, zero, 0x10ad69c addiu t1, t1, 1
+// 0x010add00: 0x10add00: bne   t3, zero, 0x10adce4 addiu t1, t1, 1
 	ldloc 21
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	brtrue L_10ad69c
+	brtrue L_10adce4
 // --- basic block ---
-// 0x010ad6c0: 0x10ad6c0: beq   a2, zero, 0x10ad6e0 sll   zero, zero, 0
+// 0x010add08: 0x10add08: beq   a2, zero, 0x10add28 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_10ad6e0
+	brfalse L_10add28
 // --- basic block ---
-// 0x010ad6c8: 0x10ad6c8: div   a1, a2
+// 0x010add10: 0x10add10: div   a1, a2
 	ldloc.2
 	ldloc.3
 	div
 	stloc 8
-// 0x010ad6cc: 0x10ad6cc: mflo  lo
+// 0x010add14: 0x10add14: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010ad6d0: 0x10ad6d0: sll   zero, zero, 0
-// 0x010ad6d4: 0x10ad6d4: sll   zero, zero, 0
-// 0x010ad6d8: 0x10ad6d8: div   a0, a2
+// 0x010add18: 0x10add18: sll   zero, zero, 0
+// 0x010add1c: 0x10add1c: sll   zero, zero, 0
+// 0x010add20: 0x10add20: div   a0, a2
 	ldloc.1
 	ldloc.3
 	div
 	stloc 8
-// 0x010ad6dc: 0x10ad6dc: mflo  lo
+// 0x010add24: 0x10add24: mflo  lo
 	ldloc 8
 	stloc.1
-L_10ad6e0:
-// 0x010ad6e0: 0x10ad6e0: sw    v1, 264(sp)
+L_10add28:
+// 0x010add28: 0x10add28: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8373,7 +8373,7 @@ L_10ad6e0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad6e4: 0x10ad6e4: sw    a0, 252(sp)
+// 0x010add2c: 0x10add2c: sw    a0, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8382,7 +8382,7 @@ L_10ad6e0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010ad6e8: 0x10ad6e8: sw    a1, 248(sp)
+// 0x010add30: 0x10add30: sw    a1, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8391,7 +8391,7 @@ L_10ad6e0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010ad6ec: 0x10ad6ec: sw    a3, 260(sp)
+// 0x010add34: 0x10add34: sw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8400,7 +8400,7 @@ L_10ad6e0:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010ad6f0: 0x10ad6f0: jal   0x102be70 sw    t0, 256(sp)
+// 0x010add38: 0x10add38: jal   0x102be80 sw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8409,18 +8409,18 @@ L_10ad6e0:
 	add
 	ldloc 15
 	stelem.i4
-	call int32 Cibyl32::roadmap_fuzzy_good_102be70()
+	call int32 Cibyl32::roadmap_fuzzy_good_102be80()
 	stloc 5
 // --- basic block ---
-// 0x010ad6f8: 0x10ad6f8: addiu t1, zero, 10
+// 0x010add40: 0x10add40: addiu t1, zero, 10
 	ldc.i4.s 10
 	stloc 13
-// 0x010ad6fc: 0x10ad6fc: div   v0, t1
+// 0x010add44: 0x10add44: div   v0, t1
 	ldloc 5
 	ldloc 13
 	div
 	stloc 8
-// 0x010ad700: 0x10ad700: lw    a0, 252(sp)
+// 0x010add48: 0x10add48: lw    a0, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8429,7 +8429,7 @@ L_10ad6e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad704: 0x10ad704: lw    a1, 248(sp)
+// 0x010add4c: 0x10add4c: lw    a1, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8438,7 +8438,7 @@ L_10ad6e0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ad708: 0x10ad708: lw    v1, 264(sp)
+// 0x010add50: 0x10add50: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8447,27 +8447,27 @@ L_10ad6e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad70c: 0x10ad70c: subu  t1, a0, a1
+// 0x010add54: 0x10add54: subu  t1, a0, a1
 	ldloc.1
 	ldloc.2
 	sub
 	stloc 13
-// 0x010ad710: 0x10ad710: sra   a2, t1, 31
+// 0x010add58: 0x10add58: sra   a2, t1, 31
 	ldloc 13
 	ldc.i4.s 31
 	shr
 	stloc.3
-// 0x010ad714: 0x10ad714: xor   t1, a2, t1
+// 0x010add5c: 0x10add5c: xor   t1, a2, t1
 	ldloc.3
 	ldloc 13
 	xor
 	stloc 13
-// 0x010ad718: 0x10ad718: subu  a2, t1, a2
+// 0x010add60: 0x10add60: subu  a2, t1, a2
 	ldloc 13
 	ldloc.3
 	sub
 	stloc.3
-// 0x010ad71c: 0x10ad71c: lw    a3, 260(sp)
+// 0x010add64: 0x10add64: lw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8476,7 +8476,7 @@ L_10ad6e0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ad720: 0x10ad720: lw    t0, 256(sp)
+// 0x010add68: 0x10add68: lw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8485,23 +8485,23 @@ L_10ad6e0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ad724: 0x10ad724: mflo  lo
+// 0x010add6c: 0x10add6c: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010ad728: 0x10ad728: slt   a2, a2, v0
+// 0x010add70: 0x10add70: slt   a2, a2, v0
 	ldloc.3
 	ldloc 5
 	clt
 	stloc.3
-// 0x010ad72c: 0x10ad72c: beq   a2, zero, 0x10ad760 mult  s4, s7
+// 0x010add74: 0x10add74: beq   a2, zero, 0x10adda8 mult  s4, s7
 	ldloc.3
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 8
-	brfalse L_10ad760
+	brfalse L_10adda8
 // --- basic block ---
-// 0x010ad734: 0x10ad734: lw    v0, 1920(v1)
+// 0x010add7c: 0x10add7c: lw    v0, 1920(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -8510,15 +8510,15 @@ L_10ad6e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad738: 0x10ad738: mflo  lo
+// 0x010add80: 0x10add80: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x010ad73c: 0x10ad73c: addu  a2, a2, s8
+// 0x010add84: 0x10add84: addu  a2, a2, s8
 	ldloc.3
 	ldloc 17
 	add
 	stloc.3
-// 0x010ad740: 0x10ad740: lw    a2, 1920(a2)
+// 0x010add88: 0x10add88: lw    a2, 1920(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -8527,60 +8527,60 @@ L_10ad6e0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad744: 0x10ad744: sll   zero, zero, 0
-// 0x010ad748: 0x10ad748: beq   v0, a2, 0x10ad760 slt   v0, a2, v0
+// 0x010add8c: 0x10add8c: sll   zero, zero, 0
+// 0x010add90: 0x10add90: beq   v0, a2, 0x10adda8 slt   v0, a2, v0
 	ldloc 5
 	ldloc.3
 	ldloc.3
 	ldloc 5
 	clt
 	stloc 5
-	beq  L_10ad760
+	beq  L_10adda8
 // --- basic block ---
-// 0x010ad750: 0x10ad750: bne   v0, zero, 0x10ae03c addu  a0, v1, zero
+// 0x010add98: 0x10add98: bne   v0, zero, 0x10ae684 addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brtrue L_10ae03c
+	brtrue L_10ae684
 // --- basic block ---
-// 0x010ad758: 0x10ad758: j	 0x10ad770 addiu a1, s4, 1
+// 0x010adda0: 0x10adda0: j	 0x10addb8 addiu a1, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc.2
-	br L_10ad770
+	br L_10addb8
 // --- basic block ---
-L_10ad760:
-// 0x010ad760: 0x10ad760: slt   a0, a0, a1
+L_10adda8:
+// 0x010adda8: 0x10adda8: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.1
-// 0x010ad764: 0x10ad764: bne   a0, zero, 0x10ae038 mult  s4, s7
+// 0x010addac: 0x10addac: bne   a0, zero, 0x10ae680 mult  s4, s7
 	ldloc.1
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 8
-	brtrue L_10ae038
+	brtrue L_10ae680
 // --- basic block ---
-L_10ad76c:
-// 0x010ad76c: 0x10ad76c: addiu a1, s4, 1
+L_10addb4:
+// 0x010addb4: 0x10addb4: addiu a1, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc.2
-L_10ad770:
-// 0x010ad770: 0x10ad770: lw    a2, -13136(a3)
+L_10addb8:
+// 0x010addb8: 0x10addb8: lw    a2, -12672(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad774: 0x10ad774: sw    v1, 264(sp)
+// 0x010addbc: 0x10addbc: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8589,17 +8589,17 @@ L_10ad770:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ad778: 0x10ad778: addiu a2, a2, -1
+// 0x010addc0: 0x10addc0: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x010ad77c: 0x10ad77c: subu  a2, a2, s4
+// 0x010addc4: 0x10addc4: subu  a2, a2, s4
 	ldloc.3
 	ldloc 9
 	sub
 	stloc.3
-// 0x010ad780: 0x10ad780: sw    a3, 260(sp)
+// 0x010addc8: 0x10addc8: sw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8608,7 +8608,7 @@ L_10ad770:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010ad784: 0x10ad784: sw    t0, 256(sp)
+// 0x010addcc: 0x10addcc: sw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8617,39 +8617,39 @@ L_10ad770:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010ad788: 0x10ad788: addiu s4, s4, -1
+// 0x010addd0: 0x10addd0: addiu s4, s4, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x010ad78c: 0x10ad78c: mflo  lo
+// 0x010addd4: 0x10addd4: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010ad790: 0x10ad790: addu  a0, s8, a0
+// 0x010addd8: 0x10addd8: addu  a0, s8, a0
 	ldloc 17
 	ldloc.1
 	add
 	stloc.1
-// 0x010ad794: 0x10ad794: sll   zero, zero, 0
-// 0x010ad798: 0x10ad798: mult  a1, s7
+// 0x010adddc: 0x10adddc: sll   zero, zero, 0
+// 0x010adde0: 0x10adde0: mult  a1, s7
 	ldloc.2
 	ldloc 11
 	mul
 	stloc 8
-// 0x010ad79c: 0x10ad79c: mflo  lo
+// 0x010adde4: 0x10adde4: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010ad7a0: 0x10ad7a0: sll   zero, zero, 0
-// 0x010ad7a4: 0x10ad7a4: sll   zero, zero, 0
-// 0x010ad7a8: 0x10ad7a8: mult  a2, s7
+// 0x010adde8: 0x10adde8: sll   zero, zero, 0
+// 0x010addec: 0x10addec: sll   zero, zero, 0
+// 0x010addf0: 0x10addf0: mult  a2, s7
 	ldloc.3
 	ldloc 11
 	mul
 	stloc 8
-// 0x010ad7ac: 0x10ad7ac: mflo  lo
+// 0x010addf4: 0x10addf4: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x010ad7b0: 0x10ad7b0: jal   0x100186c addu  a1, s8, a1
+// 0x010addf8: 0x10addf8: jal   0x100186c addu  a1, s8, a1
 	ldloc 17
 	ldloc.2
 	add
@@ -8663,7 +8663,7 @@ L_10ad770:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad7b8: 0x10ad7b8: lw    a3, 260(sp)
+// 0x010ade00: 0x10ade00: lw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8672,7 +8672,7 @@ L_10ad770:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ad7bc: 0x10ad7bc: lw    v1, 264(sp)
+// 0x010ade04: 0x10ade04: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8681,24 +8681,24 @@ L_10ad770:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad7c0: 0x10ad7c0: lw    v0, -13136(a3)
+// 0x010ade08: 0x10ade08: lw    v0, -12672(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad7c4: 0x10ad7c4: addiu a0, zero, 1
+// 0x010ade0c: 0x10ade0c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010ad7c8: 0x10ad7c8: addiu v0, v0, -1
+// 0x010ade10: 0x10ade10: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010ad7cc: 0x10ad7cc: lw    t0, 256(sp)
+// 0x010ade14: 0x10ade14: lw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8707,7 +8707,7 @@ L_10ad770:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ad7d0: 0x10ad7d0: sw    a0, 1924(v1)
+// 0x010ade18: 0x10ade18: sw    a0, 1924(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -8716,46 +8716,46 @@ L_10ad770:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010ad7d4: 0x10ad7d4: sw    v0, -13136(a3)
+// 0x010ade1c: 0x10ade1c: sw    v0, -12672(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldloc 5
 	stelem.i4
-L_10ad7d8:
-// 0x010ad7d8: 0x10ad7d8: addiu s4, s4, 1
+L_10ade20:
+// 0x010ade20: 0x10ade20: addiu s4, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10ad7dc:
-// 0x010ad7dc: 0x10ad7dc: lw    v0, -13136(a3)
+L_10ade24:
+// 0x010ade24: 0x10ade24: lw    v0, -12672(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad7e0: 0x10ad7e0: sll   zero, zero, 0
-// 0x010ad7e4: 0x10ad7e4: slt   v0, s4, v0
+// 0x010ade28: 0x10ade28: sll   zero, zero, 0
+// 0x010ade2c: 0x10ade2c: slt   v0, s4, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x010ad7e8: 0x10ad7e8: bne   v0, zero, 0x10ad5cc mult  s4, s7
+// 0x010ade30: 0x10ade30: bne   v0, zero, 0x10adc14 mult  s4, s7
 	ldloc 5
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 8
-	brtrue L_10ad5cc
+	brtrue L_10adc14
 // --- basic block ---
-// 0x010ad7f0: 0x10ad7f0: lw    v0, 216(sp)
+// 0x010ade38: 0x10ade38: lw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8764,76 +8764,76 @@ L_10ad7dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad7f4: 0x10ad7f4: addiu v1, v1, 1928
+// 0x010ade3c: 0x10ade3c: addiu v1, v1, 1928
 	ldloc 7
 	ldc.i4 1928
 	add
 	stloc 7
-L_10ad7f8:
-// 0x010ad7f8: 0x10ad7f8: lw    a0, -13136(a3)
+L_10ade40:
+// 0x010ade40: 0x10ade40: lw    a0, -12672(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad7fc: 0x10ad7fc: sll   zero, zero, 0
-// 0x010ad800: 0x10ad800: addiu a0, a0, -1
+// 0x010ade44: 0x10ade44: sll   zero, zero, 0
+// 0x010ade48: 0x10ade48: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010ad804: 0x10ad804: slt   a0, v0, a0
+// 0x010ade4c: 0x10ade4c: slt   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.1
-// 0x010ad808: 0x10ad808: bne   a0, zero, 0x10ad598 mult  v0, s7
+// 0x010ade50: 0x10ade50: bne   a0, zero, 0x10adbe0 mult  v0, s7
 	ldloc.1
 	ldloc 5
 	ldloc 11
 	mul
 	stloc 8
-	brtrue L_10ad598
+	brtrue L_10adbe0
 // --- basic block ---
-L_10ad810:
-// 0x010ad810: 0x10ad810: lui   v0, 0x90000
+L_10ade58:
+// 0x010ade58: 0x10ade58: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ad814: 0x10ad814: lw    v0, -13136(v0)
+// 0x010ade5c: 0x10ade5c: lw    v0, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad818: 0x10ad818: sll   zero, zero, 0
-// 0x010ad81c: 0x10ad81c: bne   v0, zero, 0x10ad83c slti  v0, v0, 2
+// 0x010ade60: 0x10ade60: sll   zero, zero, 0
+// 0x010ade64: 0x10ade64: bne   v0, zero, 0x10ade84 slti  v0, v0, 2
 	ldloc 5
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-	brtrue L_10ad83c
+	brtrue L_10ade84
 // --- basic block ---
-// 0x010ad824: 0x10ad824: lui   v0, 0x90000
+// 0x010ade6c: 0x10ade6c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10ad828:
-// 0x010ad828: 0x10ad828: sw    zero, -13136(v0)
+L_10ade70:
+// 0x010ade70: 0x10ade70: sw    zero, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ad82c: 0x10ad82c: jal   0x10b0d70 addu  s2, zero, zero
+// 0x010ade74: 0x10ade74: jal   0x10b13b8 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 16
 	ldloc.0
@@ -8841,48 +8841,48 @@ L_10ad828:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_reset_10b0d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_reset_10b13b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad834: 0x10ad834: j	 0x10adfe8 sll   zero, zero, 0
-	br L_10adfe8
+// 0x010ade7c: 0x10ade7c: j	 0x10ae630 sll   zero, zero, 0
+	br L_10ae630
 // --- basic block ---
-L_10ad83c:
-// 0x010ad83c: 0x10ad83c: beq   v0, zero, 0x10adfe4 lui   v0, 0x90000
+L_10ade84:
+// 0x010ade84: 0x10ade84: beq   v0, zero, 0x10ae62c lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10adfe4
+	brfalse L_10ae62c
 // --- basic block ---
-L_10ad844:
-// 0x010ad844: 0x10ad844: lw    a0, -13136(v0)
+L_10ade8c:
+// 0x010ade8c: 0x10ade8c: lw    a0, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad848: 0x10ad848: addiu v1, zero, 1
+// 0x010ade90: 0x10ade90: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010ad84c: 0x10ad84c: bne   a0, v1, 0x10ad974 sll   zero, zero, 0
+// 0x010ade94: 0x10ade94: bne   a0, v1, 0x10adfbc sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10ad974
+	bne.un L_10adfbc
 // --- basic block ---
-// 0x010ad854: 0x10ad854: lui   s2, 0x90000
+// 0x010ade9c: 0x10ade9c: lui   s2, 0x90000
 	ldc.i4 589824
 	stloc 16
-// 0x010ad858: 0x10ad858: addiu s2, s2, -32416
+// 0x010adea0: 0x10adea0: addiu s2, s2, -31952
 	ldloc 16
-	ldc.i4 -32416
+	ldc.i4 -31952
 	add
 	stloc 16
-// 0x010ad85c: 0x10ad85c: lw    v1, 1920(s2)
+// 0x010adea4: 0x10adea4: lw    v1, 1920(s2)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -8891,13 +8891,13 @@ L_10ad844:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad860: 0x10ad860: sll   zero, zero, 0
-// 0x010ad864: 0x10ad864: addiu v1, v1, -1
+// 0x010adea8: 0x10adea8: sll   zero, zero, 0
+// 0x010adeac: 0x10adeac: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x010ad868: 0x10ad868: bne   v1, zero, 0x10ad874 sw    v1, 1920(s2)
+// 0x010adeb0: 0x10adeb0: bne   v1, zero, 0x10adebc sw    v1, 1920(s2)
 	ldloc 7
 	ldloc 6
 	ldloc 16
@@ -8907,25 +8907,25 @@ L_10ad844:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_10ad874
+	brtrue L_10adebc
 // --- basic block ---
-// 0x010ad870: 0x10ad870: sw    zero, -13136(v0)
+// 0x010adeb8: 0x10adeb8: sw    zero, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10ad874:
-// 0x010ad874: 0x10ad874: addiu a2, zero, 48
+L_10adebc:
+// 0x010adebc: 0x10adebc: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010ad878: 0x10ad878: addu  a0, s5, zero
+// 0x010adec0: 0x10adec0: addu  a0, s5, zero
 	ldloc 18
 	stloc.1
-// 0x010ad87c: 0x10ad87c: jal   0x1001800 addiu a1, s2, 76
+// 0x010adec4: 0x10adec4: jal   0x1001800 addiu a1, s2, 76
 	ldloc 16
 	ldc.i4.s 76
 	add
@@ -8939,13 +8939,13 @@ L_10ad874:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad884: 0x10ad884: addu  a0, s3, zero
+// 0x010adecc: 0x10adecc: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x010ad888: 0x10ad888: addu  a1, s2, zero
+// 0x010aded0: 0x10aded0: addu  a1, s2, zero
 	ldloc 16
 	stloc.2
-// 0x010ad88c: 0x10ad88c: jal   0x1001800 addiu a2, zero, 76
+// 0x010aded4: 0x10aded4: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -8957,7 +8957,7 @@ L_10ad874:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad894: 0x10ad894: lw    v0, 1924(s2)
+// 0x010adedc: 0x10adedc: lw    v0, 1924(s2)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -8966,18 +8966,18 @@ L_10ad874:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad898: 0x10ad898: sll   zero, zero, 0
-// 0x010ad89c: 0x10ad89c: beq   v0, zero, 0x10ad8b4 lui   v0, 0x90000
+// 0x010adee0: 0x10adee0: sll   zero, zero, 0
+// 0x010adee4: 0x10adee4: beq   v0, zero, 0x10adefc lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10ad8b4
+	brfalse L_10adefc
 // --- basic block ---
-// 0x010ad8a4: 0x10ad8a4: jal   0x102be78 sll   zero, zero, 0
-	call int32 Cibyl32::roadmap_fuzzy_acceptable_102be78()
+// 0x010adeec: 0x10adeec: jal   0x102be88 sll   zero, zero, 0
+	call int32 Cibyl32::roadmap_fuzzy_acceptable_102be88()
 	stloc 5
 // --- basic block ---
-// 0x010ad8ac: 0x10ad8ac: sw    v0, 28(s3)
+// 0x010adef4: 0x10adef4: sw    v0, 28(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -8986,23 +8986,23 @@ L_10ad874:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad8b0: 0x10ad8b0: lui   v0, 0x90000
+// 0x010adef8: 0x10adef8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10ad8b4:
-// 0x010ad8b4: 0x10ad8b4: lw    a2, -30496(v0)
+L_10adefc:
+// 0x010adefc: 0x10adefc: lw    a2, -30032(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7624
+	ldc.i4 -7508
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ad8b8: 0x10ad8b8: addu  a0, s2, zero
+// 0x010adf00: 0x10adf00: addu  a0, s2, zero
 	ldloc 16
 	stloc.1
-// 0x010ad8bc: 0x10ad8bc: lw    s2, 124(s2)
+// 0x010adf04: 0x10adf04: lw    s2, 124(s2)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -9011,12 +9011,12 @@ L_10ad8b4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010ad8c0: 0x10ad8c0: sll   a2, a2, 7
+// 0x010adf08: 0x10adf08: sll   a2, a2, 7
 	ldloc.3
 	ldc.i4.7
 	shl
 	stloc.3
-// 0x010ad8c4: 0x10ad8c4: jal   0x100186c addiu a1, a0, 128
+// 0x010adf0c: 0x10adf0c: jal   0x100186c addiu a1, a0, 128
 	ldloc.1
 	ldc.i4 128
 	add
@@ -9030,51 +9030,51 @@ L_10ad8b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad8cc: 0x10ad8cc: bne   s2, zero, 0x10adfe8 sll   zero, zero, 0
+// 0x010adf14: 0x10adf14: bne   s2, zero, 0x10ae630 sll   zero, zero, 0
 	ldloc 16
-	brtrue L_10adfe8
+	brtrue L_10ae630
 // --- basic block ---
-// 0x010ad8d4: 0x10ad8d4: lw    v0, 0(s1)
+// 0x010adf1c: 0x10adf1c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ad8d8: 0x10ad8d8: sll   zero, zero, 0
-// 0x010ad8dc: 0x10ad8dc: beq   v0, zero, 0x10ad944 sll   zero, zero, 0
+// 0x010adf20: 0x10adf20: sll   zero, zero, 0
+// 0x010adf24: 0x10adf24: beq   v0, zero, 0x10adf8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ad944
+	brfalse L_10adf8c
 // --- basic block ---
-// 0x010ad8e4: 0x10ad8e4: beq   s0, zero, 0x10ad944 sll   zero, zero, 0
+// 0x010adf2c: 0x10adf2c: beq   s0, zero, 0x10adf8c sll   zero, zero, 0
 	ldloc 12
-	brfalse L_10ad944
+	brfalse L_10adf8c
 // --- basic block ---
-// 0x010ad8ec: 0x10ad8ec: lw    v0, 0(s0)
+// 0x010adf34: 0x10adf34: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ad8f0: 0x10ad8f0: lw    v1, 0(s5)
+// 0x010adf38: 0x10adf38: lw    v1, 0(s5)
 	ldloc 6
 	ldloc 18
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010ad8f4: 0x10ad8f4: sll   zero, zero, 0
-// 0x010ad8f8: 0x10ad8f8: bne   v0, v1, 0x10ad944 sll   zero, zero, 0
+// 0x010adf3c: 0x10adf3c: sll   zero, zero, 0
+// 0x010adf40: 0x10adf40: bne   v0, v1, 0x10adf8c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_10ad944
+	bne.un L_10adf8c
 // --- basic block ---
-// 0x010ad900: 0x10ad900: bne   v0, zero, 0x10ad91c sll   zero, zero, 0
+// 0x010adf48: 0x10adf48: bne   v0, zero, 0x10adf64 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ad91c
+	brtrue L_10adf64
 // --- basic block ---
-// 0x010ad908: 0x10ad908: lw    v1, 12(s0)
+// 0x010adf50: 0x10adf50: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9083,7 +9083,7 @@ L_10ad8b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad90c: 0x10ad90c: lw    v0, 12(s5)
+// 0x010adf54: 0x10adf54: lw    v0, 12(s5)
 	ldloc 6
 	ldloc 18
 	ldc.i4.2
@@ -9092,14 +9092,14 @@ L_10ad8b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad910: 0x10ad910: sll   zero, zero, 0
-// 0x010ad914: 0x10ad914: bne   v1, v0, 0x10ad944 sll   zero, zero, 0
+// 0x010adf58: 0x10adf58: sll   zero, zero, 0
+// 0x010adf5c: 0x10adf5c: bne   v1, v0, 0x10adf8c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10ad944
+	bne.un L_10adf8c
 // --- basic block ---
-L_10ad91c:
-// 0x010ad91c: 0x10ad91c: lw    v1, 4(s0)
+L_10adf64:
+// 0x010adf64: 0x10adf64: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9108,7 +9108,7 @@ L_10ad91c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad920: 0x10ad920: lw    v0, 4(s5)
+// 0x010adf68: 0x10adf68: lw    v0, 4(s5)
 	ldloc 6
 	ldloc 18
 	ldc.i4.2
@@ -9117,13 +9117,13 @@ L_10ad91c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad924: 0x10ad924: sll   zero, zero, 0
-// 0x010ad928: 0x10ad928: bne   v1, v0, 0x10ad944 sll   zero, zero, 0
+// 0x010adf6c: 0x10adf6c: sll   zero, zero, 0
+// 0x010adf70: 0x10adf70: bne   v1, v0, 0x10adf8c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10ad944
+	bne.un L_10adf8c
 // --- basic block ---
-// 0x010ad930: 0x10ad930: lw    v1, 16(s0)
+// 0x010adf78: 0x10adf78: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9132,7 +9132,7 @@ L_10ad91c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad934: 0x10ad934: lw    v0, 16(s5)
+// 0x010adf7c: 0x10adf7c: lw    v0, 16(s5)
 	ldloc 6
 	ldloc 18
 	ldc.i4.2
@@ -9141,20 +9141,20 @@ L_10ad91c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad938: 0x10ad938: sll   zero, zero, 0
-// 0x010ad93c: 0x10ad93c: beq   v1, v0, 0x10adfe8 sll   zero, zero, 0
+// 0x010adf80: 0x10adf80: sll   zero, zero, 0
+// 0x010adf84: 0x10adf84: beq   v1, v0, 0x10ae630 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10adfe8
+	beq  L_10ae630
 // --- basic block ---
-L_10ad944:
-// 0x010ad944: 0x10ad944: addu  a1, s3, zero
+L_10adf8c:
+// 0x010adf8c: 0x10adf8c: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x010ad948: 0x10ad948: addiu a2, zero, 76
+// 0x010adf90: 0x10adf90: addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
-// 0x010ad94c: 0x10ad94c: jal   0x1001800 addu  a0, s1, zero
+// 0x010adf94: 0x10adf94: jal   0x1001800 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -9166,13 +9166,13 @@ L_10ad944:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad954: 0x10ad954: addu  a0, s0, zero
+// 0x010adf9c: 0x10adf9c: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010ad958: 0x10ad958: addu  a1, s5, zero
+// 0x010adfa0: 0x10adfa0: addu  a1, s5, zero
 	ldloc 18
 	stloc.2
-// 0x010ad95c: 0x10ad95c: jal   0x1001800 addiu a2, zero, 48
+// 0x010adfa4: 0x10adfa4: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -9184,37 +9184,37 @@ L_10ad944:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad964: 0x10ad964: addiu v0, zero, 1
+// 0x010adfac: 0x10adfac: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010ad968: 0x10ad968: sw    v0, 0(s1)
+// 0x010adfb0: 0x10adfb0: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010ad96c: 0x10ad96c: j	 0x10adfe8 addiu s2, zero, -1
+// 0x010adfb4: 0x10adfb4: j	 0x10ae630 addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 16
-	br L_10adfe8
+	br L_10ae630
 // --- basic block ---
-L_10ad974:
-// 0x010ad974: 0x10ad974: lw    v0, 0(s1)
+L_10adfbc:
+// 0x010adfbc: 0x10adfbc: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ad978: 0x10ad978: sll   zero, zero, 0
-// 0x010ad97c: 0x10ad97c: beq   v0, zero, 0x10ada0c addiu v0, zero, 16
+// 0x010adfc0: 0x10adfc0: sll   zero, zero, 0
+// 0x010adfc4: 0x10adfc4: beq   v0, zero, 0x10ae054 addiu v0, zero, 16
 	ldloc 5
 	ldc.i4.s 16
 	stloc 5
-	brfalse L_10ada0c
+	brfalse L_10ae054
 // --- basic block ---
-// 0x010ad984: 0x10ad984: lw    a0, 244(sp)
+// 0x010adfcc: 0x10adfcc: lw    a0, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9223,10 +9223,10 @@ L_10ad974:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ad988: 0x10ad988: addu  a1, s0, zero
+// 0x010adfd0: 0x10adfd0: addu  a1, s0, zero
 	ldloc 12
 	stloc.2
-// 0x010ad98c: 0x10ad98c: lw    s4, 32(s1)
+// 0x010adfd4: 0x10adfd4: lw    s4, 32(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -9235,7 +9235,7 @@ L_10ad974:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ad990: 0x10ad990: jal   0x10afadc addu  a2, s0, zero
+// 0x010adfd8: 0x10adfd8: jal   0x10b0124 addu  a2, s0, zero
 	ldloc 12
 	stloc.3
 	ldloc.0
@@ -9243,18 +9243,18 @@ L_10ad974:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_get_distance_10afadc(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_get_distance_10b0124(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad998: 0x10ad998: bne   v0, zero, 0x10ad9a8 addiu v0, zero, 10000
+// 0x010adfe0: 0x10adfe0: bne   v0, zero, 0x10adff0 addiu v0, zero, 10000
 	ldloc 5
 	ldc.i4 10000
 	stloc 5
-	brtrue L_10ad9a8
+	brtrue L_10adff0
 // --- basic block ---
-// 0x010ad9a0: 0x10ad9a0: j	 0x10ada08 sw    v0, 20(s0)
+// 0x010adfe8: 0x10adfe8: j	 0x10ae050 sw    v0, 20(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9263,10 +9263,10 @@ L_10ad974:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10ada08
+	br L_10ae050
 // --- basic block ---
-L_10ad9a8:
-// 0x010ad9a8: 0x10ad9a8: lw    v0, 16(s6)
+L_10adff0:
+// 0x010adff0: 0x10adff0: lw    v0, 16(s6)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
@@ -9275,19 +9275,19 @@ L_10ad9a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad9ac: 0x10ad9ac: addu  a0, s3, zero
+// 0x010adff4: 0x10adff4: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x010ad9b0: 0x10ad9b0: addu  a1, s1, zero
+// 0x010adff8: 0x10adff8: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010ad9b4: 0x10ad9b4: addu  a2, s0, zero
+// 0x010adffc: 0x10adffc: addu  a2, s0, zero
 	ldloc 12
 	stloc.3
-// 0x010ad9b8: 0x10ad9b8: addu  a3, s0, zero
+// 0x010ae000: 0x10ae000: addu  a3, s0, zero
 	ldloc 12
 	stloc 4
-// 0x010ad9bc: 0x10ad9bc: sw    v0, 20(sp)
+// 0x010ae004: 0x10ae004: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9296,7 +9296,7 @@ L_10ad9a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ad9c0: 0x10ad9c0: jal   0x102a3cc sw    zero, 16(sp)
+// 0x010ae008: 0x10ae008: jal   0x102a3dc sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9310,18 +9310,18 @@ L_10ad9a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ad9c8: 0x10ad9c8: beq   v0, zero, 0x10ada08 addu  s7, v0, zero
+// 0x010ae010: 0x10ae010: beq   v0, zero, 0x10ae050 addu  s7, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brfalse L_10ada08
+	brfalse L_10ae050
 // --- basic block ---
-// 0x010ad9d0: 0x10ad9d0: lw    v1, 20(s3)
+// 0x010ae018: 0x10ae018: lw    v1, 20(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -9330,7 +9330,7 @@ L_10ad9a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ad9d4: 0x10ad9d4: lw    v0, 20(s1)
+// 0x010ae01c: 0x10ae01c: lw    v0, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -9339,38 +9339,38 @@ L_10ad9a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ad9d8: 0x10ad9d8: sll   zero, zero, 0
-// 0x010ad9dc: 0x10ad9dc: bne   v1, v0, 0x10ada0c addiu v0, zero, 16
+// 0x010ae020: 0x10ae020: sll   zero, zero, 0
+// 0x010ae024: 0x10ae024: bne   v1, v0, 0x10ae054 addiu v0, zero, 16
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 16
 	stloc 5
-	bne.un L_10ada0c
+	bne.un L_10ae054
 // --- basic block ---
-// 0x010ad9e4: 0x10ad9e4: slt   s4, s7, s4
+// 0x010ae02c: 0x10ae02c: slt   s4, s7, s4
 	ldloc 11
 	ldloc 9
 	clt
 	stloc 9
-// 0x010ad9e8: 0x10ad9e8: beq   s4, zero, 0x10ada00 sll   zero, zero, 0
+// 0x010ae030: 0x10ae030: beq   s4, zero, 0x10ae048 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10ada00
+	brfalse L_10ae048
 // --- basic block ---
-// 0x010ad9f0: 0x10ad9f0: jal   0x102be64 addu  a0, s7, zero
+// 0x010ae038: 0x10ae038: jal   0x102be74 addu  a0, s7, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be64(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be74(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ad9f8: 0x10ad9f8: beq   v0, zero, 0x10ada0c addiu v0, zero, 16
+// 0x010ae040: 0x10ae040: beq   v0, zero, 0x10ae054 addiu v0, zero, 16
 	ldloc 5
 	ldc.i4.s 16
 	stloc 5
-	brfalse L_10ada0c
+	brfalse L_10ae054
 // --- basic block ---
-L_10ada00:
-// 0x010ada00: 0x10ada00: j	 0x10adfe4 sw    s7, 32(s1)
+L_10ae048:
+// 0x010ae048: 0x10ae048: j	 0x10ae62c sw    s7, 32(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -9379,14 +9379,14 @@ L_10ada00:
 	add
 	ldloc 11
 	stelem.i4
-	br L_10adfe4
+	br L_10ae62c
 // --- basic block ---
-L_10ada08:
-// 0x010ada08: 0x10ada08: addiu v0, zero, 16
+L_10ae050:
+// 0x010ae050: 0x10ae050: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-L_10ada0c:
-// 0x010ada0c: 0x10ada0c: sw    v0, 20(sp)
+L_10ae054:
+// 0x010ae054: 0x10ae054: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9395,12 +9395,12 @@ L_10ada0c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ada10: 0x10ada10: addiu v0, sp, 40
+// 0x010ae058: 0x10ae058: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x010ada14: 0x10ada14: sw    v0, 24(sp)
+// 0x010ae05c: 0x10ae05c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9409,18 +9409,18 @@ L_10ada0c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ada18: 0x10ada18: lui   s4, 0x90000
+// 0x010ae060: 0x10ae060: lui   s4, 0x90000
 	ldc.i4 589824
 	stloc 9
-// 0x010ada1c: 0x10ada1c: addiu v0, sp, 44
+// 0x010ae064: 0x10ae064: addiu v0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 5
-// 0x010ada20: 0x10ada20: addu  a0, s6, zero
+// 0x010ae068: 0x10ae068: addu  a0, s6, zero
 	ldloc 19
 	stloc.1
-// 0x010ada24: 0x10ada24: sw    v0, 28(sp)
+// 0x010ae06c: 0x10ae06c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9429,26 +9429,26 @@ L_10ada0c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ada28: 0x10ada28: addiu s4, s4, -13132
+// 0x010ae070: 0x10ae070: addiu s4, s4, -12668
 	ldloc 9
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 9
-// 0x010ada2c: 0x10ada2c: addiu v0, sp, 48
+// 0x010ae074: 0x10ae074: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x010ada30: 0x10ada30: addu  a1, s3, zero
+// 0x010ae078: 0x10ae078: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x010ada34: 0x10ada34: addu  a2, s1, zero
+// 0x010ae07c: 0x10ae07c: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x010ada38: 0x10ada38: addu  a3, s0, zero
+// 0x010ae080: 0x10ae080: addu  a3, s0, zero
 	ldloc 12
 	stloc 4
-// 0x010ada3c: 0x10ada3c: sw    v0, 32(sp)
+// 0x010ae084: 0x10ae084: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9457,7 +9457,7 @@ L_10ada0c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ada40: 0x10ada40: jal   0x10af7e4 sw    s4, 16(sp)
+// 0x010ae088: 0x10ae088: jal   0x10afe2c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9471,12 +9471,12 @@ L_10ada0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_find_street_10af7e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_find_street_10afe2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ada48: 0x10ada48: lw    a0, 44(sp)
+// 0x010ae090: 0x10ae090: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9485,7 +9485,7 @@ L_10ada0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ada4c: 0x10ada4c: jal   0x102be58 sw    v0, 216(sp)
+// 0x010ae094: 0x10ae094: jal   0x102be68 sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9495,14 +9495,14 @@ L_10ada0c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ada54: 0x10ada54: bne   v0, zero, 0x10adc0c sll   zero, zero, 0
+// 0x010ae09c: 0x10ae09c: bne   v0, zero, 0x10ae254 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10adc0c
+	brtrue L_10ae254
 // --- basic block ---
-// 0x010ada5c: 0x10ada5c: lw    a0, 44(sp)
+// 0x010ae0a4: 0x10ae0a4: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9511,28 +9511,28 @@ L_10ada0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ada60: 0x10ada60: jal   0x102be40 sll   zero, zero, 0
+// 0x010ae0a8: 0x10ae0a8: jal   0x102be50 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ada68: 0x10ada68: beq   v0, zero, 0x10adc0c sll   zero, zero, 0
+// 0x010ae0b0: 0x10ae0b0: beq   v0, zero, 0x10ae254 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10adc0c
+	brfalse L_10ae254
 // --- basic block ---
-// 0x010ada70: 0x10ada70: lw    v0, 0(s1)
+// 0x010ae0b8: 0x10ae0b8: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ada74: 0x10ada74: sll   zero, zero, 0
-// 0x010ada78: 0x10ada78: beq   v0, zero, 0x10adc0c sll   zero, zero, 0
+// 0x010ae0bc: 0x10ae0bc: sll   zero, zero, 0
+// 0x010ae0c0: 0x10ae0c0: beq   v0, zero, 0x10ae254 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10adc0c
+	brfalse L_10ae254
 // --- basic block ---
-// 0x010ada80: 0x10ada80: lw    s7, 20(s0)
+// 0x010ae0c8: 0x10ae0c8: lw    s7, 20(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9541,29 +9541,29 @@ L_10ada0c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ada84: 0x10ada84: jal   0x10b0f9c sll   zero, zero, 0
+// 0x010ae0cc: 0x10ae0cc: jal   0x10b15e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ada8c: 0x10ada8c: slt   v0, s7, v0
+// 0x010ae0d4: 0x10ae0d4: slt   v0, s7, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x010ada90: 0x10ada90: beq   v0, zero, 0x10adc0c addiu v0, zero, 48
+// 0x010ae0d8: 0x10ae0d8: beq   v0, zero, 0x10ae254 addiu v0, zero, 48
 	ldloc 5
 	ldc.i4.s 48
 	stloc 5
-	brfalse L_10adc0c
+	brfalse L_10ae254
 // --- basic block ---
-// 0x010ada98: 0x10ada98: lw    s5, 40(sp)
+// 0x010ae0e0: 0x10ae0e0: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9572,55 +9572,55 @@ L_10ada0c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010ada9c: 0x10ada9c: sll   zero, zero, 0
-// 0x010adaa0: 0x10adaa0: mult  s5, v0
+// 0x010ae0e4: 0x10ae0e4: sll   zero, zero, 0
+// 0x010ae0e8: 0x10ae0e8: mult  s5, v0
 	ldloc 18
 	ldloc 5
 	mul
 	stloc 8
-// 0x010adaa4: 0x10adaa4: lw    v1, 0(s0)
+// 0x010ae0ec: 0x10ae0ec: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010adaa8: 0x10adaa8: mflo  lo
+// 0x010ae0f0: 0x10ae0f0: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010adaac: 0x10adaac: addu  v0, v0, s4
+// 0x010ae0f4: 0x10ae0f4: addu  v0, v0, s4
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x010adab0: 0x10adab0: lw    v0, 0(v0)
+// 0x010ae0f8: 0x10ae0f8: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010adab4: 0x10adab4: sll   zero, zero, 0
-// 0x010adab8: 0x10adab8: bne   v0, v1, 0x10adb48 sll   zero, zero, 0
+// 0x010ae0fc: 0x10ae0fc: sll   zero, zero, 0
+// 0x010ae100: 0x10ae100: bne   v0, v1, 0x10ae190 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_10adb48
+	bne.un L_10ae190
 // --- basic block ---
-// 0x010adac0: 0x10adac0: bne   v0, zero, 0x10adaf4 addiu a0, zero, 48
+// 0x010ae108: 0x10ae108: bne   v0, zero, 0x10ae13c addiu a0, zero, 48
 	ldloc 5
 	ldc.i4.s 48
 	stloc.1
-	brtrue L_10adaf4
+	brtrue L_10ae13c
 // --- basic block ---
-// 0x010adac8: 0x10adac8: addiu v1, zero, 6
+// 0x010ae110: 0x10ae110: addiu v1, zero, 6
 	ldc.i4.6
 	stloc 7
-// 0x010adacc: 0x10adacc: mult  s5, v1
+// 0x010ae114: 0x10ae114: mult  s5, v1
 	ldloc 18
 	ldloc 7
 	mul
 	stloc 8
-// 0x010adad0: 0x10adad0: lw    v0, 12(s0)
+// 0x010ae118: 0x10ae118: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9629,25 +9629,25 @@ L_10ada0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adad4: 0x10adad4: mflo  lo
+// 0x010ae11c: 0x10ae11c: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x010adad8: 0x10adad8: addiu v1, v1, 1
+// 0x010ae120: 0x10ae120: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010adadc: 0x10adadc: sll   v1, v1, 3
+// 0x010ae124: 0x10ae124: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x010adae0: 0x10adae0: addu  s4, s4, v1
+// 0x010ae128: 0x10ae128: addu  s4, s4, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 9
-// 0x010adae4: 0x10adae4: lw    v1, 4(s4)
+// 0x010ae12c: 0x10ae12c: lw    v1, 4(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -9656,29 +9656,29 @@ L_10ada0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adae8: 0x10adae8: sll   zero, zero, 0
-// 0x010adaec: 0x10adaec: bne   v1, v0, 0x10adb4c lui   s3, 0x90000
+// 0x010ae130: 0x10ae130: sll   zero, zero, 0
+// 0x010ae134: 0x10ae134: bne   v1, v0, 0x10ae194 lui   s3, 0x90000
 	ldloc 7
 	ldloc 5
 	ldc.i4 589824
 	stloc 14
-	bne.un L_10adb4c
+	bne.un L_10ae194
 // --- basic block ---
-L_10adaf4:
-// 0x010adaf4: 0x10adaf4: mult  s5, a0
+L_10ae13c:
+// 0x010ae13c: 0x10ae13c: mult  s5, a0
 	ldloc 18
 	ldloc.1
 	mul
 	stloc 8
-// 0x010adaf8: 0x10adaf8: lui   v0, 0x90000
+// 0x010ae140: 0x10ae140: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010adafc: 0x10adafc: addiu v0, v0, -13132
+// 0x010ae144: 0x10ae144: addiu v0, v0, -12668
 	ldloc 5
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 5
-// 0x010adb00: 0x10adb00: lw    v1, 4(s0)
+// 0x010ae148: 0x10ae148: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9687,15 +9687,15 @@ L_10adaf4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adb04: 0x10adb04: mflo  lo
+// 0x010ae14c: 0x10ae14c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010adb08: 0x10adb08: addu  a0, v0, a0
+// 0x010ae150: 0x10ae150: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x010adb0c: 0x10adb0c: lw    a0, 4(a0)
+// 0x010ae154: 0x10ae154: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -9704,23 +9704,23 @@ L_10adaf4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adb10: 0x10adb10: sll   zero, zero, 0
-// 0x010adb14: 0x10adb14: bne   a0, v1, 0x10adb4c lui   s3, 0x90000
+// 0x010ae158: 0x10ae158: sll   zero, zero, 0
+// 0x010ae15c: 0x10ae15c: bne   a0, v1, 0x10ae194 lui   s3, 0x90000
 	ldloc.1
 	ldloc 7
 	ldc.i4 589824
 	stloc 14
-	bne.un L_10adb4c
+	bne.un L_10ae194
 // --- basic block ---
-// 0x010adb1c: 0x10adb1c: addiu a0, zero, 3
+// 0x010ae164: 0x10ae164: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010adb20: 0x10adb20: mult  s5, a0
+// 0x010ae168: 0x10ae168: mult  s5, a0
 	ldloc 18
 	ldloc.1
 	mul
 	stloc 8
-// 0x010adb24: 0x10adb24: lw    v1, 16(s0)
+// 0x010ae16c: 0x10ae16c: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -9729,54 +9729,54 @@ L_10adaf4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adb28: 0x10adb28: mflo  lo
+// 0x010ae170: 0x10ae170: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010adb2c: 0x10adb2c: addiu a0, a0, 1
+// 0x010ae174: 0x10ae174: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010adb30: 0x10adb30: sll   a0, a0, 4
+// 0x010ae178: 0x10ae178: sll   a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	shl
 	stloc.1
-// 0x010adb34: 0x10adb34: addu  v0, a0, v0
+// 0x010ae17c: 0x10ae17c: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x010adb38: 0x10adb38: lw    v0, 0(v0)
+// 0x010ae180: 0x10ae180: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010adb3c: 0x10adb3c: sll   zero, zero, 0
-// 0x010adb40: 0x10adb40: beq   v0, v1, 0x10adfe4 sll   zero, zero, 0
+// 0x010ae184: 0x10ae184: sll   zero, zero, 0
+// 0x010ae188: 0x10ae188: beq   v0, v1, 0x10ae62c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_10adfe4
+	beq  L_10ae62c
 // --- basic block ---
-L_10adb48:
-// 0x010adb48: 0x10adb48: lui   s3, 0x90000
+L_10ae190:
+// 0x010ae190: 0x10ae190: lui   s3, 0x90000
 	ldc.i4 589824
 	stloc 14
-L_10adb4c:
-// 0x010adb4c: 0x10adb4c: addiu s3, s3, -32416
+L_10ae194:
+// 0x010ae194: 0x10ae194: addiu s3, s3, -31952
 	ldloc 14
-	ldc.i4 -32416
+	ldc.i4 -31952
 	add
 	stloc 14
-// 0x010adb50: 0x10adb50: addu  a0, s3, zero
+// 0x010ae198: 0x10ae198: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x010adb54: 0x10adb54: addu  a1, s1, zero
+// 0x010ae19c: 0x10ae19c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010adb58: 0x10adb58: jal   0x1001800 addiu a2, zero, 76
+// 0x010ae1a0: 0x10ae1a0: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -9788,18 +9788,18 @@ L_10adb4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adb60: 0x10adb60: addiu s7, zero, 48
+// 0x010ae1a8: 0x10ae1a8: addiu s7, zero, 48
 	ldc.i4.s 48
 	stloc 11
-// 0x010adb64: 0x10adb64: addiu a0, s3, 76
+// 0x010ae1ac: 0x10ae1ac: addiu a0, s3, 76
 	ldloc 14
 	ldc.i4.s 76
 	add
 	stloc.1
-// 0x010adb68: 0x10adb68: addu  a1, s0, zero
+// 0x010ae1b0: 0x10ae1b0: addu  a1, s0, zero
 	ldloc 12
 	stloc.2
-// 0x010adb6c: 0x10adb6c: jal   0x1001800 addiu a2, zero, 48
+// 0x010ae1b4: 0x10ae1b4: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -9811,15 +9811,15 @@ L_10adb4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adb74: 0x10adb74: mult  s5, s7
+// 0x010ae1bc: 0x10ae1bc: mult  s5, s7
 	ldloc 18
 	ldloc 11
 	mul
 	stloc 8
-// 0x010adb78: 0x10adb78: addiu s4, zero, 1
+// 0x010ae1c0: 0x10ae1c0: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010adb7c: 0x10adb7c: sw    zero, 124(s3)
+// 0x010ae1c4: 0x10ae1c4: sw    zero, 124(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -9828,7 +9828,7 @@ L_10adb4c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010adb80: 0x10adb80: sw    s4, 1920(s3)
+// 0x010ae1c8: 0x10ae1c8: sw    s4, 1920(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -9837,7 +9837,7 @@ L_10adb4c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010adb84: 0x10adb84: sw    zero, 1924(s3)
+// 0x010ae1cc: 0x10ae1cc: sw    zero, 1924(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -9846,10 +9846,10 @@ L_10adb4c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010adb88: 0x10adb88: lui   s5, 0x90000
+// 0x010ae1d0: 0x10ae1d0: lui   s5, 0x90000
 	ldc.i4 589824
 	stloc 18
-// 0x010adb8c: 0x10adb8c: lw    v0, 16(s6)
+// 0x010ae1d4: 0x10ae1d4: lw    v0, 16(s6)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
@@ -9858,29 +9858,29 @@ L_10adb4c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adb90: 0x10adb90: addiu s5, s5, -13132
+// 0x010ae1d8: 0x10ae1d8: addiu s5, s5, -12668
 	ldloc 18
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 18
-// 0x010adb94: 0x10adb94: addiu s6, sp, 64
+// 0x010ae1dc: 0x10ae1dc: addiu s6, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 19
-// 0x010adb98: 0x10adb98: addu  a1, s1, zero
+// 0x010ae1e0: 0x10ae1e0: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010adb9c: 0x10adb9c: addu  a2, s0, zero
+// 0x010ae1e4: 0x10ae1e4: addu  a2, s0, zero
 	ldloc 12
 	stloc.3
-// 0x010adba0: 0x10adba0: addu  a0, s6, zero
+// 0x010ae1e8: 0x10ae1e8: addu  a0, s6, zero
 	ldloc 19
 	stloc.1
-// 0x010adba4: 0x10adba4: mflo  lo
+// 0x010ae1ec: 0x10ae1ec: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x010adba8: 0x10adba8: sw    v0, 20(sp)
+// 0x010ae1f0: 0x10ae1f0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9889,12 +9889,12 @@ L_10adb4c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010adbac: 0x10adbac: addu  a3, s5, a3
+// 0x010ae1f4: 0x10ae1f4: addu  a3, s5, a3
 	ldloc 18
 	ldloc 4
 	add
 	stloc 4
-// 0x010adbb0: 0x10adbb0: jal   0x102a3cc sw    zero, 16(sp)
+// 0x010ae1f8: 0x10ae1f8: jal   0x102a3dc sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9908,23 +9908,23 @@ L_10adb4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adbb8: 0x10adbb8: addu  a1, s6, zero
+// 0x010ae200: 0x10ae200: addu  a1, s6, zero
 	ldloc 19
 	stloc.2
-// 0x010adbbc: 0x10adbbc: addiu a0, s3, 1928
+// 0x010ae204: 0x10ae204: addiu a0, s3, 1928
 	ldloc 14
 	ldc.i4 1928
 	add
 	stloc.1
-// 0x010adbc0: 0x10adbc0: addiu a2, zero, 76
+// 0x010ae208: 0x10ae208: addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
-// 0x010adbc4: 0x10adbc4: sw    v0, 96(sp)
+// 0x010ae20c: 0x10ae20c: sw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9933,7 +9933,7 @@ L_10adb4c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010adbc8: 0x10adbc8: sw    v0, 92(sp)
+// 0x010ae210: 0x10ae210: sw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9942,7 +9942,7 @@ L_10adb4c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010adbcc: 0x10adbcc: jal   0x1001800 sw    s4, 64(sp)
+// 0x010ae214: 0x10ae214: jal   0x1001800 sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9960,7 +9960,7 @@ L_10adb4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adbd4: 0x10adbd4: lw    v0, 40(sp)
+// 0x010ae21c: 0x10ae21c: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9969,23 +9969,23 @@ L_10adb4c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adbd8: 0x10adbd8: addiu a0, s3, 2004
+// 0x010ae220: 0x10ae220: addiu a0, s3, 2004
 	ldloc 14
 	ldc.i4 2004
 	add
 	stloc.1
-// 0x010adbdc: 0x10adbdc: mult  v0, s7
+// 0x010ae224: 0x10ae224: mult  v0, s7
 	ldloc 5
 	ldloc 11
 	mul
 	stloc 8
-// 0x010adbe0: 0x10adbe0: addiu a2, zero, 48
+// 0x010ae228: 0x10ae228: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010adbe4: 0x10adbe4: mflo  lo
+// 0x010ae22c: 0x10ae22c: mflo  lo
 	ldloc 8
 	stloc 11
-// 0x010adbe8: 0x10adbe8: jal   0x1001800 addu  a1, s5, s7
+// 0x010ae230: 0x10ae230: jal   0x1001800 addu  a1, s5, s7
 	ldloc 18
 	ldloc 11
 	add
@@ -9999,22 +9999,22 @@ L_10adb4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adbf0: 0x10adbf0: addiu v1, zero, 2
+// 0x010ae238: 0x10ae238: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x010adbf4: 0x10adbf4: lui   v0, 0x90000
+// 0x010ae23c: 0x10ae23c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010adbf8: 0x10adbf8: sw    v1, -13136(v0)
+// 0x010ae240: 0x10ae240: sw    v1, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldloc 7
 	stelem.i4
-// 0x010adbfc: 0x10adbfc: sw    s2, 2052(s3)
+// 0x010ae244: 0x10ae244: sw    s2, 2052(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -10023,7 +10023,7 @@ L_10adb4c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010adc00: 0x10adc00: sw    s4, 3848(s3)
+// 0x010ae248: 0x10ae248: sw    s4, 3848(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -10032,7 +10032,7 @@ L_10adb4c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010adc04: 0x10adc04: j	 0x10adfe4 sw    zero, 3852(s3)
+// 0x010ae24c: 0x10ae24c: j	 0x10ae62c sw    zero, 3852(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -10041,10 +10041,10 @@ L_10adb4c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10adfe4
+	br L_10ae62c
 // --- basic block ---
-L_10adc0c:
-// 0x010adc0c: 0x10adc0c: lw    a0, 44(sp)
+L_10ae254:
+// 0x010ae254: 0x10ae254: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10053,16 +10053,16 @@ L_10adc0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adc10: 0x10adc10: jal   0x102be58 sll   zero, zero, 0
+// 0x010ae258: 0x10ae258: jal   0x102be68 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010adc18: 0x10adc18: beq   v0, zero, 0x10adc34 sll   zero, zero, 0
+// 0x010ae260: 0x10ae260: beq   v0, zero, 0x10ae27c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10adc34
+	brfalse L_10ae27c
 // --- basic block ---
-// 0x010adc20: 0x10adc20: lw    a0, 48(sp)
+// 0x010ae268: 0x10ae268: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10071,17 +10071,17 @@ L_10adc0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adc24: 0x10adc24: jal   0x102be58 sll   zero, zero, 0
+// 0x010ae26c: 0x10ae26c: jal   0x102be68 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010adc2c: 0x10adc2c: bne   v0, zero, 0x10adc5c sll   zero, zero, 0
+// 0x010ae274: 0x10ae274: bne   v0, zero, 0x10ae2a4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10adc5c
+	brtrue L_10ae2a4
 // --- basic block ---
-L_10adc34:
-// 0x010adc34: 0x10adc34: lw    a0, 44(sp)
+L_10ae27c:
+// 0x010ae27c: 0x10ae27c: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10090,16 +10090,16 @@ L_10adc34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adc38: 0x10adc38: jal   0x102be58 sll   zero, zero, 0
+// 0x010ae280: 0x10ae280: jal   0x102be68 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010adc40: 0x10adc40: bne   v0, zero, 0x10ade30 sll   zero, zero, 0
+// 0x010ae288: 0x10ae288: bne   v0, zero, 0x10ae478 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ade30
+	brtrue L_10ae478
 // --- basic block ---
-// 0x010adc48: 0x10adc48: lw    a0, 48(sp)
+// 0x010ae290: 0x10ae290: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10108,17 +10108,17 @@ L_10adc34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adc4c: 0x10adc4c: jal   0x102be40 sll   zero, zero, 0
+// 0x010ae294: 0x10ae294: jal   0x102be50 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x010adc54: 0x10adc54: beq   v0, zero, 0x10ade30 sll   zero, zero, 0
+// 0x010ae29c: 0x10ae29c: beq   v0, zero, 0x10ae478 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10ade30
+	brfalse L_10ae478
 // --- basic block ---
-L_10adc5c:
-// 0x010adc5c: 0x10adc5c: lw    a0, 44(sp)
+L_10ae2a4:
+// 0x010ae2a4: 0x10ae2a4: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10127,17 +10127,17 @@ L_10adc5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adc60: 0x10adc60: jal   0x102be58 lui   s4, 0x90000
+// 0x010ae2a8: 0x10ae2a8: jal   0x102be68 lui   s4, 0x90000
 	ldc.i4 589824
 	stloc 9
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010adc68: 0x10adc68: addu  s7, zero, zero
+// 0x010ae2b0: 0x10ae2b0: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010adc6c: 0x10adc6c: sw    v0, 220(sp)
+// 0x010ae2b4: 0x10ae2b4: sw    v0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10146,18 +10146,18 @@ L_10adc5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010adc70: 0x10adc70: addiu s4, s4, -13132
+// 0x010ae2b8: 0x10ae2b8: addiu s4, s4, -12668
 	ldloc 9
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 9
-// 0x010adc74: 0x10adc74: j	 0x10ade00 lui   s8, 0x90000
+// 0x010ae2bc: 0x10ae2bc: j	 0x10ae448 lui   s8, 0x90000
 	ldc.i4 589824
 	stloc 17
-	br L_10ade00
+	br L_10ae448
 // --- basic block ---
-L_10adc7c:
-// 0x010adc7c: 0x10adc7c: lw    v0, 16(s6)
+L_10ae2c4:
+// 0x010ae2c4: 0x10ae2c4: lw    v0, 16(s6)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
@@ -10166,16 +10166,16 @@ L_10adc7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adc80: 0x10adc80: addu  a1, s1, zero
+// 0x010ae2c8: 0x10ae2c8: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010adc84: 0x10adc84: addu  a2, s0, zero
+// 0x010ae2cc: 0x10ae2cc: addu  a2, s0, zero
 	ldloc 12
 	stloc.3
-// 0x010adc88: 0x10adc88: addu  a3, s4, zero
+// 0x010ae2d0: 0x10ae2d0: addu  a3, s4, zero
 	ldloc 9
 	stloc 4
-// 0x010adc8c: 0x10adc8c: sw    v0, 20(sp)
+// 0x010ae2d4: 0x10ae2d4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10184,7 +10184,7 @@ L_10adc7c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010adc90: 0x10adc90: jal   0x102a3cc sw    zero, 16(sp)
+// 0x010ae2d8: 0x10ae2d8: jal   0x102a3dc sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10198,15 +10198,15 @@ L_10adc7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adc98: 0x10adc98: addu  a0, v0, zero
+// 0x010ae2e0: 0x10ae2e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010adc9c: 0x10adc9c: jal   0x102be58 sw    v0, 264(sp)
+// 0x010ae2e4: 0x10ae2e4: jal   0x102be68 sw    v0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10216,10 +10216,10 @@ L_10adc7c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010adca4: 0x10adca4: lw    v1, 264(sp)
+// 0x010ae2ec: 0x10ae2ec: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10228,11 +10228,11 @@ L_10adc7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adca8: 0x10adca8: bne   v0, zero, 0x10adcd4 sll   zero, zero, 0
+// 0x010ae2f0: 0x10ae2f0: bne   v0, zero, 0x10ae31c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10adcd4
+	brtrue L_10ae31c
 // --- basic block ---
-// 0x010adcb0: 0x10adcb0: lw    v0, 220(sp)
+// 0x010ae2f8: 0x10ae2f8: lw    v0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10241,19 +10241,19 @@ L_10adc7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adcb4: 0x10adcb4: sll   zero, zero, 0
-// 0x010adcb8: 0x10adcb8: bne   v0, zero, 0x10addf8 sll   zero, zero, 0
+// 0x010ae2fc: 0x10ae2fc: sll   zero, zero, 0
+// 0x010ae300: 0x10ae300: bne   v0, zero, 0x10ae440 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10addf8
+	brtrue L_10ae440
 // --- basic block ---
-// 0x010adcc0: 0x10adcc0: jal   0x102be40 addu  a0, v1, zero
+// 0x010ae308: 0x10ae308: jal   0x102be50 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x010adcc8: 0x10adcc8: lw    v1, 264(sp)
+// 0x010ae310: 0x10ae310: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10262,52 +10262,52 @@ L_10adc7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adccc: 0x10adccc: beq   v0, zero, 0x10addf8 sll   zero, zero, 0
+// 0x010ae314: 0x10ae314: beq   v0, zero, 0x10ae440 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10addf8
+	brfalse L_10ae440
 // --- basic block ---
-L_10adcd4:
-// 0x010adcd4: 0x10adcd4: lw    v0, 0(s1)
+L_10ae31c:
+// 0x010ae31c: 0x10ae31c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010adcd8: 0x10adcd8: sll   zero, zero, 0
-// 0x010adcdc: 0x10adcdc: beq   v0, zero, 0x10add54 sll   zero, zero, 0
+// 0x010ae320: 0x10ae320: sll   zero, zero, 0
+// 0x010ae324: 0x10ae324: beq   v0, zero, 0x10ae39c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10add54
+	brfalse L_10ae39c
 // --- basic block ---
-// 0x010adce4: 0x10adce4: beq   s0, zero, 0x10add54 sll   zero, zero, 0
+// 0x010ae32c: 0x10ae32c: beq   s0, zero, 0x10ae39c sll   zero, zero, 0
 	ldloc 12
-	brfalse L_10add54
+	brfalse L_10ae39c
 // --- basic block ---
-// 0x010adcec: 0x10adcec: lw    v0, 0(s0)
+// 0x010ae334: 0x10ae334: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010adcf0: 0x10adcf0: lw    a0, 0(s4)
+// 0x010ae338: 0x10ae338: lw    a0, 0(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010adcf4: 0x10adcf4: sll   zero, zero, 0
-// 0x010adcf8: 0x10adcf8: bne   v0, a0, 0x10add54 sll   zero, zero, 0
+// 0x010ae33c: 0x10ae33c: sll   zero, zero, 0
+// 0x010ae340: 0x10ae340: bne   v0, a0, 0x10ae39c sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_10add54
+	bne.un L_10ae39c
 // --- basic block ---
-// 0x010add00: 0x10add00: bne   v0, zero, 0x10add1c sll   zero, zero, 0
+// 0x010ae348: 0x10ae348: bne   v0, zero, 0x10ae364 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10add1c
+	brtrue L_10ae364
 // --- basic block ---
-// 0x010add08: 0x10add08: lw    a0, 12(s0)
+// 0x010ae350: 0x10ae350: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -10316,7 +10316,7 @@ L_10adcd4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010add0c: 0x10add0c: lw    v0, 12(s4)
+// 0x010ae354: 0x10ae354: lw    v0, 12(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -10325,14 +10325,14 @@ L_10adcd4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010add10: 0x10add10: sll   zero, zero, 0
-// 0x010add14: 0x10add14: bne   a0, v0, 0x10add54 sll   zero, zero, 0
+// 0x010ae358: 0x10ae358: sll   zero, zero, 0
+// 0x010ae35c: 0x10ae35c: bne   a0, v0, 0x10ae39c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_10add54
+	bne.un L_10ae39c
 // --- basic block ---
-L_10add1c:
-// 0x010add1c: 0x10add1c: lw    a0, 4(s0)
+L_10ae364:
+// 0x010ae364: 0x10ae364: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -10341,7 +10341,7 @@ L_10add1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010add20: 0x10add20: lw    v0, 4(s4)
+// 0x010ae368: 0x10ae368: lw    v0, 4(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -10350,13 +10350,13 @@ L_10add1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010add24: 0x10add24: sll   zero, zero, 0
-// 0x010add28: 0x10add28: bne   a0, v0, 0x10add54 sll   zero, zero, 0
+// 0x010ae36c: 0x10ae36c: sll   zero, zero, 0
+// 0x010ae370: 0x10ae370: bne   a0, v0, 0x10ae39c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_10add54
+	bne.un L_10ae39c
 // --- basic block ---
-// 0x010add30: 0x10add30: lw    a0, 16(s0)
+// 0x010ae378: 0x10ae378: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -10365,7 +10365,7 @@ L_10add1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010add34: 0x10add34: lw    v0, 16(s4)
+// 0x010ae37c: 0x10ae37c: lw    v0, 16(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -10374,54 +10374,54 @@ L_10add1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010add38: 0x10add38: sll   zero, zero, 0
-// 0x010add3c: 0x10add3c: bne   a0, v0, 0x10add54 sll   zero, zero, 0
+// 0x010ae380: 0x10ae380: sll   zero, zero, 0
+// 0x010ae384: 0x10ae384: bne   a0, v0, 0x10ae39c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_10add54
+	bne.un L_10ae39c
 // --- basic block ---
-// 0x010add44: 0x10add44: j	 0x10ae06c sll   zero, zero, 0
-	br L_10ae06c
+// 0x010ae38c: 0x10ae38c: j	 0x10ae6b4 sll   zero, zero, 0
+	br L_10ae6b4
 // --- basic block ---
-L_10add4c:
-// 0x010add4c: 0x10add4c: j	 0x10adfe4 sw    zero, -13136(v0)
+L_10ae394:
+// 0x010ae394: 0x10ae394: j	 0x10ae62c sw    zero, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10adfe4
+	br L_10ae62c
 // --- basic block ---
-L_10add54:
-// 0x010add54: 0x10add54: lw    a3, -13136(s8)
+L_10ae39c:
+// 0x010ae39c: 0x10ae39c: lw    a3, -12672(s8)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 4
-// 0x010add58: 0x10add58: addiu a0, zero, 1928
+// 0x010ae3a0: 0x10ae3a0: addiu a0, zero, 1928
 	ldc.i4 1928
 	stloc.1
-// 0x010add5c: 0x10add5c: mult  a3, a0
+// 0x010ae3a4: 0x10ae3a4: mult  a3, a0
 	ldloc 4
 	ldloc.1
 	mul
 	stloc 8
-// 0x010add60: 0x10add60: lui   a0, 0x90000
+// 0x010ae3a8: 0x10ae3a8: lui   a0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010add64: 0x10add64: addiu a0, a0, -32416
+// 0x010ae3ac: 0x10ae3ac: addiu a0, a0, -31952
 	ldloc.1
-	ldc.i4 -32416
+	ldc.i4 -31952
 	add
 	stloc.1
-// 0x010add68: 0x10add68: sw    v1, 92(sp)
+// 0x010ae3b0: 0x10ae3b0: sw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10430,7 +10430,7 @@ L_10add54:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010add6c: 0x10add6c: sw    v1, 96(sp)
+// 0x010ae3b4: 0x10ae3b4: sw    v1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10439,18 +10439,18 @@ L_10add54:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010add70: 0x10add70: addiu t1, zero, 1
+// 0x010ae3b8: 0x10ae3b8: addiu t1, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x010add74: 0x10add74: addiu a1, sp, 64
+// 0x010ae3bc: 0x10ae3bc: addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x010add78: 0x10add78: addiu a2, zero, 76
+// 0x010ae3c0: 0x10ae3c0: addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
-// 0x010add7c: 0x10add7c: sw    t1, 64(sp)
+// 0x010ae3c4: 0x10ae3c4: sw    t1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10459,7 +10459,7 @@ L_10add54:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010add80: 0x10add80: sw    a3, 260(sp)
+// 0x010ae3c8: 0x10ae3c8: sw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10468,18 +10468,18 @@ L_10add54:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010add84: 0x10add84: mflo  lo
+// 0x010ae3cc: 0x10ae3cc: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010add88: 0x10add88: addu  v1, v0, a0
+// 0x010ae3d0: 0x10ae3d0: addu  v1, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 7
-// 0x010add8c: 0x10add8c: addu  a0, v1, zero
+// 0x010ae3d4: 0x10ae3d4: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x010add90: 0x10add90: jal   0x1001800 sw    v1, 264(sp)
+// 0x010ae3d8: 0x10ae3d8: jal   0x1001800 sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10497,7 +10497,7 @@ L_10add54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010add98: 0x10add98: lw    v1, 264(sp)
+// 0x010ae3e0: 0x10ae3e0: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10506,15 +10506,15 @@ L_10add54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010add9c: 0x10add9c: addiu a2, zero, 48
+// 0x010ae3e4: 0x10ae3e4: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010adda0: 0x10adda0: addiu a0, v1, 76
+// 0x010ae3e8: 0x10ae3e8: addiu a0, v1, 76
 	ldloc 7
 	ldc.i4.s 76
 	add
 	stloc.1
-// 0x010adda4: 0x10adda4: jal   0x1001800 addu  a1, s4, zero
+// 0x010ae3ec: 0x10ae3ec: jal   0x1001800 addu  a1, s4, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -10526,7 +10526,7 @@ L_10add54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010addac: 0x10addac: lw    a3, 260(sp)
+// 0x010ae3f4: 0x10ae3f4: lw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10535,7 +10535,7 @@ L_10add54:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010addb0: 0x10addb0: lw    v1, 264(sp)
+// 0x010ae3f8: 0x10ae3f8: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10544,18 +10544,18 @@ L_10add54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010addb4: 0x10addb4: addiu a3, a3, 1
+// 0x010ae3fc: 0x10ae3fc: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010addb8: 0x10addb8: addiu a2, zero, 1
+// 0x010ae400: 0x10ae400: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010addbc: 0x10addbc: addiu t1, zero, 10
+// 0x010ae404: 0x10ae404: addiu t1, zero, 10
 	ldc.i4.s 10
 	stloc 13
-// 0x010addc0: 0x10addc0: sw    zero, 1924(v1)
+// 0x010ae408: 0x10ae408: sw    zero, 1924(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -10564,7 +10564,7 @@ L_10add54:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010addc4: 0x10addc4: sw    s2, 124(v1)
+// 0x010ae40c: 0x10ae40c: sw    s2, 124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -10573,7 +10573,7 @@ L_10add54:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010addc8: 0x10addc8: sw    a2, 1920(v1)
+// 0x010ae410: 0x10ae410: sw    a2, 1920(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -10582,39 +10582,39 @@ L_10add54:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010addcc: 0x10addcc: bne   a3, t1, 0x10addf8 sw    a3, -13136(s8)
+// 0x010ae414: 0x10ae414: bne   a3, t1, 0x10ae440 sw    a3, -12672(s8)
 	ldloc 4
 	ldloc 13
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldloc 4
 	stelem.i4
-	bne.un L_10addf8
+	bne.un L_10ae440
 // --- basic block ---
-// 0x010addd4: 0x10addd4: lui   a1, 0x20000
+// 0x010ae41c: 0x10ae41c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010addd8: 0x10addd8: lui   a3, 0x20000
+// 0x010ae420: 0x10ae420: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010adddc: 0x10adddc: addiu a1, a1, 16928
+// 0x010ae424: 0x10ae424: addiu a1, a1, 17388
 	ldloc.2
-	ldc.i4 16928
+	ldc.i4 17388
 	add
 	stloc.2
-// 0x010adde0: 0x10adde0: addiu a3, a3, 16972
+// 0x010ae428: 0x10ae428: addiu a3, a3, 17432
 	ldloc 4
-	ldc.i4 16972
+	ldc.i4 17432
 	add
 	stloc 4
-// 0x010adde4: 0x10adde4: addiu a0, zero, 4
+// 0x010ae42c: 0x10ae42c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010adde8: 0x10adde8: jal   0x100449c addiu a2, zero, 692
+// 0x010ae430: 0x10ae430: jal   0x100449c addiu a2, zero, 692
 	ldc.i4 692
 	stloc.3
 	ldloc.0
@@ -10627,25 +10627,25 @@ L_10add54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010addf0: 0x10addf0: j	 0x10ade18 lui   v0, 0x90000
+// 0x010ae438: 0x10ae438: j	 0x10ae460 lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-	br L_10ade18
+	br L_10ae460
 // --- basic block ---
-L_10addf8:
-// 0x010addf8: 0x10addf8: addiu s7, s7, 1
+L_10ae440:
+// 0x010ae440: 0x10ae440: addiu s7, s7, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_10addfc:
-// 0x010addfc: 0x10addfc: addiu s4, s4, 48
+L_10ae444:
+// 0x010ae444: 0x10ae444: addiu s4, s4, 48
 	ldloc 9
 	ldc.i4.s 48
 	add
 	stloc 9
-L_10ade00:
-// 0x010ade00: 0x10ade00: lw    v1, 216(sp)
+L_10ae448:
+// 0x010ae448: 0x10ae448: lw    v1, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10654,54 +10654,54 @@ L_10ade00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ade04: 0x10ade04: sll   zero, zero, 0
-// 0x010ade08: 0x10ade08: slt   v0, s7, v1
+// 0x010ae44c: 0x10ae44c: sll   zero, zero, 0
+// 0x010ae450: 0x10ae450: slt   v0, s7, v1
 	ldloc 11
 	ldloc 7
 	clt
 	stloc 5
-// 0x010ade0c: 0x10ade0c: bne   v0, zero, 0x10adc7c addiu a0, sp, 64
+// 0x010ae454: 0x10ae454: bne   v0, zero, 0x10ae2c4 addiu a0, sp, 64
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-	brtrue L_10adc7c
+	brtrue L_10ae2c4
 // --- basic block ---
-// 0x010ade14: 0x10ade14: lui   v0, 0x90000
+// 0x010ae45c: 0x10ae45c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10ade18:
-// 0x010ade18: 0x10ade18: lw    v1, -13136(v0)
+L_10ae460:
+// 0x010ae460: 0x10ae460: lw    v1, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ade1c: 0x10ade1c: sll   zero, zero, 0
-// 0x010ade20: 0x10ade20: slti  v1, v1, 2
+// 0x010ae464: 0x10ae464: sll   zero, zero, 0
+// 0x010ae468: 0x10ae468: slti  v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	clt
 	stloc 7
-// 0x010ade24: 0x10ade24: beq   v1, zero, 0x10adfe4 sll   zero, zero, 0
+// 0x010ae46c: 0x10ae46c: beq   v1, zero, 0x10ae62c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10adfe4
+	brfalse L_10ae62c
 // --- basic block ---
-// 0x010ade2c: 0x10ade2c: sw    zero, -13136(v0)
+// 0x010ae474: 0x10ae474: sw    zero, -12672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10ade30:
-// 0x010ade30: 0x10ade30: lw    a0, 44(sp)
+L_10ae478:
+// 0x010ae478: 0x10ae478: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10710,28 +10710,28 @@ L_10ade30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ade34: 0x10ade34: jal   0x102be40 sll   zero, zero, 0
+// 0x010ae47c: 0x10ae47c: jal   0x102be50 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ade3c: 0x10ade3c: beq   v0, zero, 0x10adfdc sll   zero, zero, 0
+// 0x010ae484: 0x10ae484: beq   v0, zero, 0x10ae624 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10adfdc
+	brfalse L_10ae624
 // --- basic block ---
-// 0x010ade44: 0x10ade44: lw    v0, 0(s1)
+// 0x010ae48c: 0x10ae48c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ade48: 0x10ade48: sll   zero, zero, 0
-// 0x010ade4c: 0x10ade4c: beq   v0, zero, 0x10adf6c sll   zero, zero, 0
+// 0x010ae490: 0x10ae490: sll   zero, zero, 0
+// 0x010ae494: 0x10ae494: beq   v0, zero, 0x10ae5b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10adf6c
+	brfalse L_10ae5b4
 // --- basic block ---
-// 0x010ade54: 0x10ade54: lw    v0, 40(sp)
+// 0x010ae49c: 0x10ae49c: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10740,68 +10740,68 @@ L_10ade30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ade58: 0x10ade58: beq   s0, zero, 0x10adf30 lui   v1, 0x90000
+// 0x010ae4a0: 0x10ae4a0: beq   s0, zero, 0x10ae578 lui   v1, 0x90000
 	ldloc 12
 	ldc.i4 589824
 	stloc 7
-	brfalse L_10adf30
+	brfalse L_10ae578
 // --- basic block ---
-// 0x010ade60: 0x10ade60: addiu a1, zero, 48
+// 0x010ae4a8: 0x10ae4a8: addiu a1, zero, 48
 	ldc.i4.s 48
 	stloc.2
-// 0x010ade64: 0x10ade64: mult  v0, a1
+// 0x010ae4ac: 0x10ae4ac: mult  v0, a1
 	ldloc 5
 	ldloc.2
 	mul
 	stloc 8
-// 0x010ade68: 0x10ade68: addiu v1, v1, -13132
+// 0x010ae4b0: 0x10ae4b0: addiu v1, v1, -12668
 	ldloc 7
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 7
-// 0x010ade6c: 0x10ade6c: lw    a0, 0(s0)
+// 0x010ae4b4: 0x10ae4b4: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010ade70: 0x10ade70: mflo  lo
+// 0x010ae4b8: 0x10ae4b8: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010ade74: 0x10ade74: addu  a1, a1, v1
+// 0x010ae4bc: 0x10ae4bc: addu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc.2
-// 0x010ade78: 0x10ade78: lw    a1, 0(a1)
+// 0x010ae4c0: 0x10ae4c0: lw    a1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010ade7c: 0x10ade7c: sll   zero, zero, 0
-// 0x010ade80: 0x10ade80: bne   a0, a1, 0x10adf30 sll   zero, zero, 0
+// 0x010ae4c4: 0x10ae4c4: sll   zero, zero, 0
+// 0x010ae4c8: 0x10ae4c8: bne   a0, a1, 0x10ae578 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	bne.un L_10adf30
+	bne.un L_10ae578
 // --- basic block ---
-// 0x010ade88: 0x10ade88: bne   a0, zero, 0x10adec0 addiu a0, zero, 48
+// 0x010ae4d0: 0x10ae4d0: bne   a0, zero, 0x10ae508 addiu a0, zero, 48
 	ldloc.1
 	ldc.i4.s 48
 	stloc.1
-	brtrue L_10adec0
+	brtrue L_10ae508
 // --- basic block ---
-// 0x010ade90: 0x10ade90: addiu a1, zero, 6
+// 0x010ae4d8: 0x10ae4d8: addiu a1, zero, 6
 	ldc.i4.6
 	stloc.2
-// 0x010ade94: 0x10ade94: mult  v0, a1
+// 0x010ae4dc: 0x10ae4dc: mult  v0, a1
 	ldloc 5
 	ldloc.2
 	mul
 	stloc 8
-// 0x010ade98: 0x10ade98: lw    a0, 12(s0)
+// 0x010ae4e0: 0x10ae4e0: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -10810,25 +10810,25 @@ L_10ade30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ade9c: 0x10ade9c: mflo  lo
+// 0x010ae4e4: 0x10ae4e4: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010adea0: 0x10adea0: addiu a1, a1, 1
+// 0x010ae4e8: 0x10ae4e8: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x010adea4: 0x10adea4: sll   a1, a1, 3
+// 0x010ae4ec: 0x10ae4ec: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x010adea8: 0x10adea8: addu  v1, v1, a1
+// 0x010ae4f0: 0x10ae4f0: addu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-// 0x010adeac: 0x10adeac: lw    v1, 4(v1)
+// 0x010ae4f4: 0x10ae4f4: lw    v1, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -10837,32 +10837,32 @@ L_10ade30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adeb0: 0x10adeb0: sll   zero, zero, 0
-// 0x010adeb4: 0x10adeb4: bne   a0, v1, 0x10adf34 addiu v1, zero, 48
+// 0x010ae4f8: 0x10ae4f8: sll   zero, zero, 0
+// 0x010ae4fc: 0x10ae4fc: bne   a0, v1, 0x10ae57c addiu v1, zero, 48
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 48
 	stloc 7
-	bne.un L_10adf34
+	bne.un L_10ae57c
 // --- basic block ---
-// 0x010adebc: 0x10adebc: addiu a0, zero, 48
+// 0x010ae504: 0x10ae504: addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
-L_10adec0:
-// 0x010adec0: 0x10adec0: mult  v0, a0
+L_10ae508:
+// 0x010ae508: 0x10ae508: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 8
-// 0x010adec4: 0x10adec4: lui   v1, 0x90000
+// 0x010ae50c: 0x10ae50c: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010adec8: 0x10adec8: addiu v1, v1, -13132
+// 0x010ae510: 0x10ae510: addiu v1, v1, -12668
 	ldloc 7
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc 7
-// 0x010adecc: 0x10adecc: lw    a1, 4(s0)
+// 0x010ae514: 0x10ae514: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -10871,15 +10871,15 @@ L_10adec0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010aded0: 0x10aded0: mflo  lo
+// 0x010ae518: 0x10ae518: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010aded4: 0x10aded4: addu  a0, v1, a0
+// 0x010ae51c: 0x10ae51c: addu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x010aded8: 0x10aded8: lw    a0, 4(a0)
+// 0x010ae520: 0x10ae520: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -10888,21 +10888,21 @@ L_10adec0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adedc: 0x10adedc: sll   zero, zero, 0
-// 0x010adee0: 0x10adee0: bne   a1, a0, 0x10adf30 sll   zero, zero, 0
+// 0x010ae524: 0x10ae524: sll   zero, zero, 0
+// 0x010ae528: 0x10ae528: bne   a1, a0, 0x10ae578 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_10adf30
+	bne.un L_10ae578
 // --- basic block ---
-// 0x010adee8: 0x10adee8: addiu a1, zero, 3
+// 0x010ae530: 0x10ae530: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010adeec: 0x10adeec: mult  v0, a1
+// 0x010ae534: 0x10ae534: mult  v0, a1
 	ldloc 5
 	ldloc.2
 	mul
 	stloc 8
-// 0x010adef0: 0x10adef0: lw    a0, 16(s0)
+// 0x010ae538: 0x10ae538: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -10911,44 +10911,44 @@ L_10adec0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adef4: 0x10adef4: mflo  lo
+// 0x010ae53c: 0x10ae53c: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010adef8: 0x10adef8: addiu a1, a1, 1
+// 0x010ae540: 0x10ae540: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x010adefc: 0x10adefc: sll   a1, a1, 4
+// 0x010ae544: 0x10ae544: sll   a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	shl
 	stloc.2
-// 0x010adf00: 0x10adf00: addu  v1, a1, v1
+// 0x010ae548: 0x10ae548: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x010adf04: 0x10adf04: lw    v1, 0(v1)
+// 0x010ae54c: 0x10ae54c: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010adf08: 0x10adf08: sll   zero, zero, 0
-// 0x010adf0c: 0x10adf0c: bne   a0, v1, 0x10adf34 addiu v1, zero, 48
+// 0x010ae550: 0x10ae550: sll   zero, zero, 0
+// 0x010ae554: 0x10ae554: bne   a0, v1, 0x10ae57c addiu v1, zero, 48
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 48
 	stloc 7
-	bne.un L_10adf34
+	bne.un L_10ae57c
 // --- basic block ---
-// 0x010adf14: 0x10adf14: j	 0x10ae088 sll   zero, zero, 0
-	br L_10ae088
+// 0x010ae55c: 0x10ae55c: j	 0x10ae6d0 sll   zero, zero, 0
+	br L_10ae6d0
 // --- basic block ---
-L_10adf1c:
-// 0x010adf1c: 0x10adf1c: lw    a0, 20(s1)
+L_10ae564:
+// 0x010ae564: 0x10ae564: lw    a0, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -10957,7 +10957,7 @@ L_10adf1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010adf20: 0x10adf20: lw    v1, 20(s3)
+// 0x010ae568: 0x10ae568: lw    v1, 20(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -10966,40 +10966,40 @@ L_10adf1c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adf24: 0x10adf24: sll   zero, zero, 0
-// 0x010adf28: 0x10adf28: beq   a0, v1, 0x10adf6c sll   zero, zero, 0
+// 0x010ae56c: 0x10ae56c: sll   zero, zero, 0
+// 0x010ae570: 0x10ae570: beq   a0, v1, 0x10ae5b4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_10adf6c
+	beq  L_10ae5b4
 // --- basic block ---
-L_10adf30:
-// 0x010adf30: 0x10adf30: addiu v1, zero, 48
+L_10ae578:
+// 0x010ae578: 0x10ae578: addiu v1, zero, 48
 	ldc.i4.s 48
 	stloc 7
-L_10adf34:
-// 0x010adf34: 0x10adf34: mult  v0, v1
+L_10ae57c:
+// 0x010ae57c: 0x10ae57c: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 8
-// 0x010adf38: 0x10adf38: lui   a1, 0x90000
+// 0x010ae580: 0x10ae580: lui   a1, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010adf3c: 0x10adf3c: addiu a1, a1, -13132
+// 0x010ae584: 0x10ae584: addiu a1, a1, -12668
 	ldloc.2
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc.2
-// 0x010adf40: 0x10adf40: addu  a0, s5, zero
+// 0x010ae588: 0x10ae588: addu  a0, s5, zero
 	ldloc 18
 	stloc.1
-// 0x010adf44: 0x10adf44: addiu a2, zero, 48
+// 0x010ae58c: 0x10ae58c: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010adf48: 0x10adf48: mflo  lo
+// 0x010ae590: 0x10ae590: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010adf4c: 0x10adf4c: jal   0x1001800 addu  a1, a1, v0
+// 0x010ae594: 0x10ae594: jal   0x1001800 addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
@@ -11013,7 +11013,7 @@ L_10adf34:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adf54: 0x10adf54: lw    v0, 44(sp)
+// 0x010ae59c: 0x10ae59c: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11022,10 +11022,10 @@ L_10adf34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adf58: 0x10adf58: addiu v1, zero, 1
+// 0x010ae5a0: 0x10ae5a0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010adf5c: 0x10adf5c: sw    v0, 28(s3)
+// 0x010ae5a4: 0x10ae5a4: sw    v0, 28(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -11034,14 +11034,14 @@ L_10adf34:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010adf60: 0x10adf60: sw    v1, 0(s3)
+// 0x010ae5a8: 0x10ae5a8: sw    v1, 0(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010adf64: 0x10adf64: j	 0x10adfe8 sw    v0, 32(s3)
+// 0x010ae5ac: 0x10ae5ac: j	 0x10ae630 sw    v0, 32(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -11050,10 +11050,10 @@ L_10adf34:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10adfe8
+	br L_10ae630
 // --- basic block ---
-L_10adf6c:
-// 0x010adf6c: 0x10adf6c: lw    v1, 40(sp)
+L_10ae5b4:
+// 0x010ae5b4: 0x10ae5b4: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11062,32 +11062,32 @@ L_10adf6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010adf70: 0x10adf70: addiu v0, zero, 48
+// 0x010ae5b8: 0x10ae5b8: addiu v0, zero, 48
 	ldc.i4.s 48
 	stloc 5
-// 0x010adf74: 0x10adf74: mult  v1, v0
+// 0x010ae5bc: 0x10ae5bc: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 8
-// 0x010adf78: 0x10adf78: lui   a1, 0x90000
+// 0x010ae5c0: 0x10ae5c0: lui   a1, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010adf7c: 0x10adf7c: addiu a1, a1, -13132
+// 0x010ae5c4: 0x10ae5c4: addiu a1, a1, -12668
 	ldloc.2
-	ldc.i4 -13132
+	ldc.i4 -12668
 	add
 	stloc.2
-// 0x010adf80: 0x10adf80: addu  a0, s0, zero
+// 0x010ae5c8: 0x10ae5c8: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010adf84: 0x10adf84: addiu a2, zero, 48
+// 0x010ae5cc: 0x10ae5cc: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010adf88: 0x10adf88: mflo  lo
+// 0x010ae5d0: 0x10ae5d0: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x010adf8c: 0x10adf8c: jal   0x1001800 addu  a1, a1, v1
+// 0x010ae5d4: 0x10ae5d4: jal   0x1001800 addu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
@@ -11101,19 +11101,19 @@ L_10adf6c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adf94: 0x10adf94: lw    v0, 0(s1)
+// 0x010ae5dc: 0x10ae5dc: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010adf98: 0x10adf98: sll   zero, zero, 0
-// 0x010adf9c: 0x10adf9c: bne   v0, zero, 0x10adfb0 sll   zero, zero, 0
+// 0x010ae5e0: 0x10ae5e0: sll   zero, zero, 0
+// 0x010ae5e4: 0x10ae5e4: bne   v0, zero, 0x10ae5f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10adfb0
+	brtrue L_10ae5f8
 // --- basic block ---
-// 0x010adfa4: 0x10adfa4: lw    v0, 44(sp)
+// 0x010ae5ec: 0x10ae5ec: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11122,8 +11122,8 @@ L_10adf6c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adfa8: 0x10adfa8: sll   zero, zero, 0
-// 0x010adfac: 0x10adfac: sw    v0, 28(s1)
+// 0x010ae5f0: 0x10ae5f0: sll   zero, zero, 0
+// 0x010ae5f4: 0x10ae5f4: sw    v0, 28(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -11132,8 +11132,8 @@ L_10adf6c:
 	add
 	ldloc 5
 	stelem.i4
-L_10adfb0:
-// 0x010adfb0: 0x10adfb0: lw    v0, 28(s1)
+L_10ae5f8:
+// 0x010ae5f8: 0x10ae5f8: lw    v0, 28(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -11142,10 +11142,10 @@ L_10adfb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adfb4: 0x10adfb4: addu  a1, s3, zero
+// 0x010ae5fc: 0x10ae5fc: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x010adfb8: 0x10adfb8: sw    v0, 28(s3)
+// 0x010ae600: 0x10ae600: sw    v0, 28(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -11154,10 +11154,10 @@ L_10adfb0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010adfbc: 0x10adfbc: addu  a0, s1, zero
+// 0x010ae604: 0x10ae604: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010adfc0: 0x10adfc0: jal   0x1001800 addiu a2, zero, 76
+// 0x010ae608: 0x10ae608: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -11169,17 +11169,17 @@ L_10adfb0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010adfc8: 0x10adfc8: addiu v0, zero, 1
+// 0x010ae610: 0x10ae610: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010adfcc: 0x10adfcc: sw    v0, 0(s1)
+// 0x010ae614: 0x10ae614: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010adfd0: 0x10adfd0: lw    v0, 44(sp)
+// 0x010ae618: 0x10ae618: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11188,7 +11188,7 @@ L_10adfb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010adfd4: 0x10adfd4: j	 0x10adfe4 sw    v0, 32(s1)
+// 0x010ae61c: 0x10ae61c: j	 0x10ae62c sw    v0, 32(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -11197,28 +11197,28 @@ L_10adfb0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10adfe4
+	br L_10ae62c
 // --- basic block ---
-L_10adfdc:
-// 0x010adfdc: 0x10adfdc: j	 0x10adfe8 sw    zero, 0(s3)
+L_10ae624:
+// 0x010ae624: 0x10ae624: j	 0x10ae630 sw    zero, 0(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_10adfe8
+	br L_10ae630
 // --- basic block ---
-L_10adfe4:
-// 0x010adfe4: 0x10adfe4: addu  s2, zero, zero
+L_10ae62c:
+// 0x010ae62c: 0x10ae62c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 16
-L_10adfe8:
-// 0x010adfe8: 0x10adfe8: lw    ra, 308(sp)
-// 0x010adfec: 0x10adfec: addu  v0, s2, zero
+L_10ae630:
+// 0x010ae630: 0x10ae630: lw    ra, 308(sp)
+// 0x010ae634: 0x10ae634: addu  v0, s2, zero
 	ldloc 16
 	stloc 5
-// 0x010adff0: 0x10adff0: lw    s8, 304(sp)
+// 0x010ae638: 0x10ae638: lw    s8, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11227,7 +11227,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010adff4: 0x10adff4: lw    s7, 300(sp)
+// 0x010ae63c: 0x10ae63c: lw    s7, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11236,7 +11236,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010adff8: 0x10adff8: lw    s6, 296(sp)
+// 0x010ae640: 0x10ae640: lw    s6, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11245,7 +11245,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010adffc: 0x10adffc: lw    s5, 292(sp)
+// 0x010ae644: 0x10ae644: lw    s5, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11254,7 +11254,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010ae000: 0x10ae000: lw    s4, 288(sp)
+// 0x010ae648: 0x10ae648: lw    s4, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11263,7 +11263,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ae004: 0x10ae004: lw    s3, 284(sp)
+// 0x010ae64c: 0x10ae64c: lw    s3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11272,7 +11272,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ae008: 0x10ae008: lw    s2, 280(sp)
+// 0x010ae650: 0x10ae650: lw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11281,7 +11281,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010ae00c: 0x10ae00c: lw    s1, 276(sp)
+// 0x010ae654: 0x10ae654: lw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11290,7 +11290,7 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ae010: 0x10ae010: lw    s0, 272(sp)
+// 0x010ae658: 0x10ae658: lw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11299,51 +11299,51 @@ L_10adfe8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ae014: 0x10ae014: jr    ra addiu sp, sp, 312
+// 0x010ae65c: 0x10ae65c: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10ae01c:
-// 0x010ae01c: 0x10ae01c: lui   a2, 0x90000
+L_10ae664:
+// 0x010ae664: 0x10ae664: lui   a2, 0x90000
 	ldc.i4 589824
 	stloc.3
-L_10ae020:
-// 0x010ae020: 0x10ae020: lw    a0, -13136(a2)
+L_10ae668:
+// 0x010ae668: 0x10ae668: lw    a0, -12672(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3284
+	ldc.i4 -3168
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae024: 0x10ae024: addiu t1, zero, 10
+// 0x010ae66c: 0x10ae66c: addiu t1, zero, 10
 	ldc.i4.s 10
 	stloc 13
-// 0x010ae028: 0x10ae028: bne   a0, t1, 0x10ad494 addiu a2, zero, 1928
+// 0x010ae670: 0x10ae670: bne   a0, t1, 0x10adadc addiu a2, zero, 1928
 	ldloc.1
 	ldloc 13
 	ldc.i4 1928
 	stloc.3
-	bne.un L_10ad494
+	bne.un L_10adadc
 // --- basic block ---
-// 0x010ae030: 0x10ae030: j	 0x10ad828 lui   v0, 0x90000
+// 0x010ae678: 0x10ae678: j	 0x10ade70 lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-	br L_10ad828
+	br L_10ade70
 // --- basic block ---
-L_10ae038:
-// 0x010ae038: 0x10ae038: addu  a0, v1, zero
+L_10ae680:
+// 0x010ae680: 0x10ae680: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-L_10ae03c:
-// 0x010ae03c: 0x10ae03c: addiu a2, zero, 1928
+L_10ae684:
+// 0x010ae684: 0x10ae684: addiu a2, zero, 1928
 	ldc.i4 1928
 	stloc.3
-// 0x010ae040: 0x10ae040: sw    v1, 264(sp)
+// 0x010ae688: 0x10ae688: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11352,7 +11352,7 @@ L_10ae03c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ae044: 0x10ae044: sw    a3, 260(sp)
+// 0x010ae68c: 0x10ae68c: sw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11361,7 +11361,7 @@ L_10ae03c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010ae048: 0x10ae048: sw    t0, 256(sp)
+// 0x010ae690: 0x10ae690: sw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11370,10 +11370,10 @@ L_10ae03c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010ae04c: 0x10ae04c: mflo  lo
+// 0x010ae694: 0x10ae694: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010ae050: 0x10ae050: jal   0x1001800 addu  a1, s8, a1
+// 0x010ae698: 0x10ae698: jal   0x1001800 addu  a1, s8, a1
 	ldloc 17
 	ldloc.2
 	add
@@ -11387,7 +11387,7 @@ L_10ae03c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae058: 0x10ae058: lw    v1, 264(sp)
+// 0x010ae6a0: 0x10ae6a0: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11396,7 +11396,7 @@ L_10ae03c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ae05c: 0x10ae05c: lw    a3, 260(sp)
+// 0x010ae6a4: 0x10ae6a4: lw    a3, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11405,7 +11405,7 @@ L_10ae03c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ae060: 0x10ae060: lw    t0, 256(sp)
+// 0x010ae6a8: 0x10ae6a8: lw    t0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11414,15 +11414,15 @@ L_10ae03c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ae064: 0x10ae064: j	 0x10ad76c mult  s4, s7
+// 0x010ae6ac: 0x10ae6ac: j	 0x10addb4 mult  s4, s7
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 8
-	br L_10ad76c
+	br L_10addb4
 // --- basic block ---
-L_10ae06c:
-// 0x010ae06c: 0x10ae06c: lw    v0, 44(sp)
+L_10ae6b4:
+// 0x010ae6b4: 0x10ae6b4: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -11431,27 +11431,27 @@ L_10ae06c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ae070: 0x10ae070: sll   zero, zero, 0
-// 0x010ae074: 0x10ae074: slt   v1, v1, v0
+// 0x010ae6b8: 0x10ae6b8: sll   zero, zero, 0
+// 0x010ae6bc: 0x10ae6bc: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010ae078: 0x10ae078: bne   v1, zero, 0x10addfc addiu s7, s7, 1
+// 0x010ae6c0: 0x10ae6c0: bne   v1, zero, 0x10ae444 addiu s7, s7, 1
 	ldloc 7
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brtrue L_10addfc
+	brtrue L_10ae444
 // --- basic block ---
-// 0x010ae080: 0x10ae080: j	 0x10add4c lui   v0, 0x90000
+// 0x010ae6c8: 0x10ae6c8: j	 0x10ae394 lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-	br L_10add4c
+	br L_10ae394
 // --- basic block ---
-L_10ae088:
-// 0x010ae088: 0x10ae088: lw    a0, 24(s1)
+L_10ae6d0:
+// 0x010ae6d0: 0x10ae6d0: lw    a0, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -11460,7 +11460,7 @@ L_10ae088:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae08c: 0x10ae08c: lw    v1, 24(s3)
+// 0x010ae6d4: 0x10ae6d4: lw    v1, 24(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -11469,16 +11469,16 @@ L_10ae088:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ae090: 0x10ae090: sll   zero, zero, 0
-// 0x010ae094: 0x10ae094: bne   a0, v1, 0x10adf34 addiu v1, zero, 48
+// 0x010ae6d8: 0x10ae6d8: sll   zero, zero, 0
+// 0x010ae6dc: 0x10ae6dc: bne   a0, v1, 0x10ae57c addiu v1, zero, 48
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 48
 	stloc 7
-	bne.un L_10adf34
+	bne.un L_10ae57c
 // --- basic block ---
-// 0x010ae09c: 0x10ae09c: j	 0x10adf1c sll   zero, zero, 0
-	br L_10adf1c
+// 0x010ae6e4: 0x10ae6e4: j	 0x10ae564 sll   zero, zero, 0
+	br L_10ae564
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl13.j b/converted/Cibyl13.j
index 7043a4e..6bdc589 100644
--- a/converted/Cibyl13.j
+++ b/converted/Cibyl13.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl13::.ctor
 
-.method public static int32 roadmap_street_get_position_1011fe0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_position_1011ff0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s0,int32 lo,int32 hi,int32 ra)
@@ -91,15 +91,15 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01011fe0: 0x1011fe0: addiu sp, sp, -40
+// 0x01011ff0: 0x1011ff0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01011fe4: 0x1011fe4: lui   v0, 0x0
+// 0x01011ff4: 0x1011ff4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01011fe8: 0x1011fe8: sw    s0, 24(sp)
+// 0x01011ff8: 0x1011ff8: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -108,7 +108,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01011fec: 0x1011fec: lw    v0, 576(v0)
+// 0x01011ffc: 0x1011ffc: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -117,17 +117,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01011ff0: 0x1011ff0: addu  s0, a0, zero
+// 0x01012000: 0x1012000: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01011ff4: 0x1011ff4: lw    a0, 0(a0)
+// 0x01012004: 0x1012004: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01011ff8: 0x1011ff8: sw    s1, 28(sp)
+// 0x01012008: 0x1012008: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -136,8 +136,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01011ffc: 0x1011ffc: sw    ra, 36(sp)
-// 0x01012000: 0x1012000: sw    s2, 32(sp)
+// 0x0101200c: 0x101200c: sw    ra, 36(sp)
+// 0x01012010: 0x1012010: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -146,21 +146,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01012004: 0x1012004: beq   a0, v0, 0x1012020 addu  s1, a1, zero
+// 0x01012014: 0x1012014: beq   a0, v0, 0x1012030 addu  s1, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 9
-	beq  L_1012020
+	beq  L_1012030
 // --- basic block ---
-// 0x0101200c: 0x101200c: bltz  a0, 0x1012024 addiu v0, zero, -1
+// 0x0101201c: 0x101201c: bltz  a0, 0x1012034 addiu v0, zero, -1
 	ldloc.1
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	blt L_1012024
+	blt L_1012034
 // --- basic block ---
-// 0x01012014: 0x1012014: jal   0x100b164 sw    a2, 16(sp)
+// 0x01012024: 0x1012024: jal   0x100b174 sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -174,12 +174,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101201c: 0x101201c: lw    a2, 16(sp)
+// 0x0101202c: 0x101202c: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -188,19 +188,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-L_1012020:
-// 0x01012020: 0x1012020: addiu v0, zero, -1
+L_1012030:
+// 0x01012030: 0x1012030: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_1012024:
-// 0x01012024: 0x1012024: bne   s1, v0, 0x1012054 addiu v1, zero, 2
+L_1012034:
+// 0x01012034: 0x1012034: bne   s1, v0, 0x1012064 addiu v1, zero, 2
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	stloc 7
-	bne.un L_1012054
+	bne.un L_1012064
 // --- basic block ---
-// 0x0101202c: 0x101202c: lw    a0, 4(s0)
+// 0x0101203c: 0x101203c: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -209,7 +209,7 @@ L_1012024:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012030: 0x1012030: jal   0x100405c sw    a2, 16(sp)
+// 0x01012040: 0x1012040: jal   0x100405c sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -228,10 +228,10 @@ L_1012024:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012038: 0x1012038: addiu a1, zero, 2
+// 0x01012048: 0x1012048: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0101203c: 0x101203c: div   v0, a1
+// 0x0101204c: 0x101204c: div   v0, a1
 	ldloc 5
 	ldloc.2
 	ldloc 5
@@ -240,7 +240,7 @@ L_1012024:
 	stloc 11
 	rem
 	stloc 12
-// 0x01012040: 0x1012040: lw    a0, 4(s0)
+// 0x01012050: 0x1012050: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -249,7 +249,7 @@ L_1012024:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012044: 0x1012044: lw    a2, 16(sp)
+// 0x01012054: 0x1012054: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -258,14 +258,14 @@ L_1012024:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01012048: 0x1012048: mflo  lo
+// 0x01012058: 0x1012058: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x0101204c: 0x101204c: j	 0x1012178 sll   zero, zero, 0
-	br L_1012178
+// 0x0101205c: 0x101205c: j	 0x1012188 sll   zero, zero, 0
+	br L_1012188
 // --- basic block ---
-L_1012054:
-// 0x01012054: 0x1012054: div   s1, v1
+L_1012064:
+// 0x01012064: 0x1012064: div   s1, v1
 	ldloc 9
 	ldloc 7
 	ldloc 9
@@ -274,7 +274,7 @@ L_1012054:
 	stloc 11
 	rem
 	stloc 12
-// 0x01012058: 0x1012058: lw    v0, 16(s0)
+// 0x01012068: 0x1012068: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -283,33 +283,33 @@ L_1012054:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101205c: 0x101205c: mfhi  hi
+// 0x0101206c: 0x101206c: mfhi  hi
 	ldloc 12
 	stloc 7
-// 0x01012060: 0x1012060: bltz  v0, 0x10120b8 andi  a0, v0, 1
+// 0x01012070: 0x1012070: bltz  v0, 0x10120c8 andi  a0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc.1
 	ldc.i4.s 0
-	blt L_10120b8
+	blt L_10120c8
 // --- basic block ---
-// 0x01012068: 0x1012068: bne   a0, v1, 0x10120b8 slt   a0, s1, v0
+// 0x01012078: 0x1012078: bne   a0, v1, 0x10120c8 slt   a0, s1, v0
 	ldloc.1
 	ldloc 7
 	ldloc 9
 	ldloc 5
 	clt
 	stloc.1
-	bne.un L_10120b8
+	bne.un L_10120c8
 // --- basic block ---
-// 0x01012070: 0x1012070: beq   a0, zero, 0x101209c sll   zero, zero, 0
+// 0x01012080: 0x1012080: beq   a0, zero, 0x10120ac sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101209c
+	brfalse L_10120ac
 // --- basic block ---
-L_1012078:
-// 0x01012078: 0x1012078: lw    a0, 20(s0)
+L_1012088:
+// 0x01012088: 0x1012088: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -318,35 +318,35 @@ L_1012078:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101207c: 0x101207c: sll   zero, zero, 0
-// 0x01012080: 0x1012080: slt   a0, s1, a0
+// 0x0101208c: 0x101208c: sll   zero, zero, 0
+// 0x01012090: 0x1012090: slt   a0, s1, a0
 	ldloc 9
 	ldloc.1
 	clt
 	stloc.1
-// 0x01012084: 0x1012084: bne   a0, zero, 0x10120b8 slt   v0, v0, s1
+// 0x01012094: 0x1012094: bne   a0, zero, 0x10120c8 slt   v0, v0, s1
 	ldloc.1
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 5
-	brtrue L_10120b8
+	brtrue L_10120c8
 // --- basic block ---
-// 0x0101208c: 0x101208c: bne   v0, zero, 0x10120b8 addu  s2, zero, zero
+// 0x0101209c: 0x101209c: bne   v0, zero, 0x10120c8 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_10120b8
+	brtrue L_10120c8
 // --- basic block ---
-// 0x01012094: 0x1012094: j	 0x1012110 addiu s2, s2, 2
+// 0x010120a4: 0x10120a4: j	 0x1012120 addiu s2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 8
-	br L_1012110
+	br L_1012120
 // --- basic block ---
-L_101209c:
-// 0x0101209c: 0x101209c: lw    a0, 20(s0)
+L_10120ac:
+// 0x010120ac: 0x10120ac: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -355,27 +355,27 @@ L_101209c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010120a0: 0x10120a0: sll   zero, zero, 0
-// 0x010120a4: 0x10120a4: slt   a0, a0, s1
+// 0x010120b0: 0x10120b0: sll   zero, zero, 0
+// 0x010120b4: 0x10120b4: slt   a0, a0, s1
 	ldloc.1
 	ldloc 9
 	clt
 	stloc.1
-// 0x010120a8: 0x10120a8: bne   a0, zero, 0x1012078 addu  s2, zero, zero
+// 0x010120b8: 0x10120b8: bne   a0, zero, 0x1012088 addu  s2, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_1012078
+	brtrue L_1012088
 // --- basic block ---
-// 0x010120b0: 0x10120b0: j	 0x1012110 addiu s2, s2, 2
+// 0x010120c0: 0x10120c0: j	 0x1012120 addiu s2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 8
-	br L_1012110
+	br L_1012120
 // --- basic block ---
-L_10120b8:
-// 0x010120b8: 0x10120b8: lw    v0, 24(s0)
+L_10120c8:
+// 0x010120c8: 0x10120c8: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -384,30 +384,30 @@ L_10120b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010120bc: 0x10120bc: sll   zero, zero, 0
-// 0x010120c0: 0x10120c0: bltz  v0, 0x1012188 andi  a0, v0, 1
+// 0x010120cc: 0x10120cc: sll   zero, zero, 0
+// 0x010120d0: 0x10120d0: bltz  v0, 0x1012198 andi  a0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc.1
 	ldc.i4.s 0
-	blt L_1012188
+	blt L_1012198
 // --- basic block ---
-// 0x010120c8: 0x10120c8: bne   a0, v1, 0x1012188 slt   v1, s1, v0
+// 0x010120d8: 0x10120d8: bne   a0, v1, 0x1012198 slt   v1, s1, v0
 	ldloc.1
 	ldloc 7
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 7
-	bne.un L_1012188
+	bne.un L_1012198
 // --- basic block ---
-// 0x010120d0: 0x10120d0: bne   v1, zero, 0x10120ec sll   zero, zero, 0
+// 0x010120e0: 0x10120e0: bne   v1, zero, 0x10120fc sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10120ec
+	brtrue L_10120fc
 // --- basic block ---
-// 0x010120d8: 0x10120d8: lw    v1, 28(s0)
+// 0x010120e8: 0x10120e8: lw    v1, 28(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -416,20 +416,20 @@ L_10120b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010120dc: 0x10120dc: sll   zero, zero, 0
-// 0x010120e0: 0x10120e0: slt   v1, v1, s1
+// 0x010120ec: 0x10120ec: sll   zero, zero, 0
+// 0x010120f0: 0x10120f0: slt   v1, v1, s1
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 7
-// 0x010120e4: 0x10120e4: beq   v1, zero, 0x101210c addiu s2, zero, 1
+// 0x010120f4: 0x10120f4: beq   v1, zero, 0x101211c addiu s2, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 8
-	brfalse L_101210c
+	brfalse L_101211c
 // --- basic block ---
-L_10120ec:
-// 0x010120ec: 0x10120ec: lw    v1, 28(s0)
+L_10120fc:
+// 0x010120fc: 0x10120fc: lw    v1, 28(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -438,37 +438,37 @@ L_10120ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010120f0: 0x10120f0: sll   zero, zero, 0
-// 0x010120f4: 0x10120f4: slt   v1, s1, v1
+// 0x01012100: 0x1012100: sll   zero, zero, 0
+// 0x01012104: 0x1012104: slt   v1, s1, v1
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 7
-// 0x010120f8: 0x10120f8: bne   v1, zero, 0x1012188 slt   v0, v0, s1
+// 0x01012108: 0x1012108: bne   v1, zero, 0x1012198 slt   v0, v0, s1
 	ldloc 7
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 5
-	brtrue L_1012188
+	brtrue L_1012198
 // --- basic block ---
-// 0x01012100: 0x1012100: bne   v0, zero, 0x101218c addu  v0, zero, zero
+// 0x01012110: 0x1012110: bne   v0, zero, 0x101219c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_101218c
+	brtrue L_101219c
 // --- basic block ---
-// 0x01012108: 0x1012108: addiu s2, zero, 1
+// 0x01012118: 0x1012118: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-L_101210c:
-// 0x0101210c: 0x101210c: addiu s2, s2, 2
+L_101211c:
+// 0x0101211c: 0x101211c: addiu s2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 8
-L_1012110:
-// 0x01012110: 0x1012110: lw    a0, 4(s0)
+L_1012120:
+// 0x01012120: 0x1012120: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -477,17 +477,17 @@ L_1012110:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012114: 0x1012114: sll   s2, s2, 3
+// 0x01012124: 0x1012124: sll   s2, s2, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x01012118: 0x1012118: addu  s2, s0, s2
+// 0x01012128: 0x1012128: addu  s2, s0, s2
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x0101211c: 0x101211c: jal   0x100405c sw    a2, 16(sp)
+// 0x0101212c: 0x101212c: jal   0x100405c sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -506,7 +506,7 @@ L_1012110:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012124: 0x1012124: lw    a0, 4(s2)
+// 0x01012134: 0x1012134: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -515,14 +515,14 @@ L_1012110:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012128: 0x1012128: lw    v1, 0(s2)
+// 0x01012138: 0x1012138: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101212c: 0x101212c: lw    a2, 16(sp)
+// 0x0101213c: 0x101213c: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -531,71 +531,71 @@ L_1012110:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01012130: 0x1012130: slt   a1, a0, v1
+// 0x01012140: 0x1012140: slt   a1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc.2
-// 0x01012134: 0x1012134: bne   a1, zero, 0x1012150 subu  a1, s1, v1
+// 0x01012144: 0x1012144: bne   a1, zero, 0x1012160 subu  a1, s1, v1
 	ldloc.2
 	ldloc 9
 	ldloc 7
 	sub
 	stloc.2
-	brtrue L_1012150
+	brtrue L_1012160
 // --- basic block ---
-// 0x0101213c: 0x101213c: addiu a1, a1, 1
+// 0x0101214c: 0x101214c: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01012140: 0x1012140: mult  v0, a1
+// 0x01012150: 0x1012150: mult  v0, a1
 	ldloc 5
 	ldloc.2
 	mul
 	stloc 11
-// 0x01012144: 0x1012144: mflo  lo
+// 0x01012154: 0x1012154: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x01012148: 0x1012148: j	 0x1012164 addiu a0, a0, 2
+// 0x01012158: 0x1012158: j	 0x1012174 addiu a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	add
 	stloc.1
-	br L_1012164
+	br L_1012174
 // --- basic block ---
-L_1012150:
-// 0x01012150: 0x1012150: nor   a1, zero, v1
+L_1012160:
+// 0x01012160: 0x1012160: nor   a1, zero, v1
 	ldloc 7
 	ldc.i4.m1
 	xor
 	stloc.2
-// 0x01012154: 0x1012154: addu  a1, a1, s1
+// 0x01012164: 0x1012164: addu  a1, a1, s1
 	ldloc.2
 	ldloc 9
 	add
 	stloc.2
-// 0x01012158: 0x1012158: mult  v0, a1
+// 0x01012168: 0x1012168: mult  v0, a1
 	ldloc 5
 	ldloc.2
 	mul
 	stloc 11
-// 0x0101215c: 0x101215c: addiu a0, a0, -2
+// 0x0101216c: 0x101216c: addiu a0, a0, -2
 	ldloc.1
 	ldc.i4.s -2
 	add
 	stloc.1
-// 0x01012160: 0x1012160: mflo  lo
+// 0x01012170: 0x1012170: mflo  lo
 	ldloc 11
 	stloc.2
-L_1012164:
-// 0x01012164: 0x1012164: subu  v1, a0, v1
+L_1012174:
+// 0x01012174: 0x1012174: subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-// 0x01012168: 0x1012168: sll   zero, zero, 0
-// 0x0101216c: 0x101216c: div   a1, v1
+// 0x01012178: 0x1012178: sll   zero, zero, 0
+// 0x0101217c: 0x101217c: div   a1, v1
 	ldloc.2
 	ldloc 7
 	ldloc.2
@@ -604,7 +604,7 @@ L_1012164:
 	stloc 11
 	rem
 	stloc 12
-// 0x01012170: 0x1012170: lw    a0, 4(s0)
+// 0x01012180: 0x1012180: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -613,33 +613,33 @@ L_1012164:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012174: 0x1012174: mflo  lo
+// 0x01012184: 0x1012184: mflo  lo
 	ldloc 11
 	stloc.2
-L_1012178:
-// 0x01012178: 0x1012178: jal   0x1011d2c sll   zero, zero, 0
+L_1012188:
+// 0x01012188: 0x1012188: jal   0x1011d3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_distance_position_1011d2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_distance_position_1011d3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012180: 0x1012180: j	 0x101218c addiu v0, zero, 1
+// 0x01012190: 0x1012190: j	 0x101219c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_101218c
+	br L_101219c
 // --- basic block ---
-L_1012188:
-// 0x01012188: 0x1012188: addu  v0, zero, zero
+L_1012198:
+// 0x01012198: 0x1012198: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_101218c:
-// 0x0101218c: 0x101218c: lw    ra, 36(sp)
-// 0x01012190: 0x1012190: lw    s2, 32(sp)
+L_101219c:
+// 0x0101219c: 0x101219c: lw    ra, 36(sp)
+// 0x010121a0: 0x10121a0: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -648,7 +648,7 @@ L_101218c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012194: 0x1012194: lw    s1, 28(sp)
+// 0x010121a4: 0x10121a4: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -657,7 +657,7 @@ L_101218c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01012198: 0x1012198: lw    s0, 24(sp)
+// 0x010121a8: 0x10121a8: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -666,7 +666,7 @@ L_101218c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101219c: 0x101219c: jr    ra addiu sp, sp, 40
+// 0x010121ac: 0x10121ac: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -678,7 +678,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_blocks_by_city_10121a4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_blocks_by_city_10121b4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s1,int32 s0,int32 s5,int32 s4,int32 s6,int32 s7,int32 s8,int32 s3,int32 ra)
@@ -740,12 +740,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010121a4: 0x10121a4: addiu sp, sp, -104
+// 0x010121b4: 0x10121b4: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x010121a8: 0x10121a8: sw    a0, 104(sp)
+// 0x010121b8: 0x10121b8: sw    a0, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -754,10 +754,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010121ac: 0x10121ac: addu  a0, a1, zero
+// 0x010121bc: 0x10121bc: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010121b0: 0x10121b0: sw    s4, 80(sp)
+// 0x010121c0: 0x10121c0: sw    s4, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -766,7 +766,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010121b4: 0x10121b4: sw    s0, 64(sp)
+// 0x010121c4: 0x10121c4: sw    s0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -775,8 +775,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010121b8: 0x10121b8: sw    ra, 100(sp)
-// 0x010121bc: 0x10121bc: sw    s8, 96(sp)
+// 0x010121c8: 0x10121c8: sw    ra, 100(sp)
+// 0x010121cc: 0x10121cc: sw    s8, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -785,7 +785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010121c0: 0x10121c0: sw    s7, 92(sp)
+// 0x010121d0: 0x10121d0: sw    s7, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -794,7 +794,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010121c4: 0x10121c4: sw    s6, 88(sp)
+// 0x010121d4: 0x10121d4: sw    s6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -803,7 +803,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010121c8: 0x10121c8: sw    s5, 84(sp)
+// 0x010121d8: 0x10121d8: sw    s5, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -812,7 +812,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010121cc: 0x10121cc: sw    s3, 76(sp)
+// 0x010121dc: 0x10121dc: sw    s3, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -821,7 +821,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010121d0: 0x10121d0: sw    s2, 72(sp)
+// 0x010121e0: 0x10121e0: sw    s2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -830,7 +830,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010121d4: 0x10121d4: sw    s1, 68(sp)
+// 0x010121e4: 0x10121e4: sw    s1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -839,7 +839,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010121d8: 0x10121d8: sw    a2, 112(sp)
+// 0x010121e8: 0x10121e8: sw    a2, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -848,7 +848,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010121dc: 0x10121dc: jal   0x10412b8 sw    a3, 116(sp)
+// 0x010121ec: 0x10121ec: jal   0x10412c8 sw    a3, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -862,30 +862,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_find_10412b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_find_10412c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010121e4: 0x10121e4: addu  s4, v0, zero
+// 0x010121f4: 0x10121f4: addu  s4, v0, zero
 	ldloc 6
 	stloc 12
-// 0x010121e8: 0x10121e8: bltz  v0, 0x10124a0 addiu s0, zero, -1
+// 0x010121f8: 0x10121f8: bltz  v0, 0x10124b0 addiu s0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 10
 	ldc.i4.s 0
-	blt L_10124a0
+	blt L_10124b0
 // --- basic block ---
-// 0x010121f0: 0x10121f0: addiu s0, sp, 16
+// 0x01012200: 0x1012200: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-// 0x010121f4: 0x10121f4: addu  a1, s0, zero
+// 0x01012204: 0x1012204: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x010121f8: 0x10121f8: jal   0x1040cc0 addu  a0, v0, zero
+// 0x01012208: 0x1012208: jal   0x1040cd0 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -893,31 +893,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_first_1040cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_first_1040cd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012200: 0x1012200: addu  s1, v0, zero
+// 0x01012210: 0x1012210: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-// 0x01012204: 0x1012204: lui   s3, 0x30000
+// 0x01012214: 0x1012214: lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 16
-// 0x01012208: 0x1012208: j	 0x1012498 addu  s0, zero, zero
+// 0x01012218: 0x1012218: j	 0x10124a8 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1012498
+	br L_10124a8
 // --- basic block ---
-L_1012210:
-// 0x01012210: 0x1012210: lw    a0, 0(s1)
+L_1012220:
+// 0x01012220: 0x1012220: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01012214: 0x1012214: lw    v0, 576(v1)
+// 0x01012224: 0x1012224: lw    v0, 576(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -926,36 +926,36 @@ L_1012210:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012218: 0x1012218: sll   zero, zero, 0
-// 0x0101221c: 0x101221c: beq   a0, v0, 0x101223c sll   zero, zero, 0
+// 0x01012228: 0x1012228: sll   zero, zero, 0
+// 0x0101222c: 0x101222c: beq   a0, v0, 0x101224c sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_101223c
+	beq  L_101224c
 // --- basic block ---
-// 0x01012224: 0x1012224: bltz  a0, 0x1012488 sll   zero, zero, 0
+// 0x01012234: 0x1012234: bltz  a0, 0x1012498 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1012488
+	blt L_1012498
 // --- basic block ---
-// 0x0101222c: 0x101222c: jal   0x100b164 sll   zero, zero, 0
+// 0x0101223c: 0x101223c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012234: 0x1012234: beq   v0, zero, 0x101248c addu  a0, s4, zero
+// 0x01012244: 0x1012244: beq   v0, zero, 0x101249c addu  a0, s4, zero
 	ldloc 6
 	ldloc 12
 	stloc.1
-	brfalse L_101248c
+	brfalse L_101249c
 // --- basic block ---
-L_101223c:
-// 0x0101223c: 0x101223c: lw    s5, 104(sp)
+L_101224c:
+// 0x0101224c: 0x101224c: lw    s5, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -964,74 +964,74 @@ L_101223c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01012240: 0x1012240: j	 0x10122c4 addu  s2, zero, zero
+// 0x01012250: 0x1012250: j	 0x10122d4 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10122c4
+	br L_10122d4
 // --- basic block ---
-L_1012248:
-// 0x01012248: 0x1012248: jal   0x1011418 sll   zero, zero, 0
+L_1012258:
+// 0x01012258: 0x1012258: jal   0x1011428 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_from_id_safe_1011418(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_from_id_safe_1011428(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012250: 0x1012250: lui   a1, 0x30000
+// 0x01012260: 0x1012260: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01012254: 0x1012254: addu  a0, s5, zero
+// 0x01012264: 0x1012264: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x01012258: 0x1012258: beq   s5, zero, 0x10122c0 addiu a1, a1, -30620
+// 0x01012268: 0x1012268: beq   s5, zero, 0x10122d0 addiu a1, a1, -30156
 	ldloc 11
 	ldloc.2
-	ldc.i4 -30620
+	ldc.i4 -30156
 	add
 	stloc.2
-	brfalse L_10122c0
+	brfalse L_10122d0
 // --- basic block ---
-// 0x01012260: 0x1012260: jal   0x1001b14 sll   zero, zero, 0
+// 0x01012270: 0x1012270: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01012268: 0x1012268: bne   v0, zero, 0x10122c4 addiu s2, s2, 1
+// 0x01012278: 0x1012278: bne   v0, zero, 0x10122d4 addiu s2, s2, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_10122c4
+	brtrue L_10122d4
 // --- basic block ---
-// 0x01012270: 0x1012270: addiu s2, s2, -1
+// 0x01012280: 0x1012280: addiu s2, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01012274: 0x1012274: lui   a0, 0x30000
+// 0x01012284: 0x1012284: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01012278: 0x1012278: lw    v0, -30624(a0)
+// 0x01012288: 0x1012288: lw    v0, -30160(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101227c: 0x101227c: sll   s2, s2, 3
+// 0x0101228c: 0x101228c: sll   s2, s2, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x01012280: 0x1012280: lw    v1, 4(v0)
+// 0x01012290: 0x1012290: lw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1040,25 +1040,25 @@ L_1012248:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012284: 0x1012284: sll   zero, zero, 0
-// 0x01012288: 0x1012288: addu  s2, v1, s2
+// 0x01012294: 0x1012294: sll   zero, zero, 0
+// 0x01012298: 0x1012298: addu  s2, v1, s2
 	ldloc 7
 	ldloc 8
 	add
 	stloc 8
-// 0x0101228c: 0x101228c: lhu   v1, 2(s2)
+// 0x0101229c: 0x101229c: lhu   v1, 2(s2)
 	ldloc 8
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01012290: 0x1012290: lhu   a0, 4(s2)
+// 0x010122a0: 0x10122a0: lhu   a0, 4(s2)
 	ldloc 8
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01012294: 0x1012294: sw    v1, 32(sp)
+// 0x010122a4: 0x10122a4: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1067,11 +1067,11 @@ L_1012248:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012298: 0x1012298: lhu   v1, 0(s2)
+// 0x010122a8: 0x10122a8: lhu   v1, 0(s2)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x0101229c: 0x101229c: sw    a0, 40(sp)
+// 0x010122ac: 0x10122ac: sw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1080,13 +1080,13 @@ L_1012248:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010122a0: 0x10122a0: lhu   s2, 6(s2)
+// 0x010122b0: 0x10122b0: lhu   s2, 6(s2)
 	ldloc 8
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 8
-// 0x010122a4: 0x10122a4: lw    a0, 32(sp)
+// 0x010122b4: 0x10122b4: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1095,7 +1095,7 @@ L_1012248:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010122a8: 0x10122a8: sw    v1, 28(sp)
+// 0x010122b8: 0x10122b8: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1104,12 +1104,12 @@ L_1012248:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010122ac: 0x10122ac: ori   v1, zero, 65535
+// 0x010122bc: 0x10122bc: ori   v1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 7
-// 0x010122b0: 0x10122b0: bne   a0, v1, 0x10122ec sw    s2, 36(sp)
+// 0x010122c0: 0x10122c0: bne   a0, v1, 0x10122fc sw    s2, 36(sp)
 	ldloc.1
 	ldloc 7
 	ldloc 5
@@ -1120,33 +1120,33 @@ L_1012248:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_10122ec
+	bne.un L_10122fc
 // --- basic block ---
-// 0x010122b8: 0x10122b8: j	 0x101248c addu  a0, s4, zero
+// 0x010122c8: 0x10122c8: j	 0x101249c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-	br L_101248c
+	br L_101249c
 // --- basic block ---
-L_10122c0:
-// 0x010122c0: 0x10122c0: addiu s2, s2, 1
+L_10122d0:
+// 0x010122d0: 0x10122d0: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10122c4:
-// 0x010122c4: 0x10122c4: lw    v0, -30624(s3)
+L_10122d4:
+// 0x010122d4: 0x10122d4: lw    v0, -30160(s3)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 6
-// 0x010122c8: 0x10122c8: lui   a1, 0x30000
+// 0x010122d8: 0x10122d8: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x010122cc: 0x10122cc: lw    v0, 8(v0)
+// 0x010122dc: 0x10122dc: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1155,32 +1155,32 @@ L_10122c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010122d0: 0x10122d0: addu  a0, s2, zero
+// 0x010122e0: 0x10122e0: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010122d4: 0x10122d4: slt   v0, s2, v0
+// 0x010122e4: 0x10122e4: slt   v0, s2, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x010122d8: 0x10122d8: addiu a1, a1, -30620
+// 0x010122e8: 0x10122e8: addiu a1, a1, -30156
 	ldloc.2
-	ldc.i4 -30620
+	ldc.i4 -30156
 	add
 	stloc.2
-// 0x010122dc: 0x10122dc: bne   v0, zero, 0x1012248 addiu a2, zero, 512
+// 0x010122ec: 0x10122ec: bne   v0, zero, 0x1012258 addiu a2, zero, 512
 	ldloc 6
 	ldc.i4 512
 	stloc.3
-	brtrue L_1012248
+	brtrue L_1012258
 // --- basic block ---
-// 0x010122e4: 0x10122e4: j	 0x101248c addu  a0, s4, zero
+// 0x010122f4: 0x10122f4: j	 0x101249c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-	br L_101248c
+	br L_101249c
 // --- basic block ---
-L_10122ec:
-// 0x010122ec: 0x10122ec: lw    s7, 4(s1)
+L_10122fc:
+// 0x010122fc: 0x10122fc: lw    s7, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1189,7 +1189,7 @@ L_10122ec:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010122f0: 0x10122f0: lw    v1, 12(v0)
+// 0x01012300: 0x1012300: lw    v1, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1198,23 +1198,23 @@ L_10122ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010122f4: 0x10122f4: sll   v0, s7, 2
+// 0x01012304: 0x1012304: sll   v0, s7, 2
 	ldloc 14
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010122f8: 0x10122f8: addu  v0, v1, v0
+// 0x01012308: 0x1012308: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x010122fc: 0x10122fc: lhu   v0, 2(v0)
+// 0x0101230c: 0x101230c: lhu   v0, 2(v0)
 	ldloc 6
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01012300: 0x1012300: lw    a0, 112(sp)
+// 0x01012310: 0x1012310: lw    a0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1223,7 +1223,7 @@ L_10122ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012304: 0x1012304: sw    v0, 24(sp)
+// 0x01012314: 0x1012314: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1232,27 +1232,27 @@ L_10122ec:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01012308: 0x1012308: addiu v0, s7, 1
+// 0x01012318: 0x1012318: addiu v0, s7, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0101230c: 0x101230c: sll   v0, v0, 2
+// 0x0101231c: 0x101231c: sll   v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01012310: 0x1012310: sll   v1, s0, 5
+// 0x01012320: 0x1012320: sll   v1, s0, 5
 	ldloc 10
 	ldc.i4.5
 	shl
 	stloc 7
-// 0x01012314: 0x1012314: addu  v1, a0, v1
+// 0x01012324: 0x1012324: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01012318: 0x1012318: sw    v0, 44(sp)
+// 0x01012328: 0x1012328: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1261,7 +1261,7 @@ L_10122ec:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101231c: 0x101231c: lw    v0, 116(sp)
+// 0x0101232c: 0x101232c: lw    v0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1270,7 +1270,7 @@ L_10122ec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012320: 0x1012320: sw    v1, 52(sp)
+// 0x01012330: 0x1012330: sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1279,7 +1279,7 @@ L_10122ec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012324: 0x1012324: lw    v1, 24(sp)
+// 0x01012334: 0x1012334: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1288,12 +1288,12 @@ L_10122ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012328: 0x1012328: subu  v0, v0, s0
+// 0x01012338: 0x1012338: subu  v0, v0, s0
 	ldloc 6
 	ldloc 10
 	sub
 	stloc 6
-// 0x0101232c: 0x101232c: sw    v0, 48(sp)
+// 0x0101233c: 0x101233c: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1302,21 +1302,21 @@ L_10122ec:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01012330: 0x1012330: sll   s6, v1, 3
+// 0x01012340: 0x1012340: sll   s6, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 13
-// 0x01012334: 0x1012334: addu  s5, zero, zero
+// 0x01012344: 0x1012344: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01012338: 0x1012338: j	 0x101244c addu  s1, zero, zero
+// 0x01012348: 0x1012348: j	 0x101245c addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_101244c
+	br L_101245c
 // --- basic block ---
-L_1012340:
-// 0x01012340: 0x1012340: lw    v0, 4(v0)
+L_1012350:
+// 0x01012350: 0x1012350: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1325,7 +1325,7 @@ L_1012340:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012344: 0x1012344: lw    a0, 32(sp)
+// 0x01012354: 0x1012354: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1334,24 +1334,24 @@ L_1012340:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012348: 0x1012348: addu  v0, v0, s6
+// 0x01012358: 0x1012358: addu  v0, v0, s6
 	ldloc 6
 	ldloc 13
 	add
 	stloc 6
-// 0x0101234c: 0x101234c: lhu   v1, 2(v0)
+// 0x0101235c: 0x101235c: lhu   v1, 2(v0)
 	ldloc 6
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01012350: 0x1012350: sll   zero, zero, 0
-// 0x01012354: 0x1012354: bne   v1, a0, 0x1012444 sll   zero, zero, 0
+// 0x01012360: 0x1012360: sll   zero, zero, 0
+// 0x01012364: 0x1012364: bne   v1, a0, 0x1012454 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_1012444
+	bne.un L_1012454
 // --- basic block ---
-// 0x0101235c: 0x101235c: lw    v1, 28(sp)
+// 0x0101236c: 0x101236c: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1360,16 +1360,16 @@ L_1012340:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012360: 0x1012360: sll   zero, zero, 0
-// 0x01012364: 0x1012364: beq   v1, zero, 0x1012380 sll   zero, zero, 0
+// 0x01012370: 0x1012370: sll   zero, zero, 0
+// 0x01012374: 0x1012374: beq   v1, zero, 0x1012390 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1012380
+	brfalse L_1012390
 // --- basic block ---
-// 0x0101236c: 0x101236c: lhu   v1, 0(v0)
+// 0x0101237c: 0x101237c: lhu   v1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01012370: 0x1012370: lw    a0, 28(sp)
+// 0x01012380: 0x1012380: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1378,14 +1378,14 @@ L_1012340:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012374: 0x1012374: sll   zero, zero, 0
-// 0x01012378: 0x1012378: bne   v1, a0, 0x1012444 sll   zero, zero, 0
+// 0x01012384: 0x1012384: sll   zero, zero, 0
+// 0x01012388: 0x1012388: bne   v1, a0, 0x1012454 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_1012444
+	bne.un L_1012454
 // --- basic block ---
-L_1012380:
-// 0x01012380: 0x1012380: lw    v1, 36(sp)
+L_1012390:
+// 0x01012390: 0x1012390: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1394,18 +1394,18 @@ L_1012380:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012384: 0x1012384: sll   zero, zero, 0
-// 0x01012388: 0x1012388: beq   v1, zero, 0x10123a4 sll   zero, zero, 0
+// 0x01012394: 0x1012394: sll   zero, zero, 0
+// 0x01012398: 0x1012398: beq   v1, zero, 0x10123b4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10123a4
+	brfalse L_10123b4
 // --- basic block ---
-// 0x01012390: 0x1012390: lhu   v1, 6(v0)
+// 0x010123a0: 0x10123a0: lhu   v1, 6(v0)
 	ldloc 6
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01012394: 0x1012394: lw    a0, 36(sp)
+// 0x010123a4: 0x10123a4: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1414,14 +1414,14 @@ L_1012380:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012398: 0x1012398: sll   zero, zero, 0
-// 0x0101239c: 0x101239c: bne   v1, a0, 0x1012444 sll   zero, zero, 0
+// 0x010123a8: 0x10123a8: sll   zero, zero, 0
+// 0x010123ac: 0x10123ac: bne   v1, a0, 0x1012454 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_1012444
+	bne.un L_1012454
 // --- basic block ---
-L_10123a4:
-// 0x010123a4: 0x10123a4: lw    v1, 40(sp)
+L_10123b4:
+// 0x010123b4: 0x10123b4: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1430,39 +1430,39 @@ L_10123a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010123a8: 0x10123a8: sll   zero, zero, 0
-// 0x010123ac: 0x10123ac: beq   v1, zero, 0x10123c4 sll   zero, zero, 0
+// 0x010123b8: 0x10123b8: sll   zero, zero, 0
+// 0x010123bc: 0x10123bc: beq   v1, zero, 0x10123d4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10123c4
+	brfalse L_10123d4
 // --- basic block ---
-// 0x010123b4: 0x10123b4: lhu   v0, 4(v0)
+// 0x010123c4: 0x10123c4: lhu   v0, 4(v0)
 	ldloc 6
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x010123b8: 0x10123b8: sll   zero, zero, 0
-// 0x010123bc: 0x10123bc: bne   v0, v1, 0x1012444 sll   zero, zero, 0
+// 0x010123c8: 0x10123c8: sll   zero, zero, 0
+// 0x010123cc: 0x10123cc: bne   v0, v1, 0x1012454 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_1012444
+	bne.un L_1012454
 // --- basic block ---
-L_10123c4:
-// 0x010123c4: 0x10123c4: jal   0x1003abc sll   zero, zero, 0
+L_10123d4:
+// 0x010123d4: 0x10123d4: jal   0x1003abc sll   zero, zero, 0
 	call int32 Cibyl2::roadmap_line_count_1003abc()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010123cc: 0x10123cc: j	 0x101243c addiu s2, v0, -1
+// 0x010123dc: 0x10123dc: j	 0x101244c addiu s2, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 8
-	br L_101243c
+	br L_101244c
 // --- basic block ---
-L_10123d4:
-// 0x010123d4: 0x10123d4: jal   0x1004034 sll   zero, zero, 0
+L_10123e4:
+// 0x010123e4: 0x10123e4: jal   0x1004034 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1473,12 +1473,12 @@ L_10123d4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010123dc: 0x10123dc: bne   v0, s8, 0x1012438 sll   zero, zero, 0
+// 0x010123ec: 0x10123ec: bne   v0, s8, 0x1012448 sll   zero, zero, 0
 	ldloc 6
 	ldloc 15
-	bne.un L_1012438
+	bne.un L_1012448
 // --- basic block ---
-// 0x010123e4: 0x10123e4: lw    v1, 48(sp)
+// 0x010123f4: 0x10123f4: lw    v1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1487,7 +1487,7 @@ L_10123d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010123e8: 0x10123e8: lw    a0, 52(sp)
+// 0x010123f8: 0x10123f8: lw    a0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1496,31 +1496,31 @@ L_10123d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010123ec: 0x10123ec: sll   a1, s1, 5
+// 0x010123fc: 0x10123fc: sll   a1, s1, 5
 	ldloc 9
 	ldc.i4.5
 	shl
 	stloc.2
-// 0x010123f0: 0x10123f0: slt   v0, s1, v1
+// 0x01012400: 0x1012400: slt   v0, s1, v1
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 6
-// 0x010123f4: 0x10123f4: addu  a1, a0, a1
+// 0x01012404: 0x1012404: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x010123f8: 0x10123f8: beq   v0, zero, 0x1012444 addu  a0, s2, zero
+// 0x01012408: 0x1012408: beq   v0, zero, 0x1012454 addu  a0, s2, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
-	brfalse L_1012444
+	brfalse L_1012454
 // --- basic block ---
-// 0x01012400: 0x1012400: lui   v1, 0x0
+// 0x01012410: 0x1012410: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01012404: 0x1012404: lw    v0, 576(v1)
+// 0x01012414: 0x1012414: lw    v0, 576(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1529,20 +1529,20 @@ L_10123d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012408: 0x1012408: sh    s7, 12(a1)
+// 0x01012418: 0x1012418: sh    s7, 12(a1)
 	ldloc.2
 	ldc.i4.s 12
 	add
 	ldloc 14
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0101240c: 0x101240c: sw    v0, 0(a1)
+// 0x0101241c: 0x101241c: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01012410: 0x1012410: sw    s2, 4(a1)
+// 0x01012420: 0x1012420: sw    s2, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -1551,7 +1551,7 @@ L_10123d4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01012414: 0x1012414: sw    s8, 8(a1)
+// 0x01012424: 0x1012424: sw    s8, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -1560,7 +1560,7 @@ L_10123d4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01012418: 0x1012418: jal   0x1003ce8 sw    a1, 56(sp)
+// 0x01012428: 0x1012428: jal   0x1003ce8 sw    a1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1579,7 +1579,7 @@ L_10123d4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012420: 0x1012420: lw    a1, 56(sp)
+// 0x01012430: 0x1012430: lw    a1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1588,15 +1588,15 @@ L_10123d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01012424: 0x1012424: addu  a0, v0, zero
+// 0x01012434: 0x1012434: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01012428: 0x1012428: addiu a2, a1, 24
+// 0x01012438: 0x1012438: addiu a2, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0101242c: 0x101242c: jal   0x10419f8 addiu a1, a1, 16
+// 0x0101243c: 0x101243c: jal   0x1041a08 addiu a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	add
@@ -1606,43 +1606,43 @@ L_10123d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_range_get_address_10419f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_range_get_address_1041a08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012434: 0x1012434: addiu s1, s1, 1
+// 0x01012444: 0x1012444: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1012438:
-// 0x01012438: 0x1012438: addiu s2, s2, -1
+L_1012448:
+// 0x01012448: 0x1012448: addiu s2, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_101243c:
-// 0x0101243c: 0x101243c: bgez  s2, 0x10123d4 addu  a0, s2, zero
+L_101244c:
+// 0x0101244c: 0x101244c: bgez  s2, 0x10123e4 addu  a0, s2, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
 	ldc.i4.s 0
-	bge L_10123d4
+	bge L_10123e4
 // --- basic block ---
-L_1012444:
-// 0x01012444: 0x1012444: addiu s5, s5, 1
+L_1012454:
+// 0x01012454: 0x1012454: addiu s5, s5, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x01012448: 0x1012448: addiu s6, s6, 8
+// 0x01012458: 0x1012458: addiu s6, s6, 8
 	ldloc 13
 	ldc.i4.8
 	add
 	stloc 13
-L_101244c:
-// 0x0101244c: 0x101244c: lw    a0, 24(sp)
+L_101245c:
+// 0x0101245c: 0x101245c: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1651,21 +1651,21 @@ L_101244c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012450: 0x1012450: lw    v0, -30624(s3)
+// 0x01012460: 0x1012460: lw    v0, -30160(s3)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012454: 0x1012454: addu  s8, s5, a0
+// 0x01012464: 0x1012464: addu  s8, s5, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc 15
-// 0x01012458: 0x1012458: lw    v1, 12(v0)
+// 0x01012468: 0x1012468: lw    v1, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1674,7 +1674,7 @@ L_101244c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101245c: 0x101245c: lw    a0, 44(sp)
+// 0x0101246c: 0x101246c: lw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1683,46 +1683,46 @@ L_101244c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012460: 0x1012460: sll   zero, zero, 0
-// 0x01012464: 0x1012464: addu  v1, v1, a0
+// 0x01012470: 0x1012470: sll   zero, zero, 0
+// 0x01012474: 0x1012474: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01012468: 0x1012468: lhu   v1, 2(v1)
+// 0x01012478: 0x1012478: lhu   v1, 2(v1)
 	ldloc 7
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x0101246c: 0x101246c: sll   zero, zero, 0
-// 0x01012470: 0x1012470: slt   v1, s8, v1
+// 0x0101247c: 0x101247c: sll   zero, zero, 0
+// 0x01012480: 0x1012480: slt   v1, s8, v1
 	ldloc 15
 	ldloc 7
 	clt
 	stloc 7
-// 0x01012474: 0x1012474: bne   v1, zero, 0x1012340 sll   zero, zero, 0
+// 0x01012484: 0x1012484: bne   v1, zero, 0x1012350 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1012340
+	brtrue L_1012350
 // --- basic block ---
-// 0x0101247c: 0x101247c: blez  s1, 0x101248c addu  a0, s4, zero
+// 0x0101248c: 0x101248c: blez  s1, 0x101249c addu  a0, s4, zero
 	ldloc 9
 	ldloc 12
 	stloc.1
 	ldc.i4.s 0
-	ble L_101248c
+	ble L_101249c
 // --- basic block ---
-// 0x01012484: 0x1012484: addu  s0, s0, s1
+// 0x01012494: 0x1012494: addu  s0, s0, s1
 	ldloc 10
 	ldloc 9
 	add
 	stloc 10
-L_1012488:
-// 0x01012488: 0x1012488: addu  a0, s4, zero
+L_1012498:
+// 0x01012498: 0x1012498: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-L_101248c:
-// 0x0101248c: 0x101248c: jal   0x1040bc4 addiu a1, sp, 16
+L_101249c:
+// 0x0101249c: 0x101249c: jal   0x1040bd4 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1732,27 +1732,27 @@ L_101248c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_city_next_1040bc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_city_next_1040bd4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012494: 0x1012494: addu  s1, v0, zero
+// 0x010124a4: 0x10124a4: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-L_1012498:
-// 0x01012498: 0x1012498: bne   s1, zero, 0x1012210 lui   v1, 0x0
+L_10124a8:
+// 0x010124a8: 0x10124a8: bne   s1, zero, 0x1012220 lui   v1, 0x0
 	ldloc 9
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1012210
+	brtrue L_1012220
 // --- basic block ---
-L_10124a0:
-// 0x010124a0: 0x10124a0: lw    ra, 100(sp)
-// 0x010124a4: 0x10124a4: addu  v0, s0, zero
+L_10124b0:
+// 0x010124b0: 0x10124b0: lw    ra, 100(sp)
+// 0x010124b4: 0x10124b4: addu  v0, s0, zero
 	ldloc 10
 	stloc 6
-// 0x010124a8: 0x10124a8: lw    s8, 96(sp)
+// 0x010124b8: 0x10124b8: lw    s8, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1761,7 +1761,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010124ac: 0x10124ac: lw    s7, 92(sp)
+// 0x010124bc: 0x10124bc: lw    s7, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1770,7 +1770,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010124b0: 0x10124b0: lw    s6, 88(sp)
+// 0x010124c0: 0x10124c0: lw    s6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1779,7 +1779,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010124b4: 0x10124b4: lw    s5, 84(sp)
+// 0x010124c4: 0x10124c4: lw    s5, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1788,7 +1788,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010124b8: 0x10124b8: lw    s4, 80(sp)
+// 0x010124c8: 0x10124c8: lw    s4, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1797,7 +1797,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010124bc: 0x10124bc: lw    s3, 76(sp)
+// 0x010124cc: 0x10124cc: lw    s3, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1806,7 +1806,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010124c0: 0x10124c0: lw    s2, 72(sp)
+// 0x010124d0: 0x10124d0: lw    s2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1815,7 +1815,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010124c4: 0x10124c4: lw    s1, 68(sp)
+// 0x010124d4: 0x10124d4: lw    s1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1824,7 +1824,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010124c8: 0x10124c8: lw    s0, 64(sp)
+// 0x010124d8: 0x10124d8: lw    s0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1833,7 +1833,7 @@ L_10124a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010124cc: 0x10124cc: jr    ra addiu sp, sp, 104
+// 0x010124dc: 0x10124dc: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -1845,7 +1845,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 T_147_10124d4(int32,int32,int32,int32,int32)
+.method public static int32 T_147_10124e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s7,int32 s6,int32 s0,int32 s1,int32 s8,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -1907,12 +1907,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010124d4: 0x10124d4: addiu sp, sp, -112
+// 0x010124e4: 0x10124e4: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x010124d8: 0x10124d8: sw    s6, 96(sp)
+// 0x010124e8: 0x10124e8: sw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1921,7 +1921,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010124dc: 0x10124dc: sw    s5, 92(sp)
+// 0x010124ec: 0x10124ec: sw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1930,7 +1930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010124e0: 0x10124e0: sw    s4, 88(sp)
+// 0x010124f0: 0x10124f0: sw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1939,7 +1939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010124e4: 0x10124e4: sw    s3, 84(sp)
+// 0x010124f4: 0x10124f4: sw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1948,7 +1948,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010124e8: 0x10124e8: sw    s2, 80(sp)
+// 0x010124f8: 0x10124f8: sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1957,8 +1957,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010124ec: 0x10124ec: sw    ra, 108(sp)
-// 0x010124f0: 0x10124f0: sw    s8, 104(sp)
+// 0x010124fc: 0x10124fc: sw    ra, 108(sp)
+// 0x01012500: 0x1012500: sw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1967,7 +1967,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010124f4: 0x10124f4: sw    s7, 100(sp)
+// 0x01012504: 0x1012504: sw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1976,7 +1976,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010124f8: 0x10124f8: sw    s1, 76(sp)
+// 0x01012508: 0x1012508: sw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1985,7 +1985,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010124fc: 0x10124fc: sw    s0, 72(sp)
+// 0x0101250c: 0x101250c: sw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1994,21 +1994,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01012500: 0x1012500: addu  s3, a2, zero
+// 0x01012510: 0x1012510: addu  s3, a2, zero
 	ldloc.3
 	stloc 14
-// 0x01012504: 0x1012504: addu  s6, a1, zero
+// 0x01012514: 0x1012514: addu  s6, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01012508: 0x1012508: addu  s5, a3, zero
+// 0x01012518: 0x1012518: addu  s5, a3, zero
 	ldloc 4
 	stloc 16
-// 0x0101250c: 0x101250c: sll   a0, a0, 3
+// 0x0101251c: 0x101251c: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x01012510: 0x1012510: lw    s2, 128(sp)
+// 0x01012520: 0x1012520: lw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2017,7 +2017,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01012514: 0x1012514: lw    s4, 132(sp)
+// 0x01012524: 0x1012524: lw    s4, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2026,109 +2026,109 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01012518: 0x1012518: lui   v0, 0x20000
+// 0x01012528: 0x1012528: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0101251c: 0x101251c: beq   a2, zero, 0x101253c lui   v1, 0x20000
+// 0x0101252c: 0x101252c: beq   a2, zero, 0x101254c lui   v1, 0x20000
 	ldloc.3
 	ldc.i4 131072
 	stloc 7
-	brfalse L_101253c
+	brfalse L_101254c
 // --- basic block ---
-// 0x01012524: 0x1012524: lw    a1, 31152(v1)
+// 0x01012534: 0x1012534: lw    a1, 31616(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.2
-// 0x01012528: 0x1012528: lw    v1, 31228(v0)
+// 0x01012538: 0x1012538: lw    v1, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101252c: 0x101252c: addu  a0, a1, a0
+// 0x0101253c: 0x101253c: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01012530: 0x1012530: lhu   v0, 0(a0)
+// 0x01012540: 0x1012540: lhu   v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01012534: 0x1012534: j	 0x1012554 andi  v0, v0, 32767
+// 0x01012544: 0x1012544: j	 0x1012564 andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-	br L_1012554
+	br L_1012564
 // --- basic block ---
-L_101253c:
-// 0x0101253c: 0x101253c: lw    a1, 31152(v1)
+L_101254c:
+// 0x0101254c: 0x101254c: lw    a1, 31616(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.2
-// 0x01012540: 0x1012540: lw    v1, 31228(v0)
+// 0x01012550: 0x1012550: lw    v1, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012544: 0x1012544: addu  a0, a1, a0
+// 0x01012554: 0x1012554: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01012548: 0x1012548: lhu   v0, 2(a0)
+// 0x01012558: 0x1012558: lhu   v0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x0101254c: 0x101254c: sll   zero, zero, 0
-// 0x01012550: 0x1012550: andi  v0, v0, 32767
+// 0x0101255c: 0x101255c: sll   zero, zero, 0
+// 0x01012560: 0x1012560: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-L_1012554:
-// 0x01012554: 0x1012554: sll   v0, v0, 3
+L_1012564:
+// 0x01012564: 0x1012564: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01012558: 0x1012558: addu  v0, v1, v0
+// 0x01012568: 0x1012568: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0101255c: 0x101255c: lw    v1, 0(v0)
+// 0x0101256c: 0x101256c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01012560: 0x1012560: addiu s7, sp, 32
+// 0x01012570: 0x1012570: addiu s7, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
-// 0x01012564: 0x1012564: sw    v1, 32(sp)
+// 0x01012574: 0x1012574: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2137,7 +2137,7 @@ L_1012554:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012568: 0x1012568: lw    v0, 4(v0)
+// 0x01012578: 0x1012578: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2146,10 +2146,10 @@ L_1012554:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101256c: 0x101256c: addu  a0, s7, zero
+// 0x0101257c: 0x101257c: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x01012570: 0x1012570: jal   0x100aee4 sw    v0, 36(sp)
+// 0x01012580: 0x1012580: jal   0x100aef4 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2163,22 +2163,22 @@ L_1012554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_cross_pos_100aee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_cross_pos_100aef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012578: 0x1012578: bltz  v0, 0x1012758 addu  s1, v0, zero
+// 0x01012588: 0x1012588: bltz  v0, 0x1012768 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
 	ldc.i4.s 0
-	blt L_1012758
+	blt L_1012768
 // --- basic block ---
-// 0x01012580: 0x1012580: addu  a0, s7, zero
+// 0x01012590: 0x1012590: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x01012584: 0x1012584: jal   0x100b7a8 addu  a1, s6, zero
+// 0x01012594: 0x1012594: jal   0x100b7b8 addu  a1, s6, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -2186,25 +2186,25 @@ L_1012554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101258c: 0x101258c: addu  s0, v0, zero
+// 0x0101259c: 0x101259c: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01012590: 0x1012590: addiu v0, zero, -1
+// 0x010125a0: 0x10125a0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01012594: 0x1012594: beq   s0, v0, 0x1012720 lui   v0, 0x0
+// 0x010125a4: 0x10125a4: beq   s0, v0, 0x1012730 lui   v0, 0x0
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1012720
+	beq  L_1012730
 // --- basic block ---
-// 0x0101259c: 0x101259c: lw    v0, 576(v0)
+// 0x010125ac: 0x10125ac: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2213,22 +2213,22 @@ L_1012554:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010125a0: 0x10125a0: sll   zero, zero, 0
-// 0x010125a4: 0x10125a4: beq   s0, v0, 0x10125c0 addu  a0, s1, zero
+// 0x010125b0: 0x10125b0: sll   zero, zero, 0
+// 0x010125b4: 0x10125b4: beq   s0, v0, 0x10125d0 addu  a0, s1, zero
 	ldloc 10
 	ldloc 5
 	ldloc 11
 	stloc.1
-	beq  L_10125c0
+	beq  L_10125d0
 // --- basic block ---
-// 0x010125ac: 0x10125ac: bltz  s0, 0x10125c4 addu  a1, s3, zero
+// 0x010125bc: 0x10125bc: bltz  s0, 0x10125d4 addu  a1, s3, zero
 	ldloc 10
 	ldloc 14
 	stloc.2
 	ldc.i4.s 0
-	blt L_10125c4
+	blt L_10125d4
 // --- basic block ---
-// 0x010125b4: 0x10125b4: jal   0x100b164 addu  a0, s0, zero
+// 0x010125c4: 0x10125c4: jal   0x100b174 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2236,25 +2236,25 @@ L_1012554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010125bc: 0x10125bc: addu  a0, s1, zero
+// 0x010125cc: 0x10125cc: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-L_10125c0:
-// 0x010125c0: 0x10125c0: addu  a1, s3, zero
+L_10125d0:
+// 0x010125d0: 0x10125d0: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-L_10125c4:
-// 0x010125c4: 0x10125c4: addiu a2, sp, 24
+L_10125d4:
+// 0x010125d4: 0x10125d4: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010125c8: 0x10125c8: jal   0x1003bb4 addiu a3, sp, 28
+// 0x010125d8: 0x10125d8: jal   0x1003bb4 addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -2268,13 +2268,13 @@ L_10125c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010125d0: 0x10125d0: beq   v0, zero, 0x1012758 addiu s6, zero, 17
+// 0x010125e0: 0x10125e0: beq   v0, zero, 0x1012768 addiu s6, zero, 17
 	ldloc 5
 	ldc.i4.s 17
 	stloc 9
-	brfalse L_1012758
+	brfalse L_1012768
 // --- basic block ---
-// 0x010125d8: 0x10125d8: lw    v0, 24(sp)
+// 0x010125e8: 0x10125e8: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2283,7 +2283,7 @@ L_10125c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010125dc: 0x10125dc: j	 0x1012700 sw    v0, 64(sp)
+// 0x010125ec: 0x10125ec: j	 0x1012710 sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2292,10 +2292,10 @@ L_10125c4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1012700
+	br L_1012710
 // --- basic block ---
-L_10125e4:
-// 0x010125e4: 0x10125e4: lw    a0, 64(sp)
+L_10125f4:
+// 0x010125f4: 0x10125f4: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2304,119 +2304,119 @@ L_10125e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010125e8: 0x10125e8: jal   0x1003c0c sll   zero, zero, 0
+// 0x010125f8: 0x10125f8: jal   0x1003c0c sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl2::roadmap_line_get_broken_1003c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010125f0: 0x10125f0: addu  s8, v0, zero
+// 0x01012600: 0x1012600: addu  s8, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010125f4: 0x10125f4: beq   s3, zero, 0x101261c sll   v0, v0, 3
+// 0x01012604: 0x1012604: beq   s3, zero, 0x101262c sll   v0, v0, 3
 	ldloc 14
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-	brfalse L_101261c
+	brfalse L_101262c
 // --- basic block ---
-// 0x010125fc: 0x10125fc: lui   a0, 0x20000
+// 0x0101260c: 0x101260c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01012600: 0x1012600: lw    v1, 31152(a0)
+// 0x01012610: 0x1012610: lw    v1, 31616(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012604: 0x1012604: lui   a1, 0x20000
+// 0x01012614: 0x1012614: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01012608: 0x1012608: addu  v0, v1, v0
+// 0x01012618: 0x1012618: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0101260c: 0x101260c: lw    a0, 31228(a1)
+// 0x0101261c: 0x101261c: lw    a0, 31692(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012610: 0x1012610: lhu   v1, 2(v0)
+// 0x01012620: 0x1012620: lhu   v1, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01012614: 0x1012614: j	 0x101263c andi  v1, v1, 32767
+// 0x01012624: 0x1012624: j	 0x101264c andi  v1, v1, 32767
 	ldloc 7
 	ldc.i4 32767
 	and
 	stloc 7
-	br L_101263c
+	br L_101264c
 // --- basic block ---
-L_101261c:
-// 0x0101261c: 0x101261c: lui   a0, 0x20000
+L_101262c:
+// 0x0101262c: 0x101262c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01012620: 0x1012620: lw    v1, 31152(a0)
+// 0x01012630: 0x1012630: lw    v1, 31616(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012624: 0x1012624: lui   a1, 0x20000
+// 0x01012634: 0x1012634: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01012628: 0x1012628: addu  v0, v1, v0
+// 0x01012638: 0x1012638: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0101262c: 0x101262c: lw    a0, 31228(a1)
+// 0x0101263c: 0x101263c: lw    a0, 31692(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012630: 0x1012630: lhu   v1, 0(v0)
+// 0x01012640: 0x1012640: lhu   v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01012634: 0x1012634: sll   zero, zero, 0
-// 0x01012638: 0x1012638: andi  v1, v1, 32767
+// 0x01012644: 0x1012644: sll   zero, zero, 0
+// 0x01012648: 0x1012648: andi  v1, v1, 32767
 	ldloc 7
 	ldc.i4 32767
 	and
 	stloc 7
-L_101263c:
-// 0x0101263c: 0x101263c: sll   v1, v1, 3
+L_101264c:
+// 0x0101264c: 0x101264c: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x01012640: 0x1012640: addu  v1, a0, v1
+// 0x01012650: 0x1012650: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01012644: 0x1012644: addiu a0, zero, 1
+// 0x01012654: 0x1012654: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01012648: 0x1012648: lw    v0, 4(v1)
+// 0x01012658: 0x1012658: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2425,27 +2425,27 @@ L_101263c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101264c: 0x101264c: lw    v1, 0(v1)
+// 0x0101265c: 0x101265c: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01012650: 0x1012650: beq   s1, a0, 0x1012660 addiu a1, zero, 3
+// 0x01012660: 0x1012660: beq   s1, a0, 0x1012670 addiu a1, zero, 3
 	ldloc 11
 	ldloc.1
 	ldc.i4.3
 	stloc.2
-	beq  L_1012660
+	beq  L_1012670
 // --- basic block ---
-// 0x01012658: 0x1012658: bne   s1, a1, 0x101266c sll   zero, zero, 0
+// 0x01012668: 0x1012668: bne   s1, a1, 0x101267c sll   zero, zero, 0
 	ldloc 11
 	ldloc.2
-	bne.un L_101266c
+	bne.un L_101267c
 // --- basic block ---
-L_1012660:
-// 0x01012660: 0x1012660: lw    s7, 32(sp)
+L_1012670:
+// 0x01012670: 0x1012670: lw    s7, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2454,15 +2454,15 @@ L_1012660:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012664: 0x1012664: j	 0x1012678 subu  s7, v1, s7
+// 0x01012674: 0x1012674: j	 0x1012688 subu  s7, v1, s7
 	ldloc 7
 	ldloc 8
 	sub
 	stloc 8
-	br L_1012678
+	br L_1012688
 // --- basic block ---
-L_101266c:
-// 0x0101266c: 0x101266c: lw    s7, 36(sp)
+L_101267c:
+// 0x0101267c: 0x101267c: lw    s7, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2471,42 +2471,42 @@ L_101266c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012670: 0x1012670: sll   zero, zero, 0
-// 0x01012674: 0x1012674: subu  s7, v0, s7
+// 0x01012680: 0x1012680: sll   zero, zero, 0
+// 0x01012684: 0x1012684: subu  s7, v0, s7
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 8
-L_1012678:
-// 0x01012678: 0x1012678: sra   v0, s7, 31
+L_1012688:
+// 0x01012688: 0x1012688: sra   v0, s7, 31
 	ldloc 8
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x0101267c: 0x101267c: xor   s7, v0, s7
+// 0x0101268c: 0x101268c: xor   s7, v0, s7
 	ldloc 5
 	ldloc 8
 	xor
 	stloc 8
-// 0x01012680: 0x1012680: subu  s7, s7, v0
+// 0x01012690: 0x1012690: subu  s7, s7, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x01012684: 0x1012684: slt   v0, s7, s6
+// 0x01012694: 0x1012694: slt   v0, s7, s6
 	ldloc 8
 	ldloc 9
 	clt
 	stloc 5
-// 0x01012688: 0x1012688: beq   v0, zero, 0x10126ec addiu a1, sp, 40
+// 0x01012698: 0x1012698: beq   v0, zero, 0x10126fc addiu a1, sp, 40
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-	brfalse L_10126ec
+	brfalse L_10126fc
 // --- basic block ---
-// 0x01012690: 0x1012690: jal   0x1011a4c addu  a0, s8, zero
+// 0x010126a0: 0x10126a0: jal   0x1011a5c addu  a0, s8, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -2514,31 +2514,31 @@ L_1012678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012698: 0x1012698: addu  a0, s8, zero
+// 0x010126a8: 0x10126a8: addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-// 0x0101269c: 0x101269c: jal   0x1004a70 addiu a1, zero, 3
+// 0x010126ac: 0x10126ac: jal   0x1004a80 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010126a4: 0x10126a4: addu  a0, s8, zero
+// 0x010126b4: 0x10126b4: addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-// 0x010126a8: 0x10126a8: addiu a1, zero, 3
+// 0x010126b8: 0x10126b8: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010126ac: 0x10126ac: jal   0x1004a70 sw    v0, 68(sp)
+// 0x010126bc: 0x10126bc: jal   0x1004a80 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2549,12 +2549,12 @@ L_1012678:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010126b4: 0x10126b4: lw    v1, 68(sp)
+// 0x010126c4: 0x10126c4: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2563,13 +2563,13 @@ L_1012678:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010126b8: 0x10126b8: sll   zero, zero, 0
-// 0x010126bc: 0x10126bc: bne   v1, v0, 0x10126ec sll   zero, zero, 0
+// 0x010126c8: 0x10126c8: sll   zero, zero, 0
+// 0x010126cc: 0x10126cc: bne   v1, v0, 0x10126fc sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10126ec
+	bne.un L_10126fc
 // --- basic block ---
-// 0x010126c4: 0x10126c4: jal   0x1011920 addiu a0, sp, 40
+// 0x010126d4: 0x10126d4: jal   0x1011930 addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2579,15 +2579,15 @@ L_1012678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_full_name_1011920(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_full_name_1011930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010126cc: 0x10126cc: addu  a1, v0, zero
+// 0x010126dc: 0x10126dc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010126d0: 0x10126d0: jal   0x1001b14 addu  a0, s5, zero
+// 0x010126e0: 0x10126e0: jal   0x1001b14 addu  a0, s5, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
@@ -2595,32 +2595,32 @@ L_1012678:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010126d8: 0x10126d8: bne   v0, zero, 0x10126ec sll   zero, zero, 0
+// 0x010126e8: 0x10126e8: bne   v0, zero, 0x10126fc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10126ec
+	brtrue L_10126fc
 // --- basic block ---
-// 0x010126e0: 0x10126e0: sw    s0, 0(s2)
+// 0x010126f0: 0x10126f0: sw    s0, 0(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010126e4: 0x10126e4: j	 0x10126f0 sw    s8, 0(s4)
+// 0x010126f4: 0x10126f4: j	 0x1012700 sw    s8, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-	br L_10126f0
+	br L_1012700
 // --- basic block ---
-L_10126ec:
-// 0x010126ec: 0x10126ec: addu  s7, s6, zero
+L_10126fc:
+// 0x010126fc: 0x10126fc: addu  s7, s6, zero
 	ldloc 9
 	stloc 8
-L_10126f0:
-// 0x010126f0: 0x10126f0: lw    v0, 64(sp)
+L_1012700:
+// 0x01012700: 0x1012700: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2629,15 +2629,15 @@ L_10126f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010126f4: 0x10126f4: addu  s6, s7, zero
+// 0x01012704: 0x1012704: addu  s6, s7, zero
 	ldloc 8
 	stloc 9
-// 0x010126f8: 0x10126f8: addiu v0, v0, 1
+// 0x01012708: 0x1012708: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010126fc: 0x10126fc: sw    v0, 64(sp)
+// 0x0101270c: 0x101270c: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2646,8 +2646,8 @@ L_10126f0:
 	add
 	ldloc 5
 	stelem.i4
-L_1012700:
-// 0x01012700: 0x1012700: lw    v0, 28(sp)
+L_1012710:
+// 0x01012710: 0x1012710: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2656,7 +2656,7 @@ L_1012700:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012704: 0x1012704: lw    v1, 64(sp)
+// 0x01012714: 0x1012714: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2665,24 +2665,24 @@ L_1012700:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012708: 0x1012708: sll   zero, zero, 0
-// 0x0101270c: 0x101270c: slt   v0, v0, v1
+// 0x01012718: 0x1012718: sll   zero, zero, 0
+// 0x0101271c: 0x101271c: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01012710: 0x1012710: beq   v0, zero, 0x10125e4 sll   zero, zero, 0
+// 0x01012720: 0x1012720: beq   v0, zero, 0x10125f4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10125e4
+	brfalse L_10125f4
 // --- basic block ---
-// 0x01012718: 0x1012718: j	 0x101275c sll   zero, zero, 0
-	br L_101275c
+// 0x01012728: 0x1012728: j	 0x101276c sll   zero, zero, 0
+	br L_101276c
 // --- basic block ---
-L_1012720:
-// 0x01012720: 0x1012720: addu  a0, s6, zero
+L_1012730:
+// 0x01012730: 0x1012730: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x01012724: 0x1012724: jal   0x100c63c addu  a1, s7, zero
+// 0x01012734: 0x1012734: jal   0x100c64c addu  a1, s7, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2690,55 +2690,55 @@ L_1012720:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101272c: 0x101272c: sw    v0, 0(s2)
+// 0x0101273c: 0x101273c: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01012730: 0x1012730: sw    s0, 0(s4)
+// 0x01012740: 0x1012740: sw    s0, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x01012734: 0x1012734: lw    v0, 0(s2)
+// 0x01012744: 0x1012744: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01012738: 0x1012738: lui   a1, 0x0
+// 0x01012748: 0x1012748: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101273c: 0x101273c: lui   a3, 0x0
+// 0x0101274c: 0x101274c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01012740: 0x1012740: addiu a1, a1, 27620
+// 0x01012750: 0x1012750: addiu a1, a1, 27620
 	ldloc.2
 	ldc.i4 27620
 	add
 	stloc.2
-// 0x01012744: 0x1012744: addiu a3, a3, 27824
+// 0x01012754: 0x1012754: addiu a3, a3, 27824
 	ldloc 4
 	ldc.i4 27824
 	add
 	stloc 4
-// 0x01012748: 0x1012748: addiu a0, zero, 1
+// 0x01012758: 0x1012758: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101274c: 0x101274c: addiu a2, zero, 1815
+// 0x0101275c: 0x101275c: addiu a2, zero, 1815
 	ldc.i4 1815
 	stloc.3
-// 0x01012750: 0x1012750: jal   0x100449c sw    v0, 16(sp)
+// 0x01012760: 0x1012760: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2757,18 +2757,18 @@ L_1012720:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1012758:
-// 0x01012758: 0x1012758: addiu s6, zero, 17
+L_1012768:
+// 0x01012768: 0x1012768: addiu s6, zero, 17
 	ldc.i4.s 17
 	stloc 9
-L_101275c:
-// 0x0101275c: 0x101275c: lw    ra, 108(sp)
-// 0x01012760: 0x1012760: slti  v0, s6, 17
+L_101276c:
+// 0x0101276c: 0x101276c: lw    ra, 108(sp)
+// 0x01012770: 0x1012770: slti  v0, s6, 17
 	ldloc 9
 	ldc.i4.s 17
 	clt
 	stloc 5
-// 0x01012764: 0x1012764: lw    s8, 104(sp)
+// 0x01012774: 0x1012774: lw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2777,7 +2777,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01012768: 0x1012768: lw    s7, 100(sp)
+// 0x01012778: 0x1012778: lw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2786,7 +2786,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101276c: 0x101276c: lw    s6, 96(sp)
+// 0x0101277c: 0x101277c: lw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2795,7 +2795,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01012770: 0x1012770: lw    s5, 92(sp)
+// 0x01012780: 0x1012780: lw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2804,7 +2804,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01012774: 0x1012774: lw    s4, 88(sp)
+// 0x01012784: 0x1012784: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2813,7 +2813,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01012778: 0x1012778: lw    s3, 84(sp)
+// 0x01012788: 0x1012788: lw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2822,7 +2822,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101277c: 0x101277c: lw    s2, 80(sp)
+// 0x0101278c: 0x101278c: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2831,7 +2831,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01012780: 0x1012780: lw    s1, 76(sp)
+// 0x01012790: 0x1012790: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2840,7 +2840,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01012784: 0x1012784: lw    s0, 72(sp)
+// 0x01012794: 0x1012794: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2849,7 +2849,7 @@ L_101275c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01012788: 0x1012788: jr    ra addiu sp, sp, 112
+// 0x01012798: 0x1012798: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -2861,7 +2861,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 s5,int32 s7,int32 s8,int32 s4,int32 s6,int32 ra)
@@ -2923,12 +2923,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01012790: 0x1012790: addiu sp, sp, -640
+// 0x010127a0: 0x10127a0: addiu sp, sp, -640
 	ldloc.0
 	ldc.i4 -640
 	add
 	stloc.0
-// 0x01012794: 0x1012794: sw    s8, 632(sp)
+// 0x010127a4: 0x10127a4: sw    s8, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2937,7 +2937,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01012798: 0x1012798: sw    s6, 624(sp)
+// 0x010127a8: 0x10127a8: sw    s6, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2946,7 +2946,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101279c: 0x101279c: sw    s5, 620(sp)
+// 0x010127ac: 0x10127ac: sw    s5, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2955,7 +2955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010127a0: 0x10127a0: sw    s4, 616(sp)
+// 0x010127b0: 0x10127b0: sw    s4, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2964,7 +2964,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010127a4: 0x10127a4: sw    s1, 604(sp)
+// 0x010127b4: 0x10127b4: sw    s1, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2973,7 +2973,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010127a8: 0x10127a8: sw    s0, 600(sp)
+// 0x010127b8: 0x10127b8: sw    s0, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2982,8 +2982,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010127ac: 0x10127ac: sw    ra, 636(sp)
-// 0x010127b0: 0x10127b0: sw    s7, 628(sp)
+// 0x010127bc: 0x10127bc: sw    ra, 636(sp)
+// 0x010127c0: 0x10127c0: sw    s7, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2992,7 +2992,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010127b4: 0x10127b4: sw    s3, 612(sp)
+// 0x010127c4: 0x10127c4: sw    s3, 612(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3001,7 +3001,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010127b8: 0x10127b8: sw    s2, 608(sp)
+// 0x010127c8: 0x10127c8: sw    s2, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3010,16 +3010,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010127bc: 0x10127bc: addu  s8, a1, zero
+// 0x010127cc: 0x10127cc: addu  s8, a1, zero
 	ldloc.2
 	stloc 14
-// 0x010127c0: 0x10127c0: addu  s4, a2, zero
+// 0x010127d0: 0x10127d0: addu  s4, a2, zero
 	ldloc.3
 	stloc 15
-// 0x010127c4: 0x10127c4: addu  s5, a3, zero
+// 0x010127d4: 0x10127d4: addu  s5, a3, zero
 	ldloc 4
 	stloc 12
-// 0x010127c8: 0x10127c8: lw    s1, 656(sp)
+// 0x010127d8: 0x10127d8: lw    s1, 656(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3028,7 +3028,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010127cc: 0x10127cc: lw    s6, 660(sp)
+// 0x010127dc: 0x10127dc: lw    s6, 660(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3037,31 +3037,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010127d0: 0x10127d0: beq   a1, zero, 0x10127e0 addu  s0, a0, zero
+// 0x010127e0: 0x10127e0: beq   a1, zero, 0x10127f0 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 8
-	brfalse L_10127e0
+	brfalse L_10127f0
 // --- basic block ---
-// 0x010127d8: 0x10127d8: jal   0x1014dd8 sll   zero, zero, 0
+// 0x010127e8: 0x10127e8: jal   0x1014de8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10127e0:
-// 0x010127e0: 0x10127e0: beq   s4, zero, 0x10127f0 addu  a0, s0, zero
+L_10127f0:
+// 0x010127f0: 0x10127f0: beq   s4, zero, 0x1012800 addu  a0, s0, zero
 	ldloc 15
 	ldloc 8
 	stloc.1
-	brfalse L_10127f0
+	brfalse L_1012800
 // --- basic block ---
-// 0x010127e8: 0x10127e8: jal   0x1014ccc addu  a1, s4, zero
+// 0x010127f8: 0x10127f8: jal   0x1014cdc addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -3069,35 +3069,35 @@ L_10127e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10127f0:
-// 0x010127f0: 0x10127f0: lw    v0, 0(s0)
+L_1012800:
+// 0x01012800: 0x1012800: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010127f4: 0x10127f4: sll   zero, zero, 0
-// 0x010127f8: 0x10127f8: bne   v0, zero, 0x1012c24 addu  s2, zero, zero
+// 0x01012804: 0x1012804: sll   zero, zero, 0
+// 0x01012808: 0x1012808: bne   v0, zero, 0x1012c34 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	brtrue L_1012c24
+	brtrue L_1012c34
 // --- basic block ---
-// 0x01012800: 0x1012800: addiu a0, sp, 32
+// 0x01012810: 0x1012810: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01012804: 0x1012804: addu  a1, s0, zero
+// 0x01012814: 0x1012814: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01012808: 0x1012808: jal   0x1001800 addiu a2, zero, 20
+// 0x01012818: 0x1012818: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -3109,10 +3109,10 @@ L_10127f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012810: 0x1012810: lui   v0, 0x0
+// 0x01012820: 0x1012820: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01012814: 0x1012814: lw    v0, 576(v0)
+// 0x01012824: 0x1012824: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3121,7 +3121,7 @@ L_10127f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012818: 0x1012818: lw    a0, 12(s0)
+// 0x01012828: 0x1012828: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3130,29 +3130,29 @@ L_10127f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101281c: 0x101281c: sll   zero, zero, 0
-// 0x01012820: 0x1012820: beq   a0, v0, 0x101283c sll   zero, zero, 0
+// 0x0101282c: 0x101282c: sll   zero, zero, 0
+// 0x01012830: 0x1012830: beq   a0, v0, 0x101284c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_101283c
+	beq  L_101284c
 // --- basic block ---
-// 0x01012828: 0x1012828: bltz  a0, 0x101283c sll   zero, zero, 0
+// 0x01012838: 0x1012838: bltz  a0, 0x101284c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_101283c
+	blt L_101284c
 // --- basic block ---
-// 0x01012830: 0x1012830: jal   0x100b164 sll   zero, zero, 0
+// 0x01012840: 0x1012840: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012838: 0x1012838: lw    a0, 12(s0)
+// 0x01012848: 0x1012848: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3161,19 +3161,19 @@ L_10127f0:
 	add
 	ldelem.i4
 	stloc.1
-L_101283c:
-// 0x0101283c: 0x101283c: jal   0x100add4 sll   zero, zero, 0
+L_101284c:
+// 0x0101284c: 0x101284c: jal   0x100ade4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_scale_100add4(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_scale_100ade4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012844: 0x1012844: sw    v0, 592(sp)
+// 0x01012854: 0x1012854: sw    v0, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3182,45 +3182,45 @@ L_101283c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01012848: 0x1012848: andi  v0, s5, 1
+// 0x01012858: 0x1012858: andi  v0, s5, 1
 	ldloc 12
 	ldc.i4.1
 	and
 	stloc 5
-// 0x0101284c: 0x101284c: bne   v0, zero, 0x1012860 sll   zero, zero, 0
+// 0x0101285c: 0x101285c: bne   v0, zero, 0x1012870 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1012860
+	brtrue L_1012870
 // --- basic block ---
-// 0x01012854: 0x1012854: addu  s3, zero, zero
+// 0x01012864: 0x1012864: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01012858: 0x1012858: j	 0x1012a3c addu  s2, zero, zero
+// 0x01012868: 0x1012868: j	 0x1012a4c addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_1012a3c
+	br L_1012a4c
 // --- basic block ---
-L_1012860:
-// 0x01012860: 0x1012860: addu  s3, zero, zero
+L_1012870:
+// 0x01012870: 0x1012870: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01012864: 0x1012864: addu  s2, zero, zero
+// 0x01012874: 0x1012874: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01012868: 0x1012868: j	 0x10129e4 addiu s7, sp, 32
+// 0x01012878: 0x1012878: j	 0x10129f4 addiu s7, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 13
-	br L_10129e4
+	br L_10129f4
 // --- basic block ---
-L_1012870:
-// 0x01012870: 0x1012870: bne   s3, zero, 0x10128d0 lui   v1, 0x0
+L_1012880:
+// 0x01012880: 0x1012880: bne   s3, zero, 0x10128e0 lui   v1, 0x0
 	ldloc 9
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10128d0
+	brtrue L_10128e0
 // --- basic block ---
-// 0x01012878: 0x1012878: lw    a0, 44(sp)
+// 0x01012888: 0x1012888: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3229,7 +3229,7 @@ L_1012870:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101287c: 0x101287c: lw    v0, 576(v1)
+// 0x0101288c: 0x101288c: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3238,30 +3238,30 @@ L_1012870:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012880: 0x1012880: sll   zero, zero, 0
-// 0x01012884: 0x1012884: beq   a0, v0, 0x101289c sll   zero, zero, 0
+// 0x01012890: 0x1012890: sll   zero, zero, 0
+// 0x01012894: 0x1012894: beq   a0, v0, 0x10128ac sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_101289c
+	beq  L_10128ac
 // --- basic block ---
-// 0x0101288c: 0x101288c: bltz  a0, 0x101289c sll   zero, zero, 0
+// 0x0101289c: 0x101289c: bltz  a0, 0x10128ac sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_101289c
+	blt L_10128ac
 // --- basic block ---
-// 0x01012894: 0x1012894: jal   0x100b164 sll   zero, zero, 0
+// 0x010128a4: 0x10128a4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101289c:
-// 0x0101289c: 0x101289c: lw    a0, 36(sp)
+L_10128ac:
+// 0x010128ac: 0x10128ac: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3270,7 +3270,7 @@ L_101289c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010128a0: 0x10128a0: jal   0x1011a4c addiu a1, sp, 52
+// 0x010128b0: 0x10128b0: jal   0x1011a5c addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -3280,12 +3280,12 @@ L_101289c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010128a8: 0x10128a8: jal   0x1011920 addiu a0, sp, 52
+// 0x010128b8: 0x10128b8: jal   0x1011930 addiu a0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -3295,20 +3295,20 @@ L_101289c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_full_name_1011920(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_full_name_1011930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010128b0: 0x10128b0: addu  a1, v0, zero
+// 0x010128c0: 0x10128c0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010128b4: 0x10128b4: addiu a0, sp, 76
+// 0x010128c4: 0x10128c4: addiu a0, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.1
-// 0x010128b8: 0x10128b8: jal   0x1001af8 addiu a2, zero, 512
+// 0x010128c8: 0x10128c8: jal   0x1001af8 addiu a2, zero, 512
 	ldc.i4 512
 	stloc.3
 	ldloc.1
@@ -3317,7 +3317,7 @@ L_101289c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010128c0: 0x10128c0: lw    a0, 36(sp)
+// 0x010128d0: 0x10128d0: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3326,10 +3326,10 @@ L_101289c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010128c4: 0x10128c4: addiu a1, zero, 3
+// 0x010128d4: 0x10128d4: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010128c8: 0x10128c8: jal   0x1004a70 sb    zero, 587(sp)
+// 0x010128d8: 0x10128d8: jal   0x1004a80 sb    zero, 587(sp)
 	ldloc.0
 	ldc.i4 587
 	add
@@ -3337,13 +3337,13 @@ L_101289c:
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10128d0:
-// 0x010128d0: 0x10128d0: lw    a1, 592(sp)
+L_10128e0:
+// 0x010128e0: 0x10128e0: lw    a1, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3352,7 +3352,7 @@ L_10128d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010128d4: 0x10128d4: lw    a0, 36(sp)
+// 0x010128e4: 0x10128e4: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3361,25 +3361,25 @@ L_10128d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010128d8: 0x10128d8: addiu v0, sp, 44
+// 0x010128e8: 0x10128e8: addiu v0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 5
-// 0x010128dc: 0x10128dc: addiu v1, sp, 36
+// 0x010128ec: 0x10128ec: addiu v1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 7
-// 0x010128e0: 0x10128e0: addiu a2, zero, 1
+// 0x010128f0: 0x10128f0: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010128e4: 0x10128e4: addiu a3, sp, 76
+// 0x010128f4: 0x10128f4: addiu a3, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 4
-// 0x010128e8: 0x10128e8: sw    v0, 16(sp)
+// 0x010128f8: 0x10128f8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3388,7 +3388,7 @@ L_10128d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010128ec: 0x10128ec: jal   0x10124d4 sw    v1, 20(sp)
+// 0x010128fc: 0x10128fc: jal   0x10124e4 sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3402,30 +3402,30 @@ L_10128d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::T_147_10124d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::T_147_10124e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010128f4: 0x10128f4: bne   v0, zero, 0x1012934 sll   zero, zero, 0
+// 0x01012904: 0x1012904: bne   v0, zero, 0x1012944 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1012934
+	brtrue L_1012944
 // --- basic block ---
-// 0x010128fc: 0x10128fc: beq   s1, zero, 0x1012a00 andi  v0, s5, 4
+// 0x0101290c: 0x101290c: beq   s1, zero, 0x1012a10 andi  v0, s5, 4
 	ldloc 10
 	ldloc 12
 	ldc.i4.4
 	and
 	stloc 5
-	brfalse L_1012a00
+	brfalse L_1012a10
 // --- basic block ---
-// 0x01012904: 0x1012904: beq   v0, zero, 0x1012a04 addiu s3, zero, 1
+// 0x01012914: 0x1012914: beq   v0, zero, 0x1012a14 addiu s3, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 9
-	brfalse L_1012a04
+	brfalse L_1012a14
 // --- basic block ---
-// 0x0101290c: 0x101290c: lw    v1, 36(sp)
+// 0x0101291c: 0x101291c: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3434,25 +3434,25 @@ L_10128d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012910: 0x1012910: addiu v0, zero, -1
+// 0x01012920: 0x1012920: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01012914: 0x1012914: bne   v1, v0, 0x1012a08 addiu a0, sp, 32
+// 0x01012924: 0x1012924: bne   v1, v0, 0x1012a18 addiu a0, sp, 32
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-	bne.un L_1012a08
+	bne.un L_1012a18
 // --- basic block ---
-// 0x0101291c: 0x101291c: addu  a0, s7, zero
+// 0x0101292c: 0x101292c: addu  a0, s7, zero
 	ldloc 13
 	stloc.1
-// 0x01012920: 0x1012920: addu  a1, s6, zero
+// 0x01012930: 0x1012930: addu  a1, s6, zero
 	ldloc 16
 	stloc.2
-// 0x01012924: 0x1012924: jalr  s1 addiu a2, zero, 4
+// 0x01012934: 0x1012934: jalr  s1 addiu a2, zero, 4
 	ldloc 10
 	ldc.i4.4
 	stloc.3
@@ -3466,20 +3466,20 @@ L_10128d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101292c: 0x101292c: j	 0x1012a04 addiu s3, zero, 1
+// 0x0101293c: 0x101293c: j	 0x1012a14 addiu s3, zero, 1
 	ldc.i4.1
 	stloc 9
-	br L_1012a04
+	br L_1012a14
 // --- basic block ---
-L_1012934:
-// 0x01012934: 0x1012934: lw    v0, 0(s0)
+L_1012944:
+// 0x01012944: 0x1012944: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01012938: 0x1012938: lw    v1, 32(sp)
+// 0x01012948: 0x1012948: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3488,17 +3488,17 @@ L_1012934:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101293c: 0x101293c: sll   zero, zero, 0
-// 0x01012940: 0x1012940: bne   v0, v1, 0x101298c sll   zero, zero, 0
+// 0x0101294c: 0x101294c: sll   zero, zero, 0
+// 0x01012950: 0x1012950: bne   v0, v1, 0x101299c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_101298c
+	bne.un L_101299c
 // --- basic block ---
-// 0x01012948: 0x1012948: bne   v0, zero, 0x1012964 sll   zero, zero, 0
+// 0x01012958: 0x1012958: bne   v0, zero, 0x1012974 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1012964
+	brtrue L_1012974
 // --- basic block ---
-// 0x01012950: 0x1012950: lw    v1, 12(s0)
+// 0x01012960: 0x1012960: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3507,7 +3507,7 @@ L_1012934:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012954: 0x1012954: lw    v0, 44(sp)
+// 0x01012964: 0x1012964: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3516,14 +3516,14 @@ L_1012934:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012958: 0x1012958: sll   zero, zero, 0
-// 0x0101295c: 0x101295c: bne   v1, v0, 0x101298c sll   zero, zero, 0
+// 0x01012968: 0x1012968: sll   zero, zero, 0
+// 0x0101296c: 0x101296c: bne   v1, v0, 0x101299c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_101298c
+	bne.un L_101299c
 // --- basic block ---
-L_1012964:
-// 0x01012964: 0x1012964: lw    v1, 4(s0)
+L_1012974:
+// 0x01012974: 0x1012974: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3532,7 +3532,7 @@ L_1012964:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012968: 0x1012968: lw    v0, 36(sp)
+// 0x01012978: 0x1012978: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3541,13 +3541,13 @@ L_1012964:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101296c: 0x101296c: sll   zero, zero, 0
-// 0x01012970: 0x1012970: bne   v1, v0, 0x101298c sll   zero, zero, 0
+// 0x0101297c: 0x101297c: sll   zero, zero, 0
+// 0x01012980: 0x1012980: bne   v1, v0, 0x101299c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_101298c
+	bne.un L_101299c
 // --- basic block ---
-// 0x01012978: 0x1012978: lw    v1, 16(s0)
+// 0x01012988: 0x1012988: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3556,7 +3556,7 @@ L_1012964:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101297c: 0x101297c: lw    v0, 48(sp)
+// 0x0101298c: 0x101298c: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3565,25 +3565,25 @@ L_1012964:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012980: 0x1012980: sll   zero, zero, 0
-// 0x01012984: 0x1012984: beq   v1, v0, 0x1012c24 sll   zero, zero, 0
+// 0x01012990: 0x1012990: sll   zero, zero, 0
+// 0x01012994: 0x1012994: beq   v1, v0, 0x1012c34 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_1012c24
+	beq  L_1012c34
 // --- basic block ---
-L_101298c:
-// 0x0101298c: 0x101298c: beq   s8, zero, 0x10129a0 addiu s2, s2, 1
+L_101299c:
+// 0x0101299c: 0x101299c: beq   s8, zero, 0x10129b0 addiu s2, s2, 1
 	ldloc 14
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brfalse L_10129a0
+	brfalse L_10129b0
 // --- basic block ---
-// 0x01012994: 0x1012994: addu  a0, s7, zero
+// 0x010129a4: 0x10129a4: addu  a0, s7, zero
 	ldloc 13
 	stloc.1
-// 0x01012998: 0x1012998: jal   0x1014dd8 addu  a1, s8, zero
+// 0x010129a8: 0x10129a8: jal   0x1014de8 addu  a1, s8, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -3591,22 +3591,22 @@ L_101298c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10129a0:
-// 0x010129a0: 0x10129a0: beq   s1, zero, 0x10129bc addu  a0, s7, zero
+L_10129b0:
+// 0x010129b0: 0x10129b0: beq   s1, zero, 0x10129cc addu  a0, s7, zero
 	ldloc 10
 	ldloc 13
 	stloc.1
-	brfalse L_10129bc
+	brfalse L_10129cc
 // --- basic block ---
-// 0x010129a8: 0x10129a8: addu  a1, s6, zero
+// 0x010129b8: 0x10129b8: addu  a1, s6, zero
 	ldloc 16
 	stloc.2
-// 0x010129ac: 0x10129ac: jalr  s1 addiu a2, zero, 1
+// 0x010129bc: 0x10129bc: jalr  s1 addiu a2, zero, 1
 	ldloc 10
 	ldc.i4.1
 	stloc.3
@@ -3620,17 +3620,17 @@ L_10129a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010129b4: 0x10129b4: bne   v0, zero, 0x1012a04 addiu s3, zero, 1
+// 0x010129c4: 0x10129c4: bne   v0, zero, 0x1012a14 addiu s3, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 9
-	brtrue L_1012a04
+	brtrue L_1012a14
 // --- basic block ---
-L_10129bc:
-// 0x010129bc: 0x10129bc: lui   v1, 0x0
+L_10129cc:
+// 0x010129cc: 0x10129cc: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010129c0: 0x10129c0: lw    a0, 44(sp)
+// 0x010129d0: 0x10129d0: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3639,7 +3639,7 @@ L_10129bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010129c4: 0x10129c4: lw    v0, 576(v1)
+// 0x010129d4: 0x10129d4: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3648,32 +3648,32 @@ L_10129bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010129c8: 0x10129c8: sll   zero, zero, 0
-// 0x010129cc: 0x10129cc: beq   a0, v0, 0x10129e4 addiu s3, zero, 1
+// 0x010129d8: 0x10129d8: sll   zero, zero, 0
+// 0x010129dc: 0x10129dc: beq   a0, v0, 0x10129f4 addiu s3, zero, 1
 	ldloc.1
 	ldloc 5
 	ldc.i4.1
 	stloc 9
-	beq  L_10129e4
+	beq  L_10129f4
 // --- basic block ---
-// 0x010129d4: 0x10129d4: bltz  a0, 0x10129e4 sll   zero, zero, 0
+// 0x010129e4: 0x10129e4: bltz  a0, 0x10129f4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10129e4
+	blt L_10129f4
 // --- basic block ---
-// 0x010129dc: 0x10129dc: jal   0x100b164 sll   zero, zero, 0
+// 0x010129ec: 0x10129ec: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10129e4:
-// 0x010129e4: 0x10129e4: lw    a0, 36(sp)
+L_10129f4:
+// 0x010129f4: 0x10129f4: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3682,40 +3682,40 @@ L_10129e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010129e8: 0x10129e8: jal   0x1003a84 sll   zero, zero, 0
+// 0x010129f8: 0x10129f8: jal   0x1003a84 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl2::roadmap_line_from_is_fake_1003a84(int32)
 	stloc 5
 // --- basic block ---
-// 0x010129f0: 0x10129f0: bne   v0, zero, 0x1012870 addiu a0, sp, 32
+// 0x01012a00: 0x1012a00: bne   v0, zero, 0x1012880 addiu a0, sp, 32
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-	brtrue L_1012870
+	brtrue L_1012880
 // --- basic block ---
-// 0x010129f8: 0x10129f8: j	 0x1012a0c addu  a1, s0, zero
+// 0x01012a08: 0x1012a08: j	 0x1012a1c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-	br L_1012a0c
+	br L_1012a1c
 // --- basic block ---
-L_1012a00:
-// 0x01012a00: 0x1012a00: addiu s3, zero, 1
+L_1012a10:
+// 0x01012a10: 0x1012a10: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 9
-L_1012a04:
-// 0x01012a04: 0x1012a04: addiu a0, sp, 32
+L_1012a14:
+// 0x01012a14: 0x1012a14: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-L_1012a08:
-// 0x01012a08: 0x1012a08: addu  a1, s0, zero
+L_1012a18:
+// 0x01012a18: 0x1012a18: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-L_1012a0c:
-// 0x01012a0c: 0x1012a0c: jal   0x1001800 addiu a2, zero, 20
+L_1012a1c:
+// 0x01012a1c: 0x1012a1c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -3727,10 +3727,10 @@ L_1012a0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012a14: 0x1012a14: lui   v0, 0x0
+// 0x01012a24: 0x1012a24: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01012a18: 0x1012a18: lw    v0, 576(v0)
+// 0x01012a28: 0x1012a28: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3739,7 +3739,7 @@ L_1012a0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012a1c: 0x1012a1c: lw    a0, 44(sp)
+// 0x01012a2c: 0x1012a2c: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3748,56 +3748,56 @@ L_1012a0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012a20: 0x1012a20: sll   zero, zero, 0
-// 0x01012a24: 0x1012a24: beq   a0, v0, 0x1012a40 andi  v0, s5, 2
+// 0x01012a30: 0x1012a30: sll   zero, zero, 0
+// 0x01012a34: 0x1012a34: beq   a0, v0, 0x1012a50 andi  v0, s5, 2
 	ldloc.1
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	and
 	stloc 5
-	beq  L_1012a40
+	beq  L_1012a50
 // --- basic block ---
-// 0x01012a2c: 0x1012a2c: bltz  a0, 0x1012a40 sll   zero, zero, 0
+// 0x01012a3c: 0x1012a3c: bltz  a0, 0x1012a50 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1012a40
+	blt L_1012a50
 // --- basic block ---
-// 0x01012a34: 0x1012a34: jal   0x100b164 sll   zero, zero, 0
+// 0x01012a44: 0x1012a44: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1012a3c:
-// 0x01012a3c: 0x1012a3c: andi  v0, s5, 2
+L_1012a4c:
+// 0x01012a4c: 0x1012a4c: andi  v0, s5, 2
 	ldloc 12
 	ldc.i4.2
 	and
 	stloc 5
-L_1012a40:
-// 0x01012a40: 0x1012a40: bne   v0, zero, 0x1012c0c lui   s8, 0x0
+L_1012a50:
+// 0x01012a50: 0x1012a50: bne   v0, zero, 0x1012c1c lui   s8, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 14
-	brtrue L_1012c0c
+	brtrue L_1012c1c
 // --- basic block ---
-// 0x01012a48: 0x1012a48: j	 0x1012c24 sll   zero, zero, 0
-	br L_1012c24
+// 0x01012a58: 0x1012a58: j	 0x1012c34 sll   zero, zero, 0
+	br L_1012c34
 // --- basic block ---
-L_1012a50:
-// 0x01012a50: 0x1012a50: bne   s3, zero, 0x1012ab8 lui   a0, 0x20000
+L_1012a60:
+// 0x01012a60: 0x1012a60: bne   s3, zero, 0x1012ac8 lui   a0, 0x20000
 	ldloc 9
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1012ab8
+	brtrue L_1012ac8
 // --- basic block ---
-// 0x01012a58: 0x1012a58: lw    a0, 44(sp)
+// 0x01012a68: 0x1012a68: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3806,7 +3806,7 @@ L_1012a50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012a5c: 0x1012a5c: lw    v0, 576(s8)
+// 0x01012a6c: 0x1012a6c: lw    v0, 576(s8)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -3815,30 +3815,30 @@ L_1012a50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012a60: 0x1012a60: sll   zero, zero, 0
-// 0x01012a64: 0x1012a64: beq   a0, v0, 0x1012a7c sll   zero, zero, 0
+// 0x01012a70: 0x1012a70: sll   zero, zero, 0
+// 0x01012a74: 0x1012a74: beq   a0, v0, 0x1012a8c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1012a7c
+	beq  L_1012a8c
 // --- basic block ---
-// 0x01012a6c: 0x1012a6c: bltz  a0, 0x1012a7c sll   zero, zero, 0
+// 0x01012a7c: 0x1012a7c: bltz  a0, 0x1012a8c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1012a7c
+	blt L_1012a8c
 // --- basic block ---
-// 0x01012a74: 0x1012a74: jal   0x100b164 sll   zero, zero, 0
+// 0x01012a84: 0x1012a84: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1012a7c:
-// 0x01012a7c: 0x1012a7c: lw    a0, 36(sp)
+L_1012a8c:
+// 0x01012a8c: 0x1012a8c: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3847,7 +3847,7 @@ L_1012a7c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012a80: 0x1012a80: jal   0x1011a4c addiu a1, sp, 52
+// 0x01012a90: 0x1012a90: jal   0x1011a5c addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -3857,12 +3857,12 @@ L_1012a7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012a88: 0x1012a88: jal   0x1011920 addiu a0, sp, 52
+// 0x01012a98: 0x1012a98: jal   0x1011930 addiu a0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -3872,20 +3872,20 @@ L_1012a7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_full_name_1011920(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_full_name_1011930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012a90: 0x1012a90: addu  a1, v0, zero
+// 0x01012aa0: 0x1012aa0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01012a94: 0x1012a94: addiu a0, sp, 76
+// 0x01012aa4: 0x1012aa4: addiu a0, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.1
-// 0x01012a98: 0x1012a98: jal   0x1001af8 addiu a2, zero, 512
+// 0x01012aa8: 0x1012aa8: jal   0x1001af8 addiu a2, zero, 512
 	ldc.i4 512
 	stloc.3
 	ldloc.1
@@ -3894,7 +3894,7 @@ L_1012a7c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01012aa0: 0x1012aa0: lw    a0, 36(sp)
+// 0x01012ab0: 0x1012ab0: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3903,30 +3903,30 @@ L_1012a7c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012aa4: 0x1012aa4: addiu a1, zero, 3
+// 0x01012ab4: 0x1012ab4: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01012aa8: 0x1012aa8: sb    zero, 587(sp)
+// 0x01012ab8: 0x1012ab8: sb    zero, 587(sp)
 	ldloc.0
 	ldc.i4 587
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01012aac: 0x1012aac: jal   0x1004a70 addiu s3, zero, 1
+// 0x01012abc: 0x1012abc: jal   0x1004a80 addiu s3, zero, 1
 	ldc.i4.1
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012ab4: 0x1012ab4: lui   a0, 0x20000
+// 0x01012ac4: 0x1012ac4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_1012ab8:
-// 0x01012ab8: 0x1012ab8: lw    v0, 36(sp)
+L_1012ac8:
+// 0x01012ac8: 0x1012ac8: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3935,71 +3935,71 @@ L_1012ab8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012abc: 0x1012abc: lw    v1, 31152(a0)
+// 0x01012acc: 0x1012acc: lw    v1, 31616(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012ac0: 0x1012ac0: sll   v0, v0, 3
+// 0x01012ad0: 0x1012ad0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01012ac4: 0x1012ac4: addu  v0, v1, v0
+// 0x01012ad4: 0x1012ad4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01012ac8: 0x1012ac8: lhu   v0, 2(v0)
+// 0x01012ad8: 0x1012ad8: lhu   v0, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01012acc: 0x1012acc: lui   a0, 0x20000
+// 0x01012adc: 0x1012adc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01012ad0: 0x1012ad0: lw    v1, 31228(a0)
+// 0x01012ae0: 0x1012ae0: lw    v1, 31692(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012ad4: 0x1012ad4: andi  v0, v0, 32767
+// 0x01012ae4: 0x1012ae4: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01012ad8: 0x1012ad8: sll   v0, v0, 3
+// 0x01012ae8: 0x1012ae8: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01012adc: 0x1012adc: addu  v0, v1, v0
+// 0x01012aec: 0x1012aec: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01012ae0: 0x1012ae0: lw    v1, 0(v0)
+// 0x01012af0: 0x1012af0: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01012ae4: 0x1012ae4: addiu a0, sp, 24
+// 0x01012af4: 0x1012af4: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x01012ae8: 0x1012ae8: sw    v1, 24(sp)
+// 0x01012af8: 0x1012af8: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4008,7 +4008,7 @@ L_1012ab8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012aec: 0x1012aec: lw    v0, 4(v0)
+// 0x01012afc: 0x1012afc: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4017,7 +4017,7 @@ L_1012ab8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012af0: 0x1012af0: jal   0x100aee4 sw    v0, 28(sp)
+// 0x01012b00: 0x1012b00: jal   0x100aef4 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4031,12 +4031,12 @@ L_1012ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_cross_pos_100aee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_cross_pos_100aef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012af8: 0x1012af8: lw    a1, 592(sp)
+// 0x01012b08: 0x1012b08: lw    a1, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4045,7 +4045,7 @@ L_1012ab8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01012afc: 0x1012afc: lw    a0, 36(sp)
+// 0x01012b0c: 0x1012b0c: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4054,25 +4054,25 @@ L_1012ab8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012b00: 0x1012b00: addiu v0, sp, 44
+// 0x01012b10: 0x1012b10: addiu v0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 5
-// 0x01012b04: 0x1012b04: addiu v1, sp, 36
+// 0x01012b14: 0x1012b14: addiu v1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 7
-// 0x01012b08: 0x1012b08: addu  a2, zero, zero
+// 0x01012b18: 0x1012b18: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01012b0c: 0x1012b0c: addiu a3, sp, 76
+// 0x01012b1c: 0x1012b1c: addiu a3, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 4
-// 0x01012b10: 0x1012b10: sw    v0, 16(sp)
+// 0x01012b20: 0x1012b20: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4081,7 +4081,7 @@ L_1012ab8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01012b14: 0x1012b14: jal   0x10124d4 sw    v1, 20(sp)
+// 0x01012b24: 0x1012b24: jal   0x10124e4 sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4095,30 +4095,30 @@ L_1012ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::T_147_10124d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::T_147_10124e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012b1c: 0x1012b1c: bne   v0, zero, 0x1012b58 sll   zero, zero, 0
+// 0x01012b2c: 0x1012b2c: bne   v0, zero, 0x1012b68 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1012b58
+	brtrue L_1012b68
 // --- basic block ---
-// 0x01012b24: 0x1012b24: beq   s1, zero, 0x1012c24 andi  s5, s5, 4
+// 0x01012b34: 0x1012b34: beq   s1, zero, 0x1012c34 andi  s5, s5, 4
 	ldloc 10
 	ldloc 12
 	ldc.i4.4
 	and
 	stloc 12
-	brfalse L_1012c24
+	brfalse L_1012c34
 // --- basic block ---
-// 0x01012b2c: 0x1012b2c: beq   s5, zero, 0x1012c24 addiu v0, zero, -1
+// 0x01012b3c: 0x1012b3c: beq   s5, zero, 0x1012c34 addiu v0, zero, -1
 	ldloc 12
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1012c24
+	brfalse L_1012c34
 // --- basic block ---
-// 0x01012b34: 0x1012b34: lw    v1, 36(sp)
+// 0x01012b44: 0x1012b44: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4127,18 +4127,18 @@ L_1012ab8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012b38: 0x1012b38: sll   zero, zero, 0
-// 0x01012b3c: 0x1012b3c: bne   v1, v0, 0x1012c24 addu  a0, s7, zero
+// 0x01012b48: 0x1012b48: sll   zero, zero, 0
+// 0x01012b4c: 0x1012b4c: bne   v1, v0, 0x1012c34 addu  a0, s7, zero
 	ldloc 7
 	ldloc 5
 	ldloc 13
 	stloc.1
-	bne.un L_1012c24
+	bne.un L_1012c34
 // --- basic block ---
-// 0x01012b44: 0x1012b44: addu  a1, s6, zero
+// 0x01012b54: 0x1012b54: addu  a1, s6, zero
 	ldloc 16
 	stloc.2
-// 0x01012b48: 0x1012b48: jalr  s1 addiu a2, zero, 4
+// 0x01012b58: 0x1012b58: jalr  s1 addiu a2, zero, 4
 	ldloc 10
 	ldc.i4.4
 	stloc.3
@@ -4152,18 +4152,18 @@ L_1012ab8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012b50: 0x1012b50: j	 0x1012c24 sll   zero, zero, 0
-	br L_1012c24
+// 0x01012b60: 0x1012b60: j	 0x1012c34 sll   zero, zero, 0
+	br L_1012c34
 // --- basic block ---
-L_1012b58:
-// 0x01012b58: 0x1012b58: lw    v0, 0(s0)
+L_1012b68:
+// 0x01012b68: 0x1012b68: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01012b5c: 0x1012b5c: lw    v1, 32(sp)
+// 0x01012b6c: 0x1012b6c: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4172,17 +4172,17 @@ L_1012b58:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012b60: 0x1012b60: sll   zero, zero, 0
-// 0x01012b64: 0x1012b64: bne   v0, v1, 0x1012bb0 sll   zero, zero, 0
+// 0x01012b70: 0x1012b70: sll   zero, zero, 0
+// 0x01012b74: 0x1012b74: bne   v0, v1, 0x1012bc0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1012bb0
+	bne.un L_1012bc0
 // --- basic block ---
-// 0x01012b6c: 0x1012b6c: bne   v0, zero, 0x1012b88 sll   zero, zero, 0
+// 0x01012b7c: 0x1012b7c: bne   v0, zero, 0x1012b98 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1012b88
+	brtrue L_1012b98
 // --- basic block ---
-// 0x01012b74: 0x1012b74: lw    v1, 12(s0)
+// 0x01012b84: 0x1012b84: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4191,7 +4191,7 @@ L_1012b58:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012b78: 0x1012b78: lw    v0, 44(sp)
+// 0x01012b88: 0x1012b88: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4200,14 +4200,14 @@ L_1012b58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012b7c: 0x1012b7c: sll   zero, zero, 0
-// 0x01012b80: 0x1012b80: bne   v1, v0, 0x1012bb0 sll   zero, zero, 0
+// 0x01012b8c: 0x1012b8c: sll   zero, zero, 0
+// 0x01012b90: 0x1012b90: bne   v1, v0, 0x1012bc0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1012bb0
+	bne.un L_1012bc0
 // --- basic block ---
-L_1012b88:
-// 0x01012b88: 0x1012b88: lw    v1, 4(s0)
+L_1012b98:
+// 0x01012b98: 0x1012b98: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ L_1012b88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012b8c: 0x1012b8c: lw    v0, 36(sp)
+// 0x01012b9c: 0x1012b9c: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4225,13 +4225,13 @@ L_1012b88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012b90: 0x1012b90: sll   zero, zero, 0
-// 0x01012b94: 0x1012b94: bne   v1, v0, 0x1012bb0 sll   zero, zero, 0
+// 0x01012ba0: 0x1012ba0: sll   zero, zero, 0
+// 0x01012ba4: 0x1012ba4: bne   v1, v0, 0x1012bc0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1012bb0
+	bne.un L_1012bc0
 // --- basic block ---
-// 0x01012b9c: 0x1012b9c: lw    v1, 16(s0)
+// 0x01012bac: 0x1012bac: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4240,7 +4240,7 @@ L_1012b88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012ba0: 0x1012ba0: lw    v0, 48(sp)
+// 0x01012bb0: 0x1012bb0: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4249,25 +4249,25 @@ L_1012b88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012ba4: 0x1012ba4: sll   zero, zero, 0
-// 0x01012ba8: 0x1012ba8: beq   v1, v0, 0x1012c24 sll   zero, zero, 0
+// 0x01012bb4: 0x1012bb4: sll   zero, zero, 0
+// 0x01012bb8: 0x1012bb8: beq   v1, v0, 0x1012c34 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_1012c24
+	beq  L_1012c34
 // --- basic block ---
-L_1012bb0:
-// 0x01012bb0: 0x1012bb0: beq   s4, zero, 0x1012bc4 addiu s2, s2, 1
+L_1012bc0:
+// 0x01012bc0: 0x1012bc0: beq   s4, zero, 0x1012bd4 addiu s2, s2, 1
 	ldloc 15
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brfalse L_1012bc4
+	brfalse L_1012bd4
 // --- basic block ---
-// 0x01012bb8: 0x1012bb8: addu  a0, s7, zero
+// 0x01012bc8: 0x1012bc8: addu  a0, s7, zero
 	ldloc 13
 	stloc.1
-// 0x01012bbc: 0x1012bbc: jal   0x1014ccc addu  a1, s4, zero
+// 0x01012bcc: 0x1012bcc: jal   0x1014cdc addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -4275,22 +4275,22 @@ L_1012bb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1012bc4:
-// 0x01012bc4: 0x1012bc4: beq   s1, zero, 0x1012be0 addu  a0, s7, zero
+L_1012bd4:
+// 0x01012bd4: 0x1012bd4: beq   s1, zero, 0x1012bf0 addu  a0, s7, zero
 	ldloc 10
 	ldloc 13
 	stloc.1
-	brfalse L_1012be0
+	brfalse L_1012bf0
 // --- basic block ---
-// 0x01012bcc: 0x1012bcc: addu  a1, s6, zero
+// 0x01012bdc: 0x1012bdc: addu  a1, s6, zero
 	ldloc 16
 	stloc.2
-// 0x01012bd0: 0x1012bd0: jalr  s1 addiu a2, zero, 2
+// 0x01012be0: 0x1012be0: jalr  s1 addiu a2, zero, 2
 	ldloc 10
 	ldc.i4.2
 	stloc.3
@@ -4304,12 +4304,12 @@ L_1012bc4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012bd8: 0x1012bd8: bne   v0, zero, 0x1012c24 sll   zero, zero, 0
+// 0x01012be8: 0x1012be8: bne   v0, zero, 0x1012c34 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1012c24
+	brtrue L_1012c34
 // --- basic block ---
-L_1012be0:
-// 0x01012be0: 0x1012be0: lw    a0, 44(sp)
+L_1012bf0:
+// 0x01012bf0: 0x1012bf0: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4318,7 +4318,7 @@ L_1012be0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012be4: 0x1012be4: lw    v0, 576(s8)
+// 0x01012bf4: 0x1012bf4: lw    v0, 576(s8)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -4327,39 +4327,39 @@ L_1012be0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01012be8: 0x1012be8: sll   zero, zero, 0
-// 0x01012bec: 0x1012bec: beq   a0, v0, 0x1012c10 sll   zero, zero, 0
+// 0x01012bf8: 0x1012bf8: sll   zero, zero, 0
+// 0x01012bfc: 0x1012bfc: beq   a0, v0, 0x1012c20 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1012c10
+	beq  L_1012c20
 // --- basic block ---
-// 0x01012bf4: 0x1012bf4: bltz  a0, 0x1012c10 sll   zero, zero, 0
+// 0x01012c04: 0x1012c04: bltz  a0, 0x1012c20 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1012c10
+	blt L_1012c20
 // --- basic block ---
-// 0x01012bfc: 0x1012bfc: jal   0x100b164 sll   zero, zero, 0
+// 0x01012c0c: 0x1012c0c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01012c04: 0x1012c04: j	 0x1012c10 sll   zero, zero, 0
-	br L_1012c10
+// 0x01012c14: 0x1012c14: j	 0x1012c20 sll   zero, zero, 0
+	br L_1012c20
 // --- basic block ---
-L_1012c0c:
-// 0x01012c0c: 0x1012c0c: addiu s7, sp, 32
+L_1012c1c:
+// 0x01012c1c: 0x1012c1c: addiu s7, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 13
-L_1012c10:
-// 0x01012c10: 0x1012c10: lw    a0, 36(sp)
+L_1012c20:
+// 0x01012c20: 0x1012c20: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4368,21 +4368,21 @@ L_1012c10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012c14: 0x1012c14: jal   0x1003aa0 sll   zero, zero, 0
+// 0x01012c24: 0x1012c24: jal   0x1003aa0 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl2::roadmap_line_to_is_fake_1003aa0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01012c1c: 0x1012c1c: bne   v0, zero, 0x1012a50 sll   zero, zero, 0
+// 0x01012c2c: 0x1012c2c: bne   v0, zero, 0x1012a60 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1012a50
+	brtrue L_1012a60
 // --- basic block ---
-L_1012c24:
-// 0x01012c24: 0x1012c24: lw    ra, 636(sp)
-// 0x01012c28: 0x1012c28: addu  v0, s2, zero
+L_1012c34:
+// 0x01012c34: 0x1012c34: lw    ra, 636(sp)
+// 0x01012c38: 0x1012c38: addu  v0, s2, zero
 	ldloc 11
 	stloc 5
-// 0x01012c2c: 0x1012c2c: lw    s8, 632(sp)
+// 0x01012c3c: 0x1012c3c: lw    s8, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4391,7 +4391,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01012c30: 0x1012c30: lw    s7, 628(sp)
+// 0x01012c40: 0x1012c40: lw    s7, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4400,7 +4400,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01012c34: 0x1012c34: lw    s6, 624(sp)
+// 0x01012c44: 0x1012c44: lw    s6, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4409,7 +4409,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01012c38: 0x1012c38: lw    s5, 620(sp)
+// 0x01012c48: 0x1012c48: lw    s5, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4418,7 +4418,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01012c3c: 0x1012c3c: lw    s4, 616(sp)
+// 0x01012c4c: 0x1012c4c: lw    s4, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4427,7 +4427,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01012c40: 0x1012c40: lw    s3, 612(sp)
+// 0x01012c50: 0x1012c50: lw    s3, 612(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4436,7 +4436,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01012c44: 0x1012c44: lw    s2, 608(sp)
+// 0x01012c54: 0x1012c54: lw    s2, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4445,7 +4445,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01012c48: 0x1012c48: lw    s1, 604(sp)
+// 0x01012c58: 0x1012c58: lw    s1, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4454,7 +4454,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01012c4c: 0x1012c4c: lw    s0, 600(sp)
+// 0x01012c5c: 0x1012c5c: lw    s0, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4463,7 +4463,7 @@ L_1012c24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012c50: 0x1012c50: jr    ra addiu sp, sp, 640
+// 0x01012c60: 0x1012c60: jr    ra addiu sp, sp, 640
 	ldloc.0
 	ldc.i4 640
 	add
@@ -4475,7 +4475,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_line_has_predecessor_1012c58(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_line_has_predecessor_1012c68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -4510,22 +4510,22 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01012c58: 0x1012c58: addiu sp, sp, -32
+// 0x01012c68: 0x1012c68: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01012c5c: 0x1012c5c: addu  a1, zero, zero
+// 0x01012c6c: 0x1012c6c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01012c60: 0x1012c60: addu  a2, zero, zero
+// 0x01012c70: 0x1012c70: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01012c64: 0x1012c64: addiu a3, zero, 1
+// 0x01012c74: 0x1012c74: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01012c68: 0x1012c68: sw    ra, 28(sp)
-// 0x01012c6c: 0x1012c6c: sw    zero, 16(sp)
+// 0x01012c78: 0x1012c78: sw    ra, 28(sp)
+// 0x01012c7c: 0x1012c7c: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4534,7 +4534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01012c70: 0x1012c70: jal   0x1012790 sw    zero, 20(sp)
+// 0x01012c80: 0x1012c80: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4548,14 +4548,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01012c78: 0x1012c78: lw    ra, 28(sp)
-// 0x01012c7c: 0x1012c7c: sll   zero, zero, 0
-// 0x01012c80: 0x1012c80: jr    ra addiu sp, sp, 32
+// 0x01012c88: 0x1012c88: lw    ra, 28(sp)
+// 0x01012c8c: 0x1012c8c: sll   zero, zero, 0
+// 0x01012c90: 0x1012c90: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4567,7 +4567,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_street_get_distance_no_shape_1012c88(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_distance_no_shape_1012c98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s3,int32 s1,int32 s4,int32 s5,int32 ra,int32 t0)
@@ -4623,41 +4623,41 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01012c88: 0x1012c88: lui   v0, 0x20000
+// 0x01012c98: 0x1012c98: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01012c8c: 0x1012c8c: lw    v1, 31152(v0)
+// 0x01012c9c: 0x1012c9c: lw    v1, 31616(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012c90: 0x1012c90: sll   v0, a1, 3
+// 0x01012ca0: 0x1012ca0: sll   v0, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x01012c94: 0x1012c94: addu  v0, v1, v0
+// 0x01012ca4: 0x1012ca4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x01012c98: 0x1012c98: lw    v1, 0(v0)
+// 0x01012ca8: 0x1012ca8: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01012c9c: 0x1012c9c: addiu sp, sp, -48
+// 0x01012cac: 0x1012cac: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01012ca0: 0x1012ca0: sw    s1, 24(sp)
+// 0x01012cb0: 0x1012cb0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4666,54 +4666,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01012ca4: 0x1012ca4: lui   v0, 0x20000
+// 0x01012cb4: 0x1012cb4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01012ca8: 0x1012ca8: addu  s1, a1, zero
+// 0x01012cb8: 0x1012cb8: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01012cac: 0x1012cac: sra   a1, v1, 16
+// 0x01012cbc: 0x1012cbc: sra   a1, v1, 16
 	ldloc 7
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x01012cb0: 0x1012cb0: lw    v0, 31228(v0)
+// 0x01012cc0: 0x1012cc0: lw    v0, 31692(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012cb4: 0x1012cb4: andi  a1, a1, 32767
+// 0x01012cc4: 0x1012cc4: andi  a1, a1, 32767
 	ldloc.2
 	ldc.i4 32767
 	and
 	stloc.2
-// 0x01012cb8: 0x1012cb8: sll   a1, a1, 3
+// 0x01012cc8: 0x1012cc8: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x01012cbc: 0x1012cbc: addu  a1, v0, a1
+// 0x01012ccc: 0x1012ccc: addu  a1, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc.2
-// 0x01012cc0: 0x1012cc0: lw    t0, 0(a1)
+// 0x01012cd0: 0x1012cd0: lw    t0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x01012cc4: 0x1012cc4: andi  v1, v1, 32767
+// 0x01012cd4: 0x1012cd4: andi  v1, v1, 32767
 	ldloc 7
 	ldc.i4 32767
 	and
 	stloc 7
-// 0x01012cc8: 0x1012cc8: sw    t0, 24(a3)
+// 0x01012cd8: 0x1012cd8: sw    t0, 24(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -4722,7 +4722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01012ccc: 0x1012ccc: lw    a1, 4(a1)
+// 0x01012cdc: 0x1012cdc: lw    a1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4731,12 +4731,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01012cd0: 0x1012cd0: sll   v1, v1, 3
+// 0x01012ce0: 0x1012ce0: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x01012cd4: 0x1012cd4: sw    a1, 28(a3)
+// 0x01012ce4: 0x1012ce4: sw    a1, 28(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -4745,19 +4745,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01012cd8: 0x1012cd8: addu  v0, v0, v1
+// 0x01012ce8: 0x1012ce8: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x01012cdc: 0x1012cdc: lw    v1, 0(v0)
+// 0x01012cec: 0x1012cec: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01012ce0: 0x1012ce0: sw    s3, 32(sp)
+// 0x01012cf0: 0x1012cf0: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4766,7 +4766,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01012ce4: 0x1012ce4: sw    v1, 32(a3)
+// 0x01012cf4: 0x1012cf4: sw    v1, 32(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -4775,7 +4775,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012ce8: 0x1012ce8: lw    v0, 4(v0)
+// 0x01012cf8: 0x1012cf8: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4784,7 +4784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012cec: 0x1012cec: sw    s2, 28(sp)
+// 0x01012cfc: 0x1012cfc: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4793,17 +4793,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01012cf0: 0x1012cf0: addiu s3, a3, 32
+// 0x01012d00: 0x1012d00: addiu s3, a3, 32
 	ldloc 4
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x01012cf4: 0x1012cf4: addiu s2, a3, 24
+// 0x01012d04: 0x1012d04: addiu s2, a3, 24
 	ldloc 4
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x01012cf8: 0x1012cf8: sw    s5, 40(sp)
+// 0x01012d08: 0x1012d08: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4812,7 +4812,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01012cfc: 0x1012cfc: sw    s4, 36(sp)
+// 0x01012d0c: 0x1012d0c: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4821,7 +4821,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01012d00: 0x1012d00: sw    s0, 20(sp)
+// 0x01012d10: 0x1012d10: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4830,7 +4830,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01012d04: 0x1012d04: sw    v0, 36(a3)
+// 0x01012d14: 0x1012d14: sw    v0, 36(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -4839,26 +4839,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01012d08: 0x1012d08: addu  s0, a3, zero
+// 0x01012d18: 0x1012d18: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x01012d0c: 0x1012d0c: addu  s5, a0, zero
+// 0x01012d1c: 0x1012d1c: addu  s5, a0, zero
 	ldloc.1
 	stloc 13
-// 0x01012d10: 0x1012d10: addu  s4, a2, zero
+// 0x01012d20: 0x1012d20: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01012d14: 0x1012d14: addu  a0, s2, zero
+// 0x01012d24: 0x1012d24: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01012d18: 0x1012d18: addu  a1, s3, zero
+// 0x01012d28: 0x1012d28: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x01012d1c: 0x1012d1c: addu  a2, zero, zero
+// 0x01012d2c: 0x1012d2c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01012d20: 0x1012d20: sw    ra, 44(sp)
-// 0x01012d24: 0x1012d24: jal   0x1008f78 addu  a3, zero, zero
+// 0x01012d30: 0x1012d30: sw    ra, 44(sp)
+// 0x01012d34: 0x1012d34: jal   0x1008f88 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4866,48 +4866,48 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012d2c: 0x1012d2c: beq   v0, zero, 0x1012d84 addu  v1, zero, zero
+// 0x01012d3c: 0x1012d3c: beq   v0, zero, 0x1012d94 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1012d84
+	brfalse L_1012d94
 // --- basic block ---
-// 0x01012d34: 0x1012d34: addiu v1, s0, 40
+// 0x01012d44: 0x1012d44: addiu v1, s0, 40
 	ldloc 8
 	ldc.i4.s 40
 	add
 	stloc 7
-// 0x01012d38: 0x1012d38: addu  a0, zero, zero
+// 0x01012d48: 0x1012d48: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01012d3c: 0x1012d3c: cibyl_sysc_arg 0x15
+// 0x01012d4c: 0x1012d4c: cibyl_sysc_arg 0x15
 	ldloc 13
-// 0x01012d40: 0x1012d40: cibyl_sysc_arg 0x12
+// 0x01012d50: 0x1012d50: cibyl_sysc_arg 0x12
 	ldloc 9
-// 0x01012d44: 0x1012d44: cibyl_sysc_arg 0x13
+// 0x01012d54: 0x1012d54: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x01012d48: 0x1012d48: cibyl_sysc_arg 0x3
+// 0x01012d58: 0x1012d58: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01012d4c: 0x1012d4c: cibyl_sysc_arg 0x4
+// 0x01012d5c: 0x1012d5c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01012d50: 0x1012d50: cibyl_sysc 0x298
+// 0x01012d60: 0x1012d60: cibyl_sysc 0x298
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 6
-// 0x01012d54: 0x1012d54: addu  s2, v0, zero
+// 0x01012d64: 0x1012d64: addu  s2, v0, zero
 	ldloc 6
 	stloc 9
-// 0x01012d58: 0x1012d58: lui   v0, 0x0
+// 0x01012d68: 0x1012d68: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01012d5c: 0x1012d5c: lui   v1, 0x0
+// 0x01012d6c: 0x1012d6c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01012d60: 0x1012d60: lw    v1, 1816(v1)
+// 0x01012d70: 0x1012d70: lw    v1, 1816(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4916,7 +4916,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012d64: 0x1012d64: lw    v0, 576(v0)
+// 0x01012d74: 0x1012d74: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4925,7 +4925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012d68: 0x1012d68: sw    v1, 16(s0)
+// 0x01012d78: 0x1012d78: sw    v1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4934,7 +4934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012d6c: 0x1012d6c: sw    s2, 20(s0)
+// 0x01012d7c: 0x1012d7c: sw    s2, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4943,7 +4943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01012d70: 0x1012d70: sw    s1, 4(s0)
+// 0x01012d80: 0x1012d80: sw    s1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4952,7 +4952,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01012d74: 0x1012d74: sw    s4, 8(s0)
+// 0x01012d84: 0x1012d84: sw    s4, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4961,7 +4961,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01012d78: 0x1012d78: sw    v0, 12(s0)
+// 0x01012d88: 0x1012d88: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4970,22 +4970,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01012d7c: 0x1012d7c: sw    zero, 0(s0)
+// 0x01012d8c: 0x1012d8c: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01012d80: 0x1012d80: addiu v1, zero, 1
+// 0x01012d90: 0x1012d90: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1012d84:
-// 0x01012d84: 0x1012d84: lw    ra, 44(sp)
-// 0x01012d88: 0x1012d88: addu  v0, v1, zero
+L_1012d94:
+// 0x01012d94: 0x1012d94: lw    ra, 44(sp)
+// 0x01012d98: 0x1012d98: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x01012d8c: 0x1012d8c: lw    s5, 40(sp)
+// 0x01012d9c: 0x1012d9c: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4994,7 +4994,7 @@ L_1012d84:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01012d90: 0x1012d90: lw    s4, 36(sp)
+// 0x01012da0: 0x1012da0: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5003,7 +5003,7 @@ L_1012d84:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01012d94: 0x1012d94: lw    s3, 32(sp)
+// 0x01012da4: 0x1012da4: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5012,7 +5012,7 @@ L_1012d84:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01012d98: 0x1012d98: lw    s2, 28(sp)
+// 0x01012da8: 0x1012da8: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5021,7 +5021,7 @@ L_1012d84:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01012d9c: 0x1012d9c: lw    s1, 24(sp)
+// 0x01012dac: 0x1012dac: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5030,7 +5030,7 @@ L_1012d84:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01012da0: 0x1012da0: lw    s0, 20(sp)
+// 0x01012db0: 0x1012db0: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5039,7 +5039,7 @@ L_1012d84:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012da4: 0x1012da4: jr    ra addiu sp, sp, 48
+// 0x01012db4: 0x1012db4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5051,7 +5051,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_street_get_distance_with_shape_1012dac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_distance_with_shape_1012dbc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s1,int32 s2,int32 s0,int32 s4,int32 s5,int32 s3,int32 s6,int32 s7,int32 s8,int32 lo,int32 ra,int32 t1,int32 t2)
@@ -5125,24 +5125,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01012dac: 0x1012dac: lui   v0, 0x20000
+// 0x01012dbc: 0x1012dbc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01012db0: 0x1012db0: addiu sp, sp, -112
+// 0x01012dc0: 0x1012dc0: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x01012db4: 0x1012db4: lw    v0, 31152(v0)
+// 0x01012dc4: 0x1012dc4: lw    v0, 31616(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012db8: 0x1012db8: sw    s5, 92(sp)
+// 0x01012dc8: 0x1012dc8: sw    s5, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5151,27 +5151,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01012dbc: 0x1012dbc: sll   s5, a1, 3
+// 0x01012dcc: 0x1012dcc: sll   s5, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc 13
-// 0x01012dc0: 0x1012dc0: addu  v0, v0, s5
+// 0x01012dd0: 0x1012dd0: addu  v0, v0, s5
 	ldloc 6
 	ldloc 13
 	add
 	stloc 6
-// 0x01012dc4: 0x1012dc4: lhu   v1, 0(v0)
+// 0x01012dd4: 0x1012dd4: lhu   v1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01012dc8: 0x1012dc8: lui   t0, 0x0
+// 0x01012dd8: 0x1012dd8: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01012dcc: 0x1012dcc: lui   v0, 0x0
+// 0x01012ddc: 0x1012ddc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01012dd0: 0x1012dd0: lw    t1, 1816(t0)
+// 0x01012de0: 0x1012de0: lw    t1, 1816(t0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5180,10 +5180,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01012dd4: 0x1012dd4: lui   t0, 0x20000
+// 0x01012de4: 0x1012de4: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01012dd8: 0x1012dd8: lw    t2, 576(v0)
+// 0x01012de8: 0x1012de8: lw    t2, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5192,26 +5192,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 21
-// 0x01012ddc: 0x1012ddc: andi  v1, v1, 32767
+// 0x01012dec: 0x1012dec: andi  v1, v1, 32767
 	ldloc 7
 	ldc.i4 32767
 	and
 	stloc 7
-// 0x01012de0: 0x1012de0: lw    t0, 31228(t0)
+// 0x01012df0: 0x1012df0: lw    t0, 31692(t0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012de4: 0x1012de4: sll   v1, v1, 3
+// 0x01012df4: 0x1012df4: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x01012de8: 0x1012de8: sw    a2, 24(sp)
+// 0x01012df8: 0x1012df8: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5220,7 +5220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01012dec: 0x1012dec: sw    t2, 28(sp)
+// 0x01012dfc: 0x1012dfc: sw    t2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5229,7 +5229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01012df0: 0x1012df0: sw    t1, 32(sp)
+// 0x01012e00: 0x1012e00: sw    t1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5238,12 +5238,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x01012df4: 0x1012df4: addu  v1, t0, v1
+// 0x01012e04: 0x1012e04: addu  v1, t0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x01012df8: 0x1012df8: sw    zero, 16(sp)
+// 0x01012e08: 0x1012e08: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5252,7 +5252,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01012dfc: 0x1012dfc: sw    a1, 20(sp)
+// 0x01012e0c: 0x1012e0c: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5261,19 +5261,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01012e00: 0x1012e00: lw    a1, 0(v1)
+// 0x01012e10: 0x1012e10: lw    a1, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01012e04: 0x1012e04: addiu v0, sp, 56
+// 0x01012e14: 0x1012e14: addiu v0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 6
-// 0x01012e08: 0x1012e08: sw    a1, 40(sp)
+// 0x01012e18: 0x1012e18: sw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5282,7 +5282,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01012e0c: 0x1012e0c: lw    v1, 4(v1)
+// 0x01012e1c: 0x1012e1c: lw    v1, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012e10: 0x1012e10: sw    s8, 104(sp)
+// 0x01012e20: 0x1012e20: sw    s8, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5300,7 +5300,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01012e14: 0x1012e14: sw    s7, 100(sp)
+// 0x01012e24: 0x1012e24: sw    s7, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5309,7 +5309,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01012e18: 0x1012e18: sw    s6, 96(sp)
+// 0x01012e28: 0x1012e28: sw    s6, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5318,7 +5318,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01012e1c: 0x1012e1c: sw    s4, 88(sp)
+// 0x01012e2c: 0x1012e2c: sw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5327,7 +5327,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01012e20: 0x1012e20: sw    s3, 84(sp)
+// 0x01012e30: 0x1012e30: sw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5336,7 +5336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01012e24: 0x1012e24: sw    s2, 80(sp)
+// 0x01012e34: 0x1012e34: sw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5345,7 +5345,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01012e28: 0x1012e28: sw    s1, 76(sp)
+// 0x01012e38: 0x1012e38: sw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5354,7 +5354,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01012e2c: 0x1012e2c: sw    s0, 72(sp)
+// 0x01012e3c: 0x1012e3c: sw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5363,8 +5363,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01012e30: 0x1012e30: sw    ra, 108(sp)
-// 0x01012e34: 0x1012e34: sw    a1, 48(sp)
+// 0x01012e40: 0x1012e40: sw    ra, 108(sp)
+// 0x01012e44: 0x1012e44: sw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5373,7 +5373,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01012e38: 0x1012e38: sw    v1, 52(sp)
+// 0x01012e48: 0x1012e48: sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5382,10 +5382,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012e3c: 0x1012e3c: addu  s4, a0, zero
+// 0x01012e4c: 0x1012e4c: addu  s4, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01012e40: 0x1012e40: sw    v1, 44(sp)
+// 0x01012e50: 0x1012e50: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5394,10 +5394,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012e44: 0x1012e44: addu  s2, a3, zero
+// 0x01012e54: 0x1012e54: addu  s2, a3, zero
 	ldloc 4
 	stloc 10
-// 0x01012e48: 0x1012e48: lw    s3, 132(sp)
+// 0x01012e58: 0x1012e58: lw    s3, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5406,28 +5406,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01012e4c: 0x1012e4c: sll   s1, a3, 2
+// 0x01012e5c: 0x1012e5c: sll   s1, a3, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x01012e50: 0x1012e50: addu  s0, zero, zero
+// 0x01012e60: 0x1012e60: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01012e54: 0x1012e54: lui   s8, 0x0
+// 0x01012e64: 0x1012e64: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 17
-// 0x01012e58: 0x1012e58: addiu s7, sp, 40
+// 0x01012e68: 0x1012e68: addiu s7, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 16
-// 0x01012e5c: 0x1012e5c: addiu s6, sp, 48
+// 0x01012e6c: 0x1012e6c: addiu s6, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 15
-// 0x01012e60: 0x1012e60: j	 0x1012f4c sw    v0, 64(sp)
+// 0x01012e70: 0x1012e70: j	 0x1012f5c sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5436,13 +5436,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1012f4c
+	br L_1012f5c
 // --- basic block ---
-L_1012e68:
-// 0x01012e68: 0x1012e68: lui   a0, 0x0
+L_1012e78:
+// 0x01012e78: 0x1012e78: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01012e6c: 0x1012e6c: lw    v0, 576(v1)
+// 0x01012e7c: 0x1012e7c: lw    v0, 576(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5451,7 +5451,7 @@ L_1012e68:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012e70: 0x1012e70: lw    v1, 548(a0)
+// 0x01012e80: 0x1012e80: lw    v1, 548(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5460,13 +5460,13 @@ L_1012e68:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012e74: 0x1012e74: sll   zero, zero, 0
-// 0x01012e78: 0x1012e78: beq   v0, v1, 0x1012e8c sll   zero, zero, 0
+// 0x01012e84: 0x1012e84: sll   zero, zero, 0
+// 0x01012e88: 0x1012e88: beq   v0, v1, 0x1012e9c sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	beq  L_1012e8c
+	beq  L_1012e9c
 // --- basic block ---
-// 0x01012e80: 0x1012e80: jal   0x100ae78 sw    v0, 548(a0)
+// 0x01012e90: 0x1012e90: jal   0x100ae88 sw    v0, 548(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5480,12 +5480,12 @@ L_1012e68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012e88: 0x1012e88: sw    v0, 552(s8)
+// 0x01012e98: 0x1012e98: sw    v0, 552(s8)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
@@ -5494,20 +5494,20 @@ L_1012e68:
 	add
 	ldloc 6
 	stelem.i4
-L_1012e8c:
-// 0x01012e8c: 0x1012e8c: lui   v0, 0x20000
+L_1012e9c:
+// 0x01012e9c: 0x1012e9c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01012e90: 0x1012e90: lw    a0, 31240(v0)
+// 0x01012ea0: 0x1012ea0: lw    a0, 31704(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012e94: 0x1012e94: lw    v0, 552(s8)
+// 0x01012ea4: 0x1012ea4: lw    v0, 552(s8)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
@@ -5516,49 +5516,49 @@ L_1012e8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012e98: 0x1012e98: addu  a0, a0, s1
+// 0x01012ea8: 0x1012ea8: addu  a0, a0, s1
 	ldloc.1
 	ldloc 9
 	add
 	stloc.1
-// 0x01012e9c: 0x1012e9c: lh    v1, 2(a0)
+// 0x01012eac: 0x1012eac: lh    v1, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01012ea0: 0x1012ea0: lh    t0, 0(a0)
+// 0x01012eb0: 0x1012eb0: lh    t0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 8
-// 0x01012ea4: 0x1012ea4: mult  v1, v0
+// 0x01012eb4: 0x1012eb4: mult  v1, v0
 	ldloc 7
 	ldloc 6
 	mul
 	stloc 18
-// 0x01012ea8: 0x1012ea8: addu  a0, s7, zero
+// 0x01012eb8: 0x1012eb8: addu  a0, s7, zero
 	ldloc 16
 	stloc.1
-// 0x01012eac: 0x1012eac: addu  a1, s6, zero
+// 0x01012ebc: 0x1012ebc: addu  a1, s6, zero
 	ldloc 15
 	stloc.2
-// 0x01012eb0: 0x1012eb0: addu  a2, zero, zero
+// 0x01012ec0: 0x1012ec0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01012eb4: 0x1012eb4: addu  a3, zero, zero
+// 0x01012ec4: 0x1012ec4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01012eb8: 0x1012eb8: mflo  lo
+// 0x01012ec8: 0x1012ec8: mflo  lo
 	ldloc 18
 	stloc 7
-// 0x01012ebc: 0x1012ebc: sll   zero, zero, 0
-// 0x01012ec0: 0x1012ec0: sll   zero, zero, 0
-// 0x01012ec4: 0x1012ec4: mult  t0, v0
+// 0x01012ecc: 0x1012ecc: sll   zero, zero, 0
+// 0x01012ed0: 0x1012ed0: sll   zero, zero, 0
+// 0x01012ed4: 0x1012ed4: mult  t0, v0
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 18
-// 0x01012ec8: 0x1012ec8: lw    t0, 52(sp)
+// 0x01012ed8: 0x1012ed8: lw    t0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5567,13 +5567,13 @@ L_1012e8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012ecc: 0x1012ecc: sll   zero, zero, 0
-// 0x01012ed0: 0x1012ed0: addu  v1, t0, v1
+// 0x01012edc: 0x1012edc: sll   zero, zero, 0
+// 0x01012ee0: 0x1012ee0: addu  v1, t0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x01012ed4: 0x1012ed4: lw    t0, 48(sp)
+// 0x01012ee4: 0x1012ee4: lw    t0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5582,7 +5582,7 @@ L_1012e8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01012ed8: 0x1012ed8: sw    v1, 52(sp)
+// 0x01012ee8: 0x1012ee8: sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5591,15 +5591,15 @@ L_1012e8c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012edc: 0x1012edc: mflo  lo
+// 0x01012eec: 0x1012eec: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x01012ee0: 0x1012ee0: addu  v0, t0, v0
+// 0x01012ef0: 0x1012ef0: addu  v0, t0, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-// 0x01012ee4: 0x1012ee4: jal   0x1008f78 sw    v0, 48(sp)
+// 0x01012ef4: 0x1012ef4: jal   0x1008f88 sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5613,18 +5613,18 @@ L_1012e8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012eec: 0x1012eec: beq   v0, zero, 0x1012f34 addu  v1, zero, zero
+// 0x01012efc: 0x1012efc: beq   v0, zero, 0x1012f44 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1012f34
+	brfalse L_1012f44
 // --- basic block ---
-// 0x01012ef4: 0x1012ef4: lw    a0, 64(sp)
+// 0x01012f04: 0x1012f04: lw    a0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5633,24 +5633,24 @@ L_1012e8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01012ef8: 0x1012ef8: sll   zero, zero, 0
-// 0x01012efc: 0x1012efc: cibyl_sysc_arg 0x14
+// 0x01012f08: 0x1012f08: sll   zero, zero, 0
+// 0x01012f0c: 0x1012f0c: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x01012f00: 0x1012f00: cibyl_sysc_arg 0x17
+// 0x01012f10: 0x1012f10: cibyl_sysc_arg 0x17
 	ldloc 16
-// 0x01012f04: 0x1012f04: cibyl_sysc_arg 0x16
+// 0x01012f14: 0x1012f14: cibyl_sysc_arg 0x16
 	ldloc 15
-// 0x01012f08: 0x1012f08: cibyl_sysc_arg 0x4
+// 0x01012f18: 0x1012f18: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01012f0c: 0x1012f0c: cibyl_sysc_arg 0x3
+// 0x01012f1c: 0x1012f1c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01012f10: 0x1012f10: cibyl_sysc 0x2b5
+// 0x01012f20: 0x1012f20: cibyl_sysc 0x2b5
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 6
-// 0x01012f14: 0x1012f14: addu  v1, v0, zero
+// 0x01012f24: 0x1012f24: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x01012f18: 0x1012f18: lw    a2, 136(sp)
+// 0x01012f28: 0x1012f28: lw    a2, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5659,18 +5659,18 @@ L_1012e8c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01012f1c: 0x1012f1c: addu  a1, s0, zero
+// 0x01012f2c: 0x1012f2c: addu  a1, s0, zero
 	ldloc 11
 	stloc.2
-// 0x01012f20: 0x1012f20: addu  a0, s3, zero
+// 0x01012f30: 0x1012f30: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x01012f24: 0x1012f24: addiu a3, sp, 16
+// 0x01012f34: 0x1012f34: addiu a3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 4
-// 0x01012f28: 0x1012f28: jal   0x1011b20 sw    v1, 36(sp)
+// 0x01012f38: 0x1012f38: jal   0x1011b30 sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5684,16 +5684,16 @@ L_1012e8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012f30: 0x1012f30: addu  s0, v0, zero
+// 0x01012f40: 0x1012f40: addu  s0, v0, zero
 	ldloc 6
 	stloc 11
-L_1012f34:
-// 0x01012f34: 0x1012f34: lw    v0, 48(sp)
+L_1012f44:
+// 0x01012f44: 0x1012f44: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5702,12 +5702,12 @@ L_1012f34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012f38: 0x1012f38: addiu s2, s2, 1
+// 0x01012f48: 0x1012f48: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01012f3c: 0x1012f3c: sw    v0, 40(sp)
+// 0x01012f4c: 0x1012f4c: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5716,7 +5716,7 @@ L_1012f34:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01012f40: 0x1012f40: lw    v0, 52(sp)
+// 0x01012f50: 0x1012f50: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5725,12 +5725,12 @@ L_1012f34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012f44: 0x1012f44: addiu s1, s1, 4
+// 0x01012f54: 0x1012f54: addiu s1, s1, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-// 0x01012f48: 0x1012f48: sw    v0, 44(sp)
+// 0x01012f58: 0x1012f58: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5739,8 +5739,8 @@ L_1012f34:
 	add
 	ldloc 6
 	stelem.i4
-L_1012f4c:
-// 0x01012f4c: 0x1012f4c: lw    v1, 128(sp)
+L_1012f5c:
+// 0x01012f5c: 0x1012f5c: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5749,81 +5749,81 @@ L_1012f4c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012f50: 0x1012f50: sll   zero, zero, 0
-// 0x01012f54: 0x1012f54: slt   v0, v1, s2
+// 0x01012f60: 0x1012f60: sll   zero, zero, 0
+// 0x01012f64: 0x1012f64: slt   v0, v1, s2
 	ldloc 7
 	ldloc 10
 	clt
 	stloc 6
-// 0x01012f58: 0x1012f58: beq   v0, zero, 0x1012e68 lui   v1, 0x0
+// 0x01012f68: 0x1012f68: beq   v0, zero, 0x1012e78 lui   v1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1012e68
+	brfalse L_1012e78
 // --- basic block ---
-// 0x01012f60: 0x1012f60: lui   v0, 0x20000
+// 0x01012f70: 0x1012f70: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01012f64: 0x1012f64: lw    v0, 31152(v0)
+// 0x01012f74: 0x1012f74: lw    v0, 31616(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012f68: 0x1012f68: lui   v1, 0x20000
+// 0x01012f78: 0x1012f78: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01012f6c: 0x1012f6c: addu  s5, v0, s5
+// 0x01012f7c: 0x1012f7c: addu  s5, v0, s5
 	ldloc 6
 	ldloc 13
 	add
 	stloc 13
-// 0x01012f70: 0x1012f70: lhu   v0, 2(s5)
+// 0x01012f80: 0x1012f80: lhu   v0, 2(s5)
 	ldloc 13
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01012f74: 0x1012f74: lw    v1, 31228(v1)
+// 0x01012f84: 0x1012f84: lw    v1, 31692(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01012f78: 0x1012f78: andi  v0, v0, 32767
+// 0x01012f88: 0x1012f88: andi  v0, v0, 32767
 	ldloc 6
 	ldc.i4 32767
 	and
 	stloc 6
-// 0x01012f7c: 0x1012f7c: sll   v0, v0, 3
+// 0x01012f8c: 0x1012f8c: sll   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x01012f80: 0x1012f80: addu  v0, v1, v0
+// 0x01012f90: 0x1012f90: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x01012f84: 0x1012f84: lw    v1, 0(v0)
+// 0x01012f94: 0x1012f94: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01012f88: 0x1012f88: addiu s2, sp, 40
+// 0x01012f98: 0x1012f98: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 10
-// 0x01012f8c: 0x1012f8c: sw    v1, 48(sp)
+// 0x01012f9c: 0x1012f9c: sw    v1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5832,7 +5832,7 @@ L_1012f4c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01012f90: 0x1012f90: lw    v0, 4(v0)
+// 0x01012fa0: 0x1012fa0: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5841,24 +5841,24 @@ L_1012f4c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01012f94: 0x1012f94: addiu s1, sp, 48
+// 0x01012fa4: 0x1012fa4: addiu s1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 9
-// 0x01012f98: 0x1012f98: addu  a0, s2, zero
+// 0x01012fa8: 0x1012fa8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01012f9c: 0x1012f9c: addu  a1, s1, zero
+// 0x01012fac: 0x1012fac: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01012fa0: 0x1012fa0: addu  a2, zero, zero
+// 0x01012fb0: 0x1012fb0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01012fa4: 0x1012fa4: addu  a3, zero, zero
+// 0x01012fb4: 0x1012fb4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01012fa8: 0x1012fa8: jal   0x1008f78 sw    v0, 52(sp)
+// 0x01012fb8: 0x1012fb8: jal   0x1008f88 sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5872,39 +5872,39 @@ L_1012f4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012fb0: 0x1012fb0: beq   v0, zero, 0x1012ff4 addu  a0, zero, zero
+// 0x01012fc0: 0x1012fc0: beq   v0, zero, 0x1013004 addu  a0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1012ff4
+	brfalse L_1013004
 // --- basic block ---
-// 0x01012fb8: 0x1012fb8: addiu v1, sp, 56
+// 0x01012fc8: 0x1012fc8: addiu v1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 7
-// 0x01012fbc: 0x1012fbc: cibyl_sysc_arg 0x14
+// 0x01012fcc: 0x1012fcc: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x01012fc0: 0x1012fc0: cibyl_sysc_arg 0x11
+// 0x01012fd0: 0x1012fd0: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01012fc4: 0x1012fc4: cibyl_sysc_arg 0x12
+// 0x01012fd4: 0x1012fd4: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x01012fc8: 0x1012fc8: cibyl_sysc_arg 0x3
+// 0x01012fd8: 0x1012fd8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01012fcc: 0x1012fcc: cibyl_sysc_arg 0x4
+// 0x01012fdc: 0x1012fdc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01012fd0: 0x1012fd0: cibyl_sysc 0x2d2
+// 0x01012fe0: 0x1012fe0: cibyl_sysc 0x2d2
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 6
-// 0x01012fd4: 0x1012fd4: addu  s4, v0, zero
+// 0x01012fe4: 0x1012fe4: addu  s4, v0, zero
 	ldloc 6
 	stloc 12
-// 0x01012fd8: 0x1012fd8: lw    a2, 136(sp)
+// 0x01012fe8: 0x1012fe8: lw    a2, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5913,18 +5913,18 @@ L_1012f4c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01012fdc: 0x1012fdc: addu  a1, s0, zero
+// 0x01012fec: 0x1012fec: addu  a1, s0, zero
 	ldloc 11
 	stloc.2
-// 0x01012fe0: 0x1012fe0: addu  a0, s3, zero
+// 0x01012ff0: 0x1012ff0: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x01012fe4: 0x1012fe4: addiu a3, sp, 16
+// 0x01012ff4: 0x1012ff4: addiu a3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 4
-// 0x01012fe8: 0x1012fe8: jal   0x1011b20 sw    s4, 36(sp)
+// 0x01012ff8: 0x1012ff8: jal   0x1011b30 sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5938,20 +5938,20 @@ L_1012f4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01012ff0: 0x1012ff0: addu  s0, v0, zero
+// 0x01013000: 0x1013000: addu  s0, v0, zero
 	ldloc 6
 	stloc 11
-L_1012ff4:
-// 0x01012ff4: 0x1012ff4: lw    ra, 108(sp)
-// 0x01012ff8: 0x1012ff8: addu  v0, s0, zero
+L_1013004:
+// 0x01013004: 0x1013004: lw    ra, 108(sp)
+// 0x01013008: 0x1013008: addu  v0, s0, zero
 	ldloc 11
 	stloc 6
-// 0x01012ffc: 0x1012ffc: lw    s8, 104(sp)
+// 0x0101300c: 0x101300c: lw    s8, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5960,7 +5960,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01013000: 0x1013000: lw    s7, 100(sp)
+// 0x01013010: 0x1013010: lw    s7, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5969,7 +5969,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01013004: 0x1013004: lw    s6, 96(sp)
+// 0x01013014: 0x1013014: lw    s6, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5978,7 +5978,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01013008: 0x1013008: lw    s5, 92(sp)
+// 0x01013018: 0x1013018: lw    s5, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5987,7 +5987,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101300c: 0x101300c: lw    s4, 88(sp)
+// 0x0101301c: 0x101301c: lw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5996,7 +5996,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01013010: 0x1013010: lw    s3, 84(sp)
+// 0x01013020: 0x1013020: lw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6005,7 +6005,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01013014: 0x1013014: lw    s2, 80(sp)
+// 0x01013024: 0x1013024: lw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6014,7 +6014,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01013018: 0x1013018: lw    s1, 76(sp)
+// 0x01013028: 0x1013028: lw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6023,7 +6023,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101301c: 0x101301c: lw    s0, 72(sp)
+// 0x0101302c: 0x101302c: lw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6032,7 +6032,7 @@ L_1012ff4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01013020: 0x1013020: jr    ra addiu sp, sp, 112
+// 0x01013030: 0x1013030: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -6044,7 +6044,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s6,int32 s1,int32 s0,int32 s2,int32 s8,int32 s4,int32 t0,int32 s5,int32 s7,int32 t1,int32 ra)
@@ -6112,24 +6112,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013028: 0x1013028: lui   v0, 0x30000
+// 0x01013038: 0x1013038: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101302c: 0x101302c: lw    v0, -30624(v0)
+// 0x0101303c: 0x101303c: lw    v0, -30160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013030: 0x1013030: addiu sp, sp, -304
+// 0x01013040: 0x1013040: addiu sp, sp, -304
 	ldloc.0
 	ldc.i4 -304
 	add
 	stloc.0
-// 0x01013034: 0x1013034: sw    s4, 280(sp)
+// 0x01013044: 0x1013044: sw    s4, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6138,7 +6138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01013038: 0x1013038: sw    s0, 264(sp)
+// 0x01013048: 0x1013048: sw    s0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6147,8 +6147,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101303c: 0x101303c: sw    ra, 300(sp)
-// 0x01013040: 0x1013040: sw    s8, 296(sp)
+// 0x0101304c: 0x101304c: sw    ra, 300(sp)
+// 0x01013050: 0x1013050: sw    s8, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6157,7 +6157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01013044: 0x1013044: sw    s7, 292(sp)
+// 0x01013054: 0x1013054: sw    s7, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6166,7 +6166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01013048: 0x1013048: sw    s6, 288(sp)
+// 0x01013058: 0x1013058: sw    s6, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6175,7 +6175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101304c: 0x101304c: sw    s5, 284(sp)
+// 0x0101305c: 0x101305c: sw    s5, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6184,7 +6184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01013050: 0x1013050: sw    s3, 276(sp)
+// 0x01013060: 0x1013060: sw    s3, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6193,7 +6193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01013054: 0x1013054: sw    s2, 272(sp)
+// 0x01013064: 0x1013064: sw    s2, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6202,7 +6202,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01013058: 0x1013058: sw    s1, 268(sp)
+// 0x01013068: 0x1013068: sw    s1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6211,7 +6211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101305c: 0x101305c: sw    a1, 308(sp)
+// 0x0101306c: 0x101306c: sw    a1, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6220,7 +6220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01013060: 0x1013060: sw    a2, 312(sp)
+// 0x01013070: 0x1013070: sw    a2, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6229,7 +6229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01013064: 0x1013064: sw    a3, 316(sp)
+// 0x01013074: 0x1013074: sw    a3, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6238,21 +6238,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01013068: 0x1013068: addu  s4, a0, zero
+// 0x01013078: 0x1013078: addu  s4, a0, zero
 	ldloc.1
 	stloc 14
-// 0x0101306c: 0x101306c: beq   v0, zero, 0x101335c addu  s0, zero, zero
+// 0x0101307c: 0x101307c: beq   v0, zero, 0x101336c addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	brfalse L_101335c
+	brfalse L_101336c
 // --- basic block ---
-// 0x01013074: 0x1013074: lui   a1, 0x30000
+// 0x01013084: 0x1013084: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01013078: 0x1013078: jal   0x1013cec addiu a1, a1, -29052
+// 0x01013088: 0x1013088: jal   0x1013cfc addiu a1, a1, -28588
 	ldloc.2
-	ldc.i4 -29052
+	ldc.i4 -28588
 	add
 	stloc.2
 	ldloc.0
@@ -6260,22 +6260,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_by_position_1013cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_by_position_1013cfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013080: 0x1013080: addiu s3, v0, -1
+// 0x01013090: 0x1013090: addiu s3, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01013084: 0x1013084: sll   v0, s3, 2
+// 0x01013094: 0x1013094: sll   v0, s3, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01013088: 0x1013088: sw    v0, 216(sp)
+// 0x01013098: 0x1013098: sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6284,24 +6284,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101308c: 0x101308c: j	 0x1013354 addiu s2, sp, 68
+// 0x0101309c: 0x101309c: j	 0x1013364 addiu s2, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 12
-	br L_1013354
+	br L_1013364
 // --- basic block ---
-L_1013094:
-// 0x01013094: 0x1013094: lw    v0, -29052(v0)
+L_10130a4:
+// 0x010130a4: 0x10130a4: lw    v0, -28588(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7263
+	ldc.i4 -7147
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013098: 0x1013098: lw    v1, 216(sp)
+// 0x010130a8: 0x10130a8: lw    v1, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6310,39 +6310,39 @@ L_1013094:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101309c: 0x101309c: sll   zero, zero, 0
-// 0x010130a0: 0x10130a0: addu  v0, v0, v1
+// 0x010130ac: 0x10130ac: sll   zero, zero, 0
+// 0x010130b0: 0x10130b0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010130a4: 0x10130a4: lw    a0, 0(v0)
+// 0x010130b4: 0x10130b4: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010130a8: 0x10130a8: jal   0x1013c44 sll   zero, zero, 0
+// 0x010130b8: 0x10130b8: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010130b0: 0x10130b0: bne   v0, zero, 0x1013344 addiu s1, sp, 32
+// 0x010130c0: 0x10130c0: bne   v0, zero, 0x1013354 addiu s1, sp, 32
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-	brtrue L_1013344
+	brtrue L_1013354
 // --- basic block ---
-// 0x010130b8: 0x10130b8: lw    a1, 308(sp)
+// 0x010130c8: 0x10130c8: lw    a1, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6351,10 +6351,10 @@ L_1013094:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010130bc: 0x10130bc: addu  a0, s4, zero
+// 0x010130cc: 0x10130cc: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x010130c0: 0x10130c0: jal   0x100b848 addu  a2, s1, zero
+// 0x010130d0: 0x10130d0: jal   0x100b858 addu  a2, s1, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -6362,12 +6362,12 @@ L_1013094:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_find_neighbours_100b848(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_find_neighbours_100b858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010130c8: 0x10130c8: lw    a0, 320(sp)
+// 0x010130d8: 0x10130d8: lw    a0, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6376,7 +6376,7 @@ L_1013094:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010130cc: 0x10130cc: sw    v0, 240(sp)
+// 0x010130dc: 0x10130dc: sw    v0, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6385,12 +6385,12 @@ L_1013094:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010130d0: 0x10130d0: slti  a0, a0, 4
+// 0x010130e0: 0x10130e0: slti  a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	clt
 	stloc.1
-// 0x010130d4: 0x10130d4: sw    s1, 220(sp)
+// 0x010130e4: 0x10130e4: sw    s1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6399,7 +6399,7 @@ L_1013094:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010130d8: 0x10130d8: sw    zero, 224(sp)
+// 0x010130e8: 0x10130e8: sw    zero, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6408,7 +6408,7 @@ L_1013094:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010130dc: 0x10130dc: sw    a0, 244(sp)
+// 0x010130ec: 0x10130ec: sw    a0, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6417,7 +6417,7 @@ L_1013094:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010130e0: 0x10130e0: j	 0x101331c sw    s3, 248(sp)
+// 0x010130f0: 0x10130f0: j	 0x101332c sw    s3, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6426,10 +6426,10 @@ L_1013094:
 	add
 	ldloc 8
 	stelem.i4
-	br L_101331c
+	br L_101332c
 // --- basic block ---
-L_10130e8:
-// 0x010130e8: 0x10130e8: lw    v0, 220(sp)
+L_10130f8:
+// 0x010130f8: 0x10130f8: lw    v0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6438,7 +6438,7 @@ L_10130e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010130ec: 0x10130ec: lw    v1, 320(sp)
+// 0x010130fc: 0x10130fc: lw    v1, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6447,7 +6447,7 @@ L_10130e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010130f0: 0x10130f0: lw    a0, 244(sp)
+// 0x01013100: 0x1013100: lw    a0, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6456,21 +6456,21 @@ L_10130e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010130f4: 0x10130f4: lw    s6, 0(v0)
+// 0x01013104: 0x1013104: lw    s6, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010130f8: 0x10130f8: lw    s1, 0(s5)
+// 0x01013108: 0x1013108: lw    s1, 0(s5)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010130fc: 0x10130fc: bne   a0, zero, 0x101310c sw    v1, 232(sp)
+// 0x0101310c: 0x101310c: bne   a0, zero, 0x101311c sw    v1, 232(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -6480,12 +6480,12 @@ L_10130e8:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_101310c
+	brtrue L_101311c
 // --- basic block ---
-// 0x01013104: 0x1013104: addiu v0, zero, 3
+// 0x01013114: 0x1013114: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01013108: 0x1013108: sw    v0, 232(sp)
+// 0x01013118: 0x1013118: sw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6494,11 +6494,11 @@ L_10130e8:
 	add
 	ldloc 5
 	stelem.i4
-L_101310c:
-// 0x0101310c: 0x101310c: lui   v1, 0x0
+L_101311c:
+// 0x0101311c: 0x101311c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01013110: 0x1013110: lw    v1, 1816(v1)
+// 0x01013120: 0x1013120: lw    v1, 1816(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6507,7 +6507,7 @@ L_101310c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013114: 0x1013114: bltz  s6, 0x10132dc sw    v1, 236(sp)
+// 0x01013124: 0x1013124: bltz  s6, 0x10132ec sw    v1, 236(sp)
 	ldloc 9
 	ldloc 6
 	ldloc.0
@@ -6518,12 +6518,12 @@ L_101310c:
 	ldloc 7
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10132dc
+	blt L_10132ec
 // --- basic block ---
-// 0x0101311c: 0x101311c: lui   a0, 0x0
+// 0x0101312c: 0x101312c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01013120: 0x1013120: lw    v0, 576(a0)
+// 0x01013130: 0x1013130: lw    v0, 576(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6532,15 +6532,15 @@ L_101310c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013124: 0x1013124: sll   zero, zero, 0
-// 0x01013128: 0x1013128: beq   s6, v0, 0x101313c lui   v1, 0x20000
+// 0x01013134: 0x1013134: sll   zero, zero, 0
+// 0x01013138: 0x1013138: beq   s6, v0, 0x101314c lui   v1, 0x20000
 	ldloc 9
 	ldloc 5
 	ldc.i4 131072
 	stloc 7
-	beq  L_101313c
+	beq  L_101314c
 // --- basic block ---
-// 0x01013130: 0x1013130: jal   0x100b164 addu  a0, s6, zero
+// 0x01013140: 0x1013140: jal   0x100b174 addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6548,34 +6548,34 @@ L_101310c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013138: 0x1013138: lui   v1, 0x20000
+// 0x01013148: 0x1013148: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-L_101313c:
-// 0x0101313c: 0x101313c: lw    v0, 31148(v1)
+L_101314c:
+// 0x0101314c: 0x101314c: lw    v0, 31612(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013140: 0x1013140: sll   zero, zero, 0
-// 0x01013144: 0x1013144: beq   v0, zero, 0x10132dc addiu a0, s1, -1
+// 0x01013150: 0x1013150: sll   zero, zero, 0
+// 0x01013154: 0x1013154: beq   v0, zero, 0x10132ec addiu a0, s1, -1
 	ldloc 5
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc.1
-	brfalse L_10132dc
+	brfalse L_10132ec
 // --- basic block ---
-// 0x0101314c: 0x101314c: lw    v0, 12(v0)
+// 0x0101315c: 0x101315c: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6584,49 +6584,49 @@ L_101313c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013150: 0x1013150: sll   v1, s1, 1
+// 0x01013160: 0x1013160: sll   v1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	shl
 	stloc 7
-// 0x01013154: 0x1013154: addu  v1, v0, v1
+// 0x01013164: 0x1013164: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01013158: 0x1013158: sll   a0, a0, 1
+// 0x01013168: 0x1013168: sll   a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
 	stloc.1
-// 0x0101315c: 0x101315c: addu  v0, v0, a0
+// 0x0101316c: 0x101316c: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01013160: 0x1013160: lhu   s8, 0(v1)
+// 0x01013170: 0x1013170: lhu   s8, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 13
-// 0x01013164: 0x1013164: lhu   s3, 0(v0)
+// 0x01013174: 0x1013174: lhu   s3, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 8
-// 0x01013168: 0x1013168: addiu s8, s8, -1
+// 0x01013178: 0x1013178: addiu s8, s8, -1
 	ldloc 13
 	ldc.i4.m1
 	add
 	stloc 13
-// 0x0101316c: 0x101316c: slt   v0, s8, s3
+// 0x0101317c: 0x101317c: slt   v0, s8, s3
 	ldloc 13
 	ldloc 8
 	clt
 	stloc 5
-// 0x01013170: 0x1013170: bne   v0, zero, 0x10132dc sll   zero, zero, 0
+// 0x01013180: 0x1013180: bne   v0, zero, 0x10132ec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10132dc
+	brtrue L_10132ec
 // --- basic block ---
-// 0x01013178: 0x1013178: jal   0x100b37c addu  a0, s6, zero
+// 0x01013188: 0x1013188: jal   0x100b38c addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6634,31 +6634,31 @@ L_101313c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_has_shapes_100b37c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_has_shapes_100b38c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013180: 0x1013180: addu  s6, zero, zero
+// 0x01013190: 0x1013190: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01013184: 0x1013184: bne   v0, zero, 0x1013280 sll   s7, s3, 3
+// 0x01013194: 0x1013194: bne   v0, zero, 0x1013290 sll   s7, s3, 3
 	ldloc 5
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 17
-	brtrue L_1013280
+	brtrue L_1013290
 // --- basic block ---
-// 0x0101318c: 0x101318c: j	 0x10132c4 addu  v0, s6, s3
+// 0x0101319c: 0x101319c: j	 0x10132d4 addu  v0, s6, s3
 	ldloc 9
 	ldloc 8
 	add
 	stloc 5
-	br L_10132c4
+	br L_10132d4
 // --- basic block ---
-L_1013194:
-// 0x01013194: 0x1013194: lw    a2, 236(sp)
+L_10131a4:
+// 0x010131a4: 0x10131a4: lw    a2, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6667,10 +6667,10 @@ L_1013194:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01013198: 0x1013198: addu  a1, s1, zero
+// 0x010131a8: 0x10131a8: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0101319c: 0x101319c: jal   0x101476c sw    v1, 260(sp)
+// 0x010131ac: 0x10131ac: jal   0x101477c sw    v1, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6679,10 +6679,10 @@ L_1013194:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl14::roadmap_plugin_override_line_101476c()
+	call int32 Cibyl14::roadmap_plugin_override_line_101477c()
 	stloc 5
 // --- basic block ---
-// 0x010131a4: 0x10131a4: lw    v1, 260(sp)
+// 0x010131b4: 0x10131b4: lw    v1, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6691,80 +6691,80 @@ L_1013194:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010131a8: 0x10131a8: bne   v0, zero, 0x1013278 lui   a0, 0x20000
+// 0x010131b8: 0x10131b8: bne   v0, zero, 0x1013288 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1013278
+	brtrue L_1013288
 // --- basic block ---
-// 0x010131b0: 0x10131b0: lw    v0, 31152(a0)
+// 0x010131c0: 0x10131c0: lw    v0, 31616(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 5
-// 0x010131b4: 0x10131b4: sll   zero, zero, 0
-// 0x010131b8: 0x10131b8: addu  v0, v0, s7
+// 0x010131c4: 0x10131c4: sll   zero, zero, 0
+// 0x010131c8: 0x10131c8: addu  v0, v0, s7
 	ldloc 5
 	ldloc 17
 	add
 	stloc 5
-// 0x010131bc: 0x10131bc: lhu   a3, 4(v0)
+// 0x010131cc: 0x10131cc: lhu   a3, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x010131c0: 0x10131c0: ori   v0, zero, 65535
+// 0x010131d0: 0x10131d0: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x010131c4: 0x10131c4: beq   a3, v0, 0x1013214 lui   v0, 0x20000
+// 0x010131d4: 0x10131d4: beq   a3, v0, 0x1013224 lui   v0, 0x20000
 	ldloc 4
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_1013214
+	beq  L_1013224
 // --- basic block ---
-// 0x010131cc: 0x10131cc: lw    a0, 31240(v0)
+// 0x010131dc: 0x10131dc: lw    a0, 31704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x010131d0: 0x10131d0: sll   v0, a3, 2
+// 0x010131e0: 0x10131e0: sll   v0, a3, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010131d4: 0x10131d4: addu  v0, a0, v0
+// 0x010131e4: 0x10131e4: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x010131d8: 0x10131d8: lw    v0, 0(v0)
+// 0x010131e8: 0x10131e8: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010131dc: 0x10131dc: sll   zero, zero, 0
-// 0x010131e0: 0x10131e0: blez  v0, 0x1013214 addu  a1, v1, zero
+// 0x010131ec: 0x10131ec: sll   zero, zero, 0
+// 0x010131f0: 0x10131f0: blez  v0, 0x1013224 addu  a1, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.2
 	ldc.i4.s 0
-	ble L_1013214
+	ble L_1013224
 // --- basic block ---
-// 0x010131e8: 0x10131e8: lw    v1, 232(sp)
+// 0x010131f8: 0x10131f8: lw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6773,23 +6773,23 @@ L_1013194:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010131ec: 0x10131ec: addu  v0, v0, a3
+// 0x010131fc: 0x10131fc: addu  v0, v0, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
-// 0x010131f0: 0x10131f0: addu  a0, s4, zero
+// 0x01013200: 0x1013200: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x010131f4: 0x10131f4: addiu a3, a3, 1
+// 0x01013204: 0x1013204: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010131f8: 0x10131f8: addu  a2, s1, zero
+// 0x01013208: 0x1013208: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x010131fc: 0x10131fc: sw    v0, 16(sp)
+// 0x0101320c: 0x101320c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6798,7 +6798,7 @@ L_1013194:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01013200: 0x1013200: sw    s2, 20(sp)
+// 0x01013210: 0x1013210: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6807,7 +6807,7 @@ L_1013194:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01013204: 0x1013204: jal   0x1012dac sw    v1, 24(sp)
+// 0x01013214: 0x1013214: jal   0x1012dbc sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6821,27 +6821,27 @@ L_1013194:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_distance_with_shape_1012dac(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_distance_with_shape_1012dbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101320c: 0x101320c: j	 0x101322c addu  t1, v0, zero
+// 0x0101321c: 0x101321c: j	 0x101323c addu  t1, v0, zero
 	ldloc 5
 	stloc 18
-	br L_101322c
+	br L_101323c
 // --- basic block ---
-L_1013214:
-// 0x01013214: 0x1013214: addu  a1, v1, zero
+L_1013224:
+// 0x01013224: 0x1013224: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01013218: 0x1013218: addu  a0, s4, zero
+// 0x01013228: 0x1013228: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x0101321c: 0x101321c: addu  a2, s1, zero
+// 0x0101322c: 0x101322c: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x01013220: 0x1013220: jal   0x1012c88 addu  a3, s2, zero
+// 0x01013230: 0x1013230: jal   0x1012c98 addu  a3, s2, zero
 	ldloc 12
 	stloc 4
 	ldloc.0
@@ -6849,25 +6849,25 @@ L_1013214:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_distance_no_shape_1012c88(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_distance_no_shape_1012c98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013228: 0x1013228: addu  t1, v0, zero
+// 0x01013238: 0x1013238: addu  t1, v0, zero
 	ldloc 5
 	stloc 18
-L_101322c:
-// 0x0101322c: 0x101322c: addu  t0, s2, zero
+L_101323c:
+// 0x0101323c: 0x101323c: addu  t0, s2, zero
 	ldloc 12
 	stloc 15
-// 0x01013230: 0x1013230: j	 0x1013260 addu  v1, zero, zero
+// 0x01013240: 0x1013240: j	 0x1013270 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1013260
+	br L_1013270
 // --- basic block ---
-L_1013238:
-// 0x01013238: 0x1013238: sw    v1, 260(sp)
+L_1013248:
+// 0x01013248: 0x1013248: sw    v1, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6876,7 +6876,7 @@ L_1013238:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101323c: 0x101323c: sw    t0, 252(sp)
+// 0x0101324c: 0x101324c: sw    t0, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6885,7 +6885,7 @@ L_1013238:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01013240: 0x1013240: jal   0x1011b20 sw    t1, 256(sp)
+// 0x01013250: 0x1013250: jal   0x1011b30 sw    t1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6899,12 +6899,12 @@ L_1013238:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013248: 0x1013248: lw    v1, 260(sp)
+// 0x01013258: 0x1013258: lw    v1, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6913,7 +6913,7 @@ L_1013238:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101324c: 0x101324c: lw    t0, 252(sp)
+// 0x0101325c: 0x101325c: lw    t0, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6922,7 +6922,7 @@ L_1013238:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01013250: 0x1013250: lw    t1, 256(sp)
+// 0x01013260: 0x1013260: lw    t1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6931,29 +6931,29 @@ L_1013238:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01013254: 0x1013254: addu  s0, v0, zero
+// 0x01013264: 0x1013264: addu  s0, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01013258: 0x1013258: addiu v1, v1, 1
+// 0x01013268: 0x1013268: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0101325c: 0x101325c: addiu t0, t0, 48
+// 0x0101326c: 0x101326c: addiu t0, t0, 48
 	ldloc 15
 	ldc.i4.s 48
 	add
 	stloc 15
-L_1013260:
-// 0x01013260: 0x1013260: slt   v0, v1, t1
+L_1013270:
+// 0x01013270: 0x1013270: slt   v0, v1, t1
 	ldloc 7
 	ldloc 18
 	clt
 	stloc 5
-// 0x01013264: 0x1013264: addu  a1, s0, zero
+// 0x01013274: 0x1013274: addu  a1, s0, zero
 	ldloc 11
 	stloc.2
-// 0x01013268: 0x1013268: lw    a0, 324(sp)
+// 0x01013278: 0x1013278: lw    a0, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6962,7 +6962,7 @@ L_1013260:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101326c: 0x101326c: lw    a2, 328(sp)
+// 0x0101327c: 0x101327c: lw    a2, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6971,62 +6971,62 @@ L_1013260:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01013270: 0x1013270: bne   v0, zero, 0x1013238 addu  a3, t0, zero
+// 0x01013280: 0x1013280: bne   v0, zero, 0x1013248 addu  a3, t0, zero
 	ldloc 5
 	ldloc 15
 	stloc 4
-	brtrue L_1013238
+	brtrue L_1013248
 // --- basic block ---
-L_1013278:
-// 0x01013278: 0x1013278: addiu s6, s6, 1
+L_1013288:
+// 0x01013288: 0x1013288: addiu s6, s6, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0101327c: 0x101327c: addiu s7, s7, 8
+// 0x0101328c: 0x101328c: addiu s7, s7, 8
 	ldloc 17
 	ldc.i4.8
 	add
 	stloc 17
-L_1013280:
-// 0x01013280: 0x1013280: addu  v1, s6, s3
+L_1013290:
+// 0x01013290: 0x1013290: addu  v1, s6, s3
 	ldloc 9
 	ldloc 8
 	add
 	stloc 7
-// 0x01013284: 0x1013284: slt   v0, s8, v1
+// 0x01013294: 0x1013294: slt   v0, s8, v1
 	ldloc 13
 	ldloc 7
 	clt
 	stloc 5
-// 0x01013288: 0x1013288: beq   v0, zero, 0x1013194 addu  a0, v1, zero
+// 0x01013298: 0x1013298: beq   v0, zero, 0x10131a4 addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_1013194
+	brfalse L_10131a4
 // --- basic block ---
-// 0x01013290: 0x1013290: j	 0x10132dc sll   zero, zero, 0
-	br L_10132dc
+// 0x010132a0: 0x10132a0: j	 0x10132ec sll   zero, zero, 0
+	br L_10132ec
 // --- basic block ---
-L_1013298:
-// 0x01013298: 0x1013298: jal   0x1012c88 sll   zero, zero, 0
+L_10132a8:
+// 0x010132a8: 0x10132a8: jal   0x1012c98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_distance_no_shape_1012c88(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_distance_no_shape_1012c98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010132a0: 0x10132a0: beq   v0, zero, 0x10132bc addu  a1, s0, zero
+// 0x010132b0: 0x10132b0: beq   v0, zero, 0x10132cc addu  a1, s0, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brfalse L_10132bc
+	brfalse L_10132cc
 // --- basic block ---
-// 0x010132a8: 0x10132a8: lw    a0, 324(sp)
+// 0x010132b8: 0x10132b8: lw    a0, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7035,7 +7035,7 @@ L_1013298:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010132ac: 0x10132ac: lw    a2, 328(sp)
+// 0x010132bc: 0x10132bc: lw    a2, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7044,7 +7044,7 @@ L_1013298:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010132b0: 0x10132b0: jal   0x1011b20 addu  a3, s2, zero
+// 0x010132c0: 0x10132c0: jal   0x1011b30 addu  a3, s2, zero
 	ldloc 12
 	stloc 4
 	ldloc.0
@@ -7052,48 +7052,48 @@ L_1013298:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010132b8: 0x10132b8: addu  s0, v0, zero
+// 0x010132c8: 0x10132c8: addu  s0, v0, zero
 	ldloc 5
 	stloc 11
-L_10132bc:
-// 0x010132bc: 0x10132bc: addiu s6, s6, 1
+L_10132cc:
+// 0x010132cc: 0x10132cc: addiu s6, s6, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010132c0: 0x10132c0: addu  v0, s6, s3
+// 0x010132d0: 0x10132d0: addu  v0, s6, s3
 	ldloc 9
 	ldloc 8
 	add
 	stloc 5
-L_10132c4:
-// 0x010132c4: 0x10132c4: addu  a1, v0, zero
+L_10132d4:
+// 0x010132d4: 0x10132d4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010132c8: 0x10132c8: slt   v0, s8, v0
+// 0x010132d8: 0x10132d8: slt   v0, s8, v0
 	ldloc 13
 	ldloc 5
 	clt
 	stloc 5
-// 0x010132cc: 0x10132cc: addu  a0, s4, zero
+// 0x010132dc: 0x10132dc: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x010132d0: 0x10132d0: addu  a2, s1, zero
+// 0x010132e0: 0x10132e0: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x010132d4: 0x10132d4: beq   v0, zero, 0x1013298 addu  a3, s2, zero
+// 0x010132e4: 0x10132e4: beq   v0, zero, 0x10132a8 addu  a3, s2, zero
 	ldloc 5
 	ldloc 12
 	stloc 4
-	brfalse L_1013298
+	brfalse L_10132a8
 // --- basic block ---
-L_10132dc:
-// 0x010132dc: 0x10132dc: lw    a0, 228(sp)
+L_10132ec:
+// 0x010132ec: 0x10132ec: lw    a0, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7102,17 +7102,17 @@ L_10132dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010132e0: 0x10132e0: addiu s5, s5, 4
+// 0x010132f0: 0x10132f0: addiu s5, s5, 4
 	ldloc 16
 	ldc.i4.4
 	add
 	stloc 16
-// 0x010132e4: 0x10132e4: addiu a0, a0, 1
+// 0x010132f4: 0x10132f4: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010132e8: 0x10132e8: sw    a0, 228(sp)
+// 0x010132f8: 0x10132f8: sw    a0, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7121,8 +7121,8 @@ L_10132dc:
 	add
 	ldloc.1
 	stelem.i4
-L_10132ec:
-// 0x010132ec: 0x10132ec: lw    v1, 228(sp)
+L_10132fc:
+// 0x010132fc: 0x10132fc: lw    v1, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7131,7 +7131,7 @@ L_10132ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010132f0: 0x10132f0: lw    a0, 316(sp)
+// 0x01013300: 0x1013300: lw    a0, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7140,17 +7140,17 @@ L_10132ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010132f4: 0x10132f4: sll   zero, zero, 0
-// 0x010132f8: 0x10132f8: slt   v0, v1, a0
+// 0x01013304: 0x1013304: sll   zero, zero, 0
+// 0x01013308: 0x1013308: slt   v0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 5
-// 0x010132fc: 0x10132fc: bne   v0, zero, 0x10130e8 sll   zero, zero, 0
+// 0x0101330c: 0x101330c: bne   v0, zero, 0x10130f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10130e8
+	brtrue L_10130f8
 // --- basic block ---
-// 0x01013304: 0x1013304: lw    v0, 224(sp)
+// 0x01013314: 0x1013314: lw    v0, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7159,7 +7159,7 @@ L_10132ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013308: 0x1013308: lw    v1, 220(sp)
+// 0x01013318: 0x1013318: lw    v1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7168,17 +7168,17 @@ L_10132ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101330c: 0x101330c: addiu v0, v0, 1
+// 0x0101331c: 0x101331c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01013310: 0x1013310: addiu v1, v1, 4
+// 0x01013320: 0x1013320: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x01013314: 0x1013314: sw    v0, 224(sp)
+// 0x01013324: 0x1013324: sw    v0, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7187,7 +7187,7 @@ L_10132ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01013318: 0x1013318: sw    v1, 220(sp)
+// 0x01013328: 0x1013328: sw    v1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7196,8 +7196,8 @@ L_10132ec:
 	add
 	ldloc 7
 	stelem.i4
-L_101331c:
-// 0x0101331c: 0x101331c: lw    a0, 224(sp)
+L_101332c:
+// 0x0101332c: 0x101332c: lw    a0, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7206,7 +7206,7 @@ L_101331c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01013320: 0x1013320: lw    v1, 240(sp)
+// 0x01013330: 0x1013330: lw    v1, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7215,17 +7215,17 @@ L_101331c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013324: 0x1013324: sll   zero, zero, 0
-// 0x01013328: 0x1013328: slt   v0, a0, v1
+// 0x01013334: 0x1013334: sll   zero, zero, 0
+// 0x01013338: 0x1013338: slt   v0, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 5
-// 0x0101332c: 0x101332c: beq   v0, zero, 0x1013340 sll   zero, zero, 0
+// 0x0101333c: 0x101333c: beq   v0, zero, 0x1013350 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1013340
+	brfalse L_1013350
 // --- basic block ---
-// 0x01013334: 0x1013334: lw    s5, 312(sp)
+// 0x01013344: 0x1013344: lw    s5, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7234,7 +7234,7 @@ L_101331c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01013338: 0x1013338: j	 0x10132ec sw    zero, 228(sp)
+// 0x01013348: 0x1013348: j	 0x10132fc sw    zero, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7243,10 +7243,10 @@ L_101331c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10132ec
+	br L_10132fc
 // --- basic block ---
-L_1013340:
-// 0x01013340: 0x1013340: lw    s3, 248(sp)
+L_1013350:
+// 0x01013350: 0x1013350: lw    s3, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7255,8 +7255,8 @@ L_1013340:
 	add
 	ldelem.i4
 	stloc 8
-L_1013344:
-// 0x01013344: 0x1013344: lw    a0, 216(sp)
+L_1013354:
+// 0x01013354: 0x1013354: lw    a0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7265,17 +7265,17 @@ L_1013344:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01013348: 0x1013348: addiu s3, s3, -1
+// 0x01013358: 0x1013358: addiu s3, s3, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x0101334c: 0x101334c: addiu a0, a0, -4
+// 0x0101335c: 0x101335c: addiu a0, a0, -4
 	ldloc.1
 	ldc.i4.s -4
 	add
 	stloc.1
-// 0x01013350: 0x1013350: sw    a0, 216(sp)
+// 0x01013360: 0x1013360: sw    a0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7284,20 +7284,20 @@ L_1013344:
 	add
 	ldloc.1
 	stelem.i4
-L_1013354:
-// 0x01013354: 0x1013354: bgez  s3, 0x1013094 lui   v0, 0x30000
+L_1013364:
+// 0x01013364: 0x1013364: bgez  s3, 0x10130a4 lui   v0, 0x30000
 	ldloc 8
 	ldc.i4 196608
 	stloc 5
 	ldc.i4.s 0
-	bge L_1013094
+	bge L_10130a4
 // --- basic block ---
-L_101335c:
-// 0x0101335c: 0x101335c: lw    ra, 300(sp)
-// 0x01013360: 0x1013360: addu  v0, s0, zero
+L_101336c:
+// 0x0101336c: 0x101336c: lw    ra, 300(sp)
+// 0x01013370: 0x1013370: addu  v0, s0, zero
 	ldloc 11
 	stloc 5
-// 0x01013364: 0x1013364: lw    s8, 296(sp)
+// 0x01013374: 0x1013374: lw    s8, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7306,7 +7306,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01013368: 0x1013368: lw    s7, 292(sp)
+// 0x01013378: 0x1013378: lw    s7, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7315,7 +7315,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0101336c: 0x101336c: lw    s6, 288(sp)
+// 0x0101337c: 0x101337c: lw    s6, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7324,7 +7324,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01013370: 0x1013370: lw    s5, 284(sp)
+// 0x01013380: 0x1013380: lw    s5, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7333,7 +7333,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01013374: 0x1013374: lw    s4, 280(sp)
+// 0x01013384: 0x1013384: lw    s4, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7342,7 +7342,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01013378: 0x1013378: lw    s3, 276(sp)
+// 0x01013388: 0x1013388: lw    s3, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7351,7 +7351,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101337c: 0x101337c: lw    s2, 272(sp)
+// 0x0101338c: 0x101338c: lw    s2, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7360,7 +7360,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01013380: 0x1013380: lw    s1, 268(sp)
+// 0x01013390: 0x1013390: lw    s1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7369,7 +7369,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01013384: 0x1013384: lw    s0, 264(sp)
+// 0x01013394: 0x1013394: lw    s0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7378,7 +7378,7 @@ L_101335c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01013388: 0x1013388: jr    ra addiu sp, sp, 304
+// 0x01013398: 0x1013398: jr    ra addiu sp, sp, 304
 	ldloc.0
 	ldc.i4 304
 	add
diff --git a/converted/Cibyl130.j b/converted/Cibyl130.j
index 885198e..f514d57 100644
--- a/converted/Cibyl130.j
+++ b/converted/Cibyl130.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl130::.ctor
 
-.method public static int32 editor_track_known_end_segment_10ae0a4(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_known_end_segment_10ae6ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s6,int32 s3,int32 s4,int32 s7,int32 s5,int32 s8,int32 lo,int32 ra)
@@ -106,12 +106,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ae0a4: 0x10ae0a4: addiu sp, sp, -88
+// 0x010ae6ec: 0x10ae6ec: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010ae0a8: 0x10ae0a8: sw    s2, 56(sp)
+// 0x010ae6f0: 0x10ae6f0: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -120,7 +120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae0ac: 0x10ae0ac: sw    s0, 48(sp)
+// 0x010ae6f4: 0x10ae6f4: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -129,8 +129,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae0b0: 0x10ae0b0: sw    ra, 84(sp)
-// 0x010ae0b4: 0x10ae0b4: sw    s8, 80(sp)
+// 0x010ae6f8: 0x10ae6f8: sw    ra, 84(sp)
+// 0x010ae6fc: 0x10ae6fc: sw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010ae0b8: 0x10ae0b8: sw    s7, 76(sp)
+// 0x010ae700: 0x10ae700: sw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -148,7 +148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ae0bc: 0x10ae0bc: sw    s6, 72(sp)
+// 0x010ae704: 0x10ae704: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -157,7 +157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ae0c0: 0x10ae0c0: sw    s5, 68(sp)
+// 0x010ae708: 0x10ae708: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -166,7 +166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010ae0c4: 0x10ae0c4: sw    s4, 64(sp)
+// 0x010ae70c: 0x10ae70c: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -175,7 +175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ae0c8: 0x10ae0c8: sw    s3, 60(sp)
+// 0x010ae710: 0x10ae710: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -184,7 +184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ae0cc: 0x10ae0cc: sw    s1, 52(sp)
+// 0x010ae714: 0x10ae714: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -193,16 +193,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ae0d0: 0x10ae0d0: addu  s2, a1, zero
+// 0x010ae718: 0x10ae718: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010ae0d4: 0x10ae0d4: beq   a1, zero, 0x10ae3a4 addu  s0, a2, zero
+// 0x010ae71c: 0x10ae71c: beq   a1, zero, 0x10ae9ec addu  s0, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 9
-	brfalse L_10ae3a4
+	brfalse L_10ae9ec
 // --- basic block ---
-// 0x010ae0dc: 0x10ae0dc: lw    a0, 16(a2)
+// 0x010ae724: 0x10ae724: lw    a0, 16(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -211,31 +211,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae0e0: 0x10ae0e0: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010ae728: 0x10ae728: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae0e8: 0x10ae0e8: addu  s1, v0, zero
+// 0x010ae730: 0x10ae730: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010ae0ec: 0x10ae0ec: addiu v0, zero, -1
+// 0x010ae734: 0x10ae734: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010ae0f0: 0x10ae0f0: bne   s1, v0, 0x10ae118 addu  a0, s0, zero
+// 0x010ae738: 0x10ae738: bne   s1, v0, 0x10ae760 addu  a0, s0, zero
 	ldloc 8
 	ldloc 5
 	ldloc 9
 	stloc.1
-	bne.un L_10ae118
+	bne.un L_10ae760
 // --- basic block ---
-// 0x010ae0f8: 0x10ae0f8: lw    a0, 16(s0)
+// 0x010ae740: 0x10ae740: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -244,11 +244,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae0fc: 0x10ae0fc: jal   0x10b6a10 sll   zero, zero, 0
-	call int32 Cibyl136::editor_db_create_10b6a10()
+// 0x010ae744: 0x10ae744: jal   0x10b7058 sll   zero, zero, 0
+	call int32 Cibyl136::editor_db_create_10b7058()
 	stloc 5
 // --- basic block ---
-// 0x010ae104: 0x10ae104: lw    a0, 16(s0)
+// 0x010ae74c: 0x10ae74c: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -257,39 +257,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae108: 0x10ae108: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010ae750: 0x10ae750: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae110: 0x10ae110: beq   v0, s1, 0x10ae3a4 addu  a0, s0, zero
+// 0x010ae758: 0x10ae758: beq   v0, s1, 0x10ae9ec addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 9
 	stloc.1
-	beq  L_10ae3a4
+	beq  L_10ae9ec
 // --- basic block ---
-L_10ae118:
-// 0x010ae118: 0x10ae118: addiu a1, sp, 32
+L_10ae760:
+// 0x010ae760: 0x10ae760: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010ae11c: 0x10ae11c: addiu a2, sp, 40
+// 0x010ae764: 0x10ae764: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x010ae120: 0x10ae120: addiu a3, zero, 3
+// 0x010ae768: 0x10ae768: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010ae124: 0x10ae124: sw    zero, 16(sp)
+// 0x010ae76c: 0x10ae76c: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -298,7 +298,7 @@ L_10ae118:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ae128: 0x10ae128: jal   0x1012790 sw    zero, 20(sp)
+// 0x010ae770: 0x10ae770: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -312,26 +312,26 @@ L_10ae118:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae130: 0x10ae130: lw    s3, 0(s0)
+// 0x010ae778: 0x10ae778: lw    s3, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x010ae134: 0x10ae134: sll   zero, zero, 0
-// 0x010ae138: 0x10ae138: bne   s3, zero, 0x10ae164 lui   v0, 0x0
+// 0x010ae77c: 0x10ae77c: sll   zero, zero, 0
+// 0x010ae780: 0x10ae780: bne   s3, zero, 0x10ae7ac lui   v0, 0x0
 	ldloc 12
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10ae164
+	brtrue L_10ae7ac
 // --- basic block ---
-// 0x010ae140: 0x10ae140: lw    v0, 576(v0)
+// 0x010ae788: 0x10ae788: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -340,7 +340,7 @@ L_10ae118:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ae144: 0x10ae144: lw    a0, 12(s0)
+// 0x010ae78c: 0x10ae78c: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -349,30 +349,30 @@ L_10ae118:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae148: 0x10ae148: sll   zero, zero, 0
-// 0x010ae14c: 0x10ae14c: beq   a0, v0, 0x10ae164 sll   zero, zero, 0
+// 0x010ae790: 0x10ae790: sll   zero, zero, 0
+// 0x010ae794: 0x10ae794: beq   a0, v0, 0x10ae7ac sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10ae164
+	beq  L_10ae7ac
 // --- basic block ---
-// 0x010ae154: 0x10ae154: bltz  a0, 0x10ae164 sll   zero, zero, 0
+// 0x010ae79c: 0x10ae79c: bltz  a0, 0x10ae7ac sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10ae164
+	blt L_10ae7ac
 // --- basic block ---
-// 0x010ae15c: 0x10ae15c: jal   0x100b164 sll   zero, zero, 0
+// 0x010ae7a4: 0x10ae7a4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ae164:
-// 0x010ae164: 0x10ae164: lw    s4, 4(s0)
+L_10ae7ac:
+// 0x010ae7ac: 0x10ae7ac: lw    s4, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -381,7 +381,7 @@ L_10ae164:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ae168: 0x10ae168: lw    s5, 12(s0)
+// 0x010ae7b0: 0x10ae7b0: lw    s5, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -390,7 +390,7 @@ L_10ae164:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ae16c: 0x10ae16c: jal   0x10aec78 addu  a0, s0, zero
+// 0x010ae7b4: 0x10ae7b4: jal   0x10af2c0 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -398,18 +398,18 @@ L_10ae164:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_get_line_length_10aec78(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_get_line_length_10af2c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae174: 0x10ae174: addu  a0, zero, zero
+// 0x010ae7bc: 0x10ae7bc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010ae178: 0x10ae178: addu  a1, s2, zero
+// 0x010ae7c0: 0x10ae7c0: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010ae17c: 0x10ae17c: jal   0x10aee14 addu  s6, v0, zero
+// 0x010ae7c4: 0x10ae7c4: jal   0x10af45c addu  s6, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -417,37 +417,37 @@ L_10ae164:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_length_10aee14(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_length_10af45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae184: 0x10ae184: lui   a1, 0x20000
+// 0x010ae7cc: 0x10ae7cc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ae188: 0x10ae188: lui   a3, 0x20000
+// 0x010ae7d0: 0x10ae7d0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ae18c: 0x10ae18c: addiu a1, a1, 16928
+// 0x010ae7d4: 0x10ae7d4: addiu a1, a1, 17388
 	ldloc.2
-	ldc.i4 16928
+	ldc.i4 17388
 	add
 	stloc.2
-// 0x010ae190: 0x10ae190: addiu a3, a3, 17016
+// 0x010ae7d8: 0x10ae7d8: addiu a3, a3, 17476
 	ldloc 4
-	ldc.i4 17016
+	ldc.i4 17476
 	add
 	stloc 4
-// 0x010ae194: 0x10ae194: addiu a0, zero, 2
+// 0x010ae7dc: 0x10ae7dc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010ae198: 0x10ae198: addiu a2, zero, 337
+// 0x010ae7e0: 0x10ae7e0: addiu a2, zero, 337
 	ldc.i4 337
 	stloc.3
-// 0x010ae19c: 0x10ae19c: addu  s7, v0, zero
+// 0x010ae7e4: 0x10ae7e4: addu  s7, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010ae1a0: 0x10ae1a0: sw    s4, 16(sp)
+// 0x010ae7e8: 0x10ae7e8: sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -456,7 +456,7 @@ L_10ae164:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ae1a4: 0x10ae1a4: sw    s3, 20(sp)
+// 0x010ae7ec: 0x10ae7ec: sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -465,7 +465,7 @@ L_10ae164:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ae1a8: 0x10ae1a8: sw    s6, 24(sp)
+// 0x010ae7f0: 0x10ae7f0: sw    s6, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -474,7 +474,7 @@ L_10ae164:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ae1ac: 0x10ae1ac: jal   0x100449c sw    v0, 28(sp)
+// 0x010ae7f4: 0x10ae7f4: jal   0x100449c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -493,29 +493,29 @@ L_10ae164:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae1b4: 0x10ae1b4: bgtz  s6, 0x10ae1c0 sll   zero, zero, 0
+// 0x010ae7fc: 0x10ae7fc: bgtz  s6, 0x10ae808 sll   zero, zero, 0
 	ldloc 11
 	ldc.i4.s 0
-	bgt L_10ae1c0
+	bgt L_10ae808
 // --- basic block ---
-// 0x010ae1bc: 0x10ae1bc: addiu s6, zero, 1
+// 0x010ae804: 0x10ae804: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 11
-L_10ae1c0:
-// 0x010ae1c0: 0x10ae1c0: jal   0x10b07a0 addu  a0, s2, zero
+L_10ae808:
+// 0x010ae808: 0x10ae808: jal   0x10b0de8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae1c8: 0x10ae1c8: addu  s8, v0, zero
+// 0x010ae810: 0x10ae810: addu  s8, v0, zero
 	ldloc 5
 	stloc 16
-// 0x010ae1cc: 0x10ae1cc: addu  a0, v0, zero
+// 0x010ae814: 0x10ae814: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ae1d0: 0x10ae1d0: jal   0x1008eb0 addiu a1, sp, 40
+// 0x010ae818: 0x10ae818: jal   0x1008ec0 addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -525,20 +525,20 @@ L_10ae1c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae1d8: 0x10ae1d8: addu  a0, s8, zero
+// 0x010ae820: 0x10ae820: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x010ae1dc: 0x10ae1dc: addiu a1, sp, 32
+// 0x010ae824: 0x10ae824: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010ae1e0: 0x10ae1e0: jal   0x1008eb0 addu  s1, v0, zero
+// 0x010ae828: 0x10ae828: jal   0x1008ec0 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -546,17 +546,17 @@ L_10ae1c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae1e8: 0x10ae1e8: slt   s1, v0, s1
+// 0x010ae830: 0x10ae830: slt   s1, v0, s1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 8
-// 0x010ae1ec: 0x10ae1ec: lw    v0, 104(sp)
+// 0x010ae834: 0x10ae834: lw    v0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -565,86 +565,86 @@ L_10ae1c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ae1f0: 0x10ae1f0: sll   zero, zero, 0
-// 0x010ae1f4: 0x10ae1f4: beq   v0, zero, 0x10ae200 sll   s1, s1, 4
+// 0x010ae838: 0x10ae838: sll   zero, zero, 0
+// 0x010ae83c: 0x10ae83c: beq   v0, zero, 0x10ae848 sll   s1, s1, 4
 	ldloc 5
 	ldloc 8
 	ldc.i4.4
 	shl
 	stloc 8
-	brfalse L_10ae200
+	brfalse L_10ae848
 // --- basic block ---
-// 0x010ae1fc: 0x10ae1fc: ori   s1, s1, 8
+// 0x010ae844: 0x10ae844: ori   s1, s1, 8
 	ldloc 8
 	ldc.i4.8
 	or
 	stloc 8
-L_10ae200:
-// 0x010ae200: 0x10ae200: jal   0x10b0964 sll   zero, zero, 0
-	call int32 Cibyl132::editor_ignore_new_roads_10b0964()
+L_10ae848:
+// 0x010ae848: 0x10ae848: jal   0x10b0fac sll   zero, zero, 0
+	call int32 Cibyl132::editor_ignore_new_roads_10b0fac()
 	stloc 5
 // --- basic block ---
-// 0x010ae208: 0x10ae208: bne   v0, zero, 0x10ae214 addiu v0, zero, 100
+// 0x010ae850: 0x10ae850: bne   v0, zero, 0x10ae85c addiu v0, zero, 100
 	ldloc 5
 	ldc.i4.s 100
 	stloc 5
-	brtrue L_10ae214
+	brtrue L_10ae85c
 // --- basic block ---
-// 0x010ae210: 0x10ae210: ori   s1, s1, 128
+// 0x010ae858: 0x10ae858: ori   s1, s1, 128
 	ldloc 8
 	ldc.i4 128
 	or
 	stloc 8
-L_10ae214:
-// 0x010ae214: 0x10ae214: mult  s7, v0
+L_10ae85c:
+// 0x010ae85c: 0x10ae85c: mult  s7, v0
 	ldloc 14
 	ldloc 5
 	mul
 	stloc 17
-// 0x010ae218: 0x10ae218: mflo  lo
+// 0x010ae860: 0x10ae860: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x010ae21c: 0x10ae21c: sll   zero, zero, 0
-// 0x010ae220: 0x10ae220: sll   zero, zero, 0
-// 0x010ae224: 0x10ae224: div   v0, s6
+// 0x010ae864: 0x10ae864: sll   zero, zero, 0
+// 0x010ae868: 0x10ae868: sll   zero, zero, 0
+// 0x010ae86c: 0x10ae86c: div   v0, s6
 	ldloc 5
 	ldloc 11
 	div
 	stloc 17
-// 0x010ae228: 0x10ae228: mflo  lo
+// 0x010ae870: 0x10ae870: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x010ae22c: 0x10ae22c: slti  v1, v0, 70
+// 0x010ae874: 0x10ae874: slti  v1, v0, 70
 	ldloc 5
 	ldc.i4.s 70
 	clt
 	stloc 7
-// 0x010ae230: 0x10ae230: beq   v1, zero, 0x10ae310 lui   a1, 0x20000
+// 0x010ae878: 0x10ae878: beq   v1, zero, 0x10ae958 lui   a1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10ae310
+	brfalse L_10ae958
 // --- basic block ---
-// 0x010ae238: 0x10ae238: lui   a3, 0x20000
+// 0x010ae880: 0x10ae880: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ae23c: 0x10ae23c: addiu a1, a1, 16928
+// 0x010ae884: 0x10ae884: addiu a1, a1, 17388
 	ldloc.2
-	ldc.i4 16928
+	ldc.i4 17388
 	add
 	stloc.2
-// 0x010ae240: 0x10ae240: addiu a3, a3, 17084
+// 0x010ae888: 0x10ae888: addiu a3, a3, 17544
 	ldloc 4
-	ldc.i4 17084
+	ldc.i4 17544
 	add
 	stloc 4
-// 0x010ae244: 0x10ae244: addiu a2, zero, 396
+// 0x010ae88c: 0x10ae88c: addiu a2, zero, 396
 	ldc.i4 396
 	stloc.3
-// 0x010ae248: 0x10ae248: addiu a0, zero, 2
+// 0x010ae890: 0x10ae890: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010ae24c: 0x10ae24c: jal   0x100449c sw    v0, 16(sp)
+// 0x010ae894: 0x10ae894: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -663,71 +663,71 @@ L_10ae214:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae254: 0x10ae254: jal   0x10b0f9c sll   zero, zero, 0
+// 0x010ae89c: 0x10ae89c: jal   0x10b15e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae25c: 0x10ae25c: addu  s8, v0, zero
+// 0x010ae8a4: 0x10ae8a4: addu  s8, v0, zero
 	ldloc 5
 	stloc 16
-// 0x010ae260: 0x10ae260: jal   0x10c09c0 addu  a0, s7, zero
+// 0x010ae8a8: 0x10ae8a8: jal   0x10c1000 addu  a0, s7, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae268: 0x10ae268: addu  a0, s8, zero
+// 0x010ae8b0: 0x10ae8b0: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x010ae26c: 0x10ae26c: addu  s7, v1, zero
+// 0x010ae8b4: 0x10ae8b4: addu  s7, v1, zero
 	ldloc 7
 	stloc 14
-// 0x010ae270: 0x10ae270: jal   0x10c09c0 addu  s6, v0, zero
+// 0x010ae8b8: 0x10ae8b8: jal   0x10c1000 addu  s6, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae278: 0x10ae278: lui   a0, 0x20000
+// 0x010ae8c0: 0x10ae8c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ae27c: 0x10ae27c: lw    a3, 23828(a0)
+// 0x010ae8c4: 0x10ae8c4: lw    a3, 24292(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5957
+	ldc.i4 6073
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ae280: 0x10ae280: lw    a2, 23824(a0)
+// 0x010ae8c8: 0x10ae8c8: lw    a2, 24288(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5956
+	ldc.i4 6072
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ae284: 0x10ae284: addu  a1, v1, zero
+// 0x010ae8cc: 0x10ae8cc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010ae288: 0x10ae288: jal   0x10c0798 addu  a0, v0, zero
+// 0x010ae8d0: 0x10ae8d0: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -735,21 +735,21 @@ L_10ae214:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae290: 0x10ae290: addu  a3, v1, zero
+// 0x010ae8d8: 0x10ae8d8: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010ae294: 0x10ae294: addu  a1, s7, zero
+// 0x010ae8dc: 0x10ae8dc: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x010ae298: 0x10ae298: addu  a0, s6, zero
+// 0x010ae8e0: 0x10ae8e0: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x010ae29c: 0x10ae29c: jal   0x10c17ac addu  a2, v0, zero
+// 0x010ae8e4: 0x10ae8e4: jal   0x10c1dec addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -757,33 +757,33 @@ L_10ae214:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae2a4: 0x10ae2a4: blez  v0, 0x10ae2d8 addu  a2, s3, zero
+// 0x010ae8ec: 0x10ae8ec: blez  v0, 0x10ae920 addu  a2, s3, zero
 	ldloc 5
 	ldloc 12
 	stloc.3
 	ldc.i4.s 0
-	ble L_10ae2d8
+	ble L_10ae920
 // --- basic block ---
-// 0x010ae2ac: 0x10ae2ac: addu  a0, s5, zero
+// 0x010ae8f4: 0x10ae8f4: addu  a0, s5, zero
 	ldloc 15
 	stloc.1
-// 0x010ae2b0: 0x10ae2b0: addu  a1, s4, zero
+// 0x010ae8f8: 0x10ae8f8: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010ae2b4: 0x10ae2b4: ori   s1, s1, 64
+// 0x010ae8fc: 0x10ae8fc: ori   s1, s1, 64
 	ldloc 8
 	ldc.i4.s 64
 	or
 	stloc 8
-// 0x010ae2b8: 0x10ae2b8: addu  a3, zero, zero
+// 0x010ae900: 0x10ae900: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010ae2bc: 0x10ae2bc: sw    s2, 16(sp)
+// 0x010ae904: 0x10ae904: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -792,7 +792,7 @@ L_10ae214:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae2c0: 0x10ae2c0: jal   0x10aefa8 sw    s1, 20(sp)
+// 0x010ae908: 0x10ae908: jal   0x10af5f0 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -806,38 +806,38 @@ L_10ae214:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_trkseg_10aefa8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_trkseg_10af5f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae2c8: 0x10ae2c8: addu  a1, v0, zero
+// 0x010ae910: 0x10ae910: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae2cc: 0x10ae2cc: addu  a0, s0, zero
+// 0x010ae914: 0x10ae914: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010ae2d0: 0x10ae2d0: j	 0x10ae36c addu  a2, zero, zero
+// 0x010ae918: 0x10ae918: j	 0x10ae9b4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_10ae36c
+	br L_10ae9b4
 // --- basic block ---
-L_10ae2d8:
-// 0x010ae2d8: 0x10ae2d8: addu  a0, s5, zero
+L_10ae920:
+// 0x010ae920: 0x10ae920: addu  a0, s5, zero
 	ldloc 15
 	stloc.1
-// 0x010ae2dc: 0x10ae2dc: addu  a1, s4, zero
+// 0x010ae924: 0x10ae924: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010ae2e0: 0x10ae2e0: ori   s1, s1, 2
+// 0x010ae928: 0x10ae928: ori   s1, s1, 2
 	ldloc 8
 	ldc.i4.2
 	or
 	stloc 8
-// 0x010ae2e4: 0x10ae2e4: addu  a3, zero, zero
+// 0x010ae92c: 0x10ae92c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010ae2e8: 0x10ae2e8: sw    s2, 16(sp)
+// 0x010ae930: 0x10ae930: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -846,7 +846,7 @@ L_10ae2d8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae2ec: 0x10ae2ec: jal   0x10aefa8 sw    s1, 20(sp)
+// 0x010ae934: 0x10ae934: jal   0x10af5f0 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -860,21 +860,21 @@ L_10ae2d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_trkseg_10aefa8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_trkseg_10af5f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae2f4: 0x10ae2f4: addu  a1, v0, zero
+// 0x010ae93c: 0x10ae93c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae2f8: 0x10ae2f8: addu  a0, s0, zero
+// 0x010ae940: 0x10ae940: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010ae2fc: 0x10ae2fc: addu  a2, zero, zero
+// 0x010ae944: 0x10ae944: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010ae300: 0x10ae300: jal   0x10aee90 addiu a3, zero, 1
+// 0x010ae948: 0x10ae948: jal   0x10af4d8 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -882,40 +882,40 @@ L_10ae2d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_add_trkseg_10aee90(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_add_trkseg_10af4d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae308: 0x10ae308: j	 0x10ae3a8 addu  v0, zero, zero
+// 0x010ae950: 0x10ae950: j	 0x10ae9f0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10ae3a8
+	br L_10ae9f0
 // --- basic block ---
-L_10ae310:
-// 0x010ae310: 0x10ae310: beq   s3, zero, 0x10ae31c sll   zero, zero, 0
+L_10ae958:
+// 0x010ae958: 0x10ae958: beq   s3, zero, 0x10ae964 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_10ae31c
+	brfalse L_10ae964
 // --- basic block ---
-// 0x010ae318: 0x10ae318: ori   s1, s1, 64
+// 0x010ae960: 0x10ae960: ori   s1, s1, 64
 	ldloc 8
 	ldc.i4.s 64
 	or
 	stloc 8
-L_10ae31c:
-// 0x010ae31c: 0x10ae31c: addu  a1, s4, zero
+L_10ae964:
+// 0x010ae964: 0x10ae964: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010ae320: 0x10ae320: addu  a0, s5, zero
+// 0x010ae968: 0x10ae968: addu  a0, s5, zero
 	ldloc 15
 	stloc.1
-// 0x010ae324: 0x10ae324: addu  a2, s3, zero
+// 0x010ae96c: 0x10ae96c: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x010ae328: 0x10ae328: addu  a3, zero, zero
+// 0x010ae970: 0x10ae970: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010ae32c: 0x10ae32c: sw    s2, 16(sp)
+// 0x010ae974: 0x10ae974: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -924,7 +924,7 @@ L_10ae31c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae330: 0x10ae330: jal   0x10aefa8 sw    s1, 20(sp)
+// 0x010ae978: 0x10ae978: jal   0x10af5f0 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -938,42 +938,42 @@ L_10ae31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_trkseg_10aefa8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_trkseg_10af5f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae338: 0x10ae338: andi  s1, s1, 16
+// 0x010ae980: 0x10ae980: andi  s1, s1, 16
 	ldloc 8
 	ldc.i4.s 16
 	and
 	stloc 8
-// 0x010ae33c: 0x10ae33c: addu  s2, v0, zero
+// 0x010ae984: 0x10ae984: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010ae340: 0x10ae340: beq   s1, zero, 0x10ae37c lui   a1, 0x20000
+// 0x010ae988: 0x10ae988: beq   s1, zero, 0x10ae9c4 lui   a1, 0x20000
 	ldloc 8
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10ae37c
+	brfalse L_10ae9c4
 // --- basic block ---
-// 0x010ae348: 0x10ae348: lui   a3, 0x20000
+// 0x010ae990: 0x10ae990: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ae34c: 0x10ae34c: addiu a1, a1, 16928
+// 0x010ae994: 0x10ae994: addiu a1, a1, 17388
 	ldloc.2
-	ldc.i4 16928
+	ldc.i4 17388
 	add
 	stloc.2
-// 0x010ae350: 0x10ae350: addiu a2, zero, 449
+// 0x010ae998: 0x10ae998: addiu a2, zero, 449
 	ldc.i4 449
 	stloc.3
-// 0x010ae354: 0x10ae354: addiu a0, zero, 2
+// 0x010ae99c: 0x10ae99c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010ae358: 0x10ae358: jal   0x100449c addiu a3, a3, 17124
+// 0x010ae9a0: 0x10ae9a0: jal   0x100449c addiu a3, a3, 17584
 	ldloc 4
-	ldc.i4 17124
+	ldc.i4 17584
 	add
 	stloc 4
 	ldloc.0
@@ -986,17 +986,17 @@ L_10ae31c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae360: 0x10ae360: addu  a0, s0, zero
+// 0x010ae9a8: 0x10ae9a8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010ae364: 0x10ae364: addu  a1, s2, zero
+// 0x010ae9ac: 0x10ae9ac: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010ae368: 0x10ae368: addiu a2, zero, 2
+// 0x010ae9b0: 0x10ae9b0: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-L_10ae36c:
-// 0x010ae36c: 0x10ae36c: jal   0x10aee90 addiu a3, zero, 1
+L_10ae9b4:
+// 0x010ae9b4: 0x10ae9b4: jal   0x10af4d8 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -1004,34 +1004,34 @@ L_10ae36c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_add_trkseg_10aee90(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_add_trkseg_10af4d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae374: 0x10ae374: j	 0x10ae3a8 addiu v0, zero, 1
+// 0x010ae9bc: 0x10ae9bc: j	 0x10ae9f0 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10ae3a8
+	br L_10ae9f0
 // --- basic block ---
-L_10ae37c:
-// 0x010ae37c: 0x10ae37c: lui   a3, 0x20000
+L_10ae9c4:
+// 0x010ae9c4: 0x10ae9c4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ae380: 0x10ae380: addiu a1, a1, 16928
+// 0x010ae9c8: 0x10ae9c8: addiu a1, a1, 17388
 	ldloc.2
-	ldc.i4 16928
+	ldc.i4 17388
 	add
 	stloc.2
-// 0x010ae384: 0x10ae384: addiu a2, zero, 454
+// 0x010ae9cc: 0x10ae9cc: addiu a2, zero, 454
 	ldc.i4 454
 	stloc.3
-// 0x010ae388: 0x10ae388: addiu a0, zero, 2
+// 0x010ae9d0: 0x10ae9d0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010ae38c: 0x10ae38c: jal   0x100449c addiu a3, a3, 17164
+// 0x010ae9d4: 0x10ae9d4: jal   0x100449c addiu a3, a3, 17624
 	ldloc 4
-	ldc.i4 17164
+	ldc.i4 17624
 	add
 	stloc 4
 	ldloc.0
@@ -1044,24 +1044,24 @@ L_10ae37c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae394: 0x10ae394: addu  a0, s0, zero
+// 0x010ae9dc: 0x10ae9dc: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010ae398: 0x10ae398: addu  a1, s2, zero
+// 0x010ae9e0: 0x10ae9e0: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010ae39c: 0x10ae39c: j	 0x10ae36c addiu a2, zero, 1
+// 0x010ae9e4: 0x10ae9e4: j	 0x10ae9b4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-	br L_10ae36c
+	br L_10ae9b4
 // --- basic block ---
-L_10ae3a4:
-// 0x010ae3a4: 0x10ae3a4: addu  v0, zero, zero
+L_10ae9ec:
+// 0x010ae9ec: 0x10ae9ec: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10ae3a8:
-// 0x010ae3a8: 0x10ae3a8: lw    ra, 84(sp)
-// 0x010ae3ac: 0x10ae3ac: lw    s8, 80(sp)
+L_10ae9f0:
+// 0x010ae9f0: 0x10ae9f0: lw    ra, 84(sp)
+// 0x010ae9f4: 0x10ae9f4: lw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1070,7 +1070,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010ae3b0: 0x10ae3b0: lw    s7, 76(sp)
+// 0x010ae9f8: 0x10ae9f8: lw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1079,7 +1079,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ae3b4: 0x10ae3b4: lw    s6, 72(sp)
+// 0x010ae9fc: 0x10ae9fc: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1088,7 +1088,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ae3b8: 0x10ae3b8: lw    s5, 68(sp)
+// 0x010aea00: 0x10aea00: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1097,7 +1097,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ae3bc: 0x10ae3bc: lw    s4, 64(sp)
+// 0x010aea04: 0x10aea04: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1106,7 +1106,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ae3c0: 0x10ae3c0: lw    s3, 60(sp)
+// 0x010aea08: 0x10aea08: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1115,7 +1115,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ae3c4: 0x10ae3c4: lw    s2, 56(sp)
+// 0x010aea0c: 0x10aea0c: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1124,7 +1124,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ae3c8: 0x10ae3c8: lw    s1, 52(sp)
+// 0x010aea10: 0x10aea10: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1133,7 +1133,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ae3cc: 0x10ae3cc: lw    s0, 48(sp)
+// 0x010aea14: 0x10aea14: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1142,7 +1142,7 @@ L_10ae3a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ae3d0: 0x10ae3d0: jr    ra addiu sp, sp, 88
+// 0x010aea18: 0x10aea18: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -1154,7 +1154,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 find_line_break_10ae3d8(int32,int32,int32,int32,int32)
+.method public static int32 find_line_break_10aea20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s4,int32 t0,int32 s5,int32 s6,int32 s7,int32 s8,int32 s1,int32 s2,int32 s0,int32 s3,int32 lo,int32 ra)
@@ -1222,12 +1222,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ae3d8: 0x10ae3d8: addiu sp, sp, -472
+// 0x010aea20: 0x10aea20: addiu sp, sp, -472
 	ldloc.0
 	ldc.i4 -472
 	add
 	stloc.0
-// 0x010ae3dc: 0x10ae3dc: sw    s1, 436(sp)
+// 0x010aea24: 0x10aea24: sw    s1, 436(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1236,17 +1236,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ae3e0: 0x10ae3e0: subu  s1, a2, a0
+// 0x010aea28: 0x10aea28: subu  s1, a2, a0
 	ldloc.3
 	ldloc.1
 	sub
 	stloc 14
-// 0x010ae3e4: 0x10ae3e4: slti  v0, s1, 50
+// 0x010aea2c: 0x10aea2c: slti  v0, s1, 50
 	ldloc 14
 	ldc.i4.s 50
 	clt
 	stloc 6
-// 0x010ae3e8: 0x10ae3e8: sw    s8, 464(sp)
+// 0x010aea30: 0x10aea30: sw    s8, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1255,7 +1255,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ae3ec: 0x10ae3ec: sw    s7, 460(sp)
+// 0x010aea34: 0x10aea34: sw    s7, 460(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1264,7 +1264,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ae3f0: 0x10ae3f0: sw    s3, 444(sp)
+// 0x010aea38: 0x10aea38: sw    s3, 444(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1273,7 +1273,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010ae3f4: 0x10ae3f4: sw    s2, 440(sp)
+// 0x010aea3c: 0x10aea3c: sw    s2, 440(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1282,7 +1282,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010ae3f8: 0x10ae3f8: sw    s0, 432(sp)
+// 0x010aea40: 0x10aea40: sw    s0, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1291,8 +1291,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010ae3fc: 0x10ae3fc: sw    ra, 468(sp)
-// 0x010ae400: 0x10ae400: sw    s6, 456(sp)
+// 0x010aea44: 0x10aea44: sw    ra, 468(sp)
+// 0x010aea48: 0x10aea48: sw    s6, 456(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1301,7 +1301,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ae404: 0x10ae404: sw    s5, 452(sp)
+// 0x010aea4c: 0x10aea4c: sw    s5, 452(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1310,7 +1310,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae408: 0x10ae408: sw    s4, 448(sp)
+// 0x010aea50: 0x10aea50: sw    s4, 448(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1319,16 +1319,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ae40c: 0x10ae40c: addu  s0, a0, zero
+// 0x010aea54: 0x10aea54: addu  s0, a0, zero
 	ldloc.1
 	stloc 16
-// 0x010ae410: 0x10ae410: addu  s3, a2, zero
+// 0x010aea58: 0x10aea58: addu  s3, a2, zero
 	ldloc.3
 	stloc 17
-// 0x010ae414: 0x10ae414: addu  s2, a1, zero
+// 0x010aea5c: 0x10aea5c: addu  s2, a1, zero
 	ldloc.2
 	stloc 15
-// 0x010ae418: 0x10ae418: lw    s7, 488(sp)
+// 0x010aea60: 0x10aea60: lw    s7, 488(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1337,32 +1337,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ae41c: 0x10ae41c: beq   v0, zero, 0x10ae588 addu  s8, a3, zero
+// 0x010aea64: 0x10aea64: beq   v0, zero, 0x10aebd0 addu  s8, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 13
-	brfalse L_10ae588
+	brfalse L_10aebd0
 // --- basic block ---
-// 0x010ae424: 0x10ae424: addiu s6, sp, 16
+// 0x010aea6c: 0x10aea6c: addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 11
-// 0x010ae428: 0x10ae428: addu  s4, a0, zero
+// 0x010aea70: 0x10aea70: addu  s4, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010ae42c: 0x10ae42c: j	 0x10ae4d4 addu  s5, zero, zero
+// 0x010aea74: 0x10aea74: j	 0x10aeb1c addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_10ae4d4
+	br L_10aeb1c
 // --- basic block ---
-L_10ae434:
-// 0x010ae434: 0x10ae434: jal   0x10b07a0 sll   zero, zero, 0
+L_10aea7c:
+// 0x010aea7c: 0x10aea7c: jal   0x10b0de8 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 6
 // --- basic block ---
-// 0x010ae43c: 0x10ae43c: lw    a0, 416(sp)
+// 0x010aea84: 0x10aea84: lw    a0, 416(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1371,7 +1371,7 @@ L_10ae434:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae440: 0x10ae440: jal   0x10b07a0 sw    v0, 428(sp)
+// 0x010aea88: 0x10aea88: jal   0x10b0de8 sw    v0, 428(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1381,10 +1381,10 @@ L_10ae434:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 6
 // --- basic block ---
-// 0x010ae448: 0x10ae448: lw    v1, 428(sp)
+// 0x010aea90: 0x10aea90: lw    v1, 428(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1393,10 +1393,10 @@ L_10ae434:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ae44c: 0x10ae44c: addu  a1, v0, zero
+// 0x010aea94: 0x10aea94: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010ae450: 0x10ae450: jal   0x1009824 addu  a0, v1, zero
+// 0x010aea98: 0x10aea98: jal   0x1009834 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1404,18 +1404,18 @@ L_10ae434:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ae458: 0x10ae458: addu  a1, v0, zero
+// 0x010aeaa0: 0x10aeaa0: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010ae45c: 0x10ae45c: addu  a0, s2, zero
+// 0x010aeaa4: 0x10aeaa4: addu  a0, s2, zero
 	ldloc 15
 	stloc.1
-// 0x010ae460: 0x10ae460: jal   0x1008410 sw    v0, 420(sp)
+// 0x010aeaa8: 0x10aeaa8: jal   0x1008420 sw    v0, 420(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1426,25 +1426,25 @@ L_10ae434:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010ae468: 0x10ae468: addu  v1, v0, zero
+// 0x010aeab0: 0x10aeab0: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x010ae46c: 0x10ae46c: addiu a0, s4, -1
+// 0x010aeab4: 0x10aeab4: addiu a0, s4, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010ae470: 0x10ae470: beq   s4, s0, 0x10ae4a4 addu  v0, s2, zero
+// 0x010aeab8: 0x10aeab8: beq   s4, s0, 0x10aeaec addu  v0, s2, zero
 	ldloc 8
 	ldloc 16
 	ldloc 15
 	stloc 6
-	beq  L_10ae4a4
+	beq  L_10aeaec
 // --- basic block ---
-// 0x010ae478: 0x10ae478: jal   0x10b07a0 sw    v1, 428(sp)
+// 0x010aeac0: 0x10aeac0: jal   0x10b0de8 sw    v1, 428(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1454,13 +1454,13 @@ L_10ae434:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 6
 // --- basic block ---
-// 0x010ae480: 0x10ae480: addu  a0, s4, zero
+// 0x010aeac8: 0x10aeac8: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x010ae484: 0x10ae484: jal   0x10b07a0 sw    v0, 424(sp)
+// 0x010aeacc: 0x10aeacc: jal   0x10b0de8 sw    v0, 424(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1470,10 +1470,10 @@ L_10ae434:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 6
 // --- basic block ---
-// 0x010ae48c: 0x10ae48c: lw    a1, 424(sp)
+// 0x010aead4: 0x10aead4: lw    a1, 424(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1482,11 +1482,11 @@ L_10ae434:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ae490: 0x10ae490: sll   zero, zero, 0
-// 0x010ae494: 0x10ae494: addu  a0, a1, zero
+// 0x010aead8: 0x10aead8: sll   zero, zero, 0
+// 0x010aeadc: 0x10aeadc: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010ae498: 0x10ae498: jal   0x1009824 addu  a1, v0, zero
+// 0x010aeae0: 0x10aeae0: jal   0x1009834 addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -1494,12 +1494,12 @@ L_10ae434:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010ae4a0: 0x10ae4a0: lw    v1, 428(sp)
+// 0x010aeae8: 0x10aeae8: lw    v1, 428(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1508,16 +1508,16 @@ L_10ae434:
 	add
 	ldelem.i4
 	stloc 7
-L_10ae4a4:
-// 0x010ae4a4: 0x10ae4a4: addu  a0, v0, zero
+L_10aeaec:
+// 0x010aeaec: 0x10aeaec: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010ae4a8: 0x10ae4a8: slt   v0, s5, v1
+// 0x010aeaf0: 0x10aeaf0: slt   v0, s5, v1
 	ldloc 10
 	ldloc 7
 	clt
 	stloc 6
-// 0x010ae4ac: 0x10ae4ac: lw    a1, 420(sp)
+// 0x010aeaf4: 0x10aeaf4: lw    a1, 420(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1526,28 +1526,28 @@ L_10ae4a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ae4b0: 0x10ae4b0: beq   v0, zero, 0x10ae4bc sll   zero, zero, 0
+// 0x010aeaf8: 0x10aeaf8: beq   v0, zero, 0x10aeb04 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10ae4bc
+	brfalse L_10aeb04
 // --- basic block ---
-// 0x010ae4b8: 0x10ae4b8: addu  s5, v1, zero
+// 0x010aeb00: 0x10aeb00: addu  s5, v1, zero
 	ldloc 7
 	stloc 10
-L_10ae4bc:
-// 0x010ae4bc: 0x10ae4bc: jal   0x1008410 sll   zero, zero, 0
+L_10aeb04:
+// 0x010aeb04: 0x10aeb04: jal   0x1008420 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010ae4c4: 0x10ae4c4: sw    s4, 0(s6)
+// 0x010aeb0c: 0x10aeb0c: sw    s4, 0(s6)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x010ae4c8: 0x10ae4c8: lw    s4, 416(sp)
+// 0x010aeb10: 0x10aeb10: lw    s4, 416(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1556,7 +1556,7 @@ L_10ae4bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ae4cc: 0x10ae4cc: sw    v0, 4(s6)
+// 0x010aeb14: 0x10aeb14: sw    v0, 4(s6)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1565,18 +1565,18 @@ L_10ae4bc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010ae4d0: 0x10ae4d0: addiu s6, s6, 8
+// 0x010aeb18: 0x10aeb18: addiu s6, s6, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 11
-L_10ae4d4:
-// 0x010ae4d4: 0x10ae4d4: addiu v0, s4, 1
+L_10aeb1c:
+// 0x010aeb1c: 0x10aeb1c: addiu v0, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010ae4d8: 0x10ae4d8: sw    v0, 416(sp)
+// 0x010aeb20: 0x10aeb20: sw    v0, 416(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1585,29 +1585,29 @@ L_10ae4d4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010ae4dc: 0x10ae4dc: slt   v0, s3, s4
+// 0x010aeb24: 0x10aeb24: slt   v0, s3, s4
 	ldloc 17
 	ldloc 8
 	clt
 	stloc 6
-// 0x010ae4e0: 0x10ae4e0: beq   v0, zero, 0x10ae434 addu  a0, s4, zero
+// 0x010aeb28: 0x10aeb28: beq   v0, zero, 0x10aea7c addu  a0, s4, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
-	brfalse L_10ae434
+	brfalse L_10aea7c
 // --- basic block ---
-// 0x010ae4e8: 0x10ae4e8: slti  v0, s5, 46
+// 0x010aeb30: 0x10aeb30: slti  v0, s5, 46
 	ldloc 10
 	ldc.i4.s 46
 	clt
 	stloc 6
-// 0x010ae4ec: 0x10ae4ec: bne   v0, zero, 0x10ae588 addiu v1, zero, 1
+// 0x010aeb34: 0x10aeb34: bne   v0, zero, 0x10aebd0 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 7
-	brtrue L_10ae588
+	brtrue L_10aebd0
 // --- basic block ---
-// 0x010ae4f4: 0x10ae4f4: lw    v0, 16(sp)
+// 0x010aeb3c: 0x10aeb3c: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1616,7 +1616,7 @@ L_10ae4d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010ae4f8: 0x10ae4f8: lw    a0, 20(sp)
+// 0x010aeb40: 0x10aeb40: lw    a0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1625,36 +1625,36 @@ L_10ae4d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae4fc: 0x10ae4fc: sw    v0, 0(s8)
+// 0x010aeb44: 0x10aeb44: sw    v0, 0(s8)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010ae500: 0x10ae500: addiu a1, zero, 100
+// 0x010aeb48: 0x10aeb48: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010ae504: 0x10ae504: sw    v0, 0(s7)
+// 0x010aeb4c: 0x10aeb4c: sw    v0, 0(s7)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010ae508: 0x10ae508: j	 0x10ae55c addiu v0, sp, 28
+// 0x010aeb50: 0x10aeb50: j	 0x10aeba4 addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 6
-	br L_10ae55c
+	br L_10aeba4
 // --- basic block ---
-L_10ae510:
-// 0x010ae510: 0x10ae510: bne   a2, zero, 0x10ae590 sll   zero, zero, 0
+L_10aeb58:
+// 0x010aeb58: 0x10aeb58: bne   a2, zero, 0x10aebd8 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10ae590
+	brtrue L_10aebd8
 // --- basic block ---
-// 0x010ae518: 0x10ae518: lw    a2, -4(v0)
+// 0x010aeb60: 0x10aeb60: lw    a2, -4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1663,129 +1663,129 @@ L_10ae510:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ae51c: 0x10ae51c: lw    t0, 0(s8)
+// 0x010aeb64: 0x10aeb64: lw    t0, 0(s8)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010ae520: 0x10ae520: lw    a3, 0(v0)
+// 0x010aeb68: 0x10aeb68: lw    a3, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010ae524: 0x10ae524: slt   t0, a2, t0
+// 0x010aeb6c: 0x10aeb6c: slt   t0, a2, t0
 	ldloc.3
 	ldloc 9
 	clt
 	stloc 9
-// 0x010ae528: 0x10ae528: beq   t0, zero, 0x10ae538 sll   zero, zero, 0
+// 0x010aeb70: 0x10aeb70: beq   t0, zero, 0x10aeb80 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10ae538
+	brfalse L_10aeb80
 // --- basic block ---
-// 0x010ae530: 0x10ae530: j	 0x10ae550 sw    a2, 0(s8)
+// 0x010aeb78: 0x10aeb78: j	 0x10aeb98 sw    a2, 0(s8)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-	br L_10ae550
+	br L_10aeb98
 // --- basic block ---
-L_10ae538:
-// 0x010ae538: 0x10ae538: lw    t0, 0(s7)
+L_10aeb80:
+// 0x010aeb80: 0x10aeb80: lw    t0, 0(s7)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010ae53c: 0x10ae53c: sll   zero, zero, 0
-// 0x010ae540: 0x10ae540: slt   t0, t0, a2
+// 0x010aeb84: 0x10aeb84: sll   zero, zero, 0
+// 0x010aeb88: 0x10aeb88: slt   t0, t0, a2
 	ldloc 9
 	ldloc.3
 	clt
 	stloc 9
-// 0x010ae544: 0x10ae544: beq   t0, zero, 0x10ae550 sll   zero, zero, 0
+// 0x010aeb8c: 0x10aeb8c: beq   t0, zero, 0x10aeb98 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10ae550
+	brfalse L_10aeb98
 // --- basic block ---
-// 0x010ae54c: 0x10ae54c: sw    a2, 0(s7)
+// 0x010aeb94: 0x10aeb94: sw    a2, 0(s7)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-L_10ae550:
-// 0x010ae550: 0x10ae550: addu  a0, a0, a3
+L_10aeb98:
+// 0x010aeb98: 0x10aeb98: addu  a0, a0, a3
 	ldloc.1
 	ldloc 4
 	add
 	stloc.1
-// 0x010ae554: 0x10ae554: addiu v1, v1, 1
+// 0x010aeb9c: 0x10aeb9c: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010ae558: 0x10ae558: addiu v0, v0, 8
+// 0x010aeba0: 0x10aeba0: addiu v0, v0, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-L_10ae55c:
-// 0x010ae55c: 0x10ae55c: mult  a0, a1
+L_10aeba4:
+// 0x010aeba4: 0x10aeba4: mult  a0, a1
 	ldloc.1
 	ldloc.2
 	mul
 	stloc 18
-// 0x010ae560: 0x10ae560: mflo  lo
+// 0x010aeba8: 0x10aeba8: mflo  lo
 	ldloc 18
 	stloc 4
-// 0x010ae564: 0x10ae564: sll   zero, zero, 0
-// 0x010ae568: 0x10ae568: sll   zero, zero, 0
-// 0x010ae56c: 0x10ae56c: div   a3, s5
+// 0x010aebac: 0x10aebac: sll   zero, zero, 0
+// 0x010aebb0: 0x10aebb0: sll   zero, zero, 0
+// 0x010aebb4: 0x10aebb4: div   a3, s5
 	ldloc 4
 	ldloc 10
 	div
 	stloc 18
-// 0x010ae570: 0x10ae570: mflo  lo
+// 0x010aebb8: 0x10aebb8: mflo  lo
 	ldloc 18
 	stloc 9
-// 0x010ae574: 0x10ae574: slti  a3, t0, 70
+// 0x010aebbc: 0x10aebbc: slti  a3, t0, 70
 	ldloc 9
 	ldc.i4.s 70
 	clt
 	stloc 4
-// 0x010ae578: 0x10ae578: bne   a3, zero, 0x10ae510 slt   a2, s1, v1
+// 0x010aebc0: 0x10aebc0: bne   a3, zero, 0x10aeb58 slt   a2, s1, v1
 	ldloc 4
 	ldloc 14
 	ldloc 7
 	clt
 	stloc.3
-	brtrue L_10ae510
+	brtrue L_10aeb58
 // --- basic block ---
-// 0x010ae580: 0x10ae580: j	 0x10ae594 addiu v0, zero, 1
+// 0x010aebc8: 0x10aebc8: j	 0x10aebdc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10ae594
+	br L_10aebdc
 // --- basic block ---
-L_10ae588:
-// 0x010ae588: 0x10ae588: j	 0x10ae594 addu  v0, zero, zero
+L_10aebd0:
+// 0x010aebd0: 0x10aebd0: j	 0x10aebdc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10ae594
+	br L_10aebdc
 // --- basic block ---
-L_10ae590:
-// 0x010ae590: 0x10ae590: addiu v0, zero, 1
+L_10aebd8:
+// 0x010aebd8: 0x10aebd8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_10ae594:
-// 0x010ae594: 0x10ae594: lw    ra, 468(sp)
-// 0x010ae598: 0x10ae598: lw    s8, 464(sp)
+L_10aebdc:
+// 0x010aebdc: 0x10aebdc: lw    ra, 468(sp)
+// 0x010aebe0: 0x10aebe0: lw    s8, 464(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1794,7 +1794,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ae59c: 0x10ae59c: lw    s7, 460(sp)
+// 0x010aebe4: 0x10aebe4: lw    s7, 460(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1803,7 +1803,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ae5a0: 0x10ae5a0: lw    s6, 456(sp)
+// 0x010aebe8: 0x10aebe8: lw    s6, 456(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1812,7 +1812,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ae5a4: 0x10ae5a4: lw    s5, 452(sp)
+// 0x010aebec: 0x10aebec: lw    s5, 452(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1821,7 +1821,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ae5a8: 0x10ae5a8: lw    s4, 448(sp)
+// 0x010aebf0: 0x10aebf0: lw    s4, 448(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1830,7 +1830,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ae5ac: 0x10ae5ac: lw    s3, 444(sp)
+// 0x010aebf4: 0x10aebf4: lw    s3, 444(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1839,7 +1839,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010ae5b0: 0x10ae5b0: lw    s2, 440(sp)
+// 0x010aebf8: 0x10aebf8: lw    s2, 440(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1848,7 +1848,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ae5b4: 0x10ae5b4: lw    s1, 436(sp)
+// 0x010aebfc: 0x10aebfc: lw    s1, 436(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1857,7 +1857,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ae5b8: 0x10ae5b8: lw    s0, 432(sp)
+// 0x010aec00: 0x10aec00: lw    s0, 432(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1866,7 +1866,7 @@ L_10ae594:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010ae5bc: 0x10ae5bc: jr    ra addiu sp, sp, 472
+// 0x010aec04: 0x10aec04: jr    ra addiu sp, sp, 472
 	ldloc.0
 	ldc.i4 472
 	add
@@ -1878,7 +1878,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 detect_road_segment_10ae5c4(int32,int32,int32,int32,int32)
+.method public static int32 detect_road_segment_10aec0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s0,int32 s3,int32 s1,int32 s5,int32 s6,int32 s7,int32 s2,int32 s8,int32 lo,int32 ra)
@@ -1943,12 +1943,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ae5c4: 0x10ae5c4: addiu sp, sp, -96
+// 0x010aec0c: 0x10aec0c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010ae5c8: 0x10ae5c8: lw    v0, 112(sp)
+// 0x010aec10: 0x10aec10: lw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1957,7 +1957,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ae5cc: 0x10ae5cc: sw    s3, 68(sp)
+// 0x010aec14: 0x10aec14: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1966,12 +1966,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae5d0: 0x10ae5d0: andi  v0, v0, 2
+// 0x010aec18: 0x10aec18: andi  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	and
 	stloc 5
-// 0x010ae5d4: 0x10ae5d4: sw    s2, 64(sp)
+// 0x010aec1c: 0x10aec1c: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1980,7 +1980,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010ae5d8: 0x10ae5d8: sw    s1, 60(sp)
+// 0x010aec20: 0x10aec20: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1989,7 +1989,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ae5dc: 0x10ae5dc: sw    s0, 56(sp)
+// 0x010aec24: 0x10aec24: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1998,8 +1998,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae5e0: 0x10ae5e0: sw    ra, 92(sp)
-// 0x010ae5e4: 0x10ae5e4: sw    s8, 88(sp)
+// 0x010aec28: 0x10aec28: sw    ra, 92(sp)
+// 0x010aec2c: 0x10aec2c: sw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2008,7 +2008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010ae5e8: 0x10ae5e8: sw    s7, 84(sp)
+// 0x010aec30: 0x10aec30: sw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2017,7 +2017,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ae5ec: 0x10ae5ec: sw    s6, 80(sp)
+// 0x010aec34: 0x10aec34: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2026,7 +2026,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ae5f0: 0x10ae5f0: sw    s5, 76(sp)
+// 0x010aec38: 0x10aec38: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2035,7 +2035,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ae5f4: 0x10ae5f4: sw    s4, 72(sp)
+// 0x010aec3c: 0x10aec3c: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2044,61 +2044,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ae5f8: 0x10ae5f8: addu  s0, a0, zero
+// 0x010aec40: 0x10aec40: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010ae5fc: 0x10ae5fc: addu  s3, a1, zero
+// 0x010aec44: 0x10aec44: addu  s3, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010ae600: 0x10ae600: addu  s1, a2, zero
+// 0x010aec48: 0x10aec48: addu  s1, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010ae604: 0x10ae604: beq   v0, zero, 0x10ae610 addiu s2, zero, 1
+// 0x010aec4c: 0x10aec4c: beq   v0, zero, 0x10aec58 addiu s2, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 15
-	brfalse L_10ae610
+	brfalse L_10aec58
 // --- basic block ---
-// 0x010ae60c: 0x10ae60c: addiu s2, zero, 4
+// 0x010aec54: 0x10aec54: addiu s2, zero, 4
 	ldc.i4.4
 	stloc 15
-L_10ae610:
-// 0x010ae610: 0x10ae610: slti  v0, s0, 5
+L_10aec58:
+// 0x010aec58: 0x10aec58: slti  v0, s0, 5
 	ldloc 9
 	ldc.i4.5
 	clt
 	stloc 5
-// 0x010ae614: 0x10ae614: bne   v0, zero, 0x10ae76c lui   v1, 0x7fff0000
+// 0x010aec5c: 0x10aec5c: bne   v0, zero, 0x10aedb4 lui   v1, 0x7fff0000
 	ldloc 5
 	ldc.i4 2147418112
 	stloc 7
-	brtrue L_10ae76c
+	brtrue L_10aedb4
 // --- basic block ---
-// 0x010ae61c: 0x10ae61c: addiu v0, s0, -1
+// 0x010aec64: 0x10aec64: addiu v0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010ae620: 0x10ae620: addiu a1, sp, 32
+// 0x010aec68: 0x10aec68: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010ae624: 0x10ae624: ori   v1, v1, 65535
+// 0x010aec6c: 0x10aec6c: ori   v1, v1, 65535
 	ldloc 7
 	ldc.i4 65535
 	or
 	stloc 7
-// 0x010ae628: 0x10ae628: addu  s5, zero, zero
+// 0x010aec70: 0x10aec70: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010ae62c: 0x10ae62c: addu  s8, zero, zero
+// 0x010aec74: 0x10aec74: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 16
-// 0x010ae630: 0x10ae630: addu  s4, zero, zero
+// 0x010aec78: 0x10aec78: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010ae634: 0x10ae634: sw    v0, 40(sp)
+// 0x010aec7c: 0x10aec7c: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2107,7 +2107,7 @@ L_10ae610:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ae638: 0x10ae638: j	 0x10ae6cc sw    a1, 48(sp)
+// 0x010aec80: 0x10aec80: j	 0x10aed14 sw    a1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2116,10 +2116,10 @@ L_10ae610:
 	add
 	ldloc.2
 	stelem.i4
-	br L_10ae6cc
+	br L_10aed14
 // --- basic block ---
-L_10ae640:
-// 0x010ae640: 0x10ae640: jal   0x10b07a0 sw    v1, 44(sp)
+L_10aec88:
+// 0x010aec88: 0x10aec88: jal   0x10b0de8 sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2129,23 +2129,23 @@ L_10ae640:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae648: 0x10ae648: addu  a0, s6, zero
+// 0x010aec90: 0x10aec90: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010ae64c: 0x10ae64c: jal   0x10b07a0 addu  s7, v0, zero
+// 0x010aec94: 0x10aec94: jal   0x10b0de8 addu  s7, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae654: 0x10ae654: addu  a0, v0, zero
+// 0x010aec9c: 0x10aec9c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ae658: 0x10ae658: lw    a2, 48(sp)
+// 0x010aeca0: 0x10aeca0: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2154,26 +2154,26 @@ L_10ae640:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ae65c: 0x10ae65c: addu  a1, zero, zero
+// 0x010aeca4: 0x10aeca4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ae660: 0x10ae660: cibyl_sysc_arg 0x13
+// 0x010aeca8: 0x10aeca8: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x010ae664: 0x10ae664: cibyl_sysc_arg 0x17
+// 0x010aecac: 0x10aecac: cibyl_sysc_arg 0x17
 	ldloc 14
-// 0x010ae668: 0x10ae668: cibyl_sysc_arg 0x4
+// 0x010aecb0: 0x10aecb0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010ae66c: 0x10ae66c: cibyl_sysc_arg 0x6
+// 0x010aecb4: 0x10aecb4: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x010ae670: 0x10ae670: cibyl_sysc_arg 0x5
+// 0x010aecb8: 0x10aecb8: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010ae674: 0x10ae674: cibyl_sysc 0x22db
+// 0x010aecbc: 0x10aecbc: cibyl_sysc 0x22db
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010ae678: 0x10ae678: addu  s7, v0, zero
+// 0x010aecc0: 0x10aecc0: addu  s7, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010ae67c: 0x10ae67c: lw    v1, 44(sp)
+// 0x010aecc4: 0x10aecc4: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2182,46 +2182,46 @@ L_10ae640:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ae680: 0x10ae680: sll   zero, zero, 0
-// 0x010ae684: 0x10ae684: slt   v0, s7, v1
+// 0x010aecc8: 0x10aecc8: sll   zero, zero, 0
+// 0x010aeccc: 0x10aeccc: slt   v0, s7, v1
 	ldloc 14
 	ldloc 7
 	clt
 	stloc 5
-// 0x010ae688: 0x10ae688: bne   v0, zero, 0x10ae69c sll   zero, zero, 0
+// 0x010aecd0: 0x10aecd0: bne   v0, zero, 0x10aece4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ae69c
+	brtrue L_10aece4
 // --- basic block ---
-// 0x010ae690: 0x10ae690: addu  s4, s5, zero
+// 0x010aecd8: 0x10aecd8: addu  s4, s5, zero
 	ldloc 12
 	stloc 8
-// 0x010ae694: 0x10ae694: j	 0x10ae6c0 addu  s7, v1, zero
+// 0x010aecdc: 0x10aecdc: j	 0x10aed08 addu  s7, v1, zero
 	ldloc 7
 	stloc 14
-	br L_10ae6c0
+	br L_10aed08
 // --- basic block ---
-L_10ae69c:
-// 0x010ae69c: 0x10ae69c: jal   0x10b07a0 addu  a0, s4, zero
+L_10aece4:
+// 0x010aece4: 0x10aece4: jal   0x10b0de8 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae6a4: 0x10ae6a4: addu  a0, s6, zero
+// 0x010aecec: 0x10aecec: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010ae6a8: 0x10ae6a8: jal   0x10b07a0 addu  s5, v0, zero
+// 0x010aecf0: 0x10aecf0: jal   0x10b0de8 addu  s5, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae6b0: 0x10ae6b0: addu  a1, v0, zero
+// 0x010aecf8: 0x10aecf8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae6b4: 0x10ae6b4: jal   0x1009824 addu  a0, s5, zero
+// 0x010aecfc: 0x10aecfc: jal   0x1009834 addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -2229,26 +2229,26 @@ L_10ae69c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae6bc: 0x10ae6bc: addu  s8, v0, zero
+// 0x010aed04: 0x10aed04: addu  s8, v0, zero
 	ldloc 5
 	stloc 16
-L_10ae6c0:
-// 0x010ae6c0: 0x10ae6c0: addu  s5, s4, zero
+L_10aed08:
+// 0x010aed08: 0x10aed08: addu  s5, s4, zero
 	ldloc 8
 	stloc 12
-// 0x010ae6c4: 0x10ae6c4: addu  v1, s7, zero
+// 0x010aed0c: 0x10aed0c: addu  v1, s7, zero
 	ldloc 14
 	stloc 7
-// 0x010ae6c8: 0x10ae6c8: addu  s4, s6, zero
+// 0x010aed10: 0x10aed10: addu  s4, s6, zero
 	ldloc 13
 	stloc 8
-L_10ae6cc:
-// 0x010ae6cc: 0x10ae6cc: lw    a2, 40(sp)
+L_10aed14:
+// 0x010aed14: 0x10aed14: lw    a2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2257,23 +2257,23 @@ L_10ae6cc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ae6d0: 0x10ae6d0: addu  a0, s4, zero
+// 0x010aed18: 0x10aed18: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x010ae6d4: 0x10ae6d4: slt   v0, s4, a2
+// 0x010aed1c: 0x10aed1c: slt   v0, s4, a2
 	ldloc 8
 	ldloc.3
 	clt
 	stloc 5
-// 0x010ae6d8: 0x10ae6d8: bne   v0, zero, 0x10ae640 addiu s6, s4, 1
+// 0x010aed20: 0x10aed20: bne   v0, zero, 0x10aec88 addiu s6, s4, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 13
-	brtrue L_10ae640
+	brtrue L_10aec88
 // --- basic block ---
-// 0x010ae6e0: 0x10ae6e0: jal   0x10b0f9c sw    v1, 44(sp)
+// 0x010aed28: 0x10aed28: jal   0x10b15e4 sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2287,12 +2287,12 @@ L_10ae6cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae6e8: 0x10ae6e8: lw    v1, 44(sp)
+// 0x010aed30: 0x10aed30: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2301,19 +2301,19 @@ L_10ae6cc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ae6ec: 0x10ae6ec: sll   zero, zero, 0
-// 0x010ae6f0: 0x10ae6f0: slt   v0, v1, v0
+// 0x010aed34: 0x10aed34: sll   zero, zero, 0
+// 0x010aed38: 0x10aed38: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010ae6f4: 0x10ae6f4: beq   v0, zero, 0x10ae778 addiu v0, zero, 1
+// 0x010aed3c: 0x10aed3c: beq   v0, zero, 0x10aedc0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_10ae778
+	brfalse L_10aedc0
 // --- basic block ---
-// 0x010ae6fc: 0x10ae6fc: lw    a1, 16(s3)
+// 0x010aed44: 0x10aed44: lw    a1, 16(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2322,29 +2322,29 @@ L_10ae6cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ae700: 0x10ae700: jal   0x1008410 addu  a0, s8, zero
+// 0x010aed48: 0x10aed48: jal   0x1008420 addu  a0, s8, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae708: 0x10ae708: slti  v0, v0, 10
+// 0x010aed50: 0x10aed50: slti  v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt
 	stloc 5
-// 0x010ae70c: 0x10ae70c: beq   v0, zero, 0x10ae778 addiu v0, zero, 1
+// 0x010aed54: 0x10aed54: beq   v0, zero, 0x10aedc0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_10ae778
+	brfalse L_10aedc0
 // --- basic block ---
-// 0x010ae714: 0x10ae714: addu  a0, s5, zero
+// 0x010aed5c: 0x10aed5c: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x010ae718: 0x10ae718: jal   0x10aee14 addu  a1, s0, zero
+// 0x010aed60: 0x10aed60: jal   0x10af45c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -2352,15 +2352,15 @@ L_10ae6cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_length_10aee14(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_length_10af45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae720: 0x10ae720: addu  s4, v0, zero
+// 0x010aed68: 0x10aed68: addu  s4, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010ae724: 0x10ae724: jal   0x10b0f9c addiu s3, zero, 3
+// 0x010aed6c: 0x10aed6c: jal   0x10b15e4 addiu s3, zero, 3
 	ldc.i4.3
 	stloc 10
 	ldloc.0
@@ -2368,61 +2368,61 @@ L_10ae6cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae72c: 0x10ae72c: mult  v0, s3
+// 0x010aed74: 0x10aed74: mult  v0, s3
 	ldloc 5
 	ldloc 10
 	mul
 	stloc 17
-// 0x010ae730: 0x10ae730: mflo  lo
+// 0x010aed78: 0x10aed78: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x010ae734: 0x10ae734: slt   v0, s4, v0
+// 0x010aed7c: 0x10aed7c: slt   v0, s4, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010ae738: 0x10ae738: bne   v0, zero, 0x10ae760 sll   zero, zero, 0
+// 0x010aed80: 0x10aed80: bne   v0, zero, 0x10aeda8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ae760
+	brtrue L_10aeda8
 // --- basic block ---
-// 0x010ae740: 0x10ae740: jal   0x10b0f9c sll   zero, zero, 0
+// 0x010aed88: 0x10aed88: jal   0x10b15e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae748: 0x10ae748: addiu v1, zero, 20
+// 0x010aed90: 0x10aed90: addiu v1, zero, 20
 	ldc.i4.s 20
 	stloc 7
-// 0x010ae74c: 0x10ae74c: mult  v0, v1
+// 0x010aed94: 0x10aed94: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 17
-// 0x010ae750: 0x10ae750: mflo  lo
+// 0x010aed98: 0x10aed98: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x010ae754: 0x10ae754: slt   s4, v1, s4
+// 0x010aed9c: 0x10aed9c: slt   s4, v1, s4
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 8
-// 0x010ae758: 0x10ae758: beq   s4, zero, 0x10ae964 sll   zero, zero, 0
+// 0x010aeda0: 0x10aeda0: beq   s4, zero, 0x10aefac sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10ae964
+	brfalse L_10aefac
 // --- basic block ---
-L_10ae760:
-// 0x010ae760: 0x10ae760: sw    s0, 4(s1)
+L_10aeda8:
+// 0x010aeda8: 0x10aeda8: sw    s0, 4(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2431,37 +2431,37 @@ L_10ae760:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae764: 0x10ae764: j	 0x10ae82c sw    s2, 0(s1)
+// 0x010aedac: 0x10aedac: j	 0x10aee74 sw    s2, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 15
 	stelem.i4
-	br L_10ae82c
+	br L_10aee74
 // --- basic block ---
-L_10ae76c:
-// 0x010ae76c: 0x10ae76c: beq   s0, zero, 0x10ae934 addu  v0, zero, zero
+L_10aedb4:
+// 0x010aedb4: 0x10aedb4: beq   s0, zero, 0x10aef7c addu  v0, zero, zero
 	ldloc 9
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10ae934
+	brfalse L_10aef7c
 // --- basic block ---
-// 0x010ae774: 0x10ae774: addiu v0, zero, 1
+// 0x010aedbc: 0x10aedbc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10ae778:
-// 0x010ae778: 0x10ae778: bne   s0, v0, 0x10ae7b0 lui   s5, 0x0
+L_10aedc0:
+// 0x010aedc0: 0x10aedc0: bne   s0, v0, 0x10aedf8 lui   s5, 0x0
 	ldloc 9
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	bne.un L_10ae7b0
+	bne.un L_10aedf8
 // --- basic block ---
-// 0x010ae780: 0x10ae780: addu  a0, zero, zero
+// 0x010aedc8: 0x10aedc8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010ae784: 0x10ae784: jal   0x10b07a0 sw    s0, 18900(s5)
+// 0x010aedcc: 0x10aedcc: jal   0x10b0de8 sw    s0, 18900(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2471,23 +2471,23 @@ L_10ae778:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae78c: 0x10ae78c: addiu a0, zero, 1
+// 0x010aedd4: 0x10aedd4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010ae790: 0x10ae790: jal   0x10b07a0 addu  s0, v0, zero
+// 0x010aedd8: 0x10aedd8: jal   0x10b0de8 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae798: 0x10ae798: addu  a1, v0, zero
+// 0x010aede0: 0x10aede0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae79c: 0x10ae79c: jal   0x1009824 addu  a0, s0, zero
+// 0x010aede4: 0x10aede4: jal   0x1009834 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2495,27 +2495,27 @@ L_10ae778:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae7a4: 0x10ae7a4: lui   v1, 0x90000
+// 0x010aedec: 0x10aedec: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010ae7a8: 0x10ae7a8: j	 0x10ae930 sw    v0, -12364(v1)
+// 0x010aedf0: 0x10aedf0: j	 0x10aef78 sw    v0, -11900(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3091
+	ldc.i4 -2975
 	add
 	ldloc 5
 	stelem.i4
-	br L_10ae930
+	br L_10aef78
 // --- basic block ---
-L_10ae7b0:
-// 0x010ae7b0: 0x10ae7b0: lw    s4, 18900(s5)
+L_10aedf8:
+// 0x010aedf8: 0x10aedf8: lw    s4, 18900(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2524,40 +2524,40 @@ L_10ae7b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ae7b4: 0x10ae7b4: addiu s6, s0, -1
+// 0x010aedfc: 0x10aedfc: addiu s6, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 13
-// 0x010ae7b8: 0x10ae7b8: bne   s4, s6, 0x10ae834 sll   zero, zero, 0
+// 0x010aee00: 0x10aee00: bne   s4, s6, 0x10aee7c sll   zero, zero, 0
 	ldloc 8
 	ldloc 13
-	bne.un L_10ae834
+	bne.un L_10aee7c
 // --- basic block ---
-// 0x010ae7c0: 0x10ae7c0: jal   0x10b07a0 addu  a0, s4, zero
+// 0x010aee08: 0x10aee08: jal   0x10b0de8 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae7c8: 0x10ae7c8: addu  a0, s0, zero
+// 0x010aee10: 0x10aee10: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010ae7cc: 0x10ae7cc: jal   0x10b07a0 addu  s7, v0, zero
+// 0x010aee14: 0x10aee14: jal   0x10b0de8 addu  s7, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae7d4: 0x10ae7d4: addu  a1, v0, zero
+// 0x010aee1c: 0x10aee1c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae7d8: 0x10ae7d8: addu  a0, s7, zero
+// 0x010aee20: 0x10aee20: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x010ae7dc: 0x10ae7dc: jal   0x1009824 lui   s7, 0x90000
+// 0x010aee24: 0x10aee24: jal   0x1009834 lui   s7, 0x90000
 	ldc.i4 589824
 	stloc 14
 	ldloc.0
@@ -2565,45 +2565,45 @@ L_10ae7b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae7e4: 0x10ae7e4: lw    a1, -12364(s7)
+// 0x010aee2c: 0x10aee2c: lw    a1, -11900(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3091
+	ldc.i4 -2975
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ae7e8: 0x10ae7e8: jal   0x1008410 addu  a0, v0, zero
+// 0x010aee30: 0x10aee30: jal   0x1008420 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae7f0: 0x10ae7f0: slti  v0, v0, 61
+// 0x010aee38: 0x10aee38: slti  v0, v0, 61
 	ldloc 5
 	ldc.i4.s 61
 	clt
 	stloc 5
-// 0x010ae7f4: 0x10ae7f4: bne   v0, zero, 0x10ae834 sll   zero, zero, 0
+// 0x010aee3c: 0x10aee3c: bne   v0, zero, 0x10aee7c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ae834
+	brtrue L_10aee7c
 // --- basic block ---
-// 0x010ae7fc: 0x10ae7fc: sw    s2, 0(s1)
+// 0x010aee44: 0x10aee44: sw    s2, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 15
 	stelem.i4
-// 0x010ae800: 0x10ae800: sw    s4, 4(s1)
+// 0x010aee48: 0x10aee48: sw    s4, 4(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2612,10 +2612,10 @@ L_10ae7b0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ae804: 0x10ae804: addu  a0, s4, zero
+// 0x010aee4c: 0x10aee4c: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x010ae808: 0x10ae808: jal   0x10b07a0 sw    s0, 18900(s5)
+// 0x010aee50: 0x10aee50: jal   0x10b0de8 sw    s0, 18900(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2625,23 +2625,23 @@ L_10ae7b0:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae810: 0x10ae810: addu  a0, s0, zero
+// 0x010aee58: 0x10aee58: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010ae814: 0x10ae814: jal   0x10b07a0 addu  s1, v0, zero
+// 0x010aee5c: 0x10aee5c: jal   0x10b0de8 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae81c: 0x10ae81c: addu  a1, v0, zero
+// 0x010aee64: 0x10aee64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae820: 0x10ae820: jal   0x1009824 addu  a0, s1, zero
+// 0x010aee68: 0x10aee68: jal   0x1009834 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2649,41 +2649,41 @@ L_10ae7b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae828: 0x10ae828: sw    v0, -12364(s7)
+// 0x010aee70: 0x10aee70: sw    v0, -11900(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3091
+	ldc.i4 -2975
 	add
 	ldloc 5
 	stelem.i4
-L_10ae82c:
-// 0x010ae82c: 0x10ae82c: j	 0x10ae934 addiu v0, zero, 1
+L_10aee74:
+// 0x010aee74: 0x10aee74: j	 0x10aef7c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10ae934
+	br L_10aef7c
 // --- basic block ---
-L_10ae834:
-// 0x010ae834: 0x10ae834: jal   0x10b07a0 addu  a0, s6, zero
+L_10aee7c:
+// 0x010aee7c: 0x10aee7c: jal   0x10b0de8 addu  a0, s6, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae83c: 0x10ae83c: addu  a0, v0, zero
+// 0x010aee84: 0x10aee84: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ae840: 0x10ae840: addu  a1, s3, zero
+// 0x010aee88: 0x10aee88: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x010ae844: 0x10ae844: jal   0x1009824 addiu s6, s0, -3
+// 0x010aee8c: 0x10aee8c: jal   0x1009834 addiu s6, s0, -3
 	ldloc 9
 	ldc.i4.s -3
 	add
@@ -2693,37 +2693,37 @@ L_10ae834:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae84c: 0x10ae84c: addu  a0, s6, zero
+// 0x010aee94: 0x10aee94: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010ae850: 0x10ae850: jal   0x10b07a0 addu  s3, v0, zero
+// 0x010aee98: 0x10aee98: jal   0x10b0de8 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae858: 0x10ae858: addiu a0, s0, -2
+// 0x010aeea0: 0x10aeea0: addiu a0, s0, -2
 	ldloc 9
 	ldc.i4.s -2
 	add
 	stloc.1
-// 0x010ae85c: 0x10ae85c: jal   0x10b07a0 addu  s4, v0, zero
+// 0x010aeea4: 0x10aeea4: jal   0x10b0de8 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae864: 0x10ae864: addu  a1, v0, zero
+// 0x010aeeac: 0x10aeeac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae868: 0x10ae868: jal   0x1009824 addu  a0, s4, zero
+// 0x010aeeb0: 0x10aeeb0: jal   0x1009834 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2731,57 +2731,57 @@ L_10ae834:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae870: 0x10ae870: addu  a1, v0, zero
+// 0x010aeeb8: 0x10aeeb8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae874: 0x10ae874: jal   0x1008410 addu  a0, s3, zero
+// 0x010aeebc: 0x10aeebc: jal   0x1008420 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae87c: 0x10ae87c: slti  v0, v0, 10
+// 0x010aeec4: 0x10aeec4: slti  v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt
 	stloc 5
-// 0x010ae880: 0x10ae880: beq   v0, zero, 0x10ae934 addu  v0, zero, zero
+// 0x010aeec8: 0x10aeec8: beq   v0, zero, 0x10aef7c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10ae934
+	brfalse L_10aef7c
 // --- basic block ---
-// 0x010ae888: 0x10ae888: jal   0x10b07a0 addu  a0, s6, zero
+// 0x010aeed0: 0x10aeed0: jal   0x10b0de8 addu  a0, s6, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae890: 0x10ae890: addu  a0, s0, zero
+// 0x010aeed8: 0x10aeed8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010ae894: 0x10ae894: jal   0x10b07a0 addu  s3, v0, zero
+// 0x010aeedc: 0x10aeedc: jal   0x10b0de8 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010ae89c: 0x10ae89c: addu  a1, v0, zero
+// 0x010aeee4: 0x10aeee4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010ae8a0: 0x10ae8a0: addu  a0, s3, zero
+// 0x010aeee8: 0x10aeee8: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010ae8a4: 0x10ae8a4: jal   0x1009824 lui   s4, 0x0
+// 0x010aeeec: 0x10aeeec: jal   0x1009834 lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -2789,12 +2789,12 @@ L_10ae834:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae8ac: 0x10ae8ac: lw    a0, 18900(s4)
+// 0x010aeef4: 0x10aeef4: lw    a0, 18900(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2803,20 +2803,20 @@ L_10ae834:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae8b0: 0x10ae8b0: addu  s5, v0, zero
+// 0x010aeef8: 0x10aeef8: addu  s5, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010ae8b4: 0x10ae8b4: addiu v0, zero, -1
+// 0x010aeefc: 0x10aeefc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010ae8b8: 0x10ae8b8: bne   a0, v0, 0x10ae8cc lui   s3, 0x90000
+// 0x010aef00: 0x10aef00: bne   a0, v0, 0x10aef14 lui   s3, 0x90000
 	ldloc.1
 	ldloc 5
 	ldc.i4 589824
 	stloc 10
-	bne.un L_10ae8cc
+	bne.un L_10aef14
 // --- basic block ---
-// 0x010ae8c0: 0x10ae8c0: sw    s0, 18900(s4)
+// 0x010aef08: 0x10aef08: sw    s0, 18900(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2825,41 +2825,41 @@ L_10ae834:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae8c4: 0x10ae8c4: j	 0x10ae930 sw    s5, -12364(s3)
+// 0x010aef0c: 0x10aef0c: j	 0x10aef78 sw    s5, -11900(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3091
+	ldc.i4 -2975
 	add
 	ldloc 12
 	stelem.i4
-	br L_10ae930
+	br L_10aef78
 // --- basic block ---
-L_10ae8cc:
-// 0x010ae8cc: 0x10ae8cc: lw    a1, -12364(s3)
+L_10aef14:
+// 0x010aef14: 0x10aef14: lw    a1, -11900(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3091
+	ldc.i4 -2975
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ae8d0: 0x10ae8d0: addiu v0, sp, 28
+// 0x010aef18: 0x10aef18: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x010ae8d4: 0x10ae8d4: addu  a2, s6, zero
+// 0x010aef1c: 0x10aef1c: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x010ae8d8: 0x10ae8d8: addiu a3, sp, 24
+// 0x010aef20: 0x10aef20: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x010ae8dc: 0x10ae8dc: jal   0x10ae3d8 sw    v0, 16(sp)
+// 0x010aef24: 0x10aef24: jal   0x10aea20 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2873,16 +2873,16 @@ L_10ae8cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::find_line_break_10ae3d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::find_line_break_10aea20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae8e4: 0x10ae8e4: bne   v0, zero, 0x10ae8f8 sll   zero, zero, 0
+// 0x010aef2c: 0x10aef2c: bne   v0, zero, 0x10aef40 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10ae8f8
+	brtrue L_10aef40
 // --- basic block ---
-// 0x010ae8ec: 0x10ae8ec: sw    s0, 18900(s4)
+// 0x010aef34: 0x10aef34: sw    s0, 18900(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2891,19 +2891,19 @@ L_10ae8cc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae8f0: 0x10ae8f0: j	 0x10ae934 sw    s5, -12364(s3)
+// 0x010aef38: 0x10aef38: j	 0x10aef7c sw    s5, -11900(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3091
+	ldc.i4 -2975
 	add
 	ldloc 12
 	stelem.i4
-	br L_10ae934
+	br L_10aef7c
 // --- basic block ---
-L_10ae8f8:
-// 0x010ae8f8: 0x10ae8f8: lw    v1, 28(sp)
+L_10aef40:
+// 0x010aef40: 0x10aef40: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2912,7 +2912,7 @@ L_10ae8f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ae8fc: 0x10ae8fc: lw    a0, 24(sp)
+// 0x010aef44: 0x10aef44: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2921,12 +2921,12 @@ L_10ae8f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ae900: 0x10ae900: subu  s0, s0, v1
+// 0x010aef48: 0x10aef48: subu  s0, s0, v1
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 9
-// 0x010ae904: 0x10ae904: sw    s0, 18900(s4)
+// 0x010aef4c: 0x10aef4c: sw    s0, 18900(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2935,27 +2935,27 @@ L_10ae8f8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae908: 0x10ae908: blez  a0, 0x10ae918 sw    s5, -12364(s3)
+// 0x010aef50: 0x10aef50: blez  a0, 0x10aef60 sw    s5, -11900(s3)
 	ldloc.1
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3091
+	ldc.i4 -2975
 	add
 	ldloc 12
 	stelem.i4
 	ldc.i4.s 0
-	ble L_10ae918
+	ble L_10aef60
 // --- basic block ---
-// 0x010ae910: 0x10ae910: sw    s2, 0(s1)
+// 0x010aef58: 0x10aef58: sw    s2, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 15
 	stelem.i4
-// 0x010ae914: 0x10ae914: sw    a0, 4(s1)
+// 0x010aef5c: 0x10aef5c: sw    a0, 4(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2964,18 +2964,18 @@ L_10ae8f8:
 	add
 	ldloc.1
 	stelem.i4
-L_10ae918:
-// 0x010ae918: 0x10ae918: beq   a0, v1, 0x10ae934 addiu v0, zero, 1
+L_10aef60:
+// 0x010aef60: 0x10aef60: beq   a0, v1, 0x10aef7c addiu v0, zero, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	beq  L_10ae934
+	beq  L_10aef7c
 // --- basic block ---
-// 0x010ae920: 0x10ae920: addiu v0, zero, 2
+// 0x010aef68: 0x10aef68: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010ae924: 0x10ae924: sw    v1, 12(s1)
+// 0x010aef6c: 0x10aef6c: sw    v1, 12(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2984,7 +2984,7 @@ L_10ae918:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ae928: 0x10ae928: j	 0x10ae934 sw    v0, 8(s1)
+// 0x010aef70: 0x10aef70: j	 0x10aef7c sw    v0, 8(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2993,15 +2993,15 @@ L_10ae918:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10ae934
+	br L_10aef7c
 // --- basic block ---
-L_10ae930:
-// 0x010ae930: 0x10ae930: addu  v0, zero, zero
+L_10aef78:
+// 0x010aef78: 0x10aef78: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10ae934:
-// 0x010ae934: 0x10ae934: lw    ra, 92(sp)
-// 0x010ae938: 0x10ae938: lw    s8, 88(sp)
+L_10aef7c:
+// 0x010aef7c: 0x10aef7c: lw    ra, 92(sp)
+// 0x010aef80: 0x10aef80: lw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3010,7 +3010,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010ae93c: 0x10ae93c: lw    s7, 84(sp)
+// 0x010aef84: 0x10aef84: lw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3019,7 +3019,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ae940: 0x10ae940: lw    s6, 80(sp)
+// 0x010aef88: 0x10aef88: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3028,7 +3028,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ae944: 0x10ae944: lw    s5, 76(sp)
+// 0x010aef8c: 0x10aef8c: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3037,7 +3037,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ae948: 0x10ae948: lw    s4, 72(sp)
+// 0x010aef90: 0x10aef90: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3046,7 +3046,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ae94c: 0x10ae94c: lw    s3, 68(sp)
+// 0x010aef94: 0x10aef94: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3055,7 +3055,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ae950: 0x10ae950: lw    s2, 64(sp)
+// 0x010aef98: 0x10aef98: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3064,7 +3064,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010ae954: 0x10ae954: lw    s1, 60(sp)
+// 0x010aef9c: 0x10aef9c: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3073,7 +3073,7 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ae958: 0x10ae958: lw    s0, 56(sp)
+// 0x010aefa0: 0x10aefa0: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3082,15 +3082,15 @@ L_10ae934:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ae95c: 0x10ae95c: jr    ra addiu sp, sp, 96
+// 0x010aefa4: 0x10aefa4: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10ae964:
-// 0x010ae964: 0x10ae964: sw    s0, 12(s1)
+L_10aefac:
+// 0x010aefac: 0x10aefac: sw    s0, 12(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3099,14 +3099,14 @@ L_10ae964:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae968: 0x10ae968: sw    s2, 0(s1)
+// 0x010aefb0: 0x10aefb0: sw    s2, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 15
 	stelem.i4
-// 0x010ae96c: 0x10ae96c: sw    s5, 4(s1)
+// 0x010aefb4: 0x10aefb4: sw    s5, 4(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3115,7 +3115,7 @@ L_10ae964:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ae970: 0x10ae970: sw    s3, 8(s1)
+// 0x010aefb8: 0x10aefb8: sw    s3, 8(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3124,17 +3124,17 @@ L_10ae964:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae974: 0x10ae974: j	 0x10ae934 addiu v0, zero, 2
+// 0x010aefbc: 0x10aefbc: j	 0x10aef7c addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-	br L_10ae934
+	br L_10aef7c
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_unknown_locate_point_10ae97c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_unknown_locate_point_10aefc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s1,int32 s6,int32 s5,int32 ra,int32 lo)
@@ -3193,12 +3193,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ae97c: 0x10ae97c: addiu sp, sp, -160
+// 0x010aefc4: 0x10aefc4: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x010ae980: 0x10ae980: sw    s2, 136(sp)
+// 0x010aefc8: 0x10aefc8: sw    s2, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3207,7 +3207,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ae984: 0x10ae984: lw    s2, 184(sp)
+// 0x010aefcc: 0x10aefcc: lw    s2, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3216,7 +3216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ae988: 0x10ae988: sw    s6, 152(sp)
+// 0x010aefd0: 0x10aefd0: sw    s6, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3225,12 +3225,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ae98c: 0x10ae98c: andi  v0, s2, 1
+// 0x010aefd4: 0x10aefd4: andi  v0, s2, 1
 	ldloc 9
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010ae990: 0x10ae990: sw    s5, 148(sp)
+// 0x010aefd8: 0x10aefd8: sw    s5, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3239,7 +3239,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ae994: 0x10ae994: sw    s4, 144(sp)
+// 0x010aefdc: 0x10aefdc: sw    s4, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3248,7 +3248,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ae998: 0x10ae998: sw    s3, 140(sp)
+// 0x010aefe0: 0x10aefe0: sw    s3, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3257,7 +3257,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ae99c: 0x10ae99c: sw    s1, 132(sp)
+// 0x010aefe4: 0x10aefe4: sw    s1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3266,7 +3266,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ae9a0: 0x10ae9a0: sw    s0, 128(sp)
+// 0x010aefe8: 0x10aefe8: sw    s0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3275,17 +3275,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ae9a4: 0x10ae9a4: sw    ra, 156(sp)
-// 0x010ae9a8: 0x10ae9a8: addu  s3, a0, zero
+// 0x010aefec: 0x10aefec: sw    ra, 156(sp)
+// 0x010aeff0: 0x10aeff0: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010ae9ac: 0x10ae9ac: addu  s5, a1, zero
+// 0x010aeff4: 0x10aeff4: addu  s5, a1, zero
 	ldloc.2
 	stloc 14
-// 0x010ae9b0: 0x10ae9b0: addu  s0, a2, zero
+// 0x010aeff8: 0x10aeff8: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010ae9b4: 0x10ae9b4: lw    s1, 176(sp)
+// 0x010aeffc: 0x10aeffc: lw    s1, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3294,7 +3294,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ae9b8: 0x10ae9b8: lw    s4, 180(sp)
+// 0x010af000: 0x10af000: lw    s4, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3303,21 +3303,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ae9bc: 0x10ae9bc: bne   v0, zero, 0x10aeafc addu  s6, a3, zero
+// 0x010af004: 0x10af004: bne   v0, zero, 0x10af144 addu  s6, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 13
-	brtrue L_10aeafc
+	brtrue L_10af144
 // --- basic block ---
-// 0x010ae9c4: 0x10ae9c4: lui   v0, 0x90000
+// 0x010af00c: 0x10af00c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010ae9c8: 0x10ae9c8: addiu v0, v0, -12360
+// 0x010af010: 0x10af010: addiu v0, v0, -11896
 	ldloc 5
-	ldc.i4 -12360
+	ldc.i4 -11896
 	add
 	stloc 5
-// 0x010ae9cc: 0x10ae9cc: sw    v0, 16(sp)
+// 0x010af014: 0x10af014: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3326,10 +3326,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ae9d0: 0x10ae9d0: addiu v0, zero, 16
+// 0x010af018: 0x10af018: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010ae9d4: 0x10ae9d4: sw    v0, 20(sp)
+// 0x010af01c: 0x10af01c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3338,12 +3338,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ae9d8: 0x10ae9d8: addiu v0, sp, 48
+// 0x010af020: 0x10af020: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x010ae9dc: 0x10ae9dc: sw    v0, 24(sp)
+// 0x010af024: 0x10af024: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3352,15 +3352,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ae9e0: 0x10ae9e0: addiu v0, sp, 40
+// 0x010af028: 0x10af028: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x010ae9e4: 0x10ae9e4: addu  a0, a1, zero
+// 0x010af02c: 0x10af02c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010ae9e8: 0x10ae9e8: sw    v0, 28(sp)
+// 0x010af030: 0x10af030: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3369,17 +3369,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ae9ec: 0x10ae9ec: addiu a1, sp, 52
+// 0x010af034: 0x10af034: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010ae9f0: 0x10ae9f0: addiu v0, sp, 44
+// 0x010af038: 0x10af038: addiu v0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 5
-// 0x010ae9f4: 0x10ae9f4: jal   0x10af7e4 sw    v0, 32(sp)
+// 0x010af03c: 0x10af03c: jal   0x10afe2c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3393,12 +3393,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_find_street_10af7e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_find_street_10afe2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ae9fc: 0x10ae9fc: lw    a0, 40(sp)
+// 0x010af044: 0x10af044: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3407,31 +3407,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aea00: 0x10aea00: jal   0x102be58 sll   zero, zero, 0
+// 0x010af048: 0x10af048: jal   0x102be68 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010aea08: 0x10aea08: bne   v0, zero, 0x10aea20 sll   zero, zero, 0
+// 0x010af050: 0x10af050: bne   v0, zero, 0x10af068 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10aea20
+	brtrue L_10af068
 // --- basic block ---
-// 0x010aea10: 0x10aea10: lw    v0, 0(s0)
+// 0x010af058: 0x10af058: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010aea14: 0x10aea14: sll   zero, zero, 0
-// 0x010aea18: 0x10aea18: beq   v0, zero, 0x10aeaf8 addu  a0, s3, zero
+// 0x010af05c: 0x10af05c: sll   zero, zero, 0
+// 0x010af060: 0x10af060: beq   v0, zero, 0x10af140 addu  a0, s3, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brfalse L_10aeaf8
+	brfalse L_10af140
 // --- basic block ---
-L_10aea20:
-// 0x010aea20: 0x10aea20: lw    a0, 40(sp)
+L_10af068:
+// 0x010af068: 0x10af068: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3440,28 +3440,28 @@ L_10aea20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aea24: 0x10aea24: jal   0x102be58 sll   zero, zero, 0
+// 0x010af06c: 0x10af06c: jal   0x102be68 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010aea2c: 0x10aea2c: beq   v0, zero, 0x10aeac0 sll   zero, zero, 0
+// 0x010af074: 0x10af074: beq   v0, zero, 0x10af108 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10aeac0
+	brfalse L_10af108
 // --- basic block ---
-// 0x010aea34: 0x10aea34: lw    v0, 0(s0)
+// 0x010af07c: 0x10af07c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010aea38: 0x10aea38: sll   zero, zero, 0
-// 0x010aea3c: 0x10aea3c: beq   v0, zero, 0x10aea5c sll   zero, zero, 0
+// 0x010af080: 0x10af080: sll   zero, zero, 0
+// 0x010af084: 0x10af084: beq   v0, zero, 0x10af0a4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10aea5c
+	brfalse L_10af0a4
 // --- basic block ---
-// 0x010aea44: 0x10aea44: lw    v0, 32(s0)
+// 0x010af08c: 0x10af08c: lw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3470,7 +3470,7 @@ L_10aea20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aea48: 0x10aea48: lw    v1, 40(sp)
+// 0x010af090: 0x10af090: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3479,18 +3479,18 @@ L_10aea20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aea4c: 0x10aea4c: sll   zero, zero, 0
-// 0x010aea50: 0x10aea50: slt   v0, v0, v1
+// 0x010af094: 0x10af094: sll   zero, zero, 0
+// 0x010af098: 0x10af098: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010aea54: 0x10aea54: beq   v0, zero, 0x10aeac0 sll   zero, zero, 0
+// 0x010af09c: 0x10af09c: beq   v0, zero, 0x10af108 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10aeac0
+	brfalse L_10af108
 // --- basic block ---
-L_10aea5c:
-// 0x010aea5c: 0x10aea5c: lw    v1, 48(sp)
+L_10af0a4:
+// 0x010af0a4: 0x10af0a4: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3499,32 +3499,32 @@ L_10aea5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aea60: 0x10aea60: addiu v0, zero, 48
+// 0x010af0a8: 0x10af0a8: addiu v0, zero, 48
 	ldc.i4.s 48
 	stloc 5
-// 0x010aea64: 0x10aea64: mult  v1, v0
+// 0x010af0ac: 0x10af0ac: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 16
-// 0x010aea68: 0x10aea68: lui   a1, 0x90000
+// 0x010af0b0: 0x10af0b0: lui   a1, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010aea6c: 0x10aea6c: addiu a1, a1, -12360
+// 0x010af0b4: 0x10af0b4: addiu a1, a1, -11896
 	ldloc.2
-	ldc.i4 -12360
+	ldc.i4 -11896
 	add
 	stloc.2
-// 0x010aea70: 0x10aea70: addiu a2, zero, 48
+// 0x010af0b8: 0x10af0b8: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010aea74: 0x10aea74: addu  a0, s6, zero
+// 0x010af0bc: 0x10af0bc: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010aea78: 0x10aea78: mflo  lo
+// 0x010af0c0: 0x10af0c0: mflo  lo
 	ldloc 16
 	stloc 5
-// 0x010aea7c: 0x10aea7c: jal   0x1001800 addu  a1, a1, v0
+// 0x010af0c4: 0x10af0c4: jal   0x1001800 addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
@@ -3538,15 +3538,15 @@ L_10aea5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aea84: 0x10aea84: addu  a0, s0, zero
+// 0x010af0cc: 0x10af0cc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010aea88: 0x10aea88: addiu a1, sp, 52
+// 0x010af0d0: 0x10af0d0: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010aea8c: 0x10aea8c: jal   0x1001800 addiu a2, zero, 76
+// 0x010af0d4: 0x10af0d4: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -3558,7 +3558,7 @@ L_10aea5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aea94: 0x10aea94: lw    v0, 40(sp)
+// 0x010af0dc: 0x10af0dc: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3567,17 +3567,17 @@ L_10aea5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aea98: 0x10aea98: addiu v1, zero, 1
+// 0x010af0e0: 0x10af0e0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010aea9c: 0x10aea9c: sw    v1, 0(s0)
+// 0x010af0e4: 0x10af0e4: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010aeaa0: 0x10aeaa0: sw    v0, 32(s0)
+// 0x010af0e8: 0x10af0e8: sw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3586,7 +3586,7 @@ L_10aea5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aeaa4: 0x10aeaa4: sw    v0, 28(s0)
+// 0x010af0ec: 0x10af0ec: sw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3595,7 +3595,7 @@ L_10aea5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aeaa8: 0x10aeaa8: lw    s4, 20(s6)
+// 0x010af0f0: 0x10af0f0: lw    s4, 20(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3604,52 +3604,52 @@ L_10aea5c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aeaac: 0x10aeaac: jal   0x10b0f9c sll   zero, zero, 0
+// 0x010af0f4: 0x10af0f4: jal   0x10b15e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aeab4: 0x10aeab4: slt   s4, v0, s4
+// 0x010af0fc: 0x10af0fc: slt   s4, v0, s4
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 11
-// 0x010aeab8: 0x10aeab8: bne   s4, zero, 0x10aeb0c addu  v0, zero, zero
+// 0x010af100: 0x10af100: bne   s4, zero, 0x10af154 addu  v0, zero, zero
 	ldloc 11
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10aeb0c
+	brtrue L_10af154
 // --- basic block ---
-L_10aeac0:
-// 0x010aeac0: 0x10aeac0: andi  s2, s2, 2
+L_10af108:
+// 0x010af108: 0x10af108: andi  s2, s2, 2
 	ldloc 9
 	ldc.i4.2
 	and
 	stloc 9
-// 0x010aeac4: 0x10aeac4: bne   s2, zero, 0x10aead0 addiu v0, zero, 4
+// 0x010af10c: 0x10af10c: bne   s2, zero, 0x10af118 addiu v0, zero, 4
 	ldloc 9
 	ldc.i4.4
 	stloc 5
-	brtrue L_10aead0
+	brtrue L_10af118
 // --- basic block ---
-// 0x010aeacc: 0x10aeacc: addiu v0, zero, 1
+// 0x010af114: 0x10af114: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10aead0:
-// 0x010aead0: 0x10aead0: sw    v0, 0(s1)
+L_10af118:
+// 0x010af118: 0x10af118: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010aead4: 0x10aead4: sw    s3, 4(s1)
+// 0x010af11c: 0x10af11c: sw    s3, 4(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3658,7 +3658,7 @@ L_10aead0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aead8: 0x10aead8: lw    v1, 32(s0)
+// 0x010af120: 0x10af120: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3667,7 +3667,7 @@ L_10aead0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aeadc: 0x10aeadc: lw    a0, 40(sp)
+// 0x010af124: 0x10af124: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3676,20 +3676,20 @@ L_10aead0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aeae0: 0x10aeae0: sll   zero, zero, 0
-// 0x010aeae4: 0x10aeae4: beq   a0, v1, 0x10aeb0c addiu v0, zero, 1
+// 0x010af128: 0x10af128: sll   zero, zero, 0
+// 0x010af12c: 0x10af12c: beq   a0, v1, 0x10af154 addiu v0, zero, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	beq  L_10aeb0c
+	beq  L_10af154
 // --- basic block ---
-// 0x010aeaec: 0x10aeaec: addiu s3, s3, -1
+// 0x010af134: 0x10af134: addiu s3, s3, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x010aeaf0: 0x10aeaf0: j	 0x10aeb0c sw    s3, 4(s1)
+// 0x010af138: 0x10af138: j	 0x10af154 sw    s3, 4(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3698,20 +3698,20 @@ L_10aead0:
 	add
 	ldloc 10
 	stelem.i4
-	br L_10aeb0c
+	br L_10af154
 // --- basic block ---
-L_10aeaf8:
-// 0x010aeaf8: 0x10aeaf8: addu  a1, s5, zero
+L_10af140:
+// 0x010af140: 0x10af140: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-L_10aeafc:
-// 0x010aeafc: 0x10aeafc: addu  a2, s1, zero
+L_10af144:
+// 0x010af144: 0x10af144: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x010aeb00: 0x10aeb00: addu  a3, s4, zero
+// 0x010af148: 0x10af148: addu  a3, s4, zero
 	ldloc 11
 	stloc 4
-// 0x010aeb04: 0x10aeb04: jal   0x10ae5c4 sw    s2, 16(sp)
+// 0x010af14c: 0x10af14c: jal   0x10aec0c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3725,14 +3725,14 @@ L_10aeafc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::detect_road_segment_10ae5c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::detect_road_segment_10aec0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aeb0c:
-// 0x010aeb0c: 0x10aeb0c: lw    ra, 156(sp)
-// 0x010aeb10: 0x10aeb10: lw    s6, 152(sp)
+L_10af154:
+// 0x010af154: 0x10af154: lw    ra, 156(sp)
+// 0x010af158: 0x10af158: lw    s6, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3741,7 +3741,7 @@ L_10aeb0c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010aeb14: 0x10aeb14: lw    s5, 148(sp)
+// 0x010af15c: 0x10af15c: lw    s5, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3750,7 +3750,7 @@ L_10aeb0c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010aeb18: 0x10aeb18: lw    s4, 144(sp)
+// 0x010af160: 0x10af160: lw    s4, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3759,7 +3759,7 @@ L_10aeb0c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aeb1c: 0x10aeb1c: lw    s3, 140(sp)
+// 0x010af164: 0x10af164: lw    s3, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3768,7 +3768,7 @@ L_10aeb0c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aeb20: 0x10aeb20: lw    s2, 136(sp)
+// 0x010af168: 0x10af168: lw    s2, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3777,7 +3777,7 @@ L_10aeb0c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aeb24: 0x10aeb24: lw    s1, 132(sp)
+// 0x010af16c: 0x10af16c: lw    s1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ L_10aeb0c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010aeb28: 0x10aeb28: lw    s0, 128(sp)
+// 0x010af170: 0x10af170: lw    s0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3795,7 +3795,7 @@ L_10aeb0c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aeb2c: 0x10aeb2c: jr    ra addiu sp, sp, 160
+// 0x010af174: 0x10af174: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
@@ -3807,7 +3807,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_get_line_point_ids_10aeb34(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_get_line_point_ids_10af17c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -3848,19 +3848,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aeb34: 0x10aeb34: lw    v0, 0(a0)
+// 0x010af17c: 0x10af17c: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010aeb38: 0x10aeb38: addiu sp, sp, -40
+// 0x010af180: 0x10af180: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010aeb3c: 0x10aeb3c: sw    s1, 32(sp)
+// 0x010af184: 0x10af184: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3869,7 +3869,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aeb40: 0x10aeb40: sw    s0, 28(sp)
+// 0x010af188: 0x10af188: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3878,17 +3878,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aeb44: 0x10aeb44: sw    ra, 36(sp)
-// 0x010aeb48: 0x10aeb48: addu  s0, a0, zero
+// 0x010af18c: 0x10af18c: sw    ra, 36(sp)
+// 0x010af190: 0x10af190: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010aeb4c: 0x10aeb4c: bne   v0, zero, 0x10aebb8 addu  s1, a1, zero
+// 0x010af194: 0x10af194: bne   v0, zero, 0x10af200 addu  s1, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 8
-	brtrue L_10aebb8
+	brtrue L_10af200
 // --- basic block ---
-// 0x010aeb54: 0x10aeb54: lw    v0, 4(a0)
+// 0x010af19c: 0x10af19c: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3897,15 +3897,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010aeb58: 0x10aeb58: sll   zero, zero, 0
-// 0x010aeb5c: 0x10aeb5c: bltz  v0, 0x10aebb8 lui   v0, 0x0
+// 0x010af1a0: 0x10af1a0: sll   zero, zero, 0
+// 0x010af1a4: 0x10af1a4: bltz  v0, 0x10af200 lui   v0, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	blt L_10aebb8
+	blt L_10af200
 // --- basic block ---
-// 0x010aeb64: 0x10aeb64: lw    v0, 576(v0)
+// 0x010af1ac: 0x10af1ac: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3914,7 +3914,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010aeb68: 0x10aeb68: lw    a0, 12(a0)
+// 0x010af1b0: 0x10af1b0: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3923,18 +3923,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aeb6c: 0x10aeb6c: sll   zero, zero, 0
-// 0x010aeb70: 0x10aeb70: beq   a0, v0, 0x10aeb94 sll   zero, zero, 0
+// 0x010af1b4: 0x10af1b4: sll   zero, zero, 0
+// 0x010af1b8: 0x10af1b8: beq   a0, v0, 0x10af1dc sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10aeb94
+	beq  L_10af1dc
 // --- basic block ---
-// 0x010aeb78: 0x10aeb78: bltz  a0, 0x10aeb94 sll   zero, zero, 0
+// 0x010af1c0: 0x10af1c0: bltz  a0, 0x10af1dc sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10aeb94
+	blt L_10af1dc
 // --- basic block ---
-// 0x010aeb80: 0x10aeb80: sw    a2, 16(sp)
+// 0x010af1c8: 0x10af1c8: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3943,7 +3943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010aeb84: 0x10aeb84: jal   0x100b164 sw    a3, 20(sp)
+// 0x010af1cc: 0x10af1cc: jal   0x100b174 sw    a3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3957,12 +3957,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010aeb8c: 0x10aeb8c: lw    a3, 20(sp)
+// 0x010af1d4: 0x10af1d4: lw    a3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3971,7 +3971,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010aeb90: 0x10aeb90: lw    a2, 16(sp)
+// 0x010af1d8: 0x10af1d8: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3980,8 +3980,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-L_10aeb94:
-// 0x010aeb94: 0x10aeb94: lw    a0, 4(s0)
+L_10af1dc:
+// 0x010af1dc: 0x10af1dc: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3990,20 +3990,20 @@ L_10aeb94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aeb98: 0x10aeb98: bne   s1, zero, 0x10aeba8 addu  a1, a3, zero
+// 0x010af1e0: 0x10af1e0: bne   s1, zero, 0x10af1f0 addu  a1, a3, zero
 	ldloc 8
 	ldloc 4
 	stloc.2
-	brtrue L_10aeba8
+	brtrue L_10af1f0
 // --- basic block ---
-// 0x010aeba0: 0x10aeba0: addu  a1, a2, zero
+// 0x010af1e8: 0x10af1e8: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x010aeba4: 0x10aeba4: addu  a2, a3, zero
+// 0x010af1ec: 0x10af1ec: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-L_10aeba8:
-// 0x010aeba8: 0x10aeba8: jal   0x1003fc8 sll   zero, zero, 0
+L_10af1f0:
+// 0x010af1f0: 0x10af1f0: jal   0x1003fc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4014,30 +4014,30 @@ L_10aeba8:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010aebb0: 0x10aebb0: j	 0x10aebc4 sll   zero, zero, 0
-	br L_10aebc4
+// 0x010af1f8: 0x10af1f8: j	 0x10af20c sll   zero, zero, 0
+	br L_10af20c
 // --- basic block ---
-L_10aebb8:
-// 0x010aebb8: 0x10aebb8: addiu v0, zero, -1
+L_10af200:
+// 0x010af200: 0x10af200: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010aebbc: 0x10aebbc: sw    v0, 0(a2)
+// 0x010af204: 0x10af204: sw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010aebc0: 0x10aebc0: sw    v0, 0(a3)
+// 0x010af208: 0x10af208: sw    v0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10aebc4:
-// 0x010aebc4: 0x10aebc4: lw    ra, 36(sp)
-// 0x010aebc8: 0x10aebc8: lw    s1, 32(sp)
+L_10af20c:
+// 0x010af20c: 0x10af20c: lw    ra, 36(sp)
+// 0x010af210: 0x10af210: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4046,7 +4046,7 @@ L_10aebc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aebcc: 0x10aebcc: lw    s0, 28(sp)
+// 0x010af214: 0x10af214: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4055,7 +4055,7 @@ L_10aebc4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aebd0: 0x10aebd0: jr    ra addiu sp, sp, 40
+// 0x010af218: 0x10af218: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4067,7 +4067,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 add_line_length_10aebd8(int32,int32,int32,int32,int32)
+.method public static int32 add_line_length_10af220(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -4111,15 +4111,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aebd8: 0x10aebd8: addiu sp, sp, -32
+// 0x010af220: 0x10af220: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010aebdc: 0x10aebdc: lui   v0, 0x0
+// 0x010af224: 0x10af224: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010aebe0: 0x10aebe0: sw    s0, 16(sp)
+// 0x010af228: 0x10af228: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4128,7 +4128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aebe4: 0x10aebe4: lw    v0, 576(v0)
+// 0x010af22c: 0x10af22c: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4137,10 +4137,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aebe8: 0x10aebe8: addu  s0, a0, zero
+// 0x010af230: 0x10af230: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010aebec: 0x10aebec: lw    a0, 12(a0)
+// 0x010af234: 0x10af234: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4149,7 +4149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aebf0: 0x10aebf0: sw    s1, 20(sp)
+// 0x010af238: 0x10af238: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4158,8 +4158,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aebf4: 0x10aebf4: sw    ra, 28(sp)
-// 0x010aebf8: 0x10aebf8: sw    s2, 24(sp)
+// 0x010af23c: 0x10af23c: sw    ra, 28(sp)
+// 0x010af240: 0x10af240: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4168,51 +4168,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aebfc: 0x10aebfc: beq   a0, v0, 0x10aec14 addu  s1, a1, zero
+// 0x010af244: 0x10af244: beq   a0, v0, 0x10af25c addu  s1, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 8
-	beq  L_10aec14
+	beq  L_10af25c
 // --- basic block ---
-// 0x010aec04: 0x10aec04: bltz  a0, 0x10aec14 sll   zero, zero, 0
+// 0x010af24c: 0x10af24c: bltz  a0, 0x10af25c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10aec14
+	blt L_10af25c
 // --- basic block ---
-// 0x010aec0c: 0x10aec0c: jal   0x100b164 sll   zero, zero, 0
+// 0x010af254: 0x10af254: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_10aec14:
-// 0x010aec14: 0x10aec14: lw    v0, 0(s0)
+L_10af25c:
+// 0x010af25c: 0x10af25c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010aec18: 0x10aec18: lw    s2, 0(s1)
+// 0x010af260: 0x10af260: lw    s2, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010aec1c: 0x10aec1c: bne   v0, zero, 0x10aec48 lui   v0, 0x0
+// 0x010af264: 0x10af264: bne   v0, zero, 0x10af290 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10aec48
+	brtrue L_10af290
 // --- basic block ---
-// 0x010aec24: 0x10aec24: lw    v0, 576(v0)
+// 0x010af26c: 0x10af26c: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4221,7 +4221,7 @@ L_10aec14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aec28: 0x10aec28: lw    a0, 12(s0)
+// 0x010af270: 0x10af270: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4230,30 +4230,30 @@ L_10aec14:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aec2c: 0x10aec2c: sll   zero, zero, 0
-// 0x010aec30: 0x10aec30: beq   a0, v0, 0x10aec48 sll   zero, zero, 0
+// 0x010af274: 0x10af274: sll   zero, zero, 0
+// 0x010af278: 0x10af278: beq   a0, v0, 0x10af290 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10aec48
+	beq  L_10af290
 // --- basic block ---
-// 0x010aec38: 0x10aec38: bltz  a0, 0x10aec48 sll   zero, zero, 0
+// 0x010af280: 0x10af280: bltz  a0, 0x10af290 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10aec48
+	blt L_10af290
 // --- basic block ---
-// 0x010aec40: 0x10aec40: jal   0x100b164 sll   zero, zero, 0
+// 0x010af288: 0x10af288: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_10aec48:
-// 0x010aec48: 0x10aec48: lw    a0, 4(s0)
+L_10af290:
+// 0x010af290: 0x10af290: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4262,7 +4262,7 @@ L_10aec48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aec4c: 0x10aec4c: jal   0x100405c sll   zero, zero, 0
+// 0x010af294: 0x10af294: jal   0x100405c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4273,20 +4273,20 @@ L_10aec48:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010aec54: 0x10aec54: lw    ra, 28(sp)
-// 0x010aec58: 0x10aec58: addu  v0, v0, s2
+// 0x010af29c: 0x10af29c: lw    ra, 28(sp)
+// 0x010af2a0: 0x10af2a0: addu  v0, v0, s2
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x010aec5c: 0x10aec5c: sw    v0, 0(s1)
+// 0x010af2a4: 0x10af2a4: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010aec60: 0x10aec60: lw    s2, 24(sp)
+// 0x010af2a8: 0x10af2a8: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4295,10 +4295,10 @@ L_10aec48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aec64: 0x10aec64: addu  v0, zero, zero
+// 0x010af2ac: 0x10af2ac: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010aec68: 0x10aec68: lw    s1, 20(sp)
+// 0x010af2b0: 0x10af2b0: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4307,7 +4307,7 @@ L_10aec48:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aec6c: 0x10aec6c: lw    s0, 16(sp)
+// 0x010af2b4: 0x10af2b4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4316,7 +4316,7 @@ L_10aec48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aec70: 0x10aec70: jr    ra addiu sp, sp, 32
+// 0x010af2b8: 0x10af2b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4328,7 +4328,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_get_line_length_10aec78(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_get_line_length_10af2c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4369,10 +4369,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aec78: 0x10aec78: lui   v0, 0x0
+// 0x010af2c0: 0x10af2c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010aec7c: 0x10aec7c: lw    v1, 18812(v0)
+// 0x010af2c4: 0x10af2c4: lw    v1, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4381,19 +4381,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aec80: 0x10aec80: lw    v0, 0(a0)
+// 0x010af2c8: 0x10af2c8: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010aec84: 0x10aec84: addiu sp, sp, -48
+// 0x010af2cc: 0x10af2cc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010aec88: 0x10aec88: sw    s1, 40(sp)
+// 0x010af2d0: 0x10af2d0: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4402,8 +4402,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aec8c: 0x10aec8c: sw    ra, 44(sp)
-// 0x010aec90: 0x10aec90: sw    s0, 36(sp)
+// 0x010af2d4: 0x10af2d4: sw    ra, 44(sp)
+// 0x010af2d8: 0x10af2d8: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4412,10 +4412,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aec94: 0x10aec94: addu  s1, a0, zero
+// 0x010af2dc: 0x10af2dc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010aec98: 0x10aec98: bne   v0, v1, 0x10aece0 sw    zero, 24(sp)
+// 0x010af2e0: 0x10af2e0: bne   v0, v1, 0x10af328 sw    zero, 24(sp)
 	ldloc 5
 	ldloc 7
 	ldloc 6
@@ -4426,15 +4426,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_10aece0
+	bne.un L_10af328
 // --- basic block ---
-// 0x010aeca0: 0x10aeca0: bne   v0, zero, 0x10aeccc lui   v0, 0x0
+// 0x010af2e8: 0x10af2e8: bne   v0, zero, 0x10af314 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10aeccc
+	brtrue L_10af314
 // --- basic block ---
-// 0x010aeca8: 0x10aeca8: lw    v0, 576(v0)
+// 0x010af2f0: 0x10af2f0: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4443,7 +4443,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aecac: 0x10aecac: lw    a0, 12(a0)
+// 0x010af2f4: 0x10af2f4: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4452,30 +4452,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aecb0: 0x10aecb0: sll   zero, zero, 0
-// 0x010aecb4: 0x10aecb4: beq   a0, v0, 0x10aeccc sll   zero, zero, 0
+// 0x010af2f8: 0x10af2f8: sll   zero, zero, 0
+// 0x010af2fc: 0x10af2fc: beq   a0, v0, 0x10af314 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10aeccc
+	beq  L_10af314
 // --- basic block ---
-// 0x010aecbc: 0x10aecbc: bltz  a0, 0x10aeccc sll   zero, zero, 0
+// 0x010af304: 0x10af304: bltz  a0, 0x10af314 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10aeccc
+	blt L_10af314
 // --- basic block ---
-// 0x010aecc4: 0x10aecc4: jal   0x100b164 sll   zero, zero, 0
+// 0x010af30c: 0x10af30c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aeccc:
-// 0x010aeccc: 0x10aeccc: lw    a0, 4(s1)
+L_10af314:
+// 0x010af314: 0x10af314: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4484,18 +4484,18 @@ L_10aeccc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aecd0: 0x10aecd0: jal   0x10b6180 sll   zero, zero, 0
+// 0x010af318: 0x10af318: jal   0x10b67c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_length_10b6180(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_length_10b67c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aecd8: 0x10aecd8: j	 0x10aed18 sw    v0, 24(sp)
+// 0x010af320: 0x10af320: j	 0x10af360 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4504,21 +4504,21 @@ L_10aeccc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10aed18
+	br L_10af360
 // --- basic block ---
-L_10aece0:
-// 0x010aece0: 0x10aece0: bne   v0, zero, 0x10aed18 addiu s0, sp, 24
+L_10af328:
+// 0x010af328: 0x10af328: bne   v0, zero, 0x10af360 addiu s0, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	brtrue L_10aed18
+	brtrue L_10af360
 // --- basic block ---
-// 0x010aece8: 0x10aece8: addu  a1, s0, zero
+// 0x010af330: 0x10af330: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010aecec: 0x10aecec: jal   0x10aebd8 addu  a2, zero, zero
+// 0x010af334: 0x10af334: jal   0x10af220 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4526,32 +4526,32 @@ L_10aece0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::add_line_length_10aebd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::add_line_length_10af220(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aecf4: 0x10aecf4: lui   v0, 0x10b0000
+// 0x010af33c: 0x10af33c: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010aecf8: 0x10aecf8: addiu v0, v0, -5160
+// 0x010af340: 0x10af340: addiu v0, v0, -3552
 	ldloc 5
-	ldc.i4 -5160
+	ldc.i4 -3552
 	add
 	stloc 5
-// 0x010aecfc: 0x10aecfc: addu  a0, s1, zero
+// 0x010af344: 0x10af344: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010aed00: 0x10aed00: addu  a1, zero, zero
+// 0x010af348: 0x10af348: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010aed04: 0x10aed04: addu  a2, zero, zero
+// 0x010af34c: 0x10af34c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010aed08: 0x10aed08: addiu a3, zero, 3
+// 0x010af350: 0x10af350: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010aed0c: 0x10aed0c: sw    v0, 16(sp)
+// 0x010af354: 0x10af354: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4560,7 +4560,7 @@ L_10aece0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aed10: 0x10aed10: jal   0x1012790 sw    s0, 20(sp)
+// 0x010af358: 0x10af358: jal   0x10127a0 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4574,14 +4574,14 @@ L_10aece0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aed18:
-// 0x010aed18: 0x10aed18: lw    ra, 44(sp)
-// 0x010aed1c: 0x10aed1c: lw    v0, 24(sp)
+L_10af360:
+// 0x010af360: 0x10af360: lw    ra, 44(sp)
+// 0x010af364: 0x10af364: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4590,7 +4590,7 @@ L_10aed18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aed20: 0x10aed20: lw    s1, 40(sp)
+// 0x010af368: 0x10af368: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4599,7 +4599,7 @@ L_10aed18:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aed24: 0x10aed24: lw    s0, 36(sp)
+// 0x010af36c: 0x10af36c: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4608,7 +4608,7 @@ L_10aed18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aed28: 0x10aed28: jr    ra addiu sp, sp, 48
+// 0x010af370: 0x10af370: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4620,7 +4620,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_roadmap_node_to_editor_10aed30(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_roadmap_node_to_editor_10af378(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -4658,15 +4658,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aed30: 0x10aed30: addiu sp, sp, -32
+// 0x010af378: 0x10af378: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010aed34: 0x10aed34: lui   v0, 0x0
+// 0x010af37c: 0x10af37c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010aed38: 0x10aed38: sw    s0, 24(sp)
+// 0x010af380: 0x10af380: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4675,7 +4675,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aed3c: 0x10aed3c: lw    v0, 576(v0)
+// 0x010af384: 0x10af384: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4684,40 +4684,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aed40: 0x10aed40: addu  s0, a0, zero
+// 0x010af388: 0x10af388: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010aed44: 0x10aed44: lw    a0, 0(a0)
+// 0x010af38c: 0x10af38c: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010aed48: 0x10aed48: sll   zero, zero, 0
-// 0x010aed4c: 0x10aed4c: beq   a0, v0, 0x10aed64 sw    ra, 28(sp)
+// 0x010af390: 0x10af390: sll   zero, zero, 0
+// 0x010af394: 0x10af394: beq   a0, v0, 0x10af3ac sw    ra, 28(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_10aed64
+	beq  L_10af3ac
 // --- basic block ---
-// 0x010aed54: 0x10aed54: bltz  a0, 0x10aed64 sll   zero, zero, 0
+// 0x010af39c: 0x10af39c: bltz  a0, 0x10af3ac sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10aed64
+	blt L_10af3ac
 // --- basic block ---
-// 0x010aed5c: 0x10aed5c: jal   0x100b164 sll   zero, zero, 0
+// 0x010af3a4: 0x10af3a4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10aed64:
-// 0x010aed64: 0x10aed64: lw    a0, 4(s0)
+L_10af3ac:
+// 0x010af3ac: 0x10af3ac: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4726,42 +4726,42 @@ L_10aed64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010aed68: 0x10aed68: lui   v0, 0x20000
+// 0x010af3b0: 0x10af3b0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010aed6c: 0x10aed6c: lw    v1, 31228(v0)
+// 0x010af3b4: 0x10af3b4: lw    v1, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aed70: 0x10aed70: andi  v0, a0, 32767
+// 0x010af3b8: 0x10af3b8: andi  v0, a0, 32767
 	ldloc.1
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x010aed74: 0x10aed74: sll   v0, v0, 3
+// 0x010af3bc: 0x10af3bc: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010aed78: 0x10aed78: addu  v0, v1, v0
+// 0x010af3c0: 0x10af3c0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010aed7c: 0x10aed7c: lw    v1, 0(v0)
+// 0x010af3c4: 0x10af3c4: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010aed80: 0x10aed80: sll   zero, zero, 0
-// 0x010aed84: 0x10aed84: sw    v1, 16(sp)
+// 0x010af3c8: 0x10af3c8: sll   zero, zero, 0
+// 0x010af3cc: 0x10af3cc: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4770,7 +4770,7 @@ L_10aed64:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aed88: 0x10aed88: lw    v0, 4(v0)
+// 0x010af3d0: 0x10af3d0: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4779,7 +4779,7 @@ L_10aed64:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aed8c: 0x10aed8c: jal   0x100a028 sw    v0, 20(sp)
+// 0x010af3d4: 0x10af3d4: jal   0x100a038 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4789,13 +4789,13 @@ L_10aed64:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl7::roadmap_point_db_id_100a028(int32)
+	call int32 Cibyl7::roadmap_point_db_id_100a038(int32)
 	stloc 5
 // --- basic block ---
-// 0x010aed94: 0x10aed94: addu  a1, v0, zero
+// 0x010af3dc: 0x10af3dc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010aed98: 0x10aed98: jal   0x10b4760 addiu a0, sp, 16
+// 0x010af3e0: 0x10af3e0: jal   0x10b4da8 addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4805,13 +4805,13 @@ L_10aed64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aeda0: 0x10aeda0: lw    ra, 28(sp)
-// 0x010aeda4: 0x10aeda4: lw    s0, 24(sp)
+// 0x010af3e8: 0x10af3e8: lw    ra, 28(sp)
+// 0x010af3ec: 0x10af3ec: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4820,7 +4820,7 @@ L_10aed64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aeda8: 0x10aeda8: jr    ra addiu sp, sp, 32
+// 0x010af3f0: 0x10af3f0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4832,7 +4832,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_create_db_10aedb0(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_create_db_10af3f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
@@ -4873,15 +4873,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aedb0: 0x10aedb0: addiu sp, sp, -32
+// 0x010af3f8: 0x10af3f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010aedb4: 0x10aedb4: lui   v0, 0x0
+// 0x010af3fc: 0x10af3fc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010aedb8: 0x10aedb8: sw    s0, 20(sp)
+// 0x010af400: 0x10af400: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4890,7 +4890,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010aedbc: 0x10aedbc: lw    s0, 1816(v0)
+// 0x010af404: 0x10af404: lw    s0, 1816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4899,7 +4899,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010aedc0: 0x10aedc0: sw    s1, 24(sp)
+// 0x010af408: 0x10af408: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4908,8 +4908,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aedc4: 0x10aedc4: sw    ra, 28(sp)
-// 0x010aedc8: 0x10aedc8: jal   0x10b79b4 addu  a0, s0, zero
+// 0x010af40c: 0x10af40c: sw    ra, 28(sp)
+// 0x010af410: 0x10af410: jal   0x10b7ffc addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4917,29 +4917,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010aedd0: 0x10aedd0: addu  s1, v0, zero
+// 0x010af418: 0x10af418: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010aedd4: 0x10aedd4: addiu v0, zero, -1
+// 0x010af41c: 0x10af41c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010aedd8: 0x10aedd8: bne   s1, v0, 0x10aedfc sll   zero, zero, 0
+// 0x010af420: 0x10af420: bne   s1, v0, 0x10af444 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_10aedfc
+	bne.un L_10af444
 // --- basic block ---
-// 0x010aede0: 0x10aede0: jal   0x10b6a10 addu  a0, s0, zero
+// 0x010af428: 0x10af428: jal   0x10b7058 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-	call int32 Cibyl136::editor_db_create_10b6a10()
+	call int32 Cibyl136::editor_db_create_10b7058()
 	stloc 5
 // --- basic block ---
-// 0x010aede8: 0x10aede8: jal   0x10b79b4 addu  a0, s0, zero
+// 0x010af430: 0x10af430: jal   0x10b7ffc addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4947,25 +4947,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010aedf0: 0x10aedf0: bne   v0, s1, 0x10aedfc sll   zero, zero, 0
+// 0x010af438: 0x10af438: bne   v0, s1, 0x10af444 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_10aedfc
+	bne.un L_10af444
 // --- basic block ---
-// 0x010aedf8: 0x10aedf8: addiu s0, zero, -1
+// 0x010af440: 0x10af440: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_10aedfc:
-// 0x010aedfc: 0x10aedfc: lw    ra, 28(sp)
-// 0x010aee00: 0x10aee00: addu  v0, s0, zero
+L_10af444:
+// 0x010af444: 0x10af444: lw    ra, 28(sp)
+// 0x010af448: 0x10af448: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-// 0x010aee04: 0x10aee04: lw    s1, 24(sp)
+// 0x010af44c: 0x10af44c: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4974,7 +4974,7 @@ L_10aedfc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aee08: 0x10aee08: lw    s0, 20(sp)
+// 0x010af450: 0x10af450: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4983,7 +4983,7 @@ L_10aedfc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010aee0c: 0x10aee0c: jr    ra addiu sp, sp, 32
+// 0x010af454: 0x10af454: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4995,7 +4995,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_length_10aee14(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_length_10af45c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 v1,int32 ra)
@@ -5042,12 +5042,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aee14: 0x10aee14: addiu sp, sp, -40
+// 0x010af45c: 0x10af45c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010aee18: 0x10aee18: sw    s2, 28(sp)
+// 0x010af460: 0x10af460: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5056,7 +5056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aee1c: 0x10aee1c: sw    s1, 24(sp)
+// 0x010af464: 0x10af464: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5065,7 +5065,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aee20: 0x10aee20: sw    s0, 20(sp)
+// 0x010af468: 0x10af468: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5074,8 +5074,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aee24: 0x10aee24: sw    ra, 36(sp)
-// 0x010aee28: 0x10aee28: sw    s3, 32(sp)
+// 0x010af46c: 0x10af46c: sw    ra, 36(sp)
+// 0x010af470: 0x10af470: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5084,37 +5084,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010aee2c: 0x10aee2c: addu  s2, a1, zero
+// 0x010af474: 0x10af474: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010aee30: 0x10aee30: addu  s0, a0, zero
+// 0x010af478: 0x10af478: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010aee34: 0x10aee34: j	 0x10aee60 addu  s1, zero, zero
+// 0x010af47c: 0x10af47c: j	 0x10af4a8 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10aee60
+	br L_10af4a8
 // --- basic block ---
-L_10aee3c:
-// 0x010aee3c: 0x10aee3c: jal   0x10b07a0 sll   zero, zero, 0
+L_10af484:
+// 0x010af484: 0x10af484: jal   0x10b0de8 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 6
 // --- basic block ---
-// 0x010aee44: 0x10aee44: addu  a0, s0, zero
+// 0x010af48c: 0x10af48c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010aee48: 0x10aee48: jal   0x10b07a0 addu  s3, v0, zero
+// 0x010af490: 0x10af490: jal   0x10b0de8 addu  s3, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 6
 // --- basic block ---
-// 0x010aee50: 0x10aee50: addu  a1, v0, zero
+// 0x010af498: 0x10af498: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010aee54: 0x10aee54: jal   0x1008eb0 addu  a0, s3, zero
+// 0x010af49c: 0x10af49c: jal   0x1008ec0 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5122,38 +5122,38 @@ L_10aee3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010aee5c: 0x10aee5c: addu  s1, s1, v0
+// 0x010af4a4: 0x10af4a4: addu  s1, s1, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-L_10aee60:
-// 0x010aee60: 0x10aee60: slt   v0, s0, s2
+L_10af4a8:
+// 0x010af4a8: 0x10af4a8: slt   v0, s0, s2
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 6
-// 0x010aee64: 0x10aee64: addu  a0, s0, zero
+// 0x010af4ac: 0x10af4ac: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010aee68: 0x10aee68: bne   v0, zero, 0x10aee3c addiu s0, s0, 1
+// 0x010af4b0: 0x10af4b0: bne   v0, zero, 0x10af484 addiu s0, s0, 1
 	ldloc 6
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_10aee3c
+	brtrue L_10af484
 // --- basic block ---
-// 0x010aee70: 0x10aee70: lw    ra, 36(sp)
-// 0x010aee74: 0x10aee74: addu  v0, s1, zero
+// 0x010af4b8: 0x10af4b8: lw    ra, 36(sp)
+// 0x010af4bc: 0x10af4bc: addu  v0, s1, zero
 	ldloc 8
 	stloc 6
-// 0x010aee78: 0x10aee78: lw    s3, 32(sp)
+// 0x010af4c0: 0x10af4c0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5162,7 +5162,7 @@ L_10aee60:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010aee7c: 0x10aee7c: lw    s2, 28(sp)
+// 0x010af4c4: 0x10af4c4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5171,7 +5171,7 @@ L_10aee60:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aee80: 0x10aee80: lw    s1, 24(sp)
+// 0x010af4c8: 0x10af4c8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5180,7 +5180,7 @@ L_10aee60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aee84: 0x10aee84: lw    s0, 20(sp)
+// 0x010af4cc: 0x10af4cc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5189,7 +5189,7 @@ L_10aee60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aee88: 0x10aee88: jr    ra addiu sp, sp, 40
+// 0x010af4d0: 0x10af4d0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5201,7 +5201,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_add_trkseg_10aee90(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_add_trkseg_10af4d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s4,int32 s1,int32 v1,int32 s2,int32 s3,int32 ra)
@@ -5251,12 +5251,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aee90: 0x10aee90: addiu sp, sp, -48
+// 0x010af4d8: 0x10af4d8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010aee94: 0x10aee94: sw    s3, 36(sp)
+// 0x010af4dc: 0x10af4dc: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5265,14 +5265,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010aee98: 0x10aee98: lw    s3, 0(a0)
+// 0x010af4e0: 0x10af4e0: lw    s3, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x010aee9c: 0x10aee9c: sw    s4, 40(sp)
+// 0x010af4e4: 0x10af4e4: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5281,7 +5281,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aeea0: 0x10aeea0: sw    s2, 32(sp)
+// 0x010af4e8: 0x10af4e8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5290,7 +5290,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aeea4: 0x10aeea4: sw    s1, 28(sp)
+// 0x010af4ec: 0x10af4ec: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5299,8 +5299,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aeea8: 0x10aeea8: sw    ra, 44(sp)
-// 0x010aeeac: 0x10aeeac: sw    s0, 24(sp)
+// 0x010af4f0: 0x10af4f0: sw    ra, 44(sp)
+// 0x010af4f4: 0x10af4f4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5309,10 +5309,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010aeeb0: 0x10aeeb0: addu  s2, a0, zero
+// 0x010af4f8: 0x10af4f8: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010aeeb4: 0x10aeeb4: lw    s4, 12(a0)
+// 0x010af4fc: 0x10af4fc: lw    s4, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5321,16 +5321,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aeeb8: 0x10aeeb8: bne   s3, zero, 0x10aeee4 addu  s1, a2, zero
+// 0x010af500: 0x10af500: bne   s3, zero, 0x10af52c addu  s1, a2, zero
 	ldloc 12
 	ldloc.3
 	stloc 9
-	brtrue L_10aeee4
+	brtrue L_10af52c
 // --- basic block ---
-// 0x010aeec0: 0x10aeec0: lui   v0, 0x0
+// 0x010af508: 0x10af508: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010aeec4: 0x10aeec4: lw    v0, 576(v0)
+// 0x010af50c: 0x10af50c: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5339,18 +5339,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010aeec8: 0x10aeec8: sll   zero, zero, 0
-// 0x010aeecc: 0x10aeecc: beq   s4, v0, 0x10aeee4 sll   zero, zero, 0
+// 0x010af510: 0x10af510: sll   zero, zero, 0
+// 0x010af514: 0x10af514: beq   s4, v0, 0x10af52c sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	beq  L_10aeee4
+	beq  L_10af52c
 // --- basic block ---
-// 0x010aeed4: 0x10aeed4: bltz  s4, 0x10aeee4 sll   zero, zero, 0
+// 0x010af51c: 0x10af51c: bltz  s4, 0x10af52c sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_10aeee4
+	blt L_10af52c
 // --- basic block ---
-// 0x010aeedc: 0x10aeedc: jal   0x100b164 addu  a0, s4, zero
+// 0x010af524: 0x10af524: jal   0x100b174 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5358,13 +5358,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_10aeee4:
-// 0x010aeee4: 0x10aeee4: lw    s0, 4(s2)
+L_10af52c:
+// 0x010af52c: 0x10af52c: lw    s0, 4(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -5373,17 +5373,17 @@ L_10aeee4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aeee8: 0x10aeee8: beq   s1, zero, 0x10aef88 sll   zero, zero, 0
+// 0x010af530: 0x10af530: beq   s1, zero, 0x10af5d0 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10aef88
+	brfalse L_10af5d0
 // --- basic block ---
-// 0x010aeef0: 0x10aeef0: bne   s3, zero, 0x10aef60 lui   v0, 0x0
+// 0x010af538: 0x10af538: bne   s3, zero, 0x10af5a8 lui   v0, 0x0
 	ldloc 12
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_10aef60
+	brtrue L_10af5a8
 // --- basic block ---
-// 0x010aeef8: 0x10aeef8: lw    v0, 576(v0)
+// 0x010af540: 0x10af540: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5392,20 +5392,20 @@ L_10aeee4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010aeefc: 0x10aeefc: sll   zero, zero, 0
-// 0x010aef00: 0x10aef00: beq   s4, v0, 0x10aef1c addu  a0, s0, zero
+// 0x010af544: 0x10af544: sll   zero, zero, 0
+// 0x010af548: 0x10af548: beq   s4, v0, 0x10af564 addu  a0, s0, zero
 	ldloc 8
 	ldloc 6
 	ldloc 7
 	stloc.1
-	beq  L_10aef1c
+	beq  L_10af564
 // --- basic block ---
-// 0x010aef08: 0x10aef08: bltz  s4, 0x10aef1c sll   zero, zero, 0
+// 0x010af550: 0x10af550: bltz  s4, 0x10af564 sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_10aef1c
+	blt L_10af564
 // --- basic block ---
-// 0x010aef10: 0x10aef10: jal   0x100b164 addu  a0, s4, zero
+// 0x010af558: 0x10af558: jal   0x100b174 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5413,26 +5413,26 @@ L_10aeee4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010aef18: 0x10aef18: addu  a0, s0, zero
+// 0x010af560: 0x10af560: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-L_10aef1c:
-// 0x010aef1c: 0x10aef1c: jal   0x1004a70 addiu a1, zero, 1
+L_10af564:
+// 0x010af564: 0x10af564: jal   0x1004a80 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010aef24: 0x10aef24: lw    a1, 12(s2)
+// 0x010af56c: 0x10af56c: lw    a1, 12(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -5441,15 +5441,15 @@ L_10aef1c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010aef28: 0x10aef28: addiu a2, sp, 16
+// 0x010af570: 0x10af570: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x010aef2c: 0x10aef2c: addu  a0, s0, zero
+// 0x010af574: 0x10af574: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010aef30: 0x10aef30: jal   0x10b67b0 sw    v0, 16(sp)
+// 0x010af578: 0x10af578: jal   0x10b6df8 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5463,12 +5463,12 @@ L_10aef1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_get_direction_10b67b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_get_direction_10b6df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010aef38: 0x10aef38: lw    a2, 16(sp)
+// 0x010af580: 0x10af580: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5477,21 +5477,21 @@ L_10aef1c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010aef3c: 0x10aef3c: sll   zero, zero, 0
-// 0x010aef40: 0x10aef40: and   v0, s1, a2
+// 0x010af584: 0x10af584: sll   zero, zero, 0
+// 0x010af588: 0x10af588: and   v0, s1, a2
 	ldloc 9
 	ldloc.3
 	and
 	stloc 6
-// 0x010aef44: 0x10aef44: bne   v0, zero, 0x10aef88 or    a2, s1, a2
+// 0x010af58c: 0x10af58c: bne   v0, zero, 0x10af5d0 or    a2, s1, a2
 	ldloc 6
 	ldloc 9
 	ldloc.3
 	or
 	stloc.3
-	brtrue L_10aef88
+	brtrue L_10af5d0
 // --- basic block ---
-// 0x010aef4c: 0x10aef4c: lw    a1, 12(s2)
+// 0x010af594: 0x10af594: lw    a1, 12(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -5500,7 +5500,7 @@ L_10aef1c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010aef50: 0x10aef50: jal   0x10b6858 addu  a0, s0, zero
+// 0x010af598: 0x10af598: jal   0x10b6ea0 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5508,21 +5508,21 @@ L_10aef1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_set_direction_10b6858(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_set_direction_10b6ea0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010aef58: 0x10aef58: j	 0x10aef88 sll   zero, zero, 0
-	br L_10aef88
+// 0x010af5a0: 0x10af5a0: j	 0x10af5d0 sll   zero, zero, 0
+	br L_10af5d0
 // --- basic block ---
-L_10aef60:
-// 0x010aef60: 0x10aef60: addiu a1, sp, 16
+L_10af5a8:
+// 0x010af5a8: 0x10af5a8: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010aef64: 0x10aef64: jal   0x10b586c addu  a0, s0, zero
+// 0x010af5ac: 0x10af5ac: jal   0x10b5eb4 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5530,12 +5530,12 @@ L_10aef60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_direction_10b586c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_direction_10b5eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010aef6c: 0x10aef6c: lw    a1, 16(sp)
+// 0x010af5b4: 0x10af5b4: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5544,21 +5544,21 @@ L_10aef60:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010aef70: 0x10aef70: sll   zero, zero, 0
-// 0x010aef74: 0x10aef74: and   v0, s1, a1
+// 0x010af5b8: 0x10af5b8: sll   zero, zero, 0
+// 0x010af5bc: 0x10af5bc: and   v0, s1, a1
 	ldloc 9
 	ldloc.2
 	and
 	stloc 6
-// 0x010aef78: 0x10aef78: bne   v0, zero, 0x10aef88 or    a1, s1, a1
+// 0x010af5c0: 0x10af5c0: bne   v0, zero, 0x10af5d0 or    a1, s1, a1
 	ldloc 6
 	ldloc 9
 	ldloc.2
 	or
 	stloc.2
-	brtrue L_10aef88
+	brtrue L_10af5d0
 // --- basic block ---
-// 0x010aef80: 0x10aef80: jal   0x10b5a24 addu  a0, s0, zero
+// 0x010af5c8: 0x10af5c8: jal   0x10b606c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5566,14 +5566,14 @@ L_10aef60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_set_direction_10b5a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_set_direction_10b606c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_10aef88:
-// 0x010aef88: 0x10aef88: lw    ra, 44(sp)
-// 0x010aef8c: 0x10aef8c: lw    s4, 40(sp)
+L_10af5d0:
+// 0x010af5d0: 0x10af5d0: lw    ra, 44(sp)
+// 0x010af5d4: 0x10af5d4: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5582,7 +5582,7 @@ L_10aef88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010aef90: 0x10aef90: lw    s3, 36(sp)
+// 0x010af5d8: 0x10af5d8: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5591,7 +5591,7 @@ L_10aef88:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010aef94: 0x10aef94: lw    s2, 32(sp)
+// 0x010af5dc: 0x10af5dc: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5600,7 +5600,7 @@ L_10aef88:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010aef98: 0x10aef98: lw    s1, 28(sp)
+// 0x010af5e0: 0x10af5e0: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5609,7 +5609,7 @@ L_10aef88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010aef9c: 0x10aef9c: lw    s0, 24(sp)
+// 0x010af5e4: 0x10af5e4: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5618,7 +5618,7 @@ L_10aef88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aefa0: 0x10aefa0: jr    ra addiu sp, sp, 48
+// 0x010af5e8: 0x10af5e8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5630,7 +5630,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_util_create_trkseg_10aefa8(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_create_trkseg_10af5f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 s7,int32 s4,int32 s5,int32 s6,int32 s8,int32 ra)
@@ -5692,12 +5692,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010aefa8: 0x10aefa8: addiu sp, sp, -128
+// 0x010af5f0: 0x10af5f0: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x010aefac: 0x10aefac: sw    s6, 112(sp)
+// 0x010af5f4: 0x10af5f4: sw    s6, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5706,7 +5706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010aefb0: 0x10aefb0: sw    s1, 92(sp)
+// 0x010af5f8: 0x10af5f8: sw    s1, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5715,17 +5715,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010aefb4: 0x10aefb4: addu  s6, a0, zero
+// 0x010af5fc: 0x10af5fc: addu  s6, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010aefb8: 0x10aefb8: addu  s1, a3, zero
+// 0x010af600: 0x10af600: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x010aefbc: 0x10aefbc: addu  a0, a3, zero
+// 0x010af604: 0x10af604: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x010aefc0: 0x10aefc0: sw    ra, 124(sp)
-// 0x010aefc4: 0x10aefc4: sw    a2, 136(sp)
+// 0x010af608: 0x10af608: sw    ra, 124(sp)
+// 0x010af60c: 0x10af60c: sw    a2, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5734,7 +5734,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010aefc8: 0x10aefc8: sw    a1, 132(sp)
+// 0x010af610: 0x10af610: sw    a1, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5743,7 +5743,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010aefcc: 0x10aefcc: sw    s8, 120(sp)
+// 0x010af614: 0x10af614: sw    s8, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5752,7 +5752,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010aefd0: 0x10aefd0: sw    s7, 116(sp)
+// 0x010af618: 0x10af618: sw    s7, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5761,7 +5761,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010aefd4: 0x10aefd4: sw    s5, 108(sp)
+// 0x010af61c: 0x10af61c: sw    s5, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5770,7 +5770,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010aefd8: 0x10aefd8: sw    s4, 104(sp)
+// 0x010af620: 0x10af620: sw    s4, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5779,7 +5779,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010aefdc: 0x10aefdc: sw    s2, 96(sp)
+// 0x010af624: 0x10af624: sw    s2, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5788,7 +5788,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010aefe0: 0x10aefe0: sw    s0, 88(sp)
+// 0x010af628: 0x10af628: sw    s0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5797,7 +5797,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010aefe4: 0x10aefe4: lw    s5, 144(sp)
+// 0x010af62c: 0x10af62c: lw    s5, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5806,7 +5806,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010aefe8: 0x10aefe8: jal   0x10b07c8 sw    s3, 100(sp)
+// 0x010af630: 0x10af630: jal   0x10b0e10 sw    s3, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5816,13 +5816,13 @@ __CIBYL_javamethod_begin:
 	ldloc 10
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 6
 // --- basic block ---
-// 0x010aeff0: 0x10aeff0: addu  a0, s1, zero
+// 0x010af638: 0x10af638: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010aeff4: 0x10aeff4: jal   0x10b07a0 sw    v0, 76(sp)
+// 0x010af63c: 0x10af63c: jal   0x10b0de8 sw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5832,16 +5832,16 @@ __CIBYL_javamethod_begin:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 6
 // --- basic block ---
-// 0x010aeffc: 0x10aeffc: addu  a0, v0, zero
+// 0x010af644: 0x10af644: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010af000: 0x10af000: addiu a1, zero, -1
+// 0x010af648: 0x10af648: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010af004: 0x10af004: jal   0x10b4760 sw    v0, 72(sp)
+// 0x010af64c: 0x10af64c: jal   0x10b4da8 sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5855,21 +5855,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af00c: 0x10af00c: addu  a0, s1, zero
+// 0x010af654: 0x10af654: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010af010: 0x10af010: addu  a1, s5, zero
+// 0x010af658: 0x10af658: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x010af014: 0x10af014: addu  s8, v0, zero
+// 0x010af65c: 0x10af65c: addu  s8, v0, zero
 	ldloc 6
 	stloc 16
-// 0x010af018: 0x10af018: jal   0x10b2f18 addu  s0, s1, zero
+// 0x010af660: 0x10af660: jal   0x10b3560 addu  s0, s1, zero
 	ldloc 9
 	stloc 8
 	ldloc.0
@@ -5877,61 +5877,61 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_compress_track_10b2f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_compress_track_10b3560(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af020: 0x10af020: addiu s2, zero, -1
+// 0x010af668: 0x10af668: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x010af024: 0x10af024: addiu s4, zero, -1
+// 0x010af66c: 0x10af66c: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 13
-// 0x010af028: 0x10af028: j	 0x10af110 addiu s7, zero, -1
+// 0x010af670: 0x10af670: j	 0x10af758 addiu s7, zero, -1
 	ldc.i4.m1
 	stloc 12
-	br L_10af110
+	br L_10af758
 // --- basic block ---
-L_10af030:
-// 0x010af030: 0x10af030: jal   0x10b07e4 sll   zero, zero, 0
+L_10af678:
+// 0x010af678: 0x10af678: jal   0x10b0e2c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl132::track_point_status_10b07e4(int32)
+	call int32 Cibyl132::track_point_status_10b0e2c(int32)
 	stloc 6
 // --- basic block ---
-// 0x010af038: 0x10af038: lw    v0, 0(v0)
+// 0x010af680: 0x10af680: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010af03c: 0x10af03c: addiu v1, zero, 1
+// 0x010af684: 0x10af684: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010af040: 0x10af040: bne   v0, v1, 0x10af10c sll   zero, zero, 0
+// 0x010af688: 0x10af688: bne   v0, v1, 0x10af754 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_10af10c
+	bne.un L_10af754
 // --- basic block ---
-// 0x010af048: 0x10af048: jal   0x10b07b4 addu  a0, s0, zero
+// 0x010af690: 0x10af690: jal   0x10b0dfc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_gps_10b07b4(int32)
+	call int32 Cibyl132::track_point_gps_10b0dfc(int32)
 	stloc 6
 // --- basic block ---
-// 0x010af050: 0x10af050: addu  a0, s0, zero
+// 0x010af698: 0x10af698: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010af054: 0x10af054: jal   0x10b07fc addu  s3, v0, zero
+// 0x010af69c: 0x10af69c: jal   0x10b0e44 addu  s3, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_ordinal_10b07fc(int32)
+	call int32 Cibyl132::track_point_ordinal_10b0e44(int32)
 	stloc 6
 // --- basic block ---
-// 0x010af05c: 0x10af05c: lw    a0, 72(sp)
+// 0x010af6a4: 0x10af6a4: lw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5940,17 +5940,17 @@ L_10af030:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010af060: 0x10af060: addu  s2, v0, zero
+// 0x010af6a8: 0x10af6a8: addu  s2, v0, zero
 	ldloc 6
 	stloc 11
-// 0x010af064: 0x10af064: lw    v1, 0(a0)
+// 0x010af6ac: 0x10af6ac: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010af068: 0x10af068: lw    v0, 4(a0)
+// 0x010af6b0: 0x10af6b0: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5959,14 +5959,14 @@ L_10af030:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af06c: 0x10af06c: lw    a1, 0(s3)
+// 0x010af6b4: 0x10af6b4: lw    a1, 0(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010af070: 0x10af070: lw    a2, 4(s3)
+// 0x010af6b8: 0x10af6b8: lw    a2, 4(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5975,40 +5975,40 @@ L_10af030:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010af074: 0x10af074: subu  a1, a1, v1
+// 0x010af6bc: 0x10af6bc: subu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	sub
 	stloc.2
-// 0x010af078: 0x10af078: subu  a2, a2, v0
+// 0x010af6c0: 0x10af6c0: subu  a2, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-// 0x010af07c: 0x10af07c: sll   a1, a1, 16
+// 0x010af6c4: 0x10af6c4: sll   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x010af080: 0x10af080: sll   a2, a2, 16
+// 0x010af6c8: 0x10af6c8: sll   a2, a2, 16
 	ldloc.3
 	ldc.i4.s 16
 	shl
 	stloc.3
-// 0x010af084: 0x10af084: sra   a1, a1, 16
+// 0x010af6cc: 0x10af6cc: sra   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x010af088: 0x10af088: sra   a2, a2, 16
+// 0x010af6d0: 0x10af6d0: sra   a2, a2, 16
 	ldloc.3
 	ldc.i4.s 16
 	shr
 	stloc.3
-// 0x010af08c: 0x10af08c: addu  a0, s0, zero
+// 0x010af6d4: 0x10af6d4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010af090: 0x10af090: sw    a1, 84(sp)
+// 0x010af6d8: 0x10af6d8: sw    a1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6017,7 +6017,7 @@ L_10af030:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010af094: 0x10af094: jal   0x10b07c8 sw    a2, 80(sp)
+// 0x010af6dc: 0x10af6dc: jal   0x10b0e10 sw    a2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6027,10 +6027,10 @@ L_10af030:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 6
 // --- basic block ---
-// 0x010af09c: 0x10af09c: lw    v1, 76(sp)
+// 0x010af6e4: 0x10af6e4: lw    v1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6039,7 +6039,7 @@ L_10af030:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af0a0: 0x10af0a0: lw    a1, 84(sp)
+// 0x010af6e8: 0x10af6e8: lw    a1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6048,23 +6048,23 @@ L_10af030:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010af0a4: 0x10af0a4: subu  v0, v0, v1
+// 0x010af6ec: 0x10af6ec: subu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	sub
 	stloc 6
-// 0x010af0a8: 0x10af0a8: sll   a3, v0, 16
+// 0x010af6f0: 0x10af6f0: sll   a3, v0, 16
 	ldloc 6
 	ldc.i4.s 16
 	shl
 	stloc 4
-// 0x010af0ac: 0x10af0ac: lh    v1, 10(s3)
+// 0x010af6f4: 0x10af6f4: lh    v1, 10(s3)
 	ldloc 10
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x010af0b0: 0x10af0b0: lw    a2, 80(sp)
+// 0x010af6f8: 0x10af6f8: lw    a2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6073,15 +6073,15 @@ L_10af030:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010af0b4: 0x10af0b4: addu  a0, s2, zero
+// 0x010af6fc: 0x10af6fc: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010af0b8: 0x10af0b8: sra   a3, a3, 16
+// 0x010af700: 0x10af700: sra   a3, a3, 16
 	ldloc 4
 	ldc.i4.s 16
 	shr
 	stloc 4
-// 0x010af0bc: 0x10af0bc: jal   0x10b4620 sw    v1, 16(sp)
+// 0x010af704: 0x10af704: jal   0x10b4c68 sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6095,41 +6095,41 @@ L_10af030:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_add_10b4620(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_add_10b4c68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af0c4: 0x10af0c4: addu  s2, v0, zero
+// 0x010af70c: 0x10af70c: addu  s2, v0, zero
 	ldloc 6
 	stloc 11
-// 0x010af0c8: 0x10af0c8: bne   v0, s7, 0x10af0f4 addu  a0, s0, zero
+// 0x010af710: 0x10af710: bne   v0, s7, 0x10af73c addu  a0, s0, zero
 	ldloc 6
 	ldloc 12
 	ldloc 8
 	stloc.1
-	bne.un L_10af0f4
+	bne.un L_10af73c
 // --- basic block ---
-// 0x010af0d0: 0x10af0d0: lui   a1, 0x20000
+// 0x010af718: 0x10af718: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010af0d4: 0x10af0d4: lui   a3, 0x20000
+// 0x010af71c: 0x10af71c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010af0d8: 0x10af0d8: addiu a1, a1, 17204
+// 0x010af720: 0x10af720: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010af0dc: 0x10af0dc: addiu a3, a3, 17248
+// 0x010af724: 0x10af724: addiu a3, a3, 17708
 	ldloc 4
-	ldc.i4 17248
+	ldc.i4 17708
 	add
 	stloc 4
-// 0x010af0e0: 0x10af0e0: addiu a0, zero, 4
+// 0x010af728: 0x10af728: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010af0e4: 0x10af0e4: jal   0x100449c addiu a2, zero, 932
+// 0x010af72c: 0x10af72c: jal   0x100449c addiu a2, zero, 932
 	ldc.i4 932
 	stloc.3
 	ldloc.0
@@ -6142,22 +6142,22 @@ L_10af030:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af0ec: 0x10af0ec: j	 0x10af1b0 addiu v0, zero, -1
+// 0x010af734: 0x10af734: j	 0x10af7f8 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-	br L_10af1b0
+	br L_10af7f8
 // --- basic block ---
-L_10af0f4:
-// 0x010af0f4: 0x10af0f4: bne   s4, s7, 0x10af100 sll   zero, zero, 0
+L_10af73c:
+// 0x010af73c: 0x10af73c: bne   s4, s7, 0x10af748 sll   zero, zero, 0
 	ldloc 13
 	ldloc 12
-	bne.un L_10af100
+	bne.un L_10af748
 // --- basic block ---
-// 0x010af0fc: 0x10af0fc: addu  s4, v0, zero
+// 0x010af744: 0x10af744: addu  s4, v0, zero
 	ldloc 6
 	stloc 13
-L_10af100:
-// 0x010af100: 0x10af100: jal   0x10b07c8 sw    s3, 72(sp)
+L_10af748:
+// 0x010af748: 0x10af748: jal   0x10b0e10 sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6167,10 +6167,10 @@ L_10af100:
 	ldloc 10
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 6
 // --- basic block ---
-// 0x010af108: 0x10af108: sw    v0, 76(sp)
+// 0x010af750: 0x10af750: sw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6179,25 +6179,25 @@ L_10af100:
 	add
 	ldloc 6
 	stelem.i4
-L_10af10c:
-// 0x010af10c: 0x10af10c: addiu s0, s0, 1
+L_10af754:
+// 0x010af754: 0x10af754: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10af110:
-// 0x010af110: 0x10af110: slt   v0, s5, s0
+L_10af758:
+// 0x010af758: 0x10af758: slt   v0, s5, s0
 	ldloc 14
 	ldloc 8
 	clt
 	stloc 6
-// 0x010af114: 0x10af114: beq   v0, zero, 0x10af030 addu  a0, s0, zero
+// 0x010af75c: 0x10af75c: beq   v0, zero, 0x10af678 addu  a0, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
-	brfalse L_10af030
+	brfalse L_10af678
 // --- basic block ---
-// 0x010af11c: 0x10af11c: lw    a0, 132(sp)
+// 0x010af764: 0x10af764: lw    a0, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6206,7 +6206,7 @@ L_10af110:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010af120: 0x10af120: lw    v0, 136(sp)
+// 0x010af768: 0x10af768: lw    v0, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6215,7 +6215,7 @@ L_10af110:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af124: 0x10af124: sw    a0, 52(sp)
+// 0x010af76c: 0x10af76c: sw    a0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6224,7 +6224,7 @@ L_10af110:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010af128: 0x10af128: sw    v0, 48(sp)
+// 0x010af770: 0x10af770: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6233,7 +6233,7 @@ L_10af110:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010af12c: 0x10af12c: jal   0x10ac838 sw    s6, 60(sp)
+// 0x010af774: 0x10af774: jal   0x10ace80 sw    s6, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6242,12 +6242,12 @@ L_10af110:
 	add
 	ldloc 15
 	stelem.i4
-	call int32 Cibyl129::editor_points_reset_munching_10ac838()
+	call int32 Cibyl129::editor_points_reset_munching_10ace80()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af134: 0x10af134: lw    v1, 148(sp)
+// 0x010af77c: 0x10af77c: lw    v1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6256,27 +6256,27 @@ L_10af110:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af138: 0x10af138: addiu a2, sp, 40
+// 0x010af780: 0x10af780: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x010af13c: 0x10af13c: andi  a1, v1, 16
+// 0x010af784: 0x10af784: andi  a1, v1, 16
 	ldloc 7
 	ldc.i4.s 16
 	and
 	stloc.2
-// 0x010af140: 0x10af140: addiu a3, sp, 44
+// 0x010af788: 0x10af788: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x010af144: 0x10af144: addiu a0, sp, 48
+// 0x010af78c: 0x10af78c: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010af148: 0x10af148: jal   0x10aeb34 addu  s0, v0, zero
+// 0x010af790: 0x10af790: jal   0x10af17c addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -6284,12 +6284,12 @@ L_10af110:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_get_line_point_ids_10aeb34(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_get_line_point_ids_10af17c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af150: 0x10af150: lw    a1, 44(sp)
+// 0x010af798: 0x10af798: lw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6298,8 +6298,8 @@ L_10af110:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010af154: 0x10af154: sll   zero, zero, 0
-// 0x010af158: 0x10af158: sw    a1, 84(sp)
+// 0x010af79c: 0x10af79c: sll   zero, zero, 0
+// 0x010af7a0: 0x10af7a0: sw    a1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6308,7 +6308,7 @@ L_10af110:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010af15c: 0x10af15c: lw    s7, 40(sp)
+// 0x010af7a4: 0x10af7a4: lw    s7, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6317,27 +6317,27 @@ L_10af110:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010af160: 0x10af160: jal   0x10b07c8 addu  a0, s1, zero
+// 0x010af7a8: 0x10af7a8: jal   0x10b0e10 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 6
 // --- basic block ---
-// 0x010af168: 0x10af168: addu  a0, s5, zero
+// 0x010af7b0: 0x10af7b0: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010af16c: 0x10af16c: jal   0x10b07c8 addu  s3, v0, zero
+// 0x010af7b4: 0x10af7b4: jal   0x10b0e10 addu  s3, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 6
 // --- basic block ---
-// 0x010af174: 0x10af174: addu  a0, s6, zero
+// 0x010af7bc: 0x10af7bc: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x010af178: 0x10af178: jal   0x100b484 addu  s1, v0, zero
+// 0x010af7c0: 0x10af7c0: jal   0x100b494 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -6345,12 +6345,12 @@ L_10af110:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af180: 0x10af180: sw    v0, 32(sp)
+// 0x010af7c8: 0x10af7c8: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6359,7 +6359,7 @@ L_10af110:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010af184: 0x10af184: lw    a1, 84(sp)
+// 0x010af7cc: 0x10af7cc: lw    a1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6368,7 +6368,7 @@ L_10af110:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010af188: 0x10af188: lw    v0, 148(sp)
+// 0x010af7d0: 0x10af7d0: lw    v0, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6377,16 +6377,16 @@ L_10af110:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af18c: 0x10af18c: addu  a0, s7, zero
+// 0x010af7d4: 0x10af7d4: addu  a0, s7, zero
 	ldloc 12
 	stloc.1
-// 0x010af190: 0x10af190: addu  a2, s8, zero
+// 0x010af7d8: 0x10af7d8: addu  a2, s8, zero
 	ldloc 16
 	stloc.3
-// 0x010af194: 0x10af194: addu  a3, s4, zero
+// 0x010af7dc: 0x10af7dc: addu  a3, s4, zero
 	ldloc 13
 	stloc 4
-// 0x010af198: 0x10af198: sw    s2, 16(sp)
+// 0x010af7e0: 0x10af7e0: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6395,7 +6395,7 @@ L_10af110:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010af19c: 0x10af19c: sw    s3, 20(sp)
+// 0x010af7e4: 0x10af7e4: sw    s3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6404,7 +6404,7 @@ L_10af110:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af1a0: 0x10af1a0: sw    s1, 24(sp)
+// 0x010af7e8: 0x10af7e8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6413,7 +6413,7 @@ L_10af110:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af1a4: 0x10af1a4: sw    s0, 28(sp)
+// 0x010af7ec: 0x10af7ec: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6422,7 +6422,7 @@ L_10af110:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af1a8: 0x10af1a8: jal   0x10b4a10 sw    v0, 36(sp)
+// 0x010af7f0: 0x10af7f0: jal   0x10b5058 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6436,14 +6436,14 @@ L_10af110:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_add_10b4a10(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_add_10b5058(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10af1b0:
-// 0x010af1b0: 0x10af1b0: lw    ra, 124(sp)
-// 0x010af1b4: 0x10af1b4: lw    s8, 120(sp)
+L_10af7f8:
+// 0x010af7f8: 0x10af7f8: lw    ra, 124(sp)
+// 0x010af7fc: 0x10af7fc: lw    s8, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6452,7 +6452,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010af1b8: 0x10af1b8: lw    s7, 116(sp)
+// 0x010af800: 0x10af800: lw    s7, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6461,7 +6461,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010af1bc: 0x10af1bc: lw    s6, 112(sp)
+// 0x010af804: 0x10af804: lw    s6, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6470,7 +6470,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010af1c0: 0x10af1c0: lw    s5, 108(sp)
+// 0x010af808: 0x10af808: lw    s5, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6479,7 +6479,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010af1c4: 0x10af1c4: lw    s4, 104(sp)
+// 0x010af80c: 0x10af80c: lw    s4, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6488,7 +6488,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010af1c8: 0x10af1c8: lw    s3, 100(sp)
+// 0x010af810: 0x10af810: lw    s3, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6497,7 +6497,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010af1cc: 0x10af1cc: lw    s2, 96(sp)
+// 0x010af814: 0x10af814: lw    s2, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6506,7 +6506,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010af1d0: 0x10af1d0: lw    s1, 92(sp)
+// 0x010af818: 0x10af818: lw    s1, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6515,7 +6515,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af1d4: 0x10af1d4: lw    s0, 88(sp)
+// 0x010af81c: 0x10af81c: lw    s0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6524,7 +6524,7 @@ L_10af1b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af1d8: 0x10af1d8: jr    ra addiu sp, sp, 128
+// 0x010af820: 0x10af820: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -6536,7 +6536,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_util_create_line_10af1e0(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_create_line_10af828(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s4,int32 s2,int32 s3,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -6595,15 +6595,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010af1e0: 0x10af1e0: addiu sp, sp, -72
+// 0x010af828: 0x10af828: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010af1e4: 0x10af1e4: lui   v0, 0x0
+// 0x010af82c: 0x10af82c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010af1e8: 0x10af1e8: sw    s7, 64(sp)
+// 0x010af830: 0x10af830: sw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6612,7 +6612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010af1ec: 0x10af1ec: sw    s6, 60(sp)
+// 0x010af834: 0x10af834: sw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6621,7 +6621,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010af1f0: 0x10af1f0: sw    s5, 56(sp)
+// 0x010af838: 0x10af838: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6630,7 +6630,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010af1f4: 0x10af1f4: sw    s3, 48(sp)
+// 0x010af83c: 0x10af83c: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6639,7 +6639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010af1f8: 0x10af1f8: sw    s2, 44(sp)
+// 0x010af840: 0x10af840: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6648,8 +6648,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010af1fc: 0x10af1fc: sw    ra, 68(sp)
-// 0x010af200: 0x10af200: sw    s4, 52(sp)
+// 0x010af844: 0x10af844: sw    ra, 68(sp)
+// 0x010af848: 0x10af848: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6658,7 +6658,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af204: 0x10af204: sw    s1, 40(sp)
+// 0x010af84c: 0x10af84c: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6667,7 +6667,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af208: 0x10af208: sw    s0, 36(sp)
+// 0x010af850: 0x10af850: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6676,16 +6676,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af20c: 0x10af20c: addu  s3, a0, zero
+// 0x010af854: 0x10af854: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x010af210: 0x10af210: addu  s2, a1, zero
+// 0x010af858: 0x10af858: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010af214: 0x10af214: addu  s7, a2, zero
+// 0x010af85c: 0x10af85c: addu  s7, a2, zero
 	ldloc.3
 	stloc 15
-// 0x010af218: 0x10af218: lw    s5, 576(v0)
+// 0x010af860: 0x10af860: lw    s5, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6694,39 +6694,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010af21c: 0x10af21c: bne   a0, a1, 0x10af240 addu  s6, a3, zero
+// 0x010af864: 0x10af864: bne   a0, a1, 0x10af888 addu  s6, a3, zero
 	ldloc.1
 	ldloc.2
 	ldloc 4
 	stloc 14
-	bne.un L_10af240
+	bne.un L_10af888
 // --- basic block ---
-// 0x010af224: 0x10af224: lui   a1, 0x20000
+// 0x010af86c: 0x10af86c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010af228: 0x10af228: lui   a3, 0x20000
+// 0x010af870: 0x10af870: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010af22c: 0x10af22c: addiu a1, a1, 17204
+// 0x010af874: 0x10af874: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010af230: 0x10af230: addiu a3, a3, 17272
+// 0x010af878: 0x10af878: addiu a3, a3, 17732
 	ldloc 4
-	ldc.i4 17272
+	ldc.i4 17732
 	add
 	stloc 4
-// 0x010af234: 0x10af234: addiu a0, zero, 4
+// 0x010af87c: 0x10af87c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010af238: 0x10af238: j	 0x10af2c0 addiu a2, zero, 1024
+// 0x010af880: 0x10af880: j	 0x10af908 addiu a2, zero, 1024
 	ldc.i4 1024
 	stloc.3
-	br L_10af2c0
+	br L_10af908
 // --- basic block ---
-L_10af240:
-// 0x010af240: 0x10af240: lw    s1, 92(sp)
+L_10af888:
+// 0x010af888: 0x10af888: lw    s1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6735,19 +6735,19 @@ L_10af240:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af244: 0x10af244: jal   0x10b07a0 addu  a0, a1, zero
+// 0x010af88c: 0x10af88c: jal   0x10b0de8 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010af24c: 0x10af24c: sltu  s1, zero, s1
+// 0x010af894: 0x10af894: sltu  s1, zero, s1
 	ldc.i4.s 0
 	ldloc 9
 	clt.un
 	stloc 9
-// 0x010af250: 0x10af250: jal   0x10aedb0 addu  a0, v0, zero
+// 0x010af898: 0x10af898: jal   0x10af3f8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6755,26 +6755,26 @@ L_10af240:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_db_10aedb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_db_10af3f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af258: 0x10af258: jal   0x10b0964 sll   s1, s1, 3
+// 0x010af8a0: 0x10af8a0: jal   0x10b0fac sll   s1, s1, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 9
-	call int32 Cibyl132::editor_ignore_new_roads_10b0964()
+	call int32 Cibyl132::editor_ignore_new_roads_10b0fac()
 	stloc 5
 // --- basic block ---
-// 0x010af260: 0x10af260: beq   v0, zero, 0x10af278 lui   v0, 0x0
+// 0x010af8a8: 0x10af8a8: beq   v0, zero, 0x10af8c0 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10af278
+	brfalse L_10af8c0
 // --- basic block ---
-// 0x010af268: 0x10af268: jal   0x10bd8b8 addiu s0, zero, -1
+// 0x010af8b0: 0x10af8b0: jal   0x10bdf00 addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 8
 	ldloc.0
@@ -6782,19 +6782,19 @@ L_10af240:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_show_candidates_10bd8b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_show_candidates_10bdf00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af270: 0x10af270: beq   v0, zero, 0x10af31c lui   v0, 0x0
+// 0x010af8b8: 0x10af8b8: beq   v0, zero, 0x10af964 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10af31c
+	brfalse L_10af964
 // --- basic block ---
-L_10af278:
-// 0x010af278: 0x10af278: lw    a2, 18812(v0)
+L_10af8c0:
+// 0x010af8c0: 0x10af8c0: lw    a2, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6803,26 +6803,26 @@ L_10af278:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010af27c: 0x10af27c: addiu s0, zero, 1
+// 0x010af8c4: 0x10af8c4: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010af280: 0x10af280: addiu v0, s2, -1
+// 0x010af8c8: 0x10af8c8: addiu v0, s2, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010af284: 0x10af284: addu  a0, s5, zero
+// 0x010af8cc: 0x10af8cc: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010af288: 0x10af288: addiu a1, zero, -1
+// 0x010af8d0: 0x10af8d0: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010af28c: 0x10af28c: addiu a3, s3, 1
+// 0x010af8d4: 0x10af8d4: addiu a3, s3, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010af290: 0x10af290: sw    v0, 16(sp)
+// 0x010af8d8: 0x10af8d8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6831,7 +6831,7 @@ L_10af278:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010af294: 0x10af294: sw    s0, 20(sp)
+// 0x010af8dc: 0x10af8dc: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6840,7 +6840,7 @@ L_10af278:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af298: 0x10af298: jal   0x10aefa8 addiu s4, zero, -1
+// 0x010af8e0: 0x10af8e0: jal   0x10af5f0 addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 10
 	ldloc.0
@@ -6848,42 +6848,42 @@ L_10af278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_trkseg_10aefa8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_trkseg_10af5f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af2a0: 0x10af2a0: bne   v0, s4, 0x10af2d0 addu  a2, v0, zero
+// 0x010af8e8: 0x10af8e8: bne   v0, s4, 0x10af918 addu  a2, v0, zero
 	ldloc 5
 	ldloc 10
 	ldloc 5
 	stloc.3
-	bne.un L_10af2d0
+	bne.un L_10af918
 // --- basic block ---
-// 0x010af2a8: 0x10af2a8: lui   a1, 0x20000
+// 0x010af8f0: 0x10af8f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010af2ac: 0x10af2ac: lui   a3, 0x20000
+// 0x010af8f4: 0x10af8f4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010af2b0: 0x10af2b0: addiu a1, a1, 17204
+// 0x010af8f8: 0x10af8f8: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010af2b4: 0x10af2b4: addiu a3, a3, 17300
+// 0x010af8fc: 0x10af8fc: addiu a3, a3, 17760
 	ldloc 4
-	ldc.i4 17300
+	ldc.i4 17760
 	add
 	stloc 4
-// 0x010af2b8: 0x10af2b8: addiu a0, zero, 4
+// 0x010af900: 0x10af900: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010af2bc: 0x10af2bc: addiu a2, zero, 1043
+// 0x010af904: 0x10af904: addiu a2, zero, 1043
 	ldc.i4 1043
 	stloc.3
-L_10af2c0:
-// 0x010af2c0: 0x10af2c0: jal   0x100449c addiu s0, zero, -1
+L_10af908:
+// 0x010af908: 0x10af908: jal   0x100449c addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 8
 	ldloc.0
@@ -6896,11 +6896,11 @@ L_10af2c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af2c8: 0x10af2c8: j	 0x10af34c sll   zero, zero, 0
-	br L_10af34c
+// 0x010af910: 0x10af910: j	 0x10af994 sll   zero, zero, 0
+	br L_10af994
 // --- basic block ---
-L_10af2d0:
-// 0x010af2d0: 0x10af2d0: lw    a3, 88(sp)
+L_10af918:
+// 0x010af918: 0x10af918: lw    a3, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6909,16 +6909,16 @@ L_10af2d0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010af2d4: 0x10af2d4: addu  a0, s7, zero
+// 0x010af91c: 0x10af91c: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-// 0x010af2d8: 0x10af2d8: addiu v0, zero, 4
+// 0x010af920: 0x10af920: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010af2dc: 0x10af2dc: addu  a1, s6, zero
+// 0x010af924: 0x10af924: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x010af2e0: 0x10af2e0: sw    s0, 16(sp)
+// 0x010af928: 0x10af928: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6927,7 +6927,7 @@ L_10af2d0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af2e4: 0x10af2e4: sw    v0, 24(sp)
+// 0x010af92c: 0x10af92c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6936,7 +6936,7 @@ L_10af2d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010af2e8: 0x10af2e8: jal   0x10b6290 sw    s4, 20(sp)
+// 0x010af930: 0x10af930: jal   0x10b68d8 sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6950,38 +6950,38 @@ L_10af2d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_add_10b6290(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_add_10b68d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af2f0: 0x10af2f0: bne   v0, s4, 0x10af31c addu  s0, v0, zero
+// 0x010af938: 0x10af938: bne   v0, s4, 0x10af964 addu  s0, v0, zero
 	ldloc 5
 	ldloc 10
 	ldloc 5
 	stloc 8
-	bne.un L_10af31c
+	bne.un L_10af964
 // --- basic block ---
-// 0x010af2f8: 0x10af2f8: lui   a1, 0x20000
+// 0x010af940: 0x10af940: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010af2fc: 0x10af2fc: lui   a3, 0x20000
+// 0x010af944: 0x10af944: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010af300: 0x10af300: addiu a1, a1, 17204
+// 0x010af948: 0x10af948: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010af304: 0x10af304: addiu a3, a3, 17328
+// 0x010af94c: 0x10af94c: addiu a3, a3, 17788
 	ldloc 4
-	ldc.i4 17328
+	ldc.i4 17788
 	add
 	stloc 4
-// 0x010af308: 0x10af308: addiu a0, zero, 4
+// 0x010af950: 0x10af950: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010af30c: 0x10af30c: jal   0x100449c addiu a2, zero, 1051
+// 0x010af954: 0x10af954: jal   0x100449c addiu a2, zero, 1051
 	ldc.i4 1051
 	stloc.3
 	ldloc.0
@@ -6994,27 +6994,27 @@ L_10af2d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af314: 0x10af314: j	 0x10af34c sll   zero, zero, 0
-	br L_10af34c
+// 0x010af95c: 0x10af95c: j	 0x10af994 sll   zero, zero, 0
+	br L_10af994
 // --- basic block ---
-L_10af31c:
-// 0x010af31c: 0x10af31c: jal   0x10b0964 sll   zero, zero, 0
-	call int32 Cibyl132::editor_ignore_new_roads_10b0964()
+L_10af964:
+// 0x010af964: 0x10af964: jal   0x10b0fac sll   zero, zero, 0
+	call int32 Cibyl132::editor_ignore_new_roads_10b0fac()
 	stloc 5
 // --- basic block ---
-// 0x010af324: 0x10af324: bne   v0, zero, 0x10af330 lui   v0, 0x0
+// 0x010af96c: 0x10af96c: bne   v0, zero, 0x10af978 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10af330
+	brtrue L_10af978
 // --- basic block ---
-// 0x010af32c: 0x10af32c: ori   s1, s1, 128
+// 0x010af974: 0x10af974: ori   s1, s1, 128
 	ldloc 9
 	ldc.i4 128
 	or
 	stloc 9
-L_10af330:
-// 0x010af330: 0x10af330: lw    a2, 18812(v0)
+L_10af978:
+// 0x010af978: 0x10af978: lw    a2, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7023,16 +7023,16 @@ L_10af330:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010af334: 0x10af334: addu  a0, s5, zero
+// 0x010af97c: 0x10af97c: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010af338: 0x10af338: addu  a3, s3, zero
+// 0x010af980: 0x10af980: addu  a3, s3, zero
 	ldloc 12
 	stloc 4
-// 0x010af33c: 0x10af33c: addu  a1, s0, zero
+// 0x010af984: 0x10af984: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010af340: 0x10af340: sw    s2, 16(sp)
+// 0x010af988: 0x10af988: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7041,7 +7041,7 @@ L_10af330:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010af344: 0x10af344: jal   0x10aefa8 sw    s1, 20(sp)
+// 0x010af98c: 0x10af98c: jal   0x10af5f0 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7055,17 +7055,17 @@ L_10af330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_trkseg_10aefa8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_trkseg_10af5f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10af34c:
-// 0x010af34c: 0x10af34c: lw    ra, 68(sp)
-// 0x010af350: 0x10af350: addu  v0, s0, zero
+L_10af994:
+// 0x010af994: 0x10af994: lw    ra, 68(sp)
+// 0x010af998: 0x10af998: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010af354: 0x10af354: lw    s7, 64(sp)
+// 0x010af99c: 0x10af99c: lw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7074,7 +7074,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010af358: 0x10af358: lw    s6, 60(sp)
+// 0x010af9a0: 0x10af9a0: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7083,7 +7083,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010af35c: 0x10af35c: lw    s5, 56(sp)
+// 0x010af9a4: 0x10af9a4: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7092,7 +7092,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010af360: 0x10af360: lw    s4, 52(sp)
+// 0x010af9a8: 0x10af9a8: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7101,7 +7101,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010af364: 0x10af364: lw    s3, 48(sp)
+// 0x010af9ac: 0x10af9ac: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7110,7 +7110,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010af368: 0x10af368: lw    s2, 44(sp)
+// 0x010af9b0: 0x10af9b0: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7119,7 +7119,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010af36c: 0x10af36c: lw    s1, 40(sp)
+// 0x010af9b4: 0x10af9b4: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7128,7 +7128,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af370: 0x10af370: lw    s0, 36(sp)
+// 0x010af9b8: 0x10af9b8: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7137,7 +7137,7 @@ L_10af34c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af374: 0x10af374: jr    ra addiu sp, sp, 72
+// 0x010af9bc: 0x10af9bc: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
diff --git a/converted/Cibyl131.j b/converted/Cibyl131.j
index 2a85e56..2745898 100644
--- a/converted/Cibyl131.j
+++ b/converted/Cibyl131.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl131::.ctor
 
-.method public static int32 editor_track_util_get_node_10af37c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_get_node_10af9c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 v1,int32 ra)
@@ -91,12 +91,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010af37c: 0x10af37c: addiu sp, sp, -56
+// 0x010af9c4: 0x10af9c4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010af380: 0x10af380: sw    s2, 40(sp)
+// 0x010af9c8: 0x10af9c8: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -105,14 +105,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010af384: 0x10af384: lw    s2, 0(a0)
+// 0x010af9cc: 0x10af9cc: lw    s2, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x010af388: 0x10af388: sw    s3, 44(sp)
+// 0x010af9d0: 0x10af9d0: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -121,7 +121,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af38c: 0x10af38c: sw    s1, 36(sp)
+// 0x010af9d4: 0x10af9d4: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -130,7 +130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af390: 0x10af390: sw    s0, 32(sp)
+// 0x010af9d8: 0x10af9d8: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -139,8 +139,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010af394: 0x10af394: sw    ra, 52(sp)
-// 0x010af398: 0x10af398: sw    s4, 48(sp)
+// 0x010af9dc: 0x10af9dc: sw    ra, 52(sp)
+// 0x010af9e0: 0x10af9e0: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -149,22 +149,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af39c: 0x10af39c: addu  s1, a0, zero
+// 0x010af9e4: 0x10af9e4: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010af3a0: 0x10af3a0: addu  s0, a2, zero
+// 0x010af9e8: 0x10af9e8: addu  s0, a2, zero
 	ldloc.3
 	stloc 7
-// 0x010af3a4: 0x10af3a4: bne   s2, zero, 0x10af3d8 addu  s3, a3, zero
+// 0x010af9ec: 0x10af9ec: bne   s2, zero, 0x10afa20 addu  s3, a3, zero
 	ldloc 11
 	ldloc 4
 	stloc 9
-	brtrue L_10af3d8
+	brtrue L_10afa20
 // --- basic block ---
-// 0x010af3ac: 0x10af3ac: lui   v0, 0x0
+// 0x010af9f4: 0x10af9f4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010af3b0: 0x10af3b0: lw    v0, 576(v0)
+// 0x010af9f8: 0x10af9f8: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -173,7 +173,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af3b4: 0x10af3b4: lw    a0, 12(a0)
+// 0x010af9fc: 0x10af9fc: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -182,20 +182,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010af3b8: 0x10af3b8: sll   zero, zero, 0
-// 0x010af3bc: 0x10af3bc: beq   a0, v0, 0x10af3dc addiu v0, zero, 2
+// 0x010afa00: 0x10afa00: sll   zero, zero, 0
+// 0x010afa04: 0x10afa04: beq   a0, v0, 0x10afa24 addiu v0, zero, 2
 	ldloc.1
 	ldloc 6
 	ldc.i4.2
 	stloc 6
-	beq  L_10af3dc
+	beq  L_10afa24
 // --- basic block ---
-// 0x010af3c4: 0x10af3c4: bltz  a0, 0x10af3dc sll   zero, zero, 0
+// 0x010afa0c: 0x10afa0c: bltz  a0, 0x10afa24 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10af3dc
+	blt L_10afa24
 // --- basic block ---
-// 0x010af3cc: 0x10af3cc: jal   0x100b164 sw    a1, 24(sp)
+// 0x010afa14: 0x10afa14: jal   0x100b174 sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -209,12 +209,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010af3d4: 0x10af3d4: lw    a1, 24(sp)
+// 0x010afa1c: 0x10afa1c: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -223,12 +223,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_10af3d8:
-// 0x010af3d8: 0x10af3d8: addiu v0, zero, 2
+L_10afa20:
+// 0x010afa20: 0x10afa20: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-L_10af3dc:
-// 0x010af3dc: 0x10af3dc: lw    s4, 12(s1)
+L_10afa24:
+// 0x010afa24: 0x10afa24: lw    s4, 12(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -237,7 +237,7 @@ L_10af3dc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010af3e0: 0x10af3e0: lw    s1, 4(s1)
+// 0x010afa28: 0x10afa28: lw    s1, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -246,30 +246,30 @@ L_10af3dc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af3e4: 0x10af3e4: bne   a1, v0, 0x10af3f8 lui   v0, 0x0
+// 0x010afa2c: 0x10afa2c: bne   a1, v0, 0x10afa40 lui   v0, 0x0
 	ldloc.2
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	bne.un L_10af3f8
+	bne.un L_10afa40
 // --- basic block ---
-// 0x010af3ec: 0x10af3ec: xori  s0, s0, 1
+// 0x010afa34: 0x10afa34: xori  s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	xor
 	stloc 7
-// 0x010af3f0: 0x10af3f0: sltiu s0, s0, 1
+// 0x010afa38: 0x10afa38: sltiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	clt.un
 	stloc 7
-// 0x010af3f4: 0x10af3f4: addiu s0, s0, 1
+// 0x010afa3c: 0x10afa3c: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_10af3f8:
-// 0x010af3f8: 0x10af3f8: lw    v0, 18812(v0)
+L_10afa40:
+// 0x010afa40: 0x10afa40: lw    v0, 18812(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -278,18 +278,18 @@ L_10af3f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af3fc: 0x10af3fc: sll   zero, zero, 0
-// 0x010af400: 0x10af400: bne   s2, v0, 0x10af440 lui   v0, 0x0
+// 0x010afa44: 0x10afa44: sll   zero, zero, 0
+// 0x010afa48: 0x10afa48: bne   s2, v0, 0x10afa88 lui   v0, 0x0
 	ldloc 11
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	bne.un L_10af440
+	bne.un L_10afa88
 // --- basic block ---
-// 0x010af408: 0x10af408: addiu v0, zero, 1
+// 0x010afa50: 0x10afa50: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010af40c: 0x10af40c: sw    s2, 8(s3)
+// 0x010afa54: 0x10afa54: sw    s2, 8(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -298,50 +298,50 @@ L_10af3f8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010af410: 0x10af410: bne   s0, v0, 0x10af424 addiu a1, s3, 4
+// 0x010afa58: 0x10afa58: bne   s0, v0, 0x10afa6c addiu a1, s3, 4
 	ldloc 7
 	ldloc 6
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc.2
-	bne.un L_10af424
+	bne.un L_10afa6c
 // --- basic block ---
-// 0x010af418: 0x10af418: addu  a0, s1, zero
+// 0x010afa60: 0x10afa60: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010af41c: 0x10af41c: j	 0x10af430 addu  a2, zero, zero
+// 0x010afa64: 0x10afa64: j	 0x10afa78 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_10af430
+	br L_10afa78
 // --- basic block ---
-L_10af424:
-// 0x010af424: 0x10af424: addu  a2, a1, zero
+L_10afa6c:
+// 0x010afa6c: 0x10afa6c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010af428: 0x10af428: addu  a0, s1, zero
+// 0x010afa70: 0x10afa70: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010af42c: 0x10af42c: addu  a1, zero, zero
+// 0x010afa74: 0x10afa74: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_10af430:
-// 0x010af430: 0x10af430: jal   0x10b5924 sll   zero, zero, 0
+L_10afa78:
+// 0x010afa78: 0x10afa78: jal   0x10b5f6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_points_10b5924(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_points_10b5f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010af438: 0x10af438: j	 0x10af498 sll   zero, zero, 0
-	br L_10af498
+// 0x010afa80: 0x10afa80: j	 0x10afae0 sll   zero, zero, 0
+	br L_10afae0
 // --- basic block ---
-L_10af440:
-// 0x010af440: 0x10af440: lw    v0, 576(v0)
+L_10afa88:
+// 0x010afa88: 0x10afa88: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -350,24 +350,24 @@ L_10af440:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af444: 0x10af444: sll   zero, zero, 0
-// 0x010af448: 0x10af448: beq   s4, v0, 0x10af464 addu  a0, s1, zero
+// 0x010afa8c: 0x10afa8c: sll   zero, zero, 0
+// 0x010afa90: 0x10afa90: beq   s4, v0, 0x10afaac addu  a0, s1, zero
 	ldloc 10
 	ldloc 6
 	ldloc 8
 	stloc.1
-	beq  L_10af464
+	beq  L_10afaac
 // --- basic block ---
-// 0x010af450: 0x10af450: bltz  s4, 0x10af468 addiu a1, sp, 16
+// 0x010afa98: 0x10afa98: bltz  s4, 0x10afab0 addiu a1, sp, 16
 	ldloc 10
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
 	ldc.i4.s 0
-	blt L_10af468
+	blt L_10afab0
 // --- basic block ---
-// 0x010af458: 0x10af458: jal   0x100b164 addu  a0, s4, zero
+// 0x010afaa0: 0x10afaa0: jal   0x100b174 addu  a0, s4, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -375,22 +375,22 @@ L_10af440:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010af460: 0x10af460: addu  a0, s1, zero
+// 0x010afaa8: 0x10afaa8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-L_10af464:
-// 0x010af464: 0x10af464: addiu a1, sp, 16
+L_10afaac:
+// 0x010afaac: 0x10afaac: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-L_10af468:
-// 0x010af468: 0x10af468: jal   0x1003adc addiu a2, sp, 20
+L_10afab0:
+// 0x010afab0: 0x10afab0: jal   0x1003adc addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
@@ -403,17 +403,17 @@ L_10af468:
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010af470: 0x10af470: addiu v0, zero, 1
+// 0x010afab8: 0x10afab8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010af474: 0x10af474: sw    s4, 0(s3)
+// 0x010afabc: 0x10afabc: sw    s4, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010af478: 0x10af478: bne   s0, v0, 0x10af48c sw    zero, 8(s3)
+// 0x010afac0: 0x10afac0: bne   s0, v0, 0x10afad4 sw    zero, 8(s3)
 	ldloc 7
 	ldloc 6
 	ldloc 5
@@ -424,9 +424,9 @@ L_10af468:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_10af48c
+	bne.un L_10afad4
 // --- basic block ---
-// 0x010af480: 0x10af480: lw    v0, 16(sp)
+// 0x010afac8: 0x10afac8: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -435,7 +435,7 @@ L_10af468:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af484: 0x10af484: j	 0x10af498 sw    v0, 4(s3)
+// 0x010afacc: 0x10afacc: j	 0x10afae0 sw    v0, 4(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -444,10 +444,10 @@ L_10af468:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10af498
+	br L_10afae0
 // --- basic block ---
-L_10af48c:
-// 0x010af48c: 0x10af48c: lw    v0, 20(sp)
+L_10afad4:
+// 0x010afad4: 0x10afad4: lw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -456,8 +456,8 @@ L_10af48c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af490: 0x10af490: sll   zero, zero, 0
-// 0x010af494: 0x10af494: sw    v0, 4(s3)
+// 0x010afad8: 0x10afad8: sll   zero, zero, 0
+// 0x010afadc: 0x10afadc: sw    v0, 4(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -466,9 +466,9 @@ L_10af48c:
 	add
 	ldloc 6
 	stelem.i4
-L_10af498:
-// 0x010af498: 0x10af498: lw    ra, 52(sp)
-// 0x010af49c: 0x10af49c: lw    s4, 48(sp)
+L_10afae0:
+// 0x010afae0: 0x10afae0: lw    ra, 52(sp)
+// 0x010afae4: 0x10afae4: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -477,7 +477,7 @@ L_10af498:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010af4a0: 0x10af4a0: lw    s3, 44(sp)
+// 0x010afae8: 0x10afae8: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -486,7 +486,7 @@ L_10af498:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af4a4: 0x10af4a4: lw    s2, 40(sp)
+// 0x010afaec: 0x10afaec: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -495,7 +495,7 @@ L_10af498:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010af4a8: 0x10af4a8: lw    s1, 36(sp)
+// 0x010afaf0: 0x10afaf0: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -504,7 +504,7 @@ L_10af498:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af4ac: 0x10af4ac: lw    s0, 32(sp)
+// 0x010afaf4: 0x10afaf4: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -513,7 +513,7 @@ L_10af498:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af4b0: 0x10af4b0: jr    ra addiu sp, sp, 56
+// 0x010afaf8: 0x10afaf8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -525,7 +525,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_util_node_pos_10af4b8(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_node_pos_10afb00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -566,10 +566,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010af4b8: 0x10af4b8: lui   v0, 0x0
+// 0x010afb00: 0x10afb00: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010af4bc: 0x10af4bc: lw    v0, 18812(v0)
+// 0x010afb04: 0x10afb04: lw    v0, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -578,7 +578,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af4c0: 0x10af4c0: lw    v1, 8(a0)
+// 0x010afb08: 0x10afb08: lw    v1, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -587,12 +587,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af4c4: 0x10af4c4: addiu sp, sp, -32
+// 0x010afb0c: 0x10afb0c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010af4c8: 0x10af4c8: sw    s1, 24(sp)
+// 0x010afb10: 0x10afb10: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -601,7 +601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af4cc: 0x10af4cc: sw    s0, 20(sp)
+// 0x010afb14: 0x10afb14: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -610,21 +610,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af4d0: 0x10af4d0: sw    ra, 28(sp)
-// 0x010af4d4: 0x10af4d4: addu  s0, a0, zero
+// 0x010afb18: 0x10afb18: sw    ra, 28(sp)
+// 0x010afb1c: 0x10afb1c: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010af4d8: 0x10af4d8: beq   v1, v0, 0x10af538 addu  s1, a1, zero
+// 0x010afb20: 0x10afb20: beq   v1, v0, 0x10afb80 addu  s1, a1, zero
 	ldloc 7
 	ldloc 5
 	ldloc.2
 	stloc 8
-	beq  L_10af538
+	beq  L_10afb80
 // --- basic block ---
-// 0x010af4e0: 0x10af4e0: lui   v0, 0x0
+// 0x010afb28: 0x10afb28: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010af4e4: 0x10af4e4: lw    v0, 576(v0)
+// 0x010afb2c: 0x10afb2c: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -633,37 +633,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af4e8: 0x10af4e8: lw    a0, 0(a0)
+// 0x010afb30: 0x10afb30: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010af4ec: 0x10af4ec: sll   zero, zero, 0
-// 0x010af4f0: 0x10af4f0: beq   a0, v0, 0x10af508 sll   zero, zero, 0
+// 0x010afb34: 0x10afb34: sll   zero, zero, 0
+// 0x010afb38: 0x10afb38: beq   a0, v0, 0x10afb50 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10af508
+	beq  L_10afb50
 // --- basic block ---
-// 0x010af4f8: 0x10af4f8: bltz  a0, 0x10af508 sll   zero, zero, 0
+// 0x010afb40: 0x10afb40: bltz  a0, 0x10afb50 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10af508
+	blt L_10afb50
 // --- basic block ---
-// 0x010af500: 0x10af500: jal   0x100b164 sll   zero, zero, 0
+// 0x010afb48: 0x10afb48: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10af508:
-// 0x010af508: 0x10af508: lw    v0, 4(s0)
+L_10afb50:
+// 0x010afb50: 0x10afb50: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -672,49 +672,49 @@ L_10af508:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af50c: 0x10af50c: lui   v1, 0x20000
+// 0x010afb54: 0x10afb54: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010af510: 0x10af510: lw    v1, 31228(v1)
+// 0x010afb58: 0x10afb58: lw    v1, 31692(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af514: 0x10af514: andi  v0, v0, 32767
+// 0x010afb5c: 0x10afb5c: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x010af518: 0x10af518: sll   v0, v0, 3
+// 0x010afb60: 0x10afb60: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010af51c: 0x10af51c: addu  v0, v1, v0
+// 0x010afb64: 0x10afb64: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010af520: 0x10af520: lw    v1, 0(v0)
+// 0x010afb68: 0x10afb68: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010af524: 0x10af524: sll   zero, zero, 0
-// 0x010af528: 0x10af528: sw    v1, 0(s1)
+// 0x010afb6c: 0x10afb6c: sll   zero, zero, 0
+// 0x010afb70: 0x10afb70: sw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010af52c: 0x10af52c: lw    v0, 4(v0)
+// 0x010afb74: 0x10afb74: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -723,7 +723,7 @@ L_10af508:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af530: 0x10af530: j	 0x10af544 sw    v0, 4(s1)
+// 0x010afb78: 0x10afb78: j	 0x10afb8c sw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -732,10 +732,10 @@ L_10af508:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10af544
+	br L_10afb8c
 // --- basic block ---
-L_10af538:
-// 0x010af538: 0x10af538: lw    a0, 4(a0)
+L_10afb80:
+// 0x010afb80: 0x10afb80: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -744,20 +744,20 @@ L_10af538:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010af53c: 0x10af53c: jal   0x10b46a0 sll   zero, zero, 0
+// 0x010afb84: 0x10afb84: jal   0x10b4ce8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10af544:
-// 0x010af544: 0x10af544: lw    ra, 28(sp)
-// 0x010af548: 0x10af548: lw    s1, 24(sp)
+L_10afb8c:
+// 0x010afb8c: 0x10afb8c: lw    ra, 28(sp)
+// 0x010afb90: 0x10afb90: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -766,7 +766,7 @@ L_10af544:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af54c: 0x10af54c: lw    s0, 20(sp)
+// 0x010afb94: 0x10afb94: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -775,7 +775,7 @@ L_10af544:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af550: 0x10af550: jr    ra addiu sp, sp, 32
+// 0x010afb98: 0x10afb98: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -787,7 +787,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_same_node_10af558(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_same_node_10afba0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -831,12 +831,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010af558: 0x10af558: addiu sp, sp, -48
+// 0x010afba0: 0x10afba0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010af55c: 0x10af55c: sw    s1, 36(sp)
+// 0x010afba4: 0x10afba4: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -845,12 +845,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af560: 0x10af560: addiu s1, sp, 16
+// 0x010afba8: 0x10afba8: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x010af564: 0x10af564: sw    s2, 40(sp)
+// 0x010afbac: 0x10afbac: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -859,7 +859,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af568: 0x10af568: sw    s0, 32(sp)
+// 0x010afbb0: 0x10afbb0: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -868,16 +868,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010af56c: 0x10af56c: addu  s2, a1, zero
+// 0x010afbb4: 0x10afbb4: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010af570: 0x10af570: addiu s0, sp, 24
+// 0x010afbb8: 0x10afbb8: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x010af574: 0x10af574: sw    ra, 44(sp)
-// 0x010af578: 0x10af578: jal   0x10af4b8 addu  a1, s1, zero
+// 0x010afbbc: 0x10afbbc: sw    ra, 44(sp)
+// 0x010afbc0: 0x10afbc0: jal   0x10afb00 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -885,15 +885,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_node_pos_10af4b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_node_pos_10afb00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010af580: 0x10af580: addu  a0, s2, zero
+// 0x010afbc8: 0x10afbc8: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010af584: 0x10af584: jal   0x10af4b8 addu  a1, s0, zero
+// 0x010afbcc: 0x10afbcc: jal   0x10afb00 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -901,32 +901,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_node_pos_10af4b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_node_pos_10afb00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010af58c: 0x10af58c: addu  a0, s1, zero
+// 0x010afbd4: 0x10afbd4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010af590: 0x10af590: jal   0x10083b4 addu  a1, s0, zero
+// 0x010afbd8: 0x10afbd8: jal   0x10083c4 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_compare_points_10083b4(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compare_points_10083c4(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010af598: 0x10af598: lw    ra, 44(sp)
-// 0x010af59c: 0x10af59c: sltiu v0, v0, 1
+// 0x010afbe0: 0x10afbe0: lw    ra, 44(sp)
+// 0x010afbe4: 0x10afbe4: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x010af5a0: 0x10af5a0: lw    s2, 40(sp)
+// 0x010afbe8: 0x10afbe8: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -935,7 +935,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af5a4: 0x10af5a4: lw    s1, 36(sp)
+// 0x010afbec: 0x10afbec: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -944,7 +944,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af5a8: 0x10af5a8: lw    s0, 32(sp)
+// 0x010afbf0: 0x10afbf0: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -953,7 +953,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af5ac: 0x10af5ac: jr    ra addiu sp, sp, 48
+// 0x010afbf4: 0x10afbf4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -965,7 +965,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 adjust_connect_node_10af5b4(int32,int32,int32,int32,int32)
+.method public static int32 adjust_connect_node_10afbfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1009,12 +1009,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010af5b4: 0x10af5b4: addiu sp, sp, -88
+// 0x010afbfc: 0x10afbfc: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010af5b8: 0x10af5b8: sw    s0, 72(sp)
+// 0x010afc00: 0x10afc00: sw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1023,12 +1023,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af5bc: 0x10af5bc: addiu s0, sp, 16
+// 0x010afc04: 0x10afc04: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x010af5c0: 0x10af5c0: sw    s2, 80(sp)
+// 0x010afc08: 0x10afc08: sw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1037,13 +1037,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af5c4: 0x10af5c4: addu  s2, a1, zero
+// 0x010afc0c: 0x10afc0c: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010af5c8: 0x10af5c8: addu  a1, s0, zero
+// 0x010afc10: 0x10afc10: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010af5cc: 0x10af5cc: sw    s1, 76(sp)
+// 0x010afc14: 0x10afc14: sw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1052,8 +1052,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af5d0: 0x10af5d0: sw    ra, 84(sp)
-// 0x010af5d4: 0x10af5d4: jal   0x10af4b8 addu  s1, a0, zero
+// 0x010afc18: 0x10afc18: sw    ra, 84(sp)
+// 0x010afc1c: 0x10afc1c: jal   0x10afb00 addu  s1, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -1061,18 +1061,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_node_pos_10af4b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_node_pos_10afb00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af5dc: 0x10af5dc: addu  a0, s0, zero
+// 0x010afc24: 0x10afc24: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010af5e0: 0x10af5e0: addu  a1, s2, zero
+// 0x010afc28: 0x10afc28: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010af5e4: 0x10af5e4: jal   0x1015394 addiu a2, sp, 24
+// 0x010afc2c: 0x10afc2c: jal   0x10153a4 addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1082,18 +1082,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_distance_1015394(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_distance_10153a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af5ec: 0x10af5ec: beq   v0, zero, 0x10af654 addiu v0, zero, -1
+// 0x010afc34: 0x10afc34: beq   v0, zero, 0x10afc9c addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brfalse L_10af654
+	brfalse L_10afc9c
 // --- basic block ---
-// 0x010af5f4: 0x10af5f4: lw    s2, 44(sp)
+// 0x010afc3c: 0x10afc3c: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1102,29 +1102,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010af5f8: 0x10af5f8: jal   0x10b0f9c sll   zero, zero, 0
+// 0x010afc40: 0x10afc40: jal   0x10b15e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af600: 0x10af600: slt   v0, v0, s2
+// 0x010afc48: 0x10afc48: slt   v0, v0, s2
 	ldloc 6
 	ldloc 10
 	clt
 	stloc 6
-// 0x010af604: 0x10af604: bne   v0, zero, 0x10af654 addiu v0, zero, -1
+// 0x010afc4c: 0x10afc4c: bne   v0, zero, 0x10afc9c addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brtrue L_10af654
+	brtrue L_10afc9c
 // --- basic block ---
-// 0x010af60c: 0x10af60c: lw    v1, 64(sp)
+// 0x010afc54: 0x10afc54: lw    v1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1133,7 +1133,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af610: 0x10af610: lw    v0, 8(s1)
+// 0x010afc58: 0x10afc58: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1142,7 +1142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010af614: 0x10af614: sw    v1, 16(sp)
+// 0x010afc5c: 0x10afc5c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1151,7 +1151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010af618: 0x10af618: lw    v1, 68(sp)
+// 0x010afc60: 0x10afc60: lw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1160,7 +1160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af61c: 0x10af61c: bne   v0, zero, 0x10af644 sw    v1, 20(sp)
+// 0x010afc64: 0x10afc64: bne   v0, zero, 0x10afc8c sw    v1, 20(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1170,12 +1170,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_10af644
+	brtrue L_10afc8c
 // --- basic block ---
-// 0x010af624: 0x10af624: addu  a0, s0, zero
+// 0x010afc6c: 0x10afc6c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010af628: 0x10af628: jal   0x10b4760 addiu a1, zero, -1
+// 0x010afc70: 0x10afc70: jal   0x10b4da8 addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -1183,15 +1183,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010af630: 0x10af630: lui   v1, 0x0
+// 0x010afc78: 0x10afc78: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010af634: 0x10af634: lw    v1, 18812(v1)
+// 0x010afc7c: 0x10afc7c: lw    v1, 18812(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1200,7 +1200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af638: 0x10af638: sw    v0, 4(s1)
+// 0x010afc80: 0x10afc80: sw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1209,7 +1209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010af63c: 0x10af63c: j	 0x10af650 sw    v1, 8(s1)
+// 0x010afc84: 0x10afc84: j	 0x10afc98 sw    v1, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1218,10 +1218,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10af650
+	br L_10afc98
 // --- basic block ---
-L_10af644:
-// 0x010af644: 0x10af644: lw    a0, 4(s1)
+L_10afc8c:
+// 0x010afc8c: 0x10afc8c: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1230,7 +1230,7 @@ L_10af644:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010af648: 0x10af648: jal   0x10b46f0 addu  a1, s0, zero
+// 0x010afc90: 0x10afc90: jal   0x10b4d38 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -1238,18 +1238,18 @@ L_10af644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_set_pos_10b46f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_set_pos_10b4d38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10af650:
-// 0x010af650: 0x10af650: addu  v0, zero, zero
+L_10afc98:
+// 0x010afc98: 0x10afc98: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10af654:
-// 0x010af654: 0x10af654: lw    ra, 84(sp)
-// 0x010af658: 0x10af658: lw    s2, 80(sp)
+L_10afc9c:
+// 0x010afc9c: 0x10afc9c: lw    ra, 84(sp)
+// 0x010afca0: 0x10afca0: lw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1258,7 +1258,7 @@ L_10af654:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010af65c: 0x10af65c: lw    s1, 76(sp)
+// 0x010afca4: 0x10afca4: lw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1267,7 +1267,7 @@ L_10af654:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af660: 0x10af660: lw    s0, 72(sp)
+// 0x010afca8: 0x10afca8: lw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1276,7 +1276,7 @@ L_10af654:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af664: 0x10af664: jr    ra addiu sp, sp, 88
+// 0x010afcac: 0x10afcac: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -1288,7 +1288,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 find_connecting_road_10af66c(int32,int32,int32,int32,int32)
+.method public static int32 find_connecting_road_10afcb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 s2,int32 s4,int32 s8,int32 s3,int32 s5,int32 s6,int32 s7,int32 ra,int32 lo)
@@ -1353,12 +1353,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010af66c: 0x10af66c: addiu sp, sp, -1376
+// 0x010afcb4: 0x10afcb4: addiu sp, sp, -1376
 	ldloc.0
 	ldc.i4 -1376
 	add
 	stloc.0
-// 0x010af670: 0x10af670: sw    s1, 1340(sp)
+// 0x010afcb8: 0x10afcb8: sw    s1, 1340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1367,12 +1367,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af674: 0x10af674: addiu s1, sp, 56
+// 0x010afcbc: 0x10afcbc: addiu s1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 8
-// 0x010af678: 0x10af678: sw    s6, 1360(sp)
+// 0x010afcc0: 0x10afcc0: sw    s6, 1360(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1381,7 +1381,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010af67c: 0x10af67c: sw    s4, 1352(sp)
+// 0x010afcc4: 0x10afcc4: sw    s4, 1352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1390,20 +1390,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010af680: 0x10af680: addu  s6, a1, zero
+// 0x010afcc8: 0x10afcc8: addu  s6, a1, zero
 	ldloc.2
 	stloc 15
-// 0x010af684: 0x10af684: addu  s4, a0, zero
+// 0x010afccc: 0x10afccc: addu  s4, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010af688: 0x10af688: addiu a1, zero, 128
+// 0x010afcd0: 0x10afcd0: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x010af68c: 0x10af68c: addu  a0, s1, zero
+// 0x010afcd4: 0x10afcd4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010af690: 0x10af690: sw    ra, 1372(sp)
-// 0x010af694: 0x10af694: sw    s7, 1364(sp)
+// 0x010afcd8: 0x10afcd8: sw    ra, 1372(sp)
+// 0x010afcdc: 0x10afcdc: sw    s7, 1364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1412,7 +1412,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010af698: 0x10af698: sw    s5, 1356(sp)
+// 0x010afce0: 0x10afce0: sw    s5, 1356(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1421,7 +1421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010af69c: 0x10af69c: sw    s3, 1348(sp)
+// 0x010afce4: 0x10afce4: sw    s3, 1348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1430,7 +1430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010af6a0: 0x10af6a0: sw    s2, 1344(sp)
+// 0x010afce8: 0x10afce8: sw    s2, 1344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1439,7 +1439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af6a4: 0x10af6a4: sw    s0, 1336(sp)
+// 0x010afcec: 0x10afcec: sw    s0, 1336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1448,10 +1448,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010af6a8: 0x10af6a8: addu  s5, a2, zero
+// 0x010afcf0: 0x10afcf0: addu  s5, a2, zero
 	ldloc.3
 	stloc 14
-// 0x010af6ac: 0x10af6ac: jal   0x1010058 sw    s8, 1368(sp)
+// 0x010afcf4: 0x10afcf4: jal   0x1010068 sw    s8, 1368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1464,38 +1464,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af6b4: 0x10af6b4: addiu s0, sp, 568
+// 0x010afcfc: 0x10afcfc: addiu s0, sp, 568
 	ldloc.0
 	ldc.i4 568
 	add
 	stloc 7
-// 0x010af6b8: 0x10af6b8: addu  s3, v0, zero
+// 0x010afd00: 0x10afd00: addu  s3, v0, zero
 	ldloc 6
 	stloc 13
-// 0x010af6bc: 0x10af6bc: addiu s2, zero, 16
+// 0x010afd04: 0x10afd04: addiu s2, zero, 16
 	ldc.i4.s 16
 	stloc 10
-// 0x010af6c0: 0x10af6c0: addu  a0, s4, zero
+// 0x010afd08: 0x10afd08: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010af6c4: 0x10af6c4: addu  a2, s1, zero
+// 0x010afd0c: 0x10afd0c: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x010af6c8: 0x10af6c8: addu  a3, v0, zero
+// 0x010afd10: 0x10afd10: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x010af6cc: 0x10af6cc: addu  a1, zero, zero
+// 0x010afd14: 0x10afd14: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010af6d0: 0x10af6d0: addiu v0, zero, 1
+// 0x010afd18: 0x10afd18: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010af6d4: 0x10af6d4: sw    s0, 20(sp)
+// 0x010afd1c: 0x10afd1c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1504,7 +1504,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010af6d8: 0x10af6d8: sw    s2, 24(sp)
+// 0x010afd20: 0x10afd20: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1513,7 +1513,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af6dc: 0x10af6dc: jal   0x1013028 sw    v0, 16(sp)
+// 0x010afd24: 0x10afd24: jal   0x1013038 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1527,24 +1527,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af6e4: 0x10af6e4: addu  a0, s4, zero
+// 0x010afd2c: 0x10afd2c: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010af6e8: 0x10af6e8: addu  a1, s1, zero
+// 0x010afd30: 0x10afd30: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010af6ec: 0x10af6ec: addu  a2, s3, zero
+// 0x010afd34: 0x10afd34: addu  a2, s3, zero
 	ldloc 13
 	stloc.3
-// 0x010af6f0: 0x10af6f0: addiu a3, zero, 1
+// 0x010afd38: 0x10afd38: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010af6f4: 0x10af6f4: sw    s2, 24(sp)
+// 0x010afd3c: 0x10afd3c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1553,7 +1553,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af6f8: 0x10af6f8: sw    s0, 16(sp)
+// 0x010afd40: 0x10afd40: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1562,7 +1562,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010af6fc: 0x10af6fc: jal   0x1014978 sw    v0, 20(sp)
+// 0x010afd44: 0x10afd44: jal   0x1014988 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1576,55 +1576,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_closest_1014978(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_closest_1014988(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af704: 0x10af704: addu  s4, s0, zero
+// 0x010afd4c: 0x10afd4c: addu  s4, s0, zero
 	ldloc 7
 	stloc 11
-// 0x010af708: 0x10af708: addu  s7, v0, zero
+// 0x010afd50: 0x10afd50: addu  s7, v0, zero
 	ldloc 6
 	stloc 16
-// 0x010af70c: 0x10af70c: addu  s0, zero, zero
+// 0x010afd54: 0x10afd54: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010af710: 0x10af710: addiu s3, zero, 48
+// 0x010afd58: 0x10afd58: addiu s3, zero, 48
 	ldc.i4.s 48
 	stloc 13
-// 0x010af714: 0x10af714: addiu s2, sp, 32
+// 0x010afd5c: 0x10afd5c: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x010af718: 0x10af718: j	 0x10af79c addiu s1, sp, 44
+// 0x010afd60: 0x10afd60: j	 0x10afde4 addiu s1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 8
-	br L_10af79c
+	br L_10afde4
 // --- basic block ---
-L_10af720:
-// 0x010af720: 0x10af720: mult  s0, s3
+L_10afd68:
+// 0x010afd68: 0x10afd68: mult  s0, s3
 	ldloc 7
 	ldloc 13
 	mul
 	stloc 18
-// 0x010af724: 0x10af724: addiu s0, s0, 1
+// 0x010afd6c: 0x10afd6c: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010af728: 0x10af728: mflo  lo
+// 0x010afd70: 0x10afd70: mflo  lo
 	ldloc 18
 	stloc 12
-// 0x010af72c: 0x10af72c: addu  s8, s4, s8
+// 0x010afd74: 0x10afd74: addu  s8, s4, s8
 	ldloc 11
 	ldloc 12
 	add
 	stloc 12
-// 0x010af730: 0x10af730: jal   0x10af37c addu  a0, s8, zero
+// 0x010afd78: 0x10afd78: jal   0x10af9c4 addu  a0, s8, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -1632,21 +1632,21 @@ L_10af720:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_get_node_10af37c(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_get_node_10af9c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af738: 0x10af738: addu  a0, s8, zero
+// 0x010afd80: 0x10afd80: addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-// 0x010af73c: 0x10af73c: addiu a2, zero, 2
+// 0x010afd84: 0x10afd84: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010af740: 0x10af740: addu  a3, s1, zero
+// 0x010afd88: 0x10afd88: addu  a3, s1, zero
 	ldloc 8
 	stloc 4
-// 0x010af744: 0x10af744: jal   0x10af37c addiu a1, zero, 1
+// 0x010afd8c: 0x10afd8c: jal   0x10af9c4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1654,15 +1654,15 @@ L_10af720:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_get_node_10af37c(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_get_node_10af9c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af74c: 0x10af74c: addu  a0, s6, zero
+// 0x010afd94: 0x10afd94: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x010af750: 0x10af750: jal   0x10af558 addu  a1, s2, zero
+// 0x010afd98: 0x10afd98: jal   0x10afba0 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -1670,42 +1670,42 @@ L_10af720:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_same_node_10af558(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_same_node_10afba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af758: 0x10af758: addu  a0, s5, zero
+// 0x010afda0: 0x10afda0: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010af75c: 0x10af75c: beq   v0, zero, 0x10af774 addu  a1, s1, zero
+// 0x010afda4: 0x10afda4: beq   v0, zero, 0x10afdbc addu  a1, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brfalse L_10af774
+	brfalse L_10afdbc
 // --- basic block ---
-// 0x010af764: 0x10af764: jal   0x10af558 sll   zero, zero, 0
+// 0x010afdac: 0x10afdac: jal   0x10afba0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_same_node_10af558(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_same_node_10afba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af76c: 0x10af76c: bne   v0, zero, 0x10af7b4 addiu v0, zero, 1
+// 0x010afdb4: 0x10afdb4: bne   v0, zero, 0x10afdfc addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_10af7b4
+	brtrue L_10afdfc
 // --- basic block ---
-L_10af774:
-// 0x010af774: 0x10af774: addu  a0, s6, zero
+L_10afdbc:
+// 0x010afdbc: 0x10afdbc: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x010af778: 0x10af778: jal   0x10af558 addu  a1, s1, zero
+// 0x010afdc0: 0x10afdc0: jal   0x10afba0 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -1713,23 +1713,23 @@ L_10af774:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_same_node_10af558(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_same_node_10afba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af780: 0x10af780: beq   v0, zero, 0x10af7a0 slt   v0, s0, s7
+// 0x010afdc8: 0x10afdc8: beq   v0, zero, 0x10afde8 slt   v0, s0, s7
 	ldloc 6
 	ldloc 7
 	ldloc 16
 	clt
 	stloc 6
-	brfalse L_10af7a0
+	brfalse L_10afde8
 // --- basic block ---
-// 0x010af788: 0x10af788: addu  a0, s5, zero
+// 0x010afdd0: 0x10afdd0: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010af78c: 0x10af78c: jal   0x10af558 addu  a1, s2, zero
+// 0x010afdd4: 0x10afdd4: jal   0x10afba0 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -1737,42 +1737,42 @@ L_10af774:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_same_node_10af558(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_same_node_10afba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010af794: 0x10af794: bne   v0, zero, 0x10af7b4 addiu v0, zero, 1
+// 0x010afddc: 0x10afddc: bne   v0, zero, 0x10afdfc addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_10af7b4
+	brtrue L_10afdfc
 // --- basic block ---
-L_10af79c:
-// 0x010af79c: 0x10af79c: slt   v0, s0, s7
+L_10afde4:
+// 0x010afde4: 0x10afde4: slt   v0, s0, s7
 	ldloc 7
 	ldloc 16
 	clt
 	stloc 6
-L_10af7a0:
-// 0x010af7a0: 0x10af7a0: addiu a1, zero, 1
+L_10afde8:
+// 0x010afde8: 0x10afde8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010af7a4: 0x10af7a4: addiu a2, zero, 1
+// 0x010afdec: 0x10afdec: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010af7a8: 0x10af7a8: bne   v0, zero, 0x10af720 addu  a3, s2, zero
+// 0x010afdf0: 0x10afdf0: bne   v0, zero, 0x10afd68 addu  a3, s2, zero
 	ldloc 6
 	ldloc 10
 	stloc 4
-	brtrue L_10af720
+	brtrue L_10afd68
 // --- basic block ---
-// 0x010af7b0: 0x10af7b0: addu  v0, zero, zero
+// 0x010afdf8: 0x10afdf8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10af7b4:
-// 0x010af7b4: 0x10af7b4: lw    ra, 1372(sp)
-// 0x010af7b8: 0x10af7b8: lw    s8, 1368(sp)
+L_10afdfc:
+// 0x010afdfc: 0x10afdfc: lw    ra, 1372(sp)
+// 0x010afe00: 0x10afe00: lw    s8, 1368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1781,7 +1781,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010af7bc: 0x10af7bc: lw    s7, 1364(sp)
+// 0x010afe04: 0x10afe04: lw    s7, 1364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1790,7 +1790,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010af7c0: 0x10af7c0: lw    s6, 1360(sp)
+// 0x010afe08: 0x10afe08: lw    s6, 1360(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1799,7 +1799,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010af7c4: 0x10af7c4: lw    s5, 1356(sp)
+// 0x010afe0c: 0x10afe0c: lw    s5, 1356(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1808,7 +1808,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010af7c8: 0x10af7c8: lw    s4, 1352(sp)
+// 0x010afe10: 0x10afe10: lw    s4, 1352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1817,7 +1817,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010af7cc: 0x10af7cc: lw    s3, 1348(sp)
+// 0x010afe14: 0x10afe14: lw    s3, 1348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1826,7 +1826,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010af7d0: 0x10af7d0: lw    s2, 1344(sp)
+// 0x010afe18: 0x10afe18: lw    s2, 1344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1835,7 +1835,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010af7d4: 0x10af7d4: lw    s1, 1340(sp)
+// 0x010afe1c: 0x10afe1c: lw    s1, 1340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1844,7 +1844,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010af7d8: 0x10af7d8: lw    s0, 1336(sp)
+// 0x010afe20: 0x10afe20: lw    s0, 1336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1853,7 +1853,7 @@ L_10af7b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af7dc: 0x10af7dc: jr    ra addiu sp, sp, 1376
+// 0x010afe24: 0x10afe24: jr    ra addiu sp, sp, 1376
 	ldloc.0
 	ldc.i4 1376
 	add
@@ -1865,7 +1865,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_util_find_street_10af7e4(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_find_street_10afe2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s5,int32 s7,int32 s6,int32 s1,int32 s3,int32 s0,int32 s2,int32 s4,int32 s8,int32 ra,int32 lo)
@@ -1930,12 +1930,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010af7e4: 0x10af7e4: addiu sp, sp, -680
+// 0x010afe2c: 0x10afe2c: addiu sp, sp, -680
 	ldloc.0
 	ldc.i4 -680
 	add
 	stloc.0
-// 0x010af7e8: 0x10af7e8: sw    s6, 664(sp)
+// 0x010afe30: 0x10afe30: sw    s6, 664(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1944,14 +1944,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010af7ec: 0x10af7ec: lw    s6, 0(a2)
+// 0x010afe34: 0x10afe34: lw    s6, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010af7f0: 0x10af7f0: sw    s5, 660(sp)
+// 0x010afe38: 0x10afe38: sw    s5, 660(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1960,17 +1960,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010af7f4: 0x10af7f4: sltu  s6, zero, s6
+// 0x010afe3c: 0x10afe3c: sltu  s6, zero, s6
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 10
-// 0x010af7f8: 0x10af7f8: addiu s5, sp, 116
+// 0x010afe40: 0x10afe40: addiu s5, sp, 116
 	ldloc.0
 	ldc.i4.s 116
 	add
 	stloc 8
-// 0x010af7fc: 0x10af7fc: sw    s4, 656(sp)
+// 0x010afe44: 0x10afe44: sw    s4, 656(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1979,7 +1979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010af800: 0x10af800: sw    a1, 684(sp)
+// 0x010afe48: 0x10afe48: sw    a1, 684(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1988,21 +1988,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010af804: 0x10af804: addu  s4, a0, zero
+// 0x010afe4c: 0x10afe4c: addu  s4, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010af808: 0x10af808: addiu a1, zero, 128
+// 0x010afe50: 0x10afe50: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x010af80c: 0x10af80c: addu  a0, s5, zero
+// 0x010afe54: 0x10afe54: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x010af810: 0x10af810: subu  s6, zero, s6
+// 0x010afe58: 0x10afe58: subu  s6, zero, s6
 	ldloc 10
 	neg
 	stloc 10
-// 0x010af814: 0x10af814: sw    ra, 676(sp)
-// 0x010af818: 0x10af818: sw    s8, 672(sp)
+// 0x010afe5c: 0x10afe5c: sw    ra, 676(sp)
+// 0x010afe60: 0x10afe60: sw    s8, 672(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2011,7 +2011,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010af81c: 0x10af81c: sw    s7, 668(sp)
+// 0x010afe64: 0x10afe64: sw    s7, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2020,7 +2020,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af820: 0x10af820: sw    s3, 652(sp)
+// 0x010afe68: 0x10afe68: sw    s3, 652(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2029,7 +2029,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010af824: 0x10af824: lw    s7, 700(sp)
+// 0x010afe6c: 0x10afe6c: lw    s7, 700(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2038,7 +2038,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010af828: 0x10af828: lw    s3, 696(sp)
+// 0x010afe70: 0x10afe70: lw    s3, 696(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2047,7 +2047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010af82c: 0x10af82c: sw    s2, 648(sp)
+// 0x010afe74: 0x10afe74: sw    s2, 648(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2056,7 +2056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010af830: 0x10af830: sw    s1, 644(sp)
+// 0x010afe78: 0x10afe78: sw    s1, 644(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2065,7 +2065,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010af834: 0x10af834: sw    s0, 640(sp)
+// 0x010afe7c: 0x10afe7c: sw    s0, 640(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2074,12 +2074,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010af838: 0x10af838: and   s6, a3, s6
+// 0x010afe80: 0x10afe80: and   s6, a3, s6
 	ldloc 4
 	ldloc 10
 	and
 	stloc 10
-// 0x010af83c: 0x10af83c: lw    s1, 708(sp)
+// 0x010afe84: 0x10afe84: lw    s1, 708(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2088,7 +2088,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010af840: 0x10af840: lw    s2, 712(sp)
+// 0x010afe88: 0x10afe88: lw    s2, 712(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2097,37 +2097,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010af844: 0x10af844: jal   0x1010058 addu  s0, a2, zero
+// 0x010afe8c: 0x10afe8c: jal   0x1010068 addu  s0, a2, zero
 	ldloc.3
 	stloc 13
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af84c: 0x10af84c: addu  s8, v0, zero
+// 0x010afe94: 0x10afe94: addu  s8, v0, zero
 	ldloc 5
 	stloc 16
-// 0x010af850: 0x10af850: addu  a2, s5, zero
+// 0x010afe98: 0x10afe98: addu  a2, s5, zero
 	ldloc 8
 	stloc.3
-// 0x010af854: 0x10af854: addu  a3, v0, zero
+// 0x010afe9c: 0x10afe9c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010af858: 0x10af858: addu  a0, s4, zero
+// 0x010afea0: 0x10afea0: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x010af85c: 0x10af85c: addu  a1, zero, zero
+// 0x010afea4: 0x10afea4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010af860: 0x10af860: addiu v0, zero, 3
+// 0x010afea8: 0x10afea8: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010af864: 0x10af864: sw    s7, 24(sp)
+// 0x010afeac: 0x10afeac: sw    s7, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2136,7 +2136,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af868: 0x10af868: sw    v0, 16(sp)
+// 0x010afeb0: 0x10afeb0: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2145,7 +2145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010af86c: 0x10af86c: jal   0x1013028 sw    s3, 20(sp)
+// 0x010afeb4: 0x10afeb4: jal   0x1013038 sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2159,24 +2159,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af874: 0x10af874: addu  a1, s5, zero
+// 0x010afebc: 0x10afebc: addu  a1, s5, zero
 	ldloc 8
 	stloc.2
-// 0x010af878: 0x10af878: addu  a2, s8, zero
+// 0x010afec0: 0x10afec0: addu  a2, s8, zero
 	ldloc 16
 	stloc.3
-// 0x010af87c: 0x10af87c: addu  a0, s4, zero
+// 0x010afec4: 0x10afec4: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x010af880: 0x10af880: addiu a3, zero, 3
+// 0x010afec8: 0x10afec8: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010af884: 0x10af884: sw    s7, 24(sp)
+// 0x010afecc: 0x10afecc: sw    s7, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2185,7 +2185,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010af888: 0x10af888: sw    v0, 20(sp)
+// 0x010afed0: 0x10afed0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2194,7 +2194,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010af88c: 0x10af88c: jal   0x1014978 sw    s3, 16(sp)
+// 0x010afed4: 0x10afed4: jal   0x1014988 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2208,35 +2208,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_closest_1014978(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_closest_1014988(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af894: 0x10af894: jal   0x102be38 addu  s8, v0, zero
+// 0x010afedc: 0x10afedc: jal   0x102be48 addu  s8, v0, zero
 	ldloc 5
 	stloc 16
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x010af89c: 0x10af89c: jal   0x102be38 sw    v0, 0(s2)
+// 0x010afee4: 0x10afee4: jal   0x102be48 sw    v0, 0(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x010af8a4: 0x10af8a4: sw    v0, 0(s1)
+// 0x010afeec: 0x10afeec: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010af8a8: 0x10af8a8: lw    v0, 704(sp)
+// 0x010afef0: 0x10afef0: lw    v0, 704(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2245,23 +2245,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af8ac: 0x10af8ac: addu  s7, s3, zero
+// 0x010afef4: 0x10afef4: addu  s7, s3, zero
 	ldloc 12
 	stloc 9
-// 0x010af8b0: 0x10af8b0: sw    zero, 0(v0)
+// 0x010afef8: 0x10afef8: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010af8b4: 0x10af8b4: j	 0x10af92c addu  s5, zero, zero
+// 0x010afefc: 0x10afefc: j	 0x10aff74 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10af92c
+	br L_10aff74
 // --- basic block ---
-L_10af8bc:
-// 0x010af8bc: 0x10af8bc: lw    v0, 16(s4)
+L_10aff04:
+// 0x010aff04: 0x10aff04: lw    v0, 16(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -2270,7 +2270,7 @@ L_10af8bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af8c0: 0x10af8c0: sw    zero, 16(sp)
+// 0x010aff08: 0x10aff08: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2279,7 +2279,7 @@ L_10af8bc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010af8c4: 0x10af8c4: jal   0x102a3cc sw    v0, 20(sp)
+// 0x010aff0c: 0x10aff0c: jal   0x102a3dc sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2293,19 +2293,19 @@ L_10af8bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af8cc: 0x10af8cc: lw    v1, 0(s1)
+// 0x010aff14: 0x10aff14: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010af8d0: 0x10af8d0: lw    a0, 684(sp)
+// 0x010aff18: 0x10aff18: lw    a0, 684(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2314,23 +2314,23 @@ L_10af8bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010af8d4: 0x10af8d4: slt   v1, v1, v0
+// 0x010aff1c: 0x10aff1c: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010af8d8: 0x10af8d8: addiu a1, sp, 40
+// 0x010aff20: 0x10aff20: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010af8dc: 0x10af8dc: beq   v1, zero, 0x10af90c addiu a2, zero, 76
+// 0x010aff24: 0x10aff24: beq   v1, zero, 0x10aff54 addiu a2, zero, 76
 	ldloc 7
 	ldc.i4.s 76
 	stloc.3
-	brfalse L_10af90c
+	brfalse L_10aff54
 // --- basic block ---
-// 0x010af8e4: 0x10af8e4: lw    v1, 704(sp)
+// 0x010aff2c: 0x10aff2c: lw    v1, 704(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2339,30 +2339,30 @@ L_10af8bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010af8e8: 0x10af8e8: sll   zero, zero, 0
-// 0x010af8ec: 0x10af8ec: sw    s5, 0(v1)
+// 0x010aff30: 0x10aff30: sll   zero, zero, 0
+// 0x010aff34: 0x10aff34: sw    s5, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x010af8f0: 0x10af8f0: lw    v1, 0(s1)
+// 0x010aff38: 0x10aff38: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010af8f4: 0x10af8f4: sll   zero, zero, 0
-// 0x010af8f8: 0x10af8f8: sw    v1, 0(s2)
+// 0x010aff3c: 0x10aff3c: sll   zero, zero, 0
+// 0x010aff40: 0x10aff40: sw    v1, 0(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010af8fc: 0x10af8fc: jal   0x1001800 sw    v0, 0(s1)
+// 0x010aff44: 0x10aff44: jal   0x1001800 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2378,104 +2378,104 @@ L_10af8bc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af904: 0x10af904: j	 0x10af928 addiu s5, s5, 1
+// 0x010aff4c: 0x10aff4c: j	 0x10aff70 addiu s5, s5, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10af928
+	br L_10aff70
 // --- basic block ---
-L_10af90c:
-// 0x010af90c: 0x10af90c: lw    v1, 0(s2)
+L_10aff54:
+// 0x010aff54: 0x10aff54: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010af910: 0x10af910: sll   zero, zero, 0
-// 0x010af914: 0x10af914: slt   v1, v1, v0
+// 0x010aff58: 0x10aff58: sll   zero, zero, 0
+// 0x010aff5c: 0x10aff5c: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010af918: 0x10af918: beq   v1, zero, 0x10af924 sll   zero, zero, 0
+// 0x010aff60: 0x10aff60: beq   v1, zero, 0x10aff6c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10af924
+	brfalse L_10aff6c
 // --- basic block ---
-// 0x010af920: 0x10af920: sw    v0, 0(s2)
+// 0x010aff68: 0x10aff68: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10af924:
-// 0x010af924: 0x10af924: addiu s5, s5, 1
+L_10aff6c:
+// 0x010aff6c: 0x10aff6c: addiu s5, s5, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10af928:
-// 0x010af928: 0x10af928: addiu s7, s7, 48
+L_10aff70:
+// 0x010aff70: 0x10aff70: addiu s7, s7, 48
 	ldloc 9
 	ldc.i4.s 48
 	add
 	stloc 9
-L_10af92c:
-// 0x010af92c: 0x10af92c: slt   v0, s5, s8
+L_10aff74:
+// 0x010aff74: 0x10aff74: slt   v0, s5, s8
 	ldloc 8
 	ldloc 16
 	clt
 	stloc 5
-// 0x010af930: 0x10af930: addu  a3, s7, zero
+// 0x010aff78: 0x10aff78: addu  a3, s7, zero
 	ldloc 9
 	stloc 4
-// 0x010af934: 0x10af934: addiu a0, sp, 40
+// 0x010aff7c: 0x10aff7c: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010af938: 0x10af938: addu  a1, s0, zero
+// 0x010aff80: 0x10aff80: addu  a1, s0, zero
 	ldloc 13
 	stloc.2
-// 0x010af93c: 0x10af93c: bne   v0, zero, 0x10af8bc addu  a2, s6, zero
+// 0x010aff84: 0x10aff84: bne   v0, zero, 0x10aff04 addu  a2, s6, zero
 	ldloc 5
 	ldloc 10
 	stloc.3
-	brtrue L_10af8bc
+	brtrue L_10aff04
 // --- basic block ---
-// 0x010af944: 0x10af944: lw    a0, 0(s1)
+// 0x010aff8c: 0x10aff8c: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010af948: 0x10af948: jal   0x102be40 sll   zero, zero, 0
+// 0x010aff90: 0x10aff90: jal   0x102be50 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x010af950: 0x10af950: beq   v0, zero, 0x10afa9c addu  s7, zero, zero
+// 0x010aff98: 0x10aff98: beq   v0, zero, 0x10b00e4 addu  s7, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_10afa9c
+	brfalse L_10b00e4
 // --- basic block ---
-// 0x010af958: 0x10af958: lw    v0, 0(s0)
+// 0x010affa0: 0x10affa0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010af95c: 0x10af95c: sll   zero, zero, 0
-// 0x010af960: 0x10af960: beq   v0, zero, 0x10afaa8 sll   zero, zero, 0
+// 0x010affa4: 0x10affa4: sll   zero, zero, 0
+// 0x010affa8: 0x10affa8: beq   v0, zero, 0x10b00f0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afaa8
+	brfalse L_10b00f0
 // --- basic block ---
-// 0x010af968: 0x10af968: lw    v0, 24(s0)
+// 0x010affb0: 0x10affb0: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2484,16 +2484,16 @@ L_10af92c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af96c: 0x10af96c: sll   zero, zero, 0
-// 0x010af970: 0x10af970: bne   v0, zero, 0x10afa9c sll   zero, zero, 0
+// 0x010affb4: 0x10affb4: sll   zero, zero, 0
+// 0x010affb8: 0x10affb8: bne   v0, zero, 0x10b00e4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10afa9c
+	brtrue L_10b00e4
 // --- basic block ---
-// 0x010af978: 0x10af978: j	 0x10afaa8 sll   zero, zero, 0
-	br L_10afaa8
+// 0x010affc0: 0x10affc0: j	 0x10b00f0 sll   zero, zero, 0
+	br L_10b00f0
 // --- basic block ---
-L_10af980:
-// 0x010af980: 0x10af980: lw    v0, 16(s4)
+L_10affc8:
+// 0x010affc8: 0x10affc8: lw    v0, 16(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -2502,8 +2502,8 @@ L_10af980:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af984: 0x10af984: sll   zero, zero, 0
-// 0x010af988: 0x10af988: sw    v0, 20(sp)
+// 0x010affcc: 0x10affcc: sll   zero, zero, 0
+// 0x010affd0: 0x10affd0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2512,19 +2512,19 @@ L_10af980:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010af98c: 0x10af98c: addu  a1, s0, zero
+// 0x010affd4: 0x10affd4: addu  a1, s0, zero
 	ldloc 13
 	stloc.2
-// 0x010af990: 0x10af990: addiu v0, zero, 1
+// 0x010affd8: 0x10affd8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010af994: 0x10af994: addu  a2, s6, zero
+// 0x010affdc: 0x10affdc: addu  a2, s6, zero
 	ldloc 10
 	stloc.3
-// 0x010af998: 0x10af998: addu  a3, s3, zero
+// 0x010affe0: 0x10affe0: addu  a3, s3, zero
 	ldloc 12
 	stloc 4
-// 0x010af99c: 0x10af99c: jal   0x102a3cc sw    v0, 16(sp)
+// 0x010affe4: 0x10affe4: jal   0x102a3dc sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2538,38 +2538,38 @@ L_10af980:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af9a4: 0x10af9a4: addu  a0, v0, zero
+// 0x010affec: 0x10affec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010af9a8: 0x10af9a8: jal   0x102be58 addu  s5, v0, zero
+// 0x010afff0: 0x10afff0: jal   0x102be68 addu  s5, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x010af9b0: 0x10af9b0: bne   v0, zero, 0x10afa3c sll   zero, zero, 0
+// 0x010afff8: 0x10afff8: bne   v0, zero, 0x10b0084 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10afa3c
+	brtrue L_10b0084
 // --- basic block ---
-// 0x010af9b8: 0x10af9b8: lw    v0, 0(s0)
+// 0x010b0000: 0x10b0000: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010af9bc: 0x10af9bc: sll   zero, zero, 0
-// 0x010af9c0: 0x10af9c0: beq   v0, zero, 0x10afa94 sll   zero, zero, 0
+// 0x010b0004: 0x10b0004: sll   zero, zero, 0
+// 0x010b0008: 0x10b0008: beq   v0, zero, 0x10b00dc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afa94
+	brfalse L_10b00dc
 // --- basic block ---
-// 0x010af9c8: 0x10af9c8: lw    v0, 24(s0)
+// 0x010b0010: 0x10b0010: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2578,14 +2578,14 @@ L_10af980:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010af9cc: 0x10af9cc: sll   zero, zero, 0
-// 0x010af9d0: 0x10af9d0: beq   v0, zero, 0x10afa94 addu  a0, s3, zero
+// 0x010b0014: 0x10b0014: sll   zero, zero, 0
+// 0x010b0018: 0x10b0018: beq   v0, zero, 0x10b00dc addu  a0, s3, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brfalse L_10afa94
+	brfalse L_10b00dc
 // --- basic block ---
-// 0x010af9d8: 0x10af9d8: jal   0x1014b10 addu  a1, s6, zero
+// 0x010b0020: 0x10b0020: jal   0x1014b20 addu  a1, s6, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -2593,18 +2593,18 @@ L_10af980:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010af9e0: 0x10af9e0: bne   v0, zero, 0x10afa3c addu  a0, s3, zero
+// 0x010b0028: 0x10b0028: bne   v0, zero, 0x10b0084 addu  a0, s3, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_10afa3c
+	brtrue L_10b0084
 // --- basic block ---
-// 0x010af9e8: 0x10af9e8: lw    a2, 20(s0)
+// 0x010b0030: 0x10b0030: lw    a2, 20(s0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2613,7 +2613,7 @@ L_10af980:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010af9ec: 0x10af9ec: lw    a3, 60(sp)
+// 0x010b0034: 0x10b0034: lw    a3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2622,15 +2622,15 @@ L_10af980:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010af9f0: 0x10af9f0: addiu v1, sp, 32
+// 0x010b0038: 0x10b0038: addiu v1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 7
-// 0x010af9f4: 0x10af9f4: addu  a1, s6, zero
+// 0x010b003c: 0x10b003c: addu  a1, s6, zero
 	ldloc 10
 	stloc.2
-// 0x010af9f8: 0x10af9f8: jal   0x102bee0 sw    v1, 16(sp)
+// 0x010b0040: 0x10b0040: jal   0x102bef0 sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2644,27 +2644,27 @@ L_10af980:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_fuzzy_connected_102bee0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_connected_102bef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afa00: 0x10afa00: jal   0x102be64 addu  a0, v0, zero
+// 0x010b0048: 0x10b0048: jal   0x102be74 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be64(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be74(int32)
 	stloc 5
 // --- basic block ---
-// 0x010afa08: 0x10afa08: beq   v0, zero, 0x10afa94 addiu a0, sp, 32
+// 0x010b0050: 0x10b0050: beq   v0, zero, 0x10b00dc addiu a0, sp, 32
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-	brfalse L_10afa94
+	brfalse L_10b00dc
 // --- basic block ---
-// 0x010afa10: 0x10afa10: jal   0x1008eb0 addu  a1, s4, zero
+// 0x010b0058: 0x10b0058: jal   0x1008ec0 addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -2672,12 +2672,12 @@ L_10af980:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afa18: 0x10afa18: jal   0x10b0f9c sw    v0, 632(sp)
+// 0x010b0060: 0x10b0060: jal   0x10b15e4 sw    v0, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2691,20 +2691,20 @@ L_10af980:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afa20: 0x10afa20: addiu a0, zero, 3
+// 0x010b0068: 0x10b0068: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010afa24: 0x10afa24: mult  v0, a0
+// 0x010b006c: 0x10b006c: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 18
-// 0x010afa28: 0x10afa28: lw    v1, 632(sp)
+// 0x010b0070: 0x10b0070: lw    v1, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2713,41 +2713,41 @@ L_10af980:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010afa2c: 0x10afa2c: mflo  lo
+// 0x010b0074: 0x10b0074: mflo  lo
 	ldloc 18
 	stloc 5
-// 0x010afa30: 0x10afa30: slt   v1, v1, v0
+// 0x010b0078: 0x10b0078: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010afa34: 0x10afa34: beq   v1, zero, 0x10afa94 sll   zero, zero, 0
+// 0x010b007c: 0x10b007c: beq   v1, zero, 0x10b00dc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10afa94
+	brfalse L_10b00dc
 // --- basic block ---
-L_10afa3c:
-// 0x010afa3c: 0x10afa3c: lw    v0, 0(s1)
+L_10b0084:
+// 0x010b0084: 0x10b0084: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010afa40: 0x10afa40: sll   zero, zero, 0
-// 0x010afa44: 0x10afa44: slt   v0, v0, s5
+// 0x010b0088: 0x10b0088: sll   zero, zero, 0
+// 0x010b008c: 0x10b008c: slt   v0, v0, s5
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x010afa48: 0x10afa48: beq   v0, zero, 0x10afa7c addiu a1, sp, 40
+// 0x010b0090: 0x10b0090: beq   v0, zero, 0x10b00c4 addiu a1, sp, 40
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-	brfalse L_10afa7c
+	brfalse L_10b00c4
 // --- basic block ---
-// 0x010afa50: 0x10afa50: lw    v0, 704(sp)
+// 0x010b0098: 0x10b0098: lw    v0, 704(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2756,7 +2756,7 @@ L_10afa3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afa54: 0x10afa54: lw    a0, 684(sp)
+// 0x010b009c: 0x10b009c: lw    a0, 684(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2765,32 +2765,32 @@ L_10afa3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010afa58: 0x10afa58: sw    s7, 0(v0)
+// 0x010b00a0: 0x10b00a0: sw    s7, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010afa5c: 0x10afa5c: lw    v0, 0(s1)
+// 0x010b00a4: 0x10b00a4: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010afa60: 0x10afa60: sll   zero, zero, 0
-// 0x010afa64: 0x10afa64: sw    v0, 0(s2)
+// 0x010b00a8: 0x10b00a8: sll   zero, zero, 0
+// 0x010b00ac: 0x10b00ac: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010afa68: 0x10afa68: addiu a2, zero, 76
+// 0x010b00b0: 0x10b00b0: addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
-// 0x010afa6c: 0x10afa6c: jal   0x1001800 sw    s5, 0(s1)
+// 0x010b00b4: 0x10b00b4: jal   0x1001800 sw    s5, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2806,70 +2806,70 @@ L_10afa3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afa74: 0x10afa74: j	 0x10afa98 addiu s7, s7, 1
+// 0x010b00bc: 0x10b00bc: j	 0x10b00e0 addiu s7, s7, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_10afa98
+	br L_10b00e0
 // --- basic block ---
-L_10afa7c:
-// 0x010afa7c: 0x10afa7c: lw    v0, 0(s2)
+L_10b00c4:
+// 0x010b00c4: 0x10b00c4: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010afa80: 0x10afa80: sll   zero, zero, 0
-// 0x010afa84: 0x10afa84: slt   v0, v0, s5
+// 0x010b00c8: 0x10b00c8: sll   zero, zero, 0
+// 0x010b00cc: 0x10b00cc: slt   v0, v0, s5
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x010afa88: 0x10afa88: beq   v0, zero, 0x10afa94 sll   zero, zero, 0
+// 0x010b00d0: 0x10b00d0: beq   v0, zero, 0x10b00dc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afa94
+	brfalse L_10b00dc
 // --- basic block ---
-// 0x010afa90: 0x10afa90: sw    s5, 0(s2)
+// 0x010b00d8: 0x10b00d8: sw    s5, 0(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_10afa94:
-// 0x010afa94: 0x10afa94: addiu s7, s7, 1
+L_10b00dc:
+// 0x010b00dc: 0x10b00dc: addiu s7, s7, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10afa98:
-// 0x010afa98: 0x10afa98: addiu s3, s3, 48
+L_10b00e0:
+// 0x010b00e0: 0x10b00e0: addiu s3, s3, 48
 	ldloc 12
 	ldc.i4.s 48
 	add
 	stloc 12
-L_10afa9c:
-// 0x010afa9c: 0x10afa9c: slt   v0, s7, s8
+L_10b00e4:
+// 0x010b00e4: 0x10b00e4: slt   v0, s7, s8
 	ldloc 9
 	ldloc 16
 	clt
 	stloc 5
-// 0x010afaa0: 0x10afaa0: bne   v0, zero, 0x10af980 addiu a0, sp, 40
+// 0x010b00e8: 0x10b00e8: bne   v0, zero, 0x10affc8 addiu a0, sp, 40
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	brtrue L_10af980
+	brtrue L_10affc8
 // --- basic block ---
-L_10afaa8:
-// 0x010afaa8: 0x10afaa8: lw    ra, 676(sp)
-// 0x010afaac: 0x10afaac: addu  v0, s8, zero
+L_10b00f0:
+// 0x010b00f0: 0x10b00f0: lw    ra, 676(sp)
+// 0x010b00f4: 0x10b00f4: addu  v0, s8, zero
 	ldloc 16
 	stloc 5
-// 0x010afab0: 0x10afab0: lw    s8, 672(sp)
+// 0x010b00f8: 0x10b00f8: lw    s8, 672(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2878,7 +2878,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010afab4: 0x10afab4: lw    s7, 668(sp)
+// 0x010b00fc: 0x10b00fc: lw    s7, 668(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2887,7 +2887,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010afab8: 0x10afab8: lw    s6, 664(sp)
+// 0x010b0100: 0x10b0100: lw    s6, 664(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2896,7 +2896,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010afabc: 0x10afabc: lw    s5, 660(sp)
+// 0x010b0104: 0x10b0104: lw    s5, 660(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2905,7 +2905,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010afac0: 0x10afac0: lw    s4, 656(sp)
+// 0x010b0108: 0x10b0108: lw    s4, 656(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2914,7 +2914,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010afac4: 0x10afac4: lw    s3, 652(sp)
+// 0x010b010c: 0x10b010c: lw    s3, 652(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2923,7 +2923,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010afac8: 0x10afac8: lw    s2, 648(sp)
+// 0x010b0110: 0x10b0110: lw    s2, 648(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2932,7 +2932,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010afacc: 0x10afacc: lw    s1, 644(sp)
+// 0x010b0114: 0x10b0114: lw    s1, 644(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2941,7 +2941,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010afad0: 0x10afad0: lw    s0, 640(sp)
+// 0x010b0118: 0x10b0118: lw    s0, 640(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2950,7 +2950,7 @@ L_10afaa8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010afad4: 0x10afad4: jr    ra addiu sp, sp, 680
+// 0x010b011c: 0x10b011c: jr    ra addiu sp, sp, 680
 	ldloc.0
 	ldc.i4 680
 	add
@@ -2962,7 +2962,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_get_distance_10afadc(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_get_distance_10b0124(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -3000,12 +3000,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010afadc: 0x10afadc: addiu sp, sp, -32
+// 0x010b0124: 0x10b0124: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010afae0: 0x10afae0: sw    s0, 24(sp)
+// 0x010b0128: 0x10b0128: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3014,14 +3014,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010afae4: 0x10afae4: addu  s0, a0, zero
+// 0x010b012c: 0x10b012c: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010afae8: 0x10afae8: addu  a0, a1, zero
+// 0x010b0130: 0x10b0130: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010afaec: 0x10afaec: sw    ra, 28(sp)
-// 0x010afaf0: 0x10afaf0: sw    a1, 16(sp)
+// 0x010b0134: 0x10b0134: sw    ra, 28(sp)
+// 0x010b0138: 0x10b0138: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3030,7 +3030,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010afaf4: 0x10afaf4: jal   0x1015474 sw    a2, 20(sp)
+// 0x010b013c: 0x10b013c: jal   0x1015484 sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3044,12 +3044,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_activate_db_1015474(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_activate_db_1015484(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010afafc: 0x10afafc: lw    a1, 16(sp)
+// 0x010b0144: 0x10b0144: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3058,7 +3058,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010afb00: 0x10afb00: lw    a2, 20(sp)
+// 0x010b0148: 0x10b0148: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3067,7 +3067,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010afb04: 0x10afb04: jal   0x1015394 addu  a0, s0, zero
+// 0x010b014c: 0x10b014c: jal   0x10153a4 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3075,13 +3075,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_distance_1015394(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_distance_10153a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010afb0c: 0x10afb0c: lw    ra, 28(sp)
-// 0x010afb10: 0x10afb10: lw    s0, 24(sp)
+// 0x010b0154: 0x10b0154: lw    ra, 28(sp)
+// 0x010b0158: 0x10b0158: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3090,7 +3090,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010afb14: 0x10afb14: jr    ra addiu sp, sp, 32
+// 0x010b015c: 0x10b015c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3102,7 +3102,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 editor_track_util_release_focus_10afb1c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_release_focus_10b0164(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3137,26 +3137,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010afb1c: 0x10afb1c: addiu sp, sp, -24
+// 0x010b0164: 0x10b0164: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010afb20: 0x10afb20: sw    ra, 20(sp)
-// 0x010afb24: 0x10afb24: jal   0x1007718 sll   zero, zero, 0
+// 0x010b0168: 0x10b0168: sw    ra, 20(sp)
+// 0x010b016c: 0x10b016c: jal   0x1007728 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_release_focus_1007718(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_release_focus_1007728(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010afb2c: 0x10afb2c: lw    ra, 20(sp)
-// 0x010afb30: 0x10afb30: sll   zero, zero, 0
-// 0x010afb34: 0x10afb34: jr    ra addiu sp, sp, 24
+// 0x010b0174: 0x10b0174: lw    ra, 20(sp)
+// 0x010b0178: 0x10b0178: sll   zero, zero, 0
+// 0x010b017c: 0x10b017c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3168,7 +3168,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_track_util_set_focus_10afb3c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_set_focus_10b0184(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -3203,7 +3203,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010afb3c: 0x10afb3c: lw    v1, 4(a0)
+// 0x010b0184: 0x10b0184: lw    v1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3212,45 +3212,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010afb40: 0x10afb40: lw    a2, 0(a0)
+// 0x010b0188: 0x10b0188: lw    a2, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010afb44: 0x10afb44: addiu sp, sp, -40
+// 0x010b018c: 0x10b018c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010afb48: 0x10afb48: addiu v0, v1, 10000
+// 0x010b0190: 0x10b0190: addiu v0, v1, 10000
 	ldloc 6
 	ldc.i4 10000
 	add
 	stloc 7
-// 0x010afb4c: 0x10afb4c: addiu a1, a2, 10000
+// 0x010b0194: 0x10b0194: addiu a1, a2, 10000
 	ldloc.3
 	ldc.i4 10000
 	add
 	stloc.2
-// 0x010afb50: 0x10afb50: addiu v1, v1, -10000
+// 0x010b0198: 0x10b0198: addiu v1, v1, -10000
 	ldloc 6
 	ldc.i4 -10000
 	add
 	stloc 6
-// 0x010afb54: 0x10afb54: addiu a2, a2, -10000
+// 0x010b019c: 0x10b019c: addiu a2, a2, -10000
 	ldloc.3
 	ldc.i4 -10000
 	add
 	stloc.3
-// 0x010afb58: 0x10afb58: addiu a0, sp, 16
+// 0x010b01a0: 0x10b01a0: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010afb5c: 0x10afb5c: sw    ra, 36(sp)
-// 0x010afb60: 0x10afb60: sw    a2, 24(sp)
+// 0x010b01a4: 0x10b01a4: sw    ra, 36(sp)
+// 0x010b01a8: 0x10b01a8: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3259,7 +3259,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010afb64: 0x10afb64: sw    a1, 16(sp)
+// 0x010b01ac: 0x10b01ac: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3268,7 +3268,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010afb68: 0x10afb68: sw    v1, 28(sp)
+// 0x010b01b0: 0x10b01b0: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3277,7 +3277,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010afb6c: 0x10afb6c: jal   0x10076a8 sw    v0, 20(sp)
+// 0x010b01b4: 0x10b01b4: jal   0x10076b8 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3291,14 +3291,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_focus_10076a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_focus_10076b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010afb74: 0x10afb74: lw    ra, 36(sp)
-// 0x010afb78: 0x10afb78: sll   zero, zero, 0
-// 0x010afb7c: 0x10afb7c: jr    ra addiu sp, sp, 40
+// 0x010b01bc: 0x10b01bc: lw    ra, 36(sp)
+// 0x010b01c0: 0x10b01c0: sll   zero, zero, 0
+// 0x010b01c4: 0x10b01c4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3310,7 +3310,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 find_split_point_10afb84(int32,int32,int32,int32,int32)
+.method public static int32 find_split_point_10b01cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 s7,int32 s8,int32 s4,int32 s3,int32 s5,int32 s6,int32 ra,int32 lo)
@@ -3375,24 +3375,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010afb84: 0x10afb84: lw    v0, 0(a0)
+// 0x010b01cc: 0x10b01cc: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010afb88: 0x10afb88: addiu sp, sp, -272
+// 0x010b01d0: 0x10b01d0: addiu sp, sp, -272
 	ldloc.0
 	ldc.i4 -272
 	add
 	stloc.0
-// 0x010afb8c: 0x10afb8c: addiu v1, a2, 1
+// 0x010b01d4: 0x10b01d4: addiu v1, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010afb90: 0x10afb90: sw    s5, 252(sp)
+// 0x010b01d8: 0x10b01d8: sw    s5, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3401,7 +3401,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010afb94: 0x10afb94: sw    s3, 244(sp)
+// 0x010b01dc: 0x10b01dc: sw    s3, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3410,7 +3410,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010afb98: 0x10afb98: sw    s1, 236(sp)
+// 0x010b01e0: 0x10b01e0: sw    s1, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3419,7 +3419,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010afb9c: 0x10afb9c: sw    s0, 232(sp)
+// 0x010b01e4: 0x10b01e4: sw    s0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3428,8 +3428,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010afba0: 0x10afba0: sw    ra, 268(sp)
-// 0x010afba4: 0x10afba4: sw    s8, 264(sp)
+// 0x010b01e8: 0x10b01e8: sw    ra, 268(sp)
+// 0x010b01ec: 0x10b01ec: sw    s8, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3438,7 +3438,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010afba8: 0x10afba8: sw    s7, 260(sp)
+// 0x010b01f0: 0x10b01f0: sw    s7, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3447,7 +3447,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010afbac: 0x10afbac: sw    s6, 256(sp)
+// 0x010b01f4: 0x10b01f4: sw    s6, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3456,7 +3456,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010afbb0: 0x10afbb0: sw    s4, 248(sp)
+// 0x010b01f8: 0x10b01f8: sw    s4, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3465,7 +3465,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010afbb4: 0x10afbb4: sw    s2, 240(sp)
+// 0x010b01fc: 0x10b01fc: sw    s2, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3474,10 +3474,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010afbb8: 0x10afbb8: addu  s0, a0, zero
+// 0x010b0200: 0x10b0200: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010afbbc: 0x10afbbc: sw    a2, 280(sp)
+// 0x010b0204: 0x10b0204: sw    a2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3486,13 +3486,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010afbc0: 0x10afbc0: addu  s1, a1, zero
+// 0x010b0208: 0x10b0208: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010afbc4: 0x10afbc4: addu  s5, a3, zero
+// 0x010b020c: 0x10b020c: addu  s5, a3, zero
 	ldloc 4
 	stloc 15
-// 0x010afbc8: 0x10afbc8: lw    s3, 296(sp)
+// 0x010b0210: 0x10b0210: lw    s3, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3501,7 +3501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010afbcc: 0x10afbcc: bne   v0, zero, 0x10afbfc sw    v1, 212(sp)
+// 0x010b0214: 0x10b0214: bne   v0, zero, 0x10b0244 sw    v1, 212(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3511,12 +3511,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_10afbfc
+	brtrue L_10b0244
 // --- basic block ---
-// 0x010afbd4: 0x10afbd4: lui   v0, 0x0
+// 0x010b021c: 0x10b021c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010afbd8: 0x10afbd8: lw    v0, 576(v0)
+// 0x010b0220: 0x10b0220: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3525,7 +3525,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afbdc: 0x10afbdc: lw    a0, 12(a0)
+// 0x010b0224: 0x10b0224: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3534,30 +3534,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010afbe0: 0x10afbe0: sll   zero, zero, 0
-// 0x010afbe4: 0x10afbe4: beq   a0, v0, 0x10afbfc sll   zero, zero, 0
+// 0x010b0228: 0x10b0228: sll   zero, zero, 0
+// 0x010b022c: 0x10b022c: beq   a0, v0, 0x10b0244 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10afbfc
+	beq  L_10b0244
 // --- basic block ---
-// 0x010afbec: 0x10afbec: bltz  a0, 0x10afbfc sll   zero, zero, 0
+// 0x010b0234: 0x10b0234: bltz  a0, 0x10b0244 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10afbfc
+	blt L_10b0244
 // --- basic block ---
-// 0x010afbf4: 0x10afbf4: jal   0x100b164 sll   zero, zero, 0
+// 0x010b023c: 0x10b023c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10afbfc:
-// 0x010afbfc: 0x10afbfc: lw    v1, 4(s0)
+L_10b0244:
+// 0x010b0244: 0x10b0244: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3566,36 +3566,36 @@ L_10afbfc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010afc00: 0x10afc00: lw    v0, 0(s0)
+// 0x010b0248: 0x10b0248: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010afc04: 0x10afc04: lui   a3, 0x20000
+// 0x010b024c: 0x10b024c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010afc08: 0x10afc08: lui   a1, 0x20000
+// 0x010b0250: 0x10b0250: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010afc0c: 0x10afc0c: addiu a3, a3, 17352
+// 0x010b0254: 0x10b0254: addiu a3, a3, 17812
 	ldloc 4
-	ldc.i4 17352
+	ldc.i4 17812
 	add
 	stloc 4
-// 0x010afc10: 0x10afc10: addiu a2, zero, 121
+// 0x010b0258: 0x10b0258: addiu a2, zero, 121
 	ldc.i4.s 121
 	stloc.3
-// 0x010afc14: 0x10afc14: addiu a1, a1, 17204
+// 0x010b025c: 0x10b025c: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010afc18: 0x10afc18: addiu a0, zero, 2
+// 0x010b0260: 0x10b0260: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010afc1c: 0x10afc1c: sw    v1, 16(sp)
+// 0x010b0264: 0x10b0264: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3604,7 +3604,7 @@ L_10afbfc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010afc20: 0x10afc20: sw    v0, 20(sp)
+// 0x010b0268: 0x10b0268: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3613,7 +3613,7 @@ L_10afbfc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afc24: 0x10afc24: jal   0x100449c sw    s5, 24(sp)
+// 0x010b026c: 0x10b026c: jal   0x100449c sw    s5, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3632,7 +3632,7 @@ L_10afbfc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afc2c: 0x10afc2c: jal   0x10b0f9c addiu s2, sp, 40
+// 0x010b0274: 0x10b0274: jal   0x10b15e4 addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3642,12 +3642,12 @@ L_10afbfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afc34: 0x10afc34: lw    s4, 288(sp)
+// 0x010b027c: 0x10b027c: lw    s4, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3656,19 +3656,19 @@ L_10afbfc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010afc38: 0x10afc38: sll   zero, zero, 0
-// 0x010afc3c: 0x10afc3c: mult  v0, s4
+// 0x010b0280: 0x10b0280: sll   zero, zero, 0
+// 0x010b0284: 0x10b0284: mult  v0, s4
 	ldloc 5
 	ldloc 13
 	mul
 	stloc 18
-// 0x010afc40: 0x10afc40: addu  a1, s2, zero
+// 0x010b0288: 0x10b0288: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010afc44: 0x10afc44: mflo  lo
+// 0x010b028c: 0x10b028c: mflo  lo
 	ldloc 18
 	stloc 13
-// 0x010afc48: 0x10afc48: jal   0x1014dd8 addu  a0, s0, zero
+// 0x010b0290: 0x10b0290: jal   0x1014de8 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -3676,15 +3676,15 @@ L_10afbfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afc50: 0x10afc50: addu  a0, s0, zero
+// 0x010b0298: 0x10b0298: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010afc54: 0x10afc54: jal   0x1014ccc addiu a1, sp, 48
+// 0x010b029c: 0x10b029c: jal   0x1014cdc addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3694,12 +3694,12 @@ L_10afbfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afc5c: 0x10afc5c: lw    v0, 4(s1)
+// 0x010b02a4: 0x10b02a4: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3708,22 +3708,22 @@ L_10afbfc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afc60: 0x10afc60: lw    v1, 0(s1)
+// 0x010b02a8: 0x10b02a8: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010afc64: 0x10afc64: addu  a1, s2, zero
+// 0x010b02ac: 0x10b02ac: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010afc68: 0x10afc68: addiu a0, sp, 64
+// 0x010b02b0: 0x10b02b0: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x010afc6c: 0x10afc6c: sw    v1, 56(sp)
+// 0x010b02b4: 0x10b02b4: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3732,7 +3732,7 @@ L_10afbfc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010afc70: 0x10afc70: sw    v0, 60(sp)
+// 0x010b02b8: 0x10b02b8: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3741,7 +3741,7 @@ L_10afbfc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afc74: 0x10afc74: sw    v1, 64(sp)
+// 0x010b02bc: 0x10b02bc: sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3750,7 +3750,7 @@ L_10afbfc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010afc78: 0x10afc78: jal   0x1008eb0 sw    v0, 68(sp)
+// 0x010b02c0: 0x10b02c0: jal   0x1008ec0 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3764,28 +3764,28 @@ L_10afbfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afc80: 0x10afc80: addu  s1, v0, zero
+// 0x010b02c8: 0x10b02c8: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010afc84: 0x10afc84: slt   v0, v0, s4
+// 0x010b02cc: 0x10b02cc: slt   v0, v0, s4
 	ldloc 5
 	ldloc 13
 	clt
 	stloc 5
-// 0x010afc88: 0x10afc88: beq   v0, zero, 0x10afca8 addiu a0, sp, 64
+// 0x010b02d0: 0x10b02d0: beq   v0, zero, 0x10b02f0 addiu a0, sp, 64
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-	brfalse L_10afca8
+	brfalse L_10b02f0
 // --- basic block ---
-// 0x010afc90: 0x10afc90: lw    v0, 40(sp)
+// 0x010b02d8: 0x10b02d8: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3794,8 +3794,8 @@ L_10afbfc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afc94: 0x10afc94: sll   zero, zero, 0
-// 0x010afc98: 0x10afc98: sw    v0, 56(sp)
+// 0x010b02dc: 0x10b02dc: sll   zero, zero, 0
+// 0x010b02e0: 0x10b02e0: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3804,7 +3804,7 @@ L_10afbfc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afc9c: 0x10afc9c: lw    v0, 44(sp)
+// 0x010b02e4: 0x10b02e4: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3813,8 +3813,8 @@ L_10afbfc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afca0: 0x10afca0: sll   zero, zero, 0
-// 0x010afca4: 0x10afca4: sw    v0, 60(sp)
+// 0x010b02e8: 0x10b02e8: sll   zero, zero, 0
+// 0x010b02ec: 0x10b02ec: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3823,8 +3823,8 @@ L_10afbfc:
 	add
 	ldloc 5
 	stelem.i4
-L_10afca8:
-// 0x010afca8: 0x10afca8: jal   0x1008eb0 addiu a1, sp, 48
+L_10b02f0:
+// 0x010b02f0: 0x10b02f0: jal   0x1008ec0 addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3834,29 +3834,29 @@ L_10afca8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afcb0: 0x10afcb0: slt   v1, v0, s1
+// 0x010b02f8: 0x10b02f8: slt   v1, v0, s1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 7
-// 0x010afcb4: 0x10afcb4: beq   v1, zero, 0x10afcdc slt   v0, v0, s4
+// 0x010b02fc: 0x10b02fc: beq   v1, zero, 0x10b0324 slt   v0, v0, s4
 	ldloc 7
 	ldloc 5
 	ldloc 13
 	clt
 	stloc 5
-	brfalse L_10afcdc
+	brfalse L_10b0324
 // --- basic block ---
-// 0x010afcbc: 0x10afcbc: beq   v0, zero, 0x10afcdc sll   zero, zero, 0
+// 0x010b0304: 0x10b0304: beq   v0, zero, 0x10b0324 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afcdc
+	brfalse L_10b0324
 // --- basic block ---
-// 0x010afcc4: 0x10afcc4: lw    v0, 48(sp)
+// 0x010b030c: 0x10b030c: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3865,8 +3865,8 @@ L_10afca8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afcc8: 0x10afcc8: sll   zero, zero, 0
-// 0x010afccc: 0x10afccc: sw    v0, 56(sp)
+// 0x010b0310: 0x10b0310: sll   zero, zero, 0
+// 0x010b0314: 0x10b0314: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3875,7 +3875,7 @@ L_10afca8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afcd0: 0x10afcd0: lw    v0, 52(sp)
+// 0x010b0318: 0x10b0318: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3884,7 +3884,7 @@ L_10afca8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afcd4: 0x10afcd4: j	 0x10b0220 sw    v0, 60(sp)
+// 0x010b031c: 0x10b031c: j	 0x10b0868 sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3893,29 +3893,29 @@ L_10afca8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10b0220
+	br L_10b0868
 // --- basic block ---
-L_10afcdc:
-// 0x010afcdc: 0x10afcdc: slt   s1, s1, s4
+L_10b0324:
+// 0x010b0324: 0x10b0324: slt   s1, s1, s4
 	ldloc 8
 	ldloc 13
 	clt
 	stloc 8
-// 0x010afce0: 0x10afce0: bne   s1, zero, 0x10b0220 andi  v0, s5, 4
+// 0x010b0328: 0x10b0328: bne   s1, zero, 0x10b0868 andi  v0, s5, 4
 	ldloc 8
 	ldloc 15
 	ldc.i4.4
 	and
 	stloc 5
-	brtrue L_10b0220
+	brtrue L_10b0868
 // --- basic block ---
-// 0x010afce8: 0x10afce8: bne   v0, zero, 0x10aff98 addiu s1, zero, -1
+// 0x010b0330: 0x10b0330: bne   v0, zero, 0x10b05e0 addiu s1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 8
-	brtrue L_10aff98
+	brtrue L_10b05e0
 // --- basic block ---
-// 0x010afcf0: 0x10afcf0: lw    v0, 212(sp)
+// 0x010b0338: 0x10b0338: lw    v0, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3924,17 +3924,17 @@ L_10afcdc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afcf4: 0x10afcf4: andi  v1, s5, 1
+// 0x010b033c: 0x10b033c: andi  v1, s5, 1
 	ldloc 15
 	ldc.i4.1
 	and
 	stloc 7
-// 0x010afcf8: 0x10afcf8: addiu v0, v0, -49
+// 0x010b0340: 0x10b0340: addiu v0, v0, -49
 	ldloc 5
 	ldc.i4.s -49
 	add
 	stloc 5
-// 0x010afcfc: 0x10afcfc: sw    v0, 216(sp)
+// 0x010b0344: 0x10b0344: sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3943,12 +3943,12 @@ L_10afcdc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afd00: 0x10afd00: andi  v0, s5, 2
+// 0x010b0348: 0x10b0348: andi  v0, s5, 2
 	ldloc 15
 	ldc.i4.2
 	and
 	stloc 5
-// 0x010afd04: 0x10afd04: lw    s2, 280(sp)
+// 0x010b034c: 0x10b034c: lw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3957,7 +3957,7 @@ L_10afcdc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010afd08: 0x10afd08: sw    v1, 220(sp)
+// 0x010b0350: 0x10b0350: sw    v1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3966,7 +3966,7 @@ L_10afcdc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010afd0c: 0x10afd0c: jal   0x102be38 sw    v0, 224(sp)
+// 0x010b0354: 0x10b0354: jal   0x102be48 sw    v0, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3975,36 +3975,36 @@ L_10afcdc:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x010afd14: 0x10afd14: addiu s7, zero, -1
+// 0x010b035c: 0x10b035c: addiu s7, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x010afd18: 0x10afd18: j	 0x10afef8 addu  s6, v0, zero
+// 0x010b0360: 0x10b0360: j	 0x10b0540 addu  s6, v0, zero
 	ldloc 5
 	stloc 16
-	br L_10afef8
+	br L_10b0540
 // --- basic block ---
-L_10afd20:
-// 0x010afd20: 0x10afd20: jal   0x10b07b4 addu  a0, s2, zero
+L_10b0368:
+// 0x010b0368: 0x10b0368: jal   0x10b0dfc addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_gps_10b07b4(int32)
+	call int32 Cibyl132::track_point_gps_10b0dfc(int32)
 	stloc 5
 // --- basic block ---
-// 0x010afd28: 0x10afd28: addu  s8, v0, zero
+// 0x010b0370: 0x10b0370: addu  s8, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010afd2c: 0x10afd2c: jal   0x10b07a0 addu  a0, s2, zero
+// 0x010b0374: 0x10b0374: jal   0x10b0de8 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010afd34: 0x10afd34: lw    s8, 16(s8)
+// 0x010b037c: 0x10b037c: lw    s8, 16(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4013,18 +4013,18 @@ L_10afd20:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010afd38: 0x10afd38: addu  a0, v0, zero
+// 0x010b0380: 0x10b0380: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010afd3c: 0x10afd3c: addu  a1, s0, zero
+// 0x010b0384: 0x10b0384: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x010afd40: 0x10afd40: addiu a2, sp, 80
+// 0x010b0388: 0x10b0388: addiu a2, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.3
-// 0x010afd44: 0x10afd44: jal   0x10afadc sw    s8, 208(sp)
+// 0x010b038c: 0x10b038c: jal   0x10b0124 sw    s8, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4038,18 +4038,18 @@ L_10afd20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_get_distance_10afadc(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_get_distance_10b0124(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afd4c: 0x10afd4c: beq   v0, zero, 0x10afef4 addiu v0, zero, 2
+// 0x010b0394: 0x10b0394: beq   v0, zero, 0x10b053c addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brfalse L_10afef4
+	brfalse L_10b053c
 // --- basic block ---
-// 0x010afd54: 0x10afd54: lw    v1, 292(sp)
+// 0x010b039c: 0x10b039c: lw    v1, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4058,17 +4058,17 @@ L_10afd20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010afd58: 0x10afd58: sll   zero, zero, 0
-// 0x010afd5c: 0x10afd5c: bne   v1, v0, 0x10afd74 addiu a0, sp, 104
+// 0x010b03a0: 0x10b03a0: sll   zero, zero, 0
+// 0x010b03a4: 0x10b03a4: bne   v1, v0, 0x10b03bc addiu a0, sp, 104
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 104
 	add
 	stloc.1
-	bne.un L_10afd74
+	bne.un L_10b03bc
 // --- basic block ---
-// 0x010afd64: 0x10afd64: lw    v1, 208(sp)
+// 0x010b03ac: 0x10b03ac: lw    v1, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4077,13 +4077,13 @@ L_10afd20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010afd68: 0x10afd68: sll   zero, zero, 0
-// 0x010afd6c: 0x10afd6c: addiu v1, v1, -180
+// 0x010b03b0: 0x10b03b0: sll   zero, zero, 0
+// 0x010b03b4: 0x10b03b4: addiu v1, v1, -180
 	ldloc 7
 	ldc.i4 -180
 	add
 	stloc 7
-// 0x010afd70: 0x10afd70: sw    v1, 208(sp)
+// 0x010b03b8: 0x10b03b8: sw    v1, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4092,8 +4092,8 @@ L_10afd20:
 	add
 	ldloc 7
 	stelem.i4
-L_10afd74:
-// 0x010afd74: 0x10afd74: jal   0x1009824 addiu a1, sp, 112
+L_10b03bc:
+// 0x010b03bc: 0x10b03bc: jal   0x1009834 addiu a1, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -4103,12 +4103,12 @@ L_10afd74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afd7c: 0x10afd7c: lw    a0, 208(sp)
+// 0x010b03c4: 0x10b03c4: lw    a0, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4117,18 +4117,18 @@ L_10afd74:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010afd80: 0x10afd80: jal   0x1008410 addu  a1, v0, zero
+// 0x010b03c8: 0x10b03c8: jal   0x1008420 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010afd88: 0x10afd88: addu  s8, v0, zero
+// 0x010b03d0: 0x10b03d0: addu  s8, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010afd8c: 0x10afd8c: lw    v0, 208(sp)
+// 0x010b03d4: 0x10b03d4: lw    v0, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4137,23 +4137,23 @@ L_10afd74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afd90: 0x10afd90: addiu a0, sp, 128
+// 0x010b03d8: 0x10b03d8: addiu a0, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
 	stloc.1
-// 0x010afd94: 0x10afd94: addu  a1, zero, zero
+// 0x010b03dc: 0x10b03dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010afd98: 0x10afd98: addu  a2, zero, zero
+// 0x010b03e0: 0x10b03e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010afd9c: 0x10afd9c: addiu a3, sp, 80
+// 0x010b03e4: 0x10b03e4: addiu a3, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 4
-// 0x010afda0: 0x10afda0: sw    v0, 20(sp)
+// 0x010b03e8: 0x10b03e8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4162,7 +4162,7 @@ L_10afd74:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afda4: 0x10afda4: jal   0x102a3cc sw    zero, 16(sp)
+// 0x010b03ec: 0x10b03ec: jal   0x102a3dc sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4176,23 +4176,23 @@ L_10afd74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afdac: 0x10afdac: addu  v1, v0, zero
+// 0x010b03f4: 0x10b03f4: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010afdb0: 0x10afdb0: addiu v0, zero, -1
+// 0x010b03f8: 0x10b03f8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010afdb4: 0x10afdb4: bne   s1, v0, 0x10afdd8 sll   zero, zero, 0
+// 0x010b03fc: 0x10b03fc: bne   s1, v0, 0x10b0420 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_10afdd8
+	bne.un L_10b0420
 // --- basic block ---
-// 0x010afdbc: 0x10afdbc: lw    v0, 120(sp)
+// 0x010b0404: 0x10b0404: lw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4201,10 +4201,10 @@ L_10afd74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afdc0: 0x10afdc0: addu  s7, s8, zero
+// 0x010b0408: 0x10b0408: addu  s7, s8, zero
 	ldloc 12
 	stloc 11
-// 0x010afdc4: 0x10afdc4: sw    v0, 56(sp)
+// 0x010b040c: 0x10b040c: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4213,7 +4213,7 @@ L_10afd74:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afdc8: 0x10afdc8: lw    v0, 124(sp)
+// 0x010b0410: 0x10b0410: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4222,10 +4222,10 @@ L_10afd74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afdcc: 0x10afdcc: addu  s6, v1, zero
+// 0x010b0414: 0x10b0414: addu  s6, v1, zero
 	ldloc 7
 	stloc 16
-// 0x010afdd0: 0x10afdd0: sw    v0, 60(sp)
+// 0x010b0418: 0x10b0418: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4234,11 +4234,11 @@ L_10afd74:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afdd4: 0x10afdd4: addu  s1, s2, zero
+// 0x010b041c: 0x10b041c: addu  s1, s2, zero
 	ldloc 9
 	stloc 8
-L_10afdd8:
-// 0x010afdd8: 0x10afdd8: lw    v0, 220(sp)
+L_10b0420:
+// 0x010b0420: 0x10b0420: lw    v0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4247,22 +4247,22 @@ L_10afdd8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afddc: 0x10afddc: sll   zero, zero, 0
-// 0x010afde0: 0x10afde0: beq   v0, zero, 0x10afe70 slt   v0, s6, v1
+// 0x010b0424: 0x10b0424: sll   zero, zero, 0
+// 0x010b0428: 0x10b0428: beq   v0, zero, 0x10b04b8 slt   v0, s6, v1
 	ldloc 5
 	ldloc 16
 	ldloc 7
 	clt
 	stloc 5
-	brfalse L_10afe70
+	brfalse L_10b04b8
 // --- basic block ---
-// 0x010afde8: 0x10afde8: bne   v0, zero, 0x10afe04 addu  a0, s6, zero
+// 0x010b0430: 0x10b0430: bne   v0, zero, 0x10b044c addu  a0, s6, zero
 	ldloc 5
 	ldloc 16
 	stloc.1
-	brtrue L_10afe04
+	brtrue L_10b044c
 // --- basic block ---
-// 0x010afdf0: 0x10afdf0: jal   0x102be64 sw    v1, 228(sp)
+// 0x010b0438: 0x10b0438: jal   0x102be74 sw    v1, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4272,10 +4272,10 @@ L_10afdd8:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be64(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be74(int32)
 	stloc 5
 // --- basic block ---
-// 0x010afdf8: 0x10afdf8: lw    v1, 228(sp)
+// 0x010b0440: 0x10b0440: lw    v1, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4284,49 +4284,49 @@ L_10afdd8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010afdfc: 0x10afdfc: bne   v0, zero, 0x10aff14 sll   zero, zero, 0
+// 0x010b0444: 0x10b0444: bne   v0, zero, 0x10b055c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10aff14
+	brtrue L_10b055c
 // --- basic block ---
-L_10afe04:
-// 0x010afe04: 0x10afe04: subu  s7, s7, s8
+L_10b044c:
+// 0x010b044c: 0x10b044c: subu  s7, s7, s8
 	ldloc 11
 	ldloc 12
 	sub
 	stloc 11
-// 0x010afe08: 0x10afe08: sra   v0, s7, 31
+// 0x010b0450: 0x10b0450: sra   v0, s7, 31
 	ldloc 11
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x010afe0c: 0x10afe0c: xor   s7, v0, s7
+// 0x010b0454: 0x10b0454: xor   s7, v0, s7
 	ldloc 5
 	ldloc 11
 	xor
 	stloc 11
-// 0x010afe10: 0x10afe10: subu  v0, s7, v0
+// 0x010b0458: 0x10b0458: subu  v0, s7, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 5
-// 0x010afe14: 0x10afe14: slti  v0, v0, 11
+// 0x010b045c: 0x10b045c: slti  v0, v0, 11
 	ldloc 5
 	ldc.i4.s 11
 	clt
 	stloc 5
-// 0x010afe18: 0x10afe18: beq   v0, zero, 0x10aff14 slt   v0, s6, v1
+// 0x010b0460: 0x10b0460: beq   v0, zero, 0x10b055c slt   v0, s6, v1
 	ldloc 5
 	ldloc 16
 	ldloc 7
 	clt
 	stloc 5
-	brfalse L_10aff14
+	brfalse L_10b055c
 // --- basic block ---
-// 0x010afe20: 0x10afe20: beq   v0, zero, 0x10afe40 sll   zero, zero, 0
+// 0x010b0468: 0x10b0468: beq   v0, zero, 0x10b0488 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afe40
+	brfalse L_10b0488
 // --- basic block ---
-// 0x010afe28: 0x10afe28: lw    v0, 120(sp)
+// 0x010b0470: 0x10b0470: lw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4335,10 +4335,10 @@ L_10afe04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afe2c: 0x10afe2c: addu  s6, v1, zero
+// 0x010b0474: 0x10b0474: addu  s6, v1, zero
 	ldloc 7
 	stloc 16
-// 0x010afe30: 0x10afe30: sw    v0, 56(sp)
+// 0x010b0478: 0x10b0478: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4347,7 +4347,7 @@ L_10afe04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afe34: 0x10afe34: lw    v0, 124(sp)
+// 0x010b047c: 0x10b047c: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4356,10 +4356,10 @@ L_10afe04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afe38: 0x10afe38: addu  s1, s2, zero
+// 0x010b0480: 0x10b0480: addu  s1, s2, zero
 	ldloc 9
 	stloc 8
-// 0x010afe3c: 0x10afe3c: sw    v0, 60(sp)
+// 0x010b0484: 0x10b0484: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4368,21 +4368,21 @@ L_10afe04:
 	add
 	ldloc 5
 	stelem.i4
-L_10afe40:
-// 0x010afe40: 0x10afe40: jal   0x102be64 addu  a0, v1, zero
+L_10b0488:
+// 0x010b0488: 0x10b0488: jal   0x102be74 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be64(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be74(int32)
 	stloc 5
 // --- basic block ---
-// 0x010afe48: 0x10afe48: beq   v0, zero, 0x10afef4 addu  s7, s8, zero
+// 0x010b0490: 0x10b0490: beq   v0, zero, 0x10b053c addu  s7, s8, zero
 	ldloc 5
 	ldloc 12
 	stloc 11
-	brfalse L_10afef4
+	brfalse L_10b053c
 // --- basic block ---
-// 0x010afe50: 0x10afe50: lw    s7, 100(sp)
+// 0x010b0498: 0x10b0498: lw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4391,31 +4391,31 @@ L_10afe40:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010afe54: 0x10afe54: jal   0x10b0f9c sll   zero, zero, 0
+// 0x010b049c: 0x10b049c: jal   0x10b15e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010afe5c: 0x10afe5c: slt   v0, s7, v0
+// 0x010b04a4: 0x10b04a4: slt   v0, s7, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x010afe60: 0x10afe60: beq   v0, zero, 0x10afef0 sll   zero, zero, 0
+// 0x010b04a8: 0x10b04a8: beq   v0, zero, 0x10b0538 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afef0
+	brfalse L_10b0538
 // --- basic block ---
-// 0x010afe68: 0x10afe68: j	 0x10aff14 sll   zero, zero, 0
-	br L_10aff14
+// 0x010b04b0: 0x10b04b0: j	 0x10b055c sll   zero, zero, 0
+	br L_10b055c
 // --- basic block ---
-L_10afe70:
-// 0x010afe70: 0x10afe70: lw    v0, 224(sp)
+L_10b04b8:
+// 0x010b04b8: 0x10b04b8: lw    v0, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4424,43 +4424,43 @@ L_10afe70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afe74: 0x10afe74: sll   zero, zero, 0
-// 0x010afe78: 0x10afe78: beq   v0, zero, 0x10afef4 sll   zero, zero, 0
+// 0x010b04bc: 0x10b04bc: sll   zero, zero, 0
+// 0x010b04c0: 0x10b04c0: beq   v0, zero, 0x10b053c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afef4
+	brfalse L_10b053c
 // --- basic block ---
-// 0x010afe80: 0x10afe80: subu  s7, s7, s8
+// 0x010b04c8: 0x10b04c8: subu  s7, s7, s8
 	ldloc 11
 	ldloc 12
 	sub
 	stloc 11
-// 0x010afe84: 0x10afe84: sra   v0, s7, 31
+// 0x010b04cc: 0x10b04cc: sra   v0, s7, 31
 	ldloc 11
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x010afe88: 0x10afe88: xor   s7, v0, s7
+// 0x010b04d0: 0x10b04d0: xor   s7, v0, s7
 	ldloc 5
 	ldloc 11
 	xor
 	stloc 11
-// 0x010afe8c: 0x10afe8c: subu  v0, s7, v0
+// 0x010b04d4: 0x10b04d4: subu  v0, s7, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 5
-// 0x010afe90: 0x10afe90: slti  v0, v0, 11
+// 0x010b04d8: 0x10b04d8: slti  v0, v0, 11
 	ldloc 5
 	ldc.i4.s 11
 	clt
 	stloc 5
-// 0x010afe94: 0x10afe94: beq   v0, zero, 0x10aff14 addu  a0, v1, zero
+// 0x010b04dc: 0x10b04dc: beq   v0, zero, 0x10b055c addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_10aff14
+	brfalse L_10b055c
 // --- basic block ---
-// 0x010afe9c: 0x10afe9c: jal   0x102be40 sw    v1, 228(sp)
+// 0x010b04e4: 0x10b04e4: jal   0x102be50 sw    v1, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4470,10 +4470,10 @@ L_10afe70:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x010afea4: 0x10afea4: lw    v1, 228(sp)
+// 0x010b04ec: 0x10b04ec: lw    v1, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4482,11 +4482,11 @@ L_10afe70:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010afea8: 0x10afea8: beq   v0, zero, 0x10afec8 sll   zero, zero, 0
+// 0x010b04f0: 0x10b04f0: beq   v0, zero, 0x10b0510 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10afec8
+	brfalse L_10b0510
 // --- basic block ---
-// 0x010afeb0: 0x10afeb0: lw    v0, 120(sp)
+// 0x010b04f8: 0x10b04f8: lw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4495,10 +4495,10 @@ L_10afe70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afeb4: 0x10afeb4: addu  s1, s2, zero
+// 0x010b04fc: 0x10b04fc: addu  s1, s2, zero
 	ldloc 9
 	stloc 8
-// 0x010afeb8: 0x10afeb8: sw    v0, 56(sp)
+// 0x010b0500: 0x10b0500: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4507,7 +4507,7 @@ L_10afe70:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afebc: 0x10afebc: lw    v0, 124(sp)
+// 0x010b0504: 0x10b0504: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4516,8 +4516,8 @@ L_10afe70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afec0: 0x10afec0: sll   zero, zero, 0
-// 0x010afec4: 0x10afec4: sw    v0, 60(sp)
+// 0x010b0508: 0x10b0508: sll   zero, zero, 0
+// 0x010b050c: 0x10b050c: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4526,19 +4526,19 @@ L_10afe70:
 	add
 	ldloc 5
 	stelem.i4
-L_10afec8:
-// 0x010afec8: 0x10afec8: jal   0x102be40 addu  a0, v1, zero
+L_10b0510:
+// 0x010b0510: 0x10b0510: jal   0x102be50 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x010afed0: 0x10afed0: bne   v0, zero, 0x10afef0 sll   zero, zero, 0
+// 0x010b0518: 0x10b0518: bne   v0, zero, 0x10b0538 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10afef0
+	brtrue L_10b0538
 // --- basic block ---
-// 0x010afed8: 0x10afed8: lw    v0, 120(sp)
+// 0x010b0520: 0x10b0520: lw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4547,10 +4547,10 @@ L_10afec8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afedc: 0x10afedc: addu  s1, s2, zero
+// 0x010b0524: 0x10b0524: addu  s1, s2, zero
 	ldloc 9
 	stloc 8
-// 0x010afee0: 0x10afee0: sw    v0, 56(sp)
+// 0x010b0528: 0x10b0528: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4559,7 +4559,7 @@ L_10afec8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010afee4: 0x10afee4: lw    v0, 124(sp)
+// 0x010b052c: 0x10b052c: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4568,7 +4568,7 @@ L_10afec8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afee8: 0x10afee8: j	 0x10aff14 sw    v0, 60(sp)
+// 0x010b0530: 0x10b0530: j	 0x10b055c sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4577,20 +4577,20 @@ L_10afec8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10aff14
+	br L_10b055c
 // --- basic block ---
-L_10afef0:
-// 0x010afef0: 0x10afef0: addu  s7, s8, zero
+L_10b0538:
+// 0x010b0538: 0x10b0538: addu  s7, s8, zero
 	ldloc 12
 	stloc 11
-L_10afef4:
-// 0x010afef4: 0x10afef4: addiu s2, s2, -1
+L_10b053c:
+// 0x010b053c: 0x10b053c: addiu s2, s2, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-L_10afef8:
-// 0x010afef8: 0x10afef8: lw    v1, 216(sp)
+L_10b0540:
+// 0x010b0540: 0x10b0540: lw    v1, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4599,23 +4599,23 @@ L_10afef8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010afefc: 0x10afefc: sll   zero, zero, 0
-// 0x010aff00: 0x10aff00: slt   v0, s2, v1
+// 0x010b0544: 0x10b0544: sll   zero, zero, 0
+// 0x010b0548: 0x10b0548: slt   v0, s2, v1
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 5
-// 0x010aff04: 0x10aff04: bne   v0, zero, 0x10aff14 sll   zero, zero, 0
+// 0x010b054c: 0x10b054c: bne   v0, zero, 0x10b055c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10aff14
+	brtrue L_10b055c
 // --- basic block ---
-// 0x010aff0c: 0x10aff0c: bgtz  s2, 0x10afd20 sll   zero, zero, 0
+// 0x010b0554: 0x10b0554: bgtz  s2, 0x10b0368 sll   zero, zero, 0
 	ldloc 9
 	ldc.i4.s 0
-	bgt L_10afd20
+	bgt L_10b0368
 // --- basic block ---
-L_10aff14:
-// 0x010aff14: 0x10aff14: lw    v0, 56(sp)
+L_10b055c:
+// 0x010b055c: 0x10b055c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4624,12 +4624,12 @@ L_10aff14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aff18: 0x10aff18: addiu a0, sp, 64
+// 0x010b0560: 0x10b0560: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x010aff1c: 0x10aff1c: sw    v0, 64(sp)
+// 0x010b0564: 0x10b0564: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4638,7 +4638,7 @@ L_10aff14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aff20: 0x10aff20: lw    v0, 60(sp)
+// 0x010b0568: 0x10b0568: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4647,12 +4647,12 @@ L_10aff14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aff24: 0x10aff24: addiu a1, sp, 40
+// 0x010b056c: 0x10b056c: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010aff28: 0x10aff28: jal   0x1008eb0 sw    v0, 68(sp)
+// 0x010b0570: 0x10b0570: jal   0x1008ec0 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4666,28 +4666,28 @@ L_10aff14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aff30: 0x10aff30: addu  s2, v0, zero
+// 0x010b0578: 0x10b0578: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010aff34: 0x10aff34: slt   v0, v0, s4
+// 0x010b057c: 0x10b057c: slt   v0, v0, s4
 	ldloc 5
 	ldloc 13
 	clt
 	stloc 5
-// 0x010aff38: 0x10aff38: beq   v0, zero, 0x10aff58 addiu a0, sp, 64
+// 0x010b0580: 0x10b0580: beq   v0, zero, 0x10b05a0 addiu a0, sp, 64
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-	brfalse L_10aff58
+	brfalse L_10b05a0
 // --- basic block ---
-// 0x010aff40: 0x10aff40: lw    v0, 40(sp)
+// 0x010b0588: 0x10b0588: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4696,8 +4696,8 @@ L_10aff14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aff44: 0x10aff44: sll   zero, zero, 0
-// 0x010aff48: 0x10aff48: sw    v0, 56(sp)
+// 0x010b058c: 0x10b058c: sll   zero, zero, 0
+// 0x010b0590: 0x10b0590: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4706,7 +4706,7 @@ L_10aff14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aff4c: 0x10aff4c: lw    v0, 44(sp)
+// 0x010b0594: 0x10b0594: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4715,8 +4715,8 @@ L_10aff14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aff50: 0x10aff50: sll   zero, zero, 0
-// 0x010aff54: 0x10aff54: sw    v0, 60(sp)
+// 0x010b0598: 0x10b0598: sll   zero, zero, 0
+// 0x010b059c: 0x10b059c: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4725,8 +4725,8 @@ L_10aff14:
 	add
 	ldloc 5
 	stelem.i4
-L_10aff58:
-// 0x010aff58: 0x10aff58: jal   0x1008eb0 addiu a1, sp, 48
+L_10b05a0:
+// 0x010b05a0: 0x10b05a0: jal   0x1008ec0 addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4736,29 +4736,29 @@ L_10aff58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010aff60: 0x10aff60: slt   v1, v0, s2
+// 0x010b05a8: 0x10b05a8: slt   v1, v0, s2
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 7
-// 0x010aff64: 0x10aff64: beq   v1, zero, 0x10aff8c slt   v0, v0, s4
+// 0x010b05ac: 0x10b05ac: beq   v1, zero, 0x10b05d4 slt   v0, v0, s4
 	ldloc 7
 	ldloc 5
 	ldloc 13
 	clt
 	stloc 5
-	brfalse L_10aff8c
+	brfalse L_10b05d4
 // --- basic block ---
-// 0x010aff6c: 0x10aff6c: beq   v0, zero, 0x10aff8c sll   zero, zero, 0
+// 0x010b05b4: 0x10b05b4: beq   v0, zero, 0x10b05d4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10aff8c
+	brfalse L_10b05d4
 // --- basic block ---
-// 0x010aff74: 0x10aff74: lw    v0, 48(sp)
+// 0x010b05bc: 0x10b05bc: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4767,8 +4767,8 @@ L_10aff58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aff78: 0x10aff78: sll   zero, zero, 0
-// 0x010aff7c: 0x10aff7c: sw    v0, 56(sp)
+// 0x010b05c0: 0x10b05c0: sll   zero, zero, 0
+// 0x010b05c4: 0x10b05c4: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4777,7 +4777,7 @@ L_10aff58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010aff80: 0x10aff80: lw    v0, 52(sp)
+// 0x010b05c8: 0x10b05c8: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4786,7 +4786,7 @@ L_10aff58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010aff84: 0x10aff84: j	 0x10affd4 sw    v0, 60(sp)
+// 0x010b05cc: 0x10b05cc: j	 0x10b061c sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4795,22 +4795,22 @@ L_10aff58:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10affd4
+	br L_10b061c
 // --- basic block ---
-L_10aff8c:
-// 0x010aff8c: 0x10aff8c: slt   s4, s2, s4
+L_10b05d4:
+// 0x010b05d4: 0x10b05d4: slt   s4, s2, s4
 	ldloc 9
 	ldloc 13
 	clt
 	stloc 13
-// 0x010aff90: 0x10aff90: bne   s4, zero, 0x10affd8 lui   v0, 0x0
+// 0x010b05d8: 0x10b05d8: bne   s4, zero, 0x10b0620 lui   v0, 0x0
 	ldloc 13
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10affd8
+	brtrue L_10b0620
 // --- basic block ---
-L_10aff98:
-// 0x010aff98: 0x10aff98: lw    v1, 212(sp)
+L_10b05e0:
+// 0x010b05e0: 0x10b05e0: lw    v1, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4819,39 +4819,39 @@ L_10aff98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010aff9c: 0x10aff9c: lui   a1, 0x20000
+// 0x010b05e4: 0x10b05e4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010affa0: 0x10affa0: lui   a3, 0x20000
+// 0x010b05e8: 0x10b05e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010affa4: 0x10affa4: subu  v0, v1, s1
+// 0x010b05ec: 0x10b05ec: subu  v0, v1, s1
 	ldloc 7
 	ldloc 8
 	sub
 	stloc 5
-// 0x010affa8: 0x10affa8: addiu a1, a1, 17204
+// 0x010b05f0: 0x10b05f0: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010affac: 0x10affac: addiu a3, a3, 17412
+// 0x010b05f4: 0x10b05f4: addiu a3, a3, 17872
 	ldloc 4
-	ldc.i4 17412
+	ldc.i4 17872
 	add
 	stloc 4
-// 0x010affb0: 0x10affb0: addiu a0, zero, 2
+// 0x010b05f8: 0x10b05f8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010affb4: 0x10affb4: addiu a2, zero, 291
+// 0x010b05fc: 0x10b05fc: addiu a2, zero, 291
 	ldc.i4 291
 	stloc.3
-// 0x010affb8: 0x10affb8: andi  s5, s5, 8
+// 0x010b0600: 0x10b0600: andi  s5, s5, 8
 	ldloc 15
 	ldc.i4.8
 	and
 	stloc 15
-// 0x010affbc: 0x10affbc: jal   0x100449c sw    v0, 16(sp)
+// 0x010b0604: 0x10b0604: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4870,23 +4870,23 @@ L_10aff98:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010affc4: 0x10affc4: beq   s5, zero, 0x10b00d0 lui   v0, 0x0
+// 0x010b060c: 0x10b060c: beq   s5, zero, 0x10b0718 lui   v0, 0x0
 	ldloc 15
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10b00d0
+	brfalse L_10b0718
 // --- basic block ---
-// 0x010affcc: 0x10affcc: j	 0x10b01ec addiu s1, zero, -1
+// 0x010b0614: 0x10b0614: j	 0x10b0834 addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 8
-	br L_10b01ec
+	br L_10b0834
 // --- basic block ---
-L_10affd4:
-// 0x010affd4: 0x10affd4: lui   v0, 0x0
+L_10b061c:
+// 0x010b061c: 0x10b061c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10affd8:
-// 0x010affd8: 0x10affd8: lw    v0, 18812(v0)
+L_10b0620:
+// 0x010b0620: 0x10b0620: lw    v0, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4895,22 +4895,22 @@ L_10affd8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010affdc: 0x10affdc: lw    s2, 0(s0)
+// 0x010b0624: 0x10b0624: lw    s2, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010affe0: 0x10affe0: sll   zero, zero, 0
-// 0x010affe4: 0x10affe4: beq   s2, v0, 0x10b0060 lui   v0, 0x0
+// 0x010b0628: 0x10b0628: sll   zero, zero, 0
+// 0x010b062c: 0x10b062c: beq   s2, v0, 0x10b06a8 lui   v0, 0x0
 	ldloc 9
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_10b0060
+	beq  L_10b06a8
 // --- basic block ---
-// 0x010affec: 0x10affec: lw    v0, 576(v0)
+// 0x010b0634: 0x10b0634: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4919,7 +4919,7 @@ L_10affd8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010afff0: 0x10afff0: lw    a0, 12(s0)
+// 0x010b0638: 0x10b0638: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4928,44 +4928,44 @@ L_10affd8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010afff4: 0x10afff4: sll   zero, zero, 0
-// 0x010afff8: 0x10afff8: beq   a0, v0, 0x10b0010 sll   zero, zero, 0
+// 0x010b063c: 0x10b063c: sll   zero, zero, 0
+// 0x010b0640: 0x10b0640: beq   a0, v0, 0x10b0658 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b0010
+	beq  L_10b0658
 // --- basic block ---
-// 0x010b0000: 0x10b0000: bltz  a0, 0x10b0010 sll   zero, zero, 0
+// 0x010b0648: 0x10b0648: bltz  a0, 0x10b0658 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b0010
+	blt L_10b0658
 // --- basic block ---
-// 0x010b0008: 0x10b0008: jal   0x100b164 sll   zero, zero, 0
+// 0x010b0650: 0x10b0650: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b0010:
-// 0x010b0010: 0x10b0010: lw    v0, 0(s0)
+L_10b0658:
+// 0x010b0658: 0x10b0658: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b0014: 0x10b0014: sll   zero, zero, 0
-// 0x010b0018: 0x10b0018: bne   v0, zero, 0x10b0044 lui   v0, 0x0
+// 0x010b065c: 0x10b065c: sll   zero, zero, 0
+// 0x010b0660: 0x10b0660: bne   v0, zero, 0x10b068c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10b0044
+	brtrue L_10b068c
 // --- basic block ---
-// 0x010b0020: 0x10b0020: lw    v0, 576(v0)
+// 0x010b0668: 0x10b0668: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4974,7 +4974,7 @@ L_10b0010:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0024: 0x10b0024: lw    a0, 12(s0)
+// 0x010b066c: 0x10b066c: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4983,30 +4983,30 @@ L_10b0010:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0028: 0x10b0028: sll   zero, zero, 0
-// 0x010b002c: 0x10b002c: beq   a0, v0, 0x10b0044 sll   zero, zero, 0
+// 0x010b0670: 0x10b0670: sll   zero, zero, 0
+// 0x010b0674: 0x10b0674: beq   a0, v0, 0x10b068c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b0044
+	beq  L_10b068c
 // --- basic block ---
-// 0x010b0034: 0x10b0034: bltz  a0, 0x10b0044 sll   zero, zero, 0
+// 0x010b067c: 0x10b067c: bltz  a0, 0x10b068c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b0044
+	blt L_10b068c
 // --- basic block ---
-// 0x010b003c: 0x10b003c: jal   0x100b164 sll   zero, zero, 0
+// 0x010b0684: 0x10b0684: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b0044:
-// 0x010b0044: 0x10b0044: lw    a0, 4(s0)
+L_10b068c:
+// 0x010b068c: 0x10b068c: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5015,12 +5015,12 @@ L_10b0044:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0048: 0x10b0048: addiu a1, sp, 32
+// 0x010b0690: 0x10b0690: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010b004c: 0x10b004c: jal   0x1003adc addiu a2, sp, 36
+// 0x010b0694: 0x10b0694: jal   0x1003adc addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -5033,7 +5033,7 @@ L_10b0044:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0054: 0x10b0054: lw    v0, 12(s0)
+// 0x010b069c: 0x10b069c: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5042,21 +5042,21 @@ L_10b0044:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0058: 0x10b0058: j	 0x10b009c sw    v0, 0(s3)
+// 0x010b06a0: 0x10b06a0: j	 0x10b06e4 sw    v0, 0(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10b009c
+	br L_10b06e4
 // --- basic block ---
-L_10b0060:
-// 0x010b0060: 0x10b0060: bne   s2, zero, 0x10b008c sll   zero, zero, 0
+L_10b06a8:
+// 0x010b06a8: 0x10b06a8: bne   s2, zero, 0x10b06d4 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10b008c
+	brtrue L_10b06d4
 // --- basic block ---
-// 0x010b0068: 0x10b0068: lw    v0, 576(v0)
+// 0x010b06b0: 0x10b06b0: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5065,7 +5065,7 @@ L_10b0060:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b006c: 0x10b006c: lw    a0, 12(s0)
+// 0x010b06b4: 0x10b06b4: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5074,30 +5074,30 @@ L_10b0060:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0070: 0x10b0070: sll   zero, zero, 0
-// 0x010b0074: 0x10b0074: beq   a0, v0, 0x10b008c sll   zero, zero, 0
+// 0x010b06b8: 0x10b06b8: sll   zero, zero, 0
+// 0x010b06bc: 0x10b06bc: beq   a0, v0, 0x10b06d4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b008c
+	beq  L_10b06d4
 // --- basic block ---
-// 0x010b007c: 0x10b007c: bltz  a0, 0x10b008c sll   zero, zero, 0
+// 0x010b06c4: 0x10b06c4: bltz  a0, 0x10b06d4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b008c
+	blt L_10b06d4
 // --- basic block ---
-// 0x010b0084: 0x10b0084: jal   0x100b164 sll   zero, zero, 0
+// 0x010b06cc: 0x10b06cc: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b008c:
-// 0x010b008c: 0x10b008c: lw    a0, 4(s0)
+L_10b06d4:
+// 0x010b06d4: 0x10b06d4: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5106,12 +5106,12 @@ L_10b008c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0090: 0x10b0090: addiu a1, sp, 32
+// 0x010b06d8: 0x10b06d8: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010b0094: 0x10b0094: jal   0x10b5924 addiu a2, sp, 36
+// 0x010b06dc: 0x10b06dc: jal   0x10b5f6c addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -5121,18 +5121,18 @@ L_10b008c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_points_10b5924(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_points_10b5f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b009c:
-// 0x010b009c: 0x10b009c: addiu a0, sp, 56
+L_10b06e4:
+// 0x010b06e4: 0x10b06e4: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x010b00a0: 0x10b00a0: jal   0x10083b4 addiu a1, sp, 40
+// 0x010b06e8: 0x10b06e8: jal   0x10083c4 addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5140,16 +5140,16 @@ L_10b009c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_compare_points_10083b4(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compare_points_10083c4(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b00a8: 0x10b00a8: bne   v0, zero, 0x10b00bc sll   zero, zero, 0
+// 0x010b06f0: 0x10b06f0: bne   v0, zero, 0x10b0704 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b00bc
+	brtrue L_10b0704
 // --- basic block ---
-// 0x010b00b0: 0x10b00b0: lw    v0, 32(sp)
+// 0x010b06f8: 0x10b06f8: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5158,7 +5158,7 @@ L_10b009c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b00b4: 0x10b00b4: j	 0x10b00c8 sw    v0, 4(s3)
+// 0x010b06fc: 0x10b06fc: j	 0x10b0710 sw    v0, 4(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -5167,10 +5167,10 @@ L_10b009c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10b00c8
+	br L_10b0710
 // --- basic block ---
-L_10b00bc:
-// 0x010b00bc: 0x10b00bc: lw    v0, 36(sp)
+L_10b0704:
+// 0x010b0704: 0x10b0704: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5179,8 +5179,8 @@ L_10b00bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b00c0: 0x10b00c0: sll   zero, zero, 0
-// 0x010b00c4: 0x10b00c4: sw    v0, 4(s3)
+// 0x010b0708: 0x10b0708: sll   zero, zero, 0
+// 0x010b070c: 0x10b070c: sw    v0, 4(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -5189,8 +5189,8 @@ L_10b00bc:
 	add
 	ldloc 5
 	stelem.i4
-L_10b00c8:
-// 0x010b00c8: 0x10b00c8: j	 0x10b00ec sw    s2, 8(s3)
+L_10b0710:
+// 0x010b0710: 0x10b0710: j	 0x10b0734 sw    s2, 8(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -5199,10 +5199,10 @@ L_10b00c8:
 	add
 	ldloc 9
 	stelem.i4
-	br L_10b00ec
+	br L_10b0734
 // --- basic block ---
-L_10b00d0:
-// 0x010b00d0: 0x10b00d0: lw    v0, 18812(v0)
+L_10b0718:
+// 0x010b0718: 0x10b0718: lw    v0, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5211,12 +5211,12 @@ L_10b00d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b00d4: 0x10b00d4: addiu a0, sp, 56
+// 0x010b071c: 0x10b071c: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x010b00d8: 0x10b00d8: sw    v0, 8(s3)
+// 0x010b0720: 0x10b0720: sw    v0, 8(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -5225,7 +5225,7 @@ L_10b00d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b00dc: 0x10b00dc: jal   0x10b4760 addiu a1, zero, -1
+// 0x010b0724: 0x10b0724: jal   0x10b4da8 addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -5233,12 +5233,12 @@ L_10b00d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b00e4: 0x10b00e4: bltz  v0, 0x10b01e0 sw    v0, 4(s3)
+// 0x010b072c: 0x10b072c: bltz  v0, 0x10b0828 sw    v0, 4(s3)
 	ldloc 5
 	ldloc 6
 	ldloc 14
@@ -5249,22 +5249,22 @@ L_10b00d0:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10b01e0
+	blt L_10b0828
 // --- basic block ---
-L_10b00ec:
-// 0x010b00ec: 0x10b00ec: addiu v0, zero, -1
+L_10b0734:
+// 0x010b0734: 0x10b0734: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b00f0: 0x10b00f0: beq   s1, v0, 0x10b0108 addiu a0, sp, 40
+// 0x010b0738: 0x10b0738: beq   s1, v0, 0x10b0750 addiu a0, sp, 40
 	ldloc 8
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	beq  L_10b0108
+	beq  L_10b0750
 // --- basic block ---
-// 0x010b00f8: 0x10b00f8: jal   0x10083b4 addiu a1, sp, 48
+// 0x010b0740: 0x10b0740: jal   0x10083c4 addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5272,17 +5272,17 @@ L_10b00ec:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_compare_points_10083b4(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compare_points_10083c4(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0100: 0x10b0100: beq   v0, zero, 0x10b01ec sll   zero, zero, 0
+// 0x010b0748: 0x10b0748: beq   v0, zero, 0x10b0834 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b01ec
+	brfalse L_10b0834
 // --- basic block ---
-L_10b0108:
-// 0x010b0108: 0x10b0108: lw    s0, 280(sp)
+L_10b0750:
+// 0x010b0750: 0x10b0750: lw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ L_10b0108:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b010c: 0x10b010c: lw    v0, 212(sp)
+// 0x010b0754: 0x10b0754: lw    v0, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5300,141 +5300,141 @@ L_10b0108:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0110: 0x10b0110: lui   s2, 0xf0000
+// 0x010b0758: 0x10b0758: lui   s2, 0xf0000
 	ldc.i4 983040
 	stloc 9
-// 0x010b0114: 0x10b0114: ori   s2, s2, 16960
+// 0x010b075c: 0x10b075c: ori   s2, s2, 16960
 	ldloc 9
 	ldc.i4 16960
 	or
 	stloc 9
-// 0x010b0118: 0x10b0118: addiu s7, v0, -49
+// 0x010b0760: 0x10b0760: addiu s7, v0, -49
 	ldloc 5
 	ldc.i4.s -49
 	add
 	stloc 11
-// 0x010b011c: 0x10b011c: addu  s1, s0, zero
+// 0x010b0764: 0x10b0764: addu  s1, s0, zero
 	ldloc 10
 	stloc 8
-// 0x010b0120: 0x10b0120: addiu s6, sp, 56
+// 0x010b0768: 0x10b0768: addiu s6, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 16
-// 0x010b0124: 0x10b0124: addiu s5, sp, 72
+// 0x010b076c: 0x10b076c: addiu s5, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 15
-// 0x010b0128: 0x10b0128: j	 0x10b0178 addu  s4, zero, zero
+// 0x010b0770: 0x10b0770: j	 0x10b07c0 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_10b0178
+	br L_10b07c0
 // --- basic block ---
-L_10b0130:
-// 0x010b0130: 0x10b0130: jal   0x10b07a0 sll   zero, zero, 0
+L_10b0778:
+// 0x010b0778: 0x10b0778: jal   0x10b0de8 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b0138: 0x10b0138: addu  a0, s3, zero
+// 0x010b0780: 0x10b0780: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x010b013c: 0x10b013c: jal   0x10b07a0 addu  s8, v0, zero
+// 0x010b0784: 0x10b0784: jal   0x10b0de8 addu  s8, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b0144: 0x10b0144: addu  v1, v0, zero
+// 0x010b078c: 0x10b078c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010b0148: 0x10b0148: cibyl_sysc_arg 0x16
+// 0x010b0790: 0x10b0790: cibyl_sysc_arg 0x16
 	ldloc 16
-// 0x010b014c: 0x10b014c: cibyl_sysc_arg 0x1e
+// 0x010b0794: 0x10b0794: cibyl_sysc_arg 0x1e
 	ldloc 12
-// 0x010b0150: 0x10b0150: cibyl_sysc_arg 0x3
+// 0x010b0798: 0x10b0798: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010b0154: 0x10b0154: cibyl_sysc_arg 0x15
+// 0x010b079c: 0x10b079c: cibyl_sysc_arg 0x15
 	ldloc 15
-// 0x010b0158: 0x10b0158: cibyl_sysc_arg 0x14
+// 0x010b07a0: 0x10b07a0: cibyl_sysc_arg 0x14
 	ldloc 13
-// 0x010b015c: 0x10b015c: cibyl_sysc 0x22f8
+// 0x010b07a4: 0x10b07a4: cibyl_sysc 0x22f8
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010b0160: 0x10b0160: addu  s8, v0, zero
+// 0x010b07a8: 0x10b07a8: addu  s8, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010b0164: 0x10b0164: slt   s2, s8, s2
+// 0x010b07ac: 0x10b07ac: slt   s2, s8, s2
 	ldloc 12
 	ldloc 9
 	clt
 	stloc 9
-// 0x010b0168: 0x10b0168: beq   s2, zero, 0x10b0190 addu  s2, s8, zero
+// 0x010b07b0: 0x10b07b0: beq   s2, zero, 0x10b07d8 addu  s2, s8, zero
 	ldloc 9
 	ldloc 12
 	stloc 9
-	brfalse L_10b0190
+	brfalse L_10b07d8
 // --- basic block ---
-// 0x010b0170: 0x10b0170: addu  s0, s1, zero
+// 0x010b07b8: 0x10b07b8: addu  s0, s1, zero
 	ldloc 8
 	stloc 10
-// 0x010b0174: 0x10b0174: addu  s1, s3, zero
+// 0x010b07bc: 0x10b07bc: addu  s1, s3, zero
 	ldloc 14
 	stloc 8
-L_10b0178:
-// 0x010b0178: 0x10b0178: slt   v0, s1, s7
+L_10b07c0:
+// 0x010b07c0: 0x10b07c0: slt   v0, s1, s7
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-// 0x010b017c: 0x10b017c: addu  a0, s1, zero
+// 0x010b07c4: 0x10b07c4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b0180: 0x10b0180: bne   v0, zero, 0x10b0190 addiu s3, s1, -1
+// 0x010b07c8: 0x10b07c8: bne   v0, zero, 0x10b07d8 addiu s3, s1, -1
 	ldloc 5
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 14
-	brtrue L_10b0190
+	brtrue L_10b07d8
 // --- basic block ---
-// 0x010b0188: 0x10b0188: bgtz  s1, 0x10b0130 sll   zero, zero, 0
+// 0x010b07d0: 0x10b07d0: bgtz  s1, 0x10b0778 sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	bgt L_10b0130
+	bgt L_10b0778
 // --- basic block ---
-L_10b0190:
-// 0x010b0190: 0x10b0190: slti  v0, s0, 2
+L_10b07d8:
+// 0x010b07d8: 0x10b07d8: slti  v0, s0, 2
 	ldloc 10
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010b0194: 0x10b0194: bne   v0, zero, 0x10b01e8 addiu s1, s0, -1
+// 0x010b07dc: 0x10b07dc: bne   v0, zero, 0x10b0830 addiu s1, s0, -1
 	ldloc 5
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 8
-	brtrue L_10b01e8
+	brtrue L_10b0830
 // --- basic block ---
-// 0x010b019c: 0x10b019c: jal   0x10b07a0 addu  a0, s1, zero
+// 0x010b07e4: 0x10b07e4: jal   0x10b0de8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b01a4: 0x10b01a4: addiu s2, sp, 72
+// 0x010b07ec: 0x10b07ec: addiu s2, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 9
-// 0x010b01a8: 0x10b01a8: addu  a1, s2, zero
+// 0x010b07f0: 0x10b07f0: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010b01ac: 0x10b01ac: jal   0x1008eb0 addu  a0, v0, zero
+// 0x010b07f4: 0x10b07f4: jal   0x1008ec0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5442,25 +5442,25 @@ L_10b0190:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b01b4: 0x10b01b4: addu  a0, s0, zero
+// 0x010b07fc: 0x10b07fc: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b01b8: 0x10b01b8: jal   0x10b07a0 addu  s3, v0, zero
+// 0x010b0800: 0x10b0800: jal   0x10b0de8 addu  s3, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b01c0: 0x10b01c0: addu  a0, v0, zero
+// 0x010b0808: 0x10b0808: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b01c4: 0x10b01c4: jal   0x1008eb0 addu  a1, s2, zero
+// 0x010b080c: 0x10b080c: jal   0x1008ec0 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -5468,41 +5468,41 @@ L_10b0190:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b01cc: 0x10b01cc: slt   v0, v0, s3
+// 0x010b0814: 0x10b0814: slt   v0, v0, s3
 	ldloc 5
 	ldloc 14
 	clt
 	stloc 5
-// 0x010b01d0: 0x10b01d0: beq   v0, zero, 0x10b01ec sll   zero, zero, 0
+// 0x010b0818: 0x10b0818: beq   v0, zero, 0x10b0834 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b01ec
+	brfalse L_10b0834
 // --- basic block ---
-// 0x010b01d8: 0x10b01d8: j	 0x10b01ec addu  s1, s0, zero
+// 0x010b0820: 0x10b0820: j	 0x10b0834 addu  s1, s0, zero
 	ldloc 10
 	stloc 8
-	br L_10b01ec
+	br L_10b0834
 // --- basic block ---
-L_10b01e0:
-// 0x010b01e0: 0x10b01e0: j	 0x10b01ec addiu s1, zero, -1
+L_10b0828:
+// 0x010b0828: 0x10b0828: j	 0x10b0834 addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 8
-	br L_10b01ec
+	br L_10b0834
 // --- basic block ---
-L_10b01e8:
-// 0x010b01e8: 0x10b01e8: addu  s1, s0, zero
+L_10b0830:
+// 0x010b0830: 0x10b0830: addu  s1, s0, zero
 	ldloc 10
 	stloc 8
-L_10b01ec:
-// 0x010b01ec: 0x10b01ec: lw    ra, 268(sp)
-// 0x010b01f0: 0x10b01f0: addu  v0, s1, zero
+L_10b0834:
+// 0x010b0834: 0x10b0834: lw    ra, 268(sp)
+// 0x010b0838: 0x10b0838: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-// 0x010b01f4: 0x10b01f4: lw    s8, 264(sp)
+// 0x010b083c: 0x10b083c: lw    s8, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5511,7 +5511,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b01f8: 0x10b01f8: lw    s7, 260(sp)
+// 0x010b0840: 0x10b0840: lw    s7, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5520,7 +5520,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b01fc: 0x10b01fc: lw    s6, 256(sp)
+// 0x010b0844: 0x10b0844: lw    s6, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5529,7 +5529,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b0200: 0x10b0200: lw    s5, 252(sp)
+// 0x010b0848: 0x10b0848: lw    s5, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5538,7 +5538,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b0204: 0x10b0204: lw    s4, 248(sp)
+// 0x010b084c: 0x10b084c: lw    s4, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5547,7 +5547,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b0208: 0x10b0208: lw    s3, 244(sp)
+// 0x010b0850: 0x10b0850: lw    s3, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5556,7 +5556,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b020c: 0x10b020c: lw    s2, 240(sp)
+// 0x010b0854: 0x10b0854: lw    s2, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5565,7 +5565,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b0210: 0x10b0210: lw    s1, 236(sp)
+// 0x010b0858: 0x10b0858: lw    s1, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5574,7 +5574,7 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0214: 0x10b0214: lw    s0, 232(sp)
+// 0x010b085c: 0x10b085c: lw    s0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5583,25 +5583,25 @@ L_10b01ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b0218: 0x10b0218: jr    ra addiu sp, sp, 272
+// 0x010b0860: 0x10b0860: jr    ra addiu sp, sp, 272
 	ldloc.0
 	ldc.i4 272
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10b0220:
-// 0x010b0220: 0x10b0220: j	 0x10affd4 addiu s1, zero, -1
+L_10b0868:
+// 0x010b0868: 0x10b0868: j	 0x10b061c addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 8
-	br L_10affd4
+	br L_10b061c
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_util_connect_roads_10b0228(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_connect_roads_10b0870(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 s6,int32 s3,int32 s5,int32 s7,int32 s8,int32 lo,int32 ra,int32 t0,int32 t1,int32 t2,int32 t3)
@@ -5678,12 +5678,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0228: 0x10b0228: addiu sp, sp, -152
+// 0x010b0870: 0x10b0870: addiu sp, sp, -152
 	ldloc.0
 	ldc.i4 -152
 	add
 	stloc.0
-// 0x010b022c: 0x10b022c: sw    s2, 120(sp)
+// 0x010b0874: 0x10b0874: sw    s2, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5692,7 +5692,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b0230: 0x10b0230: lw    s2, 168(sp)
+// 0x010b0878: 0x10b0878: lw    s2, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5701,7 +5701,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b0234: 0x10b0234: sw    s4, 128(sp)
+// 0x010b087c: 0x10b087c: sw    s4, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5710,14 +5710,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b0238: 0x10b0238: lw    v1, 0(s2)
+// 0x010b0880: 0x10b0880: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b023c: 0x10b023c: lw    v0, 4(s2)
+// 0x010b0884: 0x10b0884: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5726,12 +5726,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0240: 0x10b0240: addiu s4, sp, 84
+// 0x010b0888: 0x10b0888: addiu s4, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc 11
-// 0x010b0244: 0x10b0244: sw    s8, 144(sp)
+// 0x010b088c: 0x10b088c: sw    s8, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5740,7 +5740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b0248: 0x10b0248: sw    s3, 124(sp)
+// 0x010b0890: 0x10b0890: sw    s3, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5749,7 +5749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b024c: 0x10b024c: sw    s1, 116(sp)
+// 0x010b0894: 0x10b0894: sw    s1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5758,19 +5758,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b0250: 0x10b0250: addu  s3, a1, zero
+// 0x010b0898: 0x10b0898: addu  s3, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010b0254: 0x10b0254: addiu s1, zero, -1
+// 0x010b089c: 0x10b089c: addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 9
-// 0x010b0258: 0x10b0258: addu  a1, a2, zero
+// 0x010b08a0: 0x10b08a0: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x010b025c: 0x10b025c: addu  s8, a2, zero
+// 0x010b08a4: 0x10b08a4: addu  s8, a2, zero
 	ldloc.3
 	stloc 16
-// 0x010b0260: 0x10b0260: sw    a3, 164(sp)
+// 0x010b08a8: 0x10b08a8: sw    a3, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5779,14 +5779,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b0264: 0x10b0264: addiu a2, zero, 2
+// 0x010b08ac: 0x10b08ac: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010b0268: 0x10b0268: addu  a3, s4, zero
+// 0x010b08b0: 0x10b08b0: addu  a3, s4, zero
 	ldloc 11
 	stloc 4
-// 0x010b026c: 0x10b026c: sw    ra, 148(sp)
-// 0x010b0270: 0x10b0270: sw    v1, 40(sp)
+// 0x010b08b4: 0x10b08b4: sw    ra, 148(sp)
+// 0x010b08b8: 0x10b08b8: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5795,7 +5795,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0274: 0x10b0274: sw    v0, 44(sp)
+// 0x010b08bc: 0x10b08bc: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5804,7 +5804,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0278: 0x10b0278: sw    s7, 140(sp)
+// 0x010b08c0: 0x10b08c0: sw    s7, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5813,7 +5813,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b027c: 0x10b027c: sw    s6, 136(sp)
+// 0x010b08c4: 0x10b08c4: sw    s6, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5822,7 +5822,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b0280: 0x10b0280: lw    s7, 172(sp)
+// 0x010b08c8: 0x10b08c8: lw    s7, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5831,7 +5831,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b0284: 0x10b0284: sw    s5, 132(sp)
+// 0x010b08cc: 0x10b08cc: sw    s5, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5840,7 +5840,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b0288: 0x10b0288: sw    s0, 112(sp)
+// 0x010b08d0: 0x10b08d0: sw    s0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5849,15 +5849,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b028c: 0x10b028c: addu  s5, a0, zero
+// 0x010b08d4: 0x10b08d4: addu  s5, a0, zero
 	ldloc.1
 	stloc 14
-// 0x010b0290: 0x10b0290: addiu s0, sp, 96
+// 0x010b08d8: 0x10b08d8: addiu s0, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 8
-// 0x010b0294: 0x10b0294: sw    s1, 48(sp)
+// 0x010b08dc: 0x10b08dc: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5866,7 +5866,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b0298: 0x10b0298: sw    s1, 52(sp)
+// 0x010b08e0: 0x10b08e0: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5875,7 +5875,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b029c: 0x10b029c: sw    s1, 56(sp)
+// 0x010b08e4: 0x10b08e4: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5884,7 +5884,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b02a0: 0x10b02a0: sw    s1, 60(sp)
+// 0x010b08e8: 0x10b08e8: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5893,7 +5893,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b02a4: 0x10b02a4: sw    s1, 64(sp)
+// 0x010b08ec: 0x10b08ec: sw    s1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5902,7 +5902,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b02a8: 0x10b02a8: sw    s1, 68(sp)
+// 0x010b08f0: 0x10b08f0: sw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5911,7 +5911,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b02ac: 0x10b02ac: sw    s1, 72(sp)
+// 0x010b08f4: 0x10b08f4: sw    s1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5920,7 +5920,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b02b0: 0x10b02b0: sw    s1, 76(sp)
+// 0x010b08f8: 0x10b08f8: sw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5929,7 +5929,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b02b4: 0x10b02b4: jal   0x10af37c sw    s1, 80(sp)
+// 0x010b08fc: 0x10b08fc: jal   0x10af9c4 sw    s1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5943,12 +5943,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_get_node_10af37c(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_get_node_10af9c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b02bc: 0x10b02bc: lw    a1, 164(sp)
+// 0x010b0904: 0x10b0904: lw    a1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5957,13 +5957,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b02c0: 0x10b02c0: addu  a3, s0, zero
+// 0x010b0908: 0x10b0908: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x010b02c4: 0x10b02c4: addiu a2, zero, 1
+// 0x010b090c: 0x10b090c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b02c8: 0x10b02c8: jal   0x10af37c addu  a0, s3, zero
+// 0x010b0910: 0x10b0910: jal   0x10af9c4 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -5971,15 +5971,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_get_node_10af37c(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_get_node_10af9c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b02d0: 0x10b02d0: addu  a0, s4, zero
+// 0x010b0918: 0x10b0918: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010b02d4: 0x10b02d4: jal   0x10af558 addu  a1, s0, zero
+// 0x010b091c: 0x10b091c: jal   0x10afba0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5987,22 +5987,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_same_node_10af558(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_same_node_10afba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b02dc: 0x10b02dc: addu  s0, v0, zero
+// 0x010b0924: 0x10b0924: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010b02e0: 0x10b02e0: lw    v1, 0(s2)
+// 0x010b0928: 0x10b0928: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b02e4: 0x10b02e4: lw    v0, 4(s2)
+// 0x010b092c: 0x10b092c: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6011,7 +6011,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b02e8: 0x10b02e8: lw    t3, 4(s5)
+// 0x010b0930: 0x10b0930: lw    t3, 4(s5)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -6020,14 +6020,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 22
-// 0x010b02ec: 0x10b02ec: lw    t2, 0(s5)
+// 0x010b0934: 0x10b0934: lw    t2, 0(s5)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 21
-// 0x010b02f0: 0x10b02f0: lw    t1, 4(s3)
+// 0x010b0938: 0x10b0938: lw    t1, 4(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -6036,36 +6036,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010b02f4: 0x10b02f4: lw    t0, 0(s3)
+// 0x010b093c: 0x10b093c: lw    t0, 0(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 19
-// 0x010b02f8: 0x10b02f8: lui   s4, 0x20000
+// 0x010b0940: 0x10b0940: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x010b02fc: 0x10b02fc: lui   a3, 0x20000
+// 0x010b0944: 0x10b0944: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0300: 0x10b0300: addiu a3, a3, 17504
+// 0x010b0948: 0x10b0948: addiu a3, a3, 17964
 	ldloc 4
-	ldc.i4 17504
+	ldc.i4 17964
 	add
 	stloc 4
-// 0x010b0304: 0x10b0304: addiu a0, zero, 2
+// 0x010b094c: 0x10b094c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b0308: 0x10b0308: addiu a1, s4, 17204
+// 0x010b0950: 0x10b0950: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b030c: 0x10b030c: addiu a2, zero, 738
+// 0x010b0954: 0x10b0954: addiu a2, zero, 738
 	ldc.i4 738
 	stloc.3
-// 0x010b0310: 0x10b0310: sw    t3, 16(sp)
+// 0x010b0958: 0x10b0958: sw    t3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6074,7 +6074,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 22
 	stelem.i4
-// 0x010b0314: 0x10b0314: sw    t2, 20(sp)
+// 0x010b095c: 0x10b095c: sw    t2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6083,7 +6083,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 21
 	stelem.i4
-// 0x010b0318: 0x10b0318: sw    t1, 24(sp)
+// 0x010b0960: 0x10b0960: sw    t1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6092,7 +6092,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010b031c: 0x10b031c: sw    t0, 28(sp)
+// 0x010b0964: 0x10b0964: sw    t0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6101,7 +6101,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010b0320: 0x10b0320: sw    v1, 32(sp)
+// 0x010b0968: 0x10b0968: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6110,10 +6110,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0324: 0x10b0324: addiu s2, zero, 3
+// 0x010b096c: 0x10b096c: addiu s2, zero, 3
 	ldc.i4.3
 	stloc 10
-// 0x010b0328: 0x10b0328: jal   0x100449c sw    v0, 36(sp)
+// 0x010b0970: 0x10b0970: jal   0x100449c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6132,26 +6132,26 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0330: 0x10b0330: addu  a0, s5, zero
+// 0x010b0978: 0x10b0978: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010b0334: 0x10b0334: addiu a1, sp, 40
+// 0x010b097c: 0x10b097c: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b0338: 0x10b0338: addu  a2, s7, zero
+// 0x010b0980: 0x10b0980: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x010b033c: 0x10b033c: addiu a3, zero, 9
+// 0x010b0984: 0x10b0984: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x010b0340: 0x10b0340: addiu v0, sp, 48
+// 0x010b0988: 0x10b0988: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x010b0344: 0x10b0344: sw    s2, 16(sp)
+// 0x010b098c: 0x10b098c: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6160,7 +6160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b0348: 0x10b0348: sw    s8, 20(sp)
+// 0x010b0990: 0x10b0990: sw    s8, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6169,7 +6169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b034c: 0x10b034c: jal   0x10afb84 sw    v0, 24(sp)
+// 0x010b0994: 0x10b0994: jal   0x10b01cc sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6183,15 +6183,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_split_point_10afb84(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_split_point_10b01cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0354: 0x10b0354: addu  s6, v0, zero
+// 0x010b099c: 0x10b099c: addu  s6, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010b0358: 0x10b0358: lw    v0, 164(sp)
+// 0x010b09a0: 0x10b09a0: lw    v0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6200,12 +6200,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b035c: 0x10b035c: addiu a1, sp, 40
+// 0x010b09a4: 0x10b09a4: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b0360: 0x10b0360: sw    v0, 20(sp)
+// 0x010b09a8: 0x10b09a8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6214,21 +6214,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0364: 0x10b0364: addu  a0, s3, zero
+// 0x010b09ac: 0x10b09ac: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x010b0368: 0x10b0368: addiu v0, sp, 60
+// 0x010b09b0: 0x10b09b0: addiu v0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 5
-// 0x010b036c: 0x10b036c: addu  a2, s7, zero
+// 0x010b09b4: 0x10b09b4: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x010b0370: 0x10b0370: addiu a3, zero, 10
+// 0x010b09b8: 0x10b09b8: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010b0374: 0x10b0374: sw    s2, 16(sp)
+// 0x010b09bc: 0x10b09bc: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6237,7 +6237,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b0378: 0x10b0378: jal   0x10afb84 sw    v0, 24(sp)
+// 0x010b09c0: 0x10b09c0: jal   0x10b01cc sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6251,28 +6251,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_split_point_10afb84(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_split_point_10b01cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0380: 0x10b0380: beq   s6, s1, 0x10b0408 addu  s2, v0, zero
+// 0x010b09c8: 0x10b09c8: beq   s6, s1, 0x10b0a50 addu  s2, v0, zero
 	ldloc 12
 	ldloc 9
 	ldloc 5
 	stloc 10
-	beq  L_10b0408
+	beq  L_10b0a50
 // --- basic block ---
-// 0x010b0388: 0x10b0388: beq   v0, s1, 0x10b04f4 addiu a0, sp, 48
+// 0x010b09d0: 0x10b09d0: beq   v0, s1, 0x10b0b3c addiu a0, sp, 48
 	ldloc 5
 	ldloc 9
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-	beq  L_10b04f4
+	beq  L_10b0b3c
 // --- basic block ---
-// 0x010b0390: 0x10b0390: jal   0x10af558 addiu a1, sp, 60
+// 0x010b09d8: 0x10b09d8: jal   0x10afba0 addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
@@ -6282,39 +6282,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_same_node_10af558(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_same_node_10afba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0398: 0x10b0398: beq   v0, zero, 0x10b03c4 addu  s2, s2, s6
+// 0x010b09e0: 0x10b09e0: beq   v0, zero, 0x10b0a0c addu  s2, s2, s6
 	ldloc 5
 	ldloc 10
 	ldloc 12
 	add
 	stloc 10
-	brfalse L_10b03c4
+	brfalse L_10b0a0c
 // --- basic block ---
-// 0x010b03a0: 0x10b03a0: lui   a3, 0x20000
+// 0x010b09e8: 0x10b09e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b03a4: 0x10b03a4: addiu a1, s4, 17204
+// 0x010b09ec: 0x10b09ec: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b03a8: 0x10b03a8: addiu a3, a3, 17572
+// 0x010b09f0: 0x10b09f0: addiu a3, a3, 18032
 	ldloc 4
-	ldc.i4 17572
+	ldc.i4 18032
 	add
 	stloc 4
-// 0x010b03ac: 0x10b03ac: addiu a0, zero, 2
+// 0x010b09f4: 0x10b09f4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b03b0: 0x10b03b0: addiu a2, zero, 756
+// 0x010b09f8: 0x10b09f8: addiu a2, zero, 756
 	ldc.i4 756
 	stloc.3
-// 0x010b03b4: 0x10b03b4: jal   0x100449c addiu s0, zero, 2
+// 0x010b09fc: 0x10b09fc: jal   0x100449c addiu s0, zero, 2
 	ldc.i4.2
 	stloc 8
 	ldloc.0
@@ -6327,42 +6327,42 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b03bc: 0x10b03bc: j	 0x10b06f0 div   s2, s0
+// 0x010b0a04: 0x10b0a04: j	 0x10b0d38 div   s2, s0
 	ldloc 10
 	ldloc 8
 	div
 	stloc 17
-	br L_10b06f0
+	br L_10b0d38
 // --- basic block ---
-L_10b03c4:
-// 0x010b03c4: 0x10b03c4: addiu s0, zero, 2
+L_10b0a0c:
+// 0x010b0a0c: 0x10b0a0c: addiu s0, zero, 2
 	ldc.i4.2
 	stloc 8
-// 0x010b03c8: 0x10b03c8: div   s2, s0
+// 0x010b0a10: 0x10b0a10: div   s2, s0
 	ldloc 10
 	ldloc 8
 	div
 	stloc 17
-// 0x010b03cc: 0x10b03cc: mflo  lo
+// 0x010b0a14: 0x10b0a14: mflo  lo
 	ldloc 17
 	stloc.1
-// 0x010b03d0: 0x10b03d0: mflo  lo
+// 0x010b0a18: 0x10b0a18: mflo  lo
 	ldloc 17
 	stloc 8
-// 0x010b03d4: 0x10b03d4: jal   0x10b07a0 sll   zero, zero, 0
+// 0x010b0a1c: 0x10b0a1c: jal   0x10b0de8 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b03dc: 0x10b03dc: addu  a0, v0, zero
+// 0x010b0a24: 0x10b0a24: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b03e0: 0x10b03e0: addiu a1, sp, 48
+// 0x010b0a28: 0x10b0a28: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x010b03e4: 0x10b03e4: jal   0x10af66c addiu a2, sp, 60
+// 0x010b0a2c: 0x10b0a2c: jal   0x10afcb4 addiu a2, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
@@ -6372,51 +6372,51 @@ L_10b03c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_connecting_road_10af66c(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_connecting_road_10afcb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b03ec: 0x10b03ec: beq   v0, zero, 0x10b06f4 lui   a3, 0x20000
+// 0x010b0a34: 0x10b0a34: beq   v0, zero, 0x10b0d3c lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brfalse L_10b06f4
+	brfalse L_10b0d3c
 // --- basic block ---
-// 0x010b03f4: 0x10b03f4: addiu a1, s4, 17204
+// 0x010b0a3c: 0x10b0a3c: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b03f8: 0x10b03f8: addiu a3, a3, 17612
+// 0x010b0a40: 0x10b0a40: addiu a3, a3, 18072
 	ldloc 4
-	ldc.i4 17612
+	ldc.i4 18072
 	add
 	stloc 4
-// 0x010b03fc: 0x10b03fc: addiu a0, zero, 2
+// 0x010b0a44: 0x10b0a44: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b0400: 0x10b0400: j	 0x10b04a4 addiu a2, zero, 767
+// 0x010b0a48: 0x10b0a48: j	 0x10b0aec addiu a2, zero, 767
 	ldc.i4 767
 	stloc.3
-	br L_10b04a4
+	br L_10b0aec
 // --- basic block ---
-L_10b0408:
-// 0x010b0408: 0x10b0408: bne   v0, s6, 0x10b0560 sll   zero, zero, 0
+L_10b0a50:
+// 0x010b0a50: 0x10b0a50: bne   v0, s6, 0x10b0ba8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	bne.un L_10b0560
+	bne.un L_10b0ba8
 // --- basic block ---
-// 0x010b0410: 0x10b0410: beq   s0, zero, 0x10b0444 lui   s1, 0x20000
+// 0x010b0a58: 0x10b0a58: beq   s0, zero, 0x10b0a8c lui   s1, 0x20000
 	ldloc 8
 	ldc.i4 131072
 	stloc 9
-	brfalse L_10b0444
+	brfalse L_10b0a8c
 // --- basic block ---
-// 0x010b0418: 0x10b0418: addu  a0, s5, zero
+// 0x010b0a60: 0x10b0a60: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010b041c: 0x10b041c: jal   0x1014b10 addu  a1, s3, zero
+// 0x010b0a64: 0x10b0a64: jal   0x1014b20 addu  a1, s3, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -6424,56 +6424,56 @@ L_10b0408:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0424: 0x10b0424: bne   v0, zero, 0x10b0444 lui   s1, 0x20000
+// 0x010b0a6c: 0x10b0a6c: bne   v0, zero, 0x10b0a8c lui   s1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 9
-	brtrue L_10b0444
+	brtrue L_10b0a8c
 // --- basic block ---
-// 0x010b042c: 0x10b042c: lui   a3, 0x20000
+// 0x010b0a74: 0x10b0a74: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0430: 0x10b0430: addiu a1, s4, 17204
+// 0x010b0a78: 0x10b0a78: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b0434: 0x10b0434: addiu a3, a3, 17660
+// 0x010b0a7c: 0x10b0a7c: addiu a3, a3, 18120
 	ldloc 4
-	ldc.i4 17660
+	ldc.i4 18120
 	add
 	stloc 4
-// 0x010b0438: 0x10b0438: addiu a0, zero, 2
+// 0x010b0a80: 0x10b0a80: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b043c: 0x10b043c: j	 0x10b06d8 addiu a2, zero, 789
+// 0x010b0a84: 0x10b0a84: j	 0x10b0d20 addiu a2, zero, 789
 	ldc.i4 789
 	stloc.3
-	br L_10b06d8
+	br L_10b0d20
 // --- basic block ---
-L_10b0444:
-// 0x010b0444: 0x10b0444: lui   a3, 0x20000
+L_10b0a8c:
+// 0x010b0a8c: 0x10b0a8c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0448: 0x10b0448: addiu a3, a3, 17760
+// 0x010b0a90: 0x10b0a90: addiu a3, a3, 18220
 	ldloc 4
-	ldc.i4 17760
+	ldc.i4 18220
 	add
 	stloc 4
-// 0x010b044c: 0x10b044c: addiu a0, zero, 2
+// 0x010b0a94: 0x10b0a94: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b0450: 0x10b0450: addiu a1, s1, 17204
+// 0x010b0a98: 0x10b0a98: addiu a1, s1, 17664
 	ldloc 9
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b0454: 0x10b0454: jal   0x100449c addiu a2, zero, 796
+// 0x010b0a9c: 0x10b0a9c: jal   0x100449c addiu a2, zero, 796
 	ldc.i4 796
 	stloc.3
 	ldloc.0
@@ -6486,10 +6486,10 @@ L_10b0444:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b045c: 0x10b045c: addiu v0, zero, 3
+// 0x010b0aa4: 0x10b0aa4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010b0460: 0x10b0460: sw    v0, 16(sp)
+// 0x010b0aa8: 0x10b0aa8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6498,26 +6498,26 @@ L_10b0444:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0464: 0x10b0464: addu  a0, s5, zero
+// 0x010b0aac: 0x10b0aac: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010b0468: 0x10b0468: addiu v0, sp, 48
+// 0x010b0ab0: 0x10b0ab0: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x010b046c: 0x10b046c: addiu a1, sp, 40
+// 0x010b0ab4: 0x10b0ab4: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b0470: 0x10b0470: addu  a2, s7, zero
+// 0x010b0ab8: 0x10b0ab8: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x010b0474: 0x10b0474: addiu a3, zero, 1
+// 0x010b0abc: 0x10b0abc: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010b0478: 0x10b0478: sw    v0, 24(sp)
+// 0x010b0ac0: 0x10b0ac0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6526,7 +6526,7 @@ L_10b0444:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b047c: 0x10b047c: sw    s8, 20(sp)
+// 0x010b0ac4: 0x10b0ac4: sw    s8, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6535,7 +6535,7 @@ L_10b0444:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b0480: 0x10b0480: jal   0x10afb84 addiu s4, zero, -1
+// 0x010b0ac8: 0x10b0ac8: jal   0x10b01cc addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 11
 	ldloc.0
@@ -6543,39 +6543,39 @@ L_10b0444:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_split_point_10afb84(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_split_point_10b01cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0488: 0x10b0488: bne   v0, s4, 0x10b04b4 addu  s0, v0, zero
+// 0x010b0ad0: 0x10b0ad0: bne   v0, s4, 0x10b0afc addu  s0, v0, zero
 	ldloc 5
 	ldloc 11
 	ldloc 5
 	stloc 8
-	bne.un L_10b04b4
+	bne.un L_10b0afc
 // --- basic block ---
-// 0x010b0490: 0x10b0490: lui   a3, 0x20000
+// 0x010b0ad8: 0x10b0ad8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0494: 0x10b0494: addiu a1, s1, 17204
+// 0x010b0adc: 0x10b0adc: addiu a1, s1, 17664
 	ldloc 9
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b0498: 0x10b0498: addiu a3, a3, 17804
+// 0x010b0ae0: 0x10b0ae0: addiu a3, a3, 18264
 	ldloc 4
-	ldc.i4 17804
+	ldc.i4 18264
 	add
 	stloc 4
-// 0x010b049c: 0x10b049c: addiu a0, zero, 4
+// 0x010b0ae4: 0x10b0ae4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b04a0: 0x10b04a0: addiu a2, zero, 804
+// 0x010b0ae8: 0x10b0ae8: addiu a2, zero, 804
 	ldc.i4 804
 	stloc.3
-L_10b04a4:
-// 0x010b04a4: 0x10b04a4: jal   0x100449c sll   zero, zero, 0
+L_10b0aec:
+// 0x010b0aec: 0x10b0aec: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6586,11 +6586,11 @@ L_10b04a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b04ac: 0x10b04ac: j	 0x10b06f4 sll   zero, zero, 0
-	br L_10b06f4
+// 0x010b0af4: 0x10b0af4: j	 0x10b0d3c sll   zero, zero, 0
+	br L_10b0d3c
 // --- basic block ---
-L_10b04b4:
-// 0x010b04b4: 0x10b04b4: lw    v0, 48(sp)
+L_10b0afc:
+// 0x010b0afc: 0x10b0afc: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6599,12 +6599,12 @@ L_10b04b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b04b8: 0x10b04b8: addiu a0, sp, 72
+// 0x010b0b00: 0x10b0b00: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x010b04bc: 0x10b04bc: sw    v0, 72(sp)
+// 0x010b0b04: 0x10b0b04: sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6613,7 +6613,7 @@ L_10b04b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b04c0: 0x10b04c0: lw    v0, 52(sp)
+// 0x010b0b08: 0x10b0b08: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6622,10 +6622,10 @@ L_10b04b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b04c4: 0x10b04c4: addu  a1, s3, zero
+// 0x010b0b0c: 0x10b0b0c: addu  a1, s3, zero
 	ldloc 13
 	stloc.2
-// 0x010b04c8: 0x10b04c8: sw    v0, 76(sp)
+// 0x010b0b10: 0x10b0b10: sw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6634,7 +6634,7 @@ L_10b04b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b04cc: 0x10b04cc: lw    v0, 56(sp)
+// 0x010b0b14: 0x10b0b14: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6643,7 +6643,7 @@ L_10b04b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b04d0: 0x10b04d0: jal   0x10af5b4 sw    v0, 80(sp)
+// 0x010b0b18: 0x10b0b18: jal   0x10afbfc sw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6657,66 +6657,66 @@ L_10b04b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::adjust_connect_node_10af5b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::adjust_connect_node_10afbfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b04d8: 0x10b04d8: bne   v0, s4, 0x10b05cc lui   a3, 0x20000
+// 0x010b0b20: 0x10b0b20: bne   v0, s4, 0x10b0c14 lui   a3, 0x20000
 	ldloc 5
 	ldloc 11
 	ldc.i4 131072
 	stloc 4
-	bne.un L_10b05cc
+	bne.un L_10b0c14
 // --- basic block ---
-// 0x010b04e0: 0x10b04e0: addiu a1, s1, 17204
+// 0x010b0b28: 0x10b0b28: addiu a1, s1, 17664
 	ldloc 9
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b04e4: 0x10b04e4: addiu a3, a3, 17840
+// 0x010b0b2c: 0x10b0b2c: addiu a3, a3, 18300
 	ldloc 4
-	ldc.i4 17840
+	ldc.i4 18300
 	add
 	stloc 4
-// 0x010b04e8: 0x10b04e8: addiu a0, zero, 2
+// 0x010b0b30: 0x10b0b30: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b04ec: 0x10b04ec: j	 0x10b0510 addiu a2, zero, 812
+// 0x010b0b34: 0x10b0b34: j	 0x10b0b58 addiu a2, zero, 812
 	ldc.i4 812
 	stloc.3
-	br L_10b0510
+	br L_10b0b58
 // --- basic block ---
-L_10b04f4:
-// 0x010b04f4: 0x10b04f4: beq   s0, zero, 0x10b0520 addiu a0, sp, 72
+L_10b0b3c:
+// 0x010b0b3c: 0x10b0b3c: beq   s0, zero, 0x10b0b68 addiu a0, sp, 72
 	ldloc 8
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-	brfalse L_10b0520
+	brfalse L_10b0b68
 // --- basic block ---
-// 0x010b04fc: 0x10b04fc: lui   a3, 0x20000
+// 0x010b0b44: 0x10b0b44: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0500: 0x10b0500: addiu a1, s4, 17204
+// 0x010b0b48: 0x10b0b48: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b0504: 0x10b0504: addiu a3, a3, 17892
+// 0x010b0b4c: 0x10b0b4c: addiu a3, a3, 18352
 	ldloc 4
-	ldc.i4 17892
+	ldc.i4 18352
 	add
 	stloc 4
-// 0x010b0508: 0x10b0508: addiu a0, zero, 2
+// 0x010b0b50: 0x10b0b50: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b050c: 0x10b050c: addiu a2, zero, 821
+// 0x010b0b54: 0x10b0b54: addiu a2, zero, 821
 	ldc.i4 821
 	stloc.3
-L_10b0510:
-// 0x010b0510: 0x10b0510: jal   0x100449c addu  s0, s6, zero
+L_10b0b58:
+// 0x010b0b58: 0x10b0b58: jal   0x100449c addu  s0, s6, zero
 	ldloc 12
 	stloc 8
 	ldloc.0
@@ -6729,11 +6729,11 @@ L_10b0510:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0518: 0x10b0518: j	 0x10b06f4 sll   zero, zero, 0
-	br L_10b06f4
+// 0x010b0b60: 0x10b0b60: j	 0x10b0d3c sll   zero, zero, 0
+	br L_10b0d3c
 // --- basic block ---
-L_10b0520:
-// 0x010b0520: 0x10b0520: lw    v0, 48(sp)
+L_10b0b68:
+// 0x010b0b68: 0x10b0b68: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6742,8 +6742,8 @@ L_10b0520:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0524: 0x10b0524: sll   zero, zero, 0
-// 0x010b0528: 0x10b0528: sw    v0, 72(sp)
+// 0x010b0b6c: 0x10b0b6c: sll   zero, zero, 0
+// 0x010b0b70: 0x10b0b70: sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6752,7 +6752,7 @@ L_10b0520:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b052c: 0x10b052c: lw    v0, 52(sp)
+// 0x010b0b74: 0x10b0b74: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6761,10 +6761,10 @@ L_10b0520:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0530: 0x10b0530: addu  a1, s3, zero
+// 0x010b0b78: 0x10b0b78: addu  a1, s3, zero
 	ldloc 13
 	stloc.2
-// 0x010b0534: 0x10b0534: sw    v0, 76(sp)
+// 0x010b0b7c: 0x10b0b7c: sw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6773,7 +6773,7 @@ L_10b0520:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0538: 0x10b0538: lw    v0, 56(sp)
+// 0x010b0b80: 0x10b0b80: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6782,7 +6782,7 @@ L_10b0520:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b053c: 0x10b053c: jal   0x10af5b4 sw    v0, 80(sp)
+// 0x010b0b84: 0x10b0b84: jal   0x10afbfc sw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6796,62 +6796,62 @@ L_10b0520:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::adjust_connect_node_10af5b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::adjust_connect_node_10afbfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0544: 0x10b0544: bne   v0, s2, 0x10b05c8 lui   a3, 0x20000
+// 0x010b0b8c: 0x10b0b8c: bne   v0, s2, 0x10b0c10 lui   a3, 0x20000
 	ldloc 5
 	ldloc 10
 	ldc.i4 131072
 	stloc 4
-	bne.un L_10b05c8
+	bne.un L_10b0c10
 // --- basic block ---
-// 0x010b054c: 0x10b054c: addiu a1, s4, 17204
+// 0x010b0b94: 0x10b0b94: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b0550: 0x10b0550: addiu a3, a3, 17840
+// 0x010b0b98: 0x10b0b98: addiu a3, a3, 18300
 	ldloc 4
-	ldc.i4 17840
+	ldc.i4 18300
 	add
 	stloc 4
-// 0x010b0554: 0x10b0554: addiu a0, zero, 2
+// 0x010b0b9c: 0x10b0b9c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b0558: 0x10b0558: j	 0x10b06d8 addiu a2, zero, 830
+// 0x010b0ba0: 0x10b0ba0: j	 0x10b0d20 addiu a2, zero, 830
 	ldc.i4 830
 	stloc.3
-	br L_10b06d8
+	br L_10b0d20
 // --- basic block ---
-L_10b0560:
-// 0x010b0560: 0x10b0560: beq   s0, zero, 0x10b0588 addiu a0, sp, 72
+L_10b0ba8:
+// 0x010b0ba8: 0x10b0ba8: beq   s0, zero, 0x10b0bd0 addiu a0, sp, 72
 	ldloc 8
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-	brfalse L_10b0588
+	brfalse L_10b0bd0
 // --- basic block ---
-// 0x010b0568: 0x10b0568: lui   a3, 0x20000
+// 0x010b0bb0: 0x10b0bb0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b056c: 0x10b056c: addiu a1, s4, 17204
+// 0x010b0bb4: 0x10b0bb4: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b0570: 0x10b0570: addiu a3, a3, 17952
+// 0x010b0bb8: 0x10b0bb8: addiu a3, a3, 18412
 	ldloc 4
-	ldc.i4 17952
+	ldc.i4 18412
 	add
 	stloc 4
-// 0x010b0574: 0x10b0574: addiu a0, zero, 2
+// 0x010b0bbc: 0x10b0bbc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b0578: 0x10b0578: jal   0x100449c addiu a2, zero, 839
+// 0x010b0bc0: 0x10b0bc0: jal   0x100449c addiu a2, zero, 839
 	ldc.i4 839
 	stloc.3
 	ldloc.0
@@ -6864,13 +6864,13 @@ L_10b0560:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0580: 0x10b0580: j	 0x10b06f4 addu  s0, s2, zero
+// 0x010b0bc8: 0x10b0bc8: j	 0x10b0d3c addu  s0, s2, zero
 	ldloc 10
 	stloc 8
-	br L_10b06f4
+	br L_10b0d3c
 // --- basic block ---
-L_10b0588:
-// 0x010b0588: 0x10b0588: lw    v0, 60(sp)
+L_10b0bd0:
+// 0x010b0bd0: 0x10b0bd0: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6879,8 +6879,8 @@ L_10b0588:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b058c: 0x10b058c: sll   zero, zero, 0
-// 0x010b0590: 0x10b0590: sw    v0, 72(sp)
+// 0x010b0bd4: 0x10b0bd4: sll   zero, zero, 0
+// 0x010b0bd8: 0x10b0bd8: sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6889,7 +6889,7 @@ L_10b0588:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0594: 0x10b0594: lw    v0, 64(sp)
+// 0x010b0bdc: 0x10b0bdc: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6898,10 +6898,10 @@ L_10b0588:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0598: 0x10b0598: addu  a1, s5, zero
+// 0x010b0be0: 0x10b0be0: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x010b059c: 0x10b059c: sw    v0, 76(sp)
+// 0x010b0be4: 0x10b0be4: sw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6910,7 +6910,7 @@ L_10b0588:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b05a0: 0x10b05a0: lw    v0, 68(sp)
+// 0x010b0be8: 0x10b0be8: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6919,7 +6919,7 @@ L_10b0588:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b05a4: 0x10b05a4: jal   0x10af5b4 sw    v0, 80(sp)
+// 0x010b0bec: 0x10b0bec: jal   0x10afbfc sw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6933,42 +6933,42 @@ L_10b0588:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::adjust_connect_node_10af5b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::adjust_connect_node_10afbfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b05ac: 0x10b05ac: bne   v0, s6, 0x10b05c8 lui   a3, 0x20000
+// 0x010b0bf4: 0x10b0bf4: bne   v0, s6, 0x10b0c10 lui   a3, 0x20000
 	ldloc 5
 	ldloc 12
 	ldc.i4 131072
 	stloc 4
-	bne.un L_10b05c8
+	bne.un L_10b0c10
 // --- basic block ---
-// 0x010b05b4: 0x10b05b4: addiu a1, s4, 17204
+// 0x010b0bfc: 0x10b0bfc: addiu a1, s4, 17664
 	ldloc 11
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b05b8: 0x10b05b8: addiu a3, a3, 17840
+// 0x010b0c00: 0x10b0c00: addiu a3, a3, 18300
 	ldloc 4
-	ldc.i4 17840
+	ldc.i4 18300
 	add
 	stloc 4
-// 0x010b05bc: 0x10b05bc: addiu a0, zero, 2
+// 0x010b0c04: 0x10b0c04: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b05c0: 0x10b05c0: j	 0x10b06d8 addiu a2, zero, 848
+// 0x010b0c08: 0x10b0c08: j	 0x10b0d20 addiu a2, zero, 848
 	ldc.i4 848
 	stloc.3
-	br L_10b06d8
+	br L_10b0d20
 // --- basic block ---
-L_10b05c8:
-// 0x010b05c8: 0x10b05c8: addu  s0, s6, zero
+L_10b0c10:
+// 0x010b0c10: 0x10b0c10: addu  s0, s6, zero
 	ldloc 12
 	stloc 8
-L_10b05cc:
-// 0x010b05cc: 0x10b05cc: lw    v0, 76(sp)
+L_10b0c14:
+// 0x010b0c14: 0x10b0c14: lw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6977,52 +6977,52 @@ L_10b05cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b05d0: 0x10b05d0: addiu s6, zero, -1
+// 0x010b0c18: 0x10b0c18: addiu s6, zero, -1
 	ldc.i4.m1
 	stloc 12
-// 0x010b05d4: 0x10b05d4: bne   v0, s6, 0x10b05f8 addiu s1, sp, 72
+// 0x010b0c1c: 0x10b0c1c: bne   v0, s6, 0x10b0c40 addiu s1, sp, 72
 	ldloc 5
 	ldloc 12
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 9
-	bne.un L_10b05f8
+	bne.un L_10b0c40
 // --- basic block ---
-// 0x010b05dc: 0x10b05dc: lui   a1, 0x20000
+// 0x010b0c24: 0x10b0c24: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b05e0: 0x10b05e0: lui   a3, 0x20000
+// 0x010b0c28: 0x10b0c28: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b05e4: 0x10b05e4: addiu a1, a1, 17204
+// 0x010b0c2c: 0x10b0c2c: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b05e8: 0x10b05e8: addiu a3, a3, 18016
+// 0x010b0c30: 0x10b0c30: addiu a3, a3, 18476
 	ldloc 4
-	ldc.i4 18016
+	ldc.i4 18476
 	add
 	stloc 4
-// 0x010b05ec: 0x10b05ec: addiu a0, zero, 4
+// 0x010b0c34: 0x10b0c34: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b05f0: 0x10b05f0: j	 0x10b06d8 addiu a2, zero, 857
+// 0x010b0c38: 0x10b0c38: j	 0x10b0d20 addiu a2, zero, 857
 	ldc.i4 857
 	stloc.3
-	br L_10b06d8
+	br L_10b0d20
 // --- basic block ---
-L_10b05f8:
-// 0x010b05f8: 0x10b05f8: addiu s4, sp, 40
+L_10b0c40:
+// 0x010b0c40: 0x10b0c40: addiu s4, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 11
-// 0x010b05fc: 0x10b05fc: addu  a0, s1, zero
+// 0x010b0c44: 0x10b0c44: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b0600: 0x10b0600: jal   0x10af4b8 addu  a1, s4, zero
+// 0x010b0c48: 0x10b0c48: jal   0x10afb00 addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -7030,38 +7030,38 @@ L_10b05f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_node_pos_10af4b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_node_pos_10afb00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0608: 0x10b0608: bne   s0, s6, 0x10b0658 addiu v0, zero, -1
+// 0x010b0c50: 0x10b0c50: bne   s0, s6, 0x10b0ca0 addiu v0, zero, -1
 	ldloc 8
 	ldloc 12
 	ldc.i4.m1
 	stloc 5
-	bne.un L_10b0658
+	bne.un L_10b0ca0
 // --- basic block ---
-// 0x010b0610: 0x10b0610: lui   a1, 0x20000
+// 0x010b0c58: 0x10b0c58: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b0614: 0x10b0614: lui   a3, 0x20000
+// 0x010b0c5c: 0x10b0c5c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0618: 0x10b0618: addiu a1, a1, 17204
+// 0x010b0c60: 0x10b0c60: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b061c: 0x10b061c: addiu a3, a3, 18048
+// 0x010b0c64: 0x10b0c64: addiu a3, a3, 18508
 	ldloc 4
-	ldc.i4 18048
+	ldc.i4 18508
 	add
 	stloc 4
-// 0x010b0620: 0x10b0620: addiu a0, zero, 2
+// 0x010b0c68: 0x10b0c68: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b0624: 0x10b0624: jal   0x100449c addiu a2, zero, 866
+// 0x010b0c6c: 0x10b0c6c: jal   0x100449c addiu a2, zero, 866
 	ldc.i4 866
 	stloc.3
 	ldloc.0
@@ -7074,22 +7074,22 @@ L_10b05f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b062c: 0x10b062c: addiu v0, zero, 3
+// 0x010b0c74: 0x10b0c74: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010b0630: 0x10b0630: addu  a0, s5, zero
+// 0x010b0c78: 0x10b0c78: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010b0634: 0x10b0634: addu  a1, s4, zero
+// 0x010b0c7c: 0x10b0c7c: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x010b0638: 0x10b0638: addu  a2, s7, zero
+// 0x010b0c80: 0x10b0c80: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x010b063c: 0x10b063c: addiu a3, zero, 5
+// 0x010b0c84: 0x10b0c84: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x010b0640: 0x10b0640: sw    v0, 16(sp)
+// 0x010b0c88: 0x10b0c88: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7098,7 +7098,7 @@ L_10b05f8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0644: 0x10b0644: sw    s8, 20(sp)
+// 0x010b0c8c: 0x10b0c8c: sw    s8, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7107,7 +7107,7 @@ L_10b05f8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b0648: 0x10b0648: jal   0x10afb84 sw    s1, 24(sp)
+// 0x010b0c90: 0x10b0c90: jal   0x10b01cc sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7121,45 +7121,45 @@ L_10b05f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_split_point_10afb84(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_split_point_10b01cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0650: 0x10b0650: addu  s0, v0, zero
+// 0x010b0c98: 0x10b0c98: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010b0654: 0x10b0654: addiu v0, zero, -1
+// 0x010b0c9c: 0x10b0c9c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10b0658:
-// 0x010b0658: 0x10b0658: bne   s2, v0, 0x10b06b0 addiu v0, zero, -1
+L_10b0ca0:
+// 0x010b0ca0: 0x10b0ca0: bne   s2, v0, 0x10b0cf8 addiu v0, zero, -1
 	ldloc 10
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	bne.un L_10b06b0
+	bne.un L_10b0cf8
 // --- basic block ---
-// 0x010b0660: 0x10b0660: lui   a1, 0x20000
+// 0x010b0ca8: 0x10b0ca8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b0664: 0x10b0664: lui   a3, 0x20000
+// 0x010b0cac: 0x10b0cac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0668: 0x10b0668: addiu a1, a1, 17204
+// 0x010b0cb0: 0x10b0cb0: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b066c: 0x10b066c: addiu a3, a3, 18088
+// 0x010b0cb4: 0x10b0cb4: addiu a3, a3, 18548
 	ldloc 4
-	ldc.i4 18088
+	ldc.i4 18548
 	add
 	stloc 4
-// 0x010b0670: 0x10b0670: addiu a0, zero, 2
+// 0x010b0cb8: 0x10b0cb8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b0674: 0x10b0674: jal   0x100449c addiu a2, zero, 875
+// 0x010b0cbc: 0x10b0cbc: jal   0x100449c addiu a2, zero, 875
 	ldc.i4 875
 	stloc.3
 	ldloc.0
@@ -7172,10 +7172,10 @@ L_10b0658:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b067c: 0x10b067c: addiu v0, zero, 3
+// 0x010b0cc4: 0x10b0cc4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010b0680: 0x10b0680: sw    v0, 16(sp)
+// 0x010b0cc8: 0x10b0cc8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7184,7 +7184,7 @@ L_10b0658:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0684: 0x10b0684: lw    v0, 164(sp)
+// 0x010b0ccc: 0x10b0ccc: lw    v0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7193,10 +7193,10 @@ L_10b0658:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0688: 0x10b0688: addu  a0, s3, zero
+// 0x010b0cd0: 0x10b0cd0: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x010b068c: 0x10b068c: sw    v0, 20(sp)
+// 0x010b0cd4: 0x10b0cd4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7205,23 +7205,23 @@ L_10b0658:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0690: 0x10b0690: addu  a2, s7, zero
+// 0x010b0cd8: 0x10b0cd8: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x010b0694: 0x10b0694: addiu v0, sp, 72
+// 0x010b0cdc: 0x10b0cdc: addiu v0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 5
-// 0x010b0698: 0x10b0698: addiu a1, sp, 40
+// 0x010b0ce0: 0x10b0ce0: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b069c: 0x10b069c: addiu a3, zero, 6
+// 0x010b0ce4: 0x10b0ce4: addiu a3, zero, 6
 	ldc.i4.6
 	stloc 4
-// 0x010b06a0: 0x10b06a0: jal   0x10afb84 sw    v0, 24(sp)
+// 0x010b0ce8: 0x10b0ce8: jal   0x10b01cc sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7235,57 +7235,57 @@ L_10b0658:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_split_point_10afb84(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_split_point_10b01cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b06a8: 0x10b06a8: addu  s2, v0, zero
+// 0x010b0cf0: 0x10b0cf0: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010b06ac: 0x10b06ac: addiu v0, zero, -1
+// 0x010b0cf4: 0x10b0cf4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10b06b0:
-// 0x010b06b0: 0x10b06b0: beq   s0, v0, 0x10b06c4 lui   a1, 0x20000
+L_10b0cf8:
+// 0x010b0cf8: 0x10b0cf8: beq   s0, v0, 0x10b0d0c lui   a1, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	beq  L_10b06c4
+	beq  L_10b0d0c
 // --- basic block ---
-// 0x010b06b8: 0x10b06b8: bne   s2, v0, 0x10b06e8 addiu v0, zero, 2
+// 0x010b0d00: 0x10b0d00: bne   s2, v0, 0x10b0d30 addiu v0, zero, 2
 	ldloc 10
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	bne.un L_10b06e8
+	bne.un L_10b0d30
 // --- basic block ---
-// 0x010b06c0: 0x10b06c0: lui   a1, 0x20000
+// 0x010b0d08: 0x10b0d08: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10b06c4:
-// 0x010b06c4: 0x10b06c4: lui   a3, 0x20000
+L_10b0d0c:
+// 0x010b0d0c: 0x10b0d0c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b06c8: 0x10b06c8: addiu a1, a1, 17204
+// 0x010b0d10: 0x10b0d10: addiu a1, a1, 17664
 	ldloc.2
-	ldc.i4 17204
+	ldc.i4 17664
 	add
 	stloc.2
-// 0x010b06cc: 0x10b06cc: addiu a3, a3, 17804
+// 0x010b0d14: 0x10b0d14: addiu a3, a3, 18264
 	ldloc 4
-	ldc.i4 17804
+	ldc.i4 18264
 	add
 	stloc 4
-// 0x010b06d0: 0x10b06d0: addiu a0, zero, 4
+// 0x010b0d18: 0x10b0d18: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b06d4: 0x10b06d4: addiu a2, zero, 884
+// 0x010b0d1c: 0x10b0d1c: addiu a2, zero, 884
 	ldc.i4 884
 	stloc.3
-L_10b06d8:
-// 0x010b06d8: 0x10b06d8: jal   0x100449c addiu s0, zero, -1
+L_10b0d20:
+// 0x010b0d20: 0x10b0d20: jal   0x100449c addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 8
 	ldloc.0
@@ -7298,30 +7298,30 @@ L_10b06d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b06e0: 0x10b06e0: j	 0x10b06f4 sll   zero, zero, 0
-	br L_10b06f4
+// 0x010b0d28: 0x10b0d28: j	 0x10b0d3c sll   zero, zero, 0
+	br L_10b0d3c
 // --- basic block ---
-L_10b06e8:
-// 0x010b06e8: 0x10b06e8: addu  s0, s2, s0
+L_10b0d30:
+// 0x010b0d30: 0x10b0d30: addu  s0, s2, s0
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x010b06ec: 0x10b06ec: div   s0, v0
+// 0x010b0d34: 0x10b0d34: div   s0, v0
 	ldloc 8
 	ldloc 5
 	div
 	stloc 17
-L_10b06f0:
-// 0x010b06f0: 0x10b06f0: mflo  lo
+L_10b0d38:
+// 0x010b0d38: 0x10b0d38: mflo  lo
 	ldloc 17
 	stloc 8
-L_10b06f4:
-// 0x010b06f4: 0x10b06f4: lw    ra, 148(sp)
-// 0x010b06f8: 0x10b06f8: addu  v0, s0, zero
+L_10b0d3c:
+// 0x010b0d3c: 0x10b0d3c: lw    ra, 148(sp)
+// 0x010b0d40: 0x10b0d40: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010b06fc: 0x10b06fc: lw    s8, 144(sp)
+// 0x010b0d44: 0x10b0d44: lw    s8, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7330,7 +7330,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b0700: 0x10b0700: lw    s7, 140(sp)
+// 0x010b0d48: 0x10b0d48: lw    s7, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7339,7 +7339,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b0704: 0x10b0704: lw    s6, 136(sp)
+// 0x010b0d4c: 0x10b0d4c: lw    s6, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7348,7 +7348,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b0708: 0x10b0708: lw    s5, 132(sp)
+// 0x010b0d50: 0x10b0d50: lw    s5, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7357,7 +7357,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b070c: 0x10b070c: lw    s4, 128(sp)
+// 0x010b0d54: 0x10b0d54: lw    s4, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7366,7 +7366,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b0710: 0x10b0710: lw    s3, 124(sp)
+// 0x010b0d58: 0x10b0d58: lw    s3, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7375,7 +7375,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b0714: 0x10b0714: lw    s2, 120(sp)
+// 0x010b0d5c: 0x10b0d5c: lw    s2, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7384,7 +7384,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b0718: 0x10b0718: lw    s1, 116(sp)
+// 0x010b0d60: 0x10b0d60: lw    s1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7393,7 +7393,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b071c: 0x10b071c: lw    s0, 112(sp)
+// 0x010b0d64: 0x10b0d64: lw    s0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7402,7 +7402,7 @@ L_10b06f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0720: 0x10b0720: jr    ra addiu sp, sp, 152
+// 0x010b0d68: 0x10b0d68: jr    ra addiu sp, sp, 152
 	ldloc.0
 	ldc.i4 152
 	add
diff --git a/converted/Cibyl132.j b/converted/Cibyl132.j
index 68eb95b..7ae6d01 100644
--- a/converted/Cibyl132.j
+++ b/converted/Cibyl132.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl132::.ctor
 
-.method public static int32 editor_track_util_new_road_end_10b0728(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_new_road_end_10b0d70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -76,12 +76,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0728: 0x10b0728: addiu sp, sp, -40
+// 0x010b0d70: 0x10b0d70: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b072c: 0x10b072c: lw    v0, 56(sp)
+// 0x010b0d74: 0x10b0d74: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -90,10 +90,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0730: 0x10b0730: addiu v1, zero, -1
+// 0x010b0d78: 0x10b0d78: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b0734: 0x10b0734: sw    a3, 20(sp)
+// 0x010b0d7c: 0x10b0d7c: sw    a3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -102,7 +102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b0738: 0x10b0738: sw    v1, 4(v0)
+// 0x010b0d80: 0x10b0d80: sw    v1, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -111,14 +111,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b073c: 0x10b073c: addiu a3, zero, 2
+// 0x010b0d84: 0x10b0d84: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x010b0740: 0x10b0740: addiu v1, zero, 2
+// 0x010b0d88: 0x10b0d88: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x010b0744: 0x10b0744: sw    ra, 36(sp)
-// 0x010b0748: 0x10b0748: sw    v1, 16(sp)
+// 0x010b0d8c: 0x10b0d8c: sw    ra, 36(sp)
+// 0x010b0d90: 0x10b0d90: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -127,7 +127,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b074c: 0x10b074c: jal   0x10afb84 sw    v0, 24(sp)
+// 0x010b0d94: 0x10b0d94: jal   0x10b01cc sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -141,14 +141,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_split_point_10afb84(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_split_point_10b01cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b0754: 0x10b0754: lw    ra, 36(sp)
-// 0x010b0758: 0x10b0758: sll   zero, zero, 0
-// 0x010b075c: 0x10b075c: jr    ra addiu sp, sp, 40
+// 0x010b0d9c: 0x10b0d9c: lw    ra, 36(sp)
+// 0x010b0da0: 0x10b0da0: sll   zero, zero, 0
+// 0x010b0da4: 0x10b0da4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -160,7 +160,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_track_util_new_road_start_10b0764(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_util_new_road_start_10b0dac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -195,12 +195,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0764: 0x10b0764: addiu sp, sp, -40
+// 0x010b0dac: 0x10b0dac: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b0768: 0x10b0768: lw    v0, 56(sp)
+// 0x010b0db0: 0x10b0db0: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -209,10 +209,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b076c: 0x10b076c: addiu v1, zero, -1
+// 0x010b0db4: 0x10b0db4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b0770: 0x10b0770: sw    a3, 20(sp)
+// 0x010b0db8: 0x10b0db8: sw    a3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -221,7 +221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b0774: 0x10b0774: sw    v1, 4(v0)
+// 0x010b0dbc: 0x10b0dbc: sw    v1, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -230,14 +230,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b0778: 0x10b0778: addiu a3, zero, 1
+// 0x010b0dc0: 0x10b0dc0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010b077c: 0x10b077c: addiu v1, zero, 2
+// 0x010b0dc4: 0x10b0dc4: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x010b0780: 0x10b0780: sw    ra, 36(sp)
-// 0x010b0784: 0x10b0784: sw    v1, 16(sp)
+// 0x010b0dc8: 0x10b0dc8: sw    ra, 36(sp)
+// 0x010b0dcc: 0x10b0dcc: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -246,7 +246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b0788: 0x10b0788: jal   0x10afb84 sw    v0, 24(sp)
+// 0x010b0dd0: 0x10b0dd0: jal   0x10b01cc sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -260,14 +260,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::find_split_point_10afb84(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::find_split_point_10b01cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b0790: 0x10b0790: lw    ra, 36(sp)
-// 0x010b0794: 0x10b0794: sll   zero, zero, 0
-// 0x010b0798: 0x10b0798: jr    ra addiu sp, sp, 40
+// 0x010b0dd8: 0x10b0dd8: lw    ra, 36(sp)
+// 0x010b0ddc: 0x10b0ddc: sll   zero, zero, 0
+// 0x010b0de0: 0x10b0de0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -279,7 +279,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 track_point_pos_10b07a0(int32)
+.method public static int32 track_point_pos_10b0de8(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -296,20 +296,20 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b07a0: 0x10b07a0: lui   v0, 0x90000
+// 0x010b0de8: 0x10b0de8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b07a4: 0x10b07a4: sll   a0, a0, 5
+// 0x010b0dec: 0x10b0dec: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b07a8: 0x10b07a8: addiu v0, v0, -11560
+// 0x010b0df0: 0x10b0df0: addiu v0, v0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b07ac: 0x10b07ac: jr    ra addu  v0, v0, a0
+// 0x010b0df4: 0x10b0df4: jr    ra addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
@@ -319,7 +319,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 track_point_gps_10b07b4(int32)
+.method public static int32 track_point_gps_10b0dfc(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -336,20 +336,20 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b07b4: 0x10b07b4: lui   v0, 0x90000
+// 0x010b0dfc: 0x10b0dfc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b07b8: 0x10b07b8: sll   a0, a0, 5
+// 0x010b0e00: 0x10b0e00: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b07bc: 0x10b07bc: addiu v0, v0, -11560
+// 0x010b0e04: 0x10b0e04: addiu v0, v0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b07c0: 0x10b07c0: jr    ra addu  v0, v0, a0
+// 0x010b0e08: 0x10b0e08: jr    ra addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
@@ -359,7 +359,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 track_point_time_10b07c8(int32)
+.method public static int32 track_point_time_10b0e10(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -379,25 +379,25 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b07c8: 0x10b07c8: lui   v0, 0x90000
+// 0x010b0e10: 0x10b0e10: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b07cc: 0x10b07cc: addiu v0, v0, -11560
+// 0x010b0e14: 0x10b0e14: addiu v0, v0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b07d0: 0x10b07d0: sll   a0, a0, 5
+// 0x010b0e18: 0x10b0e18: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b07d4: 0x10b07d4: addu  a0, v0, a0
+// 0x010b0e1c: 0x10b0e1c: addu  a0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x010b07d8: 0x10b07d8: lw    v0, 20(a0)
+// 0x010b0e20: 0x10b0e20: lw    v0, 20(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -406,13 +406,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b07dc: 0x10b07dc: jr    ra sll   zero, zero, 0
+// 0x010b0e24: 0x10b0e24: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 track_point_status_10b07e4(int32)
+.method public static int32 track_point_status_10b0e2c(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -429,25 +429,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b07e4: 0x10b07e4: sll   a0, a0, 5
+// 0x010b0e2c: 0x10b0e2c: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b07e8: 0x10b07e8: lui   v0, 0x90000
+// 0x010b0e30: 0x10b0e30: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b07ec: 0x10b07ec: addiu a0, a0, 24
+// 0x010b0e34: 0x10b0e34: addiu a0, a0, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
-// 0x010b07f0: 0x10b07f0: addiu v0, v0, -11560
+// 0x010b0e38: 0x10b0e38: addiu v0, v0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b07f4: 0x10b07f4: jr    ra addu  v0, v0, a0
+// 0x010b0e3c: 0x10b0e3c: jr    ra addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
@@ -457,7 +457,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 track_point_ordinal_10b07fc(int32)
+.method public static int32 track_point_ordinal_10b0e44(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -477,25 +477,25 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b07fc: 0x10b07fc: lui   v0, 0x90000
+// 0x010b0e44: 0x10b0e44: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b0800: 0x10b0800: addiu v0, v0, -11560
+// 0x010b0e48: 0x10b0e48: addiu v0, v0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b0804: 0x10b0804: sll   a0, a0, 5
+// 0x010b0e4c: 0x10b0e4c: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b0808: 0x10b0808: addu  a0, v0, a0
+// 0x010b0e50: 0x10b0e50: addu  a0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x010b080c: 0x10b080c: lw    v0, 28(a0)
+// 0x010b0e54: 0x10b0e54: lw    v0, 28(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -504,13 +504,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0810: 0x10b0810: jr    ra sll   zero, zero, 0
+// 0x010b0e58: 0x10b0e58: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 export_track_point_pos_10b0818(int32)
+.method public static int32 export_track_point_pos_10b0e60(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -533,37 +533,37 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0818: 0x10b0818: lui   v0, 0x90000
+// 0x010b0e60: 0x10b0e60: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b081c: 0x10b081c: lw    v0, -11580(v0)
+// 0x010b0e64: 0x10b0e64: lw    v0, -11116(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0820: 0x10b0820: lui   v1, 0x90000
+// 0x010b0e68: 0x10b0e68: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010b0824: 0x10b0824: addu  v0, a0, v0
+// 0x010b0e6c: 0x10b0e6c: addu  v0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.1
-// 0x010b0828: 0x10b0828: addiu v1, v1, -11560
+// 0x010b0e70: 0x10b0e70: addiu v1, v1, -11096
 	ldloc.2
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.2
-// 0x010b082c: 0x10b082c: sll   v0, v0, 5
+// 0x010b0e74: 0x10b0e74: sll   v0, v0, 5
 	ldloc.1
 	ldc.i4.5
 	shl
 	stloc.1
-// 0x010b0830: 0x10b0830: jr    ra addu  v0, v1, v0
+// 0x010b0e78: 0x10b0e78: jr    ra addu  v0, v1, v0
 	ldloc.2
 	ldloc.1
 	add
@@ -575,7 +575,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 export_track_point_gps_10b0838(int32)
+.method public static int32 export_track_point_gps_10b0e80(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -598,37 +598,37 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0838: 0x10b0838: lui   v0, 0x90000
+// 0x010b0e80: 0x10b0e80: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b083c: 0x10b083c: lw    v0, -11580(v0)
+// 0x010b0e84: 0x10b0e84: lw    v0, -11116(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0840: 0x10b0840: lui   v1, 0x90000
+// 0x010b0e88: 0x10b0e88: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010b0844: 0x10b0844: addu  v0, a0, v0
+// 0x010b0e8c: 0x10b0e8c: addu  v0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.1
-// 0x010b0848: 0x10b0848: addiu v1, v1, -11560
+// 0x010b0e90: 0x10b0e90: addiu v1, v1, -11096
 	ldloc.2
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.2
-// 0x010b084c: 0x10b084c: sll   v0, v0, 5
+// 0x010b0e94: 0x10b0e94: sll   v0, v0, 5
 	ldloc.1
 	ldc.i4.5
 	shl
 	stloc.1
-// 0x010b0850: 0x10b0850: jr    ra addu  v0, v1, v0
+// 0x010b0e98: 0x10b0e98: jr    ra addu  v0, v1, v0
 	ldloc.2
 	ldloc.1
 	add
@@ -640,7 +640,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 export_track_point_time_10b0858(int32)
+.method public static int32 export_track_point_time_10b0ea0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -660,43 +660,43 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0858: 0x10b0858: lui   v0, 0x90000
+// 0x010b0ea0: 0x10b0ea0: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b085c: 0x10b085c: lw    v0, -11580(v0)
+// 0x010b0ea4: 0x10b0ea4: lw    v0, -11116(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0860: 0x10b0860: sll   zero, zero, 0
-// 0x010b0864: 0x10b0864: addu  a0, a0, v0
+// 0x010b0ea8: 0x10b0ea8: sll   zero, zero, 0
+// 0x010b0eac: 0x10b0eac: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x010b0868: 0x10b0868: lui   v0, 0x90000
+// 0x010b0eb0: 0x10b0eb0: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b086c: 0x10b086c: sll   a0, a0, 5
+// 0x010b0eb4: 0x10b0eb4: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b0870: 0x10b0870: addiu v0, v0, -11560
+// 0x010b0eb8: 0x10b0eb8: addiu v0, v0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b0874: 0x10b0874: addu  v0, v0, a0
+// 0x010b0ebc: 0x10b0ebc: addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.1
-// 0x010b0878: 0x10b0878: lw    v0, 20(v0)
+// 0x010b0ec0: 0x10b0ec0: lw    v0, 20(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -705,13 +705,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b087c: 0x10b087c: jr    ra sll   zero, zero, 0
+// 0x010b0ec4: 0x10b0ec4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 export_track_point_status_10b0884(int32)
+.method public static int32 export_track_point_status_10b0ecc(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -734,42 +734,42 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0884: 0x10b0884: lui   v0, 0x90000
+// 0x010b0ecc: 0x10b0ecc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b0888: 0x10b0888: lw    v0, -11580(v0)
+// 0x010b0ed0: 0x10b0ed0: lw    v0, -11116(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b088c: 0x10b088c: lui   v1, 0x90000
+// 0x010b0ed4: 0x10b0ed4: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010b0890: 0x10b0890: addu  v0, a0, v0
+// 0x010b0ed8: 0x10b0ed8: addu  v0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.1
-// 0x010b0894: 0x10b0894: sll   v0, v0, 5
+// 0x010b0edc: 0x10b0edc: sll   v0, v0, 5
 	ldloc.1
 	ldc.i4.5
 	shl
 	stloc.1
-// 0x010b0898: 0x10b0898: addiu v1, v1, -11560
+// 0x010b0ee0: 0x10b0ee0: addiu v1, v1, -11096
 	ldloc.2
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.2
-// 0x010b089c: 0x10b089c: addiu v0, v0, 24
+// 0x010b0ee4: 0x10b0ee4: addiu v0, v0, 24
 	ldloc.1
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010b08a0: 0x10b08a0: jr    ra addu  v0, v1, v0
+// 0x010b0ee8: 0x10b0ee8: jr    ra addu  v0, v1, v0
 	ldloc.2
 	ldloc.1
 	add
@@ -781,7 +781,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 export_track_point_ordinal_10b08a8(int32)
+.method public static int32 export_track_point_ordinal_10b0ef0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -801,43 +801,43 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b08a8: 0x10b08a8: lui   v0, 0x90000
+// 0x010b0ef0: 0x10b0ef0: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b08ac: 0x10b08ac: lw    v0, -11580(v0)
+// 0x010b0ef4: 0x10b0ef4: lw    v0, -11116(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b08b0: 0x10b08b0: sll   zero, zero, 0
-// 0x010b08b4: 0x10b08b4: addu  a0, a0, v0
+// 0x010b0ef8: 0x10b0ef8: sll   zero, zero, 0
+// 0x010b0efc: 0x10b0efc: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x010b08b8: 0x10b08b8: lui   v0, 0x90000
+// 0x010b0f00: 0x10b0f00: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b08bc: 0x10b08bc: sll   a0, a0, 5
+// 0x010b0f04: 0x10b0f04: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b08c0: 0x10b08c0: addiu v0, v0, -11560
+// 0x010b0f08: 0x10b0f08: addiu v0, v0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b08c4: 0x10b08c4: addu  v0, v0, a0
+// 0x010b0f0c: 0x10b0f0c: addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.1
-// 0x010b08c8: 0x10b08c8: lw    v0, 28(v0)
+// 0x010b0f10: 0x10b0f10: lw    v0, 28(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -846,13 +846,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b08cc: 0x10b08cc: jr    ra sll   zero, zero, 0
+// 0x010b0f14: 0x10b0f14: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 export_track_is_new_10b08d4()
+.method public static int32 export_track_is_new_10b0f1c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -869,10 +869,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b08d4: 0x10b08d4: lui   v0, 0x0
+// 0x010b0f1c: 0x10b0f1c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x010b08d8: 0x10b08d8: lw    v0, 19040(v0)
+// 0x010b0f20: 0x10b0f20: lw    v0, 19040(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -881,13 +881,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x010b08dc: 0x10b08dc: jr    ra sll   zero, zero, 0
+// 0x010b0f24: 0x10b0f24: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 export_track_num_points_10b08e4()
+.method public static int32 export_track_num_points_10b0f2c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -907,31 +907,31 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b08e4: 0x10b08e4: lui   v0, 0x90000
+// 0x010b0f2c: 0x10b0f2c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010b08e8: 0x10b08e8: lw    v1, -11584(v0)
+// 0x010b0f30: 0x10b0f30: lw    v1, -11120(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b08ec: 0x10b08ec: lui   v0, 0x90000
+// 0x010b0f34: 0x10b0f34: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010b08f0: 0x10b08f0: lw    v0, -11580(v0)
+// 0x010b0f38: 0x10b0f38: lw    v0, -11116(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc.0
-// 0x010b08f4: 0x10b08f4: jr    ra subu  v0, v1, v0
+// 0x010b0f3c: 0x10b0f3c: jr    ra subu  v0, v1, v0
 	ldloc.1
 	ldloc.0
 	sub
@@ -943,7 +943,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 export_track_reset_points_10b08fc()
+.method public static int32 export_track_reset_points_10b0f44()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -963,27 +963,27 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b08fc: 0x10b08fc: lui   v0, 0x90000
+// 0x010b0f44: 0x10b0f44: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010b0900: 0x10b0900: lw    v1, -11584(v0)
+// 0x010b0f48: 0x10b0f48: lw    v1, -11120(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0904: 0x10b0904: lui   v0, 0x90000
+// 0x010b0f4c: 0x10b0f4c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010b0908: 0x10b0908: jr    ra sw    v1, -11580(v0)
+// 0x010b0f50: 0x10b0f50: jr    ra sw    v1, -11116(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldloc.1
 	stelem.i4
@@ -994,7 +994,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_track_get_num_update_toggles_10b0910()
+.method public static int32 editor_track_get_num_update_toggles_10b0f58()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1011,25 +1011,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0910: 0x10b0910: lui   v0, 0x90000
+// 0x010b0f58: 0x10b0f58: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010b0914: 0x10b0914: lw    v0, -11564(v0)
+// 0x010b0f5c: 0x10b0f5c: lw    v0, -11100(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2891
+	ldc.i4 -2775
 	add
 	ldelem.i4
 	stloc.0
-// 0x010b0918: 0x10b0918: jr    ra sll   zero, zero, 0
+// 0x010b0f60: 0x10b0f60: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_track_get_update_toggle_times_10b0920()
+.method public static int32 editor_track_get_update_toggle_times_10b0f68()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1043,12 +1043,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0920: 0x10b0920: lui   v0, 0xe0000
+// 0x010b0f68: 0x10b0f68: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x010b0924: 0x10b0924: jr    ra addiu v0, v0, -19220
+// 0x010b0f6c: 0x10b0f6c: jr    ra addiu v0, v0, -18756
 	ldloc.0
-	ldc.i4 -19220
+	ldc.i4 -18756
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -1056,7 +1056,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_track_get_update_toggle_state_10b092c(int32)
+.method public static int32 editor_track_get_update_toggle_state_10b0f74(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v1,int32 v0,int32 hi,int32[] mem,int32 ra,int32 lo)
@@ -1085,32 +1085,32 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b092c: 0x10b092c: lui   v0, 0x90000
+// 0x010b0f74: 0x10b0f74: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010b0930: 0x10b0930: lw    v1, -11564(v0)
+// 0x010b0f78: 0x10b0f78: lw    v1, -11100(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2891
+	ldc.i4 -2775
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0934: 0x10b0934: addiu v0, zero, 2
+// 0x010b0f7c: 0x10b0f7c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010b0938: 0x10b0938: addiu v1, v1, -1
+// 0x010b0f80: 0x10b0f80: addiu v1, v1, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010b093c: 0x10b093c: subu  v1, v1, a0
+// 0x010b0f84: 0x10b0f84: subu  v1, v1, a0
 	ldloc.1
 	ldloc.0
 	sub
 	stloc.1
-// 0x010b0940: 0x10b0940: div   v1, v0
+// 0x010b0f88: 0x10b0f88: div   v1, v0
 	ldloc.1
 	ldloc.2
 	ldloc.1
@@ -1119,22 +1119,22 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	rem
 	stloc.3
-// 0x010b0944: 0x10b0944: lui   v1, 0x90000
+// 0x010b0f8c: 0x10b0f8c: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b0948: 0x10b0948: lw    v1, -11592(v1)
+// 0x010b0f90: 0x10b0f90: lw    v1, -11128(v1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b094c: 0x10b094c: mfhi  hi
+// 0x010b0f94: 0x10b0f94: mfhi  hi
 	ldloc.3
 	stloc.2
-// 0x010b0950: 0x10b0950: jr    ra xor   v0, v0, v1
+// 0x010b0f98: 0x10b0f98: jr    ra xor   v0, v0, v1
 	ldloc.2
 	ldloc.1
 	xor
@@ -1146,7 +1146,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 editor_track_reset_update_toggles_10b0958()
+.method public static int32 editor_track_reset_update_toggles_10b0fa0()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1163,15 +1163,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0958: 0x10b0958: lui   v0, 0x90000
+// 0x010b0fa0: 0x10b0fa0: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010b095c: 0x10b095c: jr    ra sw    zero, -11564(v0)
+// 0x010b0fa4: 0x10b0fa4: jr    ra sw    zero, -11100(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2891
+	ldc.i4 -2775
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1180,7 +1180,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_ignore_new_roads_10b0964()
+.method public static int32 editor_ignore_new_roads_10b0fac()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1197,19 +1197,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0964: 0x10b0964: lui   v0, 0x90000
+// 0x010b0fac: 0x10b0fac: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.0
-// 0x010b0968: 0x10b0968: lw    v0, -11592(v0)
+// 0x010b0fb0: 0x10b0fb0: lw    v0, -11128(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc.0
-// 0x010b096c: 0x10b096c: jr    ra sltiu v0, v0, 1
+// 0x010b0fb4: 0x10b0fb4: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -1219,7 +1219,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_track_shape_position_10b0974(int32,int32)
+.method public static int32 editor_track_shape_position_10b0fbc(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -1242,40 +1242,40 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0974: 0x10b0974: lui   v0, 0x90000
+// 0x010b0fbc: 0x10b0fbc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc.2
-// 0x010b0978: 0x10b0978: addiu v0, v0, -11560
+// 0x010b0fc0: 0x10b0fc0: addiu v0, v0, -11096
 	ldloc.2
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.2
-// 0x010b097c: 0x10b097c: sll   a0, a0, 5
+// 0x010b0fc4: 0x10b0fc4: sll   a0, a0, 5
 	ldloc.0
 	ldc.i4.5
 	shl
 	stloc.0
-// 0x010b0980: 0x10b0980: addu  a0, v0, a0
+// 0x010b0fc8: 0x10b0fc8: addu  a0, v0, a0
 	ldloc.2
 	ldloc.0
 	add
 	stloc.0
-// 0x010b0984: 0x10b0984: lw    v0, 0(a0)
+// 0x010b0fcc: 0x10b0fcc: lw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b0988: 0x10b0988: sll   zero, zero, 0
-// 0x010b098c: 0x10b098c: sw    v0, 0(a1)
+// 0x010b0fd0: 0x10b0fd0: sll   zero, zero, 0
+// 0x010b0fd4: 0x10b0fd4: sw    v0, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010b0990: 0x10b0990: lw    v0, 4(a0)
+// 0x010b0fd8: 0x10b0fd8: lw    v0, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1284,7 +1284,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b0994: 0x10b0994: jr    ra sw    v0, 4(a1)
+// 0x010b0fdc: 0x10b0fdc: jr    ra sw    v0, 4(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -1298,7 +1298,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 editor_track_is_new_direction_roads_10b09c8(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_is_new_direction_roads_10b1010(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1336,10 +1336,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b09c8: 0x10b09c8: lui   v0, 0x0
+// 0x010b1010: 0x10b1010: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b09cc: 0x10b09cc: lw    v0, 18904(v0)
+// 0x010b1014: 0x10b1014: lw    v0, 18904(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1348,13 +1348,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b09d0: 0x10b09d0: addiu sp, sp, -48
+// 0x010b1018: 0x10b1018: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b09d4: 0x10b09d4: sw    ra, 44(sp)
-// 0x010b09d8: 0x10b09d8: beq   v0, zero, 0x10b0a00 sw    s0, 40(sp)
+// 0x010b101c: 0x10b101c: sw    ra, 44(sp)
+// 0x010b1020: 0x10b1020: beq   v0, zero, 0x10b1048 sw    s0, 40(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1364,17 +1364,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_10b0a00
+	brfalse L_10b1048
 // --- basic block ---
-// 0x010b09e0: 0x10b09e0: lui   s0, 0x0
+// 0x010b1028: 0x10b1028: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010b09e4: 0x10b09e4: addiu s0, s0, 18980
+// 0x010b102c: 0x10b102c: addiu s0, s0, 18980
 	ldloc 8
 	ldc.i4 18980
 	add
 	stloc 8
-// 0x010b09e8: 0x10b09e8: lw    a0, 4(s0)
+// 0x010b1030: 0x10b1030: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1383,7 +1383,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b09ec: 0x10b09ec: lw    a1, 12(s0)
+// 0x010b1034: 0x10b1034: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1392,41 +1392,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b09f0: 0x10b09f0: jal   0x10b6788 sll   zero, zero, 0
+// 0x010b1038: 0x10b1038: jal   0x10b6dd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_exists_10b6788(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_exists_10b6dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b09f8: 0x10b09f8: beq   v0, zero, 0x10b0a0c sll   zero, zero, 0
+// 0x010b1040: 0x10b1040: beq   v0, zero, 0x10b1054 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b0a0c
+	brfalse L_10b1054
 // --- basic block ---
-L_10b0a00:
-// 0x010b0a00: 0x10b0a00: lui   v0, 0x90000
+L_10b1048:
+// 0x010b1048: 0x10b1048: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0a04: 0x10b0a04: j	 0x10b0ae0 sw    zero, -11588(v0)
+// 0x010b104c: 0x10b104c: j	 0x10b1128 sw    zero, -11124(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2897
+	ldc.i4 -2781
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b0ae0
+	br L_10b1128
 // --- basic block ---
-L_10b0a0c:
-// 0x010b0a0c: 0x10b0a0c: lui   v0, 0x0
+L_10b1054:
+// 0x010b1054: 0x10b1054: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b0a10: 0x10b0a10: lw    a0, 12(s0)
+// 0x010b1058: 0x10b1058: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1435,7 +1435,7 @@ L_10b0a0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0a14: 0x10b0a14: lw    v0, 576(v0)
+// 0x010b105c: 0x10b105c: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1444,38 +1444,38 @@ L_10b0a0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0a18: 0x10b0a18: sll   zero, zero, 0
-// 0x010b0a1c: 0x10b0a1c: beq   a0, v0, 0x10b0a34 sll   zero, zero, 0
+// 0x010b1060: 0x10b1060: sll   zero, zero, 0
+// 0x010b1064: 0x10b1064: beq   a0, v0, 0x10b107c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b0a34
+	beq  L_10b107c
 // --- basic block ---
-// 0x010b0a24: 0x10b0a24: bltz  a0, 0x10b0a34 sll   zero, zero, 0
+// 0x010b106c: 0x10b106c: bltz  a0, 0x10b107c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b0a34
+	blt L_10b107c
 // --- basic block ---
-// 0x010b0a2c: 0x10b0a2c: jal   0x100b164 sll   zero, zero, 0
+// 0x010b1074: 0x10b1074: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b0a34:
-// 0x010b0a34: 0x10b0a34: addu  a0, zero, zero
+L_10b107c:
+// 0x010b107c: 0x10b107c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b0a38: 0x10b0a38: addiu a1, sp, 20
+// 0x010b1080: 0x10b1080: addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x010b0a3c: 0x10b0a3c: jal   0x1029da8 addiu a2, sp, 16
+// 0x010b1084: 0x10b1084: jal   0x1029db8 addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1485,25 +1485,25 @@ L_10b0a34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0a44: 0x10b0a44: addiu v1, zero, -1
+// 0x010b108c: 0x10b108c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b0a48: 0x10b0a48: beq   v0, v1, 0x10b0ad4 lui   v0, 0x90000
+// 0x010b1090: 0x10b1090: beq   v0, v1, 0x10b111c lui   v0, 0x90000
 	ldloc 5
 	ldloc 7
 	ldc.i4 589824
 	stloc 5
-	beq  L_10b0ad4
+	beq  L_10b111c
 // --- basic block ---
-// 0x010b0a50: 0x10b0a50: lui   v0, 0x0
+// 0x010b1098: 0x10b1098: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b0a54: 0x10b0a54: lw    v1, 20(sp)
+// 0x010b109c: 0x10b109c: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1512,7 +1512,7 @@ L_10b0a34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0a58: 0x10b0a58: lw    a0, 18980(v0)
+// 0x010b10a0: 0x10b10a0: lw    a0, 18980(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1521,22 +1521,22 @@ L_10b0a34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0a5c: 0x10b0a5c: sll   zero, zero, 0
-// 0x010b0a60: 0x10b0a60: bne   v1, a0, 0x10b0ad0 sll   zero, zero, 0
+// 0x010b10a4: 0x10b10a4: sll   zero, zero, 0
+// 0x010b10a8: 0x10b10a8: bne   v1, a0, 0x10b1118 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_10b0ad0
+	bne.un L_10b1118
 // --- basic block ---
-// 0x010b0a68: 0x10b0a68: bne   v1, zero, 0x10b0a8c sll   zero, zero, 0
+// 0x010b10b0: 0x10b10b0: bne   v1, zero, 0x10b10d4 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10b0a8c
+	brtrue L_10b10d4
 // --- basic block ---
-// 0x010b0a70: 0x10b0a70: addiu v0, v0, 18980
+// 0x010b10b8: 0x10b10b8: addiu v0, v0, 18980
 	ldloc 5
 	ldc.i4 18980
 	add
 	stloc 5
-// 0x010b0a74: 0x10b0a74: lw    v0, 12(v0)
+// 0x010b10bc: 0x10b10bc: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1545,7 +1545,7 @@ L_10b0a34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0a78: 0x10b0a78: lw    v1, 32(sp)
+// 0x010b10c0: 0x10b10c0: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1554,24 +1554,24 @@ L_10b0a34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0a7c: 0x10b0a7c: sll   zero, zero, 0
-// 0x010b0a80: 0x10b0a80: bne   v1, v0, 0x10b0ad4 lui   v0, 0x90000
+// 0x010b10c4: 0x10b10c4: sll   zero, zero, 0
+// 0x010b10c8: 0x10b10c8: bne   v1, v0, 0x10b111c lui   v0, 0x90000
 	ldloc 7
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	bne.un L_10b0ad4
+	bne.un L_10b111c
 // --- basic block ---
-// 0x010b0a88: 0x10b0a88: lui   v0, 0x0
+// 0x010b10d0: 0x10b10d0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10b0a8c:
-// 0x010b0a8c: 0x10b0a8c: addiu v0, v0, 18980
+L_10b10d4:
+// 0x010b10d4: 0x10b10d4: addiu v0, v0, 18980
 	ldloc 5
 	ldc.i4 18980
 	add
 	stloc 5
-// 0x010b0a90: 0x10b0a90: lw    a0, 24(sp)
+// 0x010b10d8: 0x10b10d8: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1580,7 +1580,7 @@ L_10b0a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0a94: 0x10b0a94: lw    v1, 4(v0)
+// 0x010b10dc: 0x10b10dc: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1589,13 +1589,13 @@ L_10b0a8c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0a98: 0x10b0a98: sll   zero, zero, 0
-// 0x010b0a9c: 0x10b0a9c: bne   a0, v1, 0x10b0ad0 sll   zero, zero, 0
+// 0x010b10e0: 0x10b10e0: sll   zero, zero, 0
+// 0x010b10e4: 0x10b10e4: bne   a0, v1, 0x10b1118 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10b0ad0
+	bne.un L_10b1118
 // --- basic block ---
-// 0x010b0aa4: 0x10b0aa4: lw    v0, 16(v0)
+// 0x010b10ec: 0x10b10ec: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1604,7 +1604,7 @@ L_10b0a8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0aa8: 0x10b0aa8: lw    v1, 36(sp)
+// 0x010b10f0: 0x10b10f0: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1613,77 +1613,77 @@ L_10b0a8c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0aac: 0x10b0aac: sll   zero, zero, 0
-// 0x010b0ab0: 0x10b0ab0: bne   v1, v0, 0x10b0ad4 lui   v0, 0x90000
+// 0x010b10f4: 0x10b10f4: sll   zero, zero, 0
+// 0x010b10f8: 0x10b10f8: bne   v1, v0, 0x10b111c lui   v0, 0x90000
 	ldloc 7
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	bne.un L_10b0ad4
+	bne.un L_10b111c
 // --- basic block ---
-// 0x010b0ab8: 0x10b0ab8: jal   0x1004ae4 sll   zero, zero, 0
+// 0x010b1100: 0x10b1100: jal   0x1004af4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004ae4(int32)
+	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004af4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0ac0: 0x10b0ac0: bne   v0, zero, 0x10b0ae8 lui   v1, 0x90000
+// 0x010b1108: 0x10b1108: bne   v0, zero, 0x10b1130 lui   v1, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 7
-	brtrue L_10b0ae8
+	brtrue L_10b1130
 // --- basic block ---
-// 0x010b0ac8: 0x10b0ac8: j	 0x10b0ae0 sw    zero, -11588(v1)
+// 0x010b1110: 0x10b1110: j	 0x10b1128 sw    zero, -11124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2897
+	ldc.i4 -2781
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b0ae0
+	br L_10b1128
 // --- basic block ---
-L_10b0ad0:
-// 0x010b0ad0: 0x10b0ad0: lui   v0, 0x90000
+L_10b1118:
+// 0x010b1118: 0x10b1118: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10b0ad4:
-// 0x010b0ad4: 0x10b0ad4: lw    v0, -11588(v0)
+L_10b111c:
+// 0x010b111c: 0x10b111c: lw    v0, -11124(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2897
+	ldc.i4 -2781
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0ad8: 0x10b0ad8: j	 0x10b0af0 sll   zero, zero, 0
-	br L_10b0af0
+// 0x010b1120: 0x10b1120: j	 0x10b1138 sll   zero, zero, 0
+	br L_10b1138
 // --- basic block ---
-L_10b0ae0:
-// 0x010b0ae0: 0x10b0ae0: j	 0x10b0af0 addu  v0, zero, zero
+L_10b1128:
+// 0x010b1128: 0x10b1128: j	 0x10b1138 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10b0af0
+	br L_10b1138
 // --- basic block ---
-L_10b0ae8:
-// 0x010b0ae8: 0x10b0ae8: addiu v0, zero, 1
+L_10b1130:
+// 0x010b1130: 0x10b1130: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010b0aec: 0x10b0aec: sw    v0, -11588(v1)
+// 0x010b1134: 0x10b1134: sw    v0, -11124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2897
+	ldc.i4 -2781
 	add
 	ldloc 5
 	stelem.i4
-L_10b0af0:
-// 0x010b0af0: 0x10b0af0: lw    ra, 44(sp)
-// 0x010b0af4: 0x10b0af4: lw    s0, 40(sp)
+L_10b1138:
+// 0x010b1138: 0x10b1138: lw    ra, 44(sp)
+// 0x010b113c: 0x10b113c: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1692,7 +1692,7 @@ L_10b0af0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0af8: 0x10b0af8: jr    ra addiu sp, sp, 48
+// 0x010b1140: 0x10b1140: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1704,7 +1704,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_deflate_10b0b00(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_deflate_10b1148(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1745,12 +1745,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0b00: 0x10b0b00: addiu sp, sp, -32
+// 0x010b1148: 0x10b1148: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b0b04: 0x10b0b04: sw    s1, 24(sp)
+// 0x010b114c: 0x10b114c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1759,7 +1759,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b0b08: 0x10b0b08: sw    s0, 20(sp)
+// 0x010b1150: 0x10b1150: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1768,43 +1768,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b0b0c: 0x10b0b0c: lui   s1, 0x90000
+// 0x010b1154: 0x10b1154: lui   s1, 0x90000
 	ldc.i4 589824
 	stloc 9
-// 0x010b0b10: 0x10b0b10: lui   s0, 0x90000
+// 0x010b1158: 0x10b1158: lui   s0, 0x90000
 	ldc.i4 589824
 	stloc 8
-// 0x010b0b14: 0x10b0b14: lw    a1, -11584(s0)
+// 0x010b115c: 0x10b115c: lw    a1, -11120(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b0b18: 0x10b0b18: lw    a0, -11580(s1)
+// 0x010b1160: 0x10b1160: lw    a0, -11116(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0b1c: 0x10b0b1c: sw    ra, 28(sp)
-// 0x010b0b20: 0x10b0b20: slt   v1, a0, a1
+// 0x010b1164: 0x10b1164: sw    ra, 28(sp)
+// 0x010b1168: 0x10b1168: slt   v1, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc 7
-// 0x010b0b24: 0x10b0b24: beq   v1, zero, 0x10b0b7c addu  v0, zero, zero
+// 0x010b116c: 0x10b116c: beq   v1, zero, 0x10b11c4 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10b0b7c
+	brfalse L_10b11c4
 // --- basic block ---
-// 0x010b0b2c: 0x10b0b2c: jal   0x10b2f18 addiu a1, a1, -1
+// 0x010b1174: 0x10b1174: jal   0x10b3560 addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
@@ -1814,103 +1814,103 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_compress_track_10b2f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_compress_track_10b3560(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b0b34: 0x10b0b34: lw    v1, -11580(s1)
+// 0x010b117c: 0x10b117c: lw    v1, -11116(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0b38: 0x10b0b38: lui   a0, 0x90000
+// 0x010b1180: 0x10b1180: lui   a0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b0b3c: 0x10b0b3c: sll   v0, v1, 5
+// 0x010b1184: 0x10b1184: sll   v0, v1, 5
 	ldloc 7
 	ldc.i4.5
 	shl
 	stloc 6
-// 0x010b0b40: 0x10b0b40: addiu v0, v0, 24
+// 0x010b1188: 0x10b1188: addiu v0, v0, 24
 	ldloc 6
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x010b0b44: 0x10b0b44: addiu a0, a0, -11560
+// 0x010b118c: 0x10b118c: addiu a0, a0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b0b48: 0x10b0b48: addu  a0, a0, v0
+// 0x010b1190: 0x10b1190: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x010b0b4c: 0x10b0b4c: lw    a1, -11584(s0)
+// 0x010b1194: 0x10b1194: lw    a1, -11120(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b0b50: 0x10b0b50: j	 0x10b0b70 addu  v0, zero, zero
+// 0x010b1198: 0x10b1198: j	 0x10b11b8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10b0b70
+	br L_10b11b8
 // --- basic block ---
-L_10b0b58:
-// 0x010b0b58: 0x10b0b58: lw    a2, 0(a0)
+L_10b11a0:
+// 0x010b11a0: 0x10b11a0: lw    a2, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010b0b5c: 0x10b0b5c: addiu v1, v1, 1
+// 0x010b11a4: 0x10b11a4: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010b0b60: 0x10b0b60: xori  a2, a2, 1
+// 0x010b11a8: 0x10b11a8: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x010b0b64: 0x10b0b64: sltiu a2, a2, 1
+// 0x010b11ac: 0x10b11ac: sltiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x010b0b68: 0x10b0b68: addu  v0, v0, a2
+// 0x010b11b0: 0x10b11b0: addu  v0, v0, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc 6
-// 0x010b0b6c: 0x10b0b6c: addiu a0, a0, 32
+// 0x010b11b4: 0x10b11b4: addiu a0, a0, 32
 	ldloc.1
 	ldc.i4.s 32
 	add
 	stloc.1
-L_10b0b70:
-// 0x010b0b70: 0x10b0b70: slt   a2, v1, a1
+L_10b11b8:
+// 0x010b11b8: 0x10b11b8: slt   a2, v1, a1
 	ldloc 7
 	ldloc.2
 	clt
 	stloc.3
-// 0x010b0b74: 0x10b0b74: bne   a2, zero, 0x10b0b58 sll   zero, zero, 0
+// 0x010b11bc: 0x10b11bc: bne   a2, zero, 0x10b11a0 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10b0b58
+	brtrue L_10b11a0
 // --- basic block ---
-L_10b0b7c:
-// 0x010b0b7c: 0x10b0b7c: lw    ra, 28(sp)
-// 0x010b0b80: 0x10b0b80: lw    s1, 24(sp)
+L_10b11c4:
+// 0x010b11c4: 0x10b11c4: lw    ra, 28(sp)
+// 0x010b11c8: 0x10b11c8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1919,7 +1919,7 @@ L_10b0b7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b0b84: 0x10b0b84: lw    s0, 20(sp)
+// 0x010b11cc: 0x10b11cc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1928,7 +1928,7 @@ L_10b0b7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0b88: 0x10b0b88: jr    ra addiu sp, sp, 32
+// 0x010b11d0: 0x10b11d0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1940,7 +1940,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_draw_current_10b0b90(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_draw_current_10b11d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s2,int32 s3,int32 s1,int32 v1,int32 ra)
@@ -1987,15 +1987,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0b90: 0x10b0b90: addiu sp, sp, -64
+// 0x010b11d8: 0x10b11d8: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010b0b94: 0x10b0b94: lui   v0, 0x90000
+// 0x010b11dc: 0x10b11dc: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0b98: 0x10b0b98: sw    s0, 44(sp)
+// 0x010b11e0: 0x10b11e0: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2004,22 +2004,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0b9c: 0x10b0b9c: lw    s0, -11584(v0)
+// 0x010b11e4: 0x10b11e4: lw    s0, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0ba0: 0x10b0ba0: sw    ra, 60(sp)
-// 0x010b0ba4: 0x10b0ba4: slti  v0, s0, 2
+// 0x010b11e8: 0x10b11e8: sw    ra, 60(sp)
+// 0x010b11ec: 0x10b11ec: slti  v0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010b0ba8: 0x10b0ba8: sw    s3, 56(sp)
+// 0x010b11f0: 0x10b11f0: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2028,7 +2028,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b0bac: 0x10b0bac: sw    s2, 52(sp)
+// 0x010b11f4: 0x10b11f4: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2037,7 +2037,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b0bb0: 0x10b0bb0: sw    s1, 48(sp)
+// 0x010b11f8: 0x10b11f8: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2046,7 +2046,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b0bb4: 0x10b0bb4: bne   v0, zero, 0x10b0c5c sw    a0, 64(sp)
+// 0x010b11fc: 0x10b11fc: bne   v0, zero, 0x10b12a4 sw    a0, 64(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -2056,79 +2056,79 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_10b0c5c
+	brtrue L_10b12a4
 // --- basic block ---
-// 0x010b0bbc: 0x10b0bbc: beq   a0, zero, 0x10b0c5c lui   v0, 0x90000
+// 0x010b1204: 0x10b1204: beq   a0, zero, 0x10b12a4 lui   v0, 0x90000
 	ldloc.1
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10b0c5c
+	brfalse L_10b12a4
 // --- basic block ---
-// 0x010b0bc4: 0x10b0bc4: lw    v0, -11576(v0)
+// 0x010b120c: 0x10b120c: lw    v0, -11112(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0bc8: 0x10b0bc8: sll   zero, zero, 0
-// 0x010b0bcc: 0x10b0bcc: beq   v0, zero, 0x10b0c5c addiu s3, s0, -1
+// 0x010b1210: 0x10b1210: sll   zero, zero, 0
+// 0x010b1214: 0x10b1214: beq   v0, zero, 0x10b12a4 addiu s3, s0, -1
 	ldloc 5
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 9
-	brfalse L_10b0c5c
+	brfalse L_10b12a4
 // --- basic block ---
-// 0x010b0bd4: 0x10b0bd4: lui   s2, 0x90000
+// 0x010b121c: 0x10b121c: lui   s2, 0x90000
 	ldc.i4 589824
 	stloc 8
-// 0x010b0bd8: 0x10b0bd8: addiu s2, s2, -11560
+// 0x010b1220: 0x10b1220: addiu s2, s2, -11096
 	ldloc 8
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc 8
-// 0x010b0bdc: 0x10b0bdc: sll   s3, s3, 5
+// 0x010b1224: 0x10b1224: sll   s3, s3, 5
 	ldloc 9
 	ldc.i4.5
 	shl
 	stloc 9
-// 0x010b0be0: 0x10b0be0: addiu v0, zero, 2
+// 0x010b1228: 0x10b1228: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010b0be4: 0x10b0be4: bne   s0, v0, 0x10b0bf8 addu  s3, s2, s3
+// 0x010b122c: 0x10b122c: bne   s0, v0, 0x10b1240 addu  s3, s2, s3
 	ldloc 7
 	ldloc 5
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-	bne.un L_10b0bf8
+	bne.un L_10b1240
 // --- basic block ---
-// 0x010b0bec: 0x10b0bec: addiu s0, zero, -2
+// 0x010b1234: 0x10b1234: addiu s0, zero, -2
 	ldc.i4.s -2
 	stloc 7
-// 0x010b0bf0: 0x10b0bf0: j	 0x10b0c00 addiu s1, zero, -1
+// 0x010b1238: 0x10b1238: j	 0x10b1248 addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 10
-	br L_10b0c00
+	br L_10b1248
 // --- basic block ---
-L_10b0bf8:
-// 0x010b0bf8: 0x10b0bf8: addiu s0, s0, -2
+L_10b1240:
+// 0x010b1240: 0x10b1240: addiu s0, s0, -2
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc 7
-// 0x010b0bfc: 0x10b0bfc: addiu s1, zero, 1
+// 0x010b1244: 0x10b1244: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 10
-L_10b0c00:
-// 0x010b0c00: 0x10b0c00: addu  a1, s3, zero
+L_10b1248:
+// 0x010b1248: 0x10b1248: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010b0c04: 0x10b0c04: jal   0x1008eb0 addu  a0, s2, zero
+// 0x010b124c: 0x10b124c: jal   0x1008ec0 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2136,27 +2136,27 @@ L_10b0c00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x010b0c0c: 0x10b0c0c: jal   0x10b7ad0 addu  a0, v0, zero
+// 0x010b1254: 0x10b1254: jal   0x10b8118 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl137::editor_bar_set_temp_length_10b7ad0(int32)
+	call int32 Cibyl137::editor_bar_set_temp_length_10b8118(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b0c14: 0x10b0c14: lui   v0, 0x10b0000
+// 0x010b125c: 0x10b125c: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010b0c18: 0x10b0c18: addiu v0, v0, 2420
+// 0x010b1260: 0x10b1260: addiu v0, v0, 4028
 	ldloc 5
-	ldc.i4 2420
+	ldc.i4 4028
 	add
 	stloc 5
-// 0x010b0c1c: 0x10b0c1c: sw    v0, 24(sp)
+// 0x010b1264: 0x10b1264: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2165,10 +2165,10 @@ L_10b0c00:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0c20: 0x10b0c20: addiu v0, zero, 1
+// 0x010b1268: 0x10b1268: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010b0c24: 0x10b0c24: sw    v0, 32(sp)
+// 0x010b126c: 0x10b126c: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2177,10 +2177,10 @@ L_10b0c00:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0c28: 0x10b0c28: addiu v0, zero, -1
+// 0x010b1270: 0x10b1270: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b0c2c: 0x10b0c2c: sw    v0, 36(sp)
+// 0x010b1274: 0x10b1274: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2189,24 +2189,24 @@ L_10b0c00:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0c30: 0x10b0c30: addu  a0, s2, zero
+// 0x010b1278: 0x10b1278: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010b0c34: 0x10b0c34: addiu v0, sp, 64
+// 0x010b127c: 0x10b127c: addiu v0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 5
-// 0x010b0c38: 0x10b0c38: addu  a1, s3, zero
+// 0x010b1280: 0x10b1280: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010b0c3c: 0x10b0c3c: addu  a2, zero, zero
+// 0x010b1284: 0x10b1284: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b0c40: 0x10b0c40: addu  a3, s2, zero
+// 0x010b1288: 0x10b1288: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x010b0c44: 0x10b0c44: sw    s1, 16(sp)
+// 0x010b128c: 0x10b128c: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2215,7 +2215,7 @@ L_10b0c00:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b0c48: 0x10b0c48: sw    s0, 20(sp)
+// 0x010b1290: 0x10b1290: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2224,7 +2224,7 @@ L_10b0c00:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0c4c: 0x10b0c4c: jal   0x1022e0c sw    v0, 28(sp)
+// 0x010b1294: 0x10b1294: jal   0x1022e1c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2238,23 +2238,23 @@ L_10b0c00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x010b0c54: 0x10b0c54: j	 0x10b0c60 addiu v0, zero, 1
+// 0x010b129c: 0x10b129c: j	 0x10b12a8 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10b0c60
+	br L_10b12a8
 // --- basic block ---
-L_10b0c5c:
-// 0x010b0c5c: 0x10b0c5c: addu  v0, zero, zero
+L_10b12a4:
+// 0x010b12a4: 0x10b12a4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b0c60:
-// 0x010b0c60: 0x10b0c60: lw    ra, 60(sp)
-// 0x010b0c64: 0x10b0c64: lw    s3, 56(sp)
+L_10b12a8:
+// 0x010b12a8: 0x10b12a8: lw    ra, 60(sp)
+// 0x010b12ac: 0x10b12ac: lw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2263,7 +2263,7 @@ L_10b0c60:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b0c68: 0x10b0c68: lw    s2, 52(sp)
+// 0x010b12b0: 0x10b12b0: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2272,7 +2272,7 @@ L_10b0c60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0c6c: 0x10b0c6c: lw    s1, 48(sp)
+// 0x010b12b4: 0x10b12b4: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2281,7 +2281,7 @@ L_10b0c60:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b0c70: 0x10b0c70: lw    s0, 44(sp)
+// 0x010b12b8: 0x10b12b8: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2290,7 +2290,7 @@ L_10b0c60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0c74: 0x10b0c74: jr    ra addiu sp, sp, 64
+// 0x010b12bc: 0x10b12bc: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2302,7 +2302,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_is_new_road_10b0c7c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_is_new_road_10b12c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -2337,93 +2337,93 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0c7c: 0x10b0c7c: lui   v0, 0x90000
+// 0x010b12c4: 0x10b12c4: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0c80: 0x10b0c80: lw    v0, -11592(v0)
+// 0x010b12c8: 0x10b12c8: lw    v0, -11128(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0c84: 0x10b0c84: addiu sp, sp, -24
+// 0x010b12cc: 0x10b12cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b0c88: 0x10b0c88: bne   v0, zero, 0x10b0ca0 sw    ra, 20(sp)
+// 0x010b12d0: 0x10b12d0: bne   v0, zero, 0x10b12e8 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_10b0ca0
+	brtrue L_10b12e8
 // --- basic block ---
-// 0x010b0c90: 0x10b0c90: jal   0x10bd8b8 sll   zero, zero, 0
+// 0x010b12d8: 0x10b12d8: jal   0x10bdf00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_show_candidates_10bd8b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_show_candidates_10bdf00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b0c98: 0x10b0c98: beq   v0, zero, 0x10b0cc8 addu  v0, zero, zero
+// 0x010b12e0: 0x10b12e0: beq   v0, zero, 0x10b1310 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10b0cc8
+	brfalse L_10b1310
 // --- basic block ---
-L_10b0ca0:
-// 0x010b0ca0: 0x10b0ca0: lui   v0, 0x90000
+L_10b12e8:
+// 0x010b12e8: 0x10b12e8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0ca4: 0x10b0ca4: lw    v0, -11584(v0)
+// 0x010b12ec: 0x10b12ec: lw    v0, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0ca8: 0x10b0ca8: sll   zero, zero, 0
-// 0x010b0cac: 0x10b0cac: slti  v0, v0, 3
+// 0x010b12f0: 0x10b12f0: sll   zero, zero, 0
+// 0x010b12f4: 0x10b12f4: slti  v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	clt
 	stloc 5
-// 0x010b0cb0: 0x10b0cb0: bne   v0, zero, 0x10b0cc4 lui   v0, 0x90000
+// 0x010b12f8: 0x10b12f8: bne   v0, zero, 0x10b130c lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brtrue L_10b0cc4
+	brtrue L_10b130c
 // --- basic block ---
-// 0x010b0cb8: 0x10b0cb8: lw    v0, -11576(v0)
+// 0x010b1300: 0x10b1300: lw    v0, -11112(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0cbc: 0x10b0cbc: j	 0x10b0cc8 sltu  v0, zero, v0
+// 0x010b1304: 0x10b1304: j	 0x10b1310 sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	br L_10b0cc8
+	br L_10b1310
 // --- basic block ---
-L_10b0cc4:
-// 0x010b0cc4: 0x10b0cc4: addu  v0, zero, zero
+L_10b130c:
+// 0x010b130c: 0x10b130c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b0cc8:
-// 0x010b0cc8: 0x10b0cc8: lw    ra, 20(sp)
-// 0x010b0ccc: 0x10b0ccc: sll   zero, zero, 0
-// 0x010b0cd0: 0x10b0cd0: jr    ra addiu sp, sp, 24
+L_10b1310:
+// 0x010b1310: 0x10b1310: lw    ra, 20(sp)
+// 0x010b1314: 0x10b1314: sll   zero, zero, 0
+// 0x010b1318: 0x10b1318: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2435,7 +2435,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+.method public static int32 track_reset_points_10b1320(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2473,12 +2473,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0cd8: 0x10b0cd8: addiu sp, sp, -24
+// 0x010b1320: 0x10b1320: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b0cdc: 0x10b0cdc: sw    s0, 16(sp)
+// 0x010b1324: 0x10b1324: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2487,112 +2487,112 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b0ce0: 0x10b0ce0: sw    ra, 20(sp)
-// 0x010b0ce4: 0x10b0ce4: beq   a0, zero, 0x10b0d60 addu  s0, a0, zero
+// 0x010b1328: 0x10b1328: sw    ra, 20(sp)
+// 0x010b132c: 0x10b132c: beq   a0, zero, 0x10b13a8 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_10b0d60
+	brfalse L_10b13a8
 // --- basic block ---
-// 0x010b0cec: 0x10b0cec: addiu v1, zero, -1
+// 0x010b1334: 0x10b1334: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b0cf0: 0x10b0cf0: bne   a0, v1, 0x10b0d04 lui   v0, 0x90000
+// 0x010b1338: 0x10b1338: bne   a0, v1, 0x10b134c lui   v0, 0x90000
 	ldloc.1
 	ldloc 7
 	ldc.i4 589824
 	stloc 5
-	bne.un L_10b0d04
+	bne.un L_10b134c
 // --- basic block ---
-// 0x010b0cf8: 0x10b0cf8: sw    zero, -11584(v0)
+// 0x010b1340: 0x10b1340: sw    zero, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b0cfc: 0x10b0cfc: j	 0x10b0d5c lui   v0, 0x90000
+// 0x010b1344: 0x10b1344: j	 0x10b13a4 lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-	br L_10b0d5c
+	br L_10b13a4
 // --- basic block ---
-L_10b0d04:
-// 0x010b0d04: 0x10b0d04: lw    v1, -11584(v0)
+L_10b134c:
+// 0x010b134c: 0x10b134c: lw    v1, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0d08: 0x10b0d08: sll   zero, zero, 0
-// 0x010b0d0c: 0x10b0d0c: subu  v1, v1, a0
+// 0x010b1350: 0x10b1350: sll   zero, zero, 0
+// 0x010b1354: 0x10b1354: subu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 7
-// 0x010b0d10: 0x10b0d10: bgez  v1, 0x10b0d1c sw    v1, -11584(v0)
+// 0x010b1358: 0x10b1358: bgez  v1, 0x10b1364 sw    v1, -11120(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldloc 7
 	stelem.i4
 	ldc.i4.s 0
-	bge L_10b0d1c
+	bge L_10b1364
 // --- basic block ---
-// 0x010b0d18: 0x10b0d18: sw    zero, -11584(v0)
+// 0x010b1360: 0x10b1360: sw    zero, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10b0d1c:
-// 0x010b0d1c: 0x10b0d1c: lui   v0, 0x90000
+L_10b1364:
+// 0x010b1364: 0x10b1364: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0d20: 0x10b0d20: lw    a2, -11584(v0)
+// 0x010b1368: 0x10b1368: lw    a2, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b0d24: 0x10b0d24: sll   zero, zero, 0
-// 0x010b0d28: 0x10b0d28: blez  a2, 0x10b0d44 lui   a0, 0x90000
+// 0x010b136c: 0x10b136c: sll   zero, zero, 0
+// 0x010b1370: 0x10b1370: blez  a2, 0x10b138c lui   a0, 0x90000
 	ldloc.3
 	ldc.i4 589824
 	stloc.1
 	ldc.i4.s 0
-	ble L_10b0d44
+	ble L_10b138c
 // --- basic block ---
-// 0x010b0d30: 0x10b0d30: addiu a0, a0, -11560
+// 0x010b1378: 0x10b1378: addiu a0, a0, -11096
 	ldloc.1
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b0d34: 0x10b0d34: sll   a1, s0, 5
+// 0x010b137c: 0x10b137c: sll   a1, s0, 5
 	ldloc 8
 	ldc.i4.5
 	shl
 	stloc.2
-// 0x010b0d38: 0x10b0d38: addu  a1, a0, a1
+// 0x010b1380: 0x10b1380: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x010b0d3c: 0x10b0d3c: jal   0x100186c sll   a2, a2, 5
+// 0x010b1384: 0x10b1384: jal   0x100186c sll   a2, a2, 5
 	ldloc.3
 	ldc.i4.5
 	shl
@@ -2606,51 +2606,51 @@ L_10b0d1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b0d44:
-// 0x010b0d44: 0x10b0d44: lui   v0, 0x90000
+L_10b138c:
+// 0x010b138c: 0x10b138c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0d48: 0x10b0d48: lw    v1, -11580(v0)
+// 0x010b1390: 0x10b1390: lw    v1, -11116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0d4c: 0x10b0d4c: sll   zero, zero, 0
-// 0x010b0d50: 0x10b0d50: subu  s0, v1, s0
+// 0x010b1394: 0x10b1394: sll   zero, zero, 0
+// 0x010b1398: 0x10b1398: subu  s0, v1, s0
 	ldloc 7
 	ldloc 8
 	sub
 	stloc 8
-// 0x010b0d54: 0x10b0d54: bgez  s0, 0x10b0d60 sw    s0, -11580(v0)
+// 0x010b139c: 0x10b139c: bgez  s0, 0x10b13a8 sw    s0, -11116(v0)
 	ldloc 8
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldloc 8
 	stelem.i4
 	ldc.i4.s 0
-	bge L_10b0d60
+	bge L_10b13a8
 // --- basic block ---
-L_10b0d5c:
-// 0x010b0d5c: 0x10b0d5c: sw    zero, -11580(v0)
+L_10b13a4:
+// 0x010b13a4: 0x10b13a4: sw    zero, -11116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2895
+	ldc.i4 -2779
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10b0d60:
-// 0x010b0d60: 0x10b0d60: lw    ra, 20(sp)
-// 0x010b0d64: 0x10b0d64: lw    s0, 16(sp)
+L_10b13a8:
+// 0x010b13a8: 0x10b13a8: lw    ra, 20(sp)
+// 0x010b13ac: 0x10b13ac: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2659,7 +2659,7 @@ L_10b0d60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0d68: 0x10b0d68: jr    ra addiu sp, sp, 24
+// 0x010b13b0: 0x10b13b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2671,7 +2671,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_reset_10b0d70(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_reset_10b13b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2706,28 +2706,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0d70: 0x10b0d70: lui   v0, 0x90000
+// 0x010b13b8: 0x10b13b8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0d74: 0x10b0d74: lw    a0, -11584(v0)
+// 0x010b13bc: 0x10b13bc: lw    a0, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b0d78: 0x10b0d78: addiu sp, sp, -24
+// 0x010b13c0: 0x10b13c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b0d7c: 0x10b0d7c: lui   v0, 0x0
+// 0x010b13c4: 0x10b13c4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b0d80: 0x10b0d80: sw    ra, 20(sp)
-// 0x010b0d84: 0x10b0d84: jal   0x10b0cd8 sw    zero, 18904(v0)
+// 0x010b13c8: 0x10b13c8: sw    ra, 20(sp)
+// 0x010b13cc: 0x10b13cc: jal   0x10b1320 sw    zero, 18904(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2741,19 +2741,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_reset_points_10b1320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0d8c: 0x10b0d8c: addiu v1, zero, -1
+// 0x010b13d4: 0x10b13d4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b0d90: 0x10b0d90: lui   v0, 0x0
+// 0x010b13d8: 0x10b13d8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b0d94: 0x10b0d94: lw    ra, 20(sp)
-// 0x010b0d98: 0x10b0d98: sw    v1, 19032(v0)
+// 0x010b13dc: 0x10b13dc: lw    ra, 20(sp)
+// 0x010b13e0: 0x10b13e0: sw    v1, 19032(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2762,13 +2762,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0d9c: 0x10b0d9c: addiu v1, zero, 1
+// 0x010b13e4: 0x10b13e4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010b0da0: 0x10b0da0: lui   v0, 0x0
+// 0x010b13e8: 0x10b13e8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b0da4: 0x10b0da4: sw    v1, 19040(v0)
+// 0x010b13ec: 0x10b13ec: sw    v1, 19040(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2777,7 +2777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0da8: 0x10b0da8: jr    ra addiu sp, sp, 24
+// 0x010b13f0: 0x10b13f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2789,7 +2789,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_initialize_10b0e10(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_initialize_10b1458(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s3,int32 s0,int32 s1,int32 ra)
@@ -2836,20 +2836,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0e10: 0x10b0e10: lui   v0, 0x20000
+// 0x010b1458: 0x10b1458: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010b0e14: 0x10b0e14: addiu sp, sp, -56
+// 0x010b145c: 0x10b145c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010b0e18: 0x10b0e18: addiu v0, v0, 18196
+// 0x010b1460: 0x10b1460: addiu v0, v0, 18656
 	ldloc 5
-	ldc.i4 18196
+	ldc.i4 18656
 	add
 	stloc 5
-// 0x010b0e1c: 0x10b0e1c: sw    v0, 16(sp)
+// 0x010b1464: 0x10b1464: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2858,38 +2858,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0e20: 0x10b0e20: lui   a0, 0x20000
+// 0x010b1468: 0x10b1468: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b0e24: 0x10b0e24: lui   a1, 0x20000
+// 0x010b146c: 0x10b146c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b0e28: 0x10b0e28: lui   v0, 0x10b0000
+// 0x010b1470: 0x10b1470: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010b0e2c: 0x10b0e2c: addu  a2, zero, zero
+// 0x010b1474: 0x10b1474: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b0e30: 0x10b0e30: addu  a3, zero, zero
+// 0x010b1478: 0x10b1478: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b0e34: 0x10b0e34: addiu a0, a0, 18180
+// 0x010b147c: 0x10b147c: addiu a0, a0, 18640
 	ldloc.1
-	ldc.i4 18180
+	ldc.i4 18640
 	add
 	stloc.1
-// 0x010b0e38: 0x10b0e38: addiu a1, a1, 18128
+// 0x010b1480: 0x10b1480: addiu a1, a1, 18588
 	ldloc.2
-	ldc.i4 18128
+	ldc.i4 18588
 	add
 	stloc.2
-// 0x010b0e3c: 0x10b0e3c: addiu v0, v0, 4364
+// 0x010b1484: 0x10b1484: addiu v0, v0, 5972
 	ldloc 5
-	ldc.i4 4364
+	ldc.i4 5972
 	add
 	stloc 5
-// 0x010b0e40: 0x10b0e40: sw    ra, 52(sp)
-// 0x010b0e44: 0x10b0e44: sw    s3, 48(sp)
+// 0x010b1488: 0x10b1488: sw    ra, 52(sp)
+// 0x010b148c: 0x10b148c: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2898,7 +2898,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b0e48: 0x10b0e48: sw    s2, 44(sp)
+// 0x010b1490: 0x10b1490: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2907,7 +2907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b0e4c: 0x10b0e4c: sw    s1, 40(sp)
+// 0x010b1494: 0x10b1494: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2916,7 +2916,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b0e50: 0x10b0e50: sw    s0, 36(sp)
+// 0x010b1498: 0x10b1498: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2925,7 +2925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b0e54: 0x10b0e54: jal   0x102ceb0 sw    v0, 20(sp)
+// 0x010b149c: 0x10b149c: jal   0x102cec0 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2939,25 +2939,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_add_action_102ceb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_add_action_102cec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0e5c: 0x10b0e5c: lui   a1, 0x10b0000
+// 0x010b14a4: 0x10b14a4: lui   a1, 0x10b0000
 	ldc.i4 17498112
 	stloc.2
-// 0x010b0e60: 0x10b0e60: lui   a0, 0x10000
+// 0x010b14a8: 0x10b14a8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b0e64: 0x10b0e64: addiu a1, a1, 4300
+// 0x010b14ac: 0x10b14ac: addiu a1, a1, 5908
 	ldloc.2
-	ldc.i4 4300
+	ldc.i4 5908
 	add
 	stloc.2
-// 0x010b0e68: 0x10b0e68: jal   0x100f48c addiu a0, a0, 23472
+// 0x010b14b0: 0x10b14b0: jal   0x100f49c addiu a0, a0, 23936
 	ldloc.1
-	ldc.i4 23472
+	ldc.i4 23936
 	add
 	stloc.1
 	ldloc.0
@@ -2965,76 +2965,76 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0e70: 0x10b0e70: lui   a0, 0x10b0000
+// 0x010b14b8: 0x10b14b8: lui   a0, 0x10b0000
 	ldc.i4 17498112
 	stloc.1
-// 0x010b0e74: 0x10b0e74: jal   0x1030d38 addiu a0, a0, 8016
+// 0x010b14bc: 0x10b14bc: jal   0x1030d48 addiu a0, a0, 9624
 	ldloc.1
-	ldc.i4 8016
+	ldc.i4 9624
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl35::roadmap_gps_register_listener_1030d38(int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_listener_1030d48(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0e7c: 0x10b0e7c: jal   0x10b2f70 lui   s1, 0x10000
+// 0x010b14c4: 0x10b14c4: jal   0x10b35b8 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 11
-	call int32 Cibyl133::editor_track_report_init_10b2f70()
+	call int32 Cibyl133::editor_track_report_init_10b35b8()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0e84: 0x10b0e84: lui   s0, 0x0
+// 0x010b14cc: 0x10b14cc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010b0e88: 0x10b0e88: lui   s3, 0x20000
+// 0x010b14d0: 0x10b14d0: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x010b0e8c: 0x10b0e8c: lui   s2, 0x20000
+// 0x010b14d4: 0x10b14d4: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010b0e90: 0x10b0e90: lui   a3, 0x20000
+// 0x010b14d8: 0x10b14d8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0e94: 0x10b0e94: addiu s3, s3, 18252
+// 0x010b14dc: 0x10b14dc: addiu s3, s3, 18712
 	ldloc 9
-	ldc.i4 18252
+	ldc.i4 18712
 	add
 	stloc 9
-// 0x010b0e98: 0x10b0e98: addiu a3, a3, 18244
+// 0x010b14e0: 0x10b14e0: addiu a3, a3, 18704
 	ldloc 4
-	ldc.i4 18244
+	ldc.i4 18704
 	add
 	stloc 4
-// 0x010b0e9c: 0x10b0e9c: addiu a0, s1, 12560
+// 0x010b14e4: 0x10b14e4: addiu a0, s1, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010b0ea0: 0x10b0ea0: addiu a1, s0, 19124
+// 0x010b14e8: 0x10b14e8: addiu a1, s0, 19124
 	ldloc 10
 	ldc.i4 19124
 	add
 	stloc.2
-// 0x010b0ea4: 0x10b0ea4: addu  a2, zero, zero
+// 0x010b14ec: 0x10b14ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b0ea8: 0x10b0ea8: addiu s2, s2, 18260
+// 0x010b14f0: 0x10b14f0: addiu s2, s2, 18720
 	ldloc 8
-	ldc.i4 18260
+	ldc.i4 18720
 	add
 	stloc 8
-// 0x010b0eac: 0x10b0eac: sw    s3, 16(sp)
+// 0x010b14f4: 0x10b14f4: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3043,7 +3043,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b0eb0: 0x10b0eb0: sw    s2, 20(sp)
+// 0x010b14f8: 0x10b14f8: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3052,7 +3052,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b0eb4: 0x10b0eb4: jal   0x100edf8 sw    zero, 24(sp)
+// 0x010b14fc: 0x10b14fc: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3066,44 +3066,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0ebc: 0x10b0ebc: lui   a1, 0x0
+// 0x010b1504: 0x10b1504: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b0ec0: 0x10b0ec0: lui   a3, 0x20000
+// 0x010b1508: 0x10b1508: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0ec4: 0x10b0ec4: lui   v0, 0x20000
+// 0x010b150c: 0x10b150c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010b0ec8: 0x10b0ec8: addiu a1, a1, 19108
+// 0x010b1510: 0x10b1510: addiu a1, a1, 19108
 	ldloc.2
 	ldc.i4 19108
 	add
 	stloc.2
-// 0x010b0ecc: 0x10b0ecc: addiu a3, a3, 18272
+// 0x010b1514: 0x10b1514: addiu a3, a3, 18732
 	ldloc 4
-	ldc.i4 18272
+	ldc.i4 18732
 	add
 	stloc 4
-// 0x010b0ed0: 0x10b0ed0: addiu a0, s1, 12560
+// 0x010b1518: 0x10b1518: addiu a0, s1, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010b0ed4: 0x10b0ed4: addu  a2, zero, zero
+// 0x010b151c: 0x10b151c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b0ed8: 0x10b0ed8: addiu v0, v0, 18172
+// 0x010b1520: 0x10b1520: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 18172
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010b0edc: 0x10b0edc: sw    v0, 16(sp)
+// 0x010b1524: 0x10b1524: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3112,7 +3112,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0ee0: 0x10b0ee0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010b1528: 0x10b1528: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3126,44 +3126,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0ee8: 0x10b0ee8: lui   a1, 0x0
+// 0x010b1530: 0x10b1530: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b0eec: 0x10b0eec: lui   a3, 0x20000
+// 0x010b1534: 0x10b1534: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b0ef0: 0x10b0ef0: lui   v0, 0x0
+// 0x010b1538: 0x10b1538: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b0ef4: 0x10b0ef4: addiu a0, s1, 12560
+// 0x010b153c: 0x10b153c: addiu a0, s1, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010b0ef8: 0x10b0ef8: addiu a1, a1, 19092
+// 0x010b1540: 0x10b1540: addiu a1, a1, 19092
 	ldloc.2
 	ldc.i4 19092
 	add
 	stloc.2
-// 0x010b0efc: 0x10b0efc: addiu v0, v0, 20820
+// 0x010b1544: 0x10b1544: addiu v0, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
 	stloc 5
-// 0x010b0f00: 0x10b0f00: addiu a3, a3, 9464
+// 0x010b1548: 0x10b1548: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010b0f04: 0x10b0f04: addu  a2, zero, zero
+// 0x010b154c: 0x10b154c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b0f08: 0x10b0f08: sw    v0, 16(sp)
+// 0x010b1550: 0x10b1550: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3172,7 +3172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b0f0c: 0x10b0f0c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010b1554: 0x10b1554: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3186,15 +3186,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0f14: 0x10b0f14: addu  a1, s3, zero
+// 0x010b155c: 0x10b155c: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010b0f18: 0x10b0f18: jal   0x100e7f4 addiu a0, s0, 19124
+// 0x010b1560: 0x10b1560: jal   0x100e804 addiu a0, s0, 19124
 	ldloc 10
 	ldc.i4 19124
 	add
@@ -3204,23 +3204,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0f20: 0x10b0f20: bne   v0, zero, 0x10b0f64 addiu v1, zero, 1
+// 0x010b1568: 0x10b1568: bne   v0, zero, 0x10b15ac addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brtrue L_10b0f64
+	brtrue L_10b15ac
 // --- basic block ---
-// 0x010b0f28: 0x10b0f28: addiu a0, s0, 19124
+// 0x010b1570: 0x10b1570: addiu a0, s0, 19124
 	ldloc 10
 	ldc.i4 19124
 	add
 	stloc.1
-// 0x010b0f2c: 0x10b0f2c: jal   0x100e7f4 addu  a1, s2, zero
+// 0x010b1574: 0x10b1574: jal   0x100e804 addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3228,85 +3228,85 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0f34: 0x10b0f34: beq   v0, zero, 0x10b0f80 sll   zero, zero, 0
+// 0x010b157c: 0x10b157c: beq   v0, zero, 0x10b15c8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b0f80
+	brfalse L_10b15c8
 // --- basic block ---
-// 0x010b0f3c: 0x10b0f3c: jal   0x106b068 sll   zero, zero, 0
+// 0x010b1584: 0x10b1584: jal   0x106b68c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0f44: 0x10b0f44: bne   v0, zero, 0x10b0f80 sll   zero, zero, 0
+// 0x010b158c: 0x10b158c: bne   v0, zero, 0x10b15c8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b0f80
+	brtrue L_10b15c8
 // --- basic block ---
-// 0x010b0f4c: 0x10b0f4c: jal   0x106ac04 sll   zero, zero, 0
+// 0x010b1594: 0x10b1594: jal   0x106b228 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::RealTime_GetUserName_106ac04(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::RealTime_GetUserName_106b228(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b0f54: 0x10b0f54: lbu   v0, 0(v0)
+// 0x010b159c: 0x10b159c: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010b0f58: 0x10b0f58: sll   zero, zero, 0
-// 0x010b0f5c: 0x10b0f5c: beq   v0, zero, 0x10b0f80 addiu v1, zero, 1
+// 0x010b15a0: 0x10b15a0: sll   zero, zero, 0
+// 0x010b15a4: 0x10b15a4: beq   v0, zero, 0x10b15c8 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_10b0f80
+	brfalse L_10b15c8
 // --- basic block ---
-L_10b0f64:
-// 0x010b0f64: 0x10b0f64: lui   v0, 0x90000
+L_10b15ac:
+// 0x010b15ac: 0x10b15ac: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b0f68: 0x10b0f68: addiu a0, zero, 40
+// 0x010b15b0: 0x10b15b0: addiu a0, zero, 40
 	ldc.i4.s 40
 	stloc.1
-// 0x010b0f6c: 0x10b0f6c: addiu a1, zero, 150
+// 0x010b15b4: 0x10b15b4: addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
-// 0x010b0f70: 0x10b0f70: jal   0x102bcf0 sw    v1, -11592(v0)
+// 0x010b15b8: 0x10b15b8: jal   0x102bd00 sw    v1, -11128(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldloc 7
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bcf0(int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bd00(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010b0f78: 0x10b0f78: jal   0x10b7a74 sll   zero, zero, 0
-	call int32 Cibyl137::editor_bar_show_10b7a74()
+// 0x010b15c0: 0x10b15c0: jal   0x10b80bc sll   zero, zero, 0
+	call int32 Cibyl137::editor_bar_show_10b80bc()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b0f80:
-// 0x010b0f80: 0x10b0f80: lw    ra, 52(sp)
-// 0x010b0f84: 0x10b0f84: lw    s3, 48(sp)
+L_10b15c8:
+// 0x010b15c8: 0x10b15c8: lw    ra, 52(sp)
+// 0x010b15cc: 0x10b15cc: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3315,7 +3315,7 @@ L_10b0f80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b0f88: 0x10b0f88: lw    s2, 44(sp)
+// 0x010b15d0: 0x10b15d0: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3324,7 +3324,7 @@ L_10b0f80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0f8c: 0x10b0f8c: lw    s1, 40(sp)
+// 0x010b15d4: 0x10b15d4: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3333,7 +3333,7 @@ L_10b0f80:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b0f90: 0x10b0f90: lw    s0, 36(sp)
+// 0x010b15d8: 0x10b15d8: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3342,7 +3342,7 @@ L_10b0f80:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b0f94: 0x10b0f94: jr    ra addiu sp, sp, 56
+// 0x010b15dc: 0x10b15dc: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3354,7 +3354,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -3392,12 +3392,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0f9c: 0x10b0f9c: addiu sp, sp, -24
+// 0x010b15e4: 0x10b15e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b0fa0: 0x10b0fa0: sw    s0, 16(sp)
+// 0x010b15e8: 0x10b15e8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3406,10 +3406,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0fa4: 0x10b0fa4: lui   s0, 0x0
+// 0x010b15ec: 0x10b15ec: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010b0fa8: 0x10b0fa8: lw    v1, 19144(s0)
+// 0x010b15f0: 0x10b15f0: lw    v1, 19144(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3418,23 +3418,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b0fac: 0x10b0fac: addiu v0, zero, -1
+// 0x010b15f4: 0x10b15f4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b0fb0: 0x10b0fb0: bne   v1, v0, 0x10b0fcc sw    ra, 20(sp)
+// 0x010b15f8: 0x10b15f8: bne   v1, v0, 0x10b1614 sw    ra, 20(sp)
 	ldloc 8
 	ldloc 5
-	bne.un L_10b0fcc
+	bne.un L_10b1614
 // --- basic block ---
-// 0x010b0fb8: 0x10b0fb8: lui   a0, 0x20000
+// 0x010b1600: 0x10b1600: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b0fbc: 0x10b0fbc: addiu a0, a0, 18284
+// 0x010b1604: 0x10b1604: addiu a0, a0, 18744
 	ldloc.1
-	ldc.i4 18284
+	ldc.i4 18744
 	add
 	stloc.1
-// 0x010b0fc0: 0x10b0fc0: jal   0x1008cc8 addu  a1, zero, zero
+// 0x010b1608: 0x10b1608: jal   0x1008cd8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3442,12 +3442,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_convert_1008cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_convert_1008cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b0fc8: 0x10b0fc8: sw    v0, 19144(s0)
+// 0x010b1610: 0x10b1610: sw    v0, 19144(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3456,12 +3456,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_10b0fcc:
-// 0x010b0fcc: 0x10b0fcc: lw    ra, 20(sp)
-// 0x010b0fd0: 0x10b0fd0: lui   v0, 0x0
+L_10b1614:
+// 0x010b1614: 0x10b1614: lw    ra, 20(sp)
+// 0x010b1618: 0x10b1618: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b0fd4: 0x10b0fd4: lw    v0, 19144(v0)
+// 0x010b161c: 0x10b161c: lw    v0, 19144(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3470,7 +3470,7 @@ L_10b0fcc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0fd8: 0x10b0fd8: lw    s0, 16(sp)
+// 0x010b1620: 0x10b1620: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3479,7 +3479,7 @@ L_10b0fcc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b0fdc: 0x10b0fdc: jr    ra addiu sp, sp, 24
+// 0x010b1624: 0x10b1624: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3491,7 +3491,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 track_filter_init_10b0fe4(int32,int32,int32,int32,int32)
+.method public static int32 track_filter_init_10b162c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -3532,12 +3532,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b0fe4: 0x10b0fe4: addiu sp, sp, -32
+// 0x010b162c: 0x10b162c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b0fe8: 0x10b0fe8: sw    s0, 20(sp)
+// 0x010b1630: 0x10b1630: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3546,20 +3546,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b0fec: 0x10b0fec: lui   s0, 0x90000
+// 0x010b1634: 0x10b1634: lui   s0, 0x90000
 	ldc.i4 589824
 	stloc 7
-// 0x010b0ff0: 0x10b0ff0: lw    v0, -11568(s0)
+// 0x010b1638: 0x10b1638: lw    v0, -11104(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2892
+	ldc.i4 -2776
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b0ff4: 0x10b0ff4: sw    ra, 28(sp)
-// 0x010b0ff8: 0x10b0ff8: bne   v0, zero, 0x10b103c sw    s1, 24(sp)
+// 0x010b163c: 0x10b163c: sw    ra, 28(sp)
+// 0x010b1640: 0x10b1640: bne   v0, zero, 0x10b1684 sw    s1, 24(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3569,17 +3569,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_10b103c
+	brtrue L_10b1684
 // --- basic block ---
-// 0x010b1000: 0x10b1000: lui   a0, 0x20000
+// 0x010b1648: 0x10b1648: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b1004: 0x10b1004: addiu a0, a0, 18288
+// 0x010b164c: 0x10b164c: addiu a0, a0, 18748
 	ldloc.1
-	ldc.i4 18288
+	ldc.i4 18748
 	add
 	stloc.1
-// 0x010b1008: 0x10b1008: jal   0x1008cc8 addu  a1, zero, zero
+// 0x010b1650: 0x10b1650: jal   0x1008cd8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3587,23 +3587,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_convert_1008cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_convert_1008cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010b1010: 0x10b1010: lui   a0, 0x20000
+// 0x010b1658: 0x10b1658: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b1014: 0x10b1014: addiu a0, a0, 18284
+// 0x010b165c: 0x10b165c: addiu a0, a0, 18744
 	ldloc.1
-	ldc.i4 18284
+	ldc.i4 18744
 	add
 	stloc.1
-// 0x010b1018: 0x10b1018: addu  a1, zero, zero
+// 0x010b1660: 0x10b1660: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b101c: 0x10b101c: jal   0x1008cc8 addu  s1, v0, zero
+// 0x010b1664: 0x10b1664: jal   0x1008cd8 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -3611,21 +3611,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_convert_1008cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_convert_1008cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010b1024: 0x10b1024: addu  a3, v0, zero
+// 0x010b166c: 0x10b166c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b1028: 0x10b1028: addu  a0, s1, zero
+// 0x010b1670: 0x10b1670: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b102c: 0x10b102c: addiu a1, zero, 600
+// 0x010b1674: 0x10b1674: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x010b1030: 0x10b1030: jal   0x10ad034 addiu a2, zero, 4
+// 0x010b1678: 0x10b1678: jal   0x10ad67c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -3633,23 +3633,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_track_filter_new_10ad034(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_track_filter_new_10ad67c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010b1038: 0x10b1038: sw    v0, -11568(s0)
+// 0x010b1680: 0x10b1680: sw    v0, -11104(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2892
+	ldc.i4 -2776
 	add
 	ldloc 5
 	stelem.i4
-L_10b103c:
-// 0x010b103c: 0x10b103c: lw    ra, 28(sp)
-// 0x010b1040: 0x10b1040: lw    s1, 24(sp)
+L_10b1684:
+// 0x010b1684: 0x10b1684: lw    ra, 28(sp)
+// 0x010b1688: 0x10b1688: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3658,7 +3658,7 @@ L_10b103c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b1044: 0x10b1044: lw    s0, 20(sp)
+// 0x010b168c: 0x10b168c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3667,7 +3667,7 @@ L_10b103c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b1048: 0x10b1048: jr    ra addiu sp, sp, 32
+// 0x010b1690: 0x10b1690: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3679,7 +3679,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_get_gps_filter_10b1050(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_get_gps_filter_10b1698(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3714,37 +3714,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b1050: 0x10b1050: addiu sp, sp, -24
+// 0x010b1698: 0x10b1698: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b1054: 0x10b1054: sw    ra, 20(sp)
-// 0x010b1058: 0x10b1058: jal   0x10b0fe4 sll   zero, zero, 0
+// 0x010b169c: 0x10b169c: sw    ra, 20(sp)
+// 0x010b16a0: 0x10b16a0: jal   0x10b162c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_filter_init_10b0fe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_filter_init_10b162c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b1060: 0x10b1060: lw    ra, 20(sp)
-// 0x010b1064: 0x10b1064: lui   v0, 0x90000
+// 0x010b16a8: 0x10b16a8: lw    ra, 20(sp)
+// 0x010b16ac: 0x10b16ac: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b1068: 0x10b1068: lw    v0, -11568(v0)
+// 0x010b16b0: 0x10b16b0: lw    v0, -11104(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2892
+	ldc.i4 -2776
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b106c: 0x10b106c: jr    ra addiu sp, sp, 24
+// 0x010b16b4: 0x10b16b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3756,7 +3756,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 handle_new_direction_10b1074(int32,int32,int32,int32,int32)
+.method public static int32 handle_new_direction_10b16bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -3794,15 +3794,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b1074: 0x10b1074: addiu sp, sp, -24
+// 0x010b16bc: 0x10b16bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b1078: 0x10b1078: lui   v0, 0x0
+// 0x010b16c0: 0x10b16c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b107c: 0x10b107c: sw    s0, 16(sp)
+// 0x010b16c4: 0x10b16c4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3811,7 +3811,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b1080: 0x10b1080: lw    v0, 576(v0)
+// 0x010b16c8: 0x10b16c8: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3820,10 +3820,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1084: 0x10b1084: addu  s0, a0, zero
+// 0x010b16cc: 0x10b16cc: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b1088: 0x10b1088: lw    a0, 12(a0)
+// 0x010b16d0: 0x10b16d0: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3832,30 +3832,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b108c: 0x10b108c: sll   zero, zero, 0
-// 0x010b1090: 0x10b1090: beq   a0, v0, 0x10b10a8 sw    ra, 20(sp)
+// 0x010b16d4: 0x10b16d4: sll   zero, zero, 0
+// 0x010b16d8: 0x10b16d8: beq   a0, v0, 0x10b16f0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 6
-	beq  L_10b10a8
+	beq  L_10b16f0
 // --- basic block ---
-// 0x010b1098: 0x10b1098: bltz  a0, 0x10b10a8 sll   zero, zero, 0
+// 0x010b16e0: 0x10b16e0: bltz  a0, 0x10b16f0 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b10a8
+	blt L_10b16f0
 // --- basic block ---
-// 0x010b10a0: 0x10b10a0: jal   0x100b164 sll   zero, zero, 0
+// 0x010b16e8: 0x10b16e8: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10b10a8:
-// 0x010b10a8: 0x10b10a8: lw    a1, 12(s0)
+L_10b16f0:
+// 0x010b16f0: 0x10b16f0: lw    a1, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3864,7 +3864,7 @@ L_10b10a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b10ac: 0x10b10ac: lw    a0, 4(s0)
+// 0x010b16f4: 0x10b16f4: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3873,7 +3873,7 @@ L_10b10a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b10b0: 0x10b10b0: jal   0x10b694c addiu a2, zero, 16
+// 0x010b16f8: 0x10b16f8: jal   0x10b6f94 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.0
@@ -3881,16 +3881,16 @@ L_10b10a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_set_flag_10b694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_set_flag_10b6f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b10b8: 0x10b10b8: lw    ra, 20(sp)
-// 0x010b10bc: 0x10b10bc: addu  v0, zero, zero
+// 0x010b1700: 0x10b1700: lw    ra, 20(sp)
+// 0x010b1704: 0x10b1704: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010b10c0: 0x10b10c0: lw    s0, 16(sp)
+// 0x010b1708: 0x10b1708: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3899,7 +3899,7 @@ L_10b10a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b10c4: 0x10b10c4: jr    ra addiu sp, sp, 24
+// 0x010b170c: 0x10b170c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3911,7 +3911,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_new_roads_state_10b10cc(int32,int32,int32,int32,int32)
+.method public static int32 editor_new_roads_state_10b1714(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3946,65 +3946,65 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b10cc: 0x10b10cc: lui   v0, 0x90000
+// 0x010b1714: 0x10b1714: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b10d0: 0x10b10d0: lw    v0, -11592(v0)
+// 0x010b1718: 0x10b1718: lw    v0, -11128(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b10d4: 0x10b10d4: addiu sp, sp, -24
+// 0x010b171c: 0x10b171c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b10d8: 0x10b10d8: beq   v0, zero, 0x10b10f0 sw    ra, 20(sp)
+// 0x010b1720: 0x10b1720: beq   v0, zero, 0x10b1738 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_10b10f0
+	brfalse L_10b1738
 // --- basic block ---
-// 0x010b10e0: 0x10b10e0: jal   0x10b808c sll   zero, zero, 0
+// 0x010b1728: 0x10b1728: jal   0x10b86d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl137::editor_bar_feature_enabled_10b808c(int32,int32,int32,int32,int32)
+	call int32 Cibyl137::editor_bar_feature_enabled_10b86d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b10e8: 0x10b10e8: beq   v0, zero, 0x10b10fc addiu v1, zero, 1
+// 0x010b1730: 0x10b1730: beq   v0, zero, 0x10b1744 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_10b10fc
+	brfalse L_10b1744
 // --- basic block ---
-L_10b10f0:
-// 0x010b10f0: 0x10b10f0: jal   0x101fd90 sll   zero, zero, 0
+L_10b1738:
+// 0x010b1738: 0x10b1738: jal   0x101fda0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_show_icons_only_when_touched_101fd90(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_show_icons_only_when_touched_101fda0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b10f8: 0x10b10f8: addu  v1, v0, zero
+// 0x010b1740: 0x10b1740: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_10b10fc:
-// 0x010b10fc: 0x10b10fc: lw    ra, 20(sp)
-// 0x010b1100: 0x10b1100: addu  v0, v1, zero
+L_10b1744:
+// 0x010b1744: 0x10b1744: lw    ra, 20(sp)
+// 0x010b1748: 0x10b1748: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010b1104: 0x10b1104: jr    ra addiu sp, sp, 24
+// 0x010b174c: 0x10b174c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4016,7 +4016,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_toggle_new_roads_10b110c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_toggle_new_roads_10b1754(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4051,43 +4051,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b110c: 0x10b110c: addiu sp, sp, -24
+// 0x010b1754: 0x10b1754: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b1110: 0x10b1110: sw    ra, 20(sp)
-// 0x010b1114: 0x10b1114: jal   0x106b068 sll   zero, zero, 0
+// 0x010b1758: 0x10b1758: sw    ra, 20(sp)
+// 0x010b175c: 0x10b175c: jal   0x106b68c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b111c: 0x10b111c: beq   v0, zero, 0x10b115c lui   v0, 0x90000
+// 0x010b1764: 0x10b1764: beq   v0, zero, 0x10b17a4 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10b115c
+	brfalse L_10b17a4
 // --- basic block ---
-// 0x010b1124: 0x10b1124: lui   a0, 0x0
+// 0x010b176c: 0x10b176c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b1128: 0x10b1128: lui   a1, 0x20000
+// 0x010b1770: 0x10b1770: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b112c: 0x10b112c: addiu a0, a0, 19124
+// 0x010b1774: 0x10b1774: addiu a0, a0, 19124
 	ldloc.1
 	ldc.i4 19124
 	add
 	stloc.1
-// 0x010b1130: 0x10b1130: jal   0x100e7f4 addiu a1, a1, 18252
+// 0x010b1778: 0x10b1778: jal   0x100e804 addiu a1, a1, 18712
 	ldloc.2
-	ldc.i4 18252
+	ldc.i4 18712
 	add
 	stloc.2
 	ldloc.0
@@ -4095,31 +4095,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1138: 0x10b1138: bne   v0, zero, 0x10b115c lui   v0, 0x90000
+// 0x010b1780: 0x10b1780: bne   v0, zero, 0x10b17a4 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brtrue L_10b115c
+	brtrue L_10b17a4
 // --- basic block ---
-// 0x010b1140: 0x10b1140: lui   a0, 0x0
+// 0x010b1788: 0x10b1788: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b1144: 0x10b1144: lui   a1, 0x20000
+// 0x010b178c: 0x10b178c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b1148: 0x10b1148: addiu a0, a0, 30152
+// 0x010b1790: 0x10b1790: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b114c: 0x10b114c: jal   0x104c148 addiu a1, a1, 18296
+// 0x010b1794: 0x10b1794: jal   0x104c158 addiu a1, a1, 18756
 	ldloc.2
-	ldc.i4 18296
+	ldc.i4 18756
 	add
 	stloc.2
 	ldloc.0
@@ -4127,54 +4127,54 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1154: 0x10b1154: j	 0x10b1270 sll   zero, zero, 0
-	br L_10b1270
+// 0x010b179c: 0x10b179c: j	 0x10b18b8 sll   zero, zero, 0
+	br L_10b18b8
 // --- basic block ---
-L_10b115c:
-// 0x010b115c: 0x10b115c: lw    v1, -11592(v0)
+L_10b17a4:
+// 0x010b17a4: 0x10b17a4: lw    v1, -11128(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1160: 0x10b1160: sll   zero, zero, 0
-// 0x010b1164: 0x10b1164: beq   v1, zero, 0x10b1174 addiu v1, zero, 1
+// 0x010b17a8: 0x10b17a8: sll   zero, zero, 0
+// 0x010b17ac: 0x10b17ac: beq   v1, zero, 0x10b17bc addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brfalse L_10b1174
+	brfalse L_10b17bc
 // --- basic block ---
-// 0x010b116c: 0x10b116c: j	 0x10b1178 sw    zero, -11592(v0)
+// 0x010b17b4: 0x10b17b4: j	 0x10b17c0 sw    zero, -11128(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b1178
+	br L_10b17c0
 // --- basic block ---
-L_10b1174:
-// 0x010b1174: 0x10b1174: sw    v1, -11592(v0)
+L_10b17bc:
+// 0x010b17bc: 0x10b17bc: sw    v1, -11128(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldloc 6
 	stelem.i4
-L_10b1178:
-// 0x010b1178: 0x10b1178: jal   0x1094a94 addu  a0, zero, zero
+L_10b17c0:
+// 0x010b17c0: 0x10b17c0: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4182,55 +4182,55 @@ L_10b1178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1180: 0x10b1180: lui   v0, 0x90000
+// 0x010b17c8: 0x10b17c8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b1184: 0x10b1184: lw    v0, -11592(v0)
+// 0x010b17cc: 0x10b17cc: lw    v0, -11128(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1188: 0x10b1188: sll   zero, zero, 0
-// 0x010b118c: 0x10b118c: beq   v0, zero, 0x10b11c4 addiu a0, zero, 40
+// 0x010b17d0: 0x10b17d0: sll   zero, zero, 0
+// 0x010b17d4: 0x10b17d4: beq   v0, zero, 0x10b180c addiu a0, zero, 40
 	ldloc 5
 	ldc.i4.s 40
 	stloc.1
-	brfalse L_10b11c4
+	brfalse L_10b180c
 // --- basic block ---
-// 0x010b1194: 0x10b1194: jal   0x102bcf0 addiu a1, zero, 150
+// 0x010b17dc: 0x10b17dc: jal   0x102bd00 addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bcf0(int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bd00(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010b119c: 0x10b119c: lui   a0, 0x20000
+// 0x010b17e4: 0x10b17e4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b11a0: 0x10b11a0: lui   a1, 0x20000
+// 0x010b17e8: 0x10b17e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b11a4: 0x10b11a4: addiu a0, a0, 18388
+// 0x010b17ec: 0x10b17ec: addiu a0, a0, 18848
 	ldloc.1
-	ldc.i4 18388
+	ldc.i4 18848
 	add
 	stloc.1
-// 0x010b11a8: 0x10b11a8: addiu a1, a1, 18400
+// 0x010b17f0: 0x10b17f0: addiu a1, a1, 18860
 	ldloc.2
-	ldc.i4 18400
+	ldc.i4 18860
 	add
 	stloc.2
-// 0x010b11ac: 0x10b11ac: jal   0x104bfe4 addiu a2, zero, 8
+// 0x010b17f4: 0x10b17f4: jal   0x104bff4 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -4238,151 +4238,151 @@ L_10b1178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b11b4: 0x10b11b4: jal   0x10b7a74 sll   zero, zero, 0
-	call int32 Cibyl137::editor_bar_show_10b7a74()
+// 0x010b17fc: 0x10b17fc: jal   0x10b80bc sll   zero, zero, 0
+	call int32 Cibyl137::editor_bar_show_10b80bc()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b11bc: 0x10b11bc: j	 0x10b1214 lui   v0, 0x90000
+// 0x010b1804: 0x10b1804: j	 0x10b185c lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-	br L_10b1214
+	br L_10b185c
 // --- basic block ---
-L_10b11c4:
-// 0x010b11c4: 0x10b11c4: jal   0x10b5d08 sll   zero, zero, 0
+L_10b180c:
+// 0x010b180c: 0x10b180c: jal   0x10b6350 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_count_10b5d08(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_count_10b6350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b11cc: 0x10b11cc: blez  v0, 0x10b11e8 lui   a0, 0x20000
+// 0x010b1814: 0x10b1814: blez  v0, 0x10b1830 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
 	ldc.i4.s 0
-	ble L_10b11e8
+	ble L_10b1830
 // --- basic block ---
-// 0x010b11d4: 0x10b11d4: lui   a1, 0x20000
+// 0x010b181c: 0x10b181c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b11d8: 0x10b11d8: addiu a0, a0, 18388
+// 0x010b1820: 0x10b1820: addiu a0, a0, 18848
 	ldloc.1
-	ldc.i4 18388
+	ldc.i4 18848
 	add
 	stloc.1
-// 0x010b11dc: 0x10b11dc: addiu a1, a1, 18488
+// 0x010b1824: 0x10b1824: addiu a1, a1, 18948
 	ldloc.2
-	ldc.i4 18488
+	ldc.i4 18948
 	add
 	stloc.2
-// 0x010b11e0: 0x10b11e0: j	 0x10b11f8 addiu a2, zero, 8
+// 0x010b1828: 0x10b1828: j	 0x10b1840 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-	br L_10b11f8
+	br L_10b1840
 // --- basic block ---
-L_10b11e8:
-// 0x010b11e8: 0x10b11e8: lui   a1, 0x20000
+L_10b1830:
+// 0x010b1830: 0x10b1830: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b11ec: 0x10b11ec: addiu a0, a0, 18388
+// 0x010b1834: 0x10b1834: addiu a0, a0, 18848
 	ldloc.1
-	ldc.i4 18388
+	ldc.i4 18848
 	add
 	stloc.1
-// 0x010b11f0: 0x10b11f0: addiu a1, a1, 18608
+// 0x010b1838: 0x10b1838: addiu a1, a1, 19068
 	ldloc.2
-	ldc.i4 18608
+	ldc.i4 19068
 	add
 	stloc.2
-// 0x010b11f4: 0x10b11f4: addiu a2, zero, 5
+// 0x010b183c: 0x10b183c: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-L_10b11f8:
-// 0x010b11f8: 0x10b11f8: jal   0x104bfe4 sll   zero, zero, 0
+L_10b1840:
+// 0x010b1840: 0x10b1840: jal   0x104bff4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1200: 0x10b1200: jal   0x10b7a98 sll   zero, zero, 0
-	call int32 Cibyl137::editor_bar_hide_10b7a98()
+// 0x010b1848: 0x10b1848: jal   0x10b80e0 sll   zero, zero, 0
+	call int32 Cibyl137::editor_bar_hide_10b80e0()
 	stloc 5
 // --- basic block ---
-// 0x010b1208: 0x10b1208: jal   0x102c094 sll   zero, zero, 0
+// 0x010b1850: 0x10b1850: jal   0x102c0a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_fuzzy_reset_cycle_102c094(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_reset_cycle_102c0a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1210: 0x10b1210: lui   v0, 0x90000
+// 0x010b1858: 0x10b1858: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10b1214:
-// 0x010b1214: 0x10b1214: lw    a0, -11564(v0)
+L_10b185c:
+// 0x010b185c: 0x10b185c: lw    a0, -11100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2891
+	ldc.i4 -2775
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1218: 0x10b1218: addiu v1, zero, 40
+// 0x010b1860: 0x10b1860: addiu v1, zero, 40
 	ldc.i4.s 40
 	stloc 6
-// 0x010b121c: 0x10b121c: bne   a0, v1, 0x10b1240 lui   a0, 0xe0000
+// 0x010b1864: 0x10b1864: bne   a0, v1, 0x10b1888 lui   a0, 0xe0000
 	ldloc.1
 	ldloc 6
 	ldc.i4 917504
 	stloc.1
-	bne.un L_10b1240
+	bne.un L_10b1888
 // --- basic block ---
-// 0x010b1224: 0x10b1224: lui   a1, 0xe0000
+// 0x010b186c: 0x10b186c: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010b1228: 0x10b1228: addiu v1, zero, 39
+// 0x010b1870: 0x10b1870: addiu v1, zero, 39
 	ldc.i4.s 39
 	stloc 6
-// 0x010b122c: 0x10b122c: addiu a0, a0, -19220
+// 0x010b1874: 0x10b1874: addiu a0, a0, -18756
 	ldloc.1
-	ldc.i4 -19220
+	ldc.i4 -18756
 	add
 	stloc.1
-// 0x010b1230: 0x10b1230: addiu a1, a1, -19216
+// 0x010b1878: 0x10b1878: addiu a1, a1, -18752
 	ldloc.2
-	ldc.i4 -19216
+	ldc.i4 -18752
 	add
 	stloc.2
-// 0x010b1234: 0x10b1234: addiu a2, zero, 156
+// 0x010b187c: 0x10b187c: addiu a2, zero, 156
 	ldc.i4 156
 	stloc.3
-// 0x010b1238: 0x10b1238: jal   0x100186c sw    v1, -11564(v0)
+// 0x010b1880: 0x10b1880: jal   0x100186c sw    v1, -11100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2891
+	ldc.i4 -2775
 	add
 	ldloc 6
 	stelem.i4
@@ -4395,67 +4395,67 @@ L_10b1214:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1240:
-// 0x010b1240: 0x10b1240: lui   v0, 0x90000
+L_10b1888:
+// 0x010b1888: 0x10b1888: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b1244: 0x10b1244: lw    v1, -11564(v0)
+// 0x010b188c: 0x10b188c: lw    v1, -11100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2891
+	ldc.i4 -2775
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1248: 0x10b1248: lui   a0, 0x90000
+// 0x010b1890: 0x10b1890: lui   a0, 0x90000
 	ldc.i4 589824
 	stloc.1
-// 0x010b124c: 0x10b124c: lw    a1, -11572(a0)
+// 0x010b1894: 0x10b1894: lw    a1, -11108(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2893
+	ldc.i4 -2777
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b1250: 0x10b1250: lui   a0, 0xe0000
+// 0x010b1898: 0x10b1898: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b1254: 0x10b1254: sll   a2, v1, 2
+// 0x010b189c: 0x10b189c: sll   a2, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x010b1258: 0x10b1258: addiu a0, a0, -19220
+// 0x010b18a0: 0x10b18a0: addiu a0, a0, -18756
 	ldloc.1
-	ldc.i4 -19220
+	ldc.i4 -18756
 	add
 	stloc.1
-// 0x010b125c: 0x10b125c: addu  a0, a2, a0
+// 0x010b18a4: 0x10b18a4: addu  a0, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x010b1260: 0x10b1260: addiu v1, v1, 1
+// 0x010b18a8: 0x10b18a8: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010b1264: 0x10b1264: sw    a1, 0(a0)
+// 0x010b18ac: 0x10b18ac: sw    a1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010b1268: 0x10b1268: jal   0x1021900 sw    v1, -11564(v0)
+// 0x010b18b0: 0x10b18b0: jal   0x1021910 sw    v1, -11100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2891
+	ldc.i4 -2775
 	add
 	ldloc 6
 	stelem.i4
@@ -4464,15 +4464,15 @@ L_10b1240:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1270:
-// 0x010b1270: 0x10b1270: lw    ra, 20(sp)
-// 0x010b1274: 0x10b1274: sll   zero, zero, 0
-// 0x010b1278: 0x10b1278: jr    ra addiu sp, sp, 24
+L_10b18b8:
+// 0x010b18b8: 0x10b18b8: lw    ra, 20(sp)
+// 0x010b18bc: 0x10b18bc: sll   zero, zero, 0
+// 0x010b18c0: 0x10b18c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4484,7 +4484,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_155_10b1280(int32,int32,int32,int32,int32)
+.method public static int32 T_155_10b18c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s4,int32 s3,int32 t0,int32 s2,int32 ra)
@@ -4537,12 +4537,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b1280: 0x10b1280: addiu sp, sp, -64
+// 0x010b18c8: 0x10b18c8: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010b1284: 0x10b1284: sw    s4, 56(sp)
+// 0x010b18cc: 0x10b18cc: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4551,10 +4551,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b1288: 0x10b1288: lui   s4, 0x90000
+// 0x010b18d0: 0x10b18d0: lui   s4, 0x90000
 	ldc.i4 589824
 	stloc 10
-// 0x010b128c: 0x10b128c: sw    s1, 44(sp)
+// 0x010b18d4: 0x10b18d4: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4563,22 +4563,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b1290: 0x10b1290: addiu s4, s4, -11560
+// 0x010b18d8: 0x10b18d8: addiu s4, s4, -11096
 	ldloc 10
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc 10
-// 0x010b1294: 0x10b1294: sll   s1, a1, 5
+// 0x010b18dc: 0x10b18dc: sll   s1, a1, 5
 	ldloc.2
 	ldc.i4.5
 	shl
 	stloc 9
-// 0x010b1298: 0x10b1298: addu  s1, s4, s1
+// 0x010b18e0: 0x10b18e0: addu  s1, s4, s1
 	ldloc 10
 	ldloc 9
 	add
 	stloc 9
-// 0x010b129c: 0x10b129c: sw    s3, 52(sp)
+// 0x010b18e4: 0x10b18e4: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4587,13 +4587,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b12a0: 0x10b12a0: addu  s3, a0, zero
+// 0x010b18e8: 0x10b18e8: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010b12a4: 0x10b12a4: addu  a0, s1, zero
+// 0x010b18ec: 0x10b18ec: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b12a8: 0x10b12a8: sw    s2, 48(sp)
+// 0x010b18f0: 0x10b18f0: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4602,7 +4602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b12ac: 0x10b12ac: sw    s0, 40(sp)
+// 0x010b18f4: 0x10b18f4: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4611,7 +4611,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b12b0: 0x10b12b0: sw    a2, 32(sp)
+// 0x010b18f8: 0x10b18f8: sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4620,11 +4620,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b12b4: 0x10b12b4: sw    ra, 60(sp)
-// 0x010b12b8: 0x10b12b8: addu  s2, a1, zero
+// 0x010b18fc: 0x10b18fc: sw    ra, 60(sp)
+// 0x010b1900: 0x10b1900: addu  s2, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010b12bc: 0x10b12bc: jal   0x10aedb0 addu  s0, a3, zero
+// 0x010b1904: 0x10b1904: jal   0x10af3f8 addu  s0, a3, zero
 	ldloc 4
 	stloc 8
 	ldloc.0
@@ -4632,15 +4632,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_db_10aedb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_db_10af3f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b12c4: 0x10b12c4: addiu v1, zero, -1
+// 0x010b190c: 0x10b190c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b12c8: 0x10b12c8: lw    a2, 32(sp)
+// 0x010b1910: 0x10b1910: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4649,30 +4649,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b12cc: 0x10b12cc: bne   v0, v1, 0x10b12f4 lui   a1, 0x20000
+// 0x010b1914: 0x10b1914: bne   v0, v1, 0x10b193c lui   a1, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10b12f4
+	bne.un L_10b193c
 // --- basic block ---
-// 0x010b12d4: 0x10b12d4: lui   a3, 0x20000
+// 0x010b191c: 0x10b191c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b12d8: 0x10b12d8: addiu a1, a1, 18640
+// 0x010b1920: 0x10b1920: addiu a1, a1, 19100
 	ldloc.2
-	ldc.i4 18640
+	ldc.i4 19100
 	add
 	stloc.2
-// 0x010b12dc: 0x10b12dc: addiu a3, a3, 18684
+// 0x010b1924: 0x10b1924: addiu a3, a3, 19144
 	ldloc 4
-	ldc.i4 18684
+	ldc.i4 19144
 	add
 	stloc 4
-// 0x010b12e0: 0x10b12e0: addiu a0, zero, 4
+// 0x010b1928: 0x10b1928: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b12e4: 0x10b12e4: jal   0x100449c addiu a2, zero, 269
+// 0x010b192c: 0x10b192c: jal   0x100449c addiu a2, zero, 269
 	ldc.i4 269
 	stloc.3
 	ldloc.0
@@ -4685,25 +4685,25 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b12ec: 0x10b12ec: j	 0x10b13e4 addiu v0, zero, -1
+// 0x010b1934: 0x10b1934: j	 0x10b1a2c addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_10b13e4
+	br L_10b1a2c
 // --- basic block ---
-L_10b12f4:
-// 0x010b12f4: 0x10b12f4: bne   a2, v1, 0x10b1350 lui   a0, 0x0
+L_10b193c:
+// 0x010b193c: 0x10b193c: bne   a2, v1, 0x10b1998 lui   a0, 0x0
 	ldloc.3
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10b1350
+	bne.un L_10b1998
 // --- basic block ---
-// 0x010b12fc: 0x10b12fc: addiu a0, a0, 19028
+// 0x010b1944: 0x10b1944: addiu a0, a0, 19028
 	ldloc.1
 	ldc.i4 19028
 	add
 	stloc.1
-// 0x010b1300: 0x10b1300: lw    a2, 4(a0)
+// 0x010b1948: 0x10b1948: lw    a2, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4712,15 +4712,15 @@ L_10b12f4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b1304: 0x10b1304: addiu v0, zero, -1
+// 0x010b194c: 0x10b194c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b1308: 0x10b1308: beq   a2, v0, 0x10b1330 sll   zero, zero, 0
+// 0x010b1950: 0x10b1950: beq   a2, v0, 0x10b1978 sll   zero, zero, 0
 	ldloc.3
 	ldloc 5
-	beq  L_10b1330
+	beq  L_10b1978
 // --- basic block ---
-// 0x010b1310: 0x10b1310: lw    v0, 8(a0)
+// 0x010b1958: 0x10b1958: lw    v0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4729,41 +4729,41 @@ L_10b12f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1314: 0x10b1314: sll   zero, zero, 0
-// 0x010b1318: 0x10b1318: bne   v0, zero, 0x10b1354 addiu s4, zero, -1
+// 0x010b195c: 0x10b195c: sll   zero, zero, 0
+// 0x010b1960: 0x10b1960: bne   v0, zero, 0x10b199c addiu s4, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 10
-	brtrue L_10b1354
+	brtrue L_10b199c
 // --- basic block ---
-// 0x010b1320: 0x10b1320: jal   0x10aed30 sll   zero, zero, 0
+// 0x010b1968: 0x10b1968: jal   0x10af378 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10aed30(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10af378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1328: 0x10b1328: j	 0x10b1344 addu  a2, v0, zero
+// 0x010b1970: 0x10b1970: j	 0x10b198c addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-	br L_10b1344
+	br L_10b198c
 // --- basic block ---
-L_10b1330:
-// 0x010b1330: 0x10b1330: sll   a0, s3, 5
+L_10b1978:
+// 0x010b1978: 0x10b1978: sll   a0, s3, 5
 	ldloc 11
 	ldc.i4.5
 	shl
 	stloc.1
-// 0x010b1334: 0x10b1334: addu  a0, s4, a0
+// 0x010b197c: 0x10b197c: addu  a0, s4, a0
 	ldloc 10
 	ldloc.1
 	add
 	stloc.1
-// 0x010b1338: 0x10b1338: jal   0x10b4760 addiu a1, zero, -1
+// 0x010b1980: 0x10b1980: jal   0x10b4da8 addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -4771,44 +4771,44 @@ L_10b1330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1340: 0x10b1340: addu  a2, v0, zero
+// 0x010b1988: 0x10b1988: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_10b1344:
-// 0x010b1344: 0x10b1344: addiu v0, zero, -1
+L_10b198c:
+// 0x010b198c: 0x10b198c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b1348: 0x10b1348: beq   a2, v0, 0x10b13e4 sll   zero, zero, 0
+// 0x010b1990: 0x10b1990: beq   a2, v0, 0x10b1a2c sll   zero, zero, 0
 	ldloc.3
 	ldloc 5
-	beq  L_10b13e4
+	beq  L_10b1a2c
 // --- basic block ---
-L_10b1350:
-// 0x010b1350: 0x10b1350: addiu s4, zero, -1
+L_10b1998:
+// 0x010b1998: 0x10b1998: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 10
-L_10b1354:
-// 0x010b1354: 0x10b1354: bne   s0, s4, 0x10b139c addu  a0, a2, zero
+L_10b199c:
+// 0x010b199c: 0x10b199c: bne   s0, s4, 0x10b19e4 addu  a0, a2, zero
 	ldloc 8
 	ldloc 10
 	ldloc.3
 	stloc.1
-	bne.un L_10b139c
+	bne.un L_10b19e4
 // --- basic block ---
-// 0x010b135c: 0x10b135c: addiu s0, sp, 24
+// 0x010b19a4: 0x10b19a4: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x010b1360: 0x10b1360: addu  a1, s0, zero
+// 0x010b19a8: 0x10b19a8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010b1364: 0x10b1364: jal   0x10b46a0 sw    a2, 32(sp)
+// 0x010b19ac: 0x10b19ac: jal   0x10b4ce8 sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4822,26 +4822,26 @@ L_10b1354:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b136c: 0x10b136c: addu  a0, s0, zero
+// 0x010b19b4: 0x10b19b4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b1370: 0x10b1370: jal   0x10083b4 addu  a1, s1, zero
+// 0x010b19b8: 0x10b19b8: jal   0x10083c4 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_compare_points_10083b4(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compare_points_10083c4(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1378: 0x10b1378: lw    a2, 32(sp)
+// 0x010b19c0: 0x10b19c0: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4850,16 +4850,16 @@ L_10b1354:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b137c: 0x10b137c: beq   v0, zero, 0x10b139c addu  s0, a2, zero
+// 0x010b19c4: 0x10b19c4: beq   v0, zero, 0x10b19e4 addu  s0, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 8
-	brfalse L_10b139c
+	brfalse L_10b19e4
 // --- basic block ---
-// 0x010b1384: 0x10b1384: addu  a0, s1, zero
+// 0x010b19cc: 0x10b19cc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b1388: 0x10b1388: jal   0x10b4760 addiu a1, zero, -1
+// 0x010b19d0: 0x10b19d0: jal   0x10b4da8 addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -4867,12 +4867,12 @@ L_10b1354:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1390: 0x10b1390: lw    a2, 32(sp)
+// 0x010b19d8: 0x10b19d8: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4881,18 +4881,18 @@ L_10b1354:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b1394: 0x10b1394: beq   v0, s4, 0x10b13e0 addu  s0, v0, zero
+// 0x010b19dc: 0x10b19dc: beq   v0, s4, 0x10b1a28 addu  s0, v0, zero
 	ldloc 5
 	ldloc 10
 	ldloc 5
 	stloc 8
-	beq  L_10b13e0
+	beq  L_10b1a28
 // --- basic block ---
-L_10b139c:
-// 0x010b139c: 0x10b139c: lui   v0, 0x0
+L_10b19e4:
+// 0x010b19e4: 0x10b19e4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b13a0: 0x10b13a0: lw    t0, 18812(v0)
+// 0x010b19e8: 0x10b19e8: lw    t0, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4901,18 +4901,18 @@ L_10b139c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b13a4: 0x10b13a4: lui   s1, 0x0
+// 0x010b19ec: 0x10b19ec: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010b13a8: 0x10b13a8: lui   v0, 0x0
+// 0x010b19f0: 0x10b19f0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b13ac: 0x10b13ac: addiu v0, v0, 19028
+// 0x010b19f4: 0x10b19f4: addiu v0, v0, 19028
 	ldloc 5
 	ldc.i4 19028
 	add
 	stloc 5
-// 0x010b13b0: 0x10b13b0: lw    v1, 19040(s1)
+// 0x010b19f8: 0x10b19f8: lw    v1, 19040(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4921,7 +4921,7 @@ L_10b139c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b13b4: 0x10b13b4: sw    t0, 8(v0)
+// 0x010b19fc: 0x10b19fc: sw    t0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4930,10 +4930,10 @@ L_10b139c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b13b8: 0x10b13b8: addiu t0, zero, 7
+// 0x010b1a00: 0x10b1a00: addiu t0, zero, 7
 	ldc.i4.7
 	stloc 12
-// 0x010b13bc: 0x10b13bc: sw    t0, 16(sp)
+// 0x010b1a04: 0x10b1a04: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4942,7 +4942,7 @@ L_10b139c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b13c0: 0x10b13c0: sw    v1, 20(sp)
+// 0x010b1a08: 0x10b1a08: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4951,16 +4951,16 @@ L_10b139c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b13c4: 0x10b13c4: addu  a0, s3, zero
+// 0x010b1a0c: 0x10b1a0c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010b13c8: 0x10b13c8: addu  a1, s2, zero
+// 0x010b1a10: 0x10b1a10: addu  a1, s2, zero
 	ldloc 13
 	stloc.2
-// 0x010b13cc: 0x10b13cc: addu  a3, s0, zero
+// 0x010b1a14: 0x10b1a14: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x010b13d0: 0x10b13d0: jal   0x10af1e0 sw    s0, 4(v0)
+// 0x010b1a18: 0x10b1a18: jal   0x10af828 sw    s0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4974,12 +4974,12 @@ L_10b139c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_line_10af1e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_line_10af828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b13d8: 0x10b13d8: j	 0x10b13e4 sw    zero, 19040(s1)
+// 0x010b1a20: 0x10b1a20: j	 0x10b1a2c sw    zero, 19040(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4988,15 +4988,15 @@ L_10b139c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b13e4
+	br L_10b1a2c
 // --- basic block ---
-L_10b13e0:
-// 0x010b13e0: 0x10b13e0: addiu v0, zero, -1
+L_10b1a28:
+// 0x010b1a28: 0x10b1a28: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10b13e4:
-// 0x010b13e4: 0x10b13e4: lw    ra, 60(sp)
-// 0x010b13e8: 0x10b13e8: lw    s4, 56(sp)
+L_10b1a2c:
+// 0x010b1a2c: 0x10b1a2c: lw    ra, 60(sp)
+// 0x010b1a30: 0x10b1a30: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5005,7 +5005,7 @@ L_10b13e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b13ec: 0x10b13ec: lw    s3, 52(sp)
+// 0x010b1a34: 0x10b1a34: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5014,7 +5014,7 @@ L_10b13e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b13f0: 0x10b13f0: lw    s2, 48(sp)
+// 0x010b1a38: 0x10b1a38: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5023,7 +5023,7 @@ L_10b13e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b13f4: 0x10b13f4: lw    s1, 44(sp)
+// 0x010b1a3c: 0x10b1a3c: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5032,7 +5032,7 @@ L_10b13e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b13f8: 0x10b13f8: lw    s0, 40(sp)
+// 0x010b1a40: 0x10b1a40: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5041,7 +5041,7 @@ L_10b13e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b13fc: 0x10b13fc: jr    ra addiu sp, sp, 64
+// 0x010b1a44: 0x10b1a44: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5053,7 +5053,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 end_unknown_segments_10b1404(int32,int32,int32,int32,int32)
+.method public static int32 end_unknown_segments_10b1a4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 s7,int32 s4,int32 s5,int32 s3,int32 s6,int32 s8,int32 lo,int32 ra)
@@ -5118,12 +5118,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b1404: 0x10b1404: addiu sp, sp, -96
+// 0x010b1a4c: 0x10b1a4c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010b1408: 0x10b1408: sw    s7, 84(sp)
+// 0x010b1a50: 0x10b1a50: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5132,13 +5132,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b140c: 0x10b140c: lui   s7, 0x90000
+// 0x010b1a54: 0x10b1a54: lui   s7, 0x90000
 	ldc.i4 589824
 	stloc 11
-// 0x010b1410: 0x10b1410: addiu v0, zero, -1
+// 0x010b1a58: 0x10b1a58: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b1414: 0x10b1414: sw    s5, 76(sp)
+// 0x010b1a5c: 0x10b1a5c: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5147,15 +5147,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b1418: 0x10b1418: addu  s5, a0, zero
+// 0x010b1a60: 0x10b1a60: addu  s5, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010b141c: 0x10b141c: addiu a0, s7, -11560
+// 0x010b1a64: 0x10b1a64: addiu a0, s7, -11096
 	ldloc 11
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc.1
-// 0x010b1420: 0x10b1420: sw    s6, 80(sp)
+// 0x010b1a68: 0x10b1a68: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5164,7 +5164,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b1424: 0x10b1424: sw    s4, 72(sp)
+// 0x010b1a6c: 0x10b1a6c: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5173,7 +5173,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b1428: 0x10b1428: sw    s3, 68(sp)
+// 0x010b1a70: 0x10b1a70: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5182,7 +5182,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b142c: 0x10b142c: sw    s2, 64(sp)
+// 0x010b1a74: 0x10b1a74: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5191,7 +5191,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b1430: 0x10b1430: sw    s1, 60(sp)
+// 0x010b1a78: 0x10b1a78: sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5200,8 +5200,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b1434: 0x10b1434: sw    ra, 92(sp)
-// 0x010b1438: 0x10b1438: sw    s8, 88(sp)
+// 0x010b1a7c: 0x10b1a7c: sw    ra, 92(sp)
+// 0x010b1a80: 0x10b1a80: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5210,7 +5210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b143c: 0x10b143c: sw    s0, 56(sp)
+// 0x010b1a84: 0x10b1a84: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5219,7 +5219,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b1440: 0x10b1440: sw    v0, 40(sp)
+// 0x010b1a88: 0x10b1a88: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5228,7 +5228,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b1444: 0x10b1444: sw    a1, 100(sp)
+// 0x010b1a8c: 0x10b1a8c: sw    a1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5237,7 +5237,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b1448: 0x10b1448: sw    v0, 32(sp)
+// 0x010b1a90: 0x10b1a90: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5246,7 +5246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b144c: 0x10b144c: jal   0x10aedb0 sw    v0, 36(sp)
+// 0x010b1a94: 0x10b1a94: jal   0x10af3f8 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5260,12 +5260,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_db_10aedb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_db_10af3f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b1454: 0x10b1454: lw    v0, 100(sp)
+// 0x010b1a9c: 0x10b1a9c: lw    v0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5274,34 +5274,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1458: 0x10b1458: lui   s2, 0x0
+// 0x010b1aa0: 0x10b1aa0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010b145c: 0x10b145c: addiu v0, v0, -1
+// 0x010b1aa4: 0x10b1aa4: addiu v0, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010b1460: 0x10b1460: addiu s7, s7, -11560
+// 0x010b1aa8: 0x10b1aa8: addiu s7, s7, -11096
 	ldloc 11
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc 11
-// 0x010b1464: 0x10b1464: addiu s2, s2, 19028
+// 0x010b1aac: 0x10b1aac: addiu s2, s2, 19028
 	ldloc 10
 	ldc.i4 19028
 	add
 	stloc 10
-// 0x010b1468: 0x10b1468: addu  s1, zero, zero
+// 0x010b1ab0: 0x10b1ab0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b146c: 0x10b146c: addu  s4, zero, zero
+// 0x010b1ab4: 0x10b1ab4: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010b1470: 0x10b1470: addiu s3, zero, 2
+// 0x010b1ab8: 0x10b1ab8: addiu s3, zero, 2
 	ldc.i4.2
 	stloc 14
-// 0x010b1474: 0x10b1474: sw    v0, 48(sp)
+// 0x010b1abc: 0x10b1abc: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5310,20 +5310,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b1478: 0x10b1478: j	 0x10b1664 lui   s6, 0x0
+// 0x010b1ac0: 0x10b1ac0: j	 0x10b1cac lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 15
-	br L_10b1664
+	br L_10b1cac
 // --- basic block ---
-L_10b1480:
-// 0x010b1480: 0x10b1480: lw    s8, 0(s5)
+L_10b1ac8:
+// 0x010b1ac8: 0x10b1ac8: lw    s8, 0(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 16
-// 0x010b1484: 0x10b1484: lw    s0, 4(s5)
+// 0x010b1acc: 0x10b1acc: lw    s0, 4(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -5332,26 +5332,26 @@ L_10b1480:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b1488: 0x10b1488: beq   s8, s3, 0x10b14a0 addiu v1, zero, 3
+// 0x010b1ad0: 0x10b1ad0: beq   s8, s3, 0x10b1ae8 addiu v1, zero, 3
 	ldloc 16
 	ldloc 14
 	ldc.i4.3
 	stloc 7
-	beq  L_10b14a0
+	beq  L_10b1ae8
 // --- basic block ---
-// 0x010b1490: 0x10b1490: bne   s8, v1, 0x10b157c sll   zero, zero, 0
+// 0x010b1ad8: 0x10b1ad8: bne   s8, v1, 0x10b1bc4 sll   zero, zero, 0
 	ldloc 16
 	ldloc 7
-	bne.un L_10b157c
+	bne.un L_10b1bc4
 // --- basic block ---
-// 0x010b1498: 0x10b1498: j	 0x10b153c sll   zero, zero, 0
-	br L_10b153c
+// 0x010b1ae0: 0x10b1ae0: j	 0x10b1b84 sll   zero, zero, 0
+	br L_10b1b84
 // --- basic block ---
-L_10b14a0:
-// 0x010b14a0: 0x10b14a0: addu  a0, s1, zero
+L_10b1ae8:
+// 0x010b1ae8: 0x10b1ae8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b14a4: 0x10b14a4: jal   0x10aee14 addu  a1, s0, zero
+// 0x010b1aec: 0x10b1aec: jal   0x10af45c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -5359,12 +5359,12 @@ L_10b14a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_length_10aee14(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_length_10af45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b14ac: 0x10b14ac: jal   0x10b0f9c sw    v0, 52(sp)
+// 0x010b1af4: 0x10b1af4: jal   0x10b15e4 sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5378,12 +5378,12 @@ L_10b14a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_point_distance_10b0f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_point_distance_10b15e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b14b4: 0x10b14b4: lw    v1, 52(sp)
+// 0x010b1afc: 0x10b1afc: lw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5392,40 +5392,40 @@ L_10b14a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b14b8: 0x10b14b8: sll   v0, v0, 1
+// 0x010b1b00: 0x10b1b00: sll   v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x010b14bc: 0x10b14bc: slt   v1, v1, v0
+// 0x010b1b04: 0x10b1b04: slt   v1, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 7
-// 0x010b14c0: 0x10b14c0: beq   v1, zero, 0x10b157c sll   v0, s0, 5
+// 0x010b1b08: 0x10b1b08: beq   v1, zero, 0x10b1bc4 sll   v0, s0, 5
 	ldloc 7
 	ldloc 9
 	ldc.i4.5
 	shl
 	stloc 6
-	brfalse L_10b157c
+	brfalse L_10b1bc4
 // --- basic block ---
-// 0x010b14c8: 0x10b14c8: sll   s1, s1, 5
+// 0x010b1b10: 0x10b1b10: sll   s1, s1, 5
 	ldloc 8
 	ldc.i4.5
 	shl
 	stloc 8
-// 0x010b14cc: 0x10b14cc: addu  v0, s7, v0
+// 0x010b1b14: 0x10b1b14: addu  v0, s7, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x010b14d0: 0x10b14d0: addu  s1, s7, s1
+// 0x010b1b18: 0x10b1b18: addu  s1, s7, s1
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x010b14d4: 0x10b14d4: lw    a0, 4(v0)
+// 0x010b1b1c: 0x10b1b1c: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5434,7 +5434,7 @@ L_10b14a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b14d8: 0x10b14d8: lw    v1, 4(s1)
+// 0x010b1b20: 0x10b1b20: lw    v1, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5443,31 +5443,31 @@ L_10b14a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b14dc: 0x10b14dc: lw    a1, 0(v0)
+// 0x010b1b24: 0x10b1b24: lw    a1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b14e0: 0x10b14e0: addu  a0, a0, v1
+// 0x010b1b28: 0x10b1b28: addu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-// 0x010b14e4: 0x10b14e4: div   a0, s3
+// 0x010b1b2c: 0x10b1b2c: div   a0, s3
 	ldloc.1
 	ldloc 14
 	div
 	stloc 17
-// 0x010b14e8: 0x10b14e8: lw    v0, 0(s1)
+// 0x010b1b30: 0x10b1b30: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b14ec: 0x10b14ec: lw    v1, 8(s2)
+// 0x010b1b34: 0x10b1b34: lw    v1, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5476,15 +5476,15 @@ L_10b14a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b14f0: 0x10b14f0: addu  v0, a1, v0
+// 0x010b1b38: 0x10b1b38: addu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x010b14f4: 0x10b14f4: mflo  lo
+// 0x010b1b3c: 0x10b1b3c: mflo  lo
 	ldloc 17
 	stloc.1
-// 0x010b14f8: 0x10b14f8: sw    a0, 28(sp)
+// 0x010b1b40: 0x10b1b40: sw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5493,16 +5493,16 @@ L_10b14a0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b14fc: 0x10b14fc: sll   zero, zero, 0
-// 0x010b1500: 0x10b1500: div   v0, s3
+// 0x010b1b44: 0x10b1b44: sll   zero, zero, 0
+// 0x010b1b48: 0x10b1b48: div   v0, s3
 	ldloc 6
 	ldloc 14
 	div
 	stloc 17
-// 0x010b1504: 0x10b1504: mflo  lo
+// 0x010b1b4c: 0x10b1b4c: mflo  lo
 	ldloc 17
 	stloc 6
-// 0x010b1508: 0x10b1508: bne   v1, zero, 0x10b1528 sw    v0, 24(sp)
+// 0x010b1b50: 0x10b1b50: bne   v1, zero, 0x10b1b70 sw    v0, 24(sp)
 	ldloc 7
 	ldloc 5
 	ldloc.0
@@ -5512,9 +5512,9 @@ L_10b14a0:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_10b1528
+	brtrue L_10b1b70
 // --- basic block ---
-// 0x010b1510: 0x10b1510: jal   0x10aed30 addu  a0, s2, zero
+// 0x010b1b58: 0x10b1b58: jal   0x10af378 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5522,12 +5522,12 @@ L_10b14a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10aed30(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10af378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b1518: 0x10b1518: lw    v1, 18812(s6)
+// 0x010b1b60: 0x10b1b60: lw    v1, 18812(s6)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -5536,7 +5536,7 @@ L_10b14a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b151c: 0x10b151c: sw    v0, 4(s2)
+// 0x010b1b64: 0x10b1b64: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5545,7 +5545,7 @@ L_10b14a0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b1520: 0x10b1520: j	 0x10b1658 sw    v1, 8(s2)
+// 0x010b1b68: 0x10b1b68: j	 0x10b1ca0 sw    v1, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5554,10 +5554,10 @@ L_10b14a0:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10b1658
+	br L_10b1ca0
 // --- basic block ---
-L_10b1528:
-// 0x010b1528: 0x10b1528: lw    a0, 4(s2)
+L_10b1b70:
+// 0x010b1b70: 0x10b1b70: lw    a0, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5566,7 +5566,7 @@ L_10b1528:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b152c: 0x10b152c: jal   0x10b46f0 addiu a1, sp, 24
+// 0x010b1b74: 0x10b1b74: jal   0x10b4d38 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5576,18 +5576,18 @@ L_10b1528:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_set_pos_10b46f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_set_pos_10b4d38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b1534: 0x10b1534: j	 0x10b165c addu  s1, s0, zero
+// 0x010b1b7c: 0x10b1b7c: j	 0x10b1ca4 addu  s1, s0, zero
 	ldloc 9
 	stloc 8
-	br L_10b165c
+	br L_10b1ca4
 // --- basic block ---
-L_10b153c:
-// 0x010b153c: 0x10b153c: lw    v0, 8(s2)
+L_10b1b84:
+// 0x010b1b84: 0x10b1b84: lw    v0, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5596,12 +5596,12 @@ L_10b153c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1540: 0x10b1540: sll   zero, zero, 0
-// 0x010b1544: 0x10b1544: bne   v0, zero, 0x10b1560 sll   zero, zero, 0
+// 0x010b1b88: 0x10b1b88: sll   zero, zero, 0
+// 0x010b1b8c: 0x10b1b8c: bne   v0, zero, 0x10b1ba8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b1560
+	brtrue L_10b1ba8
 // --- basic block ---
-// 0x010b154c: 0x10b154c: jal   0x10aed30 addu  a0, s2, zero
+// 0x010b1b94: 0x10b1b94: jal   0x10af378 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5609,12 +5609,12 @@ L_10b153c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10aed30(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10af378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b1554: 0x10b1554: lw    v1, 18812(s6)
+// 0x010b1b9c: 0x10b1b9c: lw    v1, 18812(s6)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -5623,7 +5623,7 @@ L_10b153c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b1558: 0x10b1558: sw    v0, 4(s2)
+// 0x010b1ba0: 0x10b1ba0: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5632,7 +5632,7 @@ L_10b153c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b155c: 0x10b155c: sw    v1, 8(s2)
+// 0x010b1ba4: 0x10b1ba4: sw    v1, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5641,8 +5641,8 @@ L_10b153c:
 	add
 	ldloc 7
 	stelem.i4
-L_10b1560:
-// 0x010b1560: 0x10b1560: lw    a2, 4(s2)
+L_10b1ba8:
+// 0x010b1ba8: 0x10b1ba8: lw    a2, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5651,13 +5651,13 @@ L_10b1560:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b1564: 0x10b1564: addu  a0, s1, zero
+// 0x010b1bac: 0x10b1bac: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b1568: 0x10b1568: addu  a1, s0, zero
+// 0x010b1bb0: 0x10b1bb0: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010b156c: 0x10b156c: jal   0x10b1280 addu  a3, a2, zero
+// 0x010b1bb4: 0x10b1bb4: jal   0x10b18c8 addu  a3, a2, zero
 	ldloc.3
 	stloc 4
 	ldloc.0
@@ -5665,18 +5665,18 @@ L_10b1560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::T_155_10b1280(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::T_155_10b18c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b1574: 0x10b1574: j	 0x10b165c addu  s1, s0, zero
+// 0x010b1bbc: 0x10b1bbc: j	 0x10b1ca4 addu  s1, s0, zero
 	ldloc 9
 	stloc 8
-	br L_10b165c
+	br L_10b1ca4
 // --- basic block ---
-L_10b157c:
-// 0x010b157c: 0x10b157c: lw    v1, 48(sp)
+L_10b1bc4:
+// 0x010b1bc4: 0x10b1bc4: lw    v1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5685,15 +5685,15 @@ L_10b157c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b1580: 0x10b1580: sll   zero, zero, 0
-// 0x010b1584: 0x10b1584: bne   s4, v1, 0x10b15f8 lui   a0, 0x0
+// 0x010b1bc8: 0x10b1bc8: sll   zero, zero, 0
+// 0x010b1bcc: 0x10b1bcc: bne   s4, v1, 0x10b1c40 lui   a0, 0x0
 	ldloc 12
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10b15f8
+	bne.un L_10b1c40
 // --- basic block ---
-// 0x010b158c: 0x10b158c: lw    v0, 18904(a0)
+// 0x010b1bd4: 0x10b1bd4: lw    v0, 18904(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5702,19 +5702,19 @@ L_10b157c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1590: 0x10b1590: sll   zero, zero, 0
-// 0x010b1594: 0x10b1594: beq   v0, zero, 0x10b160c addiu a3, zero, -1
+// 0x010b1bd8: 0x10b1bd8: sll   zero, zero, 0
+// 0x010b1bdc: 0x10b1bdc: beq   v0, zero, 0x10b1c54 addiu a3, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 4
-	brfalse L_10b160c
+	brfalse L_10b1c54
 // --- basic block ---
-// 0x010b159c: 0x10b159c: addiu v0, a0, 18904
+// 0x010b1be4: 0x10b1be4: addiu v0, a0, 18904
 	ldloc.1
 	ldc.i4 18904
 	add
 	stloc 6
-// 0x010b15a0: 0x10b15a0: lw    a3, 20(v0)
+// 0x010b1be8: 0x10b1be8: lw    a3, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5723,33 +5723,33 @@ L_10b157c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b15a4: 0x10b15a4: sll   a1, s0, 5
+// 0x010b1bec: 0x10b1bec: sll   a1, s0, 5
 	ldloc 9
 	ldc.i4.5
 	shl
 	stloc.2
-// 0x010b15a8: 0x10b15a8: lui   a0, 0x0
+// 0x010b1bf0: 0x10b1bf0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b15ac: 0x10b15ac: addu  a2, s0, zero
+// 0x010b1bf4: 0x10b1bf4: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x010b15b0: 0x10b15b0: addiu v1, sp, 32
+// 0x010b1bf8: 0x10b1bf8: addiu v1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 7
-// 0x010b15b4: 0x10b15b4: addu  a1, s7, a1
+// 0x010b1bfc: 0x10b1bfc: addu  a1, s7, a1
 	ldloc 11
 	ldloc.2
 	add
 	stloc.2
-// 0x010b15b8: 0x10b15b8: addiu a0, a0, 18980
+// 0x010b1c00: 0x10b1c00: addiu a0, a0, 18980
 	ldloc.1
 	ldc.i4 18980
 	add
 	stloc.1
-// 0x010b15bc: 0x10b15bc: jal   0x10b0728 sw    v1, 16(sp)
+// 0x010b1c04: 0x10b1c04: jal   0x10b0d70 sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5763,15 +5763,15 @@ L_10b157c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_util_new_road_end_10b0728(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_util_new_road_end_10b0d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b15c4: 0x10b15c4: addu  s0, v0, zero
+// 0x010b1c0c: 0x10b1c0c: addu  s0, v0, zero
 	ldloc 6
 	stloc 9
-// 0x010b15c8: 0x10b15c8: lw    v0, 40(sp)
+// 0x010b1c10: 0x10b1c10: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5780,12 +5780,12 @@ L_10b157c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b15cc: 0x10b15cc: sll   zero, zero, 0
-// 0x010b15d0: 0x10b15d0: bne   v0, zero, 0x10b15ec sll   zero, zero, 0
+// 0x010b1c14: 0x10b1c14: sll   zero, zero, 0
+// 0x010b1c18: 0x10b1c18: bne   v0, zero, 0x10b1c34 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b15ec
+	brtrue L_10b1c34
 // --- basic block ---
-// 0x010b15d8: 0x10b15d8: jal   0x10aed30 addiu a0, sp, 32
+// 0x010b1c20: 0x10b1c20: jal   0x10af378 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5795,12 +5795,12 @@ L_10b157c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10aed30(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_roadmap_node_to_editor_10af378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b15e0: 0x10b15e0: lw    v1, 18812(s6)
+// 0x010b1c28: 0x10b1c28: lw    v1, 18812(s6)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -5809,7 +5809,7 @@ L_10b157c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b15e4: 0x10b15e4: sw    v0, 36(sp)
+// 0x010b1c2c: 0x10b1c2c: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5818,7 +5818,7 @@ L_10b157c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b15e8: 0x10b15e8: sw    v1, 40(sp)
+// 0x010b1c30: 0x10b1c30: sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5827,8 +5827,8 @@ L_10b157c:
 	add
 	ldloc 7
 	stelem.i4
-L_10b15ec:
-// 0x010b15ec: 0x10b15ec: lw    a3, 36(sp)
+L_10b1c34:
+// 0x010b1c34: 0x10b1c34: lw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5837,15 +5837,15 @@ L_10b15ec:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b15f0: 0x10b15f0: j	 0x10b1610 addiu v0, s0, -1
+// 0x010b1c38: 0x10b1c38: j	 0x10b1c58 addiu v0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 6
-	br L_10b1610
+	br L_10b1c58
 // --- basic block ---
-L_10b15f8:
-// 0x010b15f8: 0x10b15f8: lw    a0, 48(sp)
+L_10b1c40:
+// 0x010b1c40: 0x10b1c40: lw    a0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5854,38 +5854,38 @@ L_10b15f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b15fc: 0x10b15fc: sll   zero, zero, 0
-// 0x010b1600: 0x10b1600: slt   v0, s4, a0
+// 0x010b1c44: 0x10b1c44: sll   zero, zero, 0
+// 0x010b1c48: 0x10b1c48: slt   v0, s4, a0
 	ldloc 12
 	ldloc.1
 	clt
 	stloc 6
-// 0x010b1604: 0x10b1604: bne   v0, zero, 0x10b1618 addiu a3, zero, -1
+// 0x010b1c4c: 0x10b1c4c: bne   v0, zero, 0x10b1c60 addiu a3, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 4
-	brtrue L_10b1618
+	brtrue L_10b1c60
 // --- basic block ---
-L_10b160c:
-// 0x010b160c: 0x10b160c: addiu v0, s0, -1
+L_10b1c54:
+// 0x010b1c54: 0x10b1c54: addiu v0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 6
-L_10b1610:
-// 0x010b1610: 0x10b1610: beq   s1, v0, 0x10b1658 sll   zero, zero, 0
+L_10b1c58:
+// 0x010b1c58: 0x10b1c58: beq   s1, v0, 0x10b1ca0 sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	beq  L_10b1658
+	beq  L_10b1ca0
 // --- basic block ---
-L_10b1618:
-// 0x010b1618: 0x10b1618: addu  a0, s1, zero
+L_10b1c60:
+// 0x010b1c60: 0x10b1c60: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b161c: 0x10b161c: addu  a1, s0, zero
+// 0x010b1c64: 0x10b1c64: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010b1620: 0x10b1620: jal   0x10b1280 addiu a2, zero, -1
+// 0x010b1c68: 0x10b1c68: jal   0x10b18c8 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -5893,49 +5893,49 @@ L_10b1618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::T_155_10b1280(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::T_155_10b18c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b1628: 0x10b1628: addiu v1, zero, -1
+// 0x010b1c70: 0x10b1c70: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b162c: 0x10b162c: beq   v0, v1, 0x10b1658 addiu v1, zero, 4
+// 0x010b1c74: 0x10b1c74: beq   v0, v1, 0x10b1ca0 addiu v1, zero, 4
 	ldloc 6
 	ldloc 7
 	ldc.i4.4
 	stloc 7
-	beq  L_10b1658
+	beq  L_10b1ca0
 // --- basic block ---
-// 0x010b1634: 0x10b1634: beq   s8, v1, 0x10b164c lui   a0, 0x90000
+// 0x010b1c7c: 0x10b1c7c: beq   s8, v1, 0x10b1c94 lui   a0, 0x90000
 	ldloc 16
 	ldloc 7
 	ldc.i4 589824
 	stloc.1
-	beq  L_10b164c
+	beq  L_10b1c94
 // --- basic block ---
-// 0x010b163c: 0x10b163c: lw    v1, -11592(a0)
+// 0x010b1c84: 0x10b1c84: lw    v1, -11128(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b1640: 0x10b1640: sll   zero, zero, 0
-// 0x010b1644: 0x10b1644: bne   v1, zero, 0x10b165c addu  s1, s0, zero
+// 0x010b1c88: 0x10b1c88: sll   zero, zero, 0
+// 0x010b1c8c: 0x10b1c8c: bne   v1, zero, 0x10b1ca4 addu  s1, s0, zero
 	ldloc 7
 	ldloc 9
 	stloc 8
-	brtrue L_10b165c
+	brtrue L_10b1ca4
 // --- basic block ---
-L_10b164c:
-// 0x010b164c: 0x10b164c: addu  a0, v0, zero
+L_10b1c94:
+// 0x010b1c94: 0x10b1c94: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010b1650: 0x10b1650: jal   0x10b5bc4 addiu a1, zero, 8
+// 0x010b1c98: 0x10b1c98: jal   0x10b620c addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -5943,28 +5943,28 @@ L_10b164c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_set_flag_10b5bc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_set_flag_10b620c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b1658:
-// 0x010b1658: 0x10b1658: addu  s1, s0, zero
+L_10b1ca0:
+// 0x010b1ca0: 0x10b1ca0: addu  s1, s0, zero
 	ldloc 9
 	stloc 8
-L_10b165c:
-// 0x010b165c: 0x10b165c: addiu s4, s4, 1
+L_10b1ca4:
+// 0x010b1ca4: 0x10b1ca4: addiu s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010b1660: 0x10b1660: addiu s5, s5, 8
+// 0x010b1ca8: 0x10b1ca8: addiu s5, s5, 8
 	ldloc 13
 	ldc.i4.8
 	add
 	stloc 13
-L_10b1664:
-// 0x010b1664: 0x10b1664: lw    v1, 100(sp)
+L_10b1cac:
+// 0x010b1cac: 0x10b1cac: lw    v1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5973,17 +5973,17 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b1668: 0x10b1668: sll   zero, zero, 0
-// 0x010b166c: 0x10b166c: slt   v0, s4, v1
+// 0x010b1cb0: 0x10b1cb0: sll   zero, zero, 0
+// 0x010b1cb4: 0x10b1cb4: slt   v0, s4, v1
 	ldloc 12
 	ldloc 7
 	clt
 	stloc 6
-// 0x010b1670: 0x10b1670: bne   v0, zero, 0x10b1480 sll   zero, zero, 0
+// 0x010b1cb8: 0x10b1cb8: bne   v0, zero, 0x10b1ac8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b1480
+	brtrue L_10b1ac8
 // --- basic block ---
-// 0x010b1678: 0x10b1678: jal   0x10b0cd8 addu  a0, s1, zero
+// 0x010b1cc0: 0x10b1cc0: jal   0x10b1320 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5991,13 +5991,13 @@ L_10b1664:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_reset_points_10b1320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b1680: 0x10b1680: lw    ra, 92(sp)
-// 0x010b1684: 0x10b1684: lw    s8, 88(sp)
+// 0x010b1cc8: 0x10b1cc8: lw    ra, 92(sp)
+// 0x010b1ccc: 0x10b1ccc: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6006,7 +6006,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b1688: 0x10b1688: lw    s7, 84(sp)
+// 0x010b1cd0: 0x10b1cd0: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6015,7 +6015,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b168c: 0x10b168c: lw    s6, 80(sp)
+// 0x010b1cd4: 0x10b1cd4: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6024,7 +6024,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b1690: 0x10b1690: lw    s5, 76(sp)
+// 0x010b1cd8: 0x10b1cd8: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6033,7 +6033,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b1694: 0x10b1694: lw    s4, 72(sp)
+// 0x010b1cdc: 0x10b1cdc: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6042,7 +6042,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b1698: 0x10b1698: lw    s3, 68(sp)
+// 0x010b1ce0: 0x10b1ce0: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6051,7 +6051,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b169c: 0x10b169c: lw    s2, 64(sp)
+// 0x010b1ce4: 0x10b1ce4: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6060,7 +6060,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b16a0: 0x10b16a0: lw    s1, 60(sp)
+// 0x010b1ce8: 0x10b1ce8: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6069,7 +6069,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b16a4: 0x10b16a4: lw    s0, 56(sp)
+// 0x010b1cec: 0x10b1cec: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6078,7 +6078,7 @@ L_10b1664:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b16a8: 0x10b16a8: jr    ra addiu sp, sp, 96
+// 0x010b1cf0: 0x10b1cf0: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -6090,7 +6090,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_force_reset_10b16b0(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_force_reset_10b1cf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -6128,30 +6128,30 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b16b0: 0x10b16b0: lui   v0, 0x90000
+// 0x010b1cf8: 0x10b1cf8: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b16b4: 0x10b16b4: lw    a1, -11584(v0)
+// 0x010b1cfc: 0x10b1cfc: lw    a1, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b16b8: 0x10b16b8: addiu sp, sp, -40
+// 0x010b1d00: 0x10b1d00: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b16bc: 0x10b16bc: slti  v0, a1, 2
+// 0x010b1d04: 0x10b1d04: slti  v0, a1, 2
 	ldloc.2
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010b16c0: 0x10b16c0: sw    ra, 36(sp)
-// 0x010b16c4: 0x10b16c4: bne   v0, zero, 0x10b1738 sw    s0, 32(sp)
+// 0x010b1d08: 0x10b1d08: sw    ra, 36(sp)
+// 0x010b1d0c: 0x10b1d0c: bne   v0, zero, 0x10b1d80 sw    s0, 32(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6161,33 +6161,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_10b1738
+	brtrue L_10b1d80
 // --- basic block ---
-// 0x010b16cc: 0x10b16cc: lui   s0, 0x90000
+// 0x010b1d14: 0x10b1d14: lui   s0, 0x90000
 	ldc.i4 589824
 	stloc 8
-// 0x010b16d0: 0x10b16d0: lw    v0, -11576(s0)
+// 0x010b1d18: 0x10b1d18: lw    v0, -11112(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b16d4: 0x10b16d4: sll   zero, zero, 0
-// 0x010b16d8: 0x10b16d8: beq   v0, zero, 0x10b1704 lui   a3, 0x0
+// 0x010b1d1c: 0x10b1d1c: sll   zero, zero, 0
+// 0x010b1d20: 0x10b1d20: beq   v0, zero, 0x10b1d4c lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_10b1704
+	brfalse L_10b1d4c
 // --- basic block ---
-// 0x010b16e0: 0x10b16e0: addiu v0, a1, -1
+// 0x010b1d28: 0x10b1d28: addiu v0, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010b16e4: 0x10b16e4: sw    v0, 28(sp)
+// 0x010b1d2c: 0x10b1d2c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6196,18 +6196,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b16e8: 0x10b16e8: addiu a0, sp, 24
+// 0x010b1d30: 0x10b1d30: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010b16ec: 0x10b16ec: addiu v0, zero, 1
+// 0x010b1d34: 0x10b1d34: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010b16f0: 0x10b16f0: addiu a1, zero, 1
+// 0x010b1d38: 0x10b1d38: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010b16f4: 0x10b16f4: jal   0x10b1404 sw    v0, 24(sp)
+// 0x010b1d3c: 0x10b1d3c: jal   0x10b1a4c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6221,24 +6221,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::end_unknown_segments_10b1404(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::end_unknown_segments_10b1a4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b16fc: 0x10b16fc: j	 0x10b1738 sw    zero, -11576(s0)
+// 0x010b1d44: 0x10b1d44: j	 0x10b1d80 sw    zero, -11112(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b1738
+	br L_10b1d80
 // --- basic block ---
-L_10b1704:
-// 0x010b1704: 0x10b1704: lw    v0, 18904(a3)
+L_10b1d4c:
+// 0x010b1d4c: 0x10b1d4c: lw    v0, 18904(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -6247,17 +6247,17 @@ L_10b1704:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1708: 0x10b1708: sll   zero, zero, 0
-// 0x010b170c: 0x10b170c: beq   v0, zero, 0x10b173c lui   a0, 0x0
+// 0x010b1d50: 0x10b1d50: sll   zero, zero, 0
+// 0x010b1d54: 0x10b1d54: beq   v0, zero, 0x10b1d84 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10b173c
+	brfalse L_10b1d84
 // --- basic block ---
-// 0x010b1714: 0x10b1714: lui   v0, 0x0
+// 0x010b1d5c: 0x10b1d5c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1718: 0x10b1718: lw    v0, 19040(v0)
+// 0x010b1d60: 0x10b1d60: lw    v0, 19040(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6266,30 +6266,30 @@ L_10b1704:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b171c: 0x10b171c: lui   a2, 0x0
+// 0x010b1d64: 0x10b1d64: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010b1720: 0x10b1720: addiu a0, a0, 19044
+// 0x010b1d68: 0x10b1d68: addiu a0, a0, 19044
 	ldloc.1
 	ldc.i4 19044
 	add
 	stloc.1
-// 0x010b1724: 0x10b1724: addiu a1, a1, -1
+// 0x010b1d6c: 0x10b1d6c: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x010b1728: 0x10b1728: addiu a2, a2, 18980
+// 0x010b1d70: 0x10b1d70: addiu a2, a2, 18980
 	ldloc.3
 	ldc.i4 18980
 	add
 	stloc.3
-// 0x010b172c: 0x10b172c: addiu a3, a3, 18904
+// 0x010b1d74: 0x10b1d74: addiu a3, a3, 18904
 	ldloc 4
 	ldc.i4 18904
 	add
 	stloc 4
-// 0x010b1730: 0x10b1730: jal   0x10ae0a4 sw    v0, 16(sp)
+// 0x010b1d78: 0x10b1d78: jal   0x10ae6ec sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6303,30 +6303,30 @@ L_10b1704:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_known_end_segment_10ae0a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_known_end_segment_10ae6ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b1738:
-// 0x010b1738: 0x10b1738: lui   a0, 0x0
+L_10b1d80:
+// 0x010b1d80: 0x10b1d80: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_10b173c:
-// 0x010b173c: 0x10b173c: lui   a1, 0x0
+L_10b1d84:
+// 0x010b1d84: 0x10b1d84: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b1740: 0x10b1740: addiu a0, a0, 19044
+// 0x010b1d88: 0x10b1d88: addiu a0, a0, 19044
 	ldloc.1
 	ldc.i4 19044
 	add
 	stloc.1
-// 0x010b1744: 0x10b1744: addiu a1, a1, 18980
+// 0x010b1d8c: 0x10b1d8c: addiu a1, a1, 18980
 	ldloc.2
 	ldc.i4 18980
 	add
 	stloc.2
-// 0x010b1748: 0x10b1748: jal   0x1001800 addiu a2, zero, 48
+// 0x010b1d90: 0x10b1d90: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -6338,10 +6338,10 @@ L_10b173c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1750: 0x10b1750: lui   v0, 0x0
+// 0x010b1d98: 0x10b1d98: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1754: 0x10b1754: jal   0x10ad1ec sw    zero, 18904(v0)
+// 0x010b1d9c: 0x10b1d9c: jal   0x10ad834 sw    zero, 18904(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6350,40 +6350,40 @@ L_10b173c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl129::editor_track_known_reset_resolve_10ad1ec()
+	call int32 Cibyl129::editor_track_known_reset_resolve_10ad834()
 	stloc 5
 // --- basic block ---
-// 0x010b175c: 0x10b175c: lui   v0, 0x90000
+// 0x010b1da4: 0x10b1da4: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b1760: 0x10b1760: lw    a0, -11584(v0)
+// 0x010b1da8: 0x10b1da8: lw    a0, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1764: 0x10b1764: jal   0x10b0cd8 sll   zero, zero, 0
+// 0x010b1dac: 0x10b1dac: jal   0x10b1320 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_reset_points_10b1320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b176c: 0x10b176c: lw    ra, 36(sp)
-// 0x010b1770: 0x10b1770: addiu v1, zero, -1
+// 0x010b1db4: 0x10b1db4: lw    ra, 36(sp)
+// 0x010b1db8: 0x10b1db8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b1774: 0x10b1774: lui   v0, 0x0
+// 0x010b1dbc: 0x10b1dbc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1778: 0x10b1778: lw    s0, 32(sp)
+// 0x010b1dc0: 0x10b1dc0: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6392,7 +6392,7 @@ L_10b173c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b177c: 0x10b177c: sw    v1, 19032(v0)
+// 0x010b1dc4: 0x10b1dc4: sw    v1, 19032(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6401,7 +6401,7 @@ L_10b173c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b1780: 0x10b1780: jr    ra addiu sp, sp, 40
+// 0x010b1dc8: 0x10b1dc8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6413,7 +6413,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_end_10b1788(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_end_10b1dd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6448,31 +6448,31 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b1788: 0x10b1788: addiu sp, sp, -24
+// 0x010b1dd0: 0x10b1dd0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b178c: 0x10b178c: sw    ra, 20(sp)
-// 0x010b1790: 0x10b1790: jal   0x10b16b0 sll   zero, zero, 0
+// 0x010b1dd4: 0x10b1dd4: sw    ra, 20(sp)
+// 0x010b1dd8: 0x10b1dd8: jal   0x10b1cf8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_force_reset_10b16b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_force_reset_10b1cf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1798: 0x10b1798: lw    ra, 20(sp)
-// 0x010b179c: 0x10b179c: addiu v1, zero, 1
+// 0x010b1de0: 0x10b1de0: lw    ra, 20(sp)
+// 0x010b1de4: 0x10b1de4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010b17a0: 0x10b17a0: lui   v0, 0x0
+// 0x010b1de8: 0x10b1de8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b17a4: 0x10b17a4: sw    v1, 19040(v0)
+// 0x010b1dec: 0x10b1dec: sw    v1, 19040(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -6481,7 +6481,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b17a8: 0x10b17a8: jr    ra addiu sp, sp, 24
+// 0x010b1df0: 0x10b1df0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6493,7 +6493,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 track_rec_locate_point_10b17b0(int32,int32,int32,int32,int32)
+.method public static int32 track_rec_locate_point_10b1df8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s3,int32 s1,int32 s2,int32 s6,int32 s4,int32 s5,int32 s8,int32 s7,int32 ra)
@@ -6555,12 +6555,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b17b0: 0x10b17b0: addiu sp, sp, -304
+// 0x010b1df8: 0x10b1df8: addiu sp, sp, -304
 	ldloc.0
 	ldc.i4 -304
 	add
 	stloc.0
-// 0x010b17b4: 0x10b17b4: sw    s0, 264(sp)
+// 0x010b1dfc: 0x10b1dfc: sw    s0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6569,19 +6569,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b17b8: 0x10b17b8: lui   s0, 0x90000
+// 0x010b1e00: 0x10b1e00: lui   s0, 0x90000
 	ldc.i4 589824
 	stloc 8
-// 0x010b17bc: 0x10b17bc: lw    v0, -11576(s0)
+// 0x010b1e04: 0x10b1e04: lw    v0, -11112(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b17c0: 0x10b17c0: sw    s8, 296(sp)
+// 0x010b1e08: 0x10b1e08: sw    s8, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6590,8 +6590,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b17c4: 0x10b17c4: sw    ra, 300(sp)
-// 0x010b17c8: 0x10b17c8: sw    s7, 292(sp)
+// 0x010b1e0c: 0x10b1e0c: sw    ra, 300(sp)
+// 0x010b1e10: 0x10b1e10: sw    s7, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6600,7 +6600,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b17cc: 0x10b17cc: sw    s6, 288(sp)
+// 0x010b1e14: 0x10b1e14: sw    s6, 288(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6609,7 +6609,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b17d0: 0x10b17d0: sw    s5, 284(sp)
+// 0x010b1e18: 0x10b1e18: sw    s5, 284(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6618,7 +6618,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b17d4: 0x10b17d4: sw    s4, 280(sp)
+// 0x010b1e1c: 0x10b1e1c: sw    s4, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6627,7 +6627,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b17d8: 0x10b17d8: sw    s3, 276(sp)
+// 0x010b1e20: 0x10b1e20: sw    s3, 276(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6636,7 +6636,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b17dc: 0x10b17dc: sw    s2, 272(sp)
+// 0x010b1e24: 0x10b1e24: sw    s2, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6645,7 +6645,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b17e0: 0x10b17e0: sw    s1, 268(sp)
+// 0x010b1e28: 0x10b1e28: sw    s1, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6654,7 +6654,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b17e4: 0x10b17e4: sw    a1, 308(sp)
+// 0x010b1e2c: 0x10b1e2c: sw    a1, 308(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6663,36 +6663,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b17e8: 0x10b17e8: bne   v0, zero, 0x10b1e5c addu  s8, a0, zero
+// 0x010b1e30: 0x10b1e30: bne   v0, zero, 0x10b24a4 addu  s8, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 15
-	brtrue L_10b1e5c
+	brtrue L_10b24a4
 // --- basic block ---
-// 0x010b17f0: 0x10b17f0: lui   v0, 0x0
+// 0x010b1e38: 0x10b1e38: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b17f4: 0x10b17f4: lui   s5, 0x0
+// 0x010b1e3c: 0x10b1e3c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x010b17f8: 0x10b17f8: addiu s0, v0, 18980
+// 0x010b1e40: 0x10b1e40: addiu s0, v0, 18980
 	ldloc 5
 	ldc.i4 18980
 	add
 	stloc 8
-// 0x010b17fc: 0x10b17fc: addiu s2, s5, 18904
+// 0x010b1e44: 0x10b1e44: addiu s2, s5, 18904
 	ldloc 14
 	ldc.i4 18904
 	add
 	stloc 11
-// 0x010b1800: 0x10b1800: addu  s4, s0, zero
+// 0x010b1e48: 0x10b1e48: addu  s4, s0, zero
 	ldloc 8
 	stloc 13
-// 0x010b1804: 0x10b1804: lui   s7, 0x0
+// 0x010b1e4c: 0x10b1e4c: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 16
-L_10b1808:
-// 0x010b1808: 0x10b1808: lw    v0, 18904(s5)
+L_10b1e50:
+// 0x010b1e50: 0x10b1e50: lw    v0, 18904(s5)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -6701,20 +6701,20 @@ L_10b1808:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b180c: 0x10b180c: sll   zero, zero, 0
-// 0x010b1810: 0x10b1810: bne   v0, zero, 0x10b1820 addiu s6, zero, -1
+// 0x010b1e54: 0x10b1e54: sll   zero, zero, 0
+// 0x010b1e58: 0x10b1e58: bne   v0, zero, 0x10b1e68 addiu s6, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 12
-	brtrue L_10b1820
+	brtrue L_10b1e68
 // --- basic block ---
-// 0x010b1818: 0x10b1818: j	 0x10b1828 addiu s3, zero, -1
+// 0x010b1e60: 0x10b1e60: j	 0x10b1e70 addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 9
-	br L_10b1828
+	br L_10b1e70
 // --- basic block ---
-L_10b1820:
-// 0x010b1820: 0x10b1820: lw    s3, 12(s0)
+L_10b1e68:
+// 0x010b1e68: 0x10b1e68: lw    s3, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6723,7 +6723,7 @@ L_10b1820:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b1824: 0x10b1824: lw    s6, 4(s0)
+// 0x010b1e6c: 0x10b1e6c: lw    s6, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6732,35 +6732,35 @@ L_10b1820:
 	add
 	ldelem.i4
 	stloc 12
-L_10b1828:
-// 0x010b1828: 0x10b1828: lui   a1, 0xe0000
+L_10b1e70:
+// 0x010b1e70: 0x10b1e70: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010b182c: 0x10b182c: addiu v1, sp, 100
+// 0x010b1e74: 0x10b1e74: addiu v1, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc 6
-// 0x010b1830: 0x10b1830: addiu v0, sp, 52
+// 0x010b1e78: 0x10b1e78: addiu v0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 5
-// 0x010b1834: 0x10b1834: addu  a0, s8, zero
+// 0x010b1e7c: 0x10b1e7c: addu  a0, s8, zero
 	ldloc 15
 	stloc.1
-// 0x010b1838: 0x10b1838: addiu a1, a1, -19240
+// 0x010b1e80: 0x10b1e80: addiu a1, a1, -18776
 	ldloc.2
-	ldc.i4 -19240
+	ldc.i4 -18776
 	add
 	stloc.2
-// 0x010b183c: 0x10b183c: addu  a2, s2, zero
+// 0x010b1e84: 0x10b1e84: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x010b1840: 0x10b1840: addu  a3, s0, zero
+// 0x010b1e88: 0x10b1e88: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x010b1844: 0x10b1844: sw    v1, 16(sp)
+// 0x010b1e8c: 0x10b1e8c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6769,7 +6769,7 @@ L_10b1828:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b1848: 0x10b1848: jal   0x10ad1f8 sw    v0, 20(sp)
+// 0x010b1e90: 0x10b1e90: jal   0x10ad840 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6783,36 +6783,36 @@ L_10b1828:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_track_known_locate_point_10ad1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_track_known_locate_point_10ad840(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1850: 0x10b1850: beq   v0, zero, 0x10b1cc0 addu  s1, v0, zero
+// 0x010b1e98: 0x10b1e98: beq   v0, zero, 0x10b2308 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_10b1cc0
+	brfalse L_10b2308
 // --- basic block ---
-// 0x010b1858: 0x10b1858: addiu v1, zero, -1
+// 0x010b1ea0: 0x10b1ea0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b185c: 0x10b185c: bne   v0, v1, 0x10b189c lui   a0, 0x90000
+// 0x010b1ea4: 0x10b1ea4: bne   v0, v1, 0x10b1ee4 lui   a0, 0x90000
 	ldloc 5
 	ldloc 6
 	ldc.i4 589824
 	stloc.1
-	bne.un L_10b189c
+	bne.un L_10b1ee4
 // --- basic block ---
-// 0x010b1864: 0x10b1864: addiu a1, sp, 52
+// 0x010b1eac: 0x10b1eac: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010b1868: 0x10b1868: addiu a2, zero, 48
+// 0x010b1eb0: 0x10b1eb0: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010b186c: 0x10b186c: jal   0x1001800 addu  a0, s4, zero
+// 0x010b1eb4: 0x10b1eb4: jal   0x1001800 addu  a0, s4, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
@@ -6824,15 +6824,15 @@ L_10b1828:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1874: 0x10b1874: addu  a0, s2, zero
+// 0x010b1ebc: 0x10b1ebc: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010b1878: 0x10b1878: addiu a1, sp, 100
+// 0x010b1ec0: 0x10b1ec0: addiu a1, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc.2
-// 0x010b187c: 0x10b187c: jal   0x1001800 addiu a2, zero, 76
+// 0x010b1ec4: 0x10b1ec4: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -6844,18 +6844,18 @@ L_10b1828:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1884: 0x10b1884: lui   v1, 0x0
+// 0x010b1ecc: 0x10b1ecc: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b1888: 0x10b1888: addiu v1, v1, 19028
+// 0x010b1ed0: 0x10b1ed0: addiu v1, v1, 19028
 	ldloc 6
 	ldc.i4 19028
 	add
 	stloc 6
-// 0x010b188c: 0x10b188c: addiu v0, zero, 1
+// 0x010b1ed4: 0x10b1ed4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010b1890: 0x10b1890: sw    s1, 4(v1)
+// 0x010b1ed8: 0x10b1ed8: sw    s1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6864,7 +6864,7 @@ L_10b1828:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b1894: 0x10b1894: j	 0x10b1e28 sw    v0, 19040(s7)
+// 0x010b1edc: 0x10b1edc: j	 0x10b2470 sw    v0, 19040(s7)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -6873,19 +6873,19 @@ L_10b1828:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10b1e28
+	br L_10b2470
 // --- basic block ---
-L_10b189c:
-// 0x010b189c: 0x10b189c: lw    a0, -11584(a0)
+L_10b1ee4:
+// 0x010b1ee4: 0x10b1ee4: lw    a0, -11120(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b18a0: 0x10b18a0: lw    v0, 18904(s5)
+// 0x010b1ee8: 0x10b1ee8: lw    v0, 18904(s5)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -6894,8 +6894,8 @@ L_10b189c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b18a4: 0x10b18a4: sll   zero, zero, 0
-// 0x010b18a8: 0x10b18a8: bne   v0, zero, 0x10b18d8 sw    a0, 256(sp)
+// 0x010b1eec: 0x10b1eec: sll   zero, zero, 0
+// 0x010b1ef0: 0x10b1ef0: bne   v0, zero, 0x10b1f20 sw    a0, 256(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -6905,17 +6905,17 @@ L_10b189c:
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_10b18d8
+	brtrue L_10b1f20
 // --- basic block ---
-// 0x010b18b0: 0x10b18b0: addiu a1, sp, 52
+// 0x010b1ef8: 0x10b1ef8: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010b18b4: 0x10b18b4: addiu a2, zero, 48
+// 0x010b1efc: 0x10b1efc: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010b18b8: 0x10b18b8: jal   0x1001800 addu  a0, s4, zero
+// 0x010b1f00: 0x10b1f00: jal   0x1001800 addu  a0, s4, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
@@ -6927,15 +6927,15 @@ L_10b189c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b18c0: 0x10b18c0: addu  a0, s2, zero
+// 0x010b1f08: 0x10b1f08: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010b18c4: 0x10b18c4: addiu a1, sp, 100
+// 0x010b1f0c: 0x10b1f0c: addiu a1, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc.2
-// 0x010b18c8: 0x10b18c8: jal   0x1001800 addiu a2, zero, 76
+// 0x010b1f10: 0x10b1f10: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -6947,13 +6947,13 @@ L_10b189c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b18d0: 0x10b18d0: j	 0x10b1ba4 addu  s3, s1, zero
+// 0x010b1f18: 0x10b1f18: j	 0x10b21ec addu  s3, s1, zero
 	ldloc 10
 	stloc 9
-	br L_10b1ba4
+	br L_10b21ec
 // --- basic block ---
-L_10b18d8:
-// 0x010b18d8: 0x10b18d8: lw    s3, 16(s4)
+L_10b1f20:
+// 0x010b1f20: 0x10b1f20: lw    s3, 16(s4)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -6962,7 +6962,7 @@ L_10b18d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b18dc: 0x10b18dc: sw    v1, 260(sp)
+// 0x010b1f24: 0x10b1f24: sw    v1, 260(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6971,7 +6971,7 @@ L_10b18d8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b18e0: 0x10b18e0: jal   0x10b79b4 addu  a0, s3, zero
+// 0x010b1f28: 0x10b1f28: jal   0x10b7ffc addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6979,12 +6979,12 @@ L_10b18d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b18e8: 0x10b18e8: lw    v1, 260(sp)
+// 0x010b1f30: 0x10b1f30: lw    v1, 260(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6993,21 +6993,21 @@ L_10b18d8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b18ec: 0x10b18ec: sll   zero, zero, 0
-// 0x010b18f0: 0x10b18f0: bne   v0, v1, 0x10b195c addu  s6, v0, zero
+// 0x010b1f34: 0x10b1f34: sll   zero, zero, 0
+// 0x010b1f38: 0x10b1f38: bne   v0, v1, 0x10b1fa4 addu  s6, v0, zero
 	ldloc 5
 	ldloc 6
 	ldloc 5
 	stloc 12
-	bne.un L_10b195c
+	bne.un L_10b1fa4
 // --- basic block ---
-// 0x010b18f8: 0x10b18f8: jal   0x10b6a10 addu  a0, s3, zero
+// 0x010b1f40: 0x10b1f40: jal   0x10b7058 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-	call int32 Cibyl136::editor_db_create_10b6a10()
+	call int32 Cibyl136::editor_db_create_10b7058()
 	stloc 5
 // --- basic block ---
-// 0x010b1900: 0x10b1900: jal   0x10b79b4 addu  a0, s3, zero
+// 0x010b1f48: 0x10b1f48: jal   0x10b7ffc addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7015,35 +7015,35 @@ L_10b18d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1908: 0x10b1908: bne   v0, s6, 0x10b195c lui   a3, 0x20000
+// 0x010b1f50: 0x10b1f50: bne   v0, s6, 0x10b1fa4 lui   a3, 0x20000
 	ldloc 5
 	ldloc 12
 	ldc.i4 131072
 	stloc 4
-	bne.un L_10b195c
+	bne.un L_10b1fa4
 // --- basic block ---
-// 0x010b1910: 0x10b1910: lui   a1, 0x20000
+// 0x010b1f58: 0x10b1f58: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b1914: 0x10b1914: addiu a3, a3, 18720
+// 0x010b1f5c: 0x10b1f5c: addiu a3, a3, 19180
 	ldloc 4
-	ldc.i4 18720
+	ldc.i4 19180
 	add
 	stloc 4
-// 0x010b1918: 0x10b1918: addiu a2, zero, 435
+// 0x010b1f60: 0x10b1f60: addiu a2, zero, 435
 	ldc.i4 435
 	stloc.3
-// 0x010b191c: 0x10b191c: addiu a1, a1, 18640
+// 0x010b1f64: 0x10b1f64: addiu a1, a1, 19100
 	ldloc.2
-	ldc.i4 18640
+	ldc.i4 19100
 	add
 	stloc.2
-// 0x010b1920: 0x10b1920: jal   0x100449c addiu a0, zero, 4
+// 0x010b1f68: 0x10b1f68: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -7056,7 +7056,7 @@ L_10b18d8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1928: 0x10b1928: jal   0x10b0cd8 addiu a0, zero, -1
+// 0x010b1f70: 0x10b1f70: jal   0x10b1320 addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.0
@@ -7064,20 +7064,20 @@ L_10b18d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_reset_points_10b1320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1930: 0x10b1930: addu  a0, s4, zero
+// 0x010b1f78: 0x10b1f78: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010b1934: 0x10b1934: addiu a1, sp, 52
+// 0x010b1f7c: 0x10b1f7c: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010b1938: 0x10b1938: jal   0x1001800 addiu a2, zero, 48
+// 0x010b1f80: 0x10b1f80: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -7089,15 +7089,15 @@ L_10b18d8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1940: 0x10b1940: addu  a0, s2, zero
+// 0x010b1f88: 0x10b1f88: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010b1944: 0x10b1944: addiu a1, sp, 100
+// 0x010b1f8c: 0x10b1f8c: addiu a1, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc.2
-// 0x010b1948: 0x10b1948: jal   0x1001800 addiu a2, zero, 76
+// 0x010b1f90: 0x10b1f90: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -7109,7 +7109,7 @@ L_10b18d8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1950: 0x10b1950: lw    v1, 256(sp)
+// 0x010b1f98: 0x10b1f98: lw    v1, 256(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7118,15 +7118,15 @@ L_10b18d8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1954: 0x10b1954: j	 0x10b1ba4 addiu s3, v1, -1
+// 0x010b1f9c: 0x10b1f9c: j	 0x10b21ec addiu s3, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 9
-	br L_10b1ba4
+	br L_10b21ec
 // --- basic block ---
-L_10b195c:
-// 0x010b195c: 0x10b195c: lw    v0, 100(sp)
+L_10b1fa4:
+// 0x010b1fa4: 0x10b1fa4: lw    v0, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7135,12 +7135,12 @@ L_10b195c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1960: 0x10b1960: sll   zero, zero, 0
-// 0x010b1964: 0x10b1964: beq   v0, zero, 0x10b1af4 sll   zero, zero, 0
+// 0x010b1fa8: 0x10b1fa8: sll   zero, zero, 0
+// 0x010b1fac: 0x10b1fac: beq   v0, zero, 0x10b213c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1af4
+	brfalse L_10b213c
 // --- basic block ---
-// 0x010b196c: 0x10b196c: lw    v0, 18904(s5)
+// 0x010b1fb4: 0x10b1fb4: lw    v0, 18904(s5)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -7149,17 +7149,17 @@ L_10b195c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1970: 0x10b1970: sll   zero, zero, 0
-// 0x010b1974: 0x10b1974: beq   v0, zero, 0x10b1a60 lui   v1, 0x90000
+// 0x010b1fb8: 0x10b1fb8: sll   zero, zero, 0
+// 0x010b1fbc: 0x10b1fbc: beq   v0, zero, 0x10b20a8 lui   v1, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 6
-	brfalse L_10b1a60
+	brfalse L_10b20a8
 // --- basic block ---
-// 0x010b197c: 0x10b197c: lui   v1, 0x0
+// 0x010b1fc4: 0x10b1fc4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b1980: 0x10b1980: lw    v0, 18980(v1)
+// 0x010b1fc8: 0x10b1fc8: lw    v0, 18980(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7168,34 +7168,34 @@ L_10b195c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1984: 0x10b1984: sll   zero, zero, 0
-// 0x010b1988: 0x10b1988: bne   v0, zero, 0x10b1a60 lui   v1, 0x90000
+// 0x010b1fcc: 0x10b1fcc: sll   zero, zero, 0
+// 0x010b1fd0: 0x10b1fd0: bne   v0, zero, 0x10b20a8 lui   v1, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 6
-	brtrue L_10b1a60
+	brtrue L_10b20a8
 // --- basic block ---
-// 0x010b1990: 0x10b1990: jal   0x10bd6dc sll   zero, zero, 0
+// 0x010b1fd8: 0x10b1fd8: jal   0x10bdd24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1998: 0x10b1998: beq   v0, zero, 0x10b1a60 lui   v1, 0x90000
+// 0x010b1fe0: 0x10b1fe0: beq   v0, zero, 0x10b20a8 lui   v1, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 6
-	brfalse L_10b1a60
+	brfalse L_10b20a8
 // --- basic block ---
-// 0x010b19a0: 0x10b19a0: lui   v0, 0x0
+// 0x010b1fe8: 0x10b1fe8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b19a4: 0x10b19a4: lw    v0, 576(v0)
+// 0x010b1fec: 0x10b1fec: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7204,7 +7204,7 @@ L_10b195c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b19a8: 0x10b19a8: lw    a0, 12(s0)
+// 0x010b1ff0: 0x10b1ff0: lw    a0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7213,30 +7213,30 @@ L_10b195c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b19ac: 0x10b19ac: sll   zero, zero, 0
-// 0x010b19b0: 0x10b19b0: beq   a0, v0, 0x10b19c8 sll   zero, zero, 0
+// 0x010b1ff4: 0x10b1ff4: sll   zero, zero, 0
+// 0x010b1ff8: 0x10b1ff8: beq   a0, v0, 0x10b2010 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b19c8
+	beq  L_10b2010
 // --- basic block ---
-// 0x010b19b8: 0x10b19b8: bltz  a0, 0x10b19c8 sll   zero, zero, 0
+// 0x010b2000: 0x10b2000: bltz  a0, 0x10b2010 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b19c8
+	blt L_10b2010
 // --- basic block ---
-// 0x010b19c0: 0x10b19c0: jal   0x100b164 sll   zero, zero, 0
+// 0x010b2008: 0x10b2008: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b19c8:
-// 0x010b19c8: 0x10b19c8: lw    a0, 4(s0)
+L_10b2010:
+// 0x010b2010: 0x10b2010: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7245,18 +7245,18 @@ L_10b19c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b19cc: 0x10b19cc: jal   0x1004ae4 sll   zero, zero, 0
+// 0x010b2014: 0x10b2014: jal   0x1004af4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004ae4(int32)
+	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004af4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b19d4: 0x10b19d4: beq   v0, zero, 0x10b1a54 sll   zero, zero, 0
+// 0x010b201c: 0x10b201c: beq   v0, zero, 0x10b209c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1a54
+	brfalse L_10b209c
 // --- basic block ---
-// 0x010b19dc: 0x10b19dc: lw    a0, 4(s0)
+// 0x010b2024: 0x10b2024: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7265,7 +7265,7 @@ L_10b19c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b19e0: 0x10b19e0: lw    a1, 12(s0)
+// 0x010b2028: 0x10b2028: lw    a1, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7274,7 +7274,7 @@ L_10b19c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b19e4: 0x10b19e4: jal   0x10b6804 addiu a2, sp, 32
+// 0x010b202c: 0x10b202c: jal   0x10b6e4c addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -7284,22 +7284,22 @@ L_10b19c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_get_flags_10b6804(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_get_flags_10b6e4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b19ec: 0x10b19ec: addiu v1, zero, -1
+// 0x010b2034: 0x10b2034: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b19f0: 0x10b19f0: bne   v0, v1, 0x10b1a60 lui   v1, 0x90000
+// 0x010b2038: 0x10b2038: bne   v0, v1, 0x10b20a8 lui   v1, 0x90000
 	ldloc 5
 	ldloc 6
 	ldc.i4 589824
 	stloc 6
-	bne.un L_10b1a60
+	bne.un L_10b20a8
 // --- basic block ---
-// 0x010b19f8: 0x10b19f8: lw    a0, 4(s0)
+// 0x010b2040: 0x10b2040: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7308,7 +7308,7 @@ L_10b19c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b19fc: 0x10b19fc: jal   0x100405c sll   zero, zero, 0
+// 0x010b2044: 0x10b2044: jal   0x100405c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7319,14 +7319,14 @@ L_10b19c8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1a04: 0x10b1a04: blez  v0, 0x10b1a60 lui   v1, 0x90000
+// 0x010b204c: 0x10b204c: blez  v0, 0x10b20a8 lui   v1, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 6
 	ldc.i4.s 0
-	ble L_10b1a60
+	ble L_10b20a8
 // --- basic block ---
-// 0x010b1a0c: 0x10b1a0c: jal   0x10aca54 addu  a0, v0, zero
+// 0x010b2054: 0x10b2054: jal   0x10ad09c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7334,15 +7334,15 @@ L_10b19c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_10aca54(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_10ad09c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1a14: 0x10b1a14: lui   v0, 0x0
+// 0x010b205c: 0x10b205c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1a18: 0x10b1a18: lw    v0, 576(v0)
+// 0x010b2060: 0x10b2060: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7351,7 +7351,7 @@ L_10b19c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1a1c: 0x10b1a1c: lw    a0, 12(s0)
+// 0x010b2064: 0x10b2064: lw    a0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7360,30 +7360,30 @@ L_10b19c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1a20: 0x10b1a20: sll   zero, zero, 0
-// 0x010b1a24: 0x10b1a24: beq   a0, v0, 0x10b1a3c sll   zero, zero, 0
+// 0x010b2068: 0x10b2068: sll   zero, zero, 0
+// 0x010b206c: 0x10b206c: beq   a0, v0, 0x10b2084 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b1a3c
+	beq  L_10b2084
 // --- basic block ---
-// 0x010b1a2c: 0x10b1a2c: bltz  a0, 0x10b1a3c sll   zero, zero, 0
+// 0x010b2074: 0x10b2074: bltz  a0, 0x10b2084 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b1a3c
+	blt L_10b2084
 // --- basic block ---
-// 0x010b1a34: 0x10b1a34: jal   0x100b164 sll   zero, zero, 0
+// 0x010b207c: 0x10b207c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1a3c:
-// 0x010b1a3c: 0x10b1a3c: lw    a0, 4(s0)
+L_10b2084:
+// 0x010b2084: 0x10b2084: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7392,7 +7392,7 @@ L_10b1a3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1a40: 0x10b1a40: lw    a1, 12(s0)
+// 0x010b2088: 0x10b2088: lw    a1, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7401,7 +7401,7 @@ L_10b1a3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b1a44: 0x10b1a44: jal   0x10b694c addiu a2, zero, 16
+// 0x010b208c: 0x10b208c: jal   0x10b6f94 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.0
@@ -7409,33 +7409,33 @@ L_10b1a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_set_flag_10b694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_set_flag_10b6f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1a4c: 0x10b1a4c: j	 0x10b1a60 lui   v1, 0x90000
+// 0x010b2094: 0x10b2094: j	 0x10b20a8 lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 6
-	br L_10b1a60
+	br L_10b20a8
 // --- basic block ---
-L_10b1a54:
-// 0x010b1a54: 0x10b1a54: jal   0x10ac918 sll   zero, zero, 0
+L_10b209c:
+// 0x010b209c: 0x10b209c: jal   0x10acf60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_hide_10ac918(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_hide_10acf60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1a5c: 0x10b1a5c: lui   v1, 0x90000
+// 0x010b20a4: 0x10b20a4: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 6
-L_10b1a60:
-// 0x010b1a60: 0x10b1a60: lw    a2, 20(s2)
+L_10b20a8:
+// 0x010b20a8: 0x10b20a8: lw    a2, 20(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -7444,22 +7444,22 @@ L_10b1a60:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b1a64: 0x10b1a64: addiu v1, v1, -11560
+// 0x010b20ac: 0x10b20ac: addiu v1, v1, -11096
 	ldloc 6
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc 6
-// 0x010b1a68: 0x10b1a68: addiu s6, sp, 52
+// 0x010b20b0: 0x10b20b0: addiu s6, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 12
-// 0x010b1a6c: 0x10b1a6c: sll   v0, s1, 5
+// 0x010b20b4: 0x10b20b4: sll   v0, s1, 5
 	ldloc 10
 	ldc.i4.5
 	shl
 	stloc 5
-// 0x010b1a70: 0x10b1a70: lw    a3, 120(sp)
+// 0x010b20b8: 0x10b20b8: lw    a3, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7468,18 +7468,18 @@ L_10b1a60:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b1a74: 0x10b1a74: addu  v0, v1, v0
+// 0x010b20bc: 0x10b20bc: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x010b1a78: 0x10b1a78: addu  a0, s0, zero
+// 0x010b20c0: 0x10b20c0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b1a7c: 0x10b1a7c: addu  a1, s6, zero
+// 0x010b20c4: 0x10b20c4: addu  a1, s6, zero
 	ldloc 12
 	stloc.2
-// 0x010b1a80: 0x10b1a80: sw    v0, 16(sp)
+// 0x010b20c8: 0x10b20c8: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7488,7 +7488,7 @@ L_10b1a60:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b1a84: 0x10b1a84: jal   0x10b0228 sw    s1, 20(sp)
+// 0x010b20cc: 0x10b20cc: jal   0x10b0870 sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7502,28 +7502,28 @@ L_10b1a60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_connect_roads_10b0228(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_connect_roads_10b0870(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1a8c: 0x10b1a8c: addu  s3, v0, zero
+// 0x010b20d4: 0x10b20d4: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b1a90: 0x10b1a90: addiu v0, zero, -1
+// 0x010b20d8: 0x10b20d8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b1a94: 0x10b1a94: bne   s3, v0, 0x10b1b40 addu  a1, s6, zero
+// 0x010b20dc: 0x10b20dc: bne   s3, v0, 0x10b2188 addu  a1, s6, zero
 	ldloc 9
 	ldloc 5
 	ldloc 12
 	stloc.2
-	bne.un L_10b1b40
+	bne.un L_10b2188
 // --- basic block ---
-// 0x010b1a9c: 0x10b1a9c: addu  a0, s4, zero
+// 0x010b20e4: 0x10b20e4: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010b1aa0: 0x10b1aa0: jal   0x1001800 addiu a2, zero, 48
+// 0x010b20e8: 0x10b20e8: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -7535,15 +7535,15 @@ L_10b1a60:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1aa8: 0x10b1aa8: addu  a0, s2, zero
+// 0x010b20f0: 0x10b20f0: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010b1aac: 0x10b1aac: addiu a1, sp, 100
+// 0x010b20f4: 0x10b20f4: addiu a1, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc.2
-// 0x010b1ab0: 0x10b1ab0: jal   0x1001800 addiu a2, zero, 76
+// 0x010b20f8: 0x10b20f8: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -7555,22 +7555,22 @@ L_10b1a60:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1ab8: 0x10b1ab8: addiu a1, zero, -1
+// 0x010b2100: 0x10b2100: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010b1abc: 0x10b1abc: addu  a2, zero, zero
+// 0x010b2104: 0x10b2104: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b1ac0: 0x10b1ac0: addu  a3, zero, zero
+// 0x010b2108: 0x10b2108: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b1ac4: 0x10b1ac4: addiu a0, zero, -1
+// 0x010b210c: 0x10b210c: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010b1ac8: 0x10b1ac8: addiu v0, zero, 2
+// 0x010b2110: 0x10b2110: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010b1acc: 0x10b1acc: sw    v0, 20(sp)
+// 0x010b2114: 0x10b2114: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7579,7 +7579,7 @@ L_10b1a60:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b1ad0: 0x10b1ad0: jal   0x10aefa8 sw    s1, 16(sp)
+// 0x010b2118: 0x10b2118: jal   0x10af5f0 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7593,12 +7593,12 @@ L_10b1a60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_create_trkseg_10aefa8(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_create_trkseg_10af5f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1ad8: 0x10b1ad8: jal   0x10b0cd8 addu  a0, s1, zero
+// 0x010b2120: 0x10b2120: jal   0x10b1320 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7606,12 +7606,12 @@ L_10b1a60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_reset_points_10b1320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1ae0: 0x10b1ae0: lw    v0, 256(sp)
+// 0x010b2128: 0x10b2128: lw    v0, 256(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7620,19 +7620,19 @@ L_10b1a60:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1ae4: 0x10b1ae4: jal   0x10ad1ec addiu s3, v0, -1
+// 0x010b212c: 0x10b212c: jal   0x10ad834 addiu s3, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 9
-	call int32 Cibyl129::editor_track_known_reset_resolve_10ad1ec()
+	call int32 Cibyl129::editor_track_known_reset_resolve_10ad834()
 	stloc 5
 // --- basic block ---
-// 0x010b1aec: 0x10b1aec: j	 0x10b1ba4 sll   zero, zero, 0
-	br L_10b1ba4
+// 0x010b2134: 0x10b2134: j	 0x10b21ec sll   zero, zero, 0
+	br L_10b21ec
 // --- basic block ---
-L_10b1af4:
-// 0x010b1af4: 0x10b1af4: lw    v0, 18904(s5)
+L_10b213c:
+// 0x010b213c: 0x10b213c: lw    v0, 18904(s5)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -7641,17 +7641,17 @@ L_10b1af4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1af8: 0x10b1af8: sll   zero, zero, 0
-// 0x010b1afc: 0x10b1afc: beq   v0, zero, 0x10b1ba4 addu  s3, s1, zero
+// 0x010b2140: 0x10b2140: sll   zero, zero, 0
+// 0x010b2144: 0x10b2144: beq   v0, zero, 0x10b21ec addu  s3, s1, zero
 	ldloc 5
 	ldloc 10
 	stloc 9
-	brfalse L_10b1ba4
+	brfalse L_10b21ec
 // --- basic block ---
-// 0x010b1b04: 0x10b1b04: lui   v1, 0x90000
+// 0x010b214c: 0x10b214c: lui   v1, 0x90000
 	ldc.i4 589824
 	stloc 6
-// 0x010b1b08: 0x10b1b08: lw    a3, 20(s2)
+// 0x010b2150: 0x10b2150: lw    a3, 20(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -7660,36 +7660,36 @@ L_10b1af4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b1b0c: 0x10b1b0c: addiu v1, v1, -11560
+// 0x010b2154: 0x10b2154: addiu v1, v1, -11096
 	ldloc 6
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc 6
-// 0x010b1b10: 0x10b1b10: sll   a1, s1, 5
+// 0x010b2158: 0x10b2158: sll   a1, s1, 5
 	ldloc 10
 	ldc.i4.5
 	shl
 	stloc.2
-// 0x010b1b14: 0x10b1b14: lui   v0, 0x0
+// 0x010b215c: 0x10b215c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1b18: 0x10b1b18: addiu v0, v0, 19028
+// 0x010b2160: 0x10b2160: addiu v0, v0, 19028
 	ldloc 5
 	ldc.i4 19028
 	add
 	stloc 5
-// 0x010b1b1c: 0x10b1b1c: addu  a1, v1, a1
+// 0x010b2164: 0x10b2164: addu  a1, v1, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc.2
-// 0x010b1b20: 0x10b1b20: addu  a0, s0, zero
+// 0x010b2168: 0x10b2168: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b1b24: 0x10b1b24: addu  a2, s1, zero
+// 0x010b216c: 0x10b216c: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x010b1b28: 0x10b1b28: jal   0x10b0764 sw    v0, 16(sp)
+// 0x010b2170: 0x10b2170: jal   0x10b0dac sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7703,24 +7703,24 @@ L_10b1af4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_util_new_road_start_10b0764(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_util_new_road_start_10b0dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1b30: 0x10b1b30: addu  s3, v0, zero
+// 0x010b2178: 0x10b2178: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b1b34: 0x10b1b34: addiu v0, zero, -1
+// 0x010b217c: 0x10b217c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b1b38: 0x10b1b38: beq   s3, v0, 0x10b1b7c sll   zero, zero, 0
+// 0x010b2180: 0x10b2180: beq   s3, v0, 0x10b21c4 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	beq  L_10b1b7c
+	beq  L_10b21c4
 // --- basic block ---
-L_10b1b40:
-// 0x010b1b40: 0x10b1b40: lw    v0, 19040(s7)
+L_10b2188:
+// 0x010b2188: 0x10b2188: lw    v0, 19040(s7)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -7729,24 +7729,24 @@ L_10b1b40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1b44: 0x10b1b44: lui   a0, 0x0
+// 0x010b218c: 0x10b218c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b1b48: 0x10b1b48: addiu a0, a0, 19044
+// 0x010b2190: 0x10b2190: addiu a0, a0, 19044
 	ldloc.1
 	ldc.i4 19044
 	add
 	stloc.1
-// 0x010b1b4c: 0x10b1b4c: addu  a1, s3, zero
+// 0x010b2194: 0x10b2194: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010b1b50: 0x10b1b50: addu  a2, s0, zero
+// 0x010b2198: 0x10b2198: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010b1b54: 0x10b1b54: addu  a3, s2, zero
+// 0x010b219c: 0x10b219c: addu  a3, s2, zero
 	ldloc 11
 	stloc 4
-// 0x010b1b58: 0x10b1b58: jal   0x10ae0a4 sw    v0, 16(sp)
+// 0x010b21a0: 0x10b21a0: jal   0x10ae6ec sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7760,29 +7760,29 @@ L_10b1b40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_known_end_segment_10ae0a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_known_end_segment_10ae6ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1b60: 0x10b1b60: beq   v0, zero, 0x10b1b7c lui   a0, 0x0
+// 0x010b21a8: 0x10b21a8: beq   v0, zero, 0x10b21c4 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10b1b7c
+	brfalse L_10b21c4
 // --- basic block ---
-// 0x010b1b68: 0x10b1b68: addiu a0, a0, 19044
+// 0x010b21b0: 0x10b21b0: addiu a0, a0, 19044
 	ldloc.1
 	ldc.i4 19044
 	add
 	stloc.1
-// 0x010b1b6c: 0x10b1b6c: addu  a1, s4, zero
+// 0x010b21b4: 0x10b21b4: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010b1b70: 0x10b1b70: addiu a2, zero, 48
+// 0x010b21b8: 0x10b21b8: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x010b1b74: 0x10b1b74: jal   0x1001800 sw    zero, 19040(s7)
+// 0x010b21bc: 0x10b21bc: jal   0x1001800 sw    zero, 19040(s7)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -7800,8 +7800,8 @@ L_10b1b40:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1b7c:
-// 0x010b1b7c: 0x10b1b7c: jal   0x10b0cd8 addu  a0, s3, zero
+L_10b21c4:
+// 0x010b21c4: 0x10b21c4: jal   0x10b1320 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7809,20 +7809,20 @@ L_10b1b7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_reset_points_10b1320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1b84: 0x10b1b84: addu  a0, s4, zero
+// 0x010b21cc: 0x10b21cc: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010b1b88: 0x10b1b88: addiu a1, sp, 52
+// 0x010b21d0: 0x10b21d0: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010b1b8c: 0x10b1b8c: jal   0x1001800 addiu a2, zero, 48
+// 0x010b21d4: 0x10b21d4: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -7834,15 +7834,15 @@ L_10b1b7c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1b94: 0x10b1b94: addu  a0, s2, zero
+// 0x010b21dc: 0x10b21dc: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010b1b98: 0x10b1b98: addiu a1, sp, 100
+// 0x010b21e0: 0x10b21e0: addiu a1, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc.2
-// 0x010b1b9c: 0x10b1b9c: jal   0x1001800 addiu a2, zero, 76
+// 0x010b21e4: 0x10b21e4: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -7854,8 +7854,8 @@ L_10b1b7c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1ba4:
-// 0x010b1ba4: 0x10b1ba4: lw    v0, 100(sp)
+L_10b21ec:
+// 0x010b21ec: 0x10b21ec: lw    v0, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7864,12 +7864,12 @@ L_10b1ba4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1ba8: 0x10b1ba8: sll   zero, zero, 0
-// 0x010b1bac: 0x10b1bac: beq   v0, zero, 0x10b1c30 sll   zero, zero, 0
+// 0x010b21f0: 0x10b21f0: sll   zero, zero, 0
+// 0x010b21f4: 0x10b21f4: beq   v0, zero, 0x10b2278 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1c30
+	brfalse L_10b2278
 // --- basic block ---
-// 0x010b1bb4: 0x10b1bb4: lw    v0, 52(sp)
+// 0x010b21fc: 0x10b21fc: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7878,29 +7878,29 @@ L_10b1ba4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1bb8: 0x10b1bb8: sll   zero, zero, 0
-// 0x010b1bbc: 0x10b1bbc: bne   v0, zero, 0x10b1c30 sll   zero, zero, 0
+// 0x010b2200: 0x10b2200: sll   zero, zero, 0
+// 0x010b2204: 0x10b2204: bne   v0, zero, 0x10b2278 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b1c30
+	brtrue L_10b2278
 // --- basic block ---
-// 0x010b1bc4: 0x10b1bc4: jal   0x10bd6dc sll   zero, zero, 0
+// 0x010b220c: 0x10b220c: jal   0x10bdd24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1bcc: 0x10b1bcc: beq   v0, zero, 0x10b1c30 lui   v0, 0x0
+// 0x010b2214: 0x10b2214: beq   v0, zero, 0x10b2278 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10b1c30
+	brfalse L_10b2278
 // --- basic block ---
-// 0x010b1bd4: 0x10b1bd4: lw    v0, 576(v0)
+// 0x010b221c: 0x10b221c: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7909,7 +7909,7 @@ L_10b1ba4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1bd8: 0x10b1bd8: lw    a0, 12(s0)
+// 0x010b2220: 0x10b2220: lw    a0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7918,30 +7918,30 @@ L_10b1ba4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1bdc: 0x10b1bdc: sll   zero, zero, 0
-// 0x010b1be0: 0x10b1be0: beq   a0, v0, 0x10b1bf8 sll   zero, zero, 0
+// 0x010b2224: 0x10b2224: sll   zero, zero, 0
+// 0x010b2228: 0x10b2228: beq   a0, v0, 0x10b2240 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b1bf8
+	beq  L_10b2240
 // --- basic block ---
-// 0x010b1be8: 0x10b1be8: bltz  a0, 0x10b1bf8 sll   zero, zero, 0
+// 0x010b2230: 0x10b2230: bltz  a0, 0x10b2240 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b1bf8
+	blt L_10b2240
 // --- basic block ---
-// 0x010b1bf0: 0x10b1bf0: jal   0x100b164 sll   zero, zero, 0
+// 0x010b2238: 0x10b2238: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1bf8:
-// 0x010b1bf8: 0x10b1bf8: lw    a0, 4(s0)
+L_10b2240:
+// 0x010b2240: 0x10b2240: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7950,7 +7950,7 @@ L_10b1bf8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1bfc: 0x10b1bfc: jal   0x100405c sll   zero, zero, 0
+// 0x010b2244: 0x10b2244: jal   0x100405c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7961,7 +7961,7 @@ L_10b1bf8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1c04: 0x10b1c04: lw    a0, 4(s0)
+// 0x010b224c: 0x10b224c: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7970,18 +7970,18 @@ L_10b1bf8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1c08: 0x10b1c08: jal   0x1004ae4 sll   zero, zero, 0
+// 0x010b2250: 0x10b2250: jal   0x1004af4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004ae4(int32)
+	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004af4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1c10: 0x10b1c10: beq   v0, zero, 0x10b1c30 sll   zero, zero, 0
+// 0x010b2258: 0x10b2258: beq   v0, zero, 0x10b2278 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1c30
+	brfalse L_10b2278
 // --- basic block ---
-// 0x010b1c18: 0x10b1c18: lw    a0, 4(s0)
+// 0x010b2260: 0x10b2260: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7990,7 +7990,7 @@ L_10b1bf8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1c1c: 0x10b1c1c: lw    a1, 12(s0)
+// 0x010b2264: 0x10b2264: lw    a1, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7999,35 +7999,35 @@ L_10b1bf8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b1c20: 0x10b1c20: jal   0x10b6788 sll   zero, zero, 0
+// 0x010b2268: 0x10b2268: jal   0x10b6dd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_exists_10b6788(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_exists_10b6dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1c28: 0x10b1c28: beq   v0, zero, 0x10b1c38 sll   zero, zero, 0
+// 0x010b2270: 0x10b2270: beq   v0, zero, 0x10b2280 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1c38
+	brfalse L_10b2280
 // --- basic block ---
-L_10b1c30:
-// 0x010b1c30: 0x10b1c30: jal   0x10ac918 sll   zero, zero, 0
+L_10b2278:
+// 0x010b2278: 0x10b2278: jal   0x10acf60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_hide_10ac918(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_hide_10acf60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1c38:
-// 0x010b1c38: 0x10b1c38: lw    v0, 100(sp)
+L_10b2280:
+// 0x010b2280: 0x10b2280: lw    v0, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8036,37 +8036,37 @@ L_10b1c38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1c3c: 0x10b1c3c: sll   zero, zero, 0
-// 0x010b1c40: 0x10b1c40: bne   v0, zero, 0x10b1c94 slt   v0, s3, s1
+// 0x010b2284: 0x10b2284: sll   zero, zero, 0
+// 0x010b2288: 0x10b2288: bne   v0, zero, 0x10b22dc slt   v0, s3, s1
 	ldloc 5
 	ldloc 9
 	ldloc 10
 	clt
 	stloc 5
-	brtrue L_10b1c94
+	brtrue L_10b22dc
 // --- basic block ---
-// 0x010b1c48: 0x10b1c48: jal   0x10ad1ec addu  s0, zero, zero
+// 0x010b2290: 0x10b2290: jal   0x10ad834 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	call int32 Cibyl129::editor_track_known_reset_resolve_10ad1ec()
+	call int32 Cibyl129::editor_track_known_reset_resolve_10ad834()
 	stloc 5
 // --- basic block ---
-// 0x010b1c50: 0x10b1c50: addiu v1, zero, 1
+// 0x010b2298: 0x10b2298: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010b1c54: 0x10b1c54: lui   v0, 0x90000
+// 0x010b229c: 0x10b229c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b1c58: 0x10b1c58: sw    v1, -11576(v0)
+// 0x010b22a0: 0x10b22a0: sw    v1, -11112(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b1c5c: 0x10b1c5c: lw    v1, 308(sp)
+// 0x010b22a4: 0x10b22a4: lw    v1, 308(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8075,19 +8075,19 @@ L_10b1c38:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1c60: 0x10b1c60: sll   zero, zero, 0
-// 0x010b1c64: 0x10b1c64: ori   s2, v1, 1
+// 0x010b22a8: 0x10b22a8: sll   zero, zero, 0
+// 0x010b22ac: 0x10b22ac: ori   s2, v1, 1
 	ldloc 6
 	ldc.i4.1
 	or
 	stloc 11
-// 0x010b1c68: 0x10b1c68: j	 0x10b1c78 lui   s1, 0x90000
+// 0x010b22b0: 0x10b22b0: j	 0x10b22c0 lui   s1, 0x90000
 	ldc.i4 589824
 	stloc 10
-	br L_10b1c78
+	br L_10b22c0
 // --- basic block ---
-L_10b1c70:
-// 0x010b1c70: 0x10b1c70: jal   0x10b17b0 addiu s0, s0, 1
+L_10b22b8:
+// 0x010b22b8: 0x10b22b8: jal   0x10b1df8 addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -8097,48 +8097,48 @@ L_10b1c70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_rec_locate_point_10b17b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_rec_locate_point_10b1df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1c78:
-// 0x010b1c78: 0x10b1c78: lw    v0, -11584(s1)
+L_10b22c0:
+// 0x010b22c0: 0x10b22c0: lw    v0, -11120(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1c7c: 0x10b1c7c: addu  a0, s0, zero
+// 0x010b22c4: 0x10b22c4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b1c80: 0x10b1c80: slt   v0, s0, v0
+// 0x010b22c8: 0x10b22c8: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b1c84: 0x10b1c84: bne   v0, zero, 0x10b1c70 addu  a1, s2, zero
+// 0x010b22cc: 0x10b22cc: bne   v0, zero, 0x10b22b8 addu  a1, s2, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brtrue L_10b1c70
+	brtrue L_10b22b8
 // --- basic block ---
-// 0x010b1c8c: 0x10b1c8c: j	 0x10b1f20 sll   zero, zero, 0
-	br L_10b1f20
+// 0x010b22d4: 0x10b22d4: j	 0x10b2568 sll   zero, zero, 0
+	br L_10b2568
 // --- basic block ---
-L_10b1c94:
-// 0x010b1c94: 0x10b1c94: beq   v0, zero, 0x10b1cac slt   v0, s1, s3
+L_10b22dc:
+// 0x010b22dc: 0x10b22dc: beq   v0, zero, 0x10b22f4 slt   v0, s1, s3
 	ldloc 5
 	ldloc 10
 	ldloc 9
 	clt
 	stloc 5
-	brfalse L_10b1cac
+	brfalse L_10b22f4
 // --- basic block ---
-// 0x010b1c9c: 0x10b1c9c: jal   0x10b0cd8 subu  a0, s1, s3
+// 0x010b22e4: 0x10b22e4: jal   0x10b1320 subu  a0, s1, s3
 	ldloc 10
 	ldloc 9
 	sub
@@ -8148,46 +8148,46 @@ L_10b1c94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_reset_points_10b0cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_reset_points_10b1320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1ca4: 0x10b1ca4: j	 0x10b1e28 subu  s8, s8, s1
+// 0x010b22ec: 0x10b22ec: j	 0x10b2470 subu  s8, s8, s1
 	ldloc 15
 	ldloc 10
 	sub
 	stloc 15
-	br L_10b1e28
+	br L_10b2470
 // --- basic block ---
-L_10b1cac:
-// 0x010b1cac: 0x10b1cac: beq   v0, zero, 0x10b1cb8 sll   zero, zero, 0
+L_10b22f4:
+// 0x010b22f4: 0x10b22f4: beq   v0, zero, 0x10b2300 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1cb8
+	brfalse L_10b2300
 // --- basic block ---
-// 0x010b1cb4: 0x10b1cb4: addu  s1, s3, zero
+// 0x010b22fc: 0x10b22fc: addu  s1, s3, zero
 	ldloc 9
 	stloc 10
-L_10b1cb8:
-// 0x010b1cb8: 0x10b1cb8: j	 0x10b1e28 subu  s8, s8, s1
+L_10b2300:
+// 0x010b2300: 0x10b2300: j	 0x10b2470 subu  s8, s8, s1
 	ldloc 15
 	ldloc 10
 	sub
 	stloc 15
-	br L_10b1e28
+	br L_10b2470
 // --- basic block ---
-L_10b1cc0:
-// 0x010b1cc0: 0x10b1cc0: addiu v0, zero, -1
+L_10b2308:
+// 0x010b2308: 0x10b2308: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b1cc4: 0x10b1cc4: beq   s3, v0, 0x10b1e2c lui   v0, 0x90000
+// 0x010b230c: 0x10b230c: beq   s3, v0, 0x10b2474 lui   v0, 0x90000
 	ldloc 9
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	beq  L_10b1e2c
+	beq  L_10b2474
 // --- basic block ---
-// 0x010b1ccc: 0x10b1ccc: lw    v0, 12(s0)
+// 0x010b2314: 0x10b2314: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -8196,15 +8196,15 @@ L_10b1cc0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1cd0: 0x10b1cd0: sll   zero, zero, 0
-// 0x010b1cd4: 0x10b1cd4: beq   s3, v0, 0x10b1e2c lui   v0, 0x90000
+// 0x010b2318: 0x10b2318: sll   zero, zero, 0
+// 0x010b231c: 0x10b231c: beq   s3, v0, 0x10b2474 lui   v0, 0x90000
 	ldloc 9
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	beq  L_10b1e2c
+	beq  L_10b2474
 // --- basic block ---
-// 0x010b1cdc: 0x10b1cdc: lw    v0, 18904(s5)
+// 0x010b2324: 0x10b2324: lw    v0, 18904(s5)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -8213,17 +8213,17 @@ L_10b1cc0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1ce0: 0x10b1ce0: sll   zero, zero, 0
-// 0x010b1ce4: 0x10b1ce4: beq   v0, zero, 0x10b1e2c lui   v0, 0x90000
+// 0x010b2328: 0x10b2328: sll   zero, zero, 0
+// 0x010b232c: 0x10b232c: beq   v0, zero, 0x10b2474 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10b1e2c
+	brfalse L_10b2474
 // --- basic block ---
-// 0x010b1cec: 0x10b1cec: lui   v1, 0x0
+// 0x010b2334: 0x10b2334: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b1cf0: 0x10b1cf0: lw    v0, 18980(v1)
+// 0x010b2338: 0x10b2338: lw    v0, 18980(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -8232,34 +8232,34 @@ L_10b1cc0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1cf4: 0x10b1cf4: sll   zero, zero, 0
-// 0x010b1cf8: 0x10b1cf8: bne   v0, zero, 0x10b1e2c lui   v0, 0x90000
+// 0x010b233c: 0x10b233c: sll   zero, zero, 0
+// 0x010b2340: 0x10b2340: bne   v0, zero, 0x10b2474 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brtrue L_10b1e2c
+	brtrue L_10b2474
 // --- basic block ---
-// 0x010b1d00: 0x10b1d00: jal   0x10bd6dc sll   zero, zero, 0
+// 0x010b2348: 0x10b2348: jal   0x10bdd24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1d08: 0x10b1d08: beq   v0, zero, 0x10b1e2c lui   v0, 0x90000
+// 0x010b2350: 0x10b2350: beq   v0, zero, 0x10b2474 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10b1e2c
+	brfalse L_10b2474
 // --- basic block ---
-// 0x010b1d10: 0x10b1d10: lui   v0, 0x0
+// 0x010b2358: 0x10b2358: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1d14: 0x10b1d14: lw    v0, 576(v0)
+// 0x010b235c: 0x10b235c: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8268,18 +8268,18 @@ L_10b1cc0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1d18: 0x10b1d18: sll   zero, zero, 0
-// 0x010b1d1c: 0x10b1d1c: beq   s3, v0, 0x10b1d34 sll   zero, zero, 0
+// 0x010b2360: 0x10b2360: sll   zero, zero, 0
+// 0x010b2364: 0x10b2364: beq   s3, v0, 0x10b237c sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	beq  L_10b1d34
+	beq  L_10b237c
 // --- basic block ---
-// 0x010b1d24: 0x10b1d24: bltz  s3, 0x10b1d34 sll   zero, zero, 0
+// 0x010b236c: 0x10b236c: bltz  s3, 0x10b237c sll   zero, zero, 0
 	ldloc 9
 	ldc.i4.s 0
-	blt L_10b1d34
+	blt L_10b237c
 // --- basic block ---
-// 0x010b1d2c: 0x10b1d2c: jal   0x100b164 addu  a0, s3, zero
+// 0x010b2374: 0x10b2374: jal   0x100b174 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -8287,34 +8287,34 @@ L_10b1cc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1d34:
-// 0x010b1d34: 0x10b1d34: jal   0x1004ae4 addu  a0, s6, zero
+L_10b237c:
+// 0x010b237c: 0x10b237c: jal   0x1004af4 addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004ae4(int32)
+	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004af4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1d3c: 0x10b1d3c: beq   v0, zero, 0x10b1e2c lui   v0, 0x90000
+// 0x010b2384: 0x10b2384: beq   v0, zero, 0x10b2474 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10b1e2c
+	brfalse L_10b2474
 // --- basic block ---
-// 0x010b1d44: 0x10b1d44: addu  a0, s6, zero
+// 0x010b238c: 0x10b238c: addu  a0, s6, zero
 	ldloc 12
 	stloc.1
-// 0x010b1d48: 0x10b1d48: addu  a1, s3, zero
+// 0x010b2390: 0x10b2390: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010b1d4c: 0x10b1d4c: jal   0x10b6804 addiu a2, sp, 32
+// 0x010b2394: 0x10b2394: jal   0x10b6e4c addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -8324,22 +8324,22 @@ L_10b1d34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_get_flags_10b6804(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_get_flags_10b6e4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1d54: 0x10b1d54: addiu v1, zero, -1
+// 0x010b239c: 0x10b239c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b1d58: 0x10b1d58: bne   v0, v1, 0x10b1e2c lui   v0, 0x90000
+// 0x010b23a0: 0x10b23a0: bne   v0, v1, 0x10b2474 lui   v0, 0x90000
 	ldloc 5
 	ldloc 6
 	ldc.i4 589824
 	stloc 5
-	bne.un L_10b1e2c
+	bne.un L_10b2474
 // --- basic block ---
-// 0x010b1d60: 0x10b1d60: jal   0x100405c addu  a0, s6, zero
+// 0x010b23a8: 0x10b23a8: jal   0x100405c addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8352,12 +8352,12 @@ L_10b1d34:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1d68: 0x10b1d68: blez  v0, 0x10b1e28 sll   zero, zero, 0
+// 0x010b23b0: 0x10b23b0: blez  v0, 0x10b2470 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_10b1e28
+	ble L_10b2470
 // --- basic block ---
-// 0x010b1d70: 0x10b1d70: jal   0x10aca54 addu  a0, v0, zero
+// 0x010b23b8: 0x10b23b8: jal   0x10ad09c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -8365,78 +8365,78 @@ L_10b1d34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_10aca54(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_10ad09c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1d78: 0x10b1d78: lui   v0, 0x20000
+// 0x010b23c0: 0x10b23c0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010b1d7c: 0x10b1d7c: lw    v1, 31152(v0)
+// 0x010b23c4: 0x10b23c4: lw    v1, 31616(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1d80: 0x10b1d80: sll   v0, s6, 3
+// 0x010b23c8: 0x10b23c8: sll   v0, s6, 3
 	ldloc 12
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010b1d84: 0x10b1d84: addu  v0, v1, v0
+// 0x010b23cc: 0x10b23cc: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x010b1d88: 0x10b1d88: lhu   a0, 0(v0)
+// 0x010b23d0: 0x10b23d0: lhu   a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x010b1d8c: 0x10b1d8c: lui   v1, 0x20000
+// 0x010b23d4: 0x10b23d4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010b1d90: 0x10b1d90: lw    v1, 31228(v1)
+// 0x010b23d8: 0x10b23d8: lw    v1, 31692(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1d94: 0x10b1d94: andi  a0, a0, 32767
+// 0x010b23dc: 0x10b23dc: andi  a0, a0, 32767
 	ldloc.1
 	ldc.i4 32767
 	and
 	stloc.1
-// 0x010b1d98: 0x10b1d98: sll   a0, a0, 3
+// 0x010b23e0: 0x10b23e0: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x010b1d9c: 0x10b1d9c: addu  a0, v1, a0
+// 0x010b23e4: 0x10b23e4: addu  a0, v1, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc.1
-// 0x010b1da0: 0x10b1da0: lw    a1, 0(a0)
+// 0x010b23e8: 0x10b23e8: lw    a1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b1da4: 0x10b1da4: lhu   v0, 2(v0)
+// 0x010b23ec: 0x10b23ec: lhu   v0, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010b1da8: 0x10b1da8: sw    a1, 36(sp)
+// 0x010b23f0: 0x10b23f0: sw    a1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8445,7 +8445,7 @@ L_10b1d34:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b1dac: 0x10b1dac: lw    a0, 4(a0)
+// 0x010b23f4: 0x10b23f4: lw    a0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -8454,22 +8454,22 @@ L_10b1d34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1db0: 0x10b1db0: andi  v0, v0, 32767
+// 0x010b23f8: 0x10b23f8: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x010b1db4: 0x10b1db4: sll   v0, v0, 3
+// 0x010b23fc: 0x10b23fc: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010b1db8: 0x10b1db8: addu  v0, v1, v0
+// 0x010b2400: 0x10b2400: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x010b1dbc: 0x10b1dbc: sw    a0, 40(sp)
+// 0x010b2404: 0x10b2404: sw    a0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8478,15 +8478,15 @@ L_10b1d34:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b1dc0: 0x10b1dc0: lw    v1, 0(v0)
+// 0x010b2408: 0x10b2408: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b1dc4: 0x10b1dc4: sll   zero, zero, 0
-// 0x010b1dc8: 0x10b1dc8: sw    v1, 44(sp)
+// 0x010b240c: 0x10b240c: sll   zero, zero, 0
+// 0x010b2410: 0x10b2410: sw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8495,7 +8495,7 @@ L_10b1d34:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b1dcc: 0x10b1dcc: lw    v1, 4(v0)
+// 0x010b2414: 0x10b2414: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8504,10 +8504,10 @@ L_10b1d34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1dd0: 0x10b1dd0: lui   v0, 0x0
+// 0x010b2418: 0x10b2418: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1dd4: 0x10b1dd4: lw    v0, 576(v0)
+// 0x010b241c: 0x10b241c: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8516,8 +8516,8 @@ L_10b1d34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1dd8: 0x10b1dd8: sll   zero, zero, 0
-// 0x010b1ddc: 0x10b1ddc: beq   s3, v0, 0x10b1df4 sw    v1, 48(sp)
+// 0x010b2420: 0x10b2420: sll   zero, zero, 0
+// 0x010b2424: 0x10b2424: beq   s3, v0, 0x10b243c sw    v1, 48(sp)
 	ldloc 9
 	ldloc 5
 	ldloc 7
@@ -8528,16 +8528,16 @@ L_10b1d34:
 	add
 	ldloc 6
 	stelem.i4
-	beq  L_10b1df4
+	beq  L_10b243c
 // --- basic block ---
-// 0x010b1de4: 0x10b1de4: bltz  s3, 0x10b1df8 addu  a0, s6, zero
+// 0x010b242c: 0x10b242c: bltz  s3, 0x10b2440 addu  a0, s6, zero
 	ldloc 9
 	ldloc 12
 	stloc.1
 	ldc.i4.s 0
-	blt L_10b1df8
+	blt L_10b2440
 // --- basic block ---
-// 0x010b1dec: 0x10b1dec: jal   0x100b164 addu  a0, s3, zero
+// 0x010b2434: 0x10b2434: jal   0x100b174 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -8545,20 +8545,20 @@ L_10b1d34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1df4:
-// 0x010b1df4: 0x10b1df4: addu  a0, s6, zero
+L_10b243c:
+// 0x010b243c: 0x10b243c: addu  a0, s6, zero
 	ldloc 12
 	stloc.1
-L_10b1df8:
-// 0x010b1df8: 0x10b1df8: addu  a1, s3, zero
+L_10b2440:
+// 0x010b2440: 0x10b2440: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010b1dfc: 0x10b1dfc: jal   0x10b694c addiu a2, zero, 16
+// 0x010b2444: 0x10b2444: jal   0x10b6f94 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.0
@@ -8566,36 +8566,36 @@ L_10b1df8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_set_flag_10b694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_set_flag_10b6f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1e04: 0x10b1e04: lui   v0, 0x10b0000
+// 0x010b244c: 0x10b244c: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 5
-// 0x010b1e08: 0x10b1e08: addiu v0, v0, 4212
+// 0x010b2450: 0x10b2450: addiu v0, v0, 5820
 	ldloc 5
-	ldc.i4 4212
+	ldc.i4 5820
 	add
 	stloc 5
-// 0x010b1e0c: 0x10b1e0c: addu  a0, s0, zero
+// 0x010b2454: 0x10b2454: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b1e10: 0x10b1e10: addiu a1, sp, 36
+// 0x010b2458: 0x10b2458: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010b1e14: 0x10b1e14: addiu a2, sp, 44
+// 0x010b245c: 0x10b245c: addiu a2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.3
-// 0x010b1e18: 0x10b1e18: addiu a3, zero, 3
+// 0x010b2460: 0x10b2460: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010b1e1c: 0x10b1e1c: sw    v0, 16(sp)
+// 0x010b2464: 0x10b2464: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8604,7 +8604,7 @@ L_10b1df8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b1e20: 0x10b1e20: jal   0x1012790 sw    zero, 20(sp)
+// 0x010b2468: 0x10b2468: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8618,61 +8618,61 @@ L_10b1df8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b1e28:
-// 0x010b1e28: 0x10b1e28: lui   v0, 0x90000
+L_10b2470:
+// 0x010b2470: 0x10b2470: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10b1e2c:
-// 0x010b1e2c: 0x10b1e2c: lw    v0, -11584(v0)
+L_10b2474:
+// 0x010b2474: 0x10b2474: lw    v0, -11120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1e30: 0x10b1e30: sll   zero, zero, 0
-// 0x010b1e34: 0x10b1e34: beq   v0, zero, 0x10b1f20 sll   zero, zero, 0
+// 0x010b2478: 0x10b2478: sll   zero, zero, 0
+// 0x010b247c: 0x10b247c: beq   v0, zero, 0x10b2568 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1f20
+	brfalse L_10b2568
 // --- basic block ---
-// 0x010b1e3c: 0x10b1e3c: beq   s1, zero, 0x10b1f20 sll   zero, zero, 0
+// 0x010b2484: 0x10b2484: beq   s1, zero, 0x10b2568 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10b1f20
+	brfalse L_10b2568
 // --- basic block ---
-// 0x010b1e44: 0x10b1e44: jal   0x10ad1d4 sll   zero, zero, 0
-	call int32 Cibyl129::editor_track_known_resolve_10ad1d4()
+// 0x010b248c: 0x10b248c: jal   0x10ad81c sll   zero, zero, 0
+	call int32 Cibyl129::editor_track_known_resolve_10ad81c()
 	stloc 5
 // --- basic block ---
-// 0x010b1e4c: 0x10b1e4c: bne   v0, zero, 0x10b1808 sll   zero, zero, 0
+// 0x010b2494: 0x10b2494: bne   v0, zero, 0x10b1e50 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b1808
+	brtrue L_10b1e50
 // --- basic block ---
-// 0x010b1e54: 0x10b1e54: j	 0x10b1f20 sll   zero, zero, 0
-	br L_10b1f20
+// 0x010b249c: 0x10b249c: j	 0x10b2568 sll   zero, zero, 0
+	br L_10b2568
 // --- basic block ---
-L_10b1e5c:
-// 0x010b1e5c: 0x10b1e5c: addiu v0, sp, 176
+L_10b24a4:
+// 0x010b24a4: 0x10b24a4: addiu v0, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc 5
-// 0x010b1e60: 0x10b1e60: lui   s1, 0x0
+// 0x010b24a8: 0x10b24a8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010b1e64: 0x10b1e64: lui   a1, 0xe0000
+// 0x010b24ac: 0x10b24ac: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010b1e68: 0x10b1e68: lui   a3, 0x0
+// 0x010b24b0: 0x10b24b0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010b1e6c: 0x10b1e6c: lw    v1, 308(sp)
+// 0x010b24b4: 0x10b24b4: lw    v1, 308(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8681,7 +8681,7 @@ L_10b1e5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1e70: 0x10b1e70: sw    v0, 16(sp)
+// 0x010b24b8: 0x10b24b8: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8690,25 +8690,25 @@ L_10b1e5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b1e74: 0x10b1e74: addiu a1, a1, -19240
+// 0x010b24bc: 0x10b24bc: addiu a1, a1, -18776
 	ldloc.2
-	ldc.i4 -19240
+	ldc.i4 -18776
 	add
 	stloc.2
-// 0x010b1e78: 0x10b1e78: addiu v0, zero, 10
+// 0x010b24c0: 0x10b24c0: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x010b1e7c: 0x10b1e7c: addiu a3, a3, 18980
+// 0x010b24c4: 0x10b24c4: addiu a3, a3, 18980
 	ldloc 4
 	ldc.i4 18980
 	add
 	stloc 4
-// 0x010b1e80: 0x10b1e80: addiu a2, s1, 18904
+// 0x010b24c8: 0x10b24c8: addiu a2, s1, 18904
 	ldloc 10
 	ldc.i4 18904
 	add
 	stloc.3
-// 0x010b1e84: 0x10b1e84: sw    v0, 20(sp)
+// 0x010b24cc: 0x10b24cc: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8717,7 +8717,7 @@ L_10b1e5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b1e88: 0x10b1e88: jal   0x10ae97c sw    v1, 24(sp)
+// 0x010b24d0: 0x10b24d0: jal   0x10aefc4 sw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8731,22 +8731,22 @@ L_10b1e5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_unknown_locate_point_10ae97c(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_unknown_locate_point_10aefc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1e90: 0x10b1e90: beq   v0, zero, 0x10b1f20 sll   zero, zero, 0
+// 0x010b24d8: 0x10b24d8: beq   v0, zero, 0x10b2568 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b1f20
+	brfalse L_10b2568
 // --- basic block ---
-// 0x010b1e98: 0x10b1e98: bne   s8, zero, 0x10b1eb8 addu  a1, v0, zero
+// 0x010b24e0: 0x10b24e0: bne   s8, zero, 0x10b2500 addu  a1, v0, zero
 	ldloc 15
 	ldloc 5
 	stloc.2
-	brtrue L_10b1eb8
+	brtrue L_10b2500
 // --- basic block ---
-// 0x010b1ea0: 0x10b1ea0: lw    v1, 18904(s1)
+// 0x010b24e8: 0x10b24e8: lw    v1, 18904(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8755,24 +8755,24 @@ L_10b1e5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b1ea4: 0x10b1ea4: sll   zero, zero, 0
-// 0x010b1ea8: 0x10b1ea8: beq   v1, zero, 0x10b1eb8 sll   zero, zero, 0
+// 0x010b24ec: 0x10b24ec: sll   zero, zero, 0
+// 0x010b24f0: 0x10b24f0: beq   v1, zero, 0x10b2500 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b1eb8
+	brfalse L_10b2500
 // --- basic block ---
-// 0x010b1eb0: 0x10b1eb0: j	 0x10b1f20 sw    zero, -11576(s0)
+// 0x010b24f8: 0x10b24f8: j	 0x10b2568 sw    zero, -11112(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b1f20
+	br L_10b2568
 // --- basic block ---
-L_10b1eb8:
-// 0x010b1eb8: 0x10b1eb8: jal   0x10b1404 addiu a0, sp, 176
+L_10b2500:
+// 0x010b2500: 0x10b2500: jal   0x10b1a4c addiu a0, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -8782,15 +8782,15 @@ L_10b1eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::end_unknown_segments_10b1404(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::end_unknown_segments_10b1a4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1ec0: 0x10b1ec0: lui   v0, 0x0
+// 0x010b2508: 0x10b2508: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b1ec4: 0x10b1ec4: lw    v0, 18904(v0)
+// 0x010b250c: 0x10b250c: lw    v0, 18904(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8799,48 +8799,48 @@ L_10b1eb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1ec8: 0x10b1ec8: sll   zero, zero, 0
-// 0x010b1ecc: 0x10b1ecc: beq   v0, zero, 0x10b1ee0 lui   v0, 0x90000
+// 0x010b2510: 0x10b2510: sll   zero, zero, 0
+// 0x010b2514: 0x10b2514: beq   v0, zero, 0x10b2528 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10b1ee0
+	brfalse L_10b2528
 // --- basic block ---
-// 0x010b1ed4: 0x10b1ed4: lui   v0, 0x90000
+// 0x010b251c: 0x10b251c: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b1ed8: 0x10b1ed8: sw    zero, -11576(v0)
+// 0x010b2520: 0x10b2520: sw    zero, -11112(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2894
+	ldc.i4 -2778
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b1edc: 0x10b1edc: lui   v0, 0x90000
+// 0x010b2524: 0x10b2524: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10b1ee0:
-// 0x010b1ee0: 0x10b1ee0: addu  s1, v0, zero
+L_10b2528:
+// 0x010b2528: 0x10b2528: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010b1ee4: 0x10b1ee4: lw    s2, -11584(v0)
+// 0x010b252c: 0x10b252c: lw    s2, -11120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b1ee8: 0x10b1ee8: j	 0x10b1f08 addu  s0, zero, zero
+// 0x010b2530: 0x10b2530: j	 0x10b2550 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10b1f08
+	br L_10b2550
 // --- basic block ---
-L_10b1ef0:
-// 0x010b1ef0: 0x10b1ef0: jal   0x10b17b0 addiu s0, s0, 1
+L_10b2538:
+// 0x010b2538: 0x10b2538: jal   0x10b1df8 addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -8850,43 +8850,43 @@ L_10b1ef0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_rec_locate_point_10b17b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_rec_locate_point_10b1df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b1ef8: 0x10b1ef8: lw    v0, -11584(s1)
+// 0x010b2540: 0x10b2540: lw    v0, -11120(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1efc: 0x10b1efc: sll   zero, zero, 0
-// 0x010b1f00: 0x10b1f00: bne   v0, s2, 0x10b1f20 sll   zero, zero, 0
+// 0x010b2544: 0x10b2544: sll   zero, zero, 0
+// 0x010b2548: 0x10b2548: bne   v0, s2, 0x10b2568 sll   zero, zero, 0
 	ldloc 5
 	ldloc 11
-	bne.un L_10b1f20
+	bne.un L_10b2568
 // --- basic block ---
-L_10b1f08:
-// 0x010b1f08: 0x10b1f08: lw    v0, -11584(s1)
+L_10b2550:
+// 0x010b2550: 0x10b2550: lw    v0, -11120(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1f0c: 0x10b1f0c: sll   zero, zero, 0
-// 0x010b1f10: 0x10b1f10: slt   v0, s0, v0
+// 0x010b2554: 0x10b2554: sll   zero, zero, 0
+// 0x010b2558: 0x10b2558: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b1f14: 0x10b1f14: lw    a1, 308(sp)
+// 0x010b255c: 0x10b255c: lw    a1, 308(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8895,15 +8895,15 @@ L_10b1f08:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b1f18: 0x10b1f18: bne   v0, zero, 0x10b1ef0 addu  a0, s0, zero
+// 0x010b2560: 0x10b2560: bne   v0, zero, 0x10b2538 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_10b1ef0
+	brtrue L_10b2538
 // --- basic block ---
-L_10b1f20:
-// 0x010b1f20: 0x10b1f20: lw    ra, 300(sp)
-// 0x010b1f24: 0x10b1f24: lw    s8, 296(sp)
+L_10b2568:
+// 0x010b2568: 0x10b2568: lw    ra, 300(sp)
+// 0x010b256c: 0x10b256c: lw    s8, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8912,7 +8912,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b1f28: 0x10b1f28: lw    s7, 292(sp)
+// 0x010b2570: 0x10b2570: lw    s7, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8921,7 +8921,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b1f2c: 0x10b1f2c: lw    s6, 288(sp)
+// 0x010b2574: 0x10b2574: lw    s6, 288(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8930,7 +8930,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b1f30: 0x10b1f30: lw    s5, 284(sp)
+// 0x010b2578: 0x10b2578: lw    s5, 284(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8939,7 +8939,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b1f34: 0x10b1f34: lw    s4, 280(sp)
+// 0x010b257c: 0x10b257c: lw    s4, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8948,7 +8948,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b1f38: 0x10b1f38: lw    s3, 276(sp)
+// 0x010b2580: 0x10b2580: lw    s3, 276(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8957,7 +8957,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b1f3c: 0x10b1f3c: lw    s2, 272(sp)
+// 0x010b2584: 0x10b2584: lw    s2, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8966,7 +8966,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b1f40: 0x10b1f40: lw    s1, 268(sp)
+// 0x010b2588: 0x10b2588: lw    s1, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8975,7 +8975,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b1f44: 0x10b1f44: lw    s0, 264(sp)
+// 0x010b258c: 0x10b258c: lw    s0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8984,7 +8984,7 @@ L_10b1f20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b1f48: 0x10b1f48: jr    ra addiu sp, sp, 304
+// 0x010b2590: 0x10b2590: jr    ra addiu sp, sp, 304
 	ldloc.0
 	ldc.i4 304
 	add
diff --git a/converted/Cibyl133.j b/converted/Cibyl133.j
index 5ba4e75..2c5c836 100644
--- a/converted/Cibyl133.j
+++ b/converted/Cibyl133.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl133::.ctor
 
-.method public static int32 editor_gps_update_10b1f50(int32,int32,int32,int32,int32)
+.method public static int32 editor_gps_update_10b2598(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s6,int32 s4,int32 s5,int32 s2,int32 s8,int32 s3,int32 t1,int32 s7,int32 ra,int32 t0)
@@ -109,12 +109,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b1f50: 0x10b1f50: addiu sp, sp, -88
+// 0x010b2598: 0x10b2598: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010b1f54: 0x10b1f54: sw    s2, 56(sp)
+// 0x010b259c: 0x10b259c: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -123,7 +123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b1f58: 0x10b1f58: sw    s1, 52(sp)
+// 0x010b25a0: 0x10b25a0: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -132,7 +132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b1f5c: 0x10b1f5c: sw    s0, 48(sp)
+// 0x010b25a4: 0x10b25a4: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -141,8 +141,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b1f60: 0x10b1f60: sw    ra, 84(sp)
-// 0x010b1f64: 0x10b1f64: sw    s8, 80(sp)
+// 0x010b25a8: 0x10b25a8: sw    ra, 84(sp)
+// 0x010b25ac: 0x10b25ac: sw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -151,7 +151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b1f68: 0x10b1f68: sw    s7, 76(sp)
+// 0x010b25b0: 0x10b25b0: sw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -160,7 +160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010b1f6c: 0x10b1f6c: sw    s6, 72(sp)
+// 0x010b25b4: 0x10b25b4: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -169,7 +169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b1f70: 0x10b1f70: sw    s5, 68(sp)
+// 0x010b25b8: 0x10b25b8: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -178,7 +178,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b1f74: 0x10b1f74: sw    s4, 64(sp)
+// 0x010b25bc: 0x10b25bc: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -187,7 +187,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b1f78: 0x10b1f78: sw    s3, 60(sp)
+// 0x010b25c0: 0x10b25c0: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -196,30 +196,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b1f7c: 0x10b1f7c: addu  s2, a0, zero
+// 0x010b25c4: 0x10b25c4: addu  s2, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010b1f80: 0x10b1f80: addu  s1, a1, zero
+// 0x010b25c8: 0x10b25c8: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010b1f84: 0x10b1f84: jal   0x10ac694 addu  s0, a2, zero
+// 0x010b25cc: 0x10b25cc: jal   0x10accdc addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-	call int32 Cibyl129::editor_is_enabled_10ac694()
+	call int32 Cibyl129::editor_is_enabled_10accdc()
 	stloc 5
 // --- basic block ---
-// 0x010b1f8c: 0x10b1f8c: beq   v0, zero, 0x10b216c lui   v0, 0x90000
+// 0x010b25d4: 0x10b25d4: beq   v0, zero, 0x10b27b4 lui   v0, 0x90000
 	ldloc 5
 	ldc.i4 589824
 	stloc 5
-	brfalse L_10b216c
+	brfalse L_10b27b4
 // --- basic block ---
-// 0x010b1f94: 0x10b1f94: jal   0x10b0fe4 sw    s2, -11572(v0)
+// 0x010b25dc: 0x10b25dc: jal   0x10b162c sw    s2, -11108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2893
+	ldc.i4 -2777
 	add
 	ldloc 13
 	stelem.i4
@@ -228,17 +228,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_filter_init_10b0fe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_filter_init_10b162c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1f9c: 0x10b1f9c: addiu a1, sp, 24
+// 0x010b25e4: 0x10b25e4: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010b1fa0: 0x10b1fa0: jal   0x100844c addiu a0, sp, 28
+// 0x010b25e8: 0x10b25e8: jal   0x100845c addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -246,15 +246,15 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1fa8: 0x10b1fa8: addiu a1, zero, 20
+// 0x010b25f0: 0x10b25f0: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x010b1fac: 0x10b1fac: jal   0x10086bc addu  a0, s0, zero
+// 0x010b25f4: 0x10b25f4: jal   0x10086cc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -262,12 +262,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1fb4: 0x10b1fb4: jal   0x10afb3c addu  a0, s0, zero
+// 0x010b25fc: 0x10b25fc: jal   0x10b0184 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -275,30 +275,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_set_focus_10afb3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_set_focus_10b0184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1fbc: 0x10b1fbc: lui   v0, 0x90000
+// 0x010b2604: 0x10b2604: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b1fc0: 0x10b1fc0: lw    a0, -11568(v0)
+// 0x010b2608: 0x10b2608: lw    a0, -11104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2892
+	ldc.i4 -2776
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b1fc4: 0x10b1fc4: addu  a2, s1, zero
+// 0x010b260c: 0x10b260c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010b1fc8: 0x10b1fc8: addu  a3, s0, zero
+// 0x010b2610: 0x10b2610: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x010b1fcc: 0x10b1fcc: jal   0x10ace10 addu  a1, s2, zero
+// 0x010b2614: 0x10b2614: jal   0x10ad458 addu  a1, s2, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -306,67 +306,67 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_track_filter_add_10ace10(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_track_filter_add_10ad458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1fd4: 0x10b1fd4: addiu v1, zero, 1
+// 0x010b261c: 0x10b261c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010b1fd8: 0x10b1fd8: bne   v0, v1, 0x10b1fec lui   v0, 0x90000
+// 0x010b2620: 0x10b2620: bne   v0, v1, 0x10b2634 lui   v0, 0x90000
 	ldloc 5
 	ldloc 7
 	ldc.i4 589824
 	stloc 5
-	bne.un L_10b1fec
+	bne.un L_10b2634
 // --- basic block ---
-// 0x010b1fe0: 0x10b1fe0: jal   0x10b1788 sll   zero, zero, 0
+// 0x010b2628: 0x10b2628: jal   0x10b1dd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_end_10b1788(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_end_10b1dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b1fe8: 0x10b1fe8: lui   v0, 0x90000
+// 0x010b2630: 0x10b2630: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-L_10b1fec:
-// 0x010b1fec: 0x10b1fec: lw    v0, -11592(v0)
+L_10b2634:
+// 0x010b2634: 0x10b2634: lw    v0, -11128(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b1ff0: 0x10b1ff0: sll   zero, zero, 0
-// 0x010b1ff4: 0x10b1ff4: bne   v0, zero, 0x10b20f0 addiu a0, zero, 40
+// 0x010b2638: 0x10b2638: sll   zero, zero, 0
+// 0x010b263c: 0x10b263c: bne   v0, zero, 0x10b2738 addiu a0, zero, 40
 	ldloc 5
 	ldc.i4.s 40
 	stloc.1
-	brtrue L_10b20f0
+	brtrue L_10b2738
 // --- basic block ---
-// 0x010b1ffc: 0x10b1ffc: jal   0x102bcf0 addiu a1, zero, 150
+// 0x010b2644: 0x10b2644: jal   0x102bd00 addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bcf0(int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bd00(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2004: 0x10b2004: j	 0x10b20f4 lui   s6, 0xe0000
+// 0x010b264c: 0x10b264c: j	 0x10b273c lui   s6, 0xe0000
 	ldc.i4 917504
 	stloc 10
-	br L_10b20f4
+	br L_10b273c
 // --- basic block ---
-L_10b200c:
-// 0x010b200c: 0x10b200c: jal   0x1001800 sll   zero, zero, 0
+L_10b2654:
+// 0x010b2654: 0x10b2654: jal   0x1001800 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -376,38 +376,38 @@ L_10b200c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2014: 0x10b2014: lw    v0, -11584(s0)
+// 0x010b265c: 0x10b265c: lw    v0, -11120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2018: 0x10b2018: sll   zero, zero, 0
-// 0x010b201c: 0x10b201c: bne   v0, s1, 0x10b2078 lui   a3, 0x20000
+// 0x010b2660: 0x10b2660: sll   zero, zero, 0
+// 0x010b2664: 0x10b2664: bne   v0, s1, 0x10b26c0 lui   a3, 0x20000
 	ldloc 5
 	ldloc 9
 	ldc.i4 131072
 	stloc 4
-	bne.un L_10b2078
+	bne.un L_10b26c0
 // --- basic block ---
-// 0x010b2024: 0x10b2024: addiu a3, a3, 18748
+// 0x010b266c: 0x10b266c: addiu a3, a3, 19208
 	ldloc 4
-	ldc.i4 18748
+	ldc.i4 19208
 	add
 	stloc 4
-// 0x010b2028: 0x10b2028: addu  a1, s5, zero
+// 0x010b2670: 0x10b2670: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x010b202c: 0x10b202c: addiu a0, zero, 3
+// 0x010b2674: 0x10b2674: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010b2030: 0x10b2030: addiu a2, zero, 989
+// 0x010b2678: 0x10b2678: addiu a2, zero, 989
 	ldc.i4 989
 	stloc.3
-// 0x010b2034: 0x10b2034: jal   0x100449c sw    s1, 16(sp)
+// 0x010b267c: 0x10b267c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -426,44 +426,44 @@ L_10b200c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b203c: 0x10b203c: jal   0x10b16b0 sll   zero, zero, 0
+// 0x010b2684: 0x10b2684: jal   0x10b1cf8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_force_reset_10b16b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_force_reset_10b1cf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2044: 0x10b2044: lw    v0, -11584(s0)
+// 0x010b268c: 0x10b268c: lw    v0, -11120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2048: 0x10b2048: sll   zero, zero, 0
-// 0x010b204c: 0x10b204c: bne   v0, s1, 0x10b2078 addu  a3, s8, zero
+// 0x010b2690: 0x10b2690: sll   zero, zero, 0
+// 0x010b2694: 0x10b2694: bne   v0, s1, 0x10b26c0 addu  a3, s8, zero
 	ldloc 5
 	ldloc 9
 	ldloc 14
 	stloc 4
-	bne.un L_10b2078
+	bne.un L_10b26c0
 // --- basic block ---
-// 0x010b2054: 0x10b2054: addu  a1, s5, zero
+// 0x010b269c: 0x10b269c: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x010b2058: 0x10b2058: addiu a0, zero, 4
+// 0x010b26a0: 0x10b26a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b205c: 0x10b205c: addiu a2, zero, 996
+// 0x010b26a4: 0x10b26a4: addiu a2, zero, 996
 	ldc.i4 996
 	stloc.3
-// 0x010b2060: 0x10b2060: jal   0x100449c sw    s1, 16(sp)
+// 0x010b26a8: 0x10b26a8: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -482,60 +482,60 @@ L_10b200c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2068: 0x10b2068: lw    v0, -11584(s0)
+// 0x010b26b0: 0x10b26b0: lw    v0, -11120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b206c: 0x10b206c: sll   zero, zero, 0
-// 0x010b2070: 0x10b2070: addiu v0, v0, -1
+// 0x010b26b4: 0x10b26b4: sll   zero, zero, 0
+// 0x010b26b8: 0x10b26b8: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010b2074: 0x10b2074: sw    v0, -11584(s0)
+// 0x010b26bc: 0x10b26bc: sw    v0, -11120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldloc 5
 	stelem.i4
-L_10b2078:
-// 0x010b2078: 0x10b2078: lw    v1, -11584(s0)
+L_10b26c0:
+// 0x010b26c0: 0x10b26c0: lw    v1, -11120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b207c: 0x10b207c: addu  a1, s6, zero
+// 0x010b26c4: 0x10b26c4: addu  a1, s6, zero
 	ldloc 10
 	stloc.2
-// 0x010b2080: 0x10b2080: sll   a3, v1, 5
+// 0x010b26c8: 0x10b26c8: sll   a3, v1, 5
 	ldloc 7
 	ldc.i4.5
 	shl
 	stloc 4
-// 0x010b2084: 0x10b2084: addu  a3, a3, s4
+// 0x010b26cc: 0x10b26cc: addu  a3, a3, s4
 	ldloc 4
 	ldloc 11
 	add
 	stloc 4
-// 0x010b2088: 0x10b2088: addu  a0, a3, zero
+// 0x010b26d0: 0x10b26d0: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x010b208c: 0x10b208c: addiu a2, zero, 20
+// 0x010b26d4: 0x10b26d4: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x010b2090: 0x10b2090: sw    v1, 44(sp)
+// 0x010b26d8: 0x10b26d8: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -544,7 +544,7 @@ L_10b2078:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2094: 0x10b2094: jal   0x1001800 sw    a3, 40(sp)
+// 0x010b26dc: 0x10b26dc: jal   0x1001800 sw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -562,7 +562,7 @@ L_10b2078:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b209c: 0x10b209c: lw    v1, 44(sp)
+// 0x010b26e4: 0x10b26e4: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -571,7 +571,7 @@ L_10b2078:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b20a0: 0x10b20a0: lw    v0, 19140(s3)
+// 0x010b26e8: 0x10b26e8: lw    v0, 19140(s3)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -580,7 +580,7 @@ L_10b2078:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b20a4: 0x10b20a4: lw    a3, 40(sp)
+// 0x010b26ec: 0x10b26ec: lw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -589,27 +589,27 @@ L_10b2078:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b20a8: 0x10b20a8: sll   t1, v1, 5
+// 0x010b26f0: 0x10b26f0: sll   t1, v1, 5
 	ldloc 7
 	ldc.i4.5
 	shl
 	stloc 16
-// 0x010b20ac: 0x10b20ac: addiu a2, v1, 1
+// 0x010b26f4: 0x10b26f4: addiu a2, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc.3
-// 0x010b20b0: 0x10b20b0: addu  t1, s4, t1
+// 0x010b26f8: 0x10b26f8: addu  t1, s4, t1
 	ldloc 11
 	ldloc 16
 	add
 	stloc 16
-// 0x010b20b4: 0x10b20b4: addiu t0, v0, 1
+// 0x010b26fc: 0x10b26fc: addiu t0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 19
-// 0x010b20b8: 0x10b20b8: sw    s2, 20(t1)
+// 0x010b2700: 0x10b2700: sw    s2, 20(t1)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -618,7 +618,7 @@ L_10b2078:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b20bc: 0x10b20bc: sw    v0, 28(a3)
+// 0x010b2704: 0x10b2704: sw    v0, 28(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -627,10 +627,10 @@ L_10b2078:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b20c0: 0x10b20c0: addiu a1, zero, 150
+// 0x010b2708: 0x10b2708: addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
-// 0x010b20c4: 0x10b20c4: sw    t0, 19140(s3)
+// 0x010b270c: 0x10b270c: sw    t0, 19140(s3)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -639,19 +639,19 @@ L_10b2078:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010b20c8: 0x10b20c8: sw    a2, -11584(s0)
+// 0x010b2710: 0x10b2710: sw    a2, -11120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b20cc: 0x10b20cc: addiu a0, zero, 40
+// 0x010b2714: 0x10b2714: addiu a0, zero, 40
 	ldc.i4.s 40
 	stloc.1
-// 0x010b20d0: 0x10b20d0: jal   0x102bcf0 sw    zero, 24(a3)
+// 0x010b2718: 0x10b2718: jal   0x102bd00 sw    zero, 24(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -662,10 +662,10 @@ L_10b2078:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bcf0(int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_set_cycle_params_102bd00(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010b20d8: 0x10b20d8: lw    v1, 44(sp)
+// 0x010b2720: 0x10b2720: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -674,10 +674,10 @@ L_10b2078:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b20dc: 0x10b20dc: addu  a1, zero, zero
+// 0x010b2724: 0x10b2724: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b20e0: 0x10b20e0: jal   0x10b17b0 addu  a0, v1, zero
+// 0x010b2728: 0x10b2728: jal   0x10b1df8 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -685,134 +685,134 @@ L_10b2078:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::track_rec_locate_point_10b17b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::track_rec_locate_point_10b1df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b20e8: 0x10b20e8: j	 0x10b2120 sll   zero, zero, 0
-	br L_10b2120
+// 0x010b2730: 0x10b2730: j	 0x10b2768 sll   zero, zero, 0
+	br L_10b2768
 // --- basic block ---
-L_10b20f0:
-// 0x010b20f0: 0x10b20f0: lui   s6, 0xe0000
+L_10b2738:
+// 0x010b2738: 0x10b2738: lui   s6, 0xe0000
 	ldc.i4 917504
 	stloc 10
-L_10b20f4:
-// 0x010b20f4: 0x10b20f4: lui   s5, 0x20000
+L_10b273c:
+// 0x010b273c: 0x10b273c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x010b20f8: 0x10b20f8: lui   s8, 0x20000
+// 0x010b2740: 0x10b2740: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x010b20fc: 0x10b20fc: lui   s4, 0x90000
+// 0x010b2744: 0x10b2744: lui   s4, 0x90000
 	ldc.i4 589824
 	stloc 11
-// 0x010b2100: 0x10b2100: addiu s6, s6, -19240
+// 0x010b2748: 0x10b2748: addiu s6, s6, -18776
 	ldloc 10
-	ldc.i4 -19240
+	ldc.i4 -18776
 	add
 	stloc 10
-// 0x010b2104: 0x10b2104: addiu s5, s5, 18640
+// 0x010b274c: 0x10b274c: addiu s5, s5, 19100
 	ldloc 12
-	ldc.i4 18640
+	ldc.i4 19100
 	add
 	stloc 12
-// 0x010b2108: 0x10b2108: addiu s8, s8, 18792
+// 0x010b2750: 0x10b2750: addiu s8, s8, 19252
 	ldloc 14
-	ldc.i4 18792
+	ldc.i4 19252
 	add
 	stloc 14
-// 0x010b210c: 0x10b210c: addiu s4, s4, -11560
+// 0x010b2754: 0x10b2754: addiu s4, s4, -11096
 	ldloc 11
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc 11
-// 0x010b2110: 0x10b2110: lui   s7, 0x90000
+// 0x010b2758: 0x10b2758: lui   s7, 0x90000
 	ldc.i4 589824
 	stloc 17
-// 0x010b2114: 0x10b2114: lui   s0, 0x90000
+// 0x010b275c: 0x10b275c: lui   s0, 0x90000
 	ldc.i4 589824
 	stloc 8
-// 0x010b2118: 0x10b2118: addiu s1, zero, 10000
+// 0x010b2760: 0x10b2760: addiu s1, zero, 10000
 	ldc.i4 10000
 	stloc 9
-// 0x010b211c: 0x10b211c: lui   s3, 0x0
+// 0x010b2764: 0x10b2764: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 15
-L_10b2120:
-// 0x010b2120: 0x10b2120: lw    a0, -11568(s7)
+L_10b2768:
+// 0x010b2768: 0x10b2768: lw    a0, -11104(s7)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2892
+	ldc.i4 -2776
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2124: 0x10b2124: jal   0x10acd08 sll   zero, zero, 0
+// 0x010b276c: 0x10b276c: jal   0x10ad350 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_track_filter_get_10acd08(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_track_filter_get_10ad350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b212c: 0x10b212c: addu  a1, v0, zero
+// 0x010b2774: 0x10b2774: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010b2130: 0x10b2130: addu  a0, s6, zero
+// 0x010b2778: 0x10b2778: addu  a0, s6, zero
 	ldloc 10
 	stloc.1
-// 0x010b2134: 0x10b2134: bne   v0, zero, 0x10b200c addiu a2, zero, 20
+// 0x010b277c: 0x10b277c: bne   v0, zero, 0x10b2654 addiu a2, zero, 20
 	ldloc 5
 	ldc.i4.s 20
 	stloc.3
-	brtrue L_10b200c
+	brtrue L_10b2654
 // --- basic block ---
-// 0x010b213c: 0x10b213c: lui   v0, 0x90000
+// 0x010b2784: 0x10b2784: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b2140: 0x10b2140: lw    v0, -11592(v0)
+// 0x010b2788: 0x10b2788: lw    v0, -11128(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2898
+	ldc.i4 -2782
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2144: 0x10b2144: sll   zero, zero, 0
-// 0x010b2148: 0x10b2148: bne   v0, zero, 0x10b2158 sll   zero, zero, 0
+// 0x010b278c: 0x10b278c: sll   zero, zero, 0
+// 0x010b2790: 0x10b2790: bne   v0, zero, 0x10b27a0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b2158
+	brtrue L_10b27a0
 // --- basic block ---
-// 0x010b2150: 0x10b2150: jal   0x102c094 sll   zero, zero, 0
+// 0x010b2798: 0x10b2798: jal   0x102c0a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_fuzzy_reset_cycle_102c094(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_reset_cycle_102c0a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b2158:
-// 0x010b2158: 0x10b2158: jal   0x10afb1c sll   zero, zero, 0
+L_10b27a0:
+// 0x010b27a0: 0x10b27a0: jal   0x10b0164 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl131::editor_track_util_release_focus_10afb1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl131::editor_track_util_release_focus_10b0164(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2160: 0x10b2160: lw    a1, 24(sp)
+// 0x010b27a8: 0x10b27a8: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -821,7 +821,7 @@ L_10b2158:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2164: 0x10b2164: jal   0x10086bc addiu a0, sp, 28
+// 0x010b27ac: 0x10b27ac: jal   0x10086cc addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -831,14 +831,14 @@ L_10b2158:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b216c:
-// 0x010b216c: 0x10b216c: lw    ra, 84(sp)
-// 0x010b2170: 0x10b2170: lw    s8, 80(sp)
+L_10b27b4:
+// 0x010b27b4: 0x10b27b4: lw    ra, 84(sp)
+// 0x010b27b8: 0x10b27b8: lw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -847,7 +847,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b2174: 0x10b2174: lw    s7, 76(sp)
+// 0x010b27bc: 0x10b27bc: lw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -856,7 +856,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010b2178: 0x10b2178: lw    s6, 72(sp)
+// 0x010b27c0: 0x10b27c0: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -865,7 +865,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b217c: 0x10b217c: lw    s5, 68(sp)
+// 0x010b27c4: 0x10b27c4: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -874,7 +874,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b2180: 0x10b2180: lw    s4, 64(sp)
+// 0x010b27c8: 0x10b27c8: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -883,7 +883,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b2184: 0x10b2184: lw    s3, 60(sp)
+// 0x010b27cc: 0x10b27cc: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -892,7 +892,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b2188: 0x10b2188: lw    s2, 56(sp)
+// 0x010b27d0: 0x10b27d0: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -901,7 +901,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b218c: 0x10b218c: lw    s1, 52(sp)
+// 0x010b27d4: 0x10b27d4: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -910,7 +910,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b2190: 0x10b2190: lw    s0, 48(sp)
+// 0x010b27d8: 0x10b27d8: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -919,7 +919,7 @@ L_10b216c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b2194: 0x10b2194: jr    ra addiu sp, sp, 88
+// 0x010b27dc: 0x10b27dc: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -931,7 +931,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_draw_current_new_direction_road_10b219c(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_draw_current_new_direction_road_10b27e4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 lo,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 t0)
@@ -999,25 +999,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b219c: 0x10b219c: lui   v0, 0x90000
+// 0x010b27e4: 0x10b27e4: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x010b21a0: 0x10b21a0: lw    v0, -11584(v0)
+// 0x010b27e8: 0x10b27e8: lw    v0, -11120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b21a4: 0x10b21a4: addiu sp, sp, -176
+// 0x010b27ec: 0x10b27ec: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x010b21a8: 0x10b21a8: sw    ra, 172(sp)
-// 0x010b21ac: 0x10b21ac: sw    s8, 168(sp)
+// 0x010b27f0: 0x10b27f0: sw    ra, 172(sp)
+// 0x010b27f4: 0x10b27f4: sw    s8, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1026,7 +1026,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010b21b0: 0x10b21b0: sw    s7, 164(sp)
+// 0x010b27f8: 0x10b27f8: sw    s7, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1035,7 +1035,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b21b4: 0x10b21b4: sw    s6, 160(sp)
+// 0x010b27fc: 0x10b27fc: sw    s6, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1044,7 +1044,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b21b8: 0x10b21b8: sw    s5, 156(sp)
+// 0x010b2800: 0x10b2800: sw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1053,7 +1053,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b21bc: 0x10b21bc: sw    s4, 152(sp)
+// 0x010b2804: 0x10b2804: sw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1062,7 +1062,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b21c0: 0x10b21c0: sw    s3, 148(sp)
+// 0x010b2808: 0x10b2808: sw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1071,7 +1071,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b21c4: 0x10b21c4: sw    s2, 144(sp)
+// 0x010b280c: 0x10b280c: sw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1080,7 +1080,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b21c8: 0x10b21c8: sw    s1, 140(sp)
+// 0x010b2810: 0x10b2810: sw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1089,7 +1089,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b21cc: 0x10b21cc: blez  v0, 0x10b24e4 sw    s0, 136(sp)
+// 0x010b2814: 0x10b2814: blez  v0, 0x10b2b2c sw    s0, 136(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1100,12 +1100,12 @@ __CIBYL_javamethod_begin:
 	ldloc 8
 	stelem.i4
 	ldc.i4.s 0
-	ble L_10b24e4
+	ble L_10b2b2c
 // --- basic block ---
-// 0x010b21d4: 0x10b21d4: lui   v0, 0x0
+// 0x010b281c: 0x10b281c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b21d8: 0x10b21d8: lw    a0, 18992(v0)
+// 0x010b2820: 0x10b2820: lw    a0, 18992(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1114,10 +1114,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b21dc: 0x10b21dc: lui   v0, 0x0
+// 0x010b2824: 0x10b2824: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b21e0: 0x10b21e0: lw    v0, 576(v0)
+// 0x010b2828: 0x10b2828: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1126,24 +1126,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b21e4: 0x10b21e4: sll   zero, zero, 0
-// 0x010b21e8: 0x10b21e8: beq   a0, v0, 0x10b2200 lui   s0, 0x0
+// 0x010b282c: 0x10b282c: sll   zero, zero, 0
+// 0x010b2830: 0x10b2830: beq   a0, v0, 0x10b2848 lui   s0, 0x0
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	beq  L_10b2200
+	beq  L_10b2848
 // --- basic block ---
-// 0x010b21f0: 0x10b21f0: bltz  a0, 0x10b2204 addiu s0, s0, 18980
+// 0x010b2838: 0x10b2838: bltz  a0, 0x10b284c addiu s0, s0, 18980
 	ldloc.1
 	ldloc 8
 	ldc.i4 18980
 	add
 	stloc 8
 	ldc.i4.s 0
-	blt L_10b2204
+	blt L_10b284c
 // --- basic block ---
-// 0x010b21f8: 0x10b21f8: jal   0x100b164 lui   s0, 0x0
+// 0x010b2840: 0x10b2840: jal   0x100b174 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -1151,19 +1151,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b2200:
-// 0x010b2200: 0x10b2200: addiu s0, s0, 18980
+L_10b2848:
+// 0x010b2848: 0x10b2848: addiu s0, s0, 18980
 	ldloc 8
 	ldc.i4 18980
 	add
 	stloc 8
-L_10b2204:
-// 0x010b2204: 0x10b2204: lw    a0, 4(s0)
+L_10b284c:
+// 0x010b284c: 0x10b284c: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1172,20 +1172,20 @@ L_10b2204:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2208: 0x10b2208: jal   0x1004ae4 sll   zero, zero, 0
+// 0x010b2850: 0x10b2850: jal   0x1004af4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004ae4(int32)
+	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004af4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2210: 0x10b2210: beq   v0, zero, 0x10b24e4 lui   v0, 0x20000
+// 0x010b2858: 0x10b2858: beq   v0, zero, 0x10b2b2c lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10b24e4
+	brfalse L_10b2b2c
 // --- basic block ---
-// 0x010b2218: 0x10b2218: lw    v1, 4(s0)
+// 0x010b2860: 0x10b2860: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1194,53 +1194,53 @@ L_10b2204:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b221c: 0x10b221c: lw    a0, 31152(v0)
+// 0x010b2864: 0x10b2864: lw    a0, 31616(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2220: 0x10b2220: sll   v0, v1, 3
+// 0x010b2868: 0x10b2868: sll   v0, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010b2224: 0x10b2224: addu  v0, a0, v0
+// 0x010b286c: 0x10b286c: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x010b2228: 0x10b2228: sh    v1, 108(sp)
+// 0x010b2870: 0x10b2870: sh    v1, 108(sp)
 	ldloc.0
 	ldc.i4.s 108
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010b222c: 0x10b222c: lhu   a1, 0(v0)
+// 0x010b2874: 0x10b2874: lhu   a1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x010b2230: 0x10b2230: lui   v1, 0x20000
+// 0x010b2878: 0x10b2878: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010b2234: 0x10b2234: lw    a0, 31228(v1)
+// 0x010b287c: 0x10b287c: lw    a0, 31692(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2238: 0x10b2238: andi  a1, a1, 32767
+// 0x010b2880: 0x10b2880: andi  a1, a1, 32767
 	ldloc.2
 	ldc.i4 32767
 	and
 	stloc.2
-// 0x010b223c: 0x10b223c: lw    v1, 12(s0)
+// 0x010b2884: 0x10b2884: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1249,12 +1249,12 @@ L_10b2204:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2240: 0x10b2240: sll   a1, a1, 3
+// 0x010b2888: 0x10b2888: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x010b2244: 0x10b2244: sw    v1, 96(sp)
+// 0x010b288c: 0x10b288c: sw    v1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1263,25 +1263,25 @@ L_10b2204:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2248: 0x10b2248: addu  a1, a0, a1
+// 0x010b2890: 0x10b2890: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x010b224c: 0x10b224c: lw    a2, 0(a1)
+// 0x010b2894: 0x10b2894: lw    a2, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010b2250: 0x10b2250: lhu   v1, 2(v0)
+// 0x010b2898: 0x10b2898: lhu   v1, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x010b2254: 0x10b2254: sw    a2, 72(sp)
+// 0x010b289c: 0x10b289c: sw    a2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1290,7 +1290,7 @@ L_10b2204:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2258: 0x10b2258: lw    a1, 4(a1)
+// 0x010b28a0: 0x10b28a0: lw    a1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1299,17 +1299,17 @@ L_10b2204:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b225c: 0x10b225c: andi  v1, v1, 32767
+// 0x010b28a4: 0x10b28a4: andi  v1, v1, 32767
 	ldloc 7
 	ldc.i4 32767
 	and
 	stloc 7
-// 0x010b2260: 0x10b2260: sll   v1, v1, 3
+// 0x010b28a8: 0x10b28a8: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x010b2264: 0x10b2264: sw    a1, 76(sp)
+// 0x010b28ac: 0x10b28ac: sw    a1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1318,25 +1318,25 @@ L_10b2204:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b2268: 0x10b2268: addu  v1, a0, v1
+// 0x010b28b0: 0x10b28b0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x010b226c: 0x10b226c: lw    a0, 0(v1)
+// 0x010b28b4: 0x10b28b4: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b2270: 0x10b2270: lhu   v0, 4(v0)
+// 0x010b28b8: 0x10b28b8: lhu   v0, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010b2274: 0x10b2274: sw    a0, 80(sp)
+// 0x010b28bc: 0x10b28bc: sw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1345,7 +1345,7 @@ L_10b2204:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b2278: 0x10b2278: lw    v1, 4(v1)
+// 0x010b28c0: 0x10b28c0: lw    v1, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1354,8 +1354,8 @@ L_10b2204:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b227c: 0x10b227c: sll   zero, zero, 0
-// 0x010b2280: 0x10b2280: sw    v1, 84(sp)
+// 0x010b28c4: 0x10b28c4: sll   zero, zero, 0
+// 0x010b28c8: 0x10b28c8: sw    v1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1364,22 +1364,22 @@ L_10b2204:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2284: 0x10b2284: ori   v1, zero, 65535
+// 0x010b28cc: 0x10b28cc: ori   v1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 7
-// 0x010b2288: 0x10b2288: bne   v0, v1, 0x10b229c lui   v1, 0x20000
+// 0x010b28d0: 0x10b28d0: bne   v0, v1, 0x10b28e4 lui   v1, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc 7
-	bne.un L_10b229c
+	bne.un L_10b28e4
 // --- basic block ---
-// 0x010b2290: 0x10b2290: addiu v0, zero, -1
+// 0x010b28d8: 0x10b28d8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b2294: 0x10b2294: j	 0x10b22c4 sw    v0, 112(sp)
+// 0x010b28dc: 0x10b28dc: j	 0x10b290c sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1388,46 +1388,46 @@ L_10b2204:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10b22c4
+	br L_10b290c
 // --- basic block ---
-L_10b229c:
-// 0x010b229c: 0x10b229c: lw    a0, 31240(v1)
+L_10b28e4:
+// 0x010b28e4: 0x10b28e4: lw    a0, 31704(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b22a0: 0x10b22a0: sll   v1, v0, 2
+// 0x010b28e8: 0x10b28e8: sll   v1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010b22a4: 0x10b22a4: addu  v1, a0, v1
+// 0x010b28ec: 0x10b28ec: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x010b22a8: 0x10b22a8: lw    v1, 0(v1)
+// 0x010b28f0: 0x10b28f0: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b22ac: 0x10b22ac: addiu v0, v0, 1
+// 0x010b28f4: 0x10b28f4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010b22b0: 0x10b22b0: addu  v1, v1, v0
+// 0x010b28f8: 0x10b28f8: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010b22b4: 0x10b22b4: sw    v0, 112(sp)
+// 0x010b28fc: 0x10b28fc: sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1436,17 +1436,17 @@ L_10b229c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b22b8: 0x10b22b8: addiu v1, v1, -1
+// 0x010b2900: 0x10b2900: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x010b22bc: 0x10b22bc: addiu v0, sp, 72
+// 0x010b2904: 0x10b2904: addiu v0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 5
-// 0x010b22c0: 0x10b22c0: sw    v1, 42(v0)
+// 0x010b2908: 0x10b2908: sw    v1, 42(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 42
@@ -1455,8 +1455,8 @@ L_10b229c:
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10b22c4:
-// 0x010b22c4: 0x10b22c4: lw    v0, 72(sp)
+L_10b290c:
+// 0x010b290c: 0x10b290c: lw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1465,10 +1465,10 @@ L_10b22c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b22c8: 0x10b22c8: lui   s4, 0xe0000
+// 0x010b2910: 0x10b2910: lui   s4, 0xe0000
 	ldc.i4 917504
 	stloc 13
-// 0x010b22cc: 0x10b22cc: sw    v0, 88(sp)
+// 0x010b2914: 0x10b2914: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1477,7 +1477,7 @@ L_10b22c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b22d0: 0x10b22d0: lw    v0, 76(sp)
+// 0x010b2918: 0x10b2918: lw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1486,12 +1486,12 @@ L_10b22c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b22d4: 0x10b22d4: addiu s1, sp, 48
+// 0x010b291c: 0x10b291c: addiu s1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 10
-// 0x010b22d8: 0x10b22d8: sw    v0, 92(sp)
+// 0x010b2920: 0x10b2920: sw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1500,39 +1500,39 @@ L_10b22c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b22dc: 0x10b22dc: addu  s0, zero, zero
+// 0x010b2924: 0x10b2924: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b22e0: 0x10b22e0: lui   s5, 0xe0000
+// 0x010b2928: 0x10b2928: lui   s5, 0xe0000
 	ldc.i4 917504
 	stloc 14
-// 0x010b22e4: 0x10b22e4: addiu s8, s4, 29604
+// 0x010b292c: 0x10b292c: addiu s8, s4, 30068
 	ldloc 13
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 17
-// 0x010b22e8: 0x10b22e8: addiu s7, zero, 16
+// 0x010b2930: 0x10b2930: addiu s7, zero, 16
 	ldc.i4.s 16
 	stloc 16
-// 0x010b22ec: 0x10b22ec: addiu s6, zero, 12
+// 0x010b2934: 0x10b2934: addiu s6, zero, 12
 	ldc.i4.s 12
 	stloc 15
-// 0x010b22f0: 0x10b22f0: addiu s3, zero, 3
+// 0x010b2938: 0x10b2938: addiu s3, zero, 3
 	ldc.i4.3
 	stloc 11
-// 0x010b22f4: 0x10b22f4: addiu s2, zero, 6
+// 0x010b293c: 0x10b293c: addiu s2, zero, 6
 	ldc.i4.6
 	stloc 9
-L_10b22f8:
-// 0x010b22f8: 0x10b22f8: lui   v0, 0x0
+L_10b2940:
+// 0x010b2940: 0x10b2940: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b22fc: 0x10b22fc: addiu v0, v0, 18980
+// 0x010b2944: 0x10b2944: addiu v0, v0, 18980
 	ldloc 5
 	ldc.i4 18980
 	add
 	stloc 5
-// 0x010b2300: 0x10b2300: lw    a0, 4(v0)
+// 0x010b2948: 0x10b2948: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1541,7 +1541,7 @@ L_10b22f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2304: 0x10b2304: jal   0x1003b50 sll   zero, zero, 0
+// 0x010b294c: 0x10b294c: jal   0x1003b50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -1550,32 +1550,32 @@ L_10b22f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b230c: 0x10b230c: addiu a0, zero, 192
+// 0x010b2954: 0x10b2954: addiu a0, zero, 192
 	ldc.i4 192
 	stloc.1
-// 0x010b2310: 0x10b2310: mult  v0, a0
+// 0x010b2958: 0x10b2958: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 12
-// 0x010b2314: 0x10b2314: lw    a0, 29728(s5)
+// 0x010b295c: 0x10b295c: lw    a0, 30192(s5)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2318: 0x10b2318: mflo  lo
+// 0x010b2960: 0x10b2960: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x010b231c: 0x10b231c: addu  a0, a0, v1
+// 0x010b2964: 0x10b2964: addu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-// 0x010b2320: 0x10b2320: lw    a1, 8(a0)
+// 0x010b2968: 0x10b2968: lw    a1, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1584,12 +1584,12 @@ L_10b22f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2324: 0x10b2324: sll   zero, zero, 0
-// 0x010b2328: 0x10b2328: beq   a1, zero, 0x10b23cc sll   zero, zero, 0
+// 0x010b296c: 0x10b296c: sll   zero, zero, 0
+// 0x010b2970: 0x10b2970: beq   a1, zero, 0x10b2a14 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b23cc
+	brfalse L_10b2a14
 // --- basic block ---
-// 0x010b2330: 0x10b2330: lw    a2, 120(s8)
+// 0x010b2978: 0x10b2978: lw    a2, 120(s8)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
@@ -1598,7 +1598,7 @@ L_10b22f8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2334: 0x10b2334: lw    a1, 16(a0)
+// 0x010b297c: 0x10b297c: lw    a1, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1607,87 +1607,87 @@ L_10b22f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2338: 0x10b2338: lw    a3, 29604(s4)
+// 0x010b2980: 0x10b2980: lw    a3, 30068(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b233c: 0x10b233c: bne   a2, zero, 0x10b2358 addiu a0, zero, 1
+// 0x010b2984: 0x10b2984: bne   a2, zero, 0x10b29a0 addiu a0, zero, 1
 	ldloc.3
 	ldc.i4.1
 	stloc.1
-	brtrue L_10b2358
+	brtrue L_10b29a0
 // --- basic block ---
-// 0x010b2344: 0x10b2344: j	 0x10b2374 slt   a1, a3, a1
+// 0x010b298c: 0x10b298c: j	 0x10b29bc slt   a1, a3, a1
 	ldloc 4
 	ldloc.2
 	clt
 	stloc.2
-	br L_10b2374
+	br L_10b29bc
 // --- basic block ---
-L_10b234c:
-// 0x010b234c: 0x10b234c: div   a2, s3
+L_10b2994:
+// 0x010b2994: 0x10b2994: div   a2, s3
 	ldloc.3
 	ldloc 11
 	div
 	stloc 12
-// 0x010b2350: 0x10b2350: addiu a0, a0, 1
+// 0x010b2998: 0x10b2998: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010b2354: 0x10b2354: mflo  lo
+// 0x010b299c: 0x10b299c: mflo  lo
 	ldloc 12
 	stloc 4
-L_10b2358:
-// 0x010b2358: 0x10b2358: slt   t0, s0, a0
+L_10b29a0:
+// 0x010b29a0: 0x10b29a0: slt   t0, s0, a0
 	ldloc 8
 	ldloc.1
 	clt
 	stloc 19
-// 0x010b235c: 0x10b235c: beq   t0, zero, 0x10b234c sll   a2, a3, 2
+// 0x010b29a4: 0x10b29a4: beq   t0, zero, 0x10b2994 sll   a2, a3, 2
 	ldloc 19
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc.3
-	brfalse L_10b234c
+	brfalse L_10b2994
 // --- basic block ---
-// 0x010b2364: 0x10b2364: bne   a0, s2, 0x10b2370 sll   zero, zero, 0
+// 0x010b29ac: 0x10b29ac: bne   a0, s2, 0x10b29b8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 9
-	bne.un L_10b2370
+	bne.un L_10b29b8
 // --- basic block ---
-// 0x010b236c: 0x10b236c: sll   a3, a3, 1
+// 0x010b29b4: 0x10b29b4: sll   a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	shl
 	stloc 4
-L_10b2370:
-// 0x010b2370: 0x10b2370: slt   a1, a3, a1
+L_10b29b8:
+// 0x010b29b8: 0x10b29b8: slt   a1, a3, a1
 	ldloc 4
 	ldloc.2
 	clt
 	stloc.2
-L_10b2374:
-// 0x010b2374: 0x10b2374: beq   a1, zero, 0x10b23cc sll   zero, zero, 0
+L_10b29bc:
+// 0x010b29bc: 0x10b29bc: beq   a1, zero, 0x10b2a14 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b23cc
+	brfalse L_10b2a14
 // --- basic block ---
-// 0x010b237c: 0x10b237c: bne   v0, s7, 0x10b239c mult  s0, s6
+// 0x010b29c4: 0x10b29c4: bne   v0, s7, 0x10b29e4 mult  s0, s6
 	ldloc 5
 	ldloc 16
 	ldloc 8
 	ldloc 15
 	mul
 	stloc 12
-	bne.un L_10b239c
+	bne.un L_10b29e4
 // --- basic block ---
-// 0x010b2384: 0x10b2384: jal   0x101f998 sw    v1, 128(sp)
+// 0x010b29cc: 0x10b29cc: jal   0x101f9a8 sw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1696,10 +1696,10 @@ L_10b2374:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_fast_refresh_101f998()
+	call int32 Cibyl23::roadmap_screen_fast_refresh_101f9a8()
 	stloc 5
 // --- basic block ---
-// 0x010b238c: 0x10b238c: lw    v1, 128(sp)
+// 0x010b29d4: 0x10b29d4: lw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1708,42 +1708,42 @@ L_10b2374:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2390: 0x10b2390: bne   v0, zero, 0x10b23d0 addu  v0, zero, zero
+// 0x010b29d8: 0x10b29d8: bne   v0, zero, 0x10b2a18 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10b23d0
+	brtrue L_10b2a18
 // --- basic block ---
-// 0x010b2398: 0x10b2398: mult  s0, s6
+// 0x010b29e0: 0x10b29e0: mult  s0, s6
 	ldloc 8
 	ldloc 15
 	mul
 	stloc 12
-L_10b239c:
-// 0x010b239c: 0x10b239c: lw    v0, 29728(s5)
+L_10b29e4:
+// 0x010b29e4: 0x10b29e4: lw    v0, 30192(s5)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b23a0: 0x10b23a0: sll   zero, zero, 0
-// 0x010b23a4: 0x10b23a4: addu  v1, v0, v1
+// 0x010b29e8: 0x10b29e8: sll   zero, zero, 0
+// 0x010b29ec: 0x10b29ec: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x010b23a8: 0x10b23a8: mflo  lo
+// 0x010b29f0: 0x10b29f0: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x010b23ac: 0x10b23ac: addu  v1, v1, v0
+// 0x010b29f4: 0x10b29f4: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010b23b0: 0x10b23b0: lw    v0, 124(v1)
+// 0x010b29f8: 0x10b29f8: lw    v0, 124(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1752,12 +1752,12 @@ L_10b239c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b23b4: 0x10b23b4: sll   zero, zero, 0
-// 0x010b23b8: 0x10b23b8: beq   v0, zero, 0x10b23cc sll   zero, zero, 0
+// 0x010b29fc: 0x10b29fc: sll   zero, zero, 0
+// 0x010b2a00: 0x10b2a00: beq   v0, zero, 0x10b2a14 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b23cc
+	brfalse L_10b2a14
 // --- basic block ---
-// 0x010b23c0: 0x10b23c0: lw    v0, 52(v1)
+// 0x010b2a08: 0x10b2a08: lw    v0, 52(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1766,61 +1766,61 @@ L_10b239c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b23c4: 0x10b23c4: j	 0x10b23d4 addiu s0, s0, 1
+// 0x010b2a0c: 0x10b2a0c: j	 0x10b2a1c addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10b23d4
+	br L_10b2a1c
 // --- basic block ---
-L_10b23cc:
-// 0x010b23cc: 0x10b23cc: addu  v0, zero, zero
+L_10b2a14:
+// 0x010b2a14: 0x10b2a14: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b23d0:
-// 0x010b23d0: 0x10b23d0: addiu s0, s0, 1
+L_10b2a18:
+// 0x010b2a18: 0x10b2a18: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10b23d4:
-// 0x010b23d4: 0x10b23d4: sw    v0, 0(s1)
+L_10b2a1c:
+// 0x010b2a1c: 0x10b2a1c: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b23d8: 0x10b23d8: bne   s0, s2, 0x10b22f8 addiu s1, s1, 4
+// 0x010b2a20: 0x10b2a20: bne   s0, s2, 0x10b2940 addiu s1, s1, 4
 	ldloc 8
 	ldloc 9
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-	bne.un L_10b22f8
+	bne.un L_10b2940
 // --- basic block ---
-// 0x010b23e0: 0x10b23e0: lui   s3, 0x90000
+// 0x010b2a28: 0x10b2a28: lui   s3, 0x90000
 	ldc.i4 589824
 	stloc 11
-// 0x010b23e4: 0x10b23e4: lui   s1, 0x0
+// 0x010b2a2c: 0x10b2a2c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010b23e8: 0x10b23e8: lw    a0, -11584(s3)
+// 0x010b2a30: 0x10b2a30: lw    a0, -11120(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b23ec: 0x10b23ec: addiu s1, s1, 18904
+// 0x010b2a34: 0x10b2a34: addiu s1, s1, 18904
 	ldloc 10
 	ldc.i4 18904
 	add
 	stloc 10
-// 0x010b23f0: 0x10b23f0: lw    a2, 20(s1)
+// 0x010b2a38: 0x10b2a38: lw    a2, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1829,45 +1829,45 @@ L_10b23d4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b23f4: 0x10b23f4: addiu a0, a0, -1
+// 0x010b2a3c: 0x10b2a3c: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010b23f8: 0x10b23f8: lui   s2, 0x90000
+// 0x010b2a40: 0x10b2a40: lui   s2, 0x90000
 	ldc.i4 589824
 	stloc 9
-// 0x010b23fc: 0x10b23fc: sll   a0, a0, 5
+// 0x010b2a44: 0x10b2a44: sll   a0, a0, 5
 	ldloc.1
 	ldc.i4.5
 	shl
 	stloc.1
-// 0x010b2400: 0x10b2400: addiu s2, s2, -11560
+// 0x010b2a48: 0x10b2a48: addiu s2, s2, -11096
 	ldloc 9
-	ldc.i4 -11560
+	ldc.i4 -11096
 	add
 	stloc 9
-// 0x010b2404: 0x10b2404: xori  a2, a2, 1
+// 0x010b2a4c: 0x10b2a4c: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x010b2408: 0x10b2408: addiu s0, sp, 72
+// 0x010b2a50: 0x10b2a50: addiu s0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 8
-// 0x010b240c: 0x10b240c: addu  a0, s2, a0
+// 0x010b2a54: 0x10b2a54: addu  a0, s2, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc.1
-// 0x010b2410: 0x10b2410: sltiu a2, a2, 1
+// 0x010b2a58: 0x10b2a58: sltiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x010b2414: 0x10b2414: jal   0x105d4ec addu  a1, s0, zero
+// 0x010b2a5c: 0x10b2a5c: jal   0x105d4fc addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -1875,20 +1875,20 @@ L_10b23d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_fix_line_end_105d4ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_fix_line_end_105d4fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b241c: 0x10b241c: lui   v0, 0x0
+// 0x010b2a64: 0x10b2a64: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b2420: 0x10b2420: addiu v0, v0, 18980
+// 0x010b2a68: 0x10b2a68: addiu v0, v0, 18980
 	ldloc 5
 	ldc.i4 18980
 	add
 	stloc 5
-// 0x010b2424: 0x10b2424: lw    a1, 12(v0)
+// 0x010b2a6c: 0x10b2a6c: lw    a1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1897,7 +1897,7 @@ L_10b23d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2428: 0x10b2428: lw    a0, 4(v0)
+// 0x010b2a70: 0x10b2a70: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1906,74 +1906,74 @@ L_10b23d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b242c: 0x10b242c: jal   0x10b6788 sll   zero, zero, 0
+// 0x010b2a74: 0x10b2a74: jal   0x10b6dd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_exists_10b6788(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_exists_10b6dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2434: 0x10b2434: bne   v0, zero, 0x10b24a4 addu  v1, v0, zero
+// 0x010b2a7c: 0x10b2a7c: bne   v0, zero, 0x10b2aec addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_10b24a4
+	brtrue L_10b2aec
 // --- basic block ---
-// 0x010b243c: 0x10b243c: lw    v0, -11584(s3)
+// 0x010b2a84: 0x10b2a84: lw    v0, -11120(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2896
+	ldc.i4 -2780
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2440: 0x10b2440: addiu a1, sp, 80
+// 0x010b2a88: 0x10b2a88: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x010b2444: 0x10b2444: addiu v0, v0, -1
+// 0x010b2a8c: 0x10b2a8c: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010b2448: 0x10b2448: sll   v0, v0, 5
+// 0x010b2a90: 0x10b2a90: sll   v0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	shl
 	stloc 5
-// 0x010b244c: 0x10b244c: addu  s2, s2, v0
+// 0x010b2a94: 0x10b2a94: addu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x010b2450: 0x10b2450: addiu a0, sp, 40
+// 0x010b2a98: 0x10b2a98: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010b2454: 0x10b2454: cibyl_sysc_arg 0x12
+// 0x010b2a9c: 0x10b2a9c: cibyl_sysc_arg 0x12
 	ldloc 9
-// 0x010b2458: 0x10b2458: cibyl_sysc_arg 0x10
+// 0x010b2aa0: 0x10b2aa0: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010b245c: 0x10b245c: cibyl_sysc_arg 0x5
+// 0x010b2aa4: 0x10b2aa4: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010b2460: 0x10b2460: cibyl_sysc_arg 0x4
+// 0x010b2aa8: 0x10b2aa8: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010b2464: 0x10b2464: cibyl_sysc_arg 0x3
+// 0x010b2aac: 0x10b2aac: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010b2468: 0x10b2468: cibyl_sysc 0x2315
+// 0x010b2ab0: 0x10b2ab0: cibyl_sysc 0x2315
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010b246c: 0x10b246c: addu  s2, v0, zero
+// 0x010b2ab4: 0x10b2ab4: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b2470: 0x10b2470: lw    v1, 20(s1)
+// 0x010b2ab8: 0x10b2ab8: lw    v1, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1982,33 +1982,33 @@ L_10b23d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2474: 0x10b2474: addiu v0, zero, 1
+// 0x010b2abc: 0x10b2abc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010b2478: 0x10b2478: bne   v1, v0, 0x10b2484 sll   zero, zero, 0
+// 0x010b2ac0: 0x10b2ac0: bne   v1, v0, 0x10b2acc sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10b2484
+	bne.un L_10b2acc
 // --- basic block ---
-// 0x010b2480: 0x10b2480: addu  a1, s0, zero
+// 0x010b2ac8: 0x10b2ac8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-L_10b2484:
-// 0x010b2484: 0x10b2484: jal   0x1008eb0 sll   zero, zero, 0
+L_10b2acc:
+// 0x010b2acc: 0x10b2acc: jal   0x1008ec0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b248c: 0x10b248c: addiu a0, zero, 3
+// 0x010b2ad4: 0x10b2ad4: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010b2490: 0x10b2490: jal   0x101641c sw    v0, 128(sp)
+// 0x010b2ad8: 0x10b2ad8: jal   0x101642c sw    v0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2018,10 +2018,10 @@ L_10b2484:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl16::roadmap_ticker_set_last_event_101641c(int32)
+	call int32 Cibyl16::roadmap_ticker_set_last_event_101642c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2498: 0x10b2498: lw    v0, 128(sp)
+// 0x010b2ae0: 0x10b2ae0: lw    v0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2030,7 +2030,7 @@ L_10b2484:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b249c: 0x10b249c: jal   0x10ac988 addu  a0, v0, zero
+// 0x010b2ae4: 0x10b2ae4: jal   0x10acfd0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2038,25 +2038,25 @@ L_10b2484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_display_10ac988(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_display_10acfd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b24a4:
-// 0x010b24a4: 0x10b24a4: lh    v0, 114(sp)
+L_10b2aec:
+// 0x010b2aec: 0x10b2aec: lh    v0, 114(sp)
 	ldloc.0
 	ldc.i4.s 114
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x010b24a8: 0x10b24a8: lh    v1, 112(sp)
+// 0x010b2af0: 0x10b2af0: lh    v1, 112(sp)
 	ldloc.0
 	ldc.i4.s 112
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x010b24ac: 0x10b24ac: sw    v0, 20(sp)
+// 0x010b2af4: 0x10b2af4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2065,12 +2065,12 @@ L_10b24a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b24b0: 0x10b24b0: addiu v0, sp, 48
+// 0x010b2af8: 0x10b2af8: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x010b24b4: 0x10b24b4: sw    v0, 28(sp)
+// 0x010b2afc: 0x10b2afc: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2079,10 +2079,10 @@ L_10b24a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b24b8: 0x10b24b8: addiu v0, zero, 6
+// 0x010b2b00: 0x10b2b00: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x010b24bc: 0x10b24bc: sw    v0, 32(sp)
+// 0x010b2b04: 0x10b2b04: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2091,28 +2091,28 @@ L_10b24a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b24c0: 0x10b24c0: addiu a0, sp, 72
+// 0x010b2b08: 0x10b2b08: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x010b24c4: 0x10b24c4: addiu v0, zero, -1
+// 0x010b2b0c: 0x10b2b0c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b24c8: 0x10b24c8: addiu a1, sp, 80
+// 0x010b2b10: 0x10b2b10: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x010b24cc: 0x10b24cc: addu  a2, zero, zero
+// 0x010b2b14: 0x10b2b14: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b24d0: 0x10b24d0: addiu a3, sp, 88
+// 0x010b2b18: 0x10b2b18: addiu a3, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc 4
-// 0x010b24d4: 0x10b24d4: sw    v1, 16(sp)
+// 0x010b2b1c: 0x10b2b1c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2121,7 +2121,7 @@ L_10b24a4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b24d8: 0x10b24d8: sw    v0, 36(sp)
+// 0x010b2b20: 0x10b2b20: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2130,7 +2130,7 @@ L_10b24a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b24dc: 0x10b24dc: jal   0x1022e0c sw    zero, 24(sp)
+// 0x010b2b24: 0x10b2b24: jal   0x1022e1c sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2144,17 +2144,17 @@ L_10b24a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b24e4:
-// 0x010b24e4: 0x10b24e4: lw    ra, 172(sp)
-// 0x010b24e8: 0x10b24e8: addu  v0, zero, zero
+L_10b2b2c:
+// 0x010b2b2c: 0x10b2b2c: lw    ra, 172(sp)
+// 0x010b2b30: 0x10b2b30: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010b24ec: 0x10b24ec: lw    s8, 168(sp)
+// 0x010b2b34: 0x10b2b34: lw    s8, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2163,7 +2163,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010b24f0: 0x10b24f0: lw    s7, 164(sp)
+// 0x010b2b38: 0x10b2b38: lw    s7, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2172,7 +2172,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b24f4: 0x10b24f4: lw    s6, 160(sp)
+// 0x010b2b3c: 0x10b2b3c: lw    s6, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2181,7 +2181,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b24f8: 0x10b24f8: lw    s5, 156(sp)
+// 0x010b2b40: 0x10b2b40: lw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2190,7 +2190,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b24fc: 0x10b24fc: lw    s4, 152(sp)
+// 0x010b2b44: 0x10b2b44: lw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2199,7 +2199,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b2500: 0x10b2500: lw    s3, 148(sp)
+// 0x010b2b48: 0x10b2b48: lw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2208,7 +2208,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b2504: 0x10b2504: lw    s2, 144(sp)
+// 0x010b2b4c: 0x10b2b4c: lw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2217,7 +2217,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b2508: 0x10b2508: lw    s1, 140(sp)
+// 0x010b2b50: 0x10b2b50: lw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2226,7 +2226,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b250c: 0x10b250c: lw    s0, 136(sp)
+// 0x010b2b54: 0x10b2b54: lw    s0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2235,7 +2235,7 @@ L_10b24e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b2510: 0x10b2510: jr    ra addiu sp, sp, 176
+// 0x010b2b58: 0x10b2b58: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -2247,7 +2247,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_draw_new_direction_roads_10b2518(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_draw_new_direction_roads_10b2b60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 t2,int32 s0,int32 lo,int32 t1,int32 s6,int32 s2,int32 s3,int32 s4,int32 s5,int32 t0,int32 s7,int32 s8,int32 ra)
@@ -2321,13 +2321,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b2518: 0x10b2518: addiu sp, sp, -160
+// 0x010b2b60: 0x10b2b60: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x010b251c: 0x10b251c: sw    ra, 156(sp)
-// 0x010b2520: 0x10b2520: sw    s8, 152(sp)
+// 0x010b2b64: 0x10b2b64: sw    ra, 156(sp)
+// 0x010b2b68: 0x10b2b68: sw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2336,7 +2336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010b2524: 0x10b2524: sw    s7, 148(sp)
+// 0x010b2b6c: 0x10b2b6c: sw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2345,7 +2345,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010b2528: 0x10b2528: sw    s6, 144(sp)
+// 0x010b2b70: 0x10b2b70: sw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2354,7 +2354,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b252c: 0x10b252c: sw    s5, 140(sp)
+// 0x010b2b74: 0x10b2b74: sw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2363,7 +2363,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010b2530: 0x10b2530: sw    s4, 136(sp)
+// 0x010b2b78: 0x10b2b78: sw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2372,7 +2372,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b2534: 0x10b2534: sw    s3, 132(sp)
+// 0x010b2b7c: 0x10b2b7c: sw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2381,7 +2381,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b2538: 0x10b2538: sw    s2, 128(sp)
+// 0x010b2b80: 0x10b2b80: sw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2390,7 +2390,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b253c: 0x10b253c: sw    s1, 124(sp)
+// 0x010b2b84: 0x10b2b84: sw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2399,7 +2399,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b2540: 0x10b2540: jal   0x10b6518 sw    s0, 120(sp)
+// 0x010b2b88: 0x10b2b88: jal   0x10b6b60 sw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2413,12 +2413,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_get_count_10b6518(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_get_count_10b6b60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2548: 0x10b2548: sw    v0, 100(sp)
+// 0x010b2b90: 0x10b2b90: sw    v0, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2427,10 +2427,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b254c: 0x10b254c: lui   v0, 0x0
+// 0x010b2b94: 0x10b2b94: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b2550: 0x10b2550: lw    v0, 18904(v0)
+// 0x010b2b98: 0x10b2b98: lw    v0, 18904(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2439,71 +2439,71 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2554: 0x10b2554: sll   zero, zero, 0
-// 0x010b2558: 0x10b2558: beq   v0, zero, 0x10b2568 sll   zero, zero, 0
+// 0x010b2b9c: 0x10b2b9c: sll   zero, zero, 0
+// 0x010b2ba0: 0x10b2ba0: beq   v0, zero, 0x10b2bb0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b2568
+	brfalse L_10b2bb0
 // --- basic block ---
-// 0x010b2560: 0x10b2560: jal   0x10b219c sll   zero, zero, 0
+// 0x010b2ba8: 0x10b2ba8: jal   0x10b27e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_draw_current_new_direction_road_10b219c(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_draw_current_new_direction_road_10b27e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b2568:
-// 0x010b2568: 0x10b2568: lui   s3, 0xe0000
+L_10b2bb0:
+// 0x010b2bb0: 0x10b2bb0: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 15
-// 0x010b256c: 0x10b256c: addu  s1, zero, zero
+// 0x010b2bb4: 0x10b2bb4: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b2570: 0x10b2570: lui   s8, 0x20000
+// 0x010b2bb8: 0x10b2bb8: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 20
-// 0x010b2574: 0x10b2574: lui   s4, 0xe0000
+// 0x010b2bbc: 0x10b2bbc: lui   s4, 0xe0000
 	ldc.i4 917504
 	stloc 16
-// 0x010b2578: 0x10b2578: addiu s5, zero, 192
+// 0x010b2bc0: 0x10b2bc0: addiu s5, zero, 192
 	ldc.i4 192
 	stloc 17
-// 0x010b257c: 0x10b257c: addiu s0, s3, 29604
+// 0x010b2bc4: 0x10b2bc4: addiu s0, s3, 30068
 	ldloc 15
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 10
-// 0x010b2580: 0x10b2580: addiu s2, zero, 6
+// 0x010b2bc8: 0x10b2bc8: addiu s2, zero, 6
 	ldc.i4.6
 	stloc 14
-// 0x010b2584: 0x10b2584: j	 0x10b28c0 lui   s7, 0x20000
+// 0x010b2bcc: 0x10b2bcc: j	 0x10b2f08 lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 19
-	br L_10b28c0
+	br L_10b2f08
 // --- basic block ---
-L_10b258c:
-// 0x010b258c: 0x10b258c: addu  a0, s1, zero
+L_10b2bd4:
+// 0x010b2bd4: 0x10b2bd4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b2590: 0x10b2590: addiu a1, sp, 40
+// 0x010b2bd8: 0x10b2bd8: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b2594: 0x10b2594: addiu a2, sp, 44
+// 0x010b2bdc: 0x10b2bdc: addiu a2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.3
-// 0x010b2598: 0x10b2598: addiu a3, sp, 52
+// 0x010b2be0: 0x10b2be0: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x010b259c: 0x10b259c: jal   0x10b6540 sw    v0, 16(sp)
+// 0x010b2be4: 0x10b2be4: jal   0x10b6b88 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2517,16 +2517,16 @@ L_10b258c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_get_10b6540(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_get_10b6b88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b25a4: 0x10b25a4: beq   v0, zero, 0x10b28bc sll   zero, zero, 0
+// 0x010b2bec: 0x10b2bec: beq   v0, zero, 0x10b2f04 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b28bc
+	brfalse L_10b2f04
 // --- basic block ---
-// 0x010b25ac: 0x10b25ac: lw    v0, 48(sp)
+// 0x010b2bf4: 0x10b2bf4: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2535,19 +2535,19 @@ L_10b258c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b25b0: 0x10b25b0: sll   zero, zero, 0
-// 0x010b25b4: 0x10b25b4: andi  v0, v0, 16
+// 0x010b2bf8: 0x10b2bf8: sll   zero, zero, 0
+// 0x010b2bfc: 0x10b2bfc: andi  v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	and
 	stloc 5
-// 0x010b25b8: 0x10b25b8: beq   v0, zero, 0x10b28bc lui   v1, 0x0
+// 0x010b2c00: 0x10b2c00: beq   v0, zero, 0x10b2f04 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10b28bc
+	brfalse L_10b2f04
 // --- basic block ---
-// 0x010b25c0: 0x10b25c0: lw    a0, 44(sp)
+// 0x010b2c08: 0x10b2c08: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2556,7 +2556,7 @@ L_10b258c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b25c4: 0x10b25c4: lw    v0, 576(v1)
+// 0x010b2c0c: 0x10b2c0c: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2565,43 +2565,43 @@ L_10b258c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b25c8: 0x10b25c8: sll   zero, zero, 0
-// 0x010b25cc: 0x10b25cc: beq   a0, v0, 0x10b25f0 sll   zero, zero, 0
+// 0x010b2c10: 0x10b2c10: sll   zero, zero, 0
+// 0x010b2c14: 0x10b2c14: beq   a0, v0, 0x10b2c38 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b25f0
+	beq  L_10b2c38
 // --- basic block ---
-// 0x010b25d4: 0x10b25d4: bltz  a0, 0x10b28bc sll   zero, zero, 0
+// 0x010b2c1c: 0x10b2c1c: bltz  a0, 0x10b2f04 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b28bc
+	blt L_10b2f04
 // --- basic block ---
-// 0x010b25dc: 0x10b25dc: jal   0x100b164 sll   zero, zero, 0
+// 0x010b2c24: 0x10b2c24: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b25e4: 0x10b25e4: beq   v0, zero, 0x10b28c0 addiu s1, s1, 1
+// 0x010b2c2c: 0x10b2c2c: beq   v0, zero, 0x10b2f08 addiu s1, s1, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_10b28c0
+	brfalse L_10b2f08
 // --- basic block ---
-// 0x010b25ec: 0x10b25ec: addiu s1, s1, -1
+// 0x010b2c34: 0x10b2c34: addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_10b25f0:
-// 0x010b25f0: 0x10b25f0: lw    s6, 40(sp)
+L_10b2c38:
+// 0x010b2c38: 0x10b2c38: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2610,22 +2610,22 @@ L_10b25f0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b25f4: 0x10b25f4: jal   0x1003abc sll   zero, zero, 0
+// 0x010b2c3c: 0x10b2c3c: jal   0x1003abc sll   zero, zero, 0
 	call int32 Cibyl2::roadmap_line_count_1003abc()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b25fc: 0x10b25fc: slt   v0, s6, v0
+// 0x010b2c44: 0x10b2c44: slt   v0, s6, v0
 	ldloc 13
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b2600: 0x10b2600: beq   v0, zero, 0x10b28bc sll   zero, zero, 0
+// 0x010b2c48: 0x10b2c48: beq   v0, zero, 0x10b2f04 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b28bc
+	brfalse L_10b2f04
 // --- basic block ---
-// 0x010b2608: 0x10b2608: lw    a0, 40(sp)
+// 0x010b2c50: 0x10b2c50: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2634,88 +2634,88 @@ L_10b25f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b260c: 0x10b260c: sll   zero, zero, 0
-// 0x010b2610: 0x10b2610: bltz  a0, 0x10b28bc lui   a2, 0x20000
+// 0x010b2c54: 0x10b2c54: sll   zero, zero, 0
+// 0x010b2c58: 0x10b2c58: bltz  a0, 0x10b2f04 lui   a2, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.3
 	ldc.i4.s 0
-	blt L_10b28bc
+	blt L_10b2f04
 // --- basic block ---
-// 0x010b2618: 0x10b2618: lw    v1, 31152(a2)
+// 0x010b2c60: 0x10b2c60: lw    v1, 31616(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b261c: 0x10b261c: sll   v0, a0, 3
+// 0x010b2c64: 0x10b2c64: sll   v0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010b2620: 0x10b2620: addu  v1, v1, v0
+// 0x010b2c68: 0x10b2c68: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010b2624: 0x10b2624: lhu   v0, 4(v1)
+// 0x010b2c6c: 0x10b2c6c: lhu   v0, 4(v1)
 	ldloc 7
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010b2628: 0x10b2628: ori   a1, zero, 65535
+// 0x010b2c70: 0x10b2c70: ori   a1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc.2
-// 0x010b262c: 0x10b262c: beq   v0, a1, 0x10b2650 addiu s6, zero, -1
+// 0x010b2c74: 0x10b2c74: beq   v0, a1, 0x10b2c98 addiu s6, zero, -1
 	ldloc 5
 	ldloc.2
 	ldc.i4.m1
 	stloc 13
-	beq  L_10b2650
+	beq  L_10b2c98
 // --- basic block ---
-// 0x010b2634: 0x10b2634: lw    a2, 31240(s7)
+// 0x010b2c7c: 0x10b2c7c: lw    a2, 31704(s7)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2638: 0x10b2638: sll   a1, v0, 2
+// 0x010b2c80: 0x10b2c80: sll   a1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x010b263c: 0x10b263c: addu  a1, a2, a1
+// 0x010b2c84: 0x10b2c84: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x010b2640: 0x10b2640: lw    a1, 0(a1)
+// 0x010b2c88: 0x10b2c88: lw    a1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b2644: 0x10b2644: addiu s6, v0, 1
+// 0x010b2c8c: 0x10b2c8c: addiu s6, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 13
-// 0x010b2648: 0x10b2648: addu  a1, v0, a1
+// 0x010b2c90: 0x10b2c90: addu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc.2
-// 0x010b264c: 0x10b264c: sw    a1, 96(sp)
+// 0x010b2c94: 0x10b2c94: sw    a1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2724,49 +2724,49 @@ L_10b25f0:
 	add
 	ldloc.2
 	stelem.i4
-L_10b2650:
-// 0x010b2650: 0x10b2650: lhu   a2, 0(v1)
+L_10b2c98:
+// 0x010b2c98: 0x10b2c98: lhu   a2, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x010b2654: 0x10b2654: lw    a1, 31228(s8)
+// 0x010b2c9c: 0x10b2c9c: lw    a1, 31692(s8)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2658: 0x10b2658: andi  a2, a2, 32767
+// 0x010b2ca0: 0x10b2ca0: andi  a2, a2, 32767
 	ldloc.3
 	ldc.i4 32767
 	and
 	stloc.3
-// 0x010b265c: 0x10b265c: sll   a2, a2, 3
+// 0x010b2ca4: 0x10b2ca4: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x010b2660: 0x10b2660: addu  a2, a1, a2
+// 0x010b2ca8: 0x10b2ca8: addu  a2, a1, a2
 	ldloc.2
 	ldloc.3
 	add
 	stloc.3
-// 0x010b2664: 0x10b2664: lw    a3, 0(a2)
+// 0x010b2cac: 0x10b2cac: lw    a3, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010b2668: 0x10b2668: lhu   v0, 2(v1)
+// 0x010b2cb0: 0x10b2cb0: lhu   v0, 2(v1)
 	ldloc 7
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010b266c: 0x10b266c: sw    a3, 56(sp)
+// 0x010b2cb4: 0x10b2cb4: sw    a3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2775,7 +2775,7 @@ L_10b2650:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b2670: 0x10b2670: lw    v1, 4(a2)
+// 0x010b2cb8: 0x10b2cb8: lw    v1, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2784,17 +2784,17 @@ L_10b2650:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2674: 0x10b2674: andi  v0, v0, 32767
+// 0x010b2cbc: 0x10b2cbc: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x010b2678: 0x10b2678: sll   v0, v0, 3
+// 0x010b2cc0: 0x10b2cc0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010b267c: 0x10b267c: sw    v1, 60(sp)
+// 0x010b2cc4: 0x10b2cc4: sw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2803,20 +2803,20 @@ L_10b2650:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2680: 0x10b2680: addu  v0, a1, v0
+// 0x010b2cc8: 0x10b2cc8: addu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x010b2684: 0x10b2684: lw    v1, 0(v0)
+// 0x010b2ccc: 0x10b2ccc: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b2688: 0x10b2688: sll   zero, zero, 0
-// 0x010b268c: 0x10b268c: sw    v1, 64(sp)
+// 0x010b2cd0: 0x10b2cd0: sll   zero, zero, 0
+// 0x010b2cd4: 0x10b2cd4: sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2825,7 +2825,7 @@ L_10b2650:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2690: 0x10b2690: lw    v0, 4(v0)
+// 0x010b2cd8: 0x10b2cd8: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2834,7 +2834,7 @@ L_10b2650:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2694: 0x10b2694: jal   0x1003b50 sw    v0, 68(sp)
+// 0x010b2cdc: 0x10b2cdc: jal   0x1003b50 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2851,29 +2851,29 @@ L_10b2650:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b269c: 0x10b269c: mult  v0, s5
+// 0x010b2ce4: 0x10b2ce4: mult  v0, s5
 	ldloc 5
 	ldloc 17
 	mul
 	stloc 11
-// 0x010b26a0: 0x10b26a0: lw    v1, 29728(s4)
+// 0x010b2ce8: 0x10b2ce8: lw    v1, 30192(s4)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b26a4: 0x10b26a4: mflo  lo
+// 0x010b2cec: 0x10b2cec: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x010b26a8: 0x10b26a8: addu  v0, v1, v0
+// 0x010b2cf0: 0x10b2cf0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010b26ac: 0x10b26ac: lw    v1, 8(v0)
+// 0x010b2cf4: 0x10b2cf4: lw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2882,12 +2882,12 @@ L_10b2650:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b26b0: 0x10b26b0: sll   zero, zero, 0
-// 0x010b26b4: 0x10b26b4: beq   v1, zero, 0x10b28bc sll   zero, zero, 0
+// 0x010b2cf8: 0x10b2cf8: sll   zero, zero, 0
+// 0x010b2cfc: 0x10b2cfc: beq   v1, zero, 0x10b2f04 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b28bc
+	brfalse L_10b2f04
 // --- basic block ---
-// 0x010b26bc: 0x10b26bc: lw    v0, 16(v0)
+// 0x010b2d04: 0x10b2d04: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2896,26 +2896,26 @@ L_10b2650:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b26c0: 0x10b26c0: lw    v1, 29604(s3)
+// 0x010b2d08: 0x10b2d08: lw    v1, 30068(s3)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b26c4: 0x10b26c4: sll   zero, zero, 0
-// 0x010b26c8: 0x10b26c8: slt   v0, v1, v0
+// 0x010b2d0c: 0x10b2d0c: sll   zero, zero, 0
+// 0x010b2d10: 0x10b2d10: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b26cc: 0x10b26cc: beq   v0, zero, 0x10b28bc sll   zero, zero, 0
+// 0x010b2d14: 0x10b2d14: beq   v0, zero, 0x10b2f04 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b28bc
+	brfalse L_10b2f04
 // --- basic block ---
-// 0x010b26d4: 0x10b26d4: lw    v1, 56(sp)
+// 0x010b2d1c: 0x10b2d1c: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2924,7 +2924,7 @@ L_10b2650:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b26d8: 0x10b26d8: lw    v0, 56(s0)
+// 0x010b2d20: 0x10b2d20: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2933,17 +2933,17 @@ L_10b2650:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b26dc: 0x10b26dc: sll   zero, zero, 0
-// 0x010b26e0: 0x10b26e0: slt   a0, v0, v1
+// 0x010b2d24: 0x10b2d24: sll   zero, zero, 0
+// 0x010b2d28: 0x10b2d28: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x010b26e4: 0x10b26e4: beq   a0, zero, 0x10b2700 sll   zero, zero, 0
+// 0x010b2d2c: 0x10b2d2c: beq   a0, zero, 0x10b2d48 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b2700
+	brfalse L_10b2d48
 // --- basic block ---
-// 0x010b26ec: 0x10b26ec: lw    a0, 64(sp)
+// 0x010b2d34: 0x10b2d34: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2952,18 +2952,18 @@ L_10b2650:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b26f0: 0x10b26f0: sll   zero, zero, 0
-// 0x010b26f4: 0x10b26f4: slt   v0, v0, a0
+// 0x010b2d38: 0x10b2d38: sll   zero, zero, 0
+// 0x010b2d3c: 0x10b2d3c: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010b26f8: 0x10b26f8: bne   v0, zero, 0x10b28bc sll   zero, zero, 0
+// 0x010b2d40: 0x10b2d40: bne   v0, zero, 0x10b2f04 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b28bc
+	brtrue L_10b2f04
 // --- basic block ---
-L_10b2700:
-// 0x010b2700: 0x10b2700: lw    v0, 64(s0)
+L_10b2d48:
+// 0x010b2d48: 0x10b2d48: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2972,17 +2972,17 @@ L_10b2700:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2704: 0x10b2704: sll   zero, zero, 0
-// 0x010b2708: 0x10b2708: slt   v1, v1, v0
+// 0x010b2d4c: 0x10b2d4c: sll   zero, zero, 0
+// 0x010b2d50: 0x10b2d50: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010b270c: 0x10b270c: beq   v1, zero, 0x10b2728 sll   zero, zero, 0
+// 0x010b2d54: 0x10b2d54: beq   v1, zero, 0x10b2d70 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b2728
+	brfalse L_10b2d70
 // --- basic block ---
-// 0x010b2714: 0x10b2714: lw    v1, 64(sp)
+// 0x010b2d5c: 0x10b2d5c: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2991,18 +2991,18 @@ L_10b2700:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2718: 0x10b2718: sll   zero, zero, 0
-// 0x010b271c: 0x10b271c: slt   v0, v1, v0
+// 0x010b2d60: 0x10b2d60: sll   zero, zero, 0
+// 0x010b2d64: 0x10b2d64: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b2720: 0x10b2720: bne   v0, zero, 0x10b28bc sll   zero, zero, 0
+// 0x010b2d68: 0x10b2d68: bne   v0, zero, 0x10b2f04 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b28bc
+	brtrue L_10b2f04
 // --- basic block ---
-L_10b2728:
-// 0x010b2728: 0x10b2728: lw    v1, 60(sp)
+L_10b2d70:
+// 0x010b2d70: 0x10b2d70: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3011,7 +3011,7 @@ L_10b2728:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b272c: 0x10b272c: lw    v0, 60(s0)
+// 0x010b2d74: 0x10b2d74: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3020,17 +3020,17 @@ L_10b2728:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2730: 0x10b2730: sll   zero, zero, 0
-// 0x010b2734: 0x10b2734: slt   a0, v0, v1
+// 0x010b2d78: 0x10b2d78: sll   zero, zero, 0
+// 0x010b2d7c: 0x10b2d7c: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x010b2738: 0x10b2738: beq   a0, zero, 0x10b2754 sll   zero, zero, 0
+// 0x010b2d80: 0x10b2d80: beq   a0, zero, 0x10b2d9c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b2754
+	brfalse L_10b2d9c
 // --- basic block ---
-// 0x010b2740: 0x10b2740: lw    a0, 68(sp)
+// 0x010b2d88: 0x10b2d88: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3039,18 +3039,18 @@ L_10b2728:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2744: 0x10b2744: sll   zero, zero, 0
-// 0x010b2748: 0x10b2748: slt   v0, v0, a0
+// 0x010b2d8c: 0x10b2d8c: sll   zero, zero, 0
+// 0x010b2d90: 0x10b2d90: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010b274c: 0x10b274c: bne   v0, zero, 0x10b28bc sll   zero, zero, 0
+// 0x010b2d94: 0x10b2d94: bne   v0, zero, 0x10b2f04 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b28bc
+	brtrue L_10b2f04
 // --- basic block ---
-L_10b2754:
-// 0x010b2754: 0x10b2754: lw    v0, 68(s0)
+L_10b2d9c:
+// 0x010b2d9c: 0x10b2d9c: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3059,27 +3059,27 @@ L_10b2754:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2758: 0x10b2758: sll   zero, zero, 0
-// 0x010b275c: 0x10b275c: slt   v1, v1, v0
+// 0x010b2da0: 0x10b2da0: sll   zero, zero, 0
+// 0x010b2da4: 0x10b2da4: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010b2760: 0x10b2760: bne   v1, zero, 0x10b2770 addiu a1, sp, 72
+// 0x010b2da8: 0x10b2da8: bne   v1, zero, 0x10b2db8 addiu a1, sp, 72
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-	brtrue L_10b2770
+	brtrue L_10b2db8
 // --- basic block ---
-// 0x010b2768: 0x10b2768: j	 0x10b2784 addu  v1, zero, zero
+// 0x010b2db0: 0x10b2db0: j	 0x10b2dcc addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10b2784
+	br L_10b2dcc
 // --- basic block ---
-L_10b2770:
-// 0x010b2770: 0x10b2770: lw    v1, 68(sp)
+L_10b2db8:
+// 0x010b2db8: 0x10b2db8: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3088,20 +3088,20 @@ L_10b2770:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2774: 0x10b2774: sll   zero, zero, 0
-// 0x010b2778: 0x10b2778: slt   v0, v1, v0
+// 0x010b2dbc: 0x10b2dbc: sll   zero, zero, 0
+// 0x010b2dc0: 0x10b2dc0: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b277c: 0x10b277c: bne   v0, zero, 0x10b28bc addu  v1, zero, zero
+// 0x010b2dc4: 0x10b2dc4: bne   v0, zero, 0x10b2f04 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10b28bc
+	brtrue L_10b2f04
 // --- basic block ---
-L_10b2784:
-// 0x010b2784: 0x10b2784: lw    a0, 40(sp)
+L_10b2dcc:
+// 0x010b2dcc: 0x10b2dcc: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3110,7 +3110,7 @@ L_10b2784:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2788: 0x10b2788: sw    v1, 112(sp)
+// 0x010b2dd0: 0x10b2dd0: sw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3119,7 +3119,7 @@ L_10b2784:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b278c: 0x10b278c: jal   0x1003b50 sw    a1, 108(sp)
+// 0x010b2dd4: 0x10b2dd4: jal   0x1003b50 sw    a1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3136,21 +3136,21 @@ L_10b2784:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2794: 0x10b2794: mult  v0, s5
+// 0x010b2ddc: 0x10b2ddc: mult  v0, s5
 	ldloc 5
 	ldloc 17
 	mul
 	stloc 11
-// 0x010b2798: 0x10b2798: lw    a2, 29728(s4)
+// 0x010b2de0: 0x10b2de0: lw    a2, 30192(s4)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b279c: 0x10b279c: lw    v1, 112(sp)
+// 0x010b2de4: 0x10b2de4: lw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3159,7 +3159,7 @@ L_10b2784:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b27a0: 0x10b27a0: lw    a1, 108(sp)
+// 0x010b2de8: 0x10b2de8: lw    a1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3168,15 +3168,15 @@ L_10b2784:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b27a4: 0x10b27a4: mflo  lo
+// 0x010b2dec: 0x10b2dec: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x010b27a8: 0x10b27a8: addu  a2, a2, a0
+// 0x010b2df0: 0x10b2df0: addu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.3
-// 0x010b27ac: 0x10b27ac: lw    a3, 8(a2)
+// 0x010b2df4: 0x10b2df4: lw    a3, 8(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -3185,12 +3185,12 @@ L_10b2784:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b27b0: 0x10b27b0: sll   zero, zero, 0
-// 0x010b27b4: 0x10b27b4: beq   a3, zero, 0x10b2870 sll   zero, zero, 0
+// 0x010b2df8: 0x10b2df8: sll   zero, zero, 0
+// 0x010b2dfc: 0x10b2dfc: beq   a3, zero, 0x10b2eb8 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10b2870
+	brfalse L_10b2eb8
 // --- basic block ---
-// 0x010b27bc: 0x10b27bc: lw    t0, 120(s0)
+// 0x010b2e04: 0x10b2e04: lw    t0, 120(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3199,7 +3199,7 @@ L_10b2784:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010b27c0: 0x10b27c0: lw    a3, 16(a2)
+// 0x010b2e08: 0x10b2e08: lw    a3, 16(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -3208,90 +3208,90 @@ L_10b2784:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b27c4: 0x10b27c4: lw    t1, 29604(s3)
+// 0x010b2e0c: 0x10b2e0c: lw    t1, 30068(s3)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b27c8: 0x10b27c8: bne   t0, zero, 0x10b27e8 addiu a2, zero, 1
+// 0x010b2e10: 0x10b2e10: bne   t0, zero, 0x10b2e30 addiu a2, zero, 1
 	ldloc 18
 	ldc.i4.1
 	stloc.3
-	brtrue L_10b27e8
+	brtrue L_10b2e30
 // --- basic block ---
-// 0x010b27d0: 0x10b27d0: j	 0x10b2804 slt   a3, t1, a3
+// 0x010b2e18: 0x10b2e18: j	 0x10b2e4c slt   a3, t1, a3
 	ldloc 12
 	ldloc 4
 	clt
 	stloc 4
-	br L_10b2804
+	br L_10b2e4c
 // --- basic block ---
-L_10b27d8:
-// 0x010b27d8: 0x10b27d8: addiu t2, zero, 3
+L_10b2e20:
+// 0x010b2e20: 0x10b2e20: addiu t2, zero, 3
 	ldc.i4.3
 	stloc 9
-// 0x010b27dc: 0x10b27dc: div   t0, t2
+// 0x010b2e24: 0x10b2e24: div   t0, t2
 	ldloc 18
 	ldloc 9
 	div
 	stloc 11
-// 0x010b27e0: 0x10b27e0: addiu a2, a2, 1
+// 0x010b2e28: 0x10b2e28: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x010b27e4: 0x10b27e4: mflo  lo
+// 0x010b2e2c: 0x10b2e2c: mflo  lo
 	ldloc 11
 	stloc 12
-L_10b27e8:
-// 0x010b27e8: 0x10b27e8: slt   t2, v1, a2
+L_10b2e30:
+// 0x010b2e30: 0x10b2e30: slt   t2, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 9
-// 0x010b27ec: 0x10b27ec: beq   t2, zero, 0x10b27d8 sll   t0, t1, 2
+// 0x010b2e34: 0x10b2e34: beq   t2, zero, 0x10b2e20 sll   t0, t1, 2
 	ldloc 9
 	ldloc 12
 	ldc.i4.2
 	shl
 	stloc 18
-	brfalse L_10b27d8
+	brfalse L_10b2e20
 // --- basic block ---
-// 0x010b27f4: 0x10b27f4: bne   a2, s2, 0x10b2800 sll   zero, zero, 0
+// 0x010b2e3c: 0x10b2e3c: bne   a2, s2, 0x10b2e48 sll   zero, zero, 0
 	ldloc.3
 	ldloc 14
-	bne.un L_10b2800
+	bne.un L_10b2e48
 // --- basic block ---
-// 0x010b27fc: 0x10b27fc: sll   t1, t1, 1
+// 0x010b2e44: 0x10b2e44: sll   t1, t1, 1
 	ldloc 12
 	ldc.i4.1
 	shl
 	stloc 12
-L_10b2800:
-// 0x010b2800: 0x10b2800: slt   a3, t1, a3
+L_10b2e48:
+// 0x010b2e48: 0x10b2e48: slt   a3, t1, a3
 	ldloc 12
 	ldloc 4
 	clt
 	stloc 4
-L_10b2804:
-// 0x010b2804: 0x10b2804: beq   a3, zero, 0x10b2870 addiu a2, zero, 16
+L_10b2e4c:
+// 0x010b2e4c: 0x10b2e4c: beq   a3, zero, 0x10b2eb8 addiu a2, zero, 16
 	ldloc 4
 	ldc.i4.s 16
 	stloc.3
-	brfalse L_10b2870
+	brfalse L_10b2eb8
 // --- basic block ---
-// 0x010b280c: 0x10b280c: bne   v0, a2, 0x10b283c addiu t2, zero, 12
+// 0x010b2e54: 0x10b2e54: bne   v0, a2, 0x10b2e84 addiu t2, zero, 12
 	ldloc 5
 	ldloc.3
 	ldc.i4.s 12
 	stloc 9
-	bne.un L_10b283c
+	bne.un L_10b2e84
 // --- basic block ---
-// 0x010b2814: 0x10b2814: sw    v1, 112(sp)
+// 0x010b2e5c: 0x10b2e5c: sw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3300,7 +3300,7 @@ L_10b2804:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2818: 0x10b2818: sw    a0, 104(sp)
+// 0x010b2e60: 0x10b2e60: sw    a0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3309,7 +3309,7 @@ L_10b2804:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b281c: 0x10b281c: jal   0x101f998 sw    a1, 108(sp)
+// 0x010b2e64: 0x10b2e64: jal   0x101f9a8 sw    a1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3318,10 +3318,10 @@ L_10b2804:
 	add
 	ldloc.2
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_fast_refresh_101f998()
+	call int32 Cibyl23::roadmap_screen_fast_refresh_101f9a8()
 	stloc 5
 // --- basic block ---
-// 0x010b2824: 0x10b2824: lw    v1, 112(sp)
+// 0x010b2e6c: 0x10b2e6c: lw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3330,7 +3330,7 @@ L_10b2804:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2828: 0x10b2828: lw    a0, 104(sp)
+// 0x010b2e70: 0x10b2e70: lw    a0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3339,7 +3339,7 @@ L_10b2804:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b282c: 0x10b282c: lw    a1, 108(sp)
+// 0x010b2e74: 0x10b2e74: lw    a1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3348,45 +3348,45 @@ L_10b2804:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2830: 0x10b2830: bne   v0, zero, 0x10b2874 addu  v0, zero, zero
+// 0x010b2e78: 0x10b2e78: bne   v0, zero, 0x10b2ebc addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10b2874
+	brtrue L_10b2ebc
 // --- basic block ---
-// 0x010b2838: 0x10b2838: addiu t2, zero, 12
+// 0x010b2e80: 0x10b2e80: addiu t2, zero, 12
 	ldc.i4.s 12
 	stloc 9
-L_10b283c:
-// 0x010b283c: 0x10b283c: mult  v1, t2
+L_10b2e84:
+// 0x010b2e84: 0x10b2e84: mult  v1, t2
 	ldloc 7
 	ldloc 9
 	mul
 	stloc 11
-// 0x010b2840: 0x10b2840: lw    v0, 29728(s4)
+// 0x010b2e88: 0x10b2e88: lw    v0, 30192(s4)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2844: 0x10b2844: sll   zero, zero, 0
-// 0x010b2848: 0x10b2848: addu  a0, v0, a0
+// 0x010b2e8c: 0x10b2e8c: sll   zero, zero, 0
+// 0x010b2e90: 0x10b2e90: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x010b284c: 0x10b284c: mflo  lo
+// 0x010b2e94: 0x10b2e94: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x010b2850: 0x10b2850: addu  a0, a0, v0
+// 0x010b2e98: 0x10b2e98: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x010b2854: 0x10b2854: lw    v0, 124(a0)
+// 0x010b2e9c: 0x10b2e9c: lw    v0, 124(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3395,12 +3395,12 @@ L_10b283c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2858: 0x10b2858: sll   zero, zero, 0
-// 0x010b285c: 0x10b285c: beq   v0, zero, 0x10b2870 sll   zero, zero, 0
+// 0x010b2ea0: 0x10b2ea0: sll   zero, zero, 0
+// 0x010b2ea4: 0x10b2ea4: beq   v0, zero, 0x10b2eb8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b2870
+	brfalse L_10b2eb8
 // --- basic block ---
-// 0x010b2864: 0x10b2864: lw    v0, 52(a0)
+// 0x010b2eac: 0x10b2eac: lw    v0, 52(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3409,46 +3409,46 @@ L_10b283c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2868: 0x10b2868: j	 0x10b2878 addiu v1, v1, 1
+// 0x010b2eb0: 0x10b2eb0: j	 0x10b2ec0 addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_10b2878
+	br L_10b2ec0
 // --- basic block ---
-L_10b2870:
-// 0x010b2870: 0x10b2870: addu  v0, zero, zero
+L_10b2eb8:
+// 0x010b2eb8: 0x10b2eb8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b2874:
-// 0x010b2874: 0x10b2874: addiu v1, v1, 1
+L_10b2ebc:
+// 0x010b2ebc: 0x10b2ebc: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_10b2878:
-// 0x010b2878: 0x10b2878: sw    v0, 0(a1)
+L_10b2ec0:
+// 0x010b2ec0: 0x10b2ec0: sw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b287c: 0x10b287c: bne   v1, s2, 0x10b2784 addiu a1, a1, 4
+// 0x010b2ec4: 0x10b2ec4: bne   v1, s2, 0x10b2dcc addiu a1, a1, 4
 	ldloc 7
 	ldloc 14
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-	bne.un L_10b2784
+	bne.un L_10b2dcc
 // --- basic block ---
-// 0x010b2884: 0x10b2884: addiu a0, sp, 56
+// 0x010b2ecc: 0x10b2ecc: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x010b2888: 0x10b2888: lw    v1, 96(sp)
+// 0x010b2ed0: 0x10b2ed0: lw    v1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3457,26 +3457,26 @@ L_10b2878:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b288c: 0x10b288c: addiu v0, zero, -1
+// 0x010b2ed4: 0x10b2ed4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b2890: 0x10b2890: addiu t2, sp, 72
+// 0x010b2ed8: 0x10b2ed8: addiu t2, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 9
-// 0x010b2894: 0x10b2894: addiu a1, sp, 64
+// 0x010b2edc: 0x10b2edc: addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x010b2898: 0x10b2898: addu  a2, zero, zero
+// 0x010b2ee0: 0x10b2ee0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b289c: 0x10b289c: addu  a3, a0, zero
+// 0x010b2ee4: 0x10b2ee4: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x010b28a0: 0x10b28a0: sw    s6, 16(sp)
+// 0x010b2ee8: 0x10b2ee8: sw    s6, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3485,7 +3485,7 @@ L_10b2878:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b28a4: 0x10b28a4: sw    v0, 36(sp)
+// 0x010b2eec: 0x10b2eec: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3494,7 +3494,7 @@ L_10b2878:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b28a8: 0x10b28a8: sw    v1, 20(sp)
+// 0x010b2ef0: 0x10b2ef0: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3503,7 +3503,7 @@ L_10b2878:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b28ac: 0x10b28ac: sw    zero, 24(sp)
+// 0x010b2ef4: 0x10b2ef4: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3512,7 +3512,7 @@ L_10b2878:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b28b0: 0x10b28b0: sw    t2, 28(sp)
+// 0x010b2ef8: 0x10b2ef8: sw    t2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3521,7 +3521,7 @@ L_10b2878:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b28b4: 0x10b28b4: jal   0x1022e0c sw    s2, 32(sp)
+// 0x010b2efc: 0x10b2efc: jal   0x1022e1c sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3535,19 +3535,19 @@ L_10b2878:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b28bc:
-// 0x010b28bc: 0x10b28bc: addiu s1, s1, 1
+L_10b2f04:
+// 0x010b2f04: 0x10b2f04: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10b28c0:
-// 0x010b28c0: 0x10b28c0: lw    v1, 100(sp)
+L_10b2f08:
+// 0x010b2f08: 0x10b2f08: lw    v1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3556,25 +3556,25 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b28c4: 0x10b28c4: sll   zero, zero, 0
-// 0x010b28c8: 0x10b28c8: slt   v0, s1, v1
+// 0x010b2f0c: 0x10b2f0c: sll   zero, zero, 0
+// 0x010b2f10: 0x10b2f10: slt   v0, s1, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 5
-// 0x010b28cc: 0x10b28cc: bne   v0, zero, 0x10b258c addiu v0, sp, 48
+// 0x010b2f14: 0x10b2f14: bne   v0, zero, 0x10b2bd4 addiu v0, sp, 48
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-	brtrue L_10b258c
+	brtrue L_10b2bd4
 // --- basic block ---
-// 0x010b28d4: 0x10b28d4: lw    ra, 156(sp)
-// 0x010b28d8: 0x10b28d8: addu  v0, zero, zero
+// 0x010b2f1c: 0x10b2f1c: lw    ra, 156(sp)
+// 0x010b2f20: 0x10b2f20: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010b28dc: 0x10b28dc: lw    s8, 152(sp)
+// 0x010b2f24: 0x10b2f24: lw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3583,7 +3583,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010b28e0: 0x10b28e0: lw    s7, 148(sp)
+// 0x010b2f28: 0x10b2f28: lw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3592,7 +3592,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010b28e4: 0x10b28e4: lw    s6, 144(sp)
+// 0x010b2f2c: 0x10b2f2c: lw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3601,7 +3601,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b28e8: 0x10b28e8: lw    s5, 140(sp)
+// 0x010b2f30: 0x10b2f30: lw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3610,7 +3610,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010b28ec: 0x10b28ec: lw    s4, 136(sp)
+// 0x010b2f34: 0x10b2f34: lw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3619,7 +3619,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b28f0: 0x10b28f0: lw    s3, 132(sp)
+// 0x010b2f38: 0x10b2f38: lw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3628,7 +3628,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b28f4: 0x10b28f4: lw    s2, 128(sp)
+// 0x010b2f3c: 0x10b2f3c: lw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3637,7 +3637,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b28f8: 0x10b28f8: lw    s1, 124(sp)
+// 0x010b2f40: 0x10b2f40: lw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3646,7 +3646,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b28fc: 0x10b28fc: lw    s0, 120(sp)
+// 0x010b2f44: 0x10b2f44: lw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3655,7 +3655,7 @@ L_10b28c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b2900: 0x10b2900: jr    ra addiu sp, sp, 160
+// 0x010b2f48: 0x10b2f48: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
@@ -3667,7 +3667,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_compress_range_10b2908(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_compress_range_10b2f50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s6,int32 t2,int32 s7,int32 s2,int32 s0,int32 s1,int32 t0,int32 t3,int32 t1,int32 s8,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -3741,13 +3741,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b2908: 0x10b2908: addiu sp, sp, -128
+// 0x010b2f50: 0x10b2f50: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x010b290c: 0x10b290c: sw    ra, 124(sp)
-// 0x010b2910: 0x10b2910: sw    s2, 96(sp)
+// 0x010b2f54: 0x10b2f54: sw    ra, 124(sp)
+// 0x010b2f58: 0x10b2f58: sw    s2, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3756,7 +3756,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b2914: 0x10b2914: sw    s1, 92(sp)
+// 0x010b2f5c: 0x10b2f5c: sw    s1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3765,7 +3765,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b2918: 0x10b2918: sw    s0, 88(sp)
+// 0x010b2f60: 0x10b2f60: sw    s0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3774,16 +3774,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b291c: 0x10b291c: addu  s1, a0, zero
+// 0x010b2f64: 0x10b2f64: addu  s1, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010b2920: 0x10b2920: addu  s0, a1, zero
+// 0x010b2f68: 0x10b2f68: addu  s0, a1, zero
 	ldloc.2
 	stloc 12
-// 0x010b2924: 0x10b2924: addiu s2, zero, 1
+// 0x010b2f6c: 0x10b2f6c: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x010b2928: 0x10b2928: sw    s8, 120(sp)
+// 0x010b2f70: 0x10b2f70: sw    s8, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3792,7 +3792,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010b292c: 0x10b292c: sw    s7, 116(sp)
+// 0x010b2f74: 0x10b2f74: sw    s7, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3801,7 +3801,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b2930: 0x10b2930: sw    s6, 112(sp)
+// 0x010b2f78: 0x10b2f78: sw    s6, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3810,7 +3810,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b2934: 0x10b2934: sw    s5, 108(sp)
+// 0x010b2f7c: 0x10b2f7c: sw    s5, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3819,7 +3819,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010b2938: 0x10b2938: sw    s4, 104(sp)
+// 0x010b2f80: 0x10b2f80: sw    s4, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3828,7 +3828,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010b293c: 0x10b293c: jal   0x10b07e4 sw    s3, 100(sp)
+// 0x010b2f84: 0x10b2f84: jal   0x10b0e2c sw    s3, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3838,34 +3838,34 @@ __CIBYL_javamethod_begin:
 	ldloc 18
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_status_10b07e4(int32)
+	call int32 Cibyl132::track_point_status_10b0e2c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2944: 0x10b2944: sw    s2, 0(v0)
+// 0x010b2f8c: 0x10b2f8c: sw    s2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x010b2948: 0x10b2948: jal   0x10b07e4 addu  a0, s0, zero
+// 0x010b2f90: 0x10b2f90: jal   0x10b0e2c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_status_10b07e4(int32)
+	call int32 Cibyl132::track_point_status_10b0e2c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2950: 0x10b2950: subu  v1, s0, s1
+// 0x010b2f98: 0x10b2f98: subu  v1, s0, s1
 	ldloc 12
 	ldloc 13
 	sub
 	stloc 7
-// 0x010b2954: 0x10b2954: slti  v1, v1, 2
+// 0x010b2f9c: 0x10b2f9c: slti  v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	clt
 	stloc 7
-// 0x010b2958: 0x10b2958: bne   v1, zero, 0x10b2ee8 sw    s2, 0(v0)
+// 0x010b2fa0: 0x10b2fa0: bne   v1, zero, 0x10b3530 sw    s2, 0(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
@@ -3873,64 +3873,64 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldloc 11
 	stelem.i4
-	brtrue L_10b2ee8
+	brtrue L_10b3530
 // --- basic block ---
-// 0x010b2960: 0x10b2960: lui   v1, 0x20000
+// 0x010b2fa8: 0x10b2fa8: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010b2964: 0x10b2964: lui   v0, 0x20000
+// 0x010b2fac: 0x10b2fac: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010b2968: 0x10b2968: lw    s5, 23640(v1)
+// 0x010b2fb0: 0x10b2fb0: lw    s5, 24100(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5910
+	ldc.i4 6025
 	add
 	ldelem.i4
 	stloc 20
-// 0x010b296c: 0x10b296c: lui   v1, 0x20000
+// 0x010b2fb4: 0x10b2fb4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010b2970: 0x10b2970: lw    s4, 23680(v1)
+// 0x010b2fb8: 0x10b2fb8: lw    s4, 24140(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5920
+	ldc.i4 6035
 	add
 	ldelem.i4
 	stloc 19
-// 0x010b2974: 0x10b2974: lw    v1, 23716(v0)
+// 0x010b2fbc: 0x10b2fbc: lw    v1, 24180(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5929
+	ldc.i4 6045
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2978: 0x10b2978: lw    v0, 23712(v0)
+// 0x010b2fc0: 0x10b2fc0: lw    v0, 24176(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5928
+	ldc.i4 6044
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b297c: 0x10b297c: addiu a0, sp, 24
+// 0x010b2fc4: 0x10b2fc4: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010b2980: 0x10b2980: addiu a1, sp, 16
+// 0x010b2fc8: 0x10b2fc8: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b2984: 0x10b2984: sw    v1, 52(sp)
+// 0x010b2fcc: 0x10b2fcc: sw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3939,7 +3939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2988: 0x10b2988: sw    v0, 48(sp)
+// 0x010b2fd0: 0x10b2fd0: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3948,18 +3948,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b298c: 0x10b298c: addiu s2, s1, 1
+// 0x010b2fd4: 0x10b2fd4: addiu s2, s1, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010b2990: 0x10b2990: addiu s3, zero, -1
+// 0x010b2fd8: 0x10b2fd8: addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 18
-// 0x010b2994: 0x10b2994: addu  s8, zero, zero
+// 0x010b2fdc: 0x10b2fdc: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 17
-// 0x010b2998: 0x10b2998: sw    v0, 56(sp)
+// 0x010b2fe0: 0x10b2fe0: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3968,7 +3968,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b299c: 0x10b299c: sw    v1, 60(sp)
+// 0x010b2fe4: 0x10b2fe4: sw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3977,7 +3977,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b29a0: 0x10b29a0: sw    a0, 84(sp)
+// 0x010b2fe8: 0x10b2fe8: sw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3986,7 +3986,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b29a4: 0x10b29a4: j	 0x10b2eb8 sw    a1, 80(sp)
+// 0x010b2fec: 0x10b2fec: j	 0x10b3500 sw    a1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3995,58 +3995,58 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	br L_10b2eb8
+	br L_10b3500
 // --- basic block ---
-L_10b29ac:
-// 0x010b29ac: 0x10b29ac: jal   0x10b07c8 addu  a0, s1, zero
+L_10b2ff4:
+// 0x010b2ff4: 0x10b2ff4: jal   0x10b0e10 addu  a0, s1, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b29b4: 0x10b29b4: addu  s6, v0, zero
+// 0x010b2ffc: 0x10b2ffc: addu  s6, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010b29b8: 0x10b29b8: jal   0x10b07c8 addu  a0, s0, zero
+// 0x010b3000: 0x10b3000: jal   0x10b0e10 addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b29c0: 0x10b29c0: addiu s6, s6, 1
+// 0x010b3008: 0x10b3008: addiu s6, s6, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010b29c4: 0x10b29c4: slt   s6, s6, v0
+// 0x010b300c: 0x10b300c: slt   s6, s6, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 8
-// 0x010b29c8: 0x10b29c8: bne   s6, zero, 0x10b2a08 sll   zero, zero, 0
+// 0x010b3010: 0x10b3010: bne   s6, zero, 0x10b3050 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_10b2a08
+	brtrue L_10b3050
 // --- basic block ---
-// 0x010b29d0: 0x10b29d0: jal   0x10b07a0 addu  a0, s1, zero
+// 0x010b3018: 0x10b3018: jal   0x10b0de8 addu  a0, s1, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b29d8: 0x10b29d8: lw    v1, 0(v0)
+// 0x010b3020: 0x10b3020: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b29dc: 0x10b29dc: addu  a0, s0, zero
+// 0x010b3024: 0x10b3024: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010b29e0: 0x10b29e0: sw    v1, 16(sp)
+// 0x010b3028: 0x10b3028: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4055,7 +4055,7 @@ L_10b29ac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b29e4: 0x10b29e4: lw    v0, 4(v0)
+// 0x010b302c: 0x10b302c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4064,7 +4064,7 @@ L_10b29ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b29e8: 0x10b29e8: jal   0x10b07a0 sw    v0, 20(sp)
+// 0x010b3030: 0x10b3030: jal   0x10b0de8 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4074,18 +4074,18 @@ L_10b29ac:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b29f0: 0x10b29f0: lw    v1, 0(v0)
+// 0x010b3038: 0x10b3038: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b29f4: 0x10b29f4: sll   zero, zero, 0
-// 0x010b29f8: 0x10b29f8: sw    v1, 24(sp)
+// 0x010b303c: 0x10b303c: sll   zero, zero, 0
+// 0x010b3040: 0x10b3040: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4094,7 +4094,7 @@ L_10b29ac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b29fc: 0x10b29fc: lw    v0, 4(v0)
+// 0x010b3044: 0x10b3044: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4103,50 +4103,50 @@ L_10b29ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2a00: 0x10b2a00: j	 0x10b2e6c addu  a0, s2, zero
+// 0x010b3048: 0x10b3048: j	 0x10b34b4 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-	br L_10b2e6c
+	br L_10b34b4
 // --- basic block ---
-L_10b2a08:
-// 0x010b2a08: 0x10b2a08: jal   0x10b07c8 addu  a0, s1, zero
+L_10b3050:
+// 0x010b3050: 0x10b3050: jal   0x10b0e10 addu  a0, s1, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2a10: 0x10b2a10: addu  a0, s0, zero
+// 0x010b3058: 0x10b3058: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010b2a14: 0x10b2a14: jal   0x10b07c8 addu  s6, v0, zero
+// 0x010b305c: 0x10b305c: jal   0x10b0e10 addu  s6, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2a1c: 0x10b2a1c: addu  a0, s2, zero
+// 0x010b3064: 0x10b3064: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010b2a20: 0x10b2a20: jal   0x10b07c8 addu  s7, v0, zero
+// 0x010b3068: 0x10b3068: jal   0x10b0e10 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2a28: 0x10b2a28: jal   0x10c09c0 addu  a0, v0, zero
+// 0x010b3070: 0x10b3070: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2a30: 0x10b2a30: lw    a3, 52(sp)
+// 0x010b3078: 0x10b3078: lw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4155,7 +4155,7 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2a34: 0x10b2a34: lw    a2, 48(sp)
+// 0x010b307c: 0x10b307c: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4164,10 +4164,10 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2a38: 0x10b2a38: addu  a1, v1, zero
+// 0x010b3080: 0x10b3080: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b2a3c: 0x10b2a3c: jal   0x10c0740 addu  a0, v0, zero
+// 0x010b3084: 0x10b3084: jal   0x10c0d80 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4175,18 +4175,18 @@ L_10b2a08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2a44: 0x10b2a44: addu  a2, v0, zero
+// 0x010b308c: 0x10b308c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2a48: 0x10b2a48: addu  a0, s6, zero
+// 0x010b3090: 0x10b3090: addu  a0, s6, zero
 	ldloc 8
 	stloc.1
-// 0x010b2a4c: 0x10b2a4c: sw    a2, 64(sp)
+// 0x010b3094: 0x10b3094: sw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4195,7 +4195,7 @@ L_10b2a08:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2a50: 0x10b2a50: jal   0x10c09c0 sw    v1, 68(sp)
+// 0x010b3098: 0x10b3098: jal   0x10c1000 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4206,12 +4206,12 @@ L_10b2a08:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2a58: 0x10b2a58: lw    a2, 64(sp)
+// 0x010b30a0: 0x10b30a0: lw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4220,7 +4220,7 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2a5c: 0x10b2a5c: lw    a3, 68(sp)
+// 0x010b30a4: 0x10b30a4: lw    a3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4229,16 +4229,16 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2a60: 0x10b2a60: addu  a0, a2, zero
+// 0x010b30a8: 0x10b30a8: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010b2a64: 0x10b2a64: addu  a1, a3, zero
+// 0x010b30ac: 0x10b30ac: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010b2a68: 0x10b2a68: addu  a2, v0, zero
+// 0x010b30b0: 0x10b30b0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2a6c: 0x10b2a6c: jal   0x10c0740 addu  a3, v1, zero
+// 0x010b30b4: 0x10b30b4: jal   0x10c0d80 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -4246,20 +4246,20 @@ L_10b2a08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2a74: 0x10b2a74: addu  a2, v0, zero
+// 0x010b30bc: 0x10b30bc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2a78: 0x10b2a78: subu  a0, s7, s6
+// 0x010b30c0: 0x10b30c0: subu  a0, s7, s6
 	ldloc 10
 	ldloc 8
 	sub
 	stloc.1
-// 0x010b2a7c: 0x10b2a7c: sw    a2, 64(sp)
+// 0x010b30c4: 0x10b30c4: sw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4268,7 +4268,7 @@ L_10b2a08:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2a80: 0x10b2a80: jal   0x10c09c0 sw    v1, 68(sp)
+// 0x010b30c8: 0x10b30c8: jal   0x10c1000 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4279,12 +4279,12 @@ L_10b2a08:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2a88: 0x10b2a88: lw    a2, 64(sp)
+// 0x010b30d0: 0x10b30d0: lw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4293,7 +4293,7 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2a8c: 0x10b2a8c: lw    a3, 68(sp)
+// 0x010b30d4: 0x10b30d4: lw    a3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4302,16 +4302,16 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2a90: 0x10b2a90: addu  a0, a2, zero
+// 0x010b30d8: 0x10b30d8: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010b2a94: 0x10b2a94: addu  a1, a3, zero
+// 0x010b30dc: 0x10b30dc: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010b2a98: 0x10b2a98: addu  a2, v0, zero
+// 0x010b30e0: 0x10b30e0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2a9c: 0x10b2a9c: jal   0x10c07f0 addu  a3, v1, zero
+// 0x010b30e4: 0x10b30e4: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -4319,28 +4319,28 @@ L_10b2a08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2aa4: 0x10b2aa4: addu  a0, s1, zero
+// 0x010b30ec: 0x10b30ec: addu  a0, s1, zero
 	ldloc 13
 	stloc.1
-// 0x010b2aa8: 0x10b2aa8: addu  s6, v1, zero
+// 0x010b30f0: 0x10b30f0: addu  s6, v1, zero
 	ldloc 7
 	stloc 8
-// 0x010b2aac: 0x10b2aac: jal   0x10b07a0 addu  s7, v0, zero
+// 0x010b30f4: 0x10b30f4: jal   0x10b0de8 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2ab4: 0x10b2ab4: addu  a0, s0, zero
+// 0x010b30fc: 0x10b30fc: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010b2ab8: 0x10b2ab8: jal   0x10b07a0 sw    v0, 32(sp)
+// 0x010b3100: 0x10b3100: jal   0x10b0de8 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4350,22 +4350,22 @@ L_10b2a08:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2ac0: 0x10b2ac0: addu  a0, s7, zero
+// 0x010b3108: 0x10b3108: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2ac4: 0x10b2ac4: addu  a3, zero, zero
+// 0x010b310c: 0x10b310c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b2ac8: 0x10b2ac8: addu  a2, zero, zero
+// 0x010b3110: 0x10b3110: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b2acc: 0x10b2acc: addu  a1, s6, zero
+// 0x010b3114: 0x10b3114: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2ad0: 0x10b2ad0: jal   0x10c188c sw    v0, 36(sp)
+// 0x010b3118: 0x10b3118: jal   0x10c1ecc sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4379,12 +4379,12 @@ L_10b2a08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2ad8: 0x10b2ad8: lw    a2, 32(sp)
+// 0x010b3120: 0x10b3120: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4393,7 +4393,7 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2adc: 0x10b2adc: lw    a3, 36(sp)
+// 0x010b3124: 0x10b3124: lw    a3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4402,29 +4402,29 @@ L_10b2a08:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2ae0: 0x10b2ae0: lw    a2, 0(a2)
+// 0x010b3128: 0x10b3128: lw    a2, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010b2ae4: 0x10b2ae4: lw    a3, 0(a3)
+// 0x010b312c: 0x10b312c: lw    a3, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010b2ae8: 0x10b2ae8: lui   a0, 0x20000
+// 0x010b3130: 0x10b3130: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b2aec: 0x10b2aec: addiu a0, a0, 23680
+// 0x010b3134: 0x10b3134: addiu a0, a0, 24140
 	ldloc.1
-	ldc.i4 23680
+	ldc.i4 24140
 	add
 	stloc.1
-// 0x010b2af0: 0x10b2af0: sw    a2, 40(sp)
+// 0x010b3138: 0x10b3138: sw    a2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4433,14 +4433,14 @@ L_10b2a08:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2af4: 0x10b2af4: lw    v1, 0(a0)
+// 0x010b313c: 0x10b313c: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b2af8: 0x10b2af8: bltz  v0, 0x10b2b0c sw    a3, 44(sp)
+// 0x010b3140: 0x10b3140: bltz  v0, 0x10b3154 sw    a3, 44(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4451,37 +4451,37 @@ L_10b2a08:
 	ldloc 4
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10b2b0c
+	blt L_10b3154
 // --- basic block ---
-// 0x010b2b00: 0x10b2b00: lui   a1, 0x20000
+// 0x010b3148: 0x10b3148: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b2b04: 0x10b2b04: addiu a1, a1, 23640
+// 0x010b314c: 0x10b314c: addiu a1, a1, 24100
 	ldloc.2
-	ldc.i4 23640
+	ldc.i4 24100
 	add
 	stloc.2
-// 0x010b2b08: 0x10b2b08: lw    v1, 0(a1)
+// 0x010b3150: 0x10b3150: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-L_10b2b0c:
-// 0x010b2b0c: 0x10b2b0c: addu  a0, s7, zero
+L_10b3154:
+// 0x010b3154: 0x10b3154: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2b10: 0x10b2b10: addu  a3, zero, zero
+// 0x010b3158: 0x10b3158: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b2b14: 0x10b2b14: addu  a2, zero, zero
+// 0x010b315c: 0x10b315c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b2b18: 0x10b2b18: addu  a1, s6, zero
+// 0x010b3160: 0x10b3160: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2b1c: 0x10b2b1c: jal   0x10c188c sw    v1, 64(sp)
+// 0x010b3164: 0x10b3164: jal   0x10c1ecc sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4495,12 +4495,12 @@ L_10b2b0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2b24: 0x10b2b24: lw    a2, 32(sp)
+// 0x010b316c: 0x10b316c: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4509,7 +4509,7 @@ L_10b2b0c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2b28: 0x10b2b28: lw    a3, 36(sp)
+// 0x010b3170: 0x10b3170: lw    a3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4518,7 +4518,7 @@ L_10b2b0c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2b2c: 0x10b2b2c: lw    a2, 4(a2)
+// 0x010b3174: 0x10b3174: lw    a2, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4527,15 +4527,15 @@ L_10b2b0c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2b30: 0x10b2b30: lui   a0, 0x20000
+// 0x010b3178: 0x10b3178: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b2b34: 0x10b2b34: addiu a0, a0, 23680
+// 0x010b317c: 0x10b317c: addiu a0, a0, 24140
 	ldloc.1
-	ldc.i4 23680
+	ldc.i4 24140
 	add
 	stloc.1
-// 0x010b2b38: 0x10b2b38: sw    a2, 32(sp)
+// 0x010b3180: 0x10b3180: sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4544,7 +4544,7 @@ L_10b2b0c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2b3c: 0x10b2b3c: lw    t1, 4(a3)
+// 0x010b3184: 0x10b3184: lw    t1, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4553,14 +4553,14 @@ L_10b2b0c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b2b40: 0x10b2b40: lw    t0, 0(a0)
+// 0x010b3188: 0x10b3188: lw    t0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x010b2b44: 0x10b2b44: lw    v1, 64(sp)
+// 0x010b318c: 0x10b318c: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4569,30 +4569,30 @@ L_10b2b0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2b48: 0x10b2b48: bltz  v0, 0x10b2b58 lui   a1, 0x20000
+// 0x010b3190: 0x10b3190: bltz  v0, 0x10b31a0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
 	ldc.i4.s 0
-	blt L_10b2b58
+	blt L_10b31a0
 // --- basic block ---
-// 0x010b2b50: 0x10b2b50: addiu a1, a1, 23640
+// 0x010b3198: 0x10b3198: addiu a1, a1, 24100
 	ldloc.2
-	ldc.i4 23640
+	ldc.i4 24100
 	add
 	stloc.2
-// 0x010b2b54: 0x10b2b54: lw    t0, 0(a1)
+// 0x010b319c: 0x10b319c: lw    t0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-L_10b2b58:
-// 0x010b2b58: 0x10b2b58: addu  a0, v1, zero
+L_10b31a0:
+// 0x010b31a0: 0x10b31a0: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x010b2b5c: 0x10b2b5c: sw    t1, 76(sp)
+// 0x010b31a4: 0x10b31a4: sw    t1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4601,7 +4601,7 @@ L_10b2b58:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b2b60: 0x10b2b60: jal   0x10c0874 sw    t0, 72(sp)
+// 0x010b31a8: 0x10b31a8: jal   0x10c0eb4 sw    t0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4612,12 +4612,12 @@ L_10b2b58:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2b68: 0x10b2b68: lw    a2, 44(sp)
+// 0x010b31b0: 0x10b31b0: lw    a2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4626,7 +4626,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2b6c: 0x10b2b6c: lw    a3, 40(sp)
+// 0x010b31b4: 0x10b31b4: lw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4635,15 +4635,15 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2b70: 0x10b2b70: addu  t2, v0, zero
+// 0x010b31b8: 0x10b31b8: addu  t2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b2b74: 0x10b2b74: subu  a0, a2, a3
+// 0x010b31bc: 0x10b31bc: subu  a0, a2, a3
 	ldloc.3
 	ldloc 4
 	sub
 	stloc.1
-// 0x010b2b78: 0x10b2b78: sw    t2, 64(sp)
+// 0x010b31c0: 0x10b31c0: sw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4652,7 +4652,7 @@ L_10b2b58:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b2b7c: 0x10b2b7c: jal   0x10c09c0 sw    v1, 68(sp)
+// 0x010b31c4: 0x10b31c4: jal   0x10c1000 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4663,21 +4663,21 @@ L_10b2b58:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2b84: 0x10b2b84: addu  a3, v1, zero
+// 0x010b31cc: 0x10b31cc: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b2b88: 0x10b2b88: addu  a0, s7, zero
+// 0x010b31d0: 0x10b31d0: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2b8c: 0x10b2b8c: addu  a1, s6, zero
+// 0x010b31d4: 0x10b31d4: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2b90: 0x10b2b90: jal   0x10c0798 addu  a2, v0, zero
+// 0x010b31d8: 0x10b31d8: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4685,12 +4685,12 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2b98: 0x10b2b98: lw    t3, 68(sp)
+// 0x010b31e0: 0x10b31e0: lw    t3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4699,7 +4699,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b2b9c: 0x10b2b9c: lw    t2, 64(sp)
+// 0x010b31e4: 0x10b31e4: lw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4708,16 +4708,16 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b2ba0: 0x10b2ba0: addu  a1, t3, zero
+// 0x010b31e8: 0x10b31e8: addu  a1, t3, zero
 	ldloc 15
 	stloc.2
-// 0x010b2ba4: 0x10b2ba4: addu  a0, t2, zero
+// 0x010b31ec: 0x10b31ec: addu  a0, t2, zero
 	ldloc 9
 	stloc.1
-// 0x010b2ba8: 0x10b2ba8: addu  a3, v1, zero
+// 0x010b31f0: 0x10b31f0: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b2bac: 0x10b2bac: jal   0x10c06e8 addu  a2, v0, zero
+// 0x010b31f4: 0x10b31f4: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4725,26 +4725,26 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2bb4: 0x10b2bb4: addu  a1, v1, zero
+// 0x010b31fc: 0x10b31fc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b2bb8: 0x10b2bb8: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010b3200: 0x10b3200: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2bc0: 0x10b2bc0: lw    t0, 72(sp)
+// 0x010b3208: 0x10b3208: lw    t0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4753,7 +4753,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b2bc4: 0x10b2bc4: lw    v1, 40(sp)
+// 0x010b320c: 0x10b320c: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4762,15 +4762,15 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2bc8: 0x10b2bc8: addu  a0, t0, zero
+// 0x010b3210: 0x10b3210: addu  a0, t0, zero
 	ldloc 14
 	stloc.1
-// 0x010b2bcc: 0x10b2bcc: addu  v0, v0, v1
+// 0x010b3214: 0x10b3214: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010b2bd0: 0x10b2bd0: jal   0x10c0874 sw    v0, 16(sp)
+// 0x010b3218: 0x10b3218: jal   0x10c0eb4 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4781,12 +4781,12 @@ L_10b2b58:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2bd8: 0x10b2bd8: lw    t1, 76(sp)
+// 0x010b3220: 0x10b3220: lw    t1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4795,7 +4795,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b2bdc: 0x10b2bdc: lw    a1, 32(sp)
+// 0x010b3224: 0x10b3224: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4804,15 +4804,15 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2be0: 0x10b2be0: addu  t2, v0, zero
+// 0x010b3228: 0x10b3228: addu  t2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b2be4: 0x10b2be4: subu  a0, t1, a1
+// 0x010b322c: 0x10b322c: subu  a0, t1, a1
 	ldloc 16
 	ldloc.2
 	sub
 	stloc.1
-// 0x010b2be8: 0x10b2be8: sw    t2, 64(sp)
+// 0x010b3230: 0x10b3230: sw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4821,7 +4821,7 @@ L_10b2b58:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b2bec: 0x10b2bec: jal   0x10c09c0 sw    v1, 68(sp)
+// 0x010b3234: 0x10b3234: jal   0x10c1000 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4832,21 +4832,21 @@ L_10b2b58:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2bf4: 0x10b2bf4: addu  a3, v1, zero
+// 0x010b323c: 0x10b323c: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b2bf8: 0x10b2bf8: addu  a0, s7, zero
+// 0x010b3240: 0x10b3240: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2bfc: 0x10b2bfc: addu  a1, s6, zero
+// 0x010b3244: 0x10b3244: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2c00: 0x10b2c00: jal   0x10c0798 addu  a2, v0, zero
+// 0x010b3248: 0x10b3248: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4854,12 +4854,12 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2c08: 0x10b2c08: lw    t2, 64(sp)
+// 0x010b3250: 0x10b3250: lw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4868,7 +4868,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b2c0c: 0x10b2c0c: lw    t3, 68(sp)
+// 0x010b3254: 0x10b3254: lw    t3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4877,16 +4877,16 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b2c10: 0x10b2c10: addu  a0, t2, zero
+// 0x010b3258: 0x10b3258: addu  a0, t2, zero
 	ldloc 9
 	stloc.1
-// 0x010b2c14: 0x10b2c14: addu  a1, t3, zero
+// 0x010b325c: 0x10b325c: addu  a1, t3, zero
 	ldloc 15
 	stloc.2
-// 0x010b2c18: 0x10b2c18: addu  a3, v1, zero
+// 0x010b3260: 0x10b3260: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b2c1c: 0x10b2c1c: jal   0x10c06e8 addu  a2, v0, zero
+// 0x010b3264: 0x10b3264: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4894,26 +4894,26 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2c24: 0x10b2c24: addu  a1, v1, zero
+// 0x010b326c: 0x10b326c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b2c28: 0x10b2c28: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010b3270: 0x10b3270: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2c30: 0x10b2c30: lw    a2, 32(sp)
+// 0x010b3278: 0x10b3278: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4922,15 +4922,15 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2c34: 0x10b2c34: addu  a0, s1, zero
+// 0x010b327c: 0x10b327c: addu  a0, s1, zero
 	ldloc 13
 	stloc.1
-// 0x010b2c38: 0x10b2c38: addu  v0, v0, a2
+// 0x010b3280: 0x10b3280: addu  v0, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc 5
-// 0x010b2c3c: 0x10b2c3c: jal   0x10b07c8 sw    v0, 20(sp)
+// 0x010b3284: 0x10b3284: jal   0x10b0e10 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4940,40 +4940,40 @@ L_10b2b58:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2c44: 0x10b2c44: addu  a0, s0, zero
+// 0x010b328c: 0x10b328c: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010b2c48: 0x10b2c48: jal   0x10b07c8 addu  s6, v0, zero
+// 0x010b3290: 0x10b3290: jal   0x10b0e10 addu  s6, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2c50: 0x10b2c50: addu  a0, s2, zero
+// 0x010b3298: 0x10b3298: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010b2c54: 0x10b2c54: jal   0x10b07c8 addu  s7, v0, zero
+// 0x010b329c: 0x10b329c: jal   0x10b0e10 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_time_10b07c8(int32)
+	call int32 Cibyl132::track_point_time_10b0e10(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2c5c: 0x10b2c5c: jal   0x10c09c0 addu  a0, v0, zero
+// 0x010b32a4: 0x10b32a4: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2c64: 0x10b2c64: lw    a3, 60(sp)
+// 0x010b32ac: 0x10b32ac: lw    a3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4982,7 +4982,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2c68: 0x10b2c68: lw    a2, 56(sp)
+// 0x010b32b0: 0x10b32b0: lw    a2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4991,10 +4991,10 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2c6c: 0x10b2c6c: addu  a1, v1, zero
+// 0x010b32b4: 0x10b32b4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b2c70: 0x10b2c70: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010b32b8: 0x10b32b8: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5002,18 +5002,18 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2c78: 0x10b2c78: addu  a2, v0, zero
+// 0x010b32c0: 0x10b32c0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2c7c: 0x10b2c7c: addu  a0, s6, zero
+// 0x010b32c4: 0x10b32c4: addu  a0, s6, zero
 	ldloc 8
 	stloc.1
-// 0x010b2c80: 0x10b2c80: sw    a2, 64(sp)
+// 0x010b32c8: 0x10b32c8: sw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5022,7 +5022,7 @@ L_10b2b58:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2c84: 0x10b2c84: jal   0x10c09c0 sw    v1, 68(sp)
+// 0x010b32cc: 0x10b32cc: jal   0x10c1000 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5033,12 +5033,12 @@ L_10b2b58:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2c8c: 0x10b2c8c: lw    a2, 64(sp)
+// 0x010b32d4: 0x10b32d4: lw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5047,7 +5047,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2c90: 0x10b2c90: lw    a3, 68(sp)
+// 0x010b32d8: 0x10b32d8: lw    a3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5056,16 +5056,16 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2c94: 0x10b2c94: addu  a0, a2, zero
+// 0x010b32dc: 0x10b32dc: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010b2c98: 0x10b2c98: addu  a1, a3, zero
+// 0x010b32e0: 0x10b32e0: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010b2c9c: 0x10b2c9c: addu  a2, v0, zero
+// 0x010b32e4: 0x10b32e4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2ca0: 0x10b2ca0: jal   0x10c0740 addu  a3, v1, zero
+// 0x010b32e8: 0x10b32e8: jal   0x10c0d80 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -5073,20 +5073,20 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2ca8: 0x10b2ca8: addu  a2, v0, zero
+// 0x010b32f0: 0x10b32f0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2cac: 0x10b2cac: subu  a0, s7, s6
+// 0x010b32f4: 0x10b32f4: subu  a0, s7, s6
 	ldloc 10
 	ldloc 8
 	sub
 	stloc.1
-// 0x010b2cb0: 0x10b2cb0: sw    a2, 64(sp)
+// 0x010b32f8: 0x10b32f8: sw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5095,7 +5095,7 @@ L_10b2b58:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2cb4: 0x10b2cb4: jal   0x10c09c0 sw    v1, 68(sp)
+// 0x010b32fc: 0x10b32fc: jal   0x10c1000 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5106,12 +5106,12 @@ L_10b2b58:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2cbc: 0x10b2cbc: lw    a2, 64(sp)
+// 0x010b3304: 0x10b3304: lw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5120,7 +5120,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2cc0: 0x10b2cc0: lw    a3, 68(sp)
+// 0x010b3308: 0x10b3308: lw    a3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5129,16 +5129,16 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2cc4: 0x10b2cc4: addu  a0, a2, zero
+// 0x010b330c: 0x10b330c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010b2cc8: 0x10b2cc8: addu  a1, a3, zero
+// 0x010b3310: 0x10b3310: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010b2ccc: 0x10b2ccc: addu  a2, v0, zero
+// 0x010b3314: 0x10b3314: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2cd0: 0x10b2cd0: jal   0x10c07f0 addu  a3, v1, zero
+// 0x010b3318: 0x10b3318: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -5146,28 +5146,28 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2cd8: 0x10b2cd8: addu  a0, s1, zero
+// 0x010b3320: 0x10b3320: addu  a0, s1, zero
 	ldloc 13
 	stloc.1
-// 0x010b2cdc: 0x10b2cdc: addu  s6, v1, zero
+// 0x010b3324: 0x10b3324: addu  s6, v1, zero
 	ldloc 7
 	stloc 8
-// 0x010b2ce0: 0x10b2ce0: jal   0x10b07a0 addu  s7, v0, zero
+// 0x010b3328: 0x10b3328: jal   0x10b0de8 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2ce8: 0x10b2ce8: addu  a0, s0, zero
+// 0x010b3330: 0x10b3330: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010b2cec: 0x10b2cec: jal   0x10b07a0 sw    v0, 32(sp)
+// 0x010b3334: 0x10b3334: jal   0x10b0de8 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5177,22 +5177,22 @@ L_10b2b58:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2cf4: 0x10b2cf4: addu  a0, s7, zero
+// 0x010b333c: 0x10b333c: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2cf8: 0x10b2cf8: addu  a3, zero, zero
+// 0x010b3340: 0x10b3340: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b2cfc: 0x10b2cfc: addu  a1, s6, zero
+// 0x010b3344: 0x10b3344: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2d00: 0x10b2d00: addu  a2, zero, zero
+// 0x010b3348: 0x10b3348: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b2d04: 0x10b2d04: jal   0x10c188c sw    v0, 36(sp)
+// 0x010b334c: 0x10b334c: jal   0x10c1ecc sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5206,12 +5206,12 @@ L_10b2b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2d0c: 0x10b2d0c: lw    a3, 32(sp)
+// 0x010b3354: 0x10b3354: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5220,7 +5220,7 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2d10: 0x10b2d10: lw    v1, 36(sp)
+// 0x010b3358: 0x10b3358: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5229,29 +5229,29 @@ L_10b2b58:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2d14: 0x10b2d14: lw    a3, 0(a3)
+// 0x010b335c: 0x10b335c: lw    a3, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010b2d18: 0x10b2d18: lw    v1, 0(v1)
+// 0x010b3360: 0x10b3360: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b2d1c: 0x10b2d1c: lui   a0, 0x20000
+// 0x010b3364: 0x10b3364: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b2d20: 0x10b2d20: addiu a0, a0, 23680
+// 0x010b3368: 0x10b3368: addiu a0, a0, 24140
 	ldloc.1
-	ldc.i4 23680
+	ldc.i4 24140
 	add
 	stloc.1
-// 0x010b2d24: 0x10b2d24: sw    v1, 44(sp)
+// 0x010b336c: 0x10b336c: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5260,14 +5260,14 @@ L_10b2b58:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2d28: 0x10b2d28: lw    v1, 0(a0)
+// 0x010b3370: 0x10b3370: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b2d2c: 0x10b2d2c: bltz  v0, 0x10b2d40 sw    a3, 40(sp)
+// 0x010b3374: 0x10b3374: bltz  v0, 0x10b3388 sw    a3, 40(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5278,37 +5278,37 @@ L_10b2b58:
 	ldloc 4
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10b2d40
+	blt L_10b3388
 // --- basic block ---
-// 0x010b2d34: 0x10b2d34: lui   a1, 0x20000
+// 0x010b337c: 0x10b337c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b2d38: 0x10b2d38: addiu a1, a1, 23640
+// 0x010b3380: 0x10b3380: addiu a1, a1, 24100
 	ldloc.2
-	ldc.i4 23640
+	ldc.i4 24100
 	add
 	stloc.2
-// 0x010b2d3c: 0x10b2d3c: lw    v1, 0(a1)
+// 0x010b3384: 0x10b3384: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-L_10b2d40:
-// 0x010b2d40: 0x10b2d40: addu  a3, zero, zero
+L_10b3388:
+// 0x010b3388: 0x10b3388: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b2d44: 0x10b2d44: addu  a2, zero, zero
+// 0x010b338c: 0x10b338c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b2d48: 0x10b2d48: addu  a0, s7, zero
+// 0x010b3390: 0x10b3390: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2d4c: 0x10b2d4c: addu  a1, s6, zero
+// 0x010b3394: 0x10b3394: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2d50: 0x10b2d50: jal   0x10c188c sw    v1, 64(sp)
+// 0x010b3398: 0x10b3398: jal   0x10c1ecc sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5322,12 +5322,12 @@ L_10b2d40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2d58: 0x10b2d58: lw    a2, 32(sp)
+// 0x010b33a0: 0x10b33a0: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5336,7 +5336,7 @@ L_10b2d40:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2d5c: 0x10b2d5c: lw    a3, 36(sp)
+// 0x010b33a4: 0x10b33a4: lw    a3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5345,7 +5345,7 @@ L_10b2d40:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2d60: 0x10b2d60: lw    a2, 4(a2)
+// 0x010b33a8: 0x10b33a8: lw    a2, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -5354,7 +5354,7 @@ L_10b2d40:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2d64: 0x10b2d64: lw    t1, 4(a3)
+// 0x010b33ac: 0x10b33ac: lw    t1, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -5363,7 +5363,7 @@ L_10b2d40:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b2d68: 0x10b2d68: sw    a2, 32(sp)
+// 0x010b33b0: 0x10b33b0: sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5372,7 +5372,7 @@ L_10b2d40:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b2d6c: 0x10b2d6c: lw    v1, 64(sp)
+// 0x010b33b4: 0x10b33b4: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5381,21 +5381,21 @@ L_10b2d40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2d70: 0x10b2d70: bltz  v0, 0x10b2d7c addu  t0, s4, zero
+// 0x010b33b8: 0x10b33b8: bltz  v0, 0x10b33c4 addu  t0, s4, zero
 	ldloc 5
 	ldloc 19
 	stloc 14
 	ldc.i4.s 0
-	blt L_10b2d7c
+	blt L_10b33c4
 // --- basic block ---
-// 0x010b2d78: 0x10b2d78: addu  t0, s5, zero
+// 0x010b33c0: 0x10b33c0: addu  t0, s5, zero
 	ldloc 20
 	stloc 14
-L_10b2d7c:
-// 0x010b2d7c: 0x10b2d7c: addu  a0, v1, zero
+L_10b33c4:
+// 0x010b33c4: 0x10b33c4: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x010b2d80: 0x10b2d80: sw    t1, 76(sp)
+// 0x010b33c8: 0x10b33c8: sw    t1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5404,7 +5404,7 @@ L_10b2d7c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b2d84: 0x10b2d84: jal   0x10c0874 sw    t0, 72(sp)
+// 0x010b33cc: 0x10b33cc: jal   0x10c0eb4 sw    t0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5415,18 +5415,18 @@ L_10b2d7c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2d8c: 0x10b2d8c: addu  t3, v1, zero
+// 0x010b33d4: 0x10b33d4: addu  t3, v1, zero
 	ldloc 7
 	stloc 15
-// 0x010b2d90: 0x10b2d90: addu  t2, v0, zero
+// 0x010b33d8: 0x10b33d8: addu  t2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b2d94: 0x10b2d94: lw    v1, 40(sp)
+// 0x010b33dc: 0x10b33dc: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5435,7 +5435,7 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b2d98: 0x10b2d98: lw    v0, 44(sp)
+// 0x010b33e0: 0x10b33e0: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5444,7 +5444,7 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b2d9c: 0x10b2d9c: sw    t2, 64(sp)
+// 0x010b33e4: 0x10b33e4: sw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5453,12 +5453,12 @@ L_10b2d7c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b2da0: 0x10b2da0: subu  a0, v0, v1
+// 0x010b33e8: 0x10b33e8: subu  a0, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc.1
-// 0x010b2da4: 0x10b2da4: jal   0x10c09c0 sw    t3, 68(sp)
+// 0x010b33ec: 0x10b33ec: jal   0x10c1000 sw    t3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5469,21 +5469,21 @@ L_10b2d7c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2dac: 0x10b2dac: addu  a3, v1, zero
+// 0x010b33f4: 0x10b33f4: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b2db0: 0x10b2db0: addu  a0, s7, zero
+// 0x010b33f8: 0x10b33f8: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2db4: 0x10b2db4: addu  a1, s6, zero
+// 0x010b33fc: 0x10b33fc: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2db8: 0x10b2db8: jal   0x10c0798 addu  a2, v0, zero
+// 0x010b3400: 0x10b3400: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -5491,12 +5491,12 @@ L_10b2d7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2dc0: 0x10b2dc0: lw    t3, 68(sp)
+// 0x010b3408: 0x10b3408: lw    t3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5505,7 +5505,7 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b2dc4: 0x10b2dc4: lw    t2, 64(sp)
+// 0x010b340c: 0x10b340c: lw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5514,16 +5514,16 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b2dc8: 0x10b2dc8: addu  a1, t3, zero
+// 0x010b3410: 0x10b3410: addu  a1, t3, zero
 	ldloc 15
 	stloc.2
-// 0x010b2dcc: 0x10b2dcc: addu  a0, t2, zero
+// 0x010b3414: 0x10b3414: addu  a0, t2, zero
 	ldloc 9
 	stloc.1
-// 0x010b2dd0: 0x10b2dd0: addu  a3, v1, zero
+// 0x010b3418: 0x10b3418: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b2dd4: 0x10b2dd4: jal   0x10c06e8 addu  a2, v0, zero
+// 0x010b341c: 0x10b341c: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -5531,26 +5531,26 @@ L_10b2d7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2ddc: 0x10b2ddc: addu  a1, v1, zero
+// 0x010b3424: 0x10b3424: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b2de0: 0x10b2de0: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010b3428: 0x10b3428: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2de8: 0x10b2de8: lw    t0, 72(sp)
+// 0x010b3430: 0x10b3430: lw    t0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5559,7 +5559,7 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b2dec: 0x10b2dec: lw    a0, 40(sp)
+// 0x010b3434: 0x10b3434: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5568,16 +5568,16 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2df0: 0x10b2df0: sll   zero, zero, 0
-// 0x010b2df4: 0x10b2df4: addu  v0, v0, a0
+// 0x010b3438: 0x10b3438: sll   zero, zero, 0
+// 0x010b343c: 0x10b343c: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x010b2df8: 0x10b2df8: addu  a0, t0, zero
+// 0x010b3440: 0x10b3440: addu  a0, t0, zero
 	ldloc 14
 	stloc.1
-// 0x010b2dfc: 0x10b2dfc: jal   0x10c0874 sw    v0, 24(sp)
+// 0x010b3444: 0x10b3444: jal   0x10c0eb4 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5588,12 +5588,12 @@ L_10b2d7c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2e04: 0x10b2e04: lw    t1, 76(sp)
+// 0x010b344c: 0x10b344c: lw    t1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5602,7 +5602,7 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b2e08: 0x10b2e08: lw    a1, 32(sp)
+// 0x010b3450: 0x10b3450: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5611,15 +5611,15 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2e0c: 0x10b2e0c: addu  t2, v0, zero
+// 0x010b3454: 0x10b3454: addu  t2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b2e10: 0x10b2e10: subu  a0, t1, a1
+// 0x010b3458: 0x10b3458: subu  a0, t1, a1
 	ldloc 16
 	ldloc.2
 	sub
 	stloc.1
-// 0x010b2e14: 0x10b2e14: sw    t2, 64(sp)
+// 0x010b345c: 0x10b345c: sw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5628,7 +5628,7 @@ L_10b2d7c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b2e18: 0x10b2e18: jal   0x10c09c0 sw    v1, 68(sp)
+// 0x010b3460: 0x10b3460: jal   0x10c1000 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5639,21 +5639,21 @@ L_10b2d7c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2e20: 0x10b2e20: addu  a3, v1, zero
+// 0x010b3468: 0x10b3468: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b2e24: 0x10b2e24: addu  a0, s7, zero
+// 0x010b346c: 0x10b346c: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x010b2e28: 0x10b2e28: addu  a1, s6, zero
+// 0x010b3470: 0x10b3470: addu  a1, s6, zero
 	ldloc 8
 	stloc.2
-// 0x010b2e2c: 0x10b2e2c: jal   0x10c0798 addu  a2, v0, zero
+// 0x010b3474: 0x10b3474: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -5661,12 +5661,12 @@ L_10b2d7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2e34: 0x10b2e34: lw    t2, 64(sp)
+// 0x010b347c: 0x10b347c: lw    t2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5675,7 +5675,7 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b2e38: 0x10b2e38: lw    t3, 68(sp)
+// 0x010b3480: 0x10b3480: lw    t3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5684,16 +5684,16 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b2e3c: 0x10b2e3c: addu  a0, t2, zero
+// 0x010b3484: 0x10b3484: addu  a0, t2, zero
 	ldloc 9
 	stloc.1
-// 0x010b2e40: 0x10b2e40: addu  a1, t3, zero
+// 0x010b3488: 0x10b3488: addu  a1, t3, zero
 	ldloc 15
 	stloc.2
-// 0x010b2e44: 0x10b2e44: addu  a2, v0, zero
+// 0x010b348c: 0x10b348c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b2e48: 0x10b2e48: jal   0x10c06e8 addu  a3, v1, zero
+// 0x010b3490: 0x10b3490: jal   0x10c0d28 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -5701,26 +5701,26 @@ L_10b2d7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2e50: 0x10b2e50: addu  a1, v1, zero
+// 0x010b3498: 0x10b3498: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b2e54: 0x10b2e54: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010b349c: 0x10b349c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2e5c: 0x10b2e5c: lw    a2, 32(sp)
+// 0x010b34a4: 0x10b34a4: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5729,17 +5729,17 @@ L_10b2d7c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b2e60: 0x10b2e60: sll   zero, zero, 0
-// 0x010b2e64: 0x10b2e64: addu  v0, v0, a2
+// 0x010b34a8: 0x10b34a8: sll   zero, zero, 0
+// 0x010b34ac: 0x10b34ac: addu  v0, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc 5
-// 0x010b2e68: 0x10b2e68: addu  a0, s2, zero
+// 0x010b34b0: 0x10b34b0: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-L_10b2e6c:
-// 0x010b2e6c: 0x10b2e6c: jal   0x10b07a0 sw    v0, 28(sp)
+L_10b34b4:
+// 0x010b34b4: 0x10b34b4: jal   0x10b0de8 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5749,13 +5749,13 @@ L_10b2e6c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_pos_10b07a0(int32)
+	call int32 Cibyl132::track_point_pos_10b0de8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b2e74: 0x10b2e74: addu  v1, v0, zero
+// 0x010b34bc: 0x10b34bc: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010b2e78: 0x10b2e78: lw    a3, 80(sp)
+// 0x010b34c0: 0x10b34c0: lw    a3, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5764,7 +5764,7 @@ L_10b2e6c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b2e7c: 0x10b2e7c: lw    a0, 84(sp)
+// 0x010b34c4: 0x10b34c4: lw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5773,74 +5773,74 @@ L_10b2e6c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b2e80: 0x10b2e80: addu  a1, zero, zero
+// 0x010b34c8: 0x10b34c8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b2e84: 0x10b2e84: cibyl_sysc_arg 0x3
+// 0x010b34cc: 0x10b34cc: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010b2e88: 0x10b2e88: cibyl_sysc_arg 0x7
+// 0x010b34d0: 0x10b34d0: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x010b2e8c: 0x10b2e8c: cibyl_sysc_arg 0x4
+// 0x010b34d4: 0x10b34d4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010b2e90: 0x10b2e90: cibyl_sysc_arg 0x5
+// 0x010b34d8: 0x10b34d8: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010b2e94: 0x10b2e94: cibyl_sysc_arg 0x5
+// 0x010b34dc: 0x10b34dc: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010b2e98: 0x10b2e98: cibyl_sysc 0x2332
+// 0x010b34e0: 0x10b34e0: cibyl_sysc 0x2332
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010b2e9c: 0x10b2e9c: addu  v1, v0, zero
+// 0x010b34e4: 0x10b34e4: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010b2ea0: 0x10b2ea0: slt   v0, s8, v1
+// 0x010b34e8: 0x10b34e8: slt   v0, s8, v1
 	ldloc 17
 	ldloc 7
 	clt
 	stloc 5
-// 0x010b2ea4: 0x10b2ea4: beq   v0, zero, 0x10b2eb4 sll   zero, zero, 0
+// 0x010b34ec: 0x10b34ec: beq   v0, zero, 0x10b34fc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b2eb4
+	brfalse L_10b34fc
 // --- basic block ---
-// 0x010b2eac: 0x10b2eac: addu  s8, v1, zero
+// 0x010b34f4: 0x10b34f4: addu  s8, v1, zero
 	ldloc 7
 	stloc 17
-// 0x010b2eb0: 0x10b2eb0: addu  s3, s2, zero
+// 0x010b34f8: 0x10b34f8: addu  s3, s2, zero
 	ldloc 11
 	stloc 18
-L_10b2eb4:
-// 0x010b2eb4: 0x10b2eb4: addiu s2, s2, 1
+L_10b34fc:
+// 0x010b34fc: 0x10b34fc: addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_10b2eb8:
-// 0x010b2eb8: 0x10b2eb8: slt   v0, s2, s0
+L_10b3500:
+// 0x010b3500: 0x10b3500: slt   v0, s2, s0
 	ldloc 11
 	ldloc 12
 	clt
 	stloc 5
-// 0x010b2ebc: 0x10b2ebc: bne   v0, zero, 0x10b29ac addiu v0, zero, -1
+// 0x010b3504: 0x10b3504: bne   v0, zero, 0x10b2ff4 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_10b29ac
+	brtrue L_10b2ff4
 // --- basic block ---
-// 0x010b2ec4: 0x10b2ec4: beq   s3, v0, 0x10b2ee8 slti  s8, s8, 5
+// 0x010b350c: 0x10b350c: beq   s3, v0, 0x10b3530 slti  s8, s8, 5
 	ldloc 18
 	ldloc 5
 	ldloc 17
 	ldc.i4.5
 	clt
 	stloc 17
-	beq  L_10b2ee8
+	beq  L_10b3530
 // --- basic block ---
-// 0x010b2ecc: 0x10b2ecc: bne   s8, zero, 0x10b2ee8 addu  a0, s1, zero
+// 0x010b3514: 0x10b3514: bne   s8, zero, 0x10b3530 addu  a0, s1, zero
 	ldloc 17
 	ldloc 13
 	stloc.1
-	brtrue L_10b2ee8
+	brtrue L_10b3530
 // --- basic block ---
-// 0x010b2ed4: 0x10b2ed4: jal   0x10b2908 addu  a1, s3, zero
+// 0x010b351c: 0x10b351c: jal   0x10b2f50 addu  a1, s3, zero
 	ldloc 18
 	stloc.2
 	ldloc.0
@@ -5848,15 +5848,15 @@ L_10b2eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_compress_range_10b2908(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_compress_range_10b2f50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b2edc: 0x10b2edc: addu  a0, s3, zero
+// 0x010b3524: 0x10b3524: addu  a0, s3, zero
 	ldloc 18
 	stloc.1
-// 0x010b2ee0: 0x10b2ee0: jal   0x10b2908 addu  a1, s0, zero
+// 0x010b3528: 0x10b3528: jal   0x10b2f50 addu  a1, s0, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -5864,14 +5864,14 @@ L_10b2eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_compress_range_10b2908(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_compress_range_10b2f50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b2ee8:
-// 0x010b2ee8: 0x10b2ee8: lw    ra, 124(sp)
-// 0x010b2eec: 0x10b2eec: lw    s8, 120(sp)
+L_10b3530:
+// 0x010b3530: 0x10b3530: lw    ra, 124(sp)
+// 0x010b3534: 0x10b3534: lw    s8, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5880,7 +5880,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010b2ef0: 0x10b2ef0: lw    s7, 116(sp)
+// 0x010b3538: 0x10b3538: lw    s7, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5889,7 +5889,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b2ef4: 0x10b2ef4: lw    s6, 112(sp)
+// 0x010b353c: 0x10b353c: lw    s6, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5898,7 +5898,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b2ef8: 0x10b2ef8: lw    s5, 108(sp)
+// 0x010b3540: 0x10b3540: lw    s5, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5907,7 +5907,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010b2efc: 0x10b2efc: lw    s4, 104(sp)
+// 0x010b3544: 0x10b3544: lw    s4, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5916,7 +5916,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010b2f00: 0x10b2f00: lw    s3, 100(sp)
+// 0x010b3548: 0x10b3548: lw    s3, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5925,7 +5925,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010b2f04: 0x10b2f04: lw    s2, 96(sp)
+// 0x010b354c: 0x10b354c: lw    s2, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5934,7 +5934,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b2f08: 0x10b2f08: lw    s1, 92(sp)
+// 0x010b3550: 0x10b3550: lw    s1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5943,7 +5943,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b2f0c: 0x10b2f0c: lw    s0, 88(sp)
+// 0x010b3554: 0x10b3554: lw    s0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5952,7 +5952,7 @@ L_10b2ee8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b2f10: 0x10b2f10: jr    ra addiu sp, sp, 128
+// 0x010b3558: 0x10b3558: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -5964,7 +5964,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_compress_track_10b2f18(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_compress_track_10b3560(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -6005,12 +6005,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b2f18: 0x10b2f18: addiu sp, sp, -40
+// 0x010b3560: 0x10b3560: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b2f1c: 0x10b2f1c: sw    s1, 32(sp)
+// 0x010b3564: 0x10b3564: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6019,7 +6019,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b2f20: 0x10b2f20: sw    s0, 28(sp)
+// 0x010b3568: 0x10b3568: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6028,17 +6028,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b2f24: 0x10b2f24: sw    ra, 36(sp)
-// 0x010b2f28: 0x10b2f28: addu  s0, a0, zero
+// 0x010b356c: 0x10b356c: sw    ra, 36(sp)
+// 0x010b3570: 0x10b3570: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b2f2c: 0x10b2f2c: j	 0x10b2f48 addu  s1, a0, zero
+// 0x010b3574: 0x10b3574: j	 0x10b3590 addu  s1, a0, zero
 	ldloc.1
 	stloc 6
-	br L_10b2f48
+	br L_10b3590
 // --- basic block ---
-L_10b2f34:
-// 0x010b2f34: 0x10b2f34: jal   0x10b07e4 sw    a1, 16(sp)
+L_10b357c:
+// 0x010b357c: 0x10b357c: jal   0x10b0e2c sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6048,10 +6048,10 @@ L_10b2f34:
 	ldloc.2
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::track_point_status_10b07e4(int32)
+	call int32 Cibyl132::track_point_status_10b0e2c(int32)
 	stloc 7
 // --- basic block ---
-// 0x010b2f3c: 0x10b2f3c: lw    a1, 16(sp)
+// 0x010b3584: 0x10b3584: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6060,31 +6060,31 @@ L_10b2f34:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b2f40: 0x10b2f40: sw    zero, 0(v0)
+// 0x010b3588: 0x10b3588: sw    zero, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f44: 0x10b2f44: addiu s1, s1, 1
+// 0x010b358c: 0x10b358c: addiu s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_10b2f48:
-// 0x010b2f48: 0x10b2f48: slt   v0, a1, s1
+L_10b3590:
+// 0x010b3590: 0x10b3590: slt   v0, a1, s1
 	ldloc.2
 	ldloc 6
 	clt
 	stloc 7
-// 0x010b2f4c: 0x10b2f4c: beq   v0, zero, 0x10b2f34 addu  a0, s1, zero
+// 0x010b3594: 0x10b3594: beq   v0, zero, 0x10b357c addu  a0, s1, zero
 	ldloc 7
 	ldloc 6
 	stloc.1
-	brfalse L_10b2f34
+	brfalse L_10b357c
 // --- basic block ---
-// 0x010b2f54: 0x10b2f54: jal   0x10b2908 addu  a0, s0, zero
+// 0x010b359c: 0x10b359c: jal   0x10b2f50 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6092,13 +6092,13 @@ L_10b2f48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_compress_range_10b2908(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_compress_range_10b2f50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x010b2f5c: 0x10b2f5c: lw    ra, 36(sp)
-// 0x010b2f60: 0x10b2f60: lw    s1, 32(sp)
+// 0x010b35a4: 0x10b35a4: lw    ra, 36(sp)
+// 0x010b35a8: 0x10b35a8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6107,7 +6107,7 @@ L_10b2f48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b2f64: 0x10b2f64: lw    s0, 28(sp)
+// 0x010b35ac: 0x10b35ac: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6116,7 +6116,7 @@ L_10b2f48:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b2f68: 0x10b2f68: jr    ra addiu sp, sp, 40
+// 0x010b35b0: 0x10b35b0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6128,7 +6128,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_track_report_init_10b2f70()
+.method public static int32 editor_track_report_init_10b35b8()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6148,15 +6148,15 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b2f70: 0x10b2f70: lui   v1, 0xe0000
+// 0x010b35b8: 0x10b35b8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010b2f74: 0x10b2f74: addiu v0, v1, -19048
+// 0x010b35bc: 0x10b35bc: addiu v0, v1, -18584
 	ldloc.2
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc.0
-// 0x010b2f78: 0x10b2f78: sw    zero, 44(v0)
+// 0x010b35c0: 0x10b35c0: sw    zero, 44(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6165,16 +6165,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f7c: 0x10b2f7c: sw    zero, -19048(v1)
+// 0x010b35c4: 0x10b35c4: sw    zero, -18584(v1)
 	ldloc 1
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4762
+	ldc.i4 -4646
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f80: 0x10b2f80: sw    zero, 12(v0)
+// 0x010b35c8: 0x10b35c8: sw    zero, 12(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6183,7 +6183,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f84: 0x10b2f84: sw    zero, 40(v0)
+// 0x010b35cc: 0x10b35cc: sw    zero, 40(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6192,7 +6192,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f88: 0x10b2f88: sw    zero, 8(v0)
+// 0x010b35d0: 0x10b35d0: sw    zero, 8(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6201,7 +6201,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f8c: 0x10b2f8c: sw    zero, 20(v0)
+// 0x010b35d4: 0x10b35d4: sw    zero, 20(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6210,7 +6210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f90: 0x10b2f90: sw    zero, 4(v0)
+// 0x010b35d8: 0x10b35d8: sw    zero, 4(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6219,7 +6219,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f94: 0x10b2f94: sw    zero, 16(v0)
+// 0x010b35dc: 0x10b35dc: sw    zero, 16(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6228,7 +6228,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b2f98: 0x10b2f98: jr    ra sw    zero, 48(v0)
+// 0x010b35e0: 0x10b35e0: jr    ra sw    zero, 48(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -6244,7 +6244,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_track_report_get_current_position_10b2fc8(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_report_get_current_position_10b3610(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s0,int32 s2,int32 s3,int32 ra)
@@ -6291,12 +6291,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b2fc8: 0x10b2fc8: addiu sp, sp, -88
+// 0x010b3610: 0x10b3610: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010b2fcc: 0x10b2fcc: sw    s3, 80(sp)
+// 0x010b3614: 0x10b3614: sw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6305,7 +6305,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b2fd0: 0x10b2fd0: sw    s1, 72(sp)
+// 0x010b3618: 0x10b3618: sw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6314,22 +6314,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b2fd4: 0x10b2fd4: addiu s3, sp, 32
+// 0x010b361c: 0x10b361c: addiu s3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 11
-// 0x010b2fd8: 0x10b2fd8: addiu s1, zero, -1
+// 0x010b3620: 0x10b3620: addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b2fdc: 0x10b2fdc: sw    s1, 0(a2)
+// 0x010b3624: 0x10b3624: sw    s1, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b2fe0: 0x10b2fe0: sw    s2, 76(sp)
+// 0x010b3628: 0x10b3628: sw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6338,7 +6338,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b2fe4: 0x10b2fe4: sw    s0, 68(sp)
+// 0x010b362c: 0x10b362c: sw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6347,23 +6347,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b2fe8: 0x10b2fe8: sw    s1, 0(a1)
+// 0x010b3630: 0x10b3630: sw    s1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b2fec: 0x10b2fec: addu  s2, a1, zero
+// 0x010b3634: 0x10b3634: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010b2ff0: 0x10b2ff0: addu  s0, a2, zero
+// 0x010b3638: 0x10b3638: addu  s0, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010b2ff4: 0x10b2ff4: addu  a1, s3, zero
+// 0x010b363c: 0x10b363c: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010b2ff8: 0x10b2ff8: sw    a3, 56(sp)
+// 0x010b3640: 0x10b3640: sw    a3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6372,8 +6372,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b2ffc: 0x10b2ffc: sw    ra, 84(sp)
-// 0x010b3000: 0x10b3000: jal   0x1029da8 addu  a2, a3, zero
+// 0x010b3644: 0x10b3644: sw    ra, 84(sp)
+// 0x010b3648: 0x10b3648: jal   0x1029db8 addu  a2, a3, zero
 	ldloc 4
 	stloc.3
 	ldloc.0
@@ -6381,12 +6381,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b3008: 0x10b3008: lw    a3, 56(sp)
+// 0x010b3650: 0x10b3650: lw    a3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6395,33 +6395,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b300c: 0x10b300c: bne   v0, s1, 0x10b3038 addu  a0, s3, zero
+// 0x010b3654: 0x10b3654: bne   v0, s1, 0x10b3680 addu  a0, s3, zero
 	ldloc 6
 	ldloc 7
 	ldloc 11
 	stloc.1
-	bne.un L_10b3038
+	bne.un L_10b3680
 // --- basic block ---
-// 0x010b3014: 0x10b3014: lui   a1, 0x20000
+// 0x010b365c: 0x10b365c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b3018: 0x10b3018: lui   a3, 0x20000
+// 0x010b3660: 0x10b3660: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b301c: 0x10b301c: addiu a1, a1, 18900
+// 0x010b3664: 0x10b3664: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b3020: 0x10b3020: addiu a3, a3, 18948
+// 0x010b3668: 0x10b3668: addiu a3, a3, 19408
 	ldloc 4
-	ldc.i4 18948
+	ldc.i4 19408
 	add
 	stloc 4
-// 0x010b3024: 0x10b3024: addiu a0, zero, 1
+// 0x010b366c: 0x10b366c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010b3028: 0x10b3028: jal   0x100449c addiu a2, zero, 521
+// 0x010b3670: 0x10b3670: jal   0x100449c addiu a2, zero, 521
 	ldc.i4 521
 	stloc.3
 	ldloc.0
@@ -6434,34 +6434,34 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b3030: 0x10b3030: j	 0x10b30b4 addu  v0, zero, zero
+// 0x010b3678: 0x10b3678: j	 0x10b36fc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10b30b4
+	br L_10b36fc
 // --- basic block ---
-L_10b3038:
-// 0x010b3038: 0x10b3038: lw    a1, 0(a3)
+L_10b3680:
+// 0x010b3680: 0x10b3680: lw    a1, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b303c: 0x10b303c: sll   zero, zero, 0
-// 0x010b3040: 0x10b3040: xori  a1, a1, 2
+// 0x010b3684: 0x10b3684: sll   zero, zero, 0
+// 0x010b3688: 0x10b3688: xori  a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	xor
 	stloc.2
-// 0x010b3044: 0x10b3044: sltiu a1, a1, 1
+// 0x010b368c: 0x10b368c: sltiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x010b3048: 0x10b3048: addu  a2, s2, zero
+// 0x010b3690: 0x10b3690: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010b304c: 0x10b304c: jal   0x10aeb34 addu  a3, s0, zero
+// 0x010b3694: 0x10b3694: jal   0x10af17c addu  a3, s0, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -6469,51 +6469,51 @@ L_10b3038:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl130::editor_track_util_get_line_point_ids_10aeb34(int32,int32,int32,int32,int32)
+	call int32 Cibyl130::editor_track_util_get_line_point_ids_10af17c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b3054: 0x10b3054: lw    v1, 0(s2)
+// 0x010b369c: 0x10b369c: lw    v1, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010b3058: 0x10b3058: sll   zero, zero, 0
-// 0x010b305c: 0x10b305c: beq   v1, s1, 0x10b3074 sll   zero, zero, 0
+// 0x010b36a0: 0x10b36a0: sll   zero, zero, 0
+// 0x010b36a4: 0x10b36a4: beq   v1, s1, 0x10b36bc sll   zero, zero, 0
 	ldloc 8
 	ldloc 7
-	beq  L_10b3074
+	beq  L_10b36bc
 // --- basic block ---
-// 0x010b3064: 0x10b3064: lw    a0, 0(s0)
+// 0x010b36ac: 0x10b36ac: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b3068: 0x10b3068: sll   zero, zero, 0
-// 0x010b306c: 0x10b306c: bne   a0, s1, 0x10b30b4 addiu v0, zero, 1
+// 0x010b36b0: 0x10b36b0: sll   zero, zero, 0
+// 0x010b36b4: 0x10b36b4: bne   a0, s1, 0x10b36fc addiu v0, zero, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	stloc 6
-	bne.un L_10b30b4
+	bne.un L_10b36fc
 // --- basic block ---
-L_10b3074:
-// 0x010b3074: 0x10b3074: lw    v0, 0(s0)
+L_10b36bc:
+// 0x010b36bc: 0x10b36bc: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b3078: 0x10b3078: lui   a1, 0x20000
+// 0x010b36c0: 0x10b36c0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b307c: 0x10b307c: sw    v0, 20(sp)
+// 0x010b36c4: 0x10b36c4: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6522,10 +6522,10 @@ L_10b3074:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b3080: 0x10b3080: lui   a3, 0x20000
+// 0x010b36c8: 0x10b36c8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b3084: 0x10b3084: lw    v0, 36(sp)
+// 0x010b36cc: 0x10b36cc: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6534,23 +6534,23 @@ L_10b3074:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b3088: 0x10b3088: addiu a1, a1, 18900
+// 0x010b36d0: 0x10b36d0: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b308c: 0x10b308c: addiu a3, a3, 19036
+// 0x010b36d4: 0x10b36d4: addiu a3, a3, 19496
 	ldloc 4
-	ldc.i4 19036
+	ldc.i4 19496
 	add
 	stloc 4
-// 0x010b3090: 0x10b3090: addiu a0, zero, 3
+// 0x010b36d8: 0x10b36d8: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010b3094: 0x10b3094: addiu a2, zero, 532
+// 0x010b36dc: 0x10b36dc: addiu a2, zero, 532
 	ldc.i4 532
 	stloc.3
-// 0x010b3098: 0x10b3098: sw    v0, 24(sp)
+// 0x010b36e0: 0x10b36e0: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6559,7 +6559,7 @@ L_10b3074:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b309c: 0x10b309c: jal   0x100449c sw    v1, 16(sp)
+// 0x010b36e4: 0x10b36e4: jal   0x100449c sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6578,29 +6578,29 @@ L_10b3074:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b30a4: 0x10b30a4: addiu v0, zero, -1
+// 0x010b36ec: 0x10b36ec: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b30a8: 0x10b30a8: sw    v0, 0(s0)
+// 0x010b36f0: 0x10b36f0: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b30ac: 0x10b30ac: sw    v0, 0(s2)
+// 0x010b36f4: 0x10b36f4: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b30b0: 0x10b30b0: addu  v0, zero, zero
+// 0x010b36f8: 0x10b36f8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10b30b4:
-// 0x010b30b4: 0x10b30b4: lw    ra, 84(sp)
-// 0x010b30b8: 0x10b30b8: lw    s3, 80(sp)
+L_10b36fc:
+// 0x010b36fc: 0x10b36fc: lw    ra, 84(sp)
+// 0x010b3700: 0x10b3700: lw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6609,7 +6609,7 @@ L_10b30b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b30bc: 0x10b30bc: lw    s2, 76(sp)
+// 0x010b3704: 0x10b3704: lw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6618,7 +6618,7 @@ L_10b30b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b30c0: 0x10b30c0: lw    s1, 72(sp)
+// 0x010b3708: 0x10b3708: lw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6627,7 +6627,7 @@ L_10b30b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b30c4: 0x10b30c4: lw    s0, 68(sp)
+// 0x010b370c: 0x10b370c: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6636,7 +6636,7 @@ L_10b30b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b30c8: 0x10b30c8: jr    ra addiu sp, sp, 88
+// 0x010b3710: 0x10b3710: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -6648,7 +6648,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_track_report_conclude_export_10b30d0(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_report_conclude_export_10b3718(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6683,31 +6683,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b30d0: 0x10b30d0: addiu sp, sp, -24
+// 0x010b3718: 0x10b3718: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b30d4: 0x10b30d4: lui   v0, 0xe0000
+// 0x010b371c: 0x10b371c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b30d8: 0x10b30d8: sw    ra, 20(sp)
-// 0x010b30dc: 0x10b30dc: beq   a0, zero, 0x10b3130 sw    zero, -19060(v0)
+// 0x010b3720: 0x10b3720: sw    ra, 20(sp)
+// 0x010b3724: 0x10b3724: beq   a0, zero, 0x10b3778 sw    zero, -18596(v0)
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4 -4649
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10b3130
+	brfalse L_10b3778
 // --- basic block ---
-// 0x010b30e4: 0x10b30e4: lui   v0, 0x0
+// 0x010b372c: 0x10b372c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b30e8: 0x10b30e8: lw    a0, 19148(v0)
+// 0x010b3730: 0x10b3730: lw    a0, 19148(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6716,69 +6716,69 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b30ec: 0x10b30ec: jal   0x10b4804 sll   zero, zero, 0
+// 0x010b3734: 0x10b3734: jal   0x10b4e4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_confirm_commit_10b4804(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_confirm_commit_10b4e4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b30f4: 0x10b30f4: jal   0x10b0958 sll   zero, zero, 0
-	call int32 Cibyl132::editor_track_reset_update_toggles_10b0958()
+// 0x010b373c: 0x10b373c: jal   0x10b0fa0 sll   zero, zero, 0
+	call int32 Cibyl132::editor_track_reset_update_toggles_10b0fa0()
 	stloc 5
 // --- basic block ---
-// 0x010b30fc: 0x10b30fc: lui   v0, 0xe0000
+// 0x010b3744: 0x10b3744: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3100: 0x10b3100: lui   v1, 0xe0000
+// 0x010b3748: 0x10b3748: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b3104: 0x10b3104: lw    v1, -19056(v1)
+// 0x010b374c: 0x10b374c: lw    v1, -18592(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4764
+	ldc.i4 -4648
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b3108: 0x10b3108: lw    a0, -19052(v0)
+// 0x010b3750: 0x10b3750: lw    a0, -18588(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4763
+	ldc.i4 -4647
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b310c: 0x10b310c: sll   zero, zero, 0
-// 0x010b3110: 0x10b3110: slt   a0, a0, v1
+// 0x010b3754: 0x10b3754: sll   zero, zero, 0
+// 0x010b3758: 0x10b3758: slt   a0, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x010b3114: 0x10b3114: beq   a0, zero, 0x10b3120 sll   zero, zero, 0
+// 0x010b375c: 0x10b375c: beq   a0, zero, 0x10b3768 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b3120
+	brfalse L_10b3768
 // --- basic block ---
-// 0x010b311c: 0x10b311c: sw    v1, -19052(v0)
+// 0x010b3764: 0x10b3764: sw    v1, -18588(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4763
+	ldc.i4 -4647
 	add
 	ldloc 6
 	stelem.i4
-L_10b3120:
-// 0x010b3120: 0x10b3120: lui   v0, 0x0
+L_10b3768:
+// 0x010b3768: 0x10b3768: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b3124: 0x10b3124: lw    v1, 19152(v0)
+// 0x010b376c: 0x10b376c: lw    v1, 19152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6787,10 +6787,10 @@ L_10b3120:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b3128: 0x10b3128: lui   v0, 0x0
+// 0x010b3770: 0x10b3770: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b312c: 0x10b312c: sw    v1, 19156(v0)
+// 0x010b3774: 0x10b3774: sw    v1, 19156(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6799,10 +6799,10 @@ L_10b3120:
 	add
 	ldloc 6
 	stelem.i4
-L_10b3130:
-// 0x010b3130: 0x10b3130: lw    ra, 20(sp)
-// 0x010b3134: 0x10b3134: sll   zero, zero, 0
-// 0x010b3138: 0x10b3138: jr    ra addiu sp, sp, 24
+L_10b3778:
+// 0x010b3778: 0x10b3778: lw    ra, 20(sp)
+// 0x010b377c: 0x10b377c: sll   zero, zero, 0
+// 0x010b3780: 0x10b3780: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6814,7 +6814,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_track_report_begin_export_10b3140(int32,int32,int32,int32,int32)
+.method public static int32 editor_track_report_begin_export_10b3788(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s1,int32 s4,int32 s5,int32 s8,int32 s7,int32 s6,int32 ra)
@@ -6876,24 +6876,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3140: 0x10b3140: lui   v0, 0xe0000
+// 0x010b3788: 0x10b3788: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3144: 0x10b3144: lw    v0, -19060(v0)
+// 0x010b378c: 0x10b378c: lw    v0, -18596(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4 -4649
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3148: 0x10b3148: addiu sp, sp, -168
+// 0x010b3790: 0x10b3790: addiu sp, sp, -168
 	ldloc.0
 	ldc.i4 -168
 	add
 	stloc.0
-// 0x010b314c: 0x10b314c: sw    s3, 140(sp)
+// 0x010b3794: 0x10b3794: sw    s3, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6902,8 +6902,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b3150: 0x10b3150: sw    ra, 164(sp)
-// 0x010b3154: 0x10b3154: sw    s8, 160(sp)
+// 0x010b3798: 0x10b3798: sw    ra, 164(sp)
+// 0x010b379c: 0x10b379c: sw    s8, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6912,7 +6912,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b3158: 0x10b3158: sw    s7, 156(sp)
+// 0x010b37a0: 0x10b37a0: sw    s7, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6921,7 +6921,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b315c: 0x10b315c: sw    s6, 152(sp)
+// 0x010b37a4: 0x10b37a4: sw    s6, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6930,7 +6930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b3160: 0x10b3160: sw    s5, 148(sp)
+// 0x010b37a8: 0x10b37a8: sw    s5, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6939,7 +6939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b3164: 0x10b3164: sw    s4, 144(sp)
+// 0x010b37ac: 0x10b37ac: sw    s4, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6948,7 +6948,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b3168: 0x10b3168: sw    s2, 136(sp)
+// 0x010b37b0: 0x10b37b0: sw    s2, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6957,7 +6957,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b316c: 0x10b316c: sw    s1, 132(sp)
+// 0x010b37b4: 0x10b37b4: sw    s1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6966,7 +6966,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b3170: 0x10b3170: sw    s0, 128(sp)
+// 0x010b37b8: 0x10b37b8: sw    s0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6975,7 +6975,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b3174: 0x10b3174: sw    a0, 168(sp)
+// 0x010b37bc: 0x10b37bc: sw    a0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6984,27 +6984,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b3178: 0x10b3178: bne   v0, zero, 0x10b3324 addu  s3, zero, zero
+// 0x010b37c0: 0x10b37c0: bne   v0, zero, 0x10b396c addu  s3, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brtrue L_10b3324
+	brtrue L_10b396c
 // --- basic block ---
-// 0x010b3180: 0x10b3180: jal   0x10b4830 sll   zero, zero, 0
+// 0x010b37c8: 0x10b37c8: jal   0x10b4e78 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_begin_commit_10b4830(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_begin_commit_10b4e78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3188: 0x10b3188: lui   v1, 0x0
+// 0x010b37d0: 0x10b37d0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010b318c: 0x10b318c: jal   0x10b47b0 sw    v0, 19148(v1)
+// 0x010b37d4: 0x10b37d4: jal   0x10b4df8 sw    v0, 19148(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7018,33 +7018,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_items_pending_10b47b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_items_pending_10b4df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3194: 0x10b3194: bne   v0, zero, 0x10b31b0 lui   v0, 0x0
+// 0x010b37dc: 0x10b37dc: bne   v0, zero, 0x10b37f8 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10b31b0
+	brtrue L_10b37f8
 // --- basic block ---
-// 0x010b319c: 0x10b319c: addu  s6, zero, zero
+// 0x010b37e4: 0x10b37e4: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 16
-// 0x010b31a0: 0x10b31a0: addu  s1, zero, zero
+// 0x010b37e8: 0x10b37e8: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010b31a4: 0x10b31a4: addu  s2, zero, zero
+// 0x010b37ec: 0x10b37ec: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010b31a8: 0x10b31a8: j	 0x10b32ec addu  s0, zero, zero
+// 0x010b37f0: 0x10b37f0: j	 0x10b3934 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10b32ec
+	br L_10b3934
 // --- basic block ---
-L_10b31b0:
-// 0x010b31b0: 0x10b31b0: lw    s5, 19156(v0)
+L_10b37f8:
+// 0x010b37f8: 0x10b37f8: lw    s5, 19156(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7053,7 +7053,7 @@ L_10b31b0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b31b4: 0x10b31b4: jal   0x10b4858 addu  s6, zero, zero
+// 0x010b37fc: 0x10b37fc: jal   0x10b4ea0 addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 16
 	ldloc.0
@@ -7061,36 +7061,36 @@ L_10b31b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_count_10b4858(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_count_10b4ea0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b31bc: 0x10b31bc: addu  s4, zero, zero
+// 0x010b3804: 0x10b3804: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010b31c0: 0x10b31c0: addu  s1, zero, zero
+// 0x010b3808: 0x10b3808: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010b31c4: 0x10b31c4: addu  s2, zero, zero
+// 0x010b380c: 0x10b380c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010b31c8: 0x10b31c8: addu  s0, zero, zero
+// 0x010b3810: 0x10b3810: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b31cc: 0x10b31cc: addu  s3, zero, zero
+// 0x010b3814: 0x10b3814: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010b31d0: 0x10b31d0: addiu s8, zero, -1
+// 0x010b3818: 0x10b3818: addiu s8, zero, -1
 	ldc.i4.m1
 	stloc 14
-// 0x010b31d4: 0x10b31d4: j	 0x10b32e0 addu  s7, v0, zero
+// 0x010b381c: 0x10b381c: j	 0x10b3928 addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-	br L_10b32e0
+	br L_10b3928
 // --- basic block ---
-L_10b31dc:
-// 0x010b31dc: 0x10b31dc: jal   0x10b47d8 addu  a0, s3, zero
+L_10b3824:
+// 0x010b3824: 0x10b3824: jal   0x10b4e20 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7098,36 +7098,36 @@ L_10b31dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_item_committed_10b47d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_item_committed_10b4e20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b31e4: 0x10b31e4: bne   v0, zero, 0x10b32dc addiu v0, sp, 40
+// 0x010b382c: 0x10b382c: bne   v0, zero, 0x10b3924 addiu v0, sp, 40
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-	brtrue L_10b32dc
+	brtrue L_10b3924
 // --- basic block ---
-// 0x010b31ec: 0x10b31ec: addu  a0, s3, zero
+// 0x010b3834: 0x10b3834: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010b31f0: 0x10b31f0: addu  a1, zero, zero
+// 0x010b3838: 0x10b3838: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b31f4: 0x10b31f4: addiu a2, sp, 48
+// 0x010b383c: 0x10b383c: addiu a2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.3
-// 0x010b31f8: 0x10b31f8: addiu a3, sp, 44
+// 0x010b3840: 0x10b3840: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x010b31fc: 0x10b31fc: jal   0x10b48f8 sw    v0, 16(sp)
+// 0x010b3844: 0x10b3844: jal   0x10b4f40 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7141,12 +7141,12 @@ L_10b31dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3204: 0x10b3204: lw    v0, 40(sp)
+// 0x010b384c: 0x10b384c: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7155,17 +7155,17 @@ L_10b31dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3208: 0x10b3208: sll   zero, zero, 0
-// 0x010b320c: 0x10b320c: andi  v1, v0, 1
+// 0x010b3850: 0x10b3850: sll   zero, zero, 0
+// 0x010b3854: 0x10b3854: andi  v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 7
-// 0x010b3210: 0x10b3210: bne   v1, zero, 0x10b3268 sll   zero, zero, 0
+// 0x010b3858: 0x10b3858: bne   v1, zero, 0x10b38b0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10b3268
+	brtrue L_10b38b0
 // --- basic block ---
-// 0x010b3218: 0x10b3218: lw    v1, 48(sp)
+// 0x010b3860: 0x10b3860: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7174,17 +7174,17 @@ L_10b31dc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b321c: 0x10b321c: sll   zero, zero, 0
-// 0x010b3220: 0x10b3220: bltz  v1, 0x10b3240 andi  a0, v0, 8
+// 0x010b3864: 0x10b3864: sll   zero, zero, 0
+// 0x010b3868: 0x10b3868: bltz  v1, 0x10b3888 andi  a0, v0, 8
 	ldloc 7
 	ldloc 5
 	ldc.i4.8
 	and
 	stloc.1
 	ldc.i4.s 0
-	blt L_10b3240
+	blt L_10b3888
 // --- basic block ---
-// 0x010b3228: 0x10b3228: lw    a0, 44(sp)
+// 0x010b3870: 0x10b3870: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7193,48 +7193,48 @@ L_10b31dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b322c: 0x10b322c: sll   zero, zero, 0
-// 0x010b3230: 0x10b3230: addiu a0, a0, 1
+// 0x010b3874: 0x10b3874: sll   zero, zero, 0
+// 0x010b3878: 0x10b3878: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010b3234: 0x10b3234: subu  v1, a0, v1
+// 0x010b387c: 0x10b387c: subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-// 0x010b3238: 0x10b3238: addu  s2, s2, v1
+// 0x010b3880: 0x10b3880: addu  s2, s2, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 9
-// 0x010b323c: 0x10b323c: andi  a0, v0, 8
+// 0x010b3884: 0x10b3884: andi  a0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	and
 	stloc.1
-L_10b3240:
-// 0x010b3240: 0x10b3240: sltu  a0, zero, a0
+L_10b3888:
+// 0x010b3888: 0x10b3888: sltu  a0, zero, a0
 	ldc.i4.s 0
 	ldloc.1
 	clt.un
 	stloc.1
-// 0x010b3244: 0x10b3244: andi  v1, v0, 128
+// 0x010b388c: 0x10b388c: andi  v1, v0, 128
 	ldloc 5
 	ldc.i4 128
 	and
 	stloc 7
-// 0x010b3248: 0x10b3248: beq   v1, s4, 0x10b3264 addu  s2, s2, a0
+// 0x010b3890: 0x10b3890: beq   v1, s4, 0x10b38ac addu  s2, s2, a0
 	ldloc 7
 	ldloc 12
 	ldloc 9
 	ldloc.1
 	add
 	stloc 9
-	beq  L_10b3264
+	beq  L_10b38ac
 // --- basic block ---
-// 0x010b3250: 0x10b3250: lw    a0, 168(sp)
+// 0x010b3898: 0x10b3898: lw    a0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7243,55 +7243,55 @@ L_10b3240:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3254: 0x10b3254: sll   zero, zero, 0
-// 0x010b3258: 0x10b3258: beq   a0, zero, 0x10b3268 addu  s4, v1, zero
+// 0x010b389c: 0x10b389c: sll   zero, zero, 0
+// 0x010b38a0: 0x10b38a0: beq   a0, zero, 0x10b38b0 addu  s4, v1, zero
 	ldloc.1
 	ldloc 7
 	stloc 12
-	brfalse L_10b3268
+	brfalse L_10b38b0
 // --- basic block ---
-// 0x010b3260: 0x10b3260: addiu s1, s1, 1
+// 0x010b38a8: 0x10b38a8: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_10b3264:
-// 0x010b3264: 0x10b3264: addu  s4, v1, zero
+L_10b38ac:
+// 0x010b38ac: 0x10b38ac: addu  s4, v1, zero
 	ldloc 7
 	stloc 12
-L_10b3268:
-// 0x010b3268: 0x10b3268: andi  v0, v0, 3
+L_10b38b0:
+// 0x010b38b0: 0x10b38b0: andi  v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	and
 	stloc 5
-// 0x010b326c: 0x10b326c: bne   v0, zero, 0x10b32dc addiu v0, sp, 24
+// 0x010b38b4: 0x10b38b4: bne   v0, zero, 0x10b3924 addiu v0, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-	brtrue L_10b32dc
+	brtrue L_10b3924
 // --- basic block ---
-// 0x010b3274: 0x10b3274: addu  a0, s3, zero
+// 0x010b38bc: 0x10b38bc: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010b3278: 0x10b3278: addiu a1, sp, 36
+// 0x010b38c0: 0x10b38c0: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010b327c: 0x10b327c: addiu a2, sp, 32
+// 0x010b38c4: 0x10b38c4: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x010b3280: 0x10b3280: addiu a3, sp, 28
+// 0x010b38c8: 0x10b38c8: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010b3284: 0x10b3284: jal   0x10b4880 sw    v0, 16(sp)
+// 0x010b38cc: 0x10b38cc: jal   0x10b4ec8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7305,12 +7305,12 @@ L_10b3268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_points_10b4880(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_points_10b4ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b328c: 0x10b328c: lw    v0, 28(sp)
+// 0x010b38d4: 0x10b38d4: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7319,17 +7319,17 @@ L_10b3268:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3290: 0x10b3290: sll   zero, zero, 0
-// 0x010b3294: 0x10b3294: blez  v0, 0x10b32a0 sll   zero, zero, 0
+// 0x010b38d8: 0x10b38d8: sll   zero, zero, 0
+// 0x010b38dc: 0x10b38dc: blez  v0, 0x10b38e8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_10b32a0
+	ble L_10b38e8
 // --- basic block ---
-// 0x010b329c: 0x10b329c: addiu s6, zero, 1
+// 0x010b38e4: 0x10b38e4: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 16
-L_10b32a0:
-// 0x010b32a0: 0x10b32a0: lw    v0, 40(sp)
+L_10b38e8:
+// 0x010b38e8: 0x10b38e8: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7338,21 +7338,21 @@ L_10b32a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b32a4: 0x10b32a4: sll   zero, zero, 0
-// 0x010b32a8: 0x10b32a8: andi  v1, v0, 72
+// 0x010b38ec: 0x10b38ec: sll   zero, zero, 0
+// 0x010b38f0: 0x10b38f0: andi  v1, v0, 72
 	ldloc 5
 	ldc.i4.s 72
 	and
 	stloc 7
-// 0x010b32ac: 0x10b32ac: bne   v1, zero, 0x10b32c8 addiu s0, s0, 1
+// 0x010b38f4: 0x10b38f4: bne   v1, zero, 0x10b3910 addiu s0, s0, 1
 	ldloc 7
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_10b32c8
+	brtrue L_10b3910
 // --- basic block ---
-// 0x010b32b4: 0x10b32b4: lw    v1, 36(sp)
+// 0x010b38fc: 0x10b38fc: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7361,33 +7361,33 @@ L_10b32a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b32b8: 0x10b32b8: sll   zero, zero, 0
-// 0x010b32bc: 0x10b32bc: xor   s5, v1, s5
+// 0x010b3900: 0x10b3900: sll   zero, zero, 0
+// 0x010b3904: 0x10b3904: xor   s5, v1, s5
 	ldloc 7
 	ldloc 13
 	xor
 	stloc 13
-// 0x010b32c0: 0x10b32c0: sltu  s5, zero, s5
+// 0x010b3908: 0x10b3908: sltu  s5, zero, s5
 	ldc.i4.s 0
 	ldloc 13
 	clt.un
 	stloc 13
-// 0x010b32c4: 0x10b32c4: addu  s0, s0, s5
+// 0x010b390c: 0x10b390c: addu  s0, s0, s5
 	ldloc 8
 	ldloc 13
 	add
 	stloc 8
-L_10b32c8:
-// 0x010b32c8: 0x10b32c8: andi  v0, v0, 64
+L_10b3910:
+// 0x010b3910: 0x10b3910: andi  v0, v0, 64
 	ldloc 5
 	ldc.i4.s 64
 	and
 	stloc 5
-// 0x010b32cc: 0x10b32cc: beq   v0, zero, 0x10b32d8 sll   zero, zero, 0
+// 0x010b3914: 0x10b3914: beq   v0, zero, 0x10b3920 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b32d8
+	brfalse L_10b3920
 // --- basic block ---
-// 0x010b32d4: 0x10b32d4: sw    s8, 32(sp)
+// 0x010b391c: 0x10b391c: sw    s8, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7396,8 +7396,8 @@ L_10b32c8:
 	add
 	ldloc 14
 	stelem.i4
-L_10b32d8:
-// 0x010b32d8: 0x10b32d8: lw    s5, 32(sp)
+L_10b3920:
+// 0x010b3920: 0x10b3920: lw    s5, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7406,33 +7406,33 @@ L_10b32d8:
 	add
 	ldelem.i4
 	stloc 13
-L_10b32dc:
-// 0x010b32dc: 0x10b32dc: addiu s3, s3, 1
+L_10b3924:
+// 0x010b3924: 0x10b3924: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10b32e0:
-// 0x010b32e0: 0x10b32e0: slt   v0, s3, s7
+L_10b3928:
+// 0x010b3928: 0x10b3928: slt   v0, s3, s7
 	ldloc 10
 	ldloc 15
 	clt
 	stloc 5
-// 0x010b32e4: 0x10b32e4: bne   v0, zero, 0x10b31dc sll   zero, zero, 0
+// 0x010b392c: 0x10b392c: bne   v0, zero, 0x10b3824 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b31dc
+	brtrue L_10b3824
 // --- basic block ---
-L_10b32ec:
-// 0x010b32ec: 0x10b32ec: jal   0x10b08d4 sll   zero, zero, 0
-	call int32 Cibyl132::export_track_is_new_10b08d4()
+L_10b3934:
+// 0x010b3934: 0x10b3934: jal   0x10b0f1c sll   zero, zero, 0
+	call int32 Cibyl132::export_track_is_new_10b0f1c()
 	stloc 5
 // --- basic block ---
-// 0x010b32f4: 0x10b32f4: sltu  v0, zero, v0
+// 0x010b393c: 0x10b393c: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010b32f8: 0x10b32f8: jal   0x10b0b00 addu  s2, s2, v0
+// 0x010b3940: 0x10b3940: jal   0x10b1148 addu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	add
@@ -7442,12 +7442,12 @@ L_10b32ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_deflate_10b0b00(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_deflate_10b1148(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3300: 0x10b3300: lw    v1, 168(sp)
+// 0x010b3948: 0x10b3948: lw    v1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7456,47 +7456,47 @@ L_10b32ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3304: 0x10b3304: addu  s2, v0, s2
+// 0x010b394c: 0x10b394c: addu  s2, v0, s2
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x010b3308: 0x10b3308: bne   v1, zero, 0x10b331c addiu s2, s2, 1
+// 0x010b3950: 0x10b3950: bne   v1, zero, 0x10b3964 addiu s2, s2, 1
 	ldloc 7
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brtrue L_10b331c
+	brtrue L_10b3964
 // --- basic block ---
-// 0x010b3310: 0x10b3310: jal   0x10b0910 sll   zero, zero, 0
-	call int32 Cibyl132::editor_track_get_num_update_toggles_10b0910()
+// 0x010b3958: 0x10b3958: jal   0x10b0f58 sll   zero, zero, 0
+	call int32 Cibyl132::editor_track_get_num_update_toggles_10b0f58()
 	stloc 5
 // --- basic block ---
-// 0x010b3318: 0x10b3318: addu  s1, v0, zero
+// 0x010b3960: 0x10b3960: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-L_10b331c:
-// 0x010b331c: 0x10b331c: addu  s3, s2, s0
+L_10b3964:
+// 0x010b3964: 0x10b3964: addu  s3, s2, s0
 	ldloc 9
 	ldloc 8
 	add
 	stloc 10
-// 0x010b3320: 0x10b3320: addu  s3, s3, s1
+// 0x010b3968: 0x10b3968: addu  s3, s3, s1
 	ldloc 10
 	ldloc 11
 	add
 	stloc 10
-L_10b3324:
-// 0x010b3324: 0x10b3324: lui   v0, 0xe0000
+L_10b396c:
+// 0x010b396c: 0x10b396c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3328: 0x10b3328: addiu v0, v0, -19048
+// 0x010b3970: 0x10b3970: addiu v0, v0, -18584
 	ldloc 5
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc 5
-// 0x010b332c: 0x10b332c: lw    v1, 12(v0)
+// 0x010b3974: 0x10b3974: lw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7505,17 +7505,17 @@ L_10b3324:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3330: 0x10b3330: sll   zero, zero, 0
-// 0x010b3334: 0x10b3334: slt   v1, v1, s2
+// 0x010b3978: 0x10b3978: sll   zero, zero, 0
+// 0x010b397c: 0x10b397c: slt   v1, v1, s2
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 7
-// 0x010b3338: 0x10b3338: beq   v1, zero, 0x10b3394 sll   zero, zero, 0
+// 0x010b3980: 0x10b3980: beq   v1, zero, 0x10b39dc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b3394
+	brfalse L_10b39dc
 // --- basic block ---
-// 0x010b3340: 0x10b3340: lw    a0, 20(v0)
+// 0x010b3988: 0x10b3988: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7524,12 +7524,12 @@ L_10b3324:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3344: 0x10b3344: sll   zero, zero, 0
-// 0x010b3348: 0x10b3348: beq   a0, zero, 0x10b3358 sll   zero, zero, 0
+// 0x010b398c: 0x10b398c: sll   zero, zero, 0
+// 0x010b3990: 0x10b3990: beq   a0, zero, 0x10b39a0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b3358
+	brfalse L_10b39a0
 // --- basic block ---
-// 0x010b3350: 0x10b3350: jal   0x1000930 sll   zero, zero, 0
+// 0x010b3998: 0x10b3998: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7540,8 +7540,8 @@ L_10b3324:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b3358:
-// 0x010b3358: 0x10b3358: jal   0x1000910 sll   a0, s2, 4
+L_10b39a0:
+// 0x010b39a0: 0x10b39a0: jal   0x1000910 sll   a0, s2, 4
 	ldloc 9
 	ldc.i4.4
 	shl
@@ -7556,44 +7556,44 @@ L_10b3358:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3360: 0x10b3360: lui   v1, 0xe0000
+// 0x010b39a8: 0x10b39a8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b3364: 0x10b3364: bne   v0, zero, 0x10b338c sw    v0, -19028(v1)
+// 0x010b39ac: 0x10b39ac: bne   v0, zero, 0x10b39d4 sw    v0, -18564(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4757
+	ldc.i4 -4641
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10b338c
+	brtrue L_10b39d4
 // --- basic block ---
-// 0x010b336c: 0x10b336c: lui   a1, 0x20000
+// 0x010b39b4: 0x10b39b4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b3370: 0x10b3370: lui   a3, 0x20000
+// 0x010b39b8: 0x10b39b8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b3374: 0x10b3374: addiu a1, a1, 18900
+// 0x010b39bc: 0x10b39bc: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b3378: 0x10b3378: addiu a3, a3, 19164
+// 0x010b39c0: 0x10b39c0: addiu a3, a3, 19624
 	ldloc 4
-	ldc.i4 19164
+	ldc.i4 19624
 	add
 	stloc 4
-// 0x010b337c: 0x10b337c: addiu a0, zero, 5
+// 0x010b39c4: 0x10b39c4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3380: 0x10b3380: addiu a2, zero, 435
+// 0x010b39c8: 0x10b39c8: addiu a2, zero, 435
 	ldc.i4 435
 	stloc.3
-// 0x010b3384: 0x10b3384: jal   0x100449c sw    s2, 16(sp)
+// 0x010b39cc: 0x10b39cc: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7612,47 +7612,47 @@ L_10b3358:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b338c:
-// 0x010b338c: 0x10b338c: lui   v0, 0xe0000
+L_10b39d4:
+// 0x010b39d4: 0x10b39d4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3390: 0x10b3390: sw    s2, -19036(v0)
+// 0x010b39d8: 0x10b39d8: sw    s2, -18572(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4759
+	ldc.i4 -4643
 	add
 	ldloc 9
 	stelem.i4
-L_10b3394:
-// 0x010b3394: 0x10b3394: lui   v0, 0xe0000
+L_10b39dc:
+// 0x010b39dc: 0x10b39dc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3398: 0x10b3398: lw    v1, -19048(v0)
+// 0x010b39e0: 0x10b39e0: lw    v1, -18584(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4762
+	ldc.i4 -4646
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b339c: 0x10b339c: sll   zero, zero, 0
-// 0x010b33a0: 0x10b33a0: slt   v1, v1, s0
+// 0x010b39e4: 0x10b39e4: sll   zero, zero, 0
+// 0x010b39e8: 0x10b39e8: slt   v1, v1, s0
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 7
-// 0x010b33a4: 0x10b33a4: beq   v1, zero, 0x10b3400 addiu v0, v0, -19048
+// 0x010b39ec: 0x10b39ec: beq   v1, zero, 0x10b3a48 addiu v0, v0, -18584
 	ldloc 7
 	ldloc 5
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc 5
-	brfalse L_10b3400
+	brfalse L_10b3a48
 // --- basic block ---
-// 0x010b33ac: 0x10b33ac: lw    a0, 8(v0)
+// 0x010b39f4: 0x10b39f4: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7661,12 +7661,12 @@ L_10b3394:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b33b0: 0x10b33b0: sll   zero, zero, 0
-// 0x010b33b4: 0x10b33b4: beq   a0, zero, 0x10b33c4 sll   zero, zero, 0
+// 0x010b39f8: 0x10b39f8: sll   zero, zero, 0
+// 0x010b39fc: 0x10b39fc: beq   a0, zero, 0x10b3a0c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b33c4
+	brfalse L_10b3a0c
 // --- basic block ---
-// 0x010b33bc: 0x10b33bc: jal   0x1000930 sll   zero, zero, 0
+// 0x010b3a04: 0x10b3a04: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7677,8 +7677,8 @@ L_10b3394:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b33c4:
-// 0x010b33c4: 0x10b33c4: jal   0x1000910 sll   a0, s0, 3
+L_10b3a0c:
+// 0x010b3a0c: 0x10b3a0c: jal   0x1000910 sll   a0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	shl
@@ -7693,44 +7693,44 @@ L_10b33c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b33cc: 0x10b33cc: lui   v1, 0xe0000
+// 0x010b3a14: 0x10b3a14: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b33d0: 0x10b33d0: bne   v0, zero, 0x10b33f8 sw    v0, -19040(v1)
+// 0x010b3a18: 0x10b3a18: bne   v0, zero, 0x10b3a40 sw    v0, -18576(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4760
+	ldc.i4 -4644
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10b33f8
+	brtrue L_10b3a40
 // --- basic block ---
-// 0x010b33d8: 0x10b33d8: lui   a1, 0x20000
+// 0x010b3a20: 0x10b3a20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b33dc: 0x10b33dc: lui   a3, 0x20000
+// 0x010b3a24: 0x10b3a24: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b33e0: 0x10b33e0: addiu a1, a1, 18900
+// 0x010b3a28: 0x10b3a28: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b33e4: 0x10b33e4: addiu a3, a3, 19208
+// 0x010b3a2c: 0x10b3a2c: addiu a3, a3, 19668
 	ldloc 4
-	ldc.i4 19208
+	ldc.i4 19668
 	add
 	stloc 4
-// 0x010b33e8: 0x10b33e8: addiu a0, zero, 5
+// 0x010b3a30: 0x10b3a30: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b33ec: 0x10b33ec: addiu a2, zero, 443
+// 0x010b3a34: 0x10b3a34: addiu a2, zero, 443
 	ldc.i4 443
 	stloc.3
-// 0x010b33f0: 0x10b33f0: jal   0x100449c sw    s0, 16(sp)
+// 0x010b3a38: 0x10b3a38: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7749,32 +7749,32 @@ L_10b33c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b33f8:
-// 0x010b33f8: 0x10b33f8: lui   v0, 0xe0000
+L_10b3a40:
+// 0x010b3a40: 0x10b3a40: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b33fc: 0x10b33fc: sw    s0, -19048(v0)
+// 0x010b3a44: 0x10b3a44: sw    s0, -18584(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4762
+	ldc.i4 -4646
 	add
 	ldloc 8
 	stelem.i4
-L_10b3400:
-// 0x010b3400: 0x10b3400: beq   s6, zero, 0x10b3478 lui   v0, 0xe0000
+L_10b3a48:
+// 0x010b3a48: 0x10b3a48: beq   s6, zero, 0x10b3ac0 lui   v0, 0xe0000
 	ldloc 16
 	ldc.i4 917504
 	stloc 5
-	brfalse L_10b3478
+	brfalse L_10b3ac0
 // --- basic block ---
-// 0x010b3408: 0x10b3408: addiu v0, v0, -19048
+// 0x010b3a50: 0x10b3a50: addiu v0, v0, -18584
 	ldloc 5
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc 5
-// 0x010b340c: 0x10b340c: lw    v1, 40(v0)
+// 0x010b3a54: 0x10b3a54: lw    v1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7783,17 +7783,17 @@ L_10b3400:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3410: 0x10b3410: sll   zero, zero, 0
-// 0x010b3414: 0x10b3414: slt   v1, v1, s0
+// 0x010b3a58: 0x10b3a58: sll   zero, zero, 0
+// 0x010b3a5c: 0x10b3a5c: slt   v1, v1, s0
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 7
-// 0x010b3418: 0x10b3418: beq   v1, zero, 0x10b3474 sll   zero, zero, 0
+// 0x010b3a60: 0x10b3a60: beq   v1, zero, 0x10b3abc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b3474
+	brfalse L_10b3abc
 // --- basic block ---
-// 0x010b3420: 0x10b3420: lw    a0, 48(v0)
+// 0x010b3a68: 0x10b3a68: lw    a0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7802,12 +7802,12 @@ L_10b3400:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3424: 0x10b3424: sll   zero, zero, 0
-// 0x010b3428: 0x10b3428: beq   a0, zero, 0x10b3438 sll   zero, zero, 0
+// 0x010b3a6c: 0x10b3a6c: sll   zero, zero, 0
+// 0x010b3a70: 0x10b3a70: beq   a0, zero, 0x10b3a80 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b3438
+	brfalse L_10b3a80
 // --- basic block ---
-// 0x010b3430: 0x10b3430: jal   0x1000930 sll   zero, zero, 0
+// 0x010b3a78: 0x10b3a78: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7818,8 +7818,8 @@ L_10b3400:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b3438:
-// 0x010b3438: 0x10b3438: jal   0x1000910 sll   a0, s0, 3
+L_10b3a80:
+// 0x010b3a80: 0x10b3a80: jal   0x1000910 sll   a0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	shl
@@ -7834,44 +7834,44 @@ L_10b3438:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3440: 0x10b3440: lui   v1, 0xe0000
+// 0x010b3a88: 0x10b3a88: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b3444: 0x10b3444: bne   v0, zero, 0x10b346c sw    v0, -19000(v1)
+// 0x010b3a8c: 0x10b3a8c: bne   v0, zero, 0x10b3ab4 sw    v0, -18536(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4750
+	ldc.i4 -4634
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10b346c
+	brtrue L_10b3ab4
 // --- basic block ---
-// 0x010b344c: 0x10b344c: lui   a1, 0x20000
+// 0x010b3a94: 0x10b3a94: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b3450: 0x10b3450: lui   a3, 0x20000
+// 0x010b3a98: 0x10b3a98: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b3454: 0x10b3454: addiu a1, a1, 18900
+// 0x010b3a9c: 0x10b3a9c: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b3458: 0x10b3458: addiu a3, a3, 19252
+// 0x010b3aa0: 0x10b3aa0: addiu a3, a3, 19712
 	ldloc 4
-	ldc.i4 19252
+	ldc.i4 19712
 	add
 	stloc 4
-// 0x010b345c: 0x10b345c: addiu a0, zero, 5
+// 0x010b3aa4: 0x10b3aa4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3460: 0x10b3460: addiu a2, zero, 451
+// 0x010b3aa8: 0x10b3aa8: addiu a2, zero, 451
 	ldc.i4 451
 	stloc.3
-// 0x010b3464: 0x10b3464: jal   0x100449c sw    s0, 16(sp)
+// 0x010b3aac: 0x10b3aac: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7890,30 +7890,30 @@ L_10b3438:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b346c:
-// 0x010b346c: 0x10b346c: lui   v0, 0xe0000
+L_10b3ab4:
+// 0x010b3ab4: 0x10b3ab4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3470: 0x10b3470: sw    s0, -19008(v0)
+// 0x010b3ab8: 0x10b3ab8: sw    s0, -18544(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4752
+	ldc.i4 -4636
 	add
 	ldloc 8
 	stelem.i4
-L_10b3474:
-// 0x010b3474: 0x10b3474: lui   v0, 0xe0000
+L_10b3abc:
+// 0x010b3abc: 0x10b3abc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_10b3478:
-// 0x010b3478: 0x10b3478: addiu v0, v0, -19048
+L_10b3ac0:
+// 0x010b3ac0: 0x10b3ac0: addiu v0, v0, -18584
 	ldloc 5
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc 5
-// 0x010b347c: 0x10b347c: lw    v1, 24(v0)
+// 0x010b3ac4: 0x10b3ac4: lw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7922,17 +7922,17 @@ L_10b3478:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3480: 0x10b3480: sll   zero, zero, 0
-// 0x010b3484: 0x10b3484: slt   v1, v1, s1
+// 0x010b3ac8: 0x10b3ac8: sll   zero, zero, 0
+// 0x010b3acc: 0x10b3acc: slt   v1, v1, s1
 	ldloc 7
 	ldloc 11
 	clt
 	stloc 7
-// 0x010b3488: 0x10b3488: beq   v1, zero, 0x10b34e4 sll   zero, zero, 0
+// 0x010b3ad0: 0x10b3ad0: beq   v1, zero, 0x10b3b2c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b34e4
+	brfalse L_10b3b2c
 // --- basic block ---
-// 0x010b3490: 0x10b3490: lw    a0, 32(v0)
+// 0x010b3ad8: 0x10b3ad8: lw    a0, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7941,12 +7941,12 @@ L_10b3478:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3494: 0x10b3494: sll   zero, zero, 0
-// 0x010b3498: 0x10b3498: beq   a0, zero, 0x10b34a8 sll   zero, zero, 0
+// 0x010b3adc: 0x10b3adc: sll   zero, zero, 0
+// 0x010b3ae0: 0x10b3ae0: beq   a0, zero, 0x10b3af0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b34a8
+	brfalse L_10b3af0
 // --- basic block ---
-// 0x010b34a0: 0x10b34a0: jal   0x1000930 sll   zero, zero, 0
+// 0x010b3ae8: 0x10b3ae8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7957,8 +7957,8 @@ L_10b3478:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b34a8:
-// 0x010b34a8: 0x10b34a8: jal   0x1000910 sll   a0, s1, 2
+L_10b3af0:
+// 0x010b3af0: 0x10b3af0: jal   0x1000910 sll   a0, s1, 2
 	ldloc 11
 	ldc.i4.2
 	shl
@@ -7973,44 +7973,44 @@ L_10b34a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b34b0: 0x10b34b0: lui   v1, 0xe0000
+// 0x010b3af8: 0x10b3af8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b34b4: 0x10b34b4: bne   v0, zero, 0x10b34dc sw    v0, -19016(v1)
+// 0x010b3afc: 0x10b3afc: bne   v0, zero, 0x10b3b24 sw    v0, -18552(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4754
+	ldc.i4 -4638
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10b34dc
+	brtrue L_10b3b24
 // --- basic block ---
-// 0x010b34bc: 0x10b34bc: lui   a1, 0x20000
+// 0x010b3b04: 0x10b3b04: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b34c0: 0x10b34c0: lui   a3, 0x20000
+// 0x010b3b08: 0x10b3b08: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b34c4: 0x10b34c4: addiu a1, a1, 18900
+// 0x010b3b0c: 0x10b3b0c: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b34c8: 0x10b34c8: addiu a3, a3, 19296
+// 0x010b3b10: 0x10b3b10: addiu a3, a3, 19756
 	ldloc 4
-	ldc.i4 19296
+	ldc.i4 19756
 	add
 	stloc 4
-// 0x010b34cc: 0x10b34cc: addiu a0, zero, 5
+// 0x010b3b14: 0x10b3b14: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b34d0: 0x10b34d0: addiu a2, zero, 459
+// 0x010b3b18: 0x10b3b18: addiu a2, zero, 459
 	ldc.i4 459
 	stloc.3
-// 0x010b34d4: 0x10b34d4: jal   0x100449c sw    s1, 16(sp)
+// 0x010b3b1c: 0x10b3b1c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8029,41 +8029,41 @@ L_10b34a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b34dc:
-// 0x010b34dc: 0x10b34dc: lui   v0, 0xe0000
+L_10b3b24:
+// 0x010b3b24: 0x10b3b24: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b34e0: 0x10b34e0: sw    s1, -19024(v0)
+// 0x010b3b28: 0x10b3b28: sw    s1, -18560(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4756
+	ldc.i4 -4640
 	add
 	ldloc 11
 	stelem.i4
-L_10b34e4:
-// 0x010b34e4: 0x10b34e4: lui   v0, 0xe0000
+L_10b3b2c:
+// 0x010b3b2c: 0x10b3b2c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b34e8: 0x10b34e8: beq   s3, zero, 0x10b3be0 addiu s0, v0, -19048
+// 0x010b3b30: 0x10b3b30: beq   s3, zero, 0x10b4228 addiu s0, v0, -18584
 	ldloc 10
 	ldloc 5
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc 8
-	brfalse L_10b3be0
+	brfalse L_10b4228
 // --- basic block ---
-// 0x010b34f0: 0x10b34f0: lw    v0, -19048(v0)
+// 0x010b3b38: 0x10b3b38: lw    v0, -18584(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4762
+	ldc.i4 -4646
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b34f4: 0x10b34f4: lw    s1, 12(s0)
+// 0x010b3b3c: 0x10b3b3c: lw    s1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8072,7 +8072,7 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b34f8: 0x10b34f8: sw    v0, 88(sp)
+// 0x010b3b40: 0x10b3b40: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8081,10 +8081,10 @@ L_10b34e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b34fc: 0x10b34fc: lui   v0, 0x0
+// 0x010b3b44: 0x10b3b44: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b3500: 0x10b3500: lw    v1, 19156(v0)
+// 0x010b3b48: 0x10b3b48: lw    v1, 19156(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8093,19 +8093,19 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3504: 0x10b3504: lui   v0, 0xe0000
+// 0x010b3b4c: 0x10b3b4c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3508: 0x10b3508: lw    v0, -19052(v0)
+// 0x010b3b50: 0x10b3b50: lw    v0, -18588(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4763
+	ldc.i4 -4647
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b350c: 0x10b350c: lw    a0, 88(sp)
+// 0x010b3b54: 0x10b3b54: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8114,7 +8114,7 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3510: 0x10b3510: lw    s7, 24(s0)
+// 0x010b3b58: 0x10b3b58: lw    s7, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8123,13 +8123,13 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b3514: 0x10b3514: lui   s2, 0x0
+// 0x010b3b5c: 0x10b3b5c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010b3518: 0x10b3518: lui   s3, 0xe0000
+// 0x010b3b60: 0x10b3b60: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010b351c: 0x10b351c: sw    v1, 19152(s2)
+// 0x010b3b64: 0x10b3b64: sw    v1, 19152(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8138,16 +8138,16 @@ L_10b34e4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b3520: 0x10b3520: sw    v0, -19056(s3)
+// 0x010b3b68: 0x10b3b68: sw    v0, -18592(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4764
+	ldc.i4 -4648
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b3524: 0x10b3524: sw    a0, 4(s0)
+// 0x010b3b6c: 0x10b3b6c: sw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8156,7 +8156,7 @@ L_10b34e4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b3528: 0x10b3528: lw    a1, 8(s0)
+// 0x010b3b70: 0x10b3b70: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8165,7 +8165,7 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b352c: 0x10b352c: lw    v0, 20(s0)
+// 0x010b3b74: 0x10b3b74: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8174,7 +8174,7 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3530: 0x10b3530: lw    v1, 32(s0)
+// 0x010b3b78: 0x10b3b78: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8183,7 +8183,7 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3534: 0x10b3534: lw    a0, 48(s0)
+// 0x010b3b7c: 0x10b3b7c: lw    a0, 48(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8192,7 +8192,7 @@ L_10b34e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3538: 0x10b3538: sw    s1, 16(s0)
+// 0x010b3b80: 0x10b3b80: sw    s1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8201,7 +8201,7 @@ L_10b34e4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b353c: 0x10b353c: sw    s7, 28(s0)
+// 0x010b3b84: 0x10b3b84: sw    s7, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8210,7 +8210,7 @@ L_10b34e4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b3540: 0x10b3540: sw    a1, 108(sp)
+// 0x010b3b88: 0x10b3b88: sw    a1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8219,7 +8219,7 @@ L_10b34e4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b3544: 0x10b3544: sw    v0, 96(sp)
+// 0x010b3b8c: 0x10b3b8c: sw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8228,7 +8228,7 @@ L_10b34e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b3548: 0x10b3548: sw    v1, 104(sp)
+// 0x010b3b90: 0x10b3b90: sw    v1, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8237,7 +8237,7 @@ L_10b34e4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b354c: 0x10b354c: jal   0x10b47b0 sw    a0, 100(sp)
+// 0x010b3b94: 0x10b3b94: jal   0x10b4df8 sw    a0, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8251,28 +8251,28 @@ L_10b34e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_items_pending_10b47b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_items_pending_10b4df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3554: 0x10b3554: bne   v0, zero, 0x10b356c sll   zero, zero, 0
+// 0x010b3b9c: 0x10b3b9c: bne   v0, zero, 0x10b3bb4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b356c
+	brtrue L_10b3bb4
 // --- basic block ---
-// 0x010b355c: 0x10b355c: addu  s3, zero, zero
+// 0x010b3ba4: 0x10b3ba4: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010b3560: 0x10b3560: addu  s0, zero, zero
+// 0x010b3ba8: 0x10b3ba8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b3564: 0x10b3564: j	 0x10b391c addu  s2, zero, zero
+// 0x010b3bac: 0x10b3bac: j	 0x10b3f64 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10b391c
+	br L_10b3f64
 // --- basic block ---
-L_10b356c:
-// 0x010b356c: 0x10b356c: jal   0x10b4858 lui   s8, 0x20000
+L_10b3bb4:
+// 0x010b3bb4: 0x10b3bb4: jal   0x10b4ea0 lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 14
 	ldloc.0
@@ -8280,12 +8280,12 @@ L_10b356c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_count_10b4858(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_count_10b4ea0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3574: 0x10b3574: sw    v0, 120(sp)
+// 0x010b3bbc: 0x10b3bbc: sw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8294,12 +8294,12 @@ L_10b356c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b3578: 0x10b3578: addiu s8, s8, 18900
+// 0x010b3bc0: 0x10b3bc0: addiu s8, s8, 19360
 	ldloc 14
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc 14
-// 0x010b357c: 0x10b357c: sw    zero, 92(sp)
+// 0x010b3bc4: 0x10b3bc4: sw    zero, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8308,22 +8308,22 @@ L_10b356c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b3580: 0x10b3580: addu  s3, zero, zero
+// 0x010b3bc8: 0x10b3bc8: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010b3584: 0x10b3584: addu  s0, zero, zero
+// 0x010b3bcc: 0x10b3bcc: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b3588: 0x10b3588: addu  s2, zero, zero
+// 0x010b3bd0: 0x10b3bd0: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010b358c: 0x10b358c: j	 0x10b3908 addu  s5, zero, zero
+// 0x010b3bd4: 0x10b3bd4: j	 0x10b3f50 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_10b3908
+	br L_10b3f50
 // --- basic block ---
-L_10b3594:
-// 0x010b3594: 0x10b3594: jal   0x10b47d8 addu  a0, s5, zero
+L_10b3bdc:
+// 0x010b3bdc: 0x10b3bdc: jal   0x10b4e20 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -8331,38 +8331,38 @@ L_10b3594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_item_committed_10b47d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_item_committed_10b4e20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b359c: 0x10b359c: bne   v0, zero, 0x10b3904 addiu v0, sp, 36
+// 0x010b3be4: 0x10b3be4: bne   v0, zero, 0x10b3f4c addiu v0, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-	brtrue L_10b3904
+	brtrue L_10b3f4c
 // --- basic block ---
-// 0x010b35a4: 0x10b35a4: addu  a0, s5, zero
+// 0x010b3bec: 0x10b3bec: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010b35a8: 0x10b35a8: addiu a1, sp, 40
+// 0x010b3bf0: 0x10b3bf0: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b35ac: 0x10b35ac: addiu a2, sp, 28
+// 0x010b3bf4: 0x10b3bf4: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x010b35b0: 0x10b35b0: addiu a3, sp, 32
+// 0x010b3bf8: 0x10b3bf8: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x010b35b4: 0x10b35b4: jal   0x10b48f8 sw    v0, 16(sp)
+// 0x010b3bfc: 0x10b3bfc: jal   0x10b4f40 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8376,12 +8376,12 @@ L_10b3594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b35bc: 0x10b35bc: lw    v0, 36(sp)
+// 0x010b3c04: 0x10b3c04: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8390,17 +8390,17 @@ L_10b3594:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b35c0: 0x10b35c0: sll   zero, zero, 0
-// 0x010b35c4: 0x10b35c4: andi  v0, v0, 1
+// 0x010b3c08: 0x10b3c08: sll   zero, zero, 0
+// 0x010b3c0c: 0x10b3c0c: andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010b35c8: 0x10b35c8: bne   v0, zero, 0x10b3904 sll   zero, zero, 0
+// 0x010b3c10: 0x10b3c10: bne   v0, zero, 0x10b3f4c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b3904
+	brtrue L_10b3f4c
 // --- basic block ---
-// 0x010b35d0: 0x10b35d0: lw    a0, 40(sp)
+// 0x010b3c18: 0x10b3c18: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8409,7 +8409,7 @@ L_10b3594:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b35d4: 0x10b35d4: jal   0x10b46a0 addiu a1, sp, 80
+// 0x010b3c1c: 0x10b3c1c: jal   0x10b4ce8 addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -8419,20 +8419,20 @@ L_10b3594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b35dc: 0x10b35dc: addu  a0, s5, zero
+// 0x010b3c24: 0x10b3c24: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010b35e0: 0x10b35e0: addiu a1, sp, 60
+// 0x010b3c28: 0x10b3c28: addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.2
-// 0x010b35e4: 0x10b35e4: jal   0x10b49a8 addiu a2, sp, 68
+// 0x010b3c2c: 0x10b3c2c: jal   0x10b4ff0 addiu a2, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
@@ -8442,12 +8442,12 @@ L_10b3594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_time_10b49a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_time_10b4ff0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b35ec: 0x10b35ec: lw    v0, 28(sp)
+// 0x010b3c34: 0x10b3c34: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8456,17 +8456,17 @@ L_10b3594:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b35f0: 0x10b35f0: sll   zero, zero, 0
-// 0x010b35f4: 0x10b35f4: bgez  v0, 0x10b3600 addiu v0, v0, -1
+// 0x010b3c38: 0x10b3c38: sll   zero, zero, 0
+// 0x010b3c3c: 0x10b3c3c: bgez  v0, 0x10b3c48 addiu v0, v0, -1
 	ldloc 5
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
 	ldc.i4.s 0
-	bge L_10b3600
+	bge L_10b3c48
 // --- basic block ---
-// 0x010b35fc: 0x10b35fc: sw    v0, 32(sp)
+// 0x010b3c44: 0x10b3c44: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8475,8 +8475,8 @@ L_10b3594:
 	add
 	ldloc 5
 	stelem.i4
-L_10b3600:
-// 0x010b3600: 0x10b3600: lw    v0, 60(sp)
+L_10b3c48:
+// 0x010b3c48: 0x10b3c48: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8485,7 +8485,7 @@ L_10b3600:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3604: 0x10b3604: lw    s4, 28(sp)
+// 0x010b3c4c: 0x10b3c4c: lw    s4, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8494,7 +8494,7 @@ L_10b3600:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b3608: 0x10b3608: j	 0x10b37a0 sw    v0, 64(sp)
+// 0x010b3c50: 0x10b3c50: j	 0x10b3de8 sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8503,10 +8503,10 @@ L_10b3600:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10b37a0
+	br L_10b3de8
 // --- basic block ---
-L_10b3610:
-// 0x010b3610: 0x10b3610: jal   0x10b4518 addu  a0, s4, zero
+L_10b3c58:
+// 0x010b3c58: 0x10b3c58: jal   0x10b4b60 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8514,20 +8514,20 @@ L_10b3610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_ordinal_10b4518(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_ordinal_10b4b60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3618: 0x10b3618: addu  a0, s4, zero
+// 0x010b3c60: 0x10b3c60: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010b361c: 0x10b361c: addiu a1, sp, 80
+// 0x010b3c64: 0x10b3c64: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x010b3620: 0x10b3620: jal   0x10b45c4 sw    v0, 112(sp)
+// 0x010b3c68: 0x10b3c68: jal   0x10b4c0c sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8541,15 +8541,15 @@ L_10b3610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_position_10b45c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_position_10b4c0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3628: 0x10b3628: addu  a0, s4, zero
+// 0x010b3c70: 0x10b3c70: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010b362c: 0x10b362c: jal   0x10b4548 addiu a1, sp, 64
+// 0x010b3c74: 0x10b3c74: jal   0x10b4b90 addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -8559,12 +8559,12 @@ L_10b3610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_time_10b4548(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_time_10b4b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3634: 0x10b3634: jal   0x10b4594 addu  a0, s4, zero
+// 0x010b3c7c: 0x10b3c7c: jal   0x10b4bdc addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8572,15 +8572,15 @@ L_10b3610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_altitude_10b4594(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_altitude_10b4bdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b363c: 0x10b363c: lui   v1, 0xe0000
+// 0x010b3c84: 0x10b3c84: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b3640: 0x10b3640: sw    v0, 116(sp)
+// 0x010b3c88: 0x10b3c88: sw    v0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8589,7 +8589,7 @@ L_10b3610:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b3644: 0x10b3644: lw    a0, 112(sp)
+// 0x010b3c8c: 0x10b3c8c: lw    a0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8598,26 +8598,26 @@ L_10b3610:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3648: 0x10b3648: lw    v0, -19056(v1)
+// 0x010b3c90: 0x10b3c90: lw    v0, -18592(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4764
+	ldc.i4 -4648
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b364c: 0x10b364c: sll   zero, zero, 0
-// 0x010b3650: 0x10b3650: slt   v0, v0, a0
+// 0x010b3c94: 0x10b3c94: sll   zero, zero, 0
+// 0x010b3c98: 0x10b3c98: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010b3654: 0x10b3654: beq   v0, zero, 0x10b379c sll   zero, zero, 0
+// 0x010b3c9c: 0x10b3c9c: beq   v0, zero, 0x10b3de4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b379c
+	brfalse L_10b3de4
 // --- basic block ---
-// 0x010b365c: 0x10b365c: lw    v0, 28(sp)
+// 0x010b3ca4: 0x10b3ca4: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8626,13 +8626,13 @@ L_10b3610:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3660: 0x10b3660: sll   zero, zero, 0
-// 0x010b3664: 0x10b3664: bne   s4, v0, 0x10b36a0 sll   zero, zero, 0
+// 0x010b3ca8: 0x10b3ca8: sll   zero, zero, 0
+// 0x010b3cac: 0x10b3cac: bne   s4, v0, 0x10b3ce8 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	bne.un L_10b36a0
+	bne.un L_10b3ce8
 // --- basic block ---
-// 0x010b366c: 0x10b366c: lw    v0, 36(sp)
+// 0x010b3cb4: 0x10b3cb4: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8641,41 +8641,41 @@ L_10b3610:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3670: 0x10b3670: sll   zero, zero, 0
-// 0x010b3674: 0x10b3674: andi  v0, v0, 8
+// 0x010b3cb8: 0x10b3cb8: sll   zero, zero, 0
+// 0x010b3cbc: 0x10b3cbc: andi  v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	and
 	stloc 5
-// 0x010b3678: 0x10b3678: beq   v0, zero, 0x10b36a0 slt   v0, s0, s1
+// 0x010b3cc0: 0x10b3cc0: beq   v0, zero, 0x10b3ce8 slt   v0, s0, s1
 	ldloc 5
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-	brfalse L_10b36a0
+	brfalse L_10b3ce8
 // --- basic block ---
-// 0x010b3680: 0x10b3680: bne   v0, zero, 0x10b36a0 lui   a3, 0x20000
+// 0x010b3cc8: 0x10b3cc8: bne   v0, zero, 0x10b3ce8 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10b36a0
+	brtrue L_10b3ce8
 // --- basic block ---
-// 0x010b3688: 0x10b3688: addiu a0, zero, 5
+// 0x010b3cd0: 0x10b3cd0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b368c: 0x10b368c: addu  a1, s8, zero
+// 0x010b3cd4: 0x10b3cd4: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-// 0x010b3690: 0x10b3690: addiu a2, zero, 251
+// 0x010b3cd8: 0x10b3cd8: addiu a2, zero, 251
 	ldc.i4 251
 	stloc.3
-// 0x010b3694: 0x10b3694: addiu a3, a3, 19344
+// 0x010b3cdc: 0x10b3cdc: addiu a3, a3, 19804
 	ldloc 4
-	ldc.i4 19344
+	ldc.i4 19804
 	add
 	stloc 4
-// 0x010b3698: 0x10b3698: jal   0x100449c sw    s1, 16(sp)
+// 0x010b3ce0: 0x10b3ce0: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8694,8 +8694,8 @@ L_10b3610:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b36a0:
-// 0x010b36a0: 0x10b36a0: lw    a1, 168(sp)
+L_10b3ce8:
+// 0x010b3ce8: 0x10b3ce8: lw    a1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8704,12 +8704,12 @@ L_10b36a0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b36a4: 0x10b36a4: sll   zero, zero, 0
-// 0x010b36a8: 0x10b36a8: beq   a1, zero, 0x10b372c sll   zero, zero, 0
+// 0x010b3cec: 0x10b3cec: sll   zero, zero, 0
+// 0x010b3cf0: 0x10b3cf0: beq   a1, zero, 0x10b3d74 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b372c
+	brfalse L_10b3d74
 // --- basic block ---
-// 0x010b36b0: 0x10b36b0: lw    v0, 28(sp)
+// 0x010b3cf8: 0x10b3cf8: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8718,13 +8718,13 @@ L_10b36a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b36b4: 0x10b36b4: sll   zero, zero, 0
-// 0x010b36b8: 0x10b36b8: bne   s4, v0, 0x10b372c sll   zero, zero, 0
+// 0x010b3cfc: 0x10b3cfc: sll   zero, zero, 0
+// 0x010b3d00: 0x10b3d00: bne   s4, v0, 0x10b3d74 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	bne.un L_10b372c
+	bne.un L_10b3d74
 // --- basic block ---
-// 0x010b36c0: 0x10b36c0: lw    v1, 36(sp)
+// 0x010b3d08: 0x10b3d08: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8733,7 +8733,7 @@ L_10b36a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b36c4: 0x10b36c4: lw    v0, 92(sp)
+// 0x010b3d0c: 0x10b3d0c: lw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8742,41 +8742,41 @@ L_10b36a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b36c8: 0x10b36c8: andi  v1, v1, 128
+// 0x010b3d10: 0x10b3d10: andi  v1, v1, 128
 	ldloc 7
 	ldc.i4 128
 	and
 	stloc 7
-// 0x010b36cc: 0x10b36cc: beq   v0, v1, 0x10b372c slt   v0, s3, s7
+// 0x010b3d14: 0x10b3d14: beq   v0, v1, 0x10b3d74 slt   v0, s3, s7
 	ldloc 5
 	ldloc 7
 	ldloc 10
 	ldloc 15
 	clt
 	stloc 5
-	beq  L_10b372c
+	beq  L_10b3d74
 // --- basic block ---
-// 0x010b36d4: 0x10b36d4: bne   v0, zero, 0x10b36fc lui   a3, 0x20000
+// 0x010b3d1c: 0x10b3d1c: bne   v0, zero, 0x10b3d44 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10b36fc
+	brtrue L_10b3d44
 // --- basic block ---
-// 0x010b36dc: 0x10b36dc: addiu a0, zero, 5
+// 0x010b3d24: 0x10b3d24: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b36e0: 0x10b36e0: addu  a1, s8, zero
+// 0x010b3d28: 0x10b3d28: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-// 0x010b36e4: 0x10b36e4: addiu a2, zero, 267
+// 0x010b3d2c: 0x10b3d2c: addiu a2, zero, 267
 	ldc.i4 267
 	stloc.3
-// 0x010b36e8: 0x10b36e8: addiu a3, a3, 19380
+// 0x010b3d30: 0x10b3d30: addiu a3, a3, 19840
 	ldloc 4
-	ldc.i4 19380
+	ldc.i4 19840
 	add
 	stloc 4
-// 0x010b36ec: 0x10b36ec: sw    v1, 124(sp)
+// 0x010b3d34: 0x10b3d34: sw    v1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8785,7 +8785,7 @@ L_10b36a0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b36f0: 0x10b36f0: jal   0x100449c sw    s7, 16(sp)
+// 0x010b3d38: 0x10b3d38: jal   0x100449c sw    s7, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8804,7 +8804,7 @@ L_10b36a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b36f8: 0x10b36f8: lw    v1, 124(sp)
+// 0x010b3d40: 0x10b3d40: lw    v1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8813,24 +8813,24 @@ L_10b36a0:
 	add
 	ldelem.i4
 	stloc 7
-L_10b36fc:
-// 0x010b36fc: 0x10b36fc: bne   s3, zero, 0x10b3710 lui   a0, 0xe0000
+L_10b3d44:
+// 0x010b3d44: 0x10b3d44: bne   s3, zero, 0x10b3d58 lui   a0, 0xe0000
 	ldloc 10
 	ldc.i4 917504
 	stloc.1
-	brtrue L_10b3710
+	brtrue L_10b3d58
 // --- basic block ---
-// 0x010b3704: 0x10b3704: sltu  v0, zero, v1
+// 0x010b3d4c: 0x10b3d4c: sltu  v0, zero, v1
 	ldc.i4.s 0
 	ldloc 7
 	clt.un
 	stloc 5
-// 0x010b3708: 0x10b3708: addiu a0, a0, -19048
+// 0x010b3d50: 0x10b3d50: addiu a0, a0, -18584
 	ldloc.1
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc.1
-// 0x010b370c: 0x10b370c: sw    v0, 36(a0)
+// 0x010b3d54: 0x10b3d54: sw    v0, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -8839,8 +8839,8 @@ L_10b36fc:
 	add
 	ldloc 5
 	stelem.i4
-L_10b3710:
-// 0x010b3710: 0x10b3710: lw    a1, 104(sp)
+L_10b3d58:
+// 0x010b3d58: 0x10b3d58: lw    a1, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8849,12 +8849,12 @@ L_10b3710:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b3714: 0x10b3714: sll   v0, s3, 2
+// 0x010b3d5c: 0x10b3d5c: sll   v0, s3, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010b3718: 0x10b3718: lw    a0, 60(sp)
+// 0x010b3d60: 0x10b3d60: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8863,27 +8863,27 @@ L_10b3710:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b371c: 0x10b371c: addu  v0, a1, v0
+// 0x010b3d64: 0x10b3d64: addu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x010b3720: 0x10b3720: sw    a0, 0(v0)
+// 0x010b3d68: 0x10b3d68: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010b3724: 0x10b3724: j	 0x10b3730 addiu s3, s3, 1
+// 0x010b3d6c: 0x10b3d6c: j	 0x10b3d78 addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	br L_10b3730
+	br L_10b3d78
 // --- basic block ---
-L_10b372c:
-// 0x010b372c: 0x10b372c: lw    v1, 92(sp)
+L_10b3d74:
+// 0x010b3d74: 0x10b3d74: lw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8892,33 +8892,33 @@ L_10b372c:
 	add
 	ldelem.i4
 	stloc 7
-L_10b3730:
-// 0x010b3730: 0x10b3730: slt   v0, s0, s1
+L_10b3d78:
+// 0x010b3d78: 0x10b3d78: slt   v0, s0, s1
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-// 0x010b3734: 0x10b3734: bne   v0, zero, 0x10b375c lui   a3, 0x20000
+// 0x010b3d7c: 0x10b3d7c: bne   v0, zero, 0x10b3da4 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10b375c
+	brtrue L_10b3da4
 // --- basic block ---
-// 0x010b373c: 0x10b373c: addiu a0, zero, 5
+// 0x010b3d84: 0x10b3d84: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3740: 0x10b3740: addu  a1, s8, zero
+// 0x010b3d88: 0x10b3d88: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-// 0x010b3744: 0x10b3744: addiu a2, zero, 276
+// 0x010b3d8c: 0x10b3d8c: addiu a2, zero, 276
 	ldc.i4 276
 	stloc.3
-// 0x010b3748: 0x10b3748: addiu a3, a3, 19344
+// 0x010b3d90: 0x10b3d90: addiu a3, a3, 19804
 	ldloc 4
-	ldc.i4 19344
+	ldc.i4 19804
 	add
 	stloc 4
-// 0x010b374c: 0x10b374c: sw    v1, 124(sp)
+// 0x010b3d94: 0x10b3d94: sw    v1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8927,7 +8927,7 @@ L_10b3730:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b3750: 0x10b3750: jal   0x100449c sw    s1, 16(sp)
+// 0x010b3d98: 0x10b3d98: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8946,7 +8946,7 @@ L_10b3730:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3758: 0x10b3758: lw    v1, 124(sp)
+// 0x010b3da0: 0x10b3da0: lw    v1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8955,8 +8955,8 @@ L_10b3730:
 	add
 	ldelem.i4
 	stloc 7
-L_10b375c:
-// 0x010b375c: 0x10b375c: lw    a0, 96(sp)
+L_10b3da4:
+// 0x010b3da4: 0x10b3da4: lw    a0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8965,17 +8965,17 @@ L_10b375c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3760: 0x10b3760: sll   v0, s0, 4
+// 0x010b3da8: 0x10b3da8: sll   v0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	shl
 	stloc 5
-// 0x010b3764: 0x10b3764: addu  v0, a0, v0
+// 0x010b3dac: 0x10b3dac: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x010b3768: 0x10b3768: lw    a0, 80(sp)
+// 0x010b3db0: 0x10b3db0: lw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8984,7 +8984,7 @@ L_10b375c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b376c: 0x10b376c: lw    a1, 116(sp)
+// 0x010b3db4: 0x10b3db4: lw    a1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8993,14 +8993,14 @@ L_10b375c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b3770: 0x10b3770: sw    a0, 0(v0)
+// 0x010b3db8: 0x10b3db8: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010b3774: 0x10b3774: lw    a0, 84(sp)
+// 0x010b3dbc: 0x10b3dbc: lw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9009,12 +9009,12 @@ L_10b375c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3778: 0x10b3778: addiu s0, s0, 1
+// 0x010b3dc0: 0x10b3dc0: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010b377c: 0x10b377c: sw    a0, 4(v0)
+// 0x010b3dc4: 0x10b3dc4: sw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9023,7 +9023,7 @@ L_10b375c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b3780: 0x10b3780: lw    a0, 64(sp)
+// 0x010b3dc8: 0x10b3dc8: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9032,7 +9032,7 @@ L_10b375c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3784: 0x10b3784: sw    a1, 8(v0)
+// 0x010b3dcc: 0x10b3dcc: sw    a1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9041,7 +9041,7 @@ L_10b375c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b3788: 0x10b3788: sw    a0, 12(v0)
+// 0x010b3dd0: 0x10b3dd0: sw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9050,7 +9050,7 @@ L_10b375c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b378c: 0x10b378c: lw    a0, 112(sp)
+// 0x010b3dd4: 0x10b3dd4: lw    a0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9059,19 +9059,19 @@ L_10b375c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3790: 0x10b3790: lui   v0, 0xe0000
+// 0x010b3dd8: 0x10b3dd8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3794: 0x10b3794: sw    a0, -19056(v0)
+// 0x010b3ddc: 0x10b3ddc: sw    a0, -18592(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4764
+	ldc.i4 -4648
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b3798: 0x10b3798: sw    v1, 92(sp)
+// 0x010b3de0: 0x10b3de0: sw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9080,14 +9080,14 @@ L_10b375c:
 	add
 	ldloc 7
 	stelem.i4
-L_10b379c:
-// 0x010b379c: 0x10b379c: addiu s4, s4, 1
+L_10b3de4:
+// 0x010b3de4: 0x10b3de4: addiu s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-L_10b37a0:
-// 0x010b37a0: 0x10b37a0: lw    v0, 32(sp)
+L_10b3de8:
+// 0x010b3de8: 0x10b3de8: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9096,17 +9096,17 @@ L_10b37a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b37a4: 0x10b37a4: sll   zero, zero, 0
-// 0x010b37a8: 0x10b37a8: slt   v0, v0, s4
+// 0x010b3dec: 0x10b3dec: sll   zero, zero, 0
+// 0x010b3df0: 0x10b3df0: slt   v0, v0, s4
 	ldloc 5
 	ldloc 12
 	clt
 	stloc 5
-// 0x010b37ac: 0x10b37ac: beq   v0, zero, 0x10b3610 sll   zero, zero, 0
+// 0x010b3df4: 0x10b3df4: beq   v0, zero, 0x10b3c58 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b3610
+	brfalse L_10b3c58
 // --- basic block ---
-// 0x010b37b4: 0x10b37b4: lw    v0, 36(sp)
+// 0x010b3dfc: 0x10b3dfc: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9115,39 +9115,39 @@ L_10b37a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b37b8: 0x10b37b8: sll   zero, zero, 0
-// 0x010b37bc: 0x10b37bc: andi  v0, v0, 2
+// 0x010b3e00: 0x10b3e00: sll   zero, zero, 0
+// 0x010b3e04: 0x10b3e04: andi  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	and
 	stloc 5
-// 0x010b37c0: 0x10b37c0: bne   v0, zero, 0x10b3904 addiu v0, sp, 56
+// 0x010b3e08: 0x10b3e08: bne   v0, zero, 0x10b3f4c addiu v0, sp, 56
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 5
-	brtrue L_10b3904
+	brtrue L_10b3f4c
 // --- basic block ---
-// 0x010b37c8: 0x10b37c8: addu  a0, s5, zero
+// 0x010b3e10: 0x10b3e10: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010b37cc: 0x10b37cc: addiu a1, sp, 44
+// 0x010b3e14: 0x10b3e14: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x010b37d0: 0x10b37d0: addiu a2, sp, 48
+// 0x010b3e18: 0x10b3e18: addiu a2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.3
-// 0x010b37d4: 0x10b37d4: addiu a3, sp, 52
+// 0x010b3e1c: 0x10b3e1c: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x010b37d8: 0x10b37d8: jal   0x10b4880 sw    v0, 16(sp)
+// 0x010b3e20: 0x10b3e20: jal   0x10b4ec8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9161,12 +9161,12 @@ L_10b37a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_points_10b4880(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_points_10b4ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b37e0: 0x10b37e0: lw    v0, 36(sp)
+// 0x010b3e28: 0x10b3e28: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9175,19 +9175,19 @@ L_10b37a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b37e4: 0x10b37e4: sll   zero, zero, 0
-// 0x010b37e8: 0x10b37e8: andi  v0, v0, 72
+// 0x010b3e2c: 0x10b3e2c: sll   zero, zero, 0
+// 0x010b3e30: 0x10b3e30: andi  v0, v0, 72
 	ldloc 5
 	ldc.i4.s 72
 	and
 	stloc 5
-// 0x010b37ec: 0x10b37ec: bne   v0, zero, 0x10b3870 lui   a1, 0x0
+// 0x010b3e34: 0x10b3e34: bne   v0, zero, 0x10b3eb8 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_10b3870
+	brtrue L_10b3eb8
 // --- basic block ---
-// 0x010b37f4: 0x10b37f4: lw    v0, 19152(a1)
+// 0x010b3e3c: 0x10b3e3c: lw    v0, 19152(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -9196,7 +9196,7 @@ L_10b37a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b37f8: 0x10b37f8: lw    v1, 44(sp)
+// 0x010b3e40: 0x10b3e40: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9205,13 +9205,13 @@ L_10b37a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b37fc: 0x10b37fc: sll   zero, zero, 0
-// 0x010b3800: 0x10b3800: beq   v1, v0, 0x10b3870 sll   zero, zero, 0
+// 0x010b3e44: 0x10b3e44: sll   zero, zero, 0
+// 0x010b3e48: 0x10b3e48: beq   v1, v0, 0x10b3eb8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10b3870
+	beq  L_10b3eb8
 // --- basic block ---
-// 0x010b3808: 0x10b3808: lw    v1, 88(sp)
+// 0x010b3e50: 0x10b3e50: lw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9220,33 +9220,33 @@ L_10b37a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b380c: 0x10b380c: sll   zero, zero, 0
-// 0x010b3810: 0x10b3810: slt   v0, s2, v1
+// 0x010b3e54: 0x10b3e54: sll   zero, zero, 0
+// 0x010b3e58: 0x10b3e58: slt   v0, s2, v1
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 5
-// 0x010b3814: 0x10b3814: bne   v0, zero, 0x10b3834 lui   a3, 0x20000
+// 0x010b3e5c: 0x10b3e5c: bne   v0, zero, 0x10b3e7c lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10b3834
+	brtrue L_10b3e7c
 // --- basic block ---
-// 0x010b381c: 0x10b381c: addiu a0, zero, 5
+// 0x010b3e64: 0x10b3e64: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3820: 0x10b3820: addu  a1, s8, zero
+// 0x010b3e68: 0x10b3e68: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-// 0x010b3824: 0x10b3824: addiu a2, zero, 296
+// 0x010b3e6c: 0x10b3e6c: addiu a2, zero, 296
 	ldc.i4 296
 	stloc.3
-// 0x010b3828: 0x10b3828: addiu a3, a3, 19424
+// 0x010b3e70: 0x10b3e70: addiu a3, a3, 19884
 	ldloc 4
-	ldc.i4 19424
+	ldc.i4 19884
 	add
 	stloc 4
-// 0x010b382c: 0x10b382c: jal   0x100449c sw    v1, 16(sp)
+// 0x010b3e74: 0x10b3e74: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9265,8 +9265,8 @@ L_10b37a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b3834:
-// 0x010b3834: 0x10b3834: lw    a0, 108(sp)
+L_10b3e7c:
+// 0x010b3e7c: 0x10b3e7c: lw    a0, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9275,17 +9275,17 @@ L_10b3834:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3838: 0x10b3838: sll   v0, s2, 3
+// 0x010b3e80: 0x10b3e80: sll   v0, s2, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010b383c: 0x10b383c: addu  v1, a0, v0
+// 0x010b3e84: 0x10b3e84: addu  v1, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 7
-// 0x010b3840: 0x10b3840: lw    a0, 60(sp)
+// 0x010b3e88: 0x10b3e88: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9294,8 +9294,8 @@ L_10b3834:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3844: 0x10b3844: sll   zero, zero, 0
-// 0x010b3848: 0x10b3848: sw    a0, 4(v1)
+// 0x010b3e8c: 0x10b3e8c: sll   zero, zero, 0
+// 0x010b3e90: 0x10b3e90: sw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -9304,7 +9304,7 @@ L_10b3834:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b384c: 0x10b384c: lw    a0, 44(sp)
+// 0x010b3e94: 0x10b3e94: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9313,7 +9313,7 @@ L_10b3834:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3850: 0x10b3850: beq   s6, zero, 0x10b386c sw    a0, 0(v1)
+// 0x010b3e98: 0x10b3e98: beq   s6, zero, 0x10b3eb4 sw    a0, 0(v1)
 	ldloc 16
 	ldloc 6
 	ldloc 7
@@ -9321,9 +9321,9 @@ L_10b3834:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_10b386c
+	brfalse L_10b3eb4
 // --- basic block ---
-// 0x010b3858: 0x10b3858: lw    a1, 100(sp)
+// 0x010b3ea0: 0x10b3ea0: lw    a1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9332,13 +9332,13 @@ L_10b3834:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b385c: 0x10b385c: sll   zero, zero, 0
-// 0x010b3860: 0x10b3860: addu  v0, a1, v0
+// 0x010b3ea4: 0x10b3ea4: sll   zero, zero, 0
+// 0x010b3ea8: 0x10b3ea8: addu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x010b3864: 0x10b3864: sw    zero, 4(v0)
+// 0x010b3eac: 0x10b3eac: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9347,21 +9347,21 @@ L_10b3834:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b3868: 0x10b3868: sw    zero, 0(v0)
+// 0x010b3eb0: 0x10b3eb0: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10b386c:
-// 0x010b386c: 0x10b386c: addiu s2, s2, 1
+L_10b3eb4:
+// 0x010b3eb4: 0x10b3eb4: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10b3870:
-// 0x010b3870: 0x10b3870: lw    v1, 88(sp)
+L_10b3eb8:
+// 0x010b3eb8: 0x10b3eb8: lw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9370,33 +9370,33 @@ L_10b3870:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3874: 0x10b3874: sll   zero, zero, 0
-// 0x010b3878: 0x10b3878: slt   v0, s2, v1
+// 0x010b3ebc: 0x10b3ebc: sll   zero, zero, 0
+// 0x010b3ec0: 0x10b3ec0: slt   v0, s2, v1
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 5
-// 0x010b387c: 0x10b387c: bne   v0, zero, 0x10b389c lui   a3, 0x20000
+// 0x010b3ec4: 0x10b3ec4: bne   v0, zero, 0x10b3ee4 lui   a3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10b389c
+	brtrue L_10b3ee4
 // --- basic block ---
-// 0x010b3884: 0x10b3884: addiu a0, zero, 5
+// 0x010b3ecc: 0x10b3ecc: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3888: 0x10b3888: addu  a1, s8, zero
+// 0x010b3ed0: 0x10b3ed0: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-// 0x010b388c: 0x10b388c: addiu a2, zero, 312
+// 0x010b3ed4: 0x10b3ed4: addiu a2, zero, 312
 	ldc.i4 312
 	stloc.3
-// 0x010b3890: 0x10b3890: addiu a3, a3, 19424
+// 0x010b3ed8: 0x10b3ed8: addiu a3, a3, 19884
 	ldloc 4
-	ldc.i4 19424
+	ldc.i4 19884
 	add
 	stloc 4
-// 0x010b3894: 0x10b3894: jal   0x100449c sw    v1, 16(sp)
+// 0x010b3edc: 0x10b3edc: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9415,8 +9415,8 @@ L_10b3870:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b389c:
-// 0x010b389c: 0x10b389c: lw    v0, 36(sp)
+L_10b3ee4:
+// 0x010b3ee4: 0x10b3ee4: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9425,19 +9425,19 @@ L_10b389c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b38a0: 0x10b38a0: sll   zero, zero, 0
-// 0x010b38a4: 0x10b38a4: andi  v0, v0, 64
+// 0x010b3ee8: 0x10b3ee8: sll   zero, zero, 0
+// 0x010b3eec: 0x10b3eec: andi  v0, v0, 64
 	ldloc 5
 	ldc.i4.s 64
 	and
 	stloc 5
-// 0x010b38a8: 0x10b38a8: beq   v0, zero, 0x10b38b4 addiu v0, zero, -1
+// 0x010b3ef0: 0x10b3ef0: beq   v0, zero, 0x10b3efc addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_10b38b4
+	brfalse L_10b3efc
 // --- basic block ---
-// 0x010b38b0: 0x10b38b0: sw    v0, 48(sp)
+// 0x010b3ef8: 0x10b3ef8: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9446,8 +9446,8 @@ L_10b389c:
 	add
 	ldloc 5
 	stelem.i4
-L_10b38b4:
-// 0x010b38b4: 0x10b38b4: lw    a0, 108(sp)
+L_10b3efc:
+// 0x010b3efc: 0x10b3efc: lw    a0, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9456,17 +9456,17 @@ L_10b38b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b38b8: 0x10b38b8: sll   v0, s2, 3
+// 0x010b3f00: 0x10b3f00: sll   v0, s2, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010b38bc: 0x10b38bc: addu  v1, a0, v0
+// 0x010b3f04: 0x10b3f04: addu  v1, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 7
-// 0x010b38c0: 0x10b38c0: lw    a0, 68(sp)
+// 0x010b3f08: 0x10b3f08: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9475,8 +9475,8 @@ L_10b38b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b38c4: 0x10b38c4: sll   zero, zero, 0
-// 0x010b38c8: 0x10b38c8: sw    a0, 4(v1)
+// 0x010b3f0c: 0x10b3f0c: sll   zero, zero, 0
+// 0x010b3f10: 0x10b3f10: sw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -9485,7 +9485,7 @@ L_10b38b4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b38cc: 0x10b38cc: lw    a0, 48(sp)
+// 0x010b3f14: 0x10b3f14: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9494,7 +9494,7 @@ L_10b38b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b38d0: 0x10b38d0: beq   s6, zero, 0x10b38f4 sw    a0, 0(v1)
+// 0x010b3f18: 0x10b3f18: beq   s6, zero, 0x10b3f3c sw    a0, 0(v1)
 	ldloc 16
 	ldloc 6
 	ldloc 7
@@ -9502,9 +9502,9 @@ L_10b38b4:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_10b38f4
+	brfalse L_10b3f3c
 // --- basic block ---
-// 0x010b38d8: 0x10b38d8: lw    a1, 100(sp)
+// 0x010b3f20: 0x10b3f20: lw    a1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9513,7 +9513,7 @@ L_10b38b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b38dc: 0x10b38dc: lw    v1, 56(sp)
+// 0x010b3f24: 0x10b3f24: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9522,12 +9522,12 @@ L_10b38b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b38e0: 0x10b38e0: addu  v0, a1, v0
+// 0x010b3f28: 0x10b3f28: addu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x010b38e4: 0x10b38e4: sw    v1, 4(v0)
+// 0x010b3f2c: 0x10b3f2c: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9536,7 +9536,7 @@ L_10b38b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b38e8: 0x10b38e8: lw    v1, 52(sp)
+// 0x010b3f30: 0x10b3f30: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9545,16 +9545,16 @@ L_10b38b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b38ec: 0x10b38ec: sll   zero, zero, 0
-// 0x010b38f0: 0x10b38f0: sw    v1, 0(v0)
+// 0x010b3f34: 0x10b3f34: sll   zero, zero, 0
+// 0x010b3f38: 0x10b3f38: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10b38f4:
-// 0x010b38f4: 0x10b38f4: lw    v0, 48(sp)
+L_10b3f3c:
+// 0x010b3f3c: 0x10b3f3c: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9563,15 +9563,15 @@ L_10b38f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b38f8: 0x10b38f8: lui   v1, 0x0
+// 0x010b3f40: 0x10b3f40: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010b38fc: 0x10b38fc: addiu s2, s2, 1
+// 0x010b3f44: 0x10b3f44: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010b3900: 0x10b3900: sw    v0, 19152(v1)
+// 0x010b3f48: 0x10b3f48: sw    v0, 19152(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -9580,14 +9580,14 @@ L_10b38f4:
 	add
 	ldloc 5
 	stelem.i4
-L_10b3904:
-// 0x010b3904: 0x10b3904: addiu s5, s5, 1
+L_10b3f4c:
+// 0x010b3f4c: 0x10b3f4c: addiu s5, s5, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-L_10b3908:
-// 0x010b3908: 0x10b3908: lw    a0, 120(sp)
+L_10b3f50:
+// 0x010b3f50: 0x10b3f50: lw    a0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9596,68 +9596,68 @@ L_10b3908:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b390c: 0x10b390c: sll   zero, zero, 0
-// 0x010b3910: 0x10b3910: slt   v0, s5, a0
+// 0x010b3f54: 0x10b3f54: sll   zero, zero, 0
+// 0x010b3f58: 0x10b3f58: slt   v0, s5, a0
 	ldloc 13
 	ldloc.1
 	clt
 	stloc 5
-// 0x010b3914: 0x10b3914: bne   v0, zero, 0x10b3594 sll   zero, zero, 0
+// 0x010b3f5c: 0x10b3f5c: bne   v0, zero, 0x10b3bdc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b3594
+	brtrue L_10b3bdc
 // --- basic block ---
-L_10b391c:
-// 0x010b391c: 0x10b391c: jal   0x10b08e4 sll   zero, zero, 0
-	call int32 Cibyl132::export_track_num_points_10b08e4()
+L_10b3f64:
+// 0x010b3f64: 0x10b3f64: jal   0x10b0f2c sll   zero, zero, 0
+	call int32 Cibyl132::export_track_num_points_10b0f2c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3924: 0x10b3924: jal   0x10b08d4 addu  s5, v0, zero
+// 0x010b3f6c: 0x10b3f6c: jal   0x10b0f1c addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-	call int32 Cibyl132::export_track_is_new_10b08d4()
+	call int32 Cibyl132::export_track_is_new_10b0f1c()
 	stloc 5
 // --- basic block ---
-// 0x010b392c: 0x10b392c: beq   v0, zero, 0x10b3960 sll   zero, zero, 0
+// 0x010b3f74: 0x10b3f74: beq   v0, zero, 0x10b3fa8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b3960
+	brfalse L_10b3fa8
 // --- basic block ---
-// 0x010b3934: 0x10b3934: blez  s5, 0x10b3960 slt   v0, s0, s1
+// 0x010b3f7c: 0x10b3f7c: blez  s5, 0x10b3fa8 slt   v0, s0, s1
 	ldloc 13
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
 	ldc.i4.s 0
-	ble L_10b3960
+	ble L_10b3fa8
 // --- basic block ---
-// 0x010b393c: 0x10b393c: bne   v0, zero, 0x10b3960 lui   a1, 0x20000
+// 0x010b3f84: 0x10b3f84: bne   v0, zero, 0x10b3fa8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b3960
+	brtrue L_10b3fa8
 // --- basic block ---
-// 0x010b3944: 0x10b3944: lui   a3, 0x20000
+// 0x010b3f8c: 0x10b3f8c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b3948: 0x10b3948: addiu a1, a1, 18900
+// 0x010b3f90: 0x10b3f90: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b394c: 0x10b394c: addiu a3, a3, 19344
+// 0x010b3f94: 0x10b3f94: addiu a3, a3, 19804
 	ldloc 4
-	ldc.i4 19344
+	ldc.i4 19804
 	add
 	stloc 4
-// 0x010b3950: 0x10b3950: addiu a0, zero, 5
+// 0x010b3f98: 0x10b3f98: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3954: 0x10b3954: addiu a2, zero, 339
+// 0x010b3f9c: 0x10b3f9c: addiu a2, zero, 339
 	ldc.i4 339
 	stloc.3
-// 0x010b3958: 0x10b3958: jal   0x100449c sw    s1, 16(sp)
+// 0x010b3fa0: 0x10b3fa0: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9676,22 +9676,22 @@ L_10b391c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b3960:
-// 0x010b3960: 0x10b3960: addu  s4, zero, zero
+L_10b3fa8:
+// 0x010b3fa8: 0x10b3fa8: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010b3964: 0x10b3964: j	 0x10b3a34 lui   s8, 0xe0000
+// 0x010b3fac: 0x10b3fac: j	 0x10b407c lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 14
-	br L_10b3a34
+	br L_10b407c
 // --- basic block ---
-L_10b396c:
-// 0x010b396c: 0x10b396c: jal   0x10b08a8 sll   zero, zero, 0
+L_10b3fb4:
+// 0x010b3fb4: 0x10b3fb4: jal   0x10b0ef0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl132::export_track_point_ordinal_10b08a8(int32)
+	call int32 Cibyl132::export_track_point_ordinal_10b0ef0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b3974: 0x10b3974: sw    v0, 92(sp)
+// 0x010b3fbc: 0x10b3fbc: sw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9700,7 +9700,7 @@ L_10b396c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b3978: 0x10b3978: lw    a1, 92(sp)
+// 0x010b3fc0: 0x10b3fc0: lw    a1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9709,79 +9709,79 @@ L_10b396c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b397c: 0x10b397c: lw    v0, -19056(s8)
+// 0x010b3fc4: 0x10b3fc4: lw    v0, -18592(s8)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4764
+	ldc.i4 -4648
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3980: 0x10b3980: sll   zero, zero, 0
-// 0x010b3984: 0x10b3984: slt   v0, v0, a1
+// 0x010b3fc8: 0x10b3fc8: sll   zero, zero, 0
+// 0x010b3fcc: 0x10b3fcc: slt   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x010b3988: 0x10b3988: beq   v0, zero, 0x10b3a30 sll   zero, zero, 0
+// 0x010b3fd0: 0x10b3fd0: beq   v0, zero, 0x10b4078 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b3a30
+	brfalse L_10b4078
 // --- basic block ---
-// 0x010b3990: 0x10b3990: jal   0x10b0884 addu  a0, s4, zero
+// 0x010b3fd8: 0x10b3fd8: jal   0x10b0ecc addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::export_track_point_status_10b0884(int32)
+	call int32 Cibyl132::export_track_point_status_10b0ecc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3998: 0x10b3998: lw    v0, 0(v0)
+// 0x010b3fe0: 0x10b3fe0: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b399c: 0x10b399c: addiu v1, zero, 1
+// 0x010b3fe4: 0x10b3fe4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010b39a0: 0x10b39a0: bne   v0, v1, 0x10b3a24 slt   v0, s0, s1
+// 0x010b3fe8: 0x10b3fe8: bne   v0, v1, 0x10b406c slt   v0, s0, s1
 	ldloc 5
 	ldloc 7
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-	bne.un L_10b3a24
+	bne.un L_10b406c
 // --- basic block ---
-// 0x010b39a8: 0x10b39a8: bne   v0, zero, 0x10b39cc lui   a1, 0x20000
+// 0x010b3ff0: 0x10b3ff0: bne   v0, zero, 0x10b4014 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b39cc
+	brtrue L_10b4014
 // --- basic block ---
-// 0x010b39b0: 0x10b39b0: lui   a3, 0x20000
+// 0x010b3ff8: 0x10b3ff8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b39b4: 0x10b39b4: addiu a1, a1, 18900
+// 0x010b3ffc: 0x10b3ffc: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b39b8: 0x10b39b8: addiu a2, zero, 358
+// 0x010b4000: 0x10b4000: addiu a2, zero, 358
 	ldc.i4 358
 	stloc.3
-// 0x010b39bc: 0x10b39bc: addiu a3, a3, 19344
+// 0x010b4004: 0x10b4004: addiu a3, a3, 19804
 	ldloc 4
-	ldc.i4 19344
+	ldc.i4 19804
 	add
 	stloc 4
-// 0x010b39c0: 0x10b39c0: addiu a0, zero, 5
+// 0x010b4008: 0x10b4008: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b39c4: 0x10b39c4: jal   0x100449c sw    s1, 16(sp)
+// 0x010b400c: 0x10b400c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9800,8 +9800,8 @@ L_10b396c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b39cc:
-// 0x010b39cc: 0x10b39cc: lw    a1, 96(sp)
+L_10b4014:
+// 0x010b4014: 0x10b4014: lw    a1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9810,20 +9810,20 @@ L_10b39cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b39d0: 0x10b39d0: sll   v0, s0, 4
+// 0x010b4018: 0x10b4018: sll   v0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	shl
 	stloc 5
-// 0x010b39d4: 0x10b39d4: addu  v0, a1, v0
+// 0x010b401c: 0x10b401c: addu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x010b39d8: 0x10b39d8: addu  a0, s4, zero
+// 0x010b4020: 0x10b4020: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010b39dc: 0x10b39dc: jal   0x10b0818 sw    v0, 88(sp)
+// 0x010b4024: 0x10b4024: jal   0x10b0e60 sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9833,19 +9833,19 @@ L_10b39cc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::export_track_point_pos_10b0818(int32)
+	call int32 Cibyl132::export_track_point_pos_10b0e60(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b39e4: 0x10b39e4: lw    v1, 0(v0)
+// 0x010b402c: 0x10b402c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b39e8: 0x10b39e8: lw    a1, 88(sp)
+// 0x010b4030: 0x10b4030: lw    a1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9854,17 +9854,17 @@ L_10b39cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b39ec: 0x10b39ec: addu  a0, s4, zero
+// 0x010b4034: 0x10b4034: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010b39f0: 0x10b39f0: sw    v1, 0(a1)
+// 0x010b4038: 0x10b4038: sw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b39f4: 0x10b39f4: lw    v0, 4(v0)
+// 0x010b403c: 0x10b403c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9873,12 +9873,12 @@ L_10b39cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b39f8: 0x10b39f8: addiu s0, s0, 1
+// 0x010b4040: 0x10b4040: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010b39fc: 0x10b39fc: jal   0x10b0838 sw    v0, 4(a1)
+// 0x010b4044: 0x10b4044: jal   0x10b0e80 sw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -9888,12 +9888,12 @@ L_10b39cc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::export_track_point_gps_10b0838(int32)
+	call int32 Cibyl132::export_track_point_gps_10b0e80(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3a04: 0x10b3a04: lw    v0, 8(v0)
+// 0x010b404c: 0x10b404c: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9902,7 +9902,7 @@ L_10b39cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3a08: 0x10b3a08: lw    v1, 88(sp)
+// 0x010b4050: 0x10b4050: lw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9911,10 +9911,10 @@ L_10b39cc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3a0c: 0x10b3a0c: addu  a0, s4, zero
+// 0x010b4054: 0x10b4054: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010b3a10: 0x10b3a10: jal   0x10b0858 sw    v0, 8(v1)
+// 0x010b4058: 0x10b4058: jal   0x10b0ea0 sw    v0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -9924,10 +9924,10 @@ L_10b39cc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl132::export_track_point_time_10b0858(int32)
+	call int32 Cibyl132::export_track_point_time_10b0ea0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b3a18: 0x10b3a18: lw    a0, 88(sp)
+// 0x010b4060: 0x10b4060: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9936,8 +9936,8 @@ L_10b39cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3a1c: 0x10b3a1c: sll   zero, zero, 0
-// 0x010b3a20: 0x10b3a20: sw    v0, 12(a0)
+// 0x010b4064: 0x10b4064: sll   zero, zero, 0
+// 0x010b4068: 0x10b4068: sw    v0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -9946,8 +9946,8 @@ L_10b39cc:
 	add
 	ldloc 5
 	stelem.i4
-L_10b3a24:
-// 0x010b3a24: 0x10b3a24: lw    a1, 92(sp)
+L_10b406c:
+// 0x010b406c: 0x10b406c: lw    a1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9956,60 +9956,60 @@ L_10b3a24:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b3a28: 0x10b3a28: sll   zero, zero, 0
-// 0x010b3a2c: 0x10b3a2c: sw    a1, -19056(s8)
+// 0x010b4070: 0x10b4070: sll   zero, zero, 0
+// 0x010b4074: 0x10b4074: sw    a1, -18592(s8)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4764
+	ldc.i4 -4648
 	add
 	ldloc.2
 	stelem.i4
-L_10b3a30:
-// 0x010b3a30: 0x10b3a30: addiu s4, s4, 1
+L_10b4078:
+// 0x010b4078: 0x10b4078: addiu s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-L_10b3a34:
-// 0x010b3a34: 0x10b3a34: slt   v0, s4, s5
+L_10b407c:
+// 0x010b407c: 0x10b407c: slt   v0, s4, s5
 	ldloc 12
 	ldloc 13
 	clt
 	stloc 5
-// 0x010b3a38: 0x10b3a38: bne   v0, zero, 0x10b396c addu  a0, s4, zero
+// 0x010b4080: 0x10b4080: bne   v0, zero, 0x10b3fb4 addu  a0, s4, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_10b396c
+	brtrue L_10b3fb4
 // --- basic block ---
-// 0x010b3a40: 0x10b3a40: jal   0x10b08fc sll   zero, zero, 0
-	call int32 Cibyl132::export_track_reset_points_10b08fc()
+// 0x010b4088: 0x10b4088: jal   0x10b0f44 sll   zero, zero, 0
+	call int32 Cibyl132::export_track_reset_points_10b0f44()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3a48: 0x10b3a48: jal   0x10b1050 sll   zero, zero, 0
+// 0x010b4090: 0x10b4090: jal   0x10b1698 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_get_gps_filter_10b1050(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_get_gps_filter_10b1698(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3a50: 0x10b3a50: addu  a0, v0, zero
+// 0x010b4098: 0x10b4098: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b3a54: 0x10b3a54: addiu a1, sp, 72
+// 0x010b409c: 0x10b409c: addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x010b3a58: 0x10b3a58: jal   0x10acccc addiu a2, sp, 24
+// 0x010b40a0: 0x10b40a0: jal   0x10ad314 addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -10017,24 +10017,24 @@ L_10b3a34:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl129::editor_track_filter_get_current_10acccc(int32,int32,int32)
+	call int32 Cibyl129::editor_track_filter_get_current_10ad314(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3a60: 0x10b3a60: beq   v0, zero, 0x10b3b4c sll   zero, zero, 0
+// 0x010b40a8: 0x10b40a8: beq   v0, zero, 0x10b4194 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b3b4c
+	brfalse L_10b4194
 // --- basic block ---
-// 0x010b3a68: 0x10b3a68: beq   s0, zero, 0x10b3ab8 addiu v0, s0, -1
+// 0x010b40b0: 0x10b40b0: beq   s0, zero, 0x10b4100 addiu v0, s0, -1
 	ldloc 8
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 5
-	brfalse L_10b3ab8
+	brfalse L_10b4100
 // --- basic block ---
-// 0x010b3a70: 0x10b3a70: lw    v1, 96(sp)
+// 0x010b40b8: 0x10b40b8: lw    v1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10043,24 +10043,24 @@ L_10b3a34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3a74: 0x10b3a74: sll   v0, v0, 4
+// 0x010b40bc: 0x10b40bc: sll   v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc 5
-// 0x010b3a78: 0x10b3a78: addu  v0, v1, v0
+// 0x010b40c0: 0x10b40c0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010b3a7c: 0x10b3a7c: lw    v1, 0(v0)
+// 0x010b40c4: 0x10b40c4: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b3a80: 0x10b3a80: lw    a0, 72(sp)
+// 0x010b40c8: 0x10b40c8: lw    a0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10069,13 +10069,13 @@ L_10b3a34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3a84: 0x10b3a84: sll   zero, zero, 0
-// 0x010b3a88: 0x10b3a88: bne   a0, v1, 0x10b3ab8 sll   zero, zero, 0
+// 0x010b40cc: 0x10b40cc: sll   zero, zero, 0
+// 0x010b40d0: 0x10b40d0: bne   a0, v1, 0x10b4100 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10b3ab8
+	bne.un L_10b4100
 // --- basic block ---
-// 0x010b3a90: 0x10b3a90: lw    v1, 4(v0)
+// 0x010b40d8: 0x10b40d8: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10084,7 +10084,7 @@ L_10b3a34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3a94: 0x10b3a94: lw    a0, 76(sp)
+// 0x010b40dc: 0x10b40dc: lw    a0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10093,13 +10093,13 @@ L_10b3a34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3a98: 0x10b3a98: sll   zero, zero, 0
-// 0x010b3a9c: 0x10b3a9c: bne   a0, v1, 0x10b3ab8 sll   zero, zero, 0
+// 0x010b40e0: 0x10b40e0: sll   zero, zero, 0
+// 0x010b40e4: 0x10b40e4: bne   a0, v1, 0x10b4100 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10b3ab8
+	bne.un L_10b4100
 // --- basic block ---
-// 0x010b3aa4: 0x10b3aa4: lw    v0, 12(v0)
+// 0x010b40ec: 0x10b40ec: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10108,7 +10108,7 @@ L_10b3a34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b3aa8: 0x10b3aa8: lw    v1, 24(sp)
+// 0x010b40f0: 0x10b40f0: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10117,55 +10117,55 @@ L_10b3a34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3aac: 0x10b3aac: sll   zero, zero, 0
-// 0x010b3ab0: 0x10b3ab0: beq   v1, v0, 0x10b3b4c sll   zero, zero, 0
+// 0x010b40f4: 0x10b40f4: sll   zero, zero, 0
+// 0x010b40f8: 0x10b40f8: beq   v1, v0, 0x10b4194 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10b3b4c
+	beq  L_10b4194
 // --- basic block ---
-L_10b3ab8:
-// 0x010b3ab8: 0x10b3ab8: jal   0x10b08d4 sll   zero, zero, 0
-	call int32 Cibyl132::export_track_is_new_10b08d4()
+L_10b4100:
+// 0x010b4100: 0x10b4100: jal   0x10b0f1c sll   zero, zero, 0
+	call int32 Cibyl132::export_track_is_new_10b0f1c()
 	stloc 5
 // --- basic block ---
-// 0x010b3ac0: 0x10b3ac0: beq   v0, zero, 0x10b3afc slt   v0, s0, s1
+// 0x010b4108: 0x10b4108: beq   v0, zero, 0x10b4144 slt   v0, s0, s1
 	ldloc 5
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-	brfalse L_10b3afc
+	brfalse L_10b4144
 // --- basic block ---
-// 0x010b3ac8: 0x10b3ac8: bne   s5, zero, 0x10b3afc sll   zero, zero, 0
+// 0x010b4110: 0x10b4110: bne   s5, zero, 0x10b4144 sll   zero, zero, 0
 	ldloc 13
-	brtrue L_10b3afc
+	brtrue L_10b4144
 // --- basic block ---
-// 0x010b3ad0: 0x10b3ad0: bne   v0, zero, 0x10b3b20 lui   a1, 0x20000
+// 0x010b4118: 0x10b4118: bne   v0, zero, 0x10b4168 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b3b20
+	brtrue L_10b4168
 // --- basic block ---
-// 0x010b3ad8: 0x10b3ad8: lui   a3, 0x20000
+// 0x010b4120: 0x10b4120: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b3adc: 0x10b3adc: addiu a1, a1, 18900
+// 0x010b4124: 0x10b4124: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b3ae0: 0x10b3ae0: addiu a3, a3, 19344
+// 0x010b4128: 0x10b4128: addiu a3, a3, 19804
 	ldloc 4
-	ldc.i4 19344
+	ldc.i4 19804
 	add
 	stloc 4
-// 0x010b3ae4: 0x10b3ae4: addiu a0, zero, 5
+// 0x010b412c: 0x10b412c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3ae8: 0x10b3ae8: addiu a2, zero, 382
+// 0x010b4130: 0x10b4130: addiu a2, zero, 382
 	ldc.i4 382
 	stloc.3
-// 0x010b3aec: 0x10b3aec: jal   0x100449c sw    s1, 16(sp)
+// 0x010b4134: 0x10b4134: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10184,39 +10184,39 @@ L_10b3ab8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3af4: 0x10b3af4: j	 0x10b3b04 lui   a1, 0x20000
+// 0x010b413c: 0x10b413c: j	 0x10b414c lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_10b3b04
+	br L_10b414c
 // --- basic block ---
-L_10b3afc:
-// 0x010b3afc: 0x10b3afc: bne   v0, zero, 0x10b3b20 lui   a1, 0x20000
+L_10b4144:
+// 0x010b4144: 0x10b4144: bne   v0, zero, 0x10b4168 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b3b20
+	brtrue L_10b4168
 // --- basic block ---
-L_10b3b04:
-// 0x010b3b04: 0x10b3b04: lui   a3, 0x20000
+L_10b414c:
+// 0x010b414c: 0x10b414c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b3b08: 0x10b3b08: addiu a1, a1, 18900
+// 0x010b4150: 0x10b4150: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b3b0c: 0x10b3b0c: addiu a3, a3, 19344
+// 0x010b4154: 0x10b4154: addiu a3, a3, 19804
 	ldloc 4
-	ldc.i4 19344
+	ldc.i4 19804
 	add
 	stloc 4
-// 0x010b3b10: 0x10b3b10: addiu a0, zero, 5
+// 0x010b4158: 0x10b4158: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3b14: 0x10b3b14: addiu a2, zero, 392
+// 0x010b415c: 0x10b415c: addiu a2, zero, 392
 	ldc.i4 392
 	stloc.3
-// 0x010b3b18: 0x10b3b18: jal   0x100449c sw    s1, 16(sp)
+// 0x010b4160: 0x10b4160: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10235,8 +10235,8 @@ L_10b3b04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b3b20:
-// 0x010b3b20: 0x10b3b20: lw    a0, 96(sp)
+L_10b4168:
+// 0x010b4168: 0x10b4168: lw    a0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10245,7 +10245,7 @@ L_10b3b20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3b24: 0x10b3b24: lw    v1, 72(sp)
+// 0x010b416c: 0x10b416c: lw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10254,24 +10254,24 @@ L_10b3b20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3b28: 0x10b3b28: sll   v0, s0, 4
+// 0x010b4170: 0x10b4170: sll   v0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	shl
 	stloc 5
-// 0x010b3b2c: 0x10b3b2c: addu  v0, a0, v0
+// 0x010b4174: 0x10b4174: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x010b3b30: 0x10b3b30: sw    v1, 0(v0)
+// 0x010b4178: 0x10b4178: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b3b34: 0x10b3b34: lw    v1, 76(sp)
+// 0x010b417c: 0x10b417c: lw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10280,12 +10280,12 @@ L_10b3b20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3b38: 0x10b3b38: addiu s0, s0, 1
+// 0x010b4180: 0x10b4180: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010b3b3c: 0x10b3b3c: sw    v1, 4(v0)
+// 0x010b4184: 0x10b4184: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10294,7 +10294,7 @@ L_10b3b20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b3b40: 0x10b3b40: lw    v1, 24(sp)
+// 0x010b4188: 0x10b4188: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10303,8 +10303,8 @@ L_10b3b20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3b44: 0x10b3b44: sll   zero, zero, 0
-// 0x010b3b48: 0x10b3b48: sw    v1, 12(v0)
+// 0x010b418c: 0x10b418c: sll   zero, zero, 0
+// 0x010b4190: 0x10b4190: sw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10313,8 +10313,8 @@ L_10b3b20:
 	add
 	ldloc 7
 	stelem.i4
-L_10b3b4c:
-// 0x010b3b4c: 0x10b3b4c: lw    a1, 168(sp)
+L_10b4194:
+// 0x010b4194: 0x10b4194: lw    a1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10323,51 +10323,51 @@ L_10b3b4c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b3b50: 0x10b3b50: sll   zero, zero, 0
-// 0x010b3b54: 0x10b3b54: bne   a1, zero, 0x10b3bbc lui   v0, 0xe0000
+// 0x010b4198: 0x10b4198: sll   zero, zero, 0
+// 0x010b419c: 0x10b419c: bne   a1, zero, 0x10b4204 lui   v0, 0xe0000
 	ldloc.2
 	ldc.i4 917504
 	stloc 5
-	brtrue L_10b3bbc
+	brtrue L_10b4204
 // --- basic block ---
-// 0x010b3b5c: 0x10b3b5c: jal   0x10b0910 sll   zero, zero, 0
-	call int32 Cibyl132::editor_track_get_num_update_toggles_10b0910()
+// 0x010b41a4: 0x10b41a4: jal   0x10b0f58 sll   zero, zero, 0
+	call int32 Cibyl132::editor_track_get_num_update_toggles_10b0f58()
 	stloc 5
 // --- basic block ---
-// 0x010b3b64: 0x10b3b64: addu  s3, v0, zero
+// 0x010b41ac: 0x10b41ac: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010b3b68: 0x10b3b68: slt   v0, s7, v0
+// 0x010b41b0: 0x10b41b0: slt   v0, s7, v0
 	ldloc 15
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b3b6c: 0x10b3b6c: beq   v0, zero, 0x10b3b90 lui   a1, 0x20000
+// 0x010b41b4: 0x10b41b4: beq   v0, zero, 0x10b41d8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10b3b90
+	brfalse L_10b41d8
 // --- basic block ---
-// 0x010b3b74: 0x10b3b74: lui   a3, 0x20000
+// 0x010b41bc: 0x10b41bc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b3b78: 0x10b3b78: addiu a1, a1, 18900
+// 0x010b41c0: 0x10b41c0: addiu a1, a1, 19360
 	ldloc.2
-	ldc.i4 18900
+	ldc.i4 19360
 	add
 	stloc.2
-// 0x010b3b7c: 0x10b3b7c: addiu a3, a3, 19380
+// 0x010b41c4: 0x10b41c4: addiu a3, a3, 19840
 	ldloc 4
-	ldc.i4 19380
+	ldc.i4 19840
 	add
 	stloc 4
-// 0x010b3b80: 0x10b3b80: addiu a0, zero, 5
+// 0x010b41c8: 0x10b41c8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010b3b84: 0x10b3b84: addiu a2, zero, 405
+// 0x010b41cc: 0x10b41cc: addiu a2, zero, 405
 	ldc.i4 405
 	stloc.3
-// 0x010b3b88: 0x10b3b88: jal   0x100449c sw    s7, 16(sp)
+// 0x010b41d0: 0x10b41d0: jal   0x100449c sw    s7, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10386,12 +10386,12 @@ L_10b3b4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b3b90:
-// 0x010b3b90: 0x10b3b90: jal   0x10b0920 sll   zero, zero, 0
-	call int32 Cibyl132::editor_track_get_update_toggle_times_10b0920()
+L_10b41d8:
+// 0x010b41d8: 0x10b41d8: jal   0x10b0f68 sll   zero, zero, 0
+	call int32 Cibyl132::editor_track_get_update_toggle_times_10b0f68()
 	stloc 5
 // --- basic block ---
-// 0x010b3b98: 0x10b3b98: lw    a0, 104(sp)
+// 0x010b41e0: 0x10b41e0: lw    a0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10400,10 +10400,10 @@ L_10b3b90:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3b9c: 0x10b3b9c: addu  a1, v0, zero
+// 0x010b41e4: 0x10b41e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010b3ba0: 0x10b3ba0: jal   0x1001800 sll   a2, s3, 2
+// 0x010b41e8: 0x10b41e8: jal   0x1001800 sll   a2, s3, 2
 	ldloc 10
 	ldc.i4.2
 	shl
@@ -10417,37 +10417,37 @@ L_10b3b90:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3ba8: 0x10b3ba8: jal   0x10b092c addu  a0, zero, zero
+// 0x010b41f0: 0x10b41f0: jal   0x10b0f74 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl132::editor_track_get_update_toggle_state_10b092c(int32)
+	call int32 Cibyl132::editor_track_get_update_toggle_state_10b0f74(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3bb0: 0x10b3bb0: lui   v1, 0xe0000
+// 0x010b41f8: 0x10b41f8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b3bb4: 0x10b3bb4: sw    v0, -19012(v1)
+// 0x010b41fc: 0x10b41fc: sw    v0, -18548(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4753
+	ldc.i4 -4637
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b3bb8: 0x10b3bb8: lui   v0, 0xe0000
+// 0x010b4200: 0x10b4200: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_10b3bbc:
-// 0x010b3bbc: 0x10b3bbc: addiu v0, v0, -19048
+L_10b4204:
+// 0x010b4204: 0x10b4204: addiu v0, v0, -18584
 	ldloc 5
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc 5
-// 0x010b3bc0: 0x10b3bc0: sw    s0, 16(v0)
+// 0x010b4208: 0x10b4208: sw    s0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10456,7 +10456,7 @@ L_10b3bbc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b3bc4: 0x10b3bc4: sw    s3, 28(v0)
+// 0x010b420c: 0x10b420c: sw    s3, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10465,7 +10465,7 @@ L_10b3bbc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b3bc8: 0x10b3bc8: beq   s6, zero, 0x10b3bd8 sw    s2, 4(v0)
+// 0x010b4210: 0x10b4210: beq   s6, zero, 0x10b4220 sw    s2, 4(v0)
 	ldloc 16
 	ldloc 6
 	ldloc 5
@@ -10475,9 +10475,9 @@ L_10b3bbc:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_10b3bd8
+	brfalse L_10b4220
 // --- basic block ---
-// 0x010b3bd0: 0x10b3bd0: j	 0x10b3bf0 sw    s2, 44(v0)
+// 0x010b4218: 0x10b4218: j	 0x10b4238 sw    s2, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10486,10 +10486,10 @@ L_10b3bbc:
 	add
 	ldloc 9
 	stelem.i4
-	br L_10b3bf0
+	br L_10b4238
 // --- basic block ---
-L_10b3bd8:
-// 0x010b3bd8: 0x10b3bd8: j	 0x10b3bf0 sw    zero, 44(v0)
+L_10b4220:
+// 0x010b4220: 0x10b4220: j	 0x10b4238 sw    zero, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -10498,10 +10498,10 @@ L_10b3bd8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b3bf0
+	br L_10b4238
 // --- basic block ---
-L_10b3be0:
-// 0x010b3be0: 0x10b3be0: sw    zero, 44(s0)
+L_10b4228:
+// 0x010b4228: 0x10b4228: sw    zero, 44(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -10510,7 +10510,7 @@ L_10b3be0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b3be4: 0x10b3be4: sw    zero, 4(s0)
+// 0x010b422c: 0x10b422c: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -10519,7 +10519,7 @@ L_10b3be0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b3be8: 0x10b3be8: sw    zero, 16(s0)
+// 0x010b4230: 0x10b4230: sw    zero, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -10528,7 +10528,7 @@ L_10b3be0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b3bec: 0x10b3bec: sw    zero, 28(s0)
+// 0x010b4234: 0x10b4234: sw    zero, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -10537,17 +10537,17 @@ L_10b3be0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10b3bf0:
-// 0x010b3bf0: 0x10b3bf0: lw    ra, 164(sp)
-// 0x010b3bf4: 0x10b3bf4: lui   v0, 0xe0000
+L_10b4238:
+// 0x010b4238: 0x10b4238: lw    ra, 164(sp)
+// 0x010b423c: 0x10b423c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3bf8: 0x10b3bf8: addiu v0, v0, -19048
+// 0x010b4240: 0x10b4240: addiu v0, v0, -18584
 	ldloc 5
-	ldc.i4 -19048
+	ldc.i4 -18584
 	add
 	stloc 5
-// 0x010b3bfc: 0x10b3bfc: lw    s8, 160(sp)
+// 0x010b4244: 0x10b4244: lw    s8, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10556,7 +10556,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b3c00: 0x10b3c00: lw    s7, 156(sp)
+// 0x010b4248: 0x10b4248: lw    s7, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10565,7 +10565,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b3c04: 0x10b3c04: lw    s6, 152(sp)
+// 0x010b424c: 0x10b424c: lw    s6, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10574,7 +10574,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b3c08: 0x10b3c08: lw    s5, 148(sp)
+// 0x010b4250: 0x10b4250: lw    s5, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10583,7 +10583,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b3c0c: 0x10b3c0c: lw    s4, 144(sp)
+// 0x010b4254: 0x10b4254: lw    s4, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10592,7 +10592,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b3c10: 0x10b3c10: lw    s3, 140(sp)
+// 0x010b4258: 0x10b4258: lw    s3, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10601,7 +10601,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b3c14: 0x10b3c14: lw    s2, 136(sp)
+// 0x010b425c: 0x10b425c: lw    s2, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10610,7 +10610,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b3c18: 0x10b3c18: lw    s1, 132(sp)
+// 0x010b4260: 0x10b4260: lw    s1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10619,7 +10619,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b3c1c: 0x10b3c1c: lw    s0, 128(sp)
+// 0x010b4264: 0x10b4264: lw    s0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -10628,7 +10628,7 @@ L_10b3bf0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b3c20: 0x10b3c20: jr    ra addiu sp, sp, 168
+// 0x010b4268: 0x10b4268: jr    ra addiu sp, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
diff --git a/converted/Cibyl134.j b/converted/Cibyl134.j
index 428286a..eb2f0c5 100644
--- a/converted/Cibyl134.j
+++ b/converted/Cibyl134.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl134::.ctor
 
-.method public static int32 editor_marker_activate_10b3c28(int32)
+.method public static int32 editor_marker_activate_10b4270(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -61,16 +61,16 @@
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b3c28:
-// 0x010b3c28: 0x10b3c28: lui   v0, 0xe0000
+L_10b4270:
+// 0x010b4270: 0x10b4270: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b3c2c: 0x10b3c2c: jr    ra sw    a0, -18952(v0)
+// 0x010b4274: 0x10b4274: jr    ra sw    a0, -18488(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldloc.0
 	stelem.i4
@@ -79,7 +79,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_marker_reg_type_10b3c34(int32,int32,int32)
+.method public static int32 editor_marker_reg_type_10b427c(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -108,67 +108,67 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3c34: 0x10b3c34: lui   v1, 0xe0000
+// 0x010b427c: 0x10b427c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 4
-// 0x010b3c38: 0x10b3c38: lw    v0, -18956(v1)
+// 0x010b4280: 0x10b4280: lw    v0, -18492(v1)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4739
+	ldc.i4 -4623
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b3c3c: 0x10b3c3c: addiu a1, zero, 10
+// 0x010b4284: 0x10b4284: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x010b3c40: 0x10b3c40: bne   v0, a1, 0x10b3c50 lui   a2, 0xe0000
+// 0x010b4288: 0x10b4288: bne   v0, a1, 0x10b4298 lui   a2, 0xe0000
 	ldloc.3
 	ldloc.1
 	ldc.i4 917504
 	stloc.2
-	bne.un L_10b3c50
+	bne.un L_10b4298
 // --- basic block ---
-// 0x010b3c48: 0x10b3c48: jr    ra addiu v0, zero, -1
+// 0x010b4290: 0x10b4290: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.3
 	br __CIBYL_function_return
 // --- basic block ---
-L_10b3c50:
-// 0x010b3c50: 0x10b3c50: sll   a1, v0, 2
+L_10b4298:
+// 0x010b4298: 0x10b4298: sll   a1, v0, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010b3c54: 0x10b3c54: addiu a2, a2, -18996
+// 0x010b429c: 0x10b429c: addiu a2, a2, -18532
 	ldloc.2
-	ldc.i4 -18996
+	ldc.i4 -18532
 	add
 	stloc.2
-// 0x010b3c58: 0x10b3c58: addu  a2, a1, a2
+// 0x010b42a0: 0x10b42a0: addu  a2, a1, a2
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x010b3c5c: 0x10b3c5c: addiu a1, v0, 1
+// 0x010b42a4: 0x10b42a4: addiu a1, v0, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010b3c60: 0x10b3c60: sw    a0, 0(a2)
+// 0x010b42a8: 0x10b42a8: sw    a0, 0(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-// 0x010b3c64: 0x10b3c64: jr    ra sw    a1, -18956(v1)
+// 0x010b42ac: 0x10b42ac: jr    ra sw    a1, -18492(v1)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4739
+	ldc.i4 -4623
 	add
 	ldloc.1
 	stelem.i4
@@ -179,7 +179,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 editor_marker_items_pending_10b3c6c(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_items_pending_10b42b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -214,34 +214,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3c6c: 0x10b3c6c: lui   v0, 0xe0000
+// 0x010b42b4: 0x10b42b4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3c70: 0x10b3c70: lw    a0, -18952(v0)
+// 0x010b42b8: 0x10b42b8: lw    a0, -18488(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3c74: 0x10b3c74: addiu sp, sp, -24
+// 0x010b42bc: 0x10b42bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b3c78: 0x10b3c78: sw    ra, 20(sp)
-// 0x010b3c7c: 0x10b3c7c: jal   0x10b6a74 sll   zero, zero, 0
+// 0x010b42c0: 0x10b42c0: sw    ra, 20(sp)
+// 0x010b42c4: 0x10b42c4: jal   0x10b70bc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_items_pending_10b6a74(int32)
+	call int32 Cibyl136::editor_db_items_pending_10b70bc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b3c84: 0x10b3c84: lw    ra, 20(sp)
-// 0x010b3c88: 0x10b3c88: sll   zero, zero, 0
-// 0x010b3c8c: 0x10b3c8c: jr    ra addiu sp, sp, 24
+// 0x010b42cc: 0x10b42cc: lw    ra, 20(sp)
+// 0x010b42d0: 0x10b42d0: sll   zero, zero, 0
+// 0x010b42d4: 0x10b42d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -253,7 +253,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_committed_10b3cc0(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_committed_10b4308(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -288,41 +288,41 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3cc0: 0x10b3cc0: lui   v0, 0xe0000
+// 0x010b4308: 0x10b4308: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3cc4: 0x10b3cc4: addu  a1, a0, zero
+// 0x010b430c: 0x10b430c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b3cc8: 0x10b3cc8: lw    a0, -18952(v0)
+// 0x010b4310: 0x10b4310: lw    a0, -18488(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3ccc: 0x10b3ccc: addiu sp, sp, -24
+// 0x010b4314: 0x10b4314: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b3cd0: 0x10b3cd0: sw    ra, 20(sp)
-// 0x010b3cd4: 0x10b3cd4: jal   0x10b6a40 sll   zero, zero, 0
+// 0x010b4318: 0x10b4318: sw    ra, 20(sp)
+// 0x010b431c: 0x10b431c: jal   0x10b7088 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_item_committed_10b6a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_item_committed_10b7088(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b3cdc: 0x10b3cdc: lw    ra, 20(sp)
-// 0x010b3ce0: 0x10b3ce0: sll   zero, zero, 0
-// 0x010b3ce4: 0x10b3ce4: jr    ra addiu sp, sp, 24
+// 0x010b4324: 0x10b4324: lw    ra, 20(sp)
+// 0x010b4328: 0x10b4328: sll   zero, zero, 0
+// 0x010b432c: 0x10b432c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -334,7 +334,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_confirm_commit_10b3cec(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_confirm_commit_10b4334(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -369,41 +369,41 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3cec: 0x10b3cec: lui   v0, 0xe0000
+// 0x010b4334: 0x10b4334: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3cf0: 0x10b3cf0: addu  a1, a0, zero
+// 0x010b4338: 0x10b4338: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b3cf4: 0x10b3cf4: lw    a0, -18952(v0)
+// 0x010b433c: 0x10b433c: lw    a0, -18488(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3cf8: 0x10b3cf8: addiu sp, sp, -24
+// 0x010b4340: 0x10b4340: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b3cfc: 0x10b3cfc: sw    ra, 20(sp)
-// 0x010b3d00: 0x10b3d00: jal   0x10b6aa0 sll   zero, zero, 0
+// 0x010b4344: 0x10b4344: sw    ra, 20(sp)
+// 0x010b4348: 0x10b4348: jal   0x10b70e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_confirm_commit_10b6aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_confirm_commit_10b70e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b3d08: 0x10b3d08: lw    ra, 20(sp)
-// 0x010b3d0c: 0x10b3d0c: sll   zero, zero, 0
-// 0x010b3d10: 0x10b3d10: jr    ra addiu sp, sp, 24
+// 0x010b4350: 0x10b4350: lw    ra, 20(sp)
+// 0x010b4354: 0x10b4354: sll   zero, zero, 0
+// 0x010b4358: 0x10b4358: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -415,7 +415,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_begin_commit_10b3d18(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_begin_commit_10b4360(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -450,32 +450,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3d18: 0x10b3d18: lui   v0, 0xe0000
+// 0x010b4360: 0x10b4360: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3d1c: 0x10b3d1c: lw    a0, -18952(v0)
+// 0x010b4364: 0x10b4364: lw    a0, -18488(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3d20: 0x10b3d20: addiu sp, sp, -24
+// 0x010b4368: 0x10b4368: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b3d24: 0x10b3d24: sw    ra, 20(sp)
-// 0x010b3d28: 0x10b3d28: jal   0x10b6a34 sll   zero, zero, 0
+// 0x010b436c: 0x10b436c: sw    ra, 20(sp)
+// 0x010b4370: 0x10b4370: jal   0x10b707c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_begin_commit_10b6a34(int32)
+	call int32 Cibyl136::editor_db_begin_commit_10b707c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b3d30: 0x10b3d30: lw    ra, 20(sp)
-// 0x010b3d34: 0x10b3d34: sll   zero, zero, 0
-// 0x010b3d38: 0x10b3d38: jr    ra addiu sp, sp, 24
+// 0x010b4378: 0x10b4378: lw    ra, 20(sp)
+// 0x010b437c: 0x10b437c: sll   zero, zero, 0
+// 0x010b4380: 0x10b4380: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -487,7 +487,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_export_10b3dbc(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_export_10b4404(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -534,15 +534,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3dbc: 0x10b3dbc: addiu sp, sp, -48
+// 0x010b4404: 0x10b4404: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b3dc0: 0x10b3dc0: lui   v0, 0xe0000
+// 0x010b4408: 0x10b4408: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b3dc4: 0x10b3dc4: sw    s0, 28(sp)
+// 0x010b440c: 0x10b440c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -551,19 +551,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b3dc8: 0x10b3dc8: addu  s0, a0, zero
+// 0x010b4410: 0x10b4410: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b3dcc: 0x10b3dcc: lw    a0, -18952(v0)
+// 0x010b4414: 0x10b4414: lw    a0, -18488(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3dd0: 0x10b3dd0: sw    s3, 40(sp)
+// 0x010b4418: 0x10b4418: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -572,7 +572,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b3dd4: 0x10b3dd4: sw    s2, 36(sp)
+// 0x010b441c: 0x10b441c: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -581,7 +581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b3dd8: 0x10b3dd8: sw    s1, 32(sp)
+// 0x010b4420: 0x10b4420: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -590,23 +590,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b3ddc: 0x10b3ddc: addu  s3, a1, zero
+// 0x010b4424: 0x10b4424: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010b3de0: 0x10b3de0: addu  s2, a2, zero
+// 0x010b4428: 0x10b4428: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010b3de4: 0x10b3de4: addu  s1, a3, zero
+// 0x010b442c: 0x10b442c: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x010b3de8: 0x10b3de8: addu  a1, s0, zero
+// 0x010b4430: 0x10b4430: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010b3dec: 0x10b3dec: addu  a2, zero, zero
+// 0x010b4434: 0x10b4434: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b3df0: 0x10b3df0: sw    ra, 44(sp)
-// 0x010b3df4: 0x10b3df4: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4438: 0x10b4438: sw    ra, 44(sp)
+// 0x010b443c: 0x10b443c: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -614,36 +614,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b3dfc: 0x10b3dfc: lbu   v1, 26(v0)
+// 0x010b4444: 0x10b4444: lbu   v1, 26(v0)
 	ldloc 6
 	ldc.i4.s 26
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x010b3e00: 0x10b3e00: lui   v0, 0xe0000
+// 0x010b4448: 0x10b4448: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b3e04: 0x10b3e04: sll   v1, v1, 2
+// 0x010b444c: 0x10b444c: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010b3e08: 0x10b3e08: addiu v0, v0, -18996
+// 0x010b4450: 0x10b4450: addiu v0, v0, -18532
 	ldloc 6
-	ldc.i4 -18996
+	ldc.i4 -18532
 	add
 	stloc 6
-// 0x010b3e0c: 0x10b3e0c: addu  v0, v1, v0
+// 0x010b4454: 0x10b4454: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x010b3e10: 0x10b3e10: lw    v1, 64(sp)
+// 0x010b4458: 0x10b4458: lw    v1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -652,14 +652,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3e14: 0x10b3e14: lw    v0, 0(v0)
+// 0x010b445c: 0x10b445c: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b3e18: 0x10b3e18: sw    v1, 16(sp)
+// 0x010b4460: 0x10b4460: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -668,7 +668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b3e1c: 0x10b3e1c: lw    v1, 68(sp)
+// 0x010b4464: 0x10b4464: lw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -677,10 +677,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3e20: 0x10b3e20: addu  a0, s0, zero
+// 0x010b4468: 0x10b4468: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b3e24: 0x10b3e24: sw    v1, 20(sp)
+// 0x010b446c: 0x10b446c: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -689,7 +689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b3e28: 0x10b3e28: lw    v0, 4(v0)
+// 0x010b4470: 0x10b4470: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -698,13 +698,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b3e2c: 0x10b3e2c: addu  a1, s3, zero
+// 0x010b4474: 0x10b4474: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010b3e30: 0x10b3e30: addu  a2, s2, zero
+// 0x010b4478: 0x10b4478: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010b3e34: 0x10b3e34: jalr  v0 addu  a3, s1, zero
+// 0x010b447c: 0x10b447c: jalr  v0 addu  a3, s1, zero
 	ldloc 6
 	ldloc 9
 	stloc 4
@@ -718,8 +718,8 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b3e3c: 0x10b3e3c: lw    ra, 44(sp)
-// 0x010b3e40: 0x10b3e40: lw    s3, 40(sp)
+// 0x010b4484: 0x10b4484: lw    ra, 44(sp)
+// 0x010b4488: 0x10b4488: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -728,7 +728,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b3e44: 0x10b3e44: lw    s2, 36(sp)
+// 0x010b448c: 0x10b448c: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -737,7 +737,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b3e48: 0x10b3e48: lw    s1, 32(sp)
+// 0x010b4490: 0x10b4490: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -746,7 +746,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b3e4c: 0x10b3e4c: lw    s0, 28(sp)
+// 0x010b4494: 0x10b4494: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -755,7 +755,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b3e50: 0x10b3e50: jr    ra addiu sp, sp, 48
+// 0x010b4498: 0x10b4498: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -767,7 +767,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_marker_type_10b3eb8(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_type_10b4500(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -802,31 +802,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3eb8: 0x10b3eb8: lui   v0, 0xe0000
+// 0x010b4500: 0x10b4500: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3ebc: 0x10b3ebc: addu  a1, a0, zero
+// 0x010b4504: 0x10b4504: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b3ec0: 0x10b3ec0: lw    a0, -18952(v0)
+// 0x010b4508: 0x10b4508: lw    a0, -18488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3ec4: 0x10b3ec4: addiu sp, sp, -24
+// 0x010b450c: 0x10b450c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b3ec8: 0x10b3ec8: addu  a2, zero, zero
+// 0x010b4510: 0x10b4510: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b3ecc: 0x10b3ecc: sw    ra, 20(sp)
-// 0x010b3ed0: 0x10b3ed0: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4514: 0x10b4514: sw    ra, 20(sp)
+// 0x010b4518: 0x10b4518: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -834,51 +834,51 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b3ed8: 0x10b3ed8: lbu   v1, 26(v0)
+// 0x010b4520: 0x10b4520: lbu   v1, 26(v0)
 	ldloc 5
 	ldc.i4.s 26
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x010b3edc: 0x10b3edc: lui   v0, 0xe0000
+// 0x010b4524: 0x10b4524: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b3ee0: 0x10b3ee0: sll   v1, v1, 2
+// 0x010b4528: 0x10b4528: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010b3ee4: 0x10b3ee4: addiu v0, v0, -18996
+// 0x010b452c: 0x10b452c: addiu v0, v0, -18532
 	ldloc 5
-	ldc.i4 -18996
+	ldc.i4 -18532
 	add
 	stloc 5
-// 0x010b3ee8: 0x10b3ee8: addu  v0, v1, v0
+// 0x010b4530: 0x10b4530: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010b3eec: 0x10b3eec: lw    v0, 0(v0)
+// 0x010b4534: 0x10b4534: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b3ef0: 0x10b3ef0: lw    ra, 20(sp)
-// 0x010b3ef4: 0x10b3ef4: lw    v0, 0(v0)
+// 0x010b4538: 0x10b4538: lw    ra, 20(sp)
+// 0x010b453c: 0x10b453c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b3ef8: 0x10b3ef8: jr    ra addiu sp, sp, 24
+// 0x010b4540: 0x10b4540: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -890,7 +890,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_position_10b3f00(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_position_10b4548(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -931,27 +931,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b3f00: 0x10b3f00: lui   v1, 0xe0000
+// 0x010b4548: 0x10b4548: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b3f04: 0x10b3f04: addiu sp, sp, -32
+// 0x010b454c: 0x10b454c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b3f08: 0x10b3f08: addu  v0, a0, zero
+// 0x010b4550: 0x10b4550: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b3f0c: 0x10b3f0c: lw    a0, -18952(v1)
+// 0x010b4554: 0x10b4554: lw    a0, -18488(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b3f10: 0x10b3f10: sw    s1, 24(sp)
+// 0x010b4558: 0x10b4558: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -960,7 +960,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b3f14: 0x10b3f14: sw    s0, 20(sp)
+// 0x010b455c: 0x10b455c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -969,20 +969,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b3f18: 0x10b3f18: addu  s1, a1, zero
+// 0x010b4560: 0x10b4560: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010b3f1c: 0x10b3f1c: addu  s0, a2, zero
+// 0x010b4564: 0x10b4564: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010b3f20: 0x10b3f20: addu  a1, v0, zero
+// 0x010b4568: 0x10b4568: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b3f24: 0x10b3f24: addu  a2, zero, zero
+// 0x010b456c: 0x10b456c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b3f28: 0x10b3f28: sw    ra, 28(sp)
-// 0x010b3f2c: 0x10b3f2c: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4570: 0x10b4570: sw    ra, 28(sp)
+// 0x010b4574: 0x10b4574: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -990,12 +990,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b3f34: 0x10b3f34: lw    v1, 8(v0)
+// 0x010b457c: 0x10b457c: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1004,15 +1004,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3f38: 0x10b3f38: sll   zero, zero, 0
-// 0x010b3f3c: 0x10b3f3c: sw    v1, 0(s1)
+// 0x010b4580: 0x10b4580: sll   zero, zero, 0
+// 0x010b4584: 0x10b4584: sw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b3f40: 0x10b3f40: lw    v1, 12(v0)
+// 0x010b4588: 0x10b4588: lw    v1, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1021,7 +1021,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b3f44: 0x10b3f44: beq   s0, zero, 0x10b3f58 sw    v1, 4(s1)
+// 0x010b458c: 0x10b458c: beq   s0, zero, 0x10b45a0 sw    v1, 4(s1)
 	ldloc 8
 	ldloc 5
 	ldloc 9
@@ -1031,25 +1031,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_10b3f58
+	brfalse L_10b45a0
 // --- basic block ---
-// 0x010b3f4c: 0x10b3f4c: lh    v0, 24(v0)
+// 0x010b4594: 0x10b4594: lh    v0, 24(v0)
 	ldloc 6
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x010b3f50: 0x10b3f50: sll   zero, zero, 0
-// 0x010b3f54: 0x10b3f54: sw    v0, 0(s0)
+// 0x010b4598: 0x10b4598: sll   zero, zero, 0
+// 0x010b459c: 0x10b459c: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b3f58:
-// 0x010b3f58: 0x10b3f58: lw    ra, 28(sp)
-// 0x010b3f5c: 0x10b3f5c: lw    s1, 24(sp)
+L_10b45a0:
+// 0x010b45a0: 0x10b45a0: lw    ra, 28(sp)
+// 0x010b45a4: 0x10b45a4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1058,7 +1058,7 @@ L_10b3f58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b3f60: 0x10b3f60: lw    s0, 20(sp)
+// 0x010b45a8: 0x10b45a8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1067,7 +1067,7 @@ L_10b3f58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b3f64: 0x10b3f64: jr    ra addiu sp, sp, 32
+// 0x010b45ac: 0x10b45ac: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1079,7 +1079,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_marker_note_10b400c(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_note_10b4654(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1114,31 +1114,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b400c: 0x10b400c: lui   v0, 0xe0000
+// 0x010b4654: 0x10b4654: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4010: 0x10b4010: addu  a1, a0, zero
+// 0x010b4658: 0x10b4658: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b4014: 0x10b4014: lw    a0, -18952(v0)
+// 0x010b465c: 0x10b465c: lw    a0, -18488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4018: 0x10b4018: addiu sp, sp, -24
+// 0x010b4660: 0x10b4660: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b401c: 0x10b401c: addu  a2, zero, zero
+// 0x010b4664: 0x10b4664: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4020: 0x10b4020: sw    ra, 20(sp)
-// 0x010b4024: 0x10b4024: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4668: 0x10b4668: sw    ra, 20(sp)
+// 0x010b466c: 0x10b466c: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1146,12 +1146,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b402c: 0x10b402c: lw    a0, 16(v0)
+// 0x010b4674: 0x10b4674: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1160,41 +1160,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4030: 0x10b4030: ori   v0, zero, 65535
+// 0x010b4678: 0x10b4678: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x010b4034: 0x10b4034: bne   a0, v0, 0x10b4044 lui   v0, 0x10000
+// 0x010b467c: 0x10b467c: bne   a0, v0, 0x10b468c lui   v0, 0x10000
 	ldloc.1
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	bne.un L_10b4044
+	bne.un L_10b468c
 // --- basic block ---
-// 0x010b403c: 0x10b403c: j	 0x10b404c addiu v0, v0, 18500
+// 0x010b4684: 0x10b4684: j	 0x10b4694 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_10b404c
+	br L_10b4694
 // --- basic block ---
-L_10b4044:
-// 0x010b4044: 0x10b4044: jal   0x10b4338 sll   zero, zero, 0
+L_10b468c:
+// 0x010b468c: 0x10b468c: jal   0x10b4980 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_get_10b4338(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_get_10b4980(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10b404c:
-// 0x010b404c: 0x10b404c: lw    ra, 20(sp)
-// 0x010b4050: 0x10b4050: sll   zero, zero, 0
-// 0x010b4054: 0x10b4054: jr    ra addiu sp, sp, 24
+L_10b4694:
+// 0x010b4694: 0x10b4694: lw    ra, 20(sp)
+// 0x010b4698: 0x10b4698: sll   zero, zero, 0
+// 0x010b469c: 0x10b469c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1206,7 +1206,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 edit_marker_icon_10b405c(int32,int32,int32,int32,int32)
+.method public static int32 edit_marker_icon_10b46a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1241,31 +1241,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b405c: 0x10b405c: lui   v0, 0xe0000
+// 0x010b46a4: 0x10b46a4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4060: 0x10b4060: addu  a1, a0, zero
+// 0x010b46a8: 0x10b46a8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b4064: 0x10b4064: lw    a0, -18952(v0)
+// 0x010b46ac: 0x10b46ac: lw    a0, -18488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4068: 0x10b4068: addiu sp, sp, -24
+// 0x010b46b0: 0x10b46b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b406c: 0x10b406c: addu  a2, zero, zero
+// 0x010b46b4: 0x10b46b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4070: 0x10b4070: sw    ra, 20(sp)
-// 0x010b4074: 0x10b4074: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b46b8: 0x10b46b8: sw    ra, 20(sp)
+// 0x010b46bc: 0x10b46bc: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1273,12 +1273,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b407c: 0x10b407c: lw    a0, 20(v0)
+// 0x010b46c4: 0x10b46c4: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1287,41 +1287,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4080: 0x10b4080: ori   v0, zero, 65535
+// 0x010b46c8: 0x10b46c8: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x010b4084: 0x10b4084: bne   a0, v0, 0x10b4094 lui   v0, 0x10000
+// 0x010b46cc: 0x10b46cc: bne   a0, v0, 0x10b46dc lui   v0, 0x10000
 	ldloc.1
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	bne.un L_10b4094
+	bne.un L_10b46dc
 // --- basic block ---
-// 0x010b408c: 0x10b408c: j	 0x10b409c addiu v0, v0, 18500
+// 0x010b46d4: 0x10b46d4: j	 0x10b46e4 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_10b409c
+	br L_10b46e4
 // --- basic block ---
-L_10b4094:
-// 0x010b4094: 0x10b4094: jal   0x10b4338 sll   zero, zero, 0
+L_10b46dc:
+// 0x010b46dc: 0x10b46dc: jal   0x10b4980 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_get_10b4338(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_get_10b4980(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10b409c:
-// 0x010b409c: 0x10b409c: lw    ra, 20(sp)
-// 0x010b40a0: 0x10b40a0: sll   zero, zero, 0
-// 0x010b40a4: 0x10b40a4: jr    ra addiu sp, sp, 24
+L_10b46e4:
+// 0x010b46e4: 0x10b46e4: lw    ra, 20(sp)
+// 0x010b46e8: 0x10b46e8: sll   zero, zero, 0
+// 0x010b46ec: 0x10b46ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1333,7 +1333,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_is_obsolete_10b4190(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_is_obsolete_10b47d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1371,34 +1371,34 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4190: 0x10b4190: lui   v0, 0xe0000
+// 0x010b47d8: 0x10b47d8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4194: 0x10b4194: addu  a1, a0, zero
+// 0x010b47dc: 0x10b47dc: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b4198: 0x10b4198: lw    a0, -18952(v0)
+// 0x010b47e0: 0x10b47e0: lw    a0, -18488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b419c: 0x10b419c: addiu sp, sp, -32
+// 0x010b47e4: 0x10b47e4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b41a0: 0x10b41a0: addu  a2, zero, zero
+// 0x010b47e8: 0x10b47e8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b41a4: 0x10b41a4: addu  a3, zero, zero
+// 0x010b47ec: 0x10b47ec: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b41a8: 0x10b41a8: sw    ra, 28(sp)
-// 0x010b41ac: 0x10b41ac: jal   0x10b6f58 sw    s0, 24(sp)
+// 0x010b47f0: 0x10b47f0: sw    ra, 28(sp)
+// 0x010b47f4: 0x10b47f4: jal   0x10b75a0 sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1412,15 +1412,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b41b4: 0x10b41b4: addu  s0, v0, zero
+// 0x010b47fc: 0x10b47fc: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010b41b8: 0x10b41b8: lw    v0, 8(v0)
+// 0x010b4800: 0x10b4800: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1429,12 +1429,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b41bc: 0x10b41bc: addiu a1, sp, 16
+// 0x010b4804: 0x10b4804: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b41c0: 0x10b41c0: sw    v0, 16(sp)
+// 0x010b4808: 0x10b4808: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1443,7 +1443,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b41c4: 0x10b41c4: lw    v0, 12(s0)
+// 0x010b480c: 0x10b480c: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1452,10 +1452,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b41c8: 0x10b41c8: addu  a0, zero, zero
+// 0x010b4810: 0x10b4810: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b41cc: 0x10b41cc: jal   0x100c63c sw    v0, 20(sp)
+// 0x010b4814: 0x10b4814: jal   0x100c64c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1469,12 +1469,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b41d4: 0x10b41d4: jal   0x100b50c addu  a0, v0, zero
+// 0x010b481c: 0x10b481c: jal   0x100b51c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1482,25 +1482,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b41dc: 0x10b41dc: lw    v1, 0(s0)
+// 0x010b4824: 0x10b4824: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b41e0: 0x10b41e0: lw    ra, 28(sp)
-// 0x010b41e4: 0x10b41e4: slt   v0, v1, v0
+// 0x010b4828: 0x10b4828: lw    ra, 28(sp)
+// 0x010b482c: 0x10b482c: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b41e8: 0x10b41e8: lw    s0, 24(sp)
+// 0x010b4830: 0x10b4830: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1509,7 +1509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b41ec: 0x10b41ec: jr    ra addiu sp, sp, 32
+// 0x010b4834: 0x10b4834: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1521,7 +1521,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_count_10b41f4(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_count_10b483c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1556,39 +1556,39 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b41f4: 0x10b41f4: lui   v0, 0xe0000
+// 0x010b483c: 0x10b483c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b41f8: 0x10b41f8: lw    a0, -18952(v0)
+// 0x010b4840: 0x10b4840: lw    a0, -18488(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b41fc: 0x10b41fc: addiu sp, sp, -24
+// 0x010b4844: 0x10b4844: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4200: 0x10b4200: sw    ra, 20(sp)
-// 0x010b4204: 0x10b4204: beq   a0, zero, 0x10b4214 addu  v0, zero, zero
+// 0x010b4848: 0x10b4848: sw    ra, 20(sp)
+// 0x010b484c: 0x10b484c: beq   a0, zero, 0x10b485c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10b4214
+	brfalse L_10b485c
 // --- basic block ---
-// 0x010b420c: 0x10b420c: jal   0x10b6a20 sll   zero, zero, 0
+// 0x010b4854: 0x10b4854: jal   0x10b7068 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 5
 // --- basic block ---
-L_10b4214:
-// 0x010b4214: 0x10b4214: lw    ra, 20(sp)
-// 0x010b4218: 0x10b4218: sll   zero, zero, 0
-// 0x010b421c: 0x10b421c: jr    ra addiu sp, sp, 24
+L_10b485c:
+// 0x010b485c: 0x10b485c: lw    ra, 20(sp)
+// 0x010b4860: 0x10b4860: sll   zero, zero, 0
+// 0x010b4864: 0x10b4864: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1600,7 +1600,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_marker_add_10b4224(int32,int32,int32,int32,int32)
+.method public static int32 editor_marker_add_10b486c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s5,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -1653,12 +1653,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4224: 0x10b4224: addiu sp, sp, -96
+// 0x010b486c: 0x10b486c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010b4228: 0x10b4228: sw    s5, 88(sp)
+// 0x010b4870: 0x10b4870: sw    s5, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1667,7 +1667,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b422c: 0x10b422c: sw    s4, 84(sp)
+// 0x010b4874: 0x10b4874: sw    s4, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1676,7 +1676,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b4230: 0x10b4230: sw    s3, 80(sp)
+// 0x010b4878: 0x10b4878: sw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1685,7 +1685,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b4234: 0x10b4234: sw    s2, 76(sp)
+// 0x010b487c: 0x10b487c: sw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1694,7 +1694,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b4238: 0x10b4238: sw    s1, 72(sp)
+// 0x010b4880: 0x10b4880: sw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1703,7 +1703,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b423c: 0x10b423c: sw    s0, 68(sp)
+// 0x010b4884: 0x10b4884: sw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1712,11 +1712,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4240: 0x10b4240: sw    ra, 92(sp)
-// 0x010b4244: 0x10b4244: addu  s1, a0, zero
+// 0x010b4888: 0x10b4888: sw    ra, 92(sp)
+// 0x010b488c: 0x10b488c: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010b4248: 0x10b4248: lw    s3, 120(sp)
+// 0x010b4890: 0x10b4890: lw    s3, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1725,7 +1725,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b424c: 0x10b424c: lw    s2, 124(sp)
+// 0x010b4894: 0x10b4894: lw    s2, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1734,72 +1734,72 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b4250: 0x10b4250: lbu   s4, 115(sp)
+// 0x010b4898: 0x10b4898: lbu   s4, 115(sp)
 	ldloc.0
 	ldc.i4.s 115
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 13
-// 0x010b4254: 0x10b4254: lbu   s5, 119(sp)
+// 0x010b489c: 0x10b489c: lbu   s5, 119(sp)
 	ldloc.0
 	ldc.i4.s 119
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x010b4258: 0x10b4258: addu  s0, a1, zero
+// 0x010b48a0: 0x10b48a0: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-L_10b425c:
-// 0x010b425c: 0x10b425c: bltz  a2, 0x10b425c addiu a2, a2, 360
+L_10b48a4:
+// 0x010b48a4: 0x10b48a4: bltz  a2, 0x10b48a4 addiu a2, a2, 360
 	ldloc.3
 	ldloc.3
 	ldc.i4 360
 	add
 	stloc.3
 	ldc.i4.s 0
-	blt L_10b425c
+	blt L_10b48a4
 // --- basic block ---
-// 0x010b4264: 0x10b4264: addiu a2, a2, -360
+// 0x010b48ac: 0x10b48ac: addiu a2, a2, -360
 	ldloc.3
 	ldc.i4 -360
 	add
 	stloc.3
-// 0x010b4268: 0x10b4268: j	 0x10b4274 slti  v0, a2, 360
+// 0x010b48b0: 0x10b48b0: j	 0x10b48bc slti  v0, a2, 360
 	ldloc.3
 	ldc.i4 360
 	clt
 	stloc 6
-	br L_10b4274
+	br L_10b48bc
 // --- basic block ---
-L_10b4270:
-// 0x010b4270: 0x10b4270: slti  v0, a2, 360
+L_10b48b8:
+// 0x010b48b8: 0x10b48b8: slti  v0, a2, 360
 	ldloc.3
 	ldc.i4 360
 	clt
 	stloc 6
-L_10b4274:
-// 0x010b4274: 0x10b4274: beq   v0, zero, 0x10b4270 addiu a2, a2, -360
+L_10b48bc:
+// 0x010b48bc: 0x10b48bc: beq   v0, zero, 0x10b48b8 addiu a2, a2, -360
 	ldloc 6
 	ldloc.3
 	ldc.i4 -360
 	add
 	stloc.3
-	brfalse L_10b4270
+	brfalse L_10b48b8
 // --- basic block ---
-// 0x010b427c: 0x10b427c: addiu a2, a2, 360
+// 0x010b48c4: 0x10b48c4: addiu a2, a2, 360
 	ldloc.3
 	ldc.i4 360
 	add
 	stloc.3
-// 0x010b4280: 0x10b4280: addiu a1, sp, 16
+// 0x010b48c8: 0x10b48c8: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b4284: 0x10b4284: addu  a0, zero, zero
+// 0x010b48cc: 0x10b48cc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b4288: 0x10b4288: sw    a2, 56(sp)
+// 0x010b48d0: 0x10b48d0: sw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1808,7 +1808,7 @@ L_10b4274:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b428c: 0x10b428c: sw    a3, 60(sp)
+// 0x010b48d4: 0x10b48d4: sw    a3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1817,7 +1817,7 @@ L_10b4274:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b4290: 0x10b4290: sw    s1, 16(sp)
+// 0x010b48d8: 0x10b48d8: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1826,7 +1826,7 @@ L_10b4274:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4294: 0x10b4294: jal   0x100c63c sw    s0, 20(sp)
+// 0x010b48dc: 0x10b48dc: jal   0x100c64c sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1840,12 +1840,12 @@ L_10b4274:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b429c: 0x10b429c: jal   0x100b50c addu  a0, v0, zero
+// 0x010b48e4: 0x10b48e4: jal   0x100b51c addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -1853,12 +1853,12 @@ L_10b4274:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b42a4: 0x10b42a4: lw    a2, 56(sp)
+// 0x010b48ec: 0x10b48ec: lw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1867,7 +1867,7 @@ L_10b4274:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b42a8: 0x10b42a8: lw    a3, 60(sp)
+// 0x010b48f0: 0x10b48f0: lw    a3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1876,12 +1876,12 @@ L_10b4274:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b42ac: 0x10b42ac: ori   s5, s5, 1
+// 0x010b48f4: 0x10b48f4: ori   s5, s5, 1
 	ldloc 7
 	ldc.i4.1
 	or
 	stloc 7
-// 0x010b42b0: 0x10b42b0: sw    v0, 24(sp)
+// 0x010b48f8: 0x10b48f8: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1890,7 +1890,7 @@ L_10b4274:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b42b4: 0x10b42b4: sw    s1, 32(sp)
+// 0x010b48fc: 0x10b48fc: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1899,7 +1899,7 @@ L_10b4274:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b42b8: 0x10b42b8: sw    s0, 36(sp)
+// 0x010b4900: 0x10b4900: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1908,13 +1908,13 @@ L_10b4274:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b42bc: 0x10b42bc: sh    a2, 48(sp)
+// 0x010b4904: 0x10b4904: sh    a2, 48(sp)
 	ldloc.0
 	ldc.i4.s 48
 	add
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010b42c0: 0x10b42c0: sw    a3, 28(sp)
+// 0x010b4908: 0x10b4908: sw    a3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1923,27 +1923,27 @@ L_10b4274:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b42c4: 0x10b42c4: sb    s4, 50(sp)
+// 0x010b490c: 0x10b490c: sb    s4, 50(sp)
 	ldloc.0
 	ldc.i4.s 50
 	add
 	ldloc 13
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b42c8: 0x10b42c8: sb    s5, 51(sp)
+// 0x010b4910: 0x10b4910: sb    s5, 51(sp)
 	ldloc.0
 	ldc.i4.s 51
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b42cc: 0x10b42cc: beq   s3, zero, 0x10b42dc ori   v0, zero, 65535
+// 0x010b4914: 0x10b4914: beq   s3, zero, 0x10b4924 ori   v0, zero, 65535
 	ldloc 12
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-	brfalse L_10b42dc
+	brfalse L_10b4924
 // --- basic block ---
-// 0x010b42d4: 0x10b42d4: jal   0x10b441c addu  a0, s3, zero
+// 0x010b491c: 0x10b491c: jal   0x10b4a64 addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -1951,13 +1951,13 @@ L_10b4274:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10b42dc:
-// 0x010b42dc: 0x10b42dc: sw    v0, 40(sp)
+L_10b4924:
+// 0x010b4924: 0x10b4924: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1966,15 +1966,15 @@ L_10b42dc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b42e0: 0x10b42e0: beq   s2, zero, 0x10b42f0 ori   v0, zero, 65535
+// 0x010b4928: 0x10b4928: beq   s2, zero, 0x10b4938 ori   v0, zero, 65535
 	ldloc 11
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-	brfalse L_10b42f0
+	brfalse L_10b4938
 // --- basic block ---
-// 0x010b42e8: 0x10b42e8: jal   0x10b441c addu  a0, s2, zero
+// 0x010b4930: 0x10b4930: jal   0x10b4a64 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -1982,13 +1982,13 @@ L_10b42dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10b42f0:
-// 0x010b42f0: 0x10b42f0: sw    v0, 44(sp)
+L_10b4938:
+// 0x010b4938: 0x10b4938: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1997,24 +1997,24 @@ L_10b42f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b42f4: 0x10b42f4: lui   v0, 0xe0000
+// 0x010b493c: 0x10b493c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b42f8: 0x10b42f8: lw    a0, -18952(v0)
+// 0x010b4940: 0x10b4940: lw    a0, -18488(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4738
+	ldc.i4 -4622
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b42fc: 0x10b42fc: addiu a1, sp, 24
+// 0x010b4944: 0x10b4944: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010b4300: 0x10b4300: jal   0x10b72a4 addiu a2, zero, 1
+// 0x010b4948: 0x10b4948: jal   0x10b78ec addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -2022,13 +2022,13 @@ L_10b42f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b4308: 0x10b4308: lw    ra, 92(sp)
-// 0x010b430c: 0x10b430c: lw    s5, 88(sp)
+// 0x010b4950: 0x10b4950: lw    ra, 92(sp)
+// 0x010b4954: 0x10b4954: lw    s5, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2037,7 +2037,7 @@ L_10b42f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4310: 0x10b4310: lw    s4, 84(sp)
+// 0x010b4958: 0x10b4958: lw    s4, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2046,7 +2046,7 @@ L_10b42f0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b4314: 0x10b4314: lw    s3, 80(sp)
+// 0x010b495c: 0x10b495c: lw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2055,7 +2055,7 @@ L_10b42f0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b4318: 0x10b4318: lw    s2, 76(sp)
+// 0x010b4960: 0x10b4960: lw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2064,7 +2064,7 @@ L_10b42f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b431c: 0x10b431c: lw    s1, 72(sp)
+// 0x010b4964: 0x10b4964: lw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2073,7 +2073,7 @@ L_10b42f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b4320: 0x10b4320: lw    s0, 68(sp)
+// 0x010b4968: 0x10b4968: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2082,7 +2082,7 @@ L_10b42f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b4324: 0x10b4324: jr    ra addiu sp, sp, 96
+// 0x010b496c: 0x10b496c: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -2094,7 +2094,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_dictionary_activate_10b432c(int32)
+.method public static int32 editor_dictionary_activate_10b4974(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2114,16 +2114,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b432c:
-// 0x010b432c: 0x10b432c: lui   v0, 0xe0000
+L_10b4974:
+// 0x010b4974: 0x10b4974: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b4330: 0x10b4330: jr    ra sw    a0, -18948(v0)
+// 0x010b4978: 0x10b4978: jr    ra sw    a0, -18484(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldloc.0
 	stelem.i4
@@ -2132,7 +2132,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_dictionary_get_10b4338(int32,int32,int32,int32,int32)
+.method public static int32 editor_dictionary_get_10b4980(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -2170,12 +2170,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4338: 0x10b4338: addiu sp, sp, -32
+// 0x010b4980: 0x10b4980: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b433c: 0x10b433c: sw    s0, 24(sp)
+// 0x010b4984: 0x10b4984: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2184,22 +2184,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b4340: 0x10b4340: lui   s0, 0xe0000
+// 0x010b4988: 0x10b4988: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b4344: 0x10b4344: addu  a1, a0, zero
+// 0x010b498c: 0x10b498c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b4348: 0x10b4348: lw    a0, -18948(s0)
+// 0x010b4990: 0x10b4990: lw    a0, -18484(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b434c: 0x10b434c: sw    a1, 16(sp)
+// 0x010b4994: 0x10b4994: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2208,13 +2208,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b4350: 0x10b4350: sw    ra, 28(sp)
-// 0x010b4354: 0x10b4354: jal   0x10b6a20 sll   zero, zero, 0
+// 0x010b4998: 0x10b4998: sw    ra, 28(sp)
+// 0x010b499c: 0x10b499c: jal   0x10b7068 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 6
 // --- basic block ---
-// 0x010b435c: 0x10b435c: lw    a1, 16(sp)
+// 0x010b49a4: 0x10b49a4: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2223,35 +2223,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b4360: 0x10b4360: sll   zero, zero, 0
-// 0x010b4364: 0x10b4364: slt   v0, a1, v0
+// 0x010b49a8: 0x10b49a8: sll   zero, zero, 0
+// 0x010b49ac: 0x10b49ac: slt   v0, a1, v0
 	ldloc.2
 	ldloc 6
 	clt
 	stloc 6
-// 0x010b4368: 0x10b4368: beq   v0, zero, 0x10b4384 addu  v0, zero, zero
+// 0x010b49b0: 0x10b49b0: beq   v0, zero, 0x10b49cc addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10b4384
+	brfalse L_10b49cc
 // --- basic block ---
-// 0x010b4370: 0x10b4370: bltz  a1, 0x10b4384 addu  a2, zero, zero
+// 0x010b49b8: 0x10b49b8: bltz  a1, 0x10b49cc addu  a2, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.3
 	ldc.i4.s 0
-	blt L_10b4384
+	blt L_10b49cc
 // --- basic block ---
-// 0x010b4378: 0x10b4378: lw    a0, -18948(s0)
+// 0x010b49c0: 0x10b49c0: lw    a0, -18484(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b437c: 0x10b437c: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b49c4: 0x10b49c4: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2259,14 +2259,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10b4384:
-// 0x010b4384: 0x10b4384: lw    ra, 28(sp)
-// 0x010b4388: 0x10b4388: lw    s0, 24(sp)
+L_10b49cc:
+// 0x010b49cc: 0x10b49cc: lw    ra, 28(sp)
+// 0x010b49d0: 0x10b49d0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2275,7 +2275,7 @@ L_10b4384:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b438c: 0x10b438c: jr    ra addiu sp, sp, 32
+// 0x010b49d4: 0x10b49d4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2287,7 +2287,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_dictionary_locate_10b4394(int32,int32,int32,int32,int32)
+.method public static int32 editor_dictionary_locate_10b49dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s2,int32 s1,int32 v1,int32 ra)
@@ -2331,12 +2331,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4394: 0x10b4394: addiu sp, sp, -32
+// 0x010b49dc: 0x10b49dc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b4398: 0x10b4398: sw    s1, 20(sp)
+// 0x010b49e0: 0x10b49e0: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2345,8 +2345,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b439c: 0x10b439c: sw    ra, 28(sp)
-// 0x010b43a0: 0x10b43a0: sw    s2, 24(sp)
+// 0x010b49e4: 0x10b49e4: sw    ra, 28(sp)
+// 0x010b49e8: 0x10b49e8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2355,7 +2355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b43a4: 0x10b43a4: sw    s0, 16(sp)
+// 0x010b49ec: 0x10b49ec: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2364,61 +2364,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b43a8: 0x10b43a8: beq   a0, zero, 0x10b43fc addu  s1, a0, zero
+// 0x010b49f0: 0x10b49f0: beq   a0, zero, 0x10b4a44 addu  s1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 9
-	brfalse L_10b43fc
+	brfalse L_10b4a44
 // --- basic block ---
-// 0x010b43b0: 0x10b43b0: lui   s2, 0xe0000
+// 0x010b49f8: 0x10b49f8: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b43b4: 0x10b43b4: lw    a0, -18948(s2)
+// 0x010b49fc: 0x10b49fc: lw    a0, -18484(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b43b8: 0x10b43b8: jal   0x10b6a20 sll   zero, zero, 0
+// 0x010b4a00: 0x10b4a00: jal   0x10b7068 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 7
 // --- basic block ---
-// 0x010b43c0: 0x10b43c0: j	 0x10b43ec addiu s0, v0, -1
+// 0x010b4a08: 0x10b4a08: j	 0x10b4a34 addiu s0, v0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 6
-	br L_10b43ec
+	br L_10b4a34
 // --- basic block ---
-L_10b43c8:
-// 0x010b43c8: 0x10b43c8: lw    a0, -18948(s2)
+L_10b4a10:
+// 0x010b4a10: 0x10b4a10: lw    a0, -18484(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b43cc: 0x10b43cc: jal   0x10b6f58 sll   zero, zero, 0
+// 0x010b4a14: 0x10b4a14: jal   0x10b75a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x010b43d4: 0x10b43d4: addu  a1, v0, zero
+// 0x010b4a1c: 0x10b4a1c: addu  a1, v0, zero
 	ldloc 7
 	stloc.2
-// 0x010b43d8: 0x10b43d8: jal   0x1001b14 addu  a0, s1, zero
+// 0x010b4a20: 0x10b4a20: jal   0x1001b14 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -2426,39 +2426,39 @@ L_10b43c8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x010b43e0: 0x10b43e0: beq   v0, zero, 0x10b4400 sll   zero, zero, 0
+// 0x010b4a28: 0x10b4a28: beq   v0, zero, 0x10b4a48 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b4400
+	brfalse L_10b4a48
 // --- basic block ---
-// 0x010b43e8: 0x10b43e8: addiu s0, s0, -1
+// 0x010b4a30: 0x10b4a30: addiu s0, s0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-L_10b43ec:
-// 0x010b43ec: 0x10b43ec: addu  a1, s0, zero
+L_10b4a34:
+// 0x010b4a34: 0x10b4a34: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010b43f0: 0x10b43f0: addu  a2, zero, zero
+// 0x010b4a38: 0x10b4a38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b43f4: 0x10b43f4: bgez  s0, 0x10b43c8 addu  a3, zero, zero
+// 0x010b4a3c: 0x10b4a3c: bgez  s0, 0x10b4a10 addu  a3, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
 	ldc.i4.s 0
-	bge L_10b43c8
+	bge L_10b4a10
 // --- basic block ---
-L_10b43fc:
-// 0x010b43fc: 0x10b43fc: addiu s0, zero, -1
+L_10b4a44:
+// 0x010b4a44: 0x10b4a44: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_10b4400:
-// 0x010b4400: 0x10b4400: lw    ra, 28(sp)
-// 0x010b4404: 0x10b4404: addu  v0, s0, zero
+L_10b4a48:
+// 0x010b4a48: 0x10b4a48: lw    ra, 28(sp)
+// 0x010b4a4c: 0x10b4a4c: addu  v0, s0, zero
 	ldloc 6
 	stloc 7
-// 0x010b4408: 0x10b4408: lw    s2, 24(sp)
+// 0x010b4a50: 0x10b4a50: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2467,7 +2467,7 @@ L_10b4400:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b440c: 0x10b440c: lw    s1, 20(sp)
+// 0x010b4a54: 0x10b4a54: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2476,7 +2476,7 @@ L_10b4400:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b4410: 0x10b4410: lw    s0, 16(sp)
+// 0x010b4a58: 0x10b4a58: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2485,7 +2485,7 @@ L_10b4400:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4414: 0x10b4414: jr    ra addiu sp, sp, 32
+// 0x010b4a5c: 0x10b4a5c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2497,7 +2497,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+.method public static int32 editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 v1,int32 s1,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -2550,12 +2550,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b441c: 0x10b441c: addiu sp, sp, -48
+// 0x010b4a64: 0x10b4a64: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b4420: 0x10b4420: sw    s3, 32(sp)
+// 0x010b4a68: 0x10b4a68: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2564,7 +2564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b4424: 0x10b4424: sw    s2, 28(sp)
+// 0x010b4a6c: 0x10b4a6c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2573,7 +2573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b4428: 0x10b4428: sw    s0, 20(sp)
+// 0x010b4a70: 0x10b4a70: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2582,8 +2582,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b442c: 0x10b442c: sw    ra, 44(sp)
-// 0x010b4430: 0x10b4430: sw    s5, 40(sp)
+// 0x010b4a74: 0x10b4a74: sw    ra, 44(sp)
+// 0x010b4a78: 0x10b4a78: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2592,7 +2592,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b4434: 0x10b4434: sw    s4, 36(sp)
+// 0x010b4a7c: 0x10b4a7c: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2601,7 +2601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b4438: 0x10b4438: sw    s1, 24(sp)
+// 0x010b4a80: 0x10b4a80: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2610,7 +2610,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b443c: 0x10b443c: jal   0x1001b48 addu  s3, a0, zero
+// 0x010b4a84: 0x10b4a84: jal   0x1001b48 addu  s3, a0, zero
 	ldloc.1
 	stloc 11
 	ldloc.1
@@ -2619,16 +2619,16 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b4444: 0x10b4444: addiu s0, zero, -1
+// 0x010b4a8c: 0x10b4a8c: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b4448: 0x10b4448: beq   s3, zero, 0x10b44e4 addu  s2, v0, zero
+// 0x010b4a90: 0x10b4a90: beq   s3, zero, 0x10b4b2c addu  s2, v0, zero
 	ldloc 11
 	ldloc 6
 	stloc 8
-	brfalse L_10b44e4
+	brfalse L_10b4b2c
 // --- basic block ---
-// 0x010b4450: 0x10b4450: jal   0x10b4394 addu  a0, s3, zero
+// 0x010b4a98: 0x10b4a98: jal   0x10b49dc addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2636,36 +2636,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_locate_10b4394(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_locate_10b49dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b4458: 0x10b4458: bgez  v0, 0x10b44e4 addu  s0, v0, zero
+// 0x010b4aa0: 0x10b4aa0: bgez  v0, 0x10b4b2c addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
 	ldc.i4.s 0
-	bge L_10b44e4
+	bge L_10b4b2c
 // --- basic block ---
-// 0x010b4460: 0x10b4460: lui   s1, 0xe0000
+// 0x010b4aa8: 0x10b4aa8: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010b4464: 0x10b4464: addiu s4, s2, 1
+// 0x010b4aac: 0x10b4aac: addiu s4, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010b4468: 0x10b4468: lw    a0, -18948(s1)
+// 0x010b4ab0: 0x10b4ab0: lw    a0, -18484(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b446c: 0x10b446c: jal   0x10b6e78 addu  a1, s4, zero
+// 0x010b4ab4: 0x10b4ab4: jal   0x10b74c0 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -2673,44 +2673,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_allocate_items_10b6e78(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_allocate_items_10b74c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b4474: 0x10b4474: addu  s0, v0, zero
+// 0x010b4abc: 0x10b4abc: addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-// 0x010b4478: 0x10b4478: addiu v0, zero, -1
+// 0x010b4ac0: 0x10b4ac0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b447c: 0x10b447c: bne   s0, v0, 0x10b44a8 addu  a3, zero, zero
+// 0x010b4ac4: 0x10b4ac4: bne   s0, v0, 0x10b4af0 addu  a3, zero, zero
 	ldloc 7
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_10b44a8
+	bne.un L_10b4af0
 // --- basic block ---
-// 0x010b4484: 0x10b4484: lui   a1, 0x20000
+// 0x010b4acc: 0x10b4acc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b4488: 0x10b4488: lui   a3, 0x20000
+// 0x010b4ad0: 0x10b4ad0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b448c: 0x10b448c: addiu a1, a1, 19476
+// 0x010b4ad4: 0x10b4ad4: addiu a1, a1, 19936
 	ldloc.2
-	ldc.i4 19476
+	ldc.i4 19936
 	add
 	stloc.2
-// 0x010b4490: 0x10b4490: addiu a3, a3, 19516
+// 0x010b4ad8: 0x10b4ad8: addiu a3, a3, 19976
 	ldloc 4
-	ldc.i4 19516
+	ldc.i4 19976
 	add
 	stloc 4
-// 0x010b4494: 0x10b4494: addiu a0, zero, 4
+// 0x010b4adc: 0x10b4adc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b4498: 0x10b4498: jal   0x100449c addiu a2, zero, 82
+// 0x010b4ae0: 0x10b4ae0: jal   0x100449c addiu a2, zero, 82
 	ldc.i4.s 82
 	stloc.3
 	ldloc.0
@@ -2723,23 +2723,23 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b44a0: 0x10b44a0: j	 0x10b44e4 sll   zero, zero, 0
-	br L_10b44e4
+// 0x010b4ae8: 0x10b4ae8: j	 0x10b4b2c sll   zero, zero, 0
+	br L_10b4b2c
 // --- basic block ---
-L_10b44a8:
-// 0x010b44a8: 0x10b44a8: lw    a0, -18948(s1)
+L_10b4af0:
+// 0x010b4af0: 0x10b4af0: lw    a0, -18484(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b44ac: 0x10b44ac: addu  a1, s0, zero
+// 0x010b4af4: 0x10b4af4: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010b44b0: 0x10b44b0: jal   0x10b6f58 addu  a2, zero, zero
+// 0x010b4af8: 0x10b4af8: jal   0x10b75a0 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2747,24 +2747,24 @@ L_10b44a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b44b8: 0x10b44b8: addu  s5, v0, zero
+// 0x010b4b00: 0x10b4b00: addu  s5, v0, zero
 	ldloc 6
 	stloc 13
-// 0x010b44bc: 0x10b44bc: addu  a2, s2, zero
+// 0x010b4b04: 0x10b4b04: addu  a2, s2, zero
 	ldloc 8
 	stloc.3
-// 0x010b44c0: 0x10b44c0: addu  a0, v0, zero
+// 0x010b4b08: 0x10b4b08: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010b44c4: 0x10b44c4: addu  a1, s3, zero
+// 0x010b4b0c: 0x10b4b0c: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010b44c8: 0x10b44c8: jal   0x1001af8 addu  s2, s5, s2
+// 0x010b4b10: 0x10b4b10: jal   0x1001af8 addu  s2, s5, s2
 	ldloc 13
 	ldloc 8
 	add
@@ -2775,23 +2775,23 @@ L_10b44a8:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010b44d0: 0x10b44d0: sb    zero, 0(s2)
+// 0x010b4b18: 0x10b4b18: sb    zero, 0(s2)
 	ldloc 8
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b44d4: 0x10b44d4: lw    a0, -18948(s1)
+// 0x010b4b1c: 0x10b4b1c: lw    a0, -18484(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4737
+	ldc.i4 -4621
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b44d8: 0x10b44d8: addu  a2, s4, zero
+// 0x010b4b20: 0x10b4b20: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x010b44dc: 0x10b44dc: jal   0x10b6d60 addu  a1, s0, zero
+// 0x010b4b24: 0x10b4b24: jal   0x10b73a8 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -2799,17 +2799,17 @@ L_10b44a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_write_item_10b6d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_write_item_10b73a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10b44e4:
-// 0x010b44e4: 0x10b44e4: lw    ra, 44(sp)
-// 0x010b44e8: 0x10b44e8: addu  v0, s0, zero
+L_10b4b2c:
+// 0x010b4b2c: 0x10b4b2c: lw    ra, 44(sp)
+// 0x010b4b30: 0x10b4b30: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x010b44ec: 0x10b44ec: lw    s5, 40(sp)
+// 0x010b4b34: 0x10b4b34: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2818,7 +2818,7 @@ L_10b44e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b44f0: 0x10b44f0: lw    s4, 36(sp)
+// 0x010b4b38: 0x10b4b38: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2827,7 +2827,7 @@ L_10b44e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b44f4: 0x10b44f4: lw    s3, 32(sp)
+// 0x010b4b3c: 0x10b4b3c: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2836,7 +2836,7 @@ L_10b44e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b44f8: 0x10b44f8: lw    s2, 28(sp)
+// 0x010b4b40: 0x10b4b40: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2845,7 +2845,7 @@ L_10b44e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b44fc: 0x10b44fc: lw    s1, 24(sp)
+// 0x010b4b44: 0x10b4b44: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2854,7 +2854,7 @@ L_10b44e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b4500: 0x10b4500: lw    s0, 20(sp)
+// 0x010b4b48: 0x10b4b48: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2863,7 +2863,7 @@ L_10b44e4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4504: 0x10b4504: jr    ra addiu sp, sp, 48
+// 0x010b4b4c: 0x10b4b4c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2875,7 +2875,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_shape_activate_10b450c(int32)
+.method public static int32 editor_shape_activate_10b4b54(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2895,16 +2895,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b450c:
-// 0x010b450c: 0x10b450c: lui   v0, 0xe0000
+L_10b4b54:
+// 0x010b4b54: 0x10b4b54: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b4510: 0x10b4510: jr    ra sw    a0, -18944(v0)
+// 0x010b4b58: 0x10b4b58: jr    ra sw    a0, -18480(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4736
+	ldc.i4 -4620
 	add
 	ldloc.0
 	stelem.i4
@@ -2913,7 +2913,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_shape_ordinal_10b4518(int32,int32,int32,int32,int32)
+.method public static int32 editor_shape_ordinal_10b4b60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -2948,31 +2948,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4518: 0x10b4518: lui   v0, 0xe0000
+// 0x010b4b60: 0x10b4b60: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b451c: 0x10b451c: addu  a1, a0, zero
+// 0x010b4b64: 0x10b4b64: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b4520: 0x10b4520: lw    a0, -18944(v0)
+// 0x010b4b68: 0x10b4b68: lw    a0, -18480(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4736
+	ldc.i4 -4620
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4524: 0x10b4524: addiu sp, sp, -24
+// 0x010b4b6c: 0x10b4b6c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4528: 0x10b4528: addu  a2, zero, zero
+// 0x010b4b70: 0x10b4b70: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b452c: 0x10b452c: sw    ra, 20(sp)
-// 0x010b4530: 0x10b4530: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4b74: 0x10b4b74: sw    ra, 20(sp)
+// 0x010b4b78: 0x10b4b78: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2980,20 +2980,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b4538: 0x10b4538: lw    ra, 20(sp)
-// 0x010b453c: 0x10b453c: lw    v0, 0(v0)
+// 0x010b4b80: 0x10b4b80: lw    ra, 20(sp)
+// 0x010b4b84: 0x10b4b84: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b4540: 0x10b4540: jr    ra addiu sp, sp, 24
+// 0x010b4b88: 0x10b4b88: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3005,7 +3005,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_shape_time_10b4548(int32,int32,int32,int32,int32)
+.method public static int32 editor_shape_time_10b4b90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3043,27 +3043,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4548: 0x10b4548: lui   v1, 0xe0000
+// 0x010b4b90: 0x10b4b90: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b454c: 0x10b454c: addiu sp, sp, -24
+// 0x010b4b94: 0x10b4b94: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4550: 0x10b4550: addu  v0, a0, zero
+// 0x010b4b98: 0x10b4b98: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010b4554: 0x10b4554: lw    a0, -18944(v1)
+// 0x010b4b9c: 0x10b4b9c: lw    a0, -18480(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4736
+	ldc.i4 -4620
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4558: 0x10b4558: sw    s0, 16(sp)
+// 0x010b4ba0: 0x10b4ba0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3072,17 +3072,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b455c: 0x10b455c: addu  a2, zero, zero
+// 0x010b4ba4: 0x10b4ba4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4560: 0x10b4560: addu  s0, a1, zero
+// 0x010b4ba8: 0x10b4ba8: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b4564: 0x10b4564: addu  a3, zero, zero
+// 0x010b4bac: 0x10b4bac: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b4568: 0x10b4568: sw    ra, 20(sp)
-// 0x010b456c: 0x10b456c: jal   0x10b6f58 addu  a1, v0, zero
+// 0x010b4bb0: 0x10b4bb0: sw    ra, 20(sp)
+// 0x010b4bb4: 0x10b4bb4: jal   0x10b75a0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3090,38 +3090,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4574: 0x10b4574: lh    v0, 8(v0)
+// 0x010b4bbc: 0x10b4bbc: lh    v0, 8(v0)
 	ldloc 5
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x010b4578: 0x10b4578: lw    v1, 0(s0)
+// 0x010b4bc0: 0x10b4bc0: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b457c: 0x10b457c: lw    ra, 20(sp)
-// 0x010b4580: 0x10b4580: addu  v0, v1, v0
+// 0x010b4bc4: 0x10b4bc4: lw    ra, 20(sp)
+// 0x010b4bc8: 0x10b4bc8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010b4584: 0x10b4584: sw    v0, 0(s0)
+// 0x010b4bcc: 0x10b4bcc: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b4588: 0x10b4588: lw    s0, 16(sp)
+// 0x010b4bd0: 0x10b4bd0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3130,7 +3130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b458c: 0x10b458c: jr    ra addiu sp, sp, 24
+// 0x010b4bd4: 0x10b4bd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3142,7 +3142,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_shape_altitude_10b4594(int32,int32,int32,int32,int32)
+.method public static int32 editor_shape_altitude_10b4bdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3177,31 +3177,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4594: 0x10b4594: lui   v0, 0xe0000
+// 0x010b4bdc: 0x10b4bdc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4598: 0x10b4598: addu  a1, a0, zero
+// 0x010b4be0: 0x10b4be0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b459c: 0x10b459c: lw    a0, -18944(v0)
+// 0x010b4be4: 0x10b4be4: lw    a0, -18480(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4736
+	ldc.i4 -4620
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b45a0: 0x10b45a0: addiu sp, sp, -24
+// 0x010b4be8: 0x10b4be8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b45a4: 0x10b45a4: addu  a2, zero, zero
+// 0x010b4bec: 0x10b4bec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b45a8: 0x10b45a8: sw    ra, 20(sp)
-// 0x010b45ac: 0x10b45ac: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4bf0: 0x10b4bf0: sw    ra, 20(sp)
+// 0x010b4bf4: 0x10b4bf4: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3209,19 +3209,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b45b4: 0x10b45b4: lw    ra, 20(sp)
-// 0x010b45b8: 0x10b45b8: lh    v0, 10(v0)
+// 0x010b4bfc: 0x10b4bfc: lw    ra, 20(sp)
+// 0x010b4c00: 0x10b4c00: lh    v0, 10(v0)
 	ldloc 5
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x010b45bc: 0x10b45bc: jr    ra addiu sp, sp, 24
+// 0x010b4c04: 0x10b4c04: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3233,7 +3233,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_shape_position_10b45c4(int32,int32,int32,int32,int32)
+.method public static int32 editor_shape_position_10b4c0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -3271,27 +3271,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b45c4: 0x10b45c4: lui   v1, 0xe0000
+// 0x010b4c0c: 0x10b4c0c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b45c8: 0x10b45c8: addiu sp, sp, -24
+// 0x010b4c10: 0x10b4c10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b45cc: 0x10b45cc: addu  v0, a0, zero
+// 0x010b4c14: 0x10b4c14: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b45d0: 0x10b45d0: lw    a0, -18944(v1)
+// 0x010b4c18: 0x10b4c18: lw    a0, -18480(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4736
+	ldc.i4 -4620
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b45d4: 0x10b45d4: sw    s0, 16(sp)
+// 0x010b4c1c: 0x10b4c1c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3300,17 +3300,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b45d8: 0x10b45d8: addu  a2, zero, zero
+// 0x010b4c20: 0x10b4c20: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b45dc: 0x10b45dc: addu  s0, a1, zero
+// 0x010b4c24: 0x10b4c24: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b45e0: 0x10b45e0: addu  a3, zero, zero
+// 0x010b4c28: 0x10b4c28: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b45e4: 0x10b45e4: sw    ra, 20(sp)
-// 0x010b45e8: 0x10b45e8: jal   0x10b6f58 addu  a1, v0, zero
+// 0x010b4c2c: 0x10b4c2c: sw    ra, 20(sp)
+// 0x010b4c30: 0x10b4c30: jal   0x10b75a0 addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -3318,25 +3318,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b45f0: 0x10b45f0: lh    v1, 6(v0)
+// 0x010b4c38: 0x10b4c38: lh    v1, 6(v0)
 	ldloc 6
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x010b45f4: 0x10b45f4: lw    a0, 0(s0)
+// 0x010b4c3c: 0x10b4c3c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b45f8: 0x10b45f8: lw    a1, 4(s0)
+// 0x010b4c40: 0x10b4c40: lw    a1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3345,24 +3345,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b45fc: 0x10b45fc: lh    v0, 4(v0)
+// 0x010b4c44: 0x10b4c44: lh    v0, 4(v0)
 	ldloc 6
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x010b4600: 0x10b4600: lw    ra, 20(sp)
-// 0x010b4604: 0x10b4604: addu  v1, a1, v1
+// 0x010b4c48: 0x10b4c48: lw    ra, 20(sp)
+// 0x010b4c4c: 0x10b4c4c: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x010b4608: 0x10b4608: addu  v0, a0, v0
+// 0x010b4c50: 0x10b4c50: addu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x010b460c: 0x10b460c: sw    v1, 4(s0)
+// 0x010b4c54: 0x10b4c54: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3371,14 +3371,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b4610: 0x10b4610: sw    v0, 0(s0)
+// 0x010b4c58: 0x10b4c58: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b4614: 0x10b4614: lw    s0, 16(sp)
+// 0x010b4c5c: 0x10b4c5c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3387,7 +3387,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4618: 0x10b4618: jr    ra addiu sp, sp, 24
+// 0x010b4c60: 0x10b4c60: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3399,7 +3399,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_shape_add_10b4620(int32,int32,int32,int32,int32)
+.method public static int32 editor_shape_add_10b4c68(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -3434,15 +3434,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4620: 0x10b4620: addiu sp, sp, -40
+// 0x010b4c68: 0x10b4c68: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b4624: 0x10b4624: lui   v0, 0xe0000
+// 0x010b4c6c: 0x10b4c6c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b4628: 0x10b4628: sw    a0, 16(sp)
+// 0x010b4c70: 0x10b4c70: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3451,49 +3451,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b462c: 0x10b462c: lw    a0, -18944(v0)
+// 0x010b4c74: 0x10b4c74: lw    a0, -18480(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4736
+	ldc.i4 -4620
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4630: 0x10b4630: lh    v0, 58(sp)
+// 0x010b4c78: 0x10b4c78: lh    v0, 58(sp)
 	ldloc.0
 	ldc.i4.s 58
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x010b4634: 0x10b4634: sh    a1, 20(sp)
+// 0x010b4c7c: 0x10b4c7c: sh    a1, 20(sp)
 	ldloc.0
 	ldc.i4.s 20
 	add
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010b4638: 0x10b4638: sh    a2, 22(sp)
+// 0x010b4c80: 0x10b4c80: sh    a2, 22(sp)
 	ldloc.0
 	ldc.i4.s 22
 	add
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010b463c: 0x10b463c: addiu a1, sp, 16
+// 0x010b4c84: 0x10b4c84: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b4640: 0x10b4640: addiu a2, zero, 1
+// 0x010b4c88: 0x10b4c88: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b4644: 0x10b4644: sw    ra, 36(sp)
-// 0x010b4648: 0x10b4648: sh    a3, 24(sp)
+// 0x010b4c8c: 0x10b4c8c: sw    ra, 36(sp)
+// 0x010b4c90: 0x10b4c90: sh    a3, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	ldloc 4
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010b464c: 0x10b464c: jal   0x10b72a4 sh    v0, 26(sp)
+// 0x010b4c94: 0x10b4c94: jal   0x10b78ec sh    v0, 26(sp)
 	ldloc.0
 	ldc.i4.s 26
 	add
@@ -3504,14 +3504,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b4654: 0x10b4654: lw    ra, 36(sp)
-// 0x010b4658: 0x10b4658: sll   zero, zero, 0
-// 0x010b465c: 0x10b465c: jr    ra addiu sp, sp, 40
+// 0x010b4c9c: 0x10b4c9c: lw    ra, 36(sp)
+// 0x010b4ca0: 0x10b4ca0: sll   zero, zero, 0
+// 0x010b4ca4: 0x10b4ca4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3523,7 +3523,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_points_activate_10b4664(int32)
+.method public static int32 editor_points_activate_10b4cac(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -3543,16 +3543,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b4664:
-// 0x010b4664: 0x10b4664: lui   v0, 0xe0000
+L_10b4cac:
+// 0x010b4cac: 0x10b4cac: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b4668: 0x10b4668: jr    ra sw    a0, -18940(v0)
+// 0x010b4cb0: 0x10b4cb0: jr    ra sw    a0, -18476(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4735
+	ldc.i4 -4619
 	add
 	ldloc.0
 	stelem.i4
@@ -3561,7 +3561,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_point_db_id_10b4670(int32,int32,int32,int32,int32)
+.method public static int32 editor_point_db_id_10b4cb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3596,31 +3596,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4670: 0x10b4670: lui   v0, 0xe0000
+// 0x010b4cb8: 0x10b4cb8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4674: 0x10b4674: addu  a1, a0, zero
+// 0x010b4cbc: 0x10b4cbc: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b4678: 0x10b4678: lw    a0, -18940(v0)
+// 0x010b4cc0: 0x10b4cc0: lw    a0, -18476(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4735
+	ldc.i4 -4619
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b467c: 0x10b467c: addiu sp, sp, -24
+// 0x010b4cc4: 0x10b4cc4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4680: 0x10b4680: addu  a2, zero, zero
+// 0x010b4cc8: 0x10b4cc8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4684: 0x10b4684: sw    ra, 20(sp)
-// 0x010b4688: 0x10b4688: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4ccc: 0x10b4ccc: sw    ra, 20(sp)
+// 0x010b4cd0: 0x10b4cd0: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3628,13 +3628,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b4690: 0x10b4690: lw    ra, 20(sp)
-// 0x010b4694: 0x10b4694: lw    v0, 8(v0)
+// 0x010b4cd8: 0x10b4cd8: lw    ra, 20(sp)
+// 0x010b4cdc: 0x10b4cdc: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3643,7 +3643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b4698: 0x10b4698: jr    ra addiu sp, sp, 24
+// 0x010b4ce0: 0x10b4ce0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3655,7 +3655,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+.method public static int32 editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -3693,27 +3693,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b46a0: 0x10b46a0: lui   v1, 0xe0000
+// 0x010b4ce8: 0x10b4ce8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b46a4: 0x10b46a4: addiu sp, sp, -24
+// 0x010b4cec: 0x10b4cec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b46a8: 0x10b46a8: addu  v0, a0, zero
+// 0x010b4cf0: 0x10b4cf0: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b46ac: 0x10b46ac: lw    a0, -18940(v1)
+// 0x010b4cf4: 0x10b4cf4: lw    a0, -18476(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4735
+	ldc.i4 -4619
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b46b0: 0x10b46b0: sw    s0, 16(sp)
+// 0x010b4cf8: 0x10b4cf8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3722,17 +3722,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b46b4: 0x10b46b4: addu  a2, zero, zero
+// 0x010b4cfc: 0x10b4cfc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b46b8: 0x10b46b8: addu  s0, a1, zero
+// 0x010b4d00: 0x10b4d00: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b46bc: 0x10b46bc: addu  a3, zero, zero
+// 0x010b4d04: 0x10b4d04: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b46c0: 0x10b46c0: sw    ra, 20(sp)
-// 0x010b46c4: 0x10b46c4: jal   0x10b6f58 addu  a1, v0, zero
+// 0x010b4d08: 0x10b4d08: sw    ra, 20(sp)
+// 0x010b4d0c: 0x10b4d0c: jal   0x10b75a0 addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -3740,27 +3740,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b46cc: 0x10b46cc: lw    v1, 0(v0)
+// 0x010b4d14: 0x10b4d14: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b46d0: 0x10b46d0: lw    ra, 20(sp)
-// 0x010b46d4: 0x10b46d4: sw    v1, 0(s0)
+// 0x010b4d18: 0x10b4d18: lw    ra, 20(sp)
+// 0x010b4d1c: 0x10b4d1c: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b46d8: 0x10b46d8: lw    v0, 4(v0)
+// 0x010b4d20: 0x10b4d20: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3769,8 +3769,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b46dc: 0x10b46dc: sll   zero, zero, 0
-// 0x010b46e0: 0x10b46e0: sw    v0, 4(s0)
+// 0x010b4d24: 0x10b4d24: sll   zero, zero, 0
+// 0x010b4d28: 0x10b4d28: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3779,7 +3779,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b46e4: 0x10b46e4: lw    s0, 16(sp)
+// 0x010b4d2c: 0x10b4d2c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3788,7 +3788,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b46e8: 0x10b46e8: jr    ra addiu sp, sp, 24
+// 0x010b4d30: 0x10b4d30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3800,7 +3800,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_point_set_pos_10b46f0(int32,int32,int32,int32,int32)
+.method public static int32 editor_point_set_pos_10b4d38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3844,12 +3844,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b46f0: 0x10b46f0: addiu sp, sp, -32
+// 0x010b4d38: 0x10b4d38: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b46f4: 0x10b46f4: sw    s2, 24(sp)
+// 0x010b4d3c: 0x10b4d3c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3858,10 +3858,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b46f8: 0x10b46f8: lui   s2, 0xe0000
+// 0x010b4d40: 0x10b4d40: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010b46fc: 0x10b46fc: sw    s0, 16(sp)
+// 0x010b4d44: 0x10b4d44: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3870,19 +3870,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b4700: 0x10b4700: addu  s0, a0, zero
+// 0x010b4d48: 0x10b4d48: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b4704: 0x10b4704: lw    a0, -18940(s2)
+// 0x010b4d4c: 0x10b4d4c: lw    a0, -18476(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4735
+	ldc.i4 -4619
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4708: 0x10b4708: sw    s1, 20(sp)
+// 0x010b4d50: 0x10b4d50: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3891,17 +3891,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b470c: 0x10b470c: addu  a2, zero, zero
+// 0x010b4d54: 0x10b4d54: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4710: 0x10b4710: addu  s1, a1, zero
+// 0x010b4d58: 0x10b4d58: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010b4714: 0x10b4714: addu  a3, zero, zero
+// 0x010b4d5c: 0x10b4d5c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b4718: 0x10b4718: sw    ra, 28(sp)
-// 0x010b471c: 0x10b471c: jal   0x10b6f58 addu  a1, s0, zero
+// 0x010b4d60: 0x10b4d60: sw    ra, 28(sp)
+// 0x010b4d64: 0x10b4d64: jal   0x10b75a0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3909,35 +3909,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b4724: 0x10b4724: lw    v1, 0(s1)
+// 0x010b4d6c: 0x10b4d6c: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b4728: 0x10b4728: lw    a0, -18940(s2)
+// 0x010b4d70: 0x10b4d70: lw    a0, -18476(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4735
+	ldc.i4 -4619
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b472c: 0x10b472c: sw    v1, 0(v0)
+// 0x010b4d74: 0x10b4d74: sw    v1, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b4730: 0x10b4730: lw    v1, 4(s1)
+// 0x010b4d78: 0x10b4d78: lw    v1, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3946,10 +3946,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4734: 0x10b4734: addiu a1, zero, -1
+// 0x010b4d7c: 0x10b4d7c: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010b4738: 0x10b4738: sw    a1, 8(v0)
+// 0x010b4d80: 0x10b4d80: sw    a1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3958,7 +3958,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b473c: 0x10b473c: sw    v1, 4(v0)
+// 0x010b4d84: 0x10b4d84: sw    v1, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3967,7 +3967,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4740: 0x10b4740: jal   0x10b6cd4 addu  a1, s0, zero
+// 0x010b4d88: 0x10b4d88: jal   0x10b731c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3975,13 +3975,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b4748: 0x10b4748: lw    ra, 28(sp)
-// 0x010b474c: 0x10b474c: lw    s2, 24(sp)
+// 0x010b4d90: 0x10b4d90: lw    ra, 28(sp)
+// 0x010b4d94: 0x10b4d94: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3990,7 +3990,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b4750: 0x10b4750: lw    s1, 20(sp)
+// 0x010b4d98: 0x10b4d98: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3999,7 +3999,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b4754: 0x10b4754: lw    s0, 16(sp)
+// 0x010b4d9c: 0x10b4d9c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4008,7 +4008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4758: 0x10b4758: jr    ra addiu sp, sp, 32
+// 0x010b4da0: 0x10b4da0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4020,7 +4020,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_point_add_10b4760(int32,int32,int32,int32,int32)
+.method public static int32 editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -4055,7 +4055,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4760: 0x10b4760: lw    v0, 4(a0)
+// 0x010b4da8: 0x10b4da8: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4064,34 +4064,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4764: 0x10b4764: addu  v1, a0, zero
+// 0x010b4dac: 0x10b4dac: addu  v1, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b4768: 0x10b4768: lui   a0, 0xe0000
+// 0x010b4db0: 0x10b4db0: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b476c: 0x10b476c: addiu sp, sp, -40
+// 0x010b4db4: 0x10b4db4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b4770: 0x10b4770: lw    v1, 0(v1)
+// 0x010b4db8: 0x10b4db8: lw    v1, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b4774: 0x10b4774: lw    a0, -18940(a0)
+// 0x010b4dbc: 0x10b4dbc: lw    a0, -18476(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4735
+	ldc.i4 -4619
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4778: 0x10b4778: sw    a1, 24(sp)
+// 0x010b4dc0: 0x10b4dc0: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4100,16 +4100,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b477c: 0x10b477c: addiu a2, zero, 1
+// 0x010b4dc4: 0x10b4dc4: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b4780: 0x10b4780: addiu a1, sp, 16
+// 0x010b4dc8: 0x10b4dc8: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b4784: 0x10b4784: sw    ra, 36(sp)
-// 0x010b4788: 0x10b4788: sw    v1, 16(sp)
+// 0x010b4dcc: 0x10b4dcc: sw    ra, 36(sp)
+// 0x010b4dd0: 0x10b4dd0: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4118,7 +4118,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b478c: 0x10b478c: jal   0x10b72a4 sw    v0, 20(sp)
+// 0x010b4dd4: 0x10b4dd4: jal   0x10b78ec sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4132,14 +4132,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b4794: 0x10b4794: lw    ra, 36(sp)
-// 0x010b4798: 0x10b4798: sll   zero, zero, 0
-// 0x010b479c: 0x10b479c: jr    ra addiu sp, sp, 40
+// 0x010b4ddc: 0x10b4ddc: lw    ra, 36(sp)
+// 0x010b4de0: 0x10b4de0: sll   zero, zero, 0
+// 0x010b4de4: 0x10b4de4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4151,7 +4151,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_trkseg_activate_10b47a4(int32)
+.method public static int32 editor_trkseg_activate_10b4dec(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -4171,16 +4171,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b47a4:
-// 0x010b47a4: 0x10b47a4: lui   v0, 0xe0000
+L_10b4dec:
+// 0x010b4dec: 0x10b4dec: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b47a8: 0x10b47a8: jr    ra sw    a0, -18936(v0)
+// 0x010b4df0: 0x10b4df0: jr    ra sw    a0, -18472(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldloc.0
 	stelem.i4
@@ -4189,7 +4189,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_trkseg_items_pending_10b47b0(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_items_pending_10b4df8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4224,34 +4224,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b47b0: 0x10b47b0: lui   v0, 0xe0000
+// 0x010b4df8: 0x10b4df8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b47b4: 0x10b47b4: lw    a0, -18936(v0)
+// 0x010b4dfc: 0x10b4dfc: lw    a0, -18472(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b47b8: 0x10b47b8: addiu sp, sp, -24
+// 0x010b4e00: 0x10b4e00: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b47bc: 0x10b47bc: sw    ra, 20(sp)
-// 0x010b47c0: 0x10b47c0: jal   0x10b6a74 sll   zero, zero, 0
+// 0x010b4e04: 0x10b4e04: sw    ra, 20(sp)
+// 0x010b4e08: 0x10b4e08: jal   0x10b70bc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_items_pending_10b6a74(int32)
+	call int32 Cibyl136::editor_db_items_pending_10b70bc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b47c8: 0x10b47c8: lw    ra, 20(sp)
-// 0x010b47cc: 0x10b47cc: sll   zero, zero, 0
-// 0x010b47d0: 0x10b47d0: jr    ra addiu sp, sp, 24
+// 0x010b4e10: 0x10b4e10: lw    ra, 20(sp)
+// 0x010b4e14: 0x10b4e14: sll   zero, zero, 0
+// 0x010b4e18: 0x10b4e18: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4263,7 +4263,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_trkseg_item_committed_10b47d8(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_item_committed_10b4e20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4298,41 +4298,41 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b47d8: 0x10b47d8: lui   v0, 0xe0000
+// 0x010b4e20: 0x10b4e20: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b47dc: 0x10b47dc: addu  a1, a0, zero
+// 0x010b4e24: 0x10b4e24: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b47e0: 0x10b47e0: lw    a0, -18936(v0)
+// 0x010b4e28: 0x10b4e28: lw    a0, -18472(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b47e4: 0x10b47e4: addiu sp, sp, -24
+// 0x010b4e2c: 0x10b4e2c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b47e8: 0x10b47e8: sw    ra, 20(sp)
-// 0x010b47ec: 0x10b47ec: jal   0x10b6a40 sll   zero, zero, 0
+// 0x010b4e30: 0x10b4e30: sw    ra, 20(sp)
+// 0x010b4e34: 0x10b4e34: jal   0x10b7088 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_item_committed_10b6a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_item_committed_10b7088(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b47f4: 0x10b47f4: lw    ra, 20(sp)
-// 0x010b47f8: 0x10b47f8: sll   zero, zero, 0
-// 0x010b47fc: 0x10b47fc: jr    ra addiu sp, sp, 24
+// 0x010b4e3c: 0x10b4e3c: lw    ra, 20(sp)
+// 0x010b4e40: 0x10b4e40: sll   zero, zero, 0
+// 0x010b4e44: 0x10b4e44: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4344,7 +4344,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_trkseg_confirm_commit_10b4804(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_confirm_commit_10b4e4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4379,41 +4379,41 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4804: 0x10b4804: lui   v0, 0xe0000
+// 0x010b4e4c: 0x10b4e4c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4808: 0x10b4808: addu  a1, a0, zero
+// 0x010b4e50: 0x10b4e50: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b480c: 0x10b480c: lw    a0, -18936(v0)
+// 0x010b4e54: 0x10b4e54: lw    a0, -18472(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4810: 0x10b4810: addiu sp, sp, -24
+// 0x010b4e58: 0x10b4e58: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4814: 0x10b4814: sw    ra, 20(sp)
-// 0x010b4818: 0x10b4818: jal   0x10b6aa0 sll   zero, zero, 0
+// 0x010b4e5c: 0x10b4e5c: sw    ra, 20(sp)
+// 0x010b4e60: 0x10b4e60: jal   0x10b70e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_confirm_commit_10b6aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_confirm_commit_10b70e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b4820: 0x10b4820: lw    ra, 20(sp)
-// 0x010b4824: 0x10b4824: sll   zero, zero, 0
-// 0x010b4828: 0x10b4828: jr    ra addiu sp, sp, 24
+// 0x010b4e68: 0x10b4e68: lw    ra, 20(sp)
+// 0x010b4e6c: 0x10b4e6c: sll   zero, zero, 0
+// 0x010b4e70: 0x10b4e70: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4425,7 +4425,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_trkseg_begin_commit_10b4830(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_begin_commit_10b4e78(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4460,32 +4460,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4830: 0x10b4830: lui   v0, 0xe0000
+// 0x010b4e78: 0x10b4e78: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4834: 0x10b4834: lw    a0, -18936(v0)
+// 0x010b4e7c: 0x10b4e7c: lw    a0, -18472(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4838: 0x10b4838: addiu sp, sp, -24
+// 0x010b4e80: 0x10b4e80: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b483c: 0x10b483c: sw    ra, 20(sp)
-// 0x010b4840: 0x10b4840: jal   0x10b6a34 sll   zero, zero, 0
+// 0x010b4e84: 0x10b4e84: sw    ra, 20(sp)
+// 0x010b4e88: 0x10b4e88: jal   0x10b707c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_begin_commit_10b6a34(int32)
+	call int32 Cibyl136::editor_db_begin_commit_10b707c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b4848: 0x10b4848: lw    ra, 20(sp)
-// 0x010b484c: 0x10b484c: sll   zero, zero, 0
-// 0x010b4850: 0x10b4850: jr    ra addiu sp, sp, 24
+// 0x010b4e90: 0x10b4e90: lw    ra, 20(sp)
+// 0x010b4e94: 0x10b4e94: sll   zero, zero, 0
+// 0x010b4e98: 0x10b4e98: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4497,7 +4497,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_trkseg_get_count_10b4858(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_get_count_10b4ea0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4532,32 +4532,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4858: 0x10b4858: lui   v0, 0xe0000
+// 0x010b4ea0: 0x10b4ea0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b485c: 0x10b485c: lw    a0, -18936(v0)
+// 0x010b4ea4: 0x10b4ea4: lw    a0, -18472(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4860: 0x10b4860: addiu sp, sp, -24
+// 0x010b4ea8: 0x10b4ea8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4864: 0x10b4864: sw    ra, 20(sp)
-// 0x010b4868: 0x10b4868: jal   0x10b6a20 sll   zero, zero, 0
+// 0x010b4eac: 0x10b4eac: sw    ra, 20(sp)
+// 0x010b4eb0: 0x10b4eb0: jal   0x10b7068 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b4870: 0x10b4870: lw    ra, 20(sp)
-// 0x010b4874: 0x10b4874: sll   zero, zero, 0
-// 0x010b4878: 0x10b4878: jr    ra addiu sp, sp, 24
+// 0x010b4eb8: 0x10b4eb8: lw    ra, 20(sp)
+// 0x010b4ebc: 0x10b4ebc: sll   zero, zero, 0
+// 0x010b4ec0: 0x10b4ec0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4569,7 +4569,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_trkseg_get_points_10b4880(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_get_points_10b4ec8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4613,27 +4613,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4880: 0x10b4880: lui   v1, 0xe0000
+// 0x010b4ec8: 0x10b4ec8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b4884: 0x10b4884: addiu sp, sp, -32
+// 0x010b4ecc: 0x10b4ecc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b4888: 0x10b4888: addu  v0, a0, zero
+// 0x010b4ed0: 0x10b4ed0: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b488c: 0x10b488c: lw    a0, -18936(v1)
+// 0x010b4ed4: 0x10b4ed4: lw    a0, -18472(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4890: 0x10b4890: sw    s2, 24(sp)
+// 0x010b4ed8: 0x10b4ed8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4642,7 +4642,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4894: 0x10b4894: sw    s1, 20(sp)
+// 0x010b4edc: 0x10b4edc: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4651,7 +4651,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4898: 0x10b4898: sw    s0, 16(sp)
+// 0x010b4ee0: 0x10b4ee0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4660,23 +4660,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b489c: 0x10b489c: addu  s2, a1, zero
+// 0x010b4ee4: 0x10b4ee4: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010b48a0: 0x10b48a0: addu  s1, a2, zero
+// 0x010b4ee8: 0x10b4ee8: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010b48a4: 0x10b48a4: addu  s0, a3, zero
+// 0x010b4eec: 0x10b4eec: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x010b48a8: 0x10b48a8: addu  a1, v0, zero
+// 0x010b4ef0: 0x10b4ef0: addu  a1, v0, zero
 	ldloc 7
 	stloc.2
-// 0x010b48ac: 0x10b48ac: addu  a2, zero, zero
+// 0x010b4ef4: 0x10b4ef4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b48b0: 0x10b48b0: sw    ra, 28(sp)
-// 0x010b48b4: 0x10b48b4: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4ef8: 0x10b4ef8: sw    ra, 28(sp)
+// 0x010b4efc: 0x10b4efc: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4684,12 +4684,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b48bc: 0x10b48bc: lw    v1, 8(v0)
+// 0x010b4f04: 0x10b4f04: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4698,15 +4698,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b48c0: 0x10b48c0: lw    ra, 28(sp)
-// 0x010b48c4: 0x10b48c4: sw    v1, 0(s2)
+// 0x010b4f08: 0x10b4f08: lw    ra, 28(sp)
+// 0x010b4f0c: 0x10b4f0c: sw    v1, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b48c8: 0x10b48c8: lw    v1, 12(v0)
+// 0x010b4f10: 0x10b4f10: lw    v1, 12(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4715,7 +4715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b48cc: 0x10b48cc: lw    s2, 24(sp)
+// 0x010b4f14: 0x10b4f14: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4724,14 +4724,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b48d0: 0x10b48d0: sw    v1, 0(s1)
+// 0x010b4f18: 0x10b4f18: sw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b48d4: 0x10b48d4: lw    v1, 28(v0)
+// 0x010b4f1c: 0x10b4f1c: lw    v1, 28(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4740,7 +4740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b48d8: 0x10b48d8: lw    s1, 20(sp)
+// 0x010b4f20: 0x10b4f20: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4749,14 +4749,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b48dc: 0x10b48dc: sw    v1, 0(s0)
+// 0x010b4f24: 0x10b4f24: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b48e0: 0x10b48e0: lw    v1, 32(v0)
+// 0x010b4f28: 0x10b4f28: lw    v1, 32(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4765,7 +4765,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b48e4: 0x10b48e4: lw    v0, 48(sp)
+// 0x010b4f2c: 0x10b4f2c: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4774,7 +4774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b48e8: 0x10b48e8: lw    s0, 16(sp)
+// 0x010b4f30: 0x10b4f30: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4783,14 +4783,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b48ec: 0x10b48ec: sw    v1, 0(v0)
+// 0x010b4f34: 0x10b4f34: sw    v1, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b48f0: 0x10b48f0: jr    ra addiu sp, sp, 32
+// 0x010b4f38: 0x10b4f38: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4802,7 +4802,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -4849,27 +4849,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b48f8: 0x10b48f8: lui   v1, 0xe0000
+// 0x010b4f40: 0x10b4f40: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b48fc: 0x10b48fc: addiu sp, sp, -40
+// 0x010b4f44: 0x10b4f44: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b4900: 0x10b4900: addu  v0, a0, zero
+// 0x010b4f48: 0x10b4f48: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b4904: 0x10b4904: lw    a0, -18936(v1)
+// 0x010b4f4c: 0x10b4f4c: lw    a0, -18472(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4908: 0x10b4908: sw    s3, 32(sp)
+// 0x010b4f50: 0x10b4f50: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4878,7 +4878,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b490c: 0x10b490c: sw    s2, 28(sp)
+// 0x010b4f54: 0x10b4f54: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4887,10 +4887,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4910: 0x10b4910: addu  s3, a1, zero
+// 0x010b4f58: 0x10b4f58: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010b4914: 0x10b4914: sw    s1, 24(sp)
+// 0x010b4f5c: 0x10b4f5c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4899,19 +4899,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4918: 0x10b4918: addu  s2, a2, zero
+// 0x010b4f60: 0x10b4f60: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010b491c: 0x10b491c: addu  s1, a3, zero
+// 0x010b4f64: 0x10b4f64: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x010b4920: 0x10b4920: addu  a1, v0, zero
+// 0x010b4f68: 0x10b4f68: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b4924: 0x10b4924: addu  a2, zero, zero
+// 0x010b4f6c: 0x10b4f6c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4928: 0x10b4928: sw    s0, 20(sp)
+// 0x010b4f70: 0x10b4f70: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4920,8 +4920,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b492c: 0x10b492c: sw    ra, 36(sp)
-// 0x010b4930: 0x10b4930: lw    s0, 56(sp)
+// 0x010b4f74: 0x10b4f74: sw    ra, 36(sp)
+// 0x010b4f78: 0x10b4f78: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4930,7 +4930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4934: 0x10b4934: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b4f7c: 0x10b4f7c: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4938,16 +4938,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b493c: 0x10b493c: beq   s3, zero, 0x10b4950 sll   zero, zero, 0
+// 0x010b4f84: 0x10b4f84: beq   s3, zero, 0x10b4f98 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_10b4950
+	brfalse L_10b4f98
 // --- basic block ---
-// 0x010b4944: 0x10b4944: lw    v1, 16(v0)
+// 0x010b4f8c: 0x10b4f8c: lw    v1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4956,20 +4956,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4948: 0x10b4948: sll   zero, zero, 0
-// 0x010b494c: 0x10b494c: sw    v1, 0(s3)
+// 0x010b4f90: 0x10b4f90: sll   zero, zero, 0
+// 0x010b4f94: 0x10b4f94: sw    v1, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10b4950:
-// 0x010b4950: 0x10b4950: beq   s2, zero, 0x10b4964 sll   zero, zero, 0
+L_10b4f98:
+// 0x010b4f98: 0x10b4f98: beq   s2, zero, 0x10b4fac sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10b4964
+	brfalse L_10b4fac
 // --- basic block ---
-// 0x010b4958: 0x10b4958: lw    v1, 20(v0)
+// 0x010b4fa0: 0x10b4fa0: lw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4978,20 +4978,20 @@ L_10b4950:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b495c: 0x10b495c: sll   zero, zero, 0
-// 0x010b4960: 0x10b4960: sw    v1, 0(s2)
+// 0x010b4fa4: 0x10b4fa4: sll   zero, zero, 0
+// 0x010b4fa8: 0x10b4fa8: sw    v1, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10b4964:
-// 0x010b4964: 0x10b4964: beq   s1, zero, 0x10b4978 sll   zero, zero, 0
+L_10b4fac:
+// 0x010b4fac: 0x10b4fac: beq   s1, zero, 0x10b4fc0 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10b4978
+	brfalse L_10b4fc0
 // --- basic block ---
-// 0x010b496c: 0x10b496c: lw    v1, 24(v0)
+// 0x010b4fb4: 0x10b4fb4: lw    v1, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5000,20 +5000,20 @@ L_10b4964:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4970: 0x10b4970: sll   zero, zero, 0
-// 0x010b4974: 0x10b4974: sw    v1, 0(s1)
+// 0x010b4fb8: 0x10b4fb8: sll   zero, zero, 0
+// 0x010b4fbc: 0x10b4fbc: sw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10b4978:
-// 0x010b4978: 0x10b4978: beq   s0, zero, 0x10b498c sll   zero, zero, 0
+L_10b4fc0:
+// 0x010b4fc0: 0x10b4fc0: beq   s0, zero, 0x10b4fd4 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10b498c
+	brfalse L_10b4fd4
 // --- basic block ---
-// 0x010b4980: 0x10b4980: lw    v0, 36(v0)
+// 0x010b4fc8: 0x10b4fc8: lw    v0, 36(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5022,17 +5022,17 @@ L_10b4978:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4984: 0x10b4984: sll   zero, zero, 0
-// 0x010b4988: 0x10b4988: sw    v0, 0(s0)
+// 0x010b4fcc: 0x10b4fcc: sll   zero, zero, 0
+// 0x010b4fd0: 0x10b4fd0: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b498c:
-// 0x010b498c: 0x10b498c: lw    ra, 36(sp)
-// 0x010b4990: 0x10b4990: lw    s3, 32(sp)
+L_10b4fd4:
+// 0x010b4fd4: 0x10b4fd4: lw    ra, 36(sp)
+// 0x010b4fd8: 0x10b4fd8: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5041,7 +5041,7 @@ L_10b498c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b4994: 0x10b4994: lw    s2, 28(sp)
+// 0x010b4fdc: 0x10b4fdc: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5050,7 +5050,7 @@ L_10b498c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b4998: 0x10b4998: lw    s1, 24(sp)
+// 0x010b4fe0: 0x10b4fe0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5059,7 +5059,7 @@ L_10b498c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b499c: 0x10b499c: lw    s0, 20(sp)
+// 0x010b4fe4: 0x10b4fe4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5068,7 +5068,7 @@ L_10b498c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b49a0: 0x10b49a0: jr    ra addiu sp, sp, 40
+// 0x010b4fe8: 0x10b4fe8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5080,7 +5080,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_trkseg_get_time_10b49a8(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_get_time_10b4ff0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5121,27 +5121,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b49a8: 0x10b49a8: lui   v1, 0xe0000
+// 0x010b4ff0: 0x10b4ff0: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b49ac: 0x10b49ac: addiu sp, sp, -32
+// 0x010b4ff4: 0x10b4ff4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b49b0: 0x10b49b0: addu  v0, a0, zero
+// 0x010b4ff8: 0x10b4ff8: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b49b4: 0x10b49b4: lw    a0, -18936(v1)
+// 0x010b4ffc: 0x10b4ffc: lw    a0, -18472(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b49b8: 0x10b49b8: sw    s1, 24(sp)
+// 0x010b5000: 0x10b5000: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5150,7 +5150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b49bc: 0x10b49bc: sw    s0, 20(sp)
+// 0x010b5004: 0x10b5004: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5159,20 +5159,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b49c0: 0x10b49c0: addu  s1, a1, zero
+// 0x010b5008: 0x10b5008: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010b49c4: 0x10b49c4: addu  s0, a2, zero
+// 0x010b500c: 0x10b500c: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010b49c8: 0x10b49c8: addu  a1, v0, zero
+// 0x010b5010: 0x10b5010: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b49cc: 0x10b49cc: addu  a2, zero, zero
+// 0x010b5014: 0x10b5014: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b49d0: 0x10b49d0: sw    ra, 28(sp)
-// 0x010b49d4: 0x10b49d4: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b5018: 0x10b5018: sw    ra, 28(sp)
+// 0x010b501c: 0x10b501c: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5180,31 +5180,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b49dc: 0x10b49dc: beq   v0, zero, 0x10b49fc sll   zero, zero, 0
+// 0x010b5024: 0x10b5024: beq   v0, zero, 0x10b5044 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b49fc
+	brfalse L_10b5044
 // --- basic block ---
-// 0x010b49e4: 0x10b49e4: lw    v1, 0(v0)
+// 0x010b502c: 0x10b502c: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b49e8: 0x10b49e8: sll   zero, zero, 0
-// 0x010b49ec: 0x10b49ec: sw    v1, 0(s1)
+// 0x010b5030: 0x10b5030: sll   zero, zero, 0
+// 0x010b5034: 0x10b5034: sw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b49f0: 0x10b49f0: lw    v0, 4(v0)
+// 0x010b5038: 0x10b5038: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5213,17 +5213,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b49f4: 0x10b49f4: sll   zero, zero, 0
-// 0x010b49f8: 0x10b49f8: sw    v0, 0(s0)
+// 0x010b503c: 0x10b503c: sll   zero, zero, 0
+// 0x010b5040: 0x10b5040: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b49fc:
-// 0x010b49fc: 0x10b49fc: lw    ra, 28(sp)
-// 0x010b4a00: 0x10b4a00: lw    s1, 24(sp)
+L_10b5044:
+// 0x010b5044: 0x10b5044: lw    ra, 28(sp)
+// 0x010b5048: 0x10b5048: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5232,7 +5232,7 @@ L_10b49fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b4a04: 0x10b4a04: lw    s0, 20(sp)
+// 0x010b504c: 0x10b504c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5241,7 +5241,7 @@ L_10b49fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4a08: 0x10b4a08: jr    ra addiu sp, sp, 32
+// 0x010b5050: 0x10b5050: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5253,7 +5253,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_trkseg_add_10b4a10(int32,int32,int32,int32,int32)
+.method public static int32 editor_trkseg_add_10b5058(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -5288,15 +5288,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4a10: 0x10b4a10: addiu sp, sp, -64
+// 0x010b5058: 0x10b5058: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010b4a14: 0x10b4a14: lui   v0, 0xe0000
+// 0x010b505c: 0x10b505c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b4a18: 0x10b4a18: sw    a0, 24(sp)
+// 0x010b5060: 0x10b5060: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5305,16 +5305,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b4a1c: 0x10b4a1c: lw    a0, -18936(v0)
+// 0x010b5064: 0x10b5064: lw    a0, -18472(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4734
+	ldc.i4 -4618
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4a20: 0x10b4a20: lw    v0, 80(sp)
+// 0x010b5068: 0x10b5068: lw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5323,7 +5323,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4a24: 0x10b4a24: sw    a1, 28(sp)
+// 0x010b506c: 0x10b506c: sw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5332,7 +5332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b4a28: 0x10b4a28: sw    v0, 40(sp)
+// 0x010b5070: 0x10b5070: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5341,7 +5341,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4a2c: 0x10b4a2c: lw    v0, 84(sp)
+// 0x010b5074: 0x10b5074: lw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5350,7 +5350,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4a30: 0x10b4a30: sw    a2, 32(sp)
+// 0x010b5078: 0x10b5078: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5359,7 +5359,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b4a34: 0x10b4a34: sw    v0, 16(sp)
+// 0x010b507c: 0x10b507c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5368,7 +5368,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4a38: 0x10b4a38: lw    v0, 88(sp)
+// 0x010b5080: 0x10b5080: lw    v0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5377,12 +5377,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4a3c: 0x10b4a3c: addiu a1, sp, 16
+// 0x010b5084: 0x10b5084: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b4a40: 0x10b4a40: sw    v0, 20(sp)
+// 0x010b5088: 0x10b5088: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5391,7 +5391,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4a44: 0x10b4a44: lw    v0, 92(sp)
+// 0x010b508c: 0x10b508c: lw    v0, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5400,10 +5400,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4a48: 0x10b4a48: addiu a2, zero, 1
+// 0x010b5090: 0x10b5090: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b4a4c: 0x10b4a4c: sw    v0, 44(sp)
+// 0x010b5094: 0x10b5094: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5412,7 +5412,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4a50: 0x10b4a50: lw    v0, 96(sp)
+// 0x010b5098: 0x10b5098: lw    v0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5421,8 +5421,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4a54: 0x10b4a54: sw    ra, 60(sp)
-// 0x010b4a58: 0x10b4a58: sw    v0, 48(sp)
+// 0x010b509c: 0x10b509c: sw    ra, 60(sp)
+// 0x010b50a0: 0x10b50a0: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5431,7 +5431,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4a5c: 0x10b4a5c: lw    v0, 100(sp)
+// 0x010b50a4: 0x10b50a4: lw    v0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5440,7 +5440,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4a60: 0x10b4a60: sw    a3, 36(sp)
+// 0x010b50a8: 0x10b50a8: sw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5449,7 +5449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b4a64: 0x10b4a64: jal   0x10b72a4 sw    v0, 52(sp)
+// 0x010b50ac: 0x10b50ac: jal   0x10b78ec sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5463,14 +5463,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b4a6c: 0x10b4a6c: lw    ra, 60(sp)
-// 0x010b4a70: 0x10b4a70: sll   zero, zero, 0
-// 0x010b4a74: 0x10b4a74: jr    ra addiu sp, sp, 64
+// 0x010b50b4: 0x10b50b4: lw    ra, 60(sp)
+// 0x010b50b8: 0x10b50b8: sll   zero, zero, 0
+// 0x010b50bc: 0x10b50bc: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5482,7 +5482,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_street_activate_10b4a7c(int32)
+.method public static int32 editor_street_activate_10b50c4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5502,16 +5502,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b4a7c:
-// 0x010b4a7c: 0x10b4a7c: lui   v0, 0xe0000
+L_10b50c4:
+// 0x010b50c4: 0x10b50c4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b4a80: 0x10b4a80: jr    ra sw    a0, -17908(v0)
+// 0x010b50c8: 0x10b50c8: jr    ra sw    a0, -17444(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldloc.0
 	stelem.i4
@@ -5520,7 +5520,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_street_get_street_address_10b4a88()
+.method public static int32 editor_street_get_street_address_10b50d0()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -5534,12 +5534,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4a88: 0x10b4a88: lui   v0, 0x10000
+// 0x010b50d0: 0x10b50d0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc.0
-// 0x010b4a8c: 0x10b4a8c: jr    ra addiu v0, v0, 18500
+// 0x010b50d4: 0x10b50d4: jr    ra addiu v0, v0, 18768
 	ldloc.0
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -5547,7 +5547,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_street_get_street_t2s_10b4a94(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_street_t2s_10b50dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5582,35 +5582,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4a94: 0x10b4a94: addiu sp, sp, -24
+// 0x010b50dc: 0x10b50dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4a98: 0x10b4a98: sw    ra, 20(sp)
-// 0x010b4a9c: 0x10b4a9c: bltz  a0, 0x10b4ac8 addu  a1, a0, zero
+// 0x010b50e0: 0x10b50e0: sw    ra, 20(sp)
+// 0x010b50e4: 0x10b50e4: bltz  a0, 0x10b5110 addu  a1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
 	ldc.i4.s 0
-	blt L_10b4ac8
+	blt L_10b5110
 // --- basic block ---
-// 0x010b4aa4: 0x10b4aa4: lui   v0, 0xe0000
+// 0x010b50ec: 0x10b50ec: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4aa8: 0x10b4aa8: lw    a0, -17908(v0)
+// 0x010b50f0: 0x10b50f0: lw    a0, -17444(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4aac: 0x10b4aac: addu  a2, zero, zero
+// 0x010b50f4: 0x10b50f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4ab0: 0x10b4ab0: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b50f8: 0x10b50f8: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5618,12 +5618,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b4ab8: 0x10b4ab8: lw    a0, 16(v0)
+// 0x010b5100: 0x10b5100: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5632,39 +5632,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4abc: 0x10b4abc: sll   zero, zero, 0
-// 0x010b4ac0: 0x10b4ac0: bgez  a0, 0x10b4ad4 sll   zero, zero, 0
+// 0x010b5104: 0x10b5104: sll   zero, zero, 0
+// 0x010b5108: 0x10b5108: bgez  a0, 0x10b511c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	bge L_10b4ad4
+	bge L_10b511c
 // --- basic block ---
-L_10b4ac8:
-// 0x010b4ac8: 0x10b4ac8: lui   v0, 0x10000
+L_10b5110:
+// 0x010b5110: 0x10b5110: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b4acc: 0x10b4acc: j	 0x10b4adc addiu v0, v0, 18500
+// 0x010b5114: 0x10b5114: j	 0x10b5124 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_10b4adc
+	br L_10b5124
 // --- basic block ---
-L_10b4ad4:
-// 0x010b4ad4: 0x10b4ad4: jal   0x10b4338 sll   zero, zero, 0
+L_10b511c:
+// 0x010b511c: 0x10b511c: jal   0x10b4980 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_get_10b4338(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_get_10b4980(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10b4adc:
-// 0x010b4adc: 0x10b4adc: lw    ra, 20(sp)
-// 0x010b4ae0: 0x10b4ae0: sll   zero, zero, 0
-// 0x010b4ae4: 0x10b4ae4: jr    ra addiu sp, sp, 24
+L_10b5124:
+// 0x010b5124: 0x10b5124: lw    ra, 20(sp)
+// 0x010b5128: 0x10b5128: sll   zero, zero, 0
+// 0x010b512c: 0x10b512c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5676,7 +5676,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_street_get_street_city_10b4aec(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_street_city_10b5134(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5711,35 +5711,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4aec: 0x10b4aec: addiu sp, sp, -24
+// 0x010b5134: 0x10b5134: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4af0: 0x10b4af0: sw    ra, 20(sp)
-// 0x010b4af4: 0x10b4af4: bltz  a0, 0x10b4b20 addu  a1, a0, zero
+// 0x010b5138: 0x10b5138: sw    ra, 20(sp)
+// 0x010b513c: 0x10b513c: bltz  a0, 0x10b5168 addu  a1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
 	ldc.i4.s 0
-	blt L_10b4b20
+	blt L_10b5168
 // --- basic block ---
-// 0x010b4afc: 0x10b4afc: lui   v0, 0xe0000
+// 0x010b5144: 0x10b5144: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4b00: 0x10b4b00: lw    a0, -17908(v0)
+// 0x010b5148: 0x10b5148: lw    a0, -17444(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4b04: 0x10b4b04: addu  a2, zero, zero
+// 0x010b514c: 0x10b514c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4b08: 0x10b4b08: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b5150: 0x10b5150: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5747,12 +5747,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4b10: 0x10b4b10: lw    v1, 4(v0)
+// 0x010b5158: 0x10b5158: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5761,25 +5761,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4b14: 0x10b4b14: sll   zero, zero, 0
-// 0x010b4b18: 0x10b4b18: bgez  v1, 0x10b4b2c sll   zero, zero, 0
+// 0x010b515c: 0x10b515c: sll   zero, zero, 0
+// 0x010b5160: 0x10b5160: bgez  v1, 0x10b5174 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bge L_10b4b2c
+	bge L_10b5174
 // --- basic block ---
-L_10b4b20:
-// 0x010b4b20: 0x10b4b20: lui   v0, 0x10000
+L_10b5168:
+// 0x010b5168: 0x10b5168: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b4b24: 0x10b4b24: j	 0x10b4b38 addiu v0, v0, 18500
+// 0x010b516c: 0x10b516c: j	 0x10b5180 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_10b4b38
+	br L_10b5180
 // --- basic block ---
-L_10b4b2c:
-// 0x010b4b2c: 0x10b4b2c: lw    a0, 20(v0)
+L_10b5174:
+// 0x010b5174: 0x10b5174: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5788,21 +5788,21 @@ L_10b4b2c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4b30: 0x10b4b30: jal   0x10b4338 sll   zero, zero, 0
+// 0x010b5178: 0x10b5178: jal   0x10b4980 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_get_10b4338(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_get_10b4980(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b4b38:
-// 0x010b4b38: 0x10b4b38: lw    ra, 20(sp)
-// 0x010b4b3c: 0x10b4b3c: sll   zero, zero, 0
-// 0x010b4b40: 0x10b4b40: jr    ra addiu sp, sp, 24
+L_10b5180:
+// 0x010b5180: 0x10b5180: lw    ra, 20(sp)
+// 0x010b5184: 0x10b5184: sll   zero, zero, 0
+// 0x010b5188: 0x10b5188: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5814,7 +5814,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_street_get_street_fetype_10b4b48(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_street_fetype_10b5190(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5849,35 +5849,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4b48: 0x10b4b48: addiu sp, sp, -24
+// 0x010b5190: 0x10b5190: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4b4c: 0x10b4b4c: sw    ra, 20(sp)
-// 0x010b4b50: 0x10b4b50: bltz  a0, 0x10b4b7c addu  a1, a0, zero
+// 0x010b5194: 0x10b5194: sw    ra, 20(sp)
+// 0x010b5198: 0x10b5198: bltz  a0, 0x10b51c4 addu  a1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
 	ldc.i4.s 0
-	blt L_10b4b7c
+	blt L_10b51c4
 // --- basic block ---
-// 0x010b4b58: 0x10b4b58: lui   v0, 0xe0000
+// 0x010b51a0: 0x10b51a0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4b5c: 0x10b4b5c: lw    a0, -17908(v0)
+// 0x010b51a4: 0x10b51a4: lw    a0, -17444(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4b60: 0x10b4b60: addu  a2, zero, zero
+// 0x010b51a8: 0x10b51a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4b64: 0x10b4b64: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b51ac: 0x10b51ac: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5885,12 +5885,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4b6c: 0x10b4b6c: lw    v1, 4(v0)
+// 0x010b51b4: 0x10b51b4: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5899,25 +5899,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4b70: 0x10b4b70: sll   zero, zero, 0
-// 0x010b4b74: 0x10b4b74: bgez  v1, 0x10b4b88 sll   zero, zero, 0
+// 0x010b51b8: 0x10b51b8: sll   zero, zero, 0
+// 0x010b51bc: 0x10b51bc: bgez  v1, 0x10b51d0 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bge L_10b4b88
+	bge L_10b51d0
 // --- basic block ---
-L_10b4b7c:
-// 0x010b4b7c: 0x10b4b7c: lui   v0, 0x10000
+L_10b51c4:
+// 0x010b51c4: 0x10b51c4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b4b80: 0x10b4b80: j	 0x10b4b94 addiu v0, v0, 18500
+// 0x010b51c8: 0x10b51c8: j	 0x10b51dc addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_10b4b94
+	br L_10b51dc
 // --- basic block ---
-L_10b4b88:
-// 0x010b4b88: 0x10b4b88: lw    a0, 8(v0)
+L_10b51d0:
+// 0x010b51d0: 0x10b51d0: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5926,21 +5926,21 @@ L_10b4b88:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4b8c: 0x10b4b8c: jal   0x10b4338 sll   zero, zero, 0
+// 0x010b51d4: 0x10b51d4: jal   0x10b4980 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_get_10b4338(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_get_10b4980(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b4b94:
-// 0x010b4b94: 0x10b4b94: lw    ra, 20(sp)
-// 0x010b4b98: 0x10b4b98: sll   zero, zero, 0
-// 0x010b4b9c: 0x10b4b9c: jr    ra addiu sp, sp, 24
+L_10b51dc:
+// 0x010b51dc: 0x10b51dc: lw    ra, 20(sp)
+// 0x010b51e0: 0x10b51e0: sll   zero, zero, 0
+// 0x010b51e4: 0x10b51e4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5952,7 +5952,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_street_get_street_fename_10b4ba4(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_street_fename_10b51ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5987,35 +5987,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4ba4: 0x10b4ba4: addiu sp, sp, -24
+// 0x010b51ec: 0x10b51ec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b4ba8: 0x10b4ba8: sw    ra, 20(sp)
-// 0x010b4bac: 0x10b4bac: bltz  a0, 0x10b4bd8 addu  a1, a0, zero
+// 0x010b51f0: 0x10b51f0: sw    ra, 20(sp)
+// 0x010b51f4: 0x10b51f4: bltz  a0, 0x10b5220 addu  a1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
 	ldc.i4.s 0
-	blt L_10b4bd8
+	blt L_10b5220
 // --- basic block ---
-// 0x010b4bb4: 0x10b4bb4: lui   v0, 0xe0000
+// 0x010b51fc: 0x10b51fc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4bb8: 0x10b4bb8: lw    a0, -17908(v0)
+// 0x010b5200: 0x10b5200: lw    a0, -17444(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4bbc: 0x10b4bbc: addu  a2, zero, zero
+// 0x010b5204: 0x10b5204: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4bc0: 0x10b4bc0: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b5208: 0x10b5208: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6023,12 +6023,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b4bc8: 0x10b4bc8: lw    a0, 4(v0)
+// 0x010b5210: 0x10b5210: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6037,39 +6037,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4bcc: 0x10b4bcc: sll   zero, zero, 0
-// 0x010b4bd0: 0x10b4bd0: bgez  a0, 0x10b4be4 sll   zero, zero, 0
+// 0x010b5214: 0x10b5214: sll   zero, zero, 0
+// 0x010b5218: 0x10b5218: bgez  a0, 0x10b522c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	bge L_10b4be4
+	bge L_10b522c
 // --- basic block ---
-L_10b4bd8:
-// 0x010b4bd8: 0x10b4bd8: lui   v0, 0x10000
+L_10b5220:
+// 0x010b5220: 0x10b5220: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b4bdc: 0x10b4bdc: j	 0x10b4bec addiu v0, v0, 18500
+// 0x010b5224: 0x10b5224: j	 0x10b5234 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_10b4bec
+	br L_10b5234
 // --- basic block ---
-L_10b4be4:
-// 0x010b4be4: 0x10b4be4: jal   0x10b4338 sll   zero, zero, 0
+L_10b522c:
+// 0x010b522c: 0x10b522c: jal   0x10b4980 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_get_10b4338(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_get_10b4980(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10b4bec:
-// 0x010b4bec: 0x10b4bec: lw    ra, 20(sp)
-// 0x010b4bf0: 0x10b4bf0: sll   zero, zero, 0
-// 0x010b4bf4: 0x10b4bf4: jr    ra addiu sp, sp, 24
+L_10b5234:
+// 0x010b5234: 0x10b5234: lw    ra, 20(sp)
+// 0x010b5238: 0x10b5238: sll   zero, zero, 0
+// 0x010b523c: 0x10b523c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6081,7 +6081,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_street_get_street_name_10b4bfc(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_street_name_10b5244(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
@@ -6122,12 +6122,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4bfc: 0x10b4bfc: addiu sp, sp, -40
+// 0x010b5244: 0x10b5244: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b4c00: 0x10b4c00: sw    s1, 32(sp)
+// 0x010b5248: 0x10b5248: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6136,7 +6136,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b4c04: 0x10b4c04: sw    s0, 28(sp)
+// 0x010b524c: 0x10b524c: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6145,8 +6145,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4c08: 0x10b4c08: sw    ra, 36(sp)
-// 0x010b4c0c: 0x10b4c0c: jal   0x10b4ba4 addu  s1, a0, zero
+// 0x010b5250: 0x10b5250: sw    ra, 36(sp)
+// 0x010b5254: 0x10b5254: jal   0x10b51ec addu  s1, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -6154,15 +6154,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_fename_10b4ba4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_fename_10b51ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010b4c14: 0x10b4c14: addu  s0, v0, zero
+// 0x010b525c: 0x10b525c: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010b4c18: 0x10b4c18: jal   0x10b4b48 addu  a0, s1, zero
+// 0x010b5260: 0x10b5260: jal   0x10b5190 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6170,85 +6170,85 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_fetype_10b4b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_fetype_10b5190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010b4c20: 0x10b4c20: bne   s0, zero, 0x10b4c30 sll   zero, zero, 0
+// 0x010b5268: 0x10b5268: bne   s0, zero, 0x10b5278 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b4c30
+	brtrue L_10b5278
 // --- basic block ---
-// 0x010b4c28: 0x10b4c28: lui   s0, 0x10000
+// 0x010b5270: 0x10b5270: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010b4c2c: 0x10b4c2c: addiu s0, s0, 18500
+// 0x010b5274: 0x10b5274: addiu s0, s0, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-L_10b4c30:
-// 0x010b4c30: 0x10b4c30: bne   v0, zero, 0x10b4c40 sll   zero, zero, 0
+L_10b5278:
+// 0x010b5278: 0x10b5278: bne   v0, zero, 0x10b5288 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b4c40
+	brtrue L_10b5288
 // --- basic block ---
-// 0x010b4c38: 0x10b4c38: lui   v0, 0x10000
+// 0x010b5280: 0x10b5280: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b4c3c: 0x10b4c3c: addiu v0, v0, 18500
+// 0x010b5284: 0x10b5284: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-L_10b4c40:
-// 0x010b4c40: 0x10b4c40: lb    v1, 0(v0)
+L_10b5288:
+// 0x010b5288: 0x10b5288: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x010b4c44: 0x10b4c44: sll   zero, zero, 0
-// 0x010b4c48: 0x10b4c48: bne   v1, zero, 0x10b4c58 lui   a3, 0x10000
+// 0x010b528c: 0x10b528c: sll   zero, zero, 0
+// 0x010b5290: 0x10b5290: bne   v1, zero, 0x10b52a0 lui   a3, 0x10000
 	ldloc 9
 	ldc.i4 65536
 	stloc 4
-	brtrue L_10b4c58
+	brtrue L_10b52a0
 // --- basic block ---
-// 0x010b4c50: 0x10b4c50: j	 0x10b4c60 addiu a3, a3, 18500
+// 0x010b5298: 0x10b5298: j	 0x10b52a8 addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-	br L_10b4c60
+	br L_10b52a8
 // --- basic block ---
-L_10b4c58:
-// 0x010b4c58: 0x10b4c58: lui   a3, 0x20000
+L_10b52a0:
+// 0x010b52a0: 0x10b52a0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b4c5c: 0x10b4c5c: addiu a3, a3, 48
+// 0x010b52a4: 0x10b52a4: addiu a3, a3, 512
 	ldloc 4
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc 4
-L_10b4c60:
-// 0x010b4c60: 0x10b4c60: lui   s1, 0xe0000
+L_10b52a8:
+// 0x010b52a8: 0x10b52a8: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b4c64: 0x10b4c64: lui   a1, 0x0
+// 0x010b52ac: 0x10b52ac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b4c68: 0x10b4c68: addiu a0, s1, -18932
+// 0x010b52b0: 0x10b52b0: addiu a0, s1, -18468
 	ldloc 8
-	ldc.i4 -18932
+	ldc.i4 -18468
 	add
 	stloc.1
-// 0x010b4c6c: 0x10b4c6c: addiu a1, a1, 27816
+// 0x010b52b4: 0x10b52b4: addiu a1, a1, 27816
 	ldloc.2
 	ldc.i4 27816
 	add
 	stloc.2
-// 0x010b4c70: 0x10b4c70: addu  a2, v0, zero
+// 0x010b52b8: 0x10b52b8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b4c74: 0x10b4c74: jal   0x1000f64 sw    s0, 16(sp)
+// 0x010b52bc: 0x10b52bc: jal   0x1000f64 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6267,13 +6267,13 @@ L_10b4c60:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010b4c7c: 0x10b4c7c: lw    ra, 36(sp)
-// 0x010b4c80: 0x10b4c80: addiu v0, s1, -18932
+// 0x010b52c4: 0x10b52c4: lw    ra, 36(sp)
+// 0x010b52c8: 0x10b52c8: addiu v0, s1, -18468
 	ldloc 8
-	ldc.i4 -18932
+	ldc.i4 -18468
 	add
 	stloc 5
-// 0x010b4c84: 0x10b4c84: lw    s1, 32(sp)
+// 0x010b52cc: 0x10b52cc: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6282,7 +6282,7 @@ L_10b4c60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4c88: 0x10b4c88: lw    s0, 28(sp)
+// 0x010b52d0: 0x10b52d0: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6291,7 +6291,7 @@ L_10b4c60:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4c8c: 0x10b4c8c: jr    ra addiu sp, sp, 40
+// 0x010b52d4: 0x10b52d4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6303,7 +6303,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_street_get_full_name_10b4c94(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_full_name_10b52dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 t0,int32 s0,int32 v0,int32 s1,int32 ra)
@@ -6347,13 +6347,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4c94: 0x10b4c94: addiu sp, sp, -48
+// 0x010b52dc: 0x10b52dc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b4c98: 0x10b4c98: sw    ra, 44(sp)
-// 0x010b4c9c: 0x10b4c9c: sw    s1, 40(sp)
+// 0x010b52e0: 0x10b52e0: sw    ra, 44(sp)
+// 0x010b52e4: 0x10b52e4: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6362,7 +6362,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4ca0: 0x10b4ca0: sw    s0, 36(sp)
+// 0x010b52e8: 0x10b52e8: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6371,7 +6371,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b4ca4: 0x10b4ca4: jal   0x10b4aec addu  s0, a0, zero
+// 0x010b52ec: 0x10b52ec: jal   0x10b5134 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -6379,15 +6379,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_city_10b4aec(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_city_10b5134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x010b4cac: 0x10b4cac: addu  s1, v0, zero
+// 0x010b52f4: 0x10b52f4: addu  s1, v0, zero
 	ldloc 9
 	stloc 10
-// 0x010b4cb0: 0x10b4cb0: jal   0x10b4bfc addu  a0, s0, zero
+// 0x010b52f8: 0x10b52f8: jal   0x10b5244 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6395,70 +6395,70 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_name_10b4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_name_10b5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x010b4cb8: 0x10b4cb8: lb    v1, 0(s1)
+// 0x010b5300: 0x10b5300: lb    v1, 0(s1)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010b4cbc: 0x10b4cbc: sll   zero, zero, 0
-// 0x010b4cc0: 0x10b4cc0: bne   v1, zero, 0x10b4cd0 lui   t0, 0x10000
+// 0x010b5304: 0x10b5304: sll   zero, zero, 0
+// 0x010b5308: 0x10b5308: bne   v1, zero, 0x10b5318 lui   t0, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 7
-	brtrue L_10b4cd0
+	brtrue L_10b5318
 // --- basic block ---
-// 0x010b4cc8: 0x10b4cc8: j	 0x10b4cd8 addiu t0, t0, 18500
+// 0x010b5310: 0x10b5310: j	 0x10b5320 addiu t0, t0, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-	br L_10b4cd8
+	br L_10b5320
 // --- basic block ---
-L_10b4cd0:
-// 0x010b4cd0: 0x10b4cd0: lui   t0, 0x0
+L_10b5318:
+// 0x010b5318: 0x10b5318: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010b4cd4: 0x10b4cd4: addiu t0, t0, 27808
+// 0x010b531c: 0x10b531c: addiu t0, t0, 27808
 	ldloc 7
 	ldc.i4 27808
 	add
 	stloc 7
-L_10b4cd8:
-// 0x010b4cd8: 0x10b4cd8: lui   v1, 0x10000
+L_10b5320:
+// 0x010b5320: 0x10b5320: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010b4cdc: 0x10b4cdc: addiu v1, v1, 18500
+// 0x010b5324: 0x10b5324: addiu v1, v1, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-// 0x010b4ce0: 0x10b4ce0: lui   s0, 0xe0000
+// 0x010b5328: 0x10b5328: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b4ce4: 0x10b4ce4: lui   a2, 0x0
+// 0x010b532c: 0x10b532c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4ce8: 0x10b4ce8: addiu a0, s0, -18420
+// 0x010b5330: 0x10b5330: addiu a0, s0, -17956
 	ldloc 8
-	ldc.i4 -18420
+	ldc.i4 -17956
 	add
 	stloc.1
-// 0x010b4cec: 0x10b4cec: addiu a2, a2, 27812
+// 0x010b5334: 0x10b5334: addiu a2, a2, 27812
 	ldloc.3
 	ldc.i4 27812
 	add
 	stloc.3
-// 0x010b4cf0: 0x10b4cf0: addu  a3, v1, zero
+// 0x010b5338: 0x10b5338: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010b4cf4: 0x10b4cf4: addiu a1, zero, 512
+// 0x010b533c: 0x10b533c: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010b4cf8: 0x10b4cf8: sw    s1, 28(sp)
+// 0x010b5340: 0x10b5340: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6467,7 +6467,7 @@ L_10b4cd8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4cfc: 0x10b4cfc: sw    v0, 20(sp)
+// 0x010b5344: 0x10b5344: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6476,7 +6476,7 @@ L_10b4cd8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4d00: 0x10b4d00: sw    t0, 24(sp)
+// 0x010b5348: 0x10b5348: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6485,7 +6485,7 @@ L_10b4cd8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b4d04: 0x10b4d04: jal   0x1000f9c sw    v1, 16(sp)
+// 0x010b534c: 0x10b534c: jal   0x1000f9c sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6504,13 +6504,13 @@ L_10b4cd8:
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x010b4d0c: 0x10b4d0c: lw    ra, 44(sp)
-// 0x010b4d10: 0x10b4d10: addiu v0, s0, -18420
+// 0x010b5354: 0x10b5354: lw    ra, 44(sp)
+// 0x010b5358: 0x10b5358: addiu v0, s0, -17956
 	ldloc 8
-	ldc.i4 -18420
+	ldc.i4 -17956
 	add
 	stloc 9
-// 0x010b4d14: 0x10b4d14: lw    s1, 40(sp)
+// 0x010b535c: 0x10b535c: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6519,7 +6519,7 @@ L_10b4cd8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b4d18: 0x10b4d18: lw    s0, 36(sp)
+// 0x010b5360: 0x10b5360: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6528,7 +6528,7 @@ L_10b4cd8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4d1c: 0x10b4d1c: jr    ra addiu sp, sp, 48
+// 0x010b5364: 0x10b5364: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6540,7 +6540,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 editor_street_get_connected_lines_10b4d24(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_connected_lines_10b536c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s6,int32 s4,int32 s5,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -6605,16 +6605,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b4d24:
-// 0x010b4d24: 0x10b4d24: addiu sp, sp, -96
+L_10b536c:
+// 0x010b536c: 0x10b536c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010b4d28: 0x10b4d28: lui   v0, 0x0
+// 0x010b5370: 0x10b5370: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010b4d2c: 0x10b4d2c: sw    s3, 68(sp)
+// 0x010b5374: 0x10b5374: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6623,7 +6623,7 @@ L_10b4d24:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b4d30: 0x10b4d30: lw    s3, 1816(v0)
+// 0x010b5378: 0x10b5378: lw    s3, 1816(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6632,7 +6632,7 @@ L_10b4d24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b4d34: 0x10b4d34: sw    s2, 64(sp)
+// 0x010b537c: 0x10b537c: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6641,13 +6641,13 @@ L_10b4d24:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4d38: 0x10b4d38: addu  s2, a0, zero
+// 0x010b5380: 0x10b5380: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010b4d3c: 0x10b4d3c: addu  a0, s3, zero
+// 0x010b5384: 0x10b5384: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010b4d40: 0x10b4d40: sw    s0, 56(sp)
+// 0x010b5388: 0x10b5388: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6656,8 +6656,8 @@ L_10b4d24:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b4d44: 0x10b4d44: sw    ra, 92(sp)
-// 0x010b4d48: 0x10b4d48: sw    s8, 88(sp)
+// 0x010b538c: 0x10b538c: sw    ra, 92(sp)
+// 0x010b5390: 0x10b5390: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6666,7 +6666,7 @@ L_10b4d24:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b4d4c: 0x10b4d4c: sw    s7, 84(sp)
+// 0x010b5394: 0x10b5394: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6675,7 +6675,7 @@ L_10b4d24:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b4d50: 0x10b4d50: sw    s6, 80(sp)
+// 0x010b5398: 0x10b5398: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6684,7 +6684,7 @@ L_10b4d24:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b4d54: 0x10b4d54: sw    s5, 76(sp)
+// 0x010b539c: 0x10b539c: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6693,7 +6693,7 @@ L_10b4d24:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b4d58: 0x10b4d58: sw    s4, 72(sp)
+// 0x010b53a0: 0x10b53a0: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6702,7 +6702,7 @@ L_10b4d24:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b4d5c: 0x10b4d5c: sw    s1, 60(sp)
+// 0x010b53a4: 0x10b53a4: sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6711,7 +6711,7 @@ L_10b4d24:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4d60: 0x10b4d60: sw    a1, 100(sp)
+// 0x010b53a8: 0x10b53a8: sw    a1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6720,7 +6720,7 @@ L_10b4d24:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b4d64: 0x10b4d64: jal   0x10b79b4 sw    a2, 104(sp)
+// 0x010b53ac: 0x10b53ac: jal   0x10b7ffc sw    a2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6734,41 +6734,41 @@ L_10b4d24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b4d6c: 0x10b4d6c: addiu v1, zero, -1
+// 0x010b53b4: 0x10b53b4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b4d70: 0x10b4d70: beq   v0, v1, 0x10b4e64 addu  s0, zero, zero
+// 0x010b53b8: 0x10b53b8: beq   v0, v1, 0x10b54ac addu  s0, zero, zero
 	ldloc 7
 	ldloc 6
 	ldc.i4.s 0
 	stloc 8
-	beq  L_10b4e64
+	beq  L_10b54ac
 // --- basic block ---
-// 0x010b4d78: 0x10b4d78: addu  s1, zero, zero
+// 0x010b53c0: 0x10b53c0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010b4d7c: 0x10b4d7c: addiu s8, sp, 40
+// 0x010b53c4: 0x10b53c4: addiu s8, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 16
-// 0x010b4d80: 0x10b4d80: addiu s7, sp, 24
+// 0x010b53c8: 0x10b53c8: addiu s7, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-// 0x010b4d84: 0x10b4d84: addiu s6, zero, 20
+// 0x010b53cc: 0x10b53cc: addiu s6, zero, 20
 	ldc.i4.s 20
 	stloc 12
-// 0x010b4d88: 0x10b4d88: lui   s5, 0x0
+// 0x010b53d0: 0x10b53d0: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x010b4d8c: 0x10b4d8c: jal   0x10b5d08 addiu s4, zero, -1
+// 0x010b53d4: 0x10b53d4: jal   0x10b6350 addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 13
 	ldloc.0
@@ -6776,25 +6776,25 @@ L_10b4d24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_count_10b5d08(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_count_10b6350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b4d94: 0x10b4d94: j	 0x10b4e50 slt   v1, s1, v0
+// 0x010b53dc: 0x10b53dc: j	 0x10b5498 slt   v1, s1, v0
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 6
-	br L_10b4e50
+	br L_10b5498
 // --- basic block ---
-L_10b4d9c:
-// 0x010b4d9c: 0x10b4d9c: addiu v1, sp, 28
+L_10b53e4:
+// 0x010b53e4: 0x10b53e4: addiu v1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 6
-// 0x010b4da0: 0x10b4da0: sw    v1, 20(sp)
+// 0x010b53e8: 0x10b53e8: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6803,7 +6803,7 @@ L_10b4d9c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b4da4: 0x10b4da4: sw    v0, 48(sp)
+// 0x010b53ec: 0x10b53ec: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6812,7 +6812,7 @@ L_10b4d9c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b4da8: 0x10b4da8: jal   0x10b5d30 sw    s7, 16(sp)
+// 0x010b53f0: 0x10b53f0: jal   0x10b6378 sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6826,12 +6826,12 @@ L_10b4d9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010b4db0: 0x10b4db0: lw    v1, 28(sp)
+// 0x010b53f8: 0x10b53f8: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6840,7 +6840,7 @@ L_10b4d9c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4db4: 0x10b4db4: lw    v0, 48(sp)
+// 0x010b53fc: 0x10b53fc: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6849,16 +6849,16 @@ L_10b4d9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4db8: 0x10b4db8: andi  v1, v1, 1
+// 0x010b5400: 0x10b5400: andi  v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	and
 	stloc 6
-// 0x010b4dbc: 0x10b4dbc: bne   v1, zero, 0x10b4e48 sll   zero, zero, 0
+// 0x010b5404: 0x10b5404: bne   v1, zero, 0x10b5490 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b4e48
+	brtrue L_10b5490
 // --- basic block ---
-// 0x010b4dc4: 0x10b4dc4: lw    v1, 4(s2)
+// 0x010b540c: 0x10b540c: lw    v1, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -6867,7 +6867,7 @@ L_10b4d9c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b4dc8: 0x10b4dc8: lw    a0, 36(sp)
+// 0x010b5410: 0x10b5410: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6876,20 +6876,20 @@ L_10b4d9c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4dcc: 0x10b4dcc: sll   zero, zero, 0
-// 0x010b4dd0: 0x10b4dd0: bne   a0, v1, 0x10b4dec sll   zero, zero, 0
+// 0x010b5414: 0x10b5414: sll   zero, zero, 0
+// 0x010b5418: 0x10b5418: bne   a0, v1, 0x10b5434 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_10b4dec
+	bne.un L_10b5434
 // --- basic block ---
-// 0x010b4dd8: 0x10b4dd8: lw    a0, 0(s2)
+// 0x010b5420: 0x10b5420: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b4ddc: 0x10b4ddc: lw    a1, 32(sp)
+// 0x010b5424: 0x10b5424: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6898,18 +6898,18 @@ L_10b4d9c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b4de0: 0x10b4de0: sll   zero, zero, 0
-// 0x010b4de4: 0x10b4de4: beq   a1, a0, 0x10b4e10 mult  s0, s6
+// 0x010b5428: 0x10b5428: sll   zero, zero, 0
+// 0x010b542c: 0x10b542c: beq   a1, a0, 0x10b5458 mult  s0, s6
 	ldloc.2
 	ldloc.1
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 18
-	beq  L_10b4e10
+	beq  L_10b5458
 // --- basic block ---
-L_10b4dec:
-// 0x010b4dec: 0x10b4dec: lw    a0, 44(sp)
+L_10b5434:
+// 0x010b5434: 0x10b5434: lw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6918,20 +6918,20 @@ L_10b4dec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4df0: 0x10b4df0: sll   zero, zero, 0
-// 0x010b4df4: 0x10b4df4: bne   a0, v1, 0x10b4e48 sll   zero, zero, 0
+// 0x010b5438: 0x10b5438: sll   zero, zero, 0
+// 0x010b543c: 0x10b543c: bne   a0, v1, 0x10b5490 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_10b4e48
+	bne.un L_10b5490
 // --- basic block ---
-// 0x010b4dfc: 0x10b4dfc: lw    v1, 0(s2)
+// 0x010b5444: 0x10b5444: lw    v1, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b4e00: 0x10b4e00: lw    a0, 40(sp)
+// 0x010b5448: 0x10b5448: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6940,18 +6940,18 @@ L_10b4dec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4e04: 0x10b4e04: sll   zero, zero, 0
-// 0x010b4e08: 0x10b4e08: bne   a0, v1, 0x10b4e48 mult  s0, s6
+// 0x010b544c: 0x10b544c: sll   zero, zero, 0
+// 0x010b5450: 0x10b5450: bne   a0, v1, 0x10b5490 mult  s0, s6
 	ldloc.1
 	ldloc 6
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 18
-	bne.un L_10b4e48
+	bne.un L_10b5490
 // --- basic block ---
-L_10b4e10:
-// 0x010b4e10: 0x10b4e10: lw    a2, 104(sp)
+L_10b5458:
+// 0x010b5458: 0x10b5458: lw    a2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6960,17 +6960,17 @@ L_10b4e10:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b4e14: 0x10b4e14: addiu s0, s0, 1
+// 0x010b545c: 0x10b545c: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010b4e18: 0x10b4e18: slt   a0, s0, a2
+// 0x010b5460: 0x10b5460: slt   a0, s0, a2
 	ldloc 8
 	ldloc.3
 	clt
 	stloc.1
-// 0x010b4e1c: 0x10b4e1c: lw    a2, 100(sp)
+// 0x010b5464: 0x10b5464: lw    a2, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6979,7 +6979,7 @@ L_10b4e10:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b4e20: 0x10b4e20: lw    a1, 18812(s5)
+// 0x010b5468: 0x10b5468: lw    a1, 18812(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -6988,22 +6988,22 @@ L_10b4e10:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b4e24: 0x10b4e24: mflo  lo
+// 0x010b546c: 0x10b546c: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x010b4e28: 0x10b4e28: addu  v1, a2, v1
+// 0x010b5470: 0x10b5470: addu  v1, a2, v1
 	ldloc.3
 	ldloc 6
 	add
 	stloc 6
-// 0x010b4e2c: 0x10b4e2c: sw    a1, 0(v1)
+// 0x010b5474: 0x10b5474: sw    a1, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010b4e30: 0x10b4e30: lw    a1, 24(sp)
+// 0x010b5478: 0x10b5478: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7012,7 +7012,7 @@ L_10b4e10:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b4e34: 0x10b4e34: sw    s3, 16(v1)
+// 0x010b547c: 0x10b547c: sw    s3, 16(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7021,7 +7021,7 @@ L_10b4e10:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b4e38: 0x10b4e38: sw    a1, 8(v1)
+// 0x010b5480: 0x10b5480: sw    a1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7030,7 +7030,7 @@ L_10b4e10:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b4e3c: 0x10b4e3c: sw    s1, 4(v1)
+// 0x010b5484: 0x10b5484: sw    s1, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7039,7 +7039,7 @@ L_10b4e10:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4e40: 0x10b4e40: beq   a0, zero, 0x10b4e64 sw    s4, 12(v1)
+// 0x010b5488: 0x10b5488: beq   a0, zero, 0x10b54ac sw    s4, 12(v1)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -7049,43 +7049,43 @@ L_10b4e10:
 	add
 	ldloc 13
 	stelem.i4
-	brfalse L_10b4e64
+	brfalse L_10b54ac
 // --- basic block ---
-L_10b4e48:
-// 0x010b4e48: 0x10b4e48: addiu s1, s1, 1
+L_10b5490:
+// 0x010b5490: 0x10b5490: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010b4e4c: 0x10b4e4c: slt   v1, s1, v0
+// 0x010b5494: 0x10b5494: slt   v1, s1, v0
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 6
-L_10b4e50:
-// 0x010b4e50: 0x10b4e50: addu  a0, s1, zero
+L_10b5498:
+// 0x010b5498: 0x10b5498: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b4e54: 0x10b4e54: addiu a1, sp, 32
+// 0x010b549c: 0x10b549c: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010b4e58: 0x10b4e58: addu  a2, s8, zero
+// 0x010b54a0: 0x10b54a0: addu  a2, s8, zero
 	ldloc 16
 	stloc.3
-// 0x010b4e5c: 0x10b4e5c: bne   v1, zero, 0x10b4d9c addu  a3, zero, zero
+// 0x010b54a4: 0x10b54a4: bne   v1, zero, 0x10b53e4 addu  a3, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_10b4d9c
+	brtrue L_10b53e4
 // --- basic block ---
-L_10b4e64:
-// 0x010b4e64: 0x10b4e64: lw    ra, 92(sp)
-// 0x010b4e68: 0x10b4e68: addu  v0, s0, zero
+L_10b54ac:
+// 0x010b54ac: 0x10b54ac: lw    ra, 92(sp)
+// 0x010b54b0: 0x10b54b0: addu  v0, s0, zero
 	ldloc 8
 	stloc 7
-// 0x010b4e6c: 0x10b4e6c: lw    s8, 88(sp)
+// 0x010b54b4: 0x10b54b4: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7094,7 +7094,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b4e70: 0x10b4e70: lw    s7, 84(sp)
+// 0x010b54b8: 0x10b54b8: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7103,7 +7103,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b4e74: 0x10b4e74: lw    s6, 80(sp)
+// 0x010b54bc: 0x10b54bc: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7112,7 +7112,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b4e78: 0x10b4e78: lw    s5, 76(sp)
+// 0x010b54c0: 0x10b54c0: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7121,7 +7121,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b4e7c: 0x10b4e7c: lw    s4, 72(sp)
+// 0x010b54c4: 0x10b54c4: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7130,7 +7130,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b4e80: 0x10b4e80: lw    s3, 68(sp)
+// 0x010b54c8: 0x10b54c8: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7139,7 +7139,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b4e84: 0x10b4e84: lw    s2, 64(sp)
+// 0x010b54cc: 0x10b54cc: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7148,7 +7148,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b4e88: 0x10b4e88: lw    s1, 60(sp)
+// 0x010b54d0: 0x10b54d0: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7157,7 +7157,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b4e8c: 0x10b4e8c: lw    s0, 56(sp)
+// 0x010b54d4: 0x10b54d4: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7166,7 +7166,7 @@ L_10b4e64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4e90: 0x10b4e90: jr    ra addiu sp, sp, 96
+// 0x010b54d8: 0x10b54d8: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -7178,7 +7178,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_street_create_10b4e98(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_create_10b54e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra)
@@ -7222,13 +7222,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4e98: 0x10b4e98: addiu sp, sp, -72
+// 0x010b54e0: 0x10b54e0: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010b4e9c: 0x10b4e9c: sw    ra, 68(sp)
-// 0x010b4ea0: 0x10b4ea0: sw    a3, 48(sp)
+// 0x010b54e4: 0x10b54e4: sw    ra, 68(sp)
+// 0x010b54e8: 0x10b54e8: sw    a3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7237,7 +7237,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b4ea4: 0x10b4ea4: sw    a2, 44(sp)
+// 0x010b54ec: 0x10b54ec: sw    a2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7246,7 +7246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b4ea8: 0x10b4ea8: sw    a1, 40(sp)
+// 0x010b54f0: 0x10b54f0: sw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7255,7 +7255,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b4eac: 0x10b4eac: sw    s2, 64(sp)
+// 0x010b54f4: 0x10b54f4: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7264,7 +7264,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4eb0: 0x10b4eb0: sw    s1, 60(sp)
+// 0x010b54f8: 0x10b54f8: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7273,7 +7273,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4eb4: 0x10b4eb4: jal   0x10b441c sw    s0, 56(sp)
+// 0x010b54fc: 0x10b54fc: jal   0x10b4a64 sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7287,12 +7287,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4ebc: 0x10b4ebc: lw    a1, 40(sp)
+// 0x010b5504: 0x10b5504: lw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7301,7 +7301,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b4ec0: 0x10b4ec0: sw    v0, 20(sp)
+// 0x010b5508: 0x10b5508: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7310,7 +7310,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b4ec4: 0x10b4ec4: jal   0x10b441c addu  a0, a1, zero
+// 0x010b550c: 0x10b550c: jal   0x10b4a64 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -7318,12 +7318,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4ecc: 0x10b4ecc: lw    a2, 44(sp)
+// 0x010b5514: 0x10b5514: lw    a2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7332,7 +7332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b4ed0: 0x10b4ed0: sw    v0, 24(sp)
+// 0x010b5518: 0x10b5518: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7341,7 +7341,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b4ed4: 0x10b4ed4: jal   0x10b441c addu  a0, a2, zero
+// 0x010b551c: 0x10b551c: jal   0x10b4a64 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -7349,12 +7349,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4edc: 0x10b4edc: lw    a3, 48(sp)
+// 0x010b5524: 0x10b5524: lw    a3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7363,7 +7363,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b4ee0: 0x10b4ee0: sw    v0, 16(sp)
+// 0x010b5528: 0x10b5528: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7372,7 +7372,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b4ee4: 0x10b4ee4: jal   0x10b441c addu  a0, a3, zero
+// 0x010b552c: 0x10b552c: jal   0x10b4a64 addu  a0, a3, zero
 	ldloc 4
 	stloc.1
 	ldloc.0
@@ -7380,12 +7380,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4eec: 0x10b4eec: lw    a0, 88(sp)
+// 0x010b5534: 0x10b5534: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7394,7 +7394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4ef0: 0x10b4ef0: jal   0x10b441c sw    v0, 28(sp)
+// 0x010b5538: 0x10b5538: jal   0x10b4a64 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7408,12 +7408,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4ef8: 0x10b4ef8: lw    a0, 92(sp)
+// 0x010b5540: 0x10b5540: lw    a0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7422,7 +7422,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4efc: 0x10b4efc: jal   0x10b441c sw    v0, 36(sp)
+// 0x010b5544: 0x10b5544: jal   0x10b4a64 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7436,12 +7436,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_dictionary_add_10b441c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_dictionary_add_10b4a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4f04: 0x10b4f04: lw    v1, 20(sp)
+// 0x010b554c: 0x10b554c: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7450,7 +7450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b4f08: 0x10b4f08: sw    v0, 32(sp)
+// 0x010b5550: 0x10b5550: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7459,124 +7459,124 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b4f0c: 0x10b4f0c: addiu v0, zero, -1
+// 0x010b5554: 0x10b5554: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b4f10: 0x10b4f10: beq   v1, v0, 0x10b4f6c lui   s2, 0xe0000
+// 0x010b5558: 0x10b5558: beq   v1, v0, 0x10b55b4 lui   s2, 0xe0000
 	ldloc 7
 	ldloc 5
 	ldc.i4 917504
 	stloc 9
-	beq  L_10b4f6c
+	beq  L_10b55b4
 // --- basic block ---
-// 0x010b4f18: 0x10b4f18: lw    a0, -17908(s2)
+// 0x010b5560: 0x10b5560: lw    a0, -17444(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4f1c: 0x10b4f1c: jal   0x10b6a20 addiu s1, sp, 16
+// 0x010b5564: 0x10b5564: jal   0x10b7068 addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b4f24: 0x10b4f24: j	 0x10b4f5c addiu s0, v0, -1
+// 0x010b556c: 0x10b556c: j	 0x10b55a4 addiu s0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 8
-	br L_10b4f5c
+	br L_10b55a4
 // --- basic block ---
-L_10b4f2c:
-// 0x010b4f2c: 0x10b4f2c: lw    a0, -17908(s2)
+L_10b5574:
+// 0x010b5574: 0x10b5574: lw    a0, -17444(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4f30: 0x10b4f30: jal   0x10b6f58 sll   zero, zero, 0
+// 0x010b5578: 0x10b5578: jal   0x10b75a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4f38: 0x10b4f38: addu  a0, v0, zero
+// 0x010b5580: 0x10b5580: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b4f3c: 0x10b4f3c: addu  a1, s1, zero
+// 0x010b5584: 0x10b5584: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010b4f40: 0x10b4f40: beq   v0, zero, 0x10b4f58 addiu a2, zero, 24
+// 0x010b5588: 0x10b5588: beq   v0, zero, 0x10b55a0 addiu a2, zero, 24
 	ldloc 5
 	ldc.i4.s 24
 	stloc.3
-	brfalse L_10b4f58
+	brfalse L_10b55a0
 // --- basic block ---
-// 0x010b4f48: 0x10b4f48: jal   0x1001b8c sll   zero, zero, 0
+// 0x010b5590: 0x10b5590: jal   0x1001b8c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	call int32 Cibyl1::memcmp_1001b8c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010b4f50: 0x10b4f50: beq   v0, zero, 0x10b4f84 sll   zero, zero, 0
+// 0x010b5598: 0x10b5598: beq   v0, zero, 0x10b55cc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b4f84
+	brfalse L_10b55cc
 // --- basic block ---
-L_10b4f58:
-// 0x010b4f58: 0x10b4f58: addiu s0, s0, -1
+L_10b55a0:
+// 0x010b55a0: 0x10b55a0: addiu s0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_10b4f5c:
-// 0x010b4f5c: 0x10b4f5c: addu  a1, s0, zero
+L_10b55a4:
+// 0x010b55a4: 0x10b55a4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010b4f60: 0x10b4f60: addu  a2, zero, zero
+// 0x010b55a8: 0x10b55a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b4f64: 0x10b4f64: bgez  s0, 0x10b4f2c addu  a3, zero, zero
+// 0x010b55ac: 0x10b55ac: bgez  s0, 0x10b5574 addu  a3, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 4
 	ldc.i4.s 0
-	bge L_10b4f2c
+	bge L_10b5574
 // --- basic block ---
-L_10b4f6c:
-// 0x010b4f6c: 0x10b4f6c: lui   v0, 0xe0000
+L_10b55b4:
+// 0x010b55b4: 0x10b55b4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b4f70: 0x10b4f70: lw    a0, -17908(v0)
+// 0x010b55b8: 0x10b55b8: lw    a0, -17444(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4477
+	ldc.i4 -4361
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b4f74: 0x10b4f74: addiu a1, sp, 16
+// 0x010b55bc: 0x10b55bc: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b4f78: 0x10b4f78: jal   0x10b72a4 addiu a2, zero, 1
+// 0x010b55c0: 0x10b55c0: jal   0x10b78ec addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -7584,20 +7584,20 @@ L_10b4f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b4f80: 0x10b4f80: addu  s0, v0, zero
+// 0x010b55c8: 0x10b55c8: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_10b4f84:
-// 0x010b4f84: 0x10b4f84: lw    ra, 68(sp)
-// 0x010b4f88: 0x10b4f88: addu  v0, s0, zero
+L_10b55cc:
+// 0x010b55cc: 0x10b55cc: lw    ra, 68(sp)
+// 0x010b55d0: 0x10b55d0: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010b4f8c: 0x10b4f8c: lw    s2, 64(sp)
+// 0x010b55d4: 0x10b55d4: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7606,7 +7606,7 @@ L_10b4f84:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b4f90: 0x10b4f90: lw    s1, 60(sp)
+// 0x010b55d8: 0x10b55d8: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7615,7 +7615,7 @@ L_10b4f84:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b4f94: 0x10b4f94: lw    s0, 56(sp)
+// 0x010b55dc: 0x10b55dc: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7624,7 +7624,7 @@ L_10b4f84:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b4f98: 0x10b4f98: jr    ra addiu sp, sp, 72
+// 0x010b55e0: 0x10b55e0: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -7636,7 +7636,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_street_get_distance_with_shape_10b4fa0(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_distance_with_shape_10b55e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s4,int32 s5,int32 s1,int32 s2,int32 s6,int32 s7,int32 s8,int32 ra,int32 t0)
@@ -7701,12 +7701,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b4fa0: 0x10b4fa0: addiu sp, sp, -160
+// 0x010b55e8: 0x10b55e8: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x010b4fa4: 0x10b4fa4: sw    s0, 120(sp)
+// 0x010b55ec: 0x10b55ec: sw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7715,15 +7715,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b4fa8: 0x10b4fa8: addu  s0, a1, zero
+// 0x010b55f0: 0x10b55f0: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b4fac: 0x10b4fac: addiu v0, sp, 32
+// 0x010b55f4: 0x10b55f4: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x010b4fb0: 0x10b4fb0: sw    s5, 140(sp)
+// 0x010b55f8: 0x10b55f8: sw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7732,7 +7732,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b4fb4: 0x10b4fb4: sw    s4, 136(sp)
+// 0x010b55fc: 0x10b55fc: sw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7741,7 +7741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b4fb8: 0x10b4fb8: sw    s3, 132(sp)
+// 0x010b5600: 0x10b5600: sw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7750,32 +7750,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b4fbc: 0x10b4fbc: addu  s5, a2, zero
+// 0x010b5604: 0x10b5604: addu  s5, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010b4fc0: 0x10b4fc0: addu  s4, a3, zero
+// 0x010b5608: 0x10b5608: addu  s4, a3, zero
 	ldloc 4
 	stloc 10
-// 0x010b4fc4: 0x10b4fc4: addiu a1, sp, 44
+// 0x010b560c: 0x10b560c: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x010b4fc8: 0x10b4fc8: addiu a2, sp, 52
+// 0x010b5610: 0x10b5610: addiu a2, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.3
-// 0x010b4fcc: 0x10b4fcc: addiu a3, sp, 36
+// 0x010b5614: 0x10b5614: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x010b4fd0: 0x10b4fd0: addu  s3, a0, zero
+// 0x010b5618: 0x10b5618: addu  s3, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b4fd4: 0x10b4fd4: sw    ra, 156(sp)
-// 0x010b4fd8: 0x10b4fd8: sw    s2, 128(sp)
+// 0x010b561c: 0x10b561c: sw    ra, 156(sp)
+// 0x010b5620: 0x10b5620: sw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7784,7 +7784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b4fdc: 0x10b4fdc: sw    s1, 124(sp)
+// 0x010b5624: 0x10b5624: sw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7793,7 +7793,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b4fe0: 0x10b4fe0: sw    v0, 16(sp)
+// 0x010b5628: 0x10b5628: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7802,7 +7802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b4fe4: 0x10b4fe4: sw    s8, 152(sp)
+// 0x010b562c: 0x10b562c: sw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7811,7 +7811,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b4fe8: 0x10b4fe8: sw    s7, 148(sp)
+// 0x010b5630: 0x10b5630: sw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7820,7 +7820,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b4fec: 0x10b4fec: sw    s6, 144(sp)
+// 0x010b5634: 0x10b5634: sw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7829,7 +7829,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b4ff0: 0x10b4ff0: sw    zero, 20(sp)
+// 0x010b5638: 0x10b5638: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7838,7 +7838,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b4ff4: 0x10b4ff4: lw    s2, 176(sp)
+// 0x010b563c: 0x10b563c: lw    s2, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7847,7 +7847,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b4ff8: 0x10b4ff8: lw    s1, 180(sp)
+// 0x010b5640: 0x10b5640: lw    s1, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7856,7 +7856,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b4ffc: 0x10b4ffc: jal   0x10b5d30 addu  a0, s0, zero
+// 0x010b5644: 0x10b5644: jal   0x10b6378 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7864,15 +7864,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b5004: 0x10b5004: lui   v0, 0x0
+// 0x010b564c: 0x10b564c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b5008: 0x10b5008: lw    v0, 18812(v0)
+// 0x010b5650: 0x10b5650: lw    v0, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7881,7 +7881,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b500c: 0x10b500c: lw    a0, 36(sp)
+// 0x010b5654: 0x10b5654: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7890,7 +7890,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5010: 0x10b5010: sw    v0, 60(sp)
+// 0x010b5658: 0x10b5658: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7899,7 +7899,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b5014: 0x10b5014: lw    v0, 32(sp)
+// 0x010b565c: 0x10b565c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7908,12 +7908,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5018: 0x10b5018: addiu a1, sp, 40
+// 0x010b5660: 0x10b5660: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b501c: 0x10b501c: sw    v0, 68(sp)
+// 0x010b5664: 0x10b5664: sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7922,7 +7922,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b5020: 0x10b5020: lw    v0, 44(sp)
+// 0x010b5668: 0x10b5668: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7931,12 +7931,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5024: 0x10b5024: addiu a2, sp, 24
+// 0x010b566c: 0x10b566c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010b5028: 0x10b5028: sw    v0, 84(sp)
+// 0x010b5670: 0x10b5670: sw    v0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7945,7 +7945,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b502c: 0x10b502c: lw    v0, 48(sp)
+// 0x010b5674: 0x10b5674: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7954,12 +7954,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5030: 0x10b5030: addiu a3, sp, 28
+// 0x010b5678: 0x10b5678: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010b5034: 0x10b5034: sw    v0, 88(sp)
+// 0x010b567c: 0x10b567c: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7968,7 +7968,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b5038: 0x10b5038: sw    s0, 64(sp)
+// 0x010b5680: 0x10b5680: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7977,7 +7977,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b503c: 0x10b503c: sw    s5, 72(sp)
+// 0x010b5684: 0x10b5684: sw    s5, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7986,7 +7986,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5040: 0x10b5040: sw    s4, 76(sp)
+// 0x010b5688: 0x10b5688: sw    s4, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7995,7 +7995,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5044: 0x10b5044: jal   0x10b48f8 sw    zero, 16(sp)
+// 0x010b568c: 0x10b568c: jal   0x10b4f40 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8009,12 +8009,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b504c: 0x10b504c: lw    a0, 40(sp)
+// 0x010b5694: 0x10b5694: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8023,7 +8023,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5050: 0x10b5050: jal   0x10b46a0 addiu a1, sp, 92
+// 0x010b5698: 0x10b5698: jal   0x10b4ce8 addiu a1, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
@@ -8033,12 +8033,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b5058: 0x10b5058: lw    v0, 24(sp)
+// 0x010b56a0: 0x10b56a0: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8047,18 +8047,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b505c: 0x10b505c: addiu v1, zero, -1
+// 0x010b56a4: 0x10b56a4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b5060: 0x10b5060: bne   v0, v1, 0x10b5070 sll   zero, zero, 0
+// 0x010b56a8: 0x10b56a8: bne   v0, v1, 0x10b56b8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_10b5070
+	bne.un L_10b56b8
 // --- basic block ---
-// 0x010b5068: 0x10b5068: addiu v1, zero, -2
+// 0x010b56b0: 0x10b56b0: addiu v1, zero, -2
 	ldc.i4.s -2
 	stloc 7
-// 0x010b506c: 0x10b506c: sw    v1, 28(sp)
+// 0x010b56b4: 0x10b56b4: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8067,11 +8067,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-L_10b5070:
-// 0x010b5070: 0x10b5070: lui   s0, 0xe0000
+L_10b56b8:
+// 0x010b56b8: 0x10b56b8: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b5074: 0x10b5074: sw    v0, 40(sp)
+// 0x010b56bc: 0x10b56bc: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8080,41 +8080,41 @@ L_10b5070:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b5078: 0x10b5078: addiu s0, s0, 29604
+// 0x010b56c0: 0x10b56c0: addiu s0, s0, 30068
 	ldloc 8
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x010b507c: 0x10b507c: addu  v1, zero, zero
+// 0x010b56c4: 0x10b56c4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010b5080: 0x10b5080: addiu s4, sp, 92
+// 0x010b56c8: 0x10b56c8: addiu s4, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc 10
-// 0x010b5084: 0x10b5084: addiu s8, sp, 60
+// 0x010b56cc: 0x10b56cc: addiu s8, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 16
-// 0x010b5088: 0x10b5088: addiu s7, sp, 84
+// 0x010b56d0: 0x10b56d0: addiu s7, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc 15
-// 0x010b508c: 0x10b508c: addiu s6, sp, 100
+// 0x010b56d4: 0x10b56d4: addiu s6, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc 14
-// 0x010b5090: 0x10b5090: j	 0x10b5164 addu  s5, zero, zero
+// 0x010b56d8: 0x10b56d8: j	 0x10b57ac addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_10b5164
+	br L_10b57ac
 // --- basic block ---
-L_10b5098:
-// 0x010b5098: 0x10b5098: jal   0x10b45c4 sw    v1, 112(sp)
+L_10b56e0:
+// 0x010b56e0: 0x10b56e0: jal   0x10b4c0c sw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8128,12 +8128,12 @@ L_10b5098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_position_10b45c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_position_10b4c0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b50a0: 0x10b50a0: lw    a0, 84(sp)
+// 0x010b56e8: 0x10b56e8: lw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8142,7 +8142,7 @@ L_10b5098:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b50a4: 0x10b50a4: lw    v0, 56(s0)
+// 0x010b56ec: 0x10b56ec: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8151,7 +8151,7 @@ L_10b5098:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b50a8: 0x10b50a8: lw    v1, 112(sp)
+// 0x010b56f0: 0x10b56f0: lw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8160,16 +8160,16 @@ L_10b5098:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b50ac: 0x10b50ac: slt   a1, v0, a0
+// 0x010b56f4: 0x10b56f4: slt   a1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.2
-// 0x010b50b0: 0x10b50b0: beq   a1, zero, 0x10b50cc sll   zero, zero, 0
+// 0x010b56f8: 0x10b56f8: beq   a1, zero, 0x10b5714 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b50cc
+	brfalse L_10b5714
 // --- basic block ---
-// 0x010b50b8: 0x10b50b8: lw    a1, 92(sp)
+// 0x010b5700: 0x10b5700: lw    a1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8178,18 +8178,18 @@ L_10b5098:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b50bc: 0x10b50bc: sll   zero, zero, 0
-// 0x010b50c0: 0x10b50c0: slt   v0, v0, a1
+// 0x010b5704: 0x10b5704: sll   zero, zero, 0
+// 0x010b5708: 0x10b5708: slt   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x010b50c4: 0x10b50c4: bne   v0, zero, 0x10b5148 sll   zero, zero, 0
+// 0x010b570c: 0x10b570c: bne   v0, zero, 0x10b5790 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b5148
+	brtrue L_10b5790
 // --- basic block ---
-L_10b50cc:
-// 0x010b50cc: 0x10b50cc: lw    v0, 64(s0)
+L_10b5714:
+// 0x010b5714: 0x10b5714: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8198,17 +8198,17 @@ L_10b50cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b50d0: 0x10b50d0: sll   zero, zero, 0
-// 0x010b50d4: 0x10b50d4: slt   a0, a0, v0
+// 0x010b5718: 0x10b5718: sll   zero, zero, 0
+// 0x010b571c: 0x10b571c: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x010b50d8: 0x10b50d8: beq   a0, zero, 0x10b50f4 sll   zero, zero, 0
+// 0x010b5720: 0x10b5720: beq   a0, zero, 0x10b573c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b50f4
+	brfalse L_10b573c
 // --- basic block ---
-// 0x010b50e0: 0x10b50e0: lw    a0, 92(sp)
+// 0x010b5728: 0x10b5728: lw    a0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8217,18 +8217,18 @@ L_10b50cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b50e4: 0x10b50e4: sll   zero, zero, 0
-// 0x010b50e8: 0x10b50e8: slt   v0, a0, v0
+// 0x010b572c: 0x10b572c: sll   zero, zero, 0
+// 0x010b5730: 0x10b5730: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b50ec: 0x10b50ec: bne   v0, zero, 0x10b514c sll   zero, zero, 0
+// 0x010b5734: 0x10b5734: bne   v0, zero, 0x10b5794 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b514c
+	brtrue L_10b5794
 // --- basic block ---
-L_10b50f4:
-// 0x010b50f4: 0x10b50f4: lw    a0, 88(sp)
+L_10b573c:
+// 0x010b573c: 0x10b573c: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8237,7 +8237,7 @@ L_10b50f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b50f8: 0x10b50f8: lw    v0, 60(s0)
+// 0x010b5740: 0x10b5740: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8246,17 +8246,17 @@ L_10b50f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b50fc: 0x10b50fc: sll   zero, zero, 0
-// 0x010b5100: 0x10b5100: slt   a1, v0, a0
+// 0x010b5744: 0x10b5744: sll   zero, zero, 0
+// 0x010b5748: 0x10b5748: slt   a1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.2
-// 0x010b5104: 0x10b5104: beq   a1, zero, 0x10b5120 sll   zero, zero, 0
+// 0x010b574c: 0x10b574c: beq   a1, zero, 0x10b5768 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b5120
+	brfalse L_10b5768
 // --- basic block ---
-// 0x010b510c: 0x10b510c: lw    a1, 96(sp)
+// 0x010b5754: 0x10b5754: lw    a1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8265,18 +8265,18 @@ L_10b50f4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b5110: 0x10b5110: sll   zero, zero, 0
-// 0x010b5114: 0x10b5114: slt   v0, v0, a1
+// 0x010b5758: 0x10b5758: sll   zero, zero, 0
+// 0x010b575c: 0x10b575c: slt   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x010b5118: 0x10b5118: bne   v0, zero, 0x10b5148 sll   zero, zero, 0
+// 0x010b5760: 0x10b5760: bne   v0, zero, 0x10b5790 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b5148
+	brtrue L_10b5790
 // --- basic block ---
-L_10b5120:
-// 0x010b5120: 0x10b5120: lw    v0, 68(s0)
+L_10b5768:
+// 0x010b5768: 0x10b5768: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8285,17 +8285,17 @@ L_10b5120:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5124: 0x10b5124: sll   zero, zero, 0
-// 0x010b5128: 0x10b5128: slt   a0, a0, v0
+// 0x010b576c: 0x10b576c: sll   zero, zero, 0
+// 0x010b5770: 0x10b5770: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x010b512c: 0x10b512c: beq   a0, zero, 0x10b5264 sll   zero, zero, 0
+// 0x010b5774: 0x10b5774: beq   a0, zero, 0x10b58ac sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b5264
+	brfalse L_10b58ac
 // --- basic block ---
-// 0x010b5134: 0x10b5134: lw    a0, 96(sp)
+// 0x010b577c: 0x10b577c: lw    a0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8304,18 +8304,18 @@ L_10b5120:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5138: 0x10b5138: sll   zero, zero, 0
-// 0x010b513c: 0x10b513c: slt   v0, a0, v0
+// 0x010b5780: 0x10b5780: sll   zero, zero, 0
+// 0x010b5784: 0x10b5784: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b5140: 0x10b5140: beq   v0, zero, 0x10b5264 sll   zero, zero, 0
+// 0x010b5788: 0x10b5788: beq   v0, zero, 0x10b58ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b5264
+	brfalse L_10b58ac
 // --- basic block ---
-L_10b5148:
-// 0x010b5148: 0x10b5148: lw    a0, 92(sp)
+L_10b5790:
+// 0x010b5790: 0x10b5790: lw    a0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8324,8 +8324,8 @@ L_10b5148:
 	add
 	ldelem.i4
 	stloc.1
-L_10b514c:
-// 0x010b514c: 0x10b514c: lw    v0, 40(sp)
+L_10b5794:
+// 0x010b5794: 0x10b5794: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8334,7 +8334,7 @@ L_10b514c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5150: 0x10b5150: sw    a0, 84(sp)
+// 0x010b5798: 0x10b5798: sw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8343,7 +8343,7 @@ L_10b514c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b5154: 0x10b5154: lw    a0, 96(sp)
+// 0x010b579c: 0x10b579c: lw    a0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8352,12 +8352,12 @@ L_10b514c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5158: 0x10b5158: addiu v0, v0, 1
+// 0x010b57a0: 0x10b57a0: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010b515c: 0x10b515c: sw    a0, 88(sp)
+// 0x010b57a4: 0x10b57a4: sw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8366,7 +8366,7 @@ L_10b514c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b5160: 0x10b5160: sw    v0, 40(sp)
+// 0x010b57a8: 0x10b57a8: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8375,8 +8375,8 @@ L_10b514c:
 	add
 	ldloc 5
 	stelem.i4
-L_10b5164:
-// 0x010b5164: 0x10b5164: lw    a0, 40(sp)
+L_10b57ac:
+// 0x010b57ac: 0x10b57ac: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8385,7 +8385,7 @@ L_10b5164:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5168: 0x10b5168: lw    v0, 28(sp)
+// 0x010b57b0: 0x10b57b0: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8394,19 +8394,19 @@ L_10b5164:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b516c: 0x10b516c: sll   zero, zero, 0
-// 0x010b5170: 0x10b5170: slt   v0, v0, a0
+// 0x010b57b4: 0x10b57b4: sll   zero, zero, 0
+// 0x010b57b8: 0x10b57b8: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010b5174: 0x10b5174: beq   v0, zero, 0x10b5098 addu  a1, s4, zero
+// 0x010b57bc: 0x10b57bc: beq   v0, zero, 0x10b56e0 addu  a1, s4, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brfalse L_10b5098
+	brfalse L_10b56e0
 // --- basic block ---
-// 0x010b517c: 0x10b517c: lw    v0, 56(s0)
+// 0x010b57c4: 0x10b57c4: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8415,7 +8415,7 @@ L_10b5164:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5180: 0x10b5180: lw    a0, 84(sp)
+// 0x010b57c8: 0x10b57c8: lw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8424,7 +8424,7 @@ L_10b5164:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5184: 0x10b5184: lw    a1, 52(sp)
+// 0x010b57cc: 0x10b57cc: lw    a1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8433,7 +8433,7 @@ L_10b5164:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b5188: 0x10b5188: lw    a3, 56(sp)
+// 0x010b57d0: 0x10b57d0: lw    a3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8442,12 +8442,12 @@ L_10b5164:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b518c: 0x10b518c: slt   a2, v0, a0
+// 0x010b57d4: 0x10b57d4: slt   a2, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.3
-// 0x010b5190: 0x10b5190: sw    a3, 96(sp)
+// 0x010b57d8: 0x10b57d8: sw    a3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8456,7 +8456,7 @@ L_10b5164:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b5194: 0x10b5194: beq   a2, zero, 0x10b51a8 sw    a1, 92(sp)
+// 0x010b57dc: 0x10b57dc: beq   a2, zero, 0x10b57f0 sw    a1, 92(sp)
 	ldloc.3
 	ldloc 6
 	ldloc.0
@@ -8466,41 +8466,41 @@ L_10b5164:
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_10b51a8
+	brfalse L_10b57f0
 // --- basic block ---
-// 0x010b519c: 0x10b519c: slt   v0, v0, a1
+// 0x010b57e4: 0x10b57e4: slt   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x010b51a0: 0x10b51a0: bne   v0, zero, 0x10b5230 sll   zero, zero, 0
+// 0x010b57e8: 0x10b57e8: bne   v0, zero, 0x10b5878 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b5230
+	brtrue L_10b5878
 // --- basic block ---
-L_10b51a8:
-// 0x010b51a8: 0x10b51a8: lui   v0, 0xe0000
+L_10b57f0:
+// 0x010b57f0: 0x10b57f0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b51ac: 0x10b51ac: lw    v0, 29668(v0)
+// 0x010b57f4: 0x10b57f4: lw    v0, 30132(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7417
+	ldc.i4 7533
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b51b0: 0x10b51b0: sll   zero, zero, 0
-// 0x010b51b4: 0x10b51b4: slt   a0, a0, v0
+// 0x010b57f8: 0x10b57f8: sll   zero, zero, 0
+// 0x010b57fc: 0x10b57fc: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x010b51b8: 0x10b51b8: beq   a0, zero, 0x10b51d4 sll   zero, zero, 0
+// 0x010b5800: 0x10b5800: beq   a0, zero, 0x10b581c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b51d4
+	brfalse L_10b581c
 // --- basic block ---
-// 0x010b51c0: 0x10b51c0: lw    a0, 92(sp)
+// 0x010b5808: 0x10b5808: lw    a0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8509,30 +8509,30 @@ L_10b51a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b51c4: 0x10b51c4: sll   zero, zero, 0
-// 0x010b51c8: 0x10b51c8: slt   v0, a0, v0
+// 0x010b580c: 0x10b580c: sll   zero, zero, 0
+// 0x010b5810: 0x10b5810: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b51cc: 0x10b51cc: bne   v0, zero, 0x10b5230 sll   zero, zero, 0
+// 0x010b5814: 0x10b5814: bne   v0, zero, 0x10b5878 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b5230
+	brtrue L_10b5878
 // --- basic block ---
-L_10b51d4:
-// 0x010b51d4: 0x10b51d4: lui   v0, 0xe0000
+L_10b581c:
+// 0x010b581c: 0x10b581c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b51d8: 0x10b51d8: lw    v0, 29664(v0)
+// 0x010b5820: 0x10b5820: lw    v0, 30128(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7416
+	ldc.i4 7532
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b51dc: 0x10b51dc: lw    a0, 88(sp)
+// 0x010b5824: 0x10b5824: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8541,17 +8541,17 @@ L_10b51d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b51e0: 0x10b51e0: sll   zero, zero, 0
-// 0x010b51e4: 0x10b51e4: slt   a1, v0, a0
+// 0x010b5828: 0x10b5828: sll   zero, zero, 0
+// 0x010b582c: 0x10b582c: slt   a1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.2
-// 0x010b51e8: 0x10b51e8: beq   a1, zero, 0x10b5204 sll   zero, zero, 0
+// 0x010b5830: 0x10b5830: beq   a1, zero, 0x10b584c sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b5204
+	brfalse L_10b584c
 // --- basic block ---
-// 0x010b51f0: 0x10b51f0: lw    a1, 96(sp)
+// 0x010b5838: 0x10b5838: lw    a1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8560,42 +8560,42 @@ L_10b51d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b51f4: 0x10b51f4: sll   zero, zero, 0
-// 0x010b51f8: 0x10b51f8: slt   v0, v0, a1
+// 0x010b583c: 0x10b583c: sll   zero, zero, 0
+// 0x010b5840: 0x10b5840: slt   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x010b51fc: 0x10b51fc: bne   v0, zero, 0x10b5230 sll   zero, zero, 0
+// 0x010b5844: 0x10b5844: bne   v0, zero, 0x10b5878 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b5230
+	brtrue L_10b5878
 // --- basic block ---
-L_10b5204:
-// 0x010b5204: 0x10b5204: lui   v0, 0xe0000
+L_10b584c:
+// 0x010b584c: 0x10b584c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5208: 0x10b5208: lw    v0, 29672(v0)
+// 0x010b5850: 0x10b5850: lw    v0, 30136(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7418
+	ldc.i4 7534
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b520c: 0x10b520c: sll   zero, zero, 0
-// 0x010b5210: 0x10b5210: slt   a0, a0, v0
+// 0x010b5854: 0x10b5854: sll   zero, zero, 0
+// 0x010b5858: 0x10b5858: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x010b5214: 0x10b5214: beq   a0, zero, 0x10b52a0 addu  a3, zero, zero
+// 0x010b585c: 0x10b585c: beq   a0, zero, 0x10b58e8 addu  a3, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_10b52a0
+	brfalse L_10b58e8
 // --- basic block ---
-// 0x010b521c: 0x10b521c: lw    a0, 96(sp)
+// 0x010b5864: 0x10b5864: lw    a0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8604,26 +8604,26 @@ L_10b5204:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5220: 0x10b5220: sll   zero, zero, 0
-// 0x010b5224: 0x10b5224: slt   v0, a0, v0
+// 0x010b5868: 0x10b5868: sll   zero, zero, 0
+// 0x010b586c: 0x10b586c: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b5228: 0x10b5228: beq   v0, zero, 0x10b52a4 addiu a2, sp, 100
+// 0x010b5870: 0x10b5870: beq   v0, zero, 0x10b58ec addiu a2, sp, 100
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc.3
-	brfalse L_10b52a4
+	brfalse L_10b58ec
 // --- basic block ---
-L_10b5230:
-// 0x010b5230: 0x10b5230: lw    ra, 156(sp)
-// 0x010b5234: 0x10b5234: addu  v0, v1, zero
+L_10b5878:
+// 0x010b5878: 0x10b5878: lw    ra, 156(sp)
+// 0x010b587c: 0x10b587c: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x010b5238: 0x10b5238: lw    s8, 152(sp)
+// 0x010b5880: 0x10b5880: lw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8632,7 +8632,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b523c: 0x10b523c: lw    s7, 148(sp)
+// 0x010b5884: 0x10b5884: lw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8641,7 +8641,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b5240: 0x10b5240: lw    s6, 144(sp)
+// 0x010b5888: 0x10b5888: lw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8650,7 +8650,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b5244: 0x10b5244: lw    s5, 140(sp)
+// 0x010b588c: 0x10b588c: lw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8659,7 +8659,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b5248: 0x10b5248: lw    s4, 136(sp)
+// 0x010b5890: 0x10b5890: lw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8668,7 +8668,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b524c: 0x10b524c: lw    s3, 132(sp)
+// 0x010b5894: 0x10b5894: lw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8677,7 +8677,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5250: 0x10b5250: lw    s2, 128(sp)
+// 0x010b5898: 0x10b5898: lw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8686,7 +8686,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b5254: 0x10b5254: lw    s1, 124(sp)
+// 0x010b589c: 0x10b589c: lw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8695,7 +8695,7 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b5258: 0x10b5258: lw    s0, 120(sp)
+// 0x010b58a0: 0x10b58a0: lw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8704,43 +8704,43 @@ L_10b5230:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b525c: 0x10b525c: jr    ra addiu sp, sp, 160
+// 0x010b58a4: 0x10b58a4: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10b5264:
-// 0x010b5264: 0x10b5264: cibyl_sysc_arg 0x13
+L_10b58ac:
+// 0x010b58ac: 0x10b58ac: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x010b5268: 0x10b5268: cibyl_sysc_arg 0x17
+// 0x010b58b0: 0x10b58b0: cibyl_sysc_arg 0x17
 	ldloc 15
-// 0x010b526c: 0x10b526c: cibyl_sysc_arg 0x14
+// 0x010b58b4: 0x10b58b4: cibyl_sysc_arg 0x14
 	ldloc 10
-// 0x010b5270: 0x10b5270: cibyl_sysc_arg 0x16
+// 0x010b58b8: 0x10b58b8: cibyl_sysc_arg 0x16
 	ldloc 14
-// 0x010b5274: 0x10b5274: cibyl_sysc_arg 0x15
+// 0x010b58bc: 0x10b58bc: cibyl_sysc_arg 0x15
 	ldloc 11
-// 0x010b5278: 0x10b5278: cibyl_sysc 0x234f
+// 0x010b58c0: 0x10b58c0: cibyl_sysc 0x234f
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010b527c: 0x10b527c: addu  t0, v0, zero
+// 0x010b58c4: 0x10b58c4: addu  t0, v0, zero
 	ldloc 5
 	stloc 18
-// 0x010b5280: 0x10b5280: addu  a1, v1, zero
+// 0x010b58c8: 0x10b58c8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b5284: 0x10b5284: addu  a0, s2, zero
+// 0x010b58cc: 0x10b58cc: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x010b5288: 0x10b5288: addu  a2, s1, zero
+// 0x010b58d0: 0x10b58d0: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x010b528c: 0x10b528c: addu  a3, s8, zero
+// 0x010b58d4: 0x10b58d4: addu  a3, s8, zero
 	ldloc 16
 	stloc 4
-// 0x010b5290: 0x10b5290: jal   0x1011b20 sw    t0, 80(sp)
+// 0x010b58d8: 0x10b58d8: jal   0x1011b30 sw    t0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8754,64 +8754,64 @@ L_10b5264:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b5298: 0x10b5298: j	 0x10b5148 addu  v1, v0, zero
+// 0x010b58e0: 0x10b58e0: j	 0x10b5790 addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-	br L_10b5148
+	br L_10b5790
 // --- basic block ---
-L_10b52a0:
-// 0x010b52a0: 0x10b52a0: addiu a2, sp, 100
+L_10b58e8:
+// 0x010b58e8: 0x10b58e8: addiu a2, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc.3
-L_10b52a4:
-// 0x010b52a4: 0x10b52a4: addiu a1, sp, 84
+L_10b58ec:
+// 0x010b58ec: 0x10b58ec: addiu a1, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc.2
-// 0x010b52a8: 0x10b52a8: addiu a0, sp, 92
+// 0x010b58f0: 0x10b58f0: addiu a0, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.1
-// 0x010b52ac: 0x10b52ac: cibyl_sysc_arg 0x13
+// 0x010b58f4: 0x10b58f4: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x010b52b0: 0x10b52b0: cibyl_sysc_arg 0x4
+// 0x010b58f8: 0x10b58f8: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010b52b4: 0x10b52b4: cibyl_sysc_arg 0x5
+// 0x010b58fc: 0x10b58fc: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010b52b8: 0x10b52b8: cibyl_sysc_arg 0x6
+// 0x010b5900: 0x10b5900: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x010b52bc: 0x10b52bc: cibyl_sysc_arg 0x7
+// 0x010b5904: 0x10b5904: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x010b52c0: 0x10b52c0: cibyl_sysc 0x236c
+// 0x010b5908: 0x10b5908: cibyl_sysc 0x236c
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010b52c4: 0x10b52c4: addu  s3, v0, zero
+// 0x010b590c: 0x10b590c: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b52c8: 0x10b52c8: addu  a1, v1, zero
+// 0x010b5910: 0x10b5910: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010b52cc: 0x10b52cc: addu  a0, s2, zero
+// 0x010b5914: 0x10b5914: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x010b52d0: 0x10b52d0: addu  a2, s1, zero
+// 0x010b5918: 0x10b5918: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x010b52d4: 0x10b52d4: addiu a3, sp, 60
+// 0x010b591c: 0x10b591c: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x010b52d8: 0x10b52d8: jal   0x1011b20 sw    s3, 80(sp)
+// 0x010b5920: 0x10b5920: jal   0x1011b30 sw    s3, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8825,15 +8825,15 @@ L_10b52a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b52e0: 0x10b52e0: j	 0x10b5230 addu  v1, v0, zero
+// 0x010b5928: 0x10b5928: j	 0x10b5878 addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-	br L_10b5230
+	br L_10b5878
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl135.j b/converted/Cibyl135.j
index d98f4c7..f3c6933 100644
--- a/converted/Cibyl135.j
+++ b/converted/Cibyl135.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl135::.ctor
 
-.method public static int32 editor_street_get_closest_10b52e8(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_closest_10b5930(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 s5,int32 s3,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -103,21 +103,21 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b52e8:
-// 0x010b52e8: 0x10b52e8: addiu sp, sp, -240
+L_10b5930:
+// 0x010b5930: 0x10b5930: addiu sp, sp, -240
 	ldloc.0
 	ldc.i4 -240
 	add
 	stloc.0
-// 0x010b52ec: 0x10b52ec: lui   v1, 0x0
+// 0x010b5934: 0x10b5934: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010b52f0: 0x10b52f0: slti  v0, a3, 4
+// 0x010b5938: 0x10b5938: slti  v0, a3, 4
 	ldloc 4
 	ldc.i4.4
 	clt
 	stloc 6
-// 0x010b52f4: 0x10b52f4: sw    s7, 228(sp)
+// 0x010b593c: 0x10b593c: sw    s7, 228(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -126,7 +126,7 @@ L_10b52e8:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b52f8: 0x10b52f8: sw    s3, 212(sp)
+// 0x010b5940: 0x10b5940: sw    s3, 212(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -135,7 +135,7 @@ L_10b52e8:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b52fc: 0x10b52fc: sw    s2, 208(sp)
+// 0x010b5944: 0x10b5944: sw    s2, 208(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -144,8 +144,8 @@ L_10b52e8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5300: 0x10b5300: sw    ra, 236(sp)
-// 0x010b5304: 0x10b5304: sw    s8, 232(sp)
+// 0x010b5948: 0x10b5948: sw    ra, 236(sp)
+// 0x010b594c: 0x10b594c: sw    s8, 232(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -154,7 +154,7 @@ L_10b52e8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b5308: 0x10b5308: sw    s6, 224(sp)
+// 0x010b5950: 0x10b5950: sw    s6, 224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -163,7 +163,7 @@ L_10b52e8:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b530c: 0x10b530c: sw    s5, 220(sp)
+// 0x010b5954: 0x10b5954: sw    s5, 220(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -172,7 +172,7 @@ L_10b52e8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b5310: 0x10b5310: sw    s4, 216(sp)
+// 0x010b5958: 0x10b5958: sw    s4, 216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -181,7 +181,7 @@ L_10b52e8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5314: 0x10b5314: sw    s1, 204(sp)
+// 0x010b595c: 0x10b595c: sw    s1, 204(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -190,7 +190,7 @@ L_10b52e8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5318: 0x10b5318: sw    s0, 200(sp)
+// 0x010b5960: 0x10b5960: sw    s0, 200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -199,7 +199,7 @@ L_10b52e8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b531c: 0x10b531c: sw    a0, 240(sp)
+// 0x010b5964: 0x10b5964: sw    a0, 240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -208,7 +208,7 @@ L_10b52e8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b5320: 0x10b5320: lw    s7, 1816(v1)
+// 0x010b5968: 0x10b5968: lw    s7, 1816(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -217,7 +217,7 @@ L_10b52e8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b5324: 0x10b5324: lw    s2, 260(sp)
+// 0x010b596c: 0x10b596c: lw    s2, 260(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -226,17 +226,17 @@ L_10b52e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5328: 0x10b5328: bne   v0, zero, 0x10b5334 addu  s3, a3, zero
+// 0x010b5970: 0x10b5970: bne   v0, zero, 0x10b597c addu  s3, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 13
-	brtrue L_10b5334
+	brtrue L_10b597c
 // --- basic block ---
-// 0x010b5330: 0x10b5330: addiu s3, zero, 3
+// 0x010b5978: 0x10b5978: addiu s3, zero, 3
 	ldc.i4.3
 	stloc 13
-L_10b5334:
-// 0x010b5334: 0x10b5334: sw    a1, 192(sp)
+L_10b597c:
+// 0x010b597c: 0x10b597c: sw    a1, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -245,7 +245,7 @@ L_10b5334:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b5338: 0x10b5338: jal   0x10b82d8 sw    a2, 196(sp)
+// 0x010b5980: 0x10b5980: jal   0x10b8920 sw    a2, 196(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -254,10 +254,10 @@ L_10b5334:
 	add
 	ldloc.3
 	stelem.i4
-	call int32 Cibyl137::editor_plugin_get_override_10b82d8()
+	call int32 Cibyl137::editor_plugin_get_override_10b8920()
 	stloc 6
 // --- basic block ---
-// 0x010b5340: 0x10b5340: lw    a1, 192(sp)
+// 0x010b5988: 0x10b5988: lw    a1, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -266,7 +266,7 @@ L_10b5334:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b5344: 0x10b5344: lw    a2, 196(sp)
+// 0x010b598c: 0x10b598c: lw    a2, 196(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -275,109 +275,109 @@ L_10b5334:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b5348: 0x10b5348: beq   v0, zero, 0x10b5450 addiu s1, zero, 256
+// 0x010b5990: 0x10b5990: beq   v0, zero, 0x10b5a98 addiu s1, zero, 256
 	ldloc 6
 	ldc.i4 256
 	stloc 9
-	brfalse L_10b5450
+	brfalse L_10b5a98
 // --- basic block ---
-// 0x010b5350: 0x10b5350: j	 0x10b5374 addu  v0, zero, zero
+// 0x010b5998: 0x10b5998: j	 0x10b59bc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10b5374
+	br L_10b59bc
 // --- basic block ---
-L_10b5358:
-// 0x010b5358: 0x10b5358: lw    v1, 0(a1)
+L_10b59a0:
+// 0x010b59a0: 0x10b59a0: lw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b535c: 0x10b535c: sll   zero, zero, 0
-// 0x010b5360: 0x10b5360: slt   a0, v1, s1
+// 0x010b59a4: 0x10b59a4: sll   zero, zero, 0
+// 0x010b59a8: 0x10b59a8: slt   a0, v1, s1
 	ldloc 7
 	ldloc 9
 	clt
 	stloc.1
-// 0x010b5364: 0x10b5364: beq   a0, zero, 0x10b5370 addiu v0, v0, 1
+// 0x010b59ac: 0x10b59ac: beq   a0, zero, 0x10b59b8 addiu v0, v0, 1
 	ldloc.1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_10b5370
+	brfalse L_10b59b8
 // --- basic block ---
-// 0x010b536c: 0x10b536c: addu  s1, v1, zero
+// 0x010b59b4: 0x10b59b4: addu  s1, v1, zero
 	ldloc 7
 	stloc 9
-L_10b5370:
-// 0x010b5370: 0x10b5370: addiu a1, a1, 4
+L_10b59b8:
+// 0x010b59b8: 0x10b59b8: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-L_10b5374:
-// 0x010b5374: 0x10b5374: slt   v1, v0, a2
+L_10b59bc:
+// 0x010b59bc: 0x10b59bc: slt   v1, v0, a2
 	ldloc 6
 	ldloc.3
 	clt
 	stloc 7
-// 0x010b5378: 0x10b5378: bne   v1, zero, 0x10b5358 sll   zero, zero, 0
+// 0x010b59c0: 0x10b59c0: bne   v1, zero, 0x10b59a0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10b5358
+	brtrue L_10b59a0
 // --- basic block ---
-// 0x010b5380: 0x10b5380: jal   0x10b5d08 sll   zero, zero, 0
+// 0x010b59c8: 0x10b59c8: jal   0x10b6350 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_count_10b5d08(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_count_10b6350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5388: 0x10b5388: bltz  s1, 0x10b5450 addu  s8, v0, zero
+// 0x010b59d0: 0x10b59d0: bltz  s1, 0x10b5a98 addu  s8, v0, zero
 	ldloc 9
 	ldloc 6
 	stloc 16
 	ldc.i4.s 0
-	blt L_10b5450
+	blt L_10b5a98
 // --- basic block ---
-// 0x010b5390: 0x10b5390: addu  s0, zero, zero
+// 0x010b59d8: 0x10b59d8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b5394: 0x10b5394: j	 0x10b5444 addiu s6, sp, 48
+// 0x010b59dc: 0x10b59dc: j	 0x10b5a8c addiu s6, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 14
-	br L_10b5444
+	br L_10b5a8c
 // --- basic block ---
-L_10b539c:
-// 0x010b539c: 0x10b539c: addiu v1, sp, 28
+L_10b59e4:
+// 0x010b59e4: 0x10b59e4: addiu v1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 7
-// 0x010b53a0: 0x10b53a0: addu  a0, s0, zero
+// 0x010b59e8: 0x10b59e8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b53a4: 0x10b53a4: addiu a1, sp, 32
+// 0x010b59ec: 0x10b59ec: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010b53a8: 0x10b53a8: addiu a2, sp, 40
+// 0x010b59f0: 0x10b59f0: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x010b53ac: 0x10b53ac: addu  a3, zero, zero
+// 0x010b59f4: 0x10b59f4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b53b0: 0x10b53b0: sw    v0, 16(sp)
+// 0x010b59f8: 0x10b59f8: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -386,7 +386,7 @@ L_10b539c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b53b4: 0x10b53b4: jal   0x10b5d30 sw    v1, 20(sp)
+// 0x010b59fc: 0x10b59fc: jal   0x10b6378 sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -400,12 +400,12 @@ L_10b539c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b53bc: 0x10b53bc: lw    v0, 28(sp)
+// 0x010b5a04: 0x10b5a04: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -414,17 +414,17 @@ L_10b539c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b53c0: 0x10b53c0: sll   zero, zero, 0
-// 0x010b53c4: 0x10b53c4: andi  v0, v0, 1
+// 0x010b5a08: 0x10b5a08: sll   zero, zero, 0
+// 0x010b5a0c: 0x10b5a0c: andi  v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	and
 	stloc 6
-// 0x010b53c8: 0x10b53c8: bne   v0, zero, 0x10b5440 sll   zero, zero, 0
+// 0x010b5a10: 0x10b5a10: bne   v0, zero, 0x10b5a88 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b5440
+	brtrue L_10b5a88
 // --- basic block ---
-// 0x010b53d0: 0x10b53d0: lw    v0, 24(sp)
+// 0x010b5a18: 0x10b5a18: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -433,17 +433,17 @@ L_10b539c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b53d4: 0x10b53d4: sll   zero, zero, 0
-// 0x010b53d8: 0x10b53d8: slt   v0, v0, s1
+// 0x010b5a1c: 0x10b5a1c: sll   zero, zero, 0
+// 0x010b5a20: 0x10b5a20: slt   v0, v0, s1
 	ldloc 6
 	ldloc 9
 	clt
 	stloc 6
-// 0x010b53dc: 0x10b53dc: bne   v0, zero, 0x10b5440 sll   zero, zero, 0
+// 0x010b5a24: 0x10b5a24: bne   v0, zero, 0x10b5a88 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b5440
+	brtrue L_10b5a88
 // --- basic block ---
-// 0x010b53e4: 0x10b53e4: lw    a0, 240(sp)
+// 0x010b5a2c: 0x10b5a2c: lw    a0, 240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -452,16 +452,16 @@ L_10b539c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b53e8: 0x10b53e8: addu  a1, s0, zero
+// 0x010b5a30: 0x10b5a30: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010b53ec: 0x10b53ec: addiu a2, zero, -1
+// 0x010b5a34: 0x10b5a34: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010b53f0: 0x10b53f0: addu  a3, s7, zero
+// 0x010b5a38: 0x10b5a38: addu  a3, s7, zero
 	ldloc 15
 	stloc 4
-// 0x010b53f4: 0x10b53f4: sw    s6, 16(sp)
+// 0x010b5a3c: 0x10b5a3c: sw    s6, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -470,7 +470,7 @@ L_10b539c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b53f8: 0x10b53f8: jal   0x10b4fa0 sw    s3, 20(sp)
+// 0x010b5a40: 0x10b5a40: jal   0x10b55e8 sw    s3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -484,24 +484,24 @@ L_10b539c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_distance_with_shape_10b4fa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_distance_with_shape_10b55e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5400: 0x10b5400: addu  v1, v0, zero
+// 0x010b5a48: 0x10b5a48: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x010b5404: 0x10b5404: addu  s5, s6, zero
+// 0x010b5a4c: 0x10b5a4c: addu  s5, s6, zero
 	ldloc 14
 	stloc 12
-// 0x010b5408: 0x10b5408: j	 0x10b5428 addu  s4, zero, zero
+// 0x010b5a50: 0x10b5a50: j	 0x10b5a70 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_10b5428
+	br L_10b5a70
 // --- basic block ---
-L_10b5410:
-// 0x010b5410: 0x10b5410: jal   0x1011b20 sw    v1, 192(sp)
+L_10b5a58:
+// 0x010b5a58: 0x10b5a58: jal   0x1011b30 sw    v1, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -515,12 +515,12 @@ L_10b5410:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_replace_1011b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_replace_1011b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5418: 0x10b5418: lw    v1, 192(sp)
+// 0x010b5a60: 0x10b5a60: lw    v1, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -529,29 +529,29 @@ L_10b5410:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b541c: 0x10b541c: addu  s2, v0, zero
+// 0x010b5a64: 0x10b5a64: addu  s2, v0, zero
 	ldloc 6
 	stloc 10
-// 0x010b5420: 0x10b5420: addiu s4, s4, 1
+// 0x010b5a68: 0x10b5a68: addiu s4, s4, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010b5424: 0x10b5424: addiu s5, s5, 48
+// 0x010b5a6c: 0x10b5a6c: addiu s5, s5, 48
 	ldloc 12
 	ldc.i4.s 48
 	add
 	stloc 12
-L_10b5428:
-// 0x010b5428: 0x10b5428: slt   v0, s4, v1
+L_10b5a70:
+// 0x010b5a70: 0x10b5a70: slt   v0, s4, v1
 	ldloc 11
 	ldloc 7
 	clt
 	stloc 6
-// 0x010b542c: 0x10b542c: addu  a1, s2, zero
+// 0x010b5a74: 0x10b5a74: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010b5430: 0x10b5430: lw    a0, 256(sp)
+// 0x010b5a78: 0x10b5a78: lw    a0, 256(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -560,7 +560,7 @@ L_10b5428:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5434: 0x10b5434: lw    a2, 264(sp)
+// 0x010b5a7c: 0x10b5a7c: lw    a2, 264(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -569,38 +569,38 @@ L_10b5428:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b5438: 0x10b5438: bne   v0, zero, 0x10b5410 addu  a3, s5, zero
+// 0x010b5a80: 0x10b5a80: bne   v0, zero, 0x10b5a58 addu  a3, s5, zero
 	ldloc 6
 	ldloc 12
 	stloc 4
-	brtrue L_10b5410
+	brtrue L_10b5a58
 // --- basic block ---
-L_10b5440:
-// 0x010b5440: 0x10b5440: addiu s0, s0, 1
+L_10b5a88:
+// 0x010b5a88: 0x10b5a88: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10b5444:
-// 0x010b5444: 0x10b5444: slt   v0, s0, s8
+L_10b5a8c:
+// 0x010b5a8c: 0x10b5a8c: slt   v0, s0, s8
 	ldloc 8
 	ldloc 16
 	clt
 	stloc 6
-// 0x010b5448: 0x10b5448: bne   v0, zero, 0x10b539c addiu v0, sp, 24
+// 0x010b5a90: 0x10b5a90: bne   v0, zero, 0x10b59e4 addiu v0, sp, 24
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-	brtrue L_10b539c
+	brtrue L_10b59e4
 // --- basic block ---
-L_10b5450:
-// 0x010b5450: 0x10b5450: lw    ra, 236(sp)
-// 0x010b5454: 0x10b5454: addu  v0, s2, zero
+L_10b5a98:
+// 0x010b5a98: 0x10b5a98: lw    ra, 236(sp)
+// 0x010b5a9c: 0x10b5a9c: addu  v0, s2, zero
 	ldloc 10
 	stloc 6
-// 0x010b5458: 0x10b5458: lw    s8, 232(sp)
+// 0x010b5aa0: 0x10b5aa0: lw    s8, 232(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -609,7 +609,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b545c: 0x10b545c: lw    s7, 228(sp)
+// 0x010b5aa4: 0x10b5aa4: lw    s7, 228(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -618,7 +618,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b5460: 0x10b5460: lw    s6, 224(sp)
+// 0x010b5aa8: 0x10b5aa8: lw    s6, 224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -627,7 +627,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b5464: 0x10b5464: lw    s5, 220(sp)
+// 0x010b5aac: 0x10b5aac: lw    s5, 220(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -636,7 +636,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b5468: 0x10b5468: lw    s4, 216(sp)
+// 0x010b5ab0: 0x10b5ab0: lw    s4, 216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -645,7 +645,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b546c: 0x10b546c: lw    s3, 212(sp)
+// 0x010b5ab4: 0x10b5ab4: lw    s3, 212(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -654,7 +654,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b5470: 0x10b5470: lw    s2, 208(sp)
+// 0x010b5ab8: 0x10b5ab8: lw    s2, 208(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -663,7 +663,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5474: 0x10b5474: lw    s1, 204(sp)
+// 0x010b5abc: 0x10b5abc: lw    s1, 204(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -672,7 +672,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5478: 0x10b5478: lw    s0, 200(sp)
+// 0x010b5ac0: 0x10b5ac0: lw    s0, 200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -681,7 +681,7 @@ L_10b5450:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b547c: 0x10b547c: jr    ra addiu sp, sp, 240
+// 0x010b5ac4: 0x10b5ac4: jr    ra addiu sp, sp, 240
 	ldloc.0
 	ldc.i4 240
 	add
@@ -693,7 +693,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_street_get_distance_10b5484(int32,int32,int32,int32,int32)
+.method public static int32 editor_street_get_distance_10b5acc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 ra,int32 v1)
@@ -737,20 +737,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b5484:
-// 0x010b5484: 0x10b5484: lw    v0, 0(a1)
+L_10b5acc:
+// 0x010b5acc: 0x10b5acc: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b5488: 0x10b5488: addiu sp, sp, -40
+// 0x010b5ad0: 0x10b5ad0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b548c: 0x10b548c: sw    s2, 32(sp)
+// 0x010b5ad4: 0x10b5ad4: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -759,7 +759,7 @@ L_10b5484:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5490: 0x10b5490: sw    s1, 28(sp)
+// 0x010b5ad8: 0x10b5ad8: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -768,7 +768,7 @@ L_10b5484:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b5494: 0x10b5494: sw    s0, 24(sp)
+// 0x010b5adc: 0x10b5adc: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -777,23 +777,23 @@ L_10b5484:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5498: 0x10b5498: sw    ra, 36(sp)
-// 0x010b549c: 0x10b549c: addu  s1, a1, zero
+// 0x010b5ae0: 0x10b5ae0: sw    ra, 36(sp)
+// 0x010b5ae4: 0x10b5ae4: addu  s1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010b54a0: 0x10b54a0: addu  s2, a0, zero
+// 0x010b5ae8: 0x10b5ae8: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b54a4: 0x10b54a4: bne   v0, zero, 0x10b54d4 addu  s0, a2, zero
+// 0x010b5aec: 0x10b5aec: bne   v0, zero, 0x10b5b1c addu  s0, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 8
-	brtrue L_10b54d4
+	brtrue L_10b5b1c
 // --- basic block ---
-// 0x010b54ac: 0x10b54ac: lui   v0, 0x0
+// 0x010b5af4: 0x10b5af4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b54b0: 0x10b54b0: lw    v0, 576(v0)
+// 0x010b5af8: 0x10b5af8: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -802,7 +802,7 @@ L_10b5484:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b54b4: 0x10b54b4: lw    a0, 12(a1)
+// 0x010b5afc: 0x10b5afc: lw    a0, 12(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -811,30 +811,30 @@ L_10b5484:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b54b8: 0x10b54b8: sll   zero, zero, 0
-// 0x010b54bc: 0x10b54bc: beq   a0, v0, 0x10b54d4 sll   zero, zero, 0
+// 0x010b5b00: 0x10b5b00: sll   zero, zero, 0
+// 0x010b5b04: 0x10b5b04: beq   a0, v0, 0x10b5b1c sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10b54d4
+	beq  L_10b5b1c
 // --- basic block ---
-// 0x010b54c4: 0x10b54c4: bltz  a0, 0x10b54d4 sll   zero, zero, 0
+// 0x010b5b0c: 0x10b5b0c: bltz  a0, 0x10b5b1c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b54d4
+	blt L_10b5b1c
 // --- basic block ---
-// 0x010b54cc: 0x10b54cc: jal   0x100b164 sll   zero, zero, 0
+// 0x010b5b14: 0x10b5b14: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-L_10b54d4:
-// 0x010b54d4: 0x10b54d4: lw    a3, 16(s1)
+L_10b5b1c:
+// 0x010b5b1c: 0x10b5b1c: lw    a3, 16(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -843,7 +843,7 @@ L_10b54d4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b54d8: 0x10b54d8: lw    a1, 4(s1)
+// 0x010b5b20: 0x10b5b20: lw    a1, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -852,7 +852,7 @@ L_10b54d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b54dc: 0x10b54dc: lw    a2, 12(s1)
+// 0x010b5b24: 0x10b5b24: lw    a2, 12(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -861,13 +861,13 @@ L_10b54d4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b54e0: 0x10b54e0: addu  a0, s2, zero
+// 0x010b5b28: 0x10b5b28: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010b54e4: 0x10b54e4: addiu v0, zero, 1
+// 0x010b5b2c: 0x10b5b2c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010b54e8: 0x10b54e8: sw    s0, 16(sp)
+// 0x010b5b30: 0x10b5b30: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -876,7 +876,7 @@ L_10b54d4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b54ec: 0x10b54ec: jal   0x10b4fa0 sw    v0, 20(sp)
+// 0x010b5b34: 0x10b5b34: jal   0x10b55e8 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -890,13 +890,13 @@ L_10b54d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_distance_with_shape_10b4fa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_distance_with_shape_10b55e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010b54f4: 0x10b54f4: lw    ra, 36(sp)
-// 0x010b54f8: 0x10b54f8: lw    s2, 32(sp)
+// 0x010b5b3c: 0x10b5b3c: lw    ra, 36(sp)
+// 0x010b5b40: 0x10b5b40: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -905,7 +905,7 @@ L_10b54d4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b54fc: 0x10b54fc: lw    s1, 28(sp)
+// 0x010b5b44: 0x10b5b44: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -914,7 +914,7 @@ L_10b54d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b5500: 0x10b5500: lw    s0, 24(sp)
+// 0x010b5b48: 0x10b5b48: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -923,7 +923,7 @@ L_10b54d4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5504: 0x10b5504: jr    ra addiu sp, sp, 40
+// 0x010b5b4c: 0x10b5b4c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -935,7 +935,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_lines_activate_10b550c(int32)
+.method public static int32 editor_lines_activate_10b5b54(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -955,16 +955,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b550c:
-// 0x010b550c: 0x10b550c: lui   v0, 0xe0000
+L_10b5b54:
+// 0x010b5b54: 0x10b5b54: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b5510: 0x10b5510: jr    ra sw    a0, -17904(v0)
+// 0x010b5b58: 0x10b5b58: jr    ra sw    a0, -17440(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldloc.0
 	stelem.i4
@@ -973,7 +973,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 handle_segment_10b5518(int32,int32,int32,int32,int32)
+.method public static int32 handle_segment_10b5b60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 lo,int32 ra)
@@ -1035,17 +1035,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5518: 0x10b5518: addiu sp, sp, -96
+// 0x010b5b60: 0x10b5b60: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010b551c: 0x10b551c: addiu v0, sp, 28
+// 0x010b5b64: 0x10b5b64: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 6
-// 0x010b5520: 0x10b5520: sw    s0, 60(sp)
+// 0x010b5b68: 0x10b5b68: sw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1054,15 +1054,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5524: 0x10b5524: addiu a2, sp, 44
+// 0x010b5b6c: 0x10b5b6c: addiu a2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.3
-// 0x010b5528: 0x10b5528: addu  s0, a1, zero
+// 0x010b5b70: 0x10b5b70: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b552c: 0x10b552c: sw    v0, 16(sp)
+// 0x010b5b74: 0x10b5b74: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1071,22 +1071,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b5530: 0x10b5530: addiu a1, sp, 36
+// 0x010b5b78: 0x10b5b78: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010b5534: 0x10b5534: addiu v0, sp, 32
+// 0x010b5b7c: 0x10b5b7c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-// 0x010b5538: 0x10b5538: addiu a3, sp, 24
+// 0x010b5b80: 0x10b5b80: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x010b553c: 0x10b553c: sw    v0, 20(sp)
+// 0x010b5b84: 0x10b5b84: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1095,8 +1095,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b5540: 0x10b5540: sw    ra, 92(sp)
-// 0x010b5544: 0x10b5544: sw    s7, 88(sp)
+// 0x010b5b88: 0x10b5b88: sw    ra, 92(sp)
+// 0x010b5b8c: 0x10b5b8c: sw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1105,7 +1105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b5548: 0x10b5548: sw    s6, 84(sp)
+// 0x010b5b90: 0x10b5b90: sw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1114,7 +1114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b554c: 0x10b554c: sw    s5, 80(sp)
+// 0x010b5b94: 0x10b5b94: sw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b5550: 0x10b5550: sw    s4, 76(sp)
+// 0x010b5b98: 0x10b5b98: sw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1132,7 +1132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b5554: 0x10b5554: sw    s3, 72(sp)
+// 0x010b5b9c: 0x10b5b9c: sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1141,7 +1141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5558: 0x10b5558: sw    s2, 68(sp)
+// 0x010b5ba0: 0x10b5ba0: sw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1150,7 +1150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b555c: 0x10b555c: jal   0x1014ee4 sw    s1, 64(sp)
+// 0x010b5ba4: 0x10b5ba4: jal   0x1014ef4 sw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1164,12 +1164,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_line_points_1014ee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_line_points_1014ef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5564: 0x10b5564: lw    v1, 4(s0)
+// 0x010b5bac: 0x10b5bac: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1178,7 +1178,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b5568: 0x10b5568: lw    a2, 40(sp)
+// 0x010b5bb0: 0x10b5bb0: lw    a2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1187,14 +1187,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b556c: 0x10b556c: lw    v0, 0(s0)
+// 0x010b5bb4: 0x10b5bb4: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b5570: 0x10b5570: lw    a1, 36(sp)
+// 0x010b5bb8: 0x10b5bb8: lw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1203,51 +1203,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b5574: 0x10b5574: subu  a2, a2, v1
+// 0x010b5bbc: 0x10b5bbc: subu  a2, a2, v1
 	ldloc.3
 	ldloc 7
 	sub
 	stloc.3
-// 0x010b5578: 0x10b5578: bne   a2, zero, 0x10b5588 subu  a1, a1, v0
+// 0x010b5bc0: 0x10b5bc0: bne   a2, zero, 0x10b5bd0 subu  a1, a1, v0
 	ldloc.3
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-	brtrue L_10b5588
+	brtrue L_10b5bd0
 // --- basic block ---
-// 0x010b5580: 0x10b5580: beq   a1, zero, 0x10b55d0 sll   zero, zero, 0
+// 0x010b5bc8: 0x10b5bc8: beq   a1, zero, 0x10b5c18 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b55d0
+	brfalse L_10b5c18
 // --- basic block ---
-L_10b5588:
-// 0x010b5588: 0x10b5588: sll   a1, a1, 16
+L_10b5bd0:
+// 0x010b5bd0: 0x10b5bd0: sll   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x010b558c: 0x10b558c: sll   a2, a2, 16
+// 0x010b5bd4: 0x10b5bd4: sll   a2, a2, 16
 	ldloc.3
 	ldc.i4.s 16
 	shl
 	stloc.3
-// 0x010b5590: 0x10b5590: addu  a0, zero, zero
+// 0x010b5bd8: 0x10b5bd8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b5594: 0x10b5594: sra   a1, a1, 16
+// 0x010b5bdc: 0x10b5bdc: sra   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x010b5598: 0x10b5598: sra   a2, a2, 16
+// 0x010b5be0: 0x10b5be0: sra   a2, a2, 16
 	ldloc.3
 	ldc.i4.s 16
 	shr
 	stloc.3
-// 0x010b559c: 0x10b559c: addiu a3, zero, -1
+// 0x010b5be4: 0x10b5be4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010b55a0: 0x10b55a0: jal   0x10b4620 sw    zero, 16(sp)
+// 0x010b5be8: 0x10b5be8: jal   0x10b4c68 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1261,12 +1261,12 @@ L_10b5588:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_add_10b4620(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_add_10b4c68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b55a8: 0x10b55a8: lw    a0, 8(s0)
+// 0x010b5bf0: 0x10b5bf0: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1275,15 +1275,15 @@ L_10b5588:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b55ac: 0x10b55ac: addiu v1, zero, -1
+// 0x010b5bf4: 0x10b5bf4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b55b0: 0x10b55b0: bne   a0, v1, 0x10b55bc sll   zero, zero, 0
+// 0x010b5bf8: 0x10b5bf8: bne   a0, v1, 0x10b5c04 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10b55bc
+	bne.un L_10b5c04
 // --- basic block ---
-// 0x010b55b8: 0x10b55b8: sw    v0, 8(s0)
+// 0x010b5c00: 0x10b5c00: sw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1292,8 +1292,8 @@ L_10b5588:
 	add
 	ldloc 6
 	stelem.i4
-L_10b55bc:
-// 0x010b55bc: 0x10b55bc: lw    a0, 36(sp)
+L_10b5c04:
+// 0x010b5c04: 0x10b5c04: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1302,7 +1302,7 @@ L_10b55bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b55c0: 0x10b55c0: lw    v1, 40(sp)
+// 0x010b5c08: 0x10b5c08: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1311,7 +1311,7 @@ L_10b55bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b55c4: 0x10b55c4: sw    v0, 12(s0)
+// 0x010b5c0c: 0x10b5c0c: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1320,14 +1320,14 @@ L_10b55bc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b55c8: 0x10b55c8: sw    a0, 0(s0)
+// 0x010b5c10: 0x10b5c10: sw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010b55cc: 0x10b55cc: sw    v1, 4(s0)
+// 0x010b5c14: 0x10b5c14: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1336,8 +1336,8 @@ L_10b55bc:
 	add
 	ldloc 7
 	stelem.i4
-L_10b55d0:
-// 0x010b55d0: 0x10b55d0: lw    s1, 24(sp)
+L_10b5c18:
+// 0x010b5c18: 0x10b5c18: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1346,37 +1346,37 @@ L_10b55d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b55d4: 0x10b55d4: sll   zero, zero, 0
-// 0x010b55d8: 0x10b55d8: bltz  s1, 0x10b5708 sll   s2, s1, 2
+// 0x010b5c1c: 0x10b5c1c: sll   zero, zero, 0
+// 0x010b5c20: 0x10b5c20: bltz  s1, 0x10b5d50 sll   s2, s1, 2
 	ldloc 9
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 10
 	ldc.i4.s 0
-	blt L_10b5708
+	blt L_10b5d50
 // --- basic block ---
-// 0x010b55e0: 0x10b55e0: lui   s7, 0x0
+// 0x010b5c28: 0x10b5c28: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x010b55e4: 0x10b55e4: lui   s4, 0x0
+// 0x010b5c2c: 0x10b5c2c: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010b55e8: 0x10b55e8: lui   s6, 0x20000
+// 0x010b5c30: 0x10b5c30: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x010b55ec: 0x10b55ec: lui   s3, 0x0
+// 0x010b5c34: 0x10b5c34: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010b55f0: 0x10b55f0: j	 0x10b56f4 addiu s5, sp, 36
+// 0x010b5c38: 0x10b5c38: j	 0x10b5d3c addiu s5, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 13
-	br L_10b56f4
+	br L_10b5d3c
 // --- basic block ---
-L_10b55f8:
-// 0x010b55f8: 0x10b55f8: lw    v0, 32(sp)
+L_10b5c40:
+// 0x010b5c40: 0x10b5c40: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1385,14 +1385,14 @@ L_10b55f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b55fc: 0x10b55fc: sll   zero, zero, 0
-// 0x010b5600: 0x10b5600: beq   v0, zero, 0x10b5618 addu  a0, s1, zero
+// 0x010b5c44: 0x10b5c44: sll   zero, zero, 0
+// 0x010b5c48: 0x10b5c48: beq   v0, zero, 0x10b5c60 addu  a0, s1, zero
 	ldloc 6
 	ldloc 9
 	stloc.1
-	brfalse L_10b5618
+	brfalse L_10b5c60
 // --- basic block ---
-// 0x010b5608: 0x10b5608: jalr  v0 addu  a1, s5, zero
+// 0x010b5c50: 0x10b5c50: jalr  v0 addu  a1, s5, zero
 	ldloc 6
 	ldloc 13
 	stloc.2
@@ -1406,11 +1406,11 @@ L_10b55f8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5610: 0x10b5610: j	 0x10b5680 sll   zero, zero, 0
-	br L_10b5680
+// 0x010b5c58: 0x10b5c58: j	 0x10b5cc8 sll   zero, zero, 0
+	br L_10b5cc8
 // --- basic block ---
-L_10b5618:
-// 0x010b5618: 0x10b5618: lw    v0, 576(s7)
+L_10b5c60:
+// 0x010b5c60: 0x10b5c60: lw    v0, 576(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -1419,7 +1419,7 @@ L_10b5618:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b561c: 0x10b561c: lw    v1, 548(s4)
+// 0x010b5c64: 0x10b5c64: lw    v1, 548(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -1428,13 +1428,13 @@ L_10b5618:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b5620: 0x10b5620: sll   zero, zero, 0
-// 0x010b5624: 0x10b5624: beq   v0, v1, 0x10b5638 sll   zero, zero, 0
+// 0x010b5c68: 0x10b5c68: sll   zero, zero, 0
+// 0x010b5c6c: 0x10b5c6c: beq   v0, v1, 0x10b5c80 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	beq  L_10b5638
+	beq  L_10b5c80
 // --- basic block ---
-// 0x010b562c: 0x10b562c: jal   0x100ae78 sw    v0, 548(s4)
+// 0x010b5c74: 0x10b5c74: jal   0x100ae88 sw    v0, 548(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -1448,12 +1448,12 @@ L_10b5618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5634: 0x10b5634: sw    v0, 552(s3)
+// 0x010b5c7c: 0x10b5c7c: sw    v0, 552(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1462,17 +1462,17 @@ L_10b5618:
 	add
 	ldloc 6
 	stelem.i4
-L_10b5638:
-// 0x010b5638: 0x10b5638: lw    a0, 31240(s6)
+L_10b5c80:
+// 0x010b5c80: 0x10b5c80: lw    a0, 31704(s6)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b563c: 0x10b563c: lw    v0, 552(s3)
+// 0x010b5c84: 0x10b5c84: lw    v0, 552(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1481,37 +1481,37 @@ L_10b5638:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b5640: 0x10b5640: addu  a0, a0, s2
+// 0x010b5c88: 0x10b5c88: addu  a0, a0, s2
 	ldloc.1
 	ldloc 10
 	add
 	stloc.1
-// 0x010b5644: 0x10b5644: lh    v1, 2(a0)
+// 0x010b5c8c: 0x10b5c8c: lh    v1, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x010b5648: 0x10b5648: lh    a0, 0(a0)
+// 0x010b5c90: 0x10b5c90: lh    a0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x010b564c: 0x10b564c: mult  v1, v0
+// 0x010b5c94: 0x10b5c94: mult  v1, v0
 	ldloc 7
 	ldloc 6
 	mul
 	stloc 16
-// 0x010b5650: 0x10b5650: mflo  lo
+// 0x010b5c98: 0x10b5c98: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x010b5654: 0x10b5654: sll   zero, zero, 0
-// 0x010b5658: 0x10b5658: sll   zero, zero, 0
-// 0x010b565c: 0x10b565c: mult  a0, v0
+// 0x010b5c9c: 0x10b5c9c: sll   zero, zero, 0
+// 0x010b5ca0: 0x10b5ca0: sll   zero, zero, 0
+// 0x010b5ca4: 0x10b5ca4: mult  a0, v0
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 16
-// 0x010b5660: 0x10b5660: lw    a0, 40(sp)
+// 0x010b5ca8: 0x10b5ca8: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1520,13 +1520,13 @@ L_10b5638:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5664: 0x10b5664: sll   zero, zero, 0
-// 0x010b5668: 0x10b5668: addu  v1, a0, v1
+// 0x010b5cac: 0x10b5cac: sll   zero, zero, 0
+// 0x010b5cb0: 0x10b5cb0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x010b566c: 0x10b566c: lw    a0, 36(sp)
+// 0x010b5cb4: 0x10b5cb4: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1535,7 +1535,7 @@ L_10b5638:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5670: 0x10b5670: sw    v1, 40(sp)
+// 0x010b5cb8: 0x10b5cb8: sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1544,15 +1544,15 @@ L_10b5638:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b5674: 0x10b5674: mflo  lo
+// 0x010b5cbc: 0x10b5cbc: mflo  lo
 	ldloc 16
 	stloc 6
-// 0x010b5678: 0x10b5678: addu  v0, a0, v0
+// 0x010b5cc0: 0x10b5cc0: addu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x010b567c: 0x10b567c: sw    v0, 36(sp)
+// 0x010b5cc4: 0x10b5cc4: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1561,8 +1561,8 @@ L_10b5638:
 	add
 	ldloc 6
 	stelem.i4
-L_10b5680:
-// 0x010b5680: 0x10b5680: lw    v1, 4(s0)
+L_10b5cc8:
+// 0x010b5cc8: 0x10b5cc8: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1571,7 +1571,7 @@ L_10b5680:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b5684: 0x10b5684: lw    a2, 40(sp)
+// 0x010b5ccc: 0x10b5ccc: lw    a2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1580,14 +1580,14 @@ L_10b5680:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b5688: 0x10b5688: lw    v0, 0(s0)
+// 0x010b5cd0: 0x10b5cd0: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b568c: 0x10b568c: lw    a1, 36(sp)
+// 0x010b5cd4: 0x10b5cd4: lw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1596,51 +1596,51 @@ L_10b5680:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b5690: 0x10b5690: subu  a2, a2, v1
+// 0x010b5cd8: 0x10b5cd8: subu  a2, a2, v1
 	ldloc.3
 	ldloc 7
 	sub
 	stloc.3
-// 0x010b5694: 0x10b5694: bne   a2, zero, 0x10b56a4 subu  a1, a1, v0
+// 0x010b5cdc: 0x10b5cdc: bne   a2, zero, 0x10b5cec subu  a1, a1, v0
 	ldloc.3
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-	brtrue L_10b56a4
+	brtrue L_10b5cec
 // --- basic block ---
-// 0x010b569c: 0x10b569c: beq   a1, zero, 0x10b56ec sll   zero, zero, 0
+// 0x010b5ce4: 0x10b5ce4: beq   a1, zero, 0x10b5d34 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b56ec
+	brfalse L_10b5d34
 // --- basic block ---
-L_10b56a4:
-// 0x010b56a4: 0x10b56a4: sll   a1, a1, 16
+L_10b5cec:
+// 0x010b5cec: 0x10b5cec: sll   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x010b56a8: 0x10b56a8: sll   a2, a2, 16
+// 0x010b5cf0: 0x10b5cf0: sll   a2, a2, 16
 	ldloc.3
 	ldc.i4.s 16
 	shl
 	stloc.3
-// 0x010b56ac: 0x10b56ac: addu  a0, zero, zero
+// 0x010b5cf4: 0x10b5cf4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b56b0: 0x10b56b0: sra   a1, a1, 16
+// 0x010b5cf8: 0x10b5cf8: sra   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x010b56b4: 0x10b56b4: sra   a2, a2, 16
+// 0x010b5cfc: 0x10b5cfc: sra   a2, a2, 16
 	ldloc.3
 	ldc.i4.s 16
 	shr
 	stloc.3
-// 0x010b56b8: 0x10b56b8: addiu a3, zero, -1
+// 0x010b5d00: 0x10b5d00: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010b56bc: 0x10b56bc: jal   0x10b4620 sw    zero, 16(sp)
+// 0x010b5d04: 0x10b5d04: jal   0x10b4c68 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1654,12 +1654,12 @@ L_10b56a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_add_10b4620(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_add_10b4c68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b56c4: 0x10b56c4: lw    a0, 8(s0)
+// 0x010b5d0c: 0x10b5d0c: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1668,15 +1668,15 @@ L_10b56a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b56c8: 0x10b56c8: addiu v1, zero, -1
+// 0x010b5d10: 0x10b5d10: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b56cc: 0x10b56cc: bne   a0, v1, 0x10b56d8 sll   zero, zero, 0
+// 0x010b5d14: 0x10b5d14: bne   a0, v1, 0x10b5d20 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10b56d8
+	bne.un L_10b5d20
 // --- basic block ---
-// 0x010b56d4: 0x10b56d4: sw    v0, 8(s0)
+// 0x010b5d1c: 0x10b5d1c: sw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1685,8 +1685,8 @@ L_10b56a4:
 	add
 	ldloc 6
 	stelem.i4
-L_10b56d8:
-// 0x010b56d8: 0x10b56d8: lw    a0, 36(sp)
+L_10b5d20:
+// 0x010b5d20: 0x10b5d20: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1695,7 +1695,7 @@ L_10b56d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b56dc: 0x10b56dc: lw    v1, 40(sp)
+// 0x010b5d24: 0x10b5d24: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1704,7 +1704,7 @@ L_10b56d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b56e0: 0x10b56e0: sw    v0, 12(s0)
+// 0x010b5d28: 0x10b5d28: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1713,14 +1713,14 @@ L_10b56d8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b56e4: 0x10b56e4: sw    a0, 0(s0)
+// 0x010b5d2c: 0x10b5d2c: sw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010b56e8: 0x10b56e8: sw    v1, 4(s0)
+// 0x010b5d30: 0x10b5d30: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1729,19 +1729,19 @@ L_10b56d8:
 	add
 	ldloc 7
 	stelem.i4
-L_10b56ec:
-// 0x010b56ec: 0x10b56ec: addiu s1, s1, 1
+L_10b5d34:
+// 0x010b5d34: 0x10b5d34: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010b56f0: 0x10b56f0: addiu s2, s2, 4
+// 0x010b5d38: 0x10b5d38: addiu s2, s2, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-L_10b56f4:
-// 0x010b56f4: 0x10b56f4: lw    v0, 28(sp)
+L_10b5d3c:
+// 0x010b5d3c: 0x10b5d3c: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1750,22 +1750,22 @@ L_10b56f4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b56f8: 0x10b56f8: sll   zero, zero, 0
-// 0x010b56fc: 0x10b56fc: slt   v0, v0, s1
+// 0x010b5d40: 0x10b5d40: sll   zero, zero, 0
+// 0x010b5d44: 0x10b5d44: slt   v0, v0, s1
 	ldloc 6
 	ldloc 9
 	clt
 	stloc 6
-// 0x010b5700: 0x10b5700: beq   v0, zero, 0x10b55f8 sll   zero, zero, 0
+// 0x010b5d48: 0x10b5d48: beq   v0, zero, 0x10b5c40 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b55f8
+	brfalse L_10b5c40
 // --- basic block ---
-L_10b5708:
-// 0x010b5708: 0x10b5708: lw    ra, 92(sp)
-// 0x010b570c: 0x10b570c: addu  v0, zero, zero
+L_10b5d50:
+// 0x010b5d50: 0x10b5d50: lw    ra, 92(sp)
+// 0x010b5d54: 0x10b5d54: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010b5710: 0x10b5710: lw    s7, 88(sp)
+// 0x010b5d58: 0x10b5d58: lw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1774,7 +1774,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b5714: 0x10b5714: lw    s6, 84(sp)
+// 0x010b5d5c: 0x10b5d5c: lw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1783,7 +1783,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b5718: 0x10b5718: lw    s5, 80(sp)
+// 0x010b5d60: 0x10b5d60: lw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1792,7 +1792,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b571c: 0x10b571c: lw    s4, 76(sp)
+// 0x010b5d64: 0x10b5d64: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1801,7 +1801,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b5720: 0x10b5720: lw    s3, 72(sp)
+// 0x010b5d68: 0x10b5d68: lw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1810,7 +1810,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b5724: 0x10b5724: lw    s2, 68(sp)
+// 0x010b5d6c: 0x10b5d6c: lw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1819,7 +1819,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5728: 0x10b5728: lw    s1, 64(sp)
+// 0x010b5d70: 0x10b5d70: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1828,7 +1828,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b572c: 0x10b572c: lw    s0, 60(sp)
+// 0x010b5d74: 0x10b5d74: lw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1837,7 +1837,7 @@ L_10b5708:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5730: 0x10b5730: jr    ra addiu sp, sp, 96
+// 0x010b5d78: 0x10b5d78: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -1849,7 +1849,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_items_pending_10b5738(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_items_pending_10b5d80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1884,34 +1884,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5738: 0x10b5738: lui   v0, 0xe0000
+// 0x010b5d80: 0x10b5d80: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b573c: 0x10b573c: lw    a0, -17904(v0)
+// 0x010b5d84: 0x10b5d84: lw    a0, -17440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5740: 0x10b5740: addiu sp, sp, -24
+// 0x010b5d88: 0x10b5d88: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b5744: 0x10b5744: sw    ra, 20(sp)
-// 0x010b5748: 0x10b5748: jal   0x10b6a74 sll   zero, zero, 0
+// 0x010b5d8c: 0x10b5d8c: sw    ra, 20(sp)
+// 0x010b5d90: 0x10b5d90: jal   0x10b70bc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_items_pending_10b6a74(int32)
+	call int32 Cibyl136::editor_db_items_pending_10b70bc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b5750: 0x10b5750: lw    ra, 20(sp)
-// 0x010b5754: 0x10b5754: sll   zero, zero, 0
-// 0x010b5758: 0x10b5758: jr    ra addiu sp, sp, 24
+// 0x010b5d98: 0x10b5d98: lw    ra, 20(sp)
+// 0x010b5d9c: 0x10b5d9c: sll   zero, zero, 0
+// 0x010b5da0: 0x10b5da0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1923,7 +1923,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_confirm_commit_10b5760(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_confirm_commit_10b5da8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1958,41 +1958,41 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5760: 0x10b5760: lui   v0, 0xe0000
+// 0x010b5da8: 0x10b5da8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5764: 0x10b5764: addu  a1, a0, zero
+// 0x010b5dac: 0x10b5dac: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b5768: 0x10b5768: lw    a0, -17904(v0)
+// 0x010b5db0: 0x10b5db0: lw    a0, -17440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b576c: 0x10b576c: addiu sp, sp, -24
+// 0x010b5db4: 0x10b5db4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b5770: 0x10b5770: sw    ra, 20(sp)
-// 0x010b5774: 0x10b5774: jal   0x10b6aa0 sll   zero, zero, 0
+// 0x010b5db8: 0x10b5db8: sw    ra, 20(sp)
+// 0x010b5dbc: 0x10b5dbc: jal   0x10b70e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_confirm_commit_10b6aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_confirm_commit_10b70e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b577c: 0x10b577c: lw    ra, 20(sp)
-// 0x010b5780: 0x10b5780: sll   zero, zero, 0
-// 0x010b5784: 0x10b5784: jr    ra addiu sp, sp, 24
+// 0x010b5dc4: 0x10b5dc4: lw    ra, 20(sp)
+// 0x010b5dc8: 0x10b5dc8: sll   zero, zero, 0
+// 0x010b5dcc: 0x10b5dcc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2004,7 +2004,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_begin_commit_10b578c(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_begin_commit_10b5dd4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2039,32 +2039,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b578c: 0x10b578c: lui   v0, 0xe0000
+// 0x010b5dd4: 0x10b5dd4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5790: 0x10b5790: lw    a0, -17904(v0)
+// 0x010b5dd8: 0x10b5dd8: lw    a0, -17440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5794: 0x10b5794: addiu sp, sp, -24
+// 0x010b5ddc: 0x10b5ddc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b5798: 0x10b5798: sw    ra, 20(sp)
-// 0x010b579c: 0x10b579c: jal   0x10b6a34 sll   zero, zero, 0
+// 0x010b5de0: 0x10b5de0: sw    ra, 20(sp)
+// 0x010b5de4: 0x10b5de4: jal   0x10b707c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_begin_commit_10b6a34(int32)
+	call int32 Cibyl136::editor_db_begin_commit_10b707c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b57a4: 0x10b57a4: lw    ra, 20(sp)
-// 0x010b57a8: 0x10b57a8: sll   zero, zero, 0
-// 0x010b57ac: 0x10b57ac: jr    ra addiu sp, sp, 24
+// 0x010b5dec: 0x10b5dec: lw    ra, 20(sp)
+// 0x010b5df0: 0x10b5df0: sll   zero, zero, 0
+// 0x010b5df4: 0x10b5df4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2076,7 +2076,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_committed_10b57b4(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_committed_10b5dfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2111,41 +2111,41 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b57b4: 0x10b57b4: lui   v0, 0xe0000
+// 0x010b5dfc: 0x10b5dfc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b57b8: 0x10b57b8: addu  a1, a0, zero
+// 0x010b5e00: 0x10b5e00: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b57bc: 0x10b57bc: lw    a0, -17904(v0)
+// 0x010b5e04: 0x10b5e04: lw    a0, -17440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b57c0: 0x10b57c0: addiu sp, sp, -24
+// 0x010b5e08: 0x10b5e08: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b57c4: 0x10b57c4: sw    ra, 20(sp)
-// 0x010b57c8: 0x10b57c8: jal   0x10b6a40 sll   zero, zero, 0
+// 0x010b5e0c: 0x10b5e0c: sw    ra, 20(sp)
+// 0x010b5e10: 0x10b5e10: jal   0x10b7088 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_item_committed_10b6a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_item_committed_10b7088(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b57d0: 0x10b57d0: lw    ra, 20(sp)
-// 0x010b57d4: 0x10b57d4: sll   zero, zero, 0
-// 0x010b57d8: 0x10b57d8: jr    ra addiu sp, sp, 24
+// 0x010b5e18: 0x10b5e18: lw    ra, 20(sp)
+// 0x010b5e1c: 0x10b5e1c: sll   zero, zero, 0
+// 0x010b5e20: 0x10b5e20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2157,7 +2157,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_is_valid_10b57e0(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_is_valid_10b5e28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2192,31 +2192,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b57e0: 0x10b57e0: lui   v0, 0xe0000
+// 0x010b5e28: 0x10b5e28: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b57e4: 0x10b57e4: addu  a1, a0, zero
+// 0x010b5e2c: 0x10b5e2c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b57e8: 0x10b57e8: lw    a0, -17904(v0)
+// 0x010b5e30: 0x10b5e30: lw    a0, -17440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b57ec: 0x10b57ec: addiu sp, sp, -24
+// 0x010b5e34: 0x10b5e34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b57f0: 0x10b57f0: addu  a2, zero, zero
+// 0x010b5e38: 0x10b5e38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b57f4: 0x10b57f4: sw    ra, 20(sp)
-// 0x010b57f8: 0x10b57f8: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b5e3c: 0x10b5e3c: sw    ra, 20(sp)
+// 0x010b5e40: 0x10b5e40: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2224,21 +2224,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b5800: 0x10b5800: addu  v1, v0, zero
+// 0x010b5e48: 0x10b5e48: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010b5804: 0x10b5804: beq   v1, zero, 0x10b581c addu  v0, zero, zero
+// 0x010b5e4c: 0x10b5e4c: beq   v1, zero, 0x10b5e64 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10b581c
+	brfalse L_10b5e64
 // --- basic block ---
-// 0x010b580c: 0x10b580c: lw    v0, 20(v1)
+// 0x010b5e54: 0x10b5e54: lw    v0, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2247,21 +2247,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5810: 0x10b5810: sll   zero, zero, 0
-// 0x010b5814: 0x10b5814: andi  v0, v0, 1
+// 0x010b5e58: 0x10b5e58: sll   zero, zero, 0
+// 0x010b5e5c: 0x10b5e5c: andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010b5818: 0x10b5818: xori  v0, v0, 1
+// 0x010b5e60: 0x10b5e60: xori  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	xor
 	stloc 5
-L_10b581c:
-// 0x010b581c: 0x10b581c: lw    ra, 20(sp)
-// 0x010b5820: 0x10b5820: sll   zero, zero, 0
-// 0x010b5824: 0x10b5824: jr    ra addiu sp, sp, 24
+L_10b5e64:
+// 0x010b5e64: 0x10b5e64: lw    ra, 20(sp)
+// 0x010b5e68: 0x10b5e68: sll   zero, zero, 0
+// 0x010b5e6c: 0x10b5e6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2273,7 +2273,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_get_timestamp_10b582c(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_timestamp_10b5e74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2308,31 +2308,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b582c: 0x10b582c: lui   v0, 0xe0000
+// 0x010b5e74: 0x10b5e74: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5830: 0x10b5830: addu  a1, a0, zero
+// 0x010b5e78: 0x10b5e78: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b5834: 0x10b5834: lw    a0, -17904(v0)
+// 0x010b5e7c: 0x10b5e7c: lw    a0, -17440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5838: 0x10b5838: addiu sp, sp, -24
+// 0x010b5e80: 0x10b5e80: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b583c: 0x10b583c: addu  a2, zero, zero
+// 0x010b5e84: 0x10b5e84: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5840: 0x10b5840: sw    ra, 20(sp)
-// 0x010b5844: 0x10b5844: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b5e88: 0x10b5e88: sw    ra, 20(sp)
+// 0x010b5e8c: 0x10b5e8c: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2340,31 +2340,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b584c: 0x10b584c: addu  v1, v0, zero
+// 0x010b5e94: 0x10b5e94: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010b5850: 0x10b5850: beq   v1, zero, 0x10b585c addiu v0, zero, -1
+// 0x010b5e98: 0x10b5e98: beq   v1, zero, 0x10b5ea4 addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 5
-	brfalse L_10b585c
+	brfalse L_10b5ea4
 // --- basic block ---
-// 0x010b5858: 0x10b5858: lw    v0, 0(v1)
+// 0x010b5ea0: 0x10b5ea0: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-L_10b585c:
-// 0x010b585c: 0x10b585c: lw    ra, 20(sp)
-// 0x010b5860: 0x10b5860: sll   zero, zero, 0
-// 0x010b5864: 0x10b5864: jr    ra addiu sp, sp, 24
+L_10b5ea4:
+// 0x010b5ea4: 0x10b5ea4: lw    ra, 20(sp)
+// 0x010b5ea8: 0x10b5ea8: sll   zero, zero, 0
+// 0x010b5eac: 0x10b5eac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2376,7 +2376,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_get_direction_10b586c(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_direction_10b5eb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 ra)
@@ -2414,27 +2414,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b586c: 0x10b586c: lui   v1, 0xe0000
+// 0x010b5eb4: 0x10b5eb4: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5870: 0x10b5870: addiu sp, sp, -24
+// 0x010b5eb8: 0x10b5eb8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b5874: 0x10b5874: addu  v0, a0, zero
+// 0x010b5ebc: 0x10b5ebc: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b5878: 0x10b5878: lw    a0, -17904(v1)
+// 0x010b5ec0: 0x10b5ec0: lw    a0, -17440(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b587c: 0x10b587c: sw    s0, 16(sp)
+// 0x010b5ec4: 0x10b5ec4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2443,17 +2443,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5880: 0x10b5880: addu  a2, zero, zero
+// 0x010b5ec8: 0x10b5ec8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5884: 0x10b5884: addu  s0, a1, zero
+// 0x010b5ecc: 0x10b5ecc: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b5888: 0x10b5888: addu  a3, zero, zero
+// 0x010b5ed0: 0x10b5ed0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b588c: 0x10b588c: sw    ra, 20(sp)
-// 0x010b5890: 0x10b5890: jal   0x10b6f58 addu  a1, v0, zero
+// 0x010b5ed4: 0x10b5ed4: sw    ra, 20(sp)
+// 0x010b5ed8: 0x10b5ed8: jal   0x10b75a0 addu  a1, v0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -2461,27 +2461,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010b5898: 0x10b5898: addu  v1, v0, zero
+// 0x010b5ee0: 0x10b5ee0: addu  v1, v0, zero
 	ldloc 7
 	stloc 5
-// 0x010b589c: 0x10b589c: beq   v1, zero, 0x10b58b8 addiu v0, zero, -1
+// 0x010b5ee4: 0x10b5ee4: beq   v1, zero, 0x10b5f00 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 7
-	brfalse L_10b58b8
+	brfalse L_10b5f00
 // --- basic block ---
-// 0x010b58a4: 0x10b58a4: beq   s0, zero, 0x10b58b8 addu  v0, zero, zero
+// 0x010b5eec: 0x10b5eec: beq   s0, zero, 0x10b5f00 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10b58b8
+	brfalse L_10b5f00
 // --- basic block ---
-// 0x010b58ac: 0x10b58ac: lw    v1, 24(v1)
+// 0x010b5ef4: 0x10b5ef4: lw    v1, 24(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2490,17 +2490,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b58b0: 0x10b58b0: sll   zero, zero, 0
-// 0x010b58b4: 0x10b58b4: sw    v1, 0(s0)
+// 0x010b5ef8: 0x10b5ef8: sll   zero, zero, 0
+// 0x010b5efc: 0x10b5efc: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10b58b8:
-// 0x010b58b8: 0x10b58b8: lw    ra, 20(sp)
-// 0x010b58bc: 0x10b58bc: lw    s0, 16(sp)
+L_10b5f00:
+// 0x010b5f00: 0x10b5f00: lw    ra, 20(sp)
+// 0x010b5f04: 0x10b5f04: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2509,7 +2509,7 @@ L_10b58b8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b58c0: 0x10b58c0: jr    ra addiu sp, sp, 24
+// 0x010b5f08: 0x10b5f08: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2521,7 +2521,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 ra)
@@ -2559,27 +2559,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b58c8: 0x10b58c8: lui   v1, 0xe0000
+// 0x010b5f10: 0x10b5f10: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b58cc: 0x10b58cc: addiu sp, sp, -24
+// 0x010b5f14: 0x10b5f14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b58d0: 0x10b58d0: addu  v0, a0, zero
+// 0x010b5f18: 0x10b5f18: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b58d4: 0x10b58d4: lw    a0, -17904(v1)
+// 0x010b5f1c: 0x10b5f1c: lw    a0, -17440(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b58d8: 0x10b58d8: sw    s0, 16(sp)
+// 0x010b5f20: 0x10b5f20: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2588,17 +2588,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b58dc: 0x10b58dc: addu  a2, zero, zero
+// 0x010b5f24: 0x10b5f24: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b58e0: 0x10b58e0: addu  s0, a1, zero
+// 0x010b5f28: 0x10b5f28: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b58e4: 0x10b58e4: addu  a3, zero, zero
+// 0x010b5f2c: 0x10b5f2c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b58e8: 0x10b58e8: sw    ra, 20(sp)
-// 0x010b58ec: 0x10b58ec: jal   0x10b6f58 addu  a1, v0, zero
+// 0x010b5f30: 0x10b5f30: sw    ra, 20(sp)
+// 0x010b5f34: 0x10b5f34: jal   0x10b75a0 addu  a1, v0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -2606,27 +2606,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010b58f4: 0x10b58f4: addu  v1, v0, zero
+// 0x010b5f3c: 0x10b5f3c: addu  v1, v0, zero
 	ldloc 7
 	stloc 5
-// 0x010b58f8: 0x10b58f8: beq   v1, zero, 0x10b5914 addiu v0, zero, -1
+// 0x010b5f40: 0x10b5f40: beq   v1, zero, 0x10b5f5c addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 7
-	brfalse L_10b5914
+	brfalse L_10b5f5c
 // --- basic block ---
-// 0x010b5900: 0x10b5900: beq   s0, zero, 0x10b5914 addu  v0, zero, zero
+// 0x010b5f48: 0x10b5f48: beq   s0, zero, 0x10b5f5c addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10b5914
+	brfalse L_10b5f5c
 // --- basic block ---
-// 0x010b5908: 0x10b5908: lw    v1, 28(v1)
+// 0x010b5f50: 0x10b5f50: lw    v1, 28(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2635,17 +2635,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b590c: 0x10b590c: sll   zero, zero, 0
-// 0x010b5910: 0x10b5910: sw    v1, 0(s0)
+// 0x010b5f54: 0x10b5f54: sll   zero, zero, 0
+// 0x010b5f58: 0x10b5f58: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10b5914:
-// 0x010b5914: 0x10b5914: lw    ra, 20(sp)
-// 0x010b5918: 0x10b5918: lw    s0, 16(sp)
+L_10b5f5c:
+// 0x010b5f5c: 0x10b5f5c: lw    ra, 20(sp)
+// 0x010b5f60: 0x10b5f60: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2654,7 +2654,7 @@ L_10b5914:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b591c: 0x10b591c: jr    ra addiu sp, sp, 24
+// 0x010b5f64: 0x10b5f64: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2666,7 +2666,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_line_get_points_10b5924(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_points_10b5f6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2707,27 +2707,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5924: 0x10b5924: lui   v1, 0xe0000
+// 0x010b5f6c: 0x10b5f6c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b5928: 0x10b5928: addiu sp, sp, -32
+// 0x010b5f70: 0x10b5f70: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b592c: 0x10b592c: addu  v0, a0, zero
+// 0x010b5f74: 0x10b5f74: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b5930: 0x10b5930: lw    a0, -17904(v1)
+// 0x010b5f78: 0x10b5f78: lw    a0, -17440(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5934: 0x10b5934: sw    s1, 24(sp)
+// 0x010b5f7c: 0x10b5f7c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2736,7 +2736,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5938: 0x10b5938: sw    s0, 20(sp)
+// 0x010b5f80: 0x10b5f80: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2745,20 +2745,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b593c: 0x10b593c: addu  s1, a1, zero
+// 0x010b5f84: 0x10b5f84: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010b5940: 0x10b5940: addu  s0, a2, zero
+// 0x010b5f88: 0x10b5f88: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010b5944: 0x10b5944: addu  a1, v0, zero
+// 0x010b5f8c: 0x10b5f8c: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b5948: 0x10b5948: addu  a2, zero, zero
+// 0x010b5f90: 0x10b5f90: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b594c: 0x10b594c: sw    ra, 28(sp)
-// 0x010b5950: 0x10b5950: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b5f94: 0x10b5f94: sw    ra, 28(sp)
+// 0x010b5f98: 0x10b5f98: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2766,20 +2766,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5958: 0x10b5958: beq   v0, zero, 0x10b5988 sll   zero, zero, 0
+// 0x010b5fa0: 0x10b5fa0: beq   v0, zero, 0x10b5fd0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b5988
+	brfalse L_10b5fd0
 // --- basic block ---
-// 0x010b5960: 0x10b5960: beq   s1, zero, 0x10b5974 sll   zero, zero, 0
+// 0x010b5fa8: 0x10b5fa8: beq   s1, zero, 0x10b5fbc sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10b5974
+	brfalse L_10b5fbc
 // --- basic block ---
-// 0x010b5968: 0x10b5968: lw    v1, 4(v0)
+// 0x010b5fb0: 0x10b5fb0: lw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2788,20 +2788,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b596c: 0x10b596c: sll   zero, zero, 0
-// 0x010b5970: 0x10b5970: sw    v1, 0(s1)
+// 0x010b5fb4: 0x10b5fb4: sll   zero, zero, 0
+// 0x010b5fb8: 0x10b5fb8: sw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10b5974:
-// 0x010b5974: 0x10b5974: beq   s0, zero, 0x10b5988 sll   zero, zero, 0
+L_10b5fbc:
+// 0x010b5fbc: 0x10b5fbc: beq   s0, zero, 0x10b5fd0 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10b5988
+	brfalse L_10b5fd0
 // --- basic block ---
-// 0x010b597c: 0x10b597c: lw    v0, 8(v0)
+// 0x010b5fc4: 0x10b5fc4: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2810,17 +2810,17 @@ L_10b5974:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b5980: 0x10b5980: sll   zero, zero, 0
-// 0x010b5984: 0x10b5984: sw    v0, 0(s0)
+// 0x010b5fc8: 0x10b5fc8: sll   zero, zero, 0
+// 0x010b5fcc: 0x10b5fcc: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b5988:
-// 0x010b5988: 0x10b5988: lw    ra, 28(sp)
-// 0x010b598c: 0x10b598c: lw    s1, 24(sp)
+L_10b5fd0:
+// 0x010b5fd0: 0x10b5fd0: lw    ra, 28(sp)
+// 0x010b5fd4: 0x10b5fd4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2829,7 +2829,7 @@ L_10b5988:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5990: 0x10b5990: lw    s0, 20(sp)
+// 0x010b5fd8: 0x10b5fd8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2838,7 +2838,7 @@ L_10b5988:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5994: 0x10b5994: jr    ra addiu sp, sp, 32
+// 0x010b5fdc: 0x10b5fdc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2850,7 +2850,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_set_direction_10b5a24(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_set_direction_10b606c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s0,int32 s1,int32 ra)
@@ -2894,15 +2894,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5a24: 0x10b5a24: addiu sp, sp, -32
+// 0x010b606c: 0x10b606c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b5a28: 0x10b5a28: lui   v0, 0xe0000
+// 0x010b6070: 0x10b6070: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b5a2c: 0x10b5a2c: sw    s0, 16(sp)
+// 0x010b6074: 0x10b6074: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2911,19 +2911,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5a30: 0x10b5a30: addu  s0, a0, zero
+// 0x010b6078: 0x10b6078: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b5a34: 0x10b5a34: lw    a0, -17904(v0)
+// 0x010b607c: 0x10b607c: lw    a0, -17440(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5a38: 0x10b5a38: sw    s1, 20(sp)
+// 0x010b6080: 0x10b6080: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2932,16 +2932,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5a3c: 0x10b5a3c: addu  a2, zero, zero
+// 0x010b6084: 0x10b6084: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5a40: 0x10b5a40: addu  s1, a1, zero
+// 0x010b6088: 0x10b6088: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010b5a44: 0x10b5a44: addu  a3, zero, zero
+// 0x010b608c: 0x10b608c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b5a48: 0x10b5a48: sw    s2, 24(sp)
+// 0x010b6090: 0x10b6090: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2950,8 +2950,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5a4c: 0x10b5a4c: sw    ra, 28(sp)
-// 0x010b5a50: 0x10b5a50: jal   0x10b6f58 addu  a1, s0, zero
+// 0x010b6094: 0x10b6094: sw    ra, 28(sp)
+// 0x010b6098: 0x10b6098: jal   0x10b75a0 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -2959,21 +2959,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5a58: 0x10b5a58: addu  s2, v0, zero
+// 0x010b60a0: 0x10b60a0: addu  s2, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010b5a5c: 0x10b5a5c: beq   s2, zero, 0x10b5a94 addiu v0, zero, -1
+// 0x010b60a4: 0x10b60a4: beq   s2, zero, 0x10b60dc addiu v0, zero, -1
 	ldloc 8
 	ldc.i4.m1
 	stloc 6
-	brfalse L_10b5a94
+	brfalse L_10b60dc
 // --- basic block ---
-// 0x010b5a64: 0x10b5a64: jal   0x1029e40 sw    s1, 24(s2)
+// 0x010b60ac: 0x10b60ac: jal   0x1029e50 sw    s1, 24(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2982,49 +2982,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	call int32 Cibyl31::roadmap_navigate_get_time_1029e40()
+	call int32 Cibyl31::roadmap_navigate_get_time_1029e50()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5a6c: 0x10b5a6c: lw    v1, 0(s2)
+// 0x010b60b4: 0x10b60b4: lw    v1, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b5a70: 0x10b5a70: sll   zero, zero, 0
-// 0x010b5a74: 0x10b5a74: slt   v1, v1, v0
+// 0x010b60b8: 0x10b60b8: sll   zero, zero, 0
+// 0x010b60bc: 0x10b60bc: slt   v1, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 7
-// 0x010b5a78: 0x10b5a78: beq   v1, zero, 0x10b5a84 sll   zero, zero, 0
+// 0x010b60c0: 0x10b60c0: beq   v1, zero, 0x10b60cc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b5a84
+	brfalse L_10b60cc
 // --- basic block ---
-// 0x010b5a80: 0x10b5a80: sw    v0, 0(s2)
+// 0x010b60c8: 0x10b60c8: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b5a84:
-// 0x010b5a84: 0x10b5a84: lui   v0, 0xe0000
+L_10b60cc:
+// 0x010b60cc: 0x10b60cc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b5a88: 0x10b5a88: lw    a0, -17904(v0)
+// 0x010b60d0: 0x10b60d0: lw    a0, -17440(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5a8c: 0x10b5a8c: jal   0x10b6cd4 addu  a1, s0, zero
+// 0x010b60d4: 0x10b60d4: jal   0x10b731c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -3032,14 +3032,14 @@ L_10b5a84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b5a94:
-// 0x010b5a94: 0x10b5a94: lw    ra, 28(sp)
-// 0x010b5a98: 0x10b5a98: lw    s2, 24(sp)
+L_10b60dc:
+// 0x010b60dc: 0x10b60dc: lw    ra, 28(sp)
+// 0x010b60e0: 0x10b60e0: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3048,7 +3048,7 @@ L_10b5a94:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5a9c: 0x10b5a9c: lw    s1, 20(sp)
+// 0x010b60e4: 0x10b60e4: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3057,7 +3057,7 @@ L_10b5a94:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5aa0: 0x10b5aa0: lw    s0, 16(sp)
+// 0x010b60e8: 0x10b60e8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3066,7 +3066,7 @@ L_10b5a94:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5aa4: 0x10b5aa4: jr    ra addiu sp, sp, 32
+// 0x010b60ec: 0x10b60ec: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3078,7 +3078,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_set_street_10b5aac(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_set_street_10b60f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s0,int32 s1,int32 ra)
@@ -3122,15 +3122,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5aac: 0x10b5aac: addiu sp, sp, -32
+// 0x010b60f4: 0x10b60f4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b5ab0: 0x10b5ab0: lui   v0, 0xe0000
+// 0x010b60f8: 0x10b60f8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b5ab4: 0x10b5ab4: sw    s0, 16(sp)
+// 0x010b60fc: 0x10b60fc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3139,19 +3139,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5ab8: 0x10b5ab8: addu  s0, a0, zero
+// 0x010b6100: 0x10b6100: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b5abc: 0x10b5abc: lw    a0, -17904(v0)
+// 0x010b6104: 0x10b6104: lw    a0, -17440(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5ac0: 0x10b5ac0: sw    s1, 20(sp)
+// 0x010b6108: 0x10b6108: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3160,16 +3160,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5ac4: 0x10b5ac4: addu  a2, zero, zero
+// 0x010b610c: 0x10b610c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5ac8: 0x10b5ac8: addu  s1, a1, zero
+// 0x010b6110: 0x10b6110: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010b5acc: 0x10b5acc: addu  a3, zero, zero
+// 0x010b6114: 0x10b6114: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b5ad0: 0x10b5ad0: sw    s2, 24(sp)
+// 0x010b6118: 0x10b6118: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3178,8 +3178,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5ad4: 0x10b5ad4: sw    ra, 28(sp)
-// 0x010b5ad8: 0x10b5ad8: jal   0x10b6f58 addu  a1, s0, zero
+// 0x010b611c: 0x10b611c: sw    ra, 28(sp)
+// 0x010b6120: 0x10b6120: jal   0x10b75a0 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -3187,21 +3187,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5ae0: 0x10b5ae0: addu  s2, v0, zero
+// 0x010b6128: 0x10b6128: addu  s2, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010b5ae4: 0x10b5ae4: beq   s2, zero, 0x10b5b1c addiu v0, zero, -1
+// 0x010b612c: 0x10b612c: beq   s2, zero, 0x10b6164 addiu v0, zero, -1
 	ldloc 8
 	ldc.i4.m1
 	stloc 6
-	brfalse L_10b5b1c
+	brfalse L_10b6164
 // --- basic block ---
-// 0x010b5aec: 0x10b5aec: jal   0x1029e40 sw    s1, 28(s2)
+// 0x010b6134: 0x10b6134: jal   0x1029e50 sw    s1, 28(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3210,49 +3210,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	call int32 Cibyl31::roadmap_navigate_get_time_1029e40()
+	call int32 Cibyl31::roadmap_navigate_get_time_1029e50()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5af4: 0x10b5af4: lw    v1, 0(s2)
+// 0x010b613c: 0x10b613c: lw    v1, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b5af8: 0x10b5af8: sll   zero, zero, 0
-// 0x010b5afc: 0x10b5afc: slt   v1, v1, v0
+// 0x010b6140: 0x10b6140: sll   zero, zero, 0
+// 0x010b6144: 0x10b6144: slt   v1, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 7
-// 0x010b5b00: 0x10b5b00: beq   v1, zero, 0x10b5b0c sll   zero, zero, 0
+// 0x010b6148: 0x10b6148: beq   v1, zero, 0x10b6154 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b5b0c
+	brfalse L_10b6154
 // --- basic block ---
-// 0x010b5b08: 0x10b5b08: sw    v0, 0(s2)
+// 0x010b6150: 0x10b6150: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b5b0c:
-// 0x010b5b0c: 0x10b5b0c: lui   v0, 0xe0000
+L_10b6154:
+// 0x010b6154: 0x10b6154: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b5b10: 0x10b5b10: lw    a0, -17904(v0)
+// 0x010b6158: 0x10b6158: lw    a0, -17440(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5b14: 0x10b5b14: jal   0x10b6cd4 addu  a1, s0, zero
+// 0x010b615c: 0x10b615c: jal   0x10b731c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -3260,14 +3260,14 @@ L_10b5b0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b5b1c:
-// 0x010b5b1c: 0x10b5b1c: lw    ra, 28(sp)
-// 0x010b5b20: 0x10b5b20: lw    s2, 24(sp)
+L_10b6164:
+// 0x010b6164: 0x10b6164: lw    ra, 28(sp)
+// 0x010b6168: 0x10b6168: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3276,7 +3276,7 @@ L_10b5b1c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5b24: 0x10b5b24: lw    s1, 20(sp)
+// 0x010b616c: 0x10b616c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3285,7 +3285,7 @@ L_10b5b1c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5b28: 0x10b5b28: lw    s0, 16(sp)
+// 0x010b6170: 0x10b6170: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3294,7 +3294,7 @@ L_10b5b1c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5b2c: 0x10b5b2c: jr    ra addiu sp, sp, 32
+// 0x010b6174: 0x10b6174: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3306,7 +3306,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_set_flag_10b5bc4(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_set_flag_10b620c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 ra)
@@ -3350,15 +3350,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5bc4: 0x10b5bc4: addiu sp, sp, -32
+// 0x010b620c: 0x10b620c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b5bc8: 0x10b5bc8: lui   v0, 0xe0000
+// 0x010b6210: 0x10b6210: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5bcc: 0x10b5bcc: sw    s0, 16(sp)
+// 0x010b6214: 0x10b6214: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3367,19 +3367,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5bd0: 0x10b5bd0: addu  s0, a0, zero
+// 0x010b6218: 0x10b6218: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010b5bd4: 0x10b5bd4: lw    a0, -17904(v0)
+// 0x010b621c: 0x10b621c: lw    a0, -17440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5bd8: 0x10b5bd8: sw    s1, 20(sp)
+// 0x010b6220: 0x10b6220: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3388,16 +3388,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5bdc: 0x10b5bdc: addu  a2, zero, zero
+// 0x010b6224: 0x10b6224: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5be0: 0x10b5be0: addu  s1, a1, zero
+// 0x010b6228: 0x10b6228: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010b5be4: 0x10b5be4: addu  a3, zero, zero
+// 0x010b622c: 0x10b622c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b5be8: 0x10b5be8: sw    s2, 24(sp)
+// 0x010b6230: 0x10b6230: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3406,8 +3406,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5bec: 0x10b5bec: sw    ra, 28(sp)
-// 0x010b5bf0: 0x10b5bf0: jal   0x10b6f58 addu  a1, s0, zero
+// 0x010b6234: 0x10b6234: sw    ra, 28(sp)
+// 0x010b6238: 0x10b6238: jal   0x10b75a0 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3415,18 +3415,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b5bf8: 0x10b5bf8: beq   v0, zero, 0x10b5c3c addu  s2, v0, zero
+// 0x010b6240: 0x10b6240: beq   v0, zero, 0x10b6284 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_10b5c3c
+	brfalse L_10b6284
 // --- basic block ---
-// 0x010b5c00: 0x10b5c00: lw    v0, 20(v0)
+// 0x010b6248: 0x10b6248: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3435,13 +3435,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b5c04: 0x10b5c04: sll   zero, zero, 0
-// 0x010b5c08: 0x10b5c08: or    s1, v0, s1
+// 0x010b624c: 0x10b624c: sll   zero, zero, 0
+// 0x010b6250: 0x10b6250: or    s1, v0, s1
 	ldloc 5
 	ldloc 8
 	or
 	stloc 8
-// 0x010b5c0c: 0x10b5c0c: jal   0x1029e40 sw    s1, 20(s2)
+// 0x010b6254: 0x10b6254: jal   0x1029e50 sw    s1, 20(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3450,49 +3450,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl31::roadmap_navigate_get_time_1029e40()
+	call int32 Cibyl31::roadmap_navigate_get_time_1029e50()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b5c14: 0x10b5c14: lw    v1, 0(s2)
+// 0x010b625c: 0x10b625c: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b5c18: 0x10b5c18: sll   zero, zero, 0
-// 0x010b5c1c: 0x10b5c1c: slt   v1, v1, v0
+// 0x010b6260: 0x10b6260: sll   zero, zero, 0
+// 0x010b6264: 0x10b6264: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010b5c20: 0x10b5c20: beq   v1, zero, 0x10b5c2c sll   zero, zero, 0
+// 0x010b6268: 0x10b6268: beq   v1, zero, 0x10b6274 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b5c2c
+	brfalse L_10b6274
 // --- basic block ---
-// 0x010b5c28: 0x10b5c28: sw    v0, 0(s2)
+// 0x010b6270: 0x10b6270: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10b5c2c:
-// 0x010b5c2c: 0x10b5c2c: lui   v0, 0xe0000
+L_10b6274:
+// 0x010b6274: 0x10b6274: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5c30: 0x10b5c30: lw    a0, -17904(v0)
+// 0x010b6278: 0x10b6278: lw    a0, -17440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5c34: 0x10b5c34: jal   0x10b6cd4 addu  a1, s0, zero
+// 0x010b627c: 0x10b627c: jal   0x10b731c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3500,14 +3500,14 @@ L_10b5c2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b5c3c:
-// 0x010b5c3c: 0x10b5c3c: lw    ra, 28(sp)
-// 0x010b5c40: 0x10b5c40: lw    s2, 24(sp)
+L_10b6284:
+// 0x010b6284: 0x10b6284: lw    ra, 28(sp)
+// 0x010b6288: 0x10b6288: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3516,7 +3516,7 @@ L_10b5c3c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5c44: 0x10b5c44: lw    s1, 20(sp)
+// 0x010b628c: 0x10b628c: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3525,7 +3525,7 @@ L_10b5c3c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5c48: 0x10b5c48: lw    s0, 16(sp)
+// 0x010b6290: 0x10b6290: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3534,7 +3534,7 @@ L_10b5c3c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5c4c: 0x10b5c4c: jr    ra addiu sp, sp, 32
+// 0x010b6294: 0x10b6294: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3546,7 +3546,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_invalidate_10b5c54(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_invalidate_10b629c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3581,13 +3581,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5c54: 0x10b5c54: addiu sp, sp, -24
+// 0x010b629c: 0x10b629c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b5c58: 0x10b5c58: sw    ra, 20(sp)
-// 0x010b5c5c: 0x10b5c5c: jal   0x10b5bc4 addiu a1, zero, 1
+// 0x010b62a0: 0x10b62a0: sw    ra, 20(sp)
+// 0x010b62a4: 0x10b62a4: jal   0x10b620c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3595,14 +3595,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_set_flag_10b5bc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_set_flag_10b620c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010b5c64: 0x10b5c64: lw    ra, 20(sp)
-// 0x010b5c68: 0x10b5c68: sll   zero, zero, 0
-// 0x010b5c6c: 0x10b5c6c: jr    ra addiu sp, sp, 24
+// 0x010b62ac: 0x10b62ac: lw    ra, 20(sp)
+// 0x010b62b0: 0x10b62b0: sll   zero, zero, 0
+// 0x010b62b4: 0x10b62b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3614,7 +3614,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_line_modify_properties_10b5c74(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_modify_properties_10b62bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 ra)
@@ -3661,15 +3661,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5c74: 0x10b5c74: addiu sp, sp, -40
+// 0x010b62bc: 0x10b62bc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b5c78: 0x10b5c78: lui   v0, 0xe0000
+// 0x010b62c0: 0x10b62c0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b5c7c: 0x10b5c7c: sw    s0, 20(sp)
+// 0x010b62c4: 0x10b62c4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3678,19 +3678,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5c80: 0x10b5c80: addu  s0, a0, zero
+// 0x010b62c8: 0x10b62c8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b5c84: 0x10b5c84: lw    a0, -17904(v0)
+// 0x010b62cc: 0x10b62cc: lw    a0, -17440(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5c88: 0x10b5c88: sw    s2, 28(sp)
+// 0x010b62d0: 0x10b62d0: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3699,7 +3699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5c8c: 0x10b5c8c: sw    s1, 24(sp)
+// 0x010b62d4: 0x10b62d4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3708,19 +3708,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5c90: 0x10b5c90: addu  s2, a1, zero
+// 0x010b62d8: 0x10b62d8: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010b5c94: 0x10b5c94: addu  s1, a2, zero
+// 0x010b62dc: 0x10b62dc: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010b5c98: 0x10b5c98: addu  a1, s0, zero
+// 0x010b62e0: 0x10b62e0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010b5c9c: 0x10b5c9c: addu  a2, zero, zero
+// 0x010b62e4: 0x10b62e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5ca0: 0x10b5ca0: sw    s3, 32(sp)
+// 0x010b62e8: 0x10b62e8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3729,8 +3729,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5ca4: 0x10b5ca4: sw    ra, 36(sp)
-// 0x010b5ca8: 0x10b5ca8: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b62ec: 0x10b62ec: sw    ra, 36(sp)
+// 0x010b62f0: 0x10b62f0: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3738,18 +3738,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5cb0: 0x10b5cb0: beq   v0, zero, 0x10b5cec addu  s3, v0, zero
+// 0x010b62f8: 0x10b62f8: beq   v0, zero, 0x10b6334 addu  s3, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brfalse L_10b5cec
+	brfalse L_10b6334
 // --- basic block ---
-// 0x010b5cb8: 0x10b5cb8: sw    s2, 16(v0)
+// 0x010b6300: 0x10b6300: sw    s2, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3758,7 +3758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5cbc: 0x10b5cbc: jal   0x1029e40 sw    s1, 20(v0)
+// 0x010b6304: 0x10b6304: jal   0x1029e50 sw    s1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3767,49 +3767,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	call int32 Cibyl31::roadmap_navigate_get_time_1029e40()
+	call int32 Cibyl31::roadmap_navigate_get_time_1029e50()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5cc4: 0x10b5cc4: lw    v1, 0(s3)
+// 0x010b630c: 0x10b630c: lw    v1, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b5cc8: 0x10b5cc8: sll   zero, zero, 0
-// 0x010b5ccc: 0x10b5ccc: slt   v1, v1, v0
+// 0x010b6310: 0x10b6310: sll   zero, zero, 0
+// 0x010b6314: 0x10b6314: slt   v1, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 7
-// 0x010b5cd0: 0x10b5cd0: beq   v1, zero, 0x10b5cdc sll   zero, zero, 0
+// 0x010b6318: 0x10b6318: beq   v1, zero, 0x10b6324 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b5cdc
+	brfalse L_10b6324
 // --- basic block ---
-// 0x010b5cd8: 0x10b5cd8: sw    v0, 0(s3)
+// 0x010b6320: 0x10b6320: sw    v0, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b5cdc:
-// 0x010b5cdc: 0x10b5cdc: lui   v0, 0xe0000
+L_10b6324:
+// 0x010b6324: 0x10b6324: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b5ce0: 0x10b5ce0: lw    a0, -17904(v0)
+// 0x010b6328: 0x10b6328: lw    a0, -17440(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5ce4: 0x10b5ce4: jal   0x10b6cd4 addu  a1, s0, zero
+// 0x010b632c: 0x10b632c: jal   0x10b731c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3817,14 +3817,14 @@ L_10b5cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b5cec:
-// 0x010b5cec: 0x10b5cec: lw    ra, 36(sp)
-// 0x010b5cf0: 0x10b5cf0: lw    s3, 32(sp)
+L_10b6334:
+// 0x010b6334: 0x10b6334: lw    ra, 36(sp)
+// 0x010b6338: 0x10b6338: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3833,7 +3833,7 @@ L_10b5cec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5cf4: 0x10b5cf4: lw    s2, 28(sp)
+// 0x010b633c: 0x10b633c: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3842,7 +3842,7 @@ L_10b5cec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b5cf8: 0x10b5cf8: lw    s1, 24(sp)
+// 0x010b6340: 0x10b6340: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3851,7 +3851,7 @@ L_10b5cec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5cfc: 0x10b5cfc: lw    s0, 20(sp)
+// 0x010b6344: 0x10b6344: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3860,7 +3860,7 @@ L_10b5cec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5d00: 0x10b5d00: jr    ra addiu sp, sp, 40
+// 0x010b6348: 0x10b6348: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3872,7 +3872,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_get_count_10b5d08(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_count_10b6350(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3907,32 +3907,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5d08: 0x10b5d08: lui   v0, 0xe0000
+// 0x010b6350: 0x10b6350: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b5d0c: 0x10b5d0c: lw    a0, -17904(v0)
+// 0x010b6354: 0x10b6354: lw    a0, -17440(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5d10: 0x10b5d10: addiu sp, sp, -24
+// 0x010b6358: 0x10b6358: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b5d14: 0x10b5d14: sw    ra, 20(sp)
-// 0x010b5d18: 0x10b5d18: jal   0x10b6a20 sll   zero, zero, 0
+// 0x010b635c: 0x10b635c: sw    ra, 20(sp)
+// 0x010b6360: 0x10b6360: jal   0x10b7068 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b5d20: 0x10b5d20: lw    ra, 20(sp)
-// 0x010b5d24: 0x10b5d24: sll   zero, zero, 0
-// 0x010b5d28: 0x10b5d28: jr    ra addiu sp, sp, 24
+// 0x010b6368: 0x10b6368: lw    ra, 20(sp)
+// 0x010b636c: 0x10b636c: sll   zero, zero, 0
+// 0x010b6370: 0x10b6370: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3944,7 +3944,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_10b6378(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s5,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -3997,27 +3997,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5d30: 0x10b5d30: lui   v1, 0xe0000
+// 0x010b6378: 0x10b6378: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b5d34: 0x10b5d34: addiu sp, sp, -48
+// 0x010b637c: 0x10b637c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b5d38: 0x10b5d38: addu  v0, a0, zero
+// 0x010b6380: 0x10b6380: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b5d3c: 0x10b5d3c: lw    a0, -17904(v1)
+// 0x010b6384: 0x10b6384: lw    a0, -17440(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5d40: 0x10b5d40: sw    s4, 36(sp)
+// 0x010b6388: 0x10b6388: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4026,7 +4026,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b5d44: 0x10b5d44: sw    s3, 32(sp)
+// 0x010b638c: 0x10b638c: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4035,7 +4035,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b5d48: 0x10b5d48: sw    s2, 28(sp)
+// 0x010b6390: 0x10b6390: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4044,22 +4044,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5d4c: 0x10b5d4c: addu  s4, a1, zero
+// 0x010b6394: 0x10b6394: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010b5d50: 0x10b5d50: addu  s3, a2, zero
+// 0x010b6398: 0x10b6398: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x010b5d54: 0x10b5d54: addu  s2, a3, zero
+// 0x010b639c: 0x10b639c: addu  s2, a3, zero
 	ldloc 4
 	stloc 11
-// 0x010b5d58: 0x10b5d58: addu  a1, v0, zero
+// 0x010b63a0: 0x10b63a0: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b5d5c: 0x10b5d5c: addu  a2, zero, zero
+// 0x010b63a4: 0x10b63a4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5d60: 0x10b5d60: sw    s5, 40(sp)
+// 0x010b63a8: 0x10b63a8: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4068,7 +4068,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b5d64: 0x10b5d64: sw    s1, 24(sp)
+// 0x010b63ac: 0x10b63ac: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4077,7 +4077,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5d68: 0x10b5d68: sw    s0, 20(sp)
+// 0x010b63b0: 0x10b63b0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4086,8 +4086,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5d6c: 0x10b5d6c: sw    ra, 44(sp)
-// 0x010b5d70: 0x10b5d70: lw    s1, 64(sp)
+// 0x010b63b4: 0x10b63b4: sw    ra, 44(sp)
+// 0x010b63b8: 0x10b63b8: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4096,7 +4096,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5d74: 0x10b5d74: lw    s0, 68(sp)
+// 0x010b63bc: 0x10b63bc: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4105,7 +4105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5d78: 0x10b5d78: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b63c0: 0x10b63c0: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4113,22 +4113,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b5d80: 0x10b5d80: beq   v0, zero, 0x10b5dec addu  s5, v0, zero
+// 0x010b63c8: 0x10b63c8: beq   v0, zero, 0x10b6434 addu  s5, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
-	brfalse L_10b5dec
+	brfalse L_10b6434
 // --- basic block ---
-// 0x010b5d88: 0x10b5d88: beq   s4, zero, 0x10b5d9c sll   zero, zero, 0
+// 0x010b63d0: 0x10b63d0: beq   s4, zero, 0x10b63e4 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_10b5d9c
+	brfalse L_10b63e4
 // --- basic block ---
-// 0x010b5d90: 0x10b5d90: lw    a0, 4(v0)
+// 0x010b63d8: 0x10b63d8: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4137,7 +4137,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5d94: 0x10b5d94: jal   0x10b46a0 addu  a1, s4, zero
+// 0x010b63dc: 0x10b63dc: jal   0x10b4ce8 addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -4145,17 +4145,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10b5d9c:
-// 0x010b5d9c: 0x10b5d9c: beq   s3, zero, 0x10b5db0 sll   zero, zero, 0
+L_10b63e4:
+// 0x010b63e4: 0x10b63e4: beq   s3, zero, 0x10b63f8 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_10b5db0
+	brfalse L_10b63f8
 // --- basic block ---
-// 0x010b5da4: 0x10b5da4: lw    a0, 8(s5)
+// 0x010b63ec: 0x10b63ec: lw    a0, 8(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4164,7 +4164,7 @@ L_10b5d9c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5da8: 0x10b5da8: jal   0x10b46a0 addu  a1, s3, zero
+// 0x010b63f0: 0x10b63f0: jal   0x10b4ce8 addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -4172,17 +4172,17 @@ L_10b5d9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10b5db0:
-// 0x010b5db0: 0x10b5db0: beq   s2, zero, 0x10b5dc4 sll   zero, zero, 0
+L_10b63f8:
+// 0x010b63f8: 0x10b63f8: beq   s2, zero, 0x10b640c sll   zero, zero, 0
 	ldloc 11
-	brfalse L_10b5dc4
+	brfalse L_10b640c
 // --- basic block ---
-// 0x010b5db8: 0x10b5db8: lw    v0, 12(s5)
+// 0x010b6400: 0x10b6400: lw    v0, 12(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4191,20 +4191,20 @@ L_10b5db0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b5dbc: 0x10b5dbc: sll   zero, zero, 0
-// 0x010b5dc0: 0x10b5dc0: sw    v0, 0(s2)
+// 0x010b6404: 0x10b6404: sll   zero, zero, 0
+// 0x010b6408: 0x10b6408: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b5dc4:
-// 0x010b5dc4: 0x10b5dc4: beq   s1, zero, 0x10b5dd8 sll   zero, zero, 0
+L_10b640c:
+// 0x010b640c: 0x10b640c: beq   s1, zero, 0x10b6420 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10b5dd8
+	brfalse L_10b6420
 // --- basic block ---
-// 0x010b5dcc: 0x10b5dcc: lw    v0, 16(s5)
+// 0x010b6414: 0x10b6414: lw    v0, 16(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4213,20 +4213,20 @@ L_10b5dc4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b5dd0: 0x10b5dd0: sll   zero, zero, 0
-// 0x010b5dd4: 0x10b5dd4: sw    v0, 0(s1)
+// 0x010b6418: 0x10b6418: sll   zero, zero, 0
+// 0x010b641c: 0x10b641c: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b5dd8:
-// 0x010b5dd8: 0x10b5dd8: beq   s0, zero, 0x10b5dec sll   zero, zero, 0
+L_10b6420:
+// 0x010b6420: 0x10b6420: beq   s0, zero, 0x10b6434 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10b5dec
+	brfalse L_10b6434
 // --- basic block ---
-// 0x010b5de0: 0x10b5de0: lw    v0, 20(s5)
+// 0x010b6428: 0x10b6428: lw    v0, 20(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4235,17 +4235,17 @@ L_10b5dd8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b5de4: 0x10b5de4: sll   zero, zero, 0
-// 0x010b5de8: 0x10b5de8: sw    v0, 0(s0)
+// 0x010b642c: 0x10b642c: sll   zero, zero, 0
+// 0x010b6430: 0x10b6430: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b5dec:
-// 0x010b5dec: 0x10b5dec: lw    ra, 44(sp)
-// 0x010b5df0: 0x10b5df0: lw    s5, 40(sp)
+L_10b6434:
+// 0x010b6434: 0x10b6434: lw    ra, 44(sp)
+// 0x010b6438: 0x10b6438: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4254,7 +4254,7 @@ L_10b5dec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b5df4: 0x10b5df4: lw    s4, 36(sp)
+// 0x010b643c: 0x10b643c: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4263,7 +4263,7 @@ L_10b5dec:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b5df8: 0x10b5df8: lw    s3, 32(sp)
+// 0x010b6440: 0x10b6440: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4272,7 +4272,7 @@ L_10b5dec:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b5dfc: 0x10b5dfc: lw    s2, 28(sp)
+// 0x010b6444: 0x10b6444: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4281,7 +4281,7 @@ L_10b5dec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b5e00: 0x10b5e00: lw    s1, 24(sp)
+// 0x010b6448: 0x10b6448: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4290,7 +4290,7 @@ L_10b5dec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5e04: 0x10b5e04: lw    s0, 20(sp)
+// 0x010b644c: 0x10b644c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4299,7 +4299,7 @@ L_10b5dec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5e08: 0x10b5e08: jr    ra addiu sp, sp, 48
+// 0x010b6450: 0x10b6450: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4311,7 +4311,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_interpolate_request_tiles_10b5e10(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_interpolate_request_tiles_10b6458(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 lo,int32 ra)
@@ -4367,12 +4367,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5e10: 0x10b5e10: addiu sp, sp, -64
+// 0x010b6458: 0x10b6458: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010b5e14: 0x10b5e14: sw    s5, 56(sp)
+// 0x010b645c: 0x10b645c: sw    s5, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4381,7 +4381,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b5e18: 0x10b5e18: sw    s4, 52(sp)
+// 0x010b6460: 0x10b6460: sw    s4, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4390,7 +4390,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b5e1c: 0x10b5e1c: sw    s3, 48(sp)
+// 0x010b6464: 0x10b6464: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4399,7 +4399,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5e20: 0x10b5e20: sw    s2, 44(sp)
+// 0x010b6468: 0x10b6468: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4408,7 +4408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b5e24: 0x10b5e24: sw    s0, 36(sp)
+// 0x010b646c: 0x10b646c: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4417,8 +4417,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5e28: 0x10b5e28: sw    ra, 60(sp)
-// 0x010b5e2c: 0x10b5e2c: sw    s1, 40(sp)
+// 0x010b6470: 0x10b6470: sw    ra, 60(sp)
+// 0x010b6474: 0x10b6474: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4427,16 +4427,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5e30: 0x10b5e30: addu  s3, a2, zero
+// 0x010b6478: 0x10b6478: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010b5e34: 0x10b5e34: addu  s2, a3, zero
+// 0x010b647c: 0x10b647c: addu  s2, a3, zero
 	ldloc 4
 	stloc 9
-// 0x010b5e38: 0x10b5e38: addu  s5, a0, zero
+// 0x010b6480: 0x10b6480: addu  s5, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010b5e3c: 0x10b5e3c: lw    s0, 80(sp)
+// 0x010b6484: 0x10b6484: lw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4445,7 +4445,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5e40: 0x10b5e40: jal   0x100c944 addu  s4, a1, zero
+// 0x010b6488: 0x10b6488: jal   0x100c954 addu  s4, a1, zero
 	ldloc.2
 	stloc 12
 	ldloc.0
@@ -4453,18 +4453,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_is_adjacent_100c944(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_is_adjacent_100c954(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5e48: 0x10b5e48: bne   v0, zero, 0x10b5f1c addiu v0, zero, 2
+// 0x010b6490: 0x10b6490: bne   v0, zero, 0x10b6564 addiu v0, zero, 2
 	ldloc 6
 	ldc.i4.2
 	stloc 6
-	brtrue L_10b5f1c
+	brtrue L_10b6564
 // --- basic block ---
-// 0x010b5e50: 0x10b5e50: lw    v1, 4(s2)
+// 0x010b6498: 0x10b6498: lw    v1, 4(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4473,7 +4473,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b5e54: 0x10b5e54: lw    a0, 4(s3)
+// 0x010b649c: 0x10b649c: lw    a0, 4(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4482,41 +4482,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5e58: 0x10b5e58: sll   zero, zero, 0
-// 0x010b5e5c: 0x10b5e5c: addu  v1, v1, a0
+// 0x010b64a0: 0x10b64a0: sll   zero, zero, 0
+// 0x010b64a4: 0x10b64a4: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x010b5e60: 0x10b5e60: div   v1, v0
+// 0x010b64a8: 0x10b64a8: div   v1, v0
 	ldloc 7
 	ldloc 6
 	div
 	stloc 14
-// 0x010b5e64: 0x10b5e64: lw    a2, 0(s2)
+// 0x010b64ac: 0x10b64ac: lw    a2, 0(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010b5e68: 0x10b5e68: lw    a1, 0(s3)
+// 0x010b64b0: 0x10b64b0: lw    a1, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b5e6c: 0x10b5e6c: sll   zero, zero, 0
-// 0x010b5e70: 0x10b5e70: addu  a2, a2, a1
+// 0x010b64b4: 0x10b64b4: sll   zero, zero, 0
+// 0x010b64b8: 0x10b64b8: addu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.3
-// 0x010b5e74: 0x10b5e74: mflo  lo
+// 0x010b64bc: 0x10b64bc: mflo  lo
 	ldloc 14
 	stloc 7
-// 0x010b5e78: 0x10b5e78: sw    v1, 28(sp)
+// 0x010b64c0: 0x10b64c0: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4525,16 +4525,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b5e7c: 0x10b5e7c: sll   zero, zero, 0
-// 0x010b5e80: 0x10b5e80: div   a2, v0
+// 0x010b64c4: 0x10b64c4: sll   zero, zero, 0
+// 0x010b64c8: 0x10b64c8: div   a2, v0
 	ldloc.3
 	ldloc 6
 	div
 	stloc 14
-// 0x010b5e84: 0x10b5e84: mflo  lo
+// 0x010b64cc: 0x10b64cc: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x010b5e88: 0x10b5e88: bne   a2, a1, 0x10b5e98 sw    a2, 24(sp)
+// 0x010b64d0: 0x10b64d0: bne   a2, a1, 0x10b64e0 sw    a2, 24(sp)
 	ldloc.3
 	ldloc.2
 	ldloc 5
@@ -4545,30 +4545,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-	bne.un L_10b5e98
+	bne.un L_10b64e0
 // --- basic block ---
-// 0x010b5e90: 0x10b5e90: beq   v1, a0, 0x10b5f1c sll   zero, zero, 0
+// 0x010b64d8: 0x10b64d8: beq   v1, a0, 0x10b6564 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	beq  L_10b5f1c
+	beq  L_10b6564
 // --- basic block ---
-L_10b5e98:
-// 0x010b5e98: 0x10b5e98: lw    v0, 0(s2)
+L_10b64e0:
+// 0x010b64e0: 0x10b64e0: lw    v0, 0(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b5e9c: 0x10b5e9c: sll   zero, zero, 0
-// 0x010b5ea0: 0x10b5ea0: bne   a2, v0, 0x10b5eb8 addu  a0, zero, zero
+// 0x010b64e4: 0x10b64e4: sll   zero, zero, 0
+// 0x010b64e8: 0x10b64e8: bne   a2, v0, 0x10b6500 addu  a0, zero, zero
 	ldloc.3
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10b5eb8
+	bne.un L_10b6500
 // --- basic block ---
-// 0x010b5ea8: 0x10b5ea8: lw    v0, 4(s2)
+// 0x010b64f0: 0x10b64f0: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4577,14 +4577,14 @@ L_10b5e98:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b5eac: 0x10b5eac: sll   zero, zero, 0
-// 0x010b5eb0: 0x10b5eb0: beq   v1, v0, 0x10b5f1c sll   zero, zero, 0
+// 0x010b64f4: 0x10b64f4: sll   zero, zero, 0
+// 0x010b64f8: 0x10b64f8: beq   v1, v0, 0x10b6564 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	beq  L_10b5f1c
+	beq  L_10b6564
 // --- basic block ---
-L_10b5eb8:
-// 0x010b5eb8: 0x10b5eb8: jal   0x100c63c addiu a1, sp, 24
+L_10b6500:
+// 0x010b6500: 0x10b6500: jal   0x100c64c addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4594,32 +4594,32 @@ L_10b5eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5ec0: 0x10b5ec0: beq   v0, s5, 0x10b5efc addu  s1, v0, zero
+// 0x010b6508: 0x10b6508: beq   v0, s5, 0x10b6544 addu  s1, v0, zero
 	ldloc 6
 	ldloc 13
 	ldloc 6
 	stloc 10
-	beq  L_10b5efc
+	beq  L_10b6544
 // --- basic block ---
-// 0x010b5ec8: 0x10b5ec8: beq   v0, s4, 0x10b5f48 addu  a0, v0, zero
+// 0x010b6510: 0x10b6510: beq   v0, s4, 0x10b6590 addu  a0, v0, zero
 	ldloc 6
 	ldloc 12
 	ldloc 6
 	stloc.1
-	beq  L_10b5f48
+	beq  L_10b6590
 // --- basic block ---
-// 0x010b5ed0: 0x10b5ed0: addu  a1, zero, zero
+// 0x010b6518: 0x10b6518: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b5ed4: 0x10b5ed4: addiu a2, zero, 1
+// 0x010b651c: 0x10b651c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b5ed8: 0x10b5ed8: jal   0x100d384 addu  a3, zero, zero
+// 0x010b6520: 0x10b6520: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4627,12 +4627,12 @@ L_10b5eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5ee0: 0x10b5ee0: jal   0x100b50c addu  a0, s1, zero
+// 0x010b6528: 0x10b6528: jal   0x100b51c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4640,47 +4640,47 @@ L_10b5eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5ee8: 0x10b5ee8: slt   v1, v0, s0
+// 0x010b6530: 0x10b6530: slt   v1, v0, s0
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 7
-// 0x010b5eec: 0x10b5eec: bne   v1, zero, 0x10b5f44 addu  a0, s5, zero
+// 0x010b6534: 0x10b6534: bne   v1, zero, 0x10b658c addu  a0, s5, zero
 	ldloc 7
 	ldloc 13
 	stloc.1
-	brtrue L_10b5f44
+	brtrue L_10b658c
 // --- basic block ---
-// 0x010b5ef4: 0x10b5ef4: j	 0x10b5f50 addu  a2, s3, zero
+// 0x010b653c: 0x10b653c: j	 0x10b6598 addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-	br L_10b5f50
+	br L_10b6598
 // --- basic block ---
-L_10b5efc:
-// 0x010b5efc: 0x10b5efc: beq   s1, s4, 0x10b5f1c addu  a0, s1, zero
+L_10b6544:
+// 0x010b6544: 0x10b6544: beq   s1, s4, 0x10b6564 addu  a0, s1, zero
 	ldloc 10
 	ldloc 12
 	ldloc 10
 	stloc.1
-	beq  L_10b5f1c
+	beq  L_10b6564
 // --- basic block ---
-// 0x010b5f04: 0x10b5f04: addu  a1, s4, zero
+// 0x010b654c: 0x10b654c: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010b5f08: 0x10b5f08: addu  a3, s2, zero
+// 0x010b6550: 0x10b6550: addu  a3, s2, zero
 	ldloc 9
 	stloc 4
-// 0x010b5f0c: 0x10b5f0c: addiu a2, sp, 24
+// 0x010b6554: 0x10b6554: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010b5f10: 0x10b5f10: jal   0x10b5e10 sw    s0, 16(sp)
+// 0x010b6558: 0x10b6558: jal   0x10b6458 sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4694,20 +4694,20 @@ L_10b5efc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_interpolate_request_tiles_10b5e10(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_interpolate_request_tiles_10b6458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5f18: 0x10b5f18: addu  s0, v0, zero
+// 0x010b6560: 0x10b6560: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-L_10b5f1c:
-// 0x010b5f1c: 0x10b5f1c: lw    ra, 60(sp)
-// 0x010b5f20: 0x10b5f20: addu  v0, s0, zero
+L_10b6564:
+// 0x010b6564: 0x10b6564: lw    ra, 60(sp)
+// 0x010b6568: 0x10b6568: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x010b5f24: 0x10b5f24: lw    s5, 56(sp)
+// 0x010b656c: 0x10b656c: lw    s5, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4716,7 +4716,7 @@ L_10b5f1c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b5f28: 0x10b5f28: lw    s4, 52(sp)
+// 0x010b6570: 0x10b6570: lw    s4, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4725,7 +4725,7 @@ L_10b5f1c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b5f2c: 0x10b5f2c: lw    s3, 48(sp)
+// 0x010b6574: 0x10b6574: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4734,7 +4734,7 @@ L_10b5f1c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b5f30: 0x10b5f30: lw    s2, 44(sp)
+// 0x010b6578: 0x10b6578: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4743,7 +4743,7 @@ L_10b5f1c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b5f34: 0x10b5f34: lw    s1, 40(sp)
+// 0x010b657c: 0x10b657c: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4752,7 +4752,7 @@ L_10b5f1c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b5f38: 0x10b5f38: lw    s0, 36(sp)
+// 0x010b6580: 0x10b6580: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4761,34 +4761,34 @@ L_10b5f1c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b5f3c: 0x10b5f3c: jr    ra addiu sp, sp, 64
+// 0x010b6584: 0x10b6584: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10b5f44:
-// 0x010b5f44: 0x10b5f44: addu  s0, v0, zero
+L_10b658c:
+// 0x010b658c: 0x10b658c: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-L_10b5f48:
-// 0x010b5f48: 0x10b5f48: addu  a0, s5, zero
+L_10b6590:
+// 0x010b6590: 0x10b6590: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010b5f4c: 0x10b5f4c: addu  a2, s3, zero
+// 0x010b6594: 0x10b6594: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-L_10b5f50:
-// 0x010b5f50: 0x10b5f50: addu  a1, s1, zero
+L_10b6598:
+// 0x010b6598: 0x10b6598: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010b5f54: 0x10b5f54: addiu a3, sp, 24
+// 0x010b659c: 0x10b659c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x010b5f58: 0x10b5f58: jal   0x10b5e10 sw    s0, 16(sp)
+// 0x010b65a0: 0x10b65a0: jal   0x10b6458 sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4802,22 +4802,22 @@ L_10b5f50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_interpolate_request_tiles_10b5e10(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_interpolate_request_tiles_10b6458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b5f60: 0x10b5f60: j	 0x10b5efc addu  s0, v0, zero
+// 0x010b65a8: 0x10b65a8: j	 0x10b6544 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-	br L_10b5efc
+	br L_10b6544
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_get_update_time_10b5f68(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_update_time_10b65b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 s2,int32 s4,int32 s3,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -4879,33 +4879,33 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b5f68: 0x10b5f68: lui   v0, 0xe0000
+// 0x010b65b0: 0x10b65b0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b5f6c: 0x10b5f6c: addu  a1, a0, zero
+// 0x010b65b4: 0x10b65b4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b5f70: 0x10b5f70: lw    a0, -17904(v0)
+// 0x010b65b8: 0x10b65b8: lw    a0, -17440(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5f74: 0x10b5f74: addiu sp, sp, -96
+// 0x010b65bc: 0x10b65bc: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x010b5f78: 0x10b5f78: addu  a2, zero, zero
+// 0x010b65c0: 0x10b65c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b5f7c: 0x10b5f7c: addu  a3, zero, zero
+// 0x010b65c4: 0x10b65c4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b5f80: 0x10b5f80: sw    s5, 76(sp)
+// 0x010b65c8: 0x10b65c8: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4914,8 +4914,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b5f84: 0x10b5f84: sw    ra, 92(sp)
-// 0x010b5f88: 0x10b5f88: sw    s8, 88(sp)
+// 0x010b65cc: 0x10b65cc: sw    ra, 92(sp)
+// 0x010b65d0: 0x10b65d0: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4924,7 +4924,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b5f8c: 0x10b5f8c: sw    s7, 84(sp)
+// 0x010b65d4: 0x10b65d4: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4933,7 +4933,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b5f90: 0x10b5f90: sw    s6, 80(sp)
+// 0x010b65d8: 0x10b65d8: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4942,7 +4942,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b5f94: 0x10b5f94: sw    s4, 72(sp)
+// 0x010b65dc: 0x10b65dc: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4951,7 +4951,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b5f98: 0x10b5f98: sw    s3, 68(sp)
+// 0x010b65e0: 0x10b65e0: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4960,7 +4960,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b5f9c: 0x10b5f9c: sw    s2, 64(sp)
+// 0x010b65e4: 0x10b65e4: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4969,7 +4969,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b5fa0: 0x10b5fa0: sw    s1, 60(sp)
+// 0x010b65e8: 0x10b65e8: sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4978,7 +4978,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b5fa4: 0x10b5fa4: jal   0x10b6f58 sw    s0, 56(sp)
+// 0x010b65ec: 0x10b65ec: jal   0x10b75a0 sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4992,29 +4992,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b5fac: 0x10b5fac: bne   v0, zero, 0x10b5fc0 addu  s5, v0, zero
+// 0x010b65f4: 0x10b65f4: bne   v0, zero, 0x10b6608 addu  s5, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 13
-	brtrue L_10b5fc0
+	brtrue L_10b6608
 // --- basic block ---
-// 0x010b5fb4: 0x10b5fb4: lui   s1, 0x7fff0000
+// 0x010b65fc: 0x10b65fc: lui   s1, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 8
-// 0x010b5fb8: 0x10b5fb8: j	 0x10b60f4 ori   s1, s1, 65535
+// 0x010b6600: 0x10b6600: j	 0x10b673c ori   s1, s1, 65535
 	ldloc 8
 	ldc.i4 65535
 	or
 	stloc 8
-	br L_10b60f4
+	br L_10b673c
 // --- basic block ---
-L_10b5fc0:
-// 0x010b5fc0: 0x10b5fc0: lw    a0, 12(v0)
+L_10b6608:
+// 0x010b6608: 0x10b6608: lw    a0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5023,22 +5023,22 @@ L_10b5fc0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b5fc4: 0x10b5fc4: addiu a1, sp, 32
+// 0x010b660c: 0x10b660c: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010b5fc8: 0x10b5fc8: addiu a2, sp, 24
+// 0x010b6610: 0x10b6610: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010b5fcc: 0x10b5fcc: addiu a3, sp, 28
+// 0x010b6614: 0x10b6614: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010b5fd0: 0x10b5fd0: jal   0x10b48f8 sw    zero, 16(sp)
+// 0x010b6618: 0x10b6618: jal   0x10b4f40 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5052,12 +5052,12 @@ L_10b5fc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b5fd8: 0x10b5fd8: lw    s0, 24(sp)
+// 0x010b6620: 0x10b6620: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5066,15 +5066,15 @@ L_10b5fc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b5fdc: 0x10b5fdc: addiu v0, zero, -1
+// 0x010b6624: 0x10b6624: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b5fe0: 0x10b5fe0: bne   s0, v0, 0x10b5fec sll   zero, zero, 0
+// 0x010b6628: 0x10b6628: bne   s0, v0, 0x10b6634 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	bne.un L_10b5fec
+	bne.un L_10b6634
 // --- basic block ---
-// 0x010b5fe8: 0x10b5fe8: sw    s0, 28(sp)
+// 0x010b6630: 0x10b6630: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5083,48 +5083,48 @@ L_10b5fc0:
 	add
 	ldloc 7
 	stelem.i4
-L_10b5fec:
-// 0x010b5fec: 0x10b5fec: lui   s1, 0x7fff0000
+L_10b6634:
+// 0x010b6634: 0x10b6634: lui   s1, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 8
-// 0x010b5ff0: 0x10b5ff0: addiu s0, s0, -1
+// 0x010b6638: 0x10b6638: addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x010b5ff4: 0x10b5ff4: ori   s1, s1, 65535
+// 0x010b663c: 0x10b663c: ori   s1, s1, 65535
 	ldloc 8
 	ldc.i4 65535
 	or
 	stloc 8
-// 0x010b5ff8: 0x10b5ff8: addiu s4, zero, -1
+// 0x010b6640: 0x10b6640: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x010b5ffc: 0x10b5ffc: addiu s8, zero, -2
+// 0x010b6644: 0x10b6644: addiu s8, zero, -2
 	ldc.i4.s -2
 	stloc 16
-// 0x010b6000: 0x10b6000: addiu s2, sp, 36
+// 0x010b6648: 0x10b6648: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-// 0x010b6004: 0x10b6004: addiu s7, zero, -1
+// 0x010b664c: 0x10b664c: addiu s7, zero, -1
 	ldc.i4.m1
 	stloc 15
-// 0x010b6008: 0x10b6008: j	 0x10b60e0 addiu s6, sp, 44
+// 0x010b6650: 0x10b6650: j	 0x10b6728 addiu s6, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 14
-	br L_10b60e0
+	br L_10b6728
 // --- basic block ---
-L_10b6010:
-// 0x010b6010: 0x10b6010: bne   s0, s8, 0x10b6024 sll   zero, zero, 0
+L_10b6658:
+// 0x010b6658: 0x10b6658: bne   s0, s8, 0x10b666c sll   zero, zero, 0
 	ldloc 7
 	ldloc 16
-	bne.un L_10b6024
+	bne.un L_10b666c
 // --- basic block ---
-// 0x010b6018: 0x10b6018: lw    a0, 4(s5)
+// 0x010b6660: 0x10b6660: lw    a0, 4(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -5133,11 +5133,11 @@ L_10b6010:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b601c: 0x10b601c: j	 0x10b6060 sll   zero, zero, 0
-	br L_10b6060
+// 0x010b6664: 0x10b6664: j	 0x10b66a8 sll   zero, zero, 0
+	br L_10b66a8
 // --- basic block ---
-L_10b6024:
-// 0x010b6024: 0x10b6024: lw    v0, 24(sp)
+L_10b666c:
+// 0x010b666c: 0x10b666c: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5146,17 +5146,17 @@ L_10b6024:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b6028: 0x10b6028: sll   zero, zero, 0
-// 0x010b602c: 0x10b602c: slt   v0, s0, v0
+// 0x010b6670: 0x10b6670: sll   zero, zero, 0
+// 0x010b6674: 0x10b6674: slt   v0, s0, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x010b6030: 0x10b6030: beq   v0, zero, 0x10b6044 sll   zero, zero, 0
+// 0x010b6678: 0x10b6678: beq   v0, zero, 0x10b668c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b6044
+	brfalse L_10b668c
 // --- basic block ---
-// 0x010b6038: 0x10b6038: lw    a0, 32(sp)
+// 0x010b6680: 0x10b6680: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5165,18 +5165,18 @@ L_10b6024:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b603c: 0x10b603c: j	 0x10b6060 sll   zero, zero, 0
-	br L_10b6060
+// 0x010b6684: 0x10b6684: j	 0x10b66a8 sll   zero, zero, 0
+	br L_10b66a8
 // --- basic block ---
-L_10b6044:
-// 0x010b6044: 0x10b6044: bltz  s0, 0x10b605c addu  a0, s0, zero
+L_10b668c:
+// 0x010b668c: 0x10b668c: bltz  s0, 0x10b66a4 addu  a0, s0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
 	ldc.i4.s 0
-	blt L_10b605c
+	blt L_10b66a4
 // --- basic block ---
-// 0x010b604c: 0x10b604c: jal   0x10b45c4 addu  a1, s2, zero
+// 0x010b6694: 0x10b6694: jal   0x10b4c0c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5184,18 +5184,18 @@ L_10b6044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_position_10b45c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_position_10b4c0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b6054: 0x10b6054: j	 0x10b606c addu  a0, zero, zero
+// 0x010b669c: 0x10b669c: j	 0x10b66b4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10b606c
+	br L_10b66b4
 // --- basic block ---
-L_10b605c:
-// 0x010b605c: 0x10b605c: lw    a0, 8(s5)
+L_10b66a4:
+// 0x010b66a4: 0x10b66a4: lw    a0, 8(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -5204,8 +5204,8 @@ L_10b605c:
 	add
 	ldelem.i4
 	stloc.1
-L_10b6060:
-// 0x010b6060: 0x10b6060: jal   0x10b46a0 addu  a1, s2, zero
+L_10b66a8:
+// 0x010b66a8: 0x10b66a8: jal   0x10b4ce8 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5213,16 +5213,16 @@ L_10b6060:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b6068: 0x10b6068: addu  a0, zero, zero
+// 0x010b66b0: 0x10b66b0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_10b606c:
-// 0x010b606c: 0x10b606c: jal   0x100c63c addu  a1, s2, zero
+L_10b66b4:
+// 0x010b66b4: 0x10b66b4: jal   0x100c64c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5230,28 +5230,28 @@ L_10b606c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b6074: 0x10b6074: beq   v0, s4, 0x10b60c8 addu  s3, v0, zero
+// 0x010b66bc: 0x10b66bc: beq   v0, s4, 0x10b6710 addu  s3, v0, zero
 	ldloc 6
 	ldloc 11
 	ldloc 6
 	stloc 12
-	beq  L_10b60c8
+	beq  L_10b6710
 // --- basic block ---
-// 0x010b607c: 0x10b607c: addu  a0, v0, zero
+// 0x010b66c4: 0x10b66c4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010b6080: 0x10b6080: addu  a1, zero, zero
+// 0x010b66c8: 0x10b66c8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b6084: 0x10b6084: addiu a2, zero, 1
+// 0x010b66cc: 0x10b66cc: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b6088: 0x10b6088: jal   0x100d384 addu  a3, zero, zero
+// 0x010b66d0: 0x10b66d0: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5259,12 +5259,12 @@ L_10b606c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b6090: 0x10b6090: jal   0x100b50c addu  a0, s3, zero
+// 0x010b66d8: 0x10b66d8: jal   0x100b51c addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -5272,41 +5272,41 @@ L_10b606c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b6098: 0x10b6098: slt   v1, v0, s1
+// 0x010b66e0: 0x10b66e0: slt   v1, v0, s1
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 9
-// 0x010b609c: 0x10b609c: beq   v1, zero, 0x10b60a8 sll   zero, zero, 0
+// 0x010b66e4: 0x10b66e4: beq   v1, zero, 0x10b66f0 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10b60a8
+	brfalse L_10b66f0
 // --- basic block ---
-// 0x010b60a4: 0x10b60a4: addu  s1, v0, zero
+// 0x010b66ec: 0x10b66ec: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-L_10b60a8:
-// 0x010b60a8: 0x10b60a8: beq   s4, s7, 0x10b60c8 addu  a0, s4, zero
+L_10b66f0:
+// 0x010b66f0: 0x10b66f0: beq   s4, s7, 0x10b6710 addu  a0, s4, zero
 	ldloc 11
 	ldloc 15
 	ldloc 11
 	stloc.1
-	beq  L_10b60c8
+	beq  L_10b6710
 // --- basic block ---
-// 0x010b60b0: 0x10b60b0: addu  a1, s3, zero
+// 0x010b66f8: 0x10b66f8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010b60b4: 0x10b60b4: addu  a2, s6, zero
+// 0x010b66fc: 0x10b66fc: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x010b60b8: 0x10b60b8: addu  a3, s2, zero
+// 0x010b6700: 0x10b6700: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x010b60bc: 0x10b60bc: jal   0x10b5e10 sw    s1, 16(sp)
+// 0x010b6704: 0x10b6704: jal   0x10b6458 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5320,16 +5320,16 @@ L_10b60a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_interpolate_request_tiles_10b5e10(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_interpolate_request_tiles_10b6458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b60c4: 0x10b60c4: addu  s1, v0, zero
+// 0x010b670c: 0x10b670c: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-L_10b60c8:
-// 0x010b60c8: 0x10b60c8: lw    v0, 36(sp)
+L_10b6710:
+// 0x010b6710: 0x10b6710: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5338,12 +5338,12 @@ L_10b60c8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b60cc: 0x10b60cc: addiu s0, s0, 1
+// 0x010b6714: 0x10b6714: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010b60d0: 0x10b60d0: sw    v0, 44(sp)
+// 0x010b6718: 0x10b6718: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5352,7 +5352,7 @@ L_10b60c8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b60d4: 0x10b60d4: lw    v0, 40(sp)
+// 0x010b671c: 0x10b671c: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5361,10 +5361,10 @@ L_10b60c8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b60d8: 0x10b60d8: addu  s4, s3, zero
+// 0x010b6720: 0x10b6720: addu  s4, s3, zero
 	ldloc 12
 	stloc 11
-// 0x010b60dc: 0x10b60dc: sw    v0, 48(sp)
+// 0x010b6724: 0x10b6724: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5373,8 +5373,8 @@ L_10b60c8:
 	add
 	ldloc 6
 	stelem.i4
-L_10b60e0:
-// 0x010b60e0: 0x10b60e0: lw    v0, 28(sp)
+L_10b6728:
+// 0x010b6728: 0x10b6728: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5383,22 +5383,22 @@ L_10b60e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b60e4: 0x10b60e4: sll   zero, zero, 0
-// 0x010b60e8: 0x10b60e8: slt   v0, v0, s0
+// 0x010b672c: 0x10b672c: sll   zero, zero, 0
+// 0x010b6730: 0x10b6730: slt   v0, v0, s0
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x010b60ec: 0x10b60ec: beq   v0, zero, 0x10b6010 sll   zero, zero, 0
+// 0x010b6734: 0x10b6734: beq   v0, zero, 0x10b6658 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b6010
+	brfalse L_10b6658
 // --- basic block ---
-L_10b60f4:
-// 0x010b60f4: 0x10b60f4: lw    ra, 92(sp)
-// 0x010b60f8: 0x10b60f8: addu  v0, s1, zero
+L_10b673c:
+// 0x010b673c: 0x10b673c: lw    ra, 92(sp)
+// 0x010b6740: 0x10b6740: addu  v0, s1, zero
 	ldloc 8
 	stloc 6
-// 0x010b60fc: 0x10b60fc: lw    s8, 88(sp)
+// 0x010b6744: 0x10b6744: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5407,7 +5407,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b6100: 0x10b6100: lw    s7, 84(sp)
+// 0x010b6748: 0x10b6748: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5416,7 +5416,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b6104: 0x10b6104: lw    s6, 80(sp)
+// 0x010b674c: 0x10b674c: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5425,7 +5425,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b6108: 0x10b6108: lw    s5, 76(sp)
+// 0x010b6750: 0x10b6750: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5434,7 +5434,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b610c: 0x10b610c: lw    s4, 72(sp)
+// 0x010b6754: 0x10b6754: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5443,7 +5443,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b6110: 0x10b6110: lw    s3, 68(sp)
+// 0x010b6758: 0x10b6758: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5452,7 +5452,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b6114: 0x10b6114: lw    s2, 64(sp)
+// 0x010b675c: 0x10b675c: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5461,7 +5461,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b6118: 0x10b6118: lw    s1, 60(sp)
+// 0x010b6760: 0x10b6760: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5470,7 +5470,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b611c: 0x10b611c: lw    s0, 56(sp)
+// 0x010b6764: 0x10b6764: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5479,7 +5479,7 @@ L_10b60f4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6120: 0x10b6120: jr    ra addiu sp, sp, 96
+// 0x010b6768: 0x10b6768: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -5491,7 +5491,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_get_cross_time_10b6128(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_get_cross_time_10b6770(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5526,31 +5526,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6128: 0x10b6128: lui   v0, 0xe0000
+// 0x010b6770: 0x10b6770: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b612c: 0x10b612c: addu  a1, a0, zero
+// 0x010b6774: 0x10b6774: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b6130: 0x10b6130: lw    a0, -17904(v0)
+// 0x010b6778: 0x10b6778: lw    a0, -17440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6134: 0x10b6134: addiu sp, sp, -32
+// 0x010b677c: 0x10b677c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b6138: 0x10b6138: addu  a2, zero, zero
+// 0x010b6780: 0x10b6780: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b613c: 0x10b613c: sw    ra, 28(sp)
-// 0x010b6140: 0x10b6140: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b6784: 0x10b6784: sw    ra, 28(sp)
+// 0x010b6788: 0x10b6788: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5558,12 +5558,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6148: 0x10b6148: lw    a0, 12(v0)
+// 0x010b6790: 0x10b6790: lw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5572,12 +5572,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b614c: 0x10b614c: addiu a1, sp, 16
+// 0x010b6794: 0x10b6794: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010b6150: 0x10b6150: jal   0x10b49a8 addiu a2, sp, 20
+// 0x010b6798: 0x10b6798: jal   0x10b4ff0 addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
@@ -5587,12 +5587,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_time_10b49a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_time_10b4ff0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6158: 0x10b6158: lw    a0, 16(sp)
+// 0x010b67a0: 0x10b67a0: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5601,7 +5601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b615c: 0x10b615c: lw    v1, 20(sp)
+// 0x010b67a4: 0x10b67a4: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5610,23 +5610,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6160: 0x10b6160: sll   zero, zero, 0
-// 0x010b6164: 0x10b6164: bne   a0, v1, 0x10b6170 subu  v0, v1, a0
+// 0x010b67a8: 0x10b67a8: sll   zero, zero, 0
+// 0x010b67ac: 0x10b67ac: bne   a0, v1, 0x10b67b8 subu  v0, v1, a0
 	ldloc.1
 	ldloc 7
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 5
-	bne.un L_10b6170
+	bne.un L_10b67b8
 // --- basic block ---
-// 0x010b616c: 0x10b616c: addiu v0, zero, -1
+// 0x010b67b4: 0x10b67b4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10b6170:
-// 0x010b6170: 0x10b6170: lw    ra, 28(sp)
-// 0x010b6174: 0x10b6174: sll   zero, zero, 0
-// 0x010b6178: 0x10b6178: jr    ra addiu sp, sp, 32
+L_10b67b8:
+// 0x010b67b8: 0x10b67b8: lw    ra, 28(sp)
+// 0x010b67bc: 0x10b67bc: sll   zero, zero, 0
+// 0x010b67c0: 0x10b67c0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5638,7 +5638,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_length_10b6180(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_length_10b67c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 ra)
@@ -5688,34 +5688,34 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6180: 0x10b6180: lui   v0, 0xe0000
+// 0x010b67c8: 0x10b67c8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b6184: 0x10b6184: addu  a1, a0, zero
+// 0x010b67cc: 0x10b67cc: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010b6188: 0x10b6188: lw    a0, -17904(v0)
+// 0x010b67d0: 0x10b67d0: lw    a0, -17440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b618c: 0x10b618c: addiu sp, sp, -80
+// 0x010b67d4: 0x10b67d4: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010b6190: 0x10b6190: addu  a2, zero, zero
+// 0x010b67d8: 0x10b67d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b6194: 0x10b6194: addu  a3, zero, zero
+// 0x010b67dc: 0x10b67dc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b6198: 0x10b6198: sw    ra, 76(sp)
-// 0x010b619c: 0x10b619c: sw    s4, 72(sp)
+// 0x010b67e0: 0x10b67e0: sw    ra, 76(sp)
+// 0x010b67e4: 0x10b67e4: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5724,7 +5724,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b61a0: 0x10b61a0: sw    s1, 60(sp)
+// 0x010b67e8: 0x10b67e8: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5733,7 +5733,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b61a4: 0x10b61a4: sw    s0, 56(sp)
+// 0x010b67ec: 0x10b67ec: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5742,7 +5742,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b61a8: 0x10b61a8: sw    s3, 68(sp)
+// 0x010b67f0: 0x10b67f0: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5751,7 +5751,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b61ac: 0x10b61ac: jal   0x10b6f58 sw    s2, 64(sp)
+// 0x010b67f4: 0x10b67f4: jal   0x10b75a0 sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5765,12 +5765,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b61b4: 0x10b61b4: lw    a0, 12(v0)
+// 0x010b67fc: 0x10b67fc: lw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5779,25 +5779,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b61b8: 0x10b61b8: addu  s0, v0, zero
+// 0x010b6800: 0x10b6800: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010b61bc: 0x10b61bc: addiu a1, sp, 24
+// 0x010b6804: 0x10b6804: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010b61c0: 0x10b61c0: addiu a2, sp, 28
+// 0x010b6808: 0x10b6808: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x010b61c4: 0x10b61c4: addiu a3, sp, 32
+// 0x010b680c: 0x10b680c: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x010b61c8: 0x10b61c8: sw    zero, 16(sp)
+// 0x010b6810: 0x10b6810: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5806,7 +5806,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b61cc: 0x10b61cc: jal   0x10b48f8 addiu s4, sp, 36
+// 0x010b6814: 0x10b6814: jal   0x10b4f40 addiu s4, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -5816,12 +5816,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b61d4: 0x10b61d4: lw    a0, 4(s0)
+// 0x010b681c: 0x10b681c: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5830,7 +5830,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b61d8: 0x10b61d8: jal   0x10b46a0 addu  a1, s4, zero
+// 0x010b6820: 0x10b6820: jal   0x10b4ce8 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -5838,12 +5838,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b61e0: 0x10b61e0: lw    v0, 28(sp)
+// 0x010b6828: 0x10b6828: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5852,20 +5852,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b61e4: 0x10b61e4: sll   zero, zero, 0
-// 0x010b61e8: 0x10b61e8: bltz  v0, 0x10b6250 addu  s1, zero, zero
+// 0x010b682c: 0x10b682c: sll   zero, zero, 0
+// 0x010b6830: 0x10b6830: bltz  v0, 0x10b6898 addu  s1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	blt L_10b6250
+	blt L_10b6898
 // --- basic block ---
-// 0x010b61f0: 0x10b61f0: addiu s3, sp, 44
+// 0x010b6838: 0x10b6838: addiu s3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 11
-// 0x010b61f4: 0x10b61f4: lw    a0, 24(sp)
+// 0x010b683c: 0x10b683c: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5874,7 +5874,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b61f8: 0x10b61f8: jal   0x10b46a0 addu  a1, s3, zero
+// 0x010b6840: 0x10b6840: jal   0x10b4ce8 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -5882,12 +5882,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6200: 0x10b6200: lw    s2, 28(sp)
+// 0x010b6848: 0x10b6848: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5896,11 +5896,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6204: 0x10b6204: j	 0x10b623c sll   zero, zero, 0
-	br L_10b623c
+// 0x010b684c: 0x10b684c: j	 0x10b6884 sll   zero, zero, 0
+	br L_10b6884
 // --- basic block ---
-L_10b620c:
-// 0x010b620c: 0x10b620c: jal   0x10b45c4 addiu s2, s2, 1
+L_10b6854:
+// 0x010b6854: 0x10b6854: jal   0x10b4c0c addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -5910,15 +5910,15 @@ L_10b620c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_position_10b45c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_shape_position_10b4c0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6214: 0x10b6214: addu  a0, s4, zero
+// 0x010b685c: 0x10b685c: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010b6218: 0x10b6218: jal   0x1008eb0 addu  a1, s3, zero
+// 0x010b6860: 0x10b6860: jal   0x1008ec0 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -5926,17 +5926,17 @@ L_10b620c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6220: 0x10b6220: addu  s1, s1, v0
+// 0x010b6868: 0x10b6868: addu  s1, s1, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x010b6224: 0x10b6224: lw    v0, 44(sp)
+// 0x010b686c: 0x10b686c: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5945,8 +5945,8 @@ L_10b620c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6228: 0x10b6228: sll   zero, zero, 0
-// 0x010b622c: 0x10b622c: sw    v0, 36(sp)
+// 0x010b6870: 0x10b6870: sll   zero, zero, 0
+// 0x010b6874: 0x10b6874: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5955,7 +5955,7 @@ L_10b620c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b6230: 0x10b6230: lw    v0, 48(sp)
+// 0x010b6878: 0x10b6878: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5964,8 +5964,8 @@ L_10b620c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6234: 0x10b6234: sll   zero, zero, 0
-// 0x010b6238: 0x10b6238: sw    v0, 40(sp)
+// 0x010b687c: 0x10b687c: sll   zero, zero, 0
+// 0x010b6880: 0x10b6880: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5974,8 +5974,8 @@ L_10b620c:
 	add
 	ldloc 5
 	stelem.i4
-L_10b623c:
-// 0x010b623c: 0x10b623c: lw    v0, 32(sp)
+L_10b6884:
+// 0x010b6884: 0x10b6884: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5984,22 +5984,22 @@ L_10b623c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6240: 0x10b6240: addu  a0, s2, zero
+// 0x010b6888: 0x10b6888: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010b6244: 0x10b6244: slt   v0, v0, s2
+// 0x010b688c: 0x10b688c: slt   v0, v0, s2
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 5
-// 0x010b6248: 0x10b6248: beq   v0, zero, 0x10b620c addu  a1, s3, zero
+// 0x010b6890: 0x10b6890: beq   v0, zero, 0x10b6854 addu  a1, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brfalse L_10b620c
+	brfalse L_10b6854
 // --- basic block ---
-L_10b6250:
-// 0x010b6250: 0x10b6250: lw    a0, 8(s0)
+L_10b6898:
+// 0x010b6898: 0x10b6898: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6008,12 +6008,12 @@ L_10b6250:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6254: 0x10b6254: addiu s0, sp, 44
+// 0x010b689c: 0x10b689c: addiu s0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 8
-// 0x010b6258: 0x10b6258: jal   0x10b46a0 addu  a1, s0, zero
+// 0x010b68a0: 0x10b68a0: jal   0x10b4ce8 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -6021,15 +6021,15 @@ L_10b6250:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6260: 0x10b6260: addu  a1, s0, zero
+// 0x010b68a8: 0x10b68a8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010b6264: 0x10b6264: jal   0x1008eb0 addiu a0, sp, 36
+// 0x010b68ac: 0x10b68ac: jal   0x1008ec0 addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -6039,18 +6039,18 @@ L_10b6250:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b626c: 0x10b626c: lw    ra, 76(sp)
-// 0x010b6270: 0x10b6270: addu  v0, v0, s1
+// 0x010b68b4: 0x10b68b4: lw    ra, 76(sp)
+// 0x010b68b8: 0x10b68b8: addu  v0, v0, s1
 	ldloc 5
 	ldloc 10
 	add
 	stloc 5
-// 0x010b6274: 0x10b6274: lw    s4, 72(sp)
+// 0x010b68bc: 0x10b68bc: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6059,7 +6059,7 @@ L_10b6250:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b6278: 0x10b6278: lw    s3, 68(sp)
+// 0x010b68c0: 0x10b68c0: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6068,7 +6068,7 @@ L_10b6250:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b627c: 0x10b627c: lw    s2, 64(sp)
+// 0x010b68c4: 0x10b68c4: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6077,7 +6077,7 @@ L_10b6250:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6280: 0x10b6280: lw    s1, 60(sp)
+// 0x010b68c8: 0x10b68c8: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6086,7 +6086,7 @@ L_10b6250:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b6284: 0x10b6284: lw    s0, 56(sp)
+// 0x010b68cc: 0x10b68cc: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6095,7 +6095,7 @@ L_10b6250:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6288: 0x10b6288: jr    ra addiu sp, sp, 80
+// 0x010b68d0: 0x10b68d0: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -6107,7 +6107,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_line_add_10b6290(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_add_10b68d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -6160,13 +6160,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6290: 0x10b6290: addiu sp, sp, -104
+// 0x010b68d8: 0x10b68d8: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x010b6294: 0x10b6294: sw    ra, 100(sp)
-// 0x010b6298: 0x10b6298: sw    s5, 96(sp)
+// 0x010b68dc: 0x10b68dc: sw    ra, 100(sp)
+// 0x010b68e0: 0x10b68e0: sw    s5, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6175,7 +6175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b629c: 0x10b629c: sw    s4, 92(sp)
+// 0x010b68e4: 0x10b68e4: sw    s4, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6184,13 +6184,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b62a0: 0x10b62a0: addu  s5, a0, zero
+// 0x010b68e8: 0x10b68e8: addu  s5, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010b62a4: 0x10b62a4: addu  s4, a1, zero
+// 0x010b68ec: 0x10b68ec: addu  s4, a1, zero
 	ldloc.2
 	stloc 12
-// 0x010b62a8: 0x10b62a8: sw    s3, 88(sp)
+// 0x010b68f0: 0x10b68f0: sw    s3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6199,7 +6199,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b62ac: 0x10b62ac: sw    s2, 84(sp)
+// 0x010b68f4: 0x10b68f4: sw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6208,10 +6208,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b62b0: 0x10b62b0: addu  s3, a2, zero
+// 0x010b68f8: 0x10b68f8: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010b62b4: 0x10b62b4: sw    s1, 80(sp)
+// 0x010b68fc: 0x10b68fc: sw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6220,7 +6220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b62b8: 0x10b62b8: sw    s0, 76(sp)
+// 0x010b6900: 0x10b6900: sw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6229,7 +6229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b62bc: 0x10b62bc: lw    s1, 128(sp)
+// 0x010b6904: 0x10b6904: lw    s1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6238,15 +6238,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b62c0: 0x10b62c0: jal   0x1029e40 addu  s2, a3, zero
+// 0x010b6908: 0x10b6908: jal   0x1029e50 addu  s2, a3, zero
 	ldloc 4
 	stloc 10
-	call int32 Cibyl31::roadmap_navigate_get_time_1029e40()
+	call int32 Cibyl31::roadmap_navigate_get_time_1029e50()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b62c8: 0x10b62c8: sw    v0, 40(sp)
+// 0x010b6910: 0x10b6910: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6255,7 +6255,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b62cc: 0x10b62cc: lw    v0, 124(sp)
+// 0x010b6914: 0x10b6914: lw    v0, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6264,10 +6264,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b62d0: 0x10b62d0: lui   v1, 0xe0000
+// 0x010b6918: 0x10b6918: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b62d4: 0x10b62d4: sw    v0, 68(sp)
+// 0x010b691c: 0x10b691c: sw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6276,16 +6276,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b62d8: 0x10b62d8: lw    a0, -17904(v1)
+// 0x010b6920: 0x10b6920: lw    a0, -17440(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b62dc: 0x10b62dc: lw    v0, 120(sp)
+// 0x010b6924: 0x10b6924: lw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6294,15 +6294,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b62e0: 0x10b62e0: addiu a1, sp, 40
+// 0x010b6928: 0x10b6928: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b62e4: 0x10b62e4: addiu a2, zero, 1
+// 0x010b692c: 0x10b692c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b62e8: 0x10b62e8: sw    v0, 64(sp)
+// 0x010b6930: 0x10b6930: sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6311,7 +6311,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b62ec: 0x10b62ec: sw    s5, 44(sp)
+// 0x010b6934: 0x10b6934: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6320,7 +6320,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b62f0: 0x10b62f0: sw    s4, 48(sp)
+// 0x010b6938: 0x10b6938: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6329,7 +6329,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b62f4: 0x10b62f4: sw    s3, 52(sp)
+// 0x010b693c: 0x10b693c: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6338,7 +6338,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b62f8: 0x10b62f8: sw    s2, 56(sp)
+// 0x010b6940: 0x10b6940: sw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6347,7 +6347,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b62fc: 0x10b62fc: jal   0x10b72a4 sw    s1, 60(sp)
+// 0x010b6944: 0x10b6944: jal   0x10b78ec sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6361,23 +6361,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6304: 0x10b6304: addu  s0, v0, zero
+// 0x010b694c: 0x10b694c: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010b6308: 0x10b6308: addiu v0, zero, -1
+// 0x010b6950: 0x10b6950: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b630c: 0x10b630c: beq   s0, v0, 0x10b6374 sll   zero, zero, 0
+// 0x010b6954: 0x10b6954: beq   s0, v0, 0x10b69bc sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	beq  L_10b6374
+	beq  L_10b69bc
 // --- basic block ---
-// 0x010b6314: 0x10b6314: jal   0x10b6180 addu  a0, s0, zero
+// 0x010b695c: 0x10b695c: jal   0x10b67c8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6385,29 +6385,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_length_10b6180(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_length_10b67c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b631c: 0x10b631c: bne   v0, zero, 0x10b632c sll   zero, zero, 0
+// 0x010b6964: 0x10b6964: bne   v0, zero, 0x10b6974 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10b632c
+	brtrue L_10b6974
 // --- basic block ---
-// 0x010b6324: 0x10b6324: j	 0x10b6374 addiu s0, zero, -1
+// 0x010b696c: 0x10b696c: j	 0x10b69bc addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 8
-	br L_10b6374
+	br L_10b69bc
 // --- basic block ---
-L_10b632c:
-// 0x010b632c: 0x10b632c: jal   0x10b7ad0 addu  a0, zero, zero
+L_10b6974:
+// 0x010b6974: 0x10b6974: jal   0x10b8118 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl137::editor_bar_set_temp_length_10b7ad0(int32)
+	call int32 Cibyl137::editor_bar_set_temp_length_10b8118(int32)
 	stloc 6
 // --- basic block ---
-// 0x010b6334: 0x10b6334: jal   0x10b6180 addu  a0, s0, zero
+// 0x010b697c: 0x10b697c: jal   0x10b67c8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6415,43 +6415,43 @@ L_10b632c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_length_10b6180(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_length_10b67c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b633c: 0x10b633c: jal   0x10b7ab8 addu  a0, v0, zero
+// 0x010b6984: 0x10b6984: jal   0x10b8100 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl137::editor_bar_set_length_10b7ab8(int32)
+	call int32 Cibyl137::editor_bar_set_length_10b8100(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6344: 0x10b6344: lui   a1, 0x20000
+// 0x010b698c: 0x10b698c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b6348: 0x10b6348: lui   a3, 0x20000
+// 0x010b6990: 0x10b6990: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b634c: 0x10b634c: addiu a1, a1, 19540
+// 0x010b6994: 0x10b6994: addiu a1, a1, 20000
 	ldloc.2
-	ldc.i4 19540
+	ldc.i4 20000
 	add
 	stloc.2
-// 0x010b6350: 0x10b6350: addiu a3, a3, 19576
+// 0x010b6998: 0x10b6998: addiu a3, a3, 20036
 	ldloc 4
-	ldc.i4 19576
+	ldc.i4 20036
 	add
 	stloc 4
-// 0x010b6354: 0x10b6354: addiu a0, zero, 2
+// 0x010b699c: 0x10b699c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010b6358: 0x10b6358: addiu a2, zero, 126
+// 0x010b69a0: 0x10b69a0: addiu a2, zero, 126
 	ldc.i4.s 126
 	stloc.3
-// 0x010b635c: 0x10b635c: sw    s5, 16(sp)
+// 0x010b69a4: 0x10b69a4: sw    s5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6460,7 +6460,7 @@ L_10b632c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b6360: 0x10b6360: sw    s4, 20(sp)
+// 0x010b69a8: 0x10b69a8: sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6469,7 +6469,7 @@ L_10b632c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b6364: 0x10b6364: sw    s3, 24(sp)
+// 0x010b69ac: 0x10b69ac: sw    s3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6478,7 +6478,7 @@ L_10b632c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b6368: 0x10b6368: sw    s2, 28(sp)
+// 0x010b69b0: 0x10b69b0: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6487,7 +6487,7 @@ L_10b632c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b636c: 0x10b636c: jal   0x100449c sw    s1, 32(sp)
+// 0x010b69b4: 0x10b69b4: jal   0x100449c sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6506,12 +6506,12 @@ L_10b632c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b6374:
-// 0x010b6374: 0x10b6374: lw    ra, 100(sp)
-// 0x010b6378: 0x10b6378: addu  v0, s0, zero
+L_10b69bc:
+// 0x010b69bc: 0x10b69bc: lw    ra, 100(sp)
+// 0x010b69c0: 0x10b69c0: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x010b637c: 0x10b637c: lw    s5, 96(sp)
+// 0x010b69c4: 0x10b69c4: lw    s5, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6520,7 +6520,7 @@ L_10b6374:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b6380: 0x10b6380: lw    s4, 92(sp)
+// 0x010b69c8: 0x10b69c8: lw    s4, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6529,7 +6529,7 @@ L_10b6374:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b6384: 0x10b6384: lw    s3, 88(sp)
+// 0x010b69cc: 0x10b69cc: lw    s3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6538,7 +6538,7 @@ L_10b6374:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b6388: 0x10b6388: lw    s2, 84(sp)
+// 0x010b69d0: 0x10b69d0: lw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6547,7 +6547,7 @@ L_10b6374:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b638c: 0x10b638c: lw    s1, 80(sp)
+// 0x010b69d4: 0x10b69d4: lw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6556,7 +6556,7 @@ L_10b6374:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6390: 0x10b6390: lw    s0, 76(sp)
+// 0x010b69d8: 0x10b69d8: lw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6565,7 +6565,7 @@ L_10b6374:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6394: 0x10b6394: jr    ra addiu sp, sp, 104
+// 0x010b69dc: 0x10b69dc: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -6577,7 +6577,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_line_copy_10b639c(int32,int32,int32,int32,int32)
+.method public static int32 editor_line_copy_10b69e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -6621,12 +6621,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b639c: 0x10b639c: addiu sp, sp, -112
+// 0x010b69e4: 0x10b69e4: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x010b63a0: 0x10b63a0: sw    s1, 100(sp)
+// 0x010b69e8: 0x10b69e8: sw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6635,12 +6635,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b63a4: 0x10b63a4: addiu s1, sp, 72
+// 0x010b69ec: 0x10b69ec: addiu s1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 9
-// 0x010b63a8: 0x10b63a8: sw    s2, 104(sp)
+// 0x010b69f0: 0x10b69f0: sw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6649,7 +6649,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b63ac: 0x10b63ac: sw    s0, 96(sp)
+// 0x010b69f4: 0x10b69f4: sw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6658,14 +6658,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b63b0: 0x10b63b0: addu  s2, a1, zero
+// 0x010b69f8: 0x10b69f8: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010b63b4: 0x10b63b4: addu  s0, a0, zero
+// 0x010b69fc: 0x10b69fc: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b63b8: 0x10b63b8: sw    ra, 108(sp)
-// 0x010b63bc: 0x10b63bc: jal   0x1014dd8 addu  a1, s1, zero
+// 0x010b6a00: 0x10b6a00: sw    ra, 108(sp)
+// 0x010b6a04: 0x10b6a04: jal   0x1014de8 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6673,24 +6673,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b63c4: 0x10b63c4: addiu v0, zero, -1
+// 0x010b6a0c: 0x10b6a0c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b63c8: 0x10b63c8: addu  a0, s0, zero
+// 0x010b6a10: 0x10b6a10: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b63cc: 0x10b63cc: addu  a1, s1, zero
+// 0x010b6a14: 0x10b6a14: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010b63d0: 0x10b63d0: addiu a2, zero, 2
+// 0x010b6a18: 0x10b6a18: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010b63d4: 0x10b63d4: sw    v0, 84(sp)
+// 0x010b6a1c: 0x10b6a1c: sw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6699,7 +6699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b63d8: 0x10b63d8: jal   0x10b5518 sw    v0, 80(sp)
+// 0x010b6a20: 0x10b6a20: jal   0x10b5b60 sw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6713,36 +6713,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::handle_segment_10b5518(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::handle_segment_10b5b60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b63e0: 0x10b63e0: lui   v0, 0x10b0000
+// 0x010b6a28: 0x10b6a28: lui   v0, 0x10b0000
 	ldc.i4 17498112
 	stloc 6
-// 0x010b63e4: 0x10b63e4: addiu v0, v0, 21784
+// 0x010b6a2c: 0x10b6a2c: addiu v0, v0, 23392
 	ldloc 6
-	ldc.i4 21784
+	ldc.i4 23392
 	add
 	stloc 6
-// 0x010b63e8: 0x10b63e8: addu  a0, s0, zero
+// 0x010b6a30: 0x10b6a30: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b63ec: 0x10b63ec: addiu a1, sp, 56
+// 0x010b6a34: 0x10b6a34: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x010b63f0: 0x10b63f0: addiu a2, sp, 64
+// 0x010b6a38: 0x10b6a38: addiu a2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.3
-// 0x010b63f4: 0x10b63f4: addiu a3, zero, 2
+// 0x010b6a3c: 0x10b6a3c: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x010b63f8: 0x10b63f8: sw    v0, 16(sp)
+// 0x010b6a40: 0x10b6a40: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6751,7 +6751,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b63fc: 0x10b63fc: jal   0x1012790 sw    s1, 20(sp)
+// 0x010b6a44: 0x10b6a44: jal   0x10127a0 sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6765,15 +6765,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6404: 0x10b6404: lui   v0, 0x0
+// 0x010b6a4c: 0x10b6a4c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b6408: 0x10b6408: lw    v0, 18812(v0)
+// 0x010b6a50: 0x10b6a50: lw    v0, 18812(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6782,22 +6782,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b640c: 0x10b640c: lw    v1, 0(s0)
+// 0x010b6a54: 0x10b6a54: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b6410: 0x10b6410: sll   zero, zero, 0
-// 0x010b6414: 0x10b6414: bne   v1, v0, 0x10b6434 lui   v0, 0x0
+// 0x010b6a58: 0x10b6a58: sll   zero, zero, 0
+// 0x010b6a5c: 0x10b6a5c: bne   v1, v0, 0x10b6a7c lui   v0, 0x0
 	ldloc 7
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	bne.un L_10b6434
+	bne.un L_10b6a7c
 // --- basic block ---
-// 0x010b641c: 0x10b641c: lw    a0, 4(s0)
+// 0x010b6a64: 0x10b6a64: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6806,12 +6806,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6420: 0x10b6420: addiu a1, sp, 40
+// 0x010b6a68: 0x10b6a68: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010b6424: 0x10b6424: jal   0x10b5924 addiu a2, sp, 44
+// 0x010b6a6c: 0x10b6a6c: jal   0x10b5f6c addiu a2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -6821,16 +6821,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_points_10b5924(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_points_10b5f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b642c: 0x10b642c: j	 0x10b6488 sll   zero, zero, 0
-	br L_10b6488
+// 0x010b6a74: 0x10b6a74: j	 0x10b6ad0 sll   zero, zero, 0
+	br L_10b6ad0
 // --- basic block ---
-L_10b6434:
-// 0x010b6434: 0x10b6434: lw    v0, 576(v0)
+L_10b6a7c:
+// 0x010b6a7c: 0x10b6a7c: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6839,7 +6839,7 @@ L_10b6434:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b6438: 0x10b6438: lw    a0, 12(s0)
+// 0x010b6a80: 0x10b6a80: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6848,30 +6848,30 @@ L_10b6434:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b643c: 0x10b643c: sll   zero, zero, 0
-// 0x010b6440: 0x10b6440: beq   a0, v0, 0x10b6458 sll   zero, zero, 0
+// 0x010b6a84: 0x10b6a84: sll   zero, zero, 0
+// 0x010b6a88: 0x10b6a88: beq   a0, v0, 0x10b6aa0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10b6458
+	beq  L_10b6aa0
 // --- basic block ---
-// 0x010b6448: 0x10b6448: bltz  a0, 0x10b6458 sll   zero, zero, 0
+// 0x010b6a90: 0x10b6a90: bltz  a0, 0x10b6aa0 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b6458
+	blt L_10b6aa0
 // --- basic block ---
-// 0x010b6450: 0x10b6450: jal   0x100b164 sll   zero, zero, 0
+// 0x010b6a98: 0x10b6a98: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b6458:
-// 0x010b6458: 0x10b6458: lw    a0, 4(s0)
+L_10b6aa0:
+// 0x010b6aa0: 0x10b6aa0: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6880,12 +6880,12 @@ L_10b6458:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b645c: 0x10b645c: addiu a2, sp, 52
+// 0x010b6aa4: 0x10b6aa4: addiu a2, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.3
-// 0x010b6460: 0x10b6460: jal   0x1003fc8 addiu a1, sp, 48
+// 0x010b6aa8: 0x10b6aa8: jal   0x1003fc8 addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6900,7 +6900,7 @@ L_10b6458:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6468: 0x10b6468: lw    a1, 48(sp)
+// 0x010b6ab0: 0x10b6ab0: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6909,7 +6909,7 @@ L_10b6458:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b646c: 0x10b646c: jal   0x10b4760 addiu a0, sp, 56
+// 0x010b6ab4: 0x10b6ab4: jal   0x10b4da8 addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6919,12 +6919,12 @@ L_10b6458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6474: 0x10b6474: lw    a1, 52(sp)
+// 0x010b6abc: 0x10b6abc: lw    a1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6933,12 +6933,12 @@ L_10b6458:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b6478: 0x10b6478: addiu a0, sp, 64
+// 0x010b6ac0: 0x10b6ac0: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x010b647c: 0x10b647c: jal   0x10b4760 sw    v0, 40(sp)
+// 0x010b6ac4: 0x10b6ac4: jal   0x10b4da8 sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6952,12 +6952,12 @@ L_10b6458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_add_10b4760(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_add_10b4da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6484: 0x10b6484: sw    v0, 44(sp)
+// 0x010b6acc: 0x10b6acc: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6966,8 +6966,8 @@ L_10b6458:
 	add
 	ldloc 6
 	stelem.i4
-L_10b6488:
-// 0x010b6488: 0x10b6488: lw    v1, 84(sp)
+L_10b6ad0:
+// 0x010b6ad0: 0x10b6ad0: lw    v1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6976,7 +6976,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b648c: 0x10b648c: lw    a2, 40(sp)
+// 0x010b6ad4: 0x10b6ad4: lw    a2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6985,7 +6985,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b6490: 0x10b6490: lw    a3, 80(sp)
+// 0x010b6ad8: 0x10b6ad8: lw    a3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6994,10 +6994,10 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b6494: 0x10b6494: addiu v0, zero, -1
+// 0x010b6adc: 0x10b6adc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b6498: 0x10b6498: sw    v1, 16(sp)
+// 0x010b6ae0: 0x10b6ae0: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7006,16 +7006,16 @@ L_10b6488:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b649c: 0x10b649c: addiu a1, zero, -1
+// 0x010b6ae4: 0x10b6ae4: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010b64a0: 0x10b64a0: addiu v1, zero, 1
+// 0x010b6ae8: 0x10b6ae8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010b64a4: 0x10b64a4: addiu a0, zero, -1
+// 0x010b6aec: 0x10b6aec: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010b64a8: 0x10b64a8: sw    v1, 36(sp)
+// 0x010b6af0: 0x10b6af0: sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7024,7 +7024,7 @@ L_10b6488:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b64ac: 0x10b64ac: sw    v0, 24(sp)
+// 0x010b6af4: 0x10b6af4: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7033,7 +7033,7 @@ L_10b6488:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b64b0: 0x10b64b0: sw    v0, 20(sp)
+// 0x010b6af8: 0x10b6af8: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7042,7 +7042,7 @@ L_10b6488:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b64b4: 0x10b64b4: sw    zero, 28(sp)
+// 0x010b6afc: 0x10b6afc: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7051,7 +7051,7 @@ L_10b6488:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b64b8: 0x10b64b8: jal   0x10b4a10 sw    zero, 32(sp)
+// 0x010b6b00: 0x10b6b00: jal   0x10b5058 sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7065,18 +7065,18 @@ L_10b6488:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_add_10b4a10(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_add_10b5058(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b64c0: 0x10b64c0: addu  a0, s0, zero
+// 0x010b6b08: 0x10b6b08: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b64c4: 0x10b64c4: addiu a1, zero, 3
+// 0x010b6b0c: 0x10b6b0c: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010b64c8: 0x10b64c8: jal   0x1014c00 sw    v0, 88(sp)
+// 0x010b6b10: 0x10b6b10: jal   0x1014c10 sw    v0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7090,12 +7090,12 @@ L_10b6488:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_direction_1014c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_direction_1014c10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b64d0: 0x10b64d0: lw    a3, 8(s0)
+// 0x010b6b18: 0x10b6b18: lw    a3, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7104,7 +7104,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b64d4: 0x10b64d4: lw    a0, 40(sp)
+// 0x010b6b1c: 0x10b6b1c: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7113,7 +7113,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b64d8: 0x10b64d8: lw    a1, 44(sp)
+// 0x010b6b20: 0x10b6b20: lw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7122,7 +7122,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b64dc: 0x10b64dc: lw    a2, 88(sp)
+// 0x010b6b24: 0x10b6b24: lw    a2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7131,7 +7131,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b64e0: 0x10b64e0: sw    v0, 16(sp)
+// 0x010b6b28: 0x10b6b28: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7140,10 +7140,10 @@ L_10b6488:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b64e4: 0x10b64e4: addiu v0, zero, 4
+// 0x010b6b2c: 0x10b6b2c: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x010b64e8: 0x10b64e8: sw    s2, 20(sp)
+// 0x010b6b30: 0x10b6b30: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7152,7 +7152,7 @@ L_10b6488:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b64ec: 0x10b64ec: jal   0x10b6290 sw    v0, 24(sp)
+// 0x010b6b34: 0x10b6b34: jal   0x10b68d8 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7166,13 +7166,13 @@ L_10b6488:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_add_10b6290(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_add_10b68d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b64f4: 0x10b64f4: lw    ra, 108(sp)
-// 0x010b64f8: 0x10b64f8: lw    s2, 104(sp)
+// 0x010b6b3c: 0x10b6b3c: lw    ra, 108(sp)
+// 0x010b6b40: 0x10b6b40: lw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7181,7 +7181,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b64fc: 0x10b64fc: lw    s1, 100(sp)
+// 0x010b6b44: 0x10b6b44: lw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7190,7 +7190,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6500: 0x10b6500: lw    s0, 96(sp)
+// 0x010b6b48: 0x10b6b48: lw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7199,7 +7199,7 @@ L_10b6488:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6504: 0x10b6504: jr    ra addiu sp, sp, 112
+// 0x010b6b4c: 0x10b6b4c: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -7211,7 +7211,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_override_activate_10b650c(int32)
+.method public static int32 editor_override_activate_10b6b54(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -7231,16 +7231,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b650c:
-// 0x010b650c: 0x10b650c: lui   v0, 0xe0000
+L_10b6b54:
+// 0x010b6b54: 0x10b6b54: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b6510: 0x10b6510: jr    ra sw    a0, -17900(v0)
+// 0x010b6b58: 0x10b6b58: jr    ra sw    a0, -17436(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldloc.0
 	stelem.i4
@@ -7249,7 +7249,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_override_get_count_10b6518(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_get_count_10b6b60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -7284,32 +7284,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6518: 0x10b6518: lui   v0, 0xe0000
+// 0x010b6b60: 0x10b6b60: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b651c: 0x10b651c: lw    a0, -17900(v0)
+// 0x010b6b64: 0x10b6b64: lw    a0, -17436(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6520: 0x10b6520: addiu sp, sp, -24
+// 0x010b6b68: 0x10b6b68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b6524: 0x10b6524: sw    ra, 20(sp)
-// 0x010b6528: 0x10b6528: jal   0x10b6a20 sll   zero, zero, 0
+// 0x010b6b6c: 0x10b6b6c: sw    ra, 20(sp)
+// 0x010b6b70: 0x10b6b70: jal   0x10b7068 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b6530: 0x10b6530: lw    ra, 20(sp)
-// 0x010b6534: 0x10b6534: sll   zero, zero, 0
-// 0x010b6538: 0x10b6538: jr    ra addiu sp, sp, 24
+// 0x010b6b78: 0x10b6b78: lw    ra, 20(sp)
+// 0x010b6b7c: 0x10b6b7c: sll   zero, zero, 0
+// 0x010b6b80: 0x10b6b80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7321,7 +7321,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_override_get_10b6540(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_get_10b6b88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -7368,27 +7368,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6540: 0x10b6540: lui   v1, 0xe0000
+// 0x010b6b88: 0x10b6b88: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b6544: 0x10b6544: addiu sp, sp, -40
+// 0x010b6b8c: 0x10b6b8c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b6548: 0x10b6548: addu  v0, a0, zero
+// 0x010b6b90: 0x10b6b90: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b654c: 0x10b654c: lw    a0, -17900(v1)
+// 0x010b6b94: 0x10b6b94: lw    a0, -17436(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6550: 0x10b6550: sw    s3, 32(sp)
+// 0x010b6b98: 0x10b6b98: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7397,7 +7397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b6554: 0x10b6554: sw    s2, 28(sp)
+// 0x010b6b9c: 0x10b6b9c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7406,7 +7406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b6558: 0x10b6558: sw    s1, 24(sp)
+// 0x010b6ba0: 0x10b6ba0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7415,22 +7415,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b655c: 0x10b655c: addu  s3, a1, zero
+// 0x010b6ba4: 0x10b6ba4: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010b6560: 0x10b6560: addu  s2, a2, zero
+// 0x010b6ba8: 0x10b6ba8: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010b6564: 0x10b6564: addu  s1, a3, zero
+// 0x010b6bac: 0x10b6bac: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x010b6568: 0x10b6568: addu  a1, v0, zero
+// 0x010b6bb0: 0x10b6bb0: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b656c: 0x10b656c: addu  a2, zero, zero
+// 0x010b6bb4: 0x10b6bb4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b6570: 0x10b6570: sw    s0, 20(sp)
+// 0x010b6bb8: 0x10b6bb8: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7439,8 +7439,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6574: 0x10b6574: sw    ra, 36(sp)
-// 0x010b6578: 0x10b6578: lw    s0, 56(sp)
+// 0x010b6bbc: 0x10b6bbc: sw    ra, 36(sp)
+// 0x010b6bc0: 0x10b6bc0: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7449,7 +7449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b657c: 0x10b657c: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b6bc4: 0x10b6bc4: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -7457,25 +7457,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6584: 0x10b6584: addu  v1, v0, zero
+// 0x010b6bcc: 0x10b6bcc: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x010b6588: 0x10b6588: beq   v1, zero, 0x10b65f8 addu  v0, zero, zero
+// 0x010b6bd0: 0x10b6bd0: beq   v1, zero, 0x10b6c40 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10b65f8
+	brfalse L_10b6c40
 // --- basic block ---
-// 0x010b6590: 0x10b6590: beq   s3, zero, 0x10b65a4 sll   zero, zero, 0
+// 0x010b6bd8: 0x10b6bd8: beq   s3, zero, 0x10b6bec sll   zero, zero, 0
 	ldloc 11
-	brfalse L_10b65a4
+	brfalse L_10b6bec
 // --- basic block ---
-// 0x010b6598: 0x10b6598: lw    v0, 8(v1)
+// 0x010b6be0: 0x10b6be0: lw    v0, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7484,40 +7484,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b659c: 0x10b659c: sll   zero, zero, 0
-// 0x010b65a0: 0x10b65a0: sw    v0, 0(s3)
+// 0x010b6be4: 0x10b6be4: sll   zero, zero, 0
+// 0x010b6be8: 0x10b6be8: sw    v0, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b65a4:
-// 0x010b65a4: 0x10b65a4: beq   s2, zero, 0x10b65b8 sll   zero, zero, 0
+L_10b6bec:
+// 0x010b6bec: 0x10b6bec: beq   s2, zero, 0x10b6c00 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10b65b8
+	brfalse L_10b6c00
 // --- basic block ---
-// 0x010b65ac: 0x10b65ac: lw    v0, 0(v1)
+// 0x010b6bf4: 0x10b6bf4: lw    v0, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b65b0: 0x10b65b0: sll   zero, zero, 0
-// 0x010b65b4: 0x10b65b4: sw    v0, 0(s2)
+// 0x010b6bf8: 0x10b6bf8: sll   zero, zero, 0
+// 0x010b6bfc: 0x10b6bfc: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b65b8:
-// 0x010b65b8: 0x10b65b8: beq   s1, zero, 0x10b65cc sll   zero, zero, 0
+L_10b6c00:
+// 0x010b6c00: 0x10b6c00: beq   s1, zero, 0x10b6c14 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10b65cc
+	brfalse L_10b6c14
 // --- basic block ---
-// 0x010b65c0: 0x10b65c0: lw    v0, 16(v1)
+// 0x010b6c08: 0x10b6c08: lw    v0, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7526,20 +7526,20 @@ L_10b65b8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b65c4: 0x10b65c4: sll   zero, zero, 0
-// 0x010b65c8: 0x10b65c8: sw    v0, 0(s1)
+// 0x010b6c0c: 0x10b6c0c: sll   zero, zero, 0
+// 0x010b6c10: 0x10b6c10: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b65cc:
-// 0x010b65cc: 0x10b65cc: beq   s0, zero, 0x10b65e0 sll   zero, zero, 0
+L_10b6c14:
+// 0x010b6c14: 0x10b6c14: beq   s0, zero, 0x10b6c28 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10b65e0
+	brfalse L_10b6c28
 // --- basic block ---
-// 0x010b65d4: 0x10b65d4: lw    v0, 12(v1)
+// 0x010b6c1c: 0x10b6c1c: lw    v0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7548,23 +7548,23 @@ L_10b65cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b65d8: 0x10b65d8: sll   zero, zero, 0
-// 0x010b65dc: 0x10b65dc: sw    v0, 0(s0)
+// 0x010b6c20: 0x10b6c20: sll   zero, zero, 0
+// 0x010b6c24: 0x10b6c24: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b65e0:
-// 0x010b65e0: 0x10b65e0: lw    a0, 0(v1)
+L_10b6c28:
+// 0x010b6c28: 0x10b6c28: lw    a0, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b65e4: 0x10b65e4: lw    s0, 4(v1)
+// 0x010b6c2c: 0x10b6c2c: lw    s0, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7573,30 +7573,30 @@ L_10b65e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b65e8: 0x10b65e8: jal   0x100b50c sll   zero, zero, 0
+// 0x010b6c30: 0x10b6c30: jal   0x100b51c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b65f0: 0x10b65f0: xor   v0, s0, v0
+// 0x010b6c38: 0x10b6c38: xor   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	xor
 	stloc 6
-// 0x010b65f4: 0x10b65f4: sltiu v0, v0, 1
+// 0x010b6c3c: 0x10b6c3c: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-L_10b65f8:
-// 0x010b65f8: 0x10b65f8: lw    ra, 36(sp)
-// 0x010b65fc: 0x10b65fc: lw    s3, 32(sp)
+L_10b6c40:
+// 0x010b6c40: 0x10b6c40: lw    ra, 36(sp)
+// 0x010b6c44: 0x10b6c44: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7605,7 +7605,7 @@ L_10b65f8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b6600: 0x10b6600: lw    s2, 28(sp)
+// 0x010b6c48: 0x10b6c48: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7614,7 +7614,7 @@ L_10b65f8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b6604: 0x10b6604: lw    s1, 24(sp)
+// 0x010b6c4c: 0x10b6c4c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7623,7 +7623,7 @@ L_10b65f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6608: 0x10b6608: lw    s0, 20(sp)
+// 0x010b6c50: 0x10b6c50: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7632,7 +7632,7 @@ L_10b65f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b660c: 0x10b660c: jr    ra addiu sp, sp, 40
+// 0x010b6c54: 0x10b6c54: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -7644,7 +7644,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_override_find_10b6614(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_find_10b6c5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s7,int32 s2,int32 v1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s8,int32 ra)
@@ -7706,12 +7706,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6614: 0x10b6614: addiu sp, sp, -56
+// 0x010b6c5c: 0x10b6c5c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010b6618: 0x10b6618: sw    s8, 48(sp)
+// 0x010b6c60: 0x10b6c60: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7720,7 +7720,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b661c: 0x10b661c: sw    s3, 28(sp)
+// 0x010b6c64: 0x10b6c64: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7729,17 +7729,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b6620: 0x10b6620: lui   s8, 0xe0000
+// 0x010b6c68: 0x10b6c68: lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 16
-// 0x010b6624: 0x10b6624: addu  s3, a0, zero
+// 0x010b6c6c: 0x10b6c6c: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x010b6628: 0x10b6628: addu  a0, a1, zero
+// 0x010b6c70: 0x10b6c70: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010b662c: 0x10b662c: sw    ra, 52(sp)
-// 0x010b6630: 0x10b6630: sw    s7, 44(sp)
+// 0x010b6c74: 0x10b6c74: sw    ra, 52(sp)
+// 0x010b6c78: 0x10b6c78: sw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7748,7 +7748,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b6634: 0x10b6634: sw    s6, 40(sp)
+// 0x010b6c7c: 0x10b6c7c: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7757,7 +7757,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b6638: 0x10b6638: sw    s5, 36(sp)
+// 0x010b6c80: 0x10b6c80: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7766,7 +7766,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b663c: 0x10b663c: sw    s4, 32(sp)
+// 0x010b6c84: 0x10b6c84: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7775,7 +7775,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b6640: 0x10b6640: sw    s2, 24(sp)
+// 0x010b6c88: 0x10b6c88: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7784,7 +7784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b6644: 0x10b6644: sw    s1, 20(sp)
+// 0x010b6c8c: 0x10b6c8c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7793,7 +7793,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b6648: 0x10b6648: sw    s0, 16(sp)
+// 0x010b6c90: 0x10b6c90: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7802,13 +7802,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b664c: 0x10b664c: addu  s4, a1, zero
+// 0x010b6c94: 0x10b6c94: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010b6650: 0x10b6650: addu  s5, a2, zero
+// 0x010b6c98: 0x10b6c98: addu  s5, a2, zero
 	ldloc.3
 	stloc 14
-// 0x010b6654: 0x10b6654: jal   0x100b50c addu  s2, a3, zero
+// 0x010b6c9c: 0x10b6c9c: jal   0x100b51c addu  s2, a3, zero
 	ldloc 4
 	stloc 10
 	ldloc.0
@@ -7816,76 +7816,76 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010b665c: 0x10b665c: lw    a0, -17900(s8)
+// 0x010b6ca4: 0x10b6ca4: lw    a0, -17436(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6660: 0x10b6660: jal   0x10b6a20 addu  s6, v0, zero
+// 0x010b6ca8: 0x10b6ca8: jal   0x10b7068 addu  s6, v0, zero
 	ldloc 6
 	stloc 15
 	ldloc.1
-	call int32 Cibyl136::editor_db_get_item_count_10b6a20(int32)
+	call int32 Cibyl136::editor_db_get_item_count_10b7068(int32)
 	stloc 6
 // --- basic block ---
-// 0x010b6668: 0x10b6668: addu  s7, v0, zero
+// 0x010b6cb0: 0x10b6cb0: addu  s7, v0, zero
 	ldloc 6
 	stloc 9
-// 0x010b666c: 0x10b666c: addu  s0, zero, zero
+// 0x010b6cb4: 0x10b6cb4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b6670: 0x10b6670: j	 0x10b66cc addu  s1, zero, zero
+// 0x010b6cb8: 0x10b6cb8: j	 0x10b6d14 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10b66cc
+	br L_10b6d14
 // --- basic block ---
-L_10b6678:
-// 0x010b6678: 0x10b6678: lw    a0, -17900(s8)
+L_10b6cc0:
+// 0x010b6cc0: 0x10b6cc0: lw    a0, -17436(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b667c: 0x10b667c: jal   0x10b6f58 sll   zero, zero, 0
+// 0x010b6cc4: 0x10b6cc4: jal   0x10b75a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010b6684: 0x10b6684: addu  s0, v0, zero
+// 0x010b6ccc: 0x10b6ccc: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010b6688: 0x10b6688: lw    v0, 0(v0)
+// 0x010b6cd0: 0x10b6cd0: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b668c: 0x10b668c: sll   zero, zero, 0
-// 0x010b6690: 0x10b6690: bne   v0, s4, 0x10b66c8 sll   zero, zero, 0
+// 0x010b6cd4: 0x10b6cd4: sll   zero, zero, 0
+// 0x010b6cd8: 0x10b6cd8: bne   v0, s4, 0x10b6d10 sll   zero, zero, 0
 	ldloc 6
 	ldloc 13
-	bne.un L_10b66c8
+	bne.un L_10b6d10
 // --- basic block ---
-// 0x010b6698: 0x10b6698: lw    v0, 8(s0)
+// 0x010b6ce0: 0x10b6ce0: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7894,13 +7894,13 @@ L_10b6678:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b669c: 0x10b669c: sll   zero, zero, 0
-// 0x010b66a0: 0x10b66a0: bne   v0, s3, 0x10b66c8 sll   zero, zero, 0
+// 0x010b6ce4: 0x10b6ce4: sll   zero, zero, 0
+// 0x010b6ce8: 0x10b6ce8: bne   v0, s3, 0x10b6d10 sll   zero, zero, 0
 	ldloc 6
 	ldloc 12
-	bne.un L_10b66c8
+	bne.un L_10b6d10
 // --- basic block ---
-// 0x010b66a8: 0x10b66a8: lw    v0, 4(s0)
+// 0x010b6cf0: 0x10b6cf0: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7909,81 +7909,81 @@ L_10b6678:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b66ac: 0x10b66ac: sll   zero, zero, 0
-// 0x010b66b0: 0x10b66b0: bne   v0, s6, 0x10b66cc addiu s1, s1, 1
+// 0x010b6cf4: 0x10b6cf4: sll   zero, zero, 0
+// 0x010b6cf8: 0x10b6cf8: bne   v0, s6, 0x10b6d14 addiu s1, s1, 1
 	ldloc 6
 	ldloc 15
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	bne.un L_10b66cc
+	bne.un L_10b6d14
 // --- basic block ---
-// 0x010b66b8: 0x10b66b8: beq   s2, zero, 0x10b6748 addiu s1, s1, -1
+// 0x010b6d00: 0x10b6d00: beq   s2, zero, 0x10b6d90 addiu s1, s1, -1
 	ldloc 10
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-	brfalse L_10b6748
+	brfalse L_10b6d90
 // --- basic block ---
-// 0x010b66c0: 0x10b66c0: j	 0x10b6748 sw    zero, 0(s2)
+// 0x010b6d08: 0x10b6d08: j	 0x10b6d90 sw    zero, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b6748
+	br L_10b6d90
 // --- basic block ---
-L_10b66c8:
-// 0x010b66c8: 0x10b66c8: addiu s1, s1, 1
+L_10b6d10:
+// 0x010b6d10: 0x10b6d10: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_10b66cc:
-// 0x010b66cc: 0x10b66cc: slt   v0, s1, s7
+L_10b6d14:
+// 0x010b6d14: 0x10b6d14: slt   v0, s1, s7
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 6
-// 0x010b66d0: 0x10b66d0: addu  a1, s1, zero
+// 0x010b6d18: 0x10b6d18: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x010b66d4: 0x10b66d4: addu  a2, zero, zero
+// 0x010b6d1c: 0x10b6d1c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b66d8: 0x10b66d8: bne   v0, zero, 0x10b6678 addu  a3, zero, zero
+// 0x010b6d20: 0x10b6d20: bne   v0, zero, 0x10b6cc0 addu  a3, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_10b6678
+	brtrue L_10b6cc0
 // --- basic block ---
-// 0x010b66e0: 0x10b66e0: bne   s1, s7, 0x10b6748 sll   zero, zero, 0
+// 0x010b6d28: 0x10b6d28: bne   s1, s7, 0x10b6d90 sll   zero, zero, 0
 	ldloc 7
 	ldloc 9
-	bne.un L_10b6748
+	bne.un L_10b6d90
 // --- basic block ---
-// 0x010b66e8: 0x10b66e8: beq   s2, zero, 0x10b6754 addiu s1, zero, -1
+// 0x010b6d30: 0x10b6d30: beq   s2, zero, 0x10b6d9c addiu s1, zero, -1
 	ldloc 10
 	ldc.i4.m1
 	stloc 7
-	brfalse L_10b6754
+	brfalse L_10b6d9c
 // --- basic block ---
-// 0x010b66f0: 0x10b66f0: lui   s7, 0xe0000
+// 0x010b6d38: 0x10b6d38: lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x010b66f4: 0x10b66f4: lw    a0, -17900(s7)
+// 0x010b6d3c: 0x10b6d3c: lw    a0, -17436(s7)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b66f8: 0x10b66f8: jal   0x10b72a4 addu  a1, zero, zero
+// 0x010b6d40: 0x10b6d40: jal   0x10b78ec addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7991,34 +7991,34 @@ L_10b66cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010b6700: 0x10b6700: bltz  v0, 0x10b6748 addu  s1, v0, zero
+// 0x010b6d48: 0x10b6d48: bltz  v0, 0x10b6d90 addu  s1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
 	ldc.i4.s 0
-	blt L_10b6748
+	blt L_10b6d90
 // --- basic block ---
-// 0x010b6708: 0x10b6708: lw    a0, -17900(s7)
+// 0x010b6d50: 0x10b6d50: lw    a0, -17436(s7)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b670c: 0x10b670c: addu  a1, v0, zero
+// 0x010b6d54: 0x10b6d54: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b6710: 0x10b6710: addu  a2, zero, zero
+// 0x010b6d58: 0x10b6d58: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b6714: 0x10b6714: jal   0x10b6f58 addu  a3, zero, zero
+// 0x010b6d5c: 0x10b6d5c: jal   0x10b75a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -8026,19 +8026,19 @@ L_10b66cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010b671c: 0x10b671c: sw    s4, 0(v0)
+// 0x010b6d64: 0x10b6d64: sw    s4, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-// 0x010b6720: 0x10b6720: sw    s6, 4(v0)
+// 0x010b6d68: 0x10b6d68: sw    s6, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8047,7 +8047,7 @@ L_10b66cc:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b6724: 0x10b6724: sw    s3, 8(v0)
+// 0x010b6d6c: 0x10b6d6c: sw    s3, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8056,7 +8056,7 @@ L_10b66cc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b6728: 0x10b6728: sw    zero, 12(v0)
+// 0x010b6d70: 0x10b6d70: sw    zero, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8065,23 +8065,23 @@ L_10b66cc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b672c: 0x10b672c: addu  a0, s3, zero
+// 0x010b6d74: 0x10b6d74: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010b6730: 0x10b6730: addiu a1, zero, 1
+// 0x010b6d78: 0x10b6d78: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010b6734: 0x10b6734: jal   0x1004a70 addu  s0, v0, zero
+// 0x010b6d7c: 0x10b6d7c: jal   0x1004a80 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010b673c: 0x10b673c: sw    v0, 16(s0)
+// 0x010b6d84: 0x10b6d84: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -8090,34 +8090,34 @@ L_10b66cc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b6740: 0x10b6740: addiu v0, zero, 1
+// 0x010b6d88: 0x10b6d88: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010b6744: 0x10b6744: sw    v0, 0(s2)
+// 0x010b6d8c: 0x10b6d8c: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10b6748:
-// 0x010b6748: 0x10b6748: beq   s5, zero, 0x10b6754 sll   zero, zero, 0
+L_10b6d90:
+// 0x010b6d90: 0x10b6d90: beq   s5, zero, 0x10b6d9c sll   zero, zero, 0
 	ldloc 14
-	brfalse L_10b6754
+	brfalse L_10b6d9c
 // --- basic block ---
-// 0x010b6750: 0x10b6750: sw    s0, 0(s5)
+// 0x010b6d98: 0x10b6d98: sw    s0, 0(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_10b6754:
-// 0x010b6754: 0x10b6754: lw    ra, 52(sp)
-// 0x010b6758: 0x10b6758: addu  v0, s1, zero
+L_10b6d9c:
+// 0x010b6d9c: 0x10b6d9c: lw    ra, 52(sp)
+// 0x010b6da0: 0x10b6da0: addu  v0, s1, zero
 	ldloc 7
 	stloc 6
-// 0x010b675c: 0x10b675c: lw    s8, 48(sp)
+// 0x010b6da4: 0x10b6da4: lw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8126,7 +8126,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b6760: 0x10b6760: lw    s7, 44(sp)
+// 0x010b6da8: 0x10b6da8: lw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8135,7 +8135,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6764: 0x10b6764: lw    s6, 40(sp)
+// 0x010b6dac: 0x10b6dac: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8144,7 +8144,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b6768: 0x10b6768: lw    s5, 36(sp)
+// 0x010b6db0: 0x10b6db0: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8153,7 +8153,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b676c: 0x10b676c: lw    s4, 32(sp)
+// 0x010b6db4: 0x10b6db4: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8162,7 +8162,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b6770: 0x10b6770: lw    s3, 28(sp)
+// 0x010b6db8: 0x10b6db8: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8171,7 +8171,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b6774: 0x10b6774: lw    s2, 24(sp)
+// 0x010b6dbc: 0x10b6dbc: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8180,7 +8180,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b6778: 0x10b6778: lw    s1, 20(sp)
+// 0x010b6dc0: 0x10b6dc0: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8189,7 +8189,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b677c: 0x10b677c: lw    s0, 16(sp)
+// 0x010b6dc4: 0x10b6dc4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8198,7 +8198,7 @@ L_10b6754:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6780: 0x10b6780: jr    ra addiu sp, sp, 56
+// 0x010b6dc8: 0x10b6dc8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl136.j b/converted/Cibyl136.j
index 5365a4d..e86d481 100644
--- a/converted/Cibyl136.j
+++ b/converted/Cibyl136.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl136::.ctor
 
-.method public static int32 editor_override_exists_10b6788(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_exists_10b6dd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -76,16 +76,16 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6788: 0x10b6788: addiu sp, sp, -24
+// 0x010b6dd0: 0x10b6dd0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b678c: 0x10b678c: addu  a2, zero, zero
+// 0x010b6dd4: 0x10b6dd4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b6790: 0x10b6790: sw    ra, 20(sp)
-// 0x010b6794: 0x10b6794: jal   0x10b6614 addu  a3, zero, zero
+// 0x010b6dd8: 0x10b6dd8: sw    ra, 20(sp)
+// 0x010b6ddc: 0x10b6ddc: jal   0x10b6c5c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -93,23 +93,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_find_10b6614(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_find_10b6c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b679c: 0x10b679c: lw    ra, 20(sp)
-// 0x010b67a0: 0x10b67a0: addiu v0, v0, 1
+// 0x010b6de4: 0x10b6de4: lw    ra, 20(sp)
+// 0x010b6de8: 0x10b6de8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010b67a4: 0x10b67a4: sltu  v0, zero, v0
+// 0x010b6dec: 0x10b6dec: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010b67a8: 0x10b67a8: jr    ra addiu sp, sp, 24
+// 0x010b6df0: 0x10b6df0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -121,7 +121,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_override_line_get_direction_10b67b0(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_line_get_direction_10b6df8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -159,12 +159,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b67b0: 0x10b67b0: addiu sp, sp, -32
+// 0x010b6df8: 0x10b6df8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b67b4: 0x10b67b4: sw    s0, 24(sp)
+// 0x010b6dfc: 0x10b6dfc: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -173,14 +173,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b67b8: 0x10b67b8: addu  a3, zero, zero
+// 0x010b6e00: 0x10b6e00: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b67bc: 0x10b67bc: addu  s0, a2, zero
+// 0x010b6e04: 0x10b6e04: addu  s0, a2, zero
 	ldloc.3
 	stloc 7
-// 0x010b67c0: 0x10b67c0: sw    ra, 28(sp)
-// 0x010b67c4: 0x10b67c4: jal   0x10b6614 addiu a2, sp, 16
+// 0x010b6e08: 0x10b6e08: sw    ra, 28(sp)
+// 0x010b6e0c: 0x10b6e0c: jal   0x10b6c5c addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -190,25 +190,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_find_10b6614(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_find_10b6c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b67cc: 0x10b67cc: bltz  v0, 0x10b67f0 addiu v1, zero, -1
+// 0x010b6e14: 0x10b6e14: bltz  v0, 0x10b6e38 addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 8
 	ldc.i4.s 0
-	blt L_10b67f0
+	blt L_10b6e38
 // --- basic block ---
-// 0x010b67d4: 0x10b67d4: beq   s0, zero, 0x10b67f0 addu  v1, zero, zero
+// 0x010b6e1c: 0x10b6e1c: beq   s0, zero, 0x10b6e38 addu  v1, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_10b67f0
+	brfalse L_10b6e38
 // --- basic block ---
-// 0x010b67dc: 0x10b67dc: lw    v0, 16(sp)
+// 0x010b6e24: 0x10b6e24: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -217,8 +217,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b67e0: 0x10b67e0: sll   zero, zero, 0
-// 0x010b67e4: 0x10b67e4: lw    v0, 16(v0)
+// 0x010b6e28: 0x10b6e28: sll   zero, zero, 0
+// 0x010b6e2c: 0x10b6e2c: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -227,20 +227,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b67e8: 0x10b67e8: sll   zero, zero, 0
-// 0x010b67ec: 0x10b67ec: sw    v0, 0(s0)
+// 0x010b6e30: 0x10b6e30: sll   zero, zero, 0
+// 0x010b6e34: 0x10b6e34: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10b67f0:
-// 0x010b67f0: 0x10b67f0: lw    ra, 28(sp)
-// 0x010b67f4: 0x10b67f4: addu  v0, v1, zero
+L_10b6e38:
+// 0x010b6e38: 0x10b6e38: lw    ra, 28(sp)
+// 0x010b6e3c: 0x10b6e3c: addu  v0, v1, zero
 	ldloc 8
 	stloc 5
-// 0x010b67f8: 0x10b67f8: lw    s0, 24(sp)
+// 0x010b6e40: 0x10b6e40: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -249,7 +249,7 @@ L_10b67f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b67fc: 0x10b67fc: jr    ra addiu sp, sp, 32
+// 0x010b6e44: 0x10b6e44: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -261,7 +261,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_override_line_get_flags_10b6804(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_line_get_flags_10b6e4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -299,12 +299,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6804: 0x10b6804: addiu sp, sp, -32
+// 0x010b6e4c: 0x10b6e4c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b6808: 0x10b6808: sw    s0, 24(sp)
+// 0x010b6e50: 0x10b6e50: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -313,14 +313,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b680c: 0x10b680c: addu  a3, zero, zero
+// 0x010b6e54: 0x10b6e54: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b6810: 0x10b6810: addu  s0, a2, zero
+// 0x010b6e58: 0x10b6e58: addu  s0, a2, zero
 	ldloc.3
 	stloc 7
-// 0x010b6814: 0x10b6814: sw    ra, 28(sp)
-// 0x010b6818: 0x10b6818: jal   0x10b6614 addiu a2, sp, 16
+// 0x010b6e5c: 0x10b6e5c: sw    ra, 28(sp)
+// 0x010b6e60: 0x10b6e60: jal   0x10b6c5c addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -330,25 +330,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_find_10b6614(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_find_10b6c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b6820: 0x10b6820: bltz  v0, 0x10b6844 addiu v1, zero, -1
+// 0x010b6e68: 0x10b6e68: bltz  v0, 0x10b6e8c addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 8
 	ldc.i4.s 0
-	blt L_10b6844
+	blt L_10b6e8c
 // --- basic block ---
-// 0x010b6828: 0x10b6828: beq   s0, zero, 0x10b6844 addu  v1, zero, zero
+// 0x010b6e70: 0x10b6e70: beq   s0, zero, 0x10b6e8c addu  v1, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_10b6844
+	brfalse L_10b6e8c
 // --- basic block ---
-// 0x010b6830: 0x10b6830: lw    v0, 16(sp)
+// 0x010b6e78: 0x10b6e78: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -357,8 +357,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6834: 0x10b6834: sll   zero, zero, 0
-// 0x010b6838: 0x10b6838: lw    v0, 12(v0)
+// 0x010b6e7c: 0x10b6e7c: sll   zero, zero, 0
+// 0x010b6e80: 0x10b6e80: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -367,20 +367,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b683c: 0x10b683c: sll   zero, zero, 0
-// 0x010b6840: 0x10b6840: sw    v0, 0(s0)
+// 0x010b6e84: 0x10b6e84: sll   zero, zero, 0
+// 0x010b6e88: 0x10b6e88: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10b6844:
-// 0x010b6844: 0x10b6844: lw    ra, 28(sp)
-// 0x010b6848: 0x10b6848: addu  v0, v1, zero
+L_10b6e8c:
+// 0x010b6e8c: 0x10b6e8c: lw    ra, 28(sp)
+// 0x010b6e90: 0x10b6e90: addu  v0, v1, zero
 	ldloc 8
 	stloc 5
-// 0x010b684c: 0x10b684c: lw    s0, 24(sp)
+// 0x010b6e94: 0x10b6e94: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -389,7 +389,7 @@ L_10b6844:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6850: 0x10b6850: jr    ra addiu sp, sp, 32
+// 0x010b6e98: 0x10b6e98: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -401,7 +401,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_override_line_set_direction_10b6858(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_line_set_direction_10b6ea0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -439,12 +439,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6858: 0x10b6858: addiu sp, sp, -32
+// 0x010b6ea0: 0x10b6ea0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b685c: 0x10b685c: sw    s0, 24(sp)
+// 0x010b6ea4: 0x10b6ea4: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -453,16 +453,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6860: 0x10b6860: addiu a3, sp, 20
+// 0x010b6ea8: 0x10b6ea8: addiu a3, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 4
-// 0x010b6864: 0x10b6864: addu  s0, a2, zero
+// 0x010b6eac: 0x10b6eac: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010b6868: 0x10b6868: sw    ra, 28(sp)
-// 0x010b686c: 0x10b686c: jal   0x10b6614 addiu a2, sp, 16
+// 0x010b6eb0: 0x10b6eb0: sw    ra, 28(sp)
+// 0x010b6eb4: 0x10b6eb4: jal   0x10b6c5c addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -472,22 +472,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_find_10b6614(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_find_10b6c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6874: 0x10b6874: addu  a1, v0, zero
+// 0x010b6ebc: 0x10b6ebc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010b6878: 0x10b6878: bltz  a1, 0x10b68bc addu  v0, zero, zero
+// 0x010b6ec0: 0x10b6ec0: bltz  a1, 0x10b6f04 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_10b68bc
+	blt L_10b6f04
 // --- basic block ---
-// 0x010b6880: 0x10b6880: lw    v0, 16(sp)
+// 0x010b6ec8: 0x10b6ec8: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -496,8 +496,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6884: 0x10b6884: sll   zero, zero, 0
-// 0x010b6888: 0x10b6888: sw    s0, 16(v0)
+// 0x010b6ecc: 0x10b6ecc: sll   zero, zero, 0
+// 0x010b6ed0: 0x10b6ed0: sw    s0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -506,7 +506,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b688c: 0x10b688c: lw    v1, 20(sp)
+// 0x010b6ed4: 0x10b6ed4: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -515,23 +515,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6890: 0x10b6890: sll   zero, zero, 0
-// 0x010b6894: 0x10b6894: beq   v1, zero, 0x10b68b0 lui   v0, 0xe0000
+// 0x010b6ed8: 0x10b6ed8: sll   zero, zero, 0
+// 0x010b6edc: 0x10b6edc: beq   v1, zero, 0x10b6ef8 lui   v0, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc 5
-	brfalse L_10b68b0
+	brfalse L_10b6ef8
 // --- basic block ---
-// 0x010b689c: 0x10b689c: lw    a0, -17900(v0)
+// 0x010b6ee4: 0x10b6ee4: lw    a0, -17436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b68a0: 0x10b68a0: jal   0x10b6d60 addiu a2, zero, 1
+// 0x010b6ee8: 0x10b6ee8: jal   0x10b73a8 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -539,38 +539,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_write_item_10b6d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_write_item_10b73a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b68a8: 0x10b68a8: j	 0x10b68bc sll   zero, zero, 0
-	br L_10b68bc
+// 0x010b6ef0: 0x10b6ef0: j	 0x10b6f04 sll   zero, zero, 0
+	br L_10b6f04
 // --- basic block ---
-L_10b68b0:
-// 0x010b68b0: 0x10b68b0: lw    a0, -17900(v0)
+L_10b6ef8:
+// 0x010b6ef8: 0x10b6ef8: lw    a0, -17436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b68b4: 0x10b68b4: jal   0x10b6cd4 sll   zero, zero, 0
+// 0x010b6efc: 0x10b6efc: jal   0x10b731c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b68bc:
-// 0x010b68bc: 0x10b68bc: lw    ra, 28(sp)
-// 0x010b68c0: 0x10b68c0: lw    s0, 24(sp)
+L_10b6f04:
+// 0x010b6f04: 0x10b6f04: lw    ra, 28(sp)
+// 0x010b6f08: 0x10b6f08: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -579,7 +579,7 @@ L_10b68bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b68c4: 0x10b68c4: jr    ra addiu sp, sp, 32
+// 0x010b6f0c: 0x10b6f0c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -591,7 +591,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_override_line_set_flag_10b694c(int32,int32,int32,int32,int32)
+.method public static int32 editor_override_line_set_flag_10b6f94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -629,12 +629,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b694c: 0x10b694c: addiu sp, sp, -32
+// 0x010b6f94: 0x10b6f94: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b6950: 0x10b6950: sw    s0, 24(sp)
+// 0x010b6f98: 0x10b6f98: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -643,16 +643,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6954: 0x10b6954: addiu a3, sp, 20
+// 0x010b6f9c: 0x10b6f9c: addiu a3, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 4
-// 0x010b6958: 0x10b6958: addu  s0, a2, zero
+// 0x010b6fa0: 0x10b6fa0: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010b695c: 0x10b695c: sw    ra, 28(sp)
-// 0x010b6960: 0x10b6960: jal   0x10b6614 addiu a2, sp, 16
+// 0x010b6fa4: 0x10b6fa4: sw    ra, 28(sp)
+// 0x010b6fa8: 0x10b6fa8: jal   0x10b6c5c addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -662,22 +662,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_find_10b6614(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_find_10b6c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6968: 0x10b6968: addu  a1, v0, zero
+// 0x010b6fb0: 0x10b6fb0: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010b696c: 0x10b696c: bltz  a1, 0x10b69bc addu  v0, zero, zero
+// 0x010b6fb4: 0x10b6fb4: bltz  a1, 0x10b7004 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	blt L_10b69bc
+	blt L_10b7004
 // --- basic block ---
-// 0x010b6974: 0x10b6974: lw    v1, 16(sp)
+// 0x010b6fbc: 0x10b6fbc: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -686,8 +686,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6978: 0x10b6978: sll   zero, zero, 0
-// 0x010b697c: 0x10b697c: lw    a0, 12(v1)
+// 0x010b6fc0: 0x10b6fc0: sll   zero, zero, 0
+// 0x010b6fc4: 0x10b6fc4: lw    a0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -696,13 +696,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6980: 0x10b6980: sll   zero, zero, 0
-// 0x010b6984: 0x10b6984: or    s0, a0, s0
+// 0x010b6fc8: 0x10b6fc8: sll   zero, zero, 0
+// 0x010b6fcc: 0x10b6fcc: or    s0, a0, s0
 	ldloc.1
 	ldloc 8
 	or
 	stloc 8
-// 0x010b6988: 0x10b6988: sw    s0, 12(v1)
+// 0x010b6fd0: 0x10b6fd0: sw    s0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -711,7 +711,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b698c: 0x10b698c: lw    v1, 20(sp)
+// 0x010b6fd4: 0x10b6fd4: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -720,23 +720,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6990: 0x10b6990: sll   zero, zero, 0
-// 0x010b6994: 0x10b6994: beq   v1, zero, 0x10b69b0 lui   v0, 0xe0000
+// 0x010b6fd8: 0x10b6fd8: sll   zero, zero, 0
+// 0x010b6fdc: 0x10b6fdc: beq   v1, zero, 0x10b6ff8 lui   v0, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc 6
-	brfalse L_10b69b0
+	brfalse L_10b6ff8
 // --- basic block ---
-// 0x010b699c: 0x10b699c: lw    a0, -17900(v0)
+// 0x010b6fe4: 0x10b6fe4: lw    a0, -17436(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b69a0: 0x10b69a0: jal   0x10b6d60 addiu a2, zero, 1
+// 0x010b6fe8: 0x10b6fe8: jal   0x10b73a8 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -744,38 +744,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_write_item_10b6d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_write_item_10b73a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b69a8: 0x10b69a8: j	 0x10b69bc sll   zero, zero, 0
-	br L_10b69bc
+// 0x010b6ff0: 0x10b6ff0: j	 0x10b7004 sll   zero, zero, 0
+	br L_10b7004
 // --- basic block ---
-L_10b69b0:
-// 0x010b69b0: 0x10b69b0: lw    a0, -17900(v0)
+L_10b6ff8:
+// 0x010b6ff8: 0x10b6ff8: lw    a0, -17436(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4475
+	ldc.i4 -4359
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b69b4: 0x10b69b4: jal   0x10b6cd4 sll   zero, zero, 0
+// 0x010b6ffc: 0x10b6ffc: jal   0x10b731c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b69bc:
-// 0x010b69bc: 0x10b69bc: lw    ra, 28(sp)
-// 0x010b69c0: 0x10b69c0: lw    s0, 24(sp)
+L_10b7004:
+// 0x010b7004: 0x10b7004: lw    ra, 28(sp)
+// 0x010b7008: 0x10b7008: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -784,7 +784,7 @@ L_10b69bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b69c4: 0x10b69c4: jr    ra addiu sp, sp, 32
+// 0x010b700c: 0x10b700c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -796,7 +796,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_db_get_record_10b69cc(int32,int32,int32,int32)
+.method public static int32 editor_db_get_record_10b7014(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 lo,int32[] mem,int32 hi,int32 ra)
@@ -834,7 +834,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b69cc: 0x10b69cc: lw    v0, 28(a0)
+// 0x010b7014: 0x10b7014: lw    v0, 28(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -843,7 +843,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b69d0: 0x10b69d0: lw    v1, 32(a0)
+// 0x010b7018: 0x10b7018: lw    v1, 32(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -852,7 +852,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b69d4: 0x10b69d4: div   a1, v0
+// 0x010b701c: 0x10b701c: div   a1, v0
 	ldloc.1
 	ldloc 4
 	ldloc.1
@@ -861,36 +861,36 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	rem
 	stloc 8
-// 0x010b69d8: 0x10b69d8: mflo  lo
+// 0x010b7020: 0x10b7020: mflo  lo
 	ldloc 6
 	stloc.1
-// 0x010b69dc: 0x10b69dc: sll   a1, a1, 2
+// 0x010b7024: 0x10b7024: sll   a1, a1, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010b69e0: 0x10b69e0: addu  v1, v1, a1
+// 0x010b7028: 0x10b7028: addu  v1, v1, a1
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x010b69e4: 0x10b69e4: lw    a2, 0(v1)
+// 0x010b702c: 0x10b702c: lw    a2, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b69e8: 0x10b69e8: mfhi  hi
+// 0x010b7030: 0x10b7030: mfhi  hi
 	ldloc 8
 	stloc.3
-// 0x010b69ec: 0x10b69ec: beq   a2, zero, 0x10b6a08 addu  v0, zero, zero
+// 0x010b7034: 0x10b7034: beq   a2, zero, 0x10b7050 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_10b6a08
+	brfalse L_10b7050
 // --- basic block ---
-// 0x010b69f4: 0x10b69f4: lw    v0, 24(a0)
+// 0x010b703c: 0x10b703c: lw    v0, 24(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -899,22 +899,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b69f8: 0x10b69f8: sll   zero, zero, 0
-// 0x010b69fc: 0x10b69fc: mult  a3, v0
+// 0x010b7040: 0x10b7040: sll   zero, zero, 0
+// 0x010b7044: 0x10b7044: mult  a3, v0
 	ldloc.3
 	ldloc 4
 	mul
 	stloc 6
-// 0x010b6a00: 0x10b6a00: mflo  lo
+// 0x010b7048: 0x10b7048: mflo  lo
 	ldloc 6
 	stloc 4
-// 0x010b6a04: 0x10b6a04: addu  v0, a2, v0
+// 0x010b704c: 0x10b704c: addu  v0, a2, v0
 	ldloc.2
 	ldloc 4
 	add
 	stloc 4
-L_10b6a08:
-// 0x010b6a08: 0x10b6a08: jr    ra sll   zero, zero, 0
+L_10b7050:
+// 0x010b7050: 0x10b7050: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -922,7 +922,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 editor_db_create_10b6a10()
+.method public static int32 editor_db_create_10b7058()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -936,7 +936,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6a10: 0x10b6a10: jr    ra addiu v0, zero, -1
+// 0x010b7058: 0x10b7058: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.0
 	br __CIBYL_function_return
@@ -944,7 +944,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_db_get_item_count_10b6a20(int32)
+.method public static int32 editor_db_get_item_count_10b7068(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -964,7 +964,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6a20: 0x10b6a20: lw    v0, 4(a0)
+// 0x010b7068: 0x10b7068: lw    v0, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -973,13 +973,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6a24: 0x10b6a24: jr    ra sll   zero, zero, 0
+// 0x010b706c: 0x10b706c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_db_begin_commit_10b6a34(int32)
+.method public static int32 editor_db_begin_commit_10b707c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -999,7 +999,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6a34: 0x10b6a34: lw    v0, 36(a0)
+// 0x010b707c: 0x10b707c: lw    v0, 36(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -1008,7 +1008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6a38: 0x10b6a38: jr    ra sw    v0, 44(a0)
+// 0x010b7080: 0x10b7080: jr    ra sw    v0, 44(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -1022,7 +1022,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_db_item_committed_10b6a40(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_item_committed_10b7088(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1060,13 +1060,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6a40: 0x10b6a40: addiu sp, sp, -24
+// 0x010b7088: 0x10b7088: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b6a44: 0x10b6a44: sw    ra, 20(sp)
-// 0x010b6a48: 0x10b6a48: sw    s0, 16(sp)
+// 0x010b708c: 0x10b708c: sw    ra, 20(sp)
+// 0x010b7090: 0x10b7090: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1075,26 +1075,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b6a4c: 0x10b6a4c: jal   0x10b69cc addu  s0, a0, zero
+// 0x010b7094: 0x10b7094: jal   0x10b7014 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_record_10b69cc(int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_record_10b7014(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b6a54: 0x10b6a54: lw    v1, 0(v0)
+// 0x010b709c: 0x10b709c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010b6a58: 0x10b6a58: lw    v0, 40(s0)
+// 0x010b70a0: 0x10b70a0: lw    v0, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1103,18 +1103,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6a5c: 0x10b6a5c: lw    ra, 20(sp)
-// 0x010b6a60: 0x10b6a60: slt   v0, v0, v1
+// 0x010b70a4: 0x10b70a4: lw    ra, 20(sp)
+// 0x010b70a8: 0x10b70a8: slt   v0, v0, v1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x010b6a64: 0x10b6a64: xori  v0, v0, 1
+// 0x010b70ac: 0x10b70ac: xori  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	xor
 	stloc 5
-// 0x010b6a68: 0x10b6a68: lw    s0, 16(sp)
+// 0x010b70b0: 0x10b70b0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6a6c: 0x10b6a6c: jr    ra addiu sp, sp, 24
+// 0x010b70b4: 0x10b70b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1135,7 +1135,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_db_items_pending_10b6a74(int32)
+.method public static int32 editor_db_items_pending_10b70bc(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1158,7 +1158,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6a74: 0x10b6a74: lw    v0, 40(a0)
+// 0x010b70bc: 0x10b70bc: lw    v0, 40(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6a78: 0x10b6a78: lw    v1, 36(a0)
+// 0x010b70c0: 0x10b70c0: lw    v1, 36(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1176,17 +1176,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b6a7c: 0x10b6a7c: sll   zero, zero, 0
-// 0x010b6a80: 0x10b6a80: slt   v1, v1, v0
+// 0x010b70c4: 0x10b70c4: sll   zero, zero, 0
+// 0x010b70c8: 0x10b70c8: slt   v1, v1, v0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x010b6a84: 0x10b6a84: beq   v1, zero, 0x10b6a94 sll   zero, zero, 0
+// 0x010b70cc: 0x10b70cc: beq   v1, zero, 0x10b70dc sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b6a94
+	brfalse L_10b70dc
 // --- basic block ---
-// 0x010b6a8c: 0x10b6a8c: sw    v0, 36(a0)
+// 0x010b70d4: 0x10b70d4: sw    v0, 36(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1195,7 +1195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b6a90: 0x10b6a90: lw    v0, 40(a0)
+// 0x010b70d8: 0x10b70d8: lw    v0, 40(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1204,8 +1204,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-L_10b6a94:
-// 0x010b6a94: 0x10b6a94: lw    v1, 36(a0)
+L_10b70dc:
+// 0x010b70dc: 0x10b70dc: lw    v1, 36(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -1214,7 +1214,7 @@ L_10b6a94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b6a98: 0x10b6a98: jr    ra subu  v0, v1, v0
+// 0x010b70e0: 0x10b70e0: jr    ra subu  v0, v1, v0
 	ldloc.2
 	ldloc.1
 	sub
@@ -1226,7 +1226,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_db_confirm_commit_10b6aa0(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_confirm_commit_10b70e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -1264,10 +1264,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6aa0: 0x10b6aa0: addu  v1, a0, zero
+// 0x010b70e8: 0x10b70e8: addu  v1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b6aa4: 0x10b6aa4: lw    a0, 40(a0)
+// 0x010b70ec: 0x10b70ec: lw    a0, 40(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1276,18 +1276,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6aa8: 0x10b6aa8: addiu sp, sp, -32
+// 0x010b70f0: 0x10b70f0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b6aac: 0x10b6aac: slt   a0, a0, a1
+// 0x010b70f4: 0x10b70f4: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.1
-// 0x010b6ab0: 0x10b6ab0: sw    ra, 28(sp)
-// 0x010b6ab4: 0x10b6ab4: sw    s0, 24(sp)
+// 0x010b70f8: 0x10b70f8: sw    ra, 28(sp)
+// 0x010b70fc: 0x10b70fc: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1296,40 +1296,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6ab8: 0x10b6ab8: beq   a0, zero, 0x10b6b24 addu  v0, a1, zero
+// 0x010b7100: 0x10b7100: beq   a0, zero, 0x10b716c addu  v0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 6
-	brfalse L_10b6b24
+	brfalse L_10b716c
 // --- basic block ---
-// 0x010b6ac0: 0x10b6ac0: lw    a3, 0(v1)
+// 0x010b7108: 0x10b7108: lw    a3, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010b6ac4: 0x10b6ac4: lui   s0, 0xe0000
+// 0x010b710c: 0x10b710c: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b6ac8: 0x10b6ac8: lui   a1, 0x20000000
+// 0x010b7110: 0x10b7110: lui   a1, 0x20000000
 	ldc.i4 536870912
 	stloc.2
-// 0x010b6acc: 0x10b6acc: lw    a0, -17896(s0)
+// 0x010b7114: 0x10b7114: lw    a0, -17432(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6ad0: 0x10b6ad0: or    a3, a3, a1
+// 0x010b7118: 0x10b7118: or    a3, a3, a1
 	ldloc 4
 	ldloc.2
 	or
 	stloc 4
-// 0x010b6ad4: 0x10b6ad4: sw    v0, 40(v1)
+// 0x010b711c: 0x10b711c: sw    v0, 40(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1338,15 +1338,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b6ad8: 0x10b6ad8: addiu a1, sp, 20
+// 0x010b7120: 0x10b7120: addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x010b6adc: 0x10b6adc: addiu a2, zero, 4
+// 0x010b7124: 0x10b7124: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x010b6ae0: 0x10b6ae0: sw    v0, 16(sp)
+// 0x010b7128: 0x10b7128: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1355,7 +1355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b6ae4: 0x10b6ae4: jal   0x104d46c sw    a3, 20(sp)
+// 0x010b712c: 0x10b712c: jal   0x104d47c sw    a3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1369,30 +1369,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6aec: 0x10b6aec: bltz  v0, 0x10b6b08 addiu a1, sp, 16
+// 0x010b7134: 0x10b7134: bltz  v0, 0x10b7150 addiu a1, sp, 16
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
 	ldc.i4.s 0
-	blt L_10b6b08
+	blt L_10b7150
 // --- basic block ---
-// 0x010b6af4: 0x10b6af4: lw    a0, -17896(s0)
+// 0x010b713c: 0x10b713c: lw    a0, -17432(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6af8: 0x10b6af8: jal   0x104d46c addiu a2, zero, 4
+// 0x010b7140: 0x10b7140: jal   0x104d47c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -1400,37 +1400,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b6b00: 0x10b6b00: bgez  v0, 0x10b6b24 sll   zero, zero, 0
+// 0x010b7148: 0x10b7148: bgez  v0, 0x10b716c sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_10b6b24
+	bge L_10b716c
 // --- basic block ---
-L_10b6b08:
-// 0x010b6b08: 0x10b6b08: lui   a1, 0x20000
+L_10b7150:
+// 0x010b7150: 0x10b7150: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b6b0c: 0x10b6b0c: lui   a3, 0x20000
+// 0x010b7154: 0x10b7154: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b6b10: 0x10b6b10: addiu a1, a1, 19640
+// 0x010b7158: 0x10b7158: addiu a1, a1, 20100
 	ldloc.2
-	ldc.i4 19640
+	ldc.i4 20100
 	add
 	stloc.2
-// 0x010b6b14: 0x10b6b14: addiu a3, a3, 19672
+// 0x010b715c: 0x10b715c: addiu a3, a3, 20132
 	ldloc 4
-	ldc.i4 19672
+	ldc.i4 20132
 	add
 	stloc 4
-// 0x010b6b18: 0x10b6b18: addiu a0, zero, 4
+// 0x010b7160: 0x10b7160: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b6b1c: 0x10b6b1c: jal   0x100449c addiu a2, zero, 678
+// 0x010b7164: 0x10b7164: jal   0x100449c addiu a2, zero, 678
 	ldc.i4 678
 	stloc.3
 	ldloc.0
@@ -1443,9 +1443,9 @@ L_10b6b08:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b6b24:
-// 0x010b6b24: 0x10b6b24: lw    ra, 28(sp)
-// 0x010b6b28: 0x10b6b28: lw    s0, 24(sp)
+L_10b716c:
+// 0x010b716c: 0x10b716c: lw    ra, 28(sp)
+// 0x010b7170: 0x10b7170: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1454,7 +1454,7 @@ L_10b6b24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6b2c: 0x10b6b2c: jr    ra addiu sp, sp, 32
+// 0x010b7174: 0x10b7174: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1466,7 +1466,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_db_write_record_10b6b34(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_write_record_10b717c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 lo,int32 ra)
@@ -1513,22 +1513,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6b34: 0x10b6b34: lw    v0, 0(a0)
+// 0x010b717c: 0x10b717c: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b6b38: 0x10b6b38: addiu sp, sp, -40
+// 0x010b7180: 0x10b7180: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b6b3c: 0x10b6b3c: addiu v1, zero, -1
+// 0x010b7184: 0x10b7184: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b6b40: 0x10b6b40: sw    s1, 28(sp)
+// 0x010b7188: 0x10b7188: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1537,7 +1537,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b6b44: 0x10b6b44: sw    s0, 24(sp)
+// 0x010b718c: 0x10b718c: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1546,8 +1546,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6b48: 0x10b6b48: sw    ra, 36(sp)
-// 0x010b6b4c: 0x10b6b4c: sw    s2, 32(sp)
+// 0x010b7190: 0x10b7190: sw    ra, 36(sp)
+// 0x010b7194: 0x10b7194: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1556,13 +1556,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b6b50: 0x10b6b50: addu  s0, a0, zero
+// 0x010b7198: 0x10b7198: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b6b54: 0x10b6b54: addu  s1, a1, zero
+// 0x010b719c: 0x10b719c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010b6b58: 0x10b6b58: sw    a2, 48(sp)
+// 0x010b71a0: 0x10b71a0: sw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1571,7 +1571,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b6b5c: 0x10b6b5c: sw    a3, 52(sp)
+// 0x010b71a4: 0x10b71a4: sw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1580,7 +1580,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b6b60: 0x10b6b60: beq   a2, v1, 0x10b6b70 sw    v0, 20(sp)
+// 0x010b71a8: 0x10b71a8: beq   a2, v1, 0x10b71b8 sw    v0, 20(sp)
 	ldloc.3
 	ldloc 7
 	ldloc 6
@@ -1591,32 +1591,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	beq  L_10b6b70
+	beq  L_10b71b8
 // --- basic block ---
-// 0x010b6b68: 0x10b6b68: j	 0x10b6b7c lui   v1, 0x40000000
+// 0x010b71b0: 0x10b71b0: j	 0x10b71c4 lui   v1, 0x40000000
 	ldc.i4 1073741824
 	stloc 7
-	br L_10b6b7c
+	br L_10b71c4
 // --- basic block ---
-L_10b6b70:
-// 0x010b6b70: 0x10b6b70: slti  a3, a3, 2
+L_10b71b8:
+// 0x010b71b8: 0x10b71b8: slti  a3, a3, 2
 	ldloc 4
 	ldc.i4.2
 	clt
 	stloc 4
-// 0x010b6b74: 0x10b6b74: bne   a3, zero, 0x10b6b84 lui   v1, 0x80000000
+// 0x010b71bc: 0x10b71bc: bne   a3, zero, 0x10b71cc lui   v1, 0x80000000
 	ldloc 4
 	ldc.i4 2147483648
 	stloc 7
-	brtrue L_10b6b84
+	brtrue L_10b71cc
 // --- basic block ---
-L_10b6b7c:
-// 0x010b6b7c: 0x10b6b7c: or    v0, v0, v1
+L_10b71c4:
+// 0x010b71c4: 0x10b71c4: or    v0, v0, v1
 	ldloc 5
 	ldloc 7
 	or
 	stloc 5
-// 0x010b6b80: 0x10b6b80: sw    v0, 20(sp)
+// 0x010b71c8: 0x10b71c8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1625,25 +1625,25 @@ L_10b6b7c:
 	add
 	ldloc 5
 	stelem.i4
-L_10b6b84:
-// 0x010b6b84: 0x10b6b84: lui   s2, 0xe0000
+L_10b71cc:
+// 0x010b71cc: 0x10b71cc: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010b6b88: 0x10b6b88: lw    a0, -17896(s2)
+// 0x010b71d0: 0x10b71d0: lw    a0, -17432(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6b8c: 0x10b6b8c: addiu a1, sp, 20
+// 0x010b71d4: 0x10b71d4: addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x010b6b90: 0x10b6b90: jal   0x104d46c addiu a2, zero, 4
+// 0x010b71d8: 0x10b71d8: jal   0x104d47c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -1651,19 +1651,19 @@ L_10b6b84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6b98: 0x10b6b98: bltz  v0, 0x10b6cb8 addiu v0, zero, -1
+// 0x010b71e0: 0x10b71e0: bltz  v0, 0x10b7300 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	blt L_10b6cb8
+	blt L_10b7300
 // --- basic block ---
-// 0x010b6ba0: 0x10b6ba0: lw    v1, 48(sp)
+// 0x010b71e8: 0x10b71e8: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1672,26 +1672,26 @@ L_10b6b84:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6ba4: 0x10b6ba4: sll   zero, zero, 0
-// 0x010b6ba8: 0x10b6ba8: beq   v1, v0, 0x10b6bc4 addiu a1, sp, 48
+// 0x010b71ec: 0x10b71ec: sll   zero, zero, 0
+// 0x010b71f0: 0x10b71f0: beq   v1, v0, 0x10b720c addiu a1, sp, 48
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-	beq  L_10b6bc4
+	beq  L_10b720c
 // --- basic block ---
-// 0x010b6bb0: 0x10b6bb0: lw    a0, -17896(s2)
+// 0x010b71f8: 0x10b71f8: lw    a0, -17432(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6bb4: 0x10b6bb4: jal   0x104d46c addiu a2, zero, 4
+// 0x010b71fc: 0x10b71fc: jal   0x104d47c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -1699,20 +1699,20 @@ L_10b6b84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6bbc: 0x10b6bbc: bltz  v0, 0x10b6cbc addiu v0, zero, -1
+// 0x010b7204: 0x10b7204: bltz  v0, 0x10b7304 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	blt L_10b6cbc
+	blt L_10b7304
 // --- basic block ---
-L_10b6bc4:
-// 0x010b6bc4: 0x10b6bc4: lw    v0, 52(sp)
+L_10b720c:
+// 0x010b720c: 0x10b720c: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1721,33 +1721,33 @@ L_10b6bc4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6bc8: 0x10b6bc8: sll   zero, zero, 0
-// 0x010b6bcc: 0x10b6bcc: slti  v0, v0, 2
+// 0x010b7210: 0x10b7210: sll   zero, zero, 0
+// 0x010b7214: 0x10b7214: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010b6bd0: 0x10b6bd0: bne   v0, zero, 0x10b6bf0 lui   v0, 0xe0000
+// 0x010b7218: 0x10b7218: bne   v0, zero, 0x10b7238 lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brtrue L_10b6bf0
+	brtrue L_10b7238
 // --- basic block ---
-// 0x010b6bd8: 0x10b6bd8: lw    a0, -17896(v0)
+// 0x010b7220: 0x10b7220: lw    a0, -17432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6bdc: 0x10b6bdc: addiu a1, sp, 52
+// 0x010b7224: 0x10b7224: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010b6be0: 0x10b6be0: jal   0x104d46c addiu a2, zero, 4
+// 0x010b7228: 0x10b7228: jal   0x104d47c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -1755,20 +1755,20 @@ L_10b6bc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6be8: 0x10b6be8: bltz  v0, 0x10b6cbc addiu v0, zero, -1
+// 0x010b7230: 0x10b7230: bltz  v0, 0x10b7304 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	blt L_10b6cbc
+	blt L_10b7304
 // --- basic block ---
-L_10b6bf0:
-// 0x010b6bf0: 0x10b6bf0: lw    v0, 12(s0)
+L_10b7238:
+// 0x010b7238: 0x10b7238: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1777,23 +1777,23 @@ L_10b6bf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6bf4: 0x10b6bf4: sll   zero, zero, 0
-// 0x010b6bf8: 0x10b6bf8: beq   v0, zero, 0x10b6c18 lui   v0, 0xe0000
+// 0x010b723c: 0x10b723c: sll   zero, zero, 0
+// 0x010b7240: 0x10b7240: beq   v0, zero, 0x10b7260 lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brfalse L_10b6c18
+	brfalse L_10b7260
 // --- basic block ---
-// 0x010b6c00: 0x10b6c00: lw    a0, -17896(v0)
+// 0x010b7248: 0x10b7248: lw    a0, -17432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6c04: 0x10b6c04: lw    a2, 16(s0)
+// 0x010b724c: 0x10b724c: lw    a2, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1802,7 +1802,7 @@ L_10b6bf0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b6c08: 0x10b6c08: jal   0x104d46c addu  a1, s1, zero
+// 0x010b7250: 0x10b7250: jal   0x104d47c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -1810,20 +1810,20 @@ L_10b6bf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6c10: 0x10b6c10: bltz  v0, 0x10b6cbc addiu v0, zero, -1
+// 0x010b7258: 0x10b7258: bltz  v0, 0x10b7304 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	blt L_10b6cbc
+	blt L_10b7304
 // --- basic block ---
-L_10b6c18:
-// 0x010b6c18: 0x10b6c18: lw    a2, 52(sp)
+L_10b7260:
+// 0x010b7260: 0x10b7260: lw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1832,7 +1832,7 @@ L_10b6c18:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b6c1c: 0x10b6c1c: lw    v0, 20(s0)
+// 0x010b7264: 0x10b7264: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1841,15 +1841,15 @@ L_10b6c18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6c20: 0x10b6c20: lui   s2, 0xe0000
+// 0x010b7268: 0x10b7268: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010b6c24: 0x10b6c24: mult  a2, v0
+// 0x010b726c: 0x10b726c: mult  a2, v0
 	ldloc.3
 	ldloc 5
 	mul
 	stloc 11
-// 0x010b6c28: 0x10b6c28: lw    a1, 16(s0)
+// 0x010b7270: 0x10b7270: lw    a1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1858,19 +1858,19 @@ L_10b6c18:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b6c2c: 0x10b6c2c: lw    a0, -17896(s2)
+// 0x010b7274: 0x10b7274: lw    a0, -17432(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6c30: 0x10b6c30: mflo  lo
+// 0x010b7278: 0x10b7278: mflo  lo
 	ldloc 11
 	stloc.3
-// 0x010b6c34: 0x10b6c34: jal   0x104d46c addu  a1, s1, a1
+// 0x010b727c: 0x10b727c: jal   0x104d47c addu  a1, s1, a1
 	ldloc 9
 	ldloc.2
 	add
@@ -1880,19 +1880,19 @@ L_10b6c18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6c3c: 0x10b6c3c: bltz  v0, 0x10b6cbc addiu v0, zero, -1
+// 0x010b7284: 0x10b7284: bltz  v0, 0x10b7304 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	blt L_10b6cbc
+	blt L_10b7304
 // --- basic block ---
-// 0x010b6c44: 0x10b6c44: lw    v0, 24(s0)
+// 0x010b728c: 0x10b728c: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1901,7 +1901,7 @@ L_10b6c18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6c48: 0x10b6c48: lw    s0, 52(sp)
+// 0x010b7290: 0x10b7290: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1910,46 +1910,46 @@ L_10b6c18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6c4c: 0x10b6c4c: sll   zero, zero, 0
-// 0x010b6c50: 0x10b6c50: mult  s0, v0
+// 0x010b7294: 0x10b7294: sll   zero, zero, 0
+// 0x010b7298: 0x10b7298: mult  s0, v0
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 11
-// 0x010b6c54: 0x10b6c54: mflo  lo
+// 0x010b729c: 0x10b729c: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x010b6c58: 0x10b6c58: andi  s0, s0, 3
+// 0x010b72a0: 0x10b72a0: andi  s0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	and
 	stloc 8
-// 0x010b6c5c: 0x10b6c5c: beq   s0, zero, 0x10b6c98 lui   v1, 0xe0000
+// 0x010b72a4: 0x10b72a4: beq   s0, zero, 0x10b72e0 lui   v1, 0xe0000
 	ldloc 8
 	ldc.i4 917504
 	stloc 7
-	brfalse L_10b6c98
+	brfalse L_10b72e0
 // --- basic block ---
-// 0x010b6c64: 0x10b6c64: addiu v0, zero, 4
+// 0x010b72ac: 0x10b72ac: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010b6c68: 0x10b6c68: subu  s0, v0, s0
+// 0x010b72b0: 0x10b72b0: subu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 8
-// 0x010b6c6c: 0x10b6c6c: addiu s1, sp, 16
+// 0x010b72b4: 0x10b72b4: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010b6c70: 0x10b6c70: addu  a0, s1, zero
+// 0x010b72b8: 0x10b72b8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b6c74: 0x10b6c74: addu  a1, zero, zero
+// 0x010b72bc: 0x10b72bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b6c78: 0x10b6c78: jal   0x100177c addu  a2, s0, zero
+// 0x010b72c0: 0x10b72c0: jal   0x100177c addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.1
@@ -1961,19 +1961,19 @@ L_10b6c18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6c80: 0x10b6c80: lw    a0, -17896(s2)
+// 0x010b72c8: 0x10b72c8: lw    a0, -17432(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6c84: 0x10b6c84: addu  a1, s1, zero
+// 0x010b72cc: 0x10b72cc: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010b6c88: 0x10b6c88: jal   0x104d46c addu  a2, s0, zero
+// 0x010b72d0: 0x10b72d0: jal   0x104d47c addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -1981,70 +1981,70 @@ L_10b6c18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6c90: 0x10b6c90: bltz  v0, 0x10b6cb8 lui   v1, 0xe0000
+// 0x010b72d8: 0x10b72d8: bltz  v0, 0x10b7300 lui   v1, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 7
 	ldc.i4.s 0
-	blt L_10b6cb8
+	blt L_10b7300
 // --- basic block ---
-L_10b6c98:
-// 0x010b6c98: 0x10b6c98: lw    a0, -17892(v1)
+L_10b72e0:
+// 0x010b72e0: 0x10b72e0: lw    a0, -17428(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4473
+	ldc.i4 -4357
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6c9c: 0x10b6c9c: addiu a1, zero, 300
+// 0x010b72e4: 0x10b72e4: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x010b6ca0: 0x10b6ca0: addiu a0, a0, 1
+// 0x010b72e8: 0x10b72e8: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010b6ca4: 0x10b6ca4: sw    a0, -17892(v1)
+// 0x010b72ec: 0x10b72ec: sw    a0, -17428(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4473
+	ldc.i4 -4357
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b6ca8: 0x10b6ca8: bne   a0, a1, 0x10b6cbc addu  v0, zero, zero
+// 0x010b72f0: 0x10b72f0: bne   a0, a1, 0x10b7304 addu  v0, zero, zero
 	ldloc.1
 	ldloc.2
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_10b6cbc
+	bne.un L_10b7304
 // --- basic block ---
-// 0x010b6cb0: 0x10b6cb0: j	 0x10b6cbc sw    zero, -17892(v1)
+// 0x010b72f8: 0x10b72f8: j	 0x10b7304 sw    zero, -17428(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4473
+	ldc.i4 -4357
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10b6cbc
+	br L_10b7304
 // --- basic block ---
-L_10b6cb8:
-// 0x010b6cb8: 0x10b6cb8: addiu v0, zero, -1
+L_10b7300:
+// 0x010b7300: 0x10b7300: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10b6cbc:
-// 0x010b6cbc: 0x10b6cbc: lw    ra, 36(sp)
-// 0x010b6cc0: 0x10b6cc0: lw    s2, 32(sp)
+L_10b7304:
+// 0x010b7304: 0x10b7304: lw    ra, 36(sp)
+// 0x010b7308: 0x10b7308: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2053,7 +2053,7 @@ L_10b6cbc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b6cc4: 0x10b6cc4: lw    s1, 28(sp)
+// 0x010b730c: 0x10b730c: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2062,7 +2062,7 @@ L_10b6cbc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6cc8: 0x10b6cc8: lw    s0, 24(sp)
+// 0x010b7310: 0x10b7310: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2071,7 +2071,7 @@ L_10b6cbc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6ccc: 0x10b6ccc: jr    ra addiu sp, sp, 40
+// 0x010b7314: 0x10b7314: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2083,7 +2083,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_db_update_item_10b6cd4(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_update_item_10b731c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 s0,int32 v0,int32 ra)
@@ -2121,12 +2121,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6cd4: 0x10b6cd4: addiu sp, sp, -32
+// 0x010b731c: 0x10b731c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b6cd8: 0x10b6cd8: sw    s0, 24(sp)
+// 0x010b7320: 0x10b7320: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2135,11 +2135,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b6cdc: 0x10b6cdc: addu  s0, a0, zero
+// 0x010b7324: 0x10b7324: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b6ce0: 0x10b6ce0: sw    ra, 28(sp)
-// 0x010b6ce4: 0x10b6ce4: jal   0x10b69cc sw    a1, 16(sp)
+// 0x010b7328: 0x10b7328: sw    ra, 28(sp)
+// 0x010b732c: 0x10b732c: jal   0x10b7014 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2152,12 +2152,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_record_10b69cc(int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_record_10b7014(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010b6cec: 0x10b6cec: lw    v1, 12(s0)
+// 0x010b7334: 0x10b7334: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2166,7 +2166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6cf0: 0x10b6cf0: lw    a2, 16(sp)
+// 0x010b7338: 0x10b7338: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2175,13 +2175,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b6cf4: 0x10b6cf4: beq   v1, zero, 0x10b6d44 addu  a0, s0, zero
+// 0x010b733c: 0x10b733c: beq   v1, zero, 0x10b738c addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_10b6d44
+	brfalse L_10b738c
 // --- basic block ---
-// 0x010b6cfc: 0x10b6cfc: lw    v1, 40(s0)
+// 0x010b7344: 0x10b7344: lw    v1, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2190,7 +2190,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6d00: 0x10b6d00: lw    a0, 36(s0)
+// 0x010b7348: 0x10b7348: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2199,21 +2199,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6d04: 0x10b6d04: addiu v1, v1, 1
+// 0x010b734c: 0x10b734c: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010b6d08: 0x10b6d08: slt   a0, a0, v1
+// 0x010b7350: 0x10b7350: slt   a0, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x010b6d0c: 0x10b6d0c: beq   a0, zero, 0x10b6d18 sll   zero, zero, 0
+// 0x010b7354: 0x10b7354: beq   a0, zero, 0x10b7360 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b6d18
+	brfalse L_10b7360
 // --- basic block ---
-// 0x010b6d14: 0x10b6d14: sw    v1, 36(s0)
+// 0x010b735c: 0x10b735c: sw    v1, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2222,8 +2222,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_10b6d18:
-// 0x010b6d18: 0x10b6d18: lw    v1, 44(s0)
+L_10b7360:
+// 0x010b7360: 0x10b7360: lw    v1, 44(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2232,7 +2232,7 @@ L_10b6d18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6d1c: 0x10b6d1c: lw    a0, 36(s0)
+// 0x010b7364: 0x10b7364: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2241,21 +2241,21 @@ L_10b6d18:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6d20: 0x10b6d20: addiu v1, v1, 1
+// 0x010b7368: 0x10b7368: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010b6d24: 0x10b6d24: slt   a0, a0, v1
+// 0x010b736c: 0x10b736c: slt   a0, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x010b6d28: 0x10b6d28: beq   a0, zero, 0x10b6d34 sll   zero, zero, 0
+// 0x010b7370: 0x10b7370: beq   a0, zero, 0x10b737c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b6d34
+	brfalse L_10b737c
 // --- basic block ---
-// 0x010b6d30: 0x10b6d30: sw    v1, 36(s0)
+// 0x010b7378: 0x10b7378: sw    v1, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2264,8 +2264,8 @@ L_10b6d18:
 	add
 	ldloc 5
 	stelem.i4
-L_10b6d34:
-// 0x010b6d34: 0x10b6d34: lw    v1, 36(s0)
+L_10b737c:
+// 0x010b737c: 0x10b737c: lw    v1, 36(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2274,22 +2274,22 @@ L_10b6d34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6d38: 0x10b6d38: sll   zero, zero, 0
-// 0x010b6d3c: 0x10b6d3c: sw    v1, 0(v0)
+// 0x010b7380: 0x10b7380: sll   zero, zero, 0
+// 0x010b7384: 0x10b7384: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b6d40: 0x10b6d40: addu  a0, s0, zero
+// 0x010b7388: 0x10b7388: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-L_10b6d44:
-// 0x010b6d44: 0x10b6d44: addu  a1, v0, zero
+L_10b738c:
+// 0x010b738c: 0x10b738c: addu  a1, v0, zero
 	ldloc 8
 	stloc.2
-// 0x010b6d48: 0x10b6d48: jal   0x10b6b34 addiu a3, zero, 1
+// 0x010b7390: 0x10b7390: jal   0x10b717c addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -2297,13 +2297,13 @@ L_10b6d44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_write_record_10b6b34(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_write_record_10b717c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010b6d50: 0x10b6d50: lw    ra, 28(sp)
-// 0x010b6d54: 0x10b6d54: lw    s0, 24(sp)
+// 0x010b7398: 0x10b7398: lw    ra, 28(sp)
+// 0x010b739c: 0x10b739c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2312,7 +2312,7 @@ L_10b6d44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6d58: 0x10b6d58: jr    ra addiu sp, sp, 32
+// 0x010b73a0: 0x10b73a0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2324,7 +2324,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 editor_db_write_item_10b6d60(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_write_item_10b73a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -2362,13 +2362,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6d60: 0x10b6d60: addiu sp, sp, -32
+// 0x010b73a8: 0x10b73a8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b6d64: 0x10b6d64: sw    ra, 28(sp)
-// 0x010b6d68: 0x10b6d68: sw    s0, 24(sp)
+// 0x010b73ac: 0x10b73ac: sw    ra, 28(sp)
+// 0x010b73b0: 0x10b73b0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2377,7 +2377,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b6d6c: 0x10b6d6c: sw    a2, 16(sp)
+// 0x010b73b4: 0x10b73b4: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2386,19 +2386,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b6d70: 0x10b6d70: jal   0x10b69cc addu  s0, a0, zero
+// 0x010b73b8: 0x10b73b8: jal   0x10b7014 addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_record_10b69cc(int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_record_10b7014(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010b6d78: 0x10b6d78: lw    a2, 16(sp)
+// 0x010b73c0: 0x10b73c0: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2407,16 +2407,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b6d7c: 0x10b6d7c: addu  a0, s0, zero
+// 0x010b73c4: 0x10b73c4: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x010b6d80: 0x10b6d80: addu  a3, a2, zero
+// 0x010b73c8: 0x10b73c8: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x010b6d84: 0x10b6d84: addu  a1, v0, zero
+// 0x010b73cc: 0x10b73cc: addu  a1, v0, zero
 	ldloc 7
 	stloc.2
-// 0x010b6d88: 0x10b6d88: jal   0x10b6b34 addiu a2, zero, -1
+// 0x010b73d0: 0x10b73d0: jal   0x10b717c addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -2424,13 +2424,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_write_record_10b6b34(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_write_record_10b717c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010b6d90: 0x10b6d90: lw    ra, 28(sp)
-// 0x010b6d94: 0x10b6d94: lw    s0, 24(sp)
+// 0x010b73d8: 0x10b73d8: lw    ra, 28(sp)
+// 0x010b73dc: 0x10b73dc: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2439,7 +2439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b6d98: 0x10b6d98: jr    ra addiu sp, sp, 32
+// 0x010b73e0: 0x10b73e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2451,7 +2451,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_db_allocate_new_block_10b6da0(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_allocate_new_block_10b73e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -2495,12 +2495,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6da0: 0x10b6da0: addiu sp, sp, -32
+// 0x010b73e8: 0x10b73e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b6da4: 0x10b6da4: sw    s2, 24(sp)
+// 0x010b73ec: 0x10b73ec: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2509,7 +2509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b6da8: 0x10b6da8: lw    s2, 8(a0)
+// 0x010b73f0: 0x10b73f0: lw    s2, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2518,7 +2518,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6dac: 0x10b6dac: sw    s1, 20(sp)
+// 0x010b73f4: 0x10b73f4: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2527,7 +2527,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b6db0: 0x10b6db0: sw    s0, 16(sp)
+// 0x010b73f8: 0x10b73f8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2536,18 +2536,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6db4: 0x10b6db4: sw    ra, 28(sp)
-// 0x010b6db8: 0x10b6db8: addu  s0, a0, zero
+// 0x010b73fc: 0x10b73fc: sw    ra, 28(sp)
+// 0x010b7400: 0x10b7400: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b6dbc: 0x10b6dbc: bne   s2, a1, 0x10b6e30 addu  s1, a1, zero
+// 0x010b7404: 0x10b7404: bne   s2, a1, 0x10b7478 addu  s1, a1, zero
 	ldloc 7
 	ldloc.2
 	ldloc.2
 	stloc 9
-	bne.un L_10b6e30
+	bne.un L_10b7478
 // --- basic block ---
-// 0x010b6dc4: 0x10b6dc4: lw    a0, 32(a0)
+// 0x010b740c: 0x10b740c: lw    a0, 32(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2556,12 +2556,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b6dc8: 0x10b6dc8: sll   a1, s2, 3
+// 0x010b7410: 0x10b7410: sll   a1, s2, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x010b6dcc: 0x10b6dcc: jal   0x1000a60 sll   s2, s2, 1
+// 0x010b7414: 0x10b7414: jal   0x1000a60 sll   s2, s2, 1
 	ldloc 7
 	ldc.i4.1
 	shl
@@ -2576,29 +2576,29 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010b6dd4: 0x10b6dd4: bne   v0, zero, 0x10b6dfc lui   a1, 0x20000
+// 0x010b741c: 0x10b741c: bne   v0, zero, 0x10b7444 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b6dfc
+	brtrue L_10b7444
 // --- basic block ---
-// 0x010b6ddc: 0x10b6ddc: lui   a3, 0x20000
+// 0x010b7424: 0x10b7424: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b6de0: 0x10b6de0: addiu a1, a1, 19640
+// 0x010b7428: 0x10b7428: addiu a1, a1, 20100
 	ldloc.2
-	ldc.i4 19640
+	ldc.i4 20100
 	add
 	stloc.2
-// 0x010b6de4: 0x10b6de4: addiu a3, a3, 19736
+// 0x010b742c: 0x10b742c: addiu a3, a3, 20196
 	ldloc 4
-	ldc.i4 19736
+	ldc.i4 20196
 	add
 	stloc 4
-// 0x010b6de8: 0x10b6de8: addiu a0, zero, 4
+// 0x010b7430: 0x10b7430: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b6dec: 0x10b6dec: jal   0x100449c addiu a2, zero, 259
+// 0x010b7434: 0x10b7434: jal   0x100449c addiu a2, zero, 259
 	ldc.i4 259
 	stloc.3
 	ldloc.0
@@ -2611,13 +2611,13 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010b6df4: 0x10b6df4: j	 0x10b6e60 addiu v0, zero, -1
+// 0x010b743c: 0x10b743c: j	 0x10b74a8 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_10b6e60
+	br L_10b74a8
 // --- basic block ---
-L_10b6dfc:
-// 0x010b6dfc: 0x10b6dfc: j	 0x10b6e14 sw    v0, 32(s0)
+L_10b7444:
+// 0x010b7444: 0x10b7444: j	 0x10b745c sw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2626,10 +2626,10 @@ L_10b6dfc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10b6e14
+	br L_10b745c
 // --- basic block ---
-L_10b6e04:
-// 0x010b6e04: 0x10b6e04: lw    v0, 32(s0)
+L_10b744c:
+// 0x010b744c: 0x10b744c: lw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2638,7 +2638,7 @@ L_10b6e04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6e08: 0x10b6e08: sw    v1, 8(s0)
+// 0x010b7450: 0x10b7450: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2647,20 +2647,20 @@ L_10b6e04:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b6e0c: 0x10b6e0c: addu  a0, v0, a0
+// 0x010b7454: 0x10b7454: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x010b6e10: 0x10b6e10: sw    zero, 0(a0)
+// 0x010b7458: 0x10b7458: sw    zero, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10b6e14:
-// 0x010b6e14: 0x10b6e14: lw    v0, 8(s0)
+L_10b745c:
+// 0x010b745c: 0x10b745c: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2669,28 +2669,28 @@ L_10b6e14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6e18: 0x10b6e18: sll   zero, zero, 0
-// 0x010b6e1c: 0x10b6e1c: sll   a0, v0, 2
+// 0x010b7460: 0x10b7460: sll   zero, zero, 0
+// 0x010b7464: 0x10b7464: sll   a0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010b6e20: 0x10b6e20: addiu v1, v0, 1
+// 0x010b7468: 0x10b7468: addiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 10
-// 0x010b6e24: 0x10b6e24: slt   v0, v0, s2
+// 0x010b746c: 0x10b746c: slt   v0, v0, s2
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010b6e28: 0x10b6e28: bne   v0, zero, 0x10b6e04 sll   zero, zero, 0
+// 0x010b7470: 0x10b7470: bne   v0, zero, 0x10b744c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b6e04
+	brtrue L_10b744c
 // --- basic block ---
-L_10b6e30:
-// 0x010b6e30: 0x10b6e30: lw    s2, 32(s0)
+L_10b7478:
+// 0x010b7478: 0x10b7478: lw    s2, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2699,7 +2699,7 @@ L_10b6e30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6e34: 0x10b6e34: jal   0x1000910 addiu a0, zero, 1024
+// 0x010b747c: 0x10b747c: jal   0x1000910 addiu a0, zero, 1024
 	ldc.i4 1024
 	stloc.1
 	ldloc.0
@@ -2712,12 +2712,12 @@ L_10b6e30:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010b6e3c: 0x10b6e3c: sll   s1, s1, 2
+// 0x010b7484: 0x10b7484: sll   s1, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x010b6e40: 0x10b6e40: lw    v1, 32(s0)
+// 0x010b7488: 0x10b7488: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2726,43 +2726,43 @@ L_10b6e30:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b6e44: 0x10b6e44: addu  s2, s2, s1
+// 0x010b748c: 0x10b748c: addu  s2, s2, s1
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-// 0x010b6e48: 0x10b6e48: sw    v0, 0(s2)
+// 0x010b7490: 0x10b7490: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b6e4c: 0x10b6e4c: addu  s1, v1, s1
+// 0x010b7494: 0x10b7494: addu  s1, v1, s1
 	ldloc 10
 	ldloc 9
 	add
 	stloc 9
-// 0x010b6e50: 0x10b6e50: lw    v0, 0(s1)
+// 0x010b7498: 0x10b7498: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b6e54: 0x10b6e54: sll   zero, zero, 0
-// 0x010b6e58: 0x10b6e58: sltiu v0, v0, 1
+// 0x010b749c: 0x10b749c: sll   zero, zero, 0
+// 0x010b74a0: 0x10b74a0: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010b6e5c: 0x10b6e5c: subu  v0, zero, v0
+// 0x010b74a4: 0x10b74a4: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-L_10b6e60:
-// 0x010b6e60: 0x10b6e60: lw    ra, 28(sp)
-// 0x010b6e64: 0x10b6e64: lw    s2, 24(sp)
+L_10b74a8:
+// 0x010b74a8: 0x10b74a8: lw    ra, 28(sp)
+// 0x010b74ac: 0x10b74ac: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2771,7 +2771,7 @@ L_10b6e60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6e68: 0x10b6e68: lw    s1, 20(sp)
+// 0x010b74b0: 0x10b74b0: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2780,7 +2780,7 @@ L_10b6e60:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6e6c: 0x10b6e6c: lw    s0, 16(sp)
+// 0x010b74b4: 0x10b74b4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2789,7 +2789,7 @@ L_10b6e60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6e70: 0x10b6e70: jr    ra addiu sp, sp, 32
+// 0x010b74b8: 0x10b74b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2801,7 +2801,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_db_allocate_items_10b6e78(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_allocate_items_10b74c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s0,int32 s3,int32 v1,int32 s1,int32 lo,int32 hi,int32 ra)
@@ -2854,12 +2854,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6e78: 0x10b6e78: addiu sp, sp, -40
+// 0x010b74c0: 0x10b74c0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b6e7c: 0x10b6e7c: sw    s2, 28(sp)
+// 0x010b74c4: 0x10b74c4: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2868,7 +2868,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b6e80: 0x10b6e80: lw    s2, 28(a0)
+// 0x010b74c8: 0x10b74c8: lw    s2, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2877,7 +2877,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6e84: 0x10b6e84: sw    s1, 24(sp)
+// 0x010b74cc: 0x10b74cc: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2886,12 +2886,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b6e88: 0x10b6e88: slt   v1, s2, a1
+// 0x010b74d0: 0x10b74d0: slt   v1, s2, a1
 	ldloc 7
 	ldloc.2
 	clt
 	stloc 10
-// 0x010b6e8c: 0x10b6e8c: sw    s0, 20(sp)
+// 0x010b74d4: 0x10b74d4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2900,8 +2900,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6e90: 0x10b6e90: sw    ra, 36(sp)
-// 0x010b6e94: 0x10b6e94: sw    s3, 32(sp)
+// 0x010b74d8: 0x10b74d8: sw    ra, 36(sp)
+// 0x010b74dc: 0x10b74dc: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2910,10 +2910,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b6e98: 0x10b6e98: addu  s0, a0, zero
+// 0x010b74e0: 0x10b74e0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b6e9c: 0x10b6e9c: lw    v0, 4(a0)
+// 0x010b74e4: 0x10b74e4: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2922,13 +2922,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6ea0: 0x10b6ea0: bne   v1, zero, 0x10b6f38 addu  s1, a1, zero
+// 0x010b74e8: 0x10b74e8: bne   v1, zero, 0x10b7580 addu  s1, a1, zero
 	ldloc 10
 	ldloc.2
 	stloc 11
-	brtrue L_10b6f38
+	brtrue L_10b7580
 // --- basic block ---
-// 0x010b6ea8: 0x10b6ea8: div   v0, s2
+// 0x010b74f0: 0x10b74f0: div   v0, s2
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -2937,24 +2937,24 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	rem
 	stloc 13
-// 0x010b6eac: 0x10b6eac: mfhi  hi
+// 0x010b74f4: 0x10b74f4: mfhi  hi
 	ldloc 13
 	stloc 9
-// 0x010b6eb0: 0x10b6eb0: mflo  lo
+// 0x010b74f8: 0x10b74f8: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x010b6eb4: 0x10b6eb4: beq   v0, zero, 0x10b6ec4 addu  a0, s0, zero
+// 0x010b74fc: 0x10b74fc: beq   v0, zero, 0x10b750c addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brfalse L_10b6ec4
+	brfalse L_10b750c
 // --- basic block ---
-// 0x010b6ebc: 0x10b6ebc: bne   s3, zero, 0x10b6ed8 sll   zero, zero, 0
+// 0x010b7504: 0x10b7504: bne   s3, zero, 0x10b7520 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10b6ed8
+	brtrue L_10b7520
 // --- basic block ---
-L_10b6ec4:
-// 0x010b6ec4: 0x10b6ec4: jal   0x10b6da0 addu  a1, s2, zero
+L_10b750c:
+// 0x010b750c: 0x10b750c: jal   0x10b73e8 addu  a1, s2, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -2962,23 +2962,23 @@ L_10b6ec4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_allocate_new_block_10b6da0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_allocate_new_block_10b73e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010b6ecc: 0x10b6ecc: addiu v1, zero, -1
+// 0x010b7514: 0x10b7514: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x010b6ed0: 0x10b6ed0: beq   v0, v1, 0x10b6f3c addiu v0, zero, -1
+// 0x010b7518: 0x10b7518: beq   v0, v1, 0x10b7584 addiu v0, zero, -1
 	ldloc 5
 	ldloc 10
 	ldc.i4.m1
 	stloc 5
-	beq  L_10b6f3c
+	beq  L_10b7584
 // --- basic block ---
-L_10b6ed8:
-// 0x010b6ed8: 0x10b6ed8: lw    v0, 20(s0)
+L_10b7520:
+// 0x010b7520: 0x10b7520: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2987,37 +2987,37 @@ L_10b6ed8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6edc: 0x10b6edc: sll   zero, zero, 0
-// 0x010b6ee0: 0x10b6ee0: mult  s1, v0
+// 0x010b7524: 0x10b7524: sll   zero, zero, 0
+// 0x010b7528: 0x10b7528: mult  s1, v0
 	ldloc 11
 	ldloc 5
 	mul
 	stloc 12
-// 0x010b6ee4: 0x10b6ee4: mflo  lo
+// 0x010b752c: 0x10b752c: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x010b6ee8: 0x10b6ee8: addu  s3, v0, s3
+// 0x010b7530: 0x10b7530: addu  s3, v0, s3
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x010b6eec: 0x10b6eec: sltiu s3, s3, 1025
+// 0x010b7534: 0x10b7534: sltiu s3, s3, 1025
 	ldloc 9
 	ldc.i4 1025
 	clt.un
 	stloc 9
-// 0x010b6ef0: 0x10b6ef0: bne   s3, zero, 0x10b6f24 addiu s2, s2, 1
+// 0x010b7538: 0x10b7538: bne   s3, zero, 0x10b756c addiu s2, s2, 1
 	ldloc 9
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_10b6f24
+	brtrue L_10b756c
 // --- basic block ---
-// 0x010b6ef8: 0x10b6ef8: addu  a0, s0, zero
+// 0x010b7540: 0x10b7540: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b6efc: 0x10b6efc: jal   0x10b6da0 addu  a1, s2, zero
+// 0x010b7544: 0x10b7544: jal   0x10b73e8 addu  a1, s2, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -3025,20 +3025,20 @@ L_10b6ed8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_allocate_new_block_10b6da0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_allocate_new_block_10b73e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010b6f04: 0x10b6f04: addiu v1, zero, -1
+// 0x010b754c: 0x10b754c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x010b6f08: 0x10b6f08: beq   v0, v1, 0x10b6f38 sll   zero, zero, 0
+// 0x010b7550: 0x10b7550: beq   v0, v1, 0x10b7580 sll   zero, zero, 0
 	ldloc 5
 	ldloc 10
-	beq  L_10b6f38
+	beq  L_10b7580
 // --- basic block ---
-// 0x010b6f10: 0x10b6f10: lw    v0, 28(s0)
+// 0x010b7558: 0x10b7558: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3047,16 +3047,16 @@ L_10b6ed8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6f14: 0x10b6f14: sll   zero, zero, 0
-// 0x010b6f18: 0x10b6f18: mult  s2, v0
+// 0x010b755c: 0x10b755c: sll   zero, zero, 0
+// 0x010b7560: 0x10b7560: mult  s2, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 12
-// 0x010b6f1c: 0x10b6f1c: mflo  lo
+// 0x010b7564: 0x10b7564: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x010b6f20: 0x10b6f20: sw    s2, 4(s0)
+// 0x010b7568: 0x10b7568: sw    s2, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3065,8 +3065,8 @@ L_10b6ed8:
 	add
 	ldloc 7
 	stelem.i4
-L_10b6f24:
-// 0x010b6f24: 0x10b6f24: lw    v0, 4(s0)
+L_10b756c:
+// 0x010b756c: 0x10b756c: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3075,13 +3075,13 @@ L_10b6f24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6f28: 0x10b6f28: sll   zero, zero, 0
-// 0x010b6f2c: 0x10b6f2c: addu  s1, s1, v0
+// 0x010b7570: 0x10b7570: sll   zero, zero, 0
+// 0x010b7574: 0x10b7574: addu  s1, s1, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x010b6f30: 0x10b6f30: j	 0x10b6f3c sw    s1, 4(s0)
+// 0x010b7578: 0x10b7578: j	 0x10b7584 sw    s1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3090,15 +3090,15 @@ L_10b6f24:
 	add
 	ldloc 11
 	stelem.i4
-	br L_10b6f3c
+	br L_10b7584
 // --- basic block ---
-L_10b6f38:
-// 0x010b6f38: 0x10b6f38: addiu v0, zero, -1
+L_10b7580:
+// 0x010b7580: 0x10b7580: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10b6f3c:
-// 0x010b6f3c: 0x10b6f3c: lw    ra, 36(sp)
-// 0x010b6f40: 0x10b6f40: lw    s3, 32(sp)
+L_10b7584:
+// 0x010b7584: 0x10b7584: lw    ra, 36(sp)
+// 0x010b7588: 0x10b7588: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3107,7 +3107,7 @@ L_10b6f3c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b6f44: 0x10b6f44: lw    s2, 28(sp)
+// 0x010b758c: 0x10b758c: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3116,7 +3116,7 @@ L_10b6f3c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6f48: 0x10b6f48: lw    s1, 24(sp)
+// 0x010b7590: 0x10b7590: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3125,7 +3125,7 @@ L_10b6f3c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b6f4c: 0x10b6f4c: lw    s0, 20(sp)
+// 0x010b7594: 0x10b7594: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3134,7 +3134,7 @@ L_10b6f3c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b6f50: 0x10b6f50: jr    ra addiu sp, sp, 40
+// 0x010b7598: 0x10b7598: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3146,7 +3146,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_db_get_item_10b6f58(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_get_item_10b75a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s5,int32 lo,int32 s4,int32 hi,int32 s2,int32 s6,int32 ra)
@@ -3208,12 +3208,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b6f58: 0x10b6f58: addiu sp, sp, -48
+// 0x010b75a0: 0x10b75a0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b6f5c: 0x10b6f5c: sw    s1, 20(sp)
+// 0x010b75a4: 0x10b75a4: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3222,7 +3222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b6f60: 0x10b6f60: lw    s1, 28(a0)
+// 0x010b75a8: 0x10b75a8: lw    s1, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3231,7 +3231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b6f64: 0x10b6f64: sw    s2, 24(sp)
+// 0x010b75ac: 0x10b75ac: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3240,7 +3240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b6f68: 0x10b6f68: div   a1, s1
+// 0x010b75b0: 0x10b75b0: div   a1, s1
 	ldloc.2
 	ldloc 10
 	ldloc.2
@@ -3249,10 +3249,10 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	rem
 	stloc 14
-// 0x010b6f6c: 0x10b6f6c: addu  s2, a1, zero
+// 0x010b75b4: 0x10b75b4: addu  s2, a1, zero
 	ldloc.2
 	stloc 15
-// 0x010b6f70: 0x10b6f70: lw    v0, 32(a0)
+// 0x010b75b8: 0x10b75b8: lw    v0, 32(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3261,7 +3261,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6f74: 0x10b6f74: sw    s3, 28(sp)
+// 0x010b75bc: 0x10b75bc: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3270,7 +3270,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b6f78: 0x10b6f78: sw    s4, 32(sp)
+// 0x010b75c0: 0x10b75c0: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3279,7 +3279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b6f7c: 0x10b6f7c: sw    s0, 16(sp)
+// 0x010b75c4: 0x10b75c4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3288,8 +3288,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b6f80: 0x10b6f80: sw    ra, 44(sp)
-// 0x010b6f84: 0x10b6f84: sw    s6, 40(sp)
+// 0x010b75c8: 0x10b75c8: sw    ra, 44(sp)
+// 0x010b75cc: 0x10b75cc: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3298,7 +3298,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b6f88: 0x10b6f88: sw    s5, 36(sp)
+// 0x010b75d0: 0x10b75d0: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3307,68 +3307,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b6f8c: 0x10b6f8c: addu  s0, a0, zero
+// 0x010b75d4: 0x10b75d4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b6f90: 0x10b6f90: mflo  lo
+// 0x010b75d8: 0x10b75d8: mflo  lo
 	ldloc 12
 	stloc.2
-// 0x010b6f94: 0x10b6f94: sll   s3, a1, 2
+// 0x010b75dc: 0x10b75dc: sll   s3, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x010b6f98: 0x10b6f98: addu  v0, v0, s3
+// 0x010b75e0: 0x10b75e0: addu  v0, v0, s3
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x010b6f9c: 0x10b6f9c: lw    v0, 0(v0)
+// 0x010b75e4: 0x10b75e4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b6fa0: 0x10b6fa0: sll   zero, zero, 0
-// 0x010b6fa4: 0x10b6fa4: bne   v0, zero, 0x10b701c addu  s4, a3, zero
+// 0x010b75e8: 0x10b75e8: sll   zero, zero, 0
+// 0x010b75ec: 0x10b75ec: bne   v0, zero, 0x10b7664 addu  s4, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 13
-	brtrue L_10b701c
+	brtrue L_10b7664
 // --- basic block ---
-// 0x010b6fac: 0x10b6fac: beq   a2, zero, 0x10b7058 addu  v0, zero, zero
+// 0x010b75f4: 0x10b75f4: beq   a2, zero, 0x10b76a0 addu  v0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10b7058
+	brfalse L_10b76a0
 // --- basic block ---
-// 0x010b6fb4: 0x10b6fb4: jal   0x10b6da0 sll   zero, zero, 0
+// 0x010b75fc: 0x10b75fc: jal   0x10b73e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_allocate_new_block_10b6da0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_allocate_new_block_10b73e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b6fbc: 0x10b6fbc: addiu v1, zero, -1
+// 0x010b7604: 0x10b7604: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b6fc0: 0x10b6fc0: beq   v0, v1, 0x10b7054 sll   zero, zero, 0
+// 0x010b7608: 0x10b7608: beq   v0, v1, 0x10b769c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_10b7054
+	beq  L_10b769c
 // --- basic block ---
-// 0x010b6fc8: 0x10b6fc8: beq   s4, zero, 0x10b701c addu  s5, zero, zero
+// 0x010b7610: 0x10b7610: beq   s4, zero, 0x10b7664 addu  s5, zero, zero
 	ldloc 13
 	ldc.i4.s 0
 	stloc 11
-	brfalse L_10b701c
+	brfalse L_10b7664
 // --- basic block ---
-// 0x010b6fd0: 0x10b6fd0: lw    v0, 32(s0)
+// 0x010b7618: 0x10b7618: lw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3377,24 +3377,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6fd4: 0x10b6fd4: sll   zero, zero, 0
-// 0x010b6fd8: 0x10b6fd8: addu  v0, v0, s3
+// 0x010b761c: 0x10b761c: sll   zero, zero, 0
+// 0x010b7620: 0x10b7620: addu  v0, v0, s3
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x010b6fdc: 0x10b6fdc: lw    s6, 0(v0)
+// 0x010b7624: 0x10b7624: lw    s6, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 16
-// 0x010b6fe0: 0x10b6fe0: j	 0x10b7008 sll   zero, zero, 0
-	br L_10b7008
+// 0x010b7628: 0x10b7628: j	 0x10b7650 sll   zero, zero, 0
+	br L_10b7650
 // --- basic block ---
-L_10b6fe8:
-// 0x010b6fe8: 0x10b6fe8: lw    v1, 24(s0)
+L_10b7630:
+// 0x010b7630: 0x10b7630: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3403,7 +3403,7 @@ L_10b6fe8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b6fec: 0x10b6fec: lw    v0, 16(s0)
+// 0x010b7634: 0x10b7634: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3412,25 +3412,25 @@ L_10b6fe8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b6ff0: 0x10b6ff0: mult  s5, v1
+// 0x010b7638: 0x10b7638: mult  s5, v1
 	ldloc 11
 	ldloc 7
 	mul
 	stloc 12
-// 0x010b6ff4: 0x10b6ff4: addiu s5, s5, 1
+// 0x010b763c: 0x10b763c: addiu s5, s5, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010b6ff8: 0x10b6ff8: mflo  lo
+// 0x010b7640: 0x10b7640: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x010b6ffc: 0x10b6ffc: addu  v0, v1, v0
+// 0x010b7644: 0x10b7644: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010b7000: 0x10b7000: jalr  s4 addu  a0, s6, v0
+// 0x010b7648: 0x10b7648: jalr  s4 addu  a0, s6, v0
 	ldloc 13
 	ldloc 16
 	ldloc 5
@@ -3446,8 +3446,8 @@ L_10b6fe8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b7008:
-// 0x010b7008: 0x10b7008: lw    v0, 28(s0)
+L_10b7650:
+// 0x010b7650: 0x10b7650: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3456,18 +3456,18 @@ L_10b7008:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b700c: 0x10b700c: sll   zero, zero, 0
-// 0x010b7010: 0x10b7010: slt   v0, s5, v0
+// 0x010b7654: 0x10b7654: sll   zero, zero, 0
+// 0x010b7658: 0x10b7658: slt   v0, s5, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b7014: 0x10b7014: bne   v0, zero, 0x10b6fe8 sll   zero, zero, 0
+// 0x010b765c: 0x10b765c: bne   v0, zero, 0x10b7630 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b6fe8
+	brtrue L_10b7630
 // --- basic block ---
-L_10b701c:
-// 0x010b701c: 0x10b701c: div   s2, s1
+L_10b7664:
+// 0x010b7664: 0x10b7664: div   s2, s1
 	ldloc 15
 	ldloc 10
 	ldloc 15
@@ -3476,7 +3476,7 @@ L_10b701c:
 	stloc 12
 	rem
 	stloc 14
-// 0x010b7020: 0x10b7020: lw    s1, 24(s0)
+// 0x010b7668: 0x10b7668: lw    s1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3485,7 +3485,7 @@ L_10b701c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b7024: 0x10b7024: lw    v0, 32(s0)
+// 0x010b766c: 0x10b766c: lw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3494,7 +3494,7 @@ L_10b701c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7028: 0x10b7028: lw    v1, 16(s0)
+// 0x010b7670: 0x10b7670: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3503,50 +3503,50 @@ L_10b701c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b702c: 0x10b702c: addu  s3, v0, s3
+// 0x010b7674: 0x10b7674: addu  s3, v0, s3
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x010b7030: 0x10b7030: lw    v0, 0(s3)
+// 0x010b7678: 0x10b7678: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b7034: 0x10b7034: mfhi  hi
+// 0x010b767c: 0x10b767c: mfhi  hi
 	ldloc 14
 	stloc.1
-// 0x010b7038: 0x10b7038: sll   zero, zero, 0
-// 0x010b703c: 0x10b703c: sll   zero, zero, 0
-// 0x010b7040: 0x10b7040: mult  a0, s1
+// 0x010b7680: 0x10b7680: sll   zero, zero, 0
+// 0x010b7684: 0x10b7684: sll   zero, zero, 0
+// 0x010b7688: 0x10b7688: mult  a0, s1
 	ldloc.1
 	ldloc 10
 	mul
 	stloc 12
-// 0x010b7044: 0x10b7044: mflo  lo
+// 0x010b768c: 0x10b768c: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x010b7048: 0x10b7048: addu  v1, a0, v1
+// 0x010b7690: 0x10b7690: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x010b704c: 0x10b704c: j	 0x10b7058 addu  v0, v0, v1
+// 0x010b7694: 0x10b7694: j	 0x10b76a0 addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-	br L_10b7058
+	br L_10b76a0
 // --- basic block ---
-L_10b7054:
-// 0x010b7054: 0x10b7054: addu  v0, zero, zero
+L_10b769c:
+// 0x010b769c: 0x10b769c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b7058:
-// 0x010b7058: 0x10b7058: lw    ra, 44(sp)
-// 0x010b705c: 0x10b705c: lw    s6, 40(sp)
+L_10b76a0:
+// 0x010b76a0: 0x10b76a0: lw    ra, 44(sp)
+// 0x010b76a4: 0x10b76a4: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3555,7 +3555,7 @@ L_10b7058:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b7060: 0x10b7060: lw    s5, 36(sp)
+// 0x010b76a8: 0x10b76a8: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3564,7 +3564,7 @@ L_10b7058:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b7064: 0x10b7064: lw    s4, 32(sp)
+// 0x010b76ac: 0x10b76ac: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3573,7 +3573,7 @@ L_10b7058:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b7068: 0x10b7068: lw    s3, 28(sp)
+// 0x010b76b0: 0x10b76b0: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3582,7 +3582,7 @@ L_10b7058:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b706c: 0x10b706c: lw    s2, 24(sp)
+// 0x010b76b4: 0x10b76b4: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3591,7 +3591,7 @@ L_10b7058:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b7070: 0x10b7070: lw    s1, 20(sp)
+// 0x010b76b8: 0x10b76b8: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3600,7 +3600,7 @@ L_10b7058:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b7074: 0x10b7074: lw    s0, 16(sp)
+// 0x010b76bc: 0x10b76bc: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3609,7 +3609,7 @@ L_10b7058:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7078: 0x10b7078: jr    ra addiu sp, sp, 48
+// 0x010b76c0: 0x10b76c0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3621,7 +3621,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 calloc_10b7080(int32,int32,int32,int32,int32)
+.method public static int32 calloc_10b76c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 lo,int32 v1)
@@ -3662,18 +3662,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7080: 0x10b7080: mult  a1, a0
+// 0x010b76c8: 0x10b76c8: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 9
-// 0x010b7084: 0x10b7084: addiu sp, sp, -32
+// 0x010b76cc: 0x10b76cc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b7088: 0x10b7088: sw    ra, 28(sp)
-// 0x010b708c: 0x10b708c: sw    s0, 24(sp)
+// 0x010b76d0: 0x10b76d0: sw    ra, 28(sp)
+// 0x010b76d4: 0x10b76d4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3682,13 +3682,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b7090: 0x10b7090: mflo  lo
+// 0x010b76d8: 0x10b76d8: mflo  lo
 	ldloc 9
 	stloc.3
-// 0x010b7094: 0x10b7094: mflo  lo
+// 0x010b76dc: 0x10b76dc: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x010b7098: 0x10b7098: jal   0x1000910 sw    a2, 16(sp)
+// 0x010b76e0: 0x10b76e0: jal   0x1000910 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3707,7 +3707,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010b70a0: 0x10b70a0: lw    a2, 16(sp)
+// 0x010b76e8: 0x10b76e8: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3716,13 +3716,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b70a4: 0x10b70a4: addu  a0, v0, zero
+// 0x010b76ec: 0x10b76ec: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010b70a8: 0x10b70a8: addu  a1, zero, zero
+// 0x010b76f0: 0x10b76f0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b70ac: 0x10b70ac: jal   0x100177c addu  s0, v0, zero
+// 0x010b76f4: 0x10b76f4: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -3734,11 +3734,11 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010b70b4: 0x10b70b4: lw    ra, 28(sp)
-// 0x010b70b8: 0x10b70b8: addu  v0, s0, zero
+// 0x010b76fc: 0x10b76fc: lw    ra, 28(sp)
+// 0x010b7700: 0x10b7700: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x010b70bc: 0x10b70bc: lw    s0, 24(sp)
+// 0x010b7704: 0x10b7704: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3747,7 +3747,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b70c0: 0x10b70c0: jr    ra addiu sp, sp, 32
+// 0x010b7708: 0x10b7708: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3759,7 +3759,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra,int32 lo,int32 hi)
@@ -3806,12 +3806,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b70c8: 0x10b70c8: addiu sp, sp, -32
+// 0x010b7710: 0x10b7710: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b70cc: 0x10b70cc: sw    s1, 24(sp)
+// 0x010b7714: 0x10b7714: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3820,17 +3820,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b70d0: 0x10b70d0: addiu a1, zero, 1
+// 0x010b7718: 0x10b7718: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010b70d4: 0x10b70d4: addu  s1, a0, zero
+// 0x010b771c: 0x10b771c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b70d8: 0x10b70d8: addiu a0, zero, 48
+// 0x010b7720: 0x10b7720: addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
-// 0x010b70dc: 0x10b70dc: sw    ra, 28(sp)
-// 0x010b70e0: 0x10b70e0: jal   0x10b7080 sw    s0, 20(sp)
+// 0x010b7724: 0x10b7724: sw    ra, 28(sp)
+// 0x010b7728: 0x10b7728: jal   0x10b76c8 sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3844,24 +3844,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::calloc_10b7080(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::calloc_10b76c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b70e8: 0x10b70e8: addu  s0, v0, zero
+// 0x010b7730: 0x10b7730: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010b70ec: 0x10b70ec: addiu v0, zero, 10
+// 0x010b7734: 0x10b7734: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x010b70f0: 0x10b70f0: addiu a0, zero, 10
+// 0x010b7738: 0x10b7738: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x010b70f4: 0x10b70f4: addiu a1, zero, 4
+// 0x010b773c: 0x10b773c: addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
-// 0x010b70f8: 0x10b70f8: jal   0x10b7080 sw    v0, 8(s0)
+// 0x010b7740: 0x10b7740: jal   0x10b76c8 sw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3875,19 +3875,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::calloc_10b7080(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::calloc_10b76c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b7100: 0x10b7100: lw    v1, 0(s1)
+// 0x010b7748: 0x10b7748: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b7104: 0x10b7104: sw    v0, 32(s0)
+// 0x010b774c: 0x10b774c: sw    v0, 32(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3896,14 +3896,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b7108: 0x10b7108: sw    v1, 0(s0)
+// 0x010b7750: 0x10b7750: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b710c: 0x10b710c: lw    v1, 4(s1)
+// 0x010b7754: 0x10b7754: lw    v1, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3912,10 +3912,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b7110: 0x10b7110: addiu a1, zero, 1024
+// 0x010b7758: 0x10b7758: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x010b7114: 0x10b7114: sw    v1, 20(s0)
+// 0x010b775c: 0x10b775c: sw    v1, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3924,7 +3924,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b7118: 0x10b7118: lw    v0, 8(s1)
+// 0x010b7760: 0x10b7760: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3933,23 +3933,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b711c: 0x10b711c: sll   zero, zero, 0
-// 0x010b7120: 0x10b7120: sll   a0, v0, 2
+// 0x010b7764: 0x10b7764: sll   zero, zero, 0
+// 0x010b7768: 0x10b7768: sll   a0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010b7124: 0x10b7124: addu  v1, a0, v1
+// 0x010b776c: 0x10b776c: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x010b7128: 0x10b7128: divu  a1, v1
+// 0x010b7770: 0x10b7770: divu  a1, v1
 	ldloc.2
 	ldloc 7
 	div.un
 	stloc 11
-// 0x010b712c: 0x10b712c: sw    v1, 24(s0)
+// 0x010b7774: 0x10b7774: sw    v1, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3958,7 +3958,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b7130: 0x10b7130: sw    v0, 12(s0)
+// 0x010b7778: 0x10b7778: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3967,7 +3967,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b7134: 0x10b7134: sw    a0, 16(s0)
+// 0x010b777c: 0x10b777c: sw    a0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3976,10 +3976,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b7138: 0x10b7138: mflo  lo
+// 0x010b7780: 0x10b7780: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x010b713c: 0x10b713c: beq   v0, zero, 0x10b7154 sw    v1, 28(s0)
+// 0x010b7784: 0x10b7784: beq   v0, zero, 0x10b779c sw    v1, 28(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 8
@@ -3989,12 +3989,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_10b7154
+	brfalse L_10b779c
 // --- basic block ---
-// 0x010b7144: 0x10b7144: addiu v0, zero, -1
+// 0x010b778c: 0x10b778c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b7148: 0x10b7148: sw    v0, 44(s0)
+// 0x010b7790: 0x10b7790: sw    v0, 44(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4003,7 +4003,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b714c: 0x10b714c: sw    zero, 36(s0)
+// 0x010b7794: 0x10b7794: sw    zero, 36(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4012,7 +4012,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b7150: 0x10b7150: sw    v0, 40(s0)
+// 0x010b7798: 0x10b7798: sw    v0, 40(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4021,8 +4021,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_10b7154:
-// 0x010b7154: 0x10b7154: lw    v0, 12(s1)
+L_10b779c:
+// 0x010b779c: 0x10b779c: lw    v0, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4031,8 +4031,8 @@ L_10b7154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7158: 0x10b7158: sll   zero, zero, 0
-// 0x010b715c: 0x10b715c: jalr  v0 addu  a0, s0, zero
+// 0x010b77a0: 0x10b77a0: sll   zero, zero, 0
+// 0x010b77a4: 0x10b77a4: jalr  v0 addu  a0, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
@@ -4046,60 +4046,60 @@ L_10b7154:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b7164: 0x10b7164: lw    v0, 0(s1)
+// 0x010b77ac: 0x10b77ac: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b7168: 0x10b7168: lui   v1, 0xe0000
+// 0x010b77b0: 0x10b77b0: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b716c: 0x10b716c: lui   a0, 0xe0000
+// 0x010b77b4: 0x10b77b4: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b7170: 0x10b7170: sll   v0, v0, 2
+// 0x010b77b8: 0x10b77b8: sll   v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010b7174: 0x10b7174: addiu v1, v1, -17808
+// 0x010b77bc: 0x10b77bc: addiu v1, v1, -17344
 	ldloc 7
-	ldc.i4 -17808
+	ldc.i4 -17344
 	add
 	stloc 7
-// 0x010b7178: 0x10b7178: addiu a0, a0, -17888
+// 0x010b77c0: 0x10b77c0: addiu a0, a0, -17424
 	ldloc.1
-	ldc.i4 -17888
+	ldc.i4 -17424
 	add
 	stloc.1
-// 0x010b717c: 0x10b717c: lw    ra, 28(sp)
-// 0x010b7180: 0x10b7180: addu  v1, v0, v1
+// 0x010b77c4: 0x10b77c4: lw    ra, 28(sp)
+// 0x010b77c8: 0x10b77c8: addu  v1, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x010b7184: 0x10b7184: addu  v0, v0, a0
+// 0x010b77cc: 0x10b77cc: addu  v0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-// 0x010b7188: 0x10b7188: sw    s1, 0(v0)
+// 0x010b77d0: 0x10b77d0: sw    s1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010b718c: 0x10b718c: sw    s0, 0(v1)
+// 0x010b77d4: 0x10b77d4: sw    s0, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x010b7190: 0x10b7190: lw    s1, 24(sp)
+// 0x010b77d8: 0x10b77d8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4108,7 +4108,7 @@ L_10b7154:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b7194: 0x10b7194: lw    s0, 20(sp)
+// 0x010b77dc: 0x10b77dc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4117,7 +4117,7 @@ L_10b7154:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7198: 0x10b7198: jr    ra addiu sp, sp, 32
+// 0x010b77e0: 0x10b77e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4129,7 +4129,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_db_add_record_10b71a0(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_add_record_10b77e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s3,int32 v1,int32 s2,int32 s1,int32 lo,int32 s4,int32 s5,int32 ra,int32 hi)
@@ -4188,12 +4188,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b71a0: 0x10b71a0: addiu sp, sp, -48
+// 0x010b77e8: 0x10b77e8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b71a4: 0x10b71a4: sw    s2, 28(sp)
+// 0x010b77ec: 0x10b77ec: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4202,7 +4202,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b71a8: 0x10b71a8: lw    v0, 28(a0)
+// 0x010b77f0: 0x10b77f0: lw    v0, 28(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4211,7 +4211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b71ac: 0x10b71ac: lw    s2, 4(a0)
+// 0x010b77f4: 0x10b77f4: lw    s2, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4220,7 +4220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b71b0: 0x10b71b0: sw    s3, 32(sp)
+// 0x010b77f8: 0x10b77f8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4229,7 +4229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b71b4: 0x10b71b4: div   s2, v0
+// 0x010b77fc: 0x10b77fc: div   s2, v0
 	ldloc 10
 	ldloc 6
 	ldloc 10
@@ -4238,7 +4238,7 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	rem
 	stloc 16
-// 0x010b71b8: 0x10b71b8: sw    s5, 40(sp)
+// 0x010b7800: 0x10b7800: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4247,7 +4247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b71bc: 0x10b71bc: sw    s4, 36(sp)
+// 0x010b7804: 0x10b7804: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4256,7 +4256,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b71c0: 0x10b71c0: sw    s1, 24(sp)
+// 0x010b7808: 0x10b7808: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4265,7 +4265,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b71c4: 0x10b71c4: sw    s0, 20(sp)
+// 0x010b780c: 0x10b780c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4274,54 +4274,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b71c8: 0x10b71c8: sw    ra, 44(sp)
-// 0x010b71cc: 0x10b71cc: addu  s0, a0, zero
+// 0x010b7810: 0x10b7810: sw    ra, 44(sp)
+// 0x010b7814: 0x10b7814: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b71d0: 0x10b71d0: addu  s4, a1, zero
+// 0x010b7818: 0x10b7818: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010b71d4: 0x10b71d4: addu  s1, a2, zero
+// 0x010b781c: 0x10b781c: addu  s1, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010b71d8: 0x10b71d8: mfhi  hi
+// 0x010b7820: 0x10b7820: mfhi  hi
 	ldloc 16
 	stloc 8
-// 0x010b71dc: 0x10b71dc: mflo  lo
+// 0x010b7824: 0x10b7824: mflo  lo
 	ldloc 12
 	stloc 10
-// 0x010b71e0: 0x10b71e0: bne   s3, zero, 0x10b7200 addu  s5, a3, zero
+// 0x010b7828: 0x10b7828: bne   s3, zero, 0x10b7848 addu  s5, a3, zero
 	ldloc 8
 	ldloc 4
 	stloc 14
-	brtrue L_10b7200
+	brtrue L_10b7848
 // --- basic block ---
-// 0x010b71e8: 0x10b71e8: mflo  lo
+// 0x010b7830: 0x10b7830: mflo  lo
 	ldloc 12
 	stloc.2
-// 0x010b71ec: 0x10b71ec: jal   0x10b6da0 sll   zero, zero, 0
+// 0x010b7834: 0x10b7834: jal   0x10b73e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_allocate_new_block_10b6da0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_allocate_new_block_10b73e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b71f4: 0x10b71f4: addiu a0, zero, -1
+// 0x010b783c: 0x10b783c: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010b71f8: 0x10b71f8: beq   v0, a0, 0x10b727c addiu v1, zero, -1
+// 0x010b7840: 0x10b7840: beq   v0, a0, 0x10b78c4 addiu v1, zero, -1
 	ldloc 6
 	ldloc.1
 	ldc.i4.m1
 	stloc 9
-	beq  L_10b727c
+	beq  L_10b78c4
 // --- basic block ---
-L_10b7200:
-// 0x010b7200: 0x10b7200: lw    v1, 24(s0)
+L_10b7848:
+// 0x010b7848: 0x10b7848: lw    v1, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4330,7 +4330,7 @@ L_10b7200:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b7204: 0x10b7204: lw    v0, 32(s0)
+// 0x010b784c: 0x10b784c: lw    v0, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4339,29 +4339,29 @@ L_10b7200:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7208: 0x10b7208: mult  s3, v1
+// 0x010b7850: 0x10b7850: mult  s3, v1
 	ldloc 8
 	ldloc 9
 	mul
 	stloc 12
-// 0x010b720c: 0x10b720c: sll   s2, s2, 2
+// 0x010b7854: 0x10b7854: sll   s2, s2, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x010b7210: 0x10b7210: addu  v0, v0, s2
+// 0x010b7858: 0x10b7858: addu  v0, v0, s2
 	ldloc 6
 	ldloc 10
 	add
 	stloc 6
-// 0x010b7214: 0x10b7214: lw    s2, 0(v0)
+// 0x010b785c: 0x10b785c: lw    s2, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010b7218: 0x10b7218: lw    v0, 12(s0)
+// 0x010b7860: 0x10b7860: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4370,24 +4370,24 @@ L_10b7200:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b721c: 0x10b721c: mflo  lo
+// 0x010b7864: 0x10b7864: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x010b7220: 0x10b7220: beq   v0, zero, 0x10b7238 addu  s3, s2, s3
+// 0x010b7868: 0x10b7868: beq   v0, zero, 0x10b7880 addu  s3, s2, s3
 	ldloc 6
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-	brfalse L_10b7238
+	brfalse L_10b7880
 // --- basic block ---
-// 0x010b7228: 0x10b7228: addu  a1, s4, zero
+// 0x010b7870: 0x10b7870: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010b722c: 0x10b722c: addu  a0, s3, zero
+// 0x010b7874: 0x10b7874: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010b7230: 0x10b7230: jal   0x1001800 addiu a2, zero, 4
+// 0x010b7878: 0x10b7878: jal   0x1001800 addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.1
@@ -4399,12 +4399,12 @@ L_10b7200:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10b7238:
-// 0x010b7238: 0x10b7238: beq   s1, zero, 0x10b7254 sll   zero, zero, 0
+L_10b7880:
+// 0x010b7880: 0x10b7880: beq   s1, zero, 0x10b789c sll   zero, zero, 0
 	ldloc 11
-	brfalse L_10b7254
+	brfalse L_10b789c
 // --- basic block ---
-// 0x010b7240: 0x10b7240: lw    a0, 16(s0)
+// 0x010b7888: 0x10b7888: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4413,7 +4413,7 @@ L_10b7238:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7244: 0x10b7244: lw    a2, 20(s0)
+// 0x010b788c: 0x10b788c: lw    a2, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4422,12 +4422,12 @@ L_10b7238:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b7248: 0x10b7248: addu  a0, s3, a0
+// 0x010b7890: 0x10b7890: addu  a0, s3, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc.1
-// 0x010b724c: 0x10b724c: jal   0x1001800 addu  a1, s1, zero
+// 0x010b7894: 0x10b7894: jal   0x1001800 addu  a1, s1, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -4439,20 +4439,20 @@ L_10b7238:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10b7254:
-// 0x010b7254: 0x10b7254: beq   s5, zero, 0x10b726c addu  a1, s3, zero
+L_10b789c:
+// 0x010b789c: 0x10b789c: beq   s5, zero, 0x10b78b4 addu  a1, s3, zero
 	ldloc 14
 	ldloc 8
 	stloc.2
-	brfalse L_10b726c
+	brfalse L_10b78b4
 // --- basic block ---
-// 0x010b725c: 0x10b725c: addu  a0, s0, zero
+// 0x010b78a4: 0x10b78a4: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010b7260: 0x10b7260: addiu a2, zero, -1
+// 0x010b78a8: 0x10b78a8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010b7264: 0x10b7264: jal   0x10b6b34 addiu a3, zero, 1
+// 0x010b78ac: 0x10b78ac: jal   0x10b717c addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -4460,13 +4460,13 @@ L_10b7254:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_write_record_10b6b34(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_write_record_10b717c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_10b726c:
-// 0x010b726c: 0x10b726c: lw    v1, 4(s0)
+L_10b78b4:
+// 0x010b78b4: 0x10b78b4: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4475,13 +4475,13 @@ L_10b726c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b7270: 0x10b7270: sll   zero, zero, 0
-// 0x010b7274: 0x10b7274: addiu v0, v1, 1
+// 0x010b78b8: 0x10b78b8: sll   zero, zero, 0
+// 0x010b78bc: 0x10b78bc: addiu v0, v1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010b7278: 0x10b7278: sw    v0, 4(s0)
+// 0x010b78c0: 0x10b78c0: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4490,12 +4490,12 @@ L_10b726c:
 	add
 	ldloc 6
 	stelem.i4
-L_10b727c:
-// 0x010b727c: 0x10b727c: lw    ra, 44(sp)
-// 0x010b7280: 0x10b7280: addu  v0, v1, zero
+L_10b78c4:
+// 0x010b78c4: 0x10b78c4: lw    ra, 44(sp)
+// 0x010b78c8: 0x10b78c8: addu  v0, v1, zero
 	ldloc 9
 	stloc 6
-// 0x010b7284: 0x10b7284: lw    s5, 40(sp)
+// 0x010b78cc: 0x10b78cc: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4504,7 +4504,7 @@ L_10b727c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b7288: 0x10b7288: lw    s4, 36(sp)
+// 0x010b78d0: 0x10b78d0: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4513,7 +4513,7 @@ L_10b727c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b728c: 0x10b728c: lw    s3, 32(sp)
+// 0x010b78d4: 0x10b78d4: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4522,7 +4522,7 @@ L_10b727c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7290: 0x10b7290: lw    s2, 28(sp)
+// 0x010b78d8: 0x10b78d8: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4531,7 +4531,7 @@ L_10b727c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b7294: 0x10b7294: lw    s1, 24(sp)
+// 0x010b78dc: 0x10b78dc: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4540,7 +4540,7 @@ L_10b727c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b7298: 0x10b7298: lw    s0, 20(sp)
+// 0x010b78e0: 0x10b78e0: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4549,7 +4549,7 @@ L_10b727c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b729c: 0x10b729c: jr    ra addiu sp, sp, 48
+// 0x010b78e4: 0x10b78e4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4561,7 +4561,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_db_add_item_10b72a4(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_add_item_10b78ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4596,7 +4596,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b72a4: 0x10b72a4: lw    v0, 12(a0)
+// 0x010b78ec: 0x10b78ec: lw    v0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4605,19 +4605,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b72a8: 0x10b72a8: addiu sp, sp, -32
+// 0x010b78f0: 0x10b78f0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b72ac: 0x10b72ac: sw    ra, 28(sp)
-// 0x010b72b0: 0x10b72b0: beq   v0, zero, 0x10b72fc addu  a3, a2, zero
+// 0x010b78f4: 0x10b78f4: sw    ra, 28(sp)
+// 0x010b78f8: 0x10b78f8: beq   v0, zero, 0x10b7944 addu  a3, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 4
-	brfalse L_10b72fc
+	brfalse L_10b7944
 // --- basic block ---
-// 0x010b72b8: 0x10b72b8: lw    v0, 40(a0)
+// 0x010b7900: 0x10b7900: lw    v0, 40(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4626,7 +4626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b72bc: 0x10b72bc: lw    v1, 36(a0)
+// 0x010b7904: 0x10b7904: lw    v1, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4635,21 +4635,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b72c0: 0x10b72c0: addiu v0, v0, 1
+// 0x010b7908: 0x10b7908: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010b72c4: 0x10b72c4: slt   v1, v1, v0
+// 0x010b790c: 0x10b790c: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010b72c8: 0x10b72c8: beq   v1, zero, 0x10b72d4 sll   zero, zero, 0
+// 0x010b7910: 0x10b7910: beq   v1, zero, 0x10b791c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b72d4
+	brfalse L_10b791c
 // --- basic block ---
-// 0x010b72d0: 0x10b72d0: sw    v0, 36(a0)
+// 0x010b7918: 0x10b7918: sw    v0, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4658,8 +4658,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_10b72d4:
-// 0x010b72d4: 0x10b72d4: lw    v0, 44(a0)
+L_10b791c:
+// 0x010b791c: 0x10b791c: lw    v0, 44(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4668,7 +4668,7 @@ L_10b72d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b72d8: 0x10b72d8: lw    v1, 36(a0)
+// 0x010b7920: 0x10b7920: lw    v1, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4677,21 +4677,21 @@ L_10b72d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b72dc: 0x10b72dc: addiu v0, v0, 1
+// 0x010b7924: 0x10b7924: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010b72e0: 0x10b72e0: slt   v1, v1, v0
+// 0x010b7928: 0x10b7928: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010b72e4: 0x10b72e4: beq   v1, zero, 0x10b72f0 sll   zero, zero, 0
+// 0x010b792c: 0x10b792c: beq   v1, zero, 0x10b7938 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b72f0
+	brfalse L_10b7938
 // --- basic block ---
-// 0x010b72ec: 0x10b72ec: sw    v0, 36(a0)
+// 0x010b7934: 0x10b7934: sw    v0, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4700,8 +4700,8 @@ L_10b72d4:
 	add
 	ldloc 5
 	stelem.i4
-L_10b72f0:
-// 0x010b72f0: 0x10b72f0: lw    v0, 36(a0)
+L_10b7938:
+// 0x010b7938: 0x10b7938: lw    v0, 36(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4710,8 +4710,8 @@ L_10b72f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b72f4: 0x10b72f4: sll   zero, zero, 0
-// 0x010b72f8: 0x10b72f8: sw    v0, 16(sp)
+// 0x010b793c: 0x10b793c: sll   zero, zero, 0
+// 0x010b7940: 0x10b7940: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4720,11 +4720,11 @@ L_10b72f0:
 	add
 	ldloc 5
 	stelem.i4
-L_10b72fc:
-// 0x010b72fc: 0x10b72fc: addu  a2, a1, zero
+L_10b7944:
+// 0x010b7944: 0x10b7944: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010b7300: 0x10b7300: jal   0x10b71a0 addiu a1, sp, 16
+// 0x010b7948: 0x10b7948: jal   0x10b77e8 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4734,14 +4734,14 @@ L_10b72fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_record_10b71a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_record_10b77e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7308: 0x10b7308: lw    ra, 28(sp)
-// 0x010b730c: 0x10b730c: sll   zero, zero, 0
-// 0x010b7310: 0x10b7310: jr    ra addiu sp, sp, 32
+// 0x010b7950: 0x10b7950: lw    ra, 28(sp)
+// 0x010b7954: 0x10b7954: sll   zero, zero, 0
+// 0x010b7958: 0x10b7958: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4753,7 +4753,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_db_delete_10b7318(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_delete_10b7960(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4797,13 +4797,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7318: 0x10b7318: addiu sp, sp, -1168
+// 0x010b7960: 0x10b7960: addiu sp, sp, -1168
 	ldloc.0
 	ldc.i4 -1168
 	add
 	stloc.0
-// 0x010b731c: 0x10b731c: sw    ra, 1164(sp)
-// 0x010b7320: 0x10b7320: sw    s1, 1156(sp)
+// 0x010b7964: 0x10b7964: sw    ra, 1164(sp)
+// 0x010b7968: 0x10b7968: sw    s1, 1156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4812,7 +4812,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b7324: 0x10b7324: sw    s0, 1152(sp)
+// 0x010b796c: 0x10b796c: sw    s0, 1152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4821,7 +4821,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b7328: 0x10b7328: sw    a0, 1144(sp)
+// 0x010b7970: 0x10b7970: sw    a0, 1144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4830,7 +4830,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010b732c: 0x10b732c: jal   0x1002f74 sw    s2, 1160(sp)
+// 0x010b7974: 0x10b7974: jal   0x1002f74 sw    s2, 1160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4849,7 +4849,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7334: 0x10b7334: lw    a0, 1144(sp)
+// 0x010b797c: 0x10b797c: lw    a0, 1144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4858,29 +4858,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7338: 0x10b7338: addiu s0, sp, 16
+// 0x010b7980: 0x10b7980: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x010b733c: 0x10b733c: lui   a2, 0x20000
+// 0x010b7984: 0x10b7984: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b7340: 0x10b7340: addu  s1, v0, zero
+// 0x010b7988: 0x10b7988: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b7344: 0x10b7344: addu  a3, a0, zero
+// 0x010b798c: 0x10b798c: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x010b7348: 0x10b7348: addiu a1, zero, 100
+// 0x010b7990: 0x10b7990: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010b734c: 0x10b734c: addu  a0, s0, zero
+// 0x010b7994: 0x10b7994: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b7350: 0x10b7350: jal   0x1000f9c addiu a2, a2, 19788
+// 0x010b7998: 0x10b7998: jal   0x1000f9c addiu a2, a2, 20248
 	ldloc.3
-	ldc.i4 19788
+	ldc.i4 20248
 	add
 	stloc.3
 	ldloc.0
@@ -4893,10 +4893,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7358: 0x10b7358: addu  a0, s1, zero
+// 0x010b79a0: 0x10b79a0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b735c: 0x10b735c: jal   0x104d690 addu  a1, s0, zero
+// 0x010b79a4: 0x10b79a4: jal   0x104d6a0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4904,16 +4904,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7364: 0x10b7364: beq   v0, zero, 0x10b73e8 sll   zero, zero, 0
+// 0x010b79ac: 0x10b79ac: beq   v0, zero, 0x10b7a30 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b73e8
+	brfalse L_10b7a30
 // --- basic block ---
-// 0x010b736c: 0x10b736c: jal   0x104c564 addiu s0, sp, 116
+// 0x010b79b4: 0x10b79b4: jal   0x104c574 addiu s0, sp, 116
 	ldloc.0
 	ldc.i4.s 116
 	add
@@ -4923,26 +4923,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7374: 0x10b7374: lui   a3, 0x10000
+// 0x010b79bc: 0x10b79bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010b7378: 0x10b7378: addu  a2, v0, zero
+// 0x010b79c0: 0x10b79c0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b737c: 0x10b737c: addiu a3, a3, -19928
+// 0x010b79c4: 0x10b79c4: addiu a3, a3, -19928
 	ldloc 4
 	ldc.i4 -19928
 	add
 	stloc 4
-// 0x010b7380: 0x10b7380: addiu a1, zero, 512
+// 0x010b79c8: 0x10b79c8: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010b7384: 0x10b7384: jal   0x104ccb4 addu  a0, s0, zero
+// 0x010b79cc: 0x10b79cc: jal   0x104ccc4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4950,34 +4950,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b738c: 0x10b738c: lui   a1, 0x20000
+// 0x010b79d4: 0x10b79d4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b7390: 0x10b7390: addu  a0, s0, zero
+// 0x010b79d8: 0x10b79d8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b7394: 0x10b7394: jal   0x104c464 addiu a1, a1, 19468
+// 0x010b79dc: 0x10b79dc: jal   0x104c474 addiu a1, a1, 19928
 	ldloc.2
-	ldc.i4 19468
+	ldc.i4 19928
 	add
 	stloc.2
-	call int32 Cibyl56::roadmap_path_list_104c464()
+	call int32 Cibyl56::roadmap_path_list_104c474()
 	stloc 5
 // --- basic block ---
-// 0x010b739c: 0x10b739c: j	 0x10b73c4 addiu s2, sp, 628
+// 0x010b79e4: 0x10b79e4: j	 0x10b7a0c addiu s2, sp, 628
 	ldloc.0
 	ldc.i4 628
 	add
 	stloc 10
-	br L_10b73c4
+	br L_10b7a0c
 // --- basic block ---
-L_10b73a4:
-// 0x010b73a4: 0x10b73a4: jal   0x104ccb4 sw    v0, 1144(sp)
+L_10b79ec:
+// 0x010b79ec: 0x10b79ec: jal   0x104ccc4 sw    v0, 1144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4991,15 +4991,15 @@ L_10b73a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b73ac: 0x10b73ac: addu  a0, zero, zero
+// 0x010b79f4: 0x10b79f4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b73b0: 0x10b73b0: jal   0x104da04 addu  a1, s2, zero
+// 0x010b79f8: 0x10b79f8: jal   0x104da14 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5007,12 +5007,12 @@ L_10b73a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b73b8: 0x10b73b8: lw    v0, 1144(sp)
+// 0x010b7a00: 0x10b7a00: lw    v0, 1144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5021,39 +5021,39 @@ L_10b73a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b73bc: 0x10b73bc: sll   zero, zero, 0
-// 0x010b73c0: 0x10b73c0: addiu v0, v0, 4
+// 0x010b7a04: 0x10b7a04: sll   zero, zero, 0
+// 0x010b7a08: 0x10b7a08: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-L_10b73c4:
-// 0x010b73c4: 0x10b73c4: lw    v1, 0(v0)
+L_10b7a0c:
+// 0x010b7a0c: 0x10b7a0c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b73c8: 0x10b73c8: addu  a0, s2, zero
+// 0x010b7a10: 0x10b7a10: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010b73cc: 0x10b73cc: addu  a3, v1, zero
+// 0x010b7a14: 0x10b7a14: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010b73d0: 0x10b73d0: addiu a1, zero, 512
+// 0x010b7a18: 0x10b7a18: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010b73d4: 0x10b73d4: bne   v1, zero, 0x10b73a4 addu  a2, s0, zero
+// 0x010b7a1c: 0x10b7a1c: bne   v1, zero, 0x10b79ec addu  a2, s0, zero
 	ldloc 7
 	ldloc 8
 	stloc.3
-	brtrue L_10b73a4
+	brtrue L_10b79ec
 // --- basic block ---
-// 0x010b73dc: 0x10b73dc: addu  a0, s1, zero
+// 0x010b7a24: 0x10b7a24: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b73e0: 0x10b73e0: jal   0x104da04 addiu a1, sp, 16
+// 0x010b7a28: 0x10b7a28: jal   0x104da14 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5063,14 +5063,14 @@ L_10b73c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b73e8:
-// 0x010b73e8: 0x10b73e8: lw    ra, 1164(sp)
-// 0x010b73ec: 0x10b73ec: lw    s2, 1160(sp)
+L_10b7a30:
+// 0x010b7a30: 0x10b7a30: lw    ra, 1164(sp)
+// 0x010b7a34: 0x10b7a34: lw    s2, 1160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5079,7 +5079,7 @@ L_10b73e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b73f0: 0x10b73f0: lw    s1, 1156(sp)
+// 0x010b7a38: 0x10b7a38: lw    s1, 1156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5088,7 +5088,7 @@ L_10b73e8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b73f4: 0x10b73f4: lw    s0, 1152(sp)
+// 0x010b7a3c: 0x10b7a3c: lw    s0, 1152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5097,7 +5097,7 @@ L_10b73e8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b73f8: 0x10b73f8: jr    ra addiu sp, sp, 1168
+// 0x010b7a40: 0x10b7a40: jr    ra addiu sp, sp, 1168
 	ldloc.0
 	ldc.i4 1168
 	add
@@ -5109,7 +5109,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_db_free_10b7400(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_free_10b7a48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s4,int32 s5,int32 s3,int32 ra,int32 v1)
@@ -5162,12 +5162,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7400: 0x10b7400: addiu sp, sp, -48
+// 0x010b7a48: 0x10b7a48: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b7404: 0x10b7404: sw    s5, 40(sp)
+// 0x010b7a4c: 0x10b7a4c: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5176,7 +5176,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b7408: 0x10b7408: sw    s1, 24(sp)
+// 0x010b7a50: 0x10b7a50: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5185,13 +5185,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b740c: 0x10b740c: lui   s5, 0xe0000
+// 0x010b7a54: 0x10b7a54: lui   s5, 0xe0000
 	ldc.i4 917504
 	stloc 11
-// 0x010b7410: 0x10b7410: lui   s1, 0xe0000
+// 0x010b7a58: 0x10b7a58: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b7414: 0x10b7414: sw    s3, 32(sp)
+// 0x010b7a5c: 0x10b7a5c: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5200,8 +5200,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b7418: 0x10b7418: sw    ra, 44(sp)
-// 0x010b741c: 0x10b741c: sw    s4, 36(sp)
+// 0x010b7a60: 0x10b7a60: sw    ra, 44(sp)
+// 0x010b7a64: 0x10b7a64: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5210,7 +5210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b7420: 0x10b7420: sw    s2, 28(sp)
+// 0x010b7a68: 0x10b7a68: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5219,7 +5219,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b7424: 0x10b7424: sw    s0, 20(sp)
+// 0x010b7a6c: 0x10b7a6c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5228,43 +5228,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b7428: 0x10b7428: addiu s1, s1, -17808
+// 0x010b7a70: 0x10b7a70: addiu s1, s1, -17344
 	ldloc 8
-	ldc.i4 -17808
+	ldc.i4 -17344
 	add
 	stloc 8
-// 0x010b742c: 0x10b742c: addiu s5, s5, -17728
+// 0x010b7a74: 0x10b7a74: addiu s5, s5, -17264
 	ldloc 11
-	ldc.i4 -17728
+	ldc.i4 -17264
 	add
 	stloc 11
-// 0x010b7430: 0x10b7430: addiu s3, zero, -1
+// 0x010b7a78: 0x10b7a78: addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 12
-L_10b7434:
-// 0x010b7434: 0x10b7434: lw    s0, 0(s1)
+L_10b7a7c:
+// 0x010b7a7c: 0x10b7a7c: lw    s0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b7438: 0x10b7438: sll   zero, zero, 0
-// 0x010b743c: 0x10b743c: bne   s0, zero, 0x10b7480 addu  s2, zero, zero
+// 0x010b7a80: 0x10b7a80: sll   zero, zero, 0
+// 0x010b7a84: 0x10b7a84: bne   s0, zero, 0x10b7ac8 addu  s2, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 9
-	brtrue L_10b7480
+	brtrue L_10b7ac8
 // --- basic block ---
-// 0x010b7444: 0x10b7444: j	 0x10b74a8 addiu s1, s1, 4
+// 0x010b7a8c: 0x10b7a8c: j	 0x10b7af0 addiu s1, s1, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	br L_10b74a8
+	br L_10b7af0
 // --- basic block ---
-L_10b744c:
-// 0x010b744c: 0x10b744c: lw    v0, 32(s0)
+L_10b7a94:
+// 0x010b7a94: 0x10b7a94: lw    v0, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5273,31 +5273,31 @@ L_10b744c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7450: 0x10b7450: addiu s2, s2, 1
+// 0x010b7a98: 0x10b7a98: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010b7454: 0x10b7454: addu  v0, v0, s4
+// 0x010b7a9c: 0x10b7a9c: addu  v0, v0, s4
 	ldloc 6
 	ldloc 10
 	add
 	stloc 6
-// 0x010b7458: 0x10b7458: lw    v0, 0(v0)
+// 0x010b7aa0: 0x10b7aa0: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b745c: 0x10b745c: sll   zero, zero, 0
-// 0x010b7460: 0x10b7460: beq   v0, zero, 0x10b7480 addu  a0, v0, zero
+// 0x010b7aa4: 0x10b7aa4: sll   zero, zero, 0
+// 0x010b7aa8: 0x10b7aa8: beq   v0, zero, 0x10b7ac8 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_10b7480
+	brfalse L_10b7ac8
 // --- basic block ---
-// 0x010b7468: 0x10b7468: jal   0x1000930 sll   zero, zero, 0
+// 0x010b7ab0: 0x10b7ab0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5308,7 +5308,7 @@ L_10b744c:
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x010b7470: 0x10b7470: lw    v0, 32(s0)
+// 0x010b7ab8: 0x10b7ab8: lw    v0, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5317,21 +5317,21 @@ L_10b744c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7474: 0x10b7474: sll   zero, zero, 0
-// 0x010b7478: 0x10b7478: addu  s4, v0, s4
+// 0x010b7abc: 0x10b7abc: sll   zero, zero, 0
+// 0x010b7ac0: 0x10b7ac0: addu  s4, v0, s4
 	ldloc 6
 	ldloc 10
 	add
 	stloc 10
-// 0x010b747c: 0x10b747c: sw    zero, 0(s4)
+// 0x010b7ac4: 0x10b7ac4: sw    zero, 0(s4)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10b7480:
-// 0x010b7480: 0x10b7480: lw    v0, 8(s0)
+L_10b7ac8:
+// 0x010b7ac8: 0x10b7ac8: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5340,21 +5340,21 @@ L_10b7480:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7484: 0x10b7484: sll   zero, zero, 0
-// 0x010b7488: 0x10b7488: slt   v0, s2, v0
+// 0x010b7acc: 0x10b7acc: sll   zero, zero, 0
+// 0x010b7ad0: 0x10b7ad0: slt   v0, s2, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x010b748c: 0x10b748c: bne   v0, zero, 0x10b744c sll   s4, s2, 2
+// 0x010b7ad4: 0x10b7ad4: bne   v0, zero, 0x10b7a94 sll   s4, s2, 2
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 10
-	brtrue L_10b744c
+	brtrue L_10b7a94
 // --- basic block ---
-// 0x010b7494: 0x10b7494: sw    s3, 40(s0)
+// 0x010b7adc: 0x10b7adc: sw    s3, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5363,7 +5363,7 @@ L_10b7480:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b7498: 0x10b7498: sw    zero, 4(s0)
+// 0x010b7ae0: 0x10b7ae0: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5372,7 +5372,7 @@ L_10b7480:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b749c: 0x10b749c: sw    zero, 36(s0)
+// 0x010b7ae4: 0x10b7ae4: sw    zero, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5381,7 +5381,7 @@ L_10b7480:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b74a0: 0x10b74a0: sw    s3, 44(s0)
+// 0x010b7ae8: 0x10b7ae8: sw    s3, 44(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5390,19 +5390,19 @@ L_10b7480:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b74a4: 0x10b74a4: addiu s1, s1, 4
+// 0x010b7aec: 0x10b7aec: addiu s1, s1, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_10b74a8:
-// 0x010b74a8: 0x10b74a8: bne   s1, s5, 0x10b7434 sll   zero, zero, 0
+L_10b7af0:
+// 0x010b7af0: 0x10b7af0: bne   s1, s5, 0x10b7a7c sll   zero, zero, 0
 	ldloc 8
 	ldloc 11
-	bne.un L_10b7434
+	bne.un L_10b7a7c
 // --- basic block ---
-// 0x010b74b0: 0x10b74b0: lw    ra, 44(sp)
-// 0x010b74b4: 0x10b74b4: lw    s5, 40(sp)
+// 0x010b7af8: 0x10b7af8: lw    ra, 44(sp)
+// 0x010b7afc: 0x10b7afc: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5411,7 +5411,7 @@ L_10b74a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b74b8: 0x10b74b8: lw    s4, 36(sp)
+// 0x010b7b00: 0x10b7b00: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5420,7 +5420,7 @@ L_10b74a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b74bc: 0x10b74bc: lw    s3, 32(sp)
+// 0x010b7b04: 0x10b7b04: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5429,7 +5429,7 @@ L_10b74a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b74c0: 0x10b74c0: lw    s2, 28(sp)
+// 0x010b7b08: 0x10b7b08: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5438,7 +5438,7 @@ L_10b74a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b74c4: 0x10b74c4: lw    s1, 24(sp)
+// 0x010b7b0c: 0x10b7b0c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5447,7 +5447,7 @@ L_10b74a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b74c8: 0x10b74c8: lw    s0, 20(sp)
+// 0x010b7b10: 0x10b7b10: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5456,7 +5456,7 @@ L_10b74a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b74cc: 0x10b74cc: jr    ra addiu sp, sp, 48
+// 0x010b7b14: 0x10b7b14: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5468,7 +5468,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_db_close_10b74d4(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_close_10b7b1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v0,int32 ra,int32 v1)
@@ -5512,12 +5512,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b74d4: 0x10b74d4: addiu sp, sp, -32
+// 0x010b7b1c: 0x10b7b1c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b74d8: 0x10b74d8: sw    s1, 20(sp)
+// 0x010b7b20: 0x10b7b20: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5526,10 +5526,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b74dc: 0x10b74dc: lui   s1, 0x0
+// 0x010b7b24: 0x10b7b24: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010b74e0: 0x10b74e0: lw    v0, 19288(s1)
+// 0x010b7b28: 0x10b7b28: lw    v0, 19288(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5538,7 +5538,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b74e4: 0x10b74e4: sw    s2, 24(sp)
+// 0x010b7b2c: 0x10b7b2c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5547,11 +5547,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b74e8: 0x10b74e8: addiu s2, zero, -1
+// 0x010b7b30: 0x10b7b30: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x010b74ec: 0x10b74ec: sw    ra, 28(sp)
-// 0x010b74f0: 0x10b74f0: beq   v0, s2, 0x10b7514 sw    s0, 16(sp)
+// 0x010b7b34: 0x10b7b34: sw    ra, 28(sp)
+// 0x010b7b38: 0x10b7b38: beq   v0, s2, 0x10b7b5c sw    s0, 16(sp)
 	ldloc 9
 	ldloc 8
 	ldloc 5
@@ -5562,9 +5562,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	beq  L_10b7514
+	beq  L_10b7b5c
 // --- basic block ---
-// 0x010b74f8: 0x10b74f8: jal   0x10b7400 lui   s0, 0xe0000
+// 0x010b7b40: 0x10b7b40: jal   0x10b7a48 lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 6
 	ldloc.0
@@ -5572,32 +5572,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_free_10b7400(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_free_10b7a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 9
 // --- basic block ---
-// 0x010b7500: 0x10b7500: lw    a0, -17896(s0)
+// 0x010b7b48: 0x10b7b48: lw    a0, -17432(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7504: 0x10b7504: jal   0x104d44c sll   zero, zero, 0
+// 0x010b7b4c: 0x10b7b4c: jal   0x104d45c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 9
 // --- basic block ---
-// 0x010b750c: 0x10b750c: sw    s2, 19288(s1)
+// 0x010b7b54: 0x10b7b54: sw    s2, 19288(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5606,18 +5606,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b7510: 0x10b7510: sw    zero, -17896(s0)
+// 0x010b7b58: 0x10b7b58: sw    zero, -17432(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10b7514:
-// 0x010b7514: 0x10b7514: lw    ra, 28(sp)
-// 0x010b7518: 0x10b7518: lw    s2, 24(sp)
+L_10b7b5c:
+// 0x010b7b5c: 0x10b7b5c: lw    ra, 28(sp)
+// 0x010b7b60: 0x10b7b60: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5626,7 +5626,7 @@ L_10b7514:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b751c: 0x10b751c: lw    s1, 20(sp)
+// 0x010b7b64: 0x10b7b64: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5635,7 +5635,7 @@ L_10b7514:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b7520: 0x10b7520: lw    s0, 16(sp)
+// 0x010b7b68: 0x10b7b68: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5644,7 +5644,7 @@ L_10b7514:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7524: 0x10b7524: jr    ra addiu sp, sp, 32
+// 0x010b7b6c: 0x10b7b6c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5656,7 +5656,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 editor_db_open_10b752c(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_open_10b7b74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s7,int32 s3,int32 s4,int32 s5,int32 s6,int32 s8,int32 lo,int32 ra)
@@ -5721,12 +5721,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b752c: 0x10b752c: addiu sp, sp, -1712
+// 0x010b7b74: 0x10b7b74: addiu sp, sp, -1712
 	ldloc.0
 	ldc.i4 -1712
 	add
 	stloc.0
-// 0x010b7530: 0x10b7530: sw    s6, 1696(sp)
+// 0x010b7b78: 0x10b7b78: sw    s6, 1696(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5735,18 +5735,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b7534: 0x10b7534: addu  s6, a0, zero
+// 0x010b7b7c: 0x10b7b7c: addu  s6, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010b7538: 0x10b7538: lui   a0, 0x10000
+// 0x010b7b80: 0x10b7b80: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b753c: 0x10b753c: addiu a0, a0, 3288
+// 0x010b7b84: 0x10b7b84: addiu a0, a0, 3284
 	ldloc.1
-	ldc.i4 3288
+	ldc.i4 3284
 	add
 	stloc.1
-// 0x010b7540: 0x10b7540: sw    s0, 1672(sp)
+// 0x010b7b88: 0x10b7b88: sw    s0, 1672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5755,8 +5755,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b7544: 0x10b7544: sw    ra, 1708(sp)
-// 0x010b7548: 0x10b7548: sw    s8, 1704(sp)
+// 0x010b7b8c: 0x10b7b8c: sw    ra, 1708(sp)
+// 0x010b7b90: 0x10b7b90: sw    s8, 1704(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5765,7 +5765,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b754c: 0x10b754c: sw    s7, 1700(sp)
+// 0x010b7b94: 0x10b7b94: sw    s7, 1700(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5774,7 +5774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b7550: 0x10b7550: sw    s5, 1692(sp)
+// 0x010b7b98: 0x10b7b98: sw    s5, 1692(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5783,7 +5783,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b7554: 0x10b7554: sw    s4, 1688(sp)
+// 0x010b7b9c: 0x10b7b9c: sw    s4, 1688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5792,7 +5792,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b7558: 0x10b7558: sw    s3, 1684(sp)
+// 0x010b7ba0: 0x10b7ba0: sw    s3, 1684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5801,7 +5801,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b755c: 0x10b755c: sw    s2, 1680(sp)
+// 0x010b7ba4: 0x10b7ba4: sw    s2, 1680(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5810,7 +5810,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b7560: 0x10b7560: jal   0x104d04c sw    s1, 1676(sp)
+// 0x010b7ba8: 0x10b7ba8: jal   0x104d05c sw    s1, 1676(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5824,37 +5824,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_preferred_104d04c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_preferred_104d05c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7568: 0x10b7568: bne   v0, zero, 0x10b7594 addu  s0, v0, zero
+// 0x010b7bb0: 0x10b7bb0: bne   v0, zero, 0x10b7bdc addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10b7594
+	brtrue L_10b7bdc
 // --- basic block ---
-// 0x010b7570: 0x10b7570: lui   a1, 0x20000
+// 0x010b7bb8: 0x10b7bb8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b7574: 0x10b7574: lui   a3, 0x20000
+// 0x010b7bbc: 0x10b7bbc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b7578: 0x10b7578: addiu a1, a1, 19640
+// 0x010b7bc0: 0x10b7bc0: addiu a1, a1, 20100
 	ldloc.2
-	ldc.i4 19640
+	ldc.i4 20100
 	add
 	stloc.2
-// 0x010b757c: 0x10b757c: addiu a3, a3, 19800
+// 0x010b7bc4: 0x10b7bc4: addiu a3, a3, 20260
 	ldloc 4
-	ldc.i4 19800
+	ldc.i4 20260
 	add
 	stloc 4
-// 0x010b7580: 0x10b7580: addiu a0, zero, 4
+// 0x010b7bc8: 0x10b7bc8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b7584: 0x10b7584: jal   0x100449c addiu a2, zero, 448
+// 0x010b7bcc: 0x10b7bcc: jal   0x100449c addiu a2, zero, 448
 	ldc.i4 448
 	stloc.3
 	ldloc.0
@@ -5867,35 +5867,35 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b758c: 0x10b758c: j	 0x10b7984 addiu v0, zero, -1
+// 0x010b7bd4: 0x10b7bd4: j	 0x10b7fcc addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_10b7984
+	br L_10b7fcc
 // --- basic block ---
-L_10b7594:
-// 0x010b7594: 0x10b7594: addiu s2, sp, 28
+L_10b7bdc:
+// 0x010b7bdc: 0x10b7bdc: addiu s2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 10
-// 0x010b7598: 0x10b7598: lui   a2, 0x20000
+// 0x010b7be0: 0x10b7be0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b759c: 0x10b759c: addu  a0, s2, zero
+// 0x010b7be4: 0x10b7be4: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010b75a0: 0x10b75a0: addiu a2, a2, 19788
+// 0x010b7be8: 0x10b7be8: addiu a2, a2, 20248
 	ldloc.3
-	ldc.i4 19788
+	ldc.i4 20248
 	add
 	stloc.3
-// 0x010b75a4: 0x10b75a4: addiu a1, zero, 100
+// 0x010b7bec: 0x10b7bec: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010b75a8: 0x10b75a8: addu  a3, s6, zero
+// 0x010b7bf0: 0x10b7bf0: addu  a3, s6, zero
 	ldloc 15
 	stloc 4
-// 0x010b75ac: 0x10b75ac: jal   0x1000f9c addiu s1, sp, 128
+// 0x010b7bf4: 0x10b7bf4: jal   0x1000f9c addiu s1, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -5910,16 +5910,16 @@ L_10b7594:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b75b4: 0x10b75b4: addu  a3, s2, zero
+// 0x010b7bfc: 0x10b7bfc: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x010b75b8: 0x10b75b8: addu  a2, s0, zero
+// 0x010b7c00: 0x10b7c00: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010b75bc: 0x10b75bc: addu  a0, s1, zero
+// 0x010b7c04: 0x10b7c04: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b75c0: 0x10b75c0: jal   0x104ccb4 addiu a1, zero, 512
+// 0x010b7c08: 0x10b7c08: jal   0x104ccc4 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -5927,15 +5927,15 @@ L_10b7594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b75c8: 0x10b75c8: addu  a1, s2, zero
+// 0x010b7c10: 0x10b7c10: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010b75cc: 0x10b75cc: jal   0x104d690 addu  a0, s0, zero
+// 0x010b7c14: 0x10b7c14: jal   0x104d6a0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5943,24 +5943,24 @@ L_10b7594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b75d4: 0x10b75d4: beq   v0, zero, 0x10b75f8 lui   s2, 0xe0000
+// 0x010b7c1c: 0x10b7c1c: beq   v0, zero, 0x10b7c40 lui   s2, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 10
-	brfalse L_10b75f8
+	brfalse L_10b7c40
 // --- basic block ---
-// 0x010b75dc: 0x10b75dc: lui   a1, 0x0
+// 0x010b7c24: 0x10b7c24: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b75e0: 0x10b75e0: addu  a0, s1, zero
+// 0x010b7c28: 0x10b7c28: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b75e4: 0x10b75e4: jal   0x104dd10 addiu a1, a1, 20776
+// 0x010b7c2c: 0x10b7c2c: jal   0x104dd20 addiu a1, a1, 20776
 	ldloc.2
 	ldc.i4 20776
 	add
@@ -5970,27 +5970,27 @@ L_10b7594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b75ec: 0x10b75ec: sw    v0, -17896(s2)
+// 0x010b7c34: 0x10b7c34: sw    v0, -17432(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b75f0: 0x10b75f0: j	 0x10b762c addiu v0, zero, 1
+// 0x010b7c38: 0x10b7c38: j	 0x10b7c74 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10b762c
+	br L_10b7c74
 // --- basic block ---
-L_10b75f8:
-// 0x010b75f8: 0x10b75f8: jal   0x104c6f4 addu  a0, s0, zero
+L_10b7c40:
+// 0x010b7c40: 0x10b7c40: jal   0x104c704 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5998,18 +5998,18 @@ L_10b75f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_create_104c6f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_create_104c704(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7600: 0x10b7600: lui   a1, 0x0
+// 0x010b7c48: 0x10b7c48: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b7604: 0x10b7604: addu  a0, s1, zero
+// 0x010b7c4c: 0x10b7c4c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b7608: 0x10b7608: jal   0x104dd10 addiu a1, a1, 28940
+// 0x010b7c50: 0x10b7c50: jal   0x104dd20 addiu a1, a1, 28940
 	ldloc.2
 	ldc.i4 28940
 	add
@@ -6019,31 +6019,31 @@ L_10b75f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7610: 0x10b7610: lui   a1, 0x20000
+// 0x010b7c58: 0x10b7c58: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b7614: 0x10b7614: addu  a0, v0, zero
+// 0x010b7c5c: 0x10b7c5c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b7618: 0x10b7618: addiu a1, a1, 29984
+// 0x010b7c60: 0x10b7c60: addiu a1, a1, 30448
 	ldloc.2
-	ldc.i4 29984
+	ldc.i4 30448
 	add
 	stloc.2
-// 0x010b761c: 0x10b761c: addiu a2, zero, 4
+// 0x010b7c64: 0x10b7c64: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x010b7620: 0x10b7620: jal   0x104d46c sw    v0, -17896(s2)
+// 0x010b7c68: 0x10b7c68: jal   0x104d47c sw    v0, -17432(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldloc 5
 	stelem.i4
@@ -6052,59 +6052,59 @@ L_10b75f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7628: 0x10b7628: addu  v0, zero, zero
+// 0x010b7c70: 0x10b7c70: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b762c:
-// 0x010b762c: 0x10b762c: lui   s8, 0xe0000
+L_10b7c74:
+// 0x010b7c74: 0x10b7c74: lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 16
-// 0x010b7630: 0x10b7630: lw    a0, -17896(s8)
+// 0x010b7c78: 0x10b7c78: lw    a0, -17432(s8)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7634: 0x10b7634: sll   zero, zero, 0
-// 0x010b7638: 0x10b7638: bne   a0, zero, 0x10b766c lui   a1, 0x20000
+// 0x010b7c7c: 0x10b7c7c: sll   zero, zero, 0
+// 0x010b7c80: 0x10b7c80: bne   a0, zero, 0x10b7cb4 lui   a1, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b766c
+	brtrue L_10b7cb4
 // --- basic block ---
-// 0x010b7640: 0x10b7640: lui   a3, 0x20000
+// 0x010b7c88: 0x10b7c88: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b7644: 0x10b7644: addiu v0, sp, 28
+// 0x010b7c8c: 0x10b7c8c: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x010b7648: 0x10b7648: addiu a1, a1, 19640
+// 0x010b7c90: 0x10b7c90: addiu a1, a1, 20100
 	ldloc.2
-	ldc.i4 19640
+	ldc.i4 20100
 	add
 	stloc.2
-// 0x010b764c: 0x10b764c: addiu a3, a3, 19824
+// 0x010b7c94: 0x10b7c94: addiu a3, a3, 20284
 	ldloc 4
-	ldc.i4 19824
+	ldc.i4 20284
 	add
 	stloc 4
-// 0x010b7650: 0x10b7650: addiu a0, zero, 4
+// 0x010b7c98: 0x10b7c98: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b7654: 0x10b7654: addiu a2, zero, 468
+// 0x010b7c9c: 0x10b7c9c: addiu a2, zero, 468
 	ldc.i4 468
 	stloc.3
-// 0x010b7658: 0x10b7658: sw    s0, 16(sp)
+// 0x010b7ca0: 0x10b7ca0: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6113,7 +6113,7 @@ L_10b762c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b765c: 0x10b765c: jal   0x100449c sw    v0, 20(sp)
+// 0x010b7ca4: 0x10b7ca4: jal   0x100449c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6132,24 +6132,24 @@ L_10b762c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7664: 0x10b7664: j	 0x10b7984 addiu v0, zero, -1
+// 0x010b7cac: 0x10b7cac: j	 0x10b7fcc addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_10b7984
+	br L_10b7fcc
 // --- basic block ---
-L_10b766c:
-// 0x010b766c: 0x10b766c: beq   v0, zero, 0x10b797c lui   v0, 0x0
+L_10b7cb4:
+// 0x010b7cb4: 0x10b7cb4: beq   v0, zero, 0x10b7fc4 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10b797c
+	brfalse L_10b7fc4
 // --- basic block ---
-// 0x010b7674: 0x10b7674: addiu a1, sp, 24
+// 0x010b7cbc: 0x10b7cbc: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010b7678: 0x10b7678: jal   0x104d494 addiu a2, zero, 4
+// 0x010b7cc0: 0x10b7cc0: jal   0x104d4a4 addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -6157,22 +6157,22 @@ L_10b766c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_read_104d494(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_read_104d4a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7680: 0x10b7680: addiu v1, zero, 4
+// 0x010b7cc8: 0x10b7cc8: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x010b7684: 0x10b7684: bne   v0, v1, 0x10b7914 lui   v0, 0x3a2e0000
+// 0x010b7ccc: 0x10b7ccc: bne   v0, v1, 0x10b7f5c lui   v0, 0x3a2e0000
 	ldloc 5
 	ldloc 6
 	ldc.i4 976093184
 	stloc 5
-	bne.un L_10b7914
+	bne.un L_10b7f5c
 // --- basic block ---
-// 0x010b768c: 0x10b768c: lw    v1, 24(sp)
+// 0x010b7cd4: 0x10b7cd4: lw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6181,43 +6181,43 @@ L_10b766c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7690: 0x10b7690: ori   v0, v0, 1
+// 0x010b7cd8: 0x10b7cd8: ori   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 5
-// 0x010b7694: 0x10b7694: bne   v1, v0, 0x10b7914 addu  s7, zero, zero
+// 0x010b7cdc: 0x10b7cdc: bne   v1, v0, 0x10b7f5c addu  s7, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	bne.un L_10b7914
+	bne.un L_10b7f5c
 // --- basic block ---
-// 0x010b769c: 0x10b769c: addiu s3, sp, 640
+// 0x010b7ce4: 0x10b7ce4: addiu s3, sp, 640
 	ldloc.0
 	ldc.i4 640
 	add
 	stloc 12
-L_10b76a0:
-// 0x010b76a0: 0x10b76a0: addiu v0, zero, 1024
+L_10b7ce8:
+// 0x010b7ce8: 0x10b7ce8: addiu v0, zero, 1024
 	ldc.i4 1024
 	stloc 5
-L_10b76a4:
-// 0x010b76a4: 0x10b76a4: lw    a0, -17896(s8)
+L_10b7cec:
+// 0x010b7cec: 0x10b7cec: lw    a0, -17432(s8)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b76a8: 0x10b76a8: addu  a1, s3, s7
+// 0x010b7cf0: 0x10b7cf0: addu  a1, s3, s7
 	ldloc 12
 	ldloc 11
 	add
 	stloc.2
-// 0x010b76ac: 0x10b76ac: jal   0x104d494 subu  a2, v0, s7
+// 0x010b7cf4: 0x10b7cf4: jal   0x104d4a4 subu  a2, v0, s7
 	ldloc 5
 	ldloc 11
 	sub
@@ -6227,29 +6227,29 @@ L_10b76a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_read_104d494(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_read_104d4a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b76b4: 0x10b76b4: blez  v0, 0x10b7978 addu  s7, v0, s7
+// 0x010b7cfc: 0x10b7cfc: blez  v0, 0x10b7fc0 addu  s7, v0, s7
 	ldloc 5
 	ldloc 5
 	ldloc 11
 	add
 	stloc 11
 	ldc.i4.s 0
-	ble L_10b7978
+	ble L_10b7fc0
 // --- basic block ---
-// 0x010b76bc: 0x10b76bc: addu  v1, s7, s3
+// 0x010b7d04: 0x10b7d04: addu  v1, s7, s3
 	ldloc 11
 	ldloc 12
 	add
 	stloc 6
-// 0x010b76c0: 0x10b76c0: addu  a1, s3, zero
+// 0x010b7d08: 0x10b7d08: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010b76c4: 0x10b76c4: j	 0x10b77b0 sw    v1, 1664(sp)
+// 0x010b7d0c: 0x10b7d0c: j	 0x10b7df8 sw    v1, 1664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6258,29 +6258,29 @@ L_10b76a4:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10b77b0
+	br L_10b7df8
 // --- basic block ---
-L_10b76cc:
-// 0x010b76cc: 0x10b76cc: beq   s4, a0, 0x10b7720 addu  a0, s1, zero
+L_10b7d14:
+// 0x010b7d14: 0x10b7d14: beq   s4, a0, 0x10b7d68 addu  a0, s1, zero
 	ldloc 13
 	ldloc.1
 	ldloc 9
 	stloc.1
-	beq  L_10b7720
+	beq  L_10b7d68
 // --- basic block ---
-// 0x010b76d4: 0x10b76d4: jal   0x10b69cc addu  a1, s4, zero
+// 0x010b7d1c: 0x10b7d1c: jal   0x10b7014 addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_get_record_10b69cc(int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_get_record_10b7014(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b76dc: 0x10b76dc: lw    v1, 12(s1)
+// 0x010b7d24: 0x10b7d24: lw    v1, 12(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6289,19 +6289,19 @@ L_10b76cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b76e0: 0x10b76e0: sll   zero, zero, 0
-// 0x010b76e4: 0x10b76e4: beq   v1, zero, 0x10b7708 sll   zero, zero, 0
+// 0x010b7d28: 0x10b7d28: sll   zero, zero, 0
+// 0x010b7d2c: 0x10b7d2c: beq   v1, zero, 0x10b7d50 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b7708
+	brfalse L_10b7d50
 // --- basic block ---
-// 0x010b76ec: 0x10b76ec: lw    v1, 0(v0)
+// 0x010b7d34: 0x10b7d34: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b76f0: 0x10b76f0: lw    a0, 36(s1)
+// 0x010b7d38: 0x10b7d38: lw    a0, 36(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6310,17 +6310,17 @@ L_10b76cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b76f4: 0x10b76f4: sll   zero, zero, 0
-// 0x010b76f8: 0x10b76f8: slt   a0, a0, v1
+// 0x010b7d3c: 0x10b7d3c: sll   zero, zero, 0
+// 0x010b7d40: 0x10b7d40: slt   a0, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x010b76fc: 0x10b76fc: beq   a0, zero, 0x10b7708 sll   zero, zero, 0
+// 0x010b7d44: 0x10b7d44: beq   a0, zero, 0x10b7d50 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10b7708
+	brfalse L_10b7d50
 // --- basic block ---
-// 0x010b7704: 0x10b7704: sw    v1, 36(s1)
+// 0x010b7d4c: 0x10b7d4c: sw    v1, 36(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6329,8 +6329,8 @@ L_10b76cc:
 	add
 	ldloc 6
 	stelem.i4
-L_10b7708:
-// 0x010b7708: 0x10b7708: lw    a2, 24(s1)
+L_10b7d50:
+// 0x010b7d50: 0x10b7d50: lw    a2, 24(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6339,10 +6339,10 @@ L_10b7708:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b770c: 0x10b770c: addu  a0, v0, zero
+// 0x010b7d54: 0x10b7d54: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b7710: 0x10b7710: jal   0x1001800 addu  a1, s0, zero
+// 0x010b7d58: 0x10b7d58: jal   0x1001800 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -6354,11 +6354,11 @@ L_10b7708:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7718: 0x10b7718: j	 0x10b776c sll   zero, zero, 0
-	br L_10b776c
+// 0x010b7d60: 0x10b7d60: j	 0x10b7db4 sll   zero, zero, 0
+	br L_10b7db4
 // --- basic block ---
-L_10b7720:
-// 0x010b7720: 0x10b7720: lw    a2, 16(s1)
+L_10b7d68:
+// 0x010b7d68: 0x10b7d68: lw    a2, 16(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6367,16 +6367,16 @@ L_10b7720:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b7724: 0x10b7724: sll   zero, zero, 0
-// 0x010b7728: 0x10b7728: addu  a2, s0, a2
+// 0x010b7d6c: 0x10b7d6c: sll   zero, zero, 0
+// 0x010b7d70: 0x10b7d70: addu  a2, s0, a2
 	ldloc 8
 	ldloc.3
 	add
 	stloc.3
-// 0x010b772c: 0x10b772c: addu  a1, s0, zero
+// 0x010b7d74: 0x10b7d74: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010b7730: 0x10b7730: jal   0x10b71a0 addu  a3, zero, zero
+// 0x010b7d78: 0x10b7d78: jal   0x10b77e8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6384,17 +6384,17 @@ L_10b7720:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_add_record_10b71a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_add_record_10b77e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7738: 0x10b7738: beq   v0, s4, 0x10b7914 sll   zero, zero, 0
+// 0x010b7d80: 0x10b7d80: beq   v0, s4, 0x10b7f5c sll   zero, zero, 0
 	ldloc 5
 	ldloc 13
-	beq  L_10b7914
+	beq  L_10b7f5c
 // --- basic block ---
-// 0x010b7740: 0x10b7740: lw    v0, 12(s1)
+// 0x010b7d88: 0x10b7d88: lw    v0, 12(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6403,19 +6403,19 @@ L_10b7720:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7744: 0x10b7744: sll   zero, zero, 0
-// 0x010b7748: 0x10b7748: beq   v0, zero, 0x10b776c sll   zero, zero, 0
+// 0x010b7d8c: 0x10b7d8c: sll   zero, zero, 0
+// 0x010b7d90: 0x10b7d90: beq   v0, zero, 0x10b7db4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b776c
+	brfalse L_10b7db4
 // --- basic block ---
-// 0x010b7750: 0x10b7750: lw    v0, 0(s0)
+// 0x010b7d98: 0x10b7d98: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b7754: 0x10b7754: lw    v1, 36(s1)
+// 0x010b7d9c: 0x10b7d9c: lw    v1, 36(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6424,17 +6424,17 @@ L_10b7720:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7758: 0x10b7758: sll   zero, zero, 0
-// 0x010b775c: 0x10b775c: slt   v1, v1, v0
+// 0x010b7da0: 0x10b7da0: sll   zero, zero, 0
+// 0x010b7da4: 0x10b7da4: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x010b7760: 0x10b7760: beq   v1, zero, 0x10b776c sll   zero, zero, 0
+// 0x010b7da8: 0x10b7da8: beq   v1, zero, 0x10b7db4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10b776c
+	brfalse L_10b7db4
 // --- basic block ---
-// 0x010b7768: 0x10b7768: sw    v0, 36(s1)
+// 0x010b7db0: 0x10b7db0: sw    v0, 36(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6443,8 +6443,8 @@ L_10b7720:
 	add
 	ldloc 5
 	stelem.i4
-L_10b776c:
-// 0x010b776c: 0x10b776c: lw    v0, 24(s1)
+L_10b7db4:
+// 0x010b7db4: 0x10b7db4: lw    v0, 24(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6453,29 +6453,29 @@ L_10b776c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7770: 0x10b7770: addiu s5, s5, 1
+// 0x010b7db8: 0x10b7db8: addiu s5, s5, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x010b7774: 0x10b7774: addu  s0, s0, v0
+// 0x010b7dbc: 0x10b7dbc: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_10b7778:
-// 0x010b7778: 0x10b7778: slt   v0, s5, s2
+L_10b7dc0:
+// 0x010b7dc0: 0x10b7dc0: slt   v0, s5, s2
 	ldloc 14
 	ldloc 10
 	clt
 	stloc 5
-// 0x010b777c: 0x10b777c: bne   v0, zero, 0x10b76cc addiu a0, zero, -1
+// 0x010b7dc4: 0x10b7dc4: bne   v0, zero, 0x10b7d14 addiu a0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc.1
-	brtrue L_10b76cc
+	brtrue L_10b7d14
 // --- basic block ---
-// 0x010b7784: 0x10b7784: lw    v0, 24(s1)
+// 0x010b7dcc: 0x10b7dcc: lw    v0, 24(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6484,44 +6484,44 @@ L_10b7778:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7788: 0x10b7788: sll   zero, zero, 0
-// 0x010b778c: 0x10b778c: mult  s2, v0
+// 0x010b7dd0: 0x10b7dd0: sll   zero, zero, 0
+// 0x010b7dd4: 0x10b7dd4: mult  s2, v0
 	ldloc 10
 	ldloc 5
 	mul
 	stloc 17
-// 0x010b7790: 0x10b7790: mflo  lo
+// 0x010b7dd8: 0x10b7dd8: mflo  lo
 	ldloc 17
 	stloc 10
-// 0x010b7794: 0x10b7794: andi  s2, s2, 3
+// 0x010b7ddc: 0x10b7ddc: andi  s2, s2, 3
 	ldloc 10
 	ldc.i4.3
 	and
 	stloc 10
-// 0x010b7798: 0x10b7798: beq   s2, zero, 0x10b77b0 addu  a1, s0, zero
+// 0x010b7de0: 0x10b7de0: beq   s2, zero, 0x10b7df8 addu  a1, s0, zero
 	ldloc 10
 	ldloc 8
 	stloc.2
-	brfalse L_10b77b0
+	brfalse L_10b7df8
 // --- basic block ---
-// 0x010b77a0: 0x10b77a0: addiu v0, zero, 4
+// 0x010b7de8: 0x10b7de8: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010b77a4: 0x10b77a4: subu  s2, v0, s2
+// 0x010b7dec: 0x10b7dec: subu  s2, v0, s2
 	ldloc 5
 	ldloc 10
 	sub
 	stloc 10
-// 0x010b77a8: 0x10b77a8: addu  s0, s0, s2
+// 0x010b7df0: 0x10b7df0: addu  s0, s0, s2
 	ldloc 8
 	ldloc 10
 	add
 	stloc 8
-// 0x010b77ac: 0x10b77ac: addu  a1, s0, zero
+// 0x010b7df4: 0x10b7df4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-L_10b77b0:
-// 0x010b77b0: 0x10b77b0: lw    v1, 1664(sp)
+L_10b7df8:
+// 0x010b7df8: 0x10b7df8: lw    v1, 1664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6530,273 +6530,273 @@ L_10b77b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b77b4: 0x10b77b4: sll   zero, zero, 0
-// 0x010b77b8: 0x10b77b8: subu  a0, v1, a1
+// 0x010b7dfc: 0x10b7dfc: sll   zero, zero, 0
+// 0x010b7e00: 0x10b7e00: subu  a0, v1, a1
 	ldloc 6
 	ldloc.2
 	sub
 	stloc.1
-// 0x010b77bc: 0x10b77bc: sltiu v0, a0, 4
+// 0x010b7e04: 0x10b7e04: sltiu v0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	clt.un
 	stloc 5
-// 0x010b77c0: 0x10b77c0: bne   v0, zero, 0x10b78f4 addiu s0, a1, 4
+// 0x010b7e08: 0x10b7e08: bne   v0, zero, 0x10b7f3c addiu s0, a1, 4
 	ldloc 5
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc 8
-	brtrue L_10b78f4
+	brtrue L_10b7f3c
 // --- basic block ---
-// 0x010b77c8: 0x10b77c8: lw    v1, 0(a1)
+// 0x010b7e10: 0x10b7e10: lw    v1, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b77cc: 0x10b77cc: addiu v0, a0, -4
+// 0x010b7e14: 0x10b7e14: addiu v0, a0, -4
 	ldloc.1
 	ldc.i4.s -4
 	add
 	stloc 5
-// 0x010b77d0: 0x10b77d0: bgez  v1, 0x10b77f8 addiu s2, zero, 1
+// 0x010b7e18: 0x10b7e18: bgez  v1, 0x10b7e40 addiu s2, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 10
 	ldc.i4.s 0
-	bge L_10b77f8
+	bge L_10b7e40
 // --- basic block ---
-// 0x010b77d8: 0x10b77d8: sltiu v0, v0, 4
+// 0x010b7e20: 0x10b7e20: sltiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	clt.un
 	stloc 5
-// 0x010b77dc: 0x10b77dc: bne   v0, zero, 0x10b78f4 addiu v0, a0, -8
+// 0x010b7e24: 0x10b7e24: bne   v0, zero, 0x10b7f3c addiu v0, a0, -8
 	ldloc 5
 	ldloc.1
 	ldc.i4.s -8
 	add
 	stloc 5
-	brtrue L_10b78f4
+	brtrue L_10b7f3c
 // --- basic block ---
-// 0x010b77e4: 0x10b77e4: lui   a0, 0x7fff0000
+// 0x010b7e2c: 0x10b7e2c: lui   a0, 0x7fff0000
 	ldc.i4 2147418112
 	stloc.1
-// 0x010b77e8: 0x10b77e8: ori   a0, a0, 65535
+// 0x010b7e30: 0x10b7e30: ori   a0, a0, 65535
 	ldloc.1
 	ldc.i4 65535
 	or
 	stloc.1
-// 0x010b77ec: 0x10b77ec: lw    s2, 0(s0)
+// 0x010b7e34: 0x10b7e34: lw    s2, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010b77f0: 0x10b77f0: and   v1, v1, a0
+// 0x010b7e38: 0x10b7e38: and   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	and
 	stloc 6
-// 0x010b77f4: 0x10b77f4: addiu s0, a1, 8
+// 0x010b7e3c: 0x10b7e3c: addiu s0, a1, 8
 	ldloc.2
 	ldc.i4.8
 	add
 	stloc 8
-L_10b77f8:
-// 0x010b77f8: 0x10b77f8: lui   a2, 0x40000000
+L_10b7e40:
+// 0x010b7e40: 0x10b7e40: lui   a2, 0x40000000
 	ldc.i4 1073741824
 	stloc.3
-// 0x010b77fc: 0x10b77fc: and   a0, v1, a2
+// 0x010b7e44: 0x10b7e44: and   a0, v1, a2
 	ldloc 6
 	ldloc.3
 	and
 	stloc.1
-// 0x010b7800: 0x10b7800: beq   a0, zero, 0x10b7828 addiu s4, zero, -1
+// 0x010b7e48: 0x10b7e48: beq   a0, zero, 0x10b7e70 addiu s4, zero, -1
 	ldloc.1
 	ldc.i4.m1
 	stloc 13
-	brfalse L_10b7828
+	brfalse L_10b7e70
 // --- basic block ---
-// 0x010b7808: 0x10b7808: sltiu a0, v0, 4
+// 0x010b7e50: 0x10b7e50: sltiu a0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	clt.un
 	stloc.1
-// 0x010b780c: 0x10b780c: bne   a0, zero, 0x10b78f4 lui   a0, 0xbfff0000
+// 0x010b7e54: 0x10b7e54: bne   a0, zero, 0x10b7f3c lui   a0, 0xbfff0000
 	ldloc.1
 	ldc.i4 3221159936
 	stloc.1
-	brtrue L_10b78f4
+	brtrue L_10b7f3c
 // --- basic block ---
-// 0x010b7814: 0x10b7814: ori   a0, a0, 65535
+// 0x010b7e5c: 0x10b7e5c: ori   a0, a0, 65535
 	ldloc.1
 	ldc.i4 65535
 	or
 	stloc.1
-// 0x010b7818: 0x10b7818: lw    s4, 0(s0)
+// 0x010b7e60: 0x10b7e60: lw    s4, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x010b781c: 0x10b781c: addiu v0, v0, -4
+// 0x010b7e64: 0x10b7e64: addiu v0, v0, -4
 	ldloc 5
 	ldc.i4.s -4
 	add
 	stloc 5
-// 0x010b7820: 0x10b7820: and   v1, v1, a0
+// 0x010b7e68: 0x10b7e68: and   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	and
 	stloc 6
-// 0x010b7824: 0x10b7824: addiu s0, s0, 4
+// 0x010b7e6c: 0x10b7e6c: addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_10b7828:
-// 0x010b7828: 0x10b7828: lui   a0, 0x20000000
+L_10b7e70:
+// 0x010b7e70: 0x10b7e70: lui   a0, 0x20000000
 	ldc.i4 536870912
 	stloc.1
-// 0x010b782c: 0x10b782c: and   a2, v1, a0
+// 0x010b7e74: 0x10b7e74: and   a2, v1, a0
 	ldloc 6
 	ldloc.1
 	and
 	stloc.3
-// 0x010b7830: 0x10b7830: beq   a2, zero, 0x10b7858 addiu a0, zero, -1
+// 0x010b7e78: 0x10b7e78: beq   a2, zero, 0x10b7ea0 addiu a0, zero, -1
 	ldloc.3
 	ldc.i4.m1
 	stloc.1
-	brfalse L_10b7858
+	brfalse L_10b7ea0
 // --- basic block ---
-// 0x010b7838: 0x10b7838: sltiu a0, v0, 4
+// 0x010b7e80: 0x10b7e80: sltiu a0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	clt.un
 	stloc.1
-// 0x010b783c: 0x10b783c: bne   a0, zero, 0x10b78f4 lui   a2, 0xdfff0000
+// 0x010b7e84: 0x10b7e84: bne   a0, zero, 0x10b7f3c lui   a2, 0xdfff0000
 	ldloc.1
 	ldc.i4 3758030848
 	stloc.3
-	brtrue L_10b78f4
+	brtrue L_10b7f3c
 // --- basic block ---
-// 0x010b7844: 0x10b7844: ori   a2, a2, 65535
+// 0x010b7e8c: 0x10b7e8c: ori   a2, a2, 65535
 	ldloc.3
 	ldc.i4 65535
 	or
 	stloc.3
-// 0x010b7848: 0x10b7848: lw    a0, 0(s0)
+// 0x010b7e90: 0x10b7e90: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b784c: 0x10b784c: and   v1, v1, a2
+// 0x010b7e94: 0x10b7e94: and   v1, v1, a2
 	ldloc 6
 	ldloc.3
 	and
 	stloc 6
-// 0x010b7850: 0x10b7850: addiu s0, s0, 4
+// 0x010b7e98: 0x10b7e98: addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x010b7854: 0x10b7854: addu  s2, zero, zero
+// 0x010b7e9c: 0x10b7e9c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_10b7858:
-// 0x010b7858: 0x10b7858: sltiu a2, v1, 20
+L_10b7ea0:
+// 0x010b7ea0: 0x10b7ea0: sltiu a2, v1, 20
 	ldloc 6
 	ldc.i4.s 20
 	clt.un
 	stloc.3
-// 0x010b785c: 0x10b785c: bne   a2, zero, 0x10b7880 sll   v1, v1, 2
+// 0x010b7ea4: 0x10b7ea4: bne   a2, zero, 0x10b7ec8 sll   v1, v1, 2
 	ldloc.3
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-	brtrue L_10b7880
+	brtrue L_10b7ec8
 // --- basic block ---
-// 0x010b7864: 0x10b7864: lui   a1, 0x20000
+// 0x010b7eac: 0x10b7eac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b7868: 0x10b7868: lui   a3, 0x20000
+// 0x010b7eb0: 0x10b7eb0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b786c: 0x10b786c: addiu a1, a1, 19640
+// 0x010b7eb4: 0x10b7eb4: addiu a1, a1, 20100
 	ldloc.2
-	ldc.i4 19640
+	ldc.i4 20100
 	add
 	stloc.2
-// 0x010b7870: 0x10b7870: addiu a3, a3, 19864
+// 0x010b7eb8: 0x10b7eb8: addiu a3, a3, 20324
 	ldloc 4
-	ldc.i4 19864
+	ldc.i4 20324
 	add
 	stloc 4
-// 0x010b7874: 0x10b7874: addiu a0, zero, 4
+// 0x010b7ebc: 0x10b7ebc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b7878: 0x10b7878: j	 0x10b78b0 addiu a2, zero, 202
+// 0x010b7ec0: 0x10b7ec0: j	 0x10b7ef8 addiu a2, zero, 202
 	ldc.i4 202
 	stloc.3
-	br L_10b78b0
+	br L_10b7ef8
 // --- basic block ---
-L_10b7880:
-// 0x010b7880: 0x10b7880: lui   a2, 0xe0000
+L_10b7ec8:
+// 0x010b7ec8: 0x10b7ec8: lui   a2, 0xe0000
 	ldc.i4 917504
 	stloc.3
-// 0x010b7884: 0x10b7884: addiu a2, a2, -17808
+// 0x010b7ecc: 0x10b7ecc: addiu a2, a2, -17344
 	ldloc.3
-	ldc.i4 -17808
+	ldc.i4 -17344
 	add
 	stloc.3
-// 0x010b7888: 0x10b7888: addu  v1, v1, a2
+// 0x010b7ed0: 0x10b7ed0: addu  v1, v1, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc 6
-// 0x010b788c: 0x10b788c: lw    s1, 0(v1)
+// 0x010b7ed4: 0x10b7ed4: lw    s1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010b7890: 0x10b7890: sll   zero, zero, 0
-// 0x010b7894: 0x10b7894: bne   s1, zero, 0x10b78c0 lui   a3, 0x20000
+// 0x010b7ed8: 0x10b7ed8: sll   zero, zero, 0
+// 0x010b7edc: 0x10b7edc: bne   s1, zero, 0x10b7f08 lui   a3, 0x20000
 	ldloc 9
 	ldc.i4 131072
 	stloc 4
-	brtrue L_10b78c0
+	brtrue L_10b7f08
 // --- basic block ---
-// 0x010b789c: 0x10b789c: lui   a1, 0x20000
+// 0x010b7ee4: 0x10b7ee4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b78a0: 0x10b78a0: addiu a1, a1, 19640
+// 0x010b7ee8: 0x10b7ee8: addiu a1, a1, 20100
 	ldloc.2
-	ldc.i4 19640
+	ldc.i4 20100
 	add
 	stloc.2
-// 0x010b78a4: 0x10b78a4: addiu a3, a3, 19904
+// 0x010b7eec: 0x10b7eec: addiu a3, a3, 20364
 	ldloc 4
-	ldc.i4 19904
+	ldc.i4 20364
 	add
 	stloc 4
-// 0x010b78a8: 0x10b78a8: addiu a0, zero, 4
+// 0x010b7ef0: 0x10b7ef0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b78ac: 0x10b78ac: addiu a2, zero, 210
+// 0x010b7ef4: 0x10b7ef4: addiu a2, zero, 210
 	ldc.i4 210
 	stloc.3
-L_10b78b0:
-// 0x010b78b0: 0x10b78b0: jal   0x100449c sll   zero, zero, 0
+L_10b7ef8:
+// 0x010b7ef8: 0x10b7ef8: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6807,16 +6807,16 @@ L_10b78b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b78b8: 0x10b78b8: j	 0x10b7914 sll   zero, zero, 0
-	br L_10b7914
+// 0x010b7f00: 0x10b7f00: j	 0x10b7f5c sll   zero, zero, 0
+	br L_10b7f5c
 // --- basic block ---
-L_10b78c0:
-// 0x010b78c0: 0x10b78c0: bltz  a0, 0x10b78cc sll   zero, zero, 0
+L_10b7f08:
+// 0x010b7f08: 0x10b7f08: bltz  a0, 0x10b7f14 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b78cc
+	blt L_10b7f14
 // --- basic block ---
-// 0x010b78c8: 0x10b78c8: sw    a0, 40(s1)
+// 0x010b7f10: 0x10b7f10: sw    a0, 40(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6825,8 +6825,8 @@ L_10b78c0:
 	add
 	ldloc.1
 	stelem.i4
-L_10b78cc:
-// 0x010b78cc: 0x10b78cc: lw    v1, 24(s1)
+L_10b7f14:
+// 0x010b7f14: 0x10b7f14: lw    v1, 24(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6835,53 +6835,53 @@ L_10b78cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b78d0: 0x10b78d0: sll   zero, zero, 0
-// 0x010b78d4: 0x10b78d4: mult  s2, v1
+// 0x010b7f18: 0x10b7f18: sll   zero, zero, 0
+// 0x010b7f1c: 0x10b7f1c: mult  s2, v1
 	ldloc 10
 	ldloc 6
 	mul
 	stloc 17
-// 0x010b78d8: 0x10b78d8: mflo  lo
+// 0x010b7f20: 0x10b7f20: mflo  lo
 	ldloc 17
 	stloc 6
-// 0x010b78dc: 0x10b78dc: sltu  v0, v0, v1
+// 0x010b7f24: 0x10b7f24: sltu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	clt.un
 	stloc 5
-// 0x010b78e0: 0x10b78e0: bne   v0, zero, 0x10b78f4 sll   zero, zero, 0
+// 0x010b7f28: 0x10b7f28: bne   v0, zero, 0x10b7f3c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10b78f4
+	brtrue L_10b7f3c
 // --- basic block ---
-// 0x010b78e8: 0x10b78e8: bgez  s2, 0x10b7778 addu  s5, zero, zero
+// 0x010b7f30: 0x10b7f30: bgez  s2, 0x10b7dc0 addu  s5, zero, zero
 	ldloc 10
 	ldc.i4.s 0
 	stloc 14
 	ldc.i4.s 0
-	bge L_10b7778
+	bge L_10b7dc0
 // --- basic block ---
-// 0x010b78f0: 0x10b78f0: addu  a1, s0, zero
+// 0x010b7f38: 0x10b7f38: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-L_10b78f4:
-// 0x010b78f4: 0x10b78f4: addu  s7, s3, s7
+L_10b7f3c:
+// 0x010b7f3c: 0x10b7f3c: addu  s7, s3, s7
 	ldloc 12
 	ldloc 11
 	add
 	stloc 11
-// 0x010b78f8: 0x10b78f8: subu  s7, s7, a1
+// 0x010b7f40: 0x10b7f40: subu  s7, s7, a1
 	ldloc 11
 	ldloc.2
 	sub
 	stloc 11
-// 0x010b78fc: 0x10b78fc: blez  s7, 0x10b76a0 addu  a0, s3, zero
+// 0x010b7f44: 0x10b7f44: blez  s7, 0x10b7ce8 addu  a0, s3, zero
 	ldloc 11
 	ldloc 12
 	stloc.1
 	ldc.i4.s 0
-	ble L_10b76a0
+	ble L_10b7ce8
 // --- basic block ---
-// 0x010b7904: 0x10b7904: jal   0x100186c addu  a2, s7, zero
+// 0x010b7f4c: 0x10b7f4c: jal   0x100186c addu  a2, s7, zero
 	ldloc 11
 	stloc.3
 	ldloc.1
@@ -6893,13 +6893,13 @@ L_10b78f4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b790c: 0x10b790c: j	 0x10b76a4 addiu v0, zero, 1024
+// 0x010b7f54: 0x10b7f54: j	 0x10b7cec addiu v0, zero, 1024
 	ldc.i4 1024
 	stloc 5
-	br L_10b76a4
+	br L_10b7cec
 // --- basic block ---
-L_10b7914:
-// 0x010b7914: 0x10b7914: jal   0x10b7400 lui   s0, 0xe0000
+L_10b7f5c:
+// 0x010b7f5c: 0x10b7f5c: jal   0x10b7a48 lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
 	ldloc.0
@@ -6907,31 +6907,31 @@ L_10b7914:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_free_10b7400(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_free_10b7a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b791c: 0x10b791c: lui   a3, 0x20000
+// 0x010b7f64: 0x10b7f64: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b7920: 0x10b7920: lui   a1, 0x20000
+// 0x010b7f68: 0x10b7f68: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b7924: 0x10b7924: addiu a2, zero, 479
+// 0x010b7f6c: 0x10b7f6c: addiu a2, zero, 479
 	ldc.i4 479
 	stloc.3
-// 0x010b7928: 0x10b7928: addiu a3, a3, 19956
+// 0x010b7f70: 0x10b7f70: addiu a3, a3, 20416
 	ldloc 4
-	ldc.i4 19956
+	ldc.i4 20416
 	add
 	stloc 4
-// 0x010b792c: 0x10b792c: addiu a1, a1, 19640
+// 0x010b7f74: 0x10b7f74: addiu a1, a1, 20100
 	ldloc.2
-	ldc.i4 19640
+	ldc.i4 20100
 	add
 	stloc.2
-// 0x010b7930: 0x10b7930: jal   0x100449c addiu a0, zero, 4
+// 0x010b7f78: 0x10b7f78: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -6944,16 +6944,16 @@ L_10b7914:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7938: 0x10b7938: lw    a0, -17896(s0)
+// 0x010b7f80: 0x10b7f80: lw    a0, -17432(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b793c: 0x10b793c: jal   0x104d44c addiu s1, sp, 128
+// 0x010b7f84: 0x10b7f84: jal   0x104d45c addiu s1, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -6963,15 +6963,15 @@ L_10b7914:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7944: 0x10b7944: addu  a1, s1, zero
+// 0x010b7f8c: 0x10b7f8c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010b7948: 0x10b7948: jal   0x104da04 addu  a0, zero, zero
+// 0x010b7f90: 0x10b7f90: jal   0x104da14 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6979,18 +6979,18 @@ L_10b7914:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7950: 0x10b7950: lui   a1, 0x0
+// 0x010b7f98: 0x10b7f98: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b7954: 0x10b7954: addu  a0, s1, zero
+// 0x010b7f9c: 0x10b7f9c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b7958: 0x10b7958: jal   0x104dd10 addiu a1, a1, 28940
+// 0x010b7fa0: 0x10b7fa0: jal   0x104dd20 addiu a1, a1, 28940
 	ldloc.2
 	ldc.i4 28940
 	add
@@ -7000,31 +7000,31 @@ L_10b7914:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7960: 0x10b7960: lui   a1, 0x20000
+// 0x010b7fa8: 0x10b7fa8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b7964: 0x10b7964: addu  a0, v0, zero
+// 0x010b7fac: 0x10b7fac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b7968: 0x10b7968: addiu a1, a1, 29984
+// 0x010b7fb0: 0x10b7fb0: addiu a1, a1, 30448
 	ldloc.2
-	ldc.i4 29984
+	ldc.i4 30448
 	add
 	stloc.2
-// 0x010b796c: 0x10b796c: addiu a2, zero, 4
+// 0x010b7fb4: 0x10b7fb4: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x010b7970: 0x10b7970: jal   0x104d46c sw    v0, -17896(s0)
+// 0x010b7fb8: 0x10b7fb8: jal   0x104d47c sw    v0, -17432(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4474
+	ldc.i4 -4358
 	add
 	ldloc 5
 	stelem.i4
@@ -7033,17 +7033,17 @@ L_10b7914:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b7978:
-// 0x010b7978: 0x10b7978: lui   v0, 0x0
+L_10b7fc0:
+// 0x010b7fc0: 0x10b7fc0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10b797c:
-// 0x010b797c: 0x10b797c: sw    s6, 19288(v0)
+L_10b7fc4:
+// 0x010b7fc4: 0x10b7fc4: sw    s6, 19288(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7052,12 +7052,12 @@ L_10b797c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b7980: 0x10b7980: addu  v0, zero, zero
+// 0x010b7fc8: 0x10b7fc8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b7984:
-// 0x010b7984: 0x10b7984: lw    ra, 1708(sp)
-// 0x010b7988: 0x10b7988: lw    s8, 1704(sp)
+L_10b7fcc:
+// 0x010b7fcc: 0x10b7fcc: lw    ra, 1708(sp)
+// 0x010b7fd0: 0x10b7fd0: lw    s8, 1704(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7066,7 +7066,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b798c: 0x10b798c: lw    s7, 1700(sp)
+// 0x010b7fd4: 0x10b7fd4: lw    s7, 1700(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7075,7 +7075,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b7990: 0x10b7990: lw    s6, 1696(sp)
+// 0x010b7fd8: 0x10b7fd8: lw    s6, 1696(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7084,7 +7084,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b7994: 0x10b7994: lw    s5, 1692(sp)
+// 0x010b7fdc: 0x10b7fdc: lw    s5, 1692(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7093,7 +7093,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b7998: 0x10b7998: lw    s4, 1688(sp)
+// 0x010b7fe0: 0x10b7fe0: lw    s4, 1688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7102,7 +7102,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b799c: 0x10b799c: lw    s3, 1684(sp)
+// 0x010b7fe4: 0x10b7fe4: lw    s3, 1684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7111,7 +7111,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b79a0: 0x10b79a0: lw    s2, 1680(sp)
+// 0x010b7fe8: 0x10b7fe8: lw    s2, 1680(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7120,7 +7120,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b79a4: 0x10b79a4: lw    s1, 1676(sp)
+// 0x010b7fec: 0x10b7fec: lw    s1, 1676(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7129,7 +7129,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b79a8: 0x10b79a8: lw    s0, 1672(sp)
+// 0x010b7ff0: 0x10b7ff0: lw    s0, 1672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7138,7 +7138,7 @@ L_10b7984:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b79ac: 0x10b79ac: jr    ra addiu sp, sp, 1712
+// 0x010b7ff4: 0x10b7ff4: jr    ra addiu sp, sp, 1712
 	ldloc.0
 	ldc.i4 1712
 	add
@@ -7150,7 +7150,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+.method public static int32 editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -7188,10 +7188,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b79b4: 0x10b79b4: lui   v0, 0x0
+// 0x010b7ffc: 0x10b7ffc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b79b8: 0x10b79b8: lw    v1, 19288(v0)
+// 0x010b8000: 0x10b8000: lw    v1, 19288(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7200,12 +7200,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b79bc: 0x10b79bc: addiu sp, sp, -24
+// 0x010b8004: 0x10b8004: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b79c0: 0x10b79c0: sw    s0, 16(sp)
+// 0x010b8008: 0x10b8008: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7214,64 +7214,64 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b79c4: 0x10b79c4: sw    ra, 20(sp)
-// 0x010b79c8: 0x10b79c8: addu  s0, a0, zero
+// 0x010b800c: 0x10b800c: sw    ra, 20(sp)
+// 0x010b8010: 0x10b8010: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010b79cc: 0x10b79cc: beq   v1, a0, 0x10b7a64 addu  v0, zero, zero
+// 0x010b8014: 0x10b8014: beq   v1, a0, 0x10b80ac addu  v0, zero, zero
 	ldloc 6
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	beq  L_10b7a64
+	beq  L_10b80ac
 // --- basic block ---
-// 0x010b79d4: 0x10b79d4: addiu v1, zero, -1
+// 0x010b801c: 0x10b801c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b79d8: 0x10b79d8: beq   a0, v1, 0x10b7a64 addiu v0, zero, -1
+// 0x010b8020: 0x10b8020: beq   a0, v1, 0x10b80ac addiu v0, zero, -1
 	ldloc.1
 	ldloc 6
 	ldc.i4.m1
 	stloc 5
-	beq  L_10b7a64
+	beq  L_10b80ac
 // --- basic block ---
-// 0x010b79e0: 0x10b79e0: lui   v0, 0xe0000
+// 0x010b8028: 0x10b8028: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b79e4: 0x10b79e4: lui   v1, 0xe0000
+// 0x010b802c: 0x10b802c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b79e8: 0x10b79e8: addiu v0, v0, -17808
+// 0x010b8030: 0x10b8030: addiu v0, v0, -17344
 	ldloc 5
-	ldc.i4 -17808
+	ldc.i4 -17344
 	add
 	stloc 5
-// 0x010b79ec: 0x10b79ec: addiu v1, v1, -17728
+// 0x010b8034: 0x10b8034: addiu v1, v1, -17264
 	ldloc 6
-	ldc.i4 -17728
+	ldc.i4 -17264
 	add
 	stloc 6
-L_10b79f0:
-// 0x010b79f0: 0x10b79f0: sw    zero, 0(v0)
+L_10b8038:
+// 0x010b8038: 0x10b8038: sw    zero, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b79f4: 0x10b79f4: addiu v0, v0, 4
+// 0x010b803c: 0x10b803c: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010b79f8: 0x10b79f8: bne   v0, v1, 0x10b79f0 lui   a0, 0x0
+// 0x010b8040: 0x10b8040: bne   v0, v1, 0x10b8038 lui   a0, 0x0
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10b79f0
+	bne.un L_10b8038
 // --- basic block ---
-// 0x010b7a00: 0x10b7a00: jal   0x10b70c8 addiu a0, a0, 19176
+// 0x010b8048: 0x10b8048: jal   0x10b7710 addiu a0, a0, 19176
 	ldloc.1
 	ldc.i4 19176
 	add
@@ -7281,15 +7281,15 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a08: 0x10b7a08: lui   a0, 0x0
+// 0x010b8050: 0x10b8050: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7a0c: 0x10b7a0c: jal   0x10b70c8 addiu a0, a0, 19160
+// 0x010b8054: 0x10b8054: jal   0x10b7710 addiu a0, a0, 19160
 	ldloc.1
 	ldc.i4 19160
 	add
@@ -7299,15 +7299,15 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a14: 0x10b7a14: lui   a0, 0x0
+// 0x010b805c: 0x10b805c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7a18: 0x10b7a18: jal   0x10b70c8 addiu a0, a0, 19192
+// 0x010b8060: 0x10b8060: jal   0x10b7710 addiu a0, a0, 19192
 	ldloc.1
 	ldc.i4 19192
 	add
@@ -7317,15 +7317,15 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a20: 0x10b7a20: lui   a0, 0x0
+// 0x010b8068: 0x10b8068: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7a24: 0x10b7a24: jal   0x10b70c8 addiu a0, a0, 19208
+// 0x010b806c: 0x10b806c: jal   0x10b7710 addiu a0, a0, 19208
 	ldloc.1
 	ldc.i4 19208
 	add
@@ -7335,15 +7335,15 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a2c: 0x10b7a2c: lui   a0, 0x0
+// 0x010b8074: 0x10b8074: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7a30: 0x10b7a30: jal   0x10b70c8 addiu a0, a0, 19256
+// 0x010b8078: 0x10b8078: jal   0x10b7710 addiu a0, a0, 19256
 	ldloc.1
 	ldc.i4 19256
 	add
@@ -7353,15 +7353,15 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a38: 0x10b7a38: lui   a0, 0x0
+// 0x010b8080: 0x10b8080: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7a3c: 0x10b7a3c: jal   0x10b70c8 addiu a0, a0, 19240
+// 0x010b8084: 0x10b8084: jal   0x10b7710 addiu a0, a0, 19240
 	ldloc.1
 	ldc.i4 19240
 	add
@@ -7371,15 +7371,15 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a44: 0x10b7a44: lui   a0, 0x0
+// 0x010b808c: 0x10b808c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7a48: 0x10b7a48: jal   0x10b70c8 addiu a0, a0, 19272
+// 0x010b8090: 0x10b8090: jal   0x10b7710 addiu a0, a0, 19272
 	ldloc.1
 	ldc.i4 19272
 	add
@@ -7389,15 +7389,15 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a50: 0x10b7a50: lui   a0, 0x0
+// 0x010b8098: 0x10b8098: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7a54: 0x10b7a54: jal   0x10b70c8 addiu a0, a0, 19224
+// 0x010b809c: 0x10b809c: jal   0x10b7710 addiu a0, a0, 19224
 	ldloc.1
 	ldc.i4 19224
 	add
@@ -7407,12 +7407,12 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_handler_10b70c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_handler_10b7710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7a5c: 0x10b7a5c: jal   0x10b752c addu  a0, s0, zero
+// 0x010b80a4: 0x10b80a4: jal   0x10b7b74 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7420,14 +7420,14 @@ L_10b79f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_open_10b752c(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_open_10b7b74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b7a64:
-// 0x010b7a64: 0x10b7a64: lw    ra, 20(sp)
-// 0x010b7a68: 0x10b7a68: lw    s0, 16(sp)
+L_10b80ac:
+// 0x010b80ac: 0x10b80ac: lw    ra, 20(sp)
+// 0x010b80b0: 0x10b80b0: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7436,7 +7436,7 @@ L_10b7a64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7a6c: 0x10b7a6c: jr    ra addiu sp, sp, 24
+// 0x010b80b4: 0x10b80b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl137.j b/converted/Cibyl137.j
index ec5a28a..917d7f2 100644
--- a/converted/Cibyl137.j
+++ b/converted/Cibyl137.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl137::.ctor
 
-.method public static int32 editor_bar_show_10b7a74()
+.method public static int32 editor_bar_show_10b80bc()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -61,39 +61,39 @@
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7a74: 0x10b7a74: lui   v0, 0xe0000
+// 0x010b80bc: 0x10b80bc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x010b7a78: 0x10b7a78: lw    v0, -17716(v0)
+// 0x010b80c0: 0x10b80c0: lw    v0, -17252(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4429
+	ldc.i4 -4313
 	add
 	ldelem.i4
 	stloc.0
-// 0x010b7a7c: 0x10b7a7c: sll   zero, zero, 0
-// 0x010b7a80: 0x10b7a80: beq   v0, zero, 0x10b7a90 addiu v1, zero, 1
+// 0x010b80c4: 0x10b80c4: sll   zero, zero, 0
+// 0x010b80c8: 0x10b80c8: beq   v0, zero, 0x10b80d8 addiu v1, zero, 1
 	ldloc.0
 	ldc.i4.1
 	stloc.1
-	brfalse L_10b7a90
+	brfalse L_10b80d8
 // --- basic block ---
-// 0x010b7a88: 0x10b7a88: lui   v0, 0xe0000
+// 0x010b80d0: 0x10b80d0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x010b7a8c: 0x10b7a8c: sw    v1, -17692(v0)
+// 0x010b80d4: 0x10b80d4: sw    v1, -17228(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4423
+	ldc.i4 -4307
 	add
 	ldloc.1
 	stelem.i4
-L_10b7a90:
-// 0x010b7a90: 0x10b7a90: jr    ra sll   zero, zero, 0
+L_10b80d8:
+// 0x010b80d8: 0x10b80d8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -101,7 +101,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_bar_hide_10b7a98()
+.method public static int32 editor_bar_hide_10b80e0()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 ra)
@@ -118,42 +118,42 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7a98: 0x10b7a98: lui   v0, 0xe0000
+// 0x010b80e0: 0x10b80e0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x010b7a9c: 0x10b7a9c: lw    v0, -17716(v0)
+// 0x010b80e4: 0x10b80e4: lw    v0, -17252(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4429
+	ldc.i4 -4313
 	add
 	ldelem.i4
 	stloc.0
-// 0x010b7aa0: 0x10b7aa0: sll   zero, zero, 0
-// 0x010b7aa4: 0x10b7aa4: beq   v0, zero, 0x10b7ab0 lui   v0, 0xe0000
+// 0x010b80e8: 0x10b80e8: sll   zero, zero, 0
+// 0x010b80ec: 0x10b80ec: beq   v0, zero, 0x10b80f8 lui   v0, 0xe0000
 	ldloc.0
 	ldc.i4 917504
 	stloc.0
-	brfalse L_10b7ab0
+	brfalse L_10b80f8
 // --- basic block ---
-// 0x010b7aac: 0x10b7aac: sw    zero, -17692(v0)
+// 0x010b80f4: 0x10b80f4: sw    zero, -17228(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4423
+	ldc.i4 -4307
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10b7ab0:
-// 0x010b7ab0: 0x10b7ab0: jr    ra sll   zero, zero, 0
+L_10b80f8:
+// 0x010b80f8: 0x10b80f8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_bar_set_length_10b7ab8(int32)
+.method public static int32 editor_bar_set_length_10b8100(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -176,30 +176,30 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7ab8: 0x10b7ab8: lui   v0, 0xe0000
+// 0x010b8100: 0x10b8100: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010b7abc: 0x10b7abc: lw    v1, -17708(v0)
+// 0x010b8104: 0x10b8104: lw    v1, -17244(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4427
+	ldc.i4 -4311
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7ac0: 0x10b7ac0: sll   zero, zero, 0
-// 0x010b7ac4: 0x10b7ac4: addu  v1, a0, v1
+// 0x010b8108: 0x10b8108: sll   zero, zero, 0
+// 0x010b810c: 0x10b810c: addu  v1, a0, v1
 	ldloc.0
 	ldloc.1
 	add
 	stloc.1
-// 0x010b7ac8: 0x10b7ac8: jr    ra sw    v1, -17708(v0)
+// 0x010b8110: 0x10b8110: jr    ra sw    v1, -17244(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4427
+	ldc.i4 -4311
 	add
 	ldloc.1
 	stelem.i4
@@ -210,7 +210,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 editor_bar_set_temp_length_10b7ad0(int32)
+.method public static int32 editor_bar_set_temp_length_10b8118(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -230,15 +230,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7ad0: 0x10b7ad0: lui   v0, 0xe0000
+// 0x010b8118: 0x10b8118: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b7ad4: 0x10b7ad4: jr    ra sw    a0, -17704(v0)
+// 0x010b811c: 0x10b811c: jr    ra sw    a0, -17240(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4426
+	ldc.i4 -4310
 	add
 	ldloc.0
 	stelem.i4
@@ -247,7 +247,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_bar_short_click_10b7adc(int32,int32,int32,int32,int32)
+.method public static int32 editor_bar_short_click_10b8124(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -291,24 +291,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7adc: 0x10b7adc: lui   v0, 0xe0000
+// 0x010b8124: 0x10b8124: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7ae0: 0x10b7ae0: lw    v0, -17692(v0)
+// 0x010b8128: 0x10b8128: lw    v0, -17228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4423
+	ldc.i4 -4307
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7ae4: 0x10b7ae4: addiu sp, sp, -32
+// 0x010b812c: 0x10b812c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b7ae8: 0x10b7ae8: sw    s0, 16(sp)
+// 0x010b8130: 0x10b8130: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -317,8 +317,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b7aec: 0x10b7aec: sw    ra, 28(sp)
-// 0x010b7af0: 0x10b7af0: sw    s2, 24(sp)
+// 0x010b8134: 0x10b8134: sw    ra, 28(sp)
+// 0x010b8138: 0x10b8138: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -327,7 +327,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b7af4: 0x10b7af4: sw    s1, 20(sp)
+// 0x010b813c: 0x10b813c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -336,76 +336,76 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b7af8: 0x10b7af8: beq   v0, zero, 0x10b7bc0 addu  s0, a0, zero
+// 0x010b8140: 0x10b8140: beq   v0, zero, 0x10b8208 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_10b7bc0
+	brfalse L_10b8208
 // --- basic block ---
-// 0x010b7b00: 0x10b7b00: lui   s2, 0xe0000
+// 0x010b8148: 0x10b8148: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010b7b04: 0x10b7b04: lw    v0, -17712(s2)
+// 0x010b814c: 0x10b814c: lw    v0, -17248(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4428
+	ldc.i4 -4312
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7b08: 0x10b7b08: sll   zero, zero, 0
-// 0x010b7b0c: 0x10b7b0c: bne   v0, zero, 0x10b7b44 lui   v0, 0xe0000
+// 0x010b8150: 0x10b8150: sll   zero, zero, 0
+// 0x010b8154: 0x10b8154: bne   v0, zero, 0x10b818c lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brtrue L_10b7b44
+	brtrue L_10b818c
 // --- basic block ---
-// 0x010b7b14: 0x10b7b14: jal   0x10518a8 addiu a0, zero, 1
+// 0x010b815c: 0x10b815c: jal   0x10518b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7b1c: 0x10b7b1c: lui   s1, 0x20000
+// 0x010b8164: 0x10b8164: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x010b7b20: 0x10b7b20: addu  a0, v0, zero
+// 0x010b8168: 0x10b8168: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b7b24: 0x10b7b24: addiu a1, s1, 20008
+// 0x010b816c: 0x10b816c: addiu a1, s1, 20468
 	ldloc 9
-	ldc.i4 20008
+	ldc.i4 20468
 	add
 	stloc.2
-// 0x010b7b28: 0x10b7b28: jal   0x10518cc sw    v0, -17712(s2)
+// 0x010b8170: 0x10b8170: jal   0x10518dc sw    v0, -17248(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4428
+	ldc.i4 -4312
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7b30: 0x10b7b30: addiu a2, s1, 20008
+// 0x010b8178: 0x10b8178: addiu a2, s1, 20468
 	ldloc 9
-	ldc.i4 20008
+	ldc.i4 20468
 	add
 	stloc.3
-// 0x010b7b34: 0x10b7b34: addiu a0, zero, 1
+// 0x010b817c: 0x10b817c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010b7b38: 0x10b7b38: jal   0x10a1918 addu  a1, zero, zero
+// 0x010b8180: 0x10b8180: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -413,50 +413,50 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7b40: 0x10b7b40: lui   v0, 0xe0000
+// 0x010b8188: 0x10b8188: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_10b7b44:
-// 0x010b7b44: 0x10b7b44: lw    a0, -17684(v0)
+L_10b818c:
+// 0x010b818c: 0x10b818c: lw    a0, -17220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4421
+	ldc.i4 -4305
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7b48: 0x10b7b48: lw    v1, 0(s0)
+// 0x010b8190: 0x10b8190: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b7b4c: 0x10b7b4c: addiu a0, a0, -10
+// 0x010b8194: 0x10b8194: addiu a0, a0, -10
 	ldloc.1
 	ldc.i4.s -10
 	add
 	stloc.1
-// 0x010b7b50: 0x10b7b50: slt   a0, v1, a0
+// 0x010b8198: 0x10b8198: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x010b7b54: 0x10b7b54: bne   a0, zero, 0x10b7bc0 addiu v0, v0, -17684
+// 0x010b819c: 0x10b819c: bne   a0, zero, 0x10b8208 addiu v0, v0, -17220
 	ldloc.1
 	ldloc 5
-	ldc.i4 -17684
+	ldc.i4 -17220
 	add
 	stloc 5
-	brtrue L_10b7bc0
+	brtrue L_10b8208
 // --- basic block ---
-// 0x010b7b5c: 0x10b7b5c: lw    a0, 8(v0)
+// 0x010b81a4: 0x10b81a4: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -465,22 +465,22 @@ L_10b7b44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7b60: 0x10b7b60: sll   zero, zero, 0
-// 0x010b7b64: 0x10b7b64: addiu a0, a0, 10
+// 0x010b81a8: 0x10b81a8: sll   zero, zero, 0
+// 0x010b81ac: 0x10b81ac: addiu a0, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	add
 	stloc.1
-// 0x010b7b68: 0x10b7b68: slt   v1, a0, v1
+// 0x010b81b0: 0x10b81b0: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x010b7b6c: 0x10b7b6c: bne   v1, zero, 0x10b7bc0 sll   zero, zero, 0
+// 0x010b81b4: 0x10b81b4: bne   v1, zero, 0x10b8208 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10b7bc0
+	brtrue L_10b8208
 // --- basic block ---
-// 0x010b7b74: 0x10b7b74: lw    a0, 4(v0)
+// 0x010b81bc: 0x10b81bc: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -489,7 +489,7 @@ L_10b7b44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7b78: 0x10b7b78: lw    v1, 4(s0)
+// 0x010b81c0: 0x10b81c0: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -498,21 +498,21 @@ L_10b7b44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b7b7c: 0x10b7b7c: addiu a0, a0, -10
+// 0x010b81c4: 0x10b81c4: addiu a0, a0, -10
 	ldloc.1
 	ldc.i4.s -10
 	add
 	stloc.1
-// 0x010b7b80: 0x10b7b80: slt   a0, v1, a0
+// 0x010b81c8: 0x10b81c8: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x010b7b84: 0x10b7b84: bne   a0, zero, 0x10b7bc0 sll   zero, zero, 0
+// 0x010b81cc: 0x10b81cc: bne   a0, zero, 0x10b8208 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10b7bc0
+	brtrue L_10b8208
 // --- basic block ---
-// 0x010b7b8c: 0x10b7b8c: lw    v0, 12(v0)
+// 0x010b81d4: 0x10b81d4: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -521,66 +521,66 @@ L_10b7b44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7b90: 0x10b7b90: sll   zero, zero, 0
-// 0x010b7b94: 0x10b7b94: addiu v0, v0, 10
+// 0x010b81d8: 0x10b81d8: sll   zero, zero, 0
+// 0x010b81dc: 0x10b81dc: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x010b7b98: 0x10b7b98: slt   v1, v0, v1
+// 0x010b81e0: 0x10b81e0: slt   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 7
-// 0x010b7b9c: 0x10b7b9c: bne   v1, zero, 0x10b7bc0 lui   v0, 0xe0000
+// 0x010b81e4: 0x10b81e4: bne   v1, zero, 0x10b8208 lui   v0, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc 5
-	brtrue L_10b7bc0
+	brtrue L_10b8208
 // --- basic block ---
-// 0x010b7ba4: 0x10b7ba4: lw    a0, -17712(v0)
+// 0x010b81ec: 0x10b81ec: lw    a0, -17248(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4428
+	ldc.i4 -4312
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7ba8: 0x10b7ba8: jal   0x105195c sll   zero, zero, 0
+// 0x010b81f0: 0x10b81f0: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7bb0: 0x10b7bb0: jal   0x10b110c sll   zero, zero, 0
+// 0x010b81f8: 0x10b81f8: jal   0x10b1754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_toggle_new_roads_10b110c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_toggle_new_roads_10b1754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7bb8: 0x10b7bb8: j	 0x10b7bc4 addiu v0, zero, 1
+// 0x010b8200: 0x10b8200: j	 0x10b820c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10b7bc4
+	br L_10b820c
 // --- basic block ---
-L_10b7bc0:
-// 0x010b7bc0: 0x10b7bc0: addu  v0, zero, zero
+L_10b8208:
+// 0x010b8208: 0x10b8208: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b7bc4:
-// 0x010b7bc4: 0x10b7bc4: lw    ra, 28(sp)
-// 0x010b7bc8: 0x10b7bc8: lw    s2, 24(sp)
+L_10b820c:
+// 0x010b820c: 0x10b820c: lw    ra, 28(sp)
+// 0x010b8210: 0x10b8210: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -589,7 +589,7 @@ L_10b7bc4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b7bcc: 0x10b7bcc: lw    s1, 20(sp)
+// 0x010b8214: 0x10b8214: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -598,7 +598,7 @@ L_10b7bc4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b7bd0: 0x10b7bd0: lw    s0, 16(sp)
+// 0x010b8218: 0x10b8218: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -607,7 +607,7 @@ L_10b7bc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7bd4: 0x10b7bd4: jr    ra addiu sp, sp, 32
+// 0x010b821c: 0x10b821c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -619,7 +619,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_bar_pressed_10b7bdc(int32,int32,int32,int32,int32)
+.method public static int32 editor_bar_pressed_10b8224(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 ra)
@@ -663,24 +663,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7bdc: 0x10b7bdc: lui   v0, 0xe0000
+// 0x010b8224: 0x10b8224: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7be0: 0x10b7be0: lw    v0, -17692(v0)
+// 0x010b8228: 0x10b8228: lw    v0, -17228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4423
+	ldc.i4 -4307
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7be4: 0x10b7be4: addiu sp, sp, -48
+// 0x010b822c: 0x10b822c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b7be8: 0x10b7be8: sw    s1, 36(sp)
+// 0x010b8230: 0x10b8230: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -689,8 +689,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b7bec: 0x10b7bec: sw    ra, 44(sp)
-// 0x010b7bf0: 0x10b7bf0: sw    s2, 40(sp)
+// 0x010b8234: 0x10b8234: sw    ra, 44(sp)
+// 0x010b8238: 0x10b8238: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -699,7 +699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b7bf4: 0x10b7bf4: sw    s0, 32(sp)
+// 0x010b823c: 0x10b823c: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -708,24 +708,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b7bf8: 0x10b7bf8: beq   v0, zero, 0x10b7cfc addu  s1, a0, zero
+// 0x010b8240: 0x10b8240: beq   v0, zero, 0x10b8344 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_10b7cfc
+	brfalse L_10b8344
 // --- basic block ---
-// 0x010b7c00: 0x10b7c00: lui   s2, 0x20000
+// 0x010b8248: 0x10b8248: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x010b7c04: 0x10b7c04: addu  a0, zero, zero
+// 0x010b824c: 0x10b824c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7c08: 0x10b7c08: addiu a1, zero, 1
+// 0x010b8250: 0x10b8250: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010b7c0c: 0x10b7c0c: jal   0x10a1918 addiu a2, s2, 20016
+// 0x010b8254: 0x10b8254: jal   0x10a1f60 addiu a2, s2, 20476
 	ldloc 9
-	ldc.i4 20016
+	ldc.i4 20476
 	add
 	stloc.3
 	ldloc.0
@@ -733,45 +733,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7c14: 0x10b7c14: bne   v0, zero, 0x10b7c40 addu  s0, v0, zero
+// 0x010b825c: 0x10b825c: bne   v0, zero, 0x10b8288 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brtrue L_10b7c40
+	brtrue L_10b8288
 // --- basic block ---
-// 0x010b7c1c: 0x10b7c1c: lui   a1, 0x20000
+// 0x010b8264: 0x10b8264: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b7c20: 0x10b7c20: lui   a3, 0x20000
+// 0x010b8268: 0x10b8268: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b7c24: 0x10b7c24: addiu s2, s2, 20016
+// 0x010b826c: 0x10b826c: addiu s2, s2, 20476
 	ldloc 9
-	ldc.i4 20016
+	ldc.i4 20476
 	add
 	stloc 9
-// 0x010b7c28: 0x10b7c28: addiu a1, a1, 20032
+// 0x010b8270: 0x10b8270: addiu a1, a1, 20492
 	ldloc.2
-	ldc.i4 20032
+	ldc.i4 20492
 	add
 	stloc.2
-// 0x010b7c2c: 0x10b7c2c: addiu a3, a3, 20064
+// 0x010b8274: 0x10b8274: addiu a3, a3, 20524
 	ldloc 4
-	ldc.i4 20064
+	ldc.i4 20524
 	add
 	stloc 4
-// 0x010b7c30: 0x10b7c30: addiu a0, zero, 4
+// 0x010b8278: 0x10b8278: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b7c34: 0x10b7c34: addiu a2, zero, 78
+// 0x010b827c: 0x10b827c: addiu a2, zero, 78
 	ldc.i4.s 78
 	stloc.3
-// 0x010b7c38: 0x10b7c38: jal   0x100449c sw    s2, 16(sp)
+// 0x010b8280: 0x10b8280: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -790,45 +790,45 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b7c40:
-// 0x010b7c40: 0x10b7c40: lui   v0, 0xe0000
+L_10b8288:
+// 0x010b8288: 0x10b8288: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7c44: 0x10b7c44: lw    a0, -17684(v0)
+// 0x010b828c: 0x10b828c: lw    a0, -17220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4421
+	ldc.i4 -4305
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7c48: 0x10b7c48: lw    v1, 0(s1)
+// 0x010b8290: 0x10b8290: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b7c4c: 0x10b7c4c: addiu a0, a0, -10
+// 0x010b8294: 0x10b8294: addiu a0, a0, -10
 	ldloc.1
 	ldc.i4.s -10
 	add
 	stloc.1
-// 0x010b7c50: 0x10b7c50: slt   a0, v1, a0
+// 0x010b8298: 0x10b8298: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x010b7c54: 0x10b7c54: bne   a0, zero, 0x10b7cfc addiu v0, v0, -17684
+// 0x010b829c: 0x10b829c: bne   a0, zero, 0x10b8344 addiu v0, v0, -17220
 	ldloc.1
 	ldloc 5
-	ldc.i4 -17684
+	ldc.i4 -17220
 	add
 	stloc 5
-	brtrue L_10b7cfc
+	brtrue L_10b8344
 // --- basic block ---
-// 0x010b7c5c: 0x10b7c5c: lw    a0, 8(v0)
+// 0x010b82a4: 0x10b82a4: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -837,22 +837,22 @@ L_10b7c40:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7c60: 0x10b7c60: sll   zero, zero, 0
-// 0x010b7c64: 0x10b7c64: addiu a0, a0, 10
+// 0x010b82a8: 0x10b82a8: sll   zero, zero, 0
+// 0x010b82ac: 0x10b82ac: addiu a0, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	add
 	stloc.1
-// 0x010b7c68: 0x10b7c68: slt   v1, a0, v1
+// 0x010b82b0: 0x10b82b0: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x010b7c6c: 0x10b7c6c: bne   v1, zero, 0x10b7cfc sll   zero, zero, 0
+// 0x010b82b4: 0x10b82b4: bne   v1, zero, 0x10b8344 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10b7cfc
+	brtrue L_10b8344
 // --- basic block ---
-// 0x010b7c74: 0x10b7c74: lw    a0, 4(v0)
+// 0x010b82bc: 0x10b82bc: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -861,7 +861,7 @@ L_10b7c40:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7c78: 0x10b7c78: lw    v1, 4(s1)
+// 0x010b82c0: 0x10b82c0: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -870,21 +870,21 @@ L_10b7c40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b7c7c: 0x10b7c7c: addiu a0, a0, -10
+// 0x010b82c4: 0x10b82c4: addiu a0, a0, -10
 	ldloc.1
 	ldc.i4.s -10
 	add
 	stloc.1
-// 0x010b7c80: 0x10b7c80: slt   a0, v1, a0
+// 0x010b82c8: 0x10b82c8: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x010b7c84: 0x10b7c84: bne   a0, zero, 0x10b7cfc sll   zero, zero, 0
+// 0x010b82cc: 0x10b82cc: bne   a0, zero, 0x10b8344 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10b7cfc
+	brtrue L_10b8344
 // --- basic block ---
-// 0x010b7c8c: 0x10b7c8c: lw    v0, 12(v0)
+// 0x010b82d4: 0x10b82d4: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -893,27 +893,27 @@ L_10b7c40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7c90: 0x10b7c90: sll   zero, zero, 0
-// 0x010b7c94: 0x10b7c94: addiu v0, v0, 10
+// 0x010b82d8: 0x10b82d8: sll   zero, zero, 0
+// 0x010b82dc: 0x10b82dc: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x010b7c98: 0x10b7c98: slt   v1, v0, v1
+// 0x010b82e0: 0x10b82e0: slt   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 7
-// 0x010b7c9c: 0x10b7c9c: bne   v1, zero, 0x10b7d00 addu  v0, zero, zero
+// 0x010b82e4: 0x10b82e4: bne   v1, zero, 0x10b8348 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10b7d00
+	brtrue L_10b8348
 // --- basic block ---
-// 0x010b7ca4: 0x10b7ca4: addiu v0, zero, 20
+// 0x010b82ec: 0x10b82ec: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x010b7ca8: 0x10b7ca8: sw    v0, 24(sp)
+// 0x010b82f0: 0x10b82f0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -922,52 +922,52 @@ L_10b7c40:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b7cac: 0x10b7cac: lui   v0, 0xf0000
+// 0x010b82f4: 0x10b82f4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010b7cb0: 0x10b7cb0: lw    s1, -30072(v0)
+// 0x010b82f8: 0x10b82f8: lw    s1, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7cb4: 0x10b7cb4: jal   0x1042430 addiu s1, s1, 5
+// 0x010b82fc: 0x10b82fc: jal   0x1042440 addiu s1, s1, 5
 	ldloc 8
 	ldc.i4.5
 	add
 	stloc 8
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7cbc: 0x10b7cbc: lui   v1, 0xe0000
+// 0x010b8304: 0x10b8304: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b7cc0: 0x10b7cc0: lw    v1, -17696(v1)
+// 0x010b8308: 0x10b8308: lw    v1, -17232(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4424
+	ldc.i4 -4308
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b7cc4: 0x10b7cc4: sll   zero, zero, 0
-// 0x010b7cc8: 0x10b7cc8: subu  s1, s1, v1
+// 0x010b830c: 0x10b830c: sll   zero, zero, 0
+// 0x010b8310: 0x10b8310: subu  s1, s1, v1
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-// 0x010b7ccc: 0x10b7ccc: subu  s1, s1, v0
+// 0x010b8314: 0x10b8314: subu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x010b7cd0: 0x10b7cd0: beq   s0, zero, 0x10b7cec sw    s1, 28(sp)
+// 0x010b8318: 0x10b8318: beq   s0, zero, 0x10b8334 sw    s1, 28(sp)
 	ldloc 10
 	ldloc 6
 	ldloc.0
@@ -977,20 +977,20 @@ L_10b7c40:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_10b7cec
+	brfalse L_10b8334
 // --- basic block ---
-// 0x010b7cd8: 0x10b7cd8: addu  a0, s0, zero
+// 0x010b8320: 0x10b8320: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b7cdc: 0x10b7cdc: addiu a1, sp, 24
+// 0x010b8324: 0x10b8324: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010b7ce0: 0x10b7ce0: addu  a2, zero, zero
+// 0x010b8328: 0x10b8328: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b7ce4: 0x10b7ce4: jal   0x104f4a8 addu  a3, zero, zero
+// 0x010b832c: 0x10b832c: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -998,35 +998,35 @@ L_10b7c40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b7cec:
-// 0x010b7cec: 0x10b7cec: jal   0x104e31c sll   zero, zero, 0
+L_10b8334:
+// 0x010b8334: 0x10b8334: jal   0x104e32c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_refresh_104e31c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_refresh_104e32c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b7cf4: 0x10b7cf4: j	 0x10b7d00 addiu v0, zero, 1
+// 0x010b833c: 0x10b833c: j	 0x10b8348 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10b7d00
+	br L_10b8348
 // --- basic block ---
-L_10b7cfc:
-// 0x010b7cfc: 0x10b7cfc: addu  v0, zero, zero
+L_10b8344:
+// 0x010b8344: 0x10b8344: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10b7d00:
-// 0x010b7d00: 0x10b7d00: lw    ra, 44(sp)
-// 0x010b7d04: 0x10b7d04: lw    s2, 40(sp)
+L_10b8348:
+// 0x010b8348: 0x10b8348: lw    ra, 44(sp)
+// 0x010b834c: 0x10b834c: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1035,7 +1035,7 @@ L_10b7d00:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b7d08: 0x10b7d08: lw    s1, 36(sp)
+// 0x010b8350: 0x10b8350: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1044,7 +1044,7 @@ L_10b7d00:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7d0c: 0x10b7d0c: lw    s0, 32(sp)
+// 0x010b8354: 0x10b8354: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1053,7 +1053,7 @@ L_10b7d00:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b7d10: 0x10b7d10: jr    ra addiu sp, sp, 48
+// 0x010b8358: 0x10b8358: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1065,7 +1065,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_bar_after_refresh_10b7d18(int32,int32,int32,int32,int32)
+.method public static int32 editor_bar_after_refresh_10b8360(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s2,int32 s0,int32 s3,int32 s4,int32 t0,int32 hi,int32 lo,int32 ra)
@@ -1124,25 +1124,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b7d18: 0x10b7d18: lui   v0, 0xe0000
+// 0x010b8360: 0x10b8360: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7d1c: 0x10b7d1c: lw    v0, -17716(v0)
+// 0x010b8364: 0x10b8364: lw    v0, -17252(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4429
+	ldc.i4 -4313
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7d20: 0x10b7d20: addiu sp, sp, -312
+// 0x010b8368: 0x10b8368: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x010b7d24: 0x10b7d24: sw    ra, 308(sp)
-// 0x010b7d28: 0x10b7d28: sw    s4, 304(sp)
+// 0x010b836c: 0x10b836c: sw    ra, 308(sp)
+// 0x010b8370: 0x10b8370: sw    s4, 304(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1151,7 +1151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b7d2c: 0x10b7d2c: sw    s3, 300(sp)
+// 0x010b8374: 0x10b8374: sw    s3, 300(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1160,7 +1160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b7d30: 0x10b7d30: sw    s2, 296(sp)
+// 0x010b8378: 0x10b8378: sw    s2, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1169,7 +1169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b7d34: 0x10b7d34: sw    s1, 292(sp)
+// 0x010b837c: 0x10b837c: sw    s1, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1178,7 +1178,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b7d38: 0x10b7d38: beq   v0, zero, 0x10b806c sw    s0, 288(sp)
+// 0x010b8380: 0x10b8380: beq   v0, zero, 0x10b86b4 sw    s0, 288(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -1188,60 +1188,60 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	brfalse L_10b806c
+	brfalse L_10b86b4
 // --- basic block ---
-// 0x010b7d40: 0x10b7d40: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x010b8388: 0x10b8388: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x010b7d48: 0x10b7d48: beq   v0, zero, 0x10b8054 lui   v0, 0xe0000
+// 0x010b8390: 0x10b8390: beq   v0, zero, 0x10b869c lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brfalse L_10b8054
+	brfalse L_10b869c
 // --- basic block ---
-// 0x010b7d50: 0x10b7d50: lui   v0, 0xe0000
+// 0x010b8398: 0x10b8398: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7d54: 0x10b7d54: lw    v0, -17692(v0)
+// 0x010b839c: 0x10b839c: lw    v0, -17228(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4423
+	ldc.i4 -4307
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7d58: 0x10b7d58: sll   zero, zero, 0
-// 0x010b7d5c: 0x10b7d5c: beq   v0, zero, 0x10b8054 lui   v0, 0xe0000
+// 0x010b83a0: 0x10b83a0: sll   zero, zero, 0
+// 0x010b83a4: 0x10b83a4: beq   v0, zero, 0x10b869c lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brfalse L_10b8054
+	brfalse L_10b869c
 // --- basic block ---
-// 0x010b7d64: 0x10b7d64: jal   0x10b0964 sll   zero, zero, 0
-	call int32 Cibyl132::editor_ignore_new_roads_10b0964()
+// 0x010b83ac: 0x10b83ac: jal   0x10b0fac sll   zero, zero, 0
+	call int32 Cibyl132::editor_ignore_new_roads_10b0fac()
 	stloc 5
 // --- basic block ---
-// 0x010b7d6c: 0x10b7d6c: bne   v0, zero, 0x10b8054 lui   v0, 0xe0000
+// 0x010b83b4: 0x10b83b4: bne   v0, zero, 0x10b869c lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brtrue L_10b8054
+	brtrue L_10b869c
 // --- basic block ---
-// 0x010b7d74: 0x10b7d74: lui   s0, 0xf0000
+// 0x010b83bc: 0x10b83bc: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 10
-// 0x010b7d78: 0x10b7d78: lw    s1, -30072(s0)
+// 0x010b83c0: 0x10b83c0: lw    s1, -29608(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7d7c: 0x10b7d7c: jal   0x1042430 sw    zero, 24(sp)
+// 0x010b83c4: 0x10b83c4: jal   0x1042440 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1250,48 +1250,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7d84: 0x10b7d84: lui   v1, 0xe0000
+// 0x010b83cc: 0x10b83cc: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b7d88: 0x10b7d88: lw    v1, -17696(v1)
+// 0x010b83d0: 0x10b83d0: lw    v1, -17232(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4424
+	ldc.i4 -4308
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7d8c: 0x10b7d8c: subu  s1, s1, v0
+// 0x010b83d4: 0x10b83d4: subu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x010b7d90: 0x10b7d90: lui   a2, 0x20000
+// 0x010b83d8: 0x10b83d8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b7d94: 0x10b7d94: subu  s1, s1, v1
+// 0x010b83dc: 0x10b83dc: subu  s1, s1, v1
 	ldloc 8
 	ldloc 6
 	sub
 	stloc 8
-// 0x010b7d98: 0x10b7d98: addu  a0, zero, zero
+// 0x010b83e0: 0x10b83e0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b7d9c: 0x10b7d9c: lui   v0, 0xf0000
+// 0x010b83e4: 0x10b83e4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010b7da0: 0x10b7da0: addiu a2, a2, 20100
+// 0x010b83e8: 0x10b83e8: addiu a2, a2, 20560
 	ldloc.3
-	ldc.i4 20100
+	ldc.i4 20560
 	add
 	stloc.3
-// 0x010b7da4: 0x10b7da4: sw    s1, 28(sp)
+// 0x010b83ec: 0x10b83ec: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1300,25 +1300,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b7da8: 0x10b7da8: lw    s2, -30072(s0)
+// 0x010b83f0: 0x10b83f0: lw    s2, -29608(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b7dac: 0x10b7dac: lw    s1, -30068(v0)
+// 0x010b83f4: 0x10b83f4: lw    s1, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b7db0: 0x10b7db0: jal   0x10a1918 addiu a1, zero, 1
+// 0x010b83f8: 0x10b83f8: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1326,39 +1326,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7db8: 0x10b7db8: addu  s0, v0, zero
+// 0x010b8400: 0x10b8400: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010b7dbc: 0x10b7dbc: lui   v0, 0xe0000
+// 0x010b8404: 0x10b8404: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7dc0: 0x10b7dc0: lw    a0, -17724(v0)
+// 0x010b8408: 0x10b8408: lw    a0, -17260(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4431
+	ldc.i4 -4315
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b7dc4: 0x10b7dc4: sll   zero, zero, 0
-// 0x010b7dc8: 0x10b7dc8: beq   a0, zero, 0x10b7de4 addiu a1, sp, 24
+// 0x010b840c: 0x10b840c: sll   zero, zero, 0
+// 0x010b8410: 0x10b8410: beq   a0, zero, 0x10b842c addiu a1, sp, 24
 	ldloc.1
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-	brfalse L_10b7de4
+	brfalse L_10b842c
 // --- basic block ---
-// 0x010b7dd0: 0x10b7dd0: addu  a2, zero, zero
+// 0x010b8418: 0x10b8418: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b7dd4: 0x10b7dd4: jal   0x104f4a8 addu  a3, zero, zero
+// 0x010b841c: 0x10b841c: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1366,40 +1366,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7ddc: 0x10b7ddc: j	 0x10b7e58 sll   zero, zero, 0
-	br L_10b7e58
+// 0x010b8424: 0x10b8424: j	 0x10b84a0 sll   zero, zero, 0
+	br L_10b84a0
 // --- basic block ---
-L_10b7de4:
-// 0x010b7de4: 0x10b7de4: slt   s2, s1, s2
+L_10b842c:
+// 0x010b842c: 0x10b842c: slt   s2, s1, s2
 	ldloc 8
 	ldloc 9
 	clt
 	stloc 9
-// 0x010b7de8: 0x10b7de8: beq   s2, zero, 0x10b7df4 sll   zero, zero, 0
+// 0x010b8430: 0x10b8430: beq   s2, zero, 0x10b843c sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10b7df4
+	brfalse L_10b843c
 // --- basic block ---
-// 0x010b7df0: 0x10b7df0: sll   s1, s1, 1
+// 0x010b8438: 0x10b8438: sll   s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	shl
 	stloc 8
-L_10b7df4:
-// 0x010b7df4: 0x10b7df4: jal   0x104dffc addu  a0, s0, zero
+L_10b843c:
+// 0x010b843c: 0x10b843c: jal   0x104e00c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7dfc: 0x10b7dfc: div   s1, v0
+// 0x010b8444: 0x10b8444: div   s1, v0
 	ldloc 8
 	ldloc 5
 	ldloc 8
@@ -1408,24 +1408,24 @@ L_10b7df4:
 	stloc 15
 	rem
 	stloc 14
-// 0x010b7e00: 0x10b7e00: addu  s3, zero, zero
+// 0x010b8448: 0x10b8448: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010b7e04: 0x10b7e04: addu  s2, zero, zero
+// 0x010b844c: 0x10b844c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010b7e08: 0x10b7e08: mflo  lo
+// 0x010b8450: 0x10b8450: mflo  lo
 	ldloc 15
 	stloc 8
-// 0x010b7e0c: 0x10b7e0c: j	 0x10b7e38 addiu s4, sp, 32
+// 0x010b8454: 0x10b8454: j	 0x10b8480 addiu s4, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 12
-	br L_10b7e38
+	br L_10b8480
 // --- basic block ---
-L_10b7e14:
-// 0x010b7e14: 0x10b7e14: lw    v1, 24(sp)
+L_10b845c:
+// 0x010b845c: 0x10b845c: lw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1434,7 +1434,7 @@ L_10b7e14:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7e18: 0x10b7e18: sw    v0, 280(sp)
+// 0x010b8460: 0x10b8460: sw    v0, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1443,12 +1443,12 @@ L_10b7e14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b7e1c: 0x10b7e1c: addu  t0, t0, v1
+// 0x010b8464: 0x10b8464: addu  t0, t0, v1
 	ldloc 13
 	ldloc 6
 	add
 	stloc 13
-// 0x010b7e20: 0x10b7e20: lw    v1, 28(sp)
+// 0x010b8468: 0x10b8468: lw    v1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1457,7 +1457,7 @@ L_10b7e14:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b7e24: 0x10b7e24: sw    t0, 32(sp)
+// 0x010b846c: 0x10b846c: sw    t0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1466,7 +1466,7 @@ L_10b7e14:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b7e28: 0x10b7e28: jal   0x104f4a8 sw    v1, 36(sp)
+// 0x010b8470: 0x10b8470: jal   0x104f4b8 sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1480,12 +1480,12 @@ L_10b7e14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7e30: 0x10b7e30: lw    v0, 280(sp)
+// 0x010b8478: 0x10b8478: lw    v0, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1494,44 +1494,44 @@ L_10b7e14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7e34: 0x10b7e34: addiu s2, s2, 1
+// 0x010b847c: 0x10b847c: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10b7e38:
-// 0x010b7e38: 0x10b7e38: addu  s3, s3, v0
+L_10b8480:
+// 0x010b8480: 0x10b8480: addu  s3, s3, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x010b7e3c: 0x10b7e3c: slt   v1, s2, s1
+// 0x010b8484: 0x10b8484: slt   v1, s2, s1
 	ldloc 9
 	ldloc 8
 	clt
 	stloc 6
-// 0x010b7e40: 0x10b7e40: addu  a0, s0, zero
+// 0x010b8488: 0x10b8488: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b7e44: 0x10b7e44: addu  a1, s4, zero
+// 0x010b848c: 0x10b848c: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010b7e48: 0x10b7e48: addu  a2, zero, zero
+// 0x010b8490: 0x10b8490: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b7e4c: 0x10b7e4c: addu  a3, zero, zero
+// 0x010b8494: 0x10b8494: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b7e50: 0x10b7e50: bne   v1, zero, 0x10b7e14 subu  t0, s3, v0
+// 0x010b8498: 0x10b8498: bne   v1, zero, 0x10b845c subu  t0, s3, v0
 	ldloc 6
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 13
-	brtrue L_10b7e14
+	brtrue L_10b845c
 // --- basic block ---
-L_10b7e58:
-// 0x010b7e58: 0x10b7e58: jal   0x109a424 addu  a0, zero, zero
+L_10b84a0:
+// 0x010b84a0: 0x10b84a0: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1539,38 +1539,38 @@ L_10b7e58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7e60: 0x10b7e60: beq   v0, zero, 0x10b7e80 addiu v0, zero, 60
+// 0x010b84a8: 0x10b84a8: beq   v0, zero, 0x10b84c8 addiu v0, zero, 60
 	ldloc 5
 	ldc.i4.s 60
 	stloc 5
-	brfalse L_10b7e80
+	brfalse L_10b84c8
 // --- basic block ---
-// 0x010b7e68: 0x10b7e68: lui   v0, 0xf0000
+// 0x010b84b0: 0x10b84b0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010b7e6c: 0x10b7e6c: lw    v0, -30068(v0)
+// 0x010b84b4: 0x10b84b4: lw    v0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7e70: 0x10b7e70: addiu s1, zero, 1
+// 0x010b84b8: 0x10b84b8: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010b7e74: 0x10b7e74: addiu v0, v0, -10
+// 0x010b84bc: 0x10b84bc: addiu v0, v0, -10
 	ldloc 5
 	ldc.i4.s -10
 	add
 	stloc 5
-// 0x010b7e78: 0x10b7e78: j	 0x10b7e88 sw    v0, 24(sp)
+// 0x010b84c0: 0x10b84c0: j	 0x10b84d0 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1579,10 +1579,10 @@ L_10b7e58:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10b7e88
+	br L_10b84d0
 // --- basic block ---
-L_10b7e80:
-// 0x010b7e80: 0x10b7e80: sw    v0, 24(sp)
+L_10b84c8:
+// 0x010b84c8: 0x10b84c8: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1591,54 +1591,54 @@ L_10b7e80:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b7e84: 0x10b7e84: addu  s1, zero, zero
+// 0x010b84cc: 0x10b84cc: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_10b7e88:
-// 0x010b7e88: 0x10b7e88: lui   v0, 0xe0000
+L_10b84d0:
+// 0x010b84d0: 0x10b84d0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7e8c: 0x10b7e8c: lw    s4, -17704(v0)
+// 0x010b84d4: 0x10b84d4: lw    s4, -17240(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4426
+	ldc.i4 -4310
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b7e90: 0x10b7e90: lui   v0, 0xe0000
+// 0x010b84d8: 0x10b84d8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7e94: 0x10b7e94: lw    v0, -17708(v0)
+// 0x010b84dc: 0x10b84dc: lw    v0, -17244(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4427
+	ldc.i4 -4311
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b7e98: 0x10b7e98: sll   zero, zero, 0
-// 0x010b7e9c: 0x10b7e9c: addu  s4, s4, v0
+// 0x010b84e0: 0x10b84e0: sll   zero, zero, 0
+// 0x010b84e4: 0x10b84e4: addu  s4, s4, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 12
-// 0x010b7ea0: 0x10b7ea0: jal   0x1007df4 addu  a0, s4, zero
+// 0x010b84e8: 0x10b84e8: jal   0x1007e04 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b7ea8: 0x10b7ea8: sb    zero, 60(sp)
+// 0x010b84f0: 0x10b84f0: sb    zero, 60(sp)
 	ldloc.0
 	ldc.i4.s 60
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b7eac: 0x10b7eac: blez  v0, 0x10b7f38 sb    zero, 40(sp)
+// 0x010b84f4: 0x10b84f4: blez  v0, 0x10b8580 sb    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
@@ -1646,12 +1646,12 @@ L_10b7e88:
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldc.i4.s 0
-	ble L_10b7f38
+	ble L_10b8580
 // --- basic block ---
-// 0x010b7eb4: 0x10b7eb4: addu  a0, s4, zero
+// 0x010b84fc: 0x10b84fc: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010b7eb8: 0x10b7eb8: jal   0x1007e18 sw    v0, 280(sp)
+// 0x010b8500: 0x10b8500: jal   0x1007e28 sw    v0, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1661,12 +1661,12 @@ L_10b7e88:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7ec0: 0x10b7ec0: lw    a3, 280(sp)
+// 0x010b8508: 0x10b8508: lw    a3, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1675,24 +1675,24 @@ L_10b7e88:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b7ec4: 0x10b7ec4: sll   zero, zero, 0
-// 0x010b7ec8: 0x10b7ec8: slti  v1, a3, 50
+// 0x010b850c: 0x10b850c: sll   zero, zero, 0
+// 0x010b8510: 0x10b8510: slti  v1, a3, 50
 	ldloc 4
 	ldc.i4.s 50
 	clt
 	stloc 6
-// 0x010b7ecc: 0x10b7ecc: beq   v1, zero, 0x10b7f00 addiu s3, sp, 60
+// 0x010b8514: 0x10b8514: beq   v1, zero, 0x10b8548 addiu s3, sp, 60
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 11
-	brfalse L_10b7f00
+	brfalse L_10b8548
 // --- basic block ---
-// 0x010b7ed4: 0x10b7ed4: addiu v1, zero, 10
+// 0x010b851c: 0x10b851c: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x010b7ed8: 0x10b7ed8: div   v0, v1
+// 0x010b8520: 0x10b8520: div   v0, v1
 	ldloc 5
 	ldloc 6
 	ldloc 5
@@ -1701,24 +1701,24 @@ L_10b7e88:
 	stloc 15
 	rem
 	stloc 14
-// 0x010b7edc: 0x10b7edc: lui   a2, 0x10000
+// 0x010b8524: 0x10b8524: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010b7ee0: 0x10b7ee0: addu  a0, s3, zero
+// 0x010b8528: 0x10b8528: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010b7ee4: 0x10b7ee4: addiu a2, a2, 8928
+// 0x010b852c: 0x10b852c: addiu a2, a2, 8924
 	ldloc.3
-	ldc.i4 8928
+	ldc.i4 8924
 	add
 	stloc.3
-// 0x010b7ee8: 0x10b7ee8: addiu a1, zero, 100
+// 0x010b8530: 0x10b8530: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010b7eec: 0x10b7eec: mfhi  hi
+// 0x010b8534: 0x10b8534: mfhi  hi
 	ldloc 14
 	stloc 5
-// 0x010b7ef0: 0x10b7ef0: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010b8538: 0x10b8538: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1737,22 +1737,22 @@ L_10b7e88:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7ef8: 0x10b7ef8: j	 0x10b7f14 sll   zero, zero, 0
-	br L_10b7f14
+// 0x010b8540: 0x10b8540: j	 0x10b855c sll   zero, zero, 0
+	br L_10b855c
 // --- basic block ---
-L_10b7f00:
-// 0x010b7f00: 0x10b7f00: lui   a2, 0x20000
-	ldc.i4 131072
+L_10b8548:
+// 0x010b8548: 0x10b8548: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x010b7f04: 0x10b7f04: addu  a0, s3, zero
+// 0x010b854c: 0x10b854c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010b7f08: 0x10b7f08: addiu a2, a2, -13884
+// 0x010b8550: 0x10b8550: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x010b7f0c: 0x10b7f0c: jal   0x1000f9c addiu a1, zero, 100
+// 0x010b8554: 0x10b8554: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -1765,12 +1765,12 @@ L_10b7f00:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b7f14:
-// 0x010b7f14: 0x10b7f14: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+L_10b855c:
+// 0x010b855c: 0x10b855c: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x010b7f1c: 0x10b7f1c: jal   0x101cd60 addu  a0, v0, zero
+// 0x010b8564: 0x10b8564: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1778,62 +1778,62 @@ L_10b7f14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7f24: 0x10b7f24: lui   a2, 0x10000
+// 0x010b856c: 0x10b856c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010b7f28: 0x10b7f28: addiu a2, a2, 19912
+// 0x010b8570: 0x10b8570: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010b7f2c: 0x10b7f2c: addu  a3, v0, zero
+// 0x010b8574: 0x10b8574: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b7f30: 0x10b7f30: j	 0x10b7fc0 addiu a0, sp, 40
+// 0x010b8578: 0x10b8578: j	 0x10b8608 addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	br L_10b7fc0
+	br L_10b8608
 // --- basic block ---
-L_10b7f38:
-// 0x010b7f38: 0x10b7f38: jal   0x1008478 addiu s3, sp, 60
+L_10b8580:
+// 0x010b8580: 0x10b8580: jal   0x1008488 addiu s3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 11
-	call int32 Cibyl5::roadmap_math_is_metric_1008478()
+	call int32 Cibyl5::roadmap_math_is_metric_1008488()
 	stloc 5
 // --- basic block ---
-// 0x010b7f40: 0x10b7f40: addiu s2, sp, 40
+// 0x010b8588: 0x10b8588: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 9
-// 0x010b7f44: 0x10b7f44: bne   v0, zero, 0x10b7f84 lui   s0, 0x10000
+// 0x010b858c: 0x10b858c: bne   v0, zero, 0x10b85cc lui   s0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 10
-	brtrue L_10b7f84
+	brtrue L_10b85cc
 // --- basic block ---
-// 0x010b7f4c: 0x10b7f4c: jal   0x1007e18 addu  a0, s4, zero
+// 0x010b8594: 0x10b8594: jal   0x1007e28 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7f54: 0x10b7f54: addiu a3, zero, 10
+// 0x010b859c: 0x10b859c: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010b7f58: 0x10b7f58: div   v0, a3
+// 0x010b85a0: 0x10b85a0: div   v0, a3
 	ldloc 5
 	ldloc 4
 	ldloc 5
@@ -1842,21 +1842,21 @@ L_10b7f38:
 	stloc 15
 	rem
 	stloc 14
-// 0x010b7f5c: 0x10b7f5c: lui   a2, 0x10000
+// 0x010b85a4: 0x10b85a4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010b7f60: 0x10b7f60: addiu a2, a2, 9672
+// 0x010b85a8: 0x10b85a8: addiu a2, a2, 9668
 	ldloc.3
-	ldc.i4 9672
+	ldc.i4 9668
 	add
 	stloc.3
-// 0x010b7f64: 0x10b7f64: addu  a0, s3, zero
+// 0x010b85ac: 0x10b85ac: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010b7f68: 0x10b7f68: mfhi  hi
+// 0x010b85b0: 0x10b85b0: mfhi  hi
 	ldloc 14
 	stloc 4
-// 0x010b7f6c: 0x10b7f6c: jal   0x1000f9c addiu a1, zero, 100
+// 0x010b85b4: 0x10b85b4: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -1869,15 +1869,15 @@ L_10b7f38:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7f74: 0x10b7f74: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x010b85bc: 0x10b85bc: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x010b7f7c: 0x10b7f7c: j	 0x10b7fac sll   zero, zero, 0
-	br L_10b7fac
+// 0x010b85c4: 0x10b85c4: j	 0x10b85f4 sll   zero, zero, 0
+	br L_10b85f4
 // --- basic block ---
-L_10b7f84:
-// 0x010b7f84: 0x10b7f84: jal   0x1007db4 addu  a0, s4, zero
+L_10b85cc:
+// 0x010b85cc: 0x10b85cc: jal   0x1007dc4 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -1885,26 +1885,26 @@ L_10b7f84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7f8c: 0x10b7f8c: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x010b85d4: 0x10b85d4: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x010b7f90: 0x10b7f90: addu  a0, s3, zero
+// 0x010b85d8: 0x10b85d8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010b7f94: 0x10b7f94: addiu a2, a2, -13884
+// 0x010b85dc: 0x10b85dc: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x010b7f98: 0x10b7f98: addu  a3, v0, zero
+// 0x010b85e0: 0x10b85e0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b7f9c: 0x10b7f9c: jal   0x1000f9c addiu a1, zero, 100
+// 0x010b85e4: 0x10b85e4: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -1917,12 +1917,12 @@ L_10b7f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7fa4: 0x10b7fa4: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x010b85ec: 0x10b85ec: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-L_10b7fac:
-// 0x010b7fac: 0x10b7fac: jal   0x101cd60 addu  a0, v0, zero
+L_10b85f4:
+// 0x010b85f4: 0x10b85f4: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1930,24 +1930,24 @@ L_10b7fac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7fb4: 0x10b7fb4: addu  a3, v0, zero
+// 0x010b85fc: 0x10b85fc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b7fb8: 0x10b7fb8: addu  a0, s2, zero
+// 0x010b8600: 0x10b8600: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010b7fbc: 0x10b7fbc: addiu a2, s0, 19912
+// 0x010b8604: 0x10b8604: addiu a2, s0, 20332
 	ldloc 10
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-L_10b7fc0:
-// 0x010b7fc0: 0x10b7fc0: jal   0x1000f9c addiu a1, zero, 20
+L_10b8608:
+// 0x010b8608: 0x10b8608: jal   0x1000f9c addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -1960,12 +1960,12 @@ L_10b7fc0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7fc8: 0x10b7fc8: lui   a0, 0x20000
+// 0x010b8610: 0x10b8610: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b7fcc: 0x10b7fcc: jal   0x101cd60 addiu a0, a0, 20116
+// 0x010b8614: 0x10b8614: jal   0x101cd70 addiu a0, a0, 20576
 	ldloc.1
-	ldc.i4 20116
+	ldc.i4 20576
 	add
 	stloc.1
 	ldloc.0
@@ -1973,41 +1973,41 @@ L_10b7fc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7fd4: 0x10b7fd4: addiu s0, sp, 160
+// 0x010b861c: 0x10b861c: addiu s0, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
 	stloc 10
-// 0x010b7fd8: 0x10b7fd8: lui   a1, 0x10000
+// 0x010b8620: 0x10b8620: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010b7fdc: 0x10b7fdc: addu  a2, v0, zero
+// 0x010b8624: 0x10b8624: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b7fe0: 0x10b7fe0: addiu a1, a1, 9028
+// 0x010b8628: 0x10b8628: addiu a1, a1, 9024
 	ldloc.2
-	ldc.i4 9028
+	ldc.i4 9024
 	add
 	stloc.2
-// 0x010b7fe4: 0x10b7fe4: addiu a3, sp, 60
+// 0x010b862c: 0x10b862c: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x010b7fe8: 0x10b7fe8: addu  a0, s0, zero
+// 0x010b8630: 0x10b8630: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b7fec: 0x10b7fec: addiu v0, sp, 40
+// 0x010b8634: 0x10b8634: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x010b7ff0: 0x10b7ff0: jal   0x1000f64 sw    v0, 16(sp)
+// 0x010b8638: 0x10b8638: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2026,63 +2026,63 @@ L_10b7fc0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b7ff8: 0x10b7ff8: lui   v0, 0xe0000
+// 0x010b8640: 0x10b8640: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b7ffc: 0x10b7ffc: lw    a0, -17688(v0)
+// 0x010b8644: 0x10b8644: lw    a0, -17224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4422
+	ldc.i4 -4306
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8000: 0x10b8000: jal   0x104e35c sll   zero, zero, 0
+// 0x010b8648: 0x10b8648: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8008: 0x10b8008: lui   v0, 0xf0000
+// 0x010b8650: 0x10b8650: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010b800c: 0x10b800c: lw    s2, -30072(v0)
+// 0x010b8654: 0x10b8654: lw    s2, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b8010: 0x10b8010: jal   0x1042430 sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+// 0x010b8658: 0x10b8658: jal   0x1042440 sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8018: 0x10b8018: lui   v1, 0xe0000
+// 0x010b8660: 0x10b8660: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010b801c: 0x10b801c: lw    v1, -17696(v1)
+// 0x010b8664: 0x10b8664: lw    v1, -17232(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4424
+	ldc.i4 -4308
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8020: 0x10b8020: addiu a0, zero, 4
+// 0x010b8668: 0x10b8668: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b8024: 0x10b8024: div   v1, a0
+// 0x010b866c: 0x10b866c: div   v1, a0
 	ldloc 6
 	ldloc.1
 	ldloc 6
@@ -2091,39 +2091,39 @@ L_10b7fc0:
 	stloc 15
 	rem
 	stloc 14
-// 0x010b8028: 0x10b8028: addu  a1, s1, zero
+// 0x010b8670: 0x10b8670: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010b802c: 0x10b802c: addu  a3, s0, zero
+// 0x010b8674: 0x10b8674: addu  a3, s0, zero
 	ldloc 10
 	stloc 4
-// 0x010b8030: 0x10b8030: addiu a0, sp, 24
+// 0x010b8678: 0x10b8678: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010b8034: 0x10b8034: addiu a2, zero, 16
+// 0x010b867c: 0x10b867c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010b8038: 0x10b8038: mflo  lo
+// 0x010b8680: 0x10b8680: mflo  lo
 	ldloc 15
 	stloc 13
-// 0x010b803c: 0x10b803c: subu  v1, t0, v1
+// 0x010b8684: 0x10b8684: subu  v1, t0, v1
 	ldloc 13
 	ldloc 6
 	sub
 	stloc 6
-// 0x010b8040: 0x10b8040: addu  s2, v1, s2
+// 0x010b8688: 0x10b8688: addu  s2, v1, s2
 	ldloc 6
 	ldloc 9
 	add
 	stloc 9
-// 0x010b8044: 0x10b8044: subu  s2, s2, v0
+// 0x010b868c: 0x10b868c: subu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 9
-// 0x010b8048: 0x10b8048: jal   0x104ea60 sw    s2, 28(sp)
+// 0x010b8690: 0x10b8690: jal   0x104ea70 sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2137,30 +2137,30 @@ L_10b7fc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8050: 0x10b8050: lui   v0, 0xe0000
+// 0x010b8698: 0x10b8698: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_10b8054:
-// 0x010b8054: 0x10b8054: lw    v0, -17720(v0)
+L_10b869c:
+// 0x010b869c: 0x10b869c: lw    v0, -17256(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4430
+	ldc.i4 -4314
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b8058: 0x10b8058: sll   zero, zero, 0
-// 0x010b805c: 0x10b805c: beq   v0, zero, 0x10b806c sll   zero, zero, 0
+// 0x010b86a0: 0x10b86a0: sll   zero, zero, 0
+// 0x010b86a4: 0x10b86a4: beq   v0, zero, 0x10b86b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b806c
+	brfalse L_10b86b4
 // --- basic block ---
-// 0x010b8064: 0x10b8064: jalr  v0 sll   zero, zero, 0
+// 0x010b86ac: 0x10b86ac: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2172,9 +2172,9 @@ L_10b8054:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b806c:
-// 0x010b806c: 0x10b806c: lw    ra, 308(sp)
-// 0x010b8070: 0x10b8070: lw    s4, 304(sp)
+L_10b86b4:
+// 0x010b86b4: 0x10b86b4: lw    ra, 308(sp)
+// 0x010b86b8: 0x10b86b8: lw    s4, 304(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2183,7 +2183,7 @@ L_10b806c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b8074: 0x10b8074: lw    s3, 300(sp)
+// 0x010b86bc: 0x10b86bc: lw    s3, 300(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2192,7 +2192,7 @@ L_10b806c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b8078: 0x10b8078: lw    s2, 296(sp)
+// 0x010b86c0: 0x10b86c0: lw    s2, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2201,7 +2201,7 @@ L_10b806c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b807c: 0x10b807c: lw    s1, 292(sp)
+// 0x010b86c4: 0x10b86c4: lw    s1, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2210,7 +2210,7 @@ L_10b806c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b8080: 0x10b8080: lw    s0, 288(sp)
+// 0x010b86c8: 0x10b86c8: lw    s0, 288(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2219,7 +2219,7 @@ L_10b806c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b8084: 0x10b8084: jr    ra addiu sp, sp, 312
+// 0x010b86cc: 0x10b86cc: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
@@ -2231,7 +2231,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_bar_feature_enabled_10b808c(int32,int32,int32,int32,int32)
+.method public static int32 editor_bar_feature_enabled_10b86d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -2266,16 +2266,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b808c: 0x10b808c: lui   a0, 0x0
+// 0x010b86d4: 0x10b86d4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8090: 0x10b8090: addiu sp, sp, -24
+// 0x010b86d8: 0x10b86d8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b8094: 0x10b8094: sw    ra, 20(sp)
-// 0x010b8098: 0x10b8098: jal   0x100e348 addiu a0, a0, 19292
+// 0x010b86dc: 0x10b86dc: sw    ra, 20(sp)
+// 0x010b86e0: 0x10b86e0: jal   0x100e358 addiu a0, a0, 19292
 	ldloc.1
 	ldc.i4 19292
 	add
@@ -2285,18 +2285,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b80a0: 0x10b80a0: lui   a1, 0x0
+// 0x010b86e8: 0x10b86e8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b80a4: 0x10b80a4: addu  a0, v0, zero
+// 0x010b86ec: 0x10b86ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b80a8: 0x10b80a8: jal   0x1001b14 addiu a1, a1, 20820
+// 0x010b86f0: 0x10b86f0: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2306,13 +2306,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010b80b0: 0x10b80b0: lw    ra, 20(sp)
-// 0x010b80b4: 0x10b80b4: sltiu v0, v0, 1
+// 0x010b86f8: 0x10b86f8: lw    ra, 20(sp)
+// 0x010b86fc: 0x10b86fc: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010b80b8: 0x10b80b8: jr    ra addiu sp, sp, 24
+// 0x010b8700: 0x10b8700: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2324,7 +2324,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_bar_initialize_10b80c0(int32,int32,int32,int32,int32)
+.method public static int32 editor_bar_initialize_10b8708(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s5,int32 s2,int32 s3,int32 s4,int32 ra,int32 t0,int32 lo)
@@ -2383,48 +2383,48 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b80c0: 0x10b80c0: lui   a0, 0x10000
+// 0x010b8708: 0x10b8708: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b80c4: 0x10b80c4: lui   a1, 0x0
+// 0x010b870c: 0x10b870c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b80c8: 0x10b80c8: lui   a3, 0x20000
+// 0x010b8710: 0x10b8710: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b80cc: 0x10b80cc: lui   v0, 0x0
+// 0x010b8714: 0x10b8714: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b80d0: 0x10b80d0: addiu sp, sp, -72
+// 0x010b8718: 0x10b8718: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010b80d4: 0x10b80d4: addiu a0, a0, 12560
+// 0x010b871c: 0x10b871c: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010b80d8: 0x10b80d8: addiu a1, a1, 19292
+// 0x010b8720: 0x10b8720: addiu a1, a1, 19292
 	ldloc.2
 	ldc.i4 19292
 	add
 	stloc.2
-// 0x010b80dc: 0x10b80dc: addiu a3, a3, 9464
+// 0x010b8724: 0x10b8724: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010b80e0: 0x10b80e0: addu  a2, zero, zero
+// 0x010b8728: 0x10b8728: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b80e4: 0x10b80e4: addiu v0, v0, 20820
+// 0x010b872c: 0x10b872c: addiu v0, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
 	stloc 5
-// 0x010b80e8: 0x10b80e8: sw    ra, 68(sp)
-// 0x010b80ec: 0x10b80ec: sw    s5, 64(sp)
+// 0x010b8730: 0x10b8730: sw    ra, 68(sp)
+// 0x010b8734: 0x10b8734: sw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2433,7 +2433,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b80f0: 0x10b80f0: sw    s4, 60(sp)
+// 0x010b8738: 0x10b8738: sw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2442,7 +2442,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b80f4: 0x10b80f4: sw    s3, 56(sp)
+// 0x010b873c: 0x10b873c: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2451,7 +2451,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b80f8: 0x10b80f8: sw    s2, 52(sp)
+// 0x010b8740: 0x10b8740: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2460,7 +2460,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b80fc: 0x10b80fc: sw    s1, 48(sp)
+// 0x010b8744: 0x10b8744: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2469,7 +2469,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b8100: 0x10b8100: sw    s0, 44(sp)
+// 0x010b8748: 0x10b8748: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2478,7 +2478,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b8104: 0x10b8104: sw    v0, 16(sp)
+// 0x010b874c: 0x10b874c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2487,7 +2487,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b8108: 0x10b8108: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010b8750: 0x10b8750: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2501,37 +2501,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8110: 0x10b8110: jal   0x10b808c sll   zero, zero, 0
+// 0x010b8758: 0x10b8758: jal   0x10b86d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl137::editor_bar_feature_enabled_10b808c(int32,int32,int32,int32,int32)
+	call int32 Cibyl137::editor_bar_feature_enabled_10b86d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8118: 0x10b8118: beq   v0, zero, 0x10b82a0 lui   s1, 0x20000
+// 0x010b8760: 0x10b8760: beq   v0, zero, 0x10b88e8 lui   s1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 9
-	brfalse L_10b82a0
+	brfalse L_10b88e8
 // --- basic block ---
-// 0x010b8120: 0x10b8120: addu  a0, zero, zero
+// 0x010b8768: 0x10b8768: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8124: 0x10b8124: addiu a1, zero, 3
+// 0x010b876c: 0x10b876c: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010b8128: 0x10b8128: jal   0x10a1918 addiu a2, s1, 20100
+// 0x010b8770: 0x10b8770: jal   0x10a1f60 addiu a2, s1, 20560
 	ldloc 9
-	ldc.i4 20100
+	ldc.i4 20560
 	add
 	stloc.3
 	ldloc.0
@@ -2539,57 +2539,57 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8130: 0x10b8130: addu  s0, v0, zero
+// 0x010b8778: 0x10b8778: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010b8134: 0x10b8134: lui   v0, 0xe0000
+// 0x010b877c: 0x10b877c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b8138: 0x10b8138: bne   s0, zero, 0x10b816c sw    s0, -17728(v0)
+// 0x010b8780: 0x10b8780: bne   s0, zero, 0x10b87b4 sw    s0, -17264(v0)
 	ldloc 8
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4432
+	ldc.i4 -4316
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_10b816c
+	brtrue L_10b87b4
 // --- basic block ---
-// 0x010b8140: 0x10b8140: lui   a1, 0x20000
+// 0x010b8788: 0x10b8788: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8144: 0x10b8144: lui   a3, 0x20000
+// 0x010b878c: 0x10b878c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b8148: 0x10b8148: addiu s1, s1, 20100
+// 0x010b8790: 0x10b8790: addiu s1, s1, 20560
 	ldloc 9
-	ldc.i4 20100
+	ldc.i4 20560
 	add
 	stloc 9
-// 0x010b814c: 0x10b814c: addiu a1, a1, 20032
+// 0x010b8794: 0x10b8794: addiu a1, a1, 20492
 	ldloc.2
-	ldc.i4 20032
+	ldc.i4 20492
 	add
 	stloc.2
-// 0x010b8150: 0x10b8150: addiu a3, a3, 20064
+// 0x010b8798: 0x10b8798: addiu a3, a3, 20524
 	ldloc 4
-	ldc.i4 20064
+	ldc.i4 20524
 	add
 	stloc 4
-// 0x010b8154: 0x10b8154: addiu a0, zero, 4
+// 0x010b879c: 0x10b879c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b8158: 0x10b8158: addiu a2, zero, 359
+// 0x010b87a0: 0x10b87a0: addiu a2, zero, 359
 	ldc.i4 359
 	stloc.3
-// 0x010b815c: 0x10b815c: jal   0x100449c sw    s1, 16(sp)
+// 0x010b87a4: 0x10b87a4: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2608,63 +2608,63 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8164: 0x10b8164: j	 0x10b82a0 sll   zero, zero, 0
-	br L_10b82a0
+// 0x010b87ac: 0x10b87ac: j	 0x10b88e8 sll   zero, zero, 0
+	br L_10b88e8
 // --- basic block ---
-L_10b816c:
-// 0x010b816c: 0x10b816c: lui   v0, 0xf0000
+L_10b87b4:
+// 0x010b87b4: 0x10b87b4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010b8170: 0x10b8170: lw    s5, -30068(v0)
+// 0x010b87b8: 0x10b87b8: lw    s5, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b8174: 0x10b8174: lui   v0, 0xf0000
+// 0x010b87bc: 0x10b87bc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010b8178: 0x10b8178: lw    v0, -30072(v0)
+// 0x010b87c0: 0x10b87c0: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b817c: 0x10b817c: sll   zero, zero, 0
-// 0x010b8180: 0x10b8180: slt   v0, s5, v0
+// 0x010b87c4: 0x10b87c4: sll   zero, zero, 0
+// 0x010b87c8: 0x10b87c8: slt   v0, s5, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x010b8184: 0x10b8184: beq   v0, zero, 0x10b8190 sll   zero, zero, 0
+// 0x010b87cc: 0x10b87cc: beq   v0, zero, 0x10b87d8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b8190
+	brfalse L_10b87d8
 // --- basic block ---
-// 0x010b818c: 0x10b818c: sll   s5, s5, 1
+// 0x010b87d4: 0x10b87d4: sll   s5, s5, 1
 	ldloc 10
 	ldc.i4.1
 	shl
 	stloc 10
-L_10b8190:
-// 0x010b8190: 0x10b8190: jal   0x104e020 addu  a0, s0, zero
+L_10b87d8:
+// 0x010b87d8: 0x10b87d8: jal   0x104e030 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8198: 0x10b8198: addu  a1, v0, zero
+// 0x010b87e0: 0x10b87e0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010b819c: 0x10b819c: jal   0x104e170 addu  a0, s5, zero
+// 0x010b87e4: 0x10b87e4: jal   0x104e180 addu  a0, s5, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2672,46 +2672,46 @@ L_10b8190:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b81a4: 0x10b81a4: addu  a0, s0, zero
+// 0x010b87ec: 0x10b87ec: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b81a8: 0x10b81a8: jal   0x104dffc addu  s1, v0, zero
+// 0x010b87f0: 0x10b87f0: jal   0x104e00c addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b81b0: 0x10b81b0: div   s5, v0
+// 0x010b87f8: 0x10b87f8: div   s5, v0
 	ldloc 10
 	ldloc 5
 	div
 	stloc 16
-// 0x010b81b4: 0x10b81b4: addu  s3, zero, zero
+// 0x010b87fc: 0x10b87fc: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010b81b8: 0x10b81b8: addu  s2, zero, zero
+// 0x010b8800: 0x10b8800: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010b81bc: 0x10b81bc: mflo  lo
+// 0x010b8804: 0x10b8804: mflo  lo
 	ldloc 16
 	stloc 10
-// 0x010b81c0: 0x10b81c0: j	 0x10b81e4 addiu s4, sp, 24
+// 0x010b8808: 0x10b8808: j	 0x10b882c addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 13
-	br L_10b81e4
+	br L_10b882c
 // --- basic block ---
-L_10b81c8:
-// 0x010b81c8: 0x10b81c8: sw    v0, 32(sp)
+L_10b8810:
+// 0x010b8810: 0x10b8810: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2720,7 +2720,7 @@ L_10b81c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b81cc: 0x10b81cc: sw    t0, 24(sp)
+// 0x010b8814: 0x10b8814: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2729,7 +2729,7 @@ L_10b81c8:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b81d0: 0x10b81d0: sw    zero, 28(sp)
+// 0x010b8818: 0x10b8818: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2738,7 +2738,7 @@ L_10b81c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b81d4: 0x10b81d4: jal   0x104def0 sw    zero, 16(sp)
+// 0x010b881c: 0x10b881c: jal   0x104df00 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2751,12 +2751,12 @@ L_10b81c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b81dc: 0x10b81dc: lw    v0, 32(sp)
+// 0x010b8824: 0x10b8824: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2765,119 +2765,119 @@ L_10b81c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b81e0: 0x10b81e0: addiu s2, s2, 1
+// 0x010b8828: 0x10b8828: addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_10b81e4:
-// 0x010b81e4: 0x10b81e4: addu  s3, s3, v0
+L_10b882c:
+// 0x010b882c: 0x10b882c: addu  s3, s3, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 12
-// 0x010b81e8: 0x10b81e8: slt   v1, s2, s5
+// 0x010b8830: 0x10b8830: slt   v1, s2, s5
 	ldloc 11
 	ldloc 10
 	clt
 	stloc 7
-// 0x010b81ec: 0x10b81ec: addu  a0, s1, zero
+// 0x010b8834: 0x10b8834: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b81f0: 0x10b81f0: addu  a1, s4, zero
+// 0x010b8838: 0x10b8838: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010b81f4: 0x10b81f4: addu  a2, zero, zero
+// 0x010b883c: 0x10b883c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b81f8: 0x10b81f8: addu  a3, s0, zero
+// 0x010b8840: 0x10b8840: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x010b81fc: 0x10b81fc: bne   v1, zero, 0x10b81c8 subu  t0, s3, v0
+// 0x010b8844: 0x10b8844: bne   v1, zero, 0x10b8810 subu  t0, s3, v0
 	ldloc 7
 	ldloc 12
 	ldloc 5
 	sub
 	stloc 15
-	brtrue L_10b81c8
+	brtrue L_10b8810
 // --- basic block ---
-// 0x010b8204: 0x10b8204: lui   s0, 0xe0000
+// 0x010b884c: 0x10b884c: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b8208: 0x10b8208: lw    a0, -17728(s0)
+// 0x010b8850: 0x10b8850: lw    a0, -17264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4432
+	ldc.i4 -4316
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b820c: 0x10b820c: lui   v0, 0xe0000
+// 0x010b8854: 0x10b8854: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b8210: 0x10b8210: jal   0x104dffc sw    s1, -17724(v0)
+// 0x010b8858: 0x10b8858: jal   0x104e00c sw    s1, -17260(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4431
+	ldc.i4 -4315
 	add
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8218: 0x10b8218: lw    a0, -17728(s0)
+// 0x010b8860: 0x10b8860: lw    a0, -17264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4432
+	ldc.i4 -4316
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b821c: 0x10b821c: lui   v1, 0xe0000
+// 0x010b8864: 0x10b8864: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b8220: 0x10b8220: jal   0x104e020 sw    v0, -17700(v1)
+// 0x010b8868: 0x10b8868: jal   0x104e030 sw    v0, -17236(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4425
+	ldc.i4 -4309
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8228: 0x10b8228: lui   a0, 0x20000
+// 0x010b8870: 0x10b8870: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b822c: 0x10b822c: addu  a1, zero, zero
+// 0x010b8874: 0x10b8874: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b8230: 0x10b8230: lui   v1, 0xe0000
+// 0x010b8878: 0x10b8878: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b8234: 0x10b8234: addiu a0, a0, 20140
+// 0x010b887c: 0x10b887c: addiu a0, a0, 20600
 	ldloc.1
-	ldc.i4 20140
+	ldc.i4 20600
 	add
 	stloc.1
-// 0x010b8238: 0x10b8238: jal   0x104ef00 sw    v0, -17696(v1)
+// 0x010b8880: 0x10b8880: jal   0x104ef10 sw    v0, -17232(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4424
+	ldc.i4 -4308
 	add
 	ldloc 5
 	stelem.i4
@@ -2886,28 +2886,28 @@ L_10b81e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8240: 0x10b8240: lui   a0, 0x0
+// 0x010b8888: 0x10b8888: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8244: 0x10b8244: lui   v1, 0xe0000
+// 0x010b888c: 0x10b888c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b8248: 0x10b8248: addiu a0, a0, 23008
+// 0x010b8890: 0x10b8890: addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
 	stloc.1
-// 0x010b824c: 0x10b824c: jal   0x104edb0 sw    v0, -17688(v1)
+// 0x010b8894: 0x10b8894: jal   0x104edc0 sw    v0, -17224(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4422
+	ldc.i4 -4306
 	add
 	ldloc 5
 	stelem.i4
@@ -2916,48 +2916,48 @@ L_10b81e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8254: 0x10b8254: lui   a0, 0x10b0000
-	ldc.i4 17498112
+// 0x010b889c: 0x10b889c: lui   a0, 0x10c0000
+	ldc.i4 17563648
 	stloc.1
-// 0x010b8258: 0x10b8258: jal   0x101f970 addiu a0, a0, 32024
+// 0x010b88a0: 0x10b88a0: jal   0x101f980 addiu a0, a0, -31904
 	ldloc.1
-	ldc.i4 32024
+	ldc.i4 -31904
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8260: 0x10b8260: lui   a0, 0x10b0000
-	ldc.i4 17498112
+// 0x010b88a8: 0x10b88a8: lui   a0, 0x10c0000
+	ldc.i4 17563648
 	stloc.1
-// 0x010b8264: 0x10b8264: lui   v1, 0xe0000
+// 0x010b88ac: 0x10b88ac: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010b8268: 0x10b8268: addiu a0, a0, 31708
+// 0x010b88b0: 0x10b88b0: addiu a0, a0, -32220
 	ldloc.1
-	ldc.i4 31708
+	ldc.i4 -32220
 	add
 	stloc.1
-// 0x010b826c: 0x10b826c: addiu a1, zero, 2
+// 0x010b88b4: 0x10b88b4: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010b8270: 0x10b8270: lui   s0, 0x10b0000
-	ldc.i4 17498112
+// 0x010b88b8: 0x10b88b8: lui   s0, 0x10c0000
+	ldc.i4 17563648
 	stloc 8
-// 0x010b8274: 0x10b8274: jal   0x104ba38 sw    v0, -17720(v1)
+// 0x010b88bc: 0x10b88bc: jal   0x104ba48 sw    v0, -17256(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4430
+	ldc.i4 -4314
 	add
 	ldloc 5
 	stelem.i4
@@ -2966,17 +2966,17 @@ L_10b81e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba38(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b827c: 0x10b827c: addiu a0, s0, 31452
+// 0x010b88c4: 0x10b88c4: addiu a0, s0, -32476
 	ldloc 8
-	ldc.i4 31452
+	ldc.i4 -32476
 	add
 	stloc.1
-// 0x010b8280: 0x10b8280: jal   0x104bad8 addiu a1, zero, 2
+// 0x010b88c8: 0x10b88c8: jal   0x104bae8 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -2984,17 +2984,17 @@ L_10b81e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8288: 0x10b8288: addiu a0, s0, 31452
+// 0x010b88d0: 0x10b88d0: addiu a0, s0, -32476
 	ldloc 8
-	ldc.i4 31452
+	ldc.i4 -32476
 	add
 	stloc.1
-// 0x010b828c: 0x10b828c: jal   0x104bab0 addiu a1, zero, 2
+// 0x010b88d4: 0x10b88d4: jal   0x104bac0 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -3002,29 +3002,29 @@ L_10b81e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8294: 0x10b8294: addiu v1, zero, 1
+// 0x010b88dc: 0x10b88dc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010b8298: 0x10b8298: lui   v0, 0xe0000
+// 0x010b88e0: 0x10b88e0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b829c: 0x10b829c: sw    v1, -17716(v0)
+// 0x010b88e4: 0x10b88e4: sw    v1, -17252(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4429
+	ldc.i4 -4313
 	add
 	ldloc 7
 	stelem.i4
-L_10b82a0:
-// 0x010b82a0: 0x10b82a0: lw    ra, 68(sp)
-// 0x010b82a4: 0x10b82a4: lw    s5, 64(sp)
+L_10b88e8:
+// 0x010b88e8: 0x10b88e8: lw    ra, 68(sp)
+// 0x010b88ec: 0x10b88ec: lw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3033,7 +3033,7 @@ L_10b82a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b82a8: 0x10b82a8: lw    s4, 60(sp)
+// 0x010b88f0: 0x10b88f0: lw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3042,7 +3042,7 @@ L_10b82a0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b82ac: 0x10b82ac: lw    s3, 56(sp)
+// 0x010b88f4: 0x10b88f4: lw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3051,7 +3051,7 @@ L_10b82a0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b82b0: 0x10b82b0: lw    s2, 52(sp)
+// 0x010b88f8: 0x10b88f8: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3060,7 +3060,7 @@ L_10b82a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b82b4: 0x10b82b4: lw    s1, 48(sp)
+// 0x010b88fc: 0x10b88fc: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3069,7 +3069,7 @@ L_10b82a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b82b8: 0x10b82b8: lw    s0, 44(sp)
+// 0x010b8900: 0x10b8900: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3078,7 +3078,7 @@ L_10b82a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b82bc: 0x10b82bc: jr    ra addiu sp, sp, 72
+// 0x010b8904: 0x10b8904: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3090,7 +3090,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void editor_plugin_shutdown_10b82c4()
+.method public static void editor_plugin_shutdown_10b890c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3101,13 +3101,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b82c4:
-// 0x010b82c4: 0x10b82c4: jr    ra sll   zero, zero, 0
+L_10b890c:
+// 0x010b890c: 0x10b890c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 editor_plugin_get_override_10b82d8()
+.method public static int32 editor_plugin_get_override_10b8920()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3124,10 +3124,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b82d8: 0x10b82d8: lui   v0, 0x0
+// 0x010b8920: 0x10b8920: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x010b82dc: 0x10b82dc: lw    v0, 19308(v0)
+// 0x010b8924: 0x10b8924: lw    v0, 19308(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -3136,13 +3136,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x010b82e0: 0x10b82e0: jr    ra sll   zero, zero, 0
+// 0x010b8928: 0x10b8928: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_plugin_register_10b8308(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_register_10b8950(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3177,16 +3177,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8308: 0x10b8308: lui   a0, 0x0
+// 0x010b8950: 0x10b8950: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b830c: 0x10b830c: addiu sp, sp, -24
+// 0x010b8954: 0x10b8954: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b8310: 0x10b8310: sw    ra, 20(sp)
-// 0x010b8314: 0x10b8314: jal   0x10146b8 addiu a0, a0, 19312
+// 0x010b8958: 0x10b8958: sw    ra, 20(sp)
+// 0x010b895c: 0x10b895c: jal   0x10146c8 addiu a0, a0, 19312
 	ldloc.1
 	ldc.i4 19312
 	add
@@ -3195,14 +3195,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_plugin_register_10146b8(int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_plugin_register_10146c8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010b831c: 0x10b831c: lw    ra, 20(sp)
-// 0x010b8320: 0x10b8320: sll   zero, zero, 0
-// 0x010b8324: 0x10b8324: jr    ra addiu sp, sp, 24
+// 0x010b8964: 0x10b8964: lw    ra, 20(sp)
+// 0x010b8968: 0x10b8968: sll   zero, zero, 0
+// 0x010b896c: 0x10b896c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3214,7 +3214,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_plugin_get_direction_10b832c(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_get_direction_10b8974(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 s0,int32 v0,int32 ra)
@@ -3252,13 +3252,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b832c:
-// 0x010b832c: 0x10b832c: addiu sp, sp, -32
+L_10b8974:
+// 0x010b8974: 0x10b8974: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b8330: 0x10b8330: lw    a0, 4(a0)
+// 0x010b8978: 0x10b8978: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3267,7 +3267,7 @@ L_10b832c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8334: 0x10b8334: sw    s0, 24(sp)
+// 0x010b897c: 0x10b897c: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3276,11 +3276,11 @@ L_10b832c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b8338: 0x10b8338: addu  s0, a1, zero
+// 0x010b8980: 0x10b8980: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010b833c: 0x10b833c: sw    ra, 28(sp)
-// 0x010b8340: 0x10b8340: jal   0x10b586c addiu a1, sp, 16
+// 0x010b8984: 0x10b8984: sw    ra, 28(sp)
+// 0x010b8988: 0x10b8988: jal   0x10b5eb4 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3290,18 +3290,18 @@ L_10b832c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_direction_10b586c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_direction_10b5eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010b8348: 0x10b8348: bne   v0, zero, 0x10b835c addu  v1, zero, zero
+// 0x010b8990: 0x10b8990: bne   v0, zero, 0x10b89a4 addu  v1, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10b835c
+	brtrue L_10b89a4
 // --- basic block ---
-// 0x010b8350: 0x10b8350: lw    v1, 16(sp)
+// 0x010b8998: 0x10b8998: lw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3310,18 +3310,18 @@ L_10b832c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b8354: 0x10b8354: sll   zero, zero, 0
-// 0x010b8358: 0x10b8358: and   v1, s0, v1
+// 0x010b899c: 0x10b899c: sll   zero, zero, 0
+// 0x010b89a0: 0x10b89a0: and   v1, s0, v1
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-L_10b835c:
-// 0x010b835c: 0x10b835c: lw    ra, 28(sp)
-// 0x010b8360: 0x10b8360: addu  v0, v1, zero
+L_10b89a4:
+// 0x010b89a4: 0x10b89a4: lw    ra, 28(sp)
+// 0x010b89a8: 0x10b89a8: addu  v0, v1, zero
 	ldloc 5
 	stloc 8
-// 0x010b8364: 0x10b8364: lw    s0, 24(sp)
+// 0x010b89ac: 0x10b89ac: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3330,7 +3330,7 @@ L_10b835c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8368: 0x10b8368: jr    ra addiu sp, sp, 32
+// 0x010b89b0: 0x10b89b0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3342,7 +3342,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 editor_plugin_street_properties_10b8370(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_street_properties_10b89b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -3383,20 +3383,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b8370:
-// 0x010b8370: 0x10b8370: lw    v0, 0(a0)
+L_10b89b8:
+// 0x010b89b8: 0x10b89b8: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b8374: 0x10b8374: addiu sp, sp, -40
+// 0x010b89bc: 0x10b89bc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b8378: 0x10b8378: sw    s1, 32(sp)
+// 0x010b89c0: 0x10b89c0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3405,7 +3405,7 @@ L_10b8370:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b837c: 0x10b837c: sw    s0, 28(sp)
+// 0x010b89c4: 0x10b89c4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3414,20 +3414,20 @@ L_10b8370:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b8380: 0x10b8380: sw    ra, 36(sp)
-// 0x010b8384: 0x10b8384: addu  s1, a0, zero
+// 0x010b89c8: 0x10b89c8: sw    ra, 36(sp)
+// 0x010b89cc: 0x10b89cc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b8388: 0x10b8388: bne   v0, zero, 0x10b83b8 addu  s0, a1, zero
+// 0x010b89d0: 0x10b89d0: bne   v0, zero, 0x10b8a00 addu  s0, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 7
-	brtrue L_10b83b8
+	brtrue L_10b8a00
 // --- basic block ---
-// 0x010b8390: 0x10b8390: lui   v0, 0x0
+// 0x010b89d8: 0x10b89d8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b8394: 0x10b8394: lw    v0, 576(v0)
+// 0x010b89dc: 0x10b89dc: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3436,7 +3436,7 @@ L_10b8370:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8398: 0x10b8398: lw    a0, 12(a0)
+// 0x010b89e0: 0x10b89e0: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3445,30 +3445,30 @@ L_10b8370:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b839c: 0x10b839c: sll   zero, zero, 0
-// 0x010b83a0: 0x10b83a0: beq   a0, v0, 0x10b83b8 sll   zero, zero, 0
+// 0x010b89e4: 0x10b89e4: sll   zero, zero, 0
+// 0x010b89e8: 0x10b89e8: beq   a0, v0, 0x10b8a00 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10b83b8
+	beq  L_10b8a00
 // --- basic block ---
-// 0x010b83a8: 0x10b83a8: bltz  a0, 0x10b83b8 sll   zero, zero, 0
+// 0x010b89f0: 0x10b89f0: bltz  a0, 0x10b8a00 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b83b8
+	blt L_10b8a00
 // --- basic block ---
-// 0x010b83b0: 0x10b83b0: jal   0x100b164 sll   zero, zero, 0
+// 0x010b89f8: 0x10b89f8: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10b83b8:
-// 0x010b83b8: 0x10b83b8: lw    a0, 4(s1)
+L_10b8a00:
+// 0x010b8a00: 0x10b8a00: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3477,7 +3477,7 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b83bc: 0x10b83bc: jal   0x10b58c8 addiu a1, sp, 16
+// 0x010b8a04: 0x10b8a04: jal   0x10b5f10 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3487,12 +3487,12 @@ L_10b83b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b83c4: 0x10b83c4: lw    a0, 16(sp)
+// 0x010b8a0c: 0x10b8a0c: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3501,11 +3501,11 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b83c8: 0x10b83c8: jal   0x10b4a88 sll   zero, zero, 0
-	call int32 Cibyl134::editor_street_get_street_address_10b4a88()
+// 0x010b8a10: 0x10b8a10: jal   0x10b50d0 sll   zero, zero, 0
+	call int32 Cibyl134::editor_street_get_street_address_10b50d0()
 	stloc 6
 // --- basic block ---
-// 0x010b83d0: 0x10b83d0: lw    a0, 16(sp)
+// 0x010b8a18: 0x10b8a18: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3514,7 +3514,7 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b83d4: 0x10b83d4: jal   0x10b4bfc sw    v0, 0(s0)
+// 0x010b8a1c: 0x10b8a1c: jal   0x10b5244 sw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3526,12 +3526,12 @@ L_10b83b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_name_10b4bfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_name_10b5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b83dc: 0x10b83dc: lw    a0, 16(sp)
+// 0x010b8a24: 0x10b8a24: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3540,7 +3540,7 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b83e0: 0x10b83e0: jal   0x10b4a94 sw    v0, 4(s0)
+// 0x010b8a28: 0x10b8a28: jal   0x10b50dc sw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3554,12 +3554,12 @@ L_10b83b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_t2s_10b4a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_t2s_10b50dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b83e8: 0x10b83e8: lw    a0, 16(sp)
+// 0x010b8a30: 0x10b8a30: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3568,7 +3568,7 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b83ec: 0x10b83ec: jal   0x10b4aec sw    v0, 8(s0)
+// 0x010b8a34: 0x10b8a34: jal   0x10b5134 sw    v0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3582,12 +3582,12 @@ L_10b83b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_city_10b4aec(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_city_10b5134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b83f4: 0x10b83f4: sw    v0, 12(s0)
+// 0x010b8a3c: 0x10b8a3c: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3596,14 +3596,14 @@ L_10b83b8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b83f8: 0x10b83f8: lw    v1, 0(s1)
+// 0x010b8a40: 0x10b8a40: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010b83fc: 0x10b83fc: lw    v0, 16(sp)
+// 0x010b8a44: 0x10b8a44: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3612,8 +3612,8 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8400: 0x10b8400: lw    ra, 36(sp)
-// 0x010b8404: 0x10b8404: sw    v0, 24(s0)
+// 0x010b8a48: 0x10b8a48: lw    ra, 36(sp)
+// 0x010b8a4c: 0x10b8a4c: sw    v0, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3622,7 +3622,7 @@ L_10b83b8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b8408: 0x10b8408: sw    v1, 16(s0)
+// 0x010b8a50: 0x10b8a50: sw    v1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3631,7 +3631,7 @@ L_10b83b8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b840c: 0x10b840c: lw    s1, 32(sp)
+// 0x010b8a54: 0x10b8a54: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3640,7 +3640,7 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b8410: 0x10b8410: lw    s0, 28(sp)
+// 0x010b8a58: 0x10b8a58: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3649,7 +3649,7 @@ L_10b83b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8414: 0x10b8414: jr    ra addiu sp, sp, 40
+// 0x010b8a5c: 0x10b8a5c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3661,7 +3661,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_plugin_get_street_10b841c(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_get_street_10b8a64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -3702,20 +3702,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b841c:
-// 0x010b841c: 0x10b841c: lw    v0, 0(a0)
+L_10b8a64:
+// 0x010b8a64: 0x10b8a64: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b8420: 0x10b8420: addiu sp, sp, -40
+// 0x010b8a68: 0x10b8a68: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b8424: 0x10b8424: sw    s1, 32(sp)
+// 0x010b8a6c: 0x10b8a6c: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3724,7 +3724,7 @@ L_10b841c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b8428: 0x10b8428: sw    s0, 28(sp)
+// 0x010b8a70: 0x10b8a70: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3733,20 +3733,20 @@ L_10b841c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b842c: 0x10b842c: sw    ra, 36(sp)
-// 0x010b8430: 0x10b8430: addu  s0, a0, zero
+// 0x010b8a74: 0x10b8a74: sw    ra, 36(sp)
+// 0x010b8a78: 0x10b8a78: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b8434: 0x10b8434: bne   v0, zero, 0x10b8464 addu  s1, a1, zero
+// 0x010b8a7c: 0x10b8a7c: bne   v0, zero, 0x10b8aac addu  s1, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 8
-	brtrue L_10b8464
+	brtrue L_10b8aac
 // --- basic block ---
-// 0x010b843c: 0x10b843c: lui   v0, 0x0
+// 0x010b8a84: 0x10b8a84: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b8440: 0x10b8440: lw    v0, 576(v0)
+// 0x010b8a88: 0x10b8a88: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3755,7 +3755,7 @@ L_10b841c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8444: 0x10b8444: lw    a0, 12(a0)
+// 0x010b8a8c: 0x10b8a8c: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3764,30 +3764,30 @@ L_10b841c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8448: 0x10b8448: sll   zero, zero, 0
-// 0x010b844c: 0x10b844c: beq   a0, v0, 0x10b8464 sll   zero, zero, 0
+// 0x010b8a90: 0x10b8a90: sll   zero, zero, 0
+// 0x010b8a94: 0x10b8a94: beq   a0, v0, 0x10b8aac sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10b8464
+	beq  L_10b8aac
 // --- basic block ---
-// 0x010b8454: 0x10b8454: bltz  a0, 0x10b8464 sll   zero, zero, 0
+// 0x010b8a9c: 0x10b8a9c: bltz  a0, 0x10b8aac sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b8464
+	blt L_10b8aac
 // --- basic block ---
-// 0x010b845c: 0x10b845c: jal   0x100b164 sll   zero, zero, 0
+// 0x010b8aa4: 0x10b8aa4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10b8464:
-// 0x010b8464: 0x10b8464: lw    a0, 4(s0)
+L_10b8aac:
+// 0x010b8aac: 0x10b8aac: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3796,7 +3796,7 @@ L_10b8464:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8468: 0x10b8468: jal   0x10b58c8 addiu a1, sp, 16
+// 0x010b8ab0: 0x10b8ab0: jal   0x10b5f10 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3806,22 +3806,22 @@ L_10b8464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8470: 0x10b8470: addiu v1, zero, -1
+// 0x010b8ab8: 0x10b8ab8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b8474: 0x10b8474: bne   v0, v1, 0x10b8480 lui   v1, 0x0
+// 0x010b8abc: 0x10b8abc: bne   v0, v1, 0x10b8ac8 lui   v1, 0x0
 	ldloc 6
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	bne.un L_10b8480
+	bne.un L_10b8ac8
 // --- basic block ---
-// 0x010b847c: 0x10b847c: sw    v0, 16(sp)
+// 0x010b8ac4: 0x10b8ac4: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3830,8 +3830,8 @@ L_10b8464:
 	add
 	ldloc 6
 	stelem.i4
-L_10b8480:
-// 0x010b8480: 0x10b8480: lw    v1, 18812(v1)
+L_10b8ac8:
+// 0x010b8ac8: 0x10b8ac8: lw    v1, 18812(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3840,7 +3840,7 @@ L_10b8480:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8484: 0x10b8484: lw    v0, 12(s0)
+// 0x010b8acc: 0x10b8acc: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3849,14 +3849,14 @@ L_10b8480:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8488: 0x10b8488: sw    v1, 0(s1)
+// 0x010b8ad0: 0x10b8ad0: sw    v1, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010b848c: 0x10b848c: lw    v1, 16(sp)
+// 0x010b8ad4: 0x10b8ad4: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3865,8 +3865,8 @@ L_10b8480:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8490: 0x10b8490: lw    ra, 36(sp)
-// 0x010b8494: 0x10b8494: sw    v1, 8(s1)
+// 0x010b8ad8: 0x10b8ad8: lw    ra, 36(sp)
+// 0x010b8adc: 0x10b8adc: sw    v1, 8(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3875,7 +3875,7 @@ L_10b8480:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b8498: 0x10b8498: sw    v0, 4(s1)
+// 0x010b8ae0: 0x10b8ae0: sw    v0, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3884,7 +3884,7 @@ L_10b8480:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b849c: 0x10b849c: lw    s0, 28(sp)
+// 0x010b8ae4: 0x10b8ae4: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3893,7 +3893,7 @@ L_10b8480:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b84a0: 0x10b84a0: lw    s1, 32(sp)
+// 0x010b8ae8: 0x10b8ae8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3902,7 +3902,7 @@ L_10b8480:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b84a4: 0x10b84a4: jr    ra addiu sp, sp, 40
+// 0x010b8aec: 0x10b8aec: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3914,7 +3914,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_plugin_street_full_name_10b84ac(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_street_full_name_10b8af4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3952,20 +3952,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b84ac:
-// 0x010b84ac: 0x10b84ac: lw    v0, 0(a0)
+L_10b8af4:
+// 0x010b8af4: 0x10b8af4: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b84b0: 0x10b84b0: addiu sp, sp, -32
+// 0x010b8af8: 0x10b8af8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b84b4: 0x10b84b4: sw    s0, 24(sp)
+// 0x010b8afc: 0x10b8afc: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3974,17 +3974,17 @@ L_10b84ac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b84b8: 0x10b84b8: sw    ra, 28(sp)
-// 0x010b84bc: 0x10b84bc: bne   v0, zero, 0x10b84ec addu  s0, a0, zero
+// 0x010b8b00: 0x10b8b00: sw    ra, 28(sp)
+// 0x010b8b04: 0x10b8b04: bne   v0, zero, 0x10b8b34 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brtrue L_10b84ec
+	brtrue L_10b8b34
 // --- basic block ---
-// 0x010b84c4: 0x10b84c4: lui   v0, 0x0
+// 0x010b8b0c: 0x10b8b0c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b84c8: 0x10b84c8: lw    v0, 576(v0)
+// 0x010b8b10: 0x10b8b10: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3993,7 +3993,7 @@ L_10b84ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b84cc: 0x10b84cc: lw    a0, 12(a0)
+// 0x010b8b14: 0x10b8b14: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4002,30 +4002,30 @@ L_10b84ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b84d0: 0x10b84d0: sll   zero, zero, 0
-// 0x010b84d4: 0x10b84d4: beq   a0, v0, 0x10b84ec sll   zero, zero, 0
+// 0x010b8b18: 0x10b8b18: sll   zero, zero, 0
+// 0x010b8b1c: 0x10b8b1c: beq   a0, v0, 0x10b8b34 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10b84ec
+	beq  L_10b8b34
 // --- basic block ---
-// 0x010b84dc: 0x10b84dc: bltz  a0, 0x10b84ec sll   zero, zero, 0
+// 0x010b8b24: 0x10b8b24: bltz  a0, 0x10b8b34 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b84ec
+	blt L_10b8b34
 // --- basic block ---
-// 0x010b84e4: 0x10b84e4: jal   0x100b164 sll   zero, zero, 0
+// 0x010b8b2c: 0x10b8b2c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b84ec:
-// 0x010b84ec: 0x10b84ec: lw    a0, 4(s0)
+L_10b8b34:
+// 0x010b8b34: 0x10b8b34: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4034,7 +4034,7 @@ L_10b84ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b84f0: 0x10b84f0: jal   0x10b58c8 addiu a1, sp, 16
+// 0x010b8b38: 0x10b8b38: jal   0x10b5f10 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4044,22 +4044,22 @@ L_10b84ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b84f8: 0x10b84f8: addiu a0, zero, -1
+// 0x010b8b40: 0x10b8b40: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010b84fc: 0x10b84fc: beq   v0, a0, 0x10b8514 addu  v1, zero, zero
+// 0x010b8b44: 0x10b8b44: beq   v0, a0, 0x10b8b5c addu  v1, zero, zero
 	ldloc 5
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	beq  L_10b8514
+	beq  L_10b8b5c
 // --- basic block ---
-// 0x010b8504: 0x10b8504: lw    a0, 16(sp)
+// 0x010b8b4c: 0x10b8b4c: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4068,26 +4068,26 @@ L_10b84ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8508: 0x10b8508: jal   0x10b4c94 sll   zero, zero, 0
+// 0x010b8b50: 0x10b8b50: jal   0x10b52dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_full_name_10b4c94(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_full_name_10b52dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8510: 0x10b8510: addu  v1, v0, zero
+// 0x010b8b58: 0x10b8b58: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_10b8514:
-// 0x010b8514: 0x10b8514: lw    ra, 28(sp)
-// 0x010b8518: 0x10b8518: addu  v0, v1, zero
+L_10b8b5c:
+// 0x010b8b5c: 0x10b8b5c: lw    ra, 28(sp)
+// 0x010b8b60: 0x10b8b60: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x010b851c: 0x10b851c: lw    s0, 24(sp)
+// 0x010b8b64: 0x10b8b64: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4096,7 +4096,7 @@ L_10b8514:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b8520: 0x10b8520: jr    ra addiu sp, sp, 32
+// 0x010b8b68: 0x10b8b68: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4108,7 +4108,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_plugin_activate_db_10b8528(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_activate_db_10b8b70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4143,8 +4143,8 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b8528:
-// 0x010b8528: 0x10b8528: lw    a0, 16(a0)
+L_10b8b70:
+// 0x010b8b70: 0x10b8b70: lw    a0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4153,26 +4153,26 @@ L_10b8528:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b852c: 0x10b852c: addiu sp, sp, -24
+// 0x010b8b74: 0x10b8b74: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b8530: 0x10b8530: sw    ra, 20(sp)
-// 0x010b8534: 0x10b8534: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010b8b78: 0x10b8b78: sw    ra, 20(sp)
+// 0x010b8b7c: 0x10b8b7c: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010b853c: 0x10b853c: lw    ra, 20(sp)
-// 0x010b8540: 0x10b8540: sll   zero, zero, 0
-// 0x010b8544: 0x10b8544: jr    ra addiu sp, sp, 24
+// 0x010b8b84: 0x10b8b84: lw    ra, 20(sp)
+// 0x010b8b88: 0x10b8b88: sll   zero, zero, 0
+// 0x010b8b8c: 0x10b8b8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4184,7 +4184,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_plugin_line_to_10b854c(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_line_to_10b8b94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -4222,20 +4222,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b854c:
-// 0x010b854c: 0x10b854c: lw    v0, 0(a0)
+L_10b8b94:
+// 0x010b8b94: 0x10b8b94: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b8550: 0x10b8550: addiu sp, sp, -40
+// 0x010b8b98: 0x10b8b98: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b8554: 0x10b8554: sw    s0, 32(sp)
+// 0x010b8b9c: 0x10b8b9c: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4244,17 +4244,17 @@ L_10b854c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b8558: 0x10b8558: sw    ra, 36(sp)
-// 0x010b855c: 0x10b855c: bne   v0, zero, 0x10b8590 addu  s0, a0, zero
+// 0x010b8ba0: 0x10b8ba0: sw    ra, 36(sp)
+// 0x010b8ba4: 0x10b8ba4: bne   v0, zero, 0x10b8bd8 addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brtrue L_10b8590
+	brtrue L_10b8bd8
 // --- basic block ---
-// 0x010b8564: 0x10b8564: lui   v0, 0x0
+// 0x010b8bac: 0x10b8bac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b8568: 0x10b8568: lw    v0, 576(v0)
+// 0x010b8bb0: 0x10b8bb0: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4263,7 +4263,7 @@ L_10b854c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b856c: 0x10b856c: lw    a0, 12(a0)
+// 0x010b8bb4: 0x10b8bb4: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4272,18 +4272,18 @@ L_10b854c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8570: 0x10b8570: sll   zero, zero, 0
-// 0x010b8574: 0x10b8574: beq   a0, v0, 0x10b8590 sll   zero, zero, 0
+// 0x010b8bb8: 0x10b8bb8: sll   zero, zero, 0
+// 0x010b8bbc: 0x10b8bbc: beq   a0, v0, 0x10b8bd8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10b8590
+	beq  L_10b8bd8
 // --- basic block ---
-// 0x010b857c: 0x10b857c: bltz  a0, 0x10b8590 sll   zero, zero, 0
+// 0x010b8bc4: 0x10b8bc4: bltz  a0, 0x10b8bd8 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b8590
+	blt L_10b8bd8
 // --- basic block ---
-// 0x010b8584: 0x10b8584: jal   0x100b164 sw    a1, 24(sp)
+// 0x010b8bcc: 0x10b8bcc: jal   0x100b174 sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4297,12 +4297,12 @@ L_10b854c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b858c: 0x10b858c: lw    a1, 24(sp)
+// 0x010b8bd4: 0x10b8bd4: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4311,8 +4311,8 @@ L_10b854c:
 	add
 	ldelem.i4
 	stloc.2
-L_10b8590:
-// 0x010b8590: 0x10b8590: lw    a0, 4(s0)
+L_10b8bd8:
+// 0x010b8bd8: 0x10b8bd8: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4321,16 +4321,16 @@ L_10b8590:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8594: 0x10b8594: addu  a2, a1, zero
+// 0x010b8bdc: 0x10b8bdc: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010b8598: 0x10b8598: addu  a3, zero, zero
+// 0x010b8be0: 0x10b8be0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b859c: 0x10b859c: addu  a1, zero, zero
+// 0x010b8be4: 0x10b8be4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b85a0: 0x10b85a0: sw    zero, 16(sp)
+// 0x010b8be8: 0x10b8be8: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4339,7 +4339,7 @@ L_10b8590:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b85a4: 0x10b85a4: jal   0x10b5d30 sw    zero, 20(sp)
+// 0x010b8bec: 0x10b8bec: jal   0x10b6378 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4353,13 +4353,13 @@ L_10b8590:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b85ac: 0x10b85ac: lw    ra, 36(sp)
-// 0x010b85b0: 0x10b85b0: lw    s0, 32(sp)
+// 0x010b8bf4: 0x10b8bf4: lw    ra, 36(sp)
+// 0x010b8bf8: 0x10b8bf8: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4368,7 +4368,7 @@ L_10b8590:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b85b4: 0x10b85b4: jr    ra addiu sp, sp, 40
+// 0x010b8bfc: 0x10b8bfc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4380,7 +4380,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_plugin_line_from_10b85bc(int32,int32,int32,int32,int32)
+.method public static int32 editor_plugin_line_from_10b8c04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -4418,20 +4418,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b85bc:
-// 0x010b85bc: 0x10b85bc: lw    v0, 0(a0)
+L_10b8c04:
+// 0x010b8c04: 0x10b8c04: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b85c0: 0x10b85c0: addiu sp, sp, -40
+// 0x010b8c08: 0x10b8c08: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010b85c4: 0x10b85c4: sw    s0, 32(sp)
+// 0x010b8c0c: 0x10b8c0c: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4440,17 +4440,17 @@ L_10b85bc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b85c8: 0x10b85c8: sw    ra, 36(sp)
-// 0x010b85cc: 0x10b85cc: bne   v0, zero, 0x10b8600 addu  s0, a0, zero
+// 0x010b8c10: 0x10b8c10: sw    ra, 36(sp)
+// 0x010b8c14: 0x10b8c14: bne   v0, zero, 0x10b8c48 addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brtrue L_10b8600
+	brtrue L_10b8c48
 // --- basic block ---
-// 0x010b85d4: 0x10b85d4: lui   v0, 0x0
+// 0x010b8c1c: 0x10b8c1c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010b85d8: 0x10b85d8: lw    v0, 576(v0)
+// 0x010b8c20: 0x10b8c20: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4459,7 +4459,7 @@ L_10b85bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b85dc: 0x10b85dc: lw    a0, 12(a0)
+// 0x010b8c24: 0x10b8c24: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4468,18 +4468,18 @@ L_10b85bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b85e0: 0x10b85e0: sll   zero, zero, 0
-// 0x010b85e4: 0x10b85e4: beq   a0, v0, 0x10b8600 sll   zero, zero, 0
+// 0x010b8c28: 0x10b8c28: sll   zero, zero, 0
+// 0x010b8c2c: 0x10b8c2c: beq   a0, v0, 0x10b8c48 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10b8600
+	beq  L_10b8c48
 // --- basic block ---
-// 0x010b85ec: 0x10b85ec: bltz  a0, 0x10b8600 sll   zero, zero, 0
+// 0x010b8c34: 0x10b8c34: bltz  a0, 0x10b8c48 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10b8600
+	blt L_10b8c48
 // --- basic block ---
-// 0x010b85f4: 0x10b85f4: jal   0x100b164 sw    a1, 24(sp)
+// 0x010b8c3c: 0x10b8c3c: jal   0x100b174 sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4493,12 +4493,12 @@ L_10b85bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b85fc: 0x10b85fc: lw    a1, 24(sp)
+// 0x010b8c44: 0x10b8c44: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4507,8 +4507,8 @@ L_10b85bc:
 	add
 	ldelem.i4
 	stloc.2
-L_10b8600:
-// 0x010b8600: 0x10b8600: lw    a0, 4(s0)
+L_10b8c48:
+// 0x010b8c48: 0x10b8c48: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4517,13 +4517,13 @@ L_10b8600:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8604: 0x10b8604: addu  a2, zero, zero
+// 0x010b8c4c: 0x10b8c4c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b8608: 0x10b8608: addu  a3, zero, zero
+// 0x010b8c50: 0x10b8c50: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b860c: 0x10b860c: sw    zero, 16(sp)
+// 0x010b8c54: 0x10b8c54: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4532,7 +4532,7 @@ L_10b8600:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b8610: 0x10b8610: jal   0x10b5d30 sw    zero, 20(sp)
+// 0x010b8c58: 0x10b8c58: jal   0x10b6378 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4546,13 +4546,13 @@ L_10b8600:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010b8618: 0x10b8618: lw    ra, 36(sp)
-// 0x010b861c: 0x10b861c: lw    s0, 32(sp)
+// 0x010b8c60: 0x10b8c60: lw    ra, 36(sp)
+// 0x010b8c64: 0x10b8c64: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4561,7 +4561,7 @@ L_10b8600:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8620: 0x10b8620: jr    ra addiu sp, sp, 40
+// 0x010b8c68: 0x10b8c68: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4573,7 +4573,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 upload_file_size_callback_10b8628()
+.method public static int32 upload_file_size_callback_10b8c70()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4587,8 +4587,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b8628:
-// 0x010b8628: 0x10b8628: jr    ra addiu v0, zero, 1
+L_10b8c70:
+// 0x010b8c70: 0x10b8c70: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -4596,7 +4596,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void upload_progress_callback_10b8630()
+.method public static void upload_progress_callback_10b8c78()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -4607,13 +4607,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b8630:
-// 0x010b8630: 0x10b8630: jr    ra sll   zero, zero, 0
+L_10b8c78:
+// 0x010b8c78: 0x10b8c78: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 upload_10b8638(int32,int32,int32,int32,int32)
+.method public static int32 upload_10b8c80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4663,13 +4663,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8638: 0x10b8638: addiu sp, sp, -48
+// 0x010b8c80: 0x10b8c80: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010b863c: 0x10b863c: sw    ra, 44(sp)
-// 0x010b8640: 0x10b8640: sw    s3, 36(sp)
+// 0x010b8c84: 0x10b8c84: sw    ra, 44(sp)
+// 0x010b8c88: 0x10b8c88: sw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4678,7 +4678,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b8644: 0x10b8644: sw    s2, 32(sp)
+// 0x010b8c8c: 0x10b8c8c: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4687,7 +4687,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b8648: 0x10b8648: sw    s1, 28(sp)
+// 0x010b8c90: 0x10b8c90: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4696,7 +4696,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b864c: 0x10b864c: sw    s0, 24(sp)
+// 0x010b8c94: 0x10b8c94: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4705,7 +4705,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b8650: 0x10b8650: jal   0x104c504 sw    s4, 40(sp)
+// 0x010b8c98: 0x10b8c98: jal   0x104c514 sw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4719,15 +4719,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8658: 0x10b8658: addiu a0, zero, 8
+// 0x010b8ca0: 0x10b8ca0: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x010b865c: 0x10b865c: jal   0x1000910 addu  s3, v0, zero
+// 0x010b8ca4: 0x10b8ca4: jal   0x1000910 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4740,15 +4740,15 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8664: 0x10b8664: lui   a0, 0xe0000
+// 0x010b8cac: 0x10b8cac: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b8668: 0x10b8668: addiu a0, a0, -17536
+// 0x010b8cb0: 0x10b8cb0: addiu a0, a0, -17072
 	ldloc.1
-	ldc.i4 -17536
+	ldc.i4 -17072
 	add
 	stloc.1
-// 0x010b866c: 0x10b866c: jal   0x1001ba8 addu  s1, v0, zero
+// 0x010b8cb4: 0x10b8cb4: jal   0x1001ba8 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -4761,25 +4761,25 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8674: 0x10b8674: lui   a0, 0x20000
+// 0x010b8cbc: 0x10b8cbc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b8678: 0x10b8678: addiu a0, a0, 20168
+// 0x010b8cc0: 0x10b8cc0: addiu a0, a0, 20628
 	ldloc.1
-	ldc.i4 20168
+	ldc.i4 20628
 	add
 	stloc.1
-// 0x010b867c: 0x10b867c: lui   s0, 0xe0000
+// 0x010b8cc4: 0x10b8cc4: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010b8680: 0x10b8680: sw    v0, 0(s1)
+// 0x010b8cc8: 0x10b8cc8: sw    v0, 0(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b8684: 0x10b8684: jal   0x101cd60 sw    zero, 4(s1)
+// 0x010b8ccc: 0x10b8ccc: jal   0x101cd70 sw    zero, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4793,17 +4793,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b868c: 0x10b868c: addu  a1, v0, zero
+// 0x010b8cd4: 0x10b8cd4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010b8690: 0x10b8690: jal   0x1001b68 addiu a0, s0, -17664
+// 0x010b8cd8: 0x10b8cd8: jal   0x1001b68 addiu a0, s0, -17200
 	ldloc 8
-	ldc.i4 -17664
+	ldc.i4 -17200
 	add
 	stloc.1
 	ldloc.1
@@ -4813,52 +4813,52 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8698: 0x10b8698: jal   0x104c3d0 addiu a0, s0, -17664
+// 0x010b8ce0: 0x10b8ce0: jal   0x104c3e0 addiu a0, s0, -17200
 	ldloc 8
-	ldc.i4 -17664
+	ldc.i4 -17200
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b86a0: 0x10b86a0: jal   0x104fc04 addu  s2, zero, zero
+// 0x010b8ce8: 0x10b8ce8: jal   0x104fc14 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	call void Cibyl59::roadmap_main_flush_104fc04()
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010b86a8: 0x10b86a8: j	 0x10b86b4 addu  v0, s1, zero
+// 0x010b8cf0: 0x10b8cf0: j	 0x10b8cfc addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-	br L_10b86b4
+	br L_10b8cfc
 // --- basic block ---
-L_10b86b0:
-// 0x010b86b0: 0x10b86b0: addiu s2, s2, 1
+L_10b8cf8:
+// 0x010b8cf8: 0x10b8cf8: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10b86b4:
-// 0x010b86b4: 0x10b86b4: lw    v1, 0(v0)
+L_10b8cfc:
+// 0x010b8cfc: 0x10b8cfc: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010b86b8: 0x10b86b8: sll   zero, zero, 0
-// 0x010b86bc: 0x10b86bc: bne   v1, zero, 0x10b86b0 addiu v0, v0, 4
+// 0x010b8d00: 0x10b8d00: sll   zero, zero, 0
+// 0x010b8d04: 0x10b8d04: bne   v1, zero, 0x10b8cf8 addiu v0, v0, 4
 	ldloc 6
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brtrue L_10b86b0
+	brtrue L_10b8cf8
 // --- basic block ---
-// 0x010b86c4: 0x10b86c4: lui   a0, 0x0
+// 0x010b8d0c: 0x10b8d0c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b86c8: 0x10b86c8: jal   0x100e348 addiu a0, a0, 19372
+// 0x010b8d10: 0x10b8d10: jal   0x100e358 addiu a0, a0, 19372
 	ldloc.1
 	ldc.i4 19372
 	add
@@ -4868,15 +4868,15 @@ L_10b86b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b86d0: 0x10b86d0: addiu a0, zero, 20
+// 0x010b8d18: 0x10b8d18: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x010b86d4: 0x10b86d4: jal   0x1000910 addu  s4, v0, zero
+// 0x010b8d1c: 0x10b8d1c: jal   0x1000910 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -4889,17 +4889,17 @@ L_10b86b4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b86dc: 0x10b86dc: lw    a1, 0(s1)
+// 0x010b8d24: 0x10b8d24: lw    a1, 0(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b86e0: 0x10b86e0: addu  a0, s3, zero
+// 0x010b8d28: 0x10b8d28: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010b86e4: 0x10b86e4: sw    s2, 16(v0)
+// 0x010b8d2c: 0x10b8d2c: sw    s2, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4908,7 +4908,7 @@ L_10b86b4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b86e8: 0x10b86e8: sw    s1, 8(v0)
+// 0x010b8d30: 0x10b8d30: sw    s1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4917,7 +4917,7 @@ L_10b86b4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b86ec: 0x10b86ec: sw    s1, 4(v0)
+// 0x010b8d34: 0x10b8d34: sw    s1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4926,7 +4926,7 @@ L_10b86b4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b86f0: 0x10b86f0: sw    zero, 12(v0)
+// 0x010b8d38: 0x10b8d38: sw    zero, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4935,7 +4935,7 @@ L_10b86b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b86f4: 0x10b86f4: jal   0x104cb30 addu  s0, v0, zero
+// 0x010b8d3c: 0x10b8d3c: jal   0x104cb40 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4943,30 +4943,30 @@ L_10b86b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b86fc: 0x10b86fc: lui   a0, 0x20000
+// 0x010b8d44: 0x10b8d44: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b8700: 0x10b8700: addiu a0, a0, 20168
+// 0x010b8d48: 0x10b8d48: addiu a0, a0, 20628
 	ldloc.1
-	ldc.i4 20168
+	ldc.i4 20628
 	add
 	stloc.1
-// 0x010b8704: 0x10b8704: sw    v0, 0(s0)
+// 0x010b8d4c: 0x10b8d4c: sw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b8708: 0x10b8708: addu  s2, v0, zero
+// 0x010b8d50: 0x10b8d50: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010b870c: 0x10b870c: jal   0x101cd60 lui   s3, 0xe0000
+// 0x010b8d54: 0x10b8d54: jal   0x101cd70 lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 11
 	ldloc.0
@@ -4974,12 +4974,12 @@ L_10b86b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8714: 0x10b8714: lw    v1, 16(s0)
+// 0x010b8d5c: 0x10b8d5c: lw    v1, 16(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4988,26 +4988,26 @@ L_10b86b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8718: 0x10b8718: lui   a1, 0x20000
+// 0x010b8d60: 0x10b8d60: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b871c: 0x10b871c: addiu a1, a1, 20188
+// 0x010b8d64: 0x10b8d64: addiu a1, a1, 20648
 	ldloc.2
-	ldc.i4 20188
+	ldc.i4 20648
 	add
 	stloc.2
-// 0x010b8720: 0x10b8720: addu  a2, v0, zero
+// 0x010b8d68: 0x10b8d68: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b8724: 0x10b8724: addiu a3, zero, 1
+// 0x010b8d6c: 0x10b8d6c: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010b8728: 0x10b8728: addiu a0, s3, -17664
+// 0x010b8d70: 0x10b8d70: addiu a0, s3, -17200
 	ldloc 11
-	ldc.i4 -17664
+	ldc.i4 -17200
 	add
 	stloc.1
-// 0x010b872c: 0x10b872c: jal   0x1000f64 sw    v1, 16(sp)
+// 0x010b8d74: 0x10b8d74: jal   0x1000f64 sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5026,41 +5026,41 @@ L_10b86b4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8734: 0x10b8734: jal   0x104c3d0 addiu a0, s3, -17664
+// 0x010b8d7c: 0x10b8d7c: jal   0x104c3e0 addiu a0, s3, -17200
 	ldloc 11
-	ldc.i4 -17664
+	ldc.i4 -17200
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b873c: 0x10b873c: jal   0x104fc04 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_flush_104fc04()
+// 0x010b8d84: 0x10b8d84: jal   0x104fc14 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010b8744: 0x10b8744: lui   a1, 0x0
+// 0x010b8d8c: 0x10b8d8c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b8748: 0x10b8748: lui   a3, 0x20000
+// 0x010b8d90: 0x10b8d90: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b874c: 0x10b874c: addiu a1, a1, 19388
+// 0x010b8d94: 0x10b8d94: addiu a1, a1, 19388
 	ldloc.2
 	ldc.i4 19388
 	add
 	stloc.2
-// 0x010b8750: 0x10b8750: addu  a2, s4, zero
+// 0x010b8d98: 0x10b8d98: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x010b8754: 0x10b8754: addiu a3, a3, 20200
+// 0x010b8d9c: 0x10b8d9c: addiu a3, a3, 20660
 	ldloc 4
-	ldc.i4 20200
+	ldc.i4 20660
 	add
 	stloc 4
-// 0x010b8758: 0x10b8758: addu  a0, s2, zero
+// 0x010b8da0: 0x10b8da0: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010b875c: 0x10b875c: jal   0x10b8e20 sw    s0, 16(sp)
+// 0x010b8da4: 0x10b8da4: jal   0x10b9468 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5074,40 +5074,40 @@ L_10b86b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_upload_auto_10b8e20(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_upload_auto_10b9468(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8764: 0x10b8764: beq   v0, zero, 0x10b87b0 addiu v1, zero, 1
+// 0x010b8dac: 0x10b8dac: beq   v0, zero, 0x10b8df8 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_10b87b0
+	brfalse L_10b8df8
 // --- basic block ---
-// 0x010b876c: 0x10b876c: lui   a1, 0x20000
+// 0x010b8db4: 0x10b8db4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8770: 0x10b8770: lui   a3, 0x20000
+// 0x010b8db8: 0x10b8db8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b8774: 0x10b8774: addiu a1, a1, 20212
+// 0x010b8dbc: 0x10b8dbc: addiu a1, a1, 20672
 	ldloc.2
-	ldc.i4 20212
+	ldc.i4 20672
 	add
 	stloc.2
-// 0x010b8778: 0x10b8778: addiu a3, a3, 20244
+// 0x010b8dc0: 0x10b8dc0: addiu a3, a3, 20704
 	ldloc 4
-	ldc.i4 20244
+	ldc.i4 20704
 	add
 	stloc 4
-// 0x010b877c: 0x10b877c: addiu a2, zero, 334
+// 0x010b8dc4: 0x10b8dc4: addiu a2, zero, 334
 	ldc.i4 334
 	stloc.3
-// 0x010b8780: 0x10b8780: addiu a0, zero, 4
+// 0x010b8dc8: 0x10b8dc8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b8784: 0x10b8784: jal   0x100449c sw    s2, 16(sp)
+// 0x010b8dcc: 0x10b8dcc: jal   0x100449c sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5126,7 +5126,7 @@ L_10b86b4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b878c: 0x10b878c: jal   0x104c670 addu  a0, s2, zero
+// 0x010b8dd4: 0x10b8dd4: jal   0x104c680 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5134,12 +5134,12 @@ L_10b86b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b8794: 0x10b8794: jal   0x104c690 addu  a0, s1, zero
+// 0x010b8ddc: 0x10b8ddc: jal   0x104c6a0 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5147,18 +5147,18 @@ L_10b86b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_list_free_104c690(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_list_free_104c6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b879c: 0x10b879c: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010b8de4: 0x10b8de4: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b87a4: 0x10b87a4: jal   0x1000930 addu  a0, s0, zero
+// 0x010b8dec: 0x10b8dec: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5171,15 +5171,15 @@ L_10b86b4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b87ac: 0x10b87ac: addu  v1, zero, zero
+// 0x010b8df4: 0x10b8df4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10b87b0:
-// 0x010b87b0: 0x10b87b0: lw    ra, 44(sp)
-// 0x010b87b4: 0x10b87b4: addu  v0, v1, zero
+L_10b8df8:
+// 0x010b8df8: 0x10b8df8: lw    ra, 44(sp)
+// 0x010b8dfc: 0x10b8dfc: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010b87b8: 0x10b87b8: lw    s4, 40(sp)
+// 0x010b8e00: 0x10b8e00: lw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5188,7 +5188,7 @@ L_10b87b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b87bc: 0x10b87bc: lw    s3, 36(sp)
+// 0x010b8e04: 0x10b8e04: lw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5197,7 +5197,7 @@ L_10b87b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b87c0: 0x10b87c0: lw    s2, 32(sp)
+// 0x010b8e08: 0x10b8e08: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5206,7 +5206,7 @@ L_10b87b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b87c4: 0x10b87c4: lw    s1, 28(sp)
+// 0x010b8e0c: 0x10b8e0c: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5215,7 +5215,7 @@ L_10b87b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b87c8: 0x10b87c8: lw    s0, 24(sp)
+// 0x010b8e10: 0x10b8e10: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5224,7 +5224,7 @@ L_10b87b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b87cc: 0x10b87cc: jr    ra addiu sp, sp, 48
+// 0x010b8e14: 0x10b8e14: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5236,7 +5236,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 upload_done_10b87d4(int32,int32,int32,int32,int32)
+.method public static int32 upload_done_10b8e1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s5,int32 s3,int32 s4,int32 ra)
@@ -5289,13 +5289,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b87d4:
-// 0x010b87d4: 0x10b87d4: addiu sp, sp, -560
+L_10b8e1c:
+// 0x010b8e1c: 0x10b8e1c: addiu sp, sp, -560
 	ldloc.0
 	ldc.i4 -560
 	add
 	stloc.0
-// 0x010b87d8: 0x10b87d8: sw    s0, 532(sp)
+// 0x010b8e20: 0x10b8e20: sw    s0, 532(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5304,8 +5304,8 @@ L_10b87d4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b87dc: 0x10b87dc: sw    ra, 556(sp)
-// 0x010b87e0: 0x10b87e0: sw    s5, 552(sp)
+// 0x010b8e24: 0x10b8e24: sw    ra, 556(sp)
+// 0x010b8e28: 0x10b8e28: sw    s5, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5314,7 +5314,7 @@ L_10b87d4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b87e4: 0x10b87e4: sw    s4, 548(sp)
+// 0x010b8e2c: 0x10b8e2c: sw    s4, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5323,7 +5323,7 @@ L_10b87d4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b87e8: 0x10b87e8: sw    s3, 544(sp)
+// 0x010b8e30: 0x10b8e30: sw    s3, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5332,7 +5332,7 @@ L_10b87d4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b87ec: 0x10b87ec: sw    s2, 540(sp)
+// 0x010b8e34: 0x10b8e34: sw    s2, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5341,7 +5341,7 @@ L_10b87d4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b87f0: 0x10b87f0: sw    s1, 536(sp)
+// 0x010b8e38: 0x10b8e38: sw    s1, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5350,7 +5350,7 @@ L_10b87d4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b87f4: 0x10b87f4: sw    a2, 568(sp)
+// 0x010b8e3c: 0x10b8e3c: sw    a2, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5359,7 +5359,7 @@ L_10b87d4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b87f8: 0x10b87f8: sw    a3, 572(sp)
+// 0x010b8e40: 0x10b8e40: sw    a3, 572(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5368,35 +5368,35 @@ L_10b87d4:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b87fc: 0x10b87fc: beq   a1, zero, 0x10b8850 addu  s0, a0, zero
+// 0x010b8e44: 0x10b8e44: beq   a1, zero, 0x10b8e98 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 9
-	brfalse L_10b8850
+	brfalse L_10b8e98
 // --- basic block ---
-// 0x010b8804: 0x10b8804: addiu v0, sp, 568
+// 0x010b8e4c: 0x10b8e4c: addiu v0, sp, 568
 	ldloc.0
 	ldc.i4 568
 	add
 	stloc 5
-// 0x010b8808: 0x10b8808: addiu s1, sp, 28
+// 0x010b8e50: 0x10b8e50: addiu s1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 8
-// 0x010b880c: 0x10b880c: addu  a2, a1, zero
+// 0x010b8e54: 0x10b8e54: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010b8810: 0x10b8810: addu  a3, v0, zero
+// 0x010b8e58: 0x10b8e58: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b8814: 0x10b8814: addu  a0, s1, zero
+// 0x010b8e5c: 0x10b8e5c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b8818: 0x10b8818: addiu a1, zero, 500
+// 0x010b8e60: 0x10b8e60: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010b881c: 0x10b881c: jal   0x10c0a70 sw    v0, 24(sp)
+// 0x010b8e64: 0x10b8e64: jal   0x10c10b0 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5410,12 +5410,12 @@ L_10b87d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8824: 0x10b8824: lw    v0, 8(s0)
+// 0x010b8e6c: 0x10b8e6c: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5424,36 +5424,36 @@ L_10b87d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b8828: 0x10b8828: lui   a1, 0x20000
+// 0x010b8e70: 0x10b8e70: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b882c: 0x10b882c: lw    v0, 0(v0)
+// 0x010b8e74: 0x10b8e74: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b8830: 0x10b8830: lui   a3, 0x0
+// 0x010b8e78: 0x10b8e78: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010b8834: 0x10b8834: addiu a1, a1, 20212
+// 0x010b8e7c: 0x10b8e7c: addiu a1, a1, 20672
 	ldloc.2
-	ldc.i4 20212
+	ldc.i4 20672
 	add
 	stloc.2
-// 0x010b8838: 0x10b8838: addiu a3, a3, 26512
+// 0x010b8e80: 0x10b8e80: addiu a3, a3, 26512
 	ldloc 4
 	ldc.i4 26512
 	add
 	stloc 4
-// 0x010b883c: 0x10b883c: addiu a0, zero, 1
+// 0x010b8e84: 0x10b8e84: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010b8840: 0x10b8840: addiu a2, zero, 133
+// 0x010b8e88: 0x10b8e88: addiu a2, zero, 133
 	ldc.i4 133
 	stloc.3
-// 0x010b8844: 0x10b8844: sw    v0, 16(sp)
+// 0x010b8e8c: 0x10b8e8c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5462,7 +5462,7 @@ L_10b87d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b8848: 0x10b8848: jal   0x100449c sw    s1, 20(sp)
+// 0x010b8e90: 0x10b8e90: jal   0x100449c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5481,8 +5481,8 @@ L_10b87d4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b8850:
-// 0x010b8850: 0x10b8850: lw    s5, 12(s0)
+L_10b8e98:
+// 0x010b8e98: 0x10b8e98: lw    s5, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5491,7 +5491,7 @@ L_10b8850:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b8854: 0x10b8854: lw    s4, 16(s0)
+// 0x010b8e9c: 0x10b8e9c: lw    s4, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5500,19 +5500,19 @@ L_10b8850:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b8858: 0x10b8858: lw    a1, 0(s0)
+// 0x010b8ea0: 0x10b8ea0: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b885c: 0x10b885c: addiu s3, s5, 1
+// 0x010b8ea4: 0x10b8ea4: addiu s3, s5, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010b8860: 0x10b8860: lw    s1, 8(s0)
+// 0x010b8ea8: 0x10b8ea8: lw    s1, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5521,7 +5521,7 @@ L_10b8850:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b8864: 0x10b8864: jal   0x104da04 addu  a0, zero, zero
+// 0x010b8eac: 0x10b8eac: jal   0x104da14 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5529,19 +5529,19 @@ L_10b8850:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b886c: 0x10b886c: bne   s3, s4, 0x10b88a8 lui   v0, 0xe0000
+// 0x010b8eb4: 0x10b8eb4: bne   s3, s4, 0x10b8ef0 lui   v0, 0xe0000
 	ldloc 12
 	ldloc 13
 	ldc.i4 917504
 	stloc 5
-	bne.un L_10b88a8
+	bne.un L_10b8ef0
 // --- basic block ---
-// 0x010b8874: 0x10b8874: lw    a0, 4(s0)
+// 0x010b8ebc: 0x10b8ebc: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5550,12 +5550,12 @@ L_10b8850:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8878: 0x10b8878: jal   0x104c690 sw    zero, -17668(v0)
+// 0x010b8ec0: 0x10b8ec0: jal   0x104c6a0 sw    zero, -17204(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4417
+	ldc.i4 -4301
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5564,34 +5564,34 @@ L_10b8850:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_list_free_104c690(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_list_free_104c6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8880: 0x10b8880: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010b8ec8: 0x10b8ec8: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8888: 0x10b8888: lui   a0, 0x10000
+// 0x010b8ed0: 0x10b8ed0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b888c: 0x10b888c: lui   a1, 0x20000
+// 0x010b8ed4: 0x10b8ed4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8890: 0x10b8890: addiu a0, a0, -14268
+// 0x010b8ed8: 0x10b8ed8: addiu a0, a0, -14272
 	ldloc.1
-	ldc.i4 -14268
+	ldc.i4 -14272
 	add
 	stloc.1
-// 0x010b8894: 0x10b8894: addiu a1, a1, 20276
+// 0x010b8edc: 0x10b8edc: addiu a1, a1, 20736
 	ldloc.2
-	ldc.i4 20276
+	ldc.i4 20736
 	add
 	stloc.2
-// 0x010b8898: 0x10b8898: jal   0x104bfe4 addiu a2, zero, 3
+// 0x010b8ee0: 0x10b8ee0: jal   0x104bff4 addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
 	ldloc.0
@@ -5599,21 +5599,21 @@ L_10b8850:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b88a0: 0x10b88a0: j	 0x10b89b0 sll   zero, zero, 0
-	br L_10b89b0
+// 0x010b8ee8: 0x10b8ee8: j	 0x10b8ff8 sll   zero, zero, 0
+	br L_10b8ff8
 // --- basic block ---
-L_10b88a8:
-// 0x010b88a8: 0x10b88a8: lui   a0, 0x20000
+L_10b8ef0:
+// 0x010b8ef0: 0x10b8ef0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b88ac: 0x10b88ac: jal   0x101cd60 addiu a0, a0, 20168
+// 0x010b8ef4: 0x10b8ef4: jal   0x101cd70 addiu a0, a0, 20628
 	ldloc.1
-	ldc.i4 20168
+	ldc.i4 20628
 	add
 	stloc.1
 	ldloc.0
@@ -5621,36 +5621,36 @@ L_10b88a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b88b4: 0x10b88b4: lui   s2, 0xe0000
+// 0x010b8efc: 0x10b8efc: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010b88b8: 0x10b88b8: lui   a1, 0x20000
+// 0x010b8f00: 0x10b8f00: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b88bc: 0x10b88bc: addiu a3, s5, 2
+// 0x010b8f04: 0x10b8f04: addiu a3, s5, 2
 	ldloc 11
 	ldc.i4.2
 	add
 	stloc 4
-// 0x010b88c0: 0x10b88c0: addu  a2, v0, zero
+// 0x010b8f08: 0x10b8f08: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b88c4: 0x10b88c4: addiu a1, a1, 20188
+// 0x010b8f0c: 0x10b8f0c: addiu a1, a1, 20648
 	ldloc.2
-	ldc.i4 20188
+	ldc.i4 20648
 	add
 	stloc.2
-// 0x010b88c8: 0x10b88c8: addiu a0, s2, -17664
+// 0x010b8f10: 0x10b8f10: addiu a0, s2, -17200
 	ldloc 10
-	ldc.i4 -17664
+	ldc.i4 -17200
 	add
 	stloc.1
-// 0x010b88cc: 0x10b88cc: jal   0x1000f64 sw    s4, 16(sp)
+// 0x010b8f14: 0x10b8f14: jal   0x1000f64 sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5669,34 +5669,34 @@ L_10b88a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b88d4: 0x10b88d4: jal   0x104c3d0 addiu a0, s2, -17664
+// 0x010b8f1c: 0x10b8f1c: jal   0x104c3e0 addiu a0, s2, -17200
 	ldloc 10
-	ldc.i4 -17664
+	ldc.i4 -17200
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b88dc: 0x10b88dc: jal   0x104fc04 addiu s5, s1, 4
+// 0x010b8f24: 0x10b8f24: jal   0x104fc14 addiu s5, s1, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 11
-	call void Cibyl59::roadmap_main_flush_104fc04()
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010b88e4: 0x10b88e4: jal   0x104c504 sll   zero, zero, 0
+// 0x010b8f2c: 0x10b8f2c: jal   0x104c514 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b88ec: 0x10b88ec: lw    a1, 4(s1)
+// 0x010b8f34: 0x10b8f34: lw    a1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5705,7 +5705,7 @@ L_10b88a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b88f0: 0x10b88f0: jal   0x104cb30 addu  a0, v0, zero
+// 0x010b8f38: 0x10b8f38: jal   0x104cb40 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5713,15 +5713,15 @@ L_10b88a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b88f8: 0x10b88f8: addiu a0, zero, 20
+// 0x010b8f40: 0x10b8f40: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x010b88fc: 0x10b88fc: jal   0x1000910 addu  s2, v0, zero
+// 0x010b8f44: 0x10b8f44: jal   0x1000910 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -5734,10 +5734,10 @@ L_10b88a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8904: 0x10b8904: addu  s1, v0, zero
+// 0x010b8f4c: 0x10b8f4c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010b8908: 0x10b8908: lw    v0, 4(s0)
+// 0x010b8f50: 0x10b8f50: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5746,15 +5746,15 @@ L_10b88a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b890c: 0x10b890c: lui   a0, 0x0
+// 0x010b8f54: 0x10b8f54: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8910: 0x10b8910: addiu a0, a0, 19372
+// 0x010b8f58: 0x10b8f58: addiu a0, a0, 19372
 	ldloc.1
 	ldc.i4 19372
 	add
 	stloc.1
-// 0x010b8914: 0x10b8914: sw    s5, 8(s1)
+// 0x010b8f5c: 0x10b8f5c: sw    s5, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5763,7 +5763,7 @@ L_10b88a8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b8918: 0x10b8918: sw    v0, 4(s1)
+// 0x010b8f60: 0x10b8f60: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5772,7 +5772,7 @@ L_10b88a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b891c: 0x10b891c: sw    s4, 16(s1)
+// 0x010b8f64: 0x10b8f64: sw    s4, 16(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5781,14 +5781,14 @@ L_10b88a8:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b8920: 0x10b8920: sw    s2, 0(s1)
+// 0x010b8f68: 0x10b8f68: sw    s2, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010b8924: 0x10b8924: jal   0x100e348 sw    s3, 12(s1)
+// 0x010b8f6c: 0x10b8f6c: jal   0x100e358 sw    s3, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5802,34 +5802,34 @@ L_10b88a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b892c: 0x10b892c: lui   a1, 0x0
+// 0x010b8f74: 0x10b8f74: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b8930: 0x10b8930: lui   a3, 0x20000
+// 0x010b8f78: 0x10b8f78: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b8934: 0x10b8934: addiu a1, a1, 19388
+// 0x010b8f7c: 0x10b8f7c: addiu a1, a1, 19388
 	ldloc.2
 	ldc.i4 19388
 	add
 	stloc.2
-// 0x010b8938: 0x10b8938: addu  a2, v0, zero
+// 0x010b8f80: 0x10b8f80: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b893c: 0x10b893c: addiu a3, a3, 20200
+// 0x010b8f84: 0x10b8f84: addiu a3, a3, 20660
 	ldloc 4
-	ldc.i4 20200
+	ldc.i4 20660
 	add
 	stloc 4
-// 0x010b8940: 0x10b8940: addu  a0, s2, zero
+// 0x010b8f88: 0x10b8f88: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010b8944: 0x10b8944: jal   0x10b8e20 sw    s1, 16(sp)
+// 0x010b8f8c: 0x10b8f8c: jal   0x10b9468 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5843,37 +5843,37 @@ L_10b88a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_upload_auto_10b8e20(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_upload_auto_10b9468(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b894c: 0x10b894c: beq   v0, zero, 0x10b89b0 lui   a1, 0x20000
+// 0x010b8f94: 0x10b8f94: beq   v0, zero, 0x10b8ff8 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_10b89b0
+	brfalse L_10b8ff8
 // --- basic block ---
-// 0x010b8954: 0x10b8954: lui   a3, 0x20000
+// 0x010b8f9c: 0x10b8f9c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b8958: 0x10b8958: addiu a1, a1, 20212
+// 0x010b8fa0: 0x10b8fa0: addiu a1, a1, 20672
 	ldloc.2
-	ldc.i4 20212
+	ldc.i4 20672
 	add
 	stloc.2
-// 0x010b895c: 0x10b895c: addiu a3, a3, 20312
+// 0x010b8fa4: 0x10b8fa4: addiu a3, a3, 20772
 	ldloc 4
-	ldc.i4 20312
+	ldc.i4 20772
 	add
 	stloc 4
-// 0x010b8960: 0x10b8960: addiu a2, zero, 161
+// 0x010b8fa8: 0x10b8fa8: addiu a2, zero, 161
 	ldc.i4 161
 	stloc.3
-// 0x010b8964: 0x10b8964: addiu a0, zero, 4
+// 0x010b8fac: 0x10b8fac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b8968: 0x10b8968: sw    s3, 20(sp)
+// 0x010b8fb0: 0x10b8fb0: sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5882,7 +5882,7 @@ L_10b88a8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b896c: 0x10b896c: jal   0x100449c sw    s2, 16(sp)
+// 0x010b8fb4: 0x10b8fb4: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5901,7 +5901,7 @@ L_10b88a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8974: 0x10b8974: jal   0x104c670 addu  a0, s2, zero
+// 0x010b8fbc: 0x10b8fbc: jal   0x104c680 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5909,12 +5909,12 @@ L_10b88a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b897c: 0x10b897c: lw    a0, 4(s1)
+// 0x010b8fc4: 0x10b8fc4: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5923,40 +5923,40 @@ L_10b88a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8980: 0x10b8980: jal   0x104c690 sll   zero, zero, 0
+// 0x010b8fc8: 0x10b8fc8: jal   0x104c6a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_list_free_104c690(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_list_free_104c6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8988: 0x10b8988: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010b8fd0: 0x10b8fd0: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8990: 0x10b8990: lui   a0, 0x0
+// 0x010b8fd8: 0x10b8fd8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8994: 0x10b8994: lui   a1, 0x20000
+// 0x010b8fdc: 0x10b8fdc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8998: 0x10b8998: addiu a0, a0, 30152
+// 0x010b8fe0: 0x10b8fe0: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b899c: 0x10b899c: addiu a1, a1, 20356
+// 0x010b8fe4: 0x10b8fe4: addiu a1, a1, 20816
 	ldloc.2
-	ldc.i4 20356
+	ldc.i4 20816
 	add
 	stloc.2
-// 0x010b89a0: 0x10b89a0: jal   0x104bfe4 addiu a2, zero, 5
+// 0x010b8fe8: 0x10b8fe8: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -5964,43 +5964,43 @@ L_10b88a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b89a8: 0x10b89a8: lui   v0, 0xe0000
+// 0x010b8ff0: 0x10b8ff0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b89ac: 0x10b89ac: sw    zero, -17668(v0)
+// 0x010b8ff4: 0x10b8ff4: sw    zero, -17204(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4417
+	ldc.i4 -4301
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10b89b0:
-// 0x010b89b0: 0x10b89b0: lw    a0, 0(s0)
+L_10b8ff8:
+// 0x010b8ff8: 0x10b8ff8: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b89b4: 0x10b89b4: jal   0x104c670 sll   zero, zero, 0
+// 0x010b8ffc: 0x10b8ffc: jal   0x104c680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b89bc: 0x10b89bc: jal   0x1000930 addu  a0, s0, zero
+// 0x010b9004: 0x10b9004: jal   0x1000930 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6013,8 +6013,8 @@ L_10b89b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b89c4: 0x10b89c4: lw    ra, 556(sp)
-// 0x010b89c8: 0x10b89c8: lw    s5, 552(sp)
+// 0x010b900c: 0x10b900c: lw    ra, 556(sp)
+// 0x010b9010: 0x10b9010: lw    s5, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6023,7 +6023,7 @@ L_10b89b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b89cc: 0x10b89cc: lw    s4, 548(sp)
+// 0x010b9014: 0x10b9014: lw    s4, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6032,7 +6032,7 @@ L_10b89b0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b89d0: 0x10b89d0: lw    s3, 544(sp)
+// 0x010b9018: 0x10b9018: lw    s3, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6041,7 +6041,7 @@ L_10b89b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b89d4: 0x10b89d4: lw    s2, 540(sp)
+// 0x010b901c: 0x10b901c: lw    s2, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6050,7 +6050,7 @@ L_10b89b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b89d8: 0x10b89d8: lw    s1, 536(sp)
+// 0x010b9020: 0x10b9020: lw    s1, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6059,7 +6059,7 @@ L_10b89b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b89dc: 0x10b89dc: lw    s0, 532(sp)
+// 0x010b9024: 0x10b9024: lw    s0, 532(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6068,7 +6068,7 @@ L_10b89b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b89e0: 0x10b89e0: jr    ra addiu sp, sp, 560
+// 0x010b9028: 0x10b9028: jr    ra addiu sp, sp, 560
 	ldloc.0
 	ldc.i4 560
 	add
@@ -6080,7 +6080,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 upload_error_callback_10b89e8(int32,int32,int32,int32,int32)
+.method public static int32 upload_error_callback_10b9030(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -6118,14 +6118,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b89e8:
-// 0x010b89e8: 0x10b89e8: addiu sp, sp, -24
+L_10b9030:
+// 0x010b9030: 0x10b9030: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b89ec: 0x10b89ec: sw    ra, 20(sp)
-// 0x010b89f0: 0x10b89f0: sw    s0, 16(sp)
+// 0x010b9034: 0x10b9034: sw    ra, 20(sp)
+// 0x010b9038: 0x10b9038: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6134,31 +6134,31 @@ L_10b89e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b89f4: 0x10b89f4: jal   0x104c3f0 addu  s0, a0, zero
+// 0x010b903c: 0x10b903c: jal   0x104c400 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b89fc: 0x10b89fc: lui   a0, 0x0
+// 0x010b9044: 0x10b9044: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8a00: 0x10b8a00: lui   a1, 0x20000
+// 0x010b9048: 0x10b9048: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8a04: 0x10b8a04: addiu a2, zero, 5
+// 0x010b904c: 0x10b904c: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x010b8a08: 0x10b8a08: addiu a0, a0, 30152
+// 0x010b9050: 0x10b9050: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b8a0c: 0x10b8a0c: jal   0x104bfe4 addiu a1, a1, 20356
+// 0x010b9054: 0x10b9054: jal   0x104bff4 addiu a1, a1, 20816
 	ldloc.2
-	ldc.i4 20356
+	ldc.i4 20816
 	add
 	stloc.2
 	ldloc.0
@@ -6166,30 +6166,30 @@ L_10b89e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8a14: 0x10b8a14: lw    a1, 0(s0)
+// 0x010b905c: 0x10b905c: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b8a18: 0x10b8a18: lui   v0, 0xe0000
+// 0x010b9060: 0x10b9060: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b8a1c: 0x10b8a1c: addu  a0, zero, zero
+// 0x010b9064: 0x10b9064: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8a20: 0x10b8a20: jal   0x104da04 sw    zero, -17668(v0)
+// 0x010b9068: 0x10b9068: jal   0x104da14 sw    zero, -17204(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4417
+	ldc.i4 -4301
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6198,12 +6198,12 @@ L_10b89e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8a28: 0x10b8a28: lw    a0, 4(s0)
+// 0x010b9070: 0x10b9070: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6212,36 +6212,36 @@ L_10b89e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8a2c: 0x10b8a2c: jal   0x104c690 sll   zero, zero, 0
+// 0x010b9074: 0x10b9074: jal   0x104c6a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_list_free_104c690(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_list_free_104c6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8a34: 0x10b8a34: lw    a0, 0(s0)
+// 0x010b907c: 0x10b907c: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b8a38: 0x10b8a38: jal   0x104c670 sll   zero, zero, 0
+// 0x010b9080: 0x10b9080: jal   0x104c680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8a40: 0x10b8a40: jal   0x1000930 addu  a0, s0, zero
+// 0x010b9088: 0x10b9088: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6254,8 +6254,8 @@ L_10b89e8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8a48: 0x10b8a48: lw    ra, 20(sp)
-// 0x010b8a4c: 0x10b8a4c: lw    s0, 16(sp)
+// 0x010b9090: 0x10b9090: lw    ra, 20(sp)
+// 0x010b9094: 0x10b9094: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6264,7 +6264,7 @@ L_10b89e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8a50: 0x10b8a50: jr    ra addiu sp, sp, 24
+// 0x010b9098: 0x10b9098: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6276,7 +6276,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 prepare_for_upload_10b8a58(int32,int32,int32,int32,int32)
+.method public static int32 prepare_for_upload_10b90a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s6,int32 s2,int32 s5,int32 s8,int32 s3,int32 s7,int32 s1,int32 s4,int32 ra)
@@ -6338,13 +6338,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8a58: 0x10b8a58: addiu sp, sp, -392
+// 0x010b90a0: 0x10b90a0: addiu sp, sp, -392
 	ldloc.0
 	ldc.i4 -392
 	add
 	stloc.0
-// 0x010b8a5c: 0x10b8a5c: sw    ra, 388(sp)
-// 0x010b8a60: 0x10b8a60: sw    s4, 368(sp)
+// 0x010b90a4: 0x10b90a4: sw    ra, 388(sp)
+// 0x010b90a8: 0x10b90a8: sw    s4, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6353,7 +6353,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b8a64: 0x10b8a64: sw    s3, 364(sp)
+// 0x010b90ac: 0x10b90ac: sw    s3, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6362,7 +6362,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b8a68: 0x10b8a68: sw    s1, 356(sp)
+// 0x010b90b0: 0x10b90b0: sw    s1, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6371,7 +6371,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b8a6c: 0x10b8a6c: sw    s8, 384(sp)
+// 0x010b90b4: 0x10b90b4: sw    s8, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6380,7 +6380,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b8a70: 0x10b8a70: sw    s7, 380(sp)
+// 0x010b90b8: 0x10b90b8: sw    s7, 380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6389,7 +6389,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b8a74: 0x10b8a74: sw    s6, 376(sp)
+// 0x010b90bc: 0x10b90bc: sw    s6, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6398,7 +6398,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b8a78: 0x10b8a78: sw    s5, 372(sp)
+// 0x010b90c0: 0x10b90c0: sw    s5, 372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6407,7 +6407,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b8a7c: 0x10b8a7c: sw    s2, 360(sp)
+// 0x010b90c4: 0x10b90c4: sw    s2, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6416,7 +6416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b8a80: 0x10b8a80: jal   0x104c544 sw    s0, 352(sp)
+// 0x010b90c8: 0x10b90c8: jal   0x104c554 sw    s0, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6430,73 +6430,73 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_gps_104c544(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_gps_104c554(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8a88: 0x10b8a88: lui   a1, 0x20000
+// 0x010b90d0: 0x10b90d0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8a8c: 0x10b8a8c: addu  a0, v0, zero
+// 0x010b90d4: 0x10b90d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b8a90: 0x10b8a90: addiu a1, a1, 20376
+// 0x010b90d8: 0x10b90d8: addiu a1, a1, 20836
 	ldloc.2
-	ldc.i4 20376
+	ldc.i4 20836
 	add
 	stloc.2
-// 0x010b8a94: 0x10b8a94: jal   0x104c464 addu  s4, v0, zero
+// 0x010b90dc: 0x10b90dc: jal   0x104c474 addu  s4, v0, zero
 	ldloc 5
 	stloc 16
-	call int32 Cibyl56::roadmap_path_list_104c464()
+	call int32 Cibyl56::roadmap_path_list_104c474()
 	stloc 5
 // --- basic block ---
-// 0x010b8a9c: 0x10b8a9c: addu  s1, v0, zero
+// 0x010b90e4: 0x10b90e4: addu  s1, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010b8aa0: 0x10b8aa0: j	 0x10b8aac addiu s3, zero, 1
+// 0x010b90e8: 0x10b90e8: j	 0x10b90f4 addiu s3, zero, 1
 	ldc.i4.1
 	stloc 13
-	br L_10b8aac
+	br L_10b90f4
 // --- basic block ---
-L_10b8aa8:
-// 0x010b8aa8: 0x10b8aa8: addiu s3, s3, 1
+L_10b90f0:
+// 0x010b90f0: 0x10b90f0: addiu s3, s3, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-L_10b8aac:
-// 0x010b8aac: 0x10b8aac: lw    v1, 0(v0)
+L_10b90f4:
+// 0x010b90f4: 0x10b90f4: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b8ab0: 0x10b8ab0: sll   zero, zero, 0
-// 0x010b8ab4: 0x10b8ab4: bne   v1, zero, 0x10b8aa8 addiu v0, v0, 4
+// 0x010b90f8: 0x10b90f8: sll   zero, zero, 0
+// 0x010b90fc: 0x10b90fc: bne   v1, zero, 0x10b90f0 addiu v0, v0, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brtrue L_10b8aa8
+	brtrue L_10b90f0
 // --- basic block ---
-// 0x010b8abc: 0x10b8abc: addiu a0, sp, 48
+// 0x010b9104: 0x10b9104: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010b8ac0: 0x10b8ac0: cibyl_sysc_arg 0x4
+// 0x010b9108: 0x10b9108: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010b8ac4: 0x10b8ac4: cibyl_sysc 0x2389
+// 0x010b910c: 0x10b910c: cibyl_sysc 0x2389
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010b8ac8: 0x10b8ac8: addu  v1, v0, zero
+// 0x010b9110: 0x10b9110: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010b8acc: 0x10b8acc: jal   0x10c3558 lui   s6, 0x20000
+// 0x010b9114: 0x10b9114: jal   0x10c3b98 lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.0
@@ -6504,27 +6504,27 @@ L_10b8aac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8ad4: 0x10b8ad4: addiu a0, sp, 76
+// 0x010b911c: 0x10b911c: addiu a0, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.1
-// 0x010b8ad8: 0x10b8ad8: jal   0x104f650 addu  s0, v0, zero
+// 0x010b9120: 0x10b9120: jal   0x104f660 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl59::roadmap_time_get_time_104f650(int32,int32)
+	call int32 Cibyl59::roadmap_time_get_time_104f660(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8ae0: 0x10b8ae0: lw    v0, 76(sp)
+// 0x010b9128: 0x10b9128: lw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6533,12 +6533,12 @@ L_10b8aac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b8ae4: 0x10b8ae4: addiu a3, sp, 68
+// 0x010b912c: 0x10b912c: addiu a3, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 4
-// 0x010b8ae8: 0x10b8ae8: sw    v0, 8(s0)
+// 0x010b9130: 0x10b9130: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6547,7 +6547,7 @@ L_10b8aac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b8aec: 0x10b8aec: lw    v0, 80(sp)
+// 0x010b9134: 0x10b9134: lw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6556,20 +6556,20 @@ L_10b8aac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b8af0: 0x10b8af0: addu  a0, a3, zero
+// 0x010b9138: 0x10b9138: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x010b8af4: 0x10b8af4: addiu s5, sp, 60
+// 0x010b913c: 0x10b913c: addiu s5, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 11
-// 0x010b8af8: 0x10b8af8: addiu a1, s6, 20384
+// 0x010b9140: 0x10b9140: addiu a1, s6, 20844
 	ldloc 9
-	ldc.i4 20384
+	ldc.i4 20844
 	add
 	stloc.2
-// 0x010b8afc: 0x10b8afc: sw    v0, 4(s0)
+// 0x010b9144: 0x10b9144: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6578,7 +6578,7 @@ L_10b8aac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b8b00: 0x10b8b00: sw    a3, 348(sp)
+// 0x010b9148: 0x10b9148: sw    a3, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6587,7 +6587,7 @@ L_10b8aac:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b8b04: 0x10b8b04: jal   0x1001b68 addiu s2, sp, 52
+// 0x010b914c: 0x10b914c: jal   0x1001b68 addiu s2, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -6599,12 +6599,12 @@ L_10b8aac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8b0c: 0x10b8b0c: addu  a0, s5, zero
+// 0x010b9154: 0x10b9154: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x010b8b10: 0x10b8b10: jal   0x1001b68 addiu a1, s6, 20384
+// 0x010b9158: 0x10b9158: jal   0x1001b68 addiu a1, s6, 20844
 	ldloc 9
-	ldc.i4 20384
+	ldc.i4 20844
 	add
 	stloc.2
 	ldloc.1
@@ -6614,12 +6614,12 @@ L_10b8aac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8b18: 0x10b8b18: addiu a1, s6, 20384
+// 0x010b9160: 0x10b9160: addiu a1, s6, 20844
 	ldloc 9
-	ldc.i4 20384
+	ldc.i4 20844
 	add
 	stloc.2
-// 0x010b8b1c: 0x10b8b1c: jal   0x1001b68 addu  a0, s2, zero
+// 0x010b9164: 0x10b9164: jal   0x1001b68 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -6629,7 +6629,7 @@ L_10b8aac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8b24: 0x10b8b24: lw    v1, 8(s0)
+// 0x010b916c: 0x10b916c: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6638,7 +6638,7 @@ L_10b8aac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8b28: 0x10b8b28: lw    s8, 4(s0)
+// 0x010b9170: 0x10b9170: lw    s8, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6647,7 +6647,7 @@ L_10b8aac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b8b2c: 0x10b8b2c: jal   0x106ac04 sw    v1, 344(sp)
+// 0x010b9174: 0x10b9174: jal   0x106b228 sw    v1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6661,12 +6661,12 @@ L_10b8aac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::RealTime_GetUserName_106ac04(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::RealTime_GetUserName_106b228(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8b34: 0x10b8b34: jal   0x102c3f0 addu  s7, v0, zero
+// 0x010b917c: 0x10b917c: jal   0x102c400 addu  s7, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -6674,18 +6674,18 @@ L_10b8aac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8b3c: 0x10b8b3c: jal   0x100429c addu  s6, v0, zero
+// 0x010b9184: 0x10b9184: jal   0x100429c addu  s6, v0, zero
 	ldloc 5
 	stloc 9
 	call int32 Cibyl3::roadmap_log_filename_100429c()
 	stloc 5
 // --- basic block ---
-// 0x010b8b44: 0x10b8b44: lw    v1, 344(sp)
+// 0x010b918c: 0x10b918c: lw    v1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6694,7 +6694,7 @@ L_10b8aac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8b48: 0x10b8b48: lw    a3, 348(sp)
+// 0x010b9190: 0x10b9190: lw    a3, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6703,26 +6703,26 @@ L_10b8aac:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b8b4c: 0x10b8b4c: addiu s0, sp, 88
+// 0x010b9194: 0x10b9194: addiu s0, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc 8
-// 0x010b8b50: 0x10b8b50: lui   a2, 0x20000
+// 0x010b9198: 0x10b9198: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b8b54: 0x10b8b54: addiu a2, a2, 20388
+// 0x010b919c: 0x10b919c: addiu a2, a2, 20848
 	ldloc.3
-	ldc.i4 20388
+	ldc.i4 20848
 	add
 	stloc.3
-// 0x010b8b58: 0x10b8b58: addu  a0, s0, zero
+// 0x010b91a0: 0x10b91a0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b8b5c: 0x10b8b5c: addiu a1, zero, 256
+// 0x010b91a4: 0x10b91a4: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010b8b60: 0x10b8b60: sw    v1, 24(sp)
+// 0x010b91a8: 0x10b91a8: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6731,10 +6731,10 @@ L_10b8aac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b8b64: 0x10b8b64: addiu v1, zero, 70
+// 0x010b91ac: 0x10b91ac: addiu v1, zero, 70
 	ldc.i4.s 70
 	stloc 7
-// 0x010b8b68: 0x10b8b68: sw    v1, 36(sp)
+// 0x010b91b0: 0x10b91b0: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6743,7 +6743,7 @@ L_10b8aac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b8b6c: 0x10b8b6c: sw    s5, 16(sp)
+// 0x010b91b4: 0x10b91b4: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6752,7 +6752,7 @@ L_10b8aac:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b8b70: 0x10b8b70: sw    s2, 20(sp)
+// 0x010b91b8: 0x10b91b8: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6761,7 +6761,7 @@ L_10b8aac:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b8b74: 0x10b8b74: sw    s6, 40(sp)
+// 0x010b91bc: 0x10b91bc: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6770,7 +6770,7 @@ L_10b8aac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b8b78: 0x10b8b78: sw    s8, 28(sp)
+// 0x010b91c0: 0x10b91c0: sw    s8, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6779,7 +6779,7 @@ L_10b8aac:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b8b7c: 0x10b8b7c: sw    s7, 32(sp)
+// 0x010b91c4: 0x10b91c4: sw    s7, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6788,7 +6788,7 @@ L_10b8aac:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b8b80: 0x10b8b80: jal   0x1000f9c sw    v0, 44(sp)
+// 0x010b91c8: 0x10b91c8: jal   0x1000f9c sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6807,7 +6807,7 @@ L_10b8aac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8b88: 0x10b8b88: jal   0x1004454 addiu s2, zero, 6
+// 0x010b91d0: 0x10b91d0: jal   0x1004454 addiu s2, zero, 6
 	ldc.i4.6
 	stloc 10
 	ldloc.0
@@ -6820,13 +6820,13 @@ L_10b8aac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8b90: 0x10b8b90: jal   0x100429c addu  s5, v0, zero
+// 0x010b91d8: 0x10b91d8: jal   0x100429c addu  s5, v0, zero
 	ldloc 5
 	stloc 11
 	call int32 Cibyl3::roadmap_log_filename_100429c()
 	stloc 5
 // --- basic block ---
-// 0x010b8b98: 0x10b8b98: jal   0x104c504 addu  s6, v0, zero
+// 0x010b91e0: 0x10b91e0: jal   0x104c514 addu  s6, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -6834,39 +6834,39 @@ L_10b8aac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8ba0: 0x10b8ba0: addu  v1, v0, zero
+// 0x010b91e8: 0x10b91e8: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010b8ba4: 0x10b8ba4: cibyl_sysc_arg 0x15
+// 0x010b91ec: 0x10b91ec: cibyl_sysc_arg 0x15
 	ldloc 11
-// 0x010b8ba8: 0x10b8ba8: cibyl_sysc_arg 0x16
+// 0x010b91f0: 0x10b91f0: cibyl_sysc_arg 0x16
 	ldloc 9
-// 0x010b8bac: 0x10b8bac: cibyl_sysc_arg 0x3
+// 0x010b91f4: 0x10b91f4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010b8bb0: 0x10b8bb0: cibyl_sysc_arg 0x10
+// 0x010b91f8: 0x10b91f8: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010b8bb4: 0x10b8bb4: cibyl_sysc_arg 0x12
+// 0x010b91fc: 0x10b91fc: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x010b8bb8: 0x10b8bb8: cibyl_sysc 0x238e
+// 0x010b9200: 0x10b9200: cibyl_sysc 0x238e
 	call int32 [WazeWP7]Syscalls::NOPH_ZLib_compress(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010b8bbc: 0x10b8bbc: addu  s2, v0, zero
+// 0x010b9204: 0x10b9204: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010b8bc0: 0x10b8bc0: lui   a0, 0xe0000
+// 0x010b9208: 0x10b9208: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010b8bc4: 0x10b8bc4: addiu a0, a0, -17536
+// 0x010b920c: 0x10b920c: addiu a0, a0, -17072
 	ldloc.1
-	ldc.i4 -17536
+	ldc.i4 -17072
 	add
 	stloc.1
-// 0x010b8bc8: 0x10b8bc8: jal   0x1001b68 addu  a1, s0, zero
+// 0x010b9210: 0x10b9210: jal   0x1001b68 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -6876,69 +6876,69 @@ L_10b8aac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8bd0: 0x10b8bd0: bne   s2, zero, 0x10b8c88 lui   s6, 0xe0000
+// 0x010b9218: 0x10b9218: bne   s2, zero, 0x10b92d0 lui   s6, 0xe0000
 	ldloc 10
 	ldc.i4 917504
 	stloc 9
-	brtrue L_10b8c88
+	brtrue L_10b92d0
 // --- basic block ---
-// 0x010b8bd8: 0x10b8bd8: lui   s8, 0x20000
+// 0x010b9220: 0x10b9220: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x010b8bdc: 0x10b8bdc: addu  s5, s0, zero
+// 0x010b9224: 0x10b9224: addu  s5, s0, zero
 	ldloc 8
 	stloc 11
-// 0x010b8be0: 0x10b8be0: addiu s6, s6, -17664
+// 0x010b9228: 0x10b9228: addiu s6, s6, -17200
 	ldloc 9
-	ldc.i4 -17664
+	ldc.i4 -17200
 	add
 	stloc 9
-// 0x010b8be4: 0x10b8be4: addiu s8, s8, 20452
+// 0x010b922c: 0x10b922c: addiu s8, s8, 20912
 	ldloc 12
-	ldc.i4 20452
+	ldc.i4 20912
 	add
 	stloc 12
-// 0x010b8be8: 0x10b8be8: addu  s0, s1, zero
+// 0x010b9230: 0x10b9230: addu  s0, s1, zero
 	ldloc 15
 	stloc 8
-// 0x010b8bec: 0x10b8bec: addiu s2, zero, 1
+// 0x010b9234: 0x10b9234: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x010b8bf0: 0x10b8bf0: j	 0x10b8ca4 addiu s7, zero, 6
+// 0x010b9238: 0x10b9238: j	 0x10b92ec addiu s7, zero, 6
 	ldc.i4.6
 	stloc 14
-	br L_10b8ca4
+	br L_10b92ec
 // --- basic block ---
-L_10b8bf8:
-// 0x010b8bf8: 0x10b8bf8: jal   0x101cd60 sll   zero, zero, 0
+L_10b9240:
+// 0x010b9240: 0x10b9240: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8c00: 0x10b8c00: lui   a1, 0x20000
+// 0x010b9248: 0x10b9248: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8c04: 0x10b8c04: addu  a3, s2, zero
+// 0x010b924c: 0x10b924c: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x010b8c08: 0x10b8c08: addiu a1, a1, 20188
+// 0x010b9250: 0x10b9250: addiu a1, a1, 20648
 	ldloc.2
-	ldc.i4 20188
+	ldc.i4 20648
 	add
 	stloc.2
-// 0x010b8c0c: 0x10b8c0c: addu  a2, v0, zero
+// 0x010b9254: 0x10b9254: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b8c10: 0x10b8c10: addu  a0, s6, zero
+// 0x010b9258: 0x10b9258: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x010b8c14: 0x10b8c14: jal   0x1000f64 sw    s3, 16(sp)
+// 0x010b925c: 0x10b925c: jal   0x1000f64 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6957,24 +6957,24 @@ L_10b8bf8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8c1c: 0x10b8c1c: jal   0x104c3d0 addu  a0, s6, zero
+// 0x010b9264: 0x10b9264: jal   0x104c3e0 addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010b8c24: 0x10b8c24: jal   0x104fc04 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_flush_104fc04()
+// 0x010b926c: 0x10b926c: jal   0x104fc14 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010b8c2c: 0x10b8c2c: lw    a2, 0(s0)
+// 0x010b9274: 0x10b9274: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010b8c30: 0x10b8c30: jal   0x106ac04 sw    a2, 344(sp)
+// 0x010b9278: 0x10b9278: jal   0x106b228 sw    a2, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6988,12 +6988,12 @@ L_10b8bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::RealTime_GetUserName_106ac04(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::RealTime_GetUserName_106b228(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8c38: 0x10b8c38: lw    a2, 344(sp)
+// 0x010b9280: 0x10b9280: lw    a2, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7002,13 +7002,13 @@ L_10b8bf8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010b8c3c: 0x10b8c3c: addu  a0, s5, zero
+// 0x010b9284: 0x10b9284: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x010b8c40: 0x10b8c40: addu  a1, s8, zero
+// 0x010b9288: 0x10b9288: addu  a1, s8, zero
 	ldloc 12
 	stloc.2
-// 0x010b8c44: 0x10b8c44: jal   0x1000f64 addu  a3, v0, zero
+// 0x010b928c: 0x10b928c: jal   0x1000f64 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -7021,14 +7021,14 @@ L_10b8bf8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8c4c: 0x10b8c4c: lw    v1, 0(s0)
+// 0x010b9294: 0x10b9294: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010b8c50: 0x10b8c50: jal   0x104c504 sw    v1, 344(sp)
+// 0x010b9298: 0x10b9298: jal   0x104c514 sw    v1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7042,15 +7042,15 @@ L_10b8bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8c58: 0x10b8c58: addu  a0, v0, zero
+// 0x010b92a0: 0x10b92a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b8c5c: 0x10b8c5c: lw    v1, 344(sp)
+// 0x010b92a4: 0x10b92a4: lw    v1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7059,50 +7059,50 @@ L_10b8bf8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8c60: 0x10b8c60: sll   zero, zero, 0
-// 0x010b8c64: 0x10b8c64: cibyl_sysc_arg 0x14
+// 0x010b92a8: 0x10b92a8: sll   zero, zero, 0
+// 0x010b92ac: 0x10b92ac: cibyl_sysc_arg 0x14
 	ldloc 16
-// 0x010b8c68: 0x10b8c68: cibyl_sysc_arg 0x3
+// 0x010b92b0: 0x10b92b0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010b8c6c: 0x10b8c6c: cibyl_sysc_arg 0x4
+// 0x010b92b4: 0x10b92b4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010b8c70: 0x10b8c70: cibyl_sysc_arg 0x15
+// 0x010b92b8: 0x10b92b8: cibyl_sysc_arg 0x15
 	ldloc 11
-// 0x010b8c74: 0x10b8c74: cibyl_sysc_arg 0x17
+// 0x010b92bc: 0x10b92bc: cibyl_sysc_arg 0x17
 	ldloc 14
-// 0x010b8c78: 0x10b8c78: cibyl_sysc 0x23a1
+// 0x010b92c0: 0x10b92c0: cibyl_sysc 0x23a1
 	call int32 [WazeWP7]Syscalls::NOPH_ZLib_compress(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x010b8c7c: 0x10b8c7c: addu  v1, v0, zero
+// 0x010b92c4: 0x10b92c4: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010b8c80: 0x10b8c80: beq   v1, zero, 0x10b8c98 addu  a0, s4, zero
+// 0x010b92c8: 0x10b92c8: beq   v1, zero, 0x10b92e0 addu  a0, s4, zero
 	ldloc 7
 	ldloc 16
 	stloc.1
-	brfalse L_10b8c98
+	brfalse L_10b92e0
 // --- basic block ---
-L_10b8c88:
-// 0x010b8c88: 0x10b8c88: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+L_10b92d0:
+// 0x010b92d0: 0x10b92d0: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8c90: 0x10b8c90: j	 0x10b8ccc addu  v0, zero, zero
+// 0x010b92d8: 0x10b92d8: j	 0x10b9314 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10b8ccc
+	br L_10b9314
 // --- basic block ---
-L_10b8c98:
-// 0x010b8c98: 0x10b8c98: lw    a1, 0(s0)
+L_10b92e0:
+// 0x010b92e0: 0x10b92e0: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010b8c9c: 0x10b8c9c: jal   0x104da04 addiu s0, s0, 4
+// 0x010b92e4: 0x10b92e4: jal   0x104da14 addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
@@ -7112,36 +7112,36 @@ L_10b8c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b8ca4:
-// 0x010b8ca4: 0x10b8ca4: lw    v0, 0(s0)
+L_10b92ec:
+// 0x010b92ec: 0x10b92ec: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b8ca8: 0x10b8ca8: lui   a0, 0x20000
+// 0x010b92f0: 0x10b92f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b8cac: 0x10b8cac: addiu a0, a0, 20420
+// 0x010b92f4: 0x10b92f4: addiu a0, a0, 20880
 	ldloc.1
-	ldc.i4 20420
+	ldc.i4 20880
 	add
 	stloc.1
-// 0x010b8cb0: 0x10b8cb0: bne   v0, zero, 0x10b8bf8 addiu s2, s2, 1
+// 0x010b92f8: 0x10b92f8: bne   v0, zero, 0x10b9240 addiu s2, s2, 1
 	ldloc 5
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	brtrue L_10b8bf8
+	brtrue L_10b9240
 // --- basic block ---
-// 0x010b8cb8: 0x10b8cb8: jal   0x104c690 addu  a0, s1, zero
+// 0x010b9300: 0x10b9300: jal   0x104c6a0 addu  a0, s1, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -7149,23 +7149,23 @@ L_10b8ca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_list_free_104c690(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_list_free_104c6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8cc0: 0x10b8cc0: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010b9308: 0x10b9308: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b8cc8: 0x10b8cc8: addiu v0, zero, 1
+// 0x010b9310: 0x10b9310: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10b8ccc:
-// 0x010b8ccc: 0x10b8ccc: lw    ra, 388(sp)
-// 0x010b8cd0: 0x10b8cd0: lw    s8, 384(sp)
+L_10b9314:
+// 0x010b9314: 0x10b9314: lw    ra, 388(sp)
+// 0x010b9318: 0x10b9318: lw    s8, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7174,7 +7174,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b8cd4: 0x10b8cd4: lw    s7, 380(sp)
+// 0x010b931c: 0x10b931c: lw    s7, 380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7183,7 +7183,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b8cd8: 0x10b8cd8: lw    s6, 376(sp)
+// 0x010b9320: 0x10b9320: lw    s6, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7192,7 +7192,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b8cdc: 0x10b8cdc: lw    s5, 372(sp)
+// 0x010b9324: 0x10b9324: lw    s5, 372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7201,7 +7201,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b8ce0: 0x10b8ce0: lw    s4, 368(sp)
+// 0x010b9328: 0x10b9328: lw    s4, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7210,7 +7210,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b8ce4: 0x10b8ce4: lw    s3, 364(sp)
+// 0x010b932c: 0x10b932c: lw    s3, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7219,7 +7219,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b8ce8: 0x10b8ce8: lw    s2, 360(sp)
+// 0x010b9330: 0x10b9330: lw    s2, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7228,7 +7228,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b8cec: 0x10b8cec: lw    s1, 356(sp)
+// 0x010b9334: 0x10b9334: lw    s1, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7237,7 +7237,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b8cf0: 0x10b8cf0: lw    s0, 352(sp)
+// 0x010b9338: 0x10b9338: lw    s0, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7246,7 +7246,7 @@ L_10b8ccc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b8cf4: 0x10b8cf4: jr    ra addiu sp, sp, 392
+// 0x010b933c: 0x10b933c: jr    ra addiu sp, sp, 392
 	ldloc.0
 	ldc.i4 392
 	add
diff --git a/converted/Cibyl138.j b/converted/Cibyl138.j
index d337c8a..91522c3 100644
--- a/converted/Cibyl138.j
+++ b/converted/Cibyl138.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl138::.ctor
 
-.method public static int32 roadmap_confirmed_debug_info_submit_10b8cfc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_confirmed_debug_info_submit_10b9344(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -79,16 +79,16 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8cfc: 0x10b8cfc: addiu sp, sp, -24
+// 0x010b9344: 0x10b9344: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b8d00: 0x10b8d00: addiu v0, zero, 3
+// 0x010b9348: 0x10b9348: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010b8d04: 0x10b8d04: sw    ra, 20(sp)
-// 0x010b8d08: 0x10b8d08: bne   a0, v0, 0x10b8d54 sw    s0, 16(sp)
+// 0x010b934c: 0x10b934c: sw    ra, 20(sp)
+// 0x010b9350: 0x10b9350: bne   a0, v0, 0x10b939c sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -99,9 +99,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_10b8d54
+	bne.un L_10b939c
 // --- basic block ---
-// 0x010b8d10: 0x10b8d10: jal   0x10049d4 lui   s0, 0xe0000
+// 0x010b9358: 0x10b9358: jal   0x10049e4 lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
 	ldloc.0
@@ -109,20 +109,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_close_log_file_10049d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_close_log_file_10049e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8d18: 0x10b8d18: addiu v0, zero, 1
+// 0x010b9360: 0x10b9360: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010b8d1c: 0x10b8d1c: jal   0x10b8a58 sw    v0, -17668(s0)
+// 0x010b9364: 0x10b9364: jal   0x10b90a0 sw    v0, -17204(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4417
+	ldc.i4 -4301
 	add
 	ldloc 5
 	stelem.i4
@@ -131,49 +131,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl137::prepare_for_upload_10b8a58(int32,int32,int32,int32,int32)
+	call int32 Cibyl137::prepare_for_upload_10b90a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8d24: 0x10b8d24: beq   v0, zero, 0x10b8d3c lui   a0, 0x0
+// 0x010b936c: 0x10b936c: beq   v0, zero, 0x10b9384 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10b8d3c
+	brfalse L_10b9384
 // --- basic block ---
-// 0x010b8d2c: 0x10b8d2c: jal   0x10b8638 sll   zero, zero, 0
+// 0x010b9374: 0x10b9374: jal   0x10b8c80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl137::upload_10b8638(int32,int32,int32,int32,int32)
+	call int32 Cibyl137::upload_10b8c80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8d34: 0x10b8d34: bne   v0, zero, 0x10b8d54 lui   a0, 0x0
+// 0x010b937c: 0x10b937c: bne   v0, zero, 0x10b939c lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10b8d54
+	brtrue L_10b939c
 // --- basic block ---
-L_10b8d3c:
-// 0x010b8d3c: 0x10b8d3c: lui   a1, 0x20000
+L_10b9384:
+// 0x010b9384: 0x10b9384: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8d40: 0x10b8d40: addiu a0, a0, 30092
+// 0x010b9388: 0x10b9388: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010b8d44: 0x10b8d44: addiu a1, a1, 20356
+// 0x010b938c: 0x10b938c: addiu a1, a1, 20816
 	ldloc.2
-	ldc.i4 20356
+	ldc.i4 20816
 	add
 	stloc.2
-// 0x010b8d48: 0x10b8d48: jal   0x104bfe4 addiu a2, zero, 5
+// 0x010b9390: 0x10b9390: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -181,23 +181,23 @@ L_10b8d3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b8d50: 0x10b8d50: sw    zero, -17668(s0)
+// 0x010b9398: 0x10b9398: sw    zero, -17204(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4417
+	ldc.i4 -4301
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10b8d54:
-// 0x010b8d54: 0x10b8d54: lw    ra, 20(sp)
-// 0x010b8d58: 0x10b8d58: lw    s0, 16(sp)
+L_10b939c:
+// 0x010b939c: 0x10b939c: lw    ra, 20(sp)
+// 0x010b93a0: 0x10b93a0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -206,7 +206,7 @@ L_10b8d54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8d5c: 0x10b8d5c: jr    ra addiu sp, sp, 24
+// 0x010b93a4: 0x10b93a4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -218,7 +218,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 submit_10b8d64(int32,int32,int32,int32,int32)
+.method public static int32 submit_10b93ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -256,12 +256,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8d64: 0x10b8d64: addiu sp, sp, -32
+// 0x010b93ac: 0x10b93ac: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b8d68: 0x10b8d68: sw    s0, 24(sp)
+// 0x010b93b0: 0x10b93b0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -270,35 +270,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b8d6c: 0x10b8d6c: lui   a1, 0x0
+// 0x010b93b4: 0x10b93b4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b8d70: 0x10b8d70: addu  s0, a0, zero
+// 0x010b93b8: 0x10b93b8: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010b8d74: 0x10b8d74: lui   a2, 0x10000
+// 0x010b93bc: 0x10b93bc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010b8d78: 0x10b8d78: lui   a0, 0x10000
+// 0x010b93c0: 0x10b93c0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b8d7c: 0x10b8d7c: addiu a1, a1, 19372
+// 0x010b93c4: 0x10b93c4: addiu a1, a1, 19372
 	ldloc.2
 	ldc.i4 19372
 	add
 	stloc.2
-// 0x010b8d80: 0x10b8d80: addiu a0, a0, 12560
+// 0x010b93c8: 0x10b93c8: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010b8d84: 0x10b8d84: addiu a2, a2, 18500
+// 0x010b93cc: 0x10b93cc: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010b8d88: 0x10b8d88: sw    ra, 28(sp)
-// 0x010b8d8c: 0x10b8d8c: jal   0x100edb0 addu  a3, zero, zero
+// 0x010b93d0: 0x10b93d0: sw    ra, 28(sp)
+// 0x010b93d4: 0x10b93d4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -306,45 +306,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010b8d94: 0x10b8d94: beq   s0, zero, 0x10b8dc8 addiu a0, zero, 3
+// 0x010b93dc: 0x10b93dc: beq   s0, zero, 0x10b9410 addiu a0, zero, 3
 	ldloc 6
 	ldc.i4.3
 	stloc.1
-	brfalse L_10b8dc8
+	brfalse L_10b9410
 // --- basic block ---
-// 0x010b8d9c: 0x10b8d9c: lui   a0, 0x20000
+// 0x010b93e4: 0x10b93e4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b8da0: 0x10b8da0: lui   a1, 0x20000
+// 0x010b93e8: 0x10b93e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8da4: 0x10b8da4: lui   a3, 0x10c0000
+// 0x010b93ec: 0x10b93ec: lui   a3, 0x10c0000
 	ldc.i4 17563648
 	stloc 4
-// 0x010b8da8: 0x10b8da8: addiu a0, a0, 20460
+// 0x010b93f0: 0x10b93f0: addiu a0, a0, 20920
 	ldloc.1
-	ldc.i4 20460
+	ldc.i4 20920
 	add
 	stloc.1
-// 0x010b8dac: 0x10b8dac: addiu a1, a1, 20472
+// 0x010b93f4: 0x10b93f4: addiu a1, a1, 20932
 	ldloc.2
-	ldc.i4 20472
+	ldc.i4 20932
 	add
 	stloc.2
-// 0x010b8db0: 0x10b8db0: addiu a3, a3, -29444
+// 0x010b93f8: 0x10b93f8: addiu a3, a3, -27836
 	ldloc 4
-	ldc.i4 -29444
+	ldc.i4 -27836
 	add
 	stloc 4
-// 0x010b8db4: 0x10b8db4: addiu a2, zero, 1
+// 0x010b93fc: 0x10b93fc: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b8db8: 0x10b8db8: jal   0x104c320 sw    zero, 16(sp)
+// 0x010b9400: 0x10b9400: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -358,16 +358,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010b8dc0: 0x10b8dc0: j	 0x10b8dd0 sll   zero, zero, 0
-	br L_10b8dd0
+// 0x010b9408: 0x10b9408: j	 0x10b9418 sll   zero, zero, 0
+	br L_10b9418
 // --- basic block ---
-L_10b8dc8:
-// 0x010b8dc8: 0x10b8dc8: jal   0x10b8cfc addu  a1, zero, zero
+L_10b9410:
+// 0x010b9410: 0x10b9410: jal   0x10b9344 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -375,14 +375,14 @@ L_10b8dc8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::roadmap_confirmed_debug_info_submit_10b8cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::roadmap_confirmed_debug_info_submit_10b9344(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_10b8dd0:
-// 0x010b8dd0: 0x10b8dd0: lw    ra, 28(sp)
-// 0x010b8dd4: 0x10b8dd4: lw    s0, 24(sp)
+L_10b9418:
+// 0x010b9418: 0x10b9418: lw    ra, 28(sp)
+// 0x010b941c: 0x10b941c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -391,7 +391,7 @@ L_10b8dd0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8dd8: 0x10b8dd8: jr    ra addiu sp, sp, 32
+// 0x010b9420: 0x10b9420: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -403,7 +403,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_upload_auto_10b8e20(int32,int32,int32,int32,int32)
+.method public static int32 editor_upload_auto_10b9468(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -450,12 +450,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8e20: 0x10b8e20: addiu sp, sp, -64
+// 0x010b9468: 0x10b9468: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010b8e24: 0x10b8e24: sw    s2, 52(sp)
+// 0x010b946c: 0x10b946c: sw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -464,13 +464,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b8e28: 0x10b8e28: addu  s2, a0, zero
+// 0x010b9470: 0x10b9470: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010b8e2c: 0x10b8e2c: addiu a0, zero, 16
+// 0x010b9474: 0x10b9474: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-// 0x010b8e30: 0x10b8e30: sw    a3, 36(sp)
+// 0x010b9478: 0x10b9478: sw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -479,8 +479,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b8e34: 0x10b8e34: sw    ra, 60(sp)
-// 0x010b8e38: 0x10b8e38: sw    s3, 56(sp)
+// 0x010b947c: 0x10b947c: sw    ra, 60(sp)
+// 0x010b9480: 0x10b9480: sw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -489,7 +489,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b8e3c: 0x10b8e3c: sw    s0, 44(sp)
+// 0x010b9484: 0x10b9484: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -498,10 +498,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b8e40: 0x10b8e40: addu  s3, a2, zero
+// 0x010b9488: 0x10b9488: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010b8e44: 0x10b8e44: sw    a1, 32(sp)
+// 0x010b948c: 0x10b948c: sw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -510,7 +510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b8e48: 0x10b8e48: jal   0x1000910 sw    s1, 48(sp)
+// 0x010b9490: 0x10b9490: jal   0x1000910 sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -529,7 +529,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8e50: 0x10b8e50: lw    a1, 32(sp)
+// 0x010b9498: 0x10b9498: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -538,10 +538,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b8e54: 0x10b8e54: addu  a0, s2, zero
+// 0x010b949c: 0x10b949c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010b8e58: 0x10b8e58: sw    a1, 4(v0)
+// 0x010b94a0: 0x10b94a0: sw    a1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -550,7 +550,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b8e5c: 0x10b8e5c: jal   0x1001ba8 addu  s0, v0, zero
+// 0x010b94a4: 0x10b94a4: jal   0x1001ba8 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -563,14 +563,14 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8e64: 0x10b8e64: sw    v0, 0(s0)
+// 0x010b94ac: 0x10b94ac: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010b8e68: 0x10b8e68: lw    a3, 36(sp)
+// 0x010b94b0: 0x10b94b0: lw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -579,7 +579,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b8e6c: 0x10b8e6c: lw    v0, 80(sp)
+// 0x010b94b4: 0x10b94b4: lw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -588,10 +588,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b8e70: 0x10b8e70: addu  a0, a3, zero
+// 0x010b94b8: 0x10b94b8: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x010b8e74: 0x10b8e74: bne   a3, zero, 0x10b8e84 sw    v0, 12(s0)
+// 0x010b94bc: 0x10b94bc: bne   a3, zero, 0x10b94cc sw    v0, 12(s0)
 	ldloc 4
 	ldloc 5
 	ldloc 8
@@ -601,18 +601,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_10b8e84
+	brtrue L_10b94cc
 // --- basic block ---
-// 0x010b8e7c: 0x10b8e7c: lui   a0, 0x20000
+// 0x010b94c4: 0x10b94c4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b8e80: 0x10b8e80: addiu a0, a0, 20540
+// 0x010b94c8: 0x10b94c8: addiu a0, a0, 21000
 	ldloc.1
-	ldc.i4 20540
+	ldc.i4 21000
 	add
 	stloc.1
-L_10b8e84:
-// 0x010b8e84: 0x10b8e84: jal   0x1001ba8 addu  s1, s3, zero
+L_10b94cc:
+// 0x010b94cc: 0x10b94cc: jal   0x1001ba8 addu  s1, s3, zero
 	ldloc 11
 	stloc 9
 	ldloc.0
@@ -625,7 +625,7 @@ L_10b8e84:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8e8c: 0x10b8e8c: bne   s3, zero, 0x10b8ea4 sw    v0, 8(s0)
+// 0x010b94d4: 0x10b94d4: bne   s3, zero, 0x10b94ec sw    v0, 8(s0)
 	ldloc 11
 	ldloc 5
 	ldloc 8
@@ -635,12 +635,12 @@ L_10b8e84:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_10b8ea4
+	brtrue L_10b94ec
 // --- basic block ---
-// 0x010b8e94: 0x10b8e94: lui   a0, 0x0
+// 0x010b94dc: 0x10b94dc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b8e98: 0x10b8e98: jal   0x100e348 addiu a0, a0, 19404
+// 0x010b94e0: 0x10b94e0: jal   0x100e358 addiu a0, a0, 19404
 	ldloc.1
 	ldc.i4 19404
 	add
@@ -650,41 +650,41 @@ L_10b8e84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8ea0: 0x10b8ea0: addu  s1, v0, zero
+// 0x010b94e8: 0x10b94e8: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-L_10b8ea4:
-// 0x010b8ea4: 0x10b8ea4: lui   a0, 0x10000
+L_10b94ec:
+// 0x010b94ec: 0x10b94ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b8ea8: 0x10b8ea8: lui   v0, 0x10c0000
+// 0x010b94f0: 0x10b94f0: lui   v0, 0x10c0000
 	ldc.i4 17563648
 	stloc 6
-// 0x010b8eac: 0x10b8eac: addiu a0, a0, 5456
+// 0x010b94f4: 0x10b94f4: addiu a0, a0, 5452
 	ldloc.1
-	ldc.i4 5456
+	ldc.i4 5452
 	add
 	stloc.1
-// 0x010b8eb0: 0x10b8eb0: addiu v0, v0, -26776
+// 0x010b94f8: 0x10b94f8: addiu v0, v0, -25168
 	ldloc 6
-	ldc.i4 -26776
+	ldc.i4 -25168
 	add
 	stloc 6
-// 0x010b8eb4: 0x10b8eb4: addu  a1, s1, zero
+// 0x010b94fc: 0x10b94fc: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010b8eb8: 0x10b8eb8: addu  a2, zero, zero
+// 0x010b9500: 0x10b9500: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010b8ebc: 0x10b8ebc: addiu a3, zero, 80
+// 0x010b9504: 0x10b9504: addiu a3, zero, 80
 	ldc.i4.s 80
 	stloc 4
-// 0x010b8ec0: 0x10b8ec0: sw    v0, 20(sp)
+// 0x010b9508: 0x10b9508: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -693,7 +693,7 @@ L_10b8ea4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b8ec4: 0x10b8ec4: sw    zero, 16(sp)
+// 0x010b950c: 0x10b950c: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -702,7 +702,7 @@ L_10b8ea4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b8ec8: 0x10b8ec8: jal   0x1052354 sw    s0, 24(sp)
+// 0x010b9510: 0x10b9510: jal   0x1052364 sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -716,22 +716,22 @@ L_10b8ea4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_connect_async_1052354(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_connect_async_1052364(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8ed0: 0x10b8ed0: addiu a0, zero, -1
+// 0x010b9518: 0x10b9518: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010b8ed4: 0x10b8ed4: bne   v0, a0, 0x10b8f24 addu  v1, zero, zero
+// 0x010b951c: 0x10b951c: bne   v0, a0, 0x10b956c addu  v1, zero, zero
 	ldloc 6
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	bne.un L_10b8f24
+	bne.un L_10b956c
 // --- basic block ---
-// 0x010b8edc: 0x10b8edc: lw    a0, 8(s0)
+// 0x010b9524: 0x10b9524: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -740,7 +740,7 @@ L_10b8ea4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b8ee0: 0x10b8ee0: jal   0x1000930 sll   zero, zero, 0
+// 0x010b9528: 0x10b9528: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -751,14 +751,14 @@ L_10b8ea4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8ee8: 0x10b8ee8: lw    a0, 0(s0)
+// 0x010b9530: 0x10b9530: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b8eec: 0x10b8eec: jal   0x1000930 sll   zero, zero, 0
+// 0x010b9534: 0x10b9534: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -769,7 +769,7 @@ L_10b8ea4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8ef4: 0x10b8ef4: jal   0x1000930 addu  a0, s0, zero
+// 0x010b953c: 0x10b953c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -782,29 +782,29 @@ L_10b8ea4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8efc: 0x10b8efc: lui   a1, 0x20000
+// 0x010b9544: 0x10b9544: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b8f00: 0x10b8f00: lui   a3, 0x20000
+// 0x010b9548: 0x10b9548: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b8f04: 0x10b8f04: addiu a1, a1, 20568
+// 0x010b954c: 0x10b954c: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b8f08: 0x10b8f08: addiu a3, a3, 20608
+// 0x010b9550: 0x10b9550: addiu a3, a3, 21068
 	ldloc 4
-	ldc.i4 20608
+	ldc.i4 21068
 	add
 	stloc 4
-// 0x010b8f0c: 0x10b8f0c: addiu a0, zero, 4
+// 0x010b9554: 0x10b9554: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b8f10: 0x10b8f10: addiu a2, zero, 566
+// 0x010b9558: 0x10b9558: addiu a2, zero, 566
 	ldc.i4 566
 	stloc.3
-// 0x010b8f14: 0x10b8f14: sw    s2, 16(sp)
+// 0x010b955c: 0x10b955c: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -813,7 +813,7 @@ L_10b8ea4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b8f18: 0x10b8f18: jal   0x100449c sw    s1, 20(sp)
+// 0x010b9560: 0x10b9560: jal   0x100449c sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -832,15 +832,15 @@ L_10b8ea4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b8f20: 0x10b8f20: addiu v1, zero, -1
+// 0x010b9568: 0x10b9568: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-L_10b8f24:
-// 0x010b8f24: 0x10b8f24: lw    ra, 60(sp)
-// 0x010b8f28: 0x10b8f28: addu  v0, v1, zero
+L_10b956c:
+// 0x010b956c: 0x10b956c: lw    ra, 60(sp)
+// 0x010b9570: 0x10b9570: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010b8f2c: 0x10b8f2c: lw    s3, 56(sp)
+// 0x010b9574: 0x10b9574: lw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -849,7 +849,7 @@ L_10b8f24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b8f30: 0x10b8f30: lw    s2, 52(sp)
+// 0x010b9578: 0x10b9578: lw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -858,7 +858,7 @@ L_10b8f24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b8f34: 0x10b8f34: lw    s1, 48(sp)
+// 0x010b957c: 0x10b957c: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -867,7 +867,7 @@ L_10b8f24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b8f38: 0x10b8f38: lw    s0, 44(sp)
+// 0x010b9580: 0x10b9580: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -876,7 +876,7 @@ L_10b8f24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b8f3c: 0x10b8f3c: jr    ra addiu sp, sp, 64
+// 0x010b9584: 0x10b9584: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -888,7 +888,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+.method public static int32 editor_http_send_10b958c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -932,17 +932,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8f44: 0x10b8f44: addiu sp, sp, -4144
+// 0x010b958c: 0x10b958c: addiu sp, sp, -4144
 	ldloc.0
 	ldc.i4 -4144
 	add
 	stloc.0
-// 0x010b8f48: 0x10b8f48: addiu v0, sp, 4152
+// 0x010b9590: 0x10b9590: addiu v0, sp, 4152
 	ldloc.0
 	ldc.i4 4152
 	add
 	stloc 6
-// 0x010b8f4c: 0x10b8f4c: sw    s0, 4128(sp)
+// 0x010b9594: 0x10b9594: sw    s0, 4128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -951,12 +951,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b8f50: 0x10b8f50: addiu s0, sp, 28
+// 0x010b9598: 0x10b9598: addiu s0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 7
-// 0x010b8f54: 0x10b8f54: sw    s2, 4136(sp)
+// 0x010b959c: 0x10b959c: sw    s2, 4136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -965,7 +965,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b8f58: 0x10b8f58: sw    a2, 4152(sp)
+// 0x010b95a0: 0x10b95a0: sw    a2, 4152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -974,7 +974,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010b8f5c: 0x10b8f5c: sw    a3, 4156(sp)
+// 0x010b95a4: 0x10b95a4: sw    a3, 4156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -983,23 +983,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010b8f60: 0x10b8f60: addu  a2, a1, zero
+// 0x010b95a8: 0x10b95a8: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010b8f64: 0x10b8f64: addu  a3, v0, zero
+// 0x010b95ac: 0x10b95ac: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x010b8f68: 0x10b8f68: addiu a1, zero, 4096
+// 0x010b95b0: 0x10b95b0: addiu a1, zero, 4096
 	ldc.i4 4096
 	stloc.2
-// 0x010b8f6c: 0x10b8f6c: addu  s2, a0, zero
+// 0x010b95b4: 0x10b95b4: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010b8f70: 0x10b8f70: addu  a0, s0, zero
+// 0x010b95b8: 0x10b95b8: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010b8f74: 0x10b8f74: sw    ra, 4140(sp)
-// 0x010b8f78: 0x10b8f78: sw    s1, 4132(sp)
+// 0x010b95bc: 0x10b95bc: sw    ra, 4140(sp)
+// 0x010b95c0: 0x10b95c0: sw    s1, 4132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1008,7 +1008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b8f7c: 0x10b8f7c: jal   0x10c0a70 sw    v0, 24(sp)
+// 0x010b95c4: 0x10b95c4: jal   0x10c10b0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1022,12 +1022,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b8f84: 0x10b8f84: jal   0x1001b48 addu  a0, s0, zero
+// 0x010b95cc: 0x10b95cc: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -1036,19 +1036,19 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b8f8c: 0x10b8f8c: addu  a2, v0, zero
+// 0x010b95d4: 0x10b95d4: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x010b8f90: 0x10b8f90: addu  a0, s2, zero
+// 0x010b95d8: 0x10b95d8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010b8f94: 0x10b8f94: addu  a1, s0, zero
+// 0x010b95dc: 0x10b95dc: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010b8f98: 0x10b8f98: addiu a3, zero, 1
+// 0x010b95e0: 0x10b95e0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010b8f9c: 0x10b8f9c: jal   0x1052018 addu  s1, v0, zero
+// 0x010b95e4: 0x10b95e4: jal   0x1052028 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -1056,38 +1056,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_send_1052018(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_send_1052028(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b8fa4: 0x10b8fa4: beq   v0, s1, 0x10b8fcc lui   a1, 0x20000
+// 0x010b95ec: 0x10b95ec: beq   v0, s1, 0x10b9614 lui   a1, 0x20000
 	ldloc 6
 	ldloc 9
 	ldc.i4 131072
 	stloc.2
-	beq  L_10b8fcc
+	beq  L_10b9614
 // --- basic block ---
-// 0x010b8fac: 0x10b8fac: lui   a3, 0x20000
+// 0x010b95f4: 0x10b95f4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b8fb0: 0x10b8fb0: addiu a1, a1, 20568
+// 0x010b95f8: 0x10b95f8: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b8fb4: 0x10b8fb4: addiu a3, a3, 20692
+// 0x010b95fc: 0x10b95fc: addiu a3, a3, 21152
 	ldloc 4
-	ldc.i4 20692
+	ldc.i4 21152
 	add
 	stloc 4
-// 0x010b8fb8: 0x10b8fb8: addiu a0, zero, 4
+// 0x010b9600: 0x10b9600: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b8fbc: 0x10b8fbc: addiu a2, zero, 144
+// 0x010b9604: 0x10b9604: addiu a2, zero, 144
 	ldc.i4 144
 	stloc.3
-// 0x010b8fc0: 0x10b8fc0: jal   0x100449c sw    s0, 16(sp)
+// 0x010b9608: 0x10b9608: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1106,12 +1106,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b8fc8: 0x10b8fc8: addiu v0, zero, -1
+// 0x010b9610: 0x10b9610: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_10b8fcc:
-// 0x010b8fcc: 0x10b8fcc: lw    ra, 4140(sp)
-// 0x010b8fd0: 0x10b8fd0: lw    s2, 4136(sp)
+L_10b9614:
+// 0x010b9614: 0x10b9614: lw    ra, 4140(sp)
+// 0x010b9618: 0x10b9618: lw    s2, 4136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1120,7 +1120,7 @@ L_10b8fcc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b8fd4: 0x10b8fd4: lw    s1, 4132(sp)
+// 0x010b961c: 0x10b961c: lw    s1, 4132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1129,7 +1129,7 @@ L_10b8fcc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b8fd8: 0x10b8fd8: lw    s0, 4128(sp)
+// 0x010b9620: 0x10b9620: lw    s0, 4128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1138,7 +1138,7 @@ L_10b8fcc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b8fdc: 0x10b8fdc: jr    ra addiu sp, sp, 4144
+// 0x010b9624: 0x10b9624: jr    ra addiu sp, sp, 4144
 	ldloc.0
 	ldc.i4 4144
 	add
@@ -1150,7 +1150,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 send_auth_10b8fe4(int32,int32,int32,int32,int32)
+.method public static int32 send_auth_10b962c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 t4,int32 s1,int32 ra,int32 t0,int32 t1,int32 t2,int32 t3,int32 t5)
@@ -1209,12 +1209,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b8fe4: 0x10b8fe4: addiu sp, sp, -816
+// 0x010b962c: 0x10b962c: addiu sp, sp, -816
 	ldloc.0
 	ldc.i4 -816
 	add
 	stloc.0
-// 0x010b8fe8: 0x10b8fe8: sw    s1, 808(sp)
+// 0x010b9630: 0x10b9630: sw    s1, 808(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1223,7 +1223,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b8fec: 0x10b8fec: sw    s0, 804(sp)
+// 0x010b9634: 0x10b9634: sw    s0, 804(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1232,18 +1232,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b8ff0: 0x10b8ff0: addu  s1, a2, zero
+// 0x010b9638: 0x10b9638: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010b8ff4: 0x10b8ff4: addiu s0, sp, 28
+// 0x010b963c: 0x10b963c: addiu s0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 8
-// 0x010b8ff8: 0x10b8ff8: lui   a2, 0x20000
+// 0x010b9640: 0x10b9640: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b8ffc: 0x10b8ffc: sw    a1, 16(sp)
+// 0x010b9644: 0x10b9644: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1252,19 +1252,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b9000: 0x10b9000: addu  a3, a0, zero
+// 0x010b9648: 0x10b9648: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x010b9004: 0x10b9004: addiu a2, a2, 20712
+// 0x010b964c: 0x10b964c: addiu a2, a2, 21172
 	ldloc.3
-	ldc.i4 20712
+	ldc.i4 21172
 	add
 	stloc.3
-// 0x010b9008: 0x10b9008: addu  a0, s0, zero
+// 0x010b9650: 0x10b9650: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010b900c: 0x10b900c: sw    ra, 812(sp)
-// 0x010b9010: 0x10b9010: jal   0x1000f9c addiu a1, zero, 255
+// 0x010b9654: 0x10b9654: sw    ra, 812(sp)
+// 0x010b9658: 0x10b9658: jal   0x1000f9c addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
 	ldloc.0
@@ -1277,268 +1277,268 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b9018: 0x10b9018: lui   a0, 0x20000
+// 0x010b9660: 0x10b9660: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b901c: 0x10b901c: sb    zero, 282(sp)
+// 0x010b9664: 0x10b9664: sb    zero, 282(sp)
 	ldloc.0
 	ldc.i4 282
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b9020: 0x10b9020: addiu a0, a0, 29988
+// 0x010b9668: 0x10b9668: addiu a0, a0, 30452
 	ldloc.1
-	ldc.i4 29988
+	ldc.i4 30452
 	add
 	stloc.1
-// 0x010b9024: 0x10b9024: addiu v0, sp, 284
+// 0x010b966c: 0x10b966c: addiu v0, sp, 284
 	ldloc.0
 	ldc.i4 284
 	add
 	stloc 6
-// 0x010b9028: 0x10b9028: addiu t3, sp, 24
+// 0x010b9670: 0x10b9670: addiu t3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-// 0x010b902c: 0x10b902c: addiu t2, sp, 27
+// 0x010b9674: 0x10b9674: addiu t2, sp, 27
 	ldloc.0
 	ldc.i4.s 27
 	add
 	stloc 14
-// 0x010b9030: 0x10b9030: addiu t1, zero, 1
+// 0x010b9678: 0x10b9678: addiu t1, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x010b9034: 0x10b9034: j	 0x10b90e8 addiu t0, zero, 2
+// 0x010b967c: 0x10b967c: j	 0x10b9730 addiu t0, zero, 2
 	ldc.i4.2
 	stloc 12
-	br L_10b90e8
+	br L_10b9730
 // --- basic block ---
-L_10b903c:
-// 0x010b903c: 0x10b903c: lb    a2, 0(s0)
+L_10b9684:
+// 0x010b9684: 0x10b9684: lb    a2, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x010b9040: 0x10b9040: sll   zero, zero, 0
-// 0x010b9044: 0x10b9044: sb    a2, 0(a1)
+// 0x010b9688: 0x10b9688: sll   zero, zero, 0
+// 0x010b968c: 0x10b968c: sb    a2, 0(a1)
 	ldloc.2
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b9048: 0x10b9048: beq   a2, zero, 0x10b9058 addiu a1, a1, 1
+// 0x010b9690: 0x10b9690: beq   a2, zero, 0x10b96a0 addiu a1, a1, 1
 	ldloc.3
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	brfalse L_10b9058
+	brfalse L_10b96a0
 // --- basic block ---
-// 0x010b9050: 0x10b9050: addiu s0, s0, 1
+// 0x010b9698: 0x10b9698: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010b9054: 0x10b9054: addiu v1, v1, 1
+// 0x010b969c: 0x10b969c: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_10b9058:
-// 0x010b9058: 0x10b9058: bne   a1, t2, 0x10b903c sll   zero, zero, 0
+L_10b96a0:
+// 0x010b96a0: 0x10b96a0: bne   a1, t2, 0x10b9684 sll   zero, zero, 0
 	ldloc.2
 	ldloc 14
-	bne.un L_10b903c
+	bne.un L_10b9684
 // --- basic block ---
-// 0x010b9060: 0x10b9060: beq   v1, zero, 0x10b90e8 sll   zero, zero, 0
+// 0x010b96a8: 0x10b96a8: beq   v1, zero, 0x10b9730 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10b90e8
+	brfalse L_10b9730
 // --- basic block ---
-// 0x010b9068: 0x10b9068: lbu   a2, 24(sp)
+// 0x010b96b0: 0x10b96b0: lbu   a2, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x010b906c: 0x10b906c: lbu   a1, 25(sp)
+// 0x010b96b4: 0x10b96b4: lbu   a1, 25(sp)
 	ldloc.0
 	ldc.i4.s 25
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x010b9070: 0x10b9070: andi  a3, a2, 3
+// 0x010b96b8: 0x10b96b8: andi  a3, a2, 3
 	ldloc.3
 	ldc.i4.3
 	and
 	stloc 4
-// 0x010b9074: 0x10b9074: srl   t4, a1, 4
+// 0x010b96bc: 0x10b96bc: srl   t4, a1, 4
 	ldloc.2
 	ldc.i4.4
 	shr.un
 	stloc 9
-// 0x010b9078: 0x10b9078: sll   a3, a3, 4
+// 0x010b96c0: 0x10b96c0: sll   a3, a3, 4
 	ldloc 4
 	ldc.i4.4
 	shl
 	stloc 4
-// 0x010b907c: 0x10b907c: or    a3, a3, t4
+// 0x010b96c4: 0x10b96c4: or    a3, a3, t4
 	ldloc 4
 	ldloc 9
 	or
 	stloc 4
-// 0x010b9080: 0x10b9080: srl   a2, a2, 2
+// 0x010b96c8: 0x10b96c8: srl   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	stloc.3
-// 0x010b9084: 0x10b9084: addu  a2, a2, a0
+// 0x010b96cc: 0x10b96cc: addu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.3
-// 0x010b9088: 0x10b9088: addu  a3, a3, a0
+// 0x010b96d0: 0x10b96d0: addu  a3, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc 4
-// 0x010b908c: 0x10b908c: lb    t5, 0(a2)
+// 0x010b96d4: 0x10b96d4: lb    t5, 0(a2)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 16
-// 0x010b9090: 0x10b9090: lb    t4, 0(a3)
+// 0x010b96d8: 0x10b96d8: lb    t4, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x010b9094: 0x10b9094: bne   v1, t1, 0x10b90a4 addiu a2, zero, 61
+// 0x010b96dc: 0x10b96dc: bne   v1, t1, 0x10b96ec addiu a2, zero, 61
 	ldloc 7
 	ldloc 13
 	ldc.i4.s 61
 	stloc.3
-	bne.un L_10b90a4
+	bne.un L_10b96ec
 // --- basic block ---
-// 0x010b909c: 0x10b909c: j	 0x10b90d4 addiu a1, zero, 61
+// 0x010b96e4: 0x10b96e4: j	 0x10b971c addiu a1, zero, 61
 	ldc.i4.s 61
 	stloc.2
-	br L_10b90d4
+	br L_10b971c
 // --- basic block ---
-L_10b90a4:
-// 0x010b90a4: 0x10b90a4: lbu   a3, 26(sp)
+L_10b96ec:
+// 0x010b96ec: 0x10b96ec: lbu   a3, 26(sp)
 	ldloc.0
 	ldc.i4.s 26
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 4
-// 0x010b90a8: 0x10b90a8: andi  a1, a1, 15
+// 0x010b96f0: 0x10b96f0: andi  a1, a1, 15
 	ldloc.2
 	ldc.i4.s 15
 	and
 	stloc.2
-// 0x010b90ac: 0x10b90ac: srl   a2, a3, 6
+// 0x010b96f4: 0x10b96f4: srl   a2, a3, 6
 	ldloc 4
 	ldc.i4.6
 	shr.un
 	stloc.3
-// 0x010b90b0: 0x10b90b0: sll   a1, a1, 2
+// 0x010b96f8: 0x10b96f8: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x010b90b4: 0x10b90b4: or    a1, a1, a2
+// 0x010b96fc: 0x10b96fc: or    a1, a1, a2
 	ldloc.2
 	ldloc.3
 	or
 	stloc.2
-// 0x010b90b8: 0x10b90b8: addu  a1, a1, a0
+// 0x010b9700: 0x10b9700: addu  a1, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.2
-// 0x010b90bc: 0x10b90bc: lbu   a2, 0(a1)
+// 0x010b9704: 0x10b9704: lbu   a2, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x010b90c0: 0x10b90c0: beq   v1, t0, 0x10b90d4 addiu a1, zero, 61
+// 0x010b9708: 0x10b9708: beq   v1, t0, 0x10b971c addiu a1, zero, 61
 	ldloc 7
 	ldloc 12
 	ldc.i4.s 61
 	stloc.2
-	beq  L_10b90d4
+	beq  L_10b971c
 // --- basic block ---
-// 0x010b90c8: 0x10b90c8: andi  a3, a3, 63
+// 0x010b9710: 0x10b9710: andi  a3, a3, 63
 	ldloc 4
 	ldc.i4.s 63
 	and
 	stloc 4
-// 0x010b90cc: 0x10b90cc: addu  a3, a3, a0
+// 0x010b9714: 0x10b9714: addu  a3, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc 4
-// 0x010b90d0: 0x10b90d0: lbu   a1, 0(a3)
+// 0x010b9718: 0x10b9718: lbu   a1, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-L_10b90d4:
-// 0x010b90d4: 0x10b90d4: sb    t5, 0(v0)
+L_10b971c:
+// 0x010b971c: 0x10b971c: sb    t5, 0(v0)
 	ldloc 6
 	ldloc 16
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b90d8: 0x10b90d8: sb    t4, 1(v0)
+// 0x010b9720: 0x10b9720: sb    t4, 1(v0)
 	ldloc 6
 	ldc.i4.1
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b90dc: 0x10b90dc: sb    a2, 2(v0)
+// 0x010b9724: 0x10b9724: sb    a2, 2(v0)
 	ldloc 6
 	ldc.i4.2
 	add
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b90e0: 0x10b90e0: sb    a1, 3(v0)
+// 0x010b9728: 0x10b9728: sb    a1, 3(v0)
 	ldloc 6
 	ldc.i4.3
 	add
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b90e4: 0x10b90e4: addiu v0, v0, 4
+// 0x010b972c: 0x10b972c: addiu v0, v0, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-L_10b90e8:
-// 0x010b90e8: 0x10b90e8: lb    v1, 0(s0)
+L_10b9730:
+// 0x010b9730: 0x10b9730: lb    v1, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010b90ec: 0x10b90ec: sll   zero, zero, 0
-// 0x010b90f0: 0x10b90f0: beq   v1, zero, 0x10b9100 addu  a1, t3, zero
+// 0x010b9734: 0x10b9734: sll   zero, zero, 0
+// 0x010b9738: 0x10b9738: beq   v1, zero, 0x10b9748 addu  a1, t3, zero
 	ldloc 7
 	ldloc 15
 	stloc.2
-	brfalse L_10b9100
+	brfalse L_10b9748
 // --- basic block ---
-// 0x010b90f8: 0x10b90f8: j	 0x10b903c addu  v1, zero, zero
+// 0x010b9740: 0x10b9740: j	 0x10b9684 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10b903c
+	br L_10b9684
 // --- basic block ---
-L_10b9100:
-// 0x010b9100: 0x10b9100: lui   a1, 0x20000
+L_10b9748:
+// 0x010b9748: 0x10b9748: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9104: 0x10b9104: addu  a0, s1, zero
+// 0x010b974c: 0x10b974c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010b9108: 0x10b9108: addiu a2, sp, 284
+// 0x010b9750: 0x10b9750: addiu a2, sp, 284
 	ldloc.0
 	ldc.i4 284
 	add
 	stloc.3
-// 0x010b910c: 0x10b910c: addiu a1, a1, 20720
+// 0x010b9754: 0x10b9754: addiu a1, a1, 21180
 	ldloc.2
-	ldc.i4 20720
+	ldc.i4 21180
 	add
 	stloc.2
-// 0x010b9110: 0x10b9110: jal   0x10b8f44 sb    zero, 0(v0)
+// 0x010b9758: 0x10b9758: jal   0x10b958c sb    zero, 0(v0)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -1547,32 +1547,32 @@ L_10b9100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010b9118: 0x10b9118: nor   v0, zero, v0
+// 0x010b9760: 0x10b9760: nor   v0, zero, v0
 	ldloc 6
 	ldc.i4.m1
 	xor
 	stloc 6
-// 0x010b911c: 0x10b911c: sltiu v0, v0, 1
+// 0x010b9764: 0x10b9764: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x010b9120: 0x10b9120: lw    ra, 812(sp)
-// 0x010b9124: 0x10b9124: subu  v0, zero, v0
+// 0x010b9768: 0x10b9768: lw    ra, 812(sp)
+// 0x010b976c: 0x10b976c: subu  v0, zero, v0
 	ldloc 6
 	neg
 	stloc 6
-// 0x010b9128: 0x10b9128: ori   v0, v0, 1
+// 0x010b9770: 0x10b9770: ori   v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	or
 	stloc 6
-// 0x010b912c: 0x10b912c: lw    s1, 808(sp)
+// 0x010b9774: 0x10b9774: lw    s1, 808(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1581,7 +1581,7 @@ L_10b9100:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b9130: 0x10b9130: lw    s0, 804(sp)
+// 0x010b9778: 0x10b9778: lw    s0, 804(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1590,7 +1590,7 @@ L_10b9100:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b9134: 0x10b9134: jr    ra addiu sp, sp, 816
+// 0x010b977c: 0x10b977c: jr    ra addiu sp, sp, 816
 	ldloc.0
 	ldc.i4 816
 	add
@@ -1602,7 +1602,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+.method public static int32 editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -1637,16 +1637,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b913c: 0x10b913c: addiu sp, sp, -32
+// 0x010b9784: 0x10b9784: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b9140: 0x10b9140: beq   a0, zero, 0x10b9158 sw    ra, 28(sp)
+// 0x010b9788: 0x10b9788: beq   a0, zero, 0x10b97a0 sw    ra, 28(sp)
 	ldloc.1
-	brfalse L_10b9158
+	brfalse L_10b97a0
 // --- basic block ---
-// 0x010b9148: 0x10b9148: jal   0x1051af0 sw    a1, 16(sp)
+// 0x010b9790: 0x10b9790: jal   0x1051b00 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1660,12 +1660,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_net_close_1051af0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_net_close_1051b00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010b9150: 0x10b9150: lw    a1, 16(sp)
+// 0x010b9798: 0x10b9798: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1674,13 +1674,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b9154: 0x10b9154: sll   zero, zero, 0
-L_10b9158:
-// 0x010b9158: 0x10b9158: beq   a1, zero, 0x10b9168 sll   zero, zero, 0
+// 0x010b979c: 0x10b979c: sll   zero, zero, 0
+L_10b97a0:
+// 0x010b97a0: 0x10b97a0: beq   a1, zero, 0x10b97b0 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10b9168
+	brfalse L_10b97b0
 // --- basic block ---
-// 0x010b9160: 0x10b9160: jal   0x104d44c addu  a0, a1, zero
+// 0x010b97a8: 0x10b97a8: jal   0x104d45c addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -1688,15 +1688,15 @@ L_10b9158:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_10b9168:
-// 0x010b9168: 0x10b9168: lw    ra, 28(sp)
-// 0x010b916c: 0x10b916c: sll   zero, zero, 0
-// 0x010b9170: 0x10b9170: jr    ra addiu sp, sp, 32
+L_10b97b0:
+// 0x010b97b0: 0x10b97b0: lw    ra, 28(sp)
+// 0x010b97b4: 0x10b97b4: sll   zero, zero, 0
+// 0x010b97b8: 0x10b97b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1708,7 +1708,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_post_file_10b9178(int32,int32,int32,int32,int32)
+.method public static int32 editor_post_file_10b97c0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s5,int32 s0,int32 s6,int32 s8,int32 s7,int32 s2,int32 s4,int32 s3,int32 ra)
@@ -1770,12 +1770,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b9178: 0x10b9178: addiu sp, sp, -4168
+// 0x010b97c0: 0x10b97c0: addiu sp, sp, -4168
 	ldloc.0
 	ldc.i4 -4168
 	add
 	stloc.0
-// 0x010b917c: 0x10b917c: sw    s2, 4136(sp)
+// 0x010b97c4: 0x10b97c4: sw    s2, 4136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1784,7 +1784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b9180: 0x10b9180: lw    s2, 4188(sp)
+// 0x010b97c8: 0x10b97c8: lw    s2, 4188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1793,7 +1793,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b9184: 0x10b9184: sw    s8, 4160(sp)
+// 0x010b97cc: 0x10b97cc: sw    s8, 4160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1802,7 +1802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b9188: 0x10b9188: sw    s7, 4156(sp)
+// 0x010b97d0: 0x10b97d0: sw    s7, 4156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1811,7 +1811,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b918c: 0x10b918c: sw    s3, 4140(sp)
+// 0x010b97d4: 0x10b97d4: sw    s3, 4140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1820,7 +1820,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b9190: 0x10b9190: sw    s1, 4132(sp)
+// 0x010b97d8: 0x10b97d8: sw    s1, 4132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1829,7 +1829,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b9194: 0x10b9194: sw    s0, 4128(sp)
+// 0x010b97dc: 0x10b97dc: sw    s0, 4128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1838,8 +1838,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b9198: 0x10b9198: sw    ra, 4164(sp)
-// 0x010b919c: 0x10b919c: sw    s6, 4152(sp)
+// 0x010b97e0: 0x10b97e0: sw    ra, 4164(sp)
+// 0x010b97e4: 0x10b97e4: sw    s6, 4152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1848,7 +1848,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b91a0: 0x10b91a0: sw    s5, 4148(sp)
+// 0x010b97e8: 0x10b97e8: sw    s5, 4148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1857,7 +1857,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b91a4: 0x10b91a4: sw    s4, 4144(sp)
+// 0x010b97ec: 0x10b97ec: sw    s4, 4144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1866,16 +1866,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b91a8: 0x10b91a8: addu  s7, a1, zero
+// 0x010b97f0: 0x10b97f0: addu  s7, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010b91ac: 0x10b91ac: addu  s1, a2, zero
+// 0x010b97f4: 0x10b97f4: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010b91b0: 0x10b91b0: addu  s8, a3, zero
+// 0x010b97f8: 0x10b97f8: addu  s8, a3, zero
 	ldloc 4
 	stloc 12
-// 0x010b91b4: 0x10b91b4: lw    s3, 4192(sp)
+// 0x010b97fc: 0x10b97fc: lw    s3, 4192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1884,13 +1884,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b91b8: 0x10b91b8: bne   s2, zero, 0x10b91ec addu  s0, a0, zero
+// 0x010b9800: 0x10b9800: bne   s2, zero, 0x10b9834 addu  s0, a0, zero
 	ldloc 14
 	ldloc.1
 	stloc 10
-	brtrue L_10b91ec
+	brtrue L_10b9834
 // --- basic block ---
-// 0x010b91c0: 0x10b91c0: jal   0x10b913c addu  a1, zero, zero
+// 0x010b9808: 0x10b9808: jal   0x10b9784 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1898,31 +1898,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b91c8: 0x10b91c8: lui   a1, 0x20000
+// 0x010b9810: 0x10b9810: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b91cc: 0x10b91cc: lui   a3, 0x20000
+// 0x010b9814: 0x10b9814: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b91d0: 0x10b91d0: addiu a1, a1, 20568
+// 0x010b9818: 0x10b9818: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b91d4: 0x10b91d4: addiu a3, a3, 20748
+// 0x010b981c: 0x10b981c: addiu a3, a3, 21208
 	ldloc 4
-	ldc.i4 20748
+	ldc.i4 21208
 	add
 	stloc 4
-// 0x010b91d8: 0x10b91d8: addiu a0, zero, 4
+// 0x010b9820: 0x10b9820: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b91dc: 0x10b91dc: jal   0x100449c addiu a2, zero, 371
+// 0x010b9824: 0x10b9824: jal   0x100449c addiu a2, zero, 371
 	ldc.i4 371
 	stloc.3
 	ldloc.0
@@ -1935,19 +1935,19 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b91e4: 0x10b91e4: j	 0x10b9738 sll   zero, zero, 0
-	br L_10b9738
+// 0x010b982c: 0x10b982c: j	 0x10b9d80 sll   zero, zero, 0
+	br L_10b9d80
 // --- basic block ---
-L_10b91ec:
-// 0x010b91ec: 0x10b91ec: lui   a1, 0x10000
+L_10b9834:
+// 0x010b9834: 0x10b9834: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010b91f0: 0x10b91f0: addiu a1, a1, 6924
+// 0x010b9838: 0x10b9838: addiu a1, a1, 6920
 	ldloc.2
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc.2
-// 0x010b91f4: 0x10b91f4: jal   0x104dd10 addu  a0, a2, zero
+// 0x010b983c: 0x10b983c: jal   0x104dd20 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -1955,24 +1955,24 @@ L_10b91ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b91fc: 0x10b91fc: addu  s4, v0, zero
+// 0x010b9844: 0x10b9844: addu  s4, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010b9200: 0x10b9200: bne   v0, zero, 0x10b922c lui   s6, 0x20000
+// 0x010b9848: 0x10b9848: bne   v0, zero, 0x10b9874 lui   s6, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 11
-	brtrue L_10b922c
+	brtrue L_10b9874
 // --- basic block ---
-// 0x010b9208: 0x10b9208: addu  a0, s0, zero
+// 0x010b9850: 0x10b9850: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b920c: 0x10b920c: jal   0x10b913c addu  a1, zero, zero
+// 0x010b9854: 0x10b9854: jal   0x10b9784 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1980,37 +1980,37 @@ L_10b91ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9214: 0x10b9214: lui   a3, 0x20000
+// 0x010b985c: 0x10b985c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b9218: 0x10b9218: addiu a1, s6, 20568
+// 0x010b9860: 0x10b9860: addiu a1, s6, 21028
 	ldloc 11
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b921c: 0x10b921c: addiu a3, a3, 20784
+// 0x010b9864: 0x10b9864: addiu a3, a3, 21244
 	ldloc 4
-	ldc.i4 20784
+	ldc.i4 21244
 	add
 	stloc 4
-// 0x010b9220: 0x10b9220: addiu a0, zero, 4
+// 0x010b9868: 0x10b9868: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b9224: 0x10b9224: j	 0x10b9294 addiu a2, zero, 379
+// 0x010b986c: 0x10b986c: j	 0x10b98dc addiu a2, zero, 379
 	ldc.i4 379
 	stloc.3
-	br L_10b9294
+	br L_10b98dc
 // --- basic block ---
-L_10b922c:
-// 0x010b922c: 0x10b922c: addu  a0, zero, zero
+L_10b9874:
+// 0x010b9874: 0x10b9874: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9230: 0x10b9230: jal   0x104d700 addu  a1, s1, zero
+// 0x010b9878: 0x10b9878: jal   0x104d710 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2018,34 +2018,34 @@ L_10b922c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_length_104d700(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_length_104d710(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9238: 0x10b9238: lui   a3, 0x20000
+// 0x010b9880: 0x10b9880: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b923c: 0x10b923c: addiu a0, zero, 1
+// 0x010b9884: 0x10b9884: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010b9240: 0x10b9240: addiu a1, s6, 20568
+// 0x010b9888: 0x10b9888: addiu a1, s6, 21028
 	ldloc 11
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b9244: 0x10b9244: addiu a3, a3, 20820
+// 0x010b988c: 0x10b988c: addiu a3, a3, 21280
 	ldloc 4
-	ldc.i4 20820
+	ldc.i4 21280
 	add
 	stloc 4
-// 0x010b9248: 0x10b9248: addiu a2, zero, 385
+// 0x010b9890: 0x10b9890: addiu a2, zero, 385
 	ldc.i4 385
 	stloc.3
-// 0x010b924c: 0x10b924c: addu  s5, v0, zero
+// 0x010b9894: 0x10b9894: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010b9250: 0x10b9250: sw    v0, 20(sp)
+// 0x010b9898: 0x10b9898: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2054,7 +2054,7 @@ L_10b922c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b9254: 0x10b9254: jal   0x100449c sw    s1, 16(sp)
+// 0x010b989c: 0x10b989c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2073,17 +2073,17 @@ L_10b922c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b925c: 0x10b925c: lw    v0, 0(s2)
+// 0x010b98a4: 0x10b98a4: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b9260: 0x10b9260: addu  a0, s3, zero
+// 0x010b98a8: 0x10b98a8: addu  a0, s3, zero
 	ldloc 16
 	stloc.1
-// 0x010b9264: 0x10b9264: jalr  v0 addu  a1, s5, zero
+// 0x010b98ac: 0x10b98ac: jalr  v0 addu  a1, s5, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
@@ -2097,16 +2097,16 @@ L_10b922c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b926c: 0x10b926c: bne   v0, zero, 0x10b929c lui   v0, 0x0
+// 0x010b98b4: 0x10b98b4: bne   v0, zero, 0x10b98e4 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10b929c
+	brtrue L_10b98e4
 // --- basic block ---
-// 0x010b9274: 0x10b9274: addu  a0, s0, zero
+// 0x010b98bc: 0x10b98bc: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b9278: 0x10b9278: jal   0x10b913c addu  a1, s4, zero
+// 0x010b98c0: 0x10b98c0: jal   0x10b9784 addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -2114,32 +2114,32 @@ L_10b922c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9280: 0x10b9280: lui   a3, 0x20000
+// 0x010b98c8: 0x10b98c8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b9284: 0x10b9284: addiu a1, s6, 20568
+// 0x010b98cc: 0x10b98cc: addiu a1, s6, 21028
 	ldloc 11
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b9288: 0x10b9288: addiu a3, a3, 20844
+// 0x010b98d0: 0x10b98d0: addiu a3, a3, 21304
 	ldloc 4
-	ldc.i4 20844
+	ldc.i4 21304
 	add
 	stloc 4
-// 0x010b928c: 0x10b928c: addiu a0, zero, 4
+// 0x010b98d4: 0x10b98d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b9290: 0x10b9290: addiu a2, zero, 388
+// 0x010b98d8: 0x10b98d8: addiu a2, zero, 388
 	ldc.i4 388
 	stloc.3
-L_10b9294:
-// 0x010b9294: 0x10b9294: j	 0x10b9720 sw    s1, 16(sp)
+L_10b98dc:
+// 0x010b98dc: 0x10b98dc: j	 0x10b9d68 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2148,13 +2148,13 @@ L_10b9294:
 	add
 	ldloc 8
 	stelem.i4
-	br L_10b9720
+	br L_10b9d68
 // --- basic block ---
-L_10b929c:
-// 0x010b929c: 0x10b929c: addu  a0, s1, zero
+L_10b98e4:
+// 0x010b98e4: 0x10b98e4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b92a0: 0x10b92a0: jal   0x104cbd0 sw    s1, 19452(v0)
+// 0x010b98e8: 0x10b98e8: jal   0x104cbe0 sw    s1, 19452(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2168,12 +2168,12 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_skip_directories_104cbd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_skip_directories_104cbe0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b92a8: 0x10b92a8: lw    a1, 4184(sp)
+// 0x010b98f0: 0x10b98f0: lw    a1, 4184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2182,16 +2182,16 @@ L_10b929c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b92ac: 0x10b92ac: addu  a0, s8, zero
+// 0x010b98f4: 0x10b98f4: addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-// 0x010b92b0: 0x10b92b0: addu  a2, s0, zero
+// 0x010b98f8: 0x10b98f8: addu  a2, s0, zero
 	ldloc 10
 	stloc.3
-// 0x010b92b4: 0x10b92b4: addu  s6, v0, zero
+// 0x010b98fc: 0x10b98fc: addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010b92b8: 0x10b92b8: jal   0x10b8fe4 addiu s1, zero, -1
+// 0x010b9900: 0x10b9900: jal   0x10b962c addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 8
 	ldloc.0
@@ -2199,27 +2199,27 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::send_auth_10b8fe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::send_auth_10b962c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b92c0: 0x10b92c0: beq   v0, s1, 0x10b9448 addu  a0, s0, zero
+// 0x010b9908: 0x10b9908: beq   v0, s1, 0x10b9a90 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 10
 	stloc.1
-	beq  L_10b9448
+	beq  L_10b9a90
 // --- basic block ---
-// 0x010b92c8: 0x10b92c8: lui   a1, 0x20000
+// 0x010b9910: 0x10b9910: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b92cc: 0x10b92cc: addiu a1, a1, 20904
+// 0x010b9914: 0x10b9914: addiu a1, a1, 21364
 	ldloc.2
-	ldc.i4 20904
+	ldc.i4 21364
 	add
 	stloc.2
-// 0x010b92d0: 0x10b92d0: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b9918: 0x10b9918: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2227,17 +2227,17 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b92d8: 0x10b92d8: beq   v0, s1, 0x10b9444 sll   zero, zero, 0
+// 0x010b9920: 0x10b9920: beq   v0, s1, 0x10b9a8c sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	beq  L_10b9444
+	beq  L_10b9a8c
 // --- basic block ---
-// 0x010b92e0: 0x10b92e0: jal   0x1001b48 addu  a0, s6, zero
+// 0x010b9928: 0x10b9928: jal   0x1001b48 addu  a0, s6, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -2246,10 +2246,10 @@ L_10b929c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b92e8: 0x10b92e8: addu  a0, s7, zero
+// 0x010b9930: 0x10b9930: addu  a0, s7, zero
 	ldloc 13
 	stloc.1
-// 0x010b92ec: 0x10b92ec: jal   0x1001b48 addu  s8, v0, zero
+// 0x010b9934: 0x10b9934: jal   0x1001b48 addu  s8, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
@@ -2258,30 +2258,30 @@ L_10b929c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b92f4: 0x10b92f4: addiu v1, s5, 237
+// 0x010b993c: 0x10b993c: addiu v1, s5, 237
 	ldloc 9
 	ldc.i4 237
 	add
 	stloc 6
-// 0x010b92f8: 0x10b92f8: addu  s8, v1, s8
+// 0x010b9940: 0x10b9940: addu  s8, v1, s8
 	ldloc 6
 	ldloc 12
 	add
 	stloc 12
-// 0x010b92fc: 0x10b92fc: lui   a1, 0x20000
+// 0x010b9944: 0x10b9944: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9300: 0x10b9300: addu  a2, s8, v0
+// 0x010b9948: 0x10b9948: addu  a2, s8, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc.3
-// 0x010b9304: 0x10b9304: addiu a1, a1, 21008
+// 0x010b994c: 0x10b994c: addiu a1, a1, 21468
 	ldloc.2
-	ldc.i4 21008
+	ldc.i4 21468
 	add
 	stloc.2
-// 0x010b9308: 0x10b9308: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b9950: 0x10b9950: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2289,27 +2289,27 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9310: 0x10b9310: beq   v0, s1, 0x10b9448 addu  a0, s0, zero
+// 0x010b9958: 0x10b9958: beq   v0, s1, 0x10b9a90 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 10
 	stloc.1
-	beq  L_10b9448
+	beq  L_10b9a90
 // --- basic block ---
-// 0x010b9318: 0x10b9318: lui   a1, 0x10000
+// 0x010b9960: 0x10b9960: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010b931c: 0x10b931c: addiu a1, a1, 5360
+// 0x010b9964: 0x10b9964: addiu a1, a1, 5356
 	ldloc.2
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc.2
-// 0x010b9320: 0x10b9320: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b9968: 0x10b9968: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2317,27 +2317,27 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9328: 0x10b9328: beq   v0, s1, 0x10b9448 addu  a0, s0, zero
+// 0x010b9970: 0x10b9970: beq   v0, s1, 0x10b9a90 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 10
 	stloc.1
-	beq  L_10b9448
+	beq  L_10b9a90
 // --- basic block ---
-// 0x010b9330: 0x10b9330: lui   a1, 0x20000
+// 0x010b9978: 0x10b9978: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9334: 0x10b9334: addiu a1, a1, 21032
+// 0x010b997c: 0x10b997c: addiu a1, a1, 21492
 	ldloc.2
-	ldc.i4 21032
+	ldc.i4 21492
 	add
 	stloc.2
-// 0x010b9338: 0x10b9338: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b9980: 0x10b9980: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2345,30 +2345,30 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9340: 0x10b9340: beq   v0, s1, 0x10b9448 addu  a0, s0, zero
+// 0x010b9988: 0x10b9988: beq   v0, s1, 0x10b9a90 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 10
 	stloc.1
-	beq  L_10b9448
+	beq  L_10b9a90
 // --- basic block ---
-// 0x010b9348: 0x10b9348: lui   a1, 0x20000
+// 0x010b9990: 0x10b9990: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b934c: 0x10b934c: addiu a1, a1, 21096
+// 0x010b9994: 0x10b9994: addiu a1, a1, 21556
 	ldloc.2
-	ldc.i4 21096
+	ldc.i4 21556
 	add
 	stloc.2
-// 0x010b9350: 0x10b9350: addu  a2, s6, zero
+// 0x010b9998: 0x10b9998: addu  a2, s6, zero
 	ldloc 11
 	stloc.3
-// 0x010b9354: 0x10b9354: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b999c: 0x10b999c: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2376,30 +2376,30 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b935c: 0x10b935c: beq   v0, s1, 0x10b9448 addu  a0, s0, zero
+// 0x010b99a4: 0x10b99a4: beq   v0, s1, 0x10b9a90 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 10
 	stloc.1
-	beq  L_10b9448
+	beq  L_10b9a90
 // --- basic block ---
-// 0x010b9364: 0x10b9364: lui   a1, 0x20000
+// 0x010b99ac: 0x10b99ac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9368: 0x10b9368: addiu a1, a1, 21160
+// 0x010b99b0: 0x10b99b0: addiu a1, a1, 21620
 	ldloc.2
-	ldc.i4 21160
+	ldc.i4 21620
 	add
 	stloc.2
-// 0x010b936c: 0x10b936c: addu  a2, s7, zero
+// 0x010b99b4: 0x10b99b4: addu  a2, s7, zero
 	ldloc 13
 	stloc.3
-// 0x010b9370: 0x10b9370: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b99b8: 0x10b99b8: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2407,27 +2407,27 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9378: 0x10b9378: beq   v0, s1, 0x10b9448 addu  a0, s0, zero
+// 0x010b99c0: 0x10b99c0: beq   v0, s1, 0x10b9a90 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 10
 	stloc.1
-	beq  L_10b9448
+	beq  L_10b9a90
 // --- basic block ---
-// 0x010b9380: 0x10b9380: lui   a1, 0x20000
+// 0x010b99c8: 0x10b99c8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9384: 0x10b9384: addiu a1, a1, 21180
+// 0x010b99cc: 0x10b99cc: addiu a1, a1, 21640
 	ldloc.2
-	ldc.i4 21180
+	ldc.i4 21640
 	add
 	stloc.2
-// 0x010b9388: 0x10b9388: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b99d0: 0x10b99d0: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2435,46 +2435,46 @@ L_10b929c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9390: 0x10b9390: addiu v1, zero, -1
+// 0x010b99d8: 0x10b99d8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b9394: 0x10b9394: bne   v0, v1, 0x10b96dc addu  a0, s0, zero
+// 0x010b99dc: 0x10b99dc: bne   v0, v1, 0x10b9d24 addu  a0, s0, zero
 	ldloc 5
 	ldloc 6
 	ldloc 10
 	stloc.1
-	bne.un L_10b96dc
+	bne.un L_10b9d24
 // --- basic block ---
-// 0x010b939c: 0x10b939c: j	 0x10b9448 sll   zero, zero, 0
-	br L_10b9448
+// 0x010b99e4: 0x10b99e4: j	 0x10b9a90 sll   zero, zero, 0
+	br L_10b9a90
 // --- basic block ---
-L_10b93a4:
-// 0x010b93a4: 0x10b93a4: jal   0x104d494 sll   zero, zero, 0
+L_10b99ec:
+// 0x010b99ec: 0x10b99ec: jal   0x104d4a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_read_104d494(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_read_104d4a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b93ac: 0x10b93ac: addu  a2, v0, zero
+// 0x010b99f4: 0x10b99f4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010b93b0: 0x10b93b0: addu  a0, s0, zero
+// 0x010b99f8: 0x10b99f8: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b93b4: 0x10b93b4: addu  a1, s6, zero
+// 0x010b99fc: 0x10b99fc: addu  a1, s6, zero
 	ldloc 11
 	stloc.2
-// 0x010b93b8: 0x10b93b8: jal   0x1052018 addiu a3, zero, 1
+// 0x010b9a00: 0x10b9a00: jal   0x1052028 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -2482,22 +2482,22 @@ L_10b93a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_send_1052018(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_send_1052028(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b93c0: 0x10b93c0: bgtz  v0, 0x10b93f0 addu  a0, s3, zero
+// 0x010b9a08: 0x10b9a08: bgtz  v0, 0x10b9a38 addu  a0, s3, zero
 	ldloc 5
 	ldloc 16
 	stloc.1
 	ldc.i4.s 0
-	bgt L_10b93f0
+	bgt L_10b9a38
 // --- basic block ---
-// 0x010b93c8: 0x10b93c8: addu  a0, s0, zero
+// 0x010b9a10: 0x10b9a10: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b93cc: 0x10b93cc: jal   0x10b913c addu  a1, s4, zero
+// 0x010b9a14: 0x10b9a14: jal   0x10b9784 addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -2505,42 +2505,42 @@ L_10b93a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b93d4: 0x10b93d4: lui   a1, 0x20000
+// 0x010b9a1c: 0x10b9a1c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b93d8: 0x10b93d8: lui   a3, 0x20000
+// 0x010b9a20: 0x10b9a20: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b93dc: 0x10b93dc: addiu a1, a1, 20568
+// 0x010b9a24: 0x10b9a24: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b93e0: 0x10b93e0: addiu a3, a3, 21220
+// 0x010b9a28: 0x10b9a28: addiu a3, a3, 21680
 	ldloc 4
-	ldc.i4 21220
+	ldc.i4 21680
 	add
 	stloc 4
-// 0x010b93e4: 0x10b93e4: addiu a0, zero, 4
+// 0x010b9a2c: 0x10b9a2c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b93e8: 0x10b93e8: j	 0x10b9294 addiu a2, zero, 435
+// 0x010b9a30: 0x10b9a30: j	 0x10b98dc addiu a2, zero, 435
 	ldc.i4 435
 	stloc.3
-	br L_10b9294
+	br L_10b98dc
 // --- basic block ---
-L_10b93f0:
-// 0x010b93f0: 0x10b93f0: addu  s1, s1, v0
+L_10b9a38:
+// 0x010b9a38: 0x10b9a38: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x010b93f4: 0x10b93f4: lw    v0, 4(s2)
+// 0x010b9a3c: 0x10b9a3c: lw    v0, 4(s2)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -2549,8 +2549,8 @@ L_10b93f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b93f8: 0x10b93f8: sll   zero, zero, 0
-// 0x010b93fc: 0x10b93fc: jalr  v0 addu  a1, s1, zero
+// 0x010b9a40: 0x10b9a40: sll   zero, zero, 0
+// 0x010b9a44: 0x10b9a44: jalr  v0 addu  a1, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
@@ -2564,33 +2564,33 @@ L_10b93f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b9404:
-// 0x010b9404: 0x10b9404: slt   v0, s1, s5
+L_10b9a4c:
+// 0x010b9a4c: 0x10b9a4c: slt   v0, s1, s5
 	ldloc 8
 	ldloc 9
 	clt
 	stloc 5
-// 0x010b9408: 0x10b9408: addu  a0, s4, zero
+// 0x010b9a50: 0x10b9a50: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x010b940c: 0x10b940c: addu  a1, s6, zero
+// 0x010b9a54: 0x10b9a54: addu  a1, s6, zero
 	ldloc 11
 	stloc.2
-// 0x010b9410: 0x10b9410: bne   v0, zero, 0x10b93a4 addiu a2, zero, 4096
+// 0x010b9a58: 0x10b9a58: bne   v0, zero, 0x10b99ec addiu a2, zero, 4096
 	ldloc 5
 	ldc.i4 4096
 	stloc.3
-	brtrue L_10b93a4
+	brtrue L_10b99ec
 // --- basic block ---
-// 0x010b9418: 0x10b9418: lui   a1, 0x20000
+// 0x010b9a60: 0x10b9a60: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b941c: 0x10b941c: addiu a1, a1, 21252
+// 0x010b9a64: 0x10b9a64: addiu a1, a1, 21712
 	ldloc.2
-	ldc.i4 21252
+	ldc.i4 21712
 	add
 	stloc.2
-// 0x010b9420: 0x10b9420: jal   0x10b8f44 addu  a0, s0, zero
+// 0x010b9a68: 0x10b9a68: jal   0x10b958c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2598,40 +2598,40 @@ L_10b9404:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_http_send_10b8f44(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_http_send_10b958c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9428: 0x10b9428: addiu v1, zero, -1
+// 0x010b9a70: 0x10b9a70: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010b942c: 0x10b942c: beq   v0, v1, 0x10b9444 addu  s5, zero, zero
+// 0x010b9a74: 0x10b9a74: beq   v0, v1, 0x10b9a8c addu  s5, zero, zero
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc 9
-	beq  L_10b9444
+	beq  L_10b9a8c
 // --- basic block ---
-// 0x010b9434: 0x10b9434: addu  s7, zero, zero
+// 0x010b9a7c: 0x10b9a7c: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010b9438: 0x10b9438: addu  s8, zero, zero
+// 0x010b9a80: 0x10b9a80: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010b943c: 0x10b943c: j	 0x10b9458 addiu s1, sp, 24
+// 0x010b9a84: 0x10b9a84: j	 0x10b9aa0 addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	br L_10b9458
+	br L_10b9aa0
 // --- basic block ---
-L_10b9444:
-// 0x010b9444: 0x10b9444: addu  a0, s0, zero
+L_10b9a8c:
+// 0x010b9a8c: 0x10b9a8c: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-L_10b9448:
-// 0x010b9448: 0x10b9448: jal   0x10b913c addu  a1, s4, zero
+L_10b9a90:
+// 0x010b9a90: 0x10b9a90: jal   0x10b9784 addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -2639,28 +2639,28 @@ L_10b9448:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9450: 0x10b9450: j	 0x10b9728 sll   zero, zero, 0
-	br L_10b9728
+// 0x010b9a98: 0x10b9a98: j	 0x10b9d70 sll   zero, zero, 0
+	br L_10b9d70
 // --- basic block ---
-L_10b9458:
-// 0x010b9458: 0x10b9458: addu  s6, s1, s5
+L_10b9aa0:
+// 0x010b9aa0: 0x10b9aa0: addu  s6, s1, s5
 	ldloc 8
 	ldloc 9
 	add
 	stloc 11
-L_10b945c:
-// 0x010b945c: 0x10b945c: addu  a0, s1, zero
+L_10b9aa4:
+// 0x010b9aa4: 0x10b9aa4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b9460: 0x10b9460: addiu a1, zero, 10
+// 0x010b9aa8: 0x10b9aa8: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010b9464: 0x10b9464: jal   0x1001a5c sb    zero, 0(s6)
+// 0x010b9aac: 0x10b9aac: jal   0x1001a5c sb    zero, 0(s6)
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -2671,22 +2671,22 @@ L_10b945c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b946c: 0x10b946c: bne   v0, zero, 0x10b94c0 lui   a1, 0x10000
+// 0x010b9ab4: 0x10b9ab4: bne   v0, zero, 0x10b9b08 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10b94c0
+	brtrue L_10b9b08
 // --- basic block ---
-// 0x010b9474: 0x10b9474: addiu v0, zero, 4095
+// 0x010b9abc: 0x10b9abc: addiu v0, zero, 4095
 	ldc.i4 4095
 	stloc 5
-// 0x010b9478: 0x10b9478: addu  a1, s6, zero
+// 0x010b9ac0: 0x10b9ac0: addu  a1, s6, zero
 	ldloc 11
 	stloc.2
-// 0x010b947c: 0x10b947c: addu  a0, s0, zero
+// 0x010b9ac4: 0x10b9ac4: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b9480: 0x10b9480: jal   0x1051e64 subu  a2, v0, s5
+// 0x010b9ac8: 0x10b9ac8: jal   0x1051e74 subu  a2, v0, s5
 	ldloc 5
 	ldloc 9
 	sub
@@ -2696,40 +2696,40 @@ L_10b945c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_receive_1051e64(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_receive_1051e74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9488: 0x10b9488: bgtz  v0, 0x10b94b4 addu  s5, s5, v0
+// 0x010b9ad0: 0x10b9ad0: bgtz  v0, 0x10b9afc addu  s5, s5, v0
 	ldloc 5
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
 	ldc.i4.s 0
-	bgt L_10b94b4
+	bgt L_10b9afc
 // --- basic block ---
-// 0x010b9490: 0x10b9490: lui   a1, 0x20000
+// 0x010b9ad8: 0x10b9ad8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9494: 0x10b9494: lui   a3, 0x20000
+// 0x010b9adc: 0x10b9adc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b9498: 0x10b9498: addiu a1, a1, 20568
+// 0x010b9ae0: 0x10b9ae0: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b949c: 0x10b949c: addiu a3, a3, 21320
+// 0x010b9ae4: 0x10b9ae4: addiu a3, a3, 21780
 	ldloc 4
-	ldc.i4 21320
+	ldc.i4 21780
 	add
 	stloc 4
-// 0x010b94a0: 0x10b94a0: addiu a0, zero, 4
+// 0x010b9ae8: 0x10b9ae8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b94a4: 0x10b94a4: jal   0x100449c addiu a2, zero, 270
+// 0x010b9aec: 0x10b9aec: jal   0x100449c addiu a2, zero, 270
 	ldc.i4 270
 	stloc.3
 	ldloc.0
@@ -2742,31 +2742,31 @@ L_10b945c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b94ac: 0x10b94ac: j	 0x10b96f8 addu  a0, s0, zero
+// 0x010b9af4: 0x10b9af4: j	 0x10b9d40 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-	br L_10b96f8
+	br L_10b9d40
 // --- basic block ---
-L_10b94b4:
-// 0x010b94b4: 0x10b94b4: addu  v0, s1, s5
+L_10b9afc:
+// 0x010b9afc: 0x10b9afc: addu  v0, s1, s5
 	ldloc 8
 	ldloc 9
 	add
 	stloc 5
-// 0x010b94b8: 0x10b94b8: sb    zero, 0(v0)
+// 0x010b9b00: 0x10b9b00: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b94bc: 0x10b94bc: lui   a1, 0x10000
+// 0x010b9b04: 0x10b9b04: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_10b94c0:
-// 0x010b94c0: 0x10b94c0: addiu a1, a1, 5360
+L_10b9b08:
+// 0x010b9b08: 0x10b9b08: addiu a1, a1, 5356
 	ldloc.2
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc.2
-// 0x010b94c4: 0x10b94c4: jal   0x1000420 addu  a0, s1, zero
+// 0x010b9b0c: 0x10b9b0c: jal   0x1000420 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2779,19 +2779,19 @@ L_10b94c0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b94cc: 0x10b94cc: addu  s6, v0, zero
+// 0x010b9b14: 0x10b9b14: addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010b94d0: 0x10b94d0: bne   v0, zero, 0x10b94f0 addiu a1, zero, 2
+// 0x010b9b18: 0x10b9b18: bne   v0, zero, 0x10b9b38 addiu a1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc.2
-	brtrue L_10b94f0
+	brtrue L_10b9b38
 // --- basic block ---
-// 0x010b94d8: 0x10b94d8: addu  a0, s1, zero
+// 0x010b9b20: 0x10b9b20: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b94dc: 0x10b94dc: jal   0x1001a5c addiu a1, zero, 10
+// 0x010b9b24: 0x10b9b24: jal   0x1001a5c addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
 	ldloc.1
@@ -2801,17 +2801,17 @@ L_10b94c0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b94e4: 0x10b94e4: beq   v0, zero, 0x10b9458 addu  s6, v0, zero
+// 0x010b9b2c: 0x10b9b2c: beq   v0, zero, 0x10b9aa0 addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brfalse L_10b9458
+	brfalse L_10b9aa0
 // --- basic block ---
-// 0x010b94ec: 0x10b94ec: addiu a1, zero, 1
+// 0x010b9b34: 0x10b9b34: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-L_10b94f0:
-// 0x010b94f0: 0x10b94f0: sw    a1, 4120(sp)
+L_10b9b38:
+// 0x010b9b38: 0x10b9b38: sw    a1, 4120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2820,26 +2820,26 @@ L_10b94f0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010b94f4: 0x10b94f4: bne   s8, zero, 0x10b9534 sb    zero, 0(s6)
+// 0x010b9b3c: 0x10b9b3c: bne   s8, zero, 0x10b9b7c sb    zero, 0(s6)
 	ldloc 12
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brtrue L_10b9534
+	brtrue L_10b9b7c
 // --- basic block ---
-// 0x010b94fc: 0x10b94fc: beq   s6, s1, 0x10b960c lui   a1, 0x10000
+// 0x010b9b44: 0x10b9b44: beq   s6, s1, 0x10b9c54 lui   a1, 0x10000
 	ldloc 11
 	ldloc 8
 	ldc.i4 65536
 	stloc.2
-	beq  L_10b960c
+	beq  L_10b9c54
 // --- basic block ---
-// 0x010b9504: 0x10b9504: addu  a0, s1, zero
+// 0x010b9b4c: 0x10b9b4c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b9508: 0x10b9508: jal   0x1000420 addiu a1, a1, -980
+// 0x010b9b50: 0x10b9b50: jal   0x1000420 addiu a1, a1, -984
 	ldloc.2
-	ldc.i4 -980
+	ldc.i4 -984
 	add
 	stloc.2
 	ldloc.0
@@ -2852,61 +2852,61 @@ L_10b94f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9510: 0x10b9510: bne   v0, zero, 0x10b960c addiu s8, zero, 1
+// 0x010b9b58: 0x10b9b58: bne   v0, zero, 0x10b9c54 addiu s8, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 12
-	brtrue L_10b960c
+	brtrue L_10b9c54
 // --- basic block ---
-// 0x010b9518: 0x10b9518: lui   a1, 0x20000
+// 0x010b9b60: 0x10b9b60: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b951c: 0x10b951c: lui   a3, 0x20000
+// 0x010b9b64: 0x10b9b64: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b9520: 0x10b9520: addiu a1, a1, 20568
+// 0x010b9b68: 0x10b9b68: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b9524: 0x10b9524: addiu a3, a3, 21336
+// 0x010b9b6c: 0x10b9b6c: addiu a3, a3, 21796
 	ldloc 4
-	ldc.i4 21336
+	ldc.i4 21796
 	add
 	stloc 4
-// 0x010b9528: 0x10b9528: addiu a0, zero, 4
+// 0x010b9b70: 0x10b9b70: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b952c: 0x10b952c: j	 0x10b95ac addiu a2, zero, 293
+// 0x010b9b74: 0x10b9b74: j	 0x10b9bf4 addiu a2, zero, 293
 	ldc.i4 293
 	stloc.3
-	br L_10b95ac
+	br L_10b9bf4
 // --- basic block ---
-L_10b9534:
-// 0x010b9534: 0x10b9534: bne   s6, s1, 0x10b9568 addu  a0, s1, zero
+L_10b9b7c:
+// 0x010b9b7c: 0x10b9b7c: bne   s6, s1, 0x10b9bb0 addu  a0, s1, zero
 	ldloc 11
 	ldloc 8
 	ldloc 8
 	stloc.1
-	bne.un L_10b9568
+	bne.un L_10b9bb0
 // --- basic block ---
-// 0x010b953c: 0x10b953c: subu  s5, s5, a1
+// 0x010b9b84: 0x10b9b84: subu  s5, s5, a1
 	ldloc 9
 	ldloc.2
 	sub
 	stloc 9
-// 0x010b9540: 0x10b9540: beq   s5, zero, 0x10b9554 addu  a1, s6, a1
+// 0x010b9b88: 0x10b9b88: beq   s5, zero, 0x10b9b9c addu  a1, s6, a1
 	ldloc 9
 	ldloc 11
 	ldloc.2
 	add
 	stloc.2
-	brfalse L_10b9554
+	brfalse L_10b9b9c
 // --- basic block ---
-// 0x010b9548: 0x10b9548: addu  a0, s6, zero
+// 0x010b9b90: 0x10b9b90: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x010b954c: 0x10b954c: jal   0x1001800 addu  a2, s5, zero
+// 0x010b9b94: 0x10b9b94: jal   0x1001800 addu  a2, s5, zero
 	ldloc 9
 	stloc.3
 	ldloc.1
@@ -2918,35 +2918,35 @@ L_10b9534:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b9554:
-// 0x010b9554: 0x10b9554: slti  v0, s7, 2
+L_10b9b9c:
+// 0x010b9b9c: 0x10b9b9c: slti  v0, s7, 2
 	ldloc 13
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010b9558: 0x10b9558: beq   v0, zero, 0x10b9634 addiu s6, sp, 24
+// 0x010b9ba0: 0x10b9ba0: beq   v0, zero, 0x10b9c7c addiu s6, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-	brfalse L_10b9634
+	brfalse L_10b9c7c
 // --- basic block ---
-// 0x010b9560: 0x10b9560: j	 0x10b96b4 addu  a0, s0, zero
+// 0x010b9ba8: 0x10b9ba8: j	 0x10b9cfc addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-	br L_10b96b4
+	br L_10b9cfc
 // --- basic block ---
-L_10b9568:
-// 0x010b9568: 0x10b9568: lui   a1, 0x10000
+L_10b9bb0:
+// 0x010b9bb0: 0x10b9bb0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010b956c: 0x10b956c: addiu a1, a1, -908
+// 0x010b9bb4: 0x10b9bb4: addiu a1, a1, -912
 	ldloc.2
-	ldc.i4 -908
+	ldc.i4 -912
 	add
 	stloc.2
-// 0x010b9570: 0x10b9570: jal   0x100039c addiu a2, zero, 14
+// 0x010b9bb8: 0x10b9bb8: jal   0x100039c addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.1
@@ -2958,16 +2958,16 @@ L_10b9568:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9578: 0x10b9578: bne   v0, zero, 0x10b960c addiu s8, zero, 1
+// 0x010b9bc0: 0x10b9bc0: bne   v0, zero, 0x10b9c54 addiu s8, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 12
-	brtrue L_10b960c
+	brtrue L_10b9c54
 // --- basic block ---
-// 0x010b9580: 0x10b9580: addu  a0, s1, zero
+// 0x010b9bc8: 0x10b9bc8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010b9584: 0x10b9584: jal   0x1001a5c addiu a1, zero, 58
+// 0x010b9bcc: 0x10b9bcc: jal   0x1001a5c addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
 	ldloc.1
@@ -2977,38 +2977,38 @@ L_10b9568:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b958c: 0x10b958c: bne   v0, zero, 0x10b95b8 addiu v0, v0, 1
+// 0x010b9bd4: 0x10b9bd4: bne   v0, zero, 0x10b9c00 addiu v0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_10b95b8
+	brtrue L_10b9c00
 // --- basic block ---
-// 0x010b9594: 0x10b9594: lui   a1, 0x20000
+// 0x010b9bdc: 0x10b9bdc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9598: 0x10b9598: lui   a3, 0x20000
+// 0x010b9be0: 0x10b9be0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b959c: 0x10b959c: addiu a1, a1, 20568
+// 0x010b9be4: 0x10b9be4: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b95a0: 0x10b95a0: addiu a3, a3, 21360
+// 0x010b9be8: 0x10b9be8: addiu a3, a3, 21820
 	ldloc 4
-	ldc.i4 21360
+	ldc.i4 21820
 	add
 	stloc 4
-// 0x010b95a4: 0x10b95a4: addiu a0, zero, 4
+// 0x010b9bec: 0x10b9bec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b95a8: 0x10b95a8: addiu a2, zero, 319
+// 0x010b9bf0: 0x10b9bf0: addiu a2, zero, 319
 	ldc.i4 319
 	stloc.3
-L_10b95ac:
-// 0x010b95ac: 0x10b95ac: j	 0x10b95f8 sw    s1, 16(sp)
+L_10b9bf4:
+// 0x010b9bf4: 0x10b9bf4: j	 0x10b9c40 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3017,28 +3017,28 @@ L_10b95ac:
 	add
 	ldloc 8
 	stelem.i4
-	br L_10b95f8
+	br L_10b9c40
 // --- basic block ---
-L_10b95b4:
-// 0x010b95b4: 0x10b95b4: addiu v0, v0, 1
+L_10b9bfc:
+// 0x010b9bfc: 0x10b9bfc: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_10b95b8:
-// 0x010b95b8: 0x10b95b8: lb    v1, 0(v0)
+L_10b9c00:
+// 0x010b9c00: 0x10b9c00: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010b95bc: 0x10b95bc: addiu a0, zero, 32
+// 0x010b9c04: 0x10b9c04: addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
-// 0x010b95c0: 0x10b95c0: beq   v1, a0, 0x10b95b4 sll   zero, zero, 0
+// 0x010b9c08: 0x10b9c08: beq   v1, a0, 0x10b9bfc sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	beq  L_10b95b4
+	beq  L_10b9bfc
 // --- basic block ---
-// 0x010b95c8: 0x10b95c8: jal   0x1000d8c addu  a0, v0, zero
+// 0x010b9c10: 0x10b9c10: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3051,41 +3051,41 @@ L_10b95b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b95d0: 0x10b95d0: bgez  v0, 0x10b9608 addu  s7, v0, zero
+// 0x010b9c18: 0x10b9c18: bgez  v0, 0x10b9c50 addu  s7, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 13
 	ldc.i4.s 0
-	bge L_10b9608
+	bge L_10b9c50
 // --- basic block ---
-// 0x010b95d8: 0x10b95d8: lui   a1, 0x20000
+// 0x010b9c20: 0x10b9c20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b95dc: 0x10b95dc: lui   a3, 0x20000
+// 0x010b9c24: 0x10b9c24: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b95e0: 0x10b95e0: addiu v0, sp, 24
+// 0x010b9c28: 0x10b9c28: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010b95e4: 0x10b95e4: addiu a1, a1, 20568
+// 0x010b9c2c: 0x10b9c2c: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b95e8: 0x10b95e8: addiu a3, a3, 21360
+// 0x010b9c30: 0x10b9c30: addiu a3, a3, 21820
 	ldloc 4
-	ldc.i4 21360
+	ldc.i4 21820
 	add
 	stloc 4
-// 0x010b95ec: 0x10b95ec: addiu a0, zero, 4
+// 0x010b9c34: 0x10b9c34: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b95f0: 0x10b95f0: addiu a2, zero, 326
+// 0x010b9c38: 0x10b9c38: addiu a2, zero, 326
 	ldc.i4 326
 	stloc.3
-// 0x010b95f4: 0x10b95f4: sw    v0, 16(sp)
+// 0x010b9c3c: 0x10b9c3c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3094,8 +3094,8 @@ L_10b95b8:
 	add
 	ldloc 5
 	stelem.i4
-L_10b95f8:
-// 0x010b95f8: 0x10b95f8: jal   0x100449c sll   zero, zero, 0
+L_10b9c40:
+// 0x010b9c40: 0x10b9c40: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3106,17 +3106,17 @@ L_10b95f8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9600: 0x10b9600: j	 0x10b96f8 addu  a0, s0, zero
+// 0x010b9c48: 0x10b9c48: j	 0x10b9d40 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-	br L_10b96f8
+	br L_10b9d40
 // --- basic block ---
-L_10b9608:
-// 0x010b9608: 0x10b9608: addiu s8, zero, 1
+L_10b9c50:
+// 0x010b9c50: 0x10b9c50: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 12
-L_10b960c:
-// 0x010b960c: 0x10b960c: lw    v0, 4120(sp)
+L_10b9c54:
+// 0x010b9c54: 0x10b9c54: lw    v0, 4120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3125,28 +3125,28 @@ L_10b960c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b9610: 0x10b9610: addu  s5, s1, s5
+// 0x010b9c58: 0x10b9c58: addu  s5, s1, s5
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-// 0x010b9614: 0x10b9614: addu  a1, s6, v0
+// 0x010b9c5c: 0x10b9c5c: addu  a1, s6, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc.2
-// 0x010b9618: 0x10b9618: subu  s5, s5, a1
+// 0x010b9c60: 0x10b9c60: subu  s5, s5, a1
 	ldloc 9
 	ldloc.2
 	sub
 	stloc 9
-// 0x010b961c: 0x10b961c: beq   s5, zero, 0x10b9458 addu  a0, s1, zero
+// 0x010b9c64: 0x10b9c64: beq   s5, zero, 0x10b9aa0 addu  a0, s1, zero
 	ldloc 9
 	ldloc 8
 	stloc.1
-	brfalse L_10b9458
+	brfalse L_10b9aa0
 // --- basic block ---
-// 0x010b9624: 0x10b9624: jal   0x1001800 addu  a2, s5, zero
+// 0x010b9c6c: 0x10b9c6c: jal   0x1001800 addu  a2, s5, zero
 	ldloc 9
 	stloc.3
 	ldloc.1
@@ -3158,15 +3158,15 @@ L_10b960c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b962c: 0x10b962c: j	 0x10b945c addu  s6, s1, s5
+// 0x010b9c74: 0x10b9c74: j	 0x10b9aa4 addu  s6, s1, s5
 	ldloc 8
 	ldloc 9
 	add
 	stloc 11
-	br L_10b945c
+	br L_10b9aa4
 // --- basic block ---
-L_10b9634:
-// 0x010b9634: 0x10b9634: jal   0x1000910 addiu a0, s7, 1
+L_10b9c7c:
+// 0x010b9c7c: 0x10b9c7c: jal   0x1000910 addiu a0, s7, 1
 	ldloc 13
 	ldc.i4.1
 	add
@@ -3181,16 +3181,16 @@ L_10b9634:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b963c: 0x10b963c: addu  a0, v0, zero
+// 0x010b9c84: 0x10b9c84: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010b9640: 0x10b9640: addu  a1, s6, zero
+// 0x010b9c88: 0x10b9c88: addu  a1, s6, zero
 	ldloc 11
 	stloc.2
-// 0x010b9644: 0x10b9644: addu  a2, s5, zero
+// 0x010b9c8c: 0x10b9c8c: addu  a2, s5, zero
 	ldloc 9
 	stloc.3
-// 0x010b9648: 0x10b9648: jal   0x1001800 addu  s1, v0, zero
+// 0x010b9c90: 0x10b9c90: jal   0x1001800 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -3202,70 +3202,70 @@ L_10b9634:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9650: 0x10b9650: j	 0x10b9670 slt   v0, s5, s7
+// 0x010b9c98: 0x10b9c98: j	 0x10b9cb8 slt   v0, s5, s7
 	ldloc 9
 	ldloc 13
 	clt
 	stloc 5
-	br L_10b9670
+	br L_10b9cb8
 // --- basic block ---
-L_10b9658:
-// 0x010b9658: 0x10b9658: jal   0x1051e64 sll   zero, zero, 0
+L_10b9ca0:
+// 0x010b9ca0: 0x10b9ca0: jal   0x1051e74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_receive_1051e64(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_receive_1051e74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9660: 0x10b9660: blez  v0, 0x10b9680 sll   zero, zero, 0
+// 0x010b9ca8: 0x10b9ca8: blez  v0, 0x10b9cc8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_10b9680
+	ble L_10b9cc8
 // --- basic block ---
-// 0x010b9668: 0x10b9668: addu  s5, s5, v0
+// 0x010b9cb0: 0x10b9cb0: addu  s5, s5, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x010b966c: 0x10b966c: slt   v0, s5, s7
+// 0x010b9cb4: 0x10b9cb4: slt   v0, s5, s7
 	ldloc 9
 	ldloc 13
 	clt
 	stloc 5
-L_10b9670:
-// 0x010b9670: 0x10b9670: addu  a1, s1, s5
+L_10b9cb8:
+// 0x010b9cb8: 0x10b9cb8: addu  a1, s1, s5
 	ldloc 8
 	ldloc 9
 	add
 	stloc.2
-// 0x010b9674: 0x10b9674: subu  a2, s7, s5
+// 0x010b9cbc: 0x10b9cbc: subu  a2, s7, s5
 	ldloc 13
 	ldloc 9
 	sub
 	stloc.3
-// 0x010b9678: 0x10b9678: bne   v0, zero, 0x10b9658 addu  a0, s0, zero
+// 0x010b9cc0: 0x10b9cc0: bne   v0, zero, 0x10b9ca0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_10b9658
+	brtrue L_10b9ca0
 // --- basic block ---
-L_10b9680:
-// 0x010b9680: 0x10b9680: addu  s5, s1, s5
+L_10b9cc8:
+// 0x010b9cc8: 0x10b9cc8: addu  s5, s1, s5
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-// 0x010b9684: 0x10b9684: addu  a0, s0, zero
+// 0x010b9ccc: 0x10b9ccc: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010b9688: 0x10b9688: addu  a1, s4, zero
+// 0x010b9cd0: 0x10b9cd0: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x010b968c: 0x10b968c: jal   0x10b913c sb    zero, 0(s5)
+// 0x010b9cd4: 0x10b9cd4: jal   0x10b9784 sb    zero, 0(s5)
 	ldloc 9
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -3274,12 +3274,12 @@ L_10b9680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9694: 0x10b9694: lw    v0, 12(s2)
+// 0x010b9cdc: 0x10b9cdc: lw    v0, 12(s2)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -3288,10 +3288,10 @@ L_10b9680:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b9698: 0x10b9698: addu  a0, s3, zero
+// 0x010b9ce0: 0x10b9ce0: addu  a0, s3, zero
 	ldloc 16
 	stloc.1
-// 0x010b969c: 0x10b969c: jalr  v0 addu  a1, s1, zero
+// 0x010b9ce4: 0x10b9ce4: jalr  v0 addu  a1, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
@@ -3305,7 +3305,7 @@ L_10b9680:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b96a4: 0x10b96a4: jal   0x1000930 addu  a0, s1, zero
+// 0x010b9cec: 0x10b9cec: jal   0x1000930 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3318,11 +3318,11 @@ L_10b9680:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b96ac: 0x10b96ac: j	 0x10b9738 sll   zero, zero, 0
-	br L_10b9738
+// 0x010b9cf4: 0x10b9cf4: j	 0x10b9d80 sll   zero, zero, 0
+	br L_10b9d80
 // --- basic block ---
-L_10b96b4:
-// 0x010b96b4: 0x10b96b4: jal   0x10b913c addu  a1, s4, zero
+L_10b9cfc:
+// 0x010b9cfc: 0x10b9cfc: jal   0x10b9784 addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -3330,17 +3330,17 @@ L_10b96b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b96bc: 0x10b96bc: addu  s5, s6, s5
+// 0x010b9d04: 0x10b9d04: addu  s5, s6, s5
 	ldloc 11
 	ldloc 9
 	add
 	stloc 9
-// 0x010b96c0: 0x10b96c0: lw    v0, 12(s2)
+// 0x010b9d08: 0x10b9d08: lw    v0, 12(s2)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -3349,14 +3349,14 @@ L_10b96b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b96c4: 0x10b96c4: addu  a0, s3, zero
+// 0x010b9d0c: 0x10b9d0c: addu  a0, s3, zero
 	ldloc 16
 	stloc.1
-// 0x010b96c8: 0x10b96c8: sb    zero, 0(s5)
+// 0x010b9d10: 0x10b9d10: sb    zero, 0(s5)
 	ldloc 9
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b96cc: 0x10b96cc: jalr  v0 addu  a1, zero, zero
+// 0x010b9d14: 0x10b9d14: jalr  v0 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
@@ -3370,11 +3370,11 @@ L_10b96b4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b96d4: 0x10b96d4: j	 0x10b9738 sll   zero, zero, 0
-	br L_10b9738
+// 0x010b9d1c: 0x10b9d1c: j	 0x10b9d80 sll   zero, zero, 0
+	br L_10b9d80
 // --- basic block ---
-L_10b96dc:
-// 0x010b96dc: 0x10b96dc: lw    v0, 4(s2)
+L_10b9d24:
+// 0x010b9d24: 0x10b9d24: lw    v0, 4(s2)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -3383,10 +3383,10 @@ L_10b96dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b96e0: 0x10b96e0: addu  a0, s3, zero
+// 0x010b9d28: 0x10b9d28: addu  a0, s3, zero
 	ldloc 16
 	stloc.1
-// 0x010b96e4: 0x10b96e4: jalr  v0 addu  a1, zero, zero
+// 0x010b9d2c: 0x10b9d2c: jalr  v0 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
@@ -3400,18 +3400,18 @@ L_10b96dc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b96ec: 0x10b96ec: addu  s1, zero, zero
+// 0x010b9d34: 0x10b9d34: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010b96f0: 0x10b96f0: j	 0x10b9404 addiu s6, sp, 24
+// 0x010b9d38: 0x10b9d38: j	 0x10b9a4c addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-	br L_10b9404
+	br L_10b9a4c
 // --- basic block ---
-L_10b96f8:
-// 0x010b96f8: 0x10b96f8: jal   0x10b913c addu  a1, s4, zero
+L_10b9d40:
+// 0x010b9d40: 0x10b9d40: jal   0x10b9784 addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -3419,37 +3419,37 @@ L_10b96f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_close_socket_file_10b913c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_close_socket_file_10b9784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9700: 0x10b9700: lui   a1, 0x20000
+// 0x010b9d48: 0x10b9d48: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9704: 0x10b9704: lui   a3, 0x20000
+// 0x010b9d4c: 0x10b9d4c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b9708: 0x10b9708: addiu v0, zero, 4096
+// 0x010b9d50: 0x10b9d50: addiu v0, zero, 4096
 	ldc.i4 4096
 	stloc 5
-// 0x010b970c: 0x10b970c: addiu a1, a1, 20568
+// 0x010b9d54: 0x10b9d54: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b9710: 0x10b9710: addiu a3, a3, 21384
+// 0x010b9d58: 0x10b9d58: addiu a3, a3, 21844
 	ldloc 4
-	ldc.i4 21384
+	ldc.i4 21844
 	add
 	stloc 4
-// 0x010b9714: 0x10b9714: addiu a0, zero, 4
+// 0x010b9d5c: 0x10b9d5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b9718: 0x10b9718: addiu a2, zero, 456
+// 0x010b9d60: 0x10b9d60: addiu a2, zero, 456
 	ldc.i4 456
 	stloc.3
-// 0x010b971c: 0x10b971c: sw    v0, 16(sp)
+// 0x010b9d64: 0x10b9d64: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3458,8 +3458,8 @@ L_10b96f8:
 	add
 	ldloc 5
 	stelem.i4
-L_10b9720:
-// 0x010b9720: 0x10b9720: jal   0x100449c sll   zero, zero, 0
+L_10b9d68:
+// 0x010b9d68: 0x10b9d68: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3470,8 +3470,8 @@ L_10b9720:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b9728:
-// 0x010b9728: 0x10b9728: lw    v0, 8(s2)
+L_10b9d70:
+// 0x010b9d70: 0x10b9d70: lw    v0, 8(s2)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -3480,8 +3480,8 @@ L_10b9728:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b972c: 0x10b972c: sll   zero, zero, 0
-// 0x010b9730: 0x10b9730: jalr  v0 addu  a0, s3, zero
+// 0x010b9d74: 0x10b9d74: sll   zero, zero, 0
+// 0x010b9d78: 0x10b9d78: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 16
 	stloc.1
@@ -3495,9 +3495,9 @@ L_10b9728:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b9738:
-// 0x010b9738: 0x10b9738: lw    ra, 4164(sp)
-// 0x010b973c: 0x10b973c: lw    s8, 4160(sp)
+L_10b9d80:
+// 0x010b9d80: 0x10b9d80: lw    ra, 4164(sp)
+// 0x010b9d84: 0x10b9d84: lw    s8, 4160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3506,7 +3506,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b9740: 0x10b9740: lw    s7, 4156(sp)
+// 0x010b9d88: 0x10b9d88: lw    s7, 4156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3515,7 +3515,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b9744: 0x10b9744: lw    s6, 4152(sp)
+// 0x010b9d8c: 0x10b9d8c: lw    s6, 4152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3524,7 +3524,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b9748: 0x10b9748: lw    s5, 4148(sp)
+// 0x010b9d90: 0x10b9d90: lw    s5, 4148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3533,7 +3533,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b974c: 0x10b974c: lw    s4, 4144(sp)
+// 0x010b9d94: 0x10b9d94: lw    s4, 4144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3542,7 +3542,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b9750: 0x10b9750: lw    s3, 4140(sp)
+// 0x010b9d98: 0x10b9d98: lw    s3, 4140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3551,7 +3551,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b9754: 0x10b9754: lw    s2, 4136(sp)
+// 0x010b9d9c: 0x10b9d9c: lw    s2, 4136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3560,7 +3560,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b9758: 0x10b9758: lw    s1, 4132(sp)
+// 0x010b9da0: 0x10b9da0: lw    s1, 4132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3569,7 +3569,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b975c: 0x10b975c: lw    s0, 4128(sp)
+// 0x010b9da4: 0x10b9da4: lw    s0, 4128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3578,7 +3578,7 @@ L_10b9738:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b9760: 0x10b9760: jr    ra addiu sp, sp, 4168
+// 0x010b9da8: 0x10b9da8: jr    ra addiu sp, sp, 4168
 	ldloc.0
 	ldc.i4 4168
 	add
@@ -3590,7 +3590,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_upload_on_socket_connected_10b9768(int32,int32,int32,int32,int32)
+.method public static int32 editor_upload_on_socket_connected_10b9db0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra,int32 t0,int32 t1)
@@ -3637,12 +3637,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b9768: 0x10b9768: addiu sp, sp, -56
+// 0x010b9db0: 0x10b9db0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010b976c: 0x10b976c: sw    s1, 48(sp)
+// 0x010b9db4: 0x10b9db4: sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3651,19 +3651,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b9770: 0x10b9770: addu  s1, a0, zero
+// 0x010b9db8: 0x10b9db8: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010b9774: 0x10b9774: lui   a0, 0x0
+// 0x010b9dbc: 0x10b9dbc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9778: 0x10b9778: addiu a0, a0, 19420
+// 0x010b9dc0: 0x10b9dc0: addiu a0, a0, 19420
 	ldloc.1
 	ldc.i4 19420
 	add
 	stloc.1
-// 0x010b977c: 0x10b977c: sw    ra, 52(sp)
-// 0x010b9780: 0x10b9780: sw    s0, 44(sp)
+// 0x010b9dc4: 0x10b9dc4: sw    ra, 52(sp)
+// 0x010b9dc8: 0x10b9dc8: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3672,7 +3672,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b9784: 0x10b9784: jal   0x100e348 addu  s0, a1, zero
+// 0x010b9dcc: 0x10b9dcc: jal   0x100e358 addu  s0, a1, zero
 	ldloc.2
 	stloc 7
 	ldloc.0
@@ -3680,20 +3680,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b978c: 0x10b978c: lui   a0, 0x0
+// 0x010b9dd4: 0x10b9dd4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9790: 0x10b9790: addiu a0, a0, 19436
+// 0x010b9dd8: 0x10b9dd8: addiu a0, a0, 19436
 	ldloc.1
 	ldc.i4 19436
 	add
 	stloc.1
-// 0x010b9794: 0x10b9794: jal   0x100e348 sw    v0, 32(sp)
+// 0x010b9ddc: 0x10b9ddc: jal   0x100e358 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3707,19 +3707,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b979c: 0x10b979c: lw    v1, 0(s0)
+// 0x010b9de4: 0x10b9de4: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010b97a0: 0x10b97a0: lw    a3, 32(sp)
+// 0x010b9de8: 0x10b9de8: lw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3728,35 +3728,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010b97a4: 0x10b97a4: bne   s1, zero, 0x10b97ec addu  a2, v1, zero
+// 0x010b9dec: 0x10b9dec: bne   s1, zero, 0x10b9e34 addu  a2, v1, zero
 	ldloc 9
 	ldloc 8
 	stloc.3
-	brtrue L_10b97ec
+	brtrue L_10b9e34
 // --- basic block ---
-// 0x010b97ac: 0x10b97ac: lui   a1, 0x20000
+// 0x010b9df4: 0x10b9df4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b97b0: 0x10b97b0: lui   a3, 0x20000
+// 0x010b9df8: 0x10b9df8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010b97b4: 0x10b97b4: addiu a1, a1, 20568
+// 0x010b9dfc: 0x10b9dfc: addiu a1, a1, 21028
 	ldloc.2
-	ldc.i4 20568
+	ldc.i4 21028
 	add
 	stloc.2
-// 0x010b97b8: 0x10b97b8: addiu a3, a3, 21428
+// 0x010b9e00: 0x10b9e00: addiu a3, a3, 21888
 	ldloc 4
-	ldc.i4 21428
+	ldc.i4 21888
 	add
 	stloc 4
-// 0x010b97bc: 0x10b97bc: addiu a2, zero, 511
+// 0x010b9e04: 0x10b9e04: addiu a2, zero, 511
 	ldc.i4 511
 	stloc.3
-// 0x010b97c0: 0x10b97c0: addiu a0, zero, 4
+// 0x010b9e08: 0x10b9e08: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010b97c4: 0x10b97c4: jal   0x100449c sw    v1, 16(sp)
+// 0x010b9e0c: 0x10b9e0c: jal   0x100449c sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3775,7 +3775,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b97cc: 0x10b97cc: lw    v0, 4(s0)
+// 0x010b9e14: 0x10b9e14: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3784,7 +3784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b97d0: 0x10b97d0: lw    a0, 12(s0)
+// 0x010b9e18: 0x10b9e18: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3793,7 +3793,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b97d4: 0x10b97d4: lw    v0, 8(v0)
+// 0x010b9e1c: 0x10b9e1c: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3802,8 +3802,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b97d8: 0x10b97d8: sll   zero, zero, 0
-// 0x010b97dc: 0x10b97dc: jalr  v0 sll   zero, zero, 0
+// 0x010b9e20: 0x10b9e20: sll   zero, zero, 0
+// 0x010b9e24: 0x10b9e24: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -3815,11 +3815,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b97e4: 0x10b97e4: j	 0x10b980c sll   zero, zero, 0
-	br L_10b980c
+// 0x010b9e2c: 0x10b9e2c: j	 0x10b9e54 sll   zero, zero, 0
+	br L_10b9e54
 // --- basic block ---
-L_10b97ec:
-// 0x010b97ec: 0x10b97ec: lw    a1, 8(s0)
+L_10b9e34:
+// 0x010b9e34: 0x10b9e34: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3828,7 +3828,7 @@ L_10b97ec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b97f0: 0x10b97f0: lw    t1, 4(s0)
+// 0x010b9e38: 0x10b9e38: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3837,7 +3837,7 @@ L_10b97ec:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b97f4: 0x10b97f4: lw    t0, 12(s0)
+// 0x010b9e3c: 0x10b9e3c: lw    t0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3846,10 +3846,10 @@ L_10b97ec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b97f8: 0x10b97f8: addu  a0, s1, zero
+// 0x010b9e40: 0x10b9e40: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010b97fc: 0x10b97fc: sw    v0, 16(sp)
+// 0x010b9e44: 0x10b9e44: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3858,7 +3858,7 @@ L_10b97ec:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b9800: 0x10b9800: sw    t1, 20(sp)
+// 0x010b9e48: 0x10b9e48: sw    t1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3867,7 +3867,7 @@ L_10b97ec:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b9804: 0x10b9804: jal   0x10b9178 sw    t0, 24(sp)
+// 0x010b9e4c: 0x10b9e4c: jal   0x10b97c0 sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3881,13 +3881,13 @@ L_10b97ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_post_file_10b9178(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_post_file_10b97c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10b980c:
-// 0x010b980c: 0x10b980c: lw    a0, 8(s0)
+L_10b9e54:
+// 0x010b9e54: 0x10b9e54: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3896,7 +3896,7 @@ L_10b980c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b9810: 0x10b9810: jal   0x1000930 sll   zero, zero, 0
+// 0x010b9e58: 0x10b9e58: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3907,14 +3907,14 @@ L_10b980c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b9818: 0x10b9818: lw    a0, 0(s0)
+// 0x010b9e60: 0x10b9e60: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b981c: 0x10b981c: jal   0x1000930 sll   zero, zero, 0
+// 0x010b9e64: 0x10b9e64: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3925,7 +3925,7 @@ L_10b980c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b9824: 0x10b9824: jal   0x1000930 addu  a0, s0, zero
+// 0x010b9e6c: 0x10b9e6c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3938,8 +3938,8 @@ L_10b980c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010b982c: 0x10b982c: lw    ra, 52(sp)
-// 0x010b9830: 0x10b9830: lw    s1, 48(sp)
+// 0x010b9e74: 0x10b9e74: lw    ra, 52(sp)
+// 0x010b9e78: 0x10b9e78: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3948,7 +3948,7 @@ L_10b980c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b9834: 0x10b9834: lw    s0, 44(sp)
+// 0x010b9e7c: 0x10b9e7c: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3957,7 +3957,7 @@ L_10b980c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b9838: 0x10b9838: jr    ra addiu sp, sp, 56
+// 0x010b9e80: 0x10b9e80: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3969,7 +3969,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_upload_initialize_10b9840(int32,int32,int32,int32,int32)
+.method public static int32 editor_upload_initialize_10b9e88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 v1,int32 ra)
@@ -4010,12 +4010,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b9840: 0x10b9840: addiu sp, sp, -32
+// 0x010b9e88: 0x10b9e88: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b9844: 0x10b9844: sw    s0, 20(sp)
+// 0x010b9e8c: 0x10b9e8c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4024,35 +4024,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b9848: 0x10b9848: lui   a0, 0x10000
+// 0x010b9e90: 0x10b9e90: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b984c: 0x10b984c: lui   s0, 0x10000
+// 0x010b9e94: 0x10b9e94: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b9850: 0x10b9850: lui   a1, 0x0
+// 0x010b9e98: 0x10b9e98: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b9854: 0x10b9854: addiu a2, s0, 18500
+// 0x010b9e9c: 0x10b9e9c: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010b9858: 0x10b9858: addiu a0, a0, 12560
+// 0x010b9ea0: 0x10b9ea0: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010b985c: 0x10b985c: addiu a1, a1, 19404
+// 0x010b9ea4: 0x10b9ea4: addiu a1, a1, 19404
 	ldloc.2
 	ldc.i4 19404
 	add
 	stloc.2
-// 0x010b9860: 0x10b9860: addu  a3, zero, zero
+// 0x010b9ea8: 0x10b9ea8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b9864: 0x10b9864: sw    ra, 28(sp)
-// 0x010b9868: 0x10b9868: jal   0x100edb0 sw    s1, 24(sp)
+// 0x010b9eac: 0x10b9eac: sw    ra, 28(sp)
+// 0x010b9eb0: 0x10b9eb0: jal   0x100edc0 sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4066,33 +4066,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010b9870: 0x10b9870: lui   s1, 0x20000
+// 0x010b9eb8: 0x10b9eb8: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010b9874: 0x10b9874: lui   a1, 0x0
+// 0x010b9ebc: 0x10b9ebc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b9878: 0x10b9878: addiu a0, s1, -26888
+// 0x010b9ec0: 0x10b9ec0: addiu a0, s1, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010b987c: 0x10b987c: addiu a2, s0, 18500
+// 0x010b9ec4: 0x10b9ec4: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010b9880: 0x10b9880: addiu a1, a1, 19420
+// 0x010b9ec8: 0x10b9ec8: addiu a1, a1, 19420
 	ldloc.2
 	ldc.i4 19420
 	add
 	stloc.2
-// 0x010b9884: 0x10b9884: jal   0x100edb0 addu  a3, zero, zero
+// 0x010b9ecc: 0x10b9ecc: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4100,25 +4100,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010b988c: 0x10b988c: lui   a1, 0x0
+// 0x010b9ed4: 0x10b9ed4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010b9890: 0x10b9890: addiu a0, s1, -26888
+// 0x010b9ed8: 0x10b9ed8: addiu a0, s1, -26424
 	ldloc 7
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010b9894: 0x10b9894: addiu a2, s0, 18500
+// 0x010b9edc: 0x10b9edc: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010b9898: 0x10b9898: jal   0x100ed70 addiu a1, a1, 19436
+// 0x010b9ee0: 0x10b9ee0: jal   0x100ed80 addiu a1, a1, 19436
 	ldloc.2
 	ldc.i4 19436
 	add
@@ -4128,13 +4128,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_password_100ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_password_100ed80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010b98a0: 0x10b98a0: lw    ra, 28(sp)
-// 0x010b98a4: 0x10b98a4: lw    s1, 24(sp)
+// 0x010b9ee8: 0x10b9ee8: lw    ra, 28(sp)
+// 0x010b9eec: 0x10b9eec: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4143,7 +4143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b98a8: 0x10b98a8: lw    s0, 20(sp)
+// 0x010b9ef0: 0x10b9ef0: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4152,7 +4152,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b98ac: 0x10b98ac: jr    ra addiu sp, sp, 32
+// 0x010b9ef4: 0x10b9ef4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4164,7 +4164,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 editor_cleanup_test_10b98b4(int32,int32,int32,int32,int32)
+.method public static int32 editor_cleanup_test_10b9efc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32 s0,int32 v1,int32[] mem,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4214,12 +4214,12 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b98b4: 0x10b98b4: addiu sp, sp, -64
+// 0x010b9efc: 0x10b9efc: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010b98b8: 0x10b98b8: sw    s0, 40(sp)
+// 0x010b9f00: 0x10b9f00: sw    s0, 40(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4228,8 +4228,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b98bc: 0x10b98bc: sw    ra, 60(sp)
-// 0x010b98c0: 0x10b98c0: sw    s4, 56(sp)
+// 0x010b9f04: 0x10b9f04: sw    ra, 60(sp)
+// 0x010b9f08: 0x10b9f08: sw    s4, 56(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4238,7 +4238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b98c4: 0x10b98c4: sw    s3, 52(sp)
+// 0x010b9f0c: 0x10b9f0c: sw    s3, 52(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4247,7 +4247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b98c8: 0x10b98c8: sw    s2, 48(sp)
+// 0x010b9f10: 0x10b9f10: sw    s2, 48(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4256,7 +4256,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b98cc: 0x10b98cc: sw    s1, 44(sp)
+// 0x010b9f14: 0x10b9f14: sw    s1, 44(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4265,13 +4265,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b98d0: 0x10b98d0: bne   a1, zero, 0x10b99f4 addu  s0, a0, zero
+// 0x010b9f18: 0x10b9f18: bne   a1, zero, 0x10ba03c addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 7
-	brtrue L_10b99f4
+	brtrue L_10ba03c
 // --- basic block ---
-// 0x010b98d8: 0x10b98d8: jal   0x10b5d08 addu  s2, zero, zero
+// 0x010b9f20: 0x10b9f20: jal   0x10b6350 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -4279,36 +4279,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_count_10b5d08(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_count_10b6350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b98e0: 0x10b98e0: addu  s1, zero, zero
+// 0x010b9f28: 0x10b9f28: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010b98e4: 0x10b98e4: j	 0x10b993c addu  s4, v0, zero
+// 0x010b9f2c: 0x10b9f2c: j	 0x10b9f84 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-	br L_10b993c
+	br L_10b9f84
 // --- basic block ---
-L_10b98ec:
-// 0x010b98ec: 0x10b98ec: jal   0x10b57e0 sll   zero, zero, 0
+L_10b9f34:
+// 0x010b9f34: 0x10b9f34: jal   0x10b5e28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_is_valid_10b57e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_is_valid_10b5e28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b98f4: 0x10b98f4: beq   v0, zero, 0x10b9938 sll   zero, zero, 0
+// 0x010b9f3c: 0x10b9f3c: beq   v0, zero, 0x10b9f80 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b9938
+	brfalse L_10b9f80
 // --- basic block ---
-// 0x010b98fc: 0x10b98fc: jal   0x10b582c addu  a0, s1, zero
+// 0x010b9f44: 0x10b9f44: jal   0x10b5e74 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4316,52 +4316,52 @@ L_10b98ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_timestamp_10b582c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_timestamp_10b5e74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9904: 0x10b9904: addu  s3, v0, zero
+// 0x010b9f4c: 0x10b9f4c: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010b9908: 0x10b9908: slt   v0, v0, s0
+// 0x010b9f50: 0x10b9f50: slt   v0, v0, s0
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010b990c: 0x10b990c: bne   v0, zero, 0x10b9930 addu  a0, s1, zero
+// 0x010b9f54: 0x10b9f54: bne   v0, zero, 0x10b9f78 addu  a0, s1, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brtrue L_10b9930
+	brtrue L_10b9f78
 // --- basic block ---
-// 0x010b9914: 0x10b9914: jal   0x10b5f68 sll   zero, zero, 0
+// 0x010b9f5c: 0x10b9f5c: jal   0x10b65b0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_update_time_10b5f68(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_update_time_10b65b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b991c: 0x10b991c: slt   v0, v0, s3
+// 0x010b9f64: 0x10b9f64: slt   v0, v0, s3
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 5
-// 0x010b9920: 0x10b9920: beq   v0, zero, 0x10b9938 sll   zero, zero, 0
+// 0x010b9f68: 0x10b9f68: beq   v0, zero, 0x10b9f80 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10b9938
+	brfalse L_10b9f80
 // --- basic block ---
-// 0x010b9928: 0x10b9928: j	 0x10b9938 addiu s2, zero, 1
+// 0x010b9f70: 0x10b9f70: j	 0x10b9f80 addiu s2, zero, 1
 	ldc.i4.1
 	stloc 10
-	br L_10b9938
+	br L_10b9f80
 // --- basic block ---
-L_10b9930:
-// 0x010b9930: 0x10b9930: jal   0x10b5c54 addu  a0, s1, zero
+L_10b9f78:
+// 0x010b9f78: 0x10b9f78: jal   0x10b629c addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4369,34 +4369,34 @@ L_10b9930:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_invalidate_10b5c54(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_invalidate_10b629c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10b9938:
-// 0x010b9938: 0x10b9938: addiu s1, s1, 1
+L_10b9f80:
+// 0x010b9f80: 0x10b9f80: addiu s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_10b993c:
-// 0x010b993c: 0x10b993c: slt   v0, s1, s4
+L_10b9f84:
+// 0x010b9f84: 0x10b9f84: slt   v0, s1, s4
 	ldloc 6
 	ldloc 12
 	clt
 	stloc 5
-// 0x010b9940: 0x10b9940: bne   v0, zero, 0x10b98ec addu  a0, s1, zero
+// 0x010b9f88: 0x10b9f88: bne   v0, zero, 0x10b9f34 addu  a0, s1, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brtrue L_10b98ec
+	brtrue L_10b9f34
 // --- basic block ---
-// 0x010b9948: 0x10b9948: bne   s2, zero, 0x10b9a30 sll   zero, zero, 0
+// 0x010b9f90: 0x10b9f90: bne   s2, zero, 0x10ba078 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_10b9a30
+	brtrue L_10ba078
 // --- basic block ---
-// 0x010b9950: 0x10b9950: jal   0x10b41f4 addu  s1, zero, zero
+// 0x010b9f98: 0x10b9f98: jal   0x10b483c addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
 	ldloc.0
@@ -4404,53 +4404,53 @@ L_10b993c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_count_10b41f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_count_10b483c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9958: 0x10b9958: j	 0x10b999c addu  s0, v0, zero
+// 0x010b9fa0: 0x10b9fa0: j	 0x10b9fe4 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-	br L_10b999c
+	br L_10b9fe4
 // --- basic block ---
-L_10b9960:
-// 0x010b9960: 0x10b9960: jal   0x10b4190 sll   zero, zero, 0
+L_10b9fa8:
+// 0x010b9fa8: 0x10b9fa8: jal   0x10b47d8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_is_obsolete_10b4190(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_is_obsolete_10b47d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9968: 0x10b9968: bne   v0, zero, 0x10b999c addiu s1, s1, 1
+// 0x010b9fb0: 0x10b9fb0: bne   v0, zero, 0x10b9fe4 addiu s1, s1, 1
 	ldloc 5
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_10b999c
+	brtrue L_10b9fe4
 // --- basic block ---
-// 0x010b9970: 0x10b9970: addiu s1, s1, -1
+// 0x010b9fb8: 0x10b9fb8: addiu s1, s1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010b9974: 0x10b9974: addiu s0, sp, 28
+// 0x010b9fbc: 0x10b9fbc: addiu s0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 7
-// 0x010b9978: 0x10b9978: addu  a0, s1, zero
+// 0x010b9fc0: 0x10b9fc0: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x010b997c: 0x10b997c: addu  a1, s0, zero
+// 0x010b9fc4: 0x10b9fc4: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010b9980: 0x10b9980: jal   0x10b3f00 addu  a2, zero, zero
+// 0x010b9fc8: 0x10b9fc8: jal   0x10b4548 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4458,15 +4458,15 @@ L_10b9960:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_position_10b3f00(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_position_10b4548(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9988: 0x10b9988: addu  a0, zero, zero
+// 0x010b9fd0: 0x10b9fd0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010b998c: 0x10b998c: jal   0x100c63c addu  a1, s0, zero
+// 0x010b9fd4: 0x10b9fd4: jal   0x100c64c addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -4474,33 +4474,33 @@ L_10b9960:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9994: 0x10b9994: j	 0x10b99c4 addu  a0, v0, zero
+// 0x010b9fdc: 0x10b9fdc: j	 0x10ba00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	br L_10b99c4
+	br L_10ba00c
 // --- basic block ---
-L_10b999c:
-// 0x010b999c: 0x10b999c: slt   v0, s1, s0
+L_10b9fe4:
+// 0x010b9fe4: 0x10b9fe4: slt   v0, s1, s0
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 5
-// 0x010b99a0: 0x10b99a0: bne   v0, zero, 0x10b9960 addu  a0, s1, zero
+// 0x010b9fe8: 0x10b9fe8: bne   v0, zero, 0x10b9fa8 addu  a0, s1, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brtrue L_10b9960
+	brtrue L_10b9fa8
 // --- basic block ---
-// 0x010b99a8: 0x10b99a8: j	 0x10b9a1c sll   zero, zero, 0
-	br L_10b9a1c
+// 0x010b9ff0: 0x10b9ff0: j	 0x10ba064 sll   zero, zero, 0
+	br L_10ba064
 // --- basic block ---
-L_10b99b0:
-// 0x010b99b0: 0x10b99b0: jal   0x10b6540 sw    zero, 16(sp)
+L_10b9ff8:
+// 0x010b9ff8: 0x10b9ff8: jal   0x10b6b88 sw    zero, 16(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4514,20 +4514,20 @@ L_10b99b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_get_10b6540(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_get_10b6b88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b99b8: 0x10b99b8: beq   v0, zero, 0x10b99dc addiu s0, s0, 1
+// 0x010ba000: 0x10ba000: beq   v0, zero, 0x10ba024 addiu s0, s0, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brfalse L_10b99dc
+	brfalse L_10ba024
 // --- basic block ---
-// 0x010b99c0: 0x10b99c0: lw    a0, 24(sp)
+// 0x010ba008: 0x10ba008: lw    a0, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4536,14 +4536,14 @@ L_10b99b0:
 	add
 	ldelem.i4
 	stloc.1
-L_10b99c4:
-// 0x010b99c4: 0x10b99c4: addu  a1, zero, zero
+L_10ba00c:
+// 0x010ba00c: 0x10ba00c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b99c8: 0x10b99c8: addiu a2, zero, 1
+// 0x010ba010: 0x10ba010: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b99cc: 0x10b99cc: jal   0x100d384 addu  a3, zero, zero
+// 0x010ba014: 0x10ba014: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4551,40 +4551,40 @@ L_10b99c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b99d4: 0x10b99d4: j	 0x10b9a30 sll   zero, zero, 0
-	br L_10b9a30
+// 0x010ba01c: 0x10ba01c: j	 0x10ba078 sll   zero, zero, 0
+	br L_10ba078
 // --- basic block ---
-L_10b99dc:
-// 0x010b99dc: 0x10b99dc: slt   v0, s0, s1
+L_10ba024:
+// 0x010ba024: 0x10ba024: slt   v0, s0, s1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 5
-// 0x010b99e0: 0x10b99e0: addu  a0, s0, zero
+// 0x010ba028: 0x10ba028: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010b99e4: 0x10b99e4: addu  a1, zero, zero
+// 0x010ba02c: 0x10ba02c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010b99e8: 0x10b99e8: addu  a2, s2, zero
+// 0x010ba030: 0x10ba030: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010b99ec: 0x10b99ec: bne   v0, zero, 0x10b99b0 addu  a3, zero, zero
+// 0x010ba034: 0x10ba034: bne   v0, zero, 0x10b9ff8 addu  a3, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_10b99b0
+	brtrue L_10b9ff8
 // --- basic block ---
-L_10b99f4:
-// 0x010b99f4: 0x10b99f4: lui   v0, 0x0
+L_10ba03c:
+// 0x010ba03c: 0x10ba03c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b99f8: 0x10b99f8: lw    s0, 1816(v0)
+// 0x010ba040: 0x10ba040: lw    s0, 1816(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
@@ -4593,7 +4593,7 @@ L_10b99f4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b99fc: 0x10b99fc: jal   0x10b74d4 addu  a0, s0, zero
+// 0x010ba044: 0x10ba044: jal   0x10b7b1c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4601,12 +4601,12 @@ L_10b99f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_close_10b74d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_close_10b7b1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9a04: 0x10b9a04: jal   0x10b7318 addu  a0, s0, zero
+// 0x010ba04c: 0x10ba04c: jal   0x10b7960 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4614,12 +4614,12 @@ L_10b99f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_delete_10b7318(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_delete_10b7960(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9a0c: 0x10b9a0c: jal   0x10b79b4 addu  a0, s0, zero
+// 0x010ba054: 0x10ba054: jal   0x10b7ffc addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4627,16 +4627,16 @@ L_10b99f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9a14: 0x10b9a14: j	 0x10b9a30 sll   zero, zero, 0
-	br L_10b9a30
+// 0x010ba05c: 0x10ba05c: j	 0x10ba078 sll   zero, zero, 0
+	br L_10ba078
 // --- basic block ---
-L_10b9a1c:
-// 0x010b9a1c: 0x10b9a1c: jal   0x10b6518 addu  s0, zero, zero
+L_10ba064:
+// 0x010ba064: 0x10ba064: jal   0x10b6b60 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
 	ldloc.0
@@ -4644,24 +4644,24 @@ L_10b9a1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_override_get_count_10b6518(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_override_get_count_10b6b60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9a24: 0x10b9a24: addiu s2, sp, 24
+// 0x010ba06c: 0x10ba06c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x010b9a28: 0x10b9a28: j	 0x10b99dc addu  s1, v0, zero
+// 0x010ba070: 0x10ba070: j	 0x10ba024 addu  s1, v0, zero
 	ldloc 5
 	stloc 6
-	br L_10b99dc
+	br L_10ba024
 // --- basic block ---
-L_10b9a30:
-// 0x010b9a30: 0x10b9a30: lw    ra, 60(sp)
-// 0x010b9a34: 0x10b9a34: lw    s4, 56(sp)
+L_10ba078:
+// 0x010ba078: 0x10ba078: lw    ra, 60(sp)
+// 0x010ba07c: 0x10ba07c: lw    s4, 56(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4670,7 +4670,7 @@ L_10b9a30:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b9a38: 0x10b9a38: lw    s3, 52(sp)
+// 0x010ba080: 0x10ba080: lw    s3, 52(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4679,7 +4679,7 @@ L_10b9a30:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b9a3c: 0x10b9a3c: lw    s2, 48(sp)
+// 0x010ba084: 0x10ba084: lw    s2, 48(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4688,7 +4688,7 @@ L_10b9a30:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b9a40: 0x10b9a40: lw    s1, 44(sp)
+// 0x010ba088: 0x10ba088: lw    s1, 44(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4697,7 +4697,7 @@ L_10b9a30:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010b9a44: 0x10b9a44: lw    s0, 40(sp)
+// 0x010ba08c: 0x10ba08c: lw    s0, 40(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -4706,7 +4706,7 @@ L_10b9a30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b9a48: 0x10b9a48: jr    ra addiu sp, sp, 64
+// 0x010ba090: 0x10ba090: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4718,7 +4718,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 add_alert_verify_10b9a50()
+.method public static int32 add_alert_verify_10ba098()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4732,8 +4732,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b9a50:
-// 0x010b9a50: 0x10b9a50: jr    ra addu  v0, zero, zero
+L_10ba098:
+// 0x010ba098: 0x10ba098: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -4741,7 +4741,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 remove_alert_verify_10b9a58()
+.method public static int32 remove_alert_verify_10ba0a0()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4755,8 +4755,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b9a58:
-// 0x010b9a58: 0x10b9a58: jr    ra addu  v0, zero, zero
+L_10ba0a0:
+// 0x010ba0a0: 0x10ba0a0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -4764,7 +4764,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 add_red_light_cam_alert_10b9a60(int32,int32,int32,int32,int32)
+.method public static int32 add_red_light_cam_alert_10ba0a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4799,43 +4799,43 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b9a60:
-// 0x010b9a60: 0x10b9a60: addiu sp, sp, -32
+L_10ba0a8:
+// 0x010ba0a8: 0x10ba0a8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b9a64: 0x10b9a64: sw    ra, 28(sp)
-// 0x010b9a68: 0x10b9a68: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+// 0x010ba0ac: 0x10ba0ac: sw    ra, 28(sp)
+// 0x010ba0b0: 0x10ba0b0: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
 // --- basic block ---
-// 0x010b9a70: 0x10b9a70: bne   v0, zero, 0x10b9a88 lui   a1, 0x20000
+// 0x010ba0b8: 0x10ba0b8: bne   v0, zero, 0x10ba0d0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b9a88
+	brtrue L_10ba0d0
 // --- basic block ---
-// 0x010b9a78: 0x10b9a78: lui   a0, 0x0
+// 0x010ba0c0: 0x10ba0c0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9a7c: 0x10b9a7c: addiu a0, a0, 30152
+// 0x010ba0c4: 0x10ba0c4: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b9a80: 0x10b9a80: j	 0x10b9aac addiu a1, a1, -25608
+// 0x010ba0c8: 0x10ba0c8: j	 0x10ba0f4 addiu a1, a1, -25144
 	ldloc.2
-	ldc.i4 -25608
+	ldc.i4 -25144
 	add
 	stloc.2
-	br L_10b9aac
+	br L_10ba0f4
 // --- basic block ---
-L_10b9a88:
-// 0x010b9a88: 0x10b9a88: lui   a0, 0x10000
+L_10ba0d0:
+// 0x010ba0d0: 0x10ba0d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b9a8c: 0x10b9a8c: jal   0x101df24 addiu a0, a0, -23972
+// 0x010ba0d4: 0x10ba0d4: jal   0x101df34 addiu a0, a0, -23972
 	ldloc.1
 	ldc.i4 -23972
 	add
@@ -4845,74 +4845,74 @@ L_10b9a88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9a94: 0x10b9a94: bne   v0, zero, 0x10b9abc lui   a0, 0x10000
+// 0x010ba0dc: 0x10ba0dc: bne   v0, zero, 0x10ba104 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_10b9abc
+	brtrue L_10ba104
 // --- basic block ---
-// 0x010b9a9c: 0x10b9a9c: lui   a0, 0x0
+// 0x010ba0e4: 0x10ba0e4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9aa0: 0x10b9aa0: lui   a1, 0x10000
+// 0x010ba0e8: 0x10ba0e8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010b9aa4: 0x10b9aa4: addiu a0, a0, 30152
+// 0x010ba0ec: 0x10ba0ec: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b9aa8: 0x10b9aa8: addiu a1, a1, -14372
+// 0x010ba0f0: 0x10ba0f0: addiu a1, a1, -14376
 	ldloc.2
-	ldc.i4 -14372
+	ldc.i4 -14376
 	add
 	stloc.2
-L_10b9aac:
-// 0x010b9aac: 0x10b9aac: jal   0x104c148 sll   zero, zero, 0
+L_10ba0f4:
+// 0x010ba0f4: 0x10ba0f4: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9ab4: 0x10b9ab4: j	 0x10b9adc sll   zero, zero, 0
-	br L_10b9adc
+// 0x010ba0fc: 0x10ba0fc: j	 0x10ba124 sll   zero, zero, 0
+	br L_10ba124
 // --- basic block ---
-L_10b9abc:
-// 0x010b9abc: 0x10b9abc: lui   a1, 0x20000
+L_10ba104:
+// 0x010ba104: 0x10ba104: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9ac0: 0x10b9ac0: lui   a3, 0x10c0000
+// 0x010ba108: 0x10ba108: lui   a3, 0x10c0000
 	ldc.i4 17563648
 	stloc 4
-// 0x010b9ac4: 0x10b9ac4: addiu a0, a0, -19736
+// 0x010ba10c: 0x10ba10c: addiu a0, a0, -19736
 	ldloc.1
 	ldc.i4 -19736
 	add
 	stloc.1
-// 0x010b9ac8: 0x10b9ac8: addiu a1, a1, 21480
+// 0x010ba110: 0x10ba110: addiu a1, a1, 21940
 	ldloc.2
-	ldc.i4 21480
+	ldc.i4 21940
 	add
 	stloc.2
-// 0x010b9acc: 0x10b9acc: addiu a3, a3, -23292
+// 0x010ba114: 0x10ba114: addiu a3, a3, -21684
 	ldloc 4
-	ldc.i4 -23292
+	ldc.i4 -21684
 	add
 	stloc 4
-// 0x010b9ad0: 0x10b9ad0: addiu a2, zero, 1
+// 0x010ba118: 0x10ba118: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b9ad4: 0x10b9ad4: jal   0x104c320 sw    zero, 16(sp)
+// 0x010ba11c: 0x10ba11c: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4926,15 +4926,15 @@ L_10b9abc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b9adc:
-// 0x010b9adc: 0x10b9adc: lw    ra, 28(sp)
-// 0x010b9ae0: 0x10b9ae0: sll   zero, zero, 0
-// 0x010b9ae4: 0x10b9ae4: jr    ra addiu sp, sp, 32
+L_10ba124:
+// 0x010ba124: 0x10ba124: lw    ra, 28(sp)
+// 0x010ba128: 0x10ba128: sll   zero, zero, 0
+// 0x010ba12c: 0x10ba12c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4946,7 +4946,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 add_speed_cam_alert_10b9aec(int32,int32,int32,int32,int32)
+.method public static int32 add_speed_cam_alert_10ba134(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4981,43 +4981,43 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10b9aec:
-// 0x010b9aec: 0x10b9aec: addiu sp, sp, -32
+L_10ba134:
+// 0x010ba134: 0x10ba134: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010b9af0: 0x10b9af0: sw    ra, 28(sp)
-// 0x010b9af4: 0x10b9af4: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+// 0x010ba138: 0x10ba138: sw    ra, 28(sp)
+// 0x010ba13c: 0x10ba13c: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
 // --- basic block ---
-// 0x010b9afc: 0x10b9afc: bne   v0, zero, 0x10b9b14 lui   a1, 0x20000
+// 0x010ba144: 0x10ba144: bne   v0, zero, 0x10ba15c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10b9b14
+	brtrue L_10ba15c
 // --- basic block ---
-// 0x010b9b04: 0x10b9b04: lui   a0, 0x0
+// 0x010ba14c: 0x10ba14c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9b08: 0x10b9b08: addiu a0, a0, 30152
+// 0x010ba150: 0x10ba150: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b9b0c: 0x10b9b0c: j	 0x10b9b38 addiu a1, a1, -25608
+// 0x010ba154: 0x10ba154: j	 0x10ba180 addiu a1, a1, -25144
 	ldloc.2
-	ldc.i4 -25608
+	ldc.i4 -25144
 	add
 	stloc.2
-	br L_10b9b38
+	br L_10ba180
 // --- basic block ---
-L_10b9b14:
-// 0x010b9b14: 0x10b9b14: lui   a0, 0x10000
+L_10ba15c:
+// 0x010ba15c: 0x10ba15c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b9b18: 0x10b9b18: jal   0x101df24 addiu a0, a0, -23972
+// 0x010ba160: 0x10ba160: jal   0x101df34 addiu a0, a0, -23972
 	ldloc.1
 	ldc.i4 -23972
 	add
@@ -5027,74 +5027,74 @@ L_10b9b14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9b20: 0x10b9b20: bne   v0, zero, 0x10b9b48 lui   a0, 0x10000
+// 0x010ba168: 0x10ba168: bne   v0, zero, 0x10ba190 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_10b9b48
+	brtrue L_10ba190
 // --- basic block ---
-// 0x010b9b28: 0x10b9b28: lui   a0, 0x0
+// 0x010ba170: 0x10ba170: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9b2c: 0x10b9b2c: lui   a1, 0x10000
+// 0x010ba174: 0x10ba174: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010b9b30: 0x10b9b30: addiu a0, a0, 30152
+// 0x010ba178: 0x10ba178: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b9b34: 0x10b9b34: addiu a1, a1, -14372
+// 0x010ba17c: 0x10ba17c: addiu a1, a1, -14376
 	ldloc.2
-	ldc.i4 -14372
+	ldc.i4 -14376
 	add
 	stloc.2
-L_10b9b38:
-// 0x010b9b38: 0x10b9b38: jal   0x104c148 sll   zero, zero, 0
+L_10ba180:
+// 0x010ba180: 0x10ba180: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010b9b40: 0x10b9b40: j	 0x10b9b68 sll   zero, zero, 0
-	br L_10b9b68
+// 0x010ba188: 0x10ba188: j	 0x10ba1b0 sll   zero, zero, 0
+	br L_10ba1b0
 // --- basic block ---
-L_10b9b48:
-// 0x010b9b48: 0x10b9b48: lui   a1, 0x20000
+L_10ba190:
+// 0x010ba190: 0x10ba190: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9b4c: 0x10b9b4c: lui   a3, 0x10c0000
+// 0x010ba194: 0x10ba194: lui   a3, 0x10c0000
 	ldc.i4 17563648
 	stloc 4
-// 0x010b9b50: 0x10b9b50: addiu a0, a0, -19780
+// 0x010ba198: 0x10ba198: addiu a0, a0, -19780
 	ldloc.1
 	ldc.i4 -19780
 	add
 	stloc.1
-// 0x010b9b54: 0x10b9b54: addiu a1, a1, 21516
+// 0x010ba19c: 0x10ba19c: addiu a1, a1, 21976
 	ldloc.2
-	ldc.i4 21516
+	ldc.i4 21976
 	add
 	stloc.2
-// 0x010b9b58: 0x10b9b58: addiu a3, a3, -24152
+// 0x010ba1a0: 0x10ba1a0: addiu a3, a3, -22544
 	ldloc 4
-	ldc.i4 -24152
+	ldc.i4 -22544
 	add
 	stloc 4
-// 0x010b9b5c: 0x10b9b5c: addiu a2, zero, 1
+// 0x010ba1a4: 0x10ba1a4: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b9b60: 0x10b9b60: jal   0x104c320 sw    zero, 16(sp)
+// 0x010ba1a8: 0x10ba1a8: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5108,15 +5108,15 @@ L_10b9b48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10b9b68:
-// 0x010b9b68: 0x10b9b68: lw    ra, 28(sp)
-// 0x010b9b6c: 0x10b9b6c: sll   zero, zero, 0
-// 0x010b9b70: 0x10b9b70: jr    ra addiu sp, sp, 32
+L_10ba1b0:
+// 0x010ba1b0: 0x10ba1b0: lw    ra, 28(sp)
+// 0x010ba1b4: 0x10ba1b4: sll   zero, zero, 0
+// 0x010ba1b8: 0x10ba1b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5128,7 +5128,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 alert_get_city_street_10b9b78(int32,int32,int32,int32,int32)
+.method public static int32 alert_get_city_street_10ba1c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -5172,10 +5172,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b9b78: 0x10b9b78: lui   v0, 0x0
+// 0x010ba1c0: 0x10ba1c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010b9b7c: 0x10b9b7c: lw    v0, 18812(v0)
+// 0x010ba1c4: 0x10ba1c4: lw    v0, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5184,19 +5184,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b9b80: 0x10b9b80: lw    v1, 0(a0)
+// 0x010ba1c8: 0x10ba1c8: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010b9b84: 0x10b9b84: addiu sp, sp, -56
+// 0x010ba1cc: 0x10ba1cc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010b9b88: 0x10b9b88: sw    s2, 48(sp)
+// 0x010ba1d0: 0x10ba1d0: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5205,7 +5205,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b9b8c: 0x10b9b8c: sw    s1, 44(sp)
+// 0x010ba1d4: 0x10ba1d4: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5214,7 +5214,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b9b90: 0x10b9b90: sw    s0, 40(sp)
+// 0x010ba1d8: 0x10ba1d8: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5223,21 +5223,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010b9b94: 0x10b9b94: sw    ra, 52(sp)
-// 0x010b9b98: 0x10b9b98: addu  s0, a0, zero
+// 0x010ba1dc: 0x10ba1dc: sw    ra, 52(sp)
+// 0x010ba1e0: 0x10ba1e0: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010b9b9c: 0x10b9b9c: addu  s1, a1, zero
+// 0x010ba1e4: 0x10ba1e4: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010b9ba0: 0x10b9ba0: beq   v1, v0, 0x10b9bf8 addu  s2, a2, zero
+// 0x010ba1e8: 0x10ba1e8: beq   v1, v0, 0x10ba240 addu  s2, a2, zero
 	ldloc 8
 	ldloc 5
 	ldloc.3
 	stloc 10
-	beq  L_10b9bf8
+	beq  L_10ba240
 // --- basic block ---
-// 0x010b9ba8: 0x10b9ba8: lw    a0, 16(a0)
+// 0x010ba1f0: 0x10ba1f0: lw    a0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5246,47 +5246,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b9bac: 0x10b9bac: jal   0x1013c44 sll   zero, zero, 0
+// 0x010ba1f4: 0x10ba1f4: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9bb4: 0x10b9bb4: bgez  v0, 0x10b9bcc lui   v0, 0x10000
+// 0x010ba1fc: 0x10ba1fc: bgez  v0, 0x10ba214 lui   v0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
 	ldc.i4.s 0
-	bge L_10b9bcc
+	bge L_10ba214
 // --- basic block ---
-// 0x010b9bbc: 0x10b9bbc: addiu v0, v0, 18500
+// 0x010ba204: 0x10ba204: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010b9bc0: 0x10b9bc0: sw    v0, 0(s1)
+// 0x010ba208: 0x10ba208: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b9bc4: 0x10b9bc4: j	 0x10b9bf8 sw    v0, 0(s2)
+// 0x010ba20c: 0x10ba20c: j	 0x10ba240 sw    v0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10b9bf8
+	br L_10ba240
 // --- basic block ---
-L_10b9bcc:
-// 0x010b9bcc: 0x10b9bcc: lw    a0, 4(s0)
+L_10ba214:
+// 0x010ba214: 0x10ba214: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5295,12 +5295,12 @@ L_10b9bcc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b9bd0: 0x10b9bd0: addiu s0, sp, 16
+// 0x010ba218: 0x10ba218: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x010b9bd4: 0x10b9bd4: jal   0x1011a4c addu  a1, s0, zero
+// 0x010ba21c: 0x10ba21c: jal   0x1011a5c addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -5308,12 +5308,12 @@ L_10b9bcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9bdc: 0x10b9bdc: jal   0x1011818 addu  a0, s0, zero
+// 0x010ba224: 0x10ba224: jal   0x1011828 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5321,22 +5321,22 @@ L_10b9bcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9be4: 0x10b9be4: sw    v0, 0(s2)
+// 0x010ba22c: 0x10ba22c: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010b9be8: 0x10b9be8: addu  a0, s0, zero
+// 0x010ba230: 0x10ba230: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010b9bec: 0x10b9bec: jal   0x1011298 addiu a1, zero, 1
+// 0x010ba234: 0x10ba234: jal   0x10112a8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5344,21 +5344,21 @@ L_10b9bcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010b9bf4: 0x10b9bf4: sw    v0, 0(s1)
+// 0x010ba23c: 0x10ba23c: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10b9bf8:
-// 0x010b9bf8: 0x10b9bf8: lw    ra, 52(sp)
-// 0x010b9bfc: 0x10b9bfc: lw    s2, 48(sp)
+L_10ba240:
+// 0x010ba240: 0x10ba240: lw    ra, 52(sp)
+// 0x010ba244: 0x10ba244: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5367,7 +5367,7 @@ L_10b9bf8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b9c00: 0x10b9c00: lw    s1, 44(sp)
+// 0x010ba248: 0x10ba248: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5376,7 +5376,7 @@ L_10b9bf8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b9c04: 0x10b9c04: lw    s0, 40(sp)
+// 0x010ba24c: 0x10ba24c: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5385,7 +5385,7 @@ L_10b9bf8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010b9c08: 0x10b9c08: jr    ra addiu sp, sp, 56
+// 0x010ba250: 0x10ba250: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5397,7 +5397,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 add_alert_initialize_10b9c10(int32,int32,int32,int32,int32)
+.method public static int32 add_alert_initialize_10ba258(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -5432,16 +5432,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b9c10: 0x10b9c10: lui   a0, 0x0
+// 0x010ba258: 0x10ba258: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9c14: 0x10b9c14: addiu sp, sp, -24
+// 0x010ba25c: 0x10ba25c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010b9c18: 0x10b9c18: sw    ra, 20(sp)
-// 0x010b9c1c: 0x10b9c1c: jal   0x10b3c34 addiu a0, a0, 19456
+// 0x010ba260: 0x10ba260: sw    ra, 20(sp)
+// 0x010ba264: 0x10ba264: jal   0x10b427c addiu a0, a0, 19456
 	ldloc.1
 	ldc.i4 19456
 	add
@@ -5449,53 +5449,53 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl134::editor_marker_reg_type_10b3c34(int32,int32,int32)
+	call int32 Cibyl134::editor_marker_reg_type_10b427c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010b9c24: 0x10b9c24: lui   a0, 0x0
+// 0x010ba26c: 0x10ba26c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010b9c28: 0x10b9c28: lui   v1, 0xe0000
+// 0x010ba270: 0x10ba270: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b9c2c: 0x10b9c2c: addiu a0, a0, 19468
+// 0x010ba274: 0x10ba274: addiu a0, a0, 19468
 	ldloc.1
 	ldc.i4 19468
 	add
 	stloc.1
-// 0x010b9c30: 0x10b9c30: jal   0x10b3c34 sw    v0, -17276(v1)
+// 0x010ba278: 0x10ba278: jal   0x10b427c sw    v0, -16812(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4319
+	ldc.i4 -4203
 	add
 	ldloc 6
 	stelem.i4
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl134::editor_marker_reg_type_10b3c34(int32,int32,int32)
+	call int32 Cibyl134::editor_marker_reg_type_10b427c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010b9c38: 0x10b9c38: lw    ra, 20(sp)
-// 0x010b9c3c: 0x10b9c3c: lui   v1, 0xe0000
+// 0x010ba280: 0x10ba280: lw    ra, 20(sp)
+// 0x010ba284: 0x10ba284: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b9c40: 0x10b9c40: sw    v0, -17280(v1)
+// 0x010ba288: 0x10ba288: sw    v0, -16816(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4320
+	ldc.i4 -4204
 	add
 	ldloc 6
 	stelem.i4
-// 0x010b9c44: 0x10b9c44: jr    ra addiu sp, sp, 24
+// 0x010ba28c: 0x10ba28c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5507,7 +5507,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 add_alert_10b9c4c(int32,int32,int32,int32,int32)
+.method public static int32 add_alert_10ba294(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s1,int32 s8,int32 s0,int32 s6,int32 s7,int32 ra)
@@ -5569,12 +5569,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b9c4c: 0x10b9c4c: addiu sp, sp, -576
+// 0x010ba294: 0x10ba294: addiu sp, sp, -576
 	ldloc.0
 	ldc.i4 -576
 	add
 	stloc.0
-// 0x010b9c50: 0x10b9c50: sw    s7, 564(sp)
+// 0x010ba298: 0x10ba298: sw    s7, 564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5583,7 +5583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010b9c54: 0x10b9c54: sw    s3, 548(sp)
+// 0x010ba29c: 0x10ba29c: sw    s3, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5592,21 +5592,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b9c58: 0x10b9c58: addu  s7, a1, zero
+// 0x010ba2a0: 0x10ba2a0: addu  s7, a1, zero
 	ldloc.2
 	stloc 16
-// 0x010b9c5c: 0x10b9c5c: addu  s3, a2, zero
+// 0x010ba2a4: 0x10ba2a4: addu  s3, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010b9c60: 0x10b9c60: addiu a1, sp, 32
+// 0x010ba2a8: 0x10ba2a8: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010b9c64: 0x10b9c64: addiu a2, zero, 1
+// 0x010ba2ac: 0x10ba2ac: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010b9c68: 0x10b9c68: sw    s6, 560(sp)
+// 0x010ba2b0: 0x10ba2b0: sw    s6, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5615,7 +5615,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010b9c6c: 0x10b9c6c: sw    s5, 556(sp)
+// 0x010ba2b4: 0x10ba2b4: sw    s5, 556(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5624,7 +5624,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b9c70: 0x10b9c70: sw    s4, 552(sp)
+// 0x010ba2b8: 0x10ba2b8: sw    s4, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5633,7 +5633,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b9c74: 0x10b9c74: sw    s2, 544(sp)
+// 0x010ba2bc: 0x10ba2bc: sw    s2, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5642,7 +5642,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b9c78: 0x10b9c78: sw    s1, 540(sp)
+// 0x010ba2c0: 0x10ba2c0: sw    s1, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5651,7 +5651,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b9c7c: 0x10b9c7c: sw    s0, 536(sp)
+// 0x010ba2c4: 0x10ba2c4: sw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5660,8 +5660,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b9c80: 0x10b9c80: sw    ra, 572(sp)
-// 0x010b9c84: 0x10b9c84: sw    s8, 568(sp)
+// 0x010ba2c8: 0x10ba2c8: sw    ra, 572(sp)
+// 0x010ba2cc: 0x10ba2cc: sw    s8, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5670,16 +5670,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010b9c88: 0x10b9c88: addu  s2, a3, zero
+// 0x010ba2d0: 0x10ba2d0: addu  s2, a3, zero
 	ldloc 4
 	stloc 8
-// 0x010b9c8c: 0x10b9c8c: sb    zero, 36(sp)
+// 0x010ba2d4: 0x10ba2d4: sb    zero, 36(sp)
 	ldloc.0
 	ldc.i4.s 36
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010b9c90: 0x10b9c90: lw    s1, 592(sp)
+// 0x010ba2d8: 0x10ba2d8: lw    s1, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5688,7 +5688,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b9c94: 0x10b9c94: lw    s0, 596(sp)
+// 0x010ba2dc: 0x10ba2dc: lw    s0, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5697,7 +5697,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b9c98: 0x10b9c98: lw    s4, 600(sp)
+// 0x010ba2e0: 0x10ba2e0: lw    s4, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5706,7 +5706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b9c9c: 0x10b9c9c: lw    s5, 604(sp)
+// 0x010ba2e4: 0x10ba2e4: lw    s5, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5715,7 +5715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b9ca0: 0x10b9ca0: jal   0x101358c addu  s6, a0, zero
+// 0x010ba2e8: 0x10ba2e8: jal   0x101359c addu  s6, a0, zero
 	ldloc.1
 	stloc 15
 	ldloc.0
@@ -5723,35 +5723,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_county_by_position_101358c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_county_by_position_101359c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9ca8: 0x10b9ca8: bgtz  v0, 0x10b9cc0 lui   a0, 0x0
+// 0x010ba2f0: 0x10ba2f0: bgtz  v0, 0x10ba308 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	bgt L_10b9cc0
+	bgt L_10ba308
 // --- basic block ---
-// 0x010b9cb0: 0x10b9cb0: lui   a1, 0x20000
+// 0x010ba2f8: 0x10ba2f8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9cb4: 0x10b9cb4: addiu a0, a0, 30152
+// 0x010ba2fc: 0x10ba2fc: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b9cb8: 0x10b9cb8: j	 0x10b9f7c addiu a1, a1, 21548
+// 0x010ba300: 0x10ba300: j	 0x10ba5c4 addiu a1, a1, 22008
 	ldloc.2
-	ldc.i4 21548
+	ldc.i4 22008
 	add
 	stloc.2
-	br L_10b9f7c
+	br L_10ba5c4
 // --- basic block ---
-L_10b9cc0:
-// 0x010b9cc0: 0x10b9cc0: lw    a0, 32(sp)
+L_10ba308:
+// 0x010ba308: 0x10ba308: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5760,29 +5760,29 @@ L_10b9cc0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b9cc4: 0x10b9cc4: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010ba30c: 0x10ba30c: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9ccc: 0x10b9ccc: addu  s8, v0, zero
+// 0x010ba314: 0x10ba314: addu  s8, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010b9cd0: 0x10b9cd0: addiu v0, zero, -1
+// 0x010ba318: 0x10ba318: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010b9cd4: 0x10b9cd4: bne   s8, v0, 0x10b9d0c sll   zero, zero, 0
+// 0x010ba31c: 0x10ba31c: bne   s8, v0, 0x10ba354 sll   zero, zero, 0
 	ldloc 13
 	ldloc 5
-	bne.un L_10b9d0c
+	bne.un L_10ba354
 // --- basic block ---
-// 0x010b9cdc: 0x10b9cdc: lw    a0, 32(sp)
+// 0x010ba324: 0x10ba324: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5791,11 +5791,11 @@ L_10b9cc0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b9ce0: 0x10b9ce0: jal   0x10b6a10 sll   zero, zero, 0
-	call int32 Cibyl136::editor_db_create_10b6a10()
+// 0x010ba328: 0x10ba328: jal   0x10b7058 sll   zero, zero, 0
+	call int32 Cibyl136::editor_db_create_10b7058()
 	stloc 5
 // --- basic block ---
-// 0x010b9ce8: 0x10b9ce8: lw    a0, 32(sp)
+// 0x010ba330: 0x10ba330: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5804,56 +5804,56 @@ L_10b9cc0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010b9cec: 0x10b9cec: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010ba334: 0x10ba334: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9cf4: 0x10b9cf4: bne   v0, s8, 0x10b9d0c lui   a0, 0x0
+// 0x010ba33c: 0x10ba33c: bne   v0, s8, 0x10ba354 lui   a0, 0x0
 	ldloc 5
 	ldloc 13
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10b9d0c
+	bne.un L_10ba354
 // --- basic block ---
-// 0x010b9cfc: 0x10b9cfc: lui   a1, 0x20000
+// 0x010ba344: 0x10ba344: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9d00: 0x10b9d00: addiu a0, a0, 30152
+// 0x010ba348: 0x10ba348: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b9d04: 0x10b9d04: j	 0x10b9f7c addiu a1, a1, 21568
+// 0x010ba34c: 0x10ba34c: j	 0x10ba5c4 addiu a1, a1, 22028
 	ldloc.2
-	ldc.i4 21568
+	ldc.i4 22028
 	add
 	stloc.2
-	br L_10b9f7c
+	br L_10ba5c4
 // --- basic block ---
-L_10b9d0c:
-// 0x010b9d0c: 0x10b9d0c: beq   s5, zero, 0x10b9d54 sll   zero, zero, 0
+L_10ba354:
+// 0x010ba354: 0x10ba354: beq   s5, zero, 0x10ba39c sll   zero, zero, 0
 	ldloc 11
-	brfalse L_10b9d54
+	brfalse L_10ba39c
 // --- basic block ---
-// 0x010b9d14: 0x10b9d14: lb    v0, 0(s5)
+// 0x010ba35c: 0x10ba35c: lb    v0, 0(s5)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010b9d18: 0x10b9d18: sll   zero, zero, 0
-// 0x010b9d1c: 0x10b9d1c: beq   v0, zero, 0x10b9d54 lui   a0, 0x10000
+// 0x010ba360: 0x10ba360: sll   zero, zero, 0
+// 0x010ba364: 0x10ba364: beq   v0, zero, 0x10ba39c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_10b9d54
+	brfalse L_10ba39c
 // --- basic block ---
-// 0x010b9d24: 0x10b9d24: jal   0x101cd60 addiu a0, a0, -31172
+// 0x010ba36c: 0x10ba36c: jal   0x101cd70 addiu a0, a0, -31172
 	ldloc.1
 	ldc.i4 -31172
 	add
@@ -5863,39 +5863,39 @@ L_10b9d0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9d2c: 0x10b9d2c: addu  a3, v0, zero
+// 0x010ba374: 0x10ba374: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b9d30: 0x10b9d30: lui   a2, 0x20000
+// 0x010ba378: 0x10ba378: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b9d34: 0x10b9d34: lui   v0, 0x10000
+// 0x010ba37c: 0x10ba37c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b9d38: 0x10b9d38: addiu v0, v0, 19160
+// 0x010ba380: 0x10ba380: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010b9d3c: 0x10b9d3c: addiu a2, a2, 21588
+// 0x010ba384: 0x10ba384: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010b9d40: 0x10b9d40: addiu a0, sp, 36
+// 0x010ba388: 0x10ba388: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x010b9d44: 0x10b9d44: addiu a1, zero, 500
+// 0x010ba38c: 0x10ba38c: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010b9d48: 0x10b9d48: sw    s5, 16(sp)
+// 0x010ba390: 0x10ba390: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5904,7 +5904,7 @@ L_10b9d0c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b9d4c: 0x10b9d4c: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010ba394: 0x10ba394: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5923,25 +5923,25 @@ L_10b9d0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b9d54:
-// 0x010b9d54: 0x10b9d54: beq   s4, zero, 0x10b9db0 sll   zero, zero, 0
+L_10ba39c:
+// 0x010ba39c: 0x10ba39c: beq   s4, zero, 0x10ba3f8 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10b9db0
+	brfalse L_10ba3f8
 // --- basic block ---
-// 0x010b9d5c: 0x10b9d5c: lb    v0, 0(s4)
+// 0x010ba3a4: 0x10ba3a4: lb    v0, 0(s4)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010b9d60: 0x10b9d60: sll   zero, zero, 0
-// 0x010b9d64: 0x10b9d64: beq   v0, zero, 0x10b9db0 addiu s8, sp, 36
+// 0x010ba3a8: 0x10ba3a8: sll   zero, zero, 0
+// 0x010ba3ac: 0x10ba3ac: beq   v0, zero, 0x10ba3f8 addiu s8, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 13
-	brfalse L_10b9db0
+	brfalse L_10ba3f8
 // --- basic block ---
-// 0x010b9d6c: 0x10b9d6c: jal   0x1001b48 addu  a0, s8, zero
+// 0x010ba3b4: 0x10ba3b4: jal   0x1001b48 addu  a0, s8, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
@@ -5950,15 +5950,15 @@ L_10b9d54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9d74: 0x10b9d74: lui   a0, 0x10000
+// 0x010ba3bc: 0x10ba3bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b9d78: 0x10b9d78: addiu a0, a0, -28756
+// 0x010ba3c0: 0x10ba3c0: addiu a0, a0, -28756
 	ldloc.1
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010b9d7c: 0x10b9d7c: jal   0x101cd60 addu  s5, v0, zero
+// 0x010ba3c4: 0x10ba3c4: jal   0x101cd70 addu  s5, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -5966,44 +5966,44 @@ L_10b9d54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9d84: 0x10b9d84: addu  a3, v0, zero
+// 0x010ba3cc: 0x10ba3cc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b9d88: 0x10b9d88: addiu a1, zero, 500
+// 0x010ba3d0: 0x10ba3d0: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010b9d8c: 0x10b9d8c: lui   a2, 0x20000
+// 0x010ba3d4: 0x10ba3d4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b9d90: 0x10b9d90: lui   v0, 0x10000
+// 0x010ba3d8: 0x10ba3d8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b9d94: 0x10b9d94: addiu v0, v0, 19160
+// 0x010ba3dc: 0x10ba3dc: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010b9d98: 0x10b9d98: subu  a1, a1, s5
+// 0x010ba3e0: 0x10ba3e0: subu  a1, a1, s5
 	ldloc.2
 	ldloc 11
 	sub
 	stloc.2
-// 0x010b9d9c: 0x10b9d9c: addu  a0, s8, s5
+// 0x010ba3e4: 0x10ba3e4: addu  a0, s8, s5
 	ldloc 13
 	ldloc 11
 	add
 	stloc.1
-// 0x010b9da0: 0x10b9da0: addiu a2, a2, 21588
+// 0x010ba3e8: 0x10ba3e8: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010b9da4: 0x10b9da4: sw    s4, 16(sp)
+// 0x010ba3ec: 0x10ba3ec: sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6012,7 +6012,7 @@ L_10b9d54:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b9da8: 0x10b9da8: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010ba3f0: 0x10ba3f0: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6031,25 +6031,25 @@ L_10b9d54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b9db0:
-// 0x010b9db0: 0x10b9db0: beq   s3, zero, 0x10b9e0c sll   zero, zero, 0
+L_10ba3f8:
+// 0x010ba3f8: 0x10ba3f8: beq   s3, zero, 0x10ba454 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10b9e0c
+	brfalse L_10ba454
 // --- basic block ---
-// 0x010b9db8: 0x10b9db8: lb    v0, 0(s3)
+// 0x010ba400: 0x10ba400: lb    v0, 0(s3)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010b9dbc: 0x10b9dbc: sll   zero, zero, 0
-// 0x010b9dc0: 0x10b9dc0: beq   v0, zero, 0x10b9e0c addiu s5, sp, 36
+// 0x010ba404: 0x10ba404: sll   zero, zero, 0
+// 0x010ba408: 0x10ba408: beq   v0, zero, 0x10ba454 addiu s5, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 11
-	brfalse L_10b9e0c
+	brfalse L_10ba454
 // --- basic block ---
-// 0x010b9dc8: 0x10b9dc8: jal   0x1001b48 addu  a0, s5, zero
+// 0x010ba410: 0x10ba410: jal   0x1001b48 addu  a0, s5, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -6058,15 +6058,15 @@ L_10b9db0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9dd0: 0x10b9dd0: lui   a0, 0x20000
+// 0x010ba418: 0x10ba418: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b9dd4: 0x10b9dd4: addiu a0, a0, 21600
+// 0x010ba41c: 0x10ba41c: addiu a0, a0, 22060
 	ldloc.1
-	ldc.i4 21600
+	ldc.i4 22060
 	add
 	stloc.1
-// 0x010b9dd8: 0x10b9dd8: jal   0x101cd60 addu  s4, v0, zero
+// 0x010ba420: 0x10ba420: jal   0x101cd70 addu  s4, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -6074,44 +6074,44 @@ L_10b9db0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9de0: 0x10b9de0: addu  a3, v0, zero
+// 0x010ba428: 0x10ba428: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b9de4: 0x10b9de4: addiu a1, zero, 500
+// 0x010ba42c: 0x10ba42c: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010b9de8: 0x10b9de8: lui   a2, 0x20000
+// 0x010ba430: 0x10ba430: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b9dec: 0x10b9dec: lui   v0, 0x10000
+// 0x010ba434: 0x10ba434: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b9df0: 0x10b9df0: addiu v0, v0, 19160
+// 0x010ba438: 0x10ba438: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010b9df4: 0x10b9df4: subu  a1, a1, s4
+// 0x010ba43c: 0x10ba43c: subu  a1, a1, s4
 	ldloc.2
 	ldloc 10
 	sub
 	stloc.2
-// 0x010b9df8: 0x10b9df8: addu  a0, s5, s4
+// 0x010ba440: 0x10ba440: addu  a0, s5, s4
 	ldloc 11
 	ldloc 10
 	add
 	stloc.1
-// 0x010b9dfc: 0x10b9dfc: addiu a2, a2, 21588
+// 0x010ba444: 0x10ba444: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010b9e00: 0x10b9e00: sw    s3, 16(sp)
+// 0x010ba448: 0x10ba448: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6120,7 +6120,7 @@ L_10b9db0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b9e04: 0x10b9e04: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010ba44c: 0x10ba44c: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6139,25 +6139,25 @@ L_10b9db0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b9e0c:
-// 0x010b9e0c: 0x10b9e0c: beq   s2, zero, 0x10b9e68 sll   zero, zero, 0
+L_10ba454:
+// 0x010ba454: 0x10ba454: beq   s2, zero, 0x10ba4b0 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10b9e68
+	brfalse L_10ba4b0
 // --- basic block ---
-// 0x010b9e14: 0x10b9e14: lb    v0, 0(s2)
+// 0x010ba45c: 0x10ba45c: lb    v0, 0(s2)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010b9e18: 0x10b9e18: sll   zero, zero, 0
-// 0x010b9e1c: 0x10b9e1c: beq   v0, zero, 0x10b9e68 addiu s4, sp, 36
+// 0x010ba460: 0x10ba460: sll   zero, zero, 0
+// 0x010ba464: 0x10ba464: beq   v0, zero, 0x10ba4b0 addiu s4, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-	brfalse L_10b9e68
+	brfalse L_10ba4b0
 // --- basic block ---
-// 0x010b9e24: 0x10b9e24: jal   0x1001b48 addu  a0, s4, zero
+// 0x010ba46c: 0x10ba46c: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -6166,15 +6166,15 @@ L_10b9e0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9e2c: 0x10b9e2c: lui   a0, 0x20000
+// 0x010ba474: 0x10ba474: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b9e30: 0x10b9e30: addiu a0, a0, 21612
+// 0x010ba478: 0x10ba478: addiu a0, a0, 22072
 	ldloc.1
-	ldc.i4 21612
+	ldc.i4 22072
 	add
 	stloc.1
-// 0x010b9e34: 0x10b9e34: jal   0x101cd60 addu  s3, v0, zero
+// 0x010ba47c: 0x10ba47c: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -6182,44 +6182,44 @@ L_10b9e0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9e3c: 0x10b9e3c: addu  a3, v0, zero
+// 0x010ba484: 0x10ba484: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b9e40: 0x10b9e40: addiu a1, zero, 500
+// 0x010ba488: 0x10ba488: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010b9e44: 0x10b9e44: lui   a2, 0x20000
+// 0x010ba48c: 0x10ba48c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b9e48: 0x10b9e48: lui   v0, 0x10000
+// 0x010ba490: 0x10ba490: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b9e4c: 0x10b9e4c: addiu v0, v0, 19160
+// 0x010ba494: 0x10ba494: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010b9e50: 0x10b9e50: subu  a1, a1, s3
+// 0x010ba498: 0x10ba498: subu  a1, a1, s3
 	ldloc.2
 	ldloc 9
 	sub
 	stloc.2
-// 0x010b9e54: 0x10b9e54: addu  a0, s4, s3
+// 0x010ba49c: 0x10ba49c: addu  a0, s4, s3
 	ldloc 10
 	ldloc 9
 	add
 	stloc.1
-// 0x010b9e58: 0x10b9e58: addiu a2, a2, 21588
+// 0x010ba4a0: 0x10ba4a0: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010b9e5c: 0x10b9e5c: sw    s2, 16(sp)
+// 0x010ba4a4: 0x10ba4a4: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6228,7 +6228,7 @@ L_10b9e0c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b9e60: 0x10b9e60: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010ba4a8: 0x10ba4a8: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6247,25 +6247,25 @@ L_10b9e0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b9e68:
-// 0x010b9e68: 0x10b9e68: beq   s1, zero, 0x10b9ec4 sll   zero, zero, 0
+L_10ba4b0:
+// 0x010ba4b0: 0x10ba4b0: beq   s1, zero, 0x10ba50c sll   zero, zero, 0
 	ldloc 12
-	brfalse L_10b9ec4
+	brfalse L_10ba50c
 // --- basic block ---
-// 0x010b9e70: 0x10b9e70: lb    v0, 0(s1)
+// 0x010ba4b8: 0x10ba4b8: lb    v0, 0(s1)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010b9e74: 0x10b9e74: sll   zero, zero, 0
-// 0x010b9e78: 0x10b9e78: beq   v0, zero, 0x10b9ec4 addiu s3, sp, 36
+// 0x010ba4bc: 0x10ba4bc: sll   zero, zero, 0
+// 0x010ba4c0: 0x10ba4c0: beq   v0, zero, 0x10ba50c addiu s3, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 9
-	brfalse L_10b9ec4
+	brfalse L_10ba50c
 // --- basic block ---
-// 0x010b9e80: 0x10b9e80: jal   0x1001b48 addu  a0, s3, zero
+// 0x010ba4c8: 0x10ba4c8: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6274,15 +6274,15 @@ L_10b9e68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9e88: 0x10b9e88: lui   a0, 0x20000
+// 0x010ba4d0: 0x10ba4d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b9e8c: 0x10b9e8c: addiu a0, a0, 21632
+// 0x010ba4d4: 0x10ba4d4: addiu a0, a0, 22092
 	ldloc.1
-	ldc.i4 21632
+	ldc.i4 22092
 	add
 	stloc.1
-// 0x010b9e90: 0x10b9e90: jal   0x101cd60 addu  s2, v0, zero
+// 0x010ba4d8: 0x10ba4d8: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6290,44 +6290,44 @@ L_10b9e68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9e98: 0x10b9e98: addu  a3, v0, zero
+// 0x010ba4e0: 0x10ba4e0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b9e9c: 0x10b9e9c: addiu a1, zero, 500
+// 0x010ba4e4: 0x10ba4e4: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010b9ea0: 0x10b9ea0: lui   a2, 0x20000
+// 0x010ba4e8: 0x10ba4e8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b9ea4: 0x10b9ea4: lui   v0, 0x10000
+// 0x010ba4ec: 0x10ba4ec: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b9ea8: 0x10b9ea8: addiu v0, v0, 19160
+// 0x010ba4f0: 0x10ba4f0: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010b9eac: 0x10b9eac: subu  a1, a1, s2
+// 0x010ba4f4: 0x10ba4f4: subu  a1, a1, s2
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x010b9eb0: 0x10b9eb0: addu  a0, s3, s2
+// 0x010ba4f8: 0x10ba4f8: addu  a0, s3, s2
 	ldloc 9
 	ldloc 8
 	add
 	stloc.1
-// 0x010b9eb4: 0x10b9eb4: addiu a2, a2, 21588
+// 0x010ba4fc: 0x10ba4fc: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010b9eb8: 0x10b9eb8: sw    s1, 16(sp)
+// 0x010ba500: 0x10ba500: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6336,7 +6336,7 @@ L_10b9e68:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010b9ebc: 0x10b9ebc: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010ba504: 0x10ba504: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6355,25 +6355,25 @@ L_10b9e68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b9ec4:
-// 0x010b9ec4: 0x10b9ec4: beq   s0, zero, 0x10b9f20 sll   zero, zero, 0
+L_10ba50c:
+// 0x010ba50c: 0x10ba50c: beq   s0, zero, 0x10ba568 sll   zero, zero, 0
 	ldloc 14
-	brfalse L_10b9f20
+	brfalse L_10ba568
 // --- basic block ---
-// 0x010b9ecc: 0x10b9ecc: lb    v0, 0(s0)
+// 0x010ba514: 0x10ba514: lb    v0, 0(s0)
 	ldloc 14
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010b9ed0: 0x10b9ed0: sll   zero, zero, 0
-// 0x010b9ed4: 0x10b9ed4: beq   v0, zero, 0x10b9f20 addiu s2, sp, 36
+// 0x010ba518: 0x10ba518: sll   zero, zero, 0
+// 0x010ba51c: 0x10ba51c: beq   v0, zero, 0x10ba568 addiu s2, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-	brfalse L_10b9f20
+	brfalse L_10ba568
 // --- basic block ---
-// 0x010b9edc: 0x10b9edc: jal   0x1001b48 addu  a0, s2, zero
+// 0x010ba524: 0x10ba524: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -6382,15 +6382,15 @@ L_10b9ec4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9ee4: 0x10b9ee4: lui   a0, 0x20000
+// 0x010ba52c: 0x10ba52c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010b9ee8: 0x10b9ee8: addiu a0, a0, 21648
+// 0x010ba530: 0x10ba530: addiu a0, a0, 22108
 	ldloc.1
-	ldc.i4 21648
+	ldc.i4 22108
 	add
 	stloc.1
-// 0x010b9eec: 0x10b9eec: jal   0x101cd60 addu  s1, v0, zero
+// 0x010ba534: 0x10ba534: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -6398,44 +6398,44 @@ L_10b9ec4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9ef4: 0x10b9ef4: addu  a3, v0, zero
+// 0x010ba53c: 0x10ba53c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b9ef8: 0x10b9ef8: addiu a1, zero, 500
+// 0x010ba540: 0x10ba540: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010b9efc: 0x10b9efc: lui   a2, 0x20000
+// 0x010ba544: 0x10ba544: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010b9f00: 0x10b9f00: lui   v0, 0x10000
+// 0x010ba548: 0x10ba548: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010b9f04: 0x10b9f04: addiu v0, v0, 19160
+// 0x010ba54c: 0x10ba54c: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010b9f08: 0x10b9f08: subu  a1, a1, s1
+// 0x010ba550: 0x10ba550: subu  a1, a1, s1
 	ldloc.2
 	ldloc 12
 	sub
 	stloc.2
-// 0x010b9f0c: 0x10b9f0c: addu  a0, s2, s1
+// 0x010ba554: 0x10ba554: addu  a0, s2, s1
 	ldloc 8
 	ldloc 12
 	add
 	stloc.1
-// 0x010b9f10: 0x10b9f10: addiu a2, a2, 21588
+// 0x010ba558: 0x10ba558: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010b9f14: 0x10b9f14: sw    s0, 16(sp)
+// 0x010ba55c: 0x10ba55c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6444,7 +6444,7 @@ L_10b9ec4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010b9f18: 0x10b9f18: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010ba560: 0x10ba560: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6463,8 +6463,8 @@ L_10b9ec4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b9f20:
-// 0x010b9f20: 0x10b9f20: lw    a1, 4(s6)
+L_10ba568:
+// 0x010ba568: 0x10ba568: lw    a1, 4(s6)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -6473,37 +6473,37 @@ L_10b9f20:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010b9f24: 0x10b9f24: lw    a0, 0(s6)
+// 0x010ba56c: 0x10ba56c: lw    a0, 0(s6)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010b9f28: 0x10b9f28: addu  a3, zero, zero
+// 0x010ba570: 0x10ba570: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010b9f2c: 0x10b9f2c: cibyl_sysc_arg 0x7
+// 0x010ba574: 0x10ba574: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x010b9f30: 0x10b9f30: cibyl_sysc 0x23b4
+// 0x010ba578: 0x10ba578: cibyl_sysc 0x23b4
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010b9f34: 0x10b9f34: addu  a3, v0, zero
+// 0x010ba57c: 0x10ba57c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010b9f38: 0x10b9f38: lui   v0, 0xe0000
+// 0x010ba580: 0x10ba580: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010b9f3c: 0x10b9f3c: lbu   v0, -17273(v0)
+// 0x010ba584: 0x10ba584: lbu   v0, -16809(v0)
 	ldloc 5
-	ldc.i4 -17273
+	ldc.i4 -16809
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010b9f40: 0x10b9f40: addu  a2, s7, zero
+// 0x010ba588: 0x10ba588: addu  a2, s7, zero
 	ldloc 16
 	stloc.3
-// 0x010b9f44: 0x10b9f44: sw    v0, 16(sp)
+// 0x010ba58c: 0x10ba58c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6512,10 +6512,10 @@ L_10b9f20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b9f48: 0x10b9f48: addiu v0, zero, 2
+// 0x010ba590: 0x10ba590: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010b9f4c: 0x10b9f4c: sw    v0, 20(sp)
+// 0x010ba594: 0x10ba594: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6524,12 +6524,12 @@ L_10b9f20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b9f50: 0x10b9f50: addiu v0, sp, 36
+// 0x010ba598: 0x10ba598: addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-// 0x010b9f54: 0x10b9f54: sw    v0, 24(sp)
+// 0x010ba59c: 0x10ba59c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6538,7 +6538,7 @@ L_10b9f20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010b9f58: 0x10b9f58: lw    v0, 608(sp)
+// 0x010ba5a0: 0x10ba5a0: lw    v0, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6547,7 +6547,7 @@ L_10b9f20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010b9f5c: 0x10b9f5c: jal   0x10b4224 sw    v0, 28(sp)
+// 0x010ba5a4: 0x10ba5a4: jal   0x10b486c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6561,64 +6561,64 @@ L_10b9f20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_add_10b4224(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_add_10b486c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9f64: 0x10b9f64: addiu v1, zero, -1
+// 0x010ba5ac: 0x10ba5ac: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010b9f68: 0x10b9f68: bne   v0, v1, 0x10b9f8c lui   a0, 0x0
+// 0x010ba5b0: 0x10ba5b0: bne   v0, v1, 0x10ba5d4 lui   a0, 0x0
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10b9f8c
+	bne.un L_10ba5d4
 // --- basic block ---
-// 0x010b9f70: 0x10b9f70: lui   a1, 0x20000
+// 0x010ba5b8: 0x10ba5b8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010b9f74: 0x10b9f74: addiu a0, a0, 30152
+// 0x010ba5bc: 0x10ba5bc: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010b9f78: 0x10b9f78: addiu a1, a1, 21656
+// 0x010ba5c0: 0x10ba5c0: addiu a1, a1, 22116
 	ldloc.2
-	ldc.i4 21656
+	ldc.i4 22116
 	add
 	stloc.2
-L_10b9f7c:
-// 0x010b9f7c: 0x10b9f7c: jal   0x104c148 sll   zero, zero, 0
+L_10ba5c4:
+// 0x010ba5c4: 0x10ba5c4: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9f84: 0x10b9f84: j	 0x10b9f94 sll   zero, zero, 0
-	br L_10b9f94
+// 0x010ba5cc: 0x10ba5cc: j	 0x10ba5dc sll   zero, zero, 0
+	br L_10ba5dc
 // --- basic block ---
-L_10b9f8c:
-// 0x010b9f8c: 0x10b9f8c: jal   0x10bd094 sll   zero, zero, 0
+L_10ba5d4:
+// 0x010ba5d4: 0x10ba5d4: jal   0x10bd6dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_report_markers_10bd094(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_report_markers_10bd6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10b9f94:
-// 0x010b9f94: 0x10b9f94: lw    ra, 572(sp)
-// 0x010b9f98: 0x10b9f98: lw    s8, 568(sp)
+L_10ba5dc:
+// 0x010ba5dc: 0x10ba5dc: lw    ra, 572(sp)
+// 0x010ba5e0: 0x10ba5e0: lw    s8, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6627,7 +6627,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010b9f9c: 0x10b9f9c: lw    s7, 564(sp)
+// 0x010ba5e4: 0x10ba5e4: lw    s7, 564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6636,7 +6636,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010b9fa0: 0x10b9fa0: lw    s6, 560(sp)
+// 0x010ba5e8: 0x10ba5e8: lw    s6, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6645,7 +6645,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010b9fa4: 0x10b9fa4: lw    s5, 556(sp)
+// 0x010ba5ec: 0x10ba5ec: lw    s5, 556(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6654,7 +6654,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010b9fa8: 0x10b9fa8: lw    s4, 552(sp)
+// 0x010ba5f0: 0x10ba5f0: lw    s4, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6663,7 +6663,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010b9fac: 0x10b9fac: lw    s3, 548(sp)
+// 0x010ba5f4: 0x10ba5f4: lw    s3, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6672,7 +6672,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010b9fb0: 0x10b9fb0: lw    s2, 544(sp)
+// 0x010ba5f8: 0x10ba5f8: lw    s2, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6681,7 +6681,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010b9fb4: 0x10b9fb4: lw    s1, 540(sp)
+// 0x010ba5fc: 0x10ba5fc: lw    s1, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6690,7 +6690,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010b9fb8: 0x10b9fb8: lw    s0, 536(sp)
+// 0x010ba600: 0x10ba600: lw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6699,7 +6699,7 @@ L_10b9f94:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010b9fbc: 0x10b9fbc: jr    ra addiu sp, sp, 576
+// 0x010ba604: 0x10ba604: jr    ra addiu sp, sp, 576
 	ldloc.0
 	ldc.i4 576
 	add
diff --git a/converted/Cibyl139.j b/converted/Cibyl139.j
index f47d717..d744d99 100644
--- a/converted/Cibyl139.j
+++ b/converted/Cibyl139.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl139::.ctor
 
-.method public static int32 add_speed_cam_10b9fc4(int32,int32,int32,int32,int32)
+.method public static int32 add_speed_cam_10ba60c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s3,int32 s0,int32 s2,int32 ra)
@@ -88,12 +88,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010b9fc4: 0x10b9fc4: addiu sp, sp, -864
+// 0x010ba60c: 0x10ba60c: addiu sp, sp, -864
 	ldloc.0
 	ldc.i4 -864
 	add
 	stloc.0
-// 0x010b9fc8: 0x10b9fc8: sw    s2, 852(sp)
+// 0x010ba610: 0x10ba610: sw    s2, 852(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -102,19 +102,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010b9fcc: 0x10b9fcc: addu  s2, a0, zero
+// 0x010ba614: 0x10ba614: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010b9fd0: 0x10b9fd0: lui   a0, 0x10000
+// 0x010ba618: 0x10ba618: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010b9fd4: 0x10b9fd4: addiu a0, a0, -23972
+// 0x010ba61c: 0x10ba61c: addiu a0, a0, -23972
 	ldloc.1
 	ldc.i4 -23972
 	add
 	stloc.1
-// 0x010b9fd8: 0x10b9fd8: sw    ra, 860(sp)
-// 0x010b9fdc: 0x10b9fdc: sw    s1, 848(sp)
+// 0x010ba620: 0x10ba620: sw    ra, 860(sp)
+// 0x010ba624: 0x10ba624: sw    s1, 848(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -123,7 +123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010b9fe0: 0x10b9fe0: sw    s0, 844(sp)
+// 0x010ba628: 0x10ba628: sw    s0, 844(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -132,7 +132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010b9fe4: 0x10b9fe4: sw    s3, 856(sp)
+// 0x010ba62c: 0x10ba62c: sw    s3, 856(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -141,7 +141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010b9fe8: 0x10b9fe8: sw    zero, 40(sp)
+// 0x010ba630: 0x10ba630: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -150,7 +150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010b9fec: 0x10b9fec: jal   0x101df24 sw    zero, 44(sp)
+// 0x010ba634: 0x10ba634: jal   0x101df34 sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -164,27 +164,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010b9ff4: 0x10b9ff4: addu  s0, v0, zero
+// 0x010ba63c: 0x10ba63c: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010b9ff8: 0x10b9ff8: lw    v0, 0(v0)
+// 0x010ba640: 0x10ba640: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010b9ffc: 0x10b9ffc: addiu a2, sp, 316
+// 0x010ba644: 0x10ba644: addiu a2, sp, 316
 	ldloc.0
 	ldc.i4 316
 	add
 	stloc.3
-// 0x010ba000: 0x10ba000: sw    v0, 48(sp)
+// 0x010ba648: 0x10ba648: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -193,7 +193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba004: 0x10ba004: lw    v0, 4(s0)
+// 0x010ba64c: 0x10ba64c: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -202,13 +202,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ba008: 0x10ba008: addu  a0, a2, zero
+// 0x010ba650: 0x10ba650: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010ba00c: 0x10ba00c: addiu a1, zero, 128
+// 0x010ba654: 0x10ba654: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x010ba010: 0x10ba010: sw    a2, 832(sp)
+// 0x010ba658: 0x10ba658: sw    a2, 832(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -217,7 +217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010ba014: 0x10ba014: jal   0x1010058 sw    v0, 52(sp)
+// 0x010ba65c: 0x10ba65c: jal   0x1010068 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -230,12 +230,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba01c: 0x10ba01c: lw    a2, 832(sp)
+// 0x010ba664: 0x10ba664: lw    a2, 832(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -244,26 +244,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ba020: 0x10ba020: addu  a3, v0, zero
+// 0x010ba668: 0x10ba668: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010ba024: 0x10ba024: addiu s1, sp, 76
+// 0x010ba66c: 0x10ba66c: addiu s1, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 8
-// 0x010ba028: 0x10ba028: addiu v0, zero, 1
+// 0x010ba670: 0x10ba670: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010ba02c: 0x10ba02c: addiu a0, sp, 48
+// 0x010ba674: 0x10ba674: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010ba030: 0x10ba030: addu  a1, zero, zero
+// 0x010ba678: 0x10ba678: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ba034: 0x10ba034: sw    v0, 24(sp)
+// 0x010ba67c: 0x10ba67c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -272,7 +272,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba038: 0x10ba038: sw    v0, 16(sp)
+// 0x010ba680: 0x10ba680: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -281,7 +281,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba03c: 0x10ba03c: jal   0x1013028 sw    s1, 20(sp)
+// 0x010ba684: 0x10ba684: jal   0x1013038 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -295,27 +295,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba044: 0x10ba044: addiu v1, zero, -1
+// 0x010ba68c: 0x10ba68c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010ba048: 0x10ba048: beq   v0, v1, 0x10ba14c addu  a1, s1, zero
+// 0x010ba690: 0x10ba690: beq   v0, v1, 0x10ba794 addu  a1, s1, zero
 	ldloc 5
 	ldloc 7
 	ldloc 8
 	stloc.2
-	beq  L_10ba14c
+	beq  L_10ba794
 // --- basic block ---
-// 0x010ba050: 0x10ba050: addiu a0, sp, 56
+// 0x010ba698: 0x10ba698: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x010ba054: 0x10ba054: jal   0x1001800 addiu a2, zero, 20
+// 0x010ba69c: 0x10ba69c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -327,7 +327,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba05c: 0x10ba05c: lw    a0, 60(sp)
+// 0x010ba6a4: 0x10ba6a4: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -336,7 +336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ba060: 0x10ba060: jal   0x1003b50 sll   zero, zero, 0
+// 0x010ba6a8: 0x10ba6a8: jal   0x1003b50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -345,60 +345,60 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba068: 0x10ba068: addiu v0, v0, -1
+// 0x010ba6b0: 0x10ba6b0: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010ba06c: 0x10ba06c: sltiu v1, v0, 5
+// 0x010ba6b4: 0x10ba6b4: sltiu v1, v0, 5
 	ldloc 5
 	ldc.i4.5
 	clt.un
 	stloc 7
-// 0x010ba070: 0x10ba070: bne   v1, zero, 0x10ba084 lui   v1, 0x20000
+// 0x010ba6b8: 0x10ba6b8: bne   v1, zero, 0x10ba6cc lui   v1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 7
-	brtrue L_10ba084
+	brtrue L_10ba6cc
 // --- basic block ---
-// 0x010ba078: 0x10ba078: lui   s3, 0x10000
+// 0x010ba6c0: 0x10ba6c0: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010ba07c: 0x10ba07c: j	 0x10ba094 addiu s3, s3, -25516
+// 0x010ba6c4: 0x10ba6c4: j	 0x10ba6dc addiu s3, s3, -25516
 	ldloc 9
 	ldc.i4 -25516
 	add
 	stloc 9
-	br L_10ba094
+	br L_10ba6dc
 // --- basic block ---
-L_10ba084:
-// 0x010ba084: 0x10ba084: sll   v0, v0, 2
+L_10ba6cc:
+// 0x010ba6cc: 0x10ba6cc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010ba088: 0x10ba088: addiu v1, v1, 30056
+// 0x010ba6d0: 0x10ba6d0: addiu v1, v1, 30520
 	ldloc 7
-	ldc.i4 30056
+	ldc.i4 30520
 	add
 	stloc 7
-// 0x010ba08c: 0x10ba08c: addu  v0, v0, v1
+// 0x010ba6d4: 0x10ba6d4: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010ba090: 0x10ba090: lw    s3, 0(v0)
+// 0x010ba6d8: 0x10ba6d8: lw    s3, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-L_10ba094:
-// 0x010ba094: 0x10ba094: lui   v0, 0x0
+L_10ba6dc:
+// 0x010ba6dc: 0x10ba6dc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010ba098: 0x10ba098: lw    v0, 576(v0)
+// 0x010ba6e0: 0x10ba6e0: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -407,7 +407,7 @@ L_10ba094:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ba09c: 0x10ba09c: lw    a0, 68(sp)
+// 0x010ba6e4: 0x10ba6e4: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -416,7 +416,7 @@ L_10ba094:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ba0a0: 0x10ba0a0: lw    s1, 16(s0)
+// 0x010ba6e8: 0x10ba6e8: lw    s1, 16(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -425,39 +425,39 @@ L_10ba094:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba0a4: 0x10ba0a4: beq   a0, v0, 0x10ba0bc sll   zero, zero, 0
+// 0x010ba6ec: 0x10ba6ec: beq   a0, v0, 0x10ba704 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10ba0bc
+	beq  L_10ba704
 // --- basic block ---
-// 0x010ba0ac: 0x10ba0ac: bltz  a0, 0x10ba0bc sll   zero, zero, 0
+// 0x010ba6f4: 0x10ba6f4: bltz  a0, 0x10ba704 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10ba0bc
+	blt L_10ba704
 // --- basic block ---
-// 0x010ba0b4: 0x10ba0b4: jal   0x100b164 sll   zero, zero, 0
+// 0x010ba6fc: 0x10ba6fc: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ba0bc:
-// 0x010ba0bc: 0x10ba0bc: addiu a0, sp, 56
+L_10ba704:
+// 0x010ba704: 0x10ba704: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x010ba0c0: 0x10ba0c0: addiu a1, sp, 44
+// 0x010ba708: 0x10ba708: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x010ba0c4: 0x10ba0c4: jal   0x10b9b78 addiu a2, sp, 40
+// 0x010ba70c: 0x10ba70c: jal   0x10ba1c0 addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -467,22 +467,22 @@ L_10ba0bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::alert_get_city_street_10b9b78(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::alert_get_city_street_10ba1c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba0cc: 0x10ba0cc: addiu v0, zero, 2
+// 0x010ba714: 0x10ba714: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010ba0d0: 0x10ba0d0: bne   s2, v0, 0x10ba0f8 lui   v1, 0x20000
+// 0x010ba718: 0x10ba718: bne   s2, v0, 0x10ba740 lui   v1, 0x20000
 	ldloc 11
 	ldloc 5
 	ldc.i4 131072
 	stloc 7
-	bne.un L_10ba0f8
+	bne.un L_10ba740
 // --- basic block ---
-// 0x010ba0d8: 0x10ba0d8: lw    s1, 16(s0)
+// 0x010ba720: 0x10ba720: lw    s1, 16(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -491,41 +491,41 @@ L_10ba0bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba0dc: 0x10ba0dc: sll   zero, zero, 0
-// 0x010ba0e0: 0x10ba0e0: addiu s1, s1, 180
+// 0x010ba724: 0x10ba724: sll   zero, zero, 0
+// 0x010ba728: 0x10ba728: addiu s1, s1, 180
 	ldloc 8
 	ldc.i4 180
 	add
 	stloc 8
-L_10ba0e4:
-// 0x010ba0e4: 0x10ba0e4: slti  v0, s1, 361
+L_10ba72c:
+// 0x010ba72c: 0x10ba72c: slti  v0, s1, 361
 	ldloc 8
 	ldc.i4 361
 	clt
 	stloc 5
-// 0x010ba0e8: 0x10ba0e8: beq   v0, zero, 0x10ba0e4 addiu s1, s1, -360
+// 0x010ba730: 0x10ba730: beq   v0, zero, 0x10ba72c addiu s1, s1, -360
 	ldloc 5
 	ldloc 8
 	ldc.i4 -360
 	add
 	stloc 8
-	brfalse L_10ba0e4
+	brfalse L_10ba72c
 // --- basic block ---
-// 0x010ba0f0: 0x10ba0f0: addiu s1, s1, 360
+// 0x010ba738: 0x10ba738: addiu s1, s1, 360
 	ldloc 8
 	ldc.i4 360
 	add
 	stloc 8
-// 0x010ba0f4: 0x10ba0f4: lui   v1, 0x20000
+// 0x010ba73c: 0x10ba73c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-L_10ba0f8:
-// 0x010ba0f8: 0x10ba0f8: addiu v1, v1, 21676
+L_10ba740:
+// 0x010ba740: 0x10ba740: addiu v1, v1, 22136
 	ldloc 7
-	ldc.i4 21676
+	ldc.i4 22136
 	add
 	stloc 7
-// 0x010ba0fc: 0x10ba0fc: sw    v1, 16(sp)
+// 0x010ba744: 0x10ba744: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -534,7 +534,7 @@ L_10ba0f8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba100: 0x10ba100: lw    v1, 44(sp)
+// 0x010ba748: 0x10ba748: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -543,10 +543,10 @@ L_10ba0f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ba104: 0x10ba104: lui   v0, 0x10000
+// 0x010ba74c: 0x10ba74c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010ba108: 0x10ba108: sw    v1, 24(sp)
+// 0x010ba750: 0x10ba750: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -555,7 +555,7 @@ L_10ba0f8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba10c: 0x10ba10c: lw    v1, 40(sp)
+// 0x010ba754: 0x10ba754: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -564,12 +564,12 @@ L_10ba0f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ba110: 0x10ba110: addiu v0, v0, 18500
+// 0x010ba758: 0x10ba758: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010ba114: 0x10ba114: sw    v1, 28(sp)
+// 0x010ba75c: 0x10ba75c: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -578,29 +578,29 @@ L_10ba0f8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba118: 0x10ba118: lui   v1, 0x20000
+// 0x010ba760: 0x10ba760: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010ba11c: 0x10ba11c: addiu a0, sp, 48
+// 0x010ba764: 0x10ba764: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010ba120: 0x10ba120: addiu v1, v1, 21688
+// 0x010ba768: 0x10ba768: addiu v1, v1, 22148
 	ldloc 7
-	ldc.i4 21688
+	ldc.i4 22148
 	add
 	stloc 7
-// 0x010ba124: 0x10ba124: addu  a1, s1, zero
+// 0x010ba76c: 0x10ba76c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010ba128: 0x10ba128: addu  a2, v0, zero
+// 0x010ba770: 0x10ba770: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010ba12c: 0x10ba12c: addu  a3, s3, zero
+// 0x010ba774: 0x10ba774: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x010ba130: 0x10ba130: sw    v1, 32(sp)
+// 0x010ba778: 0x10ba778: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -609,7 +609,7 @@ L_10ba0f8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba134: 0x10ba134: jal   0x10b9c4c sw    v0, 20(sp)
+// 0x010ba77c: 0x10ba77c: jal   0x10ba294 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -623,23 +623,23 @@ L_10ba0f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::add_alert_10b9c4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::add_alert_10ba294(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba13c: 0x10ba13c: jal   0x101eee8 sll   zero, zero, 0
+// 0x010ba784: 0x10ba784: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba144: 0x10ba144: jal   0x1094a94 addiu a0, zero, 1
+// 0x010ba78c: 0x10ba78c: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -647,14 +647,14 @@ L_10ba0f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ba14c:
-// 0x010ba14c: 0x10ba14c: lw    ra, 860(sp)
-// 0x010ba150: 0x10ba150: lw    s3, 856(sp)
+L_10ba794:
+// 0x010ba794: 0x10ba794: lw    ra, 860(sp)
+// 0x010ba798: 0x10ba798: lw    s3, 856(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -663,7 +663,7 @@ L_10ba14c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ba154: 0x10ba154: lw    s2, 852(sp)
+// 0x010ba79c: 0x10ba79c: lw    s2, 852(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -672,7 +672,7 @@ L_10ba14c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ba158: 0x10ba158: lw    s1, 848(sp)
+// 0x010ba7a0: 0x10ba7a0: lw    s1, 848(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -681,7 +681,7 @@ L_10ba14c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba15c: 0x10ba15c: lw    s0, 844(sp)
+// 0x010ba7a4: 0x10ba7a4: lw    s0, 844(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -690,7 +690,7 @@ L_10ba14c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ba160: 0x10ba160: jr    ra addiu sp, sp, 864
+// 0x010ba7a8: 0x10ba7a8: jr    ra addiu sp, sp, 864
 	ldloc.0
 	ldc.i4 864
 	add
@@ -702,7 +702,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 add_speed_cam_my_direction_10ba188(int32,int32,int32,int32,int32)
+.method public static int32 add_speed_cam_my_direction_10ba7d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -737,13 +737,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba188: 0x10ba188: addiu sp, sp, -24
+// 0x010ba7d0: 0x10ba7d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ba18c: 0x10ba18c: sw    ra, 20(sp)
-// 0x010ba190: 0x10ba190: jal   0x10b9fc4 addiu a0, zero, 1
+// 0x010ba7d4: 0x10ba7d4: sw    ra, 20(sp)
+// 0x010ba7d8: 0x10ba7d8: jal   0x10ba60c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -751,14 +751,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::add_speed_cam_10b9fc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::add_speed_cam_10ba60c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010ba198: 0x10ba198: lw    ra, 20(sp)
-// 0x010ba19c: 0x10ba19c: sll   zero, zero, 0
-// 0x010ba1a0: 0x10ba1a0: jr    ra addiu sp, sp, 24
+// 0x010ba7e0: 0x10ba7e0: lw    ra, 20(sp)
+// 0x010ba7e4: 0x10ba7e4: sll   zero, zero, 0
+// 0x010ba7e8: 0x10ba7e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -770,7 +770,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 add_speed_cam_callback_10ba1a8(int32,int32,int32,int32,int32)
+.method public static int32 add_speed_cam_callback_10ba7f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -805,34 +805,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba1a8: 0x10ba1a8: addiu sp, sp, -24
+// 0x010ba7f0: 0x10ba7f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ba1ac: 0x10ba1ac: addiu v0, zero, 3
+// 0x010ba7f4: 0x10ba7f4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010ba1b0: 0x10ba1b0: bne   a0, v0, 0x10ba1c0 sw    ra, 20(sp)
+// 0x010ba7f8: 0x10ba7f8: bne   a0, v0, 0x10ba808 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_10ba1c0
+	bne.un L_10ba808
 // --- basic block ---
-// 0x010ba1b8: 0x10ba1b8: jal   0x10ba188 sll   zero, zero, 0
+// 0x010ba800: 0x10ba800: jal   0x10ba7d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::add_speed_cam_my_direction_10ba188(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::add_speed_cam_my_direction_10ba7d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10ba1c0:
-// 0x010ba1c0: 0x10ba1c0: lw    ra, 20(sp)
-// 0x010ba1c4: 0x10ba1c4: sll   zero, zero, 0
-// 0x010ba1c8: 0x10ba1c8: jr    ra addiu sp, sp, 24
+L_10ba808:
+// 0x010ba808: 0x10ba808: lw    ra, 20(sp)
+// 0x010ba80c: 0x10ba80c: sll   zero, zero, 0
+// 0x010ba810: 0x10ba810: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -844,7 +844,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 remove_alert_10ba1d0(int32,int32,int32,int32,int32)
+.method public static int32 remove_alert_10ba818(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 ra)
@@ -894,12 +894,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba1d0: 0x10ba1d0: addiu sp, sp, -560
+// 0x010ba818: 0x10ba818: addiu sp, sp, -560
 	ldloc.0
 	ldc.i4 -560
 	add
 	stloc.0
-// 0x010ba1d4: 0x10ba1d4: sw    s2, 544(sp)
+// 0x010ba81c: 0x10ba81c: sw    s2, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -908,7 +908,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ba1d8: 0x10ba1d8: sw    s0, 536(sp)
+// 0x010ba820: 0x10ba820: sw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -917,21 +917,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ba1dc: 0x10ba1dc: addu  s2, a1, zero
+// 0x010ba824: 0x10ba824: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x010ba1e0: 0x10ba1e0: addu  s0, a2, zero
+// 0x010ba828: 0x10ba828: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x010ba1e4: 0x10ba1e4: addiu a1, sp, 32
+// 0x010ba82c: 0x10ba82c: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010ba1e8: 0x10ba1e8: addiu a2, zero, 1
+// 0x010ba830: 0x10ba830: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010ba1ec: 0x10ba1ec: sw    s1, 540(sp)
+// 0x010ba834: 0x10ba834: sw    s1, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -940,8 +940,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ba1f0: 0x10ba1f0: sw    ra, 556(sp)
-// 0x010ba1f4: 0x10ba1f4: sw    s4, 552(sp)
+// 0x010ba838: 0x10ba838: sw    ra, 556(sp)
+// 0x010ba83c: 0x10ba83c: sw    s4, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -950,7 +950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ba1f8: 0x10ba1f8: sw    s3, 548(sp)
+// 0x010ba840: 0x10ba840: sw    s3, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -959,13 +959,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ba1fc: 0x10ba1fc: sb    zero, 36(sp)
+// 0x010ba844: 0x10ba844: sb    zero, 36(sp)
 	ldloc.0
 	ldc.i4.s 36
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010ba200: 0x10ba200: jal   0x101358c addu  s1, a0, zero
+// 0x010ba848: 0x10ba848: jal   0x101359c addu  s1, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -973,52 +973,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_county_by_position_101358c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_county_by_position_101359c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba208: 0x10ba208: bgtz  v0, 0x10ba220 lui   a0, 0x0
+// 0x010ba850: 0x10ba850: bgtz  v0, 0x10ba868 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	bgt L_10ba220
+	bgt L_10ba868
 // --- basic block ---
-// 0x010ba210: 0x10ba210: lui   a1, 0x20000
+// 0x010ba858: 0x10ba858: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba214: 0x10ba214: addiu a0, a0, 30152
+// 0x010ba85c: 0x10ba85c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010ba218: 0x10ba218: j	 0x10ba320 addiu a1, a1, 21548
+// 0x010ba860: 0x10ba860: j	 0x10ba968 addiu a1, a1, 22008
 	ldloc.2
-	ldc.i4 21548
+	ldc.i4 22008
 	add
 	stloc.2
-	br L_10ba320
+	br L_10ba968
 // --- basic block ---
-L_10ba220:
-// 0x010ba220: 0x10ba220: beq   s0, zero, 0x10ba27c sll   zero, zero, 0
+L_10ba868:
+// 0x010ba868: 0x10ba868: beq   s0, zero, 0x10ba8c4 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10ba27c
+	brfalse L_10ba8c4
 // --- basic block ---
-// 0x010ba228: 0x10ba228: lb    v0, 0(s0)
+// 0x010ba870: 0x10ba870: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010ba22c: 0x10ba22c: sll   zero, zero, 0
-// 0x010ba230: 0x10ba230: beq   v0, zero, 0x10ba27c addiu s4, sp, 36
+// 0x010ba874: 0x10ba874: sll   zero, zero, 0
+// 0x010ba878: 0x10ba878: beq   v0, zero, 0x10ba8c4 addiu s4, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 11
-	brfalse L_10ba27c
+	brfalse L_10ba8c4
 // --- basic block ---
-// 0x010ba238: 0x10ba238: jal   0x1001b48 addu  a0, s4, zero
+// 0x010ba880: 0x10ba880: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -1027,15 +1027,15 @@ L_10ba220:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba240: 0x10ba240: lui   a0, 0x20000
+// 0x010ba888: 0x10ba888: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010ba244: 0x10ba244: addiu a0, a0, 21632
+// 0x010ba88c: 0x10ba88c: addiu a0, a0, 22092
 	ldloc.1
-	ldc.i4 21632
+	ldc.i4 22092
 	add
 	stloc.1
-// 0x010ba248: 0x10ba248: jal   0x101cd60 addu  s3, v0, zero
+// 0x010ba890: 0x10ba890: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -1043,44 +1043,44 @@ L_10ba220:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba250: 0x10ba250: addu  a3, v0, zero
+// 0x010ba898: 0x10ba898: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010ba254: 0x10ba254: addiu a1, zero, 500
+// 0x010ba89c: 0x10ba89c: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010ba258: 0x10ba258: lui   a2, 0x20000
+// 0x010ba8a0: 0x10ba8a0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010ba25c: 0x10ba25c: lui   v0, 0x10000
+// 0x010ba8a4: 0x10ba8a4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010ba260: 0x10ba260: addiu v0, v0, 19160
+// 0x010ba8a8: 0x10ba8a8: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010ba264: 0x10ba264: subu  a1, a1, s3
+// 0x010ba8ac: 0x10ba8ac: subu  a1, a1, s3
 	ldloc.2
 	ldloc 10
 	sub
 	stloc.2
-// 0x010ba268: 0x10ba268: addu  a0, s4, s3
+// 0x010ba8b0: 0x10ba8b0: addu  a0, s4, s3
 	ldloc 11
 	ldloc 10
 	add
 	stloc.1
-// 0x010ba26c: 0x10ba26c: addiu a2, a2, 21588
+// 0x010ba8b4: 0x10ba8b4: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010ba270: 0x10ba270: sw    s0, 16(sp)
+// 0x010ba8b8: 0x10ba8b8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1089,7 +1089,7 @@ L_10ba220:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ba274: 0x10ba274: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010ba8bc: 0x10ba8bc: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1108,8 +1108,8 @@ L_10ba220:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ba27c:
-// 0x010ba27c: 0x10ba27c: lw    a0, 32(sp)
+L_10ba8c4:
+// 0x010ba8c4: 0x10ba8c4: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1118,29 +1118,29 @@ L_10ba27c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ba280: 0x10ba280: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010ba8c8: 0x10ba8c8: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba288: 0x10ba288: addu  s0, v0, zero
+// 0x010ba8d0: 0x10ba8d0: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010ba28c: 0x10ba28c: addiu v0, zero, -1
+// 0x010ba8d4: 0x10ba8d4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010ba290: 0x10ba290: bne   s0, v0, 0x10ba2c8 sll   zero, zero, 0
+// 0x010ba8d8: 0x10ba8d8: bne   s0, v0, 0x10ba910 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_10ba2c8
+	bne.un L_10ba910
 // --- basic block ---
-// 0x010ba298: 0x10ba298: lw    a0, 32(sp)
+// 0x010ba8e0: 0x10ba8e0: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1149,11 +1149,11 @@ L_10ba27c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ba29c: 0x10ba29c: jal   0x10b6a10 sll   zero, zero, 0
-	call int32 Cibyl136::editor_db_create_10b6a10()
+// 0x010ba8e4: 0x10ba8e4: jal   0x10b7058 sll   zero, zero, 0
+	call int32 Cibyl136::editor_db_create_10b7058()
 	stloc 5
 // --- basic block ---
-// 0x010ba2a4: 0x10ba2a4: lw    a0, 32(sp)
+// 0x010ba8ec: 0x10ba8ec: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1162,41 +1162,41 @@ L_10ba27c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ba2a8: 0x10ba2a8: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010ba8f0: 0x10ba8f0: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba2b0: 0x10ba2b0: bne   v0, s0, 0x10ba2c8 lui   a0, 0x0
+// 0x010ba8f8: 0x10ba8f8: bne   v0, s0, 0x10ba910 lui   a0, 0x0
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10ba2c8
+	bne.un L_10ba910
 // --- basic block ---
-// 0x010ba2b8: 0x10ba2b8: lui   a1, 0x20000
+// 0x010ba900: 0x10ba900: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba2bc: 0x10ba2bc: addiu a0, a0, 30152
+// 0x010ba904: 0x10ba904: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010ba2c0: 0x10ba2c0: j	 0x10ba320 addiu a1, a1, 21708
+// 0x010ba908: 0x10ba908: j	 0x10ba968 addiu a1, a1, 22168
 	ldloc.2
-	ldc.i4 21708
+	ldc.i4 22168
 	add
 	stloc.2
-	br L_10ba320
+	br L_10ba968
 // --- basic block ---
-L_10ba2c8:
-// 0x010ba2c8: 0x10ba2c8: lw    a1, 4(s1)
+L_10ba910:
+// 0x010ba910: 0x10ba910: lw    a1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1205,37 +1205,37 @@ L_10ba2c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ba2cc: 0x10ba2cc: lw    a0, 0(s1)
+// 0x010ba914: 0x10ba914: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010ba2d0: 0x10ba2d0: addu  a3, zero, zero
+// 0x010ba918: 0x10ba918: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010ba2d4: 0x10ba2d4: cibyl_sysc_arg 0x7
+// 0x010ba91c: 0x10ba91c: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x010ba2d8: 0x10ba2d8: cibyl_sysc 0x23b9
+// 0x010ba920: 0x10ba920: cibyl_sysc 0x23b9
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010ba2dc: 0x10ba2dc: addu  a3, v0, zero
+// 0x010ba924: 0x10ba924: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010ba2e0: 0x10ba2e0: lui   v0, 0xe0000
+// 0x010ba928: 0x10ba928: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010ba2e4: 0x10ba2e4: lbu   v0, -17277(v0)
+// 0x010ba92c: 0x10ba92c: lbu   v0, -16813(v0)
 	ldloc 5
-	ldc.i4 -17277
+	ldc.i4 -16813
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010ba2e8: 0x10ba2e8: addu  a2, s2, zero
+// 0x010ba930: 0x10ba930: addu  a2, s2, zero
 	ldloc 12
 	stloc.3
-// 0x010ba2ec: 0x10ba2ec: sw    v0, 16(sp)
+// 0x010ba934: 0x10ba934: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1244,10 +1244,10 @@ L_10ba2c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba2f0: 0x10ba2f0: addiu v0, zero, 2
+// 0x010ba938: 0x10ba938: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010ba2f4: 0x10ba2f4: sw    v0, 20(sp)
+// 0x010ba93c: 0x10ba93c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1256,12 +1256,12 @@ L_10ba2c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba2f8: 0x10ba2f8: addiu v0, sp, 36
+// 0x010ba940: 0x10ba940: addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-// 0x010ba2fc: 0x10ba2fc: sw    v0, 24(sp)
+// 0x010ba944: 0x10ba944: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1270,7 +1270,7 @@ L_10ba2c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba300: 0x10ba300: jal   0x10b4224 sw    zero, 28(sp)
+// 0x010ba948: 0x10ba948: jal   0x10b486c sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1284,64 +1284,64 @@ L_10ba2c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_add_10b4224(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_add_10b486c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba308: 0x10ba308: addiu v1, zero, -1
+// 0x010ba950: 0x10ba950: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010ba30c: 0x10ba30c: bne   v0, v1, 0x10ba330 lui   a0, 0x0
+// 0x010ba954: 0x10ba954: bne   v0, v1, 0x10ba978 lui   a0, 0x0
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10ba330
+	bne.un L_10ba978
 // --- basic block ---
-// 0x010ba314: 0x10ba314: lui   a1, 0x20000
+// 0x010ba95c: 0x10ba95c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba318: 0x10ba318: addiu a0, a0, 30152
+// 0x010ba960: 0x10ba960: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010ba31c: 0x10ba31c: addiu a1, a1, 21656
+// 0x010ba964: 0x10ba964: addiu a1, a1, 22116
 	ldloc.2
-	ldc.i4 21656
+	ldc.i4 22116
 	add
 	stloc.2
-L_10ba320:
-// 0x010ba320: 0x10ba320: jal   0x104c148 sll   zero, zero, 0
+L_10ba968:
+// 0x010ba968: 0x10ba968: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba328: 0x10ba328: j	 0x10ba338 sll   zero, zero, 0
-	br L_10ba338
+// 0x010ba970: 0x10ba970: j	 0x10ba980 sll   zero, zero, 0
+	br L_10ba980
 // --- basic block ---
-L_10ba330:
-// 0x010ba330: 0x10ba330: jal   0x10bd094 sll   zero, zero, 0
+L_10ba978:
+// 0x010ba978: 0x10ba978: jal   0x10bd6dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_report_markers_10bd094(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_report_markers_10bd6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ba338:
-// 0x010ba338: 0x10ba338: lw    ra, 556(sp)
-// 0x010ba33c: 0x10ba33c: lw    s4, 552(sp)
+L_10ba980:
+// 0x010ba980: 0x10ba980: lw    ra, 556(sp)
+// 0x010ba984: 0x10ba984: lw    s4, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1350,7 +1350,7 @@ L_10ba338:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ba340: 0x10ba340: lw    s3, 548(sp)
+// 0x010ba988: 0x10ba988: lw    s3, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1359,7 +1359,7 @@ L_10ba338:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ba344: 0x10ba344: lw    s2, 544(sp)
+// 0x010ba98c: 0x10ba98c: lw    s2, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1368,7 +1368,7 @@ L_10ba338:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ba348: 0x10ba348: lw    s1, 540(sp)
+// 0x010ba990: 0x10ba990: lw    s1, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1377,7 +1377,7 @@ L_10ba338:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ba34c: 0x10ba34c: lw    s0, 536(sp)
+// 0x010ba994: 0x10ba994: lw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1386,7 +1386,7 @@ L_10ba338:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba350: 0x10ba350: jr    ra addiu sp, sp, 560
+// 0x010ba998: 0x10ba998: jr    ra addiu sp, sp, 560
 	ldloc.0
 	ldc.i4 560
 	add
@@ -1398,7 +1398,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 request_speed_cam_delete_10ba358(int32,int32,int32,int32,int32)
+.method public static int32 request_speed_cam_delete_10ba9a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -1433,16 +1433,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba358: 0x10ba358: lui   a0, 0x10000
+// 0x010ba9a0: 0x10ba9a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010ba35c: 0x10ba35c: addiu sp, sp, -32
+// 0x010ba9a4: 0x10ba9a4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010ba360: 0x10ba360: sw    ra, 28(sp)
-// 0x010ba364: 0x10ba364: jal   0x101df24 addiu a0, a0, -23972
+// 0x010ba9a8: 0x10ba9a8: sw    ra, 28(sp)
+// 0x010ba9ac: 0x10ba9ac: jal   0x101df34 addiu a0, a0, -23972
 	ldloc.1
 	ldc.i4 -23972
 	add
@@ -1452,22 +1452,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ba36c: 0x10ba36c: lw    v1, 0(v0)
+// 0x010ba9b4: 0x10ba9b4: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ba370: 0x10ba370: lui   a2, 0x20000
+// 0x010ba9b8: 0x10ba9b8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010ba374: 0x10ba374: sw    v1, 16(sp)
+// 0x010ba9bc: 0x10ba9bc: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1476,7 +1476,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba378: 0x10ba378: lw    v1, 4(v0)
+// 0x010ba9c0: 0x10ba9c0: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1485,12 +1485,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ba37c: 0x10ba37c: addiu a0, sp, 16
+// 0x010ba9c4: 0x10ba9c4: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010ba380: 0x10ba380: sw    v1, 20(sp)
+// 0x010ba9c8: 0x10ba9c8: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1499,7 +1499,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba384: 0x10ba384: lw    a1, 16(v0)
+// 0x010ba9cc: 0x10ba9cc: lw    a1, 16(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1508,9 +1508,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010ba388: 0x10ba388: jal   0x10ba1d0 addiu a2, a2, 21676
+// 0x010ba9d0: 0x10ba9d0: jal   0x10ba818 addiu a2, a2, 22136
 	ldloc.3
-	ldc.i4 21676
+	ldc.i4 22136
 	add
 	stloc.3
 	ldloc.0
@@ -1518,23 +1518,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::remove_alert_10ba1d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::remove_alert_10ba818(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ba390: 0x10ba390: jal   0x101eee8 sll   zero, zero, 0
+// 0x010ba9d8: 0x10ba9d8: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ba398: 0x10ba398: jal   0x1094a94 addiu a0, zero, 1
+// 0x010ba9e0: 0x10ba9e0: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -1542,14 +1542,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010ba3a0: 0x10ba3a0: lw    ra, 28(sp)
-// 0x010ba3a4: 0x10ba3a4: sll   zero, zero, 0
-// 0x010ba3a8: 0x10ba3a8: jr    ra addiu sp, sp, 32
+// 0x010ba9e8: 0x10ba9e8: lw    ra, 28(sp)
+// 0x010ba9ec: 0x10ba9ec: sll   zero, zero, 0
+// 0x010ba9f0: 0x10ba9f0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1561,7 +1561,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 T_82_10ba3b0(int32,int32,int32,int32,int32)
+.method public static int32 T_82_10ba9f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1602,21 +1602,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba3b0: 0x10ba3b0: lui   a0, 0x10000
+// 0x010ba9f8: 0x10ba9f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010ba3b4: 0x10ba3b4: addiu sp, sp, -856
+// 0x010ba9fc: 0x10ba9fc: addiu sp, sp, -856
 	ldloc.0
 	ldc.i4 -856
 	add
 	stloc.0
-// 0x010ba3b8: 0x10ba3b8: addiu a0, a0, -23972
+// 0x010baa00: 0x10baa00: addiu a0, a0, -23972
 	ldloc.1
 	ldc.i4 -23972
 	add
 	stloc.1
-// 0x010ba3bc: 0x10ba3bc: sw    ra, 852(sp)
-// 0x010ba3c0: 0x10ba3c0: sw    s1, 848(sp)
+// 0x010baa04: 0x10baa04: sw    ra, 852(sp)
+// 0x010baa08: 0x10baa08: sw    s1, 848(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1625,7 +1625,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ba3c4: 0x10ba3c4: sw    s0, 844(sp)
+// 0x010baa0c: 0x10baa0c: sw    s0, 844(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1634,7 +1634,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ba3c8: 0x10ba3c8: sw    zero, 40(sp)
+// 0x010baa10: 0x10baa10: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1643,7 +1643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ba3cc: 0x10ba3cc: jal   0x101df24 sw    zero, 44(sp)
+// 0x010baa14: 0x10baa14: jal   0x101df34 sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1657,27 +1657,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba3d4: 0x10ba3d4: addu  s0, v0, zero
+// 0x010baa1c: 0x10baa1c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010ba3d8: 0x10ba3d8: lw    v0, 0(v0)
+// 0x010baa20: 0x10baa20: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ba3dc: 0x10ba3dc: addiu a2, sp, 316
+// 0x010baa24: 0x10baa24: addiu a2, sp, 316
 	ldloc.0
 	ldc.i4 316
 	add
 	stloc.3
-// 0x010ba3e0: 0x10ba3e0: sw    v0, 48(sp)
+// 0x010baa28: 0x10baa28: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1686,7 +1686,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba3e4: 0x10ba3e4: lw    v0, 4(s0)
+// 0x010baa2c: 0x10baa2c: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1695,13 +1695,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ba3e8: 0x10ba3e8: addu  a0, a2, zero
+// 0x010baa30: 0x10baa30: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010ba3ec: 0x10ba3ec: addiu a1, zero, 128
+// 0x010baa34: 0x10baa34: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x010ba3f0: 0x10ba3f0: sw    a2, 832(sp)
+// 0x010baa38: 0x10baa38: sw    a2, 832(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1710,7 +1710,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010ba3f4: 0x10ba3f4: jal   0x1010058 sw    v0, 52(sp)
+// 0x010baa3c: 0x10baa3c: jal   0x1010068 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1723,12 +1723,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba3fc: 0x10ba3fc: lw    a2, 832(sp)
+// 0x010baa44: 0x10baa44: lw    a2, 832(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1737,26 +1737,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ba400: 0x10ba400: addu  a3, v0, zero
+// 0x010baa48: 0x10baa48: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010ba404: 0x10ba404: addiu s1, sp, 76
+// 0x010baa4c: 0x10baa4c: addiu s1, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 9
-// 0x010ba408: 0x10ba408: addiu v0, zero, 1
+// 0x010baa50: 0x10baa50: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010ba40c: 0x10ba40c: addiu a0, sp, 48
+// 0x010baa54: 0x10baa54: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010ba410: 0x10ba410: addu  a1, zero, zero
+// 0x010baa58: 0x10baa58: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010ba414: 0x10ba414: sw    v0, 24(sp)
+// 0x010baa5c: 0x10baa5c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1765,7 +1765,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba418: 0x10ba418: sw    v0, 16(sp)
+// 0x010baa60: 0x10baa60: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1774,7 +1774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba41c: 0x10ba41c: jal   0x1013028 sw    s1, 20(sp)
+// 0x010baa64: 0x10baa64: jal   0x1013038 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1788,27 +1788,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba424: 0x10ba424: addiu v1, zero, -1
+// 0x010baa6c: 0x10baa6c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010ba428: 0x10ba428: beq   v0, v1, 0x10ba4d0 addu  a1, s1, zero
+// 0x010baa70: 0x10baa70: beq   v0, v1, 0x10bab18 addu  a1, s1, zero
 	ldloc 5
 	ldloc 7
 	ldloc 9
 	stloc.2
-	beq  L_10ba4d0
+	beq  L_10bab18
 // --- basic block ---
-// 0x010ba430: 0x10ba430: addiu a0, sp, 56
+// 0x010baa78: 0x10baa78: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x010ba434: 0x10ba434: jal   0x1001800 addiu a2, zero, 20
+// 0x010baa7c: 0x10baa7c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -1820,10 +1820,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba43c: 0x10ba43c: lui   v0, 0x0
+// 0x010baa84: 0x10baa84: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010ba440: 0x10ba440: lw    v0, 576(v0)
+// 0x010baa88: 0x10baa88: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1832,7 +1832,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ba444: 0x10ba444: lw    a0, 68(sp)
+// 0x010baa8c: 0x10baa8c: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1841,7 +1841,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010ba448: 0x10ba448: lw    s0, 16(s0)
+// 0x010baa90: 0x10baa90: lw    s0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1850,39 +1850,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba44c: 0x10ba44c: beq   a0, v0, 0x10ba464 sll   zero, zero, 0
+// 0x010baa94: 0x10baa94: beq   a0, v0, 0x10baaac sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10ba464
+	beq  L_10baaac
 // --- basic block ---
-// 0x010ba454: 0x10ba454: bltz  a0, 0x10ba464 sll   zero, zero, 0
+// 0x010baa9c: 0x10baa9c: bltz  a0, 0x10baaac sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10ba464
+	blt L_10baaac
 // --- basic block ---
-// 0x010ba45c: 0x10ba45c: jal   0x100b164 sll   zero, zero, 0
+// 0x010baaa4: 0x10baaa4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ba464:
-// 0x010ba464: 0x10ba464: addiu a0, sp, 56
+L_10baaac:
+// 0x010baaac: 0x10baaac: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x010ba468: 0x10ba468: addiu a1, sp, 44
+// 0x010baab0: 0x10baab0: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x010ba46c: 0x10ba46c: jal   0x10b9b78 addiu a2, sp, 40
+// 0x010baab4: 0x10baab4: jal   0x10ba1c0 addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1892,20 +1892,20 @@ L_10ba464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::alert_get_city_street_10b9b78(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::alert_get_city_street_10ba1c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba474: 0x10ba474: lui   v1, 0x10000
+// 0x010baabc: 0x10baabc: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010ba478: 0x10ba478: addiu v1, v1, -19736
+// 0x010baac0: 0x10baac0: addiu v1, v1, -19736
 	ldloc 7
 	ldc.i4 -19736
 	add
 	stloc 7
-// 0x010ba47c: 0x10ba47c: sw    v1, 16(sp)
+// 0x010baac4: 0x10baac4: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1914,7 +1914,7 @@ L_10ba464:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba480: 0x10ba480: lw    v1, 44(sp)
+// 0x010baac8: 0x10baac8: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1923,10 +1923,10 @@ L_10ba464:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ba484: 0x10ba484: lui   v0, 0x10000
+// 0x010baacc: 0x10baacc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010ba488: 0x10ba488: sw    v1, 24(sp)
+// 0x010baad0: 0x10baad0: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1935,7 +1935,7 @@ L_10ba464:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba48c: 0x10ba48c: lw    v1, 40(sp)
+// 0x010baad4: 0x10baad4: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1944,12 +1944,12 @@ L_10ba464:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010ba490: 0x10ba490: addiu v0, v0, 18500
+// 0x010baad8: 0x10baad8: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010ba494: 0x10ba494: sw    v1, 28(sp)
+// 0x010baadc: 0x10baadc: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1958,34 +1958,34 @@ L_10ba464:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba498: 0x10ba498: lui   a3, 0x10000
+// 0x010baae0: 0x10baae0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010ba49c: 0x10ba49c: lui   v1, 0x20000
+// 0x010baae4: 0x10baae4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010ba4a0: 0x10ba4a0: addiu a0, sp, 48
+// 0x010baae8: 0x10baae8: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010ba4a4: 0x10ba4a4: addiu v1, v1, 21732
+// 0x010baaec: 0x10baaec: addiu v1, v1, 22192
 	ldloc 7
-	ldc.i4 21732
+	ldc.i4 22192
 	add
 	stloc 7
-// 0x010ba4a8: 0x10ba4a8: addu  a1, s0, zero
+// 0x010baaf0: 0x10baaf0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010ba4ac: 0x10ba4ac: addu  a2, v0, zero
+// 0x010baaf4: 0x10baaf4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010ba4b0: 0x10ba4b0: addiu a3, a3, -48
+// 0x010baaf8: 0x10baaf8: addiu a3, a3, -52
 	ldloc 4
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc 4
-// 0x010ba4b4: 0x10ba4b4: sw    v1, 32(sp)
+// 0x010baafc: 0x10baafc: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1994,7 +1994,7 @@ L_10ba464:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010ba4b8: 0x10ba4b8: jal   0x10b9c4c sw    v0, 20(sp)
+// 0x010bab00: 0x10bab00: jal   0x10ba294 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2008,23 +2008,23 @@ L_10ba464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::add_alert_10b9c4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::add_alert_10ba294(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba4c0: 0x10ba4c0: jal   0x101eee8 sll   zero, zero, 0
+// 0x010bab08: 0x10bab08: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010ba4c8: 0x10ba4c8: jal   0x1094a94 addiu a0, zero, 1
+// 0x010bab10: 0x10bab10: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -2032,14 +2032,14 @@ L_10ba464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10ba4d0:
-// 0x010ba4d0: 0x10ba4d0: lw    ra, 852(sp)
-// 0x010ba4d4: 0x10ba4d4: lw    s1, 848(sp)
+L_10bab18:
+// 0x010bab18: 0x10bab18: lw    ra, 852(sp)
+// 0x010bab1c: 0x10bab1c: lw    s1, 848(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2048,7 +2048,7 @@ L_10ba4d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ba4d8: 0x10ba4d8: lw    s0, 844(sp)
+// 0x010bab20: 0x10bab20: lw    s0, 844(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2057,7 +2057,7 @@ L_10ba4d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba4dc: 0x10ba4dc: jr    ra addiu sp, sp, 856
+// 0x010bab24: 0x10bab24: jr    ra addiu sp, sp, 856
 	ldloc.0
 	ldc.i4 856
 	add
@@ -2069,7 +2069,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 add_red_light_cam_my_direction_10ba4e4(int32,int32,int32,int32,int32)
+.method public static int32 add_red_light_cam_my_direction_10bab2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2104,26 +2104,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba4e4: 0x10ba4e4: addiu sp, sp, -24
+// 0x010bab2c: 0x10bab2c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ba4e8: 0x10ba4e8: sw    ra, 20(sp)
-// 0x010ba4ec: 0x10ba4ec: jal   0x10ba3b0 sll   zero, zero, 0
+// 0x010bab30: 0x10bab30: sw    ra, 20(sp)
+// 0x010bab34: 0x10bab34: jal   0x10ba9f8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_82_10ba3b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_82_10ba9f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010ba4f4: 0x10ba4f4: lw    ra, 20(sp)
-// 0x010ba4f8: 0x10ba4f8: sll   zero, zero, 0
-// 0x010ba4fc: 0x10ba4fc: jr    ra addiu sp, sp, 24
+// 0x010bab3c: 0x10bab3c: lw    ra, 20(sp)
+// 0x010bab40: 0x10bab40: sll   zero, zero, 0
+// 0x010bab44: 0x10bab44: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2135,7 +2135,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 add_red_light_cam_callback_10ba504(int32,int32,int32,int32,int32)
+.method public static int32 add_red_light_cam_callback_10bab4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2170,34 +2170,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba504: 0x10ba504: addiu sp, sp, -24
+// 0x010bab4c: 0x10bab4c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ba508: 0x10ba508: addiu v0, zero, 3
+// 0x010bab50: 0x10bab50: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010ba50c: 0x10ba50c: bne   a0, v0, 0x10ba51c sw    ra, 20(sp)
+// 0x010bab54: 0x10bab54: bne   a0, v0, 0x10bab64 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_10ba51c
+	bne.un L_10bab64
 // --- basic block ---
-// 0x010ba514: 0x10ba514: jal   0x10ba4e4 sll   zero, zero, 0
+// 0x010bab5c: 0x10bab5c: jal   0x10bab2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::add_red_light_cam_my_direction_10ba4e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::add_red_light_cam_my_direction_10bab2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10ba51c:
-// 0x010ba51c: 0x10ba51c: lw    ra, 20(sp)
-// 0x010ba520: 0x10ba520: sll   zero, zero, 0
-// 0x010ba524: 0x10ba524: jr    ra addiu sp, sp, 24
+L_10bab64:
+// 0x010bab64: 0x10bab64: lw    ra, 20(sp)
+// 0x010bab68: 0x10bab68: sll   zero, zero, 0
+// 0x010bab6c: 0x10bab6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2209,7 +2209,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_83_10ba52c(int32,int32,int32,int32,int32)
+.method public static int32 T_83_10bab74(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -2259,12 +2259,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba52c: 0x10ba52c: addiu sp, sp, -40
+// 0x010bab74: 0x10bab74: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010ba530: 0x10ba530: sw    s0, 16(sp)
+// 0x010bab78: 0x10bab78: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2273,13 +2273,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010ba534: 0x10ba534: addu  s0, a0, zero
+// 0x010bab7c: 0x10bab7c: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010ba538: 0x10ba538: addu  a0, a1, zero
+// 0x010bab80: 0x10bab80: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010ba53c: 0x10ba53c: sw    s4, 32(sp)
+// 0x010bab84: 0x10bab84: sw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2288,7 +2288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ba540: 0x10ba540: sw    s3, 28(sp)
+// 0x010bab88: 0x10bab88: sw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2297,7 +2297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ba544: 0x10ba544: sw    s2, 24(sp)
+// 0x010bab8c: 0x10bab8c: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2306,7 +2306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ba548: 0x10ba548: sw    s1, 20(sp)
+// 0x010bab90: 0x10bab90: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2315,11 +2315,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ba54c: 0x10ba54c: sw    ra, 36(sp)
-// 0x010ba550: 0x10ba550: addu  s2, a1, zero
+// 0x010bab94: 0x10bab94: sw    ra, 36(sp)
+// 0x010bab98: 0x10bab98: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010ba554: 0x10ba554: jal   0x101cd60 addu  s1, a2, zero
+// 0x010bab9c: 0x10bab9c: jal   0x101cd70 addu  s1, a2, zero
 	ldloc.3
 	stloc 9
 	ldloc.0
@@ -2327,21 +2327,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010ba55c: 0x10ba55c: addiu s4, zero, 10
+// 0x010baba4: 0x10baba4: addiu s4, zero, 10
 	ldc.i4.s 10
 	stloc 12
-// 0x010ba560: 0x10ba560: j	 0x10ba65c addu  s3, v0, zero
+// 0x010baba8: 0x10baba8: j	 0x10baca4 addu  s3, v0, zero
 	ldloc 6
 	stloc 11
-	br L_10ba65c
+	br L_10baca4
 // --- basic block ---
-L_10ba568:
-// 0x010ba568: 0x10ba568: jal   0x1001b48 addu  a0, s2, zero
+L_10babb0:
+// 0x010babb0: 0x10babb0: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -2350,13 +2350,13 @@ L_10ba568:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010ba570: 0x10ba570: addu  a2, v0, zero
+// 0x010babb8: 0x10babb8: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x010ba574: 0x10ba574: addu  a0, s2, zero
+// 0x010babbc: 0x10babbc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010ba578: 0x10ba578: jal   0x1001b2c addu  a1, s0, zero
+// 0x010babc0: 0x10babc0: jal   0x1001b2c addu  a1, s0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -2365,13 +2365,13 @@ L_10ba568:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010ba580: 0x10ba580: beq   v0, zero, 0x10ba5b0 addiu a0, zero, 58
+// 0x010babc8: 0x10babc8: beq   v0, zero, 0x10babf8 addiu a0, zero, 58
 	ldloc 6
 	ldc.i4.s 58
 	stloc.1
-	brfalse L_10ba5b0
+	brfalse L_10babf8
 // --- basic block ---
-// 0x010ba588: 0x10ba588: jal   0x1001b48 addu  a0, s3, zero
+// 0x010babd0: 0x10babd0: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -2380,13 +2380,13 @@ L_10ba568:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010ba590: 0x10ba590: addu  a2, v0, zero
+// 0x010babd8: 0x10babd8: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x010ba594: 0x10ba594: addu  a0, s3, zero
+// 0x010babdc: 0x10babdc: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010ba598: 0x10ba598: jal   0x1001b2c addu  a1, s0, zero
+// 0x010babe0: 0x10babe0: jal   0x1001b2c addu  a1, s0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -2395,125 +2395,125 @@ L_10ba568:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010ba5a0: 0x10ba5a0: beq   v0, zero, 0x10ba5b0 addiu a0, zero, 58
+// 0x010babe8: 0x10babe8: beq   v0, zero, 0x10babf8 addiu a0, zero, 58
 	ldloc 6
 	ldc.i4.s 58
 	stloc.1
-	brfalse L_10ba5b0
+	brfalse L_10babf8
 // --- basic block ---
-// 0x010ba5a8: 0x10ba5a8: j	 0x10ba644 sll   zero, zero, 0
-	br L_10ba644
+// 0x010babf0: 0x10babf0: j	 0x10bac8c sll   zero, zero, 0
+	br L_10bac8c
 // --- basic block ---
-L_10ba5b0:
-// 0x010ba5b0: 0x10ba5b0: lb    v1, 0(s0)
+L_10babf8:
+// 0x010babf8: 0x10babf8: lb    v1, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010ba5b4: 0x10ba5b4: sll   zero, zero, 0
-// 0x010ba5b8: 0x10ba5b8: beq   v1, zero, 0x10ba66c addiu v0, s0, 1
+// 0x010babfc: 0x10babfc: sll   zero, zero, 0
+// 0x010bac00: 0x10bac00: beq   v1, zero, 0x10bacb4 addiu v0, s0, 1
 	ldloc 8
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_10ba66c
+	brfalse L_10bacb4
 // --- basic block ---
-// 0x010ba5c0: 0x10ba5c0: bne   v1, a0, 0x10ba5b0 addu  s0, v0, zero
+// 0x010bac08: 0x10bac08: bne   v1, a0, 0x10babf8 addu  s0, v0, zero
 	ldloc 8
 	ldloc.1
 	ldloc 6
 	stloc 5
-	bne.un L_10ba5b0
+	bne.un L_10babf8
 // --- basic block ---
-// 0x010ba5c8: 0x10ba5c8: j	 0x10ba5d4 addiu v0, zero, 32
+// 0x010bac10: 0x10bac10: j	 0x10bac1c addiu v0, zero, 32
 	ldc.i4.s 32
 	stloc 6
-	br L_10ba5d4
+	br L_10bac1c
 // --- basic block ---
-L_10ba5d0:
-// 0x010ba5d0: 0x10ba5d0: addiu s0, s0, 1
+L_10bac18:
+// 0x010bac18: 0x10bac18: addiu s0, s0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_10ba5d4:
-// 0x010ba5d4: 0x10ba5d4: lb    v1, 0(s0)
+L_10bac1c:
+// 0x010bac1c: 0x10bac1c: lb    v1, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010ba5d8: 0x10ba5d8: sll   zero, zero, 0
-// 0x010ba5dc: 0x10ba5dc: beq   v1, v0, 0x10ba5d0 addu  a1, s0, zero
+// 0x010bac20: 0x10bac20: sll   zero, zero, 0
+// 0x010bac24: 0x10bac24: beq   v1, v0, 0x10bac18 addu  a1, s0, zero
 	ldloc 8
 	ldloc 6
 	ldloc 5
 	stloc.2
-	beq  L_10ba5d0
+	beq  L_10bac18
 // --- basic block ---
-// 0x010ba5e4: 0x10ba5e4: j	 0x10ba5f0 addiu v1, zero, 10
+// 0x010bac2c: 0x10bac2c: j	 0x10bac38 addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 8
-	br L_10ba5f0
+	br L_10bac38
 // --- basic block ---
-L_10ba5ec:
-// 0x010ba5ec: 0x10ba5ec: addiu s0, s0, 1
+L_10bac34:
+// 0x010bac34: 0x10bac34: addiu s0, s0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_10ba5f0:
-// 0x010ba5f0: 0x10ba5f0: lb    v0, 0(s0)
+L_10bac38:
+// 0x010bac38: 0x10bac38: lb    v0, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010ba5f4: 0x10ba5f4: sll   zero, zero, 0
-// 0x010ba5f8: 0x10ba5f8: beq   v0, zero, 0x10ba608 sll   zero, zero, 0
+// 0x010bac3c: 0x10bac3c: sll   zero, zero, 0
+// 0x010bac40: 0x10bac40: beq   v0, zero, 0x10bac50 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10ba608
+	brfalse L_10bac50
 // --- basic block ---
-// 0x010ba600: 0x10ba600: bne   v0, v1, 0x10ba5ec sll   zero, zero, 0
+// 0x010bac48: 0x10bac48: bne   v0, v1, 0x10bac34 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	bne.un L_10ba5ec
+	bne.un L_10bac34
 // --- basic block ---
-L_10ba608:
-// 0x010ba608: 0x10ba608: bne   a1, s0, 0x10ba618 subu  s0, s0, a1
+L_10bac50:
+// 0x010bac50: 0x10bac50: bne   a1, s0, 0x10bac60 subu  s0, s0, a1
 	ldloc.2
 	ldloc 5
 	ldloc 5
 	ldloc.2
 	sub
 	stloc 5
-	bne.un L_10ba618
+	bne.un L_10bac60
 // --- basic block ---
-// 0x010ba610: 0x10ba610: j	 0x10ba63c sb    zero, 0(s1)
+// 0x010bac58: 0x10bac58: j	 0x10bac84 sb    zero, 0(s1)
 	ldloc 9
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_10ba63c
+	br L_10bac84
 // --- basic block ---
-L_10ba618:
-// 0x010ba618: 0x10ba618: slti  v0, s0, 254
+L_10bac60:
+// 0x010bac60: 0x10bac60: slti  v0, s0, 254
 	ldloc 5
 	ldc.i4 254
 	clt
 	stloc 6
-// 0x010ba61c: 0x10ba61c: bne   v0, zero, 0x10ba62c addu  a2, s0, zero
+// 0x010bac64: 0x10bac64: bne   v0, zero, 0x10bac74 addu  a2, s0, zero
 	ldloc 6
 	ldloc 5
 	stloc.3
-	brtrue L_10ba62c
+	brtrue L_10bac74
 // --- basic block ---
-// 0x010ba624: 0x10ba624: addiu s0, zero, 254
+// 0x010bac6c: 0x10bac6c: addiu s0, zero, 254
 	ldc.i4 254
 	stloc 5
-// 0x010ba628: 0x10ba628: addu  a2, s0, zero
+// 0x010bac70: 0x10bac70: addu  a2, s0, zero
 	ldloc 5
 	stloc.3
-L_10ba62c:
-// 0x010ba62c: 0x10ba62c: addu  a0, s1, zero
+L_10bac74:
+// 0x010bac74: 0x10bac74: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010ba630: 0x10ba630: jal   0x1001af8 addu  s0, s1, s0
+// 0x010bac78: 0x10bac78: jal   0x1001af8 addu  s0, s1, s0
 	ldloc 9
 	ldloc 5
 	add
@@ -2524,54 +2524,54 @@ L_10ba62c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010ba638: 0x10ba638: sb    zero, 0(s0)
+// 0x010bac80: 0x10bac80: sb    zero, 0(s0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10ba63c:
-// 0x010ba63c: 0x10ba63c: j	 0x10ba670 addu  v0, zero, zero
+L_10bac84:
+// 0x010bac84: 0x10bac84: j	 0x10bacb8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10ba670
+	br L_10bacb8
 // --- basic block ---
-L_10ba644:
-// 0x010ba644: 0x10ba644: lb    v1, 0(s0)
+L_10bac8c:
+// 0x010bac8c: 0x10bac8c: lb    v1, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010ba648: 0x10ba648: sll   zero, zero, 0
-// 0x010ba64c: 0x10ba64c: beq   v1, zero, 0x10ba65c addiu v0, s0, 1
+// 0x010bac90: 0x10bac90: sll   zero, zero, 0
+// 0x010bac94: 0x10bac94: beq   v1, zero, 0x10baca4 addiu v0, s0, 1
 	ldloc 8
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_10ba65c
+	brfalse L_10baca4
 // --- basic block ---
-// 0x010ba654: 0x10ba654: bne   v1, s4, 0x10ba644 addu  s0, v0, zero
+// 0x010bac9c: 0x10bac9c: bne   v1, s4, 0x10bac8c addu  s0, v0, zero
 	ldloc 8
 	ldloc 12
 	ldloc 6
 	stloc 5
-	bne.un L_10ba644
+	bne.un L_10bac8c
 // --- basic block ---
-L_10ba65c:
-// 0x010ba65c: 0x10ba65c: lb    v0, 0(s0)
+L_10baca4:
+// 0x010baca4: 0x10baca4: lb    v0, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010ba660: 0x10ba660: sll   zero, zero, 0
-// 0x010ba664: 0x10ba664: bne   v0, zero, 0x10ba568 sll   zero, zero, 0
+// 0x010baca8: 0x10baca8: sll   zero, zero, 0
+// 0x010bacac: 0x10bacac: bne   v0, zero, 0x10babb0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10ba568
+	brtrue L_10babb0
 // --- basic block ---
-L_10ba66c:
-// 0x010ba66c: 0x10ba66c: addiu v0, zero, -1
+L_10bacb4:
+// 0x010bacb4: 0x10bacb4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_10ba670:
-// 0x010ba670: 0x10ba670: lw    ra, 36(sp)
-// 0x010ba674: 0x10ba674: lw    s4, 32(sp)
+L_10bacb8:
+// 0x010bacb8: 0x10bacb8: lw    ra, 36(sp)
+// 0x010bacbc: 0x10bacbc: lw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2580,7 +2580,7 @@ L_10ba670:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ba678: 0x10ba678: lw    s3, 28(sp)
+// 0x010bacc0: 0x10bacc0: lw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2589,7 +2589,7 @@ L_10ba670:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ba67c: 0x10ba67c: lw    s2, 24(sp)
+// 0x010bacc4: 0x10bacc4: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2598,7 +2598,7 @@ L_10ba670:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ba680: 0x10ba680: lw    s1, 20(sp)
+// 0x010bacc8: 0x10bacc8: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2607,7 +2607,7 @@ L_10ba670:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ba684: 0x10ba684: lw    s0, 16(sp)
+// 0x010baccc: 0x10baccc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2616,7 +2616,7 @@ L_10ba670:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010ba688: 0x10ba688: jr    ra addiu sp, sp, 40
+// 0x010bacd0: 0x10bacd0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2628,7 +2628,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 add_alert_export_10ba690(int32,int32,int32,int32,int32)
+.method public static int32 add_alert_export_10bacd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s6,int32 s4,int32 s5,int32 s3,int32 s1,int32 s2,int32 ra)
@@ -2684,13 +2684,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ba690:
-// 0x010ba690: 0x10ba690: addiu sp, sp, -304
+L_10bacd8:
+// 0x010bacd8: 0x10bacd8: addiu sp, sp, -304
 	ldloc.0
 	ldc.i4 -304
 	add
 	stloc.0
-// 0x010ba694: 0x10ba694: sw    s0, 272(sp)
+// 0x010bacdc: 0x10bacdc: sw    s0, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2699,7 +2699,7 @@ L_10ba690:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ba698: 0x10ba698: lw    s0, 324(sp)
+// 0x010bace0: 0x10bace0: lw    s0, 324(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2708,8 +2708,8 @@ L_10ba690:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba69c: 0x10ba69c: sw    ra, 300(sp)
-// 0x010ba6a0: 0x10ba6a0: sw    s6, 296(sp)
+// 0x010bace4: 0x10bace4: sw    ra, 300(sp)
+// 0x010bace8: 0x10bace8: sw    s6, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2718,7 +2718,7 @@ L_10ba690:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ba6a4: 0x10ba6a4: sw    s5, 292(sp)
+// 0x010bacec: 0x10bacec: sw    s5, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2727,7 +2727,7 @@ L_10ba690:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ba6a8: 0x10ba6a8: sw    s4, 288(sp)
+// 0x010bacf0: 0x10bacf0: sw    s4, 288(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2736,7 +2736,7 @@ L_10ba690:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ba6ac: 0x10ba6ac: sw    s3, 284(sp)
+// 0x010bacf4: 0x10bacf4: sw    s3, 284(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2745,7 +2745,7 @@ L_10ba690:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010ba6b0: 0x10ba6b0: sw    s2, 280(sp)
+// 0x010bacf8: 0x10bacf8: sw    s2, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2754,7 +2754,7 @@ L_10ba690:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ba6b4: 0x10ba6b4: sw    s1, 276(sp)
+// 0x010bacfc: 0x10bacfc: sw    s1, 276(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2763,16 +2763,16 @@ L_10ba690:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ba6b8: 0x10ba6b8: addu  s2, a1, zero
+// 0x010bad00: 0x10bad00: addu  s2, a1, zero
 	ldloc.2
 	stloc 14
-// 0x010ba6bc: 0x10ba6bc: addu  s1, a2, zero
+// 0x010bad04: 0x10bad04: addu  s1, a2, zero
 	ldloc.3
 	stloc 13
-// 0x010ba6c0: 0x10ba6c0: addu  s5, a3, zero
+// 0x010bad08: 0x10bad08: addu  s5, a3, zero
 	ldloc 4
 	stloc 11
-// 0x010ba6c4: 0x10ba6c4: lw    s4, 320(sp)
+// 0x010bad0c: 0x10bad0c: lw    s4, 320(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2781,7 +2781,7 @@ L_10ba690:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ba6c8: 0x10ba6c8: jal   0x10b400c addiu s6, sp, 16
+// 0x010bad10: 0x10bad10: jal   0x10b4654 addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2791,40 +2791,40 @@ L_10ba690:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_note_10b400c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_note_10b4654(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba6d0: 0x10ba6d0: lui   a1, 0x10000
+// 0x010bad18: 0x10bad18: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010ba6d4: 0x10ba6d4: sw    zero, 0(s0)
+// 0x010bad1c: 0x10bad1c: sw    zero, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ba6d8: 0x10ba6d8: sw    zero, 0(s1)
+// 0x010bad20: 0x10bad20: sw    zero, 0(s1)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ba6dc: 0x10ba6dc: addiu a1, a1, -31172
+// 0x010bad24: 0x10bad24: addiu a1, a1, -31172
 	ldloc.2
 	ldc.i4 -31172
 	add
 	stloc.2
-// 0x010ba6e0: 0x10ba6e0: addu  a0, v0, zero
+// 0x010bad28: 0x10bad28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010ba6e4: 0x10ba6e4: addu  a2, s6, zero
+// 0x010bad2c: 0x10bad2c: addu  a2, s6, zero
 	ldloc 9
 	stloc.3
-// 0x010ba6e8: 0x10ba6e8: jal   0x10ba52c addu  s3, v0, zero
+// 0x010bad30: 0x10bad30: jal   0x10bab74 addu  s3, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2832,55 +2832,55 @@ L_10ba690:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_83_10ba52c(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_83_10bab74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba6f0: 0x10ba6f0: addiu v1, zero, -1
+// 0x010bad38: 0x10bad38: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ba6f4: 0x10ba6f4: beq   v0, v1, 0x10ba730 lui   a0, 0x10000
+// 0x010bad3c: 0x10bad3c: beq   v0, v1, 0x10bad78 lui   a0, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	beq  L_10ba730
+	beq  L_10bad78
 // --- basic block ---
-// 0x010ba6fc: 0x10ba6fc: lw    v0, 0(s0)
+// 0x010bad44: 0x10bad44: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ba700: 0x10ba700: sll   zero, zero, 0
-// 0x010ba704: 0x10ba704: sll   v0, v0, 2
+// 0x010bad48: 0x10bad48: sll   zero, zero, 0
+// 0x010bad4c: 0x10bad4c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010ba708: 0x10ba708: addu  v1, s5, v0
+// 0x010bad50: 0x10bad50: addu  v1, s5, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 6
-// 0x010ba70c: 0x10ba70c: addiu a0, a0, 13528
+// 0x010bad54: 0x10bad54: addiu a0, a0, 13524
 	ldloc.1
-	ldc.i4 13528
+	ldc.i4 13524
 	add
 	stloc.1
-// 0x010ba710: 0x10ba710: sw    a0, 0(v1)
+// 0x010bad58: 0x10bad58: sw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010ba714: 0x10ba714: addu  a0, s6, zero
+// 0x010bad5c: 0x10bad5c: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x010ba718: 0x10ba718: jal   0x1001ba8 addu  s6, s4, v0
+// 0x010bad60: 0x10bad60: jal   0x1001ba8 addu  s6, s4, v0
 	ldloc 10
 	ldloc 5
 	add
@@ -2895,50 +2895,50 @@ L_10ba690:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba720: 0x10ba720: lw    v1, 0(s0)
+// 0x010bad68: 0x10bad68: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010ba724: 0x10ba724: sw    v0, 0(s6)
+// 0x010bad6c: 0x10bad6c: sw    v0, 0(s6)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010ba728: 0x10ba728: addiu v1, v1, 1
+// 0x010bad70: 0x10bad70: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010ba72c: 0x10ba72c: sw    v1, 0(s0)
+// 0x010bad74: 0x10bad74: sw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10ba730:
-// 0x010ba730: 0x10ba730: addiu s6, sp, 16
+L_10bad78:
+// 0x010bad78: 0x10bad78: addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010ba734: 0x10ba734: lui   a1, 0x10000
+// 0x010bad7c: 0x10bad7c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010ba738: 0x10ba738: addiu a1, a1, -28756
+// 0x010bad80: 0x10bad80: addiu a1, a1, -28756
 	ldloc.2
 	ldc.i4 -28756
 	add
 	stloc.2
-// 0x010ba73c: 0x10ba73c: addu  a0, s3, zero
+// 0x010bad84: 0x10bad84: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010ba740: 0x10ba740: jal   0x10ba52c addu  a2, s6, zero
+// 0x010bad88: 0x10bad88: jal   0x10bab74 addu  a2, s6, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -2946,55 +2946,55 @@ L_10ba730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_83_10ba52c(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_83_10bab74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba748: 0x10ba748: addiu v1, zero, -1
+// 0x010bad90: 0x10bad90: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ba74c: 0x10ba74c: beq   v0, v1, 0x10ba788 lui   a0, 0x10000
+// 0x010bad94: 0x10bad94: beq   v0, v1, 0x10badd0 lui   a0, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	beq  L_10ba788
+	beq  L_10badd0
 // --- basic block ---
-// 0x010ba754: 0x10ba754: lw    v0, 0(s0)
+// 0x010bad9c: 0x10bad9c: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ba758: 0x10ba758: sll   zero, zero, 0
-// 0x010ba75c: 0x10ba75c: sll   v0, v0, 2
+// 0x010bada0: 0x10bada0: sll   zero, zero, 0
+// 0x010bada4: 0x10bada4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010ba760: 0x10ba760: addu  v1, s5, v0
+// 0x010bada8: 0x10bada8: addu  v1, s5, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 6
-// 0x010ba764: 0x10ba764: addiu a0, a0, -26948
+// 0x010badac: 0x10badac: addiu a0, a0, -26948
 	ldloc.1
 	ldc.i4 -26948
 	add
 	stloc.1
-// 0x010ba768: 0x10ba768: sw    a0, 0(v1)
+// 0x010badb0: 0x10badb0: sw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010ba76c: 0x10ba76c: addu  a0, s6, zero
+// 0x010badb4: 0x10badb4: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x010ba770: 0x10ba770: jal   0x1001ba8 addu  s6, s4, v0
+// 0x010badb8: 0x10badb8: jal   0x1001ba8 addu  s6, s4, v0
 	ldloc 10
 	ldloc 5
 	add
@@ -3009,50 +3009,50 @@ L_10ba730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba778: 0x10ba778: lw    v1, 0(s0)
+// 0x010badc0: 0x10badc0: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010ba77c: 0x10ba77c: sw    v0, 0(s6)
+// 0x010badc4: 0x10badc4: sw    v0, 0(s6)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010ba780: 0x10ba780: addiu v1, v1, 1
+// 0x010badc8: 0x10badc8: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010ba784: 0x10ba784: sw    v1, 0(s0)
+// 0x010badcc: 0x10badcc: sw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10ba788:
-// 0x010ba788: 0x10ba788: addiu s6, sp, 16
+L_10badd0:
+// 0x010badd0: 0x10badd0: addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010ba78c: 0x10ba78c: lui   a1, 0x20000
+// 0x010badd4: 0x10badd4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba790: 0x10ba790: addiu a1, a1, 21632
+// 0x010badd8: 0x10badd8: addiu a1, a1, 22092
 	ldloc.2
-	ldc.i4 21632
+	ldc.i4 22092
 	add
 	stloc.2
-// 0x010ba794: 0x10ba794: addu  a0, s3, zero
+// 0x010baddc: 0x10baddc: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010ba798: 0x10ba798: jal   0x10ba52c addu  a2, s6, zero
+// 0x010bade0: 0x10bade0: jal   0x10bab74 addu  a2, s6, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -3060,55 +3060,55 @@ L_10ba788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_83_10ba52c(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_83_10bab74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba7a0: 0x10ba7a0: addiu v1, zero, -1
+// 0x010bade8: 0x10bade8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ba7a4: 0x10ba7a4: beq   v0, v1, 0x10ba7e0 lui   a0, 0x20000
+// 0x010badec: 0x10badec: beq   v0, v1, 0x10bae28 lui   a0, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc.1
-	beq  L_10ba7e0
+	beq  L_10bae28
 // --- basic block ---
-// 0x010ba7ac: 0x10ba7ac: lw    v0, 0(s0)
+// 0x010badf4: 0x10badf4: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ba7b0: 0x10ba7b0: sll   zero, zero, 0
-// 0x010ba7b4: 0x10ba7b4: sll   v0, v0, 2
+// 0x010badf8: 0x10badf8: sll   zero, zero, 0
+// 0x010badfc: 0x10badfc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010ba7b8: 0x10ba7b8: addu  v1, s5, v0
+// 0x010bae00: 0x10bae00: addu  v1, s5, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 6
-// 0x010ba7bc: 0x10ba7bc: addiu a0, a0, 21756
+// 0x010bae04: 0x10bae04: addiu a0, a0, 22216
 	ldloc.1
-	ldc.i4 21756
+	ldc.i4 22216
 	add
 	stloc.1
-// 0x010ba7c0: 0x10ba7c0: sw    a0, 0(v1)
+// 0x010bae08: 0x10bae08: sw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010ba7c4: 0x10ba7c4: addu  a0, s6, zero
+// 0x010bae0c: 0x10bae0c: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x010ba7c8: 0x10ba7c8: jal   0x1001ba8 addu  s6, s4, v0
+// 0x010bae10: 0x10bae10: jal   0x1001ba8 addu  s6, s4, v0
 	ldloc 10
 	ldloc 5
 	add
@@ -3123,50 +3123,50 @@ L_10ba788:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba7d0: 0x10ba7d0: lw    v1, 0(s0)
+// 0x010bae18: 0x10bae18: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010ba7d4: 0x10ba7d4: sw    v0, 0(s6)
+// 0x010bae1c: 0x10bae1c: sw    v0, 0(s6)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010ba7d8: 0x10ba7d8: addiu v1, v1, 1
+// 0x010bae20: 0x10bae20: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010ba7dc: 0x10ba7dc: sw    v1, 0(s0)
+// 0x010bae24: 0x10bae24: sw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10ba7e0:
-// 0x010ba7e0: 0x10ba7e0: addiu s6, sp, 16
+L_10bae28:
+// 0x010bae28: 0x10bae28: addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010ba7e4: 0x10ba7e4: lui   a1, 0x20000
+// 0x010bae2c: 0x10bae2c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba7e8: 0x10ba7e8: addiu a1, a1, 21648
+// 0x010bae30: 0x10bae30: addiu a1, a1, 22108
 	ldloc.2
-	ldc.i4 21648
+	ldc.i4 22108
 	add
 	stloc.2
-// 0x010ba7ec: 0x10ba7ec: addu  a0, s3, zero
+// 0x010bae34: 0x10bae34: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010ba7f0: 0x10ba7f0: jal   0x10ba52c addu  a2, s6, zero
+// 0x010bae38: 0x10bae38: jal   0x10bab74 addu  a2, s6, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -3174,20 +3174,20 @@ L_10ba7e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_83_10ba52c(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_83_10bab74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba7f8: 0x10ba7f8: addiu v1, zero, -1
+// 0x010bae40: 0x10bae40: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ba7fc: 0x10ba7fc: beq   v0, v1, 0x10ba86c sll   zero, zero, 0
+// 0x010bae44: 0x10bae44: beq   v0, v1, 0x10baeb4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	beq  L_10ba86c
+	beq  L_10baeb4
 // --- basic block ---
-// 0x010ba804: 0x10ba804: jal   0x1000d8c addu  a0, s6, zero
+// 0x010bae4c: 0x10bae4c: jal   0x1000d8c addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3200,33 +3200,33 @@ L_10ba7e0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba80c: 0x10ba80c: bgtz  v0, 0x10ba838 lui   v1, 0x10000
+// 0x010bae54: 0x10bae54: bgtz  v0, 0x10bae80 lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 6
 	ldc.i4.s 0
-	bgt L_10ba838
+	bgt L_10bae80
 // --- basic block ---
-// 0x010ba814: 0x10ba814: lui   a1, 0x20000
+// 0x010bae5c: 0x10bae5c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba818: 0x10ba818: lui   a3, 0x20000
+// 0x010bae60: 0x10bae60: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010ba81c: 0x10ba81c: addiu a1, a1, 21768
+// 0x010bae64: 0x10bae64: addiu a1, a1, 22228
 	ldloc.2
-	ldc.i4 21768
+	ldc.i4 22228
 	add
 	stloc.2
-// 0x010ba820: 0x10ba820: addiu a3, a3, 21804
+// 0x010bae68: 0x10bae68: addiu a3, a3, 22264
 	ldloc 4
-	ldc.i4 21804
+	ldc.i4 22264
 	add
 	stloc 4
-// 0x010ba824: 0x10ba824: addiu a0, zero, 4
+// 0x010bae6c: 0x10bae6c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010ba828: 0x10ba828: jal   0x100449c addiu a2, zero, 170
+// 0x010bae70: 0x10bae70: jal   0x100449c addiu a2, zero, 170
 	ldc.i4 170
 	stloc.3
 	ldloc.0
@@ -3239,46 +3239,46 @@ L_10ba7e0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba830: 0x10ba830: j	 0x10ba8ec addiu v0, zero, -1
+// 0x010bae78: 0x10bae78: j	 0x10baf34 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_10ba8ec
+	br L_10baf34
 // --- basic block ---
-L_10ba838:
-// 0x010ba838: 0x10ba838: lw    v0, 0(s0)
+L_10bae80:
+// 0x010bae80: 0x10bae80: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010ba83c: 0x10ba83c: sll   zero, zero, 0
-// 0x010ba840: 0x10ba840: sll   v0, v0, 2
+// 0x010bae84: 0x10bae84: sll   zero, zero, 0
+// 0x010bae88: 0x10bae88: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010ba844: 0x10ba844: addiu v1, v1, 8860
+// 0x010bae8c: 0x10bae8c: addiu v1, v1, 8856
 	ldloc 6
-	ldc.i4 8860
+	ldc.i4 8856
 	add
 	stloc 6
-// 0x010ba848: 0x10ba848: addu  s5, s5, v0
+// 0x010bae90: 0x10bae90: addu  s5, s5, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x010ba84c: 0x10ba84c: sw    v1, 0(s5)
+// 0x010bae94: 0x10bae94: sw    v1, 0(s5)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010ba850: 0x10ba850: addu  a0, s6, zero
+// 0x010bae98: 0x10bae98: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x010ba854: 0x10ba854: jal   0x1001ba8 addu  s4, s4, v0
+// 0x010bae9c: 0x10bae9c: jal   0x1001ba8 addu  s4, s4, v0
 	ldloc 10
 	ldloc 5
 	add
@@ -3293,50 +3293,50 @@ L_10ba838:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba85c: 0x10ba85c: lw    v1, 0(s0)
+// 0x010baea4: 0x10baea4: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010ba860: 0x10ba860: sw    v0, 0(s4)
+// 0x010baea8: 0x10baea8: sw    v0, 0(s4)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010ba864: 0x10ba864: addiu v1, v1, 1
+// 0x010baeac: 0x10baeac: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010ba868: 0x10ba868: sw    v1, 0(s0)
+// 0x010baeb0: 0x10baeb0: sw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10ba86c:
-// 0x010ba86c: 0x10ba86c: addiu s0, sp, 16
+L_10baeb4:
+// 0x010baeb4: 0x10baeb4: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x010ba870: 0x10ba870: lui   a1, 0x20000
+// 0x010baeb8: 0x10baeb8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba874: 0x10ba874: addiu a1, a1, 21600
+// 0x010baebc: 0x10baebc: addiu a1, a1, 22060
 	ldloc.2
-	ldc.i4 21600
+	ldc.i4 22060
 	add
 	stloc.2
-// 0x010ba878: 0x10ba878: addu  a0, s3, zero
+// 0x010baec0: 0x10baec0: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010ba87c: 0x10ba87c: jal   0x10ba52c addu  a2, s0, zero
+// 0x010baec4: 0x10baec4: jal   0x10bab74 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -3344,20 +3344,20 @@ L_10ba86c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_83_10ba52c(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_83_10bab74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba884: 0x10ba884: addiu v1, zero, -1
+// 0x010baecc: 0x10baecc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ba888: 0x10ba888: beq   v0, v1, 0x10ba8a0 sll   zero, zero, 0
+// 0x010baed0: 0x10baed0: beq   v0, v1, 0x10baee8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	beq  L_10ba8a0
+	beq  L_10baee8
 // --- basic block ---
-// 0x010ba890: 0x10ba890: jal   0x1001ba8 addu  a0, s0, zero
+// 0x010baed8: 0x10baed8: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3370,47 +3370,47 @@ L_10ba86c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba898: 0x10ba898: j	 0x10ba8ac addiu s0, sp, 16
+// 0x010baee0: 0x10baee0: j	 0x10baef4 addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-	br L_10ba8ac
+	br L_10baef4
 // --- basic block ---
-L_10ba8a0:
-// 0x010ba8a0: 0x10ba8a0: lui   v0, 0x10000
+L_10baee8:
+// 0x010baee8: 0x10baee8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010ba8a4: 0x10ba8a4: addiu v0, v0, 18500
+// 0x010baeec: 0x10baeec: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010ba8a8: 0x10ba8a8: addiu s0, sp, 16
+// 0x010baef0: 0x10baef0: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-L_10ba8ac:
-// 0x010ba8ac: 0x10ba8ac: lui   a1, 0x20000
+L_10baef4:
+// 0x010baef4: 0x10baef4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba8b0: 0x10ba8b0: sw    v0, 0(s2)
+// 0x010baef8: 0x10baef8: sw    v0, 0(s2)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010ba8b4: 0x10ba8b4: addu  a0, s3, zero
+// 0x010baefc: 0x10baefc: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010ba8b8: 0x10ba8b8: addiu a1, a1, 21612
+// 0x010baf00: 0x10baf00: addiu a1, a1, 22072
 	ldloc.2
-	ldc.i4 21612
+	ldc.i4 22072
 	add
 	stloc.2
-// 0x010ba8bc: 0x10ba8bc: jal   0x10ba52c addu  a2, s0, zero
+// 0x010baf04: 0x10baf04: jal   0x10bab74 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -3418,22 +3418,22 @@ L_10ba8ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_83_10ba52c(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_83_10bab74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba8c4: 0x10ba8c4: addiu v1, zero, -1
+// 0x010baf0c: 0x10baf0c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ba8c8: 0x10ba8c8: beq   v0, v1, 0x10ba8e0 lui   v0, 0x10000
+// 0x010baf10: 0x10baf10: beq   v0, v1, 0x10baf28 lui   v0, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc 5
-	beq  L_10ba8e0
+	beq  L_10baf28
 // --- basic block ---
-// 0x010ba8d0: 0x10ba8d0: jal   0x1001ba8 addu  a0, s0, zero
+// 0x010baf18: 0x10baf18: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3446,35 +3446,35 @@ L_10ba8ac:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010ba8d8: 0x10ba8d8: j	 0x10ba8e8 sw    v0, 0(s1)
+// 0x010baf20: 0x10baf20: j	 0x10baf30 sw    v0, 0(s1)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10ba8e8
+	br L_10baf30
 // --- basic block ---
-L_10ba8e0:
-// 0x010ba8e0: 0x10ba8e0: addiu v0, v0, 18500
+L_10baf28:
+// 0x010baf28: 0x10baf28: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010ba8e4: 0x10ba8e4: sw    v0, 0(s1)
+// 0x010baf2c: 0x10baf2c: sw    v0, 0(s1)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10ba8e8:
-// 0x010ba8e8: 0x10ba8e8: addu  v0, zero, zero
+L_10baf30:
+// 0x010baf30: 0x10baf30: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10ba8ec:
-// 0x010ba8ec: 0x10ba8ec: lw    ra, 300(sp)
-// 0x010ba8f0: 0x10ba8f0: lw    s6, 296(sp)
+L_10baf34:
+// 0x010baf34: 0x10baf34: lw    ra, 300(sp)
+// 0x010baf38: 0x10baf38: lw    s6, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3483,7 +3483,7 @@ L_10ba8ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ba8f4: 0x10ba8f4: lw    s5, 292(sp)
+// 0x010baf3c: 0x10baf3c: lw    s5, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3492,7 +3492,7 @@ L_10ba8ec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010ba8f8: 0x10ba8f8: lw    s4, 288(sp)
+// 0x010baf40: 0x10baf40: lw    s4, 288(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3501,7 +3501,7 @@ L_10ba8ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010ba8fc: 0x10ba8fc: lw    s3, 284(sp)
+// 0x010baf44: 0x10baf44: lw    s3, 284(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3510,7 +3510,7 @@ L_10ba8ec:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010ba900: 0x10ba900: lw    s2, 280(sp)
+// 0x010baf48: 0x10baf48: lw    s2, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3519,7 +3519,7 @@ L_10ba8ec:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010ba904: 0x10ba904: lw    s1, 276(sp)
+// 0x010baf4c: 0x10baf4c: lw    s1, 276(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3528,7 +3528,7 @@ L_10ba8ec:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010ba908: 0x10ba908: lw    s0, 272(sp)
+// 0x010baf50: 0x10baf50: lw    s0, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3537,7 +3537,7 @@ L_10ba8ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba90c: 0x10ba90c: jr    ra addiu sp, sp, 304
+// 0x010baf54: 0x10baf54: jr    ra addiu sp, sp, 304
 	ldloc.0
 	ldc.i4 304
 	add
@@ -3549,7 +3549,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 remove_alert_export_10ba914(int32,int32,int32,int32,int32)
+.method public static int32 remove_alert_export_10baf5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s1,int32 s0,int32 ra)
@@ -3590,13 +3590,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10ba914:
-// 0x010ba914: 0x10ba914: addiu sp, sp, -296
+L_10baf5c:
+// 0x010baf5c: 0x10baf5c: addiu sp, sp, -296
 	ldloc.0
 	ldc.i4 -296
 	add
 	stloc.0
-// 0x010ba918: 0x10ba918: sw    a3, 276(sp)
+// 0x010baf60: 0x10baf60: sw    a3, 276(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3605,8 +3605,8 @@ L_10ba914:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010ba91c: 0x10ba91c: sw    ra, 292(sp)
-// 0x010ba920: 0x10ba920: sw    s1, 288(sp)
+// 0x010baf64: 0x10baf64: sw    ra, 292(sp)
+// 0x010baf68: 0x10baf68: sw    s1, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3615,7 +3615,7 @@ L_10ba914:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ba924: 0x10ba924: sw    s0, 284(sp)
+// 0x010baf6c: 0x10baf6c: sw    s0, 284(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3624,7 +3624,7 @@ L_10ba914:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010ba928: 0x10ba928: sw    a2, 272(sp)
+// 0x010baf70: 0x10baf70: sw    a2, 272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3633,7 +3633,7 @@ L_10ba914:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010ba92c: 0x10ba92c: lw    s0, 316(sp)
+// 0x010baf74: 0x10baf74: lw    s0, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3642,7 +3642,7 @@ L_10ba914:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ba930: 0x10ba930: jal   0x10b400c addiu s1, sp, 16
+// 0x010baf78: 0x10baf78: jal   0x10b4654 addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3652,12 +3652,12 @@ L_10ba914:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_note_10b400c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_note_10b4654(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010ba938: 0x10ba938: lw    a2, 272(sp)
+// 0x010baf80: 0x10baf80: lw    a2, 272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3666,40 +3666,40 @@ L_10ba914:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010ba93c: 0x10ba93c: lui   v1, 0x10000
+// 0x010baf84: 0x10baf84: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010ba940: 0x10ba940: addiu v1, v1, 18500
+// 0x010baf88: 0x10baf88: addiu v1, v1, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-// 0x010ba944: 0x10ba944: lui   a1, 0x20000
+// 0x010baf8c: 0x10baf8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010ba948: 0x10ba948: sw    v1, 0(a2)
+// 0x010baf90: 0x10baf90: sw    v1, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010ba94c: 0x10ba94c: sw    zero, 0(s0)
+// 0x010baf94: 0x10baf94: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010ba950: 0x10ba950: addu  a0, v0, zero
+// 0x010baf98: 0x10baf98: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x010ba954: 0x10ba954: addiu a1, a1, 21632
+// 0x010baf9c: 0x10baf9c: addiu a1, a1, 22092
 	ldloc.2
-	ldc.i4 21632
+	ldc.i4 22092
 	add
 	stloc.2
-// 0x010ba958: 0x10ba958: jal   0x10ba52c addu  a2, s1, zero
+// 0x010bafa0: 0x10bafa0: jal   0x10bab74 addu  a2, s1, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -3707,15 +3707,15 @@ L_10ba914:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::T_83_10ba52c(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::T_83_10bab74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010ba960: 0x10ba960: addiu v1, zero, -1
+// 0x010bafa8: 0x10bafa8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010ba964: 0x10ba964: lw    a3, 276(sp)
+// 0x010bafac: 0x10bafac: lw    a3, 276(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3724,40 +3724,40 @@ L_10ba914:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010ba968: 0x10ba968: beq   v0, v1, 0x10ba9a8 lui   v1, 0x20000
+// 0x010bafb0: 0x10bafb0: beq   v0, v1, 0x10baff0 lui   v1, 0x20000
 	ldloc 7
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	beq  L_10ba9a8
+	beq  L_10baff0
 // --- basic block ---
-// 0x010ba970: 0x10ba970: lw    v0, 0(s0)
+// 0x010bafb8: 0x10bafb8: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010ba974: 0x10ba974: sll   zero, zero, 0
-// 0x010ba978: 0x10ba978: sll   v0, v0, 2
+// 0x010bafbc: 0x10bafbc: sll   zero, zero, 0
+// 0x010bafc0: 0x10bafc0: sll   v0, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010ba97c: 0x10ba97c: addiu v1, v1, 21756
+// 0x010bafc4: 0x10bafc4: addiu v1, v1, 22216
 	ldloc 6
-	ldc.i4 21756
+	ldc.i4 22216
 	add
 	stloc 6
-// 0x010ba980: 0x10ba980: addu  a3, a3, v0
+// 0x010bafc8: 0x10bafc8: addu  a3, a3, v0
 	ldloc 4
 	ldloc 7
 	add
 	stloc 4
-// 0x010ba984: 0x10ba984: addu  a0, s1, zero
+// 0x010bafcc: 0x10bafcc: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010ba988: 0x10ba988: lw    s1, 312(sp)
+// 0x010bafd0: 0x10bafd0: lw    s1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3766,14 +3766,14 @@ L_10ba914:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba98c: 0x10ba98c: sw    v1, 0(a3)
+// 0x010bafd4: 0x10bafd4: sw    v1, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010ba990: 0x10ba990: jal   0x1001ba8 addu  s1, s1, v0
+// 0x010bafd8: 0x10bafd8: jal   0x1001ba8 addu  s1, s1, v0
 	ldloc 8
 	ldloc 7
 	add
@@ -3788,38 +3788,38 @@ L_10ba914:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010ba998: 0x10ba998: lw    v1, 0(s0)
+// 0x010bafe0: 0x10bafe0: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010ba99c: 0x10ba99c: sw    v0, 0(s1)
+// 0x010bafe4: 0x10bafe4: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010ba9a0: 0x10ba9a0: addiu v1, v1, 1
+// 0x010bafe8: 0x10bafe8: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010ba9a4: 0x10ba9a4: sw    v1, 0(s0)
+// 0x010bafec: 0x10bafec: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10ba9a8:
-// 0x010ba9a8: 0x10ba9a8: lw    ra, 292(sp)
-// 0x010ba9ac: 0x10ba9ac: addu  v0, zero, zero
+L_10baff0:
+// 0x010baff0: 0x10baff0: lw    ra, 292(sp)
+// 0x010baff4: 0x10baff4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010ba9b0: 0x10ba9b0: lw    s1, 288(sp)
+// 0x010baff8: 0x10baff8: lw    s1, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3828,7 +3828,7 @@ L_10ba9a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010ba9b4: 0x10ba9b4: lw    s0, 284(sp)
+// 0x010baffc: 0x10baffc: lw    s0, 284(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3837,7 +3837,7 @@ L_10ba9a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010ba9b8: 0x10ba9b8: jr    ra addiu sp, sp, 296
+// 0x010bb000: 0x10bb000: jr    ra addiu sp, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
@@ -3849,7 +3849,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 update_range_initialize_10ba9c0(int32,int32,int32,int32,int32)
+.method public static int32 update_range_initialize_10bb008(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 ra,int32[] mem,int32 v0)
@@ -3884,16 +3884,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba9c0: 0x10ba9c0: lui   a0, 0x0
+// 0x010bb008: 0x10bb008: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010ba9c4: 0x10ba9c4: addiu sp, sp, -24
+// 0x010bb00c: 0x10bb00c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010ba9c8: 0x10ba9c8: sw    ra, 20(sp)
-// 0x010ba9cc: 0x10ba9cc: jal   0x10b3c34 addiu a0, a0, 19480
+// 0x010bb010: 0x10bb010: sw    ra, 20(sp)
+// 0x010bb014: 0x10bb014: jal   0x10b427c addiu a0, a0, 19480
 	ldloc.1
 	ldc.i4 19480
 	add
@@ -3901,25 +3901,25 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl134::editor_marker_reg_type_10b3c34(int32,int32,int32)
+	call int32 Cibyl134::editor_marker_reg_type_10b427c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010ba9d4: 0x10ba9d4: lw    ra, 20(sp)
-// 0x010ba9d8: 0x10ba9d8: lui   v1, 0xe0000
+// 0x010bb01c: 0x10bb01c: lw    ra, 20(sp)
+// 0x010bb020: 0x10bb020: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010ba9dc: 0x10ba9dc: sw    v0, -17244(v1)
+// 0x010bb024: 0x10bb024: sw    v0, -16780(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4311
+	ldc.i4 -4195
 	add
 	ldloc 8
 	stelem.i4
-// 0x010ba9e0: 0x10ba9e0: jr    ra addiu sp, sp, 24
+// 0x010bb028: 0x10bb028: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3931,7 +3931,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 update_range_10ba9e8(int32,int32,int32,int32,int32)
+.method public static int32 update_range_10bb030(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s5,int32 s6,int32 s4,int32 s1,int32 s3,int32 s7,int32 ra)
@@ -3990,12 +3990,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010ba9e8: 0x10ba9e8: addiu sp, sp, -576
+// 0x010bb030: 0x10bb030: addiu sp, sp, -576
 	ldloc.0
 	ldc.i4 -576
 	add
 	stloc.0
-// 0x010ba9ec: 0x10ba9ec: sw    s6, 564(sp)
+// 0x010bb034: 0x10bb034: sw    s6, 564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4004,7 +4004,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010ba9f0: 0x10ba9f0: sw    s5, 560(sp)
+// 0x010bb038: 0x10bb038: sw    s5, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4013,7 +4013,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010ba9f4: 0x10ba9f4: sw    s3, 552(sp)
+// 0x010bb03c: 0x10bb03c: sw    s3, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4022,7 +4022,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010ba9f8: 0x10ba9f8: sw    s1, 544(sp)
+// 0x010bb040: 0x10bb040: sw    s1, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4031,8 +4031,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010ba9fc: 0x10ba9fc: sw    ra, 572(sp)
-// 0x010baa00: 0x10baa00: sw    s7, 568(sp)
+// 0x010bb044: 0x10bb044: sw    ra, 572(sp)
+// 0x010bb048: 0x10bb048: sw    s7, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4041,7 +4041,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010baa04: 0x10baa04: sw    s4, 556(sp)
+// 0x010bb04c: 0x10bb04c: sw    s4, 556(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4050,7 +4050,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010baa08: 0x10baa08: sw    s2, 548(sp)
+// 0x010bb050: 0x10bb050: sw    s2, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4059,7 +4059,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010baa0c: 0x10baa0c: sw    s0, 540(sp)
+// 0x010bb054: 0x10bb054: sw    s0, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4068,49 +4068,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010baa10: 0x10baa10: lb    v0, 0(a0)
+// 0x010bb058: 0x10bb058: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010baa14: 0x10baa14: addu  s3, a0, zero
+// 0x010bb05c: 0x10bb05c: addu  s3, a0, zero
 	ldloc.1
 	stloc 14
-// 0x010baa18: 0x10baa18: addu  s1, a1, zero
+// 0x010bb060: 0x10bb060: addu  s1, a1, zero
 	ldloc.2
 	stloc 13
-// 0x010baa1c: 0x10baa1c: addu  s6, a2, zero
+// 0x010bb064: 0x10bb064: addu  s6, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010baa20: 0x10baa20: bne   v0, zero, 0x10baa38 addu  s5, a3, zero
+// 0x010bb068: 0x10bb068: bne   v0, zero, 0x10bb080 addu  s5, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 10
-	brtrue L_10baa38
+	brtrue L_10bb080
 // --- basic block ---
-// 0x010baa28: 0x10baa28: lb    v0, 0(a1)
+// 0x010bb070: 0x10bb070: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010baa2c: 0x10baa2c: sll   zero, zero, 0
-// 0x010baa30: 0x10baa30: beq   v0, zero, 0x10bac38 sll   zero, zero, 0
+// 0x010bb074: 0x10bb074: sll   zero, zero, 0
+// 0x010bb078: 0x10bb078: beq   v0, zero, 0x10bb280 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bac38
+	brfalse L_10bb280
 // --- basic block ---
-L_10baa38:
-// 0x010baa38: 0x10baa38: lui   a0, 0xe0000
+L_10bb080:
+// 0x010bb080: 0x10bb080: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010baa3c: 0x10baa3c: addiu a0, a0, -17252
+// 0x010bb084: 0x10bb084: addiu a0, a0, -16788
 	ldloc.1
-	ldc.i4 -17252
+	ldc.i4 -16788
 	add
 	stloc.1
-// 0x010baa40: 0x10baa40: addiu a1, sp, 32
+// 0x010bb088: 0x10bb088: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010baa44: 0x10baa44: jal   0x101358c addiu a2, zero, 1
+// 0x010bb08c: 0x10bb08c: jal   0x101359c addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -4118,35 +4118,35 @@ L_10baa38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_county_by_position_101358c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_county_by_position_101359c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010baa4c: 0x10baa4c: bgtz  v0, 0x10baa64 lui   a0, 0x0
+// 0x010bb094: 0x10bb094: bgtz  v0, 0x10bb0ac lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	bgt L_10baa64
+	bgt L_10bb0ac
 // --- basic block ---
-// 0x010baa54: 0x10baa54: lui   a1, 0x20000
+// 0x010bb09c: 0x10bb09c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010baa58: 0x10baa58: addiu a0, a0, 30152
+// 0x010bb0a0: 0x10bb0a0: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010baa5c: 0x10baa5c: j	 0x10bac20 addiu a1, a1, 21548
+// 0x010bb0a4: 0x10bb0a4: j	 0x10bb268 addiu a1, a1, 22008
 	ldloc.2
-	ldc.i4 21548
+	ldc.i4 22008
 	add
 	stloc.2
-	br L_10bac20
+	br L_10bb268
 // --- basic block ---
-L_10baa64:
-// 0x010baa64: 0x10baa64: lw    a0, 32(sp)
+L_10bb0ac:
+// 0x010bb0ac: 0x10bb0ac: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4155,31 +4155,31 @@ L_10baa64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010baa68: 0x10baa68: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010bb0b0: 0x10bb0b0: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010baa70: 0x10baa70: addu  s0, v0, zero
+// 0x010bb0b8: 0x10bb0b8: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010baa74: 0x10baa74: addiu v0, zero, -1
+// 0x010bb0bc: 0x10bb0bc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010baa78: 0x10baa78: bne   s0, v0, 0x10baab4 lui   a0, 0x10000
+// 0x010bb0c0: 0x10bb0c0: bne   s0, v0, 0x10bb0fc lui   a0, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	bne.un L_10baab4
+	bne.un L_10bb0fc
 // --- basic block ---
-// 0x010baa80: 0x10baa80: lw    a0, 32(sp)
+// 0x010bb0c8: 0x10bb0c8: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4188,11 +4188,11 @@ L_10baa64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010baa84: 0x10baa84: jal   0x10b6a10 sll   zero, zero, 0
-	call int32 Cibyl136::editor_db_create_10b6a10()
+// 0x010bb0cc: 0x10bb0cc: jal   0x10b7058 sll   zero, zero, 0
+	call int32 Cibyl136::editor_db_create_10b7058()
 	stloc 5
 // --- basic block ---
-// 0x010baa8c: 0x10baa8c: lw    a0, 32(sp)
+// 0x010bb0d4: 0x10bb0d4: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4201,45 +4201,45 @@ L_10baa64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010baa90: 0x10baa90: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010bb0d8: 0x10bb0d8: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010baa98: 0x10baa98: bne   v0, s0, 0x10baab0 lui   a1, 0x20000
+// 0x010bb0e0: 0x10bb0e0: bne   v0, s0, 0x10bb0f8 lui   a1, 0x20000
 	ldloc 5
 	ldloc 8
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10baab0
+	bne.un L_10bb0f8
 // --- basic block ---
-// 0x010baaa0: 0x10baaa0: lui   a0, 0x0
+// 0x010bb0e8: 0x10bb0e8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010baaa4: 0x10baaa4: addiu a0, a0, 30152
+// 0x010bb0ec: 0x10bb0ec: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010baaa8: 0x10baaa8: j	 0x10bac20 addiu a1, a1, 21896
+// 0x010bb0f0: 0x10bb0f0: j	 0x10bb268 addiu a1, a1, 22356
 	ldloc.2
-	ldc.i4 21896
+	ldc.i4 22356
 	add
 	stloc.2
-	br L_10bac20
+	br L_10bb268
 // --- basic block ---
-L_10baab0:
-// 0x010baab0: 0x10baab0: lui   a0, 0x10000
+L_10bb0f8:
+// 0x010bb0f8: 0x10bb0f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10baab4:
-// 0x010baab4: 0x10baab4: jal   0x101cd60 addiu a0, a0, -31172
+L_10bb0fc:
+// 0x010bb0fc: 0x10bb0fc: jal   0x101cd70 addiu a0, a0, -31172
 	ldloc.1
 	ldc.i4 -31172
 	add
@@ -4249,42 +4249,42 @@ L_10baab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010baabc: 0x10baabc: addiu s0, sp, 36
+// 0x010bb104: 0x10bb104: addiu s0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-// 0x010baac0: 0x10baac0: lui   s4, 0x20000
+// 0x010bb108: 0x10bb108: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x010baac4: 0x10baac4: lui   s2, 0x10000
+// 0x010bb10c: 0x10bb10c: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010baac8: 0x10baac8: addu  a3, v0, zero
+// 0x010bb110: 0x10bb110: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010baacc: 0x10baacc: addiu a1, zero, 500
+// 0x010bb114: 0x10bb114: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010baad0: 0x10baad0: addiu a2, s4, 21588
+// 0x010bb118: 0x10bb118: addiu a2, s4, 22048
 	ldloc 12
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010baad4: 0x10baad4: addiu s2, s2, 19160
+// 0x010bb11c: 0x10bb11c: addiu s2, s2, 18632
 	ldloc 9
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 9
-// 0x010baad8: 0x10baad8: addu  a0, s0, zero
+// 0x010bb120: 0x10bb120: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010baadc: 0x10baadc: sw    s5, 16(sp)
+// 0x010bb124: 0x10bb124: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4293,7 +4293,7 @@ L_10baab4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010baae0: 0x10baae0: jal   0x1000f9c sw    s2, 20(sp)
+// 0x010bb128: 0x10bb128: jal   0x1000f9c sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4312,7 +4312,7 @@ L_10baab4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010baae8: 0x10baae8: jal   0x1001b48 addu  a0, s0, zero
+// 0x010bb130: 0x10bb130: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4321,18 +4321,18 @@ L_10baab4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010baaf0: 0x10baaf0: lui   a0, 0x10000
+// 0x010bb138: 0x10bb138: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010baaf4: 0x10baaf4: addiu a0, a0, -28756
+// 0x010bb13c: 0x10bb13c: addiu a0, a0, -28756
 	ldloc.1
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010baaf8: 0x10baaf8: addu  s7, v0, zero
+// 0x010bb140: 0x10bb140: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010baafc: 0x10baafc: jal   0x101cd60 addiu s5, zero, 500
+// 0x010bb144: 0x10bb144: jal   0x101cd70 addiu s5, zero, 500
 	ldc.i4 500
 	stloc 10
 	ldloc.0
@@ -4340,30 +4340,30 @@ L_10baab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bab04: 0x10bab04: addu  a3, v0, zero
+// 0x010bb14c: 0x10bb14c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010bab08: 0x10bab08: subu  a1, s5, s7
+// 0x010bb150: 0x10bb150: subu  a1, s5, s7
 	ldloc 10
 	ldloc 15
 	sub
 	stloc.2
-// 0x010bab0c: 0x10bab0c: addu  a0, s0, s7
+// 0x010bb154: 0x10bb154: addu  a0, s0, s7
 	ldloc 8
 	ldloc 15
 	add
 	stloc.1
-// 0x010bab10: 0x10bab10: addiu a2, s4, 21588
+// 0x010bb158: 0x10bb158: addiu a2, s4, 22048
 	ldloc 12
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010bab14: 0x10bab14: sw    s6, 16(sp)
+// 0x010bb15c: 0x10bb15c: sw    s6, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4372,7 +4372,7 @@ L_10baab4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bab18: 0x10bab18: jal   0x1000f9c sw    s2, 20(sp)
+// 0x010bb160: 0x10bb160: jal   0x1000f9c sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4391,16 +4391,16 @@ L_10baab4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bab20: 0x10bab20: lb    v0, 0(s3)
+// 0x010bb168: 0x10bb168: lb    v0, 0(s3)
 	ldloc 14
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bab24: 0x10bab24: sll   zero, zero, 0
-// 0x010bab28: 0x10bab28: beq   v0, zero, 0x10bab64 sll   zero, zero, 0
+// 0x010bb16c: 0x10bb16c: sll   zero, zero, 0
+// 0x010bb170: 0x10bb170: beq   v0, zero, 0x10bb1ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bab64
+	brfalse L_10bb1ac
 // --- basic block ---
-// 0x010bab30: 0x10bab30: jal   0x1001b48 addu  a0, s0, zero
+// 0x010bb178: 0x10bb178: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4409,15 +4409,15 @@ L_10baab4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bab38: 0x10bab38: lui   a0, 0x20000
+// 0x010bb180: 0x10bb180: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bab3c: 0x10bab3c: addiu a0, a0, 21916
+// 0x010bb184: 0x10bb184: addiu a0, a0, 22376
 	ldloc.1
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.1
-// 0x010bab40: 0x10bab40: jal   0x101cd60 addu  s6, v0, zero
+// 0x010bb188: 0x10bb188: jal   0x101cd70 addu  s6, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4425,30 +4425,30 @@ L_10baab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bab48: 0x10bab48: addu  a3, v0, zero
+// 0x010bb190: 0x10bb190: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010bab4c: 0x10bab4c: subu  a1, s5, s6
+// 0x010bb194: 0x10bb194: subu  a1, s5, s6
 	ldloc 10
 	ldloc 11
 	sub
 	stloc.2
-// 0x010bab50: 0x10bab50: addu  a0, s0, s6
+// 0x010bb198: 0x10bb198: addu  a0, s0, s6
 	ldloc 8
 	ldloc 11
 	add
 	stloc.1
-// 0x010bab54: 0x10bab54: addiu a2, s4, 21588
+// 0x010bb19c: 0x10bb19c: addiu a2, s4, 22048
 	ldloc 12
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010bab58: 0x10bab58: sw    s3, 16(sp)
+// 0x010bb1a0: 0x10bb1a0: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4457,7 +4457,7 @@ L_10baab4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bab5c: 0x10bab5c: jal   0x1000f9c sw    s2, 20(sp)
+// 0x010bb1a4: 0x10bb1a4: jal   0x1000f9c sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4476,24 +4476,24 @@ L_10baab4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bab64:
-// 0x010bab64: 0x10bab64: lb    v0, 0(s1)
+L_10bb1ac:
+// 0x010bb1ac: 0x10bb1ac: lb    v0, 0(s1)
 	ldloc 13
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bab68: 0x10bab68: sll   zero, zero, 0
-// 0x010bab6c: 0x10bab6c: beq   v0, zero, 0x10babc0 lui   v0, 0xe0000
+// 0x010bb1b0: 0x10bb1b0: sll   zero, zero, 0
+// 0x010bb1b4: 0x10bb1b4: beq   v0, zero, 0x10bb208 lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brfalse L_10babc0
+	brfalse L_10bb208
 // --- basic block ---
-// 0x010bab74: 0x10bab74: addiu s2, sp, 36
+// 0x010bb1bc: 0x10bb1bc: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 9
-// 0x010bab78: 0x10bab78: jal   0x1001b48 addu  a0, s2, zero
+// 0x010bb1c0: 0x10bb1c0: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -4502,15 +4502,15 @@ L_10bab64:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bab80: 0x10bab80: lui   a0, 0x20000
+// 0x010bb1c8: 0x10bb1c8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bab84: 0x10bab84: addiu a0, a0, 21928
+// 0x010bb1cc: 0x10bb1cc: addiu a0, a0, 22388
 	ldloc.1
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.1
-// 0x010bab88: 0x10bab88: jal   0x101cd60 addu  s0, v0, zero
+// 0x010bb1d0: 0x10bb1d0: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4518,44 +4518,44 @@ L_10bab64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bab90: 0x10bab90: addu  a3, v0, zero
+// 0x010bb1d8: 0x10bb1d8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010bab94: 0x10bab94: addiu a1, zero, 500
+// 0x010bb1dc: 0x10bb1dc: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010bab98: 0x10bab98: lui   a2, 0x20000
+// 0x010bb1e0: 0x10bb1e0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bab9c: 0x10bab9c: lui   v0, 0x10000
+// 0x010bb1e4: 0x10bb1e4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010baba0: 0x10baba0: addiu v0, v0, 19160
+// 0x010bb1e8: 0x10bb1e8: addiu v0, v0, 18632
 	ldloc 5
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 5
-// 0x010baba4: 0x10baba4: subu  a1, a1, s0
+// 0x010bb1ec: 0x10bb1ec: subu  a1, a1, s0
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x010baba8: 0x10baba8: addu  a0, s2, s0
+// 0x010bb1f0: 0x10bb1f0: addu  a0, s2, s0
 	ldloc 9
 	ldloc 8
 	add
 	stloc.1
-// 0x010babac: 0x10babac: addiu a2, a2, 21588
+// 0x010bb1f4: 0x10bb1f4: addiu a2, a2, 22048
 	ldloc.3
-	ldc.i4 21588
+	ldc.i4 22048
 	add
 	stloc.3
-// 0x010babb0: 0x10babb0: sw    s1, 16(sp)
+// 0x010bb1f8: 0x10bb1f8: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4564,7 +4564,7 @@ L_10bab64:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010babb4: 0x10babb4: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010bb1fc: 0x10bb1fc: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4583,16 +4583,16 @@ L_10bab64:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010babbc: 0x10babbc: lui   v0, 0xe0000
+// 0x010bb204: 0x10bb204: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_10babc0:
-// 0x010babc0: 0x10babc0: addiu v1, v0, -17252
+L_10bb208:
+// 0x010bb208: 0x10bb208: addiu v1, v0, -16788
 	ldloc 5
-	ldc.i4 -17252
+	ldc.i4 -16788
 	add
 	stloc 7
-// 0x010babc4: 0x10babc4: lw    a1, 4(v1)
+// 0x010bb20c: 0x10bb20c: lw    a1, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4601,48 +4601,48 @@ L_10babc0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010babc8: 0x10babc8: lui   v1, 0xe0000
+// 0x010bb210: 0x10bb210: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010babcc: 0x10babcc: lw    a2, -17256(v1)
+// 0x010bb214: 0x10bb214: lw    a2, -16792(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4314
+	ldc.i4 -4198
 	add
 	ldelem.i4
 	stloc.3
-// 0x010babd0: 0x10babd0: lw    a0, -17252(v0)
+// 0x010bb218: 0x10bb218: lw    a0, -16788(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4313
+	ldc.i4 -4197
 	add
 	ldelem.i4
 	stloc.1
-// 0x010babd4: 0x10babd4: addu  a3, zero, zero
+// 0x010bb21c: 0x10bb21c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010babd8: 0x10babd8: cibyl_sysc_arg 0x7
+// 0x010bb220: 0x10bb220: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x010babdc: 0x10babdc: cibyl_sysc 0x23be
+// 0x010bb224: 0x10bb224: cibyl_sysc 0x23be
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010babe0: 0x10babe0: addu  a3, v0, zero
+// 0x010bb228: 0x10bb228: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010babe4: 0x10babe4: lui   v0, 0xe0000
+// 0x010bb22c: 0x10bb22c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010babe8: 0x10babe8: lbu   v0, -17241(v0)
+// 0x010bb230: 0x10bb230: lbu   v0, -16777(v0)
 	ldloc 5
-	ldc.i4 -17241
+	ldc.i4 -16777
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010babec: 0x10babec: sw    zero, 28(sp)
+// 0x010bb234: 0x10bb234: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4651,7 +4651,7 @@ L_10babc0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010babf0: 0x10babf0: sw    v0, 16(sp)
+// 0x010bb238: 0x10bb238: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4660,10 +4660,10 @@ L_10babc0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010babf4: 0x10babf4: addiu v0, zero, 2
+// 0x010bb23c: 0x10bb23c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010babf8: 0x10babf8: sw    v0, 20(sp)
+// 0x010bb240: 0x10bb240: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4672,12 +4672,12 @@ L_10babc0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010babfc: 0x10babfc: addiu v0, sp, 36
+// 0x010bb244: 0x10bb244: addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-// 0x010bac00: 0x10bac00: jal   0x10b4224 sw    v0, 24(sp)
+// 0x010bb248: 0x10bb248: jal   0x10b486c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4691,64 +4691,64 @@ L_10babc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_add_10b4224(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_add_10b486c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bac08: 0x10bac08: addiu v1, zero, -1
+// 0x010bb250: 0x10bb250: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010bac0c: 0x10bac0c: bne   v0, v1, 0x10bac30 lui   a0, 0x0
+// 0x010bb254: 0x10bb254: bne   v0, v1, 0x10bb278 lui   a0, 0x0
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10bac30
+	bne.un L_10bb278
 // --- basic block ---
-// 0x010bac14: 0x10bac14: lui   a1, 0x20000
+// 0x010bb25c: 0x10bb25c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bac18: 0x10bac18: addiu a0, a0, 30152
+// 0x010bb260: 0x10bb260: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010bac1c: 0x10bac1c: addiu a1, a1, 21656
+// 0x010bb264: 0x10bb264: addiu a1, a1, 22116
 	ldloc.2
-	ldc.i4 21656
+	ldc.i4 22116
 	add
 	stloc.2
-L_10bac20:
-// 0x010bac20: 0x10bac20: jal   0x104c148 sll   zero, zero, 0
+L_10bb268:
+// 0x010bb268: 0x10bb268: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bac28: 0x10bac28: j	 0x10bac38 sll   zero, zero, 0
-	br L_10bac38
+// 0x010bb270: 0x10bb270: j	 0x10bb280 sll   zero, zero, 0
+	br L_10bb280
 // --- basic block ---
-L_10bac30:
-// 0x010bac30: 0x10bac30: jal   0x10bd094 sll   zero, zero, 0
+L_10bb278:
+// 0x010bb278: 0x10bb278: jal   0x10bd6dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_report_markers_10bd094(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_report_markers_10bd6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bac38:
-// 0x010bac38: 0x10bac38: lw    ra, 572(sp)
-// 0x010bac3c: 0x10bac3c: lw    s7, 568(sp)
+L_10bb280:
+// 0x010bb280: 0x10bb280: lw    ra, 572(sp)
+// 0x010bb284: 0x10bb284: lw    s7, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4757,7 +4757,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bac40: 0x10bac40: lw    s6, 564(sp)
+// 0x010bb288: 0x10bb288: lw    s6, 564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4766,7 +4766,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bac44: 0x10bac44: lw    s5, 560(sp)
+// 0x010bb28c: 0x10bb28c: lw    s5, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4775,7 +4775,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bac48: 0x10bac48: lw    s4, 556(sp)
+// 0x010bb290: 0x10bb290: lw    s4, 556(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4784,7 +4784,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bac4c: 0x10bac4c: lw    s3, 552(sp)
+// 0x010bb294: 0x10bb294: lw    s3, 552(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4793,7 +4793,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bac50: 0x10bac50: lw    s2, 548(sp)
+// 0x010bb298: 0x10bb298: lw    s2, 548(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4802,7 +4802,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bac54: 0x10bac54: lw    s1, 544(sp)
+// 0x010bb29c: 0x10bb29c: lw    s1, 544(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4811,7 +4811,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bac58: 0x10bac58: lw    s0, 540(sp)
+// 0x010bb2a0: 0x10bb2a0: lw    s0, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4820,7 +4820,7 @@ L_10bac38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bac5c: 0x10bac5c: jr    ra addiu sp, sp, 576
+// 0x010bb2a4: 0x10bb2a4: jr    ra addiu sp, sp, 576
 	ldloc.0
 	ldc.i4 576
 	add
@@ -4832,7 +4832,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 button_callback_10bac64(int32,int32,int32,int32,int32)
+.method public static int32 button_callback_10bb2ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -4876,12 +4876,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bac64: 0x10bac64: addiu sp, sp, -48
+// 0x010bb2ac: 0x10bb2ac: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010bac68: 0x10bac68: sw    s1, 36(sp)
+// 0x010bb2b0: 0x10bb2b0: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4890,7 +4890,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bac6c: 0x10bac6c: lw    s1, 16(a0)
+// 0x010bb2b4: 0x10bb2b4: lw    s1, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4899,10 +4899,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bac70: 0x10bac70: lui   a1, 0x10000
+// 0x010bb2b8: 0x10bb2b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bac74: 0x10bac74: sw    s0, 32(sp)
+// 0x010bb2bc: 0x10bb2bc: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4911,19 +4911,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bac78: 0x10bac78: addiu a1, a1, 12704
+// 0x010bb2c0: 0x10bb2c0: addiu a1, a1, 12700
 	ldloc.2
-	ldc.i4 12704
+	ldc.i4 12700
 	add
 	stloc.2
-// 0x010bac7c: 0x10bac7c: addu  s0, a0, zero
+// 0x010bb2c4: 0x10bb2c4: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010bac80: 0x10bac80: addu  a0, s1, zero
+// 0x010bb2c8: 0x10bb2c8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bac84: 0x10bac84: sw    ra, 44(sp)
-// 0x010bac88: 0x10bac88: jal   0x1001b14 sw    s2, 40(sp)
+// 0x010bb2cc: 0x10bb2cc: sw    ra, 44(sp)
+// 0x010bb2d0: 0x10bb2d0: jal   0x1001b14 sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4937,13 +4937,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010bac90: 0x10bac90: bne   v0, zero, 0x10bacf4 lui   a1, 0x20000
+// 0x010bb2d8: 0x10bb2d8: bne   v0, zero, 0x10bb33c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10bacf4
+	brtrue L_10bb33c
 // --- basic block ---
-// 0x010bac98: 0x10bac98: lw    a0, 4(s0)
+// 0x010bb2e0: 0x10bb2e0: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4952,9 +4952,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bac9c: 0x10bac9c: jal   0x109b634 addiu a1, a1, 21916
+// 0x010bb2e4: 0x10bb2e4: jal   0x109bc7c addiu a1, a1, 22376
 	ldloc.2
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.2
 	ldloc.0
@@ -4962,12 +4962,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010baca4: 0x10baca4: lw    a0, 4(s0)
+// 0x010bb2ec: 0x10bb2ec: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4976,15 +4976,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010baca8: 0x10baca8: lui   a1, 0x20000
+// 0x010bb2f0: 0x10bb2f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bacac: 0x10bacac: addiu a1, a1, 21928
+// 0x010bb2f4: 0x10bb2f4: addiu a1, a1, 22388
 	ldloc.2
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.2
-// 0x010bacb0: 0x10bacb0: jal   0x109b634 addu  s1, v0, zero
+// 0x010bb2f8: 0x10bb2f8: jal   0x109bc7c addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4992,20 +4992,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bacb8: 0x10bacb8: lui   a0, 0x10000
+// 0x010bb300: 0x10bb300: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bacbc: 0x10bacbc: addiu a0, a0, -28756
+// 0x010bb304: 0x10bb304: addiu a0, a0, -28756
 	ldloc.1
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010bacc0: 0x10bacc0: jal   0x10947dc sw    v0, 28(sp)
+// 0x010bb308: 0x10bb308: jal   0x1094e00 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5019,20 +5019,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bacc8: 0x10bacc8: lui   a0, 0x10000
+// 0x010bb310: 0x10bb310: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010baccc: 0x10baccc: addiu a0, a0, -31172
+// 0x010bb314: 0x10bb314: addiu a0, a0, -31172
 	ldloc.1
 	ldc.i4 -31172
 	add
 	stloc.1
-// 0x010bacd0: 0x10bacd0: jal   0x10947dc sw    v0, 24(sp)
+// 0x010bb318: 0x10bb318: jal   0x1094e00 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5046,12 +5046,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bacd8: 0x10bacd8: lw    a1, 28(sp)
+// 0x010bb320: 0x10bb320: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5060,7 +5060,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bacdc: 0x10bacdc: lw    a2, 24(sp)
+// 0x010bb324: 0x10bb324: lw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5069,10 +5069,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bace0: 0x10bace0: addu  a0, s1, zero
+// 0x010bb328: 0x10bb328: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bace4: 0x10bace4: jal   0x10ba9e8 addu  a3, v0, zero
+// 0x010bb32c: 0x10bb32c: jal   0x10bb030 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -5080,26 +5080,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::update_range_10ba9e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::update_range_10bb030(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bacec: 0x10bacec: j	 0x10bad10 addiu a0, zero, 2
+// 0x010bb334: 0x10bb334: j	 0x10bb358 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-	br L_10bad10
+	br L_10bb358
 // --- basic block ---
-L_10bacf4:
-// 0x010bacf4: 0x10bacf4: lui   a1, 0x10000
+L_10bb33c:
+// 0x010bb33c: 0x10bb33c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bacf8: 0x10bacf8: addiu a1, a1, 844
+// 0x010bb340: 0x10bb340: addiu a1, a1, 840
 	ldloc.2
-	ldc.i4 844
+	ldc.i4 840
 	add
 	stloc.2
-// 0x010bacfc: 0x10bacfc: jal   0x1001b14 addu  a0, s1, zero
+// 0x010bb344: 0x10bb344: jal   0x1001b14 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5107,37 +5107,37 @@ L_10bacf4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010bad04: 0x10bad04: bne   v0, zero, 0x10bad20 lui   a1, 0x20000
+// 0x010bb34c: 0x10bb34c: bne   v0, zero, 0x10bb368 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10bad20
+	brtrue L_10bb368
 // --- basic block ---
-// 0x010bad0c: 0x10bad0c: addu  a0, zero, zero
+// 0x010bb354: 0x10bb354: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_10bad10:
-// 0x010bad10: 0x10bad10: jal   0x1094b64 sll   zero, zero, 0
+L_10bb358:
+// 0x010bb358: 0x10bb358: jal   0x10951ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bad18: 0x10bad18: j	 0x10bad90 sll   zero, zero, 0
-	br L_10bad90
+// 0x010bb360: 0x10bb360: j	 0x10bb3d8 sll   zero, zero, 0
+	br L_10bb3d8
 // --- basic block ---
-L_10bad20:
-// 0x010bad20: 0x10bad20: addu  a0, s1, zero
+L_10bb368:
+// 0x010bb368: 0x10bb368: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bad24: 0x10bad24: jal   0x1001b14 addiu a1, a1, 21944
+// 0x010bb36c: 0x10bb36c: jal   0x1001b14 addiu a1, a1, 22404
 	ldloc.2
-	ldc.i4 21944
+	ldc.i4 22404
 	add
 	stloc.2
 	ldloc.1
@@ -5145,18 +5145,18 @@ L_10bad20:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010bad2c: 0x10bad2c: bne   v0, zero, 0x10bad50 lui   s2, 0x20000
+// 0x010bb374: 0x10bb374: bne   v0, zero, 0x10bb398 lui   s2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 10
-	brtrue L_10bad50
+	brtrue L_10bb398
 // --- basic block ---
-// 0x010bad34: 0x10bad34: lui   s2, 0x20000
+// 0x010bb37c: 0x10bb37c: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010bad38: 0x10bad38: jal   0x101cd60 addiu a0, s2, 21916
+// 0x010bb380: 0x10bb380: jal   0x101cd70 addiu a0, s2, 22376
 	ldloc 10
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.1
 	ldloc.0
@@ -5164,15 +5164,15 @@ L_10bad20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bad40: 0x10bad40: addu  s1, v0, zero
+// 0x010bb388: 0x10bb388: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010bad44: 0x10bad44: lw    a0, 4(s0)
+// 0x010bb38c: 0x10bb38c: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5181,17 +5181,17 @@ L_10bad20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bad48: 0x10bad48: j	 0x10bad64 addiu a1, s2, 21916
+// 0x010bb390: 0x10bb390: j	 0x10bb3ac addiu a1, s2, 22376
 	ldloc 10
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.2
-	br L_10bad64
+	br L_10bb3ac
 // --- basic block ---
-L_10bad50:
-// 0x010bad50: 0x10bad50: jal   0x101cd60 addiu a0, s2, 21928
+L_10bb398:
+// 0x010bb398: 0x10bb398: jal   0x101cd70 addiu a0, s2, 22388
 	ldloc 10
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.1
 	ldloc.0
@@ -5199,12 +5199,12 @@ L_10bad50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bad58: 0x10bad58: lw    a0, 4(s0)
+// 0x010bb3a0: 0x10bb3a0: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5213,52 +5213,52 @@ L_10bad50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bad5c: 0x10bad5c: addu  s1, v0, zero
+// 0x010bb3a4: 0x10bb3a4: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010bad60: 0x10bad60: addiu a1, s2, 21928
+// 0x010bb3a8: 0x10bb3a8: addiu a1, s2, 22388
 	ldloc 10
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.2
-L_10bad64:
-// 0x010bad64: 0x10bad64: jal   0x109b634 sll   zero, zero, 0
+L_10bb3ac:
+// 0x010bb3ac: 0x10bb3ac: jal   0x109bc7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bad6c: 0x10bad6c: lui   a1, 0x10000
+// 0x010bb3b4: 0x10bb3b4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bad70: 0x10bad70: lui   a2, 0x10c0000
+// 0x010bb3b8: 0x10bb3b8: lui   a2, 0x10c0000
 	ldc.i4 17563648
 	stloc.3
-// 0x010bad74: 0x10bad74: addiu v0, zero, 9
+// 0x010bb3bc: 0x10bb3bc: addiu v0, zero, 9
 	ldc.i4.s 9
 	stloc 5
-// 0x010bad78: 0x10bad78: addu  a0, s1, zero
+// 0x010bb3c0: 0x10bb3c0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bad7c: 0x10bad7c: addiu a1, a1, 18500
+// 0x010bb3c4: 0x10bb3c4: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010bad80: 0x10bad80: addiu a2, a2, -20936
+// 0x010bb3c8: 0x10bb3c8: addiu a2, a2, -19328
 	ldloc.3
-	ldc.i4 -20936
+	ldc.i4 -19328
 	add
 	stloc.3
-// 0x010bad84: 0x10bad84: addu  a3, s0, zero
+// 0x010bb3cc: 0x10bb3cc: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x010bad88: 0x10bad88: jal   0x1052e08 sw    v0, 16(sp)
+// 0x010bb3d0: 0x10bb3d0: jal   0x1052e18 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5272,17 +5272,17 @@ L_10bad64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bad90:
-// 0x010bad90: 0x10bad90: lw    ra, 44(sp)
-// 0x010bad94: 0x10bad94: addiu v0, zero, 1
+L_10bb3d8:
+// 0x010bb3d8: 0x10bb3d8: lw    ra, 44(sp)
+// 0x010bb3dc: 0x10bb3dc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010bad98: 0x10bad98: lw    s2, 40(sp)
+// 0x010bb3e0: 0x10bb3e0: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ L_10bad90:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bad9c: 0x10bad9c: lw    s1, 36(sp)
+// 0x010bb3e4: 0x10bb3e4: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5300,7 +5300,7 @@ L_10bad90:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bada0: 0x10bada0: lw    s0, 32(sp)
+// 0x010bb3e8: 0x10bb3e8: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5309,7 +5309,7 @@ L_10bad90:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bada4: 0x10bada4: jr    ra addiu sp, sp, 48
+// 0x010bb3ec: 0x10bb3ec: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5321,7 +5321,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 keyboard_callback_10bae38(int32,int32,int32,int32,int32)
+.method public static int32 keyboard_callback_10bb480(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -5359,15 +5359,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bae38: 0x10bae38: addiu sp, sp, -32
+// 0x010bb480: 0x10bb480: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010bae3c: 0x10bae3c: addiu v0, zero, 1
+// 0x010bb484: 0x10bb484: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010bae40: 0x10bae40: sw    s0, 24(sp)
+// 0x010bb488: 0x10bb488: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5376,15 +5376,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bae44: 0x10bae44: sw    ra, 28(sp)
-// 0x010bae48: 0x10bae48: bne   a0, v0, 0x10bae98 addu  s0, a1, zero
+// 0x010bb48c: 0x10bb48c: sw    ra, 28(sp)
+// 0x010bb490: 0x10bb490: bne   a0, v0, 0x10bb4e0 addu  s0, a1, zero
 	ldloc.1
 	ldloc 6
 	ldloc.2
 	stloc 7
-	bne.un L_10bae98
+	bne.un L_10bb4e0
 // --- basic block ---
-// 0x010bae50: 0x10bae50: lw    a0, 16(a2)
+// 0x010bb498: 0x10bb498: lw    a0, 16(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5393,15 +5393,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bae54: 0x10bae54: lui   a1, 0x20000
+// 0x010bb49c: 0x10bb49c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bae58: 0x10bae58: addiu a1, a1, 21944
+// 0x010bb4a0: 0x10bb4a0: addiu a1, a1, 22404
 	ldloc.2
-	ldc.i4 21944
+	ldc.i4 22404
 	add
 	stloc.2
-// 0x010bae5c: 0x10bae5c: jal   0x1001b14 sw    a2, 16(sp)
+// 0x010bb4a4: 0x10bb4a4: jal   0x1001b14 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5415,7 +5415,7 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010bae64: 0x10bae64: lw    a2, 16(sp)
+// 0x010bb4ac: 0x10bb4ac: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5424,8 +5424,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bae68: 0x10bae68: sll   zero, zero, 0
-// 0x010bae6c: 0x10bae6c: lw    a0, 4(a2)
+// 0x010bb4b0: 0x10bb4b0: sll   zero, zero, 0
+// 0x010bb4b4: 0x10bb4b4: lw    a0, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5434,30 +5434,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bae70: 0x10bae70: bne   v0, zero, 0x10bae80 lui   a1, 0x20000
+// 0x010bb4b8: 0x10bb4b8: bne   v0, zero, 0x10bb4c8 lui   a1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	brtrue L_10bae80
+	brtrue L_10bb4c8
 // --- basic block ---
-// 0x010bae78: 0x10bae78: j	 0x10bae88 addiu a1, a1, 21916
+// 0x010bb4c0: 0x10bb4c0: j	 0x10bb4d0 addiu a1, a1, 22376
 	ldloc.2
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.2
-	br L_10bae88
+	br L_10bb4d0
 // --- basic block ---
-L_10bae80:
-// 0x010bae80: 0x10bae80: lui   a1, 0x20000
+L_10bb4c8:
+// 0x010bb4c8: 0x10bb4c8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bae84: 0x10bae84: addiu a1, a1, 21928
+// 0x010bb4cc: 0x10bb4cc: addiu a1, a1, 22388
 	ldloc.2
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.2
-L_10bae88:
-// 0x010bae88: 0x10bae88: jal   0x109b3e0 addu  a2, s0, zero
+L_10bb4d0:
+// 0x010bb4d0: 0x10bb4d0: jal   0x109ba28 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -5465,28 +5465,28 @@ L_10bae88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bae90: 0x10bae90: jal   0x1021900 sll   zero, zero, 0
+// 0x010bb4d8: 0x10bb4d8: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10bae98:
-// 0x010bae98: 0x10bae98: lw    ra, 28(sp)
-// 0x010bae9c: 0x10bae9c: addiu v0, zero, 1
+L_10bb4e0:
+// 0x010bb4e0: 0x10bb4e0: lw    ra, 28(sp)
+// 0x010bb4e4: 0x10bb4e4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010baea0: 0x10baea0: lw    s0, 24(sp)
+// 0x010bb4e8: 0x10bb4e8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5495,7 +5495,7 @@ L_10bae98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010baea4: 0x10baea4: jr    ra addiu sp, sp, 32
+// 0x010bb4ec: 0x10bb4ec: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5507,7 +5507,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 update_range_dialog_10baeac(int32,int32,int32,int32,int32)
+.method public static int32 update_range_dialog_10bb4f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s7,int32 s6,int32 s8,int32 t0,int32 lo,int32 ra)
@@ -5575,13 +5575,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10baeac:
-// 0x010baeac: 0x10baeac: addiu sp, sp, -320
+L_10bb4f4:
+// 0x010bb4f4: 0x10bb4f4: addiu sp, sp, -320
 	ldloc.0
 	ldc.i4 -320
 	add
 	stloc.0
-// 0x010baeb0: 0x10baeb0: sw    s1, 284(sp)
+// 0x010bb4f8: 0x10bb4f8: sw    s1, 284(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5590,7 +5590,7 @@ L_10baeac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010baeb4: 0x10baeb4: sw    s0, 280(sp)
+// 0x010bb4fc: 0x10bb4fc: sw    s0, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5599,29 +5599,29 @@ L_10baeac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010baeb8: 0x10baeb8: lui   s1, 0xe0000
+// 0x010bb500: 0x10bb500: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x010baebc: 0x10baebc: addiu s0, sp, 68
+// 0x010bb504: 0x10bb504: addiu s0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 8
-// 0x010baec0: 0x10baec0: addiu a0, s1, -17272
+// 0x010bb508: 0x10bb508: addiu a0, s1, -16808
 	ldloc 9
-	ldc.i4 -17272
+	ldc.i4 -16808
 	add
 	stloc.1
-// 0x010baec4: 0x10baec4: addu  a1, s0, zero
+// 0x010bb50c: 0x10bb50c: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010baec8: 0x10baec8: addiu a2, sp, 24
+// 0x010bb510: 0x10bb510: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010baecc: 0x10baecc: sw    ra, 316(sp)
-// 0x010baed0: 0x10baed0: sw    s8, 312(sp)
+// 0x010bb514: 0x10bb514: sw    ra, 316(sp)
+// 0x010bb518: 0x10bb518: sw    s8, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5630,7 +5630,7 @@ L_10baeac:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010baed4: 0x10baed4: sw    s7, 308(sp)
+// 0x010bb51c: 0x10bb51c: sw    s7, 308(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5639,7 +5639,7 @@ L_10baeac:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010baed8: 0x10baed8: sw    s6, 304(sp)
+// 0x010bb520: 0x10bb520: sw    s6, 304(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5648,7 +5648,7 @@ L_10baeac:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010baedc: 0x10baedc: sw    s5, 300(sp)
+// 0x010bb524: 0x10bb524: sw    s5, 300(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ L_10baeac:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010baee0: 0x10baee0: sw    s4, 296(sp)
+// 0x010bb528: 0x10bb528: sw    s4, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5666,7 +5666,7 @@ L_10baeac:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010baee4: 0x10baee4: sw    s3, 292(sp)
+// 0x010bb52c: 0x10bb52c: sw    s3, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5675,7 +5675,7 @@ L_10baeac:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010baee8: 0x10baee8: jal   0x1029da8 sw    s2, 288(sp)
+// 0x010bb530: 0x10bb530: jal   0x1029db8 sw    s2, 288(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5689,43 +5689,43 @@ L_10baeac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010baef0: 0x10baef0: addiu v1, zero, -1
+// 0x010bb538: 0x10bb538: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010baef4: 0x10baef4: bne   v0, v1, 0x10baf0c lui   a0, 0x0
+// 0x010bb53c: 0x10bb53c: bne   v0, v1, 0x10bb554 lui   a0, 0x0
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10baf0c
+	bne.un L_10bb554
 // --- basic block ---
-// 0x010baefc: 0x10baefc: lui   a1, 0x10000
+// 0x010bb544: 0x10bb544: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010baf00: 0x10baf00: addiu a0, a0, 30152
+// 0x010bb548: 0x10bb548: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010baf04: 0x10baf04: j	 0x10baf4c addiu a1, a1, -14372
+// 0x010bb54c: 0x10bb54c: j	 0x10bb594 addiu a1, a1, -14376
 	ldloc.2
-	ldc.i4 -14372
+	ldc.i4 -14376
 	add
 	stloc.2
-	br L_10baf4c
+	br L_10bb594
 // --- basic block ---
-L_10baf0c:
-// 0x010baf0c: 0x10baf0c: addiu a1, sp, 52
+L_10bb554:
+// 0x010bb554: 0x10bb554: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010baf10: 0x10baf10: jal   0x1014dd8 addu  a0, s0, zero
+// 0x010bb558: 0x10bb558: jal   0x1014de8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5733,15 +5733,15 @@ L_10baf0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010baf18: 0x10baf18: addu  a0, s0, zero
+// 0x010bb560: 0x10bb560: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010baf1c: 0x10baf1c: jal   0x1014ccc addiu a1, sp, 60
+// 0x010bb564: 0x10bb564: jal   0x1014cdc addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
@@ -5751,20 +5751,20 @@ L_10baf0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010baf24: 0x10baf24: addiu a0, s1, -17272
+// 0x010bb56c: 0x10bb56c: addiu a0, s1, -16808
 	ldloc 9
-	ldc.i4 -17272
+	ldc.i4 -16808
 	add
 	stloc.1
-// 0x010baf28: 0x10baf28: addu  a1, s0, zero
+// 0x010bb570: 0x10bb570: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010baf2c: 0x10baf2c: jal   0x1015394 addiu a2, sp, 112
+// 0x010bb574: 0x10bb574: jal   0x10153a4 addiu a2, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -5774,50 +5774,50 @@ L_10baf0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_distance_1015394(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_distance_10153a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010baf34: 0x10baf34: bne   v0, zero, 0x10baf5c lui   v0, 0xe0000
+// 0x010bb57c: 0x10bb57c: bne   v0, zero, 0x10bb5a4 lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brtrue L_10baf5c
+	brtrue L_10bb5a4
 // --- basic block ---
-// 0x010baf3c: 0x10baf3c: lui   a0, 0x0
+// 0x010bb584: 0x10bb584: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010baf40: 0x10baf40: lui   a1, 0x20000
+// 0x010bb588: 0x10bb588: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010baf44: 0x10baf44: addiu a0, a0, 30152
+// 0x010bb58c: 0x10bb58c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010baf48: 0x10baf48: addiu a1, a1, 21956
+// 0x010bb590: 0x10bb590: addiu a1, a1, 22416
 	ldloc.2
-	ldc.i4 21956
+	ldc.i4 22416
 	add
 	stloc.2
-L_10baf4c:
-// 0x010baf4c: 0x10baf4c: jal   0x104c148 sll   zero, zero, 0
+L_10bb594:
+// 0x010bb594: 0x10bb594: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010baf54: 0x10baf54: j	 0x10bb6c8 sll   zero, zero, 0
-	br L_10bb6c8
+// 0x010bb59c: 0x10bb59c: j	 0x10bbd10 sll   zero, zero, 0
+	br L_10bbd10
 // --- basic block ---
-L_10baf5c:
-// 0x010baf5c: 0x10baf5c: lw    a2, 156(sp)
+L_10bb5a4:
+// 0x010bb5a4: 0x10bb5a4: lw    a2, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5826,15 +5826,15 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010baf60: 0x10baf60: addiu v1, v0, -17252
+// 0x010bb5a8: 0x10bb5a8: addiu v1, v0, -16788
 	ldloc 5
-	ldc.i4 -17252
+	ldc.i4 -16788
 	add
 	stloc 6
-// 0x010baf64: 0x10baf64: lui   s0, 0x10000
+// 0x010bb5ac: 0x10bb5ac: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010baf68: 0x10baf68: sw    a2, 4(v1)
+// 0x010bb5b0: 0x10bb5b0: sw    a2, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5843,7 +5843,7 @@ L_10baf5c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010baf6c: 0x10baf6c: lw    v1, 152(sp)
+// 0x010bb5b4: 0x10bb5b4: lw    v1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5852,20 +5852,20 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010baf70: 0x10baf70: addiu a0, s0, -19988
+// 0x010bb5b8: 0x10bb5b8: addiu a0, s0, -19988
 	ldloc 8
 	ldc.i4 -19988
 	add
 	stloc.1
-// 0x010baf74: 0x10baf74: addu  a1, zero, zero
+// 0x010bb5bc: 0x10bb5bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010baf78: 0x10baf78: jal   0x1095eec sw    v1, -17252(v0)
+// 0x010bb5c0: 0x10bb5c0: jal   0x1096534 sw    v1, -16788(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4313
+	ldc.i4 -4197
 	add
 	ldloc 6
 	stelem.i4
@@ -5874,26 +5874,26 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010baf80: 0x10baf80: bne   v0, zero, 0x10bb4a8 lui   v0, 0x0
+// 0x010bb5c8: 0x10bb5c8: bne   v0, zero, 0x10bbaf0 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10bb4a8
+	brtrue L_10bbaf0
 // --- basic block ---
-// 0x010baf88: 0x10baf88: lui   v0, 0x20000
+// 0x010bb5d0: 0x10bb5d0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010baf8c: 0x10baf8c: addiu v0, v0, 21988
+// 0x010bb5d4: 0x10bb5d4: addiu v0, v0, 22448
 	ldloc 5
-	ldc.i4 21988
+	ldc.i4 22448
 	add
 	stloc 5
-// 0x010baf90: 0x10baf90: sw    v0, 28(sp)
+// 0x010bb5d8: 0x10bb5d8: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5902,20 +5902,20 @@ L_10baf5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010baf94: 0x10baf94: lui   v0, 0x20000
+// 0x010bb5dc: 0x10bb5dc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010baf98: 0x10baf98: addiu a0, s0, -19988
+// 0x010bb5e0: 0x10bb5e0: addiu a0, s0, -19988
 	ldloc 8
 	ldc.i4 -19988
 	add
 	stloc.1
-// 0x010baf9c: 0x10baf9c: addiu v0, v0, 22000
+// 0x010bb5e4: 0x10bb5e4: addiu v0, v0, 22460
 	ldloc 5
-	ldc.i4 22000
+	ldc.i4 22460
 	add
 	stloc 5
-// 0x010bafa0: 0x10bafa0: jal   0x101cd60 sw    v0, 160(sp)
+// 0x010bb5e8: 0x10bb5e8: jal   0x101cd70 sw    v0, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5929,28 +5929,28 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bafa8: 0x10bafa8: lui   a3, 0x10010000
+// 0x010bb5f0: 0x10bb5f0: lui   a3, 0x10010000
 	ldc.i4 268500992
 	stloc 4
-// 0x010bafac: 0x10bafac: ori   a3, a3, 28689
+// 0x010bb5f4: 0x10bb5f4: ori   a3, a3, 28689
 	ldloc 4
 	ldc.i4 28689
 	or
 	stloc 4
-// 0x010bafb0: 0x10bafb0: addiu a0, s0, -19988
+// 0x010bb5f8: 0x10bb5f8: addiu a0, s0, -19988
 	ldloc 8
 	ldc.i4 -19988
 	add
 	stloc.1
-// 0x010bafb4: 0x10bafb4: addu  a1, v0, zero
+// 0x010bb5fc: 0x10bb5fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bafb8: 0x10bafb8: jal   0x1095a08 addu  a2, zero, zero
+// 0x010bb600: 0x10bb600: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5958,62 +5958,62 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bafc0: 0x10bafc0: lui   s8, 0x0
+// 0x010bb608: 0x10bb608: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x010bafc4: 0x10bafc4: lui   a2, 0x20000
+// 0x010bb60c: 0x10bb60c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bafc8: 0x10bafc8: addu  a0, v0, zero
+// 0x010bb610: 0x10bb610: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bafcc: 0x10bafcc: addiu a2, a2, 22012
+// 0x010bb614: 0x10bb614: addiu a2, a2, 22472
 	ldloc.3
-	ldc.i4 22012
+	ldc.i4 22472
 	add
 	stloc.3
-// 0x010bafd0: 0x10bafd0: addiu a1, s8, 31980
+// 0x010bb618: 0x10bb618: addiu a1, s8, 31980
 	ldloc 16
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010bafd4: 0x10bafd4: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010bb61c: 0x10bb61c: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bafdc: 0x10bafdc: lui   a0, 0x20000
+// 0x010bb624: 0x10bb624: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bafe0: 0x10bafe0: addiu a3, zero, -1
+// 0x010bb628: 0x10bb628: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bafe4: 0x10bafe4: addiu a0, a0, 22024
+// 0x010bb62c: 0x10bb62c: addiu a0, a0, 22484
 	ldloc.1
-	ldc.i4 22024
+	ldc.i4 22484
 	add
 	stloc.1
-// 0x010bafe8: 0x10bafe8: addu  a1, zero, zero
+// 0x010bb630: 0x10bb630: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bafec: 0x10bafec: addiu a2, zero, -1
+// 0x010bb634: 0x10bb634: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010baff0: 0x10baff0: addiu v0, zero, 128
+// 0x010bb638: 0x10bb638: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x010baff4: 0x10baff4: lui   s6, 0x20000
+// 0x010bb63c: 0x10bb63c: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 15
-// 0x010baff8: 0x10baff8: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010bb640: 0x10bb640: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6027,34 +6027,34 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb000: 0x10bb000: addu  a0, v0, zero
+// 0x010bb648: 0x10bb648: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb004: 0x10bb004: addiu a1, s6, 22036
+// 0x010bb64c: 0x10bb64c: addiu a1, s6, 22496
 	ldloc 15
-	ldc.i4 22036
+	ldc.i4 22496
 	add
 	stloc.2
-// 0x010bb008: 0x10bb008: addu  a2, zero, zero
+// 0x010bb650: 0x10bb650: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bb00c: 0x10bb00c: lui   s7, 0x10000
+// 0x010bb654: 0x10bb654: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010bb010: 0x10bb010: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010bb658: 0x10bb658: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bb018: 0x10bb018: jal   0x101cd60 addiu a0, s7, -31172
+// 0x010bb660: 0x10bb660: jal   0x101cd70 addiu a0, s7, -31172
 	ldloc 14
 	ldc.i4 -31172
 	add
@@ -6064,29 +6064,29 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb020: 0x10bb020: lui   a0, 0x10000
+// 0x010bb668: 0x10bb668: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb024: 0x10bb024: addiu a2, zero, 14
+// 0x010bb66c: 0x10bb66c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010bb028: 0x10bb028: addiu a3, zero, 4104
+// 0x010bb670: 0x10bb670: addiu a3, zero, 4104
 	ldc.i4 4104
 	stloc 4
-// 0x010bb02c: 0x10bb02c: addu  a1, v0, zero
+// 0x010bb674: 0x10bb674: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb030: 0x10bb030: addiu a0, a0, 13152
+// 0x010bb678: 0x10bb678: addiu a0, a0, 13148
 	ldloc.1
-	ldc.i4 13152
+	ldc.i4 13148
 	add
 	stloc.1
-// 0x010bb034: 0x10bb034: jal   0x1098d10 lui   s0, 0x0
+// 0x010bb67c: 0x10bb67c: jal   0x1099358 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -6094,20 +6094,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb03c: 0x10bb03c: addu  a0, v0, zero
+// 0x010bb684: 0x10bb684: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb040: 0x10bb040: addiu a1, s0, 23008
+// 0x010bb688: 0x10bb688: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb044: 0x10bb044: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bb68c: 0x10bb68c: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6118,9 +6118,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb04c: 0x10bb04c: lw    v0, 264(sp)
+// 0x010bb694: 0x10bb694: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6129,23 +6129,23 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb050: 0x10bb050: addu  a0, s2, zero
+// 0x010bb698: 0x10bb698: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010bb054: 0x10bb054: addu  a1, v0, zero
+// 0x010bb69c: 0x10bb69c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb058: 0x10bb058: jal   0x1098ec4 lui   s5, 0x10000
+// 0x010bb6a0: 0x10bb6a0: jal   0x109950c lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 13
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb060: 0x10bb060: jal   0x101cd60 addiu a0, s5, -28756
+// 0x010bb6a8: 0x10bb6a8: jal   0x101cd70 addiu a0, s5, -28756
 	ldloc 13
 	ldc.i4 -28756
 	add
@@ -6155,26 +6155,26 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb068: 0x10bb068: lui   a0, 0x20000
+// 0x010bb6b0: 0x10bb6b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb06c: 0x10bb06c: addiu a2, zero, 14
+// 0x010bb6b4: 0x10bb6b4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010bb070: 0x10bb070: addiu a3, zero, 4104
+// 0x010bb6b8: 0x10bb6b8: addiu a3, zero, 4104
 	ldc.i4 4104
 	stloc 4
-// 0x010bb074: 0x10bb074: addu  a1, v0, zero
+// 0x010bb6bc: 0x10bb6bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb078: 0x10bb078: jal   0x1098d10 addiu a0, a0, 22044
+// 0x010bb6c0: 0x10bb6c0: jal   0x1099358 addiu a0, a0, 22504
 	ldloc.1
-	ldc.i4 22044
+	ldc.i4 22504
 	add
 	stloc.1
 	ldloc.0
@@ -6182,20 +6182,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb080: 0x10bb080: addu  a0, v0, zero
+// 0x010bb6c8: 0x10bb6c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb084: 0x10bb084: addiu a1, s0, 23008
+// 0x010bb6cc: 0x10bb6cc: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb088: 0x10bb088: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bb6d0: 0x10bb6d0: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6206,9 +6206,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb090: 0x10bb090: lw    v0, 264(sp)
+// 0x010bb6d8: 0x10bb6d8: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6217,53 +6217,53 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb094: 0x10bb094: addu  a0, s2, zero
+// 0x010bb6dc: 0x10bb6dc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010bb098: 0x10bb098: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bb6e0: 0x10bb6e0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb0a0: 0x10bb0a0: addu  a1, s2, zero
+// 0x010bb6e8: 0x10bb6e8: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010bb0a4: 0x10bb0a4: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bb6ec: 0x10bb6ec: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb0ac: 0x10bb0ac: lui   a0, 0x20000
+// 0x010bb6f4: 0x10bb6f4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb0b0: 0x10bb0b0: addiu a3, zero, -1
+// 0x010bb6f8: 0x10bb6f8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bb0b4: 0x10bb0b4: addiu s4, zero, 8
+// 0x010bb6fc: 0x10bb6fc: addiu s4, zero, 8
 	ldc.i4.8
 	stloc 12
-// 0x010bb0b8: 0x10bb0b8: addiu a0, a0, 22056
+// 0x010bb700: 0x10bb700: addiu a0, a0, 22516
 	ldloc.1
-	ldc.i4 22056
+	ldc.i4 22516
 	add
 	stloc.1
-// 0x010bb0bc: 0x10bb0bc: addu  a1, zero, zero
+// 0x010bb704: 0x10bb704: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bb0c0: 0x10bb0c0: addiu a2, zero, -1
+// 0x010bb708: 0x10bb708: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bb0c4: 0x10bb0c4: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010bb70c: 0x10bb70c: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6277,47 +6277,47 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb0cc: 0x10bb0cc: lui   s2, 0x10000
+// 0x010bb714: 0x10bb714: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010bb0d0: 0x10bb0d0: addu  a0, v0, zero
+// 0x010bb718: 0x10bb718: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb0d4: 0x10bb0d4: addiu a1, s0, 23008
+// 0x010bb71c: 0x10bb71c: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb0d8: 0x10bb0d8: addu  a2, zero, zero
+// 0x010bb720: 0x10bb720: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bb0dc: 0x10bb0dc: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010bb724: 0x10bb724: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bb0e4: 0x10bb0e4: addiu a2, zero, 14
+// 0x010bb72c: 0x10bb72c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010bb0e8: 0x10bb0e8: addiu a3, zero, 8
+// 0x010bb730: 0x10bb730: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010bb0ec: 0x10bb0ec: addiu a0, s7, -31172
+// 0x010bb734: 0x10bb734: addiu a0, s7, -31172
 	ldloc 14
 	ldc.i4 -31172
 	add
 	stloc.1
-// 0x010bb0f0: 0x10bb0f0: jal   0x1098d10 addiu a1, s2, 18500
+// 0x010bb738: 0x10bb738: jal   0x1099358 addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6325,20 +6325,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb0f8: 0x10bb0f8: addu  a0, v0, zero
+// 0x010bb740: 0x10bb740: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb0fc: 0x10bb0fc: addiu a1, s0, 23008
+// 0x010bb744: 0x10bb744: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb100: 0x10bb100: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bb748: 0x10bb748: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6349,9 +6349,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb108: 0x10bb108: lw    v0, 264(sp)
+// 0x010bb750: 0x10bb750: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6360,33 +6360,33 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb10c: 0x10bb10c: addu  a0, s3, zero
+// 0x010bb754: 0x10bb754: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bb110: 0x10bb110: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bb758: 0x10bb758: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb118: 0x10bb118: addiu a2, zero, 14
+// 0x010bb760: 0x10bb760: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010bb11c: 0x10bb11c: addiu a3, zero, 8
+// 0x010bb764: 0x10bb764: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010bb120: 0x10bb120: addiu a0, s5, -28756
+// 0x010bb768: 0x10bb768: addiu a0, s5, -28756
 	ldloc 13
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010bb124: 0x10bb124: jal   0x1098d10 addiu a1, s2, 18500
+// 0x010bb76c: 0x10bb76c: jal   0x1099358 addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6394,20 +6394,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb12c: 0x10bb12c: addu  a0, v0, zero
+// 0x010bb774: 0x10bb774: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb130: 0x10bb130: addiu a1, s0, 23008
+// 0x010bb778: 0x10bb778: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb134: 0x10bb134: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bb77c: 0x10bb77c: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6418,9 +6418,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb13c: 0x10bb13c: lw    v0, 264(sp)
+// 0x010bb784: 0x10bb784: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6429,50 +6429,50 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb140: 0x10bb140: addu  a0, s3, zero
+// 0x010bb788: 0x10bb788: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bb144: 0x10bb144: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bb78c: 0x10bb78c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb14c: 0x10bb14c: addu  a1, s3, zero
+// 0x010bb794: 0x10bb794: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010bb150: 0x10bb150: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bb798: 0x10bb798: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb158: 0x10bb158: lui   a0, 0x10000
+// 0x010bb7a0: 0x10bb7a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb15c: 0x10bb15c: addu  a2, zero, zero
+// 0x010bb7a4: 0x10bb7a4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bb160: 0x10bb160: addiu a3, zero, 16
+// 0x010bb7a8: 0x10bb7a8: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x010bb164: 0x10bb164: addiu a0, a0, -27036
+// 0x010bb7ac: 0x10bb7ac: addiu a0, a0, -27036
 	ldloc.1
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010bb168: 0x10bb168: addu  a1, zero, zero
+// 0x010bb7b0: 0x10bb7b0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bb16c: 0x10bb16c: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010bb7b4: 0x10bb7b4: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6486,25 +6486,25 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb174: 0x10bb174: addu  a1, v0, zero
+// 0x010bb7bc: 0x10bb7bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb178: 0x10bb178: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bb7c0: 0x10bb7c0: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb180: 0x10bb180: jal   0x109a424 addu  a0, zero, zero
+// 0x010bb7c8: 0x10bb7c8: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6512,47 +6512,47 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb188: 0x10bb188: sltu  v0, zero, v0
+// 0x010bb7d0: 0x10bb7d0: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010bb18c: 0x10bb18c: lui   v1, 0x100000
+// 0x010bb7d4: 0x10bb7d4: lui   v1, 0x100000
 	ldc.i4 1048576
 	stloc 6
-// 0x010bb190: 0x10bb190: sll   v0, v0, 1
+// 0x010bb7d8: 0x10bb7d8: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x010bb194: 0x10bb194: lui   a0, 0x10000
+// 0x010bb7dc: 0x10bb7dc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb198: 0x10bb198: or    v0, v0, v1
+// 0x010bb7e0: 0x10bb7e0: or    v0, v0, v1
 	ldloc 5
 	ldloc 6
 	or
 	stloc 5
-// 0x010bb19c: 0x10bb19c: addiu a3, zero, -1
+// 0x010bb7e4: 0x10bb7e4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bb1a0: 0x10bb1a0: addiu a0, a0, 8676
+// 0x010bb7e8: 0x10bb7e8: addiu a0, a0, 8672
 	ldloc.1
-	ldc.i4 8676
+	ldc.i4 8672
 	add
 	stloc.1
-// 0x010bb1a4: 0x10bb1a4: addu  a1, zero, zero
+// 0x010bb7ec: 0x10bb7ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bb1a8: 0x10bb1a8: addiu a2, zero, -1
+// 0x010bb7f0: 0x10bb7f0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bb1ac: 0x10bb1ac: sw    v1, 268(sp)
+// 0x010bb7f4: 0x10bb7f4: sw    v1, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6561,7 +6561,7 @@ L_10baf5c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bb1b0: 0x10bb1b0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010bb7f8: 0x10bb7f8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6575,37 +6575,37 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb1b8: 0x10bb1b8: addu  s4, v0, zero
+// 0x010bb800: 0x10bb800: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010bb1bc: 0x10bb1bc: addu  a0, v0, zero
+// 0x010bb804: 0x10bb804: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb1c0: 0x10bb1c0: addiu a1, s0, 23008
+// 0x010bb808: 0x10bb808: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb1c4: 0x10bb1c4: jal   0x1098fe0 addu  a2, zero, zero
+// 0x010bb80c: 0x10bb80c: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bb1cc: 0x10bb1cc: addu  a0, s4, zero
+// 0x010bb814: 0x10bb814: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010bb1d0: 0x10bb1d0: addiu a1, zero, 2
+// 0x010bb818: 0x10bb818: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010bb1d4: 0x10bb1d4: jal   0x1098f84 addu  a2, zero, zero
+// 0x010bb81c: 0x10bb81c: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6613,32 +6613,32 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb1dc: 0x10bb1dc: lui   a0, 0x20000
+// 0x010bb824: 0x10bb824: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb1e0: 0x10bb1e0: addiu s5, zero, 9
+// 0x010bb828: 0x10bb828: addiu s5, zero, 9
 	ldc.i4.s 9
 	stloc 13
-// 0x010bb1e4: 0x10bb1e4: addiu a3, zero, 20
+// 0x010bb82c: 0x10bb82c: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x010bb1e8: 0x10bb1e8: addiu a0, a0, 22068
+// 0x010bb830: 0x10bb830: addiu a0, a0, 22528
 	ldloc.1
-	ldc.i4 22068
+	ldc.i4 22528
 	add
 	stloc.1
-// 0x010bb1ec: 0x10bb1ec: addu  a1, zero, zero
+// 0x010bb834: 0x10bb834: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bb1f0: 0x10bb1f0: addiu a2, zero, 50
+// 0x010bb838: 0x10bb838: addiu a2, zero, 50
 	ldc.i4.s 50
 	stloc.3
-// 0x010bb1f4: 0x10bb1f4: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010bb83c: 0x10bb83c: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6652,47 +6652,47 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb1fc: 0x10bb1fc: addu  a0, v0, zero
+// 0x010bb844: 0x10bb844: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb200: 0x10bb200: addiu a1, s0, 23008
+// 0x010bb848: 0x10bb848: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb204: 0x10bb204: addu  a2, zero, zero
+// 0x010bb84c: 0x10bb84c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bb208: 0x10bb208: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010bb850: 0x10bb850: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bb210: 0x10bb210: lui   a0, 0x20000
+// 0x010bb858: 0x10bb858: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb214: 0x10bb214: addiu a2, zero, 16
+// 0x010bb85c: 0x10bb85c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010bb218: 0x10bb218: addiu a3, zero, 9
+// 0x010bb860: 0x10bb860: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x010bb21c: 0x10bb21c: addiu a0, a0, 22080
+// 0x010bb864: 0x10bb864: addiu a0, a0, 22540
 	ldloc.1
-	ldc.i4 22080
+	ldc.i4 22540
 	add
 	stloc.1
-// 0x010bb220: 0x10bb220: jal   0x1098d10 addiu a1, s2, 18500
+// 0x010bb868: 0x10bb868: jal   0x1099358 addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6700,20 +6700,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb228: 0x10bb228: addu  a0, v0, zero
+// 0x010bb870: 0x10bb870: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb22c: 0x10bb22c: addiu a1, s0, 23008
+// 0x010bb874: 0x10bb874: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb230: 0x10bb230: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bb878: 0x10bb878: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6724,9 +6724,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb238: 0x10bb238: lw    v0, 264(sp)
+// 0x010bb880: 0x10bb880: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6735,62 +6735,62 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb23c: 0x10bb23c: addu  a0, s3, zero
+// 0x010bb884: 0x10bb884: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bb240: 0x10bb240: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bb888: 0x10bb888: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb248: 0x10bb248: addu  a1, s3, zero
+// 0x010bb890: 0x10bb890: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010bb24c: 0x10bb24c: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010bb894: 0x10bb894: jal   0x109950c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb254: 0x10bb254: lui   s7, 0x10c0000
+// 0x010bb89c: 0x10bb89c: lui   s7, 0x10c0000
 	ldc.i4 17563648
 	stloc 14
-// 0x010bb258: 0x10bb258: lui   a0, 0x20000
+// 0x010bb8a0: 0x10bb8a0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb25c: 0x10bb25c: addiu a2, sp, 28
+// 0x010bb8a4: 0x10bb8a4: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x010bb260: 0x10bb260: addiu a3, zero, 1
+// 0x010bb8a8: 0x10bb8a8: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010bb264: 0x10bb264: addiu s7, s7, -21404
+// 0x010bb8ac: 0x10bb8ac: addiu s7, s7, -19796
 	ldloc 14
-	ldc.i4 -21404
+	ldc.i4 -19796
 	add
 	stloc 14
-// 0x010bb268: 0x10bb268: addiu a0, a0, 21944
+// 0x010bb8b0: 0x10bb8b0: addiu a0, a0, 22404
 	ldloc.1
-	ldc.i4 21944
+	ldc.i4 22404
 	add
 	stloc.1
-// 0x010bb26c: 0x10bb26c: addiu a1, s2, 18500
+// 0x010bb8b4: 0x10bb8b4: addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010bb270: 0x10bb270: sw    s5, 16(sp)
+// 0x010bb8b8: 0x10bb8b8: sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6799,7 +6799,7 @@ L_10baf5c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bb274: 0x10bb274: jal   0x1090ecc sw    s7, 20(sp)
+// 0x010bb8bc: 0x10bb8bc: jal   0x10914f0 sw    s7, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6813,41 +6813,41 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb27c: 0x10bb27c: addu  a1, v0, zero
+// 0x010bb8c4: 0x10bb8c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb280: 0x10bb280: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010bb8c8: 0x10bb8c8: jal   0x109950c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb288: 0x10bb288: lui   a0, 0x20000
+// 0x010bb8d0: 0x10bb8d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb28c: 0x10bb28c: addiu a2, zero, 15
+// 0x010bb8d4: 0x10bb8d4: addiu a2, zero, 15
 	ldc.i4.s 15
 	stloc.3
-// 0x010bb290: 0x10bb290: addiu a3, zero, 9
+// 0x010bb8d8: 0x10bb8d8: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x010bb294: 0x10bb294: addiu a0, a0, 21916
+// 0x010bb8dc: 0x10bb8dc: addiu a0, a0, 22376
 	ldloc.1
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.1
-// 0x010bb298: 0x10bb298: jal   0x1098d10 addiu a1, s2, 18500
+// 0x010bb8e0: 0x10bb8e0: jal   0x1099358 addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6855,20 +6855,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb2a0: 0x10bb2a0: addu  a0, v0, zero
+// 0x010bb8e8: 0x10bb8e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb2a4: 0x10bb2a4: addiu a1, s0, 23008
+// 0x010bb8ec: 0x10bb8ec: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb2a8: 0x10bb2a8: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bb8f0: 0x10bb8f0: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6879,9 +6879,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb2b0: 0x10bb2b0: lw    v0, 264(sp)
+// 0x010bb8f8: 0x10bb8f8: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6890,20 +6890,20 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb2b4: 0x10bb2b4: addu  a0, s4, zero
+// 0x010bb8fc: 0x10bb8fc: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010bb2b8: 0x10bb2b8: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bb900: 0x10bb900: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb2c0: 0x10bb2c0: jal   0x109a424 addu  a0, zero, zero
+// 0x010bb908: 0x10bb908: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6911,17 +6911,17 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb2c8: 0x10bb2c8: sltiu v0, v0, 1
+// 0x010bb910: 0x10bb910: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010bb2cc: 0x10bb2cc: lw    v1, 268(sp)
+// 0x010bb914: 0x10bb914: lw    v1, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6930,34 +6930,34 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bb2d0: 0x10bb2d0: sll   v0, v0, 1
+// 0x010bb918: 0x10bb918: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x010bb2d4: 0x10bb2d4: lui   a0, 0x10000
+// 0x010bb91c: 0x10bb91c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb2d8: 0x10bb2d8: or    v1, v0, v1
+// 0x010bb920: 0x10bb920: or    v1, v0, v1
 	ldloc 5
 	ldloc 6
 	or
 	stloc 6
-// 0x010bb2dc: 0x10bb2dc: addiu a3, zero, -1
+// 0x010bb924: 0x10bb924: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bb2e0: 0x10bb2e0: addiu a0, a0, 8732
+// 0x010bb928: 0x10bb928: addiu a0, a0, 8728
 	ldloc.1
-	ldc.i4 8732
+	ldc.i4 8728
 	add
 	stloc.1
-// 0x010bb2e4: 0x10bb2e4: addu  a1, zero, zero
+// 0x010bb92c: 0x10bb92c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bb2e8: 0x10bb2e8: addiu a2, zero, -1
+// 0x010bb930: 0x10bb930: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bb2ec: 0x10bb2ec: jal   0x1093a24 sw    v1, 16(sp)
+// 0x010bb934: 0x10bb934: jal   0x1094048 sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6971,21 +6971,21 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb2f4: 0x10bb2f4: addu  s3, v0, zero
+// 0x010bb93c: 0x10bb93c: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010bb2f8: 0x10bb2f8: addu  a0, v0, zero
+// 0x010bb940: 0x10bb940: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb2fc: 0x10bb2fc: addiu a1, zero, 2
+// 0x010bb944: 0x10bb944: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010bb300: 0x10bb300: jal   0x1098f84 addu  a2, zero, zero
+// 0x010bb948: 0x10bb948: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6993,45 +6993,45 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb308: 0x10bb308: addiu a1, s6, 22036
+// 0x010bb950: 0x10bb950: addiu a1, s6, 22496
 	ldloc 15
-	ldc.i4 22036
+	ldc.i4 22496
 	add
 	stloc.2
-// 0x010bb30c: 0x10bb30c: addu  a0, s3, zero
+// 0x010bb954: 0x10bb954: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bb310: 0x10bb310: jal   0x1098fe0 addu  a2, zero, zero
+// 0x010bb958: 0x10bb958: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bb318: 0x10bb318: lui   a0, 0x20000
+// 0x010bb960: 0x10bb960: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb31c: 0x10bb31c: addiu a3, zero, 20
+// 0x010bb964: 0x10bb964: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x010bb320: 0x10bb320: addiu a0, a0, 22096
+// 0x010bb968: 0x10bb968: addiu a0, a0, 22556
 	ldloc.1
-	ldc.i4 22096
+	ldc.i4 22556
 	add
 	stloc.1
-// 0x010bb324: 0x10bb324: addu  a1, zero, zero
+// 0x010bb96c: 0x10bb96c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bb328: 0x10bb328: addiu a2, zero, 50
+// 0x010bb970: 0x10bb970: addiu a2, zero, 50
 	ldc.i4.s 50
 	stloc.3
-// 0x010bb32c: 0x10bb32c: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010bb974: 0x10bb974: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7045,47 +7045,47 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb334: 0x10bb334: addu  a0, v0, zero
+// 0x010bb97c: 0x10bb97c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb338: 0x10bb338: addiu a1, s8, 31980
+// 0x010bb980: 0x10bb980: addiu a1, s8, 31980
 	ldloc 16
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010bb33c: 0x10bb33c: addu  a2, zero, zero
+// 0x010bb984: 0x10bb984: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bb340: 0x10bb340: jal   0x1098fe0 addu  s6, v0, zero
+// 0x010bb988: 0x10bb988: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bb348: 0x10bb348: lui   a0, 0x20000
+// 0x010bb990: 0x10bb990: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb34c: 0x10bb34c: addiu a2, zero, 16
+// 0x010bb994: 0x10bb994: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010bb350: 0x10bb350: addiu a3, zero, 9
+// 0x010bb998: 0x10bb998: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x010bb354: 0x10bb354: addiu a0, a0, 22108
+// 0x010bb99c: 0x10bb99c: addiu a0, a0, 22568
 	ldloc.1
-	ldc.i4 22108
+	ldc.i4 22568
 	add
 	stloc.1
-// 0x010bb358: 0x10bb358: jal   0x1098d10 addiu a1, s2, 18500
+// 0x010bb9a0: 0x10bb9a0: jal   0x1099358 addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -7093,20 +7093,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb360: 0x10bb360: addu  a0, v0, zero
+// 0x010bb9a8: 0x10bb9a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb364: 0x10bb364: addiu a1, s0, 23008
+// 0x010bb9ac: 0x10bb9ac: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb368: 0x10bb368: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bb9b0: 0x10bb9b0: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7117,9 +7117,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb370: 0x10bb370: lw    v0, 264(sp)
+// 0x010bb9b8: 0x10bb9b8: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7128,54 +7128,54 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb374: 0x10bb374: addu  a0, s6, zero
+// 0x010bb9bc: 0x10bb9bc: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x010bb378: 0x10bb378: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bb9c0: 0x10bb9c0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb380: 0x10bb380: addu  a0, s3, zero
+// 0x010bb9c8: 0x10bb9c8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bb384: 0x10bb384: jal   0x1098ec4 addu  a1, s6, zero
+// 0x010bb9cc: 0x10bb9cc: jal   0x109950c addu  a1, s6, zero
 	ldloc 15
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb38c: 0x10bb38c: lui   a0, 0x20000
+// 0x010bb9d4: 0x10bb9d4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb390: 0x10bb390: addiu a2, sp, 160
+// 0x010bb9d8: 0x10bb9d8: addiu a2, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
 	stloc.3
-// 0x010bb394: 0x10bb394: addiu a3, zero, 1
+// 0x010bb9dc: 0x10bb9dc: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010bb398: 0x10bb398: addiu a0, a0, 22124
+// 0x010bb9e0: 0x10bb9e0: addiu a0, a0, 22584
 	ldloc.1
-	ldc.i4 22124
+	ldc.i4 22584
 	add
 	stloc.1
-// 0x010bb39c: 0x10bb39c: addiu a1, s2, 18500
+// 0x010bb9e4: 0x10bb9e4: addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010bb3a0: 0x10bb3a0: sw    s5, 16(sp)
+// 0x010bb9e8: 0x10bb9e8: sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7184,7 +7184,7 @@ L_10baf5c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bb3a4: 0x10bb3a4: jal   0x1090ecc sw    s7, 20(sp)
+// 0x010bb9ec: 0x10bb9ec: jal   0x10914f0 sw    s7, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7198,41 +7198,41 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb3ac: 0x10bb3ac: addu  a1, v0, zero
+// 0x010bb9f4: 0x10bb9f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb3b0: 0x10bb3b0: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010bb9f8: 0x10bb9f8: jal   0x109950c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb3b8: 0x10bb3b8: lui   a0, 0x20000
+// 0x010bba00: 0x10bba00: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb3bc: 0x10bb3bc: addiu a2, zero, 15
+// 0x010bba04: 0x10bba04: addiu a2, zero, 15
 	ldc.i4.s 15
 	stloc.3
-// 0x010bb3c0: 0x10bb3c0: addiu a3, zero, 8
+// 0x010bba08: 0x10bba08: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010bb3c4: 0x10bb3c4: addiu a1, s2, 18500
+// 0x010bba0c: 0x10bba0c: addiu a1, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010bb3c8: 0x10bb3c8: jal   0x1098d10 addiu a0, a0, 21928
+// 0x010bba10: 0x10bba10: jal   0x1099358 addiu a0, a0, 22388
 	ldloc.1
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.1
 	ldloc.0
@@ -7240,20 +7240,20 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb3d0: 0x10bb3d0: addu  a0, v0, zero
+// 0x010bba18: 0x10bba18: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bb3d4: 0x10bb3d4: addiu a1, s0, 23008
+// 0x010bba1c: 0x10bba1c: addiu a1, s0, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010bb3d8: 0x10bb3d8: jal   0x1097af8 sw    v0, 264(sp)
+// 0x010bba20: 0x10bba20: jal   0x1098140 sw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7264,9 +7264,9 @@ L_10baf5c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010bb3e0: 0x10bb3e0: lw    v0, 264(sp)
+// 0x010bba28: 0x10bba28: lw    v0, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7275,20 +7275,20 @@ L_10baf5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb3e4: 0x10bb3e4: addu  a0, s3, zero
+// 0x010bba2c: 0x10bba2c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bb3e8: 0x10bb3e8: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bba30: 0x10bba30: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb3f0: 0x10bb3f0: jal   0x109a424 addu  a0, zero, zero
+// 0x010bba38: 0x10bba38: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7296,71 +7296,71 @@ L_10baf5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb3f8: 0x10bb3f8: beq   v0, zero, 0x10bb418 sll   zero, zero, 0
+// 0x010bba40: 0x10bba40: beq   v0, zero, 0x10bba60 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bb418
+	brfalse L_10bba60
 // --- basic block ---
-// 0x010bb400: 0x10bb400: addu  a1, s3, zero
+// 0x010bba48: 0x10bba48: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010bb404: 0x10bb404: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bba4c: 0x10bba4c: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb40c: 0x10bb40c: addu  a0, s1, zero
+// 0x010bba54: 0x10bba54: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010bb410: 0x10bb410: j	 0x10bb42c addu  a1, s4, zero
+// 0x010bba58: 0x10bba58: j	 0x10bba74 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-	br L_10bb42c
+	br L_10bba74
 // --- basic block ---
-L_10bb418:
-// 0x010bb418: 0x10bb418: addu  a1, s4, zero
+L_10bba60:
+// 0x010bba60: 0x10bba60: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010bb41c: 0x10bb41c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bba64: 0x10bba64: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb424: 0x10bb424: addu  a0, s1, zero
+// 0x010bba6c: 0x10bba6c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010bb428: 0x10bb428: addu  a1, s3, zero
+// 0x010bba70: 0x10bba70: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-L_10bb42c:
-// 0x010bb42c: 0x10bb42c: jal   0x1098ec4 lui   s3, 0x100000
+L_10bba74:
+// 0x010bba74: 0x10bba74: jal   0x109950c lui   s3, 0x100000
 	ldc.i4 1048576
 	stloc 11
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb434: 0x10bb434: lui   a0, 0x0
+// 0x010bba7c: 0x10bba7c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bb438: 0x10bb438: jal   0x101cd60 addiu a0, a0, 32524
+// 0x010bba80: 0x10bba80: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -7370,33 +7370,33 @@ L_10bb42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb440: 0x10bb440: lui   s2, 0x10c0000
+// 0x010bba88: 0x10bba88: lui   s2, 0x10c0000
 	ldc.i4 17563648
 	stloc 10
-// 0x010bb444: 0x10bb444: lui   a0, 0x10000
+// 0x010bba8c: 0x10bba8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb448: 0x10bb448: ori   a2, s3, 5
+// 0x010bba90: 0x10bba90: ori   a2, s3, 5
 	ldloc 11
 	ldc.i4.5
 	or
 	stloc.3
-// 0x010bb44c: 0x10bb44c: addiu a3, s2, -21404
+// 0x010bba94: 0x10bba94: addiu a3, s2, -19796
 	ldloc 10
-	ldc.i4 -21404
+	ldc.i4 -19796
 	add
 	stloc 4
-// 0x010bb450: 0x10bb450: addiu a0, a0, 12704
+// 0x010bba98: 0x10bba98: addiu a0, a0, 12700
 	ldloc.1
-	ldc.i4 12704
+	ldc.i4 12700
 	add
 	stloc.1
-// 0x010bb454: 0x10bb454: jal   0x1091088 addu  a1, v0, zero
+// 0x010bba9c: 0x10bba9c: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7404,30 +7404,30 @@ L_10bb42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb45c: 0x10bb45c: addu  a1, v0, zero
+// 0x010bbaa4: 0x10bbaa4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb460: 0x10bb460: addu  a0, s1, zero
+// 0x010bbaa8: 0x10bbaa8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010bb464: 0x10bb464: jal   0x1098ec4 lui   s0, 0x10000
+// 0x010bbaac: 0x10bbaac: jal   0x109950c lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb46c: 0x10bb46c: jal   0x101cd60 addiu a0, s0, 844
+// 0x010bbab4: 0x10bbab4: jal   0x101cd70 addiu a0, s0, 840
 	ldloc 8
-	ldc.i4 844
+	ldc.i4 840
 	add
 	stloc.1
 	ldloc.0
@@ -7435,27 +7435,27 @@ L_10bb42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb474: 0x10bb474: addu  a1, v0, zero
+// 0x010bbabc: 0x10bbabc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb478: 0x10bb478: ori   a2, s3, 1
+// 0x010bbac0: 0x10bbac0: ori   a2, s3, 1
 	ldloc 11
 	ldc.i4.1
 	or
 	stloc.3
-// 0x010bb47c: 0x10bb47c: addiu a3, s2, -21404
+// 0x010bbac4: 0x10bbac4: addiu a3, s2, -19796
 	ldloc 10
-	ldc.i4 -21404
+	ldc.i4 -19796
 	add
 	stloc 4
-// 0x010bb480: 0x10bb480: jal   0x1091088 addiu a0, s0, 844
+// 0x010bbac8: 0x10bbac8: jal   0x10916ac addiu a0, s0, 840
 	ldloc 8
-	ldc.i4 844
+	ldc.i4 840
 	add
 	stloc.1
 	ldloc.0
@@ -7463,33 +7463,33 @@ L_10bb42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb488: 0x10bb488: addu  a1, v0, zero
+// 0x010bbad0: 0x10bbad0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bb48c: 0x10bb48c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bbad4: 0x10bbad4: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb494: 0x10bb494: lui   a0, 0x10000
+// 0x010bbadc: 0x10bbadc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb498: 0x10bb498: addiu a0, a0, -19988
+// 0x010bbae0: 0x10bbae0: addiu a0, a0, -19988
 	ldloc.1
 	ldc.i4 -19988
 	add
 	stloc.1
-// 0x010bb49c: 0x10bb49c: jal   0x1095eec addu  a1, zero, zero
+// 0x010bbae4: 0x10bbae4: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7497,16 +7497,16 @@ L_10bb42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb4a4: 0x10bb4a4: lui   v0, 0x0
+// 0x010bbaec: 0x10bbaec: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10bb4a8:
-// 0x010bb4a8: 0x10bb4a8: lw    v0, 18812(v0)
+L_10bbaf0:
+// 0x010bbaf0: 0x10bbaf0: lw    v0, 18812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7515,7 +7515,7 @@ L_10bb4a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb4ac: 0x10bb4ac: lw    v1, 68(sp)
+// 0x010bbaf4: 0x10bbaf4: lw    v1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7524,7 +7524,7 @@ L_10bb4a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bb4b0: 0x10bb4b0: lw    s7, 24(sp)
+// 0x010bbaf8: 0x10bbaf8: lw    s7, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7533,25 +7533,25 @@ L_10bb4a8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bb4b4: 0x10bb4b4: bne   v1, v0, 0x10bb4c8 lui   s1, 0x10000
+// 0x010bbafc: 0x10bbafc: bne   v1, v0, 0x10bbb10 lui   s1, 0x10000
 	ldloc 6
 	ldloc 5
 	ldc.i4 65536
 	stloc 9
-	bne.un L_10bb4c8
+	bne.un L_10bbb10
 // --- basic block ---
-// 0x010bb4bc: 0x10bb4bc: addiu s1, s1, 18500
+// 0x010bbb04: 0x10bbb04: addiu s1, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 9
-// 0x010bb4c0: 0x10bb4c0: j	 0x10bb53c addu  s3, zero, zero
+// 0x010bbb08: 0x10bbb08: j	 0x10bbb84 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_10bb53c
+	br L_10bbb84
 // --- basic block ---
-L_10bb4c8:
-// 0x010bb4c8: 0x10bb4c8: lw    a0, 84(sp)
+L_10bbb10:
+// 0x010bbb10: 0x10bbb10: lw    a0, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7560,27 +7560,27 @@ L_10bb4c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bb4cc: 0x10bb4cc: jal   0x1013c44 sll   zero, zero, 0
+// 0x010bbb14: 0x10bbb14: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb4d4: 0x10bb4d4: bltz  v0, 0x10bb6c8 addiu s0, sp, 88
+// 0x010bbb1c: 0x10bbb1c: bltz  v0, 0x10bbd10 addiu s0, sp, 88
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc 8
 	ldc.i4.s 0
-	blt L_10bb6c8
+	blt L_10bbd10
 // --- basic block ---
-// 0x010bb4dc: 0x10bb4dc: lw    a0, 72(sp)
+// 0x010bbb24: 0x10bbb24: lw    a0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7589,7 +7589,7 @@ L_10bb4c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bb4e0: 0x10bb4e0: jal   0x1011a4c addu  a1, s0, zero
+// 0x010bbb28: 0x10bbb28: jal   0x1011a5c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -7597,12 +7597,12 @@ L_10bb4c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb4e8: 0x10bb4e8: jal   0x1011818 addu  a0, s0, zero
+// 0x010bbb30: 0x10bbb30: jal   0x1011828 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7610,18 +7610,18 @@ L_10bb4c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb4f0: 0x10bb4f0: addu  a0, s0, zero
+// 0x010bbb38: 0x10bbb38: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010bb4f4: 0x10bb4f4: addiu a1, zero, 1
+// 0x010bbb3c: 0x10bbb3c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010bb4f8: 0x10bb4f8: jal   0x1011298 addu  s3, v0, zero
+// 0x010bbb40: 0x10bbb40: jal   0x10112a8 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -7629,28 +7629,28 @@ L_10bb4c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb500: 0x10bb500: addu  a0, s0, zero
+// 0x010bbb48: 0x10bbb48: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010bb504: 0x10bb504: addiu a1, zero, 1
+// 0x010bbb4c: 0x10bbb4c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010bb508: 0x10bb508: addiu a2, sp, 32
+// 0x010bbb50: 0x10bbb50: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x010bb50c: 0x10bb50c: addiu a3, sp, 36
+// 0x010bbb54: 0x10bbb54: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x010bb510: 0x10bb510: jal   0x1010d9c addu  s1, v0, zero
+// 0x010bbb58: 0x10bbb58: jal   0x1010dac addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -7658,23 +7658,23 @@ L_10bb4c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_range_1010d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_range_1010dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb518: 0x10bb518: addu  a0, s0, zero
+// 0x010bbb60: 0x10bbb60: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010bb51c: 0x10bb51c: addiu a1, zero, 2
+// 0x010bbb64: 0x10bbb64: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010bb520: 0x10bb520: addiu a2, sp, 40
+// 0x010bbb68: 0x10bbb68: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x010bb524: 0x10bb524: jal   0x1010d9c addiu a3, sp, 44
+// 0x010bbb6c: 0x10bbb6c: jal   0x1010dac addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -7684,25 +7684,25 @@ L_10bb4c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_range_1010d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_range_1010dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb52c: 0x10bb52c: bne   s1, zero, 0x10bb53c sll   zero, zero, 0
+// 0x010bbb74: 0x10bbb74: bne   s1, zero, 0x10bbb84 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10bb53c
+	brtrue L_10bbb84
 // --- basic block ---
-// 0x010bb534: 0x10bb534: lui   s1, 0x10000
+// 0x010bbb7c: 0x10bbb7c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010bb538: 0x10bb538: addiu s1, s1, 18500
+// 0x010bbb80: 0x10bbb80: addiu s1, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 9
-L_10bb53c:
-// 0x010bb53c: 0x10bb53c: lw    t0, 36(sp)
+L_10bbb84:
+// 0x010bbb84: 0x10bbb84: lw    t0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7711,20 +7711,20 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bb540: 0x10bb540: lui   a0, 0xe0000
+// 0x010bbb88: 0x10bbb88: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010bb544: 0x10bb544: addiu a1, sp, 68
+// 0x010bbb8c: 0x10bbb8c: addiu a1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x010bb548: 0x10bb548: addiu a2, sp, 48
+// 0x010bbb90: 0x10bbb90: addiu a2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.3
-// 0x010bb54c: 0x10bb54c: sw    t0, 272(sp)
+// 0x010bbb94: 0x10bbb94: sw    t0, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7733,7 +7733,7 @@ L_10bb53c:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010bb550: 0x10bb550: lw    s2, 32(sp)
+// 0x010bbb98: 0x10bbb98: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7742,7 +7742,7 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bb554: 0x10bb554: lw    s4, 40(sp)
+// 0x010bbb9c: 0x10bbb9c: lw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7751,7 +7751,7 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bb558: 0x10bb558: lw    s8, 44(sp)
+// 0x010bbba0: 0x10bbba0: lw    s8, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7760,9 +7760,9 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bb55c: 0x10bb55c: jal   0x1014fec addiu a0, a0, -17252
+// 0x010bbba4: 0x10bbba4: jal   0x1014ffc addiu a0, a0, -16788
 	ldloc.1
-	ldc.i4 -17252
+	ldc.i4 -16788
 	add
 	stloc.1
 	ldloc.0
@@ -7770,22 +7770,22 @@ L_10bb53c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_calc_length_1014fec(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_calc_length_1014ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb564: 0x10bb564: jal   0x10c09c0 addu  a0, v0, zero
+// 0x010bbbac: 0x10bbbac: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb56c: 0x10bb56c: lw    a0, 48(sp)
+// 0x010bbbb4: 0x10bbbb4: lw    a0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7794,10 +7794,10 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bb570: 0x10bb570: addu  a2, v0, zero
+// 0x010bbbb8: 0x10bbbb8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bb574: 0x10bb574: sw    a2, 264(sp)
+// 0x010bbbbc: 0x10bbbbc: sw    a2, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7806,7 +7806,7 @@ L_10bb53c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010bb578: 0x10bb578: jal   0x10c09c0 sw    v1, 268(sp)
+// 0x010bbbc0: 0x10bbbc0: jal   0x10c1000 sw    v1, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7817,12 +7817,12 @@ L_10bb53c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb580: 0x10bb580: lw    a2, 264(sp)
+// 0x010bbbc8: 0x10bbbc8: lw    a2, 264(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7831,7 +7831,7 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bb584: 0x10bb584: lw    a3, 268(sp)
+// 0x010bbbcc: 0x10bbbcc: lw    a3, 268(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7840,16 +7840,16 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bb588: 0x10bb588: addu  a0, a2, zero
+// 0x010bbbd0: 0x10bbbd0: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010bb58c: 0x10bb58c: addu  a1, a3, zero
+// 0x010bbbd4: 0x10bbbd4: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010bb590: 0x10bb590: addu  a2, v0, zero
+// 0x010bbbd8: 0x10bbbd8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bb594: 0x10bb594: jal   0x10c07f0 addu  a3, v1, zero
+// 0x010bbbdc: 0x10bbbdc: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -7857,12 +7857,12 @@ L_10bb53c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb59c: 0x10bb59c: lw    t0, 272(sp)
+// 0x010bbbe4: 0x10bbbe4: lw    t0, 272(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7871,60 +7871,60 @@ L_10bb53c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bb5a0: 0x10bb5a0: addiu s0, zero, 2
+// 0x010bbbe8: 0x10bbbe8: addiu s0, zero, 2
 	ldc.i4.2
 	stloc 8
-// 0x010bb5a4: 0x10bb5a4: addiu t0, t0, 1
+// 0x010bbbec: 0x10bbbec: addiu t0, t0, 1
 	ldloc 17
 	ldc.i4.1
 	add
 	stloc 17
-// 0x010bb5a8: 0x10bb5a8: subu  t0, t0, s2
+// 0x010bbbf0: 0x10bbbf0: subu  t0, t0, s2
 	ldloc 17
 	ldloc 10
 	sub
 	stloc 17
-// 0x010bb5ac: 0x10bb5ac: div   t0, s0
+// 0x010bbbf4: 0x10bbbf4: div   t0, s0
 	ldloc 17
 	ldloc 8
 	div
 	stloc 18
-// 0x010bb5b0: 0x10bb5b0: addu  s6, v0, zero
+// 0x010bbbf8: 0x10bbbf8: addu  s6, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010bb5b4: 0x10bb5b4: addu  s5, v1, zero
+// 0x010bbbfc: 0x10bbbfc: addu  s5, v1, zero
 	ldloc 6
 	stloc 13
-// 0x010bb5b8: 0x10bb5b8: addiu s8, s8, 1
+// 0x010bbc00: 0x10bbc00: addiu s8, s8, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x010bb5bc: 0x10bb5bc: mflo  lo
+// 0x010bbc04: 0x10bbc04: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x010bb5c0: 0x10bb5c0: jal   0x10c09c0 subu  s8, s8, s4
+// 0x010bbc08: 0x10bbc08: jal   0x10c1000 subu  s8, s8, s4
 	ldloc 16
 	ldloc 12
 	sub
 	stloc 16
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb5c8: 0x10bb5c8: addu  a3, v1, zero
+// 0x010bbc10: 0x10bbc10: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010bb5cc: 0x10bb5cc: addu  a2, v0, zero
+// 0x010bbc14: 0x10bbc14: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bb5d0: 0x10bb5d0: addu  a0, s6, zero
+// 0x010bbc18: 0x10bbc18: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x010bb5d4: 0x10bb5d4: jal   0x10c0798 addu  a1, s5, zero
+// 0x010bbc1c: 0x10bbc1c: jal   0x10c0dd8 addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -7932,60 +7932,60 @@ L_10bb53c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb5dc: 0x10bb5dc: addu  a1, v1, zero
+// 0x010bbc24: 0x10bbc24: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010bb5e0: 0x10bb5e0: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010bbc28: 0x10bbc28: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb5e8: 0x10bb5e8: div   s8, s0
+// 0x010bbc30: 0x10bbc30: div   s8, s0
 	ldloc 16
 	ldloc 8
 	div
 	stloc 18
-// 0x010bb5ec: 0x10bb5ec: sll   v0, v0, 1
+// 0x010bbc34: 0x10bbc34: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x010bb5f0: 0x10bb5f0: mflo  lo
+// 0x010bbc38: 0x10bbc38: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x010bb5f4: 0x10bb5f4: jal   0x10c09c0 addu  s2, v0, s2
+// 0x010bbc3c: 0x10bbc3c: jal   0x10c1000 addu  s2, v0, s2
 	ldloc 5
 	ldloc 10
 	add
 	stloc 10
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb5fc: 0x10bb5fc: addu  a3, v1, zero
+// 0x010bbc44: 0x10bbc44: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010bb600: 0x10bb600: addu  a0, s6, zero
+// 0x010bbc48: 0x10bbc48: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x010bb604: 0x10bb604: addu  a1, s5, zero
+// 0x010bbc4c: 0x10bbc4c: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x010bb608: 0x10bb608: jal   0x10c0798 addu  a2, v0, zero
+// 0x010bbc50: 0x10bbc50: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -7993,58 +7993,58 @@ L_10bb53c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb610: 0x10bb610: addu  a1, v1, zero
+// 0x010bbc58: 0x10bbc58: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010bb614: 0x10bb614: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010bbc5c: 0x10bbc5c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb61c: 0x10bb61c: sll   v0, v0, 1
+// 0x010bbc64: 0x10bbc64: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x010bb620: 0x10bb620: bne   s7, s0, 0x10bb634 addu  s4, v0, s4
+// 0x010bbc68: 0x10bbc68: bne   s7, s0, 0x10bbc7c addu  s4, v0, s4
 	ldloc 14
 	ldloc 8
 	ldloc 5
 	ldloc 12
 	add
 	stloc 12
-	bne.un L_10bb634
+	bne.un L_10bbc7c
 // --- basic block ---
-// 0x010bb628: 0x10bb628: addu  v0, s2, zero
+// 0x010bbc70: 0x10bbc70: addu  v0, s2, zero
 	ldloc 10
 	stloc 5
-// 0x010bb62c: 0x10bb62c: addu  s2, s4, zero
+// 0x010bbc74: 0x10bbc74: addu  s2, s4, zero
 	ldloc 12
 	stloc 10
-// 0x010bb630: 0x10bb630: addu  s4, v0, zero
+// 0x010bbc78: 0x10bbc78: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-L_10bb634:
-// 0x010bb634: 0x10bb634: lui   a0, 0x10000
+L_10bbc7c:
+// 0x010bbc7c: 0x10bbc7c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb638: 0x10bb638: addiu a0, a0, -31172
+// 0x010bbc80: 0x10bbc80: addiu a0, a0, -31172
 	ldloc.1
 	ldc.i4 -31172
 	add
 	stloc.1
-// 0x010bb63c: 0x10bb63c: jal   0x1094770 addu  a1, s3, zero
+// 0x010bbc84: 0x10bbc84: jal   0x1094d94 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -8052,49 +8052,49 @@ L_10bb634:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb644: 0x10bb644: lui   a0, 0x10000
+// 0x010bbc8c: 0x10bbc8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb648: 0x10bb648: addiu s0, sp, 160
+// 0x010bbc90: 0x10bbc90: addiu s0, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
 	stloc 8
-// 0x010bb64c: 0x10bb64c: addu  a1, s1, zero
+// 0x010bbc94: 0x10bbc94: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010bb650: 0x10bb650: addiu a0, a0, -28756
+// 0x010bbc98: 0x10bbc98: addiu a0, a0, -28756
 	ldloc.1
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010bb654: 0x10bb654: jal   0x1094770 lui   s1, 0x20000
-	ldc.i4 131072
+// 0x010bbc9c: 0x10bbc9c: jal   0x1094d94 lui   s1, 0x10000
+	ldc.i4 65536
 	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb65c: 0x10bb65c: addu  a2, s2, zero
+// 0x010bbca4: 0x10bbca4: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010bb660: 0x10bb660: addu  a0, s0, zero
+// 0x010bbca8: 0x10bbca8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010bb664: 0x10bb664: jal   0x1000f64 addiu a1, s1, -13884
+// 0x010bbcac: 0x10bbcac: jal   0x1000f64 addiu a1, s1, 19088
 	ldloc 9
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
 	ldloc.0
@@ -8107,15 +8107,15 @@ L_10bb634:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb66c: 0x10bb66c: lui   a0, 0x20000
+// 0x010bbcb4: 0x10bbcb4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb670: 0x10bb670: addu  a1, s0, zero
+// 0x010bbcb8: 0x10bbcb8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010bb674: 0x10bb674: jal   0x1094770 addiu a0, a0, 22080
+// 0x010bbcbc: 0x10bbcbc: jal   0x1094d94 addiu a0, a0, 22540
 	ldloc.1
-	ldc.i4 22080
+	ldc.i4 22540
 	add
 	stloc.1
 	ldloc.0
@@ -8123,20 +8123,20 @@ L_10bb634:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb67c: 0x10bb67c: addu  a2, s4, zero
+// 0x010bbcc4: 0x10bbcc4: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x010bb680: 0x10bb680: addu  a0, s0, zero
+// 0x010bbcc8: 0x10bbcc8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010bb684: 0x10bb684: jal   0x1000f64 addiu a1, s1, -13884
+// 0x010bbccc: 0x10bbccc: jal   0x1000f64 addiu a1, s1, 19088
 	ldloc 9
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
 	ldloc.0
@@ -8149,15 +8149,15 @@ L_10bb634:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb68c: 0x10bb68c: lui   a0, 0x20000
+// 0x010bbcd4: 0x10bbcd4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb690: 0x10bb690: addu  a1, s0, zero
+// 0x010bbcd8: 0x10bbcd8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010bb694: 0x10bb694: jal   0x1094770 addiu a0, a0, 22108
+// 0x010bbcdc: 0x10bbcdc: jal   0x1094d94 addiu a0, a0, 22568
 	ldloc.1
-	ldc.i4 22108
+	ldc.i4 22568
 	add
 	stloc.1
 	ldloc.0
@@ -8165,25 +8165,25 @@ L_10bb634:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb69c: 0x10bb69c: lui   s0, 0x10000
+// 0x010bbce4: 0x10bbce4: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010bb6a0: 0x10bb6a0: lui   a0, 0x20000
+// 0x010bbce8: 0x10bbce8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb6a4: 0x10bb6a4: addiu a0, a0, 21916
+// 0x010bbcec: 0x10bbcec: addiu a0, a0, 22376
 	ldloc.1
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.1
-// 0x010bb6a8: 0x10bb6a8: jal   0x1094770 addiu a1, s0, 18500
+// 0x010bbcf0: 0x10bbcf0: jal   0x1094d94 addiu a1, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -8191,22 +8191,22 @@ L_10bb634:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb6b0: 0x10bb6b0: lui   a0, 0x20000
+// 0x010bbcf8: 0x10bbcf8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bb6b4: 0x10bb6b4: addiu a0, a0, 21928
+// 0x010bbcfc: 0x10bbcfc: addiu a0, a0, 22388
 	ldloc.1
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.1
-// 0x010bb6b8: 0x10bb6b8: jal   0x1094770 addiu a1, s0, 18500
+// 0x010bbd00: 0x10bbd00: jal   0x1094d94 addiu a1, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -8214,25 +8214,25 @@ L_10bb634:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bb6c0: 0x10bb6c0: jal   0x109483c sll   zero, zero, 0
+// 0x010bbd08: 0x10bbd08: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10bb6c8:
-// 0x010bb6c8: 0x10bb6c8: lw    ra, 316(sp)
-// 0x010bb6cc: 0x10bb6cc: lw    s8, 312(sp)
+L_10bbd10:
+// 0x010bbd10: 0x10bbd10: lw    ra, 316(sp)
+// 0x010bbd14: 0x10bbd14: lw    s8, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8241,7 +8241,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bb6d0: 0x10bb6d0: lw    s7, 308(sp)
+// 0x010bbd18: 0x10bbd18: lw    s7, 308(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8250,7 +8250,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bb6d4: 0x10bb6d4: lw    s6, 304(sp)
+// 0x010bbd1c: 0x10bbd1c: lw    s6, 304(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8259,7 +8259,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bb6d8: 0x10bb6d8: lw    s5, 300(sp)
+// 0x010bbd20: 0x10bbd20: lw    s5, 300(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8268,7 +8268,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bb6dc: 0x10bb6dc: lw    s4, 296(sp)
+// 0x010bbd24: 0x10bbd24: lw    s4, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8277,7 +8277,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bb6e0: 0x10bb6e0: lw    s3, 292(sp)
+// 0x010bbd28: 0x10bbd28: lw    s3, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8286,7 +8286,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bb6e4: 0x10bb6e4: lw    s2, 288(sp)
+// 0x010bbd2c: 0x10bbd2c: lw    s2, 288(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8295,7 +8295,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bb6e8: 0x10bb6e8: lw    s1, 284(sp)
+// 0x010bbd30: 0x10bbd30: lw    s1, 284(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8304,7 +8304,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bb6ec: 0x10bb6ec: lw    s0, 280(sp)
+// 0x010bbd34: 0x10bbd34: lw    s0, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8313,7 +8313,7 @@ L_10bb6c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bb6f0: 0x10bb6f0: jr    ra addiu sp, sp, 320
+// 0x010bbd38: 0x10bbd38: jr    ra addiu sp, sp, 320
 	ldloc.0
 	ldc.i4 320
 	add
diff --git a/converted/Cibyl14.j b/converted/Cibyl14.j
index 2a4a58f..1cce9de 100644
--- a/converted/Cibyl14.j
+++ b/converted/Cibyl14.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl14::.ctor
 
-.method public static int32 roadmap_street_check_distance_1013390(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_check_distance_10133a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -85,15 +85,15 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013390: 0x1013390: addiu sp, sp, -96
+// 0x010133a0: 0x10133a0: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01013394: 0x1013394: lui   v0, 0x0
+// 0x010133a4: 0x10133a4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01013398: 0x1013398: sw    s1, 84(sp)
+// 0x010133a8: 0x10133a8: sw    s1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -102,7 +102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101339c: 0x101339c: lw    v0, 576(v0)
+// 0x010133ac: 0x10133ac: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -111,10 +111,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010133a0: 0x10133a0: addu  s1, a0, zero
+// 0x010133b0: 0x10133b0: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010133a4: 0x10133a4: lw    a0, 12(a0)
+// 0x010133b4: 0x10133b4: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -123,7 +123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010133a8: 0x10133a8: sw    s0, 80(sp)
+// 0x010133b8: 0x10133b8: sw    s0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -132,8 +132,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010133ac: 0x10133ac: sw    ra, 92(sp)
-// 0x010133b0: 0x10133b0: sw    s2, 88(sp)
+// 0x010133bc: 0x10133bc: sw    ra, 92(sp)
+// 0x010133c0: 0x10133c0: sw    s2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -142,46 +142,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010133b4: 0x10133b4: beq   a0, v0, 0x10133cc addu  s0, a1, zero
+// 0x010133c4: 0x10133c4: beq   a0, v0, 0x10133dc addu  s0, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 8
-	beq  L_10133cc
+	beq  L_10133dc
 // --- basic block ---
-// 0x010133bc: 0x10133bc: bltz  a0, 0x10133d0 lui   v0, 0x30000
+// 0x010133cc: 0x10133cc: bltz  a0, 0x10133e0 lui   v0, 0x30000
 	ldloc.1
 	ldc.i4 196608
 	stloc 5
 	ldc.i4.s 0
-	blt L_10133d0
+	blt L_10133e0
 // --- basic block ---
-// 0x010133c4: 0x10133c4: jal   0x100b164 sll   zero, zero, 0
+// 0x010133d4: 0x10133d4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10133cc:
-// 0x010133cc: 0x10133cc: lui   v0, 0x30000
+L_10133dc:
+// 0x010133dc: 0x10133dc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_10133d0:
-// 0x010133d0: 0x10133d0: lw    v0, -30624(v0)
+L_10133e0:
+// 0x010133e0: 0x10133e0: lw    v0, -30160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7656
+	ldc.i4 -7540
 	add
 	ldelem.i4
 	stloc 5
-// 0x010133d4: 0x10133d4: lw    a0, 12(s0)
+// 0x010133e4: 0x10133e4: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -190,7 +190,7 @@ L_10133d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010133d8: 0x10133d8: lw    a1, 4(s1)
+// 0x010133e8: 0x10133e8: lw    a1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -199,7 +199,7 @@ L_10133d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010133dc: 0x10133dc: lw    a2, 8(s0)
+// 0x010133ec: 0x10133ec: lw    a2, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -208,86 +208,86 @@ L_10133d0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010133e0: 0x10133e0: beq   v0, zero, 0x10134b0 lui   v0, 0x20000
+// 0x010133f0: 0x10133f0: beq   v0, zero, 0x10134c0 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10134b0
+	brfalse L_10134c0
 // --- basic block ---
-// 0x010133e8: 0x10133e8: lw    v1, 31152(v0)
+// 0x010133f8: 0x10133f8: lw    v1, 31616(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x010133ec: 0x10133ec: sll   v0, a1, 3
+// 0x010133fc: 0x10133fc: sll   v0, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010133f0: 0x10133f0: addu  v0, v1, v0
+// 0x01013400: 0x1013400: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010133f4: 0x10133f4: lhu   a3, 4(v0)
+// 0x01013404: 0x1013404: lhu   a3, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x010133f8: 0x10133f8: ori   v0, zero, 65535
+// 0x01013408: 0x1013408: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x010133fc: 0x10133fc: beq   a3, v0, 0x1013444 lui   v0, 0x20000
+// 0x0101340c: 0x101340c: beq   a3, v0, 0x1013454 lui   v0, 0x20000
 	ldloc 4
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_1013444
+	beq  L_1013454
 // --- basic block ---
-// 0x01013404: 0x1013404: lw    v1, 31240(v0)
+// 0x01013414: 0x1013414: lw    v1, 31704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013408: 0x1013408: sll   v0, a3, 2
+// 0x01013418: 0x1013418: sll   v0, a3, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0101340c: 0x101340c: addu  v0, v1, v0
+// 0x0101341c: 0x101341c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01013410: 0x1013410: lw    v0, 0(v0)
+// 0x01013420: 0x1013420: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01013414: 0x1013414: sll   zero, zero, 0
-// 0x01013418: 0x1013418: blez  v0, 0x1013444 addu  v0, v0, a3
+// 0x01013424: 0x1013424: sll   zero, zero, 0
+// 0x01013428: 0x1013428: blez  v0, 0x1013454 addu  v0, v0, a3
 	ldloc 5
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
 	ldc.i4.s 0
-	ble L_1013444
+	ble L_1013454
 // --- basic block ---
-// 0x01013420: 0x1013420: sw    v0, 16(sp)
+// 0x01013430: 0x1013430: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -296,12 +296,12 @@ L_10133d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01013424: 0x1013424: addiu v0, sp, 32
+// 0x01013434: 0x1013434: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01013428: 0x1013428: sw    v0, 20(sp)
+// 0x01013438: 0x1013438: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -310,15 +310,15 @@ L_10133d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101342c: 0x101342c: addiu a3, a3, 1
+// 0x0101343c: 0x101343c: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01013430: 0x1013430: addiu v0, zero, 1
+// 0x01013440: 0x1013440: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01013434: 0x1013434: jal   0x1012dac sw    v0, 24(sp)
+// 0x01013444: 0x1013444: jal   0x1012dbc sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -332,16 +332,16 @@ L_10133d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_distance_with_shape_1012dac(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_distance_with_shape_1012dbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101343c: 0x101343c: j	 0x101344c sll   zero, zero, 0
-	br L_101344c
+// 0x0101344c: 0x101344c: j	 0x101345c sll   zero, zero, 0
+	br L_101345c
 // --- basic block ---
-L_1013444:
-// 0x01013444: 0x1013444: jal   0x1012c88 addiu a3, sp, 32
+L_1013454:
+// 0x01013454: 0x1013454: jal   0x1012c98 addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -351,29 +351,29 @@ L_1013444:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_distance_no_shape_1012c88(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_distance_no_shape_1012c98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101344c:
-// 0x0101344c: 0x101344c: beq   v0, zero, 0x10134b0 sll   zero, zero, 0
+L_101345c:
+// 0x0101345c: 0x101345c: beq   v0, zero, 0x10134c0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10134b0
+	brfalse L_10134c0
 // --- basic block ---
-// 0x01013454: 0x1013454: lw    v0, 0(s0)
+// 0x01013464: 0x1013464: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01013458: 0x1013458: sll   zero, zero, 0
-// 0x0101345c: 0x101345c: beq   v0, zero, 0x1013484 sll   zero, zero, 0
+// 0x01013468: 0x1013468: sll   zero, zero, 0
+// 0x0101346c: 0x101346c: beq   v0, zero, 0x1013494 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1013484
+	brfalse L_1013494
 // --- basic block ---
-// 0x01013464: 0x1013464: lw    v0, 4(s0)
+// 0x01013474: 0x1013474: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -382,8 +382,8 @@ L_101344c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013468: 0x1013468: sll   zero, zero, 0
-// 0x0101346c: 0x101346c: lw    v1, 20(v0)
+// 0x01013478: 0x1013478: sll   zero, zero, 0
+// 0x0101347c: 0x101347c: lw    v1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -392,7 +392,7 @@ L_101344c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013470: 0x1013470: lw    v0, 52(sp)
+// 0x01013480: 0x1013480: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -401,18 +401,18 @@ L_101344c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013474: 0x1013474: sll   zero, zero, 0
-// 0x01013478: 0x1013478: slt   v0, v0, v1
+// 0x01013484: 0x1013484: sll   zero, zero, 0
+// 0x01013488: 0x1013488: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x0101347c: 0x101347c: beq   v0, zero, 0x10134b0 sll   zero, zero, 0
+// 0x0101348c: 0x101348c: beq   v0, zero, 0x10134c0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10134b0
+	brfalse L_10134c0
 // --- basic block ---
-L_1013484:
-// 0x01013484: 0x1013484: lw    s2, 4(s0)
+L_1013494:
+// 0x01013494: 0x1013494: lw    s2, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -421,15 +421,15 @@ L_1013484:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01013488: 0x1013488: addiu a1, sp, 32
+// 0x01013498: 0x1013498: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0101348c: 0x101348c: addu  a0, s2, zero
+// 0x0101349c: 0x101349c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01013490: 0x1013490: jal   0x1001800 addiu a2, zero, 48
+// 0x010134a0: 0x10134a0: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -441,7 +441,7 @@ L_1013484:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013498: 0x1013498: lw    v0, 12(s1)
+// 0x010134a8: 0x10134a8: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -450,7 +450,7 @@ L_1013484:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101349c: 0x101349c: lw    v1, 4(s1)
+// 0x010134ac: 0x10134ac: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -459,7 +459,7 @@ L_1013484:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010134a0: 0x10134a0: sw    v0, 12(s2)
+// 0x010134b0: 0x10134b0: sw    v0, 12(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -468,10 +468,10 @@ L_1013484:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010134a4: 0x10134a4: addiu v0, zero, 1
+// 0x010134b4: 0x10134b4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010134a8: 0x10134a8: sw    v1, 4(s2)
+// 0x010134b8: 0x10134b8: sw    v1, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -480,19 +480,19 @@ L_1013484:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010134ac: 0x10134ac: sw    v0, 0(s0)
+// 0x010134bc: 0x10134bc: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10134b0:
-// 0x010134b0: 0x10134b0: lw    ra, 92(sp)
-// 0x010134b4: 0x10134b4: addiu v0, zero, 1
+L_10134c0:
+// 0x010134c0: 0x10134c0: lw    ra, 92(sp)
+// 0x010134c4: 0x10134c4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010134b8: 0x10134b8: lw    s2, 88(sp)
+// 0x010134c8: 0x10134c8: lw    s2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -501,7 +501,7 @@ L_10134b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010134bc: 0x10134bc: lw    s1, 84(sp)
+// 0x010134cc: 0x10134cc: lw    s1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -510,7 +510,7 @@ L_10134b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010134c0: 0x10134c0: lw    s0, 80(sp)
+// 0x010134d0: 0x10134d0: lw    s0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -519,7 +519,7 @@ L_10134b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010134c4: 0x10134c4: jr    ra addiu sp, sp, 96
+// 0x010134d4: 0x10134d4: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -531,7 +531,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_street_get_distance_10134cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_street_get_distance_10134dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -572,15 +572,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010134cc: 0x10134cc: addiu sp, sp, -80
+// 0x010134dc: 0x10134dc: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010134d0: 0x10134d0: lui   v0, 0x0
+// 0x010134e0: 0x10134e0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010134d4: 0x10134d4: sw    s1, 72(sp)
+// 0x010134e4: 0x10134e4: sw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -589,7 +589,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010134d8: 0x10134d8: sw    s0, 68(sp)
+// 0x010134e8: 0x10134e8: sw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -598,17 +598,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010134dc: 0x10134dc: addiu s1, sp, 40
+// 0x010134ec: 0x10134ec: addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x010134e0: 0x10134e0: addiu s0, sp, 24
+// 0x010134f0: 0x10134f0: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x010134e4: 0x10134e4: lw    v0, 576(v0)
+// 0x010134f4: 0x10134f4: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -617,7 +617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010134e8: 0x10134e8: sw    a2, 32(sp)
+// 0x010134f8: 0x10134f8: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -626,7 +626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010134ec: 0x10134ec: sw    a0, 36(sp)
+// 0x010134fc: 0x10134fc: sw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -635,7 +635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010134f0: 0x10134f0: sw    a1, 44(sp)
+// 0x01013500: 0x1013500: sw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -644,17 +644,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010134f4: 0x10134f4: addu  a0, s1, zero
+// 0x01013504: 0x1013504: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010134f8: 0x10134f8: addu  a1, s0, zero
+// 0x01013508: 0x1013508: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x010134fc: 0x10134fc: addu  a2, zero, zero
+// 0x0101350c: 0x101350c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01013500: 0x1013500: sw    ra, 76(sp)
-// 0x01013504: 0x1013504: sw    a3, 28(sp)
+// 0x01013510: 0x1013510: sw    ra, 76(sp)
+// 0x01013514: 0x1013514: sw    a3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -663,7 +663,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01013508: 0x1013508: sw    v0, 52(sp)
+// 0x01013518: 0x1013518: sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -672,7 +672,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101350c: 0x101350c: sw    zero, 24(sp)
+// 0x0101351c: 0x101351c: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -681,7 +681,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01013510: 0x1013510: jal   0x1013390 sw    zero, 40(sp)
+// 0x01013520: 0x1013520: jal   0x10133a0 sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -695,32 +695,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_street_check_distance_1013390(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_street_check_distance_10133a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01013518: 0x1013518: lui   v0, 0x1010000
+// 0x01013528: 0x1013528: lui   v0, 0x1010000
 	ldc.i4 16842752
 	stloc 6
-// 0x0101351c: 0x101351c: addu  a0, s1, zero
+// 0x0101352c: 0x101352c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01013520: 0x1013520: addiu v0, v0, 13200
+// 0x01013530: 0x1013530: addiu v0, v0, 13216
 	ldloc 6
-	ldc.i4 13200
+	ldc.i4 13216
 	add
 	stloc 6
-// 0x01013524: 0x1013524: addu  a1, zero, zero
+// 0x01013534: 0x1013534: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01013528: 0x1013528: addu  a2, zero, zero
+// 0x01013538: 0x1013538: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101352c: 0x101352c: addiu a3, zero, 3
+// 0x0101353c: 0x101353c: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x01013530: 0x1013530: sw    s0, 20(sp)
+// 0x01013540: 0x1013540: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -729,7 +729,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01013534: 0x1013534: jal   0x1012790 sw    v0, 16(sp)
+// 0x01013544: 0x1013544: jal   0x10127a0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -743,13 +743,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101353c: 0x101353c: lw    ra, 76(sp)
-// 0x01013540: 0x1013540: lw    v0, 24(sp)
+// 0x0101354c: 0x101354c: lw    ra, 76(sp)
+// 0x01013550: 0x1013550: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -758,7 +758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01013544: 0x1013544: lw    s1, 72(sp)
+// 0x01013554: 0x1013554: lw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -767,7 +767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01013548: 0x1013548: lw    s0, 68(sp)
+// 0x01013558: 0x1013558: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -776,7 +776,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101354c: 0x101354c: jr    ra addiu sp, sp, 80
+// 0x0101355c: 0x101355c: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -788,7 +788,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_county_count_101355c()
+.method public static int32 roadmap_county_count_101356c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -802,7 +802,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101355c: 0x101355c: jr    ra addu  v0, zero, zero
+// 0x0101356c: 0x101356c: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -810,7 +810,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_county_by_position_101358c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_county_by_position_101359c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -851,12 +851,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101358c: 0x101358c: addiu sp, sp, -32
+// 0x0101359c: 0x101359c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01013590: 0x1013590: sw    s1, 24(sp)
+// 0x010135a0: 0x10135a0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -865,7 +865,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01013594: 0x1013594: sw    s0, 20(sp)
+// 0x010135a4: 0x10135a4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -874,8 +874,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01013598: 0x1013598: sw    ra, 28(sp)
-// 0x0101359c: 0x101359c: jal   0x1013894 addu  s1, a1, zero
+// 0x010135a8: 0x10135a8: sw    ra, 28(sp)
+// 0x010135ac: 0x10135ac: jal   0x10138a4 addu  s1, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -883,18 +883,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_static_county_1013894(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_static_county_10138a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010135a4: 0x10135a4: beq   v0, zero, 0x10135c4 addu  s0, v0, zero
+// 0x010135b4: 0x10135b4: beq   v0, zero, 0x10135d4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_10135c4
+	brfalse L_10135d4
 // --- basic block ---
-// 0x010135ac: 0x10135ac: jal   0x1013c44 addu  a0, v0, zero
+// 0x010135bc: 0x10135bc: jal   0x1013c54 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -902,33 +902,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010135b4: 0x10135b4: bne   v0, zero, 0x10135c4 addiu v0, zero, 1
+// 0x010135c4: 0x10135c4: bne   v0, zero, 0x10135d4 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10135c4
+	brtrue L_10135d4
 // --- basic block ---
-// 0x010135bc: 0x10135bc: j	 0x10135c8 sw    s0, 0(s1)
+// 0x010135cc: 0x10135cc: j	 0x10135d8 sw    s0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_10135c8
+	br L_10135d8
 // --- basic block ---
-L_10135c4:
-// 0x010135c4: 0x10135c4: addu  v0, zero, zero
+L_10135d4:
+// 0x010135d4: 0x10135d4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10135c8:
-// 0x010135c8: 0x10135c8: lw    ra, 28(sp)
-// 0x010135cc: 0x10135cc: lw    s1, 24(sp)
+L_10135d8:
+// 0x010135d8: 0x10135d8: lw    ra, 28(sp)
+// 0x010135dc: 0x10135dc: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -937,7 +937,7 @@ L_10135c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010135d0: 0x10135d0: lw    s0, 20(sp)
+// 0x010135e0: 0x10135e0: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -946,7 +946,7 @@ L_10135c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010135d4: 0x10135d4: jr    ra addiu sp, sp, 32
+// 0x010135e4: 0x10135e4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -958,7 +958,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_county_search_index_10135dc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_county_search_index_10135ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 lo,int32 ra)
@@ -1002,12 +1002,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010135dc: 0x10135dc: addiu sp, sp, -40
+// 0x010135ec: 0x10135ec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010135e0: 0x10135e0: sw    s0, 28(sp)
+// 0x010135f0: 0x10135f0: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1016,10 +1016,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010135e4: 0x10135e4: addu  s0, a0, zero
+// 0x010135f4: 0x10135f4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010135e8: 0x10135e8: lw    a0, 28(zero)
+// 0x010135f8: 0x10135f8: lw    a0, 28(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
@@ -1028,10 +1028,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010135ec: 0x10135ec: addu  a1, s0, zero
+// 0x010135fc: 0x10135fc: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010135f0: 0x10135f0: sw    s1, 32(sp)
+// 0x01013600: 0x1013600: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1040,22 +1040,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010135f4: 0x10135f4: sw    ra, 36(sp)
-// 0x010135f8: 0x10135f8: jal   0x1015518 addiu s1, zero, 24
+// 0x01013604: 0x1013604: sw    ra, 36(sp)
+// 0x01013608: 0x1013608: jal   0x1015528 addiu s1, zero, 24
 	ldc.i4.s 24
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_get_first_1015518(int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_first_1015528(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01013600: 0x1013600: j	 0x1013634 addu  a1, v0, zero
+// 0x01013610: 0x1013610: j	 0x1013644 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-	br L_1013634
+	br L_1013644
 // --- basic block ---
-L_1013608:
-// 0x01013608: 0x1013608: lw    v1, 4(zero)
+L_1013618:
+// 0x01013618: 0x1013618: lw    v1, 4(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
@@ -1064,28 +1064,28 @@ L_1013608:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101360c: 0x101360c: mflo  lo
+// 0x0101361c: 0x101361c: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x01013610: 0x1013610: addu  v1, v1, a0
+// 0x01013620: 0x1013620: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01013614: 0x1013614: lw    v1, 0(v1)
+// 0x01013624: 0x1013624: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01013618: 0x1013618: sll   zero, zero, 0
-// 0x0101361c: 0x101361c: beq   s0, v1, 0x10136a0 sll   zero, zero, 0
+// 0x01013628: 0x1013628: sll   zero, zero, 0
+// 0x0101362c: 0x101362c: beq   s0, v1, 0x10136b0 sll   zero, zero, 0
 	ldloc 8
 	ldloc 7
-	beq  L_10136a0
+	beq  L_10136b0
 // --- basic block ---
-// 0x01013624: 0x1013624: lw    a0, 28(zero)
+// 0x01013634: 0x1013634: lw    a0, 28(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
@@ -1094,40 +1094,40 @@ L_1013608:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01013628: 0x1013628: jal   0x1015744 sll   zero, zero, 0
+// 0x01013638: 0x1013638: jal   0x1015754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013630: 0x1013630: addu  a1, v0, zero
+// 0x01013640: 0x1013640: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-L_1013634:
-// 0x01013634: 0x1013634: bgez  v0, 0x1013608 mult  v0, s1
+L_1013644:
+// 0x01013644: 0x1013644: bgez  v0, 0x1013618 mult  v0, s1
 	ldloc 5
 	ldloc 5
 	ldloc 9
 	mul
 	stloc 10
 	ldc.i4.s 0
-	bge L_1013608
+	bge L_1013618
 // --- basic block ---
-// 0x0101363c: 0x101363c: addu  v0, zero, zero
+// 0x0101364c: 0x101364c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01013640: 0x1013640: j	 0x1013688 addiu v1, zero, 24
+// 0x01013650: 0x1013650: j	 0x1013698 addiu v1, zero, 24
 	ldc.i4.s 24
 	stloc 7
-	br L_1013688
+	br L_1013698
 // --- basic block ---
-L_1013648:
-// 0x01013648: 0x1013648: lw    a0, 4(zero)
+L_1013658:
+// 0x01013658: 0x1013658: lw    a0, 4(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
@@ -1136,37 +1136,37 @@ L_1013648:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101364c: 0x101364c: mflo  lo
+// 0x0101365c: 0x101365c: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x01013650: 0x1013650: addu  a0, a0, a1
+// 0x01013660: 0x1013660: addu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01013654: 0x1013654: lw    a0, 0(a0)
+// 0x01013664: 0x1013664: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01013658: 0x1013658: sll   zero, zero, 0
-// 0x0101365c: 0x101365c: bne   s0, a0, 0x1013688 addiu v0, v0, 1
+// 0x01013668: 0x1013668: sll   zero, zero, 0
+// 0x0101366c: 0x101366c: bne   s0, a0, 0x1013698 addiu v0, v0, 1
 	ldloc 8
 	ldloc.1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	bne.un L_1013688
+	bne.un L_1013698
 // --- basic block ---
-// 0x01013664: 0x1013664: addiu v0, v0, -1
+// 0x01013674: 0x1013674: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01013668: 0x1013668: lw    a0, 28(zero)
+// 0x01013678: 0x1013678: lw    a0, 28(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
@@ -1175,13 +1175,13 @@ L_1013648:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101366c: 0x101366c: addu  a2, v0, zero
+// 0x0101367c: 0x101367c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01013670: 0x1013670: addu  a1, s0, zero
+// 0x01013680: 0x1013680: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01013674: 0x1013674: jal   0x10157cc sw    v0, 16(sp)
+// 0x01013684: 0x1013684: jal   0x10157dc sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1195,12 +1195,12 @@ L_1013648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101367c: 0x101367c: lw    v0, 16(sp)
+// 0x0101368c: 0x101368c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1209,11 +1209,11 @@ L_1013648:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013680: 0x1013680: j	 0x10136a0 sll   zero, zero, 0
-	br L_10136a0
+// 0x01013690: 0x1013690: j	 0x10136b0 sll   zero, zero, 0
+	br L_10136b0
 // --- basic block ---
-L_1013688:
-// 0x01013688: 0x1013688: lw    a0, 8(zero)
+L_1013698:
+// 0x01013698: 0x1013698: lw    a0, 8(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
@@ -1222,26 +1222,26 @@ L_1013688:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101368c: 0x101368c: sll   zero, zero, 0
-// 0x01013690: 0x1013690: slt   a0, v0, a0
+// 0x0101369c: 0x101369c: sll   zero, zero, 0
+// 0x010136a0: 0x10136a0: slt   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.1
-// 0x01013694: 0x1013694: bne   a0, zero, 0x1013648 mult  v0, v1
+// 0x010136a4: 0x10136a4: bne   a0, zero, 0x1013658 mult  v0, v1
 	ldloc.1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 10
-	brtrue L_1013648
+	brtrue L_1013658
 // --- basic block ---
-// 0x0101369c: 0x101369c: addiu v0, zero, -1
+// 0x010136ac: 0x10136ac: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10136a0:
-// 0x010136a0: 0x10136a0: lw    ra, 36(sp)
-// 0x010136a4: 0x10136a4: lw    s1, 32(sp)
+L_10136b0:
+// 0x010136b0: 0x10136b0: lw    ra, 36(sp)
+// 0x010136b4: 0x10136b4: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1250,7 +1250,7 @@ L_10136a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010136a8: 0x10136a8: lw    s0, 28(sp)
+// 0x010136b8: 0x10136b8: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1259,7 +1259,7 @@ L_10136a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010136ac: 0x10136ac: jr    ra addiu sp, sp, 40
+// 0x010136bc: 0x10136bc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1271,7 +1271,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_no_download_101372c()
+.method public static int32 roadmap_locator_no_download_101373c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1285,8 +1285,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_101372c:
-// 0x0101372c: 0x101372c: jr    ra addu  v0, zero, zero
+L_101373c:
+// 0x0101373c: 0x101373c: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1294,7 +1294,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_locator_close_1013734(int32,int32)
+.method public static int32 roadmap_locator_close_1013744(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1320,73 +1320,73 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013734: 0x1013734: lui   v0, 0x30000
+// 0x01013744: 0x1013744: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01013738: 0x1013738: lw    v1, -28624(v0)
+// 0x01013748: 0x1013748: lw    v1, -28160(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7156
+	ldc.i4 -7040
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101373c: 0x101373c: lui   v0, 0x30000
+// 0x0101374c: 0x101374c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01013740: 0x1013740: lw    a1, -28628(v0)
+// 0x01013750: 0x1013750: lw    a1, -28164(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7157
+	ldc.i4 -7041
 	add
 	ldelem.i4
 	stloc.1
-// 0x01013744: 0x1013744: addiu v1, v1, -1
+// 0x01013754: 0x1013754: addiu v1, v1, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01013748: 0x1013748: sll   v0, v1, 3
+// 0x01013758: 0x1013758: sll   v0, v1, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x0101374c: 0x101374c: j	 0x1013770 addu  v0, a1, v0
+// 0x0101375c: 0x101375c: j	 0x1013780 addu  v0, a1, v0
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-	br L_1013770
+	br L_1013780
 // --- basic block ---
-L_1013754:
-// 0x01013754: 0x1013754: lw    a1, 0(v0)
+L_1013764:
+// 0x01013764: 0x1013764: lw    a1, 0(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01013758: 0x1013758: sll   zero, zero, 0
-// 0x0101375c: 0x101375c: bne   a1, a0, 0x101376c addiu v1, v1, -1
+// 0x01013768: 0x1013768: sll   zero, zero, 0
+// 0x0101376c: 0x101376c: bne   a1, a0, 0x101377c addiu v1, v1, -1
 	ldloc.1
 	ldloc.0
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-	bne.un L_101376c
+	bne.un L_101377c
 // --- basic block ---
-// 0x01013764: 0x1013764: sw    zero, 0(v0)
+// 0x01013774: 0x1013774: sw    zero, 0(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01013768: 0x1013768: sw    zero, 4(v0)
+// 0x01013778: 0x1013778: sw    zero, 4(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1395,22 +1395,22 @@ L_1013754:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101376c:
-// 0x0101376c: 0x101376c: addiu v0, v0, -8
+L_101377c:
+// 0x0101377c: 0x101377c: addiu v0, v0, -8
 	ldloc.2
 	ldc.i4.s -8
 	add
 	stloc.2
-L_1013770:
-// 0x01013770: 0x1013770: bgez  v1, 0x1013754 sll   zero, zero, 0
+L_1013780:
+// 0x01013780: 0x1013780: bgez  v1, 0x1013764 sll   zero, zero, 0
 	ldloc.3
 	ldc.i4.s 0
-	bge L_1013754
+	bge L_1013764
 // --- basic block ---
-// 0x01013778: 0x1013778: lui   v0, 0x0
+// 0x01013788: 0x1013788: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101377c: 0x101377c: lw    v1, 1816(v0)
+// 0x0101378c: 0x101378c: lw    v1, 1816(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1419,18 +1419,18 @@ L_1013770:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01013780: 0x1013780: sll   zero, zero, 0
-// 0x01013784: 0x1013784: bne   v1, a0, 0x1013798 addiu a0, zero, -1
+// 0x01013790: 0x1013790: sll   zero, zero, 0
+// 0x01013794: 0x1013794: bne   v1, a0, 0x10137a8 addiu a0, zero, -1
 	ldloc.3
 	ldloc.0
 	ldc.i4.m1
 	stloc.0
-	bne.un L_1013798
+	bne.un L_10137a8
 // --- basic block ---
-// 0x0101378c: 0x101378c: lui   v1, 0x0
+// 0x0101379c: 0x101379c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01013790: 0x1013790: sw    a0, 1836(v1)
+// 0x010137a0: 0x10137a0: sw    a0, 1836(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
@@ -1439,7 +1439,7 @@ L_1013770:
 	add
 	ldloc.0
 	stelem.i4
-// 0x01013794: 0x1013794: sw    zero, 1816(v0)
+// 0x010137a4: 0x10137a4: sw    zero, 1816(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1448,8 +1448,8 @@ L_1013770:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1013798:
-// 0x01013798: 0x1013798: jr    ra sll   zero, zero, 0
+L_10137a8:
+// 0x010137a8: 0x10137a8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -1457,7 +1457,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_locator_declare_10137a0(int32)
+.method public static int32 roadmap_locator_declare_10137b0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -1480,20 +1480,20 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010137a0: 0x10137a0: bne   a0, zero, 0x10137b8 lui   v0, 0x0
+// 0x010137b0: 0x10137b0: bne   a0, zero, 0x10137c8 lui   v0, 0x0
 	ldloc.0
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_10137b8
-// 0x010137a8: 0x10137a8: lui   v1, 0x1010000
+	brtrue L_10137c8
+// 0x010137b8: 0x10137b8: lui   v1, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x010137ac: 0x10137ac: addiu v1, v1, 14124
+// 0x010137bc: 0x10137bc: addiu v1, v1, 14140
 	ldloc.1
-	ldc.i4 14124
+	ldc.i4 14140
 	add
 	stloc.1
-// 0x010137b0: 0x10137b0: jr    ra sw    v1, 1840(v0)
+// 0x010137c0: 0x10137c0: jr    ra sw    v1, 1840(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1504,8 +1504,8 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_10137b8:
-// 0x010137b8: 0x10137b8: jr    ra sw    a0, 1840(v0)
+L_10137c8:
+// 0x010137c8: 0x10137c8: jr    ra sw    a0, 1840(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -1521,7 +1521,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_locator_unload_tile_10137c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_unload_tile_10137d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1556,10 +1556,10 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010137c0: 0x10137c0: lui   v0, 0x0
+// 0x010137d0: 0x10137d0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010137c4: 0x10137c4: lw    v1, 1816(v0)
+// 0x010137d4: 0x10137d4: lw    v1, 1816(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -1568,23 +1568,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010137c8: 0x10137c8: addiu sp, sp, -24
+// 0x010137d8: 0x10137d8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010137cc: 0x10137cc: sw    ra, 20(sp)
-// 0x010137d0: 0x10137d0: addu  a1, a0, zero
+// 0x010137dc: 0x10137dc: sw    ra, 20(sp)
+// 0x010137e0: 0x10137e0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010137d4: 0x10137d4: blez  v1, 0x10137e4 addu  v0, zero, zero
+// 0x010137e4: 0x10137e4: blez  v1, 0x10137f4 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	ble L_10137e4
+	ble L_10137f4
 // --- basic block ---
-// 0x010137dc: 0x10137dc: jal   0x1003104 addu  a0, v1, zero
+// 0x010137ec: 0x10137ec: jal   0x1003104 addu  a0, v1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -1597,10 +1597,10 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10137e4:
-// 0x010137e4: 0x10137e4: lw    ra, 20(sp)
-// 0x010137e8: 0x10137e8: sll   zero, zero, 0
-// 0x010137ec: 0x10137ec: jr    ra addiu sp, sp, 24
+L_10137f4:
+// 0x010137f4: 0x10137f4: lw    ra, 20(sp)
+// 0x010137f8: 0x10137f8: sll   zero, zero, 0
+// 0x010137fc: 0x10137fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1612,7 +1612,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_load_tile_mem_10137f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_load_tile_mem_1013804(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
@@ -1650,10 +1650,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010137f4: 0x10137f4: lui   v0, 0x0
+// 0x01013804: 0x1013804: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010137f8: 0x10137f8: lw    v1, 1816(v0)
+// 0x01013808: 0x1013808: lw    v1, 1816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1662,44 +1662,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010137fc: 0x10137fc: addiu sp, sp, -32
+// 0x0101380c: 0x101380c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01013800: 0x1013800: sw    ra, 28(sp)
-// 0x01013804: 0x1013804: addu  t0, a0, zero
+// 0x01013810: 0x1013810: sw    ra, 28(sp)
+// 0x01013814: 0x1013814: addu  t0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01013808: 0x1013808: addu  a3, a1, zero
+// 0x01013818: 0x1013818: addu  a3, a1, zero
 	ldloc.2
 	stloc 4
-// 0x0101380c: 0x101380c: blez  v1, 0x1013834 addu  v0, a2, zero
+// 0x0101381c: 0x101381c: blez  v1, 0x1013844 addu  v0, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 5
 	ldc.i4.s 0
-	ble L_1013834
+	ble L_1013844
 // --- basic block ---
-// 0x01013814: 0x1013814: lui   a0, 0x30000
+// 0x01013824: 0x1013824: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01013818: 0x1013818: lw    a2, -28612(a0)
+// 0x01013828: 0x1013828: lw    a2, -28148(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7153
+	ldc.i4 -7037
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101381c: 0x101381c: addu  a1, t0, zero
+// 0x0101382c: 0x101382c: addu  a1, t0, zero
 	ldloc 9
 	stloc.2
-// 0x01013820: 0x1013820: addu  a0, v1, zero
+// 0x01013830: 0x1013830: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01013824: 0x1013824: jal   0x10037e0 sw    v0, 16(sp)
+// 0x01013834: 0x1013834: jal   0x10037e0 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1718,22 +1718,22 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101382c: 0x101382c: bne   v0, zero, 0x1013838 addu  v1, zero, zero
+// 0x0101383c: 0x101383c: bne   v0, zero, 0x1013848 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1013838
+	brtrue L_1013848
 // --- basic block ---
-L_1013834:
-// 0x01013834: 0x1013834: addiu v1, zero, -3
+L_1013844:
+// 0x01013844: 0x1013844: addiu v1, zero, -3
 	ldc.i4.s -3
 	stloc 6
-L_1013838:
-// 0x01013838: 0x1013838: lw    ra, 28(sp)
-// 0x0101383c: 0x101383c: addu  v0, v1, zero
+L_1013848:
+// 0x01013848: 0x1013848: lw    ra, 28(sp)
+// 0x0101384c: 0x101384c: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01013840: 0x1013840: jr    ra addiu sp, sp, 32
+// 0x01013850: 0x1013850: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1745,7 +1745,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_load_tile_1013848(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_load_tile_1013858(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1780,10 +1780,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013848: 0x1013848: lui   v0, 0x0
+// 0x01013858: 0x1013858: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101384c: 0x101384c: lw    v0, 1816(v0)
+// 0x0101385c: 0x101385c: lw    v0, 1816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1792,40 +1792,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013850: 0x1013850: addiu sp, sp, -24
+// 0x01013860: 0x1013860: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01013854: 0x1013854: sw    ra, 20(sp)
-// 0x01013858: 0x1013858: blez  v0, 0x1013880 addu  a1, a0, zero
+// 0x01013864: 0x1013864: sw    ra, 20(sp)
+// 0x01013868: 0x1013868: blez  v0, 0x1013890 addu  a1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc.2
 	ldc.i4.s 0
-	ble L_1013880
+	ble L_1013890
 // --- basic block ---
-// 0x01013860: 0x1013860: lui   v1, 0x30000
+// 0x01013870: 0x1013870: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01013864: 0x1013864: lw    a2, -28612(v1)
+// 0x01013874: 0x1013874: lw    a2, -28148(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7153
+	ldc.i4 -7037
 	add
 	ldelem.i4
 	stloc.3
-// 0x01013868: 0x1013868: lui   a3, 0x10000
+// 0x01013878: 0x1013878: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101386c: 0x101386c: addu  a0, v0, zero
+// 0x0101387c: 0x101387c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01013870: 0x1013870: jal   0x10038fc addiu a3, a3, 6924
+// 0x01013880: 0x1013880: jal   0x10038fc addiu a3, a3, 6920
 	ldloc 4
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 4
 	ldloc.0
@@ -1838,22 +1838,22 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01013878: 0x1013878: bne   v0, zero, 0x1013884 addu  v1, zero, zero
+// 0x01013888: 0x1013888: bne   v0, zero, 0x1013894 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1013884
+	brtrue L_1013894
 // --- basic block ---
-L_1013880:
-// 0x01013880: 0x1013880: addiu v1, zero, -3
+L_1013890:
+// 0x01013890: 0x1013890: addiu v1, zero, -3
 	ldc.i4.s -3
 	stloc 6
-L_1013884:
-// 0x01013884: 0x1013884: lw    ra, 20(sp)
-// 0x01013888: 0x1013888: addu  v0, v1, zero
+L_1013894:
+// 0x01013894: 0x1013894: lw    ra, 20(sp)
+// 0x01013898: 0x1013898: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0101388c: 0x101388c: jr    ra addiu sp, sp, 24
+// 0x0101389c: 0x101389c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1865,7 +1865,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_static_county_1013894(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_static_county_10138a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1900,16 +1900,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013894: 0x1013894: lui   a0, 0x0
+// 0x010138a4: 0x10138a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01013898: 0x1013898: addiu sp, sp, -24
+// 0x010138a8: 0x10138a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101389c: 0x101389c: sw    ra, 20(sp)
-// 0x010138a0: 0x10138a0: jal   0x100e788 addiu a0, a0, 1820
+// 0x010138ac: 0x10138ac: sw    ra, 20(sp)
+// 0x010138b0: 0x10138b0: jal   0x100e798 addiu a0, a0, 1820
 	ldloc.1
 	ldc.i4 1820
 	add
@@ -1919,14 +1919,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010138a8: 0x10138a8: lw    ra, 20(sp)
-// 0x010138ac: 0x10138ac: sll   zero, zero, 0
-// 0x010138b0: 0x10138b0: jr    ra addiu sp, sp, 24
+// 0x010138b8: 0x10138b8: lw    ra, 20(sp)
+// 0x010138bc: 0x10138bc: sll   zero, zero, 0
+// 0x010138c0: 0x10138c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1938,7 +1938,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 calloc_101390c(int32,int32,int32,int32,int32)
+.method public static int32 calloc_101391c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 lo,int32 v1)
@@ -1979,18 +1979,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101390c: 0x101390c: mult  a1, a0
+// 0x0101391c: 0x101391c: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 9
-// 0x01013910: 0x1013910: addiu sp, sp, -32
+// 0x01013920: 0x1013920: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01013914: 0x1013914: sw    ra, 28(sp)
-// 0x01013918: 0x1013918: sw    s0, 24(sp)
+// 0x01013924: 0x1013924: sw    ra, 28(sp)
+// 0x01013928: 0x1013928: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1999,13 +1999,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101391c: 0x101391c: mflo  lo
+// 0x0101392c: 0x101392c: mflo  lo
 	ldloc 9
 	stloc.3
-// 0x01013920: 0x1013920: mflo  lo
+// 0x01013930: 0x1013930: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x01013924: 0x1013924: jal   0x1000910 sw    a2, 16(sp)
+// 0x01013934: 0x1013934: jal   0x1000910 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2024,7 +2024,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101392c: 0x101392c: lw    a2, 16(sp)
+// 0x0101393c: 0x101393c: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2033,13 +2033,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01013930: 0x1013930: addu  a0, v0, zero
+// 0x01013940: 0x1013940: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01013934: 0x1013934: addu  a1, zero, zero
+// 0x01013944: 0x1013944: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01013938: 0x1013938: jal   0x100177c addu  s0, v0, zero
+// 0x01013948: 0x1013948: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -2051,11 +2051,11 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01013940: 0x1013940: lw    ra, 28(sp)
-// 0x01013944: 0x1013944: addu  v0, s0, zero
+// 0x01013950: 0x1013950: lw    ra, 28(sp)
+// 0x01013954: 0x1013954: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01013948: 0x1013948: lw    s0, 24(sp)
+// 0x01013958: 0x1013958: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2064,7 +2064,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101394c: 0x101394c: jr    ra addiu sp, sp, 32
+// 0x0101395c: 0x101395c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2076,7 +2076,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_locator_configure_1013954(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_configure_1013964(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2117,40 +2117,40 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013954: 0x1013954: lui   a0, 0x10000
+// 0x01013964: 0x1013964: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01013958: 0x1013958: lui   a1, 0x0
+// 0x01013968: 0x1013968: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101395c: 0x101395c: lui   a2, 0x10000
+// 0x0101396c: 0x101396c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01013960: 0x1013960: addiu sp, sp, -48
+// 0x01013970: 0x1013970: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01013964: 0x1013964: addiu a0, a0, 12560
+// 0x01013974: 0x1013974: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01013968: 0x1013968: addiu a1, a1, 1820
+// 0x01013978: 0x1013978: addiu a1, a1, 1820
 	ldloc.2
 	ldc.i4 1820
 	add
 	stloc.2
-// 0x0101396c: 0x101396c: addiu a2, a2, -48
+// 0x0101397c: 0x101397c: addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x01013970: 0x1013970: addu  a3, zero, zero
+// 0x01013980: 0x1013980: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01013974: 0x1013974: sw    ra, 44(sp)
-// 0x01013978: 0x1013978: sw    s1, 40(sp)
+// 0x01013984: 0x1013984: sw    ra, 44(sp)
+// 0x01013988: 0x1013988: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2159,7 +2159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101397c: 0x101397c: jal   0x100edb0 sw    s0, 36(sp)
+// 0x0101398c: 0x101398c: jal   0x100edc0 sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2173,62 +2173,62 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013984: 0x1013984: lui   v0, 0x30000
+// 0x01013994: 0x1013994: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013988: 0x1013988: lw    v0, -28628(v0)
+// 0x01013998: 0x1013998: lw    v0, -28164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7157
+	ldc.i4 -7041
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101398c: 0x101398c: sll   zero, zero, 0
-// 0x01013990: 0x1013990: bne   v0, zero, 0x1013a34 lui   a0, 0x0
+// 0x0101399c: 0x101399c: sll   zero, zero, 0
+// 0x010139a0: 0x10139a0: bne   v0, zero, 0x1013a44 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1013a34
+	brtrue L_1013a44
 // --- basic block ---
-// 0x01013998: 0x1013998: lui   s1, 0x30000
+// 0x010139a8: 0x10139a8: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x0101399c: 0x101399c: lw    a0, -28616(s1)
+// 0x010139ac: 0x10139ac: lw    a0, -28152(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7154
+	ldc.i4 -7038
 	add
 	ldelem.i4
 	stloc.1
-// 0x010139a0: 0x10139a0: addiu v0, zero, 3
+// 0x010139b0: 0x10139b0: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010139a4: 0x10139a4: lui   a2, 0x0
+// 0x010139b4: 0x10139b4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010139a8: 0x10139a8: addiu a2, a2, 580
+// 0x010139b8: 0x10139b8: addiu a2, a2, 580
 	ldloc.3
 	ldc.i4 580
 	add
 	stloc.3
-// 0x010139ac: 0x10139ac: addiu a1, sp, 16
+// 0x010139bc: 0x10139bc: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010139b0: 0x10139b0: lui   s0, 0x30000
+// 0x010139c0: 0x10139c0: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x010139b4: 0x10139b4: sw    v0, 20(sp)
+// 0x010139c4: 0x10139c4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2237,10 +2237,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010139b8: 0x10139b8: addiu v0, zero, 26
+// 0x010139c8: 0x10139c8: addiu v0, zero, 26
 	ldc.i4.s 26
 	stloc 5
-// 0x010139bc: 0x10139bc: sw    v0, 28(sp)
+// 0x010139cc: 0x10139cc: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2249,7 +2249,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010139c0: 0x10139c0: sw    zero, 16(sp)
+// 0x010139d0: 0x10139d0: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2258,7 +2258,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010139c4: 0x10139c4: jal   0x10034b8 sw    zero, 24(sp)
+// 0x010139d4: 0x10139d4: jal   0x10034b8 sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2277,34 +2277,34 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010139cc: 0x10139cc: lw    a0, -28612(s0)
+// 0x010139dc: 0x10139dc: lw    a0, -28148(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7153
+	ldc.i4 -7037
 	add
 	ldelem.i4
 	stloc.1
-// 0x010139d0: 0x10139d0: lui   a2, 0x0
+// 0x010139e0: 0x10139e0: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010139d4: 0x10139d4: addiu a2, a2, 596
+// 0x010139e4: 0x10139e4: addiu a2, a2, 596
 	ldloc.3
 	ldc.i4 596
 	add
 	stloc.3
-// 0x010139d8: 0x10139d8: addiu a1, sp, 24
+// 0x010139e8: 0x10139e8: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010139dc: 0x10139dc: jal   0x10034b8 sw    v0, -28616(s1)
+// 0x010139ec: 0x10139ec: jal   0x10034b8 sw    v0, -28152(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7154
+	ldc.i4 -7038
 	add
 	ldloc 5
 	stelem.i4
@@ -2318,12 +2318,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010139e4: 0x10139e4: jal   0x1015de8 sw    v0, -28612(s0)
+// 0x010139f4: 0x10139f4: jal   0x1015df8 sw    v0, -28148(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7153
+	ldc.i4 -7037
 	add
 	ldloc 5
 	stelem.i4
@@ -2332,57 +2332,57 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_option_cache_1015de8(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_option_cache_1015df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010139ec: 0x10139ec: slti  a0, v0, 8
+// 0x010139fc: 0x10139fc: slti  a0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	clt
 	stloc.1
-// 0x010139f0: 0x10139f0: lui   v1, 0x30000
+// 0x01013a00: 0x1013a00: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x010139f4: 0x10139f4: beq   a0, zero, 0x1013a04 sw    v0, -28624(v1)
+// 0x01013a04: 0x1013a04: beq   a0, zero, 0x1013a14 sw    v0, -28160(v1)
 	ldloc.1
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7156
+	ldc.i4 -7040
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1013a04
+	brfalse L_1013a14
 // --- basic block ---
-// 0x010139fc: 0x10139fc: addiu v0, zero, 8
+// 0x01013a0c: 0x1013a0c: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01013a00: 0x1013a00: sw    v0, -28624(v1)
+// 0x01013a10: 0x1013a10: sw    v0, -28160(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7156
+	ldc.i4 -7040
 	add
 	ldloc 5
 	stelem.i4
-L_1013a04:
-// 0x01013a04: 0x1013a04: lui   v0, 0x30000
+L_1013a14:
+// 0x01013a14: 0x1013a14: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013a08: 0x1013a08: lw    a0, -28624(v0)
+// 0x01013a18: 0x1013a18: lw    a0, -28160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7156
+	ldc.i4 -7040
 	add
 	ldelem.i4
 	stloc.1
-// 0x01013a0c: 0x1013a0c: jal   0x101390c addiu a1, zero, 8
+// 0x01013a1c: 0x1013a1c: jal   0x101391c addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -2390,34 +2390,34 @@ L_1013a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::calloc_101390c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::calloc_101391c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013a14: 0x1013a14: lui   a0, 0x0
+// 0x01013a24: 0x1013a24: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01013a18: 0x1013a18: lui   v1, 0x30000
+// 0x01013a28: 0x1013a28: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01013a1c: 0x1013a1c: addiu a0, a0, 27876
+// 0x01013a2c: 0x1013a2c: addiu a0, a0, 27876
 	ldloc.1
 	ldc.i4 27876
 	add
 	stloc.1
-// 0x01013a20: 0x1013a20: addu  a2, v0, zero
+// 0x01013a30: 0x1013a30: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01013a24: 0x1013a24: addiu a1, zero, 134
+// 0x01013a34: 0x1013a34: addiu a1, zero, 134
 	ldc.i4 134
 	stloc.2
-// 0x01013a28: 0x1013a28: jal   0x1004a38 sw    v0, -28628(v1)
+// 0x01013a38: 0x1013a38: jal   0x1004a48 sw    v0, -28164(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7157
+	ldc.i4 -7041
 	add
 	ldloc 5
 	stelem.i4
@@ -2426,16 +2426,16 @@ L_1013a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013a30: 0x1013a30: lui   a0, 0x0
+// 0x01013a40: 0x1013a40: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1013a34:
-// 0x01013a34: 0x1013a34: jal   0x100e788 addiu a0, a0, 1820
+L_1013a44:
+// 0x01013a44: 0x1013a44: jal   0x100e798 addiu a0, a0, 1820
 	ldloc.1
 	ldc.i4 1820
 	add
@@ -2445,13 +2445,13 @@ L_1013a34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013a3c: 0x1013a3c: lw    ra, 44(sp)
-// 0x01013a40: 0x1013a40: lw    s1, 40(sp)
+// 0x01013a4c: 0x1013a4c: lw    ra, 44(sp)
+// 0x01013a50: 0x1013a50: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2460,7 +2460,7 @@ L_1013a34:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01013a44: 0x1013a44: lw    s0, 36(sp)
+// 0x01013a54: 0x1013a54: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2469,7 +2469,7 @@ L_1013a34:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01013a48: 0x1013a48: jr    ra addiu sp, sp, 48
+// 0x01013a58: 0x1013a58: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2481,7 +2481,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_open_1013a50(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_open_1013a60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s5,int32 t0,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -2537,12 +2537,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013a50: 0x1013a50: addiu sp, sp, -48
+// 0x01013a60: 0x1013a60: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01013a54: 0x1013a54: sw    s0, 20(sp)
+// 0x01013a64: 0x1013a64: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2551,8 +2551,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01013a58: 0x1013a58: sw    ra, 44(sp)
-// 0x01013a5c: 0x1013a5c: sw    s5, 40(sp)
+// 0x01013a68: 0x1013a68: sw    ra, 44(sp)
+// 0x01013a6c: 0x1013a6c: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2561,7 +2561,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01013a60: 0x1013a60: sw    s4, 36(sp)
+// 0x01013a70: 0x1013a70: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2570,7 +2570,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01013a64: 0x1013a64: sw    s3, 32(sp)
+// 0x01013a74: 0x1013a74: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2579,7 +2579,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01013a68: 0x1013a68: sw    s2, 28(sp)
+// 0x01013a78: 0x1013a78: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2588,7 +2588,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01013a6c: 0x1013a6c: sw    s1, 24(sp)
+// 0x01013a7c: 0x1013a7c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2597,17 +2597,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01013a70: 0x1013a70: blez  a0, 0x1013c1c addu  s0, a0, zero
+// 0x01013a80: 0x1013a80: blez  a0, 0x1013c2c addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 9
 	ldc.i4.s 0
-	ble L_1013c1c
+	ble L_1013c2c
 // --- basic block ---
-// 0x01013a78: 0x1013a78: lui   v0, 0x0
+// 0x01013a88: 0x1013a88: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01013a7c: 0x1013a7c: lw    v1, 1816(v0)
+// 0x01013a8c: 0x1013a8c: lw    v1, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2616,65 +2616,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013a80: 0x1013a80: sll   zero, zero, 0
-// 0x01013a84: 0x1013a84: beq   a0, v1, 0x1013c20 addu  v0, zero, zero
+// 0x01013a90: 0x1013a90: sll   zero, zero, 0
+// 0x01013a94: 0x1013a94: beq   a0, v1, 0x1013c30 addu  v0, zero, zero
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1013c20
+	beq  L_1013c30
 // --- basic block ---
-// 0x01013a8c: 0x1013a8c: lui   v0, 0x30000
+// 0x01013a9c: 0x1013a9c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013a90: 0x1013a90: lw    a2, -28624(v0)
+// 0x01013aa0: 0x1013aa0: lw    a2, -28160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7156
+	ldc.i4 -7040
 	add
 	ldelem.i4
 	stloc.3
-// 0x01013a94: 0x1013a94: lui   v0, 0x30000
+// 0x01013aa4: 0x1013aa4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013a98: 0x1013a98: lw    v0, -28628(v0)
+// 0x01013aa8: 0x1013aa8: lw    v0, -28164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7157
+	ldc.i4 -7041
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013a9c: 0x1013a9c: addiu a0, a2, -1
+// 0x01013aac: 0x1013aac: addiu a0, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01013aa0: 0x1013aa0: sll   a1, a0, 3
+// 0x01013ab0: 0x1013ab0: sll   a1, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x01013aa4: 0x1013aa4: addu  a1, v0, a1
+// 0x01013ab4: 0x1013ab4: addu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc.2
-// 0x01013aa8: 0x1013aa8: addiu a1, a1, 4
+// 0x01013ab8: 0x1013ab8: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01013aac: 0x1013aac: j	 0x1013afc addu  s1, zero, zero
+// 0x01013abc: 0x1013abc: j	 0x1013b0c addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1013afc
+	br L_1013b0c
 // --- basic block ---
-L_1013ab4:
-// 0x01013ab4: 0x1013ab4: lw    t0, -4(a1)
+L_1013ac4:
+// 0x01013ac4: 0x1013ac4: lw    t0, -4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2683,16 +2683,16 @@ L_1013ab4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01013ab8: 0x1013ab8: sll   zero, zero, 0
-// 0x01013abc: 0x1013abc: bne   t0, s0, 0x1013adc sll   zero, zero, 0
+// 0x01013ac8: 0x1013ac8: sll   zero, zero, 0
+// 0x01013acc: 0x1013acc: bne   t0, s0, 0x1013aec sll   zero, zero, 0
 	ldloc 11
 	ldloc 9
-	bne.un L_1013adc
+	bne.un L_1013aec
 // --- basic block ---
-// 0x01013ac4: 0x1013ac4: addu  a0, s0, zero
+// 0x01013ad4: 0x1013ad4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01013ac8: 0x1013ac8: jal   0x10032b0 addiu a1, zero, -1
+// 0x01013ad8: 0x1013ad8: jal   0x10032b0 addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -2705,10 +2705,10 @@ L_1013ab4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013ad0: 0x1013ad0: lui   v0, 0x0
+// 0x01013ae0: 0x1013ae0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01013ad4: 0x1013ad4: j	 0x1013c14 sw    s0, 1816(v0)
+// 0x01013ae4: 0x1013ae4: j	 0x1013c24 sw    s0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2717,17 +2717,17 @@ L_1013ab4:
 	add
 	ldloc 9
 	stelem.i4
-	br L_1013c14
+	br L_1013c24
 // --- basic block ---
-L_1013adc:
-// 0x01013adc: 0x1013adc: lw    t0, 0(a1)
+L_1013aec:
+// 0x01013aec: 0x1013aec: lw    t0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01013ae0: 0x1013ae0: lw    a3, 4(a3)
+// 0x01013af0: 0x1013af0: lw    a3, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -2736,62 +2736,62 @@ L_1013adc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01013ae4: 0x1013ae4: sll   zero, zero, 0
-// 0x01013ae8: 0x1013ae8: sltu  a3, t0, a3
+// 0x01013af4: 0x1013af4: sll   zero, zero, 0
+// 0x01013af8: 0x1013af8: sltu  a3, t0, a3
 	ldloc 11
 	ldloc 4
 	clt.un
 	stloc 4
-// 0x01013aec: 0x1013aec: beq   a3, zero, 0x1013af8 addiu a1, a1, -8
+// 0x01013afc: 0x1013afc: beq   a3, zero, 0x1013b08 addiu a1, a1, -8
 	ldloc 4
 	ldloc.2
 	ldc.i4.s -8
 	add
 	stloc.2
-	brfalse L_1013af8
+	brfalse L_1013b08
 // --- basic block ---
-// 0x01013af4: 0x1013af4: addu  s1, a0, zero
+// 0x01013b04: 0x1013b04: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-L_1013af8:
-// 0x01013af8: 0x1013af8: addiu a0, a0, -1
+L_1013b08:
+// 0x01013b08: 0x1013b08: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-L_1013afc:
-// 0x01013afc: 0x1013afc: sll   a3, s1, 3
+L_1013b0c:
+// 0x01013b0c: 0x1013b0c: sll   a3, s1, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 4
-// 0x01013b00: 0x1013b00: bgez  a0, 0x1013ab4 addu  a3, v0, a3
+// 0x01013b10: 0x1013b10: bgez  a0, 0x1013ac4 addu  a3, v0, a3
 	ldloc.1
 	ldloc 5
 	ldloc 4
 	add
 	stloc 4
 	ldc.i4.s 0
-	bge L_1013ab4
+	bge L_1013ac4
 // --- basic block ---
-// 0x01013b08: 0x1013b08: lw    a1, 0(a3)
+// 0x01013b18: 0x1013b18: lw    a1, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01013b0c: 0x1013b0c: sll   zero, zero, 0
-// 0x01013b10: 0x1013b10: blez  a1, 0x1013b38 sll   s1, s1, 3
+// 0x01013b1c: 0x1013b1c: sll   zero, zero, 0
+// 0x01013b20: 0x1013b20: blez  a1, 0x1013b48 sll   s1, s1, 3
 	ldloc.2
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
 	ldc.i4.s 0
-	ble L_1013b38
+	ble L_1013b48
 // --- basic block ---
-// 0x01013b18: 0x1013b18: sw    zero, 4(a3)
+// 0x01013b28: 0x1013b28: sw    zero, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -2800,7 +2800,7 @@ L_1013afc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01013b1c: 0x1013b1c: bne   v1, zero, 0x1013b38 sw    zero, 0(a3)
+// 0x01013b2c: 0x1013b2c: bne   v1, zero, 0x1013b48 sw    zero, 0(a3)
 	ldloc 7
 	ldloc 6
 	ldloc 4
@@ -2808,15 +2808,15 @@ L_1013afc:
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_1013b38
+	brtrue L_1013b48
 // --- basic block ---
-// 0x01013b24: 0x1013b24: lui   v1, 0x0
+// 0x01013b34: 0x1013b34: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01013b28: 0x1013b28: addiu a0, zero, -1
+// 0x01013b38: 0x1013b38: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01013b2c: 0x1013b2c: sw    a0, 1836(v1)
+// 0x01013b3c: 0x1013b3c: sw    a0, 1836(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2825,10 +2825,10 @@ L_1013afc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01013b30: 0x1013b30: lui   v1, 0x0
+// 0x01013b40: 0x1013b40: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01013b34: 0x1013b34: sw    zero, 1816(v1)
+// 0x01013b44: 0x1013b44: sw    zero, 1816(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2837,70 +2837,70 @@ L_1013afc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1013b38:
-// 0x01013b38: 0x1013b38: lui   a0, 0x30000
+L_1013b48:
+// 0x01013b48: 0x1013b48: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01013b3c: 0x1013b3c: lw    v1, -28620(a0)
+// 0x01013b4c: 0x1013b4c: lw    v1, -28156(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7155
+	ldc.i4 -7039
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013b40: 0x1013b40: sll   zero, zero, 0
-// 0x01013b44: 0x1013b44: addiu v1, v1, 1
+// 0x01013b50: 0x1013b50: sll   zero, zero, 0
+// 0x01013b54: 0x1013b54: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01013b48: 0x1013b48: bne   v1, zero, 0x1013ba0 sw    v1, -28620(a0)
+// 0x01013b58: 0x1013b58: bne   v1, zero, 0x1013bb0 sw    v1, -28156(a0)
 	ldloc 7
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7155
+	ldc.i4 -7039
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1013ba0
+	brtrue L_1013bb0
 // --- basic block ---
-// 0x01013b50: 0x1013b50: j	 0x1013b78 slt   a0, v1, a2
+// 0x01013b60: 0x1013b60: j	 0x1013b88 slt   a0, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc.1
-	br L_1013b78
+	br L_1013b88
 // --- basic block ---
-L_1013b58:
-// 0x01013b58: 0x1013b58: lw    a0, 0(v0)
+L_1013b68:
+// 0x01013b68: 0x1013b68: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01013b5c: 0x1013b5c: sll   zero, zero, 0
-// 0x01013b60: 0x1013b60: blez  a0, 0x1013b70 addiu v1, v1, 1
+// 0x01013b6c: 0x1013b6c: sll   zero, zero, 0
+// 0x01013b70: 0x1013b70: blez  a0, 0x1013b80 addiu v1, v1, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
 	ldc.i4.s 0
-	ble L_1013b70
+	ble L_1013b80
 // --- basic block ---
-// 0x01013b68: 0x1013b68: sw    zero, 0(v0)
+// 0x01013b78: 0x1013b78: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01013b6c: 0x1013b6c: sw    zero, 4(v0)
+// 0x01013b7c: 0x1013b7c: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2909,29 +2909,29 @@ L_1013b58:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1013b70:
-// 0x01013b70: 0x1013b70: addiu v0, v0, 8
+L_1013b80:
+// 0x01013b80: 0x1013b80: addiu v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01013b74: 0x1013b74: slt   a0, v1, a2
+// 0x01013b84: 0x1013b84: slt   a0, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc.1
-L_1013b78:
-// 0x01013b78: 0x1013b78: bne   a0, zero, 0x1013b58 sll   zero, zero, 0
+L_1013b88:
+// 0x01013b88: 0x1013b88: bne   a0, zero, 0x1013b68 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1013b58
+	brtrue L_1013b68
 // --- basic block ---
-// 0x01013b80: 0x1013b80: addiu v1, zero, -1
+// 0x01013b90: 0x1013b90: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01013b84: 0x1013b84: lui   v0, 0x0
+// 0x01013b94: 0x1013b94: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01013b88: 0x1013b88: sw    v1, 1836(v0)
+// 0x01013b98: 0x1013b98: sw    v1, 1836(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2940,25 +2940,25 @@ L_1013b78:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01013b8c: 0x1013b8c: lui   v0, 0x30000
+// 0x01013b9c: 0x1013b9c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013b90: 0x1013b90: addiu v1, zero, 1
+// 0x01013ba0: 0x1013ba0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01013b94: 0x1013b94: sw    v1, -28620(v0)
+// 0x01013ba4: 0x1013ba4: sw    v1, -28156(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7155
+	ldc.i4 -7039
 	add
 	ldloc 7
 	stelem.i4
-// 0x01013b98: 0x1013b98: lui   v0, 0x0
+// 0x01013ba8: 0x1013ba8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01013b9c: 0x1013b9c: sw    zero, 1816(v0)
+// 0x01013bac: 0x1013bac: sw    zero, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2967,37 +2967,37 @@ L_1013b78:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1013ba0:
-// 0x01013ba0: 0x1013ba0: lui   v0, 0x30000
+L_1013bb0:
+// 0x01013bb0: 0x1013bb0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013ba4: 0x1013ba4: lui   s5, 0x10000
+// 0x01013bb4: 0x1013bb4: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01013ba8: 0x1013ba8: lw    s2, -28620(v0)
+// 0x01013bb8: 0x1013bb8: lw    s2, -28156(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7155
+	ldc.i4 -7039
 	add
 	ldelem.i4
 	stloc 12
-// 0x01013bac: 0x1013bac: addiu s5, s5, 6924
+// 0x01013bbc: 0x1013bbc: addiu s5, s5, 6920
 	ldloc 10
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 10
-// 0x01013bb0: 0x1013bb0: lui   s4, 0x30000
+// 0x01013bc0: 0x1013bc0: lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 14
-// 0x01013bb4: 0x1013bb4: j	 0x1013bd4 lui   s3, 0x0
+// 0x01013bc4: 0x1013bc4: j	 0x1013be4 lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 13
-	br L_1013bd4
+	br L_1013be4
 // --- basic block ---
-L_1013bbc:
-// 0x01013bbc: 0x1013bbc: lw    v0, 1840(s3)
+L_1013bcc:
+// 0x01013bcc: 0x1013bcc: lw    v0, 1840(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3006,8 +3006,8 @@ L_1013bbc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013bc0: 0x1013bc0: sll   zero, zero, 0
-// 0x01013bc4: 0x1013bc4: jalr  v0 sll   zero, zero, 0
+// 0x01013bd0: 0x1013bd0: sll   zero, zero, 0
+// 0x01013bd4: 0x1013bd4: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3019,29 +3019,29 @@ L_1013bbc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013bcc: 0x1013bcc: beq   v0, zero, 0x1013c20 addiu v0, zero, -3
+// 0x01013bdc: 0x1013bdc: beq   v0, zero, 0x1013c30 addiu v0, zero, -3
 	ldloc 5
 	ldc.i4.s -3
 	stloc 5
-	brfalse L_1013c20
+	brfalse L_1013c30
 // --- basic block ---
-L_1013bd4:
-// 0x01013bd4: 0x1013bd4: lw    a2, -28616(s4)
+L_1013be4:
+// 0x01013be4: 0x1013be4: lw    a2, -28152(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7154
+	ldc.i4 -7038
 	add
 	ldelem.i4
 	stloc.3
-// 0x01013bd8: 0x1013bd8: addu  a0, s0, zero
+// 0x01013be8: 0x1013be8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01013bdc: 0x1013bdc: addiu a1, zero, -1
+// 0x01013bec: 0x1013bec: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x01013be0: 0x1013be0: jal   0x10038fc addu  a3, s5, zero
+// 0x01013bf0: 0x1013bf0: jal   0x10038fc addu  a3, s5, zero
 	ldloc 10
 	stloc 4
 	ldloc.0
@@ -3054,31 +3054,31 @@ L_1013bd4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013be8: 0x1013be8: beq   v0, zero, 0x1013bbc addu  a0, s0, zero
+// 0x01013bf8: 0x1013bf8: beq   v0, zero, 0x1013bcc addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_1013bbc
+	brfalse L_1013bcc
 // --- basic block ---
-// 0x01013bf0: 0x1013bf0: lui   v0, 0x30000
+// 0x01013c00: 0x1013c00: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013bf4: 0x1013bf4: lw    v0, -28628(v0)
+// 0x01013c04: 0x1013c04: lw    v0, -28164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7157
+	ldc.i4 -7041
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013bf8: 0x1013bf8: sll   zero, zero, 0
-// 0x01013bfc: 0x1013bfc: addu  s1, v0, s1
+// 0x01013c08: 0x1013c08: sll   zero, zero, 0
+// 0x01013c0c: 0x1013c0c: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x01013c00: 0x1013c00: sw    s2, 4(s1)
+// 0x01013c10: 0x1013c10: sw    s2, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3087,17 +3087,17 @@ L_1013bd4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01013c04: 0x1013c04: sw    s0, 0(s1)
+// 0x01013c14: 0x1013c14: sw    s0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x01013c08: 0x1013c08: lui   v0, 0x0
+// 0x01013c18: 0x1013c18: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01013c0c: 0x1013c0c: jal   0x100a72c sw    s0, 1816(v0)
+// 0x01013c1c: 0x1013c1c: jal   0x100a73c sw    s0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3106,21 +3106,21 @@ L_1013bd4:
 	add
 	ldloc 9
 	stelem.i4
-	call void Cibyl7::roadmap_square_load_index_100a72c()
+	call void Cibyl7::roadmap_square_load_index_100a73c()
 // --- basic block ---
-L_1013c14:
-// 0x01013c14: 0x1013c14: j	 0x1013c20 addu  v0, zero, zero
+L_1013c24:
+// 0x01013c24: 0x1013c24: j	 0x1013c30 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1013c20
+	br L_1013c30
 // --- basic block ---
-L_1013c1c:
-// 0x01013c1c: 0x1013c1c: addiu v0, zero, -3
+L_1013c2c:
+// 0x01013c2c: 0x1013c2c: addiu v0, zero, -3
 	ldc.i4.s -3
 	stloc 5
-L_1013c20:
-// 0x01013c20: 0x1013c20: lw    ra, 44(sp)
-// 0x01013c24: 0x1013c24: lw    s5, 40(sp)
+L_1013c30:
+// 0x01013c30: 0x1013c30: lw    ra, 44(sp)
+// 0x01013c34: 0x1013c34: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3129,7 +3129,7 @@ L_1013c20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01013c28: 0x1013c28: lw    s4, 36(sp)
+// 0x01013c38: 0x1013c38: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3138,7 +3138,7 @@ L_1013c20:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01013c2c: 0x1013c2c: lw    s3, 32(sp)
+// 0x01013c3c: 0x1013c3c: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3147,7 +3147,7 @@ L_1013c20:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01013c30: 0x1013c30: lw    s2, 28(sp)
+// 0x01013c40: 0x1013c40: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3156,7 +3156,7 @@ L_1013c20:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01013c34: 0x1013c34: lw    s1, 24(sp)
+// 0x01013c44: 0x1013c44: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3165,7 +3165,7 @@ L_1013c20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01013c38: 0x1013c38: lw    s0, 20(sp)
+// 0x01013c48: 0x1013c48: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3174,7 +3174,7 @@ L_1013c20:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01013c3c: 0x1013c3c: jr    ra addiu sp, sp, 48
+// 0x01013c4c: 0x1013c4c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3186,7 +3186,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3221,10 +3221,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013c44: 0x1013c44: lui   v0, 0x0
+// 0x01013c54: 0x1013c54: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01013c48: 0x1013c48: lw    v1, 1816(v0)
+// 0x01013c58: 0x1013c58: lw    v1, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3233,20 +3233,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013c4c: 0x1013c4c: addiu sp, sp, -32
+// 0x01013c5c: 0x1013c5c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01013c50: 0x1013c50: sw    ra, 28(sp)
-// 0x01013c54: 0x1013c54: beq   v1, a0, 0x1013c70 addu  v0, zero, zero
+// 0x01013c60: 0x1013c60: sw    ra, 28(sp)
+// 0x01013c64: 0x1013c64: beq   v1, a0, 0x1013c80 addu  v0, zero, zero
 	ldloc 7
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1013c70
+	beq  L_1013c80
 // --- basic block ---
-// 0x01013c5c: 0x1013c5c: jal   0x1013954 sw    a0, 16(sp)
+// 0x01013c6c: 0x1013c6c: jal   0x1013964 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3260,12 +3260,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_configure_1013954(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_configure_1013964(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013c64: 0x1013c64: lw    a0, 16(sp)
+// 0x01013c74: 0x1013c74: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3274,21 +3274,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01013c68: 0x1013c68: jal   0x1013a50 sll   zero, zero, 0
+// 0x01013c78: 0x1013c78: jal   0x1013a60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_open_1013a50(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_open_1013a60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1013c70:
-// 0x01013c70: 0x1013c70: lw    ra, 28(sp)
-// 0x01013c74: 0x1013c74: sll   zero, zero, 0
-// 0x01013c78: 0x1013c78: jr    ra addiu sp, sp, 32
+L_1013c80:
+// 0x01013c80: 0x1013c80: lw    ra, 28(sp)
+// 0x01013c84: 0x1013c84: sll   zero, zero, 0
+// 0x01013c88: 0x1013c88: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3300,7 +3300,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_by_city_1013c80(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_by_city_1013c90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -3338,12 +3338,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013c80: 0x1013c80: addiu sp, sp, -24
+// 0x01013c90: 0x1013c90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01013c84: 0x1013c84: sw    s0, 16(sp)
+// 0x01013c94: 0x1013c94: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3352,8 +3352,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01013c88: 0x1013c88: sw    ra, 20(sp)
-// 0x01013c8c: 0x1013c8c: jal   0x1013954 lui   s0, 0x0
+// 0x01013c98: 0x1013c98: sw    ra, 20(sp)
+// 0x01013c9c: 0x1013c9c: jal   0x1013964 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
 	ldloc.0
@@ -3361,12 +3361,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_configure_1013954(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_configure_1013964(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01013c94: 0x1013c94: jal   0x100e788 addiu a0, s0, 1820
+// 0x01013ca4: 0x1013ca4: jal   0x100e798 addiu a0, s0, 1820
 	ldloc 7
 	ldc.i4 1820
 	add
@@ -3376,18 +3376,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01013c9c: 0x1013c9c: beq   v0, zero, 0x1013cb8 addiu v1, zero, -1
+// 0x01013cac: 0x1013cac: beq   v0, zero, 0x1013cc8 addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
-	brfalse L_1013cb8
+	brfalse L_1013cc8
 // --- basic block ---
-// 0x01013ca4: 0x1013ca4: jal   0x100e788 addiu a0, s0, 1820
+// 0x01013cb4: 0x1013cb4: jal   0x100e798 addiu a0, s0, 1820
 	ldloc 7
 	ldc.i4 1820
 	add
@@ -3397,12 +3397,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01013cac: 0x1013cac: jal   0x1013a50 addu  a0, v0, zero
+// 0x01013cbc: 0x1013cbc: jal   0x1013a60 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3410,20 +3410,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_open_1013a50(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_open_1013a60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01013cb4: 0x1013cb4: addu  v1, v0, zero
+// 0x01013cc4: 0x1013cc4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_1013cb8:
-// 0x01013cb8: 0x1013cb8: lw    ra, 20(sp)
-// 0x01013cbc: 0x1013cbc: addu  v0, v1, zero
+L_1013cc8:
+// 0x01013cc8: 0x1013cc8: lw    ra, 20(sp)
+// 0x01013ccc: 0x1013ccc: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01013cc0: 0x1013cc0: lw    s0, 16(sp)
+// 0x01013cd0: 0x1013cd0: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3432,7 +3432,7 @@ L_1013cb8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013cc4: 0x1013cc4: jr    ra addiu sp, sp, 24
+// 0x01013cd4: 0x1013cd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3444,7 +3444,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_locator_by_position_1013cec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_locator_by_position_1013cfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3488,13 +3488,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01013cec: 0x1013cec: addiu sp, sp, -32
+// 0x01013cfc: 0x1013cfc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01013cf0: 0x1013cf0: sw    ra, 28(sp)
-// 0x01013cf4: 0x1013cf4: sw    s2, 24(sp)
+// 0x01013d00: 0x1013d00: sw    ra, 28(sp)
+// 0x01013d04: 0x1013d04: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3503,7 +3503,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01013cf8: 0x1013cf8: sw    s1, 20(sp)
+// 0x01013d08: 0x1013d08: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3512,7 +3512,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01013cfc: 0x1013cfc: sw    s0, 16(sp)
+// 0x01013d0c: 0x1013d0c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3521,10 +3521,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01013d00: 0x1013d00: addu  s2, a0, zero
+// 0x01013d10: 0x1013d10: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01013d04: 0x1013d04: jal   0x1013954 addu  s1, a1, zero
+// 0x01013d14: 0x1013d14: jal   0x1013964 addu  s1, a1, zero
 	ldloc.2
 	stloc 9
 	ldloc.0
@@ -3532,15 +3532,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_configure_1013954(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_configure_1013964(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013d0c: 0x1013d0c: lui   a0, 0x0
+// 0x01013d1c: 0x1013d1c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01013d10: 0x1013d10: jal   0x100e788 addiu a0, a0, 1820
+// 0x01013d20: 0x1013d20: jal   0x100e798 addiu a0, a0, 1820
 	ldloc.1
 	ldc.i4 1820
 	add
@@ -3550,40 +3550,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013d18: 0x1013d18: bne   v0, zero, 0x1013d2c addiu s0, zero, 1
+// 0x01013d28: 0x1013d28: bne   v0, zero, 0x1013d3c addiu s0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 8
-	brtrue L_1013d2c
+	brtrue L_1013d3c
 // --- basic block ---
-// 0x01013d20: 0x1013d20: jal   0x101355c sll   zero, zero, 0
-	call int32 Cibyl14::roadmap_county_count_101355c()
+// 0x01013d30: 0x1013d30: jal   0x101356c sll   zero, zero, 0
+	call int32 Cibyl14::roadmap_county_count_101356c()
 	stloc 5
 // --- basic block ---
-// 0x01013d28: 0x1013d28: addu  s0, v0, zero
+// 0x01013d38: 0x1013d38: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_1013d2c:
-// 0x01013d2c: 0x1013d2c: lw    v0, 0(s1)
+L_1013d3c:
+// 0x01013d3c: 0x1013d3c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01013d30: 0x1013d30: sll   zero, zero, 0
-// 0x01013d34: 0x1013d34: bne   v0, zero, 0x1013d5c addu  a0, s0, zero
+// 0x01013d40: 0x1013d40: sll   zero, zero, 0
+// 0x01013d44: 0x1013d44: bne   v0, zero, 0x1013d6c addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_1013d5c
+	brtrue L_1013d6c
 // --- basic block ---
-// 0x01013d3c: 0x1013d3c: jal   0x101390c addiu a1, zero, 4
+// 0x01013d4c: 0x1013d4c: jal   0x101391c addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
 	ldloc.0
@@ -3591,30 +3591,30 @@ L_1013d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::calloc_101390c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::calloc_101391c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013d44: 0x1013d44: lui   a0, 0x0
+// 0x01013d54: 0x1013d54: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01013d48: 0x1013d48: sw    v0, 0(s1)
+// 0x01013d58: 0x1013d58: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01013d4c: 0x1013d4c: addiu a0, a0, 27876
+// 0x01013d5c: 0x1013d5c: addiu a0, a0, 27876
 	ldloc.1
 	ldc.i4 27876
 	add
 	stloc.1
-// 0x01013d50: 0x1013d50: addu  a2, v0, zero
+// 0x01013d60: 0x1013d60: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01013d54: 0x1013d54: jal   0x1004a38 addiu a1, zero, 333
+// 0x01013d64: 0x1013d64: jal   0x1004a48 addiu a1, zero, 333
 	ldc.i4 333
 	stloc.2
 	ldloc.0
@@ -3622,23 +3622,23 @@ L_1013d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1013d5c:
-// 0x01013d5c: 0x1013d5c: lw    a1, 0(s1)
+L_1013d6c:
+// 0x01013d6c: 0x1013d6c: lw    a1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01013d60: 0x1013d60: addu  a0, s2, zero
+// 0x01013d70: 0x1013d70: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01013d64: 0x1013d64: jal   0x101358c addu  a2, s0, zero
+// 0x01013d74: 0x1013d74: jal   0x101359c addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -3646,13 +3646,13 @@ L_1013d5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_county_by_position_101358c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_county_by_position_101359c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013d6c: 0x1013d6c: lw    ra, 28(sp)
-// 0x01013d70: 0x1013d70: lw    s2, 24(sp)
+// 0x01013d7c: 0x1013d7c: lw    ra, 28(sp)
+// 0x01013d80: 0x1013d80: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3661,7 +3661,7 @@ L_1013d5c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01013d74: 0x1013d74: lw    s1, 20(sp)
+// 0x01013d84: 0x1013d84: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3670,7 +3670,7 @@ L_1013d5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01013d78: 0x1013d78: lw    s0, 16(sp)
+// 0x01013d88: 0x1013d88: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3679,7 +3679,7 @@ L_1013d5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01013d7c: 0x1013d7c: jr    ra addiu sp, sp, 32
+// 0x01013d8c: 0x1013d8c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3691,7 +3691,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_metadata_unmap_1013d84(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_metadata_unmap_1013d94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3729,32 +3729,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1013d84:
-// 0x01013d84: 0x1013d84: lui   v0, 0x20000
+L_1013d94:
+// 0x01013d94: 0x1013d94: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01013d88: 0x1013d88: lw    v1, 0(a0)
+// 0x01013d98: 0x1013d98: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01013d8c: 0x1013d8c: lw    v0, 24784(v0)
+// 0x01013d9c: 0x1013d9c: lw    v0, 25248(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6196
+	ldc.i4 6312
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013d90: 0x1013d90: addiu sp, sp, -24
+// 0x01013da0: 0x1013da0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01013d94: 0x1013d94: sw    s0, 16(sp)
+// 0x01013da4: 0x1013da4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3763,34 +3763,34 @@ L_1013d84:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01013d98: 0x1013d98: sw    ra, 20(sp)
-// 0x01013d9c: 0x1013d9c: beq   v1, v0, 0x1013dc0 addu  s0, a0, zero
+// 0x01013da8: 0x1013da8: sw    ra, 20(sp)
+// 0x01013dac: 0x1013dac: beq   v1, v0, 0x1013dd0 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_1013dc0
+	beq  L_1013dd0
 // --- basic block ---
-// 0x01013da4: 0x1013da4: lui   a1, 0x0
+// 0x01013db4: 0x1013db4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01013da8: 0x1013da8: lui   a3, 0x0
+// 0x01013db8: 0x1013db8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01013dac: 0x1013dac: addiu a1, a1, 27920
+// 0x01013dbc: 0x1013dbc: addiu a1, a1, 27920
 	ldloc.2
 	ldc.i4 27920
 	add
 	stloc.2
-// 0x01013db0: 0x1013db0: addiu a3, a3, 22192
+// 0x01013dc0: 0x1013dc0: addiu a3, a3, 22192
 	ldloc 4
 	ldc.i4 22192
 	add
 	stloc 4
-// 0x01013db4: 0x1013db4: addiu a0, zero, 5
+// 0x01013dc4: 0x1013dc4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01013db8: 0x1013db8: jal   0x100449c addiu a2, zero, 116
+// 0x01013dc8: 0x1013dc8: jal   0x100449c addiu a2, zero, 116
 	ldc.i4.s 116
 	stloc.3
 	ldloc.0
@@ -3803,36 +3803,36 @@ L_1013d84:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1013dc0:
-// 0x01013dc0: 0x1013dc0: lui   v0, 0x30000
+L_1013dd0:
+// 0x01013dd0: 0x1013dd0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013dc4: 0x1013dc4: lw    v1, -28608(v0)
+// 0x01013dd4: 0x1013dd4: lw    v1, -28144(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7152
+	ldc.i4 -7036
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013dc8: 0x1013dc8: sll   zero, zero, 0
-// 0x01013dcc: 0x1013dcc: bne   v1, s0, 0x1013dd8 sll   zero, zero, 0
+// 0x01013dd8: 0x1013dd8: sll   zero, zero, 0
+// 0x01013ddc: 0x1013ddc: bne   v1, s0, 0x1013de8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1013dd8
+	bne.un L_1013de8
 // --- basic block ---
-// 0x01013dd4: 0x1013dd4: sw    zero, -28608(v0)
+// 0x01013de4: 0x1013de4: sw    zero, -28144(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7152
+	ldc.i4 -7036
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1013dd8:
-// 0x01013dd8: 0x1013dd8: jal   0x1000930 addu  a0, s0, zero
+L_1013de8:
+// 0x01013de8: 0x1013de8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3845,8 +3845,8 @@ L_1013dd8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013de0: 0x1013de0: lw    ra, 20(sp)
-// 0x01013de4: 0x1013de4: lw    s0, 16(sp)
+// 0x01013df0: 0x1013df0: lw    ra, 20(sp)
+// 0x01013df4: 0x1013df4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3855,7 +3855,7 @@ L_1013dd8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01013de8: 0x1013de8: jr    ra addiu sp, sp, 24
+// 0x01013df8: 0x1013df8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3867,7 +3867,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_metadata_activate_1013df0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_metadata_activate_1013e00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -3905,13 +3905,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1013df0:
-// 0x01013df0: 0x1013df0: addiu sp, sp, -24
+L_1013e00:
+// 0x01013e00: 0x1013e00: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01013df4: 0x1013df4: sw    s0, 16(sp)
+// 0x01013e04: 0x1013e04: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3920,57 +3920,57 @@ L_1013df0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01013df8: 0x1013df8: sw    ra, 20(sp)
-// 0x01013dfc: 0x1013dfc: beq   a0, zero, 0x1013e7c addu  s0, a0, zero
+// 0x01013e08: 0x1013e08: sw    ra, 20(sp)
+// 0x01013e0c: 0x1013e0c: beq   a0, zero, 0x1013e8c addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1013e7c
+	brfalse L_1013e8c
 // --- basic block ---
-// 0x01013e04: 0x1013e04: lui   v0, 0x20000
+// 0x01013e14: 0x1013e14: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01013e08: 0x1013e08: lw    v1, 0(a0)
+// 0x01013e18: 0x1013e18: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01013e0c: 0x1013e0c: lw    v0, 24784(v0)
+// 0x01013e1c: 0x1013e1c: lw    v0, 25248(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6196
+	ldc.i4 6312
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013e10: 0x1013e10: sll   zero, zero, 0
-// 0x01013e14: 0x1013e14: beq   v1, v0, 0x1013e34 lui   a1, 0x0
+// 0x01013e20: 0x1013e20: sll   zero, zero, 0
+// 0x01013e24: 0x1013e24: beq   v1, v0, 0x1013e44 lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_1013e34
+	beq  L_1013e44
 // --- basic block ---
-// 0x01013e1c: 0x1013e1c: lui   a3, 0x0
+// 0x01013e2c: 0x1013e2c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01013e20: 0x1013e20: addiu a1, a1, 27920
+// 0x01013e30: 0x1013e30: addiu a1, a1, 27920
 	ldloc.2
 	ldc.i4 27920
 	add
 	stloc.2
-// 0x01013e24: 0x1013e24: addiu a3, a3, 27952
+// 0x01013e34: 0x1013e34: addiu a3, a3, 27952
 	ldloc 4
 	ldc.i4 27952
 	add
 	stloc 4
-// 0x01013e28: 0x1013e28: addiu a0, zero, 5
+// 0x01013e38: 0x1013e38: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01013e2c: 0x1013e2c: jal   0x100449c addiu a2, zero, 95
+// 0x01013e3c: 0x1013e3c: jal   0x100449c addiu a2, zero, 95
 	ldc.i4.s 95
 	stloc.3
 	ldloc.0
@@ -3983,8 +3983,8 @@ L_1013df0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1013e34:
-// 0x01013e34: 0x1013e34: lw    v0, 12(s0)
+L_1013e44:
+// 0x01013e44: 0x1013e44: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3993,17 +3993,17 @@ L_1013e34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013e38: 0x1013e38: sll   zero, zero, 0
-// 0x01013e3c: 0x1013e3c: bne   v0, zero, 0x1013e7c lui   a1, 0x0
+// 0x01013e48: 0x1013e48: sll   zero, zero, 0
+// 0x01013e4c: 0x1013e4c: bne   v0, zero, 0x1013e8c lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1013e7c
+	brtrue L_1013e8c
 // --- basic block ---
-// 0x01013e44: 0x1013e44: lui   a0, 0x0
+// 0x01013e54: 0x1013e54: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01013e48: 0x1013e48: jal   0x1006ba0 addiu a0, a0, 23764
+// 0x01013e58: 0x1013e58: jal   0x1006bb0 addiu a0, a0, 23764
 	ldloc.1
 	ldc.i4 23764
 	add
@@ -4013,12 +4013,12 @@ L_1013e34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01013e50: 0x1013e50: sw    v0, 12(s0)
+// 0x01013e60: 0x1013e60: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4027,7 +4027,7 @@ L_1013e34:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01013e54: 0x1013e54: lw    v0, 12(s0)
+// 0x01013e64: 0x1013e64: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4036,30 +4036,30 @@ L_1013e34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01013e58: 0x1013e58: sll   zero, zero, 0
-// 0x01013e5c: 0x1013e5c: bne   v0, zero, 0x1013e7c lui   a1, 0x0
+// 0x01013e68: 0x1013e68: sll   zero, zero, 0
+// 0x01013e6c: 0x1013e6c: bne   v0, zero, 0x1013e8c lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1013e7c
+	brtrue L_1013e8c
 // --- basic block ---
-// 0x01013e64: 0x1013e64: lui   a3, 0x0
+// 0x01013e74: 0x1013e74: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01013e68: 0x1013e68: addiu a1, a1, 27920
+// 0x01013e78: 0x1013e78: addiu a1, a1, 27920
 	ldloc.2
 	ldc.i4 27920
 	add
 	stloc.2
-// 0x01013e6c: 0x1013e6c: addiu a3, a3, 27712
+// 0x01013e7c: 0x1013e7c: addiu a3, a3, 27712
 	ldloc 4
 	ldc.i4 27712
 	add
 	stloc 4
-// 0x01013e70: 0x1013e70: addiu a0, zero, 5
+// 0x01013e80: 0x1013e80: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01013e74: 0x1013e74: jal   0x100449c addiu a2, zero, 104
+// 0x01013e84: 0x1013e84: jal   0x100449c addiu a2, zero, 104
 	ldc.i4.s 104
 	stloc.3
 	ldloc.0
@@ -4072,21 +4072,21 @@ L_1013e34:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1013e7c:
-// 0x01013e7c: 0x1013e7c: lw    ra, 20(sp)
-// 0x01013e80: 0x1013e80: lui   v0, 0x30000
+L_1013e8c:
+// 0x01013e8c: 0x1013e8c: lw    ra, 20(sp)
+// 0x01013e90: 0x1013e90: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01013e84: 0x1013e84: sw    s0, -28608(v0)
+// 0x01013e94: 0x1013e94: sw    s0, -28144(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7152
+	ldc.i4 -7036
 	add
 	ldloc 7
 	stelem.i4
-// 0x01013e88: 0x1013e88: lw    s0, 16(sp)
+// 0x01013e98: 0x1013e98: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4095,7 +4095,7 @@ L_1013e7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013e8c: 0x1013e8c: jr    ra addiu sp, sp, 24
+// 0x01013e9c: 0x1013e9c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4107,7 +4107,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_metadata_map_1013e94(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_metadata_map_1013ea4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4148,13 +4148,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1013e94:
-// 0x01013e94: 0x1013e94: addiu sp, sp, -40
+L_1013ea4:
+// 0x01013ea4: 0x1013ea4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01013e98: 0x1013e98: sw    s1, 32(sp)
+// 0x01013ea8: 0x1013ea8: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4163,10 +4163,10 @@ L_1013e94:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01013e9c: 0x1013e9c: addu  s1, a0, zero
+// 0x01013eac: 0x1013eac: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01013ea0: 0x1013ea0: sw    s0, 28(sp)
+// 0x01013eb0: 0x1013eb0: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4175,8 +4175,8 @@ L_1013e94:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01013ea4: 0x1013ea4: sw    ra, 36(sp)
-// 0x01013ea8: 0x1013ea8: jal   0x1000910 addiu a0, zero, 16
+// 0x01013eb4: 0x1013eb4: sw    ra, 36(sp)
+// 0x01013eb8: 0x1013eb8: jal   0x1000910 addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
 	ldloc.0
@@ -4189,32 +4189,32 @@ L_1013e94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013eb0: 0x1013eb0: bne   v0, zero, 0x1013edc addu  s0, v0, zero
+// 0x01013ec0: 0x1013ec0: bne   v0, zero, 0x1013eec addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1013edc
+	brtrue L_1013eec
 // --- basic block ---
-// 0x01013eb8: 0x1013eb8: lui   a1, 0x0
+// 0x01013ec8: 0x1013ec8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01013ebc: 0x1013ebc: lui   a3, 0x0
+// 0x01013ecc: 0x1013ecc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01013ec0: 0x1013ec0: addiu a1, a1, 27920
+// 0x01013ed0: 0x1013ed0: addiu a1, a1, 27920
 	ldloc.2
 	ldc.i4 27920
 	add
 	stloc.2
-// 0x01013ec4: 0x1013ec4: addiu a3, a3, 22224
+// 0x01013ed4: 0x1013ed4: addiu a3, a3, 22224
 	ldloc 4
 	ldc.i4 22224
 	add
 	stloc 4
-// 0x01013ec8: 0x1013ec8: addiu a0, zero, 4
+// 0x01013ed8: 0x1013ed8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01013ecc: 0x1013ecc: jal   0x100449c addiu a2, zero, 65
+// 0x01013edc: 0x1013edc: jal   0x100449c addiu a2, zero, 65
 	ldc.i4.s 65
 	stloc.3
 	ldloc.0
@@ -4227,38 +4227,38 @@ L_1013e94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013ed4: 0x1013ed4: j	 0x1013f34 sll   zero, zero, 0
-	br L_1013f34
+// 0x01013ee4: 0x1013ee4: j	 0x1013f44 sll   zero, zero, 0
+	br L_1013f44
 // --- basic block ---
-L_1013edc:
-// 0x01013edc: 0x1013edc: lui   v1, 0x20000
+L_1013eec:
+// 0x01013eec: 0x1013eec: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01013ee0: 0x1013ee0: lw    v1, 24784(v1)
+// 0x01013ef0: 0x1013ef0: lw    v1, 25248(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6196
+	ldc.i4 6312
 	add
 	ldelem.i4
 	stloc 7
-// 0x01013ee4: 0x1013ee4: addiu v0, v0, 8
+// 0x01013ef4: 0x1013ef4: addiu v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01013ee8: 0x1013ee8: sw    v1, 0(s0)
+// 0x01013ef8: 0x1013ef8: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01013eec: 0x1013eec: addu  a0, s1, zero
+// 0x01013efc: 0x1013efc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01013ef0: 0x1013ef0: sw    v0, 16(sp)
+// 0x01013f00: 0x1013f00: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4267,18 +4267,18 @@ L_1013edc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01013ef4: 0x1013ef4: addiu a1, zero, 27
+// 0x01013f04: 0x1013f04: addiu a1, zero, 27
 	ldc.i4.s 27
 	stloc.2
-// 0x01013ef8: 0x1013ef8: addiu a2, zero, 8
+// 0x01013f08: 0x1013f08: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x01013efc: 0x1013efc: addiu a3, s0, 4
+// 0x01013f0c: 0x1013f0c: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x01013f00: 0x1013f00: jal   0x10031b0 sw    zero, 12(s0)
+// 0x01013f10: 0x1013f10: jal   0x10031b0 sw    zero, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4297,29 +4297,29 @@ L_1013edc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013f08: 0x1013f08: bne   v0, zero, 0x1013f34 lui   a1, 0x0
+// 0x01013f18: 0x1013f18: bne   v0, zero, 0x1013f44 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1013f34
+	brtrue L_1013f44
 // --- basic block ---
-// 0x01013f10: 0x1013f10: lui   a3, 0x0
+// 0x01013f20: 0x1013f20: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01013f14: 0x1013f14: addiu a1, a1, 27920
+// 0x01013f24: 0x1013f24: addiu a1, a1, 27920
 	ldloc.2
 	ldc.i4 27920
 	add
 	stloc.2
-// 0x01013f18: 0x1013f18: addiu a3, a3, 27988
+// 0x01013f28: 0x1013f28: addiu a3, a3, 27988
 	ldloc 4
 	ldc.i4 27988
 	add
 	stloc 4
-// 0x01013f1c: 0x1013f1c: addiu a2, zero, 76
+// 0x01013f2c: 0x1013f2c: addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
-// 0x01013f20: 0x1013f20: jal   0x100449c addiu a0, zero, 4
+// 0x01013f30: 0x1013f30: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -4332,7 +4332,7 @@ L_1013edc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013f28: 0x1013f28: jal   0x1000930 addu  a0, s0, zero
+// 0x01013f38: 0x1013f38: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4345,15 +4345,15 @@ L_1013edc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01013f30: 0x1013f30: addu  s0, zero, zero
+// 0x01013f40: 0x1013f40: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_1013f34:
-// 0x01013f34: 0x1013f34: lw    ra, 36(sp)
-// 0x01013f38: 0x1013f38: addu  v0, s0, zero
+L_1013f44:
+// 0x01013f44: 0x1013f44: lw    ra, 36(sp)
+// 0x01013f48: 0x1013f48: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01013f3c: 0x1013f3c: lw    s1, 32(sp)
+// 0x01013f4c: 0x1013f4c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4362,7 +4362,7 @@ L_1013f34:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01013f40: 0x1013f40: lw    s0, 28(sp)
+// 0x01013f50: 0x1013f50: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4371,7 +4371,7 @@ L_1013f34:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01013f44: 0x1013f44: jr    ra addiu sp, sp, 40
+// 0x01013f54: 0x1013f54: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4383,7 +4383,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_register_1014064(int32,int32,int32)
+.method public static int32 roadmap_skin_register_1014074(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -4412,56 +4412,56 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014064: 0x1014064: lui   v1, 0x30000
+// 0x01014074: 0x1014074: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x01014068: 0x1014068: addiu v1, v1, -28596
+// 0x01014078: 0x1014078: addiu v1, v1, -28132
 	ldloc.3
-	ldc.i4 -28596
+	ldc.i4 -28132
 	add
 	stloc.3
-// 0x0101406c: 0x101406c: addu  v0, zero, zero
+// 0x0101407c: 0x101407c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01014070: 0x1014070: addiu a1, zero, 16
+// 0x01014080: 0x1014080: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.1
-L_1014074:
-// 0x01014074: 0x1014074: lw    a2, 0(v1)
+L_1014084:
+// 0x01014084: 0x1014084: lw    a2, 0(v1)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01014078: 0x1014078: sll   zero, zero, 0
-// 0x0101407c: 0x101407c: bne   a2, zero, 0x101409c addiu v1, v1, 4
+// 0x01014088: 0x1014088: sll   zero, zero, 0
+// 0x0101408c: 0x101408c: bne   a2, zero, 0x10140ac addiu v1, v1, 4
 	ldloc.2
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-	brtrue L_101409c
+	brtrue L_10140ac
 // --- basic block ---
-// 0x01014084: 0x1014084: lui   v1, 0x30000
+// 0x01014094: 0x1014094: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x01014088: 0x1014088: sll   v0, v0, 2
+// 0x01014098: 0x1014098: sll   v0, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x0101408c: 0x101408c: addiu v1, v1, -28596
+// 0x0101409c: 0x101409c: addiu v1, v1, -28132
 	ldloc.3
-	ldc.i4 -28596
+	ldc.i4 -28132
 	add
 	stloc.3
-// 0x01014090: 0x1014090: addu  v0, v0, v1
+// 0x010140a0: 0x10140a0: addu  v0, v0, v1
 	ldloc 4
 	ldloc.3
 	add
 	stloc 4
-// 0x01014094: 0x1014094: jr    ra sw    a0, 0(v0)
+// 0x010140a4: 0x10140a4: jr    ra sw    a0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4470,18 +4470,18 @@ L_1014074:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_101409c:
-// 0x0101409c: 0x101409c: addiu v0, v0, 1
+L_10140ac:
+// 0x010140ac: 0x10140ac: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010140a0: 0x10140a0: bne   v0, a1, 0x1014074 sll   zero, zero, 0
+// 0x010140b0: 0x10140b0: bne   v0, a1, 0x1014084 sll   zero, zero, 0
 	ldloc 4
 	ldloc.1
-	bne.un L_1014074
+	bne.un L_1014084
 // --- basic block ---
-// 0x010140a8: 0x10140a8: jr    ra sll   zero, zero, 0
+// 0x010140b8: 0x10140b8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -4489,7 +4489,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_skin_auto_night_feature_enabled_10140b0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_auto_night_feature_enabled_10140c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -4524,16 +4524,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010140b0: 0x10140b0: lui   a0, 0x0
+// 0x010140c0: 0x10140c0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010140b4: 0x10140b4: addiu sp, sp, -24
+// 0x010140c4: 0x10140c4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010140b8: 0x10140b8: sw    ra, 20(sp)
-// 0x010140bc: 0x10140bc: jal   0x100e348 addiu a0, a0, 1892
+// 0x010140c8: 0x10140c8: sw    ra, 20(sp)
+// 0x010140cc: 0x10140cc: jal   0x100e358 addiu a0, a0, 1892
 	ldloc.1
 	ldc.i4 1892
 	add
@@ -4543,18 +4543,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010140c4: 0x10140c4: lui   a1, 0x0
+// 0x010140d4: 0x10140d4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010140c8: 0x10140c8: addu  a0, v0, zero
+// 0x010140d8: 0x10140d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010140cc: 0x10140cc: jal   0x1001b14 addiu a1, a1, 20820
+// 0x010140dc: 0x10140dc: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4564,13 +4564,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010140d4: 0x10140d4: lw    ra, 20(sp)
-// 0x010140d8: 0x10140d8: sltiu v0, v0, 1
+// 0x010140e4: 0x10140e4: lw    ra, 20(sp)
+// 0x010140e8: 0x10140e8: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010140dc: 0x10140dc: jr    ra addiu sp, sp, 24
+// 0x010140ec: 0x10140ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4582,7 +4582,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_auto_night_mode_10140e4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_auto_night_mode_10140f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s2,int32 v1,int32 s1,int32 ra)
@@ -4626,12 +4626,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010140e4: 0x10140e4: addiu sp, sp, -40
+// 0x010140f4: 0x10140f4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010140e8: 0x10140e8: sw    s2, 32(sp)
+// 0x010140f8: 0x10140f8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4640,7 +4640,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010140ec: 0x10140ec: sw    s0, 24(sp)
+// 0x010140fc: 0x10140fc: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4649,43 +4649,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010140f0: 0x10140f0: lui   s2, 0x20000
+// 0x01014100: 0x1014100: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010140f4: 0x10140f4: lui   s0, 0x0
+// 0x01014104: 0x1014104: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010140f8: 0x10140f8: lui   a0, 0x10000
+// 0x01014108: 0x1014108: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010140fc: 0x10140fc: lui   a1, 0x0
+// 0x0101410c: 0x101410c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01014100: 0x1014100: addiu s0, s0, 20820
+// 0x01014110: 0x1014110: addiu s0, s0, 20820
 	ldloc 6
 	ldc.i4 20820
 	add
 	stloc 6
-// 0x01014104: 0x1014104: addiu a0, a0, 12560
+// 0x01014114: 0x1014114: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01014108: 0x1014108: addiu a1, a1, 1892
+// 0x01014118: 0x1014118: addiu a1, a1, 1892
 	ldloc.2
 	ldc.i4 1892
 	add
 	stloc.2
-// 0x0101410c: 0x101410c: addu  a2, zero, zero
+// 0x0101411c: 0x101411c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01014110: 0x1014110: addiu a3, s2, 9464
+// 0x01014120: 0x1014120: addiu a3, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01014114: 0x1014114: sw    ra, 36(sp)
-// 0x01014118: 0x1014118: sw    s1, 28(sp)
+// 0x01014124: 0x1014124: sw    ra, 36(sp)
+// 0x01014128: 0x1014128: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4694,7 +4694,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101411c: 0x101411c: sw    s0, 16(sp)
+// 0x0101412c: 0x101412c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4703,7 +4703,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01014120: 0x1014120: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01014130: 0x1014130: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4717,53 +4717,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01014128: 0x1014128: jal   0x10140b0 sll   zero, zero, 0
+// 0x01014138: 0x1014138: jal   0x10140c0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_feature_enabled_10140c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01014130: 0x1014130: beq   v0, zero, 0x101417c lui   s1, 0x0
+// 0x01014140: 0x1014140: beq   v0, zero, 0x101418c lui   s1, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_101417c
+	brfalse L_101418c
 // --- basic block ---
-// 0x01014138: 0x1014138: lui   a0, 0x20000
+// 0x01014148: 0x1014148: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0101413c: 0x101413c: addiu a0, a0, -26888
+// 0x0101414c: 0x101414c: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01014140: 0x1014140: addiu a1, s1, 1860
+// 0x01014150: 0x1014150: addiu a1, s1, 1860
 	ldloc 10
 	ldc.i4 1860
 	add
 	stloc.2
-// 0x01014144: 0x1014144: addiu s2, s2, 9464
+// 0x01014154: 0x1014154: addiu s2, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 8
-// 0x01014148: 0x1014148: addu  a2, zero, zero
+// 0x01014158: 0x1014158: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101414c: 0x101414c: addu  a3, s0, zero
+// 0x0101415c: 0x101415c: addu  a3, s0, zero
 	ldloc 6
 	stloc 4
-// 0x01014150: 0x1014150: sw    s2, 16(sp)
+// 0x01014160: 0x1014160: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4772,7 +4772,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014154: 0x1014154: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01014164: 0x1014164: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4786,17 +4786,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0101415c: 0x101415c: addiu a0, s1, 1860
+// 0x0101416c: 0x101416c: addiu a0, s1, 1860
 	ldloc 10
 	ldc.i4 1860
 	add
 	stloc.1
-// 0x01014160: 0x1014160: jal   0x100e7f4 addu  a1, s0, zero
+// 0x01014170: 0x1014170: jal   0x100e804 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -4804,34 +4804,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01014168: 0x1014168: beq   v0, zero, 0x101417c sll   zero, zero, 0
+// 0x01014178: 0x1014178: beq   v0, zero, 0x101418c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_101417c
+	brfalse L_101418c
 // --- basic block ---
-// 0x01014170: 0x1014170: lui   a0, 0x1010000
+// 0x01014180: 0x1014180: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01014174: 0x1014174: jal   0x1030d38 addiu a0, a0, 17496
+// 0x01014184: 0x1014184: jal   0x1030d48 addiu a0, a0, 17512
 	ldloc.1
-	ldc.i4 17496
+	ldc.i4 17512
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl35::roadmap_gps_register_listener_1030d38(int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_listener_1030d48(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-L_101417c:
-// 0x0101417c: 0x101417c: lw    ra, 36(sp)
-// 0x01014180: 0x1014180: lw    s2, 32(sp)
+L_101418c:
+// 0x0101418c: 0x101418c: lw    ra, 36(sp)
+// 0x01014190: 0x1014190: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4840,7 +4840,7 @@ L_101417c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014184: 0x1014184: lw    s1, 28(sp)
+// 0x01014194: 0x1014194: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4849,7 +4849,7 @@ L_101417c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01014188: 0x1014188: lw    s0, 24(sp)
+// 0x01014198: 0x1014198: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4858,7 +4858,7 @@ L_101417c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101418c: 0x101418c: jr    ra addiu sp, sp, 40
+// 0x0101419c: 0x101419c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4870,7 +4870,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4905,10 +4905,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014194: 0x1014194: lui   v0, 0x0
+// 0x010141a4: 0x10141a4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01014198: 0x1014198: lw    a0, 1912(v0)
+// 0x010141a8: 0x10141a8: lw    a0, 1912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4917,16 +4917,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101419c: 0x101419c: lui   a1, 0x0
+// 0x010141ac: 0x10141ac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010141a0: 0x10141a0: addiu sp, sp, -24
+// 0x010141b0: 0x10141b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010141a4: 0x10141a4: sw    ra, 20(sp)
-// 0x010141a8: 0x10141a8: jal   0x1001b14 addiu a1, a1, 28064
+// 0x010141b4: 0x10141b4: sw    ra, 20(sp)
+// 0x010141b8: 0x10141b8: jal   0x1001b14 addiu a1, a1, 28064
 	ldloc.2
 	ldc.i4 28064
 	add
@@ -4936,13 +4936,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010141b0: 0x10141b0: lw    ra, 20(sp)
-// 0x010141b4: 0x10141b4: sltu  v0, zero, v0
+// 0x010141c0: 0x10141c0: lw    ra, 20(sp)
+// 0x010141c4: 0x10141c4: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010141b8: 0x10141b8: jr    ra addiu sp, sp, 24
+// 0x010141c8: 0x10141c8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4954,7 +4954,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_get_scheme_10141c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_get_scheme_10141d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4989,16 +4989,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010141c0: 0x10141c0: lui   a0, 0x0
+// 0x010141d0: 0x10141d0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010141c4: 0x10141c4: addiu sp, sp, -24
+// 0x010141d4: 0x10141d4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010141c8: 0x10141c8: sw    ra, 20(sp)
-// 0x010141cc: 0x10141cc: jal   0x100e788 addiu a0, a0, 1876
+// 0x010141d8: 0x10141d8: sw    ra, 20(sp)
+// 0x010141dc: 0x10141dc: jal   0x100e798 addiu a0, a0, 1876
 	ldloc.1
 	ldc.i4 1876
 	add
@@ -5008,14 +5008,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010141d4: 0x10141d4: lw    ra, 20(sp)
-// 0x010141d8: 0x10141d8: sll   zero, zero, 0
-// 0x010141dc: 0x10141dc: jr    ra addiu sp, sp, 24
+// 0x010141e4: 0x10141e4: lw    ra, 20(sp)
+// 0x010141e8: 0x10141e8: sll   zero, zero, 0
+// 0x010141ec: 0x10141ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5027,7 +5027,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_skin_auto_night_mode_kill_timer_10141e4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_auto_night_mode_kill_timer_10141f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5062,18 +5062,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010141e4: 0x10141e4: lui   a0, 0x1010000
+// 0x010141f4: 0x10141f4: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x010141e8: 0x10141e8: addiu sp, sp, -24
+// 0x010141f8: 0x10141f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010141ec: 0x10141ec: sw    ra, 20(sp)
-// 0x010141f0: 0x10141f0: jal   0x104fd00 addiu a0, a0, 17804
+// 0x010141fc: 0x10141fc: sw    ra, 20(sp)
+// 0x01014200: 0x1014200: jal   0x104fd10 addiu a0, a0, 17820
 	ldloc.1
-	ldc.i4 17804
+	ldc.i4 17820
 	add
 	stloc.1
 	ldloc.0
@@ -5081,14 +5081,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010141f8: 0x10141f8: lw    ra, 20(sp)
-// 0x010141fc: 0x10141fc: sll   zero, zero, 0
-// 0x01014200: 0x1014200: jr    ra addiu sp, sp, 24
+// 0x01014208: 0x1014208: lw    ra, 20(sp)
+// 0x0101420c: 0x101420c: sll   zero, zero, 0
+// 0x01014210: 0x1014210: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5100,7 +5100,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_skin_state_screen_touched_1014208(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_state_screen_touched_1014218(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5135,30 +5135,30 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014208: 0x1014208: addiu sp, sp, -24
+// 0x01014218: 0x1014218: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101420c: 0x101420c: sw    ra, 20(sp)
-// 0x01014210: 0x1014210: jal   0x101f9dc sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_touched_state_101f9dc()
+// 0x0101421c: 0x101421c: sw    ra, 20(sp)
+// 0x01014220: 0x1014220: jal   0x101f9ec sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_touched_state_101f9ec()
 	stloc 5
 // --- basic block ---
-// 0x01014218: 0x1014218: addiu a0, zero, -1
+// 0x01014228: 0x1014228: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0101421c: 0x101421c: beq   v0, a0, 0x101423c addiu v1, zero, -1
+// 0x0101422c: 0x101422c: beq   v0, a0, 0x101424c addiu v1, zero, -1
 	ldloc 5
 	ldloc.1
 	ldc.i4.m1
 	stloc 6
-	beq  L_101423c
+	beq  L_101424c
 // --- basic block ---
-// 0x01014224: 0x1014224: lui   v0, 0x0
+// 0x01014234: 0x1014234: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01014228: 0x1014228: lw    a0, 1912(v0)
+// 0x01014238: 0x1014238: lw    a0, 1912(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -5167,10 +5167,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101422c: 0x101422c: lui   a1, 0x0
+// 0x0101423c: 0x101423c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01014230: 0x1014230: jal   0x1001b14 addiu a1, a1, 28064
+// 0x01014240: 0x1014240: jal   0x1001b14 addiu a1, a1, 28064
 	ldloc.2
 	ldc.i4 28064
 	add
@@ -5180,17 +5180,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01014238: 0x1014238: sltu  v1, zero, v0
+// 0x01014248: 0x1014248: sltu  v1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 6
-L_101423c:
-// 0x0101423c: 0x101423c: lw    ra, 20(sp)
-// 0x01014240: 0x1014240: addu  v0, v1, zero
+L_101424c:
+// 0x0101424c: 0x101424c: lw    ra, 20(sp)
+// 0x01014250: 0x1014250: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01014244: 0x1014244: jr    ra addiu sp, sp, 24
+// 0x01014254: 0x1014254: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5202,7 +5202,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_set_subskin_101424c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_set_subskin_101425c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s4,int32 s1,int32 s3,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -5261,12 +5261,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101424c: 0x101424c: addiu sp, sp, -1080
+// 0x0101425c: 0x101425c: addiu sp, sp, -1080
 	ldloc.0
 	ldc.i4 -1080
 	add
 	stloc.0
-// 0x01014250: 0x1014250: sw    s0, 1044(sp)
+// 0x01014260: 0x1014260: sw    s0, 1044(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5275,19 +5275,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014254: 0x1014254: addu  s0, a0, zero
+// 0x01014264: 0x1014264: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01014258: 0x1014258: lui   a0, 0x0
+// 0x01014268: 0x1014268: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101425c: 0x101425c: addiu a0, a0, 26244
+// 0x0101426c: 0x101426c: addiu a0, a0, 26244
 	ldloc.1
 	ldc.i4 26244
 	add
 	stloc.1
-// 0x01014260: 0x1014260: sw    ra, 1076(sp)
-// 0x01014264: 0x1014264: sw    s2, 1052(sp)
+// 0x01014270: 0x1014270: sw    ra, 1076(sp)
+// 0x01014274: 0x1014274: sw    s2, 1052(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5296,7 +5296,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014268: 0x1014268: sw    s1, 1048(sp)
+// 0x01014278: 0x1014278: sw    s1, 1048(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5305,7 +5305,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101426c: 0x101426c: sw    s7, 1072(sp)
+// 0x0101427c: 0x101427c: sw    s7, 1072(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5314,7 +5314,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01014270: 0x1014270: sw    s6, 1068(sp)
+// 0x01014280: 0x1014280: sw    s6, 1068(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5323,7 +5323,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01014274: 0x1014274: sw    s5, 1064(sp)
+// 0x01014284: 0x1014284: sw    s5, 1064(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5332,7 +5332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01014278: 0x1014278: sw    s4, 1060(sp)
+// 0x01014288: 0x1014288: sw    s4, 1060(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5341,7 +5341,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101427c: 0x101427c: jal   0x104d04c sw    s3, 1056(sp)
+// 0x0101428c: 0x101428c: jal   0x104d05c sw    s3, 1056(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5355,30 +5355,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_preferred_104d04c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_preferred_104d05c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01014284: 0x1014284: lui   v1, 0x20000
+// 0x01014294: 0x1014294: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01014288: 0x1014288: lw    a1, 24788(v1)
+// 0x01014298: 0x1014298: lw    a1, 25252(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6197
+	ldc.i4 6313
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101428c: 0x101428c: lui   s2, 0x0
+// 0x0101429c: 0x101429c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01014290: 0x1014290: addu  a0, v0, zero
+// 0x010142a0: 0x10142a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01014294: 0x1014294: jal   0x104cb30 sw    s0, 1912(s2)
+// 0x010142a4: 0x10142a4: jal   0x104cb40 sw    s0, 1912(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5392,12 +5392,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101429c: 0x101429c: lw    a1, 1912(s2)
+// 0x010142ac: 0x10142ac: lw    a1, 1912(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5406,10 +5406,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010142a0: 0x10142a0: addu  a0, v0, zero
+// 0x010142b0: 0x10142b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010142a4: 0x10142a4: jal   0x104cb30 addu  s1, v0, zero
+// 0x010142b4: 0x10142b4: jal   0x104cb40 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -5417,15 +5417,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010142ac: 0x10142ac: lui   a1, 0x0
+// 0x010142bc: 0x10142bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010142b0: 0x10142b0: lw    a0, 1912(s2)
+// 0x010142c0: 0x10142c0: lw    a0, 1912(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5434,12 +5434,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010142b4: 0x10142b4: addiu a1, a1, 28064
+// 0x010142c4: 0x10142c4: addiu a1, a1, 28064
 	ldloc.2
 	ldc.i4 28064
 	add
 	stloc.2
-// 0x010142b8: 0x10142b8: jal   0x1001b14 addu  s0, v0, zero
+// 0x010142c8: 0x10142c8: jal   0x1001b14 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -5447,16 +5447,16 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010142c0: 0x10142c0: bne   v0, zero, 0x101432c lui   a2, 0x10000
+// 0x010142d0: 0x10142d0: bne   v0, zero, 0x101433c lui   a2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	brtrue L_101432c
+	brtrue L_101433c
 // --- basic block ---
-// 0x010142c8: 0x10142c8: lui   s2, 0x0
+// 0x010142d8: 0x10142d8: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010142cc: 0x10142cc: jal   0x100e348 addiu a0, s2, 1876
+// 0x010142dc: 0x10142dc: jal   0x100e358 addiu a0, s2, 1876
 	ldloc 8
 	ldc.i4 1876
 	add
@@ -5466,27 +5466,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010142d4: 0x10142d4: lb    v0, 0(v0)
+// 0x010142e4: 0x10142e4: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010142d8: 0x10142d8: addiu s4, sp, 16
+// 0x010142e8: 0x10142e8: addiu s4, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-// 0x010142dc: 0x10142dc: beq   v0, zero, 0x1014320 lui   s3, 0x10000
+// 0x010142ec: 0x10142ec: beq   v0, zero, 0x1014330 lui   s3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 12
-	brfalse L_1014320
+	brfalse L_1014330
 // --- basic block ---
-// 0x010142e4: 0x10142e4: jal   0x100e348 addiu a0, s2, 1876
+// 0x010142f4: 0x10142f4: jal   0x100e358 addiu a0, s2, 1876
 	ldloc 8
 	ldc.i4 1876
 	add
@@ -5496,15 +5496,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010142ec: 0x10142ec: addu  a1, v0, zero
+// 0x010142fc: 0x10142fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010142f0: 0x10142f0: jal   0x104cb30 addu  a0, s0, zero
+// 0x01014300: 0x1014300: jal   0x104cb40 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5512,26 +5512,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010142f8: 0x10142f8: addu  s2, v0, zero
+// 0x01014308: 0x1014308: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010142fc: 0x10142fc: addu  a0, s4, zero
+// 0x0101430c: 0x101430c: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x01014300: 0x1014300: addiu a2, s3, 19912
+// 0x01014310: 0x1014310: addiu a2, s3, 20332
 	ldloc 12
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01014304: 0x1014304: addiu a1, zero, 1024
+// 0x01014314: 0x1014314: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x01014308: 0x1014308: jal   0x1000f9c addu  a3, v0, zero
+// 0x01014318: 0x1014318: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -5544,7 +5544,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01014310: 0x1014310: jal   0x104c670 addu  a0, s2, zero
+// 0x01014320: 0x1014320: jal   0x104c680 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5552,43 +5552,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01014318: 0x1014318: j	 0x1014344 lui   s4, 0x0
+// 0x01014328: 0x1014328: j	 0x1014354 lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 10
-	br L_1014344
+	br L_1014354
 // --- basic block ---
-L_1014320:
-// 0x01014320: 0x1014320: addu  a0, s4, zero
+L_1014330:
+// 0x01014330: 0x1014330: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x01014324: 0x1014324: j	 0x1014334 addiu a2, s3, 19912
+// 0x01014334: 0x1014334: j	 0x1014344 addiu a2, s3, 20332
 	ldloc 12
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-	br L_1014334
+	br L_1014344
 // --- basic block ---
-L_101432c:
-// 0x0101432c: 0x101432c: addiu a2, a2, 19912
+L_101433c:
+// 0x0101433c: 0x101433c: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01014330: 0x1014330: addiu a0, sp, 16
+// 0x01014340: 0x1014340: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-L_1014334:
-// 0x01014334: 0x1014334: addiu a1, zero, 1024
+L_1014344:
+// 0x01014344: 0x1014344: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x01014338: 0x1014338: jal   0x1000f9c addu  a3, s0, zero
+// 0x01014348: 0x1014348: jal   0x1000f9c addu  a3, s0, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -5601,11 +5601,11 @@ L_1014334:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01014340: 0x1014340: lui   s4, 0x0
+// 0x01014350: 0x1014350: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 10
-L_1014344:
-// 0x01014344: 0x1014344: jal   0x104d204 addiu a0, s4, 26244
+L_1014354:
+// 0x01014354: 0x1014354: jal   0x104d214 addiu a0, s4, 26244
 	ldloc 10
 	ldc.i4 26244
 	add
@@ -5615,52 +5615,52 @@ L_1014344:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101434c: 0x101434c: lui   s7, 0x0
+// 0x0101435c: 0x101435c: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x01014350: 0x1014350: lui   s6, 0x0
+// 0x01014360: 0x1014360: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x01014354: 0x1014354: lui   s5, 0x0
+// 0x01014364: 0x1014364: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01014358: 0x1014358: addu  s2, v0, zero
+// 0x01014368: 0x1014368: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0101435c: 0x101435c: addiu s7, s7, 28064
+// 0x0101436c: 0x101436c: addiu s7, s7, 28064
 	ldloc 15
 	ldc.i4 28064
 	add
 	stloc 15
-// 0x01014360: 0x1014360: addiu s6, s6, 28068
+// 0x01014370: 0x1014370: addiu s6, s6, 28068
 	ldloc 14
 	ldc.i4 28068
 	add
 	stloc 14
-// 0x01014364: 0x1014364: addiu s5, s5, 28076
+// 0x01014374: 0x1014374: addiu s5, s5, 28076
 	ldloc 13
 	ldc.i4 28076
 	add
 	stloc 13
-// 0x01014368: 0x1014368: addiu s4, s4, 26244
+// 0x01014378: 0x1014378: addiu s4, s4, 26244
 	ldloc 10
 	ldc.i4 26244
 	add
 	stloc 10
-// 0x0101436c: 0x101436c: j	 0x10143bc addiu s3, sp, 16
+// 0x0101437c: 0x101437c: j	 0x10143cc addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-	br L_10143bc
+	br L_10143cc
 // --- basic block ---
-L_1014374:
-// 0x01014374: 0x1014374: jal   0x1000420 sll   zero, zero, 0
+L_1014384:
+// 0x01014384: 0x1014384: jal   0x1000420 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5671,16 +5671,16 @@ L_1014374:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101437c: 0x101437c: bne   v0, zero, 0x10143b0 addu  a1, s2, zero
+// 0x0101438c: 0x101438c: bne   v0, zero, 0x10143c0 addu  a1, s2, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
-	brtrue L_10143b0
+	brtrue L_10143c0
 // --- basic block ---
-// 0x01014384: 0x1014384: addu  a0, s2, zero
+// 0x01014394: 0x1014394: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01014388: 0x1014388: jal   0x1000420 addu  a1, s6, zero
+// 0x01014398: 0x1014398: jal   0x1000420 addu  a1, s6, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -5693,13 +5693,13 @@ L_1014374:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01014390: 0x1014390: bne   v0, zero, 0x10143ac addu  a0, s3, zero
+// 0x010143a0: 0x10143a0: bne   v0, zero, 0x10143bc addu  a0, s3, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_10143ac
+	brtrue L_10143bc
 // --- basic block ---
-// 0x01014398: 0x1014398: jal   0x1001ac4 addu  a1, s5, zero
+// 0x010143a8: 0x10143a8: jal   0x1001ac4 addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
@@ -5707,10 +5707,10 @@ L_1014374:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010143a0: 0x10143a0: addu  a0, s3, zero
+// 0x010143b0: 0x10143b0: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010143a4: 0x10143a4: jal   0x1001ac4 addu  a1, s2, zero
+// 0x010143b4: 0x10143b4: jal   0x1001ac4 addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5718,12 +5718,12 @@ L_1014374:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-L_10143ac:
-// 0x010143ac: 0x10143ac: addu  a1, s2, zero
+L_10143bc:
+// 0x010143bc: 0x10143bc: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-L_10143b0:
-// 0x010143b0: 0x10143b0: jal   0x104d18c addu  a0, s4, zero
+L_10143c0:
+// 0x010143c0: 0x10143c0: jal   0x104d19c addu  a0, s4, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5731,33 +5731,33 @@ L_10143b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010143b8: 0x10143b8: addu  s2, v0, zero
+// 0x010143c8: 0x10143c8: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-L_10143bc:
-// 0x010143bc: 0x10143bc: addu  a0, s2, zero
+L_10143cc:
+// 0x010143cc: 0x10143cc: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010143c0: 0x10143c0: bne   s2, zero, 0x1014374 addu  a1, s7, zero
+// 0x010143d0: 0x10143d0: bne   s2, zero, 0x1014384 addu  a1, s7, zero
 	ldloc 8
 	ldloc 15
 	stloc.2
-	brtrue L_1014374
+	brtrue L_1014384
 // --- basic block ---
-// 0x010143c8: 0x10143c8: lui   a0, 0x0
+// 0x010143d8: 0x10143d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010143cc: 0x10143cc: addiu a1, sp, 16
+// 0x010143dc: 0x10143dc: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010143d0: 0x10143d0: jal   0x104d274 addiu a0, a0, 26244
+// 0x010143e0: 0x10143e0: jal   0x104d284 addiu a0, a0, 26244
 	ldloc.1
 	ldc.i4 26244
 	add
@@ -5767,12 +5767,12 @@ L_10143bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_set_104d274(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_set_104d284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010143d8: 0x10143d8: jal   0x104c670 addu  a0, s0, zero
+// 0x010143e8: 0x10143e8: jal   0x104c680 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5780,12 +5780,12 @@ L_10143bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010143e0: 0x10143e0: jal   0x104c670 addu  a0, s1, zero
+// 0x010143f0: 0x10143f0: jal   0x104c680 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -5793,23 +5793,23 @@ L_10143bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010143e8: 0x10143e8: lui   a0, 0x0
+// 0x010143f8: 0x10143f8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010143ec: 0x10143ec: addiu a0, a0, 26236
+// 0x010143fc: 0x10143fc: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010143f0: 0x10143f0: lui   s0, 0x30000
+// 0x01014400: 0x1014400: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x010143f4: 0x10143f4: jal   0x100f1ec lui   s1, 0x30000
+// 0x01014404: 0x1014404: jal   0x100f1fc lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 11
 	ldloc.0
@@ -5817,39 +5817,39 @@ L_10143bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_config_reload_100f1ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_config_reload_100f1fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010143fc: 0x10143fc: addiu s0, s0, -28596
+// 0x0101440c: 0x101440c: addiu s0, s0, -28132
 	ldloc 9
-	ldc.i4 -28596
+	ldc.i4 -28132
 	add
 	stloc 9
-// 0x01014400: 0x1014400: addiu s1, s1, -28532
+// 0x01014410: 0x1014410: addiu s1, s1, -28068
 	ldloc 11
-	ldc.i4 -28532
+	ldc.i4 -28068
 	add
 	stloc 11
-L_1014404:
-// 0x01014404: 0x1014404: lw    v0, 0(s0)
+L_1014414:
+// 0x01014414: 0x1014414: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014408: 0x1014408: sll   zero, zero, 0
-// 0x0101440c: 0x101440c: beq   v0, zero, 0x1014424 addiu s0, s0, 4
+// 0x01014418: 0x1014418: sll   zero, zero, 0
+// 0x0101441c: 0x101441c: beq   v0, zero, 0x1014434 addiu s0, s0, 4
 	ldloc 5
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	brfalse L_1014424
+	brfalse L_1014434
 // --- basic block ---
-// 0x01014414: 0x1014414: jalr  v0 sll   zero, zero, 0
+// 0x01014424: 0x1014424: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5861,25 +5861,25 @@ L_1014404:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101441c: 0x101441c: bne   s0, s1, 0x1014404 sll   zero, zero, 0
+// 0x0101442c: 0x101442c: bne   s0, s1, 0x1014414 sll   zero, zero, 0
 	ldloc 9
 	ldloc 11
-	bne.un L_1014404
+	bne.un L_1014414
 // --- basic block ---
-L_1014424:
-// 0x01014424: 0x1014424: jal   0x1021900 sll   zero, zero, 0
+L_1014434:
+// 0x01014434: 0x1014434: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101442c: 0x101442c: lw    ra, 1076(sp)
-// 0x01014430: 0x1014430: lw    s7, 1072(sp)
+// 0x0101443c: 0x101443c: lw    ra, 1076(sp)
+// 0x01014440: 0x1014440: lw    s7, 1072(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5888,7 +5888,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01014434: 0x1014434: lw    s6, 1068(sp)
+// 0x01014444: 0x1014444: lw    s6, 1068(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5897,7 +5897,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01014438: 0x1014438: lw    s5, 1064(sp)
+// 0x01014448: 0x1014448: lw    s5, 1064(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5906,7 +5906,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101443c: 0x101443c: lw    s4, 1060(sp)
+// 0x0101444c: 0x101444c: lw    s4, 1060(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5915,7 +5915,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01014440: 0x1014440: lw    s3, 1056(sp)
+// 0x01014450: 0x1014450: lw    s3, 1056(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5924,7 +5924,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01014444: 0x1014444: lw    s2, 1052(sp)
+// 0x01014454: 0x1014454: lw    s2, 1052(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5933,7 +5933,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014448: 0x1014448: lw    s1, 1048(sp)
+// 0x01014458: 0x1014458: lw    s1, 1048(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5942,7 +5942,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101444c: 0x101444c: lw    s0, 1044(sp)
+// 0x0101445c: 0x101445c: lw    s0, 1044(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5951,7 +5951,7 @@ L_1014424:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014450: 0x1014450: jr    ra addiu sp, sp, 1080
+// 0x01014460: 0x1014460: jr    ra addiu sp, sp, 1080
 	ldloc.0
 	ldc.i4 1080
 	add
@@ -5963,7 +5963,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_gps_listener_1014458(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_gps_listener_1014468(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 lo,int32 ra)
@@ -6010,29 +6010,29 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014458: 0x1014458: lui   v0, 0x30000
+// 0x01014468: 0x1014468: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101445c: 0x101445c: lw    v1, -28604(v0)
+// 0x0101446c: 0x101446c: lw    v1, -28140(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7151
+	ldc.i4 -7035
 	add
 	ldelem.i4
 	stloc 6
-// 0x01014460: 0x1014460: addiu sp, sp, -40
+// 0x01014470: 0x1014470: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01014464: 0x1014464: slti  a0, v1, 3
+// 0x01014474: 0x1014474: slti  a0, v1, 3
 	ldloc 6
 	ldc.i4.3
 	clt
 	stloc.1
-// 0x01014468: 0x1014468: sw    s2, 32(sp)
+// 0x01014478: 0x1014478: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6041,8 +6041,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101446c: 0x101446c: sw    ra, 36(sp)
-// 0x01014470: 0x1014470: sw    s1, 28(sp)
+// 0x0101447c: 0x101447c: sw    ra, 36(sp)
+// 0x01014480: 0x1014480: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6051,7 +6051,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014474: 0x1014474: sw    s0, 24(sp)
+// 0x01014484: 0x1014484: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6060,46 +6060,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014478: 0x1014478: beq   a0, zero, 0x101448c addu  s2, a2, zero
+// 0x01014488: 0x1014488: beq   a0, zero, 0x101449c addu  s2, a2, zero
 	ldloc.1
 	ldloc.3
 	stloc 10
-	brfalse L_101448c
+	brfalse L_101449c
 // --- basic block ---
-// 0x01014480: 0x1014480: addiu v1, v1, 1
+// 0x01014490: 0x1014490: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01014484: 0x1014484: j	 0x1014574 sw    v1, -28604(v0)
+// 0x01014494: 0x1014494: j	 0x1014584 sw    v1, -28140(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7151
+	ldc.i4 -7035
 	add
 	ldloc 6
 	stelem.i4
-	br L_1014574
+	br L_1014584
 // --- basic block ---
-L_101448c:
-// 0x0101448c: 0x101448c: addu  s0, zero, zero
+L_101449c:
+// 0x0101449c: 0x101449c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01014490: 0x1014490: cibyl_sysc_arg 0x10
+// 0x010144a0: 0x10144a0: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x01014494: 0x1014494: cibyl_sysc 0x2ef
+// 0x010144a4: 0x10144a4: cibyl_sysc 0x2ef
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01014498: 0x1014498: addu  s0, v0, zero
+// 0x010144a8: 0x10144a8: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0101449c: 0x101449c: lui   a0, 0x1010000
+// 0x010144ac: 0x10144ac: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x010144a0: 0x10144a0: jal   0x1031da0 addiu a0, a0, 17496
+// 0x010144b0: 0x10144b0: jal   0x1031db0 addiu a0, a0, 17512
 	ldloc.1
-	ldc.i4 17496
+	ldc.i4 17512
 	add
 	stloc.1
 	ldloc.0
@@ -6107,42 +6107,42 @@ L_101448c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_unregister_listener_1031da0(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_unregister_listener_1031db0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010144a8: 0x10144a8: lui   v0, 0x30000
+// 0x010144b8: 0x10144b8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010144ac: 0x10144ac: lw    v1, -28600(v0)
+// 0x010144bc: 0x10144bc: lw    v1, -28136(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7150
+	ldc.i4 -7034
 	add
 	ldelem.i4
 	stloc 6
-// 0x010144b0: 0x10144b0: sll   zero, zero, 0
-// 0x010144b4: 0x10144b4: bne   v1, zero, 0x1014574 addu  a1, s0, zero
+// 0x010144c0: 0x10144c0: sll   zero, zero, 0
+// 0x010144c4: 0x10144c4: bne   v1, zero, 0x1014584 addu  a1, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brtrue L_1014574
+	brtrue L_1014584
 // --- basic block ---
-// 0x010144bc: 0x10144bc: addu  a0, s2, zero
+// 0x010144cc: 0x10144cc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010144c0: 0x10144c0: addiu s1, zero, 1
+// 0x010144d0: 0x10144d0: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010144c4: 0x10144c4: jal   0x10bfa70 sw    s1, -28600(v0)
+// 0x010144d4: 0x10144d4: jal   0x10c00b8 sw    s1, -28136(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7150
+	ldc.i4 -7034
 	add
 	ldloc 9
 	stelem.i4
@@ -6151,17 +6151,17 @@ L_101448c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_sunrise_10bfa70(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_sunrise_10c00b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010144cc: 0x10144cc: addiu a0, sp, 20
+// 0x010144dc: 0x10144dc: addiu a0, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.1
-// 0x010144d0: 0x10144d0: jal   0x10c3558 sw    v0, 20(sp)
+// 0x010144e0: 0x10144e0: jal   0x10c3b98 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6175,15 +6175,15 @@ L_101448c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010144d8: 0x10144d8: addu  a0, s2, zero
+// 0x010144e8: 0x10144e8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010144dc: 0x10144dc: jal   0x10bfa34 addu  a1, s0, zero
+// 0x010144ec: 0x10144ec: jal   0x10c007c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -6191,17 +6191,17 @@ L_101448c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_sunset_10bfa34(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_sunset_10c007c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010144e4: 0x10144e4: addiu a0, sp, 16
+// 0x010144f4: 0x10144f4: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010144e8: 0x10144e8: jal   0x10c3558 sw    v0, 16(sp)
+// 0x010144f8: 0x10144f8: jal   0x10c3b98 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6215,12 +6215,12 @@ L_101448c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010144f0: 0x10144f0: lw    v0, 16(sp)
+// 0x01014500: 0x1014500: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6229,7 +6229,7 @@ L_101448c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010144f4: 0x10144f4: lw    v1, 20(sp)
+// 0x01014504: 0x1014504: lw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6238,19 +6238,19 @@ L_101448c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010144f8: 0x10144f8: sll   zero, zero, 0
-// 0x010144fc: 0x10144fc: slt   v1, v1, v0
+// 0x01014508: 0x1014508: sll   zero, zero, 0
+// 0x0101450c: 0x101450c: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x01014500: 0x1014500: beq   v1, zero, 0x1014540 lui   a0, 0x0
+// 0x01014510: 0x1014510: beq   v1, zero, 0x1014550 lui   a0, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1014540
+	brfalse L_1014550
 // --- basic block ---
-// 0x01014508: 0x1014508: jal   0x101424c addiu a0, a0, 28068
+// 0x01014518: 0x1014518: jal   0x101425c addiu a0, a0, 28068
 	ldloc.1
 	ldc.i4 28068
 	add
@@ -6260,12 +6260,12 @@ L_101448c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_subskin_101424c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_subskin_101425c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01014510: 0x1014510: lw    v0, 20(sp)
+// 0x01014520: 0x1014520: lw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6274,85 +6274,85 @@ L_101448c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014514: 0x1014514: sll   zero, zero, 0
-// 0x01014518: 0x1014518: subu  s0, v0, s0
+// 0x01014524: 0x1014524: sll   zero, zero, 0
+// 0x01014528: 0x1014528: subu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 8
-// 0x0101451c: 0x101451c: addiu v0, s0, -1
+// 0x0101452c: 0x101452c: addiu v0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01014520: 0x1014520: sltiu v0, v0, 1799
+// 0x01014530: 0x1014530: sltiu v0, v0, 1799
 	ldloc 5
 	ldc.i4 1799
 	clt.un
 	stloc 5
-// 0x01014524: 0x1014524: beq   v0, zero, 0x1014574 addiu a0, zero, 1000
+// 0x01014534: 0x1014534: beq   v0, zero, 0x1014584 addiu a0, zero, 1000
 	ldloc 5
 	ldc.i4 1000
 	stloc.1
-	brfalse L_1014574
+	brfalse L_1014584
 // --- basic block ---
-// 0x0101452c: 0x101452c: mult  s0, a0
+// 0x0101453c: 0x101453c: mult  s0, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 11
-// 0x01014530: 0x1014530: lui   a1, 0x1010000
+// 0x01014540: 0x1014540: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x01014534: 0x1014534: mflo  lo
+// 0x01014544: 0x1014544: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01014538: 0x1014538: j	 0x101456c addiu a1, a1, 17804
+// 0x01014548: 0x1014548: j	 0x101457c addiu a1, a1, 17820
 	ldloc.2
-	ldc.i4 17804
+	ldc.i4 17820
 	add
 	stloc.2
-	br L_101456c
+	br L_101457c
 // --- basic block ---
-L_1014540:
-// 0x01014540: 0x1014540: subu  s0, v0, s0
+L_1014550:
+// 0x01014550: 0x1014550: subu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 8
-// 0x01014544: 0x1014544: addiu v0, s0, -1
+// 0x01014554: 0x1014554: addiu v0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01014548: 0x1014548: sltiu v0, v0, 1799
+// 0x01014558: 0x1014558: sltiu v0, v0, 1799
 	ldloc 5
 	ldc.i4 1799
 	clt.un
 	stloc 5
-// 0x0101454c: 0x101454c: beq   v0, zero, 0x1014574 addiu a0, zero, 1000
+// 0x0101455c: 0x101455c: beq   v0, zero, 0x1014584 addiu a0, zero, 1000
 	ldloc 5
 	ldc.i4 1000
 	stloc.1
-	brfalse L_1014574
+	brfalse L_1014584
 // --- basic block ---
-// 0x01014554: 0x1014554: mult  s0, a0
+// 0x01014564: 0x1014564: mult  s0, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 11
-// 0x01014558: 0x1014558: lui   a1, 0x1010000
+// 0x01014568: 0x1014568: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0101455c: 0x101455c: lui   v0, 0x0
+// 0x0101456c: 0x101456c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01014560: 0x1014560: addiu a1, a1, 17804
+// 0x01014570: 0x1014570: addiu a1, a1, 17820
 	ldloc.2
-	ldc.i4 17804
+	ldc.i4 17820
 	add
 	stloc.2
-// 0x01014564: 0x1014564: sw    s1, 1908(v0)
+// 0x01014574: 0x1014574: sw    s1, 1908(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6361,24 +6361,24 @@ L_1014540:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014568: 0x1014568: mflo  lo
+// 0x01014578: 0x1014578: mflo  lo
 	ldloc 11
 	stloc.1
-L_101456c:
-// 0x0101456c: 0x101456c: jal   0x104fe98 sll   zero, zero, 0
+L_101457c:
+// 0x0101457c: 0x101457c: jal   0x104fea8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1014574:
-// 0x01014574: 0x1014574: lw    ra, 36(sp)
-// 0x01014578: 0x1014578: lw    s2, 32(sp)
+L_1014584:
+// 0x01014584: 0x1014584: lw    ra, 36(sp)
+// 0x01014588: 0x1014588: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6387,7 +6387,7 @@ L_1014574:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101457c: 0x101457c: lw    s1, 28(sp)
+// 0x0101458c: 0x101458c: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6396,7 +6396,7 @@ L_1014574:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014580: 0x1014580: lw    s0, 24(sp)
+// 0x01014590: 0x1014590: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6405,7 +6405,7 @@ L_1014574:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014584: 0x1014584: jr    ra addiu sp, sp, 40
+// 0x01014594: 0x1014594: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6417,7 +6417,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 toggle_skin_timer_101458c(int32,int32,int32,int32,int32)
+.method public static int32 toggle_skin_timer_101459c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -6452,10 +6452,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101458c: 0x101458c: lui   v0, 0x0
+// 0x0101459c: 0x101459c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01014590: 0x1014590: lw    v0, 1908(v0)
+// 0x010145a0: 0x10145a0: lw    v0, 1908(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6464,60 +6464,60 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014594: 0x1014594: addiu sp, sp, -24
+// 0x010145a4: 0x10145a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01014598: 0x1014598: beq   v0, zero, 0x10145ac sw    ra, 20(sp)
+// 0x010145a8: 0x10145a8: beq   v0, zero, 0x10145bc sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_10145ac
+	brfalse L_10145bc
 // --- basic block ---
-// 0x010145a0: 0x10145a0: lui   a0, 0x0
+// 0x010145b0: 0x10145b0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010145a4: 0x10145a4: j	 0x10145b4 addiu a0, a0, 28068
+// 0x010145b4: 0x10145b4: j	 0x10145c4 addiu a0, a0, 28068
 	ldloc.1
 	ldc.i4 28068
 	add
 	stloc.1
-	br L_10145b4
+	br L_10145c4
 // --- basic block ---
-L_10145ac:
-// 0x010145ac: 0x10145ac: lui   a0, 0x0
+L_10145bc:
+// 0x010145bc: 0x10145bc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010145b0: 0x10145b0: addiu a0, a0, 28064
+// 0x010145c0: 0x10145c0: addiu a0, a0, 28064
 	ldloc.1
 	ldc.i4 28064
 	add
 	stloc.1
-L_10145b4:
-// 0x010145b4: 0x10145b4: jal   0x101424c sll   zero, zero, 0
+L_10145c4:
+// 0x010145c4: 0x10145c4: jal   0x101425c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_subskin_101424c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_subskin_101425c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010145bc: 0x10145bc: jal   0x10141e4 sll   zero, zero, 0
+// 0x010145cc: 0x10145cc: jal   0x10141f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_mode_kill_timer_10141e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_mode_kill_timer_10141f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010145c4: 0x10145c4: lw    ra, 20(sp)
-// 0x010145c8: 0x10145c8: sll   zero, zero, 0
-// 0x010145cc: 0x10145cc: jr    ra addiu sp, sp, 24
+// 0x010145d4: 0x10145d4: lw    ra, 20(sp)
+// 0x010145d8: 0x10145d8: sll   zero, zero, 0
+// 0x010145dc: 0x10145dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6529,7 +6529,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_set_scheme_10145d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_set_scheme_10145e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -6564,19 +6564,19 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010145d4: 0x10145d4: addu  a1, a0, zero
+// 0x010145e4: 0x10145e4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010145d8: 0x10145d8: lui   a0, 0x0
+// 0x010145e8: 0x10145e8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010145dc: 0x10145dc: addiu sp, sp, -24
+// 0x010145ec: 0x10145ec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010145e0: 0x10145e0: sw    ra, 20(sp)
-// 0x010145e4: 0x10145e4: jal   0x100e5c0 addiu a0, a0, 1876
+// 0x010145f0: 0x10145f0: sw    ra, 20(sp)
+// 0x010145f4: 0x10145f4: jal   0x100e5d0 addiu a0, a0, 1876
 	ldloc.1
 	ldc.i4 1876
 	add
@@ -6586,15 +6586,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010145ec: 0x10145ec: lui   v0, 0x0
+// 0x010145fc: 0x10145fc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010145f0: 0x10145f0: lw    a0, 1912(v0)
+// 0x01014600: 0x1014600: lw    a0, 1912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6603,20 +6603,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010145f4: 0x10145f4: jal   0x101424c sll   zero, zero, 0
+// 0x01014604: 0x1014604: jal   0x101425c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_subskin_101424c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_subskin_101425c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010145fc: 0x10145fc: lw    ra, 20(sp)
-// 0x01014600: 0x1014600: sll   zero, zero, 0
-// 0x01014604: 0x1014604: jr    ra addiu sp, sp, 24
+// 0x0101460c: 0x101460c: lw    ra, 20(sp)
+// 0x01014610: 0x1014610: sll   zero, zero, 0
+// 0x01014614: 0x1014614: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6628,7 +6628,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_init_101460c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_init_101461c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -6666,12 +6666,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101460c: 0x101460c: addiu sp, sp, -24
+// 0x0101461c: 0x101461c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01014610: 0x1014610: sw    s0, 16(sp)
+// 0x01014620: 0x1014620: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6680,32 +6680,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01014614: 0x1014614: lui   a0, 0x20000
+// 0x01014624: 0x1014624: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01014618: 0x1014618: lui   s0, 0x0
+// 0x01014628: 0x1014628: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0101461c: 0x101461c: lui   a2, 0x10000
+// 0x0101462c: 0x101462c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01014620: 0x1014620: addiu a0, a0, -26888
+// 0x01014630: 0x1014630: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01014624: 0x1014624: addiu a2, a2, 18500
+// 0x01014634: 0x1014634: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01014628: 0x1014628: addiu a1, s0, 1876
+// 0x01014638: 0x1014638: addiu a1, s0, 1876
 	ldloc 6
 	ldc.i4 1876
 	add
 	stloc.2
-// 0x0101462c: 0x101462c: sw    ra, 20(sp)
-// 0x01014630: 0x1014630: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101463c: 0x101463c: sw    ra, 20(sp)
+// 0x01014640: 0x1014640: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6713,12 +6713,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01014638: 0x1014638: jal   0x100e348 addiu a0, s0, 1876
+// 0x01014648: 0x1014648: jal   0x100e358 addiu a0, s0, 1876
 	ldloc 6
 	ldc.i4 1876
 	add
@@ -6728,23 +6728,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01014640: 0x1014640: lb    v0, 0(v0)
+// 0x01014650: 0x1014650: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01014644: 0x1014644: sll   zero, zero, 0
-// 0x01014648: 0x1014648: beq   v0, zero, 0x1014658 lui   a0, 0x0
+// 0x01014654: 0x1014654: sll   zero, zero, 0
+// 0x01014658: 0x1014658: beq   v0, zero, 0x1014668 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1014658
+	brfalse L_1014668
 // --- basic block ---
-// 0x01014650: 0x1014650: jal   0x101424c addiu a0, a0, 28064
+// 0x01014660: 0x1014660: jal   0x101425c addiu a0, a0, 28064
 	ldloc.1
 	ldc.i4 28064
 	add
@@ -6754,25 +6754,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_subskin_101424c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_subskin_101425c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1014658:
-// 0x01014658: 0x1014658: jal   0x10140e4 sll   zero, zero, 0
+L_1014668:
+// 0x01014668: 0x1014668: jal   0x10140f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_auto_night_mode_10140e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_auto_night_mode_10140f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01014660: 0x1014660: lw    ra, 20(sp)
-// 0x01014664: 0x1014664: lw    s0, 16(sp)
+// 0x01014670: 0x1014670: lw    ra, 20(sp)
+// 0x01014674: 0x1014674: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6781,7 +6781,7 @@ L_1014658:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01014668: 0x1014668: jr    ra addiu sp, sp, 24
+// 0x01014678: 0x1014678: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6793,7 +6793,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_skin_toggle_1014670(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_skin_toggle_1014680(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 ra,int32 v1)
@@ -6831,16 +6831,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1014670:
-// 0x01014670: 0x1014670: addiu sp, sp, -24
+L_1014680:
+// 0x01014680: 0x1014680: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01014674: 0x1014674: lui   v0, 0x0
+// 0x01014684: 0x1014684: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01014678: 0x1014678: sw    s0, 16(sp)
+// 0x01014688: 0x1014688: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6849,7 +6849,7 @@ L_1014670:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101467c: 0x101467c: lw    a0, 1912(v0)
+// 0x0101468c: 0x101468c: lw    a0, 1912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6858,11 +6858,11 @@ L_1014670:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01014680: 0x1014680: lui   s0, 0x0
+// 0x01014690: 0x1014690: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01014684: 0x1014684: sw    ra, 20(sp)
-// 0x01014688: 0x1014688: jal   0x1001b14 addiu a1, s0, 28064
+// 0x01014694: 0x1014694: sw    ra, 20(sp)
+// 0x01014698: 0x1014698: jal   0x1001b14 addiu a1, s0, 28064
 	ldloc 6
 	ldc.i4 28064
 	add
@@ -6872,36 +6872,36 @@ L_1014670:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01014690: 0x1014690: bne   v0, zero, 0x10146a0 addiu a0, s0, 28064
+// 0x010146a0: 0x10146a0: bne   v0, zero, 0x10146b0 addiu a0, s0, 28064
 	ldloc 5
 	ldloc 6
 	ldc.i4 28064
 	add
 	stloc.1
-	brtrue L_10146a0
+	brtrue L_10146b0
 // --- basic block ---
-// 0x01014698: 0x1014698: lui   a0, 0x0
+// 0x010146a8: 0x10146a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101469c: 0x101469c: addiu a0, a0, 28068
+// 0x010146ac: 0x10146ac: addiu a0, a0, 28068
 	ldloc.1
 	ldc.i4 28068
 	add
 	stloc.1
-L_10146a0:
-// 0x010146a0: 0x10146a0: jal   0x101424c sll   zero, zero, 0
+L_10146b0:
+// 0x010146b0: 0x10146b0: jal   0x101425c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_set_subskin_101424c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_set_subskin_101425c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010146a8: 0x10146a8: lw    ra, 20(sp)
-// 0x010146ac: 0x10146ac: lw    s0, 16(sp)
+// 0x010146b8: 0x10146b8: lw    ra, 20(sp)
+// 0x010146bc: 0x10146bc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6910,7 +6910,7 @@ L_10146a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010146b0: 0x10146b0: jr    ra addiu sp, sp, 24
+// 0x010146c0: 0x10146c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6922,7 +6922,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_register_10146b8(int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_register_10146c8(int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -6954,102 +6954,102 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010146b8: 0x10146b8: lui   v1, 0x30000
+// 0x010146c8: 0x10146c8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x010146bc: 0x10146bc: addiu v1, v1, -28524
+// 0x010146cc: 0x10146cc: addiu v1, v1, -28060
 	ldloc 4
-	ldc.i4 -28524
+	ldc.i4 -28060
 	add
 	stloc 4
-// 0x010146c0: 0x10146c0: addiu v0, zero, 1
+// 0x010146d0: 0x10146d0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010146c4: 0x10146c4: addiu a1, zero, 10
+// 0x010146d4: 0x10146d4: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.1
-L_10146c8:
-// 0x010146c8: 0x10146c8: lw    a2, 0(v1)
+L_10146d8:
+// 0x010146d8: 0x10146d8: lw    a2, 0(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010146cc: 0x10146cc: sll   zero, zero, 0
-// 0x010146d0: 0x10146d0: bne   a2, zero, 0x1014700 addiu v1, v1, 4
+// 0x010146dc: 0x10146dc: sll   zero, zero, 0
+// 0x010146e0: 0x10146e0: bne   a2, zero, 0x1014710 addiu v1, v1, 4
 	ldloc.2
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-	brtrue L_1014700
+	brtrue L_1014710
 // --- basic block ---
-// 0x010146d8: 0x10146d8: lui   v1, 0x30000
+// 0x010146e8: 0x10146e8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x010146dc: 0x10146dc: lw    a1, -28532(v1)
+// 0x010146ec: 0x10146ec: lw    a1, -28068(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldelem.i4
 	stloc.1
-// 0x010146e0: 0x10146e0: lui   a2, 0x30000
+// 0x010146f0: 0x10146f0: lui   a2, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x010146e4: 0x10146e4: sll   a3, v0, 2
+// 0x010146f4: 0x10146f4: sll   a3, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x010146e8: 0x10146e8: addiu a2, a2, -28528
+// 0x010146f8: 0x10146f8: addiu a2, a2, -28064
 	ldloc.2
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc.2
-// 0x010146ec: 0x10146ec: addu  a2, a3, a2
+// 0x010146fc: 0x10146fc: addu  a2, a3, a2
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x010146f0: 0x10146f0: addiu a1, a1, 1
+// 0x01014700: 0x1014700: addiu a1, a1, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010146f4: 0x10146f4: sw    a0, 0(a2)
+// 0x01014704: 0x1014704: sw    a0, 0(a2)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-// 0x010146f8: 0x10146f8: jr    ra sw    a1, -28532(v1)
+// 0x01014708: 0x1014708: jr    ra sw    a1, -28068(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldloc.1
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1014700:
-// 0x01014700: 0x1014700: addiu v0, v0, 1
+L_1014710:
+// 0x01014710: 0x1014710: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01014704: 0x1014704: bne   v0, a1, 0x10146c8 sll   zero, zero, 0
+// 0x01014714: 0x1014714: bne   v0, a1, 0x10146d8 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_10146c8
+	bne.un L_10146d8
 // --- basic block ---
-// 0x0101470c: 0x101470c: jr    ra addiu v0, zero, -1
+// 0x0101471c: 0x101471c: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
 	br __CIBYL_function_return
@@ -7059,7 +7059,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_unregister_1014714(int32,int32)
+.method public static int32 roadmap_plugin_unregister_1014724(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -7085,62 +7085,62 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014714: 0x1014714: lui   v1, 0x30000
+// 0x01014724: 0x1014724: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01014718: 0x1014718: addiu v1, v1, -28528
+// 0x01014728: 0x1014728: addiu v1, v1, -28064
 	ldloc.2
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc.2
-// 0x0101471c: 0x101471c: sll   a1, a0, 2
+// 0x0101472c: 0x101472c: sll   a1, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01014720: 0x1014720: addiu v0, a0, 1
+// 0x01014730: 0x1014730: addiu v0, a0, 1
 	ldloc.0
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01014724: 0x1014724: addu  a1, a1, v1
+// 0x01014734: 0x1014734: addu  a1, a1, v1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01014728: 0x1014728: sll   v0, v0, 2
+// 0x01014738: 0x1014738: sll   v0, v0, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x0101472c: 0x101472c: sw    zero, 0(a1)
+// 0x0101473c: 0x101473c: sw    zero, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01014730: 0x1014730: j	 0x1014748 addu  v0, v1, v0
+// 0x01014740: 0x1014740: j	 0x1014758 addu  v0, v1, v0
 	ldloc.2
 	ldloc.3
 	add
 	stloc.3
-	br L_1014748
+	br L_1014758
 // --- basic block ---
-L_1014738:
-// 0x01014738: 0x1014738: lw    v1, 0(v0)
+L_1014748:
+// 0x01014748: 0x1014748: lw    v1, 0(v0)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101473c: 0x101473c: addiu a0, a0, 1
+// 0x0101474c: 0x101474c: addiu a0, a0, 1
 	ldloc.0
 	ldc.i4.1
 	add
 	stloc.0
-// 0x01014740: 0x1014740: sw    v1, -4(v0)
+// 0x01014750: 0x1014750: sw    v1, -4(v0)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
@@ -7149,45 +7149,45 @@ L_1014738:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01014744: 0x1014744: addiu v0, v0, 4
+// 0x01014754: 0x1014754: addiu v0, v0, 4
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-L_1014748:
-// 0x01014748: 0x1014748: slti  v1, a0, 9
+L_1014758:
+// 0x01014758: 0x1014758: slti  v1, a0, 9
 	ldloc.0
 	ldc.i4.s 9
 	clt
 	stloc.2
-// 0x0101474c: 0x101474c: bne   v1, zero, 0x1014738 sll   zero, zero, 0
+// 0x0101475c: 0x101475c: bne   v1, zero, 0x1014748 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1014738
+	brtrue L_1014748
 // --- basic block ---
-// 0x01014754: 0x1014754: lui   v0, 0x30000
+// 0x01014764: 0x1014764: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x01014758: 0x1014758: lw    v1, -28532(v0)
+// 0x01014768: 0x1014768: lw    v1, -28068(v0)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101475c: 0x101475c: sll   zero, zero, 0
-// 0x01014760: 0x1014760: addiu v1, v1, -1
+// 0x0101476c: 0x101476c: sll   zero, zero, 0
+// 0x01014770: 0x1014770: addiu v1, v1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01014764: 0x1014764: jr    ra sw    v1, -28532(v0)
+// 0x01014774: 0x1014774: jr    ra sw    v1, -28068(v0)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldloc.2
 	stelem.i4
@@ -7198,7 +7198,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_plugin_override_line_101476c()
+.method public static int32 roadmap_plugin_override_line_101477c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -7212,7 +7212,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101476c: 0x101476c: jr    ra addu  v0, zero, zero
+// 0x0101477c: 0x101477c: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -7220,7 +7220,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_plugin_screen_repaint_101477c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_screen_repaint_101478c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra,int32 v1)
@@ -7267,12 +7267,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101477c: 0x101477c: addiu sp, sp, -40
+// 0x0101478c: 0x101478c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01014780: 0x1014780: sw    s1, 24(sp)
+// 0x01014790: 0x1014790: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7281,10 +7281,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01014784: 0x1014784: lui   s1, 0x30000
+// 0x01014794: 0x1014794: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01014788: 0x1014788: sw    s3, 32(sp)
+// 0x01014798: 0x1014798: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7293,7 +7293,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101478c: 0x101478c: sw    s2, 28(sp)
+// 0x0101479c: 0x101479c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7302,7 +7302,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014790: 0x1014790: sw    s0, 20(sp)
+// 0x010147a0: 0x10147a0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7311,41 +7311,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014794: 0x1014794: sw    ra, 36(sp)
-// 0x01014798: 0x1014798: addu  s3, a0, zero
+// 0x010147a4: 0x10147a4: sw    ra, 36(sp)
+// 0x010147a8: 0x10147a8: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0101479c: 0x101479c: addiu s1, s1, -28524
+// 0x010147ac: 0x10147ac: addiu s1, s1, -28060
 	ldloc 7
-	ldc.i4 -28524
+	ldc.i4 -28060
 	add
 	stloc 7
-// 0x010147a0: 0x10147a0: addiu s0, zero, 1
+// 0x010147b0: 0x10147b0: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010147a4: 0x10147a4: j	 0x10147d8 lui   s2, 0x30000
+// 0x010147b4: 0x10147b4: j	 0x10147e8 lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 9
-	br L_10147d8
+	br L_10147e8
 // --- basic block ---
-L_10147ac:
-// 0x010147ac: 0x10147ac: lw    v0, 0(s1)
+L_10147bc:
+// 0x010147bc: 0x10147bc: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010147b0: 0x10147b0: sll   zero, zero, 0
-// 0x010147b4: 0x10147b4: beq   v0, zero, 0x10147d4 addiu s0, s0, 1
+// 0x010147c0: 0x10147c0: sll   zero, zero, 0
+// 0x010147c4: 0x10147c4: beq   v0, zero, 0x10147e4 addiu s0, s0, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_10147d4
+	brfalse L_10147e4
 // --- basic block ---
-// 0x010147bc: 0x10147bc: lw    v0, 24(v0)
+// 0x010147cc: 0x10147cc: lw    v0, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7354,12 +7354,12 @@ L_10147ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010147c0: 0x10147c0: sll   zero, zero, 0
-// 0x010147c4: 0x10147c4: beq   v0, zero, 0x10147d4 sll   zero, zero, 0
+// 0x010147d0: 0x10147d0: sll   zero, zero, 0
+// 0x010147d4: 0x10147d4: beq   v0, zero, 0x10147e4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10147d4
+	brfalse L_10147e4
 // --- basic block ---
-// 0x010147cc: 0x10147cc: jalr  v0 sll   zero, zero, 0
+// 0x010147dc: 0x10147dc: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -7371,36 +7371,36 @@ L_10147ac:
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_10147d4:
-// 0x010147d4: 0x10147d4: addiu s1, s1, 4
+L_10147e4:
+// 0x010147e4: 0x10147e4: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_10147d8:
-// 0x010147d8: 0x10147d8: lw    v0, -28532(s2)
+L_10147e8:
+// 0x010147e8: 0x10147e8: lw    v0, -28068(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldelem.i4
 	stloc 6
-// 0x010147dc: 0x10147dc: sll   zero, zero, 0
-// 0x010147e0: 0x10147e0: slt   v0, v0, s0
+// 0x010147ec: 0x10147ec: sll   zero, zero, 0
+// 0x010147f0: 0x10147f0: slt   v0, v0, s0
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 6
-// 0x010147e4: 0x10147e4: beq   v0, zero, 0x10147ac addu  a0, s3, zero
+// 0x010147f4: 0x10147f4: beq   v0, zero, 0x10147bc addu  a0, s3, zero
 	ldloc 6
 	ldloc 10
 	stloc.1
-	brfalse L_10147ac
+	brfalse L_10147bc
 // --- basic block ---
-// 0x010147ec: 0x10147ec: lw    ra, 36(sp)
-// 0x010147f0: 0x10147f0: lw    s3, 32(sp)
+// 0x010147fc: 0x10147fc: lw    ra, 36(sp)
+// 0x01014800: 0x1014800: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7409,7 +7409,7 @@ L_10147d8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010147f4: 0x10147f4: lw    s2, 28(sp)
+// 0x01014804: 0x1014804: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7418,7 +7418,7 @@ L_10147d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010147f8: 0x10147f8: lw    s1, 24(sp)
+// 0x01014808: 0x1014808: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7427,7 +7427,7 @@ L_10147d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010147fc: 0x10147fc: lw    s0, 20(sp)
+// 0x0101480c: 0x101480c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7436,7 +7436,7 @@ L_10147d8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014800: 0x1014800: jr    ra addiu sp, sp, 40
+// 0x01014810: 0x1014810: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -7448,7 +7448,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_plugin_find_connected_lines_1014808(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_find_connected_lines_1014818(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra,int32 lo,int32 v1)
@@ -7510,12 +7510,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014808: 0x1014808: addiu sp, sp, -56
+// 0x01014818: 0x1014818: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0101480c: 0x101480c: sw    s2, 28(sp)
+// 0x0101481c: 0x101481c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7524,10 +7524,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014810: 0x1014810: lui   s2, 0x30000
+// 0x01014820: 0x1014820: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x01014814: 0x1014814: sw    s7, 48(sp)
+// 0x01014824: 0x1014824: sw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7536,7 +7536,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01014818: 0x1014818: sw    s6, 44(sp)
+// 0x01014828: 0x1014828: sw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7545,7 +7545,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101481c: 0x101481c: sw    s5, 40(sp)
+// 0x0101482c: 0x101482c: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7554,7 +7554,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01014820: 0x1014820: sw    s4, 36(sp)
+// 0x01014830: 0x1014830: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7563,7 +7563,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01014824: 0x1014824: sw    s3, 32(sp)
+// 0x01014834: 0x1014834: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7572,7 +7572,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01014828: 0x1014828: sw    s1, 24(sp)
+// 0x01014838: 0x1014838: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7581,7 +7581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101482c: 0x101482c: sw    s0, 20(sp)
+// 0x0101483c: 0x101483c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7590,53 +7590,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01014830: 0x1014830: sw    ra, 52(sp)
-// 0x01014834: 0x1014834: addu  s7, a0, zero
+// 0x01014840: 0x1014840: sw    ra, 52(sp)
+// 0x01014844: 0x1014844: addu  s7, a0, zero
 	ldloc.1
 	stloc 14
-// 0x01014838: 0x1014838: addu  s6, a1, zero
+// 0x01014848: 0x1014848: addu  s6, a1, zero
 	ldloc.2
 	stloc 13
-// 0x0101483c: 0x101483c: addu  s5, a2, zero
+// 0x0101484c: 0x101484c: addu  s5, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01014840: 0x1014840: addiu s2, s2, -28524
+// 0x01014850: 0x1014850: addiu s2, s2, -28060
 	ldloc 8
-	ldc.i4 -28524
+	ldc.i4 -28060
 	add
 	stloc 8
-// 0x01014844: 0x1014844: addu  s0, zero, zero
+// 0x01014854: 0x1014854: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01014848: 0x1014848: addiu s1, zero, 1
+// 0x01014858: 0x1014858: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0101484c: 0x101484c: lui   s4, 0x30000
+// 0x0101485c: 0x101485c: lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 11
-// 0x01014850: 0x1014850: j	 0x101488c addiu s3, zero, 20
+// 0x01014860: 0x1014860: j	 0x101489c addiu s3, zero, 20
 	ldc.i4.s 20
 	stloc 10
-	br L_101488c
+	br L_101489c
 // --- basic block ---
-L_1014858:
-// 0x01014858: 0x1014858: lw    v0, 0(s2)
+L_1014868:
+// 0x01014868: 0x1014868: lw    v0, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101485c: 0x101485c: sll   zero, zero, 0
-// 0x01014860: 0x1014860: beq   v0, zero, 0x1014888 addiu s1, s1, 1
+// 0x0101486c: 0x101486c: sll   zero, zero, 0
+// 0x01014870: 0x1014870: beq   v0, zero, 0x1014898 addiu s1, s1, 1
 	ldloc 6
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brfalse L_1014888
+	brfalse L_1014898
 // --- basic block ---
-// 0x01014868: 0x1014868: lw    v0, 40(v0)
+// 0x01014878: 0x1014878: lw    v0, 40(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7645,19 +7645,19 @@ L_1014858:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101486c: 0x101486c: sll   zero, zero, 0
-// 0x01014870: 0x1014870: beq   v0, zero, 0x1014888 mult  s0, s3
+// 0x0101487c: 0x101487c: sll   zero, zero, 0
+// 0x01014880: 0x1014880: beq   v0, zero, 0x1014898 mult  s0, s3
 	ldloc 6
 	ldloc 7
 	ldloc 10
 	mul
 	stloc 16
-	brfalse L_1014888
+	brfalse L_1014898
 // --- basic block ---
-// 0x01014878: 0x1014878: mflo  lo
+// 0x01014888: 0x1014888: mflo  lo
 	ldloc 16
 	stloc.2
-// 0x0101487c: 0x101487c: jalr  v0 addu  a1, s6, a1
+// 0x0101488c: 0x101488c: jalr  v0 addu  a1, s6, a1
 	ldloc 6
 	ldloc 13
 	ldloc.2
@@ -7673,48 +7673,48 @@ L_1014858:
 	stloc 17
 	stloc 6
 // --- basic block ---
-// 0x01014884: 0x1014884: addu  s0, s0, v0
+// 0x01014894: 0x1014894: addu  s0, s0, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-L_1014888:
-// 0x01014888: 0x1014888: addiu s2, s2, 4
+L_1014898:
+// 0x01014898: 0x1014898: addiu s2, s2, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_101488c:
-// 0x0101488c: 0x101488c: lw    v0, -28532(s4)
+L_101489c:
+// 0x0101489c: 0x101489c: lw    v0, -28068(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldelem.i4
 	stloc 6
-// 0x01014890: 0x1014890: subu  a2, s5, s0
+// 0x010148a0: 0x10148a0: subu  a2, s5, s0
 	ldloc 12
 	ldloc 7
 	sub
 	stloc.3
-// 0x01014894: 0x1014894: slt   v0, v0, s1
+// 0x010148a4: 0x10148a4: slt   v0, v0, s1
 	ldloc 6
 	ldloc 9
 	clt
 	stloc 6
-// 0x01014898: 0x1014898: beq   v0, zero, 0x1014858 addu  a0, s7, zero
+// 0x010148a8: 0x10148a8: beq   v0, zero, 0x1014868 addu  a0, s7, zero
 	ldloc 6
 	ldloc 14
 	stloc.1
-	brfalse L_1014858
+	brfalse L_1014868
 // --- basic block ---
-// 0x010148a0: 0x10148a0: lw    ra, 52(sp)
-// 0x010148a4: 0x10148a4: addu  v0, s0, zero
+// 0x010148b0: 0x10148b0: lw    ra, 52(sp)
+// 0x010148b4: 0x10148b4: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x010148a8: 0x10148a8: lw    s7, 48(sp)
+// 0x010148b8: 0x10148b8: lw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7723,7 +7723,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010148ac: 0x10148ac: lw    s6, 44(sp)
+// 0x010148bc: 0x10148bc: lw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7732,7 +7732,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010148b0: 0x10148b0: lw    s5, 40(sp)
+// 0x010148c0: 0x10148c0: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7741,7 +7741,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010148b4: 0x10148b4: lw    s4, 36(sp)
+// 0x010148c4: 0x10148c4: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7750,7 +7750,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010148b8: 0x10148b8: lw    s3, 32(sp)
+// 0x010148c8: 0x10148c8: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7759,7 +7759,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010148bc: 0x10148bc: lw    s2, 28(sp)
+// 0x010148cc: 0x10148cc: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7768,7 +7768,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010148c0: 0x10148c0: lw    s1, 24(sp)
+// 0x010148d0: 0x10148d0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7777,7 +7777,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010148c4: 0x10148c4: lw    s0, 20(sp)
+// 0x010148d4: 0x10148d4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7786,7 +7786,7 @@ L_101488c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010148c8: 0x10148c8: jr    ra addiu sp, sp, 56
+// 0x010148d8: 0x10148d8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl140.j b/converted/Cibyl140.j
index 814172e..1f9a10a 100644
--- a/converted/Cibyl140.j
+++ b/converted/Cibyl140.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl140::.ctor
 
-.method public static int32 T_81_10bb6f8(int32,int32,int32,int32,int32)
+.method public static int32 T_81_10bbd40(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -91,12 +91,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bb6f8: 0x10bb6f8: addiu sp, sp, -40
+// 0x010bbd40: 0x10bbd40: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010bb6fc: 0x10bb6fc: sw    s0, 16(sp)
+// 0x010bbd44: 0x10bbd44: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -105,13 +105,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bb700: 0x10bb700: addu  s0, a0, zero
+// 0x010bbd48: 0x10bbd48: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010bb704: 0x10bb704: addu  a0, a1, zero
+// 0x010bbd4c: 0x10bbd4c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010bb708: 0x10bb708: sw    s4, 32(sp)
+// 0x010bbd50: 0x10bbd50: sw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -120,7 +120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bb70c: 0x10bb70c: sw    s3, 28(sp)
+// 0x010bbd54: 0x10bbd54: sw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -129,7 +129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bb710: 0x10bb710: sw    s2, 24(sp)
+// 0x010bbd58: 0x10bbd58: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -138,7 +138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bb714: 0x10bb714: sw    s1, 20(sp)
+// 0x010bbd5c: 0x10bbd5c: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -147,11 +147,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bb718: 0x10bb718: sw    ra, 36(sp)
-// 0x010bb71c: 0x10bb71c: addu  s2, a1, zero
+// 0x010bbd60: 0x10bbd60: sw    ra, 36(sp)
+// 0x010bbd64: 0x10bbd64: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010bb720: 0x10bb720: jal   0x101cd60 addu  s1, a2, zero
+// 0x010bbd68: 0x10bbd68: jal   0x101cd70 addu  s1, a2, zero
 	ldloc.3
 	stloc 9
 	ldloc.0
@@ -159,21 +159,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bb728: 0x10bb728: addiu s4, zero, 10
+// 0x010bbd70: 0x10bbd70: addiu s4, zero, 10
 	ldc.i4.s 10
 	stloc 12
-// 0x010bb72c: 0x10bb72c: j	 0x10bb828 addu  s3, v0, zero
+// 0x010bbd74: 0x10bbd74: j	 0x10bbe70 addu  s3, v0, zero
 	ldloc 6
 	stloc 11
-	br L_10bb828
+	br L_10bbe70
 // --- basic block ---
-L_10bb734:
-// 0x010bb734: 0x10bb734: jal   0x1001b48 addu  a0, s2, zero
+L_10bbd7c:
+// 0x010bbd7c: 0x10bbd7c: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -182,13 +182,13 @@ L_10bb734:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bb73c: 0x10bb73c: addu  a2, v0, zero
+// 0x010bbd84: 0x10bbd84: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x010bb740: 0x10bb740: addu  a0, s2, zero
+// 0x010bbd88: 0x10bbd88: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010bb744: 0x10bb744: jal   0x1001b2c addu  a1, s0, zero
+// 0x010bbd8c: 0x10bbd8c: jal   0x1001b2c addu  a1, s0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -197,13 +197,13 @@ L_10bb734:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010bb74c: 0x10bb74c: beq   v0, zero, 0x10bb77c addiu a0, zero, 58
+// 0x010bbd94: 0x10bbd94: beq   v0, zero, 0x10bbdc4 addiu a0, zero, 58
 	ldloc 6
 	ldc.i4.s 58
 	stloc.1
-	brfalse L_10bb77c
+	brfalse L_10bbdc4
 // --- basic block ---
-// 0x010bb754: 0x10bb754: jal   0x1001b48 addu  a0, s3, zero
+// 0x010bbd9c: 0x10bbd9c: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -212,13 +212,13 @@ L_10bb734:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bb75c: 0x10bb75c: addu  a2, v0, zero
+// 0x010bbda4: 0x10bbda4: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x010bb760: 0x10bb760: addu  a0, s3, zero
+// 0x010bbda8: 0x10bbda8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bb764: 0x10bb764: jal   0x1001b2c addu  a1, s0, zero
+// 0x010bbdac: 0x10bbdac: jal   0x1001b2c addu  a1, s0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -227,125 +227,125 @@ L_10bb734:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010bb76c: 0x10bb76c: beq   v0, zero, 0x10bb77c addiu a0, zero, 58
+// 0x010bbdb4: 0x10bbdb4: beq   v0, zero, 0x10bbdc4 addiu a0, zero, 58
 	ldloc 6
 	ldc.i4.s 58
 	stloc.1
-	brfalse L_10bb77c
+	brfalse L_10bbdc4
 // --- basic block ---
-// 0x010bb774: 0x10bb774: j	 0x10bb810 sll   zero, zero, 0
-	br L_10bb810
+// 0x010bbdbc: 0x10bbdbc: j	 0x10bbe58 sll   zero, zero, 0
+	br L_10bbe58
 // --- basic block ---
-L_10bb77c:
-// 0x010bb77c: 0x10bb77c: lb    v1, 0(s0)
+L_10bbdc4:
+// 0x010bbdc4: 0x10bbdc4: lb    v1, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010bb780: 0x10bb780: sll   zero, zero, 0
-// 0x010bb784: 0x10bb784: beq   v1, zero, 0x10bb838 addiu v0, s0, 1
+// 0x010bbdc8: 0x10bbdc8: sll   zero, zero, 0
+// 0x010bbdcc: 0x10bbdcc: beq   v1, zero, 0x10bbe80 addiu v0, s0, 1
 	ldloc 8
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_10bb838
+	brfalse L_10bbe80
 // --- basic block ---
-// 0x010bb78c: 0x10bb78c: bne   v1, a0, 0x10bb77c addu  s0, v0, zero
+// 0x010bbdd4: 0x10bbdd4: bne   v1, a0, 0x10bbdc4 addu  s0, v0, zero
 	ldloc 8
 	ldloc.1
 	ldloc 6
 	stloc 5
-	bne.un L_10bb77c
+	bne.un L_10bbdc4
 // --- basic block ---
-// 0x010bb794: 0x10bb794: j	 0x10bb7a0 addiu v0, zero, 32
+// 0x010bbddc: 0x10bbddc: j	 0x10bbde8 addiu v0, zero, 32
 	ldc.i4.s 32
 	stloc 6
-	br L_10bb7a0
+	br L_10bbde8
 // --- basic block ---
-L_10bb79c:
-// 0x010bb79c: 0x10bb79c: addiu s0, s0, 1
+L_10bbde4:
+// 0x010bbde4: 0x10bbde4: addiu s0, s0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_10bb7a0:
-// 0x010bb7a0: 0x10bb7a0: lb    v1, 0(s0)
+L_10bbde8:
+// 0x010bbde8: 0x10bbde8: lb    v1, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010bb7a4: 0x10bb7a4: sll   zero, zero, 0
-// 0x010bb7a8: 0x10bb7a8: beq   v1, v0, 0x10bb79c addu  a1, s0, zero
+// 0x010bbdec: 0x10bbdec: sll   zero, zero, 0
+// 0x010bbdf0: 0x10bbdf0: beq   v1, v0, 0x10bbde4 addu  a1, s0, zero
 	ldloc 8
 	ldloc 6
 	ldloc 5
 	stloc.2
-	beq  L_10bb79c
+	beq  L_10bbde4
 // --- basic block ---
-// 0x010bb7b0: 0x10bb7b0: j	 0x10bb7bc addiu v1, zero, 10
+// 0x010bbdf8: 0x10bbdf8: j	 0x10bbe04 addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 8
-	br L_10bb7bc
+	br L_10bbe04
 // --- basic block ---
-L_10bb7b8:
-// 0x010bb7b8: 0x10bb7b8: addiu s0, s0, 1
+L_10bbe00:
+// 0x010bbe00: 0x10bbe00: addiu s0, s0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_10bb7bc:
-// 0x010bb7bc: 0x10bb7bc: lb    v0, 0(s0)
+L_10bbe04:
+// 0x010bbe04: 0x10bbe04: lb    v0, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010bb7c0: 0x10bb7c0: sll   zero, zero, 0
-// 0x010bb7c4: 0x10bb7c4: beq   v0, zero, 0x10bb7d4 sll   zero, zero, 0
+// 0x010bbe08: 0x10bbe08: sll   zero, zero, 0
+// 0x010bbe0c: 0x10bbe0c: beq   v0, zero, 0x10bbe1c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10bb7d4
+	brfalse L_10bbe1c
 // --- basic block ---
-// 0x010bb7cc: 0x10bb7cc: bne   v0, v1, 0x10bb7b8 sll   zero, zero, 0
+// 0x010bbe14: 0x10bbe14: bne   v0, v1, 0x10bbe00 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	bne.un L_10bb7b8
+	bne.un L_10bbe00
 // --- basic block ---
-L_10bb7d4:
-// 0x010bb7d4: 0x10bb7d4: bne   a1, s0, 0x10bb7e4 subu  s0, s0, a1
+L_10bbe1c:
+// 0x010bbe1c: 0x10bbe1c: bne   a1, s0, 0x10bbe2c subu  s0, s0, a1
 	ldloc.2
 	ldloc 5
 	ldloc 5
 	ldloc.2
 	sub
 	stloc 5
-	bne.un L_10bb7e4
+	bne.un L_10bbe2c
 // --- basic block ---
-// 0x010bb7dc: 0x10bb7dc: j	 0x10bb808 sb    zero, 0(s1)
+// 0x010bbe24: 0x10bbe24: j	 0x10bbe50 sb    zero, 0(s1)
 	ldloc 9
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_10bb808
+	br L_10bbe50
 // --- basic block ---
-L_10bb7e4:
-// 0x010bb7e4: 0x10bb7e4: slti  v0, s0, 254
+L_10bbe2c:
+// 0x010bbe2c: 0x10bbe2c: slti  v0, s0, 254
 	ldloc 5
 	ldc.i4 254
 	clt
 	stloc 6
-// 0x010bb7e8: 0x10bb7e8: bne   v0, zero, 0x10bb7f8 addu  a2, s0, zero
+// 0x010bbe30: 0x10bbe30: bne   v0, zero, 0x10bbe40 addu  a2, s0, zero
 	ldloc 6
 	ldloc 5
 	stloc.3
-	brtrue L_10bb7f8
+	brtrue L_10bbe40
 // --- basic block ---
-// 0x010bb7f0: 0x10bb7f0: addiu s0, zero, 254
+// 0x010bbe38: 0x10bbe38: addiu s0, zero, 254
 	ldc.i4 254
 	stloc 5
-// 0x010bb7f4: 0x10bb7f4: addu  a2, s0, zero
+// 0x010bbe3c: 0x10bbe3c: addu  a2, s0, zero
 	ldloc 5
 	stloc.3
-L_10bb7f8:
-// 0x010bb7f8: 0x10bb7f8: addu  a0, s1, zero
+L_10bbe40:
+// 0x010bbe40: 0x10bbe40: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010bb7fc: 0x10bb7fc: jal   0x1001af8 addu  s0, s1, s0
+// 0x010bbe44: 0x10bbe44: jal   0x1001af8 addu  s0, s1, s0
 	ldloc 9
 	ldloc 5
 	add
@@ -356,54 +356,54 @@ L_10bb7f8:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010bb804: 0x10bb804: sb    zero, 0(s0)
+// 0x010bbe4c: 0x10bbe4c: sb    zero, 0(s0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10bb808:
-// 0x010bb808: 0x10bb808: j	 0x10bb83c addu  v0, zero, zero
+L_10bbe50:
+// 0x010bbe50: 0x10bbe50: j	 0x10bbe84 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10bb83c
+	br L_10bbe84
 // --- basic block ---
-L_10bb810:
-// 0x010bb810: 0x10bb810: lb    v1, 0(s0)
+L_10bbe58:
+// 0x010bbe58: 0x10bbe58: lb    v1, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010bb814: 0x10bb814: sll   zero, zero, 0
-// 0x010bb818: 0x10bb818: beq   v1, zero, 0x10bb828 addiu v0, s0, 1
+// 0x010bbe5c: 0x10bbe5c: sll   zero, zero, 0
+// 0x010bbe60: 0x10bbe60: beq   v1, zero, 0x10bbe70 addiu v0, s0, 1
 	ldloc 8
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_10bb828
+	brfalse L_10bbe70
 // --- basic block ---
-// 0x010bb820: 0x10bb820: bne   v1, s4, 0x10bb810 addu  s0, v0, zero
+// 0x010bbe68: 0x10bbe68: bne   v1, s4, 0x10bbe58 addu  s0, v0, zero
 	ldloc 8
 	ldloc 12
 	ldloc 6
 	stloc 5
-	bne.un L_10bb810
+	bne.un L_10bbe58
 // --- basic block ---
-L_10bb828:
-// 0x010bb828: 0x10bb828: lb    v0, 0(s0)
+L_10bbe70:
+// 0x010bbe70: 0x10bbe70: lb    v0, 0(s0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010bb82c: 0x10bb82c: sll   zero, zero, 0
-// 0x010bb830: 0x10bb830: bne   v0, zero, 0x10bb734 sll   zero, zero, 0
+// 0x010bbe74: 0x10bbe74: sll   zero, zero, 0
+// 0x010bbe78: 0x10bbe78: bne   v0, zero, 0x10bbd7c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10bb734
+	brtrue L_10bbd7c
 // --- basic block ---
-L_10bb838:
-// 0x010bb838: 0x10bb838: addiu v0, zero, -1
+L_10bbe80:
+// 0x010bbe80: 0x10bbe80: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_10bb83c:
-// 0x010bb83c: 0x10bb83c: lw    ra, 36(sp)
-// 0x010bb840: 0x10bb840: lw    s4, 32(sp)
+L_10bbe84:
+// 0x010bbe84: 0x10bbe84: lw    ra, 36(sp)
+// 0x010bbe88: 0x10bbe88: lw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -412,7 +412,7 @@ L_10bb83c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bb844: 0x10bb844: lw    s3, 28(sp)
+// 0x010bbe8c: 0x10bbe8c: lw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -421,7 +421,7 @@ L_10bb83c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bb848: 0x10bb848: lw    s2, 24(sp)
+// 0x010bbe90: 0x10bbe90: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -430,7 +430,7 @@ L_10bb83c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bb84c: 0x10bb84c: lw    s1, 20(sp)
+// 0x010bbe94: 0x10bbe94: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -439,7 +439,7 @@ L_10bb83c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bb850: 0x10bb850: lw    s0, 16(sp)
+// 0x010bbe98: 0x10bbe98: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -448,7 +448,7 @@ L_10bb83c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bb854: 0x10bb854: jr    ra addiu sp, sp, 40
+// 0x010bbe9c: 0x10bbe9c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -460,7 +460,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 update_range_export_10bb85c(int32,int32,int32,int32,int32)
+.method public static int32 update_range_export_10bbea4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s6,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -516,14 +516,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10bb85c:
-// 0x010bb85c: 0x10bb85c: addiu sp, sp, -312
+L_10bbea4:
+// 0x010bbea4: 0x10bbea4: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x010bb860: 0x10bb860: sw    ra, 308(sp)
-// 0x010bb864: 0x10bb864: sw    s5, 300(sp)
+// 0x010bbea8: 0x10bbea8: sw    ra, 308(sp)
+// 0x010bbeac: 0x10bbeac: sw    s5, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -532,7 +532,7 @@ L_10bb85c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bb868: 0x10bb868: sw    s4, 296(sp)
+// 0x010bbeb0: 0x10bbeb0: sw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -541,7 +541,7 @@ L_10bb85c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bb86c: 0x10bb86c: sw    s3, 292(sp)
+// 0x010bbeb4: 0x10bbeb4: sw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -550,7 +550,7 @@ L_10bb85c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bb870: 0x10bb870: sw    s2, 288(sp)
+// 0x010bbeb8: 0x10bbeb8: sw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -559,7 +559,7 @@ L_10bb85c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bb874: 0x10bb874: sw    s1, 284(sp)
+// 0x010bbebc: 0x10bbebc: sw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -568,7 +568,7 @@ L_10bb85c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bb878: 0x10bb878: sw    s0, 280(sp)
+// 0x010bbec0: 0x10bbec0: sw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -577,7 +577,7 @@ L_10bb85c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bb87c: 0x10bb87c: lw    s0, 332(sp)
+// 0x010bbec4: 0x10bbec4: lw    s0, 332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -586,7 +586,7 @@ L_10bb85c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bb880: 0x10bb880: sw    a1, 272(sp)
+// 0x010bbec8: 0x10bbec8: sw    a1, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -595,7 +595,7 @@ L_10bb85c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010bb884: 0x10bb884: sw    a2, 276(sp)
+// 0x010bbecc: 0x10bbecc: sw    a2, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -604,7 +604,7 @@ L_10bb85c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010bb888: 0x10bb888: sw    s6, 304(sp)
+// 0x010bbed0: 0x10bbed0: sw    s6, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -613,7 +613,7 @@ L_10bb85c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bb88c: 0x10bb88c: lw    s2, 328(sp)
+// 0x010bbed4: 0x10bbed4: lw    s2, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -622,7 +622,7 @@ L_10bb85c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bb890: 0x10bb890: jal   0x10b400c addu  s3, a3, zero
+// 0x010bbed8: 0x10bbed8: jal   0x10b4654 addu  s3, a3, zero
 	ldloc 4
 	stloc 12
 	ldloc.0
@@ -630,12 +630,12 @@ L_10bb85c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_note_10b400c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_note_10b4654(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb898: 0x10bb898: lw    a2, 276(sp)
+// 0x010bbee0: 0x10bbee0: lw    a2, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -644,7 +644,7 @@ L_10bb85c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bb89c: 0x10bb89c: lw    a1, 272(sp)
+// 0x010bbee4: 0x10bbee4: lw    a1, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -653,50 +653,50 @@ L_10bb85c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bb8a0: 0x10bb8a0: sw    zero, 0(a2)
+// 0x010bbee8: 0x10bbee8: sw    zero, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bb8a4: 0x10bb8a4: addiu s1, sp, 16
+// 0x010bbeec: 0x10bbeec: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010bb8a8: 0x10bb8a8: sw    zero, 0(a1)
+// 0x010bbef0: 0x10bbef0: sw    zero, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bb8ac: 0x10bb8ac: lui   a1, 0x10000
+// 0x010bbef4: 0x10bbef4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bb8b0: 0x10bb8b0: sw    zero, 0(s0)
+// 0x010bbef8: 0x10bbef8: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bb8b4: 0x10bb8b4: addiu a1, a1, -31172
+// 0x010bbefc: 0x10bbefc: addiu a1, a1, -31172
 	ldloc.2
 	ldc.i4 -31172
 	add
 	stloc.2
-// 0x010bb8b8: 0x10bb8b8: addu  a0, v0, zero
+// 0x010bbf00: 0x10bbf00: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x010bb8bc: 0x10bb8bc: addu  a2, s1, zero
+// 0x010bbf04: 0x10bbf04: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010bb8c0: 0x10bb8c0: addu  s4, v0, zero
+// 0x010bbf08: 0x10bbf08: addu  s4, v0, zero
 	ldloc 7
 	stloc 13
-// 0x010bb8c4: 0x10bb8c4: jal   0x10bb6f8 addiu s5, zero, -1
+// 0x010bbf0c: 0x10bbf0c: jal   0x10bbd40 addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 14
 	ldloc.0
@@ -704,74 +704,74 @@ L_10bb85c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb8cc: 0x10bb8cc: bne   v0, s5, 0x10bb8f0 lui   v1, 0x10000
+// 0x010bbf14: 0x10bbf14: bne   v0, s5, 0x10bbf38 lui   v1, 0x10000
 	ldloc 7
 	ldloc 14
 	ldc.i4 65536
 	stloc 5
-	bne.un L_10bb8f0
+	bne.un L_10bbf38
 // --- basic block ---
-// 0x010bb8d4: 0x10bb8d4: lui   a1, 0x20000
+// 0x010bbf1c: 0x10bbf1c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bb8d8: 0x10bb8d8: lui   a3, 0x20000
+// 0x010bbf20: 0x10bbf20: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bb8dc: 0x10bb8dc: addiu a1, a1, 22140
+// 0x010bbf24: 0x10bbf24: addiu a1, a1, 22600
 	ldloc.2
-	ldc.i4 22140
+	ldc.i4 22600
 	add
 	stloc.2
-// 0x010bb8e0: 0x10bb8e0: addiu a3, a3, 22180
+// 0x010bbf28: 0x10bbf28: addiu a3, a3, 22640
 	ldloc 4
-	ldc.i4 22180
+	ldc.i4 22640
 	add
 	stloc 4
-// 0x010bb8e4: 0x10bb8e4: addiu a0, zero, 4
+// 0x010bbf2c: 0x10bbf2c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010bb8e8: 0x10bb8e8: j	 0x10bbab8 addiu a2, zero, 141
+// 0x010bbf30: 0x10bbf30: j	 0x10bc100 addiu a2, zero, 141
 	ldc.i4 141
 	stloc.3
-	br L_10bbab8
+	br L_10bc100
 // --- basic block ---
-L_10bb8f0:
-// 0x010bb8f0: 0x10bb8f0: lw    s6, 0(s0)
+L_10bbf38:
+// 0x010bbf38: 0x10bbf38: lw    s6, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010bb8f4: 0x10bb8f4: sll   zero, zero, 0
-// 0x010bb8f8: 0x10bb8f8: sll   s6, s6, 2
+// 0x010bbf3c: 0x10bbf3c: sll   zero, zero, 0
+// 0x010bbf40: 0x10bbf40: sll   s6, s6, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x010bb8fc: 0x10bb8fc: addu  v0, s3, s6
+// 0x010bbf44: 0x10bbf44: addu  v0, s3, s6
 	ldloc 12
 	ldloc 10
 	add
 	stloc 7
-// 0x010bb900: 0x10bb900: addiu v1, v1, 13528
+// 0x010bbf48: 0x10bbf48: addiu v1, v1, 13524
 	ldloc 5
-	ldc.i4 13528
+	ldc.i4 13524
 	add
 	stloc 5
-// 0x010bb904: 0x10bb904: sw    v1, 0(v0)
+// 0x010bbf4c: 0x10bbf4c: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bb908: 0x10bb908: jal   0x1001ba8 addu  a0, s1, zero
+// 0x010bbf50: 0x10bbf50: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -784,49 +784,49 @@ L_10bb8f0:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb910: 0x10bb910: lw    v1, 0(s0)
+// 0x010bbf58: 0x10bbf58: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bb914: 0x10bb914: addu  s6, s2, s6
+// 0x010bbf5c: 0x10bbf5c: addu  s6, s2, s6
 	ldloc 11
 	ldloc 10
 	add
 	stloc 10
-// 0x010bb918: 0x10bb918: addiu v1, v1, 1
+// 0x010bbf60: 0x10bbf60: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010bb91c: 0x10bb91c: lui   a1, 0x10000
+// 0x010bbf64: 0x10bbf64: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bb920: 0x10bb920: sw    v0, 0(s6)
+// 0x010bbf68: 0x10bbf68: sw    v0, 0(s6)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010bb924: 0x10bb924: sw    v1, 0(s0)
+// 0x010bbf6c: 0x10bbf6c: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bb928: 0x10bb928: addiu a1, a1, -28756
+// 0x010bbf70: 0x10bbf70: addiu a1, a1, -28756
 	ldloc.2
 	ldc.i4 -28756
 	add
 	stloc.2
-// 0x010bb92c: 0x10bb92c: addu  a0, s4, zero
+// 0x010bbf74: 0x10bbf74: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010bb930: 0x10bb930: jal   0x10bb6f8 addu  a2, s1, zero
+// 0x010bbf78: 0x10bbf78: jal   0x10bbd40 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -834,74 +834,74 @@ L_10bb8f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb938: 0x10bb938: bne   v0, s5, 0x10bb95c lui   v1, 0x10000
+// 0x010bbf80: 0x10bbf80: bne   v0, s5, 0x10bbfa4 lui   v1, 0x10000
 	ldloc 7
 	ldloc 14
 	ldc.i4 65536
 	stloc 5
-	bne.un L_10bb95c
+	bne.un L_10bbfa4
 // --- basic block ---
-// 0x010bb940: 0x10bb940: lui   a1, 0x20000
+// 0x010bbf88: 0x10bbf88: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bb944: 0x10bb944: lui   a3, 0x20000
+// 0x010bbf8c: 0x10bbf8c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bb948: 0x10bb948: addiu a1, a1, 22140
+// 0x010bbf90: 0x10bbf90: addiu a1, a1, 22600
 	ldloc.2
-	ldc.i4 22140
+	ldc.i4 22600
 	add
 	stloc.2
-// 0x010bb94c: 0x10bb94c: addiu a3, a3, 22220
+// 0x010bbf94: 0x10bbf94: addiu a3, a3, 22680
 	ldloc 4
-	ldc.i4 22220
+	ldc.i4 22680
 	add
 	stloc 4
-// 0x010bb950: 0x10bb950: addiu a0, zero, 4
+// 0x010bbf98: 0x10bbf98: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010bb954: 0x10bb954: j	 0x10bbab8 addiu a2, zero, 150
+// 0x010bbf9c: 0x10bbf9c: j	 0x10bc100 addiu a2, zero, 150
 	ldc.i4 150
 	stloc.3
-	br L_10bbab8
+	br L_10bc100
 // --- basic block ---
-L_10bb95c:
-// 0x010bb95c: 0x10bb95c: lw    s6, 0(s0)
+L_10bbfa4:
+// 0x010bbfa4: 0x10bbfa4: lw    s6, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010bb960: 0x10bb960: sll   zero, zero, 0
-// 0x010bb964: 0x10bb964: sll   s6, s6, 2
+// 0x010bbfa8: 0x10bbfa8: sll   zero, zero, 0
+// 0x010bbfac: 0x10bbfac: sll   s6, s6, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x010bb968: 0x10bb968: addu  v0, s3, s6
+// 0x010bbfb0: 0x10bbfb0: addu  v0, s3, s6
 	ldloc 12
 	ldloc 10
 	add
 	stloc 7
-// 0x010bb96c: 0x10bb96c: addiu v1, v1, -26948
+// 0x010bbfb4: 0x10bbfb4: addiu v1, v1, -26948
 	ldloc 5
 	ldc.i4 -26948
 	add
 	stloc 5
-// 0x010bb970: 0x10bb970: sw    v1, 0(v0)
+// 0x010bbfb8: 0x10bbfb8: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bb974: 0x10bb974: jal   0x1001ba8 addu  a0, s1, zero
+// 0x010bbfbc: 0x10bbfbc: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -914,49 +914,49 @@ L_10bb95c:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb97c: 0x10bb97c: lw    v1, 0(s0)
+// 0x010bbfc4: 0x10bbfc4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bb980: 0x10bb980: addu  s6, s2, s6
+// 0x010bbfc8: 0x10bbfc8: addu  s6, s2, s6
 	ldloc 11
 	ldloc 10
 	add
 	stloc 10
-// 0x010bb984: 0x10bb984: addiu v1, v1, 1
+// 0x010bbfcc: 0x10bbfcc: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010bb988: 0x10bb988: lui   a1, 0x20000
+// 0x010bbfd0: 0x10bbfd0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bb98c: 0x10bb98c: sw    v0, 0(s6)
+// 0x010bbfd4: 0x10bbfd4: sw    v0, 0(s6)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010bb990: 0x10bb990: sw    v1, 0(s0)
+// 0x010bbfd8: 0x10bbfd8: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bb994: 0x10bb994: addiu a1, a1, 21916
+// 0x010bbfdc: 0x10bbfdc: addiu a1, a1, 22376
 	ldloc.2
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.2
-// 0x010bb998: 0x10bb998: addu  a0, s4, zero
+// 0x010bbfe0: 0x10bbfe0: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010bb99c: 0x10bb99c: jal   0x10bb6f8 addu  a2, s1, zero
+// 0x010bbfe4: 0x10bbfe4: jal   0x10bbd40 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -964,17 +964,17 @@ L_10bb95c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb9a4: 0x10bb9a4: beq   v0, s5, 0x10bba08 sll   zero, zero, 0
+// 0x010bbfec: 0x10bbfec: beq   v0, s5, 0x10bc050 sll   zero, zero, 0
 	ldloc 7
 	ldloc 14
-	beq  L_10bba08
+	beq  L_10bc050
 // --- basic block ---
-// 0x010bb9ac: 0x10bb9ac: jal   0x1000d8c addu  a0, s1, zero
+// 0x010bbff4: 0x10bbff4: jal   0x1000d8c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -987,71 +987,71 @@ L_10bb95c:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb9b4: 0x10bb9b4: bgtz  v0, 0x10bb9d4 lui   a1, 0x20000
+// 0x010bbffc: 0x10bbffc: bgtz  v0, 0x10bc01c lui   a1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc.2
 	ldc.i4.s 0
-	bgt L_10bb9d4
+	bgt L_10bc01c
 // --- basic block ---
-// 0x010bb9bc: 0x10bb9bc: lui   a3, 0x20000
+// 0x010bc004: 0x10bc004: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bb9c0: 0x10bb9c0: addiu a1, a1, 22140
+// 0x010bc008: 0x10bc008: addiu a1, a1, 22600
 	ldloc.2
-	ldc.i4 22140
+	ldc.i4 22600
 	add
 	stloc.2
-// 0x010bb9c4: 0x10bb9c4: addiu a3, a3, 22260
+// 0x010bc00c: 0x10bc00c: addiu a3, a3, 22720
 	ldloc 4
-	ldc.i4 22260
+	ldc.i4 22720
 	add
 	stloc 4
-// 0x010bb9c8: 0x10bb9c8: addiu a0, zero, 4
+// 0x010bc010: 0x10bc010: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010bb9cc: 0x10bb9cc: j	 0x10bbab8 addiu a2, zero, 160
+// 0x010bc014: 0x10bc014: j	 0x10bc100 addiu a2, zero, 160
 	ldc.i4 160
 	stloc.3
-	br L_10bbab8
+	br L_10bc100
 // --- basic block ---
-L_10bb9d4:
-// 0x010bb9d4: 0x10bb9d4: lw    v0, 0(s0)
+L_10bc01c:
+// 0x010bc01c: 0x10bc01c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010bb9d8: 0x10bb9d8: lui   a0, 0x10000
+// 0x010bc020: 0x10bc020: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bb9dc: 0x10bb9dc: sll   v0, v0, 2
+// 0x010bc024: 0x10bc024: sll   v0, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010bb9e0: 0x10bb9e0: addu  v1, s3, v0
+// 0x010bc028: 0x10bc028: addu  v1, s3, v0
 	ldloc 12
 	ldloc 7
 	add
 	stloc 5
-// 0x010bb9e4: 0x10bb9e4: addiu a0, a0, 8676
+// 0x010bc02c: 0x10bc02c: addiu a0, a0, 8672
 	ldloc.1
-	ldc.i4 8676
+	ldc.i4 8672
 	add
 	stloc.1
-// 0x010bb9e8: 0x10bb9e8: sw    a0, 0(v1)
+// 0x010bc030: 0x10bc030: sw    a0, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010bb9ec: 0x10bb9ec: addu  a0, s1, zero
+// 0x010bc034: 0x10bc034: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010bb9f0: 0x10bb9f0: jal   0x1001ba8 addu  s1, s2, v0
+// 0x010bc038: 0x10bc038: jal   0x1001ba8 addu  s1, s2, v0
 	ldloc 11
 	ldloc 7
 	add
@@ -1066,50 +1066,50 @@ L_10bb9d4:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bb9f8: 0x10bb9f8: lw    v1, 0(s0)
+// 0x010bc040: 0x10bc040: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bb9fc: 0x10bb9fc: sw    v0, 0(s1)
+// 0x010bc044: 0x10bc044: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010bba00: 0x10bba00: addiu v1, v1, 1
+// 0x010bc048: 0x10bc048: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010bba04: 0x10bba04: sw    v1, 0(s0)
+// 0x010bc04c: 0x10bc04c: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10bba08:
-// 0x010bba08: 0x10bba08: addiu s1, sp, 16
+L_10bc050:
+// 0x010bc050: 0x10bc050: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010bba0c: 0x10bba0c: lui   a1, 0x20000
+// 0x010bc054: 0x10bc054: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bba10: 0x10bba10: addu  a0, s4, zero
+// 0x010bc058: 0x10bc058: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010bba14: 0x10bba14: addiu a1, a1, 21928
+// 0x010bc05c: 0x10bc05c: addiu a1, a1, 22388
 	ldloc.2
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.2
-// 0x010bba18: 0x10bba18: jal   0x10bb6f8 addu  a2, s1, zero
+// 0x010bc060: 0x10bc060: jal   0x10bbd40 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -1117,20 +1117,20 @@ L_10bba08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bba20: 0x10bba20: addiu v1, zero, -1
+// 0x010bc068: 0x10bc068: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010bba24: 0x10bba24: beq   v0, v1, 0x10bba8c sll   zero, zero, 0
+// 0x010bc06c: 0x10bc06c: beq   v0, v1, 0x10bc0d4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10bba8c
+	beq  L_10bc0d4
 // --- basic block ---
-// 0x010bba2c: 0x10bba2c: jal   0x1000d8c addu  a0, s1, zero
+// 0x010bc074: 0x10bc074: jal   0x1000d8c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1143,72 +1143,72 @@ L_10bba08:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bba34: 0x10bba34: bgtz  v0, 0x10bba58 lui   v1, 0x10000
+// 0x010bc07c: 0x10bc07c: bgtz  v0, 0x10bc0a0 lui   v1, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc 5
 	ldc.i4.s 0
-	bgt L_10bba58
+	bgt L_10bc0a0
 // --- basic block ---
-// 0x010bba3c: 0x10bba3c: lui   a1, 0x20000
+// 0x010bc084: 0x10bc084: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bba40: 0x10bba40: lui   a3, 0x20000
+// 0x010bc088: 0x10bc088: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bba44: 0x10bba44: addiu a1, a1, 22140
+// 0x010bc08c: 0x10bc08c: addiu a1, a1, 22600
 	ldloc.2
-	ldc.i4 22140
+	ldc.i4 22600
 	add
 	stloc.2
-// 0x010bba48: 0x10bba48: addiu a3, a3, 22300
+// 0x010bc090: 0x10bc090: addiu a3, a3, 22760
 	ldloc 4
-	ldc.i4 22300
+	ldc.i4 22760
 	add
 	stloc 4
-// 0x010bba4c: 0x10bba4c: addiu a0, zero, 4
+// 0x010bc094: 0x10bc094: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010bba50: 0x10bba50: j	 0x10bbab8 addiu a2, zero, 171
+// 0x010bc098: 0x10bc098: j	 0x10bc100 addiu a2, zero, 171
 	ldc.i4 171
 	stloc.3
-	br L_10bbab8
+	br L_10bc100
 // --- basic block ---
-L_10bba58:
-// 0x010bba58: 0x10bba58: lw    v0, 0(s0)
+L_10bc0a0:
+// 0x010bc0a0: 0x10bc0a0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010bba5c: 0x10bba5c: sll   zero, zero, 0
-// 0x010bba60: 0x10bba60: sll   v0, v0, 2
+// 0x010bc0a4: 0x10bc0a4: sll   zero, zero, 0
+// 0x010bc0a8: 0x10bc0a8: sll   v0, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010bba64: 0x10bba64: addiu v1, v1, 8732
+// 0x010bc0ac: 0x10bc0ac: addiu v1, v1, 8728
 	ldloc 5
-	ldc.i4 8732
+	ldc.i4 8728
 	add
 	stloc 5
-// 0x010bba68: 0x10bba68: addu  s3, s3, v0
+// 0x010bc0b0: 0x10bc0b0: addu  s3, s3, v0
 	ldloc 12
 	ldloc 7
 	add
 	stloc 12
-// 0x010bba6c: 0x10bba6c: sw    v1, 0(s3)
+// 0x010bc0b4: 0x10bc0b4: sw    v1, 0(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bba70: 0x10bba70: addu  a0, s1, zero
+// 0x010bc0b8: 0x10bc0b8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010bba74: 0x10bba74: jal   0x1001ba8 addu  s2, s2, v0
+// 0x010bc0bc: 0x10bc0bc: jal   0x1001ba8 addu  s2, s2, v0
 	ldloc 11
 	ldloc 7
 	add
@@ -1223,76 +1223,76 @@ L_10bba58:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bba7c: 0x10bba7c: lw    v1, 0(s0)
+// 0x010bc0c4: 0x10bc0c4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bba80: 0x10bba80: sw    v0, 0(s2)
+// 0x010bc0c8: 0x10bc0c8: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010bba84: 0x10bba84: addiu v1, v1, 1
+// 0x010bc0cc: 0x10bc0cc: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010bba88: 0x10bba88: sw    v1, 0(s0)
+// 0x010bc0d0: 0x10bc0d0: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_10bba8c:
-// 0x010bba8c: 0x10bba8c: lw    v1, 0(s0)
+L_10bc0d4:
+// 0x010bc0d4: 0x10bc0d4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bba90: 0x10bba90: sll   zero, zero, 0
-// 0x010bba94: 0x10bba94: slti  v1, v1, 2
+// 0x010bc0d8: 0x10bc0d8: sll   zero, zero, 0
+// 0x010bc0dc: 0x10bc0dc: slti  v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010bba98: 0x10bba98: beq   v1, zero, 0x10bbac4 addu  v0, zero, zero
+// 0x010bc0e0: 0x10bc0e0: beq   v1, zero, 0x10bc10c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10bbac4
+	brfalse L_10bc10c
 // --- basic block ---
-// 0x010bbaa0: 0x10bbaa0: lui   a1, 0x20000
+// 0x010bc0e8: 0x10bc0e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbaa4: 0x10bbaa4: lui   a3, 0x20000
+// 0x010bc0ec: 0x10bc0ec: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bbaa8: 0x10bbaa8: addiu a1, a1, 22140
+// 0x010bc0f0: 0x10bc0f0: addiu a1, a1, 22600
 	ldloc.2
-	ldc.i4 22140
+	ldc.i4 22600
 	add
 	stloc.2
-// 0x010bbaac: 0x10bbaac: addiu a3, a3, 22340
+// 0x010bc0f4: 0x10bc0f4: addiu a3, a3, 22800
 	ldloc 4
-	ldc.i4 22340
+	ldc.i4 22800
 	add
 	stloc 4
-// 0x010bbab0: 0x10bbab0: addiu a0, zero, 4
+// 0x010bc0f8: 0x10bc0f8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010bbab4: 0x10bbab4: addiu a2, zero, 181
+// 0x010bc0fc: 0x10bc0fc: addiu a2, zero, 181
 	ldc.i4 181
 	stloc.3
-L_10bbab8:
-// 0x010bbab8: 0x10bbab8: jal   0x100449c sll   zero, zero, 0
+L_10bc100:
+// 0x010bc100: 0x10bc100: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1303,12 +1303,12 @@ L_10bbab8:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bbac0: 0x10bbac0: addiu v0, zero, -1
+// 0x010bc108: 0x10bc108: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-L_10bbac4:
-// 0x010bbac4: 0x10bbac4: lw    ra, 308(sp)
-// 0x010bbac8: 0x10bbac8: lw    s6, 304(sp)
+L_10bc10c:
+// 0x010bc10c: 0x10bc10c: lw    ra, 308(sp)
+// 0x010bc110: 0x10bc110: lw    s6, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1317,7 +1317,7 @@ L_10bbac4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bbacc: 0x10bbacc: lw    s5, 300(sp)
+// 0x010bc114: 0x10bc114: lw    s5, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1326,7 +1326,7 @@ L_10bbac4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bbad0: 0x10bbad0: lw    s4, 296(sp)
+// 0x010bc118: 0x10bc118: lw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1335,7 +1335,7 @@ L_10bbac4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bbad4: 0x10bbad4: lw    s3, 292(sp)
+// 0x010bc11c: 0x10bc11c: lw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1344,7 +1344,7 @@ L_10bbac4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bbad8: 0x10bbad8: lw    s2, 288(sp)
+// 0x010bc120: 0x10bc120: lw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1353,7 +1353,7 @@ L_10bbac4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bbadc: 0x10bbadc: lw    s1, 284(sp)
+// 0x010bc124: 0x10bc124: lw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1362,7 +1362,7 @@ L_10bbac4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bbae0: 0x10bbae0: lw    s0, 280(sp)
+// 0x010bc128: 0x10bc128: lw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1371,7 +1371,7 @@ L_10bbac4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bbae4: 0x10bbae4: jr    ra addiu sp, sp, 312
+// 0x010bc12c: 0x10bc12c: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
@@ -1383,7 +1383,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 update_range_verify_10bbaec(int32,int32,int32,int32,int32)
+.method public static int32 update_range_verify_10bc134(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 s2,int32 ra)
@@ -1427,13 +1427,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10bbaec:
-// 0x010bbaec: 0x10bbaec: addiu sp, sp, -288
+L_10bc134:
+// 0x010bc134: 0x10bc134: addiu sp, sp, -288
 	ldloc.0
 	ldc.i4 -288
 	add
 	stloc.0
-// 0x010bbaf0: 0x10bbaf0: sw    s1, 276(sp)
+// 0x010bc138: 0x10bc138: sw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1442,22 +1442,22 @@ L_10bbaec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bbaf4: 0x10bbaf4: lw    a0, 0(a2)
+// 0x010bc13c: 0x10bc13c: lw    a0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bbaf8: 0x10bbaf8: addiu s1, sp, 16
+// 0x010bc140: 0x10bc140: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x010bbafc: 0x10bbafc: lui   a1, 0x10000
+// 0x010bc144: 0x10bc144: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bbb00: 0x10bbb00: sw    s0, 272(sp)
+// 0x010bc148: 0x10bc148: sw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1466,18 +1466,18 @@ L_10bbaec:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bbb04: 0x10bbb04: addiu a1, a1, -31172
+// 0x010bc14c: 0x10bc14c: addiu a1, a1, -31172
 	ldloc.2
 	ldc.i4 -31172
 	add
 	stloc.2
-// 0x010bbb08: 0x10bbb08: addu  s0, a2, zero
+// 0x010bc150: 0x10bc150: addu  s0, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010bbb0c: 0x10bbb0c: addu  a2, s1, zero
+// 0x010bc154: 0x10bc154: addu  a2, s1, zero
 	ldloc 7
 	stloc.3
-// 0x010bbb10: 0x10bbb10: sw    s2, 280(sp)
+// 0x010bc158: 0x10bc158: sw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1486,8 +1486,8 @@ L_10bbaec:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bbb14: 0x10bbb14: sw    ra, 284(sp)
-// 0x010bbb18: 0x10bbb18: jal   0x10bb6f8 addiu s2, zero, -1
+// 0x010bc15c: 0x10bc15c: sw    ra, 284(sp)
+// 0x010bc160: 0x10bc160: jal   0x10bbd40 addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 10
 	ldloc.0
@@ -1495,50 +1495,50 @@ L_10bbaec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bbb20: 0x10bbb20: bne   v0, s2, 0x10bbb38 lui   a0, 0x0
+// 0x010bc168: 0x10bc168: bne   v0, s2, 0x10bc180 lui   a0, 0x0
 	ldloc 5
 	ldloc 10
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10bbb38
+	bne.un L_10bc180
 // --- basic block ---
-// 0x010bbb28: 0x10bbb28: lui   a1, 0x20000
+// 0x010bc170: 0x10bc170: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbb2c: 0x10bbb2c: addiu a0, a0, 30152
+// 0x010bc174: 0x10bc174: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010bbb30: 0x10bbb30: j	 0x10bbbe8 addiu a1, a1, 22384
+// 0x010bc178: 0x10bc178: j	 0x10bc230 addiu a1, a1, 22844
 	ldloc.2
-	ldc.i4 22384
+	ldc.i4 22844
 	add
 	stloc.2
-	br L_10bbbe8
+	br L_10bc230
 // --- basic block ---
-L_10bbb38:
-// 0x010bbb38: 0x10bbb38: lui   a1, 0x10000
+L_10bc180:
+// 0x010bc180: 0x10bc180: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bbb3c: 0x10bbb3c: lw    a0, 0(s0)
+// 0x010bc184: 0x10bc184: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bbb40: 0x10bbb40: addiu a1, a1, -28756
+// 0x010bc188: 0x10bc188: addiu a1, a1, -28756
 	ldloc.2
 	ldc.i4 -28756
 	add
 	stloc.2
-// 0x010bbb44: 0x10bbb44: jal   0x10bb6f8 addu  a2, s1, zero
+// 0x010bc18c: 0x10bc18c: jal   0x10bbd40 addu  a2, s1, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -1546,50 +1546,50 @@ L_10bbb38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bbb4c: 0x10bbb4c: bne   v0, s2, 0x10bbb64 lui   a0, 0x0
+// 0x010bc194: 0x10bc194: bne   v0, s2, 0x10bc1ac lui   a0, 0x0
 	ldloc 5
 	ldloc 10
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10bbb64
+	bne.un L_10bc1ac
 // --- basic block ---
-// 0x010bbb54: 0x10bbb54: lui   a1, 0x20000
+// 0x010bc19c: 0x10bc19c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbb58: 0x10bbb58: addiu a0, a0, 30152
+// 0x010bc1a0: 0x10bc1a0: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010bbb5c: 0x10bbb5c: j	 0x10bbbe8 addiu a1, a1, 22408
+// 0x010bc1a4: 0x10bc1a4: j	 0x10bc230 addiu a1, a1, 22868
 	ldloc.2
-	ldc.i4 22408
+	ldc.i4 22868
 	add
 	stloc.2
-	br L_10bbbe8
+	br L_10bc230
 // --- basic block ---
-L_10bbb64:
-// 0x010bbb64: 0x10bbb64: lui   a1, 0x20000
+L_10bc1ac:
+// 0x010bc1ac: 0x10bc1ac: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbb68: 0x10bbb68: lw    a0, 0(s0)
+// 0x010bc1b0: 0x10bc1b0: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bbb6c: 0x10bbb6c: addiu a1, a1, 21916
+// 0x010bc1b4: 0x10bc1b4: addiu a1, a1, 22376
 	ldloc.2
-	ldc.i4 21916
+	ldc.i4 22376
 	add
 	stloc.2
-// 0x010bbb70: 0x10bbb70: jal   0x10bb6f8 addu  a2, s1, zero
+// 0x010bc1b8: 0x10bc1b8: jal   0x10bbd40 addu  a2, s1, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -1597,17 +1597,17 @@ L_10bbb64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bbb78: 0x10bbb78: beq   v0, s2, 0x10bbba4 sll   zero, zero, 0
+// 0x010bc1c0: 0x10bc1c0: beq   v0, s2, 0x10bc1ec sll   zero, zero, 0
 	ldloc 5
 	ldloc 10
-	beq  L_10bbba4
+	beq  L_10bc1ec
 // --- basic block ---
-// 0x010bbb80: 0x10bbb80: jal   0x1000d8c addu  a0, s1, zero
+// 0x010bc1c8: 0x10bc1c8: jal   0x1000d8c addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1620,57 +1620,57 @@ L_10bbb64:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bbb88: 0x10bbb88: bgtz  v0, 0x10bbba8 addiu s1, zero, 1
+// 0x010bc1d0: 0x10bc1d0: bgtz  v0, 0x10bc1f0 addiu s1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
 	ldc.i4.s 0
-	bgt L_10bbba8
+	bgt L_10bc1f0
 // --- basic block ---
-// 0x010bbb90: 0x10bbb90: lui   a0, 0x0
+// 0x010bc1d8: 0x10bc1d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bbb94: 0x10bbb94: lui   a1, 0x20000
+// 0x010bc1dc: 0x10bc1dc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbb98: 0x10bbb98: addiu a0, a0, 30152
+// 0x010bc1e0: 0x10bc1e0: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010bbb9c: 0x10bbb9c: j	 0x10bbbe8 addiu a1, a1, 22432
+// 0x010bc1e4: 0x10bc1e4: j	 0x10bc230 addiu a1, a1, 22892
 	ldloc.2
-	ldc.i4 22432
+	ldc.i4 22892
 	add
 	stloc.2
-	br L_10bbbe8
+	br L_10bc230
 // --- basic block ---
-L_10bbba4:
-// 0x010bbba4: 0x10bbba4: addu  s1, zero, zero
+L_10bc1ec:
+// 0x010bc1ec: 0x10bc1ec: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10bbba8:
-// 0x010bbba8: 0x10bbba8: lw    a0, 0(s0)
+L_10bc1f0:
+// 0x010bc1f0: 0x10bc1f0: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bbbac: 0x10bbbac: lui   a1, 0x20000
+// 0x010bc1f4: 0x10bc1f4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbbb0: 0x10bbbb0: addiu s0, sp, 16
+// 0x010bc1f8: 0x10bc1f8: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010bbbb4: 0x10bbbb4: addiu a1, a1, 21928
+// 0x010bc1fc: 0x10bc1fc: addiu a1, a1, 22388
 	ldloc.2
-	ldc.i4 21928
+	ldc.i4 22388
 	add
 	stloc.2
-// 0x010bbbb8: 0x10bbbb8: jal   0x10bb6f8 addu  a2, s0, zero
+// 0x010bc200: 0x10bc200: jal   0x10bbd40 addu  a2, s0, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -1678,20 +1678,20 @@ L_10bbba8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::T_81_10bb6f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::T_81_10bbd40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bbbc0: 0x10bbbc0: addiu v1, zero, -1
+// 0x010bc208: 0x10bc208: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x010bbbc4: 0x10bbbc4: beq   v0, v1, 0x10bbbf8 sll   zero, zero, 0
+// 0x010bc20c: 0x10bc20c: beq   v0, v1, 0x10bc240 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	beq  L_10bbbf8
+	beq  L_10bc240
 // --- basic block ---
-// 0x010bbbcc: 0x10bbbcc: jal   0x1000d8c addu  a0, s0, zero
+// 0x010bc214: 0x10bc214: jal   0x1000d8c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1704,72 +1704,72 @@ L_10bbba8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bbbd4: 0x10bbbd4: bgtz  v0, 0x10bbc10 lui   a0, 0x0
+// 0x010bc21c: 0x10bc21c: bgtz  v0, 0x10bc258 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	bgt L_10bbc10
+	bgt L_10bc258
 // --- basic block ---
-// 0x010bbbdc: 0x10bbbdc: lui   a1, 0x20000
+// 0x010bc224: 0x10bc224: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbbe0: 0x10bbbe0: addiu a0, a0, 30152
+// 0x010bc228: 0x10bc228: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010bbbe4: 0x10bbbe4: addiu a1, a1, 22456
+// 0x010bc22c: 0x10bc22c: addiu a1, a1, 22916
 	ldloc.2
-	ldc.i4 22456
+	ldc.i4 22916
 	add
 	stloc.2
-L_10bbbe8:
-// 0x010bbbe8: 0x10bbbe8: jal   0x104c148 sll   zero, zero, 0
+L_10bc230:
+// 0x010bc230: 0x10bc230: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bbbf0: 0x10bbbf0: j	 0x10bbc14 addiu v0, zero, -1
+// 0x010bc238: 0x10bc238: j	 0x10bc25c addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_10bbc14
+	br L_10bc25c
 // --- basic block ---
-L_10bbbf8:
-// 0x010bbbf8: 0x10bbbf8: bne   s1, zero, 0x10bbc10 lui   a0, 0x0
+L_10bc240:
+// 0x010bc240: 0x10bc240: bne   s1, zero, 0x10bc258 lui   a0, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_10bbc10
+	brtrue L_10bc258
 // --- basic block ---
-// 0x010bbc00: 0x10bbc00: lui   a1, 0x20000
+// 0x010bc248: 0x10bc248: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bbc04: 0x10bbc04: addiu a0, a0, 30152
+// 0x010bc24c: 0x10bc24c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010bbc08: 0x10bbc08: j	 0x10bbbe8 addiu a1, a1, 22480
+// 0x010bc250: 0x10bc250: j	 0x10bc230 addiu a1, a1, 22940
 	ldloc.2
-	ldc.i4 22480
+	ldc.i4 22940
 	add
 	stloc.2
-	br L_10bbbe8
+	br L_10bc230
 // --- basic block ---
-L_10bbc10:
-// 0x010bbc10: 0x10bbc10: addu  v0, zero, zero
+L_10bc258:
+// 0x010bc258: 0x10bc258: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10bbc14:
-// 0x010bbc14: 0x10bbc14: lw    ra, 284(sp)
-// 0x010bbc18: 0x10bbc18: lw    s2, 280(sp)
+L_10bc25c:
+// 0x010bc25c: 0x10bc25c: lw    ra, 284(sp)
+// 0x010bc260: 0x10bc260: lw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1778,7 +1778,7 @@ L_10bbc14:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bbc1c: 0x10bbc1c: lw    s1, 276(sp)
+// 0x010bc264: 0x10bc264: lw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1787,7 +1787,7 @@ L_10bbc14:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bbc20: 0x10bbc20: lw    s0, 272(sp)
+// 0x010bc268: 0x10bc268: lw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1796,7 +1796,7 @@ L_10bbc14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bbc24: 0x10bbc24: jr    ra addiu sp, sp, 288
+// 0x010bc26c: 0x10bc26c: jr    ra addiu sp, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
@@ -1808,7 +1808,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_dialog_city_cb_10bbc2c(int32)
+.method public static int32 editor_dialog_city_cb_10bc274(int32)
 {
 .maxstack 5
 .locals init (int32 a1,int32 v0,int32 ra,int32[] mem)
@@ -1828,10 +1828,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bbc2c: 0x10bbc2c: lui   v0, 0x0
+// 0x010bc274: 0x10bc274: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bbc30: 0x10bbc30: sw    a1, 19492(v0)
+// 0x010bc278: 0x10bc278: sw    a1, 19492(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -1840,7 +1840,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.0
 	stelem.i4
-// 0x010bbc34: 0x10bbc34: jr    ra addiu v0, zero, 1
+// 0x010bc27c: 0x10bc27c: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.1
 	br __CIBYL_function_return
@@ -1848,7 +1848,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 editor_segments_apply_10bbc3c(int32,int32,int32,int32,int32)
+.method public static int32 editor_segments_apply_10bc284(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s3,int32 s0,int32 s1,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra,int32 lo)
@@ -1910,13 +1910,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bbc3c: 0x10bbc3c: addiu sp, sp, -72
+// 0x010bc284: 0x10bc284: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010bbc40: 0x10bbc40: sw    ra, 68(sp)
-// 0x010bbc44: 0x10bbc44: sw    s7, 64(sp)
+// 0x010bc288: 0x10bc288: sw    ra, 68(sp)
+// 0x010bc28c: 0x10bc28c: sw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1925,7 +1925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010bbc48: 0x10bbc48: sw    s6, 60(sp)
+// 0x010bc290: 0x10bc290: sw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1934,7 +1934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bbc4c: 0x10bbc4c: sw    s5, 56(sp)
+// 0x010bc294: 0x10bc294: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1943,7 +1943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bbc50: 0x10bbc50: sw    s4, 52(sp)
+// 0x010bc298: 0x10bc298: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1952,7 +1952,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bbc54: 0x10bbc54: sw    s3, 48(sp)
+// 0x010bc29c: 0x10bc29c: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1961,7 +1961,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bbc58: 0x10bbc58: sw    s2, 44(sp)
+// 0x010bc2a0: 0x10bc2a0: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1970,7 +1970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bbc5c: 0x10bbc5c: sw    s1, 40(sp)
+// 0x010bc2a4: 0x10bc2a4: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1979,7 +1979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bbc60: 0x10bbc60: jal   0x1094638 sw    s0, 36(sp)
+// 0x010bc2a8: 0x10bc2a8: jal   0x1094c5c sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1993,20 +1993,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_context_1094638(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_context_1094c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbc68: 0x10bbc68: lui   a0, 0x20000
+// 0x010bc2b0: 0x10bc2b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bbc6c: 0x10bbc6c: addiu a0, a0, 22528
+// 0x010bc2b4: 0x10bc2b4: addiu a0, a0, 22988
 	ldloc.1
-	ldc.i4 22528
+	ldc.i4 22988
 	add
 	stloc.1
-// 0x010bbc70: 0x10bbc70: jal   0x10947ac addu  s1, v0, zero
+// 0x010bc2b8: 0x10bc2b8: jal   0x1094dd0 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2014,20 +2014,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbc78: 0x10bbc78: lui   a0, 0x20000
+// 0x010bc2c0: 0x10bc2c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bbc7c: 0x10bbc7c: addiu a0, a0, 22540
+// 0x010bc2c4: 0x10bc2c4: addiu a0, a0, 23000
 	ldloc.1
-	ldc.i4 22540
+	ldc.i4 23000
 	add
 	stloc.1
-// 0x010bbc80: 0x10bbc80: jal   0x10947dc addiu s0, v0, 1
+// 0x010bc2c8: 0x10bc2c8: jal   0x1094e00 addiu s0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
@@ -2037,20 +2037,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbc88: 0x10bbc88: lui   a0, 0x20000
+// 0x010bc2d0: 0x10bc2d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bbc8c: 0x10bbc8c: addiu a0, a0, -18240
+// 0x010bc2d4: 0x10bc2d4: addiu a0, a0, -17776
 	ldloc.1
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
-// 0x010bbc90: 0x10bbc90: jal   0x10947dc sw    v0, 24(sp)
+// 0x010bc2d8: 0x10bc2d8: jal   0x1094e00 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2064,20 +2064,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbc98: 0x10bbc98: lui   a0, 0x20000
+// 0x010bc2e0: 0x10bc2e0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bbc9c: 0x10bbc9c: addiu a0, a0, 22552
+// 0x010bc2e4: 0x10bc2e4: addiu a0, a0, 23012
 	ldloc.1
-	ldc.i4 22552
+	ldc.i4 23012
 	add
 	stloc.1
-// 0x010bbca0: 0x10bbca0: jal   0x10947dc addu  s3, v0, zero
+// 0x010bc2e8: 0x10bc2e8: jal   0x1094e00 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2085,20 +2085,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbca8: 0x10bbca8: lui   a0, 0x10000
+// 0x010bc2f0: 0x10bc2f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bbcac: 0x10bbcac: addiu a0, a0, -28756
+// 0x010bc2f4: 0x10bc2f4: addiu a0, a0, -28756
 	ldloc.1
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010bbcb0: 0x10bbcb0: jal   0x10947dc addu  s2, v0, zero
+// 0x010bc2f8: 0x10bc2f8: jal   0x1094e00 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2106,20 +2106,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbcb8: 0x10bbcb8: lui   a2, 0x10000
+// 0x010bc300: 0x10bc300: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010bbcbc: 0x10bbcbc: addiu a2, a2, 18500
+// 0x010bc304: 0x10bc304: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010bbcc0: 0x10bbcc0: lw    a1, 24(sp)
+// 0x010bc308: 0x10bc308: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2128,13 +2128,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bbcc4: 0x10bbcc4: addu  a0, s3, zero
+// 0x010bc30c: 0x10bc30c: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x010bbcc8: 0x10bbcc8: addu  a3, a2, zero
+// 0x010bc310: 0x10bc310: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x010bbccc: 0x10bbccc: sw    v0, 16(sp)
+// 0x010bc314: 0x10bc314: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2143,7 +2143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bbcd0: 0x10bbcd0: jal   0x10b4e98 sw    s2, 20(sp)
+// 0x010bc318: 0x10bc318: jal   0x10b54e0 sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2157,37 +2157,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_create_10b4e98(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_create_10b54e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbcd8: 0x10bbcd8: addu  s4, v0, zero
+// 0x010bc320: 0x10bc320: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010bbcdc: 0x10bbcdc: addu  s3, zero, zero
+// 0x010bc324: 0x10bc324: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010bbce0: 0x10bbce0: addiu s7, zero, 20
+// 0x010bc328: 0x10bc328: addiu s7, zero, 20
 	ldc.i4.s 20
 	stloc 15
-// 0x010bbce4: 0x10bbce4: lui   s6, 0x0
+// 0x010bc32c: 0x10bc32c: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x010bbce8: 0x10bbce8: j	 0x10bbd98 lui   s5, 0x0
+// 0x010bc330: 0x10bc330: j	 0x10bc3e0 lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 13
-	br L_10bbd98
+	br L_10bc3e0
 // --- basic block ---
-L_10bbcf0:
-// 0x010bbcf0: 0x10bbcf0: lw    s2, 0(s1)
+L_10bc338:
+// 0x010bc338: 0x10bc338: lw    s2, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010bbcf4: 0x10bbcf4: lw    v0, 18812(s6)
+// 0x010bc33c: 0x10bc33c: lw    v0, 18812(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -2196,30 +2196,30 @@ L_10bbcf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbcf8: 0x10bbcf8: mflo  lo
+// 0x010bc340: 0x10bc340: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x010bbcfc: 0x10bbcfc: addu  s2, s2, v1
+// 0x010bc344: 0x10bc344: addu  s2, s2, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x010bbd00: 0x10bbd00: lw    v1, 0(s2)
+// 0x010bc348: 0x10bc348: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010bbd04: 0x10bbd04: sll   zero, zero, 0
-// 0x010bbd08: 0x10bbd08: beq   v1, v0, 0x10bbd7c addu  a1, s0, zero
+// 0x010bc34c: 0x10bc34c: sll   zero, zero, 0
+// 0x010bc350: 0x10bc350: beq   v1, v0, 0x10bc3c4 addu  a1, s0, zero
 	ldloc 7
 	ldloc 5
 	ldloc 10
 	stloc.2
-	beq  L_10bbd7c
+	beq  L_10bc3c4
 // --- basic block ---
-// 0x010bbd10: 0x10bbd10: lw    a0, 12(s2)
+// 0x010bc358: 0x10bc358: lw    a0, 12(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2228,22 +2228,22 @@ L_10bbcf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbd14: 0x10bbd14: jal   0x100add4 sll   zero, zero, 0
+// 0x010bc35c: 0x10bc35c: jal   0x100ade4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_scale_100add4(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_scale_100ade4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbd1c: 0x10bbd1c: bne   v0, zero, 0x10bbd40 sll   zero, zero, 0
+// 0x010bc364: 0x10bc364: bne   v0, zero, 0x10bc388 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bbd40
+	brtrue L_10bc388
 // --- basic block ---
-// 0x010bbd24: 0x10bbd24: jal   0x1012c58 addu  a0, s2, zero
+// 0x010bc36c: 0x10bc36c: jal   0x1012c68 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2251,18 +2251,18 @@ L_10bbcf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_line_has_predecessor_1012c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_line_has_predecessor_1012c68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbd2c: 0x10bbd2c: bne   v0, zero, 0x10bbd40 addu  a0, s2, zero
+// 0x010bc374: 0x10bc374: bne   v0, zero, 0x10bc388 addu  a0, s2, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_10bbd40
+	brtrue L_10bc388
 // --- basic block ---
-// 0x010bbd34: 0x10bbd34: sw    s0, 8(s2)
+// 0x010bc37c: 0x10bc37c: sw    s0, 8(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2271,7 +2271,7 @@ L_10bbcf0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bbd38: 0x10bbd38: jal   0x10b639c addu  a1, s4, zero
+// 0x010bc380: 0x10bc380: jal   0x10b69e4 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -2279,13 +2279,13 @@ L_10bbcf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_copy_10b639c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_copy_10b69e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bbd40:
-// 0x010bbd40: 0x10bbd40: lw    a0, 12(s2)
+L_10bc388:
+// 0x010bc388: 0x10bc388: lw    a0, 12(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2294,7 +2294,7 @@ L_10bbd40:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbd44: 0x10bbd44: lw    v0, 576(s5)
+// 0x010bc38c: 0x10bc38c: lw    v0, 576(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2303,30 +2303,30 @@ L_10bbd40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbd48: 0x10bbd48: sll   zero, zero, 0
-// 0x010bbd4c: 0x10bbd4c: beq   a0, v0, 0x10bbd64 sll   zero, zero, 0
+// 0x010bc390: 0x10bc390: sll   zero, zero, 0
+// 0x010bc394: 0x10bc394: beq   a0, v0, 0x10bc3ac sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10bbd64
+	beq  L_10bc3ac
 // --- basic block ---
-// 0x010bbd54: 0x10bbd54: bltz  a0, 0x10bbd64 sll   zero, zero, 0
+// 0x010bc39c: 0x10bc39c: bltz  a0, 0x10bc3ac sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bbd64
+	blt L_10bc3ac
 // --- basic block ---
-// 0x010bbd5c: 0x10bbd5c: jal   0x100b164 sll   zero, zero, 0
+// 0x010bc3a4: 0x10bc3a4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bbd64:
-// 0x010bbd64: 0x10bbd64: lw    a1, 12(s2)
+L_10bc3ac:
+// 0x010bc3ac: 0x10bc3ac: lw    a1, 12(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2335,7 +2335,7 @@ L_10bbd64:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bbd68: 0x10bbd68: lw    a0, 4(s2)
+// 0x010bc3b0: 0x10bc3b0: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2344,7 +2344,7 @@ L_10bbd64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbd6c: 0x10bbd6c: jal   0x10b694c addiu a2, zero, 1
+// 0x010bc3b4: 0x10bc3b4: jal   0x10b6f94 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -2352,20 +2352,20 @@ L_10bbd64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_set_flag_10b694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_set_flag_10b6f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbd74: 0x10bbd74: j	 0x10bbd98 addiu s3, s3, 1
+// 0x010bc3bc: 0x10bc3bc: j	 0x10bc3e0 addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_10bbd98
+	br L_10bc3e0
 // --- basic block ---
-L_10bbd7c:
-// 0x010bbd7c: 0x10bbd7c: lw    a0, 4(s2)
+L_10bc3c4:
+// 0x010bc3c4: 0x10bc3c4: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2374,7 +2374,7 @@ L_10bbd7c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbd80: 0x10bbd80: jal   0x10b5c74 addiu a2, zero, 4
+// 0x010bc3c8: 0x10bc3c8: jal   0x10b62bc addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -2382,12 +2382,12 @@ L_10bbd7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_modify_properties_10b5c74(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_modify_properties_10b62bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbd88: 0x10bbd88: lw    a0, 4(s2)
+// 0x010bc3d0: 0x10bc3d0: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2396,7 +2396,7 @@ L_10bbd7c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbd8c: 0x10bbd8c: jal   0x10b5aac addu  a1, s4, zero
+// 0x010bc3d4: 0x10bc3d4: jal   0x10b60f4 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -2404,18 +2404,18 @@ L_10bbd7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_set_street_10b5aac(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_set_street_10b60f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbd94: 0x10bbd94: addiu s3, s3, 1
+// 0x010bc3dc: 0x10bc3dc: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10bbd98:
-// 0x010bbd98: 0x10bbd98: lw    v0, 4(s1)
+L_10bc3e0:
+// 0x010bc3e0: 0x10bc3e0: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2424,43 +2424,43 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbd9c: 0x10bbd9c: sll   zero, zero, 0
-// 0x010bbda0: 0x10bbda0: slt   v0, s3, v0
+// 0x010bc3e4: 0x10bc3e4: sll   zero, zero, 0
+// 0x010bc3e8: 0x10bc3e8: slt   v0, s3, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x010bbda4: 0x10bbda4: bne   v0, zero, 0x10bbcf0 mult  s3, s7
+// 0x010bc3ec: 0x10bc3ec: bne   v0, zero, 0x10bc338 mult  s3, s7
 	ldloc 5
 	ldloc 9
 	ldloc 15
 	mul
 	stloc 17
-	brtrue L_10bbcf0
+	brtrue L_10bc338
 // --- basic block ---
-// 0x010bbdac: 0x10bbdac: jal   0x10bd694 sll   zero, zero, 0
+// 0x010bc3f4: 0x10bc3f4: jal   0x10bdcdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_reset_selected_10bd694(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_reset_selected_10bdcdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbdb4: 0x10bbdb4: jal   0x10bcffc sll   zero, zero, 0
+// 0x010bc3fc: 0x10bc3fc: jal   0x10bd644 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_report_segments_10bcffc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_report_segments_10bd644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbdbc: 0x10bbdbc: jal   0x1094b64 addu  a0, zero, zero
+// 0x010bc404: 0x10bc404: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2468,16 +2468,16 @@ L_10bbd98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbdc4: 0x10bbdc4: lw    ra, 68(sp)
-// 0x010bbdc8: 0x10bbdc8: addiu v0, zero, 1
+// 0x010bc40c: 0x10bc40c: lw    ra, 68(sp)
+// 0x010bc410: 0x10bc410: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010bbdcc: 0x10bbdcc: lw    s7, 64(sp)
+// 0x010bc414: 0x10bc414: lw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2486,7 +2486,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bbdd0: 0x10bbdd0: lw    s6, 60(sp)
+// 0x010bc418: 0x10bc418: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2495,7 +2495,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bbdd4: 0x10bbdd4: lw    s5, 56(sp)
+// 0x010bc41c: 0x10bc41c: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2504,7 +2504,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bbdd8: 0x10bbdd8: lw    s4, 52(sp)
+// 0x010bc420: 0x10bc420: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2513,7 +2513,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bbddc: 0x10bbddc: lw    s3, 48(sp)
+// 0x010bc424: 0x10bc424: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2522,7 +2522,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bbde0: 0x10bbde0: lw    s2, 44(sp)
+// 0x010bc428: 0x10bc428: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2531,7 +2531,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bbde4: 0x10bbde4: lw    s1, 40(sp)
+// 0x010bc42c: 0x10bc42c: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2540,7 +2540,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bbde8: 0x10bbde8: lw    s0, 36(sp)
+// 0x010bc430: 0x10bc430: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2549,7 +2549,7 @@ L_10bbd98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bbdec: 0x10bbdec: jr    ra addiu sp, sp, 72
+// 0x010bc434: 0x10bc434: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -2561,7 +2561,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_segments_find_city_10bbdf4(int32,int32,int32,int32,int32)
+.method public static int32 editor_segments_find_city_10bc43c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s7,int32 s5,int32 s6,int32 s8,int32 ra)
@@ -2623,10 +2623,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bbdf4: 0x10bbdf4: lui   v0, 0x0
+// 0x010bc43c: 0x10bc43c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bbdf8: 0x10bbdf8: lw    v0, 18812(v0)
+// 0x010bc440: 0x10bc440: lw    v0, 18812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2635,12 +2635,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbdfc: 0x10bbdfc: addiu sp, sp, -3024
+// 0x010bc444: 0x10bc444: addiu sp, sp, -3024
 	ldloc.0
 	ldc.i4 -3024
 	add
 	stloc.0
-// 0x010bbe00: 0x10bbe00: sw    s0, 2984(sp)
+// 0x010bc448: 0x10bc448: sw    s0, 2984(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2649,8 +2649,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bbe04: 0x10bbe04: sw    ra, 3020(sp)
-// 0x010bbe08: 0x10bbe08: sw    s8, 3016(sp)
+// 0x010bc44c: 0x10bc44c: sw    ra, 3020(sp)
+// 0x010bc450: 0x10bc450: sw    s8, 3016(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2659,7 +2659,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bbe0c: 0x10bbe0c: sw    s7, 3012(sp)
+// 0x010bc454: 0x10bc454: sw    s7, 3012(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2668,7 +2668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bbe10: 0x10bbe10: sw    s6, 3008(sp)
+// 0x010bc458: 0x10bc458: sw    s6, 3008(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2677,7 +2677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010bbe14: 0x10bbe14: sw    s5, 3004(sp)
+// 0x010bc45c: 0x10bc45c: sw    s5, 3004(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2686,7 +2686,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bbe18: 0x10bbe18: sw    s4, 3000(sp)
+// 0x010bc460: 0x10bc460: sw    s4, 3000(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2695,7 +2695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bbe1c: 0x10bbe1c: sw    s3, 2996(sp)
+// 0x010bc464: 0x10bc464: sw    s3, 2996(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2704,7 +2704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bbe20: 0x10bbe20: sw    s2, 2992(sp)
+// 0x010bc468: 0x10bc468: sw    s2, 2992(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2713,7 +2713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bbe24: 0x10bbe24: sw    s1, 2988(sp)
+// 0x010bc46c: 0x10bc46c: sw    s1, 2988(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2722,25 +2722,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bbe28: 0x10bbe28: bne   a1, v0, 0x10bbe50 addu  s0, a0, zero
+// 0x010bc470: 0x10bc470: bne   a1, v0, 0x10bc498 addu  s0, a0, zero
 	ldloc.2
 	ldloc 5
 	ldloc.1
 	stloc 8
-	bne.un L_10bbe50
+	bne.un L_10bc498
 // --- basic block ---
-// 0x010bbe30: 0x10bbe30: addiu a1, sp, 36
+// 0x010bc478: 0x10bc478: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010bbe34: 0x10bbe34: addu  a2, zero, zero
+// 0x010bc47c: 0x10bc47c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bbe38: 0x10bbe38: addu  a3, zero, zero
+// 0x010bc480: 0x10bc480: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bbe3c: 0x10bbe3c: sw    zero, 16(sp)
+// 0x010bc484: 0x10bc484: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2749,7 +2749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bbe40: 0x10bbe40: jal   0x10b5d30 sw    zero, 20(sp)
+// 0x010bc488: 0x10bc488: jal   0x10b6378 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2763,23 +2763,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbe48: 0x10bbe48: j	 0x10bbeb8 addiu s0, sp, 68
+// 0x010bc490: 0x10bc490: j	 0x10bc500 addiu s0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 8
-	br L_10bbeb8
+	br L_10bc500
 // --- basic block ---
-L_10bbe50:
-// 0x010bbe50: 0x10bbe50: lui   v0, 0x0
+L_10bc498:
+// 0x010bc498: 0x10bc498: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bbe54: 0x10bbe54: lw    v0, 576(v0)
+// 0x010bc49c: 0x10bc49c: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2788,20 +2788,20 @@ L_10bbe50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbe58: 0x10bbe58: sll   zero, zero, 0
-// 0x010bbe5c: 0x10bbe5c: beq   a2, v0, 0x10bbe78 lui   v0, 0x20000
+// 0x010bc4a0: 0x10bc4a0: sll   zero, zero, 0
+// 0x010bc4a4: 0x10bc4a4: beq   a2, v0, 0x10bc4c0 lui   v0, 0x20000
 	ldloc.3
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_10bbe78
+	beq  L_10bc4c0
 // --- basic block ---
-// 0x010bbe64: 0x10bbe64: bltz  a2, 0x10bbe78 sll   zero, zero, 0
+// 0x010bc4ac: 0x10bc4ac: bltz  a2, 0x10bc4c0 sll   zero, zero, 0
 	ldloc.3
 	ldc.i4.s 0
-	blt L_10bbe78
+	blt L_10bc4c0
 // --- basic block ---
-// 0x010bbe6c: 0x10bbe6c: jal   0x100b164 addu  a0, a2, zero
+// 0x010bc4b4: 0x10bc4b4: jal   0x100b174 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -2809,74 +2809,74 @@ L_10bbe50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbe74: 0x10bbe74: lui   v0, 0x20000
+// 0x010bc4bc: 0x10bc4bc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10bbe78:
-// 0x010bbe78: 0x10bbe78: lw    v0, 31152(v0)
+L_10bc4c0:
+// 0x010bc4c0: 0x10bc4c0: lw    v0, 31616(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbe7c: 0x10bbe7c: sll   s0, s0, 3
+// 0x010bc4c4: 0x10bc4c4: sll   s0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x010bbe80: 0x10bbe80: addu  s0, v0, s0
+// 0x010bc4c8: 0x10bc4c8: addu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x010bbe84: 0x10bbe84: lhu   v0, 0(s0)
+// 0x010bc4cc: 0x10bc4cc: lhu   v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010bbe88: 0x10bbe88: lui   v1, 0x20000
+// 0x010bc4d0: 0x10bc4d0: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010bbe8c: 0x10bbe8c: lw    v1, 31228(v1)
+// 0x010bc4d4: 0x10bc4d4: lw    v1, 31692(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bbe90: 0x10bbe90: andi  v0, v0, 32767
+// 0x010bc4d8: 0x10bc4d8: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x010bbe94: 0x10bbe94: sll   v0, v0, 3
+// 0x010bc4dc: 0x10bc4dc: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010bbe98: 0x10bbe98: addu  v0, v1, v0
+// 0x010bc4e0: 0x10bc4e0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010bbe9c: 0x10bbe9c: lw    v1, 0(v0)
+// 0x010bc4e4: 0x10bc4e4: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010bbea0: 0x10bbea0: sll   zero, zero, 0
-// 0x010bbea4: 0x10bbea4: sw    v1, 36(sp)
+// 0x010bc4e8: 0x10bc4e8: sll   zero, zero, 0
+// 0x010bc4ec: 0x10bc4ec: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2885,7 +2885,7 @@ L_10bbe78:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bbea8: 0x10bbea8: lw    v0, 4(v0)
+// 0x010bc4f0: 0x10bc4f0: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2894,8 +2894,8 @@ L_10bbe78:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbeac: 0x10bbeac: sll   zero, zero, 0
-// 0x010bbeb0: 0x10bbeb0: sw    v0, 40(sp)
+// 0x010bc4f4: 0x10bc4f4: sll   zero, zero, 0
+// 0x010bc4f8: 0x10bc4f8: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2904,59 +2904,59 @@ L_10bbe78:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bbeb4: 0x10bbeb4: addiu s0, sp, 68
+// 0x010bc4fc: 0x10bc4fc: addiu s0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 8
-L_10bbeb8:
-// 0x010bbeb8: 0x10bbeb8: addu  a0, s0, zero
+L_10bc500:
+// 0x010bc500: 0x10bc500: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010bbebc: 0x10bbebc: jal   0x1010058 addiu a1, zero, 128
+// 0x010bc504: 0x10bc504: jal   0x1010068 addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbec4: 0x10bbec4: addiu s4, sp, 36
+// 0x010bc50c: 0x10bc50c: addiu s4, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 12
-// 0x010bbec8: 0x10bbec8: addu  s3, v0, zero
+// 0x010bc510: 0x10bc510: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010bbecc: 0x10bbecc: addiu s2, sp, 580
+// 0x010bc514: 0x10bc514: addiu s2, sp, 580
 	ldloc.0
 	ldc.i4 580
 	add
 	stloc 10
-// 0x010bbed0: 0x10bbed0: addiu s1, zero, 50
+// 0x010bc518: 0x10bc518: addiu s1, zero, 50
 	ldc.i4.s 50
 	stloc 9
-// 0x010bbed4: 0x10bbed4: addu  a0, s4, zero
+// 0x010bc51c: 0x10bc51c: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010bbed8: 0x10bbed8: addu  a2, s0, zero
+// 0x010bc520: 0x10bc520: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010bbedc: 0x10bbedc: addu  a3, v0, zero
+// 0x010bc524: 0x10bc524: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010bbee0: 0x10bbee0: addu  a1, zero, zero
+// 0x010bc528: 0x10bc528: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bbee4: 0x10bbee4: addiu v0, zero, 1
+// 0x010bc52c: 0x10bc52c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010bbee8: 0x10bbee8: sw    s2, 20(sp)
+// 0x010bc530: 0x10bc530: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2965,7 +2965,7 @@ L_10bbeb8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bbeec: 0x10bbeec: sw    s1, 24(sp)
+// 0x010bc534: 0x10bc534: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2974,7 +2974,7 @@ L_10bbeb8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bbef0: 0x10bbef0: jal   0x1013028 sw    v0, 16(sp)
+// 0x010bc538: 0x10bc538: jal   0x1013038 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2988,24 +2988,24 @@ L_10bbeb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbef8: 0x10bbef8: addu  a0, s4, zero
+// 0x010bc540: 0x10bc540: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010bbefc: 0x10bbefc: addu  a1, s0, zero
+// 0x010bc544: 0x10bc544: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010bbf00: 0x10bbf00: addu  a2, s3, zero
+// 0x010bc548: 0x10bc548: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x010bbf04: 0x10bbf04: addiu a3, zero, 1
+// 0x010bc54c: 0x10bc54c: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010bbf08: 0x10bbf08: sw    s2, 16(sp)
+// 0x010bc550: 0x10bc550: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3014,7 +3014,7 @@ L_10bbeb8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bbf0c: 0x10bbf0c: sw    s1, 24(sp)
+// 0x010bc554: 0x10bc554: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3023,7 +3023,7 @@ L_10bbeb8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bbf10: 0x10bbf10: sw    v0, 20(sp)
+// 0x010bc558: 0x10bc558: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3032,7 +3032,7 @@ L_10bbeb8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bbf14: 0x10bbf14: jal   0x1014978 lui   s7, 0x10000
+// 0x010bc55c: 0x10bc55c: jal   0x1014988 lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 13
 	ldloc.0
@@ -3040,50 +3040,50 @@ L_10bbeb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_closest_1014978(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_closest_1014988(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbf1c: 0x10bbf1c: addu  s8, v0, zero
+// 0x010bc564: 0x10bc564: addu  s8, v0, zero
 	ldloc 5
 	stloc 16
-// 0x010bbf20: 0x10bbf20: addiu s7, s7, 18500
+// 0x010bc568: 0x10bc568: addiu s7, s7, 18768
 	ldloc 13
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 13
-// 0x010bbf24: 0x10bbf24: addiu s0, sp, 584
+// 0x010bc56c: 0x10bc56c: addiu s0, sp, 584
 	ldloc.0
 	ldc.i4 584
 	add
 	stloc 8
-// 0x010bbf28: 0x10bbf28: addu  s2, zero, zero
+// 0x010bc570: 0x10bc570: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010bbf2c: 0x10bbf2c: lui   s6, 0x0
+// 0x010bc574: 0x10bc574: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x010bbf30: 0x10bbf30: lui   s1, 0x0
+// 0x010bc578: 0x10bc578: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010bbf34: 0x10bbf34: addiu s3, sp, 44
+// 0x010bc57c: 0x10bc57c: addiu s3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 11
-// 0x010bbf38: 0x10bbf38: addiu s5, zero, -1
+// 0x010bc580: 0x10bc580: addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 14
-// 0x010bbf3c: 0x10bbf3c: j	 0x10bc030 addiu s4, sp, 32
+// 0x010bc584: 0x10bc584: j	 0x10bc678 addiu s4, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 12
-	br L_10bc030
+	br L_10bc678
 // --- basic block ---
-L_10bbf44:
-// 0x010bbf44: 0x10bbf44: lw    v1, -4(s0)
+L_10bc58c:
+// 0x010bc58c: 0x10bc58c: lw    v1, -4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3092,7 +3092,7 @@ L_10bbf44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bbf48: 0x10bbf48: lw    v0, 18812(s6)
+// 0x010bc590: 0x10bc590: lw    v0, 18812(s6)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -3101,13 +3101,13 @@ L_10bbf44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbf4c: 0x10bbf4c: sll   zero, zero, 0
-// 0x010bbf50: 0x10bbf50: bne   v1, v0, 0x10bbfa4 sll   zero, zero, 0
+// 0x010bc594: 0x10bc594: sll   zero, zero, 0
+// 0x010bc598: 0x10bc598: bne   v1, v0, 0x10bc5ec sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10bbfa4
+	bne.un L_10bc5ec
 // --- basic block ---
-// 0x010bbf58: 0x10bbf58: bne   v1, zero, 0x10bbf84 sw    s5, 32(sp)
+// 0x010bc5a0: 0x10bc5a0: bne   v1, zero, 0x10bc5cc sw    s5, 32(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -3117,9 +3117,9 @@ L_10bbf44:
 	add
 	ldloc 14
 	stelem.i4
-	brtrue L_10bbf84
+	brtrue L_10bc5cc
 // --- basic block ---
-// 0x010bbf60: 0x10bbf60: lw    a0, 8(s0)
+// 0x010bc5a8: 0x10bc5a8: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3128,7 +3128,7 @@ L_10bbf44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbf64: 0x10bbf64: lw    v0, 576(s1)
+// 0x010bc5ac: 0x10bc5ac: lw    v0, 576(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3137,37 +3137,37 @@ L_10bbf44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbf68: 0x10bbf68: sll   zero, zero, 0
-// 0x010bbf6c: 0x10bbf6c: beq   a0, v0, 0x10bbf84 sll   zero, zero, 0
+// 0x010bc5b0: 0x10bc5b0: sll   zero, zero, 0
+// 0x010bc5b4: 0x10bc5b4: beq   a0, v0, 0x10bc5cc sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10bbf84
+	beq  L_10bc5cc
 // --- basic block ---
-// 0x010bbf74: 0x10bbf74: bltz  a0, 0x10bbf84 sll   zero, zero, 0
+// 0x010bc5bc: 0x10bc5bc: bltz  a0, 0x10bc5cc sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bbf84
+	blt L_10bc5cc
 // --- basic block ---
-// 0x010bbf7c: 0x10bbf7c: jal   0x100b164 sll   zero, zero, 0
+// 0x010bc5c4: 0x10bc5c4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bbf84:
-// 0x010bbf84: 0x10bbf84: lw    a0, 0(s0)
+L_10bc5cc:
+// 0x010bc5cc: 0x10bc5cc: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bbf88: 0x10bbf88: jal   0x10b58c8 addu  a1, s4, zero
+// 0x010bc5d0: 0x10bc5d0: jal   0x10b5f10 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -3175,12 +3175,12 @@ L_10bbf84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbf90: 0x10bbf90: lw    a0, 32(sp)
+// 0x010bc5d8: 0x10bc5d8: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3189,28 +3189,28 @@ L_10bbf84:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbf94: 0x10bbf94: jal   0x10b4aec sll   zero, zero, 0
+// 0x010bc5dc: 0x10bc5dc: jal   0x10b5134 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_city_10b4aec(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_city_10b5134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bbf9c: 0x10bbf9c: j	 0x10bc01c sll   zero, zero, 0
-	br L_10bc01c
+// 0x010bc5e4: 0x10bc5e4: j	 0x10bc664 sll   zero, zero, 0
+	br L_10bc664
 // --- basic block ---
-L_10bbfa4:
-// 0x010bbfa4: 0x10bbfa4: bne   v1, zero, 0x10bc01c addu  v0, s7, zero
+L_10bc5ec:
+// 0x010bc5ec: 0x10bc5ec: bne   v1, zero, 0x10bc664 addu  v0, s7, zero
 	ldloc 7
 	ldloc 13
 	stloc 5
-	brtrue L_10bc01c
+	brtrue L_10bc664
 // --- basic block ---
-// 0x010bbfac: 0x10bbfac: lw    a0, 8(s0)
+// 0x010bc5f4: 0x10bc5f4: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3219,7 +3219,7 @@ L_10bbfa4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbfb0: 0x10bbfb0: lw    v0, 576(s1)
+// 0x010bc5f8: 0x10bc5f8: lw    v0, 576(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3228,30 +3228,30 @@ L_10bbfa4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbfb4: 0x10bbfb4: sll   zero, zero, 0
-// 0x010bbfb8: 0x10bbfb8: beq   a0, v0, 0x10bbfd0 sll   zero, zero, 0
+// 0x010bc5fc: 0x10bc5fc: sll   zero, zero, 0
+// 0x010bc600: 0x10bc600: beq   a0, v0, 0x10bc618 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10bbfd0
+	beq  L_10bc618
 // --- basic block ---
-// 0x010bbfc0: 0x10bbfc0: bltz  a0, 0x10bbfd0 sll   zero, zero, 0
+// 0x010bc608: 0x10bc608: bltz  a0, 0x10bc618 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bbfd0
+	blt L_10bc618
 // --- basic block ---
-// 0x010bbfc8: 0x10bbfc8: jal   0x100b164 sll   zero, zero, 0
+// 0x010bc610: 0x10bc610: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bbfd0:
-// 0x010bbfd0: 0x10bbfd0: lw    v0, -4(s0)
+L_10bc618:
+// 0x010bc618: 0x10bc618: lw    v0, -4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3260,12 +3260,12 @@ L_10bbfd0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbfd4: 0x10bbfd4: sll   zero, zero, 0
-// 0x010bbfd8: 0x10bbfd8: bne   v0, zero, 0x10bc004 sll   zero, zero, 0
+// 0x010bc61c: 0x10bc61c: sll   zero, zero, 0
+// 0x010bc620: 0x10bc620: bne   v0, zero, 0x10bc64c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bc004
+	brtrue L_10bc64c
 // --- basic block ---
-// 0x010bbfe0: 0x10bbfe0: lw    a0, 8(s0)
+// 0x010bc628: 0x10bc628: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3274,7 +3274,7 @@ L_10bbfd0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bbfe4: 0x10bbfe4: lw    v0, 576(s1)
+// 0x010bc62c: 0x10bc62c: lw    v0, 576(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3283,37 +3283,37 @@ L_10bbfd0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bbfe8: 0x10bbfe8: sll   zero, zero, 0
-// 0x010bbfec: 0x10bbfec: beq   a0, v0, 0x10bc004 sll   zero, zero, 0
+// 0x010bc630: 0x10bc630: sll   zero, zero, 0
+// 0x010bc634: 0x10bc634: beq   a0, v0, 0x10bc64c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10bc004
+	beq  L_10bc64c
 // --- basic block ---
-// 0x010bbff4: 0x10bbff4: bltz  a0, 0x10bc004 sll   zero, zero, 0
+// 0x010bc63c: 0x10bc63c: bltz  a0, 0x10bc64c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bc004
+	blt L_10bc64c
 // --- basic block ---
-// 0x010bbffc: 0x10bbffc: jal   0x100b164 sll   zero, zero, 0
+// 0x010bc644: 0x10bc644: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bc004:
-// 0x010bc004: 0x10bc004: lw    a0, 0(s0)
+L_10bc64c:
+// 0x010bc64c: 0x10bc64c: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bc008: 0x10bc008: jal   0x1011a4c addu  a1, s3, zero
+// 0x010bc650: 0x10bc650: jal   0x1011a5c addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -3321,15 +3321,15 @@ L_10bc004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc010: 0x10bc010: addu  a0, s3, zero
+// 0x010bc658: 0x10bc658: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010bc014: 0x10bc014: jal   0x1011298 addiu a1, zero, 1
+// 0x010bc65c: 0x10bc65c: jal   0x10112a8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3337,50 +3337,50 @@ L_10bc004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bc01c:
-// 0x010bc01c: 0x10bc01c: lb    v1, 0(v0)
+L_10bc664:
+// 0x010bc664: 0x10bc664: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010bc020: 0x10bc020: sll   zero, zero, 0
-// 0x010bc024: 0x10bc024: bne   v1, zero, 0x10bc040 addiu s0, s0, 48
+// 0x010bc668: 0x10bc668: sll   zero, zero, 0
+// 0x010bc66c: 0x10bc66c: bne   v1, zero, 0x10bc688 addiu s0, s0, 48
 	ldloc 7
 	ldloc 8
 	ldc.i4.s 48
 	add
 	stloc 8
-	brtrue L_10bc040
+	brtrue L_10bc688
 // --- basic block ---
-// 0x010bc02c: 0x10bc02c: addiu s2, s2, 1
+// 0x010bc674: 0x10bc674: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10bc030:
-// 0x010bc030: 0x10bc030: slt   v0, s2, s8
+L_10bc678:
+// 0x010bc678: 0x10bc678: slt   v0, s2, s8
 	ldloc 10
 	ldloc 16
 	clt
 	stloc 5
-// 0x010bc034: 0x10bc034: bne   v0, zero, 0x10bbf44 lui   v0, 0x10000
+// 0x010bc67c: 0x10bc67c: bne   v0, zero, 0x10bc58c lui   v0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	brtrue L_10bbf44
+	brtrue L_10bc58c
 // --- basic block ---
-// 0x010bc03c: 0x10bc03c: addiu v0, v0, 18500
+// 0x010bc684: 0x10bc684: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-L_10bc040:
-// 0x010bc040: 0x10bc040: lw    ra, 3020(sp)
-// 0x010bc044: 0x10bc044: lw    s8, 3016(sp)
+L_10bc688:
+// 0x010bc688: 0x10bc688: lw    ra, 3020(sp)
+// 0x010bc68c: 0x10bc68c: lw    s8, 3016(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3389,7 +3389,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bc048: 0x10bc048: lw    s7, 3012(sp)
+// 0x010bc690: 0x10bc690: lw    s7, 3012(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3398,7 +3398,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bc04c: 0x10bc04c: lw    s6, 3008(sp)
+// 0x010bc694: 0x10bc694: lw    s6, 3008(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3407,7 +3407,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bc050: 0x10bc050: lw    s5, 3004(sp)
+// 0x010bc698: 0x10bc698: lw    s5, 3004(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3416,7 +3416,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bc054: 0x10bc054: lw    s4, 3000(sp)
+// 0x010bc69c: 0x10bc69c: lw    s4, 3000(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3425,7 +3425,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bc058: 0x10bc058: lw    s3, 2996(sp)
+// 0x010bc6a0: 0x10bc6a0: lw    s3, 2996(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3434,7 +3434,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bc05c: 0x10bc05c: lw    s2, 2992(sp)
+// 0x010bc6a4: 0x10bc6a4: lw    s2, 2992(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3443,7 +3443,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bc060: 0x10bc060: lw    s1, 2988(sp)
+// 0x010bc6a8: 0x10bc6a8: lw    s1, 2988(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3452,7 +3452,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bc064: 0x10bc064: lw    s0, 2984(sp)
+// 0x010bc6ac: 0x10bc6ac: lw    s0, 2984(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3461,7 +3461,7 @@ L_10bc040:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bc068: 0x10bc068: jr    ra addiu sp, sp, 3024
+// 0x010bc6b0: 0x10bc6b0: jr    ra addiu sp, sp, 3024
 	ldloc.0
 	ldc.i4 3024
 	add
@@ -3473,7 +3473,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_segments_fill_dialog_10bc070(int32,int32,int32,int32,int32)
+.method public static int32 editor_segments_fill_dialog_10bc6b8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -3535,15 +3535,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bc070: 0x10bc070: addiu sp, sp, -616
+// 0x010bc6b8: 0x10bc6b8: addiu sp, sp, -616
 	ldloc.0
 	ldc.i4 -616
 	add
 	stloc.0
-// 0x010bc074: 0x10bc074: lui   v0, 0x10000
+// 0x010bc6bc: 0x10bc6bc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010bc078: 0x10bc078: sw    s1, 580(sp)
+// 0x010bc6c0: 0x10bc6c0: sw    s1, 580(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3552,7 +3552,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bc07c: 0x10bc07c: sw    s0, 576(sp)
+// 0x010bc6c4: 0x10bc6c4: sw    s0, 576(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3561,17 +3561,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bc080: 0x10bc080: addiu s1, sp, 44
+// 0x010bc6c8: 0x10bc6c8: addiu s1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 8
-// 0x010bc084: 0x10bc084: addiu s0, v0, 18500
+// 0x010bc6cc: 0x10bc6cc: addiu s0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 9
-// 0x010bc088: 0x10bc088: sw    s8, 608(sp)
+// 0x010bc6d0: 0x10bc6d0: sw    s8, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3580,7 +3580,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bc08c: 0x10bc08c: sw    s6, 600(sp)
+// 0x010bc6d4: 0x10bc6d4: sw    s6, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3589,7 +3589,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bc090: 0x10bc090: sw    a1, 620(sp)
+// 0x010bc6d8: 0x10bc6d8: sw    a1, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3598,19 +3598,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010bc094: 0x10bc094: addu  s6, a0, zero
+// 0x010bc6dc: 0x10bc6dc: addu  s6, a0, zero
 	ldloc.1
 	stloc 14
-// 0x010bc098: 0x10bc098: addu  a1, s0, zero
+// 0x010bc6e0: 0x10bc6e0: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010bc09c: 0x10bc09c: addu  a0, s1, zero
+// 0x010bc6e4: 0x10bc6e4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bc0a0: 0x10bc0a0: addiu s8, zero, 1
+// 0x010bc6e8: 0x10bc6e8: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x010bc0a4: 0x10bc0a4: sw    s7, 604(sp)
+// 0x010bc6ec: 0x10bc6ec: sw    s7, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3619,7 +3619,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010bc0a8: 0x10bc0a8: sw    s5, 596(sp)
+// 0x010bc6f0: 0x10bc6f0: sw    s5, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3628,7 +3628,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bc0ac: 0x10bc0ac: sw    s4, 592(sp)
+// 0x010bc6f4: 0x10bc6f4: sw    s4, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3637,7 +3637,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bc0b0: 0x10bc0b0: sw    s2, 584(sp)
+// 0x010bc6f8: 0x10bc6f8: sw    s2, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3646,8 +3646,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bc0b4: 0x10bc0b4: sw    ra, 612(sp)
-// 0x010bc0b8: 0x10bc0b8: sw    s3, 588(sp)
+// 0x010bc6fc: 0x10bc6fc: sw    ra, 612(sp)
+// 0x010bc700: 0x10bc700: sw    s3, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3656,7 +3656,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bc0bc: 0x10bc0bc: jal   0x1001b68 addu  s1, s6, zero
+// 0x010bc704: 0x10bc704: jal   0x1001b68 addu  s1, s6, zero
 	ldloc 14
 	stloc 8
 	ldloc.1
@@ -3666,10 +3666,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc0c4: 0x10bc0c4: addiu s5, zero, 11
+// 0x010bc70c: 0x10bc70c: addiu s5, zero, 11
 	ldc.i4.s 11
 	stloc 13
-// 0x010bc0c8: 0x10bc0c8: sw    zero, 560(sp)
+// 0x010bc710: 0x10bc710: sw    zero, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3678,7 +3678,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bc0cc: 0x10bc0cc: sw    s8, 564(sp)
+// 0x010bc714: 0x10bc714: sw    s8, 564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3687,24 +3687,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bc0d0: 0x10bc0d0: addu  s4, s0, zero
+// 0x010bc718: 0x10bc718: addu  s4, s0, zero
 	ldloc 9
 	stloc 12
-// 0x010bc0d4: 0x10bc0d4: addu  s7, s0, zero
+// 0x010bc71c: 0x10bc71c: addu  s7, s0, zero
 	ldloc 9
 	stloc 15
-// 0x010bc0d8: 0x10bc0d8: j	 0x10bc2d4 addiu s2, sp, 20
+// 0x010bc720: 0x10bc720: j	 0x10bc91c addiu s2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 10
-	br L_10bc2d4
+	br L_10bc91c
 // --- basic block ---
-L_10bc0e0:
-// 0x010bc0e0: 0x10bc0e0: lui   a0, 0x0
+L_10bc728:
+// 0x010bc728: 0x10bc728: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bc0e4: 0x10bc0e4: lw    v0, 18812(a0)
+// 0x010bc72c: 0x10bc72c: lw    v0, 18812(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3713,14 +3713,14 @@ L_10bc0e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc0e8: 0x10bc0e8: lw    v1, 0(s1)
+// 0x010bc730: 0x10bc730: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010bc0ec: 0x10bc0ec: lw    a0, 16(s1)
+// 0x010bc734: 0x10bc734: lw    a0, 16(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3729,52 +3729,52 @@ L_10bc0e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc0f0: 0x10bc0f0: bne   v1, v0, 0x10bc170 sll   zero, zero, 0
+// 0x010bc738: 0x10bc738: bne   v1, v0, 0x10bc7b8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10bc170
+	bne.un L_10bc7b8
 // --- basic block ---
-// 0x010bc0f8: 0x10bc0f8: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010bc740: 0x10bc740: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc100: 0x10bc100: addiu v1, zero, -1
+// 0x010bc748: 0x10bc748: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010bc104: 0x10bc104: bne   v0, v1, 0x10bc120 addiu a1, sp, 16
+// 0x010bc74c: 0x10bc74c: bne   v0, v1, 0x10bc768 addiu a1, sp, 16
 	ldloc 5
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-	bne.un L_10bc120
+	bne.un L_10bc768
 // --- basic block ---
-// 0x010bc10c: 0x10bc10c: lui   a2, 0x10000
+// 0x010bc754: 0x10bc754: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010bc110: 0x10bc110: addiu a2, a2, 18500
+// 0x010bc758: 0x10bc758: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010bc114: 0x10bc114: addu  s3, s7, zero
+// 0x010bc75c: 0x10bc75c: addu  s3, s7, zero
 	ldloc 15
 	stloc 11
-// 0x010bc118: 0x10bc118: j	 0x10bc1e8 addu  v1, a2, zero
+// 0x010bc760: 0x10bc760: j	 0x10bc830 addu  v1, a2, zero
 	ldloc.3
 	stloc 7
-	br L_10bc1e8
+	br L_10bc830
 // --- basic block ---
-L_10bc120:
-// 0x010bc120: 0x10bc120: lw    a0, 4(s1)
+L_10bc768:
+// 0x010bc768: 0x10bc768: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3783,10 +3783,10 @@ L_10bc120:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc124: 0x10bc124: addiu v0, zero, -1
+// 0x010bc76c: 0x10bc76c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010bc128: 0x10bc128: jal   0x10b58c8 sw    v0, 16(sp)
+// 0x010bc770: 0x10bc770: jal   0x10b5f10 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3800,12 +3800,12 @@ L_10bc120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc130: 0x10bc130: lw    a0, 16(sp)
+// 0x010bc778: 0x10bc778: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3814,18 +3814,18 @@ L_10bc120:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc134: 0x10bc134: jal   0x10b4ba4 sll   zero, zero, 0
+// 0x010bc77c: 0x10bc77c: jal   0x10b51ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_fename_10b4ba4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_fename_10b51ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc13c: 0x10bc13c: lw    a0, 16(sp)
+// 0x010bc784: 0x10bc784: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3834,7 +3834,7 @@ L_10bc120:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc140: 0x10bc140: jal   0x10b4b48 sw    v0, 572(sp)
+// 0x010bc788: 0x10bc788: jal   0x10b5190 sw    v0, 572(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3848,12 +3848,12 @@ L_10bc120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_fetype_10b4b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_fetype_10b5190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc148: 0x10bc148: lw    a0, 16(sp)
+// 0x010bc790: 0x10bc790: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3862,18 +3862,18 @@ L_10bc120:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc14c: 0x10bc14c: jal   0x10b4a94 sll   zero, zero, 0
+// 0x010bc794: 0x10bc794: jal   0x10b50dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_t2s_10b4a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_t2s_10b50dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc154: 0x10bc154: lw    a0, 16(sp)
+// 0x010bc79c: 0x10bc79c: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3882,7 +3882,7 @@ L_10bc120:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc158: 0x10bc158: jal   0x10b4aec sw    v0, 568(sp)
+// 0x010bc7a0: 0x10bc7a0: jal   0x10b5134 sw    v0, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3896,12 +3896,12 @@ L_10bc120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_city_10b4aec(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_city_10b5134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc160: 0x10bc160: lw    v1, 572(sp)
+// 0x010bc7a8: 0x10bc7a8: lw    v1, 572(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3910,7 +3910,7 @@ L_10bc120:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bc164: 0x10bc164: lw    a2, 568(sp)
+// 0x010bc7ac: 0x10bc7ac: lw    a2, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3919,31 +3919,31 @@ L_10bc120:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bc168: 0x10bc168: j	 0x10bc1e8 addu  s3, v0, zero
+// 0x010bc7b0: 0x10bc7b0: j	 0x10bc830 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-	br L_10bc1e8
+	br L_10bc830
 // --- basic block ---
-L_10bc170:
-// 0x010bc170: 0x10bc170: jal   0x1013c44 sll   zero, zero, 0
+L_10bc7b8:
+// 0x010bc7b8: 0x10bc7b8: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc178: 0x10bc178: bltz  v0, 0x10bc2bc lui   v1, 0x0
+// 0x010bc7c0: 0x10bc7c0: bltz  v0, 0x10bc904 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
-	blt L_10bc2bc
+	blt L_10bc904
 // --- basic block ---
-// 0x010bc180: 0x10bc180: lw    a0, 12(s1)
+// 0x010bc7c8: 0x10bc7c8: lw    a0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3952,7 +3952,7 @@ L_10bc170:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc184: 0x10bc184: lw    v0, 576(v1)
+// 0x010bc7cc: 0x10bc7cc: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3961,30 +3961,30 @@ L_10bc170:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc188: 0x10bc188: sll   zero, zero, 0
-// 0x010bc18c: 0x10bc18c: beq   a0, v0, 0x10bc1a4 sll   zero, zero, 0
+// 0x010bc7d0: 0x10bc7d0: sll   zero, zero, 0
+// 0x010bc7d4: 0x10bc7d4: beq   a0, v0, 0x10bc7ec sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10bc1a4
+	beq  L_10bc7ec
 // --- basic block ---
-// 0x010bc194: 0x10bc194: bltz  a0, 0x10bc1a4 sll   zero, zero, 0
+// 0x010bc7dc: 0x10bc7dc: bltz  a0, 0x10bc7ec sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bc1a4
+	blt L_10bc7ec
 // --- basic block ---
-// 0x010bc19c: 0x10bc19c: jal   0x100b164 sll   zero, zero, 0
+// 0x010bc7e4: 0x10bc7e4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bc1a4:
-// 0x010bc1a4: 0x10bc1a4: lw    a0, 4(s1)
+L_10bc7ec:
+// 0x010bc7ec: 0x10bc7ec: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3993,7 +3993,7 @@ L_10bc1a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc1a8: 0x10bc1a8: jal   0x1011a4c addu  a1, s2, zero
+// 0x010bc7f0: 0x10bc7f0: jal   0x1011a5c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4001,12 +4001,12 @@ L_10bc1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc1b0: 0x10bc1b0: jal   0x1011818 addu  a0, s2, zero
+// 0x010bc7f8: 0x10bc7f8: jal   0x1011828 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4014,15 +4014,15 @@ L_10bc1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc1b8: 0x10bc1b8: addu  a0, s2, zero
+// 0x010bc800: 0x10bc800: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010bc1bc: 0x10bc1bc: jal   0x10111ac sw    v0, 572(sp)
+// 0x010bc804: 0x10bc804: jal   0x10111bc sw    v0, 572(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4036,24 +4036,24 @@ L_10bc1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_fetype_10111ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_fetype_10111bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc1c4: 0x10bc1c4: jal   0x1010d84 addu  a0, s2, zero
+// 0x010bc80c: 0x10bc80c: jal   0x1010d94 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-	call int32 Cibyl12::roadmap_street_get_street_t2s_1010d84()
+	call int32 Cibyl12::roadmap_street_get_street_t2s_1010d94()
 	stloc 5
 // --- basic block ---
-// 0x010bc1cc: 0x10bc1cc: addu  a0, s2, zero
+// 0x010bc814: 0x10bc814: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010bc1d0: 0x10bc1d0: addiu a1, zero, 1
+// 0x010bc818: 0x10bc818: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010bc1d4: 0x10bc1d4: jal   0x1011298 sw    v0, 568(sp)
+// 0x010bc81c: 0x10bc81c: jal   0x10112a8 sw    v0, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4067,12 +4067,12 @@ L_10bc1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc1dc: 0x10bc1dc: lw    a2, 568(sp)
+// 0x010bc824: 0x10bc824: lw    a2, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4081,7 +4081,7 @@ L_10bc1a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bc1e0: 0x10bc1e0: lw    v1, 572(sp)
+// 0x010bc828: 0x10bc828: lw    v1, 572(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4090,11 +4090,11 @@ L_10bc1a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bc1e4: 0x10bc1e4: addu  s3, v0, zero
+// 0x010bc82c: 0x10bc82c: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-L_10bc1e8:
-// 0x010bc1e8: 0x10bc1e8: lw    a0, 564(sp)
+L_10bc830:
+// 0x010bc830: 0x10bc830: lw    a0, 564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4103,43 +4103,43 @@ L_10bc1e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc1ec: 0x10bc1ec: sll   zero, zero, 0
-// 0x010bc1f0: 0x10bc1f0: beq   a0, zero, 0x10bc260 sll   zero, zero, 0
+// 0x010bc834: 0x10bc834: sll   zero, zero, 0
+// 0x010bc838: 0x10bc838: beq   a0, zero, 0x10bc8a8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10bc260
+	brfalse L_10bc8a8
 // --- basic block ---
-// 0x010bc1f8: 0x10bc1f8: lb    v0, 0(s4)
+// 0x010bc840: 0x10bc840: lb    v0, 0(s4)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bc1fc: 0x10bc1fc: sll   zero, zero, 0
-// 0x010bc200: 0x10bc200: bne   v0, zero, 0x10bc20c sll   zero, zero, 0
+// 0x010bc844: 0x10bc844: sll   zero, zero, 0
+// 0x010bc848: 0x10bc848: bne   v0, zero, 0x10bc854 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bc20c
+	brtrue L_10bc854
 // --- basic block ---
-// 0x010bc208: 0x10bc208: addu  s4, a2, zero
+// 0x010bc850: 0x10bc850: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-L_10bc20c:
-// 0x010bc20c: 0x10bc20c: lb    v0, 44(sp)
+L_10bc854:
+// 0x010bc854: 0x10bc854: lb    v0, 44(sp)
 	ldloc.0
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bc210: 0x10bc210: sll   zero, zero, 0
-// 0x010bc214: 0x10bc214: bne   v0, zero, 0x10bc230 addu  a1, v1, zero
+// 0x010bc858: 0x10bc858: sll   zero, zero, 0
+// 0x010bc85c: 0x10bc85c: bne   v0, zero, 0x10bc878 addu  a1, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.2
-	brtrue L_10bc230
+	brtrue L_10bc878
 // --- basic block ---
-// 0x010bc21c: 0x10bc21c: addiu a0, sp, 44
+// 0x010bc864: 0x10bc864: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x010bc220: 0x10bc220: jal   0x1001af8 addiu a2, zero, 512
+// 0x010bc868: 0x10bc868: jal   0x1001af8 addiu a2, zero, 512
 	ldc.i4 512
 	stloc.3
 	ldloc.1
@@ -4148,27 +4148,27 @@ L_10bc20c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010bc228: 0x10bc228: j	 0x10bc260 sb    zero, 555(sp)
+// 0x010bc870: 0x10bc870: j	 0x10bc8a8 sb    zero, 555(sp)
 	ldloc.0
 	ldc.i4 555
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_10bc260
+	br L_10bc8a8
 // --- basic block ---
-L_10bc230:
-// 0x010bc230: 0x10bc230: lb    v0, 0(v1)
+L_10bc878:
+// 0x010bc878: 0x10bc878: lb    v0, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bc234: 0x10bc234: sll   zero, zero, 0
-// 0x010bc238: 0x10bc238: beq   v0, zero, 0x10bc260 addu  a0, v1, zero
+// 0x010bc87c: 0x10bc87c: sll   zero, zero, 0
+// 0x010bc880: 0x10bc880: beq   v0, zero, 0x10bc8a8 addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_10bc260
+	brfalse L_10bc8a8
 // --- basic block ---
-// 0x010bc240: 0x10bc240: jal   0x1001b14 addiu a1, sp, 44
+// 0x010bc888: 0x10bc888: jal   0x1001b14 addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -4178,15 +4178,15 @@ L_10bc230:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010bc248: 0x10bc248: beq   v0, zero, 0x10bc260 addiu a0, sp, 44
+// 0x010bc890: 0x10bc890: beq   v0, zero, 0x10bc8a8 addiu a0, sp, 44
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-	brfalse L_10bc260
+	brfalse L_10bc8a8
 // --- basic block ---
-// 0x010bc250: 0x10bc250: jal   0x1001b68 addu  a1, s7, zero
+// 0x010bc898: 0x10bc898: jal   0x1001b68 addu  a1, s7, zero
 	ldloc 15
 	stloc.2
 	ldloc.1
@@ -4196,10 +4196,10 @@ L_10bc230:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc258: 0x10bc258: addu  s4, s7, zero
+// 0x010bc8a0: 0x10bc8a0: addu  s4, s7, zero
 	ldloc 15
 	stloc 12
-// 0x010bc25c: 0x10bc25c: sw    zero, 564(sp)
+// 0x010bc8a4: 0x10bc8a4: sw    zero, 564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4208,38 +4208,38 @@ L_10bc230:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10bc260:
-// 0x010bc260: 0x10bc260: beq   s8, zero, 0x10bc2a8 sll   zero, zero, 0
+L_10bc8a8:
+// 0x010bc8a8: 0x10bc8a8: beq   s8, zero, 0x10bc8f0 sll   zero, zero, 0
 	ldloc 16
-	brfalse L_10bc2a8
+	brfalse L_10bc8f0
 // --- basic block ---
-// 0x010bc268: 0x10bc268: lb    v0, 0(s0)
+// 0x010bc8b0: 0x10bc8b0: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bc26c: 0x10bc26c: sll   zero, zero, 0
-// 0x010bc270: 0x10bc270: bne   v0, zero, 0x10bc280 sll   zero, zero, 0
+// 0x010bc8b4: 0x10bc8b4: sll   zero, zero, 0
+// 0x010bc8b8: 0x10bc8b8: bne   v0, zero, 0x10bc8c8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bc280
+	brtrue L_10bc8c8
 // --- basic block ---
-// 0x010bc278: 0x10bc278: j	 0x10bc2a8 addu  s0, s3, zero
+// 0x010bc8c0: 0x10bc8c0: j	 0x10bc8f0 addu  s0, s3, zero
 	ldloc 11
 	stloc 9
-	br L_10bc2a8
+	br L_10bc8f0
 // --- basic block ---
-L_10bc280:
-// 0x010bc280: 0x10bc280: lb    v0, 0(s3)
+L_10bc8c8:
+// 0x010bc8c8: 0x10bc8c8: lb    v0, 0(s3)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bc284: 0x10bc284: sll   zero, zero, 0
-// 0x010bc288: 0x10bc288: beq   v0, zero, 0x10bc2a8 addu  a0, s3, zero
+// 0x010bc8cc: 0x10bc8cc: sll   zero, zero, 0
+// 0x010bc8d0: 0x10bc8d0: beq   v0, zero, 0x10bc8f0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brfalse L_10bc2a8
+	brfalse L_10bc8f0
 // --- basic block ---
-// 0x010bc290: 0x10bc290: jal   0x1001b14 addu  a1, s0, zero
+// 0x010bc8d8: 0x10bc8d8: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -4247,18 +4247,18 @@ L_10bc280:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010bc298: 0x10bc298: beq   v0, zero, 0x10bc2a8 sll   zero, zero, 0
+// 0x010bc8e0: 0x10bc8e0: beq   v0, zero, 0x10bc8f0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bc2a8
+	brfalse L_10bc8f0
 // --- basic block ---
-// 0x010bc2a0: 0x10bc2a0: addu  s8, zero, zero
+// 0x010bc8e8: 0x10bc8e8: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 16
-// 0x010bc2a4: 0x10bc2a4: addu  s0, s7, zero
+// 0x010bc8ec: 0x10bc8ec: addu  s0, s7, zero
 	ldloc 15
 	stloc 9
-L_10bc2a8:
-// 0x010bc2a8: 0x10bc2a8: lw    v0, 8(s1)
+L_10bc8f0:
+// 0x010bc8f0: 0x10bc8f0: lw    v0, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4267,22 +4267,22 @@ L_10bc2a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc2ac: 0x10bc2ac: sll   zero, zero, 0
-// 0x010bc2b0: 0x10bc2b0: slt   v1, v0, s5
+// 0x010bc8f4: 0x10bc8f4: sll   zero, zero, 0
+// 0x010bc8f8: 0x10bc8f8: slt   v1, v0, s5
 	ldloc 5
 	ldloc 13
 	clt
 	stloc 7
-// 0x010bc2b4: 0x10bc2b4: bne   v1, zero, 0x10bc2c0 sll   zero, zero, 0
+// 0x010bc8fc: 0x10bc8fc: bne   v1, zero, 0x10bc908 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10bc2c0
+	brtrue L_10bc908
 // --- basic block ---
-L_10bc2bc:
-// 0x010bc2bc: 0x10bc2bc: addu  v0, s5, zero
+L_10bc904:
+// 0x010bc904: 0x10bc904: addu  v0, s5, zero
 	ldloc 13
 	stloc 5
-L_10bc2c0:
-// 0x010bc2c0: 0x10bc2c0: lw    v1, 560(sp)
+L_10bc908:
+// 0x010bc908: 0x10bc908: lw    v1, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4291,17 +4291,17 @@ L_10bc2c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bc2c4: 0x10bc2c4: addiu s1, s1, 20
+// 0x010bc90c: 0x10bc90c: addiu s1, s1, 20
 	ldloc 8
 	ldc.i4.s 20
 	add
 	stloc 8
-// 0x010bc2c8: 0x10bc2c8: addiu v1, v1, 1
+// 0x010bc910: 0x10bc910: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010bc2cc: 0x10bc2cc: sw    v1, 560(sp)
+// 0x010bc914: 0x10bc914: sw    v1, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4310,11 +4310,11 @@ L_10bc2c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bc2d0: 0x10bc2d0: addu  s5, v0, zero
+// 0x010bc918: 0x10bc918: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-L_10bc2d4:
-// 0x010bc2d4: 0x10bc2d4: lw    a0, 560(sp)
+L_10bc91c:
+// 0x010bc91c: 0x10bc91c: lw    a0, 560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4323,7 +4323,7 @@ L_10bc2d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc2d8: 0x10bc2d8: lw    v1, 620(sp)
+// 0x010bc920: 0x10bc920: lw    v1, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4332,30 +4332,30 @@ L_10bc2d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bc2dc: 0x10bc2dc: sll   zero, zero, 0
-// 0x010bc2e0: 0x10bc2e0: slt   v0, a0, v1
+// 0x010bc924: 0x10bc924: sll   zero, zero, 0
+// 0x010bc928: 0x10bc928: slt   v0, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 5
-// 0x010bc2e4: 0x10bc2e4: bne   v0, zero, 0x10bc0e0 sll   zero, zero, 0
+// 0x010bc92c: 0x10bc92c: bne   v0, zero, 0x10bc728 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bc0e0
+	brtrue L_10bc728
 // --- basic block ---
-// 0x010bc2ec: 0x10bc2ec: beq   s8, zero, 0x10bc31c sll   zero, zero, 0
+// 0x010bc934: 0x10bc934: beq   s8, zero, 0x10bc964 sll   zero, zero, 0
 	ldloc 16
-	brfalse L_10bc31c
+	brfalse L_10bc964
 // --- basic block ---
-// 0x010bc2f4: 0x10bc2f4: lb    v0, 0(s0)
+// 0x010bc93c: 0x10bc93c: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bc2f8: 0x10bc2f8: sll   zero, zero, 0
-// 0x010bc2fc: 0x10bc2fc: bne   v0, zero, 0x10bc31c sll   zero, zero, 0
+// 0x010bc940: 0x10bc940: sll   zero, zero, 0
+// 0x010bc944: 0x10bc944: bne   v0, zero, 0x10bc964 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bc31c
+	brtrue L_10bc964
 // --- basic block ---
-// 0x010bc304: 0x10bc304: lw    a2, 12(s6)
+// 0x010bc94c: 0x10bc94c: lw    a2, 12(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -4364,7 +4364,7 @@ L_10bc2d4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bc308: 0x10bc308: lw    a0, 4(s6)
+// 0x010bc950: 0x10bc950: lw    a0, 4(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -4373,39 +4373,39 @@ L_10bc2d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc30c: 0x10bc30c: lw    a1, 0(s6)
+// 0x010bc954: 0x10bc954: lw    a1, 0(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010bc310: 0x10bc310: jal   0x10bbdf4 sll   zero, zero, 0
+// 0x010bc958: 0x10bc958: jal   0x10bc43c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::editor_segments_find_city_10bbdf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::editor_segments_find_city_10bc43c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc318: 0x10bc318: addu  s0, v0, zero
+// 0x010bc960: 0x10bc960: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_10bc31c:
-// 0x010bc31c: 0x10bc31c: lui   a0, 0x20000
+L_10bc964:
+// 0x010bc964: 0x10bc964: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc320: 0x10bc320: addiu a1, s5, -1
+// 0x010bc968: 0x10bc968: addiu a1, s5, -1
 	ldloc 13
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x010bc324: 0x10bc324: jal   0x1094734 addiu a0, a0, 22528
+// 0x010bc96c: 0x10bc96c: jal   0x1094d58 addiu a0, a0, 22988
 	ldloc.1
-	ldc.i4 22528
+	ldc.i4 22988
 	add
 	stloc.1
 	ldloc.0
@@ -4413,22 +4413,22 @@ L_10bc31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc32c: 0x10bc32c: lui   a0, 0x20000
+// 0x010bc974: 0x10bc974: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc330: 0x10bc330: addiu a1, sp, 44
+// 0x010bc978: 0x10bc978: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x010bc334: 0x10bc334: jal   0x1094770 addiu a0, a0, -18240
+// 0x010bc97c: 0x10bc97c: jal   0x1094d94 addiu a0, a0, -17776
 	ldloc.1
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
 	ldloc.0
@@ -4436,23 +4436,23 @@ L_10bc31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc33c: 0x10bc33c: lui   a0, 0x20000
+// 0x010bc984: 0x10bc984: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc340: 0x10bc340: addu  a1, s4, zero
+// 0x010bc988: 0x10bc988: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010bc344: 0x10bc344: lui   s1, 0x10000
+// 0x010bc98c: 0x10bc98c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010bc348: 0x10bc348: jal   0x1094770 addiu a0, a0, 22552
+// 0x010bc990: 0x10bc990: jal   0x1094d94 addiu a0, a0, 23012
 	ldloc.1
-	ldc.i4 22552
+	ldc.i4 23012
 	add
 	stloc.1
 	ldloc.0
@@ -4460,15 +4460,15 @@ L_10bc31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc350: 0x10bc350: addu  a1, s0, zero
+// 0x010bc998: 0x10bc998: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010bc354: 0x10bc354: jal   0x1094770 addiu a0, s1, -28756
+// 0x010bc99c: 0x10bc99c: jal   0x1094d94 addiu a0, s1, -28756
 	ldloc 8
 	ldc.i4 -28756
 	add
@@ -4478,12 +4478,12 @@ L_10bc31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc35c: 0x10bc35c: jal   0x10947dc addiu a0, s1, -28756
+// 0x010bc9a4: 0x10bc9a4: jal   0x1094e00 addiu a0, s1, -28756
 	ldloc 8
 	ldc.i4 -28756
 	add
@@ -4493,16 +4493,16 @@ L_10bc31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bc364: 0x10bc364: lw    ra, 612(sp)
-// 0x010bc368: 0x10bc368: lui   v1, 0x0
+// 0x010bc9ac: 0x10bc9ac: lw    ra, 612(sp)
+// 0x010bc9b0: 0x10bc9b0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010bc36c: 0x10bc36c: lw    s8, 608(sp)
+// 0x010bc9b4: 0x10bc9b4: lw    s8, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4511,7 +4511,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bc370: 0x10bc370: lw    s7, 604(sp)
+// 0x010bc9b8: 0x10bc9b8: lw    s7, 604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4520,7 +4520,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bc374: 0x10bc374: lw    s6, 600(sp)
+// 0x010bc9bc: 0x10bc9bc: lw    s6, 600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4529,7 +4529,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bc378: 0x10bc378: lw    s5, 596(sp)
+// 0x010bc9c0: 0x10bc9c0: lw    s5, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4538,7 +4538,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bc37c: 0x10bc37c: lw    s4, 592(sp)
+// 0x010bc9c4: 0x10bc9c4: lw    s4, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4547,7 +4547,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bc380: 0x10bc380: lw    s3, 588(sp)
+// 0x010bc9c8: 0x10bc9c8: lw    s3, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4556,7 +4556,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bc384: 0x10bc384: lw    s2, 584(sp)
+// 0x010bc9cc: 0x10bc9cc: lw    s2, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4565,7 +4565,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bc388: 0x10bc388: lw    s1, 580(sp)
+// 0x010bc9d0: 0x10bc9d0: lw    s1, 580(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4574,7 +4574,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bc38c: 0x10bc38c: lw    s0, 576(sp)
+// 0x010bc9d4: 0x10bc9d4: lw    s0, 576(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4583,7 +4583,7 @@ L_10bc31c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bc390: 0x10bc390: sw    v0, 19492(v1)
+// 0x010bc9d8: 0x10bc9d8: sw    v0, 19492(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4592,7 +4592,7 @@ L_10bc31c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bc394: 0x10bc394: jr    ra addiu sp, sp, 616
+// 0x010bc9dc: 0x10bc9dc: jr    ra addiu sp, sp, 616
 	ldloc.0
 	ldc.i4 616
 	add
@@ -4604,7 +4604,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_segments_properties_10bc39c(int32,int32,int32,int32,int32)
+.method public static int32 editor_segments_properties_10bc9e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s0,int32 s8,int32 s7,int32 s6,int32 t0,int32 lo,int32 ra)
@@ -4672,12 +4672,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bc39c: 0x10bc39c: addiu sp, sp, -200
+// 0x010bc9e4: 0x10bc9e4: addiu sp, sp, -200
 	ldloc.0
 	ldc.i4 -200
 	add
 	stloc.0
-// 0x010bc3a0: 0x10bc3a0: sw    s7, 188(sp)
+// 0x010bc9e8: 0x10bc9e8: sw    s7, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4686,13 +4686,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010bc3a4: 0x10bc3a4: addu  s7, a0, zero
+// 0x010bc9ec: 0x10bc9ec: addu  s7, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010bc3a8: 0x10bc3a8: addiu a0, zero, 8
+// 0x010bc9f0: 0x10bc9f0: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x010bc3ac: 0x10bc3ac: sw    s6, 184(sp)
+// 0x010bc9f4: 0x10bc9f4: sw    s6, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4701,7 +4701,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bc3b0: 0x10bc3b0: sw    s0, 160(sp)
+// 0x010bc9f8: 0x10bc9f8: sw    s0, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4710,11 +4710,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bc3b4: 0x10bc3b4: addu  s6, a1, zero
+// 0x010bc9fc: 0x10bc9fc: addu  s6, a1, zero
 	ldloc.2
 	stloc 16
-// 0x010bc3b8: 0x10bc3b8: sw    ra, 196(sp)
-// 0x010bc3bc: 0x10bc3bc: sw    s8, 192(sp)
+// 0x010bca00: 0x10bca00: sw    ra, 196(sp)
+// 0x010bca04: 0x10bca04: sw    s8, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4723,7 +4723,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bc3c0: 0x10bc3c0: sw    s5, 180(sp)
+// 0x010bca08: 0x10bca08: sw    s5, 180(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4732,7 +4732,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bc3c4: 0x10bc3c4: sw    s4, 176(sp)
+// 0x010bca0c: 0x10bca0c: sw    s4, 176(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4741,7 +4741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bc3c8: 0x10bc3c8: sw    s3, 172(sp)
+// 0x010bca10: 0x10bca10: sw    s3, 172(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4750,7 +4750,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bc3cc: 0x10bc3cc: sw    s2, 168(sp)
+// 0x010bca14: 0x10bca14: sw    s2, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4759,7 +4759,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bc3d0: 0x10bc3d0: jal   0x1000910 sw    s1, 164(sp)
+// 0x010bca18: 0x10bca18: jal   0x1000910 sw    s1, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4778,25 +4778,25 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc3d8: 0x10bc3d8: lui   a0, 0x20000
+// 0x010bca20: 0x10bca20: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc3dc: 0x10bc3dc: addiu a0, a0, 22568
+// 0x010bca24: 0x10bca24: addiu a0, a0, 23028
 	ldloc.1
-	ldc.i4 22568
+	ldc.i4 23028
 	add
 	stloc.1
-// 0x010bc3e0: 0x10bc3e0: addu  a1, v0, zero
+// 0x010bca28: 0x10bca28: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc3e4: 0x10bc3e4: sw    s7, 0(v0)
+// 0x010bca2c: 0x10bca2c: sw    s7, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 15
 	stelem.i4
-// 0x010bc3e8: 0x10bc3e8: sw    s6, 4(v0)
+// 0x010bca30: 0x10bca30: sw    s6, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4805,7 +4805,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bc3ec: 0x10bc3ec: jal   0x1095eec addu  s0, v0, zero
+// 0x010bca34: 0x10bca34: jal   0x1096534 addu  s0, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -4813,26 +4813,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc3f4: 0x10bc3f4: bne   v0, zero, 0x10bc948 addu  a0, s7, zero
+// 0x010bca3c: 0x10bca3c: bne   v0, zero, 0x10bcf90 addu  a0, s7, zero
 	ldloc 5
 	ldloc 15
 	stloc.1
-	brtrue L_10bc948
+	brtrue L_10bcf90
 // --- basic block ---
-// 0x010bc3fc: 0x10bc3fc: lui   s1, 0x0
+// 0x010bca44: 0x10bca44: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010bc400: 0x10bc400: addiu s1, s1, 19492
+// 0x010bca48: 0x10bca48: addiu s1, s1, 19492
 	ldloc 8
 	ldc.i4 19492
 	add
 	stloc 8
-// 0x010bc404: 0x10bc404: lw    v0, 4(s1)
+// 0x010bca4c: 0x10bca4c: lw    v0, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4841,22 +4841,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc408: 0x10bc408: sll   zero, zero, 0
-// 0x010bc40c: 0x10bc40c: lb    v0, 0(v0)
+// 0x010bca50: 0x10bca50: sll   zero, zero, 0
+// 0x010bca54: 0x10bca54: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010bc410: 0x10bc410: sll   zero, zero, 0
-// 0x010bc414: 0x10bc414: bne   v0, zero, 0x10bc42c sll   zero, zero, 0
+// 0x010bca58: 0x10bca58: sll   zero, zero, 0
+// 0x010bca5c: 0x10bca5c: bne   v0, zero, 0x10bca74 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bc42c
+	brtrue L_10bca74
 // --- basic block ---
-// 0x010bc41c: 0x10bc41c: lui   a0, 0x10000
+// 0x010bca64: 0x10bca64: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bc420: 0x10bc420: jal   0x101cd60 addiu a0, a0, -7592
+// 0x010bca68: 0x10bca68: jal   0x101cd70 addiu a0, a0, -7596
 	ldloc.1
-	ldc.i4 -7592
+	ldc.i4 -7596
 	add
 	stloc.1
 	ldloc.0
@@ -4864,12 +4864,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc428: 0x10bc428: sw    v0, 4(s1)
+// 0x010bca70: 0x10bca70: sw    v0, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4878,13 +4878,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_10bc42c:
-// 0x010bc42c: 0x10bc42c: lui   s1, 0x20000
+L_10bca74:
+// 0x010bca74: 0x10bca74: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010bc430: 0x10bc430: jal   0x101cd60 addiu a0, s1, 22568
+// 0x010bca78: 0x10bca78: jal   0x101cd70 addiu a0, s1, 23028
 	ldloc 8
-	ldc.i4 22568
+	ldc.i4 23028
 	add
 	stloc.1
 	ldloc.0
@@ -4892,23 +4892,23 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc438: 0x10bc438: addu  a1, v0, zero
+// 0x010bca80: 0x10bca80: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc43c: 0x10bc43c: addiu a0, s1, 22568
+// 0x010bca84: 0x10bca84: addiu a0, s1, 23028
 	ldloc 8
-	ldc.i4 22568
+	ldc.i4 23028
 	add
 	stloc.1
-// 0x010bc440: 0x10bc440: addu  a2, zero, zero
+// 0x010bca88: 0x10bca88: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bc444: 0x10bc444: jal   0x1095a08 addiu a3, zero, 8192
+// 0x010bca8c: 0x10bca8c: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -4916,12 +4916,12 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc44c: 0x10bc44c: sw    v0, 148(sp)
+// 0x010bca94: 0x10bca94: sw    v0, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4930,32 +4930,32 @@ L_10bc42c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bc450: 0x10bc450: lui   a0, 0x20000
+// 0x010bca98: 0x10bca98: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc454: 0x10bc454: lui   v0, 0x41000000
+// 0x010bca9c: 0x10bca9c: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x010bc458: 0x10bc458: addiu a0, a0, 7312
+// 0x010bcaa0: 0x10bcaa0: addiu a0, a0, 7776
 	ldloc.1
-	ldc.i4 7312
+	ldc.i4 7776
 	add
 	stloc.1
-// 0x010bc45c: 0x10bc45c: addu  a1, zero, zero
+// 0x010bcaa4: 0x10bcaa4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc460: 0x10bc460: addiu a2, zero, -2
+// 0x010bcaa8: 0x10bcaa8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010bc464: 0x10bc464: addiu a3, zero, -1
+// 0x010bcaac: 0x10bcaac: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc468: 0x10bc468: ori   v0, v0, 20616
+// 0x010bcab0: 0x10bcab0: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010bc46c: 0x10bc46c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010bcab4: 0x10bcab4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4969,35 +4969,35 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc474: 0x10bc474: lui   a0, 0x20000
+// 0x010bcabc: 0x10bcabc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc478: 0x10bc478: addiu a3, zero, -1
+// 0x010bcac0: 0x10bcac0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc47c: 0x10bc47c: addiu s5, zero, 136
+// 0x010bcac4: 0x10bcac4: addiu s5, zero, 136
 	ldc.i4 136
 	stloc 12
-// 0x010bc480: 0x10bc480: addiu a0, a0, 22588
+// 0x010bcac8: 0x10bcac8: addiu a0, a0, 23048
 	ldloc.1
-	ldc.i4 22588
+	ldc.i4 23048
 	add
 	stloc.1
-// 0x010bc484: 0x10bc484: addu  a1, zero, zero
+// 0x010bcacc: 0x10bcacc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc488: 0x10bc488: addiu a2, zero, -1
+// 0x010bcad0: 0x10bcad0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc48c: 0x10bc48c: addu  s1, v0, zero
+// 0x010bcad4: 0x10bcad4: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010bc490: 0x10bc490: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010bcad8: 0x10bcad8: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5011,34 +5011,34 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc498: 0x10bc498: addu  a0, v0, zero
+// 0x010bcae0: 0x10bcae0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bc49c: 0x10bc49c: addu  a1, zero, zero
+// 0x010bcae4: 0x10bcae4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc4a0: 0x10bc4a0: addu  a2, zero, zero
+// 0x010bcae8: 0x10bcae8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bc4a4: 0x10bc4a4: lui   s8, 0x10000
+// 0x010bcaec: 0x10bcaec: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010bc4a8: 0x10bc4a8: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010bcaf0: 0x10bcaf0: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bc4b0: 0x10bc4b0: jal   0x101cd60 addiu a0, s8, -900
+// 0x010bcaf8: 0x10bcaf8: jal   0x101cd70 addiu a0, s8, -904
 	ldloc 14
-	ldc.i4 -900
+	ldc.i4 -904
 	add
 	stloc.1
 	ldloc.0
@@ -5046,26 +5046,26 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc4b8: 0x10bc4b8: lui   s4, 0x20000
+// 0x010bcb00: 0x10bcb00: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x010bc4bc: 0x10bc4bc: addiu a2, zero, -1
+// 0x010bcb04: 0x10bcb04: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc4c0: 0x10bc4c0: addiu a3, zero, 4096
+// 0x010bcb08: 0x10bcb08: addiu a3, zero, 4096
 	ldc.i4 4096
 	stloc 4
-// 0x010bc4c4: 0x10bc4c4: addu  a1, v0, zero
+// 0x010bcb0c: 0x10bcb0c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc4c8: 0x10bc4c8: jal   0x1098d10 addiu a0, s4, 9016
+// 0x010bcb10: 0x10bcb10: jal   0x1099358 addiu a0, s4, 9480
 	ldloc 11
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -5073,41 +5073,41 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc4d0: 0x10bc4d0: lui   s3, 0x10000
+// 0x010bcb18: 0x10bcb18: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010bc4d4: 0x10bc4d4: addu  a0, s2, zero
+// 0x010bcb1c: 0x10bcb1c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010bc4d8: 0x10bc4d8: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010bcb20: 0x10bcb20: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc4e0: 0x10bc4e0: addiu a2, zero, -1
+// 0x010bcb28: 0x10bcb28: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc4e4: 0x10bc4e4: addu  a3, zero, zero
+// 0x010bcb2c: 0x10bcb2c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bc4e8: 0x10bc4e8: addiu a0, s8, -900
+// 0x010bcb30: 0x10bcb30: addiu a0, s8, -904
 	ldloc 14
-	ldc.i4 -900
+	ldc.i4 -904
 	add
 	stloc.1
-// 0x010bc4ec: 0x10bc4ec: jal   0x1098d10 addiu a1, s3, 18500
+// 0x010bcb34: 0x10bcb34: jal   0x1099358 addiu a1, s3, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -5115,55 +5115,55 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc4f4: 0x10bc4f4: addu  a1, v0, zero
+// 0x010bcb3c: 0x10bcb3c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc4f8: 0x10bc4f8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010bcb40: 0x10bcb40: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc500: 0x10bc500: addu  a1, s2, zero
+// 0x010bcb48: 0x10bcb48: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010bc504: 0x10bc504: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bcb4c: 0x10bcb4c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc50c: 0x10bc50c: lui   a0, 0x20000
+// 0x010bcb54: 0x10bcb54: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc510: 0x10bc510: addiu a3, zero, -1
+// 0x010bcb58: 0x10bcb58: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc514: 0x10bc514: addiu a0, a0, 22604
+// 0x010bcb5c: 0x10bcb5c: addiu a0, a0, 23064
 	ldloc.1
-	ldc.i4 22604
+	ldc.i4 23064
 	add
 	stloc.1
-// 0x010bc518: 0x10bc518: addu  a1, zero, zero
+// 0x010bcb60: 0x10bcb60: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc51c: 0x10bc51c: addiu a2, zero, -1
+// 0x010bcb64: 0x10bcb64: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc520: 0x10bc520: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010bcb68: 0x10bcb68: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5177,34 +5177,34 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc528: 0x10bc528: addu  a0, v0, zero
+// 0x010bcb70: 0x10bcb70: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bc52c: 0x10bc52c: addu  a1, zero, zero
+// 0x010bcb74: 0x10bcb74: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc530: 0x10bc530: addu  a2, zero, zero
+// 0x010bcb78: 0x10bcb78: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bc534: 0x10bc534: lui   s8, 0x10000
+// 0x010bcb7c: 0x10bcb7c: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010bc538: 0x10bc538: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010bcb80: 0x10bcb80: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bc540: 0x10bc540: jal   0x101cd60 addiu a0, s8, -14896
+// 0x010bcb88: 0x10bcb88: jal   0x101cd70 addiu a0, s8, -14900
 	ldloc 14
-	ldc.i4 -14896
+	ldc.i4 -14900
 	add
 	stloc.1
 	ldloc.0
@@ -5212,23 +5212,23 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc548: 0x10bc548: addu  a1, v0, zero
+// 0x010bcb90: 0x10bcb90: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc54c: 0x10bc54c: addiu a2, zero, -1
+// 0x010bcb94: 0x10bcb94: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc550: 0x10bc550: addiu a3, zero, 4096
+// 0x010bcb98: 0x10bcb98: addiu a3, zero, 4096
 	ldc.i4 4096
 	stloc 4
-// 0x010bc554: 0x10bc554: jal   0x1098d10 addiu a0, s4, 9016
+// 0x010bcb9c: 0x10bcb9c: jal   0x1099358 addiu a0, s4, 9480
 	ldloc 11
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -5236,38 +5236,38 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc55c: 0x10bc55c: addu  a1, v0, zero
+// 0x010bcba4: 0x10bcba4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc560: 0x10bc560: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010bcba8: 0x10bcba8: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc568: 0x10bc568: addiu a2, zero, -1
+// 0x010bcbb0: 0x10bcbb0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc56c: 0x10bc56c: addu  a3, zero, zero
+// 0x010bcbb4: 0x10bcbb4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bc570: 0x10bc570: addiu a1, s3, 18500
+// 0x010bcbb8: 0x10bcbb8: addiu a1, s3, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010bc574: 0x10bc574: jal   0x1098d10 addiu a0, s8, -14896
+// 0x010bcbbc: 0x10bcbbc: jal   0x1099358 addiu a0, s8, -14900
 	ldloc 14
-	ldc.i4 -14896
+	ldc.i4 -14900
 	add
 	stloc.1
 	ldloc.0
@@ -5275,55 +5275,55 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc57c: 0x10bc57c: addu  a1, v0, zero
+// 0x010bcbc4: 0x10bcbc4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc580: 0x10bc580: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010bcbc8: 0x10bcbc8: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc588: 0x10bc588: addu  a1, s2, zero
+// 0x010bcbd0: 0x10bcbd0: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010bc58c: 0x10bc58c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bcbd4: 0x10bcbd4: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc594: 0x10bc594: lui   a0, 0x20000
+// 0x010bcbdc: 0x10bcbdc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc598: 0x10bc598: addiu a3, zero, -1
+// 0x010bcbe0: 0x10bcbe0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc59c: 0x10bc59c: addiu a0, a0, 22616
+// 0x010bcbe4: 0x10bcbe4: addiu a0, a0, 23076
 	ldloc.1
-	ldc.i4 22616
+	ldc.i4 23076
 	add
 	stloc.1
-// 0x010bc5a0: 0x10bc5a0: addu  a1, zero, zero
+// 0x010bcbe8: 0x10bcbe8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc5a4: 0x10bc5a4: addiu a2, zero, -1
+// 0x010bcbec: 0x10bcbec: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc5a8: 0x10bc5a8: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010bcbf0: 0x10bcbf0: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5337,34 +5337,34 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc5b0: 0x10bc5b0: addu  a0, v0, zero
+// 0x010bcbf8: 0x10bcbf8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bc5b4: 0x10bc5b4: addu  a1, zero, zero
+// 0x010bcbfc: 0x10bcbfc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc5b8: 0x10bc5b8: addu  a2, zero, zero
+// 0x010bcc00: 0x10bcc00: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bc5bc: 0x10bc5bc: lui   s5, 0x10000
+// 0x010bcc04: 0x10bcc04: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x010bc5c0: 0x10bc5c0: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010bcc08: 0x10bcc08: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010bc5c8: 0x10bc5c8: jal   0x101cd60 addiu a0, s5, 31800
+// 0x010bcc10: 0x10bcc10: jal   0x101cd70 addiu a0, s5, 32264
 	ldloc 12
-	ldc.i4 31800
+	ldc.i4 32264
 	add
 	stloc.1
 	ldloc.0
@@ -5372,23 +5372,23 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc5d0: 0x10bc5d0: addu  a1, v0, zero
+// 0x010bcc18: 0x10bcc18: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc5d4: 0x10bc5d4: addiu a2, zero, -1
+// 0x010bcc1c: 0x10bcc1c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc5d8: 0x10bc5d8: addiu a3, zero, 4096
+// 0x010bcc20: 0x10bcc20: addiu a3, zero, 4096
 	ldc.i4 4096
 	stloc 4
-// 0x010bc5dc: 0x10bc5dc: jal   0x1098d10 addiu a0, s4, 9016
+// 0x010bcc24: 0x10bcc24: jal   0x1099358 addiu a0, s4, 9480
 	ldloc 11
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -5396,38 +5396,38 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc5e4: 0x10bc5e4: addu  a1, v0, zero
+// 0x010bcc2c: 0x10bcc2c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc5e8: 0x10bc5e8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010bcc30: 0x10bcc30: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc5f0: 0x10bc5f0: addiu a2, zero, -1
+// 0x010bcc38: 0x10bcc38: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc5f4: 0x10bc5f4: addiu a3, zero, 8
+// 0x010bcc3c: 0x10bcc3c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010bc5f8: 0x10bc5f8: addiu a1, s3, 18500
+// 0x010bcc40: 0x10bcc40: addiu a1, s3, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010bc5fc: 0x10bc5fc: jal   0x1098d10 addiu a0, s5, 31800
+// 0x010bcc44: 0x10bcc44: jal   0x1099358 addiu a0, s5, 32264
 	ldloc 12
-	ldc.i4 31800
+	ldc.i4 32264
 	add
 	stloc.1
 	ldloc.0
@@ -5435,53 +5435,53 @@ L_10bc42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc604: 0x10bc604: addu  a1, v0, zero
+// 0x010bcc4c: 0x10bcc4c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc608: 0x10bc608: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010bcc50: 0x10bcc50: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc610: 0x10bc610: addu  a0, s1, zero
+// 0x010bcc58: 0x10bcc58: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bc614: 0x10bc614: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010bcc5c: 0x10bcc5c: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc61c: 0x10bc61c: addiu a0, sp, 40
+// 0x010bcc64: 0x10bcc64: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010bc620: 0x10bc620: jal   0x10102dc addiu a1, sp, 36
+// 0x010bcc68: 0x10bcc68: jal   0x10102ec addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl11::roadmap_layer_get_categories_names_10102dc(int32,int32)
+	call int32 Cibyl11::roadmap_layer_get_categories_names_10102ec(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010bc628: 0x10bc628: jal   0x1000910 addiu a0, zero, 48
+// 0x010bcc70: 0x10bcc70: jal   0x1000910 addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
 	ldloc.0
@@ -5494,10 +5494,10 @@ L_10bc42c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc630: 0x10bc630: lui   s3, 0xe0000
+// 0x010bcc78: 0x10bcc78: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010bc634: 0x10bc634: sw    v0, 144(sp)
+// 0x010bcc7c: 0x10bcc7c: sw    v0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5506,7 +5506,7 @@ L_10bc42c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bc638: 0x10bc638: sw    zero, 36(sp)
+// 0x010bcc80: 0x10bcc80: sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5515,22 +5515,22 @@ L_10bc42c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bc63c: 0x10bc63c: j	 0x10bc670 addiu s3, s3, -17240
+// 0x010bcc84: 0x10bcc84: j	 0x10bccb8 addiu s3, s3, -16776
 	ldloc 10
-	ldc.i4 -17240
+	ldc.i4 -16776
 	add
 	stloc 10
-	br L_10bc670
+	br L_10bccb8
 // --- basic block ---
-L_10bc644:
-// 0x010bc644: 0x10bc644: sw    v0, 0(a0)
+L_10bcc8c:
+// 0x010bcc8c: 0x10bcc8c: sw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bc648: 0x10bc648: lw    v0, 40(sp)
+// 0x010bcc90: 0x10bcc90: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5539,20 +5539,20 @@ L_10bc644:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc64c: 0x10bc64c: sll   zero, zero, 0
-// 0x010bc650: 0x10bc650: addu  v0, v0, s2
+// 0x010bcc94: 0x10bcc94: sll   zero, zero, 0
+// 0x010bcc98: 0x10bcc98: addu  v0, v0, s2
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x010bc654: 0x10bc654: lw    a0, 0(v0)
+// 0x010bcc9c: 0x10bcc9c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bc658: 0x10bc658: jal   0x101cd60 addu  s2, s2, s3
+// 0x010bcca0: 0x10bcca0: jal   0x101cd70 addu  s2, s2, s3
 	ldloc 9
 	ldloc 10
 	add
@@ -5562,12 +5562,12 @@ L_10bc644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc660: 0x10bc660: lw    v1, 36(sp)
+// 0x010bcca8: 0x10bcca8: lw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5576,19 +5576,19 @@ L_10bc644:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bc664: 0x10bc664: sw    v0, 0(s2)
+// 0x010bccac: 0x10bccac: sw    v0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bc668: 0x10bc668: addiu v1, v1, 1
+// 0x010bccb0: 0x10bccb0: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010bc66c: 0x10bc66c: sw    v1, 36(sp)
+// 0x010bccb4: 0x10bccb4: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5597,8 +5597,8 @@ L_10bc644:
 	add
 	ldloc 6
 	stelem.i4
-L_10bc670:
-// 0x010bc670: 0x10bc670: lw    v0, 36(sp)
+L_10bccb8:
+// 0x010bccb8: 0x10bccb8: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5607,7 +5607,7 @@ L_10bc670:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc674: 0x10bc674: lw    v1, 144(sp)
+// 0x010bccbc: 0x10bccbc: lw    v1, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5616,48 +5616,48 @@ L_10bc670:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bc678: 0x10bc678: sll   s2, v0, 2
+// 0x010bccc0: 0x10bccc0: sll   s2, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x010bc67c: 0x10bc67c: addu  a0, v1, s2
+// 0x010bccc4: 0x10bccc4: addu  a0, v1, s2
 	ldloc 6
 	ldloc 9
 	add
 	stloc.1
-// 0x010bc680: 0x10bc680: slti  v1, v0, 11
+// 0x010bccc8: 0x10bccc8: slti  v1, v0, 11
 	ldloc 5
 	ldc.i4.s 11
 	clt
 	stloc 6
-// 0x010bc684: 0x10bc684: bne   v1, zero, 0x10bc644 lui   s5, 0x20000
+// 0x010bcccc: 0x10bcccc: bne   v1, zero, 0x10bcc8c lui   s5, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 12
-	brtrue L_10bc644
+	brtrue L_10bcc8c
 // --- basic block ---
-// 0x010bc68c: 0x10bc68c: lui   a0, 0x20000
+// 0x010bccd4: 0x10bccd4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc690: 0x10bc690: addiu s3, zero, 136
+// 0x010bccd8: 0x10bccd8: addiu s3, zero, 136
 	ldc.i4 136
 	stloc 10
-// 0x010bc694: 0x10bc694: addu  a1, zero, zero
+// 0x010bccdc: 0x10bccdc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc698: 0x10bc698: addiu a2, zero, -1
+// 0x010bcce0: 0x10bcce0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc69c: 0x10bc69c: addiu a3, zero, -1
+// 0x010bcce4: 0x10bcce4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc6a0: 0x10bc6a0: addiu a0, a0, 22628
+// 0x010bcce8: 0x10bcce8: addiu a0, a0, 23088
 	ldloc.1
-	ldc.i4 22628
+	ldc.i4 23088
 	add
 	stloc.1
-// 0x010bc6a4: 0x10bc6a4: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010bccec: 0x10bccec: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5671,20 +5671,20 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc6ac: 0x10bc6ac: addiu a0, s5, 22528
+// 0x010bccf4: 0x10bccf4: addiu a0, s5, 22988
 	ldloc 12
-	ldc.i4 22528
+	ldc.i4 22988
 	add
 	stloc.1
-// 0x010bc6b0: 0x10bc6b0: addu  s4, v0, zero
+// 0x010bccf8: 0x10bccf8: addu  s4, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010bc6b4: 0x10bc6b4: jal   0x101cd60 lui   s2, 0x20000
+// 0x010bccfc: 0x10bccfc: jal   0x101cd70 lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.0
@@ -5692,23 +5692,23 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc6bc: 0x10bc6bc: addu  a1, v0, zero
+// 0x010bcd04: 0x10bcd04: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc6c0: 0x10bc6c0: addiu a2, zero, -1
+// 0x010bcd08: 0x10bcd08: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc6c4: 0x10bc6c4: addiu a3, zero, 4112
+// 0x010bcd0c: 0x10bcd0c: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010bc6c8: 0x10bc6c8: jal   0x1098d10 addiu a0, s2, 9016
+// 0x010bcd10: 0x10bcd10: jal   0x1099358 addiu a0, s2, 9480
 	ldloc 9
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -5716,27 +5716,27 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc6d0: 0x10bc6d0: addu  a1, v0, zero
+// 0x010bcd18: 0x10bcd18: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc6d4: 0x10bc6d4: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010bcd1c: 0x10bcd1c: jal   0x109950c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc6dc: 0x10bc6dc: jal   0x101cd60 addiu a0, s5, 22528
+// 0x010bcd24: 0x10bcd24: jal   0x101cd70 addiu a0, s5, 22988
 	ldloc 12
-	ldc.i4 22528
+	ldc.i4 22988
 	add
 	stloc.1
 	ldloc.0
@@ -5744,18 +5744,18 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc6e4: 0x10bc6e4: addu  a1, v0, zero
+// 0x010bcd2c: 0x10bcd2c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc6e8: 0x10bc6e8: lui   a3, 0xe0000
+// 0x010bcd30: 0x10bcd30: lui   a3, 0xe0000
 	ldc.i4 917504
 	stloc 4
-// 0x010bc6ec: 0x10bc6ec: lw    v0, 144(sp)
+// 0x010bcd34: 0x10bcd34: lw    v0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5764,23 +5764,23 @@ L_10bc670:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc6f0: 0x10bc6f0: addiu a3, a3, -17240
+// 0x010bcd38: 0x10bcd38: addiu a3, a3, -16776
 	ldloc 4
-	ldc.i4 -17240
+	ldc.i4 -16776
 	add
 	stloc 4
-// 0x010bc6f4: 0x10bc6f4: addiu a2, zero, 11
+// 0x010bcd3c: 0x10bcd3c: addiu a2, zero, 11
 	ldc.i4.s 11
 	stloc.3
-// 0x010bc6f8: 0x10bc6f8: addiu a0, s5, 22528
+// 0x010bcd40: 0x10bcd40: addiu a0, s5, 22988
 	ldloc 12
-	ldc.i4 22528
+	ldc.i4 22988
 	add
 	stloc.1
-// 0x010bc6fc: 0x10bc6fc: addiu s8, zero, 24
+// 0x010bcd44: 0x10bcd44: addiu s8, zero, 24
 	ldc.i4.s 24
 	stloc 14
-// 0x010bc700: 0x10bc700: sw    v0, 16(sp)
+// 0x010bcd48: 0x10bcd48: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5789,7 +5789,7 @@ L_10bc670:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bc704: 0x10bc704: sw    s8, 20(sp)
+// 0x010bcd4c: 0x10bcd4c: sw    s8, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5798,7 +5798,7 @@ L_10bc670:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bc708: 0x10bc708: jal   0x10929e0 sw    zero, 24(sp)
+// 0x010bcd50: 0x10bcd50: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5812,55 +5812,55 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc710: 0x10bc710: addu  a1, v0, zero
+// 0x010bcd58: 0x10bcd58: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc714: 0x10bc714: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010bcd5c: 0x10bcd5c: jal   0x109950c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc71c: 0x10bc71c: addu  a1, s4, zero
+// 0x010bcd64: 0x10bcd64: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x010bc720: 0x10bc720: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bcd68: 0x10bcd68: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc728: 0x10bc728: lui   a0, 0x10000
+// 0x010bcd70: 0x10bcd70: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bc72c: 0x10bc72c: addu  a1, zero, zero
+// 0x010bcd74: 0x10bcd74: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc730: 0x10bc730: addiu a2, zero, -1
+// 0x010bcd78: 0x10bcd78: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc734: 0x10bc734: addiu a3, zero, -1
+// 0x010bcd7c: 0x10bcd7c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc738: 0x10bc738: addiu a0, a0, -27724
+// 0x010bcd80: 0x10bcd80: addiu a0, a0, -27724
 	ldloc.1
 	ldc.i4 -27724
 	add
 	stloc.1
-// 0x010bc73c: 0x10bc73c: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010bcd84: 0x10bcd84: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5874,20 +5874,20 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc744: 0x10bc744: lui   v1, 0x20000
+// 0x010bcd8c: 0x10bcd8c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010bc748: 0x10bc748: addiu a0, v1, -18240
+// 0x010bcd90: 0x10bcd90: addiu a0, v1, -17776
 	ldloc 6
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
-// 0x010bc74c: 0x10bc74c: jal   0x101cd60 addu  s5, v0, zero
+// 0x010bcd94: 0x10bcd94: jal   0x101cd70 addu  s5, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -5895,23 +5895,23 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc754: 0x10bc754: addu  a1, v0, zero
+// 0x010bcd9c: 0x10bcd9c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc758: 0x10bc758: addiu a2, zero, -1
+// 0x010bcda0: 0x10bcda0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc75c: 0x10bc75c: addiu a3, zero, 4112
+// 0x010bcda4: 0x10bcda4: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010bc760: 0x10bc760: jal   0x1098d10 addiu a0, s2, 9016
+// 0x010bcda8: 0x10bcda8: jal   0x1099358 addiu a0, s2, 9480
 	ldloc 9
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -5919,56 +5919,56 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc768: 0x10bc768: addu  a1, v0, zero
+// 0x010bcdb0: 0x10bcdb0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc76c: 0x10bc76c: addu  a0, s5, zero
+// 0x010bcdb4: 0x10bcdb4: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x010bc770: 0x10bc770: jal   0x1098ec4 lui   s4, 0x10000
+// 0x010bcdb8: 0x10bcdb8: jal   0x109950c lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 11
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc778: 0x10bc778: addiu s4, s4, 18500
+// 0x010bcdc0: 0x10bcdc0: addiu s4, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 11
-// 0x010bc77c: 0x10bc77c: lui   a1, 0x20000
+// 0x010bcdc4: 0x10bcdc4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bc780: 0x10bc780: addiu t0, zero, 180
+// 0x010bcdc8: 0x10bcdc8: addiu t0, zero, 180
 	ldc.i4 180
 	stloc 17
-// 0x010bc784: 0x10bc784: addiu v1, zero, -1
+// 0x010bcdcc: 0x10bcdcc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010bc788: 0x10bc788: addiu a2, zero, 16
+// 0x010bcdd0: 0x10bcdd0: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010bc78c: 0x10bc78c: addu  a3, zero, zero
+// 0x010bcdd4: 0x10bcdd4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bc790: 0x10bc790: addiu a0, a1, -18240
+// 0x010bcdd8: 0x10bcdd8: addiu a0, a1, -17776
 	ldloc.2
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
-// 0x010bc794: 0x10bc794: addu  a1, s4, zero
+// 0x010bcddc: 0x10bcddc: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x010bc798: 0x10bc798: sw    t0, 16(sp)
+// 0x010bcde0: 0x10bcde0: sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5977,7 +5977,7 @@ L_10bc670:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010bc79c: 0x10bc79c: sw    v1, 20(sp)
+// 0x010bcde4: 0x10bcde4: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5986,7 +5986,7 @@ L_10bc670:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bc7a0: 0x10bc7a0: sw    v1, 156(sp)
+// 0x010bcde8: 0x10bcde8: sw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5995,7 +5995,7 @@ L_10bc670:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bc7a4: 0x10bc7a4: sw    t0, 152(sp)
+// 0x010bcdec: 0x10bcdec: sw    t0, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6004,7 +6004,7 @@ L_10bc670:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010bc7a8: 0x10bc7a8: jal   0x109683c sw    s4, 24(sp)
+// 0x010bcdf0: 0x10bcdf0: jal   0x1096e84 sw    s4, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6018,55 +6018,55 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc7b0: 0x10bc7b0: addu  a1, v0, zero
+// 0x010bcdf8: 0x10bcdf8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc7b4: 0x10bc7b4: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010bcdfc: 0x10bcdfc: jal   0x109950c addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc7bc: 0x10bc7bc: addu  a1, s5, zero
+// 0x010bce04: 0x10bce04: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x010bc7c0: 0x10bc7c0: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bce08: 0x10bce08: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc7c8: 0x10bc7c8: lui   a0, 0x20000
+// 0x010bce10: 0x10bce10: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc7cc: 0x10bc7cc: addu  a1, zero, zero
+// 0x010bce14: 0x10bce14: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc7d0: 0x10bc7d0: addiu a2, zero, -1
+// 0x010bce18: 0x10bce18: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc7d4: 0x10bc7d4: addiu a3, zero, -1
+// 0x010bce1c: 0x10bce1c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc7d8: 0x10bc7d8: addiu a0, a0, 22644
+// 0x010bce20: 0x10bce20: addiu a0, a0, 23104
 	ldloc.1
-	ldc.i4 22644
+	ldc.i4 23104
 	add
 	stloc.1
-// 0x010bc7dc: 0x10bc7dc: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010bce24: 0x10bce24: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6080,20 +6080,20 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc7e4: 0x10bc7e4: addu  s5, v0, zero
+// 0x010bce2c: 0x10bce2c: addu  s5, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010bc7e8: 0x10bc7e8: lui   v0, 0x20000
+// 0x010bce30: 0x10bce30: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bc7ec: 0x10bc7ec: jal   0x101cd60 addiu a0, v0, 22552
+// 0x010bce34: 0x10bce34: jal   0x101cd70 addiu a0, v0, 23012
 	ldloc 5
-	ldc.i4 22552
+	ldc.i4 23012
 	add
 	stloc.1
 	ldloc.0
@@ -6101,23 +6101,23 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc7f4: 0x10bc7f4: addu  a1, v0, zero
+// 0x010bce3c: 0x10bce3c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc7f8: 0x10bc7f8: addiu a2, zero, -1
+// 0x010bce40: 0x10bce40: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc7fc: 0x10bc7fc: addiu a3, zero, 4112
+// 0x010bce44: 0x10bce44: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010bc800: 0x10bc800: jal   0x1098d10 addiu a0, s2, 9016
+// 0x010bce48: 0x10bce48: jal   0x1099358 addiu a0, s2, 9480
 	ldloc 9
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -6125,25 +6125,25 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc808: 0x10bc808: addu  a1, v0, zero
+// 0x010bce50: 0x10bce50: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc80c: 0x10bc80c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010bce54: 0x10bce54: jal   0x109950c addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc814: 0x10bc814: lw    t0, 152(sp)
+// 0x010bce5c: 0x10bce5c: lw    t0, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6152,7 +6152,7 @@ L_10bc670:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bc818: 0x10bc818: lw    v1, 156(sp)
+// 0x010bce60: 0x10bce60: lw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6161,24 +6161,24 @@ L_10bc670:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bc81c: 0x10bc81c: lui   a1, 0x20000
+// 0x010bce64: 0x10bce64: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bc820: 0x10bc820: addiu a2, zero, 16
+// 0x010bce68: 0x10bce68: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010bc824: 0x10bc824: addu  a3, zero, zero
+// 0x010bce6c: 0x10bce6c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bc828: 0x10bc828: addiu a0, a1, 22552
+// 0x010bce70: 0x10bce70: addiu a0, a1, 23012
 	ldloc.2
-	ldc.i4 22552
+	ldc.i4 23012
 	add
 	stloc.1
-// 0x010bc82c: 0x10bc82c: addu  a1, s4, zero
+// 0x010bce74: 0x10bce74: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x010bc830: 0x10bc830: sw    t0, 16(sp)
+// 0x010bce78: 0x10bce78: sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6187,7 +6187,7 @@ L_10bc670:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010bc834: 0x10bc834: sw    v1, 20(sp)
+// 0x010bce7c: 0x10bce7c: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6196,7 +6196,7 @@ L_10bc670:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bc838: 0x10bc838: jal   0x109683c sw    s4, 24(sp)
+// 0x010bce80: 0x10bce80: jal   0x1096e84 sw    s4, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6210,58 +6210,58 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc840: 0x10bc840: addu  a1, v0, zero
+// 0x010bce88: 0x10bce88: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc844: 0x10bc844: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010bce8c: 0x10bce8c: jal   0x109950c addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc84c: 0x10bc84c: addu  a0, s1, zero
+// 0x010bce94: 0x10bce94: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bc850: 0x10bc850: jal   0x1098ec4 addu  a1, s5, zero
+// 0x010bce98: 0x10bce98: jal   0x109950c addu  a1, s5, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc858: 0x10bc858: lui   a0, 0x20000
+// 0x010bcea0: 0x10bcea0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc85c: 0x10bc85c: addu  a1, zero, zero
+// 0x010bcea4: 0x10bcea4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bc860: 0x10bc860: addiu a2, zero, -1
+// 0x010bcea8: 0x10bcea8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc864: 0x10bc864: addiu a3, zero, -1
+// 0x010bceac: 0x10bceac: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010bc868: 0x10bc868: lui   s4, 0x10000
+// 0x010bceb0: 0x10bceb0: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x010bc86c: 0x10bc86c: addiu a0, a0, 22668
+// 0x010bceb4: 0x10bceb4: addiu a0, a0, 23128
 	ldloc.1
-	ldc.i4 22668
+	ldc.i4 23128
 	add
 	stloc.1
-// 0x010bc870: 0x10bc870: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010bceb8: 0x10bceb8: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6275,17 +6275,17 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc878: 0x10bc878: addiu a0, s4, -28756
+// 0x010bcec0: 0x10bcec0: addiu a0, s4, -28756
 	ldloc 11
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010bc87c: 0x10bc87c: jal   0x101cd60 addu  s3, v0, zero
+// 0x010bcec4: 0x10bcec4: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -6293,23 +6293,23 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc884: 0x10bc884: addu  a1, v0, zero
+// 0x010bcecc: 0x10bcecc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc888: 0x10bc888: addiu a2, zero, -1
+// 0x010bced0: 0x10bced0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010bc88c: 0x10bc88c: addiu a3, zero, 4112
+// 0x010bced4: 0x10bced4: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010bc890: 0x10bc890: jal   0x1098d10 addiu a0, s2, 9016
+// 0x010bced8: 0x10bced8: jal   0x1099358 addiu a0, s2, 9480
 	ldloc 9
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -6317,25 +6317,25 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc898: 0x10bc898: addu  a1, v0, zero
+// 0x010bcee0: 0x10bcee0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc89c: 0x10bc89c: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010bcee4: 0x10bcee4: jal   0x109950c addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc8a4: 0x10bc8a4: jal   0x101cd60 addiu a0, s4, -28756
+// 0x010bceec: 0x10bceec: jal   0x101cd70 addiu a0, s4, -28756
 	ldloc 11
 	ldc.i4 -28756
 	add
@@ -6345,42 +6345,42 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc8ac: 0x10bc8ac: lui   v1, 0x0
+// 0x010bcef4: 0x10bcef4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010bc8b0: 0x10bc8b0: addiu v1, v1, 19492
+// 0x010bcef8: 0x10bcef8: addiu v1, v1, 19492
 	ldloc 6
 	ldc.i4 19492
 	add
 	stloc 6
-// 0x010bc8b4: 0x10bc8b4: addu  a1, v0, zero
+// 0x010bcefc: 0x10bcefc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc8b8: 0x10bc8b8: lui   v0, 0x10c0000
+// 0x010bcf00: 0x10bcf00: lui   v0, 0x10c0000
 	ldc.i4 17563648
 	stloc 5
-// 0x010bc8bc: 0x10bc8bc: addu  a3, v1, zero
+// 0x010bcf04: 0x10bcf04: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010bc8c0: 0x10bc8c0: addiu a2, zero, 3
+// 0x010bcf08: 0x10bcf08: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x010bc8c4: 0x10bc8c4: addiu a0, s4, -28756
+// 0x010bcf0c: 0x10bcf0c: addiu a0, s4, -28756
 	ldloc 11
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010bc8c8: 0x10bc8c8: addiu v0, v0, -17364
+// 0x010bcf10: 0x10bcf10: addiu v0, v0, -15756
 	ldloc 5
-	ldc.i4 -17364
+	ldc.i4 -15756
 	add
 	stloc 5
-// 0x010bc8cc: 0x10bc8cc: sw    v1, 16(sp)
+// 0x010bcf14: 0x10bcf14: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6389,7 +6389,7 @@ L_10bc670:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bc8d0: 0x10bc8d0: sw    s8, 20(sp)
+// 0x010bcf18: 0x10bcf18: sw    s8, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6398,7 +6398,7 @@ L_10bc670:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bc8d4: 0x10bc8d4: jal   0x10929e0 sw    v0, 24(sp)
+// 0x010bcf1c: 0x10bcf1c: jal   0x1093004 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6412,41 +6412,41 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc8dc: 0x10bc8dc: addu  a1, v0, zero
+// 0x010bcf24: 0x10bcf24: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc8e0: 0x10bc8e0: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010bcf28: 0x10bcf28: jal   0x109950c addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc8e8: 0x10bc8e8: addu  a1, s3, zero
+// 0x010bcf30: 0x10bcf30: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x010bc8ec: 0x10bc8ec: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bcf34: 0x10bcf34: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc8f4: 0x10bc8f4: lui   a0, 0x0
+// 0x010bcf3c: 0x10bcf3c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bc8f8: 0x10bc8f8: jal   0x101cd60 addiu a0, a0, 32524
+// 0x010bcf40: 0x10bcf40: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -6456,31 +6456,31 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc900: 0x10bc900: lui   a3, 0x10c0000
+// 0x010bcf48: 0x10bcf48: lui   a3, 0x10c0000
 	ldc.i4 17563648
 	stloc 4
-// 0x010bc904: 0x10bc904: lui   a0, 0x0
+// 0x010bcf4c: 0x10bcf4c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bc908: 0x10bc908: addiu a3, a3, -17348
+// 0x010bcf50: 0x10bcf50: addiu a3, a3, -15740
 	ldloc 4
-	ldc.i4 -17348
+	ldc.i4 -15740
 	add
 	stloc 4
-// 0x010bc90c: 0x10bc90c: addiu a2, zero, 5
+// 0x010bcf54: 0x10bcf54: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x010bc910: 0x10bc910: addiu a0, a0, 32528
+// 0x010bcf58: 0x10bcf58: addiu a0, a0, 32528
 	ldloc.1
 	ldc.i4 32528
 	add
 	stloc.1
-// 0x010bc914: 0x10bc914: jal   0x1091088 addu  a1, v0, zero
+// 0x010bcf5c: 0x10bcf5c: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6488,25 +6488,25 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc91c: 0x10bc91c: addu  a1, v0, zero
+// 0x010bcf64: 0x10bcf64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bc920: 0x10bc920: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010bcf68: 0x10bcf68: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc928: 0x10bc928: lw    a0, 148(sp)
+// 0x010bcf70: 0x10bcf70: lw    a0, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6515,25 +6515,25 @@ L_10bc670:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc92c: 0x10bc92c: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010bcf74: 0x10bcf74: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc934: 0x10bc934: lui   a0, 0x20000
+// 0x010bcf7c: 0x10bcf7c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bc938: 0x10bc938: addiu a0, a0, 22568
+// 0x010bcf80: 0x10bcf80: addiu a0, a0, 23028
 	ldloc.1
-	ldc.i4 22568
+	ldc.i4 23028
 	add
 	stloc.1
-// 0x010bc93c: 0x10bc93c: jal   0x1095eec addu  a1, s0, zero
+// 0x010bcf84: 0x10bcf84: jal   0x1096534 addu  a1, s0, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -6541,16 +6541,16 @@ L_10bc670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc944: 0x10bc944: addu  a0, s7, zero
+// 0x010bcf8c: 0x10bcf8c: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-L_10bc948:
-// 0x010bc948: 0x10bc948: jal   0x10bc070 addu  a1, s6, zero
+L_10bcf90:
+// 0x010bcf90: 0x10bcf90: jal   0x10bc6b8 addu  a1, s6, zero
 	ldloc 16
 	stloc.2
 	ldloc.0
@@ -6558,36 +6558,36 @@ L_10bc948:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::editor_segments_fill_dialog_10bc070(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::editor_segments_fill_dialog_10bc6b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc950: 0x10bc950: addu  s3, zero, zero
+// 0x010bcf98: 0x10bcf98: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010bc954: 0x10bc954: addu  s1, zero, zero
+// 0x010bcf9c: 0x10bcf9c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010bc958: 0x10bc958: addu  s2, zero, zero
+// 0x010bcfa0: 0x10bcfa0: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010bc95c: 0x10bc95c: addiu s8, zero, 20
+// 0x010bcfa4: 0x10bcfa4: addiu s8, zero, 20
 	ldc.i4.s 20
 	stloc 14
-// 0x010bc960: 0x10bc960: lui   s7, 0x0
+// 0x010bcfa8: 0x10bcfa8: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x010bc964: 0x10bc964: lui   s6, 0x0
+// 0x010bcfac: 0x10bcfac: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x010bc968: 0x10bc968: j	 0x10bcac0 addiu s5, zero, -1
+// 0x010bcfb0: 0x10bcfb0: j	 0x10bd108 addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 12
-	br L_10bcac0
+	br L_10bd108
 // --- basic block ---
-L_10bc970:
-// 0x010bc970: 0x10bc970: lw    a0, 18812(s7)
+L_10bcfb8:
+// 0x010bcfb8: 0x10bcfb8: lw    a0, 18812(s7)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -6596,28 +6596,28 @@ L_10bc970:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc974: 0x10bc974: mflo  lo
+// 0x010bcfbc: 0x10bcfbc: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x010bc978: 0x10bc978: addu  v1, v0, v1
+// 0x010bcfc0: 0x10bcfc0: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x010bc97c: 0x10bc97c: lw    v0, 0(v1)
+// 0x010bcfc4: 0x10bcfc4: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bc980: 0x10bc980: sll   zero, zero, 0
-// 0x010bc984: 0x10bc984: bne   v0, a0, 0x10bc9b4 sll   zero, zero, 0
+// 0x010bcfc8: 0x10bcfc8: sll   zero, zero, 0
+// 0x010bcfcc: 0x10bcfcc: bne   v0, a0, 0x10bcffc sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_10bc9b4
+	bne.un L_10bcffc
 // --- basic block ---
-// 0x010bc98c: 0x10bc98c: lw    a0, 4(v1)
+// 0x010bcfd4: 0x10bcfd4: lw    a0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6626,7 +6626,7 @@ L_10bc970:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc990: 0x10bc990: jal   0x10b6180 sw    v1, 156(sp)
+// 0x010bcfd8: 0x10bcfd8: jal   0x10b67c8 sw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6640,12 +6640,12 @@ L_10bc970:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_length_10b6180(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_length_10b67c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc998: 0x10bc998: lw    v1, 156(sp)
+// 0x010bcfe0: 0x10bcfe0: lw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6654,10 +6654,10 @@ L_10bc970:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bc99c: 0x10bc99c: addiu a1, zero, 1
+// 0x010bcfe4: 0x10bcfe4: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010bc9a0: 0x10bc9a0: lw    a0, 4(v1)
+// 0x010bcfe8: 0x10bcfe8: lw    a0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6666,7 +6666,7 @@ L_10bc970:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc9a4: 0x10bc9a4: jal   0x10b6128 addu  s4, v0, zero
+// 0x010bcfec: 0x10bcfec: jal   0x10b6770 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -6674,16 +6674,16 @@ L_10bc970:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_cross_time_10b6128(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_cross_time_10b6770(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc9ac: 0x10bc9ac: j	 0x10bca14 sll   zero, zero, 0
-	br L_10bca14
+// 0x010bcff4: 0x10bcff4: j	 0x10bd05c sll   zero, zero, 0
+	br L_10bd05c
 // --- basic block ---
-L_10bc9b4:
-// 0x010bc9b4: 0x10bc9b4: lw    a0, 12(v1)
+L_10bcffc:
+// 0x010bcffc: 0x10bcffc: lw    a0, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6692,7 +6692,7 @@ L_10bc9b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc9b8: 0x10bc9b8: lw    v0, 576(s6)
+// 0x010bd000: 0x10bd000: lw    v0, 576(s6)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -6701,18 +6701,18 @@ L_10bc9b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bc9bc: 0x10bc9bc: sll   zero, zero, 0
-// 0x010bc9c0: 0x10bc9c0: beq   a0, v0, 0x10bc9e0 sll   zero, zero, 0
+// 0x010bd004: 0x10bd004: sll   zero, zero, 0
+// 0x010bd008: 0x10bd008: beq   a0, v0, 0x10bd028 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10bc9e0
+	beq  L_10bd028
 // --- basic block ---
-// 0x010bc9c8: 0x10bc9c8: bltz  a0, 0x10bc9e0 sll   zero, zero, 0
+// 0x010bd010: 0x10bd010: bltz  a0, 0x10bd028 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bc9e0
+	blt L_10bd028
 // --- basic block ---
-// 0x010bc9d0: 0x10bc9d0: jal   0x100b164 sw    v1, 156(sp)
+// 0x010bd018: 0x10bd018: jal   0x100b174 sw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6726,12 +6726,12 @@ L_10bc9b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc9d8: 0x10bc9d8: lw    v1, 156(sp)
+// 0x010bd020: 0x10bd020: lw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6740,9 +6740,9 @@ L_10bc9b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bc9dc: 0x10bc9dc: sll   zero, zero, 0
-L_10bc9e0:
-// 0x010bc9e0: 0x10bc9e0: lw    a0, 4(v1)
+// 0x010bd024: 0x10bd024: sll   zero, zero, 0
+L_10bd028:
+// 0x010bd028: 0x10bd028: lw    a0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6751,7 +6751,7 @@ L_10bc9e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc9e4: 0x10bc9e4: jal   0x100405c sw    v1, 156(sp)
+// 0x010bd02c: 0x10bd02c: jal   0x100405c sw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6770,7 +6770,7 @@ L_10bc9e0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bc9ec: 0x10bc9ec: lw    v1, 156(sp)
+// 0x010bd034: 0x10bd034: lw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6779,12 +6779,12 @@ L_10bc9e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bc9f0: 0x10bc9f0: addiu a1, sp, 32
+// 0x010bd038: 0x10bd038: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010bc9f4: 0x10bc9f4: lw    a0, 4(v1)
+// 0x010bd03c: 0x10bd03c: lw    a0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6793,12 +6793,12 @@ L_10bc9e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bc9f8: 0x10bc9f8: addiu a2, sp, 34
+// 0x010bd040: 0x10bd040: addiu a2, sp, 34
 	ldloc.0
 	ldc.i4.s 34
 	add
 	stloc.3
-// 0x010bc9fc: 0x10bc9fc: jal   0x10055c0 addu  s4, v0, zero
+// 0x010bd044: 0x10bd044: jal   0x10055d0 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -6806,70 +6806,70 @@ L_10bc9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_line_speed_get_cross_times_10055c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_line_speed_get_cross_times_10055d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bca04: 0x10bca04: beq   v0, s5, 0x10bca20 sll   zero, zero, 0
+// 0x010bd04c: 0x10bd04c: beq   v0, s5, 0x10bd068 sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	beq  L_10bca20
+	beq  L_10bd068
 // --- basic block ---
-// 0x010bca0c: 0x10bca0c: lhu   v0, 32(sp)
+// 0x010bd054: 0x10bd054: lhu   v0, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010bca10: 0x10bca10: sll   zero, zero, 0
-L_10bca14:
-// 0x010bca14: 0x10bca14: bgtz  v0, 0x10bcab8 addu  s1, s1, v0
+// 0x010bd058: 0x10bd058: sll   zero, zero, 0
+L_10bd05c:
+// 0x010bd05c: 0x10bd05c: bgtz  v0, 0x10bd100 addu  s1, s1, v0
 	ldloc 5
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
 	ldc.i4.s 0
-	bgt L_10bcab8
+	bgt L_10bd100
 // --- basic block ---
-// 0x010bca1c: 0x10bca1c: subu  s1, s1, v0
+// 0x010bd064: 0x10bd064: subu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-L_10bca20:
-// 0x010bca20: 0x10bca20: beq   s1, zero, 0x10bca30 sll   zero, zero, 0
+L_10bd068:
+// 0x010bd068: 0x10bd068: beq   s1, zero, 0x10bd078 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10bca30
+	brfalse L_10bd078
 // --- basic block ---
-// 0x010bca28: 0x10bca28: bne   s2, zero, 0x10bca68 sll   zero, zero, 0
+// 0x010bd070: 0x10bd070: bne   s2, zero, 0x10bd0b0 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10bca68
+	brtrue L_10bd0b0
 // --- basic block ---
-L_10bca30:
-// 0x010bca30: 0x10bca30: jal   0x10c09c0 addu  a0, s4, zero
+L_10bd078:
+// 0x010bd078: 0x10bd078: jal   0x10c1000 addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bca38: 0x10bca38: addu  a0, v0, zero
+// 0x010bd080: 0x10bd080: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bca3c: 0x10bca3c: lui   v0, 0x20000
+// 0x010bd084: 0x10bd084: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bca40: 0x10bca40: addiu v0, v0, 23736
+// 0x010bd088: 0x10bd088: addiu v0, v0, 24200
 	ldloc 5
-	ldc.i4 23736
+	ldc.i4 24200
 	add
 	stloc 5
-// 0x010bca44: 0x10bca44: lw    a3, 4(v0)
+// 0x010bd08c: 0x10bd08c: lw    a3, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6878,14 +6878,14 @@ L_10bca30:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bca48: 0x10bca48: lw    a2, 0(v0)
+// 0x010bd090: 0x10bd090: lw    a2, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010bca4c: 0x10bca4c: jal   0x10c0798 addu  a1, v1, zero
+// 0x010bd094: 0x10bd094: jal   0x10c0dd8 addu  a1, v1, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -6893,52 +6893,52 @@ L_10bca30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bca54: 0x10bca54: addu  a1, v1, zero
+// 0x010bd09c: 0x10bd09c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010bca58: 0x10bca58: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010bd0a0: 0x10bd0a0: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bca60: 0x10bca60: j	 0x10bcab8 addu  s1, s1, v0
+// 0x010bd0a8: 0x10bd0a8: j	 0x10bd100 addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-	br L_10bcab8
+	br L_10bd100
 // --- basic block ---
-L_10bca68:
-// 0x010bca68: 0x10bca68: jal   0x10c09c0 addu  a0, s4, zero
+L_10bd0b0:
+// 0x010bd0b0: 0x10bd0b0: jal   0x10c1000 addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bca70: 0x10bca70: div   s2, s1
+// 0x010bd0b8: 0x10bd0b8: div   s2, s1
 	ldloc 9
 	ldloc 8
 	div
 	stloc 18
-// 0x010bca74: 0x10bca74: addu  a2, v0, zero
+// 0x010bd0bc: 0x10bd0bc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bca78: 0x10bca78: sw    a2, 152(sp)
+// 0x010bd0c0: 0x10bd0c0: sw    a2, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6947,7 +6947,7 @@ L_10bca68:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010bca7c: 0x10bca7c: sw    v1, 156(sp)
+// 0x010bd0c4: 0x10bd0c4: sw    v1, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6956,22 +6956,22 @@ L_10bca68:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bca80: 0x10bca80: mflo  lo
+// 0x010bd0c8: 0x10bd0c8: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x010bca84: 0x10bca84: jal   0x10c09c0 addiu s1, s1, 1
+// 0x010bd0cc: 0x10bd0cc: jal   0x10c1000 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bca8c: 0x10bca8c: lw    a2, 152(sp)
+// 0x010bd0d4: 0x10bd0d4: lw    a2, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6980,7 +6980,7 @@ L_10bca68:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bca90: 0x10bca90: lw    a3, 156(sp)
+// 0x010bd0d8: 0x10bd0d8: lw    a3, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6989,16 +6989,16 @@ L_10bca68:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bca94: 0x10bca94: addu  a0, a2, zero
+// 0x010bd0dc: 0x10bd0dc: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010bca98: 0x10bca98: addu  a1, a3, zero
+// 0x010bd0e0: 0x10bd0e0: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010bca9c: 0x10bca9c: addu  a2, v0, zero
+// 0x010bd0e4: 0x10bd0e4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bcaa0: 0x10bcaa0: jal   0x10c07f0 addu  a3, v1, zero
+// 0x010bd0e8: 0x10bd0e8: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -7006,43 +7006,43 @@ L_10bca68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcaa8: 0x10bcaa8: addu  a1, v1, zero
+// 0x010bd0f0: 0x10bd0f0: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010bcaac: 0x10bcaac: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010bd0f4: 0x10bd0f4: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcab4: 0x10bcab4: addu  s1, s1, v0
+// 0x010bd0fc: 0x10bd0fc: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_10bcab8:
-// 0x010bcab8: 0x10bcab8: addu  s2, s2, s4
+L_10bd100:
+// 0x010bd100: 0x10bd100: addu  s2, s2, s4
 	ldloc 9
 	ldloc 11
 	add
 	stloc 9
-// 0x010bcabc: 0x10bcabc: addiu s3, s3, 1
+// 0x010bd104: 0x10bd104: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10bcac0:
-// 0x010bcac0: 0x10bcac0: lw    v1, 4(s0)
+L_10bd108:
+// 0x010bd108: 0x10bd108: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -7051,41 +7051,41 @@ L_10bcac0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bcac4: 0x10bcac4: lw    v0, 0(s0)
+// 0x010bd10c: 0x10bd10c: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bcac8: 0x10bcac8: slt   v1, s3, v1
+// 0x010bd110: 0x10bd110: slt   v1, s3, v1
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 6
-// 0x010bcacc: 0x10bcacc: bne   v1, zero, 0x10bc970 mult  s3, s8
+// 0x010bd114: 0x10bd114: bne   v1, zero, 0x10bcfb8 mult  s3, s8
 	ldloc 6
 	ldloc 10
 	ldloc 14
 	mul
 	stloc 18
-	brtrue L_10bc970
+	brtrue L_10bcfb8
 // --- basic block ---
-// 0x010bcad4: 0x10bcad4: lw    v1, 0(v0)
+// 0x010bd11c: 0x10bd11c: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010bcad8: 0x10bcad8: sll   zero, zero, 0
-// 0x010bcadc: 0x10bcadc: bne   v1, zero, 0x10bcb48 lui   s0, 0x10000
+// 0x010bd120: 0x10bd120: sll   zero, zero, 0
+// 0x010bd124: 0x10bd124: bne   v1, zero, 0x10bd190 lui   s0, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 13
-	brtrue L_10bcb48
+	brtrue L_10bd190
 // --- basic block ---
-// 0x010bcae4: 0x10bcae4: lw    s3, 4(v0)
+// 0x010bd12c: 0x10bd12c: lw    s3, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7094,10 +7094,10 @@ L_10bcac0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bcae8: 0x10bcae8: addu  a1, zero, zero
+// 0x010bd130: 0x10bd130: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bcaec: 0x10bcaec: jal   0x1005078 addu  a0, s3, zero
+// 0x010bd134: 0x10bd134: jal   0x1005088 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7105,18 +7105,18 @@ L_10bcac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_avg_speed_1005078(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_avg_speed_1005088(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcaf4: 0x10bcaf4: addu  a1, zero, zero
+// 0x010bd13c: 0x10bd13c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bcaf8: 0x10bcaf8: addu  a0, s3, zero
+// 0x010bd140: 0x10bd140: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010bcafc: 0x10bcafc: jal   0x1004f48 addu  s4, v0, zero
+// 0x010bd144: 0x10bd144: jal   0x1004f58 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -7124,15 +7124,15 @@ L_10bcac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_speed_1004f48(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_speed_1004f58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb04: 0x10bcb04: addu  s3, v0, zero
+// 0x010bd14c: 0x10bd14c: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010bcb08: 0x10bcb08: jal   0x1007e4c addu  a0, s4, zero
+// 0x010bd150: 0x10bd150: jal   0x1007e5c addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -7140,15 +7140,15 @@ L_10bcac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb10: 0x10bcb10: addu  a0, s3, zero
+// 0x010bd158: 0x10bd158: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010bcb14: 0x10bcb14: sw    v0, 156(sp)
+// 0x010bd15c: 0x10bd15c: sw    v0, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7157,7 +7157,7 @@ L_10bcac0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bcb18: 0x10bcb18: jal   0x1007e4c addiu s3, sp, 44
+// 0x010bd160: 0x10bd160: jal   0x1007e5c addiu s3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -7167,15 +7167,15 @@ L_10bcac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb20: 0x10bcb20: lui   a2, 0x20000
+// 0x010bd168: 0x10bd168: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bcb24: 0x10bcb24: lw    a3, 156(sp)
+// 0x010bd16c: 0x10bd16c: lw    a3, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7184,18 +7184,18 @@ L_10bcac0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bcb28: 0x10bcb28: addu  a0, s3, zero
+// 0x010bd170: 0x10bd170: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010bcb2c: 0x10bcb2c: addiu a1, zero, 100
+// 0x010bd174: 0x10bd174: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010bcb30: 0x10bcb30: addiu a2, a2, 22680
+// 0x010bd178: 0x10bd178: addiu a2, a2, 23140
 	ldloc.3
-	ldc.i4 22680
+	ldc.i4 23140
 	add
 	stloc.3
-// 0x010bcb34: 0x10bcb34: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010bd17c: 0x10bd17c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7214,32 +7214,32 @@ L_10bcac0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb3c: 0x10bcb3c: addiu a0, s0, -14896
+// 0x010bd184: 0x10bd184: addiu a0, s0, -14900
 	ldloc 13
-	ldc.i4 -14896
+	ldc.i4 -14900
 	add
 	stloc.1
-// 0x010bcb40: 0x10bcb40: j	 0x10bcb54 addu  a1, s3, zero
+// 0x010bd188: 0x10bd188: j	 0x10bd19c addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-	br L_10bcb54
+	br L_10bd19c
 // --- basic block ---
-L_10bcb48:
-// 0x010bcb48: 0x10bcb48: lui   a1, 0x10000
+L_10bd190:
+// 0x010bd190: 0x10bd190: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bcb4c: 0x10bcb4c: addiu a0, s0, -14896
+// 0x010bd194: 0x10bd194: addiu a0, s0, -14900
 	ldloc 13
-	ldc.i4 -14896
+	ldc.i4 -14900
 	add
 	stloc.1
-// 0x010bcb50: 0x10bcb50: addiu a1, a1, 18500
+// 0x010bd198: 0x10bd198: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-L_10bcb54:
-// 0x010bcb54: 0x10bcb54: jal   0x1094770 addiu s0, sp, 44
+L_10bd19c:
+// 0x010bd19c: 0x10bd19c: jal   0x1094d94 addiu s0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -7249,12 +7249,12 @@ L_10bcb54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb5c: 0x10bcb5c: jal   0x1007db4 addu  a0, s2, zero
+// 0x010bd1a4: 0x10bd1a4: jal   0x1007dc4 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7262,12 +7262,12 @@ L_10bcb54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb64: 0x10bcb64: jal   0x1007d6c sw    v0, 156(sp)
+// 0x010bd1ac: 0x10bd1ac: jal   0x1007d7c sw    v0, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7276,10 +7276,10 @@ L_10bcb54:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x010bcb6c: 0x10bcb6c: jal   0x101cd60 addu  a0, v0, zero
+// 0x010bd1b4: 0x10bd1b4: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7287,12 +7287,12 @@ L_10bcb54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb74: 0x10bcb74: lw    a3, 156(sp)
+// 0x010bd1bc: 0x10bd1bc: lw    a3, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7301,21 +7301,21 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bcb78: 0x10bcb78: lui   s2, 0x20000
+// 0x010bd1c0: 0x10bd1c0: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x010bcb7c: 0x10bcb7c: addiu a2, s2, 22692
+// 0x010bd1c4: 0x10bd1c4: addiu a2, s2, 23152
 	ldloc 9
-	ldc.i4 22692
+	ldc.i4 23152
 	add
 	stloc.3
-// 0x010bcb80: 0x10bcb80: addu  a0, s0, zero
+// 0x010bd1c8: 0x10bd1c8: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x010bcb84: 0x10bcb84: addiu a1, zero, 100
+// 0x010bd1cc: 0x10bd1cc: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010bcb88: 0x10bcb88: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010bd1d0: 0x10bd1d0: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7334,15 +7334,15 @@ L_10bcb54:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcb90: 0x10bcb90: lui   a0, 0x10000
+// 0x010bd1d8: 0x10bd1d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bcb94: 0x10bcb94: addu  a1, s0, zero
+// 0x010bd1dc: 0x10bd1dc: addu  a1, s0, zero
 	ldloc 13
 	stloc.2
-// 0x010bcb98: 0x10bcb98: jal   0x1094770 addiu a0, a0, -900
+// 0x010bd1e0: 0x10bd1e0: jal   0x1094d94 addiu a0, a0, -904
 	ldloc.1
-	ldc.i4 -900
+	ldc.i4 -904
 	add
 	stloc.1
 	ldloc.0
@@ -7350,17 +7350,17 @@ L_10bcb54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcba0: 0x10bcba0: lui   a0, 0x20000
+// 0x010bd1e8: 0x10bd1e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bcba4: 0x10bcba4: jal   0x101cd60 addiu a0, a0, 22704
+// 0x010bd1ec: 0x10bd1ec: jal   0x101cd70 addiu a0, a0, 23164
 	ldloc.1
-	ldc.i4 22704
+	ldc.i4 23164
 	add
 	stloc.1
 	ldloc.0
@@ -7368,26 +7368,26 @@ L_10bcb54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcbac: 0x10bcbac: addiu a2, s2, 22692
+// 0x010bd1f4: 0x10bd1f4: addiu a2, s2, 23152
 	ldloc 9
-	ldc.i4 22692
+	ldc.i4 23152
 	add
 	stloc.3
-// 0x010bcbb0: 0x10bcbb0: addu  a3, s1, zero
+// 0x010bd1f8: 0x10bd1f8: addu  a3, s1, zero
 	ldloc 8
 	stloc 4
-// 0x010bcbb4: 0x10bcbb4: addu  a0, s0, zero
+// 0x010bd1fc: 0x10bd1fc: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x010bcbb8: 0x10bcbb8: addiu a1, zero, 100
+// 0x010bd200: 0x10bd200: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010bcbbc: 0x10bcbbc: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010bd204: 0x10bd204: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7406,15 +7406,15 @@ L_10bcb54:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcbc4: 0x10bcbc4: lui   a0, 0x10000
+// 0x010bd20c: 0x10bd20c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bcbc8: 0x10bcbc8: addu  a1, s0, zero
+// 0x010bd210: 0x10bd210: addu  a1, s0, zero
 	ldloc 13
 	stloc.2
-// 0x010bcbcc: 0x10bcbcc: jal   0x1094770 addiu a0, a0, 31800
+// 0x010bd214: 0x10bd214: jal   0x1094d94 addiu a0, a0, 32264
 	ldloc.1
-	ldc.i4 31800
+	ldc.i4 32264
 	add
 	stloc.1
 	ldloc.0
@@ -7422,24 +7422,24 @@ L_10bcb54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcbd4: 0x10bcbd4: jal   0x109483c sll   zero, zero, 0
+// 0x010bd21c: 0x10bd21c: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcbdc: 0x10bcbdc: lw    ra, 196(sp)
-// 0x010bcbe0: 0x10bcbe0: lw    s8, 192(sp)
+// 0x010bd224: 0x10bd224: lw    ra, 196(sp)
+// 0x010bd228: 0x10bd228: lw    s8, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7448,7 +7448,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bcbe4: 0x10bcbe4: lw    s7, 188(sp)
+// 0x010bd22c: 0x10bd22c: lw    s7, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7457,7 +7457,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bcbe8: 0x10bcbe8: lw    s6, 184(sp)
+// 0x010bd230: 0x10bd230: lw    s6, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7466,7 +7466,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bcbec: 0x10bcbec: lw    s5, 180(sp)
+// 0x010bd234: 0x10bd234: lw    s5, 180(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7475,7 +7475,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bcbf0: 0x10bcbf0: lw    s4, 176(sp)
+// 0x010bd238: 0x10bd238: lw    s4, 176(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7484,7 +7484,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bcbf4: 0x10bcbf4: lw    s3, 172(sp)
+// 0x010bd23c: 0x10bd23c: lw    s3, 172(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7493,7 +7493,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bcbf8: 0x10bcbf8: lw    s2, 168(sp)
+// 0x010bd240: 0x10bd240: lw    s2, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7502,7 +7502,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bcbfc: 0x10bcbfc: lw    s1, 164(sp)
+// 0x010bd244: 0x10bd244: lw    s1, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7511,7 +7511,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bcc00: 0x10bcc00: lw    s0, 160(sp)
+// 0x010bd248: 0x10bd248: lw    s0, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7520,7 +7520,7 @@ L_10bcb54:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bcc04: 0x10bcc04: jr    ra addiu sp, sp, 200
+// 0x010bd24c: 0x10bd24c: jr    ra addiu sp, sp, 200
 	ldloc.0
 	ldc.i4 200
 	add
diff --git a/converted/Cibyl141.j b/converted/Cibyl141.j
index 70855d4..0f3a657 100644
--- a/converted/Cibyl141.j
+++ b/converted/Cibyl141.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl141::.ctor
 
-.method public static int32 download_warning_fn_10bcc0c(int32,int32,int32,int32,int32)
+.method public static int32 download_warning_fn_10bd254(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 lo,int32 s1,int32 ra)
@@ -85,24 +85,24 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bcc0c: 0x10bcc0c: lui   v0, 0xe0000
+// 0x010bd254: 0x10bd254: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bcc10: 0x10bcc10: lw    v1, -15904(v0)
+// 0x010bd258: 0x10bd258: lw    v1, -15440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3976
+	ldc.i4 -3860
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bcc14: 0x10bcc14: addiu sp, sp, -48
+// 0x010bd25c: 0x10bd25c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010bcc18: 0x10bcc18: sw    s1, 40(sp)
+// 0x010bd260: 0x10bd260: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -111,8 +111,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bcc1c: 0x10bcc1c: sw    ra, 44(sp)
-// 0x010bcc20: 0x10bcc20: sw    s0, 36(sp)
+// 0x010bd264: 0x10bd264: sw    ra, 44(sp)
+// 0x010bd268: 0x10bd268: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -121,98 +121,98 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bcc24: 0x10bcc24: addu  s1, a0, zero
+// 0x010bd26c: 0x10bd26c: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010bcc28: 0x10bcc28: bltz  v1, 0x10bccd0 addu  v0, zero, zero
+// 0x010bd270: 0x10bd270: bltz  v1, 0x10bd318 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_10bccd0
+	blt L_10bd318
 // --- basic block ---
-// 0x010bcc30: 0x10bcc30: lui   v0, 0xe0000
+// 0x010bd278: 0x10bd278: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bcc34: 0x10bcc34: lw    v0, -15912(v0)
+// 0x010bd27c: 0x10bd27c: lw    v0, -15448(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3978
+	ldc.i4 -3862
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bcc38: 0x10bcc38: addiu s0, zero, 100
+// 0x010bd280: 0x10bd280: addiu s0, zero, 100
 	ldc.i4.s 100
 	stloc 8
-// 0x010bcc3c: 0x10bcc3c: div   s0, v0
+// 0x010bd284: 0x10bd284: div   s0, v0
 	ldloc 8
 	ldloc 5
 	div
 	stloc 9
-// 0x010bcc40: 0x10bcc40: addu  a1, zero, zero
+// 0x010bd288: 0x10bd288: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bcc44: 0x10bcc44: lui   a0, 0xe0000
+// 0x010bd28c: 0x10bd28c: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010bcc48: 0x10bcc48: lw    a2, -15908(a0)
+// 0x010bd290: 0x10bd290: lw    a2, -15444(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3977
+	ldc.i4 -3861
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bcc4c: 0x10bcc4c: lui   a0, 0x20000
+// 0x010bd294: 0x10bd294: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bcc50: 0x10bcc50: addiu a2, a2, -1
+// 0x010bd298: 0x10bd298: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x010bcc54: 0x10bcc54: addiu a0, a0, 22712
+// 0x010bd29c: 0x10bd29c: addiu a0, a0, 23172
 	ldloc.1
-	ldc.i4 22712
+	ldc.i4 23172
 	add
 	stloc.1
-// 0x010bcc58: 0x10bcc58: mflo  lo
+// 0x010bd2a0: 0x10bd2a0: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x010bcc5c: 0x10bcc5c: sll   zero, zero, 0
-// 0x010bcc60: 0x10bcc60: sll   zero, zero, 0
-// 0x010bcc64: 0x10bcc64: mult  v0, v1
+// 0x010bd2a4: 0x10bd2a4: sll   zero, zero, 0
+// 0x010bd2a8: 0x10bd2a8: sll   zero, zero, 0
+// 0x010bd2ac: 0x10bd2ac: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 9
-// 0x010bcc68: 0x10bcc68: mflo  lo
+// 0x010bd2b0: 0x10bd2b0: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x010bcc6c: 0x10bcc6c: sll   zero, zero, 0
-// 0x010bcc70: 0x10bcc70: sll   zero, zero, 0
-// 0x010bcc74: 0x10bcc74: div   v1, a1
+// 0x010bd2b4: 0x10bd2b4: sll   zero, zero, 0
+// 0x010bd2b8: 0x10bd2b8: sll   zero, zero, 0
+// 0x010bd2bc: 0x10bd2bc: div   v1, a1
 	ldloc 7
 	ldloc.2
 	div
 	stloc 9
-// 0x010bcc78: 0x10bcc78: mflo  lo
+// 0x010bd2c0: 0x10bd2c0: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x010bcc7c: 0x10bcc7c: sll   zero, zero, 0
-// 0x010bcc80: 0x10bcc80: sll   zero, zero, 0
-// 0x010bcc84: 0x10bcc84: mult  a2, v0
+// 0x010bd2c4: 0x10bd2c4: sll   zero, zero, 0
+// 0x010bd2c8: 0x10bd2c8: sll   zero, zero, 0
+// 0x010bd2cc: 0x10bd2cc: mult  a2, v0
 	ldloc.3
 	ldloc 5
 	mul
 	stloc 9
-// 0x010bcc88: 0x10bcc88: mflo  lo
+// 0x010bd2d0: 0x10bd2d0: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x010bcc8c: 0x10bcc8c: jal   0x101cd60 addu  s0, v1, s0
+// 0x010bd2d4: 0x10bd2d4: jal   0x101cd70 addu  s0, v1, s0
 	ldloc 7
 	ldloc 8
 	add
@@ -222,20 +222,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bcc94: 0x10bcc94: lui   a0, 0xe0000
+// 0x010bd2dc: 0x10bd2dc: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010bcc98: 0x10bcc98: addiu a0, a0, -15900
+// 0x010bd2e0: 0x10bd2e0: addiu a0, a0, -15436
 	ldloc.1
-	ldc.i4 -15900
+	ldc.i4 -15436
 	add
 	stloc.1
-// 0x010bcc9c: 0x10bcc9c: jal   0x101cd60 sw    v0, 24(sp)
+// 0x010bd2e4: 0x10bd2e4: jal   0x101cd70 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -249,12 +249,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bcca4: 0x10bcca4: lw    a3, 24(sp)
+// 0x010bd2ec: 0x10bd2ec: lw    a3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -263,21 +263,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bcca8: 0x10bcca8: lui   a2, 0x20000
+// 0x010bd2f0: 0x10bd2f0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bccac: 0x10bccac: addu  a0, s1, zero
+// 0x010bd2f4: 0x10bd2f4: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010bccb0: 0x10bccb0: addiu a2, a2, 22728
+// 0x010bd2f8: 0x10bd2f8: addiu a2, a2, 23188
 	ldloc.3
-	ldc.i4 22728
+	ldc.i4 23188
 	add
 	stloc.3
-// 0x010bccb4: 0x10bccb4: addiu a1, zero, 128
+// 0x010bd2fc: 0x10bd2fc: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x010bccb8: 0x10bccb8: sw    v0, 16(sp)
+// 0x010bd300: 0x10bd300: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -286,7 +286,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bccbc: 0x10bccbc: jal   0x1000f9c sw    s0, 20(sp)
+// 0x010bd304: 0x10bd304: jal   0x1000f9c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -305,15 +305,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bccc4: 0x10bccc4: jal   0x104fc04 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_flush_104fc04()
+// 0x010bd30c: 0x10bd30c: jal   0x104fc14 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010bcccc: 0x10bcccc: addiu v0, zero, 1
+// 0x010bd314: 0x10bd314: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10bccd0:
-// 0x010bccd0: 0x10bccd0: lw    ra, 44(sp)
-// 0x010bccd4: 0x10bccd4: lw    s1, 40(sp)
+L_10bd318:
+// 0x010bd318: 0x10bd318: lw    ra, 44(sp)
+// 0x010bd31c: 0x10bd31c: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -322,7 +322,7 @@ L_10bccd0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bccd8: 0x10bccd8: lw    s0, 36(sp)
+// 0x010bd320: 0x10bd320: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -331,7 +331,7 @@ L_10bccd0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bccdc: 0x10bccdc: jr    ra addiu sp, sp, 48
+// 0x010bd324: 0x10bd324: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -343,7 +343,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_sync_get_export_name_10bcce4(int32,int32,int32,int32,int32)
+.method public static int32 editor_sync_get_export_name_10bd32c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 ra,int32 hi,int32 lo)
@@ -387,13 +387,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bcce4: 0x10bcce4: addiu sp, sp, -56
+// 0x010bd32c: 0x10bd32c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010bcce8: 0x10bcce8: sw    ra, 52(sp)
-// 0x010bccec: 0x10bccec: sw    s0, 48(sp)
+// 0x010bd330: 0x10bd330: sw    ra, 52(sp)
+// 0x010bd334: 0x10bd334: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -402,20 +402,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bccf0: 0x10bccf0: addiu a0, sp, 40
+// 0x010bd338: 0x10bd338: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010bccf4: 0x10bccf4: cibyl_sysc_arg 0x4
+// 0x010bd33c: 0x10bd33c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010bccf8: 0x10bccf8: cibyl_sysc 0x23c3
+// 0x010bd340: 0x10bd340: cibyl_sysc 0x23c3
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 7
-// 0x010bccfc: 0x10bccfc: addu  v1, v0, zero
+// 0x010bd344: 0x10bd344: addu  v1, v0, zero
 	ldloc 7
 	stloc 5
-// 0x010bcd00: 0x10bcd00: jal   0x10c34cc lui   s0, 0xe0000
+// 0x010bd348: 0x10bd348: jal   0x10c3b0c lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
 	ldloc.0
@@ -423,12 +423,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::gmtime_10c34cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::gmtime_10c3b0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bcd08: 0x10bcd08: lw    v1, 16(v0)
+// 0x010bd350: 0x10bd350: lw    v1, 16(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -437,7 +437,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bcd0c: 0x10bcd0c: lw    a3, 12(v0)
+// 0x010bd354: 0x10bd354: lw    a3, 12(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -446,12 +446,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bcd10: 0x10bcd10: addiu v1, v1, 1
+// 0x010bd358: 0x10bd358: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010bcd14: 0x10bcd14: sw    v1, 16(sp)
+// 0x010bd35c: 0x10bd35c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -460,7 +460,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bcd18: 0x10bcd18: lw    a0, 20(v0)
+// 0x010bd360: 0x10bd360: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -469,10 +469,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bcd1c: 0x10bcd1c: addiu v1, zero, 100
+// 0x010bd364: 0x10bd364: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x010bcd20: 0x10bcd20: div   a0, v1
+// 0x010bd368: 0x10bd368: div   a0, v1
 	ldloc.1
 	ldloc 5
 	ldloc.1
@@ -481,26 +481,26 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	rem
 	stloc 10
-// 0x010bcd24: 0x10bcd24: lui   a2, 0x20000
+// 0x010bd36c: 0x10bd36c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bcd28: 0x10bcd28: addiu a0, s0, -17196
+// 0x010bd370: 0x10bd370: addiu a0, s0, -16732
 	ldloc 8
-	ldc.i4 -17196
+	ldc.i4 -16732
 	add
 	stloc.1
-// 0x010bcd2c: 0x10bcd2c: addiu a2, a2, 22744
+// 0x010bd374: 0x10bd374: addiu a2, a2, 23204
 	ldloc.3
-	ldc.i4 22744
+	ldc.i4 23204
 	add
 	stloc.3
-// 0x010bcd30: 0x10bcd30: addiu a1, zero, 255
+// 0x010bd378: 0x10bd378: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x010bcd34: 0x10bcd34: mfhi  hi
+// 0x010bd37c: 0x10bd37c: mfhi  hi
 	ldloc 10
 	stloc 5
-// 0x010bcd38: 0x10bcd38: sw    v1, 20(sp)
+// 0x010bd380: 0x10bd380: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -509,7 +509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bcd3c: 0x10bcd3c: lw    v1, 8(v0)
+// 0x010bd384: 0x10bd384: lw    v1, 8(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -518,8 +518,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bcd40: 0x10bcd40: sll   zero, zero, 0
-// 0x010bcd44: 0x10bcd44: sw    v1, 24(sp)
+// 0x010bd388: 0x10bd388: sll   zero, zero, 0
+// 0x010bd38c: 0x10bd38c: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -528,7 +528,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bcd48: 0x10bcd48: lw    v1, 4(v0)
+// 0x010bd390: 0x10bd390: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -537,8 +537,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bcd4c: 0x10bcd4c: sll   zero, zero, 0
-// 0x010bcd50: 0x10bcd50: sw    v1, 28(sp)
+// 0x010bd394: 0x10bd394: sll   zero, zero, 0
+// 0x010bd398: 0x10bd398: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -547,14 +547,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bcd54: 0x10bcd54: lw    v0, 0(v0)
+// 0x010bd39c: 0x10bd39c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010bcd58: 0x10bcd58: jal   0x1000f9c sw    v0, 32(sp)
+// 0x010bd3a0: 0x10bd3a0: jal   0x1000f9c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -573,13 +573,13 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bcd60: 0x10bcd60: lw    ra, 52(sp)
-// 0x010bcd64: 0x10bcd64: addiu v0, s0, -17196
+// 0x010bd3a8: 0x10bd3a8: lw    ra, 52(sp)
+// 0x010bd3ac: 0x10bd3ac: addiu v0, s0, -16732
 	ldloc 8
-	ldc.i4 -17196
+	ldc.i4 -16732
 	add
 	stloc 7
-// 0x010bcd68: 0x10bcd68: lw    s0, 48(sp)
+// 0x010bd3b0: 0x10bd3b0: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -588,7 +588,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bcd6c: 0x10bcd6c: jr    ra addiu sp, sp, 56
+// 0x010bd3b4: 0x10bd3b4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -600,7 +600,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_sync_get_export_path_10bcd74(int32,int32,int32,int32,int32)
+.method public static int32 editor_sync_get_export_path_10bd3bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -641,12 +641,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bcd74: 0x10bcd74: addiu sp, sp, -32
+// 0x010bd3bc: 0x10bd3bc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010bcd78: 0x10bcd78: sw    s0, 20(sp)
+// 0x010bd3c0: 0x10bd3c0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -655,20 +655,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bcd7c: 0x10bcd7c: lui   s0, 0xe0000
+// 0x010bd3c4: 0x10bd3c4: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010bcd80: 0x10bcd80: lw    v0, -16940(s0)
+// 0x010bd3c8: 0x10bd3c8: lw    v0, -16476(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4235
+	ldc.i4 -4119
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bcd84: 0x10bcd84: sw    ra, 28(sp)
-// 0x010bcd88: 0x10bcd88: bne   v0, zero, 0x10bcdc0 sw    s1, 24(sp)
+// 0x010bd3cc: 0x10bd3cc: sw    ra, 28(sp)
+// 0x010bd3d0: 0x10bd3d0: bne   v0, zero, 0x10bd408 sw    s1, 24(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -678,9 +678,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_10bcdc0
+	brtrue L_10bd408
 // --- basic block ---
-// 0x010bcd90: 0x10bcd90: jal   0x1002f74 lui   s1, 0xe0000
+// 0x010bd3d8: 0x10bd3d8: jal   0x1002f74 lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
 	ldloc.0
@@ -693,23 +693,23 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010bcd98: 0x10bcd98: lui   a3, 0x20000
+// 0x010bd3e0: 0x10bd3e0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bcd9c: 0x10bcd9c: addu  a2, v0, zero
+// 0x010bd3e4: 0x10bd3e4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bcda0: 0x10bcda0: addiu a3, a3, 22780
+// 0x010bd3e8: 0x10bd3e8: addiu a3, a3, 23240
 	ldloc 4
-	ldc.i4 22780
+	ldc.i4 23240
 	add
 	stloc 4
-// 0x010bcda4: 0x10bcda4: addiu a0, s1, -16936
+// 0x010bd3ec: 0x10bd3ec: addiu a0, s1, -16472
 	ldloc 8
-	ldc.i4 -16936
+	ldc.i4 -16472
 	add
 	stloc.1
-// 0x010bcda8: 0x10bcda8: jal   0x104ccb4 addiu a1, zero, 1024
+// 0x010bd3f0: 0x10bd3f0: jal   0x104ccc4 addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
 	ldloc.0
@@ -717,14 +717,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010bcdb0: 0x10bcdb0: jal   0x104c6f4 addiu a0, s1, -16936
+// 0x010bd3f8: 0x10bd3f8: jal   0x104c704 addiu a0, s1, -16472
 	ldloc 8
-	ldc.i4 -16936
+	ldc.i4 -16472
 	add
 	stloc.1
 	ldloc.0
@@ -732,34 +732,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_create_104c6f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_create_104c704(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010bcdb8: 0x10bcdb8: addiu v0, zero, 1
+// 0x010bd400: 0x10bd400: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010bcdbc: 0x10bcdbc: sw    v0, -16940(s0)
+// 0x010bd404: 0x10bd404: sw    v0, -16476(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4235
+	ldc.i4 -4119
 	add
 	ldloc 5
 	stelem.i4
-L_10bcdc0:
-// 0x010bcdc0: 0x10bcdc0: lw    ra, 28(sp)
-// 0x010bcdc4: 0x10bcdc4: lui   v0, 0xe0000
+L_10bd408:
+// 0x010bd408: 0x10bd408: lw    ra, 28(sp)
+// 0x010bd40c: 0x10bd40c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bcdc8: 0x10bcdc8: addiu v0, v0, -16936
+// 0x010bd410: 0x10bd410: addiu v0, v0, -16472
 	ldloc 5
-	ldc.i4 -16936
+	ldc.i4 -16472
 	add
 	stloc 5
-// 0x010bcdcc: 0x10bcdcc: lw    s1, 24(sp)
+// 0x010bd414: 0x10bd414: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -768,7 +768,7 @@ L_10bcdc0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bcdd0: 0x10bcdd0: lw    s0, 20(sp)
+// 0x010bd418: 0x10bd418: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -777,7 +777,7 @@ L_10bcdc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bcdd4: 0x10bcdd4: jr    ra addiu sp, sp, 32
+// 0x010bd41c: 0x10bd41c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -789,7 +789,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_38_10bcddc()
+.method public static int32 T_38_10bd424()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -806,15 +806,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bcddc: 0x10bcddc: lui   v0, 0xe0000
+// 0x010bd424: 0x10bd424: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x010bcde0: 0x10bcde0: jr    ra sw    zero, -15904(v0)
+// 0x010bd428: 0x10bd428: jr    ra sw    zero, -15440(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3976
+	ldc.i4 -3860
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -823,7 +823,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 export_sync_10bce90(int32,int32,int32,int32,int32)
+.method public static int32 export_sync_10bd4d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -867,13 +867,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bce90: 0x10bce90: addiu sp, sp, -40
+// 0x010bd4d8: 0x10bd4d8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010bce94: 0x10bce94: sw    ra, 36(sp)
-// 0x010bce98: 0x10bce98: sw    s2, 32(sp)
+// 0x010bd4dc: 0x10bd4dc: sw    ra, 36(sp)
+// 0x010bd4e0: 0x10bd4e0: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -882,7 +882,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bce9c: 0x10bce9c: sw    s1, 28(sp)
+// 0x010bd4e4: 0x10bd4e4: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -891,7 +891,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bcea0: 0x10bcea0: jal   0x10ac694 sw    s0, 24(sp)
+// 0x010bd4e8: 0x10bd4e8: jal   0x10accdc sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -900,55 +900,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl129::editor_is_enabled_10ac694()
+	call int32 Cibyl129::editor_is_enabled_10accdc()
 	stloc 5
 // --- basic block ---
-// 0x010bcea8: 0x10bcea8: beq   v0, zero, 0x10bcfe0 addu  v1, zero, zero
+// 0x010bd4f0: 0x10bd4f0: beq   v0, zero, 0x10bd628 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10bcfe0
+	brfalse L_10bd628
 // --- basic block ---
-// 0x010bceb0: 0x10bceb0: jal   0x104c564 sll   zero, zero, 0
+// 0x010bd4f8: 0x10bd4f8: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bceb8: 0x10bceb8: jal   0x104d444 addu  a0, v0, zero
+// 0x010bd500: 0x10bd500: jal   0x104d454 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	call int32 Cibyl57::roadmap_file_free_space_104d444()
+	call int32 Cibyl57::roadmap_file_free_space_104d454()
 	stloc 5
 // --- basic block ---
-// 0x010bcec0: 0x10bcec0: sltiu v0, v0, 5000
+// 0x010bd508: 0x10bd508: sltiu v0, v0, 5000
 	ldloc 5
 	ldc.i4 5000
 	clt.un
 	stloc 5
-// 0x010bcec4: 0x10bcec4: beq   v0, zero, 0x10bcee8 sll   zero, zero, 0
+// 0x010bd50c: 0x10bd50c: beq   v0, zero, 0x10bd530 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bcee8
+	brfalse L_10bd530
 // --- basic block ---
-// 0x010bcecc: 0x10bcecc: lui   a0, 0x0
+// 0x010bd514: 0x10bd514: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bced0: 0x10bced0: lui   a1, 0x20000
+// 0x010bd518: 0x10bd518: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bced4: 0x10bced4: addiu a0, a0, 30152
+// 0x010bd51c: 0x10bd51c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010bced8: 0x10bced8: jal   0x104c148 addiu a1, a1, 22824
+// 0x010bd520: 0x10bd520: jal   0x104c158 addiu a1, a1, 23284
 	ldloc.2
-	ldc.i4 22824
+	ldc.i4 23284
 	add
 	stloc.2
 	ldloc.0
@@ -956,29 +956,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcee0: 0x10bcee0: j	 0x10bcfe0 addiu v1, zero, -1
+// 0x010bd528: 0x10bd528: j	 0x10bd628 addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-	br L_10bcfe0
+	br L_10bd628
 // --- basic block ---
-L_10bcee8:
-// 0x010bcee8: 0x10bcee8: jal   0x10bcddc lui   s0, 0xe0000
+L_10bd530:
+// 0x010bd530: 0x10bd530: jal   0x10bd424 lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-	call int32 Cibyl141::T_38_10bcddc()
+	call int32 Cibyl141::T_38_10bd424()
 	stloc 5
 // --- basic block ---
-// 0x010bcef0: 0x10bcef0: lui   a0, 0x20000
+// 0x010bd538: 0x10bd538: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bcef4: 0x10bcef4: jal   0x101cd60 addiu a0, a0, 22880
+// 0x010bd53c: 0x10bd53c: jal   0x101cd70 addiu a0, a0, 23340
 	ldloc.1
-	ldc.i4 22880
+	ldc.i4 23340
 	add
 	stloc.1
 	ldloc.0
@@ -986,28 +986,28 @@ L_10bcee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcefc: 0x10bcefc: lui   s1, 0x10000
+// 0x010bd544: 0x10bd544: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010bcf00: 0x10bcf00: addu  a3, v0, zero
+// 0x010bd548: 0x10bd548: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010bcf04: 0x10bcf04: addiu a2, s1, 19912
+// 0x010bd54c: 0x10bd54c: addiu a2, s1, 20332
 	ldloc 9
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010bcf08: 0x10bcf08: addiu a0, s0, -15900
+// 0x010bd550: 0x10bd550: addiu a0, s0, -15436
 	ldloc 8
-	ldc.i4 -15900
+	ldc.i4 -15436
 	add
 	stloc.1
-// 0x010bcf0c: 0x10bcf0c: jal   0x1000f9c addiu a1, zero, 100
+// 0x010bd554: 0x10bd554: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -1020,20 +1020,20 @@ L_10bcee8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf14: 0x10bcf14: lui   s2, 0x10c0000
+// 0x010bd55c: 0x10bd55c: lui   s2, 0x10c0000
 	ldc.i4 17563648
 	stloc 10
-// 0x010bcf18: 0x10bcf18: lui   a1, 0x20000
+// 0x010bd560: 0x10bd560: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bcf1c: 0x10bcf1c: addiu a1, a1, 22816
+// 0x010bd564: 0x10bd564: addiu a1, a1, 23276
 	ldloc.2
-	ldc.i4 22816
+	ldc.i4 23276
 	add
 	stloc.2
-// 0x010bcf20: 0x10bcf20: jal   0x100de8c addiu a0, s2, -13300
+// 0x010bd568: 0x10bd568: jal   0x100de9c addiu a0, s2, -11692
 	ldloc 10
-	ldc.i4 -13300
+	ldc.i4 -11692
 	add
 	stloc.1
 	ldloc.0
@@ -1041,24 +1041,24 @@ L_10bcee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_register_100de8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_register_100de9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf28: 0x10bcf28: jal   0x104fc04 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_flush_104fc04()
+// 0x010bd570: 0x10bd570: jal   0x104fc14 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010bcf30: 0x10bcf30: jal   0x10bcddc sll   zero, zero, 0
-	call int32 Cibyl141::T_38_10bcddc()
+// 0x010bd578: 0x10bd578: jal   0x10bd424 sll   zero, zero, 0
+	call int32 Cibyl141::T_38_10bd424()
 	stloc 5
 // --- basic block ---
-// 0x010bcf38: 0x10bcf38: lui   a0, 0x20000
+// 0x010bd580: 0x10bd580: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bcf3c: 0x10bcf3c: jal   0x101cd60 addiu a0, a0, 22796
+// 0x010bd584: 0x10bd584: jal   0x101cd70 addiu a0, a0, 23256
 	ldloc.1
-	ldc.i4 22796
+	ldc.i4 23256
 	add
 	stloc.1
 	ldloc.0
@@ -1066,25 +1066,25 @@ L_10bcee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf44: 0x10bcf44: addu  a3, v0, zero
+// 0x010bd58c: 0x10bd58c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010bcf48: 0x10bcf48: addiu a2, s1, 19912
+// 0x010bd590: 0x10bd590: addiu a2, s1, 20332
 	ldloc 9
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010bcf4c: 0x10bcf4c: addiu a0, s0, -15900
+// 0x010bd594: 0x10bd594: addiu a0, s0, -15436
 	ldloc 8
-	ldc.i4 -15900
+	ldc.i4 -15436
 	add
 	stloc.1
-// 0x010bcf50: 0x10bcf50: jal   0x1000f9c addiu a1, zero, 100
+// 0x010bd598: 0x10bd598: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -1097,32 +1097,32 @@ L_10bcee8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf58: 0x10bcf58: jal   0x104fc04 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_flush_104fc04()
+// 0x010bd5a0: 0x10bd5a0: jal   0x104fc14 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010bcf60: 0x10bcf60: jal   0x108e428 sll   zero, zero, 0
+// 0x010bd5a8: 0x10bd5a8: jal   0x108ea4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::Realtime_OfflineClose_108e428(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::Realtime_OfflineClose_108ea4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf68: 0x10bcf68: jal   0x10bcd74 sll   zero, zero, 0
+// 0x010bd5b0: 0x10bd5b0: jal   0x10bd3bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_sync_get_export_path_10bcd74(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_sync_get_export_path_10bd3bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf70: 0x10bcf70: jal   0x10bcce4 sw    v0, 16(sp)
+// 0x010bd5b8: 0x10bd5b8: jal   0x10bd32c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1136,12 +1136,12 @@ L_10bcee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_sync_get_export_name_10bcce4(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_sync_get_export_name_10bd32c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf78: 0x10bcf78: lw    a0, 16(sp)
+// 0x010bd5c0: 0x10bd5c0: lw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1150,7 +1150,7 @@ L_10bcee8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bcf7c: 0x10bcf7c: jal   0x108e478 addu  a1, v0, zero
+// 0x010bd5c4: 0x10bd5c4: jal   0x108ea9c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1158,47 +1158,47 @@ L_10bcee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::Realtime_OfflineOpen_108e478(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::Realtime_OfflineOpen_108ea9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcf84: 0x10bcf84: addiu v1, zero, 1
+// 0x010bd5cc: 0x10bd5cc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010bcf88: 0x10bcf88: lui   v0, 0xe0000
+// 0x010bd5d0: 0x10bd5d0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bcf8c: 0x10bcf8c: sw    v1, -15912(v0)
+// 0x010bd5d4: 0x10bd5d4: sw    v1, -15448(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3978
+	ldc.i4 -3862
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bcf90: 0x10bcf90: lui   v0, 0xe0000
+// 0x010bd5d8: 0x10bd5d8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bcf94: 0x10bcf94: jal   0x10bcddc sw    zero, -15908(v0)
+// 0x010bd5dc: 0x10bd5dc: jal   0x10bd424 sw    zero, -15444(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3977
+	ldc.i4 -3861
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl141::T_38_10bcddc()
+	call int32 Cibyl141::T_38_10bd424()
 	stloc 5
 // --- basic block ---
-// 0x010bcf9c: 0x10bcf9c: lui   a0, 0x20000
+// 0x010bd5e4: 0x10bd5e4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bcfa0: 0x10bcfa0: jal   0x101cd60 addiu a0, a0, 22908
+// 0x010bd5e8: 0x10bd5e8: jal   0x101cd70 addiu a0, a0, 23368
 	ldloc.1
-	ldc.i4 22908
+	ldc.i4 23368
 	add
 	stloc.1
 	ldloc.0
@@ -1206,25 +1206,25 @@ L_10bcee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcfa8: 0x10bcfa8: addu  a3, v0, zero
+// 0x010bd5f0: 0x10bd5f0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010bcfac: 0x10bcfac: addiu a2, s1, 19912
+// 0x010bd5f4: 0x10bd5f4: addiu a2, s1, 20332
 	ldloc 9
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010bcfb0: 0x10bcfb0: addiu a1, zero, 100
+// 0x010bd5f8: 0x10bd5f8: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010bcfb4: 0x10bcfb4: jal   0x1000f9c addiu a0, s0, -15900
+// 0x010bd5fc: 0x10bd5fc: jal   0x1000f9c addiu a0, s0, -15436
 	ldloc 8
-	ldc.i4 -15900
+	ldc.i4 -15436
 	add
 	stloc.1
 	ldloc.0
@@ -1237,13 +1237,13 @@ L_10bcee8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcfbc: 0x10bcfbc: jal   0x10bfab4 addiu a0, zero, -1
+// 0x010bd604: 0x10bd604: jal   0x10c00fc addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-	call int32 Cibyl142::roadmap_label_clear_10bfab4()
+	call int32 Cibyl142::roadmap_label_clear_10c00fc()
 	stloc 5
 // --- basic block ---
-// 0x010bcfc4: 0x10bcfc4: jal   0x1060998 addiu a0, zero, -1
+// 0x010bd60c: 0x10bd60c: jal   0x10609a8 addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.0
@@ -1251,37 +1251,37 @@ L_10bcee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_graph_clear_1060998(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_graph_clear_10609a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcfcc: 0x10bcfcc: jal   0x104fc04 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_flush_104fc04()
+// 0x010bd614: 0x10bd614: jal   0x104fc14 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-// 0x010bcfd4: 0x10bcfd4: jal   0x100dc38 addiu a0, s2, -13300
+// 0x010bd61c: 0x10bd61c: jal   0x100dc48 addiu a0, s2, -11692
 	ldloc 10
-	ldc.i4 -13300
+	ldc.i4 -11692
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_unregister_100dc38(int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_unregister_100dc48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bcfdc: 0x10bcfdc: addu  v1, zero, zero
+// 0x010bd624: 0x10bd624: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10bcfe0:
-// 0x010bcfe0: 0x10bcfe0: lw    ra, 36(sp)
-// 0x010bcfe4: 0x10bcfe4: addu  v0, v1, zero
+L_10bd628:
+// 0x010bd628: 0x10bd628: lw    ra, 36(sp)
+// 0x010bd62c: 0x10bd62c: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010bcfe8: 0x10bcfe8: lw    s2, 32(sp)
+// 0x010bd630: 0x10bd630: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1290,7 +1290,7 @@ L_10bcfe0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bcfec: 0x10bcfec: lw    s1, 28(sp)
+// 0x010bd634: 0x10bd634: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1299,7 +1299,7 @@ L_10bcfe0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bcff0: 0x10bcff0: lw    s0, 24(sp)
+// 0x010bd638: 0x10bd638: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1308,7 +1308,7 @@ L_10bcfe0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bcff4: 0x10bcff4: jr    ra addiu sp, sp, 40
+// 0x010bd63c: 0x10bd63c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1320,7 +1320,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_report_segments_10bcffc(int32,int32,int32,int32,int32)
+.method public static int32 editor_report_segments_10bd644(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1358,12 +1358,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bcffc: 0x10bcffc: addiu sp, sp, -24
+// 0x010bd644: 0x10bd644: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd000: 0x10bd000: sw    s0, 16(sp)
+// 0x010bd648: 0x10bd648: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1372,61 +1372,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bd004: 0x10bd004: lui   s0, 0xe0000
+// 0x010bd64c: 0x10bd64c: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010bd008: 0x10bd008: lw    v0, -15800(s0)
+// 0x010bd650: 0x10bd650: lw    v0, -15336(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3950
+	ldc.i4 -3834
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd00c: 0x10bd00c: sll   zero, zero, 0
-// 0x010bd010: 0x10bd010: bne   v0, zero, 0x10bd048 sw    ra, 20(sp)
+// 0x010bd654: 0x10bd654: sll   zero, zero, 0
+// 0x010bd658: 0x10bd658: bne   v0, zero, 0x10bd690 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_10bd048
+	brtrue L_10bd690
 // --- basic block ---
-// 0x010bd018: 0x10bd018: jal   0x10b5738 sll   zero, zero, 0
+// 0x010bd660: 0x10bd660: jal   0x10b5d80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_items_pending_10b5738(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_items_pending_10b5d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd020: 0x10bd020: beq   v0, zero, 0x10bd048 sll   zero, zero, 0
+// 0x010bd668: 0x10bd668: beq   v0, zero, 0x10bd690 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bd048
+	brfalse L_10bd690
 // --- basic block ---
-// 0x010bd028: 0x10bd028: jal   0x10b578c sll   zero, zero, 0
+// 0x010bd670: 0x10bd670: jal   0x10b5dd4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_begin_commit_10b578c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_begin_commit_10b5dd4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd030: 0x10bd030: lui   a0, 0x10c0000
+// 0x010bd678: 0x10bd678: lui   a0, 0x10c0000
 	ldc.i4 17563648
 	stloc.1
-// 0x010bd034: 0x10bd034: lui   v1, 0x0
+// 0x010bd67c: 0x10bd67c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010bd038: 0x10bd038: addiu a0, a0, -12200
+// 0x010bd680: 0x10bd680: addiu a0, a0, -10592
 	ldloc.1
-	ldc.i4 -12200
+	ldc.i4 -10592
 	add
 	stloc.1
-// 0x010bd03c: 0x10bd03c: jal   0x106c3bc sw    v0, 19504(v1)
+// 0x010bd684: 0x10bd684: jal   0x106c9e0 sw    v0, 19504(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1440,23 +1440,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_Editor_ExportSegments_106c3bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_Editor_ExportSegments_106c9e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd044: 0x10bd044: sw    v0, -15800(s0)
+// 0x010bd68c: 0x10bd68c: sw    v0, -15336(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3950
+	ldc.i4 -3834
 	add
 	ldloc 5
 	stelem.i4
-L_10bd048:
-// 0x010bd048: 0x10bd048: lw    ra, 20(sp)
-// 0x010bd04c: 0x10bd04c: lw    s0, 16(sp)
+L_10bd690:
+// 0x010bd690: 0x10bd690: lw    ra, 20(sp)
+// 0x010bd694: 0x10bd694: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1465,7 +1465,7 @@ L_10bd048:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bd050: 0x10bd050: jr    ra addiu sp, sp, 24
+// 0x010bd698: 0x10bd698: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1477,7 +1477,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_report_segments_cb_10bd058(int32,int32,int32,int32,int32)
+.method public static int32 editor_report_segments_cb_10bd6a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1512,31 +1512,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd058: 0x10bd058: addiu sp, sp, -24
+// 0x010bd6a0: 0x10bd6a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd05c: 0x10bd05c: lui   v0, 0xe0000
+// 0x010bd6a4: 0x10bd6a4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bd060: 0x10bd060: sw    ra, 20(sp)
-// 0x010bd064: 0x10bd064: beq   a0, zero, 0x10bd084 sw    zero, -15800(v0)
+// 0x010bd6a8: 0x10bd6a8: sw    ra, 20(sp)
+// 0x010bd6ac: 0x10bd6ac: beq   a0, zero, 0x10bd6cc sw    zero, -15336(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3950
+	ldc.i4 -3834
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10bd084
+	brfalse L_10bd6cc
 // --- basic block ---
-// 0x010bd06c: 0x10bd06c: lui   v0, 0x0
+// 0x010bd6b4: 0x10bd6b4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bd070: 0x10bd070: lw    a0, 19504(v0)
+// 0x010bd6b8: 0x10bd6b8: lw    a0, 19504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1545,32 +1545,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd074: 0x10bd074: jal   0x10b5760 sll   zero, zero, 0
+// 0x010bd6bc: 0x10bd6bc: jal   0x10b5da8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_confirm_commit_10b5760(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_confirm_commit_10b5da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd07c: 0x10bd07c: jal   0x10bcffc sll   zero, zero, 0
+// 0x010bd6c4: 0x10bd6c4: jal   0x10bd644 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_report_segments_10bcffc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_report_segments_10bd644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10bd084:
-// 0x010bd084: 0x10bd084: lw    ra, 20(sp)
-// 0x010bd088: 0x10bd088: sll   zero, zero, 0
-// 0x010bd08c: 0x10bd08c: jr    ra addiu sp, sp, 24
+L_10bd6cc:
+// 0x010bd6cc: 0x10bd6cc: lw    ra, 20(sp)
+// 0x010bd6d0: 0x10bd6d0: sll   zero, zero, 0
+// 0x010bd6d4: 0x10bd6d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1582,7 +1582,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_report_markers_10bd094(int32,int32,int32,int32,int32)
+.method public static int32 editor_report_markers_10bd6dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1620,12 +1620,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd094: 0x10bd094: addiu sp, sp, -24
+// 0x010bd6dc: 0x10bd6dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd098: 0x10bd098: sw    s0, 16(sp)
+// 0x010bd6e0: 0x10bd6e0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1634,61 +1634,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bd09c: 0x10bd09c: lui   s0, 0xe0000
+// 0x010bd6e4: 0x10bd6e4: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010bd0a0: 0x10bd0a0: lw    v0, -15796(s0)
+// 0x010bd6e8: 0x10bd6e8: lw    v0, -15332(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3949
+	ldc.i4 -3833
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd0a4: 0x10bd0a4: sll   zero, zero, 0
-// 0x010bd0a8: 0x10bd0a8: bne   v0, zero, 0x10bd0e0 sw    ra, 20(sp)
+// 0x010bd6ec: 0x10bd6ec: sll   zero, zero, 0
+// 0x010bd6f0: 0x10bd6f0: bne   v0, zero, 0x10bd728 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_10bd0e0
+	brtrue L_10bd728
 // --- basic block ---
-// 0x010bd0b0: 0x10bd0b0: jal   0x10b3c6c sll   zero, zero, 0
+// 0x010bd6f8: 0x10bd6f8: jal   0x10b42b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_items_pending_10b3c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_items_pending_10b42b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd0b8: 0x10bd0b8: beq   v0, zero, 0x10bd0e0 sll   zero, zero, 0
+// 0x010bd700: 0x10bd700: beq   v0, zero, 0x10bd728 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bd0e0
+	brfalse L_10bd728
 // --- basic block ---
-// 0x010bd0c0: 0x10bd0c0: jal   0x10b3d18 sll   zero, zero, 0
+// 0x010bd708: 0x10bd708: jal   0x10b4360 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_begin_commit_10b3d18(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_begin_commit_10b4360(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd0c8: 0x10bd0c8: lui   a0, 0x10c0000
+// 0x010bd710: 0x10bd710: lui   a0, 0x10c0000
 	ldc.i4 17563648
 	stloc.1
-// 0x010bd0cc: 0x10bd0cc: lui   v1, 0x0
+// 0x010bd714: 0x10bd714: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010bd0d0: 0x10bd0d0: addiu a0, a0, -12048
+// 0x010bd718: 0x10bd718: addiu a0, a0, -10440
 	ldloc.1
-	ldc.i4 -12048
+	ldc.i4 -10440
 	add
 	stloc.1
-// 0x010bd0d4: 0x10bd0d4: jal   0x106c5f8 sw    v0, 19508(v1)
+// 0x010bd71c: 0x10bd71c: jal   0x106cc1c sw    v0, 19508(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1702,23 +1702,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_Editor_ExportMarkers_106c5f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_Editor_ExportMarkers_106cc1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd0dc: 0x10bd0dc: sw    v0, -15796(s0)
+// 0x010bd724: 0x10bd724: sw    v0, -15332(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3949
+	ldc.i4 -3833
 	add
 	ldloc 5
 	stelem.i4
-L_10bd0e0:
-// 0x010bd0e0: 0x10bd0e0: lw    ra, 20(sp)
-// 0x010bd0e4: 0x10bd0e4: lw    s0, 16(sp)
+L_10bd728:
+// 0x010bd728: 0x10bd728: lw    ra, 20(sp)
+// 0x010bd72c: 0x10bd72c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1727,7 +1727,7 @@ L_10bd0e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bd0e8: 0x10bd0e8: jr    ra addiu sp, sp, 24
+// 0x010bd730: 0x10bd730: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1739,7 +1739,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_report_markers_cb_10bd0f0(int32,int32,int32,int32,int32)
+.method public static int32 editor_report_markers_cb_10bd738(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1774,31 +1774,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd0f0: 0x10bd0f0: addiu sp, sp, -24
+// 0x010bd738: 0x10bd738: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd0f4: 0x10bd0f4: lui   v0, 0xe0000
+// 0x010bd73c: 0x10bd73c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bd0f8: 0x10bd0f8: sw    ra, 20(sp)
-// 0x010bd0fc: 0x10bd0fc: beq   a0, zero, 0x10bd11c sw    zero, -15796(v0)
+// 0x010bd740: 0x10bd740: sw    ra, 20(sp)
+// 0x010bd744: 0x10bd744: beq   a0, zero, 0x10bd764 sw    zero, -15332(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3949
+	ldc.i4 -3833
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10bd11c
+	brfalse L_10bd764
 // --- basic block ---
-// 0x010bd104: 0x10bd104: lui   v0, 0x0
+// 0x010bd74c: 0x10bd74c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bd108: 0x10bd108: lw    a0, 19508(v0)
+// 0x010bd750: 0x10bd750: lw    a0, 19508(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1807,32 +1807,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd10c: 0x10bd10c: jal   0x10b3cec sll   zero, zero, 0
+// 0x010bd754: 0x10bd754: jal   0x10b4334 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_confirm_commit_10b3cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_confirm_commit_10b4334(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd114: 0x10bd114: jal   0x10bd094 sll   zero, zero, 0
+// 0x010bd75c: 0x10bd75c: jal   0x10bd6dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_report_markers_10bd094(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_report_markers_10bd6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10bd11c:
-// 0x010bd11c: 0x10bd11c: lw    ra, 20(sp)
-// 0x010bd120: 0x10bd120: sll   zero, zero, 0
-// 0x010bd124: 0x10bd124: jr    ra addiu sp, sp, 24
+L_10bd764:
+// 0x010bd764: 0x10bd764: lw    ra, 20(sp)
+// 0x010bd768: 0x10bd768: sll   zero, zero, 0
+// 0x010bd76c: 0x10bd76c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1844,7 +1844,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_data_dir_10bd168(int32,int32,int32,int32,int32)
+.method public static int32 get_data_dir_10bd7b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -1879,30 +1879,30 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd168: 0x10bd168: addiu sp, sp, -24
+// 0x010bd7b0: 0x10bd7b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd16c: 0x10bd16c: sw    ra, 20(sp)
-// 0x010bd170: 0x10bd170: jal   0x104c564 sll   zero, zero, 0
+// 0x010bd7b4: 0x10bd7b4: sw    ra, 20(sp)
+// 0x010bd7b8: 0x10bd7b8: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd178: 0x10bd178: lui   a1, 0x10000
+// 0x010bd7c0: 0x10bd7c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bd17c: 0x10bd17c: addu  a0, v0, zero
+// 0x010bd7c4: 0x10bd7c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bd180: 0x10bd180: jal   0x104cb30 addiu a1, a1, -31052
+// 0x010bd7c8: 0x10bd7c8: jal   0x104cb40 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -1912,14 +1912,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd188: 0x10bd188: lw    ra, 20(sp)
-// 0x010bd18c: 0x10bd18c: sll   zero, zero, 0
-// 0x010bd190: 0x10bd190: jr    ra addiu sp, sp, 24
+// 0x010bd7d0: 0x10bd7d0: lw    ra, 20(sp)
+// 0x010bd7d4: 0x10bd7d4: sll   zero, zero, 0
+// 0x010bd7d8: 0x10bd7d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1931,7 +1931,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_active_file_name_10bd198(int32,int32,int32,int32,int32)
+.method public static int32 get_active_file_name_10bd7e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1969,13 +1969,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd198: 0x10bd198: addiu sp, sp, -32
+// 0x010bd7e0: 0x10bd7e0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010bd19c: 0x10bd19c: sw    ra, 28(sp)
-// 0x010bd1a0: 0x10bd1a0: jal   0x10bd168 sw    s0, 24(sp)
+// 0x010bd7e4: 0x10bd7e4: sw    ra, 28(sp)
+// 0x010bd7e8: 0x10bd7e8: jal   0x10bd7b0 sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1989,23 +1989,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::get_data_dir_10bd168(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::get_data_dir_10bd7b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd1a8: 0x10bd1a8: lui   a1, 0x20000
+// 0x010bd7f0: 0x10bd7f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bd1ac: 0x10bd1ac: addu  s0, v0, zero
+// 0x010bd7f4: 0x10bd7f4: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010bd1b0: 0x10bd1b0: addu  a0, v0, zero
+// 0x010bd7f8: 0x10bd7f8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bd1b4: 0x10bd1b4: jal   0x104cb30 addiu a1, a1, 22932
+// 0x010bd7fc: 0x10bd7fc: jal   0x104cb40 addiu a1, a1, 23392
 	ldloc.2
-	ldc.i4 22932
+	ldc.i4 23392
 	add
 	stloc.2
 	ldloc.0
@@ -2013,15 +2013,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd1bc: 0x10bd1bc: addu  a0, s0, zero
+// 0x010bd804: 0x10bd804: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010bd1c0: 0x10bd1c0: jal   0x104c670 sw    v0, 16(sp)
+// 0x010bd808: 0x10bd808: jal   0x104c680 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2035,13 +2035,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd1c8: 0x10bd1c8: lw    ra, 28(sp)
-// 0x010bd1cc: 0x10bd1cc: lw    v0, 16(sp)
+// 0x010bd810: 0x10bd810: lw    ra, 28(sp)
+// 0x010bd814: 0x10bd814: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2050,7 +2050,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd1d0: 0x10bd1d0: lw    s0, 24(sp)
+// 0x010bd818: 0x10bd818: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2059,7 +2059,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bd1d4: 0x10bd1d4: jr    ra addiu sp, sp, 32
+// 0x010bd81c: 0x10bd81c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2071,7 +2071,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 gps_data_status_10bd1dc(int32,int32,int32,int32,int32)
+.method public static int32 gps_data_status_10bd824(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 ra)
@@ -2115,28 +2115,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd1dc: 0x10bd1dc: lui   a0, 0x0
+// 0x010bd824: 0x10bd824: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bd1e0: 0x10bd1e0: lui   a1, 0x0
+// 0x010bd828: 0x10bd828: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd1e4: 0x10bd1e4: addiu sp, sp, -48
+// 0x010bd82c: 0x10bd82c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010bd1e8: 0x10bd1e8: addiu a0, a0, 19512
+// 0x010bd830: 0x10bd830: addiu a0, a0, 19512
 	ldloc.1
 	ldc.i4 19512
 	add
 	stloc.1
-// 0x010bd1ec: 0x10bd1ec: addiu a1, a1, 20820
+// 0x010bd834: 0x10bd834: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010bd1f0: 0x10bd1f0: sw    s2, 40(sp)
+// 0x010bd838: 0x10bd838: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2145,7 +2145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bd1f4: 0x10bd1f4: sw    s1, 36(sp)
+// 0x010bd83c: 0x10bd83c: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2154,8 +2154,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bd1f8: 0x10bd1f8: sw    ra, 44(sp)
-// 0x010bd1fc: 0x10bd1fc: sw    s0, 32(sp)
+// 0x010bd840: 0x10bd840: sw    ra, 44(sp)
+// 0x010bd844: 0x10bd844: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2164,7 +2164,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bd200: 0x10bd200: jal   0x100e7f4 lui   s1, 0xe0000
+// 0x010bd848: 0x10bd848: jal   0x100e804 lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
 	ldloc.0
@@ -2172,79 +2172,79 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd208: 0x10bd208: sw    v0, -15784(s1)
+// 0x010bd850: 0x10bd850: sw    v0, -15320(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3946
+	ldc.i4 -3830
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bd20c: 0x10bd20c: bne   v0, zero, 0x10bd22c lui   s2, 0xe0000
+// 0x010bd854: 0x10bd854: bne   v0, zero, 0x10bd874 lui   s2, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 9
-	brtrue L_10bd22c
+	brtrue L_10bd874
 // --- basic block ---
-// 0x010bd214: 0x10bd214: lw    a0, -15792(s2)
+// 0x010bd85c: 0x10bd85c: lw    a0, -15328(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3948
+	ldc.i4 -3832
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd218: 0x10bd218: sll   zero, zero, 0
-// 0x010bd21c: 0x10bd21c: bne   a0, zero, 0x10bd244 sll   zero, zero, 0
+// 0x010bd860: 0x10bd860: sll   zero, zero, 0
+// 0x010bd864: 0x10bd864: bne   a0, zero, 0x10bd88c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10bd244
+	brtrue L_10bd88c
 // --- basic block ---
-// 0x010bd224: 0x10bd224: j	 0x10bd30c sll   zero, zero, 0
-	br L_10bd30c
+// 0x010bd86c: 0x10bd86c: j	 0x10bd954 sll   zero, zero, 0
+	br L_10bd954
 // --- basic block ---
-L_10bd22c:
-// 0x010bd22c: 0x10bd22c: lw    v0, -15792(s2)
+L_10bd874:
+// 0x010bd874: 0x10bd874: lw    v0, -15328(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3948
+	ldc.i4 -3832
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd230: 0x10bd230: sll   zero, zero, 0
-// 0x010bd234: 0x10bd234: bne   v0, zero, 0x10bd30c sll   zero, zero, 0
+// 0x010bd878: 0x10bd878: sll   zero, zero, 0
+// 0x010bd87c: 0x10bd87c: bne   v0, zero, 0x10bd954 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bd30c
+	brtrue L_10bd954
 // --- basic block ---
-// 0x010bd23c: 0x10bd23c: j	 0x10bd274 sll   zero, zero, 0
-	br L_10bd274
+// 0x010bd884: 0x10bd884: j	 0x10bd8bc sll   zero, zero, 0
+	br L_10bd8bc
 // --- basic block ---
-L_10bd244:
-// 0x010bd244: 0x10bd244: jal   0x104d44c sll   zero, zero, 0
+L_10bd88c:
+// 0x010bd88c: 0x10bd88c: jal   0x104d45c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd24c: 0x10bd24c: jal   0x10bd168 sw    zero, -15792(s2)
+// 0x010bd894: 0x10bd894: jal   0x10bd7b0 sw    zero, -15328(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3948
+	ldc.i4 -3832
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2253,23 +2253,23 @@ L_10bd244:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::get_data_dir_10bd168(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::get_data_dir_10bd7b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd254: 0x10bd254: lui   a1, 0x20000
+// 0x010bd89c: 0x10bd89c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bd258: 0x10bd258: addu  a0, v0, zero
+// 0x010bd8a0: 0x10bd8a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bd25c: 0x10bd25c: addiu a1, a1, 22932
+// 0x010bd8a4: 0x10bd8a4: addiu a1, a1, 23392
 	ldloc.2
-	ldc.i4 22932
+	ldc.i4 23392
 	add
 	stloc.2
-// 0x010bd260: 0x10bd260: jal   0x104da04 sw    v0, 24(sp)
+// 0x010bd8a8: 0x10bd8a8: jal   0x104da14 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2283,12 +2283,12 @@ L_10bd244:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd268: 0x10bd268: lw    v0, 24(sp)
+// 0x010bd8b0: 0x10bd8b0: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2297,24 +2297,24 @@ L_10bd244:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd26c: 0x10bd26c: j	 0x10bd304 addu  a0, v0, zero
+// 0x010bd8b4: 0x10bd8b4: j	 0x10bd94c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	br L_10bd304
+	br L_10bd94c
 // --- basic block ---
-L_10bd274:
-// 0x010bd274: 0x10bd274: jal   0x10bd198 sll   zero, zero, 0
+L_10bd8bc:
+// 0x010bd8bc: 0x10bd8bc: jal   0x10bd7e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::get_active_file_name_10bd198(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::get_active_file_name_10bd7e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd27c: 0x10bd27c: jal   0x10bd168 addu  s0, v0, zero
+// 0x010bd8c4: 0x10bd8c4: jal   0x10bd7b0 addu  s0, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -2322,15 +2322,15 @@ L_10bd274:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::get_data_dir_10bd168(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::get_data_dir_10bd7b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd284: 0x10bd284: addu  a0, v0, zero
+// 0x010bd8cc: 0x10bd8cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bd288: 0x10bd288: jal   0x104c6f4 sw    v0, 24(sp)
+// 0x010bd8d0: 0x10bd8d0: jal   0x104c704 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2344,12 +2344,12 @@ L_10bd274:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_create_104c6f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_create_104c704(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd290: 0x10bd290: lw    v0, 24(sp)
+// 0x010bd8d8: 0x10bd8d8: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2358,7 +2358,7 @@ L_10bd274:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd294: 0x10bd294: jal   0x104c670 addu  a0, v0, zero
+// 0x010bd8dc: 0x10bd8dc: jal   0x104c680 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2366,18 +2366,18 @@ L_10bd274:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd29c: 0x10bd29c: lui   a1, 0x0
+// 0x010bd8e4: 0x10bd8e4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd2a0: 0x10bd2a0: addu  a0, s0, zero
+// 0x010bd8e8: 0x10bd8e8: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010bd2a4: 0x10bd2a4: jal   0x104dd10 addiu a1, a1, 28676
+// 0x010bd8ec: 0x10bd8ec: jal   0x104dd20 addiu a1, a1, 28676
 	ldloc.2
 	ldc.i4 28676
 	add
@@ -2387,93 +2387,93 @@ L_10bd274:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd2ac: 0x10bd2ac: beq   v0, zero, 0x10bd2dc sw    v0, -15792(s2)
+// 0x010bd8f4: 0x10bd8f4: beq   v0, zero, 0x10bd924 sw    v0, -15328(s2)
 	ldloc 5
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3948
+	ldc.i4 -3832
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_10bd2dc
+	brfalse L_10bd924
 // --- basic block ---
-// 0x010bd2b4: 0x10bd2b4: lui   s1, 0xe0000
+// 0x010bd8fc: 0x10bd8fc: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010bd2b8: 0x10bd2b8: lw    v0, -15788(s1)
+// 0x010bd900: 0x10bd900: lw    v0, -15324(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3947
+	ldc.i4 -3831
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd2bc: 0x10bd2bc: sll   zero, zero, 0
-// 0x010bd2c0: 0x10bd2c0: bne   v0, zero, 0x10bd300 lui   a0, 0x10c0000
+// 0x010bd904: 0x10bd904: sll   zero, zero, 0
+// 0x010bd908: 0x10bd908: bne   v0, zero, 0x10bd948 lui   a0, 0x10c0000
 	ldloc 5
 	ldc.i4 17563648
 	stloc.1
-	brtrue L_10bd300
+	brtrue L_10bd948
 // --- basic block ---
-// 0x010bd2c8: 0x10bd2c8: jal   0x1030e1c addiu a0, a0, -11252
+// 0x010bd910: 0x10bd910: jal   0x1030e2c addiu a0, a0, -9644
 	ldloc.1
-	ldc.i4 -11252
+	ldc.i4 -9644
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl35::roadmap_gps_register_logger_1030e1c(int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_logger_1030e2c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd2d0: 0x10bd2d0: addiu v0, zero, 1
+// 0x010bd918: 0x10bd918: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010bd2d4: 0x10bd2d4: j	 0x10bd300 sw    v0, -15788(s1)
+// 0x010bd91c: 0x10bd91c: j	 0x10bd948 sw    v0, -15324(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3947
+	ldc.i4 -3831
 	add
 	ldloc 5
 	stelem.i4
-	br L_10bd300
+	br L_10bd948
 // --- basic block ---
-L_10bd2dc:
-// 0x010bd2dc: 0x10bd2dc: lui   a1, 0x20000
+L_10bd924:
+// 0x010bd924: 0x10bd924: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bd2e0: 0x10bd2e0: lui   a3, 0x20000
+// 0x010bd928: 0x10bd928: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bd2e4: 0x10bd2e4: addiu a1, a1, 22948
+// 0x010bd92c: 0x10bd92c: addiu a1, a1, 23408
 	ldloc.2
-	ldc.i4 22948
+	ldc.i4 23408
 	add
 	stloc.2
-// 0x010bd2e8: 0x10bd2e8: addiu a3, a3, 22992
+// 0x010bd930: 0x10bd930: addiu a3, a3, 23452
 	ldloc 4
-	ldc.i4 22992
+	ldc.i4 23452
 	add
 	stloc 4
-// 0x010bd2ec: 0x10bd2ec: addiu a0, zero, 4
+// 0x010bd934: 0x10bd934: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010bd2f0: 0x10bd2f0: addiu a2, zero, 111
+// 0x010bd938: 0x10bd938: addiu a2, zero, 111
 	ldc.i4.s 111
 	stloc.3
-// 0x010bd2f4: 0x10bd2f4: jal   0x100449c sw    s0, 16(sp)
+// 0x010bd93c: 0x10bd93c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2492,34 +2492,34 @@ L_10bd2dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd2fc: 0x10bd2fc: sw    zero, -15784(s1)
+// 0x010bd944: 0x10bd944: sw    zero, -15320(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3946
+	ldc.i4 -3830
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10bd300:
-// 0x010bd300: 0x10bd300: addu  a0, s0, zero
+L_10bd948:
+// 0x010bd948: 0x10bd948: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-L_10bd304:
-// 0x010bd304: 0x10bd304: jal   0x104c670 sll   zero, zero, 0
+L_10bd94c:
+// 0x010bd94c: 0x10bd94c: jal   0x104c680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bd30c:
-// 0x010bd30c: 0x10bd30c: lw    ra, 44(sp)
-// 0x010bd310: 0x10bd310: lw    s2, 40(sp)
+L_10bd954:
+// 0x010bd954: 0x10bd954: lw    ra, 44(sp)
+// 0x010bd958: 0x10bd958: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2528,7 +2528,7 @@ L_10bd30c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bd314: 0x10bd314: lw    s1, 36(sp)
+// 0x010bd95c: 0x10bd95c: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2537,7 +2537,7 @@ L_10bd30c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bd318: 0x10bd318: lw    s0, 32(sp)
+// 0x010bd960: 0x10bd960: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2546,7 +2546,7 @@ L_10bd30c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bd31c: 0x10bd31c: jr    ra addiu sp, sp, 48
+// 0x010bd964: 0x10bd964: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2558,7 +2558,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 gps_data_update_10bd40c(int32,int32,int32,int32,int32)
+.method public static int32 gps_data_update_10bda54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -2596,25 +2596,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd40c: 0x10bd40c: lui   v0, 0xe0000
+// 0x010bda54: 0x10bda54: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bd410: 0x10bd410: lw    v0, -15784(v0)
+// 0x010bda58: 0x10bda58: lw    v0, -15320(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3946
+	ldc.i4 -3830
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd414: 0x10bd414: addiu sp, sp, -128
+// 0x010bda5c: 0x10bda5c: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x010bd418: 0x10bd418: sw    ra, 124(sp)
-// 0x010bd41c: 0x10bd41c: beq   v0, zero, 0x10bd45c sw    s0, 120(sp)
+// 0x010bda60: 0x10bda60: sw    ra, 124(sp)
+// 0x010bda64: 0x10bda64: beq   v0, zero, 0x10bdaa4 sw    s0, 120(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -2624,28 +2624,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10bd45c
+	brfalse L_10bdaa4
 // --- basic block ---
-// 0x010bd424: 0x10bd424: addiu s0, sp, 16
+// 0x010bda6c: 0x10bda6c: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x010bd428: 0x10bd428: lui   a2, 0x20000
+// 0x010bda70: 0x10bda70: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bd42c: 0x10bd42c: addiu a2, a2, 23080
+// 0x010bda74: 0x10bda74: addiu a2, a2, 23540
 	ldloc.3
-	ldc.i4 23080
+	ldc.i4 23540
 	add
 	stloc.3
-// 0x010bd430: 0x10bd430: addu  a3, a0, zero
+// 0x010bda78: 0x10bda78: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x010bd434: 0x10bd434: addiu a1, zero, 100
+// 0x010bda7c: 0x10bda7c: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010bd438: 0x10bd438: jal   0x1000f9c addu  a0, s0, zero
+// 0x010bda80: 0x10bda80: jal   0x1000f9c addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2658,7 +2658,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd440: 0x10bd440: jal   0x1001b48 addu  a0, s0, zero
+// 0x010bda88: 0x10bda88: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
@@ -2667,22 +2667,22 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd448: 0x10bd448: lui   v1, 0xe0000
+// 0x010bda90: 0x10bda90: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010bd44c: 0x10bd44c: lw    a0, -15792(v1)
+// 0x010bda94: 0x10bda94: lw    a0, -15328(v1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3948
+	ldc.i4 -3832
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd450: 0x10bd450: addu  a1, s0, zero
+// 0x010bda98: 0x10bda98: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010bd454: 0x10bd454: jal   0x104d46c addu  a2, v0, zero
+// 0x010bda9c: 0x10bda9c: jal   0x104d47c addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -2690,14 +2690,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10bd45c:
-// 0x010bd45c: 0x10bd45c: lw    ra, 124(sp)
-// 0x010bd460: 0x10bd460: lw    s0, 120(sp)
+L_10bdaa4:
+// 0x010bdaa4: 0x10bdaa4: lw    ra, 124(sp)
+// 0x010bdaa8: 0x10bdaa8: lw    s0, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2706,7 +2706,7 @@ L_10bd45c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bd464: 0x10bd464: jr    ra addiu sp, sp, 128
+// 0x010bdaac: 0x10bdaac: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -2718,7 +2718,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_gps_data_initialize_10bd46c(int32,int32,int32,int32,int32)
+.method public static int32 editor_gps_data_initialize_10bdab4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -2753,53 +2753,53 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd46c: 0x10bd46c: lui   a0, 0x10000
+// 0x010bdab4: 0x10bdab4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bd470: 0x10bd470: lui   a1, 0x0
+// 0x010bdab8: 0x10bdab8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd474: 0x10bd474: lui   a2, 0x10c0000
+// 0x010bdabc: 0x10bdabc: lui   a2, 0x10c0000
 	ldc.i4 17563648
 	stloc.3
-// 0x010bd478: 0x10bd478: lui   a3, 0x20000
+// 0x010bdac0: 0x10bdac0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010bd47c: 0x10bd47c: lui   v0, 0x0
+// 0x010bdac4: 0x10bdac4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bd480: 0x10bd480: addiu sp, sp, -32
+// 0x010bdac8: 0x10bdac8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010bd484: 0x10bd484: addiu a0, a0, 12560
+// 0x010bdacc: 0x10bdacc: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010bd488: 0x10bd488: addiu a1, a1, 19512
+// 0x010bdad0: 0x10bdad0: addiu a1, a1, 19512
 	ldloc.2
 	ldc.i4 19512
 	add
 	stloc.2
-// 0x010bd48c: 0x10bd48c: addiu a2, a2, -11812
+// 0x010bdad4: 0x10bdad4: addiu a2, a2, -10204
 	ldloc.3
-	ldc.i4 -11812
+	ldc.i4 -10204
 	add
 	stloc.3
-// 0x010bd490: 0x10bd490: addiu a3, a3, 9464
+// 0x010bdad8: 0x10bdad8: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010bd494: 0x10bd494: addiu v0, v0, 20820
+// 0x010bdadc: 0x10bdadc: addiu v0, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
 	stloc 5
-// 0x010bd498: 0x10bd498: sw    ra, 28(sp)
-// 0x010bd49c: 0x10bd49c: sw    v0, 16(sp)
+// 0x010bdae0: 0x10bdae0: sw    ra, 28(sp)
+// 0x010bdae4: 0x10bdae4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2808,7 +2808,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bd4a0: 0x10bd4a0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010bdae8: 0x10bdae8: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2822,25 +2822,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd4a8: 0x10bd4a8: jal   0x10bd1dc sll   zero, zero, 0
+// 0x010bdaf0: 0x10bdaf0: jal   0x10bd824 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::gps_data_status_10bd1dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::gps_data_status_10bd824(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd4b0: 0x10bd4b0: lw    ra, 28(sp)
-// 0x010bd4b4: 0x10bd4b4: sll   zero, zero, 0
-// 0x010bd4b8: 0x10bd4b8: jr    ra addiu sp, sp, 32
+// 0x010bdaf8: 0x10bdaf8: lw    ra, 28(sp)
+// 0x010bdafc: 0x10bdafc: sll   zero, zero, 0
+// 0x010bdb00: 0x10bdb00: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2852,7 +2852,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_select_line_10bd4c0(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_select_line_10bdb08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 lo,int32 ra)
@@ -2899,15 +2899,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd4c0: 0x10bd4c0: addiu sp, sp, -32
+// 0x010bdb08: 0x10bdb08: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010bd4c4: 0x10bd4c4: lui   v0, 0xe0000
+// 0x010bdb0c: 0x10bdb0c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bd4c8: 0x10bd4c8: sw    s0, 16(sp)
+// 0x010bdb10: 0x10bdb10: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2916,19 +2916,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bd4cc: 0x10bd4cc: lw    s0, -14532(v0)
+// 0x010bdb14: 0x10bdb14: lw    s0, -14068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3633
+	ldc.i4 -3517
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bd4d0: 0x10bd4d0: lui   v0, 0xf0000
+// 0x010bdb18: 0x10bdb18: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010bd4d4: 0x10bd4d4: sw    s2, 24(sp)
+// 0x010bdb1c: 0x10bdb1c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2937,8 +2937,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bd4d8: 0x10bd4d8: sw    ra, 28(sp)
-// 0x010bd4dc: 0x10bd4dc: sw    s1, 20(sp)
+// 0x010bdb20: 0x10bdb20: sw    ra, 28(sp)
+// 0x010bdb24: 0x10bdb24: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2947,49 +2947,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bd4e0: 0x10bd4e0: addu  a1, a0, zero
+// 0x010bdb28: 0x10bdb28: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010bd4e4: 0x10bd4e4: addiu v0, v0, -22944
+// 0x010bdb2c: 0x10bdb2c: addiu v0, v0, -22480
 	ldloc 5
-	ldc.i4 -22944
+	ldc.i4 -22480
 	add
 	stloc 5
-// 0x010bd4e8: 0x10bd4e8: j	 0x10bd558 addu  s2, zero, zero
+// 0x010bdb30: 0x10bdb30: j	 0x10bdba0 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_10bd558
+	br L_10bdba0
 // --- basic block ---
-L_10bd4f0:
-// 0x010bd4f0: 0x10bd4f0: beq   a1, zero, 0x10bd550 sll   zero, zero, 0
+L_10bdb38:
+// 0x010bdb38: 0x10bdb38: beq   a1, zero, 0x10bdb98 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10bd550
+	brfalse L_10bdb98
 // --- basic block ---
-// 0x010bd4f8: 0x10bd4f8: lw    v1, 0(v0)
+// 0x010bdb40: 0x10bdb40: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010bd4fc: 0x10bd4fc: lw    a0, 0(a1)
+// 0x010bdb44: 0x10bdb44: lw    a0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bd500: 0x10bd500: sll   zero, zero, 0
-// 0x010bd504: 0x10bd504: bne   v1, a0, 0x10bd550 sll   zero, zero, 0
+// 0x010bdb48: 0x10bdb48: sll   zero, zero, 0
+// 0x010bdb4c: 0x10bdb4c: bne   v1, a0, 0x10bdb98 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_10bd550
+	bne.un L_10bdb98
 // --- basic block ---
-// 0x010bd50c: 0x10bd50c: bne   v1, zero, 0x10bd528 sll   zero, zero, 0
+// 0x010bdb54: 0x10bdb54: bne   v1, zero, 0x10bdb70 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10bd528
+	brtrue L_10bdb70
 // --- basic block ---
-// 0x010bd514: 0x10bd514: lw    a0, 12(v0)
+// 0x010bdb5c: 0x10bdb5c: lw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2998,7 +2998,7 @@ L_10bd4f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd518: 0x10bd518: lw    v1, 12(a1)
+// 0x010bdb60: 0x10bdb60: lw    v1, 12(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3007,14 +3007,14 @@ L_10bd4f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bd51c: 0x10bd51c: sll   zero, zero, 0
-// 0x010bd520: 0x10bd520: bne   a0, v1, 0x10bd550 sll   zero, zero, 0
+// 0x010bdb64: 0x10bdb64: sll   zero, zero, 0
+// 0x010bdb68: 0x10bdb68: bne   a0, v1, 0x10bdb98 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10bd550
+	bne.un L_10bdb98
 // --- basic block ---
-L_10bd528:
-// 0x010bd528: 0x10bd528: lw    a0, 4(v0)
+L_10bdb70:
+// 0x010bdb70: 0x10bdb70: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3023,7 +3023,7 @@ L_10bd528:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd52c: 0x10bd52c: lw    v1, 4(a1)
+// 0x010bdb74: 0x10bdb74: lw    v1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3032,13 +3032,13 @@ L_10bd528:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bd530: 0x10bd530: sll   zero, zero, 0
-// 0x010bd534: 0x10bd534: bne   a0, v1, 0x10bd550 sll   zero, zero, 0
+// 0x010bdb78: 0x10bdb78: sll   zero, zero, 0
+// 0x010bdb7c: 0x10bdb7c: bne   a0, v1, 0x10bdb98 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10bd550
+	bne.un L_10bdb98
 // --- basic block ---
-// 0x010bd53c: 0x10bd53c: lw    a0, 16(v0)
+// 0x010bdb84: 0x10bdb84: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3047,7 +3047,7 @@ L_10bd528:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd540: 0x10bd540: lw    v1, 16(a1)
+// 0x010bdb88: 0x10bdb88: lw    v1, 16(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3056,73 +3056,73 @@ L_10bd528:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bd544: 0x10bd544: sll   zero, zero, 0
-// 0x010bd548: 0x10bd548: beq   a0, v1, 0x10bd56c addiu s1, zero, 20
+// 0x010bdb8c: 0x10bdb8c: sll   zero, zero, 0
+// 0x010bdb90: 0x10bdb90: beq   a0, v1, 0x10bdbb4 addiu s1, zero, 20
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 20
 	stloc 8
-	beq  L_10bd56c
+	beq  L_10bdbb4
 // --- basic block ---
-L_10bd550:
-// 0x010bd550: 0x10bd550: addiu s2, s2, 1
+L_10bdb98:
+// 0x010bdb98: 0x10bdb98: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x010bd554: 0x10bd554: addiu v0, v0, 20
+// 0x010bdb9c: 0x10bdb9c: addiu v0, v0, 20
 	ldloc 5
 	ldc.i4.s 20
 	add
 	stloc 5
-L_10bd558:
-// 0x010bd558: 0x10bd558: slt   v1, s2, s0
+L_10bdba0:
+// 0x010bdba0: 0x10bdba0: slt   v1, s2, s0
 	ldloc 10
 	ldloc 9
 	clt
 	stloc 7
-// 0x010bd55c: 0x10bd55c: bne   v1, zero, 0x10bd4f0 sll   zero, zero, 0
+// 0x010bdba4: 0x10bdba4: bne   v1, zero, 0x10bdb38 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10bd4f0
+	brtrue L_10bdb38
 // --- basic block ---
-// 0x010bd564: 0x10bd564: j	 0x10bd5dc slti  v0, s0, 100
+// 0x010bdbac: 0x10bdbac: j	 0x10bdc24 slti  v0, s0, 100
 	ldloc 9
 	ldc.i4.s 100
 	clt
 	stloc 5
-	br L_10bd5dc
+	br L_10bdc24
 // --- basic block ---
-L_10bd56c:
-// 0x010bd56c: 0x10bd56c: addiu s2, s2, 1
+L_10bdbb4:
+// 0x010bdbb4: 0x10bdbb4: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x010bd570: 0x10bd570: mult  s2, s1
+// 0x010bdbb8: 0x10bdbb8: mult  s2, s1
 	ldloc 10
 	ldloc 8
 	mul
 	stloc 11
-// 0x010bd574: 0x10bd574: lui   s1, 0xf0000
+// 0x010bdbbc: 0x10bdbbc: lui   s1, 0xf0000
 	ldc.i4 983040
 	stloc 8
-// 0x010bd578: 0x10bd578: addiu s1, s1, -22944
+// 0x010bdbc0: 0x10bdbc0: addiu s1, s1, -22480
 	ldloc 8
-	ldc.i4 -22944
+	ldc.i4 -22480
 	add
 	stloc 8
-// 0x010bd57c: 0x10bd57c: mflo  lo
+// 0x010bdbc4: 0x10bdbc4: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x010bd580: 0x10bd580: j	 0x10bd594 addu  s1, s1, v0
+// 0x010bdbc8: 0x10bdbc8: j	 0x10bdbdc addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-	br L_10bd594
+	br L_10bdbdc
 // --- basic block ---
-L_10bd588:
-// 0x010bd588: 0x10bd588: jal   0x1001800 addiu s2, s2, 1
+L_10bdbd0:
+// 0x010bdbd0: 0x10bdbd0: jal   0x1001800 addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
@@ -3136,64 +3136,64 @@ L_10bd588:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd590: 0x10bd590: addiu s1, s1, 20
+// 0x010bdbd8: 0x10bdbd8: addiu s1, s1, 20
 	ldloc 8
 	ldc.i4.s 20
 	add
 	stloc 8
-L_10bd594:
-// 0x010bd594: 0x10bd594: slt   v0, s2, s0
+L_10bdbdc:
+// 0x010bdbdc: 0x10bdbdc: slt   v0, s2, s0
 	ldloc 10
 	ldloc 9
 	clt
 	stloc 5
-// 0x010bd598: 0x10bd598: addiu a0, s1, -20
+// 0x010bdbe0: 0x10bdbe0: addiu a0, s1, -20
 	ldloc 8
 	ldc.i4.s -20
 	add
 	stloc.1
-// 0x010bd59c: 0x10bd59c: addu  a1, s1, zero
+// 0x010bdbe4: 0x10bdbe4: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010bd5a0: 0x10bd5a0: bne   v0, zero, 0x10bd588 addiu a2, zero, 20
+// 0x010bdbe8: 0x10bdbe8: bne   v0, zero, 0x10bdbd0 addiu a2, zero, 20
 	ldloc 5
 	ldc.i4.s 20
 	stloc.3
-	brtrue L_10bd588
+	brtrue L_10bdbd0
 // --- basic block ---
-// 0x010bd5a8: 0x10bd5a8: j	 0x10bd5d0 addiu s0, s0, -1
+// 0x010bdbf0: 0x10bdbf0: j	 0x10bdc18 addiu s0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-	br L_10bd5d0
+	br L_10bdc18
 // --- basic block ---
-L_10bd5b0:
-// 0x010bd5b0: 0x10bd5b0: mult  s0, v0
+L_10bdbf8:
+// 0x010bdbf8: 0x10bdbf8: mult  s0, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 11
-// 0x010bd5b4: 0x10bd5b4: lui   a0, 0xf0000
+// 0x010bdbfc: 0x10bdbfc: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x010bd5b8: 0x10bd5b8: addiu a0, a0, -22944
+// 0x010bdc00: 0x10bdc00: addiu a0, a0, -22480
 	ldloc.1
-	ldc.i4 -22944
+	ldc.i4 -22480
 	add
 	stloc.1
-// 0x010bd5bc: 0x10bd5bc: addiu a2, zero, 20
+// 0x010bdc04: 0x10bdc04: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x010bd5c0: 0x10bd5c0: addiu s0, s0, 1
+// 0x010bdc08: 0x10bdc08: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010bd5c4: 0x10bd5c4: mflo  lo
+// 0x010bdc0c: 0x10bdc0c: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x010bd5c8: 0x10bd5c8: jal   0x1001800 addu  a0, a0, v0
+// 0x010bdc10: 0x10bdc10: jal   0x1001800 addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
@@ -3207,31 +3207,31 @@ L_10bd5b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bd5d0:
-// 0x010bd5d0: 0x10bd5d0: lui   v0, 0xe0000
+L_10bdc18:
+// 0x010bdc18: 0x10bdc18: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bd5d4: 0x10bd5d4: j	 0x10bd5e4 sw    s0, -14532(v0)
+// 0x010bdc1c: 0x10bdc1c: j	 0x10bdc2c sw    s0, -14068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3633
+	ldc.i4 -3517
 	add
 	ldloc 9
 	stelem.i4
-	br L_10bd5e4
+	br L_10bdc2c
 // --- basic block ---
-L_10bd5dc:
-// 0x010bd5dc: 0x10bd5dc: bne   v0, zero, 0x10bd5b0 addiu v0, zero, 20
+L_10bdc24:
+// 0x010bdc24: 0x10bdc24: bne   v0, zero, 0x10bdbf8 addiu v0, zero, 20
 	ldloc 5
 	ldc.i4.s 20
 	stloc 5
-	brtrue L_10bd5b0
+	brtrue L_10bdbf8
 // --- basic block ---
-L_10bd5e4:
-// 0x010bd5e4: 0x10bd5e4: lw    ra, 28(sp)
-// 0x010bd5e8: 0x10bd5e8: lw    s2, 24(sp)
+L_10bdc2c:
+// 0x010bdc2c: 0x10bdc2c: lw    ra, 28(sp)
+// 0x010bdc30: 0x10bdc30: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3240,7 +3240,7 @@ L_10bd5e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bd5ec: 0x10bd5ec: lw    s1, 20(sp)
+// 0x010bdc34: 0x10bdc34: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3249,7 +3249,7 @@ L_10bd5e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bd5f0: 0x10bd5f0: lw    s0, 16(sp)
+// 0x010bdc38: 0x10bdc38: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3258,7 +3258,7 @@ L_10bd5e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bd5f4: 0x10bd5f4: jr    ra addiu sp, sp, 32
+// 0x010bdc3c: 0x10bdc3c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3270,7 +3270,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_line_iter_cb_10bd5fc(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_line_iter_cb_10bdc44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -3305,28 +3305,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd5fc: 0x10bd5fc: addiu sp, sp, -24
+// 0x010bdc44: 0x10bdc44: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd600: 0x10bd600: sw    ra, 20(sp)
-// 0x010bd604: 0x10bd604: jal   0x10bd4c0 sll   zero, zero, 0
+// 0x010bdc48: 0x10bdc48: sw    ra, 20(sp)
+// 0x010bdc4c: 0x10bdc4c: jal   0x10bdb08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_select_line_10bd4c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_select_line_10bdb08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bd60c: 0x10bd60c: lw    ra, 20(sp)
-// 0x010bd610: 0x10bd610: addu  v0, zero, zero
+// 0x010bdc54: 0x10bdc54: lw    ra, 20(sp)
+// 0x010bdc58: 0x10bdc58: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010bd614: 0x10bd614: jr    ra addiu sp, sp, 24
+// 0x010bdc5c: 0x10bdc5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3338,7 +3338,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_screen_short_click_10bd61c()
+.method public static int32 editor_screen_short_click_10bdc64()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -3352,7 +3352,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd61c: 0x10bd61c: jr    ra addu  v0, zero, zero
+// 0x010bdc64: 0x10bdc64: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -3360,7 +3360,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 editor_screen_reset_selected_10bd694(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_reset_selected_10bdcdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3395,21 +3395,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd694: 0x10bd694: addiu sp, sp, -24
+// 0x010bdcdc: 0x10bdcdc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd698: 0x10bd698: lui   v0, 0xe0000
+// 0x010bdce0: 0x10bdce0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bd69c: 0x10bd69c: sw    ra, 20(sp)
-// 0x010bd6a0: 0x10bd6a0: jal   0x1021900 sw    zero, -14532(v0)
+// 0x010bdce4: 0x10bdce4: sw    ra, 20(sp)
+// 0x010bdce8: 0x10bdce8: jal   0x1021910 sw    zero, -14068(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3633
+	ldc.i4 -3517
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3418,14 +3418,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bd6a8: 0x10bd6a8: lw    ra, 20(sp)
-// 0x010bd6ac: 0x10bd6ac: sll   zero, zero, 0
-// 0x010bd6b0: 0x10bd6b0: jr    ra addiu sp, sp, 24
+// 0x010bdcf0: 0x10bdcf0: lw    ra, 20(sp)
+// 0x010bdcf4: 0x10bdcf4: sll   zero, zero, 0
+// 0x010bdcf8: 0x10bdcf8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3437,7 +3437,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_wazzy_name_10bd6b8(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_wazzy_name_10bdd00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3472,16 +3472,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd6b8: 0x10bd6b8: lui   a0, 0x0
+// 0x010bdd00: 0x10bdd00: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bd6bc: 0x10bd6bc: addiu sp, sp, -24
+// 0x010bdd04: 0x10bdd04: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd6c0: 0x10bd6c0: sw    ra, 20(sp)
-// 0x010bd6c4: 0x10bd6c4: jal   0x100e348 addiu a0, a0, 19536
+// 0x010bdd08: 0x10bdd08: sw    ra, 20(sp)
+// 0x010bdd0c: 0x10bdd0c: jal   0x100e358 addiu a0, a0, 19536
 	ldloc.1
 	ldc.i4 19536
 	add
@@ -3491,14 +3491,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010bd6cc: 0x10bd6cc: lw    ra, 20(sp)
-// 0x010bd6d0: 0x10bd6d0: sll   zero, zero, 0
-// 0x010bd6d4: 0x10bd6d4: jr    ra addiu sp, sp, 24
+// 0x010bdd14: 0x10bdd14: lw    ra, 20(sp)
+// 0x010bdd18: 0x10bdd18: sll   zero, zero, 0
+// 0x010bdd1c: 0x10bdd1c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3510,7 +3510,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3545,24 +3545,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd6dc: 0x10bd6dc: lui   a0, 0x0
+// 0x010bdd24: 0x10bdd24: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bd6e0: 0x10bd6e0: lui   a1, 0x0
+// 0x010bdd28: 0x10bdd28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd6e4: 0x10bd6e4: addiu sp, sp, -24
+// 0x010bdd2c: 0x10bdd2c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd6e8: 0x10bd6e8: addiu a0, a0, 19552
+// 0x010bdd30: 0x10bdd30: addiu a0, a0, 19552
 	ldloc.1
 	ldc.i4 19552
 	add
 	stloc.1
-// 0x010bd6ec: 0x10bd6ec: sw    ra, 20(sp)
-// 0x010bd6f0: 0x10bd6f0: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010bdd34: 0x10bdd34: sw    ra, 20(sp)
+// 0x010bdd38: 0x10bdd38: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3572,14 +3572,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010bd6f8: 0x10bd6f8: lw    ra, 20(sp)
-// 0x010bd6fc: 0x10bd6fc: sll   zero, zero, 0
-// 0x010bd700: 0x10bd700: jr    ra addiu sp, sp, 24
+// 0x010bdd40: 0x10bdd40: lw    ra, 20(sp)
+// 0x010bdd44: 0x10bdd44: sll   zero, zero, 0
+// 0x010bdd48: 0x10bdd48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3591,7 +3591,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_screen_overide_car_10bd708(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_overide_car_10bdd50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
@@ -3632,13 +3632,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd708: 0x10bd708: addiu sp, sp, -56
+// 0x010bdd50: 0x10bdd50: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010bd70c: 0x10bd70c: sw    ra, 52(sp)
-// 0x010bd710: 0x10bd710: sw    s1, 48(sp)
+// 0x010bdd54: 0x10bdd54: sw    ra, 52(sp)
+// 0x010bdd58: 0x10bdd58: sw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3647,7 +3647,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bd714: 0x10bd714: jal   0x10bd6dc sw    s0, 44(sp)
+// 0x010bdd5c: 0x10bdd5c: jal   0x10bdd24 sw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3661,18 +3661,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd71c: 0x10bd71c: bne   v0, zero, 0x10bd734 lui   v0, 0xe0000
+// 0x010bdd64: 0x10bdd64: bne   v0, zero, 0x10bdd7c lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brtrue L_10bd734
+	brtrue L_10bdd7c
 // --- basic block ---
-// 0x010bd724: 0x10bd724: jal   0x1020f7c addu  a0, zero, zero
+// 0x010bdd6c: 0x10bdd6c: jal   0x1020f8c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3680,49 +3680,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd72c: 0x10bd72c: j	 0x10bd8a0 addu  s1, zero, zero
+// 0x010bdd74: 0x10bdd74: j	 0x10bdee8 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10bd8a0
+	br L_10bdee8
 // --- basic block ---
-L_10bd734:
-// 0x010bd734: 0x10bd734: lw    s1, -15780(v0)
+L_10bdd7c:
+// 0x010bdd7c: 0x10bdd7c: lw    s1, -15316(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3945
+	ldc.i4 -3829
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bd738: 0x10bd738: sll   zero, zero, 0
-// 0x010bd73c: 0x10bd73c: bne   s1, zero, 0x10bd8a0 sll   zero, zero, 0
+// 0x010bdd80: 0x10bdd80: sll   zero, zero, 0
+// 0x010bdd84: 0x10bdd84: bne   s1, zero, 0x10bdee8 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_10bd8a0
+	brtrue L_10bdee8
 // --- basic block ---
-// 0x010bd744: 0x10bd744: jal   0x10b0c7c sll   zero, zero, 0
+// 0x010bdd8c: 0x10bdd8c: jal   0x10b12c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_is_new_road_10b0c7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_is_new_road_10b12c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd74c: 0x10bd74c: beq   v0, zero, 0x10bd798 lui   v0, 0x0
+// 0x010bdd94: 0x10bdd94: beq   v0, zero, 0x10bdde0 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10bd798
+	brfalse L_10bdde0
 // --- basic block ---
-// 0x010bd754: 0x10bd754: lw    v1, 19528(v0)
+// 0x010bdd9c: 0x10bdd9c: lw    v1, 19528(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3731,27 +3731,27 @@ L_10bd734:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bd758: 0x10bd758: addiu a0, zero, 3
+// 0x010bdda0: 0x10bdda0: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010bd75c: 0x10bd75c: bne   v1, a0, 0x10bd76c sll   zero, zero, 0
+// 0x010bdda4: 0x10bdda4: bne   v1, a0, 0x10bddb4 sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	bne.un L_10bd76c
+	bne.un L_10bddb4
 // --- basic block ---
-// 0x010bd764: 0x10bd764: j	 0x10bd770 addiu v1, zero, 1
+// 0x010bddac: 0x10bddac: j	 0x10bddb8 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10bd770
+	br L_10bddb8
 // --- basic block ---
-L_10bd76c:
-// 0x010bd76c: 0x10bd76c: addiu v1, v1, 1
+L_10bddb4:
+// 0x010bddb4: 0x10bddb4: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_10bd770:
-// 0x010bd770: 0x10bd770: sw    v1, 19528(v0)
+L_10bddb8:
+// 0x010bddb8: 0x10bddb8: sw    v1, 19528(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3760,13 +3760,13 @@ L_10bd770:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bd774: 0x10bd774: lui   v0, 0x0
+// 0x010bddbc: 0x10bddbc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bd778: 0x10bd778: lui   s0, 0xe0000
+// 0x010bddc0: 0x10bddc0: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x010bd77c: 0x10bd77c: lw    a2, 19528(v0)
+// 0x010bddc4: 0x10bddc4: lw    a2, 19528(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3775,17 +3775,17 @@ L_10bd770:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bd780: 0x10bd780: lui   a1, 0x20000
+// 0x010bddc8: 0x10bddc8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bd784: 0x10bd784: addiu a1, a1, 23112
+// 0x010bddcc: 0x10bddcc: addiu a1, a1, 23572
 	ldloc.2
-	ldc.i4 23112
+	ldc.i4 23572
 	add
 	stloc.2
-// 0x010bd788: 0x10bd788: jal   0x1000f64 addiu a0, s0, -15772
+// 0x010bddd0: 0x10bddd0: jal   0x1000f64 addiu a0, s0, -15308
 	ldloc 9
-	ldc.i4 -15772
+	ldc.i4 -15308
 	add
 	stloc.1
 	ldloc.0
@@ -3798,32 +3798,32 @@ L_10bd770:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd790: 0x10bd790: j	 0x10bd8a0 addiu s1, s0, -15772
+// 0x010bddd8: 0x10bddd8: j	 0x10bdee8 addiu s1, s0, -15308
 	ldloc 9
-	ldc.i4 -15772
+	ldc.i4 -15308
 	add
 	stloc 8
-	br L_10bd8a0
+	br L_10bdee8
 // --- basic block ---
-L_10bd798:
-// 0x010bd798: 0x10bd798: jal   0x10b09c8 sll   zero, zero, 0
+L_10bdde0:
+// 0x010bdde0: 0x10bdde0: jal   0x10b1010 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_is_new_direction_roads_10b09c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_is_new_direction_roads_10b1010(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd7a0: 0x10bd7a0: bne   v0, zero, 0x10bd7f4 lui   v0, 0x0
+// 0x010bdde8: 0x10bdde8: bne   v0, zero, 0x10bde3c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10bd7f4
+	brtrue L_10bde3c
 // --- basic block ---
-// 0x010bd7a8: 0x10bd7a8: lw    v1, 19532(v0)
+// 0x010bddf0: 0x10bddf0: lw    v1, 19532(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3832,53 +3832,53 @@ L_10bd798:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bd7ac: 0x10bd7ac: addiu v0, zero, -1
+// 0x010bddf4: 0x10bddf4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010bd7b0: 0x10bd7b0: beq   v1, v0, 0x10bd7d0 lui   s0, 0xe0000
+// 0x010bddf8: 0x10bddf8: beq   v1, v0, 0x10bde18 lui   s0, 0xe0000
 	ldloc 6
 	ldloc 5
 	ldc.i4 917504
 	stloc 9
-	beq  L_10bd7d0
+	beq  L_10bde18
 // --- basic block ---
-// 0x010bd7b8: 0x10bd7b8: jal   0x10b08e4 sll   zero, zero, 0
-	call int32 Cibyl132::export_track_num_points_10b08e4()
+// 0x010bde00: 0x10bde00: jal   0x10b0f2c sll   zero, zero, 0
+	call int32 Cibyl132::export_track_num_points_10b0f2c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd7c0: 0x10bd7c0: slti  v0, v0, 2
+// 0x010bde08: 0x10bde08: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010bd7c4: 0x10bd7c4: bne   v0, zero, 0x10bd7f4 lui   v0, 0x0
+// 0x010bde0c: 0x10bde0c: bne   v0, zero, 0x10bde3c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10bd7f4
+	brtrue L_10bde3c
 // --- basic block ---
-// 0x010bd7cc: 0x10bd7cc: lui   s0, 0xe0000
+// 0x010bde14: 0x10bde14: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 9
-L_10bd7d0:
-// 0x010bd7d0: 0x10bd7d0: lw    v0, -15776(s0)
+L_10bde18:
+// 0x010bde18: 0x10bde18: lw    v0, -15312(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3944
+	ldc.i4 -3828
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd7d4: 0x10bd7d4: addiu a0, zero, -1
+// 0x010bde1c: 0x10bde1c: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010bd7d8: 0x10bd7d8: lui   v1, 0x0
+// 0x010bde20: 0x10bde20: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010bd7dc: 0x10bd7dc: beq   v0, zero, 0x10bd8a0 sw    a0, 19532(v1)
+// 0x010bde24: 0x10bde24: beq   v0, zero, 0x10bdee8 sw    a0, 19532(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
@@ -3888,9 +3888,9 @@ L_10bd7d0:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_10bd8a0
+	brfalse L_10bdee8
 // --- basic block ---
-// 0x010bd7e4: 0x10bd7e4: jal   0x1020f7c addu  a0, zero, zero
+// 0x010bde2c: 0x10bde2c: jal   0x1020f8c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3898,24 +3898,24 @@ L_10bd7d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd7ec: 0x10bd7ec: j	 0x10bd8a0 sw    zero, -15776(s0)
+// 0x010bde34: 0x10bde34: j	 0x10bdee8 sw    zero, -15312(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3944
+	ldc.i4 -3828
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10bd8a0
+	br L_10bdee8
 // --- basic block ---
-L_10bd7f4:
-// 0x010bd7f4: 0x10bd7f4: lw    a0, 19532(v0)
+L_10bde3c:
+// 0x010bde3c: 0x10bde3c: lw    a0, 19532(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3924,17 +3924,17 @@ L_10bd7f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bd7f8: 0x10bd7f8: addiu v1, zero, -1
+// 0x010bde40: 0x10bde40: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010bd7fc: 0x10bd7fc: bne   a0, v1, 0x10bd808 addiu v1, zero, 3
+// 0x010bde44: 0x10bde44: bne   a0, v1, 0x10bde50 addiu v1, zero, 3
 	ldloc.1
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	bne.un L_10bd808
+	bne.un L_10bde50
 // --- basic block ---
-// 0x010bd804: 0x10bd804: sw    v1, 19532(v0)
+// 0x010bde4c: 0x10bde4c: sw    v1, 19532(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3943,8 +3943,8 @@ L_10bd7f4:
 	add
 	ldloc 6
 	stelem.i4
-L_10bd808:
-// 0x010bd808: 0x10bd808: jal   0x1020f7c addiu a0, zero, 40
+L_10bde50:
+// 0x010bde50: 0x10bde50: jal   0x1020f8c addiu a0, zero, 40
 	ldc.i4.s 40
 	stloc.1
 	ldloc.0
@@ -3952,34 +3952,34 @@ L_10bd808:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd810: 0x10bd810: addiu v1, zero, 1
+// 0x010bde58: 0x10bde58: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010bd814: 0x10bd814: lui   v0, 0xe0000
+// 0x010bde5c: 0x10bde5c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bd818: 0x10bd818: addiu a0, sp, 16
+// 0x010bde60: 0x10bde60: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010bd81c: 0x10bd81c: addu  a1, zero, zero
+// 0x010bde64: 0x10bde64: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd820: 0x10bd820: addu  a2, zero, zero
+// 0x010bde68: 0x10bde68: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bd824: 0x10bd824: jal   0x1029da8 sw    v1, -15776(v0)
+// 0x010bde6c: 0x10bde6c: jal   0x1029db8 sw    v1, -15312(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3944
+	ldc.i4 -3828
 	add
 	ldloc 6
 	stelem.i4
@@ -3988,12 +3988,12 @@ L_10bd808:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd82c: 0x10bd82c: lw    v0, 28(sp)
+// 0x010bde74: 0x10bde74: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4002,60 +4002,60 @@ L_10bd808:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bd830: 0x10bd830: lui   s1, 0xe0000
+// 0x010bde78: 0x10bde78: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010bd834: 0x10bd834: bne   v0, zero, 0x10bd858 lui   s0, 0x20000
+// 0x010bde7c: 0x10bde7c: bne   v0, zero, 0x10bdea0 lui   s0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 9
-	brtrue L_10bd858
+	brtrue L_10bdea0
 // --- basic block ---
-// 0x010bd83c: 0x10bd83c: jal   0x10bd6b8 sll   zero, zero, 0
+// 0x010bde84: 0x10bde84: jal   0x10bdd00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_wazzy_name_10bd6b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_wazzy_name_10bdd00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd844: 0x10bd844: addu  a2, v0, zero
+// 0x010bde8c: 0x10bde8c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bd848: 0x10bd848: addiu a0, s1, -15772
+// 0x010bde90: 0x10bde90: addiu a0, s1, -15308
 	ldloc 8
-	ldc.i4 -15772
+	ldc.i4 -15308
 	add
 	stloc.1
-// 0x010bd84c: 0x10bd84c: addiu a1, s0, 23128
+// 0x010bde94: 0x10bde94: addiu a1, s0, 23588
 	ldloc 9
-	ldc.i4 23128
+	ldc.i4 23588
 	add
 	stloc.2
-// 0x010bd850: 0x10bd850: j	 0x10bd874 addiu a3, zero, 1
+// 0x010bde98: 0x10bde98: j	 0x10bdebc addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-	br L_10bd874
+	br L_10bdebc
 // --- basic block ---
-L_10bd858:
-// 0x010bd858: 0x10bd858: jal   0x10bd6b8 sll   zero, zero, 0
+L_10bdea0:
+// 0x010bdea0: 0x10bdea0: jal   0x10bdd00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_wazzy_name_10bd6b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_wazzy_name_10bdd00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd860: 0x10bd860: lui   v1, 0x0
+// 0x010bdea8: 0x10bdea8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010bd864: 0x10bd864: lw    a3, 19532(v1)
+// 0x010bdeac: 0x10bdeac: lw    a3, 19532(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4064,21 +4064,21 @@ L_10bd858:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bd868: 0x10bd868: addiu a0, s1, -15772
+// 0x010bdeb0: 0x10bdeb0: addiu a0, s1, -15308
 	ldloc 8
-	ldc.i4 -15772
+	ldc.i4 -15308
 	add
 	stloc.1
-// 0x010bd86c: 0x10bd86c: addiu a1, s0, 23128
+// 0x010bdeb4: 0x10bdeb4: addiu a1, s0, 23588
 	ldloc 9
-	ldc.i4 23128
+	ldc.i4 23588
 	add
 	stloc.2
-// 0x010bd870: 0x10bd870: addu  a2, v0, zero
+// 0x010bdeb8: 0x10bdeb8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_10bd874:
-// 0x010bd874: 0x10bd874: jal   0x1000f64 lui   s1, 0xe0000
+L_10bdebc:
+// 0x010bdebc: 0x10bdebc: jal   0x1000f64 lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
 	ldloc.0
@@ -4091,10 +4091,10 @@ L_10bd874:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bd87c: 0x10bd87c: lui   v0, 0x0
+// 0x010bdec4: 0x10bdec4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bd880: 0x10bd880: lw    v1, 19532(v0)
+// 0x010bdec8: 0x10bdec8: lw    v1, 19532(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4103,31 +4103,31 @@ L_10bd874:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bd884: 0x10bd884: addiu a0, zero, 4
+// 0x010bdecc: 0x10bdecc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010bd888: 0x10bd888: bne   v1, a0, 0x10bd898 addiu s1, s1, -15772
+// 0x010bded0: 0x10bded0: bne   v1, a0, 0x10bdee0 addiu s1, s1, -15308
 	ldloc 6
 	ldloc.1
 	ldloc 8
-	ldc.i4 -15772
+	ldc.i4 -15308
 	add
 	stloc 8
-	bne.un L_10bd898
+	bne.un L_10bdee0
 // --- basic block ---
-// 0x010bd890: 0x10bd890: j	 0x10bd89c addiu v1, zero, 3
+// 0x010bded8: 0x10bded8: j	 0x10bdee4 addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-	br L_10bd89c
+	br L_10bdee4
 // --- basic block ---
-L_10bd898:
-// 0x010bd898: 0x10bd898: addiu v1, v1, 1
+L_10bdee0:
+// 0x010bdee0: 0x10bdee0: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_10bd89c:
-// 0x010bd89c: 0x10bd89c: sw    v1, 19532(v0)
+L_10bdee4:
+// 0x010bdee4: 0x10bdee4: sw    v1, 19532(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4136,12 +4136,12 @@ L_10bd89c:
 	add
 	ldloc 6
 	stelem.i4
-L_10bd8a0:
-// 0x010bd8a0: 0x10bd8a0: lw    ra, 52(sp)
-// 0x010bd8a4: 0x10bd8a4: addu  v0, s1, zero
+L_10bdee8:
+// 0x010bdee8: 0x10bdee8: lw    ra, 52(sp)
+// 0x010bdeec: 0x10bdeec: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-// 0x010bd8a8: 0x10bd8a8: lw    s1, 48(sp)
+// 0x010bdef0: 0x10bdef0: lw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4150,7 +4150,7 @@ L_10bd8a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bd8ac: 0x10bd8ac: lw    s0, 44(sp)
+// 0x010bdef4: 0x10bdef4: lw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4159,7 +4159,7 @@ L_10bd8a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bd8b0: 0x10bd8b0: jr    ra addiu sp, sp, 56
+// 0x010bdef8: 0x10bdef8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4171,7 +4171,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_show_candidates_10bd8b8(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_show_candidates_10bdf00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4206,24 +4206,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd8b8: 0x10bd8b8: lui   a0, 0x0
+// 0x010bdf00: 0x10bdf00: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bd8bc: 0x10bd8bc: lui   a1, 0x0
+// 0x010bdf04: 0x10bdf04: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd8c0: 0x10bd8c0: addiu sp, sp, -24
+// 0x010bdf08: 0x10bdf08: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bd8c4: 0x10bd8c4: addiu a0, a0, 19568
+// 0x010bdf0c: 0x10bdf0c: addiu a0, a0, 19568
 	ldloc.1
 	ldc.i4 19568
 	add
 	stloc.1
-// 0x010bd8c8: 0x10bd8c8: sw    ra, 20(sp)
-// 0x010bd8cc: 0x10bd8cc: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010bdf10: 0x10bdf10: sw    ra, 20(sp)
+// 0x010bdf14: 0x10bdf14: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4233,14 +4233,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010bd8d4: 0x10bd8d4: lw    ra, 20(sp)
-// 0x010bd8d8: 0x10bd8d8: sll   zero, zero, 0
-// 0x010bd8dc: 0x10bd8dc: jr    ra addiu sp, sp, 24
+// 0x010bdf1c: 0x10bdf1c: lw    ra, 20(sp)
+// 0x010bdf20: 0x10bdf20: sll   zero, zero, 0
+// 0x010bdf24: 0x10bdf24: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4252,7 +4252,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 editor_screen_initialize_10bd8e4(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_initialize_10bdf2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 s7,int32 s3,int32 s5,int32 s6,int32 s8,int32 ra)
@@ -4314,12 +4314,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bd8e4: 0x10bd8e4: addiu sp, sp, -144
+// 0x010bdf2c: 0x10bdf2c: addiu sp, sp, -144
 	ldloc.0
 	ldc.i4 -144
 	add
 	stloc.0
-// 0x010bd8e8: 0x10bd8e8: sw    s2, 112(sp)
+// 0x010bdf30: 0x10bdf30: sw    s2, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4328,7 +4328,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bd8ec: 0x10bd8ec: sw    s1, 108(sp)
+// 0x010bdf34: 0x10bdf34: sw    s1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4337,7 +4337,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bd8f0: 0x10bd8f0: sw    s0, 104(sp)
+// 0x010bdf38: 0x10bdf38: sw    s0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4346,43 +4346,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bd8f4: 0x10bd8f4: lui   s2, 0x20000
+// 0x010bdf3c: 0x10bdf3c: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010bd8f8: 0x10bd8f8: lui   s0, 0x10000
+// 0x010bdf40: 0x10bdf40: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010bd8fc: 0x10bd8fc: lui   s1, 0x0
+// 0x010bdf44: 0x10bdf44: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010bd900: 0x10bd900: lui   a1, 0x0
+// 0x010bdf48: 0x10bdf48: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd904: 0x10bd904: addiu s1, s1, 20820
+// 0x010bdf4c: 0x10bdf4c: addiu s1, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 9
-// 0x010bd908: 0x10bd908: addiu a1, a1, 19568
+// 0x010bdf50: 0x10bdf50: addiu a1, a1, 19568
 	ldloc.2
 	ldc.i4 19568
 	add
 	stloc.2
-// 0x010bd90c: 0x10bd90c: addiu a0, s0, 12560
+// 0x010bdf54: 0x10bdf54: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010bd910: 0x10bd910: addu  a2, zero, zero
+// 0x010bdf58: 0x10bdf58: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bd914: 0x10bd914: addiu a3, s2, 9464
+// 0x010bdf5c: 0x10bdf5c: addiu a3, s2, 9928
 	ldloc 10
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010bd918: 0x10bd918: sw    ra, 140(sp)
-// 0x010bd91c: 0x10bd91c: sw    s8, 136(sp)
+// 0x010bdf60: 0x10bdf60: sw    ra, 140(sp)
+// 0x010bdf64: 0x10bdf64: sw    s8, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4391,7 +4391,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bd920: 0x10bd920: sw    s4, 120(sp)
+// 0x010bdf68: 0x10bdf68: sw    s4, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4400,7 +4400,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bd924: 0x10bd924: sw    s1, 16(sp)
+// 0x010bdf6c: 0x10bdf6c: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4409,7 +4409,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bd928: 0x10bd928: sw    s7, 132(sp)
+// 0x010bdf70: 0x10bdf70: sw    s7, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4418,7 +4418,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bd92c: 0x10bd92c: sw    s6, 128(sp)
+// 0x010bdf74: 0x10bdf74: sw    s6, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4427,7 +4427,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010bd930: 0x10bd930: sw    s5, 124(sp)
+// 0x010bdf78: 0x10bdf78: sw    s5, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4436,7 +4436,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bd934: 0x10bd934: sw    s3, 116(sp)
+// 0x010bdf7c: 0x10bdf7c: sw    s3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4445,7 +4445,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bd938: 0x10bd938: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010bdf80: 0x10bdf80: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4459,33 +4459,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd940: 0x10bd940: lui   a1, 0x0
+// 0x010bdf88: 0x10bdf88: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd944: 0x10bd944: addiu a1, a1, 19552
+// 0x010bdf8c: 0x10bdf8c: addiu a1, a1, 19552
 	ldloc.2
 	ldc.i4 19552
 	add
 	stloc.2
-// 0x010bd948: 0x10bd948: addiu a3, s2, 9464
+// 0x010bdf90: 0x10bdf90: addiu a3, s2, 9928
 	ldloc 10
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010bd94c: 0x10bd94c: addiu a0, s0, 12560
+// 0x010bdf94: 0x10bdf94: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010bd950: 0x10bd950: addu  a2, zero, zero
+// 0x010bdf98: 0x10bdf98: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bd954: 0x10bd954: sw    s1, 16(sp)
+// 0x010bdf9c: 0x10bdf9c: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4494,7 +4494,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bd958: 0x10bd958: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010bdfa0: 0x10bdfa0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4508,39 +4508,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd960: 0x10bd960: lui   a1, 0x0
+// 0x010bdfa8: 0x10bdfa8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bd964: 0x10bd964: lui   a2, 0x20000
+// 0x010bdfac: 0x10bdfac: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bd968: 0x10bd968: addiu a0, s0, 12560
+// 0x010bdfb0: 0x10bdfb0: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010bd96c: 0x10bd96c: addiu a1, a1, 19536
+// 0x010bdfb4: 0x10bdfb4: addiu a1, a1, 19536
 	ldloc.2
 	ldc.i4 19536
 	add
 	stloc.2
-// 0x010bd970: 0x10bd970: addiu a2, a2, 23136
+// 0x010bdfb8: 0x10bdfb8: addiu a2, a2, 23596
 	ldloc.3
-	ldc.i4 23136
+	ldc.i4 23596
 	add
 	stloc.3
-// 0x010bd974: 0x10bd974: addu  a3, zero, zero
+// 0x010bdfbc: 0x10bdfbc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bd978: 0x10bd978: lui   s4, 0xe0000
+// 0x010bdfc0: 0x10bdfc0: lui   s4, 0xe0000
 	ldc.i4 917504
 	stloc 11
-// 0x010bd97c: 0x10bd97c: jal   0x100edb0 lui   s8, 0x10000
+// 0x010bdfc4: 0x10bdfc4: jal   0x100edc0 lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
 	ldloc.0
@@ -4548,49 +4548,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd984: 0x10bd984: addiu s4, s4, -15612
+// 0x010bdfcc: 0x10bdfcc: addiu s4, s4, -15148
 	ldloc 11
-	ldc.i4 -15612
+	ldc.i4 -15148
 	add
 	stloc 11
-// 0x010bd988: 0x10bd988: addiu s8, s8, -13216
+// 0x010bdfd0: 0x10bdfd0: addiu s8, s8, -13220
 	ldloc 16
-	ldc.i4 -13216
+	ldc.i4 -13220
 	add
 	stloc 16
-// 0x010bd98c: 0x10bd98c: j	 0x10bda34 addiu s1, zero, 100
+// 0x010bdfd4: 0x10bdfd4: j	 0x10be07c addiu s1, zero, 100
 	ldc.i4.s 100
 	stloc 9
-	br L_10bda34
+	br L_10be07c
 // --- basic block ---
-L_10bd994:
-// 0x010bd994: 0x10bd994: lui   a2, 0x20000
+L_10bdfdc:
+// 0x010bdfdc: 0x10bdfdc: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bd998: 0x10bd998: addu  a3, s0, s6
+// 0x010bdfe0: 0x10bdfe0: addu  a3, s0, s6
 	ldloc 8
 	ldloc 15
 	add
 	stloc 4
-// 0x010bd99c: 0x10bd99c: addiu a2, a2, 23144
+// 0x010bdfe4: 0x10bdfe4: addiu a2, a2, 23604
 	ldloc.3
-	ldc.i4 23144
+	ldc.i4 23604
 	add
 	stloc.3
-// 0x010bd9a0: 0x10bd9a0: addiu a0, sp, 24
+// 0x010bdfe8: 0x10bdfe8: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010bd9a4: 0x10bd9a4: addiu a1, zero, 80
+// 0x010bdfec: 0x10bdfec: addiu a1, zero, 80
 	ldc.i4.s 80
 	stloc.2
-// 0x010bd9a8: 0x10bd9a8: jal   0x1000f9c sw    zero, 0(s3)
+// 0x010bdff0: 0x10bdff0: jal   0x1000f9c sw    zero, 0(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -4607,12 +4607,12 @@ L_10bd994:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd9b0: 0x10bd9b0: addiu a0, sp, 24
+// 0x010bdff8: 0x10bdff8: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010bd9b4: 0x10bd9b4: jal   0x104ef00 addu  a1, zero, zero
+// 0x010bdffc: 0x10bdffc: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4620,12 +4620,12 @@ L_10bd994:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd9bc: 0x10bd9bc: bne   s2, zero, 0x10bd9d8 sw    v0, 8(s3)
+// 0x010be004: 0x10be004: bne   s2, zero, 0x10be020 sw    v0, 8(s3)
 	ldloc 10
 	ldloc 6
 	ldloc 13
@@ -4635,34 +4635,34 @@ L_10bd994:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10bd9d8
+	brtrue L_10be020
 // --- basic block ---
-// 0x010bd9c4: 0x10bd9c4: beq   s0, zero, 0x10bd9dc addu  a0, s8, zero
+// 0x010be00c: 0x10be00c: beq   s0, zero, 0x10be024 addu  a0, s8, zero
 	ldloc 8
 	ldloc 16
 	stloc.1
-	brfalse L_10bd9dc
+	brfalse L_10be024
 // --- basic block ---
-// 0x010bd9cc: 0x10bd9cc: lui   a0, 0x0
+// 0x010be014: 0x10be014: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bd9d0: 0x10bd9d0: j	 0x10bd9dc addiu a0, a0, 27292
+// 0x010be018: 0x10be018: j	 0x10be024 addiu a0, a0, 27292
 	ldloc.1
 	ldc.i4 27292
 	add
 	stloc.1
-	br L_10bd9dc
+	br L_10be024
 // --- basic block ---
-L_10bd9d8:
-// 0x010bd9d8: 0x10bd9d8: lw    a0, 0(s7)
+L_10be020:
+// 0x010be020: 0x10be020: lw    a0, 0(s7)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-L_10bd9dc:
-// 0x010bd9dc: 0x10bd9dc: jal   0x104edb0 addiu s0, s0, 1
+L_10be024:
+// 0x010be024: 0x10be024: jal   0x104edc0 addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -4672,119 +4672,119 @@ L_10bd9dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd9e4: 0x10bd9e4: jal   0x104dd5c addiu a0, zero, 1
+// 0x010be02c: 0x10be02c: jal   0x104dd6c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bd9ec: 0x10bd9ec: addiu v0, zero, 4
+// 0x010be034: 0x10be034: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010bd9f0: 0x10bd9f0: addiu s3, s3, 12
+// 0x010be038: 0x10be038: addiu s3, s3, 12
 	ldloc 13
 	ldc.i4.s 12
 	add
 	stloc 13
-// 0x010bd9f4: 0x10bd9f4: bne   s0, v0, 0x10bd994 addiu s7, s7, 4
+// 0x010be03c: 0x10be03c: bne   s0, v0, 0x10bdfdc addiu s7, s7, 4
 	ldloc 8
 	ldloc 5
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-	bne.un L_10bd994
+	bne.un L_10bdfdc
 // --- basic block ---
-// 0x010bd9fc: 0x10bd9fc: addiu s2, s2, 1
+// 0x010be044: 0x10be044: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x010bda00: 0x10bda00: addiu v0, zero, 2
+// 0x010be048: 0x10be048: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010bda04: 0x10bda04: addiu s5, s5, 48
+// 0x010be04c: 0x10be04c: addiu s5, s5, 48
 	ldloc 14
 	ldc.i4.s 48
 	add
 	stloc 14
-// 0x010bda08: 0x10bda08: beq   s2, v0, 0x10bda24 addiu s6, s6, 10
+// 0x010be050: 0x10be050: beq   s2, v0, 0x10be06c addiu s6, s6, 10
 	ldloc 10
 	ldloc 5
 	ldloc 15
 	ldc.i4.s 10
 	add
 	stloc 15
-	beq  L_10bda24
+	beq  L_10be06c
 // --- basic block ---
-L_10bda10:
-// 0x010bda10: 0x10bda10: lui   s7, 0x20000
+L_10be058:
+// 0x010be058: 0x10be058: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x010bda14: 0x10bda14: addiu s7, s7, 30076
+// 0x010be05c: 0x10be05c: addiu s7, s7, 30540
 	ldloc 12
-	ldc.i4 30076
+	ldc.i4 30540
 	add
 	stloc 12
-// 0x010bda18: 0x10bda18: addu  s3, s5, zero
+// 0x010be060: 0x10be060: addu  s3, s5, zero
 	ldloc 14
 	stloc 13
-// 0x010bda1c: 0x10bda1c: j	 0x10bd994 addu  s0, zero, zero
+// 0x010be064: 0x10be064: j	 0x10bdfdc addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10bd994
+	br L_10bdfdc
 // --- basic block ---
-L_10bda24:
-// 0x010bda24: 0x10bda24: addiu s1, s1, 100
+L_10be06c:
+// 0x010be06c: 0x10be06c: addiu s1, s1, 100
 	ldloc 9
 	ldc.i4.s 100
 	add
 	stloc 9
-// 0x010bda28: 0x10bda28: addiu v0, zero, 1200
+// 0x010be070: 0x10be070: addiu v0, zero, 1200
 	ldc.i4 1200
 	stloc 5
-// 0x010bda2c: 0x10bda2c: beq   s1, v0, 0x10bda44 addiu s4, s4, 96
+// 0x010be074: 0x10be074: beq   s1, v0, 0x10be08c addiu s4, s4, 96
 	ldloc 9
 	ldloc 5
 	ldloc 11
 	ldc.i4.s 96
 	add
 	stloc 11
-	beq  L_10bda44
+	beq  L_10be08c
 // --- basic block ---
-L_10bda34:
-// 0x010bda34: 0x10bda34: addu  s6, s1, zero
+L_10be07c:
+// 0x010be07c: 0x10be07c: addu  s6, s1, zero
 	ldloc 9
 	stloc 15
-// 0x010bda38: 0x10bda38: addu  s5, s4, zero
+// 0x010be080: 0x10be080: addu  s5, s4, zero
 	ldloc 11
 	stloc 14
-// 0x010bda3c: 0x10bda3c: j	 0x10bda10 addu  s2, zero, zero
+// 0x010be084: 0x10be084: j	 0x10be058 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_10bda10
+	br L_10be058
 // --- basic block ---
-L_10bda44:
-// 0x010bda44: 0x10bda44: lui   a0, 0x20000
+L_10be08c:
+// 0x010be08c: 0x10be08c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bda48: 0x10bda48: addu  a1, zero, zero
+// 0x010be090: 0x10be090: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bda4c: 0x10bda4c: addiu a0, a0, 23156
+// 0x010be094: 0x10be094: addiu a0, a0, 23616
 	ldloc.1
-	ldc.i4 23156
+	ldc.i4 23616
 	add
 	stloc.1
-// 0x010bda50: 0x10bda50: jal   0x104ef00 lui   s0, 0xe0000
+// 0x010be098: 0x10be098: jal   0x104ef10 lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
 	ldloc.0
@@ -4792,20 +4792,20 @@ L_10bda44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bda58: 0x10bda58: addiu s0, s0, -14556
+// 0x010be0a0: 0x10be0a0: addiu s0, s0, -14092
 	ldloc 8
-	ldc.i4 -14556
+	ldc.i4 -14092
 	add
 	stloc 8
-// 0x010bda5c: 0x10bda5c: lui   a0, 0x0
+// 0x010be0a4: 0x10be0a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bda60: 0x10bda60: sw    v0, 8(s0)
+// 0x010be0a8: 0x10be0a8: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4814,7 +4814,7 @@ L_10bda44:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bda64: 0x10bda64: jal   0x104edb0 addiu a0, a0, 27292
+// 0x010be0ac: 0x10be0ac: jal   0x104edc0 addiu a0, a0, 27292
 	ldloc.1
 	ldc.i4 27292
 	add
@@ -4824,29 +4824,29 @@ L_10bda44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bda6c: 0x10bda6c: jal   0x104dd5c addiu a0, zero, 1
+// 0x010be0b4: 0x10be0b4: jal   0x104dd6c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bda74: 0x10bda74: lui   a0, 0x20000
+// 0x010be0bc: 0x10be0bc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bda78: 0x10bda78: addu  a1, zero, zero
+// 0x010be0c0: 0x10be0c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bda7c: 0x10bda7c: jal   0x104ef00 addiu a0, a0, 23172
+// 0x010be0c4: 0x10be0c4: jal   0x104ef10 addiu a0, a0, 23632
 	ldloc.1
-	ldc.i4 23172
+	ldc.i4 23632
 	add
 	stloc.1
 	ldloc.0
@@ -4854,15 +4854,15 @@ L_10bda44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bda84: 0x10bda84: lui   a0, 0x10000
+// 0x010be0cc: 0x10be0cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bda88: 0x10bda88: sw    v0, 20(s0)
+// 0x010be0d0: 0x10be0d0: sw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4871,7 +4871,7 @@ L_10bda44:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bda8c: 0x10bda8c: jal   0x104edb0 addiu a0, a0, -29996
+// 0x010be0d4: 0x10be0d4: jal   0x104edc0 addiu a0, a0, -29996
 	ldloc.1
 	ldc.i4 -29996
 	add
@@ -4881,59 +4881,59 @@ L_10bda44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bda94: 0x10bda94: jal   0x104dd5c addiu a0, zero, 1
+// 0x010be0dc: 0x10be0dc: jal   0x104dd6c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bda9c: 0x10bda9c: lui   v0, 0x20000
+// 0x010be0e4: 0x10be0e4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bdaa0: 0x10bdaa0: addiu v0, v0, 23188
+// 0x010be0e8: 0x10be0e8: addiu v0, v0, 23648
 	ldloc 5
-	ldc.i4 23188
+	ldc.i4 23648
 	add
 	stloc 5
-// 0x010bdaa4: 0x10bdaa4: lui   a0, 0x20000
+// 0x010be0ec: 0x10be0ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bdaa8: 0x10bdaa8: lui   a1, 0x20000
+// 0x010be0f0: 0x10be0f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010bdaac: 0x10bdaac: lui   v1, 0x10c0000
+// 0x010be0f4: 0x10be0f4: lui   v1, 0x10c0000
 	ldc.i4 17563648
 	stloc 7
-// 0x010bdab0: 0x10bdab0: addiu v1, v1, -9004
+// 0x010be0f8: 0x10be0f8: addiu v1, v1, -7396
 	ldloc 7
-	ldc.i4 -9004
+	ldc.i4 -7396
 	add
 	stloc 7
-// 0x010bdab4: 0x10bdab4: addiu a0, a0, 23200
+// 0x010be0fc: 0x10be0fc: addiu a0, a0, 23660
 	ldloc.1
-	ldc.i4 23200
+	ldc.i4 23660
 	add
 	stloc.1
-// 0x010bdab8: 0x10bdab8: addiu a1, a1, 22576
+// 0x010be100: 0x10be100: addiu a1, a1, 23036
 	ldloc.2
-	ldc.i4 22576
+	ldc.i4 23036
 	add
 	stloc.2
-// 0x010bdabc: 0x10bdabc: addu  a2, v0, zero
+// 0x010be104: 0x10be104: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bdac0: 0x10bdac0: addu  a3, zero, zero
+// 0x010be108: 0x10be108: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bdac4: 0x10bdac4: sw    v1, 20(sp)
+// 0x010be10c: 0x10be10c: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4942,7 +4942,7 @@ L_10bda44:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bdac8: 0x10bdac8: jal   0x102ceb0 sw    v0, 16(sp)
+// 0x010be110: 0x10be110: jal   0x102cec0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4956,50 +4956,50 @@ L_10bda44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_add_action_102ceb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_add_action_102cec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bdad0: 0x10bdad0: lui   v0, 0x20000
+// 0x010be118: 0x10be118: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bdad4: 0x10bdad4: addiu v0, v0, 23224
+// 0x010be11c: 0x10be11c: addiu v0, v0, 23684
 	ldloc 5
-	ldc.i4 23224
+	ldc.i4 23684
 	add
 	stloc 5
-// 0x010bdad8: 0x10bdad8: lui   a0, 0x20000
+// 0x010be120: 0x10be120: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bdadc: 0x10bdadc: lui   a1, 0x10000
+// 0x010be124: 0x10be124: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010bdae0: 0x10bdae0: lui   v1, 0x10c0000
+// 0x010be128: 0x10be128: lui   v1, 0x10c0000
 	ldc.i4 17563648
 	stloc 7
-// 0x010bdae4: 0x10bdae4: addiu v1, v1, -9340
+// 0x010be12c: 0x10be12c: addiu v1, v1, -7732
 	ldloc 7
-	ldc.i4 -9340
+	ldc.i4 -7732
 	add
 	stloc 7
-// 0x010bdae8: 0x10bdae8: addiu a0, a0, 23212
+// 0x010be130: 0x10be130: addiu a0, a0, 23672
 	ldloc.1
-	ldc.i4 23212
+	ldc.i4 23672
 	add
 	stloc.1
-// 0x010bdaec: 0x10bdaec: addiu a1, a1, -21432
+// 0x010be134: 0x10be134: addiu a1, a1, -21432
 	ldloc.2
 	ldc.i4 -21432
 	add
 	stloc.2
-// 0x010bdaf0: 0x10bdaf0: addu  a2, v0, zero
+// 0x010be138: 0x10be138: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bdaf4: 0x10bdaf4: addu  a3, zero, zero
+// 0x010be13c: 0x10be13c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bdaf8: 0x10bdaf8: sw    v1, 20(sp)
+// 0x010be140: 0x10be140: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5008,7 +5008,7 @@ L_10bda44:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bdafc: 0x10bdafc: jal   0x102ceb0 sw    v0, 16(sp)
+// 0x010be144: 0x10be144: jal   0x102cec0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5022,30 +5022,30 @@ L_10bda44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_add_action_102ceb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_add_action_102cec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bdb04: 0x10bdb04: lui   a0, 0x10c0000
+// 0x010be14c: 0x10be14c: lui   a0, 0x10c0000
 	ldc.i4 17563648
 	stloc.1
-// 0x010bdb08: 0x10bdb08: jal   0x101f970 addiu a0, a0, -9400
+// 0x010be150: 0x10be150: jal   0x101f980 addiu a0, a0, -7792
 	ldloc.1
-	ldc.i4 -9400
+	ldc.i4 -7792
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bdb10: 0x10bdb10: lw    ra, 140(sp)
-// 0x010bdb14: 0x10bdb14: lui   v1, 0xe0000
+// 0x010be158: 0x10be158: lw    ra, 140(sp)
+// 0x010be15c: 0x10be15c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010bdb18: 0x10bdb18: lw    s8, 136(sp)
+// 0x010be160: 0x10be160: lw    s8, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5054,7 +5054,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bdb1c: 0x10bdb1c: lw    s7, 132(sp)
+// 0x010be164: 0x10be164: lw    s7, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5063,7 +5063,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bdb20: 0x10bdb20: lw    s6, 128(sp)
+// 0x010be168: 0x10be168: lw    s6, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5072,7 +5072,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bdb24: 0x10bdb24: lw    s5, 124(sp)
+// 0x010be16c: 0x10be16c: lw    s5, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5081,7 +5081,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bdb28: 0x10bdb28: lw    s4, 120(sp)
+// 0x010be170: 0x10be170: lw    s4, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5090,7 +5090,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bdb2c: 0x10bdb2c: lw    s3, 116(sp)
+// 0x010be174: 0x10be174: lw    s3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5099,7 +5099,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bdb30: 0x10bdb30: lw    s2, 112(sp)
+// 0x010be178: 0x10be178: lw    s2, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5108,7 +5108,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bdb34: 0x10bdb34: lw    s1, 108(sp)
+// 0x010be17c: 0x10be17c: lw    s1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5117,7 +5117,7 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bdb38: 0x10bdb38: lw    s0, 104(sp)
+// 0x010be180: 0x10be180: lw    s0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5126,16 +5126,16 @@ L_10bda44:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bdb3c: 0x10bdb3c: sw    v0, -15720(v1)
+// 0x010be184: 0x10be184: sw    v0, -15256(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3930
+	ldc.i4 -3814
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bdb40: 0x10bdb40: jr    ra addiu sp, sp, 144
+// 0x010be188: 0x10be188: jr    ra addiu sp, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
@@ -5147,7 +5147,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_after_refresh_10bdb48(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_after_refresh_10be190(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5182,34 +5182,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bdb48: 0x10bdb48: addiu sp, sp, -24
+// 0x010be190: 0x10be190: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bdb4c: 0x10bdb4c: sw    ra, 20(sp)
-// 0x010bdb50: 0x10bdb50: jal   0x10ac694 sll   zero, zero, 0
-	call int32 Cibyl129::editor_is_enabled_10ac694()
+// 0x010be194: 0x10be194: sw    ra, 20(sp)
+// 0x010be198: 0x10be198: jal   0x10accdc sll   zero, zero, 0
+	call int32 Cibyl129::editor_is_enabled_10accdc()
 	stloc 5
 // --- basic block ---
-// 0x010bdb58: 0x10bdb58: lui   v0, 0xe0000
+// 0x010be1a0: 0x10be1a0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bdb5c: 0x10bdb5c: lw    v0, -15720(v0)
+// 0x010be1a4: 0x10be1a4: lw    v0, -15256(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3930
+	ldc.i4 -3814
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bdb60: 0x10bdb60: sll   zero, zero, 0
-// 0x010bdb64: 0x10bdb64: beq   v0, zero, 0x10bdb74 sll   zero, zero, 0
+// 0x010be1a8: 0x10be1a8: sll   zero, zero, 0
+// 0x010be1ac: 0x10be1ac: beq   v0, zero, 0x10be1bc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bdb74
+	brfalse L_10be1bc
 // --- basic block ---
-// 0x010bdb6c: 0x10bdb6c: jalr  v0 sll   zero, zero, 0
+// 0x010be1b4: 0x10be1b4: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5221,10 +5221,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10bdb74:
-// 0x010bdb74: 0x10bdb74: lw    ra, 20(sp)
-// 0x010bdb78: 0x10bdb78: sll   zero, zero, 0
-// 0x010bdb7c: 0x10bdb7c: jr    ra addiu sp, sp, 24
+L_10be1bc:
+// 0x010be1bc: 0x10be1bc: lw    ra, 20(sp)
+// 0x010be1c0: 0x10be1c0: sll   zero, zero, 0
+// 0x010be1c4: 0x10be1c4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5236,7 +5236,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_delete_segments_10bdb84(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_delete_segments_10be1cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra)
@@ -5292,12 +5292,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bdb84: 0x10bdb84: addiu sp, sp, -48
+// 0x010be1cc: 0x10be1cc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010bdb88: 0x10bdb88: sw    s0, 16(sp)
+// 0x010be1d0: 0x10be1d0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5306,10 +5306,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bdb8c: 0x10bdb8c: lui   s0, 0xf0000
+// 0x010be1d4: 0x10be1d4: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x010bdb90: 0x10bdb90: sw    s5, 36(sp)
+// 0x010be1d8: 0x10be1d8: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5318,7 +5318,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bdb94: 0x10bdb94: sw    s4, 32(sp)
+// 0x010be1dc: 0x10be1dc: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5327,7 +5327,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bdb98: 0x10bdb98: sw    s3, 28(sp)
+// 0x010be1e0: 0x10be1e0: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5336,7 +5336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bdb9c: 0x10bdb9c: sw    s2, 24(sp)
+// 0x010be1e4: 0x10be1e4: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5345,7 +5345,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bdba0: 0x10bdba0: sw    s1, 20(sp)
+// 0x010be1e8: 0x10be1e8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5354,8 +5354,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bdba4: 0x10bdba4: sw    ra, 44(sp)
-// 0x010bdba8: 0x10bdba8: sw    s6, 40(sp)
+// 0x010be1ec: 0x10be1ec: sw    ra, 44(sp)
+// 0x010be1f0: 0x10be1f0: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5364,88 +5364,88 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bdbac: 0x10bdbac: addiu s0, s0, -22928
+// 0x010be1f4: 0x10be1f4: addiu s0, s0, -22464
 	ldloc 7
-	ldc.i4 -22928
+	ldc.i4 -22464
 	add
 	stloc 7
-// 0x010bdbb0: 0x10bdbb0: addu  s1, zero, zero
+// 0x010be1f8: 0x10be1f8: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010bdbb4: 0x10bdbb4: lui   s5, 0xe0000
+// 0x010be1fc: 0x10be1fc: lui   s5, 0xe0000
 	ldc.i4 917504
 	stloc 13
-// 0x010bdbb8: 0x10bdbb8: addiu s3, zero, -1
+// 0x010be200: 0x10be200: addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x010bdbbc: 0x10bdbbc: lui   s4, 0x0
+// 0x010be204: 0x10be204: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010bdbc0: 0x10bdbc0: j	 0x10bdc90 lui   s2, 0x0
+// 0x010be208: 0x10be208: j	 0x10be2d8 lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-	br L_10bdc90
+	br L_10be2d8
 // --- basic block ---
-L_10bdbc8:
-// 0x010bdbc8: 0x10bdbc8: lw    a0, 0(s0)
+L_10be210:
+// 0x010be210: 0x10be210: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bdbcc: 0x10bdbcc: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010be214: 0x10be214: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bdbd4: 0x10bdbd4: bne   v0, s3, 0x10bdbfc sll   zero, zero, 0
+// 0x010be21c: 0x10be21c: bne   v0, s3, 0x10be244 sll   zero, zero, 0
 	ldloc 6
 	ldloc 11
-	bne.un L_10bdbfc
+	bne.un L_10be244
 // --- basic block ---
-// 0x010bdbdc: 0x10bdbdc: lw    a0, 0(s0)
+// 0x010be224: 0x10be224: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bdbe0: 0x10bdbe0: jal   0x10b6a10 sll   zero, zero, 0
-	call int32 Cibyl136::editor_db_create_10b6a10()
+// 0x010be228: 0x10be228: jal   0x10b7058 sll   zero, zero, 0
+	call int32 Cibyl136::editor_db_create_10b7058()
 	stloc 6
 // --- basic block ---
-// 0x010bdbe8: 0x10bdbe8: lw    a0, 0(s0)
+// 0x010be230: 0x10be230: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bdbec: 0x10bdbec: jal   0x10b79b4 sll   zero, zero, 0
+// 0x010be234: 0x10be234: jal   0x10b7ffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bdbf4: 0x10bdbf4: beq   v0, s3, 0x10bdc88 sll   zero, zero, 0
+// 0x010be23c: 0x10be23c: beq   v0, s3, 0x10be2d0 sll   zero, zero, 0
 	ldloc 6
 	ldloc 11
-	beq  L_10bdc88
+	beq  L_10be2d0
 // --- basic block ---
-L_10bdbfc:
-// 0x010bdbfc: 0x10bdbfc: lw    v0, -16(s0)
+L_10be244:
+// 0x010be244: 0x10be244: lw    v0, -16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5454,12 +5454,12 @@ L_10bdbfc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bdc00: 0x10bdc00: sll   zero, zero, 0
-// 0x010bdc04: 0x10bdc04: bne   v0, zero, 0x10bdc6c sll   zero, zero, 0
+// 0x010be248: 0x10be248: sll   zero, zero, 0
+// 0x010be24c: 0x10be24c: bne   v0, zero, 0x10be2b4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10bdc6c
+	brtrue L_10be2b4
 // --- basic block ---
-// 0x010bdc0c: 0x10bdc0c: lw    a0, -4(s0)
+// 0x010be254: 0x10be254: lw    a0, -4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5468,7 +5468,7 @@ L_10bdbfc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bdc10: 0x10bdc10: lw    v0, 576(s2)
+// 0x010be258: 0x10be258: lw    v0, 576(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5477,29 +5477,29 @@ L_10bdbfc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bdc14: 0x10bdc14: sll   zero, zero, 0
-// 0x010bdc18: 0x10bdc18: beq   a0, v0, 0x10bdc38 sll   zero, zero, 0
+// 0x010be25c: 0x10be25c: sll   zero, zero, 0
+// 0x010be260: 0x10be260: beq   a0, v0, 0x10be280 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10bdc38
+	beq  L_10be280
 // --- basic block ---
-// 0x010bdc20: 0x10bdc20: bltz  a0, 0x10bdc38 sll   zero, zero, 0
+// 0x010be268: 0x10be268: bltz  a0, 0x10be280 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bdc38
+	blt L_10be280
 // --- basic block ---
-// 0x010bdc28: 0x10bdc28: jal   0x100b164 sll   zero, zero, 0
+// 0x010be270: 0x10be270: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bdc30: 0x10bdc30: lw    a0, -4(s0)
+// 0x010be278: 0x10be278: lw    a0, -4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5508,7 +5508,7 @@ L_10bdbfc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bdc34: 0x10bdc34: lw    v0, 576(s2)
+// 0x010be27c: 0x10be27c: lw    v0, 576(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5517,8 +5517,8 @@ L_10bdbfc:
 	add
 	ldelem.i4
 	stloc 6
-L_10bdc38:
-// 0x010bdc38: 0x10bdc38: lw    s6, -12(s0)
+L_10be280:
+// 0x010be280: 0x10be280: lw    s6, -12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5527,29 +5527,29 @@ L_10bdc38:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bdc3c: 0x10bdc3c: beq   a0, v0, 0x10bdc54 sll   zero, zero, 0
+// 0x010be284: 0x10be284: beq   a0, v0, 0x10be29c sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10bdc54
+	beq  L_10be29c
 // --- basic block ---
-// 0x010bdc44: 0x10bdc44: bltz  a0, 0x10bdc54 sll   zero, zero, 0
+// 0x010be28c: 0x10be28c: bltz  a0, 0x10be29c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10bdc54
+	blt L_10be29c
 // --- basic block ---
-// 0x010bdc4c: 0x10bdc4c: jal   0x100b164 sll   zero, zero, 0
+// 0x010be294: 0x10be294: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10bdc54:
-// 0x010bdc54: 0x10bdc54: lw    a1, -4(s0)
+L_10be29c:
+// 0x010be29c: 0x10be29c: lw    a1, -4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5558,10 +5558,10 @@ L_10bdc54:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bdc58: 0x10bdc58: addu  a0, s6, zero
+// 0x010be2a0: 0x10be2a0: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x010bdc5c: 0x10bdc5c: jal   0x10b694c addiu a2, zero, 1
+// 0x010be2a4: 0x10be2a4: jal   0x10b6f94 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5569,20 +5569,20 @@ L_10bdc54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_set_flag_10b694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_set_flag_10b6f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bdc64: 0x10bdc64: j	 0x10bdc8c addiu s1, s1, 1
+// 0x010be2ac: 0x10be2ac: j	 0x10be2d4 addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_10bdc8c
+	br L_10be2d4
 // --- basic block ---
-L_10bdc6c:
-// 0x010bdc6c: 0x10bdc6c: lw    v1, 18812(s4)
+L_10be2b4:
+// 0x010be2b4: 0x10be2b4: lw    v1, 18812(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -5591,13 +5591,13 @@ L_10bdc6c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bdc70: 0x10bdc70: sll   zero, zero, 0
-// 0x010bdc74: 0x10bdc74: bne   v0, v1, 0x10bdc88 sll   zero, zero, 0
+// 0x010be2b8: 0x10be2b8: sll   zero, zero, 0
+// 0x010be2bc: 0x10be2bc: bne   v0, v1, 0x10be2d0 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	bne.un L_10bdc88
+	bne.un L_10be2d0
 // --- basic block ---
-// 0x010bdc7c: 0x10bdc7c: lw    a0, -12(s0)
+// 0x010be2c4: 0x10be2c4: lw    a0, -12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5606,7 +5606,7 @@ L_10bdc6c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bdc80: 0x10bdc80: jal   0x10b5bc4 addiu a1, zero, 1
+// 0x010be2c8: 0x10be2c8: jal   0x10b620c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5614,56 +5614,56 @@ L_10bdc6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_set_flag_10b5bc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_set_flag_10b620c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10bdc88:
-// 0x010bdc88: 0x10bdc88: addiu s1, s1, 1
+L_10be2d0:
+// 0x010be2d0: 0x10be2d0: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10bdc8c:
-// 0x010bdc8c: 0x10bdc8c: addiu s0, s0, 20
+L_10be2d4:
+// 0x010be2d4: 0x10be2d4: addiu s0, s0, 20
 	ldloc 7
 	ldc.i4.s 20
 	add
 	stloc 7
-L_10bdc90:
-// 0x010bdc90: 0x10bdc90: lw    v0, -14532(s5)
+L_10be2d8:
+// 0x010be2d8: 0x10be2d8: lw    v0, -14068(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3633
+	ldc.i4 -3517
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bdc94: 0x10bdc94: sll   zero, zero, 0
-// 0x010bdc98: 0x10bdc98: slt   v0, s1, v0
+// 0x010be2dc: 0x10be2dc: sll   zero, zero, 0
+// 0x010be2e0: 0x10be2e0: slt   v0, s1, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x010bdc9c: 0x10bdc9c: bne   v0, zero, 0x10bdbc8 sll   zero, zero, 0
+// 0x010be2e4: 0x10be2e4: bne   v0, zero, 0x10be210 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10bdbc8
+	brtrue L_10be210
 // --- basic block ---
-// 0x010bdca4: 0x10bdca4: jal   0x10bd694 sll   zero, zero, 0
+// 0x010be2ec: 0x10be2ec: jal   0x10bdcdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_reset_selected_10bd694(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_reset_selected_10bdcdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bdcac: 0x10bdcac: lw    ra, 44(sp)
-// 0x010bdcb0: 0x10bdcb0: lw    s6, 40(sp)
+// 0x010be2f4: 0x10be2f4: lw    ra, 44(sp)
+// 0x010be2f8: 0x10be2f8: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5672,7 +5672,7 @@ L_10bdc90:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bdcb4: 0x10bdcb4: lw    s5, 36(sp)
+// 0x010be2fc: 0x10be2fc: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5681,7 +5681,7 @@ L_10bdc90:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bdcb8: 0x10bdcb8: lw    s4, 32(sp)
+// 0x010be300: 0x10be300: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5690,7 +5690,7 @@ L_10bdc90:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bdcbc: 0x10bdcbc: lw    s3, 28(sp)
+// 0x010be304: 0x10be304: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5699,7 +5699,7 @@ L_10bdc90:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bdcc0: 0x10bdcc0: lw    s2, 24(sp)
+// 0x010be308: 0x10be308: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5708,7 +5708,7 @@ L_10bdc90:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bdcc4: 0x10bdcc4: lw    s1, 20(sp)
+// 0x010be30c: 0x10be30c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5717,7 +5717,7 @@ L_10bdc90:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bdcc8: 0x10bdcc8: lw    s0, 16(sp)
+// 0x010be310: 0x10be310: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5726,7 +5726,7 @@ L_10bdc90:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bdccc: 0x10bdccc: jr    ra addiu sp, sp, 48
+// 0x010be314: 0x10be314: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5738,7 +5738,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_screen_update_segments_10bdcd4(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_update_segments_10be31c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5773,33 +5773,33 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bdcd4: 0x10bdcd4: lui   v0, 0xe0000
+// 0x010be31c: 0x10be31c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bdcd8: 0x10bdcd8: lw    a1, -14532(v0)
+// 0x010be320: 0x10be320: lw    a1, -14068(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3633
+	ldc.i4 -3517
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bdcdc: 0x10bdcdc: addiu sp, sp, -24
+// 0x010be324: 0x10be324: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bdce0: 0x10bdce0: beq   a1, zero, 0x10bdcf4 sw    ra, 20(sp)
+// 0x010be328: 0x10be328: beq   a1, zero, 0x10be33c sw    ra, 20(sp)
 	ldloc.2
-	brfalse L_10bdcf4
+	brfalse L_10be33c
 // --- basic block ---
-// 0x010bdce8: 0x10bdce8: lui   a0, 0xf0000
+// 0x010be330: 0x10be330: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x010bdcec: 0x10bdcec: jal   0x10bc39c addiu a0, a0, -22944
+// 0x010be334: 0x10be334: jal   0x10bc9e4 addiu a0, a0, -22480
 	ldloc.1
-	ldc.i4 -22944
+	ldc.i4 -22480
 	add
 	stloc.1
 	ldloc.0
@@ -5807,15 +5807,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl140::editor_segments_properties_10bc39c(int32,int32,int32,int32,int32)
+	call int32 Cibyl140::editor_segments_properties_10bc9e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10bdcf4:
-// 0x010bdcf4: 0x10bdcf4: lw    ra, 20(sp)
-// 0x010bdcf8: 0x10bdcf8: sll   zero, zero, 0
-// 0x010bdcfc: 0x10bdcfc: jr    ra addiu sp, sp, 24
+L_10be33c:
+// 0x010be33c: 0x10be33c: lw    ra, 20(sp)
+// 0x010be340: 0x10be340: sll   zero, zero, 0
+// 0x010be344: 0x10be344: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5827,7 +5827,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_set_10bdd04(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_set_10be34c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32 s1,int32[] mem,int32 ra)
@@ -5868,12 +5868,12 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bdd04: 0x10bdd04: addiu sp, sp, -32
+// 0x010be34c: 0x10be34c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010bdd08: 0x10bdd08: sw    s1, 24(sp)
+// 0x010be350: 0x10be350: sw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5882,7 +5882,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bdd0c: 0x10bdd0c: sw    s0, 20(sp)
+// 0x010be354: 0x10be354: sw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5891,22 +5891,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bdd10: 0x10bdd10: sw    ra, 28(sp)
-// 0x010bdd14: 0x10bdd14: lui   s1, 0x10c0000
+// 0x010be358: 0x10be358: sw    ra, 28(sp)
+// 0x010be35c: 0x10be35c: lui   s1, 0x10c0000
 	ldc.i4 17563648
 	stloc 8
-// 0x010bdd18: 0x10bdd18: beq   a0, zero, 0x10bdd60 lui   s0, 0x10c0000
+// 0x010be360: 0x10be360: beq   a0, zero, 0x10be3a8 lui   s0, 0x10c0000
 	ldloc.1
 	ldc.i4 17563648
 	stloc 7
-	brfalse L_10bdd60
+	brfalse L_10be3a8
 // --- basic block ---
-// 0x010bdd20: 0x10bdd20: addiu a0, s1, -10724
+// 0x010be368: 0x10be368: addiu a0, s1, -9116
 	ldloc 8
-	ldc.i4 -10724
+	ldc.i4 -9116
 	add
 	stloc.1
-// 0x010bdd24: 0x10bdd24: jal   0x104bad8 addiu a1, zero, 1
+// 0x010be36c: 0x10be36c: jal   0x104bae8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5914,17 +5914,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdd2c: 0x10bdd2c: addiu a0, s0, -8828
+// 0x010be374: 0x10be374: addiu a0, s0, -7220
 	ldloc 7
-	ldc.i4 -8828
+	ldc.i4 -7220
 	add
 	stloc.1
-// 0x010bdd30: 0x10bdd30: jal   0x104bab0 addiu a1, zero, 1
+// 0x010be378: 0x10be378: jal   0x104bac0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5932,17 +5932,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdd38: 0x10bdd38: addiu a0, s1, -10724
+// 0x010be380: 0x10be380: addiu a0, s1, -9116
 	ldloc 8
-	ldc.i4 -10724
+	ldc.i4 -9116
 	add
 	stloc.1
-// 0x010bdd3c: 0x10bdd3c: jal   0x104ba60 addiu a1, zero, 2
+// 0x010be384: 0x10be384: jal   0x104ba70 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -5950,17 +5950,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba60(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdd44: 0x10bdd44: addiu a0, s0, -8828
+// 0x010be38c: 0x10be38c: addiu a0, s0, -7220
 	ldloc 7
-	ldc.i4 -8828
+	ldc.i4 -7220
 	add
 	stloc.1
-// 0x010bdd48: 0x10bdd48: jal   0x104ba60 addiu a1, zero, 1
+// 0x010be390: 0x10be390: jal   0x104ba70 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5968,29 +5968,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba60(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdd50: 0x10bdd50: jal   0x1010a4c sll   zero, zero, 0
+// 0x010be398: 0x10be398: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdd58: 0x10bdd58: j	 0x10bdd70 sll   zero, zero, 0
-	br L_10bdd70
+// 0x010be3a0: 0x10be3a0: j	 0x10be3b8 sll   zero, zero, 0
+	br L_10be3b8
 // --- basic block ---
-L_10bdd60:
-// 0x010bdd60: 0x10bdd60: jal   0x104b864 addiu a0, s1, -10724
+L_10be3a8:
+// 0x010be3a8: 0x10be3a8: jal   0x104b874 addiu a0, s1, -9116
 	ldloc 8
-	ldc.i4 -10724
+	ldc.i4 -9116
 	add
 	stloc.1
 	ldloc.0
@@ -5998,14 +5998,14 @@ L_10bdd60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_short_click_104b864(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_short_click_104b874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdd68: 0x10bdd68: jal   0x104b840 addiu a0, s0, -8828
+// 0x010be3b0: 0x10be3b0: jal   0x104b850 addiu a0, s0, -7220
 	ldloc 7
-	ldc.i4 -8828
+	ldc.i4 -7220
 	add
 	stloc.1
 	ldloc.0
@@ -6013,14 +6013,14 @@ L_10bdd60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_long_click_104b840(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_long_click_104b850(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10bdd70:
-// 0x010bdd70: 0x10bdd70: lw    ra, 28(sp)
-// 0x010bdd74: 0x10bdd74: lw    s1, 24(sp)
+L_10be3b8:
+// 0x010be3b8: 0x10be3b8: lw    ra, 28(sp)
+// 0x010be3bc: 0x10be3bc: lw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6029,7 +6029,7 @@ L_10bdd70:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bdd78: 0x10bdd78: lw    s0, 20(sp)
+// 0x010be3c0: 0x10be3c0: lw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6038,7 +6038,7 @@ L_10bdd70:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bdd7c: 0x10bdd7c: jr    ra addiu sp, sp, 32
+// 0x010be3c4: 0x10be3c4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6050,7 +6050,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_long_click_10bdd84(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_long_click_10be3cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
@@ -6097,12 +6097,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bdd84: 0x10bdd84: addiu sp, sp, -88
+// 0x010be3cc: 0x10be3cc: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010bdd88: 0x10bdd88: sw    s0, 68(sp)
+// 0x010be3d0: 0x10be3d0: sw    s0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6111,19 +6111,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bdd8c: 0x10bdd8c: lui   s0, 0xe0000
+// 0x010be3d4: 0x10be3d4: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010bdd90: 0x10bdd90: addiu a1, s0, -15716
+// 0x010be3d8: 0x10be3d8: addiu a1, s0, -15252
 	ldloc 8
-	ldc.i4 -15716
+	ldc.i4 -15252
 	add
 	stloc.2
-// 0x010bdd94: 0x10bdd94: addiu a2, zero, 1
+// 0x010be3dc: 0x10be3dc: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010bdd98: 0x10bdd98: sw    ra, 84(sp)
-// 0x010bdd9c: 0x10bdd9c: sw    s3, 80(sp)
+// 0x010be3e0: 0x10be3e0: sw    ra, 84(sp)
+// 0x010be3e4: 0x10be3e4: sw    s3, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6132,7 +6132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bdda0: 0x10bdda0: sw    s2, 76(sp)
+// 0x010be3e8: 0x10be3e8: sw    s2, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6141,7 +6141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bdda4: 0x10bdda4: sw    s1, 72(sp)
+// 0x010be3ec: 0x10be3ec: sw    s1, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6150,7 +6150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bdda8: 0x10bdda8: jal   0x1007a6c addu  s3, a0, zero
+// 0x010be3f0: 0x10be3f0: jal   0x1007a7c addu  s3, a0, zero
 	ldloc.1
 	stloc 11
 	ldloc.0
@@ -6158,12 +6158,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bddb0: 0x10bddb0: jal   0x1006fc0 addu  a0, zero, zero
+// 0x010be3f8: 0x10be3f8: jal   0x1006fd0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6171,22 +6171,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_get_scale_1006fc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_get_scale_1006fd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bddb8: 0x10bddb8: addiu s1, sp, 44
+// 0x010be400: 0x10be400: addiu s1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 10
-// 0x010bddbc: 0x10bddbc: addiu v0, sp, 24
+// 0x010be404: 0x10be404: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010bddc0: 0x10bddc0: sw    v0, 16(sp)
+// 0x010be408: 0x10be408: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6195,24 +6195,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bddc4: 0x10bddc4: addiu a0, s0, -15716
+// 0x010be40c: 0x10be40c: addiu a0, s0, -15252
 	ldloc 8
-	ldc.i4 -15716
+	ldc.i4 -15252
 	add
 	stloc.1
-// 0x010bddc8: 0x10bddc8: addiu v0, zero, 2
+// 0x010be410: 0x10be410: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010bddcc: 0x10bddcc: addu  a1, zero, zero
+// 0x010be414: 0x10be414: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bddd0: 0x10bddd0: addiu a2, zero, 7
+// 0x010be418: 0x10be418: addiu a2, zero, 7
 	ldc.i4.7
 	stloc.3
-// 0x010bddd4: 0x10bddd4: addu  a3, s1, zero
+// 0x010be41c: 0x10be41c: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x010bddd8: 0x10bddd8: jal   0x102ac0c sw    v0, 20(sp)
+// 0x010be420: 0x10be420: jal   0x102ac1c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6226,25 +6226,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdde0: 0x10bdde0: addiu v1, zero, -1
+// 0x010be428: 0x10be428: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010bdde4: 0x10bdde4: bne   v0, v1, 0x10bde20 lui   s2, 0x20000
+// 0x010be42c: 0x10be42c: bne   v0, v1, 0x10be468 lui   s2, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc 9
-	bne.un L_10bde20
+	bne.un L_10be468
 // --- basic block ---
-// 0x010bddec: 0x10bddec: lui   a0, 0x10000
+// 0x010be434: 0x10be434: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bddf0: 0x10bddf0: jal   0x1019564 addiu a0, a0, -30992
+// 0x010be438: 0x10be438: jal   0x1019574 addiu a0, a0, -30992
 	ldloc.1
 	ldc.i4 -30992
 	add
@@ -6254,19 +6254,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bddf8: 0x10bddf8: addiu a1, s0, -15716
+// 0x010be440: 0x10be440: addiu a1, s0, -15252
 	ldloc 8
-	ldc.i4 -15716
+	ldc.i4 -15252
 	add
 	stloc.2
-// 0x010bddfc: 0x10bddfc: jal   0x101f76c addiu a0, s2, -28932
+// 0x010be444: 0x10be444: jal   0x101f77c addiu a0, s2, -28468
 	ldloc 9
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.1
 	ldloc.0
@@ -6274,17 +6274,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bde04: 0x10bde04: lui   a0, 0x20000
+// 0x010be44c: 0x10be44c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bde08: 0x10bde08: jal   0x102d25c addiu a0, a0, 23248
+// 0x010be450: 0x10be450: jal   0x102d26c addiu a0, a0, 23708
 	ldloc.1
-	ldc.i4 23248
+	ldc.i4 23708
 	add
 	stloc.1
 	ldloc.0
@@ -6292,34 +6292,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_hide_menu_102d25c(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_hide_menu_102d26c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bde10: 0x10bde10: jal   0x10bd694 sll   zero, zero, 0
+// 0x010be458: 0x10be458: jal   0x10bdcdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_reset_selected_10bd694(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_reset_selected_10bdcdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bde18: 0x10bde18: j	 0x10bdea4 sll   zero, zero, 0
-	br L_10bdea4
+// 0x010be460: 0x10be460: j	 0x10be4ec sll   zero, zero, 0
+	br L_10be4ec
 // --- basic block ---
-L_10bde20:
-// 0x010bde20: 0x10bde20: addiu a1, s0, -15716
+L_10be468:
+// 0x010be468: 0x10be468: addiu a1, s0, -15252
 	ldloc 8
-	ldc.i4 -15716
+	ldc.i4 -15252
 	add
 	stloc.2
-// 0x010bde24: 0x10bde24: jal   0x101f76c addiu a0, s2, -28932
+// 0x010be46c: 0x10be46c: jal   0x101f77c addiu a0, s2, -28468
 	ldloc 9
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.1
 	ldloc.0
@@ -6327,12 +6327,12 @@ L_10bde20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bde2c: 0x10bde2c: jal   0x10bd4c0 addu  a0, s1, zero
+// 0x010be474: 0x10be474: jal   0x10bdb08 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6340,12 +6340,12 @@ L_10bde20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_select_line_10bd4c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_select_line_10bdb08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bde34: 0x10bde34: lw    v0, 44(sp)
+// 0x010be47c: 0x10be47c: lw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6354,44 +6354,44 @@ L_10bde20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bde38: 0x10bde38: sll   zero, zero, 0
-// 0x010bde3c: 0x10bde3c: bne   v0, zero, 0x10bde88 lui   a0, 0x20000
+// 0x010be480: 0x10be480: sll   zero, zero, 0
+// 0x010be484: 0x10be484: bne   v0, zero, 0x10be4d0 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_10bde88
+	brtrue L_10be4d0
 // --- basic block ---
-// 0x010bde44: 0x10bde44: addiu s2, sp, 28
+// 0x010be48c: 0x10be48c: addiu s2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x010bde48: 0x10bde48: addiu s0, sp, 36
+// 0x010be490: 0x10be490: addiu s0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-// 0x010bde4c: 0x10bde4c: lui   v0, 0x10c0000
+// 0x010be494: 0x10be494: lui   v0, 0x10c0000
 	ldc.i4 17563648
 	stloc 5
-// 0x010bde50: 0x10bde50: addu  a0, s1, zero
+// 0x010be498: 0x10be498: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010bde54: 0x10bde54: addu  a1, s2, zero
+// 0x010be49c: 0x10be49c: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010bde58: 0x10bde58: addu  a2, s0, zero
+// 0x010be4a0: 0x10be4a0: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010bde5c: 0x10bde5c: addiu v0, v0, -10756
+// 0x010be4a4: 0x10be4a4: addiu v0, v0, -9148
 	ldloc 5
-	ldc.i4 -10756
+	ldc.i4 -9148
 	add
 	stloc 5
-// 0x010bde60: 0x10bde60: addiu a3, zero, 3
+// 0x010be4a8: 0x10be4a8: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010bde64: 0x10bde64: sw    v0, 16(sp)
+// 0x010be4ac: 0x10be4ac: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6400,7 +6400,7 @@ L_10bde20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bde68: 0x10bde68: jal   0x1012790 sw    zero, 20(sp)
+// 0x010be4b0: 0x10be4b0: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6414,23 +6414,23 @@ L_10bde20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bde70: 0x10bde70: lui   a0, 0x10000
+// 0x010be4b8: 0x10be4b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010bde74: 0x10bde74: addiu a0, a0, -30992
+// 0x010be4bc: 0x10be4bc: addiu a0, a0, -30992
 	ldloc.1
 	ldc.i4 -30992
 	add
 	stloc.1
-// 0x010bde78: 0x10bde78: addu  a1, s2, zero
+// 0x010be4c0: 0x10be4c0: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x010bde7c: 0x10bde7c: jal   0x1019590 addu  a2, s0, zero
+// 0x010be4c4: 0x10be4c4: jal   0x10195a0 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -6438,37 +6438,37 @@ L_10bde20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_update_points_1019590(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_update_points_10195a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bde84: 0x10bde84: lui   a0, 0x20000
+// 0x010be4cc: 0x10be4cc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_10bde88:
-// 0x010bde88: 0x10bde88: lui   a1, 0x0
+L_10be4d0:
+// 0x010be4d0: 0x10be4d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bde8c: 0x10bde8c: lui   a2, 0x10c0000
+// 0x010be4d4: 0x10be4d4: lui   a2, 0x10c0000
 	ldc.i4 17563648
 	stloc.3
-// 0x010bde90: 0x10bde90: addiu a0, a0, 23248
+// 0x010be4d8: 0x10be4d8: addiu a0, a0, 23708
 	ldloc.1
-	ldc.i4 23248
+	ldc.i4 23708
 	add
 	stloc.1
-// 0x010bde94: 0x10bde94: addiu a1, a1, 19584
+// 0x010be4dc: 0x10be4dc: addiu a1, a1, 19584
 	ldloc.2
 	ldc.i4 19584
 	add
 	stloc.2
-// 0x010bde98: 0x10bde98: addiu a2, a2, -8500
+// 0x010be4e0: 0x10be4e0: addiu a2, a2, -6892
 	ldloc.3
-	ldc.i4 -8500
+	ldc.i4 -6892
 	add
 	stloc.3
-// 0x010bde9c: 0x10bde9c: jal   0x102d2b8 addu  a3, s3, zero
+// 0x010be4e4: 0x10be4e4: jal   0x102d2c8 addu  a3, s3, zero
 	ldloc 11
 	stloc 4
 	ldloc.0
@@ -6476,28 +6476,28 @@ L_10bde88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_popup_menu_102d2b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_popup_menu_102d2c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10bdea4:
-// 0x010bdea4: 0x10bdea4: jal   0x1021900 sll   zero, zero, 0
+L_10be4ec:
+// 0x010be4ec: 0x10be4ec: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdeac: 0x10bdeac: lw    ra, 84(sp)
-// 0x010bdeb0: 0x10bdeb0: addiu v0, zero, 1
+// 0x010be4f4: 0x10be4f4: lw    ra, 84(sp)
+// 0x010be4f8: 0x10be4f8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010bdeb4: 0x10bdeb4: lw    s3, 80(sp)
+// 0x010be4fc: 0x10be4fc: lw    s3, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6506,7 +6506,7 @@ L_10bdea4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bdeb8: 0x10bdeb8: lw    s2, 76(sp)
+// 0x010be500: 0x10be500: lw    s2, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6515,7 +6515,7 @@ L_10bdea4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bdebc: 0x10bdebc: lw    s1, 72(sp)
+// 0x010be504: 0x10be504: lw    s1, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6524,7 +6524,7 @@ L_10bdea4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bdec0: 0x10bdec0: lw    s0, 68(sp)
+// 0x010be508: 0x10be508: lw    s0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6533,7 +6533,7 @@ L_10bdea4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bdec4: 0x10bdec4: jr    ra addiu sp, sp, 88
+// 0x010be50c: 0x10be50c: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -6545,7 +6545,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 popup_menu_callback_10bdecc(int32,int32,int32,int32,int32)
+.method public static int32 popup_menu_callback_10be514(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -6580,18 +6580,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bdecc: 0x10bdecc: lui   a0, 0x20000
+// 0x010be514: 0x10be514: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bded0: 0x10bded0: addiu sp, sp, -24
+// 0x010be518: 0x10be518: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bded4: 0x10bded4: sw    ra, 20(sp)
-// 0x010bded8: 0x10bded8: jal   0x101f044 addiu a0, a0, -28932
+// 0x010be51c: 0x10be51c: sw    ra, 20(sp)
+// 0x010be520: 0x10be520: jal   0x101f054 addiu a0, a0, -28468
 	ldloc.1
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.1
 	ldloc.0
@@ -6599,25 +6599,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010bdee0: 0x10bdee0: jal   0x10bd694 sll   zero, zero, 0
+// 0x010be528: 0x10be528: jal   0x10bdcdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_reset_selected_10bd694(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_reset_selected_10bdcdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010bdee8: 0x10bdee8: lw    ra, 20(sp)
-// 0x010bdeec: 0x10bdeec: sll   zero, zero, 0
-// 0x010bdef0: 0x10bdef0: jr    ra addiu sp, sp, 24
+// 0x010be530: 0x10be530: lw    ra, 20(sp)
+// 0x010be534: 0x10be534: sll   zero, zero, 0
+// 0x010be538: 0x10be538: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6629,7 +6629,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 editor_screen_get_road_state_10bdef8(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_get_road_state_10be540(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s1,int32 ra)
@@ -6673,12 +6673,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bdef8: 0x10bdef8: addiu sp, sp, -64
+// 0x010be540: 0x10be540: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010bdefc: 0x10bdefc: sw    s1, 52(sp)
+// 0x010be544: 0x10be544: sw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6687,7 +6687,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bdf00: 0x10bdf00: sw    s0, 48(sp)
+// 0x010be548: 0x10be548: sw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6696,8 +6696,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bdf04: 0x10bdf04: sw    ra, 60(sp)
-// 0x010bdf08: 0x10bdf08: sw    s2, 56(sp)
+// 0x010be54c: 0x10be54c: sw    ra, 60(sp)
+// 0x010be550: 0x10be550: sw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6706,16 +6706,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bdf0c: 0x10bdf0c: addu  s0, a0, zero
+// 0x010be554: 0x10be554: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010bdf10: 0x10bdf10: bne   a2, zero, 0x10bdf80 addu  s1, a3, zero
+// 0x010be558: 0x10be558: bne   a2, zero, 0x10be5c8 addu  s1, a3, zero
 	ldloc.3
 	ldloc 4
 	stloc 10
-	brtrue L_10bdf80
+	brtrue L_10be5c8
 // --- basic block ---
-// 0x010bdf18: 0x10bdf18: jal   0x1013c44 addu  a0, a3, zero
+// 0x010be560: 0x10be560: jal   0x1013c54 addu  a0, a3, zero
 	ldloc 4
 	stloc.1
 	ldloc.0
@@ -6723,19 +6723,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdf20: 0x10bdf20: bltz  v0, 0x10bdfec addu  a0, s0, zero
+// 0x010be568: 0x10be568: bltz  v0, 0x10be634 addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
 	ldc.i4.s 0
-	blt L_10bdfec
+	blt L_10be634
 // --- basic block ---
-// 0x010bdf28: 0x10bdf28: jal   0x1011a4c addiu a1, sp, 24
+// 0x010be570: 0x10be570: jal   0x1011a5c addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6745,12 +6745,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdf30: 0x10bdf30: lw    s2, 40(sp)
+// 0x010be578: 0x10be578: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6759,36 +6759,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bdf34: 0x10bdf34: addu  a0, s0, zero
+// 0x010be57c: 0x10be57c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010bdf38: 0x10bdf38: addiu s2, s2, 1
+// 0x010be580: 0x10be580: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010bdf3c: 0x10bdf3c: addiu a1, zero, 1
+// 0x010be584: 0x10be584: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010bdf40: 0x10bdf40: jal   0x1004a70 sltu  s2, zero, s2
+// 0x010be588: 0x10be588: jal   0x1004a80 sltu  s2, zero, s2
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdf48: 0x10bdf48: bne   v0, zero, 0x10bdfcc addiu v1, zero, 1
+// 0x010be590: 0x10be590: bne   v0, zero, 0x10be614 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_10bdfcc
+	brtrue L_10be614
 // --- basic block ---
-// 0x010bdf50: 0x10bdf50: jal   0x10b79b4 addu  a0, s1, zero
+// 0x010be598: 0x10be598: jal   0x10b7ffc addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6796,30 +6796,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdf58: 0x10bdf58: addiu v1, zero, -1
+// 0x010be5a0: 0x10be5a0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010bdf5c: 0x10bdf5c: beq   v0, v1, 0x10bdfc8 addu  a0, s0, zero
+// 0x010be5a4: 0x10be5a4: beq   v0, v1, 0x10be610 addu  a0, s0, zero
 	ldloc 5
 	ldloc 6
 	ldloc 9
 	stloc.1
-	beq  L_10bdfc8
+	beq  L_10be610
 // --- basic block ---
-// 0x010bdf64: 0x10bdf64: addiu a1, zero, -1
+// 0x010be5ac: 0x10be5ac: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010bdf68: 0x10bdf68: addiu a2, sp, 16
+// 0x010be5b0: 0x10be5b0: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x010bdf6c: 0x10bdf6c: jal   0x10b67b0 sw    zero, 16(sp)
+// 0x010be5b4: 0x10be5b4: jal   0x10b6df8 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6833,12 +6833,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_override_line_get_direction_10b67b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_override_line_get_direction_10b6df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdf74: 0x10bdf74: lw    v0, 16(sp)
+// 0x010be5bc: 0x10be5bc: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6847,11 +6847,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bdf78: 0x10bdf78: j	 0x10bdfc0 sll   zero, zero, 0
-	br L_10bdfc0
+// 0x010be5c0: 0x10be5c0: j	 0x10be608 sll   zero, zero, 0
+	br L_10be608
 // --- basic block ---
-L_10bdf80:
-// 0x010bdf80: 0x10bdf80: jal   0x10b79b4 addu  a0, a3, zero
+L_10be5c8:
+// 0x010be5c8: 0x10be5c8: jal   0x10b7ffc addu  a0, a3, zero
 	ldloc 4
 	stloc.1
 	ldloc.0
@@ -6859,27 +6859,27 @@ L_10bdf80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdf88: 0x10bdf88: addiu v1, zero, -1
+// 0x010be5d0: 0x10be5d0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010bdf8c: 0x10bdf8c: beq   v0, v1, 0x10bdfec addu  a0, s0, zero
+// 0x010be5d4: 0x10be5d4: beq   v0, v1, 0x10be634 addu  a0, s0, zero
 	ldloc 5
 	ldloc 6
 	ldloc 9
 	stloc.1
-	beq  L_10bdfec
+	beq  L_10be634
 // --- basic block ---
-// 0x010bdf94: 0x10bdf94: addiu a1, sp, 16
+// 0x010be5dc: 0x10be5dc: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010bdf98: 0x10bdf98: sw    v1, 16(sp)
+// 0x010be5e0: 0x10be5e0: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6888,7 +6888,7 @@ L_10bdf80:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bdf9c: 0x10bdf9c: jal   0x10b58c8 sw    zero, 20(sp)
+// 0x010be5e4: 0x10be5e4: jal   0x10b5f10 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6902,12 +6902,12 @@ L_10bdf80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdfa4: 0x10bdfa4: lw    s2, 16(sp)
+// 0x010be5ec: 0x10be5ec: lw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6916,15 +6916,15 @@ L_10bdf80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bdfa8: 0x10bdfa8: addu  a0, s0, zero
+// 0x010be5f0: 0x10be5f0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010bdfac: 0x10bdfac: addiu a1, sp, 20
+// 0x010be5f4: 0x10be5f4: addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x010bdfb0: 0x10bdfb0: jal   0x10b586c addiu s2, s2, 1
+// 0x010be5f8: 0x10be5f8: jal   0x10b5eb4 addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -6934,12 +6934,12 @@ L_10bdf80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_direction_10b586c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_direction_10b5eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bdfb8: 0x10bdfb8: lw    v0, 20(sp)
+// 0x010be600: 0x10be600: lw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6948,56 +6948,56 @@ L_10bdf80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bdfbc: 0x10bdfbc: sltu  s2, zero, s2
+// 0x010be604: 0x10be604: sltu  s2, zero, s2
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
-L_10bdfc0:
-// 0x010bdfc0: 0x10bdfc0: bne   v0, zero, 0x10bdfcc addiu v1, zero, 1
+L_10be608:
+// 0x010be608: 0x10be608: bne   v0, zero, 0x10be614 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_10bdfcc
+	brtrue L_10be614
 // --- basic block ---
-L_10bdfc8:
-// 0x010bdfc8: 0x10bdfc8: addu  v1, zero, zero
+L_10be610:
+// 0x010be610: 0x10be610: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10bdfcc:
-// 0x010bdfcc: 0x10bdfcc: beq   s2, zero, 0x10bdfe4 sll   zero, zero, 0
+L_10be614:
+// 0x010be614: 0x10be614: beq   s2, zero, 0x10be62c sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10bdfe4
+	brfalse L_10be62c
 // --- basic block ---
-// 0x010bdfd4: 0x10bdfd4: beq   v1, zero, 0x10bdff4 addiu v0, zero, 4
+// 0x010be61c: 0x10be61c: beq   v1, zero, 0x10be63c addiu v0, zero, 4
 	ldloc 6
 	ldc.i4.4
 	stloc 5
-	brfalse L_10bdff4
+	brfalse L_10be63c
 // --- basic block ---
-// 0x010bdfdc: 0x10bdfdc: j	 0x10bdff8 sll   zero, zero, 0
-	br L_10bdff8
+// 0x010be624: 0x10be624: j	 0x10be640 sll   zero, zero, 0
+	br L_10be640
 // --- basic block ---
-L_10bdfe4:
-// 0x010bdfe4: 0x10bdfe4: bne   v1, zero, 0x10bdff8 addiu v0, zero, 3
+L_10be62c:
+// 0x010be62c: 0x10be62c: bne   v1, zero, 0x10be640 addiu v0, zero, 3
 	ldloc 6
 	ldc.i4.3
 	stloc 5
-	brtrue L_10bdff8
+	brtrue L_10be640
 // --- basic block ---
-L_10bdfec:
-// 0x010bdfec: 0x10bdfec: j	 0x10bdff8 addiu v0, zero, 1
+L_10be634:
+// 0x010be634: 0x10be634: j	 0x10be640 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10bdff8
+	br L_10be640
 // --- basic block ---
-L_10bdff4:
-// 0x010bdff4: 0x10bdff4: addiu v0, zero, 2
+L_10be63c:
+// 0x010be63c: 0x10be63c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-L_10bdff8:
-// 0x010bdff8: 0x10bdff8: lw    ra, 60(sp)
-// 0x010bdffc: 0x10bdffc: lw    s2, 56(sp)
+L_10be640:
+// 0x010be640: 0x10be640: lw    ra, 60(sp)
+// 0x010be644: 0x10be644: lw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7006,7 +7006,7 @@ L_10bdff8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010be000: 0x10be000: lw    s1, 52(sp)
+// 0x010be648: 0x10be648: lw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7015,7 +7015,7 @@ L_10bdff8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010be004: 0x10be004: lw    s0, 48(sp)
+// 0x010be64c: 0x10be64c: lw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7024,7 +7024,7 @@ L_10bdff8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010be008: 0x10be008: jr    ra addiu sp, sp, 64
+// 0x010be650: 0x10be650: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -7036,7 +7036,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_repaint_lines_10be010(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_repaint_lines_10be658(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s7,int32 s0,int32 lo,int32 s1,int32 s3,int32 s6,int32 s4,int32 s8,int32 s2,int32 s5,int32 ra)
@@ -7101,12 +7101,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010be010: 0x10be010: addiu sp, sp, -1176
+// 0x010be658: 0x10be658: addiu sp, sp, -1176
 	ldloc.0
 	ldc.i4 -1176
 	add
 	stloc.0
-// 0x010be014: 0x10be014: sw    s1, 1140(sp)
+// 0x010be65c: 0x10be65c: sw    s1, 1140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7115,7 +7115,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010be018: 0x10be018: sw    s0, 1136(sp)
+// 0x010be660: 0x10be660: sw    s0, 1136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7124,15 +7124,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010be01c: 0x10be01c: addu  s1, a1, zero
+// 0x010be664: 0x10be664: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010be020: 0x10be020: addiu s0, sp, 96
+// 0x010be668: 0x10be668: addiu s0, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 9
-// 0x010be024: 0x10be024: sw    a0, 1176(sp)
+// 0x010be66c: 0x10be66c: sw    a0, 1176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7141,16 +7141,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010be028: 0x10be028: addiu a1, zero, 256
+// 0x010be670: 0x10be670: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010be02c: 0x10be02c: addu  a0, s0, zero
+// 0x010be674: 0x10be674: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010be030: 0x10be030: addu  a2, s1, zero
+// 0x010be678: 0x10be678: addu  a2, s1, zero
 	ldloc 11
 	stloc.3
-// 0x010be034: 0x10be034: sw    s4, 1152(sp)
+// 0x010be67c: 0x10be67c: sw    s4, 1152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7159,8 +7159,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010be038: 0x10be038: sw    ra, 1172(sp)
-// 0x010be03c: 0x10be03c: sw    s8, 1168(sp)
+// 0x010be680: 0x10be680: sw    ra, 1172(sp)
+// 0x010be684: 0x10be684: sw    s8, 1168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7169,7 +7169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010be040: 0x10be040: sw    s7, 1164(sp)
+// 0x010be688: 0x10be688: sw    s7, 1164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7178,7 +7178,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010be044: 0x10be044: sw    s6, 1160(sp)
+// 0x010be68c: 0x10be68c: sw    s6, 1160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7187,7 +7187,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010be048: 0x10be048: sw    s5, 1156(sp)
+// 0x010be690: 0x10be690: sw    s5, 1156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7196,7 +7196,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010be04c: 0x10be04c: sw    s3, 1148(sp)
+// 0x010be694: 0x10be694: sw    s3, 1148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7205,7 +7205,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010be050: 0x10be050: sw    s2, 1144(sp)
+// 0x010be698: 0x10be698: sw    s2, 1144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7214,7 +7214,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010be054: 0x10be054: jal   0x1010214 addiu s4, zero, 256
+// 0x010be69c: 0x10be69c: jal   0x1010224 addiu s4, zero, 256
 	ldc.i4 256
 	stloc 14
 	ldloc.0
@@ -7222,75 +7222,75 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_visible_lines3_1010214(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_visible_lines3_1010224(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be05c: 0x10be05c: j	 0x10be080 addu  v1, zero, zero
+// 0x010be6a4: 0x10be6a4: j	 0x10be6c8 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10be080
+	br L_10be6c8
 // --- basic block ---
-L_10be064:
-// 0x010be064: 0x10be064: lw    a0, 0(s0)
+L_10be6ac:
+// 0x010be6ac: 0x10be6ac: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010be068: 0x10be068: sll   zero, zero, 0
-// 0x010be06c: 0x10be06c: slt   a1, a0, s4
+// 0x010be6b0: 0x10be6b0: sll   zero, zero, 0
+// 0x010be6b4: 0x10be6b4: slt   a1, a0, s4
 	ldloc.1
 	ldloc 14
 	clt
 	stloc.2
-// 0x010be070: 0x10be070: beq   a1, zero, 0x10be07c addiu v1, v1, 1
+// 0x010be6b8: 0x10be6b8: beq   a1, zero, 0x10be6c4 addiu v1, v1, 1
 	ldloc.2
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brfalse L_10be07c
+	brfalse L_10be6c4
 // --- basic block ---
-// 0x010be078: 0x10be078: addu  s4, a0, zero
+// 0x010be6c0: 0x10be6c0: addu  s4, a0, zero
 	ldloc.1
 	stloc 14
-L_10be07c:
-// 0x010be07c: 0x10be07c: addiu s0, s0, 4
+L_10be6c4:
+// 0x010be6c4: 0x10be6c4: addiu s0, s0, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_10be080:
-// 0x010be080: 0x10be080: slt   a0, v1, v0
+L_10be6c8:
+// 0x010be6c8: 0x10be6c8: slt   a0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc.1
-// 0x010be084: 0x10be084: bne   a0, zero, 0x10be064 sll   zero, zero, 0
+// 0x010be6cc: 0x10be6cc: bne   a0, zero, 0x10be6ac sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10be064
+	brtrue L_10be6ac
 // --- basic block ---
-// 0x010be08c: 0x10be08c: addiu v0, zero, -1
+// 0x010be6d4: 0x10be6d4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010be090: 0x10be090: sllv  v0, s4, v0
+// 0x010be6d8: 0x10be6d8: sllv  v0, s4, v0
 	ldloc 5
 	ldloc 14
 	shl
 	stloc 5
-// 0x010be094: 0x10be094: beq   v0, zero, 0x10be478 addu  s2, zero, zero
+// 0x010be6dc: 0x10be6dc: beq   v0, zero, 0x10beac0 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 16
-	brfalse L_10be478
+	brfalse L_10beac0
 // --- basic block ---
-// 0x010be09c: 0x10be09c: addiu s6, zero, 48
+// 0x010be6e4: 0x10be6e4: addiu s6, zero, 48
 	ldc.i4.s 48
 	stloc 13
-// 0x010be0a0: 0x10be0a0: jal   0x10b5d08 sw    zero, 60(sp)
+// 0x010be6e8: 0x10be6e8: jal   0x10b6350 sw    zero, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7304,17 +7304,17 @@ L_10be080:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_count_10b5d08(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_count_10b6350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be0a8: 0x10be0a8: mult  s1, s6
+// 0x010be6f0: 0x10be6f0: mult  s1, s6
 	ldloc 11
 	ldloc 13
 	mul
 	stloc 10
-// 0x010be0ac: 0x10be0ac: sw    v0, 1120(sp)
+// 0x010be6f4: 0x10be6f4: sw    v0, 1120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7323,43 +7323,43 @@ L_10be080:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be0b0: 0x10be0b0: addiu v1, s1, 30
+// 0x010be6f8: 0x10be6f8: addiu v1, s1, 30
 	ldloc 11
 	ldc.i4.s 30
 	add
 	stloc 7
-// 0x010be0b4: 0x10be0b4: addiu v0, s1, 12
+// 0x010be6fc: 0x10be6fc: addiu v0, s1, 12
 	ldloc 11
 	ldc.i4.s 12
 	add
 	stloc 5
-// 0x010be0b8: 0x10be0b8: lui   s8, 0x10b0000
+// 0x010be700: 0x10be700: lui   s8, 0x10b0000
 	ldc.i4 17498112
 	stloc 15
-// 0x010be0bc: 0x10be0bc: lui   s3, 0xe0000
+// 0x010be704: 0x10be704: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 12
-// 0x010be0c0: 0x10be0c0: sll   v1, v1, 2
+// 0x010be708: 0x10be708: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010be0c4: 0x10be0c4: sll   v0, v0, 2
+// 0x010be70c: 0x10be70c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010be0c8: 0x10be0c8: addiu s8, s8, 17860
+// 0x010be710: 0x10be710: addiu s8, s8, 19468
 	ldloc 15
-	ldc.i4 17860
+	ldc.i4 19468
 	add
 	stloc 15
-// 0x010be0cc: 0x10be0cc: addiu s3, s3, -15708
+// 0x010be714: 0x10be714: addiu s3, s3, -15244
 	ldloc 12
-	ldc.i4 -15708
+	ldc.i4 -15244
 	add
 	stloc 12
-// 0x010be0d0: 0x10be0d0: sw    v1, 1124(sp)
+// 0x010be718: 0x10be718: sw    v1, 1124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7368,7 +7368,7 @@ L_10be080:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010be0d4: 0x10be0d4: sw    v0, 1128(sp)
+// 0x010be71c: 0x10be71c: sw    v0, 1128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7377,19 +7377,19 @@ L_10be080:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be0d8: 0x10be0d8: mflo  lo
+// 0x010be720: 0x10be720: mflo  lo
 	ldloc 10
 	stloc 13
-// 0x010be0dc: 0x10be0dc: addu  s0, zero, zero
+// 0x010be724: 0x10be724: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010be0e0: 0x10be0e0: j	 0x10be464 lui   s5, 0xe0000
+// 0x010be728: 0x10be728: j	 0x10beaac lui   s5, 0xe0000
 	ldc.i4 917504
 	stloc 17
-	br L_10be464
+	br L_10beaac
 // --- basic block ---
-L_10be0e8:
-// 0x010be0e8: 0x10be0e8: sw    v0, 16(sp)
+L_10be730:
+// 0x010be730: 0x10be730: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7398,30 +7398,30 @@ L_10be0e8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be0ec: 0x10be0ec: addu  a0, s0, zero
+// 0x010be734: 0x10be734: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010be0f0: 0x10be0f0: addiu v0, sp, 56
+// 0x010be738: 0x10be738: addiu v0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 5
-// 0x010be0f4: 0x10be0f4: addiu a1, sp, 72
+// 0x010be73c: 0x10be73c: addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x010be0f8: 0x10be0f8: addiu a2, sp, 80
+// 0x010be740: 0x10be740: addiu a2, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.3
-// 0x010be0fc: 0x10be0fc: addiu a3, sp, 64
+// 0x010be744: 0x10be744: addiu a3, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 4
-// 0x010be100: 0x10be100: jal   0x10b5d30 sw    v0, 20(sp)
+// 0x010be748: 0x10be748: jal   0x10b6378 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7435,12 +7435,12 @@ L_10be0e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be108: 0x10be108: lw    v0, 52(sp)
+// 0x010be750: 0x10be750: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7449,17 +7449,17 @@ L_10be0e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be10c: 0x10be10c: sll   zero, zero, 0
-// 0x010be110: 0x10be110: slt   v0, v0, s4
+// 0x010be754: 0x10be754: sll   zero, zero, 0
+// 0x010be758: 0x10be758: slt   v0, v0, s4
 	ldloc 5
 	ldloc 14
 	clt
 	stloc 5
-// 0x010be114: 0x10be114: bne   v0, zero, 0x10be460 sll   zero, zero, 0
+// 0x010be75c: 0x10be75c: bne   v0, zero, 0x10beaa8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10be460
+	brtrue L_10beaa8
 // --- basic block ---
-// 0x010be11c: 0x10be11c: lw    v0, 56(sp)
+// 0x010be764: 0x10be764: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7468,30 +7468,30 @@ L_10be0e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be120: 0x10be120: sll   zero, zero, 0
-// 0x010be124: 0x10be124: andi  v0, v0, 1
+// 0x010be768: 0x10be768: sll   zero, zero, 0
+// 0x010be76c: 0x10be76c: andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-// 0x010be128: 0x10be128: bne   v0, zero, 0x10be460 sll   zero, zero, 0
+// 0x010be770: 0x10be770: bne   v0, zero, 0x10beaa8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10be460
+	brtrue L_10beaa8
 // --- basic block ---
-// 0x010be130: 0x10be130: jal   0x10ac694 sll   zero, zero, 0
-	call int32 Cibyl129::editor_is_enabled_10ac694()
+// 0x010be778: 0x10be778: jal   0x10accdc sll   zero, zero, 0
+	call int32 Cibyl129::editor_is_enabled_10accdc()
 	stloc 5
 // --- basic block ---
-// 0x010be138: 0x10be138: beq   v0, zero, 0x10be1d8 lui   v1, 0x0
+// 0x010be780: 0x10be780: beq   v0, zero, 0x10be820 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10be1d8
+	brfalse L_10be820
 // --- basic block ---
-// 0x010be140: 0x10be140: lui   v0, 0xe0000
+// 0x010be788: 0x10be788: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010be144: 0x10be144: lw    a0, 18812(v1)
+// 0x010be78c: 0x10be78c: lw    a0, 18812(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7500,43 +7500,43 @@ L_10be0e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be148: 0x10be148: lui   v1, 0xf0000
+// 0x010be790: 0x10be790: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x010be14c: 0x10be14c: lw    a1, -14532(v0)
+// 0x010be794: 0x10be794: lw    a1, -14068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3633
+	ldc.i4 -3517
 	add
 	ldelem.i4
 	stloc.2
-// 0x010be150: 0x10be150: addiu v1, v1, -22940
+// 0x010be798: 0x10be798: addiu v1, v1, -22476
 	ldloc 7
-	ldc.i4 -22940
+	ldc.i4 -22476
 	add
 	stloc 7
-// 0x010be154: 0x10be154: j	 0x10be1a8 addu  v0, zero, zero
+// 0x010be79c: 0x10be79c: j	 0x10be7f0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10be1a8
+	br L_10be7f0
 // --- basic block ---
-L_10be15c:
-// 0x010be15c: 0x10be15c: lw    a2, 0(v1)
+L_10be7a4:
+// 0x010be7a4: 0x10be7a4: lw    a2, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010be160: 0x10be160: sll   zero, zero, 0
-// 0x010be164: 0x10be164: bne   s0, a2, 0x10be1a0 sll   zero, zero, 0
+// 0x010be7a8: 0x10be7a8: sll   zero, zero, 0
+// 0x010be7ac: 0x10be7ac: bne   s0, a2, 0x10be7e8 sll   zero, zero, 0
 	ldloc 9
 	ldloc.3
-	bne.un L_10be1a0
+	bne.un L_10be7e8
 // --- basic block ---
-// 0x010be16c: 0x10be16c: lw    a2, -4(v1)
+// 0x010be7b4: 0x10be7b4: lw    a2, -4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7545,13 +7545,13 @@ L_10be15c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010be170: 0x10be170: sll   zero, zero, 0
-// 0x010be174: 0x10be174: bne   a2, a0, 0x10be1a0 sll   zero, zero, 0
+// 0x010be7b8: 0x10be7b8: sll   zero, zero, 0
+// 0x010be7bc: 0x10be7bc: bne   a2, a0, 0x10be7e8 sll   zero, zero, 0
 	ldloc.3
 	ldloc.1
-	bne.un L_10be1a0
+	bne.un L_10be7e8
 // --- basic block ---
-// 0x010be17c: 0x10be17c: lw    a2, 12(v1)
+// 0x010be7c4: 0x10be7c4: lw    a2, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7560,7 +7560,7 @@ L_10be15c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010be180: 0x10be180: lw    a3, 1176(sp)
+// 0x010be7c8: 0x10be7c8: lw    a3, 1176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7569,22 +7569,22 @@ L_10be15c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010be184: 0x10be184: sll   zero, zero, 0
-// 0x010be188: 0x10be188: bne   a3, a2, 0x10be1a4 addiu v0, v0, 1
+// 0x010be7cc: 0x10be7cc: sll   zero, zero, 0
+// 0x010be7d0: 0x10be7d0: bne   a3, a2, 0x10be7ec addiu v0, v0, 1
 	ldloc 4
 	ldloc.3
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	bne.un L_10be1a4
+	bne.un L_10be7ec
 // --- basic block ---
-// 0x010be190: 0x10be190: addiu v0, v0, -1
+// 0x010be7d8: 0x10be7d8: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010be194: 0x10be194: sw    v0, 40(sp)
+// 0x010be7dc: 0x10be7dc: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7593,38 +7593,38 @@ L_10be15c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be198: 0x10be198: j	 0x10be2e0 addu  v0, zero, zero
+// 0x010be7e0: 0x10be7e0: j	 0x10be928 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10be2e0
+	br L_10be928
 // --- basic block ---
-L_10be1a0:
-// 0x010be1a0: 0x10be1a0: addiu v0, v0, 1
+L_10be7e8:
+// 0x010be7e8: 0x10be7e8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_10be1a4:
-// 0x010be1a4: 0x10be1a4: addiu v1, v1, 20
+L_10be7ec:
+// 0x010be7ec: 0x10be7ec: addiu v1, v1, 20
 	ldloc 7
 	ldc.i4.s 20
 	add
 	stloc 7
-L_10be1a8:
-// 0x010be1a8: 0x10be1a8: slt   a2, v0, a1
+L_10be7f0:
+// 0x010be7f0: 0x10be7f0: slt   a2, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-// 0x010be1ac: 0x10be1ac: bne   a2, zero, 0x10be15c sll   zero, zero, 0
+// 0x010be7f4: 0x10be7f4: bne   a2, zero, 0x10be7a4 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10be15c
+	brtrue L_10be7a4
 // --- basic block ---
-// 0x010be1b4: 0x10be1b4: j	 0x10be4ac sll   zero, zero, 0
-	br L_10be4ac
+// 0x010be7fc: 0x10be7fc: j	 0x10beaf4 sll   zero, zero, 0
+	br L_10beaf4
 // --- basic block ---
-L_10be1bc:
-// 0x010be1bc: 0x10be1bc: lw    a1, 52(sp)
+L_10be804:
+// 0x010be804: 0x10be804: lw    a1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7633,7 +7633,7 @@ L_10be1bc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010be1c0: 0x10be1c0: lw    a3, 1176(sp)
+// 0x010be808: 0x10be808: lw    a3, 1176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7642,7 +7642,7 @@ L_10be1bc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010be1c4: 0x10be1c4: jal   0x10bdef8 addiu a2, zero, 1
+// 0x010be80c: 0x10be80c: jal   0x10be540 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -7650,25 +7650,25 @@ L_10be1bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_get_road_state_10bdef8(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_get_road_state_10be540(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be1cc: 0x10be1cc: addiu v1, zero, 4
+// 0x010be814: 0x10be814: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 7
-// 0x010be1d0: 0x10be1d0: bne   v0, v1, 0x10be2e4 slti  v1, s1, 2
+// 0x010be818: 0x10be818: bne   v0, v1, 0x10be92c slti  v1, s1, 2
 	ldloc 5
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	clt
 	stloc 7
-	bne.un L_10be2e4
+	bne.un L_10be92c
 // --- basic block ---
-L_10be1d8:
-// 0x010be1d8: 0x10be1d8: lw    v0, 52(sp)
+L_10be820:
+// 0x010be820: 0x10be820: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7677,32 +7677,32 @@ L_10be1d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be1dc: 0x10be1dc: addiu s7, zero, 192
+// 0x010be824: 0x10be824: addiu s7, zero, 192
 	ldc.i4 192
 	stloc 8
-// 0x010be1e0: 0x10be1e0: mult  v0, s7
+// 0x010be828: 0x10be828: mult  v0, s7
 	ldloc 5
 	ldloc 8
 	mul
 	stloc 10
-// 0x010be1e4: 0x10be1e4: lw    v1, 29728(s5)
+// 0x010be82c: 0x10be82c: lw    v1, 30192(s5)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 7
-// 0x010be1e8: 0x10be1e8: mflo  lo
+// 0x010be830: 0x10be830: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x010be1ec: 0x10be1ec: addu  v1, v1, s7
+// 0x010be834: 0x10be834: addu  v1, v1, s7
 	ldloc 7
 	ldloc 8
 	add
 	stloc 7
-// 0x010be1f0: 0x10be1f0: lw    a0, 8(v1)
+// 0x010be838: 0x10be838: lw    a0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7711,14 +7711,14 @@ L_10be1d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be1f4: 0x10be1f4: sll   zero, zero, 0
-// 0x010be1f8: 0x10be1f8: beq   a0, zero, 0x10be2d8 lui   a1, 0xe0000
+// 0x010be83c: 0x10be83c: sll   zero, zero, 0
+// 0x010be840: 0x10be840: beq   a0, zero, 0x10be920 lui   a1, 0xe0000
 	ldloc.1
 	ldc.i4 917504
 	stloc.2
-	brfalse L_10be2d8
+	brfalse L_10be920
 // --- basic block ---
-// 0x010be200: 0x10be200: lw    v1, 16(v1)
+// 0x010be848: 0x10be848: lw    v1, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7727,56 +7727,56 @@ L_10be1d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010be204: 0x10be204: lw    a0, 29604(a1)
+// 0x010be84c: 0x10be84c: lw    a0, 30068(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be208: 0x10be208: sll   zero, zero, 0
-// 0x010be20c: 0x10be20c: slt   v1, a0, v1
+// 0x010be850: 0x10be850: sll   zero, zero, 0
+// 0x010be854: 0x10be854: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x010be210: 0x10be210: beq   v1, zero, 0x10be2d8 addiu v1, zero, 16
+// 0x010be858: 0x10be858: beq   v1, zero, 0x10be920 addiu v1, zero, 16
 	ldloc 7
 	ldc.i4.s 16
 	stloc 7
-	brfalse L_10be2d8
+	brfalse L_10be920
 // --- basic block ---
-// 0x010be218: 0x10be218: bne   v0, v1, 0x10be234 addiu v0, zero, -1
+// 0x010be860: 0x10be860: bne   v0, v1, 0x10be87c addiu v0, zero, -1
 	ldloc 5
 	ldloc 7
 	ldc.i4.m1
 	stloc 5
-	bne.un L_10be234
+	bne.un L_10be87c
 // --- basic block ---
-// 0x010be220: 0x10be220: jal   0x101f998 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_fast_refresh_101f998()
+// 0x010be868: 0x10be868: jal   0x101f9a8 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_fast_refresh_101f9a8()
 	stloc 5
 // --- basic block ---
-// 0x010be228: 0x10be228: bne   v0, zero, 0x10be338 addu  v0, zero, zero
+// 0x010be870: 0x10be870: bne   v0, zero, 0x10be980 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10be338
+	brtrue L_10be980
 // --- basic block ---
-// 0x010be230: 0x10be230: addiu v0, zero, -1
+// 0x010be878: 0x10be878: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10be234:
-// 0x010be234: 0x10be234: bne   s1, v0, 0x10be2a0 lui   a3, 0x0
+L_10be87c:
+// 0x010be87c: 0x10be87c: bne   s1, v0, 0x10be8e8 lui   a3, 0x0
 	ldloc 11
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_10be2a0
+	bne.un L_10be8e8
 // --- basic block ---
-// 0x010be23c: 0x10be23c: lw    v0, 1144(a3)
+// 0x010be884: 0x10be884: lw    v0, 1144(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -7785,112 +7785,112 @@ L_10be234:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be240: 0x10be240: sll   zero, zero, 0
-// 0x010be244: 0x10be244: slti  v1, v0, 3
+// 0x010be888: 0x10be888: sll   zero, zero, 0
+// 0x010be88c: 0x10be88c: slti  v1, v0, 3
 	ldloc 5
 	ldc.i4.3
 	clt
 	stloc 7
-// 0x010be248: 0x10be248: bne   v1, zero, 0x10be254 sll   zero, zero, 0
+// 0x010be890: 0x10be890: bne   v1, zero, 0x10be89c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10be254
+	brtrue L_10be89c
 // --- basic block ---
-// 0x010be250: 0x10be250: addiu v0, zero, 2
+// 0x010be898: 0x10be898: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-L_10be254:
-// 0x010be254: 0x10be254: lw    a0, 29728(s5)
+L_10be89c:
+// 0x010be89c: 0x10be89c: lw    a0, 30192(s5)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be258: 0x10be258: addiu v1, v0, 29
+// 0x010be8a0: 0x10be8a0: addiu v1, v0, 29
 	ldloc 5
 	ldc.i4.s 29
 	add
 	stloc 7
-// 0x010be25c: 0x10be25c: addu  s7, a0, s7
+// 0x010be8a4: 0x10be8a4: addu  s7, a0, s7
 	ldloc.1
 	ldloc 8
 	add
 	stloc 8
-// 0x010be260: 0x10be260: sll   v1, v1, 2
+// 0x010be8a8: 0x10be8a8: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010be264: 0x10be264: j	 0x10be28c addu  v1, s7, v1
+// 0x010be8ac: 0x10be8ac: j	 0x10be8d4 addu  v1, s7, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-	br L_10be28c
+	br L_10be8d4
 // --- basic block ---
-L_10be26c:
-// 0x010be26c: 0x10be26c: lw    a0, 0(v1)
+L_10be8b4:
+// 0x010be8b4: 0x10be8b4: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010be270: 0x10be270: sll   zero, zero, 0
-// 0x010be274: 0x10be274: beq   a0, zero, 0x10be28c addiu v1, v1, -4
+// 0x010be8b8: 0x10be8b8: sll   zero, zero, 0
+// 0x010be8bc: 0x10be8bc: beq   a0, zero, 0x10be8d4 addiu v1, v1, -4
 	ldloc.1
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 7
-	brfalse L_10be28c
+	brfalse L_10be8d4
 // --- basic block ---
-// 0x010be27c: 0x10be27c: addiu v0, v0, 12
+// 0x010be8c4: 0x10be8c4: addiu v0, v0, 12
 	ldloc 5
 	ldc.i4.s 12
 	add
 	stloc 5
-// 0x010be280: 0x10be280: sll   v0, v0, 2
+// 0x010be8c8: 0x10be8c8: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010be284: 0x10be284: j	 0x10be2cc addu  s7, s7, v0
+// 0x010be8cc: 0x10be8cc: j	 0x10be914 addu  s7, s7, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-	br L_10be2cc
+	br L_10be914
 // --- basic block ---
-L_10be28c:
-// 0x010be28c: 0x10be28c: addiu v0, v0, -1
+L_10be8d4:
+// 0x010be8d4: 0x10be8d4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010be290: 0x10be290: bgez  v0, 0x10be26c sll   zero, zero, 0
+// 0x010be8d8: 0x10be8d8: bgez  v0, 0x10be8b4 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_10be26c
+	bge L_10be8b4
 // --- basic block ---
-// 0x010be298: 0x10be298: j	 0x10be338 addu  v0, zero, zero
+// 0x010be8e0: 0x10be8e0: j	 0x10be980 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10be338
+	br L_10be980
 // --- basic block ---
-L_10be2a0:
-// 0x010be2a0: 0x10be2a0: lw    v0, 29728(s5)
+L_10be8e8:
+// 0x010be8e8: 0x10be8e8: lw    v0, 30192(s5)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be2a4: 0x10be2a4: lw    v1, 1124(sp)
+// 0x010be8ec: 0x10be8ec: lw    v1, 1124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7899,31 +7899,31 @@ L_10be2a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010be2a8: 0x10be2a8: addu  s7, v0, s7
+// 0x010be8f0: 0x10be8f0: addu  s7, v0, s7
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x010be2ac: 0x10be2ac: addu  v0, s7, v1
+// 0x010be8f4: 0x10be8f4: addu  v0, s7, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 5
-// 0x010be2b0: 0x10be2b0: lw    v0, 0(v0)
+// 0x010be8f8: 0x10be8f8: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010be2b4: 0x10be2b4: sll   zero, zero, 0
-// 0x010be2b8: 0x10be2b8: beq   v0, zero, 0x10be338 addu  v0, zero, zero
+// 0x010be8fc: 0x10be8fc: sll   zero, zero, 0
+// 0x010be900: 0x10be900: beq   v0, zero, 0x10be980 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10be338
+	brfalse L_10be980
 // --- basic block ---
-// 0x010be2c0: 0x10be2c0: lw    a0, 1128(sp)
+// 0x010be908: 0x10be908: lw    a0, 1128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7932,21 +7932,21 @@ L_10be2a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be2c4: 0x10be2c4: sll   zero, zero, 0
-// 0x010be2c8: 0x10be2c8: addu  s7, s7, a0
+// 0x010be90c: 0x10be90c: sll   zero, zero, 0
+// 0x010be910: 0x10be910: addu  s7, s7, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-L_10be2cc:
-// 0x010be2cc: 0x10be2cc: lw    v0, 0(s7)
+L_10be914:
+// 0x010be914: 0x10be914: lw    v0, 0(s7)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010be2d0: 0x10be2d0: j	 0x10be33c sw    v0, 60(sp)
+// 0x010be918: 0x10be918: j	 0x10be984 sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7955,33 +7955,33 @@ L_10be2cc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10be33c
+	br L_10be984
 // --- basic block ---
-L_10be2d8:
-// 0x010be2d8: 0x10be2d8: j	 0x10be338 addu  v0, zero, zero
+L_10be920:
+// 0x010be920: 0x10be920: j	 0x10be980 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10be338
+	br L_10be980
 // --- basic block ---
-L_10be2e0:
-// 0x010be2e0: 0x10be2e0: slti  v1, s1, 2
+L_10be928:
+// 0x010be928: 0x10be928: slti  v1, s1, 2
 	ldloc 11
 	ldc.i4.2
 	clt
 	stloc 7
-L_10be2e4:
-// 0x010be2e4: 0x10be2e4: beq   v1, zero, 0x10be460 addiu v1, zero, 12
+L_10be92c:
+// 0x010be92c: 0x10be92c: beq   v1, zero, 0x10beaa8 addiu v1, zero, 12
 	ldloc 7
 	ldc.i4.s 12
 	stloc 7
-	brfalse L_10be460
+	brfalse L_10beaa8
 // --- basic block ---
-// 0x010be2ec: 0x10be2ec: mult  v0, v1
+// 0x010be934: 0x10be934: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 10
-// 0x010be2f0: 0x10be2f0: lw    a0, 52(sp)
+// 0x010be938: 0x10be938: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7990,64 +7990,64 @@ L_10be2e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be2f4: 0x10be2f4: addiu v1, zero, 96
+// 0x010be93c: 0x10be93c: addiu v1, zero, 96
 	ldc.i4.s 96
 	stloc 7
-// 0x010be2f8: 0x10be2f8: mflo  lo
+// 0x010be940: 0x10be940: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010be2fc: 0x10be2fc: sll   zero, zero, 0
-// 0x010be300: 0x10be300: sll   zero, zero, 0
-// 0x010be304: 0x10be304: mult  a0, v1
+// 0x010be944: 0x10be944: sll   zero, zero, 0
+// 0x010be948: 0x10be948: sll   zero, zero, 0
+// 0x010be94c: 0x10be94c: mult  a0, v1
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 10
-// 0x010be308: 0x10be308: mflo  lo
+// 0x010be950: 0x10be950: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x010be30c: 0x10be30c: addu  a0, v0, v1
+// 0x010be954: 0x10be954: addu  a0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc.1
-// 0x010be310: 0x10be310: addu  a0, a0, s6
+// 0x010be958: 0x10be958: addu  a0, a0, s6
 	ldloc.1
 	ldloc 13
 	add
 	stloc.1
-// 0x010be314: 0x10be314: addu  a0, a0, s3
+// 0x010be95c: 0x10be95c: addu  a0, a0, s3
 	ldloc.1
 	ldloc 12
 	add
 	stloc.1
-// 0x010be318: 0x10be318: lw    a0, 0(a0)
+// 0x010be960: 0x10be960: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010be31c: 0x10be31c: sll   zero, zero, 0
-// 0x010be320: 0x10be320: beq   a0, zero, 0x10be460 addu  v0, v0, s6
+// 0x010be964: 0x10be964: sll   zero, zero, 0
+// 0x010be968: 0x10be968: beq   a0, zero, 0x10beaa8 addu  v0, v0, s6
 	ldloc.1
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-	brfalse L_10be460
+	brfalse L_10beaa8
 // --- basic block ---
-// 0x010be328: 0x10be328: addu  v1, v0, v1
+// 0x010be970: 0x10be970: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x010be32c: 0x10be32c: addu  v1, v1, s3
+// 0x010be974: 0x10be974: addu  v1, v1, s3
 	ldloc 7
 	ldloc 12
 	add
 	stloc 7
-// 0x010be330: 0x10be330: lw    v0, 8(v1)
+// 0x010be978: 0x10be978: lw    v0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -8056,9 +8056,9 @@ L_10be2e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be334: 0x10be334: sll   zero, zero, 0
-L_10be338:
-// 0x010be338: 0x10be338: sw    v0, 60(sp)
+// 0x010be97c: 0x10be97c: sll   zero, zero, 0
+L_10be980:
+// 0x010be980: 0x10be980: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8067,8 +8067,8 @@ L_10be338:
 	add
 	ldloc 5
 	stelem.i4
-L_10be33c:
-// 0x010be33c: 0x10be33c: lw    v0, 60(sp)
+L_10be984:
+// 0x010be984: 0x10be984: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8077,16 +8077,16 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be340: 0x10be340: sll   zero, zero, 0
-// 0x010be344: 0x10be344: beq   v0, zero, 0x10be460 addiu a2, sp, 44
+// 0x010be988: 0x10be988: sll   zero, zero, 0
+// 0x010be98c: 0x10be98c: beq   v0, zero, 0x10beaa8 addiu a2, sp, 44
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.3
-	brfalse L_10be460
+	brfalse L_10beaa8
 // --- basic block ---
-// 0x010be34c: 0x10be34c: lw    a0, 64(sp)
+// 0x010be994: 0x10be994: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8095,22 +8095,22 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be350: 0x10be350: addiu a3, sp, 48
+// 0x010be998: 0x10be998: addiu a3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 4
-// 0x010be354: 0x10be354: addiu a1, sp, 40
+// 0x010be99c: 0x10be99c: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x010be358: 0x10be358: addiu s7, sp, 88
+// 0x010be9a0: 0x10be9a0: addiu s7, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc 8
-// 0x010be35c: 0x10be35c: jal   0x10b48f8 sw    zero, 16(sp)
+// 0x010be9a4: 0x10be9a4: jal   0x10b4f40 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8124,12 +8124,12 @@ L_10be33c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be364: 0x10be364: lw    a0, 40(sp)
+// 0x010be9ac: 0x10be9ac: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8138,7 +8138,7 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be368: 0x10be368: jal   0x10b46a0 addu  a1, s7, zero
+// 0x010be9b0: 0x10be9b0: jal   0x10b4ce8 addu  a1, s7, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -8146,12 +8146,12 @@ L_10be33c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_position_10b46a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_position_10b4ce8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be370: 0x10be370: lw    v0, 44(sp)
+// 0x010be9b8: 0x10be9b8: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8160,10 +8160,10 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be374: 0x10be374: addiu v1, zero, 1
+// 0x010be9bc: 0x10be9bc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010be378: 0x10be378: sw    v0, 16(sp)
+// 0x010be9c0: 0x10be9c0: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8172,7 +8172,7 @@ L_10be33c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be37c: 0x10be37c: lw    v0, 48(sp)
+// 0x010be9c4: 0x10be9c4: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8181,12 +8181,12 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be380: 0x10be380: addiu a0, sp, 72
+// 0x010be9c8: 0x10be9c8: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x010be384: 0x10be384: sw    v0, 20(sp)
+// 0x010be9cc: 0x10be9cc: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8195,15 +8195,15 @@ L_10be33c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be388: 0x10be388: addiu v0, sp, 60
+// 0x010be9d0: 0x10be9d0: addiu v0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 5
-// 0x010be38c: 0x10be38c: addu  a2, zero, zero
+// 0x010be9d4: 0x10be9d4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010be390: 0x10be390: sw    v0, 28(sp)
+// 0x010be9d8: 0x10be9d8: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8212,18 +8212,18 @@ L_10be33c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be394: 0x10be394: addiu a1, sp, 80
+// 0x010be9dc: 0x10be9dc: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x010be398: 0x10be398: addiu v0, zero, -1
+// 0x010be9e0: 0x10be9e0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010be39c: 0x10be39c: addu  a3, s7, zero
+// 0x010be9e4: 0x10be9e4: addu  a3, s7, zero
 	ldloc 8
 	stloc 4
-// 0x010be3a0: 0x10be3a0: sw    v1, 32(sp)
+// 0x010be9e8: 0x10be9e8: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8232,7 +8232,7 @@ L_10be33c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010be3a4: 0x10be3a4: sw    v1, 1132(sp)
+// 0x010be9ec: 0x10be9ec: sw    v1, 1132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8241,7 +8241,7 @@ L_10be33c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010be3a8: 0x10be3a8: sw    s8, 24(sp)
+// 0x010be9f0: 0x10be9f0: sw    s8, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8250,7 +8250,7 @@ L_10be33c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010be3ac: 0x10be3ac: jal   0x1022e0c sw    v0, 36(sp)
+// 0x010be9f4: 0x10be9f4: jal   0x1022e1c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8264,12 +8264,12 @@ L_10be33c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be3b4: 0x10be3b4: lw    a0, 52(sp)
+// 0x010be9fc: 0x10be9fc: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8278,20 +8278,20 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be3b8: 0x10be3b8: addiu a2, zero, 96
+// 0x010bea00: 0x10bea00: addiu a2, zero, 96
 	ldc.i4.s 96
 	stloc.3
-// 0x010be3bc: 0x10be3bc: mult  a0, a2
+// 0x010bea04: 0x10bea04: mult  a0, a2
 	ldloc.1
 	ldloc.3
 	mul
 	stloc 10
-// 0x010be3c0: 0x10be3c0: addu  s2, s2, v0
+// 0x010bea08: 0x10bea08: addu  s2, s2, v0
 	ldloc 16
 	ldloc 5
 	add
 	stloc 16
-// 0x010be3c4: 0x10be3c4: lw    v1, 1132(sp)
+// 0x010bea0c: 0x10bea0c: lw    v1, 1132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8300,20 +8300,20 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010be3c8: 0x10be3c8: mflo  lo
+// 0x010bea10: 0x10bea10: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010be3cc: 0x10be3cc: addu  v0, s6, a0
+// 0x010bea14: 0x10bea14: addu  v0, s6, a0
 	ldloc 13
 	ldloc.1
 	add
 	stloc 5
-// 0x010be3d0: 0x10be3d0: addu  v0, s3, v0
+// 0x010bea18: 0x10bea18: addu  v0, s3, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 5
-// 0x010be3d4: 0x10be3d4: lw    v0, 4(v0)
+// 0x010bea1c: 0x10bea1c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8322,29 +8322,29 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be3d8: 0x10be3d8: sll   zero, zero, 0
-// 0x010be3dc: 0x10be3dc: slti  v0, v0, 21
+// 0x010bea20: 0x10bea20: sll   zero, zero, 0
+// 0x010bea24: 0x10bea24: slti  v0, v0, 21
 	ldloc 5
 	ldc.i4.s 21
 	clt
 	stloc 5
-// 0x010be3e0: 0x10be3e0: bne   v0, zero, 0x10be460 sll   zero, zero, 0
+// 0x010bea28: 0x10bea28: bne   v0, zero, 0x10beaa8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10be460
+	brtrue L_10beaa8
 // --- basic block ---
-// 0x010be3e8: 0x10be3e8: bne   s1, v1, 0x10be460 addiu a1, sp, 68
+// 0x010bea30: 0x10bea30: bne   s1, v1, 0x10beaa8 addiu a1, sp, 68
 	ldloc 11
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.2
-	bne.un L_10be460
+	bne.un L_10beaa8
 // --- basic block ---
-// 0x010be3f0: 0x10be3f0: addu  a0, s0, zero
+// 0x010bea38: 0x10bea38: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010be3f4: 0x10be3f4: jal   0x10b586c sw    a2, 1132(sp)
+// 0x010bea3c: 0x10bea3c: jal   0x10b5eb4 sw    a2, 1132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8358,15 +8358,15 @@ L_10be33c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_direction_10b586c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_direction_10b5eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be3fc: 0x10be3fc: addiu a1, zero, -1
+// 0x010bea44: 0x10bea44: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010be400: 0x10be400: lw    a2, 1132(sp)
+// 0x010bea48: 0x10bea48: lw    a2, 1132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8375,12 +8375,12 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010be404: 0x10be404: beq   v0, a1, 0x10be460 sll   zero, zero, 0
+// 0x010bea4c: 0x10bea4c: beq   v0, a1, 0x10beaa8 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	beq  L_10be460
+	beq  L_10beaa8
 // --- basic block ---
-// 0x010be40c: 0x10be40c: lw    v0, 68(sp)
+// 0x010bea54: 0x10bea54: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8389,17 +8389,17 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be410: 0x10be410: sll   zero, zero, 0
-// 0x010be414: 0x10be414: blez  v0, 0x10be460 addiu a0, sp, 72
+// 0x010bea58: 0x10bea58: sll   zero, zero, 0
+// 0x010bea5c: 0x10bea5c: blez  v0, 0x10beaa8 addiu a0, sp, 72
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
 	ldc.i4.s 0
-	ble L_10be460
+	ble L_10beaa8
 // --- basic block ---
-// 0x010be41c: 0x10be41c: lw    v1, 52(sp)
+// 0x010bea64: 0x10bea64: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8408,7 +8408,7 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010be420: 0x10be420: sw    v0, 28(sp)
+// 0x010bea68: 0x10bea68: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8417,12 +8417,12 @@ L_10be33c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be424: 0x10be424: mult  v1, a2
+// 0x010bea6c: 0x10bea6c: mult  v1, a2
 	ldloc 7
 	ldloc.3
 	mul
 	stloc 10
-// 0x010be428: 0x10be428: lw    v1, 48(sp)
+// 0x010bea70: 0x10bea70: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8431,10 +8431,10 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010be42c: 0x10be42c: lui   v0, 0x0
+// 0x010bea74: 0x10bea74: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010be430: 0x10be430: sw    v1, 16(sp)
+// 0x010bea78: 0x10bea78: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8443,12 +8443,12 @@ L_10be33c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010be434: 0x10be434: addiu v0, v0, 31980
+// 0x010bea7c: 0x10bea7c: addiu v0, v0, 31980
 	ldloc 5
 	ldc.i4 31980
 	add
 	stloc 5
-// 0x010be438: 0x10be438: sw    v0, 32(sp)
+// 0x010bea80: 0x10bea80: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8457,7 +8457,7 @@ L_10be33c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be43c: 0x10be43c: sw    s8, 20(sp)
+// 0x010bea84: 0x10bea84: sw    s8, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8466,7 +8466,7 @@ L_10be33c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010be440: 0x10be440: lw    a3, 44(sp)
+// 0x010bea88: 0x10bea88: lw    a3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8475,23 +8475,23 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010be444: 0x10be444: addu  a2, s7, zero
+// 0x010bea8c: 0x10bea8c: addu  a2, s7, zero
 	ldloc 8
 	stloc.3
-// 0x010be448: 0x10be448: addiu a1, sp, 80
+// 0x010bea90: 0x10bea90: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x010be44c: 0x10be44c: mflo  lo
+// 0x010bea94: 0x10bea94: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x010be450: 0x10be450: addu  v0, s3, v1
+// 0x010bea98: 0x10bea98: addu  v0, s3, v1
 	ldloc 12
 	ldloc 7
 	add
 	stloc 5
-// 0x010be454: 0x10be454: lw    v0, 52(v0)
+// 0x010bea9c: 0x10bea9c: lw    v0, 52(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8500,7 +8500,7 @@ L_10be33c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010be458: 0x10be458: jal   0x10ac684 sw    v0, 24(sp)
+// 0x010beaa0: 0x10beaa0: jal   0x10acccc sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8509,16 +8509,16 @@ L_10be33c:
 	add
 	ldloc 5
 	stelem.i4
-	call void Cibyl129::roadmap_screen_draw_line_direction_10ac684()
+	call void Cibyl129::roadmap_screen_draw_line_direction_10acccc()
 // --- basic block ---
-L_10be460:
-// 0x010be460: 0x10be460: addiu s0, s0, 1
+L_10beaa8:
+// 0x010beaa8: 0x10beaa8: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10be464:
-// 0x010be464: 0x10be464: lw    a0, 1120(sp)
+L_10beaac:
+// 0x010beaac: 0x10beaac: lw    a0, 1120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8527,26 +8527,26 @@ L_10be464:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010be468: 0x10be468: sll   zero, zero, 0
-// 0x010be46c: 0x10be46c: slt   v0, s0, a0
+// 0x010beab0: 0x10beab0: sll   zero, zero, 0
+// 0x010beab4: 0x10beab4: slt   v0, s0, a0
 	ldloc 9
 	ldloc.1
 	clt
 	stloc 5
-// 0x010be470: 0x10be470: bne   v0, zero, 0x10be0e8 addiu v0, sp, 52
+// 0x010beab8: 0x10beab8: bne   v0, zero, 0x10be730 addiu v0, sp, 52
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 5
-	brtrue L_10be0e8
+	brtrue L_10be730
 // --- basic block ---
-L_10be478:
-// 0x010be478: 0x10be478: lw    ra, 1172(sp)
-// 0x010be47c: 0x10be47c: addu  v0, s2, zero
+L_10beac0:
+// 0x010beac0: 0x10beac0: lw    ra, 1172(sp)
+// 0x010beac4: 0x10beac4: addu  v0, s2, zero
 	ldloc 16
 	stloc 5
-// 0x010be480: 0x10be480: lw    s8, 1168(sp)
+// 0x010beac8: 0x10beac8: lw    s8, 1168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8555,7 +8555,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010be484: 0x10be484: lw    s7, 1164(sp)
+// 0x010beacc: 0x10beacc: lw    s7, 1164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8564,7 +8564,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010be488: 0x10be488: lw    s6, 1160(sp)
+// 0x010bead0: 0x10bead0: lw    s6, 1160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8573,7 +8573,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010be48c: 0x10be48c: lw    s5, 1156(sp)
+// 0x010bead4: 0x10bead4: lw    s5, 1156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8582,7 +8582,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010be490: 0x10be490: lw    s4, 1152(sp)
+// 0x010bead8: 0x10bead8: lw    s4, 1152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8591,7 +8591,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010be494: 0x10be494: lw    s3, 1148(sp)
+// 0x010beadc: 0x10beadc: lw    s3, 1148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8600,7 +8600,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010be498: 0x10be498: lw    s2, 1144(sp)
+// 0x010beae0: 0x10beae0: lw    s2, 1144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8609,7 +8609,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010be49c: 0x10be49c: lw    s1, 1140(sp)
+// 0x010beae4: 0x10beae4: lw    s1, 1140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8618,7 +8618,7 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010be4a0: 0x10be4a0: lw    s0, 1136(sp)
+// 0x010beae8: 0x10beae8: lw    s0, 1136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8627,15 +8627,15 @@ L_10be478:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010be4a4: 0x10be4a4: jr    ra addiu sp, sp, 1176
+// 0x010beaec: 0x10beaec: jr    ra addiu sp, sp, 1176
 	ldloc.0
 	ldc.i4 1176
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10be4ac:
-// 0x010be4ac: 0x10be4ac: lw    v1, 56(sp)
+L_10beaf4:
+// 0x010beaf4: 0x10beaf4: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8644,7 +8644,7 @@ L_10be4ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010be4b0: 0x10be4b0: sw    v0, 40(sp)
+// 0x010beaf8: 0x10beaf8: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8653,21 +8653,21 @@ L_10be4ac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010be4b4: 0x10be4b4: andi  v1, v1, 8
+// 0x010beafc: 0x10beafc: andi  v1, v1, 8
 	ldloc 7
 	ldc.i4.8
 	and
 	stloc 7
-// 0x010be4b8: 0x10be4b8: bne   v1, zero, 0x10be2e0 addiu v0, zero, 2
+// 0x010beb00: 0x10beb00: bne   v1, zero, 0x10be928 addiu v0, zero, 2
 	ldloc 7
 	ldc.i4.2
 	stloc 5
-	brtrue L_10be2e0
+	brtrue L_10be928
 // --- basic block ---
-// 0x010be4c0: 0x10be4c0: j	 0x10be1bc addu  a0, s0, zero
+// 0x010beb08: 0x10beb08: j	 0x10be804 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-	br L_10be1bc
+	br L_10be804
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl142.j b/converted/Cibyl142.j
index 41b8548..2c9aff2 100644
--- a/converted/Cibyl142.j
+++ b/converted/Cibyl142.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl142::.ctor
 
-.method public static int32 editor_screen_repaint_10be94c(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_repaint_10bef94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s2,int32 t1,int32 s1,int32 s4,int32 s5,int32 lo,int32 s6,int32 s7,int32 s8,int32 t0,int32 ra)
@@ -112,16 +112,16 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10be94c:
-// 0x010be94c: 0x10be94c: addiu sp, sp, -160
+L_10bef94:
+// 0x010bef94: 0x10bef94: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x010be950: 0x10be950: lui   v0, 0x0
+// 0x010bef98: 0x10bef98: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010be954: 0x10be954: sw    s3, 132(sp)
+// 0x010bef9c: 0x10bef9c: sw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -130,7 +130,7 @@ L_10be94c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010be958: 0x10be958: lw    s3, 1816(v0)
+// 0x010befa0: 0x10befa0: lw    s3, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -139,7 +139,7 @@ L_10be94c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010be95c: 0x10be95c: sw    s2, 128(sp)
+// 0x010befa4: 0x10befa4: sw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -148,13 +148,13 @@ L_10be94c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010be960: 0x10be960: addu  s2, a0, zero
+// 0x010befa8: 0x10befa8: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010be964: 0x10be964: addu  a0, s3, zero
+// 0x010befac: 0x10befac: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x010be968: 0x10be968: sw    s1, 124(sp)
+// 0x010befb0: 0x10befb0: sw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -163,7 +163,7 @@ L_10be94c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010be96c: 0x10be96c: sw    s0, 120(sp)
+// 0x010befb4: 0x10befb4: sw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -172,8 +172,8 @@ L_10be94c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010be970: 0x10be970: sw    ra, 156(sp)
-// 0x010be974: 0x10be974: sw    s8, 152(sp)
+// 0x010befb8: 0x10befb8: sw    ra, 156(sp)
+// 0x010befbc: 0x10befbc: sw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -182,7 +182,7 @@ L_10be94c:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010be978: 0x10be978: sw    s7, 148(sp)
+// 0x010befc0: 0x10befc0: sw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -191,7 +191,7 @@ L_10be94c:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010be97c: 0x10be97c: sw    s6, 144(sp)
+// 0x010befc4: 0x10befc4: sw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -200,7 +200,7 @@ L_10be94c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010be980: 0x10be980: sw    s5, 140(sp)
+// 0x010befc8: 0x10befc8: sw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -209,7 +209,7 @@ L_10be94c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010be984: 0x10be984: jal   0x10b79b4 sw    s4, 136(sp)
+// 0x010befcc: 0x10befcc: jal   0x10b7ffc sw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -223,29 +223,29 @@ L_10be94c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be98c: 0x10be98c: addiu v1, zero, -1
+// 0x010befd4: 0x10befd4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010be990: 0x10be990: addu  s1, zero, zero
+// 0x010befd8: 0x10befd8: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010be994: 0x10be994: bne   v0, v1, 0x10be9b0 addu  s0, zero, zero
+// 0x010befdc: 0x10befdc: bne   v0, v1, 0x10beff8 addu  s0, zero, zero
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc 8
-	bne.un L_10be9b0
+	bne.un L_10beff8
 // --- basic block ---
-// 0x010be99c: 0x10be99c: j	 0x10be9c0 sll   zero, zero, 0
-	br L_10be9c0
+// 0x010befe4: 0x10befe4: j	 0x10bf008 sll   zero, zero, 0
+	br L_10bf008
 // --- basic block ---
-L_10be9a4:
-// 0x010be9a4: 0x10be9a4: jal   0x10be010 addiu s0, s0, 1
+L_10befec:
+// 0x010befec: 0x10befec: jal   0x10be658 addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -255,130 +255,130 @@ L_10be9a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_repaint_lines_10be010(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_repaint_lines_10be658(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be9ac: 0x10be9ac: addu  s1, s1, v0
+// 0x010beff4: 0x10beff4: addu  s1, s1, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 12
-L_10be9b0:
-// 0x010be9b0: 0x10be9b0: slt   v0, s2, s0
+L_10beff8:
+// 0x010beff8: 0x10beff8: slt   v0, s2, s0
 	ldloc 10
 	ldloc 8
 	clt
 	stloc 5
-// 0x010be9b4: 0x10be9b4: addu  a1, s0, zero
+// 0x010beffc: 0x10beffc: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010be9b8: 0x10be9b8: beq   v0, zero, 0x10be9a4 addu  a0, s3, zero
+// 0x010bf000: 0x10bf000: beq   v0, zero, 0x10befec addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_10be9a4
+	brfalse L_10befec
 // --- basic block ---
-L_10be9c0:
-// 0x010be9c0: 0x10be9c0: jal   0x10b0964 sll   zero, zero, 0
-	call int32 Cibyl132::editor_ignore_new_roads_10b0964()
+L_10bf008:
+// 0x010bf008: 0x10bf008: jal   0x10b0fac sll   zero, zero, 0
+	call int32 Cibyl132::editor_ignore_new_roads_10b0fac()
 	stloc 5
 // --- basic block ---
-// 0x010be9c8: 0x10be9c8: bne   v0, zero, 0x10be9e0 sll   zero, zero, 0
+// 0x010bf010: 0x10bf010: bne   v0, zero, 0x10bf028 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10be9e0
+	brtrue L_10bf028
 // --- basic block ---
-L_10be9d0:
-// 0x010be9d0: 0x10be9d0: lui   s3, 0xe0000
+L_10bf018:
+// 0x010bf018: 0x10bf018: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x010be9d4: 0x10be9d4: addiu s3, s3, -14556
+// 0x010bf01c: 0x10bf01c: addiu s3, s3, -14092
 	ldloc 9
-	ldc.i4 -14556
+	ldc.i4 -14092
 	add
 	stloc 9
-// 0x010be9d8: 0x10be9d8: j	 0x10bea4c addu  s0, zero, zero
+// 0x010bf020: 0x10bf020: j	 0x10bf094 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10bea4c
+	br L_10bf094
 // --- basic block ---
-L_10be9e0:
-// 0x010be9e0: 0x10be9e0: jal   0x10bd8b8 sll   zero, zero, 0
+L_10bf028:
+// 0x010bf028: 0x10bf028: jal   0x10bdf00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_show_candidates_10bd8b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_show_candidates_10bdf00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010be9e8: 0x10be9e8: bne   v0, zero, 0x10be9d0 sll   zero, zero, 0
+// 0x010bf030: 0x10bf030: bne   v0, zero, 0x10bf018 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10be9d0
+	brtrue L_10bf018
 // --- basic block ---
-// 0x010be9f0: 0x10be9f0: lui   s0, 0xf0000
+// 0x010bf038: 0x10bf038: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 8
-L_10be9f4:
-// 0x010be9f4: 0x10be9f4: addiu s0, s0, -22944
+L_10bf03c:
+// 0x010bf03c: 0x10bf03c: addiu s0, s0, -22480
 	ldloc 8
-	ldc.i4 -22944
+	ldc.i4 -22480
 	add
 	stloc 8
-// 0x010be9f8: 0x10be9f8: addu  s2, zero, zero
+// 0x010bf040: 0x10bf040: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010be9fc: 0x10be9fc: lui   t0, 0xe0000
+// 0x010bf044: 0x10bf044: lui   t0, 0xe0000
 	ldc.i4 917504
 	stloc 19
-// 0x010bea00: 0x10bea00: addiu v1, zero, 20
+// 0x010bf048: 0x10bf048: addiu v1, zero, 20
 	ldc.i4.s 20
 	stloc 7
-// 0x010bea04: 0x10bea04: addu  s8, s0, zero
+// 0x010bf04c: 0x10bf04c: addu  s8, s0, zero
 	ldloc 8
 	stloc 18
-// 0x010bea08: 0x10bea08: addiu s3, sp, 52
+// 0x010bf050: 0x10bf050: addiu s3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 9
-// 0x010bea0c: 0x10bea0c: addiu s4, sp, 60
+// 0x010bf054: 0x10bf054: addiu s4, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 13
-// 0x010bea10: 0x10bea10: addiu s7, zero, 12
+// 0x010bf058: 0x10bf058: addiu s7, zero, 12
 	ldc.i4.s 12
 	stloc 17
-// 0x010bea14: 0x10bea14: addiu s6, zero, 1
+// 0x010bf05c: 0x10bf05c: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x010bea18: 0x10bea18: j	 0x10beb08 addiu s5, zero, -1
+// 0x010bf060: 0x10bf060: j	 0x10bf150 addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 14
-	br L_10beb08
+	br L_10bf150
 // --- basic block ---
-L_10bea20:
-// 0x010bea20: 0x10bea20: beq   v1, zero, 0x10bea44 sll   zero, zero, 0
+L_10bf068:
+// 0x010bf068: 0x10bf068: beq   v1, zero, 0x10bf08c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10bea44
+	brfalse L_10bf08c
 // --- basic block ---
-// 0x010bea28: 0x10bea28: lw    v0, 0(s3)
+// 0x010bf070: 0x10bf070: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bea2c: 0x10bea2c: sll   zero, zero, 0
-// 0x010bea30: 0x10bea30: beq   v0, zero, 0x10bea44 sll   zero, zero, 0
+// 0x010bf074: 0x10bf074: sll   zero, zero, 0
+// 0x010bf078: 0x10bf078: beq   v0, zero, 0x10bf08c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10bea44
+	brfalse L_10bf08c
 // --- basic block ---
-// 0x010bea38: 0x10bea38: lw    a0, 8(s3)
+// 0x010bf080: 0x10bf080: lw    a0, 8(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -387,86 +387,86 @@ L_10bea20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bea3c: 0x10bea3c: jal   0x10b0b90 sll   zero, zero, 0
+// 0x010bf084: 0x10bf084: jal   0x10b11d8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl132::editor_track_draw_current_10b0b90(int32,int32,int32,int32,int32)
+	call int32 Cibyl132::editor_track_draw_current_10b11d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bea44:
-// 0x010bea44: 0x10bea44: addiu s0, s0, 1
+L_10bf08c:
+// 0x010bf08c: 0x10bf08c: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010bea48: 0x10bea48: addiu s3, s3, 12
+// 0x010bf090: 0x10bf090: addiu s3, s3, 12
 	ldloc 9
 	ldc.i4.s 12
 	add
 	stloc 9
-L_10bea4c:
-// 0x010bea4c: 0x10bea4c: slt   v0, s2, s0
+L_10bf094:
+// 0x010bf094: 0x10bf094: slt   v0, s2, s0
 	ldloc 10
 	ldloc 8
 	clt
 	stloc 5
-// 0x010bea50: 0x10bea50: beq   v0, zero, 0x10bea20 slti  v1, s0, 2
+// 0x010bf098: 0x10bf098: beq   v0, zero, 0x10bf068 slti  v1, s0, 2
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	clt
 	stloc 7
-	brfalse L_10bea20
+	brfalse L_10bf068
 // --- basic block ---
-// 0x010bea58: 0x10bea58: j	 0x10be9f4 lui   s0, 0xf0000
+// 0x010bf0a0: 0x10bf0a0: j	 0x10bf03c lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 8
-	br L_10be9f4
+	br L_10bf03c
 // --- basic block ---
-L_10bea60:
-// 0x010bea60: 0x10bea60: lw    v0, 0(s0)
+L_10bf0a8:
+// 0x010bf0a8: 0x10bf0a8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bea64: 0x10bea64: sll   zero, zero, 0
-// 0x010bea68: 0x10bea68: bne   v0, zero, 0x10beb00 mult  s2, v1
+// 0x010bf0ac: 0x10bf0ac: sll   zero, zero, 0
+// 0x010bf0b0: 0x10bf0b0: bne   v0, zero, 0x10bf148 mult  s2, v1
 	ldloc 5
 	ldloc 10
 	ldloc 7
 	mul
 	stloc 15
-	brtrue L_10beb00
+	brtrue L_10bf148
 // --- basic block ---
-// 0x010bea70: 0x10bea70: addiu v0, sp, 48
+// 0x010bf0b8: 0x10bf0b8: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x010bea74: 0x10bea74: addiu t1, sp, 44
+// 0x010bf0bc: 0x10bf0bc: addiu t1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 11
-// 0x010bea78: 0x10bea78: addu  a1, s3, zero
+// 0x010bf0c0: 0x10bf0c0: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010bea7c: 0x10bea7c: addu  a2, s4, zero
+// 0x010bf0c4: 0x10bf0c4: addu  a2, s4, zero
 	ldloc 13
 	stloc.3
-// 0x010bea80: 0x10bea80: addiu a3, sp, 40
+// 0x010bf0c8: 0x10bf0c8: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x010bea84: 0x10bea84: sw    v1, 112(sp)
+// 0x010bf0cc: 0x10bf0cc: sw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -475,7 +475,7 @@ L_10bea60:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bea88: 0x10bea88: sw    t0, 108(sp)
+// 0x010bf0d0: 0x10bf0d0: sw    t0, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -484,7 +484,7 @@ L_10bea60:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010bea8c: 0x10bea8c: sw    v0, 16(sp)
+// 0x010bf0d4: 0x10bf0d4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -493,7 +493,7 @@ L_10bea60:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bea90: 0x10bea90: sw    t1, 20(sp)
+// 0x010bf0d8: 0x10bf0d8: sw    t1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -502,10 +502,10 @@ L_10bea60:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bea94: 0x10bea94: mflo  lo
+// 0x010bf0dc: 0x10bf0dc: mflo  lo
 	ldloc 15
 	stloc.1
-// 0x010bea98: 0x10bea98: jal   0x1014ee4 addu  a0, s8, a0
+// 0x010bf0e0: 0x10bf0e0: jal   0x1014ef4 addu  a0, s8, a0
 	ldloc 18
 	ldloc.1
 	add
@@ -515,12 +515,12 @@ L_10bea60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_line_points_1014ee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_line_points_1014ef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beaa0: 0x10beaa0: lw    v0, 8(s0)
+// 0x010bf0e8: 0x10bf0e8: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -529,7 +529,7 @@ L_10bea60:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010beaa4: 0x10beaa4: lw    t1, 40(sp)
+// 0x010bf0ec: 0x10bf0ec: lw    t1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -538,15 +538,15 @@ L_10bea60:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010beaa8: 0x10beaa8: mult  v0, s7
+// 0x010bf0f0: 0x10bf0f0: mult  v0, s7
 	ldloc 5
 	ldloc 17
 	mul
 	stloc 15
-// 0x010beaac: 0x10beaac: addu  a0, s3, zero
+// 0x010bf0f4: 0x10bf0f4: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x010beab0: 0x10beab0: sw    t1, 16(sp)
+// 0x010bf0f8: 0x10bf0f8: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -555,7 +555,7 @@ L_10bea60:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010beab4: 0x10beab4: lw    t1, 48(sp)
+// 0x010bf0fc: 0x10bf0fc: lw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -564,10 +564,10 @@ L_10bea60:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010beab8: 0x10beab8: addu  a1, s4, zero
+// 0x010bf100: 0x10bf100: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010beabc: 0x10beabc: sw    t1, 20(sp)
+// 0x010bf104: 0x10bf104: sw    t1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -576,7 +576,7 @@ L_10bea60:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010beac0: 0x10beac0: lw    t1, 44(sp)
+// 0x010bf108: 0x10bf108: lw    t1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -585,10 +585,10 @@ L_10bea60:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010beac4: 0x10beac4: addu  a2, zero, zero
+// 0x010bf10c: 0x10bf10c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010beac8: 0x10beac8: sw    t1, 24(sp)
+// 0x010bf110: 0x10bf110: sw    t1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -597,18 +597,18 @@ L_10bea60:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010beacc: 0x10beacc: lui   t1, 0xe0000
+// 0x010bf114: 0x10bf114: lui   t1, 0xe0000
 	ldc.i4 917504
 	stloc 11
-// 0x010bead0: 0x10bead0: addiu t1, t1, -15708
+// 0x010bf118: 0x10bf118: addiu t1, t1, -15244
 	ldloc 11
-	ldc.i4 -15708
+	ldc.i4 -15244
 	add
 	stloc 11
-// 0x010bead4: 0x10bead4: addu  a3, s3, zero
+// 0x010bf11c: 0x10bf11c: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x010bead8: 0x10bead8: sw    s6, 32(sp)
+// 0x010bf120: 0x10bf120: sw    s6, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -617,10 +617,10 @@ L_10bea60:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010beadc: 0x10beadc: mflo  lo
+// 0x010bf124: 0x10bf124: mflo  lo
 	ldloc 15
 	stloc 5
-// 0x010beae0: 0x10beae0: sw    s5, 36(sp)
+// 0x010bf128: 0x10bf128: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -629,22 +629,22 @@ L_10bea60:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010beae4: 0x10beae4: addiu v0, v0, 1
+// 0x010bf12c: 0x10bf12c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010beae8: 0x10beae8: sll   v0, v0, 3
+// 0x010bf130: 0x10bf130: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010beaec: 0x10beaec: addu  v0, t1, v0
+// 0x010bf134: 0x10bf134: addu  v0, t1, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x010beaf0: 0x10beaf0: jal   0x1022e0c sw    v0, 28(sp)
+// 0x010bf138: 0x10bf138: jal   0x1022e1c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -658,12 +658,12 @@ L_10bea60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beaf8: 0x10beaf8: lw    t0, 108(sp)
+// 0x010bf140: 0x10bf140: lw    t0, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -672,7 +672,7 @@ L_10bea60:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010beafc: 0x10beafc: lw    v1, 112(sp)
+// 0x010bf144: 0x10bf144: lw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -681,70 +681,70 @@ L_10bea60:
 	add
 	ldelem.i4
 	stloc 7
-L_10beb00:
-// 0x010beb00: 0x10beb00: addiu s2, s2, 1
+L_10bf148:
+// 0x010bf148: 0x10bf148: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x010beb04: 0x10beb04: addiu s0, s0, 20
+// 0x010bf14c: 0x10bf14c: addiu s0, s0, 20
 	ldloc 8
 	ldc.i4.s 20
 	add
 	stloc 8
-L_10beb08:
-// 0x010beb08: 0x10beb08: lw    v0, -14532(t0)
+L_10bf150:
+// 0x010bf150: 0x10bf150: lw    v0, -14068(t0)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3633
+	ldc.i4 -3517
 	add
 	ldelem.i4
 	stloc 5
-// 0x010beb0c: 0x10beb0c: sll   zero, zero, 0
-// 0x010beb10: 0x10beb10: slt   v0, s2, v0
+// 0x010bf154: 0x10bf154: sll   zero, zero, 0
+// 0x010bf158: 0x10bf158: slt   v0, s2, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x010beb14: 0x10beb14: bne   v0, zero, 0x10bea60 sll   zero, zero, 0
+// 0x010bf15c: 0x10bf15c: bne   v0, zero, 0x10bf0a8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bea60
+	brtrue L_10bf0a8
 // --- basic block ---
-// 0x010beb1c: 0x10beb1c: jal   0x10bd6dc sll   zero, zero, 0
+// 0x010bf164: 0x10bf164: jal   0x10bdd24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beb24: 0x10beb24: beq   v0, zero, 0x10beb38 lui   v0, 0x0
+// 0x010bf16c: 0x10bf16c: beq   v0, zero, 0x10bf180 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10beb38
+	brfalse L_10bf180
 // --- basic block ---
-// 0x010beb2c: 0x10beb2c: jal   0x10b2518 sll   zero, zero, 0
+// 0x010bf174: 0x10bf174: jal   0x10b2b60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_draw_new_direction_roads_10b2518(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_draw_new_direction_roads_10b2b60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beb34: 0x10beb34: lui   v0, 0x0
+// 0x010bf17c: 0x10bf17c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10beb38:
-// 0x010beb38: 0x10beb38: lw    a0, 1816(v0)
+L_10bf180:
+// 0x010bf180: 0x10bf180: lw    a0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -753,7 +753,7 @@ L_10beb38:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010beb3c: 0x10beb3c: jal   0x10b79b4 addu  s3, zero, zero
+// 0x010bf184: 0x10bf184: jal   0x10b7ffc addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -761,20 +761,20 @@ L_10beb38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl136::editor_db_activate_10b79b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl136::editor_db_activate_10b7ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beb44: 0x10beb44: addiu v1, zero, -1
+// 0x010bf18c: 0x10bf18c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010beb48: 0x10beb48: beq   v0, v1, 0x10bed20 sll   zero, zero, 0
+// 0x010bf190: 0x10bf190: beq   v0, v1, 0x10bf368 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_10bed20
+	beq  L_10bf368
 // --- basic block ---
-// 0x010beb50: 0x10beb50: jal   0x10b41f4 lui   s6, 0xe0000
+// 0x010bf198: 0x10bf198: jal   0x10b483c lui   s6, 0xe0000
 	ldc.i4 917504
 	stloc 16
 	ldloc.0
@@ -782,20 +782,20 @@ L_10beb38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_count_10b41f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_count_10b483c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beb58: 0x10beb58: addiu a0, sp, 84
+// 0x010bf1a0: 0x10bf1a0: addiu a0, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc.1
-// 0x010beb5c: 0x10beb5c: lui   s5, 0x20000
+// 0x010bf1a4: 0x10bf1a4: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x010beb60: 0x10beb60: sw    v0, 104(sp)
+// 0x010bf1a8: 0x10bf1a8: sw    v0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -804,9 +804,9 @@ L_10beb38:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010beb64: 0x10beb64: jal   0x1007f28 addiu s5, s5, 23260
+// 0x010bf1ac: 0x10bf1ac: jal   0x1007f38 addiu s5, s5, 23720
 	ldloc 14
-	ldc.i4 23260
+	ldc.i4 23720
 	add
 	stloc 14
 	ldloc.0
@@ -814,36 +814,36 @@ L_10beb38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_screen_edges_1007f28(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_screen_edges_1007f38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beb6c: 0x10beb6c: addu  s2, zero, zero
+// 0x010bf1b4: 0x10bf1b4: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010beb70: 0x10beb70: addiu s0, s6, 29604
+// 0x010bf1b8: 0x10bf1b8: addiu s0, s6, 30068
 	ldloc 16
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x010beb74: 0x10beb74: addiu s4, sp, 68
+// 0x010bf1bc: 0x10bf1bc: addiu s4, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 13
-// 0x010beb78: 0x10beb78: lui   s8, 0xe0000
+// 0x010bf1c0: 0x10bf1c0: lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 18
-// 0x010beb7c: 0x10beb7c: j	 0x10bed0c addiu s7, sp, 76
+// 0x010bf1c4: 0x10bf1c4: j	 0x10bf354 addiu s7, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 17
-	br L_10bed0c
+	br L_10bf354
 // --- basic block ---
-L_10beb84:
-// 0x010beb84: 0x10beb84: jal   0x10b4190 addu  a0, s2, zero
+L_10bf1cc:
+// 0x010bf1cc: 0x10bf1cc: jal   0x10b47d8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -851,23 +851,23 @@ L_10beb84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_is_obsolete_10b4190(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_is_obsolete_10b47d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beb8c: 0x10beb8c: bne   v0, zero, 0x10bed08 addu  a0, s2, zero
+// 0x010bf1d4: 0x10bf1d4: bne   v0, zero, 0x10bf350 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_10bed08
+	brtrue L_10bf350
 // --- basic block ---
-// 0x010beb94: 0x10beb94: addiu a1, sp, 60
+// 0x010bf1dc: 0x10bf1dc: addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.2
-// 0x010beb98: 0x10beb98: jal   0x10b3f00 addiu a2, sp, 48
+// 0x010bf1e0: 0x10bf1e0: jal   0x10b4548 addiu a2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -877,12 +877,12 @@ L_10beb84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_position_10b3f00(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_position_10b4548(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beba0: 0x10beba0: lw    a0, 60(sp)
+// 0x010bf1e8: 0x10bf1e8: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -891,7 +891,7 @@ L_10beb84:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010beba4: 0x10beba4: lw    v0, 56(s0)
+// 0x010bf1ec: 0x10bf1ec: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -900,17 +900,17 @@ L_10beb84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010beba8: 0x10beba8: sll   zero, zero, 0
-// 0x010bebac: 0x10bebac: slt   v0, v0, a0
+// 0x010bf1f0: 0x10bf1f0: sll   zero, zero, 0
+// 0x010bf1f4: 0x10bf1f4: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010bebb0: 0x10bebb0: bne   v0, zero, 0x10bed08 sll   zero, zero, 0
+// 0x010bf1f8: 0x10bf1f8: bne   v0, zero, 0x10bf350 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bed08
+	brtrue L_10bf350
 // --- basic block ---
-// 0x010bebb8: 0x10bebb8: lw    v0, 64(s0)
+// 0x010bf200: 0x10bf200: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -919,17 +919,17 @@ L_10beb84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bebbc: 0x10bebbc: sll   zero, zero, 0
-// 0x010bebc0: 0x10bebc0: slt   v0, a0, v0
+// 0x010bf204: 0x10bf204: sll   zero, zero, 0
+// 0x010bf208: 0x10bf208: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010bebc4: 0x10bebc4: bne   v0, zero, 0x10bed08 sll   zero, zero, 0
+// 0x010bf20c: 0x10bf20c: bne   v0, zero, 0x10bf350 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bed08
+	brtrue L_10bf350
 // --- basic block ---
-// 0x010bebcc: 0x10bebcc: lw    v1, 64(sp)
+// 0x010bf214: 0x10bf214: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -938,7 +938,7 @@ L_10beb84:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bebd0: 0x10bebd0: lw    v0, 60(s0)
+// 0x010bf218: 0x10bf218: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -947,17 +947,17 @@ L_10beb84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bebd4: 0x10bebd4: sll   zero, zero, 0
-// 0x010bebd8: 0x10bebd8: slt   v0, v0, v1
+// 0x010bf21c: 0x10bf21c: sll   zero, zero, 0
+// 0x010bf220: 0x10bf220: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010bebdc: 0x10bebdc: bne   v0, zero, 0x10bed08 sll   zero, zero, 0
+// 0x010bf224: 0x10bf224: bne   v0, zero, 0x10bf350 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bed08
+	brtrue L_10bf350
 // --- basic block ---
-// 0x010bebe4: 0x10bebe4: lw    v0, 68(s0)
+// 0x010bf22c: 0x10bf22c: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -966,34 +966,34 @@ L_10beb84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bebe8: 0x10bebe8: sll   zero, zero, 0
-// 0x010bebec: 0x10bebec: slt   v0, v1, v0
+// 0x010bf230: 0x10bf230: sll   zero, zero, 0
+// 0x010bf234: 0x10bf234: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010bebf0: 0x10bebf0: bne   v0, zero, 0x10bed08 sll   zero, zero, 0
+// 0x010bf238: 0x10bf238: bne   v0, zero, 0x10bf350 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bed08
+	brtrue L_10bf350
 // --- basic block ---
-// 0x010bebf8: 0x10bebf8: j	 0x10bed4c addiu s3, s3, 1
+// 0x010bf240: 0x10bf240: j	 0x10bf394 addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_10bed4c
+	br L_10bf394
 // --- basic block ---
-L_10bec00:
-// 0x010bec00: 0x10bec00: lw    a0, 29604(s6)
+L_10bf248:
+// 0x010bf248: 0x10bf248: lw    a0, 30068(s6)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bec04: 0x10bec04: lw    a1, 16(v0)
+// 0x010bf24c: 0x10bf24c: lw    a1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1002,17 +1002,17 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bec08: 0x10bec08: sll   zero, zero, 0
-// 0x010bec0c: 0x10bec0c: slt   a1, a0, a1
+// 0x010bf250: 0x10bf250: sll   zero, zero, 0
+// 0x010bf254: 0x10bf254: slt   a1, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.2
-// 0x010bec10: 0x10bec10: beq   a1, zero, 0x10bed08 sll   zero, zero, 0
+// 0x010bf258: 0x10bf258: beq   a1, zero, 0x10bf350 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10bed08
+	brfalse L_10bf350
 // --- basic block ---
-// 0x010bec18: 0x10bec18: lw    a1, 120(v0)
+// 0x010bf260: 0x10bf260: lw    a1, 120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1021,12 +1021,12 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bec1c: 0x10bec1c: sll   zero, zero, 0
-// 0x010bec20: 0x10bec20: beq   a1, zero, 0x10bed08 sll   zero, zero, 0
+// 0x010bf264: 0x10bf264: sll   zero, zero, 0
+// 0x010bf268: 0x10bf268: beq   a1, zero, 0x10bf350 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10bed08
+	brfalse L_10bf350
 // --- basic block ---
-// 0x010bec28: 0x10bec28: lw    v0, 48(v0)
+// 0x010bf270: 0x10bf270: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1035,16 +1035,16 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bec2c: 0x10bec2c: sll   zero, zero, 0
-// 0x010bec30: 0x10bec30: beq   v0, zero, 0x10bed08 addiu v1, v1, 1344
+// 0x010bf274: 0x10bf274: sll   zero, zero, 0
+// 0x010bf278: 0x10bf278: beq   v0, zero, 0x10bf350 addiu v1, v1, 1344
 	ldloc 5
 	ldloc 7
 	ldc.i4 1344
 	add
 	stloc 7
-	brfalse L_10bed08
+	brfalse L_10bf350
 // --- basic block ---
-// 0x010bec38: 0x10bec38: lw    v0, 8(v1)
+// 0x010bf280: 0x10bf280: lw    v0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1053,12 +1053,12 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bec3c: 0x10bec3c: sll   zero, zero, 0
-// 0x010bec40: 0x10bec40: beq   v0, zero, 0x10becf8 sll   zero, zero, 0
+// 0x010bf284: 0x10bf284: sll   zero, zero, 0
+// 0x010bf288: 0x10bf288: beq   v0, zero, 0x10bf340 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10becf8
+	brfalse L_10bf340
 // --- basic block ---
-// 0x010bec48: 0x10bec48: lw    v0, 16(v1)
+// 0x010bf290: 0x10bf290: lw    v0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1067,17 +1067,17 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bec4c: 0x10bec4c: sll   zero, zero, 0
-// 0x010bec50: 0x10bec50: slt   a0, a0, v0
+// 0x010bf294: 0x10bf294: sll   zero, zero, 0
+// 0x010bf298: 0x10bf298: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x010bec54: 0x10bec54: beq   a0, zero, 0x10becf8 sll   zero, zero, 0
+// 0x010bf29c: 0x10bf29c: beq   a0, zero, 0x10bf340 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10becf8
+	brfalse L_10bf340
 // --- basic block ---
-// 0x010bec5c: 0x10bec5c: lw    v0, 120(v1)
+// 0x010bf2a4: 0x10bf2a4: lw    v0, 120(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1086,12 +1086,12 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bec60: 0x10bec60: sll   zero, zero, 0
-// 0x010bec64: 0x10bec64: beq   v0, zero, 0x10becf8 sll   zero, zero, 0
+// 0x010bf2a8: 0x10bf2a8: sll   zero, zero, 0
+// 0x010bf2ac: 0x10bf2ac: beq   v0, zero, 0x10bf340 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10becf8
+	brfalse L_10bf340
 // --- basic block ---
-// 0x010bec6c: 0x10bec6c: lw    v0, 48(v1)
+// 0x010bf2b4: 0x10bf2b4: lw    v0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1100,12 +1100,12 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bec70: 0x10bec70: sll   zero, zero, 0
-// 0x010bec74: 0x10bec74: beq   v0, zero, 0x10becf8 sll   zero, zero, 0
+// 0x010bf2b8: 0x10bf2b8: sll   zero, zero, 0
+// 0x010bf2bc: 0x10bf2bc: beq   v0, zero, 0x10bf340 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10becf8
+	brfalse L_10bf340
 // --- basic block ---
-// 0x010bec7c: 0x10bec7c: jal   0x10b405c addu  a0, s2, zero
+// 0x010bf2c4: 0x10bf2c4: jal   0x10b46a4 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1113,26 +1113,26 @@ L_10bec00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::edit_marker_icon_10b405c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::edit_marker_icon_10b46a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bec84: 0x10bec84: lb    v1, 0(v0)
+// 0x010bf2cc: 0x10bf2cc: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010bec88: 0x10bec88: sll   zero, zero, 0
-// 0x010bec8c: 0x10bec8c: beq   v1, zero, 0x10becf8 addu  a2, v0, zero
+// 0x010bf2d0: 0x10bf2d0: sll   zero, zero, 0
+// 0x010bf2d4: 0x10bf2d4: beq   v1, zero, 0x10bf340 addu  a2, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.3
-	brfalse L_10becf8
+	brfalse L_10bf340
 // --- basic block ---
-// 0x010bec94: 0x10bec94: addu  a0, zero, zero
+// 0x010bf2dc: 0x10bf2dc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010bec98: 0x10bec98: jal   0x10a1918 addiu a1, zero, 1
+// 0x010bf2e0: 0x10bf2e0: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1140,18 +1140,18 @@ L_10bec00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010beca0: 0x10beca0: beq   v0, zero, 0x10becf8 addu  v1, v0, zero
+// 0x010bf2e8: 0x10bf2e8: beq   v0, zero, 0x10bf340 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_10becf8
+	brfalse L_10bf340
 // --- basic block ---
-// 0x010beca8: 0x10beca8: lw    v0, 68(sp)
+// 0x010bf2f0: 0x10bf2f0: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1160,7 +1160,7 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010becac: 0x10becac: lw    a1, 72(sp)
+// 0x010bf2f4: 0x10bf2f4: lw    a1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1169,15 +1169,15 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010becb0: 0x10becb0: addu  a0, v1, zero
+// 0x010bf2f8: 0x10bf2f8: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x010becb4: 0x10becb4: addiu v0, v0, -8
+// 0x010bf2fc: 0x10bf2fc: addiu v0, v0, -8
 	ldloc 5
 	ldc.i4.s -8
 	add
 	stloc 5
-// 0x010becb8: 0x10becb8: sw    v1, 112(sp)
+// 0x010bf300: 0x10bf300: sw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1186,7 +1186,7 @@ L_10bec00:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010becbc: 0x10becbc: sw    a1, 108(sp)
+// 0x010bf304: 0x10bf304: sw    a1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1195,7 +1195,7 @@ L_10bec00:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010becc0: 0x10becc0: jal   0x104e020 sw    v0, 76(sp)
+// 0x010bf308: 0x10bf308: jal   0x104e030 sw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1205,12 +1205,12 @@ L_10bec00:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010becc8: 0x10becc8: lw    a1, 108(sp)
+// 0x010bf310: 0x10bf310: lw    a1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1219,7 +1219,7 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010beccc: 0x10beccc: lw    v1, 112(sp)
+// 0x010bf314: 0x10bf314: lw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1228,29 +1228,29 @@ L_10bec00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010becd0: 0x10becd0: addiu a1, a1, 5
+// 0x010bf318: 0x10bf318: addiu a1, a1, 5
 	ldloc.2
 	ldc.i4.5
 	add
 	stloc.2
-// 0x010becd4: 0x10becd4: subu  v0, a1, v0
+// 0x010bf31c: 0x10bf31c: subu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc 5
-// 0x010becd8: 0x10becd8: addu  a0, v1, zero
+// 0x010bf320: 0x10bf320: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x010becdc: 0x10becdc: addu  a1, s7, zero
+// 0x010bf324: 0x10bf324: addu  a1, s7, zero
 	ldloc 17
 	stloc.2
-// 0x010bece0: 0x10bece0: addu  a2, zero, zero
+// 0x010bf328: 0x10bf328: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bece4: 0x10bece4: addu  a3, zero, zero
+// 0x010bf32c: 0x10bf32c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bece8: 0x10bece8: jal   0x104f4a8 sw    v0, 80(sp)
+// 0x010bf330: 0x10bf330: jal   0x104f4b8 sw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1264,20 +1264,20 @@ L_10bec00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010becf0: 0x10becf0: j	 0x10bed0c addiu s2, s2, 1
+// 0x010bf338: 0x10bf338: j	 0x10bf354 addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	br L_10bed0c
+	br L_10bf354
 // --- basic block ---
-L_10becf8:
-// 0x010becf8: 0x10becf8: lw    a2, 48(sp)
+L_10bf340:
+// 0x010bf340: 0x10bf340: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1286,10 +1286,10 @@ L_10becf8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010becfc: 0x10becfc: addu  a0, s5, zero
+// 0x010bf344: 0x10bf344: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x010bed00: 0x10bed00: jal   0x101bb50 addu  a1, s4, zero
+// 0x010bf348: 0x10bf348: jal   0x101bb60 addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -1297,19 +1297,19 @@ L_10becf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10bed08:
-// 0x010bed08: 0x10bed08: addiu s2, s2, 1
+L_10bf350:
+// 0x010bf350: 0x10bf350: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10bed0c:
-// 0x010bed0c: 0x10bed0c: lw    v1, 104(sp)
+L_10bf354:
+// 0x010bf354: 0x10bf354: lw    v1, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1318,39 +1318,39 @@ L_10bed0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bed10: 0x10bed10: sll   zero, zero, 0
-// 0x010bed14: 0x10bed14: slt   v0, s2, v1
+// 0x010bf358: 0x10bf358: sll   zero, zero, 0
+// 0x010bf35c: 0x10bf35c: slt   v0, s2, v1
 	ldloc 10
 	ldloc 7
 	clt
 	stloc 5
-// 0x010bed18: 0x10bed18: bne   v0, zero, 0x10beb84 sll   zero, zero, 0
+// 0x010bf360: 0x10bf360: bne   v0, zero, 0x10bf1cc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10beb84
+	brtrue L_10bf1cc
 // --- basic block ---
-L_10bed20:
-// 0x010bed20: 0x10bed20: addu  s1, s3, s1
+L_10bf368:
+// 0x010bf368: 0x10bf368: addu  s1, s3, s1
 	ldloc 9
 	ldloc 12
 	add
 	stloc 12
-// 0x010bed24: 0x10bed24: beq   s1, zero, 0x10bedac sll   zero, zero, 0
+// 0x010bf36c: 0x10bf36c: beq   s1, zero, 0x10bf3f4 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_10bedac
+	brfalse L_10bf3f4
 // --- basic block ---
-// 0x010bed2c: 0x10bed2c: jal   0x100a71c sll   zero, zero, 0
-	call int32 Cibyl7::roadmap_square_force_next_update_100a71c()
+// 0x010bf374: 0x10bf374: jal   0x100a72c sll   zero, zero, 0
+	call int32 Cibyl7::roadmap_square_force_next_update_100a72c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bed34: 0x10bed34: addu  a0, zero, zero
+// 0x010bf37c: 0x10bf37c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010bed38: 0x10bed38: addu  a1, zero, zero
+// 0x010bf380: 0x10bf380: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bed3c: 0x10bed3c: jal   0x100bdb4 addu  a2, zero, zero
+// 0x010bf384: 0x10bf384: jal   0x100bdc4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1358,16 +1358,16 @@ L_10bed20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_view_100bdb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_view_100bdc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bed44: 0x10bed44: j	 0x10bedac sll   zero, zero, 0
-	br L_10bedac
+// 0x010bf38c: 0x10bf38c: j	 0x10bf3f4 sll   zero, zero, 0
+	br L_10bf3f4
 // --- basic block ---
-L_10bed4c:
-// 0x010bed4c: 0x10bed4c: lw    a1, 80(s0)
+L_10bf394:
+// 0x010bf394: 0x10bf394: lw    a1, 80(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1376,7 +1376,7 @@ L_10bed4c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bed50: 0x10bed50: lw    a2, 32(s0)
+// 0x010bf398: 0x10bf398: lw    a2, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1385,17 +1385,17 @@ L_10bed4c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bed54: 0x10bed54: subu  a0, a0, a1
+// 0x010bf39c: 0x10bf39c: subu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.1
-// 0x010bed58: 0x10bed58: div   a0, a2
+// 0x010bf3a0: 0x10bf3a0: div   a0, a2
 	ldloc.1
 	ldloc.3
 	div
 	stloc 15
-// 0x010bed5c: 0x10bed5c: lw    a3, 76(s0)
+// 0x010bf3a4: 0x10bf3a4: lw    a3, 76(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1404,7 +1404,7 @@ L_10bed4c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bed60: 0x10bed60: lw    v0, 36(s0)
+// 0x010bf3a8: 0x10bf3a8: lw    v0, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1413,18 +1413,18 @@ L_10bed4c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bed64: 0x10bed64: subu  v1, a3, v1
+// 0x010bf3ac: 0x10bf3ac: subu  v1, a3, v1
 	ldloc 4
 	ldloc 7
 	sub
 	stloc 7
-// 0x010bed68: 0x10bed68: addu  a0, s4, zero
+// 0x010bf3b0: 0x10bf3b0: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010bed6c: 0x10bed6c: mflo  lo
+// 0x010bf3b4: 0x10bf3b4: mflo  lo
 	ldloc 15
 	stloc.2
-// 0x010bed70: 0x10bed70: sw    a1, 68(sp)
+// 0x010bf3b8: 0x10bf3b8: sw    a1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1433,16 +1433,16 @@ L_10bed4c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010bed74: 0x10bed74: sll   zero, zero, 0
-// 0x010bed78: 0x10bed78: div   v1, v0
+// 0x010bf3bc: 0x10bf3bc: sll   zero, zero, 0
+// 0x010bf3c0: 0x10bf3c0: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 15
-// 0x010bed7c: 0x10bed7c: mflo  lo
+// 0x010bf3c4: 0x10bf3c4: mflo  lo
 	ldloc 15
 	stloc 7
-// 0x010bed80: 0x10bed80: jal   0x10073c4 sw    v1, 72(sp)
+// 0x010bf3c8: 0x10bf3c8: jal   0x10073d4 sw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1456,27 +1456,27 @@ L_10bed4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bed88: 0x10bed88: lw    v1, 29728(s8)
+// 0x010bf3d0: 0x10bf3d0: lw    v1, 30192(s8)
 	ldloc 6
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bed8c: 0x10bed8c: sll   zero, zero, 0
-// 0x010bed90: 0x10bed90: addiu v0, v1, 960
+// 0x010bf3d4: 0x10bf3d4: sll   zero, zero, 0
+// 0x010bf3d8: 0x10bf3d8: addiu v0, v1, 960
 	ldloc 7
 	ldc.i4 960
 	add
 	stloc 5
-// 0x010bed94: 0x10bed94: lw    a0, 8(v0)
+// 0x010bf3dc: 0x10bf3dc: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1485,17 +1485,17 @@ L_10bed4c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bed98: 0x10bed98: sll   zero, zero, 0
-// 0x010bed9c: 0x10bed9c: beq   a0, zero, 0x10bed08 sll   zero, zero, 0
+// 0x010bf3e0: 0x10bf3e0: sll   zero, zero, 0
+// 0x010bf3e4: 0x10bf3e4: beq   a0, zero, 0x10bf350 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10bed08
+	brfalse L_10bf350
 // --- basic block ---
-// 0x010beda4: 0x10beda4: j	 0x10bec00 sll   zero, zero, 0
-	br L_10bec00
+// 0x010bf3ec: 0x10bf3ec: j	 0x10bf248 sll   zero, zero, 0
+	br L_10bf248
 // --- basic block ---
-L_10bedac:
-// 0x010bedac: 0x10bedac: lw    ra, 156(sp)
-// 0x010bedb0: 0x10bedb0: lw    s8, 152(sp)
+L_10bf3f4:
+// 0x010bf3f4: 0x10bf3f4: lw    ra, 156(sp)
+// 0x010bf3f8: 0x10bf3f8: lw    s8, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1504,7 +1504,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010bedb4: 0x10bedb4: lw    s7, 148(sp)
+// 0x010bf3fc: 0x10bf3fc: lw    s7, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1513,7 +1513,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bedb8: 0x10bedb8: lw    s6, 144(sp)
+// 0x010bf400: 0x10bf400: lw    s6, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1522,7 +1522,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bedbc: 0x10bedbc: lw    s5, 140(sp)
+// 0x010bf404: 0x10bf404: lw    s5, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1531,7 +1531,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bedc0: 0x10bedc0: lw    s4, 136(sp)
+// 0x010bf408: 0x10bf408: lw    s4, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1540,7 +1540,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bedc4: 0x10bedc4: lw    s3, 132(sp)
+// 0x010bf40c: 0x10bf40c: lw    s3, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1549,7 +1549,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bedc8: 0x10bedc8: lw    s2, 128(sp)
+// 0x010bf410: 0x10bf410: lw    s2, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1558,7 +1558,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bedcc: 0x10bedcc: lw    s1, 124(sp)
+// 0x010bf414: 0x10bf414: lw    s1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1567,7 +1567,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bedd0: 0x10bedd0: lw    s0, 120(sp)
+// 0x010bf418: 0x10bf418: lw    s0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1576,7 +1576,7 @@ L_10bedac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bedd4: 0x10bedd4: jr    ra addiu sp, sp, 160
+// 0x010bf41c: 0x10bf41c: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
@@ -1588,7 +1588,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 editor_screen_adjust_layer_10beddc(int32,int32,int32,int32,int32)
+.method public static int32 editor_screen_adjust_layer_10bf424(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s2,int32 s0,int32 s5,int32 s3,int32 v1,int32 s4,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -1653,18 +1653,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10beddc:
-// 0x010beddc: 0x10beddc: addiu sp, sp, -64
+L_10bf424:
+// 0x010bf424: 0x10bf424: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010bede0: 0x10bede0: slti  v0, a0, 12
+// 0x010bf428: 0x10bf428: slti  v0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	clt
 	stloc 6
-// 0x010bede4: 0x10bede4: sw    s4, 40(sp)
+// 0x010bf42c: 0x10bf42c: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1673,7 +1673,7 @@ L_10beddc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bede8: 0x10bede8: sw    s1, 28(sp)
+// 0x010bf430: 0x10bf430: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1682,7 +1682,7 @@ L_10beddc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bedec: 0x10bedec: sw    s0, 24(sp)
+// 0x010bf434: 0x10bf434: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1691,8 +1691,8 @@ L_10beddc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bedf0: 0x10bedf0: sw    ra, 60(sp)
-// 0x010bedf4: 0x10bedf4: sw    s8, 56(sp)
+// 0x010bf438: 0x10bf438: sw    ra, 60(sp)
+// 0x010bf43c: 0x10bf43c: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1701,7 +1701,7 @@ L_10beddc:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bedf8: 0x10bedf8: sw    s7, 52(sp)
+// 0x010bf440: 0x10bf440: sw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1710,7 +1710,7 @@ L_10beddc:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010bedfc: 0x10bedfc: sw    s6, 48(sp)
+// 0x010bf444: 0x10bf444: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1719,7 +1719,7 @@ L_10beddc:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bee00: 0x10bee00: sw    s5, 44(sp)
+// 0x010bf448: 0x10bf448: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1728,7 +1728,7 @@ L_10beddc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bee04: 0x10bee04: sw    s3, 36(sp)
+// 0x010bf44c: 0x10bf44c: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1737,7 +1737,7 @@ L_10beddc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bee08: 0x10bee08: sw    s2, 32(sp)
+// 0x010bf450: 0x10bf450: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1746,72 +1746,72 @@ L_10beddc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bee0c: 0x10bee0c: addu  s0, a0, zero
+// 0x010bf454: 0x10bf454: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010bee10: 0x10bee10: addu  s1, a1, zero
+// 0x010bf458: 0x10bf458: addu  s1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010bee14: 0x10bee14: beq   v0, zero, 0x10bef38 addu  s4, a2, zero
+// 0x010bf45c: 0x10bf45c: beq   v0, zero, 0x10bf580 addu  s4, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 13
-	brfalse L_10bef38
+	brfalse L_10bf580
 // --- basic block ---
-// 0x010bee1c: 0x10bee1c: jal   0x10ac694 sll   zero, zero, 0
-	call int32 Cibyl129::editor_is_enabled_10ac694()
+// 0x010bf464: 0x10bf464: jal   0x10accdc sll   zero, zero, 0
+	call int32 Cibyl129::editor_is_enabled_10accdc()
 	stloc 6
 // --- basic block ---
-// 0x010bee24: 0x10bee24: beq   v0, zero, 0x10bef38 sll   zero, zero, 0
+// 0x010bf46c: 0x10bf46c: beq   v0, zero, 0x10bf580 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10bef38
+	brfalse L_10bf580
 // --- basic block ---
-// 0x010bee2c: 0x10bee2c: bgtz  s1, 0x10bee38 slti  v0, s4, 2
+// 0x010bf474: 0x10bf474: bgtz  s1, 0x10bf480 slti  v0, s4, 2
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	clt
 	stloc 6
 	ldc.i4.s 0
-	bgt L_10bee38
+	bgt L_10bf480
 // --- basic block ---
-// 0x010bee34: 0x10bee34: addiu s1, zero, 1
+// 0x010bf47c: 0x10bf47c: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 7
-L_10bee38:
-// 0x010bee38: 0x10bee38: bne   v0, zero, 0x10bee4c slti  v0, s1, 3
+L_10bf480:
+// 0x010bf480: 0x10bf480: bne   v0, zero, 0x10bf494 slti  v0, s1, 3
 	ldloc 6
 	ldloc 7
 	ldc.i4.3
 	clt
 	stloc 6
-	brtrue L_10bee4c
+	brtrue L_10bf494
 // --- basic block ---
-// 0x010bee40: 0x10bee40: beq   v0, zero, 0x10bee4c sll   zero, zero, 0
+// 0x010bf488: 0x10bf488: beq   v0, zero, 0x10bf494 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10bee4c
+	brfalse L_10bf494
 // --- basic block ---
-// 0x010bee48: 0x10bee48: addiu s4, zero, 1
+// 0x010bf490: 0x10bf490: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 13
-L_10bee4c:
-// 0x010bee4c: 0x10bee4c: addiu s5, zero, 96
+L_10bf494:
+// 0x010bf494: 0x10bf494: addiu s5, zero, 96
 	ldc.i4.s 96
 	stloc 10
-// 0x010bee50: 0x10bee50: mult  s0, s5
+// 0x010bf498: 0x10bf498: mult  s0, s5
 	ldloc 9
 	ldloc 10
 	mul
 	stloc 18
-// 0x010bee54: 0x10bee54: addiu v0, s1, -2
+// 0x010bf49c: 0x10bf49c: addiu v0, s1, -2
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc 6
-// 0x010bee58: 0x10bee58: lui   s5, 0xe0000
+// 0x010bf4a0: 0x10bf4a0: lui   s5, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010bee5c: 0x10bee5c: sw    v0, 16(sp)
+// 0x010bf4a4: 0x10bf4a4: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1820,29 +1820,29 @@ L_10bee4c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bee60: 0x10bee60: addiu s5, s5, -15708
+// 0x010bf4a8: 0x10bf4a8: addiu s5, s5, -15244
 	ldloc 10
-	ldc.i4 -15708
+	ldc.i4 -15244
 	add
 	stloc 10
-// 0x010bee64: 0x10bee64: addu  s3, zero, zero
+// 0x010bf4ac: 0x10bf4ac: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010bee68: 0x10bee68: addiu s8, zero, 2
+// 0x010bf4b0: 0x10bf4b0: addiu s8, zero, 2
 	ldc.i4.2
 	stloc 16
-// 0x010bee6c: 0x10bee6c: mflo  lo
+// 0x010bf4b4: 0x10bf4b4: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x010bee70: 0x10bee70: j	 0x10beed0 addu  s5, s5, v0
+// 0x010bf4b8: 0x10bf4b8: j	 0x10bf518 addu  s5, s5, v0
 	ldloc 10
 	ldloc 6
 	add
 	stloc 10
-	br L_10beed0
+	br L_10bf518
 // --- basic block ---
-L_10bee78:
-// 0x010bee78: 0x10bee78: beq   s7, zero, 0x10beeb4 sw    s7, 0(s2)
+L_10bf4c0:
+// 0x010bf4c0: 0x10bf4c0: beq   s7, zero, 0x10bf4fc sw    s7, 0(s2)
 	ldloc 15
 	ldloc 5
 	ldloc 8
@@ -1850,9 +1850,9 @@ L_10bee78:
 	shr.un
 	ldloc 15
 	stelem.i4
-	brfalse L_10beeb4
+	brfalse L_10bf4fc
 // --- basic block ---
-// 0x010bee80: 0x10bee80: lw    a0, 8(s2)
+// 0x010bf4c8: 0x10bf4c8: lw    a0, 8(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1861,26 +1861,26 @@ L_10bee78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bee84: 0x10bee84: jal   0x104e35c sll   zero, zero, 0
+// 0x010bf4cc: 0x10bf4cc: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010bee8c: 0x10bee8c: addiu v0, zero, 1
+// 0x010bf4d4: 0x10bf4d4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010bee90: 0x10bee90: bne   s3, v0, 0x10beea4 sll   zero, zero, 0
+// 0x010bf4d8: 0x10bf4d8: bne   s3, v0, 0x10bf4ec sll   zero, zero, 0
 	ldloc 11
 	ldloc 6
-	bne.un L_10beea4
+	bne.un L_10bf4ec
 // --- basic block ---
-// 0x010bee98: 0x10bee98: lw    v0, 16(sp)
+// 0x010bf4e0: 0x10bf4e0: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1889,7 +1889,7 @@ L_10bee78:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bee9c: 0x10bee9c: j	 0x10beea8 sw    v0, 4(s2)
+// 0x010bf4e4: 0x10bf4e4: j	 0x10bf4f0 sw    v0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1898,10 +1898,10 @@ L_10bee78:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10beea8
+	br L_10bf4f0
 // --- basic block ---
-L_10beea4:
-// 0x010beea4: 0x10beea4: sw    s1, 4(s2)
+L_10bf4ec:
+// 0x010bf4ec: 0x10bf4ec: sw    s1, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1910,8 +1910,8 @@ L_10beea4:
 	add
 	ldloc 7
 	stelem.i4
-L_10beea8:
-// 0x010beea8: 0x10beea8: lw    a0, 4(s2)
+L_10bf4f0:
+// 0x010bf4f0: 0x10bf4f0: lw    a0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1920,76 +1920,76 @@ L_10beea8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010beeac: 0x10beeac: jal   0x104dd5c sll   zero, zero, 0
+// 0x010bf4f4: 0x10bf4f4: jal   0x104dd6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_10beeb4:
-// 0x010beeb4: 0x10beeb4: addiu s6, s6, 1
+L_10bf4fc:
+// 0x010bf4fc: 0x10bf4fc: addiu s6, s6, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x010beeb8: 0x10beeb8: addiu v0, zero, 4
+// 0x010bf500: 0x10bf500: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x010beebc: 0x10beebc: bne   s6, v0, 0x10bee78 addiu s2, s2, 12
+// 0x010bf504: 0x10bf504: bne   s6, v0, 0x10bf4c0 addiu s2, s2, 12
 	ldloc 14
 	ldloc 6
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 8
-	bne.un L_10bee78
+	bne.un L_10bf4c0
 // --- basic block ---
-// 0x010beec4: 0x10beec4: addiu s3, s3, 1
+// 0x010bf50c: 0x10bf50c: addiu s3, s3, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010beec8: 0x10beec8: beq   s3, s8, 0x10beee0 addiu s5, s5, 48
+// 0x010bf510: 0x10bf510: beq   s3, s8, 0x10bf528 addiu s5, s5, 48
 	ldloc 11
 	ldloc 16
 	ldloc 10
 	ldc.i4.s 48
 	add
 	stloc 10
-	beq  L_10beee0
+	beq  L_10bf528
 // --- basic block ---
-L_10beed0:
-// 0x010beed0: 0x10beed0: addu  s2, s5, zero
+L_10bf518:
+// 0x010bf518: 0x10bf518: addu  s2, s5, zero
 	ldloc 10
 	stloc 8
-// 0x010beed4: 0x10beed4: addu  s6, zero, zero
+// 0x010bf51c: 0x10bf51c: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x010beed8: 0x10beed8: j	 0x10bee78 slt   s7, s3, s4
+// 0x010bf520: 0x10bf520: j	 0x10bf4c0 slt   s7, s3, s4
 	ldloc 11
 	ldloc 13
 	clt
 	stloc 15
-	br L_10bee78
+	br L_10bf4c0
 // --- basic block ---
-L_10beee0:
-// 0x010beee0: 0x10beee0: addiu v0, zero, 7
+L_10bf528:
+// 0x010bf528: 0x10bf528: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 6
-// 0x010beee4: 0x10beee4: bne   s0, v0, 0x10bef38 lui   s3, 0xe0000
+// 0x010bf52c: 0x10bf52c: bne   s0, v0, 0x10bf580 lui   s3, 0xe0000
 	ldloc 9
 	ldloc 6
 	ldc.i4 917504
 	stloc 11
-	bne.un L_10bef38
+	bne.un L_10bf580
 // --- basic block ---
-// 0x010beeec: 0x10beeec: addiu s0, s3, -14556
+// 0x010bf534: 0x10bf534: addiu s0, s3, -14092
 	ldloc 11
-	ldc.i4 -14556
+	ldc.i4 -14092
 	add
 	stloc 9
-// 0x010beef0: 0x10beef0: lw    a0, 8(s0)
+// 0x010bf538: 0x10bf538: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1998,7 +1998,7 @@ L_10beee0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010beef4: 0x10beef4: jal   0x104e35c addiu s2, zero, 1
+// 0x010bf53c: 0x10bf53c: jal   0x104e36c addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
 	ldloc.0
@@ -2006,15 +2006,15 @@ L_10beee0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010beefc: 0x10beefc: addu  a0, s1, zero
+// 0x010bf544: 0x10bf544: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x010bef00: 0x10bef00: sw    s1, 4(s0)
+// 0x010bf548: 0x10bf548: sw    s1, 4(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2023,27 +2023,27 @@ L_10beee0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bef04: 0x10bef04: jal   0x104dd5c sw    s2, -14556(s3)
+// 0x010bf54c: 0x10bf54c: jal   0x104dd6c sw    s2, -14092(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3639
+	ldc.i4 -3523
 	add
 	ldloc 8
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010bef0c: 0x10bef0c: bne   s4, s2, 0x10bef1c sll   zero, zero, 0
+// 0x010bf554: 0x10bf554: bne   s4, s2, 0x10bf564 sll   zero, zero, 0
 	ldloc 13
 	ldloc 8
-	bne.un L_10bef1c
+	bne.un L_10bf564
 // --- basic block ---
-// 0x010bef14: 0x10bef14: j	 0x10bef38 sw    zero, 12(s0)
+// 0x010bf55c: 0x10bf55c: j	 0x10bf580 sw    zero, 12(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2052,10 +2052,10 @@ L_10beee0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10bef38
+	br L_10bf580
 // --- basic block ---
-L_10bef1c:
-// 0x010bef1c: 0x10bef1c: lw    a0, 20(s0)
+L_10bf564:
+// 0x010bf564: 0x10bf564: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2064,7 +2064,7 @@ L_10bef1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bef20: 0x10bef20: jal   0x104e35c addiu s1, s1, -2
+// 0x010bf568: 0x10bf568: jal   0x104e36c addiu s1, s1, -2
 	ldloc 7
 	ldc.i4.s -2
 	add
@@ -2074,15 +2074,15 @@ L_10bef1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010bef28: 0x10bef28: addu  a0, s1, zero
+// 0x010bf570: 0x10bf570: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x010bef2c: 0x10bef2c: sw    s2, 12(s0)
+// 0x010bf574: 0x10bf574: sw    s2, 12(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2091,7 +2091,7 @@ L_10bef1c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bef30: 0x10bef30: jal   0x104dd5c sw    s1, 16(s0)
+// 0x010bf578: 0x10bf578: jal   0x104dd6c sw    s1, 16(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2101,14 +2101,14 @@ L_10bef1c:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_10bef38:
-// 0x010bef38: 0x10bef38: lw    ra, 60(sp)
-// 0x010bef3c: 0x10bef3c: lw    s8, 56(sp)
+L_10bf580:
+// 0x010bf580: 0x10bf580: lw    ra, 60(sp)
+// 0x010bf584: 0x10bf584: lw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2117,7 +2117,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bef40: 0x10bef40: lw    s7, 52(sp)
+// 0x010bf588: 0x10bf588: lw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2126,7 +2126,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bef44: 0x10bef44: lw    s6, 48(sp)
+// 0x010bf58c: 0x10bf58c: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2135,7 +2135,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bef48: 0x10bef48: lw    s5, 44(sp)
+// 0x010bf590: 0x10bf590: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2144,7 +2144,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bef4c: 0x10bef4c: lw    s4, 40(sp)
+// 0x010bf594: 0x10bf594: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2153,7 +2153,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bef50: 0x10bef50: lw    s3, 36(sp)
+// 0x010bf598: 0x10bf598: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2162,7 +2162,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bef54: 0x10bef54: lw    s2, 32(sp)
+// 0x010bf59c: 0x10bf59c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2171,7 +2171,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bef58: 0x10bef58: lw    s1, 28(sp)
+// 0x010bf5a0: 0x10bf5a0: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2180,7 +2180,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bef5c: 0x10bef5c: lw    s0, 24(sp)
+// 0x010bf5a4: 0x10bf5a4: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2189,7 +2189,7 @@ L_10bef38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bef60: 0x10bef60: jr    ra addiu sp, sp, 64
+// 0x010bf5a8: 0x10bf5a8: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2201,7 +2201,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 sunriseset_10bf1e0(int32,int32,int32,int32,int32)
+.method public static int32 sunriseset_10bf828(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 t0,int32 s0,int32 s2,int32 s4,int32 s5,int32 s7,int32 s6,int32 s3,int32 t1,int32 t2,int32 s8,int32 t3,int32 t4,int32 ra,int32 t5,int32 lo)
@@ -2284,12 +2284,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bf1e0: 0x10bf1e0: addiu sp, sp, -104
+// 0x010bf828: 0x10bf828: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x010bf1e4: 0x10bf1e4: sw    s6, 88(sp)
+// 0x010bf82c: 0x10bf82c: sw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2298,7 +2298,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010bf1e8: 0x10bf1e8: lw    s6, 128(sp)
+// 0x010bf830: 0x10bf830: lw    s6, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2307,7 +2307,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bf1ec: 0x10bf1ec: sw    s0, 64(sp)
+// 0x010bf834: 0x10bf834: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2316,10 +2316,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bf1f0: 0x10bf1f0: lui   s0, 0x20000
+// 0x010bf838: 0x10bf838: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010bf1f4: 0x10bf1f4: lw    a1, 124(sp)
+// 0x010bf83c: 0x10bf83c: lw    a1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2328,7 +2328,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf1f8: 0x10bf1f8: sw    s4, 80(sp)
+// 0x010bf840: 0x10bf840: sw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2337,7 +2337,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bf1fc: 0x10bf1fc: sw    a3, 116(sp)
+// 0x010bf844: 0x10bf844: sw    a3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2346,19 +2346,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010bf200: 0x10bf200: addu  s4, a0, zero
+// 0x010bf848: 0x10bf848: addu  s4, a0, zero
 	ldloc.1
 	stloc 12
-// 0x010bf204: 0x10bf204: lw    a3, 23932(s0)
+// 0x010bf84c: 0x10bf84c: lw    a3, 24396(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5983
+	ldc.i4 6099
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf208: 0x10bf208: lw    a0, 120(sp)
+// 0x010bf850: 0x10bf850: lw    a0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2367,7 +2367,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf20c: 0x10bf20c: sw    a2, 112(sp)
+// 0x010bf854: 0x10bf854: sw    a2, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2376,26 +2376,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010bf210: 0x10bf210: sltu  s6, zero, s6
+// 0x010bf858: 0x10bf858: sltu  s6, zero, s6
 	ldc.i4.s 0
 	ldloc 15
 	clt.un
 	stloc 15
-// 0x010bf214: 0x10bf214: lw    a2, 23928(s0)
+// 0x010bf85c: 0x10bf85c: lw    a2, 24392(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5982
+	ldc.i4 6098
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf218: 0x10bf218: subu  s6, zero, s6
+// 0x010bf860: 0x10bf860: subu  s6, zero, s6
 	ldloc 15
 	neg
 	stloc 15
-// 0x010bf21c: 0x10bf21c: sw    ra, 100(sp)
-// 0x010bf220: 0x10bf220: sw    s8, 96(sp)
+// 0x010bf864: 0x10bf864: sw    ra, 100(sp)
+// 0x010bf868: 0x10bf868: sw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2404,7 +2404,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010bf224: 0x10bf224: sw    s7, 92(sp)
+// 0x010bf86c: 0x10bf86c: sw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2413,7 +2413,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010bf228: 0x10bf228: sw    s5, 84(sp)
+// 0x010bf870: 0x10bf870: sw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2422,7 +2422,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bf22c: 0x10bf22c: sw    s3, 76(sp)
+// 0x010bf874: 0x10bf874: sw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2431,7 +2431,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010bf230: 0x10bf230: sw    s2, 72(sp)
+// 0x010bf878: 0x10bf878: sw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2440,7 +2440,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bf234: 0x10bf234: sw    s1, 68(sp)
+// 0x010bf87c: 0x10bf87c: sw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2449,7 +2449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bf238: 0x10bf238: jal   0x10c0798 ori   s6, s6, 1
+// 0x010bf880: 0x10bf880: jal   0x10c0dd8 ori   s6, s6, 1
 	ldloc 15
 	ldc.i4.1
 	or
@@ -2459,56 +2459,56 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf240: 0x10bf240: addiu a0, zero, -6
+// 0x010bf888: 0x10bf888: addiu a0, zero, -6
 	ldc.i4.s -6
 	stloc.1
-// 0x010bf244: 0x10bf244: mult  s6, a0
+// 0x010bf88c: 0x10bf88c: mult  s6, a0
 	ldloc 15
 	ldloc.1
 	mul
 	stloc 24
-// 0x010bf248: 0x10bf248: addu  s3, v0, zero
+// 0x010bf890: 0x10bf890: addu  s3, v0, zero
 	ldloc 5
 	stloc 16
-// 0x010bf24c: 0x10bf24c: addu  s2, v1, zero
+// 0x010bf894: 0x10bf894: addu  s2, v1, zero
 	ldloc 7
 	stloc 11
-// 0x010bf250: 0x10bf250: lui   s1, 0x20000
+// 0x010bf898: 0x10bf898: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010bf254: 0x10bf254: lui   s7, 0x20000
+// 0x010bf89c: 0x10bf89c: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x010bf258: 0x10bf258: mflo  lo
+// 0x010bf8a0: 0x10bf8a0: mflo  lo
 	ldloc 24
 	stloc.1
-// 0x010bf25c: 0x10bf25c: jal   0x10c09c0 addiu a0, a0, 12
+// 0x010bf8a4: 0x10bf8a4: jal   0x10c1000 addiu a0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	add
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf264: 0x10bf264: addu  a1, v1, zero
+// 0x010bf8ac: 0x10bf8ac: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf268: 0x10bf268: addu  a0, v0, zero
+// 0x010bf8b0: 0x10bf8b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bf26c: 0x10bf26c: addu  a2, s3, zero
+// 0x010bf8b4: 0x10bf8b4: addu  a2, s3, zero
 	ldloc 16
 	stloc.3
-// 0x010bf270: 0x10bf270: jal   0x10c0740 addu  a3, s2, zero
+// 0x010bf8b8: 0x10bf8b8: jal   0x10c0d80 addu  a3, s2, zero
 	ldloc 11
 	stloc 4
 	ldloc.0
@@ -2516,36 +2516,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf278: 0x10bf278: lui   a0, 0x20000
+// 0x010bf8c0: 0x10bf8c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf27c: 0x10bf27c: lw    a3, 23940(a0)
+// 0x010bf8c4: 0x10bf8c4: lw    a3, 24404(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5985
+	ldc.i4 6101
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf280: 0x10bf280: lw    a2, 23936(a0)
+// 0x010bf8c8: 0x10bf8c8: lw    a2, 24400(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5984
+	ldc.i4 6100
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf284: 0x10bf284: addu  a1, v1, zero
+// 0x010bf8cc: 0x10bf8cc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf288: 0x10bf288: jal   0x10c0798 addu  a0, v0, zero
+// 0x010bf8d0: 0x10bf8d0: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2553,18 +2553,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf290: 0x10bf290: addu  a2, v0, zero
+// 0x010bf8d8: 0x10bf8d8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bf294: 0x10bf294: addu  a0, s4, zero
+// 0x010bf8dc: 0x10bf8dc: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010bf298: 0x10bf298: sw    a2, 48(sp)
+// 0x010bf8e0: 0x10bf8e0: sw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2573,7 +2573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010bf29c: 0x10bf29c: jal   0x10c09c0 sw    v1, 52(sp)
+// 0x010bf8e4: 0x10bf8e4: jal   0x10c1000 sw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2584,12 +2584,12 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf2a4: 0x10bf2a4: lw    a2, 48(sp)
+// 0x010bf8ec: 0x10bf8ec: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2598,7 +2598,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf2a8: 0x10bf2a8: lw    a3, 52(sp)
+// 0x010bf8f0: 0x10bf8f0: lw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2607,16 +2607,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf2ac: 0x10bf2ac: addu  a0, a2, zero
+// 0x010bf8f4: 0x10bf8f4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010bf2b0: 0x10bf2b0: addu  a1, a3, zero
+// 0x010bf8f8: 0x10bf8f8: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010bf2b4: 0x10bf2b4: addu  a2, v0, zero
+// 0x010bf8fc: 0x10bf8fc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bf2b8: 0x10bf2b8: jal   0x10c06e8 addu  a3, v1, zero
+// 0x010bf900: 0x10bf900: jal   0x10c0d28 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -2624,15 +2624,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf2c0: 0x10bf2c0: addu  a0, v0, zero
+// 0x010bf908: 0x10bf908: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bf2c4: 0x10bf2c4: sw    v0, 24(sp)
+// 0x010bf90c: 0x10bf90c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2641,31 +2641,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bf2c8: 0x10bf2c8: lui   v0, 0x20000
+// 0x010bf910: 0x10bf910: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf2cc: 0x10bf2cc: lw    a3, 23948(v0)
+// 0x010bf914: 0x10bf914: lw    a3, 24412(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5987
+	ldc.i4 6103
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf2d0: 0x10bf2d0: lw    a2, 23944(v0)
+// 0x010bf918: 0x10bf918: lw    a2, 24408(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5986
+	ldc.i4 6102
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf2d4: 0x10bf2d4: addu  a1, v1, zero
+// 0x010bf91c: 0x10bf91c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf2d8: 0x10bf2d8: jal   0x10c0798 sw    v1, 28(sp)
+// 0x010bf920: 0x10bf920: jal   0x10c0dd8 sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2679,36 +2679,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf2e0: 0x10bf2e0: lui   a0, 0x20000
+// 0x010bf928: 0x10bf928: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf2e4: 0x10bf2e4: lw    a3, 23956(a0)
+// 0x010bf92c: 0x10bf92c: lw    a3, 24420(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5989
+	ldc.i4 6105
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf2e8: 0x10bf2e8: lw    a2, 23952(a0)
+// 0x010bf930: 0x10bf930: lw    a2, 24416(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5988
+	ldc.i4 6104
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf2ec: 0x10bf2ec: addu  a1, v1, zero
+// 0x010bf934: 0x10bf934: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf2f0: 0x10bf2f0: jal   0x10c0740 addu  a0, v0, zero
+// 0x010bf938: 0x10bf938: jal   0x10c0d80 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2716,39 +2716,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf2f8: 0x10bf2f8: addu  s5, v0, zero
+// 0x010bf940: 0x10bf940: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010bf2fc: 0x10bf2fc: lw    a3, 23964(s1)
+// 0x010bf944: 0x10bf944: lw    a3, 24428(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5991
+	ldc.i4 6107
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf300: 0x10bf300: lw    a2, 23960(s1)
+// 0x010bf948: 0x10bf948: lw    a2, 24424(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5990
+	ldc.i4 6106
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf304: 0x10bf304: addu  a0, s5, zero
+// 0x010bf94c: 0x10bf94c: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010bf308: 0x10bf308: addu  a1, v1, zero
+// 0x010bf950: 0x10bf950: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf30c: 0x10bf30c: jal   0x10c0798 addu  s4, v1, zero
+// 0x010bf954: 0x10bf954: jal   0x10c0dd8 addu  s4, v1, zero
 	ldloc 7
 	stloc 12
 	ldloc.0
@@ -2756,59 +2756,59 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf314: 0x10bf314: addu  a1, v1, zero
+// 0x010bf95c: 0x10bf95c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf318: 0x10bf318: jal   0x10c1e10 addu  a0, v0, zero
+// 0x010bf960: 0x10bf960: jal   0x10c2450 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sin_10c1e10(int32,int32,int32)
+	call int32 Cibyl144::sin_10c2450(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf320: 0x10bf320: addu  t1, v1, zero
+// 0x010bf968: 0x10bf968: addu  t1, v1, zero
 	ldloc 7
 	stloc 17
-// 0x010bf324: 0x10bf324: lui   v1, 0x20000
+// 0x010bf96c: 0x10bf96c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010bf328: 0x10bf328: lw    a3, 23972(v1)
+// 0x010bf970: 0x10bf970: lw    a3, 24436(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5993
+	ldc.i4 6109
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf32c: 0x10bf32c: lw    a2, 23968(v1)
+// 0x010bf974: 0x10bf974: lw    a2, 24432(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5992
+	ldc.i4 6108
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf330: 0x10bf330: addu  t0, v0, zero
+// 0x010bf978: 0x10bf978: addu  t0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010bf334: 0x10bf334: addu  a0, s5, zero
+// 0x010bf97c: 0x10bf97c: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010bf338: 0x10bf338: addu  a1, s4, zero
+// 0x010bf980: 0x10bf980: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010bf33c: 0x10bf33c: sw    t0, 52(sp)
+// 0x010bf984: 0x10bf984: sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2817,7 +2817,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bf340: 0x10bf340: jal   0x10c0798 sw    t1, 48(sp)
+// 0x010bf988: 0x10bf988: jal   0x10c0dd8 sw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2831,29 +2831,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf348: 0x10bf348: addu  a1, v1, zero
+// 0x010bf990: 0x10bf990: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf34c: 0x10bf34c: jal   0x10c1e10 addu  a0, v0, zero
+// 0x010bf994: 0x10bf994: jal   0x10c2450 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sin_10c1e10(int32,int32,int32)
+	call int32 Cibyl144::sin_10c2450(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf354: 0x10bf354: addu  t2, v0, zero
+// 0x010bf99c: 0x10bf99c: addu  t2, v0, zero
 	ldloc 5
 	stloc 18
-// 0x010bf358: 0x10bf358: lw    t1, 48(sp)
+// 0x010bf9a0: 0x10bf9a0: lw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2862,7 +2862,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bf35c: 0x10bf35c: lw    t0, 52(sp)
+// 0x010bf9a4: 0x10bf9a4: lw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2871,34 +2871,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bf360: 0x10bf360: lui   v0, 0x20000
+// 0x010bf9a8: 0x10bf9a8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf364: 0x10bf364: lw    a3, 23980(v0)
+// 0x010bf9ac: 0x10bf9ac: lw    a3, 24444(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5995
+	ldc.i4 6111
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf368: 0x10bf368: lw    a2, 23976(v0)
+// 0x010bf9b0: 0x10bf9b0: lw    a2, 24440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5994
+	ldc.i4 6110
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf36c: 0x10bf36c: addu  a1, t1, zero
+// 0x010bf9b4: 0x10bf9b4: addu  a1, t1, zero
 	ldloc 17
 	stloc.2
-// 0x010bf370: 0x10bf370: addu  a0, t0, zero
+// 0x010bf9b8: 0x10bf9b8: addu  a0, t0, zero
 	ldloc 9
 	stloc.1
-// 0x010bf374: 0x10bf374: sw    t2, 48(sp)
+// 0x010bf9bc: 0x10bf9bc: sw    t2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2907,7 +2907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010bf378: 0x10bf378: jal   0x10c0798 sw    v1, 52(sp)
+// 0x010bf9c0: 0x10bf9c0: jal   0x10c0dd8 sw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2921,15 +2921,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf380: 0x10bf380: addu  t0, v0, zero
+// 0x010bf9c8: 0x10bf9c8: addu  t0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010bf384: 0x10bf384: lw    t3, 52(sp)
+// 0x010bf9cc: 0x10bf9cc: lw    t3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2938,7 +2938,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010bf388: 0x10bf388: lw    t2, 48(sp)
+// 0x010bf9d0: 0x10bf9d0: lw    t2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2947,34 +2947,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010bf38c: 0x10bf38c: lui   v0, 0x20000
+// 0x010bf9d4: 0x10bf9d4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf390: 0x10bf390: lw    a3, 23988(v0)
+// 0x010bf9d8: 0x10bf9d8: lw    a3, 24452(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5997
+	ldc.i4 6113
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf394: 0x10bf394: lw    a2, 23984(v0)
+// 0x010bf9dc: 0x10bf9dc: lw    a2, 24448(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5996
+	ldc.i4 6112
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf398: 0x10bf398: addu  a1, t3, zero
+// 0x010bf9e0: 0x10bf9e0: addu  a1, t3, zero
 	ldloc 20
 	stloc.2
-// 0x010bf39c: 0x10bf39c: addu  a0, t2, zero
+// 0x010bf9e4: 0x10bf9e4: addu  a0, t2, zero
 	ldloc 18
 	stloc.1
-// 0x010bf3a0: 0x10bf3a0: sw    t0, 52(sp)
+// 0x010bf9e8: 0x10bf9e8: sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2983,7 +2983,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bf3a4: 0x10bf3a4: jal   0x10c0798 sw    v1, 48(sp)
+// 0x010bf9ec: 0x10bf9ec: jal   0x10c0dd8 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2997,12 +2997,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf3ac: 0x10bf3ac: lw    t1, 48(sp)
+// 0x010bf9f4: 0x10bf9f4: lw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3011,7 +3011,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bf3b0: 0x10bf3b0: lw    t0, 52(sp)
+// 0x010bf9f8: 0x10bf9f8: lw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3020,16 +3020,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bf3b4: 0x10bf3b4: addu  a1, t1, zero
+// 0x010bf9fc: 0x10bf9fc: addu  a1, t1, zero
 	ldloc 17
 	stloc.2
-// 0x010bf3b8: 0x10bf3b8: addu  a0, t0, zero
+// 0x010bfa00: 0x10bfa00: addu  a0, t0, zero
 	ldloc 9
 	stloc.1
-// 0x010bf3bc: 0x10bf3bc: addu  a3, v1, zero
+// 0x010bfa04: 0x10bfa04: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010bf3c0: 0x10bf3c0: jal   0x10c06e8 addu  a2, v0, zero
+// 0x010bfa08: 0x10bfa08: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3037,36 +3037,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf3c8: 0x10bf3c8: lui   a0, 0x20000
+// 0x010bfa10: 0x10bfa10: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf3cc: 0x10bf3cc: lw    a3, 23996(a0)
+// 0x010bfa14: 0x10bfa14: lw    a3, 24460(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5999
+	ldc.i4 6115
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf3d0: 0x10bf3d0: lw    a2, 23992(a0)
+// 0x010bfa18: 0x10bfa18: lw    a2, 24456(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5998
+	ldc.i4 6114
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf3d4: 0x10bf3d4: addu  a1, v1, zero
+// 0x010bfa1c: 0x10bfa1c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf3d8: 0x10bf3d8: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010bfa20: 0x10bfa20: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3074,21 +3074,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf3e0: 0x10bf3e0: addu  a1, v1, zero
+// 0x010bfa28: 0x10bfa28: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf3e4: 0x10bf3e4: addu  a2, s5, zero
+// 0x010bfa2c: 0x10bfa2c: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x010bf3e8: 0x10bf3e8: addu  a3, s4, zero
+// 0x010bfa30: 0x10bfa30: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x010bf3ec: 0x10bf3ec: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010bfa34: 0x10bfa34: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3096,39 +3096,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf3f4: 0x10bf3f4: addu  t0, v0, zero
+// 0x010bfa3c: 0x10bfa3c: addu  t0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010bf3f8: 0x10bf3f8: lw    a3, 23964(s1)
+// 0x010bfa40: 0x10bfa40: lw    a3, 24428(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5991
+	ldc.i4 6107
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf3fc: 0x10bf3fc: lw    a2, 23960(s1)
+// 0x010bfa44: 0x10bfa44: lw    a2, 24424(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5990
+	ldc.i4 6106
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf400: 0x10bf400: addu  a0, t0, zero
+// 0x010bfa48: 0x10bfa48: addu  a0, t0, zero
 	ldloc 9
 	stloc.1
-// 0x010bf404: 0x10bf404: addu  a1, v1, zero
+// 0x010bfa4c: 0x10bfa4c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf408: 0x10bf408: sw    t0, 52(sp)
+// 0x010bfa50: 0x10bfa50: sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3137,7 +3137,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bf40c: 0x10bf40c: jal   0x10c0798 addu  s8, v1, zero
+// 0x010bfa54: 0x10bfa54: jal   0x10c0dd8 addu  s8, v1, zero
 	ldloc 7
 	stloc 19
 	ldloc.0
@@ -3145,38 +3145,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf414: 0x10bf414: addu  s5, v0, zero
+// 0x010bfa5c: 0x10bfa5c: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010bf418: 0x10bf418: addu  s4, v1, zero
+// 0x010bfa60: 0x10bfa60: addu  s4, v1, zero
 	ldloc 7
 	stloc 12
-// 0x010bf41c: 0x10bf41c: addu  a0, s5, zero
+// 0x010bfa64: 0x10bfa64: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010bf420: 0x10bf420: jal   0x10c1e10 addu  a1, v1, zero
+// 0x010bfa68: 0x10bfa68: jal   0x10c2450 addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sin_10c1e10(int32,int32,int32)
+	call int32 Cibyl144::sin_10c2450(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf428: 0x10bf428: addu  a0, s5, zero
+// 0x010bfa70: 0x10bfa70: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010bf42c: 0x10bf42c: addu  a1, s4, zero
+// 0x010bfa74: 0x10bfa74: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010bf430: 0x10bf430: sw    v1, 20(sp)
+// 0x010bfa78: 0x10bfa78: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3185,7 +3185,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bf434: 0x10bf434: jal   0x10c1e44 sw    v0, 16(sp)
+// 0x010bfa7c: 0x10bfa7c: jal   0x10c2484 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3197,12 +3197,12 @@ __CIBYL_javamethod_begin:
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::cos_10c1e44(int32,int32,int32)
+	call int32 Cibyl144::cos_10c2484(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf43c: 0x10bf43c: lw    a1, 20(sp)
+// 0x010bfa84: 0x10bfa84: lw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3211,7 +3211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf440: 0x10bf440: lw    a0, 16(sp)
+// 0x010bfa88: 0x10bfa88: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3220,10 +3220,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf444: 0x10bf444: addu  a3, v1, zero
+// 0x010bfa8c: 0x10bfa8c: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010bf448: 0x10bf448: jal   0x10c07f0 addu  a2, v0, zero
+// 0x010bfa90: 0x10bfa90: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3231,36 +3231,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf450: 0x10bf450: lui   a0, 0x20000
+// 0x010bfa98: 0x10bfa98: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf454: 0x10bf454: lw    a3, 24004(a0)
+// 0x010bfa9c: 0x10bfa9c: lw    a3, 24468(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6001
+	ldc.i4 6117
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf458: 0x10bf458: lw    a2, 24000(a0)
+// 0x010bfaa0: 0x10bfaa0: lw    a2, 24464(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6000
+	ldc.i4 6116
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf45c: 0x10bf45c: addu  a1, v1, zero
+// 0x010bfaa4: 0x10bfaa4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf460: 0x10bf460: jal   0x10c0798 addu  a0, v0, zero
+// 0x010bfaa8: 0x10bfaa8: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3268,50 +3268,50 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf468: 0x10bf468: addu  a1, v1, zero
+// 0x010bfab0: 0x10bfab0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf46c: 0x10bf46c: jal   0x10c1e78 addu  a0, v0, zero
+// 0x010bfab4: 0x10bfab4: jal   0x10c24b8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::atan_10c1e78(int32,int32,int32)
+	call int32 Cibyl144::atan_10c24b8(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf474: 0x10bf474: lui   a0, 0x20000
+// 0x010bfabc: 0x10bfabc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf478: 0x10bf478: lw    a3, 24012(a0)
+// 0x010bfac0: 0x10bfac0: lw    a3, 24476(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6003
+	ldc.i4 6119
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf47c: 0x10bf47c: lw    a2, 24008(a0)
+// 0x010bfac4: 0x10bfac4: lw    a2, 24472(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6002
+	ldc.i4 6118
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf480: 0x10bf480: addu  a1, v1, zero
+// 0x010bfac8: 0x10bfac8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf484: 0x10bf484: jal   0x10c0798 addu  a0, v0, zero
+// 0x010bfacc: 0x10bfacc: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3319,12 +3319,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf48c: 0x10bf48c: lw    t0, 52(sp)
+// 0x010bfad4: 0x10bfad4: lw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3333,34 +3333,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bf490: 0x10bf490: lw    a3, 24020(s7)
+// 0x010bfad8: 0x10bfad8: lw    a3, 24484(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 6005
+	ldc.i4 6121
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf494: 0x10bf494: lw    a2, 24016(s7)
+// 0x010bfadc: 0x10bfadc: lw    a2, 24480(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 6004
+	ldc.i4 6120
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf498: 0x10bf498: addu  a0, t0, zero
+// 0x010bfae0: 0x10bfae0: addu  a0, t0, zero
 	ldloc 9
 	stloc.1
-// 0x010bf49c: 0x10bf49c: addu  a1, s8, zero
+// 0x010bfae4: 0x10bfae4: addu  a1, s8, zero
 	ldloc 19
 	stloc.2
-// 0x010bf4a0: 0x10bf4a0: addu  s5, v0, zero
+// 0x010bfae8: 0x10bfae8: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010bf4a4: 0x10bf4a4: jal   0x10c0798 addu  s4, v1, zero
+// 0x010bfaec: 0x10bfaec: jal   0x10c0dd8 addu  s4, v1, zero
 	ldloc 7
 	stloc 12
 	ldloc.0
@@ -3368,26 +3368,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf4ac: 0x10bf4ac: addu  a1, v1, zero
+// 0x010bfaf4: 0x10bfaf4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf4b0: 0x10bf4b0: jal   0x10c1fb0 addu  a0, v0, zero
+// 0x010bfaf8: 0x10bfaf8: jal   0x10c25f0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::floor_10c1fb0(int32,int32,int32)
+	call int32 Cibyl144::floor_10c25f0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf4b8: 0x10bf4b8: sw    v1, 44(sp)
+// 0x010bfb00: 0x10bfb00: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3396,31 +3396,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bf4bc: 0x10bf4bc: lw    a3, 24020(s7)
+// 0x010bfb04: 0x10bfb04: lw    a3, 24484(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 6005
+	ldc.i4 6121
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf4c0: 0x10bf4c0: lw    a2, 24016(s7)
+// 0x010bfb08: 0x10bfb08: lw    a2, 24480(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 6004
+	ldc.i4 6120
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf4c4: 0x10bf4c4: addu  a0, s5, zero
+// 0x010bfb0c: 0x10bfb0c: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010bf4c8: 0x10bf4c8: addu  a1, s4, zero
+// 0x010bfb10: 0x10bfb10: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010bf4cc: 0x10bf4cc: jal   0x10c0798 sw    v0, 40(sp)
+// 0x010bfb14: 0x10bfb14: jal   0x10c0dd8 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3434,26 +3434,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf4d4: 0x10bf4d4: addu  a1, v1, zero
+// 0x010bfb1c: 0x10bfb1c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf4d8: 0x10bf4d8: jal   0x10c1fb0 addu  a0, v0, zero
+// 0x010bfb20: 0x10bfb20: jal   0x10c25f0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::floor_10c1fb0(int32,int32,int32)
+	call int32 Cibyl144::floor_10c25f0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf4e0: 0x10bf4e0: sw    v0, 32(sp)
+// 0x010bfb28: 0x10bfb28: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3462,28 +3462,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bf4e4: 0x10bf4e4: lui   v0, 0x20000
+// 0x010bfb2c: 0x10bfb2c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf4e8: 0x10bf4e8: lw    a3, 24028(v0)
+// 0x010bfb30: 0x10bfb30: lw    a3, 24492(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6007
+	ldc.i4 6123
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf4ec: 0x10bf4ec: lw    a2, 24024(v0)
+// 0x010bfb34: 0x10bfb34: lw    a2, 24488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6006
+	ldc.i4 6122
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf4f0: 0x10bf4f0: lw    a1, 20(sp)
+// 0x010bfb38: 0x10bfb38: lw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3492,7 +3492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf4f4: 0x10bf4f4: lw    a0, 16(sp)
+// 0x010bfb3c: 0x10bfb3c: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3501,7 +3501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf4f8: 0x10bf4f8: jal   0x10c0798 sw    v1, 36(sp)
+// 0x010bfb40: 0x10bfb40: jal   0x10c0dd8 sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3515,70 +3515,70 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf500: 0x10bf500: addu  s8, v0, zero
+// 0x010bfb48: 0x10bfb48: addu  s8, v0, zero
 	ldloc 5
 	stloc 19
-// 0x010bf504: 0x10bf504: addu  a0, s8, zero
+// 0x010bfb4c: 0x10bfb4c: addu  a0, s8, zero
 	ldloc 19
 	stloc.1
-// 0x010bf508: 0x10bf508: addu  a1, v1, zero
+// 0x010bfb50: 0x10bfb50: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf50c: 0x10bf50c: jal   0x10c1eac addu  s7, v1, zero
+// 0x010bfb54: 0x10bfb54: jal   0x10c24ec addu  s7, v1, zero
 	ldloc 7
 	stloc 14
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::asin_10c1eac(int32,int32,int32)
+	call int32 Cibyl144::asin_10c24ec(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf514: 0x10bf514: addu  a1, v1, zero
+// 0x010bfb5c: 0x10bfb5c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf518: 0x10bf518: jal   0x10c1e44 addu  a0, v0, zero
+// 0x010bfb60: 0x10bfb60: jal   0x10c2484 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::cos_10c1e44(int32,int32,int32)
+	call int32 Cibyl144::cos_10c2484(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf520: 0x10bf520: addu  t4, v0, zero
+// 0x010bfb68: 0x10bfb68: addu  t4, v0, zero
 	ldloc 5
 	stloc 21
-// 0x010bf524: 0x10bf524: lui   v0, 0x20000
+// 0x010bfb6c: 0x10bfb6c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf528: 0x10bf528: lw    a3, 24036(v0)
+// 0x010bfb70: 0x10bfb70: lw    a3, 24500(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6009
+	ldc.i4 6125
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf52c: 0x10bf52c: lw    a2, 24032(v0)
+// 0x010bfb74: 0x10bfb74: lw    a2, 24496(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6008
+	ldc.i4 6124
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf530: 0x10bf530: lw    a1, 116(sp)
+// 0x010bfb78: 0x10bfb78: lw    a1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3587,7 +3587,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf534: 0x10bf534: lw    a0, 112(sp)
+// 0x010bfb7c: 0x10bfb7c: lw    a0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3596,7 +3596,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf538: 0x10bf538: sw    t4, 56(sp)
+// 0x010bfb80: 0x10bfb80: sw    t4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3605,7 +3605,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 21
 	stelem.i4
-// 0x010bf53c: 0x10bf53c: jal   0x10c0798 sw    v1, 60(sp)
+// 0x010bfb84: 0x10bfb84: jal   0x10c0dd8 sw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3619,44 +3619,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf544: 0x10bf544: addu  a1, v1, zero
+// 0x010bfb8c: 0x10bfb8c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf548: 0x10bf548: jal   0x10c1e10 addu  a0, v0, zero
+// 0x010bfb90: 0x10bfb90: jal   0x10c2450 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sin_10c1e10(int32,int32,int32)
+	call int32 Cibyl144::sin_10c2450(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf550: 0x10bf550: lw    a3, 23964(s1)
+// 0x010bfb98: 0x10bfb98: lw    a3, 24428(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5991
+	ldc.i4 6107
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf554: 0x10bf554: lw    a2, 23960(s1)
+// 0x010bfb9c: 0x10bfb9c: lw    a2, 24424(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5990
+	ldc.i4 6106
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf558: 0x10bf558: lw    a1, 116(sp)
+// 0x010bfba0: 0x10bfba0: lw    a1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3665,7 +3665,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf55c: 0x10bf55c: lw    a0, 112(sp)
+// 0x010bfba4: 0x10bfba4: lw    a0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3674,10 +3674,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf560: 0x10bf560: addu  t0, v0, zero
+// 0x010bfba8: 0x10bfba8: addu  t0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010bf564: 0x10bf564: sw    t0, 52(sp)
+// 0x010bfbac: 0x10bfbac: sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3686,7 +3686,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bf568: 0x10bf568: jal   0x10c0798 sw    v1, 48(sp)
+// 0x010bfbb0: 0x10bfbb0: jal   0x10c0dd8 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3700,26 +3700,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf570: 0x10bf570: addu  a1, v1, zero
+// 0x010bfbb8: 0x10bfbb8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf574: 0x10bf574: jal   0x10c1e44 addu  a0, v0, zero
+// 0x010bfbbc: 0x10bfbbc: jal   0x10c2484 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::cos_10c1e44(int32,int32,int32)
+	call int32 Cibyl144::cos_10c2484(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf57c: 0x10bf57c: lw    t1, 48(sp)
+// 0x010bfbc4: 0x10bfbc4: lw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3728,7 +3728,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bf580: 0x10bf580: lw    t0, 52(sp)
+// 0x010bfbc8: 0x10bfbc8: lw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3737,22 +3737,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bf584: 0x10bf584: addu  a3, t1, zero
+// 0x010bfbcc: 0x10bfbcc: addu  a3, t1, zero
 	ldloc 17
 	stloc 4
-// 0x010bf588: 0x10bf588: addu  t2, v0, zero
+// 0x010bfbd0: 0x10bfbd0: addu  t2, v0, zero
 	ldloc 5
 	stloc 18
-// 0x010bf58c: 0x10bf58c: addu  a2, t0, zero
+// 0x010bfbd4: 0x10bfbd4: addu  a2, t0, zero
 	ldloc 9
 	stloc.3
-// 0x010bf590: 0x10bf590: addu  a1, s7, zero
+// 0x010bfbd8: 0x10bfbd8: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x010bf594: 0x10bf594: addu  a0, s8, zero
+// 0x010bfbdc: 0x10bfbdc: addu  a0, s8, zero
 	ldloc 19
 	stloc.1
-// 0x010bf598: 0x10bf598: sw    t2, 48(sp)
+// 0x010bfbe0: 0x10bfbe0: sw    t2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3761,7 +3761,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010bf59c: 0x10bf59c: jal   0x10c0798 sw    v1, 52(sp)
+// 0x010bfbe4: 0x10bfbe4: jal   0x10c0dd8 sw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3775,36 +3775,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf5a4: 0x10bf5a4: lui   a0, 0x20000
+// 0x010bfbec: 0x10bfbec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf5a8: 0x10bf5a8: lw    a3, 24044(a0)
+// 0x010bfbf0: 0x10bfbf0: lw    a3, 24508(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6011
+	ldc.i4 6127
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf5ac: 0x10bf5ac: lw    a2, 24040(a0)
+// 0x010bfbf4: 0x10bfbf4: lw    a2, 24504(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6010
+	ldc.i4 6126
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf5b0: 0x10bf5b0: addu  a1, v1, zero
+// 0x010bfbf8: 0x10bfbf8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf5b4: 0x10bf5b4: jal   0x10c0740 addu  a0, v0, zero
+// 0x010bfbfc: 0x10bfbfc: jal   0x10c0d80 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3812,12 +3812,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf5bc: 0x10bf5bc: lw    t2, 48(sp)
+// 0x010bfc04: 0x10bfc04: lw    t2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3826,7 +3826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010bf5c0: 0x10bf5c0: lw    t3, 52(sp)
+// 0x010bfc08: 0x10bfc08: lw    t3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3835,7 +3835,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010bf5c4: 0x10bf5c4: lw    t4, 56(sp)
+// 0x010bfc0c: 0x10bfc0c: lw    t4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3844,7 +3844,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 21
-// 0x010bf5c8: 0x10bf5c8: lw    t5, 60(sp)
+// 0x010bfc10: 0x10bfc10: lw    t5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3853,22 +3853,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 23
-// 0x010bf5cc: 0x10bf5cc: addu  t0, v0, zero
+// 0x010bfc14: 0x10bfc14: addu  t0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010bf5d0: 0x10bf5d0: addu  a1, t3, zero
+// 0x010bfc18: 0x10bfc18: addu  a1, t3, zero
 	ldloc 20
 	stloc.2
-// 0x010bf5d4: 0x10bf5d4: addu  a0, t2, zero
+// 0x010bfc1c: 0x10bfc1c: addu  a0, t2, zero
 	ldloc 18
 	stloc.1
-// 0x010bf5d8: 0x10bf5d8: addu  a3, t5, zero
+// 0x010bfc20: 0x10bfc20: addu  a3, t5, zero
 	ldloc 23
 	stloc 4
-// 0x010bf5dc: 0x10bf5dc: addu  a2, t4, zero
+// 0x010bfc24: 0x10bfc24: addu  a2, t4, zero
 	ldloc 21
 	stloc.3
-// 0x010bf5e0: 0x10bf5e0: sw    t0, 52(sp)
+// 0x010bfc28: 0x10bfc28: sw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3877,7 +3877,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bf5e4: 0x10bf5e4: jal   0x10c0798 sw    v1, 48(sp)
+// 0x010bfc2c: 0x10bfc2c: jal   0x10c0dd8 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3891,12 +3891,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf5ec: 0x10bf5ec: lw    t0, 52(sp)
+// 0x010bfc34: 0x10bfc34: lw    t0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3905,7 +3905,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bf5f0: 0x10bf5f0: lw    t1, 48(sp)
+// 0x010bfc38: 0x10bfc38: lw    t1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3914,16 +3914,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010bf5f4: 0x10bf5f4: addu  a0, t0, zero
+// 0x010bfc3c: 0x10bfc3c: addu  a0, t0, zero
 	ldloc 9
 	stloc.1
-// 0x010bf5f8: 0x10bf5f8: addu  a1, t1, zero
+// 0x010bfc40: 0x10bfc40: addu  a1, t1, zero
 	ldloc 17
 	stloc.2
-// 0x010bf5fc: 0x10bf5fc: addu  a3, v1, zero
+// 0x010bfc44: 0x10bfc44: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010bf600: 0x10bf600: jal   0x10c07f0 addu  a2, v0, zero
+// 0x010bfc48: 0x10bfc48: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3931,42 +3931,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf608: 0x10bf608: addu  s1, v0, zero
+// 0x010bfc50: 0x10bfc50: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010bf60c: 0x10bf60c: lui   v0, 0x20000
+// 0x010bfc54: 0x10bfc54: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf610: 0x10bf610: lw    a3, 23756(v0)
+// 0x010bfc58: 0x10bfc58: lw    a3, 24220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5939
+	ldc.i4 6055
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf614: 0x10bf614: lw    a2, 23752(v0)
+// 0x010bfc5c: 0x10bfc5c: lw    a2, 24216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5938
+	ldc.i4 6054
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf618: 0x10bf618: addu  a0, s1, zero
+// 0x010bfc60: 0x10bfc60: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bf61c: 0x10bf61c: addu  a1, v1, zero
+// 0x010bfc64: 0x10bfc64: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf620: 0x10bf620: jal   0x10c188c addu  s7, v1, zero
+// 0x010bfc68: 0x10bfc68: jal   0x10c1ecc addu  s7, v1, zero
 	ldloc 7
 	stloc 14
 	ldloc.0
@@ -3974,40 +3974,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf628: 0x10bf628: bltz  v0, 0x10bf874 lui   v0, 0x20000
+// 0x010bfc70: 0x10bfc70: bltz  v0, 0x10bfebc lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	blt L_10bf874
+	blt L_10bfebc
 // --- basic block ---
-// 0x010bf630: 0x10bf630: lw    a3, 23764(v0)
+// 0x010bfc78: 0x10bfc78: lw    a3, 24228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5941
+	ldc.i4 6057
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf634: 0x10bf634: lw    a2, 23760(v0)
+// 0x010bfc7c: 0x10bfc7c: lw    a2, 24224(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5940
+	ldc.i4 6056
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf638: 0x10bf638: addu  a0, s1, zero
+// 0x010bfc80: 0x10bfc80: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bf63c: 0x10bf63c: jal   0x10c17ac addu  a1, s7, zero
+// 0x010bfc84: 0x10bfc84: jal   0x10c1dec addu  a1, s7, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -4015,60 +4015,60 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf644: 0x10bf644: bgtz  v0, 0x10bf878 lui   v0, 0x20000
+// 0x010bfc8c: 0x10bfc8c: bgtz  v0, 0x10bfec0 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	bgt L_10bf878
+	bgt L_10bfec0
 // --- basic block ---
-// 0x010bf64c: 0x10bf64c: addu  a0, s1, zero
+// 0x010bfc94: 0x10bfc94: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bf650: 0x10bf650: jal   0x10c1ee0 addu  a1, s7, zero
+// 0x010bfc98: 0x10bfc98: jal   0x10c2520 addu  a1, s7, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::acos_10c1ee0(int32,int32,int32)
+	call int32 Cibyl144::acos_10c2520(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf658: 0x10bf658: lui   a0, 0x20000
+// 0x010bfca0: 0x10bfca0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf65c: 0x10bf65c: lw    a3, 24052(a0)
+// 0x010bfca4: 0x10bfca4: lw    a3, 24516(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6013
+	ldc.i4 6129
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf660: 0x10bf660: lw    a2, 24048(a0)
+// 0x010bfca8: 0x10bfca8: lw    a2, 24512(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6012
+	ldc.i4 6128
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf664: 0x10bf664: lui   s1, 0x20000
+// 0x010bfcac: 0x10bfcac: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010bf668: 0x10bf668: addu  a1, v1, zero
+// 0x010bfcb0: 0x10bfcb0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf66c: 0x10bf66c: jal   0x10c0798 addu  a0, v0, zero
+// 0x010bfcb4: 0x10bfcb4: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4076,33 +4076,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf674: 0x10bf674: lw    a3, 24060(s1)
+// 0x010bfcbc: 0x10bfcbc: lw    a3, 24524(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6015
+	ldc.i4 6131
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf678: 0x10bf678: lw    a2, 24056(s1)
+// 0x010bfcc0: 0x10bfcc0: lw    a2, 24520(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6014
+	ldc.i4 6130
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf67c: 0x10bf67c: addu  a1, v1, zero
+// 0x010bfcc4: 0x10bfcc4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf680: 0x10bf680: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010bfcc8: 0x10bfcc8: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4110,18 +4110,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf688: 0x10bf688: addu  a2, v0, zero
+// 0x010bfcd0: 0x10bfcd0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bf68c: 0x10bf68c: addu  a0, s6, zero
+// 0x010bfcd4: 0x10bfcd4: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x010bf690: 0x10bf690: sw    a2, 48(sp)
+// 0x010bfcd8: 0x10bfcd8: sw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4130,7 +4130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010bf694: 0x10bf694: jal   0x10c09c0 sw    v1, 52(sp)
+// 0x010bfcdc: 0x10bfcdc: jal   0x10c1000 sw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4141,12 +4141,12 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf69c: 0x10bf69c: lw    a2, 48(sp)
+// 0x010bfce4: 0x10bfce4: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4155,7 +4155,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf6a0: 0x10bf6a0: lw    a3, 52(sp)
+// 0x010bfce8: 0x10bfce8: lw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4164,16 +4164,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf6a4: 0x10bf6a4: addu  a0, a2, zero
+// 0x010bfcec: 0x10bfcec: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010bf6a8: 0x10bf6a8: addu  a1, a3, zero
+// 0x010bfcf0: 0x10bfcf0: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010bf6ac: 0x10bf6ac: addu  a2, v0, zero
+// 0x010bfcf4: 0x10bfcf4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010bf6b0: 0x10bf6b0: jal   0x10c0798 addu  a3, v1, zero
+// 0x010bfcf8: 0x10bfcf8: jal   0x10c0dd8 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -4181,36 +4181,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf6b8: 0x10bf6b8: lw    a3, 24060(s1)
+// 0x010bfd00: 0x10bfd00: lw    a3, 24524(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6015
+	ldc.i4 6131
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf6bc: 0x10bf6bc: lw    a2, 24056(s1)
+// 0x010bfd04: 0x10bfd04: lw    a2, 24520(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6014
+	ldc.i4 6130
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf6c0: 0x10bf6c0: addu  a1, v1, zero
+// 0x010bfd08: 0x10bfd08: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf6c4: 0x10bf6c4: lui   s1, 0x20000
+// 0x010bfd0c: 0x10bfd0c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010bf6c8: 0x10bf6c8: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010bfd10: 0x10bfd10: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4218,30 +4218,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf6d0: 0x10bf6d0: lw    a3, 24068(s1)
+// 0x010bfd18: 0x10bfd18: lw    a3, 24532(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6017
+	ldc.i4 6133
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf6d4: 0x10bf6d4: lw    a2, 24064(s1)
+// 0x010bfd1c: 0x10bfd1c: lw    a2, 24528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6016
+	ldc.i4 6132
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf6d8: 0x10bf6d8: lw    a1, 44(sp)
+// 0x010bfd20: 0x10bfd20: lw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4250,7 +4250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf6dc: 0x10bf6dc: lw    a0, 40(sp)
+// 0x010bfd24: 0x10bfd24: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4259,10 +4259,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf6e0: 0x10bf6e0: addu  s7, v0, zero
+// 0x010bfd28: 0x10bfd28: addu  s7, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010bf6e4: 0x10bf6e4: jal   0x10c0798 addu  s6, v1, zero
+// 0x010bfd2c: 0x10bfd2c: jal   0x10c0dd8 addu  s6, v1, zero
 	ldloc 7
 	stloc 15
 	ldloc.0
@@ -4270,21 +4270,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf6ec: 0x10bf6ec: addu  a1, v1, zero
+// 0x010bfd34: 0x10bfd34: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf6f0: 0x10bf6f0: addu  a2, s5, zero
+// 0x010bfd38: 0x10bfd38: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x010bf6f4: 0x10bf6f4: addu  a3, s4, zero
+// 0x010bfd3c: 0x10bfd3c: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x010bf6f8: 0x10bf6f8: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010bfd40: 0x10bfd40: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4292,30 +4292,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf700: 0x10bf700: lw    a3, 24068(s1)
+// 0x010bfd48: 0x10bfd48: lw    a3, 24532(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6017
+	ldc.i4 6133
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf704: 0x10bf704: lw    a2, 24064(s1)
+// 0x010bfd4c: 0x10bfd4c: lw    a2, 24528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6016
+	ldc.i4 6132
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf708: 0x10bf708: lw    a1, 36(sp)
+// 0x010bfd50: 0x10bfd50: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4324,7 +4324,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf70c: 0x10bf70c: lw    a0, 32(sp)
+// 0x010bfd54: 0x10bfd54: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4333,10 +4333,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf710: 0x10bf710: addu  s4, v1, zero
+// 0x010bfd58: 0x10bfd58: addu  s4, v1, zero
 	ldloc 7
 	stloc 12
-// 0x010bf714: 0x10bf714: jal   0x10c0798 addu  s5, v0, zero
+// 0x010bfd5c: 0x10bfd5c: jal   0x10c0dd8 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -4344,21 +4344,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf71c: 0x10bf71c: addu  a3, v1, zero
+// 0x010bfd64: 0x10bfd64: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010bf720: 0x10bf720: addu  a1, s4, zero
+// 0x010bfd68: 0x10bfd68: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010bf724: 0x10bf724: addu  a0, s5, zero
+// 0x010bfd6c: 0x10bfd6c: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010bf728: 0x10bf728: jal   0x10c0740 addu  a2, v0, zero
+// 0x010bfd70: 0x10bfd70: jal   0x10c0d80 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4366,42 +4366,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf730: 0x10bf730: addu  s4, v0, zero
+// 0x010bfd78: 0x10bfd78: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010bf734: 0x10bf734: lui   v0, 0x20000
+// 0x010bfd7c: 0x10bfd7c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf738: 0x10bf738: lw    a1, 24076(v0)
+// 0x010bfd80: 0x10bfd80: lw    a1, 24540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6019
+	ldc.i4 6135
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bf73c: 0x10bf73c: lw    a0, 24072(v0)
+// 0x010bfd84: 0x10bfd84: lw    a0, 24536(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6018
+	ldc.i4 6134
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf740: 0x10bf740: addu  a2, s3, zero
+// 0x010bfd88: 0x10bfd88: addu  a2, s3, zero
 	ldloc 16
 	stloc.3
-// 0x010bf744: 0x10bf744: addu  a3, s2, zero
+// 0x010bfd8c: 0x10bfd8c: addu  a3, s2, zero
 	ldloc 11
 	stloc 4
-// 0x010bf748: 0x10bf748: jal   0x10c0740 addu  s1, v1, zero
+// 0x010bfd90: 0x10bfd90: jal   0x10c0d80 addu  s1, v1, zero
 	ldloc 7
 	stloc 8
 	ldloc.0
@@ -4409,39 +4409,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf750: 0x10bf750: lw    a3, 23932(s0)
+// 0x010bfd98: 0x10bfd98: lw    a3, 24396(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5983
+	ldc.i4 6099
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf754: 0x10bf754: lw    a2, 23928(s0)
+// 0x010bfd9c: 0x10bfd9c: lw    a2, 24392(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5982
+	ldc.i4 6098
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf758: 0x10bf758: addu  a1, s1, zero
+// 0x010bfda0: 0x10bfda0: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010bf75c: 0x10bf75c: addu  a0, s4, zero
+// 0x010bfda4: 0x10bfda4: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010bf760: 0x10bf760: addu  s3, v1, zero
+// 0x010bfda8: 0x10bfda8: addu  s3, v1, zero
 	ldloc 7
 	stloc 16
-// 0x010bf764: 0x10bf764: jal   0x10c0798 addu  s2, v0, zero
+// 0x010bfdac: 0x10bfdac: jal   0x10c0dd8 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4449,21 +4449,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf76c: 0x10bf76c: addu  a3, v1, zero
+// 0x010bfdb4: 0x10bfdb4: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010bf770: 0x10bf770: addu  a1, s3, zero
+// 0x010bfdb8: 0x10bfdb8: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010bf774: 0x10bf774: addu  a0, s2, zero
+// 0x010bfdbc: 0x10bfdbc: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010bf778: 0x10bf778: jal   0x10c06e8 addu  a2, v0, zero
+// 0x010bfdc0: 0x10bfdc0: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4471,15 +4471,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf780: 0x10bf780: addu  s2, v0, zero
+// 0x010bfdc8: 0x10bfdc8: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010bf784: 0x10bf784: lw    v0, 24(sp)
+// 0x010bfdcc: 0x10bfdcc: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4488,11 +4488,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bf788: 0x10bf788: sll   zero, zero, 0
-// 0x010bf78c: 0x10bf78c: addu  a0, v0, zero
+// 0x010bfdd0: 0x10bfdd0: sll   zero, zero, 0
+// 0x010bfdd4: 0x10bfdd4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010bf790: 0x10bf790: lw    v0, 28(sp)
+// 0x010bfdd8: 0x10bfdd8: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4501,32 +4501,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bf794: 0x10bf794: sll   zero, zero, 0
-// 0x010bf798: 0x10bf798: addu  a1, v0, zero
+// 0x010bfddc: 0x10bfddc: sll   zero, zero, 0
+// 0x010bfde0: 0x10bfde0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010bf79c: 0x10bf79c: lui   v0, 0x20000
+// 0x010bfde4: 0x10bfde4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf7a0: 0x10bf7a0: lw    a3, 24084(v0)
+// 0x010bfde8: 0x10bfde8: lw    a3, 24548(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6021
+	ldc.i4 6137
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf7a4: 0x10bf7a4: lw    a2, 24080(v0)
+// 0x010bfdec: 0x10bfdec: lw    a2, 24544(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6020
+	ldc.i4 6136
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf7a8: 0x10bf7a8: jal   0x10c0798 addu  s3, v1, zero
+// 0x010bfdf0: 0x10bfdf0: jal   0x10c0dd8 addu  s3, v1, zero
 	ldloc 7
 	stloc 16
 	ldloc.0
@@ -4534,21 +4534,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf7b0: 0x10bf7b0: addu  a3, v1, zero
+// 0x010bfdf8: 0x10bfdf8: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010bf7b4: 0x10bf7b4: addu  a1, s3, zero
+// 0x010bfdfc: 0x10bfdfc: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010bf7b8: 0x10bf7b8: addu  a0, s2, zero
+// 0x010bfe00: 0x10bfe00: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010bf7bc: 0x10bf7bc: jal   0x10c06e8 addu  a2, v0, zero
+// 0x010bfe04: 0x10bfe04: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4556,39 +4556,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf7c4: 0x10bf7c4: lw    a3, 23932(s0)
+// 0x010bfe0c: 0x10bfe0c: lw    a3, 24396(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5983
+	ldc.i4 6099
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf7c8: 0x10bf7c8: lw    a2, 23928(s0)
+// 0x010bfe10: 0x10bfe10: lw    a2, 24392(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5982
+	ldc.i4 6098
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf7cc: 0x10bf7cc: addu  a0, s7, zero
+// 0x010bfe14: 0x10bfe14: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x010bf7d0: 0x10bf7d0: addu  a1, s6, zero
+// 0x010bfe18: 0x10bfe18: addu  a1, s6, zero
 	ldloc 15
 	stloc.2
-// 0x010bf7d4: 0x10bf7d4: addu  s3, v1, zero
+// 0x010bfe1c: 0x10bfe1c: addu  s3, v1, zero
 	ldloc 7
 	stloc 16
-// 0x010bf7d8: 0x10bf7d8: jal   0x10c0798 addu  s2, v0, zero
+// 0x010bfe20: 0x10bfe20: jal   0x10c0dd8 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4596,21 +4596,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf7e0: 0x10bf7e0: addu  a3, v1, zero
+// 0x010bfe28: 0x10bfe28: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010bf7e4: 0x10bf7e4: addu  a1, s3, zero
+// 0x010bfe2c: 0x10bfe2c: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010bf7e8: 0x10bf7e8: addu  a0, s2, zero
+// 0x010bfe30: 0x10bfe30: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010bf7ec: 0x10bf7ec: jal   0x10c06e8 addu  a2, v0, zero
+// 0x010bfe34: 0x10bfe34: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -4618,27 +4618,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf7f4: 0x10bf7f4: addu  s1, v0, zero
+// 0x010bfe3c: 0x10bfe3c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010bf7f8: 0x10bf7f8: addu  a0, s1, zero
+// 0x010bfe40: 0x10bfe40: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bf7fc: 0x10bf7fc: addu  a1, v1, zero
+// 0x010bfe44: 0x10bfe44: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010bf800: 0x10bf800: addu  a3, zero, zero
+// 0x010bfe48: 0x10bfe48: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010bf804: 0x10bf804: addu  a2, zero, zero
+// 0x010bfe4c: 0x10bfe4c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010bf808: 0x10bf808: jal   0x10c188c addu  s0, v1, zero
+// 0x010bfe50: 0x10bfe50: jal   0x10c1ecc addu  s0, v1, zero
 	ldloc 7
 	stloc 10
 	ldloc.0
@@ -4646,43 +4646,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf810: 0x10bf810: bgez  v0, 0x10bf83c lui   s2, 0x20000
+// 0x010bfe58: 0x10bfe58: bgez  v0, 0x10bfe84 lui   s2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 11
 	ldc.i4.s 0
-	bge L_10bf83c
+	bge L_10bfe84
 // --- basic block ---
-// 0x010bf818: 0x10bf818: lui   v0, 0x20000
+// 0x010bfe60: 0x10bfe60: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010bf81c: 0x10bf81c: lw    a3, 24092(v0)
+// 0x010bfe64: 0x10bfe64: lw    a3, 24556(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6023
+	ldc.i4 6139
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf820: 0x10bf820: lw    a2, 24088(v0)
+// 0x010bfe68: 0x10bfe68: lw    a2, 24552(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6022
+	ldc.i4 6138
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf824: 0x10bf824: addu  a0, s1, zero
+// 0x010bfe6c: 0x10bfe6c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bf828: 0x10bf828: jal   0x10c06e8 addu  a1, s0, zero
+// 0x010bfe70: 0x10bfe70: jal   0x10c0d28 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4690,43 +4690,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf830: 0x10bf830: addu  s1, v0, zero
+// 0x010bfe78: 0x10bfe78: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010bf834: 0x10bf834: addu  s0, v1, zero
+// 0x010bfe7c: 0x10bfe7c: addu  s0, v1, zero
 	ldloc 7
 	stloc 10
-// 0x010bf838: 0x10bf838: lui   s2, 0x20000
+// 0x010bfe80: 0x10bfe80: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 11
-L_10bf83c:
-// 0x010bf83c: 0x10bf83c: lw    a3, 24092(s2)
+L_10bfe84:
+// 0x010bfe84: 0x10bfe84: lw    a3, 24556(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 6023
+	ldc.i4 6139
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf840: 0x10bf840: lw    a2, 24088(s2)
+// 0x010bfe88: 0x10bfe88: lw    a2, 24552(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 6022
+	ldc.i4 6138
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf844: 0x10bf844: addu  a0, s1, zero
+// 0x010bfe8c: 0x10bfe8c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010bf848: 0x10bf848: jal   0x10c18fc addu  a1, s0, zero
+// 0x010bfe90: 0x10bfe90: jal   0x10c1f3c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4734,37 +4734,37 @@ L_10bf83c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gedf2_10c18fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gedf2_10c1f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf850: 0x10bf850: bltz  v0, 0x10bf880 addu  a0, s1, zero
+// 0x010bfe98: 0x10bfe98: bltz  v0, 0x10bfec8 addu  a0, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
 	ldc.i4.s 0
-	blt L_10bf880
+	blt L_10bfec8
 // --- basic block ---
-// 0x010bf858: 0x10bf858: lw    a3, 24092(s2)
+// 0x010bfea0: 0x10bfea0: lw    a3, 24556(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 6023
+	ldc.i4 6139
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf85c: 0x10bf85c: lw    a2, 24088(s2)
+// 0x010bfea4: 0x10bfea4: lw    a2, 24552(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 6022
+	ldc.i4 6138
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf860: 0x10bf860: jal   0x10c0740 addu  a1, s0, zero
+// 0x010bfea8: 0x10bfea8: jal   0x10c0d80 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4772,45 +4772,45 @@ L_10bf83c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bf868: 0x10bf868: addu  s1, v0, zero
+// 0x010bfeb0: 0x10bfeb0: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010bf86c: 0x10bf86c: j	 0x10bf880 addu  s0, v1, zero
+// 0x010bfeb4: 0x10bfeb4: j	 0x10bfec8 addu  s0, v1, zero
 	ldloc 7
 	stloc 10
-	br L_10bf880
+	br L_10bfec8
 // --- basic block ---
-L_10bf874:
-// 0x010bf874: 0x10bf874: lui   v0, 0x20000
+L_10bfebc:
+// 0x010bfebc: 0x10bfebc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10bf878:
-// 0x010bf878: 0x10bf878: lw    s0, 23756(v0)
+L_10bfec0:
+// 0x010bfec0: 0x10bfec0: lw    s0, 24220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5939
+	ldc.i4 6055
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bf87c: 0x10bf87c: lui   s1, 0xbff00000
+// 0x010bfec4: 0x10bfec4: lui   s1, 0xbff00000
 	ldc.i4 3220176896
 	stloc 8
-L_10bf880:
-// 0x010bf880: 0x10bf880: lw    ra, 100(sp)
-// 0x010bf884: 0x10bf884: addu  v0, s1, zero
+L_10bfec8:
+// 0x010bfec8: 0x10bfec8: lw    ra, 100(sp)
+// 0x010bfecc: 0x10bfecc: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-// 0x010bf888: 0x10bf888: addu  v1, s0, zero
+// 0x010bfed0: 0x10bfed0: addu  v1, s0, zero
 	ldloc 10
 	stloc 7
-// 0x010bf88c: 0x10bf88c: lw    s8, 96(sp)
+// 0x010bfed4: 0x10bfed4: lw    s8, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4819,7 +4819,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010bf890: 0x10bf890: lw    s7, 92(sp)
+// 0x010bfed8: 0x10bfed8: lw    s7, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4828,7 +4828,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010bf894: 0x10bf894: lw    s6, 88(sp)
+// 0x010bfedc: 0x10bfedc: lw    s6, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4837,7 +4837,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010bf898: 0x10bf898: lw    s5, 84(sp)
+// 0x010bfee0: 0x10bfee0: lw    s5, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4846,7 +4846,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bf89c: 0x10bf89c: lw    s4, 80(sp)
+// 0x010bfee4: 0x10bfee4: lw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4855,7 +4855,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bf8a0: 0x10bf8a0: lw    s3, 76(sp)
+// 0x010bfee8: 0x10bfee8: lw    s3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4864,7 +4864,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bf8a4: 0x10bf8a4: lw    s2, 72(sp)
+// 0x010bfeec: 0x10bfeec: lw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4873,7 +4873,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bf8a8: 0x10bf8a8: lw    s1, 68(sp)
+// 0x010bfef0: 0x10bfef0: lw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4882,7 +4882,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bf8ac: 0x10bf8ac: lw    s0, 64(sp)
+// 0x010bfef4: 0x10bfef4: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4891,7 +4891,7 @@ L_10bf880:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bf8b0: 0x10bf8b0: jr    ra addiu sp, sp, 104
+// 0x010bfef8: 0x10bfef8: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -4903,7 +4903,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_sunriseset_10bf8b8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sunriseset_10bff00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -4956,12 +4956,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bf8b8: 0x10bf8b8: addiu sp, sp, -104
+// 0x010bff00: 0x10bff00: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x010bf8bc: 0x10bf8bc: sw    s2, 84(sp)
+// 0x010bff04: 0x10bff04: sw    s2, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4970,7 +4970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bf8c0: 0x10bf8c0: sw    s1, 80(sp)
+// 0x010bff08: 0x10bff08: sw    s1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4979,22 +4979,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bf8c4: 0x10bf8c4: addu  s2, a2, zero
+// 0x010bff0c: 0x10bff0c: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010bf8c8: 0x10bf8c8: addu  s1, a0, zero
+// 0x010bff10: 0x10bff10: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010bf8cc: 0x10bf8cc: addiu a2, zero, 36
+// 0x010bff14: 0x10bff14: addiu a2, zero, 36
 	ldc.i4.s 36
 	stloc.3
-// 0x010bf8d0: 0x10bf8d0: addiu a0, sp, 32
+// 0x010bff18: 0x10bff18: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x010bf8d4: 0x10bf8d4: sw    ra, 100(sp)
-// 0x010bf8d8: 0x10bf8d8: sw    s5, 96(sp)
+// 0x010bff1c: 0x10bff1c: sw    ra, 100(sp)
+// 0x010bff20: 0x10bff20: sw    s5, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5003,7 +5003,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bf8dc: 0x10bf8dc: sw    s4, 92(sp)
+// 0x010bff24: 0x10bff24: sw    s4, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5012,7 +5012,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010bf8e0: 0x10bf8e0: sw    s3, 88(sp)
+// 0x010bff28: 0x10bff28: sw    s3, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5021,7 +5021,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bf8e4: 0x10bf8e4: jal   0x1001800 sw    s0, 76(sp)
+// 0x010bff2c: 0x10bff2c: jal   0x1001800 sw    s0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5039,7 +5039,7 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf8ec: 0x10bf8ec: lw    a0, 4(s1)
+// 0x010bff34: 0x10bff34: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5048,38 +5048,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf8f0: 0x10bf8f0: jal   0x10c09c0 lui   s0, 0x20000
+// 0x010bff38: 0x10bff38: jal   0x10c1000 lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf8f8: 0x10bf8f8: lw    a3, 24100(s0)
+// 0x010bff40: 0x10bff40: lw    a3, 24564(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6025
+	ldc.i4 6141
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf8fc: 0x10bf8fc: lw    a2, 24096(s0)
+// 0x010bff44: 0x10bff44: lw    a2, 24560(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6024
+	ldc.i4 6140
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf900: 0x10bf900: addu  a1, v1, zero
+// 0x010bff48: 0x10bff48: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010bf904: 0x10bf904: jal   0x10c0798 addu  a0, v0, zero
+// 0x010bff4c: 0x10bff4c: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5087,53 +5087,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf90c: 0x10bf90c: lw    a0, 0(s1)
+// 0x010bff54: 0x10bff54: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bf910: 0x10bf910: addu  s5, v1, zero
+// 0x010bff58: 0x10bff58: addu  s5, v1, zero
 	ldloc 5
 	stloc 13
-// 0x010bf914: 0x10bf914: jal   0x10c09c0 addu  s4, v0, zero
+// 0x010bff5c: 0x10bff5c: jal   0x10c1000 addu  s4, v0, zero
 	ldloc 7
 	stloc 12
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf91c: 0x10bf91c: lw    a3, 24100(s0)
+// 0x010bff64: 0x10bff64: lw    a3, 24564(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6025
+	ldc.i4 6141
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf920: 0x10bf920: lw    a2, 24096(s0)
+// 0x010bff68: 0x10bff68: lw    a2, 24560(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6024
+	ldc.i4 6140
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf924: 0x10bf924: addu  a1, v1, zero
+// 0x010bff6c: 0x10bff6c: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010bf928: 0x10bf928: jal   0x10c0798 addu  a0, v0, zero
+// 0x010bff70: 0x10bff70: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5141,12 +5141,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf930: 0x10bf930: lw    a0, 60(sp)
+// 0x010bff78: 0x10bff78: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5155,13 +5155,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bf934: 0x10bf934: addu  a3, s5, zero
+// 0x010bff7c: 0x10bff7c: addu  a3, s5, zero
 	ldloc 13
 	stloc 4
-// 0x010bf938: 0x10bf938: addu  a2, s4, zero
+// 0x010bff80: 0x10bff80: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x010bf93c: 0x10bf93c: sw    s2, 24(sp)
+// 0x010bff84: 0x10bff84: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5170,7 +5170,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010bf940: 0x10bf940: sw    v1, 20(sp)
+// 0x010bff88: 0x10bff88: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5179,7 +5179,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bf944: 0x10bf944: jal   0x10bf1e0 sw    v0, 16(sp)
+// 0x010bff8c: 0x10bff8c: jal   0x10bf828 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5193,54 +5193,54 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::sunriseset_10bf1e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::sunriseset_10bf828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf94c: 0x10bf94c: addu  s2, v0, zero
+// 0x010bff94: 0x10bff94: addu  s2, v0, zero
 	ldloc 7
 	stloc 10
-// 0x010bf950: 0x10bf950: addu  a1, v1, zero
+// 0x010bff98: 0x10bff98: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010bf954: 0x10bf954: addu  a0, s2, zero
+// 0x010bff9c: 0x10bff9c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010bf958: 0x10bf958: jal   0x10c08d0 addu  s3, v1, zero
+// 0x010bffa0: 0x10bffa0: jal   0x10c0f10 addu  s3, v1, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf960: 0x10bf960: addu  a0, v0, zero
+// 0x010bffa8: 0x10bffa8: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x010bf964: 0x10bf964: jal   0x10c09c0 addu  s0, v0, zero
+// 0x010bffac: 0x10bffac: jal   0x10c1000 addu  s0, v0, zero
 	ldloc 7
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf96c: 0x10bf96c: addu  a3, v1, zero
+// 0x010bffb4: 0x10bffb4: addu  a3, v1, zero
 	ldloc 5
 	stloc 4
-// 0x010bf970: 0x10bf970: addu  a1, s3, zero
+// 0x010bffb8: 0x10bffb8: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010bf974: 0x10bf974: addu  a0, s2, zero
+// 0x010bffbc: 0x10bffbc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010bf978: 0x10bf978: jal   0x10c0740 addu  a2, v0, zero
+// 0x010bffc0: 0x10bffc0: jal   0x10c0d80 addu  a2, v0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -5248,36 +5248,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf980: 0x10bf980: lui   a0, 0x20000
+// 0x010bffc8: 0x10bffc8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bf984: 0x10bf984: lw    a3, 24108(a0)
+// 0x010bffcc: 0x10bffcc: lw    a3, 24572(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6027
+	ldc.i4 6143
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bf988: 0x10bf988: lw    a2, 24104(a0)
+// 0x010bffd0: 0x10bffd0: lw    a2, 24568(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6026
+	ldc.i4 6142
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bf98c: 0x10bf98c: addu  a1, v1, zero
+// 0x010bffd4: 0x10bffd4: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010bf990: 0x10bf990: jal   0x10c0798 addu  a0, v0, zero
+// 0x010bffd8: 0x10bffd8: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5285,43 +5285,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf998: 0x10bf998: addu  a1, v1, zero
+// 0x010bffe0: 0x10bffe0: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010bf99c: 0x10bf99c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010bffe4: 0x10bffe4: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf9a4: 0x10bf9a4: addiu v1, zero, 60
+// 0x010bffec: 0x10bffec: addiu v1, zero, 60
 	ldc.i4.s 60
 	stloc 5
-// 0x010bf9a8: 0x10bf9a8: bne   v0, v1, 0x10bf9b8 sll   zero, zero, 0
+// 0x010bfff0: 0x10bfff0: bne   v0, v1, 0x10c0000 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10bf9b8
+	bne.un L_10c0000
 // --- basic block ---
-// 0x010bf9b0: 0x10bf9b0: addiu s0, s0, 1
+// 0x010bfff8: 0x10bfff8: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010bf9b4: 0x10bf9b4: addu  v0, zero, zero
+// 0x010bfffc: 0x10bfffc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10bf9b8:
-// 0x010bf9b8: 0x10bf9b8: lw    v1, 40(sp)
+L_10c0000:
+// 0x010c0000: 0x10c0000: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5330,26 +5330,26 @@ L_10bf9b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bf9bc: 0x10bf9bc: sll   zero, zero, 0
-// 0x010bf9c0: 0x10bf9c0: slt   a0, s0, v1
+// 0x010c0004: 0x10c0004: sll   zero, zero, 0
+// 0x010c0008: 0x10c0008: slt   a0, s0, v1
 	ldloc 8
 	ldloc 5
 	clt
 	stloc.1
-// 0x010bf9c4: 0x10bf9c4: bne   a0, zero, 0x10bf9e0 addiu s1, zero, 1
+// 0x010c000c: 0x10c000c: bne   a0, zero, 0x10c0028 addiu s1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 9
-	brtrue L_10bf9e0
+	brtrue L_10c0028
 // --- basic block ---
-// 0x010bf9cc: 0x10bf9cc: bne   s0, v1, 0x10bf9e0 addu  s1, zero, zero
+// 0x010c0014: 0x10c0014: bne   s0, v1, 0x10c0028 addu  s1, zero, zero
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	bne.un L_10bf9e0
+	bne.un L_10c0028
 // --- basic block ---
-// 0x010bf9d4: 0x10bf9d4: lw    s1, 36(sp)
+// 0x010c001c: 0x10c001c: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5358,19 +5358,19 @@ L_10bf9b8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bf9d8: 0x10bf9d8: sll   zero, zero, 0
-// 0x010bf9dc: 0x10bf9dc: slt   s1, v0, s1
+// 0x010c0020: 0x10c0020: sll   zero, zero, 0
+// 0x010c0024: 0x10c0024: slt   s1, v0, s1
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 9
-L_10bf9e0:
-// 0x010bf9e0: 0x10bf9e0: addiu a0, sp, 32
+L_10c0028:
+// 0x010c0028: 0x10c0028: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x010bf9e4: 0x10bf9e4: sw    s0, 40(sp)
+// 0x010c002c: 0x10c002c: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5379,7 +5379,7 @@ L_10bf9e0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bf9e8: 0x10bf9e8: sw    v0, 36(sp)
+// 0x010c0030: 0x10c0030: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5388,7 +5388,7 @@ L_10bf9e0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bf9ec: 0x10bf9ec: jal   0x106a770 sw    zero, 32(sp)
+// 0x010c0034: 0x10c0034: jal   0x106ad94 sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5402,38 +5402,38 @@ L_10bf9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::mkgmtime_106a770(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::mkgmtime_106ad94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010bf9f4: 0x10bf9f4: addiu v1, zero, -1
+// 0x010c003c: 0x10c003c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010bf9f8: 0x10bf9f8: beq   v0, v1, 0x10bfa10 sll   zero, zero, 0
+// 0x010c0040: 0x10c0040: beq   v0, v1, 0x10c0058 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10bfa10
+	beq  L_10c0058
 // --- basic block ---
-// 0x010bfa00: 0x10bfa00: beq   s1, zero, 0x10bfa10 lui   v1, 0x10000
+// 0x010c0048: 0x10c0048: beq   s1, zero, 0x10c0058 lui   v1, 0x10000
 	ldloc 9
 	ldc.i4 65536
 	stloc 5
-	brfalse L_10bfa10
+	brfalse L_10c0058
 // --- basic block ---
-// 0x010bfa08: 0x10bfa08: ori   v1, v1, 20864
+// 0x010c0050: 0x10c0050: ori   v1, v1, 20864
 	ldloc 5
 	ldc.i4 20864
 	or
 	stloc 5
-// 0x010bfa0c: 0x10bfa0c: addu  v0, v0, v1
+// 0x010c0054: 0x10c0054: addu  v0, v0, v1
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-L_10bfa10:
-// 0x010bfa10: 0x10bfa10: lw    ra, 100(sp)
-// 0x010bfa14: 0x10bfa14: lw    s5, 96(sp)
+L_10c0058:
+// 0x010c0058: 0x10c0058: lw    ra, 100(sp)
+// 0x010c005c: 0x10c005c: lw    s5, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5442,7 +5442,7 @@ L_10bfa10:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bfa18: 0x10bfa18: lw    s4, 92(sp)
+// 0x010c0060: 0x10c0060: lw    s4, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5451,7 +5451,7 @@ L_10bfa10:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010bfa1c: 0x10bfa1c: lw    s3, 88(sp)
+// 0x010c0064: 0x10c0064: lw    s3, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5460,7 +5460,7 @@ L_10bfa10:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bfa20: 0x10bfa20: lw    s2, 84(sp)
+// 0x010c0068: 0x10c0068: lw    s2, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5469,7 +5469,7 @@ L_10bfa10:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bfa24: 0x10bfa24: lw    s1, 80(sp)
+// 0x010c006c: 0x10c006c: lw    s1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5478,7 +5478,7 @@ L_10bfa10:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bfa28: 0x10bfa28: lw    s0, 76(sp)
+// 0x010c0070: 0x10c0070: lw    s0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5487,7 +5487,7 @@ L_10bfa10:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bfa2c: 0x10bfa2c: jr    ra addiu sp, sp, 104
+// 0x010c0074: 0x10c0074: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -5499,7 +5499,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_sunset_10bfa34(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sunset_10c007c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -5537,12 +5537,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfa34: 0x10bfa34: addiu sp, sp, -24
+// 0x010c007c: 0x10c007c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bfa38: 0x10bfa38: sw    s0, 16(sp)
+// 0x010c0080: 0x10c0080: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5551,16 +5551,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bfa3c: 0x10bfa3c: addu  s0, a0, zero
+// 0x010c0084: 0x10c0084: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010bfa40: 0x10bfa40: addiu a0, sp, 28
+// 0x010c0088: 0x10c0088: addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x010bfa44: 0x10bfa44: sw    ra, 20(sp)
-// 0x010bfa48: 0x10bfa48: jal   0x10c34cc sw    a1, 28(sp)
+// 0x010c008c: 0x10c008c: sw    ra, 20(sp)
+// 0x010c0090: 0x10c0090: jal   0x10c3b0c sw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5574,18 +5574,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::gmtime_10c34cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::gmtime_10c3b0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010bfa50: 0x10bfa50: addu  a1, v0, zero
+// 0x010c0098: 0x10c0098: addu  a1, v0, zero
 	ldloc 7
 	stloc.2
-// 0x010bfa54: 0x10bfa54: addu  a0, s0, zero
+// 0x010c009c: 0x10c009c: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x010bfa58: 0x10bfa58: jal   0x10bf8b8 addiu a2, zero, 1
+// 0x010c00a0: 0x10c00a0: jal   0x10bff00 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5593,13 +5593,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_sunriseset_10bf8b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_sunriseset_10bff00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010bfa60: 0x10bfa60: lw    ra, 20(sp)
-// 0x010bfa64: 0x10bfa64: lw    s0, 16(sp)
+// 0x010c00a8: 0x10c00a8: lw    ra, 20(sp)
+// 0x010c00ac: 0x10c00ac: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5608,7 +5608,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bfa68: 0x10bfa68: jr    ra addiu sp, sp, 24
+// 0x010c00b0: 0x10c00b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5620,7 +5620,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_sunrise_10bfa70(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sunrise_10c00b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -5658,12 +5658,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfa70: 0x10bfa70: addiu sp, sp, -24
+// 0x010c00b8: 0x10c00b8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bfa74: 0x10bfa74: sw    s0, 16(sp)
+// 0x010c00bc: 0x10c00bc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5672,16 +5672,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bfa78: 0x10bfa78: addu  s0, a0, zero
+// 0x010c00c0: 0x10c00c0: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010bfa7c: 0x10bfa7c: addiu a0, sp, 28
+// 0x010c00c4: 0x10c00c4: addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x010bfa80: 0x10bfa80: sw    ra, 20(sp)
-// 0x010bfa84: 0x10bfa84: jal   0x10c34cc sw    a1, 28(sp)
+// 0x010c00c8: 0x10c00c8: sw    ra, 20(sp)
+// 0x010c00cc: 0x10c00cc: jal   0x10c3b0c sw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5695,18 +5695,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::gmtime_10c34cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::gmtime_10c3b0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010bfa8c: 0x10bfa8c: addu  a1, v0, zero
+// 0x010c00d4: 0x10c00d4: addu  a1, v0, zero
 	ldloc 7
 	stloc.2
-// 0x010bfa90: 0x10bfa90: addu  a0, s0, zero
+// 0x010c00d8: 0x10c00d8: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x010bfa94: 0x10bfa94: jal   0x10bf8b8 addu  a2, zero, zero
+// 0x010c00dc: 0x10c00dc: jal   0x10bff00 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5714,13 +5714,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_sunriseset_10bf8b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_sunriseset_10bff00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010bfa9c: 0x10bfa9c: lw    ra, 20(sp)
-// 0x010bfaa0: 0x10bfaa0: lw    s0, 16(sp)
+// 0x010c00e4: 0x10c00e4: lw    ra, 20(sp)
+// 0x010c00e8: 0x10c00e8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5729,7 +5729,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bfaa4: 0x10bfaa4: jr    ra addiu sp, sp, 24
+// 0x010c00ec: 0x10c00ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5741,7 +5741,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_label_add_place_10bfaac()
+.method public static int32 roadmap_label_add_place_10c00f4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -5755,7 +5755,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfaac: 0x10bfaac: jr    ra addiu v0, zero, -1
+// 0x010c00f4: 0x10c00f4: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.0
 	br __CIBYL_function_return
@@ -5763,7 +5763,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_label_clear_10bfab4()
+.method public static int32 roadmap_label_clear_10c00fc()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 ra)
@@ -5780,27 +5780,27 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfab4: 0x10bfab4: lui   v0, 0xe0000
+// 0x010c00fc: 0x10c00fc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x010bfab8: 0x10bfab8: sw    zero, -14528(v0)
+// 0x010c0100: 0x10c0100: sw    zero, -14064(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3632
+	ldc.i4 -3516
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bfabc: 0x10bfabc: lui   v0, 0xe0000
+// 0x010c0104: 0x10c0104: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x010bfac0: 0x10bfac0: jr    ra sw    zero, 29508(v0)
+// 0x010c0108: 0x10c0108: jr    ra sw    zero, 29972(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7377
+	ldc.i4 7493
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5809,7 +5809,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_label_initialize_10bfac8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_label_initialize_10c0110(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5847,12 +5847,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfac8: 0x10bfac8: addiu sp, sp, -24
+// 0x010c0110: 0x10c0110: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bfacc: 0x10bfacc: sw    s0, 16(sp)
+// 0x010c0114: 0x10c0114: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5861,32 +5861,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bfad0: 0x10bfad0: lui   a1, 0x0
+// 0x010c0118: 0x10c0118: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bfad4: 0x10bfad4: lui   s0, 0x0
+// 0x010c011c: 0x10c011c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010bfad8: 0x10bfad8: lui   a2, 0x20000
+// 0x010c0120: 0x10c0120: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010bfadc: 0x10bfadc: addiu a0, s0, 26236
+// 0x010c0124: 0x10c0124: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010bfae0: 0x10bfae0: addiu a1, a1, 19632
+// 0x010c0128: 0x10c0128: addiu a1, a1, 19632
 	ldloc.2
 	ldc.i4 19632
 	add
 	stloc.2
-// 0x010bfae4: 0x10bfae4: addiu a2, a2, 6816
+// 0x010c012c: 0x10c012c: addiu a2, a2, 7280
 	ldloc.3
-	ldc.i4 6816
+	ldc.i4 7280
 	add
 	stloc.3
-// 0x010bfae8: 0x10bfae8: sw    ra, 20(sp)
-// 0x010bfaec: 0x10bfaec: jal   0x100edb0 addu  a3, zero, zero
+// 0x010c0130: 0x10c0130: sw    ra, 20(sp)
+// 0x010c0134: 0x10c0134: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5894,33 +5894,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bfaf4: 0x10bfaf4: lui   a1, 0x0
+// 0x010c013c: 0x10c013c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010bfaf8: 0x10bfaf8: lui   a2, 0x0
+// 0x010c0140: 0x10c0140: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010bfafc: 0x10bfafc: addiu a0, s0, 26236
+// 0x010c0144: 0x10c0144: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010bfb00: 0x10bfb00: addiu a1, a1, 19600
+// 0x010c0148: 0x10c0148: addiu a1, a1, 19600
 	ldloc.2
 	ldc.i4 19600
 	add
 	stloc.2
-// 0x010bfb04: 0x10bfb04: addiu a2, a2, 31980
+// 0x010c014c: 0x10c014c: addiu a2, a2, 31980
 	ldloc.3
 	ldc.i4 31980
 	add
 	stloc.3
-// 0x010bfb08: 0x10bfb08: jal   0x100edb0 addu  a3, zero, zero
+// 0x010c0150: 0x10c0150: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5928,32 +5928,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bfb10: 0x10bfb10: lui   a0, 0x10c0000
+// 0x010c0158: 0x10c0158: lui   a0, 0x10c0000
 	ldc.i4 17563648
 	stloc.1
-// 0x010bfb14: 0x10bfb14: jal   0x1014064 addiu a0, a0, -1232
+// 0x010c015c: 0x10c015c: jal   0x1014074 addiu a0, a0, 376
 	ldloc.1
-	ldc.i4 -1232
+	ldc.i4 376
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010bfb1c: 0x10bfb1c: lw    ra, 20(sp)
-// 0x010bfb20: 0x10bfb20: addu  v0, zero, zero
+// 0x010c0164: 0x10c0164: lw    ra, 20(sp)
+// 0x010c0168: 0x10c0168: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010bfb24: 0x10bfb24: lw    s0, 16(sp)
+// 0x010c016c: 0x10c016c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5962,7 +5962,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bfb28: 0x10bfb28: jr    ra addiu sp, sp, 24
+// 0x010c0170: 0x10c0170: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5974,7 +5974,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_label_activate_10bfb30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_label_activate_10c0178(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -6012,21 +6012,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfb30: 0x10bfb30: lui   a0, 0x20000
+// 0x010c0178: 0x10c0178: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010bfb34: 0x10bfb34: addiu sp, sp, -24
+// 0x010c017c: 0x10c017c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bfb38: 0x10bfb38: addu  a1, zero, zero
+// 0x010c0180: 0x10c0180: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010bfb3c: 0x10bfb3c: sw    ra, 20(sp)
-// 0x010bfb40: 0x10bfb40: jal   0x104ef00 addiu a0, a0, 23324
+// 0x010c0184: 0x10c0184: sw    ra, 20(sp)
+// 0x010c0188: 0x10c0188: jal   0x104ef10 addiu a0, a0, 23784
 	ldloc.1
-	ldc.i4 23324
+	ldc.i4 23784
 	add
 	stloc.1
 	ldloc.0
@@ -6034,28 +6034,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bfb48: 0x10bfb48: lui   a0, 0x0
+// 0x010c0190: 0x10c0190: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bfb4c: 0x10bfb4c: lui   v1, 0xe0000
+// 0x010c0194: 0x10c0194: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010bfb50: 0x10bfb50: addiu a0, a0, 19600
+// 0x010c0198: 0x10c0198: addiu a0, a0, 19600
 	ldloc.1
 	ldc.i4 19600
 	add
 	stloc.1
-// 0x010bfb54: 0x10bfb54: jal   0x100e348 sw    v0, 29488(v1)
+// 0x010c019c: 0x10c019c: jal   0x100e358 sw    v0, 29952(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7372
+	ldc.i4 7488
 	add
 	ldloc 5
 	stelem.i4
@@ -6064,12 +6064,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bfb5c: 0x10bfb5c: jal   0x104edb0 addu  a0, v0, zero
+// 0x010c01a4: 0x10c01a4: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6077,24 +6077,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bfb64: 0x10bfb64: jal   0x104dd5c addiu a0, zero, 2
+// 0x010c01ac: 0x10c01ac: jal   0x104dd6c addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bfb6c: 0x10bfb6c: lui   a0, 0x0
+// 0x010c01b4: 0x10c01b4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010bfb70: 0x10bfb70: jal   0x100e788 addiu a0, a0, 19632
+// 0x010c01b8: 0x10c01b8: jal   0x100e798 addiu a0, a0, 19632
 	ldloc.1
 	ldc.i4 19632
 	add
@@ -6104,34 +6104,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bfb78: 0x10bfb78: mult  v0, v0
+// 0x010c01c0: 0x10c01c0: mult  v0, v0
 	ldloc 5
 	ldloc 5
 	mul
 	stloc 9
-// 0x010bfb7c: 0x10bfb7c: lw    ra, 20(sp)
-// 0x010bfb80: 0x10bfb80: lui   v1, 0xe0000
+// 0x010c01c4: 0x10c01c4: lw    ra, 20(sp)
+// 0x010c01c8: 0x10c01c8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010bfb84: 0x10bfb84: addiu sp, sp, 24
+// 0x010c01cc: 0x10c01cc: addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
-// 0x010bfb88: 0x10bfb88: mflo  lo
+// 0x010c01d0: 0x10c01d0: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x010bfb8c: 0x10bfb8c: jr    ra sw    v0, 29492(v1)
+// 0x010c01d4: 0x10c01d4: jr    ra sw    v0, 29956(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7373
+	ldc.i4 7489
 	add
 	ldloc 5
 	stelem.i4
@@ -6142,7 +6142,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_label_add_10bfb94(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_label_add_10c01dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 t4,int32 s3,int32 t0,int32 s2,int32 lo,int32 t1,int32 t2,int32 t3,int32 ra,int32 t5)
@@ -6210,19 +6210,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfb94: 0x10bfb94: lw    v0, 0(a0)
+// 0x010c01dc: 0x10c01dc: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bfb98: 0x10bfb98: addiu sp, sp, -40
+// 0x010c01e0: 0x10c01e0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010bfb9c: 0x10bfb9c: sw    s3, 32(sp)
+// 0x010c01e4: 0x10c01e4: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6231,7 +6231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010bfba0: 0x10bfba0: sw    s1, 24(sp)
+// 0x010c01e8: 0x10c01e8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6240,8 +6240,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010bfba4: 0x10bfba4: sw    ra, 36(sp)
-// 0x010bfba8: 0x10bfba8: sw    s2, 28(sp)
+// 0x010c01ec: 0x10c01ec: sw    ra, 36(sp)
+// 0x010c01f0: 0x10c01f0: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6250,7 +6250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bfbac: 0x10bfbac: sw    s0, 20(sp)
+// 0x010c01f4: 0x10c01f4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6259,45 +6259,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010bfbb0: 0x10bfbb0: addu  s3, a0, zero
+// 0x010c01f8: 0x10c01f8: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010bfbb4: 0x10bfbb4: bne   v0, zero, 0x10bfeb8 addu  s1, a1, zero
+// 0x010c01fc: 0x10c01fc: bne   v0, zero, 0x10c0500 addu  s1, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 9
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-// 0x010bfbbc: 0x10bfbbc: lui   v0, 0xe0000
+// 0x010c0204: 0x10c0204: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bfbc0: 0x10bfbc0: lw    v1, 29492(v0)
+// 0x010c0208: 0x10c0208: lw    v1, 29956(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7373
+	ldc.i4 7489
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bfbc4: 0x10bfbc4: lw    v0, 0(a1)
+// 0x010c020c: 0x10c020c: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bfbc8: 0x10bfbc8: sll   zero, zero, 0
-// 0x010bfbcc: 0x10bfbcc: slt   v1, v0, v1
+// 0x010c0210: 0x10c0210: sll   zero, zero, 0
+// 0x010c0214: 0x10c0214: slt   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 7
-// 0x010bfbd0: 0x10bfbd0: bne   v1, zero, 0x10bfeb8 sll   zero, zero, 0
+// 0x010c0218: 0x10c0218: bne   v1, zero, 0x10c0500 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-// 0x010bfbd8: 0x10bfbd8: lw    a0, 4(a1)
+// 0x010c0220: 0x10c0220: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6306,17 +6306,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bfbdc: 0x10bfbdc: sll   zero, zero, 0
-// 0x010bfbe0: 0x10bfbe0: slti  v1, a0, 30
+// 0x010c0224: 0x10c0224: sll   zero, zero, 0
+// 0x010c0228: 0x10c0228: slti  v1, a0, 30
 	ldloc.1
 	ldc.i4.s 30
 	clt
 	stloc 7
-// 0x010bfbe4: 0x10bfbe4: bne   v1, zero, 0x10bfeb8 sll   zero, zero, 0
+// 0x010c022c: 0x10c022c: bne   v1, zero, 0x10c0500 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-// 0x010bfbec: 0x10bfbec: lw    v1, 8(a1)
+// 0x010c0234: 0x10c0234: lw    v1, 8(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6325,101 +6325,101 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bfbf0: 0x10bfbf0: sll   zero, zero, 0
-// 0x010bfbf4: 0x10bfbf4: slti  a1, v1, 30
+// 0x010c0238: 0x10c0238: sll   zero, zero, 0
+// 0x010c023c: 0x10c023c: slti  a1, v1, 30
 	ldloc 7
 	ldc.i4.s 30
 	clt
 	stloc.2
-// 0x010bfbf8: 0x10bfbf8: bne   a1, zero, 0x10bfeb8 lui   a1, 0xe0000
+// 0x010c0240: 0x10c0240: bne   a1, zero, 0x10c0500 lui   a1, 0xe0000
 	ldloc.2
 	ldc.i4 917504
 	stloc.2
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-// 0x010bfc00: 0x10bfc00: lw    a1, 29504(a1)
+// 0x010c0248: 0x10c0248: lw    a1, 29968(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7376
+	ldc.i4 7492
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bfc04: 0x10bfc04: sll   zero, zero, 0
-// 0x010bfc08: 0x10bfc08: slt   a0, a1, a0
+// 0x010c024c: 0x10c024c: sll   zero, zero, 0
+// 0x010c0250: 0x10c0250: slt   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.1
-// 0x010bfc0c: 0x10bfc0c: bne   a0, zero, 0x10bfeb8 lui   a0, 0xe0000
+// 0x010c0254: 0x10c0254: bne   a0, zero, 0x10c0500 lui   a0, 0xe0000
 	ldloc.1
 	ldc.i4 917504
 	stloc.1
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-// 0x010bfc14: 0x10bfc14: lw    a0, 29500(a0)
+// 0x010c025c: 0x10c025c: lw    a0, 29964(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7375
+	ldc.i4 7491
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bfc18: 0x10bfc18: sll   zero, zero, 0
-// 0x010bfc1c: 0x10bfc1c: slt   v1, a0, v1
+// 0x010c0260: 0x10c0260: sll   zero, zero, 0
+// 0x010c0264: 0x10c0264: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x010bfc20: 0x10bfc20: bne   v1, zero, 0x10bfeb8 lui   v1, 0xe0000
+// 0x010c0268: 0x10c0268: bne   v1, zero, 0x10c0500 lui   v1, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc 7
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-// 0x010bfc28: 0x10bfc28: lw    a0, -14528(v1)
+// 0x010c0270: 0x10c0270: lw    a0, -14064(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3632
+	ldc.i4 -3516
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bfc2c: 0x10bfc2c: addiu v1, zero, 200
+// 0x010c0274: 0x10c0274: addiu v1, zero, 200
 	ldc.i4 200
 	stloc 7
-// 0x010bfc30: 0x10bfc30: bne   a0, v1, 0x10bfc50 sll   zero, zero, 0
+// 0x010c0278: 0x10c0278: bne   a0, v1, 0x10c0298 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_10bfc50
+	bne.un L_10c0298
 // --- basic block ---
-// 0x010bfc38: 0x10bfc38: lui   v1, 0xe0000
+// 0x010c0280: 0x10c0280: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010bfc3c: 0x10bfc3c: lw    v1, 29508(v1)
+// 0x010c0284: 0x10c0284: lw    v1, 29972(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7377
+	ldc.i4 7493
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bfc40: 0x10bfc40: sll   zero, zero, 0
-// 0x010bfc44: 0x10bfc44: slt   v0, v0, v1
+// 0x010c0288: 0x10c0288: sll   zero, zero, 0
+// 0x010c028c: 0x10c028c: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010bfc48: 0x10bfc48: bne   v0, zero, 0x10bfeb8 sll   zero, zero, 0
+// 0x010c0290: 0x10c0290: bne   v0, zero, 0x10c0500 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-L_10bfc50:
-// 0x010bfc50: 0x10bfc50: lw    a0, 4(s3)
+L_10c0298:
+// 0x010c0298: 0x10c0298: lw    a0, 4(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6428,7 +6428,7 @@ L_10bfc50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bfc54: 0x10bfc54: jal   0x1004034 sll   zero, zero, 0
+// 0x010c029c: 0x10c029c: jal   0x1004034 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6439,63 +6439,63 @@ L_10bfc50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bfc5c: 0x10bfc5c: addu  s2, v0, zero
+// 0x010c02a4: 0x10c02a4: addu  s2, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010bfc60: 0x10bfc60: lui   v0, 0xe0000
+// 0x010c02a8: 0x10c02a8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bfc64: 0x10bfc64: lw    t2, -14528(v0)
+// 0x010c02ac: 0x10c02ac: lw    t2, -14064(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3632
+	ldc.i4 -3516
 	add
 	ldelem.i4
 	stloc 16
-// 0x010bfc68: 0x10bfc68: lui   a3, 0xe0000
+// 0x010c02b0: 0x10c02b0: lui   a3, 0xe0000
 	ldc.i4 917504
 	stloc 4
-// 0x010bfc6c: 0x10bfc6c: lui   v0, 0xe0000
+// 0x010c02b4: 0x10c02b4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bfc70: 0x10bfc70: lw    a1, 29508(v0)
+// 0x010c02b8: 0x10c02b8: lw    a1, 29972(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7377
+	ldc.i4 7493
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bfc74: 0x10bfc74: addiu a3, a3, -14492
+// 0x010c02bc: 0x10c02bc: addiu a3, a3, -14028
 	ldloc 4
-	ldc.i4 -14492
+	ldc.i4 -14028
 	add
 	stloc 4
-// 0x010bfc78: 0x10bfc78: addiu a0, zero, -1
+// 0x010c02c0: 0x10c02c0: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x010bfc7c: 0x10bfc7c: addu  v1, zero, zero
+// 0x010c02c4: 0x10c02c4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010bfc80: 0x10bfc80: addiu t1, zero, -1
+// 0x010c02c8: 0x10c02c8: addiu t1, zero, -1
 	ldc.i4.m1
 	stloc 15
-// 0x010bfc84: 0x10bfc84: addu  t0, zero, zero
+// 0x010c02cc: 0x10c02cc: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010bfc88: 0x10bfc88: addu  t3, zero, zero
+// 0x010c02d0: 0x10c02d0: addu  t3, zero, zero
 	ldc.i4.s 0
 	stloc 17
-// 0x010bfc8c: 0x10bfc8c: j	 0x10bfd40 addu  v0, zero, zero
+// 0x010c02d4: 0x10c02d4: j	 0x10c0388 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10bfd40
+	br L_10c0388
 // --- basic block ---
-L_10bfc94:
-// 0x010bfc94: 0x10bfc94: lw    a2, 188(a3)
+L_10c02dc:
+// 0x010c02dc: 0x10c02dc: lw    a2, 188(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -6504,19 +6504,19 @@ L_10bfc94:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bfc98: 0x10bfc98: sll   zero, zero, 0
-// 0x010bfc9c: 0x10bfc9c: andi  a2, a2, 1
+// 0x010c02e0: 0x10c02e0: sll   zero, zero, 0
+// 0x010c02e4: 0x10c02e4: andi  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc.3
-// 0x010bfca0: 0x10bfca0: beq   a2, zero, 0x10bfd4c addiu a2, zero, -1
+// 0x010c02e8: 0x10c02e8: beq   a2, zero, 0x10c0394 addiu a2, zero, -1
 	ldloc.3
 	ldc.i4.m1
 	stloc.3
-	brfalse L_10bfd4c
+	brfalse L_10c0394
 // --- basic block ---
-// 0x010bfca8: 0x10bfca8: lw    a2, -24(a3)
+// 0x010c02f0: 0x10c02f0: lw    a2, -24(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -6525,50 +6525,50 @@ L_10bfc94:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bfcac: 0x10bfcac: sll   zero, zero, 0
-// 0x010bfcb0: 0x10bfcb0: beq   a2, a1, 0x10bfcd0 sll   zero, zero, 0
+// 0x010c02f4: 0x10c02f4: sll   zero, zero, 0
+// 0x010c02f8: 0x10c02f8: beq   a2, a1, 0x10c0318 sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	beq  L_10bfcd0
+	beq  L_10c0318
 // --- basic block ---
-// 0x010bfcb8: 0x10bfcb8: beq   v1, zero, 0x10bfcc8 slt   t4, a2, v1
+// 0x010c0300: 0x10c0300: beq   v1, zero, 0x10c0310 slt   t4, a2, v1
 	ldloc 7
 	ldloc.3
 	ldloc 7
 	clt
 	stloc 10
-	brfalse L_10bfcc8
+	brfalse L_10c0310
 // --- basic block ---
-// 0x010bfcc0: 0x10bfcc0: beq   t4, zero, 0x10bfcd4 sll   zero, zero, 0
+// 0x010c0308: 0x10c0308: beq   t4, zero, 0x10c031c sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10bfcd4
+	brfalse L_10c031c
 // --- basic block ---
-L_10bfcc8:
-// 0x010bfcc8: 0x10bfcc8: bne   a1, zero, 0x10bfcd4 addu  v1, a2, zero
+L_10c0310:
+// 0x010c0310: 0x10c0310: bne   a1, zero, 0x10c031c addu  v1, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 7
-	brtrue L_10bfcd4
+	brtrue L_10c031c
 // --- basic block ---
-L_10bfcd0:
-// 0x010bfcd0: 0x10bfcd0: addu  t1, v0, zero
+L_10c0318:
+// 0x010c0318: 0x10c0318: addu  t1, v0, zero
 	ldloc 5
 	stloc 15
-L_10bfcd4:
-// 0x010bfcd4: 0x10bfcd4: lw    t4, 0(a3)
+L_10c031c:
+// 0x010c031c: 0x10c031c: lw    t4, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010bfcd8: 0x10bfcd8: sll   zero, zero, 0
-// 0x010bfcdc: 0x10bfcdc: bne   t4, s2, 0x10bfd38 sll   zero, zero, 0
+// 0x010c0320: 0x10c0320: sll   zero, zero, 0
+// 0x010c0324: 0x10c0324: bne   t4, s2, 0x10c0380 sll   zero, zero, 0
 	ldloc 10
 	ldloc 13
-	bne.un L_10bfd38
+	bne.un L_10c0380
 // --- basic block ---
-// 0x010bfce4: 0x10bfce4: lw    t5, -8(a3)
+// 0x010c032c: 0x10c032c: lw    t5, -8(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -6577,7 +6577,7 @@ L_10bfcd4:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010bfce8: 0x10bfce8: lw    t4, 12(s3)
+// 0x010c0330: 0x10c0330: lw    t4, 12(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6586,330 +6586,330 @@ L_10bfcd4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010bfcec: 0x10bfcec: sll   zero, zero, 0
-// 0x010bfcf0: 0x10bfcf0: bne   t5, t4, 0x10bfd38 sll   zero, zero, 0
+// 0x010c0334: 0x10c0334: sll   zero, zero, 0
+// 0x010c0338: 0x10c0338: bne   t5, t4, 0x10c0380 sll   zero, zero, 0
 	ldloc 19
 	ldloc 10
-	bne.un L_10bfd38
+	bne.un L_10c0380
 // --- basic block ---
-// 0x010bfcf8: 0x10bfcf8: bne   t0, zero, 0x10bfd0c sll   zero, zero, 0
+// 0x010c0340: 0x10c0340: bne   t0, zero, 0x10c0354 sll   zero, zero, 0
 	ldloc 12
-	brtrue L_10bfd0c
+	brtrue L_10c0354
 // --- basic block ---
-// 0x010bfd00: 0x10bfd00: addu  t0, a2, zero
+// 0x010c0348: 0x10c0348: addu  t0, a2, zero
 	ldloc.3
 	stloc 12
-// 0x010bfd04: 0x10bfd04: j	 0x10bfd38 addu  t3, v0, zero
+// 0x010c034c: 0x10c034c: j	 0x10c0380 addu  t3, v0, zero
 	ldloc 5
 	stloc 17
-	br L_10bfd38
+	br L_10c0380
 // --- basic block ---
-L_10bfd0c:
-// 0x010bfd0c: 0x10bfd0c: lw    a0, 0(s1)
+L_10c0354:
+// 0x010c0354: 0x10c0354: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bfd10: 0x10bfd10: sll   zero, zero, 0
-// 0x010bfd14: 0x10bfd14: slt   t4, a0, a2
+// 0x010c0358: 0x10c0358: sll   zero, zero, 0
+// 0x010c035c: 0x10c035c: slt   t4, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc 10
-// 0x010bfd18: 0x10bfd18: beq   t4, zero, 0x10bfd28 slt   a0, a0, t0
+// 0x010c0360: 0x10c0360: beq   t4, zero, 0x10c0370 slt   a0, a0, t0
 	ldloc 10
 	ldloc.1
 	ldloc 12
 	clt
 	stloc.1
-	brfalse L_10bfd28
+	brfalse L_10c0370
 // --- basic block ---
-// 0x010bfd20: 0x10bfd20: bne   a0, zero, 0x10bfeb8 sll   zero, zero, 0
+// 0x010c0368: 0x10c0368: bne   a0, zero, 0x10c0500 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10bfeb8
+	brtrue L_10c0500
 // --- basic block ---
-L_10bfd28:
-// 0x010bfd28: 0x10bfd28: slt   a2, a2, t0
+L_10c0370:
+// 0x010c0370: 0x10c0370: slt   a2, a2, t0
 	ldloc.3
 	ldloc 12
 	clt
 	stloc.3
-// 0x010bfd2c: 0x10bfd2c: bne   a2, zero, 0x10bfd38 addu  a0, v0, zero
+// 0x010c0374: 0x10c0374: bne   a2, zero, 0x10c0380 addu  a0, v0, zero
 	ldloc.3
 	ldloc 5
 	stloc.1
-	brtrue L_10bfd38
+	brtrue L_10c0380
 // --- basic block ---
-// 0x010bfd34: 0x10bfd34: addu  a0, t3, zero
+// 0x010c037c: 0x10c037c: addu  a0, t3, zero
 	ldloc 17
 	stloc.1
-L_10bfd38:
-// 0x010bfd38: 0x10bfd38: addiu v0, v0, 1
+L_10c0380:
+// 0x010c0380: 0x10c0380: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010bfd3c: 0x10bfd3c: addiu a3, a3, 220
+// 0x010c0384: 0x10c0384: addiu a3, a3, 220
 	ldloc 4
 	ldc.i4 220
 	add
 	stloc 4
-L_10bfd40:
-// 0x010bfd40: 0x10bfd40: slt   a2, v0, t2
+L_10c0388:
+// 0x010c0388: 0x10c0388: slt   a2, v0, t2
 	ldloc 5
 	ldloc 16
 	clt
 	stloc.3
-// 0x010bfd44: 0x10bfd44: bne   a2, zero, 0x10bfc94 addiu a2, zero, -1
+// 0x010c038c: 0x10c038c: bne   a2, zero, 0x10c02dc addiu a2, zero, -1
 	ldloc.3
 	ldc.i4.m1
 	stloc.3
-	brtrue L_10bfc94
+	brtrue L_10c02dc
 // --- basic block ---
-L_10bfd4c:
-// 0x010bfd4c: 0x10bfd4c: beq   a0, a2, 0x10bfd58 addiu a2, zero, 200
+L_10c0394:
+// 0x010c0394: 0x10c0394: beq   a0, a2, 0x10c03a0 addiu a2, zero, 200
 	ldloc.1
 	ldloc.3
 	ldc.i4 200
 	stloc.3
-	beq  L_10bfd58
+	beq  L_10c03a0
 // --- basic block ---
-// 0x010bfd54: 0x10bfd54: addu  v0, a0, zero
+// 0x010c039c: 0x10c039c: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-L_10bfd58:
-// 0x010bfd58: 0x10bfd58: bne   v0, a2, 0x10bfd88 sll   zero, zero, 0
+L_10c03a0:
+// 0x010c03a0: 0x10c03a0: bne   v0, a2, 0x10c03d0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.3
-	bne.un L_10bfd88
+	bne.un L_10c03d0
 // --- basic block ---
-// 0x010bfd60: 0x10bfd60: lw    v0, 0(s1)
+// 0x010c03a8: 0x10c03a8: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bfd64: 0x10bfd64: sll   zero, zero, 0
-// 0x010bfd68: 0x10bfd68: slt   a0, v0, v1
+// 0x010c03ac: 0x10c03ac: sll   zero, zero, 0
+// 0x010c03b0: 0x10c03b0: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x010bfd6c: 0x10bfd6c: beq   a0, zero, 0x10bfd78 sll   zero, zero, 0
+// 0x010c03b4: 0x10c03b4: beq   a0, zero, 0x10c03c0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10bfd78
+	brfalse L_10c03c0
 // --- basic block ---
-// 0x010bfd74: 0x10bfd74: addu  v1, v0, zero
+// 0x010c03bc: 0x10c03bc: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_10bfd78:
-// 0x010bfd78: 0x10bfd78: lui   v0, 0xe0000
+L_10c03c0:
+// 0x010c03c0: 0x10c03c0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bfd7c: 0x10bfd7c: sw    v1, 29508(v0)
+// 0x010c03c4: 0x10c03c4: sw    v1, 29972(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7377
+	ldc.i4 7493
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bfd80: 0x10bfd80: j	 0x10bfe18 addu  v0, t1, zero
+// 0x010c03c8: 0x10c03c8: j	 0x10c0460 addu  v0, t1, zero
 	ldloc 15
 	stloc 5
-	br L_10bfe18
+	br L_10c0460
 // --- basic block ---
-L_10bfd88:
-// 0x010bfd88: 0x10bfd88: bne   v0, t2, 0x10bfdc4 sll   zero, zero, 0
+L_10c03d0:
+// 0x010c03d0: 0x10c03d0: bne   v0, t2, 0x10c040c sll   zero, zero, 0
 	ldloc 5
 	ldloc 16
-	bne.un L_10bfdc4
+	bne.un L_10c040c
 // --- basic block ---
-// 0x010bfd90: 0x10bfd90: addiu a0, v0, 1
+// 0x010c03d8: 0x10c03d8: addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010bfd94: 0x10bfd94: lui   a1, 0xe0000
+// 0x010c03dc: 0x10c03dc: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010bfd98: 0x10bfd98: bne   a0, a2, 0x10bfe18 sw    a0, -14528(a1)
+// 0x010c03e0: 0x10c03e0: bne   a0, a2, 0x10c0460 sw    a0, -14064(a1)
 	ldloc.1
 	ldloc.3
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3632
+	ldc.i4 -3516
 	add
 	ldloc.1
 	stelem.i4
-	bne.un L_10bfe18
+	bne.un L_10c0460
 // --- basic block ---
-// 0x010bfda0: 0x10bfda0: lw    a0, 0(s1)
+// 0x010c03e8: 0x10c03e8: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010bfda4: 0x10bfda4: sll   zero, zero, 0
-// 0x010bfda8: 0x10bfda8: slt   a1, a0, v1
+// 0x010c03ec: 0x10c03ec: sll   zero, zero, 0
+// 0x010c03f0: 0x10c03f0: slt   a1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc.2
-// 0x010bfdac: 0x10bfdac: beq   a1, zero, 0x10bfdb8 sll   zero, zero, 0
+// 0x010c03f4: 0x10c03f4: beq   a1, zero, 0x10c0400 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10bfdb8
+	brfalse L_10c0400
 // --- basic block ---
-// 0x010bfdb4: 0x10bfdb4: addu  v1, a0, zero
+// 0x010c03fc: 0x10c03fc: addu  v1, a0, zero
 	ldloc.1
 	stloc 7
-L_10bfdb8:
-// 0x010bfdb8: 0x10bfdb8: lui   a0, 0xe0000
+L_10c0400:
+// 0x010c0400: 0x10c0400: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010bfdbc: 0x10bfdbc: j	 0x10bfe18 sw    v1, 29508(a0)
+// 0x010c0404: 0x10c0404: j	 0x10c0460 sw    v1, 29972(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7377
+	ldc.i4 7493
 	add
 	ldloc 7
 	stelem.i4
-	br L_10bfe18
+	br L_10c0460
 // --- basic block ---
-L_10bfdc4:
-// 0x010bfdc4: 0x10bfdc4: bne   a0, v0, 0x10bfe1c addiu s0, zero, 220
+L_10c040c:
+// 0x010c040c: 0x10c040c: bne   a0, v0, 0x10c0464 addiu s0, zero, 220
 	ldloc.1
 	ldloc 5
 	ldc.i4 220
 	stloc 8
-	bne.un L_10bfe1c
+	bne.un L_10c0464
 // --- basic block ---
-// 0x010bfdcc: 0x10bfdcc: addiu a2, zero, 220
+// 0x010c0414: 0x10c0414: addiu a2, zero, 220
 	ldc.i4 220
 	stloc.3
-// 0x010bfdd0: 0x10bfdd0: mult  v0, a2
+// 0x010c0418: 0x10c0418: mult  v0, a2
 	ldloc 5
 	ldloc.3
 	mul
 	stloc 14
-// 0x010bfdd4: 0x10bfdd4: lui   a2, 0xe0000
+// 0x010c041c: 0x10c041c: lui   a2, 0xe0000
 	ldc.i4 917504
 	stloc.3
-// 0x010bfdd8: 0x10bfdd8: addiu a2, a2, -14516
+// 0x010c0420: 0x10c0420: addiu a2, a2, -14052
 	ldloc.3
-	ldc.i4 -14516
+	ldc.i4 -14052
 	add
 	stloc.3
-// 0x010bfddc: 0x10bfddc: mflo  lo
+// 0x010c0424: 0x10c0424: mflo  lo
 	ldloc 14
 	stloc 4
-// 0x010bfde0: 0x10bfde0: addu  a2, a3, a2
+// 0x010c0428: 0x10c0428: addu  a2, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x010bfde4: 0x10bfde4: lw    a2, 0(a2)
+// 0x010c042c: 0x10c042c: lw    a2, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010bfde8: 0x10bfde8: sll   zero, zero, 0
-// 0x010bfdec: 0x10bfdec: bne   a1, a2, 0x10bfe20 mult  v0, s0
+// 0x010c0430: 0x10c0430: sll   zero, zero, 0
+// 0x010c0434: 0x10c0434: bne   a1, a2, 0x10c0468 mult  v0, s0
 	ldloc.2
 	ldloc.3
 	ldloc 5
 	ldloc 8
 	mul
 	stloc 14
-	bne.un L_10bfe20
+	bne.un L_10c0468
 // --- basic block ---
-// 0x010bfdf4: 0x10bfdf4: lw    v0, 0(s1)
+// 0x010c043c: 0x10c043c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bfdf8: 0x10bfdf8: sll   zero, zero, 0
-// 0x010bfdfc: 0x10bfdfc: slt   a1, v0, v1
+// 0x010c0440: 0x10c0440: sll   zero, zero, 0
+// 0x010c0444: 0x10c0444: slt   a1, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.2
-// 0x010bfe00: 0x10bfe00: beq   a1, zero, 0x10bfe0c sll   zero, zero, 0
+// 0x010c0448: 0x10c0448: beq   a1, zero, 0x10c0454 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10bfe0c
+	brfalse L_10c0454
 // --- basic block ---
-// 0x010bfe08: 0x10bfe08: addu  v1, v0, zero
+// 0x010c0450: 0x10c0450: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_10bfe0c:
-// 0x010bfe0c: 0x10bfe0c: lui   v0, 0xe0000
+L_10c0454:
+// 0x010c0454: 0x10c0454: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bfe10: 0x10bfe10: sw    v1, 29508(v0)
+// 0x010c0458: 0x10c0458: sw    v1, 29972(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7377
+	ldc.i4 7493
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bfe14: 0x10bfe14: addu  v0, a0, zero
+// 0x010c045c: 0x10c045c: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-L_10bfe18:
-// 0x010bfe18: 0x10bfe18: addiu s0, zero, 220
+L_10c0460:
+// 0x010c0460: 0x10c0460: addiu s0, zero, 220
 	ldc.i4 220
 	stloc 8
-L_10bfe1c:
-// 0x010bfe1c: 0x10bfe1c: mult  v0, s0
+L_10c0464:
+// 0x010c0464: 0x10c0464: mult  v0, s0
 	ldloc 5
 	ldloc 8
 	mul
 	stloc 14
-L_10bfe20:
-// 0x010bfe20: 0x10bfe20: lui   s0, 0xe0000
+L_10c0468:
+// 0x010c0468: 0x10c0468: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010bfe24: 0x10bfe24: addiu s0, s0, -14516
+// 0x010c046c: 0x10c046c: addiu s0, s0, -14052
 	ldloc 8
-	ldc.i4 -14516
+	ldc.i4 -14052
 	add
 	stloc 8
-// 0x010bfe28: 0x10bfe28: addiu v0, zero, 1
+// 0x010c0470: 0x10c0470: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010bfe2c: 0x10bfe2c: addu  a1, s3, zero
+// 0x010c0474: 0x10c0474: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x010bfe30: 0x10bfe30: addiu a2, zero, 20
+// 0x010c0478: 0x10c0478: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x010bfe34: 0x10bfe34: mflo  lo
+// 0x010c047c: 0x10c047c: mflo  lo
 	ldloc 14
 	stloc 7
-// 0x010bfe38: 0x10bfe38: addu  s0, s0, v1
+// 0x010c0480: 0x10c0480: addu  s0, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x010bfe3c: 0x10bfe3c: addiu v1, zero, -1000
+// 0x010c0484: 0x10c0484: addiu v1, zero, -1000
 	ldc.i4 -1000
 	stloc 7
-// 0x010bfe40: 0x10bfe40: sw    v1, 208(s0)
+// 0x010c0488: 0x10c0488: sw    v1, 208(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6918,15 +6918,15 @@ L_10bfe20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bfe44: 0x10bfe44: addiu v1, zero, -1
+// 0x010c048c: 0x10c048c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010bfe48: 0x10bfe48: addiu a0, s0, 4
+// 0x010c0490: 0x10c0490: addiu a0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc.1
-// 0x010bfe4c: 0x10bfe4c: sw    v1, 168(s0)
+// 0x010c0494: 0x10c0494: sw    v1, 168(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6935,7 +6935,7 @@ L_10bfe20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bfe50: 0x10bfe50: sw    v0, 160(s0)
+// 0x010c0498: 0x10c0498: sw    v0, 160(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6944,7 +6944,7 @@ L_10bfe20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bfe54: 0x10bfe54: jal   0x1001800 sw    v0, 212(s0)
+// 0x010c049c: 0x10c049c: jal   0x1001800 sw    v0, 212(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6962,24 +6962,24 @@ L_10bfe20:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bfe5c: 0x10bfe5c: lw    v0, 0(s1)
+// 0x010c04a4: 0x10c04a4: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010bfe60: 0x10bfe60: addiu a0, zero, 1
+// 0x010c04a8: 0x10c04a8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010bfe64: 0x10bfe64: sw    v0, 0(s0)
+// 0x010c04ac: 0x10c04ac: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010bfe68: 0x10bfe68: lw    v0, 12(s1)
+// 0x010c04b0: 0x10c04b0: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6988,7 +6988,7 @@ L_10bfe20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bfe6c: 0x10bfe6c: lw    v1, 4(s1)
+// 0x010c04b4: 0x10c04b4: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6997,7 +6997,7 @@ L_10bfe20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bfe70: 0x10bfe70: sw    v0, 128(s0)
+// 0x010c04b8: 0x10c04b8: sw    v0, 128(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7006,7 +7006,7 @@ L_10bfe20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bfe74: 0x10bfe74: lw    v0, 16(s1)
+// 0x010c04bc: 0x10c04bc: lw    v0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7015,7 +7015,7 @@ L_10bfe20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bfe78: 0x10bfe78: sw    v1, 152(s0)
+// 0x010c04c0: 0x10c04c0: sw    v1, 152(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7024,7 +7024,7 @@ L_10bfe20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bfe7c: 0x10bfe7c: sw    v0, 132(s0)
+// 0x010c04c4: 0x10c04c4: sw    v0, 132(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7033,7 +7033,7 @@ L_10bfe20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bfe80: 0x10bfe80: lw    v1, 20(s1)
+// 0x010c04c8: 0x10c04c8: lw    v1, 20(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7042,7 +7042,7 @@ L_10bfe20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bfe84: 0x10bfe84: lw    v0, 8(s1)
+// 0x010c04cc: 0x10c04cc: lw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7051,7 +7051,7 @@ L_10bfe20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bfe88: 0x10bfe88: sw    v1, 136(s0)
+// 0x010c04d0: 0x10c04d0: sw    v1, 136(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7060,7 +7060,7 @@ L_10bfe20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010bfe8c: 0x10bfe8c: lw    v1, 24(s1)
+// 0x010c04d4: 0x10c04d4: lw    v1, 24(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7069,7 +7069,7 @@ L_10bfe20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010bfe90: 0x10bfe90: sw    v0, 156(s0)
+// 0x010c04d8: 0x10c04d8: sw    v0, 156(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7078,12 +7078,12 @@ L_10bfe20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bfe94: 0x10bfe94: addiu a1, s0, 152
+// 0x010c04dc: 0x10c04dc: addiu a1, s0, 152
 	ldloc 8
 	ldc.i4 152
 	add
 	stloc.2
-// 0x010bfe98: 0x10bfe98: jal   0x10072a4 sw    v1, 140(s0)
+// 0x010c04e0: 0x10c04e0: jal   0x10072b4 sw    v1, 140(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7097,24 +7097,24 @@ L_10bfe20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010bfea0: 0x10bfea0: lui   v0, 0xe0000
+// 0x010c04e8: 0x10c04e8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bfea4: 0x10bfea4: lw    v0, 29484(v0)
+// 0x010c04ec: 0x10c04ec: lw    v0, 29948(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7371
+	ldc.i4 7487
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bfea8: 0x10bfea8: sw    s2, 24(s0)
+// 0x010c04f0: 0x10c04f0: sw    s2, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7123,7 +7123,7 @@ L_10bfe20:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010bfeac: 0x10bfeac: sw    v0, 216(s0)
+// 0x010c04f4: 0x10c04f4: sw    v0, 216(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7132,18 +7132,18 @@ L_10bfe20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bfeb0: 0x10bfeb0: j	 0x10bfebc addu  v0, zero, zero
+// 0x010c04f8: 0x10c04f8: j	 0x10c0504 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10bfebc
+	br L_10c0504
 // --- basic block ---
-L_10bfeb8:
-// 0x010bfeb8: 0x10bfeb8: addiu v0, zero, -1
+L_10c0500:
+// 0x010c0500: 0x10c0500: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10bfebc:
-// 0x010bfebc: 0x10bfebc: lw    ra, 36(sp)
-// 0x010bfec0: 0x10bfec0: lw    s3, 32(sp)
+L_10c0504:
+// 0x010c0504: 0x10c0504: lw    ra, 36(sp)
+// 0x010c0508: 0x10c0508: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7152,7 +7152,7 @@ L_10bfebc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010bfec4: 0x10bfec4: lw    s2, 28(sp)
+// 0x010c050c: 0x10c050c: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7161,7 +7161,7 @@ L_10bfebc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010bfec8: 0x10bfec8: lw    s1, 24(sp)
+// 0x010c0510: 0x10c0510: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7170,7 +7170,7 @@ L_10bfebc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010bfecc: 0x10bfecc: lw    s0, 20(sp)
+// 0x010c0514: 0x10c0514: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7179,7 +7179,7 @@ L_10bfebc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010bfed0: 0x10bfed0: jr    ra addiu sp, sp, 40
+// 0x010c0518: 0x10c0518: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl143.j b/converted/Cibyl143.j
index 37673c7..32a518c 100644
--- a/converted/Cibyl143.j
+++ b/converted/Cibyl143.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl143::.ctor
 
-.method public static int32 roadmap_label_start_10bfed8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_label_start_10c0520(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -79,27 +79,27 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bfed8: 0x10bfed8: lui   v0, 0xe0000
+// 0x010c0520: 0x10c0520: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bfedc: 0x10bfedc: addiu v0, v0, 29604
+// 0x010c0524: 0x10c0524: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x010bfee0: 0x10bfee0: lui   v1, 0xe0000
+// 0x010c0528: 0x10c0528: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010bfee4: 0x10bfee4: lw    a0, -14524(v1)
+// 0x010c052c: 0x10c052c: lw    a0, -14060(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3631
+	ldc.i4 -3515
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bfee8: 0x10bfee8: lw    a1, 56(v0)
+// 0x010c0530: 0x10c0530: lw    a1, 56(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -108,21 +108,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bfeec: 0x10bfeec: addiu sp, sp, -24
+// 0x010c0534: 0x10c0534: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010bfef0: 0x10bfef0: slt   a1, a1, a0
+// 0x010c0538: 0x10c0538: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x010bfef4: 0x10bfef4: bne   a1, zero, 0x10bff3c sw    ra, 20(sp)
+// 0x010c053c: 0x10c053c: bne   a1, zero, 0x10c0584 sw    ra, 20(sp)
 	ldloc.2
-	brtrue L_10bff3c
+	brtrue L_10c0584
 // --- basic block ---
-// 0x010bfefc: 0x10bfefc: lw    a1, 64(v0)
+// 0x010c0544: 0x10c0544: lw    a1, 64(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -131,21 +131,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010bff00: 0x10bff00: sll   zero, zero, 0
-// 0x010bff04: 0x10bff04: slt   a0, a0, a1
+// 0x010c0548: 0x10c0548: sll   zero, zero, 0
+// 0x010c054c: 0x10c054c: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.1
-// 0x010bff08: 0x10bff08: bne   a0, zero, 0x10bff3c addiu v1, v1, -14524
+// 0x010c0550: 0x10c0550: bne   a0, zero, 0x10c0584 addiu v1, v1, -14060
 	ldloc.1
 	ldloc 6
-	ldc.i4 -14524
+	ldc.i4 -14060
 	add
 	stloc 6
-	brtrue L_10bff3c
+	brtrue L_10c0584
 // --- basic block ---
-// 0x010bff10: 0x10bff10: lw    v1, 4(v1)
+// 0x010c0558: 0x10c0558: lw    v1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -154,7 +154,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bff14: 0x10bff14: lw    a0, 60(v0)
+// 0x010c055c: 0x10c055c: lw    a0, 60(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -163,17 +163,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010bff18: 0x10bff18: sll   zero, zero, 0
-// 0x010bff1c: 0x10bff1c: slt   a0, a0, v1
+// 0x010c0560: 0x10c0560: sll   zero, zero, 0
+// 0x010c0564: 0x10c0564: slt   a0, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x010bff20: 0x10bff20: bne   a0, zero, 0x10bff3c sll   zero, zero, 0
+// 0x010c0568: 0x10c0568: bne   a0, zero, 0x10c0584 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10bff3c
+	brtrue L_10c0584
 // --- basic block ---
-// 0x010bff28: 0x10bff28: lw    v0, 68(v0)
+// 0x010c0570: 0x10c0570: lw    v0, 68(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -182,164 +182,164 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bff2c: 0x10bff2c: sll   zero, zero, 0
-// 0x010bff30: 0x10bff30: slt   v1, v1, v0
+// 0x010c0574: 0x10c0574: sll   zero, zero, 0
+// 0x010c0578: 0x10c0578: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x010bff34: 0x10bff34: beq   v1, zero, 0x10bff48 lui   a0, 0xe0000
+// 0x010c057c: 0x10c057c: beq   v1, zero, 0x10c0590 lui   a0, 0xe0000
 	ldloc 6
 	ldc.i4 917504
 	stloc.1
-	brfalse L_10bff48
+	brfalse L_10c0590
 // --- basic block ---
-L_10bff3c:
-// 0x010bff3c: 0x10bff3c: lui   v0, 0xe0000
+L_10c0584:
+// 0x010c0584: 0x10c0584: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bff40: 0x10bff40: sw    zero, -14528(v0)
+// 0x010c0588: 0x10c0588: sw    zero, -14064(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3632
+	ldc.i4 -3516
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bff44: 0x10bff44: lui   a0, 0xe0000
+// 0x010c058c: 0x10c058c: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-L_10bff48:
-// 0x010bff48: 0x10bff48: lui   a1, 0xe0000
+L_10c0590:
+// 0x010c0590: 0x10c0590: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010bff4c: 0x10bff4c: addiu a0, a0, -14524
+// 0x010c0594: 0x10c0594: addiu a0, a0, -14060
 	ldloc.1
-	ldc.i4 -14524
+	ldc.i4 -14060
 	add
 	stloc.1
-// 0x010bff50: 0x10bff50: jal   0x100844c addiu a1, a1, 29484
+// 0x010c0598: 0x10c0598: jal   0x100845c addiu a1, a1, 29948
 	ldloc.2
-	ldc.i4 29484
+	ldc.i4 29948
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010bff58: 0x10bff58: lui   v0, 0xf0000
+// 0x010c05a0: 0x10c05a0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010bff5c: 0x10bff5c: lw    v0, -30072(v0)
+// 0x010c05a4: 0x10c05a4: lw    v0, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x010bff60: 0x10bff60: addiu v1, zero, 75
+// 0x010c05a8: 0x10c05a8: addiu v1, zero, 75
 	ldc.i4.s 75
 	stloc 6
-// 0x010bff64: 0x10bff64: div   v0, v1
+// 0x010c05ac: 0x10c05ac: div   v0, v1
 	ldloc 5
 	ldloc 6
 	div
 	stloc 9
-// 0x010bff68: 0x10bff68: lui   v1, 0xf0000
+// 0x010c05b0: 0x10c05b0: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010bff6c: 0x10bff6c: lw    v1, -30068(v1)
+// 0x010c05b4: 0x10c05b4: lw    v1, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 6
-// 0x010bff70: 0x10bff70: addiu v0, v0, -30
+// 0x010c05b8: 0x10c05b8: addiu v0, v0, -30
 	ldloc 5
 	ldc.i4.s -30
 	add
 	stloc 5
-// 0x010bff74: 0x10bff74: lui   a0, 0xe0000
+// 0x010c05bc: 0x10c05bc: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x010bff78: 0x10bff78: addiu v1, v1, -30
+// 0x010c05c0: 0x10c05c0: addiu v1, v1, -30
 	ldloc 6
 	ldc.i4.s -30
 	add
 	stloc 6
-// 0x010bff7c: 0x10bff7c: sw    v0, 29500(a0)
+// 0x010c05c4: 0x10c05c4: sw    v0, 29964(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7375
+	ldc.i4 7491
 	add
 	ldloc 5
 	stelem.i4
-// 0x010bff80: 0x10bff80: lui   v0, 0xe0000
+// 0x010c05c8: 0x10c05c8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bff84: 0x10bff84: sw    v1, 29504(v0)
+// 0x010c05cc: 0x10c05cc: sw    v1, 29968(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7376
+	ldc.i4 7492
 	add
 	ldloc 6
 	stelem.i4
-// 0x010bff88: 0x10bff88: lui   v0, 0xe0000
+// 0x010c05d0: 0x10c05d0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bff8c: 0x10bff8c: sw    zero, -14528(v0)
+// 0x010c05d4: 0x10c05d4: sw    zero, -14064(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3632
+	ldc.i4 -3516
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bff90: 0x10bff90: lw    ra, 20(sp)
-// 0x010bff94: 0x10bff94: lui   v0, 0xe0000
+// 0x010c05d8: 0x10c05d8: lw    ra, 20(sp)
+// 0x010c05dc: 0x10c05dc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bff98: 0x10bff98: sw    zero, 29508(v0)
+// 0x010c05e0: 0x10c05e0: sw    zero, 29972(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7377
+	ldc.i4 7493
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010bff9c: 0x10bff9c: lui   v0, 0xe0000
+// 0x010c05e4: 0x10c05e4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010bffa0: 0x10bffa0: addiu sp, sp, 24
+// 0x010c05e8: 0x10c05e8: addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
-// 0x010bffa4: 0x10bffa4: mflo  lo
+// 0x010c05ec: 0x10c05ec: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x010bffa8: 0x10bffa8: jr    ra sw    v1, 29496(v0)
+// 0x010c05f0: 0x10c05f0: jr    ra sw    v1, 29960(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7374
+	ldc.i4 7490
 	add
 	ldloc 6
 	stelem.i4
@@ -350,7 +350,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_label_draw_text_10bffb0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_label_draw_text_10c05f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -385,25 +385,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010bffb0: 0x10bffb0: addiu sp, sp, -32
+// 0x010c05f8: 0x10c05f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010bffb4: 0x10bffb4: addu  v0, a0, zero
+// 0x010c05fc: 0x10c05fc: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010bffb8: 0x10bffb8: sw    ra, 28(sp)
-// 0x010bffbc: 0x10bffbc: beq   a3, zero, 0x10bffe0 addu  a0, a1, zero
+// 0x010c0600: 0x10c0600: sw    ra, 28(sp)
+// 0x010c0604: 0x10c0604: beq   a3, zero, 0x10c0628 addu  a0, a1, zero
 	ldloc 4
 	ldloc.2
 	stloc.1
-	brfalse L_10bffe0
+	brfalse L_10c0628
 // --- basic block ---
-// 0x010bffc4: 0x10bffc4: addu  a1, a2, zero
+// 0x010c060c: 0x10c060c: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x010bffc8: 0x10bffc8: lw    a3, 52(sp)
+// 0x010c0610: 0x10c0610: lw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -412,7 +412,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010bffcc: 0x10bffcc: lw    a2, 48(sp)
+// 0x010c0614: 0x10c0614: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -421,7 +421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010bffd0: 0x10bffd0: jal   0x104e86c sw    v0, 16(sp)
+// 0x010c0618: 0x10c0618: jal   0x104e87c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -435,22 +435,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_angle_104e86c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_angle_104e87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010bffd8: 0x10bffd8: j	 0x10bfff0 sll   zero, zero, 0
-	br L_10bfff0
+// 0x010c0620: 0x10c0620: j	 0x10c0638 sll   zero, zero, 0
+	br L_10c0638
 // --- basic block ---
-L_10bffe0:
-// 0x010bffe0: 0x10bffe0: addu  a0, a2, zero
+L_10c0628:
+// 0x010c0628: 0x10c0628: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010bffe4: 0x10bffe4: addiu a1, zero, 4
+// 0x010c062c: 0x10c062c: addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
-// 0x010bffe8: 0x10bffe8: jal   0x104ebfc addu  a2, v0, zero
+// 0x010c0630: 0x10c0630: jal   0x104ec0c addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -458,15 +458,15 @@ L_10bffe0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_104ebfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_104ec0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10bfff0:
-// 0x010bfff0: 0x10bfff0: lw    ra, 28(sp)
-// 0x010bfff4: 0x10bfff4: sll   zero, zero, 0
-// 0x010bfff8: 0x10bfff8: jr    ra addiu sp, sp, 32
+L_10c0638:
+// 0x010c0638: 0x10c0638: lw    ra, 28(sp)
+// 0x010c063c: 0x10c063c: sll   zero, zero, 0
+// 0x010c0640: 0x10c0640: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -478,7 +478,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_label_draw_cache_10c0034(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_label_draw_cache_10c067c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 t0,int32 s8,int32 t2,int32 lo,int32 s2,int32 t1,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -552,15 +552,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0034: 0x10c0034: addiu sp, sp, -120
+// 0x010c067c: 0x10c067c: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x010c0038: 0x10c0038: lui   v0, 0xe0000
+// 0x010c0680: 0x10c0680: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010c003c: 0x10c003c: sw    s8, 112(sp)
+// 0x010c0684: 0x10c0684: sw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -569,19 +569,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c0040: 0x10c0040: addu  s8, a0, zero
+// 0x010c0688: 0x10c0688: addu  s8, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010c0044: 0x10c0044: lw    a0, 29488(v0)
+// 0x010c068c: 0x10c068c: lw    a0, 29952(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7372
+	ldc.i4 7488
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c0048: 0x10c0048: sw    s0, 80(sp)
+// 0x010c0690: 0x10c0690: sw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -590,10 +590,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c004c: 0x10c004c: lui   s0, 0xe0000
+// 0x010c0694: 0x10c0694: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x010c0050: 0x10c0050: sw    s7, 108(sp)
+// 0x010c0698: 0x10c0698: sw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -602,7 +602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010c0054: 0x10c0054: sw    s6, 104(sp)
+// 0x010c069c: 0x10c069c: sw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -611,7 +611,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010c0058: 0x10c0058: sw    s5, 100(sp)
+// 0x010c06a0: 0x10c06a0: sw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -620,7 +620,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010c005c: 0x10c005c: sw    s3, 92(sp)
+// 0x010c06a4: 0x10c06a4: sw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -629,7 +629,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010c0060: 0x10c0060: sw    s2, 88(sp)
+// 0x010c06a8: 0x10c06a8: sw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -638,7 +638,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010c0064: 0x10c0064: sw    s1, 84(sp)
+// 0x010c06ac: 0x10c06ac: sw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -647,8 +647,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010c0068: 0x10c0068: sw    ra, 116(sp)
-// 0x010c006c: 0x10c006c: sw    s4, 96(sp)
+// 0x010c06b0: 0x10c06b0: sw    ra, 116(sp)
+// 0x010c06b4: 0x10c06b4: sw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -657,7 +657,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010c0070: 0x10c0070: jal   0x104e35c addu  s3, zero, zero
+// 0x010c06b8: 0x10c06b8: jal   0x104e36c addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 16
 	ldloc.0
@@ -665,35 +665,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c0078: 0x10c0078: addiu s0, s0, -14516
+// 0x010c06c0: 0x10c06c0: addiu s0, s0, -14052
 	ldloc 8
-	ldc.i4 -14516
+	ldc.i4 -14052
 	add
 	stloc 8
-// 0x010c007c: 0x10c007c: addu  s2, zero, zero
+// 0x010c06c4: 0x10c06c4: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010c0080: 0x10c0080: lui   s7, 0xe0000
+// 0x010c06c8: 0x10c06c8: lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 20
-// 0x010c0084: 0x10c0084: lui   s6, 0x0
+// 0x010c06cc: 0x10c06cc: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 19
-// 0x010c0088: 0x10c0088: lui   s5, 0xe0000
+// 0x010c06d0: 0x10c06d0: lui   s5, 0xe0000
 	ldc.i4 917504
 	stloc 18
-// 0x010c008c: 0x10c008c: j	 0x10c066c addiu s1, zero, 2
+// 0x010c06d4: 0x10c06d4: j	 0x10c0cb4 addiu s1, zero, 2
 	ldc.i4.2
 	stloc 15
-	br L_10c066c
+	br L_10c0cb4
 // --- basic block ---
-L_10c0094:
-// 0x010c0094: 0x10c0094: lw    v0, 212(s0)
+L_10c06dc:
+// 0x010c06dc: 0x10c06dc: lw    v0, 212(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -702,17 +702,17 @@ L_10c0094:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0098: 0x10c0098: sll   zero, zero, 0
-// 0x010c009c: 0x10c009c: andi  v0, v0, 4
+// 0x010c06e0: 0x10c06e0: sll   zero, zero, 0
+// 0x010c06e4: 0x10c06e4: andi  v0, v0, 4
 	ldloc 6
 	ldc.i4.4
 	and
 	stloc 6
-// 0x010c00a0: 0x10c00a0: bne   v0, zero, 0x10c00ec sll   zero, zero, 0
+// 0x010c06e8: 0x10c06e8: bne   v0, zero, 0x10c0734 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10c00ec
+	brtrue L_10c0734
 // --- basic block ---
-// 0x010c00a8: 0x10c00a8: lw    a0, 16(s0)
+// 0x010c06f0: 0x10c06f0: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -721,7 +721,7 @@ L_10c0094:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c00ac: 0x10c00ac: lw    v0, 576(s6)
+// 0x010c06f4: 0x10c06f4: lw    v0, 576(s6)
 	ldloc 5
 	ldloc 19
 	ldc.i4.2
@@ -730,30 +730,30 @@ L_10c0094:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c00b0: 0x10c00b0: sll   zero, zero, 0
-// 0x010c00b4: 0x10c00b4: beq   a0, v0, 0x10c00cc sll   zero, zero, 0
+// 0x010c06f8: 0x10c06f8: sll   zero, zero, 0
+// 0x010c06fc: 0x10c06fc: beq   a0, v0, 0x10c0714 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10c00cc
+	beq  L_10c0714
 // --- basic block ---
-// 0x010c00bc: 0x10c00bc: bltz  a0, 0x10c00cc sll   zero, zero, 0
+// 0x010c0704: 0x10c0704: bltz  a0, 0x10c0714 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10c00cc
+	blt L_10c0714
 // --- basic block ---
-// 0x010c00c4: 0x10c00c4: jal   0x100b164 sll   zero, zero, 0
+// 0x010c070c: 0x10c070c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10c00cc:
-// 0x010c00cc: 0x10c00cc: lw    a0, 24(s0)
+L_10c0714:
+// 0x010c0714: 0x10c0714: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -762,12 +762,12 @@ L_10c00cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c00d0: 0x10c00d0: addiu a1, s0, 28
+// 0x010c0718: 0x10c0718: addiu a1, s0, 28
 	ldloc 8
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x010c00d4: 0x10c00d4: jal   0x1011418 addiu a2, zero, 100
+// 0x010c071c: 0x10c071c: jal   0x1011428 addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.0
@@ -775,12 +775,12 @@ L_10c00cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_from_id_safe_1011418(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_from_id_safe_1011428(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c00dc: 0x10c00dc: lw    v0, 212(s0)
+// 0x010c0724: 0x10c0724: lw    v0, 212(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -789,13 +789,13 @@ L_10c00cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c00e0: 0x10c00e0: sll   zero, zero, 0
-// 0x010c00e4: 0x10c00e4: ori   v0, v0, 4
+// 0x010c0728: 0x10c0728: sll   zero, zero, 0
+// 0x010c072c: 0x10c072c: ori   v0, v0, 4
 	ldloc 6
 	ldc.i4.4
 	or
 	stloc 6
-// 0x010c00e8: 0x10c00e8: sw    v0, 212(s0)
+// 0x010c0730: 0x10c0730: sw    v0, 212(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -804,37 +804,37 @@ L_10c00cc:
 	add
 	ldloc 6
 	stelem.i4
-L_10c00ec:
-// 0x010c00ec: 0x10c00ec: lb    v0, 28(s0)
+L_10c0734:
+// 0x010c0734: 0x10c0734: lb    v0, 28(s0)
 	ldloc 8
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c00f0: 0x10c00f0: sll   zero, zero, 0
-// 0x010c00f4: 0x10c00f4: beq   v0, zero, 0x10c0664 lui   v1, 0xe0000
+// 0x010c0738: 0x10c0738: sll   zero, zero, 0
+// 0x010c073c: 0x10c073c: beq   v0, zero, 0x10c0cac lui   v1, 0xe0000
 	ldloc 6
 	ldc.i4 917504
 	stloc 7
-	brfalse L_10c0664
+	brfalse L_10c0cac
 // --- basic block ---
-// 0x010c00fc: 0x10c00fc: addiu s4, s0, 28
+// 0x010c0744: 0x10c0744: addiu s4, s0, 28
 	ldloc 8
 	ldc.i4.s 28
 	add
 	stloc 17
-// 0x010c0100: 0x10c0100: addiu v1, v1, -14516
+// 0x010c0748: 0x10c0748: addiu v1, v1, -14052
 	ldloc 7
-	ldc.i4 -14516
+	ldc.i4 -14052
 	add
 	stloc 7
-// 0x010c0104: 0x10c0104: j	 0x10c0174 addu  a2, zero, zero
+// 0x010c074c: 0x10c074c: j	 0x10c07bc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_10c0174
+	br L_10c07bc
 // --- basic block ---
-L_10c010c:
-// 0x010c010c: 0x10c010c: lw    v0, 212(v1)
+L_10c0754:
+// 0x010c0754: 0x10c0754: lw    v0, 212(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -843,21 +843,21 @@ L_10c010c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0110: 0x10c0110: sll   zero, zero, 0
-// 0x010c0114: 0x10c0114: andi  v0, v0, 16
+// 0x010c0758: 0x10c0758: sll   zero, zero, 0
+// 0x010c075c: 0x10c075c: andi  v0, v0, 16
 	ldloc 6
 	ldc.i4.s 16
 	and
 	stloc 6
-// 0x010c0118: 0x10c0118: beq   v0, zero, 0x10c0170 addiu a2, a2, 1
+// 0x010c0760: 0x10c0760: beq   v0, zero, 0x10c07b8 addiu a2, a2, 1
 	ldloc 6
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-	brfalse L_10c0170
+	brfalse L_10c07b8
 // --- basic block ---
-// 0x010c0120: 0x10c0120: lw    v0, 16(v1)
+// 0x010c0768: 0x10c0768: lw    v0, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -866,7 +866,7 @@ L_10c010c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0124: 0x10c0124: lw    a3, 16(s0)
+// 0x010c076c: 0x10c076c: lw    a3, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -875,19 +875,19 @@ L_10c010c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c0128: 0x10c0128: addiu a1, v1, 28
+// 0x010c0770: 0x10c0770: addiu a1, v1, 28
 	ldloc 7
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x010c012c: 0x10c012c: bne   a3, v0, 0x10c0154 addu  a0, s4, zero
+// 0x010c0774: 0x10c0774: bne   a3, v0, 0x10c079c addu  a0, s4, zero
 	ldloc 4
 	ldloc 6
 	ldloc 17
 	stloc.1
-	bne.un L_10c0154
+	bne.un L_10c079c
 // --- basic block ---
-// 0x010c0134: 0x10c0134: lw    v0, 24(v1)
+// 0x010c077c: 0x10c077c: lw    v0, 24(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -896,7 +896,7 @@ L_10c010c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0138: 0x10c0138: lw    a0, 24(s0)
+// 0x010c0780: 0x10c0780: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -905,30 +905,30 @@ L_10c010c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c013c: 0x10c013c: sll   zero, zero, 0
-// 0x010c0140: 0x10c0140: bne   a0, v0, 0x10c0174 addiu v1, v1, 220
+// 0x010c0784: 0x10c0784: sll   zero, zero, 0
+// 0x010c0788: 0x10c0788: bne   a0, v0, 0x10c07bc addiu v1, v1, 220
 	ldloc.1
 	ldloc 6
 	ldloc 7
 	ldc.i4 220
 	add
 	stloc 7
-	bne.un L_10c0174
+	bne.un L_10c07bc
 // --- basic block ---
-// 0x010c0148: 0x10c0148: addiu v1, v1, -220
+// 0x010c0790: 0x10c0790: addiu v1, v1, -220
 	ldloc 7
 	ldc.i4 -220
 	add
 	stloc 7
-// 0x010c014c: 0x10c014c: j	 0x10c0668 addiu s2, s2, 1
+// 0x010c0794: 0x10c0794: j	 0x10c0cb0 addiu s2, s2, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	br L_10c0668
+	br L_10c0cb0
 // --- basic block ---
-L_10c0154:
-// 0x010c0154: 0x10c0154: sw    v1, 72(sp)
+L_10c079c:
+// 0x010c079c: 0x10c079c: sw    v1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -937,7 +937,7 @@ L_10c0154:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c0158: 0x10c0158: jal   0x1001b14 sw    a2, 56(sp)
+// 0x010c07a0: 0x10c07a0: jal   0x1001b14 sw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -951,7 +951,7 @@ L_10c0154:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010c0160: 0x10c0160: lw    v1, 72(sp)
+// 0x010c07a8: 0x10c07a8: lw    v1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -960,7 +960,7 @@ L_10c0154:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c0164: 0x10c0164: lw    a2, 56(sp)
+// 0x010c07ac: 0x10c07ac: lw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -969,34 +969,34 @@ L_10c0154:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c0168: 0x10c0168: beq   v0, zero, 0x10c0664 sll   zero, zero, 0
+// 0x010c07b0: 0x10c07b0: beq   v0, zero, 0x10c0cac sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10c0664
+	brfalse L_10c0cac
 // --- basic block ---
-L_10c0170:
-// 0x010c0170: 0x10c0170: addiu v1, v1, 220
+L_10c07b8:
+// 0x010c07b8: 0x10c07b8: addiu v1, v1, 220
 	ldloc 7
 	ldc.i4 220
 	add
 	stloc 7
-L_10c0174:
-// 0x010c0174: 0x10c0174: slt   v0, a2, s2
+L_10c07bc:
+// 0x010c07bc: 0x10c07bc: slt   v0, a2, s2
 	ldloc.3
 	ldloc 13
 	clt
 	stloc 6
-// 0x010c0178: 0x10c0178: bne   v0, zero, 0x10c010c sll   zero, zero, 0
+// 0x010c07c0: 0x10c07c0: bne   v0, zero, 0x10c0754 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10c010c
+	brtrue L_10c0754
 // --- basic block ---
-// 0x010c0180: 0x10c0180: bne   a2, s2, 0x10c0664 addiu v1, zero, -1000
+// 0x010c07c8: 0x10c07c8: bne   a2, s2, 0x10c0cac addiu v1, zero, -1000
 	ldloc.3
 	ldloc 13
 	ldc.i4 -1000
 	stloc 7
-	bne.un L_10c0664
+	bne.un L_10c0cac
 // --- basic block ---
-// 0x010c0188: 0x10c0188: lw    v0, 208(s0)
+// 0x010c07d0: 0x10c07d0: lw    v0, 208(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1005,17 +1005,17 @@ L_10c0174:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c018c: 0x10c018c: sll   zero, zero, 0
-// 0x010c0190: 0x10c0190: bne   v0, v1, 0x10c01e8 addiu a0, s0, 128
+// 0x010c07d4: 0x10c07d4: sll   zero, zero, 0
+// 0x010c07d8: 0x10c07d8: bne   v0, v1, 0x10c0830 addiu a0, s0, 128
 	ldloc 6
 	ldloc 7
 	ldloc 8
 	ldc.i4 128
 	add
 	stloc.1
-	bne.un L_10c01e8
+	bne.un L_10c0830
 // --- basic block ---
-// 0x010c0198: 0x10c0198: jal   0x1009824 addiu a1, s0, 136
+// 0x010c07e0: 0x10c07e0: jal   0x1009834 addiu a1, s0, 136
 	ldloc 8
 	ldc.i4 136
 	add
@@ -1025,12 +1025,12 @@ L_10c0174:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c01a0: 0x10c01a0: jal   0x1007a4c sw    v0, 72(sp)
+// 0x010c07e8: 0x10c07e8: jal   0x1007a5c sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1039,10 +1039,10 @@ L_10c0174:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_get_orientation_1007a4c()
+	call int32 Cibyl5::roadmap_math_get_orientation_1007a5c()
 	stloc 6
 // --- basic block ---
-// 0x010c01a8: 0x10c01a8: lw    v1, 72(sp)
+// 0x010c07f0: 0x10c07f0: lw    v1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1051,67 +1051,67 @@ L_10c0174:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c01ac: 0x10c01ac: sll   zero, zero, 0
-// 0x010c01b0: 0x10c01b0: addu  v1, v0, v1
+// 0x010c07f4: 0x10c07f4: sll   zero, zero, 0
+// 0x010c07f8: 0x10c07f8: addu  v1, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-L_10c01b4:
-// 0x010c01b4: 0x10c01b4: slti  v0, v1, 361
+L_10c07fc:
+// 0x010c07fc: 0x10c07fc: slti  v0, v1, 361
 	ldloc 7
 	ldc.i4 361
 	clt
 	stloc 6
-// 0x010c01b8: 0x10c01b8: beq   v0, zero, 0x10c01b4 addiu v1, v1, -360
+// 0x010c0800: 0x10c0800: beq   v0, zero, 0x10c07fc addiu v1, v1, -360
 	ldloc 6
 	ldloc 7
 	ldc.i4 -360
 	add
 	stloc 7
-	brfalse L_10c01b4
+	brfalse L_10c07fc
 // --- basic block ---
-// 0x010c01c0: 0x10c01c0: addiu v1, v1, 360
+// 0x010c0808: 0x10c0808: addiu v1, v1, 360
 	ldloc 7
 	ldc.i4 360
 	add
 	stloc 7
-L_10c01c4:
-// 0x010c01c4: 0x10c01c4: bltz  v1, 0x10c01c4 addiu v1, v1, 360
+L_10c080c:
+// 0x010c080c: 0x10c080c: bltz  v1, 0x10c080c addiu v1, v1, 360
 	ldloc 7
 	ldloc 7
 	ldc.i4 360
 	add
 	stloc 7
 	ldc.i4.s 0
-	blt L_10c01c4
+	blt L_10c080c
 // --- basic block ---
-// 0x010c01cc: 0x10c01cc: addiu v1, v1, -360
+// 0x010c0814: 0x10c0814: addiu v1, v1, -360
 	ldloc 7
 	ldc.i4 -360
 	add
 	stloc 7
-// 0x010c01d0: 0x10c01d0: slti  v0, v1, 180
+// 0x010c0818: 0x10c0818: slti  v0, v1, 180
 	ldloc 7
 	ldc.i4 180
 	clt
 	stloc 6
-// 0x010c01d4: 0x10c01d4: bne   v0, zero, 0x10c01e0 sll   zero, zero, 0
+// 0x010c081c: 0x10c081c: bne   v0, zero, 0x10c0828 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10c01e0
+	brtrue L_10c0828
 // --- basic block ---
-// 0x010c01dc: 0x10c01dc: addiu v1, v1, -180
+// 0x010c0824: 0x10c0824: addiu v1, v1, -180
 	ldloc 7
 	ldc.i4 -180
 	add
 	stloc 7
-L_10c01e0:
-// 0x010c01e0: 0x10c01e0: addiu v1, v1, -90
+L_10c0828:
+// 0x010c0828: 0x10c0828: addiu v1, v1, -90
 	ldloc 7
 	ldc.i4.s -90
 	add
 	stloc 7
-// 0x010c01e4: 0x10c01e4: sw    v1, 208(s0)
+// 0x010c082c: 0x10c082c: sw    v1, 208(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1120,8 +1120,8 @@ L_10c01e0:
 	add
 	ldloc 7
 	stelem.i4
-L_10c01e8:
-// 0x010c01e8: 0x10c01e8: lw    v1, 160(s0)
+L_10c0830:
+// 0x010c0830: 0x10c0830: lw    v1, 160(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1130,7 +1130,7 @@ L_10c01e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c01ec: 0x10c01ec: lw    v0, 168(s0)
+// 0x010c0834: 0x10c0834: lw    v0, 168(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1139,42 +1139,42 @@ L_10c01e8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c01f0: 0x10c01f0: sll   zero, zero, 0
-// 0x010c01f4: 0x10c01f4: slt   v0, v0, v1
+// 0x010c0838: 0x10c0838: sll   zero, zero, 0
+// 0x010c083c: 0x10c083c: slt   v0, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x010c01f8: 0x10c01f8: beq   v0, zero, 0x10c0548 addiu t2, sp, 32
+// 0x010c0840: 0x10c0840: beq   v0, zero, 0x10c0b90 addiu t2, sp, 32
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 11
-	brfalse L_10c0548
+	brfalse L_10c0b90
 // --- basic block ---
-// 0x010c0200: 0x10c0200: addiu v0, sp, 36
+// 0x010c0848: 0x10c0848: addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 6
-// 0x010c0204: 0x10c0204: addu  a0, s4, zero
+// 0x010c084c: 0x10c084c: addu  a0, s4, zero
 	ldloc 17
 	stloc.1
-// 0x010c0208: 0x10c0208: addiu a1, zero, 12
+// 0x010c0850: 0x10c0850: addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.2
-// 0x010c020c: 0x10c020c: addiu a2, sp, 24
+// 0x010c0854: 0x10c0854: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010c0210: 0x10c0210: addiu a3, sp, 28
+// 0x010c0858: 0x10c0858: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010c0214: 0x10c0214: sw    t2, 16(sp)
+// 0x010c085c: 0x10c085c: sw    t2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1183,7 +1183,7 @@ L_10c01e8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c0218: 0x10c0218: jal   0x104e968 sw    v0, 20(sp)
+// 0x010c0860: 0x10c0860: jal   0x104e978 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1197,16 +1197,16 @@ L_10c01e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c0220: 0x10c0220: beq   s8, zero, 0x10c0234 sll   zero, zero, 0
+// 0x010c0868: 0x10c0868: beq   s8, zero, 0x10c087c sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10c0234
+	brfalse L_10c087c
 // --- basic block ---
-// 0x010c0228: 0x10c0228: lw    s8, 36(sp)
+// 0x010c0870: 0x10c0870: lw    s8, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1215,14 +1215,14 @@ L_10c01e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c022c: 0x10c022c: sll   zero, zero, 0
-// 0x010c0230: 0x10c0230: sltu  s8, zero, s8
+// 0x010c0874: 0x10c0874: sll   zero, zero, 0
+// 0x010c0878: 0x10c0878: sltu  s8, zero, s8
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 10
-L_10c0234:
-// 0x010c0234: 0x10c0234: lw    v1, 24(sp)
+L_10c087c:
+// 0x010c087c: 0x10c087c: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1231,48 +1231,48 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c0238: 0x10c0238: addiu a1, zero, 256
+// 0x010c0880: 0x10c0880: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010c023c: 0x10c023c: mult  v1, v1
+// 0x010c0884: 0x10c0884: mult  v1, v1
 	ldloc 7
 	ldloc 7
 	mul
 	stloc 12
-// 0x010c0240: 0x10c0240: lw    v0, 0(s0)
+// 0x010c0888: 0x10c0888: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010c0244: 0x10c0244: mflo  lo
+// 0x010c088c: 0x10c088c: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x010c0248: 0x10c0248: sll   zero, zero, 0
-// 0x010c024c: 0x10c024c: sll   zero, zero, 0
-// 0x010c0250: 0x10c0250: div   a0, a1
+// 0x010c0890: 0x10c0890: sll   zero, zero, 0
+// 0x010c0894: 0x10c0894: sll   zero, zero, 0
+// 0x010c0898: 0x10c0898: div   a0, a1
 	ldloc.1
 	ldloc.2
 	div
 	stloc 12
-// 0x010c0254: 0x10c0254: mflo  lo
+// 0x010c089c: 0x10c089c: mflo  lo
 	ldloc 12
 	stloc 11
-// 0x010c0258: 0x10c0258: slt   v0, v0, t2
+// 0x010c08a0: 0x10c08a0: slt   v0, v0, t2
 	ldloc 6
 	ldloc 11
 	clt
 	stloc 6
-// 0x010c025c: 0x10c025c: bne   v0, zero, 0x10c0664 addiu v0, v1, 1
+// 0x010c08a4: 0x10c08a4: bne   v0, zero, 0x10c0cac addiu v0, v1, 1
 	ldloc 6
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_10c0664
+	brtrue L_10c0cac
 // --- basic block ---
-// 0x010c0264: 0x10c0264: lw    a0, 32(sp)
+// 0x010c08ac: 0x10c08ac: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1281,7 +1281,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c0268: 0x10c0268: lw    t0, 28(sp)
+// 0x010c08b0: 0x10c08b0: lw    t0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1290,31 +1290,31 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c026c: 0x10c026c: sll   zero, zero, 0
-// 0x010c0270: 0x10c0270: addu  t0, t0, a0
+// 0x010c08b4: 0x10c08b4: sll   zero, zero, 0
+// 0x010c08b8: 0x10c08b8: addu  t0, t0, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc 9
-// 0x010c0274: 0x10c0274: beq   s8, zero, 0x10c04f8 addiu a3, t0, 1
+// 0x010c08bc: 0x10c08bc: beq   s8, zero, 0x10c0b40 addiu a3, t0, 1
 	ldloc 10
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 4
-	brfalse L_10c04f8
+	brfalse L_10c0b40
 // --- basic block ---
-// 0x010c027c: 0x10c027c: div   a3, s1
+// 0x010c08c4: 0x10c08c4: div   a3, s1
 	ldloc 4
 	ldloc 15
 	div
 	stloc 12
-// 0x010c0280: 0x10c0280: addiu a0, s0, 152
+// 0x010c08c8: 0x10c08c8: addiu a0, s0, 152
 	ldloc 8
 	ldc.i4 152
 	add
 	stloc.1
-// 0x010c0284: 0x10c0284: lw    s8, 208(s0)
+// 0x010c08cc: 0x10c08cc: lw    s8, 208(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1323,7 +1323,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c0288: 0x10c0288: sw    a0, 48(sp)
+// 0x010c08d0: 0x10c08d0: sw    a0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1332,7 +1332,7 @@ L_10c0234:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010c028c: 0x10c028c: lw    a1, 48(sp)
+// 0x010c08d4: 0x10c08d4: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1341,20 +1341,20 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c0290: 0x10c0290: addiu t1, s0, 176
+// 0x010c08d8: 0x10c08d8: addiu t1, s0, 176
 	ldloc 8
 	ldc.i4 176
 	add
 	stloc 14
-// 0x010c0294: 0x10c0294: addiu a0, sp, 40
+// 0x010c08dc: 0x10c08dc: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010c0298: 0x10c0298: addu  a2, s8, zero
+// 0x010c08e0: 0x10c08e0: addu  a2, s8, zero
 	ldloc 10
 	stloc.3
-// 0x010c029c: 0x10c029c: sw    v1, 72(sp)
+// 0x010c08e4: 0x10c08e4: sw    v1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1363,7 +1363,7 @@ L_10c0234:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c02a0: 0x10c02a0: sw    t0, 60(sp)
+// 0x010c08e8: 0x10c08e8: sw    t0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1372,7 +1372,7 @@ L_10c0234:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c02a4: 0x10c02a4: sw    t1, 56(sp)
+// 0x010c08ec: 0x10c08ec: sw    t1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1381,14 +1381,14 @@ L_10c0234:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010c02a8: 0x10c02a8: mflo  lo
+// 0x010c08f0: 0x10c08f0: mflo  lo
 	ldloc 12
 	stloc 4
-// 0x010c02ac: 0x10c02ac: subu  t2, zero, a3
+// 0x010c08f4: 0x10c08f4: subu  t2, zero, a3
 	ldloc 4
 	neg
 	stloc 11
-// 0x010c02b0: 0x10c02b0: sw    t2, 44(sp)
+// 0x010c08f8: 0x10c08f8: sw    t2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1397,17 +1397,17 @@ L_10c0234:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c02b4: 0x10c02b4: div   v0, s1
+// 0x010c08fc: 0x10c08fc: div   v0, s1
 	ldloc 6
 	ldloc 15
 	div
 	stloc 12
-// 0x010c02b8: 0x10c02b8: nor   t2, zero, a3
+// 0x010c0900: 0x10c0900: nor   t2, zero, a3
 	ldloc 4
 	ldc.i4.m1
 	xor
 	stloc 11
-// 0x010c02bc: 0x10c02bc: sw    a3, 64(sp)
+// 0x010c0904: 0x10c0904: sw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1416,7 +1416,7 @@ L_10c0234:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c02c0: 0x10c02c0: sw    t2, 52(sp)
+// 0x010c0908: 0x10c0908: sw    t2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1425,14 +1425,14 @@ L_10c0234:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c02c4: 0x10c02c4: mflo  lo
+// 0x010c090c: 0x10c090c: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x010c02c8: 0x10c02c8: subu  v0, zero, v0
+// 0x010c0910: 0x10c0910: subu  v0, zero, v0
 	ldloc 6
 	neg
 	stloc 6
-// 0x010c02cc: 0x10c02cc: sw    v0, 40(sp)
+// 0x010c0914: 0x10c0914: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1441,7 +1441,7 @@ L_10c0234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c02d0: 0x10c02d0: jal   0x10073e8 sw    v0, 68(sp)
+// 0x010c0918: 0x10c0918: jal   0x10073f8 sw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1455,12 +1455,12 @@ L_10c0234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_point_10073e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_point_10073f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c02d8: 0x10c02d8: lw    t1, 56(sp)
+// 0x010c0920: 0x10c0920: lw    t1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1469,7 +1469,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010c02dc: 0x10c02dc: lw    v0, 68(sp)
+// 0x010c0924: 0x10c0924: lw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1478,7 +1478,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c02e0: 0x10c02e0: lw    t2, 52(sp)
+// 0x010c0928: 0x10c0928: lw    t2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1487,7 +1487,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c02e4: 0x10c02e4: lw    a1, 48(sp)
+// 0x010c092c: 0x10c092c: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1496,18 +1496,18 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c02e8: 0x10c02e8: addu  a0, t1, zero
+// 0x010c0930: 0x10c0930: addu  a0, t1, zero
 	ldloc 14
 	stloc.1
-// 0x010c02ec: 0x10c02ec: addu  a2, s8, zero
+// 0x010c0934: 0x10c0934: addu  a2, s8, zero
 	ldloc 10
 	stloc.3
-// 0x010c02f0: 0x10c02f0: addiu t1, v0, -1
+// 0x010c0938: 0x10c0938: addiu t1, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 14
-// 0x010c02f4: 0x10c02f4: sw    t1, 176(s0)
+// 0x010c093c: 0x10c093c: sw    t1, 176(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1516,7 +1516,7 @@ L_10c0234:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010c02f8: 0x10c02f8: sw    t2, 180(s0)
+// 0x010c0940: 0x10c0940: sw    t2, 180(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1525,7 +1525,7 @@ L_10c0234:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c02fc: 0x10c02fc: jal   0x10073e8 sw    t1, 56(sp)
+// 0x010c0944: 0x10c0944: jal   0x10073f8 sw    t1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1539,12 +1539,12 @@ L_10c0234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_point_10073e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_point_10073f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c0304: 0x10c0304: lw    t0, 60(sp)
+// 0x010c094c: 0x10c094c: lw    t0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1553,7 +1553,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c0308: 0x10c0308: lw    a3, 64(sp)
+// 0x010c0950: 0x10c0950: lw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1562,22 +1562,22 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c030c: 0x10c030c: addiu t0, t0, 2
+// 0x010c0954: 0x10c0954: addiu t0, t0, 2
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 9
-// 0x010c0310: 0x10c0310: addiu t2, s0, 184
+// 0x010c0958: 0x10c0958: addiu t2, s0, 184
 	ldloc 8
 	ldc.i4 184
 	add
 	stloc 11
-// 0x010c0314: 0x10c0314: subu  a3, t0, a3
+// 0x010c095c: 0x10c095c: subu  a3, t0, a3
 	ldloc 9
 	ldloc 4
 	sub
 	stloc 4
-// 0x010c0318: 0x10c0318: lw    t1, 56(sp)
+// 0x010c0960: 0x10c0960: lw    t1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1586,7 +1586,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010c031c: 0x10c031c: lw    a1, 48(sp)
+// 0x010c0964: 0x10c0964: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1595,10 +1595,10 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c0320: 0x10c0320: addu  a0, t2, zero
+// 0x010c0968: 0x10c0968: addu  a0, t2, zero
 	ldloc 11
 	stloc.1
-// 0x010c0324: 0x10c0324: sw    a3, 4(t2)
+// 0x010c096c: 0x10c096c: sw    a3, 4(t2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1607,10 +1607,10 @@ L_10c0234:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c0328: 0x10c0328: addu  a2, s8, zero
+// 0x010c0970: 0x10c0970: addu  a2, s8, zero
 	ldloc 10
 	stloc.3
-// 0x010c032c: 0x10c032c: sw    t1, 184(s0)
+// 0x010c0974: 0x10c0974: sw    t1, 184(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1619,7 +1619,7 @@ L_10c0234:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010c0330: 0x10c0330: jal   0x10073e8 sw    a3, 64(sp)
+// 0x010c0978: 0x10c0978: jal   0x10073f8 sw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1633,12 +1633,12 @@ L_10c0234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_point_10073e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_point_10073f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c0338: 0x10c0338: lw    v1, 72(sp)
+// 0x010c0980: 0x10c0980: lw    v1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1647,7 +1647,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c033c: 0x10c033c: lw    v0, 68(sp)
+// 0x010c0984: 0x10c0984: lw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1656,7 +1656,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0340: 0x10c0340: lw    a3, 64(sp)
+// 0x010c0988: 0x10c0988: lw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1665,17 +1665,17 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c0344: 0x10c0344: addiu t0, s0, 192
+// 0x010c098c: 0x10c098c: addiu t0, s0, 192
 	ldloc 8
 	ldc.i4 192
 	add
 	stloc 9
-// 0x010c0348: 0x10c0348: addiu v1, v1, 2
+// 0x010c0990: 0x10c0990: addiu v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x010c034c: 0x10c034c: lw    a1, 48(sp)
+// 0x010c0994: 0x10c0994: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1684,18 +1684,18 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c0350: 0x10c0350: addu  v0, v1, v0
+// 0x010c0998: 0x10c0998: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x010c0354: 0x10c0354: addu  a0, t0, zero
+// 0x010c099c: 0x10c099c: addu  a0, t0, zero
 	ldloc 9
 	stloc.1
-// 0x010c0358: 0x10c0358: addu  a2, s8, zero
+// 0x010c09a0: 0x10c09a0: addu  a2, s8, zero
 	ldloc 10
 	stloc.3
-// 0x010c035c: 0x10c035c: sw    a3, 4(t0)
+// 0x010c09a4: 0x10c09a4: sw    a3, 4(t0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1704,7 +1704,7 @@ L_10c0234:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c0360: 0x10c0360: sw    v0, 192(s0)
+// 0x010c09a8: 0x10c09a8: sw    v0, 192(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1713,7 +1713,7 @@ L_10c0234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c0364: 0x10c0364: jal   0x10073e8 sw    v0, 68(sp)
+// 0x010c09ac: 0x10c09ac: jal   0x10073f8 sw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1727,12 +1727,12 @@ L_10c0234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_point_10073e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_point_10073f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c036c: 0x10c036c: lw    v0, 68(sp)
+// 0x010c09b4: 0x10c09b4: lw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1741,12 +1741,12 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0370: 0x10c0370: addiu v1, s0, 200
+// 0x010c09b8: 0x10c09b8: addiu v1, s0, 200
 	ldloc 8
 	ldc.i4 200
 	add
 	stloc 7
-// 0x010c0374: 0x10c0374: sw    v0, 200(s0)
+// 0x010c09bc: 0x10c09bc: sw    v0, 200(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1755,7 +1755,7 @@ L_10c0234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c0378: 0x10c0378: lw    v0, 52(sp)
+// 0x010c09c0: 0x10c09c0: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1764,7 +1764,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c037c: 0x10c037c: lw    a1, 48(sp)
+// 0x010c09c4: 0x10c09c4: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1773,10 +1773,10 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c0380: 0x10c0380: addu  a0, v1, zero
+// 0x010c09c8: 0x10c09c8: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x010c0384: 0x10c0384: sw    v0, 4(v1)
+// 0x010c09cc: 0x10c09cc: sw    v0, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1785,7 +1785,7 @@ L_10c0234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c0388: 0x10c0388: jal   0x10073e8 addu  a2, s8, zero
+// 0x010c09d0: 0x10c09d0: jal   0x10073f8 addu  a2, s8, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -1793,12 +1793,12 @@ L_10c0234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_point_10073e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_point_10073f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c0390: 0x10c0390: lw    v0, 176(s0)
+// 0x010c09d8: 0x10c09d8: lw    v0, 176(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1807,7 +1807,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0394: 0x10c0394: lw    v1, 184(s0)
+// 0x010c09dc: 0x10c09dc: lw    v1, 184(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1816,7 +1816,7 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c0398: 0x10c0398: lw    a0, 180(s0)
+// 0x010c09e0: 0x10c09e0: lw    a0, 180(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1825,15 +1825,15 @@ L_10c0234:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c039c: 0x10c039c: slt   a2, v1, v0
+// 0x010c09e4: 0x10c09e4: slt   a2, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc.3
-// 0x010c03a0: 0x10c03a0: addu  a1, v0, zero
+// 0x010c09e8: 0x10c09e8: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010c03a4: 0x10c03a4: sw    a0, 164(s0)
+// 0x010c09ec: 0x10c09ec: sw    a0, 164(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1842,7 +1842,7 @@ L_10c0234:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010c03a8: 0x10c03a8: sw    v0, 168(s0)
+// 0x010c09f0: 0x10c09f0: sw    v0, 168(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1851,7 +1851,7 @@ L_10c0234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c03ac: 0x10c03ac: sw    v0, 160(s0)
+// 0x010c09f4: 0x10c09f4: sw    v0, 160(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1860,7 +1860,7 @@ L_10c0234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c03b0: 0x10c03b0: beq   a2, zero, 0x10c03bc sw    a0, 172(s0)
+// 0x010c09f8: 0x10c09f8: beq   a2, zero, 0x10c0a04 sw    a0, 172(s0)
 	ldloc.3
 	ldloc 5
 	ldloc 8
@@ -1870,13 +1870,13 @@ L_10c0234:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_10c03bc
+	brfalse L_10c0a04
 // --- basic block ---
-// 0x010c03b8: 0x10c03b8: addu  a1, v1, zero
+// 0x010c0a00: 0x10c0a00: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-L_10c03bc:
-// 0x010c03bc: 0x10c03bc: lw    v0, 184(s0)
+L_10c0a04:
+// 0x010c0a04: 0x10c0a04: lw    v0, 184(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1885,7 +1885,7 @@ L_10c03bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c03c0: 0x10c03c0: lw    a0, 168(s0)
+// 0x010c0a08: 0x10c0a08: lw    a0, 168(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1894,21 +1894,21 @@ L_10c03bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c03c4: 0x10c03c4: sll   zero, zero, 0
-// 0x010c03c8: 0x10c03c8: slt   v1, a0, v0
+// 0x010c0a0c: 0x10c0a0c: sll   zero, zero, 0
+// 0x010c0a10: 0x10c0a10: slt   v1, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 7
-// 0x010c03cc: 0x10c03cc: beq   v1, zero, 0x10c03d8 sll   zero, zero, 0
+// 0x010c0a14: 0x10c0a14: beq   v1, zero, 0x10c0a20 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10c03d8
+	brfalse L_10c0a20
 // --- basic block ---
-// 0x010c03d4: 0x10c03d4: addu  a0, v0, zero
+// 0x010c0a1c: 0x10c0a1c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-L_10c03d8:
-// 0x010c03d8: 0x10c03d8: lw    v1, 188(s0)
+L_10c0a20:
+// 0x010c0a20: 0x10c0a20: lw    v1, 188(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1917,7 +1917,7 @@ L_10c03d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c03dc: 0x10c03dc: lw    v0, 164(s0)
+// 0x010c0a24: 0x10c0a24: lw    v0, 164(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1926,21 +1926,21 @@ L_10c03d8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c03e0: 0x10c03e0: sll   zero, zero, 0
-// 0x010c03e4: 0x10c03e4: slt   a2, v1, v0
+// 0x010c0a28: 0x10c0a28: sll   zero, zero, 0
+// 0x010c0a2c: 0x10c0a2c: slt   a2, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc.3
-// 0x010c03e8: 0x10c03e8: beq   a2, zero, 0x10c03f4 sll   zero, zero, 0
+// 0x010c0a30: 0x10c0a30: beq   a2, zero, 0x10c0a3c sll   zero, zero, 0
 	ldloc.3
-	brfalse L_10c03f4
+	brfalse L_10c0a3c
 // --- basic block ---
-// 0x010c03f0: 0x10c03f0: addu  v0, v1, zero
+// 0x010c0a38: 0x10c0a38: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-L_10c03f4:
-// 0x010c03f4: 0x10c03f4: lw    a2, 188(s0)
+L_10c0a3c:
+// 0x010c0a3c: 0x10c0a3c: lw    a2, 188(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1949,7 +1949,7 @@ L_10c03f4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c03f8: 0x10c03f8: lw    v1, 172(s0)
+// 0x010c0a40: 0x10c0a40: lw    v1, 172(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1958,21 +1958,21 @@ L_10c03f4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c03fc: 0x10c03fc: sll   zero, zero, 0
-// 0x010c0400: 0x10c0400: slt   a3, v1, a2
+// 0x010c0a44: 0x10c0a44: sll   zero, zero, 0
+// 0x010c0a48: 0x10c0a48: slt   a3, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 4
-// 0x010c0404: 0x10c0404: beq   a3, zero, 0x10c0410 sll   zero, zero, 0
+// 0x010c0a4c: 0x10c0a4c: beq   a3, zero, 0x10c0a58 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10c0410
+	brfalse L_10c0a58
 // --- basic block ---
-// 0x010c040c: 0x10c040c: addu  v1, a2, zero
+// 0x010c0a54: 0x10c0a54: addu  v1, a2, zero
 	ldloc.3
 	stloc 7
-L_10c0410:
-// 0x010c0410: 0x10c0410: lw    a2, 192(s0)
+L_10c0a58:
+// 0x010c0a58: 0x10c0a58: lw    a2, 192(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1981,24 +1981,24 @@ L_10c0410:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c0414: 0x10c0414: sll   zero, zero, 0
-// 0x010c0418: 0x10c0418: slt   a3, a2, a1
+// 0x010c0a5c: 0x10c0a5c: sll   zero, zero, 0
+// 0x010c0a60: 0x10c0a60: slt   a3, a2, a1
 	ldloc.3
 	ldloc.2
 	clt
 	stloc 4
-// 0x010c041c: 0x10c041c: beq   a3, zero, 0x10c0434 slt   a3, a0, a2
+// 0x010c0a64: 0x10c0a64: beq   a3, zero, 0x10c0a7c slt   a3, a0, a2
 	ldloc 4
 	ldloc.1
 	ldloc.3
 	clt
 	stloc 4
-	brfalse L_10c0434
+	brfalse L_10c0a7c
 // --- basic block ---
-// 0x010c0424: 0x10c0424: addu  a1, a2, zero
+// 0x010c0a6c: 0x10c0a6c: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x010c0428: 0x10c0428: lw    a2, 192(s0)
+// 0x010c0a70: 0x10c0a70: lw    a2, 192(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2007,22 +2007,22 @@ L_10c0410:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c042c: 0x10c042c: sll   zero, zero, 0
-// 0x010c0430: 0x10c0430: slt   a3, a0, a2
+// 0x010c0a74: 0x10c0a74: sll   zero, zero, 0
+// 0x010c0a78: 0x10c0a78: slt   a3, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc 4
-L_10c0434:
-// 0x010c0434: 0x10c0434: beq   a3, zero, 0x10c0440 sll   zero, zero, 0
+L_10c0a7c:
+// 0x010c0a7c: 0x10c0a7c: beq   a3, zero, 0x10c0a88 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10c0440
+	brfalse L_10c0a88
 // --- basic block ---
-// 0x010c043c: 0x10c043c: addu  a0, a2, zero
+// 0x010c0a84: 0x10c0a84: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-L_10c0440:
-// 0x010c0440: 0x10c0440: lw    a2, 196(s0)
+L_10c0a88:
+// 0x010c0a88: 0x10c0a88: lw    a2, 196(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2031,24 +2031,24 @@ L_10c0440:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c0444: 0x10c0444: sll   zero, zero, 0
-// 0x010c0448: 0x10c0448: slt   a3, a2, v0
+// 0x010c0a8c: 0x10c0a8c: sll   zero, zero, 0
+// 0x010c0a90: 0x10c0a90: slt   a3, a2, v0
 	ldloc.3
 	ldloc 6
 	clt
 	stloc 4
-// 0x010c044c: 0x10c044c: beq   a3, zero, 0x10c0464 slt   a3, v1, a2
+// 0x010c0a94: 0x10c0a94: beq   a3, zero, 0x10c0aac slt   a3, v1, a2
 	ldloc 4
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 4
-	brfalse L_10c0464
+	brfalse L_10c0aac
 // --- basic block ---
-// 0x010c0454: 0x10c0454: addu  v0, a2, zero
+// 0x010c0a9c: 0x10c0a9c: addu  v0, a2, zero
 	ldloc.3
 	stloc 6
-// 0x010c0458: 0x10c0458: lw    a2, 196(s0)
+// 0x010c0aa0: 0x10c0aa0: lw    a2, 196(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2057,22 +2057,22 @@ L_10c0440:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c045c: 0x10c045c: sll   zero, zero, 0
-// 0x010c0460: 0x10c0460: slt   a3, v1, a2
+// 0x010c0aa4: 0x10c0aa4: sll   zero, zero, 0
+// 0x010c0aa8: 0x10c0aa8: slt   a3, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 4
-L_10c0464:
-// 0x010c0464: 0x10c0464: beq   a3, zero, 0x10c0470 sll   zero, zero, 0
+L_10c0aac:
+// 0x010c0aac: 0x10c0aac: beq   a3, zero, 0x10c0ab8 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10c0470
+	brfalse L_10c0ab8
 // --- basic block ---
-// 0x010c046c: 0x10c046c: addu  v1, a2, zero
+// 0x010c0ab4: 0x10c0ab4: addu  v1, a2, zero
 	ldloc.3
 	stloc 7
-L_10c0470:
-// 0x010c0470: 0x10c0470: lw    a2, 200(s0)
+L_10c0ab8:
+// 0x010c0ab8: 0x10c0ab8: lw    a2, 200(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2081,21 +2081,21 @@ L_10c0470:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c0474: 0x10c0474: sll   zero, zero, 0
-// 0x010c0478: 0x10c0478: slt   a3, a0, a2
+// 0x010c0abc: 0x10c0abc: sll   zero, zero, 0
+// 0x010c0ac0: 0x10c0ac0: slt   a3, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc 4
-// 0x010c047c: 0x10c047c: beq   a3, zero, 0x10c0488 sll   zero, zero, 0
+// 0x010c0ac4: 0x10c0ac4: beq   a3, zero, 0x10c0ad0 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10c0488
+	brfalse L_10c0ad0
 // --- basic block ---
-// 0x010c0484: 0x10c0484: addu  a0, a2, zero
+// 0x010c0acc: 0x10c0acc: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-L_10c0488:
-// 0x010c0488: 0x10c0488: lw    a2, 204(s0)
+L_10c0ad0:
+// 0x010c0ad0: 0x10c0ad0: lw    a2, 204(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2104,24 +2104,24 @@ L_10c0488:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c048c: 0x10c048c: sll   zero, zero, 0
-// 0x010c0490: 0x10c0490: slt   a3, a2, v0
+// 0x010c0ad4: 0x10c0ad4: sll   zero, zero, 0
+// 0x010c0ad8: 0x10c0ad8: slt   a3, a2, v0
 	ldloc.3
 	ldloc 6
 	clt
 	stloc 4
-// 0x010c0494: 0x10c0494: beq   a3, zero, 0x10c04ac slt   a3, v1, a2
+// 0x010c0adc: 0x10c0adc: beq   a3, zero, 0x10c0af4 slt   a3, v1, a2
 	ldloc 4
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 4
-	brfalse L_10c04ac
+	brfalse L_10c0af4
 // --- basic block ---
-// 0x010c049c: 0x10c049c: addu  v0, a2, zero
+// 0x010c0ae4: 0x10c0ae4: addu  v0, a2, zero
 	ldloc.3
 	stloc 6
-// 0x010c04a0: 0x10c04a0: lw    a2, 204(s0)
+// 0x010c0ae8: 0x10c0ae8: lw    a2, 204(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2130,22 +2130,22 @@ L_10c0488:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c04a4: 0x10c04a4: sll   zero, zero, 0
-// 0x010c04a8: 0x10c04a8: slt   a3, v1, a2
+// 0x010c0aec: 0x10c0aec: sll   zero, zero, 0
+// 0x010c0af0: 0x10c0af0: slt   a3, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 4
-L_10c04ac:
-// 0x010c04ac: 0x10c04ac: beq   a3, zero, 0x10c04b8 sll   zero, zero, 0
+L_10c0af4:
+// 0x010c0af4: 0x10c0af4: beq   a3, zero, 0x10c0b00 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10c04b8
+	brfalse L_10c0b00
 // --- basic block ---
-// 0x010c04b4: 0x10c04b4: addu  v1, a2, zero
+// 0x010c0afc: 0x10c0afc: addu  v1, a2, zero
 	ldloc.3
 	stloc 7
-L_10c04b8:
-// 0x010c04b8: 0x10c04b8: lw    a2, 200(s0)
+L_10c0b00:
+// 0x010c0b00: 0x10c0b00: lw    a2, 200(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2154,21 +2154,21 @@ L_10c04b8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c04bc: 0x10c04bc: sll   zero, zero, 0
-// 0x010c04c0: 0x10c04c0: slt   a3, a2, a1
+// 0x010c0b04: 0x10c0b04: sll   zero, zero, 0
+// 0x010c0b08: 0x10c0b08: slt   a3, a2, a1
 	ldloc.3
 	ldloc.2
 	clt
 	stloc 4
-// 0x010c04c4: 0x10c04c4: beq   a3, zero, 0x10c04d0 sll   zero, zero, 0
+// 0x010c0b0c: 0x10c0b0c: beq   a3, zero, 0x10c0b18 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10c04d0
+	brfalse L_10c0b18
 // --- basic block ---
-// 0x010c04cc: 0x10c04cc: addu  a1, a2, zero
+// 0x010c0b14: 0x10c0b14: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-L_10c04d0:
-// 0x010c04d0: 0x10c04d0: sw    v0, 164(s0)
+L_10c0b18:
+// 0x010c0b18: 0x10c0b18: sw    v0, 164(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2177,7 +2177,7 @@ L_10c04d0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c04d4: 0x10c04d4: lw    v0, 44(sp)
+// 0x010c0b1c: 0x10c0b1c: lw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2186,7 +2186,7 @@ L_10c04d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c04d8: 0x10c04d8: sw    a1, 160(s0)
+// 0x010c0b20: 0x10c0b20: sw    a1, 160(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2195,7 +2195,7 @@ L_10c04d0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c04dc: 0x10c04dc: sw    v0, 148(s0)
+// 0x010c0b24: 0x10c0b24: sw    v0, 148(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2204,7 +2204,7 @@ L_10c04d0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c04e0: 0x10c04e0: lw    v0, 40(sp)
+// 0x010c0b28: 0x10c0b28: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2213,7 +2213,7 @@ L_10c04d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c04e4: 0x10c04e4: sw    a0, 168(s0)
+// 0x010c0b2c: 0x10c0b2c: sw    a0, 168(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2222,7 +2222,7 @@ L_10c04d0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010c04e8: 0x10c04e8: sw    v1, 172(s0)
+// 0x010c0b30: 0x10c0b30: sw    v1, 172(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2231,7 +2231,7 @@ L_10c04d0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c04ec: 0x10c04ec: sw    v0, 144(s0)
+// 0x010c0b34: 0x10c0b34: sw    v0, 144(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2240,18 +2240,18 @@ L_10c04d0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c04f0: 0x10c04f0: j	 0x10c0548 addiu s8, zero, 1
+// 0x010c0b38: 0x10c0b38: j	 0x10c0b90 addiu s8, zero, 1
 	ldc.i4.1
 	stloc 10
-	br L_10c0548
+	br L_10c0b90
 // --- basic block ---
-L_10c04f8:
-// 0x010c04f8: 0x10c04f8: div   v0, s1
+L_10c0b40:
+// 0x010c0b40: 0x10c0b40: div   v0, s1
 	ldloc 6
 	ldloc 15
 	div
 	stloc 12
-// 0x010c04fc: 0x10c04fc: lw    a0, 156(s0)
+// 0x010c0b44: 0x10c0b44: lw    a0, 156(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2260,7 +2260,7 @@ L_10c04f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c0500: 0x10c0500: lw    a1, 152(s0)
+// 0x010c0b48: 0x10c0b48: lw    a1, 152(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2269,17 +2269,17 @@ L_10c04f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c0504: 0x10c0504: addu  a2, a3, a0
+// 0x010c0b4c: 0x10c0b4c: addu  a2, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc.3
-// 0x010c0508: 0x10c0508: addu  v0, v0, a1
+// 0x010c0b50: 0x10c0b50: addu  v0, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x010c050c: 0x10c050c: sw    a1, 144(s0)
+// 0x010c0b54: 0x10c0b54: sw    a1, 144(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2288,7 +2288,7 @@ L_10c04f8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c0510: 0x10c0510: sw    a0, 148(s0)
+// 0x010c0b58: 0x10c0b58: sw    a0, 148(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2297,29 +2297,29 @@ L_10c04f8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010c0514: 0x10c0514: mflo  lo
+// 0x010c0b5c: 0x10c0b5c: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x010c0518: 0x10c0518: subu  v1, zero, v1
+// 0x010c0b60: 0x10c0b60: subu  v1, zero, v1
 	ldloc 7
 	neg
 	stloc 7
-// 0x010c051c: 0x10c051c: addu  v0, v0, v1
+// 0x010c0b64: 0x10c0b64: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x010c0520: 0x10c0520: div   a3, s1
+// 0x010c0b68: 0x10c0b68: div   a3, s1
 	ldloc 4
 	ldloc 15
 	div
 	stloc 12
-// 0x010c0524: 0x10c0524: addu  v1, v1, a1
+// 0x010c0b6c: 0x10c0b6c: addu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-// 0x010c0528: 0x10c0528: sw    v1, 160(s0)
+// 0x010c0b70: 0x10c0b70: sw    v1, 160(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2328,7 +2328,7 @@ L_10c04f8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c052c: 0x10c052c: sw    v0, 168(s0)
+// 0x010c0b74: 0x10c0b74: sw    v0, 168(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2337,24 +2337,24 @@ L_10c04f8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c0530: 0x10c0530: mflo  lo
+// 0x010c0b78: 0x10c0b78: mflo  lo
 	ldloc 12
 	stloc 4
-// 0x010c0534: 0x10c0534: subu  a3, zero, a3
+// 0x010c0b7c: 0x10c0b7c: subu  a3, zero, a3
 	ldloc 4
 	neg
 	stloc 4
-// 0x010c0538: 0x10c0538: addu  a2, a2, a3
+// 0x010c0b80: 0x10c0b80: addu  a2, a2, a3
 	ldloc.3
 	ldloc 4
 	add
 	stloc.3
-// 0x010c053c: 0x10c053c: addu  a3, a3, a0
+// 0x010c0b84: 0x10c0b84: addu  a3, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc 4
-// 0x010c0540: 0x10c0540: sw    a3, 164(s0)
+// 0x010c0b88: 0x10c0b88: sw    a3, 164(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2363,7 +2363,7 @@ L_10c04f8:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c0544: 0x10c0544: sw    a2, 172(s0)
+// 0x010c0b8c: 0x10c0b8c: sw    a2, 172(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2372,8 +2372,8 @@ L_10c04f8:
 	add
 	ldloc.3
 	stelem.i4
-L_10c0548:
-// 0x010c0548: 0x10c0548: lw    a1, 160(s0)
+L_10c0b90:
+// 0x010c0b90: 0x10c0b90: lw    a1, 160(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2382,17 +2382,17 @@ L_10c0548:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c054c: 0x10c054c: sll   zero, zero, 0
-// 0x010c0550: 0x10c0550: slti  v0, a1, 10
+// 0x010c0b94: 0x10c0b94: sll   zero, zero, 0
+// 0x010c0b98: 0x10c0b98: slti  v0, a1, 10
 	ldloc.2
 	ldc.i4.s 10
 	clt
 	stloc 6
-// 0x010c0554: 0x10c0554: bne   v0, zero, 0x10c0664 sll   zero, zero, 0
+// 0x010c0b9c: 0x10c0b9c: bne   v0, zero, 0x10c0cac sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10c0664
+	brtrue L_10c0cac
 // --- basic block ---
-// 0x010c055c: 0x10c055c: lw    a3, 164(s0)
+// 0x010c0ba4: 0x10c0ba4: lw    a3, 164(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2401,17 +2401,17 @@ L_10c0548:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c0560: 0x10c0560: sll   zero, zero, 0
-// 0x010c0564: 0x10c0564: slti  v0, a3, 30
+// 0x010c0ba8: 0x10c0ba8: sll   zero, zero, 0
+// 0x010c0bac: 0x10c0bac: slti  v0, a3, 30
 	ldloc 4
 	ldc.i4.s 30
 	clt
 	stloc 6
-// 0x010c0568: 0x10c0568: bne   v0, zero, 0x10c0664 sll   zero, zero, 0
+// 0x010c0bb0: 0x10c0bb0: bne   v0, zero, 0x10c0cac sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10c0664
+	brtrue L_10c0cac
 // --- basic block ---
-// 0x010c0570: 0x10c0570: lw    a0, 168(s0)
+// 0x010c0bb8: 0x10c0bb8: lw    a0, 168(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2420,28 +2420,28 @@ L_10c0548:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c0574: 0x10c0574: lw    v0, 29504(s5)
+// 0x010c0bbc: 0x10c0bbc: lw    v0, 29968(s5)
 	ldloc 5
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 7376
+	ldc.i4 7492
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0578: 0x10c0578: sll   zero, zero, 0
-// 0x010c057c: 0x10c057c: slt   v0, v0, a0
+// 0x010c0bc0: 0x10c0bc0: sll   zero, zero, 0
+// 0x010c0bc4: 0x10c0bc4: slt   v0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x010c0580: 0x10c0580: bne   v0, zero, 0x10c0664 lui   v1, 0xe0000
+// 0x010c0bc8: 0x10c0bc8: bne   v0, zero, 0x10c0cac lui   v1, 0xe0000
 	ldloc 6
 	ldc.i4 917504
 	stloc 7
-	brtrue L_10c0664
+	brtrue L_10c0cac
 // --- basic block ---
-// 0x010c0588: 0x10c0588: lw    a2, 172(s0)
+// 0x010c0bd0: 0x10c0bd0: lw    a2, 172(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2450,39 +2450,39 @@ L_10c0548:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c058c: 0x10c058c: lw    v0, 29500(v1)
+// 0x010c0bd4: 0x10c0bd4: lw    v0, 29964(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7375
+	ldc.i4 7491
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0590: 0x10c0590: sll   zero, zero, 0
-// 0x010c0594: 0x10c0594: slt   v0, v0, a2
+// 0x010c0bd8: 0x10c0bd8: sll   zero, zero, 0
+// 0x010c0bdc: 0x10c0bdc: slt   v0, v0, a2
 	ldloc 6
 	ldloc.3
 	clt
 	stloc 6
-// 0x010c0598: 0x10c0598: bne   v0, zero, 0x10c0664 lui   v0, 0xe0000
+// 0x010c0be0: 0x10c0be0: bne   v0, zero, 0x10c0cac lui   v0, 0xe0000
 	ldloc 6
 	ldc.i4 917504
 	stloc 6
-	brtrue L_10c0664
+	brtrue L_10c0cac
 // --- basic block ---
-// 0x010c05a0: 0x10c05a0: addiu v0, v0, -14348
+// 0x010c0be8: 0x10c0be8: addiu v0, v0, -13884
 	ldloc 6
-	ldc.i4 -14348
+	ldc.i4 -13884
 	add
 	stloc 6
-// 0x010c05a4: 0x10c05a4: j	 0x10c0614 addu  v1, zero, zero
+// 0x010c0bec: 0x10c0bec: j	 0x10c0c5c addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10c0614
+	br L_10c0c5c
 // --- basic block ---
-L_10c05ac:
-// 0x010c05ac: 0x10c05ac: lw    t0, 44(v0)
+L_10c0bf4:
+// 0x010c0bf4: 0x10c0bf4: lw    t0, 44(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2491,21 +2491,21 @@ L_10c05ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c05b0: 0x10c05b0: sll   zero, zero, 0
-// 0x010c05b4: 0x10c05b4: andi  t0, t0, 16
+// 0x010c0bf8: 0x10c0bf8: sll   zero, zero, 0
+// 0x010c0bfc: 0x10c0bfc: andi  t0, t0, 16
 	ldloc 9
 	ldc.i4.s 16
 	and
 	stloc 9
-// 0x010c05b8: 0x10c05b8: beq   t0, zero, 0x10c0610 addiu v1, v1, 1
+// 0x010c0c00: 0x10c0c00: beq   t0, zero, 0x10c0c58 addiu v1, v1, 1
 	ldloc 9
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brfalse L_10c0610
+	brfalse L_10c0c58
 // --- basic block ---
-// 0x010c05c0: 0x10c05c0: lw    t0, -8(v0)
+// 0x010c0c08: 0x10c0c08: lw    t0, -8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2514,34 +2514,34 @@ L_10c05ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c05c4: 0x10c05c4: sll   zero, zero, 0
-// 0x010c05c8: 0x10c05c8: slt   t0, a0, t0
+// 0x010c0c0c: 0x10c0c0c: sll   zero, zero, 0
+// 0x010c0c10: 0x10c0c10: slt   t0, a0, t0
 	ldloc.1
 	ldloc 9
 	clt
 	stloc 9
-// 0x010c05cc: 0x10c05cc: bne   t0, zero, 0x10c0610 sll   zero, zero, 0
+// 0x010c0c14: 0x10c0c14: bne   t0, zero, 0x10c0c58 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10c0610
+	brtrue L_10c0c58
 // --- basic block ---
-// 0x010c05d4: 0x10c05d4: lw    t0, 0(v0)
+// 0x010c0c1c: 0x10c0c1c: lw    t0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010c05d8: 0x10c05d8: sll   zero, zero, 0
-// 0x010c05dc: 0x10c05dc: slt   t0, t0, a1
+// 0x010c0c20: 0x10c0c20: sll   zero, zero, 0
+// 0x010c0c24: 0x10c0c24: slt   t0, t0, a1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc 9
-// 0x010c05e0: 0x10c05e0: bne   t0, zero, 0x10c0610 sll   zero, zero, 0
+// 0x010c0c28: 0x10c0c28: bne   t0, zero, 0x10c0c58 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10c0610
+	brtrue L_10c0c58
 // --- basic block ---
-// 0x010c05e8: 0x10c05e8: lw    t0, -4(v0)
+// 0x010c0c30: 0x10c0c30: lw    t0, -4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2550,17 +2550,17 @@ L_10c05ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c05ec: 0x10c05ec: sll   zero, zero, 0
-// 0x010c05f0: 0x10c05f0: slt   t0, a2, t0
+// 0x010c0c34: 0x10c0c34: sll   zero, zero, 0
+// 0x010c0c38: 0x10c0c38: slt   t0, a2, t0
 	ldloc.3
 	ldloc 9
 	clt
 	stloc 9
-// 0x010c05f4: 0x10c05f4: bne   t0, zero, 0x10c0610 sll   zero, zero, 0
+// 0x010c0c3c: 0x10c0c3c: bne   t0, zero, 0x10c0c58 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10c0610
+	brtrue L_10c0c58
 // --- basic block ---
-// 0x010c05fc: 0x10c05fc: lw    t0, 4(v0)
+// 0x010c0c44: 0x10c0c44: lw    t0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2569,39 +2569,39 @@ L_10c05ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c0600: 0x10c0600: sll   zero, zero, 0
-// 0x010c0604: 0x10c0604: slt   t0, t0, a3
+// 0x010c0c48: 0x10c0c48: sll   zero, zero, 0
+// 0x010c0c4c: 0x10c0c4c: slt   t0, t0, a3
 	ldloc 9
 	ldloc 4
 	clt
 	stloc 9
-// 0x010c0608: 0x10c0608: beq   t0, zero, 0x10c0664 sll   zero, zero, 0
+// 0x010c0c50: 0x10c0c50: beq   t0, zero, 0x10c0cac sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10c0664
+	brfalse L_10c0cac
 // --- basic block ---
-L_10c0610:
-// 0x010c0610: 0x10c0610: addiu v0, v0, 220
+L_10c0c58:
+// 0x010c0c58: 0x10c0c58: addiu v0, v0, 220
 	ldloc 6
 	ldc.i4 220
 	add
 	stloc 6
-L_10c0614:
-// 0x010c0614: 0x10c0614: slt   t0, v1, s2
+L_10c0c5c:
+// 0x010c0c5c: 0x10c0c5c: slt   t0, v1, s2
 	ldloc 7
 	ldloc 13
 	clt
 	stloc 9
-// 0x010c0618: 0x10c0618: bne   t0, zero, 0x10c05ac sll   zero, zero, 0
+// 0x010c0c60: 0x10c0c60: bne   t0, zero, 0x10c0bf4 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10c05ac
+	brtrue L_10c0bf4
 // --- basic block ---
-// 0x010c0620: 0x10c0620: j	 0x10c06b4 addu  v0, zero, zero
+// 0x010c0c68: 0x10c0c68: j	 0x10c0cfc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10c06b4
+	br L_10c0cfc
 // --- basic block ---
-L_10c0628:
-// 0x010c0628: 0x10c0628: lw    v0, 208(s0)
+L_10c0c70:
+// 0x010c0c70: 0x10c0c70: lw    v0, 208(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2610,24 +2610,24 @@ L_10c0628:
 	add
 	ldelem.i4
 	stloc 6
-L_10c062c:
-// 0x010c062c: 0x10c062c: addu  a0, s4, zero
+L_10c0c74:
+// 0x010c0c74: 0x10c0c74: addu  a0, s4, zero
 	ldloc 17
 	stloc.1
-// 0x010c0630: 0x10c0630: addiu a1, s0, 144
+// 0x010c0c78: 0x10c0c78: addiu a1, s0, 144
 	ldloc 8
 	ldc.i4 144
 	add
 	stloc.2
-// 0x010c0634: 0x10c0634: addiu a2, s0, 152
+// 0x010c0c7c: 0x10c0c7c: addiu a2, s0, 152
 	ldloc 8
 	ldc.i4 152
 	add
 	stloc.3
-// 0x010c0638: 0x10c0638: addu  a3, s8, zero
+// 0x010c0c80: 0x10c0c80: addu  a3, s8, zero
 	ldloc 10
 	stloc 4
-// 0x010c063c: 0x10c063c: sw    v0, 16(sp)
+// 0x010c0c84: 0x10c0c84: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2636,7 +2636,7 @@ L_10c062c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c0640: 0x10c0640: jal   0x10bffb0 sw    t2, 20(sp)
+// 0x010c0c88: 0x10c0c88: jal   0x10c05f8 sw    t2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2650,12 +2650,12 @@ L_10c062c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::roadmap_label_draw_text_10bffb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::roadmap_label_draw_text_10c05f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c0648: 0x10c0648: lw    v0, 212(s0)
+// 0x010c0c90: 0x10c0c90: lw    v0, 212(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2664,17 +2664,17 @@ L_10c062c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c064c: 0x10c064c: addiu s3, s3, 1
+// 0x010c0c94: 0x10c0c94: addiu s3, s3, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x010c0650: 0x10c0650: ori   v0, v0, 16
+// 0x010c0c98: 0x10c0c98: ori   v0, v0, 16
 	ldloc 6
 	ldc.i4.s 16
 	or
 	stloc 6
-// 0x010c0654: 0x10c0654: sw    v0, 212(s0)
+// 0x010c0c9c: 0x10c0c9c: sw    v0, 212(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2683,52 +2683,52 @@ L_10c062c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c0658: 0x10c0658: addiu v0, zero, 4
+// 0x010c0ca0: 0x10c0ca0: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x010c065c: 0x10c065c: beq   s3, v0, 0x10c0680 sll   zero, zero, 0
+// 0x010c0ca4: 0x10c0ca4: beq   s3, v0, 0x10c0cc8 sll   zero, zero, 0
 	ldloc 16
 	ldloc 6
-	beq  L_10c0680
+	beq  L_10c0cc8
 // --- basic block ---
-L_10c0664:
-// 0x010c0664: 0x10c0664: addiu s2, s2, 1
+L_10c0cac:
+// 0x010c0cac: 0x10c0cac: addiu s2, s2, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-L_10c0668:
-// 0x010c0668: 0x10c0668: addiu s0, s0, 220
+L_10c0cb0:
+// 0x010c0cb0: 0x10c0cb0: addiu s0, s0, 220
 	ldloc 8
 	ldc.i4 220
 	add
 	stloc 8
-L_10c066c:
-// 0x010c066c: 0x10c066c: lw    v0, -14528(s7)
+L_10c0cb4:
+// 0x010c0cb4: 0x10c0cb4: lw    v0, -14064(s7)
 	ldloc 5
 	ldloc 20
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3632
+	ldc.i4 -3516
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0670: 0x10c0670: sll   zero, zero, 0
-// 0x010c0674: 0x10c0674: slt   v0, s2, v0
+// 0x010c0cb8: 0x10c0cb8: sll   zero, zero, 0
+// 0x010c0cbc: 0x10c0cbc: slt   v0, s2, v0
 	ldloc 13
 	ldloc 6
 	clt
 	stloc 6
-// 0x010c0678: 0x10c0678: bne   v0, zero, 0x10c0094 sll   zero, zero, 0
+// 0x010c0cc0: 0x10c0cc0: bne   v0, zero, 0x10c06dc sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10c0094
+	brtrue L_10c06dc
 // --- basic block ---
-L_10c0680:
-// 0x010c0680: 0x10c0680: lw    ra, 116(sp)
-// 0x010c0684: 0x10c0684: addu  v0, zero, zero
+L_10c0cc8:
+// 0x010c0cc8: 0x10c0cc8: lw    ra, 116(sp)
+// 0x010c0ccc: 0x10c0ccc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010c0688: 0x10c0688: lw    s8, 112(sp)
+// 0x010c0cd0: 0x10c0cd0: lw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2737,7 +2737,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c068c: 0x10c068c: lw    s7, 108(sp)
+// 0x010c0cd4: 0x10c0cd4: lw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2746,7 +2746,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010c0690: 0x10c0690: lw    s6, 104(sp)
+// 0x010c0cd8: 0x10c0cd8: lw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2755,7 +2755,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010c0694: 0x10c0694: lw    s5, 100(sp)
+// 0x010c0cdc: 0x10c0cdc: lw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2764,7 +2764,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010c0698: 0x10c0698: lw    s4, 96(sp)
+// 0x010c0ce0: 0x10c0ce0: lw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2773,7 +2773,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010c069c: 0x10c069c: lw    s3, 92(sp)
+// 0x010c0ce4: 0x10c0ce4: lw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2782,7 +2782,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010c06a0: 0x10c06a0: lw    s2, 88(sp)
+// 0x010c0ce8: 0x10c0ce8: lw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2791,7 +2791,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010c06a4: 0x10c06a4: lw    s1, 84(sp)
+// 0x010c0cec: 0x10c0cec: lw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2800,7 +2800,7 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010c06a8: 0x10c06a8: lw    s0, 80(sp)
+// 0x010c0cf0: 0x10c0cf0: lw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2809,32 +2809,29 @@ L_10c0680:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c06ac: 0x10c06ac: jr    ra addiu sp, sp, 120
+// 0x010c0cf4: 0x10c0cf4: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10c06b4:
-// 0x010c06b4: 0x10c06b4: beq   s8, zero, 0x10c062c addiu t2, zero, 12
+L_10c0cfc:
+// 0x010c0cfc: 0x10c0cfc: beq   s8, zero, 0x10c0c74 addiu t2, zero, 12
 	ldloc 10
 	ldc.i4.s 12
 	stloc 11
-	brfalse L_10c062c
-// --- basic block ---
-// 0x010c06bc: 0x10c06bc: j	 0x10c0628 sll   zero, zero, 0
-	br L_10c0628
+	brfalse L_10c0c74
 // --- basic block ---
-// 0x010c06c4: 0x10c06c4: sll   zero, zero, 0
-// 0x010c06c8: 0x10c06c8: sll   zero, zero, 0
+// 0x010c0d04: 0x10c0d04: j	 0x10c0c70 sll   zero, zero, 0
+	br L_10c0c70
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 __addsf3_10c06d0(int32,int32)
+.method public static int32 __addsf3_10c0d10(int32,int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 a1,int32 v0,int32 ra)
@@ -2854,17 +2851,17 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c06d0: 0x10c06d0: cibyl_sysc_arg 0x4
+// 0x010c0d10: 0x10c0d10: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c06d4: 0x10c06d4: cibyl_sysc_arg 0x5
+// 0x010c0d14: 0x10c0d14: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c06d8: 0x10c06d8: cibyl_sysc 0x23c8
+// 0x010c0d18: 0x10c0d18: cibyl_sysc 0x23c8
 	call int32 [WazeWP7]Syscalls::__addsf3_helper(int32,int32)
 	stloc.2
-// 0x010c06dc: 0x10c06dc: addu  a0, v0, zero
+// 0x010c0d1c: 0x10c0d1c: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c06e0: 0x10c06e0: jr    ra addu  v0, a0, zero
+// 0x010c0d20: 0x10c0d20: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.2
 	br __CIBYL_function_return
@@ -2872,7 +2869,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __adddf3_10c06e8(int32,int32,int32,int32,int32)
+.method public static int32 __adddf3_10c0d28(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -2907,19 +2904,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c06e8: 0x10c06e8: addiu sp, sp, -24
+// 0x010c0d28: 0x10c0d28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c06ec: 0x10c06ec: sw    a0, 0(sp)
+// 0x010c0d2c: 0x10c0d2c: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c06f0: 0x10c06f0: sw    a1, 4(sp)
+// 0x010c0d30: 0x10c0d30: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2928,7 +2925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c06f4: 0x10c06f4: sw    a3, 12(sp)
+// 0x010c0d34: 0x10c0d34: sw    a3, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2937,7 +2934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c06f8: 0x10c06f8: sw    a2, 8(sp)
+// 0x010c0d38: 0x10c0d38: sw    a2, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2946,28 +2943,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c06fc: 0x10c06fc: addiu v1, sp, 16
+// 0x010c0d3c: 0x10c0d3c: addiu v1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x010c0700: 0x10c0700: addiu a0, sp, 8
+// 0x010c0d40: 0x10c0d40: addiu a0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.1
-// 0x010c0704: 0x10c0704: cibyl_sysc_arg 0x3
+// 0x010c0d44: 0x10c0d44: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c0708: 0x10c0708: cibyl_sysc_arg 0x1d
+// 0x010c0d48: 0x10c0d48: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c070c: 0x10c070c: cibyl_sysc_arg 0x4
+// 0x010c0d4c: 0x10c0d4c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c0710: 0x10c0710: cibyl_sysc 0x23d8
+// 0x010c0d50: 0x10c0d50: cibyl_sysc 0x23d8
 	call void [WazeWP7]Syscalls::__adddf3_helper(int32,int32,int32)
-// 0x010c0714: 0x10c0714: addu  v1, v0, zero
+// 0x010c0d54: 0x10c0d54: addu  v1, v0, zero
 	ldloc 7
 	stloc 6
-// 0x010c0718: 0x10c0718: lw    v1, 20(sp)
+// 0x010c0d58: 0x10c0d58: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2976,7 +2973,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c071c: 0x10c071c: lw    v0, 16(sp)
+// 0x010c0d5c: 0x10c0d5c: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2985,7 +2982,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c0720: 0x10c0720: jr    ra addiu sp, sp, 24
+// 0x010c0d60: 0x10c0d60: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2997,7 +2994,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 __subsf3_10c0728(int32,int32)
+.method public static int32 __subsf3_10c0d68(int32,int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 a1,int32 v0,int32 ra)
@@ -3017,17 +3014,17 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0728: 0x10c0728: cibyl_sysc_arg 0x4
+// 0x010c0d68: 0x10c0d68: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c072c: 0x10c072c: cibyl_sysc_arg 0x5
+// 0x010c0d6c: 0x10c0d6c: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c0730: 0x10c0730: cibyl_sysc 0x23e8
+// 0x010c0d70: 0x10c0d70: cibyl_sysc 0x23e8
 	call int32 [WazeWP7]Syscalls::__subsf3_helper(int32,int32)
 	stloc.2
-// 0x010c0734: 0x10c0734: addu  a0, v0, zero
+// 0x010c0d74: 0x10c0d74: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c0738: 0x10c0738: jr    ra addu  v0, a0, zero
+// 0x010c0d78: 0x10c0d78: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.2
 	br __CIBYL_function_return
@@ -3035,7 +3032,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __subdf3_10c0740(int32,int32,int32,int32,int32)
+.method public static int32 __subdf3_10c0d80(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -3070,19 +3067,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0740: 0x10c0740: addiu sp, sp, -24
+// 0x010c0d80: 0x10c0d80: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c0744: 0x10c0744: sw    a0, 0(sp)
+// 0x010c0d84: 0x10c0d84: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c0748: 0x10c0748: sw    a1, 4(sp)
+// 0x010c0d88: 0x10c0d88: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3091,7 +3088,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c074c: 0x10c074c: sw    a3, 12(sp)
+// 0x010c0d8c: 0x10c0d8c: sw    a3, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3100,7 +3097,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c0750: 0x10c0750: sw    a2, 8(sp)
+// 0x010c0d90: 0x10c0d90: sw    a2, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3109,28 +3106,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c0754: 0x10c0754: addiu v1, sp, 16
+// 0x010c0d94: 0x10c0d94: addiu v1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x010c0758: 0x10c0758: addiu a0, sp, 8
+// 0x010c0d98: 0x10c0d98: addiu a0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.1
-// 0x010c075c: 0x10c075c: cibyl_sysc_arg 0x3
+// 0x010c0d9c: 0x10c0d9c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c0760: 0x10c0760: cibyl_sysc_arg 0x1d
+// 0x010c0da0: 0x10c0da0: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c0764: 0x10c0764: cibyl_sysc_arg 0x4
+// 0x010c0da4: 0x10c0da4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c0768: 0x10c0768: cibyl_sysc 0x23f8
+// 0x010c0da8: 0x10c0da8: cibyl_sysc 0x23f8
 	call void [WazeWP7]Syscalls::__subdf3_helper(int32,int32,int32)
-// 0x010c076c: 0x10c076c: addu  v1, v0, zero
+// 0x010c0dac: 0x10c0dac: addu  v1, v0, zero
 	ldloc 7
 	stloc 6
-// 0x010c0770: 0x10c0770: lw    v1, 20(sp)
+// 0x010c0db0: 0x10c0db0: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3139,7 +3136,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0774: 0x10c0774: lw    v0, 16(sp)
+// 0x010c0db4: 0x10c0db4: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3148,7 +3145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c0778: 0x10c0778: jr    ra addiu sp, sp, 24
+// 0x010c0db8: 0x10c0db8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3160,7 +3157,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 __mulsf3_10c0780(int32,int32)
+.method public static int32 __mulsf3_10c0dc0(int32,int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 a1,int32 v0,int32 ra)
@@ -3180,17 +3177,17 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0780: 0x10c0780: cibyl_sysc_arg 0x4
+// 0x010c0dc0: 0x10c0dc0: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c0784: 0x10c0784: cibyl_sysc_arg 0x5
+// 0x010c0dc4: 0x10c0dc4: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c0788: 0x10c0788: cibyl_sysc 0x2408
+// 0x010c0dc8: 0x10c0dc8: cibyl_sysc 0x2408
 	call int32 [WazeWP7]Syscalls::__mulsf3_helper(int32,int32)
 	stloc.2
-// 0x010c078c: 0x10c078c: addu  a0, v0, zero
+// 0x010c0dcc: 0x10c0dcc: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c0790: 0x10c0790: jr    ra addu  v0, a0, zero
+// 0x010c0dd0: 0x10c0dd0: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.2
 	br __CIBYL_function_return
@@ -3198,7 +3195,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __muldf3_10c0798(int32,int32,int32,int32,int32)
+.method public static int32 __muldf3_10c0dd8(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -3233,19 +3230,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0798: 0x10c0798: addiu sp, sp, -24
+// 0x010c0dd8: 0x10c0dd8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c079c: 0x10c079c: sw    a0, 0(sp)
+// 0x010c0ddc: 0x10c0ddc: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c07a0: 0x10c07a0: sw    a1, 4(sp)
+// 0x010c0de0: 0x10c0de0: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3254,7 +3251,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c07a4: 0x10c07a4: sw    a3, 12(sp)
+// 0x010c0de4: 0x10c0de4: sw    a3, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3263,7 +3260,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c07a8: 0x10c07a8: sw    a2, 8(sp)
+// 0x010c0de8: 0x10c0de8: sw    a2, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3272,28 +3269,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c07ac: 0x10c07ac: addiu v1, sp, 16
+// 0x010c0dec: 0x10c0dec: addiu v1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x010c07b0: 0x10c07b0: addiu a0, sp, 8
+// 0x010c0df0: 0x10c0df0: addiu a0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.1
-// 0x010c07b4: 0x10c07b4: cibyl_sysc_arg 0x3
+// 0x010c0df4: 0x10c0df4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c07b8: 0x10c07b8: cibyl_sysc_arg 0x1d
+// 0x010c0df8: 0x10c0df8: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c07bc: 0x10c07bc: cibyl_sysc_arg 0x4
+// 0x010c0dfc: 0x10c0dfc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c07c0: 0x10c07c0: cibyl_sysc 0x2418
+// 0x010c0e00: 0x10c0e00: cibyl_sysc 0x2418
 	call void [WazeWP7]Syscalls::__muldf3_helper(int32,int32,int32)
-// 0x010c07c4: 0x10c07c4: addu  v1, v0, zero
+// 0x010c0e04: 0x10c0e04: addu  v1, v0, zero
 	ldloc 7
 	stloc 6
-// 0x010c07c8: 0x10c07c8: lw    v1, 20(sp)
+// 0x010c0e08: 0x10c0e08: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3302,7 +3299,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c07cc: 0x10c07cc: lw    v0, 16(sp)
+// 0x010c0e0c: 0x10c0e0c: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3311,7 +3308,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c07d0: 0x10c07d0: jr    ra addiu sp, sp, 24
+// 0x010c0e10: 0x10c0e10: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3323,7 +3320,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 __divsf3_10c07d8(int32,int32)
+.method public static int32 __divsf3_10c0e18(int32,int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 a1,int32 v0,int32 ra)
@@ -3343,17 +3340,17 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c07d8: 0x10c07d8: cibyl_sysc_arg 0x4
+// 0x010c0e18: 0x10c0e18: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c07dc: 0x10c07dc: cibyl_sysc_arg 0x5
+// 0x010c0e1c: 0x10c0e1c: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c07e0: 0x10c07e0: cibyl_sysc 0x2428
+// 0x010c0e20: 0x10c0e20: cibyl_sysc 0x2428
 	call int32 [WazeWP7]Syscalls::__divsf3_helper(int32,int32)
 	stloc.2
-// 0x010c07e4: 0x10c07e4: addu  a0, v0, zero
+// 0x010c0e24: 0x10c0e24: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c07e8: 0x10c07e8: jr    ra addu  v0, a0, zero
+// 0x010c0e28: 0x10c0e28: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.2
 	br __CIBYL_function_return
@@ -3361,7 +3358,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __divdf3_10c07f0(int32,int32,int32,int32,int32)
+.method public static int32 __divdf3_10c0e30(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -3396,19 +3393,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c07f0: 0x10c07f0: addiu sp, sp, -24
+// 0x010c0e30: 0x10c0e30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c07f4: 0x10c07f4: sw    a0, 0(sp)
+// 0x010c0e34: 0x10c0e34: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c07f8: 0x10c07f8: sw    a1, 4(sp)
+// 0x010c0e38: 0x10c0e38: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3417,7 +3414,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c07fc: 0x10c07fc: sw    a3, 12(sp)
+// 0x010c0e3c: 0x10c0e3c: sw    a3, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3426,7 +3423,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c0800: 0x10c0800: sw    a2, 8(sp)
+// 0x010c0e40: 0x10c0e40: sw    a2, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3435,28 +3432,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c0804: 0x10c0804: addiu v1, sp, 16
+// 0x010c0e44: 0x10c0e44: addiu v1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x010c0808: 0x10c0808: addiu a0, sp, 8
+// 0x010c0e48: 0x10c0e48: addiu a0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.1
-// 0x010c080c: 0x10c080c: cibyl_sysc_arg 0x3
+// 0x010c0e4c: 0x10c0e4c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c0810: 0x10c0810: cibyl_sysc_arg 0x1d
+// 0x010c0e50: 0x10c0e50: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c0814: 0x10c0814: cibyl_sysc_arg 0x4
+// 0x010c0e54: 0x10c0e54: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c0818: 0x10c0818: cibyl_sysc 0x2438
+// 0x010c0e58: 0x10c0e58: cibyl_sysc 0x2438
 	call void [WazeWP7]Syscalls::__divdf3_helper(int32,int32,int32)
-// 0x010c081c: 0x10c081c: addu  v1, v0, zero
+// 0x010c0e5c: 0x10c0e5c: addu  v1, v0, zero
 	ldloc 7
 	stloc 6
-// 0x010c0820: 0x10c0820: lw    v1, 20(sp)
+// 0x010c0e60: 0x10c0e60: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3465,7 +3462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0824: 0x10c0824: lw    v0, 16(sp)
+// 0x010c0e64: 0x10c0e64: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3474,7 +3471,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c0828: 0x10c0828: jr    ra addiu sp, sp, 24
+// 0x010c0e68: 0x10c0e68: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3486,7 +3483,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 __extendsfdf2_10c0874(int32,int32)
+.method public static int32 __extendsfdf2_10c0eb4(int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3512,21 +3509,21 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0874: 0x10c0874: addiu sp, sp, -8
+// 0x010c0eb4: 0x10c0eb4: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x010c0878: 0x10c0878: cibyl_sysc_arg 0x1d
+// 0x010c0eb8: 0x10c0eb8: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c087c: 0x10c087c: cibyl_sysc_arg 0x4
+// 0x010c0ebc: 0x10c0ebc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c0880: 0x10c0880: cibyl_sysc 0x2468
+// 0x010c0ec0: 0x10c0ec0: cibyl_sysc 0x2468
 	call void [WazeWP7]Syscalls::__extendsfdf2_helper(int32,int32)
-// 0x010c0884: 0x10c0884: addu  a0, v0, zero
+// 0x010c0ec4: 0x10c0ec4: addu  a0, v0, zero
 	ldloc.2
 	stloc.1
-// 0x010c0888: 0x10c0888: lw    v1, 4(sp)
+// 0x010c0ec8: 0x10c0ec8: lw    v1, 4(sp)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -3535,14 +3532,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c088c: 0x10c088c: lw    v0, 0(sp)
+// 0x010c0ecc: 0x10c0ecc: lw    v0, 0(sp)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010c0890: 0x10c0890: jr    ra addiu sp, sp, 8
+// 0x010c0ed0: 0x10c0ed0: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -3554,7 +3551,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __truncdfsf2_10c0898(int32,int32,int32)
+.method public static int32 __truncdfsf2_10c0ed8(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3583,12 +3580,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0898: 0x10c0898: addiu sp, sp, -8
+// 0x010c0ed8: 0x10c0ed8: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x010c089c: 0x10c089c: sw    a1, 4(sp)
+// 0x010c0edc: 0x10c0edc: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3597,25 +3594,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c08a0: 0x10c08a0: sw    a0, 0(sp)
+// 0x010c0ee0: 0x10c0ee0: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c08a4: 0x10c08a4: cibyl_sysc_arg 0x1d
+// 0x010c0ee4: 0x10c0ee4: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c08a8: 0x10c08a8: cibyl_sysc 0x247d
+// 0x010c0ee8: 0x10c0ee8: cibyl_sysc 0x247d
 	call int32 [WazeWP7]Syscalls::__truncdfsf2_helper(int32)
 	stloc.3
-// 0x010c08ac: 0x10c08ac: addu  v1, v0, zero
+// 0x010c0eec: 0x10c0eec: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c08b0: 0x10c08b0: addu  v0, v1, zero
+// 0x010c0ef0: 0x10c0ef0: addu  v0, v1, zero
 	ldloc 4
 	stloc.3
-// 0x010c08b4: 0x10c08b4: jr    ra addiu sp, sp, 8
+// 0x010c0ef4: 0x10c0ef4: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -3627,7 +3624,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 __fixsfsi_10c08bc(int32)
+.method public static int32 __fixsfsi_10c0efc(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -3644,15 +3641,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c08bc: 0x10c08bc: cibyl_sysc_arg 0x4
+// 0x010c0efc: 0x10c0efc: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c08c0: 0x10c08c0: cibyl_sysc 0x2491
+// 0x010c0f00: 0x10c0f00: cibyl_sysc 0x2491
 	call int32 [WazeWP7]Syscalls::__fixsfsi_helper(int32)
 	stloc.1
-// 0x010c08c4: 0x10c08c4: addu  a0, v0, zero
+// 0x010c0f04: 0x10c0f04: addu  a0, v0, zero
 	ldloc.1
 	stloc.0
-// 0x010c08c8: 0x10c08c8: jr    ra addu  v0, a0, zero
+// 0x010c0f08: 0x10c0f08: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.1
 	br __CIBYL_function_return
@@ -3660,7 +3657,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 __fixdfsi_10c08d0(int32,int32,int32)
+.method public static int32 __fixdfsi_10c0f10(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3689,12 +3686,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c08d0: 0x10c08d0: addiu sp, sp, -8
+// 0x010c0f10: 0x10c0f10: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x010c08d4: 0x10c08d4: sw    a1, 4(sp)
+// 0x010c0f14: 0x10c0f14: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3703,25 +3700,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c08d8: 0x10c08d8: sw    a0, 0(sp)
+// 0x010c0f18: 0x10c0f18: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c08dc: 0x10c08dc: cibyl_sysc_arg 0x1d
+// 0x010c0f1c: 0x10c0f1c: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c08e0: 0x10c08e0: cibyl_sysc 0x24a2
+// 0x010c0f20: 0x10c0f20: cibyl_sysc 0x24a2
 	call int32 [WazeWP7]Syscalls::__fixdfsi_helper(int32)
 	stloc.3
-// 0x010c08e4: 0x10c08e4: addu  v1, v0, zero
+// 0x010c0f24: 0x10c0f24: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c08e8: 0x10c08e8: addu  v0, v1, zero
+// 0x010c0f28: 0x10c0f28: addu  v0, v1, zero
 	ldloc 4
 	stloc.3
-// 0x010c08ec: 0x10c08ec: jr    ra addiu sp, sp, 8
+// 0x010c0f2c: 0x10c0f2c: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -3733,7 +3730,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 __fixunssfsi_10c0934(int32)
+.method public static int32 __fixunssfsi_10c0f74(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -3750,15 +3747,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0934: 0x10c0934: cibyl_sysc_arg 0x4
+// 0x010c0f74: 0x10c0f74: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c0938: 0x10c0938: cibyl_sysc 0x24b3
+// 0x010c0f78: 0x10c0f78: cibyl_sysc 0x24b3
 	call int32 [WazeWP7]Syscalls::__fixunssfsi_helper(int32)
 	stloc.1
-// 0x010c093c: 0x10c093c: addu  a0, v0, zero
+// 0x010c0f7c: 0x10c0f7c: addu  a0, v0, zero
 	ldloc.1
 	stloc.0
-// 0x010c0940: 0x10c0940: jr    ra addu  v0, a0, zero
+// 0x010c0f80: 0x10c0f80: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.1
 	br __CIBYL_function_return
@@ -3766,7 +3763,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 __fixunsdfsi_10c0948(int32,int32,int32)
+.method public static int32 __fixunsdfsi_10c0f88(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3795,12 +3792,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0948: 0x10c0948: addiu sp, sp, -8
+// 0x010c0f88: 0x10c0f88: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x010c094c: 0x10c094c: sw    a1, 4(sp)
+// 0x010c0f8c: 0x10c0f8c: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3809,25 +3806,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c0950: 0x10c0950: sw    a0, 0(sp)
+// 0x010c0f90: 0x10c0f90: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c0954: 0x10c0954: cibyl_sysc_arg 0x1d
+// 0x010c0f94: 0x10c0f94: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c0958: 0x10c0958: cibyl_sysc 0x24c7
+// 0x010c0f98: 0x10c0f98: cibyl_sysc 0x24c7
 	call int32 [WazeWP7]Syscalls::__fixunsdfsi_helper(int32)
 	stloc.3
-// 0x010c095c: 0x10c095c: addu  v1, v0, zero
+// 0x010c0f9c: 0x10c0f9c: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c0960: 0x10c0960: addu  v0, v1, zero
+// 0x010c0fa0: 0x10c0fa0: addu  v0, v1, zero
 	ldloc 4
 	stloc.3
-// 0x010c0964: 0x10c0964: jr    ra addiu sp, sp, 8
+// 0x010c0fa4: 0x10c0fa4: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -3839,7 +3836,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 __floatsisf_10c09ac(int32)
+.method public static int32 __floatsisf_10c0fec(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -3856,15 +3853,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c09ac: 0x10c09ac: cibyl_sysc_arg 0x4
+// 0x010c0fec: 0x10c0fec: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c09b0: 0x10c09b0: cibyl_sysc 0x24db
+// 0x010c0ff0: 0x10c0ff0: cibyl_sysc 0x24db
 	call int32 [WazeWP7]Syscalls::__floatsisf_helper(int32)
 	stloc.1
-// 0x010c09b4: 0x10c09b4: addu  a0, v0, zero
+// 0x010c0ff4: 0x10c0ff4: addu  a0, v0, zero
 	ldloc.1
 	stloc.0
-// 0x010c09b8: 0x10c09b8: jr    ra addu  v0, a0, zero
+// 0x010c0ff8: 0x10c0ff8: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.1
 	br __CIBYL_function_return
@@ -3872,7 +3869,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 __floatsidf_10c09c0(int32,int32)
+.method public static int32 __floatsidf_10c1000(int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3898,21 +3895,21 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c09c0: 0x10c09c0: addiu sp, sp, -8
+// 0x010c1000: 0x10c1000: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x010c09c4: 0x10c09c4: cibyl_sysc_arg 0x1d
+// 0x010c1004: 0x10c1004: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c09c8: 0x10c09c8: cibyl_sysc_arg 0x4
+// 0x010c1008: 0x10c1008: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c09cc: 0x10c09cc: cibyl_sysc 0x24ee
+// 0x010c100c: 0x10c100c: cibyl_sysc 0x24ee
 	call void [WazeWP7]Syscalls::__floatsidf_helper(int32,int32)
-// 0x010c09d0: 0x10c09d0: addu  a0, v0, zero
+// 0x010c1010: 0x10c1010: addu  a0, v0, zero
 	ldloc.2
 	stloc.1
-// 0x010c09d4: 0x10c09d4: lw    v1, 4(sp)
+// 0x010c1014: 0x10c1014: lw    v1, 4(sp)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -3921,14 +3918,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c09d8: 0x10c09d8: lw    v0, 0(sp)
+// 0x010c1018: 0x10c1018: lw    v0, 0(sp)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010c09dc: 0x10c09dc: jr    ra addiu sp, sp, 8
+// 0x010c101c: 0x10c101c: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -3940,7 +3937,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __cmpsf2_10c0a24(int32,int32)
+.method public static int32 __cmpsf2_10c1064(int32,int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 a1,int32 v0,int32 ra)
@@ -3960,17 +3957,17 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0a24: 0x10c0a24: cibyl_sysc_arg 0x4
+// 0x010c1064: 0x10c1064: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c0a28: 0x10c0a28: cibyl_sysc_arg 0x5
+// 0x010c1068: 0x10c1068: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c0a2c: 0x10c0a2c: cibyl_sysc 0x2501
+// 0x010c106c: 0x10c106c: cibyl_sysc 0x2501
 	call int32 [WazeWP7]Syscalls::__cmpsf2_helper(int32,int32)
 	stloc.2
-// 0x010c0a30: 0x10c0a30: addu  a0, v0, zero
+// 0x010c1070: 0x10c1070: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c0a34: 0x10c0a34: jr    ra addu  v0, a0, zero
+// 0x010c1074: 0x10c1074: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.2
 	br __CIBYL_function_return
@@ -3978,7 +3975,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __cmpdf2_10c0a3c(int32,int32,int32,int32,int32)
+.method public static int32 __cmpdf2_10c107c(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -4013,12 +4010,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0a3c: 0x10c0a3c: addiu sp, sp, -16
+// 0x010c107c: 0x10c107c: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c0a40: 0x10c0a40: sw    a1, 4(sp)
+// 0x010c1080: 0x10c1080: sw    a1, 4(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4027,14 +4024,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c0a44: 0x10c0a44: sw    a0, 0(sp)
+// 0x010c1084: 0x10c1084: sw    a0, 0(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c0a48: 0x10c0a48: sw    a3, 12(sp)
+// 0x010c1088: 0x10c1088: sw    a3, 12(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4043,7 +4040,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c0a4c: 0x10c0a4c: sw    a2, 8(sp)
+// 0x010c108c: 0x10c108c: sw    a2, 8(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4052,25 +4049,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c0a50: 0x10c0a50: addiu v1, sp, 8
+// 0x010c1090: 0x10c1090: addiu v1, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc 5
-// 0x010c0a54: 0x10c0a54: cibyl_sysc_arg 0x1d
+// 0x010c1094: 0x10c1094: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c0a58: 0x10c0a58: cibyl_sysc_arg 0x3
+// 0x010c1098: 0x10c1098: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x010c0a5c: 0x10c0a5c: cibyl_sysc 0x2511
+// 0x010c109c: 0x10c109c: cibyl_sysc 0x2511
 	call int32 [WazeWP7]Syscalls::__cmpdf2_helper(int32,int32)
 	stloc 7
-// 0x010c0a60: 0x10c0a60: addu  v1, v0, zero
+// 0x010c10a0: 0x10c10a0: addu  v1, v0, zero
 	ldloc 7
 	stloc 5
-// 0x010c0a64: 0x10c0a64: addu  v0, v1, zero
+// 0x010c10a4: 0x10c10a4: addu  v0, v1, zero
 	ldloc 5
 	stloc 7
-// 0x010c0a68: 0x10c0a68: jr    ra addiu sp, sp, 16
+// 0x010c10a8: 0x10c10a8: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4082,7 +4079,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+.method public static int32 vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s4,int32 s0,int32 s1,int32 s8,int32 s6,int32 s5,int32 s2,int32 s7,int32 s3,int32 t1,int32 t3,int32 t0,int32 t2,int32 hi,int32 ra,int32 lo)
@@ -4162,12 +4159,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c0a70: 0x10c0a70: addiu sp, sp, -152
+// 0x010c10b0: 0x10c10b0: addiu sp, sp, -152
 	ldloc.0
 	ldc.i4 -152
 	add
 	stloc.0
-// 0x010c0a74: 0x10c0a74: sw    s6, 136(sp)
+// 0x010c10b4: 0x10c10b4: sw    s6, 136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4176,7 +4173,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010c0a78: 0x10c0a78: sw    s1, 116(sp)
+// 0x010c10b8: 0x10c10b8: sw    s1, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4185,8 +4182,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c0a7c: 0x10c0a7c: sw    ra, 148(sp)
-// 0x010c0a80: 0x10c0a80: sw    s8, 144(sp)
+// 0x010c10bc: 0x10c10bc: sw    ra, 148(sp)
+// 0x010c10c0: 0x10c10c0: sw    s8, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4195,7 +4192,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c0a84: 0x10c0a84: sw    s7, 140(sp)
+// 0x010c10c4: 0x10c10c4: sw    s7, 140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4204,7 +4201,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010c0a88: 0x10c0a88: sw    s5, 132(sp)
+// 0x010c10c8: 0x10c10c8: sw    s5, 132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4213,7 +4210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010c0a8c: 0x10c0a8c: sw    s4, 128(sp)
+// 0x010c10cc: 0x10c10cc: sw    s4, 128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4222,7 +4219,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c0a90: 0x10c0a90: sw    s3, 124(sp)
+// 0x010c10d0: 0x10c10d0: sw    s3, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4231,7 +4228,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010c0a94: 0x10c0a94: sw    s2, 120(sp)
+// 0x010c10d4: 0x10c10d4: sw    s2, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4240,7 +4237,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010c0a98: 0x10c0a98: sw    s0, 112(sp)
+// 0x010c10d8: 0x10c10d8: sw    s0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4249,10 +4246,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c0a9c: 0x10c0a9c: addu  s6, a2, zero
+// 0x010c10dc: 0x10c10dc: addu  s6, a2, zero
 	ldloc.3
 	stloc 12
-// 0x010c0aa0: 0x10c0aa0: sw    a0, 152(sp)
+// 0x010c10e0: 0x10c10e0: sw    a0, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4261,32 +4258,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010c0aa4: 0x10c0aa4: beq   a2, zero, 0x10c0ab8 addiu s1, a1, -1
+// 0x010c10e4: 0x10c10e4: beq   a2, zero, 0x10c10f8 addiu s1, a1, -1
 	ldloc.3
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 10
-	brfalse L_10c0ab8
+	brfalse L_10c10f8
 // --- basic block ---
-// 0x010c0aac: 0x10c0aac: addu  s4, a0, zero
+// 0x010c10ec: 0x10c10ec: addu  s4, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c0ab0: 0x10c0ab0: j	 0x10c16f0 addu  s8, zero, zero
+// 0x010c10f0: 0x10c10f0: j	 0x10c1d30 addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_10c16f0
+	br L_10c1d30
 // --- basic block ---
-L_10c0ab8:
-// 0x010c0ab8: 0x10c0ab8: lui   v0, 0x20000
+L_10c10f8:
+// 0x010c10f8: 0x10c10f8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010c0abc: 0x10c0abc: addiu v0, v0, 23360
+// 0x010c10fc: 0x10c10fc: addiu v0, v0, 23820
 	ldloc 5
-	ldc.i4 23360
+	ldc.i4 23820
 	add
 	stloc 5
-// 0x010c0ac0: 0x10c0ac0: lw    s4, 152(sp)
+// 0x010c1100: 0x10c1100: lw    s4, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4295,115 +4292,115 @@ L_10c0ab8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c0ac4: 0x10c0ac4: j	 0x10c0adc addu  a1, s1, v0
+// 0x010c1104: 0x10c1104: j	 0x10c111c addu  a1, s1, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc.2
-	br L_10c0adc
+	br L_10c111c
 // --- basic block ---
-L_10c0acc:
-// 0x010c0acc: 0x10c0acc: beq   v0, a1, 0x10c1724 addiu v0, v0, 1
+L_10c110c:
+// 0x010c110c: 0x10c110c: beq   v0, a1, 0x10c1d64 addiu v0, v0, 1
 	ldloc 5
 	ldloc.2
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c0ad4: 0x10c0ad4: sb    v1, 0(s4)
+// 0x010c1114: 0x10c1114: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c0ad8: 0x10c0ad8: addiu s4, s4, 1
+// 0x010c1118: 0x10c1118: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c0adc:
-// 0x010c0adc: 0x10c0adc: lb    v1, 0(v0)
+L_10c111c:
+// 0x010c111c: 0x10c111c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c0ae0: 0x10c0ae0: sll   zero, zero, 0
-// 0x010c0ae4: 0x10c0ae4: bne   v1, zero, 0x10c0acc sll   zero, zero, 0
+// 0x010c1120: 0x10c1120: sll   zero, zero, 0
+// 0x010c1124: 0x10c1124: bne   v1, zero, 0x10c110c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10c0acc
+	brtrue L_10c110c
 // --- basic block ---
-// 0x010c0aec: 0x10c0aec: j	 0x10c1724 sll   zero, zero, 0
-	br L_10c1724
+// 0x010c112c: 0x10c112c: j	 0x10c1d64 sll   zero, zero, 0
+	br L_10c1d64
 // --- basic block ---
-L_10c0af4:
-// 0x010c0af4: 0x10c0af4: beq   a0, s1, 0x10c1724 sll   zero, zero, 0
+L_10c1134:
+// 0x010c1134: 0x10c1134: beq   a0, s1, 0x10c1d64 sll   zero, zero, 0
 	ldloc.1
 	ldloc 10
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c0afc: 0x10c0afc: beq   v1, zero, 0x10c1724 addiu a0, a0, 1
+// 0x010c113c: 0x10c113c: beq   v1, zero, 0x10c1d64 addiu a0, a0, 1
 	ldloc 6
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brfalse L_10c1724
+	brfalse L_10c1d64
 // --- basic block ---
-// 0x010c0b04: 0x10c0b04: sb    v1, 0(s4)
+// 0x010c1144: 0x10c1144: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c0b08: 0x10c0b08: addiu s4, s4, 1
+// 0x010c1148: 0x10c1148: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c0b0c:
-// 0x010c0b0c: 0x10c0b0c: lb    v1, 0(s6)
+L_10c114c:
+// 0x010c114c: 0x10c114c: lb    v1, 0(s6)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c0b10: 0x10c0b10: addiu v0, zero, 37
+// 0x010c1150: 0x10c1150: addiu v0, zero, 37
 	ldc.i4.s 37
 	stloc 5
-// 0x010c0b14: 0x10c0b14: addiu s6, s6, 1
+// 0x010c1154: 0x10c1154: addiu s6, s6, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010c0b18: 0x10c0b18: bne   v1, v0, 0x10c0af4 subu  s0, s1, a0
+// 0x010c1158: 0x10c1158: bne   v1, v0, 0x10c1134 subu  s0, s1, a0
 	ldloc 6
 	ldloc 5
 	ldloc 10
 	ldloc.1
 	sub
 	stloc 9
-	bne.un L_10c0af4
+	bne.un L_10c1134
 // --- basic block ---
-// 0x010c0b20: 0x10c0b20: addu  t3, zero, zero
+// 0x010c1160: 0x10c1160: addu  t3, zero, zero
 	ldc.i4.s 0
 	stloc 18
-// 0x010c0b24: 0x10c0b24: addu  s1, zero, zero
+// 0x010c1164: 0x10c1164: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010c0b28: 0x10c0b28: addu  t2, zero, zero
+// 0x010c1168: 0x10c1168: addu  t2, zero, zero
 	ldc.i4.s 0
 	stloc 20
-// 0x010c0b2c: 0x10c0b2c: addiu t1, zero, 43
+// 0x010c116c: 0x10c116c: addiu t1, zero, 43
 	ldc.i4.s 43
 	stloc 17
-// 0x010c0b30: 0x10c0b30: addiu t0, zero, 32
+// 0x010c1170: 0x10c1170: addiu t0, zero, 32
 	ldc.i4.s 32
 	stloc 19
-// 0x010c0b34: 0x10c0b34: addiu a2, zero, 35
+// 0x010c1174: 0x10c1174: addiu a2, zero, 35
 	ldc.i4.s 35
 	stloc.3
-// 0x010c0b38: 0x10c0b38: addiu a1, zero, 45
+// 0x010c1178: 0x10c1178: addiu a1, zero, 45
 	ldc.i4.s 45
 	stloc.2
-// 0x010c0b3c: 0x10c0b3c: addiu a0, zero, 48
+// 0x010c117c: 0x10c117c: addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
-// 0x010c0b40: 0x10c0b40: sw    zero, 100(sp)
+// 0x010c1180: 0x10c1180: sw    zero, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4412,7 +4409,7 @@ L_10c0b0c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c0b44: 0x10c0b44: j	 0x10c0b80 sw    zero, 104(sp)
+// 0x010c1184: 0x10c1184: j	 0x10c11c0 sw    zero, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4421,15 +4418,15 @@ L_10c0b0c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10c0b80
+	br L_10c11c0
 // --- basic block ---
-L_10c0b4c:
-// 0x010c0b4c: 0x10c0b4c: addiu s6, s6, 1
+L_10c118c:
+// 0x010c118c: 0x10c118c: addiu s6, s6, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010c0b50: 0x10c0b50: j	 0x10c0b80 sw    v0, 104(sp)
+// 0x010c1190: 0x10c1190: j	 0x10c11c0 sw    v0, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4438,37 +4435,37 @@ L_10c0b4c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10c0b80
+	br L_10c11c0
 // --- basic block ---
-L_10c0b58:
-// 0x010c0b58: 0x10c0b58: addiu s6, s6, 1
+L_10c1198:
+// 0x010c1198: 0x10c1198: addiu s6, s6, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010c0b5c: 0x10c0b5c: j	 0x10c0b80 addiu t2, zero, 1
+// 0x010c119c: 0x10c119c: j	 0x10c11c0 addiu t2, zero, 1
 	ldc.i4.1
 	stloc 20
-	br L_10c0b80
+	br L_10c11c0
 // --- basic block ---
-L_10c0b64:
-// 0x010c0b64: 0x10c0b64: addiu s6, s6, 1
+L_10c11a4:
+// 0x010c11a4: 0x10c11a4: addiu s6, s6, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010c0b68: 0x10c0b68: j	 0x10c0b80 addiu s1, zero, 1
+// 0x010c11a8: 0x10c11a8: j	 0x10c11c0 addiu s1, zero, 1
 	ldc.i4.1
 	stloc 10
-	br L_10c0b80
+	br L_10c11c0
 // --- basic block ---
-L_10c0b70:
-// 0x010c0b70: 0x10c0b70: addiu s6, s6, 1
+L_10c11b0:
+// 0x010c11b0: 0x10c11b0: addiu s6, s6, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010c0b74: 0x10c0b74: j	 0x10c0b80 sw    v1, 100(sp)
+// 0x010c11b4: 0x10c11b4: j	 0x10c11c0 sw    v1, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4477,182 +4474,182 @@ L_10c0b70:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10c0b80
+	br L_10c11c0
 // --- basic block ---
-L_10c0b7c:
-// 0x010c0b7c: 0x10c0b7c: addiu t3, zero, 1
+L_10c11bc:
+// 0x010c11bc: 0x10c11bc: addiu t3, zero, 1
 	ldc.i4.1
 	stloc 18
-L_10c0b80:
-// 0x010c0b80: 0x10c0b80: lb    v1, 0(s6)
+L_10c11c0:
+// 0x010c11c0: 0x10c11c0: lb    v1, 0(s6)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c0b84: 0x10c0b84: sll   zero, zero, 0
-// 0x010c0b88: 0x10c0b88: beq   v1, t1, 0x10c0b58 slti  v0, v1, 44
+// 0x010c11c4: 0x10c11c4: sll   zero, zero, 0
+// 0x010c11c8: 0x10c11c8: beq   v1, t1, 0x10c1198 slti  v0, v1, 44
 	ldloc 6
 	ldloc 17
 	ldloc 6
 	ldc.i4.s 44
 	clt
 	stloc 5
-	beq  L_10c0b58
+	beq  L_10c1198
 // --- basic block ---
-// 0x010c0b90: 0x10c0b90: beq   v0, zero, 0x10c0bb0 sll   zero, zero, 0
+// 0x010c11d0: 0x10c11d0: beq   v0, zero, 0x10c11f0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c0bb0
+	brfalse L_10c11f0
 // --- basic block ---
-// 0x010c0b98: 0x10c0b98: beq   v1, t0, 0x10c0b64 sll   zero, zero, 0
+// 0x010c11d8: 0x10c11d8: beq   v1, t0, 0x10c11a4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 19
-	beq  L_10c0b64
+	beq  L_10c11a4
 // --- basic block ---
-// 0x010c0ba0: 0x10c0ba0: bne   v1, a2, 0x10c1708 addiu v0, zero, 42
+// 0x010c11e0: 0x10c11e0: bne   v1, a2, 0x10c1d48 addiu v0, zero, 42
 	ldloc 6
 	ldloc.3
 	ldc.i4.s 42
 	stloc 5
-	bne.un L_10c1708
+	bne.un L_10c1d48
 // --- basic block ---
-// 0x010c0ba8: 0x10c0ba8: j	 0x10c0b7c addiu s6, s6, 1
+// 0x010c11e8: 0x10c11e8: j	 0x10c11bc addiu s6, s6, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-	br L_10c0b7c
+	br L_10c11bc
 // --- basic block ---
-L_10c0bb0:
-// 0x010c0bb0: 0x10c0bb0: beq   v1, a1, 0x10c0b4c addiu v0, zero, 1
+L_10c11f0:
+// 0x010c11f0: 0x10c11f0: beq   v1, a1, 0x10c118c addiu v0, zero, 1
 	ldloc 6
 	ldloc.2
 	ldc.i4.1
 	stloc 5
-	beq  L_10c0b4c
+	beq  L_10c118c
 // --- basic block ---
-// 0x010c0bb8: 0x10c0bb8: bne   v1, a0, 0x10c1708 addiu v0, zero, 42
+// 0x010c11f8: 0x10c11f8: bne   v1, a0, 0x10c1d48 addiu v0, zero, 42
 	ldloc 6
 	ldloc.1
 	ldc.i4.s 42
 	stloc 5
-	bne.un L_10c1708
+	bne.un L_10c1d48
 // --- basic block ---
-// 0x010c0bc0: 0x10c0bc0: j	 0x10c0b70 addiu v1, zero, 1
+// 0x010c1200: 0x10c1200: j	 0x10c11b0 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10c0b70
+	br L_10c11b0
 // --- basic block ---
-L_10c0bc8:
-// 0x010c0bc8: 0x10c0bc8: lw    s5, 0(a3)
+L_10c1208:
+// 0x010c1208: 0x10c1208: lw    s5, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x010c0bcc: 0x10c0bcc: j	 0x10c0c28 addiu a3, a3, 4
+// 0x010c120c: 0x10c120c: j	 0x10c1268 addiu a3, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-	br L_10c0c28
+	br L_10c1268
 // --- basic block ---
-L_10c0bd4:
-// 0x010c0bd4: 0x10c0bd4: sltiu v0, v0, 10
+L_10c1214:
+// 0x010c1214: 0x10c1214: sltiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt.un
 	stloc 5
-// 0x010c0bd8: 0x10c0bd8: bne   v0, zero, 0x10c0be8 sll   zero, zero, 0
+// 0x010c1218: 0x10c1218: bne   v0, zero, 0x10c1228 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10c0be8
+	brtrue L_10c1228
 // --- basic block ---
-// 0x010c0be0: 0x10c0be0: j	 0x10c0c28 addiu s5, zero, -1
+// 0x010c1220: 0x10c1220: j	 0x10c1268 addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 13
-	br L_10c0c28
+	br L_10c1268
 // --- basic block ---
-L_10c0be8:
-// 0x010c0be8: 0x10c0be8: j	 0x10c0bf8 addu  s5, zero, zero
+L_10c1228:
+// 0x010c1228: 0x10c1228: j	 0x10c1238 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_10c0bf8
+	br L_10c1238
 // --- basic block ---
-L_10c0bf0:
-// 0x010c0bf0: 0x10c0bf0: addiu s5, v1, -48
+L_10c1230:
+// 0x010c1230: 0x10c1230: addiu s5, v1, -48
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc 13
-// 0x010c0bf4: 0x10c0bf4: addu  s6, a1, zero
+// 0x010c1234: 0x10c1234: addu  s6, a1, zero
 	ldloc.2
 	stloc 12
-L_10c0bf8:
-// 0x010c0bf8: 0x10c0bf8: sll   v0, s5, 3
+L_10c1238:
+// 0x010c1238: 0x10c1238: sll   v0, s5, 3
 	ldloc 13
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010c0bfc: 0x10c0bfc: sll   v1, s5, 1
+// 0x010c123c: 0x10c123c: sll   v1, s5, 1
 	ldloc 13
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x010c0c00: 0x10c0c00: addu  v1, v1, v0
+// 0x010c1240: 0x10c1240: addu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x010c0c04: 0x10c0c04: lb    v0, 0(s6)
+// 0x010c1244: 0x10c1244: lb    v0, 0(s6)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010c0c08: 0x10c0c08: sll   zero, zero, 0
-// 0x010c0c0c: 0x10c0c0c: addu  v1, v1, v0
+// 0x010c1248: 0x10c1248: sll   zero, zero, 0
+// 0x010c124c: 0x10c124c: addu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x010c0c10: 0x10c0c10: slti  a0, v0, 58
+// 0x010c1250: 0x10c1250: slti  a0, v0, 58
 	ldloc 5
 	ldc.i4.s 58
 	clt
 	stloc.1
-// 0x010c0c14: 0x10c0c14: slti  v0, v0, 48
+// 0x010c1254: 0x10c1254: slti  v0, v0, 48
 	ldloc 5
 	ldc.i4.s 48
 	clt
 	stloc 5
-// 0x010c0c18: 0x10c0c18: bne   v0, zero, 0x10c0c28 addiu a1, s6, 1
+// 0x010c1258: 0x10c1258: bne   v0, zero, 0x10c1268 addiu a1, s6, 1
 	ldloc 5
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc.2
-	brtrue L_10c0c28
+	brtrue L_10c1268
 // --- basic block ---
-// 0x010c0c20: 0x10c0c20: bne   a0, zero, 0x10c0bf0 sll   zero, zero, 0
+// 0x010c1260: 0x10c1260: bne   a0, zero, 0x10c1230 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10c0bf0
+	brtrue L_10c1230
 // --- basic block ---
-L_10c0c28:
-// 0x010c0c28: 0x10c0c28: lb    v1, 0(s6)
+L_10c1268:
+// 0x010c1268: 0x10c1268: lb    v1, 0(s6)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c0c2c: 0x10c0c2c: addiu v0, zero, 46
+// 0x010c126c: 0x10c126c: addiu v0, zero, 46
 	ldc.i4.s 46
 	stloc 5
-// 0x010c0c30: 0x10c0c30: beq   v1, v0, 0x10c0c44 addiu a1, zero, -1
+// 0x010c1270: 0x10c1270: beq   v1, v0, 0x10c1284 addiu a1, zero, -1
 	ldloc 6
 	ldloc 5
 	ldc.i4.m1
 	stloc.2
-	beq  L_10c0c44
+	beq  L_10c1284
 // --- basic block ---
-// 0x010c0c38: 0x10c0c38: addu  a0, s6, zero
+// 0x010c1278: 0x10c1278: addu  a0, s6, zero
 	ldloc 12
 	stloc.1
-// 0x010c0c3c: 0x10c0c3c: j	 0x10c0cc8 sw    a1, 96(sp)
+// 0x010c127c: 0x10c127c: j	 0x10c1308 sw    a1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4661,45 +4658,45 @@ L_10c0c28:
 	add
 	ldloc.2
 	stelem.i4
-	br L_10c0cc8
+	br L_10c1308
 // --- basic block ---
-L_10c0c44:
-// 0x010c0c44: 0x10c0c44: lb    v1, 1(s6)
+L_10c1284:
+// 0x010c1284: 0x10c1284: lb    v1, 1(s6)
 	ldloc 12
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c0c48: 0x10c0c48: addiu v0, zero, 42
+// 0x010c1288: 0x10c1288: addiu v0, zero, 42
 	ldc.i4.s 42
 	stloc 5
-// 0x010c0c4c: 0x10c0c4c: bne   v1, v0, 0x10c0c68 addiu a0, s6, 1
+// 0x010c128c: 0x10c128c: bne   v1, v0, 0x10c12a8 addiu a0, s6, 1
 	ldloc 6
 	ldloc 5
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_10c0c68
+	bne.un L_10c12a8
 // --- basic block ---
-// 0x010c0c54: 0x10c0c54: lw    a2, 0(a3)
+// 0x010c1294: 0x10c1294: lw    a2, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010c0c58: 0x10c0c58: addiu a0, s6, 2
+// 0x010c1298: 0x10c1298: addiu a0, s6, 2
 	ldloc 12
 	ldc.i4.2
 	add
 	stloc.1
-// 0x010c0c5c: 0x10c0c5c: addiu a3, a3, 4
+// 0x010c129c: 0x10c129c: addiu a3, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-// 0x010c0c60: 0x10c0c60: j	 0x10c0cc8 sw    a2, 96(sp)
+// 0x010c12a0: 0x10c12a0: j	 0x10c1308 sw    a2, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4708,26 +4705,26 @@ L_10c0c44:
 	add
 	ldloc.3
 	stelem.i4
-	br L_10c0cc8
+	br L_10c1308
 // --- basic block ---
-L_10c0c68:
-// 0x010c0c68: 0x10c0c68: addiu v0, v1, -48
+L_10c12a8:
+// 0x010c12a8: 0x10c12a8: addiu v0, v1, -48
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc 5
-// 0x010c0c6c: 0x10c0c6c: sltiu v0, v0, 10
+// 0x010c12ac: 0x10c12ac: sltiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt.un
 	stloc 5
-// 0x010c0c70: 0x10c0c70: bne   v0, zero, 0x10c0c80 addiu v0, zero, -1
+// 0x010c12b0: 0x10c12b0: bne   v0, zero, 0x10c12c0 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_10c0c80
+	brtrue L_10c12c0
 // --- basic block ---
-// 0x010c0c78: 0x10c0c78: j	 0x10c0cc8 sw    v0, 96(sp)
+// 0x010c12b8: 0x10c12b8: j	 0x10c1308 sw    v0, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4736,10 +4733,10 @@ L_10c0c68:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10c0cc8
+	br L_10c1308
 // --- basic block ---
-L_10c0c80:
-// 0x010c0c80: 0x10c0c80: j	 0x10c0c90 sw    zero, 96(sp)
+L_10c12c0:
+// 0x010c12c0: 0x10c12c0: j	 0x10c12d0 sw    zero, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4748,10 +4745,10 @@ L_10c0c80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10c0c90
+	br L_10c12d0
 // --- basic block ---
-L_10c0c88:
-// 0x010c0c88: 0x10c0c88: sw    v1, 96(sp)
+L_10c12c8:
+// 0x010c12c8: 0x10c12c8: sw    v1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4760,11 +4757,11 @@ L_10c0c88:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c0c8c: 0x10c0c8c: addu  a0, a2, zero
+// 0x010c12cc: 0x10c12cc: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-L_10c0c90:
-// 0x010c0c90: 0x10c0c90: lw    v1, 96(sp)
+L_10c12d0:
+// 0x010c12d0: 0x10c12d0: lw    v1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4773,315 +4770,315 @@ L_10c0c90:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0c94: 0x10c0c94: sll   zero, zero, 0
-// 0x010c0c98: 0x10c0c98: sll   v0, v1, 3
+// 0x010c12d4: 0x10c12d4: sll   zero, zero, 0
+// 0x010c12d8: 0x10c12d8: sll   v0, v1, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010c0c9c: 0x10c0c9c: sll   v1, v1, 1
+// 0x010c12dc: 0x10c12dc: sll   v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x010c0ca0: 0x10c0ca0: addu  v1, v1, v0
+// 0x010c12e0: 0x10c12e0: addu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x010c0ca4: 0x10c0ca4: lb    v0, 0(a0)
+// 0x010c12e4: 0x10c12e4: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010c0ca8: 0x10c0ca8: sll   zero, zero, 0
-// 0x010c0cac: 0x10c0cac: addu  v1, v1, v0
+// 0x010c12e8: 0x10c12e8: sll   zero, zero, 0
+// 0x010c12ec: 0x10c12ec: addu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x010c0cb0: 0x10c0cb0: slti  a1, v0, 58
+// 0x010c12f0: 0x10c12f0: slti  a1, v0, 58
 	ldloc 5
 	ldc.i4.s 58
 	clt
 	stloc.2
-// 0x010c0cb4: 0x10c0cb4: slti  v0, v0, 48
+// 0x010c12f4: 0x10c12f4: slti  v0, v0, 48
 	ldloc 5
 	ldc.i4.s 48
 	clt
 	stloc 5
-// 0x010c0cb8: 0x10c0cb8: bne   v0, zero, 0x10c0cc8 addiu a2, a0, 1
+// 0x010c12f8: 0x10c12f8: bne   v0, zero, 0x10c1308 addiu a2, a0, 1
 	ldloc 5
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.3
-	brtrue L_10c0cc8
+	brtrue L_10c1308
 // --- basic block ---
-// 0x010c0cc0: 0x10c0cc0: bne   a1, zero, 0x10c0c88 addiu v1, v1, -48
+// 0x010c1300: 0x10c1300: bne   a1, zero, 0x10c12c8 addiu v1, v1, -48
 	ldloc.2
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc 6
-	brtrue L_10c0c88
+	brtrue L_10c12c8
 // --- basic block ---
-L_10c0cc8:
-// 0x010c0cc8: 0x10c0cc8: lb    v1, 0(a0)
+L_10c1308:
+// 0x010c1308: 0x10c1308: lb    v1, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c0ccc: 0x10c0ccc: addiu v0, zero, 104
+// 0x010c130c: 0x10c130c: addiu v0, zero, 104
 	ldc.i4.s 104
 	stloc 5
-// 0x010c0cd0: 0x10c0cd0: beq   v1, v0, 0x10c0ce8 addiu v0, zero, 108
+// 0x010c1310: 0x10c1310: beq   v1, v0, 0x10c1328 addiu v0, zero, 108
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 108
 	stloc 5
-	beq  L_10c0ce8
+	beq  L_10c1328
 // --- basic block ---
-// 0x010c0cd8: 0x10c0cd8: beq   v1, v0, 0x10c0ce8 addiu v0, zero, 76
+// 0x010c1318: 0x10c1318: beq   v1, v0, 0x10c1328 addiu v0, zero, 76
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 76
 	stloc 5
-	beq  L_10c0ce8
+	beq  L_10c1328
 // --- basic block ---
-// 0x010c0ce0: 0x10c0ce0: bne   v1, v0, 0x10c0cf4 addiu v0, zero, 105
+// 0x010c1320: 0x10c1320: bne   v1, v0, 0x10c1334 addiu v0, zero, 105
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 105
 	stloc 5
-	bne.un L_10c0cf4
+	bne.un L_10c1334
 // --- basic block ---
-L_10c0ce8:
-// 0x010c0ce8: 0x10c0ce8: addiu a0, a0, 1
+L_10c1328:
+// 0x010c1328: 0x10c1328: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010c0cec: 0x10c0cec: lb    v1, 0(a0)
+// 0x010c132c: 0x10c132c: lb    v1, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c0cf0: 0x10c0cf0: addiu v0, zero, 105
+// 0x010c1330: 0x10c1330: addiu v0, zero, 105
 	ldc.i4.s 105
 	stloc 5
-L_10c0cf4:
-// 0x010c0cf4: 0x10c0cf4: beq   v1, v0, 0x10c0e30 addiu s6, a0, 1
+L_10c1334:
+// 0x010c1334: 0x10c1334: beq   v1, v0, 0x10c1470 addiu s6, a0, 1
 	ldloc 6
 	ldloc 5
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc 12
-	beq  L_10c0e30
+	beq  L_10c1470
 // --- basic block ---
-// 0x010c0cfc: 0x10c0cfc: slti  v0, v1, 106
+// 0x010c133c: 0x10c133c: slti  v0, v1, 106
 	ldloc 6
 	ldc.i4.s 106
 	clt
 	stloc 5
-// 0x010c0d00: 0x10c0d00: beq   v0, zero, 0x10c0d58 addiu v0, zero, 112
+// 0x010c1340: 0x10c1340: beq   v0, zero, 0x10c1398 addiu v0, zero, 112
 	ldloc 5
 	ldc.i4.s 112
 	stloc 5
-	brfalse L_10c0d58
+	brfalse L_10c1398
 // --- basic block ---
-// 0x010c0d08: 0x10c0d08: addiu v0, zero, 99
+// 0x010c1348: 0x10c1348: addiu v0, zero, 99
 	ldc.i4.s 99
 	stloc 5
-// 0x010c0d0c: 0x10c0d0c: beq   v1, v0, 0x10c167c slti  v0, v1, 100
+// 0x010c134c: 0x10c134c: beq   v1, v0, 0x10c1cbc slti  v0, v1, 100
 	ldloc 6
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 100
 	clt
 	stloc 5
-	beq  L_10c167c
+	beq  L_10c1cbc
 // --- basic block ---
-// 0x010c0d14: 0x10c0d14: beq   v0, zero, 0x10c0d40 addiu v0, zero, 100
+// 0x010c1354: 0x10c1354: beq   v0, zero, 0x10c1380 addiu v0, zero, 100
 	ldloc 5
 	ldc.i4.s 100
 	stloc 5
-	brfalse L_10c0d40
+	brfalse L_10c1380
 // --- basic block ---
-// 0x010c0d1c: 0x10c0d1c: addiu v0, zero, 88
+// 0x010c135c: 0x10c135c: addiu v0, zero, 88
 	ldc.i4.s 88
 	stloc 5
-// 0x010c0d20: 0x10c0d20: beq   v1, v0, 0x10c0df8 addiu v0, zero, 98
+// 0x010c1360: 0x10c1360: beq   v1, v0, 0x10c1438 addiu v0, zero, 98
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 98
 	stloc 5
-	beq  L_10c0df8
+	beq  L_10c1438
 // --- basic block ---
-// 0x010c0d28: 0x10c0d28: beq   v1, v0, 0x10c0da4 addiu v0, zero, 37
+// 0x010c1368: 0x10c1368: beq   v1, v0, 0x10c13e4 addiu v0, zero, 37
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 37
 	stloc 5
-	beq  L_10c0da4
+	beq  L_10c13e4
 // --- basic block ---
-// 0x010c0d30: 0x10c0d30: bne   v1, v0, 0x10c16c4 addiu s1, s0, -1
+// 0x010c1370: 0x10c1370: bne   v1, v0, 0x10c1d04 addiu s1, s0, -1
 	ldloc 6
 	ldloc 5
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 10
-	bne.un L_10c16c4
+	bne.un L_10c1d04
 // --- basic block ---
-// 0x010c0d38: 0x10c0d38: j	 0x10c1694 sll   zero, zero, 0
-	br L_10c1694
+// 0x010c1378: 0x10c1378: j	 0x10c1cd4 sll   zero, zero, 0
+	br L_10c1cd4
 // --- basic block ---
-L_10c0d40:
-// 0x010c0d40: 0x10c0d40: beq   v1, v0, 0x10c0e30 addiu v0, zero, 102
+L_10c1380:
+// 0x010c1380: 0x10c1380: beq   v1, v0, 0x10c1470 addiu v0, zero, 102
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 102
 	stloc 5
-	beq  L_10c0e30
+	beq  L_10c1470
 // --- basic block ---
-// 0x010c0d48: 0x10c0d48: bne   v1, v0, 0x10c16c4 addiu v0, a3, 7
+// 0x010c1388: 0x10c1388: bne   v1, v0, 0x10c1d04 addiu v0, a3, 7
 	ldloc 6
 	ldloc 5
 	ldloc 4
 	ldc.i4.7
 	add
 	stloc 5
-	bne.un L_10c16c4
+	bne.un L_10c1d04
 // --- basic block ---
-// 0x010c0d50: 0x10c0d50: j	 0x10c10e4 addiu v1, zero, -8
+// 0x010c1390: 0x10c1390: j	 0x10c1724 addiu v1, zero, -8
 	ldc.i4.s -8
 	stloc 6
-	br L_10c10e4
+	br L_10c1724
 // --- basic block ---
-L_10c0d58:
-// 0x010c0d58: 0x10c0d58: beq   v1, v0, 0x10c0dd4 slti  v0, v1, 113
+L_10c1398:
+// 0x010c1398: 0x10c1398: beq   v1, v0, 0x10c1414 slti  v0, v1, 113
 	ldloc 6
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 113
 	clt
 	stloc 5
-	beq  L_10c0dd4
+	beq  L_10c1414
 // --- basic block ---
-// 0x010c0d60: 0x10c0d60: beq   v0, zero, 0x10c0d84 addiu v0, zero, 117
+// 0x010c13a0: 0x10c13a0: beq   v0, zero, 0x10c13c4 addiu v0, zero, 117
 	ldloc 5
 	ldc.i4.s 117
 	stloc 5
-	brfalse L_10c0d84
+	brfalse L_10c13c4
 // --- basic block ---
-// 0x010c0d68: 0x10c0d68: addiu v0, zero, 110
+// 0x010c13a8: 0x10c13a8: addiu v0, zero, 110
 	ldc.i4.s 110
 	stloc 5
-// 0x010c0d6c: 0x10c0d6c: beq   v1, v0, 0x10c16a8 addiu v0, zero, 111
+// 0x010c13ac: 0x10c13ac: beq   v1, v0, 0x10c1ce8 addiu v0, zero, 111
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 111
 	stloc 5
-	beq  L_10c16a8
+	beq  L_10c1ce8
 // --- basic block ---
-// 0x010c0d74: 0x10c0d74: bne   v1, v0, 0x10c16c4 addiu v0, a3, 4
+// 0x010c13b4: 0x10c13b4: bne   v1, v0, 0x10c1d04 addiu v0, a3, 4
 	ldloc 6
 	ldloc 5
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 5
-	bne.un L_10c16c4
+	bne.un L_10c1d04
 // --- basic block ---
-// 0x010c0d7c: 0x10c0d7c: j	 0x10c0dc0 lui   v1, 0x0
+// 0x010c13bc: 0x10c13bc: j	 0x10c1400 lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-	br L_10c0dc0
+	br L_10c1400
 // --- basic block ---
-L_10c0d84:
-// 0x010c0d84: 0x10c0d84: beq   v1, v0, 0x10c0e14 addiu v0, zero, 120
+L_10c13c4:
+// 0x010c13c4: 0x10c13c4: beq   v1, v0, 0x10c1454 addiu v0, zero, 120
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 120
 	stloc 5
-	beq  L_10c0e14
+	beq  L_10c1454
 // --- basic block ---
-// 0x010c0d8c: 0x10c0d8c: beq   v1, v0, 0x10c0de0 addiu v0, zero, 115
+// 0x010c13cc: 0x10c13cc: beq   v1, v0, 0x10c1420 addiu v0, zero, 115
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 115
 	stloc 5
-	beq  L_10c0de0
+	beq  L_10c1420
 // --- basic block ---
-// 0x010c0d94: 0x10c0d94: bne   v1, v0, 0x10c16c4 addiu s7, a3, 4
+// 0x010c13d4: 0x10c13d4: bne   v1, v0, 0x10c1d04 addiu s7, a3, 4
 	ldloc 6
 	ldloc 5
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 15
-	bne.un L_10c16c4
+	bne.un L_10c1d04
 // --- basic block ---
-// 0x010c0d9c: 0x10c0d9c: j	 0x10c14f0 sll   zero, zero, 0
-	br L_10c14f0
+// 0x010c13dc: 0x10c13dc: j	 0x10c1b30 sll   zero, zero, 0
+	br L_10c1b30
 // --- basic block ---
-L_10c0da4:
-// 0x010c0da4: 0x10c0da4: addiu v0, a3, 4
+L_10c13e4:
+// 0x010c13e4: 0x10c13e4: addiu v0, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010c0da8: 0x10c0da8: lui   v1, 0x0
+// 0x010c13e8: 0x10c13e8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c0dac: 0x10c0dac: lw    a3, 0(a3)
+// 0x010c13ec: 0x10c13ec: lw    a3, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010c0db0: 0x10c0db0: addu  s7, v0, zero
+// 0x010c13f0: 0x10c13f0: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010c0db4: 0x10c0db4: addiu a2, v1, 20608
+// 0x010c13f4: 0x10c13f4: addiu a2, v1, 20608
 	ldloc 6
 	ldc.i4 20608
 	add
 	stloc.3
-// 0x010c0db8: 0x10c0db8: j	 0x10c1718 addiu a1, zero, 2
+// 0x010c13f8: 0x10c13f8: j	 0x10c1d58 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-	br L_10c1718
+	br L_10c1d58
 // --- basic block ---
-L_10c0dc0:
-// 0x010c0dc0: 0x10c0dc0: lw    a3, 0(a3)
+L_10c1400:
+// 0x010c1400: 0x10c1400: lw    a3, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010c0dc4: 0x10c0dc4: addu  s7, v0, zero
+// 0x010c1404: 0x10c1404: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010c0dc8: 0x10c0dc8: addiu a2, v1, 20612
+// 0x010c1408: 0x10c1408: addiu a2, v1, 20612
 	ldloc 6
 	ldc.i4 20612
 	add
 	stloc.3
-// 0x010c0dcc: 0x10c0dcc: j	 0x10c1718 addiu a1, zero, 8
+// 0x010c140c: 0x10c140c: j	 0x10c1d58 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
-	br L_10c1718
+	br L_10c1d58
 // --- basic block ---
-L_10c0dd4:
-// 0x010c0dd4: 0x10c0dd4: addiu s5, zero, 8
+L_10c1414:
+// 0x010c1414: 0x10c1414: addiu s5, zero, 8
 	ldc.i4.8
 	stloc 13
-// 0x010c0dd8: 0x10c0dd8: addiu t3, zero, 1
+// 0x010c1418: 0x10c1418: addiu t3, zero, 1
 	ldc.i4.1
 	stloc 18
-// 0x010c0ddc: 0x10c0ddc: sw    s5, 96(sp)
+// 0x010c141c: 0x10c141c: sw    s5, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5090,204 +5087,204 @@ L_10c0dd4:
 	add
 	ldloc 13
 	stelem.i4
-L_10c0de0:
-// 0x010c0de0: 0x10c0de0: addiu v0, a3, 4
+L_10c1420:
+// 0x010c1420: 0x10c1420: addiu v0, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010c0de4: 0x10c0de4: lui   v1, 0x0
+// 0x010c1424: 0x10c1424: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c0de8: 0x10c0de8: lw    a3, 0(a3)
+// 0x010c1428: 0x10c1428: lw    a3, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010c0dec: 0x10c0dec: addu  s7, v0, zero
+// 0x010c142c: 0x10c142c: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010c0df0: 0x10c0df0: j	 0x10c0e0c addiu a2, v1, 20624
+// 0x010c1430: 0x10c1430: j	 0x10c144c addiu a2, v1, 20624
 	ldloc 6
 	ldc.i4 20624
 	add
 	stloc.3
-	br L_10c0e0c
+	br L_10c144c
 // --- basic block ---
-L_10c0df8:
-// 0x010c0df8: 0x10c0df8: addiu v0, a3, 4
+L_10c1438:
+// 0x010c1438: 0x10c1438: addiu v0, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010c0dfc: 0x10c0dfc: lui   v1, 0x0
+// 0x010c143c: 0x10c143c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c0e00: 0x10c0e00: lw    a3, 0(a3)
+// 0x010c1440: 0x10c1440: lw    a3, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010c0e04: 0x10c0e04: addu  s7, v0, zero
+// 0x010c1444: 0x10c1444: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010c0e08: 0x10c0e08: addiu a2, v1, 20644
+// 0x010c1448: 0x10c1448: addiu a2, v1, 20644
 	ldloc 6
 	ldc.i4 20644
 	add
 	stloc.3
-L_10c0e0c:
-// 0x010c0e0c: 0x10c0e0c: j	 0x10c1718 addiu a1, zero, 16
+L_10c144c:
+// 0x010c144c: 0x10c144c: j	 0x10c1d58 addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-	br L_10c1718
+	br L_10c1d58
 // --- basic block ---
-L_10c0e14:
-// 0x010c0e14: 0x10c0e14: addiu v0, a3, 4
+L_10c1454:
+// 0x010c1454: 0x10c1454: addiu v0, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010c0e18: 0x10c0e18: lui   v1, 0x0
+// 0x010c1458: 0x10c1458: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c0e1c: 0x10c0e1c: lw    a3, 0(a3)
+// 0x010c145c: 0x10c145c: lw    a3, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010c0e20: 0x10c0e20: addu  s7, v0, zero
+// 0x010c1460: 0x10c1460: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x010c0e24: 0x10c0e24: addiu a2, v1, 20664
+// 0x010c1464: 0x10c1464: addiu a2, v1, 20664
 	ldloc 6
 	ldc.i4 20664
 	add
 	stloc.3
-// 0x010c0e28: 0x10c0e28: j	 0x10c1718 addiu a1, zero, 10
+// 0x010c1468: 0x10c1468: j	 0x10c1d58 addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-	br L_10c1718
+	br L_10c1d58
 // --- basic block ---
-L_10c0e30:
-// 0x010c0e30: 0x10c0e30: addiu v0, a3, 4
+L_10c1470:
+// 0x010c1470: 0x10c1470: addiu v0, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010c0e34: 0x10c0e34: lw    a3, 0(a3)
+// 0x010c1474: 0x10c1474: lw    a3, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010c0e38: 0x10c0e38: beq   t2, zero, 0x10c0e58 addu  s7, v0, zero
+// 0x010c1478: 0x10c1478: beq   t2, zero, 0x10c1498 addu  s7, v0, zero
 	ldloc 20
 	ldloc 5
 	stloc 15
-	brfalse L_10c0e58
+	brfalse L_10c1498
 // --- basic block ---
-// 0x010c0e40: 0x10c0e40: bltz  a3, 0x10c0e58 lui   v0, 0x0
+// 0x010c1480: 0x10c1480: bltz  a3, 0x10c1498 lui   v0, 0x0
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_10c0e58
+	blt L_10c1498
 // --- basic block ---
-// 0x010c0e48: 0x10c0e48: addiu a2, v0, 20664
+// 0x010c1488: 0x10c1488: addiu a2, v0, 20664
 	ldloc 5
 	ldc.i4 20664
 	add
 	stloc.3
-// 0x010c0e4c: 0x10c0e4c: addu  v1, a3, zero
+// 0x010c148c: 0x10c148c: addu  v1, a3, zero
 	ldloc 4
 	stloc 6
-// 0x010c0e50: 0x10c0e50: j	 0x10c0ea0 addiu t1, zero, 43
+// 0x010c1490: 0x10c1490: j	 0x10c14e0 addiu t1, zero, 43
 	ldc.i4.s 43
 	stloc 17
-	br L_10c0ea0
+	br L_10c14e0
 // --- basic block ---
-L_10c0e58:
-// 0x010c0e58: 0x10c0e58: beq   s1, zero, 0x10c0e78 sll   zero, zero, 0
+L_10c1498:
+// 0x010c1498: 0x10c1498: beq   s1, zero, 0x10c14b8 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10c0e78
+	brfalse L_10c14b8
 // --- basic block ---
-// 0x010c0e60: 0x10c0e60: bltz  a3, 0x10c0e90 lui   v0, 0x0
+// 0x010c14a0: 0x10c14a0: bltz  a3, 0x10c14d0 lui   v0, 0x0
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_10c0e90
+	blt L_10c14d0
 // --- basic block ---
-// 0x010c0e68: 0x10c0e68: addiu a2, v0, 20664
+// 0x010c14a8: 0x10c14a8: addiu a2, v0, 20664
 	ldloc 5
 	ldc.i4 20664
 	add
 	stloc.3
-// 0x010c0e6c: 0x10c0e6c: addu  v1, a3, zero
+// 0x010c14ac: 0x10c14ac: addu  v1, a3, zero
 	ldloc 4
 	stloc 6
-// 0x010c0e70: 0x10c0e70: j	 0x10c0ea0 addiu t1, zero, 32
+// 0x010c14b0: 0x10c14b0: j	 0x10c14e0 addiu t1, zero, 32
 	ldc.i4.s 32
 	stloc 17
-	br L_10c0ea0
+	br L_10c14e0
 // --- basic block ---
-L_10c0e78:
-// 0x010c0e78: 0x10c0e78: bltz  a3, 0x10c0e90 lui   v0, 0x0
+L_10c14b8:
+// 0x010c14b8: 0x10c14b8: bltz  a3, 0x10c14d0 lui   v0, 0x0
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_10c0e90
+	blt L_10c14d0
 // --- basic block ---
-// 0x010c0e80: 0x10c0e80: addiu a2, v0, 20664
+// 0x010c14c0: 0x10c14c0: addiu a2, v0, 20664
 	ldloc 5
 	ldc.i4 20664
 	add
 	stloc.3
-// 0x010c0e84: 0x10c0e84: addu  v1, a3, zero
+// 0x010c14c4: 0x10c14c4: addu  v1, a3, zero
 	ldloc 4
 	stloc 6
-// 0x010c0e88: 0x10c0e88: j	 0x10c0ea0 addu  t1, zero, zero
+// 0x010c14c8: 0x10c14c8: j	 0x10c14e0 addu  t1, zero, zero
 	ldc.i4.s 0
 	stloc 17
-	br L_10c0ea0
+	br L_10c14e0
 // --- basic block ---
-L_10c0e90:
-// 0x010c0e90: 0x10c0e90: lui   v0, 0x0
+L_10c14d0:
+// 0x010c14d0: 0x10c14d0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010c0e94: 0x10c0e94: addiu a2, v0, 20664
+// 0x010c14d4: 0x10c14d4: addiu a2, v0, 20664
 	ldloc 5
 	ldc.i4 20664
 	add
 	stloc.3
-// 0x010c0e98: 0x10c0e98: subu  v1, zero, a3
+// 0x010c14d8: 0x10c14d8: subu  v1, zero, a3
 	ldloc 4
 	neg
 	stloc 6
-// 0x010c0e9c: 0x10c0e9c: addiu t1, zero, 45
+// 0x010c14dc: 0x10c14dc: addiu t1, zero, 45
 	ldc.i4.s 45
 	stloc 17
-L_10c0ea0:
-// 0x010c0ea0: 0x10c0ea0: addiu a1, zero, 10
+L_10c14e0:
+// 0x010c14e0: 0x10c14e0: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-L_10c0ea4:
-// 0x010c0ea4: 0x10c0ea4: addiu a0, sp, 24
+L_10c14e4:
+// 0x010c14e4: 0x10c14e4: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-L_10c0ea8:
-// 0x010c0ea8: 0x10c0ea8: divu  v1, a1
+L_10c14e8:
+// 0x010c14e8: 0x10c14e8: divu  v1, a1
 	ldloc 6
 	ldloc.2
 	div.un
@@ -5296,39 +5293,39 @@ L_10c0ea8:
 	ldloc.2
 	rem.un
 	stloc 21
-// 0x010c0eac: 0x10c0eac: mfhi  hi
+// 0x010c14ec: 0x10c14ec: mfhi  hi
 	ldloc 21
 	stloc 5
-// 0x010c0eb0: 0x10c0eb0: addu  v0, a2, v0
+// 0x010c14f0: 0x10c14f0: addu  v0, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc 5
-// 0x010c0eb4: 0x10c0eb4: lbu   v0, 0(v0)
+// 0x010c14f4: 0x10c14f4: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010c0eb8: 0x10c0eb8: mflo  lo
+// 0x010c14f8: 0x10c14f8: mflo  lo
 	ldloc 23
 	stloc 6
-// 0x010c0ebc: 0x10c0ebc: sb    v0, 0(a0)
+// 0x010c14fc: 0x10c14fc: sb    v0, 0(a0)
 	ldloc.1
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c0ec0: 0x10c0ec0: bne   v1, zero, 0x10c0ea8 addiu a0, a0, 1
+// 0x010c1500: 0x10c1500: bne   v1, zero, 0x10c14e8 addiu a0, a0, 1
 	ldloc 6
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brtrue L_10c0ea8
+	brtrue L_10c14e8
 // --- basic block ---
-// 0x010c0ec8: 0x10c0ec8: addiu v0, sp, 24
+// 0x010c1508: 0x10c1508: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010c0ecc: 0x10c0ecc: lw    s8, 96(sp)
+// 0x010c150c: 0x10c150c: lw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5337,79 +5334,79 @@ L_10c0ea8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c0ed0: 0x10c0ed0: subu  a2, a0, v0
+// 0x010c1510: 0x10c1510: subu  a2, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.3
-// 0x010c0ed4: 0x10c0ed4: slt   v0, s8, a2
+// 0x010c1514: 0x10c1514: slt   v0, s8, a2
 	ldloc 11
 	ldloc.3
 	clt
 	stloc 5
-// 0x010c0ed8: 0x10c0ed8: beq   v0, zero, 0x10c0ee4 sll   zero, zero, 0
+// 0x010c1518: 0x10c1518: beq   v0, zero, 0x10c1524 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c0ee4
+	brfalse L_10c1524
 // --- basic block ---
-// 0x010c0ee0: 0x10c0ee0: addu  s8, a2, zero
+// 0x010c1520: 0x10c1520: addu  s8, a2, zero
 	ldloc.3
 	stloc 11
-L_10c0ee4:
-// 0x010c0ee4: 0x10c0ee4: beq   t1, zero, 0x10c0ef0 sll   zero, zero, 0
+L_10c1524:
+// 0x010c1524: 0x10c1524: beq   t1, zero, 0x10c1530 sll   zero, zero, 0
 	ldloc 17
-	brfalse L_10c0ef0
+	brfalse L_10c1530
 // --- basic block ---
-// 0x010c0eec: 0x10c0eec: addiu s8, s8, 1
+// 0x010c152c: 0x10c152c: addiu s8, s8, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_10c0ef0:
-// 0x010c0ef0: 0x10c0ef0: beq   t3, zero, 0x10c0f24 sll   zero, zero, 0
+L_10c1530:
+// 0x010c1530: 0x10c1530: beq   t3, zero, 0x10c1564 sll   zero, zero, 0
 	ldloc 18
-	brfalse L_10c0f24
+	brfalse L_10c1564
 // --- basic block ---
-// 0x010c0ef8: 0x10c0ef8: beq   a3, zero, 0x10c0f24 addiu v0, zero, 8
+// 0x010c1538: 0x10c1538: beq   a3, zero, 0x10c1564 addiu v0, zero, 8
 	ldloc 4
 	ldc.i4.8
 	stloc 5
-	brfalse L_10c0f24
+	brfalse L_10c1564
 // --- basic block ---
-// 0x010c0f00: 0x10c0f00: bne   a1, v0, 0x10c0f10 addiu v0, zero, 16
+// 0x010c1540: 0x10c1540: bne   a1, v0, 0x10c1550 addiu v0, zero, 16
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 16
 	stloc 5
-	bne.un L_10c0f10
+	bne.un L_10c1550
 // --- basic block ---
-// 0x010c0f08: 0x10c0f08: j	 0x10c0f24 addiu s8, s8, 1
+// 0x010c1548: 0x10c1548: j	 0x10c1564 addiu s8, s8, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	br L_10c0f24
+	br L_10c1564
 // --- basic block ---
-L_10c0f10:
-// 0x010c0f10: 0x10c0f10: beq   a1, v0, 0x10c0f20 addiu v0, zero, 2
+L_10c1550:
+// 0x010c1550: 0x10c1550: beq   a1, v0, 0x10c1560 addiu v0, zero, 2
 	ldloc.2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	beq  L_10c0f20
+	beq  L_10c1560
 // --- basic block ---
-// 0x010c0f18: 0x10c0f18: bne   a1, v0, 0x10c0f24 sll   zero, zero, 0
+// 0x010c1558: 0x10c1558: bne   a1, v0, 0x10c1564 sll   zero, zero, 0
 	ldloc.2
 	ldloc 5
-	bne.un L_10c0f24
+	bne.un L_10c1564
 // --- basic block ---
-L_10c0f20:
-// 0x010c0f20: 0x10c0f20: addiu s8, s8, 2
+L_10c1560:
+// 0x010c1560: 0x10c1560: addiu s8, s8, 2
 	ldloc 11
 	ldc.i4.2
 	add
 	stloc 11
-L_10c0f24:
-// 0x010c0f24: 0x10c0f24: lw    v0, 104(sp)
+L_10c1564:
+// 0x010c1564: 0x10c1564: lw    v0, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5418,20 +5415,20 @@ L_10c0f24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c0f28: 0x10c0f28: sll   zero, zero, 0
-// 0x010c0f2c: 0x10c0f2c: bne   v0, zero, 0x10c0f84 slt   v0, s8, s5
+// 0x010c1568: 0x10c1568: sll   zero, zero, 0
+// 0x010c156c: 0x10c156c: bne   v0, zero, 0x10c15c4 slt   v0, s8, s5
 	ldloc 5
 	ldloc 11
 	ldloc 13
 	clt
 	stloc 5
-	brtrue L_10c0f84
+	brtrue L_10c15c4
 // --- basic block ---
-// 0x010c0f34: 0x10c0f34: beq   v0, zero, 0x10c0f84 sll   zero, zero, 0
+// 0x010c1574: 0x10c1574: beq   v0, zero, 0x10c15c4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c0f84
+	brfalse L_10c15c4
 // --- basic block ---
-// 0x010c0f3c: 0x10c0f3c: lw    v1, 100(sp)
+// 0x010c157c: 0x10c157c: lw    v1, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5440,357 +5437,357 @@ L_10c0f24:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c0f40: 0x10c0f40: sll   zero, zero, 0
-// 0x010c0f44: 0x10c0f44: beq   v1, zero, 0x10c0f54 sll   zero, zero, 0
+// 0x010c1580: 0x10c1580: sll   zero, zero, 0
+// 0x010c1584: 0x10c1584: beq   v1, zero, 0x10c1594 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10c0f54
+	brfalse L_10c1594
 // --- basic block ---
-// 0x010c0f4c: 0x10c0f4c: j	 0x10c0f84 addu  s8, s5, zero
+// 0x010c158c: 0x10c158c: j	 0x10c15c4 addu  s8, s5, zero
 	ldloc 13
 	stloc 11
-	br L_10c0f84
+	br L_10c15c4
 // --- basic block ---
-L_10c0f54:
-// 0x010c0f54: 0x10c0f54: subu  v1, s5, s8
+L_10c1594:
+// 0x010c1594: 0x10c1594: subu  v1, s5, s8
 	ldloc 13
 	ldloc 11
 	sub
 	stloc 6
-// 0x010c0f58: 0x10c0f58: addu  a0, zero, zero
+// 0x010c1598: 0x10c1598: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010c0f5c: 0x10c0f5c: j	 0x10c0f78 addiu t0, zero, 32
+// 0x010c159c: 0x10c159c: j	 0x10c15b8 addiu t0, zero, 32
 	ldc.i4.s 32
 	stloc 19
-	br L_10c0f78
+	br L_10c15b8
 // --- basic block ---
-L_10c0f64:
-// 0x010c0f64: 0x10c0f64: beq   a0, s0, 0x10c1724 addiu v1, v1, -1
+L_10c15a4:
+// 0x010c15a4: 0x10c15a4: beq   a0, s0, 0x10c1d64 addiu v1, v1, -1
 	ldloc.1
 	ldloc 9
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c0f6c: 0x10c0f6c: sb    t0, 0(s4)
+// 0x010c15ac: 0x10c15ac: sb    t0, 0(s4)
 	ldloc 8
 	ldloc 19
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c0f70: 0x10c0f70: addiu a0, a0, 1
+// 0x010c15b0: 0x10c15b0: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010c0f74: 0x10c0f74: addiu s4, s4, 1
+// 0x010c15b4: 0x10c15b4: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c0f78:
-// 0x010c0f78: 0x10c0f78: bgtz  v1, 0x10c0f64 subu  v0, s0, a0
+L_10c15b8:
+// 0x010c15b8: 0x10c15b8: bgtz  v1, 0x10c15a4 subu  v0, s0, a0
 	ldloc 6
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 5
 	ldc.i4.s 0
-	bgt L_10c0f64
+	bgt L_10c15a4
 // --- basic block ---
-// 0x010c0f80: 0x10c0f80: addu  s0, v0, zero
+// 0x010c15c0: 0x10c15c0: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_10c0f84:
-// 0x010c0f84: 0x10c0f84: beq   t1, zero, 0x10c0fa0 addiu v0, zero, -1
+L_10c15c4:
+// 0x010c15c4: 0x10c15c4: beq   t1, zero, 0x10c15e0 addiu v0, zero, -1
 	ldloc 17
 	ldc.i4.m1
 	stloc 5
-	brfalse L_10c0fa0
+	brfalse L_10c15e0
 // --- basic block ---
-// 0x010c0f8c: 0x10c0f8c: addiu s0, s0, -1
+// 0x010c15cc: 0x10c15cc: addiu s0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x010c0f90: 0x10c0f90: beq   s0, v0, 0x10c1724 addiu s8, s8, -1
+// 0x010c15d0: 0x10c15d0: beq   s0, v0, 0x10c1d64 addiu s8, s8, -1
 	ldloc 9
 	ldloc 5
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c0f98: 0x10c0f98: sb    t1, 0(s4)
+// 0x010c15d8: 0x10c15d8: sb    t1, 0(s4)
 	ldloc 8
 	ldloc 17
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c0f9c: 0x10c0f9c: addiu s4, s4, 1
+// 0x010c15dc: 0x10c15dc: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c0fa0:
-// 0x010c0fa0: 0x10c0fa0: beq   t3, zero, 0x10c1044 subu  v0, s8, a2
+L_10c15e0:
+// 0x010c15e0: 0x10c15e0: beq   t3, zero, 0x10c1684 subu  v0, s8, a2
 	ldloc 18
 	ldloc 11
 	ldloc.3
 	sub
 	stloc 5
-	brfalse L_10c1044
+	brfalse L_10c1684
 // --- basic block ---
-// 0x010c0fa8: 0x10c0fa8: beq   a3, zero, 0x10c1044 sll   zero, zero, 0
+// 0x010c15e8: 0x10c15e8: beq   a3, zero, 0x10c1684 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10c1044
+	brfalse L_10c1684
 // --- basic block ---
-// 0x010c0fb0: 0x10c0fb0: addiu v0, zero, 2
+// 0x010c15f0: 0x10c15f0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010c0fb4: 0x10c0fb4: bne   a1, v0, 0x10c0fd4 addiu v0, zero, 8
+// 0x010c15f4: 0x10c15f4: bne   a1, v0, 0x10c1614 addiu v0, zero, 8
 	ldloc.2
 	ldloc 5
 	ldc.i4.8
 	stloc 5
-	bne.un L_10c0fd4
+	bne.un L_10c1614
 // --- basic block ---
-// 0x010c0fbc: 0x10c0fbc: addiu s0, s0, -1
+// 0x010c15fc: 0x10c15fc: addiu s0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x010c0fc0: 0x10c0fc0: addiu v0, zero, -1
+// 0x010c1600: 0x10c1600: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010c0fc4: 0x10c0fc4: beq   s0, v0, 0x10c1724 addiu s8, s8, -1
+// 0x010c1604: 0x10c1604: beq   s0, v0, 0x10c1d64 addiu s8, s8, -1
 	ldloc 9
 	ldloc 5
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c0fcc: 0x10c0fcc: j	 0x10c0ff0 addiu v0, zero, 37
+// 0x010c160c: 0x10c160c: j	 0x10c1630 addiu v0, zero, 37
 	ldc.i4.s 37
 	stloc 5
-	br L_10c0ff0
+	br L_10c1630
 // --- basic block ---
-L_10c0fd4:
-// 0x010c0fd4: 0x10c0fd4: bne   a1, v0, 0x10c0ffc addiu v0, zero, 16
+L_10c1614:
+// 0x010c1614: 0x10c1614: bne   a1, v0, 0x10c163c addiu v0, zero, 16
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 16
 	stloc 5
-	bne.un L_10c0ffc
+	bne.un L_10c163c
 // --- basic block ---
-// 0x010c0fdc: 0x10c0fdc: addiu s0, s0, -1
+// 0x010c161c: 0x10c161c: addiu s0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x010c0fe0: 0x10c0fe0: addiu v0, zero, -1
+// 0x010c1620: 0x10c1620: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010c0fe4: 0x10c0fe4: beq   s0, v0, 0x10c1724 addiu s8, s8, -1
+// 0x010c1624: 0x10c1624: beq   s0, v0, 0x10c1d64 addiu s8, s8, -1
 	ldloc 9
 	ldloc 5
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c0fec: 0x10c0fec: addiu v0, zero, 48
+// 0x010c162c: 0x10c162c: addiu v0, zero, 48
 	ldc.i4.s 48
 	stloc 5
-L_10c0ff0:
-// 0x010c0ff0: 0x10c0ff0: sb    v0, 0(s4)
+L_10c1630:
+// 0x010c1630: 0x10c1630: sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c0ff4: 0x10c0ff4: j	 0x10c1040 addiu s4, s4, 1
+// 0x010c1634: 0x10c1634: j	 0x10c1680 addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c1040
+	br L_10c1680
 // --- basic block ---
-L_10c0ffc:
-// 0x010c0ffc: 0x10c0ffc: bne   a1, v0, 0x10c1040 sll   zero, zero, 0
+L_10c163c:
+// 0x010c163c: 0x10c163c: bne   a1, v0, 0x10c1680 sll   zero, zero, 0
 	ldloc.2
 	ldloc 5
-	bne.un L_10c1040
+	bne.un L_10c1680
 // --- basic block ---
-// 0x010c1004: 0x10c1004: lui   v0, 0x0
+// 0x010c1644: 0x10c1644: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010c1008: 0x10c1008: addiu v0, v0, 20676
+// 0x010c1648: 0x10c1648: addiu v0, v0, 20676
 	ldloc 5
 	ldc.i4 20676
 	add
 	stloc 5
-// 0x010c100c: 0x10c100c: addu  v1, s0, zero
+// 0x010c164c: 0x10c164c: addu  v1, s0, zero
 	ldloc 9
 	stloc 6
-// 0x010c1010: 0x10c1010: addiu s8, s8, -2
+// 0x010c1650: 0x10c1650: addiu s8, s8, -2
 	ldloc 11
 	ldc.i4.s -2
 	add
 	stloc 11
-// 0x010c1014: 0x10c1014: j	 0x10c1030 addu  a1, s0, v0
+// 0x010c1654: 0x10c1654: j	 0x10c1670 addu  a1, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc.2
-	br L_10c1030
+	br L_10c1670
 // --- basic block ---
-L_10c101c:
-// 0x010c101c: 0x10c101c: beq   v0, a1, 0x10c1724 addiu v1, v1, -1
+L_10c165c:
+// 0x010c165c: 0x10c165c: beq   v0, a1, 0x10c1d64 addiu v1, v1, -1
 	ldloc 5
 	ldloc.2
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1024: 0x10c1024: sb    a0, 0(s4)
+// 0x010c1664: 0x10c1664: sb    a0, 0(s4)
 	ldloc 8
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1028: 0x10c1028: addiu v0, v0, 1
+// 0x010c1668: 0x10c1668: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010c102c: 0x10c102c: addiu s4, s4, 1
+// 0x010c166c: 0x10c166c: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c1030:
-// 0x010c1030: 0x10c1030: lb    a0, 0(v0)
+L_10c1670:
+// 0x010c1670: 0x10c1670: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010c1034: 0x10c1034: sll   zero, zero, 0
-// 0x010c1038: 0x10c1038: bne   a0, zero, 0x10c101c addu  s0, v1, zero
+// 0x010c1674: 0x10c1674: sll   zero, zero, 0
+// 0x010c1678: 0x10c1678: bne   a0, zero, 0x10c165c addu  s0, v1, zero
 	ldloc.1
 	ldloc 6
 	stloc 9
-	brtrue L_10c101c
+	brtrue L_10c165c
 // --- basic block ---
-L_10c1040:
-// 0x010c1040: 0x10c1040: subu  v0, s8, a2
+L_10c1680:
+// 0x010c1680: 0x10c1680: subu  v0, s8, a2
 	ldloc 11
 	ldloc.3
 	sub
 	stloc 5
-L_10c1044:
-// 0x010c1044: 0x10c1044: addu  v1, zero, zero
+L_10c1684:
+// 0x010c1684: 0x10c1684: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010c1048: 0x10c1048: j	 0x10c1064 addiu a0, zero, 48
+// 0x010c1688: 0x10c1688: j	 0x10c16a4 addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
-	br L_10c1064
+	br L_10c16a4
 // --- basic block ---
-L_10c1050:
-// 0x010c1050: 0x10c1050: beq   v1, s0, 0x10c1724 addiu v0, v0, -1
+L_10c1690:
+// 0x010c1690: 0x10c1690: beq   v1, s0, 0x10c1d64 addiu v0, v0, -1
 	ldloc 6
 	ldloc 9
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1058: 0x10c1058: sb    a0, 0(s4)
+// 0x010c1698: 0x10c1698: sb    a0, 0(s4)
 	ldloc 8
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c105c: 0x10c105c: addiu v1, v1, 1
+// 0x010c169c: 0x10c169c: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010c1060: 0x10c1060: addiu s4, s4, 1
+// 0x010c16a0: 0x10c16a0: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c1064:
-// 0x010c1064: 0x10c1064: bgtz  v0, 0x10c1050 subu  a1, s0, v1
+L_10c16a4:
+// 0x010c16a4: 0x10c16a4: bgtz  v0, 0x10c1690 subu  a1, s0, v1
 	ldloc 5
 	ldloc 9
 	ldloc 6
 	sub
 	stloc.2
 	ldc.i4.s 0
-	bgt L_10c1050
+	bgt L_10c1690
 // --- basic block ---
-// 0x010c106c: 0x10c106c: addu  v0, sp, a2
+// 0x010c16ac: 0x10c16ac: addu  v0, sp, a2
 	ldloc.0
 	ldloc.3
 	add
 	stloc 5
-// 0x010c1070: 0x10c1070: addiu v1, v0, 23
+// 0x010c16b0: 0x10c16b0: addiu v1, v0, 23
 	ldloc 5
 	ldc.i4.s 23
 	add
 	stloc 6
-// 0x010c1074: 0x10c1074: j	 0x10c1094 addu  a0, zero, zero
+// 0x010c16b4: 0x10c16b4: j	 0x10c16d4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10c1094
+	br L_10c16d4
 // --- basic block ---
-L_10c107c:
-// 0x010c107c: 0x10c107c: beq   a0, a1, 0x10c1724 addiu a2, a2, -1
+L_10c16bc:
+// 0x010c16bc: 0x10c16bc: beq   a0, a1, 0x10c1d64 addiu a2, a2, -1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1084: 0x10c1084: lbu   v0, 1(v1)
+// 0x010c16c4: 0x10c16c4: lbu   v0, 1(v1)
 	ldloc 6
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010c1088: 0x10c1088: addiu a0, a0, 1
+// 0x010c16c8: 0x10c16c8: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010c108c: 0x10c108c: sb    v0, 0(s4)
+// 0x010c16cc: 0x10c16cc: sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1090: 0x10c1090: addiu s4, s4, 1
+// 0x010c16d0: 0x10c16d0: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c1094:
-// 0x010c1094: 0x10c1094: addiu v1, v1, -1
+L_10c16d4:
+// 0x010c16d4: 0x10c16d4: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010c1098: 0x10c1098: bgtz  a2, 0x10c107c subu  s1, a1, a0
+// 0x010c16d8: 0x10c16d8: bgtz  a2, 0x10c16bc subu  s1, a1, a0
 	ldloc.3
 	ldloc.2
 	ldloc.1
 	sub
 	stloc 10
 	ldc.i4.s 0
-	bgt L_10c107c
+	bgt L_10c16bc
 // --- basic block ---
-// 0x010c10a0: 0x10c10a0: lw    a0, 104(sp)
+// 0x010c16e0: 0x10c16e0: lw    a0, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5799,77 +5796,77 @@ L_10c1094:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c10a4: 0x10c10a4: subu  v1, s5, s8
+// 0x010c16e4: 0x10c16e4: subu  v1, s5, s8
 	ldloc 13
 	ldloc 11
 	sub
 	stloc 6
-// 0x010c10a8: 0x10c10a8: sltu  v0, zero, t1
+// 0x010c16e8: 0x10c16e8: sltu  v0, zero, t1
 	ldc.i4.s 0
 	ldloc 17
 	clt.un
 	stloc 5
-// 0x010c10ac: 0x10c10ac: beq   a0, zero, 0x10c16ec subu  v0, v1, v0
+// 0x010c16ec: 0x10c16ec: beq   a0, zero, 0x10c1d2c subu  v0, v1, v0
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 5
-	brfalse L_10c16ec
+	brfalse L_10c1d2c
 // --- basic block ---
-// 0x010c10b4: 0x10c10b4: blez  v0, 0x10c16ec addu  a1, zero, zero
+// 0x010c16f4: 0x10c16f4: blez  v0, 0x10c1d2c addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
 	ldc.i4.s 0
-	ble L_10c16ec
+	ble L_10c1d2c
 // --- basic block ---
-// 0x010c10bc: 0x10c10bc: j	 0x10c10d4 addiu v1, zero, 32
+// 0x010c16fc: 0x10c16fc: j	 0x10c1714 addiu v1, zero, 32
 	ldc.i4.s 32
 	stloc 6
-	br L_10c10d4
+	br L_10c1714
 // --- basic block ---
-L_10c10c4:
-// 0x010c10c4: 0x10c10c4: beq   a1, s1, 0x10c1724 addiu a1, a1, 1
+L_10c1704:
+// 0x010c1704: 0x10c1704: beq   a1, s1, 0x10c1d64 addiu a1, a1, 1
 	ldloc.2
 	ldloc 10
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c10cc: 0x10c10cc: sb    v1, 0(s4)
+// 0x010c170c: 0x10c170c: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c10d0: 0x10c10d0: addiu s4, s4, 1
+// 0x010c1710: 0x10c1710: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c10d4:
-// 0x010c10d4: 0x10c10d4: bne   a1, v0, 0x10c10c4 subu  a0, s1, a1
+L_10c1714:
+// 0x010c1714: 0x10c1714: bne   a1, v0, 0x10c1704 subu  a0, s1, a1
 	ldloc.2
 	ldloc 5
 	ldloc 10
 	ldloc.2
 	sub
 	stloc.1
-	bne.un L_10c10c4
+	bne.un L_10c1704
 // --- basic block ---
-// 0x010c10dc: 0x10c10dc: j	 0x10c16ec addu  s1, a0, zero
+// 0x010c171c: 0x10c171c: j	 0x10c1d2c addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-	br L_10c16ec
+	br L_10c1d2c
 // --- basic block ---
-L_10c10e4:
-// 0x010c10e4: 0x10c10e4: and   v0, v0, v1
+L_10c1724:
+// 0x010c1724: 0x10c1724: and   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	and
 	stloc 5
-// 0x010c10e8: 0x10c10e8: lw    a1, 96(sp)
+// 0x010c1728: 0x10c1728: lw    a1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5878,7 +5875,7 @@ L_10c10e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c10ec: 0x10c10ec: lw    s3, 4(v0)
+// 0x010c172c: 0x10c172c: lw    s3, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5887,29 +5884,29 @@ L_10c10e4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010c10f0: 0x10c10f0: lw    s2, 0(v0)
+// 0x010c1730: 0x10c1730: lw    s2, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x010c10f4: 0x10c10f4: addiu s7, v0, 8
+// 0x010c1734: 0x10c1734: addiu s7, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 15
-// 0x010c10f8: 0x10c10f8: addiu v0, zero, -1
+// 0x010c1738: 0x10c1738: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010c10fc: 0x10c10fc: bne   a1, v0, 0x10c1108 addiu a2, zero, 6
+// 0x010c173c: 0x10c173c: bne   a1, v0, 0x10c1748 addiu a2, zero, 6
 	ldloc.2
 	ldloc 5
 	ldc.i4.6
 	stloc.3
-	bne.un L_10c1108
+	bne.un L_10c1748
 // --- basic block ---
-// 0x010c1104: 0x10c1104: sw    a2, 96(sp)
+// 0x010c1744: 0x10c1744: sw    a2, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5918,20 +5915,20 @@ L_10c10e4:
 	add
 	ldloc.3
 	stelem.i4
-L_10c1108:
-// 0x010c1108: 0x10c1108: beq   t2, zero, 0x10c1130 addu  a1, s3, zero
+L_10c1748:
+// 0x010c1748: 0x10c1748: beq   t2, zero, 0x10c1770 addu  a1, s3, zero
 	ldloc 20
 	ldloc 16
 	stloc.2
-	brfalse L_10c1130
+	brfalse L_10c1770
 // --- basic block ---
-// 0x010c1110: 0x10c1110: addu  a0, s2, zero
+// 0x010c1750: 0x10c1750: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-// 0x010c1114: 0x10c1114: addu  a3, zero, zero
+// 0x010c1754: 0x10c1754: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010c1118: 0x10c1118: jal   0x10c18fc addu  a2, zero, zero
+// 0x010c1758: 0x10c1758: jal   0x10c1f3c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5939,35 +5936,35 @@ L_10c1108:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gedf2_10c18fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gedf2_10c1f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1120: 0x10c1120: bltz  v0, 0x10c1130 sll   zero, zero, 0
+// 0x010c1760: 0x10c1760: bltz  v0, 0x10c1770 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	blt L_10c1130
+	blt L_10c1770
 // --- basic block ---
-// 0x010c1128: 0x10c1128: j	 0x10c1180 addiu s1, zero, 43
+// 0x010c1768: 0x10c1768: j	 0x10c17c0 addiu s1, zero, 43
 	ldc.i4.s 43
 	stloc 10
-	br L_10c1180
+	br L_10c17c0
 // --- basic block ---
-L_10c1130:
-// 0x010c1130: 0x10c1130: beq   s1, zero, 0x10c1158 addu  a1, s3, zero
+L_10c1770:
+// 0x010c1770: 0x10c1770: beq   s1, zero, 0x10c1798 addu  a1, s3, zero
 	ldloc 10
 	ldloc 16
 	stloc.2
-	brfalse L_10c1158
+	brfalse L_10c1798
 // --- basic block ---
-// 0x010c1138: 0x10c1138: addu  a0, s2, zero
+// 0x010c1778: 0x10c1778: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-// 0x010c113c: 0x10c113c: addu  a3, zero, zero
+// 0x010c177c: 0x10c177c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010c1140: 0x10c1140: jal   0x10c18fc addu  a2, zero, zero
+// 0x010c1780: 0x10c1780: jal   0x10c1f3c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5975,31 +5972,31 @@ L_10c1130:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gedf2_10c18fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gedf2_10c1f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1148: 0x10c1148: bltz  v0, 0x10c1158 addu  a1, s3, zero
+// 0x010c1788: 0x10c1788: bltz  v0, 0x10c1798 addu  a1, s3, zero
 	ldloc 5
 	ldloc 16
 	stloc.2
 	ldc.i4.s 0
-	blt L_10c1158
+	blt L_10c1798
 // --- basic block ---
-// 0x010c1150: 0x10c1150: j	 0x10c1180 addiu s1, zero, 32
+// 0x010c1790: 0x10c1790: j	 0x10c17c0 addiu s1, zero, 32
 	ldc.i4.s 32
 	stloc 10
-	br L_10c1180
+	br L_10c17c0
 // --- basic block ---
-L_10c1158:
-// 0x010c1158: 0x10c1158: addu  a0, s2, zero
+L_10c1798:
+// 0x010c1798: 0x10c1798: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-// 0x010c115c: 0x10c115c: addu  a3, zero, zero
+// 0x010c179c: 0x10c179c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010c1160: 0x10c1160: jal   0x10c188c addu  a2, zero, zero
+// 0x010c17a0: 0x10c17a0: jal   0x10c1ecc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6007,34 +6004,34 @@ L_10c1158:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1168: 0x10c1168: bgez  v0, 0x10c1180 addu  s1, zero, zero
+// 0x010c17a8: 0x10c17a8: bgez  v0, 0x10c17c0 addu  s1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	bge L_10c1180
+	bge L_10c17c0
 // --- basic block ---
-// 0x010c1170: 0x10c1170: lui   a0, 0x80000000
+// 0x010c17b0: 0x10c17b0: lui   a0, 0x80000000
 	ldc.i4 2147483648
 	stloc.1
-// 0x010c1174: 0x10c1174: xor   v0, s2, a0
+// 0x010c17b4: 0x10c17b4: xor   v0, s2, a0
 	ldloc 14
 	ldloc.1
 	xor
 	stloc 5
-// 0x010c1178: 0x10c1178: addu  s2, v0, zero
+// 0x010c17b8: 0x10c17b8: addu  s2, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010c117c: 0x10c117c: addiu s1, zero, 45
+// 0x010c17bc: 0x10c17bc: addiu s1, zero, 45
 	ldc.i4.s 45
 	stloc 10
-L_10c1180:
-// 0x010c1180: 0x10c1180: sw    s3, 20(sp)
+L_10c17c0:
+// 0x010c17c0: 0x10c17c0: sw    s3, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6043,7 +6040,7 @@ L_10c1180:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010c1184: 0x10c1184: sw    s2, 16(sp)
+// 0x010c17c4: 0x10c17c4: sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6052,81 +6049,81 @@ L_10c1180:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010c1188: 0x10c1188: addiu a0, sp, 16
+// 0x010c17c8: 0x10c17c8: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010c118c: 0x10c118c: cibyl_sysc_arg 0x4
+// 0x010c17cc: 0x10c17cc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c1190: 0x10c1190: cibyl_sysc 0x2521
+// 0x010c17d0: 0x10c17d0: cibyl_sysc 0x2521
 	call int32 [WazeWP7]Syscalls::__isnan_helper(int32)
 	stloc 5
-// 0x010c1194: 0x10c1194: addu  v1, v0, zero
+// 0x010c17d4: 0x10c17d4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c1198: 0x10c1198: beq   v1, zero, 0x10c11dc lui   v0, 0x20000
+// 0x010c17d8: 0x10c17d8: beq   v1, zero, 0x10c181c lui   v0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10c11dc
+	brfalse L_10c181c
 // --- basic block ---
-// 0x010c11a0: 0x10c11a0: addiu v0, v0, 23380
+// 0x010c17e0: 0x10c17e0: addiu v0, v0, 23840
 	ldloc 5
-	ldc.i4 23380
+	ldc.i4 23840
 	add
 	stloc 5
-// 0x010c11a4: 0x10c11a4: addu  s1, s0, zero
+// 0x010c17e4: 0x10c17e4: addu  s1, s0, zero
 	ldloc 9
 	stloc 10
-// 0x010c11a8: 0x10c11a8: j	 0x10c11c4 addu  a0, s0, v0
+// 0x010c17e8: 0x10c17e8: j	 0x10c1804 addu  a0, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc.1
-	br L_10c11c4
+	br L_10c1804
 // --- basic block ---
-L_10c11b0:
-// 0x010c11b0: 0x10c11b0: beq   v0, a0, 0x10c1724 addiu s1, s1, -1
+L_10c17f0:
+// 0x010c17f0: 0x10c17f0: beq   v0, a0, 0x10c1d64 addiu s1, s1, -1
 	ldloc 5
 	ldloc.1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c11b8: 0x10c11b8: sb    v1, 0(s4)
+// 0x010c17f8: 0x10c17f8: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c11bc: 0x10c11bc: addiu v0, v0, 1
+// 0x010c17fc: 0x10c17fc: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010c11c0: 0x10c11c0: addiu s4, s4, 1
+// 0x010c1800: 0x10c1800: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c11c4:
-// 0x010c11c4: 0x10c11c4: lb    v1, 0(v0)
+L_10c1804:
+// 0x010c1804: 0x10c1804: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c11c8: 0x10c11c8: sll   zero, zero, 0
-// 0x010c11cc: 0x10c11cc: bne   v1, zero, 0x10c11b0 addu  a3, s7, zero
+// 0x010c1808: 0x10c1808: sll   zero, zero, 0
+// 0x010c180c: 0x10c180c: bne   v1, zero, 0x10c17f0 addu  a3, s7, zero
 	ldloc 6
 	ldloc 15
 	stloc 4
-	brtrue L_10c11b0
+	brtrue L_10c17f0
 // --- basic block ---
-// 0x010c11d4: 0x10c11d4: j	 0x10c16f0 sll   zero, zero, 0
-	br L_10c16f0
+// 0x010c1814: 0x10c1814: j	 0x10c1d30 sll   zero, zero, 0
+	br L_10c1d30
 // --- basic block ---
-L_10c11dc:
-// 0x010c11dc: 0x10c11dc: sw    s3, 20(sp)
+L_10c181c:
+// 0x010c181c: 0x10c181c: sw    s3, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6135,7 +6132,7 @@ L_10c11dc:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010c11e0: 0x10c11e0: sw    s2, 16(sp)
+// 0x010c1820: 0x10c1820: sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6144,180 +6141,180 @@ L_10c11dc:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010c11e4: 0x10c11e4: cibyl_sysc_arg 0x4
+// 0x010c1824: 0x10c1824: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c11e8: 0x10c11e8: cibyl_sysc 0x2530
+// 0x010c1828: 0x10c1828: cibyl_sysc 0x2530
 	call int32 [WazeWP7]Syscalls::__isinf_helper(int32)
 	stloc 5
-// 0x010c11ec: 0x10c11ec: addu  v1, v0, zero
+// 0x010c182c: 0x10c182c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c11f0: 0x10c11f0: beq   v1, zero, 0x10c1238 addu  a1, s3, zero
+// 0x010c1830: 0x10c1830: beq   v1, zero, 0x10c1878 addu  a1, s3, zero
 	ldloc 6
 	ldloc 16
 	stloc.2
-	brfalse L_10c1238
+	brfalse L_10c1878
 // --- basic block ---
-// 0x010c11f8: 0x10c11f8: lui   v0, 0x20000
+// 0x010c1838: 0x10c1838: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010c11fc: 0x10c11fc: addiu v0, v0, 23384
+// 0x010c183c: 0x10c183c: addiu v0, v0, 23844
 	ldloc 5
-	ldc.i4 23384
+	ldc.i4 23844
 	add
 	stloc 5
-// 0x010c1200: 0x10c1200: addu  s1, s0, zero
+// 0x010c1840: 0x10c1840: addu  s1, s0, zero
 	ldloc 9
 	stloc 10
-// 0x010c1204: 0x10c1204: j	 0x10c1220 addu  a0, s0, v0
+// 0x010c1844: 0x10c1844: j	 0x10c1860 addu  a0, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc.1
-	br L_10c1220
+	br L_10c1860
 // --- basic block ---
-L_10c120c:
-// 0x010c120c: 0x10c120c: beq   v0, a0, 0x10c1724 addiu s1, s1, -1
+L_10c184c:
+// 0x010c184c: 0x10c184c: beq   v0, a0, 0x10c1d64 addiu s1, s1, -1
 	ldloc 5
 	ldloc.1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1214: 0x10c1214: sb    v1, 0(s4)
+// 0x010c1854: 0x10c1854: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1218: 0x10c1218: addiu v0, v0, 1
+// 0x010c1858: 0x10c1858: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010c121c: 0x10c121c: addiu s4, s4, 1
+// 0x010c185c: 0x10c185c: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c1220:
-// 0x010c1220: 0x10c1220: lb    v1, 0(v0)
+L_10c1860:
+// 0x010c1860: 0x10c1860: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c1224: 0x10c1224: sll   zero, zero, 0
-// 0x010c1228: 0x10c1228: bne   v1, zero, 0x10c120c addu  a3, s7, zero
+// 0x010c1864: 0x10c1864: sll   zero, zero, 0
+// 0x010c1868: 0x10c1868: bne   v1, zero, 0x10c184c addu  a3, s7, zero
 	ldloc 6
 	ldloc 15
 	stloc 4
-	brtrue L_10c120c
+	brtrue L_10c184c
 // --- basic block ---
-// 0x010c1230: 0x10c1230: j	 0x10c16f0 sll   zero, zero, 0
-	br L_10c16f0
+// 0x010c1870: 0x10c1870: j	 0x10c1d30 sll   zero, zero, 0
+	br L_10c1d30
 // --- basic block ---
-L_10c1238:
-// 0x010c1238: 0x10c1238: jal   0x10c0948 addu  a0, s2, zero
+L_10c1878:
+// 0x010c1878: 0x10c1878: jal   0x10c0f88 addu  a0, s2, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixunsdfsi_10c0948(int32,int32,int32)
+	call int32 Cibyl143::__fixunsdfsi_10c0f88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1240: 0x10c1240: addu  a1, v0, zero
+// 0x010c1880: 0x10c1880: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010c1244: 0x10c1244: lui   v0, 0xcccc0000
+// 0x010c1884: 0x10c1884: lui   v0, 0xcccc0000
 	ldc.i4 3435921408
 	stloc 5
-// 0x010c1248: 0x10c1248: ori   a3, v0, 52429
+// 0x010c1888: 0x10c1888: ori   a3, v0, 52429
 	ldloc 5
 	ldc.i4 52429
 	or
 	stloc 4
-// 0x010c124c: 0x10c124c: addiu a2, sp, 24
+// 0x010c188c: 0x10c188c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-L_10c1250:
-// 0x010c1250: 0x10c1250: multu a1, a3
+L_10c1890:
+// 0x010c1890: 0x10c1890: multu a1, a3
 	ldloc.2
 	ldloc 4
 	mul.ovf.un
 	stloc 23
-// 0x010c1254: 0x10c1254: mfhi  hi
+// 0x010c1894: 0x10c1894: mfhi  hi
 	ldloc 21
 	stloc 5
-// 0x010c1258: 0x10c1258: srl   v0, v0, 3
+// 0x010c1898: 0x10c1898: srl   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shr.un
 	stloc 5
-// 0x010c125c: 0x10c125c: sll   v1, v0, 1
+// 0x010c189c: 0x10c189c: sll   v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x010c1260: 0x10c1260: sll   a0, v0, 3
+// 0x010c18a0: 0x10c18a0: sll   a0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x010c1264: 0x10c1264: addu  v1, v1, a0
+// 0x010c18a4: 0x10c18a4: addu  v1, v1, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-// 0x010c1268: 0x10c1268: subu  v1, a1, v1
+// 0x010c18a8: 0x10c18a8: subu  v1, a1, v1
 	ldloc.2
 	ldloc 6
 	sub
 	stloc 6
-// 0x010c126c: 0x10c126c: addiu v1, v1, 48
+// 0x010c18ac: 0x10c18ac: addiu v1, v1, 48
 	ldloc 6
 	ldc.i4.s 48
 	add
 	stloc 6
-// 0x010c1270: 0x10c1270: sb    v1, 0(a2)
+// 0x010c18b0: 0x10c18b0: sb    v1, 0(a2)
 	ldloc.3
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1274: 0x10c1274: addu  a1, v0, zero
+// 0x010c18b4: 0x10c18b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010c1278: 0x10c1278: bne   v0, zero, 0x10c1250 addiu a2, a2, 1
+// 0x010c18b8: 0x10c18b8: bne   v0, zero, 0x10c1890 addiu a2, a2, 1
 	ldloc 5
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-	brtrue L_10c1250
+	brtrue L_10c1890
 // --- basic block ---
-// 0x010c1280: 0x10c1280: addiu v0, sp, 24
+// 0x010c18c0: 0x10c18c0: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010c1284: 0x10c1284: subu  a1, a2, v0
+// 0x010c18c4: 0x10c18c4: subu  a1, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.2
-// 0x010c1288: 0x10c1288: sltu  v0, zero, s1
+// 0x010c18c8: 0x10c18c8: sltu  v0, zero, s1
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 5
-// 0x010c128c: 0x10c128c: addu  s8, a1, v0
+// 0x010c18cc: 0x10c18cc: addu  s8, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 11
-// 0x010c1290: 0x10c1290: lw    v0, 96(sp)
+// 0x010c18d0: 0x10c18d0: lw    v0, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6326,23 +6323,23 @@ L_10c1250:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c1294: 0x10c1294: sll   zero, zero, 0
-// 0x010c1298: 0x10c1298: blez  v0, 0x10c12a4 addu  v0, s8, v0
+// 0x010c18d4: 0x10c18d4: sll   zero, zero, 0
+// 0x010c18d8: 0x10c18d8: blez  v0, 0x10c18e4 addu  v0, s8, v0
 	ldloc 5
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
 	ldc.i4.s 0
-	ble L_10c12a4
+	ble L_10c18e4
 // --- basic block ---
-// 0x010c12a0: 0x10c12a0: addiu s8, v0, 1
+// 0x010c18e0: 0x10c18e0: addiu s8, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 11
-L_10c12a4:
-// 0x010c12a4: 0x10c12a4: lw    v1, 104(sp)
+L_10c18e4:
+// 0x010c18e4: 0x10c18e4: lw    v1, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6351,12 +6348,12 @@ L_10c12a4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c12a8: 0x10c12a8: subu  s5, s5, s8
+// 0x010c18e8: 0x10c18e8: subu  s5, s5, s8
 	ldloc 13
 	ldloc 11
 	sub
 	stloc 13
-// 0x010c12ac: 0x10c12ac: bne   v1, zero, 0x10c1300 sw    s5, 92(sp)
+// 0x010c18ec: 0x10c18ec: bne   v1, zero, 0x10c1940 sw    s5, 92(sp)
 	ldloc 6
 	ldloc 7
 	ldloc.0
@@ -6366,23 +6363,23 @@ L_10c12a4:
 	add
 	ldloc 13
 	stelem.i4
-	brtrue L_10c1300
+	brtrue L_10c1940
 // --- basic block ---
-// 0x010c12b4: 0x10c12b4: blez  s5, 0x10c1300 sll   zero, zero, 0
+// 0x010c18f4: 0x10c18f4: blez  s5, 0x10c1940 sll   zero, zero, 0
 	ldloc 13
 	ldc.i4.s 0
-	ble L_10c1300
+	ble L_10c1940
 // --- basic block ---
-// 0x010c12bc: 0x10c12bc: j	 0x10c12ec sll   zero, zero, 0
-	br L_10c12ec
+// 0x010c18fc: 0x10c18fc: j	 0x10c192c sll   zero, zero, 0
+	br L_10c192c
 // --- basic block ---
-L_10c12c4:
-// 0x010c12c4: 0x10c12c4: beq   v1, s0, 0x10c1724 sll   zero, zero, 0
+L_10c1904:
+// 0x010c1904: 0x10c1904: beq   v1, s0, 0x10c1d64 sll   zero, zero, 0
 	ldloc 6
 	ldloc 9
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c12cc: 0x10c12cc: lw    a2, 100(sp)
+// 0x010c190c: 0x10c190c: lw    a2, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6391,31 +6388,31 @@ L_10c12c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c12d0: 0x10c12d0: sll   zero, zero, 0
-// 0x010c12d4: 0x10c12d4: bne   a2, zero, 0x10c12e0 sll   zero, zero, 0
+// 0x010c1910: 0x10c1910: sll   zero, zero, 0
+// 0x010c1914: 0x10c1914: bne   a2, zero, 0x10c1920 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10c12e0
+	brtrue L_10c1920
 // --- basic block ---
-// 0x010c12dc: 0x10c12dc: addiu a0, zero, 32
+// 0x010c191c: 0x10c191c: addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
-L_10c12e0:
-// 0x010c12e0: 0x10c12e0: sb    a0, 0(s4)
+L_10c1920:
+// 0x010c1920: 0x10c1920: sb    a0, 0(s4)
 	ldloc 8
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c12e4: 0x10c12e4: addiu v1, v1, 1
+// 0x010c1924: 0x10c1924: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010c12e8: 0x10c12e8: addiu s4, s4, 1
+// 0x010c1928: 0x10c1928: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c12ec:
-// 0x010c12ec: 0x10c12ec: lw    a2, 92(sp)
+L_10c192c:
+// 0x010c192c: 0x10c192c: lw    a2, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6424,112 +6421,112 @@ L_10c12ec:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c12f0: 0x10c12f0: addiu a0, zero, 48
+// 0x010c1930: 0x10c1930: addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
-// 0x010c12f4: 0x10c12f4: bne   v1, a2, 0x10c12c4 subu  v0, s0, v1
+// 0x010c1934: 0x10c1934: bne   v1, a2, 0x10c1904 subu  v0, s0, v1
 	ldloc 6
 	ldloc.3
 	ldloc 9
 	ldloc 6
 	sub
 	stloc 5
-	bne.un L_10c12c4
+	bne.un L_10c1904
 // --- basic block ---
-// 0x010c12fc: 0x10c12fc: addu  s0, v0, zero
+// 0x010c193c: 0x10c193c: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_10c1300:
-// 0x010c1300: 0x10c1300: bne   s1, zero, 0x10c1318 addiu v0, zero, -1
+L_10c1940:
+// 0x010c1940: 0x10c1940: bne   s1, zero, 0x10c1958 addiu v0, zero, -1
 	ldloc 10
 	ldc.i4.m1
 	stloc 5
-	brtrue L_10c1318
+	brtrue L_10c1958
 // --- basic block ---
-L_10c1308:
-// 0x010c1308: 0x10c1308: addu  v0, sp, a1
+L_10c1948:
+// 0x010c1948: 0x10c1948: addu  v0, sp, a1
 	ldloc.0
 	ldloc.2
 	add
 	stloc 5
-// 0x010c130c: 0x10c130c: addiu v1, v0, 23
+// 0x010c194c: 0x10c194c: addiu v1, v0, 23
 	ldloc 5
 	ldc.i4.s 23
 	add
 	stloc 6
-// 0x010c1310: 0x10c1310: j	 0x10c1348 addu  a0, zero, zero
+// 0x010c1950: 0x10c1950: j	 0x10c1988 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10c1348
+	br L_10c1988
 // --- basic block ---
-L_10c1318:
-// 0x010c1318: 0x10c1318: addiu s0, s0, -1
+L_10c1958:
+// 0x010c1958: 0x10c1958: addiu s0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x010c131c: 0x10c131c: beq   s0, v0, 0x10c1724 sll   zero, zero, 0
+// 0x010c195c: 0x10c195c: beq   s0, v0, 0x10c1d64 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1324: 0x10c1324: sb    s1, 0(s4)
+// 0x010c1964: 0x10c1964: sb    s1, 0(s4)
 	ldloc 8
 	ldloc 10
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1328: 0x10c1328: j	 0x10c1308 addiu s4, s4, 1
+// 0x010c1968: 0x10c1968: j	 0x10c1948 addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c1308
+	br L_10c1948
 // --- basic block ---
-L_10c1330:
-// 0x010c1330: 0x10c1330: beq   a0, s0, 0x10c1724 addiu a1, a1, -1
+L_10c1970:
+// 0x010c1970: 0x10c1970: beq   a0, s0, 0x10c1d64 addiu a1, a1, -1
 	ldloc.1
 	ldloc 9
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1338: 0x10c1338: lbu   v0, 1(v1)
+// 0x010c1978: 0x10c1978: lbu   v0, 1(v1)
 	ldloc 6
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010c133c: 0x10c133c: addiu a0, a0, 1
+// 0x010c197c: 0x10c197c: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010c1340: 0x10c1340: sb    v0, 0(s4)
+// 0x010c1980: 0x10c1980: sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1344: 0x10c1344: addiu s4, s4, 1
+// 0x010c1984: 0x10c1984: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c1348:
-// 0x010c1348: 0x10c1348: addiu v1, v1, -1
+L_10c1988:
+// 0x010c1988: 0x10c1988: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010c134c: 0x10c134c: bgtz  a1, 0x10c1330 subu  s1, s0, a0
+// 0x010c198c: 0x10c198c: bgtz  a1, 0x10c1970 subu  s1, s0, a0
 	ldloc.2
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 10
 	ldc.i4.s 0
-	bgt L_10c1330
+	bgt L_10c1970
 // --- basic block ---
-// 0x010c1354: 0x10c1354: lw    v0, 96(sp)
+// 0x010c1994: 0x10c1994: lw    v0, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6538,93 +6535,93 @@ L_10c1348:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c1358: 0x10c1358: sll   zero, zero, 0
-// 0x010c135c: 0x10c135c: bgtz  v0, 0x10c13c0 lui   v0, 0x20000
+// 0x010c1998: 0x10c1998: sll   zero, zero, 0
+// 0x010c199c: 0x10c199c: bgtz  v0, 0x10c1a00 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	bgt L_10c13c0
+	bgt L_10c1a00
 // --- basic block ---
-// 0x010c1364: 0x10c1364: j	 0x10c14a0 sll   zero, zero, 0
-	br L_10c14a0
+// 0x010c19a4: 0x10c19a4: j	 0x10c1ae0 sll   zero, zero, 0
+	br L_10c1ae0
 // --- basic block ---
-L_10c136c:
-// 0x010c136c: 0x10c136c: jal   0x10c0948 sll   zero, zero, 0
+L_10c19ac:
+// 0x010c19ac: 0x10c19ac: jal   0x10c0f88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixunsdfsi_10c0948(int32,int32,int32)
+	call int32 Cibyl143::__fixunsdfsi_10c0f88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1374: 0x10c1374: addu  a0, v0, zero
+// 0x010c19b4: 0x10c19b4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010c1378: 0x10c1378: jal   0x10c09c0 addu  s0, v0, zero
+// 0x010c19b8: 0x10c19b8: jal   0x10c1000 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1380: 0x10c1380: addu  a1, v1, zero
+// 0x010c19c0: 0x10c19c0: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010c1384: 0x10c1384: bgez  s0, 0x10c13a0 addu  a0, v0, zero
+// 0x010c19c4: 0x10c19c4: bgez  s0, 0x10c19e0 addu  a0, v0, zero
 	ldloc 9
 	ldloc 5
 	stloc.1
 	ldc.i4.s 0
-	bge L_10c13a0
+	bge L_10c19e0
 // --- basic block ---
-// 0x010c138c: 0x10c138c: lui   v0, 0x20000
+// 0x010c19cc: 0x10c19cc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010c1390: 0x10c1390: lw    a3, 24116(v0)
+// 0x010c19d0: 0x10c19d0: lw    a3, 24580(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6029
+	ldc.i4 6145
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1394: 0x10c1394: lw    a2, 24112(v0)
+// 0x010c19d4: 0x10c19d4: lw    a2, 24576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6028
+	ldc.i4 6144
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1398: 0x10c1398: jal   0x10c06e8 sll   zero, zero, 0
+// 0x010c19d8: 0x10c19d8: jal   0x10c0d28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10c13a0:
-// 0x010c13a0: 0x10c13a0: addu  a1, s3, zero
+L_10c19e0:
+// 0x010c19e0: 0x10c19e0: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010c13a4: 0x10c13a4: addu  a0, s2, zero
+// 0x010c19e4: 0x10c19e4: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-// 0x010c13a8: 0x10c13a8: addu  a3, v1, zero
+// 0x010c19e8: 0x10c19e8: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010c13ac: 0x10c13ac: jal   0x10c0740 addu  a2, v0, zero
+// 0x010c19ec: 0x10c19ec: jal   0x10c0d80 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -6632,43 +6629,43 @@ L_10c13a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c13b4: 0x10c13b4: addu  s3, v1, zero
+// 0x010c19f4: 0x10c19f4: addu  s3, v1, zero
 	ldloc 6
 	stloc 16
-// 0x010c13b8: 0x10c13b8: addu  s2, v0, zero
+// 0x010c19f8: 0x10c19f8: addu  s2, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010c13bc: 0x10c13bc: lui   v0, 0x20000
+// 0x010c19fc: 0x10c19fc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10c13c0:
-// 0x010c13c0: 0x10c13c0: lw    a3, 23764(v0)
+L_10c1a00:
+// 0x010c1a00: 0x10c1a00: lw    a3, 24228(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5941
+	ldc.i4 6057
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c13c4: 0x10c13c4: lw    a2, 23760(v0)
+// 0x010c1a04: 0x10c1a04: lw    a2, 24224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5940
+	ldc.i4 6056
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c13c8: 0x10c13c8: addu  a1, s3, zero
+// 0x010c1a08: 0x10c1a08: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010c13cc: 0x10c13cc: jal   0x10c18fc addu  a0, s2, zero
+// 0x010c1a0c: 0x10c1a0c: jal   0x10c1f3c addu  a0, s2, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -6676,27 +6673,27 @@ L_10c13c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gedf2_10c18fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gedf2_10c1f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c13d4: 0x10c13d4: addu  a1, s3, zero
+// 0x010c1a14: 0x10c1a14: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010c13d8: 0x10c13d8: bgez  v0, 0x10c136c addu  a0, s2, zero
+// 0x010c1a18: 0x10c1a18: bgez  v0, 0x10c19ac addu  a0, s2, zero
 	ldloc 5
 	ldloc 14
 	stloc.1
 	ldc.i4.s 0
-	bge L_10c136c
+	bge L_10c19ac
 // --- basic block ---
-// 0x010c13e0: 0x10c13e0: addiu v1, s1, -1
+// 0x010c1a20: 0x10c1a20: addiu v1, s1, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010c13e4: 0x10c13e4: beq   s1, zero, 0x10c1724 sw    v1, 88(sp)
+// 0x010c1a24: 0x10c1a24: beq   s1, zero, 0x10c1d64 sw    v1, 88(sp)
 	ldloc 10
 	ldloc 7
 	ldloc.0
@@ -6706,79 +6703,79 @@ L_10c13c0:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10c1724
+	brfalse L_10c1d64
 // --- basic block ---
-// 0x010c13ec: 0x10c13ec: addiu v0, zero, 46
+// 0x010c1a2c: 0x10c1a2c: addiu v0, zero, 46
 	ldc.i4.s 46
 	stloc 5
-// 0x010c13f0: 0x10c13f0: sb    v0, 0(s4)
+// 0x010c1a30: 0x10c1a30: sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c13f4: 0x10c13f4: addu  s5, zero, zero
+// 0x010c1a34: 0x10c1a34: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010c13f8: 0x10c13f8: j	 0x10c1488 addiu s4, s4, 1
+// 0x010c1a38: 0x10c1a38: j	 0x10c1ac8 addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c1488
+	br L_10c1ac8
 // --- basic block ---
-L_10c1400:
-// 0x010c1400: 0x10c1400: lui   v0, 0x20000
+L_10c1a40:
+// 0x010c1a40: 0x10c1a40: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010c1404: 0x10c1404: lw    a3, 23908(v0)
+// 0x010c1a44: 0x10c1a44: lw    a3, 24372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5977
+	ldc.i4 6093
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1408: 0x10c1408: lw    a2, 23904(v0)
+// 0x010c1a48: 0x10c1a48: lw    a2, 24368(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5976
+	ldc.i4 6092
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c140c: 0x10c140c: jal   0x10c0798 sll   zero, zero, 0
+// 0x010c1a4c: 0x10c1a4c: jal   0x10c0dd8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1414: 0x10c1414: addu  s2, v0, zero
+// 0x010c1a54: 0x10c1a54: addu  s2, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010c1418: 0x10c1418: addu  a1, v1, zero
+// 0x010c1a58: 0x10c1a58: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010c141c: 0x10c141c: addu  a0, s2, zero
+// 0x010c1a5c: 0x10c1a5c: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-// 0x010c1420: 0x10c1420: jal   0x10c0948 addu  s3, v1, zero
+// 0x010c1a60: 0x10c1a60: jal   0x10c0f88 addu  s3, v1, zero
 	ldloc 6
 	stloc 16
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixunsdfsi_10c0948(int32,int32,int32)
+	call int32 Cibyl143::__fixunsdfsi_10c0f88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1428: 0x10c1428: lw    a1, 88(sp)
+// 0x010c1a68: 0x10c1a68: lw    a1, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6787,95 +6784,95 @@ L_10c1400:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c142c: 0x10c142c: addu  s0, v0, zero
+// 0x010c1a6c: 0x10c1a6c: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010c1430: 0x10c1430: addu  a0, s0, zero
+// 0x010c1a70: 0x10c1a70: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010c1434: 0x10c1434: beq   s5, a1, 0x10c1724 addiu v0, v0, 48
+// 0x010c1a74: 0x10c1a74: beq   s5, a1, 0x10c1d64 addiu v0, v0, 48
 	ldloc 13
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 48
 	add
 	stloc 5
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c143c: 0x10c143c: jal   0x10c09c0 sb    v0, 0(s4)
+// 0x010c1a7c: 0x10c1a7c: jal   0x10c1000 sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1444: 0x10c1444: addiu s5, s5, 1
+// 0x010c1a84: 0x10c1a84: addiu s5, s5, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-// 0x010c1448: 0x10c1448: addu  a1, v1, zero
+// 0x010c1a88: 0x10c1a88: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010c144c: 0x10c144c: addu  a0, v0, zero
+// 0x010c1a8c: 0x10c1a8c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010c1450: 0x10c1450: bgez  s0, 0x10c146c addiu s4, s4, 1
+// 0x010c1a90: 0x10c1a90: bgez  s0, 0x10c1aac addiu s4, s4, 1
 	ldloc 9
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
 	ldc.i4.s 0
-	bge L_10c146c
+	bge L_10c1aac
 // --- basic block ---
-// 0x010c1458: 0x10c1458: lui   v0, 0x20000
+// 0x010c1a98: 0x10c1a98: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010c145c: 0x10c145c: lw    a3, 24116(v0)
+// 0x010c1a9c: 0x10c1a9c: lw    a3, 24580(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6029
+	ldc.i4 6145
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1460: 0x10c1460: lw    a2, 24112(v0)
+// 0x010c1aa0: 0x10c1aa0: lw    a2, 24576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6028
+	ldc.i4 6144
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1464: 0x10c1464: jal   0x10c06e8 sll   zero, zero, 0
+// 0x010c1aa4: 0x10c1aa4: jal   0x10c0d28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10c146c:
-// 0x010c146c: 0x10c146c: addu  a1, s3, zero
+L_10c1aac:
+// 0x010c1aac: 0x10c1aac: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010c1470: 0x10c1470: addu  a0, s2, zero
+// 0x010c1ab0: 0x10c1ab0: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-// 0x010c1474: 0x10c1474: addu  a3, v1, zero
+// 0x010c1ab4: 0x10c1ab4: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010c1478: 0x10c1478: jal   0x10c0740 addu  a2, v0, zero
+// 0x010c1ab8: 0x10c1ab8: jal   0x10c0d80 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -6883,19 +6880,19 @@ L_10c146c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1480: 0x10c1480: addu  s3, v1, zero
+// 0x010c1ac0: 0x10c1ac0: addu  s3, v1, zero
 	ldloc 6
 	stloc 16
-// 0x010c1484: 0x10c1484: addu  s2, v0, zero
+// 0x010c1ac4: 0x10c1ac4: addu  s2, v0, zero
 	ldloc 5
 	stloc 14
-L_10c1488:
-// 0x010c1488: 0x10c1488: lw    a2, 88(sp)
+L_10c1ac8:
+// 0x010c1ac8: 0x10c1ac8: lw    a2, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6904,7 +6901,7 @@ L_10c1488:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c148c: 0x10c148c: lw    v0, 96(sp)
+// 0x010c1acc: 0x10c1acc: lw    v0, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6913,23 +6910,23 @@ L_10c1488:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c1490: 0x10c1490: addu  a1, s3, zero
+// 0x010c1ad0: 0x10c1ad0: addu  a1, s3, zero
 	ldloc 16
 	stloc.2
-// 0x010c1494: 0x10c1494: addu  a0, s2, zero
+// 0x010c1ad4: 0x10c1ad4: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-// 0x010c1498: 0x10c1498: bne   s5, v0, 0x10c1400 subu  s1, a2, s5
+// 0x010c1ad8: 0x10c1ad8: bne   s5, v0, 0x10c1a40 subu  s1, a2, s5
 	ldloc 13
 	ldloc 5
 	ldloc.3
 	ldloc 13
 	sub
 	stloc 10
-	bne.un L_10c1400
+	bne.un L_10c1a40
 // --- basic block ---
-L_10c14a0:
-// 0x010c14a0: 0x10c14a0: lw    v1, 104(sp)
+L_10c1ae0:
+// 0x010c1ae0: 0x10c1ae0: lw    v1, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6938,14 +6935,14 @@ L_10c14a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c14a4: 0x10c14a4: sll   zero, zero, 0
-// 0x010c14a8: 0x10c14a8: beq   v1, zero, 0x10c16f0 addu  a3, s7, zero
+// 0x010c1ae4: 0x10c1ae4: sll   zero, zero, 0
+// 0x010c1ae8: 0x10c1ae8: beq   v1, zero, 0x10c1d30 addu  a3, s7, zero
 	ldloc 6
 	ldloc 15
 	stloc 4
-	brfalse L_10c16f0
+	brfalse L_10c1d30
 // --- basic block ---
-// 0x010c14b0: 0x10c14b0: lw    a0, 92(sp)
+// 0x010c1af0: 0x10c1af0: lw    a0, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6954,40 +6951,40 @@ L_10c14a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c14b4: 0x10c14b4: sll   zero, zero, 0
-// 0x010c14b8: 0x10c14b8: blez  a0, 0x10c16f0 addu  v1, zero, zero
+// 0x010c1af4: 0x10c1af4: sll   zero, zero, 0
+// 0x010c1af8: 0x10c1af8: blez  a0, 0x10c1d30 addu  v1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	ble L_10c16f0
+	ble L_10c1d30
 // --- basic block ---
-// 0x010c14c0: 0x10c14c0: j	 0x10c14d8 addiu a0, zero, 32
+// 0x010c1b00: 0x10c1b00: j	 0x10c1b18 addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
-	br L_10c14d8
+	br L_10c1b18
 // --- basic block ---
-L_10c14c8:
-// 0x010c14c8: 0x10c14c8: beq   v1, s1, 0x10c1724 addiu v1, v1, 1
+L_10c1b08:
+// 0x010c1b08: 0x10c1b08: beq   v1, s1, 0x10c1d64 addiu v1, v1, 1
 	ldloc 6
 	ldloc 10
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c14d0: 0x10c14d0: sb    a0, 0(s4)
+// 0x010c1b10: 0x10c1b10: sb    a0, 0(s4)
 	ldloc 8
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c14d4: 0x10c14d4: addiu s4, s4, 1
+// 0x010c1b14: 0x10c1b14: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c14d8:
-// 0x010c14d8: 0x10c14d8: lw    a1, 92(sp)
+L_10c1b18:
+// 0x010c1b18: 0x10c1b18: lw    a1, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6996,105 +6993,105 @@ L_10c14d8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c14dc: 0x10c14dc: sll   zero, zero, 0
-// 0x010c14e0: 0x10c14e0: bne   v1, a1, 0x10c14c8 subu  v0, s1, v1
+// 0x010c1b1c: 0x10c1b1c: sll   zero, zero, 0
+// 0x010c1b20: 0x10c1b20: bne   v1, a1, 0x10c1b08 subu  v0, s1, v1
 	ldloc 6
 	ldloc.2
 	ldloc 10
 	ldloc 6
 	sub
 	stloc 5
-	bne.un L_10c14c8
+	bne.un L_10c1b08
 // --- basic block ---
-// 0x010c14e8: 0x10c14e8: j	 0x10c16ec addu  s1, v0, zero
+// 0x010c1b28: 0x10c1b28: j	 0x10c1d2c addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-	br L_10c16ec
+	br L_10c1d2c
 // --- basic block ---
-L_10c14f0:
-// 0x010c14f0: 0x10c14f0: lw    v1, 0(a3)
+L_10c1b30:
+// 0x010c1b30: 0x10c1b30: lw    v1, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010c14f4: 0x10c14f4: sll   zero, zero, 0
-// 0x010c14f8: 0x10c14f8: bne   v1, zero, 0x10c153c lui   v0, 0x0
+// 0x010c1b34: 0x10c1b34: sll   zero, zero, 0
+// 0x010c1b38: 0x10c1b38: bne   v1, zero, 0x10c1b7c lui   v0, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_10c153c
+	brtrue L_10c1b7c
 // --- basic block ---
-// 0x010c1500: 0x10c1500: addiu v0, v0, 20680
+// 0x010c1b40: 0x10c1b40: addiu v0, v0, 20680
 	ldloc 5
 	ldc.i4 20680
 	add
 	stloc 5
-// 0x010c1504: 0x10c1504: addu  s1, s0, zero
+// 0x010c1b44: 0x10c1b44: addu  s1, s0, zero
 	ldloc 9
 	stloc 10
-// 0x010c1508: 0x10c1508: j	 0x10c1524 addu  a0, s0, v0
+// 0x010c1b48: 0x10c1b48: j	 0x10c1b64 addu  a0, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc.1
-	br L_10c1524
+	br L_10c1b64
 // --- basic block ---
-L_10c1510:
-// 0x010c1510: 0x10c1510: beq   v0, a0, 0x10c1724 addiu s1, s1, -1
+L_10c1b50:
+// 0x010c1b50: 0x10c1b50: beq   v0, a0, 0x10c1d64 addiu s1, s1, -1
 	ldloc 5
 	ldloc.1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1518: 0x10c1518: sb    v1, 0(s4)
+// 0x010c1b58: 0x10c1b58: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c151c: 0x10c151c: addiu v0, v0, 1
+// 0x010c1b5c: 0x10c1b5c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010c1520: 0x10c1520: addiu s4, s4, 1
+// 0x010c1b60: 0x10c1b60: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c1524:
-// 0x010c1524: 0x10c1524: lb    v1, 0(v0)
+L_10c1b64:
+// 0x010c1b64: 0x10c1b64: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c1528: 0x10c1528: sll   zero, zero, 0
-// 0x010c152c: 0x10c152c: bne   v1, zero, 0x10c1510 addu  a3, s7, zero
+// 0x010c1b68: 0x10c1b68: sll   zero, zero, 0
+// 0x010c1b6c: 0x10c1b6c: bne   v1, zero, 0x10c1b50 addu  a3, s7, zero
 	ldloc 6
 	ldloc 15
 	stloc 4
-	brtrue L_10c1510
+	brtrue L_10c1b50
 // --- basic block ---
-// 0x010c1534: 0x10c1534: j	 0x10c16f0 sll   zero, zero, 0
-	br L_10c16f0
+// 0x010c1b74: 0x10c1b74: j	 0x10c1d30 sll   zero, zero, 0
+	br L_10c1d30
 // --- basic block ---
-L_10c153c:
-// 0x010c153c: 0x10c153c: blez  s5, 0x10c15c4 sll   zero, zero, 0
+L_10c1b7c:
+// 0x010c1b7c: 0x10c1b7c: blez  s5, 0x10c1c04 sll   zero, zero, 0
 	ldloc 13
 	ldc.i4.s 0
-	ble L_10c15c4
+	ble L_10c1c04
 // --- basic block ---
-// 0x010c1544: 0x10c1544: cibyl_sysc_arg 0x3
+// 0x010c1b84: 0x10c1b84: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c1548: 0x10c1548: cibyl_sysc 0x253f
+// 0x010c1b88: 0x10c1b88: cibyl_sysc 0x253f
 	call int32 [WazeWP7]Syscalls::__strlen(int32)
 	stloc 5
-// 0x010c154c: 0x10c154c: addu  s8, v0, zero
+// 0x010c1b8c: 0x10c1b8c: addu  s8, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010c1550: 0x10c1550: lw    a2, 96(sp)
+// 0x010c1b90: 0x10c1b90: lw    a2, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7103,25 +7100,25 @@ L_10c153c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1554: 0x10c1554: sll   zero, zero, 0
-// 0x010c1558: 0x10c1558: bltz  a2, 0x10c156c slt   v0, a2, s8
+// 0x010c1b94: 0x10c1b94: sll   zero, zero, 0
+// 0x010c1b98: 0x10c1b98: bltz  a2, 0x10c1bac slt   v0, a2, s8
 	ldloc.3
 	ldloc.3
 	ldloc 11
 	clt
 	stloc 5
 	ldc.i4.s 0
-	blt L_10c156c
+	blt L_10c1bac
 // --- basic block ---
-// 0x010c1560: 0x10c1560: beq   v0, zero, 0x10c156c sll   zero, zero, 0
+// 0x010c1ba0: 0x10c1ba0: beq   v0, zero, 0x10c1bac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c156c
+	brfalse L_10c1bac
 // --- basic block ---
-// 0x010c1568: 0x10c1568: addu  s8, a2, zero
+// 0x010c1ba8: 0x10c1ba8: addu  s8, a2, zero
 	ldloc.3
 	stloc 11
-L_10c156c:
-// 0x010c156c: 0x10c156c: lw    v0, 104(sp)
+L_10c1bac:
+// 0x010c1bac: 0x10c1bac: lw    v0, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7130,34 +7127,34 @@ L_10c156c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c1570: 0x10c1570: sll   zero, zero, 0
-// 0x010c1574: 0x10c1574: bne   v0, zero, 0x10c15c4 subu  a1, s5, s8
+// 0x010c1bb0: 0x10c1bb0: sll   zero, zero, 0
+// 0x010c1bb4: 0x10c1bb4: bne   v0, zero, 0x10c1c04 subu  a1, s5, s8
 	ldloc 5
 	ldloc 13
 	ldloc 11
 	sub
 	stloc.2
-	brtrue L_10c15c4
+	brtrue L_10c1c04
 // --- basic block ---
-// 0x010c157c: 0x10c157c: blez  a1, 0x10c15c4 addu  a0, zero, zero
+// 0x010c1bbc: 0x10c1bbc: blez  a1, 0x10c1c04 addu  a0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	ble L_10c15c4
+	ble L_10c1c04
 // --- basic block ---
-// 0x010c1584: 0x10c1584: j	 0x10c15b8 addiu a2, zero, 48
+// 0x010c1bc4: 0x10c1bc4: j	 0x10c1bf8 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-	br L_10c15b8
+	br L_10c1bf8
 // --- basic block ---
-L_10c158c:
-// 0x010c158c: 0x10c158c: beq   a0, s0, 0x10c1724 sll   zero, zero, 0
+L_10c1bcc:
+// 0x010c1bcc: 0x10c1bcc: beq   a0, s0, 0x10c1d64 sll   zero, zero, 0
 	ldloc.1
 	ldloc 9
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1594: 0x10c1594: lw    v0, 100(sp)
+// 0x010c1bd4: 0x10c1bd4: lw    v0, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7166,47 +7163,47 @@ L_10c158c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c1598: 0x10c1598: sll   zero, zero, 0
-// 0x010c159c: 0x10c159c: bne   v0, zero, 0x10c15a8 sll   zero, zero, 0
+// 0x010c1bd8: 0x10c1bd8: sll   zero, zero, 0
+// 0x010c1bdc: 0x10c1bdc: bne   v0, zero, 0x10c1be8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10c15a8
+	brtrue L_10c1be8
 // --- basic block ---
-// 0x010c15a4: 0x10c15a4: addiu a2, zero, 32
+// 0x010c1be4: 0x10c1be4: addiu a2, zero, 32
 	ldc.i4.s 32
 	stloc.3
-L_10c15a8:
-// 0x010c15a8: 0x10c15a8: sb    a2, 0(s4)
+L_10c1be8:
+// 0x010c1be8: 0x10c1be8: sb    a2, 0(s4)
 	ldloc 8
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c15ac: 0x10c15ac: addiu a0, a0, 1
+// 0x010c1bec: 0x10c1bec: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010c15b0: 0x10c15b0: addiu s4, s4, 1
+// 0x010c1bf0: 0x10c1bf0: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010c15b4: 0x10c15b4: addiu a2, zero, 48
+// 0x010c1bf4: 0x10c1bf4: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-L_10c15b8:
-// 0x010c15b8: 0x10c15b8: bne   a0, a1, 0x10c158c subu  v0, s0, a0
+L_10c1bf8:
+// 0x010c1bf8: 0x10c1bf8: bne   a0, a1, 0x10c1bcc subu  v0, s0, a0
 	ldloc.1
 	ldloc.2
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 5
-	bne.un L_10c158c
+	bne.un L_10c1bcc
 // --- basic block ---
-// 0x010c15c0: 0x10c15c0: addu  s0, v0, zero
+// 0x010c1c00: 0x10c1c00: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_10c15c4:
-// 0x010c15c4: 0x10c15c4: lw    a0, 96(sp)
+L_10c1c04:
+// 0x010c1c04: 0x10c1c04: lw    a0, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7215,44 +7212,44 @@ L_10c15c4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c15c8: 0x10c15c8: sll   zero, zero, 0
-// 0x010c15cc: 0x10c15cc: bgez  a0, 0x10c15dc sll   zero, zero, 0
+// 0x010c1c08: 0x10c1c08: sll   zero, zero, 0
+// 0x010c1c0c: 0x10c1c0c: bgez  a0, 0x10c1c1c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	bge L_10c15dc
+	bge L_10c1c1c
 // --- basic block ---
-// 0x010c15d4: 0x10c15d4: j	 0x10c162c addu  a0, zero, zero
+// 0x010c1c14: 0x10c1c14: j	 0x10c1c6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10c162c
+	br L_10c1c6c
 // --- basic block ---
-L_10c15dc:
-// 0x010c15dc: 0x10c15dc: j	 0x10c15f4 addu  a0, zero, zero
+L_10c1c1c:
+// 0x010c1c1c: 0x10c1c1c: j	 0x10c1c34 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10c15f4
+	br L_10c1c34
 // --- basic block ---
-L_10c15e4:
-// 0x010c15e4: 0x10c15e4: beq   a0, s0, 0x10c1724 addiu a0, a0, 1
+L_10c1c24:
+// 0x010c1c24: 0x10c1c24: beq   a0, s0, 0x10c1d64 addiu a0, a0, 1
 	ldloc.1
 	ldloc 9
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c15ec: 0x10c15ec: sb    v0, 0(s4)
+// 0x010c1c2c: 0x10c1c2c: sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c15f0: 0x10c15f0: addiu s4, s4, 1
+// 0x010c1c30: 0x10c1c30: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c15f4:
-// 0x010c15f4: 0x10c15f4: lw    a1, 96(sp)
+L_10c1c34:
+// 0x010c1c34: 0x10c1c34: lw    a1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7261,71 +7258,71 @@ L_10c15f4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c15f8: 0x10c15f8: sll   zero, zero, 0
-// 0x010c15fc: 0x10c15fc: beq   a0, a1, 0x10c163c subu  s1, s0, a0
+// 0x010c1c38: 0x10c1c38: sll   zero, zero, 0
+// 0x010c1c3c: 0x10c1c3c: beq   a0, a1, 0x10c1c7c subu  s1, s0, a0
 	ldloc.1
 	ldloc.2
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 10
-	beq  L_10c163c
+	beq  L_10c1c7c
 // --- basic block ---
-// 0x010c1604: 0x10c1604: lb    v0, 0(v1)
+// 0x010c1c44: 0x10c1c44: lb    v0, 0(v1)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010c1608: 0x10c1608: sll   zero, zero, 0
-// 0x010c160c: 0x10c160c: bne   v0, zero, 0x10c15e4 addiu v1, v1, 1
+// 0x010c1c48: 0x10c1c48: sll   zero, zero, 0
+// 0x010c1c4c: 0x10c1c4c: bne   v0, zero, 0x10c1c24 addiu v1, v1, 1
 	ldloc 5
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_10c15e4
+	brtrue L_10c1c24
 // --- basic block ---
-// 0x010c1614: 0x10c1614: j	 0x10c163c sll   zero, zero, 0
-	br L_10c163c
+// 0x010c1c54: 0x10c1c54: j	 0x10c1c7c sll   zero, zero, 0
+	br L_10c1c7c
 // --- basic block ---
-L_10c161c:
-// 0x010c161c: 0x10c161c: beq   a0, s0, 0x10c1724 addiu a0, a0, 1
+L_10c1c5c:
+// 0x010c1c5c: 0x10c1c5c: beq   a0, s0, 0x10c1d64 addiu a0, a0, 1
 	ldloc.1
 	ldloc 9
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1624: 0x10c1624: sb    v0, 0(s4)
+// 0x010c1c64: 0x10c1c64: sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1628: 0x10c1628: addiu s4, s4, 1
+// 0x010c1c68: 0x10c1c68: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c162c:
-// 0x010c162c: 0x10c162c: lb    v0, 0(v1)
+L_10c1c6c:
+// 0x010c1c6c: 0x10c1c6c: lb    v0, 0(v1)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010c1630: 0x10c1630: subu  s1, s0, a0
+// 0x010c1c70: 0x10c1c70: subu  s1, s0, a0
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 10
-// 0x010c1634: 0x10c1634: bne   v0, zero, 0x10c161c addiu v1, v1, 1
+// 0x010c1c74: 0x10c1c74: bne   v0, zero, 0x10c1c5c addiu v1, v1, 1
 	ldloc 5
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_10c161c
+	brtrue L_10c1c5c
 // --- basic block ---
-L_10c163c:
-// 0x010c163c: 0x10c163c: lw    a2, 104(sp)
+L_10c1c7c:
+// 0x010c1c7c: 0x10c1c7c: lw    a2, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7334,109 +7331,109 @@ L_10c163c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1640: 0x10c1640: sll   zero, zero, 0
-// 0x010c1644: 0x10c1644: beq   a2, zero, 0x10c16ec subu  v0, s5, s8
+// 0x010c1c80: 0x10c1c80: sll   zero, zero, 0
+// 0x010c1c84: 0x10c1c84: beq   a2, zero, 0x10c1d2c subu  v0, s5, s8
 	ldloc.3
 	ldloc 13
 	ldloc 11
 	sub
 	stloc 5
-	brfalse L_10c16ec
+	brfalse L_10c1d2c
 // --- basic block ---
-// 0x010c164c: 0x10c164c: blez  v0, 0x10c16ec addu  a1, zero, zero
+// 0x010c1c8c: 0x10c1c8c: blez  v0, 0x10c1d2c addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
 	ldc.i4.s 0
-	ble L_10c16ec
+	ble L_10c1d2c
 // --- basic block ---
-// 0x010c1654: 0x10c1654: j	 0x10c166c addiu v1, zero, 32
+// 0x010c1c94: 0x10c1c94: j	 0x10c1cac addiu v1, zero, 32
 	ldc.i4.s 32
 	stloc 6
-	br L_10c166c
+	br L_10c1cac
 // --- basic block ---
-L_10c165c:
-// 0x010c165c: 0x10c165c: beq   a1, s1, 0x10c1724 addiu a1, a1, 1
+L_10c1c9c:
+// 0x010c1c9c: 0x10c1c9c: beq   a1, s1, 0x10c1d64 addiu a1, a1, 1
 	ldloc.2
 	ldloc 10
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	beq  L_10c1724
+	beq  L_10c1d64
 // --- basic block ---
-// 0x010c1664: 0x10c1664: sb    v1, 0(s4)
+// 0x010c1ca4: 0x10c1ca4: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c1668: 0x10c1668: addiu s4, s4, 1
+// 0x010c1ca8: 0x10c1ca8: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10c166c:
-// 0x010c166c: 0x10c166c: bne   a1, v0, 0x10c165c subu  a0, s1, a1
+L_10c1cac:
+// 0x010c1cac: 0x10c1cac: bne   a1, v0, 0x10c1c9c subu  a0, s1, a1
 	ldloc.2
 	ldloc 5
 	ldloc 10
 	ldloc.2
 	sub
 	stloc.1
-	bne.un L_10c165c
+	bne.un L_10c1c9c
 // --- basic block ---
-// 0x010c1674: 0x10c1674: j	 0x10c16ec addu  s1, a0, zero
+// 0x010c1cb4: 0x10c1cb4: j	 0x10c1d2c addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-	br L_10c16ec
+	br L_10c1d2c
 // --- basic block ---
-L_10c167c:
-// 0x010c167c: 0x10c167c: beq   s0, zero, 0x10c1724 addiu s1, s0, -1
+L_10c1cbc:
+// 0x010c1cbc: 0x10c1cbc: beq   s0, zero, 0x10c1d64 addiu s1, s0, -1
 	ldloc 9
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 10
-	brfalse L_10c1724
+	brfalse L_10c1d64
 // --- basic block ---
-// 0x010c1684: 0x10c1684: lw    v0, 0(a3)
+// 0x010c1cc4: 0x10c1cc4: lw    v0, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c1688: 0x10c1688: addiu s7, a3, 4
+// 0x010c1cc8: 0x10c1cc8: addiu s7, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 15
-// 0x010c168c: 0x10c168c: j	 0x10c16a0 sb    v0, 0(s4)
+// 0x010c1ccc: 0x10c1ccc: j	 0x10c1ce0 sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_10c16a0
+	br L_10c1ce0
 // --- basic block ---
-L_10c1694:
-// 0x010c1694: 0x10c1694: beq   s0, zero, 0x10c1724 addu  s7, a3, zero
+L_10c1cd4:
+// 0x010c1cd4: 0x10c1cd4: beq   s0, zero, 0x10c1d64 addu  s7, a3, zero
 	ldloc 9
 	ldloc 4
 	stloc 15
-	brfalse L_10c1724
+	brfalse L_10c1d64
 // --- basic block ---
-// 0x010c169c: 0x10c169c: sb    v1, 0(s4)
+// 0x010c1cdc: 0x10c1cdc: sb    v1, 0(s4)
 	ldloc 8
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10c16a0:
-// 0x010c16a0: 0x10c16a0: j	 0x10c16ec addiu s4, s4, 1
+L_10c1ce0:
+// 0x010c1ce0: 0x10c1ce0: j	 0x10c1d2c addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c16ec
+	br L_10c1d2c
 // --- basic block ---
-L_10c16a8:
-// 0x010c16a8: 0x10c16a8: lw    a0, 152(sp)
+L_10c1ce8:
+// 0x010c1ce8: 0x10c1ce8: lw    a0, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7445,123 +7442,123 @@ L_10c16a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c16ac: 0x10c16ac: lw    v1, 0(a3)
+// 0x010c1cec: 0x10c1cec: lw    v1, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010c16b0: 0x10c16b0: subu  v0, s4, a0
+// 0x010c1cf0: 0x10c1cf0: subu  v0, s4, a0
 	ldloc 8
 	ldloc.1
 	sub
 	stloc 5
-// 0x010c16b4: 0x10c16b4: addu  s1, s0, zero
+// 0x010c1cf4: 0x10c1cf4: addu  s1, s0, zero
 	ldloc 9
 	stloc 10
-// 0x010c16b8: 0x10c16b8: addu  s7, a3, zero
+// 0x010c1cf8: 0x10c1cf8: addu  s7, a3, zero
 	ldloc 4
 	stloc 15
-// 0x010c16bc: 0x10c16bc: j	 0x10c16ec sw    v0, 0(v1)
+// 0x010c1cfc: 0x10c1cfc: j	 0x10c1d2c sw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10c16ec
+	br L_10c1d2c
 // --- basic block ---
-L_10c16c4:
-// 0x010c16c4: 0x10c16c4: beq   s0, zero, 0x10c1724 addiu v0, zero, 37
+L_10c1d04:
+// 0x010c1d04: 0x10c1d04: beq   s0, zero, 0x10c1d64 addiu v0, zero, 37
 	ldloc 9
 	ldc.i4.s 37
 	stloc 5
-	brfalse L_10c1724
+	brfalse L_10c1d64
 // --- basic block ---
-// 0x010c16cc: 0x10c16cc: sb    v0, 0(s4)
+// 0x010c1d0c: 0x10c1d0c: sb    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c16d0: 0x10c16d0: addiu s1, s0, -2
+// 0x010c1d10: 0x10c1d10: addiu s1, s0, -2
 	ldloc 9
 	ldc.i4.s -2
 	add
 	stloc 10
-// 0x010c16d4: 0x10c16d4: addiu v0, zero, -1
+// 0x010c1d14: 0x10c1d14: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010c16d8: 0x10c16d8: beq   s1, v0, 0x10c1700 addiu a0, s4, 1
+// 0x010c1d18: 0x10c1d18: beq   s1, v0, 0x10c1d40 addiu a0, s4, 1
 	ldloc 10
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc.1
-	beq  L_10c1700
+	beq  L_10c1d40
 // --- basic block ---
-// 0x010c16e0: 0x10c16e0: sb    v1, 1(s4)
+// 0x010c1d20: 0x10c1d20: sb    v1, 1(s4)
 	ldloc 8
 	ldc.i4.1
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c16e4: 0x10c16e4: addu  s7, a3, zero
+// 0x010c1d24: 0x10c1d24: addu  s7, a3, zero
 	ldloc 4
 	stloc 15
-// 0x010c16e8: 0x10c16e8: addiu s4, s4, 2
+// 0x010c1d28: 0x10c1d28: addiu s4, s4, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 8
-L_10c16ec:
-// 0x010c16ec: 0x10c16ec: addu  a3, s7, zero
+L_10c1d2c:
+// 0x010c1d2c: 0x10c1d2c: addu  a3, s7, zero
 	ldloc 15
 	stloc 4
-L_10c16f0:
-// 0x010c16f0: 0x10c16f0: beq   s1, zero, 0x10c1724 addu  a0, zero, zero
+L_10c1d30:
+// 0x010c1d30: 0x10c1d30: beq   s1, zero, 0x10c1d64 addu  a0, zero, zero
 	ldloc 10
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10c1724
+	brfalse L_10c1d64
 // --- basic block ---
-// 0x010c16f8: 0x10c16f8: j	 0x10c0b0c sll   zero, zero, 0
-	br L_10c0b0c
+// 0x010c1d38: 0x10c1d38: j	 0x10c114c sll   zero, zero, 0
+	br L_10c114c
 // --- basic block ---
-L_10c1700:
-// 0x010c1700: 0x10c1700: j	 0x10c1724 addu  s4, a0, zero
+L_10c1d40:
+// 0x010c1d40: 0x10c1d40: j	 0x10c1d64 addu  s4, a0, zero
 	ldloc.1
 	stloc 8
-	br L_10c1724
+	br L_10c1d64
 // --- basic block ---
-L_10c1708:
-// 0x010c1708: 0x10c1708: bne   v1, v0, 0x10c0bd4 addiu v0, v1, -48
+L_10c1d48:
+// 0x010c1d48: 0x10c1d48: bne   v1, v0, 0x10c1214 addiu v0, v1, -48
 	ldloc 6
 	ldloc 5
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc 5
-	bne.un L_10c0bd4
+	bne.un L_10c1214
 // --- basic block ---
-// 0x010c1710: 0x10c1710: j	 0x10c0bc8 addiu s6, s6, 1
+// 0x010c1d50: 0x10c1d50: j	 0x10c1208 addiu s6, s6, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-	br L_10c0bc8
+	br L_10c1208
 // --- basic block ---
-L_10c1718:
-// 0x010c1718: 0x10c1718: addu  v1, a3, zero
+L_10c1d58:
+// 0x010c1d58: 0x10c1d58: addu  v1, a3, zero
 	ldloc 4
 	stloc 6
-// 0x010c171c: 0x10c171c: j	 0x10c0ea4 addu  t1, zero, zero
+// 0x010c1d5c: 0x10c1d5c: j	 0x10c14e4 addu  t1, zero, zero
 	ldc.i4.s 0
 	stloc 17
-	br L_10c0ea4
+	br L_10c14e4
 // --- basic block ---
-L_10c1724:
-// 0x010c1724: 0x10c1724: lw    a1, 152(sp)
+L_10c1d64:
+// 0x010c1d64: 0x10c1d64: lw    a1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7570,17 +7567,17 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c1728: 0x10c1728: sb    zero, 0(s4)
+// 0x010c1d68: 0x10c1d68: sb    zero, 0(s4)
 	ldloc 8
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c172c: 0x10c172c: subu  v0, s4, a1
+// 0x010c1d6c: 0x10c1d6c: subu  v0, s4, a1
 	ldloc 8
 	ldloc.2
 	sub
 	stloc 5
-// 0x010c1730: 0x10c1730: lw    ra, 148(sp)
-// 0x010c1734: 0x10c1734: lw    s8, 144(sp)
+// 0x010c1d70: 0x10c1d70: lw    ra, 148(sp)
+// 0x010c1d74: 0x10c1d74: lw    s8, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7589,7 +7586,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c1738: 0x10c1738: lw    s7, 140(sp)
+// 0x010c1d78: 0x10c1d78: lw    s7, 140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7598,7 +7595,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010c173c: 0x10c173c: lw    s6, 136(sp)
+// 0x010c1d7c: 0x10c1d7c: lw    s6, 136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7607,7 +7604,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010c1740: 0x10c1740: lw    s5, 132(sp)
+// 0x010c1d80: 0x10c1d80: lw    s5, 132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7616,7 +7613,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010c1744: 0x10c1744: lw    s4, 128(sp)
+// 0x010c1d84: 0x10c1d84: lw    s4, 128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7625,7 +7622,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1748: 0x10c1748: lw    s3, 124(sp)
+// 0x010c1d88: 0x10c1d88: lw    s3, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7634,7 +7631,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010c174c: 0x10c174c: lw    s2, 120(sp)
+// 0x010c1d8c: 0x10c1d8c: lw    s2, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7643,7 +7640,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010c1750: 0x10c1750: lw    s1, 116(sp)
+// 0x010c1d90: 0x10c1d90: lw    s1, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7652,7 +7649,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c1754: 0x10c1754: lw    s0, 112(sp)
+// 0x010c1d94: 0x10c1d94: lw    s0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7661,7 +7658,7 @@ L_10c1724:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c1758: 0x10c1758: jr    ra addiu sp, sp, 152
+// 0x010c1d98: 0x10c1d98: jr    ra addiu sp, sp, 152
 	ldloc.0
 	ldc.i4 152
 	add
diff --git a/converted/Cibyl144.j b/converted/Cibyl144.j
index 5952b3c..75d7afd 100644
--- a/converted/Cibyl144.j
+++ b/converted/Cibyl144.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl144::.ctor
 
-.method public static int32 __unorddf2_10c1760(int32,int32,int32,int32,int32)
+.method public static int32 __unorddf2_10c1da0(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,12 +76,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1760: 0x10c1760: addiu sp, sp, -16
+// 0x010c1da0: 0x10c1da0: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1764: 0x10c1764: sw    a1, 4(sp)
+// 0x010c1da4: 0x10c1da4: sw    a1, 4(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -90,14 +90,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1768: 0x10c1768: sw    a0, 0(sp)
+// 0x010c1da8: 0x10c1da8: sw    a0, 0(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c176c: 0x10c176c: sw    a3, 12(sp)
+// 0x010c1dac: 0x10c1dac: sw    a3, 12(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -106,7 +106,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c1770: 0x10c1770: sw    a2, 8(sp)
+// 0x010c1db0: 0x10c1db0: sw    a2, 8(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -115,44 +115,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c1774: 0x10c1774: cibyl_sysc_arg 0x1d
+// 0x010c1db4: 0x10c1db4: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c1778: 0x10c1778: cibyl_sysc 0x2548
+// 0x010c1db8: 0x10c1db8: cibyl_sysc 0x2548
 	call int32 [WazeWP7]Syscalls::__isnan_helper(int32)
 	stloc 5
-// 0x010c177c: 0x10c177c: addu  v1, v0, zero
+// 0x010c1dbc: 0x10c1dbc: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c1780: 0x10c1780: bne   v1, zero, 0x10c17a4 addiu v0, zero, 1
+// 0x010c1dc0: 0x10c1dc0: bne   v1, zero, 0x10c1de4 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brtrue L_10c17a4
+	brtrue L_10c1de4
 // --- basic block ---
-// 0x010c1788: 0x10c1788: addiu v1, sp, 8
+// 0x010c1dc8: 0x10c1dc8: addiu v1, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc 6
-// 0x010c178c: 0x10c178c: cibyl_sysc_arg 0x3
+// 0x010c1dcc: 0x10c1dcc: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c1790: 0x10c1790: cibyl_sysc 0x2557
+// 0x010c1dd0: 0x10c1dd0: cibyl_sysc 0x2557
 	call int32 [WazeWP7]Syscalls::__isnan_helper(int32)
 	stloc 5
-// 0x010c1794: 0x10c1794: addu  v1, v0, zero
+// 0x010c1dd4: 0x10c1dd4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c1798: 0x10c1798: beq   v1, zero, 0x10c17a4 addu  v0, zero, zero
+// 0x010c1dd8: 0x10c1dd8: beq   v1, zero, 0x10c1de4 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10c17a4
+	brfalse L_10c1de4
 // --- basic block ---
-// 0x010c17a0: 0x10c17a0: addiu v0, zero, 1
+// 0x010c1de0: 0x10c1de0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10c17a4:
-// 0x010c17a4: 0x10c17a4: jr    ra addiu sp, sp, 16
+L_10c1de4:
+// 0x010c1de4: 0x10c1de4: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -164,7 +164,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 __gtdf2_10c17ac(int32,int32,int32,int32,int32)
+.method public static int32 __gtdf2_10c1dec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -211,12 +211,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c17ac: 0x10c17ac: addiu sp, sp, -40
+// 0x010c1dec: 0x10c1dec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010c17b0: 0x10c17b0: sw    s3, 28(sp)
+// 0x010c1df0: 0x10c1df0: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -225,7 +225,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c17b4: 0x10c17b4: sw    s2, 24(sp)
+// 0x010c1df4: 0x10c1df4: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -234,7 +234,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c17b8: 0x10c17b8: sw    s1, 20(sp)
+// 0x010c1df8: 0x10c1df8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -243,7 +243,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c17bc: 0x10c17bc: sw    s0, 16(sp)
+// 0x010c1dfc: 0x10c1dfc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -252,17 +252,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c17c0: 0x10c17c0: addu  s1, a1, zero
+// 0x010c1e00: 0x10c1e00: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c17c4: 0x10c17c4: addu  s0, a0, zero
+// 0x010c1e04: 0x10c1e04: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c17c8: 0x10c17c8: addu  s3, a3, zero
+// 0x010c1e08: 0x10c1e08: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x010c17cc: 0x10c17cc: sw    ra, 32(sp)
-// 0x010c17d0: 0x10c17d0: jal   0x10c1760 addu  s2, a2, zero
+// 0x010c1e0c: 0x10c1e0c: sw    ra, 32(sp)
+// 0x010c1e10: 0x10c1e10: jal   0x10c1da0 addu  s2, a2, zero
 	ldloc.3
 	stloc 10
 	ldloc.0
@@ -270,46 +270,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__unorddf2_10c1760(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__unorddf2_10c1da0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c17d8: 0x10c17d8: addu  a1, s1, zero
+// 0x010c1e18: 0x10c1e18: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c17dc: 0x10c17dc: addu  a0, s0, zero
+// 0x010c1e1c: 0x10c1e1c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c17e0: 0x10c17e0: addu  a3, s3, zero
+// 0x010c1e20: 0x10c1e20: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010c17e4: 0x10c17e4: addu  a2, s2, zero
+// 0x010c1e24: 0x10c1e24: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010c17e8: 0x10c17e8: bne   v0, zero, 0x10c17fc addu  v1, zero, zero
+// 0x010c1e28: 0x10c1e28: bne   v0, zero, 0x10c1e3c addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10c17fc
+	brtrue L_10c1e3c
 // --- basic block ---
-// 0x010c17f0: 0x10c17f0: jal   0x10c0a3c sll   zero, zero, 0
+// 0x010c1e30: 0x10c1e30: jal   0x10c107c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__cmpdf2_10c0a3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__cmpdf2_10c107c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c17f8: 0x10c17f8: addu  v1, v0, zero
+// 0x010c1e38: 0x10c1e38: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c17fc:
-// 0x010c17fc: 0x10c17fc: lw    ra, 32(sp)
-// 0x010c1800: 0x10c1800: lw    s3, 28(sp)
+L_10c1e3c:
+// 0x010c1e3c: 0x10c1e3c: lw    ra, 32(sp)
+// 0x010c1e40: 0x10c1e40: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -318,7 +318,7 @@ L_10c17fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c1804: 0x10c1804: lw    s2, 24(sp)
+// 0x010c1e44: 0x10c1e44: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -327,7 +327,7 @@ L_10c17fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c1808: 0x10c1808: lw    s1, 20(sp)
+// 0x010c1e48: 0x10c1e48: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -336,7 +336,7 @@ L_10c17fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c180c: 0x10c180c: lw    s0, 16(sp)
+// 0x010c1e4c: 0x10c1e4c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -345,10 +345,10 @@ L_10c17fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1810: 0x10c1810: addu  v0, v1, zero
+// 0x010c1e50: 0x10c1e50: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c1814: 0x10c1814: jr    ra addiu sp, sp, 40
+// 0x010c1e54: 0x10c1e54: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -360,7 +360,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 __ltdf2_10c188c(int32,int32,int32,int32,int32)
+.method public static int32 __ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -407,12 +407,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c188c: 0x10c188c: addiu sp, sp, -40
+// 0x010c1ecc: 0x10c1ecc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010c1890: 0x10c1890: sw    s3, 28(sp)
+// 0x010c1ed0: 0x10c1ed0: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -421,7 +421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c1894: 0x10c1894: sw    s2, 24(sp)
+// 0x010c1ed4: 0x10c1ed4: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -430,7 +430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c1898: 0x10c1898: sw    s1, 20(sp)
+// 0x010c1ed8: 0x10c1ed8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -439,7 +439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c189c: 0x10c189c: sw    s0, 16(sp)
+// 0x010c1edc: 0x10c1edc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -448,17 +448,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c18a0: 0x10c18a0: addu  s1, a1, zero
+// 0x010c1ee0: 0x10c1ee0: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c18a4: 0x10c18a4: addu  s0, a0, zero
+// 0x010c1ee4: 0x10c1ee4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c18a8: 0x10c18a8: addu  s3, a3, zero
+// 0x010c1ee8: 0x10c1ee8: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x010c18ac: 0x10c18ac: sw    ra, 32(sp)
-// 0x010c18b0: 0x10c18b0: jal   0x10c1760 addu  s2, a2, zero
+// 0x010c1eec: 0x10c1eec: sw    ra, 32(sp)
+// 0x010c1ef0: 0x10c1ef0: jal   0x10c1da0 addu  s2, a2, zero
 	ldloc.3
 	stloc 10
 	ldloc.0
@@ -466,46 +466,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__unorddf2_10c1760(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__unorddf2_10c1da0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c18b8: 0x10c18b8: addu  a1, s1, zero
+// 0x010c1ef8: 0x10c1ef8: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c18bc: 0x10c18bc: addu  a0, s0, zero
+// 0x010c1efc: 0x10c1efc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c18c0: 0x10c18c0: addu  a3, s3, zero
+// 0x010c1f00: 0x10c1f00: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010c18c4: 0x10c18c4: addu  a2, s2, zero
+// 0x010c1f04: 0x10c1f04: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010c18c8: 0x10c18c8: bne   v0, zero, 0x10c18dc addiu v1, zero, -1
+// 0x010c1f08: 0x10c1f08: bne   v0, zero, 0x10c1f1c addiu v1, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 7
-	brtrue L_10c18dc
+	brtrue L_10c1f1c
 // --- basic block ---
-// 0x010c18d0: 0x10c18d0: jal   0x10c0a3c sll   zero, zero, 0
+// 0x010c1f10: 0x10c1f10: jal   0x10c107c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__cmpdf2_10c0a3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__cmpdf2_10c107c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c18d8: 0x10c18d8: addu  v1, v0, zero
+// 0x010c1f18: 0x10c1f18: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c18dc:
-// 0x010c18dc: 0x10c18dc: lw    ra, 32(sp)
-// 0x010c18e0: 0x10c18e0: lw    s3, 28(sp)
+L_10c1f1c:
+// 0x010c1f1c: 0x10c1f1c: lw    ra, 32(sp)
+// 0x010c1f20: 0x10c1f20: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -514,7 +514,7 @@ L_10c18dc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c18e4: 0x10c18e4: lw    s2, 24(sp)
+// 0x010c1f24: 0x10c1f24: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -523,7 +523,7 @@ L_10c18dc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c18e8: 0x10c18e8: lw    s1, 20(sp)
+// 0x010c1f28: 0x10c1f28: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -532,7 +532,7 @@ L_10c18dc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c18ec: 0x10c18ec: lw    s0, 16(sp)
+// 0x010c1f2c: 0x10c1f2c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -541,10 +541,10 @@ L_10c18dc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c18f0: 0x10c18f0: addu  v0, v1, zero
+// 0x010c1f30: 0x10c1f30: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c18f4: 0x10c18f4: jr    ra addiu sp, sp, 40
+// 0x010c1f34: 0x10c1f34: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -556,7 +556,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 __gedf2_10c18fc(int32,int32,int32,int32,int32)
+.method public static int32 __gedf2_10c1f3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -603,12 +603,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c18fc: 0x10c18fc: addiu sp, sp, -40
+// 0x010c1f3c: 0x10c1f3c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010c1900: 0x10c1900: sw    s3, 28(sp)
+// 0x010c1f40: 0x10c1f40: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -617,7 +617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c1904: 0x10c1904: sw    s2, 24(sp)
+// 0x010c1f44: 0x10c1f44: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -626,7 +626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c1908: 0x10c1908: sw    s1, 20(sp)
+// 0x010c1f48: 0x10c1f48: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -635,7 +635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c190c: 0x10c190c: sw    s0, 16(sp)
+// 0x010c1f4c: 0x10c1f4c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -644,17 +644,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c1910: 0x10c1910: addu  s1, a1, zero
+// 0x010c1f50: 0x10c1f50: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c1914: 0x10c1914: addu  s0, a0, zero
+// 0x010c1f54: 0x10c1f54: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c1918: 0x10c1918: addu  s3, a3, zero
+// 0x010c1f58: 0x10c1f58: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x010c191c: 0x10c191c: sw    ra, 32(sp)
-// 0x010c1920: 0x10c1920: jal   0x10c1760 addu  s2, a2, zero
+// 0x010c1f5c: 0x10c1f5c: sw    ra, 32(sp)
+// 0x010c1f60: 0x10c1f60: jal   0x10c1da0 addu  s2, a2, zero
 	ldloc.3
 	stloc 10
 	ldloc.0
@@ -662,46 +662,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__unorddf2_10c1760(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__unorddf2_10c1da0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c1928: 0x10c1928: addu  a1, s1, zero
+// 0x010c1f68: 0x10c1f68: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c192c: 0x10c192c: addu  a0, s0, zero
+// 0x010c1f6c: 0x10c1f6c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c1930: 0x10c1930: addu  a3, s3, zero
+// 0x010c1f70: 0x10c1f70: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x010c1934: 0x10c1934: addu  a2, s2, zero
+// 0x010c1f74: 0x10c1f74: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x010c1938: 0x10c1938: bne   v0, zero, 0x10c194c addu  v1, zero, zero
+// 0x010c1f78: 0x10c1f78: bne   v0, zero, 0x10c1f8c addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10c194c
+	brtrue L_10c1f8c
 // --- basic block ---
-// 0x010c1940: 0x10c1940: jal   0x10c0a3c sll   zero, zero, 0
+// 0x010c1f80: 0x10c1f80: jal   0x10c107c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__cmpdf2_10c0a3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__cmpdf2_10c107c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c1948: 0x10c1948: addu  v1, v0, zero
+// 0x010c1f88: 0x10c1f88: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c194c:
-// 0x010c194c: 0x10c194c: lw    ra, 32(sp)
-// 0x010c1950: 0x10c1950: lw    s3, 28(sp)
+L_10c1f8c:
+// 0x010c1f8c: 0x10c1f8c: lw    ra, 32(sp)
+// 0x010c1f90: 0x10c1f90: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -710,7 +710,7 @@ L_10c194c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c1954: 0x10c1954: lw    s2, 24(sp)
+// 0x010c1f94: 0x10c1f94: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -719,7 +719,7 @@ L_10c194c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c1958: 0x10c1958: lw    s1, 20(sp)
+// 0x010c1f98: 0x10c1f98: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -728,7 +728,7 @@ L_10c194c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c195c: 0x10c195c: lw    s0, 16(sp)
+// 0x010c1f9c: 0x10c1f9c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -737,10 +737,10 @@ L_10c194c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1960: 0x10c1960: addu  v0, v1, zero
+// 0x010c1fa0: 0x10c1fa0: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c1964: 0x10c1964: jr    ra addiu sp, sp, 40
+// 0x010c1fa4: 0x10c1fa4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -752,7 +752,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 __unordsf2_10c1a4c(int32,int32)
+.method public static int32 __unordsf2_10c208c(int32,int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32 ra)
@@ -775,39 +775,39 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1a4c: 0x10c1a4c: cibyl_sysc_arg 0x4
+// 0x010c208c: 0x10c208c: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c1a50: 0x10c1a50: cibyl_sysc 0x2566
+// 0x010c2090: 0x10c2090: cibyl_sysc 0x2566
 	call int32 [WazeWP7]Syscalls::__isnanf_helper(int32)
 	stloc.2
-// 0x010c1a54: 0x10c1a54: addu  a0, v0, zero
+// 0x010c2094: 0x10c2094: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c1a58: 0x10c1a58: bne   a0, zero, 0x10c1a78 addiu v0, zero, 1
+// 0x010c2098: 0x10c2098: bne   a0, zero, 0x10c20b8 addiu v0, zero, 1
 	ldloc.0
 	ldc.i4.1
 	stloc.2
-	brtrue L_10c1a78
+	brtrue L_10c20b8
 // --- basic block ---
-// 0x010c1a60: 0x10c1a60: cibyl_sysc_arg 0x5
+// 0x010c20a0: 0x10c20a0: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c1a64: 0x10c1a64: cibyl_sysc 0x2576
+// 0x010c20a4: 0x10c20a4: cibyl_sysc 0x2576
 	call int32 [WazeWP7]Syscalls::__isnanf_helper(int32)
 	stloc.2
-// 0x010c1a68: 0x10c1a68: addu  v1, v0, zero
+// 0x010c20a8: 0x10c20a8: addu  v1, v0, zero
 	ldloc.2
 	stloc.3
-// 0x010c1a6c: 0x10c1a6c: beq   v1, zero, 0x10c1a78 addu  v0, zero, zero
+// 0x010c20ac: 0x10c20ac: beq   v1, zero, 0x10c20b8 addu  v0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10c1a78
+	brfalse L_10c20b8
 // --- basic block ---
-// 0x010c1a74: 0x10c1a74: addiu v0, zero, 1
+// 0x010c20b4: 0x10c20b4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.2
-L_10c1a78:
-// 0x010c1a78: 0x10c1a78: jr    ra sll   zero, zero, 0
+L_10c20b8:
+// 0x010c20b8: 0x10c20b8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -815,7 +815,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 __gtsf2_10c1a80(int32,int32,int32,int32,int32)
+.method public static int32 __gtsf2_10c20c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -856,12 +856,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1a80: 0x10c1a80: addiu sp, sp, -32
+// 0x010c20c0: 0x10c20c0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c1a84: 0x10c1a84: sw    s1, 20(sp)
+// 0x010c20c4: 0x10c20c4: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -870,7 +870,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c1a88: 0x10c1a88: sw    s0, 16(sp)
+// 0x010c20c8: 0x10c20c8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -879,44 +879,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c1a8c: 0x10c1a8c: addu  s1, a1, zero
+// 0x010c20cc: 0x10c20cc: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c1a90: 0x10c1a90: sw    ra, 24(sp)
-// 0x010c1a94: 0x10c1a94: jal   0x10c1a4c addu  s0, a0, zero
+// 0x010c20d0: 0x10c20d0: sw    ra, 24(sp)
+// 0x010c20d4: 0x10c20d4: jal   0x10c208c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::__unordsf2_10c1a4c(int32,int32)
+	call int32 Cibyl144::__unordsf2_10c208c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c1a9c: 0x10c1a9c: addu  a0, s0, zero
+// 0x010c20dc: 0x10c20dc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c1aa0: 0x10c1aa0: addu  a1, s1, zero
+// 0x010c20e0: 0x10c20e0: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c1aa4: 0x10c1aa4: bne   v0, zero, 0x10c1ab8 addu  v1, zero, zero
+// 0x010c20e4: 0x10c20e4: bne   v0, zero, 0x10c20f8 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10c1ab8
+	brtrue L_10c20f8
 // --- basic block ---
-// 0x010c1aac: 0x10c1aac: jal   0x10c0a24 sll   zero, zero, 0
+// 0x010c20ec: 0x10c20ec: jal   0x10c1064 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__cmpsf2_10c0a24(int32,int32)
+	call int32 Cibyl143::__cmpsf2_10c1064(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010c1ab4: 0x10c1ab4: addu  v1, v0, zero
+// 0x010c20f4: 0x10c20f4: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c1ab8:
-// 0x010c1ab8: 0x10c1ab8: lw    ra, 24(sp)
-// 0x010c1abc: 0x10c1abc: lw    s1, 20(sp)
+L_10c20f8:
+// 0x010c20f8: 0x10c20f8: lw    ra, 24(sp)
+// 0x010c20fc: 0x10c20fc: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -925,7 +925,7 @@ L_10c1ab8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c1ac0: 0x10c1ac0: lw    s0, 16(sp)
+// 0x010c2100: 0x10c2100: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -934,10 +934,10 @@ L_10c1ab8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1ac4: 0x10c1ac4: addu  v0, v1, zero
+// 0x010c2104: 0x10c2104: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c1ac8: 0x10c1ac8: jr    ra addiu sp, sp, 32
+// 0x010c2108: 0x10c2108: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -949,7 +949,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 __lesf2_10c1ad0(int32,int32,int32,int32,int32)
+.method public static int32 __lesf2_10c2110(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -990,12 +990,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1ad0: 0x10c1ad0: addiu sp, sp, -32
+// 0x010c2110: 0x10c2110: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c1ad4: 0x10c1ad4: sw    s1, 20(sp)
+// 0x010c2114: 0x10c2114: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1004,7 +1004,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c1ad8: 0x10c1ad8: sw    s0, 16(sp)
+// 0x010c2118: 0x10c2118: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1013,44 +1013,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c1adc: 0x10c1adc: addu  s1, a1, zero
+// 0x010c211c: 0x10c211c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c1ae0: 0x10c1ae0: sw    ra, 24(sp)
-// 0x010c1ae4: 0x10c1ae4: jal   0x10c1a4c addu  s0, a0, zero
+// 0x010c2120: 0x10c2120: sw    ra, 24(sp)
+// 0x010c2124: 0x10c2124: jal   0x10c208c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::__unordsf2_10c1a4c(int32,int32)
+	call int32 Cibyl144::__unordsf2_10c208c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c1aec: 0x10c1aec: addu  a0, s0, zero
+// 0x010c212c: 0x10c212c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c1af0: 0x10c1af0: addu  a1, s1, zero
+// 0x010c2130: 0x10c2130: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c1af4: 0x10c1af4: bne   v0, zero, 0x10c1b08 addiu v1, zero, 1
+// 0x010c2134: 0x10c2134: bne   v0, zero, 0x10c2148 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 7
-	brtrue L_10c1b08
+	brtrue L_10c2148
 // --- basic block ---
-// 0x010c1afc: 0x10c1afc: jal   0x10c0a24 sll   zero, zero, 0
+// 0x010c213c: 0x10c213c: jal   0x10c1064 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__cmpsf2_10c0a24(int32,int32)
+	call int32 Cibyl143::__cmpsf2_10c1064(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010c1b04: 0x10c1b04: addu  v1, v0, zero
+// 0x010c2144: 0x10c2144: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c1b08:
-// 0x010c1b08: 0x10c1b08: lw    ra, 24(sp)
-// 0x010c1b0c: 0x10c1b0c: lw    s1, 20(sp)
+L_10c2148:
+// 0x010c2148: 0x10c2148: lw    ra, 24(sp)
+// 0x010c214c: 0x10c214c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1059,7 +1059,7 @@ L_10c1b08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c1b10: 0x10c1b10: lw    s0, 16(sp)
+// 0x010c2150: 0x10c2150: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1068,10 +1068,10 @@ L_10c1b08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1b14: 0x10c1b14: addu  v0, v1, zero
+// 0x010c2154: 0x10c2154: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c1b18: 0x10c1b18: jr    ra addiu sp, sp, 32
+// 0x010c2158: 0x10c2158: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1083,7 +1083,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 __ltsf2_10c1b20(int32,int32,int32,int32,int32)
+.method public static int32 __ltsf2_10c2160(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1124,12 +1124,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1b20: 0x10c1b20: addiu sp, sp, -32
+// 0x010c2160: 0x10c2160: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c1b24: 0x10c1b24: sw    s1, 20(sp)
+// 0x010c2164: 0x10c2164: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1138,7 +1138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c1b28: 0x10c1b28: sw    s0, 16(sp)
+// 0x010c2168: 0x10c2168: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1147,44 +1147,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c1b2c: 0x10c1b2c: addu  s1, a1, zero
+// 0x010c216c: 0x10c216c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c1b30: 0x10c1b30: sw    ra, 24(sp)
-// 0x010c1b34: 0x10c1b34: jal   0x10c1a4c addu  s0, a0, zero
+// 0x010c2170: 0x10c2170: sw    ra, 24(sp)
+// 0x010c2174: 0x10c2174: jal   0x10c208c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::__unordsf2_10c1a4c(int32,int32)
+	call int32 Cibyl144::__unordsf2_10c208c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c1b3c: 0x10c1b3c: addu  a0, s0, zero
+// 0x010c217c: 0x10c217c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c1b40: 0x10c1b40: addu  a1, s1, zero
+// 0x010c2180: 0x10c2180: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c1b44: 0x10c1b44: bne   v0, zero, 0x10c1b58 addiu v1, zero, -1
+// 0x010c2184: 0x10c2184: bne   v0, zero, 0x10c2198 addiu v1, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 7
-	brtrue L_10c1b58
+	brtrue L_10c2198
 // --- basic block ---
-// 0x010c1b4c: 0x10c1b4c: jal   0x10c0a24 sll   zero, zero, 0
+// 0x010c218c: 0x10c218c: jal   0x10c1064 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__cmpsf2_10c0a24(int32,int32)
+	call int32 Cibyl143::__cmpsf2_10c1064(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010c1b54: 0x10c1b54: addu  v1, v0, zero
+// 0x010c2194: 0x10c2194: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c1b58:
-// 0x010c1b58: 0x10c1b58: lw    ra, 24(sp)
-// 0x010c1b5c: 0x10c1b5c: lw    s1, 20(sp)
+L_10c2198:
+// 0x010c2198: 0x10c2198: lw    ra, 24(sp)
+// 0x010c219c: 0x10c219c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1193,7 +1193,7 @@ L_10c1b58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c1b60: 0x10c1b60: lw    s0, 16(sp)
+// 0x010c21a0: 0x10c21a0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1202,10 +1202,10 @@ L_10c1b58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1b64: 0x10c1b64: addu  v0, v1, zero
+// 0x010c21a4: 0x10c21a4: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c1b68: 0x10c1b68: jr    ra addiu sp, sp, 32
+// 0x010c21a8: 0x10c21a8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1217,7 +1217,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 __gesf2_10c1b70(int32,int32,int32,int32,int32)
+.method public static int32 __gesf2_10c21b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1258,12 +1258,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1b70: 0x10c1b70: addiu sp, sp, -32
+// 0x010c21b0: 0x10c21b0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c1b74: 0x10c1b74: sw    s1, 20(sp)
+// 0x010c21b4: 0x10c21b4: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1272,7 +1272,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c1b78: 0x10c1b78: sw    s0, 16(sp)
+// 0x010c21b8: 0x10c21b8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1281,44 +1281,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c1b7c: 0x10c1b7c: addu  s1, a1, zero
+// 0x010c21bc: 0x10c21bc: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c1b80: 0x10c1b80: sw    ra, 24(sp)
-// 0x010c1b84: 0x10c1b84: jal   0x10c1a4c addu  s0, a0, zero
+// 0x010c21c0: 0x10c21c0: sw    ra, 24(sp)
+// 0x010c21c4: 0x10c21c4: jal   0x10c208c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::__unordsf2_10c1a4c(int32,int32)
+	call int32 Cibyl144::__unordsf2_10c208c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c1b8c: 0x10c1b8c: addu  a0, s0, zero
+// 0x010c21cc: 0x10c21cc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c1b90: 0x10c1b90: addu  a1, s1, zero
+// 0x010c21d0: 0x10c21d0: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c1b94: 0x10c1b94: bne   v0, zero, 0x10c1ba8 addu  v1, zero, zero
+// 0x010c21d4: 0x10c21d4: bne   v0, zero, 0x10c21e8 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10c1ba8
+	brtrue L_10c21e8
 // --- basic block ---
-// 0x010c1b9c: 0x10c1b9c: jal   0x10c0a24 sll   zero, zero, 0
+// 0x010c21dc: 0x10c21dc: jal   0x10c1064 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__cmpsf2_10c0a24(int32,int32)
+	call int32 Cibyl143::__cmpsf2_10c1064(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010c1ba4: 0x10c1ba4: addu  v1, v0, zero
+// 0x010c21e4: 0x10c21e4: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c1ba8:
-// 0x010c1ba8: 0x10c1ba8: lw    ra, 24(sp)
-// 0x010c1bac: 0x10c1bac: lw    s1, 20(sp)
+L_10c21e8:
+// 0x010c21e8: 0x10c21e8: lw    ra, 24(sp)
+// 0x010c21ec: 0x10c21ec: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1327,7 +1327,7 @@ L_10c1ba8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c1bb0: 0x10c1bb0: lw    s0, 16(sp)
+// 0x010c21f0: 0x10c21f0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1336,10 +1336,10 @@ L_10c1ba8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1bb4: 0x10c1bb4: addu  v0, v1, zero
+// 0x010c21f4: 0x10c21f4: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c1bb8: 0x10c1bb8: jr    ra addiu sp, sp, 32
+// 0x010c21f8: 0x10c21f8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1351,7 +1351,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 __eqsf2_10c1c10(int32,int32,int32,int32,int32)
+.method public static int32 __eqsf2_10c2250(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1392,12 +1392,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1c10: 0x10c1c10: addiu sp, sp, -32
+// 0x010c2250: 0x10c2250: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c1c14: 0x10c1c14: sw    s1, 20(sp)
+// 0x010c2254: 0x10c2254: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1406,7 +1406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c1c18: 0x10c1c18: sw    s0, 16(sp)
+// 0x010c2258: 0x10c2258: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1415,44 +1415,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c1c1c: 0x10c1c1c: addu  s1, a1, zero
+// 0x010c225c: 0x10c225c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c1c20: 0x10c1c20: sw    ra, 24(sp)
-// 0x010c1c24: 0x10c1c24: jal   0x10c1a4c addu  s0, a0, zero
+// 0x010c2260: 0x10c2260: sw    ra, 24(sp)
+// 0x010c2264: 0x10c2264: jal   0x10c208c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::__unordsf2_10c1a4c(int32,int32)
+	call int32 Cibyl144::__unordsf2_10c208c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c1c2c: 0x10c1c2c: addu  a0, s0, zero
+// 0x010c226c: 0x10c226c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c1c30: 0x10c1c30: addu  a1, s1, zero
+// 0x010c2270: 0x10c2270: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010c1c34: 0x10c1c34: bne   v0, zero, 0x10c1c48 addiu v1, zero, 1
+// 0x010c2274: 0x10c2274: bne   v0, zero, 0x10c2288 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 7
-	brtrue L_10c1c48
+	brtrue L_10c2288
 // --- basic block ---
-// 0x010c1c3c: 0x10c1c3c: jal   0x10c0a24 sll   zero, zero, 0
+// 0x010c227c: 0x10c227c: jal   0x10c1064 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__cmpsf2_10c0a24(int32,int32)
+	call int32 Cibyl143::__cmpsf2_10c1064(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010c1c44: 0x10c1c44: addu  v1, v0, zero
+// 0x010c2284: 0x10c2284: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-L_10c1c48:
-// 0x010c1c48: 0x10c1c48: lw    ra, 24(sp)
-// 0x010c1c4c: 0x10c1c4c: lw    s1, 20(sp)
+L_10c2288:
+// 0x010c2288: 0x10c2288: lw    ra, 24(sp)
+// 0x010c228c: 0x10c228c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1461,7 +1461,7 @@ L_10c1c48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c1c50: 0x10c1c50: lw    s0, 16(sp)
+// 0x010c2290: 0x10c2290: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1470,10 +1470,10 @@ L_10c1c48:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1c54: 0x10c1c54: addu  v0, v1, zero
+// 0x010c2294: 0x10c2294: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x010c1c58: 0x10c1c58: jr    ra addiu sp, sp, 32
+// 0x010c2298: 0x10c2298: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1485,7 +1485,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 atof_10c1c60(int32,int32,int32,int32,int32)
+.method public static int32 atof_10c22a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra,int32 t0)
@@ -1535,12 +1535,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1c60: 0x10c1c60: addiu sp, sp, -40
+// 0x010c22a0: 0x10c22a0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010c1c64: 0x10c1c64: sw    s1, 20(sp)
+// 0x010c22a4: 0x10c22a4: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1549,11 +1549,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c1c68: 0x10c1c68: sw    ra, 32(sp)
-// 0x010c1c6c: 0x10c1c6c: addu  s1, a0, zero
+// 0x010c22a8: 0x10c22a8: sw    ra, 32(sp)
+// 0x010c22ac: 0x10c22ac: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c1c70: 0x10c1c70: sw    s3, 28(sp)
+// 0x010c22b0: 0x10c22b0: sw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1562,7 +1562,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c1c74: 0x10c1c74: sw    s2, 24(sp)
+// 0x010c22b4: 0x10c22b4: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1571,7 +1571,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c1c78: 0x10c1c78: sw    s0, 16(sp)
+// 0x010c22b8: 0x10c22b8: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1580,103 +1580,103 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c1c7c: 0x10c1c7c: addiu t0, zero, 32
+// 0x010c22bc: 0x10c22bc: addiu t0, zero, 32
 	ldc.i4.s 32
 	stloc 13
-// 0x010c1c80: 0x10c1c80: addiu a3, zero, 12
+// 0x010c22c0: 0x10c22c0: addiu a3, zero, 12
 	ldc.i4.s 12
 	stloc 4
-// 0x010c1c84: 0x10c1c84: addiu a2, zero, 10
+// 0x010c22c4: 0x10c22c4: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010c1c88: 0x10c1c88: addiu a1, zero, 13
+// 0x010c22c8: 0x10c22c8: addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
-// 0x010c1c8c: 0x10c1c8c: addiu a0, zero, 9
+// 0x010c22cc: 0x10c22cc: addiu a0, zero, 9
 	ldc.i4.s 9
 	stloc.1
-// 0x010c1c90: 0x10c1c90: addiu v0, zero, 11
+// 0x010c22d0: 0x10c22d0: addiu v0, zero, 11
 	ldc.i4.s 11
 	stloc 5
-L_10c1c94:
-// 0x010c1c94: 0x10c1c94: lb    v1, 0(s1)
+L_10c22d4:
+// 0x010c22d4: 0x10c22d4: lb    v1, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c1c98: 0x10c1c98: sll   zero, zero, 0
-// 0x010c1c9c: 0x10c1c9c: beq   v1, t0, 0x10c1ccc sll   zero, zero, 0
+// 0x010c22d8: 0x10c22d8: sll   zero, zero, 0
+// 0x010c22dc: 0x10c22dc: beq   v1, t0, 0x10c230c sll   zero, zero, 0
 	ldloc 6
 	ldloc 13
-	beq  L_10c1ccc
+	beq  L_10c230c
 // --- basic block ---
-// 0x010c1ca4: 0x10c1ca4: beq   v1, a3, 0x10c1ccc sll   zero, zero, 0
+// 0x010c22e4: 0x10c22e4: beq   v1, a3, 0x10c230c sll   zero, zero, 0
 	ldloc 6
 	ldloc 4
-	beq  L_10c1ccc
+	beq  L_10c230c
 // --- basic block ---
-// 0x010c1cac: 0x10c1cac: beq   v1, a2, 0x10c1ccc sll   zero, zero, 0
+// 0x010c22ec: 0x10c22ec: beq   v1, a2, 0x10c230c sll   zero, zero, 0
 	ldloc 6
 	ldloc.3
-	beq  L_10c1ccc
+	beq  L_10c230c
 // --- basic block ---
-// 0x010c1cb4: 0x10c1cb4: beq   v1, a1, 0x10c1ccc sll   zero, zero, 0
+// 0x010c22f4: 0x10c22f4: beq   v1, a1, 0x10c230c sll   zero, zero, 0
 	ldloc 6
 	ldloc.2
-	beq  L_10c1ccc
+	beq  L_10c230c
 // --- basic block ---
-// 0x010c1cbc: 0x10c1cbc: beq   v1, a0, 0x10c1ccc sll   zero, zero, 0
+// 0x010c22fc: 0x10c22fc: beq   v1, a0, 0x10c230c sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	beq  L_10c1ccc
+	beq  L_10c230c
 // --- basic block ---
-// 0x010c1cc4: 0x10c1cc4: bne   v1, v0, 0x10c1dbc sll   zero, zero, 0
+// 0x010c2304: 0x10c2304: bne   v1, v0, 0x10c23fc sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_10c1dbc
+	bne.un L_10c23fc
 // --- basic block ---
-L_10c1ccc:
-// 0x010c1ccc: 0x10c1ccc: j	 0x10c1c94 addiu s1, s1, 1
+L_10c230c:
+// 0x010c230c: 0x10c230c: j	 0x10c22d4 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c1c94
+	br L_10c22d4
 // --- basic block ---
-L_10c1cd4:
-// 0x010c1cd4: 0x10c1cd4: j	 0x10c1de4 addiu s1, s1, 1
+L_10c2314:
+// 0x010c2314: 0x10c2314: j	 0x10c2424 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c1de4
+	br L_10c2424
 // --- basic block ---
-L_10c1cdc:
-// 0x010c1cdc: 0x10c1cdc: lui   v0, 0x20000
+L_10c231c:
+// 0x010c231c: 0x10c231c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010c1ce0: 0x10c1ce0: lw    a1, 23692(v0)
+// 0x010c2320: 0x10c2320: lw    a1, 24152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5923
+	ldc.i4 6038
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c1ce4: 0x10c1ce4: jal   0x10c0780 addiu s1, s1, 1
+// 0x010c2324: 0x10c2324: jal   0x10c0dc0 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010c1cec: 0x10c1cec: addu  a0, s2, zero
+// 0x010c232c: 0x10c232c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010c1cf0: 0x10c1cf0: jal   0x10c09ac addu  s0, v0, zero
+// 0x010c2330: 0x10c2330: jal   0x10c0fec addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -1684,135 +1684,135 @@ L_10c1cdc:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010c1cf8: 0x10c1cf8: addu  a1, v0, zero
+// 0x010c2338: 0x10c2338: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010c1cfc: 0x10c1cfc: jal   0x10c06d0 addu  a0, s0, zero
+// 0x010c233c: 0x10c233c: jal   0x10c0d10 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010c1d04: 0x10c1d04: addu  s0, v0, zero
+// 0x010c2344: 0x10c2344: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_10c1d08:
-// 0x010c1d08: 0x10c1d08: lb    v1, 0(s1)
+L_10c2348:
+// 0x010c2348: 0x10c2348: lb    v1, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010c1d0c: 0x10c1d0c: sll   zero, zero, 0
-// 0x010c1d10: 0x10c1d10: addiu s2, v1, -48
+// 0x010c234c: 0x10c234c: sll   zero, zero, 0
+// 0x010c2350: 0x10c2350: addiu s2, v1, -48
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc 10
-// 0x010c1d14: 0x10c1d14: sltiu v0, s2, 10
+// 0x010c2354: 0x10c2354: sltiu v0, s2, 10
 	ldloc 10
 	ldc.i4.s 10
 	clt.un
 	stloc 5
-// 0x010c1d18: 0x10c1d18: bne   v0, zero, 0x10c1cdc addu  a0, s0, zero
+// 0x010c2358: 0x10c2358: bne   v0, zero, 0x10c231c addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_10c1cdc
+	brtrue L_10c231c
 // --- basic block ---
-// 0x010c1d20: 0x10c1d20: addiu v0, zero, 46
+// 0x010c2360: 0x10c2360: addiu v0, zero, 46
 	ldc.i4.s 46
 	stloc 5
-// 0x010c1d24: 0x10c1d24: bne   v1, v0, 0x10c1da8 lui   v0, 0x20000
+// 0x010c2364: 0x10c2364: bne   v1, v0, 0x10c23e8 lui   v0, 0x20000
 	ldloc 6
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	bne.un L_10c1da8
+	bne.un L_10c23e8
 // --- basic block ---
-// 0x010c1d2c: 0x10c1d2c: lw    s2, 23660(v0)
+// 0x010c236c: 0x10c236c: lw    s2, 24120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5915
+	ldc.i4 6030
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c1d30: 0x10c1d30: j	 0x10c1d8c addiu s1, s1, 1
+// 0x010c2370: 0x10c2370: j	 0x10c23cc addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c1d8c
+	br L_10c23cc
 // --- basic block ---
-L_10c1d38:
-// 0x010c1d38: 0x10c1d38: jal   0x10c09ac sll   zero, zero, 0
+L_10c2378:
+// 0x010c2378: 0x10c2378: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010c1d40: 0x10c1d40: addu  a0, v0, zero
+// 0x010c2380: 0x10c2380: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010c1d44: 0x10c1d44: jal   0x10c0780 addu  a1, s2, zero
+// 0x010c2384: 0x10c2384: jal   0x10c0dc0 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010c1d4c: 0x10c1d4c: addu  a1, v0, zero
+// 0x010c238c: 0x10c238c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010c1d50: 0x10c1d50: jal   0x10c06d0 addu  a0, s0, zero
+// 0x010c2390: 0x10c2390: jal   0x10c0d10 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010c1d58: 0x10c1d58: addu  a0, s2, zero
+// 0x010c2398: 0x10c2398: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010c1d5c: 0x10c1d5c: jal   0x10c0874 addu  s0, v0, zero
+// 0x010c239c: 0x10c239c: jal   0x10c0eb4 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1d64: 0x10c1d64: lui   a0, 0x20000
+// 0x010c23a4: 0x10c23a4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c1d68: 0x10c1d68: lw    a3, 23740(a0)
+// 0x010c23a8: 0x10c23a8: lw    a3, 24204(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5935
+	ldc.i4 6051
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1d6c: 0x10c1d6c: lw    a2, 23736(a0)
+// 0x010c23ac: 0x10c23ac: lw    a2, 24200(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5934
+	ldc.i4 6050
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1d70: 0x10c1d70: addu  a1, v1, zero
+// 0x010c23b0: 0x10c23b0: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010c1d74: 0x10c1d74: jal   0x10c0798 addu  a0, v0, zero
+// 0x010c23b4: 0x10c23b4: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1820,115 +1820,115 @@ L_10c1d38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1d7c: 0x10c1d7c: addu  a1, v1, zero
+// 0x010c23bc: 0x10c23bc: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010c1d80: 0x10c1d80: jal   0x10c0898 addu  a0, v0, zero
+// 0x010c23c0: 0x10c23c0: jal   0x10c0ed8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__truncdfsf2_10c0898(int32,int32,int32)
+	call int32 Cibyl143::__truncdfsf2_10c0ed8(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c1d88: 0x10c1d88: addu  s2, v0, zero
+// 0x010c23c8: 0x10c23c8: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-L_10c1d8c:
-// 0x010c1d8c: 0x10c1d8c: lb    v0, 0(s1)
+L_10c23cc:
+// 0x010c23cc: 0x10c23cc: lb    v0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010c1d90: 0x10c1d90: sll   zero, zero, 0
-// 0x010c1d94: 0x10c1d94: addiu v0, v0, -48
+// 0x010c23d0: 0x10c23d0: sll   zero, zero, 0
+// 0x010c23d4: 0x10c23d4: addiu v0, v0, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 5
-// 0x010c1d98: 0x10c1d98: addu  a0, v0, zero
+// 0x010c23d8: 0x10c23d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010c1d9c: 0x10c1d9c: sltiu v0, v0, 10
+// 0x010c23dc: 0x10c23dc: sltiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt.un
 	stloc 5
-// 0x010c1da0: 0x10c1da0: bne   v0, zero, 0x10c1d38 addiu s1, s1, 1
+// 0x010c23e0: 0x10c23e0: bne   v0, zero, 0x10c2378 addiu s1, s1, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_10c1d38
+	brtrue L_10c2378
 // --- basic block ---
-L_10c1da8:
-// 0x010c1da8: 0x10c1da8: beq   s3, zero, 0x10c1dec lui   v0, 0x80000000
+L_10c23e8:
+// 0x010c23e8: 0x10c23e8: beq   s3, zero, 0x10c242c lui   v0, 0x80000000
 	ldloc 11
 	ldc.i4 2147483648
 	stloc 5
-	brfalse L_10c1dec
+	brfalse L_10c242c
 // --- basic block ---
-// 0x010c1db0: 0x10c1db0: xor   v0, s0, v0
+// 0x010c23f0: 0x10c23f0: xor   v0, s0, v0
 	ldloc 9
 	ldloc 5
 	xor
 	stloc 5
-// 0x010c1db4: 0x10c1db4: j	 0x10c1dec addu  s0, v0, zero
+// 0x010c23f4: 0x10c23f4: j	 0x10c242c addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-	br L_10c1dec
+	br L_10c242c
 // --- basic block ---
-L_10c1dbc:
-// 0x010c1dbc: 0x10c1dbc: addiu v0, zero, 43
+L_10c23fc:
+// 0x010c23fc: 0x10c23fc: addiu v0, zero, 43
 	ldc.i4.s 43
 	stloc 5
-// 0x010c1dc0: 0x10c1dc0: beq   v1, v0, 0x10c1dd8 addiu v0, zero, 45
+// 0x010c2400: 0x10c2400: beq   v1, v0, 0x10c2418 addiu v0, zero, 45
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 45
 	stloc 5
-	beq  L_10c1dd8
+	beq  L_10c2418
 // --- basic block ---
-// 0x010c1dc8: 0x10c1dc8: bne   v1, v0, 0x10c1de0 sll   zero, zero, 0
+// 0x010c2408: 0x10c2408: bne   v1, v0, 0x10c2420 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_10c1de0
+	bne.un L_10c2420
 // --- basic block ---
-// 0x010c1dd0: 0x10c1dd0: j	 0x10c1cd4 addiu s3, zero, 1
+// 0x010c2410: 0x10c2410: j	 0x10c2314 addiu s3, zero, 1
 	ldc.i4.1
 	stloc 11
-	br L_10c1cd4
+	br L_10c2314
 // --- basic block ---
-L_10c1dd8:
-// 0x010c1dd8: 0x10c1dd8: j	 0x10c1cd4 addu  s3, zero, zero
+L_10c2418:
+// 0x010c2418: 0x10c2418: j	 0x10c2314 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_10c1cd4
+	br L_10c2314
 // --- basic block ---
-L_10c1de0:
-// 0x010c1de0: 0x10c1de0: addu  s3, zero, zero
+L_10c2420:
+// 0x010c2420: 0x10c2420: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-L_10c1de4:
-// 0x010c1de4: 0x10c1de4: j	 0x10c1d08 addu  s0, zero, zero
+L_10c2424:
+// 0x010c2424: 0x10c2424: j	 0x10c2348 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10c1d08
+	br L_10c2348
 // --- basic block ---
-L_10c1dec:
-// 0x010c1dec: 0x10c1dec: addu  v0, s0, zero
+L_10c242c:
+// 0x010c242c: 0x10c242c: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x010c1df0: 0x10c1df0: lw    ra, 32(sp)
-// 0x010c1df4: 0x10c1df4: lw    s3, 28(sp)
+// 0x010c2430: 0x10c2430: lw    ra, 32(sp)
+// 0x010c2434: 0x10c2434: lw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1937,7 +1937,7 @@ L_10c1dec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c1df8: 0x10c1df8: lw    s2, 24(sp)
+// 0x010c2438: 0x10c2438: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1946,7 +1946,7 @@ L_10c1dec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c1dfc: 0x10c1dfc: lw    s1, 20(sp)
+// 0x010c243c: 0x10c243c: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1955,7 +1955,7 @@ L_10c1dec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c1e00: 0x10c1e00: lw    s0, 16(sp)
+// 0x010c2440: 0x10c2440: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1964,7 +1964,7 @@ L_10c1dec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c1e04: 0x10c1e04: jr    ra addiu sp, sp, 40
+// 0x010c2444: 0x10c2444: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1976,7 +1976,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 sin_10c1e10(int32,int32,int32)
+.method public static int32 sin_10c2450(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2005,17 +2005,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1e10: 0x10c1e10: addiu sp, sp, -16
+// 0x010c2450: 0x10c2450: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1e14: 0x10c1e14: addiu v0, sp, 8
+// 0x010c2454: 0x10c2454: addiu v0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.3
-// 0x010c1e18: 0x10c1e18: sw    a1, 4(sp)
+// 0x010c2458: 0x10c2458: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2024,26 +2024,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1e1c: 0x10c1e1c: sw    a0, 0(sp)
+// 0x010c245c: 0x10c245c: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c1e20: 0x10c1e20: addu  v1, v0, zero
+// 0x010c2460: 0x10c2460: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1e24: 0x10c1e24: cibyl_sysc_arg 0x3
+// 0x010c2464: 0x10c2464: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x010c1e28: 0x10c1e28: cibyl_sysc_arg 0x1d
+// 0x010c2468: 0x10c2468: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c1e2c: 0x10c1e2c: cibyl_sysc 0x2586
+// 0x010c246c: 0x10c246c: cibyl_sysc 0x2586
 	call void [WazeWP7]Syscalls::__sin_helper(int32,int32)
-// 0x010c1e30: 0x10c1e30: addu  v1, v0, zero
+// 0x010c2470: 0x10c2470: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1e34: 0x10c1e34: lw    v0, 8(sp)
+// 0x010c2474: 0x10c2474: lw    v0, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2052,7 +2052,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1e38: 0x10c1e38: lw    v1, 12(sp)
+// 0x010c2478: 0x10c2478: lw    v1, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2061,7 +2061,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1e3c: 0x10c1e3c: jr    ra addiu sp, sp, 16
+// 0x010c247c: 0x10c247c: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2073,7 +2073,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 cos_10c1e44(int32,int32,int32)
+.method public static int32 cos_10c2484(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2102,17 +2102,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1e44: 0x10c1e44: addiu sp, sp, -16
+// 0x010c2484: 0x10c2484: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1e48: 0x10c1e48: addiu v0, sp, 8
+// 0x010c2488: 0x10c2488: addiu v0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.3
-// 0x010c1e4c: 0x10c1e4c: sw    a1, 4(sp)
+// 0x010c248c: 0x10c248c: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2121,26 +2121,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1e50: 0x10c1e50: sw    a0, 0(sp)
+// 0x010c2490: 0x10c2490: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c1e54: 0x10c1e54: addu  v1, v0, zero
+// 0x010c2494: 0x10c2494: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1e58: 0x10c1e58: cibyl_sysc_arg 0x3
+// 0x010c2498: 0x10c2498: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x010c1e5c: 0x10c1e5c: cibyl_sysc_arg 0x1d
+// 0x010c249c: 0x10c249c: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c1e60: 0x10c1e60: cibyl_sysc 0x2593
+// 0x010c24a0: 0x10c24a0: cibyl_sysc 0x2593
 	call void [WazeWP7]Syscalls::__cos_helper(int32,int32)
-// 0x010c1e64: 0x10c1e64: addu  v1, v0, zero
+// 0x010c24a4: 0x10c24a4: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1e68: 0x10c1e68: lw    v0, 8(sp)
+// 0x010c24a8: 0x10c24a8: lw    v0, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2149,7 +2149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1e6c: 0x10c1e6c: lw    v1, 12(sp)
+// 0x010c24ac: 0x10c24ac: lw    v1, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2158,7 +2158,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1e70: 0x10c1e70: jr    ra addiu sp, sp, 16
+// 0x010c24b0: 0x10c24b0: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2170,7 +2170,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 atan_10c1e78(int32,int32,int32)
+.method public static int32 atan_10c24b8(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2199,17 +2199,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1e78: 0x10c1e78: addiu sp, sp, -16
+// 0x010c24b8: 0x10c24b8: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1e7c: 0x10c1e7c: addiu v0, sp, 8
+// 0x010c24bc: 0x10c24bc: addiu v0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.3
-// 0x010c1e80: 0x10c1e80: sw    a1, 4(sp)
+// 0x010c24c0: 0x10c24c0: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2218,26 +2218,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1e84: 0x10c1e84: sw    a0, 0(sp)
+// 0x010c24c4: 0x10c24c4: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c1e88: 0x10c1e88: addu  v1, v0, zero
+// 0x010c24c8: 0x10c24c8: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1e8c: 0x10c1e8c: cibyl_sysc_arg 0x3
+// 0x010c24cc: 0x10c24cc: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x010c1e90: 0x10c1e90: cibyl_sysc_arg 0x1d
+// 0x010c24d0: 0x10c24d0: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c1e94: 0x10c1e94: cibyl_sysc 0x25a0
+// 0x010c24d4: 0x10c24d4: cibyl_sysc 0x25a0
 	call void [WazeWP7]Syscalls::__atan_helper(int32,int32)
-// 0x010c1e98: 0x10c1e98: addu  v1, v0, zero
+// 0x010c24d8: 0x10c24d8: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1e9c: 0x10c1e9c: lw    v0, 8(sp)
+// 0x010c24dc: 0x10c24dc: lw    v0, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2246,7 +2246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1ea0: 0x10c1ea0: lw    v1, 12(sp)
+// 0x010c24e0: 0x10c24e0: lw    v1, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2255,7 +2255,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1ea4: 0x10c1ea4: jr    ra addiu sp, sp, 16
+// 0x010c24e4: 0x10c24e4: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2267,7 +2267,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 asin_10c1eac(int32,int32,int32)
+.method public static int32 asin_10c24ec(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2296,17 +2296,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1eac: 0x10c1eac: addiu sp, sp, -16
+// 0x010c24ec: 0x10c24ec: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1eb0: 0x10c1eb0: addiu v0, sp, 8
+// 0x010c24f0: 0x10c24f0: addiu v0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.3
-// 0x010c1eb4: 0x10c1eb4: sw    a1, 4(sp)
+// 0x010c24f4: 0x10c24f4: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2315,26 +2315,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1eb8: 0x10c1eb8: sw    a0, 0(sp)
+// 0x010c24f8: 0x10c24f8: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c1ebc: 0x10c1ebc: addu  v1, v0, zero
+// 0x010c24fc: 0x10c24fc: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1ec0: 0x10c1ec0: cibyl_sysc_arg 0x3
+// 0x010c2500: 0x10c2500: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x010c1ec4: 0x10c1ec4: cibyl_sysc_arg 0x1d
+// 0x010c2504: 0x10c2504: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c1ec8: 0x10c1ec8: cibyl_sysc 0x25ae
+// 0x010c2508: 0x10c2508: cibyl_sysc 0x25ae
 	call void [WazeWP7]Syscalls::__asin_helper(int32,int32)
-// 0x010c1ecc: 0x10c1ecc: addu  v1, v0, zero
+// 0x010c250c: 0x10c250c: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1ed0: 0x10c1ed0: lw    v0, 8(sp)
+// 0x010c2510: 0x10c2510: lw    v0, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2343,7 +2343,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1ed4: 0x10c1ed4: lw    v1, 12(sp)
+// 0x010c2514: 0x10c2514: lw    v1, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2352,7 +2352,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1ed8: 0x10c1ed8: jr    ra addiu sp, sp, 16
+// 0x010c2518: 0x10c2518: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2364,7 +2364,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 acos_10c1ee0(int32,int32,int32)
+.method public static int32 acos_10c2520(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2393,17 +2393,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1ee0: 0x10c1ee0: addiu sp, sp, -16
+// 0x010c2520: 0x10c2520: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1ee4: 0x10c1ee4: addiu v0, sp, 8
+// 0x010c2524: 0x10c2524: addiu v0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.3
-// 0x010c1ee8: 0x10c1ee8: sw    a1, 4(sp)
+// 0x010c2528: 0x10c2528: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2412,26 +2412,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1eec: 0x10c1eec: sw    a0, 0(sp)
+// 0x010c252c: 0x10c252c: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c1ef0: 0x10c1ef0: addu  v1, v0, zero
+// 0x010c2530: 0x10c2530: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1ef4: 0x10c1ef4: cibyl_sysc_arg 0x3
+// 0x010c2534: 0x10c2534: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x010c1ef8: 0x10c1ef8: cibyl_sysc_arg 0x1d
+// 0x010c2538: 0x10c2538: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c1efc: 0x10c1efc: cibyl_sysc 0x25bc
+// 0x010c253c: 0x10c253c: cibyl_sysc 0x25bc
 	call void [WazeWP7]Syscalls::__acos_helper(int32,int32)
-// 0x010c1f00: 0x10c1f00: addu  v1, v0, zero
+// 0x010c2540: 0x10c2540: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1f04: 0x10c1f04: lw    v0, 8(sp)
+// 0x010c2544: 0x10c2544: lw    v0, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2440,7 +2440,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1f08: 0x10c1f08: lw    v1, 12(sp)
+// 0x010c2548: 0x10c2548: lw    v1, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2449,7 +2449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1f0c: 0x10c1f0c: jr    ra addiu sp, sp, 16
+// 0x010c254c: 0x10c254c: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2461,7 +2461,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 floor_10c1fb0(int32,int32,int32)
+.method public static int32 floor_10c25f0(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2490,17 +2490,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1fb0: 0x10c1fb0: addiu sp, sp, -16
+// 0x010c25f0: 0x10c25f0: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1fb4: 0x10c1fb4: addiu v0, sp, 8
+// 0x010c25f4: 0x10c25f4: addiu v0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.3
-// 0x010c1fb8: 0x10c1fb8: sw    a1, 4(sp)
+// 0x010c25f8: 0x10c25f8: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2509,26 +2509,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1fbc: 0x10c1fbc: sw    a0, 0(sp)
+// 0x010c25fc: 0x10c25fc: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c1fc0: 0x10c1fc0: addu  v1, v0, zero
+// 0x010c2600: 0x10c2600: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1fc4: 0x10c1fc4: cibyl_sysc_arg 0x3
+// 0x010c2604: 0x10c2604: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x010c1fc8: 0x10c1fc8: cibyl_sysc_arg 0x1d
+// 0x010c2608: 0x10c2608: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c1fcc: 0x10c1fcc: cibyl_sysc 0x25f3
+// 0x010c260c: 0x10c260c: cibyl_sysc 0x25f3
 	call void [WazeWP7]Syscalls::__floor_helper(int32,int32)
-// 0x010c1fd0: 0x10c1fd0: addu  v1, v0, zero
+// 0x010c2610: 0x10c2610: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1fd4: 0x10c1fd4: lw    v0, 8(sp)
+// 0x010c2614: 0x10c2614: lw    v0, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2537,7 +2537,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c1fd8: 0x10c1fd8: lw    v1, 12(sp)
+// 0x010c2618: 0x10c2618: lw    v1, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2546,7 +2546,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c1fdc: 0x10c1fdc: jr    ra addiu sp, sp, 16
+// 0x010c261c: 0x10c261c: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2558,7 +2558,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 sqrt_10c1fe4(int32,int32,int32)
+.method public static int32 sqrt_10c2624(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2587,17 +2587,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c1fe4: 0x10c1fe4: addiu sp, sp, -16
+// 0x010c2624: 0x10c2624: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x010c1fe8: 0x10c1fe8: addiu v0, sp, 8
+// 0x010c2628: 0x10c2628: addiu v0, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
 	stloc.3
-// 0x010c1fec: 0x10c1fec: sw    a1, 4(sp)
+// 0x010c262c: 0x10c262c: sw    a1, 4(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2606,26 +2606,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c1ff0: 0x10c1ff0: sw    a0, 0(sp)
+// 0x010c2630: 0x10c2630: sw    a0, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c1ff4: 0x10c1ff4: addu  v1, v0, zero
+// 0x010c2634: 0x10c2634: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c1ff8: 0x10c1ff8: cibyl_sysc_arg 0x3
+// 0x010c2638: 0x10c2638: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x010c1ffc: 0x10c1ffc: cibyl_sysc_arg 0x1d
+// 0x010c263c: 0x10c263c: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x010c2000: 0x10c2000: cibyl_sysc 0x2602
+// 0x010c2640: 0x10c2640: cibyl_sysc 0x2602
 	call void [WazeWP7]Syscalls::__sqrt_helper(int32,int32)
-// 0x010c2004: 0x10c2004: addu  v1, v0, zero
+// 0x010c2644: 0x10c2644: addu  v1, v0, zero
 	ldloc.3
 	stloc 4
-// 0x010c2008: 0x10c2008: lw    v0, 8(sp)
+// 0x010c2648: 0x10c2648: lw    v0, 8(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2634,7 +2634,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c200c: 0x10c200c: lw    v1, 12(sp)
+// 0x010c264c: 0x10c264c: lw    v1, 12(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2643,7 +2643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c2010: 0x10c2010: jr    ra addiu sp, sp, 16
+// 0x010c2650: 0x10c2650: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2655,7 +2655,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static void close_read_10c2198()
+.method public static void close_read_10c27d8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2666,12 +2666,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c2198: 0x10c2198: jr    ra sll   zero, zero, 0
+// 0x010c27d8: 0x10c27d8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 rs_close_10c21a0(int32,int32,int32,int32,int32)
+.method public static int32 rs_close_10c27e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2712,13 +2712,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c21a0:
-// 0x010c21a0: 0x10c21a0: addiu sp, sp, -32
+L_10c27e0:
+// 0x010c27e0: 0x10c27e0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c21a4: 0x10c21a4: sw    s0, 20(sp)
+// 0x010c27e4: 0x10c27e4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2727,7 +2727,7 @@ L_10c21a0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c21a8: 0x10c21a8: lw    s0, 20(a0)
+// 0x010c27e8: 0x10c27e8: lw    s0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2736,7 +2736,7 @@ L_10c21a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c21ac: 0x10c21ac: sw    s1, 24(sp)
+// 0x010c27ec: 0x10c27ec: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2745,7 +2745,7 @@ L_10c21a0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c21b0: 0x10c21b0: lw    v0, 28(s0)
+// 0x010c27f0: 0x10c27f0: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2754,8 +2754,8 @@ L_10c21a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c21b4: 0x10c21b4: sw    ra, 28(sp)
-// 0x010c21b8: 0x10c21b8: jalr  v0 addu  s1, a0, zero
+// 0x010c27f4: 0x10c27f4: sw    ra, 28(sp)
+// 0x010c27f8: 0x10c27f8: jalr  v0 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
@@ -2769,7 +2769,7 @@ L_10c21a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c21c0: 0x10c21c0: lw    v1, 20(s0)
+// 0x010c2800: 0x10c2800: lw    v1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2778,15 +2778,15 @@ L_10c21a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c21c4: 0x10c21c4: sll   zero, zero, 0
-// 0x010c21c8: 0x10c21c8: cibyl_sysc_arg 0x3
+// 0x010c2804: 0x10c2804: sll   zero, zero, 0
+// 0x010c2808: 0x10c2808: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c21cc: 0x10c21cc: cibyl_sysc 0x26de
+// 0x010c280c: 0x10c280c: cibyl_sysc 0x26de
 	call void [WazeWP7]Syscalls::NOPH_RecordStore_closeRecordStore(int32)
-// 0x010c21d0: 0x10c21d0: addu  v1, v0, zero
+// 0x010c2810: 0x10c2810: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c21d4: 0x10c21d4: lw    v1, 20(s0)
+// 0x010c2814: 0x10c2814: lw    v1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2795,18 +2795,18 @@ L_10c21a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c21d8: 0x10c21d8: sll   zero, zero, 0
-// 0x010c21dc: 0x10c21dc: cibyl_sysc_arg 0x3
+// 0x010c2818: 0x10c2818: sll   zero, zero, 0
+// 0x010c281c: 0x10c281c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c21e0: 0x10c21e0: cibyl_sysc 0x2700
+// 0x010c2820: 0x10c2820: cibyl_sysc 0x2700
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c21e4: 0x10c21e4: addu  v1, v0, zero
+// 0x010c2824: 0x10c2824: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c21e8: 0x10c21e8: lui   v0, 0x0
+// 0x010c2828: 0x10c2828: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010c21ec: 0x10c21ec: lw    v0, 19936(v0)
+// 0x010c282c: 0x10c282c: lw    v0, 19936(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2815,8 +2815,8 @@ L_10c21a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c21f0: 0x10c21f0: sll   zero, zero, 0
-// 0x010c21f4: 0x10c21f4: jalr  v0 addu  a0, s1, zero
+// 0x010c2830: 0x10c2830: sll   zero, zero, 0
+// 0x010c2834: 0x10c2834: jalr  v0 addu  a0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -2830,11 +2830,11 @@ L_10c21a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c21fc: 0x10c21fc: lw    ra, 28(sp)
-// 0x010c2200: 0x10c2200: addu  v0, zero, zero
+// 0x010c283c: 0x10c283c: lw    ra, 28(sp)
+// 0x010c2840: 0x10c2840: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x010c2204: 0x10c2204: lw    s1, 24(sp)
+// 0x010c2844: 0x10c2844: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2843,7 +2843,7 @@ L_10c21a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c2208: 0x10c2208: lw    s0, 20(sp)
+// 0x010c2848: 0x10c2848: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2852,7 +2852,7 @@ L_10c21a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c220c: 0x10c220c: jr    ra addiu sp, sp, 32
+// 0x010c284c: 0x10c284c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2864,7 +2864,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 resource_register_fs_10c2214(int32,int32,int32,int32,int32)
+.method public static int32 resource_register_fs_10c2854(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra,int32 t0,int32 t1,int32 t2)
@@ -2908,24 +2908,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2214:
-// 0x010c2214: 0x10c2214: lui   a0, 0x0
+L_10c2854:
+// 0x010c2854: 0x10c2854: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c2218: 0x10c2218: addiu a0, a0, 19880
+// 0x010c2858: 0x10c2858: addiu a0, a0, 19880
 	ldloc.1
 	ldc.i4 19880
 	add
 	stloc.1
-// 0x010c221c: 0x10c221c: lui   v0, 0x0
+// 0x010c285c: 0x10c285c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c2220: 0x10c2220: addiu v0, v0, 19648
+// 0x010c2860: 0x10c2860: addiu v0, v0, 19648
 	ldloc 6
 	ldc.i4 19648
 	add
 	stloc 6
-// 0x010c2224: 0x10c2224: lw    v1, 32(a0)
+// 0x010c2864: 0x10c2864: lw    v1, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2934,7 +2934,7 @@ L_10c2214:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2228: 0x10c2228: lw    t2, 16(a0)
+// 0x010c2868: 0x10c2868: lw    t2, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2943,7 +2943,7 @@ L_10c2214:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c222c: 0x10c222c: lw    t1, 20(a0)
+// 0x010c286c: 0x10c286c: lw    t1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2952,7 +2952,7 @@ L_10c2214:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c2230: 0x10c2230: lw    t0, 24(a0)
+// 0x010c2870: 0x10c2870: lw    t0, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2961,7 +2961,7 @@ L_10c2214:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c2234: 0x10c2234: lw    a3, 28(a0)
+// 0x010c2874: 0x10c2874: lw    a3, 28(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2970,27 +2970,27 @@ L_10c2214:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c2238: 0x10c2238: lui   a0, 0x10000
+// 0x010c2878: 0x10c2878: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010c223c: 0x10c223c: addiu sp, sp, -24
+// 0x010c287c: 0x10c287c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c2240: 0x10c2240: addiu a0, a0, 3392
+// 0x010c2880: 0x10c2880: addiu a0, a0, 3388
 	ldloc.1
-	ldc.i4 3392
+	ldc.i4 3388
 	add
 	stloc.1
-// 0x010c2244: 0x10c2244: addu  a1, v0, zero
+// 0x010c2884: 0x10c2884: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2248: 0x10c2248: addu  a2, zero, zero
+// 0x010c2888: 0x10c2888: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010c224c: 0x10c224c: sw    ra, 20(sp)
-// 0x010c2250: 0x10c2250: sw    t2, 16(v0)
+// 0x010c288c: 0x10c288c: sw    ra, 20(sp)
+// 0x010c2890: 0x10c2890: sw    t2, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2999,7 +2999,7 @@ L_10c2214:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c2254: 0x10c2254: sw    t1, 20(v0)
+// 0x010c2894: 0x10c2894: sw    t1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3008,7 +3008,7 @@ L_10c2214:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c2258: 0x10c2258: sw    t0, 24(v0)
+// 0x010c2898: 0x10c2898: sw    t0, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3017,7 +3017,7 @@ L_10c2214:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c225c: 0x10c225c: sw    a3, 28(v0)
+// 0x010c289c: 0x10c289c: sw    a3, 28(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3026,7 +3026,7 @@ L_10c2214:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c2260: 0x10c2260: jal   0x10027d4 sw    v1, 32(v0)
+// 0x010c28a0: 0x10c28a0: jal   0x10027d4 sw    v1, 32(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3045,9 +3045,9 @@ L_10c2214:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c2268: 0x10c2268: lw    ra, 20(sp)
-// 0x010c226c: 0x10c226c: sll   zero, zero, 0
-// 0x010c2270: 0x10c2270: jr    ra addiu sp, sp, 24
+// 0x010c28a8: 0x10c28a8: lw    ra, 20(sp)
+// 0x010c28ac: 0x10c28ac: sll   zero, zero, 0
+// 0x010c28b0: 0x10c28b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3059,7 +3059,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 recordstore_register_fs_10c2278(int32,int32,int32,int32,int32)
+.method public static int32 recordstore_register_fs_10c28b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra,int32 t0,int32 t1)
@@ -3100,24 +3100,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2278:
-// 0x010c2278: 0x10c2278: lui   a0, 0x0
+L_10c28b8:
+// 0x010c28b8: 0x10c28b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c227c: 0x10c227c: addiu a0, a0, 19920
+// 0x010c28bc: 0x10c28bc: addiu a0, a0, 19920
 	ldloc.1
 	ldc.i4 19920
 	add
 	stloc.1
-// 0x010c2280: 0x10c2280: lui   v0, 0x0
+// 0x010c28c0: 0x10c28c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c2284: 0x10c2284: addiu v0, v0, 19688
+// 0x010c28c4: 0x10c28c4: addiu v0, v0, 19688
 	ldloc 6
 	ldc.i4 19688
 	add
 	stloc 6
-// 0x010c2288: 0x10c2288: lw    v1, 32(a0)
+// 0x010c28c8: 0x10c28c8: lw    v1, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3126,7 +3126,7 @@ L_10c2278:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c228c: 0x10c228c: lw    t1, 20(a0)
+// 0x010c28cc: 0x10c28cc: lw    t1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3135,7 +3135,7 @@ L_10c2278:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c2290: 0x10c2290: lw    t0, 24(a0)
+// 0x010c28d0: 0x10c28d0: lw    t0, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3144,7 +3144,7 @@ L_10c2278:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c2294: 0x10c2294: lw    a3, 28(a0)
+// 0x010c28d4: 0x10c28d4: lw    a3, 28(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3153,27 +3153,27 @@ L_10c2278:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c2298: 0x10c2298: lui   a0, 0x20000
+// 0x010c28d8: 0x10c28d8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c229c: 0x10c229c: addiu sp, sp, -24
+// 0x010c28dc: 0x10c28dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c22a0: 0x10c22a0: addiu a0, a0, 23388
+// 0x010c28e0: 0x10c28e0: addiu a0, a0, 23848
 	ldloc.1
-	ldc.i4 23388
+	ldc.i4 23848
 	add
 	stloc.1
-// 0x010c22a4: 0x10c22a4: addu  a1, v0, zero
+// 0x010c28e4: 0x10c28e4: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010c22a8: 0x10c22a8: addu  a2, zero, zero
+// 0x010c28e8: 0x10c28e8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010c22ac: 0x10c22ac: sw    ra, 20(sp)
-// 0x010c22b0: 0x10c22b0: sw    t1, 20(v0)
+// 0x010c28ec: 0x10c28ec: sw    ra, 20(sp)
+// 0x010c28f0: 0x10c28f0: sw    t1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3182,7 +3182,7 @@ L_10c2278:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c22b4: 0x10c22b4: sw    t0, 24(v0)
+// 0x010c28f4: 0x10c28f4: sw    t0, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3191,7 +3191,7 @@ L_10c2278:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c22b8: 0x10c22b8: sw    a3, 28(v0)
+// 0x010c28f8: 0x10c28f8: sw    a3, 28(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3200,7 +3200,7 @@ L_10c2278:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c22bc: 0x10c22bc: jal   0x10027d4 sw    v1, 32(v0)
+// 0x010c28fc: 0x10c28fc: jal   0x10027d4 sw    v1, 32(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3219,9 +3219,9 @@ L_10c2278:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c22c4: 0x10c22c4: lw    ra, 20(sp)
-// 0x010c22c8: 0x10c22c8: sll   zero, zero, 0
-// 0x010c22cc: 0x10c22cc: jr    ra addiu sp, sp, 24
+// 0x010c2904: 0x10c2904: lw    ra, 20(sp)
+// 0x010c2908: 0x10c2908: sll   zero, zero, 0
+// 0x010c290c: 0x10c290c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3233,7 +3233,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 connector_register_fs_10c22d4(int32,int32,int32,int32,int32)
+.method public static int32 connector_register_fs_10c2914(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 s0,int32[] mem,int32 v0,int32 ra)
@@ -3271,16 +3271,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c22d4:
-// 0x010c22d4: 0x10c22d4: addiu sp, sp, -24
+L_10c2914:
+// 0x010c2914: 0x10c2914: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c22d8: 0x10c22d8: lui   v1, 0x0
+// 0x010c2918: 0x10c2918: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010c22dc: 0x10c22dc: sw    s0, 16(sp)
+// 0x010c291c: 0x10c291c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3289,20 +3289,20 @@ L_10c22d4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c22e0: 0x10c22e0: addiu v1, v1, 19880
+// 0x010c2920: 0x10c2920: addiu v1, v1, 19880
 	ldloc 5
 	ldc.i4 19880
 	add
 	stloc 5
-// 0x010c22e4: 0x10c22e4: lui   s0, 0x0
+// 0x010c2924: 0x10c2924: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c22e8: 0x10c22e8: addiu s0, s0, 19728
+// 0x010c2928: 0x10c2928: addiu s0, s0, 19728
 	ldloc 6
 	ldc.i4 19728
 	add
 	stloc 6
-// 0x010c22ec: 0x10c22ec: lw    v0, 28(v1)
+// 0x010c292c: 0x10c292c: lw    v0, 28(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3311,7 +3311,7 @@ L_10c22d4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c22f0: 0x10c22f0: lw    a3, 20(v1)
+// 0x010c2930: 0x10c2930: lw    a3, 20(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3320,10 +3320,10 @@ L_10c22d4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c22f4: 0x10c22f4: lui   a0, 0x10000
+// 0x010c2934: 0x10c2934: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010c22f8: 0x10c22f8: lw    v1, 24(v1)
+// 0x010c2938: 0x10c2938: lw    v1, 24(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3332,19 +3332,19 @@ L_10c22d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c22fc: 0x10c22fc: addu  a1, s0, zero
+// 0x010c293c: 0x10c293c: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2300: 0x10c2300: addiu a0, a0, 3624
+// 0x010c2940: 0x10c2940: addiu a0, a0, 3620
 	ldloc.1
-	ldc.i4 3624
+	ldc.i4 3620
 	add
 	stloc.1
-// 0x010c2304: 0x10c2304: addiu a2, zero, 1
+// 0x010c2944: 0x10c2944: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010c2308: 0x10c2308: sw    ra, 20(sp)
-// 0x010c230c: 0x10c230c: sw    a3, 20(s0)
+// 0x010c2948: 0x10c2948: sw    ra, 20(sp)
+// 0x010c294c: 0x10c294c: sw    a3, 20(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3353,7 +3353,7 @@ L_10c22d4:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c2310: 0x10c2310: sw    v1, 24(s0)
+// 0x010c2950: 0x10c2950: sw    v1, 24(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3362,7 +3362,7 @@ L_10c22d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c2314: 0x10c2314: jal   0x10027d4 sw    v0, 28(s0)
+// 0x010c2954: 0x10c2954: jal   0x10027d4 sw    v0, 28(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3381,18 +3381,18 @@ L_10c22d4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010c231c: 0x10c231c: lui   a0, 0x10000
+// 0x010c295c: 0x10c295c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010c2320: 0x10c2320: addu  a1, s0, zero
+// 0x010c2960: 0x10c2960: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2324: 0x10c2324: addiu a0, a0, 17972
+// 0x010c2964: 0x10c2964: addiu a0, a0, 17968
 	ldloc.1
-	ldc.i4 17972
+	ldc.i4 17968
 	add
 	stloc.1
-// 0x010c2328: 0x10c2328: jal   0x10027d4 addu  a2, zero, zero
+// 0x010c2968: 0x10c2968: jal   0x10027d4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3405,18 +3405,18 @@ L_10c22d4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010c2330: 0x10c2330: lui   a0, 0x20000
+// 0x010c2970: 0x10c2970: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c2334: 0x10c2334: addu  a1, s0, zero
+// 0x010c2974: 0x10c2974: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2338: 0x10c2338: addiu a0, a0, 23404
+// 0x010c2978: 0x10c2978: addiu a0, a0, 23864
 	ldloc.1
-	ldc.i4 23404
+	ldc.i4 23864
 	add
 	stloc.1
-// 0x010c233c: 0x10c233c: jal   0x10027d4 addu  a2, zero, zero
+// 0x010c297c: 0x10c297c: jal   0x10027d4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3429,18 +3429,18 @@ L_10c22d4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010c2344: 0x10c2344: lui   a0, 0x20000
+// 0x010c2984: 0x10c2984: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c2348: 0x10c2348: addu  a1, s0, zero
+// 0x010c2988: 0x10c2988: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010c234c: 0x10c234c: addiu a0, a0, 23416
+// 0x010c298c: 0x10c298c: addiu a0, a0, 23876
 	ldloc.1
-	ldc.i4 23416
+	ldc.i4 23876
 	add
 	stloc.1
-// 0x010c2350: 0x10c2350: jal   0x10027d4 addu  a2, zero, zero
+// 0x010c2990: 0x10c2990: jal   0x10027d4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3453,18 +3453,18 @@ L_10c22d4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010c2358: 0x10c2358: lui   a0, 0x20000
+// 0x010c2998: 0x10c2998: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c235c: 0x10c235c: addu  a1, s0, zero
+// 0x010c299c: 0x10c299c: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2360: 0x10c2360: addiu a0, a0, 23428
+// 0x010c29a0: 0x10c29a0: addiu a0, a0, 23888
 	ldloc.1
-	ldc.i4 23428
+	ldc.i4 23888
 	add
 	stloc.1
-// 0x010c2364: 0x10c2364: jal   0x10027d4 addu  a2, zero, zero
+// 0x010c29a4: 0x10c29a4: jal   0x10027d4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3477,18 +3477,18 @@ L_10c22d4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010c236c: 0x10c236c: lui   a0, 0x20000
+// 0x010c29ac: 0x10c29ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c2370: 0x10c2370: addu  a1, s0, zero
+// 0x010c29b0: 0x10c29b0: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2374: 0x10c2374: addiu a0, a0, 23436
+// 0x010c29b4: 0x10c29b4: addiu a0, a0, 23896
 	ldloc.1
-	ldc.i4 23436
+	ldc.i4 23896
 	add
 	stloc.1
-// 0x010c2378: 0x10c2378: jal   0x10027d4 addu  a2, zero, zero
+// 0x010c29b8: 0x10c29b8: jal   0x10027d4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3501,18 +3501,18 @@ L_10c22d4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010c2380: 0x10c2380: lui   a0, 0x20000
+// 0x010c29c0: 0x10c29c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c2384: 0x10c2384: addu  a1, s0, zero
+// 0x010c29c4: 0x10c29c4: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2388: 0x10c2388: addiu a0, a0, 23448
+// 0x010c29c8: 0x10c29c8: addiu a0, a0, 23908
 	ldloc.1
-	ldc.i4 23448
+	ldc.i4 23908
 	add
 	stloc.1
-// 0x010c238c: 0x10c238c: jal   0x10027d4 addu  a2, zero, zero
+// 0x010c29cc: 0x10c29cc: jal   0x10027d4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3525,8 +3525,8 @@ L_10c22d4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010c2394: 0x10c2394: lw    ra, 20(sp)
-// 0x010c2398: 0x10c2398: lw    s0, 16(sp)
+// 0x010c29d4: 0x10c29d4: lw    ra, 20(sp)
+// 0x010c29d8: 0x10c29d8: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3535,7 +3535,7 @@ L_10c22d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c239c: 0x10c239c: jr    ra addiu sp, sp, 24
+// 0x010c29dc: 0x10c29dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3547,7 +3547,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 res_open_10c23a4(int32,int32,int32,int32,int32)
+.method public static int32 res_open_10c29e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 v1,int32 s0,int32 ra,int32 ecb,int32 ear)
@@ -3594,13 +3594,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c23a4:
-// 0x010c23a4: 0x10c23a4: addiu sp, sp, -40
+L_10c29e4:
+// 0x010c29e4: 0x10c29e4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010c23a8: 0x10c23a8: sw    s0, 28(sp)
+// 0x010c29e8: 0x10c29e8: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3609,8 +3609,8 @@ L_10c23a4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c23ac: 0x10c23ac: sw    ra, 36(sp)
-// 0x010c23b0: 0x10c23b0: sw    s1, 32(sp)
+// 0x010c29ec: 0x10c29ec: sw    ra, 36(sp)
+// 0x010c29f0: 0x10c29f0: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3619,7 +3619,7 @@ L_10c23a4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c23b4: 0x10c23b4: sw    zero, 16(sp)
+// 0x010c29f4: 0x10c29f4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3628,19 +3628,19 @@ L_10c23a4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c23b8: 0x10c23b8: addu  s0, a0, zero
+// 0x010c29f8: 0x10c29f8: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010c23bc: 0x10c23bc: lui   a0, 0x1000000
+// 0x010c29fc: 0x10c29fc: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c23c0: 0x10c23c0: addiu a0, a0, 264
+// 0x010c2a00: 0x10c2a00: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c23c4:
-// 0x010c23c4: 0x10c23c4: jal   0x1000120 addiu a1, sp, 16
+L_10c2a04:
+// 0x010c2a04: 0x10c2a04: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3650,50 +3650,50 @@ L_10c23c4:
 	ldloc.2
 	stloc 12
 // --- basic block ---
-// 0x010c23cc: 0x10c23cc: lw    v0, 0(zero)
+// 0x010c2a0c: 0x10c2a0c: lw    v0, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c23d0: 0x10c23d0: sll   zero, zero, 0
-// 0x010c23d4: 0x10c23d4: beq   v0, zero, 0x10c2400 addu  s1, zero, zero
+// 0x010c2a10: 0x10c2a10: sll   zero, zero, 0
+// 0x010c2a14: 0x10c2a14: beq   v0, zero, 0x10c2a40 addu  s1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10c2400
+	brfalse L_10c2a40
 // --- basic block ---
-// 0x010c23dc: 0x10c23dc: cibyl_sysc 0x270c
+// 0x010c2a1c: 0x10c2a1c: cibyl_sysc 0x270c
 	call int32 [WazeWP7]Syscalls::NOPH_Canvas_get()
 	stloc 5
-// 0x010c23e0: 0x10c23e0: addu  s1, v0, zero
+// 0x010c2a20: 0x10c2a20: addu  s1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c23e4: 0x10c23e4: cibyl_sysc_arg 0x11
+// 0x010c2a24: 0x10c2a24: cibyl_sysc_arg 0x11
 	ldloc 6
-// 0x010c23e8: 0x10c23e8: cibyl_sysc 0x271c
+// 0x010c2a28: 0x10c2a28: cibyl_sysc 0x271c
 	call int32 [WazeWP7]Syscalls::NOPH_Object_getClass(int32)
 	stloc 5
-// 0x010c23ec: 0x10c23ec: addu  s1, v0, zero
+// 0x010c2a2c: 0x10c2a2c: addu  s1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c23f0: 0x10c23f0: cibyl_sysc_arg 0x11
+// 0x010c2a30: 0x10c2a30: cibyl_sysc_arg 0x11
 	ldloc 6
-// 0x010c23f4: 0x10c23f4: cibyl_sysc_arg 0x10
+// 0x010c2a34: 0x10c2a34: cibyl_sysc_arg 0x10
 	ldloc 9
-// 0x010c23f8: 0x10c23f8: cibyl_sysc 0x2731
+// 0x010c2a38: 0x10c2a38: cibyl_sysc 0x2731
 	call int32 [WazeWP7]Syscalls::NOPH_Class_getResourceAsStream(int32,int32)
 	stloc 5
-// 0x010c23fc: 0x10c23fc: addu  s1, v0, zero
+// 0x010c2a3c: 0x10c2a3c: addu  s1, v0, zero
 	ldloc 5
 	stloc 6
-L_10c2400:
-// 0x010c2400: 0x10c2400: sll   zero, zero, 0
-// 0x010c2404: 0x10c2404: Unknown instruction 0x0
-L_10c2404:
-// 0x010c2408: 0x10c2408: sll   zero, zero, 0
-// 0x010c240c: 0x10c240c: lw    v0, 16(sp)
+L_10c2a40:
+// 0x010c2a40: 0x10c2a40: sll   zero, zero, 0
+// 0x010c2a44: 0x10c2a44: Unknown instruction 0x0
+L_10c2a44:
+// 0x010c2a48: 0x10c2a48: sll   zero, zero, 0
+// 0x010c2a4c: 0x10c2a4c: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3702,20 +3702,20 @@ L_10c2404:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2410: 0x10c2410: sll   zero, zero, 0
-// 0x010c2414: 0x10c2414: bne   v0, zero, 0x10c244c addu  v1, zero, zero
+// 0x010c2a50: 0x10c2a50: sll   zero, zero, 0
+// 0x010c2a54: 0x10c2a54: bne   v0, zero, 0x10c2a8c addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_10c244c
+	brtrue L_10c2a8c
 // --- basic block ---
-// 0x010c241c: 0x10c241c: beq   s1, zero, 0x10c244c lui   a0, 0x0
+// 0x010c2a5c: 0x10c2a5c: beq   s1, zero, 0x10c2a8c lui   a0, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10c244c
+	brfalse L_10c2a8c
 // --- basic block ---
-// 0x010c2424: 0x10c2424: jal   0x1002450 addiu a0, a0, 19648
+// 0x010c2a64: 0x10c2a64: jal   0x1002450 addiu a0, a0, 19648
 	ldloc.1
 	ldc.i4 19648
 	add
@@ -3730,10 +3730,10 @@ L_10c2404:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010c242c: 0x10c242c: addu  v1, v0, zero
+// 0x010c2a6c: 0x10c2a6c: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010c2430: 0x10c2430: lw    v0, 20(v0)
+// 0x010c2a70: 0x10c2a70: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3742,23 +3742,23 @@ L_10c2404:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2434: 0x10c2434: sll   zero, zero, 0
-// 0x010c2438: 0x10c2438: sw    s1, 0(v0)
+// 0x010c2a74: 0x10c2a74: sll   zero, zero, 0
+// 0x010c2a78: 0x10c2a78: sw    s1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010c243c: 0x10c243c: cibyl_sysc_arg 0x11
+// 0x010c2a7c: 0x10c2a7c: cibyl_sysc_arg 0x11
 	ldloc 6
-// 0x010c2440: 0x10c2440: cibyl_sysc 0x2750
+// 0x010c2a80: 0x10c2a80: cibyl_sysc 0x2750
 	call int32 [WazeWP7]Syscalls::NOPH_InputStream_available(int32)
 	stloc 5
-// 0x010c2444: 0x10c2444: addu  s1, v0, zero
+// 0x010c2a84: 0x10c2a84: addu  s1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c2448: 0x10c2448: sw    s1, 16(v1)
+// 0x010c2a88: 0x10c2a88: sw    s1, 16(v1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3767,12 +3767,12 @@ L_10c2404:
 	add
 	ldloc 6
 	stelem.i4
-L_10c244c:
-// 0x010c244c: 0x10c244c: lw    ra, 36(sp)
-// 0x010c2450: 0x10c2450: addu  v0, v1, zero
+L_10c2a8c:
+// 0x010c2a8c: 0x10c2a8c: lw    ra, 36(sp)
+// 0x010c2a90: 0x10c2a90: addu  v0, v1, zero
 	ldloc 8
 	stloc 5
-// 0x010c2454: 0x10c2454: lw    s1, 32(sp)
+// 0x010c2a94: 0x10c2a94: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3781,7 +3781,7 @@ L_10c244c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c2458: 0x10c2458: lw    s0, 28(sp)
+// 0x010c2a98: 0x10c2a98: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3790,7 +3790,7 @@ L_10c244c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c245c: 0x10c245c: jr    ra addiu sp, sp, 40
+// 0x010c2a9c: 0x10c2a9c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3802,7 +3802,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 conn_close_10c2464(int32,int32,int32,int32,int32)
+.method public static int32 conn_close_10c2aa4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -3837,8 +3837,8 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2464:
-// 0x010c2464: 0x10c2464: lw    v1, 20(a0)
+L_10c2aa4:
+// 0x010c2aa4: 0x10c2aa4: lw    v1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3847,28 +3847,28 @@ L_10c2464:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c2468: 0x10c2468: addiu sp, sp, -24
+// 0x010c2aa8: 0x10c2aa8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c246c: 0x10c246c: sw    ra, 20(sp)
-// 0x010c2470: 0x10c2470: lw    a0, 0(v1)
+// 0x010c2aac: 0x10c2aac: sw    ra, 20(sp)
+// 0x010c2ab0: 0x10c2ab0: lw    a0, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c2474: 0x10c2474: sll   zero, zero, 0
-// 0x010c2478: 0x10c2478: cibyl_sysc_arg 0x4
+// 0x010c2ab4: 0x10c2ab4: sll   zero, zero, 0
+// 0x010c2ab8: 0x10c2ab8: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c247c: 0x10c247c: cibyl_sysc 0x276b
+// 0x010c2abc: 0x10c2abc: cibyl_sysc 0x276b
 	call void [WazeWP7]Syscalls::NOPH_InputStream_close(int32)
-// 0x010c2480: 0x10c2480: addu  a0, v0, zero
+// 0x010c2ac0: 0x10c2ac0: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x010c2484: 0x10c2484: lw    a0, 4(v1)
+// 0x010c2ac4: 0x10c2ac4: lw    a0, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3877,7 +3877,7 @@ L_10c2464:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2488: 0x10c2488: jal   0x1000930 sll   zero, zero, 0
+// 0x010c2ac8: 0x10c2ac8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3888,11 +3888,11 @@ L_10c2464:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010c2490: 0x10c2490: lw    ra, 20(sp)
-// 0x010c2494: 0x10c2494: addu  v0, zero, zero
+// 0x010c2ad0: 0x10c2ad0: lw    ra, 20(sp)
+// 0x010c2ad4: 0x10c2ad4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010c2498: 0x10c2498: jr    ra addiu sp, sp, 24
+// 0x010c2ad8: 0x10c2ad8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3904,7 +3904,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 get_record_10c24a0(int32,int32,int32,int32,int32)
+.method public static int32 get_record_10c2ae0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 ra,int32 ecb,int32 ear)
@@ -3957,12 +3957,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c24a0: 0x10c24a0: addiu sp, sp, -48
+// 0x010c2ae0: 0x10c2ae0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010c24a4: 0x10c24a4: sw    s3, 40(sp)
+// 0x010c2ae4: 0x10c2ae4: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3971,7 +3971,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c24a8: 0x10c24a8: sw    s2, 36(sp)
+// 0x010c2ae8: 0x10c2ae8: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3980,7 +3980,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c24ac: 0x10c24ac: sw    s1, 32(sp)
+// 0x010c2aec: 0x10c2aec: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3989,8 +3989,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c24b0: 0x10c24b0: sw    ra, 44(sp)
-// 0x010c24b4: 0x10c24b4: sw    s0, 28(sp)
+// 0x010c2af0: 0x10c2af0: sw    ra, 44(sp)
+// 0x010c2af4: 0x10c2af4: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3999,7 +3999,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c24b8: 0x10c24b8: sw    zero, 16(sp)
+// 0x010c2af8: 0x10c2af8: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4008,25 +4008,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c24bc: 0x10c24bc: addu  s1, a0, zero
+// 0x010c2afc: 0x10c2afc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010c24c0: 0x10c24c0: addu  s2, a1, zero
+// 0x010c2b00: 0x10c2b00: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010c24c4: 0x10c24c4: addu  s3, a2, zero
+// 0x010c2b04: 0x10c2b04: addu  s3, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010c24c8: 0x10c24c8: lui   a0, 0x1000000
+// 0x010c2b08: 0x10c2b08: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c24cc: 0x10c24cc: addiu a0, a0, 264
+// 0x010c2b0c: 0x10c2b0c: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c24d0:
-// 0x010c24d0: 0x10c24d0: jal   0x1000120 addiu a1, sp, 16
+L_10c2b10:
+// 0x010c2b10: 0x10c2b10: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4036,29 +4036,29 @@ L_10c24d0:
 	ldloc.2
 	stloc 14
 // --- basic block ---
-// 0x010c24d8: 0x10c24d8: lw    v0, 0(zero)
+// 0x010c2b18: 0x10c2b18: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c24dc: 0x10c24dc: sll   zero, zero, 0
-// 0x010c24e0: 0x10c24e0: beq   v0, zero, 0x10c2524 sll   zero, zero, 0
+// 0x010c2b1c: 0x10c2b1c: sll   zero, zero, 0
+// 0x010c2b20: 0x10c2b20: beq   v0, zero, 0x10c2b64 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c2524
+	brfalse L_10c2b64
 // --- basic block ---
-// 0x010c24e8: 0x10c24e8: cibyl_sysc_arg 0x11
+// 0x010c2b28: 0x10c2b28: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x010c24ec: 0x10c24ec: cibyl_sysc_arg 0x12
+// 0x010c2b2c: 0x10c2b2c: cibyl_sysc_arg 0x12
 	ldloc 11
-// 0x010c24f0: 0x10c24f0: cibyl_sysc 0x2782
+// 0x010c2b30: 0x10c2b30: cibyl_sysc 0x2782
 	call int32 [WazeWP7]Syscalls::NOPH_RecordStore_getRecordSize(int32,int32)
 	stloc 5
-// 0x010c24f4: 0x10c24f4: addu  a0, v0, zero
+// 0x010c2b34: 0x10c2b34: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010c24f8: 0x10c24f8: jal   0x1000910 sw    a0, 0(s3)
+// 0x010c2b38: 0x10c2b38: jal   0x1000910 sw    a0, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4075,35 +4075,35 @@ L_10c24d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2500: 0x10c2500: beq   v0, zero, 0x10c2580 addu  s0, v0, zero
+// 0x010c2b40: 0x10c2b40: beq   v0, zero, 0x10c2bc0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_10c2580
+	brfalse L_10c2bc0
 // --- basic block ---
-// 0x010c2508: 0x10c2508: addu  v1, zero, zero
+// 0x010c2b48: 0x10c2b48: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010c250c: 0x10c250c: cibyl_sysc_arg 0x11
+// 0x010c2b4c: 0x10c2b4c: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x010c2510: 0x10c2510: cibyl_sysc_arg 0x12
+// 0x010c2b50: 0x10c2b50: cibyl_sysc_arg 0x12
 	ldloc 11
-// 0x010c2514: 0x10c2514: cibyl_sysc_arg 0x10
+// 0x010c2b54: 0x10c2b54: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010c2518: 0x10c2518: cibyl_sysc_arg 0x3
+// 0x010c2b58: 0x10c2b58: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c251c: 0x10c251c: cibyl_sysc 0x27a1
+// 0x010c2b5c: 0x10c2b5c: cibyl_sysc 0x27a1
 	call int32 [WazeWP7]Syscalls::NOPH_RecordStore_getRecord(int32,int32,int32,int32)
 	stloc 5
-// 0x010c2520: 0x10c2520: addu  s1, v0, zero
+// 0x010c2b60: 0x10c2b60: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-L_10c2524:
-// 0x010c2524: 0x10c2524: sll   zero, zero, 0
-// 0x010c2528: 0x10c2528: Unknown instruction 0x0
-L_10c2528:
-// 0x010c252c: 0x10c252c: sll   zero, zero, 0
-// 0x010c2530: 0x10c2530: lw    v0, 16(sp)
+L_10c2b64:
+// 0x010c2b64: 0x10c2b64: sll   zero, zero, 0
+// 0x010c2b68: 0x10c2b68: Unknown instruction 0x0
+L_10c2b68:
+// 0x010c2b6c: 0x10c2b6c: sll   zero, zero, 0
+// 0x010c2b70: 0x10c2b70: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4112,48 +4112,48 @@ L_10c2528:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2534: 0x10c2534: sll   zero, zero, 0
-// 0x010c2538: 0x10c2538: bne   v0, zero, 0x10c257c addiu v0, zero, 8
+// 0x010c2b74: 0x10c2b74: sll   zero, zero, 0
+// 0x010c2b78: 0x10c2b78: bne   v0, zero, 0x10c2bbc addiu v0, zero, 8
 	ldloc 5
 	ldc.i4.8
 	stloc 5
-	brtrue L_10c257c
+	brtrue L_10c2bbc
 // --- basic block ---
-// 0x010c2540: 0x10c2540: lw    v1, 0(s3)
+// 0x010c2b80: 0x10c2b80: lw    v1, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010c2544: 0x10c2544: sll   zero, zero, 0
-// 0x010c2548: 0x10c2548: bne   v1, v0, 0x10c2580 lui   v0, 0xc1b40000
+// 0x010c2b84: 0x10c2b84: sll   zero, zero, 0
+// 0x010c2b88: 0x10c2b88: bne   v1, v0, 0x10c2bc0 lui   v0, 0xc1b40000
 	ldloc 7
 	ldloc 5
 	ldc.i4 3249799168
 	stloc 5
-	bne.un L_10c2580
+	bne.un L_10c2bc0
 // --- basic block ---
-// 0x010c2550: 0x10c2550: lw    v1, 0(s0)
+// 0x010c2b90: 0x10c2b90: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010c2554: 0x10c2554: ori   v0, v0, 7195
+// 0x010c2b94: 0x10c2b94: ori   v0, v0, 7195
 	ldloc 5
 	ldc.i4 7195
 	or
 	stloc 5
-// 0x010c2558: 0x10c2558: bne   v1, v0, 0x10c2580 lui   v0, 0x41090000
+// 0x010c2b98: 0x10c2b98: bne   v1, v0, 0x10c2bc0 lui   v0, 0x41090000
 	ldloc 7
 	ldloc 5
 	ldc.i4 1091108864
 	stloc 5
-	bne.un L_10c2580
+	bne.un L_10c2bc0
 // --- basic block ---
-// 0x010c2560: 0x10c2560: lw    v1, 4(s0)
+// 0x010c2ba0: 0x10c2ba0: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4162,17 +4162,17 @@ L_10c2528:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2564: 0x10c2564: ori   v0, v0, 46273
+// 0x010c2ba4: 0x10c2ba4: ori   v0, v0, 46273
 	ldloc 5
 	ldc.i4 46273
 	or
 	stloc 5
-// 0x010c2568: 0x10c2568: bne   v1, v0, 0x10c2580 sll   zero, zero, 0
+// 0x010c2ba8: 0x10c2ba8: bne   v1, v0, 0x10c2bc0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10c2580
+	bne.un L_10c2bc0
 // --- basic block ---
-// 0x010c2570: 0x10c2570: jal   0x1000930 addu  a0, s0, zero
+// 0x010c2bb0: 0x10c2bb0: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4185,23 +4185,23 @@ L_10c2528:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2578: 0x10c2578: sw    zero, 0(s3)
+// 0x010c2bb8: 0x10c2bb8: sw    zero, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10c257c:
-// 0x010c257c: 0x10c257c: addu  s0, zero, zero
+L_10c2bbc:
+// 0x010c2bbc: 0x10c2bbc: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_10c2580:
-// 0x010c2580: 0x10c2580: lw    ra, 44(sp)
-// 0x010c2584: 0x10c2584: addu  v0, s0, zero
+L_10c2bc0:
+// 0x010c2bc0: 0x10c2bc0: lw    ra, 44(sp)
+// 0x010c2bc4: 0x10c2bc4: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010c2588: 0x10c2588: lw    s3, 40(sp)
+// 0x010c2bc8: 0x10c2bc8: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4210,7 +4210,7 @@ L_10c2580:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c258c: 0x10c258c: lw    s2, 36(sp)
+// 0x010c2bcc: 0x10c2bcc: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4219,7 +4219,7 @@ L_10c2580:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c2590: 0x10c2590: lw    s1, 32(sp)
+// 0x010c2bd0: 0x10c2bd0: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4228,7 +4228,7 @@ L_10c2580:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c2594: 0x10c2594: lw    s0, 28(sp)
+// 0x010c2bd4: 0x10c2bd4: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4237,7 +4237,7 @@ L_10c2580:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c2598: 0x10c2598: jr    ra addiu sp, sp, 48
+// 0x010c2bd8: 0x10c2bd8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4249,7 +4249,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rs_open_10c25a0(int32,int32,int32,int32,int32)
+.method public static int32 rs_open_10c2be0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 s3,int32 s4,int32 ra,int32 ecb,int32 ear)
@@ -4305,13 +4305,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c25a0:
-// 0x010c25a0: 0x10c25a0: addiu sp, sp, -48
+L_10c2be0:
+// 0x010c2be0: 0x10c2be0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010c25a4: 0x10c25a4: sw    s1, 28(sp)
+// 0x010c2be4: 0x10c2be4: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4320,13 +4320,13 @@ L_10c25a0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c25a8: 0x10c25a8: addu  s1, a1, zero
+// 0x010c2be8: 0x10c2be8: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010c25ac: 0x10c25ac: addiu a1, zero, 58
+// 0x010c2bec: 0x10c2bec: addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
-// 0x010c25b0: 0x10c25b0: sw    s4, 40(sp)
+// 0x010c2bf0: 0x10c2bf0: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4335,7 +4335,7 @@ L_10c25a0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010c25b4: 0x10c25b4: sw    s2, 32(sp)
+// 0x010c2bf4: 0x10c2bf4: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4344,7 +4344,7 @@ L_10c25a0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c25b8: 0x10c25b8: sw    s0, 24(sp)
+// 0x010c2bf8: 0x10c2bf8: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4353,8 +4353,8 @@ L_10c25a0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c25bc: 0x10c25bc: sw    ra, 44(sp)
-// 0x010c25c0: 0x10c25c0: sw    s3, 36(sp)
+// 0x010c2bfc: 0x10c2bfc: sw    ra, 44(sp)
+// 0x010c2c00: 0x10c2c00: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4363,7 +4363,7 @@ L_10c25a0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c25c4: 0x10c25c4: jal   0x1001a5c addu  s2, a0, zero
+// 0x010c2c04: 0x10c2c04: jal   0x1001a5c addu  s2, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
@@ -4373,19 +4373,19 @@ L_10c25a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c25cc: 0x10c25cc: addu  s4, v0, zero
+// 0x010c2c0c: 0x10c2c0c: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010c25d0: 0x10c25d0: beq   v0, zero, 0x10c278c addu  s0, zero, zero
+// 0x010c2c10: 0x10c2c10: beq   v0, zero, 0x10c2dcc addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_10c278c
+	brfalse L_10c2dcc
 // --- basic block ---
-// 0x010c25d8: 0x10c25d8: addu  a0, s2, zero
+// 0x010c2c18: 0x10c2c18: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010c25dc: 0x10c25dc: sw    zero, 20(sp)
+// 0x010c2c1c: 0x10c2c1c: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4394,7 +4394,7 @@ L_10c25a0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c25e0: 0x10c25e0: jal   0x1001ba8 sw    zero, 16(sp)
+// 0x010c2c20: 0x10c2c20: jal   0x1001ba8 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4413,13 +4413,13 @@ L_10c25a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c25e8: 0x10c25e8: addu  a0, v0, zero
+// 0x010c2c28: 0x10c2c28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010c25ec: 0x10c25ec: addiu a1, zero, 58
+// 0x010c2c2c: 0x10c2c2c: addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
-// 0x010c25f0: 0x10c25f0: jal   0x1001a5c addu  s3, v0, zero
+// 0x010c2c30: 0x10c2c30: jal   0x1001a5c addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
@@ -4429,14 +4429,14 @@ L_10c25a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c25f8: 0x10c25f8: lui   a0, 0x0
+// 0x010c2c38: 0x10c2c38: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c25fc: 0x10c25fc: sb    zero, 0(v0)
+// 0x010c2c3c: 0x10c2c3c: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010c2600: 0x10c2600: jal   0x1002450 addiu a0, a0, 19688
+// 0x010c2c40: 0x10c2c40: jal   0x1002450 addiu a0, a0, 19688
 	ldloc.1
 	ldc.i4 19688
 	add
@@ -4451,13 +4451,13 @@ L_10c25a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2608: 0x10c2608: beq   v0, zero, 0x10c278c addu  s0, v0, zero
+// 0x010c2c48: 0x10c2c48: beq   v0, zero, 0x10c2dcc addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_10c278c
+	brfalse L_10c2dcc
 // --- basic block ---
-// 0x010c2610: 0x10c2610: lw    s2, 20(v0)
+// 0x010c2c50: 0x10c2c50: lw    s2, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4466,16 +4466,16 @@ L_10c25a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c2614: 0x10c2614: lui   a0, 0x1000000
+// 0x010c2c54: 0x10c2c54: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c2618: 0x10c2618: addiu a0, a0, 264
+// 0x010c2c58: 0x10c2c58: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c261c:
-// 0x010c261c: 0x10c261c: jal   0x1000120 addiu a1, sp, 20
+L_10c2c5c:
+// 0x010c2c5c: 0x10c2c5c: jal   0x1000120 addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
@@ -4485,33 +4485,33 @@ L_10c261c:
 	ldloc.2
 	stloc 15
 // --- basic block ---
-// 0x010c2624: 0x10c2624: lw    v0, 0(zero)
+// 0x010c2c64: 0x10c2c64: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c2628: 0x10c2628: sll   zero, zero, 0
-// 0x010c262c: 0x10c262c: beq   v0, zero, 0x10c2648 sltu  v1, zero, s1
+// 0x010c2c68: 0x10c2c68: sll   zero, zero, 0
+// 0x010c2c6c: 0x10c2c6c: beq   v0, zero, 0x10c2c88 sltu  v1, zero, s1
 	ldloc 5
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 7
-	brfalse L_10c2648
+	brfalse L_10c2c88
 // --- basic block ---
-// 0x010c2634: 0x10c2634: cibyl_sysc_arg 0x13
+// 0x010c2c74: 0x10c2c74: cibyl_sysc_arg 0x13
 	ldloc 11
-// 0x010c2638: 0x10c2638: cibyl_sysc_arg 0x3
+// 0x010c2c78: 0x10c2c78: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c263c: 0x10c263c: cibyl_sysc 0x27bc
+// 0x010c2c7c: 0x10c2c7c: cibyl_sysc 0x27bc
 	call int32 [WazeWP7]Syscalls::NOPH_RecordStore_openRecordStore(int32,int32)
 	stloc 5
-// 0x010c2640: 0x10c2640: addu  v1, v0, zero
+// 0x010c2c80: 0x10c2c80: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c2644: 0x10c2644: sw    v1, 20(s2)
+// 0x010c2c84: 0x10c2c84: sw    v1, 20(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4520,12 +4520,12 @@ L_10c261c:
 	add
 	ldloc 7
 	stelem.i4
-L_10c2648:
-// 0x010c2648: 0x10c2648: sll   zero, zero, 0
-// 0x010c264c: 0x10c264c: Unknown instruction 0x0
-L_10c264c:
-// 0x010c2650: 0x10c2650: sll   zero, zero, 0
-// 0x010c2654: 0x10c2654: lw    v0, 20(sp)
+L_10c2c88:
+// 0x010c2c88: 0x10c2c88: sll   zero, zero, 0
+// 0x010c2c8c: 0x10c2c8c: Unknown instruction 0x0
+L_10c2c8c:
+// 0x010c2c90: 0x10c2c90: sll   zero, zero, 0
+// 0x010c2c94: 0x10c2c94: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4534,12 +4534,12 @@ L_10c264c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2658: 0x10c2658: sll   zero, zero, 0
-// 0x010c265c: 0x10c265c: bne   v0, zero, 0x10c2674 sll   zero, zero, 0
+// 0x010c2c98: 0x10c2c98: sll   zero, zero, 0
+// 0x010c2c9c: 0x10c2c9c: bne   v0, zero, 0x10c2cb4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10c2674
+	brtrue L_10c2cb4
 // --- basic block ---
-// 0x010c2664: 0x10c2664: lw    v0, 20(s2)
+// 0x010c2ca4: 0x10c2ca4: lw    v0, 20(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4548,13 +4548,13 @@ L_10c264c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2668: 0x10c2668: sll   zero, zero, 0
-// 0x010c266c: 0x10c266c: bne   v0, zero, 0x10c2684 sll   zero, zero, 0
+// 0x010c2ca8: 0x10c2ca8: sll   zero, zero, 0
+// 0x010c2cac: 0x10c2cac: bne   v0, zero, 0x10c2cc4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10c2684
+	brtrue L_10c2cc4
 // --- basic block ---
-L_10c2674:
-// 0x010c2674: 0x10c2674: jal   0x1000930 addu  a0, s3, zero
+L_10c2cb4:
+// 0x010c2cb4: 0x10c2cb4: jal   0x1000930 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4567,11 +4567,11 @@ L_10c2674:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c267c: 0x10c267c: j	 0x10c2780 sll   zero, zero, 0
-	br L_10c2780
+// 0x010c2cbc: 0x10c2cbc: j	 0x10c2dc0 sll   zero, zero, 0
+	br L_10c2dc0
 // --- basic block ---
-L_10c2684:
-// 0x010c2684: 0x10c2684: jal   0x1000d8c addiu a0, s4, 1
+L_10c2cc4:
+// 0x010c2cc4: 0x10c2cc4: jal   0x1000d8c addiu a0, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
@@ -4586,7 +4586,7 @@ L_10c2684:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c268c: 0x10c268c: sw    v0, 24(s2)
+// 0x010c2ccc: 0x10c2ccc: sw    v0, 24(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4595,15 +4595,15 @@ L_10c2684:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c2690: 0x10c2690: lui   v0, 0x10c0000
+// 0x010c2cd0: 0x10c2cd0: lui   v0, 0x10c0000
 	ldc.i4 17563648
 	stloc 5
-// 0x010c2694: 0x10c2694: addiu v0, v0, 10160
+// 0x010c2cd4: 0x10c2cd4: addiu v0, v0, 11760
 	ldloc 5
-	ldc.i4 10160
+	ldc.i4 11760
 	add
 	stloc 5
-// 0x010c2698: 0x10c2698: sw    v0, 28(s2)
+// 0x010c2cd8: 0x10c2cd8: sw    v0, 28(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4612,7 +4612,7 @@ L_10c2684:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c269c: 0x10c269c: jal   0x1000930 addu  a0, s3, zero
+// 0x010c2cdc: 0x10c2cdc: jal   0x1000930 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4625,46 +4625,46 @@ L_10c2684:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c26a4: 0x10c26a4: sltiu v0, s1, 6
+// 0x010c2ce4: 0x10c2ce4: sltiu v0, s1, 6
 	ldloc 10
 	ldc.i4.6
 	clt.un
 	stloc 5
-// 0x010c26a8: 0x10c26a8: beq   v0, zero, 0x10c2708 lui   v0, 0x20000
+// 0x010c2ce8: 0x10c2ce8: beq   v0, zero, 0x10c2d48 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10c2708
+	brfalse L_10c2d48
 // --- basic block ---
-// 0x010c26b0: 0x10c26b0: sll   v1, s1, 2
+// 0x010c2cf0: 0x10c2cf0: sll   v1, s1, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010c26b4: 0x10c26b4: addiu v0, v0, 30092
+// 0x010c2cf4: 0x10c2cf4: addiu v0, v0, 30556
 	ldloc 5
-	ldc.i4 30092
+	ldc.i4 30556
 	add
 	stloc 5
-// 0x010c26b8: 0x10c26b8: addu  v0, v0, v1
+// 0x010c2cf8: 0x10c2cf8: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010c26bc: 0x10c26bc: lw    v0, 0(v0)
+// 0x010c2cfc: 0x10c2cfc: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c26c0: 0x10c26c0: sll   zero, zero, 0
-// 0x010c26c4: 0x10c26c4: jr    v0 sll   zero, zero, 0
+// 0x010c2d00: 0x10c2d00: sll   zero, zero, 0
+// 0x010c2d04: 0x10c2d04: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_10c26cc:
-// 0x010c26cc: 0x10c26cc: lw    a1, 24(s2)
+L_10c2d0c:
+// 0x010c2d0c: 0x10c2d0c: lw    a1, 24(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4673,7 +4673,7 @@ L_10c26cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c26d0: 0x10c26d0: lw    a0, 20(s2)
+// 0x010c2d10: 0x10c2d10: lw    a0, 20(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4682,7 +4682,7 @@ L_10c26cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c26d4: 0x10c26d4: jal   0x10c24a0 addiu a2, sp, 16
+// 0x010c2d14: 0x10c2d14: jal   0x10c2ae0 addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4692,16 +4692,16 @@ L_10c26cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::get_record_10c24a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::get_record_10c2ae0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c26dc: 0x10c26dc: j	 0x10c2724 sll   zero, zero, 0
-	br L_10c2724
+// 0x010c2d1c: 0x10c2d1c: j	 0x10c2d64 sll   zero, zero, 0
+	br L_10c2d64
 // --- basic block ---
-L_10c26e4:
-// 0x010c26e4: 0x10c26e4: lw    a0, 20(s2)
+L_10c2d24:
+// 0x010c2d24: 0x10c2d24: lw    a0, 20(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4710,7 +4710,7 @@ L_10c26e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c26e8: 0x10c26e8: lw    a1, 24(s2)
+// 0x010c2d28: 0x10c2d28: lw    a1, 24(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4719,7 +4719,7 @@ L_10c26e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c26ec: 0x10c26ec: jal   0x10c24a0 addiu a2, sp, 16
+// 0x010c2d2c: 0x10c2d2c: jal   0x10c2ae0 addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4729,23 +4729,23 @@ L_10c26e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::get_record_10c24a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::get_record_10c2ae0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c26f4: 0x10c26f4: beq   v0, zero, 0x10c2758 lui   v1, 0x10c0000
+// 0x010c2d34: 0x10c2d34: beq   v0, zero, 0x10c2d98 lui   v1, 0x10c0000
 	ldloc 5
 	ldc.i4 17563648
 	stloc 7
-	brfalse L_10c2758
+	brfalse L_10c2d98
 // --- basic block ---
-// 0x010c26fc: 0x10c26fc: addiu v1, v1, 8600
+// 0x010c2d3c: 0x10c2d3c: addiu v1, v1, 10200
 	ldloc 7
-	ldc.i4 8600
+	ldc.i4 10200
 	add
 	stloc 7
-// 0x010c2700: 0x10c2700: j	 0x10c2724 sw    v1, 28(s2)
+// 0x010c2d40: 0x10c2d40: j	 0x10c2d64 sw    v1, 28(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4754,18 +4754,18 @@ L_10c26e4:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10c2724
+	br L_10c2d64
 // --- basic block ---
-L_10c2708:
-// 0x010c2708: 0x10c2708: lui   a0, 0x20000
+L_10c2d48:
+// 0x010c2d48: 0x10c2d48: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c270c: 0x10c270c: addiu a0, a0, 23456
+// 0x010c2d4c: 0x10c2d4c: addiu a0, a0, 23916
 	ldloc.1
-	ldc.i4 23456
+	ldc.i4 23916
 	add
 	stloc.1
-// 0x010c2710: 0x10c2710: jal   0x10002dc addu  a1, s1, zero
+// 0x010c2d50: 0x10c2d50: jal   0x10002dc addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4778,15 +4778,15 @@ L_10c2708:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2718: 0x10c2718: j	 0x10c2758 sll   zero, zero, 0
-	br L_10c2758
+// 0x010c2d58: 0x10c2d58: j	 0x10c2d98 sll   zero, zero, 0
+	br L_10c2d98
 // --- basic block ---
-L_10c2720:
-// 0x010c2720: 0x10c2720: addu  v0, zero, zero
+L_10c2d60:
+// 0x010c2d60: 0x10c2d60: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10c2724:
-// 0x010c2724: 0x10c2724: lw    a2, 16(sp)
+L_10c2d64:
+// 0x010c2d64: 0x10c2d64: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4795,13 +4795,13 @@ L_10c2724:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c2728: 0x10c2728: addu  a1, v0, zero
+// 0x010c2d68: 0x10c2d68: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010c272c: 0x10c272c: addu  a0, s0, zero
+// 0x010c2d6c: 0x10c2d6c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010c2730: 0x10c2730: jal   0x10c39c0 addiu a3, zero, 1
+// 0x010c2d70: 0x10c2d70: jal   0x10c4000 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -4809,25 +4809,25 @@ L_10c2724:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::NOPH_MemoryFile_setup_10c39c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::NOPH_MemoryFile_setup_10c4000(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2738: 0x10c2738: addiu v0, zero, 3
+// 0x010c2d78: 0x10c2d78: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010c273c: 0x10c273c: bne   s1, v0, 0x10c278c addu  a1, zero, zero
+// 0x010c2d7c: 0x10c2d7c: bne   s1, v0, 0x10c2dcc addu  a1, zero, zero
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_10c278c
+	bne.un L_10c2dcc
 // --- basic block ---
-// 0x010c2744: 0x10c2744: addu  a0, s0, zero
+// 0x010c2d84: 0x10c2d84: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010c2748: 0x10c2748: jal   0x10022c4 addiu a2, zero, 2
+// 0x010c2d88: 0x10c2d88: jal   0x10022c4 addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -4840,11 +4840,11 @@ L_10c2724:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2750: 0x10c2750: j	 0x10c278c sll   zero, zero, 0
-	br L_10c278c
+// 0x010c2d90: 0x10c2d90: j	 0x10c2dcc sll   zero, zero, 0
+	br L_10c2dcc
 // --- basic block ---
-L_10c2758:
-// 0x010c2758: 0x10c2758: lw    v1, 20(s2)
+L_10c2d98:
+// 0x010c2d98: 0x10c2d98: lw    v1, 20(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4853,15 +4853,15 @@ L_10c2758:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c275c: 0x10c275c: sll   zero, zero, 0
-// 0x010c2760: 0x10c2760: cibyl_sysc_arg 0x3
+// 0x010c2d9c: 0x10c2d9c: sll   zero, zero, 0
+// 0x010c2da0: 0x10c2da0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2764: 0x10c2764: cibyl_sysc 0x27dd
+// 0x010c2da4: 0x10c2da4: cibyl_sysc 0x27dd
 	call void [WazeWP7]Syscalls::NOPH_RecordStore_closeRecordStore(int32)
-// 0x010c2768: 0x10c2768: addu  v1, v0, zero
+// 0x010c2da8: 0x10c2da8: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c276c: 0x10c276c: lw    v1, 20(s2)
+// 0x010c2dac: 0x10c2dac: lw    v1, 20(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4870,16 +4870,16 @@ L_10c2758:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2770: 0x10c2770: sll   zero, zero, 0
-// 0x010c2774: 0x10c2774: cibyl_sysc_arg 0x3
+// 0x010c2db0: 0x10c2db0: sll   zero, zero, 0
+// 0x010c2db4: 0x10c2db4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2778: 0x10c2778: cibyl_sysc 0x27ff
+// 0x010c2db8: 0x10c2db8: cibyl_sysc 0x27ff
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c277c: 0x10c277c: addu  v1, v0, zero
+// 0x010c2dbc: 0x10c2dbc: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_10c2780:
-// 0x010c2780: 0x10c2780: jal   0x1002394 addu  a0, s0, zero
+L_10c2dc0:
+// 0x010c2dc0: 0x10c2dc0: jal   0x1002394 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4892,15 +4892,15 @@ L_10c2780:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2788: 0x10c2788: addu  s0, zero, zero
+// 0x010c2dc8: 0x10c2dc8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_10c278c:
-// 0x010c278c: 0x10c278c: lw    ra, 44(sp)
-// 0x010c2790: 0x10c2790: addu  v0, s0, zero
+L_10c2dcc:
+// 0x010c2dcc: 0x10c2dcc: lw    ra, 44(sp)
+// 0x010c2dd0: 0x10c2dd0: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x010c2794: 0x10c2794: lw    s4, 40(sp)
+// 0x010c2dd4: 0x10c2dd4: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4909,7 +4909,7 @@ L_10c278c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010c2798: 0x10c2798: lw    s3, 36(sp)
+// 0x010c2dd8: 0x10c2dd8: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4918,7 +4918,7 @@ L_10c278c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c279c: 0x10c279c: lw    s2, 32(sp)
+// 0x010c2ddc: 0x10c2ddc: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4927,7 +4927,7 @@ L_10c278c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c27a0: 0x10c27a0: lw    s1, 28(sp)
+// 0x010c2de0: 0x10c2de0: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4936,7 +4936,7 @@ L_10c278c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c27a4: 0x10c27a4: lw    s0, 24(sp)
+// 0x010c2de4: 0x10c2de4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4945,7 +4945,7 @@ L_10c278c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c27a8: 0x10c27a8: jr    ra addiu sp, sp, 48
+// 0x010c2de8: 0x10c2de8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4955,20 +4955,20 @@ L_10c278c:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17573280
-	beq  L_10c25a0
+	ldc.i4 17574880
+	beq  L_10c2be0
 	ldloc 5
-	ldc.i4 17573580
-	beq  L_10c26cc
+	ldc.i4 17575180
+	beq  L_10c2d0c
 	ldloc 5
-	ldc.i4 17573604
-	beq  L_10c26e4
+	ldc.i4 17575204
+	beq  L_10c2d24
 	ldloc 5
-	ldc.i4 17573640
-	beq  L_10c2708
+	ldc.i4 17575240
+	beq  L_10c2d48
 	ldloc 5
-	ldc.i4 17573664
-	beq  L_10c2720
+	ldc.i4 17575264
+	beq  L_10c2d60
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -4976,7 +4976,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 close_write_10c27b0(int32,int32,int32,int32,int32)
+.method public static int32 close_write_10c2df0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s2,int32 s1,int32 s4,int32 ra,int32 ecb,int32 ear)
@@ -5032,12 +5032,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c27b0: 0x10c27b0: addiu sp, sp, -56
+// 0x010c2df0: 0x10c2df0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010c27b4: 0x10c27b4: sw    s2, 40(sp)
+// 0x010c2df4: 0x10c2df4: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5046,11 +5046,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c27b8: 0x10c27b8: addu  s2, a0, zero
+// 0x010c2df8: 0x10c2df8: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010c27bc: 0x10c27bc: sw    ra, 52(sp)
-// 0x010c27c0: 0x10c27c0: sw    s1, 36(sp)
+// 0x010c2dfc: 0x10c2dfc: sw    ra, 52(sp)
+// 0x010c2e00: 0x10c2e00: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5059,7 +5059,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c27c4: 0x10c27c4: sw    s0, 32(sp)
+// 0x010c2e04: 0x10c2e04: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5068,7 +5068,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c27c8: 0x10c27c8: sw    s4, 48(sp)
+// 0x010c2e08: 0x10c2e08: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5077,7 +5077,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010c27cc: 0x10c27cc: lw    s0, 20(a0)
+// 0x010c2e0c: 0x10c2e0c: lw    s0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5086,7 +5086,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c27d0: 0x10c27d0: jal   0x10c37a0 sw    s3, 44(sp)
+// 0x010c2e10: 0x10c2e10: jal   0x10c3de0 sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5096,23 +5096,23 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl145::NOPH_MemoryFile_getDataPtr_10c37a0(int32)
+	call int32 Cibyl145::NOPH_MemoryFile_getDataPtr_10c3de0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010c27d8: 0x10c27d8: addu  a0, s2, zero
+// 0x010c2e18: 0x10c2e18: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010c27dc: 0x10c27dc: jal   0x1001e0c addu  s1, v0, zero
+// 0x010c2e1c: 0x10c2e1c: jal   0x1001e0c addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	call int32 Cibyl1::ftell_1001e0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010c27e4: 0x10c27e4: addu  s2, v0, zero
+// 0x010c2e24: 0x10c2e24: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010c27e8: 0x10c27e8: sw    zero, 16(sp)
+// 0x010c2e28: 0x10c2e28: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5121,16 +5121,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c27ec: 0x10c27ec: lui   a0, 0x1000000
+// 0x010c2e2c: 0x10c2e2c: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c27f0: 0x10c27f0: addiu a0, a0, 264
+// 0x010c2e30: 0x10c2e30: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c27f4:
-// 0x010c27f4: 0x10c27f4: jal   0x1000120 addiu a1, sp, 16
+L_10c2e34:
+// 0x010c2e34: 0x10c2e34: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5140,21 +5140,21 @@ L_10c27f4:
 	ldloc.2
 	stloc 15
 // --- basic block ---
-// 0x010c27fc: 0x10c27fc: lw    v0, 0(zero)
+// 0x010c2e3c: 0x10c2e3c: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c2800: 0x10c2800: sll   zero, zero, 0
-// 0x010c2804: 0x10c2804: beq   v0, zero, 0x10c2834 addu  a1, zero, zero
+// 0x010c2e40: 0x10c2e40: sll   zero, zero, 0
+// 0x010c2e44: 0x10c2e44: beq   v0, zero, 0x10c2e74 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10c2834
+	brfalse L_10c2e74
 // --- basic block ---
-// 0x010c280c: 0x10c280c: lw    v1, 20(s0)
+// 0x010c2e4c: 0x10c2e4c: lw    v1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5163,7 +5163,7 @@ L_10c27f4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2810: 0x10c2810: lw    a0, 24(s0)
+// 0x010c2e50: 0x10c2e50: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5172,28 +5172,28 @@ L_10c27f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2814: 0x10c2814: sll   zero, zero, 0
-// 0x010c2818: 0x10c2818: cibyl_sysc_arg 0x3
+// 0x010c2e54: 0x10c2e54: sll   zero, zero, 0
+// 0x010c2e58: 0x10c2e58: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c281c: 0x10c281c: cibyl_sysc_arg 0x4
+// 0x010c2e5c: 0x10c2e5c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c2820: 0x10c2820: cibyl_sysc_arg 0x11
+// 0x010c2e60: 0x10c2e60: cibyl_sysc_arg 0x11
 	ldloc 11
-// 0x010c2824: 0x10c2824: cibyl_sysc_arg 0x5
+// 0x010c2e64: 0x10c2e64: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010c2828: 0x10c2828: cibyl_sysc_arg 0x12
+// 0x010c2e68: 0x10c2e68: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x010c282c: 0x10c282c: cibyl_sysc 0x280b
+// 0x010c2e6c: 0x10c2e6c: cibyl_sysc 0x280b
 	call void [WazeWP7]Syscalls::NOPH_RecordStore_setRecord(int32,int32,int32,int32,int32)
-// 0x010c2830: 0x10c2830: addu  v1, v0, zero
+// 0x010c2e70: 0x10c2e70: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_10c2834:
-// 0x010c2834: 0x10c2834: sll   zero, zero, 0
-// 0x010c2838: 0x10c2838: Unknown instruction 0x0
-L_10c2838:
-// 0x010c283c: 0x10c283c: sll   zero, zero, 0
-// 0x010c2840: 0x10c2840: lw    v0, 16(sp)
+L_10c2e74:
+// 0x010c2e74: 0x10c2e74: sll   zero, zero, 0
+// 0x010c2e78: 0x10c2e78: Unknown instruction 0x0
+L_10c2e78:
+// 0x010c2e7c: 0x10c2e7c: sll   zero, zero, 0
+// 0x010c2e80: 0x10c2e80: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5202,27 +5202,27 @@ L_10c2838:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2844: 0x10c2844: sll   zero, zero, 0
-// 0x010c2848: 0x10c2848: beq   v0, zero, 0x10c2910 lui   v1, 0x41090000
+// 0x010c2e84: 0x10c2e84: sll   zero, zero, 0
+// 0x010c2e88: 0x10c2e88: beq   v0, zero, 0x10c2f50 lui   v1, 0x41090000
 	ldloc 5
 	ldc.i4 1091108864
 	stloc 7
-	brfalse L_10c2910
+	brfalse L_10c2f50
 // --- basic block ---
-// 0x010c2850: 0x10c2850: lui   v0, 0xc1b40000
+// 0x010c2e90: 0x10c2e90: lui   v0, 0xc1b40000
 	ldc.i4 3249799168
 	stloc 5
-// 0x010c2854: 0x10c2854: ori   v1, v1, 46273
+// 0x010c2e94: 0x10c2e94: ori   v1, v1, 46273
 	ldloc 7
 	ldc.i4 46273
 	or
 	stloc 7
-// 0x010c2858: 0x10c2858: ori   v0, v0, 7195
+// 0x010c2e98: 0x10c2e98: ori   v0, v0, 7195
 	ldloc 5
 	ldc.i4 7195
 	or
 	stloc 5
-// 0x010c285c: 0x10c285c: sw    v1, 28(sp)
+// 0x010c2e9c: 0x10c2e9c: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ L_10c2838:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c2860: 0x10c2860: sw    v0, 24(sp)
+// 0x010c2ea0: 0x10c2ea0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5240,12 +5240,12 @@ L_10c2838:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c2864: 0x10c2864: addiu s4, sp, 24
+// 0x010c2ea4: 0x10c2ea4: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 12
-// 0x010c2868: 0x10c2868: lw    v1, 20(s0)
+// 0x010c2ea8: 0x10c2ea8: lw    v1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5254,27 +5254,27 @@ L_10c2838:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c286c: 0x10c286c: addiu s3, zero, 8
+// 0x010c2eac: 0x10c2eac: addiu s3, zero, 8
 	ldc.i4.8
 	stloc 9
-// 0x010c2870: 0x10c2870: addu  a0, zero, zero
+// 0x010c2eb0: 0x10c2eb0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010c2874: 0x10c2874: cibyl_sysc_arg 0x3
+// 0x010c2eb4: 0x10c2eb4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2878: 0x10c2878: cibyl_sysc_arg 0x14
+// 0x010c2eb8: 0x10c2eb8: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x010c287c: 0x10c287c: cibyl_sysc_arg 0x4
+// 0x010c2ebc: 0x10c2ebc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c2880: 0x10c2880: cibyl_sysc_arg 0x13
+// 0x010c2ec0: 0x10c2ec0: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x010c2884: 0x10c2884: cibyl_sysc 0x2826
+// 0x010c2ec4: 0x10c2ec4: cibyl_sysc 0x2826
 	call int32 [WazeWP7]Syscalls::NOPH_RecordStore_addRecord(int32,int32,int32,int32)
 	stloc 5
-// 0x010c2888: 0x10c2888: addu  s3, v0, zero
+// 0x010c2ec8: 0x10c2ec8: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010c288c: 0x10c288c: lw    v0, 24(s0)
+// 0x010c2ecc: 0x10c2ecc: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5283,22 +5283,22 @@ L_10c2838:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2890: 0x10c2890: sll   zero, zero, 0
-// 0x010c2894: 0x10c2894: slt   v0, v0, s3
+// 0x010c2ed0: 0x10c2ed0: sll   zero, zero, 0
+// 0x010c2ed4: 0x10c2ed4: slt   v0, v0, s3
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 5
-// 0x010c2898: 0x10c2898: beq   v0, zero, 0x10c28d8 sll   zero, zero, 0
+// 0x010c2ed8: 0x10c2ed8: beq   v0, zero, 0x10c2f18 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c28d8
+	brfalse L_10c2f18
 // --- basic block ---
-// 0x010c28a0: 0x10c28a0: lui   a0, 0x20000
+// 0x010c2ee0: 0x10c2ee0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c28a4: 0x10c28a4: jal   0x10001a0 addiu a0, a0, 23472
+// 0x010c2ee4: 0x10c2ee4: jal   0x10001a0 addiu a0, a0, 23932
 	ldloc.1
-	ldc.i4 23472
+	ldc.i4 23932
 	add
 	stloc.1
 	ldloc.0
@@ -5311,7 +5311,7 @@ L_10c2838:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c28ac: 0x10c28ac: jal   0x1000130 addu  a0, v0, zero
+// 0x010c2eec: 0x10c2eec: jal   0x1000130 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldsfld object[] [WazeWP7]CRunTime::objectRepository
@@ -5320,38 +5320,38 @@ L_10c2838:
 	castclass [mscorlib]System.Exception
 	throw
 // --- basic block ---
-// 0x010c28b4: 0x10c28b4: j	 0x10c28dc addu  a1, zero, zero
+// 0x010c2ef4: 0x10c2ef4: j	 0x10c2f1c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_10c28dc
+	br L_10c2f1c
 // --- basic block ---
-L_10c28bc:
-// 0x010c28bc: 0x10c28bc: cibyl_sysc_arg 0x3
+L_10c2efc:
+// 0x010c2efc: 0x10c2efc: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c28c0: 0x10c28c0: cibyl_sysc_arg 0x14
+// 0x010c2f00: 0x10c2f00: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x010c28c4: 0x10c28c4: cibyl_sysc_arg 0x5
+// 0x010c2f04: 0x10c2f04: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010c28c8: 0x10c28c8: cibyl_sysc_arg 0x4
+// 0x010c2f08: 0x10c2f08: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c28cc: 0x10c28cc: cibyl_sysc 0x2841
+// 0x010c2f0c: 0x10c2f0c: cibyl_sysc 0x2841
 	call int32 [WazeWP7]Syscalls::NOPH_RecordStore_addRecord(int32,int32,int32,int32)
 	stloc 5
-// 0x010c28d0: 0x10c28d0: j	 0x10c28e0 addu  s3, v0, zero
+// 0x010c2f10: 0x10c2f10: j	 0x10c2f20 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-	br L_10c28e0
+	br L_10c2f20
 // --- basic block ---
-L_10c28d8:
-// 0x010c28d8: 0x10c28d8: addu  a1, zero, zero
+L_10c2f18:
+// 0x010c2f18: 0x10c2f18: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_10c28dc:
-// 0x010c28dc: 0x10c28dc: addiu a0, zero, 8
+L_10c2f1c:
+// 0x010c2f1c: 0x10c2f1c: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-L_10c28e0:
-// 0x010c28e0: 0x10c28e0: lw    v0, 24(s0)
+L_10c2f20:
+// 0x010c2f20: 0x10c2f20: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5360,7 +5360,7 @@ L_10c28e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c28e4: 0x10c28e4: lw    v1, 20(s0)
+// 0x010c2f24: 0x10c2f24: lw    v1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5369,32 +5369,32 @@ L_10c28e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c28e8: 0x10c28e8: bne   s3, v0, 0x10c28bc sll   zero, zero, 0
+// 0x010c2f28: 0x10c2f28: bne   s3, v0, 0x10c2efc sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	bne.un L_10c28bc
+	bne.un L_10c2efc
 // --- basic block ---
-// 0x010c28f0: 0x10c28f0: addu  a0, zero, zero
+// 0x010c2f30: 0x10c2f30: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010c28f4: 0x10c28f4: cibyl_sysc_arg 0x3
+// 0x010c2f34: 0x10c2f34: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c28f8: 0x10c28f8: cibyl_sysc_arg 0x13
+// 0x010c2f38: 0x10c2f38: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x010c28fc: 0x10c28fc: cibyl_sysc_arg 0x11
+// 0x010c2f3c: 0x10c2f3c: cibyl_sysc_arg 0x11
 	ldloc 11
-// 0x010c2900: 0x10c2900: cibyl_sysc_arg 0x4
+// 0x010c2f40: 0x10c2f40: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c2904: 0x10c2904: cibyl_sysc_arg 0x12
+// 0x010c2f44: 0x10c2f44: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x010c2908: 0x10c2908: cibyl_sysc 0x285c
+// 0x010c2f48: 0x10c2f48: cibyl_sysc 0x285c
 	call void [WazeWP7]Syscalls::NOPH_RecordStore_setRecord(int32,int32,int32,int32,int32)
-// 0x010c290c: 0x10c290c: addu  s1, v0, zero
+// 0x010c2f4c: 0x10c2f4c: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-L_10c2910:
-// 0x010c2910: 0x10c2910: lw    ra, 52(sp)
-// 0x010c2914: 0x10c2914: lw    s4, 48(sp)
+L_10c2f50:
+// 0x010c2f50: 0x10c2f50: lw    ra, 52(sp)
+// 0x010c2f54: 0x10c2f54: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5403,7 +5403,7 @@ L_10c2910:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010c2918: 0x10c2918: lw    s3, 44(sp)
+// 0x010c2f58: 0x10c2f58: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5412,7 +5412,7 @@ L_10c2910:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c291c: 0x10c291c: lw    s2, 40(sp)
+// 0x010c2f5c: 0x10c2f5c: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5421,7 +5421,7 @@ L_10c2910:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c2920: 0x10c2920: lw    s1, 36(sp)
+// 0x010c2f60: 0x10c2f60: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5430,7 +5430,7 @@ L_10c2910:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c2924: 0x10c2924: lw    s0, 32(sp)
+// 0x010c2f64: 0x10c2f64: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5439,7 +5439,7 @@ L_10c2910:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c2928: 0x10c2928: jr    ra addiu sp, sp, 56
+// 0x010c2f68: 0x10c2f68: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5451,7 +5451,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 conn_open_10c2930(int32,int32,int32,int32,int32)
+.method public static int32 conn_open_10c2f70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra,int32 ecb,int32 ear)
@@ -5501,23 +5501,23 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2930:
-// 0x010c2930: 0x10c2930: addiu v0, a1, -2
+L_10c2f70:
+// 0x010c2f70: 0x10c2f70: addiu v0, a1, -2
 	ldloc.2
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x010c2934: 0x10c2934: addiu sp, sp, -48
+// 0x010c2f74: 0x10c2f74: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010c2938: 0x10c2938: sltiu v0, v0, 2
+// 0x010c2f78: 0x10c2f78: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x010c293c: 0x10c293c: sw    s1, 36(sp)
+// 0x010c2f7c: 0x10c2f7c: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5526,8 +5526,8 @@ L_10c2930:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c2940: 0x10c2940: sw    ra, 44(sp)
-// 0x010c2944: 0x10c2944: sw    s2, 40(sp)
+// 0x010c2f80: 0x10c2f80: sw    ra, 44(sp)
+// 0x010c2f84: 0x10c2f84: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5536,7 +5536,7 @@ L_10c2930:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c2948: 0x10c2948: sw    s0, 32(sp)
+// 0x010c2f88: 0x10c2f88: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5545,10 +5545,10 @@ L_10c2930:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c294c: 0x10c294c: addu  s1, a0, zero
+// 0x010c2f8c: 0x10c2f8c: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c2950: 0x10c2950: beq   v0, zero, 0x10c2984 sw    zero, 16(sp)
+// 0x010c2f90: 0x10c2f90: beq   v0, zero, 0x10c2fc4 sw    zero, 16(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5558,17 +5558,17 @@ L_10c2930:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10c2984
+	brfalse L_10c2fc4
 // --- basic block ---
-// 0x010c2958: 0x10c2958: cibyl_sysc_arg 0x4
+// 0x010c2f98: 0x10c2f98: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c295c: 0x10c295c: cibyl_sysc 0x2877
+// 0x010c2f9c: 0x10c2f9c: cibyl_sysc 0x2877
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openDataOutputStream(int32)
 	stloc 5
-// 0x010c2960: 0x10c2960: addu  s1, v0, zero
+// 0x010c2fa0: 0x10c2fa0: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010c2964: 0x10c2964: jal   0x1001cb8 addu  a0, s1, zero
+// 0x010c2fa4: 0x10c2fa4: jal   0x1001cb8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5581,31 +5581,31 @@ L_10c2930:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c296c: 0x10c296c: bne   v0, zero, 0x10c2a28 addu  s0, v0, zero
+// 0x010c2fac: 0x10c2fac: bne   v0, zero, 0x10c3068 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10c2a28
+	brtrue L_10c3068
 // --- basic block ---
-// 0x010c2974: 0x10c2974: cibyl_sysc_arg 0x11
+// 0x010c2fb4: 0x10c2fb4: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c2978: 0x10c2978: cibyl_sysc 0x289b
+// 0x010c2fb8: 0x10c2fb8: cibyl_sysc 0x289b
 	call void [WazeWP7]Syscalls::NOPH_OutputStream_close(int32)
-// 0x010c297c: 0x10c297c: j	 0x10c2a28 addu  s1, v0, zero
+// 0x010c2fbc: 0x10c2fbc: j	 0x10c3068 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-	br L_10c2a28
+	br L_10c3068
 // --- basic block ---
-L_10c2984:
-// 0x010c2984: 0x10c2984: lui   a0, 0x0
+L_10c2fc4:
+// 0x010c2fc4: 0x10c2fc4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c2988: 0x10c2988: addiu a0, a0, 19728
+// 0x010c2fc8: 0x10c2fc8: addiu a0, a0, 19728
 	ldloc.1
 	ldc.i4 19728
 	add
 	stloc.1
-// 0x010c298c: 0x10c298c: jal   0x1002450 sw    a1, 24(sp)
+// 0x010c2fcc: 0x10c2fcc: jal   0x1002450 sw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5624,7 +5624,7 @@ L_10c2984:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2994: 0x10c2994: lw    a1, 24(sp)
+// 0x010c2fd4: 0x10c2fd4: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5633,13 +5633,13 @@ L_10c2984:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c2998: 0x10c2998: sll   zero, zero, 0
-// 0x010c299c: 0x10c299c: sltiu a1, a1, 2
+// 0x010c2fd8: 0x10c2fd8: sll   zero, zero, 0
+// 0x010c2fdc: 0x10c2fdc: sltiu a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	clt.un
 	stloc.2
-// 0x010c29a0: 0x10c29a0: lw    s2, 20(v0)
+// 0x010c2fe0: 0x10c2fe0: lw    s2, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5648,18 +5648,18 @@ L_10c2984:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c29a4: 0x10c29a4: bne   a1, zero, 0x10c29c0 addu  s0, v0, zero
+// 0x010c2fe4: 0x10c2fe4: bne   a1, zero, 0x10c3000 addu  s0, v0, zero
 	ldloc.2
 	ldloc 5
 	stloc 9
-	brtrue L_10c29c0
+	brtrue L_10c3000
 // --- basic block ---
-// 0x010c29ac: 0x10c29ac: lui   a0, 0x20000
+// 0x010c2fec: 0x10c2fec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c29b0: 0x10c29b0: jal   0x10001a0 addiu a0, a0, 23492
+// 0x010c2ff0: 0x10c2ff0: jal   0x10001a0 addiu a0, a0, 23952
 	ldloc.1
-	ldc.i4 23492
+	ldc.i4 23952
 	add
 	stloc.1
 	ldloc.0
@@ -5672,7 +5672,7 @@ L_10c2984:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c29b8: 0x10c29b8: jal   0x1000130 addu  a0, v0, zero
+// 0x010c2ff8: 0x10c2ff8: jal   0x1000130 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldsfld object[] [WazeWP7]CRunTime::objectRepository
@@ -5681,17 +5681,17 @@ L_10c2984:
 	castclass [mscorlib]System.Exception
 	throw
 // --- basic block ---
-L_10c29c0:
-// 0x010c29c0: 0x10c29c0: lui   a0, 0x1000000
+L_10c3000:
+// 0x010c3000: 0x10c3000: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c29c4: 0x10c29c4: addiu a0, a0, 264
+// 0x010c3004: 0x10c3004: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c29c8:
-// 0x010c29c8: 0x10c29c8: jal   0x1000120 addiu a1, sp, 16
+L_10c3008:
+// 0x010c3008: 0x10c3008: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5701,39 +5701,39 @@ L_10c29c8:
 	ldloc.2
 	stloc 13
 // --- basic block ---
-// 0x010c29d0: 0x10c29d0: lw    v0, 0(zero)
+// 0x010c3010: 0x10c3010: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c29d4: 0x10c29d4: sll   zero, zero, 0
-// 0x010c29d8: 0x10c29d8: beq   v0, zero, 0x10c29f0 sll   zero, zero, 0
+// 0x010c3014: 0x10c3014: sll   zero, zero, 0
+// 0x010c3018: 0x10c3018: beq   v0, zero, 0x10c3030 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c29f0
+	brfalse L_10c3030
 // --- basic block ---
-// 0x010c29e0: 0x10c29e0: cibyl_sysc_arg 0x11
+// 0x010c3020: 0x10c3020: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c29e4: 0x10c29e4: cibyl_sysc 0x28b3
+// 0x010c3024: 0x10c3024: cibyl_sysc 0x28b3
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openDataInputStream(int32)
 	stloc 5
-// 0x010c29e8: 0x10c29e8: addu  v1, v0, zero
+// 0x010c3028: 0x10c3028: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c29ec: 0x10c29ec: sw    v1, 0(s2)
+// 0x010c302c: 0x10c302c: sw    v1, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10c29f0:
-// 0x010c29f0: 0x10c29f0: sll   zero, zero, 0
-// 0x010c29f4: 0x10c29f4: Unknown instruction 0x0
-L_10c29f4:
-// 0x010c29f8: 0x10c29f8: sll   zero, zero, 0
-// 0x010c29fc: 0x10c29fc: lw    v0, 16(sp)
+L_10c3030:
+// 0x010c3030: 0x10c3030: sll   zero, zero, 0
+// 0x010c3034: 0x10c3034: Unknown instruction 0x0
+L_10c3034:
+// 0x010c3038: 0x10c3038: sll   zero, zero, 0
+// 0x010c303c: 0x10c303c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5742,12 +5742,12 @@ L_10c29f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2a00: 0x10c2a00: sll   zero, zero, 0
-// 0x010c2a04: 0x10c2a04: beq   v0, zero, 0x10c2a1c sll   zero, zero, 0
+// 0x010c3040: 0x10c3040: sll   zero, zero, 0
+// 0x010c3044: 0x10c3044: beq   v0, zero, 0x10c305c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c2a1c
+	brfalse L_10c305c
 // --- basic block ---
-// 0x010c2a0c: 0x10c2a0c: jal   0x1002394 addu  a0, s0, zero
+// 0x010c304c: 0x10c304c: jal   0x1002394 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5760,13 +5760,13 @@ L_10c29f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2a14: 0x10c2a14: j	 0x10c2a28 addu  s0, zero, zero
+// 0x010c3054: 0x10c3054: j	 0x10c3068 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10c2a28
+	br L_10c3068
 // --- basic block ---
-L_10c2a1c:
-// 0x010c2a1c: 0x10c2a1c: jal   0x1001ba8 addu  a0, s1, zero
+L_10c305c:
+// 0x010c305c: 0x10c305c: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5779,7 +5779,7 @@ L_10c2a1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c2a24: 0x10c2a24: sw    v0, 4(s2)
+// 0x010c3064: 0x10c3064: sw    v0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5788,12 +5788,12 @@ L_10c2a1c:
 	add
 	ldloc 5
 	stelem.i4
-L_10c2a28:
-// 0x010c2a28: 0x10c2a28: lw    ra, 44(sp)
-// 0x010c2a2c: 0x10c2a2c: addu  v0, s0, zero
+L_10c3068:
+// 0x010c3068: 0x10c3068: lw    ra, 44(sp)
+// 0x010c306c: 0x10c306c: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x010c2a30: 0x10c2a30: lw    s2, 40(sp)
+// 0x010c3070: 0x10c3070: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5802,7 +5802,7 @@ L_10c2a28:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c2a34: 0x10c2a34: lw    s1, 36(sp)
+// 0x010c3074: 0x10c3074: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5811,7 +5811,7 @@ L_10c2a28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c2a38: 0x10c2a38: lw    s0, 32(sp)
+// 0x010c3078: 0x10c3078: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5820,7 +5820,7 @@ L_10c2a28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c2a3c: 0x10c2a3c: jr    ra addiu sp, sp, 48
+// 0x010c307c: 0x10c307c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5832,7 +5832,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 close_output_10c2a78(int32)
+.method public static int32 close_output_10c30b8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -5855,8 +5855,8 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2a78:
-// 0x010c2a78: 0x10c2a78: lw    v1, 20(a0)
+L_10c30b8:
+// 0x010c30b8: 0x10c30b8: lw    v1, 20(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -5865,23 +5865,23 @@ L_10c2a78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2a7c: 0x10c2a7c: sll   zero, zero, 0
-// 0x010c2a80: 0x10c2a80: lw    a0, 0(v1)
+// 0x010c30bc: 0x10c30bc: sll   zero, zero, 0
+// 0x010c30c0: 0x10c30c0: lw    a0, 0(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x010c2a84: 0x10c2a84: sll   zero, zero, 0
-// 0x010c2a88: 0x10c2a88: cibyl_sysc_arg 0x4
+// 0x010c30c4: 0x10c30c4: sll   zero, zero, 0
+// 0x010c30c8: 0x10c30c8: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c2a8c: 0x10c2a8c: cibyl_sysc 0x28d6
+// 0x010c30cc: 0x10c30cc: cibyl_sysc 0x28d6
 	call void [WazeWP7]Syscalls::NOPH_OutputStream_close(int32)
-// 0x010c2a90: 0x10c2a90: addu  a0, v0, zero
+// 0x010c30d0: 0x10c30d0: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c2a94: 0x10c2a94: lw    v1, 4(v1)
+// 0x010c30d4: 0x10c30d4: lw    v1, 4(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -5890,15 +5890,15 @@ L_10c2a78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2a98: 0x10c2a98: sll   zero, zero, 0
-// 0x010c2a9c: 0x10c2a9c: cibyl_sysc_arg 0x3
+// 0x010c30d8: 0x10c30d8: sll   zero, zero, 0
+// 0x010c30dc: 0x10c30dc: cibyl_sysc_arg 0x3
 	ldloc.1
-// 0x010c2aa0: 0x10c2aa0: cibyl_sysc 0x28ee
+// 0x010c30e0: 0x10c30e0: cibyl_sysc 0x28ee
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c2aa4: 0x10c2aa4: addu  v1, v0, zero
+// 0x010c30e4: 0x10c30e4: addu  v1, v0, zero
 	ldloc.2
 	stloc.1
-// 0x010c2aa8: 0x10c2aa8: jr    ra addu  v0, zero, zero
+// 0x010c30e8: 0x10c30e8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	br __CIBYL_function_return
@@ -5908,7 +5908,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 seek_10c2ab0(int32,int32,int32)
+.method public static int32 seek_10c30f0(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -5937,8 +5937,8 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2ab0:
-// 0x010c2ab0: 0x10c2ab0: lw    v1, 20(a0)
+L_10c30f0:
+// 0x010c30f0: 0x10c30f0: lw    v1, 20(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5947,44 +5947,44 @@ L_10c2ab0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c2ab4: 0x10c2ab4: bgez  a1, 0x10c2b2c addu  a2, a1, zero
+// 0x010c30f4: 0x10c30f4: bgez  a1, 0x10c316c addu  a2, a1, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
 	ldc.i4.s 0
-	bge L_10c2b2c
+	bge L_10c316c
 // --- basic block ---
-// 0x010c2abc: 0x10c2abc: lw    a1, 0(v1)
+// 0x010c30fc: 0x10c30fc: lw    a1, 0(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c2ac0: 0x10c2ac0: sll   zero, zero, 0
-// 0x010c2ac4: 0x10c2ac4: cibyl_sysc_arg 0x5
+// 0x010c3100: 0x10c3100: sll   zero, zero, 0
+// 0x010c3104: 0x10c3104: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c2ac8: 0x10c2ac8: cibyl_sysc 0x28fa
+// 0x010c3108: 0x10c3108: cibyl_sysc 0x28fa
 	call void [WazeWP7]Syscalls::NOPH_InputStream_close(int32)
-// 0x010c2acc: 0x10c2acc: addu  a1, v0, zero
+// 0x010c310c: 0x10c310c: addu  a1, v0, zero
 	ldloc 4
 	stloc.1
-// 0x010c2ad0: 0x10c2ad0: lw    a1, 0(v1)
+// 0x010c3110: 0x10c3110: lw    a1, 0(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c2ad4: 0x10c2ad4: sll   zero, zero, 0
-// 0x010c2ad8: 0x10c2ad8: cibyl_sysc_arg 0x5
+// 0x010c3114: 0x10c3114: sll   zero, zero, 0
+// 0x010c3118: 0x10c3118: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c2adc: 0x10c2adc: cibyl_sysc 0x2911
+// 0x010c311c: 0x10c311c: cibyl_sysc 0x2911
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c2ae0: 0x10c2ae0: addu  a1, v0, zero
+// 0x010c3120: 0x10c3120: addu  a1, v0, zero
 	ldloc 4
 	stloc.1
-// 0x010c2ae4: 0x10c2ae4: lw    a1, 4(v1)
+// 0x010c3124: 0x10c3124: lw    a1, 4(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5993,18 +5993,18 @@ L_10c2ab0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2ae8: 0x10c2ae8: sll   zero, zero, 0
-// 0x010c2aec: 0x10c2aec: cibyl_sysc_arg 0x5
+// 0x010c3128: 0x10c3128: sll   zero, zero, 0
+// 0x010c312c: 0x10c312c: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c2af0: 0x10c2af0: cibyl_sysc 0x291d
+// 0x010c3130: 0x10c3130: cibyl_sysc 0x291d
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c2af4: 0x10c2af4: addu  a1, v0, zero
+// 0x010c3134: 0x10c3134: addu  a1, v0, zero
 	ldloc 4
 	stloc.1
-// 0x010c2af8: 0x10c2af8: addiu a2, zero, 1
+// 0x010c3138: 0x10c3138: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010c2afc: 0x10c2afc: lw    a1, 8(v1)
+// 0x010c313c: 0x10c313c: lw    a1, 8(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6013,18 +6013,18 @@ L_10c2ab0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2b00: 0x10c2b00: sll   zero, zero, 0
-// 0x010c2b04: 0x10c2b04: cibyl_sysc_arg 0x5
+// 0x010c3140: 0x10c3140: sll   zero, zero, 0
+// 0x010c3144: 0x10c3144: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c2b08: 0x10c2b08: cibyl_sysc_arg 0x6
+// 0x010c3148: 0x10c3148: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x010c2b0c: 0x10c2b0c: cibyl_sysc 0x2929
+// 0x010c314c: 0x10c314c: cibyl_sysc 0x2929
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openFileConnection_mode(int32,int32)
 	stloc 4
-// 0x010c2b10: 0x10c2b10: addu  a1, v0, zero
+// 0x010c3150: 0x10c3150: addu  a1, v0, zero
 	ldloc 4
 	stloc.1
-// 0x010c2b14: 0x10c2b14: sw    a1, 4(v1)
+// 0x010c3154: 0x10c3154: sw    a1, 4(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6033,15 +6033,15 @@ L_10c2ab0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010c2b18: 0x10c2b18: cibyl_sysc_arg 0x5
+// 0x010c3158: 0x10c3158: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c2b1c: 0x10c2b1c: cibyl_sysc 0x2950
+// 0x010c315c: 0x10c315c: cibyl_sysc 0x2950
 	call int32 [WazeWP7]Syscalls::NOPH_FileConnection_openInputStream(int32)
 	stloc 4
-// 0x010c2b20: 0x10c2b20: addu  a1, v0, zero
+// 0x010c3160: 0x10c3160: addu  a1, v0, zero
 	ldloc 4
 	stloc.1
-// 0x010c2b24: 0x10c2b24: lw    a2, 12(a0)
+// 0x010c3164: 0x10c3164: lw    a2, 12(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6050,30 +6050,30 @@ L_10c2ab0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c2b28: 0x10c2b28: sw    a1, 0(v1)
+// 0x010c3168: 0x10c3168: sw    a1, 0(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-L_10c2b2c:
-// 0x010c2b2c: 0x10c2b2c: lw    v1, 0(v1)
+L_10c316c:
+// 0x010c316c: 0x10c316c: lw    v1, 0(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010c2b30: 0x10c2b30: sll   zero, zero, 0
-// 0x010c2b34: 0x10c2b34: cibyl_sysc_arg 0x3
+// 0x010c3170: 0x10c3170: sll   zero, zero, 0
+// 0x010c3174: 0x10c3174: cibyl_sysc_arg 0x3
 	ldloc.3
-// 0x010c2b38: 0x10c2b38: cibyl_sysc_arg 0x6
+// 0x010c3178: 0x10c3178: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x010c2b3c: 0x10c2b3c: cibyl_sysc 0x2974
+// 0x010c317c: 0x10c317c: cibyl_sysc 0x2974
 	call int32 [WazeWP7]Syscalls::NOPH_InputStream_skip(int32,int32)
 	stloc 4
-// 0x010c2b40: 0x10c2b40: jr    ra addu  a2, v0, zero
+// 0x010c3180: 0x10c3180: jr    ra addu  a2, v0, zero
 	ldloc 4
 	stloc.2
 	br __CIBYL_function_return
@@ -6083,7 +6083,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 close_dir_10c2b48(int32)
+.method public static int32 close_dir_10c3188(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -6106,8 +6106,8 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2b48:
-// 0x010c2b48: 0x10c2b48: lw    v1, 4(a0)
+L_10c3188:
+// 0x010c3188: 0x10c3188: lw    v1, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -6116,23 +6116,23 @@ L_10c2b48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2b4c: 0x10c2b4c: sll   zero, zero, 0
-// 0x010c2b50: 0x10c2b50: lw    a0, 0(v1)
+// 0x010c318c: 0x10c318c: sll   zero, zero, 0
+// 0x010c3190: 0x10c3190: lw    a0, 0(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x010c2b54: 0x10c2b54: sll   zero, zero, 0
-// 0x010c2b58: 0x10c2b58: cibyl_sysc_arg 0x4
+// 0x010c3194: 0x10c3194: sll   zero, zero, 0
+// 0x010c3198: 0x10c3198: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c2b5c: 0x10c2b5c: cibyl_sysc 0x298a
+// 0x010c319c: 0x10c319c: cibyl_sysc 0x298a
 	call void [WazeWP7]Syscalls::NOPH_FileConnection_close(int32)
-// 0x010c2b60: 0x10c2b60: addu  a0, v0, zero
+// 0x010c31a0: 0x10c31a0: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c2b64: 0x10c2b64: lw    a0, 4(v1)
+// 0x010c31a4: 0x10c31a4: lw    a0, 4(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -6141,30 +6141,30 @@ L_10c2b48:
 	add
 	ldelem.i4
 	stloc.0
-// 0x010c2b68: 0x10c2b68: sll   zero, zero, 0
-// 0x010c2b6c: 0x10c2b6c: cibyl_sysc_arg 0x4
+// 0x010c31a8: 0x10c31a8: sll   zero, zero, 0
+// 0x010c31ac: 0x10c31ac: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010c2b70: 0x10c2b70: cibyl_sysc 0x29a4
+// 0x010c31b0: 0x10c31b0: cibyl_sysc 0x29a4
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c2b74: 0x10c2b74: addu  a0, v0, zero
+// 0x010c31b4: 0x10c31b4: addu  a0, v0, zero
 	ldloc.2
 	stloc.0
-// 0x010c2b78: 0x10c2b78: lw    v1, 0(v1)
+// 0x010c31b8: 0x10c31b8: lw    v1, 0(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c2b7c: 0x10c2b7c: sll   zero, zero, 0
-// 0x010c2b80: 0x10c2b80: cibyl_sysc_arg 0x3
+// 0x010c31bc: 0x10c31bc: sll   zero, zero, 0
+// 0x010c31c0: 0x10c31c0: cibyl_sysc_arg 0x3
 	ldloc.1
-// 0x010c2b84: 0x10c2b84: cibyl_sysc 0x29b0
+// 0x010c31c4: 0x10c31c4: cibyl_sysc 0x29b0
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c2b88: 0x10c2b88: addu  v1, v0, zero
+// 0x010c31c8: 0x10c31c8: addu  v1, v0, zero
 	ldloc.2
 	stloc.1
-// 0x010c2b8c: 0x10c2b8c: jr    ra addu  v0, zero, zero
+// 0x010c31cc: 0x10c31cc: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	br __CIBYL_function_return
@@ -6174,7 +6174,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 register_fs_10c2b94(int32,int32,int32,int32,int32)
+.method public static int32 register_fs_10c31d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6209,30 +6209,30 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2b94:
-// 0x010c2b94: 0x10c2b94: lui   a0, 0x10000
+L_10c31d4:
+// 0x010c31d4: 0x10c31d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010c2b98: 0x10c2b98: lui   a1, 0x0
+// 0x010c31d8: 0x10c31d8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010c2b9c: 0x10c2b9c: addiu sp, sp, -24
+// 0x010c31dc: 0x10c31dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c2ba0: 0x10c2ba0: addiu a0, a0, 3624
+// 0x010c31e0: 0x10c31e0: addiu a0, a0, 3620
 	ldloc.1
-	ldc.i4 3624
+	ldc.i4 3620
 	add
 	stloc.1
-// 0x010c2ba4: 0x10c2ba4: addiu a1, a1, 19768
+// 0x010c31e4: 0x10c31e4: addiu a1, a1, 19768
 	ldloc.2
 	ldc.i4 19768
 	add
 	stloc.2
-// 0x010c2ba8: 0x10c2ba8: sw    ra, 20(sp)
-// 0x010c2bac: 0x10c2bac: jal   0x100279c addiu a2, zero, 1
+// 0x010c31e8: 0x10c31e8: sw    ra, 20(sp)
+// 0x010c31ec: 0x10c31ec: jal   0x100279c addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -6245,9 +6245,9 @@ L_10c2b94:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010c2bb4: 0x10c2bb4: lw    ra, 20(sp)
-// 0x010c2bb8: 0x10c2bb8: sll   zero, zero, 0
-// 0x010c2bbc: 0x10c2bbc: jr    ra addiu sp, sp, 24
+// 0x010c31f4: 0x10c31f4: lw    ra, 20(sp)
+// 0x010c31f8: 0x10c31f8: sll   zero, zero, 0
+// 0x010c31fc: 0x10c31fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6259,7 +6259,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 read_dir_10c2bc4(int32,int32,int32,int32,int32)
+.method public static int32 read_dir_10c3204(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra,int32 ecb,int32 ear)
@@ -6306,13 +6306,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2bc4:
-// 0x010c2bc4: 0x10c2bc4: addiu sp, sp, -40
+L_10c3204:
+// 0x010c3204: 0x10c3204: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010c2bc8: 0x10c2bc8: sw    s0, 28(sp)
+// 0x010c3208: 0x10c3208: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6321,7 +6321,7 @@ L_10c2bc4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c2bcc: 0x10c2bcc: lw    s0, 4(a0)
+// 0x010c320c: 0x10c320c: lw    s0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6330,7 +6330,7 @@ L_10c2bc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c2bd0: 0x10c2bd0: sw    zero, 16(sp)
+// 0x010c3210: 0x10c3210: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6339,7 +6339,7 @@ L_10c2bc4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c2bd4: 0x10c2bd4: sw    s1, 32(sp)
+// 0x010c3214: 0x10c3214: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6348,11 +6348,11 @@ L_10c2bc4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c2bd8: 0x10c2bd8: sw    ra, 36(sp)
-// 0x010c2bdc: 0x10c2bdc: addu  s1, a1, zero
+// 0x010c3218: 0x10c3218: sw    ra, 36(sp)
+// 0x010c321c: 0x10c321c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x010c2be0: 0x10c2be0: lw    v1, 4(s0)
+// 0x010c3220: 0x10c3220: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6361,31 +6361,31 @@ L_10c2bc4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2be4: 0x10c2be4: sll   zero, zero, 0
-// 0x010c2be8: 0x10c2be8: cibyl_sysc_arg 0x3
+// 0x010c3224: 0x10c3224: sll   zero, zero, 0
+// 0x010c3228: 0x10c3228: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2bec: 0x10c2bec: cibyl_sysc 0x29bc
+// 0x010c322c: 0x10c322c: cibyl_sysc 0x29bc
 	call int32 [WazeWP7]Syscalls::NOPH_Enumeration_hasMoreElements(int32)
 	stloc 5
-// 0x010c2bf0: 0x10c2bf0: addu  v1, v0, zero
+// 0x010c3230: 0x10c3230: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c2bf4: 0x10c2bf4: beq   v1, zero, 0x10c2c7c addiu v0, zero, -1
+// 0x010c3234: 0x10c3234: beq   v1, zero, 0x10c32bc addiu v0, zero, -1
 	ldloc 7
 	ldc.i4.m1
 	stloc 5
-	brfalse L_10c2c7c
+	brfalse L_10c32bc
 // --- basic block ---
-// 0x010c2bfc: 0x10c2bfc: lui   a0, 0x1000000
+// 0x010c323c: 0x10c323c: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c2c00: 0x10c2c00: addiu a0, a0, 264
+// 0x010c3240: 0x10c3240: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c2c04:
-// 0x010c2c04: 0x10c2c04: jal   0x1000120 addiu a1, sp, 16
+L_10c3244:
+// 0x010c3244: 0x10c3244: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6395,21 +6395,21 @@ L_10c2c04:
 	ldloc.2
 	stloc 12
 // --- basic block ---
-// 0x010c2c0c: 0x10c2c0c: lw    v0, 0(zero)
+// 0x010c324c: 0x10c324c: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c2c10: 0x10c2c10: sll   zero, zero, 0
-// 0x010c2c14: 0x10c2c14: beq   v0, zero, 0x10c2c34 addiu v1, zero, -1
+// 0x010c3250: 0x10c3250: sll   zero, zero, 0
+// 0x010c3254: 0x10c3254: beq   v0, zero, 0x10c3274 addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 7
-	brfalse L_10c2c34
+	brfalse L_10c3274
 // --- basic block ---
-// 0x010c2c1c: 0x10c2c1c: lw    v1, 4(s0)
+// 0x010c325c: 0x10c325c: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6418,16 +6418,16 @@ L_10c2c04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2c20: 0x10c2c20: sll   zero, zero, 0
-// 0x010c2c24: 0x10c2c24: cibyl_sysc_arg 0x3
+// 0x010c3260: 0x10c3260: sll   zero, zero, 0
+// 0x010c3264: 0x10c3264: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2c28: 0x10c2c28: cibyl_sysc 0x29dd
+// 0x010c3268: 0x10c3268: cibyl_sysc 0x29dd
 	call int32 [WazeWP7]Syscalls::NOPH_Enumeration_nextElement(int32)
 	stloc 5
-// 0x010c2c2c: 0x10c2c2c: addu  v1, v0, zero
+// 0x010c326c: 0x10c326c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c2c30: 0x10c2c30: sw    zero, 16(sp)
+// 0x010c3270: 0x10c3270: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6436,12 +6436,12 @@ L_10c2c04:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10c2c34:
-// 0x010c2c34: 0x10c2c34: sll   zero, zero, 0
-// 0x010c2c38: 0x10c2c38: Unknown instruction 0x0
-L_10c2c38:
-// 0x010c2c3c: 0x10c2c3c: sll   zero, zero, 0
-// 0x010c2c40: 0x10c2c40: lw    v0, 16(sp)
+L_10c3274:
+// 0x010c3274: 0x10c3274: sll   zero, zero, 0
+// 0x010c3278: 0x10c3278: Unknown instruction 0x0
+L_10c3278:
+// 0x010c327c: 0x10c327c: sll   zero, zero, 0
+// 0x010c3280: 0x10c3280: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6450,44 +6450,44 @@ L_10c2c38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2c44: 0x10c2c44: sll   zero, zero, 0
-// 0x010c2c48: 0x10c2c48: bne   v0, zero, 0x10c2c78 addiu a0, zero, 256
+// 0x010c3284: 0x10c3284: sll   zero, zero, 0
+// 0x010c3288: 0x10c3288: bne   v0, zero, 0x10c32b8 addiu a0, zero, 256
 	ldloc 5
 	ldc.i4 256
 	stloc.1
-	brtrue L_10c2c78
+	brtrue L_10c32b8
 // --- basic block ---
-// 0x010c2c50: 0x10c2c50: cibyl_sysc_arg 0x3
+// 0x010c3290: 0x10c3290: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2c54: 0x10c2c54: cibyl_sysc_arg 0x11
+// 0x010c3294: 0x10c3294: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x010c2c58: 0x10c2c58: cibyl_sysc_arg 0x4
+// 0x010c3298: 0x10c3298: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c2c5c: 0x10c2c5c: cibyl_sysc 0x29fa
+// 0x010c329c: 0x10c329c: cibyl_sysc 0x29fa
 	call int32 [WazeWP7]Syscalls::NOPH_String_toCharPtr(int32,int32,int32)
 	stloc 5
-// 0x010c2c60: 0x10c2c60: addu  s1, v0, zero
+// 0x010c32a0: 0x10c32a0: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010c2c64: 0x10c2c64: cibyl_sysc_arg 0x3
+// 0x010c32a4: 0x10c32a4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2c68: 0x10c2c68: cibyl_sysc 0x2a10
+// 0x010c32a8: 0x10c32a8: cibyl_sysc 0x2a10
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c2c6c: 0x10c2c6c: addu  v1, v0, zero
+// 0x010c32ac: 0x10c32ac: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c2c70: 0x10c2c70: j	 0x10c2c7c addu  v0, zero, zero
+// 0x010c32b0: 0x10c32b0: j	 0x10c32bc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10c2c7c
+	br L_10c32bc
 // --- basic block ---
-L_10c2c78:
-// 0x010c2c78: 0x10c2c78: addiu v0, zero, -1
+L_10c32b8:
+// 0x010c32b8: 0x10c32b8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_10c2c7c:
-// 0x010c2c7c: 0x10c2c7c: lw    ra, 36(sp)
-// 0x010c2c80: 0x10c2c80: lw    s1, 32(sp)
+L_10c32bc:
+// 0x010c32bc: 0x10c32bc: lw    ra, 36(sp)
+// 0x010c32c0: 0x10c32c0: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6496,7 +6496,7 @@ L_10c2c7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c2c84: 0x10c2c84: lw    s0, 28(sp)
+// 0x010c32c4: 0x10c32c4: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6505,7 +6505,7 @@ L_10c2c7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c2c88: 0x10c2c88: jr    ra addiu sp, sp, 40
+// 0x010c32c8: 0x10c32c8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6517,7 +6517,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 remove_dir_10c2c90(int32,int32,int32,int32,int32)
+.method public static int32 remove_dir_10c32d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra,int32 ecb,int32 ear)
@@ -6561,13 +6561,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2c90:
-// 0x010c2c90: 0x10c2c90: addiu sp, sp, -32
+L_10c32d0:
+// 0x010c32d0: 0x10c32d0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c2c94: 0x10c2c94: sw    s0, 24(sp)
+// 0x010c32d4: 0x10c32d4: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6576,8 +6576,8 @@ L_10c2c90:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c2c98: 0x10c2c98: sw    ra, 28(sp)
-// 0x010c2c9c: 0x10c2c9c: sw    zero, 16(sp)
+// 0x010c32d8: 0x10c32d8: sw    ra, 28(sp)
+// 0x010c32dc: 0x10c32dc: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6586,19 +6586,19 @@ L_10c2c90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c2ca0: 0x10c2ca0: addu  s0, a0, zero
+// 0x010c32e0: 0x10c32e0: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010c2ca4: 0x10c2ca4: lui   a0, 0x1000000
+// 0x010c32e4: 0x10c32e4: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c2ca8: 0x10c2ca8: addiu a0, a0, 264
+// 0x010c32e8: 0x10c32e8: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c2cac:
-// 0x010c2cac: 0x10c2cac: jal   0x1000120 addiu a1, sp, 16
+L_10c32ec:
+// 0x010c32ec: 0x10c32ec: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6608,43 +6608,43 @@ L_10c2cac:
 	ldloc.2
 	stloc 11
 // --- basic block ---
-// 0x010c2cb4: 0x10c2cb4: lw    v0, 0(zero)
+// 0x010c32f4: 0x10c32f4: lw    v0, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c2cb8: 0x10c2cb8: sll   zero, zero, 0
-// 0x010c2cbc: 0x10c2cbc: beq   v0, zero, 0x10c2ce0 addiu v1, zero, 3
+// 0x010c32f8: 0x10c32f8: sll   zero, zero, 0
+// 0x010c32fc: 0x10c32fc: beq   v0, zero, 0x10c3320 addiu v1, zero, 3
 	ldloc 5
 	ldc.i4.3
 	stloc 8
-	brfalse L_10c2ce0
+	brfalse L_10c3320
 // --- basic block ---
-// 0x010c2cc4: 0x10c2cc4: cibyl_sysc_arg 0x10
+// 0x010c3304: 0x10c3304: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x010c2cc8: 0x10c2cc8: cibyl_sysc_arg 0x3
+// 0x010c3308: 0x10c3308: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x010c2ccc: 0x10c2ccc: cibyl_sysc 0x2a1c
+// 0x010c330c: 0x10c330c: cibyl_sysc 0x2a1c
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openFileConnection_mode(int32,int32)
 	stloc 5
-// 0x010c2cd0: 0x10c2cd0: addu  s0, v0, zero
+// 0x010c3310: 0x10c3310: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c2cd4: 0x10c2cd4: cibyl_sysc_arg 0x10
+// 0x010c3314: 0x10c3314: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x010c2cd8: 0x10c2cd8: cibyl_sysc 0x2a43
+// 0x010c3318: 0x10c3318: cibyl_sysc 0x2a43
 	call void [WazeWP7]Syscalls::NOPH_FileConnection_delete(int32)
-// 0x010c2cdc: 0x10c2cdc: addu  s0, v0, zero
+// 0x010c331c: 0x10c331c: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-L_10c2ce0:
-// 0x010c2ce0: 0x10c2ce0: sll   zero, zero, 0
-// 0x010c2ce4: 0x10c2ce4: Unknown instruction 0x0
-L_10c2ce4:
-// 0x010c2ce8: 0x10c2ce8: sll   zero, zero, 0
-// 0x010c2cec: 0x10c2cec: lw    v0, 16(sp)
+L_10c3320:
+// 0x010c3320: 0x10c3320: sll   zero, zero, 0
+// 0x010c3324: 0x10c3324: Unknown instruction 0x0
+L_10c3324:
+// 0x010c3328: 0x10c3328: sll   zero, zero, 0
+// 0x010c332c: 0x10c332c: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6653,17 +6653,17 @@ L_10c2ce4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2cf0: 0x10c2cf0: lw    ra, 28(sp)
-// 0x010c2cf4: 0x10c2cf4: sltu  v0, zero, v0
+// 0x010c3330: 0x10c3330: lw    ra, 28(sp)
+// 0x010c3334: 0x10c3334: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010c2cf8: 0x10c2cf8: subu  v0, zero, v0
+// 0x010c3338: 0x10c3338: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x010c2cfc: 0x10c2cfc: lw    s0, 24(sp)
+// 0x010c333c: 0x10c333c: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6672,7 +6672,7 @@ L_10c2ce4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c2d00: 0x10c2d00: jr    ra addiu sp, sp, 32
+// 0x010c3340: 0x10c3340: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6684,7 +6684,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 make_dir_10c2d08(int32,int32,int32,int32,int32)
+.method public static int32 make_dir_10c3348(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra,int32 ecb,int32 ear)
@@ -6728,13 +6728,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2d08:
-// 0x010c2d08: 0x10c2d08: addiu sp, sp, -32
+L_10c3348:
+// 0x010c3348: 0x10c3348: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c2d0c: 0x10c2d0c: sw    s0, 24(sp)
+// 0x010c334c: 0x10c334c: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6743,8 +6743,8 @@ L_10c2d08:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c2d10: 0x10c2d10: sw    ra, 28(sp)
-// 0x010c2d14: 0x10c2d14: sw    zero, 16(sp)
+// 0x010c3350: 0x10c3350: sw    ra, 28(sp)
+// 0x010c3354: 0x10c3354: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6753,19 +6753,19 @@ L_10c2d08:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c2d18: 0x10c2d18: addu  s0, a0, zero
+// 0x010c3358: 0x10c3358: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010c2d1c: 0x10c2d1c: lui   a0, 0x1000000
+// 0x010c335c: 0x10c335c: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c2d20: 0x10c2d20: addiu a0, a0, 264
+// 0x010c3360: 0x10c3360: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c2d24:
-// 0x010c2d24: 0x10c2d24: jal   0x1000120 addiu a1, sp, 16
+L_10c3364:
+// 0x010c3364: 0x10c3364: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6775,43 +6775,43 @@ L_10c2d24:
 	ldloc.2
 	stloc 11
 // --- basic block ---
-// 0x010c2d2c: 0x10c2d2c: lw    v0, 0(zero)
+// 0x010c336c: 0x10c336c: lw    v0, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c2d30: 0x10c2d30: sll   zero, zero, 0
-// 0x010c2d34: 0x10c2d34: beq   v0, zero, 0x10c2d58 addiu v1, zero, 3
+// 0x010c3370: 0x10c3370: sll   zero, zero, 0
+// 0x010c3374: 0x10c3374: beq   v0, zero, 0x10c3398 addiu v1, zero, 3
 	ldloc 5
 	ldc.i4.3
 	stloc 8
-	brfalse L_10c2d58
+	brfalse L_10c3398
 // --- basic block ---
-// 0x010c2d3c: 0x10c2d3c: cibyl_sysc_arg 0x10
+// 0x010c337c: 0x10c337c: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x010c2d40: 0x10c2d40: cibyl_sysc_arg 0x3
+// 0x010c3380: 0x10c3380: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x010c2d44: 0x10c2d44: cibyl_sysc 0x2a5e
+// 0x010c3384: 0x10c3384: cibyl_sysc 0x2a5e
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openFileConnection_mode(int32,int32)
 	stloc 5
-// 0x010c2d48: 0x10c2d48: addu  s0, v0, zero
+// 0x010c3388: 0x10c3388: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c2d4c: 0x10c2d4c: cibyl_sysc_arg 0x10
+// 0x010c338c: 0x10c338c: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x010c2d50: 0x10c2d50: cibyl_sysc 0x2a85
+// 0x010c3390: 0x10c3390: cibyl_sysc 0x2a85
 	call void [WazeWP7]Syscalls::NOPH_FileConnection_mkdir(int32)
-// 0x010c2d54: 0x10c2d54: addu  s0, v0, zero
+// 0x010c3394: 0x10c3394: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-L_10c2d58:
-// 0x010c2d58: 0x10c2d58: sll   zero, zero, 0
-// 0x010c2d5c: 0x10c2d5c: Unknown instruction 0x0
-L_10c2d5c:
-// 0x010c2d60: 0x10c2d60: sll   zero, zero, 0
-// 0x010c2d64: 0x10c2d64: lw    v0, 16(sp)
+L_10c3398:
+// 0x010c3398: 0x10c3398: sll   zero, zero, 0
+// 0x010c339c: 0x10c339c: Unknown instruction 0x0
+L_10c339c:
+// 0x010c33a0: 0x10c33a0: sll   zero, zero, 0
+// 0x010c33a4: 0x10c33a4: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6820,17 +6820,17 @@ L_10c2d5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c2d68: 0x10c2d68: lw    ra, 28(sp)
-// 0x010c2d6c: 0x10c2d6c: sltu  v0, zero, v0
+// 0x010c33a8: 0x10c33a8: lw    ra, 28(sp)
+// 0x010c33ac: 0x10c33ac: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010c2d70: 0x10c2d70: subu  v0, zero, v0
+// 0x010c33b0: 0x10c33b0: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x010c2d74: 0x10c2d74: lw    s0, 24(sp)
+// 0x010c33b4: 0x10c33b4: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6839,7 +6839,7 @@ L_10c2d5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c2d78: 0x10c2d78: jr    ra addiu sp, sp, 32
+// 0x010c33b8: 0x10c33b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6851,7 +6851,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 open_dir_10c2d80(int32,int32,int32,int32,int32)
+.method public static int32 open_dir_10c33c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 s2,int32 s3,int32 ra,int32 ecb,int32 ear)
@@ -6904,13 +6904,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2d80:
-// 0x010c2d80: 0x10c2d80: addiu sp, sp, -48
+L_10c33c0:
+// 0x010c33c0: 0x10c33c0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010c2d84: 0x10c2d84: sw    s0, 28(sp)
+// 0x010c33c4: 0x10c33c4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6919,8 +6919,8 @@ L_10c2d80:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c2d88: 0x10c2d88: sw    ra, 44(sp)
-// 0x010c2d8c: 0x10c2d8c: sw    s3, 40(sp)
+// 0x010c33c8: 0x10c33c8: sw    ra, 44(sp)
+// 0x010c33cc: 0x10c33cc: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6929,7 +6929,7 @@ L_10c2d80:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c2d90: 0x10c2d90: sw    s2, 36(sp)
+// 0x010c33d0: 0x10c33d0: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6938,7 +6938,7 @@ L_10c2d80:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c2d94: 0x10c2d94: sw    s1, 32(sp)
+// 0x010c33d4: 0x10c33d4: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6947,7 +6947,7 @@ L_10c2d80:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c2d98: 0x10c2d98: sw    zero, 16(sp)
+// 0x010c33d8: 0x10c33d8: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6956,19 +6956,19 @@ L_10c2d80:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c2d9c: 0x10c2d9c: addu  s0, a0, zero
+// 0x010c33dc: 0x10c33dc: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c2da0: 0x10c2da0: lui   a0, 0x1000000
+// 0x010c33e0: 0x10c33e0: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c2da4: 0x10c2da4: addiu a0, a0, 264
+// 0x010c33e4: 0x10c33e4: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c2da8:
-// 0x010c2da8: 0x10c2da8: jal   0x1000120 addiu a1, sp, 16
+L_10c33e8:
+// 0x010c33e8: 0x10c33e8: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6978,34 +6978,34 @@ L_10c2da8:
 	ldloc.2
 	stloc 14
 // --- basic block ---
-// 0x010c2db0: 0x10c2db0: lw    v0, 0(zero)
+// 0x010c33f0: 0x10c33f0: lw    v0, 0(zero)
 	ldloc 5
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010c2db4: 0x10c2db4: sll   zero, zero, 0
-// 0x010c2db8: 0x10c2db8: beq   v0, zero, 0x10c2dd8 addiu s1, zero, -1
+// 0x010c33f4: 0x10c33f4: sll   zero, zero, 0
+// 0x010c33f8: 0x10c33f8: beq   v0, zero, 0x10c3418 addiu s1, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 7
-	brfalse L_10c2dd8
+	brfalse L_10c3418
 // --- basic block ---
-// 0x010c2dc0: 0x10c2dc0: addiu s1, zero, 1
+// 0x010c3400: 0x10c3400: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010c2dc4: 0x10c2dc4: cibyl_sysc_arg 0x10
+// 0x010c3404: 0x10c3404: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010c2dc8: 0x10c2dc8: cibyl_sysc_arg 0x11
+// 0x010c3408: 0x10c3408: cibyl_sysc_arg 0x11
 	ldloc 7
-// 0x010c2dcc: 0x10c2dcc: cibyl_sysc 0x2a9f
+// 0x010c340c: 0x10c340c: cibyl_sysc 0x2a9f
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openFileConnection_mode(int32,int32)
 	stloc 6
-// 0x010c2dd0: 0x10c2dd0: addu  s1, v0, zero
+// 0x010c3410: 0x10c3410: addu  s1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x010c2dd4: 0x10c2dd4: sw    zero, 16(sp)
+// 0x010c3414: 0x10c3414: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7014,12 +7014,12 @@ L_10c2da8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10c2dd8:
-// 0x010c2dd8: 0x10c2dd8: sll   zero, zero, 0
-// 0x010c2ddc: 0x10c2ddc: Unknown instruction 0x0
-L_10c2ddc:
-// 0x010c2de0: 0x10c2de0: sll   zero, zero, 0
-// 0x010c2de4: 0x10c2de4: lw    s3, 16(sp)
+L_10c3418:
+// 0x010c3418: 0x10c3418: sll   zero, zero, 0
+// 0x010c341c: 0x10c341c: Unknown instruction 0x0
+L_10c341c:
+// 0x010c3420: 0x10c3420: sll   zero, zero, 0
+// 0x010c3424: 0x10c3424: lw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7028,17 +7028,17 @@ L_10c2ddc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c2de8: 0x10c2de8: sll   zero, zero, 0
-// 0x010c2dec: 0x10c2dec: bne   s3, zero, 0x10c2e74 addu  s0, zero, zero
+// 0x010c3428: 0x10c3428: sll   zero, zero, 0
+// 0x010c342c: 0x10c342c: bne   s3, zero, 0x10c34b4 addu  s0, zero, zero
 	ldloc 11
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_10c2e74
+	brtrue L_10c34b4
 // --- basic block ---
-// 0x010c2df4: 0x10c2df4: lui   a0, 0x0
+// 0x010c3434: 0x10c3434: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c2df8: 0x10c2df8: jal   0x10023f0 addiu a0, a0, 19768
+// 0x010c3438: 0x10c3438: jal   0x10023f0 addiu a0, a0, 19768
 	ldloc.1
 	ldc.i4 19768
 	add
@@ -7053,7 +7053,7 @@ L_10c2ddc:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010c2e00: 0x10c2e00: lw    s2, 4(v0)
+// 0x010c3440: 0x10c3440: lw    s2, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7062,26 +7062,26 @@ L_10c2ddc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c2e04: 0x10c2e04: addu  s0, v0, zero
+// 0x010c3444: 0x10c3444: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010c2e08: 0x10c2e08: sw    s1, 0(s2)
+// 0x010c3448: 0x10c3448: sw    s1, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010c2e0c: 0x10c2e0c: lui   a0, 0x1000000
+// 0x010c344c: 0x10c344c: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c2e10: 0x10c2e10: addiu a0, a0, 264
+// 0x010c3450: 0x10c3450: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c2e14:
-// 0x010c2e14: 0x10c2e14: jal   0x1000120 addiu a1, sp, 16
+L_10c3454:
+// 0x010c3454: 0x10c3454: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -7091,27 +7091,27 @@ L_10c2e14:
 	ldloc.2
 	stloc 14
 // --- basic block ---
-// 0x010c2e1c: 0x10c2e1c: lw    v0, 0(s3)
+// 0x010c345c: 0x10c345c: lw    v0, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010c2e20: 0x10c2e20: sll   zero, zero, 0
-// 0x010c2e24: 0x10c2e24: beq   v0, zero, 0x10c2e40 sll   zero, zero, 0
+// 0x010c3460: 0x10c3460: sll   zero, zero, 0
+// 0x010c3464: 0x10c3464: beq   v0, zero, 0x10c3480 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10c2e40
+	brfalse L_10c3480
 // --- basic block ---
-// 0x010c2e2c: 0x10c2e2c: cibyl_sysc_arg 0x11
+// 0x010c346c: 0x10c346c: cibyl_sysc_arg 0x11
 	ldloc 7
-// 0x010c2e30: 0x10c2e30: cibyl_sysc 0x2ac6
+// 0x010c3470: 0x10c3470: cibyl_sysc 0x2ac6
 	call int32 [WazeWP7]Syscalls::NOPH_FileConnection_list(int32)
 	stloc 6
-// 0x010c2e34: 0x10c2e34: addu  v1, v0, zero
+// 0x010c3474: 0x10c3474: addu  v1, v0, zero
 	ldloc 6
 	stloc 9
-// 0x010c2e38: 0x10c2e38: sw    v1, 4(s2)
+// 0x010c3478: 0x10c3478: sw    v1, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7120,7 +7120,7 @@ L_10c2e14:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c2e3c: 0x10c2e3c: sw    zero, 16(sp)
+// 0x010c347c: 0x10c347c: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7129,12 +7129,12 @@ L_10c2e14:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10c2e40:
-// 0x010c2e40: 0x10c2e40: sll   zero, zero, 0
-// 0x010c2e44: 0x10c2e44: Unknown instruction 0x0
-L_10c2e44:
-// 0x010c2e48: 0x10c2e48: sll   zero, zero, 0
-// 0x010c2e4c: 0x10c2e4c: lw    v0, 16(sp)
+L_10c3480:
+// 0x010c3480: 0x10c3480: sll   zero, zero, 0
+// 0x010c3484: 0x10c3484: Unknown instruction 0x0
+L_10c3484:
+// 0x010c3488: 0x10c3488: sll   zero, zero, 0
+// 0x010c348c: 0x10c348c: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7143,12 +7143,12 @@ L_10c2e44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c2e50: 0x10c2e50: sll   zero, zero, 0
-// 0x010c2e54: 0x10c2e54: beq   v0, zero, 0x10c2e74 sll   zero, zero, 0
+// 0x010c3490: 0x10c3490: sll   zero, zero, 0
+// 0x010c3494: 0x10c3494: beq   v0, zero, 0x10c34b4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10c2e74
+	brfalse L_10c34b4
 // --- basic block ---
-// 0x010c2e5c: 0x10c2e5c: jal   0x1002374 addu  a0, s0, zero
+// 0x010c349c: 0x10c349c: jal   0x1002374 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7161,22 +7161,22 @@ L_10c2e44:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010c2e64: 0x10c2e64: cibyl_sysc_arg 0x11
+// 0x010c34a4: 0x10c34a4: cibyl_sysc_arg 0x11
 	ldloc 7
-// 0x010c2e68: 0x10c2e68: cibyl_sysc 0x2adf
+// 0x010c34a8: 0x10c34a8: cibyl_sysc 0x2adf
 	call void [WazeWP7]Syscalls::NOPH_FileConnection_close(int32)
-// 0x010c2e6c: 0x10c2e6c: addu  s1, v0, zero
+// 0x010c34ac: 0x10c34ac: addu  s1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x010c2e70: 0x10c2e70: addu  s0, zero, zero
+// 0x010c34b0: 0x10c34b0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_10c2e74:
-// 0x010c2e74: 0x10c2e74: lw    ra, 44(sp)
-// 0x010c2e78: 0x10c2e78: addu  v0, s0, zero
+L_10c34b4:
+// 0x010c34b4: 0x10c34b4: lw    ra, 44(sp)
+// 0x010c34b8: 0x10c34b8: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x010c2e7c: 0x10c2e7c: lw    s3, 40(sp)
+// 0x010c34bc: 0x10c34bc: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7185,7 +7185,7 @@ L_10c2e74:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c2e80: 0x10c2e80: lw    s2, 36(sp)
+// 0x010c34c0: 0x10c34c0: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7194,7 +7194,7 @@ L_10c2e74:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c2e84: 0x10c2e84: lw    s1, 32(sp)
+// 0x010c34c4: 0x10c34c4: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7203,7 +7203,7 @@ L_10c2e74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2e88: 0x10c2e88: lw    s0, 28(sp)
+// 0x010c34c8: 0x10c34c8: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7212,7 +7212,7 @@ L_10c2e74:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c2e8c: 0x10c2e8c: jr    ra addiu sp, sp, 48
+// 0x010c34cc: 0x10c34cc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
diff --git a/converted/Cibyl145.j b/converted/Cibyl145.j
index 4426daf..a972cd2 100644
--- a/converted/Cibyl145.j
+++ b/converted/Cibyl145.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl145::.ctor
 
-.method public static int32 fileconnection_register_fs_10c2e94(int32,int32,int32,int32,int32)
+.method public static int32 fileconnection_register_fs_10c34d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra,int32 t0,int32 t1)
@@ -82,27 +82,27 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2e94:
-// 0x010c2e94: 0x10c2e94: lui   a0, 0x0
+L_10c34d4:
+// 0x010c34d4: 0x10c34d4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c2e98: 0x10c2e98: addiu a0, a0, 19880
+// 0x010c34d8: 0x10c34d8: addiu a0, a0, 19880
 	ldloc.1
 	ldc.i4 19880
 	add
 	stloc.1
-// 0x010c2e9c: 0x10c2e9c: lui   a1, 0x0
+// 0x010c34dc: 0x10c34dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010c2ea0: 0x10c2ea0: lui   v0, 0x0
+// 0x010c34e0: 0x10c34e0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010c2ea4: 0x10c2ea4: addiu v0, v0, 19800
+// 0x010c34e4: 0x10c34e4: addiu v0, v0, 19800
 	ldloc 6
 	ldc.i4 19800
 	add
 	stloc 6
-// 0x010c2ea8: 0x10c2ea8: lw    v1, 24(a0)
+// 0x010c34e8: 0x10c34e8: lw    v1, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -111,7 +111,7 @@ L_10c2e94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c2eac: 0x10c2eac: lw    t1, 48(a1)
+// 0x010c34ec: 0x10c34ec: lw    t1, 48(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -120,7 +120,7 @@ L_10c2e94:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c2eb0: 0x10c2eb0: lw    a3, 20(a0)
+// 0x010c34f0: 0x10c34f0: lw    a3, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -129,30 +129,30 @@ L_10c2e94:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c2eb4: 0x10c2eb4: lui   a0, 0x10000
+// 0x010c34f4: 0x10c34f4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010c2eb8: 0x10c2eb8: addiu sp, sp, -24
+// 0x010c34f8: 0x10c34f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c2ebc: 0x10c2ebc: lui   t0, 0x0
+// 0x010c34fc: 0x10c34fc: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010c2ec0: 0x10c2ec0: addiu a0, a0, 3624
+// 0x010c3500: 0x10c3500: addiu a0, a0, 3620
 	ldloc.1
-	ldc.i4 3624
+	ldc.i4 3620
 	add
 	stloc.1
-// 0x010c2ec4: 0x10c2ec4: addu  a1, v0, zero
+// 0x010c3504: 0x10c3504: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x010c2ec8: 0x10c2ec8: addiu a2, zero, 1
+// 0x010c3508: 0x10c3508: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010c2ecc: 0x10c2ecc: sw    ra, 20(sp)
-// 0x010c2ed0: 0x10c2ed0: sw    t1, 19864(t0)
+// 0x010c350c: 0x10c350c: sw    ra, 20(sp)
+// 0x010c3510: 0x10c3510: sw    t1, 19864(t0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -161,7 +161,7 @@ L_10c2e94:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c2ed4: 0x10c2ed4: sw    a3, 20(v0)
+// 0x010c3514: 0x10c3514: sw    a3, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -170,7 +170,7 @@ L_10c2e94:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010c2ed8: 0x10c2ed8: jal   0x10027d4 sw    v1, 24(v0)
+// 0x010c3518: 0x10c3518: jal   0x10027d4 sw    v1, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -189,9 +189,9 @@ L_10c2e94:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c2ee0: 0x10c2ee0: lw    ra, 20(sp)
-// 0x010c2ee4: 0x10c2ee4: sll   zero, zero, 0
-// 0x010c2ee8: 0x10c2ee8: jr    ra addiu sp, sp, 24
+// 0x010c3520: 0x10c3520: lw    ra, 20(sp)
+// 0x010c3524: 0x10c3524: sll   zero, zero, 0
+// 0x010c3528: 0x10c3528: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -203,7 +203,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 close_10c2ef0(int32,int32,int32,int32,int32)
+.method public static int32 close_10c3530(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -238,8 +238,8 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c2ef0:
-// 0x010c2ef0: 0x10c2ef0: lw    v1, 20(a0)
+L_10c3530:
+// 0x010c3530: 0x10c3530: lw    v1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -248,28 +248,28 @@ L_10c2ef0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c2ef4: 0x10c2ef4: addiu sp, sp, -24
+// 0x010c3534: 0x10c3534: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c2ef8: 0x10c2ef8: sw    ra, 20(sp)
-// 0x010c2efc: 0x10c2efc: lw    a0, 0(v1)
+// 0x010c3538: 0x10c3538: sw    ra, 20(sp)
+// 0x010c353c: 0x10c353c: lw    a0, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c2f00: 0x10c2f00: sll   zero, zero, 0
-// 0x010c2f04: 0x10c2f04: cibyl_sysc_arg 0x4
+// 0x010c3540: 0x10c3540: sll   zero, zero, 0
+// 0x010c3544: 0x10c3544: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c2f08: 0x10c2f08: cibyl_sysc 0x2af9
+// 0x010c3548: 0x10c3548: cibyl_sysc 0x2af9
 	call void [WazeWP7]Syscalls::NOPH_InputStream_close(int32)
-// 0x010c2f0c: 0x10c2f0c: addu  a0, v0, zero
+// 0x010c354c: 0x10c354c: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x010c2f10: 0x10c2f10: lw    a0, 4(v1)
+// 0x010c3550: 0x10c3550: lw    a0, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -278,15 +278,15 @@ L_10c2ef0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2f14: 0x10c2f14: sll   zero, zero, 0
-// 0x010c2f18: 0x10c2f18: cibyl_sysc_arg 0x4
+// 0x010c3554: 0x10c3554: sll   zero, zero, 0
+// 0x010c3558: 0x10c3558: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c2f1c: 0x10c2f1c: cibyl_sysc 0x2b10
+// 0x010c355c: 0x10c355c: cibyl_sysc 0x2b10
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c2f20: 0x10c2f20: addu  a0, v0, zero
+// 0x010c3560: 0x10c3560: addu  a0, v0, zero
 	ldloc 7
 	stloc.1
-// 0x010c2f24: 0x10c2f24: lw    a0, 8(v1)
+// 0x010c3564: 0x10c3564: lw    a0, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -295,7 +295,7 @@ L_10c2ef0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c2f28: 0x10c2f28: jal   0x1000930 sll   zero, zero, 0
+// 0x010c3568: 0x10c3568: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -306,11 +306,11 @@ L_10c2ef0:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010c2f30: 0x10c2f30: lw    ra, 20(sp)
-// 0x010c2f34: 0x10c2f34: addu  v0, zero, zero
+// 0x010c3570: 0x10c3570: lw    ra, 20(sp)
+// 0x010c3574: 0x10c3574: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010c2f38: 0x10c2f38: jr    ra addiu sp, sp, 24
+// 0x010c3578: 0x10c3578: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -322,7 +322,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 open_file_10c2f40(int32,int32,int32,int32,int32)
+.method public static int32 open_file_10c3580(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s4,int32 s3,int32 s2,int32 ra,int32 ecb,int32 ear)
@@ -378,22 +378,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c2f40: 0x10c2f40: addiu v0, a1, -2
+// 0x010c3580: 0x10c3580: addiu v0, a1, -2
 	ldloc.2
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x010c2f44: 0x10c2f44: addiu sp, sp, -48
+// 0x010c3584: 0x10c3584: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010c2f48: 0x10c2f48: sltiu v0, v0, 2
+// 0x010c3588: 0x10c3588: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x010c2f4c: 0x10c2f4c: sw    s2, 32(sp)
+// 0x010c358c: 0x10c358c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -402,7 +402,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010c2f50: 0x10c2f50: sw    s1, 28(sp)
+// 0x010c3590: 0x10c3590: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -411,8 +411,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c2f54: 0x10c2f54: sw    ra, 44(sp)
-// 0x010c2f58: 0x10c2f58: sw    s4, 40(sp)
+// 0x010c3594: 0x10c3594: sw    ra, 44(sp)
+// 0x010c3598: 0x10c3598: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -421,7 +421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c2f5c: 0x10c2f5c: sw    s3, 36(sp)
+// 0x010c359c: 0x10c359c: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -430,7 +430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c2f60: 0x10c2f60: sw    s0, 24(sp)
+// 0x010c35a0: 0x10c35a0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -439,13 +439,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c2f64: 0x10c2f64: addu  s2, a1, zero
+// 0x010c35a4: 0x10c35a4: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x010c2f68: 0x10c2f68: addu  s1, a0, zero
+// 0x010c35a8: 0x10c35a8: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c2f6c: 0x10c2f6c: bne   v0, zero, 0x10c2f80 sw    zero, 16(sp)
+// 0x010c35ac: 0x10c35ac: bne   v0, zero, 0x10c35c0 sw    zero, 16(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -455,42 +455,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_10c2f80
+	brtrue L_10c35c0
 // --- basic block ---
-// 0x010c2f74: 0x10c2f74: addiu v0, zero, 5
+// 0x010c35b4: 0x10c35b4: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010c2f78: 0x10c2f78: bne   a1, v0, 0x10c3104 lui   a0, 0x0
+// 0x010c35b8: 0x10c35b8: bne   a1, v0, 0x10c3744 lui   a0, 0x0
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_10c3104
+	bne.un L_10c3744
 // --- basic block ---
-L_10c2f80:
-// 0x010c2f80: 0x10c2f80: addiu v1, zero, 3
+L_10c35c0:
+// 0x010c35c0: 0x10c35c0: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x010c2f84: 0x10c2f84: cibyl_sysc_arg 0x11
+// 0x010c35c4: 0x10c35c4: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c2f88: 0x10c2f88: cibyl_sysc_arg 0x3
+// 0x010c35c8: 0x10c35c8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2f8c: 0x10c2f8c: cibyl_sysc 0x2b1c
+// 0x010c35cc: 0x10c35cc: cibyl_sysc 0x2b1c
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openFileConnection_mode(int32,int32)
 	stloc 5
-// 0x010c2f90: 0x10c2f90: addu  s1, v0, zero
+// 0x010c35d0: 0x10c35d0: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010c2f94: 0x10c2f94: lui   a0, 0x1000000
+// 0x010c35d4: 0x10c35d4: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c2f98: 0x10c2f98: addiu a0, a0, 264
+// 0x010c35d8: 0x10c35d8: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c2f9c:
-// 0x010c2f9c: 0x10c2f9c: jal   0x1000120 addiu a1, sp, 16
+L_10c35dc:
+// 0x010c35dc: 0x10c35dc: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -500,40 +500,40 @@ L_10c2f9c:
 	ldloc.2
 	stloc 15
 // --- basic block ---
-// 0x010c2fa4: 0x10c2fa4: lw    v0, 0(zero)
+// 0x010c35e4: 0x10c35e4: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c2fa8: 0x10c2fa8: sll   zero, zero, 0
-// 0x010c2fac: 0x10c2fac: beq   v0, zero, 0x10c3004 sll   zero, zero, 0
+// 0x010c35e8: 0x10c35e8: sll   zero, zero, 0
+// 0x010c35ec: 0x10c35ec: beq   v0, zero, 0x10c3644 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c3004
+	brfalse L_10c3644
 // --- basic block ---
-// 0x010c2fb4: 0x10c2fb4: cibyl_sysc_arg 0x11
+// 0x010c35f4: 0x10c35f4: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c2fb8: 0x10c2fb8: cibyl_sysc 0x2b43
+// 0x010c35f8: 0x10c35f8: cibyl_sysc 0x2b43
 	call int32 [WazeWP7]Syscalls::NOPH_FileConnection_exists(int32)
 	stloc 5
-// 0x010c2fbc: 0x10c2fbc: addu  v1, v0, zero
+// 0x010c35fc: 0x10c35fc: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c2fc0: 0x10c2fc0: bne   v1, zero, 0x10c2fdc addiu v0, zero, 5
+// 0x010c3600: 0x10c3600: bne   v1, zero, 0x10c361c addiu v0, zero, 5
 	ldloc 7
 	ldc.i4.5
 	stloc 5
-	brtrue L_10c2fdc
+	brtrue L_10c361c
 // --- basic block ---
-// 0x010c2fc8: 0x10c2fc8: cibyl_sysc_arg 0x11
+// 0x010c3608: 0x10c3608: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c2fcc: 0x10c2fcc: cibyl_sysc 0x2b5e
+// 0x010c360c: 0x10c360c: cibyl_sysc 0x2b5e
 	call void [WazeWP7]Syscalls::NOPH_FileConnection_create(int32)
-// 0x010c2fd0: 0x10c2fd0: addu  v1, v0, zero
+// 0x010c3610: 0x10c3610: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c2fd4: 0x10c2fd4: j	 0x10c3004 sw    zero, 16(sp)
+// 0x010c3614: 0x10c3614: j	 0x10c3644 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -542,36 +542,36 @@ L_10c2f9c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10c3004
+	br L_10c3644
 // --- basic block ---
-L_10c2fdc:
-// 0x010c2fdc: 0x10c2fdc: beq   s2, v0, 0x10c2fec addiu v0, zero, 2
+L_10c361c:
+// 0x010c361c: 0x10c361c: beq   s2, v0, 0x10c362c addiu v0, zero, 2
 	ldloc 12
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	beq  L_10c2fec
+	beq  L_10c362c
 // --- basic block ---
-// 0x010c2fe4: 0x10c2fe4: bne   s2, v0, 0x10c3000 sll   zero, zero, 0
+// 0x010c3624: 0x10c3624: bne   s2, v0, 0x10c3640 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	bne.un L_10c3000
+	bne.un L_10c3640
 // --- basic block ---
-L_10c2fec:
-// 0x010c2fec: 0x10c2fec: addu  v1, zero, zero
+L_10c362c:
+// 0x010c362c: 0x10c362c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010c2ff0: 0x10c2ff0: cibyl_sysc_arg 0x11
+// 0x010c3630: 0x10c3630: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c2ff4: 0x10c2ff4: cibyl_sysc_arg 0x3
+// 0x010c3634: 0x10c3634: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c2ff8: 0x10c2ff8: cibyl_sysc 0x2b79
+// 0x010c3638: 0x10c3638: cibyl_sysc 0x2b79
 	call void [WazeWP7]Syscalls::NOPH_FileConnection_truncate(int32,int32)
-// 0x010c2ffc: 0x10c2ffc: addu  v1, v0, zero
+// 0x010c363c: 0x10c363c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_10c3000:
-// 0x010c3000: 0x10c3000: sw    zero, 16(sp)
+L_10c3640:
+// 0x010c3640: 0x10c3640: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -580,12 +580,12 @@ L_10c3000:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10c3004:
-// 0x010c3004: 0x10c3004: sll   zero, zero, 0
-// 0x010c3008: 0x10c3008: Unknown instruction 0x0
-L_10c3008:
-// 0x010c300c: 0x10c300c: sll   zero, zero, 0
-// 0x010c3010: 0x10c3010: lw    v0, 16(sp)
+L_10c3644:
+// 0x010c3644: 0x10c3644: sll   zero, zero, 0
+// 0x010c3648: 0x10c3648: Unknown instruction 0x0
+L_10c3648:
+// 0x010c364c: 0x10c364c: sll   zero, zero, 0
+// 0x010c3650: 0x10c3650: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -594,15 +594,15 @@ L_10c3008:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c3014: 0x10c3014: sll   zero, zero, 0
-// 0x010c3018: 0x10c3018: bne   v0, zero, 0x10c30b8 sll   zero, zero, 0
+// 0x010c3654: 0x10c3654: sll   zero, zero, 0
+// 0x010c3658: 0x10c3658: bne   v0, zero, 0x10c36f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10c30b8
+	brtrue L_10c36f8
 // --- basic block ---
-// 0x010c3020: 0x10c3020: lui   a0, 0x0
+// 0x010c3660: 0x10c3660: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c3024: 0x10c3024: jal   0x1002450 addiu a0, a0, 19840
+// 0x010c3664: 0x10c3664: jal   0x1002450 addiu a0, a0, 19840
 	ldloc.1
 	ldc.i4 19840
 	add
@@ -617,10 +617,10 @@ L_10c3008:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c302c: 0x10c302c: addu  s0, v0, zero
+// 0x010c366c: 0x10c366c: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010c3030: 0x10c3030: lw    s4, 20(v0)
+// 0x010c3670: 0x10c3670: lw    s4, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -629,19 +629,19 @@ L_10c3008:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c3034: 0x10c3034: sll   zero, zero, 0
-// 0x010c3038: 0x10c3038: cibyl_sysc_arg 0x11
+// 0x010c3674: 0x10c3674: sll   zero, zero, 0
+// 0x010c3678: 0x10c3678: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c303c: 0x10c303c: cibyl_sysc 0x2b96
+// 0x010c367c: 0x10c367c: cibyl_sysc 0x2b96
 	call int32 [WazeWP7]Syscalls::NOPH_FileConnection_fileSize(int32)
 	stloc 5
-// 0x010c3040: 0x10c3040: addu  v1, v0, zero
+// 0x010c3680: 0x10c3680: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c3044: 0x10c3044: addiu v0, zero, 3
+// 0x010c3684: 0x10c3684: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010c3048: 0x10c3048: sw    v1, 16(s0)
+// 0x010c3688: 0x10c3688: sw    v1, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -650,17 +650,17 @@ L_10c3008:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c304c: 0x10c304c: bne   s2, v0, 0x10c3060 addu  s3, zero, zero
+// 0x010c368c: 0x10c368c: bne   s2, v0, 0x10c36a0 addu  s3, zero, zero
 	ldloc 12
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	bne.un L_10c3060
+	bne.un L_10c36a0
 // --- basic block ---
-// 0x010c3054: 0x10c3054: addu  s3, v1, zero
+// 0x010c3694: 0x10c3694: addu  s3, v1, zero
 	ldloc 7
 	stloc 11
-// 0x010c3058: 0x10c3058: sw    v1, 8(s0)
+// 0x010c3698: 0x10c3698: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -669,7 +669,7 @@ L_10c3008:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c305c: 0x10c305c: sw    v1, 12(s0)
+// 0x010c369c: 0x10c369c: sw    v1, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -678,17 +678,17 @@ L_10c3008:
 	add
 	ldloc 7
 	stelem.i4
-L_10c3060:
-// 0x010c3060: 0x10c3060: lui   a0, 0x1000000
+L_10c36a0:
+// 0x010c36a0: 0x10c36a0: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c3064: 0x10c3064: addiu a0, a0, 264
+// 0x010c36a4: 0x10c36a4: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c3068:
-// 0x010c3068: 0x10c3068: jal   0x1000120 addiu a1, sp, 16
+L_10c36a8:
+// 0x010c36a8: 0x10c36a8: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -698,41 +698,41 @@ L_10c3068:
 	ldloc.2
 	stloc 15
 // --- basic block ---
-// 0x010c3070: 0x10c3070: lw    v0, 0(zero)
+// 0x010c36b0: 0x10c36b0: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c3074: 0x10c3074: sll   zero, zero, 0
-// 0x010c3078: 0x10c3078: beq   v0, zero, 0x10c3094 sll   zero, zero, 0
+// 0x010c36b4: 0x10c36b4: sll   zero, zero, 0
+// 0x010c36b8: 0x10c36b8: beq   v0, zero, 0x10c36d4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c3094
+	brfalse L_10c36d4
 // --- basic block ---
-// 0x010c3080: 0x10c3080: cibyl_sysc_arg 0x11
+// 0x010c36c0: 0x10c36c0: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c3084: 0x10c3084: cibyl_sysc_arg 0x13
+// 0x010c36c4: 0x10c36c4: cibyl_sysc_arg 0x13
 	ldloc 11
-// 0x010c3088: 0x10c3088: cibyl_sysc 0x2bb3
+// 0x010c36c8: 0x10c36c8: cibyl_sysc 0x2bb3
 	call int32 [WazeWP7]Syscalls::NOPH_FileConnection_openOutputStream(int32,int32)
 	stloc 5
-// 0x010c308c: 0x10c308c: addu  s3, v0, zero
+// 0x010c36cc: 0x10c36cc: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010c3090: 0x10c3090: sw    s3, 0(s4)
+// 0x010c36d0: 0x10c36d0: sw    s3, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-L_10c3094:
-// 0x010c3094: 0x10c3094: sll   zero, zero, 0
-// 0x010c3098: 0x10c3098: Unknown instruction 0x0
-L_10c3098:
-// 0x010c309c: 0x10c309c: sll   zero, zero, 0
-// 0x010c30a0: 0x10c30a0: lw    v0, 16(sp)
+L_10c36d4:
+// 0x010c36d4: 0x10c36d4: sll   zero, zero, 0
+// 0x010c36d8: 0x10c36d8: Unknown instruction 0x0
+L_10c36d8:
+// 0x010c36dc: 0x10c36dc: sll   zero, zero, 0
+// 0x010c36e0: 0x10c36e0: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -741,12 +741,12 @@ L_10c3098:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c30a4: 0x10c30a4: sll   zero, zero, 0
-// 0x010c30a8: 0x10c30a8: beq   v0, zero, 0x10c30cc sll   zero, zero, 0
+// 0x010c36e4: 0x10c36e4: sll   zero, zero, 0
+// 0x010c36e8: 0x10c36e8: beq   v0, zero, 0x10c370c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c30cc
+	brfalse L_10c370c
 // --- basic block ---
-// 0x010c30b0: 0x10c30b0: jal   0x1002394 addu  a0, s0, zero
+// 0x010c36f0: 0x10c36f0: jal   0x1002394 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -759,28 +759,28 @@ L_10c3098:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10c30b8:
-// 0x010c30b8: 0x10c30b8: cibyl_sysc_arg 0x11
+L_10c36f8:
+// 0x010c36f8: 0x10c36f8: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c30bc: 0x10c30bc: cibyl_sysc 0x2bd8
+// 0x010c36fc: 0x10c36fc: cibyl_sysc 0x2bd8
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c30c0: 0x10c30c0: addu  s1, v0, zero
+// 0x010c3700: 0x10c3700: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010c30c4: 0x10c30c4: j	 0x10c31d0 addu  s0, zero, zero
+// 0x010c3704: 0x10c3704: j	 0x10c3810 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10c31d0
+	br L_10c3810
 // --- basic block ---
-L_10c30cc:
-// 0x010c30cc: 0x10c30cc: cibyl_sysc_arg 0x11
+L_10c370c:
+// 0x010c370c: 0x10c370c: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c30d0: 0x10c30d0: cibyl_sysc 0x2be4
+// 0x010c3710: 0x10c3710: cibyl_sysc 0x2be4
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x010c30d4: 0x10c30d4: addu  s1, v0, zero
+// 0x010c3714: 0x10c3714: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010c30d8: 0x10c30d8: lw    v0, 16(sp)
+// 0x010c3718: 0x10c3718: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -789,33 +789,33 @@ L_10c30cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c30dc: 0x10c30dc: sll   zero, zero, 0
-// 0x010c30e0: 0x10c30e0: beq   v0, zero, 0x10c31d0 sll   zero, zero, 0
+// 0x010c371c: 0x10c371c: sll   zero, zero, 0
+// 0x010c3720: 0x10c3720: beq   v0, zero, 0x10c3810 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c31d0
+	brfalse L_10c3810
 // --- basic block ---
-// 0x010c30e8: 0x10c30e8: lw    v1, 0(s4)
+// 0x010c3728: 0x10c3728: lw    v1, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010c30ec: 0x10c30ec: sll   zero, zero, 0
-// 0x010c30f0: 0x10c30f0: cibyl_sysc_arg 0x3
+// 0x010c372c: 0x10c372c: sll   zero, zero, 0
+// 0x010c3730: 0x10c3730: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010c30f4: 0x10c30f4: cibyl_sysc 0x2bf0
+// 0x010c3734: 0x10c3734: cibyl_sysc 0x2bf0
 	call void [WazeWP7]Syscalls::NOPH_OutputStream_close(int32)
-// 0x010c30f8: 0x10c30f8: addu  v1, v0, zero
+// 0x010c3738: 0x10c3738: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c30fc: 0x10c30fc: j	 0x10c31d0 addu  s0, zero, zero
+// 0x010c373c: 0x10c373c: j	 0x10c3810 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10c31d0
+	br L_10c3810
 // --- basic block ---
-L_10c3104:
-// 0x010c3104: 0x10c3104: jal   0x1002450 addiu a0, a0, 19800
+L_10c3744:
+// 0x010c3744: 0x10c3744: jal   0x1002450 addiu a0, a0, 19800
 	ldloc.1
 	ldc.i4 19800
 	add
@@ -830,12 +830,12 @@ L_10c3104:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c310c: 0x10c310c: sltiu s2, s2, 2
+// 0x010c374c: 0x10c374c: sltiu s2, s2, 2
 	ldloc 12
 	ldc.i4.2
 	clt.un
 	stloc 12
-// 0x010c3110: 0x10c3110: lw    s3, 20(v0)
+// 0x010c3750: 0x10c3750: lw    s3, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -844,18 +844,18 @@ L_10c3104:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c3114: 0x10c3114: bne   s2, zero, 0x10c3130 addu  s0, v0, zero
+// 0x010c3754: 0x10c3754: bne   s2, zero, 0x10c3770 addu  s0, v0, zero
 	ldloc 12
 	ldloc 5
 	stloc 9
-	brtrue L_10c3130
+	brtrue L_10c3770
 // --- basic block ---
-// 0x010c311c: 0x10c311c: lui   a0, 0x20000
+// 0x010c375c: 0x10c375c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010c3120: 0x10c3120: jal   0x10001a0 addiu a0, a0, 23492
+// 0x010c3760: 0x10c3760: jal   0x10001a0 addiu a0, a0, 23952
 	ldloc.1
-	ldc.i4 23492
+	ldc.i4 23952
 	add
 	stloc.1
 	ldloc.0
@@ -868,7 +868,7 @@ L_10c3104:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3128: 0x10c3128: jal   0x1000130 addu  a0, v0, zero
+// 0x010c3768: 0x10c3768: jal   0x1000130 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldsfld object[] [WazeWP7]CRunTime::objectRepository
@@ -877,17 +877,17 @@ L_10c3104:
 	castclass [mscorlib]System.Exception
 	throw
 // --- basic block ---
-L_10c3130:
-// 0x010c3130: 0x10c3130: lui   a0, 0x1000000
+L_10c3770:
+// 0x010c3770: 0x10c3770: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x010c3134: 0x10c3134: addiu a0, a0, 264
+// 0x010c3774: 0x10c3774: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_10c3138:
-// 0x010c3138: 0x10c3138: jal   0x1000120 addiu a1, sp, 16
+L_10c3778:
+// 0x010c3778: 0x10c3778: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -897,52 +897,52 @@ L_10c3138:
 	ldloc.2
 	stloc 15
 // --- basic block ---
-// 0x010c3140: 0x10c3140: lw    v0, 0(zero)
+// 0x010c3780: 0x10c3780: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c3144: 0x10c3144: sll   zero, zero, 0
-// 0x010c3148: 0x10c3148: beq   v0, zero, 0x10c3174 sll   zero, zero, 0
+// 0x010c3784: 0x10c3784: sll   zero, zero, 0
+// 0x010c3788: 0x10c3788: beq   v0, zero, 0x10c37b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10c3174
+	brfalse L_10c37b4
 // --- basic block ---
-// 0x010c3150: 0x10c3150: addiu s4, zero, 1
+// 0x010c3790: 0x10c3790: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x010c3154: 0x10c3154: cibyl_sysc_arg 0x11
+// 0x010c3794: 0x10c3794: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x010c3158: 0x10c3158: cibyl_sysc_arg 0x14
+// 0x010c3798: 0x10c3798: cibyl_sysc_arg 0x14
 	ldloc 10
-// 0x010c315c: 0x10c315c: cibyl_sysc 0x2c08
+// 0x010c379c: 0x10c379c: cibyl_sysc 0x2c08
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openFileConnection_mode(int32,int32)
 	stloc 5
-// 0x010c3160: 0x10c3160: addu  s4, v0, zero
+// 0x010c37a0: 0x10c37a0: addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010c3164: 0x10c3164: cibyl_sysc_arg 0x14
+// 0x010c37a4: 0x10c37a4: cibyl_sysc_arg 0x14
 	ldloc 10
-// 0x010c3168: 0x10c3168: cibyl_sysc 0x2c2f
+// 0x010c37a8: 0x10c37a8: cibyl_sysc 0x2c2f
 	call int32 [WazeWP7]Syscalls::NOPH_FileConnection_openDataInputStream(int32)
 	stloc 5
-// 0x010c316c: 0x10c316c: addu  v1, v0, zero
+// 0x010c37ac: 0x10c37ac: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010c3170: 0x10c3170: sw    v1, 0(s3)
+// 0x010c37b0: 0x10c37b0: sw    v1, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_10c3174:
-// 0x010c3174: 0x10c3174: sll   zero, zero, 0
-// 0x010c3178: 0x10c3178: Unknown instruction 0x0
-L_10c3178:
-// 0x010c317c: 0x10c317c: sll   zero, zero, 0
-// 0x010c3180: 0x10c3180: lw    v0, 16(sp)
+L_10c37b4:
+// 0x010c37b4: 0x10c37b4: sll   zero, zero, 0
+// 0x010c37b8: 0x10c37b8: Unknown instruction 0x0
+L_10c37b8:
+// 0x010c37bc: 0x10c37bc: sll   zero, zero, 0
+// 0x010c37c0: 0x10c37c0: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -951,25 +951,25 @@ L_10c3178:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c3184: 0x10c3184: sll   zero, zero, 0
-// 0x010c3188: 0x10c3188: bne   v0, zero, 0x10c31a0 sll   zero, zero, 0
+// 0x010c37c4: 0x10c37c4: sll   zero, zero, 0
+// 0x010c37c8: 0x10c37c8: bne   v0, zero, 0x10c37e0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10c31a0
+	brtrue L_10c37e0
 // --- basic block ---
-// 0x010c3190: 0x10c3190: lw    v0, 0(s3)
+// 0x010c37d0: 0x10c37d0: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c3194: 0x10c3194: sll   zero, zero, 0
-// 0x010c3198: 0x10c3198: bne   v0, zero, 0x10c31b0 sll   zero, zero, 0
+// 0x010c37d4: 0x10c37d4: sll   zero, zero, 0
+// 0x010c37d8: 0x10c37d8: bne   v0, zero, 0x10c37f0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10c31b0
+	brtrue L_10c37f0
 // --- basic block ---
-L_10c31a0:
-// 0x010c31a0: 0x10c31a0: jal   0x1002394 addu  a0, s0, zero
+L_10c37e0:
+// 0x010c37e0: 0x10c37e0: jal   0x1002394 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -982,13 +982,13 @@ L_10c31a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c31a8: 0x10c31a8: j	 0x10c31d0 addu  s0, zero, zero
+// 0x010c37e8: 0x10c37e8: j	 0x10c3810 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10c31d0
+	br L_10c3810
 // --- basic block ---
-L_10c31b0:
-// 0x010c31b0: 0x10c31b0: jal   0x1001ba8 addu  a0, s1, zero
+L_10c37f0:
+// 0x010c37f0: 0x10c37f0: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1001,7 +1001,7 @@ L_10c31b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c31b8: 0x10c31b8: sw    v0, 8(s3)
+// 0x010c37f8: 0x10c37f8: sw    v0, 8(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1010,7 +1010,7 @@ L_10c31b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c31bc: 0x10c31bc: sw    s4, 4(s3)
+// 0x010c37fc: 0x10c37fc: sw    s4, 4(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1019,15 +1019,15 @@ L_10c31b0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c31c0: 0x10c31c0: cibyl_sysc_arg 0x14
+// 0x010c3800: 0x10c3800: cibyl_sysc_arg 0x14
 	ldloc 10
-// 0x010c31c4: 0x10c31c4: cibyl_sysc 0x2c57
+// 0x010c3804: 0x10c3804: cibyl_sysc 0x2c57
 	call int32 [WazeWP7]Syscalls::NOPH_FileConnection_fileSize(int32)
 	stloc 5
-// 0x010c31c8: 0x10c31c8: addu  s4, v0, zero
+// 0x010c3808: 0x10c3808: addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010c31cc: 0x10c31cc: sw    s4, 16(s0)
+// 0x010c380c: 0x10c380c: sw    s4, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1036,12 +1036,12 @@ L_10c31b0:
 	add
 	ldloc 10
 	stelem.i4
-L_10c31d0:
-// 0x010c31d0: 0x10c31d0: lw    ra, 44(sp)
-// 0x010c31d4: 0x10c31d4: addu  v0, s0, zero
+L_10c3810:
+// 0x010c3810: 0x10c3810: lw    ra, 44(sp)
+// 0x010c3814: 0x10c3814: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x010c31d8: 0x10c31d8: lw    s4, 40(sp)
+// 0x010c3818: 0x10c3818: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1050,7 +1050,7 @@ L_10c31d0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c31dc: 0x10c31dc: lw    s3, 36(sp)
+// 0x010c381c: 0x10c381c: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1059,7 +1059,7 @@ L_10c31d0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c31e0: 0x10c31e0: lw    s2, 32(sp)
+// 0x010c3820: 0x10c3820: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1068,7 +1068,7 @@ L_10c31d0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010c31e4: 0x10c31e4: lw    s1, 28(sp)
+// 0x010c3824: 0x10c3824: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1077,7 +1077,7 @@ L_10c31d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c31e8: 0x10c31e8: lw    s0, 24(sp)
+// 0x010c3828: 0x10c3828: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1086,7 +1086,7 @@ L_10c31d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c31ec: 0x10c31ec: jr    ra addiu sp, sp, 48
+// 0x010c382c: 0x10c382c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1098,7 +1098,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 open_10c31f4(int32,int32,int32,int32,int32)
+.method public static int32 open_10c3834(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1133,27 +1133,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c31f4:
-// 0x010c31f4: 0x10c31f4: addiu sp, sp, -24
+L_10c3834:
+// 0x010c3834: 0x10c3834: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c31f8: 0x10c31f8: sw    ra, 20(sp)
-// 0x010c31fc: 0x10c31fc: jal   0x10c2f40 sll   zero, zero, 0
+// 0x010c3838: 0x10c3838: sw    ra, 20(sp)
+// 0x010c383c: 0x10c383c: jal   0x10c3580 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::open_file_10c2f40(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::open_file_10c3580(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010c3204: 0x10c3204: lw    ra, 20(sp)
-// 0x010c3208: 0x10c3208: sll   zero, zero, 0
-// 0x010c320c: 0x10c320c: jr    ra addiu sp, sp, 24
+// 0x010c3844: 0x10c3844: lw    ra, 20(sp)
+// 0x010c3848: 0x10c3848: sll   zero, zero, 0
+// 0x010c384c: 0x10c384c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1165,7 +1165,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 __offtime_10c3248(int32,int32,int32,int32,int32)
+.method public static int32 __offtime_10c3888(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 hi,int32 lo,int32 v0,int32 t6,int32 t5,int32[] mem,int32 t7,int32 t0,int32 t8,int32 t9,int32 t1,int32 t2,int32 t3,int32 t4,int32 s0,int32 ra)
@@ -1239,22 +1239,22 @@ __CIBYL_function_return:
 	stloc 11
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c3248: 0x10c3248: lw    v0, 0(a0)
+// 0x010c3888: 0x10c3888: lw    v0, 0(a0)
 	ldloc 11
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010c324c: 0x10c324c: lui   v1, 0x10000
+// 0x010c388c: 0x10c388c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010c3250: 0x10c3250: ori   v1, v1, 20864
+// 0x010c3890: 0x10c3890: ori   v1, v1, 20864
 	ldloc 5
 	ldc.i4 20864
 	or
 	stloc 5
-// 0x010c3254: 0x10c3254: div   v0, v1
+// 0x010c3894: 0x10c3894: div   v0, v1
 	ldloc 8
 	ldloc 5
 	ldloc 8
@@ -1263,12 +1263,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3258: 0x10c3258: addiu sp, sp, -8
+// 0x010c3898: 0x10c3898: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x010c325c: 0x10c325c: sw    s0, 4(sp)
+// 0x010c389c: 0x10c389c: sw    s0, 4(sp)
 	ldloc 11
 	ldloc.0
 	ldc.i4.2
@@ -1277,82 +1277,82 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010c3260: 0x10c3260: mfhi  hi
+// 0x010c38a0: 0x10c38a0: mfhi  hi
 	ldloc 6
 	stloc.1
-// 0x010c3264: 0x10c3264: mflo  lo
+// 0x010c38a4: 0x10c38a4: mflo  lo
 	ldloc 7
 	stloc 8
-// 0x010c3268: 0x10c3268: j	 0x10c3274 addu  a0, a0, a1
+// 0x010c38a8: 0x10c38a8: j	 0x10c38b4 addu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-	br L_10c3274
+	br L_10c38b4
 // --- basic block ---
-L_10c3270:
-// 0x010c3270: 0x10c3270: addiu v0, v0, -1
+L_10c38b0:
+// 0x010c38b0: 0x10c38b0: addiu v0, v0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_10c3274:
-// 0x010c3274: 0x10c3274: bltz  a0, 0x10c3270 addu  a0, a0, v1
+L_10c38b4:
+// 0x010c38b4: 0x10c38b4: bltz  a0, 0x10c38b0 addu  a0, a0, v1
 	ldloc.1
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
 	ldc.i4.s 0
-	blt L_10c3270
+	blt L_10c38b0
 // --- basic block ---
-// 0x010c327c: 0x10c327c: subu  a0, a0, v1
+// 0x010c38bc: 0x10c38bc: subu  a0, a0, v1
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x010c3280: 0x10c3280: j	 0x10c3290 lui   v1, 0x10000
+// 0x010c38c0: 0x10c38c0: j	 0x10c38d0 lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 5
-	br L_10c3290
+	br L_10c38d0
 // --- basic block ---
-L_10c3288:
-// 0x010c3288: 0x10c3288: j	 0x10c3294 addiu v0, v0, 1
+L_10c38c8:
+// 0x010c38c8: 0x10c38c8: j	 0x10c38d4 addiu v0, v0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10c3294
+	br L_10c38d4
 // --- basic block ---
-L_10c3290:
-// 0x010c3290: 0x10c3290: ori   v1, v1, 20864
+L_10c38d0:
+// 0x010c38d0: 0x10c38d0: ori   v1, v1, 20864
 	ldloc 5
 	ldc.i4 20864
 	or
 	stloc 5
-L_10c3294:
-// 0x010c3294: 0x10c3294: slt   a1, a0, v1
+L_10c38d4:
+// 0x010c38d4: 0x10c38d4: slt   a1, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.2
-// 0x010c3298: 0x10c3298: beq   a1, zero, 0x10c3288 subu  a0, a0, v1
+// 0x010c38d8: 0x10c38d8: beq   a1, zero, 0x10c38c8 subu  a0, a0, v1
 	ldloc.2
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-	brfalse L_10c3288
+	brfalse L_10c38c8
 // --- basic block ---
-// 0x010c32a0: 0x10c32a0: addu  a0, a0, v1
+// 0x010c38e0: 0x10c38e0: addu  a0, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x010c32a4: 0x10c32a4: addiu a1, zero, 3600
+// 0x010c38e4: 0x10c38e4: addiu a1, zero, 3600
 	ldc.i4 3600
 	stloc.2
-// 0x010c32a8: 0x10c32a8: div   a0, a1
+// 0x010c38e8: 0x10c38e8: div   a0, a1
 	ldloc.1
 	ldloc.2
 	ldloc.1
@@ -1361,24 +1361,24 @@ L_10c3294:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c32ac: 0x10c32ac: addiu v1, zero, 7
+// 0x010c38ec: 0x10c38ec: addiu v1, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x010c32b0: 0x10c32b0: addiu t0, v0, 4
+// 0x010c38f0: 0x10c38f0: addiu t0, v0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 13
-// 0x010c32b4: 0x10c32b4: addiu a3, zero, 60
+// 0x010c38f4: 0x10c38f4: addiu a3, zero, 60
 	ldc.i4.s 60
 	stloc 4
-// 0x010c32b8: 0x10c32b8: mfhi  hi
+// 0x010c38f8: 0x10c38f8: mfhi  hi
 	ldloc 6
 	stloc.1
-// 0x010c32bc: 0x10c32bc: mflo  lo
+// 0x010c38fc: 0x10c38fc: mflo  lo
 	ldloc 7
 	stloc.2
-// 0x010c32c0: 0x10c32c0: sw    a1, 8(a2)
+// 0x010c3900: 0x10c3900: sw    a1, 8(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
@@ -1387,8 +1387,8 @@ L_10c3294:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c32c4: 0x10c32c4: sll   zero, zero, 0
-// 0x010c32c8: 0x10c32c8: div   t0, v1
+// 0x010c3904: 0x10c3904: sll   zero, zero, 0
+// 0x010c3908: 0x10c3908: div   t0, v1
 	ldloc 13
 	ldloc 5
 	ldloc 13
@@ -1397,10 +1397,10 @@ L_10c3294:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c32cc: 0x10c32cc: mfhi  hi
+// 0x010c390c: 0x10c390c: mfhi  hi
 	ldloc 6
 	stloc 5
-// 0x010c32d0: 0x10c32d0: sw    v1, 24(a2)
+// 0x010c3910: 0x10c3910: sw    v1, 24(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
@@ -1409,8 +1409,8 @@ L_10c3294:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c32d4: 0x10c32d4: sll   zero, zero, 0
-// 0x010c32d8: 0x10c32d8: div   a0, a3
+// 0x010c3914: 0x10c3914: sll   zero, zero, 0
+// 0x010c3918: 0x10c3918: div   a0, a3
 	ldloc.1
 	ldloc 4
 	ldloc.1
@@ -1419,20 +1419,20 @@ L_10c3294:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c32dc: 0x10c32dc: mfhi  hi
+// 0x010c391c: 0x10c391c: mfhi  hi
 	ldloc 6
 	stloc.1
-// 0x010c32e0: 0x10c32e0: sw    a0, 0(a2)
+// 0x010c3920: 0x10c3920: sw    a0, 0(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010c32e4: 0x10c32e4: mflo  lo
+// 0x010c3924: 0x10c3924: mflo  lo
 	ldloc 7
 	stloc 4
-// 0x010c32e8: 0x10c32e8: bgez  v1, 0x10c32f8 sw    a3, 4(a2)
+// 0x010c3928: 0x10c3928: bgez  v1, 0x10c3938 sw    a3, 4(a2)
 	ldloc 5
 	ldloc 11
 	ldloc.3
@@ -1443,14 +1443,14 @@ L_10c3294:
 	ldloc 4
 	stelem.i4
 	ldc.i4.s 0
-	bge L_10c32f8
+	bge L_10c3938
 // --- basic block ---
-// 0x010c32f0: 0x10c32f0: addiu v1, v1, 7
+// 0x010c3930: 0x10c3930: addiu v1, v1, 7
 	ldloc 5
 	ldc.i4.7
 	add
 	stloc 5
-// 0x010c32f4: 0x10c32f4: sw    v1, 24(a2)
+// 0x010c3934: 0x10c3934: sw    v1, 24(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
@@ -1459,32 +1459,32 @@ L_10c3294:
 	add
 	ldloc 5
 	stelem.i4
-L_10c32f8:
-// 0x010c32f8: 0x10c32f8: addiu v1, zero, 1970
+L_10c3938:
+// 0x010c3938: 0x10c3938: addiu v1, zero, 1970
 	ldc.i4 1970
 	stloc 5
-// 0x010c32fc: 0x10c32fc: addiu t2, zero, 365
+// 0x010c393c: 0x10c393c: addiu t2, zero, 365
 	ldc.i4 365
 	stloc 17
-// 0x010c3300: 0x10c3300: addiu t0, zero, 100
+// 0x010c3940: 0x10c3940: addiu t0, zero, 100
 	ldc.i4.s 100
 	stloc 13
-// 0x010c3304: 0x10c3304: addiu a3, zero, 400
+// 0x010c3944: 0x10c3944: addiu a3, zero, 400
 	ldc.i4 400
 	stloc 4
-// 0x010c3308: 0x10c3308: addiu t1, zero, 4
+// 0x010c3948: 0x10c3948: addiu t1, zero, 4
 	ldc.i4.4
 	stloc 16
-// 0x010c330c: 0x10c330c: addiu t4, zero, -100
+// 0x010c394c: 0x10c394c: addiu t4, zero, -100
 	ldc.i4.s -100
 	stloc 19
-// 0x010c3310: 0x10c3310: j	 0x10c3400 addiu t3, zero, -400
+// 0x010c3950: 0x10c3950: j	 0x10c3a40 addiu t3, zero, -400
 	ldc.i4 -400
 	stloc 18
-	br L_10c3400
+	br L_10c3a40
 // --- basic block ---
-L_10c3318:
-// 0x010c3318: 0x10c3318: div   v0, t2
+L_10c3958:
+// 0x010c3958: 0x10c3958: div   v0, t2
 	ldloc 8
 	ldloc 17
 	ldloc 8
@@ -1493,28 +1493,28 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c331c: 0x10c331c: addiu a1, v1, -1
+// 0x010c395c: 0x10c395c: addiu a1, v1, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x010c3320: 0x10c3320: mflo  lo
+// 0x010c3960: 0x10c3960: mflo  lo
 	ldloc 7
 	stloc.1
-// 0x010c3324: 0x10c3324: mfhi  hi
+// 0x010c3964: 0x10c3964: mfhi  hi
 	ldloc 6
 	stloc 9
-// 0x010c3328: 0x10c3328: srl   t6, t6, 31
+// 0x010c3968: 0x10c3968: srl   t6, t6, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr.un
 	stloc 9
-// 0x010c332c: 0x10c332c: subu  t6, a0, t6
+// 0x010c396c: 0x10c396c: subu  t6, a0, t6
 	ldloc.1
 	ldloc 9
 	sub
 	stloc 9
-// 0x010c3330: 0x10c3330: div   a1, t4
+// 0x010c3970: 0x10c3970: div   a1, t4
 	ldloc.2
 	ldloc 19
 	ldloc.2
@@ -1523,30 +1523,30 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3334: 0x10c3334: addu  t6, t6, v1
+// 0x010c3974: 0x10c3974: addu  t6, t6, v1
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x010c3338: 0x10c3338: addiu a0, t6, -1
+// 0x010c3978: 0x10c3978: addiu a0, t6, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010c333c: 0x10c333c: subu  t8, v1, t6
+// 0x010c397c: 0x10c397c: subu  t8, v1, t6
 	ldloc 5
 	ldloc 9
 	sub
 	stloc 14
-// 0x010c3340: 0x10c3340: addu  v1, t6, zero
+// 0x010c3980: 0x10c3980: addu  v1, t6, zero
 	ldloc 9
 	stloc 5
-// 0x010c3344: 0x10c3344: mflo  lo
+// 0x010c3984: 0x10c3984: mflo  lo
 	ldloc 7
 	stloc 10
-// 0x010c3348: 0x10c3348: sll   zero, zero, 0
-// 0x010c334c: 0x10c334c: sll   zero, zero, 0
-// 0x010c3350: 0x10c3350: div   a1, t1
+// 0x010c3988: 0x10c3988: sll   zero, zero, 0
+// 0x010c398c: 0x10c398c: sll   zero, zero, 0
+// 0x010c3990: 0x10c3990: div   a1, t1
 	ldloc.2
 	ldloc 16
 	ldloc.2
@@ -1555,29 +1555,29 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3354: 0x10c3354: mflo  lo
+// 0x010c3994: 0x10c3994: mflo  lo
 	ldloc 7
 	stloc 12
-// 0x010c3358: 0x10c3358: addu  t5, t7, t5
+// 0x010c3998: 0x10c3998: addu  t5, t7, t5
 	ldloc 12
 	ldloc 10
 	add
 	stloc 10
-// 0x010c335c: 0x10c335c: addu  v0, t5, v0
+// 0x010c399c: 0x10c399c: addu  v0, t5, v0
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x010c3360: 0x10c3360: mfhi  hi
+// 0x010c39a0: 0x10c39a0: mfhi  hi
 	ldloc 6
 	stloc 9
-// 0x010c3364: 0x10c3364: srl   t6, t6, 31
+// 0x010c39a4: 0x10c39a4: srl   t6, t6, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr.un
 	stloc 9
-// 0x010c3368: 0x10c3368: sll   zero, zero, 0
-// 0x010c336c: 0x10c336c: div   a1, t0
+// 0x010c39a8: 0x10c39a8: sll   zero, zero, 0
+// 0x010c39ac: 0x10c39ac: div   a1, t0
 	ldloc.2
 	ldloc 13
 	ldloc.2
@@ -1586,16 +1586,16 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3370: 0x10c3370: mfhi  hi
+// 0x010c39b0: 0x10c39b0: mfhi  hi
 	ldloc 6
 	stloc 15
-// 0x010c3374: 0x10c3374: srl   t9, t9, 31
+// 0x010c39b4: 0x10c39b4: srl   t9, t9, 31
 	ldloc 15
 	ldc.i4.s 31
 	shr.un
 	stloc 15
-// 0x010c3378: 0x10c3378: sll   zero, zero, 0
-// 0x010c337c: 0x10c337c: div   a1, a3
+// 0x010c39b8: 0x10c39b8: sll   zero, zero, 0
+// 0x010c39bc: 0x10c39bc: div   a1, a3
 	ldloc.2
 	ldloc 4
 	ldloc.2
@@ -1604,28 +1604,28 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3380: 0x10c3380: mfhi  hi
+// 0x010c39c0: 0x10c39c0: mfhi  hi
 	ldloc 6
 	stloc 10
-// 0x010c3384: 0x10c3384: srl   t5, t5, 31
+// 0x010c39c4: 0x10c39c4: srl   t5, t5, 31
 	ldloc 10
 	ldc.i4.s 31
 	shr.un
 	stloc 10
-// 0x010c3388: 0x10c3388: mflo  lo
+// 0x010c39c8: 0x10c39c8: mflo  lo
 	ldloc 7
 	stloc.2
-// 0x010c338c: 0x10c338c: addu  a1, v0, a1
+// 0x010c39cc: 0x10c39cc: addu  a1, v0, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc.2
-// 0x010c3390: 0x10c3390: addu  a1, a1, t9
+// 0x010c39d0: 0x10c39d0: addu  a1, a1, t9
 	ldloc.2
 	ldloc 15
 	add
 	stloc.2
-// 0x010c3394: 0x10c3394: div   a0, t3
+// 0x010c39d4: 0x10c39d4: div   a0, t3
 	ldloc.1
 	ldloc 18
 	ldloc.1
@@ -1634,26 +1634,26 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3398: 0x10c3398: subu  a1, a1, t6
+// 0x010c39d8: 0x10c39d8: subu  a1, a1, t6
 	ldloc.2
 	ldloc 9
 	sub
 	stloc.2
-// 0x010c339c: 0x10c339c: subu  a1, a1, t5
+// 0x010c39dc: 0x10c39dc: subu  a1, a1, t5
 	ldloc.2
 	ldloc 10
 	sub
 	stloc.2
-// 0x010c33a0: 0x10c33a0: mflo  lo
+// 0x010c39e0: 0x10c39e0: mflo  lo
 	ldloc 7
 	stloc 12
-// 0x010c33a4: 0x10c33a4: addu  a1, a1, t7
+// 0x010c39e4: 0x10c39e4: addu  a1, a1, t7
 	ldloc.2
 	ldloc 12
 	add
 	stloc.2
-// 0x010c33a8: 0x10c33a8: sll   zero, zero, 0
-// 0x010c33ac: 0x10c33ac: div   a0, t0
+// 0x010c39e8: 0x10c39e8: sll   zero, zero, 0
+// 0x010c39ec: 0x10c39ec: div   a0, t0
 	ldloc.1
 	ldloc 13
 	ldloc.1
@@ -1662,24 +1662,24 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c33b0: 0x10c33b0: mflo  lo
+// 0x010c39f0: 0x10c39f0: mflo  lo
 	ldloc 7
 	stloc 9
-// 0x010c33b4: 0x10c33b4: addu  a1, a1, t6
+// 0x010c39f4: 0x10c39f4: addu  a1, a1, t6
 	ldloc.2
 	ldloc 9
 	add
 	stloc.2
-// 0x010c33b8: 0x10c33b8: mfhi  hi
+// 0x010c39f8: 0x10c39f8: mfhi  hi
 	ldloc 6
 	stloc 10
-// 0x010c33bc: 0x10c33bc: srl   t5, t5, 31
+// 0x010c39fc: 0x10c39fc: srl   t5, t5, 31
 	ldloc 10
 	ldc.i4.s 31
 	shr.un
 	stloc 10
-// 0x010c33c0: 0x10c33c0: sll   zero, zero, 0
-// 0x010c33c4: 0x10c33c4: div   a0, a3
+// 0x010c3a00: 0x10c3a00: sll   zero, zero, 0
+// 0x010c3a04: 0x10c3a04: div   a0, a3
 	ldloc.1
 	ldloc 4
 	ldloc.1
@@ -1688,16 +1688,16 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c33c8: 0x10c33c8: mfhi  hi
+// 0x010c3a08: 0x10c3a08: mfhi  hi
 	ldloc 6
 	stloc 12
-// 0x010c33cc: 0x10c33cc: srl   t7, t7, 31
+// 0x010c3a0c: 0x10c3a0c: srl   t7, t7, 31
 	ldloc 12
 	ldc.i4.s 31
 	shr.un
 	stloc 12
-// 0x010c33d0: 0x10c33d0: sll   zero, zero, 0
-// 0x010c33d4: 0x10c33d4: div   a0, t1
+// 0x010c3a10: 0x10c3a10: sll   zero, zero, 0
+// 0x010c3a14: 0x10c3a14: div   a0, t1
 	ldloc.1
 	ldloc 16
 	ldloc.1
@@ -1706,67 +1706,67 @@ L_10c3318:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c33d8: 0x10c33d8: mfhi  hi
+// 0x010c3a18: 0x10c3a18: mfhi  hi
 	ldloc 6
 	stloc 9
-// 0x010c33dc: 0x10c33dc: srl   t6, t6, 31
+// 0x010c3a1c: 0x10c3a1c: srl   t6, t6, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr.un
 	stloc 9
-// 0x010c33e0: 0x10c33e0: mflo  lo
+// 0x010c3a20: 0x10c3a20: mflo  lo
 	ldloc 7
 	stloc.1
-// 0x010c33e4: 0x10c33e4: subu  a0, a1, a0
+// 0x010c3a24: 0x10c3a24: subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-// 0x010c33e8: 0x10c33e8: addu  v0, a0, t7
+// 0x010c3a28: 0x10c3a28: addu  v0, a0, t7
 	ldloc.1
 	ldloc 12
 	add
 	stloc 8
-// 0x010c33ec: 0x10c33ec: mult  t8, t2
+// 0x010c3a2c: 0x10c3a2c: mult  t8, t2
 	ldloc 14
 	ldloc 17
 	mul
 	stloc 7
-// 0x010c33f0: 0x10c33f0: addu  v0, v0, t6
+// 0x010c3a30: 0x10c3a30: addu  v0, v0, t6
 	ldloc 8
 	ldloc 9
 	add
 	stloc 8
-// 0x010c33f4: 0x10c33f4: mflo  lo
+// 0x010c3a34: 0x10c3a34: mflo  lo
 	ldloc 7
 	stloc 14
-// 0x010c33f8: 0x10c33f8: addu  v0, v0, t8
+// 0x010c3a38: 0x10c3a38: addu  v0, v0, t8
 	ldloc 8
 	ldloc 14
 	add
 	stloc 8
-// 0x010c33fc: 0x10c33fc: subu  v0, v0, t5
+// 0x010c3a3c: 0x10c3a3c: subu  v0, v0, t5
 	ldloc 8
 	ldloc 10
 	sub
 	stloc 8
-L_10c3400:
-// 0x010c3400: 0x10c3400: bltz  v0, 0x10c3318 andi  a0, v1, 3
+L_10c3a40:
+// 0x010c3a40: 0x10c3a40: bltz  v0, 0x10c3958 andi  a0, v1, 3
 	ldloc 8
 	ldloc 5
 	ldc.i4.3
 	and
 	stloc.1
 	ldc.i4.s 0
-	blt L_10c3318
+	blt L_10c3958
 // --- basic block ---
-// 0x010c3408: 0x10c3408: bne   a0, zero, 0x10c3434 addiu a1, zero, 365
+// 0x010c3a48: 0x10c3a48: bne   a0, zero, 0x10c3a74 addiu a1, zero, 365
 	ldloc.1
 	ldc.i4 365
 	stloc.2
-	brtrue L_10c3434
+	brtrue L_10c3a74
 // --- basic block ---
-// 0x010c3410: 0x10c3410: div   v1, t0
+// 0x010c3a50: 0x10c3a50: div   v1, t0
 	ldloc 5
 	ldloc 13
 	ldloc 5
@@ -1775,16 +1775,16 @@ L_10c3400:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3414: 0x10c3414: mfhi  hi
+// 0x010c3a54: 0x10c3a54: mfhi  hi
 	ldloc 6
 	stloc 10
-// 0x010c3418: 0x10c3418: bne   t5, zero, 0x10c3434 addiu a1, zero, 366
+// 0x010c3a58: 0x10c3a58: bne   t5, zero, 0x10c3a74 addiu a1, zero, 366
 	ldloc 10
 	ldc.i4 366
 	stloc.2
-	brtrue L_10c3434
+	brtrue L_10c3a74
 // --- basic block ---
-// 0x010c3420: 0x10c3420: div   v1, a3
+// 0x010c3a60: 0x10c3a60: div   v1, a3
 	ldloc 5
 	ldloc 4
 	ldloc 5
@@ -1793,36 +1793,36 @@ L_10c3400:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3424: 0x10c3424: mfhi  hi
+// 0x010c3a64: 0x10c3a64: mfhi  hi
 	ldloc 6
 	stloc 10
-// 0x010c3428: 0x10c3428: beq   t5, zero, 0x10c3438 slt   a1, v0, a1
+// 0x010c3a68: 0x10c3a68: beq   t5, zero, 0x10c3a78 slt   a1, v0, a1
 	ldloc 10
 	ldloc 8
 	ldloc.2
 	clt
 	stloc.2
-	brfalse L_10c3438
+	brfalse L_10c3a78
 // --- basic block ---
-// 0x010c3430: 0x10c3430: addiu a1, zero, 365
+// 0x010c3a70: 0x10c3a70: addiu a1, zero, 365
 	ldc.i4 365
 	stloc.2
-L_10c3434:
-// 0x010c3434: 0x10c3434: slt   a1, v0, a1
+L_10c3a74:
+// 0x010c3a74: 0x10c3a74: slt   a1, v0, a1
 	ldloc 8
 	ldloc.2
 	clt
 	stloc.2
-L_10c3438:
-// 0x010c3438: 0x10c3438: beq   a1, zero, 0x10c3318 addiu a1, v1, -1900
+L_10c3a78:
+// 0x010c3a78: 0x10c3a78: beq   a1, zero, 0x10c3958 addiu a1, v1, -1900
 	ldloc.2
 	ldloc 5
 	ldc.i4 -1900
 	add
 	stloc.2
-	brfalse L_10c3318
+	brfalse L_10c3958
 // --- basic block ---
-// 0x010c3440: 0x10c3440: sw    a1, 20(a2)
+// 0x010c3a80: 0x10c3a80: sw    a1, 20(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
@@ -1831,7 +1831,7 @@ L_10c3438:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c3444: 0x10c3444: sw    v0, 28(a2)
+// 0x010c3a84: 0x10c3a84: sw    v0, 28(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
@@ -1840,16 +1840,16 @@ L_10c3438:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c3448: 0x10c3448: bne   a0, zero, 0x10c3474 addu  a1, zero, zero
+// 0x010c3a88: 0x10c3a88: bne   a0, zero, 0x10c3ab4 addu  a1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_10c3474
+	brtrue L_10c3ab4
 // --- basic block ---
-// 0x010c3450: 0x10c3450: addiu a0, zero, 100
+// 0x010c3a90: 0x10c3a90: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x010c3454: 0x10c3454: div   v1, a0
+// 0x010c3a94: 0x10c3a94: div   v1, a0
 	ldloc 5
 	ldloc.1
 	ldloc 5
@@ -1858,19 +1858,19 @@ L_10c3438:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c3458: 0x10c3458: mfhi  hi
+// 0x010c3a98: 0x10c3a98: mfhi  hi
 	ldloc 6
 	stloc.1
-// 0x010c345c: 0x10c345c: bne   a0, zero, 0x10c3474 addiu a1, zero, 1
+// 0x010c3a9c: 0x10c3a9c: bne   a0, zero, 0x10c3ab4 addiu a1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc.2
-	brtrue L_10c3474
+	brtrue L_10c3ab4
 // --- basic block ---
-// 0x010c3464: 0x10c3464: addiu a0, zero, 400
+// 0x010c3aa4: 0x10c3aa4: addiu a0, zero, 400
 	ldc.i4 400
 	stloc.1
-// 0x010c3468: 0x10c3468: div   v1, a0
+// 0x010c3aa8: 0x10c3aa8: div   v1, a0
 	ldloc 5
 	ldloc.1
 	ldloc 5
@@ -1879,82 +1879,82 @@ L_10c3438:
 	stloc 7
 	rem
 	stloc 6
-// 0x010c346c: 0x10c346c: mfhi  hi
+// 0x010c3aac: 0x10c3aac: mfhi  hi
 	ldloc 6
 	stloc 5
-// 0x010c3470: 0x10c3470: sltiu a1, v1, 1
+// 0x010c3ab0: 0x10c3ab0: sltiu a1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.2
-L_10c3474:
-// 0x010c3474: 0x10c3474: addiu v1, zero, 26
+L_10c3ab4:
+// 0x010c3ab4: 0x10c3ab4: addiu v1, zero, 26
 	ldc.i4.s 26
 	stloc 5
-// 0x010c3478: 0x10c3478: mult  a1, v1
+// 0x010c3ab8: 0x10c3ab8: mult  a1, v1
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 7
-// 0x010c347c: 0x10c347c: lui   v1, 0x20000
+// 0x010c3abc: 0x10c3abc: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010c3480: 0x10c3480: addiu v1, v1, 30116
+// 0x010c3ac0: 0x10c3ac0: addiu v1, v1, 30580
 	ldloc 5
-	ldc.i4 30116
+	ldc.i4 30580
 	add
 	stloc 5
-// 0x010c3484: 0x10c3484: addiu a0, zero, 11
+// 0x010c3ac4: 0x10c3ac4: addiu a0, zero, 11
 	ldc.i4.s 11
 	stloc.1
-// 0x010c3488: 0x10c3488: mflo  lo
+// 0x010c3ac8: 0x10c3ac8: mflo  lo
 	ldloc 7
 	stloc.2
-// 0x010c348c: 0x10c348c: j	 0x10c3498 addu  v1, v1, a1
+// 0x010c3acc: 0x10c3acc: j	 0x10c3ad8 addu  v1, v1, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-	br L_10c3498
+	br L_10c3ad8
 // --- basic block ---
-L_10c3494:
-// 0x010c3494: 0x10c3494: addiu a0, a0, -1
+L_10c3ad4:
+// 0x010c3ad4: 0x10c3ad4: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-L_10c3498:
-// 0x010c3498: 0x10c3498: lhu   a1, 22(v1)
+L_10c3ad8:
+// 0x010c3ad8: 0x10c3ad8: lhu   a1, 22(v1)
 	ldloc 5
 	ldc.i4.s 22
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x010c349c: 0x10c349c: sll   zero, zero, 0
-// 0x010c34a0: 0x10c34a0: slt   a3, v0, a1
+// 0x010c3adc: 0x10c3adc: sll   zero, zero, 0
+// 0x010c3ae0: 0x10c3ae0: slt   a3, v0, a1
 	ldloc 8
 	ldloc.2
 	clt
 	stloc 4
-// 0x010c34a4: 0x10c34a4: bne   a3, zero, 0x10c3494 addiu v1, v1, -2
+// 0x010c3ae4: 0x10c3ae4: bne   a3, zero, 0x10c3ad4 addiu v1, v1, -2
 	ldloc 4
 	ldloc 5
 	ldc.i4.s -2
 	add
 	stloc 5
-	brtrue L_10c3494
+	brtrue L_10c3ad4
 // --- basic block ---
-// 0x010c34ac: 0x10c34ac: addiu v0, v0, 1
+// 0x010c3aec: 0x10c3aec: addiu v0, v0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010c34b0: 0x10c34b0: subu  a1, v0, a1
+// 0x010c3af0: 0x10c3af0: subu  a1, v0, a1
 	ldloc 8
 	ldloc.2
 	sub
 	stloc.2
-// 0x010c34b4: 0x10c34b4: lw    s0, 4(sp)
+// 0x010c3af4: 0x10c3af4: lw    s0, 4(sp)
 	ldloc 11
 	ldloc.0
 	ldc.i4.2
@@ -1963,10 +1963,10 @@ L_10c3498:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010c34b8: 0x10c34b8: addiu v0, zero, 1
+// 0x010c3af8: 0x10c3af8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010c34bc: 0x10c34bc: sw    a1, 12(a2)
+// 0x010c3afc: 0x10c3afc: sw    a1, 12(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
@@ -1975,7 +1975,7 @@ L_10c3498:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010c34c0: 0x10c34c0: sw    a0, 16(a2)
+// 0x010c3b00: 0x10c3b00: sw    a0, 16(a2)
 	ldloc 11
 	ldloc.3
 	ldc.i4.2
@@ -1984,7 +1984,7 @@ L_10c3498:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010c34c4: 0x10c34c4: jr    ra addiu sp, sp, 8
+// 0x010c3b04: 0x10c3b04: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -1996,7 +1996,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 gmtime_10c34cc(int32,int32,int32,int32,int32)
+.method public static int32 gmtime_10c3b0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -2034,12 +2034,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c34cc: 0x10c34cc: addiu sp, sp, -24
+// 0x010c3b0c: 0x10c3b0c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c34d0: 0x10c34d0: sw    s0, 16(sp)
+// 0x010c3b10: 0x10c3b10: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2048,16 +2048,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c34d4: 0x10c34d4: lui   s0, 0xe0000
+// 0x010c3b14: 0x10c3b14: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010c34d8: 0x10c34d8: addiu a2, s0, 29556
+// 0x010c3b18: 0x10c3b18: addiu a2, s0, 30020
 	ldloc 5
-	ldc.i4 29556
+	ldc.i4 30020
 	add
 	stloc.3
-// 0x010c34dc: 0x10c34dc: sw    ra, 20(sp)
-// 0x010c34e0: 0x10c34e0: jal   0x10c3248 addu  a1, zero, zero
+// 0x010c3b1c: 0x10c3b1c: sw    ra, 20(sp)
+// 0x010c3b20: 0x10c3b20: jal   0x10c3888 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2065,18 +2065,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::__offtime_10c3248(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::__offtime_10c3888(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010c34e8: 0x10c34e8: lw    ra, 20(sp)
-// 0x010c34ec: 0x10c34ec: addiu v0, s0, 29556
+// 0x010c3b28: 0x10c3b28: lw    ra, 20(sp)
+// 0x010c3b2c: 0x10c3b2c: addiu v0, s0, 30020
 	ldloc 5
-	ldc.i4 29556
+	ldc.i4 30020
 	add
 	stloc 8
-// 0x010c34f0: 0x10c34f0: lw    s0, 16(sp)
+// 0x010c3b30: 0x10c3b30: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2085,7 +2085,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010c34f4: 0x10c34f4: jr    ra addiu sp, sp, 24
+// 0x010c3b34: 0x10c3b34: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2097,7 +2097,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 localtime_r_10c34fc(int32,int32,int32,int32,int32)
+.method public static int32 localtime_r_10c3b3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra,int32 lo)
@@ -2138,12 +2138,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c34fc: 0x10c34fc: addiu sp, sp, -24
+// 0x010c3b3c: 0x10c3b3c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c3500: 0x10c3500: sw    s0, 16(sp)
+// 0x010c3b40: 0x10c3b40: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2152,41 +2152,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c3504: 0x10c3504: sw    ra, 20(sp)
-// 0x010c3508: 0x10c3508: addu  s0, a1, zero
+// 0x010c3b44: 0x10c3b44: sw    ra, 20(sp)
+// 0x010c3b48: 0x10c3b48: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010c350c: 0x10c350c: cibyl_sysc 0x2c74
+// 0x010c3b4c: 0x10c3b4c: cibyl_sysc 0x2c74
 	call int32 [WazeWP7]Syscalls::NOPH_TimeZone_getDefault()
 	stloc 5
-// 0x010c3510: 0x10c3510: addu  v1, v0, zero
+// 0x010c3b50: 0x10c3b50: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c3514: 0x10c3514: cibyl_sysc_arg 0x3
+// 0x010c3b54: 0x10c3b54: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c3518: 0x10c3518: cibyl_sysc 0x2c8d
+// 0x010c3b58: 0x10c3b58: cibyl_sysc 0x2c8d
 	call int32 [WazeWP7]Syscalls::NOPH_TimeZone_getRawOffset(int32)
 	stloc 5
-// 0x010c351c: 0x10c351c: addu  a1, v0, zero
+// 0x010c3b5c: 0x10c3b5c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010c3520: 0x10c3520: cibyl_sysc_arg 0x3
+// 0x010c3b60: 0x10c3b60: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010c3524: 0x10c3524: cibyl_sysc 0x2ca8
+// 0x010c3b64: 0x10c3b64: cibyl_sysc 0x2ca8
 	call int32 [WazeWP7]Syscalls::NOPH_TimeZone_useDaylightTime(int32)
 	stloc 5
-// 0x010c3528: 0x10c3528: addu  v1, v0, zero
+// 0x010c3b68: 0x10c3b68: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010c352c: 0x10c352c: addiu v0, zero, -60
+// 0x010c3b6c: 0x10c3b6c: addiu v0, zero, -60
 	ldc.i4.s -60
 	stloc 5
-// 0x010c3530: 0x10c3530: mult  a1, v0
+// 0x010c3b70: 0x10c3b70: mult  a1, v0
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 10
-// 0x010c3534: 0x10c3534: sw    v1, 32(s0)
+// 0x010c3b74: 0x10c3b74: sw    v1, 32(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
@@ -2195,10 +2195,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c3538: 0x10c3538: mflo  lo
+// 0x010c3b78: 0x10c3b78: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x010c353c: 0x10c353c: jal   0x10c3248 addu  a2, s0, zero
+// 0x010c3b7c: 0x10c3b7c: jal   0x10c3888 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -2206,16 +2206,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::__offtime_10c3248(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::__offtime_10c3888(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010c3544: 0x10c3544: lw    ra, 20(sp)
-// 0x010c3548: 0x10c3548: addu  v0, s0, zero
+// 0x010c3b84: 0x10c3b84: lw    ra, 20(sp)
+// 0x010c3b88: 0x10c3b88: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x010c354c: 0x10c354c: lw    s0, 16(sp)
+// 0x010c3b8c: 0x10c3b8c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2224,7 +2224,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c3550: 0x10c3550: jr    ra addiu sp, sp, 24
+// 0x010c3b90: 0x10c3b90: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2236,7 +2236,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 localtime_10c3558(int32,int32,int32,int32,int32)
+.method public static int32 localtime_10c3b98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2271,18 +2271,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c3558: 0x10c3558: lui   a1, 0xe0000
+// 0x010c3b98: 0x10c3b98: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010c355c: 0x10c355c: addiu sp, sp, -24
+// 0x010c3b9c: 0x10c3b9c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c3560: 0x10c3560: sw    ra, 20(sp)
-// 0x010c3564: 0x10c3564: jal   0x10c34fc addiu a1, a1, 29520
+// 0x010c3ba0: 0x10c3ba0: sw    ra, 20(sp)
+// 0x010c3ba4: 0x10c3ba4: jal   0x10c3b3c addiu a1, a1, 29984
 	ldloc.2
-	ldc.i4 29520
+	ldc.i4 29984
 	add
 	stloc.2
 	ldloc.0
@@ -2290,14 +2290,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_r_10c34fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_r_10c3b3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010c356c: 0x10c356c: lw    ra, 20(sp)
-// 0x010c3570: 0x10c3570: sll   zero, zero, 0
-// 0x010c3574: 0x10c3574: jr    ra addiu sp, sp, 24
+// 0x010c3bac: 0x10c3bac: lw    ra, 20(sp)
+// 0x010c3bb0: 0x10c3bb0: sll   zero, zero, 0
+// 0x010c3bb4: 0x10c3bb4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2309,7 +2309,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 timegm_10c357c(int32,int32,int32,int32)
+.method public static int32 timegm_10c3bbc(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 lo,int32 t4,int32 v1,int32 t2,int32 v0,int32 t0,int32 t1,int32 t3,int32[] mem,int32 t5,int32 hi,int32 ra)
@@ -2365,7 +2365,7 @@ __CIBYL_function_return:
 	stloc 12
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c357c: 0x10c357c: lw    a3, 16(a0)
+// 0x010c3bbc: 0x10c3bbc: lw    a3, 16(a0)
 	ldloc 12
 	ldloc.0
 	ldc.i4.2
@@ -2374,7 +2374,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c3580: 0x10c3580: lw    a2, 20(a0)
+// 0x010c3bc0: 0x10c3bc0: lw    a2, 20(a0)
 	ldloc 12
 	ldloc.0
 	ldc.i4.2
@@ -2383,12 +2383,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c3584: 0x10c3584: addiu a1, a3, -1
+// 0x010c3bc4: 0x10c3bc4: addiu a1, a3, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010c3588: 0x10c3588: lw    t2, 12(a0)
+// 0x010c3bc8: 0x10c3bc8: lw    t2, 12(a0)
 	ldloc 12
 	ldloc.0
 	ldc.i4.2
@@ -2397,7 +2397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c358c: 0x10c358c: lw    t1, 8(a0)
+// 0x010c3bcc: 0x10c3bcc: lw    t1, 8(a0)
 	ldloc 12
 	ldloc.0
 	ldc.i4.2
@@ -2406,7 +2406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c3590: 0x10c3590: lw    v0, 4(a0)
+// 0x010c3bd0: 0x10c3bd0: lw    v0, 4(a0)
 	ldloc 12
 	ldloc.0
 	ldc.i4.2
@@ -2415,180 +2415,180 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3594: 0x10c3594: lw    t3, 0(a0)
+// 0x010c3bd4: 0x10c3bd4: lw    t3, 0(a0)
 	ldloc 12
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x010c3598: 0x10c3598: bgtz  a1, 0x10c35a8 addiu v1, a2, 1900
+// 0x010c3bd8: 0x10c3bd8: bgtz  a1, 0x10c3be8 addiu v1, a2, 1900
 	ldloc.1
 	ldloc.2
 	ldc.i4 1900
 	add
 	stloc 6
 	ldc.i4.s 0
-	bgt L_10c35a8
+	bgt L_10c3be8
 // --- basic block ---
-// 0x010c35a0: 0x10c35a0: addiu a1, a3, 11
+// 0x010c3be0: 0x10c3be0: addiu a1, a3, 11
 	ldloc.3
 	ldc.i4.s 11
 	add
 	stloc.1
-// 0x010c35a4: 0x10c35a4: addiu v1, a2, 1899
+// 0x010c3be4: 0x10c3be4: addiu v1, a2, 1899
 	ldloc.2
 	ldc.i4 1899
 	add
 	stloc 6
-L_10c35a8:
-// 0x010c35a8: 0x10c35a8: addiu a3, zero, 367
+L_10c3be8:
+// 0x010c3be8: 0x10c3be8: addiu a3, zero, 367
 	ldc.i4 367
 	stloc.3
-// 0x010c35ac: 0x10c35ac: mult  a1, a3
+// 0x010c3bec: 0x10c3bec: mult  a1, a3
 	ldloc.1
 	ldloc.3
 	mul
 	stloc 4
-// 0x010c35b0: 0x10c35b0: addiu t4, zero, 400
+// 0x010c3bf0: 0x10c3bf0: addiu t4, zero, 400
 	ldc.i4 400
 	stloc 5
-// 0x010c35b4: 0x10c35b4: addiu a2, zero, 12
+// 0x010c3bf4: 0x10c3bf4: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.2
-// 0x010c35b8: 0x10c35b8: lui   t0, 0x86b10000
+// 0x010c3bf8: 0x10c3bf8: lui   t0, 0x86b10000
 	ldc.i4 2259746816
 	stloc 9
-// 0x010c35bc: 0x10c35bc: addiu a1, zero, 100
+// 0x010c3bfc: 0x10c3bfc: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x010c35c0: 0x10c35c0: ori   t0, t0, 49024
+// 0x010c3c00: 0x10c3c00: ori   t0, t0, 49024
 	ldloc 9
 	ldc.i4 49024
 	or
 	stloc 9
-// 0x010c35c4: 0x10c35c4: addu  t0, t3, t0
+// 0x010c3c04: 0x10c3c04: addu  t0, t3, t0
 	ldloc 11
 	ldloc 9
 	add
 	stloc 9
-// 0x010c35c8: 0x10c35c8: srl   t5, v1, 2
+// 0x010c3c08: 0x10c3c08: srl   t5, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	stloc 13
-// 0x010c35cc: 0x10c35cc: addiu a0, zero, 60
+// 0x010c3c0c: 0x10c3c0c: addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.0
-// 0x010c35d0: 0x10c35d0: mflo  lo
+// 0x010c3c10: 0x10c3c10: mflo  lo
 	ldloc 4
 	stloc.3
-// 0x010c35d4: 0x10c35d4: sll   zero, zero, 0
-// 0x010c35d8: 0x10c35d8: sll   zero, zero, 0
-// 0x010c35dc: 0x10c35dc: divu  v1, t4
+// 0x010c3c14: 0x10c3c14: sll   zero, zero, 0
+// 0x010c3c18: 0x10c3c18: sll   zero, zero, 0
+// 0x010c3c1c: 0x10c3c1c: divu  v1, t4
 	ldloc 6
 	ldloc 5
 	div.un
 	stloc 4
-// 0x010c35e0: 0x10c35e0: mflo  lo
+// 0x010c3c20: 0x10c3c20: mflo  lo
 	ldloc 4
 	stloc 5
-// 0x010c35e4: 0x10c35e4: addu  t4, t5, t4
+// 0x010c3c24: 0x10c3c24: addu  t4, t5, t4
 	ldloc 13
 	ldloc 5
 	add
 	stloc 5
-// 0x010c35e8: 0x10c35e8: addu  t4, t4, t2
+// 0x010c3c28: 0x10c3c28: addu  t4, t4, t2
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010c35ec: 0x10c35ec: divu  a3, a2
+// 0x010c3c2c: 0x10c3c2c: divu  a3, a2
 	ldloc.3
 	ldloc.2
 	div.un
 	stloc 4
-// 0x010c35f0: 0x10c35f0: addiu a2, zero, 365
+// 0x010c3c30: 0x10c3c30: addiu a2, zero, 365
 	ldc.i4 365
 	stloc.2
-// 0x010c35f4: 0x10c35f4: addiu t5, zero, 24
+// 0x010c3c34: 0x10c3c34: addiu t5, zero, 24
 	ldc.i4.s 24
 	stloc 13
-// 0x010c35f8: 0x10c35f8: mflo  lo
+// 0x010c3c38: 0x10c3c38: mflo  lo
 	ldloc 4
 	stloc 11
-// 0x010c35fc: 0x10c35fc: sll   zero, zero, 0
-// 0x010c3600: 0x10c3600: sll   zero, zero, 0
-// 0x010c3604: 0x10c3604: divu  v1, a1
+// 0x010c3c3c: 0x10c3c3c: sll   zero, zero, 0
+// 0x010c3c40: 0x10c3c40: sll   zero, zero, 0
+// 0x010c3c44: 0x10c3c44: divu  v1, a1
 	ldloc 6
 	ldloc.1
 	div.un
 	stloc 4
-// 0x010c3608: 0x10c3608: mflo  lo
+// 0x010c3c48: 0x10c3c48: mflo  lo
 	ldloc 4
 	stloc 7
-// 0x010c360c: 0x10c360c: sll   zero, zero, 0
-// 0x010c3610: 0x10c3610: sll   zero, zero, 0
-// 0x010c3614: 0x10c3614: mult  v1, a2
+// 0x010c3c4c: 0x10c3c4c: sll   zero, zero, 0
+// 0x010c3c50: 0x10c3c50: sll   zero, zero, 0
+// 0x010c3c54: 0x10c3c54: mult  v1, a2
 	ldloc 6
 	ldloc.2
 	mul
 	stloc 4
-// 0x010c3618: 0x10c3618: mflo  lo
+// 0x010c3c58: 0x10c3c58: mflo  lo
 	ldloc 4
 	stloc 6
-// 0x010c361c: 0x10c361c: addu  t4, t4, v1
+// 0x010c3c5c: 0x10c3c5c: addu  t4, t4, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x010c3620: 0x10c3620: addu  t3, t4, t3
+// 0x010c3c60: 0x10c3c60: addu  t3, t4, t3
 	ldloc 5
 	ldloc 11
 	add
 	stloc 11
-// 0x010c3624: 0x10c3624: subu  t2, t3, t2
+// 0x010c3c64: 0x10c3c64: subu  t2, t3, t2
 	ldloc 11
 	ldloc 7
 	sub
 	stloc 7
-// 0x010c3628: 0x10c3628: mult  t2, t5
+// 0x010c3c68: 0x10c3c68: mult  t2, t5
 	ldloc 7
 	ldloc 13
 	mul
 	stloc 4
-// 0x010c362c: 0x10c362c: mflo  lo
+// 0x010c3c6c: 0x10c3c6c: mflo  lo
 	ldloc 4
 	stloc 7
-// 0x010c3630: 0x10c3630: addu  t1, t2, t1
+// 0x010c3c70: 0x10c3c70: addu  t1, t2, t1
 	ldloc 7
 	ldloc 10
 	add
 	stloc 10
-// 0x010c3634: 0x10c3634: sll   zero, zero, 0
-// 0x010c3638: 0x10c3638: mult  t1, a0
+// 0x010c3c74: 0x10c3c74: sll   zero, zero, 0
+// 0x010c3c78: 0x10c3c78: mult  t1, a0
 	ldloc 10
 	ldloc.0
 	mul
 	stloc 4
-// 0x010c363c: 0x10c363c: mflo  lo
+// 0x010c3c7c: 0x10c3c7c: mflo  lo
 	ldloc 4
 	stloc 10
-// 0x010c3640: 0x10c3640: addu  v0, t1, v0
+// 0x010c3c80: 0x10c3c80: addu  v0, t1, v0
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x010c3644: 0x10c3644: sll   zero, zero, 0
-// 0x010c3648: 0x10c3648: mult  v0, a0
+// 0x010c3c84: 0x10c3c84: sll   zero, zero, 0
+// 0x010c3c88: 0x10c3c88: mult  v0, a0
 	ldloc 8
 	ldloc.0
 	mul
 	stloc 4
-// 0x010c364c: 0x10c364c: mflo  lo
+// 0x010c3c8c: 0x10c3c8c: mflo  lo
 	ldloc 4
 	stloc 8
-// 0x010c3650: 0x10c3650: jr    ra addu  v0, t0, v0
+// 0x010c3c90: 0x10c3c90: jr    ra addu  v0, t0, v0
 	ldloc 9
 	ldloc 8
 	add
@@ -2600,7 +2600,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 close_10c3658(int32)
+.method public static int32 close_10c3c98(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2623,8 +2623,8 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c3658:
-// 0x010c3658: 0x10c3658: lw    v0, 20(a0)
+L_10c3c98:
+// 0x010c3c98: 0x10c3c98: lw    v0, 20(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2633,23 +2633,23 @@ L_10c3658:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c365c: 0x10c365c: sll   zero, zero, 0
-// 0x010c3660: 0x10c3660: lw    v1, 0(v0)
+// 0x010c3c9c: 0x10c3c9c: sll   zero, zero, 0
+// 0x010c3ca0: 0x10c3ca0: lw    v1, 0(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010c3664: 0x10c3664: sll   zero, zero, 0
-// 0x010c3668: 0x10c3668: cibyl_sysc_arg 0x3
+// 0x010c3ca4: 0x10c3ca4: sll   zero, zero, 0
+// 0x010c3ca8: 0x10c3ca8: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x010c366c: 0x10c366c: cibyl_sysc 0x2cc6
+// 0x010c3cac: 0x10c3cac: cibyl_sysc 0x2cc6
 	call void [WazeWP7]Syscalls::NOPH_InputStream_close(int32)
-// 0x010c3670: 0x10c3670: addu  v1, v0, zero
+// 0x010c3cb0: 0x10c3cb0: addu  v1, v0, zero
 	ldloc.1
 	stloc.2
-// 0x010c3674: 0x10c3674: jr    ra addu  v0, zero, zero
+// 0x010c3cb4: 0x10c3cb4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	br __CIBYL_function_return
@@ -2659,7 +2659,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 read_10c367c(int32,int32,int32,int32)
+.method public static int32 read_10c3cbc(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 t0,int32 t1,int32 t2,int32 ra)
@@ -2700,8 +2700,8 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c367c:
-// 0x010c367c: 0x10c367c: lw    t1, 20(a0)
+L_10c3cbc:
+// 0x010c3cbc: 0x10c3cbc: lw    t1, 20(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2710,83 +2710,83 @@ L_10c367c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3680: 0x10c3680: addiu t0, a0, 4
+// 0x010c3cc0: 0x10c3cc0: addiu t0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	add
 	stloc 7
-// 0x010c3684: 0x10c3684: j	 0x10c36c8 addu  v1, zero, zero
+// 0x010c3cc4: 0x10c3cc4: j	 0x10c3d08 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10c36c8
+	br L_10c3d08
 // --- basic block ---
-L_10c368c:
-// 0x010c368c: 0x10c368c: lw    t2, 0(t1)
+L_10c3ccc:
+// 0x010c3ccc: 0x10c3ccc: lw    t2, 0(t1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010c3690: 0x10c3690: bne   v0, zero, 0x10c369c addu  a3, a2, zero
+// 0x010c3cd0: 0x10c3cd0: bne   v0, zero, 0x10c3cdc addu  a3, a2, zero
 	ldloc 4
 	ldloc.2
 	stloc.3
-	brtrue L_10c369c
+	brtrue L_10c3cdc
 // --- basic block ---
-// 0x010c3698: 0x10c3698: addiu a3, zero, 4096
+// 0x010c3cd8: 0x10c3cd8: addiu a3, zero, 4096
 	ldc.i4 4096
 	stloc.3
-L_10c369c:
-// 0x010c369c: 0x10c369c: cibyl_sysc_arg 0xa
+L_10c3cdc:
+// 0x010c3cdc: 0x10c3cdc: cibyl_sysc_arg 0xa
 	ldloc 9
-// 0x010c36a0: 0x10c36a0: cibyl_sysc_arg 0x5
+// 0x010c3ce0: 0x10c3ce0: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010c36a4: 0x10c36a4: cibyl_sysc_arg 0x7
+// 0x010c3ce4: 0x10c3ce4: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x010c36a8: 0x10c36a8: cibyl_sysc_arg 0x8
+// 0x010c3ce8: 0x10c3ce8: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x010c36ac: 0x10c36ac: cibyl_sysc 0x2cdd
+// 0x010c3cec: 0x10c3cec: cibyl_sysc 0x2cdd
 	call int32 [WazeWP7]Syscalls::NOPH_InputStream_read_into(int32,int32,int32,int32)
 	stloc 4
-// 0x010c36b0: 0x10c36b0: addu  a3, v0, zero
+// 0x010c3cf0: 0x10c3cf0: addu  a3, v0, zero
 	ldloc 4
 	stloc.3
-// 0x010c36b4: 0x10c36b4: lh    v0, 4(a0)
+// 0x010c3cf4: 0x10c3cf4: lh    v0, 4(a0)
 	ldloc.0
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x010c36b8: 0x10c36b8: addu  a1, a1, a3
+// 0x010c3cf8: 0x10c3cf8: addu  a1, a1, a3
 	ldloc.1
 	ldloc.3
 	add
 	stloc.1
-// 0x010c36bc: 0x10c36bc: bne   v0, zero, 0x10c36d0 addu  v1, v1, a3
+// 0x010c3cfc: 0x10c3cfc: bne   v0, zero, 0x10c3d10 addu  v1, v1, a3
 	ldloc 4
 	ldloc 5
 	ldloc.3
 	add
 	stloc 5
-	brtrue L_10c36d0
+	brtrue L_10c3d10
 // --- basic block ---
-// 0x010c36c4: 0x10c36c4: subu  a2, a2, a3
+// 0x010c3d04: 0x10c3d04: subu  a2, a2, a3
 	ldloc.2
 	ldloc.3
 	sub
 	stloc.2
-L_10c36c8:
-// 0x010c36c8: 0x10c36c8: bne   a2, zero, 0x10c368c sltiu v0, a2, 4097
+L_10c3d08:
+// 0x010c3d08: 0x10c3d08: bne   a2, zero, 0x10c3ccc sltiu v0, a2, 4097
 	ldloc.2
 	ldloc.2
 	ldc.i4 4097
 	clt.un
 	stloc 4
-	brtrue L_10c368c
+	brtrue L_10c3ccc
 // --- basic block ---
-L_10c36d0:
-// 0x010c36d0: 0x10c36d0: jr    ra addu  v0, v1, zero
+L_10c3d10:
+// 0x010c3d10: 0x10c3d10: jr    ra addu  v0, v1, zero
 	ldloc 5
 	stloc 4
 	br __CIBYL_function_return
@@ -2796,7 +2796,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 write_10c36d8()
+.method public static int32 write_10c3d18()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -2810,8 +2810,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c36d8:
-// 0x010c36d8: 0x10c36d8: jr    ra addu  v0, zero, zero
+L_10c3d18:
+// 0x010c3d18: 0x10c3d18: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -2819,7 +2819,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 seek_10c36e0(int32,int32,int32,int32,int32)
+.method public static int32 seek_10c3d20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -2854,14 +2854,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c36e0:
-// 0x010c36e0: 0x10c36e0: addiu sp, sp, -24
+L_10c3d20:
+// 0x010c3d20: 0x10c3d20: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010c36e4: 0x10c36e4: sw    ra, 20(sp)
-// 0x010c36e8: 0x10c36e8: lw    a2, 20(a0)
+// 0x010c3d24: 0x10c3d24: sw    ra, 20(sp)
+// 0x010c3d28: 0x10c3d28: lw    a2, 20(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2870,29 +2870,29 @@ L_10c36e0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010c36ec: 0x10c36ec: bgez  a1, 0x10c370c addu  v1, a1, zero
+// 0x010c3d2c: 0x10c3d2c: bgez  a1, 0x10c3d4c addu  v1, a1, zero
 	ldloc.2
 	ldloc.2
 	stloc 5
 	ldc.i4.s 0
-	bge L_10c370c
+	bge L_10c3d4c
 // --- basic block ---
-// 0x010c36f4: 0x10c36f4: lw    v1, 0(a2)
+// 0x010c3d34: 0x10c3d34: lw    v1, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010c36f8: 0x10c36f8: sll   zero, zero, 0
-// 0x010c36fc: 0x10c36fc: cibyl_sysc_arg 0x3
+// 0x010c3d38: 0x10c3d38: sll   zero, zero, 0
+// 0x010c3d3c: 0x10c3d3c: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x010c3700: 0x10c3700: cibyl_sysc 0x2cf8
+// 0x010c3d40: 0x10c3d40: cibyl_sysc 0x2cf8
 	call void [WazeWP7]Syscalls::NOPH_InputStream_reset(int32)
-// 0x010c3704: 0x10c3704: addu  v1, v0, zero
+// 0x010c3d44: 0x10c3d44: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x010c3708: 0x10c3708: lw    v1, 12(a0)
+// 0x010c3d48: 0x10c3d48: lw    v1, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2901,34 +2901,34 @@ L_10c36e0:
 	add
 	ldelem.i4
 	stloc 5
-L_10c370c:
-// 0x010c370c: 0x10c370c: lw    a0, 0(a2)
+L_10c3d4c:
+// 0x010c3d4c: 0x10c3d4c: lw    a0, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c3710: 0x10c3710: sll   zero, zero, 0
-// 0x010c3714: 0x10c3714: cibyl_sysc_arg 0x4
+// 0x010c3d50: 0x10c3d50: sll   zero, zero, 0
+// 0x010c3d54: 0x10c3d54: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010c3718: 0x10c3718: cibyl_sysc_arg 0x3
+// 0x010c3d58: 0x10c3d58: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x010c371c: 0x10c371c: cibyl_sysc 0x2d0f
+// 0x010c3d5c: 0x10c3d5c: cibyl_sysc 0x2d0f
 	call int32 [WazeWP7]Syscalls::NOPH_InputStream_skip(int32,int32)
 	stloc 6
-// 0x010c3720: 0x10c3720: addu  a0, v0, zero
+// 0x010c3d60: 0x10c3d60: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010c3724: 0x10c3724: beq   a0, v1, 0x10c3738 sll   zero, zero, 0
+// 0x010c3d64: 0x10c3d64: beq   a0, v1, 0x10c3d78 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10c3738
+	beq  L_10c3d78
 // --- basic block ---
-// 0x010c372c: 0x10c372c: cibyl_sysc 0x2d25
+// 0x010c3d6c: 0x10c3d6c: cibyl_sysc 0x2d25
 	call int32 [WazeWP7]Syscalls::NOPH_Exception_new()
 	stloc 6
-// 0x010c3730: 0x10c3730: jal   0x1000130 addu  a0, v0, zero
+// 0x010c3d70: 0x10c3d70: jal   0x1000130 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldsfld object[] [WazeWP7]CRunTime::objectRepository
@@ -2937,10 +2937,10 @@ L_10c370c:
 	castclass [mscorlib]System.Exception
 	throw
 // --- basic block ---
-L_10c3738:
-// 0x010c3738: 0x10c3738: lw    ra, 20(sp)
-// 0x010c373c: 0x10c373c: sll   zero, zero, 0
-// 0x010c3740: 0x10c3740: jr    ra addiu sp, sp, 24
+L_10c3d78:
+// 0x010c3d78: 0x10c3d78: lw    ra, 20(sp)
+// 0x010c3d7c: 0x10c3d7c: sll   zero, zero, 0
+// 0x010c3d80: 0x10c3d80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2952,7 +2952,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void seek_10c3798()
+.method public static void seek_10c3dd8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2963,13 +2963,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c3798:
-// 0x010c3798: 0x10c3798: jr    ra sll   zero, zero, 0
+L_10c3dd8:
+// 0x010c3dd8: 0x10c3dd8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 NOPH_MemoryFile_getDataPtr_10c37a0(int32)
+.method public static int32 NOPH_MemoryFile_getDataPtr_10c3de0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -2989,7 +2989,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c37a0: 0x10c37a0: lw    v0, 20(a0)
+// 0x010c3de0: 0x10c3de0: lw    v0, 20(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2998,21 +2998,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c37a4: 0x10c37a4: sll   zero, zero, 0
-// 0x010c37a8: 0x10c37a8: lw    v0, 0(v0)
+// 0x010c3de4: 0x10c3de4: sll   zero, zero, 0
+// 0x010c3de8: 0x10c3de8: lw    v0, 0(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c37ac: 0x10c37ac: jr    ra sll   zero, zero, 0
+// 0x010c3dec: 0x10c3dec: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 write_10c37b4(int32,int32,int32,int32,int32)
+.method public static int32 write_10c3df4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s3,int32 s1,int32 s4,int32 v1,int32 s5,int32 ra)
@@ -3065,13 +3065,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c37b4:
-// 0x010c37b4: 0x10c37b4: addiu sp, sp, -48
+L_10c3df4:
+// 0x010c3df4: 0x10c3df4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010c37b8: 0x10c37b8: sw    s2, 28(sp)
+// 0x010c3df8: 0x10c3df8: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3080,7 +3080,7 @@ L_10c37b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c37bc: 0x10c37bc: lw    s2, 8(a0)
+// 0x010c3dfc: 0x10c3dfc: lw    s2, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3089,7 +3089,7 @@ L_10c37b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c37c0: 0x10c37c0: lw    v0, 16(a0)
+// 0x010c3e00: 0x10c3e00: lw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3098,17 +3098,17 @@ L_10c37b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c37c4: 0x10c37c4: addu  s2, a2, s2
+// 0x010c3e04: 0x10c3e04: addu  s2, a2, s2
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x010c37c8: 0x10c37c8: sltu  v1, s2, v0
+// 0x010c3e08: 0x10c3e08: sltu  v1, s2, v0
 	ldloc 7
 	ldloc 6
 	clt.un
 	stloc 12
-// 0x010c37cc: 0x10c37cc: sw    s5, 40(sp)
+// 0x010c3e0c: 0x10c3e0c: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3117,7 +3117,7 @@ L_10c37b4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010c37d0: 0x10c37d0: sw    s3, 32(sp)
+// 0x010c3e10: 0x10c3e10: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3126,7 +3126,7 @@ L_10c37b4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c37d4: 0x10c37d4: sw    s1, 24(sp)
+// 0x010c3e14: 0x10c3e14: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3135,7 +3135,7 @@ L_10c37b4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c37d8: 0x10c37d8: sw    s0, 20(sp)
+// 0x010c3e18: 0x10c3e18: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3144,8 +3144,8 @@ L_10c37b4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c37dc: 0x10c37dc: sw    ra, 44(sp)
-// 0x010c37e0: 0x10c37e0: sw    s4, 36(sp)
+// 0x010c3e1c: 0x10c3e1c: sw    ra, 44(sp)
+// 0x010c3e20: 0x10c3e20: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3154,13 +3154,13 @@ L_10c37b4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c37e4: 0x10c37e4: addu  s0, a0, zero
+// 0x010c3e24: 0x10c3e24: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c37e8: 0x10c37e8: addu  s1, a2, zero
+// 0x010c3e28: 0x10c3e28: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x010c37ec: 0x10c37ec: lw    s3, 20(a0)
+// 0x010c3e2c: 0x10c3e2c: lw    s3, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3169,17 +3169,17 @@ L_10c37b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c37f0: 0x10c37f0: beq   v1, zero, 0x10c37fc addu  s5, a1, zero
+// 0x010c3e30: 0x10c3e30: beq   v1, zero, 0x10c3e3c addu  s5, a1, zero
 	ldloc 12
 	ldloc.2
 	stloc 13
-	brfalse L_10c37fc
+	brfalse L_10c3e3c
 // --- basic block ---
-// 0x010c37f8: 0x10c37f8: addu  s2, v0, zero
+// 0x010c3e38: 0x10c3e38: addu  s2, v0, zero
 	ldloc 6
 	stloc 7
-L_10c37fc:
-// 0x010c37fc: 0x10c37fc: lw    v0, 4(s3)
+L_10c3e3c:
+// 0x010c3e3c: 0x10c3e3c: lw    v0, 4(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3188,28 +3188,28 @@ L_10c37fc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c3800: 0x10c3800: sll   zero, zero, 0
-// 0x010c3804: 0x10c3804: sltu  v0, v0, s2
+// 0x010c3e40: 0x10c3e40: sll   zero, zero, 0
+// 0x010c3e44: 0x10c3e44: sltu  v0, v0, s2
 	ldloc 6
 	ldloc 7
 	clt.un
 	stloc 6
-// 0x010c3808: 0x10c3808: beq   v0, zero, 0x10c3838 addiu s4, s2, 4096
+// 0x010c3e48: 0x10c3e48: beq   v0, zero, 0x10c3e78 addiu s4, s2, 4096
 	ldloc 6
 	ldloc 7
 	ldc.i4 4096
 	add
 	stloc 11
-	brfalse L_10c3838
+	brfalse L_10c3e78
 // --- basic block ---
-// 0x010c3810: 0x10c3810: lw    a0, 0(s3)
+// 0x010c3e50: 0x10c3e50: lw    a0, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c3814: 0x10c3814: jal   0x1000a60 addu  a1, s4, zero
+// 0x010c3e54: 0x10c3e54: jal   0x1000a60 addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -3222,7 +3222,7 @@ L_10c37fc:
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010c381c: 0x10c381c: bne   v0, zero, 0x10c382c sw    v0, 0(s3)
+// 0x010c3e5c: 0x10c3e5c: bne   v0, zero, 0x10c3e6c sw    v0, 0(s3)
 	ldloc 6
 	ldloc 5
 	ldloc 9
@@ -3230,15 +3230,15 @@ L_10c37fc:
 	shr.un
 	ldloc 6
 	stelem.i4
-	brtrue L_10c382c
+	brtrue L_10c3e6c
 // --- basic block ---
-// 0x010c3824: 0x10c3824: j	 0x10c3868 addiu s1, zero, -1
+// 0x010c3e64: 0x10c3e64: j	 0x10c3ea8 addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 10
-	br L_10c3868
+	br L_10c3ea8
 // --- basic block ---
-L_10c382c:
-// 0x010c382c: 0x10c382c: sw    s2, 16(s0)
+L_10c3e6c:
+// 0x010c3e6c: 0x10c3e6c: sw    s2, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3247,13 +3247,13 @@ L_10c382c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c3830: 0x10c3830: sh    zero, 4(s0)
+// 0x010c3e70: 0x10c3e70: sh    zero, 4(s0)
 	ldloc 8
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010c3834: 0x10c3834: sw    s4, 4(s3)
+// 0x010c3e74: 0x10c3e74: sw    s4, 4(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3262,8 +3262,8 @@ L_10c382c:
 	add
 	ldloc 11
 	stelem.i4
-L_10c3838:
-// 0x010c3838: 0x10c3838: lw    v0, 16(s0)
+L_10c3e78:
+// 0x010c3e78: 0x10c3e78: lw    v0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3272,17 +3272,17 @@ L_10c3838:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c383c: 0x10c383c: sll   zero, zero, 0
-// 0x010c3840: 0x10c3840: sltu  v0, v0, s2
+// 0x010c3e7c: 0x10c3e7c: sll   zero, zero, 0
+// 0x010c3e80: 0x10c3e80: sltu  v0, v0, s2
 	ldloc 6
 	ldloc 7
 	clt.un
 	stloc 6
-// 0x010c3844: 0x10c3844: beq   v0, zero, 0x10c3850 sll   zero, zero, 0
+// 0x010c3e84: 0x10c3e84: beq   v0, zero, 0x10c3e90 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10c3850
+	brfalse L_10c3e90
 // --- basic block ---
-// 0x010c384c: 0x10c384c: sw    s2, 16(s0)
+// 0x010c3e8c: 0x10c3e8c: sw    s2, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3291,15 +3291,15 @@ L_10c3838:
 	add
 	ldloc 7
 	stelem.i4
-L_10c3850:
-// 0x010c3850: 0x10c3850: lw    a0, 0(s3)
+L_10c3e90:
+// 0x010c3e90: 0x10c3e90: lw    a0, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c3854: 0x10c3854: lw    v0, 8(s0)
+// 0x010c3e94: 0x10c3e94: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3308,15 +3308,15 @@ L_10c3850:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c3858: 0x10c3858: addu  a1, s5, zero
+// 0x010c3e98: 0x10c3e98: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x010c385c: 0x10c385c: addu  a0, a0, v0
+// 0x010c3e9c: 0x10c3e9c: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x010c3860: 0x10c3860: jal   0x1001800 addu  a2, s1, zero
+// 0x010c3ea0: 0x10c3ea0: jal   0x1001800 addu  a2, s1, zero
 	ldloc 10
 	stloc.3
 	ldloc.1
@@ -3328,12 +3328,12 @@ L_10c3850:
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_10c3868:
-// 0x010c3868: 0x10c3868: lw    ra, 44(sp)
-// 0x010c386c: 0x10c386c: addu  v0, s1, zero
+L_10c3ea8:
+// 0x010c3ea8: 0x10c3ea8: lw    ra, 44(sp)
+// 0x010c3eac: 0x10c3eac: addu  v0, s1, zero
 	ldloc 10
 	stloc 6
-// 0x010c3870: 0x10c3870: lw    s5, 40(sp)
+// 0x010c3eb0: 0x10c3eb0: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3342,7 +3342,7 @@ L_10c3868:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010c3874: 0x10c3874: lw    s4, 36(sp)
+// 0x010c3eb4: 0x10c3eb4: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3351,7 +3351,7 @@ L_10c3868:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c3878: 0x10c3878: lw    s3, 32(sp)
+// 0x010c3eb8: 0x10c3eb8: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3360,7 +3360,7 @@ L_10c3868:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c387c: 0x10c387c: lw    s2, 28(sp)
+// 0x010c3ebc: 0x10c3ebc: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3369,7 +3369,7 @@ L_10c3868:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c3880: 0x10c3880: lw    s1, 24(sp)
+// 0x010c3ec0: 0x10c3ec0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3378,7 +3378,7 @@ L_10c3868:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c3884: 0x10c3884: lw    s0, 20(sp)
+// 0x010c3ec4: 0x10c3ec4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3387,7 +3387,7 @@ L_10c3868:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3888: 0x10c3888: jr    ra addiu sp, sp, 48
+// 0x010c3ec8: 0x10c3ec8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3399,7 +3399,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 read_10c3890(int32,int32,int32,int32,int32)
+.method public static int32 read_10c3ed0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3440,8 +3440,8 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c3890:
-// 0x010c3890: 0x10c3890: lw    v0, 8(a0)
+L_10c3ed0:
+// 0x010c3ed0: 0x10c3ed0: lw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3450,7 +3450,7 @@ L_10c3890:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c3894: 0x10c3894: lw    v1, 16(a0)
+// 0x010c3ed4: 0x10c3ed4: lw    v1, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3459,17 +3459,17 @@ L_10c3890:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c3898: 0x10c3898: addiu sp, sp, -32
+// 0x010c3ed8: 0x10c3ed8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c389c: 0x10c389c: subu  v1, v1, v0
+// 0x010c3edc: 0x10c3edc: subu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 7
-// 0x010c38a0: 0x10c38a0: sw    s1, 24(sp)
+// 0x010c3ee0: 0x10c3ee0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3478,15 +3478,15 @@ L_10c3890:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c38a4: 0x10c38a4: addu  s1, a2, zero
+// 0x010c3ee4: 0x10c3ee4: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010c38a8: 0x10c38a8: sltu  a2, v1, a2
+// 0x010c3ee8: 0x10c3ee8: sltu  a2, v1, a2
 	ldloc 7
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x010c38ac: 0x10c38ac: sw    s0, 20(sp)
+// 0x010c3eec: 0x10c3eec: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3495,21 +3495,21 @@ L_10c3890:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c38b0: 0x10c38b0: sw    ra, 28(sp)
-// 0x010c38b4: 0x10c38b4: addu  s0, a0, zero
+// 0x010c3ef0: 0x10c3ef0: sw    ra, 28(sp)
+// 0x010c3ef4: 0x10c3ef4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c38b8: 0x10c38b8: beq   a2, zero, 0x10c38c4 addu  a0, a1, zero
+// 0x010c3ef8: 0x10c3ef8: beq   a2, zero, 0x10c3f04 addu  a0, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc.1
-	brfalse L_10c38c4
+	brfalse L_10c3f04
 // --- basic block ---
-// 0x010c38c0: 0x10c38c0: addu  s1, v1, zero
+// 0x010c3f00: 0x10c3f00: addu  s1, v1, zero
 	ldloc 7
 	stloc 9
-L_10c38c4:
-// 0x010c38c4: 0x10c38c4: lw    v1, 20(s0)
+L_10c3f04:
+// 0x010c3f04: 0x10c3f04: lw    v1, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3518,17 +3518,17 @@ L_10c38c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c38c8: 0x10c38c8: addu  a2, s1, zero
+// 0x010c3f08: 0x10c3f08: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x010c38cc: 0x10c38cc: lw    a1, 0(v1)
+// 0x010c3f0c: 0x10c3f0c: lw    a1, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010c38d0: 0x10c38d0: jal   0x1001800 addu  a1, a1, v0
+// 0x010c3f10: 0x10c3f10: jal   0x1001800 addu  a1, a1, v0
 	ldloc.2
 	ldloc 6
 	add
@@ -3542,7 +3542,7 @@ L_10c38c4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c38d8: 0x10c38d8: lw    v1, 8(s0)
+// 0x010c3f18: 0x10c3f18: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3551,7 +3551,7 @@ L_10c38c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c38dc: 0x10c38dc: lw    v0, 16(s0)
+// 0x010c3f1c: 0x10c3f1c: lw    v0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3560,30 +3560,30 @@ L_10c38c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c38e0: 0x10c38e0: sll   zero, zero, 0
-// 0x010c38e4: 0x10c38e4: sltu  v0, v1, v0
+// 0x010c3f20: 0x10c3f20: sll   zero, zero, 0
+// 0x010c3f24: 0x10c3f24: sltu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010c38e8: 0x10c38e8: bne   v0, zero, 0x10c38f4 addiu v0, zero, 1
+// 0x010c3f28: 0x10c3f28: bne   v0, zero, 0x10c3f34 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_10c38f4
+	brtrue L_10c3f34
 // --- basic block ---
-// 0x010c38f0: 0x10c38f0: sh    v0, 4(s0)
+// 0x010c3f30: 0x10c3f30: sh    v0, 4(s0)
 	ldloc 8
 	ldc.i4.4
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_10c38f4:
-// 0x010c38f4: 0x10c38f4: lw    ra, 28(sp)
-// 0x010c38f8: 0x10c38f8: addu  v0, s1, zero
+L_10c3f34:
+// 0x010c3f34: 0x10c3f34: lw    ra, 28(sp)
+// 0x010c3f38: 0x10c3f38: addu  v0, s1, zero
 	ldloc 9
 	stloc 6
-// 0x010c38fc: 0x10c38fc: lw    s1, 24(sp)
+// 0x010c3f3c: 0x10c3f3c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3592,7 +3592,7 @@ L_10c38f4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c3900: 0x10c3900: lw    s0, 20(sp)
+// 0x010c3f40: 0x10c3f40: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3601,7 +3601,7 @@ L_10c38f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3904: 0x10c3904: jr    ra addiu sp, sp, 32
+// 0x010c3f44: 0x10c3f44: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3613,7 +3613,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 close_10c390c(int32,int32,int32,int32,int32)
+.method public static int32 close_10c3f4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3657,13 +3657,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10c390c:
-// 0x010c390c: 0x10c390c: addiu sp, sp, -32
+L_10c3f4c:
+// 0x010c3f4c: 0x10c3f4c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c3910: 0x10c3910: sw    s0, 16(sp)
+// 0x010c3f50: 0x10c3f50: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3672,7 +3672,7 @@ L_10c390c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c3914: 0x10c3914: lw    s0, 20(a0)
+// 0x010c3f54: 0x10c3f54: lw    s0, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3681,7 +3681,7 @@ L_10c390c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3918: 0x10c3918: sw    s2, 24(sp)
+// 0x010c3f58: 0x10c3f58: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3690,10 +3690,10 @@ L_10c390c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c391c: 0x10c391c: addu  s2, a0, zero
+// 0x010c3f5c: 0x10c3f5c: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010c3920: 0x10c3920: lw    a0, 12(s0)
+// 0x010c3f60: 0x10c3f60: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3702,8 +3702,8 @@ L_10c390c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c3924: 0x10c3924: sw    ra, 28(sp)
-// 0x010c3928: 0x10c3928: beq   a0, zero, 0x10c3988 sw    s1, 20(sp)
+// 0x010c3f64: 0x10c3f64: sw    ra, 28(sp)
+// 0x010c3f68: 0x10c3f68: beq   a0, zero, 0x10c3fc8 sw    s1, 20(sp)
 	ldloc.1
 	ldloc 5
 	ldloc.0
@@ -3713,9 +3713,9 @@ L_10c390c:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_10c3988
+	brfalse L_10c3fc8
 // --- basic block ---
-// 0x010c3930: 0x10c3930: lw    a1, 16(s0)
+// 0x010c3f70: 0x10c3f70: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3724,7 +3724,7 @@ L_10c390c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c3934: 0x10c3934: jal   0x1002540 sll   zero, zero, 0
+// 0x010c3f74: 0x10c3f74: jal   0x1002540 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3735,7 +3735,7 @@ L_10c390c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c393c: 0x10c393c: lw    a0, 16(s0)
+// 0x010c3f7c: 0x10c3f7c: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3744,7 +3744,7 @@ L_10c390c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c3940: 0x10c3940: jal   0x1000930 addu  s1, v0, zero
+// 0x010c3f80: 0x10c3f80: jal   0x1000930 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -3757,7 +3757,7 @@ L_10c390c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c3948: 0x10c3948: lw    a0, 12(s0)
+// 0x010c3f88: 0x10c3f88: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3766,7 +3766,7 @@ L_10c390c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010c394c: 0x10c394c: jal   0x1000930 sll   zero, zero, 0
+// 0x010c3f8c: 0x10c3f8c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3777,20 +3777,20 @@ L_10c390c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c3954: 0x10c3954: beq   s1, zero, 0x10c39a8 addiu v0, zero, -1
+// 0x010c3f94: 0x10c3f94: beq   s1, zero, 0x10c3fe8 addiu v0, zero, -1
 	ldloc 9
 	ldc.i4.m1
 	stloc 6
-	brfalse L_10c39a8
+	brfalse L_10c3fe8
 // --- basic block ---
-// 0x010c395c: 0x10c395c: lw    a0, 0(s0)
+// 0x010c3f9c: 0x10c3f9c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c3960: 0x10c3960: lw    a1, 16(s2)
+// 0x010c3fa0: 0x10c3fa0: lw    a1, 16(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3799,10 +3799,10 @@ L_10c390c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010c3964: 0x10c3964: addiu a2, zero, 1
+// 0x010c3fa4: 0x10c3fa4: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010c3968: 0x10c3968: jal   0x1001da4 addu  a3, s1, zero
+// 0x010c3fa8: 0x10c3fa8: jal   0x1001da4 addu  a3, s1, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -3815,7 +3815,7 @@ L_10c390c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c3970: 0x10c3970: lw    v1, 16(s2)
+// 0x010c3fb0: 0x10c3fb0: lw    v1, 16(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3824,15 +3824,15 @@ L_10c390c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c3974: 0x10c3974: sll   zero, zero, 0
-// 0x010c3978: 0x10c3978: bne   v0, v1, 0x10c39a8 addiu v0, zero, -1
+// 0x010c3fb4: 0x10c3fb4: sll   zero, zero, 0
+// 0x010c3fb8: 0x10c3fb8: bne   v0, v1, 0x10c3fe8 addiu v0, zero, -1
 	ldloc 6
 	ldloc 7
 	ldc.i4.m1
 	stloc 6
-	bne.un L_10c39a8
+	bne.un L_10c3fe8
 // --- basic block ---
-// 0x010c3980: 0x10c3980: jal   0x10023b4 addu  a0, s1, zero
+// 0x010c3fc0: 0x10c3fc0: jal   0x10023b4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3845,8 +3845,8 @@ L_10c390c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10c3988:
-// 0x010c3988: 0x10c3988: lw    v1, 8(s0)
+L_10c3fc8:
+// 0x010c3fc8: 0x10c3fc8: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3855,21 +3855,21 @@ L_10c3988:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c398c: 0x10c398c: sll   zero, zero, 0
-// 0x010c3990: 0x10c3990: beq   v1, zero, 0x10c39a8 addu  v0, zero, zero
+// 0x010c3fcc: 0x10c3fcc: sll   zero, zero, 0
+// 0x010c3fd0: 0x10c3fd0: beq   v1, zero, 0x10c3fe8 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10c39a8
+	brfalse L_10c3fe8
 // --- basic block ---
-// 0x010c3998: 0x10c3998: lw    a0, 0(s0)
+// 0x010c3fd8: 0x10c3fd8: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010c399c: 0x10c399c: jal   0x1000930 sll   zero, zero, 0
+// 0x010c3fdc: 0x10c3fdc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3880,12 +3880,12 @@ L_10c3988:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010c39a4: 0x10c39a4: addu  v0, zero, zero
+// 0x010c3fe4: 0x10c3fe4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10c39a8:
-// 0x010c39a8: 0x10c39a8: lw    ra, 28(sp)
-// 0x010c39ac: 0x10c39ac: lw    s2, 24(sp)
+L_10c3fe8:
+// 0x010c3fe8: 0x10c3fe8: lw    ra, 28(sp)
+// 0x010c3fec: 0x10c3fec: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3894,7 +3894,7 @@ L_10c39a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c39b0: 0x10c39b0: lw    s1, 20(sp)
+// 0x010c3ff0: 0x10c3ff0: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3903,7 +3903,7 @@ L_10c39a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c39b4: 0x10c39b4: lw    s0, 16(sp)
+// 0x010c3ff4: 0x10c3ff4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3912,7 +3912,7 @@ L_10c39a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c39b8: 0x10c39b8: jr    ra addiu sp, sp, 32
+// 0x010c3ff8: 0x10c3ff8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3924,7 +3924,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 NOPH_MemoryFile_setup_10c39c0(int32,int32,int32,int32,int32)
+.method public static int32 NOPH_MemoryFile_setup_10c4000(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v1,int32 s1,int32 v0,int32 ra)
@@ -3965,12 +3965,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c39c0: 0x10c39c0: addiu sp, sp, -32
+// 0x010c4000: 0x10c4000: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010c39c4: 0x10c39c4: sw    s0, 20(sp)
+// 0x010c4004: 0x10c4004: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3979,7 +3979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010c39c8: 0x10c39c8: lw    s0, 20(a0)
+// 0x010c4008: 0x10c4008: lw    s0, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3988,7 +3988,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c39cc: 0x10c39cc: sw    s1, 24(sp)
+// 0x010c400c: 0x10c400c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3997,11 +3997,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c39d0: 0x10c39d0: sw    ra, 28(sp)
-// 0x010c39d4: 0x10c39d4: addu  s1, a0, zero
+// 0x010c4010: 0x10c4010: sw    ra, 28(sp)
+// 0x010c4014: 0x10c4014: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c39d8: 0x10c39d8: bne   a1, zero, 0x10c3a14 sw    a3, 8(s0)
+// 0x010c4018: 0x10c4018: bne   a1, zero, 0x10c4054 sw    a3, 8(s0)
 	ldloc.2
 	ldloc 5
 	ldloc 6
@@ -4011,9 +4011,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-	brtrue L_10c3a14
+	brtrue L_10c4054
 // --- basic block ---
-// 0x010c39e0: 0x10c39e0: jal   0x1000910 addiu a0, zero, 4096
+// 0x010c4020: 0x10c4020: jal   0x1000910 addiu a0, zero, 4096
 	ldc.i4 4096
 	stloc.1
 	ldloc.0
@@ -4026,10 +4026,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x010c39e8: 0x10c39e8: addiu v1, zero, 1
+// 0x010c4028: 0x10c4028: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010c39ec: 0x10c39ec: sw    zero, 16(s1)
+// 0x010c402c: 0x10c402c: sw    zero, 16(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4038,7 +4038,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010c39f0: 0x10c39f0: sw    v1, 8(s0)
+// 0x010c4030: 0x10c4030: sw    v1, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4047,10 +4047,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c39f4: 0x10c39f4: addiu v1, zero, 4096
+// 0x010c4034: 0x10c4034: addiu v1, zero, 4096
 	ldc.i4 4096
 	stloc 7
-// 0x010c39f8: 0x10c39f8: sw    v1, 4(s0)
+// 0x010c4038: 0x10c4038: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4059,7 +4059,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c39fc: 0x10c39fc: bne   v0, zero, 0x10c3a20 sw    v0, 0(s0)
+// 0x010c403c: 0x10c403c: bne   v0, zero, 0x10c4060 sw    v0, 0(s0)
 	ldloc 9
 	ldloc 5
 	ldloc 6
@@ -4067,9 +4067,9 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldloc 9
 	stelem.i4
-	brtrue L_10c3a20
+	brtrue L_10c4060
 // --- basic block ---
-// 0x010c3a04: 0x10c3a04: jal   0x1002394 addu  a0, s1, zero
+// 0x010c4044: 0x10c4044: jal   0x1002394 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4082,11 +4082,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x010c3a0c: 0x10c3a0c: j	 0x10c3a20 sll   zero, zero, 0
-	br L_10c3a20
+// 0x010c404c: 0x10c404c: j	 0x10c4060 sll   zero, zero, 0
+	br L_10c4060
 // --- basic block ---
-L_10c3a14:
-// 0x010c3a14: 0x10c3a14: sw    a2, 4(s0)
+L_10c4054:
+// 0x010c4054: 0x10c4054: sw    a2, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4095,14 +4095,14 @@ L_10c3a14:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c3a18: 0x10c3a18: sw    a1, 0(s0)
+// 0x010c4058: 0x10c4058: sw    a1, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010c3a1c: 0x10c3a1c: sw    a2, 16(a0)
+// 0x010c405c: 0x10c405c: sw    a2, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4111,9 +4111,9 @@ L_10c3a14:
 	add
 	ldloc.3
 	stelem.i4
-L_10c3a20:
-// 0x010c3a20: 0x10c3a20: lw    ra, 28(sp)
-// 0x010c3a24: 0x10c3a24: lw    s1, 24(sp)
+L_10c4060:
+// 0x010c4060: 0x10c4060: lw    ra, 28(sp)
+// 0x010c4064: 0x10c4064: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4122,7 +4122,7 @@ L_10c3a20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3a28: 0x10c3a28: lw    s0, 20(sp)
+// 0x010c4068: 0x10c4068: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4131,7 +4131,7 @@ L_10c3a20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c3a2c: 0x10c3a2c: jr    ra addiu sp, sp, 32
+// 0x010c406c: 0x10c406c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4143,7 +4143,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 NOPH_MemoryFile_open_10c3a34(int32,int32,int32,int32,int32)
+.method public static int32 NOPH_MemoryFile_open_10c4074(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -4184,12 +4184,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c3a34: 0x10c3a34: addiu sp, sp, -40
+// 0x010c4074: 0x10c4074: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010c3a38: 0x10c3a38: sw    s1, 32(sp)
+// 0x010c4078: 0x10c4078: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4198,19 +4198,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010c3a3c: 0x10c3a3c: addu  s1, a0, zero
+// 0x010c407c: 0x10c407c: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010c3a40: 0x10c3a40: lui   a0, 0x0
+// 0x010c4080: 0x10c4080: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010c3a44: 0x10c3a44: addiu a0, a0, 19920
+// 0x010c4084: 0x10c4084: addiu a0, a0, 19920
 	ldloc.1
 	ldc.i4 19920
 	add
 	stloc.1
-// 0x010c3a48: 0x10c3a48: sw    ra, 36(sp)
-// 0x010c3a4c: 0x10c3a4c: sw    s0, 28(sp)
+// 0x010c4088: 0x10c4088: sw    ra, 36(sp)
+// 0x010c408c: 0x10c408c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4219,7 +4219,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010c3a50: 0x10c3a50: sw    a2, 16(sp)
+// 0x010c4090: 0x10c4090: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4228,7 +4228,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010c3a54: 0x10c3a54: jal   0x1002450 addu  s0, a1, zero
+// 0x010c4094: 0x10c4094: jal   0x1002450 addu  s0, a1, zero
 	ldloc.2
 	stloc 7
 	ldloc.0
@@ -4241,7 +4241,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010c3a5c: 0x10c3a5c: lw    a3, 16(sp)
+// 0x010c409c: 0x10c409c: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4250,16 +4250,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010c3a60: 0x10c3a60: addu  a0, v0, zero
+// 0x010c40a0: 0x10c40a0: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010c3a64: 0x10c3a64: addu  a1, s1, zero
+// 0x010c40a4: 0x10c40a4: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010c3a68: 0x10c3a68: addu  a2, s0, zero
+// 0x010c40a8: 0x10c40a8: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x010c3a6c: 0x10c3a6c: jal   0x10c39c0 sw    v0, 16(sp)
+// 0x010c40ac: 0x10c40ac: jal   0x10c4000 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4273,13 +4273,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::NOPH_MemoryFile_setup_10c39c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::NOPH_MemoryFile_setup_10c4000(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x010c3a74: 0x10c3a74: lw    ra, 36(sp)
-// 0x010c3a78: 0x10c3a78: lw    v0, 16(sp)
+// 0x010c40b4: 0x10c40b4: lw    ra, 36(sp)
+// 0x010c40b8: 0x10c40b8: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4288,7 +4288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010c3a7c: 0x10c3a7c: lw    s1, 32(sp)
+// 0x010c40bc: 0x10c40bc: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4297,7 +4297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3a80: 0x10c3a80: lw    s0, 28(sp)
+// 0x010c40c0: 0x10c40c0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4306,7 +4306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010c3a84: 0x10c3a84: jr    ra addiu sp, sp, 40
+// 0x010c40c4: 0x10c40c4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4318,7 +4318,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 NOPH_MemoryFile_openIndirectSizeHint_10c3a8c(int32,int32,int32,int32,int32)
+.method public static int32 NOPH_MemoryFile_openIndirectSizeHint_10c40cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s5,int32 s6,int32 s4,int32 s7,int32 ra)
@@ -4377,12 +4377,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010c3a8c: 0x10c3a8c: addiu sp, sp, -56
+// 0x010c40cc: 0x10c40cc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010c3a90: 0x10c3a90: sw    s7, 48(sp)
+// 0x010c40d0: 0x10c40d0: sw    s7, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4391,14 +4391,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010c3a94: 0x10c3a94: addu  s7, a0, zero
+// 0x010c40d4: 0x10c40d4: addu  s7, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010c3a98: 0x10c3a98: addu  a0, a1, zero
+// 0x010c40d8: 0x10c40d8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010c3a9c: 0x10c3a9c: sw    ra, 52(sp)
-// 0x010c3aa0: 0x10c3aa0: sw    s6, 44(sp)
+// 0x010c40dc: 0x10c40dc: sw    ra, 52(sp)
+// 0x010c40e0: 0x10c40e0: sw    s6, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4407,7 +4407,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010c3aa4: 0x10c3aa4: sw    s4, 36(sp)
+// 0x010c40e4: 0x10c40e4: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4416,7 +4416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010c3aa8: 0x10c3aa8: sw    s1, 24(sp)
+// 0x010c40e8: 0x10c40e8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4425,13 +4425,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010c3aac: 0x10c3aac: addu  s4, a1, zero
+// 0x010c40ec: 0x10c40ec: addu  s4, a1, zero
 	ldloc.2
 	stloc 14
-// 0x010c3ab0: 0x10c3ab0: addu  s6, a2, zero
+// 0x010c40f0: 0x10c40f0: addu  s6, a2, zero
 	ldloc.3
 	stloc 13
-// 0x010c3ab4: 0x10c3ab4: sw    s5, 40(sp)
+// 0x010c40f4: 0x10c40f4: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4440,7 +4440,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010c3ab8: 0x10c3ab8: sw    s3, 32(sp)
+// 0x010c40f8: 0x10c40f8: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4449,7 +4449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010c3abc: 0x10c3abc: sw    s2, 28(sp)
+// 0x010c40fc: 0x10c40fc: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4458,7 +4458,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010c3ac0: 0x10c3ac0: jal   0x10024b0 sw    s0, 20(sp)
+// 0x010c4100: 0x10c4100: jal   0x10024b0 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4477,28 +4477,28 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3ac8: 0x10c3ac8: addiu a0, v0, -3
+// 0x010c4108: 0x10c4108: addiu a0, v0, -3
 	ldloc 5
 	ldc.i4.s -3
 	add
 	stloc.1
-// 0x010c3acc: 0x10c3acc: lui   a1, 0x20000
+// 0x010c410c: 0x10c410c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010c3ad0: 0x10c3ad0: addu  s1, v0, zero
+// 0x010c4110: 0x10c4110: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010c3ad4: 0x10c3ad4: sltiu a0, a0, 2
+// 0x010c4114: 0x10c4114: sltiu a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	clt.un
 	stloc.1
-// 0x010c3ad8: 0x10c3ad8: addiu a1, a1, 23540
+// 0x010c4118: 0x10c4118: addiu a1, a1, 24000
 	ldloc.2
-	ldc.i4 23540
+	ldc.i4 24000
 	add
 	stloc.2
-// 0x010c3adc: 0x10c3adc: jal   0x10001f8 addu  a2, s4, zero
+// 0x010c411c: 0x10c411c: jal   0x10001f8 addu  a2, s4, zero
 	ldloc 14
 	stloc.3
 	ldloc.0
@@ -4511,32 +4511,32 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3ae4: 0x10c3ae4: sltiu v0, s1, 2
+// 0x010c4124: 0x10c4124: sltiu v0, s1, 2
 	ldloc 9
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x010c3ae8: 0x10c3ae8: bne   v0, zero, 0x10c3af8 addu  a1, zero, zero
+// 0x010c4128: 0x10c4128: bne   v0, zero, 0x10c4138 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_10c3af8
+	brtrue L_10c4138
 // --- basic block ---
-// 0x010c3af0: 0x10c3af0: j	 0x10c3b70 addu  s0, zero, zero
+// 0x010c4130: 0x10c4130: j	 0x10c41b0 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10c3b70
+	br L_10c41b0
 // --- basic block ---
-L_10c3af8:
-// 0x010c3af8: 0x10c3af8: lui   a1, 0x10000
+L_10c4138:
+// 0x010c4138: 0x10c4138: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010c3afc: 0x10c3afc: addiu a1, a1, 6924
+// 0x010c413c: 0x10c413c: addiu a1, a1, 6920
 	ldloc.2
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc.2
-// 0x010c3b00: 0x10c3b00: jal   0x1002540 addu  a0, s7, zero
+// 0x010c4140: 0x10c4140: jal   0x1002540 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -4549,31 +4549,31 @@ L_10c3af8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3b08: 0x10c3b08: addu  s3, v0, zero
+// 0x010c4148: 0x10c4148: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010c3b0c: 0x10c3b0c: beq   v0, zero, 0x10c3bc4 addu  s0, zero, zero
+// 0x010c414c: 0x10c414c: beq   v0, zero, 0x10c4204 addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_10c3bc4
+	brfalse L_10c4204
 // --- basic block ---
-// 0x010c3b14: 0x10c3b14: addu  s2, zero, zero
+// 0x010c4154: 0x10c4154: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010c3b18: 0x10c3b18: addu  s5, zero, zero
+// 0x010c4158: 0x10c4158: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 12
-L_10c3b1c:
-// 0x010c3b1c: 0x10c3b1c: addu  s5, s5, s6
+L_10c415c:
+// 0x010c415c: 0x10c415c: addu  s5, s5, s6
 	ldloc 12
 	ldloc 13
 	add
 	stloc 12
-// 0x010c3b20: 0x10c3b20: addu  a0, s0, zero
+// 0x010c4160: 0x10c4160: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c3b24: 0x10c3b24: jal   0x1000a60 addu  a1, s5, zero
+// 0x010c4164: 0x10c4164: jal   0x1000a60 addu  a1, s5, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -4586,27 +4586,27 @@ L_10c3b1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3b2c: 0x10c3b2c: addu  s0, v0, zero
+// 0x010c416c: 0x10c416c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010c3b30: 0x10c3b30: addu  a0, v0, s2
+// 0x010c4170: 0x10c4170: addu  a0, v0, s2
 	ldloc 5
 	ldloc 10
 	add
 	stloc.1
-// 0x010c3b34: 0x10c3b34: addiu a1, zero, 1
+// 0x010c4174: 0x10c4174: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010c3b38: 0x10c3b38: addu  a2, s6, zero
+// 0x010c4178: 0x10c4178: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x010c3b3c: 0x10c3b3c: bne   v0, zero, 0x10c3b54 addu  a3, s3, zero
+// 0x010c417c: 0x10c417c: bne   v0, zero, 0x10c4194 addu  a3, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc 4
-	brtrue L_10c3b54
+	brtrue L_10c4194
 // --- basic block ---
-// 0x010c3b44: 0x10c3b44: jal   0x10023b4 addu  a0, s3, zero
+// 0x010c4184: 0x10c4184: jal   0x10023b4 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4619,11 +4619,11 @@ L_10c3b1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3b4c: 0x10c3b4c: j	 0x10c3bc4 sll   zero, zero, 0
-	br L_10c3bc4
+// 0x010c418c: 0x10c418c: j	 0x10c4204 sll   zero, zero, 0
+	br L_10c4204
 // --- basic block ---
-L_10c3b54:
-// 0x010c3b54: 0x10c3b54: jal   0x1001cec sll   zero, zero, 0
+L_10c4194:
+// 0x010c4194: 0x10c4194: jal   0x1001cec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4634,16 +4634,16 @@ L_10c3b54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3b5c: 0x10c3b5c: beq   v0, s6, 0x10c3b1c addu  s2, s2, v0
+// 0x010c419c: 0x10c419c: beq   v0, s6, 0x10c415c addu  s2, s2, v0
 	ldloc 5
 	ldloc 13
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-	beq  L_10c3b1c
+	beq  L_10c415c
 // --- basic block ---
-// 0x010c3b64: 0x10c3b64: jal   0x10023b4 addu  a0, s3, zero
+// 0x010c41a4: 0x10c41a4: jal   0x10023b4 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4656,14 +4656,14 @@ L_10c3b54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3b6c: 0x10c3b6c: addu  a1, s2, zero
+// 0x010c41ac: 0x10c41ac: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-L_10c3b70:
-// 0x010c3b70: 0x10c3b70: addu  a0, s0, zero
+L_10c41b0:
+// 0x010c41b0: 0x10c41b0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010c3b74: 0x10c3b74: jal   0x10c3a34 addiu a2, zero, 1
+// 0x010c41b4: 0x10c41b4: jal   0x10c4074 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -4671,39 +4671,39 @@ L_10c3b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::NOPH_MemoryFile_open_10c3a34(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::NOPH_MemoryFile_open_10c4074(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3b7c: 0x10c3b7c: addu  s0, v0, zero
+// 0x010c41bc: 0x10c41bc: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010c3b80: 0x10c3b80: addiu v0, s1, -1
+// 0x010c41c0: 0x10c41c0: addiu v0, s1, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010c3b84: 0x10c3b84: sltiu v0, v0, 2
+// 0x010c41c4: 0x10c41c4: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x010c3b88: 0x10c3b88: bne   v0, zero, 0x10c3b98 addiu v0, zero, 5
+// 0x010c41c8: 0x10c41c8: bne   v0, zero, 0x10c41d8 addiu v0, zero, 5
 	ldloc 5
 	ldc.i4.5
 	stloc 5
-	brtrue L_10c3b98
+	brtrue L_10c41d8
 // --- basic block ---
-// 0x010c3b90: 0x10c3b90: bne   s1, v0, 0x10c3bb8 lui   a1, 0x20000
+// 0x010c41d0: 0x10c41d0: bne   s1, v0, 0x10c41f8 lui   a1, 0x20000
 	ldloc 9
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10c3bb8
+	bne.un L_10c41f8
 // --- basic block ---
-L_10c3b98:
-// 0x010c3b98: 0x10c3b98: lw    s1, 20(s0)
+L_10c41d8:
+// 0x010c41d8: 0x10c41d8: lw    s1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4712,7 +4712,7 @@ L_10c3b98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c3b9c: 0x10c3b9c: jal   0x1001ba8 addu  a0, s7, zero
+// 0x010c41dc: 0x10c41dc: jal   0x1001ba8 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -4725,7 +4725,7 @@ L_10c3b98:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3ba4: 0x10c3ba4: sw    v0, 12(s1)
+// 0x010c41e4: 0x10c41e4: sw    v0, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4734,7 +4734,7 @@ L_10c3b98:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c3ba8: 0x10c3ba8: jal   0x1001ba8 addu  a0, s4, zero
+// 0x010c41e8: 0x10c41e8: jal   0x1001ba8 addu  a0, s4, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -4747,7 +4747,7 @@ L_10c3b98:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010c3bb0: 0x10c3bb0: sw    v0, 16(s1)
+// 0x010c41f0: 0x10c41f0: sw    v0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4756,16 +4756,16 @@ L_10c3b98:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010c3bb4: 0x10c3bb4: lui   a1, 0x20000
+// 0x010c41f4: 0x10c41f4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_10c3bb8:
-// 0x010c3bb8: 0x10c3bb8: addiu a1, a1, 23572
+L_10c41f8:
+// 0x010c41f8: 0x10c41f8: addiu a1, a1, 24032
 	ldloc.2
-	ldc.i4 23572
+	ldc.i4 24032
 	add
 	stloc.2
-// 0x010c3bbc: 0x10c3bbc: jal   0x10001f8 sltiu a0, s0, 1
+// 0x010c41fc: 0x10c41fc: jal   0x10001f8 sltiu a0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	clt.un
@@ -4780,12 +4780,12 @@ L_10c3bb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10c3bc4:
-// 0x010c3bc4: 0x10c3bc4: lw    ra, 52(sp)
-// 0x010c3bc8: 0x10c3bc8: addu  v0, s0, zero
+L_10c4204:
+// 0x010c4204: 0x10c4204: lw    ra, 52(sp)
+// 0x010c4208: 0x10c4208: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010c3bcc: 0x10c3bcc: lw    s7, 48(sp)
+// 0x010c420c: 0x10c420c: lw    s7, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4794,7 +4794,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010c3bd0: 0x10c3bd0: lw    s6, 44(sp)
+// 0x010c4210: 0x10c4210: lw    s6, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4803,7 +4803,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010c3bd4: 0x10c3bd4: lw    s5, 40(sp)
+// 0x010c4214: 0x10c4214: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4812,7 +4812,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010c3bd8: 0x10c3bd8: lw    s4, 36(sp)
+// 0x010c4218: 0x10c4218: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4821,7 +4821,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010c3bdc: 0x10c3bdc: lw    s3, 32(sp)
+// 0x010c421c: 0x10c421c: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4830,7 +4830,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010c3be0: 0x10c3be0: lw    s2, 28(sp)
+// 0x010c4220: 0x10c4220: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4839,7 +4839,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010c3be4: 0x10c3be4: lw    s1, 24(sp)
+// 0x010c4224: 0x10c4224: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4848,7 +4848,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010c3be8: 0x10c3be8: lw    s0, 20(sp)
+// 0x010c4228: 0x10c4228: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4857,7 +4857,7 @@ L_10c3bc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010c3bec: 0x10c3bec: jr    ra addiu sp, sp, 56
+// 0x010c422c: 0x10c422c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl15.j b/converted/Cibyl15.j
index e6052fd..9fa57a5 100644
--- a/converted/Cibyl15.j
+++ b/converted/Cibyl15.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl15::.ctor
 
-.method public static int32 roadmap_plugin_adjust_layer_10148d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_adjust_layer_10148e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 v1)
@@ -94,12 +94,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010148d0: 0x10148d0: addiu sp, sp, -48
+// 0x010148e0: 0x10148e0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010148d4: 0x10148d4: sw    s1, 24(sp)
+// 0x010148e4: 0x10148e4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -108,10 +108,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010148d8: 0x10148d8: lui   s1, 0x30000
+// 0x010148e8: 0x10148e8: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x010148dc: 0x10148dc: sw    s5, 40(sp)
+// 0x010148ec: 0x10148ec: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -120,7 +120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010148e0: 0x10148e0: sw    s4, 36(sp)
+// 0x010148f0: 0x10148f0: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -129,7 +129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010148e4: 0x10148e4: sw    s3, 32(sp)
+// 0x010148f4: 0x10148f4: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -138,7 +138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010148e8: 0x10148e8: sw    s2, 28(sp)
+// 0x010148f8: 0x10148f8: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -147,7 +147,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010148ec: 0x10148ec: sw    s0, 20(sp)
+// 0x010148fc: 0x10148fc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -156,47 +156,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010148f0: 0x10148f0: sw    ra, 44(sp)
-// 0x010148f4: 0x10148f4: addu  s5, a0, zero
+// 0x01014900: 0x1014900: sw    ra, 44(sp)
+// 0x01014904: 0x1014904: addu  s5, a0, zero
 	ldloc.1
 	stloc 12
-// 0x010148f8: 0x10148f8: addu  s4, a1, zero
+// 0x01014908: 0x1014908: addu  s4, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010148fc: 0x10148fc: addu  s3, a2, zero
+// 0x0101490c: 0x101490c: addu  s3, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01014900: 0x1014900: addiu s1, s1, -28524
+// 0x01014910: 0x1014910: addiu s1, s1, -28060
 	ldloc 7
-	ldc.i4 -28524
+	ldc.i4 -28060
 	add
 	stloc 7
-// 0x01014904: 0x1014904: addiu s0, zero, 1
+// 0x01014914: 0x1014914: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01014908: 0x1014908: j	 0x101493c lui   s2, 0x30000
+// 0x01014918: 0x1014918: j	 0x101494c lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 9
-	br L_101493c
+	br L_101494c
 // --- basic block ---
-L_1014910:
-// 0x01014910: 0x1014910: lw    v0, 0(s1)
+L_1014920:
+// 0x01014920: 0x1014920: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01014914: 0x1014914: sll   zero, zero, 0
-// 0x01014918: 0x1014918: beq   v0, zero, 0x1014938 addiu s0, s0, 1
+// 0x01014924: 0x1014924: sll   zero, zero, 0
+// 0x01014928: 0x1014928: beq   v0, zero, 0x1014948 addiu s0, s0, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_1014938
+	brfalse L_1014948
 // --- basic block ---
-// 0x01014920: 0x1014920: lw    v0, 44(v0)
+// 0x01014930: 0x1014930: lw    v0, 44(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -205,12 +205,12 @@ L_1014910:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01014924: 0x1014924: sll   zero, zero, 0
-// 0x01014928: 0x1014928: beq   v0, zero, 0x1014938 sll   zero, zero, 0
+// 0x01014934: 0x1014934: sll   zero, zero, 0
+// 0x01014938: 0x1014938: beq   v0, zero, 0x1014948 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1014938
+	brfalse L_1014948
 // --- basic block ---
-// 0x01014930: 0x1014930: jalr  v0 sll   zero, zero, 0
+// 0x01014940: 0x1014940: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -222,41 +222,41 @@ L_1014910:
 	stloc 14
 	stloc 6
 // --- basic block ---
-L_1014938:
-// 0x01014938: 0x1014938: addiu s1, s1, 4
+L_1014948:
+// 0x01014948: 0x1014948: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_101493c:
-// 0x0101493c: 0x101493c: lw    v0, -28532(s2)
+L_101494c:
+// 0x0101494c: 0x101494c: lw    v0, -28068(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldelem.i4
 	stloc 6
-// 0x01014940: 0x1014940: addu  a0, s5, zero
+// 0x01014950: 0x1014950: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01014944: 0x1014944: slt   v0, v0, s0
+// 0x01014954: 0x1014954: slt   v0, v0, s0
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 6
-// 0x01014948: 0x1014948: addu  a1, s4, zero
+// 0x01014958: 0x1014958: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x0101494c: 0x101494c: beq   v0, zero, 0x1014910 addu  a2, s3, zero
+// 0x0101495c: 0x101495c: beq   v0, zero, 0x1014920 addu  a2, s3, zero
 	ldloc 6
 	ldloc 10
 	stloc.3
-	brfalse L_1014910
+	brfalse L_1014920
 // --- basic block ---
-// 0x01014954: 0x1014954: lw    ra, 44(sp)
-// 0x01014958: 0x1014958: lw    s5, 40(sp)
+// 0x01014964: 0x1014964: lw    ra, 44(sp)
+// 0x01014968: 0x1014968: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -265,7 +265,7 @@ L_101493c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101495c: 0x101495c: lw    s4, 36(sp)
+// 0x0101496c: 0x101496c: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -274,7 +274,7 @@ L_101493c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01014960: 0x1014960: lw    s3, 32(sp)
+// 0x01014970: 0x1014970: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -283,7 +283,7 @@ L_101493c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01014964: 0x1014964: lw    s2, 28(sp)
+// 0x01014974: 0x1014974: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -292,7 +292,7 @@ L_101493c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014968: 0x1014968: lw    s1, 24(sp)
+// 0x01014978: 0x1014978: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -301,7 +301,7 @@ L_101493c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101496c: 0x101496c: lw    s0, 20(sp)
+// 0x0101497c: 0x101497c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -310,7 +310,7 @@ L_101493c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014970: 0x1014970: jr    ra addiu sp, sp, 48
+// 0x01014980: 0x1014980: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -322,7 +322,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_plugin_get_closest_1014978(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_get_closest_1014988(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 v0,int32 ra)
@@ -384,12 +384,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014978: 0x1014978: addiu sp, sp, -72
+// 0x01014988: 0x1014988: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0101497c: 0x101497c: sw    s1, 36(sp)
+// 0x0101498c: 0x101498c: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -398,10 +398,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01014980: 0x1014980: lui   s1, 0x30000
+// 0x01014990: 0x1014990: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01014984: 0x1014984: sw    s8, 64(sp)
+// 0x01014994: 0x1014994: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -410,7 +410,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01014988: 0x1014988: sw    s7, 60(sp)
+// 0x01014998: 0x1014998: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -419,7 +419,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101498c: 0x101498c: sw    s6, 56(sp)
+// 0x0101499c: 0x101499c: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -428,7 +428,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01014990: 0x1014990: sw    s5, 52(sp)
+// 0x010149a0: 0x10149a0: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -437,7 +437,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01014994: 0x1014994: sw    s4, 48(sp)
+// 0x010149a4: 0x10149a4: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -446,7 +446,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01014998: 0x1014998: sw    s3, 44(sp)
+// 0x010149a8: 0x10149a8: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -455,7 +455,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101499c: 0x101499c: sw    s2, 40(sp)
+// 0x010149ac: 0x10149ac: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -464,7 +464,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010149a0: 0x10149a0: sw    s0, 32(sp)
+// 0x010149b0: 0x10149b0: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -473,25 +473,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010149a4: 0x10149a4: sw    ra, 68(sp)
-// 0x010149a8: 0x10149a8: addu  s8, a0, zero
+// 0x010149b4: 0x10149b4: sw    ra, 68(sp)
+// 0x010149b8: 0x10149b8: addu  s8, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010149ac: 0x10149ac: addu  s7, a1, zero
+// 0x010149bc: 0x10149bc: addu  s7, a1, zero
 	ldloc.2
 	stloc 14
-// 0x010149b0: 0x10149b0: addu  s6, a2, zero
+// 0x010149c0: 0x10149c0: addu  s6, a2, zero
 	ldloc.3
 	stloc 13
-// 0x010149b4: 0x10149b4: addu  s5, a3, zero
+// 0x010149c4: 0x10149c4: addu  s5, a3, zero
 	ldloc 4
 	stloc 12
-// 0x010149b8: 0x10149b8: addiu s1, s1, -28524
+// 0x010149c8: 0x10149c8: addiu s1, s1, -28060
 	ldloc 7
-	ldc.i4 -28524
+	ldc.i4 -28060
 	add
 	stloc 7
-// 0x010149bc: 0x10149bc: lw    s4, 88(sp)
+// 0x010149cc: 0x10149cc: lw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -500,7 +500,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010149c0: 0x10149c0: lw    v0, 92(sp)
+// 0x010149d0: 0x10149d0: lw    v0, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -509,7 +509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010149c4: 0x10149c4: lw    s3, 96(sp)
+// 0x010149d4: 0x10149d4: lw    s3, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -518,32 +518,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010149c8: 0x10149c8: addiu s0, zero, 1
+// 0x010149d8: 0x10149d8: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010149cc: 0x10149cc: j	 0x1014a08 lui   s2, 0x30000
+// 0x010149dc: 0x10149dc: j	 0x1014a18 lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 9
-	br L_1014a08
+	br L_1014a18
 // --- basic block ---
-L_10149d4:
-// 0x010149d4: 0x10149d4: lw    v1, 0(s1)
+L_10149e4:
+// 0x010149e4: 0x10149e4: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010149d8: 0x10149d8: sll   zero, zero, 0
-// 0x010149dc: 0x10149dc: beq   v1, zero, 0x1014a04 addiu s0, s0, 1
+// 0x010149e8: 0x10149e8: sll   zero, zero, 0
+// 0x010149ec: 0x10149ec: beq   v1, zero, 0x1014a14 addiu s0, s0, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_1014a04
+	brfalse L_1014a14
 // --- basic block ---
-// 0x010149e4: 0x10149e4: lw    v1, 48(v1)
+// 0x010149f4: 0x10149f4: lw    v1, 48(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -552,12 +552,12 @@ L_10149d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010149e8: 0x10149e8: sll   zero, zero, 0
-// 0x010149ec: 0x10149ec: beq   v1, zero, 0x1014a04 sll   zero, zero, 0
+// 0x010149f8: 0x10149f8: sll   zero, zero, 0
+// 0x010149fc: 0x10149fc: beq   v1, zero, 0x1014a14 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1014a04
+	brfalse L_1014a14
 // --- basic block ---
-// 0x010149f4: 0x10149f4: sw    v0, 20(sp)
+// 0x01014a04: 0x1014a04: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -566,7 +566,7 @@ L_10149d4:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010149f8: 0x10149f8: sw    s4, 16(sp)
+// 0x01014a08: 0x1014a08: sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -575,7 +575,7 @@ L_10149d4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010149fc: 0x10149fc: jalr  v1 sw    s3, 24(sp)
+// 0x01014a0c: 0x1014a0c: jalr  v1 sw    s3, 24(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -595,44 +595,44 @@ L_10149d4:
 	stloc 6
 	stloc 16
 // --- basic block ---
-L_1014a04:
-// 0x01014a04: 0x1014a04: addiu s1, s1, 4
+L_1014a14:
+// 0x01014a14: 0x1014a14: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_1014a08:
-// 0x01014a08: 0x1014a08: lw    v1, -28532(s2)
+L_1014a18:
+// 0x01014a18: 0x1014a18: lw    v1, -28068(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldelem.i4
 	stloc 6
-// 0x01014a0c: 0x1014a0c: addu  a0, s8, zero
+// 0x01014a1c: 0x1014a1c: addu  a0, s8, zero
 	ldloc 15
 	stloc.1
-// 0x01014a10: 0x1014a10: slt   v1, v1, s0
+// 0x01014a20: 0x1014a20: slt   v1, v1, s0
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 6
-// 0x01014a14: 0x1014a14: addu  a1, s7, zero
+// 0x01014a24: 0x1014a24: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x01014a18: 0x1014a18: addu  a2, s6, zero
+// 0x01014a28: 0x1014a28: addu  a2, s6, zero
 	ldloc 13
 	stloc.3
-// 0x01014a1c: 0x1014a1c: beq   v1, zero, 0x10149d4 addu  a3, s5, zero
+// 0x01014a2c: 0x1014a2c: beq   v1, zero, 0x10149e4 addu  a3, s5, zero
 	ldloc 6
 	ldloc 12
 	stloc 4
-	brfalse L_10149d4
+	brfalse L_10149e4
 // --- basic block ---
-// 0x01014a24: 0x1014a24: lw    ra, 68(sp)
-// 0x01014a28: 0x1014a28: lw    s8, 64(sp)
+// 0x01014a34: 0x1014a34: lw    ra, 68(sp)
+// 0x01014a38: 0x1014a38: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -641,7 +641,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01014a2c: 0x1014a2c: lw    s7, 60(sp)
+// 0x01014a3c: 0x1014a3c: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -650,7 +650,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01014a30: 0x1014a30: lw    s6, 56(sp)
+// 0x01014a40: 0x1014a40: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -659,7 +659,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01014a34: 0x1014a34: lw    s5, 52(sp)
+// 0x01014a44: 0x1014a44: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -668,7 +668,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01014a38: 0x1014a38: lw    s4, 48(sp)
+// 0x01014a48: 0x1014a48: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -677,7 +677,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01014a3c: 0x1014a3c: lw    s3, 44(sp)
+// 0x01014a4c: 0x1014a4c: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -686,7 +686,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01014a40: 0x1014a40: lw    s2, 40(sp)
+// 0x01014a50: 0x1014a50: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -695,7 +695,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014a44: 0x1014a44: lw    s1, 36(sp)
+// 0x01014a54: 0x1014a54: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -704,7 +704,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014a48: 0x1014a48: lw    s0, 32(sp)
+// 0x01014a58: 0x1014a58: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -713,7 +713,7 @@ L_1014a08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014a4c: 0x1014a4c: jr    ra addiu sp, sp, 72
+// 0x01014a5c: 0x1014a5c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -725,7 +725,7 @@ __CIBYL_function_return:
 	ldloc 16
 	ret
 }
-.method public static int32 roadmap_plugin_shutdown_1014a54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_shutdown_1014a64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 s2,int32 ra,int32 v1)
@@ -769,12 +769,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014a54: 0x1014a54: addiu sp, sp, -32
+// 0x01014a64: 0x1014a64: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01014a58: 0x1014a58: sw    s1, 20(sp)
+// 0x01014a68: 0x1014a68: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -783,10 +783,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01014a5c: 0x1014a5c: lui   s1, 0x30000
+// 0x01014a6c: 0x1014a6c: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01014a60: 0x1014a60: sw    s2, 24(sp)
+// 0x01014a70: 0x1014a70: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -795,7 +795,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014a64: 0x1014a64: sw    s0, 16(sp)
+// 0x01014a74: 0x1014a74: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -804,38 +804,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014a68: 0x1014a68: sw    ra, 28(sp)
-// 0x01014a6c: 0x1014a6c: addiu s1, s1, -28524
+// 0x01014a78: 0x1014a78: sw    ra, 28(sp)
+// 0x01014a7c: 0x1014a7c: addiu s1, s1, -28060
 	ldloc 7
-	ldc.i4 -28524
+	ldc.i4 -28060
 	add
 	stloc 7
-// 0x01014a70: 0x1014a70: addiu s0, zero, 1
+// 0x01014a80: 0x1014a80: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01014a74: 0x1014a74: j	 0x1014aa8 lui   s2, 0x30000
+// 0x01014a84: 0x1014a84: j	 0x1014ab8 lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 9
-	br L_1014aa8
+	br L_1014ab8
 // --- basic block ---
-L_1014a7c:
-// 0x01014a7c: 0x1014a7c: lw    v0, 0(s1)
+L_1014a8c:
+// 0x01014a8c: 0x1014a8c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014a80: 0x1014a80: sll   zero, zero, 0
-// 0x01014a84: 0x1014a84: beq   v0, zero, 0x1014aa4 addiu s0, s0, 1
+// 0x01014a90: 0x1014a90: sll   zero, zero, 0
+// 0x01014a94: 0x1014a94: beq   v0, zero, 0x1014ab4 addiu s0, s0, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_1014aa4
+	brfalse L_1014ab4
 // --- basic block ---
-// 0x01014a8c: 0x1014a8c: lw    v0, 56(v0)
+// 0x01014a9c: 0x1014a9c: lw    v0, 56(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -844,12 +844,12 @@ L_1014a7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014a90: 0x1014a90: sll   zero, zero, 0
-// 0x01014a94: 0x1014a94: beq   v0, zero, 0x1014aa4 sll   zero, zero, 0
+// 0x01014aa0: 0x1014aa0: sll   zero, zero, 0
+// 0x01014aa4: 0x1014aa4: beq   v0, zero, 0x1014ab4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1014aa4
+	brfalse L_1014ab4
 // --- basic block ---
-// 0x01014a9c: 0x1014a9c: jalr  v0 sll   zero, zero, 0
+// 0x01014aac: 0x1014aac: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -861,34 +861,34 @@ L_1014a7c:
 	stloc 11
 	stloc 5
 // --- basic block ---
-L_1014aa4:
-// 0x01014aa4: 0x1014aa4: addiu s1, s1, 4
+L_1014ab4:
+// 0x01014ab4: 0x1014ab4: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_1014aa8:
-// 0x01014aa8: 0x1014aa8: lw    v0, -28532(s2)
+L_1014ab8:
+// 0x01014ab8: 0x1014ab8: lw    v0, -28068(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7133
+	ldc.i4 -7017
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014aac: 0x1014aac: sll   zero, zero, 0
-// 0x01014ab0: 0x1014ab0: slt   v0, v0, s0
+// 0x01014abc: 0x1014abc: sll   zero, zero, 0
+// 0x01014ac0: 0x1014ac0: slt   v0, v0, s0
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x01014ab4: 0x1014ab4: beq   v0, zero, 0x1014a7c sll   zero, zero, 0
+// 0x01014ac4: 0x1014ac4: beq   v0, zero, 0x1014a8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1014a7c
+	brfalse L_1014a8c
 // --- basic block ---
-// 0x01014abc: 0x1014abc: lw    ra, 28(sp)
-// 0x01014ac0: 0x1014ac0: lw    s2, 24(sp)
+// 0x01014acc: 0x1014acc: lw    ra, 28(sp)
+// 0x01014ad0: 0x1014ad0: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -897,7 +897,7 @@ L_1014aa8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014ac4: 0x1014ac4: lw    s1, 20(sp)
+// 0x01014ad4: 0x1014ad4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -906,7 +906,7 @@ L_1014aa8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014ac8: 0x1014ac8: lw    s0, 16(sp)
+// 0x01014ad8: 0x1014ad8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -915,7 +915,7 @@ L_1014aa8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014acc: 0x1014acc: jr    ra addiu sp, sp, 32
+// 0x01014adc: 0x1014adc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -927,7 +927,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 check_same_line_1014ad4(int32,int32)
+.method public static int32 check_same_line_1014ae4(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -953,7 +953,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014ad4: 0x1014ad4: lw    v1, 12(a0)
+// 0x01014ae4: 0x1014ae4: lw    v1, 12(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -962,7 +962,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01014ad8: 0x1014ad8: lw    v0, 12(a1)
+// 0x01014ae8: 0x1014ae8: lw    v0, 12(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -971,13 +971,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01014adc: 0x1014adc: sll   zero, zero, 0
-// 0x01014ae0: 0x1014ae0: bne   v1, v0, 0x1014b04 sll   zero, zero, 0
+// 0x01014aec: 0x1014aec: sll   zero, zero, 0
+// 0x01014af0: 0x1014af0: bne   v1, v0, 0x1014b14 sll   zero, zero, 0
 	ldloc 4
 	ldloc.2
-	bne.un L_1014b04
+	bne.un L_1014b14
 // --- basic block ---
-// 0x01014ae8: 0x1014ae8: lw    v1, 4(a0)
+// 0x01014af8: 0x1014af8: lw    v1, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -986,7 +986,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01014aec: 0x1014aec: lw    v0, 4(a1)
+// 0x01014afc: 0x1014afc: lw    v0, 4(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -995,31 +995,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01014af0: 0x1014af0: sll   zero, zero, 0
-// 0x01014af4: 0x1014af4: bne   v1, v0, 0x1014b04 sll   zero, zero, 0
+// 0x01014b00: 0x1014b00: sll   zero, zero, 0
+// 0x01014b04: 0x1014b04: bne   v1, v0, 0x1014b14 sll   zero, zero, 0
 	ldloc 4
 	ldloc.2
-	bne.un L_1014b04
+	bne.un L_1014b14
 // --- basic block ---
-// 0x01014afc: 0x1014afc: addiu v0, zero, 1
+// 0x01014b0c: 0x1014b0c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01014b00: 0x1014b00: sw    v0, 0(a1)
+// 0x01014b10: 0x1014b10: sw    v0, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-L_1014b04:
-// 0x01014b04: 0x1014b04: lw    v0, 0(a1)
+L_1014b14:
+// 0x01014b14: 0x1014b14: lw    v0, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01014b08: 0x1014b08: jr    ra sll   zero, zero, 0
+// 0x01014b18: 0x1014b18: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -1027,7 +1027,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_plugin_same_db_line_1014b10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_same_db_line_1014b20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -1068,12 +1068,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014b10: 0x1014b10: addiu sp, sp, -64
+// 0x01014b20: 0x1014b20: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01014b14: 0x1014b14: sw    s1, 56(sp)
+// 0x01014b24: 0x1014b24: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1082,8 +1082,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014b18: 0x1014b18: sw    ra, 60(sp)
-// 0x01014b1c: 0x1014b1c: sw    s0, 52(sp)
+// 0x01014b28: 0x1014b28: sw    ra, 60(sp)
+// 0x01014b2c: 0x1014b2c: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1092,41 +1092,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014b20: 0x1014b20: beq   a0, zero, 0x1014b88 addu  s1, a0, zero
+// 0x01014b30: 0x1014b30: beq   a0, zero, 0x1014b98 addu  s1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_1014b88
+	brfalse L_1014b98
 // --- basic block ---
-// 0x01014b28: 0x1014b28: beq   a1, zero, 0x1014b88 sll   zero, zero, 0
+// 0x01014b38: 0x1014b38: beq   a1, zero, 0x1014b98 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1014b88
+	brfalse L_1014b98
 // --- basic block ---
-// 0x01014b30: 0x1014b30: lw    v0, 0(a0)
+// 0x01014b40: 0x1014b40: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014b34: 0x1014b34: lw    v1, 0(a1)
+// 0x01014b44: 0x1014b44: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01014b38: 0x1014b38: sll   zero, zero, 0
-// 0x01014b3c: 0x1014b3c: bne   v0, v1, 0x1014b88 sll   zero, zero, 0
+// 0x01014b48: 0x1014b48: sll   zero, zero, 0
+// 0x01014b4c: 0x1014b4c: bne   v0, v1, 0x1014b98 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1014b88
+	bne.un L_1014b98
 // --- basic block ---
-// 0x01014b44: 0x1014b44: bne   v0, zero, 0x1014b60 sll   zero, zero, 0
+// 0x01014b54: 0x1014b54: bne   v0, zero, 0x1014b70 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1014b60
+	brtrue L_1014b70
 // --- basic block ---
-// 0x01014b4c: 0x1014b4c: lw    v1, 12(a0)
+// 0x01014b5c: 0x1014b5c: lw    v1, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1135,7 +1135,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014b50: 0x1014b50: lw    v0, 12(a1)
+// 0x01014b60: 0x1014b60: lw    v0, 12(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1144,14 +1144,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014b54: 0x1014b54: sll   zero, zero, 0
-// 0x01014b58: 0x1014b58: bne   v1, v0, 0x1014b88 sll   zero, zero, 0
+// 0x01014b64: 0x1014b64: sll   zero, zero, 0
+// 0x01014b68: 0x1014b68: bne   v1, v0, 0x1014b98 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1014b88
+	bne.un L_1014b98
 // --- basic block ---
-L_1014b60:
-// 0x01014b60: 0x1014b60: lw    v1, 4(s1)
+L_1014b70:
+// 0x01014b70: 0x1014b70: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1160,7 +1160,7 @@ L_1014b60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014b64: 0x1014b64: lw    v0, 4(a1)
+// 0x01014b74: 0x1014b74: lw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1169,13 +1169,13 @@ L_1014b60:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014b68: 0x1014b68: sll   zero, zero, 0
-// 0x01014b6c: 0x1014b6c: bne   v1, v0, 0x1014b88 sll   zero, zero, 0
+// 0x01014b78: 0x1014b78: sll   zero, zero, 0
+// 0x01014b7c: 0x1014b7c: bne   v1, v0, 0x1014b98 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1014b88
+	bne.un L_1014b98
 // --- basic block ---
-// 0x01014b74: 0x1014b74: lw    a0, 16(s1)
+// 0x01014b84: 0x1014b84: lw    a0, 16(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1184,7 +1184,7 @@ L_1014b60:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01014b78: 0x1014b78: lw    v1, 16(a1)
+// 0x01014b88: 0x1014b88: lw    v1, 16(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1193,49 +1193,49 @@ L_1014b60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014b7c: 0x1014b7c: sll   zero, zero, 0
-// 0x01014b80: 0x1014b80: beq   a0, v1, 0x1014bec addiu v0, zero, 1
+// 0x01014b8c: 0x1014b8c: sll   zero, zero, 0
+// 0x01014b90: 0x1014b90: beq   a0, v1, 0x1014bfc addiu v0, zero, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	beq  L_1014bec
+	beq  L_1014bfc
 // --- basic block ---
-L_1014b88:
-// 0x01014b88: 0x1014b88: lw    v0, 0(s1)
+L_1014b98:
+// 0x01014b98: 0x1014b98: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014b8c: 0x1014b8c: sll   zero, zero, 0
-// 0x01014b90: 0x1014b90: bne   v0, zero, 0x1014bec addu  v0, zero, zero
+// 0x01014b9c: 0x1014b9c: sll   zero, zero, 0
+// 0x01014ba0: 0x1014ba0: bne   v0, zero, 0x1014bfc addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1014bec
+	brtrue L_1014bfc
 // --- basic block ---
-// 0x01014b98: 0x1014b98: lw    v0, 0(a1)
+// 0x01014ba8: 0x1014ba8: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014b9c: 0x1014b9c: sll   zero, zero, 0
-// 0x01014ba0: 0x1014ba0: bne   v0, zero, 0x1014be8 addiu s0, sp, 24
+// 0x01014bac: 0x1014bac: sll   zero, zero, 0
+// 0x01014bb0: 0x1014bb0: bne   v0, zero, 0x1014bf8 addiu s0, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-	brtrue L_1014be8
+	brtrue L_1014bf8
 // --- basic block ---
-// 0x01014ba8: 0x1014ba8: addu  a0, s0, zero
+// 0x01014bb8: 0x1014bb8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01014bac: 0x1014bac: jal   0x1001800 addiu a2, zero, 20
+// 0x01014bbc: 0x1014bbc: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -1247,27 +1247,27 @@ L_1014b88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01014bb4: 0x1014bb4: lui   v0, 0x1010000
+// 0x01014bc4: 0x1014bc4: lui   v0, 0x1010000
 	ldc.i4 16842752
 	stloc 5
-// 0x01014bb8: 0x1014bb8: addiu v0, v0, 19156
+// 0x01014bc8: 0x1014bc8: addiu v0, v0, 19172
 	ldloc 5
-	ldc.i4 19156
+	ldc.i4 19172
 	add
 	stloc 5
-// 0x01014bbc: 0x1014bbc: addu  a0, s1, zero
+// 0x01014bcc: 0x1014bcc: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01014bc0: 0x1014bc0: addu  a1, zero, zero
+// 0x01014bd0: 0x1014bd0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01014bc4: 0x1014bc4: addu  a2, zero, zero
+// 0x01014bd4: 0x1014bd4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01014bc8: 0x1014bc8: addiu a3, zero, 3
+// 0x01014bd8: 0x1014bd8: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x01014bcc: 0x1014bcc: sw    v0, 16(sp)
+// 0x01014bdc: 0x1014bdc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1276,7 +1276,7 @@ L_1014b88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01014bd0: 0x1014bd0: sw    s0, 20(sp)
+// 0x01014be0: 0x1014be0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1285,7 +1285,7 @@ L_1014b88:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014bd4: 0x1014bd4: jal   0x1012790 sw    zero, 24(sp)
+// 0x01014be4: 0x1014be4: jal   0x10127a0 sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1299,12 +1299,12 @@ L_1014b88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01014bdc: 0x1014bdc: lw    v0, 24(sp)
+// 0x01014bec: 0x1014bec: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1313,16 +1313,16 @@ L_1014b88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014be0: 0x1014be0: j	 0x1014bec sll   zero, zero, 0
-	br L_1014bec
+// 0x01014bf0: 0x1014bf0: j	 0x1014bfc sll   zero, zero, 0
+	br L_1014bfc
 // --- basic block ---
-L_1014be8:
-// 0x01014be8: 0x1014be8: addu  v0, zero, zero
+L_1014bf8:
+// 0x01014bf8: 0x1014bf8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1014bec:
-// 0x01014bec: 0x1014bec: lw    ra, 60(sp)
-// 0x01014bf0: 0x1014bf0: lw    s1, 56(sp)
+L_1014bfc:
+// 0x01014bfc: 0x1014bfc: lw    ra, 60(sp)
+// 0x01014c00: 0x1014c00: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1331,7 +1331,7 @@ L_1014bec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014bf4: 0x1014bf4: lw    s0, 52(sp)
+// 0x01014c04: 0x1014c04: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1340,7 +1340,7 @@ L_1014bec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014bf8: 0x1014bf8: jr    ra addiu sp, sp, 64
+// 0x01014c08: 0x1014c08: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1352,7 +1352,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_get_direction_1014c00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_get_direction_1014c10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -1393,19 +1393,19 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014c00: 0x1014c00: lw    v0, 0(a0)
+// 0x01014c10: 0x1014c10: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01014c04: 0x1014c04: addiu sp, sp, -40
+// 0x01014c14: 0x1014c14: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01014c08: 0x1014c08: sw    s1, 32(sp)
+// 0x01014c18: 0x1014c18: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1414,7 +1414,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014c0c: 0x1014c0c: sw    s0, 28(sp)
+// 0x01014c1c: 0x1014c1c: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1423,20 +1423,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014c10: 0x1014c10: sw    ra, 36(sp)
-// 0x01014c14: 0x1014c14: addu  s0, a0, zero
+// 0x01014c20: 0x1014c20: sw    ra, 36(sp)
+// 0x01014c24: 0x1014c24: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01014c18: 0x1014c18: bne   v0, zero, 0x1014c5c addu  s1, a1, zero
+// 0x01014c28: 0x1014c28: bne   v0, zero, 0x1014c6c addu  s1, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 9
-	brtrue L_1014c5c
+	brtrue L_1014c6c
 // --- basic block ---
-// 0x01014c20: 0x1014c20: lui   v0, 0x0
+// 0x01014c30: 0x1014c30: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01014c24: 0x1014c24: lw    v0, 576(v0)
+// 0x01014c34: 0x1014c34: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1445,7 +1445,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01014c28: 0x1014c28: lw    a0, 12(a0)
+// 0x01014c38: 0x1014c38: lw    a0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1454,30 +1454,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01014c2c: 0x1014c2c: sll   zero, zero, 0
-// 0x01014c30: 0x1014c30: beq   a0, v0, 0x1014c48 sll   zero, zero, 0
+// 0x01014c3c: 0x1014c3c: sll   zero, zero, 0
+// 0x01014c40: 0x1014c40: beq   a0, v0, 0x1014c58 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_1014c48
+	beq  L_1014c58
 // --- basic block ---
-// 0x01014c38: 0x1014c38: bltz  a0, 0x1014c48 sll   zero, zero, 0
+// 0x01014c48: 0x1014c48: bltz  a0, 0x1014c58 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1014c48
+	blt L_1014c58
 // --- basic block ---
-// 0x01014c40: 0x1014c40: jal   0x100b164 sll   zero, zero, 0
+// 0x01014c50: 0x1014c50: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1014c48:
-// 0x01014c48: 0x1014c48: lw    a0, 4(s0)
+L_1014c58:
+// 0x01014c58: 0x1014c58: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1486,72 +1486,72 @@ L_1014c48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01014c4c: 0x1014c4c: jal   0x1004a70 addu  a1, s1, zero
+// 0x01014c5c: 0x1014c5c: jal   0x1004a80 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01014c54: 0x1014c54: j	 0x1014cb8 sll   zero, zero, 0
-	br L_1014cb8
+// 0x01014c64: 0x1014c64: j	 0x1014cc8 sll   zero, zero, 0
+	br L_1014cc8
 // --- basic block ---
-L_1014c5c:
-// 0x01014c5c: 0x1014c5c: lui   v1, 0x30000
+L_1014c6c:
+// 0x01014c6c: 0x1014c6c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01014c60: 0x1014c60: sll   a2, v0, 2
+// 0x01014c70: 0x1014c70: sll   a2, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01014c64: 0x1014c64: addiu v1, v1, -28528
+// 0x01014c74: 0x1014c74: addiu v1, v1, -28064
 	ldloc 5
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 5
-// 0x01014c68: 0x1014c68: addu  v1, a2, v1
+// 0x01014c78: 0x1014c78: addu  v1, a2, v1
 	ldloc.3
 	ldloc 5
 	add
 	stloc 5
-// 0x01014c6c: 0x1014c6c: lw    v1, 0(v1)
+// 0x01014c7c: 0x1014c7c: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014c70: 0x1014c70: sll   zero, zero, 0
-// 0x01014c74: 0x1014c74: bne   v1, zero, 0x1014ca0 lui   a3, 0x0
+// 0x01014c80: 0x1014c80: sll   zero, zero, 0
+// 0x01014c84: 0x1014c84: bne   v1, zero, 0x1014cb0 lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_1014ca0
+	brtrue L_1014cb0
 // --- basic block ---
-// 0x01014c7c: 0x1014c7c: lui   a1, 0x0
+// 0x01014c8c: 0x1014c8c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01014c80: 0x1014c80: addiu a1, a1, 28140
+// 0x01014c90: 0x1014c90: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x01014c84: 0x1014c84: addiu a3, a3, 28168
+// 0x01014c94: 0x1014c94: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01014c88: 0x1014c88: addiu a0, zero, 4
+// 0x01014c98: 0x1014c98: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01014c8c: 0x1014c8c: addiu a2, zero, 519
+// 0x01014c9c: 0x1014c9c: addiu a2, zero, 519
 	ldc.i4 519
 	stloc.3
-// 0x01014c90: 0x1014c90: jal   0x100449c sw    v0, 16(sp)
+// 0x01014ca0: 0x1014ca0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1570,13 +1570,13 @@ L_1014c5c:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01014c98: 0x1014c98: j	 0x1014cb8 addu  v0, zero, zero
+// 0x01014ca8: 0x1014ca8: j	 0x1014cc8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1014cb8
+	br L_1014cc8
 // --- basic block ---
-L_1014ca0:
-// 0x01014ca0: 0x1014ca0: lw    v1, 52(v1)
+L_1014cb0:
+// 0x01014cb0: 0x1014cb0: lw    v1, 52(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1585,14 +1585,14 @@ L_1014ca0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014ca4: 0x1014ca4: sll   zero, zero, 0
-// 0x01014ca8: 0x1014ca8: beq   v1, zero, 0x1014cb8 addu  v0, zero, zero
+// 0x01014cb4: 0x1014cb4: sll   zero, zero, 0
+// 0x01014cb8: 0x1014cb8: beq   v1, zero, 0x1014cc8 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1014cb8
+	brfalse L_1014cc8
 // --- basic block ---
-// 0x01014cb0: 0x1014cb0: jalr  v1 sll   zero, zero, 0
+// 0x01014cc0: 0x1014cc0: jalr  v1 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1604,9 +1604,9 @@ L_1014ca0:
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1014cb8:
-// 0x01014cb8: 0x1014cb8: lw    ra, 36(sp)
-// 0x01014cbc: 0x1014cbc: lw    s1, 32(sp)
+L_1014cc8:
+// 0x01014cc8: 0x1014cc8: lw    ra, 36(sp)
+// 0x01014ccc: 0x1014ccc: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1615,7 +1615,7 @@ L_1014cb8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014cc0: 0x1014cc0: lw    s0, 28(sp)
+// 0x01014cd0: 0x1014cd0: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1624,7 +1624,7 @@ L_1014cb8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014cc4: 0x1014cc4: jr    ra addiu sp, sp, 40
+// 0x01014cd4: 0x1014cd4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1636,7 +1636,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1677,19 +1677,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014ccc: 0x1014ccc: lw    v0, 0(a0)
+// 0x01014cdc: 0x1014cdc: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014cd0: 0x1014cd0: addiu sp, sp, -40
+// 0x01014ce0: 0x1014ce0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01014cd4: 0x1014cd4: sw    s1, 32(sp)
+// 0x01014ce4: 0x1014ce4: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1698,7 +1698,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014cd8: 0x1014cd8: sw    s0, 28(sp)
+// 0x01014ce8: 0x1014ce8: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1707,20 +1707,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014cdc: 0x1014cdc: sw    ra, 36(sp)
-// 0x01014ce0: 0x1014ce0: addu  s1, a0, zero
+// 0x01014cec: 0x1014cec: sw    ra, 36(sp)
+// 0x01014cf0: 0x1014cf0: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01014ce4: 0x1014ce4: bne   v0, zero, 0x1014d58 addu  s0, a1, zero
+// 0x01014cf4: 0x1014cf4: bne   v0, zero, 0x1014d68 addu  s0, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 8
-	brtrue L_1014d58
+	brtrue L_1014d68
 // --- basic block ---
-// 0x01014cec: 0x1014cec: lui   v0, 0x0
+// 0x01014cfc: 0x1014cfc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01014cf0: 0x1014cf0: lw    v0, 576(v0)
+// 0x01014d00: 0x1014d00: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1729,7 +1729,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014cf4: 0x1014cf4: lw    a0, 12(a0)
+// 0x01014d04: 0x1014d04: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1738,30 +1738,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01014cf8: 0x1014cf8: sll   zero, zero, 0
-// 0x01014cfc: 0x1014cfc: beq   a0, v0, 0x1014d14 sll   zero, zero, 0
+// 0x01014d08: 0x1014d08: sll   zero, zero, 0
+// 0x01014d0c: 0x1014d0c: beq   a0, v0, 0x1014d24 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1014d14
+	beq  L_1014d24
 // --- basic block ---
-// 0x01014d04: 0x1014d04: bltz  a0, 0x1014d14 sll   zero, zero, 0
+// 0x01014d14: 0x1014d14: bltz  a0, 0x1014d24 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1014d14
+	blt L_1014d24
 // --- basic block ---
-// 0x01014d0c: 0x1014d0c: jal   0x100b164 sll   zero, zero, 0
+// 0x01014d1c: 0x1014d1c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1014d14:
-// 0x01014d14: 0x1014d14: lw    v0, 4(s1)
+L_1014d24:
+// 0x01014d24: 0x1014d24: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1770,77 +1770,77 @@ L_1014d14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014d18: 0x1014d18: lui   v1, 0x20000
+// 0x01014d28: 0x1014d28: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01014d1c: 0x1014d1c: lw    v1, 31152(v1)
+// 0x01014d2c: 0x1014d2c: lw    v1, 31616(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014d20: 0x1014d20: sll   v0, v0, 3
+// 0x01014d30: 0x1014d30: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01014d24: 0x1014d24: addu  v0, v1, v0
+// 0x01014d34: 0x1014d34: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01014d28: 0x1014d28: lhu   v0, 2(v0)
+// 0x01014d38: 0x1014d38: lhu   v0, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01014d2c: 0x1014d2c: lui   v1, 0x20000
+// 0x01014d3c: 0x1014d3c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01014d30: 0x1014d30: lw    v1, 31228(v1)
+// 0x01014d40: 0x1014d40: lw    v1, 31692(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014d34: 0x1014d34: andi  v0, v0, 32767
+// 0x01014d44: 0x1014d44: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01014d38: 0x1014d38: sll   v0, v0, 3
+// 0x01014d48: 0x1014d48: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01014d3c: 0x1014d3c: addu  v0, v1, v0
+// 0x01014d4c: 0x1014d4c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01014d40: 0x1014d40: lw    v1, 0(v0)
+// 0x01014d50: 0x1014d50: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01014d44: 0x1014d44: sll   zero, zero, 0
-// 0x01014d48: 0x1014d48: sw    v1, 0(s0)
+// 0x01014d54: 0x1014d54: sll   zero, zero, 0
+// 0x01014d58: 0x1014d58: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01014d4c: 0x1014d4c: lw    v0, 4(v0)
+// 0x01014d5c: 0x1014d5c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1849,7 +1849,7 @@ L_1014d14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014d50: 0x1014d50: j	 0x1014dc4 sw    v0, 4(s0)
+// 0x01014d60: 0x1014d60: j	 0x1014dd4 sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1858,61 +1858,61 @@ L_1014d14:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1014dc4
+	br L_1014dd4
 // --- basic block ---
-L_1014d58:
-// 0x01014d58: 0x1014d58: lui   v1, 0x30000
+L_1014d68:
+// 0x01014d68: 0x1014d68: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01014d5c: 0x1014d5c: sll   a2, v0, 2
+// 0x01014d6c: 0x1014d6c: sll   a2, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01014d60: 0x1014d60: addiu v1, v1, -28528
+// 0x01014d70: 0x1014d70: addiu v1, v1, -28064
 	ldloc 7
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 7
-// 0x01014d64: 0x1014d64: addu  v1, a2, v1
+// 0x01014d74: 0x1014d74: addu  v1, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x01014d68: 0x1014d68: lw    v1, 0(v1)
+// 0x01014d78: 0x1014d78: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01014d6c: 0x1014d6c: sll   zero, zero, 0
-// 0x01014d70: 0x1014d70: bne   v1, zero, 0x1014d9c lui   a3, 0x0
+// 0x01014d7c: 0x1014d7c: sll   zero, zero, 0
+// 0x01014d80: 0x1014d80: bne   v1, zero, 0x1014dac lui   a3, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_1014d9c
+	brtrue L_1014dac
 // --- basic block ---
-// 0x01014d78: 0x1014d78: lui   a1, 0x0
+// 0x01014d88: 0x1014d88: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01014d7c: 0x1014d7c: addiu a1, a1, 28140
+// 0x01014d8c: 0x1014d8c: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x01014d80: 0x1014d80: addiu a3, a3, 28168
+// 0x01014d90: 0x1014d90: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01014d84: 0x1014d84: addiu a0, zero, 4
+// 0x01014d94: 0x1014d94: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01014d88: 0x1014d88: addiu a2, zero, 233
+// 0x01014d98: 0x1014d98: addiu a2, zero, 233
 	ldc.i4 233
 	stloc.3
-// 0x01014d8c: 0x1014d8c: jal   0x100449c sw    v0, 16(sp)
+// 0x01014d9c: 0x1014d9c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1931,17 +1931,17 @@ L_1014d58:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01014d94: 0x1014d94: j	 0x1014dc0 sw    zero, 0(s0)
+// 0x01014da4: 0x1014da4: j	 0x1014dd0 sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_1014dc0
+	br L_1014dd0
 // --- basic block ---
-L_1014d9c:
-// 0x01014d9c: 0x1014d9c: lw    v0, 4(v1)
+L_1014dac:
+// 0x01014dac: 0x1014dac: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1950,12 +1950,12 @@ L_1014d9c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014da0: 0x1014da0: sll   zero, zero, 0
-// 0x01014da4: 0x1014da4: beq   v0, zero, 0x1014dbc sll   zero, zero, 0
+// 0x01014db0: 0x1014db0: sll   zero, zero, 0
+// 0x01014db4: 0x1014db4: beq   v0, zero, 0x1014dcc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1014dbc
+	brfalse L_1014dcc
 // --- basic block ---
-// 0x01014dac: 0x1014dac: jalr  v0 sll   zero, zero, 0
+// 0x01014dbc: 0x1014dbc: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1967,19 +1967,19 @@ L_1014d9c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01014db4: 0x1014db4: j	 0x1014dc4 sll   zero, zero, 0
-	br L_1014dc4
+// 0x01014dc4: 0x1014dc4: j	 0x1014dd4 sll   zero, zero, 0
+	br L_1014dd4
 // --- basic block ---
-L_1014dbc:
-// 0x01014dbc: 0x1014dbc: sw    zero, 0(s0)
+L_1014dcc:
+// 0x01014dcc: 0x1014dcc: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1014dc0:
-// 0x01014dc0: 0x1014dc0: sw    zero, 4(s0)
+L_1014dd0:
+// 0x01014dd0: 0x1014dd0: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1988,9 +1988,9 @@ L_1014dc0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1014dc4:
-// 0x01014dc4: 0x1014dc4: lw    ra, 36(sp)
-// 0x01014dc8: 0x1014dc8: lw    s1, 32(sp)
+L_1014dd4:
+// 0x01014dd4: 0x1014dd4: lw    ra, 36(sp)
+// 0x01014dd8: 0x1014dd8: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1999,7 +1999,7 @@ L_1014dc4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014dcc: 0x1014dcc: lw    s0, 28(sp)
+// 0x01014ddc: 0x1014ddc: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2008,7 +2008,7 @@ L_1014dc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014dd0: 0x1014dd0: jr    ra addiu sp, sp, 40
+// 0x01014de0: 0x1014de0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2020,7 +2020,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2061,19 +2061,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014dd8: 0x1014dd8: lw    v0, 0(a0)
+// 0x01014de8: 0x1014de8: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014ddc: 0x1014ddc: addiu sp, sp, -40
+// 0x01014dec: 0x1014dec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01014de0: 0x1014de0: sw    s1, 32(sp)
+// 0x01014df0: 0x1014df0: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2082,7 +2082,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014de4: 0x1014de4: sw    s0, 28(sp)
+// 0x01014df4: 0x1014df4: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2091,20 +2091,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014de8: 0x1014de8: sw    ra, 36(sp)
-// 0x01014dec: 0x1014dec: addu  s1, a0, zero
+// 0x01014df8: 0x1014df8: sw    ra, 36(sp)
+// 0x01014dfc: 0x1014dfc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01014df0: 0x1014df0: bne   v0, zero, 0x1014e64 addu  s0, a1, zero
+// 0x01014e00: 0x1014e00: bne   v0, zero, 0x1014e74 addu  s0, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 8
-	brtrue L_1014e64
+	brtrue L_1014e74
 // --- basic block ---
-// 0x01014df8: 0x1014df8: lui   v0, 0x0
+// 0x01014e08: 0x1014e08: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01014dfc: 0x1014dfc: lw    v0, 576(v0)
+// 0x01014e0c: 0x1014e0c: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2113,7 +2113,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014e00: 0x1014e00: lw    a0, 12(a0)
+// 0x01014e10: 0x1014e10: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2122,30 +2122,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01014e04: 0x1014e04: sll   zero, zero, 0
-// 0x01014e08: 0x1014e08: beq   a0, v0, 0x1014e20 sll   zero, zero, 0
+// 0x01014e14: 0x1014e14: sll   zero, zero, 0
+// 0x01014e18: 0x1014e18: beq   a0, v0, 0x1014e30 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1014e20
+	beq  L_1014e30
 // --- basic block ---
-// 0x01014e10: 0x1014e10: bltz  a0, 0x1014e20 sll   zero, zero, 0
+// 0x01014e20: 0x1014e20: bltz  a0, 0x1014e30 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1014e20
+	blt L_1014e30
 // --- basic block ---
-// 0x01014e18: 0x1014e18: jal   0x100b164 sll   zero, zero, 0
+// 0x01014e28: 0x1014e28: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1014e20:
-// 0x01014e20: 0x1014e20: lw    v0, 4(s1)
+L_1014e30:
+// 0x01014e30: 0x1014e30: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2154,75 +2154,75 @@ L_1014e20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014e24: 0x1014e24: lui   v1, 0x20000
+// 0x01014e34: 0x1014e34: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01014e28: 0x1014e28: lw    v1, 31152(v1)
+// 0x01014e38: 0x1014e38: lw    v1, 31616(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014e2c: 0x1014e2c: sll   v0, v0, 3
+// 0x01014e3c: 0x1014e3c: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01014e30: 0x1014e30: addu  v0, v1, v0
+// 0x01014e40: 0x1014e40: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01014e34: 0x1014e34: lhu   v0, 0(v0)
+// 0x01014e44: 0x1014e44: lhu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01014e38: 0x1014e38: lui   v1, 0x20000
+// 0x01014e48: 0x1014e48: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01014e3c: 0x1014e3c: lw    v1, 31228(v1)
+// 0x01014e4c: 0x1014e4c: lw    v1, 31692(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014e40: 0x1014e40: andi  v0, v0, 32767
+// 0x01014e50: 0x1014e50: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01014e44: 0x1014e44: sll   v0, v0, 3
+// 0x01014e54: 0x1014e54: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01014e48: 0x1014e48: addu  v0, v1, v0
+// 0x01014e58: 0x1014e58: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01014e4c: 0x1014e4c: lw    v1, 0(v0)
+// 0x01014e5c: 0x1014e5c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01014e50: 0x1014e50: sll   zero, zero, 0
-// 0x01014e54: 0x1014e54: sw    v1, 0(s0)
+// 0x01014e60: 0x1014e60: sll   zero, zero, 0
+// 0x01014e64: 0x1014e64: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01014e58: 0x1014e58: lw    v0, 4(v0)
+// 0x01014e68: 0x1014e68: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2231,7 +2231,7 @@ L_1014e20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014e5c: 0x1014e5c: j	 0x1014ed0 sw    v0, 4(s0)
+// 0x01014e6c: 0x1014e6c: j	 0x1014ee0 sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2240,61 +2240,61 @@ L_1014e20:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1014ed0
+	br L_1014ee0
 // --- basic block ---
-L_1014e64:
-// 0x01014e64: 0x1014e64: lui   v1, 0x30000
+L_1014e74:
+// 0x01014e74: 0x1014e74: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01014e68: 0x1014e68: sll   a2, v0, 2
+// 0x01014e78: 0x1014e78: sll   a2, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01014e6c: 0x1014e6c: addiu v1, v1, -28528
+// 0x01014e7c: 0x1014e7c: addiu v1, v1, -28064
 	ldloc 7
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 7
-// 0x01014e70: 0x1014e70: addu  v1, a2, v1
+// 0x01014e80: 0x1014e80: addu  v1, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x01014e74: 0x1014e74: lw    v1, 0(v1)
+// 0x01014e84: 0x1014e84: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01014e78: 0x1014e78: sll   zero, zero, 0
-// 0x01014e7c: 0x1014e7c: bne   v1, zero, 0x1014ea8 lui   a3, 0x0
+// 0x01014e88: 0x1014e88: sll   zero, zero, 0
+// 0x01014e8c: 0x1014e8c: bne   v1, zero, 0x1014eb8 lui   a3, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_1014ea8
+	brtrue L_1014eb8
 // --- basic block ---
-// 0x01014e84: 0x1014e84: lui   a1, 0x0
+// 0x01014e94: 0x1014e94: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01014e88: 0x1014e88: addiu a1, a1, 28140
+// 0x01014e98: 0x1014e98: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x01014e8c: 0x1014e8c: addiu a3, a3, 28168
+// 0x01014e9c: 0x1014e9c: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01014e90: 0x1014e90: addiu a0, zero, 4
+// 0x01014ea0: 0x1014ea0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01014e94: 0x1014e94: addiu a2, zero, 204
+// 0x01014ea4: 0x1014ea4: addiu a2, zero, 204
 	ldc.i4 204
 	stloc.3
-// 0x01014e98: 0x1014e98: jal   0x100449c sw    v0, 16(sp)
+// 0x01014ea8: 0x1014ea8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2313,29 +2313,29 @@ L_1014e64:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01014ea0: 0x1014ea0: j	 0x1014ecc sw    zero, 0(s0)
+// 0x01014eb0: 0x1014eb0: j	 0x1014edc sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_1014ecc
+	br L_1014edc
 // --- basic block ---
-L_1014ea8:
-// 0x01014ea8: 0x1014ea8: lw    v0, 0(v1)
+L_1014eb8:
+// 0x01014eb8: 0x1014eb8: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014eac: 0x1014eac: sll   zero, zero, 0
-// 0x01014eb0: 0x1014eb0: beq   v0, zero, 0x1014ec8 sll   zero, zero, 0
+// 0x01014ebc: 0x1014ebc: sll   zero, zero, 0
+// 0x01014ec0: 0x1014ec0: beq   v0, zero, 0x1014ed8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1014ec8
+	brfalse L_1014ed8
 // --- basic block ---
-// 0x01014eb8: 0x1014eb8: jalr  v0 sll   zero, zero, 0
+// 0x01014ec8: 0x1014ec8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2347,19 +2347,19 @@ L_1014ea8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01014ec0: 0x1014ec0: j	 0x1014ed0 sll   zero, zero, 0
-	br L_1014ed0
+// 0x01014ed0: 0x1014ed0: j	 0x1014ee0 sll   zero, zero, 0
+	br L_1014ee0
 // --- basic block ---
-L_1014ec8:
-// 0x01014ec8: 0x1014ec8: sw    zero, 0(s0)
+L_1014ed8:
+// 0x01014ed8: 0x1014ed8: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1014ecc:
-// 0x01014ecc: 0x1014ecc: sw    zero, 4(s0)
+L_1014edc:
+// 0x01014edc: 0x1014edc: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2368,9 +2368,9 @@ L_1014ecc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1014ed0:
-// 0x01014ed0: 0x1014ed0: lw    ra, 36(sp)
-// 0x01014ed4: 0x1014ed4: lw    s1, 32(sp)
+L_1014ee0:
+// 0x01014ee0: 0x1014ee0: lw    ra, 36(sp)
+// 0x01014ee4: 0x1014ee4: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2379,7 +2379,7 @@ L_1014ed0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014ed8: 0x1014ed8: lw    s0, 28(sp)
+// 0x01014ee8: 0x1014ee8: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2388,7 +2388,7 @@ L_1014ed0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014edc: 0x1014edc: jr    ra addiu sp, sp, 40
+// 0x01014eec: 0x1014eec: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2400,7 +2400,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_get_line_points_1014ee4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_get_line_points_1014ef4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s3,int32 s0,int32 s2,int32 s1,int32 ra)
@@ -2447,13 +2447,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014ee4: 0x1014ee4: addiu sp, sp, -56
+// 0x01014ef4: 0x1014ef4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01014ee8: 0x1014ee8: sw    ra, 52(sp)
-// 0x01014eec: 0x1014eec: sw    s3, 48(sp)
+// 0x01014ef8: 0x1014ef8: sw    ra, 52(sp)
+// 0x01014efc: 0x1014efc: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2462,7 +2462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014ef0: 0x1014ef0: sw    s2, 44(sp)
+// 0x01014f00: 0x1014f00: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2471,10 +2471,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01014ef4: 0x1014ef4: addu  s3, a0, zero
+// 0x01014f04: 0x1014f04: addu  s3, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01014ef8: 0x1014ef8: sw    s1, 40(sp)
+// 0x01014f08: 0x1014f08: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2483,7 +2483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01014efc: 0x1014efc: sw    s0, 36(sp)
+// 0x01014f0c: 0x1014f0c: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2492,7 +2492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01014f00: 0x1014f00: sw    a2, 24(sp)
+// 0x01014f10: 0x1014f10: sw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2501,7 +2501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01014f04: 0x1014f04: lw    s2, 72(sp)
+// 0x01014f14: 0x1014f14: lw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2510,7 +2510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01014f08: 0x1014f08: lw    s1, 76(sp)
+// 0x01014f18: 0x1014f18: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2519,7 +2519,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01014f0c: 0x1014f0c: jal   0x1014dd8 addu  s0, a3, zero
+// 0x01014f1c: 0x1014f1c: jal   0x1014de8 addu  s0, a3, zero
 	ldloc 4
 	stloc 9
 	ldloc.0
@@ -2527,12 +2527,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01014f14: 0x1014f14: lw    a2, 24(sp)
+// 0x01014f24: 0x1014f24: lw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2541,10 +2541,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01014f18: 0x1014f18: addu  a0, s3, zero
+// 0x01014f28: 0x1014f28: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x01014f1c: 0x1014f1c: jal   0x1014ccc addu  a1, a2, zero
+// 0x01014f2c: 0x1014f2c: jal   0x1014cdc addu  a1, a2, zero
 	ldloc.3
 	stloc.2
 	ldloc.0
@@ -2552,26 +2552,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01014f24: 0x1014f24: lw    v0, 0(s3)
+// 0x01014f34: 0x1014f34: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01014f28: 0x1014f28: sll   zero, zero, 0
-// 0x01014f2c: 0x1014f2c: bne   v0, zero, 0x1014f88 lui   v1, 0x30000
+// 0x01014f38: 0x1014f38: sll   zero, zero, 0
+// 0x01014f3c: 0x1014f3c: bne   v0, zero, 0x1014f98 lui   v1, 0x30000
 	ldloc 7
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1014f88
+	brtrue L_1014f98
 // --- basic block ---
-// 0x01014f34: 0x1014f34: lw    v0, 4(s3)
+// 0x01014f44: 0x1014f44: lw    v0, 4(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2580,159 +2580,159 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01014f38: 0x1014f38: lui   v1, 0x20000
+// 0x01014f48: 0x1014f48: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01014f3c: 0x1014f3c: lw    v1, 31152(v1)
+// 0x01014f4c: 0x1014f4c: lw    v1, 31616(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 5
-// 0x01014f40: 0x1014f40: sll   v0, v0, 3
+// 0x01014f50: 0x1014f50: sll   v0, v0, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x01014f44: 0x1014f44: addu  v0, v1, v0
+// 0x01014f54: 0x1014f54: addu  v0, v1, v0
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01014f48: 0x1014f48: lhu   v0, 4(v0)
+// 0x01014f58: 0x1014f58: lhu   v0, 4(v0)
 	ldloc 7
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01014f4c: 0x1014f4c: ori   v1, zero, 65535
+// 0x01014f5c: 0x1014f5c: ori   v1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x01014f50: 0x1014f50: bne   v0, v1, 0x1014f60 lui   v1, 0x20000
+// 0x01014f60: 0x1014f60: bne   v0, v1, 0x1014f70 lui   v1, 0x20000
 	ldloc 7
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	bne.un L_1014f60
+	bne.un L_1014f70
 // --- basic block ---
-// 0x01014f58: 0x1014f58: j	 0x1014fc8 addiu v0, zero, -1
+// 0x01014f68: 0x1014f68: j	 0x1014fd8 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-	br L_1014fc8
+	br L_1014fd8
 // --- basic block ---
-L_1014f60:
-// 0x01014f60: 0x1014f60: lw    a0, 31240(v1)
+L_1014f70:
+// 0x01014f70: 0x1014f70: lw    a0, 31704(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x01014f64: 0x1014f64: sll   v1, v0, 2
+// 0x01014f74: 0x1014f74: sll   v1, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01014f68: 0x1014f68: addu  v1, a0, v1
+// 0x01014f78: 0x1014f78: addu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01014f6c: 0x1014f6c: lw    v1, 0(v1)
+// 0x01014f7c: 0x1014f7c: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014f70: 0x1014f70: addiu v0, v0, 1
+// 0x01014f80: 0x1014f80: addiu v0, v0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01014f74: 0x1014f74: addu  v1, v1, v0
+// 0x01014f84: 0x1014f84: addu  v1, v1, v0
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01014f78: 0x1014f78: addiu v1, v1, -1
+// 0x01014f88: 0x1014f88: addiu v1, v1, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01014f7c: 0x1014f7c: sw    v0, 0(s0)
+// 0x01014f8c: 0x1014f8c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01014f80: 0x1014f80: j	 0x1014fcc sw    v1, 0(s2)
+// 0x01014f90: 0x1014f90: j	 0x1014fdc sw    v1, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1014fcc
+	br L_1014fdc
 // --- basic block ---
-L_1014f88:
-// 0x01014f88: 0x1014f88: sll   a0, v0, 2
+L_1014f98:
+// 0x01014f98: 0x1014f98: sll   a0, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01014f8c: 0x1014f8c: addiu v1, v1, -28528
+// 0x01014f9c: 0x1014f9c: addiu v1, v1, -28064
 	ldloc 5
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 5
-// 0x01014f90: 0x1014f90: addu  v1, a0, v1
+// 0x01014fa0: 0x1014fa0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01014f94: 0x1014f94: lw    v1, 0(v1)
+// 0x01014fa4: 0x1014fa4: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01014f98: 0x1014f98: sll   zero, zero, 0
-// 0x01014f9c: 0x1014f9c: bne   v1, zero, 0x1014fc0 lui   a1, 0x0
+// 0x01014fa8: 0x1014fa8: sll   zero, zero, 0
+// 0x01014fac: 0x1014fac: bne   v1, zero, 0x1014fd0 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1014fc0
+	brtrue L_1014fd0
 // --- basic block ---
-// 0x01014fa4: 0x1014fa4: lui   a3, 0x0
+// 0x01014fb4: 0x1014fb4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01014fa8: 0x1014fa8: addiu a1, a1, 28140
+// 0x01014fb8: 0x1014fb8: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x01014fac: 0x1014fac: addiu a3, a3, 28168
+// 0x01014fbc: 0x1014fbc: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01014fb0: 0x1014fb0: addiu a0, zero, 4
+// 0x01014fc0: 0x1014fc0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01014fb4: 0x1014fb4: addiu a2, zero, 168
+// 0x01014fc4: 0x1014fc4: addiu a2, zero, 168
 	ldc.i4 168
 	stloc.3
-// 0x01014fb8: 0x1014fb8: jal   0x100449c sw    v0, 16(sp)
+// 0x01014fc8: 0x1014fc8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2751,35 +2751,35 @@ L_1014f88:
 	stloc 5
 	stloc 7
 // --- basic block ---
-L_1014fc0:
-// 0x01014fc0: 0x1014fc0: addiu v0, zero, -1
+L_1014fd0:
+// 0x01014fd0: 0x1014fd0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01014fc4: 0x1014fc4: sw    v0, 0(s2)
+// 0x01014fd4: 0x1014fd4: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_1014fc8:
-// 0x01014fc8: 0x1014fc8: sw    v0, 0(s0)
+L_1014fd8:
+// 0x01014fd8: 0x1014fd8: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_1014fcc:
-// 0x01014fcc: 0x1014fcc: lw    ra, 52(sp)
-// 0x01014fd0: 0x1014fd0: sw    zero, 0(s1)
+L_1014fdc:
+// 0x01014fdc: 0x1014fdc: lw    ra, 52(sp)
+// 0x01014fe0: 0x1014fe0: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01014fd4: 0x1014fd4: lw    s3, 48(sp)
+// 0x01014fe4: 0x1014fe4: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2788,7 +2788,7 @@ L_1014fcc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01014fd8: 0x1014fd8: lw    s2, 44(sp)
+// 0x01014fe8: 0x1014fe8: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2797,7 +2797,7 @@ L_1014fcc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01014fdc: 0x1014fdc: lw    s1, 40(sp)
+// 0x01014fec: 0x1014fec: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2806,7 +2806,7 @@ L_1014fcc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01014fe0: 0x1014fe0: lw    s0, 36(sp)
+// 0x01014ff0: 0x1014ff0: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2815,7 +2815,7 @@ L_1014fcc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01014fe4: 0x1014fe4: jr    ra addiu sp, sp, 56
+// 0x01014ff4: 0x1014ff4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2827,7 +2827,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_plugin_calc_length_1014fec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_calc_length_1014ffc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 v1)
@@ -2874,12 +2874,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01014fec: 0x1014fec: addiu sp, sp, -88
+// 0x01014ffc: 0x1014ffc: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01014ff0: 0x1014ff0: sw    s1, 72(sp)
+// 0x01015000: 0x1015000: sw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2888,7 +2888,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01014ff4: 0x1014ff4: sw    s0, 68(sp)
+// 0x01015004: 0x1015004: sw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2897,22 +2897,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01014ff8: 0x1014ff8: addiu s1, sp, 44
+// 0x01015008: 0x1015008: addiu s1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 8
-// 0x01014ffc: 0x1014ffc: addiu s0, sp, 52
+// 0x0101500c: 0x101500c: addiu s0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 7
-// 0x01015000: 0x1015000: addiu v0, sp, 36
+// 0x01015010: 0x1015010: addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 6
-// 0x01015004: 0x1015004: sw    s3, 80(sp)
+// 0x01015014: 0x1015014: sw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2921,7 +2921,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01015008: 0x1015008: sw    s2, 76(sp)
+// 0x01015018: 0x1015018: sw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2930,27 +2930,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101500c: 0x101500c: addu  s3, a0, zero
+// 0x0101501c: 0x101501c: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01015010: 0x1015010: addu  s2, a2, zero
+// 0x01015020: 0x1015020: addu  s2, a2, zero
 	ldloc.3
 	stloc 9
-// 0x01015014: 0x1015014: addu  a0, a1, zero
+// 0x01015024: 0x1015024: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01015018: 0x1015018: addu  a2, s0, zero
+// 0x01015028: 0x1015028: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x0101501c: 0x101501c: addu  a1, s1, zero
+// 0x0101502c: 0x101502c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01015020: 0x1015020: addiu a3, sp, 32
+// 0x01015030: 0x1015030: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01015024: 0x1015024: sw    v0, 16(sp)
+// 0x01015034: 0x1015034: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2959,13 +2959,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015028: 0x1015028: addiu v0, sp, 40
+// 0x01015038: 0x1015038: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 6
-// 0x0101502c: 0x101502c: sw    ra, 84(sp)
-// 0x01015030: 0x1015030: jal   0x1014ee4 sw    v0, 20(sp)
+// 0x0101503c: 0x101503c: sw    ra, 84(sp)
+// 0x01015040: 0x1015040: jal   0x1014ef4 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2979,12 +2979,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_line_points_1014ee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_line_points_1014ef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x01015038: 0x1015038: lw    v0, 36(sp)
+// 0x01015048: 0x1015048: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2993,7 +2993,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101503c: 0x101503c: lw    a3, 32(sp)
+// 0x0101504c: 0x101504c: lw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3002,7 +3002,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01015040: 0x1015040: sw    v0, 16(sp)
+// 0x01015050: 0x1015050: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3011,7 +3011,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015044: 0x1015044: lw    v0, 40(sp)
+// 0x01015054: 0x1015054: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3020,16 +3020,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015048: 0x1015048: addu  a0, s3, zero
+// 0x01015058: 0x1015058: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0101504c: 0x101504c: addu  a1, s1, zero
+// 0x0101505c: 0x101505c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01015050: 0x1015050: addu  a2, s0, zero
+// 0x01015060: 0x1015060: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x01015054: 0x1015054: sw    s2, 24(sp)
+// 0x01015064: 0x1015064: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3038,7 +3038,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015058: 0x1015058: jal   0x1009db4 sw    v0, 20(sp)
+// 0x01015068: 0x1015068: jal   0x1009dc4 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3052,13 +3052,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_calc_line_length_1009db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_calc_line_length_1009dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x01015060: 0x1015060: lw    ra, 84(sp)
-// 0x01015064: 0x1015064: lw    s3, 80(sp)
+// 0x01015070: 0x1015070: lw    ra, 84(sp)
+// 0x01015074: 0x1015074: lw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3067,7 +3067,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01015068: 0x1015068: lw    s2, 76(sp)
+// 0x01015078: 0x1015078: lw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3076,7 +3076,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101506c: 0x101506c: lw    s1, 72(sp)
+// 0x0101507c: 0x101507c: lw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3085,7 +3085,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01015070: 0x1015070: lw    s0, 68(sp)
+// 0x01015080: 0x1015080: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3094,7 +3094,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01015074: 0x1015074: jr    ra addiu sp, sp, 88
+// 0x01015084: 0x1015084: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -3106,7 +3106,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_plugin_get_street_101507c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_get_street_101508c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3147,19 +3147,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101507c: 0x101507c: lw    v0, 0(a0)
+// 0x0101508c: 0x101508c: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01015080: 0x1015080: addiu sp, sp, -64
+// 0x01015090: 0x1015090: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01015084: 0x1015084: sw    s1, 56(sp)
+// 0x01015094: 0x1015094: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3168,7 +3168,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015088: 0x1015088: sw    s0, 52(sp)
+// 0x01015098: 0x1015098: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3177,20 +3177,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101508c: 0x101508c: sw    ra, 60(sp)
-// 0x01015090: 0x1015090: addu  s1, a0, zero
+// 0x0101509c: 0x101509c: sw    ra, 60(sp)
+// 0x010150a0: 0x10150a0: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01015094: 0x1015094: bne   v0, zero, 0x10150e8 addu  s0, a1, zero
+// 0x010150a4: 0x10150a4: bne   v0, zero, 0x10150f8 addu  s0, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 8
-	brtrue L_10150e8
+	brtrue L_10150f8
 // --- basic block ---
-// 0x0101509c: 0x101509c: lui   v0, 0x0
+// 0x010150ac: 0x10150ac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010150a0: 0x10150a0: lw    v0, 576(v0)
+// 0x010150b0: 0x10150b0: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3199,7 +3199,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010150a4: 0x10150a4: lw    a0, 12(a0)
+// 0x010150b4: 0x10150b4: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3208,30 +3208,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010150a8: 0x10150a8: sll   zero, zero, 0
-// 0x010150ac: 0x10150ac: beq   a0, v0, 0x10150c4 sll   zero, zero, 0
+// 0x010150b8: 0x10150b8: sll   zero, zero, 0
+// 0x010150bc: 0x10150bc: beq   a0, v0, 0x10150d4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10150c4
+	beq  L_10150d4
 // --- basic block ---
-// 0x010150b4: 0x10150b4: bltz  a0, 0x10150c4 sll   zero, zero, 0
+// 0x010150c4: 0x10150c4: bltz  a0, 0x10150d4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10150c4
+	blt L_10150d4
 // --- basic block ---
-// 0x010150bc: 0x10150bc: jal   0x100b164 sll   zero, zero, 0
+// 0x010150cc: 0x10150cc: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10150c4:
-// 0x010150c4: 0x10150c4: lw    a0, 4(s1)
+L_10150d4:
+// 0x010150d4: 0x10150d4: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3240,7 +3240,7 @@ L_10150c4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010150c8: 0x10150c8: jal   0x1011a4c addiu a1, sp, 24
+// 0x010150d8: 0x10150d8: jal   0x1011a5c addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3250,12 +3250,12 @@ L_10150c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010150d0: 0x10150d0: lw    v0, 40(sp)
+// 0x010150e0: 0x10150e0: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3264,14 +3264,14 @@ L_10150c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010150d4: 0x10150d4: sw    zero, 0(s0)
+// 0x010150e4: 0x10150e4: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010150d8: 0x10150d8: sw    v0, 8(s0)
+// 0x010150e8: 0x10150e8: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3280,7 +3280,7 @@ L_10150c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010150dc: 0x10150dc: lw    v0, 12(s1)
+// 0x010150ec: 0x10150ec: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3289,7 +3289,7 @@ L_10150c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010150e0: 0x10150e0: j	 0x1015160 sw    v0, 4(s0)
+// 0x010150f0: 0x10150f0: j	 0x1015170 sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3298,42 +3298,42 @@ L_10150c4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1015160
+	br L_1015170
 // --- basic block ---
-L_10150e8:
-// 0x010150e8: 0x10150e8: lui   v1, 0x30000
+L_10150f8:
+// 0x010150f8: 0x10150f8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x010150ec: 0x10150ec: sll   a2, v0, 2
+// 0x010150fc: 0x10150fc: sll   a2, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x010150f0: 0x10150f0: addiu v1, v1, -28528
+// 0x01015100: 0x1015100: addiu v1, v1, -28064
 	ldloc 7
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 7
-// 0x010150f4: 0x10150f4: addu  v1, a2, v1
+// 0x01015104: 0x1015104: addu  v1, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x010150f8: 0x10150f8: sw    v0, 0(a1)
+// 0x01015108: 0x1015108: sw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010150fc: 0x10150fc: lw    v0, 0(v1)
+// 0x0101510c: 0x101510c: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01015100: 0x1015100: lw    v1, 12(a0)
+// 0x01015110: 0x1015110: lw    v1, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3342,7 +3342,7 @@ L_10150e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01015104: 0x1015104: bne   v0, zero, 0x1015138 sw    v1, 4(a1)
+// 0x01015114: 0x1015114: bne   v0, zero, 0x1015148 sw    v1, 4(a1)
 	ldloc 5
 	ldloc 6
 	ldloc.2
@@ -3352,38 +3352,38 @@ L_10150e8:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1015138
+	brtrue L_1015148
 // --- basic block ---
-// 0x0101510c: 0x101510c: lw    v0, 0(a0)
+// 0x0101511c: 0x101511c: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01015110: 0x1015110: lui   a1, 0x0
+// 0x01015120: 0x1015120: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015114: 0x1015114: lui   a3, 0x0
+// 0x01015124: 0x1015124: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01015118: 0x1015118: addiu a1, a1, 28140
+// 0x01015128: 0x1015128: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x0101511c: 0x101511c: addiu a3, a3, 28168
+// 0x0101512c: 0x101512c: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01015120: 0x1015120: addiu a0, zero, 4
+// 0x01015130: 0x1015130: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01015124: 0x1015124: addiu a2, zero, 348
+// 0x01015134: 0x1015134: addiu a2, zero, 348
 	ldc.i4 348
 	stloc.3
-// 0x01015128: 0x1015128: jal   0x100449c sw    v0, 16(sp)
+// 0x01015138: 0x1015138: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3402,13 +3402,13 @@ L_10150e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01015130: 0x1015130: j	 0x101515c addiu v0, zero, -1
+// 0x01015140: 0x1015140: j	 0x101516c addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_101515c
+	br L_101516c
 // --- basic block ---
-L_1015138:
-// 0x01015138: 0x1015138: lw    v0, 28(v0)
+L_1015148:
+// 0x01015148: 0x1015148: lw    v0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3417,12 +3417,12 @@ L_1015138:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101513c: 0x101513c: sll   zero, zero, 0
-// 0x01015140: 0x1015140: beq   v0, zero, 0x1015158 sll   zero, zero, 0
+// 0x0101514c: 0x101514c: sll   zero, zero, 0
+// 0x01015150: 0x1015150: beq   v0, zero, 0x1015168 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1015158
+	brfalse L_1015168
 // --- basic block ---
-// 0x01015148: 0x1015148: jalr  v0 sll   zero, zero, 0
+// 0x01015158: 0x1015158: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3434,15 +3434,15 @@ L_1015138:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01015150: 0x1015150: j	 0x1015160 sll   zero, zero, 0
-	br L_1015160
+// 0x01015160: 0x1015160: j	 0x1015170 sll   zero, zero, 0
+	br L_1015170
 // --- basic block ---
-L_1015158:
-// 0x01015158: 0x1015158: addiu v0, zero, -1
+L_1015168:
+// 0x01015168: 0x1015168: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_101515c:
-// 0x0101515c: 0x101515c: sw    v0, 8(s0)
+L_101516c:
+// 0x0101516c: 0x101516c: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3451,9 +3451,9 @@ L_101515c:
 	add
 	ldloc 5
 	stelem.i4
-L_1015160:
-// 0x01015160: 0x1015160: lw    ra, 60(sp)
-// 0x01015164: 0x1015164: lw    s1, 56(sp)
+L_1015170:
+// 0x01015170: 0x1015170: lw    ra, 60(sp)
+// 0x01015174: 0x1015174: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3462,7 +3462,7 @@ L_1015160:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01015168: 0x1015168: lw    s0, 52(sp)
+// 0x01015178: 0x1015178: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3471,7 +3471,7 @@ L_1015160:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101516c: 0x101516c: jr    ra addiu sp, sp, 64
+// 0x0101517c: 0x101517c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3483,7 +3483,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -3527,19 +3527,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015174: 0x1015174: lw    v0, 0(a0)
+// 0x01015184: 0x1015184: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01015178: 0x1015178: addiu sp, sp, -64
+// 0x01015188: 0x1015188: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0101517c: 0x101517c: sw    s2, 56(sp)
+// 0x0101518c: 0x101518c: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3548,7 +3548,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01015180: 0x1015180: sw    s1, 52(sp)
+// 0x01015190: 0x1015190: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3557,7 +3557,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01015184: 0x1015184: sw    s0, 48(sp)
+// 0x01015194: 0x1015194: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3566,23 +3566,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015188: 0x1015188: sw    ra, 60(sp)
-// 0x0101518c: 0x101518c: addu  s1, a0, zero
+// 0x01015198: 0x1015198: sw    ra, 60(sp)
+// 0x0101519c: 0x101519c: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01015190: 0x1015190: addu  s0, a1, zero
+// 0x010151a0: 0x10151a0: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01015194: 0x1015194: bne   v0, zero, 0x1015234 addu  s2, a2, zero
+// 0x010151a4: 0x10151a4: bne   v0, zero, 0x1015244 addu  s2, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 10
-	brtrue L_1015234
+	brtrue L_1015244
 // --- basic block ---
-// 0x0101519c: 0x101519c: lui   v0, 0x0
+// 0x010151ac: 0x10151ac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010151a0: 0x10151a0: lw    v0, 576(v0)
+// 0x010151b0: 0x10151b0: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3591,7 +3591,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010151a4: 0x10151a4: lw    a0, 12(a0)
+// 0x010151b4: 0x10151b4: lw    a0, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3600,35 +3600,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010151a8: 0x10151a8: sll   zero, zero, 0
-// 0x010151ac: 0x10151ac: beq   a0, v0, 0x10151c8 addiu v0, zero, 1
+// 0x010151b8: 0x10151b8: sll   zero, zero, 0
+// 0x010151bc: 0x10151bc: beq   a0, v0, 0x10151d8 addiu v0, zero, 1
 	ldloc.1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	beq  L_10151c8
+	beq  L_10151d8
 // --- basic block ---
-// 0x010151b4: 0x10151b4: bltz  a0, 0x10151c8 sll   zero, zero, 0
+// 0x010151c4: 0x10151c4: bltz  a0, 0x10151d8 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10151c8
+	blt L_10151d8
 // --- basic block ---
-// 0x010151bc: 0x10151bc: jal   0x100b164 sll   zero, zero, 0
+// 0x010151cc: 0x10151cc: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010151c4: 0x10151c4: addiu v0, zero, 1
+// 0x010151d4: 0x10151d4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10151c8:
-// 0x010151c8: 0x10151c8: lw    a0, 4(s1)
+L_10151d8:
+// 0x010151d8: 0x10151d8: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3637,16 +3637,16 @@ L_10151c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010151cc: 0x10151cc: bne   s2, v0, 0x10151ec addiu s1, sp, 24
+// 0x010151dc: 0x10151dc: bne   s2, v0, 0x10151fc addiu s1, sp, 24
 	ldloc 10
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	bne.un L_10151ec
+	bne.un L_10151fc
 // --- basic block ---
-// 0x010151d4: 0x10151d4: jal   0x1011a14 addu  a1, s1, zero
+// 0x010151e4: 0x10151e4: jal   0x1011a24 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3654,12 +3654,12 @@ L_10151c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_1011a14(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_1011a24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010151dc: 0x10151dc: jal   0x1011818 addu  a0, s1, zero
+// 0x010151ec: 0x10151ec: jal   0x1011828 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3667,12 +3667,12 @@ L_10151c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010151e4: 0x10151e4: j	 0x1015224 sw    v0, 4(s0)
+// 0x010151f4: 0x10151f4: j	 0x1015234 sw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3681,10 +3681,10 @@ L_10151c8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1015224
+	br L_1015234
 // --- basic block ---
-L_10151ec:
-// 0x010151ec: 0x10151ec: jal   0x1011a4c addu  a1, s1, zero
+L_10151fc:
+// 0x010151fc: 0x10151fc: jal   0x1011a5c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3692,12 +3692,12 @@ L_10151ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010151f4: 0x10151f4: jal   0x101184c addu  a0, s1, zero
+// 0x01015204: 0x1015204: jal   0x101185c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3705,19 +3705,19 @@ L_10151ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_address_101184c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_address_101185c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010151fc: 0x10151fc: sw    v0, 0(s0)
+// 0x0101520c: 0x101520c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01015200: 0x1015200: jal   0x1011818 addu  a0, s1, zero
+// 0x01015210: 0x1015210: jal   0x1011828 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3725,12 +3725,12 @@ L_10151ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01015208: 0x1015208: sw    v0, 4(s0)
+// 0x01015218: 0x1015218: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3739,13 +3739,13 @@ L_10151ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101520c: 0x101520c: jal   0x1010d84 addu  a0, s1, zero
+// 0x0101521c: 0x101521c: jal   0x1010d94 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-	call int32 Cibyl12::roadmap_street_get_street_t2s_1010d84()
+	call int32 Cibyl12::roadmap_street_get_street_t2s_1010d94()
 	stloc 5
 // --- basic block ---
-// 0x01015214: 0x1015214: sw    v0, 8(s0)
+// 0x01015224: 0x1015224: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3754,7 +3754,7 @@ L_10151ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01015218: 0x1015218: jal   0x101124c addu  a0, s1, zero
+// 0x01015228: 0x1015228: jal   0x101125c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3762,12 +3762,12 @@ L_10151ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_city_name_101124c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_city_name_101125c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01015220: 0x1015220: sw    v0, 12(s0)
+// 0x01015230: 0x1015230: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3776,8 +3776,8 @@ L_10151ec:
 	add
 	ldloc 5
 	stelem.i4
-L_1015224:
-// 0x01015224: 0x1015224: lw    v0, 40(sp)
+L_1015234:
+// 0x01015234: 0x1015234: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ L_1015224:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015228: 0x1015228: sw    zero, 16(s0)
+// 0x01015238: 0x1015238: sw    zero, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3795,7 +3795,7 @@ L_1015224:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101522c: 0x101522c: j	 0x10152a4 sw    v0, 24(s0)
+// 0x0101523c: 0x101523c: j	 0x10152b4 sw    v0, 24(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3804,43 +3804,43 @@ L_1015224:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10152a4
+	br L_10152b4
 // --- basic block ---
-L_1015234:
-// 0x01015234: 0x1015234: lui   v1, 0x30000
+L_1015244:
+// 0x01015244: 0x1015244: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01015238: 0x1015238: sll   a3, v0, 2
+// 0x01015248: 0x1015248: sll   a3, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x0101523c: 0x101523c: addiu v1, v1, -28528
+// 0x0101524c: 0x101524c: addiu v1, v1, -28064
 	ldloc 7
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 7
-// 0x01015240: 0x1015240: addu  v1, a3, v1
+// 0x01015250: 0x1015250: addu  v1, a3, v1
 	ldloc 4
 	ldloc 7
 	add
 	stloc 7
-// 0x01015244: 0x1015244: lw    a3, 0(v1)
+// 0x01015254: 0x1015254: lw    a3, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01015248: 0x1015248: lui   v1, 0x10000
+// 0x01015258: 0x1015258: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0101524c: 0x101524c: addiu v1, v1, 18500
+// 0x0101525c: 0x101525c: addiu v1, v1, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-// 0x01015250: 0x1015250: sw    v1, 12(a1)
+// 0x01015260: 0x1015260: sw    v1, 12(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3849,14 +3849,14 @@ L_1015234:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01015254: 0x1015254: sw    v1, 0(a1)
+// 0x01015264: 0x1015264: sw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01015258: 0x1015258: sw    v1, 4(a1)
+// 0x01015268: 0x1015268: sw    v1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3865,7 +3865,7 @@ L_1015234:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101525c: 0x101525c: bne   a3, zero, 0x101528c sw    v1, 8(a1)
+// 0x0101526c: 0x101526c: bne   a3, zero, 0x101529c sw    v1, 8(a1)
 	ldloc 4
 	ldloc 6
 	ldloc.2
@@ -3875,31 +3875,31 @@ L_1015234:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_101528c
+	brtrue L_101529c
 // --- basic block ---
-// 0x01015264: 0x1015264: lui   a1, 0x0
+// 0x01015274: 0x1015274: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015268: 0x1015268: lui   a3, 0x0
+// 0x01015278: 0x1015278: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101526c: 0x101526c: addiu a1, a1, 28140
+// 0x0101527c: 0x101527c: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x01015270: 0x1015270: addiu a3, a3, 28168
+// 0x01015280: 0x1015280: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01015274: 0x1015274: addiu a0, zero, 4
+// 0x01015284: 0x1015284: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01015278: 0x1015278: addiu a2, zero, 433
+// 0x01015288: 0x1015288: addiu a2, zero, 433
 	ldc.i4 433
 	stloc.3
-// 0x0101527c: 0x101527c: jal   0x100449c sw    v0, 16(sp)
+// 0x0101528c: 0x101528c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3918,11 +3918,11 @@ L_1015234:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01015284: 0x1015284: j	 0x10152a4 sll   zero, zero, 0
-	br L_10152a4
+// 0x01015294: 0x1015294: j	 0x10152b4 sll   zero, zero, 0
+	br L_10152b4
 // --- basic block ---
-L_101528c:
-// 0x0101528c: 0x101528c: lw    v0, 36(a3)
+L_101529c:
+// 0x0101529c: 0x101529c: lw    v0, 36(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -3931,12 +3931,12 @@ L_101528c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015290: 0x1015290: sll   zero, zero, 0
-// 0x01015294: 0x1015294: beq   v0, zero, 0x10152a4 sll   zero, zero, 0
+// 0x010152a0: 0x10152a0: sll   zero, zero, 0
+// 0x010152a4: 0x10152a4: beq   v0, zero, 0x10152b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10152a4
+	brfalse L_10152b4
 // --- basic block ---
-// 0x0101529c: 0x101529c: jalr  v0 sll   zero, zero, 0
+// 0x010152ac: 0x10152ac: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3948,9 +3948,9 @@ L_101528c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10152a4:
-// 0x010152a4: 0x10152a4: lw    ra, 60(sp)
-// 0x010152a8: 0x10152a8: lw    s2, 56(sp)
+L_10152b4:
+// 0x010152b4: 0x10152b4: lw    ra, 60(sp)
+// 0x010152b8: 0x10152b8: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3959,7 +3959,7 @@ L_10152a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010152ac: 0x10152ac: lw    s1, 52(sp)
+// 0x010152bc: 0x10152bc: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3968,7 +3968,7 @@ L_10152a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010152b0: 0x10152b0: lw    s0, 48(sp)
+// 0x010152c0: 0x10152c0: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3977,7 +3977,7 @@ L_10152a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010152b4: 0x10152b4: jr    ra addiu sp, sp, 64
+// 0x010152c4: 0x10152c4: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3989,7 +3989,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_street_full_name_10152bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_street_full_name_10152cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -4027,19 +4027,19 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010152bc: 0x10152bc: lw    v0, 0(a0)
+// 0x010152cc: 0x10152cc: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010152c0: 0x10152c0: addiu sp, sp, -56
+// 0x010152d0: 0x10152d0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010152c4: 0x10152c4: sw    s0, 48(sp)
+// 0x010152d4: 0x10152d4: sw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4048,17 +4048,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010152c8: 0x10152c8: sw    ra, 52(sp)
-// 0x010152cc: 0x10152cc: bne   v0, zero, 0x101531c addu  s0, a0, zero
+// 0x010152d8: 0x10152d8: sw    ra, 52(sp)
+// 0x010152dc: 0x10152dc: bne   v0, zero, 0x101532c addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brtrue L_101531c
+	brtrue L_101532c
 // --- basic block ---
-// 0x010152d4: 0x10152d4: lui   v0, 0x0
+// 0x010152e4: 0x10152e4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010152d8: 0x10152d8: lw    v0, 576(v0)
+// 0x010152e8: 0x10152e8: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4067,7 +4067,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010152dc: 0x10152dc: lw    a0, 12(a0)
+// 0x010152ec: 0x10152ec: lw    a0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4076,30 +4076,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010152e0: 0x10152e0: sll   zero, zero, 0
-// 0x010152e4: 0x10152e4: beq   a0, v0, 0x10152fc sll   zero, zero, 0
+// 0x010152f0: 0x10152f0: sll   zero, zero, 0
+// 0x010152f4: 0x10152f4: beq   a0, v0, 0x101530c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10152fc
+	beq  L_101530c
 // --- basic block ---
-// 0x010152ec: 0x10152ec: bltz  a0, 0x10152fc sll   zero, zero, 0
+// 0x010152fc: 0x10152fc: bltz  a0, 0x101530c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10152fc
+	blt L_101530c
 // --- basic block ---
-// 0x010152f4: 0x10152f4: jal   0x100b164 sll   zero, zero, 0
+// 0x01015304: 0x1015304: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10152fc:
-// 0x010152fc: 0x10152fc: lw    a0, 4(s0)
+L_101530c:
+// 0x0101530c: 0x101530c: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4108,12 +4108,12 @@ L_10152fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015300: 0x1015300: addiu s0, sp, 24
+// 0x01015310: 0x1015310: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01015304: 0x1015304: jal   0x1011a4c addu  a1, s0, zero
+// 0x01015314: 0x1015314: jal   0x1011a5c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4121,12 +4121,12 @@ L_10152fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101530c: 0x101530c: jal   0x1011920 addu  a0, s0, zero
+// 0x0101531c: 0x101531c: jal   0x1011930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4134,67 +4134,67 @@ L_10152fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_full_name_1011920(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_full_name_1011930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01015314: 0x1015314: j	 0x1015384 sll   zero, zero, 0
-	br L_1015384
+// 0x01015324: 0x1015324: j	 0x1015394 sll   zero, zero, 0
+	br L_1015394
 // --- basic block ---
-L_101531c:
-// 0x0101531c: 0x101531c: lui   v1, 0x30000
+L_101532c:
+// 0x0101532c: 0x101532c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01015320: 0x1015320: sll   a1, v0, 2
+// 0x01015330: 0x1015330: sll   a1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01015324: 0x1015324: addiu v1, v1, -28528
+// 0x01015334: 0x1015334: addiu v1, v1, -28064
 	ldloc 6
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 6
-// 0x01015328: 0x1015328: addu  v1, a1, v1
+// 0x01015338: 0x1015338: addu  v1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x0101532c: 0x101532c: lw    v1, 0(v1)
+// 0x0101533c: 0x101533c: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01015330: 0x1015330: sll   zero, zero, 0
-// 0x01015334: 0x1015334: bne   v1, zero, 0x1015360 lui   a1, 0x0
+// 0x01015340: 0x1015340: sll   zero, zero, 0
+// 0x01015344: 0x1015344: bne   v1, zero, 0x1015370 lui   a1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1015360
+	brtrue L_1015370
 // --- basic block ---
-// 0x0101533c: 0x101533c: lui   a3, 0x0
+// 0x0101534c: 0x101534c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01015340: 0x1015340: addiu a1, a1, 28140
+// 0x01015350: 0x1015350: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x01015344: 0x1015344: addiu a3, a3, 28168
+// 0x01015354: 0x1015354: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01015348: 0x1015348: addiu a0, zero, 4
+// 0x01015358: 0x1015358: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101534c: 0x101534c: addiu a2, zero, 381
+// 0x0101535c: 0x101535c: addiu a2, zero, 381
 	ldc.i4 381
 	stloc.3
-// 0x01015350: 0x1015350: jal   0x100449c sw    v0, 16(sp)
+// 0x01015360: 0x1015360: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4213,13 +4213,13 @@ L_101531c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01015358: 0x1015358: j	 0x1015374 lui   v0, 0x10000
+// 0x01015368: 0x1015368: j	 0x1015384 lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-	br L_1015374
+	br L_1015384
 // --- basic block ---
-L_1015360:
-// 0x01015360: 0x1015360: lw    v0, 32(v1)
+L_1015370:
+// 0x01015370: 0x1015370: lw    v0, 32(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4228,24 +4228,24 @@ L_1015360:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015364: 0x1015364: sll   zero, zero, 0
-// 0x01015368: 0x1015368: bne   v0, zero, 0x101537c sll   zero, zero, 0
+// 0x01015374: 0x1015374: sll   zero, zero, 0
+// 0x01015378: 0x1015378: bne   v0, zero, 0x101538c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101537c
+	brtrue L_101538c
 // --- basic block ---
-// 0x01015370: 0x1015370: lui   v0, 0x10000
+// 0x01015380: 0x1015380: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-L_1015374:
-// 0x01015374: 0x1015374: j	 0x1015384 addiu v0, v0, 18500
+L_1015384:
+// 0x01015384: 0x1015384: j	 0x1015394 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_1015384
+	br L_1015394
 // --- basic block ---
-L_101537c:
-// 0x0101537c: 0x101537c: jalr  v0 sll   zero, zero, 0
+L_101538c:
+// 0x0101538c: 0x101538c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4257,9 +4257,9 @@ L_101537c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1015384:
-// 0x01015384: 0x1015384: lw    ra, 52(sp)
-// 0x01015388: 0x1015388: lw    s0, 48(sp)
+L_1015394:
+// 0x01015394: 0x1015394: lw    ra, 52(sp)
+// 0x01015398: 0x1015398: lw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4268,7 +4268,7 @@ L_1015384:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101538c: 0x101538c: jr    ra addiu sp, sp, 56
+// 0x0101539c: 0x101539c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4280,7 +4280,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_plugin_get_distance_1015394(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_get_distance_10153a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4321,19 +4321,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015394: 0x1015394: lw    v0, 0(a1)
+// 0x010153a4: 0x10153a4: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01015398: 0x1015398: addiu sp, sp, -48
+// 0x010153a8: 0x10153a8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101539c: 0x101539c: sw    s1, 40(sp)
+// 0x010153ac: 0x10153ac: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4342,7 +4342,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010153a0: 0x10153a0: sw    s0, 36(sp)
+// 0x010153b0: 0x10153b0: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4351,23 +4351,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010153a4: 0x10153a4: sw    ra, 44(sp)
-// 0x010153a8: 0x10153a8: addu  s0, a1, zero
+// 0x010153b4: 0x10153b4: sw    ra, 44(sp)
+// 0x010153b8: 0x10153b8: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010153ac: 0x10153ac: addu  s1, a0, zero
+// 0x010153bc: 0x10153bc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010153b0: 0x10153b0: bne   v0, zero, 0x10153fc addu  a3, a2, zero
+// 0x010153c0: 0x10153c0: bne   v0, zero, 0x101540c addu  a3, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 4
-	brtrue L_10153fc
+	brtrue L_101540c
 // --- basic block ---
-// 0x010153b8: 0x10153b8: lui   v0, 0x0
+// 0x010153c8: 0x10153c8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010153bc: 0x10153bc: lw    v0, 576(v0)
+// 0x010153cc: 0x10153cc: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4376,7 +4376,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010153c0: 0x10153c0: lw    a0, 12(a1)
+// 0x010153d0: 0x10153d0: lw    a0, 12(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4385,18 +4385,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010153c4: 0x10153c4: sll   zero, zero, 0
-// 0x010153c8: 0x10153c8: beq   a0, v0, 0x10153e4 sll   zero, zero, 0
+// 0x010153d4: 0x10153d4: sll   zero, zero, 0
+// 0x010153d8: 0x10153d8: beq   a0, v0, 0x10153f4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10153e4
+	beq  L_10153f4
 // --- basic block ---
-// 0x010153d0: 0x10153d0: bltz  a0, 0x10153e4 sll   zero, zero, 0
+// 0x010153e0: 0x10153e0: bltz  a0, 0x10153f4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10153e4
+	blt L_10153f4
 // --- basic block ---
-// 0x010153d8: 0x10153d8: jal   0x100b164 sw    a2, 24(sp)
+// 0x010153e8: 0x10153e8: jal   0x100b174 sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4410,12 +4410,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010153e0: 0x10153e0: lw    a3, 24(sp)
+// 0x010153f0: 0x10153f0: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4424,8 +4424,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-L_10153e4:
-// 0x010153e4: 0x10153e4: lw    a2, 8(s0)
+L_10153f4:
+// 0x010153f4: 0x10153f4: lw    a2, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4434,7 +4434,7 @@ L_10153e4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010153e8: 0x10153e8: lw    a1, 4(s0)
+// 0x010153f8: 0x10153f8: lw    a1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4443,7 +4443,7 @@ L_10153e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010153ec: 0x10153ec: jal   0x10134cc addu  a0, s1, zero
+// 0x010153fc: 0x10153fc: jal   0x10134dc addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4451,67 +4451,67 @@ L_10153e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_street_get_distance_10134cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_street_get_distance_10134dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010153f4: 0x10153f4: j	 0x1015460 sll   zero, zero, 0
-	br L_1015460
+// 0x01015404: 0x1015404: j	 0x1015470 sll   zero, zero, 0
+	br L_1015470
 // --- basic block ---
-L_10153fc:
-// 0x010153fc: 0x10153fc: lui   v1, 0x30000
+L_101540c:
+// 0x0101540c: 0x101540c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01015400: 0x1015400: sll   a3, v0, 2
+// 0x01015410: 0x1015410: sll   a3, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01015404: 0x1015404: addiu v1, v1, -28528
+// 0x01015414: 0x1015414: addiu v1, v1, -28064
 	ldloc 7
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 7
-// 0x01015408: 0x1015408: addu  v1, a3, v1
+// 0x01015418: 0x1015418: addu  v1, a3, v1
 	ldloc 4
 	ldloc 7
 	add
 	stloc 7
-// 0x0101540c: 0x101540c: lw    v1, 0(v1)
+// 0x0101541c: 0x101541c: lw    v1, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01015410: 0x1015410: sll   zero, zero, 0
-// 0x01015414: 0x1015414: bne   v1, zero, 0x1015440 lui   a3, 0x0
+// 0x01015420: 0x1015420: sll   zero, zero, 0
+// 0x01015424: 0x1015424: bne   v1, zero, 0x1015450 lui   a3, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_1015440
+	brtrue L_1015450
 // --- basic block ---
-// 0x0101541c: 0x101541c: lui   a1, 0x0
+// 0x0101542c: 0x101542c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015420: 0x1015420: addiu a1, a1, 28140
+// 0x01015430: 0x1015430: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x01015424: 0x1015424: addiu a3, a3, 28168
+// 0x01015434: 0x1015434: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x01015428: 0x1015428: addiu a0, zero, 4
+// 0x01015438: 0x1015438: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101542c: 0x101542c: addiu a2, zero, 135
+// 0x0101543c: 0x101543c: addiu a2, zero, 135
 	ldc.i4 135
 	stloc.3
-// 0x01015430: 0x1015430: jal   0x100449c sw    v0, 16(sp)
+// 0x01015440: 0x1015440: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4530,13 +4530,13 @@ L_10153fc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01015438: 0x1015438: j	 0x1015460 addu  v0, zero, zero
+// 0x01015448: 0x1015448: j	 0x1015470 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1015460
+	br L_1015470
 // --- basic block ---
-L_1015440:
-// 0x01015440: 0x1015440: lw    a3, 8(v1)
+L_1015450:
+// 0x01015450: 0x1015450: lw    a3, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4545,14 +4545,14 @@ L_1015440:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01015444: 0x1015444: sll   zero, zero, 0
-// 0x01015448: 0x1015448: beq   a3, zero, 0x1015460 addu  v0, zero, zero
+// 0x01015454: 0x1015454: sll   zero, zero, 0
+// 0x01015458: 0x1015458: beq   a3, zero, 0x1015470 addu  v0, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1015460
+	brfalse L_1015470
 // --- basic block ---
-// 0x01015450: 0x1015450: lw    v0, 12(v1)
+// 0x01015460: 0x1015460: lw    v0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4561,8 +4561,8 @@ L_1015440:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015454: 0x1015454: sll   zero, zero, 0
-// 0x01015458: 0x1015458: jalr  v0 sll   zero, zero, 0
+// 0x01015464: 0x1015464: sll   zero, zero, 0
+// 0x01015468: 0x1015468: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -4574,9 +4574,9 @@ L_1015440:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1015460:
-// 0x01015460: 0x1015460: lw    ra, 44(sp)
-// 0x01015464: 0x1015464: lw    s1, 40(sp)
+L_1015470:
+// 0x01015470: 0x1015470: lw    ra, 44(sp)
+// 0x01015474: 0x1015474: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4585,7 +4585,7 @@ L_1015460:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01015468: 0x1015468: lw    s0, 36(sp)
+// 0x01015478: 0x1015478: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4594,7 +4594,7 @@ L_1015460:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101546c: 0x101546c: jr    ra addiu sp, sp, 48
+// 0x0101547c: 0x101547c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4606,7 +4606,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_plugin_activate_db_1015474(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_plugin_activate_db_1015484(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -4641,23 +4641,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015474: 0x1015474: lw    v0, 0(a0)
+// 0x01015484: 0x1015484: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01015478: 0x1015478: addiu sp, sp, -32
+// 0x01015488: 0x1015488: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101547c: 0x101547c: bne   v0, zero, 0x10154a0 sw    ra, 28(sp)
+// 0x0101548c: 0x101548c: bne   v0, zero, 0x10154b0 sw    ra, 28(sp)
 	ldloc 6
-	brtrue L_10154a0
+	brtrue L_10154b0
 // --- basic block ---
-// 0x01015484: 0x1015484: lw    a0, 16(a0)
+// 0x01015494: 0x1015494: lw    a0, 16(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4666,81 +4666,81 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015488: 0x1015488: jal   0x1013c44 sll   zero, zero, 0
+// 0x01015498: 0x1015498: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01015490: 0x1015490: bne   v0, zero, 0x1015508 addiu v1, zero, -1
+// 0x010154a0: 0x10154a0: bne   v0, zero, 0x1015518 addiu v1, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1015508
+	brtrue L_1015518
 // --- basic block ---
-// 0x01015498: 0x1015498: j	 0x1015508 addu  v1, zero, zero
+// 0x010154a8: 0x10154a8: j	 0x1015518 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1015508
+	br L_1015518
 // --- basic block ---
-L_10154a0:
-// 0x010154a0: 0x10154a0: lui   v1, 0x30000
+L_10154b0:
+// 0x010154b0: 0x10154b0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010154a4: 0x10154a4: sll   a1, v0, 2
+// 0x010154b4: 0x10154b4: sll   a1, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x010154a8: 0x10154a8: addiu v1, v1, -28528
+// 0x010154b8: 0x10154b8: addiu v1, v1, -28064
 	ldloc 5
-	ldc.i4 -28528
+	ldc.i4 -28064
 	add
 	stloc 5
-// 0x010154ac: 0x10154ac: addu  v1, a1, v1
+// 0x010154bc: 0x10154bc: addu  v1, a1, v1
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x010154b0: 0x10154b0: lw    v1, 0(v1)
+// 0x010154c0: 0x10154c0: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010154b4: 0x10154b4: sll   zero, zero, 0
-// 0x010154b8: 0x10154b8: bne   v1, zero, 0x10154e4 lui   a1, 0x0
+// 0x010154c4: 0x10154c4: sll   zero, zero, 0
+// 0x010154c8: 0x10154c8: bne   v1, zero, 0x10154f4 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_10154e4
+	brtrue L_10154f4
 // --- basic block ---
-// 0x010154c0: 0x10154c0: lui   a3, 0x0
+// 0x010154d0: 0x10154d0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010154c4: 0x10154c4: addiu a1, a1, 28140
+// 0x010154d4: 0x10154d4: addiu a1, a1, 28140
 	ldloc.2
 	ldc.i4 28140
 	add
 	stloc.2
-// 0x010154c8: 0x10154c8: addiu a3, a3, 28168
+// 0x010154d8: 0x10154d8: addiu a3, a3, 28168
 	ldloc 4
 	ldc.i4 28168
 	add
 	stloc 4
-// 0x010154cc: 0x10154cc: addiu a0, zero, 4
+// 0x010154dc: 0x10154dc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010154d0: 0x10154d0: addiu a2, zero, 102
+// 0x010154e0: 0x10154e0: addiu a2, zero, 102
 	ldc.i4.s 102
 	stloc.3
-// 0x010154d4: 0x10154d4: jal   0x100449c sw    v0, 16(sp)
+// 0x010154e4: 0x10154e4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4759,13 +4759,13 @@ L_10154a0:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010154dc: 0x10154dc: j	 0x1015508 addiu v1, zero, -1
+// 0x010154ec: 0x10154ec: j	 0x1015518 addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_1015508
+	br L_1015518
 // --- basic block ---
-L_10154e4:
-// 0x010154e4: 0x10154e4: lw    v0, 8(v1)
+L_10154f4:
+// 0x010154f4: 0x10154f4: lw    v0, 8(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4774,12 +4774,12 @@ L_10154e4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010154e8: 0x10154e8: sll   zero, zero, 0
-// 0x010154ec: 0x10154ec: beq   v0, zero, 0x1015504 sll   zero, zero, 0
+// 0x010154f8: 0x10154f8: sll   zero, zero, 0
+// 0x010154fc: 0x10154fc: beq   v0, zero, 0x1015514 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1015504
+	brfalse L_1015514
 // --- basic block ---
-// 0x010154f4: 0x10154f4: jalr  v0 sll   zero, zero, 0
+// 0x01015504: 0x1015504: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -4791,21 +4791,21 @@ L_10154e4:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010154fc: 0x10154fc: j	 0x1015508 addu  v1, v0, zero
+// 0x0101550c: 0x101550c: j	 0x1015518 addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-	br L_1015508
+	br L_1015518
 // --- basic block ---
-L_1015504:
-// 0x01015504: 0x1015504: addu  v1, zero, zero
+L_1015514:
+// 0x01015514: 0x1015514: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1015508:
-// 0x01015508: 0x1015508: lw    ra, 28(sp)
-// 0x0101550c: 0x101550c: addu  v0, v1, zero
+L_1015518:
+// 0x01015518: 0x1015518: lw    ra, 28(sp)
+// 0x0101551c: 0x101551c: addu  v0, v1, zero
 	ldloc 5
 	stloc 6
-// 0x01015510: 0x1015510: jr    ra addiu sp, sp, 32
+// 0x01015520: 0x1015520: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4817,7 +4817,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_hash_get_first_1015518(int32,int32)
+.method public static int32 roadmap_hash_get_first_1015528(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 hi,int32 ra,int32 lo)
@@ -4846,10 +4846,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015518: 0x1015518: addiu v0, zero, 397
+// 0x01015528: 0x1015528: addiu v0, zero, 397
 	ldc.i4 397
 	stloc.2
-// 0x0101551c: 0x101551c: div   a1, v0
+// 0x0101552c: 0x101552c: div   a1, v0
 	ldloc.1
 	ldloc.2
 	ldloc.1
@@ -4858,7 +4858,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	rem
 	stloc 4
-// 0x01015520: 0x1015520: lw    v0, 1620(a0)
+// 0x01015530: 0x1015530: lw    v0, 1620(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4867,13 +4867,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01015524: 0x1015524: sll   zero, zero, 0
-// 0x01015528: 0x1015528: addiu v0, v0, 1
+// 0x01015534: 0x1015534: sll   zero, zero, 0
+// 0x01015538: 0x1015538: addiu v0, v0, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0101552c: 0x101552c: sw    v0, 1620(a0)
+// 0x0101553c: 0x101553c: sw    v0, 1620(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4882,40 +4882,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01015530: 0x1015530: mfhi  hi
+// 0x01015540: 0x1015540: mfhi  hi
 	ldloc 4
 	stloc.1
-// 0x01015534: 0x1015534: sra   v0, a1, 31
+// 0x01015544: 0x1015544: sra   v0, a1, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc.2
-// 0x01015538: 0x1015538: xor   a1, v0, a1
+// 0x01015548: 0x1015548: xor   a1, v0, a1
 	ldloc.2
 	ldloc.1
 	xor
 	stloc.1
-// 0x0101553c: 0x101553c: subu  v0, a1, v0
+// 0x0101554c: 0x101554c: subu  v0, a1, v0
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.2
-// 0x01015540: 0x1015540: addiu v0, v0, 2
+// 0x01015550: 0x1015550: addiu v0, v0, 2
 	ldloc.2
 	ldc.i4.2
 	add
 	stloc.2
-// 0x01015544: 0x1015544: sll   v0, v0, 2
+// 0x01015554: 0x1015554: sll   v0, v0, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01015548: 0x1015548: addu  a0, a0, v0
+// 0x01015558: 0x1015558: addu  a0, a0, v0
 	ldloc.0
 	ldloc.2
 	add
 	stloc.0
-// 0x0101554c: 0x101554c: lw    v0, 4(a0)
+// 0x0101555c: 0x101555c: lw    v0, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4924,13 +4924,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01015550: 0x1015550: jr    ra sll   zero, zero, 0
+// 0x01015560: 0x1015560: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_hash_string_10155ac(int32,int32)
+.method public static int32 roadmap_hash_string_10155bc(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v1,int32 v0,int32 lo,int32 ra,int32[] mem)
@@ -4959,48 +4959,48 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010155ac: 0x10155ac: addiu v1, zero, 1
+// 0x010155bc: 0x10155bc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010155b0: 0x10155b0: addu  v0, zero, zero
+// 0x010155c0: 0x10155c0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_10155b4:
-// 0x010155b4: 0x10155b4: lb    a1, 0(a0)
+L_10155c4:
+// 0x010155c4: 0x10155c4: lb    a1, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010155b8: 0x10155b8: sll   zero, zero, 0
-// 0x010155bc: 0x10155bc: beq   a1, zero, 0x10155d8 addiu a0, a0, 1
+// 0x010155c8: 0x10155c8: sll   zero, zero, 0
+// 0x010155cc: 0x10155cc: beq   a1, zero, 0x10155e8 addiu a0, a0, 1
 	ldloc.1
 	ldloc.0
 	ldc.i4.1
 	add
 	stloc.0
-	brfalse L_10155d8
+	brfalse L_10155e8
 // --- basic block ---
-// 0x010155c4: 0x10155c4: mult  v1, a1
+// 0x010155d4: 0x10155d4: mult  v1, a1
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 4
-// 0x010155c8: 0x10155c8: addiu v1, v1, 1
+// 0x010155d8: 0x10155d8: addiu v1, v1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x010155cc: 0x10155cc: mflo  lo
+// 0x010155dc: 0x10155dc: mflo  lo
 	ldloc 4
 	stloc.1
-// 0x010155d0: 0x10155d0: j	 0x10155b4 addu  v0, v0, a1
+// 0x010155e0: 0x10155e0: j	 0x10155c4 addu  v0, v0, a1
 	ldloc.3
 	ldloc.1
 	add
 	stloc.3
-	br L_10155b4
+	br L_10155c4
 // --- basic block ---
-L_10155d8:
-// 0x010155d8: 0x10155d8: jr    ra sll   zero, zero, 0
+L_10155e8:
+// 0x010155e8: 0x10155e8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -5008,7 +5008,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -5049,12 +5049,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010155e0: 0x10155e0: addiu sp, sp, -40
+// 0x010155f0: 0x10155f0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010155e4: 0x10155e4: sw    s1, 32(sp)
+// 0x010155f4: 0x10155f4: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5063,7 +5063,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010155e8: 0x10155e8: sw    s0, 28(sp)
+// 0x010155f8: 0x10155f8: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5072,18 +5072,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010155ec: 0x10155ec: sw    ra, 36(sp)
-// 0x010155f0: 0x10155f0: addu  s0, a1, zero
+// 0x010155fc: 0x10155fc: sw    ra, 36(sp)
+// 0x01015600: 0x1015600: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010155f4: 0x10155f4: bltz  a1, 0x1015610 addu  s1, a0, zero
+// 0x01015604: 0x1015604: bltz  a1, 0x1015620 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 9
 	ldc.i4.s 0
-	blt L_1015610
+	blt L_1015620
 // --- basic block ---
-// 0x010155fc: 0x10155fc: lw    v0, 1600(a0)
+// 0x0101560c: 0x101560c: lw    v0, 1600(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5092,47 +5092,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015600: 0x1015600: sll   zero, zero, 0
-// 0x01015604: 0x1015604: slt   v0, v0, a1
+// 0x01015610: 0x1015610: sll   zero, zero, 0
+// 0x01015614: 0x1015614: slt   v0, v0, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc 6
-// 0x01015608: 0x1015608: beq   v0, zero, 0x1015638 sll   zero, zero, 0
+// 0x01015618: 0x1015618: beq   v0, zero, 0x1015648 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1015638
+	brfalse L_1015648
 // --- basic block ---
-L_1015610:
-// 0x01015610: 0x1015610: lw    v0, 0(s1)
+L_1015620:
+// 0x01015620: 0x1015620: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01015614: 0x1015614: lui   a1, 0x0
+// 0x01015624: 0x1015624: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015618: 0x1015618: lui   a3, 0x0
+// 0x01015628: 0x1015628: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101561c: 0x101561c: addiu a1, a1, 28196
+// 0x0101562c: 0x101562c: addiu a1, a1, 28196
 	ldloc.2
 	ldc.i4 28196
 	add
 	stloc.2
-// 0x01015620: 0x1015620: addiu a3, a3, 28224
+// 0x01015630: 0x1015630: addiu a3, a3, 28224
 	ldloc 4
 	ldc.i4 28224
 	add
 	stloc 4
-// 0x01015624: 0x1015624: addiu a0, zero, 5
+// 0x01015634: 0x1015634: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01015628: 0x1015628: addiu a2, zero, 233
+// 0x01015638: 0x1015638: addiu a2, zero, 233
 	ldc.i4 233
 	stloc.3
-// 0x0101562c: 0x101562c: sw    v0, 20(sp)
+// 0x0101563c: 0x101563c: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5141,7 +5141,7 @@ L_1015610:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015630: 0x1015630: jal   0x100449c sw    s0, 16(sp)
+// 0x01015640: 0x1015640: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5160,8 +5160,8 @@ L_1015610:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1015638:
-// 0x01015638: 0x1015638: lw    v1, 1608(s1)
+L_1015648:
+// 0x01015648: 0x1015648: lw    v1, 1608(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5170,33 +5170,33 @@ L_1015638:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101563c: 0x101563c: sll   zero, zero, 0
-// 0x01015640: 0x1015640: beq   v1, zero, 0x1015654 addu  v0, zero, zero
+// 0x0101564c: 0x101564c: sll   zero, zero, 0
+// 0x01015650: 0x1015650: beq   v1, zero, 0x1015664 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1015654
+	brfalse L_1015664
 // --- basic block ---
-// 0x01015648: 0x1015648: sll   s0, s0, 2
+// 0x01015658: 0x1015658: sll   s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0101564c: 0x101564c: addu  v1, v1, s0
+// 0x0101565c: 0x101565c: addu  v1, v1, s0
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x01015650: 0x1015650: lw    v0, 0(v1)
+// 0x01015660: 0x1015660: lw    v0, 0(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-L_1015654:
-// 0x01015654: 0x1015654: lw    ra, 36(sp)
-// 0x01015658: 0x1015658: lw    s1, 32(sp)
+L_1015664:
+// 0x01015664: 0x1015664: lw    ra, 36(sp)
+// 0x01015668: 0x1015668: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5205,7 +5205,7 @@ L_1015654:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101565c: 0x101565c: lw    s0, 28(sp)
+// 0x0101566c: 0x101566c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5214,7 +5214,7 @@ L_1015654:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01015660: 0x1015660: jr    ra addiu sp, sp, 40
+// 0x01015670: 0x1015670: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5226,7 +5226,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_hash_remove_1015668(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_remove_1015678(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra,int32 hi,int32 lo)
@@ -5276,12 +5276,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015668: 0x1015668: addiu sp, sp, -40
+// 0x01015678: 0x1015678: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101566c: 0x101566c: sw    s2, 32(sp)
+// 0x0101567c: 0x101567c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5290,7 +5290,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015670: 0x1015670: sw    s1, 28(sp)
+// 0x01015680: 0x1015680: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5299,7 +5299,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01015674: 0x1015674: sw    s0, 24(sp)
+// 0x01015684: 0x1015684: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5308,21 +5308,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01015678: 0x1015678: sw    ra, 36(sp)
-// 0x0101567c: 0x101567c: addu  s0, a2, zero
+// 0x01015688: 0x1015688: sw    ra, 36(sp)
+// 0x0101568c: 0x101568c: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01015680: 0x1015680: addu  s1, a0, zero
+// 0x01015690: 0x1015690: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01015684: 0x1015684: bltz  a2, 0x10156a0 addu  s2, a1, zero
+// 0x01015694: 0x1015694: bltz  a2, 0x10156b0 addu  s2, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 9
 	ldc.i4.s 0
-	blt L_10156a0
+	blt L_10156b0
 // --- basic block ---
-// 0x0101568c: 0x101568c: lw    v0, 1600(a0)
+// 0x0101569c: 0x101569c: lw    v0, 1600(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5331,49 +5331,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015690: 0x1015690: sll   zero, zero, 0
-// 0x01015694: 0x1015694: slt   v0, v0, a2
+// 0x010156a0: 0x10156a0: sll   zero, zero, 0
+// 0x010156a4: 0x10156a4: slt   v0, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 5
-// 0x01015698: 0x1015698: beq   v0, zero, 0x10156cc addiu v0, zero, 397
+// 0x010156a8: 0x10156a8: beq   v0, zero, 0x10156dc addiu v0, zero, 397
 	ldloc 5
 	ldc.i4 397
 	stloc 5
-	brfalse L_10156cc
+	brfalse L_10156dc
 // --- basic block ---
-L_10156a0:
-// 0x010156a0: 0x10156a0: lw    v0, 0(s1)
+L_10156b0:
+// 0x010156b0: 0x10156b0: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010156a4: 0x10156a4: lui   a1, 0x0
+// 0x010156b4: 0x10156b4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010156a8: 0x10156a8: lui   a3, 0x0
+// 0x010156b8: 0x10156b8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010156ac: 0x10156ac: addiu a1, a1, 28196
+// 0x010156bc: 0x10156bc: addiu a1, a1, 28196
 	ldloc.2
 	ldc.i4 28196
 	add
 	stloc.2
-// 0x010156b0: 0x10156b0: addiu a3, a3, 28224
+// 0x010156c0: 0x10156c0: addiu a3, a3, 28224
 	ldloc 4
 	ldc.i4 28224
 	add
 	stloc 4
-// 0x010156b4: 0x10156b4: addiu a0, zero, 5
+// 0x010156c4: 0x10156c4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010156b8: 0x10156b8: addiu a2, zero, 134
+// 0x010156c8: 0x10156c8: addiu a2, zero, 134
 	ldc.i4 134
 	stloc.3
-// 0x010156bc: 0x10156bc: sw    v0, 20(sp)
+// 0x010156cc: 0x10156cc: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5382,7 +5382,7 @@ L_10156a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010156c0: 0x10156c0: jal   0x100449c sw    s0, 16(sp)
+// 0x010156d0: 0x10156d0: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5401,11 +5401,11 @@ L_10156a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010156c8: 0x10156c8: addiu v0, zero, 397
+// 0x010156d8: 0x10156d8: addiu v0, zero, 397
 	ldc.i4 397
 	stloc 5
-L_10156cc:
-// 0x010156cc: 0x10156cc: div   s2, v0
+L_10156dc:
+// 0x010156dc: 0x10156dc: div   s2, v0
 	ldloc 9
 	ldloc 5
 	ldloc 9
@@ -5414,48 +5414,48 @@ L_10156cc:
 	stloc 13
 	rem
 	stloc 12
-// 0x010156d0: 0x10156d0: mfhi  hi
+// 0x010156e0: 0x10156e0: mfhi  hi
 	ldloc 12
 	stloc 9
-// 0x010156d4: 0x10156d4: sra   v0, s2, 31
+// 0x010156e4: 0x10156e4: sra   v0, s2, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x010156d8: 0x10156d8: xor   v1, v0, s2
+// 0x010156e8: 0x10156e8: xor   v1, v0, s2
 	ldloc 5
 	ldloc 9
 	xor
 	stloc 7
-// 0x010156dc: 0x10156dc: subu  v1, v1, v0
+// 0x010156ec: 0x10156ec: subu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 7
-// 0x010156e0: 0x10156e0: addiu v1, v1, 2
+// 0x010156f0: 0x10156f0: addiu v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x010156e4: 0x10156e4: sll   v1, v1, 2
+// 0x010156f4: 0x10156f4: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010156e8: 0x10156e8: addu  v1, s1, v1
+// 0x010156f8: 0x10156f8: addu  v1, s1, v1
 	ldloc 10
 	ldloc 7
 	add
 	stloc 7
-// 0x010156ec: 0x10156ec: j	 0x1015718 addiu v1, v1, 4
+// 0x010156fc: 0x10156fc: j	 0x1015728 addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	br L_1015718
+	br L_1015728
 // --- basic block ---
-L_10156f4:
-// 0x010156f4: 0x10156f4: lw    a0, 1604(s1)
+L_1015704:
+// 0x01015704: 0x1015704: lw    a0, 1604(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5464,69 +5464,69 @@ L_10156f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010156f8: 0x10156f8: bne   v0, s0, 0x1015714 addiu v0, zero, 1
+// 0x01015708: 0x1015708: bne   v0, s0, 0x1015724 addiu v0, zero, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	stloc 5
-	bne.un L_1015714
+	bne.un L_1015724
 // --- basic block ---
-// 0x01015700: 0x1015700: sll   s0, s0, 2
+// 0x01015710: 0x1015710: sll   s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x01015704: 0x1015704: addu  a0, a0, s0
+// 0x01015714: 0x1015714: addu  a0, a0, s0
 	ldloc.1
 	ldloc 8
 	add
 	stloc.1
-// 0x01015708: 0x1015708: lw    a0, 0(a0)
+// 0x01015718: 0x1015718: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101570c: 0x101570c: j	 0x101572c sw    a0, 0(v1)
+// 0x0101571c: 0x101571c: j	 0x101573c sw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-	br L_101572c
+	br L_101573c
 // --- basic block ---
-L_1015714:
-// 0x01015714: 0x1015714: addu  v1, a0, a1
+L_1015724:
+// 0x01015724: 0x1015724: addu  v1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc 7
-L_1015718:
-// 0x01015718: 0x1015718: lw    v0, 0(v1)
+L_1015728:
+// 0x01015728: 0x1015728: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101571c: 0x101571c: sll   zero, zero, 0
-// 0x01015720: 0x1015720: bgez  v0, 0x10156f4 sll   a1, v0, 2
+// 0x0101572c: 0x101572c: sll   zero, zero, 0
+// 0x01015730: 0x1015730: bgez  v0, 0x1015704 sll   a1, v0, 2
 	ldloc 5
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.2
 	ldc.i4.s 0
-	bge L_10156f4
+	bge L_1015704
 // --- basic block ---
-// 0x01015728: 0x1015728: addu  v0, zero, zero
+// 0x01015738: 0x1015738: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_101572c:
-// 0x0101572c: 0x101572c: lw    ra, 36(sp)
-// 0x01015730: 0x1015730: lw    s2, 32(sp)
+L_101573c:
+// 0x0101573c: 0x101573c: lw    ra, 36(sp)
+// 0x01015740: 0x1015740: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5535,7 +5535,7 @@ L_101572c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01015734: 0x1015734: lw    s1, 28(sp)
+// 0x01015744: 0x1015744: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5544,7 +5544,7 @@ L_101572c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01015738: 0x1015738: lw    s0, 24(sp)
+// 0x01015748: 0x1015748: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5553,7 +5553,7 @@ L_101572c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101573c: 0x101573c: jr    ra addiu sp, sp, 40
+// 0x0101574c: 0x101574c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5565,7 +5565,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -5606,12 +5606,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015744: 0x1015744: addiu sp, sp, -40
+// 0x01015754: 0x1015754: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01015748: 0x1015748: sw    s1, 32(sp)
+// 0x01015758: 0x1015758: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5620,7 +5620,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101574c: 0x101574c: sw    s0, 28(sp)
+// 0x0101575c: 0x101575c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5629,18 +5629,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01015750: 0x1015750: sw    ra, 36(sp)
-// 0x01015754: 0x1015754: addu  s1, a1, zero
+// 0x01015760: 0x1015760: sw    ra, 36(sp)
+// 0x01015764: 0x1015764: addu  s1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01015758: 0x1015758: bltz  a1, 0x1015774 addu  s0, a0, zero
+// 0x01015768: 0x1015768: bltz  a1, 0x1015784 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 8
 	ldc.i4.s 0
-	blt L_1015774
+	blt L_1015784
 // --- basic block ---
-// 0x01015760: 0x1015760: lw    v0, 1600(a0)
+// 0x01015770: 0x1015770: lw    v0, 1600(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5649,47 +5649,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015764: 0x1015764: sll   zero, zero, 0
-// 0x01015768: 0x1015768: slt   v0, a1, v0
+// 0x01015774: 0x1015774: sll   zero, zero, 0
+// 0x01015778: 0x1015778: slt   v0, a1, v0
 	ldloc.2
 	ldloc 6
 	clt
 	stloc 6
-// 0x0101576c: 0x101576c: bne   v0, zero, 0x101579c sll   zero, zero, 0
+// 0x0101577c: 0x101577c: bne   v0, zero, 0x10157ac sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101579c
+	brtrue L_10157ac
 // --- basic block ---
-L_1015774:
-// 0x01015774: 0x1015774: lw    v0, 0(s0)
+L_1015784:
+// 0x01015784: 0x1015784: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01015778: 0x1015778: lui   a1, 0x0
+// 0x01015788: 0x1015788: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101577c: 0x101577c: lui   a3, 0x0
+// 0x0101578c: 0x101578c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01015780: 0x1015780: addiu a1, a1, 28196
+// 0x01015790: 0x1015790: addiu a1, a1, 28196
 	ldloc.2
 	ldc.i4 28196
 	add
 	stloc.2
-// 0x01015784: 0x1015784: addiu a3, a3, 28224
+// 0x01015794: 0x1015794: addiu a3, a3, 28224
 	ldloc 4
 	ldc.i4 28224
 	add
 	stloc 4
-// 0x01015788: 0x1015788: addiu a0, zero, 5
+// 0x01015798: 0x1015798: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0101578c: 0x101578c: addiu a2, zero, 118
+// 0x0101579c: 0x101579c: addiu a2, zero, 118
 	ldc.i4.s 118
 	stloc.3
-// 0x01015790: 0x1015790: sw    v0, 20(sp)
+// 0x010157a0: 0x10157a0: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5698,7 +5698,7 @@ L_1015774:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015794: 0x1015794: jal   0x100449c sw    s1, 16(sp)
+// 0x010157a4: 0x10157a4: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5717,8 +5717,8 @@ L_1015774:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_101579c:
-// 0x0101579c: 0x101579c: lw    v1, 1624(s0)
+L_10157ac:
+// 0x010157ac: 0x10157ac: lw    v1, 1624(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5727,7 +5727,7 @@ L_101579c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010157a0: 0x10157a0: lw    v0, 1604(s0)
+// 0x010157b0: 0x10157b0: lw    v0, 1604(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5736,18 +5736,18 @@ L_101579c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010157a4: 0x10157a4: addiu v1, v1, 1
+// 0x010157b4: 0x10157b4: addiu v1, v1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010157a8: 0x10157a8: sll   s1, s1, 2
+// 0x010157b8: 0x10157b8: sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010157ac: 0x10157ac: lw    ra, 36(sp)
-// 0x010157b0: 0x10157b0: sw    v1, 1624(s0)
+// 0x010157bc: 0x10157bc: lw    ra, 36(sp)
+// 0x010157c0: 0x10157c0: sw    v1, 1624(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5756,19 +5756,19 @@ L_101579c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010157b4: 0x10157b4: addu  s1, v0, s1
+// 0x010157c4: 0x10157c4: addu  s1, v0, s1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x010157b8: 0x10157b8: lw    v0, 0(s1)
+// 0x010157c8: 0x10157c8: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010157bc: 0x10157bc: lw    s1, 32(sp)
+// 0x010157cc: 0x10157cc: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5777,7 +5777,7 @@ L_101579c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010157c0: 0x10157c0: lw    s0, 28(sp)
+// 0x010157d0: 0x10157d0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5786,7 +5786,7 @@ L_101579c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010157c4: 0x10157c4: jr    ra addiu sp, sp, 40
+// 0x010157d4: 0x10157d4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5798,7 +5798,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s0,int32 s1,int32 v1,int32 ra,int32 hi,int32 lo)
@@ -5848,12 +5848,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010157cc: 0x10157cc: addiu sp, sp, -40
+// 0x010157dc: 0x10157dc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010157d0: 0x10157d0: sw    s2, 32(sp)
+// 0x010157e0: 0x10157e0: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5862,10 +5862,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010157d4: 0x10157d4: addiu s2, zero, 397
+// 0x010157e4: 0x10157e4: addiu s2, zero, 397
 	ldc.i4 397
 	stloc 7
-// 0x010157d8: 0x10157d8: div   a1, s2
+// 0x010157e8: 0x10157e8: div   a1, s2
 	ldloc.2
 	ldloc 7
 	ldloc.2
@@ -5874,7 +5874,7 @@ __CIBYL_javamethod_begin:
 	stloc 13
 	rem
 	stloc 12
-// 0x010157dc: 0x10157dc: sw    s1, 28(sp)
+// 0x010157ec: 0x10157ec: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5883,7 +5883,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010157e0: 0x10157e0: sw    s0, 24(sp)
+// 0x010157f0: 0x10157f0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5892,36 +5892,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010157e4: 0x10157e4: sw    ra, 36(sp)
-// 0x010157e8: 0x10157e8: addu  s1, a2, zero
+// 0x010157f4: 0x10157f4: sw    ra, 36(sp)
+// 0x010157f8: 0x10157f8: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010157ec: 0x10157ec: addu  s0, a0, zero
+// 0x010157fc: 0x10157fc: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010157f0: 0x10157f0: mfhi  hi
+// 0x01015800: 0x1015800: mfhi  hi
 	ldloc 12
 	stloc 7
-// 0x010157f4: 0x10157f4: sra   v0, s2, 31
+// 0x01015804: 0x1015804: sra   v0, s2, 31
 	ldloc 7
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x010157f8: 0x10157f8: xor   s2, v0, s2
+// 0x01015808: 0x1015808: xor   s2, v0, s2
 	ldloc 5
 	ldloc 7
 	xor
 	stloc 7
-// 0x010157fc: 0x10157fc: bltz  a2, 0x1015818 subu  s2, s2, v0
+// 0x0101580c: 0x101580c: bltz  a2, 0x1015828 subu  s2, s2, v0
 	ldloc.3
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 7
 	ldc.i4.s 0
-	blt L_1015818
+	blt L_1015828
 // --- basic block ---
-// 0x01015804: 0x1015804: lw    v0, 1600(a0)
+// 0x01015814: 0x1015814: lw    v0, 1600(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5930,51 +5930,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015808: 0x1015808: sll   zero, zero, 0
-// 0x0101580c: 0x101580c: slt   v0, v0, a2
+// 0x01015818: 0x1015818: sll   zero, zero, 0
+// 0x0101581c: 0x101581c: slt   v0, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 5
-// 0x01015810: 0x1015810: beq   v0, zero, 0x1015844 addiu v0, s2, 2
+// 0x01015820: 0x1015820: beq   v0, zero, 0x1015854 addiu v0, s2, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 5
-	brfalse L_1015844
+	brfalse L_1015854
 // --- basic block ---
-L_1015818:
-// 0x01015818: 0x1015818: lw    v0, 0(s0)
+L_1015828:
+// 0x01015828: 0x1015828: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101581c: 0x101581c: lui   a1, 0x0
+// 0x0101582c: 0x101582c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015820: 0x1015820: lui   a3, 0x0
+// 0x01015830: 0x1015830: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01015824: 0x1015824: addiu a1, a1, 28196
+// 0x01015834: 0x1015834: addiu a1, a1, 28196
 	ldloc.2
 	ldc.i4 28196
 	add
 	stloc.2
-// 0x01015828: 0x1015828: addiu a3, a3, 28224
+// 0x01015838: 0x1015838: addiu a3, a3, 28224
 	ldloc 4
 	ldc.i4 28224
 	add
 	stloc 4
-// 0x0101582c: 0x101582c: addiu a0, zero, 5
+// 0x0101583c: 0x101583c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01015830: 0x1015830: addiu a2, zero, 90
+// 0x01015840: 0x1015840: addiu a2, zero, 90
 	ldc.i4.s 90
 	stloc.3
-// 0x01015834: 0x1015834: sw    v0, 20(sp)
+// 0x01015844: 0x1015844: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5983,7 +5983,7 @@ L_1015818:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01015838: 0x1015838: jal   0x100449c sw    s1, 16(sp)
+// 0x01015848: 0x1015848: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6002,23 +6002,23 @@ L_1015818:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01015840: 0x1015840: addiu v0, s2, 2
+// 0x01015850: 0x1015850: addiu v0, s2, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 5
-L_1015844:
-// 0x01015844: 0x1015844: sll   v0, v0, 2
+L_1015854:
+// 0x01015854: 0x1015854: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01015848: 0x1015848: addu  v0, s0, v0
+// 0x01015858: 0x1015858: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x0101584c: 0x101584c: lw    v0, 4(v0)
+// 0x0101585c: 0x101585c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6027,13 +6027,13 @@ L_1015844:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015850: 0x1015850: sll   zero, zero, 0
-// 0x01015854: 0x1015854: bgez  v0, 0x1015870 sll   zero, zero, 0
+// 0x01015860: 0x1015860: sll   zero, zero, 0
+// 0x01015864: 0x1015864: bgez  v0, 0x1015880 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1015870
+	bge L_1015880
 // --- basic block ---
-// 0x0101585c: 0x101585c: lw    v0, 1612(s0)
+// 0x0101586c: 0x101586c: lw    v0, 1612(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6042,13 +6042,13 @@ L_1015844:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015860: 0x1015860: sll   zero, zero, 0
-// 0x01015864: 0x1015864: addiu v0, v0, 1
+// 0x01015870: 0x1015870: sll   zero, zero, 0
+// 0x01015874: 0x1015874: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01015868: 0x1015868: j	 0x1015880 sw    v0, 1612(s0)
+// 0x01015878: 0x1015878: j	 0x1015890 sw    v0, 1612(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6057,10 +6057,10 @@ L_1015844:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1015880
+	br L_1015890
 // --- basic block ---
-L_1015870:
-// 0x01015870: 0x1015870: lw    v0, 1616(s0)
+L_1015880:
+// 0x01015880: 0x1015880: lw    v0, 1616(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6069,13 +6069,13 @@ L_1015870:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015874: 0x1015874: sll   zero, zero, 0
-// 0x01015878: 0x1015878: addiu v0, v0, 1
+// 0x01015884: 0x1015884: sll   zero, zero, 0
+// 0x01015888: 0x1015888: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0101587c: 0x101587c: sw    v0, 1616(s0)
+// 0x0101588c: 0x101588c: sw    v0, 1616(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6084,23 +6084,23 @@ L_1015870:
 	add
 	ldloc 5
 	stelem.i4
-L_1015880:
-// 0x01015880: 0x1015880: addiu s2, s2, 2
+L_1015890:
+// 0x01015890: 0x1015890: addiu s2, s2, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x01015884: 0x1015884: sll   s2, s2, 2
+// 0x01015894: 0x1015894: sll   s2, s2, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01015888: 0x1015888: addu  s2, s0, s2
+// 0x01015898: 0x1015898: addu  s2, s0, s2
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x0101588c: 0x101588c: lw    a0, 1604(s0)
+// 0x0101589c: 0x101589c: lw    a0, 1604(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6109,7 +6109,7 @@ L_1015880:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015890: 0x1015890: lw    v1, 4(s2)
+// 0x010158a0: 0x10158a0: lw    v1, 4(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6118,25 +6118,25 @@ L_1015880:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01015894: 0x1015894: sll   v0, s1, 2
+// 0x010158a4: 0x10158a4: sll   v0, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01015898: 0x1015898: lw    ra, 36(sp)
-// 0x0101589c: 0x101589c: addu  v0, a0, v0
+// 0x010158a8: 0x10158a8: lw    ra, 36(sp)
+// 0x010158ac: 0x10158ac: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x010158a0: 0x10158a0: sw    v1, 0(v0)
+// 0x010158b0: 0x10158b0: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010158a4: 0x10158a4: lw    s0, 24(sp)
+// 0x010158b4: 0x10158b4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6145,7 +6145,7 @@ L_1015880:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010158a8: 0x10158a8: sw    s1, 4(s2)
+// 0x010158b8: 0x10158b8: sw    s1, 4(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6154,7 +6154,7 @@ L_1015880:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010158ac: 0x10158ac: lw    s2, 32(sp)
+// 0x010158bc: 0x10158bc: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6163,7 +6163,7 @@ L_1015880:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010158b0: 0x10158b0: lw    s1, 28(sp)
+// 0x010158c0: 0x10158c0: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6172,7 +6172,7 @@ L_1015880:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010158b4: 0x10158b4: jr    ra addiu sp, sp, 40
+// 0x010158c4: 0x10158c4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6184,7 +6184,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_hash_new_10158bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_new_10158cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -6228,12 +6228,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010158bc: 0x10158bc: addiu sp, sp, -32
+// 0x010158cc: 0x10158cc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010158c0: 0x10158c0: sw    s2, 24(sp)
+// 0x010158d0: 0x10158d0: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6242,14 +6242,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010158c4: 0x10158c4: addu  s2, a0, zero
+// 0x010158d4: 0x10158d4: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010158c8: 0x10158c8: addiu a0, zero, 1628
+// 0x010158d8: 0x10158d8: addiu a0, zero, 1628
 	ldc.i4 1628
 	stloc.1
-// 0x010158cc: 0x10158cc: sw    ra, 28(sp)
-// 0x010158d0: 0x10158d0: sw    s1, 20(sp)
+// 0x010158dc: 0x10158dc: sw    ra, 28(sp)
+// 0x010158e0: 0x10158e0: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6258,7 +6258,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010158d4: 0x10158d4: sw    s0, 16(sp)
+// 0x010158e4: 0x10158e4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6267,7 +6267,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010158d8: 0x10158d8: jal   0x1000910 addu  s1, a1, zero
+// 0x010158e8: 0x10158e8: jal   0x1000910 addu  s1, a1, zero
 	ldloc.2
 	stloc 9
 	ldloc.0
@@ -6280,21 +6280,21 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010158e0: 0x10158e0: lui   a0, 0x0
+// 0x010158f0: 0x10158f0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010158e4: 0x10158e4: addu  s0, v0, zero
+// 0x010158f4: 0x10158f4: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010158e8: 0x10158e8: addiu a0, a0, 28196
+// 0x010158f8: 0x10158f8: addiu a0, a0, 28196
 	ldloc.1
 	ldc.i4 28196
 	add
 	stloc.1
-// 0x010158ec: 0x10158ec: addu  a2, v0, zero
+// 0x010158fc: 0x10158fc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010158f0: 0x10158f0: jal   0x1004a38 addiu a1, zero, 56
+// 0x01015900: 0x1015900: jal   0x1004a48 addiu a1, zero, 56
 	ldc.i4.s 56
 	stloc.2
 	ldloc.0
@@ -6302,39 +6302,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010158f8: 0x10158f8: sw    s2, 0(s0)
+// 0x01015908: 0x1015908: sw    s2, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010158fc: 0x10158fc: addu  v0, zero, zero
+// 0x0101590c: 0x101590c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01015900: 0x1015900: addiu a0, zero, -1
+// 0x01015910: 0x1015910: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01015904: 0x1015904: addiu v1, zero, 1588
+// 0x01015914: 0x1015914: addiu v1, zero, 1588
 	ldc.i4 1588
 	stloc 8
-L_1015908:
-// 0x01015908: 0x1015908: addu  a1, s0, v0
+L_1015918:
+// 0x01015918: 0x1015918: addu  a1, s0, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc.2
-// 0x0101590c: 0x101590c: addiu v0, v0, 4
+// 0x0101591c: 0x101591c: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01015910: 0x1015910: bne   v0, v1, 0x1015908 sw    a0, 12(a1)
+// 0x01015920: 0x1015920: bne   v0, v1, 0x1015918 sw    a0, 12(a1)
 	ldloc 5
 	ldloc 8
 	ldloc 6
@@ -6345,14 +6345,14 @@ L_1015908:
 	add
 	ldloc.1
 	stelem.i4
-	bne.un L_1015908
+	bne.un L_1015918
 // --- basic block ---
-// 0x01015918: 0x1015918: sll   a0, s1, 2
+// 0x01015928: 0x1015928: sll   a0, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0101591c: 0x101591c: jal   0x1000910 sw    s1, 1600(s0)
+// 0x0101592c: 0x101592c: jal   0x1000910 sw    s1, 1600(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6371,21 +6371,21 @@ L_1015908:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01015924: 0x1015924: lui   a0, 0x0
+// 0x01015934: 0x1015934: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01015928: 0x1015928: addu  a2, v0, zero
+// 0x01015938: 0x1015938: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101592c: 0x101592c: addiu a0, a0, 28196
+// 0x0101593c: 0x101593c: addiu a0, a0, 28196
 	ldloc.1
 	ldc.i4 28196
 	add
 	stloc.1
-// 0x01015930: 0x1015930: addiu a1, zero, 68
+// 0x01015940: 0x1015940: addiu a1, zero, 68
 	ldc.i4.s 68
 	stloc.2
-// 0x01015934: 0x1015934: sw    v0, 1604(s0)
+// 0x01015944: 0x1015944: sw    v0, 1604(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6394,7 +6394,7 @@ L_1015908:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01015938: 0x1015938: jal   0x1004a38 sw    zero, 1608(s0)
+// 0x01015948: 0x1015948: jal   0x1004a48 sw    zero, 1608(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6408,21 +6408,21 @@ L_1015908:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01015940: 0x1015940: addu  v0, zero, zero
+// 0x01015950: 0x1015950: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01015944: 0x1015944: j	 0x101595c addiu v1, zero, -1
+// 0x01015954: 0x1015954: j	 0x101596c addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 8
-	br L_101595c
+	br L_101596c
 // --- basic block ---
-L_101594c:
-// 0x0101594c: 0x101594c: lw    a0, 1604(s0)
+L_101595c:
+// 0x0101595c: 0x101595c: lw    a0, 1604(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6431,55 +6431,55 @@ L_101594c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015950: 0x1015950: addiu v0, v0, 1
+// 0x01015960: 0x1015960: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01015954: 0x1015954: addu  a1, a0, a1
+// 0x01015964: 0x1015964: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x01015958: 0x1015958: sw    v1, 0(a1)
+// 0x01015968: 0x1015968: sw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_101595c:
-// 0x0101595c: 0x101595c: slt   a0, v0, s1
+L_101596c:
+// 0x0101596c: 0x101596c: slt   a0, v0, s1
 	ldloc 5
 	ldloc 9
 	clt
 	stloc.1
-// 0x01015960: 0x1015960: bne   a0, zero, 0x101594c sll   a1, v0, 2
+// 0x01015970: 0x1015970: bne   a0, zero, 0x101595c sll   a1, v0, 2
 	ldloc.1
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.2
-	brtrue L_101594c
+	brtrue L_101595c
 // --- basic block ---
-// 0x01015968: 0x1015968: lui   v0, 0x30000
+// 0x01015978: 0x1015978: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101596c: 0x101596c: lw    v0, -28488(v0)
+// 0x0101597c: 0x101597c: lw    v0, -28024(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7122
+	ldc.i4 -7006
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015970: 0x1015970: sll   zero, zero, 0
-// 0x01015974: 0x1015974: beq   v0, zero, 0x1015980 sll   zero, zero, 0
+// 0x01015980: 0x1015980: sll   zero, zero, 0
+// 0x01015984: 0x1015984: beq   v0, zero, 0x1015990 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1015980
+	brfalse L_1015990
 // --- basic block ---
-// 0x0101597c: 0x101597c: sw    s0, 8(v0)
+// 0x0101598c: 0x101598c: sw    s0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6488,9 +6488,9 @@ L_101595c:
 	add
 	ldloc 7
 	stelem.i4
-L_1015980:
-// 0x01015980: 0x1015980: lw    ra, 28(sp)
-// 0x01015984: 0x1015984: sw    v0, 4(s0)
+L_1015990:
+// 0x01015990: 0x1015990: lw    ra, 28(sp)
+// 0x01015994: 0x1015994: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6499,19 +6499,19 @@ L_1015980:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01015988: 0x1015988: lui   v0, 0x30000
+// 0x01015998: 0x1015998: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101598c: 0x101598c: sw    s0, -28488(v0)
+// 0x0101599c: 0x101599c: sw    s0, -28024(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7122
+	ldc.i4 -7006
 	add
 	ldloc 7
 	stelem.i4
-// 0x01015990: 0x1015990: sw    zero, 8(s0)
+// 0x010159a0: 0x10159a0: sw    zero, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6520,10 +6520,10 @@ L_1015980:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01015994: 0x1015994: addu  v0, s0, zero
+// 0x010159a4: 0x10159a4: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x01015998: 0x1015998: lw    s2, 24(sp)
+// 0x010159a8: 0x10159a8: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6532,7 +6532,7 @@ L_1015980:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101599c: 0x101599c: lw    s1, 20(sp)
+// 0x010159ac: 0x10159ac: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6541,7 +6541,7 @@ L_1015980:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010159a0: 0x10159a0: lw    s0, 16(sp)
+// 0x010159b0: 0x10159b0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6550,7 +6550,7 @@ L_1015980:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010159a4: 0x10159a4: jr    ra addiu sp, sp, 32
+// 0x010159b4: 0x10159b4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6562,7 +6562,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_hash_set_value_10159ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_set_value_10159bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s3,int32 v1,int32 s2,int32 ra)
@@ -6609,12 +6609,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010159ac: 0x10159ac: addiu sp, sp, -56
+// 0x010159bc: 0x10159bc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010159b0: 0x10159b0: sw    s2, 44(sp)
+// 0x010159c0: 0x10159c0: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6623,7 +6623,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010159b4: 0x10159b4: sw    s1, 40(sp)
+// 0x010159c4: 0x10159c4: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6632,7 +6632,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010159b8: 0x10159b8: sw    s0, 36(sp)
+// 0x010159c8: 0x10159c8: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6641,8 +6641,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010159bc: 0x10159bc: sw    ra, 52(sp)
-// 0x010159c0: 0x10159c0: sw    s3, 48(sp)
+// 0x010159cc: 0x10159cc: sw    ra, 52(sp)
+// 0x010159d0: 0x10159d0: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6651,20 +6651,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010159c4: 0x10159c4: addu  s1, a1, zero
+// 0x010159d4: 0x10159d4: addu  s1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010159c8: 0x10159c8: addu  s0, a0, zero
+// 0x010159d8: 0x10159d8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010159cc: 0x10159cc: bltz  a1, 0x10159e8 addu  s2, a2, zero
+// 0x010159dc: 0x10159dc: bltz  a1, 0x10159f8 addu  s2, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 11
 	ldc.i4.s 0
-	blt L_10159e8
+	blt L_10159f8
 // --- basic block ---
-// 0x010159d4: 0x10159d4: lw    v0, 1600(a0)
+// 0x010159e4: 0x10159e4: lw    v0, 1600(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6673,47 +6673,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010159d8: 0x10159d8: sll   zero, zero, 0
-// 0x010159dc: 0x10159dc: slt   v0, v0, a1
+// 0x010159e8: 0x10159e8: sll   zero, zero, 0
+// 0x010159ec: 0x10159ec: slt   v0, v0, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc 6
-// 0x010159e0: 0x10159e0: beq   v0, zero, 0x1015a10 sll   zero, zero, 0
+// 0x010159f0: 0x10159f0: beq   v0, zero, 0x1015a20 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1015a10
+	brfalse L_1015a20
 // --- basic block ---
-L_10159e8:
-// 0x010159e8: 0x10159e8: lw    v0, 0(s0)
+L_10159f8:
+// 0x010159f8: 0x10159f8: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010159ec: 0x10159ec: lui   a1, 0x0
+// 0x010159fc: 0x10159fc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010159f0: 0x10159f0: lui   a3, 0x0
+// 0x01015a00: 0x1015a00: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010159f4: 0x10159f4: addiu a1, a1, 28196
+// 0x01015a04: 0x1015a04: addiu a1, a1, 28196
 	ldloc.2
 	ldc.i4 28196
 	add
 	stloc.2
-// 0x010159f8: 0x10159f8: addiu a3, a3, 28224
+// 0x01015a08: 0x1015a08: addiu a3, a3, 28224
 	ldloc 4
 	ldc.i4 28224
 	add
 	stloc 4
-// 0x010159fc: 0x10159fc: addiu a0, zero, 5
+// 0x01015a0c: 0x1015a0c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01015a00: 0x1015a00: addiu a2, zero, 217
+// 0x01015a10: 0x1015a10: addiu a2, zero, 217
 	ldc.i4 217
 	stloc.3
-// 0x01015a04: 0x1015a04: sw    v0, 20(sp)
+// 0x01015a14: 0x1015a14: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6722,7 +6722,7 @@ L_10159e8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015a08: 0x1015a08: jal   0x100449c sw    s1, 16(sp)
+// 0x01015a18: 0x1015a18: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6741,8 +6741,8 @@ L_10159e8:
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_1015a10:
-// 0x01015a10: 0x1015a10: lw    v0, 1608(s0)
+L_1015a20:
+// 0x01015a20: 0x1015a20: lw    v0, 1608(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6751,12 +6751,12 @@ L_1015a10:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015a14: 0x1015a14: sll   zero, zero, 0
-// 0x01015a18: 0x1015a18: bne   v0, zero, 0x1015a68 sll   zero, zero, 0
+// 0x01015a24: 0x1015a24: sll   zero, zero, 0
+// 0x01015a28: 0x1015a28: bne   v0, zero, 0x1015a78 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1015a68
+	brtrue L_1015a78
 // --- basic block ---
-// 0x01015a20: 0x1015a20: lw    a2, 1600(s0)
+// 0x01015a30: 0x1015a30: lw    a2, 1600(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6765,16 +6765,16 @@ L_1015a10:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01015a24: 0x1015a24: sll   zero, zero, 0
-// 0x01015a28: 0x1015a28: sll   a2, a2, 2
+// 0x01015a34: 0x1015a34: sll   zero, zero, 0
+// 0x01015a38: 0x1015a38: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01015a2c: 0x1015a2c: addu  a0, a2, zero
+// 0x01015a3c: 0x1015a3c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01015a30: 0x1015a30: jal   0x1000910 sw    a2, 24(sp)
+// 0x01015a40: 0x1015a40: jal   0x1000910 sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6793,7 +6793,7 @@ L_1015a10:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01015a38: 0x1015a38: lw    a2, 24(sp)
+// 0x01015a48: 0x1015a48: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6802,13 +6802,13 @@ L_1015a10:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01015a3c: 0x1015a3c: addu  a0, v0, zero
+// 0x01015a4c: 0x1015a4c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01015a40: 0x1015a40: addu  a1, zero, zero
+// 0x01015a50: 0x1015a50: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01015a44: 0x1015a44: jal   0x100177c addu  s3, v0, zero
+// 0x01015a54: 0x1015a54: jal   0x100177c addu  s3, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.1
@@ -6820,10 +6820,10 @@ L_1015a10:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01015a4c: 0x1015a4c: lui   a0, 0x0
+// 0x01015a5c: 0x1015a5c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01015a50: 0x1015a50: sw    s3, 1608(s0)
+// 0x01015a60: 0x1015a60: sw    s3, 1608(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6832,15 +6832,15 @@ L_1015a10:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015a54: 0x1015a54: addiu a0, a0, 28196
+// 0x01015a64: 0x1015a64: addiu a0, a0, 28196
 	ldloc.1
 	ldc.i4 28196
 	add
 	stloc.1
-// 0x01015a58: 0x1015a58: addu  a2, s3, zero
+// 0x01015a68: 0x1015a68: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x01015a5c: 0x1015a5c: jal   0x1004a38 addiu a1, zero, 223
+// 0x01015a6c: 0x1015a6c: jal   0x1004a48 addiu a1, zero, 223
 	ldc.i4 223
 	stloc.2
 	ldloc.0
@@ -6848,12 +6848,12 @@ L_1015a10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01015a64: 0x1015a64: lw    v0, 1608(s0)
+// 0x01015a74: 0x1015a74: lw    v0, 1608(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6862,26 +6862,26 @@ L_1015a10:
 	add
 	ldelem.i4
 	stloc 6
-L_1015a68:
-// 0x01015a68: 0x1015a68: sll   s1, s1, 2
+L_1015a78:
+// 0x01015a78: 0x1015a78: sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01015a6c: 0x1015a6c: lw    ra, 52(sp)
-// 0x01015a70: 0x1015a70: addu  s1, v0, s1
+// 0x01015a7c: 0x1015a7c: lw    ra, 52(sp)
+// 0x01015a80: 0x1015a80: addu  s1, v0, s1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x01015a74: 0x1015a74: sw    s2, 0(s1)
+// 0x01015a84: 0x1015a84: sw    s2, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x01015a78: 0x1015a78: lw    s3, 48(sp)
+// 0x01015a88: 0x1015a88: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6890,7 +6890,7 @@ L_1015a68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01015a7c: 0x1015a7c: lw    s2, 44(sp)
+// 0x01015a8c: 0x1015a8c: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6899,7 +6899,7 @@ L_1015a68:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01015a80: 0x1015a80: lw    s1, 40(sp)
+// 0x01015a90: 0x1015a90: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6908,7 +6908,7 @@ L_1015a68:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01015a84: 0x1015a84: lw    s0, 36(sp)
+// 0x01015a94: 0x1015a94: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6917,7 +6917,7 @@ L_1015a68:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01015a88: 0x1015a88: jr    ra addiu sp, sp, 56
+// 0x01015a98: 0x1015a98: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6929,7 +6929,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_hash_free_1015a90(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_free_1015aa0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -6967,24 +6967,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015a90: 0x1015a90: lui   v0, 0x30000
+// 0x01015aa0: 0x1015aa0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01015a94: 0x1015a94: addiu sp, sp, -24
+// 0x01015aa4: 0x1015aa4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01015a98: 0x1015a98: lw    v1, -28488(v0)
+// 0x01015aa8: 0x1015aa8: lw    v1, -28024(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7122
+	ldc.i4 -7006
 	add
 	ldelem.i4
 	stloc 8
-// 0x01015a9c: 0x1015a9c: sw    s0, 16(sp)
+// 0x01015aac: 0x1015aac: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6993,11 +6993,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01015aa0: 0x1015aa0: addu  s0, a0, zero
+// 0x01015ab0: 0x1015ab0: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01015aa4: 0x1015aa4: sw    ra, 20(sp)
-// 0x01015aa8: 0x1015aa8: lw    a0, 8(a0)
+// 0x01015ab4: 0x1015ab4: sw    ra, 20(sp)
+// 0x01015ab8: 0x1015ab8: lw    a0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7006,7 +7006,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015aac: 0x1015aac: lw    a1, 4(s0)
+// 0x01015abc: 0x1015abc: lw    a1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7015,26 +7015,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01015ab0: 0x1015ab0: bne   s0, v1, 0x1015abc sll   zero, zero, 0
+// 0x01015ac0: 0x1015ac0: bne   s0, v1, 0x1015acc sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1015abc
+	bne.un L_1015acc
 // --- basic block ---
-// 0x01015ab8: 0x1015ab8: sw    a1, -28488(v0)
+// 0x01015ac8: 0x1015ac8: sw    a1, -28024(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7122
+	ldc.i4 -7006
 	add
 	ldloc.2
 	stelem.i4
-L_1015abc:
-// 0x01015abc: 0x1015abc: beq   a0, zero, 0x1015ac8 sll   zero, zero, 0
+L_1015acc:
+// 0x01015acc: 0x1015acc: beq   a0, zero, 0x1015ad8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1015ac8
+	brfalse L_1015ad8
 // --- basic block ---
-// 0x01015ac4: 0x1015ac4: sw    a1, 4(a0)
+// 0x01015ad4: 0x1015ad4: sw    a1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7043,8 +7043,8 @@ L_1015abc:
 	add
 	ldloc.2
 	stelem.i4
-L_1015ac8:
-// 0x01015ac8: 0x1015ac8: lw    v0, 4(s0)
+L_1015ad8:
+// 0x01015ad8: 0x1015ad8: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7053,12 +7053,12 @@ L_1015ac8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015acc: 0x1015acc: sll   zero, zero, 0
-// 0x01015ad0: 0x1015ad0: beq   v0, zero, 0x1015adc sll   zero, zero, 0
+// 0x01015adc: 0x1015adc: sll   zero, zero, 0
+// 0x01015ae0: 0x1015ae0: beq   v0, zero, 0x1015aec sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1015adc
+	brfalse L_1015aec
 // --- basic block ---
-// 0x01015ad8: 0x1015ad8: sw    a0, 8(v0)
+// 0x01015ae8: 0x1015ae8: sw    a0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7067,8 +7067,8 @@ L_1015ac8:
 	add
 	ldloc.1
 	stelem.i4
-L_1015adc:
-// 0x01015adc: 0x1015adc: lw    a0, 1608(s0)
+L_1015aec:
+// 0x01015aec: 0x1015aec: lw    a0, 1608(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7077,12 +7077,12 @@ L_1015adc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015ae0: 0x1015ae0: sll   zero, zero, 0
-// 0x01015ae4: 0x1015ae4: beq   a0, zero, 0x1015af4 sll   zero, zero, 0
+// 0x01015af0: 0x1015af0: sll   zero, zero, 0
+// 0x01015af4: 0x1015af4: beq   a0, zero, 0x1015b04 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1015af4
+	brfalse L_1015b04
 // --- basic block ---
-// 0x01015aec: 0x1015aec: jal   0x1000930 sll   zero, zero, 0
+// 0x01015afc: 0x1015afc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7093,8 +7093,8 @@ L_1015adc:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1015af4:
-// 0x01015af4: 0x1015af4: lw    a0, 1604(s0)
+L_1015b04:
+// 0x01015b04: 0x1015b04: lw    a0, 1604(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7103,7 +7103,7 @@ L_1015af4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015af8: 0x1015af8: jal   0x1000930 sll   zero, zero, 0
+// 0x01015b08: 0x1015b08: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7114,7 +7114,7 @@ L_1015af4:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01015b00: 0x1015b00: jal   0x1000930 addu  a0, s0, zero
+// 0x01015b10: 0x1015b10: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -7127,8 +7127,8 @@ L_1015af4:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01015b08: 0x1015b08: lw    ra, 20(sp)
-// 0x01015b0c: 0x1015b0c: lw    s0, 16(sp)
+// 0x01015b18: 0x1015b18: lw    ra, 20(sp)
+// 0x01015b1c: 0x1015b1c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7137,7 +7137,7 @@ L_1015af4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01015b10: 0x1015b10: jr    ra addiu sp, sp, 24
+// 0x01015b20: 0x1015b20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7149,7 +7149,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_hash_resize_1015b18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_hash_resize_1015b28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -7196,12 +7196,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015b18: 0x1015b18: addiu sp, sp, -40
+// 0x01015b28: 0x1015b28: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01015b1c: 0x1015b1c: sw    s3, 32(sp)
+// 0x01015b2c: 0x1015b2c: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7210,7 +7210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01015b20: 0x1015b20: sw    s0, 20(sp)
+// 0x01015b30: 0x1015b30: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7219,15 +7219,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01015b24: 0x1015b24: sll   s3, a1, 2
+// 0x01015b34: 0x1015b34: sll   s3, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc 11
-// 0x01015b28: 0x1015b28: addu  s0, a0, zero
+// 0x01015b38: 0x1015b38: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01015b2c: 0x1015b2c: lw    a0, 1604(a0)
+// 0x01015b3c: 0x1015b3c: lw    a0, 1604(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -7236,7 +7236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015b30: 0x1015b30: sw    s1, 24(sp)
+// 0x01015b40: 0x1015b40: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7245,14 +7245,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015b34: 0x1015b34: addu  s1, a1, zero
+// 0x01015b44: 0x1015b44: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01015b38: 0x1015b38: addu  a1, s3, zero
+// 0x01015b48: 0x1015b48: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x01015b3c: 0x1015b3c: sw    ra, 36(sp)
-// 0x01015b40: 0x1015b40: jal   0x1000a60 sw    s2, 28(sp)
+// 0x01015b4c: 0x1015b4c: sw    ra, 36(sp)
+// 0x01015b50: 0x1015b50: jal   0x1000a60 sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7271,15 +7271,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01015b48: 0x1015b48: lui   s2, 0x0
+// 0x01015b58: 0x1015b58: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01015b4c: 0x1015b4c: addiu a0, s2, 28196
+// 0x01015b5c: 0x1015b5c: addiu a0, s2, 28196
 	ldloc 10
 	ldc.i4 28196
 	add
 	stloc.1
-// 0x01015b50: 0x1015b50: sw    v0, 1604(s0)
+// 0x01015b60: 0x1015b60: sw    v0, 1604(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7288,10 +7288,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015b54: 0x1015b54: addu  a2, v0, zero
+// 0x01015b64: 0x1015b64: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x01015b58: 0x1015b58: jal   0x1004a38 addiu a1, zero, 177
+// 0x01015b68: 0x1015b68: jal   0x1004a48 addiu a1, zero, 177
 	ldc.i4 177
 	stloc.2
 	ldloc.0
@@ -7299,12 +7299,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01015b60: 0x1015b60: lw    a0, 1608(s0)
+// 0x01015b70: 0x1015b70: lw    a0, 1608(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7313,12 +7313,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015b64: 0x1015b64: sll   zero, zero, 0
-// 0x01015b68: 0x1015b68: beq   a0, zero, 0x1015b8c sll   zero, zero, 0
+// 0x01015b74: 0x1015b74: sll   zero, zero, 0
+// 0x01015b78: 0x1015b78: beq   a0, zero, 0x1015b9c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1015b8c
+	brfalse L_1015b9c
 // --- basic block ---
-// 0x01015b70: 0x1015b70: jal   0x1000a60 addu  a1, s3, zero
+// 0x01015b80: 0x1015b80: jal   0x1000a60 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -7331,7 +7331,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01015b78: 0x1015b78: sw    v0, 1608(s0)
+// 0x01015b88: 0x1015b88: sw    v0, 1608(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7340,15 +7340,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015b7c: 0x1015b7c: addiu a0, s2, 28196
+// 0x01015b8c: 0x1015b8c: addiu a0, s2, 28196
 	ldloc 10
 	ldc.i4 28196
 	add
 	stloc.1
-// 0x01015b80: 0x1015b80: addu  a2, v0, zero
+// 0x01015b90: 0x1015b90: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x01015b84: 0x1015b84: jal   0x1004a38 addiu a1, zero, 181
+// 0x01015b94: 0x1015b94: jal   0x1004a48 addiu a1, zero, 181
 	ldc.i4 181
 	stloc.2
 	ldloc.0
@@ -7356,13 +7356,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1015b8c:
-// 0x01015b8c: 0x1015b8c: lw    v0, 1600(s0)
+L_1015b9c:
+// 0x01015b9c: 0x1015b9c: lw    v0, 1600(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7371,18 +7371,18 @@ L_1015b8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015b90: 0x1015b90: addiu a0, zero, -1
+// 0x01015ba0: 0x1015ba0: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01015b94: 0x1015b94: j	 0x1015bb0 sll   v1, v0, 2
+// 0x01015ba4: 0x1015ba4: j	 0x1015bc0 sll   v1, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 8
-	br L_1015bb0
+	br L_1015bc0
 // --- basic block ---
-L_1015b9c:
-// 0x01015b9c: 0x1015b9c: lw    a1, 1604(s0)
+L_1015bac:
+// 0x01015bac: 0x1015bac: lw    a1, 1604(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7391,40 +7391,40 @@ L_1015b9c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01015ba0: 0x1015ba0: addiu v0, v0, 1
+// 0x01015bb0: 0x1015bb0: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01015ba4: 0x1015ba4: addu  a1, a1, v1
+// 0x01015bb4: 0x1015bb4: addu  a1, a1, v1
 	ldloc.2
 	ldloc 8
 	add
 	stloc.2
-// 0x01015ba8: 0x1015ba8: sw    a0, 0(a1)
+// 0x01015bb8: 0x1015bb8: sw    a0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01015bac: 0x1015bac: addiu v1, v1, 4
+// 0x01015bbc: 0x1015bbc: addiu v1, v1, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_1015bb0:
-// 0x01015bb0: 0x1015bb0: slt   a1, v0, s1
+L_1015bc0:
+// 0x01015bc0: 0x1015bc0: slt   a1, v0, s1
 	ldloc 6
 	ldloc 9
 	clt
 	stloc.2
-// 0x01015bb4: 0x1015bb4: bne   a1, zero, 0x1015b9c sll   zero, zero, 0
+// 0x01015bc4: 0x1015bc4: bne   a1, zero, 0x1015bac sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1015b9c
+	brtrue L_1015bac
 // --- basic block ---
-// 0x01015bbc: 0x1015bbc: lw    ra, 36(sp)
-// 0x01015bc0: 0x1015bc0: sw    s1, 1600(s0)
+// 0x01015bcc: 0x1015bcc: lw    ra, 36(sp)
+// 0x01015bd0: 0x1015bd0: sw    s1, 1600(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7433,7 +7433,7 @@ L_1015bb0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015bc4: 0x1015bc4: lw    s3, 32(sp)
+// 0x01015bd4: 0x1015bd4: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7442,7 +7442,7 @@ L_1015bb0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01015bc8: 0x1015bc8: lw    s2, 28(sp)
+// 0x01015bd8: 0x1015bd8: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7451,7 +7451,7 @@ L_1015bb0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01015bcc: 0x1015bcc: lw    s1, 24(sp)
+// 0x01015bdc: 0x1015bdc: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7460,7 +7460,7 @@ L_1015bb0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01015bd0: 0x1015bd0: lw    s0, 20(sp)
+// 0x01015be0: 0x1015be0: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7469,7 +7469,7 @@ L_1015bb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01015bd4: 0x1015bd4: jr    ra addiu sp, sp, 40
+// 0x01015be4: 0x1015be4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl16.j b/converted/Cibyl16.j
index 4ca84c1..8ab60da 100644
--- a/converted/Cibyl16.j
+++ b/converted/Cibyl16.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl16::.ctor
 
-.method public static int32 roadmap_list_enqueue_1015bdc(int32,int32)
+.method public static int32 roadmap_list_enqueue_1015bec(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32[] mem,int32 v0,int32 ra)
@@ -64,14 +64,14 @@
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015bdc: 0x1015bdc: lw    v0, 0(a1)
+// 0x01015bec: 0x1015bec: lw    v0, 0(a1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01015be0: 0x1015be0: sw    a1, 4(a0)
+// 0x01015bf0: 0x1015bf0: sw    a1, 4(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -80,28 +80,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01015be4: 0x1015be4: sw    v0, 0(a0)
+// 0x01015bf4: 0x1015bf4: sw    v0, 0(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01015be8: 0x1015be8: lw    v0, 0(a1)
+// 0x01015bf8: 0x1015bf8: lw    v0, 0(a1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01015bec: 0x1015bec: sw    a0, 0(a1)
+// 0x01015bfc: 0x1015bfc: sw    a0, 0(a1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-// 0x01015bf0: 0x1015bf0: jr    ra sw    a0, 4(v0)
+// 0x01015c00: 0x1015c00: jr    ra sw    a0, 4(v0)
 	ldloc 2
 	ldloc.3
 	ldc.i4.2
@@ -115,7 +115,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_list_remove_1015bf8(int32,int32)
+.method public static int32 roadmap_list_remove_1015c08(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -141,7 +141,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015bf8: 0x1015bf8: lw    a1, 4(a0)
+// 0x01015c08: 0x1015c08: lw    a1, 4(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -150,24 +150,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015bfc: 0x1015bfc: lw    v1, 0(a0)
+// 0x01015c0c: 0x1015c0c: lw    v1, 0(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01015c00: 0x1015c00: addu  v0, a0, zero
+// 0x01015c10: 0x1015c10: addu  v0, a0, zero
 	ldloc.0
 	stloc 4
-// 0x01015c04: 0x1015c04: sw    v1, 0(a1)
+// 0x01015c14: 0x1015c14: sw    v1, 0(a1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01015c08: 0x1015c08: sw    a1, 4(v1)
+// 0x01015c18: 0x1015c18: sw    a1, 4(v1)
 	ldloc 2
 	ldloc.3
 	ldc.i4.2
@@ -176,14 +176,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01015c0c: 0x1015c0c: sw    a0, 0(a0)
+// 0x01015c1c: 0x1015c1c: sw    a0, 0(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-// 0x01015c10: 0x1015c10: jr    ra sw    a0, 4(a0)
+// 0x01015c20: 0x1015c20: jr    ra sw    a0, 4(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -199,7 +199,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_is_visible_1015c3c(int32)
+.method public static int32 roadmap_is_visible_1015c4c(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -222,58 +222,58 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015c3c: 0x1015c3c: addiu v0, zero, 1
+// 0x01015c4c: 0x1015c4c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01015c40: 0x1015c40: beq   a0, v0, 0x1015c58 addiu v1, zero, 2
+// 0x01015c50: 0x1015c50: beq   a0, v0, 0x1015c68 addiu v1, zero, 2
 	ldloc.0
 	ldloc.1
 	ldc.i4.2
 	stloc.2
-	beq  L_1015c58
+	beq  L_1015c68
 // --- basic block ---
-// 0x01015c48: 0x1015c48: bne   a0, v1, 0x1015c6c sll   zero, zero, 0
+// 0x01015c58: 0x1015c58: bne   a0, v1, 0x1015c7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.2
-	bne.un L_1015c6c
+	bne.un L_1015c7c
 // --- basic block ---
-// 0x01015c50: 0x1015c50: j	 0x1015c68 lui   v0, 0x30000
+// 0x01015c60: 0x1015c60: j	 0x1015c78 lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-	br L_1015c68
+	br L_1015c78
 // --- basic block ---
-L_1015c58:
-// 0x01015c58: 0x1015c58: lui   v0, 0x30000
+L_1015c68:
+// 0x01015c68: 0x1015c68: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01015c5c: 0x1015c5c: lw    v0, -28464(v0)
+// 0x01015c6c: 0x1015c6c: lw    v0, -28000(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7116
+	ldc.i4 -7000
 	add
 	ldelem.i4
 	stloc.1
-// 0x01015c60: 0x1015c60: jr    ra sltiu v0, v0, 1
+// 0x01015c70: 0x1015c70: jr    ra sltiu v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_1015c68:
-// 0x01015c68: 0x1015c68: lw    v0, -28468(v0)
+L_1015c78:
+// 0x01015c78: 0x1015c78: lw    v0, -28004(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7117
+	ldc.i4 -7001
 	add
 	ldelem.i4
 	stloc.1
-L_1015c6c:
-// 0x01015c6c: 0x1015c6c: jr    ra sll   zero, zero, 0
+L_1015c7c:
+// 0x01015c7c: 0x1015c7c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -281,7 +281,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_gps_source_1015c84()
+.method public static int32 roadmap_gps_source_1015c94()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -298,25 +298,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015c84: 0x1015c84: lui   v0, 0x30000
+// 0x01015c94: 0x1015c94: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x01015c88: 0x1015c88: lw    v0, -28472(v0)
+// 0x01015c98: 0x1015c98: lw    v0, -28008(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7118
+	ldc.i4 -7002
 	add
 	ldelem.i4
 	stloc.0
-// 0x01015c8c: 0x1015c8c: jr    ra sll   zero, zero, 0
+// 0x01015c9c: 0x1015c9c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_verbosity_1015c94()
+.method public static int32 roadmap_verbosity_1015ca4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -333,10 +333,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015c94: 0x1015c94: lui   v0, 0x0
+// 0x01015ca4: 0x1015ca4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01015c98: 0x1015c98: lw    v0, 1932(v0)
+// 0x01015ca8: 0x1015ca8: lw    v0, 1932(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -345,13 +345,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01015c9c: 0x1015c9c: jr    ra sll   zero, zero, 0
+// 0x01015cac: 0x1015cac: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_debug_1015ca4()
+.method public static int32 roadmap_debug_1015cb4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -368,10 +368,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015ca4: 0x1015ca4: lui   v0, 0x0
+// 0x01015cb4: 0x1015cb4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01015ca8: 0x1015ca8: lw    v0, 2304(v0)
+// 0x01015cb8: 0x1015cb8: lw    v0, 2304(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -380,13 +380,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01015cac: 0x1015cac: jr    ra sll   zero, zero, 0
+// 0x01015cbc: 0x1015cbc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_option_is_synchronous_1015cb4()
+.method public static int32 roadmap_option_is_synchronous_1015cc4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -403,25 +403,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015cb4: 0x1015cb4: lui   v0, 0x30000
+// 0x01015cc4: 0x1015cc4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x01015cb8: 0x1015cb8: lw    v0, -28476(v0)
+// 0x01015cc8: 0x1015cc8: lw    v0, -28012(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7119
+	ldc.i4 -7003
 	add
 	ldelem.i4
 	stloc.0
-// 0x01015cbc: 0x1015cbc: jr    ra sll   zero, zero, 0
+// 0x01015ccc: 0x1015ccc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_option_set_no_area_1015cc4()
+.method public static int32 roadmap_option_set_no_area_1015cd4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -441,19 +441,19 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1015cc4:
-// 0x01015cc4: 0x1015cc4: addiu v1, zero, 1
+L_1015cd4:
+// 0x01015cd4: 0x1015cd4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01015cc8: 0x1015cc8: lui   v0, 0x30000
+// 0x01015cd8: 0x1015cd8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x01015ccc: 0x1015ccc: jr    ra sw    v1, -28464(v0)
+// 0x01015cdc: 0x1015cdc: jr    ra sw    v1, -28000(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7116
+	ldc.i4 -7000
 	add
 	ldloc.1
 	stelem.i4
@@ -464,7 +464,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_option_set_square_1015cd4()
+.method public static int32 roadmap_option_set_square_1015ce4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -484,19 +484,19 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1015cd4:
-// 0x01015cd4: 0x1015cd4: addiu v1, zero, 1
+L_1015ce4:
+// 0x01015ce4: 0x1015ce4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01015cd8: 0x1015cd8: lui   v0, 0x30000
+// 0x01015ce8: 0x1015ce8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x01015cdc: 0x1015cdc: jr    ra sw    v1, -28468(v0)
+// 0x01015cec: 0x1015cec: jr    ra sw    v1, -28004(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7117
+	ldc.i4 -7001
 	add
 	ldloc.1
 	stelem.i4
@@ -507,7 +507,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_option_set_verbose_1015ce4()
+.method public static int32 roadmap_option_set_verbose_1015cf4()
 {
 .maxstack 5
 .locals init (int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -527,11 +527,11 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1015ce4:
-// 0x01015ce4: 0x1015ce4: lui   v0, 0x0
+L_1015cf4:
+// 0x01015cf4: 0x1015cf4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01015ce8: 0x1015ce8: lw    v1, 1932(v0)
+// 0x01015cf8: 0x1015cf8: lw    v1, 1932(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -540,19 +540,19 @@ L_1015ce4:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01015cec: 0x1015cec: sll   zero, zero, 0
-// 0x01015cf0: 0x1015cf0: slti  v1, v1, 3
+// 0x01015cfc: 0x1015cfc: sll   zero, zero, 0
+// 0x01015d00: 0x1015d00: slti  v1, v1, 3
 	ldloc.0
 	ldc.i4.3
 	clt
 	stloc.0
-// 0x01015cf4: 0x1015cf4: bne   v1, zero, 0x1015d00 addiu v1, zero, 2
+// 0x01015d04: 0x1015d04: bne   v1, zero, 0x1015d10 addiu v1, zero, 2
 	ldloc.0
 	ldc.i4.2
 	stloc.0
-	brtrue L_1015d00
+	brtrue L_1015d10
 // --- basic block ---
-// 0x01015cfc: 0x1015cfc: sw    v1, 1932(v0)
+// 0x01015d0c: 0x1015d0c: sw    v1, 1932(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -561,8 +561,8 @@ L_1015ce4:
 	add
 	ldloc.0
 	stelem.i4
-L_1015d00:
-// 0x01015d00: 0x1015d00: jr    ra sll   zero, zero, 0
+L_1015d10:
+// 0x01015d10: 0x1015d10: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
@@ -570,7 +570,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_option_set_synchronous_1015d08()
+.method public static int32 roadmap_option_set_synchronous_1015d18()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -590,19 +590,19 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1015d08:
-// 0x01015d08: 0x1015d08: addiu v1, zero, 1
+L_1015d18:
+// 0x01015d18: 0x1015d18: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01015d0c: 0x1015d0c: lui   v0, 0x30000
+// 0x01015d1c: 0x1015d1c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x01015d10: 0x1015d10: jr    ra sw    v1, -28476(v0)
+// 0x01015d20: 0x1015d20: jr    ra sw    v1, -28012(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7119
+	ldc.i4 -7003
 	add
 	ldloc.1
 	stelem.i4
@@ -613,7 +613,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_option_set_verbosity_1015d18(int32)
+.method public static int32 roadmap_option_set_verbosity_1015d28(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -633,10 +633,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015d18: 0x1015d18: lui   v0, 0x0
+// 0x01015d28: 0x1015d28: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01015d1c: 0x1015d1c: jr    ra sw    a0, 1932(v0)
+// 0x01015d2c: 0x1015d2c: jr    ra sw    a0, 1932(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -650,7 +650,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_option_initialize_1015d24(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_initialize_1015d34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v1,int32 s0,int32 v0,int32 s2,int32 ra)
@@ -694,12 +694,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015d24: 0x1015d24: addiu sp, sp, -40
+// 0x01015d34: 0x1015d34: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01015d28: 0x1015d28: sw    s2, 32(sp)
+// 0x01015d38: 0x1015d38: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -708,7 +708,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01015d2c: 0x1015d2c: sw    s1, 28(sp)
+// 0x01015d3c: 0x1015d3c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -717,7 +717,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015d30: 0x1015d30: sw    s0, 24(sp)
+// 0x01015d40: 0x1015d40: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -726,43 +726,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01015d34: 0x1015d34: lui   s2, 0x0
+// 0x01015d44: 0x1015d44: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01015d38: 0x1015d38: lui   s0, 0x10000
+// 0x01015d48: 0x1015d48: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01015d3c: 0x1015d3c: lui   s1, 0x20000
+// 0x01015d4c: 0x1015d4c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01015d40: 0x1015d40: lui   a1, 0x0
+// 0x01015d50: 0x1015d50: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015d44: 0x1015d44: addiu s1, s1, 9464
+// 0x01015d54: 0x1015d54: addiu s1, s1, 9928
 	ldloc 6
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 6
-// 0x01015d48: 0x1015d48: addiu a0, s0, 12560
+// 0x01015d58: 0x1015d58: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01015d4c: 0x1015d4c: addiu a3, s2, 20820
+// 0x01015d5c: 0x1015d5c: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01015d50: 0x1015d50: addiu a1, a1, 1936
+// 0x01015d60: 0x1015d60: addiu a1, a1, 1936
 	ldloc.2
 	ldc.i4 1936
 	add
 	stloc.2
-// 0x01015d54: 0x1015d54: addu  a2, zero, zero
+// 0x01015d64: 0x1015d64: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01015d58: 0x1015d58: sw    ra, 36(sp)
-// 0x01015d5c: 0x1015d5c: sw    s1, 16(sp)
+// 0x01015d68: 0x1015d68: sw    ra, 36(sp)
+// 0x01015d6c: 0x1015d6c: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -771,7 +771,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015d60: 0x1015d60: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01015d70: 0x1015d70: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -785,33 +785,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x01015d68: 0x1015d68: lui   a1, 0x0
+// 0x01015d78: 0x1015d78: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015d6c: 0x1015d6c: addiu a3, s2, 20820
+// 0x01015d7c: 0x1015d7c: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01015d70: 0x1015d70: addiu a0, s0, 12560
+// 0x01015d80: 0x1015d80: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01015d74: 0x1015d74: addiu a1, a1, 1952
+// 0x01015d84: 0x1015d84: addiu a1, a1, 1952
 	ldloc.2
 	ldc.i4 1952
 	add
 	stloc.2
-// 0x01015d78: 0x1015d78: addu  a2, zero, zero
+// 0x01015d88: 0x1015d88: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01015d7c: 0x1015d7c: sw    s1, 16(sp)
+// 0x01015d8c: 0x1015d8c: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -820,7 +820,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015d80: 0x1015d80: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01015d90: 0x1015d90: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -834,33 +834,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x01015d88: 0x1015d88: lui   a1, 0x0
+// 0x01015d98: 0x1015d98: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015d8c: 0x1015d8c: lui   a2, 0x0
-	ldc.i4.s 0
+// 0x01015d9c: 0x1015d9c: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x01015d90: 0x1015d90: addiu a0, s0, 12560
+// 0x01015da0: 0x1015da0: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01015d94: 0x1015d94: addiu a1, a1, 1968
+// 0x01015da4: 0x1015da4: addiu a1, a1, 1968
 	ldloc.2
 	ldc.i4 1968
 	add
 	stloc.2
-// 0x01015d98: 0x1015d98: addiu a2, a2, 20620
+// 0x01015da8: 0x1015da8: addiu a2, a2, 18760
 	ldloc.3
-	ldc.i4 20620
+	ldc.i4 18760
 	add
 	stloc.3
-// 0x01015d9c: 0x1015d9c: jal   0x100edb0 addu  a3, zero, zero
+// 0x01015dac: 0x1015dac: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -868,33 +868,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x01015da4: 0x1015da4: lui   s1, 0x0
+// 0x01015db4: 0x1015db4: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01015da8: 0x1015da8: lui   a2, 0x10000
+// 0x01015db8: 0x1015db8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01015dac: 0x1015dac: addiu a0, s0, 12560
+// 0x01015dbc: 0x1015dbc: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01015db0: 0x1015db0: addiu a1, s1, 1916
+// 0x01015dc0: 0x1015dc0: addiu a1, s1, 1916
 	ldloc 6
 	ldc.i4 1916
 	add
 	stloc.2
-// 0x01015db4: 0x1015db4: addiu a2, a2, -15496
+// 0x01015dc4: 0x1015dc4: addiu a2, a2, 19432
 	ldloc.3
-	ldc.i4 -15496
+	ldc.i4 19432
 	add
 	stloc.3
-// 0x01015db8: 0x1015db8: jal   0x100edb0 addu  a3, zero, zero
+// 0x01015dc8: 0x1015dc8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -902,12 +902,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x01015dc0: 0x1015dc0: jal   0x100e788 addiu a0, s1, 1916
+// 0x01015dd0: 0x1015dd0: jal   0x100e798 addiu a0, s1, 1916
 	ldloc 6
 	ldc.i4 1916
 	add
@@ -917,16 +917,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 9
 // --- basic block ---
-// 0x01015dc8: 0x1015dc8: lw    ra, 36(sp)
-// 0x01015dcc: 0x1015dcc: lui   v1, 0x0
+// 0x01015dd8: 0x1015dd8: lw    ra, 36(sp)
+// 0x01015ddc: 0x1015ddc: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01015dd0: 0x1015dd0: lw    s2, 32(sp)
+// 0x01015de0: 0x1015de0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -935,7 +935,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01015dd4: 0x1015dd4: lw    s1, 28(sp)
+// 0x01015de4: 0x1015de4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -944,7 +944,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015dd8: 0x1015dd8: lw    s0, 24(sp)
+// 0x01015de8: 0x1015de8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -953,7 +953,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01015ddc: 0x1015ddc: sw    v0, 1932(v1)
+// 0x01015dec: 0x1015dec: sw    v0, 1932(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -962,7 +962,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015de0: 0x1015de0: jr    ra addiu sp, sp, 40
+// 0x01015df0: 0x1015df0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -974,7 +974,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_option_cache_1015de8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_cache_1015df8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1009,32 +1009,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015de8: 0x1015de8: lui   v0, 0x30000
+// 0x01015df8: 0x1015df8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01015dec: 0x1015dec: lw    v0, -28480(v0)
+// 0x01015dfc: 0x1015dfc: lw    v0, -28016(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7120
+	ldc.i4 -7004
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015df0: 0x1015df0: addiu sp, sp, -24
+// 0x01015e00: 0x1015e00: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01015df4: 0x1015df4: bgtz  v0, 0x1015e08 sw    ra, 20(sp)
+// 0x01015e04: 0x1015e04: bgtz  v0, 0x1015e18 sw    ra, 20(sp)
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_1015e08
+	bgt L_1015e18
 // --- basic block ---
-// 0x01015dfc: 0x1015dfc: lui   a0, 0x0
+// 0x01015e0c: 0x1015e0c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01015e00: 0x1015e00: jal   0x100e788 addiu a0, a0, 1968
+// 0x01015e10: 0x1015e10: jal   0x100e798 addiu a0, a0, 1968
 	ldloc.1
 	ldc.i4 1968
 	add
@@ -1044,15 +1044,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1015e08:
-// 0x01015e08: 0x1015e08: lw    ra, 20(sp)
-// 0x01015e0c: 0x1015e0c: sll   zero, zero, 0
-// 0x01015e10: 0x1015e10: jr    ra addiu sp, sp, 24
+L_1015e18:
+// 0x01015e18: 0x1015e18: lw    ra, 20(sp)
+// 0x01015e1c: 0x1015e1c: sll   zero, zero, 0
+// 0x01015e20: 0x1015e20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1064,7 +1064,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_option_1015e18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_1015e28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s6,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s7,int32 s8,int32 s5,int32 ra)
@@ -1126,12 +1126,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01015e18: 0x1015e18: addiu sp, sp, -72
+// 0x01015e28: 0x1015e28: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01015e1c: 0x1015e1c: sw    s4, 48(sp)
+// 0x01015e2c: 0x1015e2c: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1140,7 +1140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01015e20: 0x1015e20: sw    s3, 44(sp)
+// 0x01015e30: 0x1015e30: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1149,7 +1149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01015e24: 0x1015e24: sw    s2, 40(sp)
+// 0x01015e34: 0x1015e34: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1158,19 +1158,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01015e28: 0x1015e28: lui   v0, 0x30000
+// 0x01015e38: 0x1015e38: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01015e2c: 0x1015e2c: lui   s4, 0x0
+// 0x01015e3c: 0x1015e3c: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01015e30: 0x1015e30: lui   s3, 0x0
+// 0x01015e40: 0x1015e40: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01015e34: 0x1015e34: lui   s2, 0x0
+// 0x01015e44: 0x1015e44: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01015e38: 0x1015e38: sw    s5, 52(sp)
+// 0x01015e48: 0x1015e48: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1179,7 +1179,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01015e3c: 0x1015e3c: sw    s1, 36(sp)
+// 0x01015e4c: 0x1015e4c: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1188,7 +1188,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015e40: 0x1015e40: sw    s0, 32(sp)
+// 0x01015e50: 0x1015e50: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1197,8 +1197,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01015e44: 0x1015e44: sw    ra, 68(sp)
-// 0x01015e48: 0x1015e48: sw    s8, 64(sp)
+// 0x01015e54: 0x1015e54: sw    ra, 68(sp)
+// 0x01015e58: 0x1015e58: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1207,7 +1207,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01015e4c: 0x1015e4c: sw    s7, 60(sp)
+// 0x01015e5c: 0x1015e5c: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1216,7 +1216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01015e50: 0x1015e50: sw    s6, 56(sp)
+// 0x01015e60: 0x1015e60: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1225,43 +1225,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01015e54: 0x1015e54: sw    a2, -28484(v0)
+// 0x01015e64: 0x1015e64: sw    a2, -28020(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7121
+	ldc.i4 -7005
 	add
 	ldloc.3
 	stelem.i4
-// 0x01015e58: 0x1015e58: addu  s5, a0, zero
+// 0x01015e68: 0x1015e68: addu  s5, a0, zero
 	ldloc.1
 	stloc 16
-// 0x01015e5c: 0x1015e5c: addu  s0, a1, zero
+// 0x01015e6c: 0x1015e6c: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01015e60: 0x1015e60: addiu s4, s4, 1984
+// 0x01015e70: 0x1015e70: addiu s4, s4, 1984
 	ldloc 13
 	ldc.i4 1984
 	add
 	stloc 13
-// 0x01015e64: 0x1015e64: addiu s3, s3, 28260
+// 0x01015e74: 0x1015e74: addiu s3, s3, 28260
 	ldloc 12
 	ldc.i4 28260
 	add
 	stloc 12
-// 0x01015e68: 0x1015e68: addiu s2, s2, 28288
+// 0x01015e78: 0x1015e78: addiu s2, s2, 28288
 	ldloc 11
 	ldc.i4 28288
 	add
 	stloc 11
-// 0x01015e6c: 0x1015e6c: j	 0x1015f18 addiu s1, zero, 1
+// 0x01015e7c: 0x1015e7c: j	 0x1015f28 addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-	br L_1015f18
+	br L_1015f28
 // --- basic block ---
-L_1015e74:
-// 0x01015e74: 0x1015e74: lw    v0, 4(s6)
+L_1015e84:
+// 0x01015e84: 0x1015e84: lw    v0, 4(s6)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1270,7 +1270,7 @@ L_1015e74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015e78: 0x1015e78: lw    s7, 4(s0)
+// 0x01015e88: 0x1015e88: lw    s7, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1279,18 +1279,18 @@ L_1015e74:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01015e7c: 0x1015e7c: lb    v0, 0(v0)
+// 0x01015e8c: 0x1015e8c: lb    v0, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01015e80: 0x1015e80: sll   zero, zero, 0
-// 0x01015e84: 0x1015e84: bne   v0, zero, 0x1015e9c addu  a1, s7, zero
+// 0x01015e90: 0x1015e90: sll   zero, zero, 0
+// 0x01015e94: 0x1015e94: bne   v0, zero, 0x1015eac addu  a1, s7, zero
 	ldloc 6
 	ldloc 14
 	stloc.2
-	brtrue L_1015e9c
+	brtrue L_1015eac
 // --- basic block ---
-// 0x01015e8c: 0x1015e8c: jal   0x1001b14 addu  a0, v1, zero
+// 0x01015e9c: 0x1015e9c: jal   0x1001b14 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -1298,11 +1298,11 @@ L_1015e74:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01015e94: 0x1015e94: j	 0x1015ebc sll   zero, zero, 0
-	br L_1015ebc
+// 0x01015ea4: 0x1015ea4: j	 0x1015ecc sll   zero, zero, 0
+	br L_1015ecc
 // --- basic block ---
-L_1015e9c:
-// 0x01015e9c: 0x1015e9c: jal   0x1001b48 sw    v1, 24(sp)
+L_1015eac:
+// 0x01015eac: 0x1015eac: jal   0x1001b48 sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1317,7 +1317,7 @@ L_1015e9c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01015ea4: 0x1015ea4: lw    v1, 24(sp)
+// 0x01015eb4: 0x1015eb4: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1326,16 +1326,16 @@ L_1015e9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01015ea8: 0x1015ea8: addu  a1, s7, zero
+// 0x01015eb8: 0x1015eb8: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x01015eac: 0x1015eac: addu  a0, v1, zero
+// 0x01015ebc: 0x1015ebc: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01015eb0: 0x1015eb0: addu  a2, v0, zero
+// 0x01015ec0: 0x1015ec0: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x01015eb4: 0x1015eb4: jal   0x1001b2c addu  s8, s7, v0
+// 0x01015ec4: 0x1015ec4: jal   0x1001b2c addu  s8, s7, v0
 	ldloc 14
 	ldloc 6
 	add
@@ -1346,21 +1346,21 @@ L_1015e9c:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-L_1015ebc:
-// 0x01015ebc: 0x1015ebc: bne   v0, zero, 0x1015ee0 addiu s6, s6, 16
+L_1015ecc:
+// 0x01015ecc: 0x1015ecc: bne   v0, zero, 0x1015ef0 addiu s6, s6, 16
 	ldloc 6
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 8
-	brtrue L_1015ee0
+	brtrue L_1015ef0
 // --- basic block ---
-// 0x01015ec4: 0x1015ec4: addiu s6, s6, -16
+// 0x01015ed4: 0x1015ed4: addiu s6, s6, -16
 	ldloc 8
 	ldc.i4.s -16
 	add
 	stloc 8
-// 0x01015ec8: 0x1015ec8: lw    v0, 8(s6)
+// 0x01015ed8: 0x1015ed8: lw    v0, 8(s6)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1369,8 +1369,8 @@ L_1015ebc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015ecc: 0x1015ecc: sll   zero, zero, 0
-// 0x01015ed0: 0x1015ed0: jalr  v0 addu  a0, s8, zero
+// 0x01015edc: 0x1015edc: sll   zero, zero, 0
+// 0x01015ee0: 0x1015ee0: jalr  v0 addu  a0, s8, zero
 	ldloc 6
 	ldloc 15
 	stloc.1
@@ -1384,37 +1384,37 @@ L_1015ebc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01015ed8: 0x1015ed8: j	 0x1015f14 addiu s1, s1, 1
+// 0x01015ee8: 0x1015ee8: j	 0x1015f24 addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_1015f14
+	br L_1015f24
 // --- basic block ---
-L_1015ee0:
-// 0x01015ee0: 0x1015ee0: lw    v1, 0(s6)
+L_1015ef0:
+// 0x01015ef0: 0x1015ef0: lw    v1, 0(s6)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01015ee4: 0x1015ee4: addu  s8, zero, zero
+// 0x01015ef4: 0x1015ef4: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01015ee8: 0x1015ee8: bne   v1, zero, 0x1015e74 addu  a0, v1, zero
+// 0x01015ef8: 0x1015ef8: bne   v1, zero, 0x1015e84 addu  a0, v1, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_1015e74
+	brtrue L_1015e84
 // --- basic block ---
-// 0x01015ef0: 0x1015ef0: beq   v0, zero, 0x1015f10 addiu a0, zero, 5
+// 0x01015f00: 0x1015f00: beq   v0, zero, 0x1015f20 addiu a0, zero, 5
 	ldloc 6
 	ldc.i4.5
 	stloc.1
-	brfalse L_1015f10
+	brfalse L_1015f20
 // --- basic block ---
-// 0x01015ef8: 0x1015ef8: lw    v0, 4(s0)
+// 0x01015f08: 0x1015f08: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1423,16 +1423,16 @@ L_1015ee0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01015efc: 0x1015efc: addu  a1, s3, zero
+// 0x01015f0c: 0x1015f0c: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01015f00: 0x1015f00: addiu a2, zero, 428
+// 0x01015f10: 0x1015f10: addiu a2, zero, 428
 	ldc.i4 428
 	stloc.3
-// 0x01015f04: 0x1015f04: addu  a3, s2, zero
+// 0x01015f14: 0x1015f14: addu  a3, s2, zero
 	ldloc 11
 	stloc 4
-// 0x01015f08: 0x1015f08: jal   0x100449c sw    v0, 16(sp)
+// 0x01015f18: 0x1015f18: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1451,41 +1451,41 @@ L_1015ee0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1015f10:
-// 0x01015f10: 0x1015f10: addiu s1, s1, 1
+L_1015f20:
+// 0x01015f20: 0x1015f20: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1015f14:
-// 0x01015f14: 0x1015f14: addiu s0, s0, 4
+L_1015f24:
+// 0x01015f24: 0x1015f24: addiu s0, s0, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-L_1015f18:
-// 0x01015f18: 0x1015f18: slt   v0, s1, s5
+L_1015f28:
+// 0x01015f28: 0x1015f28: slt   v0, s1, s5
 	ldloc 9
 	ldloc 16
 	clt
 	stloc 6
-// 0x01015f1c: 0x1015f1c: beq   v0, zero, 0x1015f2c addu  s6, s4, zero
+// 0x01015f2c: 0x1015f2c: beq   v0, zero, 0x1015f3c addu  s6, s4, zero
 	ldloc 6
 	ldloc 13
 	stloc 8
-	brfalse L_1015f2c
+	brfalse L_1015f3c
 // --- basic block ---
-// 0x01015f24: 0x1015f24: j	 0x1015ee0 addiu v0, zero, 1
+// 0x01015f34: 0x1015f34: j	 0x1015ef0 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_1015ee0
+	br L_1015ef0
 // --- basic block ---
-L_1015f2c:
-// 0x01015f2c: 0x1015f2c: lw    ra, 68(sp)
-// 0x01015f30: 0x1015f30: lui   v0, 0x30000
+L_1015f3c:
+// 0x01015f3c: 0x1015f3c: lw    ra, 68(sp)
+// 0x01015f40: 0x1015f40: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01015f34: 0x1015f34: lw    s8, 64(sp)
+// 0x01015f44: 0x1015f44: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1494,7 +1494,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01015f38: 0x1015f38: lw    s7, 60(sp)
+// 0x01015f48: 0x1015f48: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1503,7 +1503,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01015f3c: 0x1015f3c: lw    s6, 56(sp)
+// 0x01015f4c: 0x1015f4c: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1512,7 +1512,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01015f40: 0x1015f40: lw    s5, 52(sp)
+// 0x01015f50: 0x1015f50: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1521,7 +1521,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01015f44: 0x1015f44: lw    s4, 48(sp)
+// 0x01015f54: 0x1015f54: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1530,7 +1530,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01015f48: 0x1015f48: lw    s3, 44(sp)
+// 0x01015f58: 0x1015f58: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1539,7 +1539,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01015f4c: 0x1015f4c: lw    s2, 40(sp)
+// 0x01015f5c: 0x1015f5c: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1548,7 +1548,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01015f50: 0x1015f50: lw    s1, 36(sp)
+// 0x01015f60: 0x1015f60: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1557,7 +1557,7 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01015f54: 0x1015f54: lw    s0, 32(sp)
+// 0x01015f64: 0x1015f64: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1566,16 +1566,16 @@ L_1015f2c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01015f58: 0x1015f58: sw    zero, -28484(v0)
+// 0x01015f68: 0x1015f68: sw    zero, -28020(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7121
+	ldc.i4 -7005
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01015f5c: 0x1015f5c: jr    ra addiu sp, sp, 72
+// 0x01015f6c: 0x1015f6c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1587,7 +1587,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_option_usage_1015f64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_usage_1015f74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 s2,int32 s3,int32 s1,int32 ra)
@@ -1634,13 +1634,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1015f64:
-// 0x01015f64: 0x1015f64: addiu sp, sp, -40
+L_1015f74:
+// 0x01015f74: 0x1015f74: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01015f68: 0x1015f68: sw    s1, 24(sp)
+// 0x01015f78: 0x1015f78: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1649,8 +1649,8 @@ L_1015f64:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01015f6c: 0x1015f6c: sw    ra, 36(sp)
-// 0x01015f70: 0x1015f70: sw    s3, 32(sp)
+// 0x01015f7c: 0x1015f7c: sw    ra, 36(sp)
+// 0x01015f80: 0x1015f80: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1659,7 +1659,7 @@ L_1015f64:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01015f74: 0x1015f74: sw    s2, 28(sp)
+// 0x01015f84: 0x1015f84: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1668,7 +1668,7 @@ L_1015f64:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01015f78: 0x1015f78: sw    s0, 20(sp)
+// 0x01015f88: 0x1015f88: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1677,16 +1677,16 @@ L_1015f64:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01015f7c: 0x1015f7c: beq   a0, zero, 0x1015f98 addu  s1, a0, zero
+// 0x01015f8c: 0x1015f8c: beq   a0, zero, 0x1015fa8 addu  s1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 11
-	brfalse L_1015f98
+	brfalse L_1015fa8
 // --- basic block ---
-// 0x01015f84: 0x1015f84: lui   a1, 0x0
+// 0x01015f94: 0x1015f94: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01015f88: 0x1015f88: jal   0x1001c08 addiu a1, a1, 28308
+// 0x01015f98: 0x1015f98: jal   0x1001c08 addiu a1, a1, 28308
 	ldloc.2
 	ldc.i4 28308
 	add
@@ -1701,53 +1701,53 @@ L_1015f64:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01015f90: 0x1015f90: bne   v0, zero, 0x1015ff4 lui   v0, 0x30000
+// 0x01015fa0: 0x1015fa0: bne   v0, zero, 0x1016004 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1015ff4
+	brtrue L_1016004
 // --- basic block ---
-L_1015f98:
-// 0x01015f98: 0x1015f98: lui   a0, 0x0
+L_1015fa8:
+// 0x01015fa8: 0x1015fa8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01015f9c: 0x1015f9c: addiu a0, a0, 28316
+// 0x01015fac: 0x1015fac: addiu a0, a0, 28316
 	ldloc.1
 	ldc.i4 28316
 	add
 	stloc.1
-// 0x01015fa0: 0x1015fa0: lui   s0, 0x0
+// 0x01015fb0: 0x1015fb0: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01015fa4: 0x1015fa4: lui   s3, 0x0
+// 0x01015fb4: 0x1015fb4: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01015fa8: 0x1015fa8: jal   0x1000350 lui   s2, 0x0
+// 0x01015fb8: 0x1015fb8: jal   0x1000350 lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
 	ldloc.1
 	call int32 Cibyl::puts_1000350(int32)
 	stloc 5
 // --- basic block ---
-// 0x01015fb0: 0x1015fb0: addiu s0, s0, 1984
+// 0x01015fc0: 0x1015fc0: addiu s0, s0, 1984
 	ldloc 6
 	ldc.i4 1984
 	add
 	stloc 6
-// 0x01015fb4: 0x1015fb4: addiu s3, s3, 28328
+// 0x01015fc4: 0x1015fc4: addiu s3, s3, 28328
 	ldloc 10
 	ldc.i4 28328
 	add
 	stloc 10
-// 0x01015fb8: 0x1015fb8: j	 0x1015fdc addiu s2, s2, 28336
+// 0x01015fc8: 0x1015fc8: j	 0x1015fec addiu s2, s2, 28336
 	ldloc 9
 	ldc.i4 28336
 	add
 	stloc 9
-	br L_1015fdc
+	br L_1015fec
 // --- basic block ---
-L_1015fc0:
-// 0x01015fc0: 0x1015fc0: lw    a2, 4(s0)
+L_1015fd0:
+// 0x01015fd0: 0x1015fd0: lw    a2, 4(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1756,7 +1756,7 @@ L_1015fc0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01015fc4: 0x1015fc4: jal   0x1000e78 addu  a0, s3, zero
+// 0x01015fd4: 0x1015fd4: jal   0x1000e78 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1769,7 +1769,7 @@ L_1015fc0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01015fcc: 0x1015fcc: lw    a1, 12(s0)
+// 0x01015fdc: 0x1015fdc: lw    a1, 12(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1778,10 +1778,10 @@ L_1015fc0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01015fd0: 0x1015fd0: addu  a0, s2, zero
+// 0x01015fe0: 0x1015fe0: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01015fd4: 0x1015fd4: jal   0x1000e78 addiu s0, s0, 16
+// 0x01015fe4: 0x1015fe4: jal   0x1000e78 addiu s0, s0, 16
 	ldloc 6
 	ldc.i4.s 16
 	add
@@ -1796,41 +1796,41 @@ L_1015fc0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1015fdc:
-// 0x01015fdc: 0x1015fdc: lw    a1, 0(s0)
+L_1015fec:
+// 0x01015fec: 0x1015fec: lw    a1, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01015fe0: 0x1015fe0: sll   zero, zero, 0
-// 0x01015fe4: 0x1015fe4: bne   a1, zero, 0x1015fc0 sll   zero, zero, 0
+// 0x01015ff0: 0x1015ff0: sll   zero, zero, 0
+// 0x01015ff4: 0x1015ff4: bne   a1, zero, 0x1015fd0 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1015fc0
+	brtrue L_1015fd0
 // --- basic block ---
-// 0x01015fec: 0x1015fec: bne   s1, zero, 0x101600c lui   v0, 0x30000
+// 0x01015ffc: 0x1015ffc: bne   s1, zero, 0x101601c lui   v0, 0x30000
 	ldloc 11
 	ldc.i4 196608
 	stloc 5
-	brtrue L_101600c
+	brtrue L_101601c
 // --- basic block ---
-L_1015ff4:
-// 0x01015ff4: 0x1015ff4: lw    v0, -28484(v0)
+L_1016004:
+// 0x01016004: 0x1016004: lw    v0, -28020(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7121
+	ldc.i4 -7005
 	add
 	ldelem.i4
 	stloc 5
-// 0x01015ff8: 0x1015ff8: sll   zero, zero, 0
-// 0x01015ffc: 0x1015ffc: beq   v0, zero, 0x101600c sll   zero, zero, 0
+// 0x01016008: 0x1016008: sll   zero, zero, 0
+// 0x0101600c: 0x101600c: beq   v0, zero, 0x101601c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101600c
+	brfalse L_101601c
 // --- basic block ---
-// 0x01016004: 0x1016004: jalr  v0 addu  a0, s1, zero
+// 0x01016014: 0x1016014: jalr  v0 addu  a0, s1, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
@@ -1844,8 +1844,8 @@ L_1015ff4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101600c:
-// 0x0101600c: 0x101600c: jal   0x1000ac0 addu  a0, zero, zero
+L_101601c:
+// 0x0101601c: 0x101601c: jal   0x1000ac0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
@@ -1857,7 +1857,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_option_set_debug_1016014(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_debug_1016024(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -1892,11 +1892,11 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1016014:
-// 0x01016014: 0x1016014: lui   v0, 0x0
+L_1016024:
+// 0x01016024: 0x1016024: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01016018: 0x1016018: lw    v1, 1932(v0)
+// 0x01016028: 0x1016028: lw    v1, 1932(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1905,24 +1905,24 @@ L_1016014:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101601c: 0x101601c: addiu sp, sp, -24
+// 0x0101602c: 0x101602c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016020: 0x1016020: slti  v1, v1, 2
+// 0x01016030: 0x1016030: slti  v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01016024: 0x1016024: bne   v1, zero, 0x1016034 sw    ra, 20(sp)
+// 0x01016034: 0x1016034: bne   v1, zero, 0x1016044 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1016034
+	brtrue L_1016044
 // --- basic block ---
-// 0x0101602c: 0x101602c: addiu v1, zero, 1
+// 0x0101603c: 0x101603c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01016030: 0x1016030: sw    v1, 1932(v0)
+// 0x01016040: 0x1016040: sw    v1, 1932(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1931,21 +1931,21 @@ L_1016014:
 	add
 	ldloc 5
 	stelem.i4
-L_1016034:
-// 0x01016034: 0x1016034: beq   a0, zero, 0x101605c sll   zero, zero, 0
+L_1016044:
+// 0x01016044: 0x1016044: beq   a0, zero, 0x101606c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101605c
+	brfalse L_101606c
 // --- basic block ---
-// 0x0101603c: 0x101603c: lb    v0, 0(a0)
+// 0x0101604c: 0x101604c: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01016040: 0x1016040: sll   zero, zero, 0
-// 0x01016044: 0x1016044: beq   v0, zero, 0x101605c sll   zero, zero, 0
+// 0x01016050: 0x1016050: sll   zero, zero, 0
+// 0x01016054: 0x1016054: beq   v0, zero, 0x101606c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101605c
+	brfalse L_101606c
 // --- basic block ---
-// 0x0101604c: 0x101604c: jal   0x1001ba8 sll   zero, zero, 0
+// 0x0101605c: 0x101605c: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1956,10 +1956,10 @@ L_1016034:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01016054: 0x1016054: lui   v1, 0x0
+// 0x01016064: 0x1016064: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01016058: 0x1016058: sw    v0, 2304(v1)
+// 0x01016068: 0x1016068: sw    v0, 2304(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1968,10 +1968,10 @@ L_1016034:
 	add
 	ldloc 6
 	stelem.i4
-L_101605c:
-// 0x0101605c: 0x101605c: lw    ra, 20(sp)
-// 0x01016060: 0x1016060: sll   zero, zero, 0
-// 0x01016064: 0x1016064: jr    ra addiu sp, sp, 24
+L_101606c:
+// 0x0101606c: 0x101606c: lw    ra, 20(sp)
+// 0x01016070: 0x1016070: sll   zero, zero, 0
+// 0x01016074: 0x1016074: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1983,7 +1983,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_option_set_cache_101606c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_cache_101607c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -2021,13 +2021,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_101606c:
-// 0x0101606c: 0x101606c: addiu sp, sp, -32
+L_101607c:
+// 0x0101607c: 0x101607c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01016070: 0x1016070: sw    s0, 24(sp)
+// 0x01016080: 0x1016080: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2036,8 +2036,8 @@ L_101606c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01016074: 0x1016074: sw    ra, 28(sp)
-// 0x01016078: 0x1016078: jal   0x1000d8c addu  s0, a0, zero
+// 0x01016084: 0x1016084: sw    ra, 28(sp)
+// 0x01016088: 0x1016088: jal   0x1000d8c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -2050,45 +2050,45 @@ L_101606c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01016080: 0x1016080: lui   v1, 0x30000
+// 0x01016090: 0x1016090: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01016084: 0x1016084: bgtz  v0, 0x10160ac sw    v0, -28480(v1)
+// 0x01016094: 0x1016094: bgtz  v0, 0x10160bc sw    v0, -28016(v1)
 	ldloc 6
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7120
+	ldc.i4 -7004
 	add
 	ldloc 6
 	stelem.i4
 	ldc.i4.s 0
-	bgt L_10160ac
+	bgt L_10160bc
 // --- basic block ---
-// 0x0101608c: 0x101608c: lui   a1, 0x0
+// 0x0101609c: 0x101609c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016090: 0x1016090: lui   a3, 0x0
+// 0x010160a0: 0x10160a0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01016094: 0x1016094: addiu a1, a1, 28260
+// 0x010160a4: 0x10160a4: addiu a1, a1, 28260
 	ldloc.2
 	ldc.i4 28260
 	add
 	stloc.2
-// 0x01016098: 0x1016098: addiu a3, a3, 28352
+// 0x010160a8: 0x10160a8: addiu a3, a3, 28352
 	ldloc 4
 	ldc.i4 28352
 	add
 	stloc 4
-// 0x0101609c: 0x101609c: addiu a0, zero, 5
+// 0x010160ac: 0x10160ac: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010160a0: 0x10160a0: addiu a2, zero, 263
+// 0x010160b0: 0x10160b0: addiu a2, zero, 263
 	ldc.i4 263
 	stloc.3
-// 0x010160a4: 0x10160a4: jal   0x100449c sw    s0, 16(sp)
+// 0x010160b4: 0x10160b4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2107,14 +2107,14 @@ L_101606c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10160ac:
-// 0x010160ac: 0x10160ac: lui   a0, 0x0
+L_10160bc:
+// 0x010160bc: 0x10160bc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010160b0: 0x10160b0: addu  a1, s0, zero
+// 0x010160c0: 0x10160c0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010160b4: 0x10160b4: jal   0x100e5c0 addiu a0, a0, 1968
+// 0x010160c4: 0x10160c4: jal   0x100e5d0 addiu a0, a0, 1968
 	ldloc.1
 	ldc.i4 1968
 	add
@@ -2124,13 +2124,13 @@ L_10160ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010160bc: 0x10160bc: lw    ra, 28(sp)
-// 0x010160c0: 0x10160c0: lw    s0, 24(sp)
+// 0x010160cc: 0x10160cc: lw    ra, 28(sp)
+// 0x010160d0: 0x10160d0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2139,7 +2139,7 @@ L_10160ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010160c4: 0x10160c4: jr    ra addiu sp, sp, 32
+// 0x010160d4: 0x10160d4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2151,7 +2151,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_option_set_no_icon_10160cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_no_icon_10160dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2186,27 +2186,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10160cc:
-// 0x010160cc: 0x10160cc: lui   a0, 0x0
+L_10160dc:
+// 0x010160dc: 0x10160dc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010160d0: 0x10160d0: lui   a1, 0x20000
+// 0x010160e0: 0x10160e0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010160d4: 0x10160d4: addiu sp, sp, -24
+// 0x010160e4: 0x10160e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010160d8: 0x10160d8: addiu a0, a0, 1952
+// 0x010160e8: 0x10160e8: addiu a0, a0, 1952
 	ldloc.1
 	ldc.i4 1952
 	add
 	stloc.1
-// 0x010160dc: 0x10160dc: sw    ra, 20(sp)
-// 0x010160e0: 0x10160e0: jal   0x100e5c0 addiu a1, a1, 9464
+// 0x010160ec: 0x10160ec: sw    ra, 20(sp)
+// 0x010160f0: 0x10160f0: jal   0x100e5d0 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -2214,14 +2214,14 @@ L_10160cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010160e8: 0x10160e8: lw    ra, 20(sp)
-// 0x010160ec: 0x10160ec: sll   zero, zero, 0
-// 0x010160f0: 0x10160f0: jr    ra addiu sp, sp, 24
+// 0x010160f8: 0x10160f8: lw    ra, 20(sp)
+// 0x010160fc: 0x10160fc: sll   zero, zero, 0
+// 0x01016100: 0x1016100: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2233,7 +2233,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_option_set_no_toolbar_10160f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_no_toolbar_1016108(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2268,27 +2268,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10160f8:
-// 0x010160f8: 0x10160f8: lui   a0, 0x0
+L_1016108:
+// 0x01016108: 0x1016108: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010160fc: 0x10160fc: lui   a1, 0x20000
+// 0x0101610c: 0x101610c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01016100: 0x1016100: addiu sp, sp, -24
+// 0x01016110: 0x1016110: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016104: 0x1016104: addiu a0, a0, 1936
+// 0x01016114: 0x1016114: addiu a0, a0, 1936
 	ldloc.1
 	ldc.i4 1936
 	add
 	stloc.1
-// 0x01016108: 0x1016108: sw    ra, 20(sp)
-// 0x0101610c: 0x101610c: jal   0x100e5c0 addiu a1, a1, 9464
+// 0x01016118: 0x1016118: sw    ra, 20(sp)
+// 0x0101611c: 0x101611c: jal   0x100e5d0 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -2296,14 +2296,14 @@ L_10160f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01016114: 0x1016114: lw    ra, 20(sp)
-// 0x01016118: 0x1016118: sll   zero, zero, 0
-// 0x0101611c: 0x101611c: jr    ra addiu sp, sp, 24
+// 0x01016124: 0x1016124: lw    ra, 20(sp)
+// 0x01016128: 0x1016128: sll   zero, zero, 0
+// 0x0101612c: 0x101612c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2315,7 +2315,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_option_set_geometry1_1016124(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_geometry1_1016134(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2350,20 +2350,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1016124:
-// 0x01016124: 0x1016124: addu  a1, a0, zero
+L_1016134:
+// 0x01016134: 0x1016134: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01016128: 0x1016128: lui   a0, 0x0
+// 0x01016138: 0x1016138: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101612c: 0x101612c: addiu sp, sp, -24
+// 0x0101613c: 0x101613c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016130: 0x1016130: sw    ra, 20(sp)
-// 0x01016134: 0x1016134: jal   0x100e5c0 addiu a0, a0, 2312
+// 0x01016140: 0x1016140: sw    ra, 20(sp)
+// 0x01016144: 0x1016144: jal   0x100e5d0 addiu a0, a0, 2312
 	ldloc.1
 	ldc.i4 2312
 	add
@@ -2373,14 +2373,14 @@ L_1016124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101613c: 0x101613c: lw    ra, 20(sp)
-// 0x01016140: 0x1016140: sll   zero, zero, 0
-// 0x01016144: 0x1016144: jr    ra addiu sp, sp, 24
+// 0x0101614c: 0x101614c: lw    ra, 20(sp)
+// 0x01016150: 0x1016150: sll   zero, zero, 0
+// 0x01016154: 0x1016154: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2392,7 +2392,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_option_set_imperial_101614c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_imperial_101615c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2427,25 +2427,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_101614c:
-// 0x0101614c: 0x101614c: lui   a0, 0x0
+L_101615c:
+// 0x0101615c: 0x101615c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016150: 0x1016150: lui   a1, 0x0
+// 0x01016160: 0x1016160: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016154: 0x1016154: addiu sp, sp, -24
+// 0x01016164: 0x1016164: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016158: 0x1016158: addiu a0, a0, 2328
+// 0x01016168: 0x1016168: addiu a0, a0, 2328
 	ldloc.1
 	ldc.i4 2328
 	add
 	stloc.1
-// 0x0101615c: 0x101615c: sw    ra, 20(sp)
-// 0x01016160: 0x1016160: jal   0x100e5c0 addiu a1, a1, 28376
+// 0x0101616c: 0x101616c: sw    ra, 20(sp)
+// 0x01016170: 0x1016170: jal   0x100e5d0 addiu a1, a1, 28376
 	ldloc.2
 	ldc.i4 28376
 	add
@@ -2455,14 +2455,14 @@ L_101614c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01016168: 0x1016168: lw    ra, 20(sp)
-// 0x0101616c: 0x101616c: sll   zero, zero, 0
-// 0x01016170: 0x1016170: jr    ra addiu sp, sp, 24
+// 0x01016178: 0x1016178: lw    ra, 20(sp)
+// 0x0101617c: 0x101617c: sll   zero, zero, 0
+// 0x01016180: 0x1016180: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2474,7 +2474,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_option_set_metric_1016178(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_metric_1016188(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2509,27 +2509,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1016178:
-// 0x01016178: 0x1016178: lui   a0, 0x0
+L_1016188:
+// 0x01016188: 0x1016188: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101617c: 0x101617c: lui   a1, 0x20000
+// 0x0101618c: 0x101618c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01016180: 0x1016180: addiu sp, sp, -24
+// 0x01016190: 0x1016190: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016184: 0x1016184: addiu a0, a0, 2328
+// 0x01016194: 0x1016194: addiu a0, a0, 2328
 	ldloc.1
 	ldc.i4 2328
 	add
 	stloc.1
-// 0x01016188: 0x1016188: sw    ra, 20(sp)
-// 0x0101618c: 0x101618c: jal   0x100e5c0 addiu a1, a1, 6872
+// 0x01016198: 0x1016198: sw    ra, 20(sp)
+// 0x0101619c: 0x101619c: jal   0x100e5d0 addiu a1, a1, 7336
 	ldloc.2
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc.2
 	ldloc.0
@@ -2537,14 +2537,14 @@ L_1016178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01016194: 0x1016194: lw    ra, 20(sp)
-// 0x01016198: 0x1016198: sll   zero, zero, 0
-// 0x0101619c: 0x101619c: jr    ra addiu sp, sp, 24
+// 0x010161a4: 0x10161a4: lw    ra, 20(sp)
+// 0x010161a8: 0x10161a8: sll   zero, zero, 0
+// 0x010161ac: 0x10161ac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2556,7 +2556,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_option_set_location_10161a4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_location_10161b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2591,20 +2591,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10161a4:
-// 0x010161a4: 0x10161a4: addu  a1, a0, zero
+L_10161b4:
+// 0x010161b4: 0x10161b4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010161a8: 0x10161a8: lui   a0, 0x0
+// 0x010161b8: 0x10161b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010161ac: 0x10161ac: addiu sp, sp, -24
+// 0x010161bc: 0x10161bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010161b0: 0x10161b0: sw    ra, 20(sp)
-// 0x010161b4: 0x10161b4: jal   0x100e5c0 addiu a0, a0, 2344
+// 0x010161c0: 0x10161c0: sw    ra, 20(sp)
+// 0x010161c4: 0x10161c4: jal   0x100e5d0 addiu a0, a0, 2344
 	ldloc.1
 	ldc.i4 2344
 	add
@@ -2614,14 +2614,14 @@ L_10161a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010161bc: 0x10161bc: lw    ra, 20(sp)
-// 0x010161c0: 0x10161c0: sll   zero, zero, 0
-// 0x010161c4: 0x10161c4: jr    ra addiu sp, sp, 24
+// 0x010161cc: 0x10161cc: lw    ra, 20(sp)
+// 0x010161d0: 0x10161d0: sll   zero, zero, 0
+// 0x010161d4: 0x10161d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2633,7 +2633,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_option_set_gps_10161cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_gps_10161dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2671,25 +2671,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10161cc:
-// 0x010161cc: 0x10161cc: lui   v0, 0x30000
+L_10161dc:
+// 0x010161dc: 0x10161dc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010161d0: 0x10161d0: lw    v0, -28472(v0)
+// 0x010161e0: 0x10161e0: lw    v0, -28008(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7118
+	ldc.i4 -7002
 	add
 	ldelem.i4
 	stloc 5
-// 0x010161d4: 0x10161d4: addiu sp, sp, -24
+// 0x010161e4: 0x10161e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010161d8: 0x10161d8: sw    s0, 16(sp)
+// 0x010161e8: 0x10161e8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2698,14 +2698,14 @@ L_10161cc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010161dc: 0x10161dc: sw    ra, 20(sp)
-// 0x010161e0: 0x10161e0: beq   v0, zero, 0x10161f0 addu  s0, a0, zero
+// 0x010161ec: 0x10161ec: sw    ra, 20(sp)
+// 0x010161f0: 0x10161f0: beq   v0, zero, 0x1016200 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_10161f0
+	brfalse L_1016200
 // --- basic block ---
-// 0x010161e8: 0x10161e8: jal   0x1000930 addu  a0, v0, zero
+// 0x010161f8: 0x10161f8: jal   0x1000930 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2718,8 +2718,8 @@ L_10161cc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10161f0:
-// 0x010161f0: 0x10161f0: jal   0x1001ba8 addu  a0, s0, zero
+L_1016200:
+// 0x01016200: 0x1016200: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2732,11 +2732,11 @@ L_10161f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010161f8: 0x10161f8: lw    ra, 20(sp)
-// 0x010161fc: 0x10161fc: lui   v1, 0x30000
+// 0x01016208: 0x1016208: lw    ra, 20(sp)
+// 0x0101620c: 0x101620c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01016200: 0x1016200: lw    s0, 16(sp)
+// 0x01016210: 0x1016210: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2745,16 +2745,16 @@ L_10161f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01016204: 0x1016204: sw    v0, -28472(v1)
+// 0x01016214: 0x1016214: sw    v0, -28008(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7118
+	ldc.i4 -7002
 	add
 	ldloc 5
 	stelem.i4
-// 0x01016208: 0x1016208: jr    ra addiu sp, sp, 24
+// 0x01016218: 0x1016218: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2766,7 +2766,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_option_set_fastforward_1016210(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_fastforward_1016220(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 ra,int32[] mem,int32 v0)
@@ -2801,29 +2801,29 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1016210:
-// 0x01016210: 0x1016210: addiu sp, sp, -24
+L_1016220:
+// 0x01016220: 0x1016220: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016214: 0x1016214: sw    ra, 20(sp)
-// 0x01016218: 0x1016218: jal   0x10c1c60 sll   zero, zero, 0
+// 0x01016224: 0x1016224: sw    ra, 20(sp)
+// 0x01016228: 0x1016228: jal   0x10c22a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::atof_10c1c60(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::atof_10c22a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x01016220: 0x1016220: lw    ra, 20(sp)
-// 0x01016224: 0x1016224: lui   v1, 0x0
+// 0x01016230: 0x1016230: lw    ra, 20(sp)
+// 0x01016234: 0x1016234: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01016228: 0x1016228: sw    v0, 2308(v1)
+// 0x01016238: 0x1016238: sw    v0, 2308(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2832,7 +2832,7 @@ L_1016210:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101622c: 0x101622c: jr    ra addiu sp, sp, 24
+// 0x0101623c: 0x101623c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2844,7 +2844,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_option_set_geometry2_1016234(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_set_geometry2_1016244(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -2885,13 +2885,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1016234:
-// 0x01016234: 0x1016234: addiu sp, sp, -312
+L_1016244:
+// 0x01016244: 0x1016244: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x01016238: 0x1016238: sw    s1, 304(sp)
+// 0x01016248: 0x1016248: sw    s1, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2900,7 +2900,7 @@ L_1016234:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101623c: 0x101623c: sw    s0, 300(sp)
+// 0x0101624c: 0x101624c: sw    s0, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2909,22 +2909,22 @@ L_1016234:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01016240: 0x1016240: addu  s1, a0, zero
+// 0x01016250: 0x1016250: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01016244: 0x1016244: addiu s0, sp, 40
+// 0x01016254: 0x1016254: addiu s0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 9
-// 0x01016248: 0x1016248: addu  a0, s0, zero
+// 0x01016258: 0x1016258: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0101624c: 0x101624c: addu  a1, s1, zero
+// 0x0101625c: 0x101625c: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x01016250: 0x1016250: sw    ra, 308(sp)
-// 0x01016254: 0x1016254: jal   0x1001af8 addiu a2, zero, 256
+// 0x01016260: 0x1016260: sw    ra, 308(sp)
+// 0x01016264: 0x1016264: jal   0x1001af8 addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
 	ldloc.1
@@ -2933,13 +2933,13 @@ L_1016234:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101625c: 0x101625c: addu  a0, s0, zero
+// 0x0101626c: 0x101626c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01016260: 0x1016260: addiu a1, zero, 61
+// 0x01016270: 0x1016270: addiu a1, zero, 61
 	ldc.i4.s 61
 	stloc.2
-// 0x01016264: 0x1016264: jal   0x1001a5c sb    zero, 295(sp)
+// 0x01016274: 0x1016274: jal   0x1001a5c sb    zero, 295(sp)
 	ldloc.0
 	ldc.i4 295
 	add
@@ -2952,35 +2952,35 @@ L_1016234:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101626c: 0x101626c: bne   v0, zero, 0x1016294 addu  s0, v0, zero
+// 0x0101627c: 0x101627c: bne   v0, zero, 0x10162a4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1016294
+	brtrue L_10162a4
 // --- basic block ---
-// 0x01016274: 0x1016274: lui   a1, 0x0
+// 0x01016284: 0x1016284: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016278: 0x1016278: lui   a3, 0x0
+// 0x01016288: 0x1016288: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101627c: 0x101627c: addiu a1, a1, 28260
+// 0x0101628c: 0x101628c: addiu a1, a1, 28260
 	ldloc.2
 	ldc.i4 28260
 	add
 	stloc.2
-// 0x01016280: 0x1016280: addiu a3, a3, 28388
+// 0x01016290: 0x1016290: addiu a3, a3, 28388
 	ldloc 4
 	ldc.i4 28388
 	add
 	stloc 4
-// 0x01016284: 0x1016284: addiu a0, zero, 5
+// 0x01016294: 0x1016294: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01016288: 0x1016288: addiu a2, zero, 209
+// 0x01016298: 0x1016298: addiu a2, zero, 209
 	ldc.i4 209
 	stloc.3
-// 0x0101628c: 0x101628c: jal   0x100449c sw    s1, 16(sp)
+// 0x0101629c: 0x101629c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2999,17 +2999,17 @@ L_1016234:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1016294:
-// 0x01016294: 0x1016294: sb    zero, 0(s0)
+L_10162a4:
+// 0x010162a4: 0x10162a4: sb    zero, 0(s0)
 	ldloc 9
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01016298: 0x1016298: addiu a0, sp, 40
+// 0x010162a8: 0x10162a8: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0101629c: 0x101629c: jal   0x1001a5c addiu a1, zero, 45
+// 0x010162ac: 0x10162ac: jal   0x1001a5c addiu a1, zero, 45
 	ldc.i4.s 45
 	stloc.2
 	ldloc.1
@@ -3019,13 +3019,13 @@ L_1016294:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010162a4: 0x10162a4: j	 0x10162b4 addiu s1, zero, 32
+// 0x010162b4: 0x10162b4: j	 0x10162c4 addiu s1, zero, 32
 	ldc.i4.s 32
 	stloc 7
-	br L_10162b4
+	br L_10162c4
 // --- basic block ---
-L_10162ac:
-// 0x010162ac: 0x10162ac: jal   0x1001a5c sb    s1, 0(v0)
+L_10162bc:
+// 0x010162bc: 0x10162bc: jal   0x1001a5c sb    s1, 0(v0)
 	ldloc 5
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -3036,35 +3036,35 @@ L_10162ac:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10162b4:
-// 0x010162b4: 0x10162b4: addu  a0, v0, zero
+L_10162c4:
+// 0x010162c4: 0x10162c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010162b8: 0x10162b8: bne   v0, zero, 0x10162ac addiu a1, zero, 45
+// 0x010162c8: 0x10162c8: bne   v0, zero, 0x10162bc addiu a1, zero, 45
 	ldloc 5
 	ldc.i4.s 45
 	stloc.2
-	brtrue L_10162ac
+	brtrue L_10162bc
 // --- basic block ---
-// 0x010162c0: 0x10162c0: lui   v0, 0x0
+// 0x010162d0: 0x10162d0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010162c4: 0x10162c4: addiu a0, sp, 40
+// 0x010162d4: 0x10162d4: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010162c8: 0x10162c8: addiu v0, v0, 28424
+// 0x010162d8: 0x10162d8: addiu v0, v0, 28424
 	ldloc 5
 	ldc.i4 28424
 	add
 	stloc 5
-// 0x010162cc: 0x10162cc: addiu s1, sp, 24
+// 0x010162dc: 0x10162dc: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x010162d0: 0x10162d0: jal   0x1001ba8 sw    v0, 24(sp)
+// 0x010162e0: 0x10162e0: jal   0x1001ba8 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3083,29 +3083,29 @@ L_10162b4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010162d8: 0x10162d8: lui   a0, 0x10000
+// 0x010162e8: 0x10162e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010162dc: 0x10162dc: lui   a2, 0x0
+// 0x010162ec: 0x10162ec: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010162e0: 0x10162e0: addu  a1, s1, zero
+// 0x010162f0: 0x10162f0: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x010162e4: 0x10162e4: addiu a0, a0, 12560
+// 0x010162f4: 0x10162f4: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010162e8: 0x10162e8: addiu a2, a2, 28436
+// 0x010162f8: 0x10162f8: addiu a2, a2, 28436
 	ldloc.3
 	ldc.i4 28436
 	add
 	stloc.3
-// 0x010162ec: 0x10162ec: addu  a3, zero, zero
+// 0x010162fc: 0x10162fc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010162f0: 0x10162f0: sw    v0, 28(sp)
+// 0x01016300: 0x1016300: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3114,7 +3114,7 @@ L_10162b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010162f4: 0x10162f4: jal   0x100edb0 sw    zero, 36(sp)
+// 0x01016304: 0x1016304: jal   0x100edc0 sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3128,15 +3128,15 @@ L_10162b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010162fc: 0x10162fc: addu  a0, s1, zero
+// 0x0101630c: 0x101630c: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x01016300: 0x1016300: jal   0x100e5c0 addiu a1, s0, 1
+// 0x01016310: 0x1016310: jal   0x100e5d0 addiu a1, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -3146,13 +3146,13 @@ L_10162b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01016308: 0x1016308: lw    ra, 308(sp)
-// 0x0101630c: 0x101630c: lw    s1, 304(sp)
+// 0x01016318: 0x1016318: lw    ra, 308(sp)
+// 0x0101631c: 0x101631c: lw    s1, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3161,7 +3161,7 @@ L_10162b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01016310: 0x1016310: lw    s0, 300(sp)
+// 0x01016320: 0x1016320: lw    s0, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3170,7 +3170,7 @@ L_10162b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01016314: 0x1016314: jr    ra addiu sp, sp, 312
+// 0x01016324: 0x1016324: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
@@ -3182,7 +3182,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_option_height_101631c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_height_101632c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3217,15 +3217,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101631c: 0x101631c: addiu sp, sp, -40
+// 0x0101632c: 0x101632c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01016320: 0x1016320: lui   v0, 0x0
+// 0x01016330: 0x1016330: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01016324: 0x1016324: sw    a0, 20(sp)
+// 0x01016334: 0x1016334: sw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3234,18 +3234,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01016328: 0x1016328: addiu v0, v0, 28424
+// 0x01016338: 0x1016338: addiu v0, v0, 28424
 	ldloc 5
 	ldc.i4 28424
 	add
 	stloc 5
-// 0x0101632c: 0x101632c: addiu a0, sp, 16
+// 0x0101633c: 0x101633c: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01016330: 0x1016330: sw    ra, 36(sp)
-// 0x01016334: 0x1016334: sw    v0, 16(sp)
+// 0x01016340: 0x1016340: sw    ra, 36(sp)
+// 0x01016344: 0x1016344: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3254,7 +3254,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01016338: 0x1016338: jal   0x100e348 sw    zero, 28(sp)
+// 0x01016348: 0x1016348: jal   0x100e358 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3268,15 +3268,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01016340: 0x1016340: addu  a0, v0, zero
+// 0x01016350: 0x1016350: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01016344: 0x1016344: jal   0x1001a5c addiu a1, zero, 120
+// 0x01016354: 0x1016354: jal   0x1001a5c addiu a1, zero, 120
 	ldc.i4.s 120
 	stloc.2
 	ldloc.1
@@ -3286,16 +3286,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101634c: 0x101634c: addu  a0, v0, zero
+// 0x0101635c: 0x101635c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01016350: 0x1016350: beq   a0, zero, 0x1016360 addiu v0, zero, 200
+// 0x01016360: 0x1016360: beq   a0, zero, 0x1016370 addiu v0, zero, 200
 	ldloc.1
 	ldc.i4 200
 	stloc 5
-	brfalse L_1016360
+	brfalse L_1016370
 // --- basic block ---
-// 0x01016358: 0x1016358: jal   0x1000d8c addiu a0, a0, 1
+// 0x01016368: 0x1016368: jal   0x1000d8c addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
@@ -3310,10 +3310,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1016360:
-// 0x01016360: 0x1016360: lw    ra, 36(sp)
-// 0x01016364: 0x1016364: sll   zero, zero, 0
-// 0x01016368: 0x1016368: jr    ra addiu sp, sp, 40
+L_1016370:
+// 0x01016370: 0x1016370: lw    ra, 36(sp)
+// 0x01016374: 0x1016374: sll   zero, zero, 0
+// 0x01016378: 0x1016378: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3325,7 +3325,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_option_width_1016370(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_option_width_1016380(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3360,15 +3360,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016370: 0x1016370: addiu sp, sp, -40
+// 0x01016380: 0x1016380: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01016374: 0x1016374: lui   v0, 0x0
+// 0x01016384: 0x1016384: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01016378: 0x1016378: sw    a0, 20(sp)
+// 0x01016388: 0x1016388: sw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3377,18 +3377,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101637c: 0x101637c: addiu v0, v0, 28424
+// 0x0101638c: 0x101638c: addiu v0, v0, 28424
 	ldloc 5
 	ldc.i4 28424
 	add
 	stloc 5
-// 0x01016380: 0x1016380: addiu a0, sp, 16
+// 0x01016390: 0x1016390: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01016384: 0x1016384: sw    ra, 36(sp)
-// 0x01016388: 0x1016388: sw    v0, 16(sp)
+// 0x01016394: 0x1016394: sw    ra, 36(sp)
+// 0x01016398: 0x1016398: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3397,7 +3397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101638c: 0x101638c: jal   0x100e348 sw    zero, 28(sp)
+// 0x0101639c: 0x101639c: jal   0x100e358 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3411,25 +3411,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01016394: 0x1016394: beq   v0, zero, 0x10163bc sll   zero, zero, 0
+// 0x010163a4: 0x10163a4: beq   v0, zero, 0x10163cc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10163bc
+	brfalse L_10163cc
 // --- basic block ---
-// 0x0101639c: 0x101639c: lb    v1, 0(v0)
+// 0x010163ac: 0x10163ac: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010163a0: 0x10163a0: sll   zero, zero, 0
-// 0x010163a4: 0x10163a4: beq   v1, zero, 0x10163bc sll   zero, zero, 0
+// 0x010163b0: 0x10163b0: sll   zero, zero, 0
+// 0x010163b4: 0x10163b4: beq   v1, zero, 0x10163cc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10163bc
+	brfalse L_10163cc
 // --- basic block ---
-// 0x010163ac: 0x10163ac: jal   0x1000d8c addu  a0, v0, zero
+// 0x010163bc: 0x10163bc: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3442,17 +3442,17 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010163b4: 0x10163b4: j	 0x10163c0 sll   zero, zero, 0
-	br L_10163c0
+// 0x010163c4: 0x10163c4: j	 0x10163d0 sll   zero, zero, 0
+	br L_10163d0
 // --- basic block ---
-L_10163bc:
-// 0x010163bc: 0x10163bc: addiu v0, zero, 300
+L_10163cc:
+// 0x010163cc: 0x10163cc: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-L_10163c0:
-// 0x010163c0: 0x10163c0: lw    ra, 36(sp)
-// 0x010163c4: 0x10163c4: sll   zero, zero, 0
-// 0x010163c8: 0x10163c8: jr    ra addiu sp, sp, 40
+L_10163d0:
+// 0x010163d0: 0x10163d0: lw    ra, 36(sp)
+// 0x010163d4: 0x10163d4: sll   zero, zero, 0
+// 0x010163d8: 0x10163d8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3464,7 +3464,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_ticker_height_10163d0()
+.method public static int32 roadmap_ticker_height_10163e0()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3484,27 +3484,27 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010163d0: 0x10163d0: lui   v0, 0x30000
+// 0x010163e0: 0x10163e0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x010163d4: 0x10163d4: lw    v0, -28444(v0)
+// 0x010163e4: 0x10163e4: lw    v0, -27980(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7111
+	ldc.i4 -6995
 	add
 	ldelem.i4
 	stloc.0
-// 0x010163d8: 0x10163d8: sll   zero, zero, 0
-// 0x010163dc: 0x10163dc: beq   v0, zero, 0x1016404 sll   zero, zero, 0
+// 0x010163e8: 0x10163e8: sll   zero, zero, 0
+// 0x010163ec: 0x10163ec: beq   v0, zero, 0x1016414 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_1016404
+	brfalse L_1016414
 // --- basic block ---
-// 0x010163e4: 0x10163e4: lui   v0, 0x0
+// 0x010163f4: 0x10163f4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x010163e8: 0x10163e8: lw    v0, 2364(v0)
+// 0x010163f8: 0x10163f8: lw    v0, 2364(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -3513,32 +3513,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x010163ec: 0x10163ec: sll   zero, zero, 0
-// 0x010163f0: 0x10163f0: bltz  v0, 0x1016404 lui   v1, 0x30000
+// 0x010163fc: 0x10163fc: sll   zero, zero, 0
+// 0x01016400: 0x1016400: bltz  v0, 0x1016414 lui   v1, 0x30000
 	ldloc.0
 	ldc.i4 196608
 	stloc.1
 	ldc.i4.s 0
-	blt L_1016404
+	blt L_1016414
 // --- basic block ---
-// 0x010163f8: 0x10163f8: lw    v1, -28456(v1)
+// 0x01016408: 0x1016408: lw    v1, -27992(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc.1
-// 0x010163fc: 0x10163fc: jr    ra addu  v0, v0, v1
+// 0x0101640c: 0x101640c: jr    ra addu  v0, v0, v1
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1016404:
-// 0x01016404: 0x1016404: jr    ra addu  v0, zero, zero
+L_1016414:
+// 0x01016414: 0x1016414: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -3548,7 +3548,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_ticker_state_101640c()
+.method public static int32 roadmap_ticker_state_101641c()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3565,19 +3565,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101640c: 0x101640c: lui   v0, 0x30000
+// 0x0101641c: 0x101641c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x01016410: 0x1016410: lw    v0, -28444(v0)
+// 0x01016420: 0x1016420: lw    v0, -27980(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7111
+	ldc.i4 -6995
 	add
 	ldelem.i4
 	stloc.0
-// 0x01016414: 0x1016414: jr    ra sltu  v0, zero, v0
+// 0x01016424: 0x1016424: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
@@ -3587,7 +3587,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_ticker_set_last_event_101641c(int32)
+.method public static int32 roadmap_ticker_set_last_event_101642c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -3607,15 +3607,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101641c: 0x101641c: lui   v0, 0x30000
+// 0x0101642c: 0x101642c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01016420: 0x1016420: jr    ra sw    a0, -28452(v0)
+// 0x01016430: 0x1016430: jr    ra sw    a0, -27988(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7113
+	ldc.i4 -6997
 	add
 	ldloc.0
 	stelem.i4
@@ -3624,7 +3624,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_ticker_set_suppress_hide_1016438(int32)
+.method public static int32 roadmap_ticker_set_suppress_hide_1016448(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -3644,15 +3644,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016438: 0x1016438: lui   v0, 0x30000
+// 0x01016448: 0x1016448: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101643c: 0x101643c: jr    ra sw    a0, -28460(v0)
+// 0x0101644c: 0x101644c: jr    ra sw    a0, -27996(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7115
+	ldc.i4 -6999
 	add
 	ldloc.0
 	stelem.i4
@@ -3661,7 +3661,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_ticker_show_1016444(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_ticker_show_1016454(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3696,38 +3696,38 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1016444:
-// 0x01016444: 0x1016444: addiu sp, sp, -280
+L_1016454:
+// 0x01016454: 0x1016454: addiu sp, sp, -280
 	ldloc.0
 	ldc.i4 -280
 	add
 	stloc.0
-// 0x01016448: 0x1016448: lui   a2, 0x0
+// 0x01016458: 0x1016458: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101644c: 0x101644c: lui   v0, 0x30000
+// 0x0101645c: 0x101645c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01016450: 0x1016450: addiu a2, a2, 29696
+// 0x01016460: 0x1016460: addiu a2, a2, 29696
 	ldloc.3
 	ldc.i4 29696
 	add
 	stloc.3
-// 0x01016454: 0x1016454: addiu a0, sp, 16
+// 0x01016464: 0x1016464: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01016458: 0x1016458: addiu a1, zero, 256
+// 0x01016468: 0x1016468: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0101645c: 0x101645c: sw    ra, 276(sp)
-// 0x01016460: 0x1016460: jal   0x101afb8 sw    zero, -28448(v0)
+// 0x0101646c: 0x101646c: sw    ra, 276(sp)
+// 0x01016470: 0x1016470: jal   0x101afc8 sw    zero, -27984(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7112
+	ldc.i4 -6996
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3736,29 +3736,29 @@ L_1016444:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016468: 0x1016468: bne   v0, zero, 0x1016490 lui   v0, 0x30000
+// 0x01016478: 0x1016478: bne   v0, zero, 0x10164a0 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1016490
+	brtrue L_10164a0
 // --- basic block ---
-// 0x01016470: 0x1016470: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x01016480: 0x1016480: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01016474: 0x1016474: addiu a1, a1, -13884
+// 0x01016484: 0x1016484: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01016478: 0x1016478: addiu a0, zero, 42
+// 0x01016488: 0x1016488: addiu a0, zero, 42
 	ldc.i4.s 42
 	stloc.1
-// 0x0101647c: 0x101647c: jal   0x101aec4 addu  a2, zero, zero
+// 0x0101648c: 0x101648c: jal   0x101aed4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3766,49 +3766,49 @@ L_1016444:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016484: 0x1016484: lui   v0, 0x30000
+// 0x01016494: 0x1016494: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01016488: 0x1016488: sw    zero, -28452(v0)
+// 0x01016498: 0x1016498: sw    zero, -27988(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7113
+	ldc.i4 -6997
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101648c: 0x101648c: lui   v0, 0x30000
+// 0x0101649c: 0x101649c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_1016490:
-// 0x01016490: 0x1016490: lw    v0, -28460(v0)
+L_10164a0:
+// 0x010164a0: 0x10164a0: lw    v0, -27996(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7115
+	ldc.i4 -6999
 	add
 	ldelem.i4
 	stloc 5
-// 0x01016494: 0x1016494: sll   zero, zero, 0
-// 0x01016498: 0x1016498: beq   v0, zero, 0x10164b0 lui   a1, 0x1010000
+// 0x010164a4: 0x10164a4: sll   zero, zero, 0
+// 0x010164a8: 0x10164a8: beq   v0, zero, 0x10164c0 lui   a1, 0x1010000
 	ldloc 5
 	ldc.i4 16842752
 	stloc.2
-	brfalse L_10164b0
+	brfalse L_10164c0
 // --- basic block ---
-// 0x010164a0: 0x10164a0: lui   a0, 0x1010000
+// 0x010164b0: 0x10164b0: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x010164a4: 0x10164a4: jal   0x104fd00 addiu a0, a0, 25892
+// 0x010164b4: 0x10164b4: jal   0x104fd10 addiu a0, a0, 25908
 	ldloc.1
-	ldc.i4 25892
+	ldc.i4 25908
 	add
 	stloc.1
 	ldloc.0
@@ -3816,21 +3816,21 @@ L_1016490:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010164ac: 0x10164ac: lui   a1, 0x1010000
+// 0x010164bc: 0x10164bc: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-L_10164b0:
-// 0x010164b0: 0x10164b0: addiu a1, a1, 25892
+L_10164c0:
+// 0x010164c0: 0x10164c0: addiu a1, a1, 25908
 	ldloc.2
-	ldc.i4 25892
+	ldc.i4 25908
 	add
 	stloc.2
-// 0x010164b4: 0x10164b4: jal   0x104fe98 addiu a0, zero, 15000
+// 0x010164c4: 0x10164c4: jal   0x104fea8 addiu a0, zero, 15000
 	ldc.i4 15000
 	stloc.1
 	ldloc.0
@@ -3838,23 +3838,23 @@ L_10164b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010164bc: 0x10164bc: addiu v1, zero, 1
+// 0x010164cc: 0x10164cc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010164c0: 0x10164c0: lui   v0, 0x30000
+// 0x010164d0: 0x10164d0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010164c4: 0x10164c4: jal   0x102146c sw    v1, -28460(v0)
+// 0x010164d4: 0x10164d4: jal   0x102147c sw    v1, -27996(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7115
+	ldc.i4 -6999
 	add
 	ldloc 6
 	stelem.i4
@@ -3863,30 +3863,30 @@ L_10164b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010164cc: 0x10164cc: bne   v0, zero, 0x10164dc sll   zero, zero, 0
+// 0x010164dc: 0x10164dc: bne   v0, zero, 0x10164ec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10164dc
+	brtrue L_10164ec
 // --- basic block ---
-// 0x010164d4: 0x10164d4: jal   0x1021900 sll   zero, zero, 0
+// 0x010164e4: 0x10164e4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10164dc:
-// 0x010164dc: 0x10164dc: lw    ra, 276(sp)
-// 0x010164e0: 0x10164e0: sll   zero, zero, 0
-// 0x010164e4: 0x10164e4: jr    ra addiu sp, sp, 280
+L_10164ec:
+// 0x010164ec: 0x10164ec: lw    ra, 276(sp)
+// 0x010164f0: 0x10164f0: sll   zero, zero, 0
+// 0x010164f4: 0x10164f4: jr    ra addiu sp, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
@@ -3898,7 +3898,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_ticker_hide_10164ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_ticker_hide_10164fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3933,25 +3933,25 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10164ec:
-// 0x010164ec: 0x10164ec: addiu sp, sp, -24
+L_10164fc:
+// 0x010164fc: 0x10164fc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010164f0: 0x10164f0: addiu v1, zero, 1
+// 0x01016500: 0x1016500: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010164f4: 0x10164f4: lui   v0, 0x30000
+// 0x01016504: 0x1016504: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010164f8: 0x10164f8: sw    ra, 20(sp)
-// 0x010164fc: 0x10164fc: jal   0x102146c sw    v1, -28448(v0)
+// 0x01016508: 0x1016508: sw    ra, 20(sp)
+// 0x0101650c: 0x101650c: jal   0x102147c sw    v1, -27984(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7112
+	ldc.i4 -6996
 	add
 	ldloc 6
 	stelem.i4
@@ -3960,30 +3960,30 @@ L_10164ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016504: 0x1016504: bne   v0, zero, 0x1016514 sll   zero, zero, 0
+// 0x01016514: 0x1016514: bne   v0, zero, 0x1016524 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1016514
+	brtrue L_1016524
 // --- basic block ---
-// 0x0101650c: 0x101650c: jal   0x1021900 sll   zero, zero, 0
+// 0x0101651c: 0x101651c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1016514:
-// 0x01016514: 0x1016514: lw    ra, 20(sp)
-// 0x01016518: 0x1016518: sll   zero, zero, 0
-// 0x0101651c: 0x101651c: jr    ra addiu sp, sp, 24
+L_1016524:
+// 0x01016524: 0x1016524: lw    ra, 20(sp)
+// 0x01016528: 0x1016528: sll   zero, zero, 0
+// 0x0101652c: 0x101652c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3995,7 +3995,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_ticker_supress_hide_1016524(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_ticker_supress_hide_1016534(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4030,21 +4030,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016524: 0x1016524: addiu sp, sp, -24
+// 0x01016534: 0x1016534: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016528: 0x1016528: lui   v0, 0x30000
+// 0x01016538: 0x1016538: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101652c: 0x101652c: sw    ra, 20(sp)
-// 0x01016530: 0x1016530: jal   0x102146c sw    zero, -28460(v0)
+// 0x0101653c: 0x101653c: sw    ra, 20(sp)
+// 0x01016540: 0x1016540: jal   0x102147c sw    zero, -27996(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7115
+	ldc.i4 -6999
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4053,33 +4053,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016538: 0x1016538: bne   v0, zero, 0x1016548 sll   zero, zero, 0
+// 0x01016548: 0x1016548: bne   v0, zero, 0x1016558 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1016548
+	brtrue L_1016558
 // --- basic block ---
-// 0x01016540: 0x1016540: jal   0x1021900 sll   zero, zero, 0
+// 0x01016550: 0x1016550: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1016548:
-// 0x01016548: 0x1016548: lui   a0, 0x1010000
+L_1016558:
+// 0x01016558: 0x1016558: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x0101654c: 0x101654c: jal   0x104fd00 addiu a0, a0, 25892
+// 0x0101655c: 0x101655c: jal   0x104fd10 addiu a0, a0, 25908
 	ldloc.1
-	ldc.i4 25892
+	ldc.i4 25908
 	add
 	stloc.1
 	ldloc.0
@@ -4087,14 +4087,14 @@ L_1016548:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016554: 0x1016554: lw    ra, 20(sp)
-// 0x01016558: 0x1016558: sll   zero, zero, 0
-// 0x0101655c: 0x101655c: jr    ra addiu sp, sp, 24
+// 0x01016564: 0x1016564: lw    ra, 20(sp)
+// 0x01016568: 0x1016568: sll   zero, zero, 0
+// 0x0101656c: 0x101656c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4106,7 +4106,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_ticker_initialize_1016564(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_ticker_initialize_1016574(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4150,16 +4150,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016564: 0x1016564: addiu sp, sp, -40
+// 0x01016574: 0x1016574: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01016568: 0x1016568: lui   v0, 0x30000
+// 0x01016578: 0x1016578: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101656c: 0x101656c: sw    ra, 36(sp)
-// 0x01016570: 0x1016570: sw    s2, 32(sp)
+// 0x0101657c: 0x101657c: sw    ra, 36(sp)
+// 0x01016580: 0x1016580: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4168,7 +4168,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01016574: 0x1016574: sw    s1, 28(sp)
+// 0x01016584: 0x1016584: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4177,7 +4177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01016578: 0x1016578: sw    s0, 24(sp)
+// 0x01016588: 0x1016588: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4186,76 +4186,76 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101657c: 0x101657c: jal   0x101fa28 sw    zero, -28436(v0)
+// 0x0101658c: 0x101658c: jal   0x101fa38 sw    zero, -27972(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7109
+	ldc.i4 -6993
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01016584: 0x1016584: beq   v0, zero, 0x1016598 lui   a0, 0x20000
+// 0x01016594: 0x1016594: beq   v0, zero, 0x10165a8 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_1016598
+	brfalse L_10165a8
 // --- basic block ---
-// 0x0101658c: 0x101658c: addiu v1, zero, -5
+// 0x0101659c: 0x101659c: addiu v1, zero, -5
 	ldc.i4.s -5
 	stloc 6
-// 0x01016590: 0x1016590: lui   v0, 0x30000
+// 0x010165a0: 0x10165a0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01016594: 0x1016594: sw    v1, -28456(v0)
+// 0x010165a4: 0x10165a4: sw    v1, -27992(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldloc 6
 	stelem.i4
-L_1016598:
-// 0x01016598: 0x1016598: lui   a1, 0x0
+L_10165a8:
+// 0x010165a8: 0x10165a8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101659c: 0x101659c: lui   a3, 0x0
+// 0x010165ac: 0x10165ac: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010165a0: 0x10165a0: lui   v0, 0x20000
+// 0x010165b0: 0x10165b0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010165a4: 0x10165a4: addiu a0, a0, -26888
+// 0x010165b4: 0x10165b4: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010165a8: 0x10165a8: addiu a1, a1, 2368
+// 0x010165b8: 0x10165b8: addiu a1, a1, 2368
 	ldloc.2
 	ldc.i4 2368
 	add
 	stloc.2
-// 0x010165ac: 0x10165ac: addiu a3, a3, 20820
+// 0x010165bc: 0x10165bc: addiu a3, a3, 20820
 	ldloc 4
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x010165b0: 0x10165b0: addu  a2, zero, zero
+// 0x010165c0: 0x10165c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010165b4: 0x10165b4: addiu v0, v0, 9464
+// 0x010165c4: 0x10165c4: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x010165b8: 0x10165b8: lui   s0, 0x0
+// 0x010165c8: 0x10165c8: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010165bc: 0x10165bc: sw    v0, 16(sp)
+// 0x010165cc: 0x10165cc: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4264,7 +4264,7 @@ L_1016598:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010165c0: 0x10165c0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010165d0: 0x10165d0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4278,18 +4278,18 @@ L_1016598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010165c8: 0x10165c8: addu  a0, zero, zero
+// 0x010165d8: 0x10165d8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010165cc: 0x10165cc: addiu a1, zero, 1
+// 0x010165dc: 0x10165dc: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010165d0: 0x10165d0: jal   0x10a1918 addiu a2, s0, 29704
+// 0x010165e0: 0x10165e0: jal   0x10a1f60 addiu a2, s0, 29704
 	ldloc 8
 	ldc.i4 29704
 	add
@@ -4299,45 +4299,45 @@ L_1016598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010165d8: 0x10165d8: bne   v0, zero, 0x101660c addu  s1, v0, zero
+// 0x010165e8: 0x10165e8: bne   v0, zero, 0x101661c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_101660c
+	brtrue L_101661c
 // --- basic block ---
-// 0x010165e0: 0x10165e0: lui   a1, 0x0
+// 0x010165f0: 0x10165f0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010165e4: 0x10165e4: lui   a3, 0x0
+// 0x010165f4: 0x10165f4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010165e8: 0x10165e8: addiu s0, s0, 29704
+// 0x010165f8: 0x10165f8: addiu s0, s0, 29704
 	ldloc 8
 	ldc.i4 29704
 	add
 	stloc 8
-// 0x010165ec: 0x10165ec: addiu a1, a1, 29720
+// 0x010165fc: 0x10165fc: addiu a1, a1, 29720
 	ldloc.2
 	ldc.i4 29720
 	add
 	stloc.2
-// 0x010165f0: 0x10165f0: addiu a3, a3, 29748
+// 0x01016600: 0x1016600: addiu a3, a3, 29748
 	ldloc 4
 	ldc.i4 29748
 	add
 	stloc 4
-// 0x010165f4: 0x10165f4: addiu a0, zero, 4
+// 0x01016604: 0x1016604: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010165f8: 0x10165f8: addiu a2, zero, 367
+// 0x01016608: 0x1016608: addiu a2, zero, 367
 	ldc.i4 367
 	stloc.3
-// 0x010165fc: 0x10165fc: jal   0x100449c sw    s0, 16(sp)
+// 0x0101660c: 0x101660c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4356,26 +4356,26 @@ L_1016598:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016604: 0x1016604: j	 0x1016690 sll   zero, zero, 0
-	br L_1016690
+// 0x01016614: 0x1016614: j	 0x10166a0 sll   zero, zero, 0
+	br L_10166a0
 // --- basic block ---
-L_101660c:
-// 0x0101660c: 0x101660c: jal   0x104dffc addu  a0, v0, zero
+L_101661c:
+// 0x0101661c: 0x101661c: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016614: 0x1016614: addu  a0, s1, zero
+// 0x01016624: 0x1016624: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01016618: 0x1016618: lui   s1, 0x0
+// 0x01016628: 0x1016628: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0101661c: 0x101661c: jal   0x104e020 sw    v0, 2360(s1)
+// 0x0101662c: 0x101662c: jal   0x104e030 sw    v0, 2360(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4385,20 +4385,20 @@ L_101660c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016624: 0x1016624: addiu s1, s1, 2360
+// 0x01016634: 0x1016634: addiu s1, s1, 2360
 	ldloc 9
 	ldc.i4 2360
 	add
 	stloc 9
-// 0x01016628: 0x1016628: lui   s2, 0x30000
+// 0x01016638: 0x1016638: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 10
-// 0x0101662c: 0x101662c: jal   0x10423fc sw    v0, 4(s1)
+// 0x0101663c: 0x101663c: jal   0x104240c sw    v0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4407,34 +4407,34 @@ L_101660c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016634: 0x1016634: lw    v1, -28456(s2)
+// 0x01016644: 0x1016644: lw    v1, -27992(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016638: 0x1016638: lui   s0, 0x30000
+// 0x01016648: 0x1016648: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0101663c: 0x101663c: addu  v0, v0, v1
+// 0x0101664c: 0x101664c: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01016640: 0x1016640: addiu s0, s0, -28432
+// 0x01016650: 0x1016650: addiu s0, s0, -27968
 	ldloc 8
-	ldc.i4 -28432
+	ldc.i4 -27968
 	add
 	stloc 8
-// 0x01016644: 0x1016644: jal   0x10423fc sw    v0, 4(s0)
+// 0x01016654: 0x1016654: jal   0x104240c sw    v0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4443,21 +4443,21 @@ L_101660c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101664c: 0x101664c: lw    a0, -28456(s2)
+// 0x0101665c: 0x101665c: lw    a0, -27992(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc.1
-// 0x01016650: 0x1016650: lw    v1, 4(s1)
+// 0x01016660: 0x1016660: lw    v1, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4466,28 +4466,28 @@ L_101660c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016654: 0x1016654: addu  a1, zero, zero
+// 0x01016664: 0x1016664: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01016658: 0x1016658: addu  v1, a0, v1
+// 0x01016668: 0x1016668: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x0101665c: 0x101665c: addu  v0, v1, v0
+// 0x0101666c: 0x101666c: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01016660: 0x1016660: lui   a0, 0x0
+// 0x01016670: 0x1016670: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016664: 0x1016664: addiu a0, a0, 29788
+// 0x01016674: 0x1016674: addiu a0, a0, 29788
 	ldloc.1
 	ldc.i4 29788
 	add
 	stloc.1
-// 0x01016668: 0x1016668: jal   0x104ef00 sw    v0, 12(s0)
+// 0x01016678: 0x1016678: jal   0x104ef10 sw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4501,28 +4501,28 @@ L_101660c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016670: 0x1016670: lui   a0, 0x0
+// 0x01016680: 0x1016680: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016674: 0x1016674: lui   v1, 0x30000
+// 0x01016684: 0x1016684: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01016678: 0x1016678: addiu a0, a0, 29800
+// 0x01016688: 0x1016688: addiu a0, a0, 29800
 	ldloc.1
 	ldc.i4 29800
 	add
 	stloc.1
-// 0x0101667c: 0x101667c: jal   0x104edb0 sw    v0, -28440(v1)
+// 0x0101668c: 0x101668c: jal   0x104edc0 sw    v0, -27976(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7110
+	ldc.i4 -6994
 	add
 	ldloc 5
 	stelem.i4
@@ -4531,29 +4531,29 @@ L_101660c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016684: 0x1016684: addiu v1, zero, 1
+// 0x01016694: 0x1016694: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01016688: 0x1016688: lui   v0, 0x30000
+// 0x01016698: 0x1016698: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101668c: 0x101668c: sw    v1, -28436(v0)
+// 0x0101669c: 0x101669c: sw    v1, -27972(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7109
+	ldc.i4 -6993
 	add
 	ldloc 6
 	stelem.i4
-L_1016690:
-// 0x01016690: 0x1016690: lw    ra, 36(sp)
-// 0x01016694: 0x1016694: lw    s2, 32(sp)
+L_10166a0:
+// 0x010166a0: 0x10166a0: lw    ra, 36(sp)
+// 0x010166a4: 0x10166a4: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4562,7 +4562,7 @@ L_1016690:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01016698: 0x1016698: lw    s1, 28(sp)
+// 0x010166a8: 0x10166a8: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4571,7 +4571,7 @@ L_1016690:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101669c: 0x101669c: lw    s0, 24(sp)
+// 0x010166ac: 0x10166ac: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4580,7 +4580,7 @@ L_1016690:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010166a0: 0x10166a0: jr    ra addiu sp, sp, 40
+// 0x010166b0: 0x10166b0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4592,7 +4592,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ticker_cfg_on_10166a8(int32,int32,int32,int32,int32)
+.method public static int32 ticker_cfg_on_10166b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4627,24 +4627,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010166a8: 0x10166a8: lui   a0, 0x0
+// 0x010166b8: 0x10166b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010166ac: 0x10166ac: lui   a1, 0x0
+// 0x010166bc: 0x10166bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010166b0: 0x10166b0: addiu sp, sp, -24
+// 0x010166c0: 0x10166c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010166b4: 0x10166b4: addiu a0, a0, 2368
+// 0x010166c4: 0x10166c4: addiu a0, a0, 2368
 	ldloc.1
 	ldc.i4 2368
 	add
 	stloc.1
-// 0x010166b8: 0x10166b8: sw    ra, 20(sp)
-// 0x010166bc: 0x10166bc: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010166c8: 0x10166c8: sw    ra, 20(sp)
+// 0x010166cc: 0x10166cc: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4654,14 +4654,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010166c4: 0x10166c4: lw    ra, 20(sp)
-// 0x010166c8: 0x10166c8: sll   zero, zero, 0
-// 0x010166cc: 0x10166cc: jr    ra addiu sp, sp, 24
+// 0x010166d4: 0x10166d4: lw    ra, 20(sp)
+// 0x010166d8: 0x10166d8: sll   zero, zero, 0
+// 0x010166dc: 0x10166dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4673,7 +4673,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_ticker_display_10166d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_ticker_display_10166e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s5,int32 s3,int32 lo,int32 s1,int32 s4,int32 s6,int32 s7,int32 ra)
@@ -4735,13 +4735,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010166d4: 0x10166d4: addiu sp, sp, -400
+// 0x010166e4: 0x10166e4: addiu sp, sp, -400
 	ldloc.0
 	ldc.i4 -400
 	add
 	stloc.0
-// 0x010166d8: 0x10166d8: sw    ra, 396(sp)
-// 0x010166dc: 0x10166dc: sw    s7, 392(sp)
+// 0x010166e8: 0x10166e8: sw    ra, 396(sp)
+// 0x010166ec: 0x10166ec: sw    s7, 392(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4750,7 +4750,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010166e0: 0x10166e0: sw    s6, 388(sp)
+// 0x010166f0: 0x10166f0: sw    s6, 388(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4759,7 +4759,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010166e4: 0x10166e4: sw    s5, 384(sp)
+// 0x010166f4: 0x10166f4: sw    s5, 384(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4768,7 +4768,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010166e8: 0x10166e8: sw    s4, 380(sp)
+// 0x010166f8: 0x10166f8: sw    s4, 380(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4777,7 +4777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010166ec: 0x10166ec: sw    s3, 376(sp)
+// 0x010166fc: 0x10166fc: sw    s3, 376(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4786,7 +4786,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010166f0: 0x10166f0: sw    s2, 372(sp)
+// 0x01016700: 0x1016700: sw    s2, 372(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4795,7 +4795,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010166f4: 0x10166f4: sw    s1, 368(sp)
+// 0x01016704: 0x1016704: sw    s1, 368(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4804,7 +4804,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010166f8: 0x10166f8: jal   0x101fa28 sw    s0, 364(sp)
+// 0x01016708: 0x1016708: jal   0x101fa38 sw    s0, 364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4813,126 +4813,126 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01016700: 0x1016700: beq   v0, zero, 0x1016710 addiu s4, zero, 65
+// 0x01016710: 0x1016710: beq   v0, zero, 0x1016720 addiu s4, zero, 65
 	ldloc 5
 	ldc.i4.s 65
 	stloc 14
-	brfalse L_1016710
+	brfalse L_1016720
 // --- basic block ---
-// 0x01016708: 0x1016708: j	 0x1016718 addiu s1, zero, 22
+// 0x01016718: 0x1016718: j	 0x1016728 addiu s1, zero, 22
 	ldc.i4.s 22
 	stloc 13
-	br L_1016718
+	br L_1016728
 // --- basic block ---
-L_1016710:
-// 0x01016710: 0x1016710: addiu s4, zero, 50
+L_1016720:
+// 0x01016720: 0x1016720: addiu s4, zero, 50
 	ldc.i4.s 50
 	stloc 14
-// 0x01016714: 0x1016714: addiu s1, zero, 25
+// 0x01016724: 0x1016724: addiu s1, zero, 25
 	ldc.i4.s 25
 	stloc 13
-L_1016718:
-// 0x01016718: 0x1016718: lui   v0, 0x30000
+L_1016728:
+// 0x01016728: 0x1016728: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101671c: 0x101671c: lw    v0, -28436(v0)
+// 0x0101672c: 0x101672c: lw    v0, -27972(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7109
+	ldc.i4 -6993
 	add
 	ldelem.i4
 	stloc 5
-// 0x01016720: 0x1016720: lui   v1, 0xf0000
+// 0x01016730: 0x1016730: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x01016724: 0x1016724: lw    s0, -30068(v1)
+// 0x01016734: 0x1016734: lw    s0, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x01016728: 0x1016728: beq   v0, zero, 0x1016c7c sll   zero, zero, 0
+// 0x01016738: 0x1016738: beq   v0, zero, 0x1016c8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1016c7c
+	brfalse L_1016c8c
 // --- basic block ---
-// 0x01016730: 0x1016730: jal   0x10166a8 sll   zero, zero, 0
+// 0x01016740: 0x1016740: jal   0x10166b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::ticker_cfg_on_10166a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::ticker_cfg_on_10166b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016738: 0x1016738: bne   v0, zero, 0x1016754 lui   v0, 0x30000
+// 0x01016748: 0x1016748: bne   v0, zero, 0x1016764 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1016754
+	brtrue L_1016764
 // --- basic block ---
-// 0x01016740: 0x1016740: lui   v0, 0x30000
+// 0x01016750: 0x1016750: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01016744: 0x1016744: lw    v0, -28460(v0)
+// 0x01016754: 0x1016754: lw    v0, -27996(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7115
+	ldc.i4 -6999
 	add
 	ldelem.i4
 	stloc 5
-// 0x01016748: 0x1016748: sll   zero, zero, 0
-// 0x0101674c: 0x101674c: beq   v0, zero, 0x10167c4 lui   v0, 0x30000
+// 0x01016758: 0x1016758: sll   zero, zero, 0
+// 0x0101675c: 0x101675c: beq   v0, zero, 0x10167d4 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_10167c4
+	brfalse L_10167d4
 // --- basic block ---
-L_1016754:
-// 0x01016754: 0x1016754: lw    v0, -28448(v0)
+L_1016764:
+// 0x01016764: 0x1016764: lw    v0, -27984(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7112
+	ldc.i4 -6996
 	add
 	ldelem.i4
 	stloc 5
-// 0x01016758: 0x1016758: sll   zero, zero, 0
-// 0x0101675c: 0x101675c: bne   v0, zero, 0x10167c8 lui   v0, 0x30000
+// 0x01016768: 0x1016768: sll   zero, zero, 0
+// 0x0101676c: 0x101676c: bne   v0, zero, 0x10167d8 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_10167c8
+	brtrue L_10167d8
 // --- basic block ---
-// 0x01016764: 0x1016764: addiu s2, sp, 92
+// 0x01016774: 0x1016774: addiu s2, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc 8
-// 0x01016768: 0x1016768: lui   a2, 0x0
+// 0x01016778: 0x1016778: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101676c: 0x101676c: addiu a2, a2, 29808
+// 0x0101677c: 0x101677c: addiu a2, a2, 29808
 	ldloc.3
 	ldc.i4 29808
 	add
 	stloc.3
-// 0x01016770: 0x1016770: addu  a0, s2, zero
+// 0x01016780: 0x1016780: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01016774: 0x1016774: jal   0x101afb8 addiu a1, zero, 256
+// 0x01016784: 0x1016784: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -4940,45 +4940,45 @@ L_1016754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101677c: 0x101677c: bne   v0, zero, 0x10167d0 lui   v0, 0x30000
+// 0x0101678c: 0x101678c: bne   v0, zero, 0x10167e0 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_10167d0
+	brtrue L_10167e0
 // --- basic block ---
-// 0x01016784: 0x1016784: lw    v0, -28460(v0)
+// 0x01016794: 0x1016794: lw    v0, -27996(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7115
+	ldc.i4 -6999
 	add
 	ldelem.i4
 	stloc 5
-// 0x01016788: 0x1016788: sll   zero, zero, 0
-// 0x0101678c: 0x101678c: beq   v0, zero, 0x10167c8 lui   v0, 0x30000
+// 0x01016798: 0x1016798: sll   zero, zero, 0
+// 0x0101679c: 0x101679c: beq   v0, zero, 0x10167d8 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_10167c8
+	brfalse L_10167d8
 // --- basic block ---
-// 0x01016794: 0x1016794: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x010167a4: 0x10167a4: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01016798: 0x1016798: addiu a1, a1, -13884
+// 0x010167a8: 0x10167a8: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0101679c: 0x101679c: addu  a2, zero, zero
+// 0x010167ac: 0x10167ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010167a0: 0x10167a0: jal   0x101aec4 addiu a0, zero, 42
+// 0x010167b0: 0x10167b0: jal   0x101aed4 addiu a0, zero, 42
 	ldc.i4.s 42
 	stloc.1
 	ldloc.0
@@ -4986,23 +4986,23 @@ L_1016754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010167a8: 0x10167a8: lui   a2, 0x0
+// 0x010167b8: 0x10167b8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010167ac: 0x10167ac: addu  a0, s2, zero
+// 0x010167bc: 0x10167bc: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010167b0: 0x10167b0: addiu a2, a2, 29816
+// 0x010167c0: 0x10167c0: addiu a2, a2, 29816
 	ldloc.3
 	ldc.i4 29816
 	add
 	stloc.3
-// 0x010167b4: 0x10167b4: jal   0x101afb8 addiu a1, zero, 256
+// 0x010167c4: 0x10167c4: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -5010,73 +5010,73 @@ L_1016754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010167bc: 0x10167bc: j	 0x10167d4 addiu v1, zero, 1
+// 0x010167cc: 0x10167cc: j	 0x10167e4 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10167d4
+	br L_10167e4
 // --- basic block ---
-L_10167c4:
-// 0x010167c4: 0x10167c4: lui   v0, 0x30000
+L_10167d4:
+// 0x010167d4: 0x10167d4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_10167c8:
-// 0x010167c8: 0x10167c8: j	 0x1016c7c sw    zero, -28444(v0)
+L_10167d8:
+// 0x010167d8: 0x10167d8: j	 0x1016c8c sw    zero, -27980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7111
+	ldc.i4 -6995
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1016c7c
+	br L_1016c8c
 // --- basic block ---
-L_10167d0:
-// 0x010167d0: 0x10167d0: addiu v1, zero, 1
+L_10167e0:
+// 0x010167e0: 0x10167e0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_10167d4:
-// 0x010167d4: 0x10167d4: lui   v0, 0x30000
+L_10167e4:
+// 0x010167e4: 0x10167e4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010167d8: 0x10167d8: sw    v1, -28444(v0)
+// 0x010167e8: 0x10167e8: sw    v1, -27980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7111
+	ldc.i4 -6995
 	add
 	ldloc 6
 	stelem.i4
-// 0x010167dc: 0x10167dc: addiu a1, zero, 14
+// 0x010167ec: 0x10167ec: addiu a1, zero, 14
 	ldc.i4.s 14
 	stloc.2
-// 0x010167e0: 0x10167e0: addiu a2, sp, 24
+// 0x010167f0: 0x10167f0: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010167e4: 0x10167e4: addiu a3, sp, 28
+// 0x010167f4: 0x10167f4: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010167e8: 0x10167e8: addiu v0, sp, 32
+// 0x010167f8: 0x10167f8: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x010167ec: 0x10167ec: addiu a0, sp, 92
+// 0x010167fc: 0x10167fc: addiu a0, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.1
-// 0x010167f0: 0x10167f0: sw    v0, 16(sp)
+// 0x01016800: 0x1016800: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5085,7 +5085,7 @@ L_10167d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010167f4: 0x10167f4: jal   0x104e968 sw    zero, 20(sp)
+// 0x01016804: 0x1016804: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5099,58 +5099,58 @@ L_10167d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010167fc: 0x10167fc: lui   v0, 0x30000
+// 0x0101680c: 0x101680c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01016800: 0x1016800: lw    a0, -28440(v0)
+// 0x01016810: 0x1016810: lw    a0, -27976(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7110
+	ldc.i4 -6994
 	add
 	ldelem.i4
 	stloc.1
-// 0x01016804: 0x1016804: jal   0x104e35c sll   zero, zero, 0
+// 0x01016814: 0x1016814: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101680c: 0x101680c: lui   a2, 0x0
+// 0x0101681c: 0x101681c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01016810: 0x1016810: lui   v0, 0xf0000
+// 0x01016820: 0x1016820: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01016814: 0x1016814: addiu a2, a2, 29704
+// 0x01016824: 0x1016824: addiu a2, a2, 29704
 	ldloc.3
 	ldc.i4 29704
 	add
 	stloc.3
-// 0x01016818: 0x1016818: addu  a0, zero, zero
+// 0x01016828: 0x1016828: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0101681c: 0x101681c: lw    s7, -30068(v0)
+// 0x0101682c: 0x101682c: lw    s7, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 16
-// 0x01016820: 0x1016820: jal   0x10a1918 addiu a1, zero, 1
+// 0x01016830: 0x1016830: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5158,32 +5158,32 @@ L_10167d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016828: 0x1016828: beq   v0, zero, 0x1016880 addu  s3, v0, zero
+// 0x01016838: 0x1016838: beq   v0, zero, 0x1016890 addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brfalse L_1016880
+	brfalse L_1016890
 // --- basic block ---
-// 0x01016830: 0x1016830: addiu s2, zero, 1
+// 0x01016840: 0x1016840: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01016834: 0x1016834: lui   s6, 0x30000
+// 0x01016844: 0x1016844: lui   s6, 0x30000
 	ldc.i4 196608
 	stloc 15
-// 0x01016838: 0x1016838: j	 0x1016874 addiu s5, sp, 36
+// 0x01016848: 0x1016848: j	 0x1016884 addiu s5, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-	br L_1016874
+	br L_1016884
 // --- basic block ---
-L_1016840:
-// 0x01016840: 0x1016840: jal   0x10423fc sw    s2, 36(sp)
+L_1016850:
+// 0x01016850: 0x1016850: jal   0x104240c sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5192,38 +5192,38 @@ L_1016840:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016848: 0x1016848: lw    v1, -28456(s6)
+// 0x01016858: 0x1016858: lw    v1, -27992(s6)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101684c: 0x101684c: addu  a1, s5, zero
+// 0x0101685c: 0x101685c: addu  a1, s5, zero
 	ldloc 10
 	stloc.2
-// 0x01016850: 0x1016850: addu  v0, v0, v1
+// 0x01016860: 0x1016860: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01016854: 0x1016854: addu  a2, zero, zero
+// 0x01016864: 0x1016864: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01016858: 0x1016858: addu  a3, zero, zero
+// 0x01016868: 0x1016868: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101685c: 0x101685c: addu  a0, s3, zero
+// 0x0101686c: 0x101686c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01016860: 0x1016860: jal   0x104f4a8 sw    v0, 40(sp)
+// 0x01016870: 0x1016870: jal   0x104f4b8 sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5237,40 +5237,40 @@ L_1016840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016868: 0x1016868: jal   0x104dffc addu  a0, s3, zero
+// 0x01016878: 0x1016878: jal   0x104e00c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016870: 0x1016870: addu  s2, s2, v0
+// 0x01016880: 0x1016880: addu  s2, s2, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_1016874:
-// 0x01016874: 0x1016874: slt   v0, s2, s7
+L_1016884:
+// 0x01016884: 0x1016884: slt   v0, s2, s7
 	ldloc 8
 	ldloc 16
 	clt
 	stloc 5
-// 0x01016878: 0x1016878: bne   v0, zero, 0x1016840 sll   zero, zero, 0
+// 0x01016888: 0x1016888: bne   v0, zero, 0x1016850 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1016840
+	brtrue L_1016850
 // --- basic block ---
-L_1016880:
-// 0x01016880: 0x1016880: addu  a0, zero, zero
+L_1016890:
+// 0x01016890: 0x1016890: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01016884: 0x1016884: jal   0x109a424 sw    zero, 36(sp)
+// 0x01016894: 0x1016894: jal   0x109aa6c sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5284,36 +5284,36 @@ L_1016880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101688c: 0x101688c: beq   v0, zero, 0x10168ac addiu a1, zero, 1
+// 0x0101689c: 0x101689c: beq   v0, zero, 0x10168bc addiu a1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.2
-	brfalse L_10168ac
+	brfalse L_10168bc
 // --- basic block ---
-// 0x01016894: 0x1016894: lui   v0, 0xf0000
+// 0x010168a4: 0x10168a4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01016898: 0x1016898: lw    v0, -30068(v0)
+// 0x010168a8: 0x10168a8: lw    v0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101689c: 0x101689c: sll   zero, zero, 0
-// 0x010168a0: 0x10168a0: addiu v0, v0, -4
+// 0x010168ac: 0x10168ac: sll   zero, zero, 0
+// 0x010168b0: 0x10168b0: addiu v0, v0, -4
 	ldloc 5
 	ldc.i4.s -4
 	add
 	stloc 5
-// 0x010168a4: 0x10168a4: j	 0x10168b8 sw    v0, 44(sp)
+// 0x010168b4: 0x10168b4: j	 0x10168c8 sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5322,13 +5322,13 @@ L_1016880:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10168b8
+	br L_10168c8
 // --- basic block ---
-L_10168ac:
-// 0x010168ac: 0x10168ac: addiu v0, zero, 4
+L_10168bc:
+// 0x010168bc: 0x10168bc: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010168b0: 0x10168b0: sw    v0, 44(sp)
+// 0x010168c0: 0x10168c0: sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5337,14 +5337,14 @@ L_10168ac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010168b4: 0x10168b4: addu  a1, zero, zero
+// 0x010168c4: 0x10168c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_10168b8:
-// 0x010168b8: 0x10168b8: lui   s2, 0x30000
+L_10168c8:
+// 0x010168c8: 0x10168c8: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x010168bc: 0x10168bc: jal   0x10423fc sw    a1, 352(sp)
+// 0x010168cc: 0x10168cc: jal   0x104240c sw    a1, 352(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5353,39 +5353,39 @@ L_10168b8:
 	add
 	ldloc.2
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010168c4: 0x10168c4: lw    v1, -28456(s2)
+// 0x010168d4: 0x10168d4: lw    v1, -27992(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x010168c8: 0x10168c8: lui   a0, 0x0
+// 0x010168d8: 0x10168d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010168cc: 0x10168cc: addiu v1, v1, 2
+// 0x010168dc: 0x10168dc: addiu v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	add
 	stloc 6
-// 0x010168d0: 0x10168d0: addu  v0, v1, v0
+// 0x010168e0: 0x10168e0: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x010168d4: 0x10168d4: addiu a0, a0, 29820
+// 0x010168e4: 0x10168e4: addiu a0, a0, 29820
 	ldloc.1
 	ldc.i4 29820
 	add
 	stloc.1
-// 0x010168d8: 0x10168d8: jal   0x101cd60 sw    v0, 48(sp)
+// 0x010168e8: 0x10168e8: jal   0x101cd70 sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5399,12 +5399,12 @@ L_10168b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010168e0: 0x10168e0: lw    a1, 352(sp)
+// 0x010168f0: 0x10168f0: lw    a1, 352(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5413,15 +5413,15 @@ L_10168b8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010168e4: 0x10168e4: addu  a3, v0, zero
+// 0x010168f4: 0x10168f4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010168e8: 0x10168e8: addiu a0, sp, 44
+// 0x010168f8: 0x10168f8: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x010168ec: 0x10168ec: jal   0x104ea60 addiu a2, zero, 14
+// 0x010168fc: 0x10168fc: jal   0x104ea70 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -5429,15 +5429,15 @@ L_10168b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010168f4: 0x10168f4: addiu v0, zero, 4
+// 0x01016904: 0x1016904: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010168f8: 0x10168f8: jal   0x10423fc sw    v0, 44(sp)
+// 0x01016908: 0x1016908: jal   0x104240c sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5446,48 +5446,48 @@ L_10168b8:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016900: 0x1016900: lw    a0, -28456(s2)
+// 0x01016910: 0x1016910: lw    a0, -27992(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc.1
-// 0x01016904: 0x1016904: lui   v1, 0x30000
+// 0x01016914: 0x1016914: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01016908: 0x1016908: lw    v1, -28452(v1)
+// 0x01016918: 0x1016918: lw    v1, -27988(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7113
+	ldc.i4 -6997
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101690c: 0x101690c: addiu a0, a0, 27
+// 0x0101691c: 0x101691c: addiu a0, a0, 27
 	ldloc.1
 	ldc.i4.s 27
 	add
 	stloc.1
-// 0x01016910: 0x1016910: addu  v0, a0, v0
+// 0x01016920: 0x1016920: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01016914: 0x1016914: sltiu a1, v1, 7
+// 0x01016924: 0x1016924: sltiu a1, v1, 7
 	ldloc 6
 	ldc.i4.7
 	clt.un
 	stloc.2
-// 0x01016918: 0x1016918: sw    v0, 48(sp)
+// 0x01016928: 0x1016928: sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5496,142 +5496,142 @@ L_10168b8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101691c: 0x101691c: beq   a1, zero, 0x101699c addu  v0, zero, zero
+// 0x0101692c: 0x101692c: beq   a1, zero, 0x10169ac addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_101699c
+	brfalse L_10169ac
 // --- basic block ---
-// 0x01016924: 0x1016924: lui   v0, 0x20000
+// 0x01016934: 0x1016934: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01016928: 0x1016928: addiu v0, v0, 24792
+// 0x01016938: 0x1016938: addiu v0, v0, 25256
 	ldloc 5
-	ldc.i4 24792
+	ldc.i4 25256
 	add
 	stloc 5
-// 0x0101692c: 0x101692c: sll   v1, v1, 2
+// 0x0101693c: 0x101693c: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01016930: 0x1016930: addu  v1, v0, v1
+// 0x01016940: 0x1016940: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01016934: 0x1016934: lw    v0, 0(v1)
+// 0x01016944: 0x1016944: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01016938: 0x1016938: sll   zero, zero, 0
-// 0x0101693c: 0x101693c: jr    v0 sll   zero, zero, 0
+// 0x01016948: 0x1016948: sll   zero, zero, 0
+// 0x0101694c: 0x101694c: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1016944:
-// 0x01016944: 0x1016944: lui   a0, 0x0
+L_1016954:
+// 0x01016954: 0x1016954: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016948: 0x1016948: j	 0x1016994 addiu a0, a0, 29848
+// 0x01016958: 0x1016958: j	 0x10169a4 addiu a0, a0, 29848
 	ldloc.1
 	ldc.i4 29848
 	add
 	stloc.1
-	br L_1016994
+	br L_10169a4
 // --- basic block ---
-L_1016950:
-// 0x01016950: 0x1016950: lui   a0, 0x0
+L_1016960:
+// 0x01016960: 0x1016960: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016954: 0x1016954: j	 0x1016994 addiu a0, a0, 29860
+// 0x01016964: 0x1016964: j	 0x10169a4 addiu a0, a0, 29860
 	ldloc.1
 	ldc.i4 29860
 	add
 	stloc.1
-	br L_1016994
+	br L_10169a4
 // --- basic block ---
-L_101695c:
-// 0x0101695c: 0x101695c: lui   a0, 0x0
+L_101696c:
+// 0x0101696c: 0x101696c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016960: 0x1016960: j	 0x1016994 addiu a0, a0, 29872
+// 0x01016970: 0x1016970: j	 0x10169a4 addiu a0, a0, 29872
 	ldloc.1
 	ldc.i4 29872
 	add
 	stloc.1
-	br L_1016994
+	br L_10169a4
 // --- basic block ---
-L_1016968:
-// 0x01016968: 0x1016968: lui   a0, 0x0
+L_1016978:
+// 0x01016978: 0x1016978: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101696c: 0x101696c: j	 0x1016994 addiu a0, a0, 29888
+// 0x0101697c: 0x101697c: j	 0x10169a4 addiu a0, a0, 29888
 	ldloc.1
 	ldc.i4 29888
 	add
 	stloc.1
-	br L_1016994
+	br L_10169a4
 // --- basic block ---
-L_1016974:
-// 0x01016974: 0x1016974: lui   a0, 0x0
+L_1016984:
+// 0x01016984: 0x1016984: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016978: 0x1016978: j	 0x1016994 addiu a0, a0, 29904
+// 0x01016988: 0x1016988: j	 0x10169a4 addiu a0, a0, 29904
 	ldloc.1
 	ldc.i4 29904
 	add
 	stloc.1
-	br L_1016994
+	br L_10169a4
 // --- basic block ---
-L_1016980:
-// 0x01016980: 0x1016980: lui   a0, 0x0
+L_1016990:
+// 0x01016990: 0x1016990: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016984: 0x1016984: j	 0x1016994 addiu a0, a0, 29920
+// 0x01016994: 0x1016994: j	 0x10169a4 addiu a0, a0, 29920
 	ldloc.1
 	ldc.i4 29920
 	add
 	stloc.1
-	br L_1016994
+	br L_10169a4
 // --- basic block ---
-L_101698c:
-// 0x0101698c: 0x101698c: lui   a0, 0x0
+L_101699c:
+// 0x0101699c: 0x101699c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016990: 0x1016990: addiu a0, a0, 29940
+// 0x010169a0: 0x10169a0: addiu a0, a0, 29940
 	ldloc.1
 	ldc.i4 29940
 	add
 	stloc.1
-L_1016994:
-// 0x01016994: 0x1016994: jal   0x101cd60 sll   zero, zero, 0
+L_10169a4:
+// 0x010169a4: 0x10169a4: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_101699c:
-// 0x0101699c: 0x101699c: addu  a3, v0, zero
+L_10169ac:
+// 0x010169ac: 0x10169ac: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010169a0: 0x10169a0: addiu a0, sp, 44
+// 0x010169b0: 0x10169b0: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x010169a4: 0x10169a4: addu  a1, zero, zero
+// 0x010169b4: 0x10169b4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010169a8: 0x10169a8: jal   0x104ea60 addiu a2, zero, 14
+// 0x010169b8: 0x10169b8: jal   0x104ea70 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -5639,23 +5639,23 @@ L_101699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010169b0: 0x10169b0: lui   a2, 0x0
+// 0x010169c0: 0x10169c0: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010169b4: 0x10169b4: addiu a2, a2, 29956
+// 0x010169c4: 0x10169c4: addiu a2, a2, 29956
 	ldloc.3
 	ldc.i4 29956
 	add
 	stloc.3
-// 0x010169b8: 0x10169b8: addu  a0, zero, zero
+// 0x010169c8: 0x10169c8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010169bc: 0x10169bc: jal   0x10a1918 addiu a1, zero, 1
+// 0x010169cc: 0x10169cc: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5663,53 +5663,53 @@ L_101699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010169c4: 0x10169c4: beq   v0, zero, 0x1016a3c addu  s3, v0, zero
+// 0x010169d4: 0x10169d4: beq   v0, zero, 0x1016a4c addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brfalse L_1016a3c
+	brfalse L_1016a4c
 // --- basic block ---
-// 0x010169cc: 0x10169cc: jal   0x10423fc addiu s2, zero, 3
+// 0x010169dc: 0x10169dc: jal   0x104240c addiu s2, zero, 3
 	ldc.i4.3
 	stloc 8
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010169d4: 0x10169d4: div   s0, s2
+// 0x010169e4: 0x10169e4: div   s0, s2
 	ldloc 9
 	ldloc 8
 	div
 	stloc 12
-// 0x010169d8: 0x10169d8: addiu s5, sp, 36
+// 0x010169e8: 0x10169e8: addiu s5, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-// 0x010169dc: 0x10169dc: addiu v0, v0, 25
+// 0x010169ec: 0x10169ec: addiu v0, v0, 25
 	ldloc 5
 	ldc.i4.s 25
 	add
 	stloc 5
-// 0x010169e0: 0x10169e0: addu  a0, s3, zero
+// 0x010169f0: 0x10169f0: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010169e4: 0x10169e4: addu  a1, s5, zero
+// 0x010169f4: 0x10169f4: addu  a1, s5, zero
 	ldloc 10
 	stloc.2
-// 0x010169e8: 0x10169e8: addu  a2, zero, zero
+// 0x010169f8: 0x10169f8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010169ec: 0x10169ec: addu  a3, zero, zero
+// 0x010169fc: 0x10169fc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010169f0: 0x10169f0: sw    v0, 40(sp)
+// 0x01016a00: 0x1016a00: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5718,15 +5718,15 @@ L_101699c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010169f4: 0x10169f4: mflo  lo
+// 0x01016a04: 0x1016a04: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x010169f8: 0x10169f8: addiu v0, v1, 34
+// 0x01016a08: 0x1016a08: addiu v0, v1, 34
 	ldloc 6
 	ldc.i4.s 34
 	add
 	stloc 5
-// 0x010169fc: 0x10169fc: jal   0x104f4a8 sw    v0, 36(sp)
+// 0x01016a0c: 0x1016a0c: jal   0x104f4b8 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5740,45 +5740,45 @@ L_101699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016a04: 0x1016a04: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+// 0x01016a14: 0x1016a14: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016a0c: 0x1016a0c: sll   v1, s0, 1
+// 0x01016a1c: 0x1016a1c: sll   v1, s0, 1
 	ldloc 9
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x01016a10: 0x1016a10: div   v1, s2
+// 0x01016a20: 0x1016a20: div   v1, s2
 	ldloc 6
 	ldloc 8
 	div
 	stloc 12
-// 0x01016a14: 0x1016a14: addiu v0, v0, 25
+// 0x01016a24: 0x1016a24: addiu v0, v0, 25
 	ldloc 5
 	ldc.i4.s 25
 	add
 	stloc 5
-// 0x01016a18: 0x1016a18: addu  a0, s3, zero
+// 0x01016a28: 0x1016a28: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01016a1c: 0x1016a1c: addu  a1, s5, zero
+// 0x01016a2c: 0x1016a2c: addu  a1, s5, zero
 	ldloc 10
 	stloc.2
-// 0x01016a20: 0x1016a20: addu  a2, zero, zero
+// 0x01016a30: 0x1016a30: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01016a24: 0x1016a24: addu  a3, zero, zero
+// 0x01016a34: 0x1016a34: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01016a28: 0x1016a28: sw    v0, 40(sp)
+// 0x01016a38: 0x1016a38: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5787,15 +5787,15 @@ L_101699c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01016a2c: 0x1016a2c: mflo  lo
+// 0x01016a3c: 0x1016a3c: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x01016a30: 0x1016a30: addiu s2, s2, 19
+// 0x01016a40: 0x1016a40: addiu s2, s2, 19
 	ldloc 8
 	ldc.i4.s 19
 	add
 	stloc 8
-// 0x01016a34: 0x1016a34: jal   0x104f4a8 sw    s2, 36(sp)
+// 0x01016a44: 0x1016a44: jal   0x104f4b8 sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5809,50 +5809,50 @@ L_101699c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1016a3c:
-// 0x01016a3c: 0x1016a3c: addiu s2, zero, 12
+L_1016a4c:
+// 0x01016a4c: 0x1016a4c: addiu s2, zero, 12
 	ldc.i4.s 12
 	stloc 8
-// 0x01016a40: 0x1016a40: div   s0, s2
+// 0x01016a50: 0x1016a50: div   s0, s2
 	ldloc 9
 	ldloc 8
 	div
 	stloc 12
-// 0x01016a44: 0x1016a44: addiu s5, zero, 3
+// 0x01016a54: 0x1016a54: addiu s5, zero, 3
 	ldc.i4.3
 	stloc 10
-// 0x01016a48: 0x1016a48: lui   s3, 0x30000
+// 0x01016a58: 0x1016a58: lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 11
-// 0x01016a4c: 0x1016a4c: mflo  lo
+// 0x01016a5c: 0x1016a5c: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x01016a50: 0x1016a50: sll   zero, zero, 0
-// 0x01016a54: 0x1016a54: sll   zero, zero, 0
-// 0x01016a58: 0x1016a58: div   s0, s5
+// 0x01016a60: 0x1016a60: sll   zero, zero, 0
+// 0x01016a64: 0x1016a64: sll   zero, zero, 0
+// 0x01016a68: 0x1016a68: div   s0, s5
 	ldloc 9
 	ldloc 10
 	div
 	stloc 12
-// 0x01016a5c: 0x1016a5c: mflo  lo
+// 0x01016a6c: 0x1016a6c: mflo  lo
 	ldloc 12
 	stloc 10
-// 0x01016a60: 0x1016a60: addu  s5, s5, s2
+// 0x01016a70: 0x1016a70: addu  s5, s5, s2
 	ldloc 10
 	ldloc 8
 	add
 	stloc 10
-// 0x01016a64: 0x1016a64: addiu s5, s5, 30
+// 0x01016a74: 0x1016a74: addiu s5, s5, 30
 	ldloc 10
 	ldc.i4.s 30
 	add
 	stloc 10
-// 0x01016a68: 0x1016a68: jal   0x10423fc sw    s5, 44(sp)
+// 0x01016a78: 0x1016a78: jal   0x104240c sw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5861,39 +5861,39 @@ L_1016a3c:
 	add
 	ldloc 10
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016a70: 0x1016a70: lw    v1, -28456(s3)
+// 0x01016a80: 0x1016a80: lw    v1, -27992(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016a74: 0x1016a74: lui   a0, 0x0
+// 0x01016a84: 0x1016a84: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016a78: 0x1016a78: addiu v1, v1, 27
+// 0x01016a88: 0x1016a88: addiu v1, v1, 27
 	ldloc 6
 	ldc.i4.s 27
 	add
 	stloc 6
-// 0x01016a7c: 0x1016a7c: addu  v0, v1, v0
+// 0x01016a8c: 0x1016a8c: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01016a80: 0x1016a80: addiu a0, a0, 29972
+// 0x01016a90: 0x1016a90: addiu a0, a0, 29972
 	ldloc.1
 	ldc.i4 29972
 	add
 	stloc.1
-// 0x01016a84: 0x1016a84: jal   0x101cd60 sw    v0, 48(sp)
+// 0x01016a94: 0x1016a94: jal   0x101cd70 sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5907,23 +5907,23 @@ L_1016a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016a8c: 0x1016a8c: addu  a3, v0, zero
+// 0x01016a9c: 0x1016a9c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01016a90: 0x1016a90: addiu a0, sp, 44
+// 0x01016aa0: 0x1016aa0: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x01016a94: 0x1016a94: addu  a1, zero, zero
+// 0x01016aa4: 0x1016aa4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01016a98: 0x1016a98: jal   0x104ea60 addiu a2, zero, 14
+// 0x01016aa8: 0x1016aa8: jal   0x104ea70 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -5931,12 +5931,12 @@ L_1016a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016aa0: 0x1016aa0: jal   0x10423fc sw    s5, 44(sp)
+// 0x01016ab0: 0x1016ab0: jal   0x104240c sw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5945,37 +5945,37 @@ L_1016a3c:
 	add
 	ldloc 10
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016aa8: 0x1016aa8: lw    v1, -28456(s3)
+// 0x01016ab8: 0x1016ab8: lw    v1, -27992(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016aac: 0x1016aac: sll   zero, zero, 0
-// 0x01016ab0: 0x1016ab0: addiu v1, v1, 25
+// 0x01016abc: 0x1016abc: sll   zero, zero, 0
+// 0x01016ac0: 0x1016ac0: addiu v1, v1, 25
 	ldloc 6
 	ldc.i4.s 25
 	add
 	stloc 6
-// 0x01016ab4: 0x1016ab4: addu  v1, v1, s1
+// 0x01016ac4: 0x1016ac4: addu  v1, v1, s1
 	ldloc 6
 	ldloc 13
 	add
 	stloc 6
-// 0x01016ab8: 0x1016ab8: addu  v0, v1, v0
+// 0x01016ac8: 0x1016ac8: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01016abc: 0x1016abc: jal   0x10ac820 sw    v0, 48(sp)
+// 0x01016acc: 0x1016acc: jal   0x10ace68 sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5984,66 +5984,66 @@ L_1016a3c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl129::editor_points_get_total_points_10ac820()
+	call int32 Cibyl129::editor_points_get_total_points_10ace68()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016ac4: 0x1016ac4: addiu v1, zero, -1
+// 0x01016ad4: 0x1016ad4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01016ac8: 0x1016ac8: beq   v0, v1, 0x1016b0c slti  v1, v0, 10000
+// 0x01016ad8: 0x1016ad8: beq   v0, v1, 0x1016b1c slti  v1, v0, 10000
 	ldloc 5
 	ldloc 6
 	ldloc 5
 	ldc.i4 10000
 	clt
 	stloc 6
-	beq  L_1016b0c
+	beq  L_1016b1c
 // --- basic block ---
-// 0x01016ad0: 0x1016ad0: beq   v1, zero, 0x1016ae8 addiu a0, sp, 52
+// 0x01016ae0: 0x1016ae0: beq   v1, zero, 0x1016af8 addiu a0, sp, 52
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.1
-	brfalse L_1016ae8
+	brfalse L_1016af8
 // --- basic block ---
-// 0x01016ad8: 0x1016ad8: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x01016ae8: 0x1016ae8: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01016adc: 0x1016adc: addiu a1, a1, -13884
+// 0x01016aec: 0x1016aec: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01016ae0: 0x1016ae0: j	 0x1016afc addu  a2, v0, zero
+// 0x01016af0: 0x1016af0: j	 0x1016b0c addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-	br L_1016afc
+	br L_1016b0c
 // --- basic block ---
-L_1016ae8:
-// 0x01016ae8: 0x1016ae8: addiu a2, zero, 1000
+L_1016af8:
+// 0x01016af8: 0x1016af8: addiu a2, zero, 1000
 	ldc.i4 1000
 	stloc.3
-// 0x01016aec: 0x1016aec: div   v0, a2
+// 0x01016afc: 0x1016afc: div   v0, a2
 	ldloc 5
 	ldloc.3
 	div
 	stloc 12
-// 0x01016af0: 0x1016af0: lui   a1, 0x0
+// 0x01016b00: 0x1016b00: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016af4: 0x1016af4: addiu a1, a1, 29980
+// 0x01016b04: 0x1016b04: addiu a1, a1, 29980
 	ldloc.2
 	ldc.i4 29980
 	add
 	stloc.2
-// 0x01016af8: 0x1016af8: mflo  lo
+// 0x01016b08: 0x1016b08: mflo  lo
 	ldloc 12
 	stloc.3
-L_1016afc:
-// 0x01016afc: 0x1016afc: jal   0x1000f64 sll   zero, zero, 0
+L_1016b0c:
+// 0x01016b0c: 0x1016b0c: jal   0x1000f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6054,23 +6054,23 @@ L_1016afc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016b04: 0x1016b04: j	 0x1016b20 addiu a0, sp, 44
+// 0x01016b14: 0x1016b14: j	 0x1016b30 addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-	br L_1016b20
+	br L_1016b30
 // --- basic block ---
-L_1016b0c:
-// 0x01016b0c: 0x1016b0c: lui   a1, 0x10000
+L_1016b1c:
+// 0x01016b1c: 0x1016b1c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01016b10: 0x1016b10: addiu a1, a1, 18500
+// 0x01016b20: 0x1016b20: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01016b14: 0x1016b14: jal   0x1001b68 addiu a0, sp, 52
+// 0x01016b24: 0x1016b24: jal   0x1001b68 addiu a0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -6082,19 +6082,19 @@ L_1016b0c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016b1c: 0x1016b1c: addiu a0, sp, 44
+// 0x01016b2c: 0x1016b2c: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-L_1016b20:
-// 0x01016b20: 0x1016b20: addu  a1, zero, zero
+L_1016b30:
+// 0x01016b30: 0x1016b30: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01016b24: 0x1016b24: addiu a2, zero, 14
+// 0x01016b34: 0x1016b34: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01016b28: 0x1016b28: jal   0x104ea60 addiu a3, sp, 52
+// 0x01016b38: 0x1016b38: jal   0x104ea70 addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -6104,38 +6104,38 @@ L_1016b20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016b30: 0x1016b30: addiu v0, zero, -3
+// 0x01016b40: 0x1016b40: addiu v0, zero, -3
 	ldc.i4.s -3
 	stloc 5
-// 0x01016b34: 0x1016b34: div   s0, v0
+// 0x01016b44: 0x1016b44: div   s0, v0
 	ldloc 9
 	ldloc 5
 	div
 	stloc 12
-// 0x01016b38: 0x1016b38: mflo  lo
+// 0x01016b48: 0x1016b48: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x01016b3c: 0x1016b3c: addu  s2, s2, v0
+// 0x01016b4c: 0x1016b4c: addu  s2, s2, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01016b40: 0x1016b40: addu  s0, s2, s0
+// 0x01016b50: 0x1016b50: addu  s0, s2, s0
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-// 0x01016b44: 0x1016b44: addiu v0, s0, 15
+// 0x01016b54: 0x1016b54: addiu v0, s0, 15
 	ldloc 9
 	ldc.i4.s 15
 	add
 	stloc 5
-// 0x01016b48: 0x1016b48: jal   0x10423fc sw    v0, 44(sp)
+// 0x01016b58: 0x1016b58: jal   0x104240c sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6144,35 +6144,35 @@ L_1016b20:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016b50: 0x1016b50: lui   v1, 0x30000
+// 0x01016b60: 0x1016b60: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01016b54: 0x1016b54: lw    v1, -28456(v1)
+// 0x01016b64: 0x1016b64: lw    v1, -27992(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016b58: 0x1016b58: sll   zero, zero, 0
-// 0x01016b5c: 0x1016b5c: addiu v1, v1, 27
+// 0x01016b68: 0x1016b68: sll   zero, zero, 0
+// 0x01016b6c: 0x1016b6c: addiu v1, v1, 27
 	ldloc 6
 	ldc.i4.s 27
 	add
 	stloc 6
-// 0x01016b60: 0x1016b60: addu  v0, v1, v0
+// 0x01016b70: 0x1016b70: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01016b64: 0x1016b64: jal   0x106aad8 sw    v0, 48(sp)
+// 0x01016b74: 0x1016b74: jal   0x106b0fc sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6181,27 +6181,27 @@ L_1016b20:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl79::RealTime_GetMyRanking_106aad8()
+	call int32 Cibyl79::RealTime_GetMyRanking_106b0fc()
 	stloc 5
 // --- basic block ---
-// 0x01016b6c: 0x1016b6c: addiu v1, zero, -1
+// 0x01016b7c: 0x1016b7c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01016b70: 0x1016b70: bne   v0, v1, 0x1016b8c addiu a0, sp, 72
+// 0x01016b80: 0x1016b80: bne   v0, v1, 0x1016b9c addiu a0, sp, 72
 	ldloc 5
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-	bne.un L_1016b8c
+	bne.un L_1016b9c
 // --- basic block ---
-// 0x01016b78: 0x1016b78: lui   a1, 0x10000
+// 0x01016b88: 0x1016b88: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01016b7c: 0x1016b7c: jal   0x1001b68 addiu a1, a1, 18500
+// 0x01016b8c: 0x1016b8c: jal   0x1001b68 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.1
@@ -6211,21 +6211,21 @@ L_1016b20:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016b84: 0x1016b84: j	 0x1016ba0 lui   a0, 0x0
+// 0x01016b94: 0x1016b94: j	 0x1016bb0 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_1016ba0
+	br L_1016bb0
 // --- basic block ---
-L_1016b8c:
-// 0x01016b8c: 0x1016b8c: lui   a1, 0x20000
-	ldc.i4 131072
+L_1016b9c:
+// 0x01016b9c: 0x1016b9c: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01016b90: 0x1016b90: addiu a1, a1, -13884
+// 0x01016ba0: 0x1016ba0: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01016b94: 0x1016b94: jal   0x1000f64 addu  a2, v0, zero
+// 0x01016ba4: 0x1016ba4: jal   0x1000f64 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -6238,11 +6238,11 @@ L_1016b8c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016b9c: 0x1016b9c: lui   a0, 0x0
+// 0x01016bac: 0x1016bac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1016ba0:
-// 0x01016ba0: 0x1016ba0: jal   0x101cd60 addiu a0, a0, 29984
+L_1016bb0:
+// 0x01016bb0: 0x1016bb0: jal   0x101cd70 addiu a0, a0, 29984
 	ldloc.1
 	ldc.i4 29984
 	add
@@ -6252,34 +6252,34 @@ L_1016ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016ba8: 0x1016ba8: addiu s2, sp, 44
+// 0x01016bb8: 0x1016bb8: addiu s2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 8
-// 0x01016bac: 0x1016bac: addu  a3, v0, zero
+// 0x01016bbc: 0x1016bbc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01016bb0: 0x1016bb0: addu  a0, s2, zero
+// 0x01016bc0: 0x1016bc0: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01016bb4: 0x1016bb4: addu  a1, zero, zero
+// 0x01016bc4: 0x1016bc4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01016bb8: 0x1016bb8: addiu a2, zero, 14
+// 0x01016bc8: 0x1016bc8: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01016bbc: 0x1016bbc: addiu s0, s0, 12
+// 0x01016bcc: 0x1016bcc: addiu s0, s0, 12
 	ldloc 9
 	ldc.i4.s 12
 	add
 	stloc 9
-// 0x01016bc0: 0x1016bc0: jal   0x104ea60 lui   s3, 0x30000
+// 0x01016bd0: 0x1016bd0: jal   0x104ea70 lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 11
 	ldloc.0
@@ -6287,12 +6287,12 @@ L_1016ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016bc8: 0x1016bc8: jal   0x10423fc sw    s0, 44(sp)
+// 0x01016bd8: 0x1016bd8: jal   0x104240c sw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6301,50 +6301,50 @@ L_1016ba0:
 	add
 	ldloc 9
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016bd0: 0x1016bd0: lw    v1, -28456(s3)
+// 0x01016be0: 0x1016be0: lw    v1, -27992(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016bd4: 0x1016bd4: addu  a0, s2, zero
+// 0x01016be4: 0x1016be4: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01016bd8: 0x1016bd8: addiu v1, v1, 25
+// 0x01016be8: 0x1016be8: addiu v1, v1, 25
 	ldloc 6
 	ldc.i4.s 25
 	add
 	stloc 6
-// 0x01016bdc: 0x1016bdc: addu  v1, v1, s1
+// 0x01016bec: 0x1016bec: addu  v1, v1, s1
 	ldloc 6
 	ldloc 13
 	add
 	stloc 6
-// 0x01016be0: 0x1016be0: addu  v0, v1, v0
+// 0x01016bf0: 0x1016bf0: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01016be4: 0x1016be4: addu  a1, zero, zero
+// 0x01016bf4: 0x1016bf4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01016be8: 0x1016be8: addiu a2, zero, 14
+// 0x01016bf8: 0x1016bf8: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01016bec: 0x1016bec: addiu a3, sp, 72
+// 0x01016bfc: 0x1016bfc: addiu a3, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 4
-// 0x01016bf0: 0x1016bf0: sw    v0, 48(sp)
+// 0x01016c00: 0x1016c00: sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6353,7 +6353,7 @@ L_1016ba0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01016bf4: 0x1016bf4: jal   0x104ea60 addiu s0, sp, 92
+// 0x01016c04: 0x1016c04: jal   0x104ea70 addiu s0, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
@@ -6363,20 +6363,20 @@ L_1016ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016bfc: 0x1016bfc: lui   a1, 0x10000
+// 0x01016c0c: 0x1016c0c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01016c00: 0x1016c00: addiu a1, a1, -48
+// 0x01016c10: 0x1016c10: addiu a1, a1, -52
 	ldloc.2
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.2
-// 0x01016c04: 0x1016c04: jal   0x1001b14 addu  a0, s0, zero
+// 0x01016c14: 0x1016c14: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6384,15 +6384,15 @@ L_1016ba0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01016c0c: 0x1016c0c: beq   v0, zero, 0x1016c7c addiu v0, s4, 29
+// 0x01016c1c: 0x1016c1c: beq   v0, zero, 0x1016c8c addiu v0, s4, 29
 	ldloc 5
 	ldloc 14
 	ldc.i4.s 29
 	add
 	stloc 5
-	brfalse L_1016c7c
+	brfalse L_1016c8c
 // --- basic block ---
-// 0x01016c14: 0x1016c14: jal   0x10423fc sw    v0, 44(sp)
+// 0x01016c24: 0x1016c24: jal   0x104240c sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6401,58 +6401,58 @@ L_1016ba0:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016c1c: 0x1016c1c: lw    v1, -28456(s3)
+// 0x01016c2c: 0x1016c2c: lw    v1, -27992(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016c20: 0x1016c20: lui   a3, 0x0
+// 0x01016c30: 0x1016c30: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01016c24: 0x1016c24: addiu v1, v1, 25
+// 0x01016c34: 0x1016c34: addiu v1, v1, 25
 	ldloc 6
 	ldc.i4.s 25
 	add
 	stloc 6
-// 0x01016c28: 0x1016c28: addu  v1, v1, s1
+// 0x01016c38: 0x1016c38: addu  v1, v1, s1
 	ldloc 6
 	ldloc 13
 	add
 	stloc 6
-// 0x01016c2c: 0x1016c2c: addu  v0, v1, v0
+// 0x01016c3c: 0x1016c3c: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01016c30: 0x1016c30: addiu a3, a3, 29992
+// 0x01016c40: 0x1016c40: addiu a3, a3, 29992
 	ldloc 4
 	ldc.i4 29992
 	add
 	stloc 4
-// 0x01016c34: 0x1016c34: addu  a0, s2, zero
+// 0x01016c44: 0x1016c44: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01016c38: 0x1016c38: addu  a1, zero, zero
+// 0x01016c48: 0x1016c48: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01016c3c: 0x1016c3c: addiu a2, zero, 14
+// 0x01016c4c: 0x1016c4c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01016c40: 0x1016c40: addiu s4, s4, 39
+// 0x01016c50: 0x1016c50: addiu s4, s4, 39
 	ldloc 14
 	ldc.i4.s 39
 	add
 	stloc 14
-// 0x01016c44: 0x1016c44: jal   0x104ea60 sw    v0, 48(sp)
+// 0x01016c54: 0x1016c54: jal   0x104ea70 sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6466,12 +6466,12 @@ L_1016ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016c4c: 0x1016c4c: jal   0x10423fc sw    s4, 44(sp)
+// 0x01016c5c: 0x1016c5c: jal   0x104240c sw    s4, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6480,48 +6480,48 @@ L_1016ba0:
 	add
 	ldloc 14
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016c54: 0x1016c54: lw    v1, -28456(s3)
+// 0x01016c64: 0x1016c64: lw    v1, -27992(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7114
+	ldc.i4 -6998
 	add
 	ldelem.i4
 	stloc 6
-// 0x01016c58: 0x1016c58: addu  a0, s2, zero
+// 0x01016c68: 0x1016c68: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01016c5c: 0x1016c5c: addiu v1, v1, 25
+// 0x01016c6c: 0x1016c6c: addiu v1, v1, 25
 	ldloc 6
 	ldc.i4.s 25
 	add
 	stloc 6
-// 0x01016c60: 0x1016c60: addu  s1, v1, s1
+// 0x01016c70: 0x1016c70: addu  s1, v1, s1
 	ldloc 6
 	ldloc 13
 	add
 	stloc 13
-// 0x01016c64: 0x1016c64: addu  v0, s1, v0
+// 0x01016c74: 0x1016c74: addu  v0, s1, v0
 	ldloc 13
 	ldloc 5
 	add
 	stloc 5
-// 0x01016c68: 0x1016c68: addu  a3, s0, zero
+// 0x01016c78: 0x1016c78: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x01016c6c: 0x1016c6c: addu  a1, zero, zero
+// 0x01016c7c: 0x1016c7c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01016c70: 0x1016c70: addiu a2, zero, 14
+// 0x01016c80: 0x1016c80: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01016c74: 0x1016c74: jal   0x104ea60 sw    v0, 48(sp)
+// 0x01016c84: 0x1016c84: jal   0x104ea70 sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6535,14 +6535,14 @@ L_1016ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1016c7c:
-// 0x01016c7c: 0x1016c7c: lw    ra, 396(sp)
-// 0x01016c80: 0x1016c80: lw    s7, 392(sp)
+L_1016c8c:
+// 0x01016c8c: 0x1016c8c: lw    ra, 396(sp)
+// 0x01016c90: 0x1016c90: lw    s7, 392(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6551,7 +6551,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01016c84: 0x1016c84: lw    s6, 388(sp)
+// 0x01016c94: 0x1016c94: lw    s6, 388(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6560,7 +6560,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01016c88: 0x1016c88: lw    s5, 384(sp)
+// 0x01016c98: 0x1016c98: lw    s5, 384(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6569,7 +6569,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01016c8c: 0x1016c8c: lw    s4, 380(sp)
+// 0x01016c9c: 0x1016c9c: lw    s4, 380(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6578,7 +6578,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01016c90: 0x1016c90: lw    s3, 376(sp)
+// 0x01016ca0: 0x1016ca0: lw    s3, 376(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6587,7 +6587,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01016c94: 0x1016c94: lw    s2, 372(sp)
+// 0x01016ca4: 0x1016ca4: lw    s2, 372(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6596,7 +6596,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01016c98: 0x1016c98: lw    s1, 368(sp)
+// 0x01016ca8: 0x1016ca8: lw    s1, 368(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6605,7 +6605,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01016c9c: 0x1016c9c: lw    s0, 364(sp)
+// 0x01016cac: 0x1016cac: lw    s0, 364(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6614,7 +6614,7 @@ L_1016c7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01016ca0: 0x1016ca0: jr    ra addiu sp, sp, 400
+// 0x01016cb0: 0x1016cb0: jr    ra addiu sp, sp, 400
 	ldloc.0
 	ldc.i4 400
 	add
@@ -6624,26 +6624,26 @@ L_1016c7c:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 16869700
-	beq  L_1016944
+	ldc.i4 16869716
+	beq  L_1016954
 	ldloc 5
-	ldc.i4 16869712
-	beq  L_1016950
+	ldc.i4 16869728
+	beq  L_1016960
 	ldloc 5
-	ldc.i4 16869724
-	beq  L_101695c
+	ldc.i4 16869740
+	beq  L_101696c
 	ldloc 5
-	ldc.i4 16869736
-	beq  L_1016968
+	ldc.i4 16869752
+	beq  L_1016978
 	ldloc 5
-	ldc.i4 16869748
-	beq  L_1016974
+	ldc.i4 16869764
+	beq  L_1016984
 	ldloc 5
-	ldc.i4 16869760
-	beq  L_1016980
+	ldc.i4 16869776
+	beq  L_1016990
 	ldloc 5
-	ldc.i4 16869772
-	beq  L_101698c
+	ldc.i4 16869788
+	beq  L_101699c
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
@@ -6651,7 +6651,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_venues_list_1016cd0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_venues_list_1016ce0(int32,int32,int32,int32,int32)
 {
 .maxstack 12
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 t1,int32 t0,int32 t3,int32[] mem,int32 v1,int32 t2,int32 t4,int32 ra,int32 t5,int32 t6,int32 lo)
@@ -6710,18 +6710,18 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016cd0: 0x1016cd0: lui   a0, 0x1010000
+// 0x01016ce0: 0x1016ce0: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01016cd4: 0x1016cd4: addiu sp, sp, -24
+// 0x01016ce4: 0x1016ce4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016cd8: 0x1016cd8: sw    ra, 20(sp)
-// 0x01016cdc: 0x1016cdc: jal   0x104fd00 addiu a0, a0, 27856
+// 0x01016ce8: 0x1016ce8: sw    ra, 20(sp)
+// 0x01016cec: 0x1016cec: jal   0x104fd10 addiu a0, a0, 27872
 	ldloc.1
-	ldc.i4 27856
+	ldc.i4 27872
 	add
 	stloc.1
 	ldloc.0
@@ -6729,195 +6729,195 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01016ce4: 0x1016ce4: lui   v0, 0x30000
+// 0x01016cf4: 0x1016cf4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01016ce8: 0x1016ce8: lui   a0, 0x30000
+// 0x01016cf8: 0x1016cf8: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01016cec: 0x1016cec: lui   a1, 0x30000
+// 0x01016cfc: 0x1016cfc: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01016cf0: 0x1016cf0: lui   a2, 0x30000
+// 0x01016d00: 0x1016d00: lui   a2, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x01016cf4: 0x1016cf4: lui   t2, 0x30000
+// 0x01016d04: 0x1016d04: lui   t2, 0x30000
 	ldc.i4 196608
 	stloc 11
-// 0x01016cf8: 0x1016cf8: lui   t1, 0x0
+// 0x01016d08: 0x1016d08: lui   t1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01016cfc: 0x1016cfc: lw    v1, -28408(v0)
+// 0x01016d0c: 0x1016d0c: lw    v1, -27944(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7102
+	ldc.i4 -6986
 	add
 	ldelem.i4
 	stloc 10
-// 0x01016d00: 0x1016d00: addiu a0, a0, -28004
+// 0x01016d10: 0x1016d10: addiu a0, a0, -27540
 	ldloc.1
-	ldc.i4 -28004
+	ldc.i4 -27540
 	add
 	stloc.1
-// 0x01016d04: 0x1016d04: addiu a1, a1, -28204
+// 0x01016d14: 0x1016d14: addiu a1, a1, -27740
 	ldloc.2
-	ldc.i4 -28204
+	ldc.i4 -27740
 	add
 	stloc.2
-// 0x01016d08: 0x1016d08: addiu a2, a2, -28404
+// 0x01016d18: 0x1016d18: addiu a2, a2, -27940
 	ldloc.3
-	ldc.i4 -28404
+	ldc.i4 -27940
 	add
 	stloc.3
-// 0x01016d0c: 0x1016d0c: addiu t2, t2, -27796
+// 0x01016d1c: 0x1016d1c: addiu t2, t2, -27332
 	ldloc 11
-	ldc.i4 -27796
+	ldc.i4 -27332
 	add
 	stloc 11
-// 0x01016d10: 0x1016d10: addiu t1, t1, 30024
+// 0x01016d20: 0x1016d20: addiu t1, t1, 30024
 	ldloc 6
 	ldc.i4 30024
 	add
 	stloc 6
-// 0x01016d14: 0x1016d14: addu  a3, zero, zero
+// 0x01016d24: 0x1016d24: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01016d18: 0x1016d18: addu  v0, zero, zero
+// 0x01016d28: 0x1016d28: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01016d1c: 0x1016d1c: j	 0x1016d48 addiu t0, zero, 1072
+// 0x01016d2c: 0x1016d2c: j	 0x1016d58 addiu t0, zero, 1072
 	ldc.i4 1072
 	stloc 7
-	br L_1016d48
+	br L_1016d58
 // --- basic block ---
-L_1016d24:
-// 0x01016d24: 0x1016d24: mult  v0, t0
+L_1016d34:
+// 0x01016d34: 0x1016d34: mult  v0, t0
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 16
-// 0x01016d28: 0x1016d28: sw    v0, 0(t4)
+// 0x01016d38: 0x1016d38: sw    v0, 0(t4)
 	ldloc 9
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01016d2c: 0x1016d2c: sw    t1, 0(t3)
+// 0x01016d3c: 0x1016d3c: sw    t1, 0(t3)
 	ldloc 9
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01016d30: 0x1016d30: addiu v0, v0, 1
+// 0x01016d40: 0x1016d40: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01016d34: 0x1016d34: addiu a3, a3, 4
+// 0x01016d44: 0x1016d44: addiu a3, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-// 0x01016d38: 0x1016d38: mflo  lo
+// 0x01016d48: 0x1016d48: mflo  lo
 	ldloc 16
 	stloc 12
-// 0x01016d3c: 0x1016d3c: addiu t3, t4, 648
+// 0x01016d4c: 0x1016d4c: addiu t3, t4, 648
 	ldloc 12
 	ldc.i4 648
 	add
 	stloc 8
-// 0x01016d40: 0x1016d40: addu  t3, t2, t3
+// 0x01016d50: 0x1016d50: addu  t3, t2, t3
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x01016d44: 0x1016d44: sw    t3, 0(t5)
+// 0x01016d54: 0x1016d54: sw    t3, 0(t5)
 	ldloc 9
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_1016d48:
-// 0x01016d48: 0x1016d48: slt   t6, v0, v1
+L_1016d58:
+// 0x01016d58: 0x1016d58: slt   t6, v0, v1
 	ldloc 5
 	ldloc 10
 	clt
 	stloc 15
-// 0x01016d4c: 0x1016d4c: addu  t5, a0, a3
+// 0x01016d5c: 0x1016d5c: addu  t5, a0, a3
 	ldloc.1
 	ldloc 4
 	add
 	stloc 14
-// 0x01016d50: 0x1016d50: addu  t4, a1, a3
+// 0x01016d60: 0x1016d60: addu  t4, a1, a3
 	ldloc.2
 	ldloc 4
 	add
 	stloc 12
-// 0x01016d54: 0x1016d54: bne   t6, zero, 0x1016d24 addu  t3, a2, a3
+// 0x01016d64: 0x1016d64: bne   t6, zero, 0x1016d34 addu  t3, a2, a3
 	ldloc 15
 	ldloc.3
 	ldloc 4
 	add
 	stloc 8
-	brtrue L_1016d24
+	brtrue L_1016d34
 // --- basic block ---
-// 0x01016d5c: 0x1016d5c: lui   t1, 0x1010000
+// 0x01016d6c: 0x1016d6c: lui   t1, 0x1010000
 	ldc.i4 16842752
 	stloc 6
-// 0x01016d60: 0x1016d60: lui   t0, 0x0
+// 0x01016d70: 0x1016d70: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01016d64: 0x1016d64: addu  a3, zero, zero
+// 0x01016d74: 0x1016d74: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01016d68: 0x1016d68: addiu t1, t1, 30824
+// 0x01016d78: 0x1016d78: addiu t1, t1, 30840
 	ldloc 6
-	ldc.i4 30824
+	ldc.i4 30840
 	add
 	stloc 6
-// 0x01016d6c: 0x1016d6c: addiu t0, t0, 30044
+// 0x01016d7c: 0x1016d7c: addiu t0, t0, 30044
 	ldloc 7
 	ldc.i4 30044
 	add
 	stloc 7
-// 0x01016d70: 0x1016d70: cibyl_sysc_arg 0x8
+// 0x01016d80: 0x1016d80: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x01016d74: 0x1016d74: cibyl_sysc_arg 0x9
+// 0x01016d84: 0x1016d84: cibyl_sysc_arg 0x9
 	ldloc 6
-// 0x01016d78: 0x1016d78: cibyl_sysc_arg 0x3
+// 0x01016d88: 0x1016d88: cibyl_sysc_arg 0x3
 	ldloc 10
-// 0x01016d7c: 0x1016d7c: cibyl_sysc_arg 0x4
+// 0x01016d8c: 0x1016d8c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01016d80: 0x1016d80: cibyl_sysc_arg 0x5
+// 0x01016d90: 0x1016d90: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01016d84: 0x1016d84: cibyl_sysc_arg 0x6
+// 0x01016d94: 0x1016d94: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01016d88: 0x1016d88: cibyl_sysc_arg 0x7
+// 0x01016d98: 0x1016d98: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01016d8c: 0x1016d8c: cibyl_sysc_arg 0x7
+// 0x01016d9c: 0x1016d9c: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01016d90: 0x1016d90: cibyl_sysc_arg 0x7
+// 0x01016da0: 0x1016da0: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01016d94: 0x1016d94: cibyl_sysc_arg 0x7
+// 0x01016da4: 0x1016da4: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01016d98: 0x1016d98: cibyl_sysc 0x2f4
+// 0x01016da8: 0x1016da8: cibyl_sysc 0x2f4
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_showDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x01016d9c: 0x1016d9c: addu  a3, v0, zero
+// 0x01016dac: 0x1016dac: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01016da0: 0x1016da0: lw    ra, 20(sp)
-// 0x01016da4: 0x1016da4: sll   zero, zero, 0
-// 0x01016da8: 0x1016da8: jr    ra addiu sp, sp, 24
+// 0x01016db0: 0x1016db0: lw    ra, 20(sp)
+// 0x01016db4: 0x1016db4: sll   zero, zero, 0
+// 0x01016db8: 0x1016db8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6929,7 +6929,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 delayed_show_progress_1016db0(int32,int32,int32,int32,int32)
+.method public static int32 delayed_show_progress_1016dc0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6964,18 +6964,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016db0: 0x1016db0: lui   a0, 0x1010000
+// 0x01016dc0: 0x1016dc0: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01016db4: 0x1016db4: addiu sp, sp, -24
+// 0x01016dc4: 0x1016dc4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016db8: 0x1016db8: sw    ra, 20(sp)
-// 0x01016dbc: 0x1016dbc: jal   0x104fd00 addiu a0, a0, 28080
+// 0x01016dc8: 0x1016dc8: sw    ra, 20(sp)
+// 0x01016dcc: 0x1016dcc: jal   0x104fd10 addiu a0, a0, 28096
 	ldloc.1
-	ldc.i4 28080
+	ldc.i4 28096
 	add
 	stloc.1
 	ldloc.0
@@ -6983,15 +6983,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016dc4: 0x1016dc4: lui   a0, 0x0
+// 0x01016dd4: 0x1016dd4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016dc8: 0x1016dc8: jal   0x101cd60 addiu a0, a0, 30064
+// 0x01016dd8: 0x1016dd8: jal   0x101cd70 addiu a0, a0, 30064
 	ldloc.1
 	ldc.i4 30064
 	add
@@ -7001,21 +7001,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016dd0: 0x1016dd0: jal   0x104c3d0 addu  a0, v0, zero
+// 0x01016de0: 0x1016de0: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01016dd8: 0x1016dd8: lw    ra, 20(sp)
-// 0x01016ddc: 0x1016ddc: sll   zero, zero, 0
-// 0x01016de0: 0x1016de0: jr    ra addiu sp, sp, 24
+// 0x01016de8: 0x1016de8: lw    ra, 20(sp)
+// 0x01016dec: 0x1016dec: sll   zero, zero, 0
+// 0x01016df0: 0x1016df0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7027,7 +7027,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 request_time_out_1016de8(int32,int32,int32,int32,int32)
+.method public static int32 request_time_out_1016df8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -7062,18 +7062,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016de8: 0x1016de8: lui   a0, 0x1010000
+// 0x01016df8: 0x1016df8: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01016dec: 0x1016dec: addiu sp, sp, -24
+// 0x01016dfc: 0x1016dfc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016df0: 0x1016df0: sw    ra, 20(sp)
-// 0x01016df4: 0x1016df4: jal   0x104fd00 addiu a0, a0, 28136
+// 0x01016e00: 0x1016e00: sw    ra, 20(sp)
+// 0x01016e04: 0x1016e04: jal   0x104fd10 addiu a0, a0, 28152
 	ldloc.1
-	ldc.i4 28136
+	ldc.i4 28152
 	add
 	stloc.1
 	ldloc.0
@@ -7081,29 +7081,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016dfc: 0x1016dfc: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x01016e0c: 0x1016e0c: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016e04: 0x1016e04: lui   a0, 0x0
+// 0x01016e14: 0x1016e14: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016e08: 0x1016e08: lui   a1, 0x0
+// 0x01016e18: 0x1016e18: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016e0c: 0x1016e0c: addiu a0, a0, 30092
+// 0x01016e1c: 0x1016e1c: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x01016e10: 0x1016e10: jal   0x104c148 addiu a1, a1, 30100
+// 0x01016e20: 0x1016e20: jal   0x104c158 addiu a1, a1, 30100
 	ldloc.2
 	ldc.i4 30100
 	add
@@ -7113,14 +7113,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01016e18: 0x1016e18: lw    ra, 20(sp)
-// 0x01016e1c: 0x1016e1c: sll   zero, zero, 0
-// 0x01016e20: 0x1016e20: jr    ra addiu sp, sp, 24
+// 0x01016e28: 0x1016e28: lw    ra, 20(sp)
+// 0x01016e2c: 0x1016e2c: sll   zero, zero, 0
+// 0x01016e30: 0x1016e30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7132,7 +7132,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 foursquare_pw_empty_1016e28(int32,int32,int32,int32,int32)
+.method public static int32 foursquare_pw_empty_1016e38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -7167,18 +7167,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016e28: 0x1016e28: lui   a0, 0x1010000
+// 0x01016e38: 0x1016e38: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01016e2c: 0x1016e2c: addiu sp, sp, -24
+// 0x01016e3c: 0x1016e3c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016e30: 0x1016e30: sw    ra, 20(sp)
-// 0x01016e34: 0x1016e34: jal   0x104fd00 addiu a0, a0, 28200
+// 0x01016e40: 0x1016e40: sw    ra, 20(sp)
+// 0x01016e44: 0x1016e44: jal   0x104fd10 addiu a0, a0, 28216
 	ldloc.1
-	ldc.i4 28200
+	ldc.i4 28216
 	add
 	stloc.1
 	ldloc.0
@@ -7186,23 +7186,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01016e3c: 0x1016e3c: lui   a0, 0x0
+// 0x01016e4c: 0x1016e4c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016e40: 0x1016e40: lui   a1, 0x0
+// 0x01016e50: 0x1016e50: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016e44: 0x1016e44: addiu a0, a0, 30152
+// 0x01016e54: 0x1016e54: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x01016e48: 0x1016e48: jal   0x104c148 addiu a1, a1, 30160
+// 0x01016e58: 0x1016e58: jal   0x104c158 addiu a1, a1, 30160
 	ldloc.2
 	ldc.i4 30160
 	add
@@ -7212,14 +7212,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01016e50: 0x1016e50: lw    ra, 20(sp)
-// 0x01016e54: 0x1016e54: sll   zero, zero, 0
-// 0x01016e58: 0x1016e58: jr    ra addiu sp, sp, 24
+// 0x01016e60: 0x1016e60: lw    ra, 20(sp)
+// 0x01016e64: 0x1016e64: sll   zero, zero, 0
+// 0x01016e68: 0x1016e68: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7231,7 +7231,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 foursquare_un_empty_1016e60(int32,int32,int32,int32,int32)
+.method public static int32 foursquare_un_empty_1016e70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -7266,18 +7266,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016e60: 0x1016e60: lui   a0, 0x1010000
+// 0x01016e70: 0x1016e70: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01016e64: 0x1016e64: addiu sp, sp, -24
+// 0x01016e74: 0x1016e74: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016e68: 0x1016e68: sw    ra, 20(sp)
-// 0x01016e6c: 0x1016e6c: jal   0x104fd00 addiu a0, a0, 28256
+// 0x01016e78: 0x1016e78: sw    ra, 20(sp)
+// 0x01016e7c: 0x1016e7c: jal   0x104fd10 addiu a0, a0, 28272
 	ldloc.1
-	ldc.i4 28256
+	ldc.i4 28272
 	add
 	stloc.1
 	ldloc.0
@@ -7285,23 +7285,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01016e74: 0x1016e74: lui   a0, 0x0
+// 0x01016e84: 0x1016e84: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01016e78: 0x1016e78: lui   a1, 0x0
+// 0x01016e88: 0x1016e88: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016e7c: 0x1016e7c: addiu a0, a0, 30152
+// 0x01016e8c: 0x1016e8c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x01016e80: 0x1016e80: jal   0x104c148 addiu a1, a1, 30212
+// 0x01016e90: 0x1016e90: jal   0x104c158 addiu a1, a1, 30212
 	ldloc.2
 	ldc.i4 30212
 	add
@@ -7311,14 +7311,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01016e88: 0x1016e88: lw    ra, 20(sp)
-// 0x01016e8c: 0x1016e8c: sll   zero, zero, 0
-// 0x01016e90: 0x1016e90: jr    ra addiu sp, sp, 24
+// 0x01016e98: 0x1016e98: lw    ra, 20(sp)
+// 0x01016e9c: 0x1016e9c: sll   zero, zero, 0
+// 0x01016ea0: 0x1016ea0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7330,7 +7330,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_ok_softkey_1016e98(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_softkey_1016ea8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -7365,13 +7365,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016e98: 0x1016e98: addiu sp, sp, -24
+// 0x01016ea8: 0x1016ea8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016e9c: 0x1016e9c: sw    ra, 20(sp)
-// 0x01016ea0: 0x1016ea0: jal   0x1094b64 addiu a0, zero, 1
+// 0x01016eac: 0x1016eac: sw    ra, 20(sp)
+// 0x01016eb0: 0x1016eb0: jal   0x10951ac addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -7379,16 +7379,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01016ea8: 0x1016ea8: lw    ra, 20(sp)
-// 0x01016eac: 0x1016eac: addu  v0, zero, zero
+// 0x01016eb8: 0x1016eb8: lw    ra, 20(sp)
+// 0x01016ebc: 0x1016ebc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01016eb0: 0x1016eb0: jr    ra addiu sp, sp, 24
+// 0x01016ec0: 0x1016ec0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7400,7 +7400,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_checkin_ok_btn_1016eb8(int32,int32,int32,int32,int32)
+.method public static int32 on_checkin_ok_btn_1016ec8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -7435,13 +7435,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016eb8: 0x1016eb8: addiu sp, sp, -24
+// 0x01016ec8: 0x1016ec8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01016ebc: 0x1016ebc: sw    ra, 20(sp)
-// 0x01016ec0: 0x1016ec0: jal   0x1094a94 addu  a0, zero, zero
+// 0x01016ecc: 0x1016ecc: sw    ra, 20(sp)
+// 0x01016ed0: 0x1016ed0: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7449,16 +7449,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01016ec8: 0x1016ec8: lw    ra, 20(sp)
-// 0x01016ecc: 0x1016ecc: addiu v0, zero, 1
+// 0x01016ed8: 0x1016ed8: lw    ra, 20(sp)
+// 0x01016edc: 0x1016edc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01016ed0: 0x1016ed0: jr    ra addiu sp, sp, 24
+// 0x01016ee0: 0x1016ee0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7470,7 +7470,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 parse_search_results_1016ed8(int32,int32,int32,int32,int32)
+.method public static int32 parse_search_results_1016ee8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s7,int32 s3,int32 s1,int32 s2,int32 s4,int32 s5,int32 s6,int32 t0,int32 s8,int32 s0,int32 lo,int32 ra,int32 hi)
@@ -7541,12 +7541,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01016ed8: 0x1016ed8: addiu sp, sp, -1312
+// 0x01016ee8: 0x1016ee8: addiu sp, sp, -1312
 	ldloc.0
 	ldc.i4 -1312
 	add
 	stloc.0
-// 0x01016edc: 0x1016edc: sw    s3, 1284(sp)
+// 0x01016eec: 0x1016eec: sw    s3, 1284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7555,7 +7555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01016ee0: 0x1016ee0: sw    s0, 1272(sp)
+// 0x01016ef0: 0x1016ef0: sw    s0, 1272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7564,8 +7564,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01016ee4: 0x1016ee4: sw    ra, 1308(sp)
-// 0x01016ee8: 0x1016ee8: sw    s8, 1304(sp)
+// 0x01016ef4: 0x1016ef4: sw    ra, 1308(sp)
+// 0x01016ef8: 0x1016ef8: sw    s8, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7574,7 +7574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01016eec: 0x1016eec: sw    s7, 1300(sp)
+// 0x01016efc: 0x1016efc: sw    s7, 1300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7583,7 +7583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01016ef0: 0x1016ef0: sw    s6, 1296(sp)
+// 0x01016f00: 0x1016f00: sw    s6, 1296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7592,7 +7592,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01016ef4: 0x1016ef4: sw    s5, 1292(sp)
+// 0x01016f04: 0x1016f04: sw    s5, 1292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7601,7 +7601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01016ef8: 0x1016ef8: sw    s4, 1288(sp)
+// 0x01016f08: 0x1016f08: sw    s4, 1288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7610,7 +7610,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01016efc: 0x1016efc: sw    s2, 1280(sp)
+// 0x01016f0c: 0x1016f0c: sw    s2, 1280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7619,7 +7619,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01016f00: 0x1016f00: sw    s1, 1276(sp)
+// 0x01016f10: 0x1016f10: sw    s1, 1276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7628,24 +7628,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01016f04: 0x1016f04: addu  s0, a0, zero
+// 0x01016f14: 0x1016f14: addu  s0, a0, zero
 	ldloc.1
 	stloc 17
-// 0x01016f08: 0x1016f08: beq   a1, zero, 0x10174e4 addu  s3, a2, zero
+// 0x01016f18: 0x1016f18: beq   a1, zero, 0x10174f4 addu  s3, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 9
-	brfalse L_10174e4
+	brfalse L_10174f4
 // --- basic block ---
-// 0x01016f10: 0x1016f10: addiu a1, a1, -1
+// 0x01016f20: 0x1016f20: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01016f14: 0x1016f14: addiu v0, zero, 11
+// 0x01016f24: 0x1016f24: addiu v0, zero, 11
 	ldc.i4.s 11
 	stloc 5
-// 0x01016f18: 0x1016f18: div   a1, v0
+// 0x01016f28: 0x1016f28: div   a1, v0
 	ldloc.2
 	ldloc 5
 	ldloc.2
@@ -7654,38 +7654,38 @@ __CIBYL_javamethod_begin:
 	stloc 18
 	rem
 	stloc 20
-// 0x01016f1c: 0x1016f1c: mfhi  hi
+// 0x01016f2c: 0x1016f2c: mfhi  hi
 	ldloc 20
 	stloc.2
-// 0x01016f20: 0x1016f20: mflo  lo
+// 0x01016f30: 0x1016f30: mflo  lo
 	ldloc 18
 	stloc 14
-// 0x01016f24: 0x1016f24: bne   a1, zero, 0x1016f94 addiu s1, sp, 48
+// 0x01016f34: 0x1016f34: bne   a1, zero, 0x1016fa4 addiu s1, sp, 48
 	ldloc.2
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 10
-	brtrue L_1016f94
+	brtrue L_1016fa4
 // --- basic block ---
-// 0x01016f2c: 0x1016f2c: addiu v0, zero, 128
+// 0x01016f3c: 0x1016f3c: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x01016f30: 0x1016f30: addiu s2, sp, 32
+// 0x01016f40: 0x1016f40: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 11
-// 0x01016f34: 0x1016f34: lui   s4, 0x0
+// 0x01016f44: 0x1016f44: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01016f38: 0x1016f38: addu  a0, a2, zero
+// 0x01016f48: 0x1016f48: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01016f3c: 0x1016f3c: addu  a1, s1, zero
+// 0x01016f4c: 0x1016f4c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01016f40: 0x1016f40: sw    v0, 32(sp)
+// 0x01016f50: 0x1016f50: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7694,18 +7694,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01016f44: 0x1016f44: addu  a2, s2, zero
+// 0x01016f54: 0x1016f54: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x01016f48: 0x1016f48: addiu v0, zero, 1
+// 0x01016f58: 0x1016f58: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01016f4c: 0x1016f4c: addiu a3, s4, 30268
+// 0x01016f5c: 0x1016f5c: addiu a3, s4, 30268
 	ldloc 12
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01016f50: 0x1016f50: jal   0x1068250 sw    v0, 16(sp)
+// 0x01016f60: 0x1016f60: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7719,23 +7719,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01016f58: 0x1016f58: lui   a1, 0x0
+// 0x01016f68: 0x1016f68: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016f5c: 0x1016f5c: addu  a0, s1, zero
+// 0x01016f6c: 0x1016f6c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01016f60: 0x1016f60: addiu a1, a1, 30272
+// 0x01016f70: 0x1016f70: addiu a1, a1, 30272
 	ldloc.2
 	ldc.i4 30272
 	add
 	stloc.2
-// 0x01016f64: 0x1016f64: jal   0x1001b14 addu  s3, v0, zero
+// 0x01016f74: 0x1016f74: jal   0x1001b14 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -7743,32 +7743,32 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01016f6c: 0x1016f6c: beq   v0, zero, 0x1016fa4 lui   a1, 0x0
+// 0x01016f7c: 0x1016f7c: beq   v0, zero, 0x1016fb4 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1016fa4
+	brfalse L_1016fb4
 // --- basic block ---
-// 0x01016f74: 0x1016f74: lui   a3, 0x0
+// 0x01016f84: 0x1016f84: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01016f78: 0x1016f78: addiu a1, a1, 30284
+// 0x01016f88: 0x1016f88: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01016f7c: 0x1016f7c: addiu a3, a3, 30316
+// 0x01016f8c: 0x1016f8c: addiu a3, a3, 30316
 	ldloc 4
 	ldc.i4 30316
 	add
 	stloc 4
-// 0x01016f80: 0x1016f80: addiu a0, zero, 4
+// 0x01016f90: 0x1016f90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01016f84: 0x1016f84: addiu a2, zero, 781
+// 0x01016f94: 0x1016f94: addiu a2, zero, 781
 	ldc.i4 781
 	stloc.3
-// 0x01016f88: 0x1016f88: sw    s1, 16(sp)
+// 0x01016f98: 0x1016f98: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7777,8 +7777,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-L_1016f8c:
-// 0x01016f8c: 0x1016f8c: jal   0x100449c sll   zero, zero, 0
+L_1016f9c:
+// 0x01016f9c: 0x1016f9c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7789,62 +7789,62 @@ L_1016f8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1016f94:
-// 0x01016f94: 0x1016f94: addiu v0, zero, 18
+L_1016fa4:
+// 0x01016fa4: 0x1016fa4: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01016f98: 0x1016f98: sw    v0, 0(s0)
+// 0x01016fa8: 0x1016fa8: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01016f9c: 0x1016f9c: j	 0x10174e4 addu  s3, zero, zero
+// 0x01016fac: 0x1016fac: j	 0x10174f4 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10174e4
+	br L_10174f4
 // --- basic block ---
-L_1016fa4:
-// 0x01016fa4: 0x1016fa4: lb    v0, 0(s3)
+L_1016fb4:
+// 0x01016fb4: 0x1016fb4: lb    v0, 0(s3)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01016fa8: 0x1016fa8: sll   zero, zero, 0
-// 0x01016fac: 0x1016fac: beq   v0, zero, 0x1016ff0 lui   a3, 0x0
+// 0x01016fb8: 0x1016fb8: sll   zero, zero, 0
+// 0x01016fbc: 0x1016fbc: beq   v0, zero, 0x1017000 lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_1016ff0
+	brfalse L_1017000
 // --- basic block ---
-// 0x01016fb4: 0x1016fb4: beq   s6, zero, 0x1016fe8 lui   v0, 0x20000
+// 0x01016fc4: 0x1016fc4: beq   s6, zero, 0x1016ff8 lui   v0, 0x20000
 	ldloc 14
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1016fe8
+	brfalse L_1016ff8
 // --- basic block ---
-// 0x01016fbc: 0x1016fbc: lw    v1, 23796(v0)
+// 0x01016fcc: 0x1016fcc: lw    v1, 24260(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 7
-// 0x01016fc0: 0x1016fc0: lw    v0, 23792(v0)
+// 0x01016fd0: 0x1016fd0: lw    v0, 24256(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc 5
-// 0x01016fc4: 0x1016fc4: lui   s1, 0x0
+// 0x01016fd4: 0x1016fd4: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01016fc8: 0x1016fc8: sw    v1, 1252(sp)
+// 0x01016fd8: 0x1016fd8: sw    v1, 1252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7853,7 +7853,7 @@ L_1016fa4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01016fcc: 0x1016fcc: sw    v0, 1248(sp)
+// 0x01016fdc: 0x1016fdc: sw    v0, 1248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7862,15 +7862,15 @@ L_1016fa4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01016fd0: 0x1016fd0: addiu s1, s1, 28076
+// 0x01016fe0: 0x1016fe0: addiu s1, s1, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 10
-// 0x01016fd4: 0x1016fd4: addu  s4, zero, zero
+// 0x01016fe4: 0x1016fe4: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x01016fd8: 0x1016fd8: sw    v0, 1256(sp)
+// 0x01016fe8: 0x1016fe8: sw    v0, 1256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7879,7 +7879,7 @@ L_1016fa4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01016fdc: 0x1016fdc: sw    v1, 1260(sp)
+// 0x01016fec: 0x1016fec: sw    v1, 1260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7888,33 +7888,33 @@ L_1016fa4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01016fe0: 0x1016fe0: j	 0x10174c8 lui   s5, 0x30000
+// 0x01016ff0: 0x1016ff0: j	 0x10174d8 lui   s5, 0x30000
 	ldc.i4 196608
 	stloc 13
-	br L_10174c8
+	br L_10174d8
 // --- basic block ---
-L_1016fe8:
-// 0x01016fe8: 0x1016fe8: lui   a1, 0x0
+L_1016ff8:
+// 0x01016ff8: 0x1016ff8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01016fec: 0x1016fec: lui   a3, 0x0
+// 0x01016ffc: 0x1016ffc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-L_1016ff0:
-// 0x01016ff0: 0x1016ff0: addiu a1, a1, 30284
+L_1017000:
+// 0x01017000: 0x1017000: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01016ff4: 0x1016ff4: addiu a3, a3, 30404
+// 0x01017004: 0x1017004: addiu a3, a3, 30404
 	ldloc 4
 	ldc.i4 30404
 	add
 	stloc 4
-// 0x01016ff8: 0x1016ff8: addiu a2, zero, 789
+// 0x01017008: 0x1017008: addiu a2, zero, 789
 	ldc.i4 789
 	stloc.3
-// 0x01016ffc: 0x1016ffc: jal   0x100449c addiu a0, zero, 1
+// 0x0101700c: 0x101700c: jal   0x100449c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -7927,7 +7927,7 @@ L_1016ff0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017004: 0x1017004: jal   0x1094a94 addu  a0, zero, zero
+// 0x01017014: 0x1017014: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7935,28 +7935,28 @@ L_1016ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101700c: 0x101700c: lui   a0, 0x0
+// 0x0101701c: 0x101701c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017010: 0x1017010: lui   a1, 0x0
+// 0x01017020: 0x1017020: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017014: 0x1017014: addiu a0, a0, 30444
+// 0x01017024: 0x1017024: addiu a0, a0, 30444
 	ldloc.1
 	ldc.i4 30444
 	add
 	stloc.1
-// 0x01017018: 0x1017018: addiu a1, a1, 30456
+// 0x01017028: 0x1017028: addiu a1, a1, 30456
 	ldloc.2
 	ldc.i4 30456
 	add
 	stloc.2
-// 0x0101701c: 0x101701c: jal   0x104bfe4 addiu a2, zero, 5
+// 0x0101702c: 0x101702c: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -7964,33 +7964,33 @@ L_1016ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017024: 0x1017024: j	 0x10174e4 sll   zero, zero, 0
-	br L_10174e4
+// 0x01017034: 0x1017034: j	 0x10174f4 sll   zero, zero, 0
+	br L_10174f4
 // --- basic block ---
-L_101702c:
-// 0x0101702c: 0x101702c: addiu v0, zero, 10
+L_101703c:
+// 0x0101703c: 0x101703c: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x01017030: 0x1017030: addiu s3, zero, 1
+// 0x01017040: 0x1017040: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x01017034: 0x1017034: addiu a1, sp, 176
+// 0x01017044: 0x1017044: addiu a1, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc.2
-// 0x01017038: 0x1017038: addu  a2, s2, zero
+// 0x01017048: 0x1017048: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x0101703c: 0x101703c: addu  a3, s1, zero
+// 0x0101704c: 0x101704c: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x01017040: 0x1017040: sw    v0, 32(sp)
+// 0x01017050: 0x1017050: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7999,7 +7999,7 @@ L_101702c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01017044: 0x1017044: jal   0x1068250 sw    s3, 16(sp)
+// 0x01017054: 0x1017054: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8013,74 +8013,74 @@ L_101702c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101704c: 0x101704c: beq   v0, zero, 0x1017068 lui   a1, 0x0
+// 0x0101705c: 0x101705c: beq   v0, zero, 0x1017078 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1017068
+	brfalse L_1017078
 // --- basic block ---
-// 0x01017054: 0x1017054: lb    v1, 0(v0)
+// 0x01017064: 0x1017064: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01017058: 0x1017058: sll   zero, zero, 0
-// 0x0101705c: 0x101705c: bne   v1, zero, 0x1017084 addiu s7, zero, 100
+// 0x01017068: 0x1017068: sll   zero, zero, 0
+// 0x0101706c: 0x101706c: bne   v1, zero, 0x1017094 addiu s7, zero, 100
 	ldloc 7
 	ldc.i4.s 100
 	stloc 8
-	brtrue L_1017084
+	brtrue L_1017094
 // --- basic block ---
-// 0x01017064: 0x1017064: lui   a1, 0x0
+// 0x01017074: 0x1017074: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_1017068:
-// 0x01017068: 0x1017068: lui   a3, 0x0
+L_1017078:
+// 0x01017078: 0x1017078: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101706c: 0x101706c: addiu a1, a1, 30284
+// 0x0101707c: 0x101707c: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017070: 0x1017070: addiu a3, a3, 30488
+// 0x01017080: 0x1017080: addiu a3, a3, 30488
 	ldloc 4
 	ldc.i4 30488
 	add
 	stloc 4
-// 0x01017074: 0x1017074: addiu a0, zero, 4
+// 0x01017084: 0x1017084: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01017078: 0x1017078: addiu a2, zero, 810
+// 0x01017088: 0x1017088: addiu a2, zero, 810
 	ldc.i4 810
 	stloc.3
-// 0x0101707c: 0x101707c: j	 0x1017410 addiu v0, sp, 176
+// 0x0101708c: 0x101708c: j	 0x1017420 addiu v0, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_1017084:
-// 0x01017084: 0x1017084: addu  a0, v0, zero
+L_1017094:
+// 0x01017094: 0x1017094: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017088: 0x1017088: addiu a1, sp, 187
+// 0x01017098: 0x1017098: addiu a1, sp, 187
 	ldloc.0
 	ldc.i4 187
 	add
 	stloc.2
-// 0x0101708c: 0x101708c: addu  a2, s2, zero
+// 0x0101709c: 0x101709c: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x01017090: 0x1017090: addu  a3, s1, zero
+// 0x010170a0: 0x10170a0: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x01017094: 0x1017094: sw    s7, 32(sp)
+// 0x010170a4: 0x10170a4: sw    s7, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8089,7 +8089,7 @@ L_1017084:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01017098: 0x1017098: jal   0x1068250 sw    s3, 16(sp)
+// 0x010170a8: 0x10170a8: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8103,72 +8103,72 @@ L_1017084:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010170a0: 0x10170a0: beq   v0, zero, 0x10170b8 lui   a1, 0x0
+// 0x010170b0: 0x10170b0: beq   v0, zero, 0x10170c8 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10170b8
+	brfalse L_10170c8
 // --- basic block ---
-// 0x010170a8: 0x10170a8: lb    v1, 0(v0)
+// 0x010170b8: 0x10170b8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010170ac: 0x10170ac: sll   zero, zero, 0
-// 0x010170b0: 0x10170b0: bne   v1, zero, 0x10170d4 sll   zero, zero, 0
+// 0x010170bc: 0x10170bc: sll   zero, zero, 0
+// 0x010170c0: 0x10170c0: bne   v1, zero, 0x10170e4 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10170d4
+	brtrue L_10170e4
 // --- basic block ---
-L_10170b8:
-// 0x010170b8: 0x10170b8: lui   a3, 0x0
+L_10170c8:
+// 0x010170c8: 0x10170c8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010170bc: 0x10170bc: addiu a1, a1, 30284
+// 0x010170cc: 0x10170cc: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x010170c0: 0x10170c0: addiu a3, a3, 30552
+// 0x010170d0: 0x10170d0: addiu a3, a3, 30552
 	ldloc 4
 	ldc.i4 30552
 	add
 	stloc 4
-// 0x010170c4: 0x10170c4: addiu a0, zero, 4
+// 0x010170d4: 0x10170d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010170c8: 0x10170c8: addiu a2, zero, 826
+// 0x010170d8: 0x10170d8: addiu a2, zero, 826
 	ldc.i4 826
 	stloc.3
-// 0x010170cc: 0x10170cc: j	 0x1017410 addiu v0, sp, 187
+// 0x010170dc: 0x10170dc: j	 0x1017420 addiu v0, sp, 187
 	ldloc.0
 	ldc.i4 187
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_10170d4:
-// 0x010170d4: 0x10170d4: addu  a0, v0, zero
+L_10170e4:
+// 0x010170e4: 0x10170e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010170d8: 0x10170d8: addiu a1, sp, 288
+// 0x010170e8: 0x10170e8: addiu a1, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc.2
-// 0x010170dc: 0x10170dc: addiu v0, zero, 200
+// 0x010170ec: 0x10170ec: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x010170e0: 0x10170e0: addu  a2, s2, zero
+// 0x010170f0: 0x10170f0: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x010170e4: 0x10170e4: addu  a3, s1, zero
+// 0x010170f4: 0x10170f4: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x010170e8: 0x10170e8: sw    v0, 32(sp)
+// 0x010170f8: 0x10170f8: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8177,7 +8177,7 @@ L_10170d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010170ec: 0x10170ec: jal   0x1068250 sw    s3, 16(sp)
+// 0x010170fc: 0x10170fc: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8191,69 +8191,69 @@ L_10170d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010170f4: 0x10170f4: beq   v0, zero, 0x101710c lui   a1, 0x0
+// 0x01017104: 0x1017104: beq   v0, zero, 0x101711c lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_101710c
+	brfalse L_101711c
 // --- basic block ---
-// 0x010170fc: 0x10170fc: lb    v1, 0(v0)
+// 0x0101710c: 0x101710c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01017100: 0x1017100: sll   zero, zero, 0
-// 0x01017104: 0x1017104: bne   v1, zero, 0x1017128 sll   zero, zero, 0
+// 0x01017110: 0x1017110: sll   zero, zero, 0
+// 0x01017114: 0x1017114: bne   v1, zero, 0x1017138 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1017128
+	brtrue L_1017138
 // --- basic block ---
-L_101710c:
-// 0x0101710c: 0x101710c: lui   a3, 0x0
+L_101711c:
+// 0x0101711c: 0x101711c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01017110: 0x1017110: addiu a1, a1, 30284
+// 0x01017120: 0x1017120: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017114: 0x1017114: addiu a3, a3, 30620
+// 0x01017124: 0x1017124: addiu a3, a3, 30620
 	ldloc 4
 	ldc.i4 30620
 	add
 	stloc 4
-// 0x01017118: 0x1017118: addiu a0, zero, 4
+// 0x01017128: 0x1017128: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101711c: 0x101711c: addiu a2, zero, 842
+// 0x0101712c: 0x101712c: addiu a2, zero, 842
 	ldc.i4 842
 	stloc.3
-// 0x01017120: 0x1017120: j	 0x1017410 addiu v0, sp, 288
+// 0x01017130: 0x1017130: j	 0x1017420 addiu v0, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_1017128:
-// 0x01017128: 0x1017128: addu  a0, v0, zero
+L_1017138:
+// 0x01017138: 0x1017138: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101712c: 0x101712c: addiu a1, sp, 489
+// 0x0101713c: 0x101713c: addiu a1, sp, 489
 	ldloc.0
 	ldc.i4 489
 	add
 	stloc.2
-// 0x01017130: 0x1017130: addu  a2, s2, zero
+// 0x01017140: 0x1017140: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x01017134: 0x1017134: addu  a3, s1, zero
+// 0x01017144: 0x1017144: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x01017138: 0x1017138: sw    s7, 32(sp)
+// 0x01017148: 0x1017148: sw    s7, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8262,7 +8262,7 @@ L_1017128:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101713c: 0x101713c: jal   0x1068250 sw    s3, 16(sp)
+// 0x0101714c: 0x101714c: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8276,69 +8276,69 @@ L_1017128:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017144: 0x1017144: beq   v0, zero, 0x101715c lui   a1, 0x0
+// 0x01017154: 0x1017154: beq   v0, zero, 0x101716c lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_101715c
+	brfalse L_101716c
 // --- basic block ---
-// 0x0101714c: 0x101714c: lb    v1, 0(v0)
+// 0x0101715c: 0x101715c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01017150: 0x1017150: sll   zero, zero, 0
-// 0x01017154: 0x1017154: bne   v1, zero, 0x1017178 sll   zero, zero, 0
+// 0x01017160: 0x1017160: sll   zero, zero, 0
+// 0x01017164: 0x1017164: bne   v1, zero, 0x1017188 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1017178
+	brtrue L_1017188
 // --- basic block ---
-L_101715c:
-// 0x0101715c: 0x101715c: lui   a3, 0x0
+L_101716c:
+// 0x0101716c: 0x101716c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01017160: 0x1017160: addiu a1, a1, 30284
+// 0x01017170: 0x1017170: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017164: 0x1017164: addiu a3, a3, 30692
+// 0x01017174: 0x1017174: addiu a3, a3, 30692
 	ldloc 4
 	ldc.i4 30692
 	add
 	stloc 4
-// 0x01017168: 0x1017168: addiu a0, zero, 4
+// 0x01017178: 0x1017178: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101716c: 0x101716c: addiu a2, zero, 858
+// 0x0101717c: 0x101717c: addiu a2, zero, 858
 	ldc.i4 858
 	stloc.3
-// 0x01017170: 0x1017170: j	 0x1017410 addiu v0, sp, 489
+// 0x01017180: 0x1017180: j	 0x1017420 addiu v0, sp, 489
 	ldloc.0
 	ldc.i4 489
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_1017178:
-// 0x01017178: 0x1017178: addu  a0, v0, zero
+L_1017188:
+// 0x01017188: 0x1017188: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101717c: 0x101717c: addiu a1, sp, 590
+// 0x0101718c: 0x101718c: addiu a1, sp, 590
 	ldloc.0
 	ldc.i4 590
 	add
 	stloc.2
-// 0x01017180: 0x1017180: addu  a2, s2, zero
+// 0x01017190: 0x1017190: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x01017184: 0x1017184: addu  a3, s1, zero
+// 0x01017194: 0x1017194: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x01017188: 0x1017188: sw    s7, 32(sp)
+// 0x01017198: 0x1017198: sw    s7, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8347,7 +8347,7 @@ L_1017178:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101718c: 0x101718c: jal   0x1068250 sw    s3, 16(sp)
+// 0x0101719c: 0x101719c: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8361,77 +8361,77 @@ L_1017178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017194: 0x1017194: beq   v0, zero, 0x10171b0 lui   a1, 0x0
+// 0x010171a4: 0x10171a4: beq   v0, zero, 0x10171c0 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10171b0
+	brfalse L_10171c0
 // --- basic block ---
-// 0x0101719c: 0x101719c: lb    v1, 0(v0)
+// 0x010171ac: 0x10171ac: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010171a0: 0x10171a0: sll   zero, zero, 0
-// 0x010171a4: 0x10171a4: bne   v1, zero, 0x10171cc addiu s8, zero, 50
+// 0x010171b0: 0x10171b0: sll   zero, zero, 0
+// 0x010171b4: 0x10171b4: bne   v1, zero, 0x10171dc addiu s8, zero, 50
 	ldloc 7
 	ldc.i4.s 50
 	stloc 16
-	brtrue L_10171cc
+	brtrue L_10171dc
 // --- basic block ---
-// 0x010171ac: 0x10171ac: lui   a1, 0x0
+// 0x010171bc: 0x10171bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_10171b0:
-// 0x010171b0: 0x10171b0: lui   a3, 0x0
+L_10171c0:
+// 0x010171c0: 0x10171c0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010171b4: 0x10171b4: addiu a1, a1, 30284
+// 0x010171c4: 0x10171c4: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x010171b8: 0x10171b8: addiu a3, a3, 30764
+// 0x010171c8: 0x10171c8: addiu a3, a3, 30764
 	ldloc 4
 	ldc.i4 30764
 	add
 	stloc 4
-// 0x010171bc: 0x10171bc: addiu a0, zero, 4
+// 0x010171cc: 0x10171cc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010171c0: 0x10171c0: addiu a2, zero, 874
+// 0x010171d0: 0x10171d0: addiu a2, zero, 874
 	ldc.i4 874
 	stloc.3
-// 0x010171c4: 0x10171c4: j	 0x1017410 addiu v0, sp, 590
+// 0x010171d4: 0x10171d4: j	 0x1017420 addiu v0, sp, 590
 	ldloc.0
 	ldc.i4 590
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_10171cc:
-// 0x010171cc: 0x10171cc: addiu s3, zero, 1
+L_10171dc:
+// 0x010171dc: 0x10171dc: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010171d0: 0x10171d0: addu  a0, v0, zero
+// 0x010171e0: 0x10171e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010171d4: 0x10171d4: addiu a1, sp, 691
+// 0x010171e4: 0x10171e4: addiu a1, sp, 691
 	ldloc.0
 	ldc.i4 691
 	add
 	stloc.2
-// 0x010171d8: 0x10171d8: addu  a2, s2, zero
+// 0x010171e8: 0x10171e8: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x010171dc: 0x10171dc: addu  a3, s1, zero
+// 0x010171ec: 0x10171ec: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x010171e0: 0x10171e0: sw    s8, 32(sp)
+// 0x010171f0: 0x10171f0: sw    s8, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8440,7 +8440,7 @@ L_10171cc:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010171e4: 0x10171e4: jal   0x1068250 sw    s3, 16(sp)
+// 0x010171f4: 0x10171f4: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8454,72 +8454,72 @@ L_10171cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010171ec: 0x10171ec: beq   v0, zero, 0x1017204 lui   a1, 0x0
+// 0x010171fc: 0x10171fc: beq   v0, zero, 0x1017214 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1017204
+	brfalse L_1017214
 // --- basic block ---
-// 0x010171f4: 0x10171f4: lb    v1, 0(v0)
+// 0x01017204: 0x1017204: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010171f8: 0x10171f8: sll   zero, zero, 0
-// 0x010171fc: 0x10171fc: bne   v1, zero, 0x1017220 sll   zero, zero, 0
+// 0x01017208: 0x1017208: sll   zero, zero, 0
+// 0x0101720c: 0x101720c: bne   v1, zero, 0x1017230 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1017220
+	brtrue L_1017230
 // --- basic block ---
-L_1017204:
-// 0x01017204: 0x1017204: lui   a3, 0x0
+L_1017214:
+// 0x01017214: 0x1017214: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01017208: 0x1017208: addiu a1, a1, 30284
+// 0x01017218: 0x1017218: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x0101720c: 0x101720c: addiu a3, a3, 30832
+// 0x0101721c: 0x101721c: addiu a3, a3, 30832
 	ldloc 4
 	ldc.i4 30832
 	add
 	stloc 4
-// 0x01017210: 0x1017210: addiu a0, zero, 4
+// 0x01017220: 0x1017220: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01017214: 0x1017214: addiu a2, zero, 890
+// 0x01017224: 0x1017224: addiu a2, zero, 890
 	ldc.i4 890
 	stloc.3
-// 0x01017218: 0x1017218: j	 0x1017410 addiu v0, sp, 691
+// 0x01017228: 0x1017228: j	 0x1017420 addiu v0, sp, 691
 	ldloc.0
 	ldc.i4 691
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_1017220:
-// 0x01017220: 0x1017220: addu  a0, v0, zero
+L_1017230:
+// 0x01017230: 0x1017230: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017224: 0x1017224: addiu a1, sp, 742
+// 0x01017234: 0x1017234: addiu a1, sp, 742
 	ldloc.0
 	ldc.i4 742
 	add
 	stloc.2
-// 0x01017228: 0x1017228: addiu v0, zero, 16
+// 0x01017238: 0x1017238: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0101722c: 0x101722c: addu  a2, s2, zero
+// 0x0101723c: 0x101723c: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x01017230: 0x1017230: addu  a3, s1, zero
+// 0x01017240: 0x1017240: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x01017234: 0x1017234: sw    v0, 32(sp)
+// 0x01017244: 0x1017244: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8528,7 +8528,7 @@ L_1017220:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01017238: 0x1017238: jal   0x1068250 sw    s3, 16(sp)
+// 0x01017248: 0x1017248: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8542,74 +8542,74 @@ L_1017220:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017240: 0x1017240: beq   v0, zero, 0x101725c lui   a1, 0x0
+// 0x01017250: 0x1017250: beq   v0, zero, 0x101726c lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_101725c
+	brfalse L_101726c
 // --- basic block ---
-// 0x01017248: 0x1017248: lb    v1, 0(v0)
+// 0x01017258: 0x1017258: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0101724c: 0x101724c: sll   zero, zero, 0
-// 0x01017250: 0x1017250: bne   v1, zero, 0x1017278 addiu t0, sp, 40
+// 0x0101725c: 0x101725c: sll   zero, zero, 0
+// 0x01017260: 0x1017260: bne   v1, zero, 0x1017288 addiu t0, sp, 40
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 15
-	brtrue L_1017278
+	brtrue L_1017288
 // --- basic block ---
-// 0x01017258: 0x1017258: lui   a1, 0x0
+// 0x01017268: 0x1017268: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_101725c:
-// 0x0101725c: 0x101725c: lui   a3, 0x0
+L_101726c:
+// 0x0101726c: 0x101726c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01017260: 0x1017260: addiu a1, a1, 30284
+// 0x01017270: 0x1017270: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017264: 0x1017264: addiu a3, a3, 30900
+// 0x01017274: 0x1017274: addiu a3, a3, 30900
 	ldloc 4
 	ldc.i4 30900
 	add
 	stloc 4
-// 0x01017268: 0x1017268: addiu a0, zero, 4
+// 0x01017278: 0x1017278: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101726c: 0x101726c: addiu a2, zero, 906
+// 0x0101727c: 0x101727c: addiu a2, zero, 906
 	ldc.i4 906
 	stloc.3
-// 0x01017270: 0x1017270: j	 0x1017410 addiu v0, sp, 742
+// 0x01017280: 0x1017280: j	 0x1017420 addiu v0, sp, 742
 	ldloc.0
 	ldc.i4 742
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_1017278:
-// 0x01017278: 0x1017278: addu  a3, t0, zero
+L_1017288:
+// 0x01017288: 0x1017288: addu  a3, t0, zero
 	ldloc 15
 	stloc 4
-// 0x0101727c: 0x101727c: addu  a0, v0, zero
+// 0x0101728c: 0x101728c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017280: 0x1017280: addu  a1, s1, zero
+// 0x01017290: 0x1017290: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01017284: 0x1017284: addu  a2, zero, zero
+// 0x01017294: 0x1017294: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01017288: 0x1017288: sw    t0, 1264(sp)
+// 0x01017298: 0x1017298: sw    t0, 1264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8618,7 +8618,7 @@ L_1017278:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101728c: 0x101728c: jal   0x106885c sw    s3, 16(sp)
+// 0x0101729c: 0x101729c: jal   0x106886c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8632,12 +8632,12 @@ L_1017278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadDoubleFromString_106885c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadDoubleFromString_106886c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017294: 0x1017294: lw    a2, 1248(sp)
+// 0x010172a4: 0x10172a4: lw    a2, 1248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8646,7 +8646,7 @@ L_1017278:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01017298: 0x1017298: lw    a3, 1252(sp)
+// 0x010172a8: 0x10172a8: lw    a3, 1252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8655,7 +8655,7 @@ L_1017278:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101729c: 0x101729c: lw    a1, 44(sp)
+// 0x010172ac: 0x10172ac: lw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8664,7 +8664,7 @@ L_1017278:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010172a0: 0x10172a0: lw    a0, 40(sp)
+// 0x010172b0: 0x10172b0: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8673,7 +8673,7 @@ L_1017278:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010172a4: 0x10172a4: jal   0x10c0798 addu  s7, v0, zero
+// 0x010172b4: 0x10172b4: jal   0x10c0dd8 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -8681,26 +8681,26 @@ L_1017278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010172ac: 0x10172ac: addu  a1, v1, zero
+// 0x010172bc: 0x10172bc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010172b0: 0x10172b0: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010172c0: 0x10172c0: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010172b8: 0x10172b8: sw    v0, 760(sp)
+// 0x010172c8: 0x10172c8: sw    v0, 760(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8709,7 +8709,7 @@ L_1017278:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010172bc: 0x10172bc: lw    t0, 1264(sp)
+// 0x010172cc: 0x10172cc: lw    t0, 1264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8718,57 +8718,57 @@ L_1017278:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010172c0: 0x10172c0: beq   s7, zero, 0x10172d8 lui   a1, 0x0
+// 0x010172d0: 0x10172d0: beq   s7, zero, 0x10172e8 lui   a1, 0x0
 	ldloc 8
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10172d8
+	brfalse L_10172e8
 // --- basic block ---
-// 0x010172c8: 0x10172c8: lb    v1, 0(s7)
+// 0x010172d8: 0x10172d8: lb    v1, 0(s7)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010172cc: 0x10172cc: sll   zero, zero, 0
-// 0x010172d0: 0x10172d0: bne   v1, zero, 0x10172f0 sll   zero, zero, 0
+// 0x010172dc: 0x10172dc: sll   zero, zero, 0
+// 0x010172e0: 0x10172e0: bne   v1, zero, 0x1017300 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10172f0
+	brtrue L_1017300
 // --- basic block ---
-L_10172d8:
-// 0x010172d8: 0x10172d8: lui   a3, 0x0
+L_10172e8:
+// 0x010172e8: 0x10172e8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010172dc: 0x10172dc: addiu a1, a1, 30284
+// 0x010172ec: 0x10172ec: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x010172e0: 0x10172e0: addiu a3, a3, 30968
+// 0x010172f0: 0x10172f0: addiu a3, a3, 30968
 	ldloc 4
 	ldc.i4 30968
 	add
 	stloc 4
-// 0x010172e4: 0x10172e4: addiu a0, zero, 4
+// 0x010172f4: 0x10172f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010172e8: 0x10172e8: j	 0x1017410 addiu a2, zero, 922
+// 0x010172f8: 0x10172f8: j	 0x1017420 addiu a2, zero, 922
 	ldc.i4 922
 	stloc.3
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_10172f0:
-// 0x010172f0: 0x10172f0: addu  a3, t0, zero
+L_1017300:
+// 0x01017300: 0x1017300: addu  a3, t0, zero
 	ldloc 15
 	stloc 4
-// 0x010172f4: 0x10172f4: addu  a0, s7, zero
+// 0x01017304: 0x1017304: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x010172f8: 0x10172f8: addu  a1, s1, zero
+// 0x01017308: 0x1017308: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010172fc: 0x10172fc: addu  a2, zero, zero
+// 0x0101730c: 0x101730c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01017300: 0x1017300: jal   0x106885c sw    s3, 16(sp)
+// 0x01017310: 0x1017310: jal   0x106886c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8782,12 +8782,12 @@ L_10172f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadDoubleFromString_106885c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadDoubleFromString_106886c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017308: 0x1017308: lw    a2, 1256(sp)
+// 0x01017318: 0x1017318: lw    a2, 1256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8796,7 +8796,7 @@ L_10172f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101730c: 0x101730c: lw    a3, 1260(sp)
+// 0x0101731c: 0x101731c: lw    a3, 1260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8805,7 +8805,7 @@ L_10172f0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01017310: 0x1017310: lw    a1, 44(sp)
+// 0x01017320: 0x1017320: lw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8814,7 +8814,7 @@ L_10172f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01017314: 0x1017314: lw    a0, 40(sp)
+// 0x01017324: 0x1017324: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8823,7 +8823,7 @@ L_10172f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01017318: 0x1017318: jal   0x10c0798 addu  s7, v0, zero
+// 0x01017328: 0x1017328: jal   0x10c0dd8 addu  s7, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -8831,26 +8831,26 @@ L_10172f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017320: 0x1017320: addu  a1, v1, zero
+// 0x01017330: 0x1017330: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01017324: 0x1017324: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01017334: 0x1017334: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101732c: 0x101732c: beq   s7, zero, 0x1017344 sw    v0, 764(sp)
+// 0x0101733c: 0x101733c: beq   s7, zero, 0x1017354 sw    v0, 764(sp)
 	ldloc 8
 	ldloc 6
 	ldloc.0
@@ -8860,58 +8860,58 @@ L_10172f0:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1017344
+	brfalse L_1017354
 // --- basic block ---
-// 0x01017334: 0x1017334: lb    v1, 0(s7)
+// 0x01017344: 0x1017344: lb    v1, 0(s7)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01017338: 0x1017338: sll   zero, zero, 0
-// 0x0101733c: 0x101733c: bne   v1, zero, 0x1017360 sll   zero, zero, 0
+// 0x01017348: 0x1017348: sll   zero, zero, 0
+// 0x0101734c: 0x101734c: bne   v1, zero, 0x1017370 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1017360
+	brtrue L_1017370
 // --- basic block ---
-L_1017344:
-// 0x01017344: 0x1017344: lui   a1, 0x0
+L_1017354:
+// 0x01017354: 0x1017354: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017348: 0x1017348: lui   a3, 0x0
+// 0x01017358: 0x1017358: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101734c: 0x101734c: addiu a1, a1, 30284
+// 0x0101735c: 0x101735c: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017350: 0x1017350: addiu a3, a3, 31036
+// 0x01017360: 0x1017360: addiu a3, a3, 31036
 	ldloc 4
 	ldc.i4 31036
 	add
 	stloc 4
-// 0x01017354: 0x1017354: addiu a0, zero, 4
+// 0x01017364: 0x1017364: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01017358: 0x1017358: j	 0x1017410 addiu a2, zero, 938
+// 0x01017368: 0x1017368: j	 0x1017420 addiu a2, zero, 938
 	ldc.i4 938
 	stloc.3
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_1017360:
-// 0x01017360: 0x1017360: addu  a0, s7, zero
+L_1017370:
+// 0x01017370: 0x1017370: addu  a0, s7, zero
 	ldloc 8
 	stloc.1
-// 0x01017364: 0x1017364: addiu a1, sp, 768
+// 0x01017374: 0x1017374: addiu a1, sp, 768
 	ldloc.0
 	ldc.i4 768
 	add
 	stloc.2
-// 0x01017368: 0x1017368: addu  a2, s2, zero
+// 0x01017378: 0x1017378: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x0101736c: 0x101736c: addu  a3, s1, zero
+// 0x0101737c: 0x101737c: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x01017370: 0x1017370: sw    s8, 32(sp)
+// 0x01017380: 0x1017380: sw    s8, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8920,7 +8920,7 @@ L_1017360:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01017374: 0x1017374: jal   0x1068250 sw    s3, 16(sp)
+// 0x01017384: 0x1017384: jal   0x1068260 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8934,77 +8934,77 @@ L_1017360:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101737c: 0x101737c: beq   v0, zero, 0x1017394 lui   a1, 0x0
+// 0x0101738c: 0x101738c: beq   v0, zero, 0x10173a4 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1017394
+	brfalse L_10173a4
 // --- basic block ---
-// 0x01017384: 0x1017384: lb    v1, 0(v0)
+// 0x01017394: 0x1017394: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01017388: 0x1017388: sll   zero, zero, 0
-// 0x0101738c: 0x101738c: bne   v1, zero, 0x10173b0 sll   zero, zero, 0
+// 0x01017398: 0x1017398: sll   zero, zero, 0
+// 0x0101739c: 0x101739c: bne   v1, zero, 0x10173c0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10173b0
+	brtrue L_10173c0
 // --- basic block ---
-L_1017394:
-// 0x01017394: 0x1017394: lui   a3, 0x0
+L_10173a4:
+// 0x010173a4: 0x10173a4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01017398: 0x1017398: addiu a1, a1, 30284
+// 0x010173a8: 0x10173a8: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x0101739c: 0x101739c: addiu a3, a3, 31104
+// 0x010173ac: 0x10173ac: addiu a3, a3, 31104
 	ldloc 4
 	ldc.i4 31104
 	add
 	stloc 4
-// 0x010173a0: 0x10173a0: addiu a0, zero, 4
+// 0x010173b0: 0x10173b0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010173a4: 0x10173a4: addiu a2, zero, 954
+// 0x010173b4: 0x10173b4: addiu a2, zero, 954
 	ldc.i4 954
 	stloc.3
-// 0x010173a8: 0x10173a8: j	 0x1017410 addiu v0, sp, 768
+// 0x010173b8: 0x10173b8: j	 0x1017420 addiu v0, sp, 768
 	ldloc.0
 	ldc.i4 768
 	add
 	stloc 5
-	br L_1017410
+	br L_1017420
 // --- basic block ---
-L_10173b0:
-// 0x010173b0: 0x10173b0: lui   a1, 0x0
+L_10173c0:
+// 0x010173c0: 0x10173c0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010173b4: 0x10173b4: addu  a0, v0, zero
+// 0x010173c4: 0x10173c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010173b8: 0x10173b8: addiu a1, a1, 30268
+// 0x010173c8: 0x10173c8: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x010173bc: 0x10173bc: addiu v0, zero, 1
+// 0x010173cc: 0x10173cc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010173c0: 0x10173c0: addu  a2, zero, zero
+// 0x010173d0: 0x10173d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010173c4: 0x10173c4: addiu a3, sp, 820
+// 0x010173d4: 0x10173d4: addiu a3, sp, 820
 	ldloc.0
 	ldc.i4 820
 	add
 	stloc 4
-// 0x010173c8: 0x10173c8: jal   0x106855c sw    v0, 16(sp)
+// 0x010173d8: 0x10173d8: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9018,47 +9018,47 @@ L_10173b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010173d0: 0x10173d0: beq   v0, zero, 0x10173f4 addu  s3, v0, zero
+// 0x010173e0: 0x10173e0: beq   v0, zero, 0x1017404 addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_10173f4
+	brfalse L_1017404
 // --- basic block ---
-// 0x010173d8: 0x10173d8: lb    v0, 0(v0)
+// 0x010173e8: 0x10173e8: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010173dc: 0x10173dc: sll   zero, zero, 0
-// 0x010173e0: 0x10173e0: bne   v0, zero, 0x1017418 addiu v0, s6, -1
+// 0x010173ec: 0x10173ec: sll   zero, zero, 0
+// 0x010173f0: 0x10173f0: bne   v0, zero, 0x1017428 addiu v0, s6, -1
 	ldloc 5
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 5
-	brtrue L_1017418
+	brtrue L_1017428
 // --- basic block ---
-// 0x010173e8: 0x10173e8: slt   v0, s4, v0
+// 0x010173f8: 0x10173f8: slt   v0, s4, v0
 	ldloc 12
 	ldloc 5
 	clt
 	stloc 5
-// 0x010173ec: 0x10173ec: beq   v0, zero, 0x1017418 sll   zero, zero, 0
+// 0x010173fc: 0x10173fc: beq   v0, zero, 0x1017428 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1017418
+	brfalse L_1017428
 // --- basic block ---
-L_10173f4:
-// 0x010173f4: 0x10173f4: lui   a1, 0x0
+L_1017404:
+// 0x01017404: 0x1017404: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010173f8: 0x10173f8: lui   a3, 0x0
+// 0x01017408: 0x1017408: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010173fc: 0x10173fc: lw    v0, 820(sp)
+// 0x0101740c: 0x101740c: lw    v0, 820(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9067,24 +9067,24 @@ L_10173f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01017400: 0x1017400: addiu a1, a1, 30284
+// 0x01017410: 0x1017410: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017404: 0x1017404: addiu a3, a3, 31172
+// 0x01017414: 0x1017414: addiu a3, a3, 31172
 	ldloc 4
 	ldc.i4 31172
 	add
 	stloc 4
-// 0x01017408: 0x1017408: addiu a0, zero, 4
+// 0x01017418: 0x1017418: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101740c: 0x101740c: addiu a2, zero, 969
+// 0x0101741c: 0x101741c: addiu a2, zero, 969
 	ldc.i4 969
 	stloc.3
-L_1017410:
-// 0x01017410: 0x1017410: j	 0x1016f8c sw    v0, 16(sp)
+L_1017420:
+// 0x01017420: 0x1017420: j	 0x1016f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9093,33 +9093,33 @@ L_1017410:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1016f8c
+	br L_1016f9c
 // --- basic block ---
-L_1017418:
-// 0x01017418: 0x1017418: lw    v0, -28408(s5)
+L_1017428:
+// 0x01017428: 0x1017428: lw    v0, -27944(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7102
+	ldc.i4 -6986
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101741c: 0x101741c: sll   zero, zero, 0
-// 0x01017420: 0x1017420: slti  v0, v0, 50
+// 0x0101742c: 0x101742c: sll   zero, zero, 0
+// 0x01017430: 0x1017430: slti  v0, v0, 50
 	ldloc 5
 	ldc.i4.s 50
 	clt
 	stloc 5
-// 0x01017424: 0x1017424: beq   v0, zero, 0x10174c4 addiu s7, sp, 742
+// 0x01017434: 0x1017434: beq   v0, zero, 0x10174d4 addiu s7, sp, 742
 	ldloc 5
 	ldloc.0
 	ldc.i4 742
 	add
 	stloc 8
-	brfalse L_10174c4
+	brfalse L_10174d4
 // --- basic block ---
-// 0x0101742c: 0x101742c: jal   0x1001b48 addu  a0, s7, zero
+// 0x0101743c: 0x101743c: jal   0x1001b48 addu  a0, s7, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -9128,46 +9128,46 @@ L_1017418:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017434: 0x1017434: sltiu v0, v0, 4
+// 0x01017444: 0x1017444: sltiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	clt.un
 	stloc 5
-// 0x01017438: 0x1017438: beq   v0, zero, 0x101746c addiu a0, sp, 824
+// 0x01017448: 0x1017448: beq   v0, zero, 0x101747c addiu a0, sp, 824
 	ldloc 5
 	ldloc.0
 	ldc.i4 824
 	add
 	stloc.1
-	brfalse L_101746c
+	brfalse L_101747c
 // --- basic block ---
-// 0x01017440: 0x1017440: lui   a2, 0x0
+// 0x01017450: 0x1017450: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01017444: 0x1017444: addiu v0, sp, 288
+// 0x01017454: 0x1017454: addiu v0, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 5
-// 0x01017448: 0x1017448: addiu v1, sp, 590
+// 0x01017458: 0x1017458: addiu v1, sp, 590
 	ldloc.0
 	ldc.i4 590
 	add
 	stloc 7
-// 0x0101744c: 0x101744c: addiu a1, zero, 422
+// 0x0101745c: 0x101745c: addiu a1, zero, 422
 	ldc.i4 422
 	stloc.2
-// 0x01017450: 0x1017450: addiu a2, a2, 31244
+// 0x01017460: 0x1017460: addiu a2, a2, 31244
 	ldloc.3
 	ldc.i4 31244
 	add
 	stloc.3
-// 0x01017454: 0x1017454: addiu a3, sp, 187
+// 0x01017464: 0x1017464: addiu a3, sp, 187
 	ldloc.0
 	ldc.i4 187
 	add
 	stloc 4
-// 0x01017458: 0x1017458: sw    v0, 16(sp)
+// 0x01017468: 0x1017468: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9176,7 +9176,7 @@ L_1017418:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101745c: 0x101745c: jal   0x1000f9c sw    v1, 20(sp)
+// 0x0101746c: 0x101746c: jal   0x1000f9c sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9195,37 +9195,37 @@ L_1017418:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017464: 0x1017464: j	 0x1017494 sll   zero, zero, 0
-	br L_1017494
+// 0x01017474: 0x1017474: j	 0x10174a4 sll   zero, zero, 0
+	br L_10174a4
 // --- basic block ---
-L_101746c:
-// 0x0101746c: 0x101746c: lui   a2, 0x0
+L_101747c:
+// 0x0101747c: 0x101747c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01017470: 0x1017470: addiu v0, sp, 288
+// 0x01017480: 0x1017480: addiu v0, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 5
-// 0x01017474: 0x1017474: addiu v1, sp, 590
+// 0x01017484: 0x1017484: addiu v1, sp, 590
 	ldloc.0
 	ldc.i4 590
 	add
 	stloc 7
-// 0x01017478: 0x1017478: addiu a1, zero, 422
+// 0x01017488: 0x1017488: addiu a1, zero, 422
 	ldc.i4 422
 	stloc.2
-// 0x0101747c: 0x101747c: addiu a2, a2, 31256
+// 0x0101748c: 0x101748c: addiu a2, a2, 31256
 	ldloc.3
 	ldc.i4 31256
 	add
 	stloc.3
-// 0x01017480: 0x1017480: addiu a3, sp, 187
+// 0x01017490: 0x1017490: addiu a3, sp, 187
 	ldloc.0
 	ldc.i4 187
 	add
 	stloc 4
-// 0x01017484: 0x1017484: sw    s7, 24(sp)
+// 0x01017494: 0x1017494: sw    s7, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9234,7 +9234,7 @@ L_101746c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01017488: 0x1017488: sw    v0, 16(sp)
+// 0x01017498: 0x1017498: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9243,7 +9243,7 @@ L_101746c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101748c: 0x101748c: jal   0x1000f9c sw    v1, 20(sp)
+// 0x0101749c: 0x101749c: jal   0x1000f9c sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9262,49 +9262,49 @@ L_101746c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1017494:
-// 0x01017494: 0x1017494: lw    s7, -28408(s5)
+L_10174a4:
+// 0x010174a4: 0x10174a4: lw    s7, -27944(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7102
+	ldc.i4 -6986
 	add
 	ldelem.i4
 	stloc 8
-// 0x01017498: 0x1017498: addiu a0, zero, 1072
+// 0x010174a8: 0x10174a8: addiu a0, zero, 1072
 	ldc.i4 1072
 	stloc.1
-// 0x0101749c: 0x101749c: mult  s7, a0
+// 0x010174ac: 0x10174ac: mult  s7, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 18
-// 0x010174a0: 0x10174a0: lui   v0, 0x30000
+// 0x010174b0: 0x10174b0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010174a4: 0x10174a4: addiu v0, v0, -27796
+// 0x010174b4: 0x10174b4: addiu v0, v0, -27332
 	ldloc 5
-	ldc.i4 -27796
+	ldc.i4 -27332
 	add
 	stloc 5
-// 0x010174a8: 0x10174a8: addiu a1, sp, 176
+// 0x010174b8: 0x10174b8: addiu a1, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc.2
-// 0x010174ac: 0x10174ac: addiu a2, zero, 1072
+// 0x010174bc: 0x10174bc: addiu a2, zero, 1072
 	ldc.i4 1072
 	stloc.3
-// 0x010174b0: 0x10174b0: addiu s7, s7, 1
+// 0x010174c0: 0x10174c0: addiu s7, s7, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010174b4: 0x10174b4: mflo  lo
+// 0x010174c4: 0x10174c4: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x010174b8: 0x10174b8: jal   0x1001800 addu  a0, v0, a0
+// 0x010174c8: 0x10174c8: jal   0x1001800 addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
@@ -9318,42 +9318,42 @@ L_1017494:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010174c0: 0x10174c0: sw    s7, -28408(s5)
+// 0x010174d0: 0x10174d0: sw    s7, -27944(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7102
+	ldc.i4 -6986
 	add
 	ldloc 8
 	stelem.i4
-L_10174c4:
-// 0x010174c4: 0x10174c4: addiu s4, s4, 1
+L_10174d4:
+// 0x010174d4: 0x10174d4: addiu s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-L_10174c8:
-// 0x010174c8: 0x10174c8: slt   v0, s4, s6
+L_10174d8:
+// 0x010174d8: 0x10174d8: slt   v0, s4, s6
 	ldloc 12
 	ldloc 14
 	clt
 	stloc 5
-// 0x010174cc: 0x10174cc: bne   v0, zero, 0x101702c addu  a0, s3, zero
+// 0x010174dc: 0x10174dc: bne   v0, zero, 0x101703c addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_101702c
+	brtrue L_101703c
 // --- basic block ---
-// 0x010174d4: 0x10174d4: lui   a1, 0x1010000
+// 0x010174e4: 0x10174e4: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x010174d8: 0x10174d8: addiu a1, a1, 27856
+// 0x010174e8: 0x10174e8: addiu a1, a1, 27872
 	ldloc.2
-	ldc.i4 27856
+	ldc.i4 27872
 	add
 	stloc.2
-// 0x010174dc: 0x10174dc: jal   0x104fe98 addiu a0, zero, 100
+// 0x010174ec: 0x10174ec: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -9361,17 +9361,17 @@ L_10174c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10174e4:
-// 0x010174e4: 0x10174e4: lw    ra, 1308(sp)
-// 0x010174e8: 0x10174e8: addu  v0, s3, zero
+L_10174f4:
+// 0x010174f4: 0x10174f4: lw    ra, 1308(sp)
+// 0x010174f8: 0x10174f8: addu  v0, s3, zero
 	ldloc 9
 	stloc 5
-// 0x010174ec: 0x10174ec: lw    s8, 1304(sp)
+// 0x010174fc: 0x10174fc: lw    s8, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9380,7 +9380,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010174f0: 0x10174f0: lw    s7, 1300(sp)
+// 0x01017500: 0x1017500: lw    s7, 1300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9389,7 +9389,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010174f4: 0x10174f4: lw    s6, 1296(sp)
+// 0x01017504: 0x1017504: lw    s6, 1296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9398,7 +9398,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010174f8: 0x10174f8: lw    s5, 1292(sp)
+// 0x01017508: 0x1017508: lw    s5, 1292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9407,7 +9407,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010174fc: 0x10174fc: lw    s4, 1288(sp)
+// 0x0101750c: 0x101750c: lw    s4, 1288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9416,7 +9416,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01017500: 0x1017500: lw    s3, 1284(sp)
+// 0x01017510: 0x1017510: lw    s3, 1284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9425,7 +9425,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01017504: 0x1017504: lw    s2, 1280(sp)
+// 0x01017514: 0x1017514: lw    s2, 1280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9434,7 +9434,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01017508: 0x1017508: lw    s1, 1276(sp)
+// 0x01017518: 0x1017518: lw    s1, 1276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9443,7 +9443,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101750c: 0x101750c: lw    s0, 1272(sp)
+// 0x0101751c: 0x101751c: lw    s0, 1272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9452,7 +9452,7 @@ L_10174e4:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01017510: 0x1017510: jr    ra addiu sp, sp, 1312
+// 0x01017520: 0x1017520: jr    ra addiu sp, sp, 1312
 	ldloc.0
 	ldc.i4 1312
 	add
diff --git a/converted/Cibyl17.j b/converted/Cibyl17.j
index 99dee4b..ea24e8c 100644
--- a/converted/Cibyl17.j
+++ b/converted/Cibyl17.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl17::.ctor
 
-.method public static int32 roadmap_foursquare_disable_tweet_badge_1017518(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_disable_tweet_badge_1017528(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -76,24 +76,24 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017518: 0x1017518: lui   a0, 0x0
+// 0x01017528: 0x1017528: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101751c: 0x101751c: lui   a1, 0x0
+// 0x0101752c: 0x101752c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017520: 0x1017520: addiu sp, sp, -24
+// 0x01017530: 0x1017530: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017524: 0x1017524: addiu a0, a0, 2432
+// 0x01017534: 0x1017534: addiu a0, a0, 2432
 	ldloc.1
 	ldc.i4 2432
 	add
 	stloc.1
-// 0x01017528: 0x1017528: sw    ra, 20(sp)
-// 0x0101752c: 0x101752c: jal   0x100e5c0 addiu a1, a1, 31272
+// 0x01017538: 0x1017538: sw    ra, 20(sp)
+// 0x0101753c: 0x101753c: jal   0x100e5d0 addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
@@ -103,12 +103,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01017534: 0x1017534: jal   0x100ea50 addu  a0, zero, zero
+// 0x01017544: 0x1017544: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -116,14 +116,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101753c: 0x101753c: lw    ra, 20(sp)
-// 0x01017540: 0x1017540: sll   zero, zero, 0
-// 0x01017544: 0x1017544: jr    ra addiu sp, sp, 24
+// 0x0101754c: 0x101754c: lw    ra, 20(sp)
+// 0x01017550: 0x1017550: sll   zero, zero, 0
+// 0x01017554: 0x1017554: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -135,7 +135,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_foursquare_enable_tweet_badge_101754c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_enable_tweet_badge_101755c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -170,24 +170,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101754c: 0x101754c: lui   a0, 0x0
+// 0x0101755c: 0x101755c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017550: 0x1017550: lui   a1, 0x0
+// 0x01017560: 0x1017560: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017554: 0x1017554: addiu sp, sp, -24
+// 0x01017564: 0x1017564: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017558: 0x1017558: addiu a0, a0, 2432
+// 0x01017568: 0x1017568: addiu a0, a0, 2432
 	ldloc.1
 	ldc.i4 2432
 	add
 	stloc.1
-// 0x0101755c: 0x101755c: sw    ra, 20(sp)
-// 0x01017560: 0x1017560: jal   0x100e5c0 addiu a1, a1, 21112
+// 0x0101756c: 0x101756c: sw    ra, 20(sp)
+// 0x01017570: 0x1017570: jal   0x100e5d0 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -197,12 +197,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01017568: 0x1017568: jal   0x100ea50 addu  a0, zero, zero
+// 0x01017578: 0x1017578: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -210,14 +210,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01017570: 0x1017570: lw    ra, 20(sp)
-// 0x01017574: 0x1017574: sll   zero, zero, 0
-// 0x01017578: 0x1017578: jr    ra addiu sp, sp, 24
+// 0x01017580: 0x1017580: lw    ra, 20(sp)
+// 0x01017584: 0x1017584: sll   zero, zero, 0
+// 0x01017588: 0x1017588: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -229,7 +229,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_foursquare_disable_tweet_login_1017580(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_disable_tweet_login_1017590(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -264,24 +264,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017580: 0x1017580: lui   a0, 0x0
+// 0x01017590: 0x1017590: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017584: 0x1017584: lui   a1, 0x0
+// 0x01017594: 0x1017594: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017588: 0x1017588: addiu sp, sp, -24
+// 0x01017598: 0x1017598: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101758c: 0x101758c: addiu a0, a0, 2416
+// 0x0101759c: 0x101759c: addiu a0, a0, 2416
 	ldloc.1
 	ldc.i4 2416
 	add
 	stloc.1
-// 0x01017590: 0x1017590: sw    ra, 20(sp)
-// 0x01017594: 0x1017594: jal   0x100e5c0 addiu a1, a1, 31272
+// 0x010175a0: 0x10175a0: sw    ra, 20(sp)
+// 0x010175a4: 0x10175a4: jal   0x100e5d0 addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
@@ -291,12 +291,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101759c: 0x101759c: jal   0x100ea50 addu  a0, zero, zero
+// 0x010175ac: 0x10175ac: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -304,14 +304,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010175a4: 0x10175a4: lw    ra, 20(sp)
-// 0x010175a8: 0x10175a8: sll   zero, zero, 0
-// 0x010175ac: 0x10175ac: jr    ra addiu sp, sp, 24
+// 0x010175b4: 0x10175b4: lw    ra, 20(sp)
+// 0x010175b8: 0x10175b8: sll   zero, zero, 0
+// 0x010175bc: 0x10175bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -323,7 +323,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_foursquare_enable_tweet_login_10175b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_enable_tweet_login_10175c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -358,24 +358,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010175b4: 0x10175b4: lui   a0, 0x0
+// 0x010175c4: 0x10175c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010175b8: 0x10175b8: lui   a1, 0x0
+// 0x010175c8: 0x10175c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010175bc: 0x10175bc: addiu sp, sp, -24
+// 0x010175cc: 0x10175cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010175c0: 0x10175c0: addiu a0, a0, 2416
+// 0x010175d0: 0x10175d0: addiu a0, a0, 2416
 	ldloc.1
 	ldc.i4 2416
 	add
 	stloc.1
-// 0x010175c4: 0x10175c4: sw    ra, 20(sp)
-// 0x010175c8: 0x10175c8: jal   0x100e5c0 addiu a1, a1, 21112
+// 0x010175d4: 0x10175d4: sw    ra, 20(sp)
+// 0x010175d8: 0x10175d8: jal   0x100e5d0 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -385,12 +385,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010175d0: 0x10175d0: jal   0x100ea50 addu  a0, zero, zero
+// 0x010175e0: 0x10175e0: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -398,14 +398,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010175d8: 0x10175d8: lw    ra, 20(sp)
-// 0x010175dc: 0x10175dc: sll   zero, zero, 0
-// 0x010175e0: 0x10175e0: jr    ra addiu sp, sp, 24
+// 0x010175e8: 0x10175e8: lw    ra, 20(sp)
+// 0x010175ec: 0x10175ec: sll   zero, zero, 0
+// 0x010175f0: 0x10175f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -417,7 +417,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_foursquare_set_password_10175e8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_set_password_10175f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -452,26 +452,26 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010175e8: 0x10175e8: lui   a0, 0x0
+// 0x010175f8: 0x10175f8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010175ec: 0x10175ec: lui   a1, 0x10000
+// 0x010175fc: 0x10175fc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010175f0: 0x10175f0: addiu sp, sp, -24
+// 0x01017600: 0x1017600: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010175f4: 0x10175f4: addiu a0, a0, 2400
+// 0x01017604: 0x1017604: addiu a0, a0, 2400
 	ldloc.1
 	ldc.i4 2400
 	add
 	stloc.1
-// 0x010175f8: 0x10175f8: sw    ra, 20(sp)
-// 0x010175fc: 0x10175fc: jal   0x100e5c0 addiu a1, a1, 18500
+// 0x01017608: 0x1017608: sw    ra, 20(sp)
+// 0x0101760c: 0x101760c: jal   0x100e5d0 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -479,12 +479,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01017604: 0x1017604: jal   0x100ea50 addu  a0, zero, zero
+// 0x01017614: 0x1017614: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -492,14 +492,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101760c: 0x101760c: lw    ra, 20(sp)
-// 0x01017610: 0x1017610: sll   zero, zero, 0
-// 0x01017614: 0x1017614: jr    ra addiu sp, sp, 24
+// 0x0101761c: 0x101761c: lw    ra, 20(sp)
+// 0x01017620: 0x1017620: sll   zero, zero, 0
+// 0x01017624: 0x1017624: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -511,7 +511,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_foursquare_set_username_101761c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_set_username_101762c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -546,19 +546,19 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101761c: 0x101761c: addu  a1, a0, zero
+// 0x0101762c: 0x101762c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01017620: 0x1017620: lui   a0, 0x0
+// 0x01017630: 0x1017630: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017624: 0x1017624: addiu sp, sp, -24
+// 0x01017634: 0x1017634: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017628: 0x1017628: sw    ra, 20(sp)
-// 0x0101762c: 0x101762c: jal   0x100e5c0 addiu a0, a0, 2384
+// 0x01017638: 0x1017638: sw    ra, 20(sp)
+// 0x0101763c: 0x101763c: jal   0x100e5d0 addiu a0, a0, 2384
 	ldloc.1
 	ldc.i4 2384
 	add
@@ -568,12 +568,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01017634: 0x1017634: jal   0x100ea50 addu  a0, zero, zero
+// 0x01017644: 0x1017644: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -581,14 +581,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101763c: 0x101763c: lw    ra, 20(sp)
-// 0x01017640: 0x1017640: sll   zero, zero, 0
-// 0x01017644: 0x1017644: jr    ra addiu sp, sp, 24
+// 0x0101764c: 0x101764c: lw    ra, 20(sp)
+// 0x01017650: 0x1017650: sll   zero, zero, 0
+// 0x01017654: 0x1017654: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -600,7 +600,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_foursquare_set_logged_in_101764c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_set_logged_in_101765c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -635,60 +635,60 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101764c: 0x101764c: addiu sp, sp, -24
+// 0x0101765c: 0x101765c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017650: 0x1017650: sw    ra, 20(sp)
-// 0x01017654: 0x1017654: beq   a0, zero, 0x101766c lui   v0, 0x0
+// 0x01017660: 0x1017660: sw    ra, 20(sp)
+// 0x01017664: 0x1017664: beq   a0, zero, 0x101767c lui   v0, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_101766c
+	brfalse L_101767c
 // --- basic block ---
-// 0x0101765c: 0x101765c: lui   a1, 0x0
+// 0x0101766c: 0x101766c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017660: 0x1017660: addiu a0, v0, 2464
+// 0x01017670: 0x1017670: addiu a0, v0, 2464
 	ldloc 5
 	ldc.i4 2464
 	add
 	stloc.1
-// 0x01017664: 0x1017664: j	 0x1017678 addiu a1, a1, 20820
+// 0x01017674: 0x1017674: j	 0x1017688 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-	br L_1017678
+	br L_1017688
 // --- basic block ---
-L_101766c:
-// 0x0101766c: 0x101766c: lui   a1, 0x20000
+L_101767c:
+// 0x0101767c: 0x101767c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01017670: 0x1017670: addiu a0, v0, 2464
+// 0x01017680: 0x1017680: addiu a0, v0, 2464
 	ldloc 5
 	ldc.i4 2464
 	add
 	stloc.1
-// 0x01017674: 0x1017674: addiu a1, a1, 9464
+// 0x01017684: 0x1017684: addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-L_1017678:
-// 0x01017678: 0x1017678: jal   0x100e5c0 sll   zero, zero, 0
+L_1017688:
+// 0x01017688: 0x1017688: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017680: 0x1017680: jal   0x100ea50 addu  a0, zero, zero
+// 0x01017690: 0x1017690: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -696,14 +696,14 @@ L_1017678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017688: 0x1017688: lw    ra, 20(sp)
-// 0x0101768c: 0x101768c: sll   zero, zero, 0
-// 0x01017690: 0x1017690: jr    ra addiu sp, sp, 24
+// 0x01017698: 0x1017698: lw    ra, 20(sp)
+// 0x0101769c: 0x101769c: sll   zero, zero, 0
+// 0x010176a0: 0x10176a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -715,7 +715,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_login_failed_1017698(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_login_failed_10176a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -750,64 +750,64 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017698: 0x1017698: addiu sp, sp, -24
+// 0x010176a8: 0x10176a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101769c: 0x101769c: addiu v1, zero, 701
+// 0x010176ac: 0x10176ac: addiu v1, zero, 701
 	ldc.i4 701
 	stloc 6
-// 0x010176a0: 0x10176a0: sw    ra, 20(sp)
-// 0x010176a4: 0x10176a4: bne   a0, v1, 0x10176bc lui   v0, 0x0
+// 0x010176b0: 0x10176b0: sw    ra, 20(sp)
+// 0x010176b4: 0x10176b4: bne   a0, v1, 0x10176cc lui   v0, 0x0
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_10176bc
+	bne.un L_10176cc
 // --- basic block ---
-// 0x010176ac: 0x10176ac: lui   a1, 0x0
+// 0x010176bc: 0x10176bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010176b0: 0x10176b0: addiu a0, v0, 30092
+// 0x010176c0: 0x10176c0: addiu a0, v0, 30092
 	ldloc 5
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010176b4: 0x10176b4: j	 0x10176c8 addiu a1, a1, 31284
+// 0x010176c4: 0x10176c4: j	 0x10176d8 addiu a1, a1, 31284
 	ldloc.2
 	ldc.i4 31284
 	add
 	stloc.2
-	br L_10176c8
+	br L_10176d8
 // --- basic block ---
-L_10176bc:
-// 0x010176bc: 0x10176bc: lui   a1, 0x0
+L_10176cc:
+// 0x010176cc: 0x10176cc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010176c0: 0x10176c0: addiu a0, v0, 30092
+// 0x010176d0: 0x10176d0: addiu a0, v0, 30092
 	ldloc 5
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010176c4: 0x10176c4: addiu a1, a1, 30100
+// 0x010176d4: 0x10176d4: addiu a1, a1, 30100
 	ldloc.2
 	ldc.i4 30100
 	add
 	stloc.2
-L_10176c8:
-// 0x010176c8: 0x10176c8: jal   0x104c148 sll   zero, zero, 0
+L_10176d8:
+// 0x010176d8: 0x10176d8: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010176d0: 0x10176d0: jal   0x101764c addu  a0, zero, zero
+// 0x010176e0: 0x10176e0: jal   0x101765c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -815,14 +815,14 @@ L_10176c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_set_logged_in_101764c(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_set_logged_in_101765c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010176d8: 0x10176d8: lw    ra, 20(sp)
-// 0x010176dc: 0x10176dc: sll   zero, zero, 0
-// 0x010176e0: 0x10176e0: jr    ra addiu sp, sp, 24
+// 0x010176e8: 0x10176e8: lw    ra, 20(sp)
+// 0x010176ec: 0x10176ec: sll   zero, zero, 0
+// 0x010176f0: 0x10176f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -834,7 +834,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_request_failed_10176e8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_request_failed_10176f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -872,12 +872,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010176e8: 0x10176e8: addiu sp, sp, -32
+// 0x010176f8: 0x10176f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010176ec: 0x10176ec: sw    s0, 24(sp)
+// 0x010176fc: 0x10176fc: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -886,16 +886,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010176f0: 0x10176f0: addu  s0, a0, zero
+// 0x01017700: 0x1017700: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010176f4: 0x10176f4: lui   a0, 0x1010000
+// 0x01017704: 0x1017704: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x010176f8: 0x10176f8: sw    ra, 28(sp)
-// 0x010176fc: 0x10176fc: jal   0x104fd00 addiu a0, a0, 28136
+// 0x01017708: 0x1017708: sw    ra, 28(sp)
+// 0x0101770c: 0x101770c: jal   0x104fd10 addiu a0, a0, 28152
 	ldloc.1
-	ldc.i4 28136
+	ldc.i4 28152
 	add
 	stloc.1
 	ldloc.0
@@ -903,82 +903,82 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017704: 0x1017704: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x01017714: 0x1017714: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101770c: 0x101770c: lui   v0, 0x30000
+// 0x0101771c: 0x101771c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01017710: 0x1017710: lw    v0, -28412(v0)
+// 0x01017720: 0x1017720: lw    v0, -27948(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldelem.i4
 	stloc 5
-// 0x01017714: 0x1017714: addiu v1, zero, 1
+// 0x01017724: 0x1017724: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01017718: 0x1017718: beq   v0, v1, 0x1017738 addiu v1, zero, 2
+// 0x01017728: 0x1017728: beq   v0, v1, 0x1017748 addiu v1, zero, 2
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	stloc 6
-	beq  L_1017738
+	beq  L_1017748
 // --- basic block ---
-// 0x01017720: 0x1017720: beq   v0, v1, 0x1017768 addiu v1, zero, 3
+// 0x01017730: 0x1017730: beq   v0, v1, 0x1017778 addiu v1, zero, 3
 	ldloc 5
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	beq  L_1017768
+	beq  L_1017778
 // --- basic block ---
-// 0x01017728: 0x1017728: bne   v0, v1, 0x10177b8 lui   a1, 0x0
+// 0x01017738: 0x1017738: bne   v0, v1, 0x10177c8 lui   a1, 0x0
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_10177b8
+	bne.un L_10177c8
 // --- basic block ---
-// 0x01017730: 0x1017730: j	 0x1017784 lui   a3, 0x0
+// 0x01017740: 0x1017740: j	 0x1017794 lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-	br L_1017784
+	br L_1017794
 // --- basic block ---
-L_1017738:
-// 0x01017738: 0x1017738: lui   a1, 0x0
+L_1017748:
+// 0x01017748: 0x1017748: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101773c: 0x101773c: lui   a3, 0x0
+// 0x0101774c: 0x101774c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01017740: 0x1017740: addiu a1, a1, 30284
+// 0x01017750: 0x1017750: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017744: 0x1017744: addiu a3, a3, 31396
+// 0x01017754: 0x1017754: addiu a3, a3, 31396
 	ldloc 4
 	ldc.i4 31396
 	add
 	stloc 4
-// 0x01017748: 0x1017748: addiu a2, zero, 1043
+// 0x01017758: 0x1017758: addiu a2, zero, 1043
 	ldc.i4 1043
 	stloc.3
-// 0x0101774c: 0x101774c: addiu a0, zero, 4
+// 0x0101775c: 0x101775c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01017750: 0x1017750: jal   0x100449c sw    s0, 16(sp)
+// 0x01017760: 0x1017760: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -997,7 +997,7 @@ L_1017738:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017758: 0x1017758: jal   0x1017698 addu  a0, s0, zero
+// 0x01017768: 0x1017768: jal   0x10176a8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1005,58 +1005,58 @@ L_1017738:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_login_failed_1017698(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_login_failed_10176a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017760: 0x1017760: j	 0x10177d4 sll   zero, zero, 0
-	br L_10177d4
+// 0x01017770: 0x1017770: j	 0x10177e4 sll   zero, zero, 0
+	br L_10177e4
 // --- basic block ---
-L_1017768:
-// 0x01017768: 0x1017768: lui   a1, 0x0
+L_1017778:
+// 0x01017778: 0x1017778: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101776c: 0x101776c: lui   a3, 0x0
+// 0x0101777c: 0x101777c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01017770: 0x1017770: addiu a1, a1, 30284
+// 0x01017780: 0x1017780: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017774: 0x1017774: addiu a3, a3, 31464
+// 0x01017784: 0x1017784: addiu a3, a3, 31464
 	ldloc 4
 	ldc.i4 31464
 	add
 	stloc 4
-// 0x01017778: 0x1017778: addiu a0, zero, 4
+// 0x01017788: 0x1017788: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101777c: 0x101777c: j	 0x1017794 addiu a2, zero, 1047
+// 0x0101778c: 0x101778c: j	 0x10177a4 addiu a2, zero, 1047
 	ldc.i4 1047
 	stloc.3
-	br L_1017794
+	br L_10177a4
 // --- basic block ---
-L_1017784:
-// 0x01017784: 0x1017784: addiu a1, a1, 30284
+L_1017794:
+// 0x01017794: 0x1017794: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017788: 0x1017788: addiu a3, a3, 31540
+// 0x01017798: 0x1017798: addiu a3, a3, 31540
 	ldloc 4
 	ldc.i4 31540
 	add
 	stloc 4
-// 0x0101778c: 0x101778c: addiu a0, zero, 4
+// 0x0101779c: 0x101779c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01017790: 0x1017790: addiu a2, zero, 1051
+// 0x010177a0: 0x10177a0: addiu a2, zero, 1051
 	ldc.i4 1051
 	stloc.3
-L_1017794:
-// 0x01017794: 0x1017794: jal   0x100449c sw    s0, 16(sp)
+L_10177a4:
+// 0x010177a4: 0x10177a4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1075,18 +1075,18 @@ L_1017794:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101779c: 0x101779c: lui   a0, 0x0
+// 0x010177ac: 0x10177ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010177a0: 0x10177a0: lui   a1, 0x0
+// 0x010177b0: 0x10177b0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010177a4: 0x10177a4: addiu a0, a0, 30092
+// 0x010177b4: 0x10177b4: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010177a8: 0x10177a8: jal   0x104c148 addiu a1, a1, 30100
+// 0x010177b8: 0x10177b8: jal   0x104c158 addiu a1, a1, 30100
 	ldloc.2
 	ldc.i4 30100
 	add
@@ -1096,35 +1096,35 @@ L_1017794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010177b0: 0x10177b0: j	 0x10177d4 sll   zero, zero, 0
-	br L_10177d4
+// 0x010177c0: 0x10177c0: j	 0x10177e4 sll   zero, zero, 0
+	br L_10177e4
 // --- basic block ---
-L_10177b8:
-// 0x010177b8: 0x10177b8: lui   a3, 0x0
+L_10177c8:
+// 0x010177c8: 0x10177c8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010177bc: 0x10177bc: addiu a1, a1, 30284
+// 0x010177cc: 0x10177cc: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x010177c0: 0x10177c0: addiu a3, a3, 31608
+// 0x010177d0: 0x10177d0: addiu a3, a3, 31608
 	ldloc 4
 	ldc.i4 31608
 	add
 	stloc 4
-// 0x010177c4: 0x10177c4: addiu a0, zero, 4
+// 0x010177d4: 0x10177d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010177c8: 0x10177c8: addiu a2, zero, 1055
+// 0x010177d8: 0x10177d8: addiu a2, zero, 1055
 	ldc.i4 1055
 	stloc.3
-// 0x010177cc: 0x10177cc: jal   0x100449c sw    s0, 16(sp)
+// 0x010177dc: 0x10177dc: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1143,12 +1143,12 @@ L_10177b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10177d4:
-// 0x010177d4: 0x10177d4: lw    ra, 28(sp)
-// 0x010177d8: 0x10177d8: lui   v0, 0x30000
+L_10177e4:
+// 0x010177e4: 0x10177e4: lw    ra, 28(sp)
+// 0x010177e8: 0x10177e8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010177dc: 0x10177dc: lw    s0, 24(sp)
+// 0x010177ec: 0x10177ec: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1157,16 +1157,16 @@ L_10177d4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010177e0: 0x10177e0: sw    zero, -28412(v0)
+// 0x010177f0: 0x10177f0: sw    zero, -27948(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010177e4: 0x10177e4: jr    ra addiu sp, sp, 32
+// 0x010177f4: 0x10177f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1178,7 +1178,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 foursquare_network_error_10177ec(int32,int32,int32,int32,int32)
+.method public static int32 foursquare_network_error_10177fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1213,18 +1213,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010177ec: 0x10177ec: lui   a0, 0x1010000
+// 0x010177fc: 0x10177fc: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x010177f0: 0x10177f0: addiu sp, sp, -24
+// 0x01017800: 0x1017800: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010177f4: 0x10177f4: sw    ra, 20(sp)
-// 0x010177f8: 0x10177f8: jal   0x104fd00 addiu a0, a0, 30700
+// 0x01017804: 0x1017804: sw    ra, 20(sp)
+// 0x01017808: 0x1017808: jal   0x104fd10 addiu a0, a0, 30716
 	ldloc.1
-	ldc.i4 30700
+	ldc.i4 30716
 	add
 	stloc.1
 	ldloc.0
@@ -1232,15 +1232,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017800: 0x1017800: lui   a0, 0x0
+// 0x01017810: 0x1017810: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017804: 0x1017804: jal   0x101cd60 addiu a0, a0, 31676
+// 0x01017814: 0x1017814: jal   0x101cd70 addiu a0, a0, 31676
 	ldloc.1
 	ldc.i4 31676
 	add
@@ -1250,20 +1250,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101780c: 0x101780c: lui   a0, 0x0
+// 0x0101781c: 0x101781c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017810: 0x1017810: addiu a0, a0, 30092
+// 0x01017820: 0x1017820: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x01017814: 0x1017814: jal   0x104c148 addu  a1, v0, zero
+// 0x01017824: 0x1017824: jal   0x104c158 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1271,12 +1271,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101781c: 0x101781c: jal   0x101764c addu  a0, zero, zero
+// 0x0101782c: 0x101782c: jal   0x101765c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1284,14 +1284,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_set_logged_in_101764c(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_set_logged_in_101765c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017824: 0x1017824: lw    ra, 20(sp)
-// 0x01017828: 0x1017828: sll   zero, zero, 0
-// 0x0101782c: 0x101782c: jr    ra addiu sp, sp, 24
+// 0x01017834: 0x1017834: lw    ra, 20(sp)
+// 0x01017838: 0x1017838: sll   zero, zero, 0
+// 0x0101783c: 0x101783c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1303,7 +1303,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_is_tweet_badge_enabled_1017834(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_is_tweet_badge_enabled_1017844(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -1338,16 +1338,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017834: 0x1017834: lui   a0, 0x0
+// 0x01017844: 0x1017844: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017838: 0x1017838: addiu sp, sp, -24
+// 0x01017848: 0x1017848: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101783c: 0x101783c: sw    ra, 20(sp)
-// 0x01017840: 0x1017840: jal   0x100e348 addiu a0, a0, 2432
+// 0x0101784c: 0x101784c: sw    ra, 20(sp)
+// 0x01017850: 0x1017850: jal   0x100e358 addiu a0, a0, 2432
 	ldloc.1
 	ldc.i4 2432
 	add
@@ -1357,18 +1357,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017848: 0x1017848: lui   a1, 0x0
+// 0x01017858: 0x1017858: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101784c: 0x101784c: addu  a0, v0, zero
+// 0x0101785c: 0x101785c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017850: 0x1017850: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01017860: 0x1017860: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -1378,13 +1378,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01017858: 0x1017858: lw    ra, 20(sp)
-// 0x0101785c: 0x101785c: sltiu v0, v0, 1
+// 0x01017868: 0x1017868: lw    ra, 20(sp)
+// 0x0101786c: 0x101786c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01017860: 0x1017860: jr    ra addiu sp, sp, 24
+// 0x01017870: 0x1017870: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1396,7 +1396,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_venue_item_selected_1017868(int32,int32,int32,int32,int32)
+.method public static int32 on_venue_item_selected_1017878(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 lo,int32 ra)
@@ -1437,26 +1437,26 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017868: 0x1017868: addiu sp, sp, -40
+// 0x01017878: 0x1017878: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101786c: 0x101786c: lw    v1, 0(a0)
+// 0x0101787c: 0x101787c: lw    v1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01017870: 0x1017870: lw    v0, 0(a1)
+// 0x01017880: 0x1017880: lw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01017874: 0x1017874: sw    s0, 32(sp)
+// 0x01017884: 0x1017884: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1465,21 +1465,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01017878: 0x1017878: lui   a3, 0x0
+// 0x01017888: 0x1017888: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101787c: 0x101787c: addu  s0, a1, zero
+// 0x0101788c: 0x101788c: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01017880: 0x1017880: lui   a1, 0x0
+// 0x01017890: 0x1017890: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017884: 0x1017884: addiu a3, a3, 31760
+// 0x01017894: 0x1017894: addiu a3, a3, 31760
 	ldloc 4
 	ldc.i4 31760
 	add
 	stloc 4
-// 0x01017888: 0x1017888: sw    a2, 20(sp)
+// 0x01017898: 0x1017898: sw    a2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1488,19 +1488,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101788c: 0x101788c: addiu a1, a1, 30284
+// 0x0101789c: 0x101789c: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01017890: 0x1017890: addiu a2, zero, 620
+// 0x010178a0: 0x10178a0: addiu a2, zero, 620
 	ldc.i4 620
 	stloc.3
-// 0x01017894: 0x1017894: addiu a0, zero, 2
+// 0x010178a4: 0x10178a4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01017898: 0x1017898: sw    ra, 36(sp)
-// 0x0101789c: 0x101789c: sw    v1, 16(sp)
+// 0x010178a8: 0x10178a8: sw    ra, 36(sp)
+// 0x010178ac: 0x10178ac: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1509,7 +1509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010178a0: 0x10178a0: jal   0x100449c sw    v0, 24(sp)
+// 0x010178b0: 0x10178b0: jal   0x100449c sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1528,37 +1528,37 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010178a8: 0x10178a8: lui   a1, 0x1010000
+// 0x010178b8: 0x10178b8: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x010178ac: 0x10178ac: addiu v1, zero, 3
+// 0x010178bc: 0x10178bc: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x010178b0: 0x10178b0: lui   v0, 0x30000
+// 0x010178c0: 0x10178c0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010178b4: 0x10178b4: addiu a1, a1, 28136
+// 0x010178c4: 0x10178c4: addiu a1, a1, 28152
 	ldloc.2
-	ldc.i4 28136
+	ldc.i4 28152
 	add
 	stloc.2
-// 0x010178b8: 0x10178b8: sw    v1, -28412(v0)
+// 0x010178c8: 0x10178c8: sw    v1, -27948(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldloc 6
 	stelem.i4
-// 0x010178bc: 0x10178bc: lw    s0, 0(s0)
+// 0x010178cc: 0x10178cc: lw    s0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010178c0: 0x10178c0: jal   0x104fe98 addiu a0, zero, 15000
+// 0x010178d0: 0x10178d0: jal   0x104fea8 addiu a0, zero, 15000
 	ldc.i4 15000
 	stloc.1
 	ldloc.0
@@ -1566,20 +1566,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010178c8: 0x10178c8: lui   a1, 0x1010000
+// 0x010178d8: 0x10178d8: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x010178cc: 0x10178cc: addiu a1, a1, 28080
+// 0x010178dc: 0x10178dc: addiu a1, a1, 28096
 	ldloc.2
-	ldc.i4 28080
+	ldc.i4 28096
 	add
 	stloc.2
-// 0x010178d0: 0x10178d0: jal   0x104fe98 addiu a0, zero, 100
+// 0x010178e0: 0x10178e0: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -1587,57 +1587,57 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010178d8: 0x10178d8: addiu a2, zero, 1072
+// 0x010178e8: 0x10178e8: addiu a2, zero, 1072
 	ldc.i4 1072
 	stloc.3
-// 0x010178dc: 0x10178dc: mult  s0, a2
+// 0x010178ec: 0x10178ec: mult  s0, a2
 	ldloc 8
 	ldloc.3
 	mul
 	stloc 9
-// 0x010178e0: 0x10178e0: lui   a2, 0x30000
+// 0x010178f0: 0x10178f0: lui   a2, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x010178e4: 0x10178e4: addiu a2, a2, -27796
+// 0x010178f4: 0x10178f4: addiu a2, a2, -27332
 	ldloc.3
-	ldc.i4 -27796
+	ldc.i4 -27332
 	add
 	stloc.3
-// 0x010178e8: 0x10178e8: lui   a0, 0x30000
+// 0x010178f8: 0x10178f8: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x010178ec: 0x10178ec: lui   a1, 0x10000
+// 0x010178fc: 0x10178fc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010178f0: 0x10178f0: addiu a0, a0, 26216
+// 0x01017900: 0x1017900: addiu a0, a0, 26680
 	ldloc.1
-	ldc.i4 26216
+	ldc.i4 26680
 	add
 	stloc.1
-// 0x010178f4: 0x10178f4: addiu a1, a1, -10228
+// 0x01017904: 0x1017904: addiu a1, a1, -10232
 	ldloc.2
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.2
-// 0x010178f8: 0x10178f8: mflo  lo
+// 0x01017908: 0x1017908: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x010178fc: 0x10178fc: addu  a2, a2, v0
+// 0x0101790c: 0x101790c: addu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc.3
-// 0x01017900: 0x1017900: addiu a3, a2, 414
+// 0x01017910: 0x1017910: addiu a3, a2, 414
 	ldloc.3
 	ldc.i4 414
 	add
 	stloc 4
-// 0x01017904: 0x1017904: jal   0x1000f64 addiu a2, a2, 112
+// 0x01017914: 0x1017914: jal   0x1000f64 addiu a2, a2, 112
 	ldloc.3
 	ldc.i4.s 112
 	add
@@ -1652,14 +1652,14 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101790c: 0x101790c: addu  v1, zero, zero
+// 0x0101791c: 0x101791c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01017910: 0x1017910: cibyl_sysc_arg 0x3
+// 0x01017920: 0x1017920: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01017914: 0x1017914: cibyl_sysc 0x317
+// 0x01017924: 0x1017924: cibyl_sysc 0x317
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_closeDialog(int32)
-// 0x01017918: 0x1017918: jal   0x1017834 addu  v1, v0, zero
+// 0x01017928: 0x1017928: jal   0x1017844 addu  v1, v0, zero
 	ldloc 5
 	stloc 6
 	ldloc.0
@@ -1667,58 +1667,58 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_is_tweet_badge_enabled_1017834(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_is_tweet_badge_enabled_1017844(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017920: 0x1017920: beq   v0, zero, 0x101793c addu  a1, zero, zero
+// 0x01017930: 0x1017930: beq   v0, zero, 0x101794c addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_101793c
+	brfalse L_101794c
 // --- basic block ---
-// 0x01017928: 0x1017928: jal   0x1026edc sll   zero, zero, 0
+// 0x01017938: 0x1017938: jal   0x1026eec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017930: 0x1017930: bne   v0, zero, 0x101793c addiu a1, zero, 1
+// 0x01017940: 0x1017940: bne   v0, zero, 0x101794c addiu a1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.2
-	brtrue L_101793c
+	brtrue L_101794c
 // --- basic block ---
-// 0x01017938: 0x1017938: addu  a1, zero, zero
+// 0x01017948: 0x1017948: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_101793c:
-// 0x0101793c: 0x101793c: addiu v0, zero, 1072
+L_101794c:
+// 0x0101794c: 0x101794c: addiu v0, zero, 1072
 	ldc.i4 1072
 	stloc 5
-// 0x01017940: 0x1017940: mult  s0, v0
+// 0x01017950: 0x1017950: mult  s0, v0
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 9
-// 0x01017944: 0x1017944: lui   a0, 0x30000
+// 0x01017954: 0x1017954: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01017948: 0x1017948: addiu a0, a0, -27796
+// 0x01017958: 0x1017958: addiu a0, a0, -27332
 	ldloc.1
-	ldc.i4 -27796
+	ldc.i4 -27332
 	add
 	stloc.1
-// 0x0101794c: 0x101794c: mflo  lo
+// 0x0101795c: 0x101795c: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01017950: 0x1017950: jal   0x106cc60 addu  a0, a0, s0
+// 0x01017960: 0x1017960: jal   0x106d284 addu  a0, a0, s0
 	ldloc.1
 	ldloc 8
 	add
@@ -1728,13 +1728,13 @@ L_101793c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_FoursquareCheckin_106cc60(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_FoursquareCheckin_106d284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017958: 0x1017958: lw    ra, 36(sp)
-// 0x0101795c: 0x101795c: lw    s0, 32(sp)
+// 0x01017968: 0x1017968: lw    ra, 36(sp)
+// 0x0101796c: 0x101796c: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1743,7 +1743,7 @@ L_101793c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01017960: 0x1017960: jr    ra addiu sp, sp, 40
+// 0x01017970: 0x1017970: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1755,7 +1755,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_is_tweet_login_enabled_1017968(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_is_tweet_login_enabled_1017978(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -1790,16 +1790,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017968: 0x1017968: lui   a0, 0x0
+// 0x01017978: 0x1017978: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101796c: 0x101796c: addiu sp, sp, -24
+// 0x0101797c: 0x101797c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017970: 0x1017970: sw    ra, 20(sp)
-// 0x01017974: 0x1017974: jal   0x100e348 addiu a0, a0, 2416
+// 0x01017980: 0x1017980: sw    ra, 20(sp)
+// 0x01017984: 0x1017984: jal   0x100e358 addiu a0, a0, 2416
 	ldloc.1
 	ldc.i4 2416
 	add
@@ -1809,18 +1809,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101797c: 0x101797c: lui   a1, 0x0
+// 0x0101798c: 0x101798c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017980: 0x1017980: addu  a0, v0, zero
+// 0x01017990: 0x1017990: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017984: 0x1017984: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01017994: 0x1017994: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -1830,13 +1830,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101798c: 0x101798c: lw    ra, 20(sp)
-// 0x01017990: 0x1017990: sltiu v0, v0, 1
+// 0x0101799c: 0x101799c: lw    ra, 20(sp)
+// 0x010179a0: 0x10179a0: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01017994: 0x1017994: jr    ra addiu sp, sp, 24
+// 0x010179a4: 0x10179a4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1848,7 +1848,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_login_101799c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_login_10179ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -1889,12 +1889,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101799c: 0x101799c: addiu sp, sp, -32
+// 0x010179ac: 0x10179ac: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010179a0: 0x10179a0: sw    s0, 20(sp)
+// 0x010179b0: 0x10179b0: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1903,19 +1903,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010179a4: 0x10179a4: addu  s0, a1, zero
+// 0x010179b4: 0x10179b4: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010179a8: 0x10179a8: lui   a1, 0x1010000
+// 0x010179b8: 0x10179b8: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x010179ac: 0x10179ac: addiu v1, zero, 1
+// 0x010179bc: 0x10179bc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010179b0: 0x10179b0: lui   v0, 0x30000
+// 0x010179c0: 0x10179c0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010179b4: 0x10179b4: sw    s1, 24(sp)
+// 0x010179c4: 0x10179c4: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1924,24 +1924,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010179b8: 0x10179b8: addiu a1, a1, 28080
+// 0x010179c8: 0x10179c8: addiu a1, a1, 28096
 	ldloc.2
-	ldc.i4 28080
+	ldc.i4 28096
 	add
 	stloc.2
-// 0x010179bc: 0x10179bc: addu  s1, a0, zero
+// 0x010179cc: 0x10179cc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010179c0: 0x10179c0: addiu a0, zero, 100
+// 0x010179d0: 0x10179d0: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x010179c4: 0x10179c4: sw    ra, 28(sp)
-// 0x010179c8: 0x10179c8: jal   0x104fe98 sw    v1, -28412(v0)
+// 0x010179d4: 0x10179d4: sw    ra, 28(sp)
+// 0x010179d8: 0x10179d8: jal   0x104fea8 sw    v1, -27948(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldloc 6
 	stelem.i4
@@ -1950,20 +1950,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010179d0: 0x10179d0: lui   a1, 0x1010000
+// 0x010179e0: 0x10179e0: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x010179d4: 0x10179d4: addiu a1, a1, 28136
+// 0x010179e4: 0x10179e4: addiu a1, a1, 28152
 	ldloc.2
-	ldc.i4 28136
+	ldc.i4 28152
 	add
 	stloc.2
-// 0x010179d8: 0x10179d8: jal   0x104fe98 addiu a0, zero, 15000
+// 0x010179e8: 0x10179e8: jal   0x104fea8 addiu a0, zero, 15000
 	ldc.i4 15000
 	stloc.1
 	ldloc.0
@@ -1971,53 +1971,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010179e0: 0x10179e0: jal   0x1017968 sll   zero, zero, 0
+// 0x010179f0: 0x10179f0: jal   0x1017978 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_is_tweet_login_enabled_1017968(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_is_tweet_login_enabled_1017978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010179e8: 0x10179e8: beq   v0, zero, 0x1017a04 addu  a2, zero, zero
+// 0x010179f8: 0x10179f8: beq   v0, zero, 0x1017a14 addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_1017a04
+	brfalse L_1017a14
 // --- basic block ---
-// 0x010179f0: 0x10179f0: jal   0x1026edc sll   zero, zero, 0
+// 0x01017a00: 0x1017a00: jal   0x1026eec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010179f8: 0x10179f8: bne   v0, zero, 0x1017a04 addiu a2, zero, 1
+// 0x01017a08: 0x1017a08: bne   v0, zero, 0x1017a14 addiu a2, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.3
-	brtrue L_1017a04
+	brtrue L_1017a14
 // --- basic block ---
-// 0x01017a00: 0x1017a00: addu  a2, zero, zero
+// 0x01017a10: 0x1017a10: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_1017a04:
-// 0x01017a04: 0x1017a04: addu  a0, s1, zero
+L_1017a14:
+// 0x01017a14: 0x1017a14: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01017a08: 0x1017a08: jal   0x106ccc8 addu  a1, s0, zero
+// 0x01017a18: 0x1017a18: jal   0x106d2ec addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2025,20 +2025,20 @@ L_1017a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_FoursquareConnect_106ccc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_FoursquareConnect_106d2ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017a10: 0x1017a10: bne   v0, zero, 0x1017a40 lui   a0, 0x1010000
+// 0x01017a20: 0x1017a20: bne   v0, zero, 0x1017a50 lui   a0, 0x1010000
 	ldloc 5
 	ldc.i4 16842752
 	stloc.1
-	brtrue L_1017a40
+	brtrue L_1017a50
 // --- basic block ---
-// 0x01017a18: 0x1017a18: jal   0x104fd00 addiu a0, a0, 28136
+// 0x01017a28: 0x1017a28: jal   0x104fd10 addiu a0, a0, 28152
 	ldloc.1
-	ldc.i4 28136
+	ldc.i4 28152
 	add
 	stloc.1
 	ldloc.0
@@ -2046,37 +2046,37 @@ L_1017a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017a20: 0x1017a20: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x01017a30: 0x1017a30: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017a28: 0x1017a28: lui   a1, 0x1010000
+// 0x01017a38: 0x1017a38: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x01017a2c: 0x1017a2c: lui   v0, 0x30000
+// 0x01017a3c: 0x1017a3c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01017a30: 0x1017a30: addiu a1, a1, 30700
+// 0x01017a40: 0x1017a40: addiu a1, a1, 30716
 	ldloc.2
-	ldc.i4 30700
+	ldc.i4 30716
 	add
 	stloc.2
-// 0x01017a34: 0x1017a34: addiu a0, zero, 100
+// 0x01017a44: 0x1017a44: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x01017a38: 0x1017a38: jal   0x104fe98 sw    zero, -28412(v0)
+// 0x01017a48: 0x1017a48: jal   0x104fea8 sw    zero, -27948(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2085,14 +2085,14 @@ L_1017a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1017a40:
-// 0x01017a40: 0x1017a40: lw    ra, 28(sp)
-// 0x01017a44: 0x1017a44: lw    s1, 24(sp)
+L_1017a50:
+// 0x01017a50: 0x1017a50: lw    ra, 28(sp)
+// 0x01017a54: 0x1017a54: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2101,7 +2101,7 @@ L_1017a40:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01017a48: 0x1017a48: lw    s0, 20(sp)
+// 0x01017a58: 0x1017a58: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2110,7 +2110,7 @@ L_1017a40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01017a4c: 0x1017a4c: jr    ra addiu sp, sp, 32
+// 0x01017a5c: 0x1017a5c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2122,7 +2122,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_is_enabled_1017a54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_is_enabled_1017a64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -2157,16 +2157,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017a54: 0x1017a54: lui   a0, 0x0
+// 0x01017a64: 0x1017a64: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017a58: 0x1017a58: addiu sp, sp, -24
+// 0x01017a68: 0x1017a68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017a5c: 0x1017a5c: sw    ra, 20(sp)
-// 0x01017a60: 0x1017a60: jal   0x100e348 addiu a0, a0, 2448
+// 0x01017a6c: 0x1017a6c: sw    ra, 20(sp)
+// 0x01017a70: 0x1017a70: jal   0x100e358 addiu a0, a0, 2448
 	ldloc.1
 	ldc.i4 2448
 	add
@@ -2176,18 +2176,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017a68: 0x1017a68: lui   a1, 0x0
+// 0x01017a78: 0x1017a78: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017a6c: 0x1017a6c: addu  a0, v0, zero
+// 0x01017a7c: 0x1017a7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017a70: 0x1017a70: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01017a80: 0x1017a80: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2197,13 +2197,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01017a78: 0x1017a78: lw    ra, 20(sp)
-// 0x01017a7c: 0x1017a7c: sltiu v0, v0, 1
+// 0x01017a88: 0x1017a88: lw    ra, 20(sp)
+// 0x01017a8c: 0x1017a8c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01017a80: 0x1017a80: jr    ra addiu sp, sp, 24
+// 0x01017a90: 0x1017a90: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2215,7 +2215,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_get_password_1017c6c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_get_password_1017c7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2250,16 +2250,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017c6c: 0x1017c6c: lui   a0, 0x0
+// 0x01017c7c: 0x1017c7c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017c70: 0x1017c70: addiu sp, sp, -24
+// 0x01017c80: 0x1017c80: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017c74: 0x1017c74: sw    ra, 20(sp)
-// 0x01017c78: 0x1017c78: jal   0x100e348 addiu a0, a0, 2400
+// 0x01017c84: 0x1017c84: sw    ra, 20(sp)
+// 0x01017c88: 0x1017c88: jal   0x100e358 addiu a0, a0, 2400
 	ldloc.1
 	ldc.i4 2400
 	add
@@ -2269,14 +2269,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01017c80: 0x1017c80: lw    ra, 20(sp)
-// 0x01017c84: 0x1017c84: sll   zero, zero, 0
-// 0x01017c88: 0x1017c88: jr    ra addiu sp, sp, 24
+// 0x01017c90: 0x1017c90: lw    ra, 20(sp)
+// 0x01017c94: 0x1017c94: sll   zero, zero, 0
+// 0x01017c98: 0x1017c98: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2288,7 +2288,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_foursquare_get_username_1017c90(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_get_username_1017ca0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2323,16 +2323,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017c90: 0x1017c90: lui   a0, 0x0
+// 0x01017ca0: 0x1017ca0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017c94: 0x1017c94: addiu sp, sp, -24
+// 0x01017ca4: 0x1017ca4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017c98: 0x1017c98: sw    ra, 20(sp)
-// 0x01017c9c: 0x1017c9c: jal   0x100e348 addiu a0, a0, 2384
+// 0x01017ca8: 0x1017ca8: sw    ra, 20(sp)
+// 0x01017cac: 0x1017cac: jal   0x100e358 addiu a0, a0, 2384
 	ldloc.1
 	ldc.i4 2384
 	add
@@ -2342,14 +2342,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01017ca4: 0x1017ca4: lw    ra, 20(sp)
-// 0x01017ca8: 0x1017ca8: sll   zero, zero, 0
-// 0x01017cac: 0x1017cac: jr    ra addiu sp, sp, 24
+// 0x01017cb4: 0x1017cb4: lw    ra, 20(sp)
+// 0x01017cb8: 0x1017cb8: sll   zero, zero, 0
+// 0x01017cbc: 0x1017cbc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2361,7 +2361,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_foursquare_logged_in_1017cb4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_logged_in_1017cc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -2396,16 +2396,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017cb4: 0x1017cb4: lui   a0, 0x0
+// 0x01017cc4: 0x1017cc4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017cb8: 0x1017cb8: addiu sp, sp, -24
+// 0x01017cc8: 0x1017cc8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01017cbc: 0x1017cbc: sw    ra, 20(sp)
-// 0x01017cc0: 0x1017cc0: jal   0x100e348 addiu a0, a0, 2464
+// 0x01017ccc: 0x1017ccc: sw    ra, 20(sp)
+// 0x01017cd0: 0x1017cd0: jal   0x100e358 addiu a0, a0, 2464
 	ldloc.1
 	ldc.i4 2464
 	add
@@ -2415,18 +2415,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01017cc8: 0x1017cc8: lui   a1, 0x0
+// 0x01017cd8: 0x1017cd8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017ccc: 0x1017ccc: addu  a0, v0, zero
+// 0x01017cdc: 0x1017cdc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017cd0: 0x1017cd0: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01017ce0: 0x1017ce0: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2436,13 +2436,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01017cd8: 0x1017cd8: lw    ra, 20(sp)
-// 0x01017cdc: 0x1017cdc: sltiu v0, v0, 1
+// 0x01017ce8: 0x1017ce8: lw    ra, 20(sp)
+// 0x01017cec: 0x1017cec: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01017ce0: 0x1017ce0: jr    ra addiu sp, sp, 24
+// 0x01017cf0: 0x1017cf0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2454,7 +2454,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_login_dlg_close_1017ce8(int32,int32,int32,int32,int32)
+.method public static int32 on_login_dlg_close_1017cf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2498,16 +2498,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017ce8: 0x1017ce8: addiu sp, sp, -32
+// 0x01017cf8: 0x1017cf8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01017cec: 0x1017cec: addiu v0, zero, 1
+// 0x01017cfc: 0x1017cfc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01017cf0: 0x1017cf0: sw    ra, 28(sp)
-// 0x01017cf4: 0x1017cf4: sw    s2, 24(sp)
+// 0x01017d00: 0x1017d00: sw    ra, 28(sp)
+// 0x01017d04: 0x1017d04: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2516,7 +2516,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01017cf8: 0x1017cf8: sw    s1, 20(sp)
+// 0x01017d08: 0x1017d08: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2525,7 +2525,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01017cfc: 0x1017cfc: bne   a0, v0, 0x1017e1c sw    s0, 16(sp)
+// 0x01017d0c: 0x1017d0c: bne   a0, v0, 0x1017e2c sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 7
@@ -2536,12 +2536,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_1017e1c
+	bne.un L_1017e2c
 // --- basic block ---
-// 0x01017d04: 0x1017d04: lui   a0, 0x0
+// 0x01017d14: 0x1017d14: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017d08: 0x1017d08: jal   0x10947dc addiu a0, a0, 32028
+// 0x01017d18: 0x1017d18: jal   0x1094e00 addiu a0, a0, 32028
 	ldloc.1
 	ldc.i4 32028
 	add
@@ -2551,20 +2551,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d10: 0x1017d10: lui   a0, 0x0
+// 0x01017d20: 0x1017d20: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017d14: 0x1017d14: addiu a0, a0, 32048
+// 0x01017d24: 0x1017d24: addiu a0, a0, 32048
 	ldloc.1
 	ldc.i4 32048
 	add
 	stloc.1
-// 0x01017d18: 0x1017d18: jal   0x10947dc addu  s1, v0, zero
+// 0x01017d28: 0x1017d28: jal   0x1094e00 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2572,12 +2572,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d20: 0x1017d20: jal   0x1017cb4 addu  s0, v0, zero
+// 0x01017d30: 0x1017d30: jal   0x1017cc4 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2585,20 +2585,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_logged_in_1017cb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_logged_in_1017cc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d28: 0x1017d28: lui   a0, 0x0
+// 0x01017d38: 0x1017d38: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017d2c: 0x1017d2c: addiu a0, a0, 32068
+// 0x01017d3c: 0x1017d3c: addiu a0, a0, 32068
 	ldloc.1
 	ldc.i4 32068
 	add
 	stloc.1
-// 0x01017d30: 0x1017d30: jal   0x10947ac addu  s2, v0, zero
+// 0x01017d40: 0x1017d40: jal   0x1094dd0 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -2606,24 +2606,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d38: 0x1017d38: lui   v1, 0x30000
+// 0x01017d48: 0x1017d48: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01017d3c: 0x1017d3c: lw    a1, -27804(v1)
+// 0x01017d4c: 0x1017d4c: lw    a1, -27340(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6951
+	ldc.i4 -6835
 	add
 	ldelem.i4
 	stloc.2
-// 0x01017d40: 0x1017d40: jal   0x1001c08 addu  a0, v0, zero
+// 0x01017d50: 0x1017d50: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2636,43 +2636,43 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d48: 0x1017d48: bne   v0, zero, 0x1017d60 sll   zero, zero, 0
+// 0x01017d58: 0x1017d58: bne   v0, zero, 0x1017d70 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1017d60
+	brtrue L_1017d70
 // --- basic block ---
-// 0x01017d50: 0x1017d50: jal   0x10175b4 sll   zero, zero, 0
+// 0x01017d60: 0x1017d60: jal   0x10175c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_enable_tweet_login_10175b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_enable_tweet_login_10175c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d58: 0x1017d58: j	 0x1017d6c lui   a0, 0x0
+// 0x01017d68: 0x1017d68: j	 0x1017d7c lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_1017d6c
+	br L_1017d7c
 // --- basic block ---
-L_1017d60:
-// 0x01017d60: 0x1017d60: jal   0x1017580 sll   zero, zero, 0
+L_1017d70:
+// 0x01017d70: 0x1017d70: jal   0x1017590 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_disable_tweet_login_1017580(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_disable_tweet_login_1017590(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d68: 0x1017d68: lui   a0, 0x0
+// 0x01017d78: 0x1017d78: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1017d6c:
-// 0x01017d6c: 0x1017d6c: jal   0x10947ac addiu a0, a0, 32088
+L_1017d7c:
+// 0x01017d7c: 0x1017d7c: jal   0x1094dd0 addiu a0, a0, 32088
 	ldloc.1
 	ldc.i4 32088
 	add
@@ -2682,24 +2682,24 @@ L_1017d6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d74: 0x1017d74: lui   v1, 0x30000
+// 0x01017d84: 0x1017d84: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01017d78: 0x1017d78: lw    a1, -27804(v1)
+// 0x01017d88: 0x1017d88: lw    a1, -27340(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6951
+	ldc.i4 -6835
 	add
 	ldelem.i4
 	stloc.2
-// 0x01017d7c: 0x1017d7c: jal   0x1001c08 addu  a0, v0, zero
+// 0x01017d8c: 0x1017d8c: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2712,56 +2712,56 @@ L_1017d6c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d84: 0x1017d84: bne   v0, zero, 0x1017d9c sll   zero, zero, 0
+// 0x01017d94: 0x1017d94: bne   v0, zero, 0x1017dac sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1017d9c
+	brtrue L_1017dac
 // --- basic block ---
-// 0x01017d8c: 0x1017d8c: jal   0x101754c sll   zero, zero, 0
+// 0x01017d9c: 0x1017d9c: jal   0x101755c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_enable_tweet_badge_101754c(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_enable_tweet_badge_101755c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017d94: 0x1017d94: j	 0x1017da4 sll   zero, zero, 0
-	br L_1017da4
+// 0x01017da4: 0x1017da4: j	 0x1017db4 sll   zero, zero, 0
+	br L_1017db4
 // --- basic block ---
-L_1017d9c:
-// 0x01017d9c: 0x1017d9c: jal   0x1017518 sll   zero, zero, 0
+L_1017dac:
+// 0x01017dac: 0x1017dac: jal   0x1017528 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_disable_tweet_badge_1017518(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_disable_tweet_badge_1017528(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1017da4:
-// 0x01017da4: 0x1017da4: lb    v0, 0(s1)
+L_1017db4:
+// 0x01017db4: 0x1017db4: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01017da8: 0x1017da8: sll   zero, zero, 0
-// 0x01017dac: 0x1017dac: beq   v0, zero, 0x1017de8 sll   zero, zero, 0
+// 0x01017db8: 0x1017db8: sll   zero, zero, 0
+// 0x01017dbc: 0x1017dbc: beq   v0, zero, 0x1017df8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1017de8
+	brfalse L_1017df8
 // --- basic block ---
-// 0x01017db4: 0x1017db4: lb    v1, 0(s0)
+// 0x01017dc4: 0x1017dc4: lb    v1, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01017db8: 0x1017db8: sll   zero, zero, 0
-// 0x01017dbc: 0x1017dbc: beq   v1, zero, 0x1017de8 sll   zero, zero, 0
+// 0x01017dc8: 0x1017dc8: sll   zero, zero, 0
+// 0x01017dcc: 0x1017dcc: beq   v1, zero, 0x1017df8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1017de8
+	brfalse L_1017df8
 // --- basic block ---
-// 0x01017dc4: 0x1017dc4: jal   0x101761c addu  a0, s1, zero
+// 0x01017dd4: 0x1017dd4: jal   0x101762c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2769,12 +2769,12 @@ L_1017da4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_set_username_101761c(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_set_username_101762c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017dcc: 0x1017dcc: jal   0x10175e8 addu  a0, s0, zero
+// 0x01017ddc: 0x1017ddc: jal   0x10175f8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2782,15 +2782,15 @@ L_1017da4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_set_password_10175e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_set_password_10175f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017dd4: 0x1017dd4: addu  a0, s1, zero
+// 0x01017de4: 0x1017de4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01017dd8: 0x1017dd8: jal   0x101799c addu  a1, s0, zero
+// 0x01017de8: 0x1017de8: jal   0x10179ac addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2798,51 +2798,51 @@ L_1017da4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_login_101799c(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_login_10179ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017de0: 0x1017de0: j	 0x1017e1c sll   zero, zero, 0
-	br L_1017e1c
+// 0x01017df0: 0x1017df0: j	 0x1017e2c sll   zero, zero, 0
+	br L_1017e2c
 // --- basic block ---
-L_1017de8:
-// 0x01017de8: 0x1017de8: bne   s2, zero, 0x1017e1c sll   zero, zero, 0
+L_1017df8:
+// 0x01017df8: 0x1017df8: bne   s2, zero, 0x1017e2c sll   zero, zero, 0
 	ldloc 10
-	brtrue L_1017e1c
+	brtrue L_1017e2c
 // --- basic block ---
-// 0x01017df0: 0x1017df0: bne   v0, zero, 0x1017e00 lui   a1, 0x1010000
+// 0x01017e00: 0x1017e00: bne   v0, zero, 0x1017e10 lui   a1, 0x1010000
 	ldloc 5
 	ldc.i4 16842752
 	stloc.2
-	brtrue L_1017e00
+	brtrue L_1017e10
 // --- basic block ---
-// 0x01017df8: 0x1017df8: j	 0x1017e14 addiu a1, a1, 28256
+// 0x01017e08: 0x1017e08: j	 0x1017e24 addiu a1, a1, 28272
 	ldloc.2
-	ldc.i4 28256
+	ldc.i4 28272
 	add
 	stloc.2
-	br L_1017e14
+	br L_1017e24
 // --- basic block ---
-L_1017e00:
-// 0x01017e00: 0x1017e00: lb    v0, 0(s0)
+L_1017e10:
+// 0x01017e10: 0x1017e10: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01017e04: 0x1017e04: sll   zero, zero, 0
-// 0x01017e08: 0x1017e08: bne   v0, zero, 0x1017e1c lui   a1, 0x1010000
+// 0x01017e14: 0x1017e14: sll   zero, zero, 0
+// 0x01017e18: 0x1017e18: bne   v0, zero, 0x1017e2c lui   a1, 0x1010000
 	ldloc 5
 	ldc.i4 16842752
 	stloc.2
-	brtrue L_1017e1c
+	brtrue L_1017e2c
 // --- basic block ---
-// 0x01017e10: 0x1017e10: addiu a1, a1, 28200
+// 0x01017e20: 0x1017e20: addiu a1, a1, 28216
 	ldloc.2
-	ldc.i4 28200
+	ldc.i4 28216
 	add
 	stloc.2
-L_1017e14:
-// 0x01017e14: 0x1017e14: jal   0x104fe98 addiu a0, zero, 100
+L_1017e24:
+// 0x01017e24: 0x1017e24: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -2850,14 +2850,14 @@ L_1017e14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1017e1c:
-// 0x01017e1c: 0x1017e1c: lw    ra, 28(sp)
-// 0x01017e20: 0x1017e20: lw    s2, 24(sp)
+L_1017e2c:
+// 0x01017e2c: 0x1017e2c: lw    ra, 28(sp)
+// 0x01017e30: 0x1017e30: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2866,7 +2866,7 @@ L_1017e1c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01017e24: 0x1017e24: lw    s1, 20(sp)
+// 0x01017e34: 0x1017e34: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2875,7 +2875,7 @@ L_1017e1c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01017e28: 0x1017e28: lw    s0, 16(sp)
+// 0x01017e38: 0x1017e38: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2884,7 +2884,7 @@ L_1017e1c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01017e2c: 0x1017e2c: jr    ra addiu sp, sp, 32
+// 0x01017e3c: 0x1017e3c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2896,7 +2896,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_initialize_1017e34(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_initialize_1017e44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v1,int32 v0,int32 s0,int32 s2,int32 ra)
@@ -2940,12 +2940,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017e34: 0x1017e34: addiu sp, sp, -40
+// 0x01017e44: 0x1017e44: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01017e38: 0x1017e38: sw    s1, 28(sp)
+// 0x01017e48: 0x1017e48: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2954,7 +2954,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01017e3c: 0x1017e3c: sw    s0, 24(sp)
+// 0x01017e4c: 0x1017e4c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2963,35 +2963,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01017e40: 0x1017e40: lui   s1, 0x10000
+// 0x01017e50: 0x1017e50: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01017e44: 0x1017e44: lui   s0, 0x20000
+// 0x01017e54: 0x1017e54: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01017e48: 0x1017e48: lui   a1, 0x0
+// 0x01017e58: 0x1017e58: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017e4c: 0x1017e4c: addu  a3, zero, zero
+// 0x01017e5c: 0x1017e5c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01017e50: 0x1017e50: addiu a0, s0, -26888
+// 0x01017e60: 0x1017e60: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01017e54: 0x1017e54: addiu a2, s1, 18500
+// 0x01017e64: 0x1017e64: addiu a2, s1, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01017e58: 0x1017e58: addiu a1, a1, 2384
+// 0x01017e68: 0x1017e68: addiu a1, a1, 2384
 	ldloc.2
 	ldc.i4 2384
 	add
 	stloc.2
-// 0x01017e5c: 0x1017e5c: sw    ra, 36(sp)
-// 0x01017e60: 0x1017e60: jal   0x100edb0 sw    s2, 32(sp)
+// 0x01017e6c: 0x1017e6c: sw    ra, 36(sp)
+// 0x01017e70: 0x1017e70: jal   0x100edc0 sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3005,25 +3005,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x01017e68: 0x1017e68: lui   a1, 0x0
+// 0x01017e78: 0x1017e78: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017e6c: 0x1017e6c: addiu a2, s1, 18500
+// 0x01017e7c: 0x1017e7c: addiu a2, s1, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01017e70: 0x1017e70: addiu a0, s0, -26888
+// 0x01017e80: 0x1017e80: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01017e74: 0x1017e74: jal   0x100ed70 addiu a1, a1, 2400
+// 0x01017e84: 0x1017e84: jal   0x100ed80 addiu a1, a1, 2400
 	ldloc.2
 	ldc.i4 2400
 	add
@@ -3033,44 +3033,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_password_100ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_password_100ed80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x01017e7c: 0x1017e7c: lui   s2, 0x0
+// 0x01017e8c: 0x1017e8c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01017e80: 0x1017e80: lui   s1, 0x0
+// 0x01017e90: 0x1017e90: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01017e84: 0x1017e84: lui   a1, 0x0
+// 0x01017e94: 0x1017e94: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017e88: 0x1017e88: addiu s1, s1, 31272
+// 0x01017e98: 0x1017e98: addiu s1, s1, 31272
 	ldloc 6
 	ldc.i4 31272
 	add
 	stloc 6
-// 0x01017e8c: 0x1017e8c: addiu a0, s0, -26888
+// 0x01017e9c: 0x1017e9c: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01017e90: 0x1017e90: addiu a3, s2, 21112
+// 0x01017ea0: 0x1017ea0: addiu a3, s2, 21112
 	ldloc 10
 	ldc.i4 21112
 	add
 	stloc 4
-// 0x01017e94: 0x1017e94: addiu a1, a1, 2416
+// 0x01017ea4: 0x1017ea4: addiu a1, a1, 2416
 	ldloc.2
 	ldc.i4 2416
 	add
 	stloc.2
-// 0x01017e98: 0x1017e98: addu  a2, zero, zero
+// 0x01017ea8: 0x1017ea8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01017e9c: 0x1017e9c: sw    s1, 16(sp)
+// 0x01017eac: 0x1017eac: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3079,7 +3079,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01017ea0: 0x1017ea0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01017eb0: 0x1017eb0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3093,33 +3093,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x01017ea8: 0x1017ea8: lui   a1, 0x0
+// 0x01017eb8: 0x1017eb8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017eac: 0x1017eac: addiu a3, s2, 21112
+// 0x01017ebc: 0x1017ebc: addiu a3, s2, 21112
 	ldloc 10
 	ldc.i4 21112
 	add
 	stloc 4
-// 0x01017eb0: 0x1017eb0: addiu a0, s0, -26888
+// 0x01017ec0: 0x1017ec0: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01017eb4: 0x1017eb4: addiu a1, a1, 2432
+// 0x01017ec4: 0x1017ec4: addiu a1, a1, 2432
 	ldloc.2
 	ldc.i4 2432
 	add
 	stloc.2
-// 0x01017eb8: 0x1017eb8: addu  a2, zero, zero
+// 0x01017ec8: 0x1017ec8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01017ebc: 0x1017ebc: sw    s1, 16(sp)
+// 0x01017ecc: 0x1017ecc: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3128,10 +3128,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01017ec0: 0x1017ec0: lui   s2, 0x20000
+// 0x01017ed0: 0x1017ed0: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x01017ec4: 0x1017ec4: sw    zero, 20(sp)
+// 0x01017ed4: 0x1017ed4: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3140,7 +3140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01017ec8: 0x1017ec8: jal   0x100edf8 lui   s1, 0x0
+// 0x01017ed8: 0x1017ed8: jal   0x100ee08 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 6
 	ldloc.0
@@ -3148,41 +3148,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x01017ed0: 0x1017ed0: lui   a0, 0x10000
+// 0x01017ee0: 0x1017ee0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01017ed4: 0x1017ed4: lui   a1, 0x0
+// 0x01017ee4: 0x1017ee4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017ed8: 0x1017ed8: addiu s1, s1, 20820
+// 0x01017ee8: 0x1017ee8: addiu s1, s1, 20820
 	ldloc 6
 	ldc.i4 20820
 	add
 	stloc 6
-// 0x01017edc: 0x1017edc: addiu a3, s2, 9464
+// 0x01017eec: 0x1017eec: addiu a3, s2, 9928
 	ldloc 10
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01017ee0: 0x1017ee0: addiu a0, a0, 12560
+// 0x01017ef0: 0x1017ef0: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01017ee4: 0x1017ee4: addiu a1, a1, 2448
+// 0x01017ef4: 0x1017ef4: addiu a1, a1, 2448
 	ldloc.2
 	ldc.i4 2448
 	add
 	stloc.2
-// 0x01017ee8: 0x1017ee8: addu  a2, zero, zero
+// 0x01017ef8: 0x1017ef8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01017eec: 0x1017eec: sw    s1, 16(sp)
+// 0x01017efc: 0x1017efc: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3191,7 +3191,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01017ef0: 0x1017ef0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01017f00: 0x1017f00: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3205,33 +3205,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x01017ef8: 0x1017ef8: lui   a1, 0x0
+// 0x01017f08: 0x1017f08: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01017efc: 0x1017efc: addiu a0, s0, -26888
+// 0x01017f0c: 0x1017f0c: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01017f00: 0x1017f00: addiu a3, s2, 9464
+// 0x01017f10: 0x1017f10: addiu a3, s2, 9928
 	ldloc 10
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01017f04: 0x1017f04: addiu a1, a1, 2464
+// 0x01017f14: 0x1017f14: addiu a1, a1, 2464
 	ldloc.2
 	ldc.i4 2464
 	add
 	stloc.2
-// 0x01017f08: 0x1017f08: addu  a2, zero, zero
+// 0x01017f18: 0x1017f18: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01017f0c: 0x1017f0c: sw    s1, 16(sp)
+// 0x01017f1c: 0x1017f1c: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3240,7 +3240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01017f10: 0x1017f10: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01017f20: 0x1017f20: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3254,28 +3254,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x01017f18: 0x1017f18: lui   v0, 0x30000
+// 0x01017f28: 0x1017f28: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x01017f1c: 0x1017f1c: lui   a0, 0x0
+// 0x01017f2c: 0x1017f2c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017f20: 0x1017f20: addiu v1, v0, -27804
+// 0x01017f30: 0x1017f30: addiu v1, v0, -27340
 	ldloc 8
-	ldc.i4 -27804
+	ldc.i4 -27340
 	add
 	stloc 7
-// 0x01017f24: 0x1017f24: addiu a0, a0, 32120
+// 0x01017f34: 0x1017f34: addiu a0, a0, 32120
 	ldloc.1
 	ldc.i4 32120
 	add
 	stloc.1
-// 0x01017f28: 0x1017f28: sw    a0, 4(v1)
+// 0x01017f38: 0x1017f38: sw    a0, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3284,25 +3284,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01017f2c: 0x1017f2c: lw    ra, 36(sp)
-// 0x01017f30: 0x1017f30: lui   v1, 0x0
+// 0x01017f3c: 0x1017f3c: lw    ra, 36(sp)
+// 0x01017f40: 0x1017f40: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01017f34: 0x1017f34: addiu v1, v1, 32116
+// 0x01017f44: 0x1017f44: addiu v1, v1, 32116
 	ldloc 7
 	ldc.i4 32116
 	add
 	stloc 7
-// 0x01017f38: 0x1017f38: sw    v1, -27804(v0)
+// 0x01017f48: 0x1017f48: sw    v1, -27340(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6951
+	ldc.i4 -6835
 	add
 	ldloc 7
 	stelem.i4
-// 0x01017f3c: 0x1017f3c: lw    s2, 32(sp)
+// 0x01017f4c: 0x1017f4c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3311,10 +3311,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01017f40: 0x1017f40: addiu v0, zero, 1
+// 0x01017f50: 0x1017f50: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01017f44: 0x1017f44: lw    s1, 28(sp)
+// 0x01017f54: 0x1017f54: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3323,7 +3323,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01017f48: 0x1017f48: lw    s0, 24(sp)
+// 0x01017f58: 0x1017f58: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3332,7 +3332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01017f4c: 0x1017f4c: jr    ra addiu sp, sp, 40
+// 0x01017f5c: 0x1017f5c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3344,7 +3344,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 T_72_1017f54(int32,int32,int32,int32,int32)
+.method public static int32 T_72_1017f64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3379,33 +3379,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017f54: 0x1017f54: lui   a0, 0x0
+// 0x01017f64: 0x1017f64: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017f58: 0x1017f58: addiu sp, sp, -40
+// 0x01017f68: 0x1017f68: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01017f5c: 0x1017f5c: addiu a0, a0, 32124
+// 0x01017f6c: 0x1017f6c: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01017f60: 0x1017f60: addu  a1, zero, zero
+// 0x01017f70: 0x1017f70: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01017f64: 0x1017f64: addiu a2, zero, -2
+// 0x01017f74: 0x1017f74: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01017f68: 0x1017f68: addiu a3, zero, 5
+// 0x01017f78: 0x1017f78: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x01017f6c: 0x1017f6c: addiu v0, zero, 136
+// 0x01017f7c: 0x1017f7c: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x01017f70: 0x1017f70: sw    ra, 36(sp)
-// 0x01017f74: 0x1017f74: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01017f80: 0x1017f80: sw    ra, 36(sp)
+// 0x01017f84: 0x1017f84: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3419,21 +3419,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01017f7c: 0x1017f7c: addu  a0, v0, zero
+// 0x01017f8c: 0x1017f8c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01017f80: 0x1017f80: addu  a1, zero, zero
+// 0x01017f90: 0x1017f90: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01017f84: 0x1017f84: addu  a2, zero, zero
+// 0x01017f94: 0x1017f94: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01017f88: 0x1017f88: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01017f98: 0x1017f98: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3445,10 +3445,10 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01017f90: 0x1017f90: lw    ra, 36(sp)
-// 0x01017f94: 0x1017f94: lw    v0, 24(sp)
+// 0x01017fa0: 0x1017fa0: lw    ra, 36(sp)
+// 0x01017fa4: 0x1017fa4: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3457,7 +3457,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01017f98: 0x1017f98: jr    ra addiu sp, sp, 40
+// 0x01017fa8: 0x1017fa8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3469,7 +3469,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_checkedin_dialog_1017fa0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_checkedin_dialog_1017fb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -3531,15 +3531,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01017fa0: 0x1017fa0: addiu sp, sp, -576
+// 0x01017fb0: 0x1017fb0: addiu sp, sp, -576
 	ldloc.0
 	ldc.i4 -576
 	add
 	stloc.0
-// 0x01017fa4: 0x1017fa4: lui   a0, 0x1010000
+// 0x01017fb4: 0x1017fb4: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01017fa8: 0x1017fa8: sw    s5, 556(sp)
+// 0x01017fb8: 0x1017fb8: sw    s5, 556(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3548,16 +3548,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01017fac: 0x1017fac: addiu a0, a0, 32672
+// 0x01017fbc: 0x1017fbc: addiu a0, a0, 32688
 	ldloc.1
-	ldc.i4 32672
+	ldc.i4 32688
 	add
 	stloc.1
-// 0x01017fb0: 0x1017fb0: lui   s5, 0x0
+// 0x01017fc0: 0x1017fc0: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01017fb4: 0x1017fb4: sw    ra, 572(sp)
-// 0x01017fb8: 0x1017fb8: sw    s8, 568(sp)
+// 0x01017fc4: 0x1017fc4: sw    ra, 572(sp)
+// 0x01017fc8: 0x1017fc8: sw    s8, 568(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3566,7 +3566,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01017fbc: 0x1017fbc: sw    s7, 564(sp)
+// 0x01017fcc: 0x1017fcc: sw    s7, 564(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3575,7 +3575,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01017fc0: 0x1017fc0: sw    s6, 560(sp)
+// 0x01017fd0: 0x1017fd0: sw    s6, 560(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3584,7 +3584,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01017fc4: 0x1017fc4: sw    s4, 552(sp)
+// 0x01017fd4: 0x1017fd4: sw    s4, 552(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3593,7 +3593,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01017fc8: 0x1017fc8: sw    s3, 548(sp)
+// 0x01017fd8: 0x1017fd8: sw    s3, 548(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3602,7 +3602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01017fcc: 0x1017fcc: sw    s2, 544(sp)
+// 0x01017fdc: 0x1017fdc: sw    s2, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3611,7 +3611,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01017fd0: 0x1017fd0: sw    s1, 540(sp)
+// 0x01017fe0: 0x1017fe0: sw    s1, 540(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3620,7 +3620,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01017fd4: 0x1017fd4: jal   0x104fd00 sw    s0, 536(sp)
+// 0x01017fe4: 0x1017fe4: jal   0x104fd10 sw    s0, 536(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3634,17 +3634,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017fdc: 0x1017fdc: addiu a0, s5, 32132
+// 0x01017fec: 0x1017fec: addiu a0, s5, 32132
 	ldloc 13
 	ldc.i4 32132
 	add
 	stloc.1
-// 0x01017fe0: 0x1017fe0: jal   0x1095eec addu  a1, zero, zero
+// 0x01017ff0: 0x1017ff0: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3652,19 +3652,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017fe8: 0x1017fe8: bne   v0, zero, 0x1018374 sll   zero, zero, 0
+// 0x01017ff8: 0x1017ff8: bne   v0, zero, 0x1018384 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1018374
+	brtrue L_1018384
 // --- basic block ---
-// 0x01017ff0: 0x1017ff0: lui   a0, 0x0
+// 0x01018000: 0x1018000: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01017ff4: 0x1017ff4: jal   0x101cd60 addiu a0, a0, 32156
+// 0x01018004: 0x1018004: jal   0x101cd70 addiu a0, a0, 32156
 	ldloc.1
 	ldc.i4 32156
 	add
@@ -3674,23 +3674,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01017ffc: 0x1017ffc: addu  a1, v0, zero
+// 0x0101800c: 0x101800c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018000: 0x1018000: addiu a0, s5, 32132
+// 0x01018010: 0x1018010: addiu a0, s5, 32132
 	ldloc 13
 	ldc.i4 32132
 	add
 	stloc.1
-// 0x01018004: 0x1018004: addu  a2, zero, zero
+// 0x01018014: 0x1018014: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01018008: 0x1018008: jal   0x1095a08 addiu a3, zero, 8192
+// 0x01018018: 0x1018018: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -3698,40 +3698,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018010: 0x1018010: addu  s6, v0, zero
+// 0x01018020: 0x1018020: addu  s6, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01018014: 0x1018014: lui   a0, 0x0
+// 0x01018024: 0x1018024: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018018: 0x1018018: lui   v0, 0x41000000
+// 0x01018028: 0x1018028: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x0101801c: 0x101801c: addiu a0, a0, 32180
+// 0x0101802c: 0x101802c: addiu a0, a0, 32180
 	ldloc.1
 	ldc.i4 32180
 	add
 	stloc.1
-// 0x01018020: 0x1018020: addu  a1, zero, zero
+// 0x01018030: 0x1018030: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018024: 0x1018024: addiu a2, zero, -2
+// 0x01018034: 0x1018034: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018028: 0x1018028: addiu a3, zero, -1
+// 0x01018038: 0x1018038: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0101802c: 0x101802c: ori   v0, v0, 20616
+// 0x0101803c: 0x101803c: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x01018030: 0x1018030: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01018040: 0x1018040: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3745,41 +3745,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018038: 0x1018038: lui   a0, 0x0
+// 0x01018048: 0x1018048: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101803c: 0x101803c: addiu a3, zero, -1
+// 0x0101804c: 0x101804c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018040: 0x1018040: addiu s4, zero, 136
+// 0x01018050: 0x1018050: addiu s4, zero, 136
 	ldc.i4 136
 	stloc 12
-// 0x01018044: 0x1018044: addiu a0, a0, 32196
+// 0x01018054: 0x1018054: addiu a0, a0, 32196
 	ldloc.1
 	ldc.i4 32196
 	add
 	stloc.1
-// 0x01018048: 0x1018048: addu  a1, zero, zero
+// 0x01018058: 0x1018058: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101804c: 0x101804c: addiu a2, zero, -2
+// 0x0101805c: 0x101805c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018050: 0x1018050: addu  s0, v0, zero
+// 0x01018060: 0x1018060: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01018054: 0x1018054: lui   s3, 0x0
+// 0x01018064: 0x1018064: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01018058: 0x1018058: lui   s2, 0x0
+// 0x01018068: 0x1018068: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0101805c: 0x101805c: jal   0x1093a24 sw    s4, 16(sp)
+// 0x0101806c: 0x101806c: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3793,47 +3793,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018064: 0x1018064: addu  a0, v0, zero
+// 0x01018074: 0x1018074: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01018068: 0x1018068: addiu a1, s3, 31980
+// 0x01018078: 0x1018078: addiu a1, s3, 31980
 	ldloc 11
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x0101806c: 0x101806c: addiu a2, s2, 23008
+// 0x0101807c: 0x101807c: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01018070: 0x1018070: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01018080: 0x1018080: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01018078: 0x1018078: lui   a0, 0x0
+// 0x01018088: 0x1018088: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101807c: 0x101807c: lui   a1, 0x0
+// 0x0101808c: 0x101808c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01018080: 0x1018080: lui   a2, 0x100000
+// 0x01018090: 0x1018090: lui   a2, 0x100000
 	ldc.i4 1048576
 	stloc.3
-// 0x01018084: 0x1018084: addiu a0, a0, 32212
+// 0x01018094: 0x1018094: addiu a0, a0, 32212
 	ldloc.1
 	ldc.i4 32212
 	add
 	stloc.1
-// 0x01018088: 0x1018088: jal   0x109e13c addiu a1, a1, 32228
+// 0x01018098: 0x1018098: jal   0x109e784 addiu a1, a1, 32228
 	ldloc.2
 	ldc.i4 32228
 	add
@@ -3843,25 +3843,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018090: 0x1018090: addu  a1, v0, zero
+// 0x010180a0: 0x10180a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018094: 0x1018094: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010180a4: 0x10180a4: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101809c: 0x101809c: jal   0x1017f54 lui   s7, 0x0
+// 0x010180ac: 0x10180ac: jal   0x1017f64 lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 15
 	ldloc.0
@@ -3869,30 +3869,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010180a4: 0x10180a4: addu  a1, v0, zero
+// 0x010180b4: 0x10180b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010180a8: 0x10180a8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010180b8: 0x10180b8: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010180b0: 0x10180b0: addiu a0, s7, 32244
+// 0x010180c0: 0x10180c0: addiu a0, s7, 32244
 	ldloc 15
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010180b4: 0x10180b4: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010180c4: 0x10180c4: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3900,25 +3900,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010180bc: 0x10180bc: addu  a1, v0, zero
+// 0x010180cc: 0x10180cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010180c0: 0x10180c0: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010180d0: 0x10180d0: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010180c8: 0x10180c8: jal   0x1017f54 addiu s8, sp, 280
+// 0x010180d8: 0x10180d8: jal   0x1017f64 addiu s8, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
@@ -3928,55 +3928,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010180d0: 0x10180d0: addu  a1, v0, zero
+// 0x010180e0: 0x10180e0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010180d4: 0x10180d4: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010180e4: 0x10180e4: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010180dc: 0x10180dc: addu  a1, s1, zero
+// 0x010180ec: 0x10180ec: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010180e0: 0x10180e0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010180f0: 0x10180f0: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010180e8: 0x10180e8: lui   a0, 0x0
+// 0x010180f8: 0x10180f8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010180ec: 0x10180ec: addiu a3, zero, -1
+// 0x010180fc: 0x10180fc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010180f0: 0x10180f0: addiu a0, a0, 32256
+// 0x01018100: 0x1018100: addiu a0, a0, 32256
 	ldloc.1
 	ldc.i4 32256
 	add
 	stloc.1
-// 0x010180f4: 0x10180f4: addu  a1, zero, zero
+// 0x01018104: 0x1018104: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010180f8: 0x10180f8: addiu a2, zero, -2
+// 0x01018108: 0x1018108: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010180fc: 0x10180fc: jal   0x1093a24 sw    s4, 16(sp)
+// 0x0101810c: 0x101810c: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3990,52 +3990,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018104: 0x1018104: addu  a0, v0, zero
+// 0x01018114: 0x1018114: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01018108: 0x1018108: addiu a1, s3, 31980
+// 0x01018118: 0x1018118: addiu a1, s3, 31980
 	ldloc 11
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x0101810c: 0x101810c: addiu a2, s2, 23008
+// 0x0101811c: 0x101811c: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01018110: 0x1018110: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01018120: 0x1018120: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01018118: 0x1018118: lui   a0, 0x0
+// 0x01018128: 0x1018128: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101811c: 0x101811c: lui   a1, 0x30000
+// 0x0101812c: 0x101812c: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01018120: 0x1018120: addiu a2, zero, 16
+// 0x01018130: 0x1018130: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01018124: 0x1018124: addiu a3, zero, 4112
+// 0x01018134: 0x1018134: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x01018128: 0x1018128: addiu a0, a0, 32284
+// 0x01018138: 0x1018138: addiu a0, a0, 32284
 	ldloc.1
 	ldc.i4 32284
 	add
 	stloc.1
-// 0x0101812c: 0x101812c: jal   0x1098d10 addiu a1, a1, 25804
+// 0x0101813c: 0x101813c: jal   0x1099358 addiu a1, a1, 26268
 	ldloc.2
-	ldc.i4 25804
+	ldc.i4 26268
 	add
 	stloc.2
 	ldloc.0
@@ -4043,55 +4043,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018134: 0x1018134: addu  a1, v0, zero
+// 0x01018144: 0x1018144: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018138: 0x1018138: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018148: 0x1018148: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018140: 0x1018140: addu  a1, s1, zero
+// 0x01018150: 0x1018150: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01018144: 0x1018144: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018154: 0x1018154: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101814c: 0x101814c: lui   a0, 0x0
+// 0x0101815c: 0x101815c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018150: 0x1018150: addiu a3, zero, -1
+// 0x01018160: 0x1018160: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018154: 0x1018154: addiu a0, a0, 32308
+// 0x01018164: 0x1018164: addiu a0, a0, 32308
 	ldloc.1
 	ldc.i4 32308
 	add
 	stloc.1
-// 0x01018158: 0x1018158: addu  a1, zero, zero
+// 0x01018168: 0x1018168: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101815c: 0x101815c: addiu a2, zero, -2
+// 0x0101816c: 0x101816c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018160: 0x1018160: jal   0x1093a24 sw    s4, 16(sp)
+// 0x01018170: 0x1018170: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4105,52 +4105,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018168: 0x1018168: addu  a0, v0, zero
+// 0x01018178: 0x1018178: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101816c: 0x101816c: addiu a1, s3, 31980
+// 0x0101817c: 0x101817c: addiu a1, s3, 31980
 	ldloc 11
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01018170: 0x1018170: addiu a2, s2, 23008
+// 0x01018180: 0x1018180: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01018174: 0x1018174: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01018184: 0x1018184: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0101817c: 0x101817c: lui   a0, 0x0
+// 0x0101818c: 0x101818c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018180: 0x1018180: lui   a1, 0x30000
+// 0x01018190: 0x1018190: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01018184: 0x1018184: addiu a2, zero, 16
+// 0x01018194: 0x1018194: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01018188: 0x1018188: addiu a3, zero, 4112
+// 0x01018198: 0x1018198: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x0101818c: 0x101818c: addiu a0, a0, 32336
+// 0x0101819c: 0x101819c: addiu a0, a0, 32336
 	ldloc.1
 	ldc.i4 32336
 	add
 	stloc.1
-// 0x01018190: 0x1018190: jal   0x1098d10 addiu a1, a1, 26216
+// 0x010181a0: 0x10181a0: jal   0x1099358 addiu a1, a1, 26680
 	ldloc.2
-	ldc.i4 26216
+	ldc.i4 26680
 	add
 	stloc.2
 	ldloc.0
@@ -4158,55 +4158,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018198: 0x1018198: addu  a1, v0, zero
+// 0x010181a8: 0x10181a8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101819c: 0x101819c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010181ac: 0x10181ac: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010181a4: 0x10181a4: addu  a1, s1, zero
+// 0x010181b4: 0x10181b4: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010181a8: 0x10181a8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010181b8: 0x10181b8: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010181b0: 0x10181b0: lui   a0, 0x0
+// 0x010181c0: 0x10181c0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010181b4: 0x10181b4: addiu a3, zero, -1
+// 0x010181c4: 0x10181c4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010181b8: 0x10181b8: addiu a0, a0, 32352
+// 0x010181c8: 0x10181c8: addiu a0, a0, 32352
 	ldloc.1
 	ldc.i4 32352
 	add
 	stloc.1
-// 0x010181bc: 0x10181bc: addu  a1, zero, zero
+// 0x010181cc: 0x10181cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010181c0: 0x10181c0: addiu a2, zero, -2
+// 0x010181d0: 0x10181d0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010181c4: 0x10181c4: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010181d4: 0x10181d4: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4220,36 +4220,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010181cc: 0x10181cc: addu  a0, v0, zero
+// 0x010181dc: 0x10181dc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010181d0: 0x10181d0: addiu a1, s3, 31980
+// 0x010181e0: 0x10181e0: addiu a1, s3, 31980
 	ldloc 11
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010181d4: 0x10181d4: addiu a2, s2, 23008
+// 0x010181e4: 0x10181e4: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010181d8: 0x10181d8: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010181e8: 0x10181e8: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010181e0: 0x10181e0: lui   a0, 0x0
+// 0x010181f0: 0x10181f0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010181e4: 0x10181e4: jal   0x101cd60 addiu a0, a0, 32376
+// 0x010181f4: 0x10181f4: jal   0x101cd70 addiu a0, a0, 32376
 	ldloc.1
 	ldc.i4 32376
 	add
@@ -4259,37 +4259,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010181ec: 0x10181ec: addu  a3, v0, zero
+// 0x010181fc: 0x10181fc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010181f0: 0x10181f0: lui   a2, 0x20000
+// 0x01018200: 0x1018200: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010181f4: 0x10181f4: lui   v0, 0x30000
+// 0x01018204: 0x1018204: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010181f8: 0x10181f8: addiu a2, a2, -6888
+// 0x01018208: 0x1018208: addiu a2, a2, -6424
 	ldloc.3
-	ldc.i4 -6888
+	ldc.i4 -6424
 	add
 	stloc.3
-// 0x010181fc: 0x10181fc: addu  a0, s8, zero
+// 0x0101820c: 0x101820c: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x01018200: 0x1018200: addiu a1, zero, 256
+// 0x01018210: 0x1018210: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x01018204: 0x1018204: addiu v0, v0, 26205
+// 0x01018214: 0x1018214: addiu v0, v0, 26669
 	ldloc 5
-	ldc.i4 26205
+	ldc.i4 26669
 	add
 	stloc 5
-// 0x01018208: 0x1018208: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01018218: 0x1018218: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4308,21 +4308,21 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018210: 0x1018210: lui   a0, 0x0
+// 0x01018220: 0x1018220: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018214: 0x1018214: addiu a2, zero, 16
+// 0x01018224: 0x1018224: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01018218: 0x1018218: addiu a3, zero, 4112
+// 0x01018228: 0x1018228: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x0101821c: 0x101821c: addiu a0, a0, 32384
+// 0x0101822c: 0x101822c: addiu a0, a0, 32384
 	ldloc.1
 	ldc.i4 32384
 	add
 	stloc.1
-// 0x01018220: 0x1018220: jal   0x1098d10 addu  a1, s8, zero
+// 0x01018230: 0x1018230: jal   0x1099358 addu  a1, s8, zero
 	ldloc 16
 	stloc.2
 	ldloc.0
@@ -4330,54 +4330,54 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018228: 0x1018228: addu  a1, v0, zero
+// 0x01018238: 0x1018238: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101822c: 0x101822c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0101823c: 0x101823c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018234: 0x1018234: jal   0x1017f54 sll   zero, zero, 0
+// 0x01018244: 0x1018244: jal   0x1017f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101823c: 0x101823c: addu  a1, v0, zero
+// 0x0101824c: 0x101824c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018240: 0x1018240: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018250: 0x1018250: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018248: 0x1018248: addiu a0, s7, 32244
+// 0x01018258: 0x1018258: addiu a0, s7, 32244
 	ldloc 15
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x0101824c: 0x101824c: jal   0x109e6d0 addiu a1, zero, 512
+// 0x0101825c: 0x101825c: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -4385,79 +4385,79 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018254: 0x1018254: addu  a1, v0, zero
+// 0x01018264: 0x1018264: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018258: 0x1018258: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018268: 0x1018268: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018260: 0x1018260: jal   0x1017f54 sll   zero, zero, 0
+// 0x01018270: 0x1018270: jal   0x1017f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018268: 0x1018268: addu  a1, v0, zero
+// 0x01018278: 0x1018278: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101826c: 0x101826c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0101827c: 0x101827c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018274: 0x1018274: addu  a1, s1, zero
+// 0x01018284: 0x1018284: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01018278: 0x1018278: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018288: 0x1018288: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018280: 0x1018280: lui   a0, 0x0
+// 0x01018290: 0x1018290: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018284: 0x1018284: addiu a3, zero, -1
+// 0x01018294: 0x1018294: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018288: 0x1018288: addiu a0, a0, 32400
+// 0x01018298: 0x1018298: addiu a0, a0, 32400
 	ldloc.1
 	ldc.i4 32400
 	add
 	stloc.1
-// 0x0101828c: 0x101828c: addu  a1, zero, zero
+// 0x0101829c: 0x101829c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018290: 0x1018290: addiu a2, zero, -2
+// 0x010182a0: 0x10182a0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018294: 0x1018294: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010182a4: 0x10182a4: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4471,36 +4471,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101829c: 0x101829c: addu  a0, v0, zero
+// 0x010182ac: 0x10182ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010182a0: 0x10182a0: addiu a1, s3, 31980
+// 0x010182b0: 0x10182b0: addiu a1, s3, 31980
 	ldloc 11
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010182a4: 0x10182a4: addiu a2, s2, 23008
+// 0x010182b4: 0x10182b4: addiu a2, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010182a8: 0x10182a8: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010182b8: 0x10182b8: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010182b0: 0x10182b0: lui   a0, 0x0
+// 0x010182c0: 0x10182c0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010182b4: 0x10182b4: jal   0x101cd60 addiu a0, a0, 32432
+// 0x010182c4: 0x10182c4: jal   0x101cd70 addiu a0, a0, 32432
 	ldloc.1
 	ldc.i4 32432
 	add
@@ -4510,26 +4510,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010182bc: 0x10182bc: lui   a0, 0x0
+// 0x010182cc: 0x10182cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010182c0: 0x10182c0: addiu a2, zero, 16
+// 0x010182d0: 0x10182d0: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010182c4: 0x10182c4: addiu a3, zero, 4112
+// 0x010182d4: 0x10182d4: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010182c8: 0x10182c8: addiu a0, a0, 32504
+// 0x010182d8: 0x10182d8: addiu a0, a0, 32504
 	ldloc.1
 	ldc.i4 32504
 	add
 	stloc.1
-// 0x010182cc: 0x10182cc: jal   0x1098d10 addu  a1, v0, zero
+// 0x010182dc: 0x10182dc: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4537,65 +4537,65 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010182d4: 0x10182d4: addu  a1, v0, zero
+// 0x010182e4: 0x10182e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010182d8: 0x10182d8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010182e8: 0x10182e8: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010182e0: 0x10182e0: jal   0x1017f54 sll   zero, zero, 0
+// 0x010182f0: 0x10182f0: jal   0x1017f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010182e8: 0x10182e8: addu  a1, v0, zero
+// 0x010182f8: 0x10182f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010182ec: 0x10182ec: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010182fc: 0x10182fc: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010182f4: 0x10182f4: addu  a1, s1, zero
+// 0x01018304: 0x1018304: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010182f8: 0x10182f8: addu  a0, s0, zero
+// 0x01018308: 0x1018308: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010182fc: 0x10182fc: jal   0x1098ec4 lui   s1, 0x0
+// 0x0101830c: 0x101830c: jal   0x109950c lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018304: 0x1018304: jal   0x101cd60 addiu a0, s1, 32524
+// 0x01018314: 0x1018314: jal   0x101cd70 addiu a0, s1, 32524
 	ldloc 8
 	ldc.i4 32524
 	add
@@ -4605,36 +4605,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101830c: 0x101830c: lui   a2, 0x300000
+// 0x0101831c: 0x101831c: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x01018310: 0x1018310: lui   a3, 0x1010000
+// 0x01018320: 0x1018320: lui   a3, 0x1010000
 	ldc.i4 16842752
 	stloc 4
-// 0x01018314: 0x1018314: lui   a0, 0x0
+// 0x01018324: 0x1018324: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018318: 0x1018318: ori   a2, a2, 5
+// 0x01018328: 0x1018328: ori   a2, a2, 5
 	ldloc.3
 	ldc.i4.5
 	or
 	stloc.3
-// 0x0101831c: 0x101831c: addiu a3, a3, 28344
+// 0x0101832c: 0x101832c: addiu a3, a3, 28360
 	ldloc 4
-	ldc.i4 28344
+	ldc.i4 28360
 	add
 	stloc 4
-// 0x01018320: 0x1018320: addiu a0, a0, 32528
+// 0x01018330: 0x1018330: addiu a0, a0, 32528
 	ldloc.1
 	ldc.i4 32528
 	add
 	stloc.1
-// 0x01018324: 0x1018324: jal   0x1091088 addu  a1, v0, zero
+// 0x01018334: 0x1018334: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4642,38 +4642,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101832c: 0x101832c: addu  a1, v0, zero
+// 0x0101833c: 0x101833c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018330: 0x1018330: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018340: 0x1018340: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018338: 0x1018338: addu  a1, s0, zero
+// 0x01018348: 0x1018348: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0101833c: 0x101833c: jal   0x1098ec4 addu  a0, s6, zero
+// 0x0101834c: 0x101834c: jal   0x109950c addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018344: 0x1018344: jal   0x101cd60 addiu a0, s1, 32524
+// 0x01018354: 0x1018354: jal   0x101cd70 addiu a0, s1, 32524
 	ldloc 8
 	ldc.i4 32524
 	add
@@ -4683,15 +4683,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101834c: 0x101834c: addu  a1, v0, zero
+// 0x0101835c: 0x101835c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018350: 0x1018350: jal   0x109b434 addu  a0, s6, zero
+// 0x01018360: 0x1018360: jal   0x109ba7c addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -4699,32 +4699,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018358: 0x1018358: lui   a1, 0x1010000
+// 0x01018368: 0x1018368: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0101835c: 0x101835c: addu  a0, s6, zero
+// 0x0101836c: 0x101836c: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01018360: 0x1018360: jal   0x1099174 addiu a1, a1, 28312
+// 0x01018370: 0x1018370: jal   0x10997bc addiu a1, a1, 28328
 	ldloc.2
-	ldc.i4 28312
+	ldc.i4 28328
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01018368: 0x1018368: addiu a0, s5, 32132
+// 0x01018378: 0x1018378: addiu a0, s5, 32132
 	ldloc 13
 	ldc.i4 32132
 	add
 	stloc.1
-// 0x0101836c: 0x101836c: jal   0x1095eec addu  a1, zero, zero
+// 0x0101837c: 0x101837c: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4732,26 +4732,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1018374:
-// 0x01018374: 0x1018374: lui   a0, 0x0
+L_1018384:
+// 0x01018384: 0x1018384: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018378: 0x1018378: lui   a1, 0x30000
+// 0x01018388: 0x1018388: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x0101837c: 0x101837c: addiu a0, a0, 32284
+// 0x0101838c: 0x101838c: addiu a0, a0, 32284
 	ldloc.1
 	ldc.i4 32284
 	add
 	stloc.1
-// 0x01018380: 0x1018380: jal   0x1094770 addiu a1, a1, 25804
+// 0x01018390: 0x1018390: jal   0x1094d94 addiu a1, a1, 26268
 	ldloc.2
-	ldc.i4 25804
+	ldc.i4 26268
 	add
 	stloc.2
 	ldloc.0
@@ -4759,23 +4759,23 @@ L_1018374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018388: 0x1018388: lui   a1, 0x30000
+// 0x01018398: 0x1018398: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x0101838c: 0x101838c: lui   a0, 0x0
+// 0x0101839c: 0x101839c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018390: 0x1018390: addiu a1, a1, 26216
+// 0x010183a0: 0x10183a0: addiu a1, a1, 26680
 	ldloc.2
-	ldc.i4 26216
+	ldc.i4 26680
 	add
 	stloc.2
-// 0x01018394: 0x1018394: jal   0x1094770 addiu a0, a0, 32336
+// 0x010183a4: 0x10183a4: jal   0x1094d94 addiu a0, a0, 32336
 	ldloc.1
 	ldc.i4 32336
 	add
@@ -4785,15 +4785,15 @@ L_1018374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101839c: 0x101839c: lui   a0, 0x0
+// 0x010183ac: 0x10183ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010183a0: 0x10183a0: jal   0x101cd60 addiu a0, a0, 32376
+// 0x010183b0: 0x10183b0: jal   0x101cd70 addiu a0, a0, 32376
 	ldloc.1
 	ldc.i4 32376
 	add
@@ -4803,42 +4803,42 @@ L_1018374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010183a8: 0x10183a8: addiu s0, sp, 24
+// 0x010183b8: 0x10183b8: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x010183ac: 0x10183ac: addu  a3, v0, zero
+// 0x010183bc: 0x10183bc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010183b0: 0x10183b0: lui   a2, 0x20000
+// 0x010183c0: 0x10183c0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010183b4: 0x10183b4: lui   v0, 0x30000
+// 0x010183c4: 0x10183c4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010183b8: 0x10183b8: addiu a2, a2, -6888
+// 0x010183c8: 0x10183c8: addiu a2, a2, -6424
 	ldloc.3
-	ldc.i4 -6888
+	ldc.i4 -6424
 	add
 	stloc.3
-// 0x010183bc: 0x10183bc: addu  a0, s0, zero
+// 0x010183cc: 0x10183cc: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010183c0: 0x10183c0: addiu a1, zero, 256
+// 0x010183d0: 0x10183d0: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010183c4: 0x10183c4: addiu v0, v0, 26205
+// 0x010183d4: 0x10183d4: addiu v0, v0, 26669
 	ldloc 5
-	ldc.i4 26205
+	ldc.i4 26669
 	add
 	stloc 5
-// 0x010183c8: 0x10183c8: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010183d8: 0x10183d8: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4857,13 +4857,13 @@ L_1018374:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010183d0: 0x10183d0: lui   a0, 0x0
+// 0x010183e0: 0x10183e0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010183d4: 0x10183d4: addu  a1, s0, zero
+// 0x010183e4: 0x10183e4: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010183d8: 0x10183d8: jal   0x1094770 addiu a0, a0, 32384
+// 0x010183e8: 0x10183e8: jal   0x1094d94 addiu a0, a0, 32384
 	ldloc.1
 	ldc.i4 32384
 	add
@@ -4873,24 +4873,24 @@ L_1018374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010183e0: 0x10183e0: jal   0x1021900 sll   zero, zero, 0
+// 0x010183f0: 0x10183f0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010183e8: 0x10183e8: lw    ra, 572(sp)
-// 0x010183ec: 0x10183ec: lw    s8, 568(sp)
+// 0x010183f8: 0x10183f8: lw    ra, 572(sp)
+// 0x010183fc: 0x10183fc: lw    s8, 568(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4899,7 +4899,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010183f0: 0x10183f0: lw    s7, 564(sp)
+// 0x01018400: 0x1018400: lw    s7, 564(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4908,7 +4908,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010183f4: 0x10183f4: lw    s6, 560(sp)
+// 0x01018404: 0x1018404: lw    s6, 560(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4917,7 +4917,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010183f8: 0x10183f8: lw    s5, 556(sp)
+// 0x01018408: 0x1018408: lw    s5, 556(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4926,7 +4926,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010183fc: 0x10183fc: lw    s4, 552(sp)
+// 0x0101840c: 0x101840c: lw    s4, 552(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4935,7 +4935,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01018400: 0x1018400: lw    s3, 548(sp)
+// 0x01018410: 0x1018410: lw    s3, 548(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4944,7 +4944,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01018404: 0x1018404: lw    s2, 544(sp)
+// 0x01018414: 0x1018414: lw    s2, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4953,7 +4953,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01018408: 0x1018408: lw    s1, 540(sp)
+// 0x01018418: 0x1018418: lw    s1, 540(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4962,7 +4962,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101840c: 0x101840c: lw    s0, 536(sp)
+// 0x0101841c: 0x101841c: lw    s0, 536(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4971,7 +4971,7 @@ L_1018374:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01018410: 0x1018410: jr    ra addiu sp, sp, 576
+// 0x01018420: 0x1018420: jr    ra addiu sp, sp, 576
 	ldloc.0
 	ldc.i4 576
 	add
@@ -4983,7 +4983,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_foursquare_login_dialog_1018418(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_login_dialog_1018428(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s6,int32 s5,int32 s1,int32 s0,int32 s3,int32 s4,int32 t1,int32 t0,int32 s8,int32 s2,int32 s7,int32 lo,int32 ra)
@@ -5054,24 +5054,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01018418: 0x1018418: lui   v0, 0x0
+// 0x01018428: 0x1018428: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101841c: 0x101841c: addiu sp, sp, -88
+// 0x0101842c: 0x101842c: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01018420: 0x1018420: addiu a0, v0, 32536
+// 0x01018430: 0x1018430: addiu a0, v0, 32536
 	ldloc 5
 	ldc.i4 32536
 	add
 	stloc.1
-// 0x01018424: 0x1018424: addu  a1, zero, zero
+// 0x01018434: 0x1018434: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018428: 0x1018428: sw    ra, 84(sp)
-// 0x0101842c: 0x101842c: sw    s8, 80(sp)
+// 0x01018438: 0x1018438: sw    ra, 84(sp)
+// 0x0101843c: 0x101843c: sw    s8, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5080,7 +5080,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01018430: 0x1018430: sw    s7, 76(sp)
+// 0x01018440: 0x1018440: sw    s7, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5089,7 +5089,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01018434: 0x1018434: sw    s6, 72(sp)
+// 0x01018444: 0x1018444: sw    s6, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5098,7 +5098,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01018438: 0x1018438: sw    s5, 68(sp)
+// 0x01018448: 0x1018448: sw    s5, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5107,7 +5107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101843c: 0x101843c: sw    s4, 64(sp)
+// 0x0101844c: 0x101844c: sw    s4, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5116,7 +5116,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01018440: 0x1018440: sw    s3, 60(sp)
+// 0x01018450: 0x1018450: sw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5125,7 +5125,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01018444: 0x1018444: sw    s2, 56(sp)
+// 0x01018454: 0x1018454: sw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5134,7 +5134,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01018448: 0x1018448: sw    s1, 52(sp)
+// 0x01018458: 0x1018458: sw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5143,7 +5143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101844c: 0x101844c: jal   0x1095eec sw    s0, 48(sp)
+// 0x0101845c: 0x101845c: jal   0x1096534 sw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5157,62 +5157,62 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018454: 0x1018454: bne   v0, zero, 0x1018b80 addiu v0, zero, 2
+// 0x01018464: 0x1018464: bne   v0, zero, 0x1018b90 addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brtrue L_1018b80
+	brtrue L_1018b90
 // --- basic block ---
-// 0x0101845c: 0x101845c: lui   s7, 0xf0000
+// 0x0101846c: 0x101846c: lui   s7, 0xf0000
 	ldc.i4 983040
 	stloc 18
-// 0x01018460: 0x1018460: lw    v1, -30068(s7)
+// 0x01018470: 0x1018470: lw    v1, -29604(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 6
-// 0x01018464: 0x1018464: sll   zero, zero, 0
-// 0x01018468: 0x1018468: div   v1, v0
+// 0x01018474: 0x1018474: sll   zero, zero, 0
+// 0x01018478: 0x1018478: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 19
-// 0x0101846c: 0x101846c: lui   a0, 0x0
+// 0x0101847c: 0x101847c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018470: 0x1018470: addiu a0, a0, 30444
+// 0x01018480: 0x1018480: addiu a0, a0, 30444
 	ldloc.1
 	ldc.i4 30444
 	add
 	stloc.1
-// 0x01018474: 0x1018474: addiu s1, zero, 136
+// 0x01018484: 0x1018484: addiu s1, zero, 136
 	ldc.i4 136
 	stloc 10
-// 0x01018478: 0x1018478: lui   s4, 0x0
+// 0x01018488: 0x1018488: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x0101847c: 0x101847c: lui   s3, 0x0
+// 0x0101848c: 0x101848c: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01018480: 0x1018480: lui   s2, 0x100000
+// 0x01018490: 0x1018490: lui   s2, 0x100000
 	ldc.i4 1048576
 	stloc 17
-// 0x01018484: 0x1018484: lui   s8, 0x10000
+// 0x01018494: 0x1018494: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x01018488: 0x1018488: mflo  lo
+// 0x01018498: 0x1018498: mflo  lo
 	ldloc 19
 	stloc.2
-// 0x0101848c: 0x101848c: jal   0x101cd60 sw    a1, 32(sp)
+// 0x0101849c: 0x101849c: jal   0x101cd70 sw    a1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5226,31 +5226,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018494: 0x1018494: addu  a1, v0, zero
+// 0x010184a4: 0x10184a4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018498: 0x1018498: lui   a2, 0x1010000
+// 0x010184a8: 0x10184a8: lui   a2, 0x1010000
 	ldc.i4 16842752
 	stloc.3
-// 0x0101849c: 0x101849c: lui   v0, 0x0
+// 0x010184ac: 0x10184ac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010184a0: 0x10184a0: addiu a2, a2, 31976
+// 0x010184b0: 0x10184b0: addiu a2, a2, 31992
 	ldloc.3
-	ldc.i4 31976
+	ldc.i4 31992
 	add
 	stloc.3
-// 0x010184a4: 0x10184a4: addiu a0, v0, 32536
+// 0x010184b4: 0x10184b4: addiu a0, v0, 32536
 	ldloc 5
 	ldc.i4 32536
 	add
 	stloc.1
-// 0x010184a8: 0x10184a8: jal   0x1095a08 addiu a3, zero, 8192
+// 0x010184b8: 0x10184b8: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -5258,37 +5258,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010184b0: 0x10184b0: lui   t1, 0x41000000
+// 0x010184c0: 0x10184c0: lui   t1, 0x41000000
 	ldc.i4 1090519040
 	stloc 14
-// 0x010184b4: 0x10184b4: lui   a0, 0x0
+// 0x010184c4: 0x10184c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010184b8: 0x10184b8: ori   t1, t1, 20616
+// 0x010184c8: 0x10184c8: ori   t1, t1, 20616
 	ldloc 14
 	ldc.i4 20616
 	or
 	stloc 14
-// 0x010184bc: 0x10184bc: addiu a0, a0, 32556
+// 0x010184cc: 0x10184cc: addiu a0, a0, 32556
 	ldloc.1
 	ldc.i4 32556
 	add
 	stloc.1
-// 0x010184c0: 0x10184c0: addu  a1, zero, zero
+// 0x010184d0: 0x10184d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010184c4: 0x10184c4: addiu a2, zero, -2
+// 0x010184d4: 0x10184d4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010184c8: 0x10184c8: addiu a3, zero, -1
+// 0x010184d8: 0x10184d8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010184cc: 0x10184cc: sw    t1, 16(sp)
+// 0x010184dc: 0x10184dc: sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5297,7 +5297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010184d0: 0x10184d0: sw    t1, 44(sp)
+// 0x010184e0: 0x10184e0: sw    t1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5306,7 +5306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010184d4: 0x10184d4: jal   0x1093a24 addu  s0, v0, zero
+// 0x010184e4: 0x10184e4: jal   0x1094048 addu  s0, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -5314,32 +5314,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010184dc: 0x10184dc: lui   a0, 0x0
+// 0x010184ec: 0x10184ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010184e0: 0x10184e0: addiu a3, zero, -1
+// 0x010184f0: 0x10184f0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010184e4: 0x10184e4: addiu a0, a0, 32568
+// 0x010184f4: 0x10184f4: addiu a0, a0, 32568
 	ldloc.1
 	ldc.i4 32568
 	add
 	stloc.1
-// 0x010184e8: 0x10184e8: addu  a1, zero, zero
+// 0x010184f8: 0x10184f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010184ec: 0x10184ec: addiu a2, zero, -2
+// 0x010184fc: 0x10184fc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010184f0: 0x10184f0: addu  s5, v0, zero
+// 0x01018500: 0x1018500: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010184f4: 0x10184f4: jal   0x1093a24 sw    s1, 16(sp)
+// 0x01018504: 0x1018504: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5353,36 +5353,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010184fc: 0x10184fc: addu  a0, v0, zero
+// 0x0101850c: 0x101850c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01018500: 0x1018500: addiu a1, s4, 31980
+// 0x01018510: 0x1018510: addiu a1, s4, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01018504: 0x1018504: addiu a2, s3, 23008
+// 0x01018514: 0x1018514: addiu a2, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01018508: 0x1018508: jal   0x1098fe0 addu  s6, v0, zero
+// 0x01018518: 0x1018518: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01018510: 0x1018510: lui   a0, 0x0
+// 0x01018520: 0x1018520: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018514: 0x1018514: jal   0x101cd60 addiu a0, a0, 32600
+// 0x01018524: 0x1018524: jal   0x101cd70 addiu a0, a0, 32600
 	ldloc.1
 	ldc.i4 32600
 	add
@@ -5392,29 +5392,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101851c: 0x101851c: lui   v1, 0x20000
+// 0x0101852c: 0x101852c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01018520: 0x1018520: addiu a0, v1, 9016
+// 0x01018530: 0x1018530: addiu a0, v1, 9480
 	ldloc 6
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x01018524: 0x1018524: addiu a3, zero, 4112
+// 0x01018534: 0x1018534: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x01018528: 0x1018528: addiu a2, zero, 16
+// 0x01018538: 0x1018538: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0101852c: 0x101852c: addu  a1, v0, zero
+// 0x0101853c: 0x101853c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018530: 0x1018530: jal   0x1098d10 sw    v1, 40(sp)
+// 0x01018540: 0x1018540: jal   0x1099358 sw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5428,41 +5428,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018538: 0x1018538: addu  a1, v0, zero
+// 0x01018548: 0x1018548: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101853c: 0x101853c: jal   0x1098ec4 addu  a0, s6, zero
+// 0x0101854c: 0x101854c: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018544: 0x1018544: lui   a0, 0x0
+// 0x01018554: 0x1018554: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018548: 0x1018548: lui   a1, 0x0
+// 0x01018558: 0x1018558: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101854c: 0x101854c: ori   a2, s2, 2
+// 0x0101855c: 0x101855c: ori   a2, s2, 2
 	ldloc 17
 	ldc.i4.2
 	or
 	stloc.3
-// 0x01018550: 0x1018550: addiu a0, a0, 32212
+// 0x01018560: 0x1018560: addiu a0, a0, 32212
 	ldloc.1
 	ldc.i4 32212
 	add
 	stloc.1
-// 0x01018554: 0x1018554: jal   0x109e13c addiu a1, a1, 32228
+// 0x01018564: 0x1018564: jal   0x109e784 addiu a1, a1, 32228
 	ldloc.2
 	ldc.i4 32228
 	add
@@ -5472,33 +5472,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101855c: 0x101855c: addu  a1, v0, zero
+// 0x0101856c: 0x101856c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018560: 0x1018560: jal   0x1098ec4 addu  a0, s6, zero
+// 0x01018570: 0x1018570: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018568: 0x1018568: lui   a1, 0x0
+// 0x01018578: 0x1018578: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101856c: 0x101856c: addiu a0, a1, 32244
+// 0x0101857c: 0x101857c: addiu a0, a1, 32244
 	ldloc.2
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01018570: 0x1018570: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01018580: 0x1018580: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -5506,55 +5506,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018578: 0x1018578: addu  a1, v0, zero
+// 0x01018588: 0x1018588: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101857c: 0x101857c: jal   0x1098ec4 addu  a0, s6, zero
+// 0x0101858c: 0x101858c: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018584: 0x1018584: addu  a0, s5, zero
+// 0x01018594: 0x1018594: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01018588: 0x1018588: jal   0x1098ec4 addu  a1, s6, zero
+// 0x01018598: 0x1018598: jal   0x109950c addu  a1, s6, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018590: 0x1018590: lui   a0, 0x0
+// 0x010185a0: 0x10185a0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018594: 0x1018594: addiu a3, zero, -1
+// 0x010185a4: 0x10185a4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018598: 0x1018598: addiu a0, a0, 32616
+// 0x010185a8: 0x10185a8: addiu a0, a0, 32616
 	ldloc.1
 	ldc.i4 32616
 	add
 	stloc.1
-// 0x0101859c: 0x101859c: addu  a1, zero, zero
+// 0x010185ac: 0x10185ac: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010185a0: 0x10185a0: addiu a2, zero, -2
+// 0x010185b0: 0x10185b0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010185a4: 0x10185a4: jal   0x1093a24 sw    s1, 16(sp)
+// 0x010185b4: 0x10185b4: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5568,47 +5568,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010185ac: 0x10185ac: addu  a0, v0, zero
+// 0x010185bc: 0x10185bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010185b0: 0x10185b0: addiu a1, s4, 31980
+// 0x010185c0: 0x10185c0: addiu a1, s4, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010185b4: 0x10185b4: addiu a2, s3, 23008
+// 0x010185c4: 0x10185c4: addiu a2, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010185b8: 0x10185b8: jal   0x1098fe0 addu  s6, v0, zero
+// 0x010185c8: 0x10185c8: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010185c0: 0x10185c0: lui   a0, 0x0
+// 0x010185d0: 0x10185d0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010185c4: 0x10185c4: addiu a2, zero, 16
+// 0x010185d4: 0x10185d4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010185c8: 0x10185c8: addiu a3, zero, 4112
+// 0x010185d8: 0x10185d8: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x010185cc: 0x10185cc: addiu a1, s8, 18500
+// 0x010185dc: 0x10185dc: addiu a1, s8, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010185d0: 0x10185d0: jal   0x1098d10 addiu a0, a0, 32648
+// 0x010185e0: 0x10185e0: jal   0x1099358 addiu a0, a0, 32648
 	ldloc.1
 	ldc.i4 32648
 	add
@@ -5618,33 +5618,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010185d8: 0x10185d8: addu  a1, v0, zero
+// 0x010185e8: 0x10185e8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010185dc: 0x10185dc: jal   0x1098ec4 addu  a0, s6, zero
+// 0x010185ec: 0x10185ec: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010185e4: 0x10185e4: lui   v0, 0x0
+// 0x010185f4: 0x10185f4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010185e8: 0x10185e8: addiu a0, v0, 32244
+// 0x010185f8: 0x10185f8: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010185ec: 0x10185ec: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010185fc: 0x10185fc: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -5652,55 +5652,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010185f4: 0x10185f4: addu  a1, v0, zero
+// 0x01018604: 0x1018604: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010185f8: 0x10185f8: jal   0x1098ec4 addu  a0, s6, zero
+// 0x01018608: 0x1018608: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018600: 0x1018600: addu  a0, s5, zero
+// 0x01018610: 0x1018610: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01018604: 0x1018604: jal   0x1098ec4 addu  a1, s6, zero
+// 0x01018614: 0x1018614: jal   0x109950c addu  a1, s6, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101860c: 0x101860c: lui   a0, 0x0
+// 0x0101861c: 0x101861c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018610: 0x1018610: addiu a3, zero, -1
+// 0x01018620: 0x1018620: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018614: 0x1018614: addiu a0, a0, 32668
+// 0x01018624: 0x1018624: addiu a0, a0, 32668
 	ldloc.1
 	ldc.i4 32668
 	add
 	stloc.1
-// 0x01018618: 0x1018618: addu  a1, zero, zero
+// 0x01018628: 0x1018628: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101861c: 0x101861c: addiu a2, zero, -2
+// 0x0101862c: 0x101862c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018620: 0x1018620: jal   0x1093a24 sw    s1, 16(sp)
+// 0x01018630: 0x1018630: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5714,36 +5714,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018628: 0x1018628: addu  a0, v0, zero
+// 0x01018638: 0x1018638: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101862c: 0x101862c: addiu a1, s4, 31980
+// 0x0101863c: 0x101863c: addiu a1, s4, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01018630: 0x1018630: addiu a2, s3, 23008
+// 0x01018640: 0x1018640: addiu a2, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01018634: 0x1018634: jal   0x1098fe0 addu  s6, v0, zero
+// 0x01018644: 0x1018644: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0101863c: 0x101863c: lui   a0, 0x0
+// 0x0101864c: 0x101864c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018640: 0x1018640: jal   0x101cd60 addiu a0, a0, 32692
+// 0x01018650: 0x1018650: jal   0x101cd70 addiu a0, a0, 32692
 	ldloc.1
 	ldc.i4 32692
 	add
@@ -5753,12 +5753,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018648: 0x1018648: lw    v1, 40(sp)
+// 0x01018658: 0x1018658: lw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5767,18 +5767,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101864c: 0x101864c: addiu a2, zero, -1
+// 0x0101865c: 0x101865c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01018650: 0x1018650: addiu a0, v1, 9016
+// 0x01018660: 0x1018660: addiu a0, v1, 9480
 	ldloc 6
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x01018654: 0x1018654: addiu a3, zero, 4112
+// 0x01018664: 0x1018664: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x01018658: 0x1018658: jal   0x1098d10 addu  a1, v0, zero
+// 0x01018668: 0x1018668: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5786,28 +5786,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018660: 0x1018660: addu  a1, v0, zero
+// 0x01018670: 0x1018670: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018664: 0x1018664: jal   0x1098ec4 addu  a0, s6, zero
+// 0x01018674: 0x1018674: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101866c: 0x101866c: lui   a0, 0x0
+// 0x0101867c: 0x101867c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018670: 0x1018670: jal   0x101cd60 addiu a0, a0, 32704
+// 0x01018680: 0x1018680: jal   0x101cd70 addiu a0, a0, 32704
 	ldloc.1
 	ldc.i4 32704
 	add
@@ -5817,12 +5817,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018678: 0x1018678: sw    v0, 24(sp)
+// 0x01018688: 0x1018688: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5831,10 +5831,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101867c: 0x101867c: lui   a0, 0x0
+// 0x0101868c: 0x101868c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018680: 0x1018680: lw    v0, 32(sp)
+// 0x01018690: 0x1018690: lw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5843,28 +5843,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01018684: 0x1018684: addiu t0, zero, -1
+// 0x01018694: 0x1018694: addiu t0, zero, -1
 	ldc.i4.m1
 	stloc 15
-// 0x01018688: 0x1018688: ori   a2, s2, 18
+// 0x01018698: 0x1018698: ori   a2, s2, 18
 	ldloc 17
 	ldc.i4.s 18
 	or
 	stloc.3
-// 0x0101868c: 0x101868c: addu  a3, zero, zero
+// 0x0101869c: 0x101869c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01018690: 0x1018690: addiu a1, s8, 18500
+// 0x010186a0: 0x10186a0: addiu a1, s8, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01018694: 0x1018694: addiu a0, a0, 32028
+// 0x010186a4: 0x10186a4: addiu a0, a0, 32028
 	ldloc.1
 	ldc.i4 32028
 	add
 	stloc.1
-// 0x01018698: 0x1018698: sw    t0, 20(sp)
+// 0x010186a8: 0x10186a8: sw    t0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5873,7 +5873,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101869c: 0x101869c: sw    t0, 36(sp)
+// 0x010186ac: 0x10186ac: sw    t0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5882,7 +5882,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010186a0: 0x10186a0: jal   0x109683c sw    v0, 16(sp)
+// 0x010186b0: 0x10186b0: jal   0x1096e84 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5896,55 +5896,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010186a8: 0x10186a8: addu  a1, v0, zero
+// 0x010186b8: 0x10186b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010186ac: 0x10186ac: jal   0x1098ec4 addu  a0, s6, zero
+// 0x010186bc: 0x10186bc: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010186b4: 0x10186b4: addu  a0, s5, zero
+// 0x010186c4: 0x10186c4: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010186b8: 0x10186b8: jal   0x1098ec4 addu  a1, s6, zero
+// 0x010186c8: 0x10186c8: jal   0x109950c addu  a1, s6, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010186c0: 0x10186c0: lui   a0, 0x0
+// 0x010186d0: 0x10186d0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010186c4: 0x10186c4: addiu a3, zero, 40
+// 0x010186d4: 0x10186d4: addiu a3, zero, 40
 	ldc.i4.s 40
 	stloc 4
-// 0x010186c8: 0x10186c8: addiu a0, a0, 32716
+// 0x010186d8: 0x10186d8: addiu a0, a0, 32716
 	ldloc.1
 	ldc.i4 32716
 	add
 	stloc.1
-// 0x010186cc: 0x10186cc: addu  a1, zero, zero
+// 0x010186dc: 0x10186dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010186d0: 0x10186d0: addiu a2, zero, -2
+// 0x010186e0: 0x10186e0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010186d4: 0x10186d4: jal   0x1093a24 sw    s1, 16(sp)
+// 0x010186e4: 0x10186e4: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5958,36 +5958,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010186dc: 0x10186dc: addu  a0, v0, zero
+// 0x010186ec: 0x10186ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010186e0: 0x10186e0: addiu a2, s3, 23008
+// 0x010186f0: 0x10186f0: addiu a2, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010186e4: 0x10186e4: addiu a1, s4, 31980
+// 0x010186f4: 0x10186f4: addiu a1, s4, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010186e8: 0x10186e8: jal   0x1098fe0 addu  s6, v0, zero
+// 0x010186f8: 0x10186f8: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010186f0: 0x10186f0: lui   a1, 0x0
+// 0x01018700: 0x1018700: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010186f4: 0x10186f4: jal   0x101cd60 addiu a0, a1, 32736
+// 0x01018704: 0x1018704: jal   0x101cd70 addiu a0, a1, 32736
 	ldloc.2
 	ldc.i4 32736
 	add
@@ -5997,12 +5997,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010186fc: 0x10186fc: lw    v1, 40(sp)
+// 0x0101870c: 0x101870c: lw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6011,18 +6011,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01018700: 0x1018700: addiu a2, zero, 12
+// 0x01018710: 0x1018710: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x01018704: 0x1018704: addiu a0, v1, 9016
+// 0x01018714: 0x1018714: addiu a0, v1, 9480
 	ldloc 6
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x01018708: 0x1018708: addiu a3, zero, 4112
+// 0x01018718: 0x1018718: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x0101870c: 0x101870c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0101871c: 0x101871c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6030,28 +6030,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018714: 0x1018714: addu  a1, v0, zero
+// 0x01018724: 0x1018724: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018718: 0x1018718: jal   0x1098ec4 addu  a0, s6, zero
+// 0x01018728: 0x1018728: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018720: 0x1018720: lui   v0, 0x0
+// 0x01018730: 0x1018730: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01018724: 0x1018724: jal   0x101cd60 addiu a0, v0, 32736
+// 0x01018734: 0x1018734: jal   0x101cd70 addiu a0, v0, 32736
 	ldloc 5
 	ldc.i4 32736
 	add
@@ -6061,12 +6061,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101872c: 0x101872c: lw    v1, 32(sp)
+// 0x0101873c: 0x101873c: lw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6075,7 +6075,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01018730: 0x1018730: lw    t0, 36(sp)
+// 0x01018740: 0x1018740: lw    t0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6084,28 +6084,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01018734: 0x1018734: lui   a0, 0x0
+// 0x01018744: 0x1018744: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018738: 0x1018738: ori   a2, s2, 18
+// 0x01018748: 0x1018748: ori   a2, s2, 18
 	ldloc 17
 	ldc.i4.s 18
 	or
 	stloc.3
-// 0x0101873c: 0x101873c: addiu a3, zero, 8192
+// 0x0101874c: 0x101874c: addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
-// 0x01018740: 0x1018740: addiu a1, s8, 18500
+// 0x01018750: 0x1018750: addiu a1, s8, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01018744: 0x1018744: addiu a0, a0, 32048
+// 0x01018754: 0x1018754: addiu a0, a0, 32048
 	ldloc.1
 	ldc.i4 32048
 	add
 	stloc.1
-// 0x01018748: 0x1018748: sw    v1, 16(sp)
+// 0x01018758: 0x1018758: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6114,7 +6114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101874c: 0x101874c: sw    t0, 20(sp)
+// 0x0101875c: 0x101875c: sw    t0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6123,7 +6123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01018750: 0x1018750: jal   0x109683c sw    v0, 24(sp)
+// 0x01018760: 0x1018760: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6137,92 +6137,92 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018758: 0x1018758: addu  a1, v0, zero
+// 0x01018768: 0x1018768: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101875c: 0x101875c: jal   0x1098ec4 addu  a0, s6, zero
+// 0x0101876c: 0x101876c: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018764: 0x1018764: addu  a0, s5, zero
+// 0x01018774: 0x1018774: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01018768: 0x1018768: jal   0x1098ec4 addu  a1, s6, zero
+// 0x01018778: 0x1018778: jal   0x109950c addu  a1, s6, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018770: 0x1018770: addu  a1, s5, zero
+// 0x01018780: 0x1018780: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x01018774: 0x1018774: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018784: 0x1018784: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101877c: 0x101877c: jal   0x1017f54 sll   zero, zero, 0
+// 0x0101878c: 0x101878c: jal   0x1017f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018784: 0x1018784: addu  a1, v0, zero
+// 0x01018794: 0x1018794: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018788: 0x1018788: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018798: 0x1018798: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018790: 0x1018790: lui   a0, 0x0
+// 0x010187a0: 0x10187a0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018794: 0x1018794: addu  a1, zero, zero
+// 0x010187a4: 0x10187a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018798: 0x1018798: addiu a2, zero, -1
+// 0x010187a8: 0x10187a8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0101879c: 0x101879c: addiu a3, zero, -1
+// 0x010187ac: 0x10187ac: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010187a0: 0x10187a0: addiu a0, a0, 32748
+// 0x010187b0: 0x10187b0: addiu a0, a0, 32748
 	ldloc.1
 	ldc.i4 32748
 	add
 	stloc.1
-// 0x010187a4: 0x10187a4: jal   0x1093a24 sw    s1, 16(sp)
+// 0x010187b4: 0x10187b4: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6236,20 +6236,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010187ac: 0x10187ac: lui   a0, 0x10000
+// 0x010187bc: 0x10187bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010187b0: 0x10187b0: addiu a0, a0, -32748
+// 0x010187c0: 0x10187c0: addiu a0, a0, -32748
 	ldloc.1
 	ldc.i4 -32748
 	add
 	stloc.1
-// 0x010187b4: 0x10187b4: jal   0x101cd60 addu  s5, v0, zero
+// 0x010187c4: 0x10187c4: jal   0x101cd70 addu  s5, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -6257,26 +6257,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010187bc: 0x10187bc: lui   a0, 0x10000
+// 0x010187cc: 0x10187cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010187c0: 0x10187c0: addiu a3, zero, 4240
+// 0x010187d0: 0x10187d0: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010187c4: 0x10187c4: addiu a2, zero, 14
+// 0x010187d4: 0x10187d4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010187c8: 0x10187c8: addiu a0, a0, -32704
+// 0x010187d8: 0x10187d8: addiu a0, a0, -32704
 	ldloc.1
 	ldc.i4 -32704
 	add
 	stloc.1
-// 0x010187cc: 0x10187cc: jal   0x1098d10 addu  a1, v0, zero
+// 0x010187dc: 0x10187dc: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6284,76 +6284,76 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010187d4: 0x10187d4: addu  a1, v0, zero
+// 0x010187e4: 0x10187e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010187d8: 0x10187d8: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010187e8: 0x10187e8: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010187e0: 0x10187e0: addu  a2, zero, zero
+// 0x010187f0: 0x10187f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010187e4: 0x10187e4: addu  a0, s5, zero
+// 0x010187f4: 0x10187f4: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010187e8: 0x10187e8: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010187f8: 0x10187f8: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010187f0: 0x10187f0: addu  a1, s5, zero
+// 0x01018800: 0x1018800: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x010187f4: 0x10187f4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018804: 0x1018804: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010187fc: 0x10187fc: jal   0x1017f54 sll   zero, zero, 0
+// 0x0101880c: 0x101880c: jal   0x1017f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018804: 0x1018804: addu  a1, v0, zero
+// 0x01018814: 0x1018814: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018808: 0x1018808: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018818: 0x1018818: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018810: 0x1018810: lw    t1, 44(sp)
+// 0x01018820: 0x1018820: lw    t1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6362,24 +6362,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01018814: 0x1018814: lui   a0, 0x10000
+// 0x01018824: 0x1018824: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018818: 0x1018818: addiu a0, a0, -32672
+// 0x01018828: 0x1018828: addiu a0, a0, -32672
 	ldloc.1
 	ldc.i4 -32672
 	add
 	stloc.1
-// 0x0101881c: 0x101881c: addu  a1, zero, zero
+// 0x0101882c: 0x101882c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018820: 0x1018820: addiu a2, zero, -2
+// 0x01018830: 0x1018830: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018824: 0x1018824: addiu a3, zero, -1
+// 0x01018834: 0x1018834: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018828: 0x1018828: jal   0x1093a24 sw    t1, 16(sp)
+// 0x01018838: 0x1018838: jal   0x1094048 sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6393,37 +6393,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018830: 0x1018830: addu  s6, v0, zero
+// 0x01018840: 0x1018840: addu  s6, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01018834: 0x1018834: lui   v0, 0x10000
+// 0x01018844: 0x1018844: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01018838: 0x1018838: ori   t1, s2, 136
+// 0x01018848: 0x1018848: ori   t1, s2, 136
 	ldloc 17
 	ldc.i4 136
 	or
 	stloc 14
-// 0x0101883c: 0x101883c: addiu a3, zero, -1
+// 0x0101884c: 0x101884c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018840: 0x1018840: addu  a1, zero, zero
+// 0x01018850: 0x1018850: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018844: 0x1018844: addiu a2, zero, -2
+// 0x01018854: 0x1018854: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018848: 0x1018848: addiu a0, v0, -32652
+// 0x01018858: 0x1018858: addiu a0, v0, -32652
 	ldloc 5
 	ldc.i4 -32652
 	add
 	stloc.1
-// 0x0101884c: 0x101884c: sw    t1, 16(sp)
+// 0x0101885c: 0x101885c: sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6432,7 +6432,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01018850: 0x1018850: jal   0x1093a24 sw    t1, 44(sp)
+// 0x01018860: 0x1018860: jal   0x1094048 sw    t1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6446,72 +6446,72 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018858: 0x1018858: addu  a0, v0, zero
+// 0x01018868: 0x1018868: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101885c: 0x101885c: addiu a1, s4, 31980
+// 0x0101886c: 0x101886c: addiu a1, s4, 31980
 	ldloc 13
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01018860: 0x1018860: addiu a2, s3, 23008
+// 0x01018870: 0x1018870: addiu a2, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01018864: 0x1018864: jal   0x1098fe0 addu  s5, v0, zero
+// 0x01018874: 0x1018874: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0101886c: 0x101886c: lw    a2, -30068(s7)
+// 0x0101887c: 0x101887c: lw    a2, -29604(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x01018870: 0x1018870: addiu s4, zero, 3
+// 0x01018880: 0x1018880: addiu s4, zero, 3
 	ldc.i4.3
 	stloc 13
-// 0x01018874: 0x1018874: sll   a2, a2, 1
+// 0x01018884: 0x1018884: sll   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x01018878: 0x1018878: div   a2, s4
+// 0x01018888: 0x1018888: div   a2, s4
 	ldloc.3
 	ldloc 13
 	div
 	stloc 19
-// 0x0101887c: 0x101887c: lui   t0, 0x10000
+// 0x0101888c: 0x101888c: lui   t0, 0x10000
 	ldc.i4 65536
 	stloc 15
-// 0x01018880: 0x1018880: addiu v1, zero, 16
+// 0x01018890: 0x1018890: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 6
-// 0x01018884: 0x1018884: addiu a0, t0, -32632
+// 0x01018894: 0x1018894: addiu a0, t0, -32632
 	ldloc 15
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x01018888: 0x1018888: addiu a3, zero, -1
+// 0x01018898: 0x1018898: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0101888c: 0x101888c: addu  a1, zero, zero
+// 0x0101889c: 0x101889c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018890: 0x1018890: sw    v1, 16(sp)
+// 0x010188a0: 0x10188a0: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6520,7 +6520,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01018894: 0x1018894: sw    v1, 40(sp)
+// 0x010188a4: 0x10188a4: sw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6529,7 +6529,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01018898: 0x1018898: sw    t0, 36(sp)
+// 0x010188a8: 0x10188a8: sw    t0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6538,10 +6538,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101889c: 0x101889c: mflo  lo
+// 0x010188ac: 0x10188ac: mflo  lo
 	ldloc 19
 	stloc.3
-// 0x010188a0: 0x10188a0: jal   0x1093a24 lui   s3, 0x10000
+// 0x010188b0: 0x10188b0: jal   0x1094048 lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 12
 	ldloc.0
@@ -6549,32 +6549,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010188a8: 0x10188a8: addu  a0, v0, zero
+// 0x010188b8: 0x10188b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010188ac: 0x10188ac: addu  a1, zero, zero
+// 0x010188bc: 0x10188bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010188b0: 0x10188b0: addu  a2, zero, zero
+// 0x010188c0: 0x10188c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010188b4: 0x10188b4: jal   0x1098fe0 addu  s8, v0, zero
+// 0x010188c4: 0x10188c4: jal   0x1099628 addu  s8, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010188bc: 0x10188bc: lui   a0, 0x10000
+// 0x010188cc: 0x10188cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010188c0: 0x10188c0: jal   0x101cd60 addiu a0, a0, -32624
+// 0x010188d0: 0x10188d0: jal   0x101cd70 addiu a0, a0, -32624
 	ldloc.1
 	ldc.i4 -32624
 	add
@@ -6584,26 +6584,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010188c8: 0x10188c8: lui   a0, 0x10000
+// 0x010188d8: 0x10188d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010188cc: 0x10188cc: addiu a2, zero, -1
+// 0x010188dc: 0x10188dc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010188d0: 0x10188d0: addiu a3, zero, 4240
+// 0x010188e0: 0x10188e0: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010188d4: 0x10188d4: addiu a0, a0, -32588
+// 0x010188e4: 0x10188e4: addiu a0, a0, -32588
 	ldloc.1
 	ldc.i4 -32588
 	add
 	stloc.1
-// 0x010188d8: 0x10188d8: jal   0x1098d10 addu  a1, v0, zero
+// 0x010188e8: 0x10188e8: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6611,55 +6611,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010188e0: 0x10188e0: addu  a1, v0, zero
+// 0x010188f0: 0x10188f0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010188e4: 0x10188e4: jal   0x1098ec4 addu  a0, s8, zero
+// 0x010188f4: 0x10188f4: jal   0x109950c addu  a0, s8, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010188ec: 0x10188ec: addu  a0, s5, zero
+// 0x010188fc: 0x10188fc: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010188f0: 0x10188f0: jal   0x1098ec4 addu  a1, s8, zero
+// 0x01018900: 0x1018900: jal   0x109950c addu  a1, s8, zero
 	ldloc 16
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010188f8: 0x10188f8: lui   a0, 0x0
+// 0x01018908: 0x1018908: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010188fc: 0x10188fc: addiu a2, zero, 26
+// 0x0101890c: 0x101890c: addiu a2, zero, 26
 	ldc.i4.s 26
 	stloc.3
-// 0x01018900: 0x1018900: addu  a3, zero, zero
+// 0x01018910: 0x1018910: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01018904: 0x1018904: addiu a0, a0, 32068
+// 0x01018914: 0x1018914: addiu a0, a0, 32068
 	ldloc.1
 	ldc.i4 32068
 	add
 	stloc.1
-// 0x01018908: 0x1018908: addiu a1, zero, 1
+// 0x01018918: 0x1018918: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0101890c: 0x101890c: sw    zero, 16(sp)
+// 0x0101891c: 0x101891c: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6668,7 +6668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01018910: 0x1018910: sw    zero, 20(sp)
+// 0x01018920: 0x1018920: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6677,7 +6677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01018914: 0x1018914: jal   0x109c14c sw    zero, 24(sp)
+// 0x01018924: 0x1018924: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6691,38 +6691,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101891c: 0x101891c: addu  a1, v0, zero
+// 0x0101892c: 0x101892c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018920: 0x1018920: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01018930: 0x1018930: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018928: 0x1018928: addu  a1, s5, zero
+// 0x01018938: 0x1018938: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x0101892c: 0x101892c: jal   0x1098ec4 addu  a0, s6, zero
+// 0x0101893c: 0x101893c: jal   0x109950c addu  a0, s6, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018934: 0x1018934: lw    t1, 44(sp)
+// 0x01018944: 0x1018944: lw    t1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6731,24 +6731,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01018938: 0x1018938: lui   v0, 0x10000
+// 0x01018948: 0x1018948: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0101893c: 0x101893c: addiu a0, v0, -32652
+// 0x0101894c: 0x101894c: addiu a0, v0, -32652
 	ldloc 5
 	ldc.i4 -32652
 	add
 	stloc.1
-// 0x01018940: 0x1018940: addu  a1, zero, zero
+// 0x01018950: 0x1018950: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018944: 0x1018944: addiu a2, zero, -2
+// 0x01018954: 0x1018954: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01018948: 0x1018948: addiu a3, zero, -1
+// 0x01018958: 0x1018958: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0101894c: 0x101894c: jal   0x1093a24 sw    t1, 16(sp)
+// 0x0101895c: 0x101895c: jal   0x1094048 sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6762,21 +6762,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018954: 0x1018954: lw    a2, -30068(s7)
+// 0x01018964: 0x1018964: lw    a2, -29604(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x01018958: 0x1018958: lw    t0, 36(sp)
+// 0x01018968: 0x1018968: lw    t0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6785,17 +6785,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101895c: 0x101895c: sll   a2, a2, 1
+// 0x0101896c: 0x101896c: sll   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x01018960: 0x1018960: div   a2, s4
+// 0x01018970: 0x1018970: div   a2, s4
 	ldloc.3
 	ldloc 13
 	div
 	stloc 19
-// 0x01018964: 0x1018964: lw    v1, 40(sp)
+// 0x01018974: 0x1018974: lw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6804,18 +6804,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01018968: 0x1018968: addiu a0, t0, -32632
+// 0x01018978: 0x1018978: addiu a0, t0, -32632
 	ldloc 15
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x0101896c: 0x101896c: addiu a3, zero, -1
+// 0x0101897c: 0x101897c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018970: 0x1018970: addu  a1, zero, zero
+// 0x01018980: 0x1018980: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018974: 0x1018974: sw    v1, 16(sp)
+// 0x01018984: 0x1018984: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6824,10 +6824,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01018978: 0x1018978: mflo  lo
+// 0x01018988: 0x1018988: mflo  lo
 	ldloc 19
 	stloc.3
-// 0x0101897c: 0x101897c: jal   0x1093a24 addu  s5, v0, zero
+// 0x0101898c: 0x101898c: jal   0x1094048 addu  s5, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -6835,32 +6835,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018984: 0x1018984: addu  a0, v0, zero
+// 0x01018994: 0x1018994: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01018988: 0x1018988: addu  a1, zero, zero
+// 0x01018998: 0x1018998: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101898c: 0x101898c: addu  a2, zero, zero
+// 0x0101899c: 0x101899c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01018990: 0x1018990: jal   0x1098fe0 addu  s4, v0, zero
+// 0x010189a0: 0x10189a0: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01018998: 0x1018998: lui   a0, 0x10000
+// 0x010189a8: 0x10189a8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101899c: 0x101899c: jal   0x101cd60 addiu a0, a0, -32568
+// 0x010189ac: 0x10189ac: jal   0x101cd70 addiu a0, a0, -32568
 	ldloc.1
 	ldc.i4 -32568
 	add
@@ -6870,26 +6870,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010189a4: 0x10189a4: lui   a0, 0x10000
+// 0x010189b4: 0x10189b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010189a8: 0x10189a8: addiu a2, zero, -1
+// 0x010189b8: 0x10189b8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010189ac: 0x10189ac: addiu a3, zero, 4240
+// 0x010189bc: 0x10189bc: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010189b0: 0x10189b0: addiu a0, a0, -32532
+// 0x010189c0: 0x10189c0: addiu a0, a0, -32532
 	ldloc.1
 	ldc.i4 -32532
 	add
 	stloc.1
-// 0x010189b4: 0x10189b4: jal   0x1098d10 addu  a1, v0, zero
+// 0x010189c4: 0x10189c4: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6897,55 +6897,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010189bc: 0x10189bc: addu  a1, v0, zero
+// 0x010189cc: 0x10189cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010189c0: 0x10189c0: jal   0x1098ec4 addu  a0, s4, zero
+// 0x010189d0: 0x10189d0: jal   0x109950c addu  a0, s4, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010189c8: 0x10189c8: addu  a0, s5, zero
+// 0x010189d8: 0x10189d8: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010189cc: 0x10189cc: jal   0x1098ec4 addu  a1, s4, zero
+// 0x010189dc: 0x10189dc: jal   0x109950c addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010189d4: 0x10189d4: lui   a0, 0x0
+// 0x010189e4: 0x10189e4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010189d8: 0x10189d8: addiu a2, zero, 26
+// 0x010189e8: 0x10189e8: addiu a2, zero, 26
 	ldc.i4.s 26
 	stloc.3
-// 0x010189dc: 0x10189dc: addu  a3, zero, zero
+// 0x010189ec: 0x10189ec: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010189e0: 0x10189e0: addiu a0, a0, 32088
+// 0x010189f0: 0x10189f0: addiu a0, a0, 32088
 	ldloc.1
 	ldc.i4 32088
 	add
 	stloc.1
-// 0x010189e4: 0x10189e4: addiu a1, zero, 1
+// 0x010189f4: 0x10189f4: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010189e8: 0x10189e8: sw    zero, 16(sp)
+// 0x010189f8: 0x10189f8: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6954,7 +6954,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010189ec: 0x10189ec: sw    zero, 20(sp)
+// 0x010189fc: 0x10189fc: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6963,7 +6963,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010189f0: 0x10189f0: jal   0x109c14c sw    zero, 24(sp)
+// 0x01018a00: 0x1018a00: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6977,92 +6977,92 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010189f8: 0x10189f8: addu  a1, v0, zero
+// 0x01018a08: 0x1018a08: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010189fc: 0x10189fc: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01018a0c: 0x1018a0c: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a04: 0x1018a04: addu  a0, s6, zero
+// 0x01018a14: 0x1018a14: addu  a0, s6, zero
 	ldloc 8
 	stloc.1
-// 0x01018a08: 0x1018a08: jal   0x1098ec4 addu  a1, s5, zero
+// 0x01018a18: 0x1018a18: jal   0x109950c addu  a1, s5, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a10: 0x1018a10: addu  a0, s0, zero
+// 0x01018a20: 0x1018a20: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01018a14: 0x1018a14: jal   0x1098ec4 addu  a1, s6, zero
+// 0x01018a24: 0x1018a24: jal   0x109950c addu  a1, s6, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a1c: 0x1018a1c: jal   0x1017f54 sll   zero, zero, 0
+// 0x01018a2c: 0x1018a2c: jal   0x1017f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::T_72_1017f54(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::T_72_1017f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a24: 0x1018a24: addu  a1, v0, zero
+// 0x01018a34: 0x1018a34: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018a28: 0x1018a28: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018a38: 0x1018a38: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a30: 0x1018a30: lui   a0, 0x20000
+// 0x01018a40: 0x1018a40: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01018a34: 0x1018a34: addu  a1, zero, zero
+// 0x01018a44: 0x1018a44: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01018a38: 0x1018a38: addiu a2, zero, -1
+// 0x01018a48: 0x1018a48: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01018a3c: 0x1018a3c: addiu a3, zero, -1
+// 0x01018a4c: 0x1018a4c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01018a40: 0x1018a40: addiu a0, a0, -21524
+// 0x01018a50: 0x1018a50: addiu a0, a0, -21060
 	ldloc.1
-	ldc.i4 -21524
+	ldc.i4 -21060
 	add
 	stloc.1
-// 0x01018a44: 0x1018a44: jal   0x1093a24 sw    s1, 16(sp)
+// 0x01018a54: 0x1018a54: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7076,20 +7076,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a4c: 0x1018a4c: lui   a0, 0x10000
+// 0x01018a5c: 0x1018a5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018a50: 0x1018a50: addiu a0, a0, -32508
+// 0x01018a60: 0x1018a60: addiu a0, a0, -32508
 	ldloc.1
 	ldc.i4 -32508
 	add
 	stloc.1
-// 0x01018a54: 0x1018a54: jal   0x101cd60 addu  s1, v0, zero
+// 0x01018a64: 0x1018a64: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -7097,21 +7097,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a5c: 0x1018a5c: addu  a1, v0, zero
+// 0x01018a6c: 0x1018a6c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018a60: 0x1018a60: addiu a2, zero, 14
+// 0x01018a70: 0x1018a70: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01018a64: 0x1018a64: addiu a3, zero, 4224
+// 0x01018a74: 0x1018a74: addiu a3, zero, 4224
 	ldc.i4 4224
 	stloc 4
-// 0x01018a68: 0x1018a68: jal   0x1098d10 addiu a0, s3, -32420
+// 0x01018a78: 0x1018a78: jal   0x1099358 addiu a0, s3, -32420
 	ldloc 12
 	ldc.i4 -32420
 	add
@@ -7121,28 +7121,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a70: 0x1018a70: addu  a1, v0, zero
+// 0x01018a80: 0x1018a80: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018a74: 0x1018a74: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018a84: 0x1018a84: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a7c: 0x1018a7c: lui   a0, 0x10000
+// 0x01018a8c: 0x1018a8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018a80: 0x1018a80: jal   0x101cd60 addiu a0, a0, -32404
+// 0x01018a90: 0x1018a90: jal   0x101cd70 addiu a0, a0, -32404
 	ldloc.1
 	ldc.i4 -32404
 	add
@@ -7152,21 +7152,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a88: 0x1018a88: addu  a1, v0, zero
+// 0x01018a98: 0x1018a98: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018a8c: 0x1018a8c: addiu a2, zero, 14
+// 0x01018a9c: 0x1018a9c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01018a90: 0x1018a90: addiu a3, zero, 4224
+// 0x01018aa0: 0x1018aa0: addiu a3, zero, 4224
 	ldc.i4 4224
 	stloc 4
-// 0x01018a94: 0x1018a94: jal   0x1098d10 addiu a0, s3, -32420
+// 0x01018aa4: 0x1018aa4: jal   0x1099358 addiu a0, s3, -32420
 	ldloc 12
 	ldc.i4 -32420
 	add
@@ -7176,28 +7176,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018a9c: 0x1018a9c: addu  a1, v0, zero
+// 0x01018aac: 0x1018aac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018aa0: 0x1018aa0: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018ab0: 0x1018ab0: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018aa8: 0x1018aa8: lui   a0, 0x10000
+// 0x01018ab8: 0x1018ab8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018aac: 0x1018aac: jal   0x101cd60 addiu a0, a0, -32384
+// 0x01018abc: 0x1018abc: jal   0x101cd70 addiu a0, a0, -32384
 	ldloc.1
 	ldc.i4 -32384
 	add
@@ -7207,21 +7207,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018ab4: 0x1018ab4: addu  a1, v0, zero
+// 0x01018ac4: 0x1018ac4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018ab8: 0x1018ab8: addiu a2, zero, 14
+// 0x01018ac8: 0x1018ac8: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01018abc: 0x1018abc: addiu a3, zero, 4224
+// 0x01018acc: 0x1018acc: addiu a3, zero, 4224
 	ldc.i4 4224
 	stloc 4
-// 0x01018ac0: 0x1018ac0: jal   0x1098d10 addiu a0, s3, -32420
+// 0x01018ad0: 0x1018ad0: jal   0x1099358 addiu a0, s3, -32420
 	ldloc 12
 	ldc.i4 -32420
 	add
@@ -7231,28 +7231,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018ac8: 0x1018ac8: addu  a1, v0, zero
+// 0x01018ad8: 0x1018ad8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018acc: 0x1018acc: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018adc: 0x1018adc: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018ad4: 0x1018ad4: lui   a0, 0x10000
+// 0x01018ae4: 0x1018ae4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018ad8: 0x1018ad8: jal   0x101cd60 addiu a0, a0, -32288
+// 0x01018ae8: 0x1018ae8: jal   0x101cd70 addiu a0, a0, -32288
 	ldloc.1
 	ldc.i4 -32288
 	add
@@ -7262,21 +7262,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018ae0: 0x1018ae0: addu  a1, v0, zero
+// 0x01018af0: 0x1018af0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018ae4: 0x1018ae4: addiu a2, zero, 14
+// 0x01018af4: 0x1018af4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01018ae8: 0x1018ae8: addiu a3, zero, 4224
+// 0x01018af8: 0x1018af8: addiu a3, zero, 4224
 	ldc.i4 4224
 	stloc 4
-// 0x01018aec: 0x1018aec: jal   0x1098d10 addiu a0, s3, -32420
+// 0x01018afc: 0x1018afc: jal   0x1099358 addiu a0, s3, -32420
 	ldloc 12
 	ldc.i4 -32420
 	add
@@ -7286,28 +7286,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018af4: 0x1018af4: addu  a1, v0, zero
+// 0x01018b04: 0x1018b04: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018af8: 0x1018af8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018b08: 0x1018b08: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b00: 0x1018b00: lui   a0, 0x10000
+// 0x01018b10: 0x1018b10: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018b04: 0x1018b04: jal   0x101cd60 addiu a0, a0, -32252
+// 0x01018b14: 0x1018b14: jal   0x101cd70 addiu a0, a0, -32252
 	ldloc.1
 	ldc.i4 -32252
 	add
@@ -7317,23 +7317,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b0c: 0x1018b0c: addu  a1, v0, zero
+// 0x01018b1c: 0x1018b1c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018b10: 0x1018b10: ori   a3, s2, 4224
+// 0x01018b20: 0x1018b20: ori   a3, s2, 4224
 	ldloc 17
 	ldc.i4 4224
 	or
 	stloc 4
-// 0x01018b14: 0x1018b14: addiu a2, zero, 14
+// 0x01018b24: 0x1018b24: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01018b18: 0x1018b18: jal   0x1098d10 addiu a0, s3, -32420
+// 0x01018b28: 0x1018b28: jal   0x1099358 addiu a0, s3, -32420
 	ldloc 12
 	ldc.i4 -32420
 	add
@@ -7343,55 +7343,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b20: 0x1018b20: addu  a1, v0, zero
+// 0x01018b30: 0x1018b30: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018b24: 0x1018b24: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01018b34: 0x1018b34: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b2c: 0x1018b2c: addu  a2, zero, zero
+// 0x01018b3c: 0x1018b3c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01018b30: 0x1018b30: addu  a0, s1, zero
+// 0x01018b40: 0x1018b40: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01018b34: 0x1018b34: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01018b44: 0x1018b44: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01018b3c: 0x1018b3c: addu  a1, s1, zero
+// 0x01018b4c: 0x1018b4c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01018b40: 0x1018b40: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01018b50: 0x1018b50: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b48: 0x1018b48: lui   a0, 0x0
+// 0x01018b58: 0x1018b58: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018b4c: 0x1018b4c: jal   0x101cd60 addiu a0, a0, 32524
+// 0x01018b5c: 0x1018b5c: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -7401,15 +7401,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b54: 0x1018b54: addu  a1, v0, zero
+// 0x01018b64: 0x1018b64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018b58: 0x1018b58: jal   0x109b434 addu  a0, s0, zero
+// 0x01018b68: 0x1018b68: jal   0x109ba7c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -7417,35 +7417,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b60: 0x1018b60: lui   a1, 0x1010000
+// 0x01018b70: 0x1018b70: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x01018b64: 0x1018b64: addu  a0, s0, zero
+// 0x01018b74: 0x1018b74: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01018b68: 0x1018b68: jal   0x1099174 addiu a1, a1, 28312
+// 0x01018b78: 0x1018b78: jal   0x10997bc addiu a1, a1, 28328
 	ldloc.2
-	ldc.i4 28312
+	ldc.i4 28328
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01018b70: 0x1018b70: lui   v0, 0x0
+// 0x01018b80: 0x1018b80: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01018b74: 0x1018b74: addiu a0, v0, 32536
+// 0x01018b84: 0x1018b84: addiu a0, v0, 32536
 	ldloc 5
 	ldc.i4 32536
 	add
 	stloc.1
-// 0x01018b78: 0x1018b78: jal   0x1095eec addu  a1, zero, zero
+// 0x01018b88: 0x1018b88: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7453,13 +7453,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1018b80:
-// 0x01018b80: 0x1018b80: jal   0x1017cb4 lui   s0, 0x0
+L_1018b90:
+// 0x01018b90: 0x1018b90: jal   0x1017cc4 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 11
 	ldloc.0
@@ -7467,50 +7467,50 @@ L_1018b80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_logged_in_1017cb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_logged_in_1017cc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018b88: 0x1018b88: beq   v0, zero, 0x1018b9c sll   zero, zero, 0
+// 0x01018b98: 0x1018b98: beq   v0, zero, 0x1018bac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1018b9c
+	brfalse L_1018bac
 // --- basic block ---
-// 0x01018b90: 0x1018b90: lui   a0, 0x10000
+// 0x01018ba0: 0x1018ba0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018b94: 0x1018b94: j	 0x1018ba4 addiu a0, a0, -32232
+// 0x01018ba4: 0x1018ba4: j	 0x1018bb4 addiu a0, a0, -32232
 	ldloc.1
 	ldc.i4 -32232
 	add
 	stloc.1
-	br L_1018ba4
+	br L_1018bb4
 // --- basic block ---
-L_1018b9c:
-// 0x01018b9c: 0x1018b9c: lui   a0, 0x10000
+L_1018bac:
+// 0x01018bac: 0x1018bac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01018ba0: 0x1018ba0: addiu a0, a0, -32212
+// 0x01018bb0: 0x1018bb0: addiu a0, a0, -32212
 	ldloc.1
 	ldc.i4 -32212
 	add
 	stloc.1
-L_1018ba4:
-// 0x01018ba4: 0x1018ba4: jal   0x101cd60 sll   zero, zero, 0
+L_1018bb4:
+// 0x01018bb4: 0x1018bb4: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018bac: 0x1018bac: addu  a1, v0, zero
+// 0x01018bbc: 0x1018bbc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01018bb0: 0x1018bb0: jal   0x1094770 addiu a0, s0, 32648
+// 0x01018bc0: 0x1018bc0: jal   0x1094d94 addiu a0, s0, 32648
 	ldloc 11
 	ldc.i4 32648
 	add
@@ -7520,31 +7520,31 @@ L_1018ba4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018bb8: 0x1018bb8: jal   0x1017c90 sll   zero, zero, 0
+// 0x01018bc8: 0x1018bc8: jal   0x1017ca0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_get_username_1017c90(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_get_username_1017ca0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018bc0: 0x1018bc0: lui   a0, 0x0
+// 0x01018bd0: 0x1018bd0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018bc4: 0x1018bc4: addiu a0, a0, 32028
+// 0x01018bd4: 0x1018bd4: addiu a0, a0, 32028
 	ldloc.1
 	ldc.i4 32028
 	add
 	stloc.1
-// 0x01018bc8: 0x1018bc8: jal   0x1094770 addu  a1, v0, zero
+// 0x01018bd8: 0x1018bd8: jal   0x1094d94 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7552,31 +7552,31 @@ L_1018ba4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018bd0: 0x1018bd0: jal   0x1017c6c sll   zero, zero, 0
+// 0x01018be0: 0x1018be0: jal   0x1017c7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_get_password_1017c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_get_password_1017c7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018bd8: 0x1018bd8: lui   a0, 0x0
+// 0x01018be8: 0x1018be8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018bdc: 0x1018bdc: addiu a0, a0, 32048
+// 0x01018bec: 0x1018bec: addiu a0, a0, 32048
 	ldloc.1
 	ldc.i4 32048
 	add
 	stloc.1
-// 0x01018be0: 0x1018be0: jal   0x1094770 addu  a1, v0, zero
+// 0x01018bf0: 0x1018bf0: jal   0x1094d94 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7584,49 +7584,49 @@ L_1018ba4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018be8: 0x1018be8: jal   0x1017968 sll   zero, zero, 0
+// 0x01018bf8: 0x1018bf8: jal   0x1017978 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_is_tweet_login_enabled_1017968(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_is_tweet_login_enabled_1017978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018bf0: 0x1018bf0: beq   v0, zero, 0x1018c04 lui   v1, 0x30000
+// 0x01018c00: 0x1018c00: beq   v0, zero, 0x1018c14 lui   v1, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 6
-	brfalse L_1018c04
+	brfalse L_1018c14
 // --- basic block ---
-// 0x01018bf8: 0x1018bf8: lw    a1, -27804(v1)
+// 0x01018c08: 0x1018c08: lw    a1, -27340(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6951
+	ldc.i4 -6835
 	add
 	ldelem.i4
 	stloc.2
-// 0x01018bfc: 0x1018bfc: j	 0x1018c10 lui   a0, 0x0
+// 0x01018c0c: 0x1018c0c: j	 0x1018c20 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_1018c10
+	br L_1018c20
 // --- basic block ---
-L_1018c04:
-// 0x01018c04: 0x1018c04: addiu v1, v1, -27804
+L_1018c14:
+// 0x01018c14: 0x1018c14: addiu v1, v1, -27340
 	ldloc 6
-	ldc.i4 -27804
+	ldc.i4 -27340
 	add
 	stloc 6
-// 0x01018c08: 0x1018c08: lw    a1, 4(v1)
+// 0x01018c18: 0x1018c18: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7635,11 +7635,11 @@ L_1018c04:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01018c0c: 0x1018c0c: lui   a0, 0x0
+// 0x01018c1c: 0x1018c1c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1018c10:
-// 0x01018c10: 0x1018c10: jal   0x1094734 addiu a0, a0, 32068
+L_1018c20:
+// 0x01018c20: 0x1018c20: jal   0x1094d58 addiu a0, a0, 32068
 	ldloc.1
 	ldc.i4 32068
 	add
@@ -7649,49 +7649,49 @@ L_1018c10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018c18: 0x1018c18: jal   0x1017834 sll   zero, zero, 0
+// 0x01018c28: 0x1018c28: jal   0x1017844 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_is_tweet_badge_enabled_1017834(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_is_tweet_badge_enabled_1017844(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018c20: 0x1018c20: beq   v0, zero, 0x1018c34 lui   v1, 0x30000
+// 0x01018c30: 0x1018c30: beq   v0, zero, 0x1018c44 lui   v1, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 6
-	brfalse L_1018c34
+	brfalse L_1018c44
 // --- basic block ---
-// 0x01018c28: 0x1018c28: lw    a1, -27804(v1)
+// 0x01018c38: 0x1018c38: lw    a1, -27340(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6951
+	ldc.i4 -6835
 	add
 	ldelem.i4
 	stloc.2
-// 0x01018c2c: 0x1018c2c: j	 0x1018c40 lui   a0, 0x0
+// 0x01018c3c: 0x1018c3c: j	 0x1018c50 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_1018c40
+	br L_1018c50
 // --- basic block ---
-L_1018c34:
-// 0x01018c34: 0x1018c34: addiu v1, v1, -27804
+L_1018c44:
+// 0x01018c44: 0x1018c44: addiu v1, v1, -27340
 	ldloc 6
-	ldc.i4 -27804
+	ldc.i4 -27340
 	add
 	stloc 6
-// 0x01018c38: 0x1018c38: lw    a1, 4(v1)
+// 0x01018c48: 0x1018c48: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7700,11 +7700,11 @@ L_1018c34:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01018c3c: 0x1018c3c: lui   a0, 0x0
+// 0x01018c4c: 0x1018c4c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1018c40:
-// 0x01018c40: 0x1018c40: jal   0x1094734 addiu a0, a0, 32088
+L_1018c50:
+// 0x01018c50: 0x1018c50: jal   0x1094d58 addiu a0, a0, 32088
 	ldloc.1
 	ldc.i4 32088
 	add
@@ -7714,13 +7714,13 @@ L_1018c40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018c48: 0x1018c48: lw    ra, 84(sp)
-// 0x01018c4c: 0x1018c4c: lw    s8, 80(sp)
+// 0x01018c58: 0x1018c58: lw    ra, 84(sp)
+// 0x01018c5c: 0x1018c5c: lw    s8, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7729,7 +7729,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01018c50: 0x1018c50: lw    s7, 76(sp)
+// 0x01018c60: 0x1018c60: lw    s7, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7738,7 +7738,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01018c54: 0x1018c54: lw    s6, 72(sp)
+// 0x01018c64: 0x1018c64: lw    s6, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7747,7 +7747,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01018c58: 0x1018c58: lw    s5, 68(sp)
+// 0x01018c68: 0x1018c68: lw    s5, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7756,7 +7756,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01018c5c: 0x1018c5c: lw    s4, 64(sp)
+// 0x01018c6c: 0x1018c6c: lw    s4, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7765,7 +7765,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01018c60: 0x1018c60: lw    s3, 60(sp)
+// 0x01018c70: 0x1018c70: lw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7774,7 +7774,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01018c64: 0x1018c64: lw    s2, 56(sp)
+// 0x01018c74: 0x1018c74: lw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7783,7 +7783,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01018c68: 0x1018c68: lw    s1, 52(sp)
+// 0x01018c78: 0x1018c78: lw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7792,7 +7792,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01018c6c: 0x1018c6c: lw    s0, 48(sp)
+// 0x01018c7c: 0x1018c7c: lw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7801,7 +7801,7 @@ L_1018c40:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01018c70: 0x1018c70: jr    ra addiu sp, sp, 88
+// 0x01018c80: 0x1018c80: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
diff --git a/converted/Cibyl18.j b/converted/Cibyl18.j
index 1e69839..f897224 100644
--- a/converted/Cibyl18.j
+++ b/converted/Cibyl18.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl18::.ctor
 
-.method public static int32 roadmap_foursquare_checkin_1018c78(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_checkin_1018c88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,39 +76,39 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1018c78:
-// 0x01018c78: 0x1018c78: addiu sp, sp, -24
+L_1018c88:
+// 0x01018c88: 0x1018c88: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01018c7c: 0x1018c7c: sw    ra, 20(sp)
-// 0x01018c80: 0x1018c80: jal   0x1017cb4 sll   zero, zero, 0
+// 0x01018c8c: 0x1018c8c: sw    ra, 20(sp)
+// 0x01018c90: 0x1018c90: jal   0x1017cc4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_logged_in_1017cb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_logged_in_1017cc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018c88: 0x1018c88: bne   v0, zero, 0x1018ca4 lui   v1, 0x30000
+// 0x01018c98: 0x1018c98: bne   v0, zero, 0x1018cb4 lui   v1, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 6
-	brtrue L_1018ca4
+	brtrue L_1018cb4
 // --- basic block ---
-// 0x01018c90: 0x1018c90: addiu v0, zero, 1
+// 0x01018ca0: 0x1018ca0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01018c94: 0x1018c94: jal   0x1018418 sw    v0, -28416(v1)
+// 0x01018ca4: 0x1018ca4: jal   0x1018428 sw    v0, -27952(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7104
+	ldc.i4 -6988
 	add
 	ldloc 5
 	stelem.i4
@@ -117,59 +117,59 @@ L_1018c78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_login_dialog_1018418(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_login_dialog_1018428(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018c9c: 0x1018c9c: j	 0x1018cf0 sll   zero, zero, 0
-	br L_1018cf0
+// 0x01018cac: 0x1018cac: j	 0x1018d00 sll   zero, zero, 0
+	br L_1018d00
 // --- basic block ---
-L_1018ca4:
-// 0x01018ca4: 0x1018ca4: addiu a2, zero, 2
+L_1018cb4:
+// 0x01018cb4: 0x1018cb4: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01018ca8: 0x1018ca8: lui   v0, 0x30000
+// 0x01018cb8: 0x1018cb8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01018cac: 0x1018cac: lui   a1, 0x1010000
+// 0x01018cbc: 0x1018cbc: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x01018cb0: 0x1018cb0: sw    a2, -28412(v0)
+// 0x01018cc0: 0x1018cc0: sw    a2, -27948(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldloc.3
 	stelem.i4
-// 0x01018cb4: 0x1018cb4: addiu a1, a1, 28136
+// 0x01018cc4: 0x1018cc4: addiu a1, a1, 28152
 	ldloc.2
-	ldc.i4 28136
+	ldc.i4 28152
 	add
 	stloc.2
-// 0x01018cb8: 0x1018cb8: lui   v0, 0x30000
+// 0x01018cc8: 0x1018cc8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01018cbc: 0x1018cbc: addiu a0, zero, 15000
+// 0x01018ccc: 0x1018ccc: addiu a0, zero, 15000
 	ldc.i4 15000
 	stloc.1
-// 0x01018cc0: 0x1018cc0: sw    zero, -28416(v1)
+// 0x01018cd0: 0x1018cd0: sw    zero, -27952(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7104
+	ldc.i4 -6988
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01018cc4: 0x1018cc4: jal   0x104fe98 sw    zero, -28408(v0)
+// 0x01018cd4: 0x1018cd4: jal   0x104fea8 sw    zero, -27944(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7102
+	ldc.i4 -6986
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -178,20 +178,20 @@ L_1018ca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018ccc: 0x1018ccc: lui   a1, 0x1010000
+// 0x01018cdc: 0x1018cdc: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x01018cd0: 0x1018cd0: addiu a1, a1, 28080
+// 0x01018ce0: 0x1018ce0: addiu a1, a1, 28096
 	ldloc.2
-	ldc.i4 28080
+	ldc.i4 28096
 	add
 	stloc.2
-// 0x01018cd4: 0x1018cd4: jal   0x104fe98 addiu a0, zero, 100
+// 0x01018ce4: 0x1018ce4: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -199,17 +199,17 @@ L_1018ca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018cdc: 0x1018cdc: lui   a0, 0x20000
+// 0x01018cec: 0x1018cec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01018ce0: 0x1018ce0: jal   0x101df50 addiu a0, a0, 6792
+// 0x01018cf0: 0x1018cf0: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -217,12 +217,12 @@ L_1018ca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01018ce8: 0x1018ce8: jal   0x106cc98 addu  a0, v0, zero
+// 0x01018cf8: 0x1018cf8: jal   0x106d2bc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -230,15 +230,15 @@ L_1018ca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_FoursquareSearch_106cc98(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_FoursquareSearch_106d2bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1018cf0:
-// 0x01018cf0: 0x1018cf0: lw    ra, 20(sp)
-// 0x01018cf4: 0x1018cf4: sll   zero, zero, 0
-// 0x01018cf8: 0x1018cf8: jr    ra addiu sp, sp, 24
+L_1018d00:
+// 0x01018d00: 0x1018d00: lw    ra, 20(sp)
+// 0x01018d04: 0x1018d04: sll   zero, zero, 0
+// 0x01018d08: 0x1018d08: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -250,7 +250,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_foursquare_checkin_1018d00(int32,int32,int32,int32,int32)
+.method public static int32 on_foursquare_checkin_1018d10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -285,28 +285,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01018d00: 0x1018d00: addiu sp, sp, -24
+// 0x01018d10: 0x1018d10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01018d04: 0x1018d04: sw    ra, 20(sp)
-// 0x01018d08: 0x1018d08: jal   0x1018c78 sll   zero, zero, 0
+// 0x01018d14: 0x1018d14: sw    ra, 20(sp)
+// 0x01018d18: 0x1018d18: jal   0x1018c88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_foursquare_checkin_1018c78(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_foursquare_checkin_1018c88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01018d10: 0x1018d10: lw    ra, 20(sp)
-// 0x01018d14: 0x1018d14: addu  v0, zero, zero
+// 0x01018d20: 0x1018d20: lw    ra, 20(sp)
+// 0x01018d24: 0x1018d24: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01018d18: 0x1018d18: jr    ra addiu sp, sp, 24
+// 0x01018d28: 0x1018d28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -318,7 +318,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_foursquare_response_1018d20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_foursquare_response_1018d30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s2,int32 s3,int32 s6,int32 s0,int32 s1,int32 s5,int32 ra)
@@ -374,12 +374,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01018d20: 0x1018d20: addiu sp, sp, -192
+// 0x01018d30: 0x1018d30: addiu sp, sp, -192
 	ldloc.0
 	ldc.i4 -192
 	add
 	stloc.0
-// 0x01018d24: 0x1018d24: sw    s2, 168(sp)
+// 0x01018d34: 0x1018d34: sw    s2, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -388,19 +388,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01018d28: 0x1018d28: addu  s2, a0, zero
+// 0x01018d38: 0x1018d38: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01018d2c: 0x1018d2c: lui   a0, 0x1010000
+// 0x01018d3c: 0x1018d3c: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x01018d30: 0x1018d30: addiu a0, a0, 28136
+// 0x01018d40: 0x1018d40: addiu a0, a0, 28152
 	ldloc.1
-	ldc.i4 28136
+	ldc.i4 28152
 	add
 	stloc.1
-// 0x01018d34: 0x1018d34: sw    ra, 188(sp)
-// 0x01018d38: 0x1018d38: sw    s6, 184(sp)
+// 0x01018d44: 0x1018d44: sw    ra, 188(sp)
+// 0x01018d48: 0x1018d48: sw    s6, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -409,7 +409,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01018d3c: 0x1018d3c: sw    s4, 176(sp)
+// 0x01018d4c: 0x1018d4c: sw    s4, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -418,7 +418,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01018d40: 0x1018d40: sw    s3, 172(sp)
+// 0x01018d50: 0x1018d50: sw    s3, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -427,7 +427,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01018d44: 0x1018d44: sw    s1, 164(sp)
+// 0x01018d54: 0x1018d54: sw    s1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -436,16 +436,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01018d48: 0x1018d48: addu  s4, a2, zero
+// 0x01018d58: 0x1018d58: addu  s4, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01018d4c: 0x1018d4c: addu  s1, a1, zero
+// 0x01018d5c: 0x1018d5c: addu  s1, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01018d50: 0x1018d50: addu  s6, a3, zero
+// 0x01018d60: 0x1018d60: addu  s6, a3, zero
 	ldloc 4
 	stloc 11
-// 0x01018d54: 0x1018d54: sw    s5, 180(sp)
+// 0x01018d64: 0x1018d64: sw    s5, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -454,7 +454,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01018d58: 0x1018d58: jal   0x104fd00 sw    s0, 160(sp)
+// 0x01018d68: 0x1018d68: jal   0x104fd10 sw    s0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -468,89 +468,89 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018d60: 0x1018d60: jal   0x104c3f0 lui   s3, 0x30000
+// 0x01018d70: 0x1018d70: jal   0x104c400 lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 10
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018d68: 0x1018d68: addiu v0, zero, 200
+// 0x01018d78: 0x1018d78: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01018d6c: 0x1018d6c: beq   s2, v0, 0x1018e44 addiu v1, zero, 1
+// 0x01018d7c: 0x1018d7c: beq   s2, v0, 0x1018e54 addiu v1, zero, 1
 	ldloc 9
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	beq  L_1018e44
+	beq  L_1018e54
 // --- basic block ---
-// 0x01018d74: 0x1018d74: lw    v0, -28412(s3)
+// 0x01018d84: 0x1018d84: lw    v0, -27948(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldelem.i4
 	stloc 5
-// 0x01018d78: 0x1018d78: sll   zero, zero, 0
-// 0x01018d7c: 0x1018d7c: beq   v0, v1, 0x1018d9c addiu v1, zero, 2
+// 0x01018d88: 0x1018d88: sll   zero, zero, 0
+// 0x01018d8c: 0x1018d8c: beq   v0, v1, 0x1018dac addiu v1, zero, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	beq  L_1018d9c
+	beq  L_1018dac
 // --- basic block ---
-// 0x01018d84: 0x1018d84: beq   v0, v1, 0x1018dcc addiu v1, zero, 3
+// 0x01018d94: 0x1018d94: beq   v0, v1, 0x1018ddc addiu v1, zero, 3
 	ldloc 5
 	ldloc 7
 	ldc.i4.3
 	stloc 7
-	beq  L_1018dcc
+	beq  L_1018ddc
 // --- basic block ---
-// 0x01018d8c: 0x1018d8c: bne   v0, v1, 0x1018e1c lui   s0, 0x0
+// 0x01018d9c: 0x1018d9c: bne   v0, v1, 0x1018e2c lui   s0, 0x0
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc 12
-	bne.un L_1018e1c
+	bne.un L_1018e2c
 // --- basic block ---
-// 0x01018d94: 0x1018d94: j	 0x1018de8 lui   a3, 0x10000
+// 0x01018da4: 0x1018da4: j	 0x1018df8 lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-	br L_1018de8
+	br L_1018df8
 // --- basic block ---
-L_1018d9c:
-// 0x01018d9c: 0x1018d9c: lui   a1, 0x0
+L_1018dac:
+// 0x01018dac: 0x1018dac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01018da0: 0x1018da0: lui   a3, 0x10000
+// 0x01018db0: 0x1018db0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01018da4: 0x1018da4: addiu a1, a1, 30284
+// 0x01018db4: 0x1018db4: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018da8: 0x1018da8: addiu a3, a3, -32188
+// 0x01018db8: 0x1018db8: addiu a3, a3, -32188
 	ldloc 4
 	ldc.i4 -32188
 	add
 	stloc 4
-// 0x01018dac: 0x1018dac: addiu a2, zero, 994
+// 0x01018dbc: 0x1018dbc: addiu a2, zero, 994
 	ldc.i4 994
 	stloc.3
-// 0x01018db0: 0x1018db0: addiu a0, zero, 4
+// 0x01018dc0: 0x1018dc0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01018db4: 0x1018db4: jal   0x100449c sw    s2, 16(sp)
+// 0x01018dc4: 0x1018dc4: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -569,7 +569,7 @@ L_1018d9c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018dbc: 0x1018dbc: jal   0x1017698 addu  a0, s2, zero
+// 0x01018dcc: 0x1018dcc: jal   0x10176a8 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -577,60 +577,60 @@ L_1018d9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_login_failed_1017698(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_login_failed_10176a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018dc4: 0x1018dc4: j	 0x1018e3c lui   v0, 0x30000
+// 0x01018dd4: 0x1018dd4: j	 0x1018e4c lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-	br L_1018e3c
+	br L_1018e4c
 // --- basic block ---
-L_1018dcc:
-// 0x01018dcc: 0x1018dcc: lui   a1, 0x0
+L_1018ddc:
+// 0x01018ddc: 0x1018ddc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01018dd0: 0x1018dd0: lui   a3, 0x10000
+// 0x01018de0: 0x1018de0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01018dd4: 0x1018dd4: addiu a1, a1, 30284
+// 0x01018de4: 0x1018de4: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018dd8: 0x1018dd8: addiu a3, a3, -32120
+// 0x01018de8: 0x1018de8: addiu a3, a3, -32120
 	ldloc 4
 	ldc.i4 -32120
 	add
 	stloc 4
-// 0x01018ddc: 0x1018ddc: addiu a0, zero, 4
+// 0x01018dec: 0x1018dec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01018de0: 0x1018de0: j	 0x1018df8 addiu a2, zero, 998
+// 0x01018df0: 0x1018df0: j	 0x1018e08 addiu a2, zero, 998
 	ldc.i4 998
 	stloc.3
-	br L_1018df8
+	br L_1018e08
 // --- basic block ---
-L_1018de8:
-// 0x01018de8: 0x1018de8: addiu a1, s0, 30284
+L_1018df8:
+// 0x01018df8: 0x1018df8: addiu a1, s0, 30284
 	ldloc 12
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018dec: 0x1018dec: addiu a3, a3, -32052
+// 0x01018dfc: 0x1018dfc: addiu a3, a3, -32052
 	ldloc 4
 	ldc.i4 -32052
 	add
 	stloc 4
-// 0x01018df0: 0x1018df0: addiu a0, zero, 4
+// 0x01018e00: 0x1018e00: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01018df4: 0x1018df4: addiu a2, zero, 1002
+// 0x01018e04: 0x1018e04: addiu a2, zero, 1002
 	ldc.i4 1002
 	stloc.3
-L_1018df8:
-// 0x01018df8: 0x1018df8: jal   0x100449c sw    s2, 16(sp)
+L_1018e08:
+// 0x01018e08: 0x1018e08: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -649,18 +649,18 @@ L_1018df8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018e00: 0x1018e00: lui   a0, 0x0
+// 0x01018e10: 0x1018e10: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01018e04: 0x1018e04: lui   a1, 0x0
+// 0x01018e14: 0x1018e14: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01018e08: 0x1018e08: addiu a0, a0, 30092
+// 0x01018e18: 0x1018e18: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x01018e0c: 0x1018e0c: jal   0x104c148 addiu a1, a1, 30100
+// 0x01018e1c: 0x1018e1c: jal   0x104c158 addiu a1, a1, 30100
 	ldloc.2
 	ldc.i4 30100
 	add
@@ -670,37 +670,37 @@ L_1018df8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018e14: 0x1018e14: j	 0x1018e3c lui   v0, 0x30000
+// 0x01018e24: 0x1018e24: j	 0x1018e4c lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-	br L_1018e3c
+	br L_1018e4c
 // --- basic block ---
-L_1018e1c:
-// 0x01018e1c: 0x1018e1c: lui   a3, 0x10000
+L_1018e2c:
+// 0x01018e2c: 0x1018e2c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01018e20: 0x1018e20: addiu a1, s0, 30284
+// 0x01018e30: 0x1018e30: addiu a1, s0, 30284
 	ldloc 12
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018e24: 0x1018e24: addiu a3, a3, -31984
+// 0x01018e34: 0x1018e34: addiu a3, a3, -31984
 	ldloc 4
 	ldc.i4 -31984
 	add
 	stloc 4
-// 0x01018e28: 0x1018e28: addiu a0, zero, 4
+// 0x01018e38: 0x1018e38: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01018e2c: 0x1018e2c: addiu a2, zero, 1006
+// 0x01018e3c: 0x1018e3c: addiu a2, zero, 1006
 	ldc.i4 1006
 	stloc.3
-// 0x01018e30: 0x1018e30: jal   0x100449c sw    s2, 16(sp)
+// 0x01018e40: 0x1018e40: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -719,81 +719,81 @@ L_1018e1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018e38: 0x1018e38: lui   v0, 0x30000
+// 0x01018e48: 0x1018e48: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_1018e3c:
-// 0x01018e3c: 0x1018e3c: j	 0x101907c sw    zero, -28412(v0)
+L_1018e4c:
+// 0x01018e4c: 0x1018e4c: j	 0x101908c sw    zero, -27948(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_101907c
+	br L_101908c
 // --- basic block ---
-L_1018e44:
-// 0x01018e44: 0x1018e44: lw    v0, -28412(s3)
+L_1018e54:
+// 0x01018e54: 0x1018e54: lw    v0, -27948(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldelem.i4
 	stloc 5
-// 0x01018e48: 0x1018e48: addiu s2, zero, 1
+// 0x01018e58: 0x1018e58: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x01018e4c: 0x1018e4c: beq   v0, s2, 0x1018e6c addiu v1, zero, 2
+// 0x01018e5c: 0x1018e5c: beq   v0, s2, 0x1018e7c addiu v1, zero, 2
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	stloc 7
-	beq  L_1018e6c
+	beq  L_1018e7c
 // --- basic block ---
-// 0x01018e54: 0x1018e54: beq   v0, v1, 0x1018eb4 addiu v1, zero, 3
+// 0x01018e64: 0x1018e64: beq   v0, v1, 0x1018ec4 addiu v1, zero, 3
 	ldloc 5
 	ldloc 7
 	ldc.i4.3
 	stloc 7
-	beq  L_1018eb4
+	beq  L_1018ec4
 // --- basic block ---
-// 0x01018e5c: 0x1018e5c: bne   v0, v1, 0x1019064 lui   s0, 0x0
+// 0x01018e6c: 0x1018e6c: bne   v0, v1, 0x1019074 lui   s0, 0x0
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc 12
-	bne.un L_1019064
+	bne.un L_1019074
 // --- basic block ---
-// 0x01018e64: 0x1018e64: j	 0x1018eec lui   a3, 0x10000
+// 0x01018e74: 0x1018e74: j	 0x1018efc lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-	br L_1018eec
+	br L_1018efc
 // --- basic block ---
-L_1018e6c:
-// 0x01018e6c: 0x1018e6c: lui   a1, 0x0
+L_1018e7c:
+// 0x01018e7c: 0x1018e7c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01018e70: 0x1018e70: lui   a3, 0x10000
+// 0x01018e80: 0x1018e80: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01018e74: 0x1018e74: addiu a1, a1, 30284
+// 0x01018e84: 0x1018e84: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018e78: 0x1018e78: addiu a3, a3, -31916
+// 0x01018e88: 0x1018e88: addiu a3, a3, -31916
 	ldloc 4
 	ldc.i4 -31916
 	add
 	stloc 4
-// 0x01018e7c: 0x1018e7c: addiu a0, zero, 1
+// 0x01018e8c: 0x1018e8c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01018e80: 0x1018e80: jal   0x100449c addiu a2, zero, 1014
+// 0x01018e90: 0x1018e90: jal   0x100449c addiu a2, zero, 1014
 	ldc.i4 1014
 	stloc.3
 	ldloc.0
@@ -806,7 +806,7 @@ L_1018e6c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018e88: 0x1018e88: jal   0x101764c addiu a0, zero, 1
+// 0x01018e98: 0x1018e98: jal   0x101765c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -814,71 +814,71 @@ L_1018e6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_set_logged_in_101764c(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_set_logged_in_101765c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018e90: 0x1018e90: lui   v0, 0x30000
+// 0x01018ea0: 0x1018ea0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01018e94: 0x1018e94: lw    v0, -28416(v0)
+// 0x01018ea4: 0x1018ea4: lw    v0, -27952(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7104
+	ldc.i4 -6988
 	add
 	ldelem.i4
 	stloc 5
-// 0x01018e98: 0x1018e98: sll   zero, zero, 0
-// 0x01018e9c: 0x1018e9c: beq   v0, zero, 0x101907c sw    zero, -28412(s3)
+// 0x01018ea8: 0x1018ea8: sll   zero, zero, 0
+// 0x01018eac: 0x1018eac: beq   v0, zero, 0x101908c sw    zero, -27948(s3)
 	ldloc 5
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_101907c
+	brfalse L_101908c
 // --- basic block ---
-// 0x01018ea4: 0x1018ea4: jal   0x1018c78 sll   zero, zero, 0
+// 0x01018eb4: 0x1018eb4: jal   0x1018c88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_foursquare_checkin_1018c78(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_foursquare_checkin_1018c88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018eac: 0x1018eac: j	 0x101907c sll   zero, zero, 0
-	br L_101907c
+// 0x01018ebc: 0x1018ebc: j	 0x101908c sll   zero, zero, 0
+	br L_101908c
 // --- basic block ---
-L_1018eb4:
-// 0x01018eb4: 0x1018eb4: lui   a1, 0x0
+L_1018ec4:
+// 0x01018ec4: 0x1018ec4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01018eb8: 0x1018eb8: lui   a3, 0x10000
+// 0x01018ec8: 0x1018ec8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01018ebc: 0x1018ebc: addiu a1, a1, 30284
+// 0x01018ecc: 0x1018ecc: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018ec0: 0x1018ec0: addiu a3, a3, -31864
+// 0x01018ed0: 0x1018ed0: addiu a3, a3, -31864
 	ldloc 4
 	ldc.i4 -31864
 	add
 	stloc 4
-// 0x01018ec4: 0x1018ec4: addiu a0, zero, 1
+// 0x01018ed4: 0x1018ed4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01018ec8: 0x1018ec8: jal   0x100449c addiu a2, zero, 1021
+// 0x01018ed8: 0x1018ed8: jal   0x100449c addiu a2, zero, 1021
 	ldc.i4 1021
 	stloc.3
 	ldloc.0
@@ -891,21 +891,21 @@ L_1018eb4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018ed0: 0x1018ed0: addu  a2, s6, zero
+// 0x01018ee0: 0x1018ee0: addu  a2, s6, zero
 	ldloc 11
 	stloc.3
-// 0x01018ed4: 0x1018ed4: addu  a0, s1, zero
+// 0x01018ee4: 0x1018ee4: addu  a0, s1, zero
 	ldloc 13
 	stloc.1
-// 0x01018ed8: 0x1018ed8: addu  a1, s4, zero
+// 0x01018ee8: 0x1018ee8: addu  a1, s4, zero
 	ldloc 8
 	stloc.2
-// 0x01018edc: 0x1018edc: jal   0x1016ed8 sw    zero, -28412(s3)
+// 0x01018eec: 0x1018eec: jal   0x1016ee8 sw    zero, -27948(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -914,31 +914,31 @@ L_1018eb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::parse_search_results_1016ed8(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::parse_search_results_1016ee8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018ee4: 0x1018ee4: j	 0x101907c addu  s6, v0, zero
+// 0x01018ef4: 0x1018ef4: j	 0x101908c addu  s6, v0, zero
 	ldloc 5
 	stloc 11
-	br L_101907c
+	br L_101908c
 // --- basic block ---
-L_1018eec:
-// 0x01018eec: 0x1018eec: addiu a3, a3, -31812
+L_1018efc:
+// 0x01018efc: 0x1018efc: addiu a3, a3, -31812
 	ldloc 4
 	ldc.i4 -31812
 	add
 	stloc 4
-// 0x01018ef0: 0x1018ef0: addiu a0, zero, 1
+// 0x01018f00: 0x1018f00: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01018ef4: 0x1018ef4: addiu a1, s0, 30284
+// 0x01018f04: 0x1018f04: addiu a1, s0, 30284
 	ldloc 12
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018ef8: 0x1018ef8: jal   0x100449c addiu a2, zero, 1026
+// 0x01018f08: 0x1018f08: jal   0x100449c addiu a2, zero, 1026
 	ldc.i4 1026
 	stloc.3
 	ldloc.0
@@ -951,62 +951,62 @@ L_1018eec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018f00: 0x1018f00: beq   s4, zero, 0x101907c sw    zero, -28412(s3)
+// 0x01018f10: 0x1018f10: beq   s4, zero, 0x101908c sw    zero, -27948(s3)
 	ldloc 8
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7103
+	ldc.i4 -6987
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_101907c
+	brfalse L_101908c
 // --- basic block ---
-// 0x01018f08: 0x1018f08: addiu s4, s4, -1
+// 0x01018f18: 0x1018f18: addiu s4, s4, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01018f0c: 0x1018f0c: andi  s4, s4, 1
+// 0x01018f1c: 0x1018f1c: andi  s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	and
 	stloc 8
-// 0x01018f10: 0x1018f10: bne   s4, zero, 0x1018fdc addiu s4, sp, 28
+// 0x01018f20: 0x1018f20: bne   s4, zero, 0x1018fec addiu s4, sp, 28
 	ldloc 8
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 8
-	brtrue L_1018fdc
+	brtrue L_1018fec
 // --- basic block ---
-// 0x01018f18: 0x1018f18: addiu s3, sp, 24
+// 0x01018f28: 0x1018f28: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01018f1c: 0x1018f1c: lui   s5, 0x0
+// 0x01018f2c: 0x1018f2c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x01018f20: 0x1018f20: addu  a0, s6, zero
+// 0x01018f30: 0x1018f30: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x01018f24: 0x1018f24: addu  a1, s4, zero
+// 0x01018f34: 0x1018f34: addu  a1, s4, zero
 	ldloc 8
 	stloc.2
-// 0x01018f28: 0x1018f28: addiu v0, zero, 128
+// 0x01018f38: 0x1018f38: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x01018f2c: 0x1018f2c: addu  a2, s3, zero
+// 0x01018f3c: 0x1018f3c: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01018f30: 0x1018f30: addiu a3, s5, 28076
+// 0x01018f40: 0x1018f40: addiu a3, s5, 28076
 	ldloc 14
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01018f34: 0x1018f34: sw    v0, 24(sp)
+// 0x01018f44: 0x1018f44: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1015,7 +1015,7 @@ L_1018eec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01018f38: 0x1018f38: jal   0x1068250 sw    s2, 16(sp)
+// 0x01018f48: 0x1018f48: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1029,23 +1029,23 @@ L_1018eec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018f40: 0x1018f40: lui   a1, 0x10000
+// 0x01018f50: 0x1018f50: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01018f44: 0x1018f44: addu  a0, s4, zero
+// 0x01018f54: 0x1018f54: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x01018f48: 0x1018f48: addiu a1, a1, -31760
+// 0x01018f58: 0x1018f58: addiu a1, a1, -31760
 	ldloc.2
 	ldc.i4 -31760
 	add
 	stloc.2
-// 0x01018f4c: 0x1018f4c: jal   0x1001b14 addu  s6, v0, zero
+// 0x01018f5c: 0x1018f5c: jal   0x1001b14 addu  s6, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
@@ -1053,32 +1053,32 @@ L_1018eec:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01018f54: 0x1018f54: beq   v0, zero, 0x1018f78 addiu v0, zero, 400
+// 0x01018f64: 0x1018f64: beq   v0, zero, 0x1018f88 addiu v0, zero, 400
 	ldloc 5
 	ldc.i4 400
 	stloc 5
-	brfalse L_1018f78
+	brfalse L_1018f88
 // --- basic block ---
-// 0x01018f5c: 0x1018f5c: lui   a3, 0x10000
+// 0x01018f6c: 0x1018f6c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01018f60: 0x1018f60: addiu a1, s0, 30284
+// 0x01018f70: 0x1018f70: addiu a1, s0, 30284
 	ldloc 12
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018f64: 0x1018f64: addiu a3, a3, -31744
+// 0x01018f74: 0x1018f74: addiu a3, a3, -31744
 	ldloc 4
 	ldc.i4 -31744
 	add
 	stloc 4
-// 0x01018f68: 0x1018f68: addiu a0, zero, 4
+// 0x01018f78: 0x1018f78: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01018f6c: 0x1018f6c: addiu a2, zero, 710
+// 0x01018f7c: 0x1018f7c: addiu a2, zero, 710
 	ldc.i4 710
 	stloc.3
-// 0x01018f70: 0x1018f70: j	 0x1018fd4 sw    s4, 16(sp)
+// 0x01018f80: 0x1018f80: j	 0x1018fe4 sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1087,29 +1087,29 @@ L_1018eec:
 	add
 	ldloc 8
 	stelem.i4
-	br L_1018fd4
+	br L_1018fe4
 // --- basic block ---
-L_1018f78:
-// 0x01018f78: 0x1018f78: lui   a1, 0x30000
+L_1018f88:
+// 0x01018f88: 0x1018f88: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01018f7c: 0x1018f7c: addu  a0, s6, zero
+// 0x01018f8c: 0x1018f8c: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x01018f80: 0x1018f80: addiu a1, a1, 25804
+// 0x01018f90: 0x1018f90: addiu a1, a1, 26268
 	ldloc.2
-	ldc.i4 25804
+	ldc.i4 26268
 	add
 	stloc.2
-// 0x01018f84: 0x1018f84: addiu a3, s5, 28076
+// 0x01018f94: 0x1018f94: addiu a3, s5, 28076
 	ldloc 14
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x01018f88: 0x1018f88: addu  a2, s3, zero
+// 0x01018f98: 0x1018f98: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01018f8c: 0x1018f8c: sw    v0, 24(sp)
+// 0x01018f9c: 0x1018f9c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1118,7 +1118,7 @@ L_1018f78:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01018f90: 0x1018f90: jal   0x1068250 sw    s2, 16(sp)
+// 0x01018fa0: 0x1018fa0: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1132,58 +1132,58 @@ L_1018f78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01018f98: 0x1018f98: beq   v0, zero, 0x1018fb0 sll   zero, zero, 0
+// 0x01018fa8: 0x1018fa8: beq   v0, zero, 0x1018fc0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1018fb0
+	brfalse L_1018fc0
 // --- basic block ---
-// 0x01018fa0: 0x1018fa0: lb    v1, 0(v0)
+// 0x01018fb0: 0x1018fb0: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01018fa4: 0x1018fa4: sll   zero, zero, 0
-// 0x01018fa8: 0x1018fa8: bne   v1, zero, 0x1018fec lui   a1, 0x30000
+// 0x01018fb4: 0x1018fb4: sll   zero, zero, 0
+// 0x01018fb8: 0x1018fb8: bne   v1, zero, 0x1018ffc lui   a1, 0x30000
 	ldloc 7
 	ldc.i4 196608
 	stloc.2
-	brtrue L_1018fec
+	brtrue L_1018ffc
 // --- basic block ---
-L_1018fb0:
-// 0x01018fb0: 0x1018fb0: lui   v0, 0x30000
+L_1018fc0:
+// 0x01018fc0: 0x1018fc0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01018fb4: 0x1018fb4: lui   a1, 0x0
+// 0x01018fc4: 0x1018fc4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01018fb8: 0x1018fb8: lui   a3, 0x10000
+// 0x01018fc8: 0x1018fc8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01018fbc: 0x1018fbc: addiu v0, v0, 25804
+// 0x01018fcc: 0x1018fcc: addiu v0, v0, 26268
 	ldloc 5
-	ldc.i4 25804
+	ldc.i4 26268
 	add
 	stloc 5
-// 0x01018fc0: 0x1018fc0: addiu a1, a1, 30284
+// 0x01018fd0: 0x1018fd0: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x01018fc4: 0x1018fc4: addiu a3, a3, -31652
+// 0x01018fd4: 0x1018fd4: addiu a3, a3, -31652
 	ldloc 4
 	ldc.i4 -31652
 	add
 	stloc 4
-// 0x01018fc8: 0x1018fc8: addiu a0, zero, 4
+// 0x01018fd8: 0x1018fd8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01018fcc: 0x1018fcc: addiu a2, zero, 726
+// 0x01018fdc: 0x1018fdc: addiu a2, zero, 726
 	ldc.i4 726
 	stloc.3
-// 0x01018fd0: 0x1018fd0: sw    v0, 16(sp)
+// 0x01018fe0: 0x1018fe0: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1192,8 +1192,8 @@ L_1018fb0:
 	add
 	ldloc 5
 	stelem.i4
-L_1018fd4:
-// 0x01018fd4: 0x1018fd4: jal   0x100449c sll   zero, zero, 0
+L_1018fe4:
+// 0x01018fe4: 0x1018fe4: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1204,46 +1204,46 @@ L_1018fd4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1018fdc:
-// 0x01018fdc: 0x1018fdc: addiu v0, zero, 18
+L_1018fec:
+// 0x01018fec: 0x1018fec: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01018fe0: 0x1018fe0: sw    v0, 0(s1)
+// 0x01018ff0: 0x1018ff0: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01018fe4: 0x1018fe4: j	 0x101907c addu  s6, zero, zero
+// 0x01018ff4: 0x1018ff4: j	 0x101908c addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_101907c
+	br L_101908c
 // --- basic block ---
-L_1018fec:
-// 0x01018fec: 0x1018fec: lui   a3, 0x0
+L_1018ffc:
+// 0x01018ffc: 0x1018ffc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01018ff0: 0x1018ff0: addu  a0, v0, zero
+// 0x01019000: 0x1019000: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01018ff4: 0x1018ff4: addiu a1, a1, 26205
+// 0x01019004: 0x1019004: addiu a1, a1, 26669
 	ldloc.2
-	ldc.i4 26205
+	ldc.i4 26669
 	add
 	stloc.2
-// 0x01018ff8: 0x1018ff8: addiu v0, zero, 10
+// 0x01019008: 0x1019008: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x01018ffc: 0x1018ffc: addu  a2, s3, zero
+// 0x0101900c: 0x101900c: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01019000: 0x1019000: addiu a3, a3, 30268
+// 0x01019010: 0x1019010: addiu a3, a3, 30268
 	ldloc 4
 	ldc.i4 30268
 	add
 	stloc 4
-// 0x01019004: 0x1019004: sw    v0, 24(sp)
+// 0x01019014: 0x1019014: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1252,7 +1252,7 @@ L_1018fec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01019008: 0x1019008: jal   0x1068250 sw    s2, 16(sp)
+// 0x01019018: 0x1019018: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1266,48 +1266,48 @@ L_1018fec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019010: 0x1019010: bne   v0, zero, 0x101904c addu  s6, v0, zero
+// 0x01019020: 0x1019020: bne   v0, zero, 0x101905c addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brtrue L_101904c
+	brtrue L_101905c
 // --- basic block ---
-// 0x01019018: 0x1019018: lui   a1, 0x0
+// 0x01019028: 0x1019028: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101901c: 0x101901c: lui   a3, 0x10000
+// 0x0101902c: 0x101902c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01019020: 0x1019020: lui   v0, 0x30000
+// 0x01019030: 0x1019030: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01019024: 0x1019024: addiu v0, v0, 26205
+// 0x01019034: 0x1019034: addiu v0, v0, 26669
 	ldloc 5
-	ldc.i4 26205
+	ldc.i4 26669
 	add
 	stloc 5
-// 0x01019028: 0x1019028: addiu a1, a1, 30284
+// 0x01019038: 0x1019038: addiu a1, a1, 30284
 	ldloc.2
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x0101902c: 0x101902c: addiu a3, a3, -31580
+// 0x0101903c: 0x101903c: addiu a3, a3, -31580
 	ldloc 4
 	ldc.i4 -31580
 	add
 	stloc 4
-// 0x01019030: 0x1019030: addiu a0, zero, 4
+// 0x01019040: 0x1019040: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01019034: 0x1019034: addiu a2, zero, 742
+// 0x01019044: 0x1019044: addiu a2, zero, 742
 	ldc.i4 742
 	stloc.3
-// 0x01019038: 0x1019038: jal   0x100449c sw    v0, 16(sp)
+// 0x01019048: 0x1019048: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1326,28 +1326,28 @@ L_1018fec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019040: 0x1019040: addiu v0, zero, 18
+// 0x01019050: 0x1019050: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01019044: 0x1019044: j	 0x101907c sw    v0, 0(s1)
+// 0x01019054: 0x1019054: j	 0x101908c sw    v0, 0(s1)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_101907c
+	br L_101908c
 // --- basic block ---
-L_101904c:
-// 0x0101904c: 0x101904c: lui   a1, 0x1010000
+L_101905c:
+// 0x0101905c: 0x101905c: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x01019050: 0x1019050: addiu a1, a1, 32672
+// 0x01019060: 0x1019060: addiu a1, a1, 32688
 	ldloc.2
-	ldc.i4 32672
+	ldc.i4 32688
 	add
 	stloc.2
-// 0x01019054: 0x1019054: jal   0x104fe98 addiu a0, zero, 100
+// 0x01019064: 0x1019064: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -1355,32 +1355,32 @@ L_101904c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101905c: 0x101905c: j	 0x101907c sll   zero, zero, 0
-	br L_101907c
+// 0x0101906c: 0x101906c: j	 0x101908c sll   zero, zero, 0
+	br L_101908c
 // --- basic block ---
-L_1019064:
-// 0x01019064: 0x1019064: lui   a3, 0x10000
+L_1019074:
+// 0x01019074: 0x1019074: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01019068: 0x1019068: addiu a1, s0, 30284
+// 0x01019078: 0x1019078: addiu a1, s0, 30284
 	ldloc 12
 	ldc.i4 30284
 	add
 	stloc.2
-// 0x0101906c: 0x101906c: addiu a3, a3, -31508
+// 0x0101907c: 0x101907c: addiu a3, a3, -31508
 	ldloc 4
 	ldc.i4 -31508
 	add
 	stloc 4
-// 0x01019070: 0x1019070: addiu a0, zero, 1
+// 0x01019080: 0x1019080: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01019074: 0x1019074: jal   0x100449c addiu a2, zero, 1031
+// 0x01019084: 0x1019084: jal   0x100449c addiu a2, zero, 1031
 	ldc.i4 1031
 	stloc.3
 	ldloc.0
@@ -1393,12 +1393,12 @@ L_1019064:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101907c:
-// 0x0101907c: 0x101907c: lw    ra, 188(sp)
-// 0x01019080: 0x1019080: addu  v0, s6, zero
+L_101908c:
+// 0x0101908c: 0x101908c: lw    ra, 188(sp)
+// 0x01019090: 0x1019090: addu  v0, s6, zero
 	ldloc 11
 	stloc 5
-// 0x01019084: 0x1019084: lw    s6, 184(sp)
+// 0x01019094: 0x1019094: lw    s6, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1407,7 +1407,7 @@ L_101907c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01019088: 0x1019088: lw    s5, 180(sp)
+// 0x01019098: 0x1019098: lw    s5, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1416,7 +1416,7 @@ L_101907c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101908c: 0x101908c: lw    s4, 176(sp)
+// 0x0101909c: 0x101909c: lw    s4, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1425,7 +1425,7 @@ L_101907c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01019090: 0x1019090: lw    s3, 172(sp)
+// 0x010190a0: 0x10190a0: lw    s3, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1434,7 +1434,7 @@ L_101907c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01019094: 0x1019094: lw    s2, 168(sp)
+// 0x010190a4: 0x10190a4: lw    s2, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1443,7 +1443,7 @@ L_101907c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01019098: 0x1019098: lw    s1, 164(sp)
+// 0x010190a8: 0x10190a8: lw    s1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1452,7 +1452,7 @@ L_101907c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101909c: 0x101909c: lw    s0, 160(sp)
+// 0x010190ac: 0x10190ac: lw    s0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1461,7 +1461,7 @@ L_101907c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010190a0: 0x10190a0: jr    ra addiu sp, sp, 192
+// 0x010190b0: 0x10190b0: jr    ra addiu sp, sp, 192
 	ldloc.0
 	ldc.i4 192
 	add
@@ -1473,7 +1473,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_initialize_10190a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_initialize_10190b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32 v1,int32 s1,int32[] mem,int32 s2,int32 ra)
@@ -1517,12 +1517,12 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010190a8: 0x10190a8: addiu sp, sp, -32
+// 0x010190b8: 0x10190b8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010190ac: 0x10190ac: sw    s1, 20(sp)
+// 0x010190bc: 0x10190bc: sw    s1, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -1531,35 +1531,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010190b0: 0x10190b0: lui   a1, 0x0
+// 0x010190c0: 0x10190c0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010190b4: 0x10190b4: lui   s1, 0x10000
+// 0x010190c4: 0x10190c4: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010190b8: 0x10190b8: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x010190c8: 0x10190c8: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x010190bc: 0x10190bc: addiu a0, s1, 12560
+// 0x010190cc: 0x10190cc: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010190c0: 0x10190c0: addiu a1, a1, 4640
+// 0x010190d0: 0x10190d0: addiu a1, a1, 4640
 	ldloc.2
 	ldc.i4 4640
 	add
 	stloc.2
-// 0x010190c4: 0x10190c4: addiu a2, a2, -6904
+// 0x010190d4: 0x10190d4: addiu a2, a2, 19584
 	ldloc.3
-	ldc.i4 -6904
+	ldc.i4 19584
 	add
 	stloc.3
-// 0x010190c8: 0x10190c8: addu  a3, zero, zero
+// 0x010190d8: 0x10190d8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010190cc: 0x10190cc: sw    ra, 28(sp)
-// 0x010190d0: 0x10190d0: sw    s2, 24(sp)
+// 0x010190dc: 0x10190dc: sw    ra, 28(sp)
+// 0x010190e0: 0x10190e0: sw    s2, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -1568,7 +1568,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010190d4: 0x10190d4: jal   0x100edb0 sw    s0, 16(sp)
+// 0x010190e4: 0x10190e4: jal   0x100edc0 sw    s0, 16(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -1582,33 +1582,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010190dc: 0x10190dc: lui   a1, 0x0
+// 0x010190ec: 0x10190ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010190e0: 0x10190e0: lui   a2, 0x10000
+// 0x010190f0: 0x10190f0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010190e4: 0x10190e4: addiu a0, s1, 12560
+// 0x010190f4: 0x10190f4: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010190e8: 0x10190e8: addiu a1, a1, 4656
+// 0x010190f8: 0x10190f8: addiu a1, a1, 4656
 	ldloc.2
 	ldc.i4 4656
 	add
 	stloc.2
-// 0x010190ec: 0x10190ec: addiu a2, a2, -31404
+// 0x010190fc: 0x10190fc: addiu a2, a2, -31404
 	ldloc.3
 	ldc.i4 -31404
 	add
 	stloc.3
-// 0x010190f0: 0x10190f0: jal   0x100edb0 addu  a3, zero, zero
+// 0x01019100: 0x1019100: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1616,33 +1616,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010190f8: 0x10190f8: lui   a1, 0x0
+// 0x01019108: 0x1019108: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010190fc: 0x10190fc: lui   a2, 0x10000
+// 0x0101910c: 0x101910c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01019100: 0x1019100: addiu a0, s1, 12560
+// 0x01019110: 0x1019110: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01019104: 0x1019104: addiu a1, a1, 4672
+// 0x01019114: 0x1019114: addiu a1, a1, 4672
 	ldloc.2
 	ldc.i4 4672
 	add
 	stloc.2
-// 0x01019108: 0x1019108: addiu a2, a2, -31392
+// 0x01019118: 0x1019118: addiu a2, a2, -31392
 	ldloc.3
 	ldc.i4 -31392
 	add
 	stloc.3
-// 0x0101910c: 0x101910c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101911c: 0x101911c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1650,36 +1650,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019114: 0x1019114: lui   a1, 0x0
+// 0x01019124: 0x1019124: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01019118: 0x1019118: lui   a2, 0x10000
+// 0x01019128: 0x1019128: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101911c: 0x101911c: addiu a0, s1, 12560
+// 0x0101912c: 0x101912c: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01019120: 0x1019120: addiu a1, a1, 4688
+// 0x01019130: 0x1019130: addiu a1, a1, 4688
 	ldloc.2
 	ldc.i4 4688
 	add
 	stloc.2
-// 0x01019124: 0x1019124: addiu a2, a2, -31388
+// 0x01019134: 0x1019134: addiu a2, a2, -31388
 	ldloc.3
 	ldc.i4 -31388
 	add
 	stloc.3
-// 0x01019128: 0x1019128: addu  a3, zero, zero
+// 0x01019138: 0x1019138: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101912c: 0x101912c: jal   0x100edb0 lui   s0, 0x0
+// 0x0101913c: 0x101913c: jal   0x100edc0 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
 	ldloc.0
@@ -1687,33 +1687,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019134: 0x1019134: lui   a1, 0x0
+// 0x01019144: 0x1019144: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01019138: 0x1019138: lui   a2, 0x10000
+// 0x01019148: 0x1019148: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101913c: 0x101913c: addiu a0, s0, 26236
+// 0x0101914c: 0x101914c: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01019140: 0x1019140: addiu a1, a1, 4704
+// 0x01019150: 0x1019150: addiu a1, a1, 4704
 	ldloc.2
 	ldc.i4 4704
 	add
 	stloc.2
-// 0x01019144: 0x1019144: addiu a2, a2, -31376
+// 0x01019154: 0x1019154: addiu a2, a2, -31376
 	ldloc.3
 	ldc.i4 -31376
 	add
 	stloc.3
-// 0x01019148: 0x1019148: jal   0x100edb0 addu  a3, zero, zero
+// 0x01019158: 0x1019158: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1721,33 +1721,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019150: 0x1019150: lui   s2, 0x0
+// 0x01019160: 0x1019160: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01019154: 0x1019154: lui   a1, 0x0
+// 0x01019164: 0x1019164: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01019158: 0x1019158: addiu a0, s0, 26236
+// 0x01019168: 0x1019168: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x0101915c: 0x101915c: addiu a2, s2, 31980
+// 0x0101916c: 0x101916c: addiu a2, s2, 31980
 	ldloc 10
 	ldc.i4 31980
 	add
 	stloc.3
-// 0x01019160: 0x1019160: addiu a1, a1, 4720
+// 0x01019170: 0x1019170: addiu a1, a1, 4720
 	ldloc.2
 	ldc.i4 4720
 	add
 	stloc.2
-// 0x01019164: 0x1019164: jal   0x100edb0 addu  a3, zero, zero
+// 0x01019174: 0x1019174: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1755,30 +1755,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101916c: 0x101916c: lui   a1, 0x0
+// 0x0101917c: 0x101917c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01019170: 0x1019170: addiu a2, s2, 31980
+// 0x01019180: 0x1019180: addiu a2, s2, 31980
 	ldloc 10
 	ldc.i4 31980
 	add
 	stloc.3
-// 0x01019174: 0x1019174: addiu a0, s0, 26236
+// 0x01019184: 0x1019184: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01019178: 0x1019178: addiu a1, a1, 4736
+// 0x01019188: 0x1019188: addiu a1, a1, 4736
 	ldloc.2
 	ldc.i4 4736
 	add
 	stloc.2
-// 0x0101917c: 0x101917c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101918c: 0x101918c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1786,33 +1786,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019184: 0x1019184: lui   s2, 0x10000
+// 0x01019194: 0x1019194: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01019188: 0x1019188: lui   a1, 0x0
+// 0x01019198: 0x1019198: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101918c: 0x101918c: addiu a0, s0, 26236
+// 0x0101919c: 0x101919c: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01019190: 0x1019190: addiu a1, a1, 4752
+// 0x010191a0: 0x10191a0: addiu a1, a1, 4752
 	ldloc.2
 	ldc.i4 4752
 	add
 	stloc.2
-// 0x01019194: 0x1019194: addiu a2, s2, -31368
+// 0x010191a4: 0x10191a4: addiu a2, s2, -31368
 	ldloc 10
 	ldc.i4 -31368
 	add
 	stloc.3
-// 0x01019198: 0x1019198: jal   0x100edb0 addu  a3, zero, zero
+// 0x010191a8: 0x10191a8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1820,33 +1820,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010191a0: 0x10191a0: lui   a1, 0x0
+// 0x010191b0: 0x10191b0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010191a4: 0x10191a4: lui   a2, 0x10000
+// 0x010191b4: 0x10191b4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010191a8: 0x10191a8: addiu a0, s0, 26236
+// 0x010191b8: 0x10191b8: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010191ac: 0x10191ac: addiu a1, a1, 4768
+// 0x010191bc: 0x10191bc: addiu a1, a1, 4768
 	ldloc.2
 	ldc.i4 4768
 	add
 	stloc.2
-// 0x010191b0: 0x10191b0: addiu a2, a2, -31360
+// 0x010191c0: 0x10191c0: addiu a2, a2, -31360
 	ldloc.3
 	ldc.i4 -31360
 	add
 	stloc.3
-// 0x010191b4: 0x10191b4: jal   0x100edb0 addu  a3, zero, zero
+// 0x010191c4: 0x10191c4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1854,33 +1854,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010191bc: 0x10191bc: lui   a1, 0x0
+// 0x010191cc: 0x10191cc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010191c0: 0x10191c0: addiu a0, s0, 26236
+// 0x010191d0: 0x10191d0: addiu a0, s0, 26236
 	ldloc 5
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010191c4: 0x10191c4: addiu a1, a1, 4784
+// 0x010191d4: 0x10191d4: addiu a1, a1, 4784
 	ldloc.2
 	ldc.i4 4784
 	add
 	stloc.2
-// 0x010191c8: 0x10191c8: addiu a2, s2, -31368
+// 0x010191d8: 0x10191d8: addiu a2, s2, -31368
 	ldloc 10
 	ldc.i4 -31368
 	add
 	stloc.3
-// 0x010191cc: 0x10191cc: addu  a3, zero, zero
+// 0x010191dc: 0x10191dc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010191d0: 0x10191d0: jal   0x100edb0 lui   s0, 0x0
+// 0x010191e0: 0x10191e0: jal   0x100edc0 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
 	ldloc.0
@@ -1888,25 +1888,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010191d8: 0x10191d8: addiu s0, s0, 2480
+// 0x010191e8: 0x10191e8: addiu s0, s0, 2480
 	ldloc 5
 	ldc.i4 2480
 	add
 	stloc 5
-// 0x010191dc: 0x10191dc: j	 0x1019228 addiu s1, s1, 12560
+// 0x010191ec: 0x10191ec: j	 0x1019238 addiu s1, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc 8
-	br L_1019228
+	br L_1019238
 // --- basic block ---
-L_10191e4:
-// 0x010191e4: 0x10191e4: lw    v0, 140(s0)
+L_10191f4:
+// 0x010191f4: 0x10191f4: lw    v0, 140(s0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
@@ -1915,26 +1915,26 @@ L_10191e4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010191e8: 0x10191e8: sll   zero, zero, 0
-// 0x010191ec: 0x10191ec: beq   v0, zero, 0x10191fc addu  a2, v0, zero
+// 0x010191f8: 0x10191f8: sll   zero, zero, 0
+// 0x010191fc: 0x10191fc: beq   v0, zero, 0x101920c addu  a2, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.3
-	brfalse L_10191fc
+	brfalse L_101920c
 // --- basic block ---
-// 0x010191f4: 0x10191f4: jal   0x100edb0 sll   zero, zero, 0
+// 0x01019204: 0x1019204: jal   0x100edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10191fc:
-// 0x010191fc: 0x10191fc: lw    a2, 144(s0)
+L_101920c:
+// 0x0101920c: 0x101920c: lw    a2, 144(s0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
@@ -1943,15 +1943,15 @@ L_10191fc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01019200: 0x1019200: addiu a1, s0, 104
+// 0x01019210: 0x1019210: addiu a1, s0, 104
 	ldloc 5
 	ldc.i4.s 104
 	add
 	stloc.2
-// 0x01019204: 0x1019204: addu  a3, zero, zero
+// 0x01019214: 0x1019214: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01019208: 0x1019208: jal   0x100edb0 addu  a0, s1, zero
+// 0x01019218: 0x1019218: jal   0x100edc0 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1959,12 +1959,12 @@ L_10191fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019210: 0x1019210: lw    a2, 148(s0)
+// 0x01019220: 0x1019220: lw    a2, 148(s0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
@@ -1973,15 +1973,15 @@ L_10191fc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01019214: 0x1019214: addiu a1, s0, 120
+// 0x01019224: 0x1019224: addiu a1, s0, 120
 	ldloc 5
 	ldc.i4.s 120
 	add
 	stloc.2
-// 0x01019218: 0x1019218: addu  a0, s1, zero
+// 0x01019228: 0x1019228: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0101921c: 0x101921c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101922c: 0x101922c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1989,18 +1989,18 @@ L_10191fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019224: 0x1019224: addiu s0, s0, 180
+// 0x01019234: 0x1019234: addiu s0, s0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-L_1019228:
-// 0x01019228: 0x1019228: lw    v0, 4(s0)
+L_1019238:
+// 0x01019238: 0x1019238: lw    v0, 4(s0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
@@ -2009,38 +2009,38 @@ L_1019228:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101922c: 0x101922c: addiu a1, s0, 88
+// 0x0101923c: 0x101923c: addiu a1, s0, 88
 	ldloc 5
 	ldc.i4.s 88
 	add
 	stloc.2
-// 0x01019230: 0x1019230: addu  a0, s1, zero
+// 0x01019240: 0x1019240: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01019234: 0x1019234: bne   v0, zero, 0x10191e4 addu  a3, zero, zero
+// 0x01019244: 0x1019244: bne   v0, zero, 0x10191f4 addu  a3, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_10191e4
+	brtrue L_10191f4
 // --- basic block ---
-// 0x0101923c: 0x101923c: lui   a0, 0x1020000
+// 0x0101924c: 0x101924c: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01019240: 0x1019240: jal   0x1014064 addiu a0, a0, -27804
+// 0x01019250: 0x1019250: jal   0x1014074 addiu a0, a0, -27788
 	ldloc.1
-	ldc.i4 -27804
+	ldc.i4 -27788
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019248: 0x1019248: lw    ra, 28(sp)
-// 0x0101924c: 0x101924c: lw    s2, 24(sp)
+// 0x01019258: 0x1019258: lw    ra, 28(sp)
+// 0x0101925c: 0x101925c: lw    s2, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -2049,7 +2049,7 @@ L_1019228:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01019250: 0x1019250: lw    s1, 20(sp)
+// 0x01019260: 0x1019260: lw    s1, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -2058,7 +2058,7 @@ L_1019228:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01019254: 0x1019254: lw    s0, 16(sp)
+// 0x01019264: 0x1019264: lw    s0, 16(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -2067,7 +2067,7 @@ L_1019228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019258: 0x1019258: jr    ra addiu sp, sp, 32
+// 0x01019268: 0x1019268: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2079,7 +2079,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s4,int32 s0,int32 s3,int32 s1,int32 ra)
@@ -2129,12 +2129,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019260: 0x1019260: addiu sp, sp, -312
+// 0x01019270: 0x1019270: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x01019264: 0x1019264: sw    s1, 292(sp)
+// 0x01019274: 0x1019274: sw    s1, 292(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2143,7 +2143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01019268: 0x1019268: sw    s0, 288(sp)
+// 0x01019278: 0x1019278: sw    s0, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2152,11 +2152,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101926c: 0x101926c: sw    ra, 308(sp)
-// 0x01019270: 0x1019270: addu  s0, a0, zero
+// 0x0101927c: 0x101927c: sw    ra, 308(sp)
+// 0x01019280: 0x1019280: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01019274: 0x1019274: sw    s4, 304(sp)
+// 0x01019284: 0x1019284: sw    s4, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2165,7 +2165,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01019278: 0x1019278: sw    s3, 300(sp)
+// 0x01019288: 0x1019288: sw    s3, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2174,7 +2174,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101927c: 0x101927c: jal   0x100e348 sw    s2, 296(sp)
+// 0x0101928c: 0x101928c: jal   0x100e358 sw    s2, 296(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2188,23 +2188,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019284: 0x1019284: lui   a1, 0x0
+// 0x01019294: 0x1019294: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01019288: 0x1019288: addu  a0, v0, zero
+// 0x01019298: 0x1019298: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0101928c: 0x101928c: addiu a1, a1, 31980
+// 0x0101929c: 0x101929c: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01019290: 0x1019290: jal   0x1001c08 addu  s1, v0, zero
+// 0x010192a0: 0x10192a0: jal   0x1001c08 addu  s1, v0, zero
 	ldloc 6
 	stloc 12
 	ldloc.0
@@ -2217,20 +2217,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019298: 0x1019298: beq   v0, zero, 0x1019340 lui   v0, 0x30000
+// 0x010192a8: 0x10192a8: beq   v0, zero, 0x1019350 lui   v0, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc 6
-	brfalse L_1019340
+	brfalse L_1019350
 // --- basic block ---
-// 0x010192a0: 0x10192a0: lw    s3, 0(s0)
+// 0x010192b0: 0x10192b0: lw    s3, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x010192a4: 0x10192a4: jal   0x1001b48 addu  a0, s3, zero
+// 0x010192b4: 0x10192b4: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -2239,7 +2239,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010192ac: 0x10192ac: lw    s2, 4(s0)
+// 0x010192bc: 0x10192bc: lw    s2, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2248,10 +2248,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010192b0: 0x10192b0: addu  s4, v0, zero
+// 0x010192c0: 0x10192c0: addu  s4, v0, zero
 	ldloc 6
 	stloc 9
-// 0x010192b4: 0x10192b4: jal   0x1001b48 addu  a0, s2, zero
+// 0x010192c4: 0x10192c4: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2260,47 +2260,47 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010192bc: 0x10192bc: addu  s4, s4, v0
+// 0x010192cc: 0x10192cc: addu  s4, s4, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x010192c0: 0x10192c0: addiu s4, s4, 2
+// 0x010192d0: 0x10192d0: addiu s4, s4, 2
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 9
-// 0x010192c4: 0x10192c4: sltiu s4, s4, 257
+// 0x010192d4: 0x10192d4: sltiu s4, s4, 257
 	ldloc 9
 	ldc.i4 257
 	clt.un
 	stloc 9
-// 0x010192c8: 0x10192c8: bne   s4, zero, 0x10192f0 lui   a3, 0x10000
+// 0x010192d8: 0x10192d8: bne   s4, zero, 0x1019300 lui   a3, 0x10000
 	ldloc 9
 	ldc.i4 65536
 	stloc 4
-	brtrue L_10192f0
+	brtrue L_1019300
 // --- basic block ---
-// 0x010192d0: 0x10192d0: lui   a1, 0x10000
+// 0x010192e0: 0x10192e0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010192d4: 0x10192d4: addiu a1, a1, -31352
+// 0x010192e4: 0x10192e4: addiu a1, a1, -31352
 	ldloc.2
 	ldc.i4 -31352
 	add
 	stloc.2
-// 0x010192d8: 0x10192d8: addiu a3, a3, -31324
+// 0x010192e8: 0x10192e8: addiu a3, a3, -31324
 	ldloc 4
 	ldc.i4 -31324
 	add
 	stloc 4
-// 0x010192dc: 0x10192dc: addiu a0, zero, 5
+// 0x010192ec: 0x10192ec: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010192e0: 0x10192e0: addiu a2, zero, 193
+// 0x010192f0: 0x10192f0: addiu a2, zero, 193
 	ldc.i4 193
 	stloc.3
-// 0x010192e4: 0x10192e4: sw    s3, 16(sp)
+// 0x010192f4: 0x10192f4: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2309,7 +2309,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010192e8: 0x10192e8: jal   0x100449c sw    s2, 20(sp)
+// 0x010192f8: 0x10192f8: jal   0x100449c sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2328,20 +2328,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10192f0:
-// 0x010192f0: 0x10192f0: addiu s2, sp, 24
+L_1019300:
+// 0x01019300: 0x1019300: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x010192f4: 0x10192f4: lw    a1, 0(s0)
+// 0x01019304: 0x1019304: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010192f8: 0x10192f8: jal   0x1001b68 addu  a0, s2, zero
+// 0x01019308: 0x1019308: jal   0x1001b68 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2351,13 +2351,13 @@ L_10192f0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019300: 0x1019300: lui   a1, 0x10000
+// 0x01019310: 0x1019310: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01019304: 0x1019304: addu  a0, s2, zero
+// 0x01019314: 0x1019314: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01019308: 0x1019308: jal   0x1001ac4 addiu a1, a1, -29244
+// 0x01019318: 0x1019318: jal   0x1001ac4 addiu a1, a1, -29244
 	ldloc.2
 	ldc.i4 -29244
 	add
@@ -2367,7 +2367,7 @@ L_10192f0:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01019310: 0x1019310: lw    a1, 4(s0)
+// 0x01019320: 0x1019320: lw    a1, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2376,7 +2376,7 @@ L_10192f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019314: 0x1019314: jal   0x1001ac4 addu  a0, s2, zero
+// 0x01019324: 0x1019324: jal   0x1001ac4 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2384,10 +2384,10 @@ L_10192f0:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101931c: 0x101931c: addu  a0, s2, zero
+// 0x0101932c: 0x101932c: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01019320: 0x1019320: jal   0x104ef00 addiu a1, zero, 1
+// 0x01019330: 0x1019330: jal   0x104ef10 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2395,15 +2395,15 @@ L_10192f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019328: 0x1019328: addu  a0, s1, zero
+// 0x01019338: 0x1019338: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x0101932c: 0x101932c: jal   0x104edb0 sw    v0, 280(sp)
+// 0x0101933c: 0x101933c: jal   0x104edc0 sw    v0, 280(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2417,12 +2417,12 @@ L_10192f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01019334: 0x1019334: lw    v0, 280(sp)
+// 0x01019344: 0x1019344: lw    v0, 280(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2431,22 +2431,22 @@ L_10192f0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01019338: 0x1019338: j	 0x1019344 sll   zero, zero, 0
-	br L_1019344
+// 0x01019348: 0x1019348: j	 0x1019354 sll   zero, zero, 0
+	br L_1019354
 // --- basic block ---
-L_1019340:
-// 0x01019340: 0x1019340: lw    v0, 26528(v0)
+L_1019350:
+// 0x01019350: 0x1019350: lw    v0, 26992(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6632
+	ldc.i4 6748
 	add
 	ldelem.i4
 	stloc 6
-L_1019344:
-// 0x01019344: 0x1019344: lw    ra, 308(sp)
-// 0x01019348: 0x1019348: lw    s4, 304(sp)
+L_1019354:
+// 0x01019354: 0x1019354: lw    ra, 308(sp)
+// 0x01019358: 0x1019358: lw    s4, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2455,7 +2455,7 @@ L_1019344:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101934c: 0x101934c: lw    s3, 300(sp)
+// 0x0101935c: 0x101935c: lw    s3, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2464,7 +2464,7 @@ L_1019344:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01019350: 0x1019350: lw    s2, 296(sp)
+// 0x01019360: 0x1019360: lw    s2, 296(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2473,7 +2473,7 @@ L_1019344:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01019354: 0x1019354: lw    s1, 292(sp)
+// 0x01019364: 0x1019364: lw    s1, 292(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2482,7 +2482,7 @@ L_1019344:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01019358: 0x1019358: lw    s0, 288(sp)
+// 0x01019368: 0x1019368: lw    s0, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2491,7 +2491,7 @@ L_1019344:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101935c: 0x101935c: jr    ra addiu sp, sp, 312
+// 0x0101936c: 0x101936c: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
@@ -2503,7 +2503,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_display_create_pens_1019364(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_create_pens_1019374(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 ra)
@@ -2541,25 +2541,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019364: 0x1019364: lui   v0, 0x30000
+// 0x01019374: 0x1019374: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01019368: 0x1019368: lw    v1, 26520(v0)
+// 0x01019378: 0x1019378: lw    v1, 26984(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6630
+	ldc.i4 6746
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101936c: 0x101936c: addiu sp, sp, -24
+// 0x0101937c: 0x101937c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01019370: 0x1019370: sw    ra, 20(sp)
-// 0x01019374: 0x1019374: bne   v1, zero, 0x1019460 sw    s0, 16(sp)
+// 0x01019380: 0x1019380: sw    ra, 20(sp)
+// 0x01019384: 0x1019384: bne   v1, zero, 0x1019470 sw    s0, 16(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -2569,28 +2569,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1019460
+	brtrue L_1019470
 // --- basic block ---
-// 0x0101937c: 0x101937c: lui   a0, 0x10000
+// 0x0101938c: 0x101938c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01019380: 0x1019380: addu  a1, zero, zero
+// 0x01019390: 0x1019390: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01019384: 0x1019384: addiu v1, zero, 1
+// 0x01019394: 0x1019394: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01019388: 0x1019388: addiu a0, a0, -31284
+// 0x01019398: 0x1019398: addiu a0, a0, -31284
 	ldloc.1
 	ldc.i4 -31284
 	add
 	stloc.1
-// 0x0101938c: 0x101938c: jal   0x104ef00 sw    v1, 26520(v0)
+// 0x0101939c: 0x101939c: jal   0x104ef10 sw    v1, 26984(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6630
+	ldc.i4 6746
 	add
 	ldloc 5
 	stelem.i4
@@ -2599,28 +2599,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01019394: 0x1019394: lui   a0, 0x0
+// 0x010193a4: 0x10193a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01019398: 0x1019398: lui   v1, 0x30000
+// 0x010193a8: 0x10193a8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101939c: 0x101939c: addiu a0, a0, 31980
+// 0x010193ac: 0x10193ac: addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
 	stloc.1
-// 0x010193a0: 0x10193a0: jal   0x104edb0 sw    v0, 26528(v1)
+// 0x010193b0: 0x10193b0: jal   0x104edc0 sw    v0, 26992(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6632
+	ldc.i4 6748
 	add
 	ldloc 6
 	stelem.i4
@@ -2629,15 +2629,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010193a8: 0x10193a8: lui   a0, 0x0
+// 0x010193b8: 0x10193b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010193ac: 0x10193ac: jal   0x1019260 addiu a0, a0, 4704
+// 0x010193bc: 0x10193bc: jal   0x1019270 addiu a0, a0, 4704
 	ldloc.1
 	ldc.i4 4704
 	add
@@ -2647,28 +2647,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010193b4: 0x10193b4: lui   a0, 0x0
+// 0x010193c4: 0x10193c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010193b8: 0x10193b8: lui   v1, 0x30000
+// 0x010193c8: 0x10193c8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010193bc: 0x10193bc: addiu a0, a0, 4720
+// 0x010193cc: 0x10193cc: addiu a0, a0, 4720
 	ldloc.1
 	ldc.i4 4720
 	add
 	stloc.1
-// 0x010193c0: 0x10193c0: jal   0x1019260 sw    v0, 26532(v1)
+// 0x010193d0: 0x10193d0: jal   0x1019270 sw    v0, 26996(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6633
+	ldc.i4 6749
 	add
 	ldloc 6
 	stelem.i4
@@ -2677,28 +2677,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010193c8: 0x10193c8: lui   a0, 0x0
+// 0x010193d8: 0x10193d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010193cc: 0x10193cc: lui   v1, 0x30000
+// 0x010193dc: 0x10193dc: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010193d0: 0x10193d0: addiu a0, a0, 4768
+// 0x010193e0: 0x10193e0: addiu a0, a0, 4768
 	ldloc.1
 	ldc.i4 4768
 	add
 	stloc.1
-// 0x010193d4: 0x10193d4: jal   0x1019260 sw    v0, 26536(v1)
+// 0x010193e4: 0x10193e4: jal   0x1019270 sw    v0, 27000(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6634
+	ldc.i4 6750
 	add
 	ldloc 6
 	stelem.i4
@@ -2707,28 +2707,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010193dc: 0x10193dc: lui   a0, 0x0
+// 0x010193ec: 0x10193ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010193e0: 0x10193e0: lui   v1, 0x30000
+// 0x010193f0: 0x10193f0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010193e4: 0x10193e4: addiu a0, a0, 4784
+// 0x010193f4: 0x10193f4: addiu a0, a0, 4784
 	ldloc.1
 	ldc.i4 4784
 	add
 	stloc.1
-// 0x010193e8: 0x10193e8: jal   0x1019260 sw    v0, 26540(v1)
+// 0x010193f8: 0x10193f8: jal   0x1019270 sw    v0, 27004(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6635
+	ldc.i4 6751
 	add
 	ldloc 6
 	stelem.i4
@@ -2737,28 +2737,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010193f0: 0x10193f0: lui   a0, 0x0
+// 0x01019400: 0x1019400: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010193f4: 0x10193f4: lui   v1, 0x30000
+// 0x01019404: 0x1019404: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010193f8: 0x10193f8: addiu a0, a0, 4736
+// 0x01019408: 0x1019408: addiu a0, a0, 4736
 	ldloc.1
 	ldc.i4 4736
 	add
 	stloc.1
-// 0x010193fc: 0x10193fc: jal   0x1019260 sw    v0, 26544(v1)
+// 0x0101940c: 0x101940c: jal   0x1019270 sw    v0, 27008(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6636
+	ldc.i4 6752
 	add
 	ldloc 6
 	stelem.i4
@@ -2767,32 +2767,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01019404: 0x1019404: lui   a0, 0x0
+// 0x01019414: 0x1019414: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01019408: 0x1019408: lui   v1, 0x30000
+// 0x01019418: 0x1019418: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101940c: 0x101940c: addiu a0, a0, 4752
+// 0x0101941c: 0x101941c: addiu a0, a0, 4752
 	ldloc.1
 	ldc.i4 4752
 	add
 	stloc.1
-// 0x01019410: 0x1019410: sw    v0, 26548(v1)
+// 0x01019420: 0x1019420: sw    v0, 27012(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6637
+	ldc.i4 6753
 	add
 	ldloc 6
 	stelem.i4
-// 0x01019414: 0x1019414: jal   0x1019260 lui   s0, 0x0
+// 0x01019424: 0x1019424: jal   0x1019270 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -2800,46 +2800,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0101941c: 0x101941c: lui   v1, 0x30000
+// 0x0101942c: 0x101942c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01019420: 0x1019420: sw    v0, 26552(v1)
+// 0x01019430: 0x1019430: sw    v0, 27016(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6638
+	ldc.i4 6754
 	add
 	ldloc 6
 	stelem.i4
-// 0x01019424: 0x1019424: j	 0x1019450 addiu s0, s0, 2480
+// 0x01019434: 0x1019434: j	 0x1019460 addiu s0, s0, 2480
 	ldloc 8
 	ldc.i4 2480
 	add
 	stloc 8
-	br L_1019450
+	br L_1019460
 // --- basic block ---
-L_101942c:
-// 0x0101942c: 0x101942c: jal   0x1019260 sll   zero, zero, 0
+L_101943c:
+// 0x0101943c: 0x101943c: jal   0x1019270 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01019434: 0x1019434: addiu a0, zero, 230
+// 0x01019444: 0x1019444: addiu a0, zero, 230
 	ldc.i4 230
 	stloc.1
-// 0x01019438: 0x1019438: jal   0x104e410 sw    v0, 60(s0)
+// 0x01019448: 0x1019448: jal   0x104e420 sw    v0, 60(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2853,12 +2853,12 @@ L_101942c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01019440: 0x1019440: jal   0x1019260 addiu a0, s0, 120
+// 0x01019450: 0x1019450: jal   0x1019270 addiu a0, s0, 120
 	ldloc 8
 	ldc.i4.s 120
 	add
@@ -2868,12 +2868,12 @@ L_101942c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_new_pen_1019260(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_new_pen_1019270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01019448: 0x1019448: sw    v0, 64(s0)
+// 0x01019458: 0x1019458: sw    v0, 64(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2882,13 +2882,13 @@ L_101942c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101944c: 0x101944c: addiu s0, s0, 180
+// 0x0101945c: 0x101945c: addiu s0, s0, 180
 	ldloc 8
 	ldc.i4 180
 	add
 	stloc 8
-L_1019450:
-// 0x01019450: 0x1019450: lw    v0, 4(s0)
+L_1019460:
+// 0x01019460: 0x1019460: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2897,18 +2897,18 @@ L_1019450:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01019454: 0x1019454: sll   zero, zero, 0
-// 0x01019458: 0x1019458: bne   v0, zero, 0x101942c addiu a0, s0, 104
+// 0x01019464: 0x1019464: sll   zero, zero, 0
+// 0x01019468: 0x1019468: bne   v0, zero, 0x101943c addiu a0, s0, 104
 	ldloc 6
 	ldloc 8
 	ldc.i4.s 104
 	add
 	stloc.1
-	brtrue L_101942c
+	brtrue L_101943c
 // --- basic block ---
-L_1019460:
-// 0x01019460: 0x1019460: lw    ra, 20(sp)
-// 0x01019464: 0x1019464: lw    s0, 16(sp)
+L_1019470:
+// 0x01019470: 0x1019470: lw    ra, 20(sp)
+// 0x01019474: 0x1019474: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2917,7 +2917,7 @@ L_1019460:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01019468: 0x1019468: jr    ra addiu sp, sp, 24
+// 0x01019478: 0x1019478: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2929,7 +2929,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_display_search_sign_1019470(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_search_sign_1019480(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s1,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -2970,12 +2970,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019470: 0x1019470: addiu sp, sp, -40
+// 0x01019480: 0x1019480: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01019474: 0x1019474: sw    s1, 32(sp)
+// 0x01019484: 0x1019484: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2984,10 +2984,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01019478: 0x1019478: lui   s1, 0x0
+// 0x01019488: 0x1019488: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101947c: 0x101947c: sw    s0, 28(sp)
+// 0x0101948c: 0x101948c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2996,35 +2996,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01019480: 0x1019480: sw    ra, 36(sp)
-// 0x01019484: 0x1019484: addu  s0, a0, zero
+// 0x01019490: 0x1019490: sw    ra, 36(sp)
+// 0x01019494: 0x1019494: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01019488: 0x1019488: j	 0x10194a4 addiu s1, s1, 2480
+// 0x01019498: 0x1019498: j	 0x10194b4 addiu s1, s1, 2480
 	ldloc 5
 	ldc.i4 2480
 	add
 	stloc 5
-	br L_10194a4
+	br L_10194b4
 // --- basic block ---
-L_1019490:
-// 0x01019490: 0x1019490: jal   0x1001b14 sll   zero, zero, 0
+L_10194a0:
+// 0x010194a0: 0x10194a0: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01019498: 0x1019498: beq   v0, zero, 0x10194d8 sll   zero, zero, 0
+// 0x010194a8: 0x10194a8: beq   v0, zero, 0x10194e8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10194d8
+	brfalse L_10194e8
 // --- basic block ---
-// 0x010194a0: 0x10194a0: addiu s1, s1, 180
+// 0x010194b0: 0x10194b0: addiu s1, s1, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-L_10194a4:
-// 0x010194a4: 0x10194a4: lw    v0, 4(s1)
+L_10194b4:
+// 0x010194b4: 0x10194b4: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3033,38 +3033,38 @@ L_10194a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010194a8: 0x10194a8: addu  a1, s0, zero
+// 0x010194b8: 0x10194b8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010194ac: 0x10194ac: bne   v0, zero, 0x1019490 addu  a0, v0, zero
+// 0x010194bc: 0x10194bc: bne   v0, zero, 0x10194a0 addu  a0, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_1019490
+	brtrue L_10194a0
 // --- basic block ---
-// 0x010194b4: 0x10194b4: lui   a1, 0x10000
+// 0x010194c4: 0x10194c4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010194b8: 0x10194b8: lui   a3, 0x10000
+// 0x010194c8: 0x10194c8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010194bc: 0x10194bc: addiu a1, a1, -31352
+// 0x010194cc: 0x10194cc: addiu a1, a1, -31352
 	ldloc.2
 	ldc.i4 -31352
 	add
 	stloc.2
-// 0x010194c0: 0x10194c0: addiu a3, a3, -31268
+// 0x010194d0: 0x10194d0: addiu a3, a3, -31268
 	ldloc 4
 	ldc.i4 -31268
 	add
 	stloc 4
-// 0x010194c4: 0x10194c4: addiu a0, zero, 4
+// 0x010194d4: 0x10194d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010194c8: 0x10194c8: addiu a2, zero, 401
+// 0x010194d8: 0x10194d8: addiu a2, zero, 401
 	ldc.i4 401
 	stloc.3
-// 0x010194cc: 0x10194cc: sw    s0, 16(sp)
+// 0x010194dc: 0x10194dc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3073,7 +3073,7 @@ L_10194a4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010194d0: 0x10194d0: jal   0x100449c addu  s1, zero, zero
+// 0x010194e0: 0x10194e0: jal   0x100449c addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 5
 	ldloc.0
@@ -3086,12 +3086,12 @@ L_10194a4:
 	stloc 10
 	stloc 7
 // --- basic block ---
-L_10194d8:
-// 0x010194d8: 0x10194d8: lw    ra, 36(sp)
-// 0x010194dc: 0x10194dc: addu  v0, s1, zero
+L_10194e8:
+// 0x010194e8: 0x10194e8: lw    ra, 36(sp)
+// 0x010194ec: 0x10194ec: addu  v0, s1, zero
 	ldloc 5
 	stloc 7
-// 0x010194e0: 0x10194e0: lw    s1, 32(sp)
+// 0x010194f0: 0x10194f0: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3100,7 +3100,7 @@ L_10194d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010194e4: 0x10194e4: lw    s0, 28(sp)
+// 0x010194f4: 0x10194f4: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3109,7 +3109,7 @@ L_10194d8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010194e8: 0x10194e8: jr    ra addiu sp, sp, 40
+// 0x010194f8: 0x10194f8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3121,7 +3121,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_display_get_id_10194f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_get_id_1019500(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3156,28 +3156,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010194f0: 0x10194f0: addiu sp, sp, -24
+// 0x01019500: 0x1019500: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010194f4: 0x10194f4: sw    ra, 20(sp)
-// 0x010194f8: 0x10194f8: jal   0x1019470 sll   zero, zero, 0
+// 0x01019504: 0x1019504: sw    ra, 20(sp)
+// 0x01019508: 0x1019508: jal   0x1019480 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_search_sign_1019470(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_search_sign_1019480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019500: 0x1019500: beq   v0, zero, 0x1019524 sll   zero, zero, 0
+// 0x01019510: 0x1019510: beq   v0, zero, 0x1019534 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1019524
+	brfalse L_1019534
 // --- basic block ---
-// 0x01019508: 0x1019508: lw    v1, 24(v0)
+// 0x01019518: 0x1019518: lw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3186,12 +3186,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101950c: 0x101950c: sll   zero, zero, 0
-// 0x01019510: 0x1019510: beq   v1, zero, 0x1019524 sll   zero, zero, 0
+// 0x0101951c: 0x101951c: sll   zero, zero, 0
+// 0x01019520: 0x1019520: beq   v1, zero, 0x1019534 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1019524
+	brfalse L_1019534
 // --- basic block ---
-// 0x01019518: 0x1019518: lw    v0, 16(v0)
+// 0x01019528: 0x1019528: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3200,17 +3200,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101951c: 0x101951c: j	 0x1019528 sll   zero, zero, 0
-	br L_1019528
+// 0x0101952c: 0x101952c: j	 0x1019538 sll   zero, zero, 0
+	br L_1019538
 // --- basic block ---
-L_1019524:
-// 0x01019524: 0x1019524: addu  v0, zero, zero
+L_1019534:
+// 0x01019534: 0x1019534: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1019528:
-// 0x01019528: 0x1019528: lw    ra, 20(sp)
-// 0x0101952c: 0x101952c: sll   zero, zero, 0
-// 0x01019530: 0x1019530: jr    ra addiu sp, sp, 24
+L_1019538:
+// 0x01019538: 0x1019538: lw    ra, 20(sp)
+// 0x0101953c: 0x101953c: sll   zero, zero, 0
+// 0x01019540: 0x1019540: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3222,7 +3222,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3257,28 +3257,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019564: 0x1019564: addiu sp, sp, -24
+// 0x01019574: 0x1019574: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01019568: 0x1019568: sw    ra, 20(sp)
-// 0x0101956c: 0x101956c: jal   0x1019470 sll   zero, zero, 0
+// 0x01019578: 0x1019578: sw    ra, 20(sp)
+// 0x0101957c: 0x101957c: jal   0x1019480 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_search_sign_1019470(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_search_sign_1019480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01019574: 0x1019574: beq   v0, zero, 0x1019580 sll   zero, zero, 0
+// 0x01019584: 0x1019584: beq   v0, zero, 0x1019590 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1019580
+	brfalse L_1019590
 // --- basic block ---
-// 0x0101957c: 0x101957c: sw    zero, 32(v0)
+// 0x0101958c: 0x101958c: sw    zero, 32(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3287,10 +3287,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1019580:
-// 0x01019580: 0x1019580: lw    ra, 20(sp)
-// 0x01019584: 0x1019584: sll   zero, zero, 0
-// 0x01019588: 0x1019588: jr    ra addiu sp, sp, 24
+L_1019590:
+// 0x01019590: 0x1019590: lw    ra, 20(sp)
+// 0x01019594: 0x1019594: sll   zero, zero, 0
+// 0x01019598: 0x1019598: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3302,7 +3302,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_update_points_1019590(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_update_points_10195a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -3337,12 +3337,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019590: 0x1019590: addiu sp, sp, -32
+// 0x010195a0: 0x10195a0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01019594: 0x1019594: sw    a1, 16(sp)
+// 0x010195a4: 0x10195a4: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3351,7 +3351,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01019598: 0x1019598: sw    a2, 20(sp)
+// 0x010195a8: 0x10195a8: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3360,19 +3360,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101959c: 0x101959c: sw    ra, 28(sp)
-// 0x010195a0: 0x10195a0: jal   0x1019470 sll   zero, zero, 0
+// 0x010195ac: 0x10195ac: sw    ra, 28(sp)
+// 0x010195b0: 0x10195b0: jal   0x1019480 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_search_sign_1019470(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_search_sign_1019480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010195a8: 0x10195a8: lw    a1, 16(sp)
+// 0x010195b8: 0x10195b8: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3381,7 +3381,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010195ac: 0x10195ac: lw    a2, 20(sp)
+// 0x010195bc: 0x10195bc: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3390,11 +3390,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010195b0: 0x10195b0: beq   v0, zero, 0x10195f8 sll   zero, zero, 0
+// 0x010195c0: 0x10195c0: beq   v0, zero, 0x1019608 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10195f8
+	brfalse L_1019608
 // --- basic block ---
-// 0x010195b8: 0x10195b8: lw    v1, 88(v0)
+// 0x010195c8: 0x10195c8: lw    v1, 88(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3403,20 +3403,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010195bc: 0x10195bc: sll   zero, zero, 0
-// 0x010195c0: 0x10195c0: beq   v1, zero, 0x10195f8 sll   zero, zero, 0
+// 0x010195cc: 0x10195cc: sll   zero, zero, 0
+// 0x010195d0: 0x10195d0: beq   v1, zero, 0x1019608 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10195f8
+	brfalse L_1019608
 // --- basic block ---
-// 0x010195c8: 0x10195c8: lw    v1, 0(a1)
+// 0x010195d8: 0x10195d8: lw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010195cc: 0x10195cc: sll   zero, zero, 0
-// 0x010195d0: 0x10195d0: sw    v1, 44(v0)
+// 0x010195dc: 0x10195dc: sll   zero, zero, 0
+// 0x010195e0: 0x10195e0: sw    v1, 44(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3425,7 +3425,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010195d4: 0x10195d4: lw    v1, 4(a1)
+// 0x010195e4: 0x10195e4: lw    v1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3434,8 +3434,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010195d8: 0x10195d8: sll   zero, zero, 0
-// 0x010195dc: 0x10195dc: sw    v1, 48(v0)
+// 0x010195e8: 0x10195e8: sll   zero, zero, 0
+// 0x010195ec: 0x10195ec: sw    v1, 48(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3444,15 +3444,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010195e0: 0x10195e0: lw    v1, 0(a2)
+// 0x010195f0: 0x10195f0: lw    v1, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010195e4: 0x10195e4: sll   zero, zero, 0
-// 0x010195e8: 0x10195e8: sw    v1, 52(v0)
+// 0x010195f4: 0x10195f4: sll   zero, zero, 0
+// 0x010195f8: 0x10195f8: sw    v1, 52(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3461,7 +3461,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010195ec: 0x10195ec: lw    v1, 4(a2)
+// 0x010195fc: 0x10195fc: lw    v1, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3470,8 +3470,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010195f0: 0x10195f0: sll   zero, zero, 0
-// 0x010195f4: 0x10195f4: sw    v1, 56(v0)
+// 0x01019600: 0x1019600: sll   zero, zero, 0
+// 0x01019604: 0x1019604: sw    v1, 56(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3480,10 +3480,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_10195f8:
-// 0x010195f8: 0x10195f8: lw    ra, 28(sp)
-// 0x010195fc: 0x10195fc: sll   zero, zero, 0
-// 0x01019600: 0x1019600: jr    ra addiu sp, sp, 32
+L_1019608:
+// 0x01019608: 0x1019608: lw    ra, 28(sp)
+// 0x0101960c: 0x101960c: sll   zero, zero, 0
+// 0x01019610: 0x1019610: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3495,7 +3495,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_display_is_sign_active_1019608(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_is_sign_active_1019618(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -3533,12 +3533,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019608: 0x1019608: addiu sp, sp, -24
+// 0x01019618: 0x1019618: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101960c: 0x101960c: sw    s0, 16(sp)
+// 0x0101961c: 0x101961c: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3547,16 +3547,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01019610: 0x1019610: sw    ra, 20(sp)
-// 0x01019614: 0x1019614: addu  s0, zero, zero
+// 0x01019620: 0x1019620: sw    ra, 20(sp)
+// 0x01019624: 0x1019624: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01019618: 0x1019618: cibyl_sysc_arg 0x10
+// 0x01019628: 0x1019628: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x0101961c: 0x101961c: cibyl_sysc 0x33b
+// 0x0101962c: 0x101962c: cibyl_sysc 0x33b
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01019620: 0x1019620: jal   0x1019470 addu  s0, v0, zero
+// 0x01019630: 0x1019630: jal   0x1019480 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -3564,21 +3564,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_search_sign_1019470(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_search_sign_1019480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01019628: 0x1019628: addu  v1, v0, zero
+// 0x01019638: 0x1019638: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0101962c: 0x101962c: beq   v1, zero, 0x1019648 addu  v0, zero, zero
+// 0x0101963c: 0x101963c: beq   v1, zero, 0x1019658 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1019648
+	brfalse L_1019658
 // --- basic block ---
-// 0x01019634: 0x1019634: lw    v1, 32(v1)
+// 0x01019644: 0x1019644: lw    v1, 32(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
@@ -3587,24 +3587,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01019638: 0x1019638: addiu a0, zero, -1
+// 0x01019648: 0x1019648: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0101963c: 0x101963c: bne   v1, a0, 0x1019648 slt   v0, s0, v1
+// 0x0101964c: 0x101964c: bne   v1, a0, 0x1019658 slt   v0, s0, v1
 	ldloc 6
 	ldloc.1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 5
-	bne.un L_1019648
+	bne.un L_1019658
 // --- basic block ---
-// 0x01019644: 0x1019644: addiu v0, zero, 1
+// 0x01019654: 0x1019654: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1019648:
-// 0x01019648: 0x1019648: lw    ra, 20(sp)
-// 0x0101964c: 0x101964c: lw    s0, 16(sp)
+L_1019658:
+// 0x01019658: 0x1019658: lw    ra, 20(sp)
+// 0x0101965c: 0x101965c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3613,7 +3613,7 @@ L_1019648:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019650: 0x1019650: jr    ra addiu sp, sp, 24
+// 0x01019660: 0x1019660: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3625,7 +3625,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_image_sign_1019658(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_image_sign_1019668(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3660,7 +3660,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019658: 0x1019658: lw    v1, 136(a0)
+// 0x01019668: 0x1019668: lw    v1, 136(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3669,23 +3669,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101965c: 0x101965c: addiu sp, sp, -40
+// 0x0101966c: 0x101966c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01019660: 0x1019660: addiu v0, zero, 1
+// 0x01019670: 0x1019670: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01019664: 0x1019664: bne   v1, v0, 0x1019688 sw    ra, 36(sp)
+// 0x01019674: 0x1019674: bne   v1, v0, 0x1019698 sw    ra, 36(sp)
 	ldloc 7
 	ldloc 5
-	bne.un L_1019688
+	bne.un L_1019698
 // --- basic block ---
-// 0x0101966c: 0x101966c: addiu v0, zero, 3
+// 0x0101967c: 0x101967c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01019670: 0x1019670: sw    a0, 24(sp)
+// 0x01019680: 0x1019680: sw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3694,7 +3694,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01019674: 0x1019674: jal   0x10423fc sw    v0, 16(sp)
+// 0x01019684: 0x1019684: jal   0x104240c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3703,17 +3703,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101967c: 0x101967c: addiu v0, v0, 3
+// 0x0101968c: 0x101968c: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x01019680: 0x1019680: lw    a0, 24(sp)
+// 0x01019690: 0x1019690: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3722,7 +3722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01019684: 0x1019684: sw    v0, 20(sp)
+// 0x01019694: 0x1019694: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3731,8 +3731,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_1019688:
-// 0x01019688: 0x1019688: lw    a2, 152(a0)
+L_1019698:
+// 0x01019698: 0x1019698: lw    a2, 152(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3741,14 +3741,14 @@ L_1019688:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101968c: 0x101968c: sll   zero, zero, 0
-// 0x01019690: 0x1019690: beq   a2, zero, 0x10196b4 addiu a1, zero, 1
+// 0x0101969c: 0x101969c: sll   zero, zero, 0
+// 0x010196a0: 0x10196a0: beq   a2, zero, 0x10196c4 addiu a1, zero, 1
 	ldloc.3
 	ldc.i4.1
 	stloc.2
-	brfalse L_10196b4
+	brfalse L_10196c4
 // --- basic block ---
-// 0x01019698: 0x1019698: jal   0x10a1918 addu  a0, zero, zero
+// 0x010196a8: 0x10196a8: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3756,23 +3756,23 @@ L_1019688:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010196a0: 0x10196a0: addu  a0, v0, zero
+// 0x010196b0: 0x10196b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010196a4: 0x10196a4: addiu a1, sp, 16
+// 0x010196b4: 0x10196b4: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010196a8: 0x10196a8: addu  a2, zero, zero
+// 0x010196b8: 0x10196b8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010196ac: 0x10196ac: jal   0x104f4a8 addu  a3, zero, zero
+// 0x010196bc: 0x10196bc: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3780,15 +3780,15 @@ L_1019688:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10196b4:
-// 0x010196b4: 0x10196b4: lw    ra, 36(sp)
-// 0x010196b8: 0x10196b8: sll   zero, zero, 0
-// 0x010196bc: 0x10196bc: jr    ra addiu sp, sp, 40
+L_10196c4:
+// 0x010196c4: 0x10196c4: lw    ra, 36(sp)
+// 0x010196c8: 0x10196c8: sll   zero, zero, 0
+// 0x010196cc: 0x10196cc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3800,7 +3800,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_highlight_10196c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_highlight_10196d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 lo,int32 ra)
@@ -3838,15 +3838,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010196c4: 0x10196c4: lui   a1, 0xe0000
+// 0x010196d4: 0x10196d4: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x010196c8: 0x10196c8: addiu a1, a1, 29604
+// 0x010196d8: 0x10196d8: addiu a1, a1, 30068
 	ldloc.2
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.2
-// 0x010196cc: 0x10196cc: lw    v1, 4(a0)
+// 0x010196dc: 0x10196dc: lw    v1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3855,14 +3855,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010196d0: 0x10196d0: lw    a2, 0(a0)
+// 0x010196e0: 0x10196e0: lw    a2, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010196d4: 0x10196d4: lw    a0, 80(a1)
+// 0x010196e4: 0x10196e4: lw    a0, 80(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3871,7 +3871,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010196d8: 0x10196d8: lw    a3, 76(a1)
+// 0x010196e8: 0x10196e8: lw    a3, 76(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3880,7 +3880,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010196dc: 0x10196dc: lw    v0, 36(a1)
+// 0x010196ec: 0x10196ec: lw    v0, 36(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3889,7 +3889,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010196e0: 0x10196e0: lw    a1, 32(a1)
+// 0x010196f0: 0x10196f0: lw    a1, 32(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3898,36 +3898,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010196e4: 0x10196e4: subu  a2, a2, a0
+// 0x010196f4: 0x10196f4: subu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	sub
 	stloc.3
-// 0x010196e8: 0x10196e8: div   a2, a1
+// 0x010196f8: 0x10196f8: div   a2, a1
 	ldloc.3
 	ldloc.2
 	div
 	stloc 8
-// 0x010196ec: 0x10196ec: subu  v1, a3, v1
+// 0x010196fc: 0x10196fc: subu  v1, a3, v1
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 6
-// 0x010196f0: 0x10196f0: addiu sp, sp, -40
+// 0x01019700: 0x1019700: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010196f4: 0x10196f4: addiu a1, sp, 16
+// 0x01019704: 0x1019704: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010196f8: 0x10196f8: addu  a0, a1, zero
+// 0x01019708: 0x1019708: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010196fc: 0x10196fc: sw    ra, 36(sp)
-// 0x01019700: 0x1019700: sw    a1, 24(sp)
+// 0x0101970c: 0x101970c: sw    ra, 36(sp)
+// 0x01019710: 0x1019710: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3936,10 +3936,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01019704: 0x1019704: mflo  lo
+// 0x01019714: 0x1019714: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x01019708: 0x1019708: sw    a2, 16(sp)
+// 0x01019718: 0x1019718: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3948,16 +3948,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101970c: 0x101970c: sll   zero, zero, 0
-// 0x01019710: 0x1019710: div   v1, v0
+// 0x0101971c: 0x101971c: sll   zero, zero, 0
+// 0x01019720: 0x1019720: div   v1, v0
 	ldloc 6
 	ldloc 7
 	div
 	stloc 8
-// 0x01019714: 0x1019714: mflo  lo
+// 0x01019724: 0x1019724: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01019718: 0x1019718: jal   0x10073c4 sw    v1, 20(sp)
+// 0x01019728: 0x1019728: jal   0x10073d4 sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3971,12 +3971,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01019720: 0x1019720: lw    a1, 24(sp)
+// 0x01019730: 0x1019730: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3985,15 +3985,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019724: 0x1019724: lui   a0, 0x10000
+// 0x01019734: 0x1019734: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01019728: 0x1019728: addiu a0, a0, -31240
+// 0x01019738: 0x1019738: addiu a0, a0, -31240
 	ldloc.1
 	ldc.i4 -31240
 	add
 	stloc.1
-// 0x0101972c: 0x101972c: jal   0x101bb50 addu  a2, zero, zero
+// 0x0101973c: 0x101973c: jal   0x101bb60 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4001,14 +4001,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01019734: 0x1019734: lw    ra, 36(sp)
-// 0x01019738: 0x1019738: sll   zero, zero, 0
-// 0x0101973c: 0x101973c: jr    ra addiu sp, sp, 40
+// 0x01019744: 0x1019744: lw    ra, 36(sp)
+// 0x01019748: 0x1019748: sll   zero, zero, 0
+// 0x0101974c: 0x101974c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4020,7 +4020,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_display_string_1019744(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_string_1019754(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s4,int32 s1,int32 s0,int32 s5,int32 s2,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -4082,12 +4082,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019744: 0x1019744: addiu sp, sp, -352
+// 0x01019754: 0x1019754: addiu sp, sp, -352
 	ldloc.0
 	ldc.i4 -352
 	add
 	stloc.0
-// 0x01019748: 0x1019748: sw    s3, 324(sp)
+// 0x01019758: 0x1019758: sw    s3, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4096,13 +4096,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101974c: 0x101974c: addu  s3, a1, zero
+// 0x0101975c: 0x101975c: addu  s3, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01019750: 0x1019750: addiu a1, zero, 10
+// 0x01019760: 0x1019760: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x01019754: 0x1019754: sw    s4, 328(sp)
+// 0x01019764: 0x1019764: sw    s4, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4111,7 +4111,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01019758: 0x1019758: sw    s2, 320(sp)
+// 0x01019768: 0x1019768: sw    s2, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4120,7 +4120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101975c: 0x101975c: sw    s1, 316(sp)
+// 0x0101976c: 0x101976c: sw    s1, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4129,7 +4129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01019760: 0x1019760: sw    s0, 312(sp)
+// 0x01019770: 0x1019770: sw    s0, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4138,8 +4138,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01019764: 0x1019764: sw    ra, 348(sp)
-// 0x01019768: 0x1019768: sw    s8, 344(sp)
+// 0x01019774: 0x1019774: sw    ra, 348(sp)
+// 0x01019778: 0x1019778: sw    s8, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4148,7 +4148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101976c: 0x101976c: sw    s7, 340(sp)
+// 0x0101977c: 0x101977c: sw    s7, 340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4157,7 +4157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01019770: 0x1019770: sw    s6, 336(sp)
+// 0x01019780: 0x1019780: sw    s6, 336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4166,7 +4166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01019774: 0x1019774: sw    s5, 332(sp)
+// 0x01019784: 0x1019784: sw    s5, 332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4175,13 +4175,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01019778: 0x1019778: addu  s1, a2, zero
+// 0x01019788: 0x1019788: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0101977c: 0x101977c: addu  s0, a3, zero
+// 0x0101978c: 0x101978c: addu  s0, a3, zero
 	ldloc 4
 	stloc 11
-// 0x01019780: 0x1019780: lw    s2, 368(sp)
+// 0x01019790: 0x1019790: lw    s2, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4190,7 +4190,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01019784: 0x1019784: jal   0x1001a5c addu  s4, a0, zero
+// 0x01019794: 0x1019794: jal   0x1001a5c addu  s4, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.1
@@ -4200,93 +4200,93 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101978c: 0x101978c: beq   v0, zero, 0x10199c0 addu  a3, s4, zero
+// 0x0101979c: 0x101979c: beq   v0, zero, 0x10199d0 addu  a3, s4, zero
 	ldloc 5
 	ldloc 9
 	stloc 4
-	brfalse L_10199c0
+	brfalse L_10199d0
 // --- basic block ---
-// 0x01019794: 0x1019794: lui   s8, 0x10000
+// 0x010197a4: 0x10197a4: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x01019798: 0x1019798: lui   s7, 0x10000
+// 0x010197a8: 0x10197a8: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 15
-// 0x0101979c: 0x101979c: lui   s6, 0x10000
+// 0x010197ac: 0x10197ac: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010197a0: 0x10197a0: lui   s3, 0x0
+// 0x010197b0: 0x10197b0: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010197a4: 0x10197a4: lui   s4, 0x0
+// 0x010197b4: 0x10197b4: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010197a8: 0x10197a8: lui   s5, 0x10000
+// 0x010197b8: 0x10197b8: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x010197ac: 0x10197ac: addiu s8, s8, -31212
+// 0x010197bc: 0x10197bc: addiu s8, s8, -31212
 	ldloc 16
 	ldc.i4 -31212
 	add
 	stloc 16
-// 0x010197b0: 0x10197b0: addiu s7, s7, -31196
+// 0x010197c0: 0x10197c0: addiu s7, s7, -31196
 	ldloc 15
 	ldc.i4 -31196
 	add
 	stloc 15
-// 0x010197b4: 0x10197b4: addiu s6, s6, -31188
+// 0x010197c4: 0x10197c4: addiu s6, s6, -31188
 	ldloc 14
 	ldc.i4 -31188
 	add
 	stloc 14
-// 0x010197b8: 0x10197b8: addiu s3, s3, 31980
+// 0x010197c8: 0x10197c8: addiu s3, s3, 31980
 	ldloc 8
 	ldc.i4 31980
 	add
 	stloc 8
-// 0x010197bc: 0x10197bc: addiu s4, s4, 23008
+// 0x010197cc: 0x10197cc: addiu s4, s4, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc 9
-// 0x010197c0: 0x10197c0: addiu s5, s5, -31204
+// 0x010197d0: 0x10197d0: addiu s5, s5, -31204
 	ldloc 12
 	ldc.i4 -31204
 	add
 	stloc 12
-// 0x010197c4: 0x10197c4: j	 0x1019938 addiu s1, sp, 36
+// 0x010197d4: 0x10197d4: j	 0x1019948 addiu s1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-	br L_1019938
+	br L_1019948
 // --- basic block ---
-L_10197cc:
-// 0x010197cc: 0x10197cc: sltiu v0, v1, 256
+L_10197dc:
+// 0x010197dc: 0x10197dc: sltiu v0, v1, 256
 	ldloc 7
 	ldc.i4 256
 	clt.un
 	stloc 5
-// 0x010197d0: 0x10197d0: bne   v0, zero, 0x10197e0 addu  a2, v1, zero
+// 0x010197e0: 0x10197e0: bne   v0, zero, 0x10197f0 addu  a2, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.3
-	brtrue L_10197e0
+	brtrue L_10197f0
 // --- basic block ---
-// 0x010197d8: 0x10197d8: addiu v1, zero, 255
+// 0x010197e8: 0x10197e8: addiu v1, zero, 255
 	ldc.i4 255
 	stloc 7
-// 0x010197dc: 0x10197dc: addu  a2, v1, zero
+// 0x010197ec: 0x10197ec: addu  a2, v1, zero
 	ldloc 7
 	stloc.3
-L_10197e0:
-// 0x010197e0: 0x10197e0: addu  a1, a3, zero
+L_10197f0:
+// 0x010197f0: 0x10197f0: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010197e4: 0x10197e4: addu  a0, s1, zero
+// 0x010197f4: 0x10197f4: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010197e8: 0x10197e8: sw    v1, 300(sp)
+// 0x010197f8: 0x10197f8: sw    v1, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4295,7 +4295,7 @@ L_10197e0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010197ec: 0x10197ec: jal   0x1001af8 sw    a3, 304(sp)
+// 0x010197fc: 0x10197fc: jal   0x1001af8 sw    a3, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4310,7 +4310,7 @@ L_10197e0:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010197f4: 0x10197f4: lw    v1, 300(sp)
+// 0x01019804: 0x1019804: lw    v1, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4319,7 +4319,7 @@ L_10197e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010197f8: 0x10197f8: lw    a3, 304(sp)
+// 0x01019808: 0x1019808: lw    a3, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4328,23 +4328,23 @@ L_10197e0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010197fc: 0x10197fc: addiu v0, sp, 24
+// 0x0101980c: 0x101980c: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x01019800: 0x1019800: addu  v1, v0, v1
+// 0x01019810: 0x1019810: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01019804: 0x1019804: addu  a0, a3, zero
+// 0x01019814: 0x1019814: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x01019808: 0x1019808: addiu a1, zero, 10
+// 0x01019818: 0x1019818: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0101980c: 0x101980c: jal   0x1001a5c sb    zero, 12(v1)
+// 0x0101981c: 0x101981c: jal   0x1001a5c sb    zero, 12(v1)
 	ldloc 7
 	ldc.i4.s 12
 	add
@@ -4357,21 +4357,21 @@ L_10197e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019814: 0x1019814: lui   a0, 0x10000
+// 0x01019824: 0x1019824: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01019818: 0x1019818: addiu a0, a0, -31228
+// 0x01019828: 0x1019828: addiu a0, a0, -31228
 	ldloc.1
 	ldc.i4 -31228
 	add
 	stloc.1
-// 0x0101981c: 0x101981c: addu  a1, s1, zero
+// 0x0101982c: 0x101982c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01019820: 0x1019820: addiu a2, zero, 4
+// 0x01019830: 0x1019830: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x01019824: 0x1019824: jal   0x1001b2c sw    v0, 296(sp)
+// 0x01019834: 0x1019834: jal   0x1001b2c sw    v0, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4386,21 +4386,21 @@ L_10197e0:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101982c: 0x101982c: beq   v0, zero, 0x101988c lui   a0, 0x10000
+// 0x0101983c: 0x101983c: beq   v0, zero, 0x101989c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_101988c
+	brfalse L_101989c
 // --- basic block ---
-// 0x01019834: 0x1019834: addiu a0, a0, -31220
+// 0x01019844: 0x1019844: addiu a0, a0, -31220
 	ldloc.1
 	ldc.i4 -31220
 	add
 	stloc.1
-// 0x01019838: 0x1019838: addu  a1, s1, zero
+// 0x01019848: 0x1019848: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0101983c: 0x101983c: jal   0x1001b2c addiu a2, zero, 4
+// 0x0101984c: 0x101984c: jal   0x1001b2c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.1
@@ -4409,13 +4409,13 @@ L_10197e0:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01019844: 0x1019844: bne   v0, zero, 0x1019860 addu  a0, s8, zero
+// 0x01019854: 0x1019854: bne   v0, zero, 0x1019870 addu  a0, s8, zero
 	ldloc 5
 	ldloc 16
 	stloc.1
-	brtrue L_1019860
+	brtrue L_1019870
 // --- basic block ---
-// 0x0101984c: 0x101984c: jal   0x104edb0 addu  a0, s3, zero
+// 0x0101985c: 0x101985c: jal   0x104edc0 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4423,25 +4423,25 @@ L_10197e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019854: 0x1019854: addiu v0, zero, 16
+// 0x01019864: 0x1019864: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-L_1019858:
-// 0x01019858: 0x1019858: j	 0x10198d4 addiu a3, zero, 4
+L_1019868:
+// 0x01019868: 0x1019868: j	 0x10198e4 addiu a3, zero, 4
 	ldc.i4.4
 	stloc 4
-	br L_10198d4
+	br L_10198e4
 // --- basic block ---
-L_1019860:
-// 0x01019860: 0x1019860: addu  a1, s1, zero
+L_1019870:
+// 0x01019870: 0x1019870: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01019864: 0x1019864: jal   0x1001b2c addiu a2, zero, 4
+// 0x01019874: 0x1019874: jal   0x1001b2c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.1
@@ -4450,19 +4450,19 @@ L_1019860:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101986c: 0x101986c: beq   v0, zero, 0x1019890 addu  a0, s5, zero
+// 0x0101987c: 0x101987c: beq   v0, zero, 0x10198a0 addu  a0, s5, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brfalse L_1019890
+	brfalse L_10198a0
 // --- basic block ---
-// 0x01019874: 0x1019874: addu  a0, s7, zero
+// 0x01019884: 0x1019884: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-// 0x01019878: 0x1019878: addu  a1, s1, zero
+// 0x01019888: 0x1019888: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0101987c: 0x101987c: jal   0x1001b2c addiu a2, zero, 4
+// 0x0101988c: 0x101988c: jal   0x1001b2c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.1
@@ -4471,38 +4471,38 @@ L_1019860:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01019884: 0x1019884: bne   v0, zero, 0x10198a0 addu  a0, s6, zero
+// 0x01019894: 0x1019894: bne   v0, zero, 0x10198b0 addu  a0, s6, zero
 	ldloc 5
 	ldloc 14
 	stloc.1
-	brtrue L_10198a0
+	brtrue L_10198b0
 // --- basic block ---
-L_101988c:
-// 0x0101988c: 0x101988c: addu  a0, s4, zero
+L_101989c:
+// 0x0101989c: 0x101989c: addu  a0, s4, zero
 	ldloc 9
 	stloc.1
-L_1019890:
-// 0x01019890: 0x1019890: jal   0x104edb0 sll   zero, zero, 0
+L_10198a0:
+// 0x010198a0: 0x10198a0: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019898: 0x1019898: j	 0x1019858 addiu v0, zero, 18
+// 0x010198a8: 0x10198a8: j	 0x1019868 addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-	br L_1019858
+	br L_1019868
 // --- basic block ---
-L_10198a0:
-// 0x010198a0: 0x10198a0: addu  a1, s1, zero
+L_10198b0:
+// 0x010198b0: 0x10198b0: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010198a4: 0x10198a4: jal   0x1001b2c addiu a2, zero, 4
+// 0x010198b4: 0x10198b4: jal   0x1001b2c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.1
@@ -4511,11 +4511,11 @@ L_10198a0:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010198ac: 0x10198ac: bne   v0, zero, 0x10198c4 sll   zero, zero, 0
+// 0x010198bc: 0x10198bc: bne   v0, zero, 0x10198d4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10198c4
+	brtrue L_10198d4
 // --- basic block ---
-// 0x010198b4: 0x10198b4: jal   0x104edb0 addu  a0, s3, zero
+// 0x010198c4: 0x10198c4: jal   0x104edc0 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4523,18 +4523,18 @@ L_10198a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010198bc: 0x10198bc: j	 0x1019858 addiu v0, zero, -1
+// 0x010198cc: 0x10198cc: j	 0x1019868 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_1019858
+	br L_1019868
 // --- basic block ---
-L_10198c4:
-// 0x010198c4: 0x10198c4: jal   0x104edb0 addu  a0, s3, zero
+L_10198d4:
+// 0x010198d4: 0x10198d4: jal   0x104edc0 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4542,33 +4542,33 @@ L_10198c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010198cc: 0x10198cc: addiu v0, zero, 12
+// 0x010198dc: 0x10198dc: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x010198d0: 0x10198d0: addu  a3, zero, zero
+// 0x010198e0: 0x10198e0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-L_10198d4:
-// 0x010198d4: 0x10198d4: addu  a2, v0, zero
+L_10198e4:
+// 0x010198e4: 0x10198e4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010198d8: 0x10198d8: addu  a3, s1, a3
+// 0x010198e8: 0x10198e8: addu  a3, s1, a3
 	ldloc 10
 	ldloc 4
 	add
 	stloc 4
-// 0x010198dc: 0x10198dc: addu  a0, s0, zero
+// 0x010198ec: 0x10198ec: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010198e0: 0x10198e0: addu  a1, s2, zero
+// 0x010198f0: 0x10198f0: addu  a1, s2, zero
 	ldloc 13
 	stloc.2
-// 0x010198e4: 0x10198e4: jal   0x104ea60 sw    v0, 300(sp)
+// 0x010198f4: 0x10198f4: jal   0x104ea70 sw    v0, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4582,12 +4582,12 @@ L_10198d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010198ec: 0x10198ec: lw    v0, 300(sp)
+// 0x010198fc: 0x10198fc: lw    v0, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4596,28 +4596,28 @@ L_10198d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010198f0: 0x10198f0: addu  a0, s1, zero
+// 0x01019900: 0x1019900: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010198f4: 0x10198f4: addu  a1, v0, zero
+// 0x01019904: 0x1019904: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010198f8: 0x10198f8: addiu a3, sp, 28
+// 0x01019908: 0x1019908: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010198fc: 0x10198fc: addiu v0, sp, 32
+// 0x0101990c: 0x101990c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01019900: 0x1019900: addiu a2, sp, 24
+// 0x01019910: 0x1019910: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01019904: 0x1019904: sw    v0, 16(sp)
+// 0x01019914: 0x1019914: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4626,7 +4626,7 @@ L_10198d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01019908: 0x1019908: jal   0x104e968 sw    zero, 20(sp)
+// 0x01019918: 0x1019918: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4640,12 +4640,12 @@ L_10198d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019910: 0x1019910: lw    v0, 32(sp)
+// 0x01019920: 0x1019920: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4654,7 +4654,7 @@ L_10198d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019914: 0x1019914: lw    a0, 28(sp)
+// 0x01019924: 0x1019924: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4663,7 +4663,7 @@ L_10198d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01019918: 0x1019918: lw    v1, 4(s0)
+// 0x01019928: 0x1019928: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4672,22 +4672,22 @@ L_10198d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101991c: 0x101991c: addu  v0, a0, v0
+// 0x0101992c: 0x101992c: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01019920: 0x1019920: addiu v0, v0, 4
+// 0x01019930: 0x1019930: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01019924: 0x1019924: addu  v0, v1, v0
+// 0x01019934: 0x1019934: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01019928: 0x1019928: sw    v0, 4(s0)
+// 0x01019938: 0x1019938: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4696,7 +4696,7 @@ L_10198d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101992c: 0x101992c: lw    v0, 296(sp)
+// 0x0101993c: 0x101993c: lw    v0, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4705,20 +4705,20 @@ L_10198d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019930: 0x1019930: sll   zero, zero, 0
-// 0x01019934: 0x1019934: addiu a3, v0, 1
+// 0x01019940: 0x1019940: sll   zero, zero, 0
+// 0x01019944: 0x1019944: addiu a3, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 4
-L_1019938:
-// 0x01019938: 0x1019938: addu  a0, a3, zero
+L_1019948:
+// 0x01019948: 0x1019948: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x0101993c: 0x101993c: addiu a1, zero, 10
+// 0x0101994c: 0x101994c: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x01019940: 0x1019940: jal   0x1001a5c sw    a3, 304(sp)
+// 0x01019950: 0x1019950: jal   0x1001a5c sw    a3, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4734,7 +4734,7 @@ L_1019938:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019948: 0x1019948: lw    a3, 304(sp)
+// 0x01019958: 0x1019958: lw    a3, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4743,26 +4743,26 @@ L_1019938:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101994c: 0x101994c: bne   v0, zero, 0x10197cc subu  v1, v0, a3
+// 0x0101995c: 0x101995c: bne   v0, zero, 0x10197dc subu  v1, v0, a3
 	ldloc 5
 	ldloc 5
 	ldloc 4
 	sub
 	stloc 7
-	brtrue L_10197cc
+	brtrue L_10197dc
 // --- basic block ---
-// 0x01019954: 0x1019954: lui   a0, 0x10000
+// 0x01019964: 0x1019964: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01019958: 0x1019958: addu  a1, a3, zero
+// 0x01019968: 0x1019968: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x0101995c: 0x101995c: addiu a0, a0, -31228
+// 0x0101996c: 0x101996c: addiu a0, a0, -31228
 	ldloc.1
 	ldc.i4 -31228
 	add
 	stloc.1
-// 0x01019960: 0x1019960: jal   0x1001b2c addiu a2, zero, 4
+// 0x01019970: 0x1019970: jal   0x1001b2c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.1
@@ -4771,7 +4771,7 @@ L_1019938:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01019968: 0x1019968: lw    a3, 304(sp)
+// 0x01019978: 0x1019978: lw    a3, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4780,33 +4780,33 @@ L_1019938:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101996c: 0x101996c: bne   v0, zero, 0x101997c addiu v0, zero, 4
+// 0x0101997c: 0x101997c: bne   v0, zero, 0x101998c addiu v0, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	brtrue L_101997c
+	brtrue L_101998c
 // --- basic block ---
-// 0x01019974: 0x1019974: j	 0x10199b0 addiu a2, zero, 18
+// 0x01019984: 0x1019984: j	 0x10199c0 addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-	br L_10199b0
+	br L_10199c0
 // --- basic block ---
-L_101997c:
-// 0x0101997c: 0x101997c: lui   a0, 0x10000
+L_101998c:
+// 0x0101998c: 0x101998c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01019980: 0x1019980: addu  a1, a3, zero
+// 0x01019990: 0x1019990: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01019984: 0x1019984: addiu a0, a0, -31188
+// 0x01019994: 0x1019994: addiu a0, a0, -31188
 	ldloc.1
 	ldc.i4 -31188
 	add
 	stloc.1
-// 0x01019988: 0x1019988: addiu a2, zero, 4
+// 0x01019998: 0x1019998: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0101998c: 0x101998c: jal   0x1001b2c sw    a3, 304(sp)
+// 0x0101999c: 0x101999c: jal   0x1001b2c sw    a3, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4821,7 +4821,7 @@ L_101997c:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01019994: 0x1019994: lw    a3, 304(sp)
+// 0x010199a4: 0x10199a4: lw    a3, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4830,49 +4830,49 @@ L_101997c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01019998: 0x1019998: beq   v0, zero, 0x10199a8 addu  v0, zero, zero
+// 0x010199a8: 0x10199a8: beq   v0, zero, 0x10199b8 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10199a8
+	brfalse L_10199b8
 // --- basic block ---
-// 0x010199a0: 0x10199a0: j	 0x10199b0 addiu a2, zero, 12
+// 0x010199b0: 0x10199b0: j	 0x10199c0 addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-	br L_10199b0
+	br L_10199c0
 // --- basic block ---
-L_10199a8:
-// 0x010199a8: 0x10199a8: addiu v0, zero, 4
+L_10199b8:
+// 0x010199b8: 0x10199b8: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010199ac: 0x10199ac: addiu a2, zero, 13
+// 0x010199bc: 0x10199bc: addiu a2, zero, 13
 	ldc.i4.s 13
 	stloc.3
-L_10199b0:
-// 0x010199b0: 0x10199b0: addu  a3, a3, v0
+L_10199c0:
+// 0x010199c0: 0x10199c0: addu  a3, a3, v0
 	ldloc 4
 	ldloc 5
 	add
 	stloc 4
-// 0x010199b4: 0x10199b4: addu  a0, s0, zero
+// 0x010199c4: 0x10199c4: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010199b8: 0x10199b8: j	 0x1019a9c addu  a1, s2, zero
+// 0x010199c8: 0x10199c8: j	 0x1019aac addu  a1, s2, zero
 	ldloc 13
 	stloc.2
-	br L_1019a9c
+	br L_1019aac
 // --- basic block ---
-L_10199c0:
-// 0x010199c0: 0x10199c0: slti  s3, s3, 2
+L_10199d0:
+// 0x010199d0: 0x10199d0: slti  s3, s3, 2
 	ldloc 8
 	ldc.i4.2
 	clt
 	stloc 8
-// 0x010199c4: 0x10199c4: bne   s3, zero, 0x1019a90 sll   zero, zero, 0
+// 0x010199d4: 0x10199d4: bne   s3, zero, 0x1019aa0 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1019a90
+	brtrue L_1019aa0
 // --- basic block ---
-// 0x010199cc: 0x10199cc: jal   0x1001b48 addu  a0, s4, zero
+// 0x010199dc: 0x10199dc: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -4881,146 +4881,146 @@ L_10199c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010199d4: 0x10199d4: srl   v1, v0, 1
+// 0x010199e4: 0x10199e4: srl   v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shr.un
 	stloc 7
-// 0x010199d8: 0x10199d8: addu  v1, s4, v1
+// 0x010199e8: 0x10199e8: addu  v1, s4, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x010199dc: 0x10199dc: addu  v0, s4, v0
+// 0x010199ec: 0x10199ec: addu  v0, s4, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x010199e0: 0x10199e0: addu  s3, v1, zero
+// 0x010199f0: 0x10199f0: addu  s3, v1, zero
 	ldloc 7
 	stloc 8
-// 0x010199e4: 0x10199e4: j	 0x1019a08 addiu a0, zero, 32
+// 0x010199f4: 0x10199f4: j	 0x1019a18 addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
-	br L_1019a08
+	br L_1019a18
 // --- basic block ---
-L_10199ec:
-// 0x010199ec: 0x10199ec: lb    a1, 0(s3)
+L_10199fc:
+// 0x010199fc: 0x10199fc: lb    a1, 0(s3)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x010199f0: 0x10199f0: sll   zero, zero, 0
-// 0x010199f4: 0x10199f4: bne   a1, a0, 0x1019a08 addiu s3, s3, -1
+// 0x01019a00: 0x1019a00: sll   zero, zero, 0
+// 0x01019a04: 0x1019a04: bne   a1, a0, 0x1019a18 addiu s3, s3, -1
 	ldloc.2
 	ldloc.1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-	bne.un L_1019a08
+	bne.un L_1019a18
 // --- basic block ---
-// 0x010199fc: 0x10199fc: addiu s3, s3, 1
+// 0x01019a0c: 0x1019a0c: addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01019a00: 0x1019a00: j	 0x1019a30 addiu a0, zero, 32
+// 0x01019a10: 0x1019a10: j	 0x1019a40 addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
-	br L_1019a30
+	br L_1019a40
 // --- basic block ---
-L_1019a08:
-// 0x01019a08: 0x1019a08: sltu  a1, s4, s3
+L_1019a18:
+// 0x01019a18: 0x1019a18: sltu  a1, s4, s3
 	ldloc 9
 	ldloc 8
 	clt.un
 	stloc.2
-// 0x01019a0c: 0x1019a0c: bne   a1, zero, 0x10199ec sll   zero, zero, 0
+// 0x01019a1c: 0x1019a1c: bne   a1, zero, 0x10199fc sll   zero, zero, 0
 	ldloc.2
-	brtrue L_10199ec
+	brtrue L_10199fc
 // --- basic block ---
-// 0x01019a14: 0x1019a14: j	 0x1019a30 addiu a0, zero, 32
+// 0x01019a24: 0x1019a24: j	 0x1019a40 addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
-	br L_1019a30
+	br L_1019a40
 // --- basic block ---
-L_1019a1c:
-// 0x01019a1c: 0x1019a1c: lb    a1, 0(v1)
+L_1019a2c:
+// 0x01019a2c: 0x1019a2c: lb    a1, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01019a20: 0x1019a20: sll   zero, zero, 0
-// 0x01019a24: 0x1019a24: beq   a1, a0, 0x1019a3c sll   zero, zero, 0
+// 0x01019a30: 0x1019a30: sll   zero, zero, 0
+// 0x01019a34: 0x1019a34: beq   a1, a0, 0x1019a4c sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	beq  L_1019a3c
+	beq  L_1019a4c
 // --- basic block ---
-// 0x01019a2c: 0x1019a2c: addiu v1, v1, 1
+// 0x01019a3c: 0x1019a3c: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_1019a30:
-// 0x01019a30: 0x1019a30: sltu  a1, v1, v0
+L_1019a40:
+// 0x01019a40: 0x1019a40: sltu  a1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt.un
 	stloc.2
-// 0x01019a34: 0x1019a34: bne   a1, zero, 0x1019a1c sll   zero, zero, 0
+// 0x01019a44: 0x1019a44: bne   a1, zero, 0x1019a2c sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1019a1c
+	brtrue L_1019a2c
 // --- basic block ---
-L_1019a3c:
-// 0x01019a3c: 0x1019a3c: subu  v0, v0, s3
+L_1019a4c:
+// 0x01019a4c: 0x1019a4c: subu  v0, v0, s3
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 5
-// 0x01019a40: 0x1019a40: subu  a0, v1, s4
+// 0x01019a50: 0x1019a50: subu  a0, v1, s4
 	ldloc 7
 	ldloc 9
 	sub
 	stloc.1
-// 0x01019a44: 0x1019a44: slt   v0, a0, v0
+// 0x01019a54: 0x1019a54: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x01019a48: 0x1019a48: beq   v0, zero, 0x1019a58 sltu  v0, s4, s3
+// 0x01019a58: 0x1019a58: beq   v0, zero, 0x1019a68 sltu  v0, s4, s3
 	ldloc 5
 	ldloc 9
 	ldloc 8
 	clt.un
 	stloc 5
-	brfalse L_1019a58
+	brfalse L_1019a68
 // --- basic block ---
-// 0x01019a50: 0x1019a50: addu  s3, v1, zero
+// 0x01019a60: 0x1019a60: addu  s3, v1, zero
 	ldloc 7
 	stloc 8
-// 0x01019a54: 0x1019a54: sltu  v0, s4, s3
+// 0x01019a64: 0x1019a64: sltu  v0, s4, s3
 	ldloc 9
 	ldloc 8
 	clt.un
 	stloc 5
-L_1019a58:
-// 0x01019a58: 0x1019a58: beq   v0, zero, 0x1019a8c addu  a2, s4, zero
+L_1019a68:
+// 0x01019a68: 0x1019a68: beq   v0, zero, 0x1019a9c addu  a2, s4, zero
 	ldloc 5
 	ldloc 9
 	stloc.3
-	brfalse L_1019a8c
+	brfalse L_1019a9c
 // --- basic block ---
-// 0x01019a60: 0x1019a60: lb    s5, 0(s3)
+// 0x01019a70: 0x1019a70: lb    s5, 0(s3)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 12
-// 0x01019a64: 0x1019a64: sb    zero, 0(s3)
+// 0x01019a74: 0x1019a74: sb    zero, 0(s3)
 	ldloc 8
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01019a68: 0x1019a68: addu  a0, s0, zero
+// 0x01019a78: 0x1019a78: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01019a6c: 0x1019a6c: jal   0x104ebfc addu  a1, s2, zero
+// 0x01019a7c: 0x1019a7c: jal   0x104ec0c addu  a1, s2, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -5028,16 +5028,16 @@ L_1019a58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_104ebfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_104ec0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019a74: 0x1019a74: sb    s5, 0(s3)
+// 0x01019a84: 0x1019a84: sb    s5, 0(s3)
 	ldloc 8
 	ldloc 12
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01019a78: 0x1019a78: lw    v0, 4(s0)
+// 0x01019a88: 0x1019a88: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5046,17 +5046,17 @@ L_1019a58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019a7c: 0x1019a7c: addiu a3, s3, 1
+// 0x01019a8c: 0x1019a8c: addiu a3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01019a80: 0x1019a80: addu  s1, v0, s1
+// 0x01019a90: 0x1019a90: addu  s1, v0, s1
 	ldloc 5
 	ldloc 10
 	add
 	stloc 10
-// 0x01019a84: 0x1019a84: j	 0x1019a90 sw    s1, 4(s0)
+// 0x01019a94: 0x1019a94: j	 0x1019aa0 sw    s1, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5065,36 +5065,36 @@ L_1019a58:
 	add
 	ldloc 10
 	stelem.i4
-	br L_1019a90
+	br L_1019aa0
 // --- basic block ---
-L_1019a8c:
-// 0x01019a8c: 0x1019a8c: addu  a3, s4, zero
+L_1019a9c:
+// 0x01019a9c: 0x1019a9c: addu  a3, s4, zero
 	ldloc 9
 	stloc 4
-L_1019a90:
-// 0x01019a90: 0x1019a90: addu  a0, s0, zero
+L_1019aa0:
+// 0x01019aa0: 0x1019aa0: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01019a94: 0x1019a94: addu  a1, s2, zero
+// 0x01019aa4: 0x1019aa4: addu  a1, s2, zero
 	ldloc 13
 	stloc.2
-// 0x01019a98: 0x1019a98: addiu a2, zero, 12
+// 0x01019aa8: 0x1019aa8: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-L_1019a9c:
-// 0x01019a9c: 0x1019a9c: jal   0x104ea60 sll   zero, zero, 0
+L_1019aac:
+// 0x01019aac: 0x1019aac: jal   0x104ea70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019aa4: 0x1019aa4: lw    ra, 348(sp)
-// 0x01019aa8: 0x1019aa8: lw    s8, 344(sp)
+// 0x01019ab4: 0x1019ab4: lw    ra, 348(sp)
+// 0x01019ab8: 0x1019ab8: lw    s8, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5103,7 +5103,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01019aac: 0x1019aac: lw    s7, 340(sp)
+// 0x01019abc: 0x1019abc: lw    s7, 340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5112,7 +5112,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01019ab0: 0x1019ab0: lw    s6, 336(sp)
+// 0x01019ac0: 0x1019ac0: lw    s6, 336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5121,7 +5121,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01019ab4: 0x1019ab4: lw    s5, 332(sp)
+// 0x01019ac4: 0x1019ac4: lw    s5, 332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5130,7 +5130,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01019ab8: 0x1019ab8: lw    s4, 328(sp)
+// 0x01019ac8: 0x1019ac8: lw    s4, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5139,7 +5139,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01019abc: 0x1019abc: lw    s3, 324(sp)
+// 0x01019acc: 0x1019acc: lw    s3, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5148,7 +5148,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01019ac0: 0x1019ac0: lw    s2, 320(sp)
+// 0x01019ad0: 0x1019ad0: lw    s2, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5157,7 +5157,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01019ac4: 0x1019ac4: lw    s1, 316(sp)
+// 0x01019ad4: 0x1019ad4: lw    s1, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5166,7 +5166,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01019ac8: 0x1019ac8: lw    s0, 312(sp)
+// 0x01019ad8: 0x1019ad8: lw    s0, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5175,7 +5175,7 @@ L_1019a9c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01019acc: 0x1019acc: jr    ra addiu sp, sp, 352
+// 0x01019adc: 0x1019adc: jr    ra addiu sp, sp, 352
 	ldloc.0
 	ldc.i4 352
 	add
@@ -5187,7 +5187,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_page_1019ad4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_page_1019ae4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -5231,24 +5231,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019ad4: 0x1019ad4: lui   v0, 0x30000
+// 0x01019ae4: 0x1019ae4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01019ad8: 0x1019ad8: lw    v0, 26524(v0)
+// 0x01019ae8: 0x1019ae8: lw    v0, 26988(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6631
+	ldc.i4 6747
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019adc: 0x1019adc: addiu sp, sp, -32
+// 0x01019aec: 0x1019aec: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01019ae0: 0x1019ae0: sw    s1, 20(sp)
+// 0x01019af0: 0x1019af0: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5257,8 +5257,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01019ae4: 0x1019ae4: sw    ra, 28(sp)
-// 0x01019ae8: 0x1019ae8: sw    s2, 24(sp)
+// 0x01019af4: 0x1019af4: sw    ra, 28(sp)
+// 0x01019af8: 0x1019af8: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5267,7 +5267,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01019aec: 0x1019aec: sw    s0, 16(sp)
+// 0x01019afc: 0x1019afc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5276,13 +5276,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01019af0: 0x1019af0: beq   v0, zero, 0x1019b00 addu  s1, a0, zero
+// 0x01019b00: 0x1019b00: beq   v0, zero, 0x1019b10 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_1019b00
+	brfalse L_1019b10
 // --- basic block ---
-// 0x01019af8: 0x1019af8: jal   0x1000930 addu  a0, v0, zero
+// 0x01019b08: 0x1019b08: jal   0x1000930 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5295,34 +5295,34 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_1019b00:
-// 0x01019b00: 0x1019b00: lui   s0, 0x0
+L_1019b10:
+// 0x01019b10: 0x1019b10: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01019b04: 0x1019b04: addiu s0, s0, 2480
+// 0x01019b14: 0x1019b14: addiu s0, s0, 2480
 	ldloc 7
 	ldc.i4 2480
 	add
 	stloc 7
-// 0x01019b08: 0x1019b08: bne   s1, zero, 0x1019b38 lui   s2, 0x30000
+// 0x01019b18: 0x1019b18: bne   s1, zero, 0x1019b48 lui   s2, 0x30000
 	ldloc 8
 	ldc.i4 196608
 	stloc 9
-	brtrue L_1019b38
+	brtrue L_1019b48
 // --- basic block ---
-// 0x01019b10: 0x1019b10: j	 0x1019b20 sw    zero, 26524(s2)
+// 0x01019b20: 0x1019b20: j	 0x1019b30 sw    zero, 26988(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 6631
+	ldc.i4 6747
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1019b20
+	br L_1019b30
 // --- basic block ---
-L_1019b18:
-// 0x01019b18: 0x1019b18: sw    zero, 20(s0)
+L_1019b28:
+// 0x01019b28: 0x1019b28: sw    zero, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5331,13 +5331,13 @@ L_1019b18:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01019b1c: 0x1019b1c: addiu s0, s0, 180
+// 0x01019b2c: 0x1019b2c: addiu s0, s0, 180
 	ldloc 7
 	ldc.i4 180
 	add
 	stloc 7
-L_1019b20:
-// 0x01019b20: 0x1019b20: lw    v0, 4(s0)
+L_1019b30:
+// 0x01019b30: 0x1019b30: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5346,16 +5346,16 @@ L_1019b20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019b24: 0x1019b24: sll   zero, zero, 0
-// 0x01019b28: 0x1019b28: bne   v0, zero, 0x1019b18 sll   zero, zero, 0
+// 0x01019b34: 0x1019b34: sll   zero, zero, 0
+// 0x01019b38: 0x1019b38: bne   v0, zero, 0x1019b28 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1019b18
+	brtrue L_1019b28
 // --- basic block ---
-// 0x01019b30: 0x1019b30: j	 0x1019b90 sll   zero, zero, 0
-	br L_1019b90
+// 0x01019b40: 0x1019b40: j	 0x1019ba0 sll   zero, zero, 0
+	br L_1019ba0
 // --- basic block ---
-L_1019b38:
-// 0x01019b38: 0x1019b38: jal   0x1001ba8 addu  a0, s1, zero
+L_1019b48:
+// 0x01019b48: 0x1019b48: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5368,50 +5368,50 @@ L_1019b38:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01019b40: 0x1019b40: sw    v0, 26524(s2)
+// 0x01019b50: 0x1019b50: sw    v0, 26988(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 6631
+	ldc.i4 6747
 	add
 	ldloc 5
 	stelem.i4
-// 0x01019b44: 0x1019b44: addu  s1, v0, zero
+// 0x01019b54: 0x1019b54: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01019b48: 0x1019b48: j	 0x1019b80 addiu s2, zero, 1
+// 0x01019b58: 0x1019b58: j	 0x1019b90 addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-	br L_1019b80
+	br L_1019b90
 // --- basic block ---
-L_1019b50:
-// 0x01019b50: 0x1019b50: lw    v0, 0(s0)
+L_1019b60:
+// 0x01019b60: 0x1019b60: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01019b54: 0x1019b54: sll   zero, zero, 0
-// 0x01019b58: 0x1019b58: beq   v0, zero, 0x1019b70 addu  a0, v0, zero
+// 0x01019b64: 0x1019b64: sll   zero, zero, 0
+// 0x01019b68: 0x1019b68: beq   v0, zero, 0x1019b80 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1019b70
+	brfalse L_1019b80
 // --- basic block ---
-// 0x01019b60: 0x1019b60: jal   0x1001b14 sll   zero, zero, 0
+// 0x01019b70: 0x1019b70: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01019b68: 0x1019b68: bne   v0, zero, 0x1019b78 sll   zero, zero, 0
+// 0x01019b78: 0x1019b78: bne   v0, zero, 0x1019b88 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1019b78
+	brtrue L_1019b88
 // --- basic block ---
-L_1019b70:
-// 0x01019b70: 0x1019b70: j	 0x1019b7c sw    s2, 20(s0)
+L_1019b80:
+// 0x01019b80: 0x1019b80: j	 0x1019b8c sw    s2, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5420,10 +5420,10 @@ L_1019b70:
 	add
 	ldloc 9
 	stelem.i4
-	br L_1019b7c
+	br L_1019b8c
 // --- basic block ---
-L_1019b78:
-// 0x01019b78: 0x1019b78: sw    zero, 20(s0)
+L_1019b88:
+// 0x01019b88: 0x1019b88: sw    zero, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5432,14 +5432,14 @@ L_1019b78:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1019b7c:
-// 0x01019b7c: 0x1019b7c: addiu s0, s0, 180
+L_1019b8c:
+// 0x01019b8c: 0x1019b8c: addiu s0, s0, 180
 	ldloc 7
 	ldc.i4 180
 	add
 	stloc 7
-L_1019b80:
-// 0x01019b80: 0x1019b80: lw    v0, 4(s0)
+L_1019b90:
+// 0x01019b90: 0x1019b90: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5448,16 +5448,16 @@ L_1019b80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019b84: 0x1019b84: sll   zero, zero, 0
-// 0x01019b88: 0x1019b88: bne   v0, zero, 0x1019b50 addu  a1, s1, zero
+// 0x01019b94: 0x1019b94: sll   zero, zero, 0
+// 0x01019b98: 0x1019b98: bne   v0, zero, 0x1019b60 addu  a1, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
-	brtrue L_1019b50
+	brtrue L_1019b60
 // --- basic block ---
-L_1019b90:
-// 0x01019b90: 0x1019b90: lw    ra, 28(sp)
-// 0x01019b94: 0x1019b94: lw    s2, 24(sp)
+L_1019ba0:
+// 0x01019ba0: 0x1019ba0: lw    ra, 28(sp)
+// 0x01019ba4: 0x1019ba4: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5466,7 +5466,7 @@ L_1019b90:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01019b98: 0x1019b98: lw    s1, 20(sp)
+// 0x01019ba8: 0x1019ba8: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5475,7 +5475,7 @@ L_1019b90:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01019b9c: 0x1019b9c: lw    s0, 16(sp)
+// 0x01019bac: 0x1019bac: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5484,7 +5484,7 @@ L_1019b90:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019ba0: 0x1019ba0: jr    ra addiu sp, sp, 32
+// 0x01019bb0: 0x1019bb0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5496,7 +5496,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_text_1019ba8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_text_1019bb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra)
@@ -5540,13 +5540,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019ba8: 0x1019ba8: addiu sp, sp, -1072
+// 0x01019bb8: 0x1019bb8: addiu sp, sp, -1072
 	ldloc.0
 	ldc.i4 -1072
 	add
 	stloc.0
-// 0x01019bac: 0x1019bac: sw    ra, 1068(sp)
-// 0x01019bb0: 0x1019bb0: sw    s0, 1056(sp)
+// 0x01019bbc: 0x1019bbc: sw    ra, 1068(sp)
+// 0x01019bc0: 0x1019bc0: sw    s0, 1056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5555,7 +5555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01019bb4: 0x1019bb4: sw    a2, 1080(sp)
+// 0x01019bc4: 0x1019bc4: sw    a2, 1080(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5564,7 +5564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01019bb8: 0x1019bb8: sw    a3, 1084(sp)
+// 0x01019bc8: 0x1019bc8: sw    a3, 1084(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5573,7 +5573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01019bbc: 0x1019bbc: sw    a1, 1048(sp)
+// 0x01019bcc: 0x1019bcc: sw    a1, 1048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5582,7 +5582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01019bc0: 0x1019bc0: sw    s2, 1064(sp)
+// 0x01019bd0: 0x1019bd0: sw    s2, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5591,7 +5591,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01019bc4: 0x1019bc4: jal   0x1019470 sw    s1, 1060(sp)
+// 0x01019bd4: 0x1019bd4: jal   0x1019480 sw    s1, 1060(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5605,12 +5605,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_search_sign_1019470(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_search_sign_1019480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019bcc: 0x1019bcc: lw    a1, 1048(sp)
+// 0x01019bdc: 0x1019bdc: lw    a1, 1048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5619,29 +5619,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019bd0: 0x1019bd0: addu  s0, v0, zero
+// 0x01019be0: 0x1019be0: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01019bd4: 0x1019bd4: addiu v0, sp, 1080
+// 0x01019be4: 0x1019be4: addiu v0, sp, 1080
 	ldloc.0
 	ldc.i4 1080
 	add
 	stloc 5
-// 0x01019bd8: 0x1019bd8: addu  a2, a1, zero
+// 0x01019be8: 0x1019be8: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01019bdc: 0x1019bdc: addiu a0, sp, 20
+// 0x01019bec: 0x1019bec: addiu a0, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.1
-// 0x01019be0: 0x1019be0: addu  a3, v0, zero
+// 0x01019bf0: 0x1019bf0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01019be4: 0x1019be4: addiu a1, zero, 1024
+// 0x01019bf4: 0x1019bf4: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x01019be8: 0x1019be8: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x01019bf8: 0x1019bf8: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5655,12 +5655,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019bf0: 0x1019bf0: lw    a0, 12(s0)
+// 0x01019c00: 0x1019c00: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5669,12 +5669,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01019bf4: 0x1019bf4: sll   zero, zero, 0
-// 0x01019bf8: 0x1019bf8: beq   a0, zero, 0x1019c08 sll   zero, zero, 0
+// 0x01019c04: 0x1019c04: sll   zero, zero, 0
+// 0x01019c08: 0x1019c08: beq   a0, zero, 0x1019c18 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1019c08
+	brfalse L_1019c18
 // --- basic block ---
-// 0x01019c00: 0x1019c00: jal   0x1000930 sll   zero, zero, 0
+// 0x01019c10: 0x1019c10: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5685,8 +5685,8 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1019c08:
-// 0x01019c08: 0x1019c08: jal   0x1001ba8 addiu a0, sp, 20
+L_1019c18:
+// 0x01019c18: 0x1019c18: jal   0x1001ba8 addiu a0, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
@@ -5701,10 +5701,10 @@ L_1019c08:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019c10: 0x1019c10: lui   s1, 0x0
+// 0x01019c20: 0x1019c20: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01019c14: 0x1019c14: sw    v0, 12(s0)
+// 0x01019c24: 0x1019c24: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5713,7 +5713,7 @@ L_1019c08:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01019c18: 0x1019c18: jal   0x100e788 addiu a0, s1, 4640
+// 0x01019c28: 0x1019c28: jal   0x100e798 addiu a0, s1, 4640
 	ldloc 10
 	ldc.i4 4640
 	add
@@ -5723,30 +5723,30 @@ L_1019c08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019c20: 0x1019c20: addiu v1, zero, -1
+// 0x01019c30: 0x1019c30: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01019c24: 0x1019c24: beq   v0, v1, 0x1019c44 addu  s2, zero, zero
+// 0x01019c34: 0x1019c34: beq   v0, v1, 0x1019c54 addu  s2, zero, zero
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc 9
-	beq  L_1019c44
+	beq  L_1019c54
 // --- basic block ---
-// 0x01019c2c: 0x1019c2c: cibyl_sysc_arg 0x12
+// 0x01019c3c: 0x1019c3c: cibyl_sysc_arg 0x12
 	ldloc 9
-// 0x01019c30: 0x1019c30: cibyl_sysc 0x340
+// 0x01019c40: 0x1019c40: cibyl_sysc 0x340
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01019c34: 0x1019c34: addu  s2, v0, zero
+// 0x01019c44: 0x1019c44: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01019c38: 0x1019c38: jal   0x100e788 addiu a0, s1, 4640
+// 0x01019c48: 0x1019c48: jal   0x100e798 addiu a0, s1, 4640
 	ldloc 10
 	ldc.i4 4640
 	add
@@ -5756,19 +5756,19 @@ L_1019c08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019c40: 0x1019c40: addu  v0, s2, v0
+// 0x01019c50: 0x1019c50: addu  v0, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-L_1019c44:
-// 0x01019c44: 0x1019c44: lw    ra, 1068(sp)
-// 0x01019c48: 0x1019c48: sw    v0, 32(s0)
+L_1019c54:
+// 0x01019c54: 0x1019c54: lw    ra, 1068(sp)
+// 0x01019c58: 0x1019c58: sw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5777,7 +5777,7 @@ L_1019c44:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01019c4c: 0x1019c4c: lw    s2, 1064(sp)
+// 0x01019c5c: 0x1019c5c: lw    s2, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5786,7 +5786,7 @@ L_1019c44:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01019c50: 0x1019c50: lw    s1, 1060(sp)
+// 0x01019c60: 0x1019c60: lw    s1, 1060(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5795,7 +5795,7 @@ L_1019c44:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01019c54: 0x1019c54: lw    s0, 1056(sp)
+// 0x01019c64: 0x1019c64: lw    s0, 1056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5804,7 +5804,7 @@ L_1019c44:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01019c58: 0x1019c58: jr    ra addiu sp, sp, 1072
+// 0x01019c68: 0x1019c68: jr    ra addiu sp, sp, 1072
 	ldloc.0
 	ldc.i4 1072
 	add
@@ -5816,7 +5816,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_activate_1019e40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_activate_1019e50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 s5,int32 s4,int32 s6,int32 s1,int32 s7,int32 ra)
@@ -5875,12 +5875,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01019e40: 0x1019e40: addiu sp, sp, -344
+// 0x01019e50: 0x1019e50: addiu sp, sp, -344
 	ldloc.0
 	ldc.i4 -344
 	add
 	stloc.0
-// 0x01019e44: 0x1019e44: sw    s6, 332(sp)
+// 0x01019e54: 0x1019e54: sw    s6, 332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5889,7 +5889,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01019e48: 0x1019e48: sw    s3, 320(sp)
+// 0x01019e58: 0x1019e58: sw    s3, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5898,7 +5898,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01019e4c: 0x1019e4c: sw    s2, 316(sp)
+// 0x01019e5c: 0x1019e5c: sw    s2, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5907,7 +5907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01019e50: 0x1019e50: sw    s1, 312(sp)
+// 0x01019e60: 0x1019e60: sw    s1, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5916,7 +5916,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01019e54: 0x1019e54: sw    s0, 308(sp)
+// 0x01019e64: 0x1019e64: sw    s0, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5925,8 +5925,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01019e58: 0x1019e58: sw    ra, 340(sp)
-// 0x01019e5c: 0x1019e5c: sw    s7, 336(sp)
+// 0x01019e68: 0x1019e68: sw    ra, 340(sp)
+// 0x01019e6c: 0x1019e6c: sw    s7, 336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5935,7 +5935,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01019e60: 0x1019e60: sw    s5, 328(sp)
+// 0x01019e70: 0x1019e70: sw    s5, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5944,7 +5944,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01019e64: 0x1019e64: sw    s4, 324(sp)
+// 0x01019e74: 0x1019e74: sw    s4, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5953,16 +5953,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01019e68: 0x1019e68: addu  s0, a1, zero
+// 0x01019e78: 0x1019e78: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01019e6c: 0x1019e6c: addu  s1, a2, zero
+// 0x01019e7c: 0x1019e7c: addu  s1, a2, zero
 	ldloc.3
 	stloc 14
-// 0x01019e70: 0x1019e70: addu  s3, a3, zero
+// 0x01019e80: 0x1019e80: addu  s3, a3, zero
 	ldloc 4
 	stloc 10
-// 0x01019e74: 0x1019e74: jal   0x1019470 addu  s6, a0, zero
+// 0x01019e84: 0x1019e84: jal   0x1019480 addu  s6, a0, zero
 	ldloc.1
 	stloc 13
 	ldloc.0
@@ -5970,18 +5970,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_search_sign_1019470(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_search_sign_1019480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019e7c: 0x1019e7c: beq   v0, zero, 0x101a140 addu  s2, v0, zero
+// 0x01019e8c: 0x1019e8c: beq   v0, zero, 0x101a150 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_101a140
+	brfalse L_101a150
 // --- basic block ---
-// 0x01019e84: 0x1019e84: lw    v0, 88(v0)
+// 0x01019e94: 0x1019e94: lw    v0, 88(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5990,14 +5990,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019e88: 0x1019e88: sll   zero, zero, 0
-// 0x01019e8c: 0x1019e8c: beq   v0, zero, 0x101a144 addiu v0, zero, -1
+// 0x01019e98: 0x1019e98: sll   zero, zero, 0
+// 0x01019e9c: 0x1019e9c: beq   v0, zero, 0x101a154 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_101a144
+	brfalse L_101a154
 // --- basic block ---
-// 0x01019e94: 0x1019e94: jal   0x100e348 addiu a0, s2, 88
+// 0x01019ea4: 0x1019ea4: jal   0x100e358 addiu a0, s2, 88
 	ldloc 8
 	ldc.i4.s 88
 	add
@@ -6007,18 +6007,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019e9c: 0x1019e9c: beq   s0, zero, 0x1019efc addu  s5, v0, zero
+// 0x01019eac: 0x1019eac: beq   s0, zero, 0x1019f0c addu  s5, v0, zero
 	ldloc 9
 	ldloc 5
 	stloc 11
-	brfalse L_1019efc
+	brfalse L_1019f0c
 // --- basic block ---
-// 0x01019ea4: 0x1019ea4: lw    v0, 68(s2)
+// 0x01019eb4: 0x1019eb4: lw    v0, 68(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6027,24 +6027,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019ea8: 0x1019ea8: lw    v1, 0(s0)
+// 0x01019eb8: 0x1019eb8: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01019eac: 0x1019eac: sll   zero, zero, 0
-// 0x01019eb0: 0x1019eb0: bne   v0, v1, 0x1019efc sll   zero, zero, 0
+// 0x01019ebc: 0x1019ebc: sll   zero, zero, 0
+// 0x01019ec0: 0x1019ec0: bne   v0, v1, 0x1019f0c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1019efc
+	bne.un L_1019f0c
 // --- basic block ---
-// 0x01019eb8: 0x1019eb8: bne   v0, zero, 0x1019ed4 sll   zero, zero, 0
+// 0x01019ec8: 0x1019ec8: bne   v0, zero, 0x1019ee4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1019ed4
+	brtrue L_1019ee4
 // --- basic block ---
-// 0x01019ec0: 0x1019ec0: lw    v1, 80(s2)
+// 0x01019ed0: 0x1019ed0: lw    v1, 80(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6053,7 +6053,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019ec4: 0x1019ec4: lw    v0, 12(s0)
+// 0x01019ed4: 0x1019ed4: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6062,14 +6062,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019ec8: 0x1019ec8: sll   zero, zero, 0
-// 0x01019ecc: 0x1019ecc: bne   v1, v0, 0x1019efc sll   zero, zero, 0
+// 0x01019ed8: 0x1019ed8: sll   zero, zero, 0
+// 0x01019edc: 0x1019edc: bne   v1, v0, 0x1019f0c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1019efc
+	bne.un L_1019f0c
 // --- basic block ---
-L_1019ed4:
-// 0x01019ed4: 0x1019ed4: lw    v1, 72(s2)
+L_1019ee4:
+// 0x01019ee4: 0x1019ee4: lw    v1, 72(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6078,7 +6078,7 @@ L_1019ed4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019ed8: 0x1019ed8: lw    v0, 4(s0)
+// 0x01019ee8: 0x1019ee8: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6087,13 +6087,13 @@ L_1019ed4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019edc: 0x1019edc: sll   zero, zero, 0
-// 0x01019ee0: 0x1019ee0: bne   v1, v0, 0x1019efc sll   zero, zero, 0
+// 0x01019eec: 0x1019eec: sll   zero, zero, 0
+// 0x01019ef0: 0x1019ef0: bne   v1, v0, 0x1019f0c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1019efc
+	bne.un L_1019f0c
 // --- basic block ---
-// 0x01019ee8: 0x1019ee8: lw    v1, 84(s2)
+// 0x01019ef8: 0x1019ef8: lw    v1, 84(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6102,7 +6102,7 @@ L_1019ed4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019eec: 0x1019eec: lw    v0, 16(s0)
+// 0x01019efc: 0x1019efc: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6111,19 +6111,19 @@ L_1019ed4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019ef0: 0x1019ef0: sll   zero, zero, 0
-// 0x01019ef4: 0x1019ef4: beq   v1, v0, 0x1019f90 addu  s4, zero, zero
+// 0x01019f00: 0x1019f00: sll   zero, zero, 0
+// 0x01019f04: 0x1019f04: beq   v1, v0, 0x1019fa0 addu  s4, zero, zero
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	beq  L_1019f90
+	beq  L_1019fa0
 // --- basic block ---
-L_1019efc:
-// 0x01019efc: 0x1019efc: addu  a0, s0, zero
+L_1019f0c:
+// 0x01019f0c: 0x1019f0c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01019f00: 0x1019f00: jal   0x101507c addu  a1, s3, zero
+// 0x01019f10: 0x1019f10: jal   0x101508c addu  a1, s3, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -6131,12 +6131,12 @@ L_1019efc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_101507c(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_101508c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019f08: 0x1019f08: lw    a0, 16(s2)
+// 0x01019f18: 0x1019f18: lw    a0, 16(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6145,12 +6145,12 @@ L_1019efc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01019f0c: 0x1019f0c: sll   zero, zero, 0
-// 0x01019f10: 0x1019f10: beq   a0, zero, 0x1019f20 sll   zero, zero, 0
+// 0x01019f1c: 0x1019f1c: sll   zero, zero, 0
+// 0x01019f20: 0x1019f20: beq   a0, zero, 0x1019f30 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1019f20
+	brfalse L_1019f30
 // --- basic block ---
-// 0x01019f18: 0x1019f18: jal   0x1000930 sll   zero, zero, 0
+// 0x01019f28: 0x1019f28: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6161,8 +6161,8 @@ L_1019efc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1019f20:
-// 0x01019f20: 0x1019f20: jal   0x10152bc addu  a0, s0, zero
+L_1019f30:
+// 0x01019f30: 0x1019f30: jal   0x10152cc addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6170,12 +6170,12 @@ L_1019f20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_street_full_name_10152bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_street_full_name_10152cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019f28: 0x1019f28: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01019f38: 0x1019f38: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6188,7 +6188,7 @@ L_1019f20:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019f30: 0x1019f30: sw    v0, 16(s2)
+// 0x01019f40: 0x1019f40: sw    v0, 16(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6197,15 +6197,15 @@ L_1019f20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01019f34: 0x1019f34: addiu a0, s2, 68
+// 0x01019f44: 0x1019f44: addiu a0, s2, 68
 	ldloc 8
 	ldc.i4.s 68
 	add
 	stloc.1
-// 0x01019f38: 0x1019f38: addu  a1, s0, zero
+// 0x01019f48: 0x1019f48: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x01019f3c: 0x1019f3c: jal   0x1001800 addiu a2, zero, 20
+// 0x01019f4c: 0x1019f4c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -6217,7 +6217,7 @@ L_1019f20:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019f44: 0x1019f44: sw    zero, 28(s2)
+// 0x01019f54: 0x1019f54: sw    zero, 28(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6226,14 +6226,14 @@ L_1019f20:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01019f48: 0x1019f48: lw    v0, 0(s3)
+// 0x01019f58: 0x1019f58: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01019f4c: 0x1019f4c: lw    v1, 156(s2)
+// 0x01019f5c: 0x1019f5c: lw    v1, 156(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6242,19 +6242,19 @@ L_1019f20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019f50: 0x1019f50: sll   zero, zero, 0
-// 0x01019f54: 0x1019f54: bne   v0, v1, 0x101a178 addiu s4, zero, 1
+// 0x01019f60: 0x1019f60: sll   zero, zero, 0
+// 0x01019f64: 0x1019f64: bne   v0, v1, 0x101a188 addiu s4, zero, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	stloc 12
-	bne.un L_101a178
+	bne.un L_101a188
 // --- basic block ---
-// 0x01019f5c: 0x1019f5c: bne   v0, zero, 0x1019f78 sll   zero, zero, 0
+// 0x01019f6c: 0x1019f6c: bne   v0, zero, 0x1019f88 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1019f78
+	brtrue L_1019f88
 // --- basic block ---
-// 0x01019f64: 0x1019f64: lw    v1, 4(s3)
+// 0x01019f74: 0x1019f74: lw    v1, 4(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6263,7 +6263,7 @@ L_1019f20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019f68: 0x1019f68: lw    v0, 160(s2)
+// 0x01019f78: 0x1019f78: lw    v0, 160(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6272,14 +6272,14 @@ L_1019f20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019f6c: 0x1019f6c: sll   zero, zero, 0
-// 0x01019f70: 0x1019f70: bne   v1, v0, 0x101a170 sll   zero, zero, 0
+// 0x01019f7c: 0x1019f7c: sll   zero, zero, 0
+// 0x01019f80: 0x1019f80: bne   v1, v0, 0x101a180 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_101a170
+	bne.un L_101a180
 // --- basic block ---
-L_1019f78:
-// 0x01019f78: 0x1019f78: lw    v1, 8(s3)
+L_1019f88:
+// 0x01019f88: 0x1019f88: lw    v1, 8(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6288,7 +6288,7 @@ L_1019f78:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01019f7c: 0x1019f7c: lw    v0, 164(s2)
+// 0x01019f8c: 0x1019f8c: lw    v0, 164(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6297,17 +6297,17 @@ L_1019f78:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01019f80: 0x1019f80: sll   zero, zero, 0
-// 0x01019f84: 0x1019f84: bne   v1, v0, 0x101a170 sll   zero, zero, 0
+// 0x01019f90: 0x1019f90: sll   zero, zero, 0
+// 0x01019f94: 0x1019f94: bne   v1, v0, 0x101a180 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_101a170
+	bne.un L_101a180
 // --- basic block ---
-// 0x01019f8c: 0x1019f8c: addu  s4, zero, zero
+// 0x01019f9c: 0x1019f9c: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-L_1019f90:
-// 0x01019f90: 0x1019f90: lw    a1, 16(s2)
+L_1019fa0:
+// 0x01019fa0: 0x1019fa0: lw    a1, 16(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6316,7 +6316,7 @@ L_1019f90:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019f94: 0x1019f94: jal   0x101aec4 addiu a0, zero, 70
+// 0x01019fa4: 0x1019fa4: jal   0x101aed4 addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
@@ -6324,18 +6324,18 @@ L_1019f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019f9c: 0x1019f9c: addu  a2, zero, zero
+// 0x01019fac: 0x1019fac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01019fa0: 0x1019fa0: addu  a0, s0, zero
+// 0x01019fb0: 0x1019fb0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01019fa4: 0x1019fa4: jal   0x1015174 addiu a1, sp, 16
+// 0x01019fb4: 0x1019fb4: jal   0x1015184 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6345,12 +6345,12 @@ L_1019f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019fac: 0x1019fac: lw    a1, 16(sp)
+// 0x01019fbc: 0x1019fbc: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6359,7 +6359,7 @@ L_1019f90:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019fb0: 0x1019fb0: jal   0x101aec4 addiu a0, zero, 35
+// 0x01019fc0: 0x1019fc0: jal   0x101aed4 addiu a0, zero, 35
 	ldc.i4.s 35
 	stloc.1
 	ldloc.0
@@ -6367,12 +6367,12 @@ L_1019f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019fb8: 0x1019fb8: lw    a1, 20(sp)
+// 0x01019fc8: 0x1019fc8: lw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6381,7 +6381,7 @@ L_1019f90:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019fbc: 0x1019fbc: jal   0x101aec4 addiu a0, zero, 78
+// 0x01019fcc: 0x1019fcc: jal   0x101aed4 addiu a0, zero, 78
 	ldc.i4.s 78
 	stloc.1
 	ldloc.0
@@ -6389,12 +6389,12 @@ L_1019f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019fc4: 0x1019fc4: lw    a1, 28(sp)
+// 0x01019fd4: 0x1019fd4: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6403,7 +6403,7 @@ L_1019f90:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019fc8: 0x1019fc8: jal   0x101aec4 addiu a0, zero, 67
+// 0x01019fd8: 0x1019fd8: jal   0x101aed4 addiu a0, zero, 67
 	ldc.i4.s 67
 	stloc.1
 	ldloc.0
@@ -6411,18 +6411,18 @@ L_1019f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019fd0: 0x1019fd0: lui   a1, 0x10000
+// 0x01019fe0: 0x1019fe0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01019fd4: 0x1019fd4: addu  a0, s6, zero
+// 0x01019fe4: 0x1019fe4: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x01019fd8: 0x1019fd8: jal   0x1001b14 addiu a1, a1, -31180
+// 0x01019fe8: 0x1019fe8: jal   0x1001b14 addiu a1, a1, -31180
 	ldloc.2
 	ldc.i4 -31180
 	add
@@ -6432,11 +6432,11 @@ L_1019f90:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01019fe0: 0x1019fe0: bne   v0, zero, 0x101a000 sll   zero, zero, 0
+// 0x01019ff0: 0x1019ff0: bne   v0, zero, 0x101a010 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101a000
+	brtrue L_101a010
 // --- basic block ---
-// 0x01019fe8: 0x1019fe8: lw    a1, 20(sp)
+// 0x01019ff8: 0x1019ff8: lw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6445,7 +6445,7 @@ L_1019f90:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019fec: 0x1019fec: jal   0x101aec4 addiu a0, zero, 89
+// 0x01019ffc: 0x1019ffc: jal   0x101aed4 addiu a0, zero, 89
 	ldc.i4.s 89
 	stloc.1
 	ldloc.0
@@ -6453,12 +6453,12 @@ L_1019f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01019ff4: 0x1019ff4: lw    a1, 28(sp)
+// 0x0101a004: 0x101a004: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6467,7 +6467,7 @@ L_1019f90:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01019ff8: 0x1019ff8: jal   0x101aec4 addiu a0, zero, 90
+// 0x0101a008: 0x101a008: jal   0x101aed4 addiu a0, zero, 90
 	ldc.i4.s 90
 	stloc.1
 	ldloc.0
@@ -6475,13 +6475,13 @@ L_1019f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101a000:
-// 0x0101a000: 0x101a000: jal   0x101cd60 addu  a0, s5, zero
+L_101a010:
+// 0x0101a010: 0x101a010: jal   0x101cd70 addu  a0, s5, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -6489,23 +6489,23 @@ L_101a000:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a008: 0x101a008: addiu s5, sp, 44
+// 0x0101a018: 0x101a018: addiu s5, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 11
-// 0x0101a00c: 0x101a00c: addu  a2, v0, zero
+// 0x0101a01c: 0x101a01c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101a010: 0x101a010: addu  a0, s5, zero
+// 0x0101a020: 0x101a020: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x0101a014: 0x101a014: jal   0x101afb8 addiu a1, zero, 256
+// 0x0101a024: 0x101a024: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -6513,16 +6513,16 @@ L_101a000:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a01c: 0x101a01c: bne   v0, zero, 0x101a030 sll   zero, zero, 0
+// 0x0101a02c: 0x101a02c: bne   v0, zero, 0x101a040 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101a030
+	brtrue L_101a040
 // --- basic block ---
-// 0x0101a024: 0x101a024: lw    v1, 156(s2)
+// 0x0101a034: 0x101a034: lw    v1, 156(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6531,17 +6531,17 @@ L_101a000:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a028: 0x101a028: j	 0x101a128 sw    v1, 0(s3)
+// 0x0101a038: 0x101a038: j	 0x101a138 sw    v1, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_101a128
+	br L_101a138
 // --- basic block ---
-L_101a030:
-// 0x0101a030: 0x101a030: lw    a0, 12(s2)
+L_101a040:
+// 0x0101a040: 0x101a040: lw    a0, 12(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6550,14 +6550,14 @@ L_101a030:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a034: 0x101a034: sll   zero, zero, 0
-// 0x0101a038: 0x101a038: beq   a0, zero, 0x101a04c addiu s6, zero, 1
+// 0x0101a044: 0x101a044: sll   zero, zero, 0
+// 0x0101a048: 0x101a048: beq   a0, zero, 0x101a05c addiu s6, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 13
-	brfalse L_101a04c
+	brfalse L_101a05c
 // --- basic block ---
-// 0x0101a040: 0x101a040: jal   0x1001b14 addu  a1, s5, zero
+// 0x0101a050: 0x101a050: jal   0x1001b14 addu  a1, s5, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -6565,16 +6565,16 @@ L_101a030:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101a048: 0x101a048: sltu  s6, zero, v0
+// 0x0101a058: 0x101a058: sltu  s6, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 13
-L_101a04c:
-// 0x0101a04c: 0x101a04c: lui   s5, 0x0
+L_101a05c:
+// 0x0101a05c: 0x101a05c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0101a050: 0x101a050: jal   0x100e788 addiu a0, s5, 4640
+// 0x0101a060: 0x101a060: jal   0x100e798 addiu a0, s5, 4640
 	ldloc 11
 	ldc.i4 4640
 	add
@@ -6584,30 +6584,30 @@ L_101a04c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a058: 0x101a058: addiu v1, zero, -1
+// 0x0101a068: 0x101a068: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0101a05c: 0x101a05c: beq   v0, v1, 0x101a07c addu  s7, zero, zero
+// 0x0101a06c: 0x101a06c: beq   v0, v1, 0x101a08c addu  s7, zero, zero
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc 15
-	beq  L_101a07c
+	beq  L_101a08c
 // --- basic block ---
-// 0x0101a064: 0x101a064: cibyl_sysc_arg 0x17
+// 0x0101a074: 0x101a074: cibyl_sysc_arg 0x17
 	ldloc 15
-// 0x0101a068: 0x101a068: cibyl_sysc 0x34f
+// 0x0101a078: 0x101a078: cibyl_sysc 0x34f
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0101a06c: 0x101a06c: addu  s7, v0, zero
+// 0x0101a07c: 0x101a07c: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x0101a070: 0x101a070: jal   0x100e788 addiu a0, s5, 4640
+// 0x0101a080: 0x101a080: jal   0x100e798 addiu a0, s5, 4640
 	ldloc 11
 	ldc.i4 4640
 	add
@@ -6617,18 +6617,18 @@ L_101a04c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a078: 0x101a078: addu  v0, s7, v0
+// 0x0101a088: 0x101a088: addu  v0, s7, v0
 	ldloc 15
 	ldloc 5
 	add
 	stloc 5
-L_101a07c:
-// 0x0101a07c: 0x101a07c: beq   s4, zero, 0x101a090 sw    v0, 32(s2)
+L_101a08c:
+// 0x0101a08c: 0x101a08c: beq   s4, zero, 0x101a0a0 sw    v0, 32(s2)
 	ldloc 12
 	ldloc 6
 	ldloc 8
@@ -6638,9 +6638,9 @@ L_101a07c:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_101a090
+	brfalse L_101a0a0
 // --- basic block ---
-// 0x0101a084: 0x101a084: lw    a0, 4(s2)
+// 0x0101a094: 0x101a094: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6649,19 +6649,19 @@ L_101a07c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a088: 0x101a088: jal   0x10ac53c sll   zero, zero, 0
-	call void Cibyl129::roadmap_voice_announce_10ac53c()
+// 0x0101a098: 0x101a098: jal   0x10acb84 sll   zero, zero, 0
+	call void Cibyl129::roadmap_voice_announce_10acb84()
 // --- basic block ---
-L_101a090:
-// 0x0101a090: 0x101a090: beq   s6, zero, 0x101a0d8 addiu a1, s2, 44
+L_101a0a0:
+// 0x0101a0a0: 0x101a0a0: beq   s6, zero, 0x101a0e8 addiu a1, s2, 44
 	ldloc 13
 	ldloc 8
 	ldc.i4.s 44
 	add
 	stloc.2
-	brfalse L_101a0d8
+	brfalse L_101a0e8
 // --- basic block ---
-// 0x0101a098: 0x101a098: lw    a0, 12(s2)
+// 0x0101a0a8: 0x101a0a8: lw    a0, 12(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6670,12 +6670,12 @@ L_101a090:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a09c: 0x101a09c: sll   zero, zero, 0
-// 0x0101a0a0: 0x101a0a0: beq   a0, zero, 0x101a0b0 sll   zero, zero, 0
+// 0x0101a0ac: 0x101a0ac: sll   zero, zero, 0
+// 0x0101a0b0: 0x101a0b0: beq   a0, zero, 0x101a0c0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101a0b0
+	brfalse L_101a0c0
 // --- basic block ---
-// 0x0101a0a8: 0x101a0a8: jal   0x1000930 sll   zero, zero, 0
+// 0x0101a0b8: 0x101a0b8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6686,32 +6686,32 @@ L_101a090:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101a0b0:
-// 0x0101a0b0: 0x101a0b0: lb    v0, 44(sp)
+L_101a0c0:
+// 0x0101a0c0: 0x101a0c0: lb    v0, 44(sp)
 	ldloc.0
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101a0b4: 0x101a0b4: sll   zero, zero, 0
-// 0x0101a0b8: 0x101a0b8: bne   v0, zero, 0x101a0c8 addiu a0, sp, 44
+// 0x0101a0c4: 0x101a0c4: sll   zero, zero, 0
+// 0x0101a0c8: 0x101a0c8: bne   v0, zero, 0x101a0d8 addiu a0, sp, 44
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-	brtrue L_101a0c8
+	brtrue L_101a0d8
 // --- basic block ---
-// 0x0101a0c0: 0x101a0c0: lui   a0, 0x10000
+// 0x0101a0d0: 0x101a0d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101a0c4: 0x101a0c4: addiu a0, a0, -31164
+// 0x0101a0d4: 0x101a0d4: addiu a0, a0, -31164
 	ldloc.1
 	ldc.i4 -31164
 	add
 	stloc.1
-L_101a0c8:
-// 0x0101a0c8: 0x101a0c8: jal   0x1001ba8 sll   zero, zero, 0
+L_101a0d8:
+// 0x0101a0d8: 0x101a0d8: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6722,7 +6722,7 @@ L_101a0c8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a0d0: 0x101a0d0: sw    v0, 12(s2)
+// 0x0101a0e0: 0x101a0e0: sw    v0, 12(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6731,13 +6731,13 @@ L_101a0c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a0d4: 0x101a0d4: addiu a1, s2, 44
+// 0x0101a0e4: 0x101a0e4: addiu a1, s2, 44
 	ldloc 8
 	ldc.i4.s 44
 	add
 	stloc.2
-L_101a0d8:
-// 0x0101a0d8: 0x101a0d8: jal   0x1014dd8 addu  a0, s0, zero
+L_101a0e8:
+// 0x0101a0e8: 0x101a0e8: jal   0x1014de8 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6745,15 +6745,15 @@ L_101a0d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a0e0: 0x101a0e0: addu  a0, s0, zero
+// 0x0101a0f0: 0x101a0f0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0101a0e4: 0x101a0e4: jal   0x1014ccc addiu a1, s2, 52
+// 0x0101a0f4: 0x101a0f4: jal   0x1014cdc addiu a1, s2, 52
 	ldloc 8
 	ldc.i4.s 52
 	add
@@ -6763,16 +6763,16 @@ L_101a0d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a0ec: 0x101a0ec: bne   s1, zero, 0x101a0fc sll   zero, zero, 0
+// 0x0101a0fc: 0x101a0fc: bne   s1, zero, 0x101a10c sll   zero, zero, 0
 	ldloc 14
-	brtrue L_101a0fc
+	brtrue L_101a10c
 // --- basic block ---
-// 0x0101a0f4: 0x101a0f4: j	 0x101a11c sw    zero, 24(s2)
+// 0x0101a104: 0x101a104: j	 0x101a12c sw    zero, 24(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6781,13 +6781,13 @@ L_101a0d8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_101a11c
+	br L_101a12c
 // --- basic block ---
-L_101a0fc:
-// 0x0101a0fc: 0x101a0fc: addiu v0, zero, 1
+L_101a10c:
+// 0x0101a10c: 0x101a10c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101a100: 0x101a100: sw    v0, 24(s2)
+// 0x0101a110: 0x101a110: sw    v0, 24(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6796,15 +6796,15 @@ L_101a0fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a104: 0x101a104: lw    v0, 0(s1)
+// 0x0101a114: 0x101a114: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101a108: 0x101a108: sll   zero, zero, 0
-// 0x0101a10c: 0x101a10c: sw    v0, 36(s2)
+// 0x0101a118: 0x101a118: sll   zero, zero, 0
+// 0x0101a11c: 0x101a11c: sw    v0, 36(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6813,7 +6813,7 @@ L_101a0fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a110: 0x101a110: lw    v0, 4(s1)
+// 0x0101a120: 0x101a120: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -6822,8 +6822,8 @@ L_101a0fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a114: 0x101a114: sll   zero, zero, 0
-// 0x0101a118: 0x101a118: sw    v0, 40(s2)
+// 0x0101a124: 0x101a124: sll   zero, zero, 0
+// 0x0101a128: 0x101a128: sw    v0, 40(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6832,8 +6832,8 @@ L_101a0fc:
 	add
 	ldloc 5
 	stelem.i4
-L_101a11c:
-// 0x0101a11c: 0x101a11c: lw    v1, 156(s2)
+L_101a12c:
+// 0x0101a12c: 0x101a12c: lw    v1, 156(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6842,18 +6842,18 @@ L_101a11c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a120: 0x101a120: addu  v0, zero, zero
+// 0x0101a130: 0x101a130: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0101a124: 0x101a124: sw    v1, 0(s3)
+// 0x0101a134: 0x101a134: sw    v1, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_101a128:
-// 0x0101a128: 0x101a128: lw    v1, 160(s2)
+L_101a138:
+// 0x0101a138: 0x101a138: lw    v1, 160(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6862,8 +6862,8 @@ L_101a128:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a12c: 0x101a12c: sll   zero, zero, 0
-// 0x0101a130: 0x101a130: sw    v1, 4(s3)
+// 0x0101a13c: 0x101a13c: sll   zero, zero, 0
+// 0x0101a140: 0x101a140: sw    v1, 4(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6872,7 +6872,7 @@ L_101a128:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101a134: 0x101a134: lw    v1, 164(s2)
+// 0x0101a144: 0x101a144: lw    v1, 164(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6881,7 +6881,7 @@ L_101a128:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a138: 0x101a138: j	 0x101a144 sw    v1, 8(s3)
+// 0x0101a148: 0x101a148: j	 0x101a154 sw    v1, 8(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6890,15 +6890,15 @@ L_101a128:
 	add
 	ldloc 7
 	stelem.i4
-	br L_101a144
+	br L_101a154
 // --- basic block ---
-L_101a140:
-// 0x0101a140: 0x101a140: addiu v0, zero, -1
+L_101a150:
+// 0x0101a150: 0x101a150: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_101a144:
-// 0x0101a144: 0x101a144: lw    ra, 340(sp)
-// 0x0101a148: 0x101a148: lw    s7, 336(sp)
+L_101a154:
+// 0x0101a154: 0x101a154: lw    ra, 340(sp)
+// 0x0101a158: 0x101a158: lw    s7, 336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6907,7 +6907,7 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101a14c: 0x101a14c: lw    s6, 332(sp)
+// 0x0101a15c: 0x101a15c: lw    s6, 332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6916,7 +6916,7 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101a150: 0x101a150: lw    s5, 328(sp)
+// 0x0101a160: 0x101a160: lw    s5, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6925,7 +6925,7 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101a154: 0x101a154: lw    s4, 324(sp)
+// 0x0101a164: 0x101a164: lw    s4, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6934,7 +6934,7 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101a158: 0x101a158: lw    s3, 320(sp)
+// 0x0101a168: 0x101a168: lw    s3, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6943,7 +6943,7 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101a15c: 0x101a15c: lw    s2, 316(sp)
+// 0x0101a16c: 0x101a16c: lw    s2, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6952,7 +6952,7 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101a160: 0x101a160: lw    s1, 312(sp)
+// 0x0101a170: 0x101a170: lw    s1, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6961,7 +6961,7 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101a164: 0x101a164: lw    s0, 308(sp)
+// 0x0101a174: 0x101a174: lw    s0, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6970,26 +6970,26 @@ L_101a144:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101a168: 0x101a168: jr    ra addiu sp, sp, 344
+// 0x0101a178: 0x101a178: jr    ra addiu sp, sp, 344
 	ldloc.0
 	ldc.i4 344
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_101a170:
-// 0x0101a170: 0x101a170: lw    v0, 0(s3)
+L_101a180:
+// 0x0101a180: 0x101a180: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101a174: 0x101a174: addiu s4, zero, 1
+// 0x0101a184: 0x101a184: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 12
-L_101a178:
-// 0x0101a178: 0x101a178: sw    v0, 156(s2)
+L_101a188:
+// 0x0101a188: 0x101a188: sw    v0, 156(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6998,7 +6998,7 @@ L_101a178:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a17c: 0x101a17c: lw    v0, 4(s3)
+// 0x0101a18c: 0x101a18c: lw    v0, 4(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7007,8 +7007,8 @@ L_101a178:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a180: 0x101a180: sll   zero, zero, 0
-// 0x0101a184: 0x101a184: sw    v0, 160(s2)
+// 0x0101a190: 0x101a190: sll   zero, zero, 0
+// 0x0101a194: 0x101a194: sw    v0, 160(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7017,7 +7017,7 @@ L_101a178:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a188: 0x101a188: lw    v0, 8(s3)
+// 0x0101a198: 0x101a198: lw    v0, 8(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7026,7 +7026,7 @@ L_101a178:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a18c: 0x101a18c: j	 0x1019f90 sw    v0, 164(s2)
+// 0x0101a19c: 0x101a19c: j	 0x1019fa0 sw    v0, 164(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7035,7 +7035,7 @@ L_101a178:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1019f90
+	br L_1019fa0
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl19.j b/converted/Cibyl19.j
index 891b2bd..83ae03f 100644
--- a/converted/Cibyl19.j
+++ b/converted/Cibyl19.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl19::.ctor
 
-.method public static int32 roadmap_display_sign_pop_up_101a194(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_sign_pop_up_101a1a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s7,int32 v1,int32 s0,int32 s2,int32 s1,int32 s6,int32 t0,int32 s3,int32 s4,int32 s5,int32 ra,int32 t1,int32 lo)
@@ -109,12 +109,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101a194: 0x101a194: addiu sp, sp, -120
+// 0x0101a1a4: 0x101a1a4: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x0101a198: 0x101a198: sw    s0, 84(sp)
+// 0x0101a1a8: 0x101a1a8: sw    s0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -123,14 +123,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101a19c: 0x101a19c: addu  s0, a0, zero
+// 0x0101a1ac: 0x101a1ac: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0101a1a0: 0x101a1a0: addu  a0, zero, zero
+// 0x0101a1b0: 0x101a1b0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0101a1a4: 0x101a1a4: sw    ra, 116(sp)
-// 0x0101a1a8: 0x101a1a8: sw    s5, 104(sp)
+// 0x0101a1b4: 0x101a1b4: sw    ra, 116(sp)
+// 0x0101a1b8: 0x101a1b8: sw    s5, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101a1ac: 0x101a1ac: sw    s4, 100(sp)
+// 0x0101a1bc: 0x101a1bc: sw    s4, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -148,7 +148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101a1b0: 0x101a1b0: sw    s3, 96(sp)
+// 0x0101a1c0: 0x101a1c0: sw    s3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -157,7 +157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101a1b4: 0x101a1b4: sw    s2, 92(sp)
+// 0x0101a1c4: 0x101a1c4: sw    s2, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -166,7 +166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101a1b8: 0x101a1b8: sw    s1, 88(sp)
+// 0x0101a1c8: 0x101a1c8: sw    s1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -175,7 +175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101a1bc: 0x101a1bc: sw    s7, 112(sp)
+// 0x0101a1cc: 0x101a1cc: sw    s7, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -184,7 +184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101a1c0: 0x101a1c0: jal   0x109a424 sw    s6, 108(sp)
+// 0x0101a1d0: 0x101a1d0: jal   0x109aa6c sw    s6, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -198,12 +198,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a1c8: 0x101a1c8: lw    a0, 12(s0)
+// 0x0101a1d8: 0x101a1d8: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -212,28 +212,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a1cc: 0x101a1cc: addu  s3, v0, zero
+// 0x0101a1dc: 0x101a1dc: addu  s3, v0, zero
 	ldloc 5
 	stloc 14
-// 0x0101a1d0: 0x101a1d0: addiu a1, zero, -1
+// 0x0101a1e0: 0x101a1e0: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0101a1d4: 0x101a1d4: addiu v0, sp, 40
+// 0x0101a1e4: 0x101a1e4: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x0101a1d8: 0x101a1d8: addiu a2, sp, 32
+// 0x0101a1e8: 0x101a1e8: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0101a1dc: 0x101a1dc: addiu a3, sp, 36
+// 0x0101a1ec: 0x101a1ec: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x0101a1e0: 0x101a1e0: sw    v0, 16(sp)
+// 0x0101a1f0: 0x101a1f0: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -242,7 +242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a1e4: 0x101a1e4: jal   0x104e968 sw    zero, 20(sp)
+// 0x0101a1f4: 0x101a1f4: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -256,24 +256,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a1ec: 0x101a1ec: lui   v0, 0xf0000
+// 0x0101a1fc: 0x101a1fc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0101a1f0: 0x101a1f0: lw    s2, -30068(v0)
+// 0x0101a200: 0x101a200: lw    s2, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101a1f4: 0x101a1f4: lw    s5, 36(sp)
+// 0x0101a204: 0x101a204: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -282,7 +282,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101a1f8: 0x101a1f8: lw    s4, 40(sp)
+// 0x0101a208: 0x101a208: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -291,7 +291,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101a1fc: 0x101a1fc: lw    v0, 12(s0)
+// 0x0101a20c: 0x101a20c: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -300,55 +300,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a200: 0x101a200: j	 0x101a20c addiu s1, zero, 1
+// 0x0101a210: 0x101a210: j	 0x101a21c addiu s1, zero, 1
 	ldc.i4.1
 	stloc 11
-	br L_101a20c
+	br L_101a21c
 // --- basic block ---
-L_101a208:
-// 0x0101a208: 0x101a208: addu  s1, s1, a0
+L_101a218:
+// 0x0101a218: 0x101a218: addu  s1, s1, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc 11
-L_101a20c:
-// 0x0101a20c: 0x101a20c: lb    v1, 0(v0)
+L_101a21c:
+// 0x0101a21c: 0x101a21c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0101a210: 0x101a210: addiu v0, v0, 1
+// 0x0101a220: 0x101a220: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0101a214: 0x101a214: xori  a0, v1, 10
+// 0x0101a224: 0x101a224: xori  a0, v1, 10
 	ldloc 8
 	ldc.i4.s 10
 	xor
 	stloc.1
-// 0x0101a218: 0x101a218: bne   v1, zero, 0x101a208 sltiu a0, a0, 1
+// 0x0101a228: 0x101a228: bne   v1, zero, 0x101a218 sltiu a0, a0, 1
 	ldloc 8
 	ldloc.1
 	ldc.i4.1
 	clt.un
 	stloc.1
-	brtrue L_101a208
+	brtrue L_101a218
 // --- basic block ---
-// 0x0101a220: 0x101a220: addiu v0, zero, 1
+// 0x0101a230: 0x101a230: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101a224: 0x101a224: bne   s1, v0, 0x101a230 addiu v0, zero, -1
+// 0x0101a234: 0x101a234: bne   s1, v0, 0x101a240 addiu v0, zero, -1
 	ldloc 11
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	bne.un L_101a230
+	bne.un L_101a240
 // --- basic block ---
-// 0x0101a22c: 0x101a22c: addiu s1, zero, 2
+// 0x0101a23c: 0x101a23c: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 11
-L_101a230:
-// 0x0101a230: 0x101a230: sw    v0, 32(s0)
+L_101a240:
+// 0x0101a240: 0x101a240: sw    v0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -357,10 +357,10 @@ L_101a230:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a234: 0x101a234: addiu v0, zero, 1
+// 0x0101a244: 0x101a244: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101a238: 0x101a238: jal   0x10423fc sw    v0, 52(sp)
+// 0x0101a248: 0x101a248: jal   0x104240c sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -369,25 +369,25 @@ L_101a230:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a240: 0x101a240: addiu v1, zero, 21
+// 0x0101a250: 0x101a250: addiu v1, zero, 21
 	ldc.i4.s 21
 	stloc 8
-// 0x0101a244: 0x101a244: mult  s1, v1
+// 0x0101a254: 0x101a254: mult  s1, v1
 	ldloc 11
 	ldloc 8
 	mul
 	stloc 19
-// 0x0101a248: 0x101a248: addiu v0, v0, 1
+// 0x0101a258: 0x101a258: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0101a24c: 0x101a24c: lw    a2, 172(s0)
+// 0x0101a25c: 0x101a25c: lw    a2, 172(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -396,7 +396,7 @@ L_101a230:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a250: 0x101a250: lw    a0, 168(s0)
+// 0x0101a260: 0x101a260: lw    a0, 168(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -405,7 +405,7 @@ L_101a230:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a254: 0x101a254: lw    a1, 176(s0)
+// 0x0101a264: 0x101a264: lw    a1, 176(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -414,17 +414,17 @@ L_101a230:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101a258: 0x101a258: addiu v1, s0, 36
+// 0x0101a268: 0x101a268: addiu v1, s0, 36
 	ldloc 9
 	ldc.i4.s 36
 	add
 	stloc 8
-// 0x0101a25c: 0x101a25c: addiu a3, sp, 60
+// 0x0101a26c: 0x101a26c: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x0101a260: 0x101a260: sw    s2, 60(sp)
+// 0x0101a270: 0x101a270: sw    s2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -433,7 +433,7 @@ L_101a230:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101a264: 0x101a264: sw    v1, 24(sp)
+// 0x0101a274: 0x101a274: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -442,7 +442,7 @@ L_101a230:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101a268: 0x101a268: sw    v0, 56(sp)
+// 0x0101a278: 0x101a278: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -451,15 +451,15 @@ L_101a230:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a26c: 0x101a26c: mflo  lo
+// 0x0101a27c: 0x101a27c: mflo  lo
 	ldloc 19
 	stloc 18
-// 0x0101a270: 0x101a270: addu  t0, t1, v0
+// 0x0101a280: 0x101a280: addu  t0, t1, v0
 	ldloc 18
 	ldloc 5
 	add
 	stloc 13
-// 0x0101a274: 0x101a274: sw    t0, 64(sp)
+// 0x0101a284: 0x101a284: sw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -468,12 +468,12 @@ L_101a230:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101a278: 0x101a278: addiu t0, sp, 52
+// 0x0101a288: 0x101a288: addiu t0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 13
-// 0x0101a27c: 0x101a27c: sw    t0, 16(sp)
+// 0x0101a28c: 0x101a28c: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -482,15 +482,15 @@ L_101a230:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101a280: 0x101a280: lui   t0, 0x10000
+// 0x0101a290: 0x101a290: lui   t0, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x0101a284: 0x101a284: addiu t0, t0, -31136
+// 0x0101a294: 0x101a294: addiu t0, t0, -31136
 	ldloc 13
 	ldc.i4 -31136
 	add
 	stloc 13
-// 0x0101a288: 0x101a288: jal   0x10453c8 sw    t0, 20(sp)
+// 0x0101a298: 0x101a298: jal   0x10453d8 sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -504,12 +504,12 @@ L_101a230:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_display_border_10453c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_display_border_10453d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a290: 0x101a290: lw    a2, 152(s0)
+// 0x0101a2a0: 0x101a2a0: lw    a2, 152(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -518,17 +518,17 @@ L_101a230:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a294: 0x101a294: sll   zero, zero, 0
-// 0x0101a298: 0x101a298: beq   a2, zero, 0x101a384 addu  s2, v0, zero
+// 0x0101a2a4: 0x101a2a4: sll   zero, zero, 0
+// 0x0101a2a8: 0x101a2a8: beq   a2, zero, 0x101a394 addu  s2, v0, zero
 	ldloc.3
 	ldloc 5
 	stloc 10
-	brfalse L_101a384
+	brfalse L_101a394
 // --- basic block ---
-// 0x0101a2a0: 0x101a2a0: addu  a0, zero, zero
+// 0x0101a2b0: 0x101a2b0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0101a2a4: 0x101a2a4: jal   0x10a1918 addiu a1, zero, 1
+// 0x0101a2b4: 0x101a2b4: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -536,18 +536,18 @@ L_101a230:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a2ac: 0x101a2ac: beq   v0, zero, 0x101a310 addu  s6, v0, zero
+// 0x0101a2bc: 0x101a2bc: beq   v0, zero, 0x101a320 addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
-	brfalse L_101a310
+	brfalse L_101a320
 // --- basic block ---
-// 0x0101a2b4: 0x101a2b4: jal   0x109a424 addu  a0, zero, zero
+// 0x0101a2c4: 0x101a2c4: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -555,12 +555,12 @@ L_101a230:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a2bc: 0x101a2bc: lw    s7, 52(sp)
+// 0x0101a2cc: 0x101a2cc: lw    s7, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -569,43 +569,43 @@ L_101a230:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a2c0: 0x101a2c0: beq   v0, zero, 0x101a2d0 addu  a0, s6, zero
+// 0x0101a2d0: 0x101a2d0: beq   v0, zero, 0x101a2e0 addu  a0, s6, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brfalse L_101a2d0
+	brfalse L_101a2e0
 // --- basic block ---
-// 0x0101a2c8: 0x101a2c8: j	 0x101a2e0 addiu s7, s7, 12
+// 0x0101a2d8: 0x101a2d8: j	 0x101a2f0 addiu s7, s7, 12
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 7
-	br L_101a2e0
+	br L_101a2f0
 // --- basic block ---
-L_101a2d0:
-// 0x0101a2d0: 0x101a2d0: addiu s7, s7, -12
+L_101a2e0:
+// 0x0101a2e0: 0x101a2e0: addiu s7, s7, -12
 	ldloc 7
 	ldc.i4.s -12
 	add
 	stloc 7
-// 0x0101a2d4: 0x101a2d4: jal   0x104dffc addu  s7, s7, s2
+// 0x0101a2e4: 0x101a2e4: jal   0x104e00c addu  s7, s7, s2
 	ldloc 7
 	ldloc 10
 	add
 	stloc 7
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a2dc: 0x101a2dc: subu  s7, s7, v0
+// 0x0101a2ec: 0x101a2ec: subu  s7, s7, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 7
-L_101a2e0:
-// 0x0101a2e0: 0x101a2e0: sw    s7, 68(sp)
+L_101a2f0:
+// 0x0101a2f0: 0x101a2f0: sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -614,7 +614,7 @@ L_101a2e0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101a2e4: 0x101a2e4: lw    s7, 64(sp)
+// 0x0101a2f4: 0x101a2f4: lw    s7, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -623,40 +623,40 @@ L_101a2e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a2e8: 0x101a2e8: jal   0x104e020 addu  a0, s6, zero
+// 0x0101a2f8: 0x101a2f8: jal   0x104e030 addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a2f0: 0x101a2f0: addiu s7, s7, -12
+// 0x0101a300: 0x101a300: addiu s7, s7, -12
 	ldloc 7
 	ldc.i4.s -12
 	add
 	stloc 7
-// 0x0101a2f4: 0x101a2f4: subu  v0, s7, v0
+// 0x0101a304: 0x101a304: subu  v0, s7, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x0101a2f8: 0x101a2f8: addu  a0, s6, zero
+// 0x0101a308: 0x101a308: addu  a0, s6, zero
 	ldloc 12
 	stloc.1
-// 0x0101a2fc: 0x101a2fc: addiu a1, sp, 68
+// 0x0101a30c: 0x101a30c: addiu a1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x0101a300: 0x101a300: addu  a2, zero, zero
+// 0x0101a310: 0x101a310: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101a304: 0x101a304: addu  a3, zero, zero
+// 0x0101a314: 0x101a314: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101a308: 0x101a308: jal   0x104f4a8 sw    v0, 72(sp)
+// 0x0101a318: 0x101a318: jal   0x104f4b8 sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -670,24 +670,24 @@ L_101a2e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101a310:
-// 0x0101a310: 0x101a310: lui   a2, 0x10000
+L_101a320:
+// 0x0101a320: 0x101a320: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101a314: 0x101a314: addiu a2, a2, -31128
+// 0x0101a324: 0x101a324: addiu a2, a2, -31128
 	ldloc.3
 	ldc.i4 -31128
 	add
 	stloc.3
-// 0x0101a318: 0x101a318: addu  a0, zero, zero
+// 0x0101a328: 0x101a328: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0101a31c: 0x101a31c: jal   0x10a1918 addiu a1, zero, 1
+// 0x0101a32c: 0x101a32c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -695,18 +695,18 @@ L_101a310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a324: 0x101a324: beq   v0, zero, 0x101a384 addu  s6, v0, zero
+// 0x0101a334: 0x101a334: beq   v0, zero, 0x101a394 addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
-	brfalse L_101a384
+	brfalse L_101a394
 // --- basic block ---
-// 0x0101a32c: 0x101a32c: lw    v0, 56(sp)
+// 0x0101a33c: 0x101a33c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -715,15 +715,15 @@ L_101a310:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a330: 0x101a330: addu  a0, zero, zero
+// 0x0101a340: 0x101a340: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0101a334: 0x101a334: addiu v0, v0, 4
+// 0x0101a344: 0x101a344: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x0101a338: 0x101a338: jal   0x109a424 sw    v0, 72(sp)
+// 0x0101a348: 0x101a348: jal   0x109aa6c sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -737,12 +737,12 @@ L_101a310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a340: 0x101a340: lw    s7, 52(sp)
+// 0x0101a350: 0x101a350: lw    s7, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -751,16 +751,16 @@ L_101a310:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a344: 0x101a344: beq   v0, zero, 0x101a358 sll   zero, zero, 0
+// 0x0101a354: 0x101a354: beq   v0, zero, 0x101a368 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101a358
+	brfalse L_101a368
 // --- basic block ---
-// 0x0101a34c: 0x101a34c: addiu s7, s7, 2
+// 0x0101a35c: 0x101a35c: addiu s7, s7, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x0101a350: 0x101a350: j	 0x101a370 sw    s7, 68(sp)
+// 0x0101a360: 0x101a360: j	 0x101a380 sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -769,34 +769,34 @@ L_101a310:
 	add
 	ldloc 7
 	stelem.i4
-	br L_101a370
+	br L_101a380
 // --- basic block ---
-L_101a358:
-// 0x0101a358: 0x101a358: addiu s7, s7, -12
+L_101a368:
+// 0x0101a368: 0x101a368: addiu s7, s7, -12
 	ldloc 7
 	ldc.i4.s -12
 	add
 	stloc 7
-// 0x0101a35c: 0x101a35c: jal   0x104dffc addu  a0, s6, zero
+// 0x0101a36c: 0x101a36c: jal   0x104e00c addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a364: 0x101a364: addu  s7, s7, s2
+// 0x0101a374: 0x101a374: addu  s7, s7, s2
 	ldloc 7
 	ldloc 10
 	add
 	stloc 7
-// 0x0101a368: 0x101a368: subu  v0, s7, v0
+// 0x0101a378: 0x101a378: subu  v0, s7, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x0101a36c: 0x101a36c: sw    v0, 68(sp)
+// 0x0101a37c: 0x101a37c: sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -805,19 +805,19 @@ L_101a358:
 	add
 	ldloc 5
 	stelem.i4
-L_101a370:
-// 0x0101a370: 0x101a370: addu  a0, s6, zero
+L_101a380:
+// 0x0101a380: 0x101a380: addu  a0, s6, zero
 	ldloc 12
 	stloc.1
-// 0x0101a374: 0x101a374: addiu a1, sp, 68
+// 0x0101a384: 0x101a384: addiu a1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x0101a378: 0x101a378: addu  a2, zero, zero
+// 0x0101a388: 0x101a388: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101a37c: 0x101a37c: jal   0x104f4a8 addu  a3, zero, zero
+// 0x0101a38c: 0x101a38c: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -825,13 +825,13 @@ L_101a370:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101a384:
-// 0x0101a384: 0x101a384: lw    a0, 64(s0)
+L_101a394:
+// 0x0101a394: 0x101a394: lw    a0, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -840,18 +840,18 @@ L_101a384:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a388: 0x101a388: jal   0x104e35c sll   zero, zero, 0
+// 0x0101a398: 0x101a398: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a390: 0x101a390: jal   0x109a424 addu  a0, zero, zero
+// 0x0101a3a0: 0x101a3a0: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -859,23 +859,23 @@ L_101a384:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a398: 0x101a398: beq   v0, zero, 0x101a3ac addiu v0, zero, 10
+// 0x0101a3a8: 0x101a3a8: beq   v0, zero, 0x101a3bc addiu v0, zero, 10
 	ldloc 5
 	ldc.i4.s 10
 	stloc 5
-	brfalse L_101a3ac
+	brfalse L_101a3bc
 // --- basic block ---
-// 0x0101a3a0: 0x101a3a0: addiu s2, s2, -10
+// 0x0101a3b0: 0x101a3b0: addiu s2, s2, -10
 	ldloc 10
 	ldc.i4.s -10
 	add
 	stloc 10
-// 0x0101a3a4: 0x101a3a4: j	 0x101a3b0 sw    s2, 44(sp)
+// 0x0101a3b4: 0x101a3b4: j	 0x101a3c0 sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -884,10 +884,10 @@ L_101a384:
 	add
 	ldloc 10
 	stelem.i4
-	br L_101a3b0
+	br L_101a3c0
 // --- basic block ---
-L_101a3ac:
-// 0x0101a3ac: 0x101a3ac: sw    v0, 44(sp)
+L_101a3bc:
+// 0x0101a3bc: 0x101a3bc: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -896,18 +896,18 @@ L_101a3ac:
 	add
 	ldloc 5
 	stelem.i4
-L_101a3b0:
-// 0x0101a3b0: 0x101a3b0: jal   0x10423fc addu  s4, s5, s4
+L_101a3c0:
+// 0x0101a3c0: 0x101a3c0: jal   0x104240c addu  s4, s5, s4
 	ldloc 16
 	ldloc 15
 	add
 	stloc 15
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a3b8: 0x101a3b8: lw    a0, 12(s0)
+// 0x0101a3c8: 0x101a3c8: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -916,30 +916,30 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a3bc: 0x101a3bc: addiu v0, v0, 9
+// 0x0101a3cc: 0x101a3cc: addiu v0, v0, 9
 	ldloc 5
 	ldc.i4.s 9
 	add
 	stloc 5
-// 0x0101a3c0: 0x101a3c0: sltu  s3, zero, s3
+// 0x0101a3d0: 0x101a3d0: sltu  s3, zero, s3
 	ldc.i4.s 0
 	ldloc 14
 	clt.un
 	stloc 14
-// 0x0101a3c4: 0x101a3c4: addu  a1, s1, zero
+// 0x0101a3d4: 0x101a3d4: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0101a3c8: 0x101a3c8: addiu a2, s4, 5
+// 0x0101a3d8: 0x101a3d8: addiu a2, s4, 5
 	ldloc 15
 	ldc.i4.5
 	add
 	stloc.3
-// 0x0101a3cc: 0x101a3cc: addiu a3, sp, 44
+// 0x0101a3dc: 0x101a3dc: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x0101a3d0: 0x101a3d0: sw    s3, 16(sp)
+// 0x0101a3e0: 0x101a3e0: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -948,7 +948,7 @@ L_101a3b0:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101a3d4: 0x101a3d4: jal   0x1019744 sw    v0, 48(sp)
+// 0x0101a3e4: 0x101a3e4: jal   0x1019754 sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -962,13 +962,13 @@ L_101a3b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_string_1019744(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_string_1019754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101a3dc: 0x101a3dc: lw    ra, 116(sp)
-// 0x0101a3e0: 0x101a3e0: lw    s7, 112(sp)
+// 0x0101a3ec: 0x101a3ec: lw    ra, 116(sp)
+// 0x0101a3f0: 0x101a3f0: lw    s7, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -977,7 +977,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a3e4: 0x101a3e4: lw    s6, 108(sp)
+// 0x0101a3f4: 0x101a3f4: lw    s6, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -986,7 +986,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101a3e8: 0x101a3e8: lw    s5, 104(sp)
+// 0x0101a3f8: 0x101a3f8: lw    s5, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -995,7 +995,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101a3ec: 0x101a3ec: lw    s4, 100(sp)
+// 0x0101a3fc: 0x101a3fc: lw    s4, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1004,7 +1004,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101a3f0: 0x101a3f0: lw    s3, 96(sp)
+// 0x0101a400: 0x101a400: lw    s3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1013,7 +1013,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101a3f4: 0x101a3f4: lw    s2, 92(sp)
+// 0x0101a404: 0x101a404: lw    s2, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1022,7 +1022,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101a3f8: 0x101a3f8: lw    s1, 88(sp)
+// 0x0101a408: 0x101a408: lw    s1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1031,7 +1031,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101a3fc: 0x101a3fc: lw    s0, 84(sp)
+// 0x0101a40c: 0x101a40c: lw    s0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1040,7 +1040,7 @@ L_101a3b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101a400: 0x101a400: jr    ra addiu sp, sp, 120
+// 0x0101a410: 0x101a410: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
@@ -1052,7 +1052,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_99_101a408(int32,int32,int32,int32,int32)
+.method public static int32 T_99_101a418(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 s3,int32 ra)
@@ -1099,12 +1099,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101a408: 0x101a408: addiu sp, sp, -360
+// 0x0101a418: 0x101a418: addiu sp, sp, -360
 	ldloc.0
 	ldc.i4 -360
 	add
 	stloc.0
-// 0x0101a40c: 0x101a40c: sw    s1, 344(sp)
+// 0x0101a41c: 0x101a41c: sw    s1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1113,7 +1113,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101a410: 0x101a410: sw    s0, 340(sp)
+// 0x0101a420: 0x101a420: sw    s0, 340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1122,7 +1122,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101a414: 0x101a414: sw    a1, 328(sp)
+// 0x0101a424: 0x101a424: sw    a1, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1131,8 +1131,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101a418: 0x101a418: sw    ra, 356(sp)
-// 0x0101a41c: 0x101a41c: sw    s3, 352(sp)
+// 0x0101a428: 0x101a428: sw    ra, 356(sp)
+// 0x0101a42c: 0x101a42c: sw    s3, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1141,7 +1141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101a420: 0x101a420: sw    s2, 348(sp)
+// 0x0101a430: 0x101a430: sw    s2, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1150,13 +1150,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101a424: 0x101a424: jal   0x101fa28 addu  s0, a0, zero
+// 0x0101a434: 0x101a434: jal   0x101fa38 addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0101a42c: 0x101a42c: lw    a1, 328(sp)
+// 0x0101a43c: 0x101a43c: lw    a1, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1165,34 +1165,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101a430: 0x101a430: beq   v0, zero, 0x101a43c addiu s1, zero, 13
+// 0x0101a440: 0x101a440: beq   v0, zero, 0x101a44c addiu s1, zero, 13
 	ldloc 5
 	ldc.i4.s 13
 	stloc 10
-	brfalse L_101a43c
+	brfalse L_101a44c
 // --- basic block ---
-// 0x0101a438: 0x101a438: addiu s1, zero, 10
+// 0x0101a448: 0x101a448: addiu s1, zero, 10
 	ldc.i4.s 10
 	stloc 10
-L_101a43c:
-// 0x0101a43c: 0x101a43c: addiu s2, sp, 72
+L_101a44c:
+// 0x0101a44c: 0x101a44c: addiu s2, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 8
-// 0x0101a440: 0x101a440: addu  a2, a1, zero
+// 0x0101a450: 0x101a450: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0101a444: 0x101a444: addiu v0, zero, 4
+// 0x0101a454: 0x101a454: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0101a448: 0x101a448: addu  a0, s2, zero
+// 0x0101a458: 0x101a458: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0101a44c: 0x101a44c: addiu a1, zero, 256
+// 0x0101a45c: 0x101a45c: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0101a450: 0x101a450: jal   0x101afb8 sw    v0, 24(sp)
+// 0x0101a460: 0x101a460: jal   0x101afc8 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1206,84 +1206,84 @@ L_101a43c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a458: 0x101a458: beq   v0, zero, 0x101a6a4 addiu v0, zero, 2
+// 0x0101a468: 0x101a468: beq   v0, zero, 0x101a6b4 addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brfalse L_101a6a4
+	brfalse L_101a6b4
 // --- basic block ---
-// 0x0101a460: 0x101a460: bne   s0, v0, 0x101a47c addu  a0, s2, zero
+// 0x0101a470: 0x101a470: bne   s0, v0, 0x101a48c addu  a0, s2, zero
 	ldloc 9
 	ldloc 5
 	ldloc 8
 	stloc.1
-	bne.un L_101a47c
+	bne.un L_101a48c
 // --- basic block ---
-// 0x0101a468: 0x101a468: addu  a1, s1, zero
+// 0x0101a478: 0x101a478: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0101a46c: 0x101a46c: addiu a2, sp, 28
+// 0x0101a47c: 0x101a47c: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x0101a470: 0x101a470: addiu a3, sp, 32
+// 0x0101a480: 0x101a480: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x0101a474: 0x101a474: j	 0x101a4a4 addiu v0, sp, 36
+// 0x0101a484: 0x101a484: j	 0x101a4b4 addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-	br L_101a4a4
+	br L_101a4b4
 // --- basic block ---
-L_101a47c:
-// 0x0101a47c: 0x101a47c: addiu v1, zero, 1
+L_101a48c:
+// 0x0101a48c: 0x101a48c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0101a480: 0x101a480: addiu a2, sp, 28
+// 0x0101a490: 0x101a490: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x0101a484: 0x101a484: addiu a3, sp, 32
+// 0x0101a494: 0x101a494: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x0101a488: 0x101a488: bne   s0, v1, 0x101a49c addiu v0, sp, 36
+// 0x0101a498: 0x101a498: bne   s0, v1, 0x101a4ac addiu v0, sp, 36
 	ldloc 9
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-	bne.un L_101a49c
+	bne.un L_101a4ac
 // --- basic block ---
-// 0x0101a490: 0x101a490: addu  a0, s2, zero
+// 0x0101a4a0: 0x101a4a0: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0101a494: 0x101a494: j	 0x101a4a4 addiu a1, zero, 12
+// 0x0101a4a4: 0x101a4a4: j	 0x101a4b4 addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.2
-	br L_101a4a4
+	br L_101a4b4
 // --- basic block ---
-L_101a49c:
-// 0x0101a49c: 0x101a49c: addu  a0, s2, zero
+L_101a4ac:
+// 0x0101a4ac: 0x101a4ac: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0101a4a0: 0x101a4a0: addiu a1, zero, 16
+// 0x0101a4b0: 0x101a4b0: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-L_101a4a4:
-// 0x0101a4a4: 0x101a4a4: sw    v0, 16(sp)
+L_101a4b4:
+// 0x0101a4b4: 0x101a4b4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1292,7 +1292,7 @@ L_101a4a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a4a8: 0x101a4a8: jal   0x104e968 sw    zero, 20(sp)
+// 0x0101a4b8: 0x101a4b8: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1306,19 +1306,19 @@ L_101a4a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a4b0: 0x101a4b0: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0101a4c0: 0x101a4c0: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0101a4b8: 0x101a4b8: addiu a0, zero, 1
+// 0x0101a4c8: 0x101a4c8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101a4bc: 0x101a4bc: lw    v1, 28(sp)
+// 0x0101a4cc: 0x101a4cc: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1327,63 +1327,63 @@ L_101a4a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a4c0: 0x101a4c0: bne   s0, a0, 0x101a4dc lui   v0, 0xf0000
+// 0x0101a4d0: 0x101a4d0: bne   s0, a0, 0x101a4ec lui   v0, 0xf0000
 	ldloc 9
 	ldloc.1
 	ldc.i4 983040
 	stloc 5
-	bne.un L_101a4dc
+	bne.un L_101a4ec
 // --- basic block ---
-// 0x0101a4c8: 0x101a4c8: lw    v0, -30068(v0)
+// 0x0101a4d8: 0x101a4d8: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a4cc: 0x101a4cc: sll   zero, zero, 0
-// 0x0101a4d0: 0x101a4d0: addiu a0, v0, -4
+// 0x0101a4dc: 0x101a4dc: sll   zero, zero, 0
+// 0x0101a4e0: 0x101a4e0: addiu a0, v0, -4
 	ldloc 5
 	ldc.i4.s -4
 	add
 	stloc.1
-// 0x0101a4d4: 0x101a4d4: j	 0x101a4f0 subu  v1, a0, v1
+// 0x0101a4e4: 0x101a4e4: j	 0x101a500 subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-	br L_101a4f0
+	br L_101a500
 // --- basic block ---
-L_101a4dc:
-// 0x0101a4dc: 0x101a4dc: lw    v0, -30068(v0)
+L_101a4ec:
+// 0x0101a4ec: 0x101a4ec: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a4e0: 0x101a4e0: sll   zero, zero, 0
-// 0x0101a4e4: 0x101a4e4: addiu v0, v0, -1
+// 0x0101a4f0: 0x101a4f0: sll   zero, zero, 0
+// 0x0101a4f4: 0x101a4f4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0101a4e8: 0x101a4e8: subu  v1, v0, v1
+// 0x0101a4f8: 0x101a4f8: subu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 7
-// 0x0101a4ec: 0x101a4ec: addiu v1, v1, -6
+// 0x0101a4fc: 0x101a4fc: addiu v1, v1, -6
 	ldloc 7
 	ldc.i4.s -6
 	add
 	stloc 7
-L_101a4f0:
-// 0x0101a4f0: 0x101a4f0: sw    v1, 40(sp)
+L_101a500:
+// 0x0101a500: 0x101a500: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1392,7 +1392,7 @@ L_101a4f0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101a4f4: 0x101a4f4: lw    v1, 40(sp)
+// 0x0101a504: 0x101a504: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1401,7 +1401,7 @@ L_101a4f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a4f8: 0x101a4f8: sw    v0, 56(sp)
+// 0x0101a508: 0x101a508: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1410,7 +1410,7 @@ L_101a4f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a4fc: 0x101a4fc: sw    v1, 48(sp)
+// 0x0101a50c: 0x101a50c: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1419,12 +1419,12 @@ L_101a4f0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101a500: 0x101a500: addiu v0, s0, -1
+// 0x0101a510: 0x101a510: addiu v0, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0101a504: 0x101a504: lw    v1, 56(sp)
+// 0x0101a514: 0x101a514: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1433,12 +1433,12 @@ L_101a4f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a508: 0x101a508: sltiu v0, v0, 2
+// 0x0101a518: 0x101a518: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x0101a50c: 0x101a50c: beq   v0, zero, 0x101a540 sw    v1, 64(sp)
+// 0x0101a51c: 0x101a51c: beq   v0, zero, 0x101a550 sw    v1, 64(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1448,26 +1448,26 @@ L_101a4f0:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_101a540
+	brfalse L_101a550
 // --- basic block ---
-// 0x0101a514: 0x101a514: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+// 0x0101a524: 0x101a524: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a51c: 0x101a51c: jal   0x10163d0 addu  s3, v0, zero
+// 0x0101a52c: 0x101a52c: jal   0x10163e0 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-	call int32 Cibyl16::roadmap_ticker_height_10163d0()
+	call int32 Cibyl16::roadmap_ticker_height_10163e0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a524: 0x101a524: addu  s2, v0, zero
+// 0x0101a534: 0x101a534: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0101a528: 0x101a528: jal   0x1053710 addu  s2, s3, s2
+// 0x0101a538: 0x101a538: jal   0x1053720 addu  s2, s3, s2
 	ldloc 11
 	ldloc 8
 	add
@@ -1477,22 +1477,22 @@ L_101a4f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_height_1053710(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_height_1053720(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a530: 0x101a530: addiu s2, s2, 1
+// 0x0101a540: 0x101a540: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0101a534: 0x101a534: addu  s2, s2, v0
+// 0x0101a544: 0x101a544: addu  s2, s2, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0101a538: 0x101a538: j	 0x101a548 sw    s2, 44(sp)
+// 0x0101a548: 0x101a548: j	 0x101a558 sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1501,13 +1501,13 @@ L_101a4f0:
 	add
 	ldloc 8
 	stelem.i4
-	br L_101a548
+	br L_101a558
 // --- basic block ---
-L_101a540:
-// 0x0101a540: 0x101a540: addiu v0, zero, 40
+L_101a550:
+// 0x0101a550: 0x101a550: addiu v0, zero, 40
 	ldc.i4.s 40
 	stloc 5
-// 0x0101a544: 0x101a544: sw    v0, 44(sp)
+// 0x0101a554: 0x101a554: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1516,8 +1516,8 @@ L_101a540:
 	add
 	ldloc 5
 	stelem.i4
-L_101a548:
-// 0x0101a548: 0x101a548: lw    v0, 36(sp)
+L_101a558:
+// 0x0101a558: 0x101a558: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1526,7 +1526,7 @@ L_101a548:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a54c: 0x101a54c: lw    a0, 32(sp)
+// 0x0101a55c: 0x101a55c: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1535,7 +1535,7 @@ L_101a548:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a550: 0x101a550: lw    v1, 44(sp)
+// 0x0101a560: 0x101a560: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1544,22 +1544,22 @@ L_101a548:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a554: 0x101a554: addu  v0, a0, v0
+// 0x0101a564: 0x101a564: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0101a558: 0x101a558: addiu v0, v0, 6
+// 0x0101a568: 0x101a568: addiu v0, v0, 6
 	ldloc 5
 	ldc.i4.6
 	add
 	stloc 5
-// 0x0101a55c: 0x101a55c: addu  v0, v0, v1
+// 0x0101a56c: 0x101a56c: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0101a560: 0x101a560: sw    v0, 60(sp)
+// 0x0101a570: 0x101a570: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1568,7 +1568,7 @@ L_101a548:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a564: 0x101a564: sw    v1, 68(sp)
+// 0x0101a574: 0x101a574: sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1577,7 +1577,7 @@ L_101a548:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101a568: 0x101a568: sw    v0, 52(sp)
+// 0x0101a578: 0x101a578: sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1586,13 +1586,13 @@ L_101a548:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a56c: 0x101a56c: addiu v1, zero, 4
+// 0x0101a57c: 0x101a57c: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 7
-// 0x0101a570: 0x101a570: addiu v0, zero, 2
+// 0x0101a580: 0x101a580: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0101a574: 0x101a574: bne   s0, v0, 0x101a59c sw    v1, 24(sp)
+// 0x0101a584: 0x101a584: bne   s0, v0, 0x101a5ac sw    v1, 24(sp)
 	ldloc 9
 	ldloc 5
 	ldloc 6
@@ -1603,32 +1603,32 @@ L_101a548:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_101a59c
+	bne.un L_101a5ac
 // --- basic block ---
-// 0x0101a57c: 0x101a57c: lui   v0, 0x30000
+// 0x0101a58c: 0x101a58c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101a580: 0x101a580: lw    a0, 26548(v0)
+// 0x0101a590: 0x101a590: lw    a0, 27012(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6637
+	ldc.i4 6753
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a584: 0x101a584: jal   0x104e35c sll   zero, zero, 0
+// 0x0101a594: 0x101a594: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a58c: 0x101a58c: jal   0x104e410 addiu a0, zero, 181
+// 0x0101a59c: 0x101a59c: jal   0x104e420 addiu a0, zero, 181
 	ldc.i4 181
 	stloc.1
 	ldloc.0
@@ -1636,82 +1636,82 @@ L_101a548:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a594: 0x101a594: j	 0x101a5c8 addiu a0, zero, 1
+// 0x0101a5a4: 0x101a5a4: j	 0x101a5d8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-	br L_101a5c8
+	br L_101a5d8
 // --- basic block ---
-L_101a59c:
-// 0x0101a59c: 0x101a59c: addiu v0, zero, 1
+L_101a5ac:
+// 0x0101a5ac: 0x101a5ac: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101a5a0: 0x101a5a0: bne   s0, v0, 0x101a5b4 lui   v0, 0x30000
+// 0x0101a5b0: 0x101a5b0: bne   s0, v0, 0x101a5c4 lui   v0, 0x30000
 	ldloc 9
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	bne.un L_101a5b4
+	bne.un L_101a5c4
 // --- basic block ---
-// 0x0101a5a8: 0x101a5a8: lw    a0, 26540(v0)
+// 0x0101a5b8: 0x101a5b8: lw    a0, 27004(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6635
+	ldc.i4 6751
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a5ac: 0x101a5ac: j	 0x101a5bc sll   zero, zero, 0
-	br L_101a5bc
+// 0x0101a5bc: 0x101a5bc: j	 0x101a5cc sll   zero, zero, 0
+	br L_101a5cc
 // --- basic block ---
-L_101a5b4:
-// 0x0101a5b4: 0x101a5b4: lui   v0, 0x30000
+L_101a5c4:
+// 0x0101a5c4: 0x101a5c4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101a5b8: 0x101a5b8: lw    a0, 26532(v0)
+// 0x0101a5c8: 0x101a5c8: lw    a0, 26996(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6633
+	ldc.i4 6749
 	add
 	ldelem.i4
 	stloc.1
-L_101a5bc:
-// 0x0101a5bc: 0x101a5bc: jal   0x104e35c sll   zero, zero, 0
+L_101a5cc:
+// 0x0101a5cc: 0x101a5cc: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a5c4: 0x101a5c4: addiu a0, zero, 1
+// 0x0101a5d4: 0x101a5d4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_101a5c8:
-// 0x0101a5c8: 0x101a5c8: addiu a1, sp, 24
+L_101a5d8:
+// 0x0101a5d8: 0x101a5d8: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0101a5cc: 0x101a5cc: addiu a2, sp, 40
+// 0x0101a5dc: 0x101a5dc: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x0101a5d0: 0x101a5d0: addiu a3, zero, 1
+// 0x0101a5e0: 0x101a5e0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0101a5d4: 0x101a5d4: jal   0x104ef80 sw    zero, 16(sp)
+// 0x0101a5e4: 0x101a5e4: jal   0x104ef90 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1725,109 +1725,109 @@ L_101a5c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a5dc: 0x101a5dc: addiu v0, zero, 2
+// 0x0101a5ec: 0x101a5ec: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0101a5e0: 0x101a5e0: bne   s0, v0, 0x101a5fc lui   v0, 0x30000
+// 0x0101a5f0: 0x101a5f0: bne   s0, v0, 0x101a60c lui   v0, 0x30000
 	ldloc 9
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	bne.un L_101a5fc
+	bne.un L_101a60c
 // --- basic block ---
-// 0x0101a5e8: 0x101a5e8: lw    a0, 26552(v0)
+// 0x0101a5f8: 0x101a5f8: lw    a0, 27016(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6638
+	ldc.i4 6754
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a5ec: 0x101a5ec: jal   0x104e35c sll   zero, zero, 0
+// 0x0101a5fc: 0x101a5fc: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a5f4: 0x101a5f4: j	 0x101a63c sll   zero, zero, 0
-	br L_101a63c
+// 0x0101a604: 0x101a604: j	 0x101a64c sll   zero, zero, 0
+	br L_101a64c
 // --- basic block ---
-L_101a5fc:
-// 0x0101a5fc: 0x101a5fc: addiu v0, zero, 1
+L_101a60c:
+// 0x0101a60c: 0x101a60c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101a600: 0x101a600: bne   s0, v0, 0x101a614 lui   v0, 0x30000
+// 0x0101a610: 0x101a610: bne   s0, v0, 0x101a624 lui   v0, 0x30000
 	ldloc 9
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	bne.un L_101a614
+	bne.un L_101a624
 // --- basic block ---
-// 0x0101a608: 0x101a608: lw    a0, 26544(v0)
+// 0x0101a618: 0x101a618: lw    a0, 27008(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6636
+	ldc.i4 6752
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a60c: 0x101a60c: j	 0x101a61c sll   zero, zero, 0
-	br L_101a61c
+// 0x0101a61c: 0x101a61c: j	 0x101a62c sll   zero, zero, 0
+	br L_101a62c
 // --- basic block ---
-L_101a614:
-// 0x0101a614: 0x101a614: lui   v0, 0x30000
+L_101a624:
+// 0x0101a624: 0x101a624: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101a618: 0x101a618: lw    a0, 26536(v0)
+// 0x0101a628: 0x101a628: lw    a0, 27000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6634
+	ldc.i4 6750
 	add
 	ldelem.i4
 	stloc.1
-L_101a61c:
-// 0x0101a61c: 0x101a61c: jal   0x104e35c sll   zero, zero, 0
+L_101a62c:
+// 0x0101a62c: 0x101a62c: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a624: 0x101a624: addiu a0, zero, 1
+// 0x0101a634: 0x101a634: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101a628: 0x101a628: addiu a1, sp, 24
+// 0x0101a638: 0x101a638: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0101a62c: 0x101a62c: addiu a2, sp, 40
+// 0x0101a63c: 0x101a63c: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x0101a630: 0x101a630: addu  a3, zero, zero
+// 0x0101a640: 0x101a640: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101a634: 0x101a634: jal   0x104ef80 sw    zero, 16(sp)
+// 0x0101a644: 0x101a644: jal   0x104ef90 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1841,13 +1841,13 @@ L_101a61c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101a63c:
-// 0x0101a63c: 0x101a63c: lw    v0, 68(sp)
+L_101a64c:
+// 0x0101a64c: 0x101a64c: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1856,7 +1856,7 @@ L_101a63c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101a640: 0x101a640: lw    v1, 64(sp)
+// 0x0101a650: 0x101a650: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1865,17 +1865,17 @@ L_101a63c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a644: 0x101a644: addiu v0, v0, 1
+// 0x0101a654: 0x101a654: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0101a648: 0x101a648: addiu v1, v1, -3
+// 0x0101a658: 0x101a658: addiu v1, v1, -3
 	ldloc 7
 	ldc.i4.s -3
 	add
 	stloc 7
-// 0x0101a64c: 0x101a64c: sw    v0, 44(sp)
+// 0x0101a65c: 0x101a65c: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1884,10 +1884,10 @@ L_101a63c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101a650: 0x101a650: addiu v0, zero, 2
+// 0x0101a660: 0x101a660: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0101a654: 0x101a654: bne   s0, v0, 0x101a670 sw    v1, 40(sp)
+// 0x0101a664: 0x101a664: bne   s0, v0, 0x101a680 sw    v1, 40(sp)
 	ldloc 9
 	ldloc 5
 	ldloc 6
@@ -1898,70 +1898,70 @@ L_101a63c:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_101a670
+	bne.un L_101a680
 // --- basic block ---
-// 0x0101a65c: 0x101a65c: addu  a2, s1, zero
+// 0x0101a66c: 0x101a66c: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x0101a660: 0x101a660: addiu a0, sp, 40
+// 0x0101a670: 0x101a670: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0101a664: 0x101a664: addiu a1, zero, 1
+// 0x0101a674: 0x101a674: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0101a668: 0x101a668: j	 0x101a68c addiu a3, sp, 72
+// 0x0101a678: 0x101a678: j	 0x101a69c addiu a3, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 4
-	br L_101a68c
+	br L_101a69c
 // --- basic block ---
-L_101a670:
-// 0x0101a670: 0x101a670: addiu v0, zero, 1
+L_101a680:
+// 0x0101a680: 0x101a680: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101a674: 0x101a674: addiu a2, sp, 72
+// 0x0101a684: 0x101a684: addiu a2, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.3
-// 0x0101a678: 0x101a678: bne   s0, v0, 0x101a69c addiu a0, sp, 40
+// 0x0101a688: 0x101a688: bne   s0, v0, 0x101a6ac addiu a0, sp, 40
 	ldloc 9
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	bne.un L_101a69c
+	bne.un L_101a6ac
 // --- basic block ---
-// 0x0101a680: 0x101a680: addu  a3, a2, zero
+// 0x0101a690: 0x101a690: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x0101a684: 0x101a684: addiu a1, zero, 1
+// 0x0101a694: 0x101a694: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0101a688: 0x101a688: addiu a2, zero, 12
+// 0x0101a698: 0x101a698: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-L_101a68c:
-// 0x0101a68c: 0x101a68c: jal   0x104ea60 sll   zero, zero, 0
+L_101a69c:
+// 0x0101a69c: 0x101a69c: jal   0x104ea70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101a694: 0x101a694: j	 0x101a6a4 sll   zero, zero, 0
-	br L_101a6a4
+// 0x0101a6a4: 0x101a6a4: j	 0x101a6b4 sll   zero, zero, 0
+	br L_101a6b4
 // --- basic block ---
-L_101a69c:
-// 0x0101a69c: 0x101a69c: jal   0x104ebfc addiu a1, zero, 1
+L_101a6ac:
+// 0x0101a6ac: 0x101a6ac: jal   0x104ec0c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1969,14 +1969,14 @@ L_101a69c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_104ebfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_104ec0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101a6a4:
-// 0x0101a6a4: 0x101a6a4: lw    ra, 356(sp)
-// 0x0101a6a8: 0x101a6a8: lw    s3, 352(sp)
+L_101a6b4:
+// 0x0101a6b4: 0x101a6b4: lw    ra, 356(sp)
+// 0x0101a6b8: 0x101a6b8: lw    s3, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1985,7 +1985,7 @@ L_101a6a4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101a6ac: 0x101a6ac: lw    s2, 348(sp)
+// 0x0101a6bc: 0x101a6bc: lw    s2, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1994,7 +1994,7 @@ L_101a6a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101a6b0: 0x101a6b0: lw    s1, 344(sp)
+// 0x0101a6c0: 0x101a6c0: lw    s1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2003,7 +2003,7 @@ L_101a6a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101a6b4: 0x101a6b4: lw    s0, 340(sp)
+// 0x0101a6c4: 0x101a6c4: lw    s0, 340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2012,7 +2012,7 @@ L_101a6a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101a6b8: 0x101a6b8: jr    ra addiu sp, sp, 360
+// 0x0101a6c8: 0x101a6c8: jr    ra addiu sp, sp, 360
 	ldloc.0
 	ldc.i4 360
 	add
@@ -2024,7 +2024,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_display_signs_101a6c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_signs_101a6d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 lo,int32 s1,int32 s3,int32 s2,int32 s4,int32 s7,int32 t0,int32 s5,int32 t1,int32 s6,int32 s8,int32 ra,int32 t2,int32 t3)
@@ -2101,13 +2101,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101a6c0: 0x101a6c0: addiu sp, sp, -176
+// 0x0101a6d0: 0x101a6d0: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x0101a6c4: 0x101a6c4: sw    ra, 172(sp)
-// 0x0101a6c8: 0x101a6c8: sw    s8, 168(sp)
+// 0x0101a6d4: 0x101a6d4: sw    ra, 172(sp)
+// 0x0101a6d8: 0x101a6d8: sw    s8, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2116,7 +2116,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0101a6cc: 0x101a6cc: sw    s7, 164(sp)
+// 0x0101a6dc: 0x101a6dc: sw    s7, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2125,7 +2125,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101a6d0: 0x101a6d0: sw    s6, 160(sp)
+// 0x0101a6e0: 0x101a6e0: sw    s6, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2134,7 +2134,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0101a6d4: 0x101a6d4: sw    s5, 156(sp)
+// 0x0101a6e4: 0x101a6e4: sw    s5, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2143,7 +2143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101a6d8: 0x101a6d8: sw    s4, 152(sp)
+// 0x0101a6e8: 0x101a6e8: sw    s4, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2152,7 +2152,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101a6dc: 0x101a6dc: sw    s3, 148(sp)
+// 0x0101a6ec: 0x101a6ec: sw    s3, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2161,7 +2161,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101a6e0: 0x101a6e0: sw    s2, 144(sp)
+// 0x0101a6f0: 0x101a6f0: sw    s2, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2170,7 +2170,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101a6e4: 0x101a6e4: sw    s1, 140(sp)
+// 0x0101a6f4: 0x101a6f4: sw    s1, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2179,7 +2179,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101a6e8: 0x101a6e8: sw    s0, 136(sp)
+// 0x0101a6f8: 0x101a6f8: sw    s0, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2188,18 +2188,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101a6ec: 0x101a6ec: addu  v1, zero, zero
+// 0x0101a6fc: 0x101a6fc: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0101a6f0: 0x101a6f0: cibyl_sysc_arg 0x3
+// 0x0101a700: 0x101a700: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0101a6f4: 0x101a6f4: cibyl_sysc 0x354
+// 0x0101a704: 0x101a704: cibyl_sysc 0x354
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 6
-// 0x0101a6f8: 0x101a6f8: addu  a0, v0, zero
+// 0x0101a708: 0x101a708: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0101a6fc: 0x101a6fc: jal   0x1019364 sw    a0, 116(sp)
+// 0x0101a70c: 0x101a70c: jal   0x1019374 sw    a0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2213,12 +2213,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_create_pens_1019364(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_create_pens_1019374(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101a704: 0x101a704: jal   0x101addc addiu a0, zero, 119
+// 0x0101a714: 0x101a714: jal   0x101adec addiu a0, zero, 119
 	ldc.i4.s 119
 	stloc.1
 	ldloc.0
@@ -2226,44 +2226,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_is_set_101addc(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_is_set_101adec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101a70c: 0x101a70c: beq   v0, zero, 0x101a720 lui   a1, 0x10000
+// 0x0101a71c: 0x101a71c: beq   v0, zero, 0x101a730 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brfalse L_101a720
+	brfalse L_101a730
 // --- basic block ---
-// 0x0101a714: 0x101a714: addiu a1, a1, -31120
+// 0x0101a724: 0x101a724: addiu a1, a1, -31120
 	ldloc.2
 	ldc.i4 -31120
 	add
 	stloc.2
-// 0x0101a718: 0x101a718: j	 0x101a72c addiu a0, zero, 2
+// 0x0101a728: 0x101a728: j	 0x101a73c addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-	br L_101a72c
+	br L_101a73c
 // --- basic block ---
-L_101a720:
-// 0x0101a720: 0x101a720: lui   a1, 0x10000
+L_101a730:
+// 0x0101a730: 0x101a730: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101a724: 0x101a724: addiu a1, a1, -31116
+// 0x0101a734: 0x101a734: addiu a1, a1, -31116
 	ldloc.2
 	ldc.i4 -31116
 	add
 	stloc.2
-// 0x0101a728: 0x101a728: addiu a0, zero, 1
+// 0x0101a738: 0x101a738: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_101a72c:
-// 0x0101a72c: 0x101a72c: lui   s0, 0x0
+L_101a73c:
+// 0x0101a73c: 0x101a73c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0101a730: 0x101a730: jal   0x101a408 lui   s2, 0xe0000
+// 0x0101a740: 0x101a740: jal   0x101a418 lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 12
 	ldloc.0
@@ -2271,78 +2271,78 @@ L_101a72c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::T_99_101a408(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::T_99_101a418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101a738: 0x101a738: addiu s0, s0, 2480
+// 0x0101a748: 0x101a748: addiu s0, s0, 2480
 	ldloc 8
 	ldc.i4 2480
 	add
 	stloc 8
-// 0x0101a73c: 0x101a73c: addiu s2, s2, 29604
+// 0x0101a74c: 0x101a74c: addiu s2, s2, 30068
 	ldloc 12
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 12
-// 0x0101a740: 0x101a740: addiu s5, zero, 1
+// 0x0101a750: 0x101a750: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x0101a744: 0x101a744: addiu s1, zero, 2
+// 0x0101a754: 0x101a754: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 10
-// 0x0101a748: 0x101a748: lui   s8, 0xf0000
+// 0x0101a758: 0x101a758: lui   s8, 0xf0000
 	ldc.i4 983040
 	stloc 19
-// 0x0101a74c: 0x101a74c: j	 0x101ad5c addiu s6, sp, 56
+// 0x0101a75c: 0x101a75c: j	 0x101ad6c addiu s6, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 18
-	br L_101ad5c
+	br L_101ad6c
 // --- basic block ---
-L_101a754:
-// 0x0101a754: 0x101a754: lw    a0, 0(s0)
+L_101a764:
+// 0x0101a764: 0x101a764: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101a758: 0x101a758: sll   zero, zero, 0
-// 0x0101a75c: 0x101a75c: beq   a0, zero, 0x101a784 lui   a3, 0x30000
+// 0x0101a768: 0x101a768: sll   zero, zero, 0
+// 0x0101a76c: 0x101a76c: beq   a0, zero, 0x101a794 lui   a3, 0x30000
 	ldloc.1
 	ldc.i4 196608
 	stloc 4
-	brfalse L_101a784
+	brfalse L_101a794
 // --- basic block ---
-// 0x0101a764: 0x101a764: lw    a1, 26524(a3)
+// 0x0101a774: 0x101a774: lw    a1, 26988(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 6631
+	ldc.i4 6747
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101a768: 0x101a768: sll   zero, zero, 0
-// 0x0101a76c: 0x101a76c: beq   a1, zero, 0x101a784 sll   zero, zero, 0
+// 0x0101a778: 0x101a778: sll   zero, zero, 0
+// 0x0101a77c: 0x101a77c: beq   a1, zero, 0x101a794 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_101a784
+	brfalse L_101a794
 // --- basic block ---
-// 0x0101a774: 0x101a774: jal   0x1001b14 sll   zero, zero, 0
+// 0x0101a784: 0x101a784: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101a77c: 0x101a77c: bne   v0, zero, 0x101ad58 sll   zero, zero, 0
+// 0x0101a78c: 0x101a78c: bne   v0, zero, 0x101ad68 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101ad58
+	brtrue L_101ad68
 // --- basic block ---
-L_101a784:
-// 0x0101a784: 0x101a784: lw    v0, 32(s0)
+L_101a794:
+// 0x0101a794: 0x101a794: lw    v0, 32(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2351,15 +2351,15 @@ L_101a784:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101a788: 0x101a788: addiu v1, zero, -1
+// 0x0101a798: 0x101a798: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0101a78c: 0x101a78c: beq   v0, v1, 0x101a7a8 sll   zero, zero, 0
+// 0x0101a79c: 0x101a79c: beq   v0, v1, 0x101a7b8 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	beq  L_101a7a8
+	beq  L_101a7b8
 // --- basic block ---
-// 0x0101a794: 0x101a794: lw    a0, 116(sp)
+// 0x0101a7a4: 0x101a7a4: lw    a0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2368,18 +2368,18 @@ L_101a784:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a798: 0x101a798: sll   zero, zero, 0
-// 0x0101a79c: 0x101a79c: slt   v0, a0, v0
+// 0x0101a7a8: 0x101a7a8: sll   zero, zero, 0
+// 0x0101a7ac: 0x101a7ac: slt   v0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x0101a7a0: 0x101a7a0: beq   v0, zero, 0x101ad58 sll   zero, zero, 0
+// 0x0101a7b0: 0x101a7b0: beq   v0, zero, 0x101ad68 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101ad58
+	brfalse L_101ad68
 // --- basic block ---
-L_101a7a8:
-// 0x0101a7a8: 0x101a7a8: lw    a0, 12(s0)
+L_101a7b8:
+// 0x0101a7b8: 0x101a7b8: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2388,12 +2388,12 @@ L_101a7a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a7ac: 0x101a7ac: sll   zero, zero, 0
-// 0x0101a7b0: 0x101a7b0: beq   a0, zero, 0x101ad58 sll   zero, zero, 0
+// 0x0101a7bc: 0x101a7bc: sll   zero, zero, 0
+// 0x0101a7c0: 0x101a7c0: beq   a0, zero, 0x101ad68 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101ad58
+	brfalse L_101ad68
 // --- basic block ---
-// 0x0101a7b8: 0x101a7b8: lw    v0, 8(s0)
+// 0x0101a7c8: 0x101a7c8: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2402,13 +2402,13 @@ L_101a7a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101a7bc: 0x101a7bc: sll   zero, zero, 0
-// 0x0101a7c0: 0x101a7c0: bne   v0, s5, 0x101a7d8 sll   zero, zero, 0
+// 0x0101a7cc: 0x101a7cc: sll   zero, zero, 0
+// 0x0101a7d0: 0x101a7d0: bne   v0, s5, 0x101a7e8 sll   zero, zero, 0
 	ldloc 6
 	ldloc 16
-	bne.un L_101a7d8
+	bne.un L_101a7e8
 // --- basic block ---
-// 0x0101a7c8: 0x101a7c8: jal   0x101a194 addu  a0, s0, zero
+// 0x0101a7d8: 0x101a7d8: jal   0x101a1a4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2416,29 +2416,29 @@ L_101a7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_display_sign_pop_up_101a194(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_display_sign_pop_up_101a1a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101a7d0: 0x101a7d0: j	 0x101ad5c addiu s0, s0, 180
+// 0x0101a7e0: 0x101a7e0: j	 0x101ad6c addiu s0, s0, 180
 	ldloc 8
 	ldc.i4 180
 	add
 	stloc 8
-	br L_101ad5c
+	br L_101ad6c
 // --- basic block ---
-L_101a7d8:
-// 0x0101a7d8: 0x101a7d8: bne   v0, s1, 0x101a7f0 addiu v0, sp, 32
+L_101a7e8:
+// 0x0101a7e8: 0x101a7e8: bne   v0, s1, 0x101a800 addiu v0, sp, 32
 	ldloc 6
 	ldloc 10
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-	bne.un L_101a7f0
+	bne.un L_101a800
 // --- basic block ---
-// 0x0101a7e0: 0x101a7e0: jal   0x1019658 addu  a0, s0, zero
+// 0x0101a7f0: 0x101a7f0: jal   0x1019668 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2446,33 +2446,33 @@ L_101a7d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_image_sign_1019658(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_image_sign_1019668(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101a7e8: 0x101a7e8: j	 0x101ad5c addiu s0, s0, 180
+// 0x0101a7f8: 0x101a7f8: j	 0x101ad6c addiu s0, s0, 180
 	ldloc 8
 	ldc.i4 180
 	add
 	stloc 8
-	br L_101ad5c
+	br L_101ad6c
 // --- basic block ---
-L_101a7f0:
-// 0x0101a7f0: 0x101a7f0: addiu a1, zero, 12
+L_101a800:
+// 0x0101a800: 0x101a800: addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.2
-// 0x0101a7f4: 0x101a7f4: addiu a2, sp, 24
+// 0x0101a804: 0x101a804: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0101a7f8: 0x101a7f8: addiu a3, sp, 28
+// 0x0101a808: 0x101a808: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0101a7fc: 0x101a7fc: sw    v0, 16(sp)
+// 0x0101a80c: 0x101a80c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2481,7 +2481,7 @@ L_101a7f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101a800: 0x101a800: jal   0x104e968 sw    zero, 20(sp)
+// 0x0101a810: 0x101a810: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2495,12 +2495,12 @@ L_101a7f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101a808: 0x101a808: lw    a1, 24(sp)
+// 0x0101a818: 0x101a818: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2509,34 +2509,34 @@ L_101a7f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101a80c: 0x101a80c: lw    v0, -30068(s8)
+// 0x0101a81c: 0x101a81c: lw    v0, -29604(s8)
 	ldloc 5
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101a810: 0x101a810: addiu a0, a1, 18
+// 0x0101a820: 0x101a820: addiu a0, a1, 18
 	ldloc.2
 	ldc.i4.s 18
 	add
 	stloc.1
-// 0x0101a814: 0x101a814: lui   a3, 0xf0000
+// 0x0101a824: 0x101a824: lui   a3, 0xf0000
 	ldc.i4 983040
 	stloc 4
-// 0x0101a818: 0x101a818: addiu a1, a1, 8
+// 0x0101a828: 0x101a828: addiu a1, a1, 8
 	ldloc.2
 	ldc.i4.8
 	add
 	stloc.2
-// 0x0101a81c: 0x101a81c: slt   a2, a0, v0
+// 0x0101a82c: 0x101a82c: slt   a2, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.3
-// 0x0101a820: 0x101a820: sw    a1, 24(sp)
+// 0x0101a830: 0x101a830: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2545,41 +2545,41 @@ L_101a7f0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101a824: 0x101a824: lw    v1, -30072(a3)
+// 0x0101a834: 0x101a834: lw    v1, -29608(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a828: 0x101a828: bne   a2, zero, 0x101a840 addiu s4, zero, 1
+// 0x0101a838: 0x101a838: bne   a2, zero, 0x101a850 addiu s4, zero, 1
 	ldloc.3
 	ldc.i4.1
 	stloc 13
-	brtrue L_101a840
+	brtrue L_101a850
 // --- basic block ---
-// 0x0101a830: 0x101a830: div   a0, v0
+// 0x0101a840: 0x101a840: div   a0, v0
 	ldloc.1
 	ldloc 6
 	div
 	stloc 9
-// 0x0101a834: 0x101a834: addiu a1, v0, -10
+// 0x0101a844: 0x101a844: addiu a1, v0, -10
 	ldloc 6
 	ldc.i4.s -10
 	add
 	stloc.2
-// 0x0101a838: 0x101a838: mflo  lo
+// 0x0101a848: 0x101a848: mflo  lo
 	ldloc 9
 	stloc 13
-// 0x0101a83c: 0x101a83c: addiu s4, s4, 1
+// 0x0101a84c: 0x101a84c: addiu s4, s4, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-L_101a840:
-// 0x0101a840: 0x101a840: lw    a0, 12(s0)
+L_101a850:
+// 0x0101a850: 0x101a850: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2588,39 +2588,39 @@ L_101a840:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a844: 0x101a844: j	 0x101a850 sll   zero, zero, 0
-	br L_101a850
+// 0x0101a854: 0x101a854: j	 0x101a860 sll   zero, zero, 0
+	br L_101a860
 // --- basic block ---
-L_101a84c:
-// 0x0101a84c: 0x101a84c: addu  s4, s4, a3
+L_101a85c:
+// 0x0101a85c: 0x101a85c: addu  s4, s4, a3
 	ldloc 13
 	ldloc 4
 	add
 	stloc 13
-L_101a850:
-// 0x0101a850: 0x101a850: lb    a2, 0(a0)
+L_101a860:
+// 0x0101a860: 0x101a860: lb    a2, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0101a854: 0x101a854: addiu a0, a0, 1
+// 0x0101a864: 0x101a864: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0101a858: 0x101a858: xori  a3, a2, 10
+// 0x0101a868: 0x101a868: xori  a3, a2, 10
 	ldloc.3
 	ldc.i4.s 10
 	xor
 	stloc 4
-// 0x0101a85c: 0x101a85c: bne   a2, zero, 0x101a84c sltiu a3, a3, 1
+// 0x0101a86c: 0x101a86c: bne   a2, zero, 0x101a85c sltiu a3, a3, 1
 	ldloc.3
 	ldloc 4
 	ldc.i4.1
 	clt.un
 	stloc 4
-	brtrue L_101a84c
+	brtrue L_101a85c
 // --- basic block ---
-// 0x0101a864: 0x101a864: lw    a2, 32(sp)
+// 0x0101a874: 0x101a874: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2629,7 +2629,7 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a868: 0x101a868: lw    s7, 28(sp)
+// 0x0101a878: 0x101a878: lw    s7, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2638,7 +2638,7 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101a86c: 0x101a86c: lw    a0, 24(s0)
+// 0x0101a87c: 0x101a87c: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2647,29 +2647,29 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a870: 0x101a870: addu  s7, s7, a2
+// 0x0101a880: 0x101a880: addu  s7, s7, a2
 	ldloc 14
 	ldloc.3
 	add
 	stloc 14
-// 0x0101a874: 0x101a874: addiu s7, s7, 4
+// 0x0101a884: 0x101a884: addiu s7, s7, 4
 	ldloc 14
 	ldc.i4.4
 	add
 	stloc 14
-// 0x0101a878: 0x101a878: mult  s4, s7
+// 0x0101a888: 0x101a888: mult  s4, s7
 	ldloc 13
 	ldloc 14
 	mul
 	stloc 9
-// 0x0101a87c: 0x101a87c: mflo  lo
+// 0x0101a88c: 0x101a88c: mflo  lo
 	ldloc 9
 	stloc 11
-// 0x0101a880: 0x101a880: beq   a0, zero, 0x101ab60 sll   zero, zero, 0
+// 0x0101a890: 0x101a890: beq   a0, zero, 0x101ab70 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101ab60
+	brfalse L_101ab70
 // --- basic block ---
-// 0x0101a888: 0x101a888: lw    a0, 36(s0)
+// 0x0101a898: 0x101a898: lw    a0, 36(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2678,7 +2678,7 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a88c: 0x101a88c: lw    a2, 56(s2)
+// 0x0101a89c: 0x101a89c: lw    a2, 56(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2687,19 +2687,19 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a890: 0x101a890: sll   zero, zero, 0
-// 0x0101a894: 0x101a894: slt   a2, a2, a0
+// 0x0101a8a0: 0x101a8a0: sll   zero, zero, 0
+// 0x0101a8a4: 0x101a8a4: slt   a2, a2, a0
 	ldloc.3
 	ldloc.1
 	clt
 	stloc.3
-// 0x0101a898: 0x101a898: bne   a2, zero, 0x101a8e4 addu  a2, zero, zero
+// 0x0101a8a8: 0x101a8a8: bne   a2, zero, 0x101a8f4 addu  a2, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_101a8e4
+	brtrue L_101a8f4
 // --- basic block ---
-// 0x0101a8a0: 0x101a8a0: lw    a2, 64(s2)
+// 0x0101a8b0: 0x101a8b0: lw    a2, 64(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2708,19 +2708,19 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a8a4: 0x101a8a4: sll   zero, zero, 0
-// 0x0101a8a8: 0x101a8a8: slt   a0, a0, a2
+// 0x0101a8b4: 0x101a8b4: sll   zero, zero, 0
+// 0x0101a8b8: 0x101a8b8: slt   a0, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc.1
-// 0x0101a8ac: 0x101a8ac: bne   a0, zero, 0x101a8e4 addu  a2, zero, zero
+// 0x0101a8bc: 0x101a8bc: bne   a0, zero, 0x101a8f4 addu  a2, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_101a8e4
+	brtrue L_101a8f4
 // --- basic block ---
-// 0x0101a8b4: 0x101a8b4: lw    a0, 40(s0)
+// 0x0101a8c4: 0x101a8c4: lw    a0, 40(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2729,7 +2729,7 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a8b8: 0x101a8b8: lw    a2, 60(s2)
+// 0x0101a8c8: 0x101a8c8: lw    a2, 60(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2738,17 +2738,17 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a8bc: 0x101a8bc: sll   zero, zero, 0
-// 0x0101a8c0: 0x101a8c0: slt   a2, a2, a0
+// 0x0101a8cc: 0x101a8cc: sll   zero, zero, 0
+// 0x0101a8d0: 0x101a8d0: slt   a2, a2, a0
 	ldloc.3
 	ldloc.1
 	clt
 	stloc.3
-// 0x0101a8c4: 0x101a8c4: bne   a2, zero, 0x101a8e0 sll   zero, zero, 0
+// 0x0101a8d4: 0x101a8d4: bne   a2, zero, 0x101a8f0 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_101a8e0
+	brtrue L_101a8f0
 // --- basic block ---
-// 0x0101a8cc: 0x101a8cc: lw    a2, 68(s2)
+// 0x0101a8dc: 0x101a8dc: lw    a2, 68(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2757,25 +2757,25 @@ L_101a850:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a8d0: 0x101a8d0: sll   zero, zero, 0
-// 0x0101a8d4: 0x101a8d4: slt   a2, a0, a2
+// 0x0101a8e0: 0x101a8e0: sll   zero, zero, 0
+// 0x0101a8e4: 0x101a8e4: slt   a2, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc.3
-// 0x0101a8d8: 0x101a8d8: j	 0x101a8e4 xori  a2, a2, 1
+// 0x0101a8e8: 0x101a8e8: j	 0x101a8f4 xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-	br L_101a8e4
+	br L_101a8f4
 // --- basic block ---
-L_101a8e0:
-// 0x0101a8e0: 0x101a8e0: addu  a2, zero, zero
+L_101a8f0:
+// 0x0101a8f0: 0x101a8f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_101a8e4:
-// 0x0101a8e4: 0x101a8e4: lw    a0, 28(s0)
+L_101a8f4:
+// 0x0101a8f4: 0x101a8f4: lw    a0, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2784,16 +2784,16 @@ L_101a8e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a8e8: 0x101a8e8: sll   zero, zero, 0
-// 0x0101a8ec: 0x101a8ec: beq   a0, zero, 0x101a904 sll   zero, zero, 0
+// 0x0101a8f8: 0x101a8f8: sll   zero, zero, 0
+// 0x0101a8fc: 0x101a8fc: beq   a0, zero, 0x101a914 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101a904
+	brfalse L_101a914
 // --- basic block ---
-// 0x0101a8f4: 0x101a8f4: bne   a2, zero, 0x101a904 sll   zero, zero, 0
+// 0x0101a904: 0x101a904: bne   a2, zero, 0x101a914 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_101a904
+	brtrue L_101a914
 // --- basic block ---
-// 0x0101a8fc: 0x101a8fc: j	 0x101ad58 sw    zero, 32(s0)
+// 0x0101a90c: 0x101a90c: j	 0x101ad68 sw    zero, 32(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2802,10 +2802,10 @@ L_101a8e4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_101ad58
+	br L_101ad68
 // --- basic block ---
-L_101a904:
-// 0x0101a904: 0x101a904: lw    a0, 80(s2)
+L_101a914:
+// 0x0101a914: 0x101a914: lw    a0, 80(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2814,7 +2814,7 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a908: 0x101a908: lw    t1, 36(s0)
+// 0x0101a918: 0x101a918: lw    t1, 36(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2823,7 +2823,7 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0101a90c: 0x101a90c: lw    t2, 32(s2)
+// 0x0101a91c: 0x101a91c: lw    t2, 32(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2832,17 +2832,17 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc 21
-// 0x0101a910: 0x101a910: subu  t1, t1, a0
+// 0x0101a920: 0x101a920: subu  t1, t1, a0
 	ldloc 17
 	ldloc.1
 	sub
 	stloc 17
-// 0x0101a914: 0x101a914: div   t1, t2
+// 0x0101a924: 0x101a924: div   t1, t2
 	ldloc 17
 	ldloc 21
 	div
 	stloc 9
-// 0x0101a918: 0x101a918: lw    t3, 76(s2)
+// 0x0101a928: 0x101a928: lw    t3, 76(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2851,7 +2851,7 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc 22
-// 0x0101a91c: 0x101a91c: lw    t0, 40(s0)
+// 0x0101a92c: 0x101a92c: lw    t0, 40(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2860,7 +2860,7 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101a920: 0x101a920: lw    a3, 36(s2)
+// 0x0101a930: 0x101a930: lw    a3, 36(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2869,15 +2869,15 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101a924: 0x101a924: subu  t0, t3, t0
+// 0x0101a934: 0x101a934: subu  t0, t3, t0
 	ldloc 22
 	ldloc 15
 	sub
 	stloc 15
-// 0x0101a928: 0x101a928: addu  a0, s6, zero
+// 0x0101a938: 0x101a938: addu  a0, s6, zero
 	ldloc 18
 	stloc.1
-// 0x0101a92c: 0x101a92c: sw    a2, 28(s0)
+// 0x0101a93c: 0x101a93c: sw    a2, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2886,7 +2886,7 @@ L_101a904:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101a930: 0x101a930: sw    v0, 120(sp)
+// 0x0101a940: 0x101a940: sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2895,7 +2895,7 @@ L_101a904:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101a934: 0x101a934: sw    v1, 128(sp)
+// 0x0101a944: 0x101a944: sw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2904,7 +2904,7 @@ L_101a904:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101a938: 0x101a938: sw    a1, 124(sp)
+// 0x0101a948: 0x101a948: sw    a1, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2913,10 +2913,10 @@ L_101a904:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101a93c: 0x101a93c: mflo  lo
+// 0x0101a94c: 0x101a94c: mflo  lo
 	ldloc 9
 	stloc 17
-// 0x0101a940: 0x101a940: sw    t1, 56(sp)
+// 0x0101a950: 0x101a950: sw    t1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2925,16 +2925,16 @@ L_101a904:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0101a944: 0x101a944: sll   zero, zero, 0
-// 0x0101a948: 0x101a948: div   t0, a3
+// 0x0101a954: 0x101a954: sll   zero, zero, 0
+// 0x0101a958: 0x101a958: div   t0, a3
 	ldloc 15
 	ldloc 4
 	div
 	stloc 9
-// 0x0101a94c: 0x101a94c: mflo  lo
+// 0x0101a95c: 0x101a95c: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0101a950: 0x101a950: jal   0x10073c4 sw    a3, 60(sp)
+// 0x0101a960: 0x101a960: jal   0x10073d4 sw    a3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2948,12 +2948,12 @@ L_101a904:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101a958: 0x101a958: lw    a2, 136(s0)
+// 0x0101a968: 0x101a968: lw    a2, 136(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2962,7 +2962,7 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101a95c: 0x101a95c: lw    v0, 120(sp)
+// 0x0101a96c: 0x101a96c: lw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2971,7 +2971,7 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101a960: 0x101a960: lw    v1, 128(sp)
+// 0x0101a970: 0x101a970: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2980,7 +2980,7 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101a964: 0x101a964: lw    a1, 124(sp)
+// 0x0101a974: 0x101a974: lw    a1, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2989,49 +2989,49 @@ L_101a904:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101a968: 0x101a968: bne   a2, s5, 0x101a9a0 subu  a0, v0, a1
+// 0x0101a978: 0x101a978: bne   a2, s5, 0x101a9b0 subu  a0, v0, a1
 	ldloc.3
 	ldloc 16
 	ldloc 6
 	ldloc.2
 	sub
 	stloc.1
-	bne.un L_101a9a0
+	bne.un L_101a9b0
 // --- basic block ---
-// 0x0101a970: 0x101a970: div   a0, s1
+// 0x0101a980: 0x101a980: div   a0, s1
 	ldloc.1
 	ldloc 10
 	div
 	stloc 9
-// 0x0101a974: 0x101a974: addu  v0, a1, v0
+// 0x0101a984: 0x101a984: addu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x0101a978: 0x101a978: mflo  lo
+// 0x0101a988: 0x101a988: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0101a97c: 0x101a97c: addiu t0, a0, 5
+// 0x0101a98c: 0x101a98c: addiu t0, a0, 5
 	ldloc.1
 	ldc.i4.5
 	add
 	stloc 15
-// 0x0101a980: 0x101a980: addiu a3, a0, 15
+// 0x0101a990: 0x101a990: addiu a3, a0, 15
 	ldloc.1
 	ldc.i4.s 15
 	add
 	stloc 4
-// 0x0101a984: 0x101a984: div   v0, s1
+// 0x0101a994: 0x101a994: div   v0, s1
 	ldloc 6
 	ldloc 10
 	div
 	stloc 9
-// 0x0101a988: 0x101a988: addiu v0, a0, 4
+// 0x0101a998: 0x101a998: addiu v0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc 6
-// 0x0101a98c: 0x101a98c: sw    t0, 64(sp)
+// 0x0101a99c: 0x101a99c: sw    t0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3040,7 +3040,7 @@ L_101a904:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101a990: 0x101a990: sw    a3, 104(sp)
+// 0x0101a9a0: 0x101a9a0: sw    a3, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3049,10 +3049,10 @@ L_101a904:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0101a994: 0x101a994: mflo  lo
+// 0x0101a9a4: 0x101a9a4: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x0101a998: 0x101a998: j	 0x101aa00 sw    v0, 40(sp)
+// 0x0101a9a8: 0x101a9a8: j	 0x101aa10 sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3061,15 +3061,15 @@ L_101a904:
 	add
 	ldloc 6
 	stelem.i4
-	br L_101aa00
+	br L_101aa10
 // --- basic block ---
-L_101a9a0:
-// 0x0101a9a0: 0x101a9a0: div   v0, s1
+L_101a9b0:
+// 0x0101a9b0: 0x101a9b0: div   v0, s1
 	ldloc 6
 	ldloc 10
 	div
 	stloc 9
-// 0x0101a9a4: 0x101a9a4: lw    a0, 56(sp)
+// 0x0101a9b4: 0x101a9b4: lw    a0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3078,26 +3078,26 @@ L_101a9a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101a9a8: 0x101a9a8: mflo  lo
+// 0x0101a9b8: 0x101a9b8: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0101a9ac: 0x101a9ac: slt   a0, a0, a3
+// 0x0101a9bc: 0x101a9bc: slt   a0, a0, a3
 	ldloc.1
 	ldloc 4
 	clt
 	stloc.1
-// 0x0101a9b0: 0x101a9b0: beq   a0, zero, 0x101a9e4 addiu a0, v0, -5
+// 0x0101a9c0: 0x101a9c0: beq   a0, zero, 0x101a9f4 addiu a0, v0, -5
 	ldloc.1
 	ldloc 6
 	ldc.i4.s -5
 	add
 	stloc.1
-	brfalse L_101a9e4
+	brfalse L_101a9f4
 // --- basic block ---
-// 0x0101a9b8: 0x101a9b8: addiu v0, zero, 20
+// 0x0101a9c8: 0x101a9c8: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 6
-// 0x0101a9bc: 0x101a9bc: sw    v0, 104(sp)
+// 0x0101a9cc: 0x101a9cc: sw    v0, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3106,15 +3106,15 @@ L_101a9a0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101a9c0: 0x101a9c0: addiu v0, zero, 9
+// 0x0101a9d0: 0x101a9d0: addiu v0, zero, 9
 	ldc.i4.s 9
 	stloc 6
-// 0x0101a9c4: 0x101a9c4: addiu a1, a1, 5
+// 0x0101a9d4: 0x101a9d4: addiu a1, a1, 5
 	ldloc.2
 	ldc.i4.5
 	add
 	stloc.2
-// 0x0101a9c8: 0x101a9c8: sw    v0, 40(sp)
+// 0x0101a9d8: 0x101a9d8: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3123,13 +3123,13 @@ L_101a9a0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101a9cc: 0x101a9cc: addiu a0, zero, 5
+// 0x0101a9dc: 0x101a9dc: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0101a9d0: 0x101a9d0: addiu v0, zero, 10
+// 0x0101a9e0: 0x101a9e0: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x0101a9d4: 0x101a9d4: sw    a1, 88(sp)
+// 0x0101a9e4: 0x101a9e4: sw    a1, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3138,7 +3138,7 @@ L_101a9a0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101a9d8: 0x101a9d8: sw    v0, 64(sp)
+// 0x0101a9e8: 0x101a9e8: sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3147,7 +3147,7 @@ L_101a9a0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101a9dc: 0x101a9dc: j	 0x101aa08 sw    a0, 72(sp)
+// 0x0101a9ec: 0x101a9ec: j	 0x101aa18 sw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3156,30 +3156,30 @@ L_101a9a0:
 	add
 	ldloc.1
 	stelem.i4
-	br L_101aa08
+	br L_101aa18
 // --- basic block ---
-L_101a9e4:
-// 0x0101a9e4: 0x101a9e4: subu  a1, a0, a1
+L_101a9f4:
+// 0x0101a9f4: 0x101a9f4: subu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.2
-// 0x0101a9e8: 0x101a9e8: addiu t0, v0, -20
+// 0x0101a9f8: 0x101a9f8: addiu t0, v0, -20
 	ldloc 6
 	ldc.i4.s -20
 	add
 	stloc 15
-// 0x0101a9ec: 0x101a9ec: addiu a3, a1, 4
+// 0x0101a9fc: 0x101a9fc: addiu a3, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0101a9f0: 0x101a9f0: addiu v0, v0, -10
+// 0x0101aa00: 0x101aa00: addiu v0, v0, -10
 	ldloc 6
 	ldc.i4.s -10
 	add
 	stloc 6
-// 0x0101a9f4: 0x101a9f4: sw    v0, 64(sp)
+// 0x0101aa04: 0x101aa04: sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3188,7 +3188,7 @@ L_101a9e4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101a9f8: 0x101a9f8: sw    t0, 104(sp)
+// 0x0101aa08: 0x101aa08: sw    t0, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3197,7 +3197,7 @@ L_101a9e4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101a9fc: 0x101a9fc: sw    a3, 40(sp)
+// 0x0101aa0c: 0x101aa0c: sw    a3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3206,8 +3206,8 @@ L_101a9e4:
 	add
 	ldloc 4
 	stelem.i4
-L_101aa00:
-// 0x0101aa00: 0x101aa00: sw    a0, 72(sp)
+L_101aa10:
+// 0x0101aa10: 0x101aa10: sw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3216,7 +3216,7 @@ L_101aa00:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101aa04: 0x101aa04: sw    a1, 88(sp)
+// 0x0101aa14: 0x101aa14: sw    a1, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3225,8 +3225,8 @@ L_101aa00:
 	add
 	ldloc.2
 	stelem.i4
-L_101aa08:
-// 0x0101aa08: 0x101aa08: lw    v0, 72(sp)
+L_101aa18:
+// 0x0101aa18: 0x101aa18: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3235,8 +3235,8 @@ L_101aa08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101aa0c: 0x101aa0c: sll   zero, zero, 0
-// 0x0101aa10: 0x101aa10: sw    v0, 80(sp)
+// 0x0101aa1c: 0x101aa1c: sll   zero, zero, 0
+// 0x0101aa20: 0x101aa20: sw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3245,7 +3245,7 @@ L_101aa08:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101aa14: 0x101aa14: lw    v0, 88(sp)
+// 0x0101aa24: 0x101aa24: lw    v0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3254,7 +3254,7 @@ L_101aa08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101aa18: 0x101aa18: beq   a2, s5, 0x101aa38 sw    v0, 96(sp)
+// 0x0101aa28: 0x101aa28: beq   a2, s5, 0x101aa48 sw    v0, 96(sp)
 	ldloc.3
 	ldloc 16
 	ldloc 5
@@ -3265,14 +3265,14 @@ L_101aa08:
 	add
 	ldloc 6
 	stelem.i4
-	beq  L_101aa38
+	beq  L_101aa48
 // --- basic block ---
-// 0x0101aa20: 0x101aa20: div   v1, s1
+// 0x0101aa30: 0x101aa30: div   v1, s1
 	ldloc 7
 	ldloc 10
 	div
 	stloc 9
-// 0x0101aa24: 0x101aa24: lw    v0, 60(sp)
+// 0x0101aa34: 0x101aa34: lw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3281,30 +3281,30 @@ L_101aa08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101aa28: 0x101aa28: mflo  lo
+// 0x0101aa38: 0x101aa38: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0101aa2c: 0x101aa2c: slt   v0, a3, v0
+// 0x0101aa3c: 0x101aa3c: slt   v0, a3, v0
 	ldloc 4
 	ldloc 6
 	clt
 	stloc 6
-// 0x0101aa30: 0x101aa30: beq   v0, zero, 0x101aaf0 addiu v1, v1, -5
+// 0x0101aa40: 0x101aa40: beq   v0, zero, 0x101ab00 addiu v1, v1, -5
 	ldloc 6
 	ldloc 7
 	ldc.i4.s -5
 	add
 	stloc 7
-	brfalse L_101aaf0
+	brfalse L_101ab00
 // --- basic block ---
-L_101aa38:
-// 0x0101aa38: 0x101aa38: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+L_101aa48:
+// 0x0101aa48: 0x101aa48: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aa40: 0x101aa40: jal   0x10163d0 sw    v0, 120(sp)
+// 0x0101aa50: 0x101aa50: jal   0x10163e0 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3313,12 +3313,12 @@ L_101aa38:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl16::roadmap_ticker_height_10163d0()
+	call int32 Cibyl16::roadmap_ticker_height_10163e0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aa48: 0x101aa48: jal   0x1053710 sw    v0, 128(sp)
+// 0x0101aa58: 0x101aa58: jal   0x1053720 sw    v0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3332,12 +3332,12 @@ L_101aa38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_height_1053710(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_height_1053720(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aa50: 0x101aa50: lw    a0, 120(sp)
+// 0x0101aa60: 0x101aa60: lw    a0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3346,12 +3346,12 @@ L_101aa38:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101aa54: 0x101aa54: addiu a1, s3, 5
+// 0x0101aa64: 0x101aa64: addiu a1, s3, 5
 	ldloc 11
 	ldc.i4.5
 	add
 	stloc.2
-// 0x0101aa58: 0x101aa58: lw    v1, 128(sp)
+// 0x0101aa68: 0x101aa68: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3360,22 +3360,22 @@ L_101aa38:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101aa5c: 0x101aa5c: addu  a0, a1, a0
+// 0x0101aa6c: 0x101aa6c: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0101aa60: 0x101aa60: addu  v1, a0, v1
+// 0x0101aa70: 0x101aa70: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0101aa64: 0x101aa64: addu  v1, v1, v0
+// 0x0101aa74: 0x101aa74: addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0101aa68: 0x101aa68: lw    v0, 60(sp)
+// 0x0101aa78: 0x101aa78: lw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3384,13 +3384,13 @@ L_101aa38:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101aa6c: 0x101aa6c: sll   zero, zero, 0
-// 0x0101aa70: 0x101aa70: slt   v0, v0, v1
+// 0x0101aa7c: 0x101aa7c: sll   zero, zero, 0
+// 0x0101aa80: 0x101aa80: slt   v0, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x0101aa74: 0x101aa74: beq   v0, zero, 0x101aa88 sw    v1, 68(sp)
+// 0x0101aa84: 0x101aa84: beq   v0, zero, 0x101aa98 sw    v1, 68(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -3400,9 +3400,9 @@ L_101aa38:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_101aa88
+	brfalse L_101aa98
 // --- basic block ---
-// 0x0101aa7c: 0x101aa7c: lw    v0, 64(sp)
+// 0x0101aa8c: 0x101aa8c: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3411,7 +3411,7 @@ L_101aa38:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101aa80: 0x101aa80: sw    v1, 60(sp)
+// 0x0101aa90: 0x101aa90: sw    v1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3420,7 +3420,7 @@ L_101aa38:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101aa84: 0x101aa84: sw    v0, 56(sp)
+// 0x0101aa94: 0x101aa94: sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3429,14 +3429,14 @@ L_101aa38:
 	add
 	ldloc 6
 	stelem.i4
-L_101aa88:
-// 0x0101aa88: 0x101aa88: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+L_101aa98:
+// 0x0101aa98: 0x101aa98: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aa90: 0x101aa90: jal   0x10163d0 sw    v0, 120(sp)
+// 0x0101aaa0: 0x101aaa0: jal   0x10163e0 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3445,12 +3445,12 @@ L_101aa88:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl16::roadmap_ticker_height_10163d0()
+	call int32 Cibyl16::roadmap_ticker_height_10163e0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aa98: 0x101aa98: jal   0x1053710 sw    v0, 128(sp)
+// 0x0101aaa8: 0x101aaa8: jal   0x1053720 sw    v0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3464,12 +3464,12 @@ L_101aa88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_height_1053710(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_height_1053720(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aaa0: 0x101aaa0: lw    a0, 120(sp)
+// 0x0101aab0: 0x101aab0: lw    a0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3478,7 +3478,7 @@ L_101aa88:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101aaa4: 0x101aaa4: lw    v1, 128(sp)
+// 0x0101aab4: 0x101aab4: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3487,23 +3487,23 @@ L_101aa88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101aaa8: 0x101aaa8: sll   zero, zero, 0
-// 0x0101aaac: 0x101aaac: addu  v1, a0, v1
+// 0x0101aab8: 0x101aab8: sll   zero, zero, 0
+// 0x0101aabc: 0x101aabc: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0101aab0: 0x101aab0: addiu v1, v1, 5
+// 0x0101aac0: 0x101aac0: addiu v1, v1, 5
 	ldloc 7
 	ldc.i4.5
 	add
 	stloc 7
-// 0x0101aab4: 0x101aab4: addu  v1, v1, v0
+// 0x0101aac4: 0x101aac4: addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0101aab8: 0x101aab8: jal   0x10423fc sw    v1, 84(sp)
+// 0x0101aac8: 0x101aac8: jal   0x104240c sw    v1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3512,12 +3512,12 @@ L_101aa88:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aac0: 0x101aac0: jal   0x10163d0 sw    v0, 120(sp)
+// 0x0101aad0: 0x101aad0: jal   0x10163e0 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3526,12 +3526,12 @@ L_101aa88:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl16::roadmap_ticker_height_10163d0()
+	call int32 Cibyl16::roadmap_ticker_height_10163e0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aac8: 0x101aac8: jal   0x1053710 sw    v0, 128(sp)
+// 0x0101aad8: 0x101aad8: jal   0x1053720 sw    v0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3545,12 +3545,12 @@ L_101aa88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_height_1053710(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_height_1053720(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aad0: 0x101aad0: lw    v1, 128(sp)
+// 0x0101aae0: 0x101aae0: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3559,7 +3559,7 @@ L_101aa88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101aad4: 0x101aad4: lw    a0, 120(sp)
+// 0x0101aae4: 0x101aae4: lw    a0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3568,23 +3568,23 @@ L_101aa88:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101aad8: 0x101aad8: sll   zero, zero, 0
-// 0x0101aadc: 0x101aadc: addu  v1, a0, v1
+// 0x0101aae8: 0x101aae8: sll   zero, zero, 0
+// 0x0101aaec: 0x101aaec: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0101aae0: 0x101aae0: addiu v1, v1, 8
+// 0x0101aaf0: 0x101aaf0: addiu v1, v1, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 7
-// 0x0101aae4: 0x101aae4: addu  v1, v1, v0
+// 0x0101aaf4: 0x101aaf4: addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0101aae8: 0x101aae8: j	 0x101ab28 sw    v1, 44(sp)
+// 0x0101aaf8: 0x101aaf8: j	 0x101ab38 sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3593,10 +3593,10 @@ L_101aa88:
 	add
 	ldloc 7
 	stelem.i4
-	br L_101ab28
+	br L_101ab38
 // --- basic block ---
-L_101aaf0:
-// 0x0101aaf0: 0x101aaf0: jal   0x1042430 sw    v1, 112(sp)
+L_101ab00:
+// 0x0101ab00: 0x101ab00: jal   0x1042440 sw    v1, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3605,12 +3605,12 @@ L_101aaf0:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aaf8: 0x101aaf8: lw    a0, 112(sp)
+// 0x0101ab08: 0x101ab08: lw    a0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3619,18 +3619,18 @@ L_101aaf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101aafc: 0x101aafc: sll   zero, zero, 0
-// 0x0101ab00: 0x101ab00: subu  v1, a0, s3
+// 0x0101ab0c: 0x101ab0c: sll   zero, zero, 0
+// 0x0101ab10: 0x101ab10: subu  v1, a0, s3
 	ldloc.1
 	ldloc 11
 	sub
 	stloc 7
-// 0x0101ab04: 0x101ab04: subu  v0, v1, v0
+// 0x0101ab14: 0x101ab14: subu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 6
-// 0x0101ab08: 0x101ab08: jal   0x1042430 sw    v0, 68(sp)
+// 0x0101ab18: 0x101ab18: jal   0x1042440 sw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3639,12 +3639,12 @@ L_101aaf0:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ab10: 0x101ab10: lw    a3, 112(sp)
+// 0x0101ab20: 0x101ab20: lw    a3, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3653,7 +3653,7 @@ L_101aaf0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101ab14: 0x101ab14: lw    a0, 68(sp)
+// 0x0101ab24: 0x101ab24: lw    a0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3662,17 +3662,17 @@ L_101aaf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ab18: 0x101ab18: subu  v0, a3, v0
+// 0x0101ab28: 0x101ab28: subu  v0, a3, v0
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 6
-// 0x0101ab1c: 0x101ab1c: addiu a0, a0, 3
+// 0x0101ab2c: 0x101ab2c: addiu a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	add
 	stloc.1
-// 0x0101ab20: 0x101ab20: sw    v0, 84(sp)
+// 0x0101ab30: 0x101ab30: sw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3681,7 +3681,7 @@ L_101aaf0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101ab24: 0x101ab24: sw    a0, 44(sp)
+// 0x0101ab34: 0x101ab34: sw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3690,8 +3690,8 @@ L_101aaf0:
 	add
 	ldloc.1
 	stelem.i4
-L_101ab28:
-// 0x0101ab28: 0x101ab28: lw    v0, 68(sp)
+L_101ab38:
+// 0x0101ab38: 0x101ab38: lw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3700,7 +3700,7 @@ L_101ab28:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101ab2c: 0x101ab2c: lw    v1, 84(sp)
+// 0x0101ab3c: 0x101ab3c: lw    v1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3709,12 +3709,12 @@ L_101ab28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ab30: 0x101ab30: addiu a0, s0, 44
+// 0x0101ab40: 0x101ab40: addiu a0, s0, 44
 	ldloc 8
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x0101ab34: 0x101ab34: sw    v0, 108(sp)
+// 0x0101ab44: 0x101ab44: sw    v0, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3723,7 +3723,7 @@ L_101ab28:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101ab38: 0x101ab38: sw    v0, 76(sp)
+// 0x0101ab48: 0x101ab48: sw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3732,7 +3732,7 @@ L_101ab28:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101ab3c: 0x101ab3c: sw    v0, 100(sp)
+// 0x0101ab4c: 0x101ab4c: sw    v0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3741,10 +3741,10 @@ L_101ab28:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101ab40: 0x101ab40: addiu v0, zero, 7
+// 0x0101ab50: 0x101ab50: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 6
-// 0x0101ab44: 0x101ab44: sw    v1, 92(sp)
+// 0x0101ab54: 0x101ab54: sw    v1, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3753,7 +3753,7 @@ L_101ab28:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ab48: 0x101ab48: jal   0x10196c4 sw    v0, 36(sp)
+// 0x0101ab58: 0x101ab58: jal   0x10196d4 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3767,12 +3767,12 @@ L_101ab28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_highlight_10196c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_highlight_10196d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ab50: 0x101ab50: jal   0x10196c4 addiu a0, s0, 52
+// 0x0101ab60: 0x101ab60: jal   0x10196d4 addiu a0, s0, 52
 	ldloc 8
 	ldc.i4.s 52
 	add
@@ -3782,16 +3782,16 @@ L_101ab28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_highlight_10196c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_highlight_10196d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ab58: 0x101ab58: j	 0x101ac74 sll   zero, zero, 0
-	br L_101ac74
+// 0x0101ab68: 0x101ab68: j	 0x101ac84 sll   zero, zero, 0
+	br L_101ac84
 // --- basic block ---
-L_101ab60:
-// 0x0101ab60: 0x101ab60: lw    v0, 136(s0)
+L_101ab70:
+// 0x0101ab70: 0x101ab70: lw    v0, 136(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3800,12 +3800,12 @@ L_101ab60:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101ab64: 0x101ab64: addiu a1, a1, 2
+// 0x0101ab74: 0x101ab74: addiu a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	add
 	stloc.2
-// 0x0101ab68: 0x101ab68: sw    s1, 56(sp)
+// 0x0101ab78: 0x101ab78: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3814,7 +3814,7 @@ L_101ab60:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101ab6c: 0x101ab6c: sw    a1, 64(sp)
+// 0x0101ab7c: 0x101ab7c: sw    a1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3823,7 +3823,7 @@ L_101ab60:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101ab70: 0x101ab70: sw    a1, 72(sp)
+// 0x0101ab80: 0x101ab80: sw    a1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3832,7 +3832,7 @@ L_101ab60:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101ab74: 0x101ab74: beq   v0, zero, 0x101aba0 sw    s1, 80(sp)
+// 0x0101ab84: 0x101ab84: beq   v0, zero, 0x101abb0 sw    s1, 80(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -3842,35 +3842,35 @@ L_101ab60:
 	add
 	ldloc 10
 	stelem.i4
-	brfalse L_101aba0
+	brfalse L_101abb0
 // --- basic block ---
-// 0x0101ab7c: 0x101ab7c: beq   v0, s5, 0x101abbc sll   zero, zero, 0
+// 0x0101ab8c: 0x101ab8c: beq   v0, s5, 0x101abcc sll   zero, zero, 0
 	ldloc 6
 	ldloc 16
-	beq  L_101abbc
+	beq  L_101abcc
 // --- basic block ---
-// 0x0101ab84: 0x101ab84: beq   v0, s1, 0x101ac38 subu  v1, v1, s3
+// 0x0101ab94: 0x101ab94: beq   v0, s1, 0x101ac48 subu  v1, v1, s3
 	ldloc 6
 	ldloc 10
 	ldloc 7
 	ldloc 11
 	sub
 	stloc 7
-	beq  L_101ac38
+	beq  L_101ac48
 // --- basic block ---
-// 0x0101ab8c: 0x101ab8c: addiu v1, zero, 3
+// 0x0101ab9c: 0x101ab9c: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x0101ab90: 0x101ab90: bne   v0, v1, 0x101ac44 sll   zero, zero, 0
+// 0x0101aba0: 0x101aba0: bne   v0, v1, 0x101ac54 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_101ac44
+	bne.un L_101ac54
 // --- basic block ---
-// 0x0101ab98: 0x101ab98: j	 0x101abf0 sll   zero, zero, 0
-	br L_101abf0
+// 0x0101aba8: 0x101aba8: j	 0x101ac00 sll   zero, zero, 0
+	br L_101ac00
 // --- basic block ---
-L_101aba0:
-// 0x0101aba0: 0x101aba0: jal   0x1042430 sw    v1, 128(sp)
+L_101abb0:
+// 0x0101abb0: 0x101abb0: jal   0x1042440 sw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3879,12 +3879,12 @@ L_101aba0:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aba8: 0x101aba8: lw    v1, 128(sp)
+// 0x0101abb8: 0x101abb8: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3893,27 +3893,27 @@ L_101aba0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101abac: 0x101abac: sll   zero, zero, 0
-// 0x0101abb0: 0x101abb0: subu  v1, v1, s3
+// 0x0101abbc: 0x101abbc: sll   zero, zero, 0
+// 0x0101abc0: 0x101abc0: subu  v1, v1, s3
 	ldloc 7
 	ldloc 11
 	sub
 	stloc 7
-// 0x0101abb4: 0x101abb4: j	 0x101ac40 subu  v1, v1, v0
+// 0x0101abc4: 0x101abc4: j	 0x101ac50 subu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 7
-	br L_101ac40
+	br L_101ac50
 // --- basic block ---
-L_101abbc:
-// 0x0101abbc: 0x101abbc: jal   0x10423fc sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+L_101abcc:
+// 0x0101abcc: 0x101abcc: jal   0x104240c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101abc4: 0x101abc4: jal   0x10163d0 sw    v0, 120(sp)
+// 0x0101abd4: 0x101abd4: jal   0x10163e0 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3922,12 +3922,12 @@ L_101abbc:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl16::roadmap_ticker_height_10163d0()
+	call int32 Cibyl16::roadmap_ticker_height_10163e0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101abcc: 0x101abcc: jal   0x1053710 sw    v0, 128(sp)
+// 0x0101abdc: 0x101abdc: jal   0x1053720 sw    v0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3941,12 +3941,12 @@ L_101abbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_height_1053710(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_height_1053720(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101abd4: 0x101abd4: lw    v1, 128(sp)
+// 0x0101abe4: 0x101abe4: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3955,7 +3955,7 @@ L_101abbc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101abd8: 0x101abd8: lw    a0, 120(sp)
+// 0x0101abe8: 0x101abe8: lw    a0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3964,26 +3964,26 @@ L_101abbc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101abdc: 0x101abdc: sll   zero, zero, 0
-// 0x0101abe0: 0x101abe0: addu  v1, a0, v1
+// 0x0101abec: 0x101abec: sll   zero, zero, 0
+// 0x0101abf0: 0x101abf0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0101abe4: 0x101abe4: addiu v1, v1, 3
+// 0x0101abf4: 0x101abf4: addiu v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	add
 	stloc 7
-// 0x0101abe8: 0x101abe8: j	 0x101ac40 addu  v1, v1, v0
+// 0x0101abf8: 0x101abf8: j	 0x101ac50 addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-	br L_101ac40
+	br L_101ac50
 // --- basic block ---
-L_101abf0:
-// 0x0101abf0: 0x101abf0: jal   0x10423fc sw    a1, 124(sp)
+L_101ac00:
+// 0x0101ac00: 0x101ac00: jal   0x104240c sw    a1, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3992,12 +3992,12 @@ L_101abf0:
 	add
 	ldloc.2
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101abf8: 0x101abf8: jal   0x10163d0 sw    v0, 120(sp)
+// 0x0101ac08: 0x101ac08: jal   0x10163e0 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4006,12 +4006,12 @@ L_101abf0:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl16::roadmap_ticker_height_10163d0()
+	call int32 Cibyl16::roadmap_ticker_height_10163e0()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ac00: 0x101ac00: jal   0x1053710 sw    v0, 128(sp)
+// 0x0101ac10: 0x101ac10: jal   0x1053720 sw    v0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4025,12 +4025,12 @@ L_101abf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_height_1053710(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_height_1053720(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ac08: 0x101ac08: lw    v1, 128(sp)
+// 0x0101ac18: 0x101ac18: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4039,7 +4039,7 @@ L_101abf0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ac0c: 0x101ac0c: lw    a0, 120(sp)
+// 0x0101ac1c: 0x101ac1c: lw    a0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4048,7 +4048,7 @@ L_101abf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ac10: 0x101ac10: lw    a1, 124(sp)
+// 0x0101ac20: 0x101ac20: lw    a1, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4057,22 +4057,22 @@ L_101abf0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101ac14: 0x101ac14: addu  v1, a0, v1
+// 0x0101ac24: 0x101ac24: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0101ac18: 0x101ac18: addiu v1, v1, 3
+// 0x0101ac28: 0x101ac28: addiu v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	add
 	stloc 7
-// 0x0101ac1c: 0x101ac1c: addu  v1, v1, v0
+// 0x0101ac2c: 0x101ac2c: addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0101ac20: 0x101ac20: sw    v1, 60(sp)
+// 0x0101ac30: 0x101ac30: sw    v1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4081,7 +4081,7 @@ L_101abf0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ac24: 0x101ac24: sw    a1, 72(sp)
+// 0x0101ac34: 0x101ac34: sw    a1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4090,7 +4090,7 @@ L_101abf0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101ac28: 0x101ac28: sw    s1, 56(sp)
+// 0x0101ac38: 0x101ac38: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4099,7 +4099,7 @@ L_101abf0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101ac2c: 0x101ac2c: sw    a1, 64(sp)
+// 0x0101ac3c: 0x101ac3c: sw    a1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4108,7 +4108,7 @@ L_101abf0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101ac30: 0x101ac30: j	 0x101ac44 sw    s1, 80(sp)
+// 0x0101ac40: 0x101ac40: j	 0x101ac54 sw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4117,19 +4117,19 @@ L_101abf0:
 	add
 	ldloc 10
 	stelem.i4
-	br L_101ac44
+	br L_101ac54
 // --- basic block ---
-L_101ac38:
-// 0x0101ac38: 0x101ac38: div   v1, s1
+L_101ac48:
+// 0x0101ac48: 0x101ac48: div   v1, s1
 	ldloc 7
 	ldloc 10
 	div
 	stloc 9
-// 0x0101ac3c: 0x101ac3c: mflo  lo
+// 0x0101ac4c: 0x101ac4c: mflo  lo
 	ldloc 9
 	stloc 7
-L_101ac40:
-// 0x0101ac40: 0x101ac40: sw    v1, 60(sp)
+L_101ac50:
+// 0x0101ac50: 0x101ac50: sw    v1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4138,8 +4138,8 @@ L_101ac40:
 	add
 	ldloc 7
 	stelem.i4
-L_101ac44:
-// 0x0101ac44: 0x101ac44: lw    v0, 60(sp)
+L_101ac54:
+// 0x0101ac54: 0x101ac54: lw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4148,7 +4148,7 @@ L_101ac44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101ac48: 0x101ac48: lw    a1, 56(sp)
+// 0x0101ac58: 0x101ac58: lw    a1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4157,22 +4157,22 @@ L_101ac44:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101ac4c: 0x101ac4c: addu  v1, s3, v0
+// 0x0101ac5c: 0x101ac5c: addu  v1, s3, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 7
-// 0x0101ac50: 0x101ac50: addiu a0, v0, 1
+// 0x0101ac60: 0x101ac60: addiu a0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0101ac54: 0x101ac54: addiu a1, a1, 4
+// 0x0101ac64: 0x101ac64: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x0101ac58: 0x101ac58: sw    v0, 68(sp)
+// 0x0101ac68: 0x101ac68: sw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4181,10 +4181,10 @@ L_101ac44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101ac5c: 0x101ac5c: addiu v0, zero, 4
+// 0x0101ac6c: 0x101ac6c: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x0101ac60: 0x101ac60: sw    v1, 84(sp)
+// 0x0101ac70: 0x101ac70: sw    v1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4193,7 +4193,7 @@ L_101ac44:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ac64: 0x101ac64: sw    a1, 40(sp)
+// 0x0101ac74: 0x101ac74: sw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4202,7 +4202,7 @@ L_101ac44:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101ac68: 0x101ac68: sw    a0, 44(sp)
+// 0x0101ac78: 0x101ac78: sw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4211,7 +4211,7 @@ L_101ac44:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101ac6c: 0x101ac6c: sw    v1, 76(sp)
+// 0x0101ac7c: 0x101ac7c: sw    v1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4220,7 +4220,7 @@ L_101ac44:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ac70: 0x101ac70: sw    v0, 36(sp)
+// 0x0101ac80: 0x101ac80: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4229,8 +4229,8 @@ L_101ac44:
 	add
 	ldloc 6
 	stelem.i4
-L_101ac74:
-// 0x0101ac74: 0x101ac74: lw    a0, 60(s0)
+L_101ac84:
+// 0x0101ac84: 0x101ac84: lw    a0, 60(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4239,18 +4239,18 @@ L_101ac74:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ac78: 0x101ac78: jal   0x104e35c sll   zero, zero, 0
+// 0x0101ac88: 0x101ac88: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ac80: 0x101ac80: jal   0x104e410 addiu a0, zero, 181
+// 0x0101ac90: 0x101ac90: jal   0x104e420 addiu a0, zero, 181
 	ldc.i4 181
 	stloc.1
 	ldloc.0
@@ -4258,26 +4258,26 @@ L_101ac74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ac88: 0x101ac88: addiu a1, sp, 36
+// 0x0101ac98: 0x101ac98: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0101ac8c: 0x101ac8c: addu  a2, s6, zero
+// 0x0101ac9c: 0x101ac9c: addu  a2, s6, zero
 	ldloc 18
 	stloc.3
-// 0x0101ac90: 0x101ac90: addiu a3, zero, 1
+// 0x0101aca0: 0x101aca0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0101ac94: 0x101ac94: addiu a0, zero, 1
+// 0x0101aca4: 0x101aca4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101ac98: 0x101ac98: jal   0x104ef80 sw    zero, 16(sp)
+// 0x0101aca8: 0x101aca8: jal   0x104ef90 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4291,49 +4291,49 @@ L_101ac74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101aca0: 0x101aca0: lui   v1, 0x30000
+// 0x0101acb0: 0x101acb0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101aca4: 0x101aca4: lw    a0, 26528(v1)
+// 0x0101acb4: 0x101acb4: lw    a0, 26992(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6632
+	ldc.i4 6748
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101aca8: 0x101aca8: jal   0x104e35c sll   zero, zero, 0
+// 0x0101acb8: 0x101acb8: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101acb0: 0x101acb0: addu  a2, s6, zero
+// 0x0101acc0: 0x101acc0: addu  a2, s6, zero
 	ldloc 18
 	stloc.3
-// 0x0101acb4: 0x101acb4: addiu a0, zero, 1
+// 0x0101acc4: 0x101acc4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101acb8: 0x101acb8: addiu a1, sp, 36
+// 0x0101acc8: 0x101acc8: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0101acbc: 0x101acbc: addu  a3, zero, zero
+// 0x0101accc: 0x101accc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101acc0: 0x101acc0: jal   0x104ef80 sw    zero, 16(sp)
+// 0x0101acd0: 0x101acd0: jal   0x104ef90 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4347,12 +4347,12 @@ L_101ac74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101acc8: 0x101acc8: lw    a2, 152(s0)
+// 0x0101acd8: 0x101acd8: lw    a2, 152(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4361,14 +4361,14 @@ L_101ac74:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101accc: 0x101accc: sll   zero, zero, 0
-// 0x0101acd0: 0x101acd0: beq   a2, zero, 0x101ad34 addiu a1, zero, 1
+// 0x0101acdc: 0x101acdc: sll   zero, zero, 0
+// 0x0101ace0: 0x101ace0: beq   a2, zero, 0x101ad44 addiu a1, zero, 1
 	ldloc.3
 	ldc.i4.1
 	stloc.2
-	brfalse L_101ad34
+	brfalse L_101ad44
 // --- basic block ---
-// 0x0101acd8: 0x101acd8: jal   0x10a1918 addu  a0, zero, zero
+// 0x0101ace8: 0x101ace8: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4376,20 +4376,20 @@ L_101ac74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ace0: 0x101ace0: div   s3, s1
+// 0x0101acf0: 0x101acf0: div   s3, s1
 	ldloc 11
 	ldloc 10
 	div
 	stloc 9
-// 0x0101ace4: 0x101ace4: addu  v1, v0, zero
+// 0x0101acf4: 0x101acf4: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0101ace8: 0x101ace8: lw    v0, 80(sp)
+// 0x0101acf8: 0x101acf8: lw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4398,15 +4398,15 @@ L_101ac74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101acec: 0x101acec: addu  a0, v1, zero
+// 0x0101acfc: 0x101acfc: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0101acf0: 0x101acf0: addiu v0, v0, 2
+// 0x0101ad00: 0x101ad00: addiu v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	add
 	stloc 6
-// 0x0101acf4: 0x101acf4: sw    v0, 48(sp)
+// 0x0101ad04: 0x101ad04: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4415,7 +4415,7 @@ L_101ac74:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101acf8: 0x101acf8: lw    v0, 84(sp)
+// 0x0101ad08: 0x101ad08: lw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4424,7 +4424,7 @@ L_101ac74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101acfc: 0x101acfc: sw    v1, 128(sp)
+// 0x0101ad0c: 0x101ad0c: sw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4433,26 +4433,26 @@ L_101ac74:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ad00: 0x101ad00: mflo  lo
+// 0x0101ad10: 0x101ad10: mflo  lo
 	ldloc 9
 	stloc 11
-// 0x0101ad04: 0x101ad04: jal   0x104dffc addu  s3, s3, v0
+// 0x0101ad14: 0x101ad14: jal   0x104e00c addu  s3, s3, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 11
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ad0c: 0x101ad0c: div   v0, s1
+// 0x0101ad1c: 0x101ad1c: div   v0, s1
 	ldloc 6
 	ldloc 10
 	div
 	stloc 9
-// 0x0101ad10: 0x101ad10: lw    v1, 128(sp)
+// 0x0101ad20: 0x101ad20: lw    v1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4461,29 +4461,29 @@ L_101ac74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ad14: 0x101ad14: addiu a1, sp, 48
+// 0x0101ad24: 0x101ad24: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x0101ad18: 0x101ad18: addu  a0, v1, zero
+// 0x0101ad28: 0x101ad28: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0101ad1c: 0x101ad1c: addu  a2, zero, zero
+// 0x0101ad2c: 0x101ad2c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101ad20: 0x101ad20: addu  a3, zero, zero
+// 0x0101ad30: 0x101ad30: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101ad24: 0x101ad24: mflo  lo
+// 0x0101ad34: 0x101ad34: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0101ad28: 0x101ad28: subu  s3, s3, v0
+// 0x0101ad38: 0x101ad38: subu  s3, s3, v0
 	ldloc 11
 	ldloc 6
 	sub
 	stloc 11
-// 0x0101ad2c: 0x101ad2c: jal   0x104f4a8 sw    s3, 52(sp)
+// 0x0101ad3c: 0x101ad3c: jal   0x104f4b8 sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4497,13 +4497,13 @@ L_101ac74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_101ad34:
-// 0x0101ad34: 0x101ad34: lw    a0, 64(s0)
+L_101ad44:
+// 0x0101ad44: 0x101ad44: lw    a0, 64(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4512,18 +4512,18 @@ L_101ad34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ad38: 0x101ad38: jal   0x104e35c sll   zero, zero, 0
+// 0x0101ad48: 0x101ad48: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ad40: 0x101ad40: lw    a0, 12(s0)
+// 0x0101ad50: 0x101ad50: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4532,18 +4532,18 @@ L_101ad34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ad44: 0x101ad44: addu  a1, s4, zero
+// 0x0101ad54: 0x101ad54: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x0101ad48: 0x101ad48: addu  a2, s7, zero
+// 0x0101ad58: 0x101ad58: addu  a2, s7, zero
 	ldloc 14
 	stloc.3
-// 0x0101ad4c: 0x101ad4c: addiu a3, sp, 40
+// 0x0101ad5c: 0x101ad5c: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x0101ad50: 0x101ad50: jal   0x1019744 sw    zero, 16(sp)
+// 0x0101ad60: 0x101ad60: jal   0x1019754 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4557,19 +4557,19 @@ L_101ad34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_string_1019744(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_string_1019754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_101ad58:
-// 0x0101ad58: 0x101ad58: addiu s0, s0, 180
+L_101ad68:
+// 0x0101ad68: 0x101ad68: addiu s0, s0, 180
 	ldloc 8
 	ldc.i4 180
 	add
 	stloc 8
-L_101ad5c:
-// 0x0101ad5c: 0x101ad5c: lw    v0, 4(s0)
+L_101ad6c:
+// 0x0101ad6c: 0x101ad6c: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4578,13 +4578,13 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101ad60: 0x101ad60: sll   zero, zero, 0
-// 0x0101ad64: 0x101ad64: bne   v0, zero, 0x101a754 sll   zero, zero, 0
+// 0x0101ad70: 0x101ad70: sll   zero, zero, 0
+// 0x0101ad74: 0x101ad74: bne   v0, zero, 0x101a764 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101a754
+	brtrue L_101a764
 // --- basic block ---
-// 0x0101ad6c: 0x101ad6c: lw    ra, 172(sp)
-// 0x0101ad70: 0x101ad70: lw    s8, 168(sp)
+// 0x0101ad7c: 0x101ad7c: lw    ra, 172(sp)
+// 0x0101ad80: 0x101ad80: lw    s8, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4593,7 +4593,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0101ad74: 0x101ad74: lw    s7, 164(sp)
+// 0x0101ad84: 0x101ad84: lw    s7, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4602,7 +4602,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101ad78: 0x101ad78: lw    s6, 160(sp)
+// 0x0101ad88: 0x101ad88: lw    s6, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4611,7 +4611,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0101ad7c: 0x101ad7c: lw    s5, 156(sp)
+// 0x0101ad8c: 0x101ad8c: lw    s5, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4620,7 +4620,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101ad80: 0x101ad80: lw    s4, 152(sp)
+// 0x0101ad90: 0x101ad90: lw    s4, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4629,7 +4629,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101ad84: 0x101ad84: lw    s3, 148(sp)
+// 0x0101ad94: 0x101ad94: lw    s3, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4638,7 +4638,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101ad88: 0x101ad88: lw    s2, 144(sp)
+// 0x0101ad98: 0x101ad98: lw    s2, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4647,7 +4647,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101ad8c: 0x101ad8c: lw    s1, 140(sp)
+// 0x0101ad9c: 0x101ad9c: lw    s1, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4656,7 +4656,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101ad90: 0x101ad90: lw    s0, 136(sp)
+// 0x0101ada0: 0x101ada0: lw    s0, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4665,7 +4665,7 @@ L_101ad5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101ad94: 0x101ad94: jr    ra addiu sp, sp, 176
+// 0x0101ada4: 0x101ada4: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -4677,7 +4677,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void roadmap_message_dummy_101ad9c()
+.method public static void roadmap_message_dummy_101adac()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -4688,13 +4688,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_101ad9c:
-// 0x0101ad9c: 0x101ad9c: jr    ra sll   zero, zero, 0
+L_101adac:
+// 0x0101adac: 0x101adac: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_message_register_101ada4(int32)
+.method public static int32 roadmap_message_register_101adb4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -4717,10 +4717,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ada4: 0x101ada4: lui   v1, 0x0
+// 0x0101adb4: 0x101adb4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101ada8: 0x101ada8: lw    v0, 4800(v1)
+// 0x0101adb8: 0x101adb8: lw    v0, 4800(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -4729,7 +4729,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101adac: 0x101adac: jr    ra sw    a0, 4800(v1)
+// 0x0101adbc: 0x101adbc: jr    ra sw    a0, 4800(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -4745,7 +4745,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_message_update_101adb4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_update_101adc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4780,15 +4780,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101adb4: 0x101adb4: lui   v0, 0x0
+// 0x0101adc4: 0x101adc4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101adb8: 0x101adb8: addiu sp, sp, -24
+// 0x0101adc8: 0x101adc8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101adbc: 0x101adbc: lw    v0, 4800(v0)
+// 0x0101adcc: 0x101adcc: lw    v0, 4800(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4797,8 +4797,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101adc0: 0x101adc0: sw    ra, 20(sp)
-// 0x0101adc4: 0x101adc4: jalr  v0 sll   zero, zero, 0
+// 0x0101add0: 0x101add0: sw    ra, 20(sp)
+// 0x0101add4: 0x101add4: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4810,9 +4810,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101adcc: 0x101adcc: lw    ra, 20(sp)
-// 0x0101add0: 0x101add0: sll   zero, zero, 0
-// 0x0101add4: 0x101add4: jr    ra addiu sp, sp, 24
+// 0x0101addc: 0x101addc: lw    ra, 20(sp)
+// 0x0101ade0: 0x101ade0: sll   zero, zero, 0
+// 0x0101ade4: 0x101ade4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4824,7 +4824,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_is_set_101addc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_is_set_101adec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4859,49 +4859,49 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101addc: 0x101addc: sll   v0, a0, 24
+// 0x0101adec: 0x101adec: sll   v0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 5
-// 0x0101ade0: 0x101ade0: addiu sp, sp, -32
+// 0x0101adf0: 0x101adf0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101ade4: 0x101ade4: sra   v0, v0, 24
+// 0x0101adf4: 0x101adf4: sra   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shr
 	stloc 5
-// 0x0101ade8: 0x101ade8: bgtz  v0, 0x101ae18 sw    ra, 28(sp)
+// 0x0101adf8: 0x101adf8: bgtz  v0, 0x101ae28 sw    ra, 28(sp)
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_101ae18
+	bgt L_101ae28
 // --- basic block ---
-// 0x0101adf0: 0x101adf0: lui   a1, 0x10000
+// 0x0101ae00: 0x101ae00: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101adf4: 0x101adf4: lui   a3, 0x10000
+// 0x0101ae04: 0x101ae04: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101adf8: 0x101adf8: addiu a1, a1, -30788
+// 0x0101ae08: 0x101ae08: addiu a1, a1, -30788
 	ldloc.2
 	ldc.i4 -30788
 	add
 	stloc.2
-// 0x0101adfc: 0x101adfc: addiu a3, a3, -30760
+// 0x0101ae0c: 0x101ae0c: addiu a3, a3, -30760
 	ldloc 4
 	ldc.i4 -30760
 	add
 	stloc 4
-// 0x0101ae00: 0x101ae00: addiu a0, zero, 4
+// 0x0101ae10: 0x101ae10: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101ae04: 0x101ae04: addiu a2, zero, 158
+// 0x0101ae14: 0x101ae14: addiu a2, zero, 158
 	ldc.i4 158
 	stloc.3
-// 0x0101ae08: 0x101ae08: jal   0x100449c sw    v0, 16(sp)
+// 0x0101ae18: 0x101ae18: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4920,58 +4920,58 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101ae10: 0x101ae10: j	 0x101ae44 addu  v0, zero, zero
+// 0x0101ae20: 0x101ae20: j	 0x101ae54 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_101ae44
+	br L_101ae54
 // --- basic block ---
-L_101ae18:
-// 0x0101ae18: 0x101ae18: lui   v1, 0x30000
+L_101ae28:
+// 0x0101ae28: 0x101ae28: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101ae1c: 0x101ae1c: addiu v1, v1, 26556
+// 0x0101ae2c: 0x101ae2c: addiu v1, v1, 27020
 	ldloc 6
-	ldc.i4 26556
+	ldc.i4 27020
 	add
 	stloc 6
-// 0x0101ae20: 0x101ae20: sll   v0, v0, 2
+// 0x0101ae30: 0x101ae30: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0101ae24: 0x101ae24: addu  v0, v0, v1
+// 0x0101ae34: 0x101ae34: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0101ae28: 0x101ae28: lw    v1, 0(v0)
+// 0x0101ae38: 0x101ae38: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101ae2c: 0x101ae2c: sll   zero, zero, 0
-// 0x0101ae30: 0x101ae30: beq   v1, zero, 0x101ae44 addu  v0, zero, zero
+// 0x0101ae3c: 0x101ae3c: sll   zero, zero, 0
+// 0x0101ae40: 0x101ae40: beq   v1, zero, 0x101ae54 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_101ae44
+	brfalse L_101ae54
 // --- basic block ---
-// 0x0101ae38: 0x101ae38: lb    v0, 0(v1)
+// 0x0101ae48: 0x101ae48: lb    v0, 0(v1)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101ae3c: 0x101ae3c: sll   zero, zero, 0
-// 0x0101ae40: 0x101ae40: sltu  v0, zero, v0
+// 0x0101ae4c: 0x101ae4c: sll   zero, zero, 0
+// 0x0101ae50: 0x101ae50: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-L_101ae44:
-// 0x0101ae44: 0x101ae44: lw    ra, 28(sp)
-// 0x0101ae48: 0x101ae48: sll   zero, zero, 0
-// 0x0101ae4c: 0x101ae4c: jr    ra addiu sp, sp, 32
+L_101ae54:
+// 0x0101ae54: 0x101ae54: lw    ra, 28(sp)
+// 0x0101ae58: 0x101ae58: sll   zero, zero, 0
+// 0x0101ae5c: 0x101ae5c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4983,7 +4983,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5018,49 +5018,49 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ae54: 0x101ae54: sll   v0, a0, 24
+// 0x0101ae64: 0x101ae64: sll   v0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 5
-// 0x0101ae58: 0x101ae58: addiu sp, sp, -32
+// 0x0101ae68: 0x101ae68: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101ae5c: 0x101ae5c: sra   v0, v0, 24
+// 0x0101ae6c: 0x101ae6c: sra   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shr
 	stloc 5
-// 0x0101ae60: 0x101ae60: bgtz  v0, 0x101ae90 sw    ra, 28(sp)
+// 0x0101ae70: 0x101ae70: bgtz  v0, 0x101aea0 sw    ra, 28(sp)
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_101ae90
+	bgt L_101aea0
 // --- basic block ---
-// 0x0101ae68: 0x101ae68: lui   a1, 0x10000
+// 0x0101ae78: 0x101ae78: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101ae6c: 0x101ae6c: lui   a3, 0x10000
+// 0x0101ae7c: 0x101ae7c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101ae70: 0x101ae70: addiu a1, a1, -30788
+// 0x0101ae80: 0x101ae80: addiu a1, a1, -30788
 	ldloc.2
 	ldc.i4 -30788
 	add
 	stloc.2
-// 0x0101ae74: 0x101ae74: addiu a3, a3, -30760
+// 0x0101ae84: 0x101ae84: addiu a3, a3, -30760
 	ldloc 4
 	ldc.i4 -30760
 	add
 	stloc 4
-// 0x0101ae78: 0x101ae78: addiu a0, zero, 4
+// 0x0101ae88: 0x101ae88: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101ae7c: 0x101ae7c: addiu a2, zero, 143
+// 0x0101ae8c: 0x101ae8c: addiu a2, zero, 143
 	ldc.i4 143
 	stloc.3
-// 0x0101ae80: 0x101ae80: jal   0x100449c sw    v0, 16(sp)
+// 0x0101ae90: 0x101ae90: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5079,48 +5079,48 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101ae88: 0x101ae88: j	 0x101aeb4 sll   zero, zero, 0
-	br L_101aeb4
+// 0x0101ae98: 0x101ae98: j	 0x101aec4 sll   zero, zero, 0
+	br L_101aec4
 // --- basic block ---
-L_101ae90:
-// 0x0101ae90: 0x101ae90: lui   v1, 0x30000
+L_101aea0:
+// 0x0101aea0: 0x101aea0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101ae94: 0x101ae94: sll   v0, v0, 2
+// 0x0101aea4: 0x101aea4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0101ae98: 0x101ae98: addiu v1, v1, 26556
+// 0x0101aea8: 0x101aea8: addiu v1, v1, 27020
 	ldloc 6
-	ldc.i4 26556
+	ldc.i4 27020
 	add
 	stloc 6
-// 0x0101ae9c: 0x101ae9c: addu  v0, v0, v1
+// 0x0101aeac: 0x101aeac: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0101aea0: 0x101aea0: lw    v0, 0(v0)
+// 0x0101aeb0: 0x101aeb0: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101aea4: 0x101aea4: sll   zero, zero, 0
-// 0x0101aea8: 0x101aea8: beq   v0, zero, 0x101aeb4 sll   zero, zero, 0
+// 0x0101aeb4: 0x101aeb4: sll   zero, zero, 0
+// 0x0101aeb8: 0x101aeb8: beq   v0, zero, 0x101aec4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101aeb4
+	brfalse L_101aec4
 // --- basic block ---
-// 0x0101aeb0: 0x101aeb0: sb    zero, 0(v0)
+// 0x0101aec0: 0x101aec0: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_101aeb4:
-// 0x0101aeb4: 0x101aeb4: lw    ra, 28(sp)
-// 0x0101aeb8: 0x101aeb8: sll   zero, zero, 0
-// 0x0101aebc: 0x101aebc: jr    ra addiu sp, sp, 32
+L_101aec4:
+// 0x0101aec4: 0x101aec4: lw    ra, 28(sp)
+// 0x0101aec8: 0x101aec8: sll   zero, zero, 0
+// 0x0101aecc: 0x101aecc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5132,7 +5132,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -5173,12 +5173,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101aec4: 0x101aec4: addiu sp, sp, -56
+// 0x0101aed4: 0x101aed4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0101aec8: 0x101aec8: sw    s0, 44(sp)
+// 0x0101aed8: 0x101aed8: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5187,18 +5187,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101aecc: 0x101aecc: sll   s0, a0, 24
+// 0x0101aedc: 0x101aedc: sll   s0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 7
-// 0x0101aed0: 0x101aed0: sra   s0, s0, 24
+// 0x0101aee0: 0x101aee0: sra   s0, s0, 24
 	ldloc 7
 	ldc.i4.s 24
 	shr
 	stloc 7
-// 0x0101aed4: 0x101aed4: sw    ra, 52(sp)
-// 0x0101aed8: 0x101aed8: sw    s1, 48(sp)
+// 0x0101aee4: 0x101aee4: sw    ra, 52(sp)
+// 0x0101aee8: 0x101aee8: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5207,7 +5207,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101aedc: 0x101aedc: sw    a2, 64(sp)
+// 0x0101aeec: 0x101aeec: sw    a2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5216,7 +5216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101aee0: 0x101aee0: bgtz  s0, 0x101af10 sw    a3, 68(sp)
+// 0x0101aef0: 0x101aef0: bgtz  s0, 0x101af20 sw    a3, 68(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -5227,31 +5227,31 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	stelem.i4
 	ldc.i4.s 0
-	bgt L_101af10
+	bgt L_101af20
 // --- basic block ---
-// 0x0101aee8: 0x101aee8: lui   a1, 0x10000
+// 0x0101aef8: 0x101aef8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101aeec: 0x101aeec: lui   a3, 0x10000
+// 0x0101aefc: 0x101aefc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101aef0: 0x101aef0: addiu a1, a1, -30788
+// 0x0101af00: 0x101af00: addiu a1, a1, -30788
 	ldloc.2
 	ldc.i4 -30788
 	add
 	stloc.2
-// 0x0101aef4: 0x101aef4: addiu a3, a3, -30760
+// 0x0101af04: 0x101af04: addiu a3, a3, -30760
 	ldloc 4
 	ldc.i4 -30760
 	add
 	stloc 4
-// 0x0101aef8: 0x101aef8: addiu a0, zero, 4
+// 0x0101af08: 0x101af08: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101aefc: 0x101aefc: addiu a2, zero, 113
+// 0x0101af0c: 0x101af0c: addiu a2, zero, 113
 	ldc.i4.s 113
 	stloc.3
-// 0x0101af00: 0x101af00: jal   0x100449c sw    s0, 16(sp)
+// 0x0101af10: 0x101af10: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5270,36 +5270,36 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0101af08: 0x101af08: j	 0x101afa4 sll   zero, zero, 0
-	br L_101afa4
+// 0x0101af18: 0x101af18: j	 0x101afb4 sll   zero, zero, 0
+	br L_101afb4
 // --- basic block ---
-L_101af10:
-// 0x0101af10: 0x101af10: bne   a1, zero, 0x101af3c lui   s1, 0x30000
+L_101af20:
+// 0x0101af20: 0x101af20: bne   a1, zero, 0x101af4c lui   s1, 0x30000
 	ldloc.2
 	ldc.i4 196608
 	stloc 8
-	brtrue L_101af3c
+	brtrue L_101af4c
 // --- basic block ---
-// 0x0101af18: 0x101af18: lui   a1, 0x10000
+// 0x0101af28: 0x101af28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101af1c: 0x101af1c: lui   a3, 0x10000
+// 0x0101af2c: 0x101af2c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101af20: 0x101af20: addiu a1, a1, -30788
+// 0x0101af30: 0x101af30: addiu a1, a1, -30788
 	ldloc.2
 	ldc.i4 -30788
 	add
 	stloc.2
-// 0x0101af24: 0x101af24: addiu a3, a3, -30732
+// 0x0101af34: 0x101af34: addiu a3, a3, -30732
 	ldloc 4
 	ldc.i4 -30732
 	add
 	stloc 4
-// 0x0101af28: 0x101af28: addiu a0, zero, 4
+// 0x0101af38: 0x101af38: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101af2c: 0x101af2c: jal   0x100449c addiu a2, zero, 120
+// 0x0101af3c: 0x101af3c: jal   0x100449c addiu a2, zero, 120
 	ldc.i4.s 120
 	stloc.3
 	ldloc.0
@@ -5312,43 +5312,43 @@ L_101af10:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0101af34: 0x101af34: j	 0x101afa4 sll   zero, zero, 0
-	br L_101afa4
+// 0x0101af44: 0x101af44: j	 0x101afb4 sll   zero, zero, 0
+	br L_101afb4
 // --- basic block ---
-L_101af3c:
-// 0x0101af3c: 0x101af3c: sll   v0, s0, 2
+L_101af4c:
+// 0x0101af4c: 0x101af4c: sll   v0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0101af40: 0x101af40: addiu s1, s1, 26556
+// 0x0101af50: 0x101af50: addiu s1, s1, 27020
 	ldloc 8
-	ldc.i4 26556
+	ldc.i4 27020
 	add
 	stloc 8
-// 0x0101af44: 0x101af44: addu  s1, v0, s1
+// 0x0101af54: 0x101af54: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0101af48: 0x101af48: lw    v0, 0(s1)
+// 0x0101af58: 0x101af58: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101af4c: 0x101af4c: sll   zero, zero, 0
-// 0x0101af50: 0x101af50: bne   v0, zero, 0x101af70 lui   v0, 0x30000
+// 0x0101af5c: 0x101af5c: sll   zero, zero, 0
+// 0x0101af60: 0x101af60: bne   v0, zero, 0x101af80 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_101af70
+	brtrue L_101af80
 // --- basic block ---
-// 0x0101af58: 0x101af58: addiu a0, zero, 100
+// 0x0101af68: 0x101af68: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x0101af5c: 0x101af5c: jal   0x1000910 sw    a1, 32(sp)
+// 0x0101af6c: 0x101af6c: jal   0x1000910 sw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5367,7 +5367,7 @@ L_101af3c:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0101af64: 0x101af64: lw    a1, 32(sp)
+// 0x0101af74: 0x101af74: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5376,54 +5376,54 @@ L_101af3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101af68: 0x101af68: sw    v0, 0(s1)
+// 0x0101af78: 0x101af78: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0101af6c: 0x101af6c: lui   v0, 0x30000
+// 0x0101af7c: 0x101af7c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_101af70:
-// 0x0101af70: 0x101af70: addiu v0, v0, 26556
+L_101af80:
+// 0x0101af80: 0x101af80: addiu v0, v0, 27020
 	ldloc 5
-	ldc.i4 26556
+	ldc.i4 27020
 	add
 	stloc 5
-// 0x0101af74: 0x101af74: sll   s0, s0, 2
+// 0x0101af84: 0x101af84: sll   s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0101af78: 0x101af78: addu  s0, s0, v0
+// 0x0101af88: 0x101af88: addu  s0, s0, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0101af7c: 0x101af7c: lw    a0, 0(s0)
+// 0x0101af8c: 0x101af8c: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101af80: 0x101af80: addiu v0, sp, 64
+// 0x0101af90: 0x101af90: addiu v0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 5
-// 0x0101af84: 0x101af84: addu  a2, a1, zero
+// 0x0101af94: 0x101af94: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0101af88: 0x101af88: addu  a3, v0, zero
+// 0x0101af98: 0x101af98: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0101af8c: 0x101af8c: addiu a1, zero, 100
+// 0x0101af9c: 0x101af9c: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0101af90: 0x101af90: jal   0x10c0a70 sw    v0, 24(sp)
+// 0x0101afa0: 0x101afa0: jal   0x10c10b0 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5437,28 +5437,28 @@ L_101af70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0101af98: 0x101af98: lw    v0, 0(s0)
+// 0x0101afa8: 0x101afa8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101af9c: 0x101af9c: sll   zero, zero, 0
-// 0x0101afa0: 0x101afa0: sb    zero, 99(v0)
+// 0x0101afac: 0x101afac: sll   zero, zero, 0
+// 0x0101afb0: 0x101afb0: sb    zero, 99(v0)
 	ldloc 5
 	ldc.i4.s 99
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_101afa4:
-// 0x0101afa4: 0x101afa4: lw    ra, 52(sp)
-// 0x0101afa8: 0x101afa8: lw    s1, 48(sp)
+L_101afb4:
+// 0x0101afb4: 0x101afb4: lw    ra, 52(sp)
+// 0x0101afb8: 0x101afb8: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5467,7 +5467,7 @@ L_101afa4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101afac: 0x101afac: lw    s0, 44(sp)
+// 0x0101afbc: 0x101afbc: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5476,7 +5476,7 @@ L_101afa4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101afb0: 0x101afb0: jr    ra addiu sp, sp, 56
+// 0x0101afc0: 0x101afc0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5488,7 +5488,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -5541,12 +5541,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101afb8: 0x101afb8: addiu sp, sp, -48
+// 0x0101afc8: 0x101afc8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101afbc: 0x101afbc: sw    s5, 40(sp)
+// 0x0101afcc: 0x101afcc: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5555,7 +5555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101afc0: 0x101afc0: sw    s0, 20(sp)
+// 0x0101afd0: 0x101afd0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5564,18 +5564,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101afc4: 0x101afc4: addiu a1, a1, -1
+// 0x0101afd4: 0x101afd4: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x0101afc8: 0x101afc8: addu  s0, a0, zero
+// 0x0101afd8: 0x101afd8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0101afcc: 0x101afcc: lui   s5, 0x30000
+// 0x0101afdc: 0x101afdc: lui   s5, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x0101afd0: 0x101afd0: sw    s4, 36(sp)
+// 0x0101afe0: 0x101afe0: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5584,7 +5584,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101afd4: 0x101afd4: sw    s3, 32(sp)
+// 0x0101afe4: 0x101afe4: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5593,7 +5593,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101afd8: 0x101afd8: sw    s2, 28(sp)
+// 0x0101afe8: 0x101afe8: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5602,7 +5602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101afdc: 0x101afdc: sw    s1, 24(sp)
+// 0x0101afec: 0x101afec: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5611,122 +5611,122 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101afe0: 0x101afe0: sw    ra, 44(sp)
-// 0x0101afe4: 0x101afe4: addu  a0, a2, zero
+// 0x0101aff0: 0x101aff0: sw    ra, 44(sp)
+// 0x0101aff4: 0x101aff4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0101afe8: 0x101afe8: addu  s1, s0, a1
+// 0x0101aff8: 0x101aff8: addu  s1, s0, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc 10
-// 0x0101afec: 0x101afec: addiu s5, s5, 26556
+// 0x0101affc: 0x101affc: addiu s5, s5, 27020
 	ldloc 9
-	ldc.i4 26556
+	ldc.i4 27020
 	add
 	stloc 9
-// 0x0101aff0: 0x101aff0: addu  v1, s0, zero
+// 0x0101b000: 0x101b000: addu  v1, s0, zero
 	ldloc 8
 	stloc 7
-// 0x0101aff4: 0x101aff4: addiu s4, zero, 37
+// 0x0101b004: 0x101b004: addiu s4, zero, 37
 	ldc.i4.s 37
 	stloc 13
-// 0x0101aff8: 0x101aff8: addiu s3, zero, 124
+// 0x0101b008: 0x101b008: addiu s3, zero, 124
 	ldc.i4.s 124
 	stloc 12
-// 0x0101affc: 0x101affc: j	 0x101b09c addu  s2, s0, zero
+// 0x0101b00c: 0x101b00c: j	 0x101b0ac addu  s2, s0, zero
 	ldloc 8
 	stloc 11
-	br L_101b09c
+	br L_101b0ac
 // --- basic block ---
-L_101b004:
-// 0x0101b004: 0x101b004: bne   v0, s4, 0x101b07c sll   zero, zero, 0
+L_101b014:
+// 0x0101b014: 0x101b014: bne   v0, s4, 0x101b08c sll   zero, zero, 0
 	ldloc 5
 	ldloc 13
-	bne.un L_101b07c
+	bne.un L_101b08c
 // --- basic block ---
-// 0x0101b00c: 0x101b00c: lb    v0, 1(a0)
+// 0x0101b01c: 0x101b01c: lb    v0, 1(a0)
 	ldloc.1
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b010: 0x101b010: sll   zero, zero, 0
-// 0x0101b014: 0x101b014: blez  v0, 0x101b0ac sll   v0, v0, 2
+// 0x0101b020: 0x101b020: sll   zero, zero, 0
+// 0x0101b024: 0x101b024: blez  v0, 0x101b0bc sll   v0, v0, 2
 	ldloc 5
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
 	ldc.i4.s 0
-	ble L_101b0ac
+	ble L_101b0bc
 // --- basic block ---
-// 0x0101b01c: 0x101b01c: addu  v0, v0, s5
+// 0x0101b02c: 0x101b02c: addu  v0, v0, s5
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x0101b020: 0x101b020: lw    v0, 0(v0)
+// 0x0101b030: 0x101b030: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101b024: 0x101b024: sll   zero, zero, 0
-// 0x0101b028: 0x101b028: bne   v0, zero, 0x101b044 addiu a0, a0, 2
+// 0x0101b034: 0x101b034: sll   zero, zero, 0
+// 0x0101b038: 0x101b038: bne   v0, zero, 0x101b054 addiu a0, a0, 2
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	add
 	stloc.1
-	brtrue L_101b044
+	brtrue L_101b054
 // --- basic block ---
-// 0x0101b030: 0x101b030: j	 0x101b064 sll   zero, zero, 0
-	br L_101b064
+// 0x0101b040: 0x101b040: j	 0x101b074 sll   zero, zero, 0
+	br L_101b074
 // --- basic block ---
-L_101b038:
-// 0x0101b038: 0x101b038: sb    a1, 0(v1)
+L_101b048:
+// 0x0101b048: 0x101b048: sb    a1, 0(v1)
 	ldloc 7
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101b03c: 0x101b03c: addiu v0, v0, 1
+// 0x0101b04c: 0x101b04c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0101b040: 0x101b040: addiu v1, v1, 1
+// 0x0101b050: 0x101b050: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_101b044:
-// 0x0101b044: 0x101b044: lb    a1, 0(v0)
+L_101b054:
+// 0x0101b054: 0x101b054: lb    a1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0101b048: 0x101b048: sll   zero, zero, 0
-// 0x0101b04c: 0x101b04c: beq   a1, zero, 0x101b090 sltu  a2, v1, s1
+// 0x0101b058: 0x101b058: sll   zero, zero, 0
+// 0x0101b05c: 0x101b05c: beq   a1, zero, 0x101b0a0 sltu  a2, v1, s1
 	ldloc.2
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc.3
-	brfalse L_101b090
+	brfalse L_101b0a0
 // --- basic block ---
-// 0x0101b054: 0x101b054: bne   a2, zero, 0x101b038 sll   zero, zero, 0
+// 0x0101b064: 0x101b064: bne   a2, zero, 0x101b048 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_101b038
+	brtrue L_101b048
 // --- basic block ---
-// 0x0101b05c: 0x101b05c: j	 0x101b0b0 sltu  v0, s0, v1
+// 0x0101b06c: 0x101b06c: j	 0x101b0c0 sltu  v0, s0, v1
 	ldloc 8
 	ldloc 7
 	clt.un
 	stloc 5
-	br L_101b0b0
+	br L_101b0c0
 // --- basic block ---
-L_101b064:
-// 0x0101b064: 0x101b064: jal   0x1001a5c addiu a1, zero, 124
+L_101b074:
+// 0x0101b074: 0x101b074: jal   0x1001a5c addiu a1, zero, 124
 	ldc.i4.s 124
 	stloc.2
 	ldloc.1
@@ -5736,77 +5736,77 @@ L_101b064:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b06c: 0x101b06c: beq   v0, zero, 0x101b0b4 addu  v1, s2, zero
+// 0x0101b07c: 0x101b07c: beq   v0, zero, 0x101b0c4 addu  v1, s2, zero
 	ldloc 5
 	ldloc 11
 	stloc 7
-	brfalse L_101b0b4
+	brfalse L_101b0c4
 // --- basic block ---
-// 0x0101b074: 0x101b074: j	 0x101b090 addiu a0, v0, 1
+// 0x0101b084: 0x101b084: j	 0x101b0a0 addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-	br L_101b090
+	br L_101b0a0
 // --- basic block ---
-L_101b07c:
-// 0x0101b07c: 0x101b07c: beq   v0, s3, 0x101b0ac sll   zero, zero, 0
+L_101b08c:
+// 0x0101b08c: 0x101b08c: beq   v0, s3, 0x101b0bc sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	beq  L_101b0ac
+	beq  L_101b0bc
 // --- basic block ---
-// 0x0101b084: 0x101b084: sb    v0, 0(v1)
+// 0x0101b094: 0x101b094: sb    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101b088: 0x101b088: addiu a0, a0, 1
+// 0x0101b098: 0x101b098: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0101b08c: 0x101b08c: addiu v1, v1, 1
+// 0x0101b09c: 0x101b09c: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_101b090:
-// 0x0101b090: 0x101b090: sltu  v0, v1, s1
+L_101b0a0:
+// 0x0101b0a0: 0x101b0a0: sltu  v0, v1, s1
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc 5
-// 0x0101b094: 0x101b094: beq   v0, zero, 0x101b0b0 sltu  v0, s0, v1
+// 0x0101b0a4: 0x101b0a4: beq   v0, zero, 0x101b0c0 sltu  v0, s0, v1
 	ldloc 5
 	ldloc 8
 	ldloc 7
 	clt.un
 	stloc 5
-	brfalse L_101b0b0
+	brfalse L_101b0c0
 // --- basic block ---
-L_101b09c:
-// 0x0101b09c: 0x101b09c: lb    v0, 0(a0)
+L_101b0ac:
+// 0x0101b0ac: 0x101b0ac: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b0a0: 0x101b0a0: sll   zero, zero, 0
-// 0x0101b0a4: 0x101b0a4: bne   v0, zero, 0x101b004 sll   zero, zero, 0
+// 0x0101b0b0: 0x101b0b0: sll   zero, zero, 0
+// 0x0101b0b4: 0x101b0b4: bne   v0, zero, 0x101b014 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101b004
+	brtrue L_101b014
 // --- basic block ---
-L_101b0ac:
-// 0x0101b0ac: 0x101b0ac: sltu  v0, s0, v1
+L_101b0bc:
+// 0x0101b0bc: 0x101b0bc: sltu  v0, s0, v1
 	ldloc 8
 	ldloc 7
 	clt.un
 	stloc 5
-L_101b0b0:
-// 0x0101b0b0: 0x101b0b0: sb    zero, 0(v1)
+L_101b0c0:
+// 0x0101b0c0: 0x101b0c0: sb    zero, 0(v1)
 	ldloc 7
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_101b0b4:
-// 0x0101b0b4: 0x101b0b4: lw    ra, 44(sp)
-// 0x0101b0b8: 0x101b0b8: lw    s5, 40(sp)
+L_101b0c4:
+// 0x0101b0c4: 0x101b0c4: lw    ra, 44(sp)
+// 0x0101b0c8: 0x101b0c8: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5815,7 +5815,7 @@ L_101b0b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101b0bc: 0x101b0bc: lw    s4, 36(sp)
+// 0x0101b0cc: 0x101b0cc: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5824,7 +5824,7 @@ L_101b0b4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101b0c0: 0x101b0c0: lw    s3, 32(sp)
+// 0x0101b0d0: 0x101b0d0: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5833,7 +5833,7 @@ L_101b0b4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101b0c4: 0x101b0c4: lw    s2, 28(sp)
+// 0x0101b0d4: 0x101b0d4: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5842,7 +5842,7 @@ L_101b0b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101b0c8: 0x101b0c8: lw    s1, 24(sp)
+// 0x0101b0d8: 0x101b0d8: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5851,7 +5851,7 @@ L_101b0b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101b0cc: 0x101b0cc: lw    s0, 20(sp)
+// 0x0101b0dc: 0x101b0dc: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5860,7 +5860,7 @@ L_101b0b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b0d0: 0x101b0d0: jr    ra addiu sp, sp, 48
+// 0x0101b0e0: 0x101b0e0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5872,7 +5872,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_sprite_decode_point_101b0d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sprite_decode_point_101b0e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -5910,12 +5910,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101b0d8: 0x101b0d8: addiu sp, sp, -32
+// 0x0101b0e8: 0x101b0e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101b0dc: 0x101b0dc: sw    s0, 24(sp)
+// 0x0101b0ec: 0x101b0ec: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5924,10 +5924,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101b0e0: 0x101b0e0: addu  s0, a0, zero
+// 0x0101b0f0: 0x101b0f0: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0101b0e4: 0x101b0e4: sw    a1, 16(sp)
+// 0x0101b0f4: 0x101b0f4: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5936,8 +5936,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101b0e8: 0x101b0e8: sw    ra, 28(sp)
-// 0x0101b0ec: 0x101b0ec: jal   0x1000d8c addu  a0, a1, zero
+// 0x0101b0f8: 0x101b0f8: sw    ra, 28(sp)
+// 0x0101b0fc: 0x101b0fc: jal   0x1000d8c addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -5950,7 +5950,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101b0f4: 0x101b0f4: lw    a1, 16(sp)
+// 0x0101b104: 0x101b104: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5959,17 +5959,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101b0f8: 0x101b0f8: sw    v0, 0(s0)
+// 0x0101b108: 0x101b108: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0101b0fc: 0x101b0fc: addu  a0, a1, zero
+// 0x0101b10c: 0x101b10c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0101b100: 0x101b100: jal   0x1001a5c addiu a1, zero, 44
+// 0x0101b110: 0x101b110: jal   0x1001a5c addiu a1, zero, 44
 	ldc.i4.s 44
 	stloc.2
 	ldloc.1
@@ -5979,11 +5979,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101b108: 0x101b108: beq   v0, zero, 0x101b120 sll   zero, zero, 0
+// 0x0101b118: 0x101b118: beq   v0, zero, 0x101b130 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101b120
+	brfalse L_101b130
 // --- basic block ---
-// 0x0101b110: 0x101b110: jal   0x1000d8c addiu a0, v0, 1
+// 0x0101b120: 0x101b120: jal   0x1000d8c addiu a0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
@@ -5998,7 +5998,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101b118: 0x101b118: j	 0x101b124 sw    v0, 4(s0)
+// 0x0101b128: 0x101b128: j	 0x101b134 sw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6007,10 +6007,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	br L_101b124
+	br L_101b134
 // --- basic block ---
-L_101b120:
-// 0x0101b120: 0x101b120: sw    zero, 4(s0)
+L_101b130:
+// 0x0101b130: 0x101b130: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6019,9 +6019,9 @@ L_101b120:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101b124:
-// 0x0101b124: 0x101b124: lw    ra, 28(sp)
-// 0x0101b128: 0x101b128: lw    s0, 24(sp)
+L_101b134:
+// 0x0101b134: 0x101b134: lw    ra, 28(sp)
+// 0x0101b138: 0x101b138: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6030,7 +6030,7 @@ L_101b124:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b12c: 0x101b12c: jr    ra addiu sp, sp, 32
+// 0x0101b13c: 0x101b13c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6042,7 +6042,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_sprite_decode_sequence_101b134(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sprite_decode_sequence_101b144(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s4,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -6092,24 +6092,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101b134: 0x101b134: lw    v0, 0(a0)
+// 0x0101b144: 0x101b144: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101b138: 0x101b138: addiu sp, sp, -48
+// 0x0101b148: 0x101b148: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101b13c: 0x101b13c: addiu v0, v0, 1
+// 0x0101b14c: 0x101b14c: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0101b140: 0x101b140: sw    s0, 24(sp)
+// 0x0101b150: 0x101b150: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6118,10 +6118,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101b144: 0x101b144: addu  s0, a0, zero
+// 0x0101b154: 0x101b154: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0101b148: 0x101b148: lw    a0, 4(a0)
+// 0x0101b158: 0x101b158: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6130,7 +6130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b14c: 0x101b14c: sw    s1, 28(sp)
+// 0x0101b15c: 0x101b15c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6139,24 +6139,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101b150: 0x101b150: sw    v0, 0(s0)
+// 0x0101b160: 0x101b160: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0101b154: 0x101b154: addiu s1, a1, -1
+// 0x0101b164: 0x101b164: addiu s1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0101b158: 0x101b158: sll   a1, v0, 2
+// 0x0101b168: 0x101b168: sll   a1, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0101b15c: 0x101b15c: sw    a2, 16(sp)
+// 0x0101b16c: 0x101b16c: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6165,8 +6165,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101b160: 0x101b160: sw    ra, 44(sp)
-// 0x0101b164: 0x101b164: sw    s4, 40(sp)
+// 0x0101b170: 0x101b170: sw    ra, 44(sp)
+// 0x0101b174: 0x101b174: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6175,7 +6175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101b168: 0x101b168: sw    s3, 36(sp)
+// 0x0101b178: 0x101b178: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6184,7 +6184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101b16c: 0x101b16c: jal   0x1000a60 sw    s2, 32(sp)
+// 0x0101b17c: 0x101b17c: jal   0x1000a60 sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6203,14 +6203,14 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101b174: 0x101b174: lw    v1, 0(s0)
+// 0x0101b184: 0x101b184: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0101b178: 0x101b178: lw    a0, 12(s0)
+// 0x0101b188: 0x101b188: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6219,29 +6219,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b17c: 0x101b17c: addiu v1, v1, -1
+// 0x0101b18c: 0x101b18c: addiu v1, v1, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x0101b180: 0x101b180: sll   v1, v1, 2
+// 0x0101b190: 0x101b190: sll   v1, v1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x0101b184: 0x101b184: addu  v1, v0, v1
+// 0x0101b194: 0x101b194: addu  v1, v0, v1
 	ldloc 6
 	ldloc 9
 	add
 	stloc 9
-// 0x0101b188: 0x101b188: sw    s1, 0(v1)
+// 0x0101b198: 0x101b198: sw    s1, 0(v1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x0101b18c: 0x101b18c: lw    a1, 8(s0)
+// 0x0101b19c: 0x101b19c: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6250,7 +6250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101b190: 0x101b190: sw    v0, 4(s0)
+// 0x0101b1a0: 0x101b1a0: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6259,12 +6259,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101b194: 0x101b194: addu  a1, s1, a1
+// 0x0101b1a4: 0x101b1a4: addu  a1, s1, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc.2
-// 0x0101b198: 0x101b198: jal   0x1000a60 sll   a1, a1, 3
+// 0x0101b1a8: 0x101b1a8: jal   0x1000a60 sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
@@ -6279,7 +6279,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101b1a0: 0x101b1a0: lw    s4, 8(s0)
+// 0x0101b1b0: 0x101b1b0: lw    s4, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6288,7 +6288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b1a4: 0x101b1a4: lw    a2, 16(sp)
+// 0x0101b1b4: 0x101b1b4: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6297,17 +6297,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101b1a8: 0x101b1a8: addiu s4, s4, -1
+// 0x0101b1b8: 0x101b1b8: addiu s4, s4, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x0101b1ac: 0x101b1ac: sll   s4, s4, 3
+// 0x0101b1bc: 0x101b1bc: sll   s4, s4, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x0101b1b0: 0x101b1b0: sw    v0, 12(s0)
+// 0x0101b1c0: 0x101b1c0: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6316,28 +6316,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101b1b4: 0x101b1b4: addu  s4, v0, s4
+// 0x0101b1c4: 0x101b1c4: addu  s4, v0, s4
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x0101b1b8: 0x101b1b8: addu  s3, a2, zero
+// 0x0101b1c8: 0x101b1c8: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x0101b1bc: 0x101b1bc: j	 0x101b1d0 addiu s2, zero, 1
+// 0x0101b1cc: 0x101b1cc: j	 0x101b1e0 addiu s2, zero, 1
 	ldc.i4.1
 	stloc 11
-	br L_101b1d0
+	br L_101b1e0
 // --- basic block ---
-L_101b1c4:
-// 0x0101b1c4: 0x101b1c4: lw    a1, 0(s3)
+L_101b1d4:
+// 0x0101b1d4: 0x101b1d4: lw    a1, 0(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101b1c8: 0x101b1c8: jal   0x101b0d8 addiu s2, s2, 1
+// 0x0101b1d8: 0x101b1d8: jal   0x101b0e8 addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
@@ -6347,34 +6347,34 @@ L_101b1c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_sprite_decode_point_101b0d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_sprite_decode_point_101b0e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_101b1d0:
-// 0x0101b1d0: 0x101b1d0: addiu s4, s4, 8
+L_101b1e0:
+// 0x0101b1e0: 0x101b1e0: addiu s4, s4, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 8
-// 0x0101b1d4: 0x101b1d4: slt   v0, s1, s2
+// 0x0101b1e4: 0x101b1e4: slt   v0, s1, s2
 	ldloc 10
 	ldloc 11
 	clt
 	stloc 6
-// 0x0101b1d8: 0x101b1d8: addu  a0, s4, zero
+// 0x0101b1e8: 0x101b1e8: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x0101b1dc: 0x101b1dc: beq   v0, zero, 0x101b1c4 addiu s3, s3, 4
+// 0x0101b1ec: 0x101b1ec: beq   v0, zero, 0x101b1d4 addiu s3, s3, 4
 	ldloc 6
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-	brfalse L_101b1c4
+	brfalse L_101b1d4
 // --- basic block ---
-// 0x0101b1e4: 0x101b1e4: lw    v0, 8(s0)
+// 0x0101b1f4: 0x101b1f4: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6383,13 +6383,13 @@ L_101b1d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101b1e8: 0x101b1e8: lw    ra, 44(sp)
-// 0x0101b1ec: 0x101b1ec: addu  s1, v0, s1
+// 0x0101b1f8: 0x101b1f8: lw    ra, 44(sp)
+// 0x0101b1fc: 0x101b1fc: addu  s1, v0, s1
 	ldloc 6
 	ldloc 10
 	add
 	stloc 10
-// 0x0101b1f0: 0x101b1f0: sw    s1, 8(s0)
+// 0x0101b200: 0x101b200: sw    s1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6398,7 +6398,7 @@ L_101b1d0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101b1f4: 0x101b1f4: lw    s4, 40(sp)
+// 0x0101b204: 0x101b204: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6407,7 +6407,7 @@ L_101b1d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b1f8: 0x101b1f8: lw    s3, 36(sp)
+// 0x0101b208: 0x101b208: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6416,7 +6416,7 @@ L_101b1d0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101b1fc: 0x101b1fc: lw    s2, 32(sp)
+// 0x0101b20c: 0x101b20c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6425,7 +6425,7 @@ L_101b1d0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101b200: 0x101b200: lw    s1, 28(sp)
+// 0x0101b210: 0x101b210: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6434,7 +6434,7 @@ L_101b1d0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101b204: 0x101b204: lw    s0, 24(sp)
+// 0x0101b214: 0x101b214: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6443,7 +6443,7 @@ L_101b1d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b208: 0x101b208: jr    ra addiu sp, sp, 48
+// 0x0101b218: 0x101b218: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6455,7 +6455,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_sprite_decode_circle_101b210(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sprite_decode_circle_101b220(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 v1,int32 s1,int32 ra)
@@ -6499,14 +6499,14 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101b210: 0x101b210: lw    v0, 0(a0)
+// 0x0101b220: 0x101b220: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101b214: 0x101b214: lw    v1, 8(a0)
+// 0x0101b224: 0x101b224: lw    v1, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6515,17 +6515,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101b218: 0x101b218: addiu sp, sp, -32
+// 0x0101b228: 0x101b228: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101b21c: 0x101b21c: addiu v1, v1, 1
+// 0x0101b22c: 0x101b22c: addiu v1, v1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0101b220: 0x101b220: sw    s0, 16(sp)
+// 0x0101b230: 0x101b230: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6534,15 +6534,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101b224: 0x101b224: addiu v0, v0, 1
+// 0x0101b234: 0x101b234: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0101b228: 0x101b228: addu  s0, a0, zero
+// 0x0101b238: 0x101b238: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0101b22c: 0x101b22c: lw    a0, 4(a0)
+// 0x0101b23c: 0x101b23c: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6551,7 +6551,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b230: 0x101b230: sw    v1, 8(s0)
+// 0x0101b240: 0x101b240: sw    v1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6560,7 +6560,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101b234: 0x101b234: sw    s1, 20(sp)
+// 0x0101b244: 0x101b244: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6569,23 +6569,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101b238: 0x101b238: sw    v0, 0(s0)
+// 0x0101b248: 0x101b248: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0101b23c: 0x101b23c: addu  s1, a1, zero
+// 0x0101b24c: 0x101b24c: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0101b240: 0x101b240: sll   a1, v0, 2
+// 0x0101b250: 0x101b250: sll   a1, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0101b244: 0x101b244: sw    ra, 28(sp)
-// 0x0101b248: 0x101b248: jal   0x1000a60 sw    s2, 24(sp)
+// 0x0101b254: 0x101b254: sw    ra, 28(sp)
+// 0x0101b258: 0x101b258: jal   0x1000a60 sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6604,14 +6604,14 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101b250: 0x101b250: lw    s2, 0(s0)
+// 0x0101b260: 0x101b260: lw    s2, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0101b254: 0x101b254: lw    a0, 8(s1)
+// 0x0101b264: 0x101b264: lw    a0, 8(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -6620,12 +6620,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b258: 0x101b258: addiu s2, s2, -1
+// 0x0101b268: 0x101b268: addiu s2, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x0101b25c: 0x101b25c: sw    v0, 4(s0)
+// 0x0101b26c: 0x101b26c: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6634,12 +6634,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101b260: 0x101b260: sll   s2, s2, 2
+// 0x0101b270: 0x101b270: sll   s2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x0101b264: 0x101b264: jal   0x1000d8c addu  s2, v0, s2
+// 0x0101b274: 0x101b274: jal   0x1000d8c addu  s2, v0, s2
 	ldloc 6
 	ldloc 8
 	add
@@ -6654,21 +6654,21 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101b26c: 0x101b26c: sw    v0, 0(s2)
+// 0x0101b27c: 0x101b27c: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0101b270: 0x101b270: lw    a1, 0(s0)
+// 0x0101b280: 0x101b280: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101b274: 0x101b274: lw    a0, 12(s0)
+// 0x0101b284: 0x101b284: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6677,7 +6677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b278: 0x101b278: jal   0x1000a60 sll   a1, a1, 3
+// 0x0101b288: 0x101b288: jal   0x1000a60 sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
@@ -6692,14 +6692,14 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101b280: 0x101b280: lw    a0, 0(s0)
+// 0x0101b290: 0x101b290: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101b284: 0x101b284: lw    a1, 4(s1)
+// 0x0101b294: 0x101b294: lw    a1, 4(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -6708,17 +6708,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101b288: 0x101b288: addiu a0, a0, -1
+// 0x0101b298: 0x101b298: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x0101b28c: 0x101b28c: sll   a0, a0, 3
+// 0x0101b29c: 0x101b29c: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0101b290: 0x101b290: sw    v0, 12(s0)
+// 0x0101b2a0: 0x101b2a0: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6727,7 +6727,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101b294: 0x101b294: jal   0x101b0d8 addu  a0, v0, a0
+// 0x0101b2a4: 0x101b2a4: jal   0x101b0e8 addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
@@ -6737,13 +6737,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_sprite_decode_point_101b0d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_sprite_decode_point_101b0e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101b29c: 0x101b29c: lw    ra, 28(sp)
-// 0x0101b2a0: 0x101b2a0: lw    s2, 24(sp)
+// 0x0101b2ac: 0x101b2ac: lw    ra, 28(sp)
+// 0x0101b2b0: 0x101b2b0: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6752,7 +6752,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b2a4: 0x101b2a4: lw    s1, 20(sp)
+// 0x0101b2b4: 0x101b2b4: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6761,7 +6761,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101b2a8: 0x101b2a8: lw    s0, 16(sp)
+// 0x0101b2b8: 0x101b2b8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6770,7 +6770,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b2ac: 0x101b2ac: jr    ra addiu sp, sp, 32
+// 0x0101b2bc: 0x101b2bc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6782,7 +6782,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 calloc_101b2b4(int32,int32,int32,int32,int32)
+.method public static int32 calloc_101b2c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 lo,int32 v1)
@@ -6823,18 +6823,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101b2b4: 0x101b2b4: mult  a1, a0
+// 0x0101b2c4: 0x101b2c4: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 9
-// 0x0101b2b8: 0x101b2b8: addiu sp, sp, -32
+// 0x0101b2c8: 0x101b2c8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101b2bc: 0x101b2bc: sw    ra, 28(sp)
-// 0x0101b2c0: 0x101b2c0: sw    s0, 24(sp)
+// 0x0101b2cc: 0x101b2cc: sw    ra, 28(sp)
+// 0x0101b2d0: 0x101b2d0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6843,13 +6843,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101b2c4: 0x101b2c4: mflo  lo
+// 0x0101b2d4: 0x101b2d4: mflo  lo
 	ldloc 9
 	stloc.3
-// 0x0101b2c8: 0x101b2c8: mflo  lo
+// 0x0101b2d8: 0x101b2d8: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0101b2cc: 0x101b2cc: jal   0x1000910 sw    a2, 16(sp)
+// 0x0101b2dc: 0x101b2dc: jal   0x1000910 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6868,7 +6868,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101b2d4: 0x101b2d4: lw    a2, 16(sp)
+// 0x0101b2e4: 0x101b2e4: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6877,13 +6877,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101b2d8: 0x101b2d8: addu  a0, v0, zero
+// 0x0101b2e8: 0x101b2e8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0101b2dc: 0x101b2dc: addu  a1, zero, zero
+// 0x0101b2ec: 0x101b2ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101b2e0: 0x101b2e0: jal   0x100177c addu  s0, v0, zero
+// 0x0101b2f0: 0x101b2f0: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -6895,11 +6895,11 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101b2e8: 0x101b2e8: lw    ra, 28(sp)
-// 0x0101b2ec: 0x101b2ec: addu  v0, s0, zero
+// 0x0101b2f8: 0x101b2f8: lw    ra, 28(sp)
+// 0x0101b2fc: 0x101b2fc: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0101b2f0: 0x101b2f0: lw    s0, 24(sp)
+// 0x0101b300: 0x101b300: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6908,7 +6908,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b2f4: 0x101b2f4: jr    ra addiu sp, sp, 32
+// 0x0101b304: 0x101b304: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6920,7 +6920,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_sprite_load_101b2fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sprite_load_101b30c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s5,int32 s6,int32 s2,int32 s3,int32 s4,int32 s7,int32 s8,int32 ra)
@@ -6982,12 +6982,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101b2fc: 0x101b2fc: addiu sp, sp, -2640
+// 0x0101b30c: 0x101b30c: addiu sp, sp, -2640
 	ldloc.0
 	ldc.i4 -2640
 	add
 	stloc.0
-// 0x0101b300: 0x101b300: sw    s4, 2616(sp)
+// 0x0101b310: 0x101b310: sw    s4, 2616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6996,10 +6996,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101b304: 0x101b304: lui   s4, 0x10000
+// 0x0101b314: 0x101b314: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x0101b308: 0x101b308: sw    s8, 2632(sp)
+// 0x0101b318: 0x101b318: sw    s8, 2632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7008,7 +7008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101b30c: 0x101b30c: sw    s7, 2628(sp)
+// 0x0101b31c: 0x101b31c: sw    s7, 2628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7017,7 +7017,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101b310: 0x101b310: sw    s3, 2612(sp)
+// 0x0101b320: 0x101b320: sw    s3, 2612(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7026,7 +7026,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101b314: 0x101b314: sw    s2, 2608(sp)
+// 0x0101b324: 0x101b324: sw    s2, 2608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7035,7 +7035,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101b318: 0x101b318: sw    s0, 2600(sp)
+// 0x0101b328: 0x101b328: sw    s0, 2600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7044,8 +7044,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101b31c: 0x101b31c: sw    ra, 2636(sp)
-// 0x0101b320: 0x101b320: sw    s6, 2624(sp)
+// 0x0101b32c: 0x101b32c: sw    ra, 2636(sp)
+// 0x0101b330: 0x101b330: sw    s6, 2624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7054,7 +7054,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101b324: 0x101b324: sw    s5, 2620(sp)
+// 0x0101b334: 0x101b334: sw    s5, 2620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7063,7 +7063,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101b328: 0x101b328: sw    s1, 2604(sp)
+// 0x0101b338: 0x101b338: sw    s1, 2604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7072,120 +7072,120 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101b32c: 0x101b32c: addu  s3, a0, a1
+// 0x0101b33c: 0x101b33c: addu  s3, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc 13
-// 0x0101b330: 0x101b330: addiu s4, s4, -30716
+// 0x0101b340: 0x101b340: addiu s4, s4, -30716
 	ldloc 14
 	ldc.i4 -30716
 	add
 	stloc 14
-// 0x0101b334: 0x101b334: addu  s0, zero, zero
+// 0x0101b344: 0x101b344: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0101b338: 0x101b338: addiu s8, zero, 35
+// 0x0101b348: 0x101b348: addiu s8, zero, 35
 	ldc.i4.s 35
 	stloc 16
-// 0x0101b33c: 0x101b33c: addiu s2, sp, 24
+// 0x0101b34c: 0x101b34c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 12
-// 0x0101b340: 0x101b340: j	 0x101b750 lui   s7, 0x30000
+// 0x0101b350: 0x101b350: j	 0x101b760 lui   s7, 0x30000
 	ldc.i4 196608
 	stloc 15
-	br L_101b750
+	br L_101b760
 // --- basic block ---
-L_101b348:
-// 0x0101b348: 0x101b348: bne   v0, s8, 0x101b370 addiu a0, a0, 1
+L_101b358:
+// 0x0101b358: 0x101b358: bne   v0, s8, 0x101b380 addiu a0, a0, 1
 	ldloc 5
 	ldloc 16
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_101b370
+	bne.un L_101b380
 // --- basic block ---
-L_101b350:
-// 0x0101b350: 0x101b350: beq   a0, s3, 0x101b38c sll   zero, zero, 0
+L_101b360:
+// 0x0101b360: 0x101b360: beq   a0, s3, 0x101b39c sll   zero, zero, 0
 	ldloc.1
 	ldloc 13
-	beq  L_101b38c
+	beq  L_101b39c
 // --- basic block ---
-// 0x0101b358: 0x101b358: lb    v0, 0(a0)
+// 0x0101b368: 0x101b368: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b35c: 0x101b35c: sll   zero, zero, 0
-// 0x0101b360: 0x101b360: slti  v0, v0, 32
+// 0x0101b36c: 0x101b36c: sll   zero, zero, 0
+// 0x0101b370: 0x101b370: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x0101b364: 0x101b364: beq   v0, zero, 0x101b350 addiu a0, a0, 1
+// 0x0101b374: 0x101b374: beq   v0, zero, 0x101b360 addiu a0, a0, 1
 	ldloc 5
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brfalse L_101b350
+	brfalse L_101b360
 // --- basic block ---
-// 0x0101b36c: 0x101b36c: addiu a0, a0, -1
+// 0x0101b37c: 0x101b37c: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-L_101b370:
-// 0x0101b370: 0x101b370: beq   a0, s3, 0x101b38c addiu v1, zero, 10
+L_101b380:
+// 0x0101b380: 0x101b380: beq   a0, s3, 0x101b39c addiu v1, zero, 10
 	ldloc.1
 	ldloc 13
 	ldc.i4.s 10
 	stloc 7
-	beq  L_101b38c
+	beq  L_101b39c
 // --- basic block ---
-// 0x0101b378: 0x101b378: lb    v0, 0(a0)
+// 0x0101b388: 0x101b388: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b37c: 0x101b37c: sll   zero, zero, 0
-// 0x0101b380: 0x101b380: beq   v0, v1, 0x101b370 addiu a0, a0, 1
+// 0x0101b38c: 0x101b38c: sll   zero, zero, 0
+// 0x0101b390: 0x101b390: beq   v0, v1, 0x101b380 addiu a0, a0, 1
 	ldloc 5
 	ldloc 7
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	beq  L_101b370
+	beq  L_101b380
 // --- basic block ---
-// 0x0101b388: 0x101b388: addiu a0, a0, -1
+// 0x0101b398: 0x101b398: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-L_101b38c:
-// 0x0101b38c: 0x101b38c: lb    v0, 0(a0)
+L_101b39c:
+// 0x0101b39c: 0x101b39c: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b390: 0x101b390: sll   zero, zero, 0
-// 0x0101b394: 0x101b394: beq   v0, s8, 0x101b348 slti  v1, v0, 32
+// 0x0101b3a0: 0x101b3a0: sll   zero, zero, 0
+// 0x0101b3a4: 0x101b3a4: beq   v0, s8, 0x101b358 slti  v1, v0, 32
 	ldloc 5
 	ldloc 16
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 7
-	beq  L_101b348
+	beq  L_101b358
 // --- basic block ---
-// 0x0101b39c: 0x101b39c: bne   v1, zero, 0x101b348 addu  s1, a0, zero
+// 0x0101b3ac: 0x101b3ac: bne   v1, zero, 0x101b358 addu  s1, a0, zero
 	ldloc 7
 	ldloc.1
 	stloc 8
-	brtrue L_101b348
+	brtrue L_101b358
 // --- basic block ---
-// 0x0101b3a4: 0x101b3a4: sw    a0, 1560(sp)
+// 0x0101b3b4: 0x101b3b4: sw    a0, 1560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7194,42 +7194,42 @@ L_101b38c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101b3a8: 0x101b3a8: j	 0x101b40c addiu a1, zero, 1
+// 0x0101b3b8: 0x101b3b8: j	 0x101b41c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-	br L_101b40c
+	br L_101b41c
 // --- basic block ---
-L_101b3b0:
-// 0x0101b3b0: 0x101b3b0: lb    v0, 0(s1)
+L_101b3c0:
+// 0x0101b3c0: 0x101b3c0: lb    v0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b3b4: 0x101b3b4: sll   zero, zero, 0
-// 0x0101b3b8: 0x101b3b8: bne   v0, a0, 0x101b400 slti  v0, v0, 32
+// 0x0101b3c4: 0x101b3c4: sll   zero, zero, 0
+// 0x0101b3c8: 0x101b3c8: bne   v0, a0, 0x101b410 slti  v0, v0, 32
 	ldloc 5
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-	bne.un L_101b400
+	bne.un L_101b410
 // --- basic block ---
-// 0x0101b3c0: 0x101b3c0: addiu v0, a1, -1
+// 0x0101b3d0: 0x101b3d0: addiu v0, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0101b3c4: 0x101b3c4: sll   v0, v0, 2
+// 0x0101b3d4: 0x101b3d4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0101b3c8: 0x101b3c8: addu  v0, s2, v0
+// 0x0101b3d8: 0x101b3d8: addu  v0, s2, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 5
-// 0x0101b3cc: 0x101b3cc: lw    a2, 1536(v0)
+// 0x0101b3dc: 0x101b3dc: lw    a2, 1536(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7238,27 +7238,27 @@ L_101b3b0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101b3d0: 0x101b3d0: sll   v1, a1, 2
+// 0x0101b3e0: 0x101b3e0: sll   v1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0101b3d4: 0x101b3d4: subu  a2, s1, a2
+// 0x0101b3e4: 0x101b3e4: subu  a2, s1, a2
 	ldloc 8
 	ldloc.3
 	sub
 	stloc.3
-// 0x0101b3d8: 0x101b3d8: addu  v1, s2, v1
+// 0x0101b3e8: 0x101b3e8: addu  v1, s2, v1
 	ldloc 12
 	ldloc 7
 	add
 	stloc 7
-// 0x0101b3dc: 0x101b3dc: addiu a0, s1, 1
+// 0x0101b3ec: 0x101b3ec: addiu a0, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0101b3e0: 0x101b3e0: sw    a2, 512(v0)
+// 0x0101b3f0: 0x101b3f0: sw    a2, 512(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7267,15 +7267,15 @@ L_101b3b0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101b3e4: 0x101b3e4: addiu a1, a1, 1
+// 0x0101b3f4: 0x101b3f4: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0101b3e8: 0x101b3e8: addiu v0, zero, 255
+// 0x0101b3f8: 0x101b3f8: addiu v0, zero, 255
 	ldc.i4 255
 	stloc 5
-// 0x0101b3ec: 0x101b3ec: beq   a1, v0, 0x101b414 sw    a0, 1536(v1)
+// 0x0101b3fc: 0x101b3fc: beq   a1, v0, 0x101b424 sw    a0, 1536(v1)
 	ldloc.2
 	ldloc 5
 	ldloc 6
@@ -7286,53 +7286,53 @@ L_101b3b0:
 	add
 	ldloc.1
 	stelem.i4
-	beq  L_101b414
+	beq  L_101b424
 // --- basic block ---
-// 0x0101b3f4: 0x101b3f4: lb    v0, 0(s1)
+// 0x0101b404: 0x101b404: lb    v0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b3f8: 0x101b3f8: sll   zero, zero, 0
-// 0x0101b3fc: 0x101b3fc: slti  v0, v0, 32
+// 0x0101b408: 0x101b408: sll   zero, zero, 0
+// 0x0101b40c: 0x101b40c: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-L_101b400:
-// 0x0101b400: 0x101b400: bne   v0, zero, 0x101b414 sll   zero, zero, 0
+L_101b410:
+// 0x0101b410: 0x101b410: bne   v0, zero, 0x101b424 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101b414
+	brtrue L_101b424
 // --- basic block ---
-// 0x0101b408: 0x101b408: addiu s1, s1, 1
+// 0x0101b418: 0x101b418: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_101b40c:
-// 0x0101b40c: 0x101b40c: bne   s1, s3, 0x101b3b0 addiu a0, zero, 32
+L_101b41c:
+// 0x0101b41c: 0x101b41c: bne   s1, s3, 0x101b3c0 addiu a0, zero, 32
 	ldloc 8
 	ldloc 13
 	ldc.i4.s 32
 	stloc.1
-	bne.un L_101b3b0
+	bne.un L_101b3c0
 // --- basic block ---
-L_101b414:
-// 0x0101b414: 0x101b414: addiu v1, a1, -1
+L_101b424:
+// 0x0101b424: 0x101b424: addiu v1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0101b418: 0x101b418: sll   a0, v1, 2
+// 0x0101b428: 0x101b428: sll   a0, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0101b41c: 0x101b41c: addu  a0, s2, a0
+// 0x0101b42c: 0x101b42c: addu  a0, s2, a0
 	ldloc 12
 	ldloc.1
 	add
 	stloc.1
-// 0x0101b420: 0x101b420: lw    a2, 1536(a0)
+// 0x0101b430: 0x101b430: lw    a2, 1536(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7341,49 +7341,49 @@ L_101b414:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101b424: 0x101b424: addu  v0, s1, zero
+// 0x0101b434: 0x101b434: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-L_101b428:
-// 0x0101b428: 0x101b428: beq   s1, s3, 0x101b450 sll   zero, zero, 0
+L_101b438:
+// 0x0101b438: 0x101b438: beq   s1, s3, 0x101b460 sll   zero, zero, 0
 	ldloc 8
 	ldloc 13
-	beq  L_101b450
+	beq  L_101b460
 // --- basic block ---
-// 0x0101b430: 0x101b430: lb    a0, 0(s1)
+// 0x0101b440: 0x101b440: lb    a0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0101b434: 0x101b434: sll   zero, zero, 0
-// 0x0101b438: 0x101b438: slti  a3, a0, 32
+// 0x0101b444: 0x101b444: sll   zero, zero, 0
+// 0x0101b448: 0x101b448: slti  a3, a0, 32
 	ldloc.1
 	ldc.i4.s 32
 	clt
 	stloc 4
-// 0x0101b43c: 0x101b43c: beq   a3, zero, 0x101b450 sll   zero, zero, 0
+// 0x0101b44c: 0x101b44c: beq   a3, zero, 0x101b460 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_101b450
+	brfalse L_101b460
 // --- basic block ---
-// 0x0101b444: 0x101b444: bgtz  a0, 0x101b428 addiu s1, s1, 1
+// 0x0101b454: 0x101b454: bgtz  a0, 0x101b438 addiu s1, s1, 1
 	ldloc.1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
 	ldc.i4.s 0
-	bgt L_101b428
+	bgt L_101b438
 // --- basic block ---
-// 0x0101b44c: 0x101b44c: addiu s1, s1, -1
+// 0x0101b45c: 0x101b45c: addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_101b450:
-// 0x0101b450: 0x101b450: bne   s0, zero, 0x101b494 sll   zero, zero, 0
+L_101b460:
+// 0x0101b460: 0x101b460: bne   s0, zero, 0x101b4a4 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_101b494
+	brtrue L_101b4a4
 // --- basic block ---
-// 0x0101b458: 0x101b458: lw    a0, 1560(sp)
+// 0x0101b468: 0x101b468: lw    a0, 1560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7392,43 +7392,43 @@ L_101b450:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b45c: 0x101b45c: sll   zero, zero, 0
-// 0x0101b460: 0x101b460: lb    a3, 0(a0)
+// 0x0101b46c: 0x101b46c: sll   zero, zero, 0
+// 0x0101b470: 0x101b470: lb    a3, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x0101b464: 0x101b464: addiu a0, zero, 83
+// 0x0101b474: 0x101b474: addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
-// 0x0101b468: 0x101b468: beq   a3, a0, 0x101b4ec sll   v1, v1, 2
+// 0x0101b478: 0x101b478: beq   a3, a0, 0x101b4fc sll   v1, v1, 2
 	ldloc 4
 	ldloc.1
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-	beq  L_101b4ec
+	beq  L_101b4fc
 // --- basic block ---
-// 0x0101b470: 0x101b470: lui   a1, 0x10000
+// 0x0101b480: 0x101b480: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101b474: 0x101b474: lui   a3, 0x10000
+// 0x0101b484: 0x101b484: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101b478: 0x101b478: addiu a1, a1, -30716
+// 0x0101b488: 0x101b488: addiu a1, a1, -30716
 	ldloc.2
 	ldc.i4 -30716
 	add
 	stloc.2
-// 0x0101b47c: 0x101b47c: addiu a3, a3, -30688
+// 0x0101b48c: 0x101b48c: addiu a3, a3, -30688
 	ldloc 4
 	ldc.i4 -30688
 	add
 	stloc 4
-// 0x0101b480: 0x101b480: addiu a0, zero, 4
+// 0x0101b490: 0x101b490: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101b484: 0x101b484: jal   0x100449c addiu a2, zero, 291
+// 0x0101b494: 0x101b494: jal   0x100449c addiu a2, zero, 291
 	ldc.i4 291
 	stloc.3
 	ldloc.0
@@ -7441,11 +7441,11 @@ L_101b450:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b48c: 0x101b48c: j	 0x101b758 sll   zero, zero, 0
-	br L_101b758
+// 0x0101b49c: 0x101b49c: j	 0x101b768 sll   zero, zero, 0
+	br L_101b768
 // --- basic block ---
-L_101b494:
-// 0x0101b494: 0x101b494: lw    a0, 76(s0)
+L_101b4a4:
+// 0x0101b4a4: 0x101b4a4: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7454,12 +7454,12 @@ L_101b494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b498: 0x101b498: sll   zero, zero, 0
-// 0x0101b49c: 0x101b49c: bne   a0, zero, 0x101b4e8 sll   zero, zero, 0
+// 0x0101b4a8: 0x101b4a8: sll   zero, zero, 0
+// 0x0101b4ac: 0x101b4ac: bne   a0, zero, 0x101b4f8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_101b4e8
+	brtrue L_101b4f8
 // --- basic block ---
-// 0x0101b4a4: 0x101b4a4: lw    a0, 1560(sp)
+// 0x0101b4b4: 0x101b4b4: lw    a0, 1560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7468,53 +7468,53 @@ L_101b494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b4a8: 0x101b4a8: sll   zero, zero, 0
-// 0x0101b4ac: 0x101b4ac: lb    a3, 0(a0)
+// 0x0101b4b8: 0x101b4b8: sll   zero, zero, 0
+// 0x0101b4bc: 0x101b4bc: lb    a3, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x0101b4b0: 0x101b4b0: addiu a0, zero, 70
+// 0x0101b4c0: 0x101b4c0: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x0101b4b4: 0x101b4b4: beq   a3, a0, 0x101b4ec sll   v1, v1, 2
+// 0x0101b4c4: 0x101b4c4: beq   a3, a0, 0x101b4fc sll   v1, v1, 2
 	ldloc 4
 	ldloc.1
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-	beq  L_101b4ec
+	beq  L_101b4fc
 // --- basic block ---
-// 0x0101b4bc: 0x101b4bc: lw    v0, 0(s0)
+// 0x0101b4cc: 0x101b4cc: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101b4c0: 0x101b4c0: lui   a1, 0x10000
+// 0x0101b4d0: 0x101b4d0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101b4c4: 0x101b4c4: lui   a3, 0x10000
+// 0x0101b4d4: 0x101b4d4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101b4c8: 0x101b4c8: addiu a1, a1, -30716
+// 0x0101b4d8: 0x101b4d8: addiu a1, a1, -30716
 	ldloc.2
 	ldc.i4 -30716
 	add
 	stloc.2
-// 0x0101b4cc: 0x101b4cc: addiu a3, a3, -30664
+// 0x0101b4dc: 0x101b4dc: addiu a3, a3, -30664
 	ldloc 4
 	ldc.i4 -30664
 	add
 	stloc 4
-// 0x0101b4d0: 0x101b4d0: addiu a0, zero, 4
+// 0x0101b4e0: 0x101b4e0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101b4d4: 0x101b4d4: addiu a2, zero, 298
+// 0x0101b4e4: 0x101b4e4: addiu a2, zero, 298
 	ldc.i4 298
 	stloc.3
-// 0x0101b4d8: 0x101b4d8: jal   0x100449c sw    v0, 16(sp)
+// 0x0101b4e8: 0x101b4e8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7533,27 +7533,27 @@ L_101b494:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b4e0: 0x101b4e0: j	 0x101b758 sll   zero, zero, 0
-	br L_101b758
+// 0x0101b4f0: 0x101b4f0: j	 0x101b768 sll   zero, zero, 0
+	br L_101b768
 // --- basic block ---
-L_101b4e8:
-// 0x0101b4e8: 0x101b4e8: sll   v1, v1, 2
+L_101b4f8:
+// 0x0101b4f8: 0x101b4f8: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-L_101b4ec:
-// 0x0101b4ec: 0x101b4ec: subu  v0, v0, a2
+L_101b4fc:
+// 0x0101b4fc: 0x101b4fc: subu  v0, v0, a2
 	ldloc 5
 	ldloc.3
 	sub
 	stloc 5
-// 0x0101b4f0: 0x101b4f0: addu  v1, s2, v1
+// 0x0101b500: 0x101b500: addu  v1, s2, v1
 	ldloc 12
 	ldloc 7
 	add
 	stloc 7
-// 0x0101b4f4: 0x101b4f4: sw    v0, 512(v1)
+// 0x0101b504: 0x101b504: sw    v0, 512(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7562,7 +7562,7 @@ L_101b4ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101b4f8: 0x101b4f8: lw    v0, 1560(sp)
+// 0x0101b508: 0x101b508: lw    v0, 1560(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7571,65 +7571,65 @@ L_101b4ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101b4fc: 0x101b4fc: sll   zero, zero, 0
-// 0x0101b500: 0x101b500: lbu   v0, 0(v0)
+// 0x0101b50c: 0x101b50c: sll   zero, zero, 0
+// 0x0101b510: 0x101b510: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0101b504: 0x101b504: sll   zero, zero, 0
-// 0x0101b508: 0x101b508: addiu v0, v0, -67
+// 0x0101b514: 0x101b514: sll   zero, zero, 0
+// 0x0101b518: 0x101b518: addiu v0, v0, -67
 	ldloc 5
 	ldc.i4.s -67
 	add
 	stloc 5
-// 0x0101b50c: 0x101b50c: andi  v0, v0, 255
+// 0x0101b51c: 0x101b51c: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x0101b510: 0x101b510: sltiu v1, v0, 17
+// 0x0101b520: 0x101b520: sltiu v1, v0, 17
 	ldloc 5
 	ldc.i4.s 17
 	clt.un
 	stloc 7
-// 0x0101b514: 0x101b514: beq   v1, zero, 0x101b730 addu  a0, s1, zero
+// 0x0101b524: 0x101b524: beq   v1, zero, 0x101b740 addu  a0, s1, zero
 	ldloc 7
 	ldloc 8
 	stloc.1
-	brfalse L_101b730
+	brfalse L_101b740
 // --- basic block ---
-// 0x0101b51c: 0x101b51c: lui   v1, 0x20000
+// 0x0101b52c: 0x101b52c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0101b520: 0x101b520: sll   v0, v0, 2
+// 0x0101b530: 0x101b530: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0101b524: 0x101b524: addiu v1, v1, 24820
+// 0x0101b534: 0x101b534: addiu v1, v1, 25284
 	ldloc 7
-	ldc.i4 24820
+	ldc.i4 25284
 	add
 	stloc 7
-// 0x0101b528: 0x101b528: addu  v0, v1, v0
+// 0x0101b538: 0x101b538: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0101b52c: 0x101b52c: lw    v0, 0(v0)
+// 0x0101b53c: 0x101b53c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101b530: 0x101b530: sll   zero, zero, 0
-// 0x0101b534: 0x101b534: jr    v0 sll   zero, zero, 0
+// 0x0101b540: 0x101b540: sll   zero, zero, 0
+// 0x0101b544: 0x101b544: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_101b53c:
-// 0x0101b53c: 0x101b53c: lw    s5, 540(sp)
+L_101b54c:
+// 0x0101b54c: 0x101b54c: lw    s5, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7638,7 +7638,7 @@ L_101b53c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101b540: 0x101b540: lw    a0, 1564(sp)
+// 0x0101b550: 0x101b550: lw    a0, 1564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7647,12 +7647,12 @@ L_101b53c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b544: 0x101b544: slti  v0, s5, 255
+// 0x0101b554: 0x101b554: slti  v0, s5, 255
 	ldloc 10
 	ldc.i4 255
 	clt
 	stloc 5
-// 0x0101b548: 0x101b548: sw    a0, 2588(sp)
+// 0x0101b558: 0x101b558: sw    a0, 2588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7661,7 +7661,7 @@ L_101b53c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101b54c: 0x101b54c: lw    s6, 1568(sp)
+// 0x0101b55c: 0x101b55c: lw    s6, 1568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7670,13 +7670,13 @@ L_101b53c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101b550: 0x101b550: bne   v0, zero, 0x101b578 lui   a3, 0x10000
+// 0x0101b560: 0x101b560: bne   v0, zero, 0x101b588 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_101b578
+	brtrue L_101b588
 // --- basic block ---
-// 0x0101b558: 0x101b558: lw    v0, 2588(sp)
+// 0x0101b568: 0x101b568: lw    v0, 2588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7685,21 +7685,21 @@ L_101b53c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101b55c: 0x101b55c: addiu a0, zero, 5
+// 0x0101b56c: 0x101b56c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0101b560: 0x101b560: addu  a1, s4, zero
+// 0x0101b570: 0x101b570: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x0101b564: 0x101b564: addiu a2, zero, 109
+// 0x0101b574: 0x101b574: addiu a2, zero, 109
 	ldc.i4.s 109
 	stloc.3
-// 0x0101b568: 0x101b568: addiu a3, a3, -30628
+// 0x0101b578: 0x101b578: addiu a3, a3, -30628
 	ldloc 4
 	ldc.i4 -30628
 	add
 	stloc 4
-// 0x0101b56c: 0x101b56c: sw    s5, 16(sp)
+// 0x0101b57c: 0x101b57c: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7708,7 +7708,7 @@ L_101b53c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101b570: 0x101b570: jal   0x100449c sw    v0, 20(sp)
+// 0x0101b580: 0x101b580: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7727,8 +7727,8 @@ L_101b53c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101b578:
-// 0x0101b578: 0x101b578: lw    v1, 76(s0)
+L_101b588:
+// 0x0101b588: 0x101b588: lw    v1, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7737,16 +7737,16 @@ L_101b578:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b57c: 0x101b57c: sll   zero, zero, 0
-// 0x0101b580: 0x101b580: bne   v1, zero, 0x101b594 addiu v0, s0, 4
+// 0x0101b58c: 0x101b58c: sll   zero, zero, 0
+// 0x0101b590: 0x101b590: bne   v1, zero, 0x101b5a4 addiu v0, s0, 4
 	ldloc 7
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 5
-	brtrue L_101b594
+	brtrue L_101b5a4
 // --- basic block ---
-// 0x0101b588: 0x101b588: sw    v0, 76(s0)
+// 0x0101b598: 0x101b598: sw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7755,7 +7755,7 @@ L_101b578:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101b58c: 0x101b58c: j	 0x101b5d8 sw    zero, 4(s0)
+// 0x0101b59c: 0x101b59c: j	 0x101b5e8 sw    zero, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7764,16 +7764,16 @@ L_101b578:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_101b5d8
+	br L_101b5e8
 // --- basic block ---
-L_101b594:
-// 0x0101b594: 0x101b594: addiu a0, zero, 1
+L_101b5a4:
+// 0x0101b5a4: 0x101b5a4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101b598: 0x101b598: addiu a1, zero, 72
+// 0x0101b5a8: 0x101b5a8: addiu a1, zero, 72
 	ldc.i4.s 72
 	stloc.2
-// 0x0101b59c: 0x101b59c: jal   0x101b2b4 sw    v1, 2592(sp)
+// 0x0101b5ac: 0x101b5ac: jal   0x101b2c4 sw    v1, 2592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7787,12 +7787,12 @@ L_101b594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::calloc_101b2b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::calloc_101b2c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b5a4: 0x101b5a4: lw    v1, 2592(sp)
+// 0x0101b5b4: 0x101b5b4: lw    v1, 2592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7801,17 +7801,17 @@ L_101b594:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b5a8: 0x101b5a8: addu  a0, s4, zero
+// 0x0101b5b8: 0x101b5b8: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x0101b5ac: 0x101b5ac: sw    v0, 0(v1)
+// 0x0101b5bc: 0x101b5bc: sw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0101b5b0: 0x101b5b0: lw    v0, 76(s0)
+// 0x0101b5c0: 0x101b5c0: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7820,15 +7820,15 @@ L_101b594:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101b5b4: 0x101b5b4: sll   zero, zero, 0
-// 0x0101b5b8: 0x101b5b8: lw    a2, 0(v0)
+// 0x0101b5c4: 0x101b5c4: sll   zero, zero, 0
+// 0x0101b5c8: 0x101b5c8: lw    a2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0101b5bc: 0x101b5bc: jal   0x1004a38 addiu a1, zero, 121
+// 0x0101b5cc: 0x101b5cc: jal   0x1004a48 addiu a1, zero, 121
 	ldc.i4.s 121
 	stloc.2
 	ldloc.0
@@ -7836,12 +7836,12 @@ L_101b594:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b5c4: 0x101b5c4: lw    v0, 76(s0)
+// 0x0101b5d4: 0x101b5d4: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7850,16 +7850,16 @@ L_101b594:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101b5c8: 0x101b5c8: sll   zero, zero, 0
-// 0x0101b5cc: 0x101b5cc: lw    v0, 0(v0)
+// 0x0101b5d8: 0x101b5d8: sll   zero, zero, 0
+// 0x0101b5dc: 0x101b5dc: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101b5d0: 0x101b5d0: sll   zero, zero, 0
-// 0x0101b5d4: 0x101b5d4: sw    v0, 76(s0)
+// 0x0101b5e0: 0x101b5e0: sll   zero, zero, 0
+// 0x0101b5e4: 0x101b5e4: sw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7868,8 +7868,8 @@ L_101b594:
 	add
 	ldloc 5
 	stelem.i4
-L_101b5d8:
-// 0x0101b5d8: 0x101b5d8: jal   0x1000d8c addu  a0, s6, zero
+L_101b5e8:
+// 0x0101b5e8: 0x101b5e8: jal   0x1000d8c addu  a0, s6, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -7882,12 +7882,12 @@ L_101b5d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b5e0: 0x101b5e0: addiu s6, sp, 280
+// 0x0101b5f0: 0x101b5f0: addiu s6, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
 	stloc 11
-// 0x0101b5e4: 0x101b5e4: lw    a1, 2588(sp)
+// 0x0101b5f4: 0x101b5f4: lw    a1, 2588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7896,18 +7896,18 @@ L_101b5d8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101b5e8: 0x101b5e8: addu  a0, s6, zero
+// 0x0101b5f8: 0x101b5f8: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x0101b5ec: 0x101b5ec: addu  a2, s5, zero
+// 0x0101b5fc: 0x101b5fc: addu  a2, s5, zero
 	ldloc 10
 	stloc.3
-// 0x0101b5f0: 0x101b5f0: addu  s5, s2, s5
+// 0x0101b600: 0x101b600: addu  s5, s2, s5
 	ldloc 12
 	ldloc 10
 	add
 	stloc 10
-// 0x0101b5f4: 0x101b5f4: jal   0x1001af8 sw    v0, 2584(sp)
+// 0x0101b604: 0x101b604: jal   0x1001af8 sw    v0, 2584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7922,20 +7922,20 @@ L_101b5d8:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101b5fc: 0x101b5fc: sb    zero, 256(s5)
+// 0x0101b60c: 0x101b60c: sb    zero, 256(s5)
 	ldloc 10
 	ldc.i4 256
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101b600: 0x101b600: lw    a2, 0(s0)
+// 0x0101b610: 0x101b610: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0101b604: 0x101b604: lw    a3, 2584(sp)
+// 0x0101b614: 0x101b614: lw    a3, 2584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7944,18 +7944,18 @@ L_101b5d8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101b608: 0x101b608: lui   a1, 0x10000
+// 0x0101b618: 0x101b618: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101b60c: 0x101b60c: addu  a0, s2, zero
+// 0x0101b61c: 0x101b61c: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x0101b610: 0x101b610: addiu a1, a1, -30600
+// 0x0101b620: 0x101b620: addiu a1, a1, -30600
 	ldloc.2
 	ldc.i4 -30600
 	add
 	stloc.2
-// 0x0101b614: 0x101b614: jal   0x1000f64 sw    s6, 16(sp)
+// 0x0101b624: 0x101b624: jal   0x1000f64 sw    s6, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7974,7 +7974,7 @@ L_101b5d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b61c: 0x101b61c: lw    s5, 76(s0)
+// 0x0101b62c: 0x101b62c: lw    s5, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7983,10 +7983,10 @@ L_101b5d8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101b620: 0x101b620: addu  a0, s2, zero
+// 0x0101b630: 0x101b630: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x0101b624: 0x101b624: jal   0x104ef00 addiu a1, zero, 1
+// 0x0101b634: 0x101b634: jal   0x104ef10 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7994,12 +7994,12 @@ L_101b5d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b62c: 0x101b62c: sw    v0, 4(s5)
+// 0x0101b63c: 0x101b63c: sw    v0, 4(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -8008,7 +8008,7 @@ L_101b5d8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101b630: 0x101b630: jal   0x104edb0 addu  a0, s6, zero
+// 0x0101b640: 0x101b640: jal   0x104edc0 addu  a0, s6, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8016,12 +8016,12 @@ L_101b5d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b638: 0x101b638: lw    a0, 2584(sp)
+// 0x0101b648: 0x101b648: lw    a0, 2584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8030,20 +8030,20 @@ L_101b5d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b63c: 0x101b63c: jal   0x104dd5c sll   zero, zero, 0
+// 0x0101b64c: 0x101b64c: jal   0x104dd6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b644: 0x101b644: j	 0x101b730 addu  a0, s1, zero
+// 0x0101b654: 0x101b654: j	 0x101b740 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-	br L_101b730
+	br L_101b740
 // --- basic block ---
-L_101b64c:
-// 0x0101b64c: 0x101b64c: lw    a0, 76(s0)
+L_101b65c:
+// 0x0101b65c: 0x101b65c: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8052,15 +8052,15 @@ L_101b64c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b650: 0x101b650: j	 0x101b664 addiu a0, a0, 8
+// 0x0101b660: 0x101b660: j	 0x101b674 addiu a0, a0, 8
 	ldloc.1
 	ldc.i4.8
 	add
 	stloc.1
-	br L_101b664
+	br L_101b674
 // --- basic block ---
-L_101b658:
-// 0x0101b658: 0x101b658: lw    a0, 76(s0)
+L_101b668:
+// 0x0101b668: 0x101b668: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8069,14 +8069,14 @@ L_101b658:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b65c: 0x101b65c: sll   zero, zero, 0
-// 0x0101b660: 0x101b660: addiu a0, a0, 56
+// 0x0101b66c: 0x101b66c: sll   zero, zero, 0
+// 0x0101b670: 0x101b670: addiu a0, a0, 56
 	ldloc.1
 	ldc.i4.s 56
 	add
 	stloc.1
-L_101b664:
-// 0x0101b664: 0x101b664: jal   0x101b134 addiu a2, sp, 1560
+L_101b674:
+// 0x0101b674: 0x101b674: jal   0x101b144 addiu a2, sp, 1560
 	ldloc.0
 	ldc.i4 1560
 	add
@@ -8086,18 +8086,18 @@ L_101b664:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_sprite_decode_sequence_101b134(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_sprite_decode_sequence_101b144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b66c: 0x101b66c: j	 0x101b730 addu  a0, s1, zero
+// 0x0101b67c: 0x101b67c: j	 0x101b740 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-	br L_101b730
+	br L_101b740
 // --- basic block ---
-L_101b674:
-// 0x0101b674: 0x101b674: lw    a0, 76(s0)
+L_101b684:
+// 0x0101b684: 0x101b684: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8106,20 +8106,20 @@ L_101b674:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b678: 0x101b678: addiu a1, sp, 1560
+// 0x0101b688: 0x101b688: addiu a1, sp, 1560
 	ldloc.0
 	ldc.i4 1560
 	add
 	stloc.2
-// 0x0101b67c: 0x101b67c: j	 0x101b690 addiu a0, a0, 24
+// 0x0101b68c: 0x101b68c: j	 0x101b6a0 addiu a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	add
 	stloc.1
-	br L_101b690
+	br L_101b6a0
 // --- basic block ---
-L_101b684:
-// 0x0101b684: 0x101b684: lw    a0, 76(s0)
+L_101b694:
+// 0x0101b694: 0x101b694: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8128,35 +8128,35 @@ L_101b684:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b688: 0x101b688: addiu a1, sp, 1560
+// 0x0101b698: 0x101b698: addiu a1, sp, 1560
 	ldloc.0
 	ldc.i4 1560
 	add
 	stloc.2
-// 0x0101b68c: 0x101b68c: addiu a0, a0, 40
+// 0x0101b69c: 0x101b69c: addiu a0, a0, 40
 	ldloc.1
 	ldc.i4.s 40
 	add
 	stloc.1
-L_101b690:
-// 0x0101b690: 0x101b690: jal   0x101b210 sll   zero, zero, 0
+L_101b6a0:
+// 0x0101b6a0: 0x101b6a0: jal   0x101b220 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_sprite_decode_circle_101b210(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_sprite_decode_circle_101b220(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b698: 0x101b698: j	 0x101b730 addu  a0, s1, zero
+// 0x0101b6a8: 0x101b6a8: j	 0x101b740 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-	br L_101b730
+	br L_101b740
 // --- basic block ---
-L_101b6a0:
-// 0x0101b6a0: 0x101b6a0: jal   0x1000910 addiu a0, zero, 84
+L_101b6b0:
+// 0x0101b6b0: 0x101b6b0: jal   0x1000910 addiu a0, zero, 84
 	ldc.i4.s 84
 	stloc.1
 	ldloc.0
@@ -8169,16 +8169,16 @@ L_101b6a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b6a8: 0x101b6a8: addu  s0, v0, zero
+// 0x0101b6b8: 0x101b6b8: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0101b6ac: 0x101b6ac: addu  a2, v0, zero
+// 0x0101b6bc: 0x101b6bc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101b6b0: 0x101b6b0: addu  a0, s4, zero
+// 0x0101b6c0: 0x101b6c0: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x0101b6b4: 0x101b6b4: jal   0x1004a38 addiu a1, zero, 206
+// 0x0101b6c4: 0x101b6c4: jal   0x1004a48 addiu a1, zero, 206
 	ldc.i4 206
 	stloc.2
 	ldloc.0
@@ -8186,18 +8186,18 @@ L_101b6a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b6bc: 0x101b6bc: addu  a1, zero, zero
+// 0x0101b6cc: 0x101b6cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101b6c0: 0x101b6c0: addiu a2, zero, 84
+// 0x0101b6d0: 0x101b6d0: addiu a2, zero, 84
 	ldc.i4.s 84
 	stloc.3
-// 0x0101b6c4: 0x101b6c4: jal   0x100177c addu  a0, s0, zero
+// 0x0101b6d4: 0x101b6d4: jal   0x100177c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -8209,7 +8209,7 @@ L_101b6a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b6cc: 0x101b6cc: lw    s6, 540(sp)
+// 0x0101b6dc: 0x101b6dc: lw    s6, 540(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8218,7 +8218,7 @@ L_101b6a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101b6d0: 0x101b6d0: lw    v1, 1564(sp)
+// 0x0101b6e0: 0x101b6e0: lw    v1, 1564(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8227,12 +8227,12 @@ L_101b6a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b6d4: 0x101b6d4: addiu a0, s6, 1
+// 0x0101b6e4: 0x101b6e4: addiu a0, s6, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0101b6d8: 0x101b6d8: jal   0x1000910 sw    v1, 2592(sp)
+// 0x0101b6e8: 0x101b6e8: jal   0x1000910 sw    v1, 2592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8251,16 +8251,16 @@ L_101b6a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b6e0: 0x101b6e0: addu  a2, v0, zero
+// 0x0101b6f0: 0x101b6f0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101b6e4: 0x101b6e4: addu  a0, s4, zero
+// 0x0101b6f4: 0x101b6f4: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x0101b6e8: 0x101b6e8: addiu a1, zero, 91
+// 0x0101b6f8: 0x101b6f8: addiu a1, zero, 91
 	ldc.i4.s 91
 	stloc.2
-// 0x0101b6ec: 0x101b6ec: jal   0x1004a38 addu  s5, v0, zero
+// 0x0101b6fc: 0x101b6fc: jal   0x1004a48 addu  s5, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -8268,12 +8268,12 @@ L_101b6a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b6f4: 0x101b6f4: lw    v1, 2592(sp)
+// 0x0101b704: 0x101b704: lw    v1, 2592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8282,13 +8282,13 @@ L_101b6a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b6f8: 0x101b6f8: addu  a0, s5, zero
+// 0x0101b708: 0x101b708: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-// 0x0101b6fc: 0x101b6fc: addu  a1, v1, zero
+// 0x0101b70c: 0x101b70c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0101b700: 0x101b700: jal   0x1001af8 addu  a2, s6, zero
+// 0x0101b710: 0x101b710: jal   0x1001af8 addu  a2, s6, zero
 	ldloc 11
 	stloc.3
 	ldloc.1
@@ -8297,37 +8297,37 @@ L_101b6a0:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101b708: 0x101b708: lui   a0, 0x30000
+// 0x0101b718: 0x101b718: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101b70c: 0x101b70c: lw    v1, 27080(s7)
+// 0x0101b71c: 0x101b71c: lw    v1, 27544(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 6770
+	ldc.i4 6886
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b710: 0x101b710: lw    v0, 27084(a0)
+// 0x0101b720: 0x101b720: lw    v0, 27548(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6771
+	ldc.i4 6887
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101b714: 0x101b714: addu  s6, s5, s6
+// 0x0101b724: 0x101b724: addu  s6, s5, s6
 	ldloc 10
 	ldloc 11
 	add
 	stloc 11
-// 0x0101b718: 0x101b718: sb    zero, 0(s6)
+// 0x0101b728: 0x101b728: sb    zero, 0(s6)
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101b71c: 0x101b71c: sw    v1, 80(s0)
+// 0x0101b72c: 0x101b72c: sw    v1, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8336,14 +8336,14 @@ L_101b6a0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101b720: 0x101b720: sw    s5, 0(s0)
+// 0x0101b730: 0x101b730: sw    s5, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x0101b724: 0x101b724: sw    v0, 8(s0)
+// 0x0101b734: 0x101b734: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8352,57 +8352,57 @@ L_101b6a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101b728: 0x101b728: sw    s0, 27080(s7)
+// 0x0101b738: 0x101b738: sw    s0, 27544(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 6770
+	ldc.i4 6886
 	add
 	ldloc 9
 	stelem.i4
-L_101b72c:
-// 0x0101b72c: 0x101b72c: addu  a0, s1, zero
+L_101b73c:
+// 0x0101b73c: 0x101b73c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-L_101b730:
-// 0x0101b730: 0x101b730: beq   s1, s3, 0x101b750 sll   zero, zero, 0
+L_101b740:
+// 0x0101b740: 0x101b740: beq   s1, s3, 0x101b760 sll   zero, zero, 0
 	ldloc 8
 	ldloc 13
-	beq  L_101b750
+	beq  L_101b760
 // --- basic block ---
-// 0x0101b738: 0x101b738: lb    v0, 0(s1)
+// 0x0101b748: 0x101b748: lb    v0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101b73c: 0x101b73c: sll   zero, zero, 0
-// 0x0101b740: 0x101b740: slti  v0, v0, 32
+// 0x0101b74c: 0x101b74c: sll   zero, zero, 0
+// 0x0101b750: 0x101b750: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x0101b744: 0x101b744: bne   v0, zero, 0x101b72c addiu s1, s1, 1
+// 0x0101b754: 0x101b754: bne   v0, zero, 0x101b73c addiu s1, s1, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_101b72c
+	brtrue L_101b73c
 // --- basic block ---
-// 0x0101b74c: 0x101b74c: addiu s1, s1, -1
+// 0x0101b75c: 0x101b75c: addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_101b750:
-// 0x0101b750: 0x101b750: bne   a0, s3, 0x101b38c sll   zero, zero, 0
+L_101b760:
+// 0x0101b760: 0x101b760: bne   a0, s3, 0x101b39c sll   zero, zero, 0
 	ldloc.1
 	ldloc 13
-	bne.un L_101b38c
+	bne.un L_101b39c
 // --- basic block ---
-L_101b758:
-// 0x0101b758: 0x101b758: lw    ra, 2636(sp)
-// 0x0101b75c: 0x101b75c: lw    s8, 2632(sp)
+L_101b768:
+// 0x0101b768: 0x101b768: lw    ra, 2636(sp)
+// 0x0101b76c: 0x101b76c: lw    s8, 2632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8411,7 +8411,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101b760: 0x101b760: lw    s7, 2628(sp)
+// 0x0101b770: 0x101b770: lw    s7, 2628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8420,7 +8420,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101b764: 0x101b764: lw    s6, 2624(sp)
+// 0x0101b774: 0x101b774: lw    s6, 2624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8429,7 +8429,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101b768: 0x101b768: lw    s5, 2620(sp)
+// 0x0101b778: 0x101b778: lw    s5, 2620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8438,7 +8438,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101b76c: 0x101b76c: lw    s4, 2616(sp)
+// 0x0101b77c: 0x101b77c: lw    s4, 2616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8447,7 +8447,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101b770: 0x101b770: lw    s3, 2612(sp)
+// 0x0101b780: 0x101b780: lw    s3, 2612(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8456,7 +8456,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101b774: 0x101b774: lw    s2, 2608(sp)
+// 0x0101b784: 0x101b784: lw    s2, 2608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8465,7 +8465,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101b778: 0x101b778: lw    s1, 2604(sp)
+// 0x0101b788: 0x101b788: lw    s1, 2604(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8474,7 +8474,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b77c: 0x101b77c: lw    s0, 2600(sp)
+// 0x0101b78c: 0x101b78c: lw    s0, 2600(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8483,7 +8483,7 @@ L_101b758:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101b780: 0x101b780: jr    ra addiu sp, sp, 2640
+// 0x0101b790: 0x101b790: jr    ra addiu sp, sp, 2640
 	ldloc.0
 	ldc.i4 2640
 	add
@@ -8493,26 +8493,26 @@ L_101b758:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 16889148
-	beq  L_101b53c
-	ldloc 5
-	ldc.i4 16889420
-	beq  L_101b64c
+	ldc.i4 16889164
+	beq  L_101b54c
 	ldloc 5
-	ldc.i4 16889432
-	beq  L_101b658
+	ldc.i4 16889436
+	beq  L_101b65c
 	ldloc 5
-	ldc.i4 16889460
-	beq  L_101b674
+	ldc.i4 16889448
+	beq  L_101b668
 	ldloc 5
 	ldc.i4 16889476
 	beq  L_101b684
 	ldloc 5
-	ldc.i4 16889504
-	beq  L_101b6a0
+	ldc.i4 16889492
+	beq  L_101b694
+	ldloc 5
+	ldc.i4 16889520
+	beq  L_101b6b0
 	ldloc 5
-	ldc.i4 16889644
-	beq  L_101b72c
+	ldc.i4 16889660
+	beq  L_101b73c
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
diff --git a/converted/Cibyl2.j b/converted/Cibyl2.j
index 192742e..5fa51ad 100644
--- a/converted/Cibyl2.j
+++ b/converted/Cibyl2.j
@@ -219,9 +219,9 @@ L_1002ca8:
 	ldc.i4 20804
 	add
 	stloc.3
-// 0x01002cf8: 0x1002cf8: addiu a3, a3, 18500
+// 0x01002cf8: 0x1002cf8: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
 // 0x01002cfc: 0x1002cfc: addiu a0, zero, 4
@@ -245,7 +245,7 @@ L_1002ca8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01002d08: 0x1002d08: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x01002d08: 0x1002d08: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -259,7 +259,7 @@ L_1002ca8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -279,7 +279,7 @@ L_1002d10:
 // 0x01002d20: 0x1002d20: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01002d24: 0x1002d24: jal   0x100e610 addiu a0, a0, 160
+// 0x01002d24: 0x1002d24: jal   0x100e620 addiu a0, a0, 160
 	ldloc.1
 	ldc.i4 160
 	add
@@ -289,7 +289,7 @@ L_1002d10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -375,9 +375,9 @@ L_1002d6c:
 // 0x01002d6c: 0x1002d6c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01002d70: 0x1002d70: addiu a0, a0, 18500
+// 0x01002d70: 0x1002d70: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 L_1002d74:
@@ -451,7 +451,7 @@ __CIBYL_javamethod_begin:
 	add
 	stloc.0
 // 0x01002d94: 0x1002d94: sw    ra, 20(sp)
-// 0x01002d98: 0x1002d98: jal   0x100e348 addiu a0, a0, 176
+// 0x01002d98: 0x1002d98: jal   0x100e358 addiu a0, a0, 176
 	ldloc.1
 	ldc.i4 176
 	add
@@ -461,7 +461,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -538,12 +538,12 @@ __CIBYL_javamethod_begin:
 // 0x01002dc0: 0x1002dc0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01002dc4: 0x1002dc4: lw    v0, 30516(v0)
+// 0x01002dc4: 0x1002dc4: lw    v0, 30980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7629
+	ldc.i4 7745
 	add
 	ldelem.i4
 	stloc 5
@@ -648,7 +648,7 @@ L_1002ddc:
 	ldc.i4 16777216
 	stloc.1
 L_1002e30:
-// 0x01002e30: 0x1002e30: jal   0x106bcfc addiu a0, a0, 10592
+// 0x01002e30: 0x1002e30: jal   0x106c320 addiu a0, a0, 10592
 	ldloc.1
 	ldc.i4 10592
 	add
@@ -658,7 +658,7 @@ L_1002e30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
@@ -666,12 +666,12 @@ L_1002e30:
 // 0x01002e38: 0x1002e38: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01002e3c: 0x1002e3c: j	 0x1002e5c sw    v0, 30520(v1)
+// 0x01002e3c: 0x1002e3c: j	 0x1002e5c sw    v0, 30984(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7630
+	ldc.i4 7746
 	add
 	ldloc 5
 	stelem.i4
@@ -1088,12 +1088,12 @@ __CIBYL_javamethod_begin:
 // 0x01002f7c: 0x1002f7c: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01002f80: 0x1002f80: lw    v0, 30628(s0)
+// 0x01002f80: 0x1002f80: lw    v0, 31092(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7657
+	ldc.i4 7773
 	add
 	ldelem.i4
 	stloc 5
@@ -1113,7 +1113,7 @@ __CIBYL_javamethod_begin:
 // 0x01002f90: 0x1002f90: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01002f94: 0x1002f94: jal   0x104d04c addiu a0, a0, 21376
+// 0x01002f94: 0x1002f94: jal   0x104d05c addiu a0, a0, 21376
 	ldloc.1
 	ldc.i4 21376
 	add
@@ -1123,7 +1123,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_preferred_104d04c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_preferred_104d05c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
@@ -1131,9 +1131,9 @@ __CIBYL_javamethod_begin:
 // 0x01002f9c: 0x1002f9c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01002fa0: 0x1002fa0: addiu a0, s1, 30632
+// 0x01002fa0: 0x1002fa0: addiu a0, s1, 31096
 	ldloc 7
-	ldc.i4 30632
+	ldc.i4 31096
 	add
 	stloc.1
 // 0x01002fa4: 0x1002fa4: addu  a1, v0, zero
@@ -1148,20 +1148,20 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01002fb0: 0x1002fb0: addiu s1, s1, 30632
+// 0x01002fb0: 0x1002fb0: addiu s1, s1, 31096
 	ldloc 7
-	ldc.i4 30632
+	ldc.i4 31096
 	add
 	stloc 7
 // 0x01002fb4: 0x1002fb4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01002fb8: 0x1002fb8: sw    v0, 30628(s0)
+// 0x01002fb8: 0x1002fb8: sw    v0, 31092(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7657
+	ldc.i4 7773
 	add
 	ldloc 5
 	stelem.i4
@@ -1176,9 +1176,9 @@ L_1002fc0:
 // 0x01002fc4: 0x1002fc4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01002fc8: 0x1002fc8: addiu v0, v0, 30632
+// 0x01002fc8: 0x1002fc8: addiu v0, v0, 31096
 	ldloc 5
-	ldc.i4 30632
+	ldc.i4 31096
 	add
 	stloc 5
 // 0x01002fcc: 0x1002fcc: lw    s1, 24(sp)
@@ -1486,12 +1486,12 @@ L_1003080:
 // 0x01003090: 0x1003090: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01003094: 0x1003094: j	 0x10030a0 sw    v1, 31144(v0)
+// 0x01003094: 0x1003094: j	 0x10030a0 sw    v1, 31608(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7786
+	ldc.i4 7902
 	add
 	ldloc 7
 	stelem.i4
@@ -1617,12 +1617,12 @@ __CIBYL_javamethod_begin:
 	ldloc 5
 	stelem.i4
 // 0x01003110: 0x1003110: sw    ra, 20(sp)
-// 0x01003114: 0x1003114: lw    s0, 31144(v0)
+// 0x01003114: 0x1003114: lw    s0, 31608(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7786
+	ldc.i4 7902
 	add
 	ldelem.i4
 	stloc 5
@@ -2155,12 +2155,12 @@ __CIBYL_javamethod_begin:
 	ldloc 6
 	stelem.i4
 // 0x010032c0: 0x10032c0: sw    ra, 28(sp)
-// 0x010032c4: 0x10032c4: lw    s0, 31144(a0)
+// 0x010032c4: 0x10032c4: lw    s0, 31608(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7786
+	ldc.i4 7902
 	add
 	ldelem.i4
 	stloc 6
@@ -2411,12 +2411,12 @@ __CIBYL_javamethod_begin:
 // 0x01003364: 0x1003364: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01003368: 0x1003368: lw    v0, 31144(v0)
+// 0x01003368: 0x1003368: lw    v0, 31608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7786
+	ldc.i4 7902
 	add
 	ldelem.i4
 	stloc 5
@@ -2525,12 +2525,12 @@ L_1003398:
 	ldc.i4 21384
 	add
 	stloc 11
-// 0x010033ac: 0x10033ac: sw    s0, 31144(v0)
+// 0x010033ac: 0x10033ac: sw    s0, 31608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7786
+	ldc.i4 7902
 	add
 	ldloc 7
 	stelem.i4
@@ -2732,7 +2732,7 @@ L_1003430:
 // 0x01003440: 0x1003440: addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
-// 0x01003444: 0x1003444: jal   0x1004a38 sw    v0, 16(sp)
+// 0x01003444: 0x1003444: jal   0x1004a48 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2746,7 +2746,7 @@ L_1003430:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
@@ -3039,7 +3039,7 @@ __CIBYL_javamethod_begin:
 // 0x010034ec: 0x10034ec: addiu a1, zero, 248
 	ldc.i4 248
 	stloc.2
-// 0x010034f0: 0x10034f0: jal   0x1004a38 sw    v0, 16(sp)
+// 0x010034f0: 0x10034f0: jal   0x1004a48 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3053,7 +3053,7 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
@@ -4218,12 +4218,12 @@ __CIBYL_javamethod_begin:
 // 0x0100380c: 0x100380c: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01003810: 0x1003810: lw    a0, 31144(v0)
+// 0x01003810: 0x1003810: lw    a0, 31608(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7786
+	ldc.i4 7902
 	add
 	ldelem.i4
 	stloc.1
@@ -4320,7 +4320,7 @@ L_100385c:
 // 0x01003870: 0x1003870: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x01003874: 0x1003874: jal   0x1004a38 addu  s0, v0, zero
+// 0x01003874: 0x1003874: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.0
@@ -4328,7 +4328,7 @@ L_100385c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
@@ -4670,12 +4670,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100392c: 0x100392c: lw    a0, 31144(v0)
+// 0x0100392c: 0x100392c: lw    a0, 31608(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7786
+	ldc.i4 7902
 	add
 	ldelem.i4
 	stloc.1
@@ -4823,7 +4823,7 @@ L_1003980:
 // 0x010039b0: 0x10039b0: addiu a1, zero, 411
 	ldc.i4 411
 	stloc.2
-// 0x010039b4: 0x10039b4: jal   0x1004a38 addu  s0, v0, zero
+// 0x010039b4: 0x10039b4: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -4831,7 +4831,7 @@ L_1003980:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
@@ -4969,10 +4969,10 @@ L_1003980:
 // 0x01003a0c: 0x1003a0c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01003a10: 0x1003a10: jal   0x1052ac4 addu  a1, s2, zero
+// 0x01003a10: 0x1003a10: jal   0x1052ad4 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-	call void Cibyl61::roadmap_tile_remove_1052ac4()
+	call void Cibyl61::roadmap_tile_remove_1052ad4()
 // --- basic block ---
 // 0x01003a18: 0x1003a18: j	 0x1003a40 addu  v1, zero, zero
 	ldc.i4.s 0
@@ -5100,7 +5100,7 @@ L_1003a64:
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01003a6c: 0x1003a6c: jal   0x1052be4 addiu a3, sp, 28
+// 0x01003a6c: 0x1003a6c: jal   0x1052bf4 addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -5110,7 +5110,7 @@ L_1003a64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_tile_load_1052be4(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_tile_load_1052bf4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
@@ -5154,12 +5154,12 @@ __CIBYL_javamethod_begin:
 // 0x01003a84: 0x1003a84: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01003a88: 0x1003a88: lw    v0, 31152(v0)
+// 0x01003a88: 0x1003a88: lw    v0, 31616(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.1
@@ -5210,12 +5210,12 @@ __CIBYL_javamethod_begin:
 // 0x01003aa0: 0x1003aa0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01003aa4: 0x1003aa4: lw    v0, 31152(v0)
+// 0x01003aa4: 0x1003aa4: lw    v0, 31616(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.1
@@ -5268,12 +5268,12 @@ __CIBYL_javamethod_begin:
 // 0x01003abc: 0x1003abc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.0
-// 0x01003ac0: 0x1003ac0: lw    v1, 31148(v0)
+// 0x01003ac0: 0x1003ac0: lw    v1, 31612(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc.1
@@ -5334,12 +5334,12 @@ __CIBYL_javamethod_begin:
 // 0x01003adc: 0x1003adc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01003ae0: 0x1003ae0: lw    v0, 31152(v0)
+// 0x01003ae0: 0x1003ae0: lw    v0, 31616(v0)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.3
@@ -5420,12 +5420,12 @@ __CIBYL_javamethod_begin:
 // 0x01003b08: 0x1003b08: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01003b0c: 0x1003b0c: lw    v0, 31152(v0)
+// 0x01003b0c: 0x1003b0c: lw    v0, 31616(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.2
@@ -5487,12 +5487,12 @@ __CIBYL_javamethod_begin:
 // 0x01003b2c: 0x1003b2c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01003b30: 0x1003b30: lw    v0, 31152(v0)
+// 0x01003b30: 0x1003b30: lw    v0, 31616(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.2
@@ -5562,12 +5562,12 @@ __CIBYL_javamethod_begin:
 // 0x01003b50: 0x1003b50: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01003b54: 0x1003b54: lw    v0, 31148(v0)
+// 0x01003b54: 0x1003b54: lw    v0, 31612(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc.3
@@ -5687,12 +5687,12 @@ __CIBYL_javamethod_begin:
 // 0x01003bb4: 0x1003bb4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01003bb8: 0x1003bb8: lw    v1, 31148(v0)
+// 0x01003bb8: 0x1003bb8: lw    v1, 31612(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 5
@@ -5818,12 +5818,12 @@ __CIBYL_javamethod_begin:
 // 0x01003c0c: 0x1003c0c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01003c10: 0x1003c10: lw    v0, 31148(v0)
+// 0x01003c10: 0x1003c10: lw    v0, 31612(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc.1
@@ -5892,12 +5892,12 @@ __CIBYL_javamethod_begin:
 // 0x01003c30: 0x1003c30: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01003c34: 0x1003c34: lw    v0, 31148(v0)
+// 0x01003c34: 0x1003c34: lw    v0, 31612(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 4
@@ -6045,12 +6045,12 @@ L_1003c80:
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01003c9c: 0x1003c9c: lw    v0, 24364(v0)
+// 0x01003c9c: 0x1003c9c: lw    v0, 24828(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6091
+	ldc.i4 6207
 	add
 	ldelem.i4
 	stloc 5
@@ -6105,24 +6105,24 @@ L_1003cc4:
 	ldc.i4 131072
 	stloc 5
 // 0x01003ccc: 0x1003ccc: lw    ra, 20(sp)
-// 0x01003cd0: 0x1003cd0: sw    v1, 31152(v0)
+// 0x01003cd0: 0x1003cd0: sw    v1, 31616(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldloc 7
 	stelem.i4
 // 0x01003cd4: 0x1003cd4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01003cd8: 0x1003cd8: sw    s0, 31148(v0)
+// 0x01003cd8: 0x1003cd8: sw    s0, 31612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldloc 8
 	stelem.i4
@@ -6185,12 +6185,12 @@ __CIBYL_javamethod_begin:
 // 0x01003ce8: 0x1003ce8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01003cec: 0x1003cec: lw    v1, 31148(v0)
+// 0x01003cec: 0x1003cec: lw    v1, 31612(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 5
@@ -6282,12 +6282,12 @@ L_1003d20:
 	br L_1003d64
 // --- basic block ---
 L_1003d44:
-// 0x01003d44: 0x1003d44: lw    v1, 31152(v1)
+// 0x01003d44: 0x1003d44: lw    v1, 31616(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 5
@@ -6385,12 +6385,12 @@ L_1003d74:
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01003d7c: 0x1003d7c: lw    v0, 24364(v0)
+// 0x01003d7c: 0x1003d7c: lw    v0, 24828(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6091
+	ldc.i4 6207
 	add
 	ldelem.i4
 	stloc 5
@@ -6613,12 +6613,12 @@ L_1003e10:
 // 0x01003e10: 0x1003e10: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01003e14: 0x1003e14: lw    v1, 24364(v1)
+// 0x01003e14: 0x1003e14: lw    v1, 24828(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6091
+	ldc.i4 6207
 	add
 	ldelem.i4
 	stloc 8
diff --git a/converted/Cibyl20.j b/converted/Cibyl20.j
index cdad002..e97550a 100644
--- a/converted/Cibyl20.j
+++ b/converted/Cibyl20.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl20::.ctor
 
-.method public static int32 roadmap_sprite_initialize_101b788(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sprite_initialize_101b798(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 t0,int32 s4,int32 s5,int32 ra)
@@ -97,15 +97,15 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101b788: 0x101b788: addiu sp, sp, -72
+// 0x0101b798: 0x101b798: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0101b78c: 0x101b78c: lui   a0, 0x10000
+// 0x0101b79c: 0x101b79c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101b790: 0x101b790: sw    s3, 56(sp)
+// 0x0101b7a0: 0x101b7a0: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -114,7 +114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101b794: 0x101b794: sw    s2, 52(sp)
+// 0x0101b7a4: 0x101b7a4: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -123,7 +123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101b798: 0x101b798: sw    s1, 48(sp)
+// 0x0101b7a8: 0x101b7a8: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -132,25 +132,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101b79c: 0x101b79c: addiu a0, a0, -30588
+// 0x0101b7ac: 0x101b7ac: addiu a0, a0, -30588
 	ldloc.1
 	ldc.i4 -30588
 	add
 	stloc.1
-// 0x0101b7a0: 0x101b7a0: addu  a1, zero, zero
+// 0x0101b7b0: 0x101b7b0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101b7a4: 0x101b7a4: lui   s3, 0x0
+// 0x0101b7b4: 0x101b7b4: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0101b7a8: 0x101b7a8: lui   s2, 0x10000
+// 0x0101b7b8: 0x101b7b8: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0101b7ac: 0x101b7ac: lui   s1, 0x10000
+// 0x0101b7bc: 0x101b7bc: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0101b7b0: 0x101b7b0: sw    ra, 68(sp)
-// 0x0101b7b4: 0x101b7b4: sw    s5, 64(sp)
+// 0x0101b7c0: 0x101b7c0: sw    ra, 68(sp)
+// 0x0101b7c4: 0x101b7c4: sw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -159,7 +159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101b7b8: 0x101b7b8: sw    s4, 60(sp)
+// 0x0101b7c8: 0x101b7c8: sw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -168,7 +168,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101b7bc: 0x101b7bc: jal   0x104ef00 sw    s0, 44(sp)
+// 0x0101b7cc: 0x101b7cc: jal   0x104ef10 sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -182,47 +182,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b7c4: 0x101b7c4: addiu s0, sp, 24
+// 0x0101b7d4: 0x101b7d4: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0101b7c8: 0x101b7c8: addiu a0, s3, 26228
+// 0x0101b7d8: 0x101b7d8: addiu a0, s3, 26228
 	ldloc 10
 	ldc.i4 26228
 	add
 	stloc.1
-// 0x0101b7cc: 0x101b7cc: addu  a2, zero, zero
+// 0x0101b7dc: 0x101b7dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101b7d0: 0x101b7d0: lui   v1, 0x30000
+// 0x0101b7e0: 0x101b7e0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101b7d4: 0x101b7d4: addiu a1, s2, -30580
+// 0x0101b7e4: 0x101b7e4: addiu a1, s2, -30580
 	ldloc 11
 	ldc.i4 -30580
 	add
 	stloc.2
-// 0x0101b7d8: 0x101b7d8: addiu a3, s1, 6924
+// 0x0101b7e8: 0x101b7e8: addiu a3, s1, 6920
 	ldloc 9
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 4
-// 0x0101b7dc: 0x101b7dc: sw    v0, 27084(v1)
+// 0x0101b7ec: 0x101b7ec: sw    v0, 27548(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6771
+	ldc.i4 6887
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101b7e0: 0x101b7e0: jal   0x104d770 sw    s0, 16(sp)
+// 0x0101b7f0: 0x101b7f0: jal   0x104d780 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -236,33 +236,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_map_104d770(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_map_104d780(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b7e8: 0x101b7e8: addu  a2, v0, zero
+// 0x0101b7f8: 0x101b7f8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101b7ec: 0x101b7ec: addiu s3, s3, 26228
+// 0x0101b7fc: 0x101b7fc: addiu s3, s3, 26228
 	ldloc 10
 	ldc.i4 26228
 	add
 	stloc 10
-// 0x0101b7f0: 0x101b7f0: addiu s5, s2, -30580
+// 0x0101b800: 0x101b800: addiu s5, s2, -30580
 	ldloc 11
 	ldc.i4 -30580
 	add
 	stloc 14
-// 0x0101b7f4: 0x101b7f4: j	 0x101b844 addiu s4, s1, 6924
+// 0x0101b804: 0x101b804: j	 0x101b854 addiu s4, s1, 6920
 	ldloc 9
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 13
-	br L_101b844
+	br L_101b854
 // --- basic block ---
-L_101b7fc:
-// 0x0101b7fc: 0x101b7fc: lw    a0, 24(sp)
+L_101b80c:
+// 0x0101b80c: 0x101b80c: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -271,7 +271,7 @@ L_101b7fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b800: 0x101b800: jal   0x104d414 sw    a2, 32(sp)
+// 0x0101b810: 0x101b810: jal   0x104d424 sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -281,10 +281,10 @@ L_101b7fc:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_base_104d414(int32)
+	call int32 Cibyl57::roadmap_file_base_104d424(int32)
 	stloc 5
 // --- basic block ---
-// 0x0101b808: 0x101b808: lw    a0, 24(sp)
+// 0x0101b818: 0x101b818: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -293,17 +293,17 @@ L_101b7fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b80c: 0x101b80c: jal   0x104d428 addu  s1, v0, zero
+// 0x0101b81c: 0x101b81c: jal   0x104d438 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_size_104d428(int32)
+	call int32 Cibyl57::roadmap_file_size_104d438(int32)
 	stloc 5
 // --- basic block ---
-// 0x0101b814: 0x101b814: addu  a1, v0, zero
+// 0x0101b824: 0x101b824: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101b818: 0x101b818: jal   0x101b2fc addu  a0, s1, zero
+// 0x0101b828: 0x101b828: jal   0x101b30c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -311,12 +311,12 @@ L_101b7fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_sprite_load_101b2fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_sprite_load_101b30c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b820: 0x101b820: jal   0x104d628 addu  a0, s0, zero
+// 0x0101b830: 0x101b830: jal   0x104d638 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -324,12 +324,12 @@ L_101b7fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_unmap_104d628(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_unmap_104d638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b828: 0x101b828: lw    a2, 32(sp)
+// 0x0101b838: 0x101b838: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -338,16 +338,16 @@ L_101b7fc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101b82c: 0x101b82c: addu  a0, s3, zero
+// 0x0101b83c: 0x101b83c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0101b830: 0x101b830: addu  a1, s5, zero
+// 0x0101b840: 0x101b840: addu  a1, s5, zero
 	ldloc 14
 	stloc.2
-// 0x0101b834: 0x101b834: addu  a3, s4, zero
+// 0x0101b844: 0x101b844: addu  a3, s4, zero
 	ldloc 13
 	stloc 4
-// 0x0101b838: 0x101b838: jal   0x104d770 sw    s0, 16(sp)
+// 0x0101b848: 0x101b848: jal   0x104d780 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -361,43 +361,43 @@ L_101b7fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_map_104d770(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_map_104d780(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b840: 0x101b840: addu  a2, v0, zero
+// 0x0101b850: 0x101b850: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_101b844:
-// 0x0101b844: 0x101b844: lui   s2, 0x10000
+L_101b854:
+// 0x0101b854: 0x101b854: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0101b848: 0x101b848: bne   a2, zero, 0x101b7fc lui   s1, 0x10000
+// 0x0101b858: 0x101b858: bne   a2, zero, 0x101b80c lui   s1, 0x10000
 	ldloc.3
 	ldc.i4 65536
 	stloc 9
-	brtrue L_101b7fc
+	brtrue L_101b80c
 // --- basic block ---
-// 0x0101b850: 0x101b850: lui   s3, 0x20000
+// 0x0101b860: 0x101b860: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x0101b854: 0x101b854: addiu a0, s3, -26888
+// 0x0101b864: 0x101b864: addiu a0, s3, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0101b858: 0x101b858: addiu a1, s2, -30580
+// 0x0101b868: 0x101b868: addiu a1, s2, -30580
 	ldloc 11
 	ldc.i4 -30580
 	add
 	stloc.2
-// 0x0101b85c: 0x101b85c: addiu a3, s1, 6924
+// 0x0101b86c: 0x101b86c: addiu a3, s1, 6920
 	ldloc 9
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 4
-// 0x0101b860: 0x101b860: jal   0x104d770 sw    s0, 16(sp)
+// 0x0101b870: 0x101b870: jal   0x104d780 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -411,38 +411,38 @@ L_101b844:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_map_104d770(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_map_104d780(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b868: 0x101b868: addu  a2, v0, zero
+// 0x0101b878: 0x101b878: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101b86c: 0x101b86c: addiu s3, s3, -26888
+// 0x0101b87c: 0x101b87c: addiu s3, s3, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc 10
-// 0x0101b870: 0x101b870: addiu s2, s2, -30580
+// 0x0101b880: 0x101b880: addiu s2, s2, -30580
 	ldloc 11
 	ldc.i4 -30580
 	add
 	stloc 11
-// 0x0101b874: 0x101b874: addiu s1, s1, 6924
+// 0x0101b884: 0x101b884: addiu s1, s1, 6920
 	ldloc 9
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 9
-// 0x0101b878: 0x101b878: j	 0x101b8c8 addiu s0, sp, 24
+// 0x0101b888: 0x101b888: j	 0x101b8d8 addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	br L_101b8c8
+	br L_101b8d8
 // --- basic block ---
-L_101b880:
-// 0x0101b880: 0x101b880: lw    a0, 24(sp)
+L_101b890:
+// 0x0101b890: 0x101b890: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -451,7 +451,7 @@ L_101b880:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b884: 0x101b884: jal   0x104d414 sw    a2, 32(sp)
+// 0x0101b894: 0x101b894: jal   0x104d424 sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -461,10 +461,10 @@ L_101b880:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_base_104d414(int32)
+	call int32 Cibyl57::roadmap_file_base_104d424(int32)
 	stloc 5
 // --- basic block ---
-// 0x0101b88c: 0x101b88c: lw    a0, 24(sp)
+// 0x0101b89c: 0x101b89c: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -473,17 +473,17 @@ L_101b880:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b890: 0x101b890: jal   0x104d428 addu  s4, v0, zero
+// 0x0101b8a0: 0x101b8a0: jal   0x104d438 addu  s4, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_size_104d428(int32)
+	call int32 Cibyl57::roadmap_file_size_104d438(int32)
 	stloc 5
 // --- basic block ---
-// 0x0101b898: 0x101b898: addu  a1, v0, zero
+// 0x0101b8a8: 0x101b8a8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101b89c: 0x101b89c: jal   0x101b2fc addu  a0, s4, zero
+// 0x0101b8ac: 0x101b8ac: jal   0x101b30c addu  a0, s4, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -491,12 +491,12 @@ L_101b880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_sprite_load_101b2fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_sprite_load_101b30c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b8a4: 0x101b8a4: jal   0x104d628 addu  a0, s0, zero
+// 0x0101b8b4: 0x101b8b4: jal   0x104d638 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -504,12 +504,12 @@ L_101b880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_unmap_104d628(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_unmap_104d638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b8ac: 0x101b8ac: lw    a2, 32(sp)
+// 0x0101b8bc: 0x101b8bc: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -518,16 +518,16 @@ L_101b880:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101b8b0: 0x101b8b0: addu  a0, s3, zero
+// 0x0101b8c0: 0x101b8c0: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0101b8b4: 0x101b8b4: addu  a1, s2, zero
+// 0x0101b8c4: 0x101b8c4: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x0101b8b8: 0x101b8b8: addu  a3, s1, zero
+// 0x0101b8c8: 0x101b8c8: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0101b8bc: 0x101b8bc: jal   0x104d770 sw    s0, 16(sp)
+// 0x0101b8cc: 0x101b8cc: jal   0x104d780 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -541,49 +541,49 @@ L_101b880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_map_104d770(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_map_104d780(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b8c4: 0x101b8c4: addu  a2, v0, zero
+// 0x0101b8d4: 0x101b8d4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_101b8c8:
-// 0x0101b8c8: 0x101b8c8: bne   a2, zero, 0x101b880 lui   v0, 0x30000
+L_101b8d8:
+// 0x0101b8d8: 0x101b8d8: bne   a2, zero, 0x101b890 lui   v0, 0x30000
 	ldloc.3
 	ldc.i4 196608
 	stloc 5
-	brtrue L_101b880
+	brtrue L_101b890
 // --- basic block ---
-// 0x0101b8d0: 0x101b8d0: lui   s1, 0x10000
+// 0x0101b8e0: 0x101b8e0: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0101b8d4: 0x101b8d4: lw    s0, 27080(v0)
+// 0x0101b8e4: 0x101b8e4: lw    s0, 27544(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6770
+	ldc.i4 6886
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b8d8: 0x101b8d8: j	 0x101b8fc addiu s1, s1, -30572
+// 0x0101b8e8: 0x101b8e8: j	 0x101b90c addiu s1, s1, -30572
 	ldloc 9
 	ldc.i4 -30572
 	add
 	stloc 9
-	br L_101b8fc
+	br L_101b90c
 // --- basic block ---
-L_101b8e0:
-// 0x0101b8e0: 0x101b8e0: lw    a1, 0(s0)
+L_101b8f0:
+// 0x0101b8f0: 0x101b8f0: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101b8e4: 0x101b8e4: jal   0x1001c08 sll   zero, zero, 0
+// 0x0101b8f4: 0x101b8f4: jal   0x1001c08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -594,13 +594,13 @@ L_101b8e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b8ec: 0x101b8ec: beq   v0, zero, 0x101b910 lui   v0, 0x30000
+// 0x0101b8fc: 0x101b8fc: beq   v0, zero, 0x101b920 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_101b910
+	brfalse L_101b920
 // --- basic block ---
-// 0x0101b8f4: 0x101b8f4: lw    s0, 80(s0)
+// 0x0101b904: 0x101b904: lw    s0, 80(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -609,51 +609,51 @@ L_101b8e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b8f8: 0x101b8f8: sll   zero, zero, 0
-L_101b8fc:
-// 0x0101b8fc: 0x101b8fc: bne   s0, zero, 0x101b8e0 addu  a0, s1, zero
+// 0x0101b908: 0x101b908: sll   zero, zero, 0
+L_101b90c:
+// 0x0101b90c: 0x101b90c: bne   s0, zero, 0x101b8f0 addu  a0, s1, zero
 	ldloc 8
 	ldloc 9
 	stloc.1
-	brtrue L_101b8e0
+	brtrue L_101b8f0
 // --- basic block ---
-// 0x0101b904: 0x101b904: lui   v0, 0x30000
+// 0x0101b914: 0x101b914: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101b908: 0x101b908: lw    s0, 27076(v0)
+// 0x0101b918: 0x101b918: lw    s0, 27540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6769
+	ldc.i4 6885
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b90c: 0x101b90c: lui   v0, 0x30000
+// 0x0101b91c: 0x101b91c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_101b910:
-// 0x0101b910: 0x101b910: bne   s0, zero, 0x101b970 sw    s0, 27076(v0)
+L_101b920:
+// 0x0101b920: 0x101b920: bne   s0, zero, 0x101b980 sw    s0, 27540(v0)
 	ldloc 8
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6769
+	ldc.i4 6885
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_101b970
+	brtrue L_101b980
 // --- basic block ---
-// 0x0101b918: 0x101b918: lui   a0, 0x10000
+// 0x0101b928: 0x101b928: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101b91c: 0x101b91c: addiu a0, a0, -30564
+// 0x0101b92c: 0x101b92c: addiu a0, a0, -30564
 	ldloc.1
 	ldc.i4 -30564
 	add
 	stloc.1
-// 0x0101b920: 0x101b920: jal   0x101b2fc addiu a1, zero, 42
+// 0x0101b930: 0x101b930: jal   0x101b30c addiu a1, zero, 42
 	ldc.i4.s 42
 	stloc.2
 	ldloc.0
@@ -661,42 +661,42 @@ L_101b910:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_sprite_load_101b2fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_sprite_load_101b30c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b928: 0x101b928: lui   s1, 0x10000
+// 0x0101b938: 0x101b938: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0101b92c: 0x101b92c: lui   v0, 0x30000
+// 0x0101b93c: 0x101b93c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101b930: 0x101b930: lw    s0, 27080(v0)
+// 0x0101b940: 0x101b940: lw    s0, 27544(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6770
+	ldc.i4 6886
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b934: 0x101b934: j	 0x101b958 addiu s1, s1, -30572
+// 0x0101b944: 0x101b944: j	 0x101b968 addiu s1, s1, -30572
 	ldloc 9
 	ldc.i4 -30572
 	add
 	stloc 9
-	br L_101b958
+	br L_101b968
 // --- basic block ---
-L_101b93c:
-// 0x0101b93c: 0x101b93c: lw    a1, 0(s0)
+L_101b94c:
+// 0x0101b94c: 0x101b94c: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101b940: 0x101b940: jal   0x1001c08 sll   zero, zero, 0
+// 0x0101b950: 0x101b950: jal   0x1001c08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -707,13 +707,13 @@ L_101b93c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101b948: 0x101b948: beq   v0, zero, 0x101b96c lui   v0, 0x30000
+// 0x0101b958: 0x101b958: beq   v0, zero, 0x101b97c lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_101b96c
+	brfalse L_101b97c
 // --- basic block ---
-// 0x0101b950: 0x101b950: lw    s0, 80(s0)
+// 0x0101b960: 0x101b960: lw    s0, 80(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -722,64 +722,64 @@ L_101b93c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b954: 0x101b954: sll   zero, zero, 0
-L_101b958:
-// 0x0101b958: 0x101b958: bne   s0, zero, 0x101b93c addu  a0, s1, zero
+// 0x0101b964: 0x101b964: sll   zero, zero, 0
+L_101b968:
+// 0x0101b968: 0x101b968: bne   s0, zero, 0x101b94c addu  a0, s1, zero
 	ldloc 8
 	ldloc 9
 	stloc.1
-	brtrue L_101b93c
+	brtrue L_101b94c
 // --- basic block ---
-// 0x0101b960: 0x101b960: lui   v0, 0x30000
+// 0x0101b970: 0x101b970: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101b964: 0x101b964: lw    s0, 27076(v0)
+// 0x0101b974: 0x101b974: lw    s0, 27540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6769
+	ldc.i4 6885
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101b968: 0x101b968: lui   v0, 0x30000
+// 0x0101b978: 0x101b978: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_101b96c:
-// 0x0101b96c: 0x101b96c: sw    s0, 27076(v0)
+L_101b97c:
+// 0x0101b97c: 0x101b97c: sw    s0, 27540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6769
+	ldc.i4 6885
 	add
 	ldloc 8
 	stelem.i4
-L_101b970:
-// 0x0101b970: 0x101b970: lui   v0, 0x30000
+L_101b980:
+// 0x0101b980: 0x101b980: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101b974: 0x101b974: lw    v1, 27076(v0)
+// 0x0101b984: 0x101b984: lw    v1, 27540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6769
+	ldc.i4 6885
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101b978: 0x101b978: addu  v0, zero, zero
+// 0x0101b988: 0x101b988: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0101b97c: 0x101b97c: j	 0x101b9e8 addiu v1, v1, 4
+// 0x0101b98c: 0x101b98c: j	 0x101b9f8 addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	br L_101b9e8
+	br L_101b9f8
 // --- basic block ---
-L_101b984:
-// 0x0101b984: 0x101b984: lw    a0, 32(v1)
+L_101b994:
+// 0x0101b994: 0x101b994: lw    a0, 32(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -788,7 +788,7 @@ L_101b984:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b988: 0x101b988: lw    a1, 16(v1)
+// 0x0101b998: 0x101b998: lw    a1, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -797,21 +797,21 @@ L_101b984:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101b98c: 0x101b98c: sll   zero, zero, 0
-// 0x0101b990: 0x101b990: slt   a2, a0, a1
+// 0x0101b99c: 0x101b99c: sll   zero, zero, 0
+// 0x0101b9a0: 0x101b9a0: slt   a2, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.3
-// 0x0101b994: 0x101b994: beq   a2, zero, 0x101b9a0 sll   zero, zero, 0
+// 0x0101b9a4: 0x101b9a4: beq   a2, zero, 0x101b9b0 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_101b9a0
+	brfalse L_101b9b0
 // --- basic block ---
-// 0x0101b99c: 0x101b99c: addu  a0, a1, zero
+// 0x0101b9ac: 0x101b9ac: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-L_101b9a0:
-// 0x0101b9a0: 0x101b9a0: lw    a1, 48(v1)
+L_101b9b0:
+// 0x0101b9b0: 0x101b9b0: lw    a1, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -820,21 +820,21 @@ L_101b9a0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101b9a4: 0x101b9a4: sll   zero, zero, 0
-// 0x0101b9a8: 0x101b9a8: slt   a2, a0, a1
+// 0x0101b9b4: 0x101b9b4: sll   zero, zero, 0
+// 0x0101b9b8: 0x101b9b8: slt   a2, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.3
-// 0x0101b9ac: 0x101b9ac: beq   a2, zero, 0x101b9b8 sll   zero, zero, 0
+// 0x0101b9bc: 0x101b9bc: beq   a2, zero, 0x101b9c8 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_101b9b8
+	brfalse L_101b9c8
 // --- basic block ---
-// 0x0101b9b4: 0x101b9b4: addu  a0, a1, zero
+// 0x0101b9c4: 0x101b9c4: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-L_101b9b8:
-// 0x0101b9b8: 0x101b9b8: lw    a1, 64(v1)
+L_101b9c8:
+// 0x0101b9c8: 0x101b9c8: lw    a1, 64(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -843,69 +843,69 @@ L_101b9b8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101b9bc: 0x101b9bc: sll   zero, zero, 0
-// 0x0101b9c0: 0x101b9c0: slt   a2, a0, a1
+// 0x0101b9cc: 0x101b9cc: sll   zero, zero, 0
+// 0x0101b9d0: 0x101b9d0: slt   a2, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.3
-// 0x0101b9c4: 0x101b9c4: beq   a2, zero, 0x101b9d0 sll   zero, zero, 0
+// 0x0101b9d4: 0x101b9d4: beq   a2, zero, 0x101b9e0 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_101b9d0
+	brfalse L_101b9e0
 // --- basic block ---
-// 0x0101b9cc: 0x101b9cc: addu  a0, a1, zero
+// 0x0101b9dc: 0x101b9dc: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-L_101b9d0:
-// 0x0101b9d0: 0x101b9d0: slt   a1, v0, a0
+L_101b9e0:
+// 0x0101b9e0: 0x101b9e0: slt   a1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.2
-// 0x0101b9d4: 0x101b9d4: beq   a1, zero, 0x101b9e0 sll   zero, zero, 0
+// 0x0101b9e4: 0x101b9e4: beq   a1, zero, 0x101b9f0 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_101b9e0
+	brfalse L_101b9f0
 // --- basic block ---
-// 0x0101b9dc: 0x101b9dc: addu  v0, a0, zero
+// 0x0101b9ec: 0x101b9ec: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-L_101b9e0:
-// 0x0101b9e0: 0x101b9e0: lw    v1, 0(v1)
+L_101b9f0:
+// 0x0101b9f0: 0x101b9f0: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101b9e4: 0x101b9e4: sll   zero, zero, 0
-L_101b9e8:
-// 0x0101b9e8: 0x101b9e8: bne   v1, zero, 0x101b984 sll   zero, zero, 0
+// 0x0101b9f4: 0x101b9f4: sll   zero, zero, 0
+L_101b9f8:
+// 0x0101b9f8: 0x101b9f8: bne   v1, zero, 0x101b994 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_101b984
+	brtrue L_101b994
 // --- basic block ---
-// 0x0101b9f0: 0x101b9f0: lui   v1, 0x30000
+// 0x0101ba00: 0x101ba00: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101b9f4: 0x101b9f4: lw    a0, 27080(v1)
+// 0x0101ba04: 0x101ba04: lw    a0, 27544(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6770
+	ldc.i4 6886
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101b9f8: 0x101b9f8: j	 0x101ba8c sll   zero, zero, 0
-	br L_101ba8c
+// 0x0101ba08: 0x101ba08: j	 0x101ba9c sll   zero, zero, 0
+	br L_101ba9c
 // --- basic block ---
-L_101ba00:
-// 0x0101ba00: 0x101ba00: j	 0x101ba6c addu  a1, zero, zero
+L_101ba10:
+// 0x0101ba10: 0x101ba10: j	 0x101ba7c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_101ba6c
+	br L_101ba7c
 // --- basic block ---
-L_101ba08:
-// 0x0101ba08: 0x101ba08: lw    a2, 32(v1)
+L_101ba18:
+// 0x0101ba18: 0x101ba18: lw    a2, 32(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -914,7 +914,7 @@ L_101ba08:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101ba0c: 0x101ba0c: lw    a3, 16(v1)
+// 0x0101ba1c: 0x101ba1c: lw    a3, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -923,21 +923,21 @@ L_101ba08:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101ba10: 0x101ba10: sll   zero, zero, 0
-// 0x0101ba14: 0x101ba14: slt   t0, a2, a3
+// 0x0101ba20: 0x101ba20: sll   zero, zero, 0
+// 0x0101ba24: 0x101ba24: slt   t0, a2, a3
 	ldloc.3
 	ldloc 4
 	clt
 	stloc 12
-// 0x0101ba18: 0x101ba18: beq   t0, zero, 0x101ba24 sll   zero, zero, 0
+// 0x0101ba28: 0x101ba28: beq   t0, zero, 0x101ba34 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_101ba24
+	brfalse L_101ba34
 // --- basic block ---
-// 0x0101ba20: 0x101ba20: addu  a2, a3, zero
+// 0x0101ba30: 0x101ba30: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-L_101ba24:
-// 0x0101ba24: 0x101ba24: lw    a3, 48(v1)
+L_101ba34:
+// 0x0101ba34: 0x101ba34: lw    a3, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -946,21 +946,21 @@ L_101ba24:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101ba28: 0x101ba28: sll   zero, zero, 0
-// 0x0101ba2c: 0x101ba2c: slt   t0, a2, a3
+// 0x0101ba38: 0x101ba38: sll   zero, zero, 0
+// 0x0101ba3c: 0x101ba3c: slt   t0, a2, a3
 	ldloc.3
 	ldloc 4
 	clt
 	stloc 12
-// 0x0101ba30: 0x101ba30: beq   t0, zero, 0x101ba3c sll   zero, zero, 0
+// 0x0101ba40: 0x101ba40: beq   t0, zero, 0x101ba4c sll   zero, zero, 0
 	ldloc 12
-	brfalse L_101ba3c
+	brfalse L_101ba4c
 // --- basic block ---
-// 0x0101ba38: 0x101ba38: addu  a2, a3, zero
+// 0x0101ba48: 0x101ba48: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-L_101ba3c:
-// 0x0101ba3c: 0x101ba3c: lw    a3, 64(v1)
+L_101ba4c:
+// 0x0101ba4c: 0x101ba4c: lw    a3, 64(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -969,60 +969,60 @@ L_101ba3c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101ba40: 0x101ba40: sll   zero, zero, 0
-// 0x0101ba44: 0x101ba44: slt   t0, a2, a3
+// 0x0101ba50: 0x101ba50: sll   zero, zero, 0
+// 0x0101ba54: 0x101ba54: slt   t0, a2, a3
 	ldloc.3
 	ldloc 4
 	clt
 	stloc 12
-// 0x0101ba48: 0x101ba48: beq   t0, zero, 0x101ba54 sll   zero, zero, 0
+// 0x0101ba58: 0x101ba58: beq   t0, zero, 0x101ba64 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_101ba54
+	brfalse L_101ba64
 // --- basic block ---
-// 0x0101ba50: 0x101ba50: addu  a2, a3, zero
+// 0x0101ba60: 0x101ba60: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-L_101ba54:
-// 0x0101ba54: 0x101ba54: slt   a3, a1, a2
+L_101ba64:
+// 0x0101ba64: 0x101ba64: slt   a3, a1, a2
 	ldloc.2
 	ldloc.3
 	clt
 	stloc 4
-// 0x0101ba58: 0x101ba58: beq   a3, zero, 0x101ba64 sll   zero, zero, 0
+// 0x0101ba68: 0x101ba68: beq   a3, zero, 0x101ba74 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_101ba64
+	brfalse L_101ba74
 // --- basic block ---
-// 0x0101ba60: 0x101ba60: addu  a1, a2, zero
+// 0x0101ba70: 0x101ba70: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-L_101ba64:
-// 0x0101ba64: 0x101ba64: lw    v1, 0(v1)
+L_101ba74:
+// 0x0101ba74: 0x101ba74: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101ba68: 0x101ba68: sll   zero, zero, 0
-L_101ba6c:
-// 0x0101ba6c: 0x101ba6c: bne   v1, zero, 0x101ba08 sll   zero, zero, 0
+// 0x0101ba78: 0x101ba78: sll   zero, zero, 0
+L_101ba7c:
+// 0x0101ba7c: 0x101ba7c: bne   v1, zero, 0x101ba18 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_101ba08
+	brtrue L_101ba18
 // --- basic block ---
-// 0x0101ba74: 0x101ba74: slt   v1, v0, a1
+// 0x0101ba84: 0x101ba84: slt   v1, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 7
-// 0x0101ba78: 0x101ba78: beq   v1, zero, 0x101ba84 sll   zero, zero, 0
+// 0x0101ba88: 0x101ba88: beq   v1, zero, 0x101ba94 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_101ba84
+	brfalse L_101ba94
 // --- basic block ---
-// 0x0101ba80: 0x101ba80: addu  v0, a1, zero
+// 0x0101ba90: 0x101ba90: addu  v0, a1, zero
 	ldloc.2
 	stloc 5
-L_101ba84:
-// 0x0101ba84: 0x101ba84: lw    a0, 80(a0)
+L_101ba94:
+// 0x0101ba94: 0x101ba94: lw    a0, 80(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1031,31 +1031,31 @@ L_101ba84:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ba88: 0x101ba88: sll   zero, zero, 0
-L_101ba8c:
-// 0x0101ba8c: 0x101ba8c: bne   a0, zero, 0x101ba00 addiu v1, a0, 4
+// 0x0101ba98: 0x101ba98: sll   zero, zero, 0
+L_101ba9c:
+// 0x0101ba9c: 0x101ba9c: bne   a0, zero, 0x101ba10 addiu v1, a0, 4
 	ldloc.1
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc 7
-	brtrue L_101ba00
+	brtrue L_101ba10
 // --- basic block ---
-// 0x0101ba94: 0x101ba94: lui   v1, 0x30000
+// 0x0101baa4: 0x101baa4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101ba98: 0x101ba98: addu  a0, v0, zero
+// 0x0101baa8: 0x101baa8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101ba9c: 0x101ba9c: addiu a1, zero, 8
+// 0x0101baac: 0x101baac: addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
-// 0x0101baa0: 0x101baa0: jal   0x101b2b4 sw    v0, 27068(v1)
+// 0x0101bab0: 0x101bab0: jal   0x101b2c4 sw    v0, 27532(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6767
+	ldc.i4 6883
 	add
 	ldloc 5
 	stelem.i4
@@ -1064,16 +1064,16 @@ L_101ba8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::calloc_101b2b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::calloc_101b2c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101baa8: 0x101baa8: lw    ra, 68(sp)
-// 0x0101baac: 0x101baac: lui   v1, 0x30000
+// 0x0101bab8: 0x101bab8: lw    ra, 68(sp)
+// 0x0101babc: 0x101babc: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101bab0: 0x101bab0: lw    s5, 64(sp)
+// 0x0101bac0: 0x101bac0: lw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1082,7 +1082,7 @@ L_101ba8c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101bab4: 0x101bab4: lw    s4, 60(sp)
+// 0x0101bac4: 0x101bac4: lw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1091,7 +1091,7 @@ L_101ba8c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101bab8: 0x101bab8: lw    s3, 56(sp)
+// 0x0101bac8: 0x101bac8: lw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1100,7 +1100,7 @@ L_101ba8c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101babc: 0x101babc: lw    s2, 52(sp)
+// 0x0101bacc: 0x101bacc: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1109,7 +1109,7 @@ L_101ba8c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101bac0: 0x101bac0: lw    s1, 48(sp)
+// 0x0101bad0: 0x101bad0: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1118,7 +1118,7 @@ L_101ba8c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101bac4: 0x101bac4: lw    s0, 44(sp)
+// 0x0101bad4: 0x101bad4: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1127,16 +1127,16 @@ L_101ba8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bac8: 0x101bac8: sw    v0, 27072(v1)
+// 0x0101bad8: 0x101bad8: sw    v0, 27536(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6768
+	ldc.i4 6884
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101bacc: 0x101bacc: jr    ra addiu sp, sp, 72
+// 0x0101badc: 0x101badc: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1148,7 +1148,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_sprite_place_101bad4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sprite_place_101bae4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 t0,int32 v0,int32 v1,int32 t3,int32 t4,int32 ra,int32 t1,int32 t2)
@@ -1198,22 +1198,22 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bad4: 0x101bad4: lui   v0, 0x30000
+// 0x0101bae4: 0x101bae4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101bad8: 0x101bad8: addu  t0, a0, zero
+// 0x0101bae8: 0x101bae8: addu  t0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0101badc: 0x101badc: lw    v1, 27072(v0)
+// 0x0101baec: 0x101baec: lw    v1, 27536(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6768
+	ldc.i4 6884
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bae0: 0x101bae0: lw    a0, 8(a0)
+// 0x0101baf0: 0x101baf0: lw    a0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1222,25 +1222,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bae4: 0x101bae4: addiu sp, sp, -24
+// 0x0101baf4: 0x101baf4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101bae8: 0x101bae8: addu  v0, a1, zero
+// 0x0101baf8: 0x101baf8: addu  v0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0101baec: 0x101baec: addu  a3, a2, zero
+// 0x0101bafc: 0x101bafc: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x0101baf0: 0x101baf0: lw    t2, 0(a1)
+// 0x0101bb00: 0x101bb00: lw    t2, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0101baf4: 0x101baf4: lw    t1, 4(a1)
+// 0x0101bb04: 0x101bb04: lw    t1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -1249,7 +1249,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101baf8: 0x101baf8: lw    a2, 12(t0)
+// 0x0101bb08: 0x101bb08: lw    a2, 12(t0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1258,26 +1258,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101bafc: 0x101bafc: sw    ra, 20(sp)
-// 0x0101bb00: 0x101bb00: addiu t0, a0, -1
+// 0x0101bb0c: 0x101bb0c: sw    ra, 20(sp)
+// 0x0101bb10: 0x101bb10: addiu t0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0101bb04: 0x101bb04: j	 0x101bb2c addu  a1, v1, zero
+// 0x0101bb14: 0x101bb14: j	 0x101bb3c addu  a1, v1, zero
 	ldloc 8
 	stloc.2
-	br L_101bb2c
+	br L_101bb3c
 // --- basic block ---
-L_101bb0c:
-// 0x0101bb0c: 0x101bb0c: lw    t4, 0(a2)
+L_101bb1c:
+// 0x0101bb1c: 0x101bb1c: lw    t4, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0101bb10: 0x101bb10: lw    t3, 4(a2)
+// 0x0101bb20: 0x101bb20: lw    t3, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -1286,24 +1286,24 @@ L_101bb0c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101bb14: 0x101bb14: addu  t4, t4, t2
+// 0x0101bb24: 0x101bb24: addu  t4, t4, t2
 	ldloc 10
 	ldloc 13
 	add
 	stloc 10
-// 0x0101bb18: 0x101bb18: addu  t3, t3, t1
+// 0x0101bb28: 0x101bb28: addu  t3, t3, t1
 	ldloc 9
 	ldloc 12
 	add
 	stloc 9
-// 0x0101bb1c: 0x101bb1c: sw    t4, 0(a1)
+// 0x0101bb2c: 0x101bb2c: sw    t4, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x0101bb20: 0x101bb20: sw    t3, 4(a1)
+// 0x0101bb30: 0x101bb30: sw    t3, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -1312,30 +1312,30 @@ L_101bb0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101bb24: 0x101bb24: addiu a2, a2, 8
+// 0x0101bb34: 0x101bb34: addiu a2, a2, 8
 	ldloc.3
 	ldc.i4.8
 	add
 	stloc.3
-// 0x0101bb28: 0x101bb28: addiu a1, a1, 8
+// 0x0101bb38: 0x101bb38: addiu a1, a1, 8
 	ldloc.2
 	ldc.i4.8
 	add
 	stloc.2
-L_101bb2c:
-// 0x0101bb2c: 0x101bb2c: bgez  t0, 0x101bb0c addiu t0, t0, -1
+L_101bb3c:
+// 0x0101bb3c: 0x101bb3c: bgez  t0, 0x101bb1c addiu t0, t0, -1
 	ldloc 6
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
 	ldc.i4.s 0
-	bge L_101bb0c
+	bge L_101bb1c
 // --- basic block ---
-// 0x0101bb34: 0x101bb34: addu  a1, v1, zero
+// 0x0101bb44: 0x101bb44: addu  a1, v1, zero
 	ldloc 8
 	stloc.2
-// 0x0101bb38: 0x101bb38: jal   0x10074ec addu  a2, v0, zero
+// 0x0101bb48: 0x101bb48: jal   0x10074fc addu  a2, v0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -1343,14 +1343,14 @@ L_101bb2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_object_10074ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_object_10074fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101bb40: 0x101bb40: lw    ra, 20(sp)
-// 0x0101bb44: 0x101bb44: sll   zero, zero, 0
-// 0x0101bb48: 0x101bb48: jr    ra addiu sp, sp, 24
+// 0x0101bb50: 0x101bb50: lw    ra, 20(sp)
+// 0x0101bb54: 0x101bb54: sll   zero, zero, 0
+// 0x0101bb58: 0x101bb58: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1362,7 +1362,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -1409,15 +1409,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bb50: 0x101bb50: addiu sp, sp, -48
+// 0x0101bb60: 0x101bb60: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101bb54: 0x101bb54: lui   v0, 0x30000
+// 0x0101bb64: 0x101bb64: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101bb58: 0x101bb58: sw    s3, 40(sp)
+// 0x0101bb68: 0x101bb68: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1426,7 +1426,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101bb5c: 0x101bb5c: sw    s2, 36(sp)
+// 0x0101bb6c: 0x101bb6c: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1435,7 +1435,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101bb60: 0x101bb60: sw    s1, 32(sp)
+// 0x0101bb70: 0x101bb70: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1444,7 +1444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101bb64: 0x101bb64: sw    s0, 28(sp)
+// 0x0101bb74: 0x101bb74: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1453,36 +1453,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101bb68: 0x101bb68: sw    ra, 44(sp)
-// 0x0101bb6c: 0x101bb6c: addu  s1, a0, zero
+// 0x0101bb78: 0x101bb78: sw    ra, 44(sp)
+// 0x0101bb7c: 0x101bb7c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0101bb70: 0x101bb70: addu  s2, a1, zero
+// 0x0101bb80: 0x101bb80: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0101bb74: 0x101bb74: lw    s0, 27080(v0)
+// 0x0101bb84: 0x101bb84: lw    s0, 27544(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6770
+	ldc.i4 6886
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bb78: 0x101bb78: j	 0x101bb9c addu  s3, a2, zero
+// 0x0101bb88: 0x101bb88: j	 0x101bbac addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-	br L_101bb9c
+	br L_101bbac
 // --- basic block ---
-L_101bb80:
-// 0x0101bb80: 0x101bb80: lw    a1, 0(s0)
+L_101bb90:
+// 0x0101bb90: 0x101bb90: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101bb84: 0x101bb84: jal   0x1001c08 sll   zero, zero, 0
+// 0x0101bb94: 0x101bb94: jal   0x1001c08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1493,11 +1493,11 @@ L_101bb80:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101bb8c: 0x101bb8c: beq   v0, zero, 0x101bbb8 sll   zero, zero, 0
+// 0x0101bb9c: 0x101bb9c: beq   v0, zero, 0x101bbc8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_101bbb8
+	brfalse L_101bbc8
 // --- basic block ---
-// 0x0101bb94: 0x101bb94: lw    s0, 80(s0)
+// 0x0101bba4: 0x101bba4: lw    s0, 80(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1506,44 +1506,44 @@ L_101bb80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bb98: 0x101bb98: sll   zero, zero, 0
-L_101bb9c:
-// 0x0101bb9c: 0x101bb9c: bne   s0, zero, 0x101bb80 addu  a0, s1, zero
+// 0x0101bba8: 0x101bba8: sll   zero, zero, 0
+L_101bbac:
+// 0x0101bbac: 0x101bbac: bne   s0, zero, 0x101bb90 addu  a0, s1, zero
 	ldloc 6
 	ldloc 9
 	stloc.1
-	brtrue L_101bb80
+	brtrue L_101bb90
 // --- basic block ---
-// 0x0101bba4: 0x101bba4: lui   v0, 0x30000
+// 0x0101bbb4: 0x101bbb4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101bba8: 0x101bba8: lw    s0, 27076(v0)
+// 0x0101bbb8: 0x101bbb8: lw    s0, 27540(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6769
+	ldc.i4 6885
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bbac: 0x101bbac: sll   zero, zero, 0
-// 0x0101bbb0: 0x101bbb0: beq   s0, zero, 0x101bcac sll   zero, zero, 0
+// 0x0101bbbc: 0x101bbbc: sll   zero, zero, 0
+// 0x0101bbc0: 0x101bbc0: beq   s0, zero, 0x101bcbc sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101bcac
+	brfalse L_101bcbc
 // --- basic block ---
-L_101bbb8:
-// 0x0101bbb8: 0x101bbb8: addiu s0, s0, 4
+L_101bbc8:
+// 0x0101bbc8: 0x101bbc8: addiu s0, s0, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-// 0x0101bbbc: 0x101bbbc: j	 0x101bca4 lui   s1, 0x30000
+// 0x0101bbcc: 0x101bbcc: j	 0x101bcb4 lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 9
-	br L_101bca4
+	br L_101bcb4
 // --- basic block ---
-L_101bbc4:
-// 0x0101bbc4: 0x101bbc4: lw    a0, 4(s0)
+L_101bbd4:
+// 0x0101bbd4: 0x101bbd4: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1552,18 +1552,18 @@ L_101bbc4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bbc8: 0x101bbc8: jal   0x104e35c sll   zero, zero, 0
+// 0x0101bbd8: 0x101bbd8: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101bbd0: 0x101bbd0: lw    v0, 56(s0)
+// 0x0101bbe0: 0x101bbe0: lw    v0, 56(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1572,33 +1572,33 @@ L_101bbc4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bbd4: 0x101bbd4: addiu a0, s0, 56
+// 0x0101bbe4: 0x101bbe4: addiu a0, s0, 56
 	ldloc 6
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x0101bbd8: 0x101bbd8: addu  a1, s2, zero
+// 0x0101bbe8: 0x101bbe8: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0101bbdc: 0x101bbdc: blez  v0, 0x101bc04 addu  a2, s3, zero
+// 0x0101bbec: 0x101bbec: blez  v0, 0x101bc14 addu  a2, s3, zero
 	ldloc 7
 	ldloc 11
 	stloc.3
 	ldc.i4.s 0
-	ble L_101bc04
+	ble L_101bc14
 // --- basic block ---
-// 0x0101bbe4: 0x101bbe4: jal   0x101bad4 sll   zero, zero, 0
+// 0x0101bbf4: 0x101bbf4: jal   0x101bae4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_place_101bad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_place_101bae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101bbec: 0x101bbec: lw    a0, 56(s0)
+// 0x0101bbfc: 0x101bbfc: lw    a0, 56(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1607,7 +1607,7 @@ L_101bbc4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bbf0: 0x101bbf0: lw    a1, 60(s0)
+// 0x0101bc00: 0x101bc00: lw    a1, 60(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1616,19 +1616,19 @@ L_101bbc4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101bbf4: 0x101bbf4: lw    a2, 27072(s1)
+// 0x0101bc04: 0x101bc04: lw    a2, 27536(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 6768
+	ldc.i4 6884
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101bbf8: 0x101bbf8: addiu a3, zero, 1
+// 0x0101bc08: 0x101bc08: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0101bbfc: 0x101bbfc: jal   0x104ef80 sw    zero, 16(sp)
+// 0x0101bc0c: 0x101bc0c: jal   0x104ef90 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1642,13 +1642,13 @@ L_101bbc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_101bc04:
-// 0x0101bc04: 0x101bc04: lw    v0, 24(s0)
+L_101bc14:
+// 0x0101bc14: 0x101bc14: lw    v0, 24(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1657,33 +1657,33 @@ L_101bc04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bc08: 0x101bc08: addiu a0, s0, 24
+// 0x0101bc18: 0x101bc18: addiu a0, s0, 24
 	ldloc 6
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x0101bc0c: 0x101bc0c: addu  a1, s2, zero
+// 0x0101bc1c: 0x101bc1c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0101bc10: 0x101bc10: blez  v0, 0x101bc38 addu  a2, s3, zero
+// 0x0101bc20: 0x101bc20: blez  v0, 0x101bc48 addu  a2, s3, zero
 	ldloc 7
 	ldloc 11
 	stloc.3
 	ldc.i4.s 0
-	ble L_101bc38
+	ble L_101bc48
 // --- basic block ---
-// 0x0101bc18: 0x101bc18: jal   0x101bad4 sll   zero, zero, 0
+// 0x0101bc28: 0x101bc28: jal   0x101bae4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_place_101bad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_place_101bae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101bc20: 0x101bc20: lw    a0, 24(s0)
+// 0x0101bc30: 0x101bc30: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1692,7 +1692,7 @@ L_101bc04:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bc24: 0x101bc24: lw    a2, 28(s0)
+// 0x0101bc34: 0x101bc34: lw    a2, 28(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1701,19 +1701,19 @@ L_101bc04:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101bc28: 0x101bc28: lw    a1, 27072(s1)
+// 0x0101bc38: 0x101bc38: lw    a1, 27536(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 6768
+	ldc.i4 6884
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101bc2c: 0x101bc2c: addiu a3, zero, 1
+// 0x0101bc3c: 0x101bc3c: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0101bc30: 0x101bc30: jal   0x104f184 sw    zero, 16(sp)
+// 0x0101bc40: 0x101bc40: jal   0x104f194 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1727,13 +1727,13 @@ L_101bc04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_circles_104f184(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_circles_104f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_101bc38:
-// 0x0101bc38: 0x101bc38: lw    v0, 8(s0)
+L_101bc48:
+// 0x0101bc48: 0x101bc48: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1742,33 +1742,33 @@ L_101bc38:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bc3c: 0x101bc3c: addiu a0, s0, 8
+// 0x0101bc4c: 0x101bc4c: addiu a0, s0, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc.1
-// 0x0101bc40: 0x101bc40: addu  a1, s2, zero
+// 0x0101bc50: 0x101bc50: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0101bc44: 0x101bc44: blez  v0, 0x101bc68 addu  a2, s3, zero
+// 0x0101bc54: 0x101bc54: blez  v0, 0x101bc78 addu  a2, s3, zero
 	ldloc 7
 	ldloc 11
 	stloc.3
 	ldc.i4.s 0
-	ble L_101bc68
+	ble L_101bc78
 // --- basic block ---
-// 0x0101bc4c: 0x101bc4c: jal   0x101bad4 sll   zero, zero, 0
+// 0x0101bc5c: 0x101bc5c: jal   0x101bae4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_place_101bad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_place_101bae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101bc54: 0x101bc54: lw    a0, 8(s0)
+// 0x0101bc64: 0x101bc64: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1777,7 +1777,7 @@ L_101bc38:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bc58: 0x101bc58: lw    a1, 12(s0)
+// 0x0101bc68: 0x101bc68: lw    a1, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1786,16 +1786,16 @@ L_101bc38:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101bc5c: 0x101bc5c: lw    a2, 27072(s1)
+// 0x0101bc6c: 0x101bc6c: lw    a2, 27536(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 6768
+	ldc.i4 6884
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101bc60: 0x101bc60: jal   0x104f290 addu  a3, zero, zero
+// 0x0101bc70: 0x101bc70: jal   0x104f2a0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1803,13 +1803,13 @@ L_101bc38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f290(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f2a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_101bc68:
-// 0x0101bc68: 0x101bc68: lw    v0, 40(s0)
+L_101bc78:
+// 0x0101bc78: 0x101bc78: lw    v0, 40(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1818,33 +1818,33 @@ L_101bc68:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bc6c: 0x101bc6c: addiu a0, s0, 40
+// 0x0101bc7c: 0x101bc7c: addiu a0, s0, 40
 	ldloc 6
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0101bc70: 0x101bc70: addu  a1, s2, zero
+// 0x0101bc80: 0x101bc80: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0101bc74: 0x101bc74: blez  v0, 0x101bc9c addu  a2, s3, zero
+// 0x0101bc84: 0x101bc84: blez  v0, 0x101bcac addu  a2, s3, zero
 	ldloc 7
 	ldloc 11
 	stloc.3
 	ldc.i4.s 0
-	ble L_101bc9c
+	ble L_101bcac
 // --- basic block ---
-// 0x0101bc7c: 0x101bc7c: jal   0x101bad4 sll   zero, zero, 0
+// 0x0101bc8c: 0x101bc8c: jal   0x101bae4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_place_101bad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_place_101bae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101bc84: 0x101bc84: lw    a0, 40(s0)
+// 0x0101bc94: 0x101bc94: lw    a0, 40(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1853,7 +1853,7 @@ L_101bc68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bc88: 0x101bc88: lw    a2, 44(s0)
+// 0x0101bc98: 0x101bc98: lw    a2, 44(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1862,19 +1862,19 @@ L_101bc68:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101bc8c: 0x101bc8c: lw    a1, 27072(s1)
+// 0x0101bc9c: 0x101bc9c: lw    a1, 27536(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 6768
+	ldc.i4 6884
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101bc90: 0x101bc90: addu  a3, zero, zero
+// 0x0101bca0: 0x101bca0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101bc94: 0x101bc94: jal   0x104f184 sw    zero, 16(sp)
+// 0x0101bca4: 0x101bca4: jal   0x104f194 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1888,28 +1888,28 @@ L_101bc68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_circles_104f184(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_circles_104f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_101bc9c:
-// 0x0101bc9c: 0x101bc9c: lw    s0, 0(s0)
+L_101bcac:
+// 0x0101bcac: 0x101bcac: lw    s0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101bca0: 0x101bca0: sll   zero, zero, 0
-L_101bca4:
-// 0x0101bca4: 0x101bca4: bne   s0, zero, 0x101bbc4 sll   zero, zero, 0
+// 0x0101bcb0: 0x101bcb0: sll   zero, zero, 0
+L_101bcb4:
+// 0x0101bcb4: 0x101bcb4: bne   s0, zero, 0x101bbd4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101bbc4
+	brtrue L_101bbd4
 // --- basic block ---
-L_101bcac:
-// 0x0101bcac: 0x101bcac: lw    ra, 44(sp)
-// 0x0101bcb0: 0x101bcb0: lw    s3, 40(sp)
+L_101bcbc:
+// 0x0101bcbc: 0x101bcbc: lw    ra, 44(sp)
+// 0x0101bcc0: 0x101bcc0: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1918,7 +1918,7 @@ L_101bcac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101bcb4: 0x101bcb4: lw    s2, 36(sp)
+// 0x0101bcc4: 0x101bcc4: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1927,7 +1927,7 @@ L_101bcac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101bcb8: 0x101bcb8: lw    s1, 32(sp)
+// 0x0101bcc8: 0x101bcc8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1936,7 +1936,7 @@ L_101bcac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101bcbc: 0x101bcbc: lw    s0, 28(sp)
+// 0x0101bccc: 0x101bccc: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1945,7 +1945,7 @@ L_101bcac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bcc0: 0x101bcc0: jr    ra addiu sp, sp, 48
+// 0x0101bcd0: 0x101bcd0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1957,7 +1957,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_object_exists_101bcc8(int32)
+.method public static int32 roadmap_object_exists_101bcd8(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1980,23 +1980,23 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bcc8: 0x101bcc8: lui   v0, 0x30000
+// 0x0101bcd8: 0x101bcd8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101bccc: 0x101bccc: lw    v0, 27088(v0)
+// 0x0101bcdc: 0x101bcdc: lw    v0, 27552(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bcd0: 0x101bcd0: j	 0x101bcf0 sll   zero, zero, 0
-	br L_101bcf0
+// 0x0101bce0: 0x101bce0: j	 0x101bd00 sll   zero, zero, 0
+	br L_101bd00
 // --- basic block ---
-L_101bcd8:
-// 0x0101bcd8: 0x101bcd8: lw    v1, 4(v0)
+L_101bce8:
+// 0x0101bce8: 0x101bce8: lw    v1, 4(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2005,13 +2005,13 @@ L_101bcd8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101bcdc: 0x101bcdc: sll   zero, zero, 0
-// 0x0101bce0: 0x101bce0: beq   v1, a0, 0x101bcf8 sll   zero, zero, 0
+// 0x0101bcec: 0x101bcec: sll   zero, zero, 0
+// 0x0101bcf0: 0x101bcf0: beq   v1, a0, 0x101bd08 sll   zero, zero, 0
 	ldloc.3
 	ldloc.0
-	beq  L_101bcf8
+	beq  L_101bd08
 // --- basic block ---
-// 0x0101bce8: 0x101bce8: lw    v0, 96(v0)
+// 0x0101bcf8: 0x101bcf8: lw    v0, 96(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -2020,14 +2020,14 @@ L_101bcd8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bcec: 0x101bcec: sll   zero, zero, 0
-L_101bcf0:
-// 0x0101bcf0: 0x101bcf0: bne   v0, zero, 0x101bcd8 sll   zero, zero, 0
+// 0x0101bcfc: 0x101bcfc: sll   zero, zero, 0
+L_101bd00:
+// 0x0101bd00: 0x101bd00: bne   v0, zero, 0x101bce8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_101bcd8
+	brtrue L_101bce8
 // --- basic block ---
-L_101bcf8:
-// 0x0101bcf8: 0x101bcf8: jr    ra sltu  v0, zero, v0
+L_101bd08:
+// 0x0101bd08: 0x101bd08: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.1
 	clt.un
@@ -2039,7 +2039,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_object_disable_short_click_101bd00()
+.method public static int32 roadmap_object_disable_short_click_101bd10()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2056,10 +2056,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bd00: 0x101bd00: lui   v0, 0x0
+// 0x0101bd10: 0x101bd10: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101bd04: 0x101bd04: jr    ra sw    zero, 4804(v0)
+// 0x0101bd14: 0x101bd14: jr    ra sw    zero, 4804(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -2073,7 +2073,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_object_enable_short_click_101bd0c()
+.method public static int32 roadmap_object_enable_short_click_101bd1c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2093,13 +2093,13 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bd0c: 0x101bd0c: addiu v1, zero, 1
+// 0x0101bd1c: 0x101bd1c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101bd10: 0x101bd10: lui   v0, 0x0
+// 0x0101bd20: 0x101bd20: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101bd14: 0x101bd14: jr    ra sw    v1, 4804(v0)
+// 0x0101bd24: 0x101bd24: jr    ra sw    v1, 4804(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2115,7 +2115,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_object_null_listener_101bd2c()
+.method public static void roadmap_object_null_listener_101bd3c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2126,12 +2126,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bd2c: 0x101bd2c: jr    ra sll   zero, zero, 0
+// 0x0101bd3c: 0x101bd3c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_object_null_monitor_101bd34()
+.method public static void roadmap_object_null_monitor_101bd44()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2142,13 +2142,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_101bd34:
-// 0x0101bd34: 0x101bd34: jr    ra sll   zero, zero, 0
+L_101bd44:
+// 0x0101bd44: 0x101bd44: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_object_move_101bd3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_move_101bd4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -2192,15 +2192,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bd3c: 0x101bd3c: addiu sp, sp, -32
+// 0x0101bd4c: 0x101bd4c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101bd40: 0x101bd40: lui   v0, 0x30000
+// 0x0101bd50: 0x101bd50: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101bd44: 0x101bd44: sw    s2, 24(sp)
+// 0x0101bd54: 0x101bd54: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2209,7 +2209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101bd48: 0x101bd48: sw    s1, 20(sp)
+// 0x0101bd58: 0x101bd58: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2218,7 +2218,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101bd4c: 0x101bd4c: sw    s0, 16(sp)
+// 0x0101bd5c: 0x101bd5c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2227,26 +2227,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101bd50: 0x101bd50: sw    ra, 28(sp)
-// 0x0101bd54: 0x101bd54: addu  s2, a0, zero
+// 0x0101bd60: 0x101bd60: sw    ra, 28(sp)
+// 0x0101bd64: 0x101bd64: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0101bd58: 0x101bd58: lw    s0, 27088(v0)
+// 0x0101bd68: 0x101bd68: lw    s0, 27552(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bd5c: 0x101bd5c: j	 0x101bd7c addu  s1, a1, zero
+// 0x0101bd6c: 0x101bd6c: j	 0x101bd8c addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-	br L_101bd7c
+	br L_101bd8c
 // --- basic block ---
-L_101bd64:
-// 0x0101bd64: 0x101bd64: lw    v0, 4(s0)
+L_101bd74:
+// 0x0101bd74: 0x101bd74: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2255,13 +2255,13 @@ L_101bd64:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bd68: 0x101bd68: sll   zero, zero, 0
-// 0x0101bd6c: 0x101bd6c: beq   v0, s2, 0x101bd8c sll   zero, zero, 0
+// 0x0101bd78: 0x101bd78: sll   zero, zero, 0
+// 0x0101bd7c: 0x101bd7c: beq   v0, s2, 0x101bd9c sll   zero, zero, 0
 	ldloc 6
 	ldloc 10
-	beq  L_101bd8c
+	beq  L_101bd9c
 // --- basic block ---
-// 0x0101bd74: 0x101bd74: lw    s0, 96(s0)
+// 0x0101bd84: 0x101bd84: lw    s0, 96(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2270,17 +2270,17 @@ L_101bd64:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bd78: 0x101bd78: sll   zero, zero, 0
-L_101bd7c:
-// 0x0101bd7c: 0x101bd7c: bne   s0, zero, 0x101bd64 sll   zero, zero, 0
+// 0x0101bd88: 0x101bd88: sll   zero, zero, 0
+L_101bd8c:
+// 0x0101bd8c: 0x101bd8c: bne   s0, zero, 0x101bd74 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_101bd64
+	brtrue L_101bd74
 // --- basic block ---
-// 0x0101bd84: 0x101bd84: j	 0x101be0c sll   zero, zero, 0
-	br L_101be0c
+// 0x0101bd94: 0x101bd94: j	 0x101be1c sll   zero, zero, 0
+	br L_101be1c
 // --- basic block ---
-L_101bd8c:
-// 0x0101bd8c: 0x101bd8c: lw    v1, 24(s0)
+L_101bd9c:
+// 0x0101bd9c: 0x101bd9c: lw    v1, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2289,24 +2289,24 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bd90: 0x101bd90: lw    v0, 0(s1)
+// 0x0101bda0: 0x101bda0: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101bd94: 0x101bd94: sll   zero, zero, 0
-// 0x0101bd98: 0x101bd98: bne   v1, v0, 0x101bdf0 addiu a0, s0, 24
+// 0x0101bda4: 0x101bda4: sll   zero, zero, 0
+// 0x0101bda8: 0x101bda8: bne   v1, v0, 0x101be00 addiu a0, s0, 24
 	ldloc 8
 	ldloc 6
 	ldloc 7
 	ldc.i4.s 24
 	add
 	stloc.1
-	bne.un L_101bdf0
+	bne.un L_101be00
 // --- basic block ---
-// 0x0101bda0: 0x101bda0: lw    v1, 28(s0)
+// 0x0101bdb0: 0x101bdb0: lw    v1, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2315,7 +2315,7 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bda4: 0x101bda4: lw    v0, 4(s1)
+// 0x0101bdb4: 0x101bdb4: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2324,15 +2324,15 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bda8: 0x101bda8: sll   zero, zero, 0
-// 0x0101bdac: 0x101bdac: bne   v1, v0, 0x101bdf4 addu  a1, s1, zero
+// 0x0101bdb8: 0x101bdb8: sll   zero, zero, 0
+// 0x0101bdbc: 0x101bdbc: bne   v1, v0, 0x101be04 addu  a1, s1, zero
 	ldloc 8
 	ldloc 6
 	ldloc 9
 	stloc.2
-	bne.un L_101bdf4
+	bne.un L_101be04
 // --- basic block ---
-// 0x0101bdb4: 0x101bdb4: lw    v1, 32(s0)
+// 0x0101bdc4: 0x101bdc4: lw    v1, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2341,7 +2341,7 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bdb8: 0x101bdb8: lw    v0, 8(s1)
+// 0x0101bdc8: 0x101bdc8: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2350,13 +2350,13 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bdbc: 0x101bdbc: sll   zero, zero, 0
-// 0x0101bdc0: 0x101bdc0: bne   v1, v0, 0x101bdf4 sll   zero, zero, 0
+// 0x0101bdcc: 0x101bdcc: sll   zero, zero, 0
+// 0x0101bdd0: 0x101bdd0: bne   v1, v0, 0x101be04 sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	bne.un L_101bdf4
+	bne.un L_101be04
 // --- basic block ---
-// 0x0101bdc8: 0x101bdc8: lw    v1, 40(s0)
+// 0x0101bdd8: 0x101bdd8: lw    v1, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2365,7 +2365,7 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bdcc: 0x101bdcc: lw    v0, 16(s1)
+// 0x0101bddc: 0x101bddc: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2374,13 +2374,13 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bdd0: 0x101bdd0: sll   zero, zero, 0
-// 0x0101bdd4: 0x101bdd4: bne   v1, v0, 0x101bdf4 sll   zero, zero, 0
+// 0x0101bde0: 0x101bde0: sll   zero, zero, 0
+// 0x0101bde4: 0x101bde4: bne   v1, v0, 0x101be04 sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	bne.un L_101bdf4
+	bne.un L_101be04
 // --- basic block ---
-// 0x0101bddc: 0x101bddc: lw    v1, 36(s0)
+// 0x0101bdec: 0x101bdec: lw    v1, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2389,7 +2389,7 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bde0: 0x101bde0: lw    v0, 12(s1)
+// 0x0101bdf0: 0x101bdf0: lw    v0, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2398,18 +2398,18 @@ L_101bd8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bde4: 0x101bde4: sll   zero, zero, 0
-// 0x0101bde8: 0x101bde8: beq   v1, v0, 0x101be0c sll   zero, zero, 0
+// 0x0101bdf4: 0x101bdf4: sll   zero, zero, 0
+// 0x0101bdf8: 0x101bdf8: beq   v1, v0, 0x101be1c sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	beq  L_101be0c
+	beq  L_101be1c
 // --- basic block ---
-L_101bdf0:
-// 0x0101bdf0: 0x101bdf0: addu  a1, s1, zero
+L_101be00:
+// 0x0101be00: 0x101be00: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-L_101bdf4:
-// 0x0101bdf4: 0x101bdf4: jal   0x1001800 addiu a2, zero, 20
+L_101be04:
+// 0x0101be04: 0x101be04: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -2421,7 +2421,7 @@ L_101bdf4:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101bdfc: 0x101bdfc: lw    v0, 52(s0)
+// 0x0101be0c: 0x101be0c: lw    v0, 52(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2430,10 +2430,10 @@ L_101bdf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101be00: 0x101be00: addu  a0, s2, zero
+// 0x0101be10: 0x101be10: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0101be04: 0x101be04: jalr  v0 addu  a1, s1, zero
+// 0x0101be14: 0x101be14: jalr  v0 addu  a1, s1, zero
 	ldloc 6
 	ldloc 9
 	stloc.2
@@ -2447,9 +2447,9 @@ L_101bdf4:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_101be0c:
-// 0x0101be0c: 0x101be0c: lw    ra, 28(sp)
-// 0x0101be10: 0x101be10: lw    s2, 24(sp)
+L_101be1c:
+// 0x0101be1c: 0x101be1c: lw    ra, 28(sp)
+// 0x0101be20: 0x101be20: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2458,7 +2458,7 @@ L_101be0c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101be14: 0x101be14: lw    s1, 20(sp)
+// 0x0101be24: 0x101be24: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2467,7 +2467,7 @@ L_101be0c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101be18: 0x101be18: lw    s0, 16(sp)
+// 0x0101be28: 0x101be28: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2476,7 +2476,7 @@ L_101be0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101be1c: 0x101be1c: jr    ra addiu sp, sp, 32
+// 0x0101be2c: 0x101be2c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2488,7 +2488,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_object_set_zoom_101be78(int32,int32,int32)
+.method public static int32 roadmap_object_set_zoom_101be88(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2517,23 +2517,23 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101be78: 0x101be78: lui   v0, 0x30000
+// 0x0101be88: 0x101be88: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x0101be7c: 0x101be7c: lw    v0, 27088(v0)
+// 0x0101be8c: 0x101be8c: lw    v0, 27552(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101be80: 0x101be80: j	 0x101bea0 sll   zero, zero, 0
-	br L_101bea0
+// 0x0101be90: 0x101be90: j	 0x101beb0 sll   zero, zero, 0
+	br L_101beb0
 // --- basic block ---
-L_101be88:
-// 0x0101be88: 0x101be88: lw    v1, 4(v0)
+L_101be98:
+// 0x0101be98: 0x101be98: lw    v1, 4(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2542,15 +2542,15 @@ L_101be88:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101be8c: 0x101be8c: sll   zero, zero, 0
-// 0x0101be90: 0x101be90: beq   v1, a0, 0x101beb0 addiu v1, zero, -1
+// 0x0101be9c: 0x101be9c: sll   zero, zero, 0
+// 0x0101bea0: 0x101bea0: beq   v1, a0, 0x101bec0 addiu v1, zero, -1
 	ldloc 4
 	ldloc.0
 	ldc.i4.m1
 	stloc 4
-	beq  L_101beb0
+	beq  L_101bec0
 // --- basic block ---
-// 0x0101be98: 0x101be98: lw    v0, 96(v0)
+// 0x0101bea8: 0x101bea8: lw    v0, 96(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2559,24 +2559,24 @@ L_101be88:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101be9c: 0x101be9c: sll   zero, zero, 0
-L_101bea0:
-// 0x0101bea0: 0x101bea0: bne   v0, zero, 0x101be88 sll   zero, zero, 0
+// 0x0101beac: 0x101beac: sll   zero, zero, 0
+L_101beb0:
+// 0x0101beb0: 0x101beb0: bne   v0, zero, 0x101be98 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_101be88
+	brtrue L_101be98
 // --- basic block ---
-// 0x0101bea8: 0x101bea8: jr    ra sll   zero, zero, 0
+// 0x0101beb8: 0x101beb8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_101beb0:
-// 0x0101beb0: 0x101beb0: beq   a1, v1, 0x101bebc addiu v1, zero, -1
+L_101bec0:
+// 0x0101bec0: 0x101bec0: beq   a1, v1, 0x101becc addiu v1, zero, -1
 	ldloc.1
 	ldloc 4
 	ldc.i4.m1
 	stloc 4
-	beq  L_101bebc
+	beq  L_101becc
 // --- basic block ---
-// 0x0101beb8: 0x101beb8: sw    a1, 68(v0)
+// 0x0101bec8: 0x101bec8: sw    a1, 68(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2585,13 +2585,13 @@ L_101beb0:
 	add
 	ldloc.1
 	stelem.i4
-L_101bebc:
-// 0x0101bebc: 0x101bebc: beq   a2, v1, 0x101bec8 sll   zero, zero, 0
+L_101becc:
+// 0x0101becc: 0x101becc: beq   a2, v1, 0x101bed8 sll   zero, zero, 0
 	ldloc.2
 	ldloc 4
-	beq  L_101bec8
+	beq  L_101bed8
 // --- basic block ---
-// 0x0101bec4: 0x101bec4: sw    a2, 72(v0)
+// 0x0101bed4: 0x101bed4: sw    a2, 72(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2600,8 +2600,8 @@ L_101bebc:
 	add
 	ldloc.2
 	stelem.i4
-L_101bec8:
-// 0x0101bec8: 0x101bec8: jr    ra sll   zero, zero, 0
+L_101bed8:
+// 0x0101bed8: 0x101bed8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -2609,7 +2609,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2650,16 +2650,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bed0: 0x101bed0: addiu sp, sp, -32
+// 0x0101bee0: 0x101bee0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101bed4: 0x101bed4: lui   v0, 0x30000
+// 0x0101bee4: 0x101bee4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101bed8: 0x101bed8: sw    ra, 28(sp)
-// 0x0101bedc: 0x101bedc: sw    s1, 24(sp)
+// 0x0101bee8: 0x101bee8: sw    ra, 28(sp)
+// 0x0101beec: 0x101beec: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2668,7 +2668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101bee0: 0x101bee0: sw    s0, 20(sp)
+// 0x0101bef0: 0x101bef0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2677,20 +2677,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101bee4: 0x101bee4: lw    v0, 27088(v0)
+// 0x0101bef4: 0x101bef4: lw    v0, 27552(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101bee8: 0x101bee8: j	 0x101bf08 sll   zero, zero, 0
-	br L_101bf08
+// 0x0101bef8: 0x101bef8: j	 0x101bf18 sll   zero, zero, 0
+	br L_101bf18
 // --- basic block ---
-L_101bef0:
-// 0x0101bef0: 0x101bef0: lw    v1, 4(v0)
+L_101bf00:
+// 0x0101bf00: 0x101bf00: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2699,13 +2699,13 @@ L_101bef0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bef4: 0x101bef4: sll   zero, zero, 0
-// 0x0101bef8: 0x101bef8: beq   v1, a0, 0x101bf18 sll   zero, zero, 0
+// 0x0101bf04: 0x101bf04: sll   zero, zero, 0
+// 0x0101bf08: 0x101bf08: beq   v1, a0, 0x101bf28 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	beq  L_101bf18
+	beq  L_101bf28
 // --- basic block ---
-// 0x0101bf00: 0x101bf00: lw    v0, 96(v0)
+// 0x0101bf10: 0x101bf10: lw    v0, 96(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2714,33 +2714,33 @@ L_101bef0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101bf04: 0x101bf04: sll   zero, zero, 0
-L_101bf08:
-// 0x0101bf08: 0x101bf08: bne   v0, zero, 0x101bef0 sll   zero, zero, 0
+// 0x0101bf14: 0x101bf14: sll   zero, zero, 0
+L_101bf18:
+// 0x0101bf18: 0x101bf18: bne   v0, zero, 0x101bf00 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101bef0
+	brtrue L_101bf00
 // --- basic block ---
-// 0x0101bf10: 0x101bf10: j	 0x101bf54 sll   zero, zero, 0
-	br L_101bf54
+// 0x0101bf20: 0x101bf20: j	 0x101bf64 sll   zero, zero, 0
+	br L_101bf64
 // --- basic block ---
-L_101bf18:
-// 0x0101bf18: 0x101bf18: beq   a1, zero, 0x101bf54 lui   s0, 0x30000
+L_101bf28:
+// 0x0101bf28: 0x101bf28: beq   a1, zero, 0x101bf64 lui   s0, 0x30000
 	ldloc.2
 	ldc.i4 196608
 	stloc 8
-	brfalse L_101bf54
+	brfalse L_101bf64
 // --- basic block ---
-// 0x0101bf20: 0x101bf20: lw    v1, 27092(s0)
+// 0x0101bf30: 0x101bf30: lw    v1, 27556(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6773
+	ldc.i4 6889
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bf24: 0x101bf24: sll   zero, zero, 0
-// 0x0101bf28: 0x101bf28: bne   v1, zero, 0x101bf54 sw    a1, 56(v0)
+// 0x0101bf34: 0x101bf34: sll   zero, zero, 0
+// 0x0101bf38: 0x101bf38: bne   v1, zero, 0x101bf64 sw    a1, 56(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
@@ -2750,17 +2750,17 @@ L_101bf18:
 	add
 	ldloc.2
 	stelem.i4
-	brtrue L_101bf54
+	brtrue L_101bf64
 // --- basic block ---
-// 0x0101bf30: 0x101bf30: lui   s1, 0x1020000
+// 0x0101bf40: 0x101bf40: lui   s1, 0x1020000
 	ldc.i4 16908288
 	stloc 9
-// 0x0101bf34: 0x101bf34: addiu a0, s1, -15028
+// 0x0101bf44: 0x101bf44: addiu a0, s1, -15012
 	ldloc 9
-	ldc.i4 -15028
+	ldc.i4 -15012
 	add
 	stloc.1
-// 0x0101bf38: 0x101bf38: jal   0x104bad8 addiu a1, zero, 1
+// 0x0101bf48: 0x101bf48: jal   0x104bae8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2768,17 +2768,17 @@ L_101bf18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101bf40: 0x101bf40: addiu a0, s1, -15028
+// 0x0101bf50: 0x101bf50: addiu a0, s1, -15012
 	ldloc 9
-	ldc.i4 -15028
+	ldc.i4 -15012
 	add
 	stloc.1
-// 0x0101bf44: 0x101bf44: jal   0x104ba60 addiu a1, zero, 2
+// 0x0101bf54: 0x101bf54: jal   0x104ba70 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -2786,26 +2786,26 @@ L_101bf18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba60(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101bf4c: 0x101bf4c: addiu v0, zero, 1
+// 0x0101bf5c: 0x101bf5c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101bf50: 0x101bf50: sw    v0, 27092(s0)
+// 0x0101bf60: 0x101bf60: sw    v0, 27556(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6773
+	ldc.i4 6889
 	add
 	ldloc 5
 	stelem.i4
-L_101bf54:
-// 0x0101bf54: 0x101bf54: lw    ra, 28(sp)
-// 0x0101bf58: 0x101bf58: lw    s1, 24(sp)
+L_101bf64:
+// 0x0101bf64: 0x101bf64: lw    ra, 28(sp)
+// 0x0101bf68: 0x101bf68: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2814,7 +2814,7 @@ L_101bf54:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101bf5c: 0x101bf5c: lw    s0, 20(sp)
+// 0x0101bf6c: 0x101bf6c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2823,7 +2823,7 @@ L_101bf54:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bf60: 0x101bf60: jr    ra addiu sp, sp, 32
+// 0x0101bf70: 0x101bf70: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2835,7 +2835,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 out_of_zoom_101bf68(int32,int32,int32,int32,int32)
+.method public static int32 out_of_zoom_101bf78(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -2873,7 +2873,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bf68: 0x101bf68: lw    v1, 68(a0)
+// 0x0101bf78: 0x101bf78: lw    v1, 68(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2882,15 +2882,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bf6c: 0x101bf6c: addiu sp, sp, -24
+// 0x0101bf7c: 0x101bf7c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101bf70: 0x101bf70: addiu v0, zero, -1
+// 0x0101bf80: 0x101bf80: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0101bf74: 0x101bf74: sw    s0, 16(sp)
+// 0x0101bf84: 0x101bf84: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2899,19 +2899,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101bf78: 0x101bf78: sw    ra, 20(sp)
-// 0x0101bf7c: 0x101bf7c: beq   v1, v0, 0x101bfa0 addu  s0, a0, zero
+// 0x0101bf88: 0x101bf88: sw    ra, 20(sp)
+// 0x0101bf8c: 0x101bf8c: beq   v1, v0, 0x101bfb0 addu  s0, a0, zero
 	ldloc 6
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_101bfa0
+	beq  L_101bfb0
 // --- basic block ---
-// 0x0101bf84: 0x101bf84: jal   0x1007a5c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_get_zoom_1007a5c()
+// 0x0101bf94: 0x101bf94: jal   0x1007a6c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_get_zoom_1007a6c()
 	stloc 5
 // --- basic block ---
-// 0x0101bf8c: 0x101bf8c: lw    a0, 68(s0)
+// 0x0101bf9c: 0x101bf9c: lw    a0, 68(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2920,20 +2920,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bf90: 0x101bf90: sll   zero, zero, 0
-// 0x0101bf94: 0x101bf94: slt   v0, v0, a0
+// 0x0101bfa0: 0x101bfa0: sll   zero, zero, 0
+// 0x0101bfa4: 0x101bfa4: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x0101bf98: 0x101bf98: bne   v0, zero, 0x101bfc4 addiu v1, zero, 1
+// 0x0101bfa8: 0x101bfa8: bne   v0, zero, 0x101bfd4 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_101bfc4
+	brtrue L_101bfd4
 // --- basic block ---
-L_101bfa0:
-// 0x0101bfa0: 0x101bfa0: lw    a0, 72(s0)
+L_101bfb0:
+// 0x0101bfb0: 0x101bfb0: lw    a0, 72(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2942,21 +2942,21 @@ L_101bfa0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101bfa4: 0x101bfa4: addiu v0, zero, -1
+// 0x0101bfb4: 0x101bfb4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0101bfa8: 0x101bfa8: beq   a0, v0, 0x101bfc4 addu  v1, zero, zero
+// 0x0101bfb8: 0x101bfb8: beq   a0, v0, 0x101bfd4 addu  v1, zero, zero
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	beq  L_101bfc4
+	beq  L_101bfd4
 // --- basic block ---
-// 0x0101bfb0: 0x101bfb0: jal   0x1007a5c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_get_zoom_1007a5c()
+// 0x0101bfc0: 0x101bfc0: jal   0x1007a6c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_get_zoom_1007a6c()
 	stloc 5
 // --- basic block ---
-// 0x0101bfb8: 0x101bfb8: lw    v1, 72(s0)
+// 0x0101bfc8: 0x101bfc8: lw    v1, 72(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2965,18 +2965,18 @@ L_101bfa0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101bfbc: 0x101bfbc: sll   zero, zero, 0
-// 0x0101bfc0: 0x101bfc0: slt   v1, v1, v0
+// 0x0101bfcc: 0x101bfcc: sll   zero, zero, 0
+// 0x0101bfd0: 0x101bfd0: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-L_101bfc4:
-// 0x0101bfc4: 0x101bfc4: lw    ra, 20(sp)
-// 0x0101bfc8: 0x101bfc8: addu  v0, v1, zero
+L_101bfd4:
+// 0x0101bfd4: 0x101bfd4: lw    ra, 20(sp)
+// 0x0101bfd8: 0x101bfd8: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0101bfcc: 0x101bfcc: lw    s0, 16(sp)
+// 0x0101bfdc: 0x101bfdc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2985,7 +2985,7 @@ L_101bfc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101bfd0: 0x101bfd0: jr    ra addiu sp, sp, 24
+// 0x0101bfe0: 0x101bfe0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2997,7 +2997,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_object_iterate_101bfd8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_iterate_101bfe8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s5,int32 s4,int32 s3,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -3059,15 +3059,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101bfd8: 0x101bfd8: addiu sp, sp, -88
+// 0x0101bfe8: 0x101bfe8: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x0101bfdc: 0x101bfdc: lui   v0, 0x30000
+// 0x0101bfec: 0x101bfec: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101bfe0: 0x101bfe0: sw    s0, 48(sp)
+// 0x0101bff0: 0x101bff0: sw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3076,16 +3076,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101bfe4: 0x101bfe4: lw    s0, 27088(v0)
+// 0x0101bff4: 0x101bff4: lw    s0, 27552(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101bfe8: 0x101bfe8: sw    s3, 60(sp)
+// 0x0101bff8: 0x101bff8: sw    s3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3094,8 +3094,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101bfec: 0x101bfec: sw    ra, 84(sp)
-// 0x0101bff0: 0x101bff0: sw    s8, 80(sp)
+// 0x0101bffc: 0x101bffc: sw    ra, 84(sp)
+// 0x0101c000: 0x101c000: sw    s8, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3104,7 +3104,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101bff4: 0x101bff4: sw    s7, 76(sp)
+// 0x0101c004: 0x101c004: sw    s7, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3113,7 +3113,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101bff8: 0x101bff8: sw    s6, 72(sp)
+// 0x0101c008: 0x101c008: sw    s6, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3122,7 +3122,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101bffc: 0x101bffc: sw    s5, 68(sp)
+// 0x0101c00c: 0x101c00c: sw    s5, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3131,7 +3131,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101c000: 0x101c000: sw    s4, 64(sp)
+// 0x0101c010: 0x101c010: sw    s4, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3140,7 +3140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101c004: 0x101c004: sw    s2, 56(sp)
+// 0x0101c014: 0x101c014: sw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3149,7 +3149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101c008: 0x101c008: sw    s1, 52(sp)
+// 0x0101c018: 0x101c018: sw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3158,11 +3158,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101c00c: 0x101c00c: addu  s3, a0, zero
+// 0x0101c01c: 0x101c01c: addu  s3, a0, zero
 	ldloc.1
 	stloc 13
-L_101c010:
-// 0x0101c010: 0x101c010: lw    v0, 96(s0)
+L_101c020:
+// 0x0101c020: 0x101c020: lw    v0, 96(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3171,20 +3171,20 @@ L_101c010:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c014: 0x101c014: sll   zero, zero, 0
-// 0x0101c018: 0x101c018: beq   v0, zero, 0x101c110 lui   s1, 0xe0000
+// 0x0101c024: 0x101c024: sll   zero, zero, 0
+// 0x0101c028: 0x101c028: beq   v0, zero, 0x101c120 lui   s1, 0xe0000
 	ldloc 6
 	ldc.i4 917504
 	stloc 9
-	brfalse L_101c110
+	brfalse L_101c120
 // --- basic block ---
-// 0x0101c020: 0x101c020: j	 0x101c010 addu  s0, v0, zero
+// 0x0101c030: 0x101c030: j	 0x101c020 addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-	br L_101c010
+	br L_101c020
 // --- basic block ---
-L_101c028:
-// 0x0101c028: 0x101c028: lw    a0, 8(s0)
+L_101c038:
+// 0x0101c038: 0x101c038: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3193,14 +3193,14 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c02c: 0x101c02c: jal   0x101c7d4 addu  s2, zero, zero
+// 0x0101c03c: 0x101c03c: jal   0x101c7e4 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c034: 0x101c034: lw    a0, 12(s0)
+// 0x0101c044: 0x101c044: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3209,7 +3209,7 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c038: 0x101c038: jal   0x101c7d4 sw    v0, 40(sp)
+// 0x0101c048: 0x101c048: jal   0x101c7e4 sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3219,10 +3219,10 @@ L_101c028:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c040: 0x101c040: lw    a0, 16(s0)
+// 0x0101c050: 0x101c050: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3231,17 +3231,17 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c044: 0x101c044: jal   0x101c7d4 addu  s8, v0, zero
+// 0x0101c054: 0x101c054: jal   0x101c7e4 addu  s8, v0, zero
 	ldloc 6
 	stloc 16
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c04c: 0x101c04c: addu  a0, s0, zero
+// 0x0101c05c: 0x101c05c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0101c050: 0x101c050: lw    s4, 28(s0)
+// 0x0101c060: 0x101c060: lw    s4, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3250,7 +3250,7 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101c054: 0x101c054: lw    s5, 24(s0)
+// 0x0101c064: 0x101c064: lw    s5, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3259,7 +3259,7 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c058: 0x101c058: jal   0x101bf68 addu  s7, v0, zero
+// 0x0101c068: 0x101c068: jal   0x101bf78 addu  s7, v0, zero
 	ldloc 6
 	stloc 15
 	ldloc.0
@@ -3267,16 +3267,16 @@ L_101c028:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::out_of_zoom_101bf68(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::out_of_zoom_101bf78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101c060: 0x101c060: bne   v0, zero, 0x101c0b4 sll   zero, zero, 0
+// 0x0101c070: 0x101c070: bne   v0, zero, 0x101c0c4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101c0b4
+	brtrue L_101c0c4
 // --- basic block ---
-// 0x0101c068: 0x101c068: lw    v0, 56(s1)
+// 0x0101c078: 0x101c078: lw    v0, 56(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3285,17 +3285,17 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c06c: 0x101c06c: sll   zero, zero, 0
-// 0x0101c070: 0x101c070: slt   v0, v0, s5
+// 0x0101c07c: 0x101c07c: sll   zero, zero, 0
+// 0x0101c080: 0x101c080: slt   v0, v0, s5
 	ldloc 6
 	ldloc 11
 	clt
 	stloc 6
-// 0x0101c074: 0x101c074: bne   v0, zero, 0x101c0b4 sll   zero, zero, 0
+// 0x0101c084: 0x101c084: bne   v0, zero, 0x101c0c4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101c0b4
+	brtrue L_101c0c4
 // --- basic block ---
-// 0x0101c07c: 0x101c07c: lw    v0, 64(s1)
+// 0x0101c08c: 0x101c08c: lw    v0, 64(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3304,17 +3304,17 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c080: 0x101c080: sll   zero, zero, 0
-// 0x0101c084: 0x101c084: slt   s5, s5, v0
+// 0x0101c090: 0x101c090: sll   zero, zero, 0
+// 0x0101c094: 0x101c094: slt   s5, s5, v0
 	ldloc 11
 	ldloc 6
 	clt
 	stloc 11
-// 0x0101c088: 0x101c088: bne   s5, zero, 0x101c0b4 sll   zero, zero, 0
+// 0x0101c098: 0x101c098: bne   s5, zero, 0x101c0c4 sll   zero, zero, 0
 	ldloc 11
-	brtrue L_101c0b4
+	brtrue L_101c0c4
 // --- basic block ---
-// 0x0101c090: 0x101c090: lw    v0, 60(s1)
+// 0x0101c0a0: 0x101c0a0: lw    v0, 60(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3323,17 +3323,17 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c094: 0x101c094: sll   zero, zero, 0
-// 0x0101c098: 0x101c098: slt   v0, v0, s4
+// 0x0101c0a4: 0x101c0a4: sll   zero, zero, 0
+// 0x0101c0a8: 0x101c0a8: slt   v0, v0, s4
 	ldloc 6
 	ldloc 12
 	clt
 	stloc 6
-// 0x0101c09c: 0x101c09c: bne   v0, zero, 0x101c0b4 sll   zero, zero, 0
+// 0x0101c0ac: 0x101c0ac: bne   v0, zero, 0x101c0c4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101c0b4
+	brtrue L_101c0c4
 // --- basic block ---
-// 0x0101c0a4: 0x101c0a4: lw    s2, 68(s1)
+// 0x0101c0b4: 0x101c0b4: lw    s2, 68(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3342,19 +3342,19 @@ L_101c028:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101c0a8: 0x101c0a8: sll   zero, zero, 0
-// 0x0101c0ac: 0x101c0ac: slt   s2, s4, s2
+// 0x0101c0b8: 0x101c0b8: sll   zero, zero, 0
+// 0x0101c0bc: 0x101c0bc: slt   s2, s4, s2
 	ldloc 12
 	ldloc 10
 	clt
 	stloc 10
-// 0x0101c0b0: 0x101c0b0: xori  s2, s2, 1
+// 0x0101c0c0: 0x101c0c0: xori  s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	xor
 	stloc 10
-L_101c0b4:
-// 0x0101c0b4: 0x101c0b4: lw    a0, 4(s0)
+L_101c0c4:
+// 0x0101c0c4: 0x101c0c4: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3363,7 +3363,7 @@ L_101c0b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c0b8: 0x101c0b8: lw    s6, 76(s0)
+// 0x0101c0c8: 0x101c0c8: lw    s6, 76(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3372,7 +3372,7 @@ L_101c0b4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101c0bc: 0x101c0bc: lw    s5, 80(s0)
+// 0x0101c0cc: 0x101c0cc: lw    s5, 80(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3381,12 +3381,12 @@ L_101c0b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c0c0: 0x101c0c0: jal   0x101c7d4 sll   zero, zero, 0
+// 0x0101c0d0: 0x101c0d0: jal   0x101c7e4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c0c8: 0x101c0c8: lw    a0, 20(s0)
+// 0x0101c0d8: 0x101c0d8: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3395,19 +3395,19 @@ L_101c0b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c0cc: 0x101c0cc: jal   0x101c7d4 addu  s4, v0, zero
+// 0x0101c0dc: 0x101c0dc: jal   0x101c7e4 addu  s4, v0, zero
 	ldloc 6
 	stloc 12
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c0d4: 0x101c0d4: addiu v1, s0, 44
+// 0x0101c0e4: 0x101c0e4: addiu v1, s0, 44
 	ldloc 7
 	ldc.i4.s 44
 	add
 	stloc 8
-// 0x0101c0d8: 0x101c0d8: lw    a0, 40(sp)
+// 0x0101c0e8: 0x101c0e8: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3416,18 +3416,18 @@ L_101c0b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c0dc: 0x101c0dc: addiu a3, s0, 24
+// 0x0101c0ec: 0x101c0ec: addiu a3, s0, 24
 	ldloc 7
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x0101c0e0: 0x101c0e0: addu  a1, s8, zero
+// 0x0101c0f0: 0x101c0f0: addu  a1, s8, zero
 	ldloc 16
 	stloc.2
-// 0x0101c0e4: 0x101c0e4: addu  a2, s7, zero
+// 0x0101c0f4: 0x101c0f4: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x0101c0e8: 0x101c0e8: sw    v1, 16(sp)
+// 0x0101c0f8: 0x101c0f8: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3436,7 +3436,7 @@ L_101c0b4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101c0ec: 0x101c0ec: sw    s2, 20(sp)
+// 0x0101c0fc: 0x101c0fc: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3445,7 +3445,7 @@ L_101c0b4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101c0f0: 0x101c0f0: sw    s6, 24(sp)
+// 0x0101c100: 0x101c100: sw    s6, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3454,7 +3454,7 @@ L_101c0b4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101c0f4: 0x101c0f4: sw    s5, 28(sp)
+// 0x0101c104: 0x101c104: sw    s5, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3463,7 +3463,7 @@ L_101c0b4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101c0f8: 0x101c0f8: sw    s4, 32(sp)
+// 0x0101c108: 0x101c108: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3472,7 +3472,7 @@ L_101c0b4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101c0fc: 0x101c0fc: jalr  s3 sw    v0, 36(sp)
+// 0x0101c10c: 0x101c10c: jalr  s3 sw    v0, 36(sp)
 	ldloc 13
 	ldloc 5
 	ldloc.0
@@ -3492,7 +3492,7 @@ L_101c0b4:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101c104: 0x101c104: lw    s0, 100(s0)
+// 0x0101c114: 0x101c114: lw    s0, 100(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3501,22 +3501,22 @@ L_101c0b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c108: 0x101c108: j	 0x101c114 sll   zero, zero, 0
-	br L_101c114
+// 0x0101c118: 0x101c118: j	 0x101c124 sll   zero, zero, 0
+	br L_101c124
 // --- basic block ---
-L_101c110:
-// 0x0101c110: 0x101c110: addiu s1, s1, 29604
+L_101c120:
+// 0x0101c120: 0x101c120: addiu s1, s1, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-L_101c114:
-// 0x0101c114: 0x101c114: bne   s0, zero, 0x101c028 sll   zero, zero, 0
+L_101c124:
+// 0x0101c124: 0x101c124: bne   s0, zero, 0x101c038 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_101c028
+	brtrue L_101c038
 // --- basic block ---
-// 0x0101c11c: 0x101c11c: lw    ra, 84(sp)
-// 0x0101c120: 0x101c120: lw    s8, 80(sp)
+// 0x0101c12c: 0x101c12c: lw    ra, 84(sp)
+// 0x0101c130: 0x101c130: lw    s8, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3525,7 +3525,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101c124: 0x101c124: lw    s7, 76(sp)
+// 0x0101c134: 0x101c134: lw    s7, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3534,7 +3534,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101c128: 0x101c128: lw    s6, 72(sp)
+// 0x0101c138: 0x101c138: lw    s6, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3543,7 +3543,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101c12c: 0x101c12c: lw    s5, 68(sp)
+// 0x0101c13c: 0x101c13c: lw    s5, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3552,7 +3552,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c130: 0x101c130: lw    s4, 64(sp)
+// 0x0101c140: 0x101c140: lw    s4, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3561,7 +3561,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101c134: 0x101c134: lw    s3, 60(sp)
+// 0x0101c144: 0x101c144: lw    s3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3570,7 +3570,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101c138: 0x101c138: lw    s2, 56(sp)
+// 0x0101c148: 0x101c148: lw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3579,7 +3579,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101c13c: 0x101c13c: lw    s1, 52(sp)
+// 0x0101c14c: 0x101c14c: lw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3588,7 +3588,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101c140: 0x101c140: lw    s0, 48(sp)
+// 0x0101c150: 0x101c150: lw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3597,7 +3597,7 @@ L_101c114:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c144: 0x101c144: jr    ra addiu sp, sp, 88
+// 0x0101c154: 0x101c154: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -3609,7 +3609,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -3647,15 +3647,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c14c: 0x101c14c: addiu sp, sp, -24
+// 0x0101c15c: 0x101c15c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101c150: 0x101c150: lui   v0, 0x30000
+// 0x0101c160: 0x101c160: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101c154: 0x101c154: sw    s0, 16(sp)
+// 0x0101c164: 0x101c164: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3664,21 +3664,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c158: 0x101c158: sw    ra, 20(sp)
-// 0x0101c15c: 0x101c15c: lw    s0, 27088(v0)
+// 0x0101c168: 0x101c168: sw    ra, 20(sp)
+// 0x0101c16c: 0x101c16c: lw    s0, 27552(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c160: 0x101c160: j	 0x101c17c sll   zero, zero, 0
-	br L_101c17c
+// 0x0101c170: 0x101c170: j	 0x101c18c sll   zero, zero, 0
+	br L_101c18c
 // --- basic block ---
-L_101c168:
-// 0x0101c168: 0x101c168: lw    v1, 4(s0)
+L_101c178:
+// 0x0101c178: 0x101c178: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3687,7 +3687,7 @@ L_101c168:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c16c: 0x101c16c: lw    v0, 96(s0)
+// 0x0101c17c: 0x101c17c: lw    v0, 96(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3696,28 +3696,28 @@ L_101c168:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c170: 0x101c170: beq   v1, a0, 0x101c18c sll   zero, zero, 0
+// 0x0101c180: 0x101c180: beq   v1, a0, 0x101c19c sll   zero, zero, 0
 	ldloc 8
 	ldloc.1
-	beq  L_101c18c
+	beq  L_101c19c
 // --- basic block ---
-// 0x0101c178: 0x101c178: addu  s0, v0, zero
+// 0x0101c188: 0x101c188: addu  s0, v0, zero
 	ldloc 7
 	stloc 6
-L_101c17c:
-// 0x0101c17c: 0x101c17c: bne   s0, zero, 0x101c168 sll   zero, zero, 0
+L_101c18c:
+// 0x0101c18c: 0x101c18c: bne   s0, zero, 0x101c178 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101c168
+	brtrue L_101c178
 // --- basic block ---
-// 0x0101c184: 0x101c184: j	 0x101c210 sll   zero, zero, 0
-	br L_101c210
+// 0x0101c194: 0x101c194: j	 0x101c220 sll   zero, zero, 0
+	br L_101c220
 // --- basic block ---
-L_101c18c:
-// 0x0101c18c: 0x101c18c: beq   v0, zero, 0x101c1a0 sll   zero, zero, 0
+L_101c19c:
+// 0x0101c19c: 0x101c19c: beq   v0, zero, 0x101c1b0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_101c1a0
+	brfalse L_101c1b0
 // --- basic block ---
-// 0x0101c194: 0x101c194: lw    v1, 100(s0)
+// 0x0101c1a4: 0x101c1a4: lw    v1, 100(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3726,8 +3726,8 @@ L_101c18c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c198: 0x101c198: sll   zero, zero, 0
-// 0x0101c19c: 0x101c19c: sw    v1, 100(v0)
+// 0x0101c1a8: 0x101c1a8: sll   zero, zero, 0
+// 0x0101c1ac: 0x101c1ac: sw    v1, 100(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3736,8 +3736,8 @@ L_101c18c:
 	add
 	ldloc 8
 	stelem.i4
-L_101c1a0:
-// 0x0101c1a0: 0x101c1a0: lw    v1, 100(s0)
+L_101c1b0:
+// 0x0101c1b0: 0x101c1b0: lw    v1, 100(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3746,7 +3746,7 @@ L_101c1a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c1a4: 0x101c1a4: lw    v0, 96(s0)
+// 0x0101c1b4: 0x101c1b4: lw    v0, 96(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3755,11 +3755,11 @@ L_101c1a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c1a8: 0x101c1a8: beq   v1, zero, 0x101c1b8 sll   zero, zero, 0
+// 0x0101c1b8: 0x101c1b8: beq   v1, zero, 0x101c1c8 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_101c1b8
+	brfalse L_101c1c8
 // --- basic block ---
-// 0x0101c1b0: 0x101c1b0: j	 0x101c1c0 sw    v0, 96(v1)
+// 0x0101c1c0: 0x101c1c0: j	 0x101c1d0 sw    v0, 96(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3768,41 +3768,41 @@ L_101c1a0:
 	add
 	ldloc 7
 	stelem.i4
-	br L_101c1c0
+	br L_101c1d0
 // --- basic block ---
-L_101c1b8:
-// 0x0101c1b8: 0x101c1b8: lui   v1, 0x30000
+L_101c1c8:
+// 0x0101c1c8: 0x101c1c8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0101c1bc: 0x101c1bc: sw    v0, 27088(v1)
+// 0x0101c1cc: 0x101c1cc: sw    v0, 27552(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldloc 7
 	stelem.i4
-L_101c1c0:
-// 0x0101c1c0: 0x101c1c0: lw    a0, 0(s0)
+L_101c1d0:
+// 0x0101c1d0: 0x101c1d0: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101c1c4: 0x101c1c4: jal   0x101c8f8 sll   zero, zero, 0
+// 0x0101c1d4: 0x101c1d4: jal   0x101c908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101c1cc: 0x101c1cc: lw    a0, 4(s0)
+// 0x0101c1dc: 0x101c1dc: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3811,18 +3811,18 @@ L_101c1c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c1d0: 0x101c1d0: jal   0x101c8f8 sll   zero, zero, 0
+// 0x0101c1e0: 0x101c1e0: jal   0x101c908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101c1d8: 0x101c1d8: lw    a0, 8(s0)
+// 0x0101c1e8: 0x101c1e8: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3831,18 +3831,18 @@ L_101c1c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c1dc: 0x101c1dc: jal   0x101c8f8 sll   zero, zero, 0
+// 0x0101c1ec: 0x101c1ec: jal   0x101c908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101c1e4: 0x101c1e4: lw    a0, 12(s0)
+// 0x0101c1f4: 0x101c1f4: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3851,18 +3851,18 @@ L_101c1c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c1e8: 0x101c1e8: jal   0x101c8f8 sll   zero, zero, 0
+// 0x0101c1f8: 0x101c1f8: jal   0x101c908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101c1f0: 0x101c1f0: lw    a0, 20(s0)
+// 0x0101c200: 0x101c200: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3871,18 +3871,18 @@ L_101c1c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c1f4: 0x101c1f4: jal   0x101c8f8 sll   zero, zero, 0
+// 0x0101c204: 0x101c204: jal   0x101c908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101c1fc: 0x101c1fc: lw    a0, 16(s0)
+// 0x0101c20c: 0x101c20c: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3891,18 +3891,18 @@ L_101c1c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c200: 0x101c200: jal   0x101c8f8 sll   zero, zero, 0
+// 0x0101c210: 0x101c210: jal   0x101c908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101c208: 0x101c208: jal   0x1000930 addu  a0, s0, zero
+// 0x0101c218: 0x101c218: jal   0x1000930 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3915,9 +3915,9 @@ L_101c1c0:
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_101c210:
-// 0x0101c210: 0x101c210: lw    ra, 20(sp)
-// 0x0101c214: 0x101c214: lw    s0, 16(sp)
+L_101c220:
+// 0x0101c220: 0x101c220: lw    ra, 20(sp)
+// 0x0101c224: 0x101c224: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3926,7 +3926,7 @@ L_101c210:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c218: 0x101c218: jr    ra addiu sp, sp, 24
+// 0x0101c228: 0x101c228: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3938,7 +3938,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_object_add_with_priority_101c27c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_add_with_priority_101c28c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s3,int32 s0,int32 s4,int32 s5,int32 s1,int32 s2,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -4000,15 +4000,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c27c: 0x101c27c: addiu sp, sp, -56
+// 0x0101c28c: 0x101c28c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0101c280: 0x101c280: lui   v0, 0x30000
+// 0x0101c290: 0x101c290: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101c284: 0x101c284: sw    s8, 48(sp)
+// 0x0101c294: 0x101c294: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4017,7 +4017,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101c288: 0x101c288: sw    s7, 44(sp)
+// 0x0101c298: 0x101c298: sw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4026,7 +4026,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101c28c: 0x101c28c: sw    s5, 36(sp)
+// 0x0101c29c: 0x101c29c: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4035,7 +4035,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101c290: 0x101c290: sw    s4, 32(sp)
+// 0x0101c2a0: 0x101c2a0: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4044,7 +4044,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101c294: 0x101c294: sw    s2, 24(sp)
+// 0x0101c2a4: 0x101c2a4: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4053,7 +4053,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101c298: 0x101c298: sw    s1, 20(sp)
+// 0x0101c2a8: 0x101c2a8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4062,7 +4062,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101c29c: 0x101c29c: sw    s0, 16(sp)
+// 0x0101c2ac: 0x101c2ac: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4071,8 +4071,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101c2a0: 0x101c2a0: sw    ra, 52(sp)
-// 0x0101c2a4: 0x101c2a4: sw    s6, 40(sp)
+// 0x0101c2b0: 0x101c2b0: sw    ra, 52(sp)
+// 0x0101c2b4: 0x101c2b4: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4081,7 +4081,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101c2a8: 0x101c2a8: sw    s3, 28(sp)
+// 0x0101c2b8: 0x101c2b8: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4090,25 +4090,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101c2ac: 0x101c2ac: addu  s1, a0, zero
+// 0x0101c2bc: 0x101c2bc: addu  s1, a0, zero
 	ldloc.1
 	stloc 12
-// 0x0101c2b0: 0x101c2b0: addu  s0, a1, zero
+// 0x0101c2c0: 0x101c2c0: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0101c2b4: 0x101c2b4: addu  s2, a2, zero
+// 0x0101c2c4: 0x101c2c4: addu  s2, a2, zero
 	ldloc.3
 	stloc 13
-// 0x0101c2b8: 0x101c2b8: lw    v0, 27088(v0)
+// 0x0101c2c8: 0x101c2c8: lw    v0, 27552(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c2bc: 0x101c2bc: lw    s8, 72(sp)
+// 0x0101c2cc: 0x101c2cc: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4117,7 +4117,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101c2c0: 0x101c2c0: lw    s4, 76(sp)
+// 0x0101c2d0: 0x101c2d0: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4126,7 +4126,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101c2c4: 0x101c2c4: lw    s5, 80(sp)
+// 0x0101c2d4: 0x101c2d4: lw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4135,13 +4135,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c2c8: 0x101c2c8: j	 0x101c2e8 addu  s7, a3, zero
+// 0x0101c2d8: 0x101c2d8: j	 0x101c2f8 addu  s7, a3, zero
 	ldloc 4
 	stloc 15
-	br L_101c2e8
+	br L_101c2f8
 // --- basic block ---
-L_101c2d0:
-// 0x0101c2d0: 0x101c2d0: lw    v1, 4(v0)
+L_101c2e0:
+// 0x0101c2e0: 0x101c2e0: lw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4150,13 +4150,13 @@ L_101c2d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c2d4: 0x101c2d4: sll   zero, zero, 0
-// 0x0101c2d8: 0x101c2d8: beq   v1, s0, 0x101c4cc sll   zero, zero, 0
+// 0x0101c2e4: 0x101c2e4: sll   zero, zero, 0
+// 0x0101c2e8: 0x101c2e8: beq   v1, s0, 0x101c4dc sll   zero, zero, 0
 	ldloc 7
 	ldloc 9
-	beq  L_101c4cc
+	beq  L_101c4dc
 // --- basic block ---
-// 0x0101c2e0: 0x101c2e0: lw    v0, 96(v0)
+// 0x0101c2f0: 0x101c2f0: lw    v0, 96(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4165,25 +4165,25 @@ L_101c2d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c2e4: 0x101c2e4: sll   zero, zero, 0
-L_101c2e8:
-// 0x0101c2e8: 0x101c2e8: bne   v0, zero, 0x101c2d0 sll   zero, zero, 0
+// 0x0101c2f4: 0x101c2f4: sll   zero, zero, 0
+L_101c2f8:
+// 0x0101c2f8: 0x101c2f8: bne   v0, zero, 0x101c2e0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101c2d0
+	brtrue L_101c2e0
 // --- basic block ---
-// 0x0101c2f0: 0x101c2f0: j	 0x101c48c sll   zero, zero, 0
-	br L_101c48c
+// 0x0101c300: 0x101c300: j	 0x101c49c sll   zero, zero, 0
+	br L_101c49c
 // --- basic block ---
-L_101c2f8:
-// 0x0101c2f8: 0x101c2f8: addiu a3, a3, 22224
+L_101c308:
+// 0x0101c308: 0x101c308: addiu a3, a3, 22224
 	ldloc 4
 	ldc.i4 22224
 	add
 	stloc 4
-// 0x0101c2fc: 0x101c2fc: addiu a0, zero, 4
+// 0x0101c30c: 0x101c30c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101c300: 0x101c300: jal   0x100449c addiu a2, zero, 372
+// 0x0101c310: 0x101c310: jal   0x100449c addiu a2, zero, 372
 	ldc.i4 372
 	stloc.3
 	ldloc.0
@@ -4196,11 +4196,11 @@ L_101c2f8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c308: 0x101c308: j	 0x101c4cc sll   zero, zero, 0
-	br L_101c4cc
+// 0x0101c318: 0x101c318: j	 0x101c4dc sll   zero, zero, 0
+	br L_101c4dc
 // --- basic block ---
-L_101c310:
-// 0x0101c310: 0x101c310: lw    v0, 84(sp)
+L_101c320:
+// 0x0101c320: 0x101c320: lw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4209,14 +4209,14 @@ L_101c310:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c314: 0x101c314: sw    s1, 0(s3)
+// 0x0101c324: 0x101c324: sw    s1, 0(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x0101c318: 0x101c318: sw    v0, 60(s3)
+// 0x0101c328: 0x101c328: sw    v0, 60(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4225,7 +4225,7 @@ L_101c310:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c31c: 0x101c31c: lw    v0, 88(sp)
+// 0x0101c32c: 0x101c32c: lw    v0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4234,7 +4234,7 @@ L_101c310:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c320: 0x101c320: sw    s0, 4(s3)
+// 0x0101c330: 0x101c330: sw    s0, 4(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4243,7 +4243,7 @@ L_101c310:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101c324: 0x101c324: sw    s2, 8(s3)
+// 0x0101c334: 0x101c334: sw    s2, 8(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4252,7 +4252,7 @@ L_101c310:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101c328: 0x101c328: sw    s7, 12(s3)
+// 0x0101c338: 0x101c338: sw    s7, 12(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4261,7 +4261,7 @@ L_101c310:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101c32c: 0x101c32c: sw    s8, 16(s3)
+// 0x0101c33c: 0x101c33c: sw    s8, 16(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4270,7 +4270,7 @@ L_101c310:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101c330: 0x101c330: beq   s5, zero, 0x101c34c sw    v0, 20(s3)
+// 0x0101c340: 0x101c340: beq   s5, zero, 0x101c35c sw    v0, 20(s3)
 	ldloc 11
 	ldloc 5
 	ldloc 8
@@ -4280,9 +4280,9 @@ L_101c310:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_101c34c
+	brfalse L_101c35c
 // --- basic block ---
-// 0x0101c338: 0x101c338: lw    v1, 4(s5)
+// 0x0101c348: 0x101c348: lw    v1, 4(s5)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4291,14 +4291,14 @@ L_101c310:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c33c: 0x101c33c: lw    v0, 0(s5)
+// 0x0101c34c: 0x101c34c: lw    v0, 0(s5)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101c340: 0x101c340: sw    v1, 48(s3)
+// 0x0101c350: 0x101c350: sw    v1, 48(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4307,7 +4307,7 @@ L_101c310:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c344: 0x101c344: j	 0x101c354 sw    v0, 44(s3)
+// 0x0101c354: 0x101c354: j	 0x101c364 sw    v0, 44(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4316,10 +4316,10 @@ L_101c310:
 	add
 	ldloc 6
 	stelem.i4
-	br L_101c354
+	br L_101c364
 // --- basic block ---
-L_101c34c:
-// 0x0101c34c: 0x101c34c: sw    zero, 48(s3)
+L_101c35c:
+// 0x0101c35c: 0x101c35c: sw    zero, 48(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4328,7 +4328,7 @@ L_101c34c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101c350: 0x101c350: sw    zero, 44(s3)
+// 0x0101c360: 0x101c360: sw    zero, 44(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4337,16 +4337,16 @@ L_101c34c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101c354:
-// 0x0101c354: 0x101c354: lui   v1, 0x1020000
+L_101c364:
+// 0x0101c364: 0x101c364: lui   v1, 0x1020000
 	ldc.i4 16908288
 	stloc 7
-// 0x0101c358: 0x101c358: addiu v1, v1, -17108
+// 0x0101c368: 0x101c368: addiu v1, v1, -17092
 	ldloc 7
-	ldc.i4 -17108
+	ldc.i4 -17092
 	add
 	stloc 7
-// 0x0101c35c: 0x101c35c: sw    v1, 52(s3)
+// 0x0101c36c: 0x101c36c: sw    v1, 52(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4355,7 +4355,7 @@ L_101c354:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c360: 0x101c360: lw    v1, 92(sp)
+// 0x0101c370: 0x101c370: lw    v1, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4364,10 +4364,10 @@ L_101c354:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c364: 0x101c364: addiu v0, zero, -1
+// 0x0101c374: 0x101c374: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0101c368: 0x101c368: sw    v1, 84(s3)
+// 0x0101c378: 0x101c378: sw    v1, 84(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4376,13 +4376,13 @@ L_101c354:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c36c: 0x101c36c: addiu v1, zero, 100
+// 0x0101c37c: 0x101c37c: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x0101c370: 0x101c370: addu  a0, s1, zero
+// 0x0101c380: 0x101c380: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x0101c374: 0x101c374: sw    v1, 76(s3)
+// 0x0101c384: 0x101c384: sw    v1, 76(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4391,10 +4391,10 @@ L_101c354:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c378: 0x101c378: addiu v1, zero, 255
+// 0x0101c388: 0x101c388: addiu v1, zero, 255
 	ldc.i4 255
 	stloc 7
-// 0x0101c37c: 0x101c37c: sw    v0, 72(s3)
+// 0x0101c38c: 0x101c38c: sw    v0, 72(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4403,7 +4403,7 @@ L_101c354:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c380: 0x101c380: sw    v0, 68(s3)
+// 0x0101c390: 0x101c390: sw    v0, 68(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4412,7 +4412,7 @@ L_101c354:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c384: 0x101c384: sw    v1, 80(s3)
+// 0x0101c394: 0x101c394: sw    v1, 80(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4421,7 +4421,7 @@ L_101c354:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c388: 0x101c388: jal   0x101c7b0 sw    zero, 56(s3)
+// 0x0101c398: 0x101c398: jal   0x101c7c0 sw    zero, 56(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4431,48 +4431,48 @@ L_101c354:
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_lock_101c7b0(int32)
+	call int32 Cibyl20::roadmap_string_lock_101c7c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c390: 0x101c390: jal   0x101c7b0 addu  a0, s0, zero
+// 0x0101c3a0: 0x101c3a0: jal   0x101c7c0 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_lock_101c7b0(int32)
+	call int32 Cibyl20::roadmap_string_lock_101c7c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c398: 0x101c398: jal   0x101c7b0 addu  a0, s2, zero
+// 0x0101c3a8: 0x101c3a8: jal   0x101c7c0 addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_lock_101c7b0(int32)
+	call int32 Cibyl20::roadmap_string_lock_101c7c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c3a0: 0x101c3a0: jal   0x101c7b0 addu  a0, s7, zero
+// 0x0101c3b0: 0x101c3b0: jal   0x101c7c0 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_lock_101c7b0(int32)
+	call int32 Cibyl20::roadmap_string_lock_101c7c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c3a8: 0x101c3a8: jal   0x101c7b0 addu  a0, s8, zero
+// 0x0101c3b8: 0x101c3b8: jal   0x101c7c0 addu  a0, s8, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_lock_101c7b0(int32)
+	call int32 Cibyl20::roadmap_string_lock_101c7c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c3b0: 0x101c3b0: lw    a0, 88(sp)
+// 0x0101c3c0: 0x101c3c0: lw    a0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4481,31 +4481,31 @@ L_101c354:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c3b4: 0x101c3b4: jal   0x101c7b0 sll   zero, zero, 0
+// 0x0101c3c4: 0x101c3c4: jal   0x101c7c0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_lock_101c7b0(int32)
+	call int32 Cibyl20::roadmap_string_lock_101c7c0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c3bc: 0x101c3bc: lui   v0, 0x30000
+// 0x0101c3cc: 0x101c3cc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101c3c0: 0x101c3c0: lw    v0, 27088(v0)
+// 0x0101c3d0: 0x101c3d0: lw    v0, 27552(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c3c4: 0x101c3c4: sll   zero, zero, 0
-// 0x0101c3c8: 0x101c3c8: beq   v0, zero, 0x101c3f0 sll   zero, zero, 0
+// 0x0101c3d4: 0x101c3d4: sll   zero, zero, 0
+// 0x0101c3d8: 0x101c3d8: beq   v0, zero, 0x101c400 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101c3f0
+	brfalse L_101c400
 // --- basic block ---
-// 0x0101c3d0: 0x101c3d0: lw    a2, 84(s3)
+// 0x0101c3e0: 0x101c3e0: lw    a2, 84(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4514,7 +4514,7 @@ L_101c354:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101c3d4: 0x101c3d4: lw    v1, 84(v0)
+// 0x0101c3e4: 0x101c3e4: lw    v1, 84(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4523,25 +4523,25 @@ L_101c354:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c3d8: 0x101c3d8: sll   zero, zero, 0
-// 0x0101c3dc: 0x101c3dc: slt   v1, a2, v1
+// 0x0101c3e8: 0x101c3e8: sll   zero, zero, 0
+// 0x0101c3ec: 0x101c3ec: slt   v1, a2, v1
 	ldloc.3
 	ldloc 7
 	clt
 	stloc 7
-// 0x0101c3e0: 0x101c3e0: beq   v1, zero, 0x101c3f0 addu  a1, v0, zero
+// 0x0101c3f0: 0x101c3f0: beq   v1, zero, 0x101c400 addu  a1, v0, zero
 	ldloc 7
 	ldloc 6
 	stloc.2
-	brfalse L_101c3f0
+	brfalse L_101c400
 // --- basic block ---
-// 0x0101c3e8: 0x101c3e8: j	 0x101c41c addu  a0, v0, zero
+// 0x0101c3f8: 0x101c3f8: j	 0x101c42c addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-	br L_101c41c
+	br L_101c42c
 // --- basic block ---
-L_101c3f0:
-// 0x0101c3f0: 0x101c3f0: sw    v0, 96(s3)
+L_101c400:
+// 0x0101c400: 0x101c400: sw    v0, 96(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4550,7 +4550,7 @@ L_101c3f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c3f4: 0x101c3f4: beq   v0, zero, 0x101c400 sw    zero, 100(s3)
+// 0x0101c404: 0x101c404: beq   v0, zero, 0x101c410 sw    zero, 100(s3)
 	ldloc 6
 	ldloc 5
 	ldloc 8
@@ -4560,9 +4560,9 @@ L_101c3f0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_101c400
+	brfalse L_101c410
 // --- basic block ---
-// 0x0101c3fc: 0x101c3fc: sw    s3, 100(v0)
+// 0x0101c40c: 0x101c40c: sw    s3, 100(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4571,14 +4571,14 @@ L_101c3f0:
 	add
 	ldloc 8
 	stelem.i4
-L_101c400:
-// 0x0101c400: 0x101c400: j	 0x101c444 addu  v0, s3, zero
+L_101c410:
+// 0x0101c410: 0x101c410: j	 0x101c454 addu  v0, s3, zero
 	ldloc 8
 	stloc 6
-	br L_101c444
+	br L_101c454
 // --- basic block ---
-L_101c408:
-// 0x0101c408: 0x101c408: lw    v1, 96(a0)
+L_101c418:
+// 0x0101c418: 0x101c418: lw    v1, 96(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4587,18 +4587,18 @@ L_101c408:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c40c: 0x101c40c: sll   zero, zero, 0
-// 0x0101c410: 0x101c410: beq   v1, zero, 0x101c430 addu  a1, a0, zero
+// 0x0101c41c: 0x101c41c: sll   zero, zero, 0
+// 0x0101c420: 0x101c420: beq   v1, zero, 0x101c440 addu  a1, a0, zero
 	ldloc 7
 	ldloc.1
 	stloc.2
-	brfalse L_101c430
+	brfalse L_101c440
 // --- basic block ---
-// 0x0101c418: 0x101c418: addu  a0, v1, zero
+// 0x0101c428: 0x101c428: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-L_101c41c:
-// 0x0101c41c: 0x101c41c: lw    v1, 84(a0)
+L_101c42c:
+// 0x0101c42c: 0x101c42c: lw    v1, 84(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4607,20 +4607,20 @@ L_101c41c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c420: 0x101c420: sll   zero, zero, 0
-// 0x0101c424: 0x101c424: slt   v1, a2, v1
+// 0x0101c430: 0x101c430: sll   zero, zero, 0
+// 0x0101c434: 0x101c434: slt   v1, a2, v1
 	ldloc.3
 	ldloc 7
 	clt
 	stloc 7
-// 0x0101c428: 0x101c428: bne   v1, zero, 0x101c408 addu  v1, a0, zero
+// 0x0101c438: 0x101c438: bne   v1, zero, 0x101c418 addu  v1, a0, zero
 	ldloc 7
 	ldloc.1
 	stloc 7
-	brtrue L_101c408
+	brtrue L_101c418
 // --- basic block ---
-L_101c430:
-// 0x0101c430: 0x101c430: sw    s3, 96(a1)
+L_101c440:
+// 0x0101c440: 0x101c440: sw    s3, 96(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4629,7 +4629,7 @@ L_101c430:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101c434: 0x101c434: sw    a1, 100(s3)
+// 0x0101c444: 0x101c444: sw    a1, 100(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4638,7 +4638,7 @@ L_101c430:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101c438: 0x101c438: beq   v1, zero, 0x101c444 sw    v1, 96(s3)
+// 0x0101c448: 0x101c448: beq   v1, zero, 0x101c454 sw    v1, 96(s3)
 	ldloc 7
 	ldloc 5
 	ldloc 8
@@ -4648,9 +4648,9 @@ L_101c430:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_101c444
+	brfalse L_101c454
 // --- basic block ---
-// 0x0101c440: 0x101c440: sw    s3, 100(v1)
+// 0x0101c450: 0x101c450: sw    s3, 100(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4659,31 +4659,31 @@ L_101c430:
 	add
 	ldloc 8
 	stelem.i4
-L_101c444:
-// 0x0101c444: 0x101c444: lui   v1, 0x30000
+L_101c454:
+// 0x0101c454: 0x101c454: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101c448: 0x101c448: beq   s4, zero, 0x101c470 sw    v0, 27088(v1)
+// 0x0101c458: 0x101c458: beq   s4, zero, 0x101c480 sw    v0, 27552(v1)
 	ldloc 10
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_101c470
+	brfalse L_101c480
 // --- basic block ---
-// 0x0101c450: 0x101c450: addiu a0, s3, 24
+// 0x0101c460: 0x101c460: addiu a0, s3, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x0101c454: 0x101c454: addu  a1, s4, zero
+// 0x0101c464: 0x101c464: addu  a1, s4, zero
 	ldloc 10
 	stloc.2
-// 0x0101c458: 0x101c458: jal   0x1001800 addiu a2, zero, 20
+// 0x0101c468: 0x101c468: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -4695,7 +4695,7 @@ L_101c444:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c460: 0x101c460: lw    v0, 52(s3)
+// 0x0101c470: 0x101c470: lw    v0, 52(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4704,10 +4704,10 @@ L_101c444:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c464: 0x101c464: addu  a1, s4, zero
+// 0x0101c474: 0x101c474: addu  a1, s4, zero
 	ldloc 10
 	stloc.2
-// 0x0101c468: 0x101c468: jalr  v0 addu  a0, s0, zero
+// 0x0101c478: 0x101c478: jalr  v0 addu  a0, s0, zero
 	ldloc 6
 	ldloc 9
 	stloc.1
@@ -4721,11 +4721,11 @@ L_101c444:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_101c470:
-// 0x0101c470: 0x101c470: lui   v0, 0x0
+L_101c480:
+// 0x0101c480: 0x101c480: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0101c474: 0x101c474: lw    v0, 4808(v0)
+// 0x0101c484: 0x101c484: lw    v0, 4808(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4734,8 +4734,8 @@ L_101c470:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c478: 0x101c478: sll   zero, zero, 0
-// 0x0101c47c: 0x101c47c: jalr  v0 addu  a0, s0, zero
+// 0x0101c488: 0x101c488: sll   zero, zero, 0
+// 0x0101c48c: 0x101c48c: jalr  v0 addu  a0, s0, zero
 	ldloc 6
 	ldloc 9
 	stloc.1
@@ -4749,11 +4749,11 @@ L_101c470:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c484: 0x101c484: j	 0x101c4cc sll   zero, zero, 0
-	br L_101c4cc
+// 0x0101c494: 0x101c494: j	 0x101c4dc sll   zero, zero, 0
+	br L_101c4dc
 // --- basic block ---
-L_101c48c:
-// 0x0101c48c: 0x101c48c: jal   0x1000910 addiu a0, zero, 104
+L_101c49c:
+// 0x0101c49c: 0x101c49c: jal   0x1000910 addiu a0, zero, 104
 	ldc.i4.s 104
 	stloc.1
 	ldloc.0
@@ -4766,19 +4766,19 @@ L_101c48c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c494: 0x101c494: addu  s3, v0, zero
+// 0x0101c4a4: 0x101c4a4: addu  s3, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0101c498: 0x101c498: addu  a0, v0, zero
+// 0x0101c4a8: 0x101c4a8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0101c49c: 0x101c49c: addu  a1, zero, zero
+// 0x0101c4ac: 0x101c4ac: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101c4a0: 0x101c4a0: addiu a2, zero, 104
+// 0x0101c4b0: 0x101c4b0: addiu a2, zero, 104
 	ldc.i4.s 104
 	stloc.3
-// 0x0101c4a4: 0x101c4a4: jal   0x100177c lui   s6, 0x10000
+// 0x0101c4b4: 0x101c4b4: jal   0x100177c lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 14
 	ldloc.1
@@ -4790,15 +4790,15 @@ L_101c48c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c4ac: 0x101c4ac: addiu a0, s6, -30520
+// 0x0101c4bc: 0x101c4bc: addiu a0, s6, -30520
 	ldloc 14
 	ldc.i4 -30520
 	add
 	stloc.1
-// 0x0101c4b0: 0x101c4b0: addiu a1, zero, 369
+// 0x0101c4c0: 0x101c4c0: addiu a1, zero, 369
 	ldc.i4 369
 	stloc.2
-// 0x0101c4b4: 0x101c4b4: jal   0x1004a38 addu  a2, s3, zero
+// 0x0101c4c4: 0x101c4c4: jal   0x1004a48 addu  a2, s3, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -4806,27 +4806,27 @@ L_101c48c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c4bc: 0x101c4bc: bne   s3, zero, 0x101c310 lui   a3, 0x0
+// 0x0101c4cc: 0x101c4cc: bne   s3, zero, 0x101c320 lui   a3, 0x0
 	ldloc 8
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_101c310
+	brtrue L_101c320
 // --- basic block ---
-// 0x0101c4c4: 0x101c4c4: j	 0x101c2f8 addiu a1, s6, -30520
+// 0x0101c4d4: 0x101c4d4: j	 0x101c308 addiu a1, s6, -30520
 	ldloc 14
 	ldc.i4 -30520
 	add
 	stloc.2
-	br L_101c2f8
+	br L_101c308
 // --- basic block ---
-L_101c4cc:
-// 0x0101c4cc: 0x101c4cc: lw    ra, 52(sp)
-// 0x0101c4d0: 0x101c4d0: lw    s8, 48(sp)
+L_101c4dc:
+// 0x0101c4dc: 0x101c4dc: lw    ra, 52(sp)
+// 0x0101c4e0: 0x101c4e0: lw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4835,7 +4835,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101c4d4: 0x101c4d4: lw    s7, 44(sp)
+// 0x0101c4e4: 0x101c4e4: lw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4844,7 +4844,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101c4d8: 0x101c4d8: lw    s6, 40(sp)
+// 0x0101c4e8: 0x101c4e8: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4853,7 +4853,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101c4dc: 0x101c4dc: lw    s5, 36(sp)
+// 0x0101c4ec: 0x101c4ec: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c4e0: 0x101c4e0: lw    s4, 32(sp)
+// 0x0101c4f0: 0x101c4f0: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4871,7 +4871,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101c4e4: 0x101c4e4: lw    s3, 28(sp)
+// 0x0101c4f4: 0x101c4f4: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4880,7 +4880,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c4e8: 0x101c4e8: lw    s2, 24(sp)
+// 0x0101c4f8: 0x101c4f8: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4889,7 +4889,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101c4ec: 0x101c4ec: lw    s1, 20(sp)
+// 0x0101c4fc: 0x101c4fc: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4898,7 +4898,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101c4f0: 0x101c4f0: lw    s0, 16(sp)
+// 0x0101c500: 0x101c500: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4907,7 +4907,7 @@ L_101c4cc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101c4f4: 0x101c4f4: jr    ra addiu sp, sp, 56
+// 0x0101c504: 0x101c504: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4919,7 +4919,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -4954,12 +4954,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c4fc: 0x101c4fc: addiu sp, sp, -48
+// 0x0101c50c: 0x101c50c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101c500: 0x101c500: lw    v0, 64(sp)
+// 0x0101c510: 0x101c510: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4968,8 +4968,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c504: 0x101c504: sw    ra, 44(sp)
-// 0x0101c508: 0x101c508: sw    v0, 16(sp)
+// 0x0101c514: 0x101c514: sw    ra, 44(sp)
+// 0x0101c518: 0x101c518: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4978,7 +4978,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c50c: 0x101c50c: lw    v0, 68(sp)
+// 0x0101c51c: 0x101c51c: lw    v0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4987,7 +4987,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c510: 0x101c510: sw    zero, 36(sp)
+// 0x0101c520: 0x101c520: sw    zero, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4996,7 +4996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101c514: 0x101c514: sw    v0, 20(sp)
+// 0x0101c524: 0x101c524: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5005,7 +5005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c518: 0x101c518: lw    v0, 72(sp)
+// 0x0101c528: 0x101c528: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5014,8 +5014,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c51c: 0x101c51c: sll   zero, zero, 0
-// 0x0101c520: 0x101c520: sw    v0, 24(sp)
+// 0x0101c52c: 0x101c52c: sll   zero, zero, 0
+// 0x0101c530: 0x101c530: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5024,7 +5024,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c524: 0x101c524: lw    v0, 76(sp)
+// 0x0101c534: 0x101c534: lw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5033,8 +5033,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c528: 0x101c528: sll   zero, zero, 0
-// 0x0101c52c: 0x101c52c: sw    v0, 28(sp)
+// 0x0101c538: 0x101c538: sll   zero, zero, 0
+// 0x0101c53c: 0x101c53c: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5043,7 +5043,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c530: 0x101c530: lw    v0, 80(sp)
+// 0x0101c540: 0x101c540: lw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5052,7 +5052,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c534: 0x101c534: jal   0x101c27c sw    v0, 32(sp)
+// 0x0101c544: 0x101c544: jal   0x101c28c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5066,14 +5066,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_with_priority_101c27c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_with_priority_101c28c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101c53c: 0x101c53c: lw    ra, 44(sp)
-// 0x0101c540: 0x101c540: sll   zero, zero, 0
-// 0x0101c544: 0x101c544: jr    ra addiu sp, sp, 48
+// 0x0101c54c: 0x101c54c: lw    ra, 44(sp)
+// 0x0101c550: 0x101c550: sll   zero, zero, 0
+// 0x0101c554: 0x101c554: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5085,7 +5085,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_object_short_click_101c54c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_short_click_101c55c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 lo,int32 s2,int32 s0,int32 s3,int32 s4,int32 s6,int32 s5,int32 s7,int32 ra,int32 t0)
@@ -5150,10 +5150,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c54c: 0x101c54c: lui   v0, 0x0
+// 0x0101c55c: 0x101c55c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0101c550: 0x101c550: lw    v0, 4804(v0)
+// 0x0101c560: 0x101c560: lw    v0, 4804(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5162,13 +5162,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c554: 0x101c554: addiu sp, sp, -96
+// 0x0101c564: 0x101c564: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0101c558: 0x101c558: sw    ra, 92(sp)
-// 0x0101c55c: 0x101c55c: sw    s7, 88(sp)
+// 0x0101c568: 0x101c568: sw    ra, 92(sp)
+// 0x0101c56c: 0x101c56c: sw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5177,7 +5177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101c560: 0x101c560: sw    s6, 84(sp)
+// 0x0101c570: 0x101c570: sw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5186,7 +5186,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101c564: 0x101c564: sw    s5, 80(sp)
+// 0x0101c574: 0x101c574: sw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5195,7 +5195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101c568: 0x101c568: sw    s4, 76(sp)
+// 0x0101c578: 0x101c578: sw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5204,7 +5204,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101c56c: 0x101c56c: sw    s3, 72(sp)
+// 0x0101c57c: 0x101c57c: sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5213,7 +5213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101c570: 0x101c570: sw    s2, 68(sp)
+// 0x0101c580: 0x101c580: sw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5222,7 +5222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101c574: 0x101c574: sw    s1, 64(sp)
+// 0x0101c584: 0x101c584: sw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101c578: 0x101c578: beq   v0, zero, 0x101c780 sw    s0, 60(sp)
+// 0x0101c588: 0x101c588: beq   v0, zero, 0x101c790 sw    s0, 60(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -5241,36 +5241,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-	brfalse L_101c780
+	brfalse L_101c790
 // --- basic block ---
-// 0x0101c580: 0x101c580: lui   v0, 0x30000
+// 0x0101c590: 0x101c590: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101c584: 0x101c584: lui   s2, 0xe0000
+// 0x0101c594: 0x101c594: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x0101c588: 0x101c588: lw    s4, 0(a0)
+// 0x0101c598: 0x101c598: lw    s4, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0101c58c: 0x101c58c: lw    s1, 27088(v0)
+// 0x0101c59c: 0x101c59c: lw    s1, 27552(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 6772
+	ldc.i4 6888
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c590: 0x101c590: addiu s2, s2, 29604
+// 0x0101c5a0: 0x101c5a0: addiu s2, s2, 30068
 	ldloc 10
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 10
-// 0x0101c594: 0x101c594: lw    s3, 4(a0)
+// 0x0101c5a4: 0x101c5a4: lw    s3, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5279,18 +5279,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101c598: 0x101c598: addiu s5, sp, 40
+// 0x0101c5a8: 0x101c5a8: addiu s5, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 15
-// 0x0101c59c: 0x101c59c: j	 0x101c6d8 addiu s0, zero, 2
+// 0x0101c5ac: 0x101c5ac: j	 0x101c6e8 addiu s0, zero, 2
 	ldc.i4.2
 	stloc 11
-	br L_101c6d8
+	br L_101c6e8
 // --- basic block ---
-L_101c5a4:
-// 0x0101c5a4: 0x101c5a4: lw    v0, 16(s1)
+L_101c5b4:
+// 0x0101c5b4: 0x101c5b4: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5299,12 +5299,12 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c5a8: 0x101c5a8: sll   zero, zero, 0
-// 0x0101c5ac: 0x101c5ac: beq   v0, zero, 0x101c6d0 sll   zero, zero, 0
+// 0x0101c5b8: 0x101c5b8: sll   zero, zero, 0
+// 0x0101c5bc: 0x101c5bc: beq   v0, zero, 0x101c6e0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101c6d0
+	brfalse L_101c6e0
 // --- basic block ---
-// 0x0101c5b4: 0x101c5b4: lw    v0, 56(s1)
+// 0x0101c5c4: 0x101c5c4: lw    v0, 56(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5313,29 +5313,29 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c5b8: 0x101c5b8: sll   zero, zero, 0
-// 0x0101c5bc: 0x101c5bc: beq   v0, zero, 0x101c6d0 sll   zero, zero, 0
+// 0x0101c5c8: 0x101c5c8: sll   zero, zero, 0
+// 0x0101c5cc: 0x101c5cc: beq   v0, zero, 0x101c6e0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101c6d0
+	brfalse L_101c6e0
 // --- basic block ---
-// 0x0101c5c4: 0x101c5c4: jal   0x101bf68 sll   zero, zero, 0
+// 0x0101c5d4: 0x101c5d4: jal   0x101bf78 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::out_of_zoom_101bf68(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::out_of_zoom_101bf78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c5cc: 0x101c5cc: bne   v0, zero, 0x101c6d0 addu  a0, s5, zero
+// 0x0101c5dc: 0x101c5dc: bne   v0, zero, 0x101c6e0 addu  a0, s5, zero
 	ldloc 6
 	ldloc 15
 	stloc.1
-	brtrue L_101c6d0
+	brtrue L_101c6e0
 // --- basic block ---
-// 0x0101c5d4: 0x101c5d4: lw    a2, 24(s1)
+// 0x0101c5e4: 0x101c5e4: lw    a2, 24(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5344,7 +5344,7 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101c5d8: 0x101c5d8: lw    a1, 80(s2)
+// 0x0101c5e8: 0x101c5e8: lw    a1, 80(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5353,7 +5353,7 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101c5dc: 0x101c5dc: lw    a3, 32(s2)
+// 0x0101c5ec: 0x101c5ec: lw    a3, 32(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5362,17 +5362,17 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101c5e0: 0x101c5e0: subu  a1, a2, a1
+// 0x0101c5f0: 0x101c5f0: subu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.2
-// 0x0101c5e4: 0x101c5e4: div   a1, a3
+// 0x0101c5f4: 0x101c5f4: div   a1, a3
 	ldloc.2
 	ldloc 4
 	div
 	stloc 9
-// 0x0101c5e8: 0x101c5e8: lw    v1, 28(s1)
+// 0x0101c5f8: 0x101c5f8: lw    v1, 28(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5381,7 +5381,7 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c5ec: 0x101c5ec: lw    t0, 76(s2)
+// 0x0101c5fc: 0x101c5fc: lw    t0, 76(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5390,7 +5390,7 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0101c5f0: 0x101c5f0: lw    v0, 36(s2)
+// 0x0101c600: 0x101c600: lw    v0, 36(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5399,15 +5399,15 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c5f4: 0x101c5f4: subu  v1, t0, v1
+// 0x0101c604: 0x101c604: subu  v1, t0, v1
 	ldloc 18
 	ldloc 7
 	sub
 	stloc 7
-// 0x0101c5f8: 0x101c5f8: mflo  lo
+// 0x0101c608: 0x101c608: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x0101c5fc: 0x101c5fc: sw    a1, 40(sp)
+// 0x0101c60c: 0x101c60c: sw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5416,16 +5416,16 @@ L_101c5a4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101c600: 0x101c600: sll   zero, zero, 0
-// 0x0101c604: 0x101c604: div   v1, v0
+// 0x0101c610: 0x101c610: sll   zero, zero, 0
+// 0x0101c614: 0x101c614: div   v1, v0
 	ldloc 7
 	ldloc 6
 	div
 	stloc 9
-// 0x0101c608: 0x101c608: mflo  lo
+// 0x0101c618: 0x101c618: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0101c60c: 0x101c60c: jal   0x10073c4 sw    v1, 44(sp)
+// 0x0101c61c: 0x101c61c: jal   0x10073d4 sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5439,12 +5439,12 @@ L_101c5a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c614: 0x101c614: lw    a0, 16(s1)
+// 0x0101c624: 0x101c624: lw    a0, 16(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5453,18 +5453,18 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c618: 0x101c618: jal   0x101c7d4 sll   zero, zero, 0
+// 0x0101c628: 0x101c628: jal   0x101c7e4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c620: 0x101c620: addu  a2, v0, zero
+// 0x0101c630: 0x101c630: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0101c624: 0x101c624: addu  a0, zero, zero
+// 0x0101c634: 0x101c634: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0101c628: 0x101c628: jal   0x10a1918 addiu a1, zero, 1
+// 0x0101c638: 0x101c638: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5472,45 +5472,45 @@ L_101c5a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c630: 0x101c630: addu  s7, v0, zero
+// 0x0101c640: 0x101c640: addu  s7, v0, zero
 	ldloc 6
 	stloc 16
-// 0x0101c634: 0x101c634: beq   v0, zero, 0x101c6d0 addu  a0, v0, zero
+// 0x0101c644: 0x101c644: beq   v0, zero, 0x101c6e0 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_101c6d0
+	brfalse L_101c6e0
 // --- basic block ---
-// 0x0101c63c: 0x101c63c: jal   0x104e020 sll   zero, zero, 0
+// 0x0101c64c: 0x101c64c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c644: 0x101c644: addu  a0, s7, zero
+// 0x0101c654: 0x101c654: addu  a0, s7, zero
 	ldloc 16
 	stloc.1
-// 0x0101c648: 0x101c648: jal   0x104dffc addu  s6, v0, zero
+// 0x0101c658: 0x101c658: jal   0x104e00c addu  s6, v0, zero
 	ldloc 6
 	stloc 14
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c650: 0x101c650: div   v0, s0
+// 0x0101c660: 0x101c660: div   v0, s0
 	ldloc 6
 	ldloc 11
 	div
 	stloc 9
-// 0x0101c654: 0x101c654: lw    a1, 44(s1)
+// 0x0101c664: 0x101c664: lw    a1, 44(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5519,7 +5519,7 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101c658: 0x101c658: lw    v1, 40(sp)
+// 0x0101c668: 0x101c668: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5528,57 +5528,57 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c65c: 0x101c65c: sll   zero, zero, 0
-// 0x0101c660: 0x101c660: addu  v1, a1, v1
+// 0x0101c66c: 0x101c66c: sll   zero, zero, 0
+// 0x0101c670: 0x101c670: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x0101c664: 0x101c664: mflo  lo
+// 0x0101c674: 0x101c674: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0101c668: 0x101c668: subu  a0, v1, a0
+// 0x0101c678: 0x101c678: subu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	sub
 	stloc.1
-// 0x0101c66c: 0x101c66c: slt   a0, s4, a0
+// 0x0101c67c: 0x101c67c: slt   a0, s4, a0
 	ldloc 13
 	ldloc.1
 	clt
 	stloc.1
-// 0x0101c670: 0x101c670: bne   a0, zero, 0x101c6d0 sll   zero, zero, 0
+// 0x0101c680: 0x101c680: bne   a0, zero, 0x101c6e0 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_101c6d0
+	brtrue L_101c6e0
 // --- basic block ---
-// 0x0101c678: 0x101c678: div   v0, s0
+// 0x0101c688: 0x101c688: div   v0, s0
 	ldloc 6
 	ldloc 11
 	div
 	stloc 9
-// 0x0101c67c: 0x101c67c: mflo  lo
+// 0x0101c68c: 0x101c68c: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0101c680: 0x101c680: addu  v1, v1, v0
+// 0x0101c690: 0x101c690: addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0101c684: 0x101c684: slt   v1, v1, s4
+// 0x0101c694: 0x101c694: slt   v1, v1, s4
 	ldloc 7
 	ldloc 13
 	clt
 	stloc 7
-// 0x0101c688: 0x101c688: bne   v1, zero, 0x101c6d0 sll   zero, zero, 0
+// 0x0101c698: 0x101c698: bne   v1, zero, 0x101c6e0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_101c6d0
+	brtrue L_101c6e0
 // --- basic block ---
-// 0x0101c690: 0x101c690: div   s6, s0
+// 0x0101c6a0: 0x101c6a0: div   s6, s0
 	ldloc 14
 	ldloc 11
 	div
 	stloc 9
-// 0x0101c694: 0x101c694: lw    a0, 48(s1)
+// 0x0101c6a4: 0x101c6a4: lw    a0, 48(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5587,7 +5587,7 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c698: 0x101c698: lw    v0, 44(sp)
+// 0x0101c6a8: 0x101c6a8: lw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5596,53 +5596,53 @@ L_101c5a4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c69c: 0x101c69c: sll   zero, zero, 0
-// 0x0101c6a0: 0x101c6a0: addu  v0, a0, v0
+// 0x0101c6ac: 0x101c6ac: sll   zero, zero, 0
+// 0x0101c6b0: 0x101c6b0: addu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x0101c6a4: 0x101c6a4: mflo  lo
+// 0x0101c6b4: 0x101c6b4: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0101c6a8: 0x101c6a8: subu  v1, v0, v1
+// 0x0101c6b8: 0x101c6b8: subu  v1, v0, v1
 	ldloc 6
 	ldloc 7
 	sub
 	stloc 7
-// 0x0101c6ac: 0x101c6ac: slt   v1, s3, v1
+// 0x0101c6bc: 0x101c6bc: slt   v1, s3, v1
 	ldloc 12
 	ldloc 7
 	clt
 	stloc 7
-// 0x0101c6b0: 0x101c6b0: bne   v1, zero, 0x101c6d0 sll   zero, zero, 0
+// 0x0101c6c0: 0x101c6c0: bne   v1, zero, 0x101c6e0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_101c6d0
+	brtrue L_101c6e0
 // --- basic block ---
-// 0x0101c6b8: 0x101c6b8: div   s6, s0
+// 0x0101c6c8: 0x101c6c8: div   s6, s0
 	ldloc 14
 	ldloc 11
 	div
 	stloc 9
-// 0x0101c6bc: 0x101c6bc: mflo  lo
+// 0x0101c6cc: 0x101c6cc: mflo  lo
 	ldloc 9
 	stloc 14
-// 0x0101c6c0: 0x101c6c0: addu  v0, v0, s6
+// 0x0101c6d0: 0x101c6d0: addu  v0, v0, s6
 	ldloc 6
 	ldloc 14
 	add
 	stloc 6
-// 0x0101c6c4: 0x101c6c4: slt   v0, v0, s3
+// 0x0101c6d4: 0x101c6d4: slt   v0, v0, s3
 	ldloc 6
 	ldloc 12
 	clt
 	stloc 6
-// 0x0101c6c8: 0x101c6c8: beq   v0, zero, 0x101c6e8 sll   zero, zero, 0
+// 0x0101c6d8: 0x101c6d8: beq   v0, zero, 0x101c6f8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101c6e8
+	brfalse L_101c6f8
 // --- basic block ---
-L_101c6d0:
-// 0x0101c6d0: 0x101c6d0: lw    s1, 96(s1)
+L_101c6e0:
+// 0x0101c6e0: 0x101c6e0: lw    s1, 96(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5651,21 +5651,21 @@ L_101c6d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c6d4: 0x101c6d4: sll   zero, zero, 0
-L_101c6d8:
-// 0x0101c6d8: 0x101c6d8: bne   s1, zero, 0x101c5a4 addu  a0, s1, zero
+// 0x0101c6e4: 0x101c6e4: sll   zero, zero, 0
+L_101c6e8:
+// 0x0101c6e8: 0x101c6e8: bne   s1, zero, 0x101c5b4 addu  a0, s1, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
-	brtrue L_101c5a4
+	brtrue L_101c5b4
 // --- basic block ---
-// 0x0101c6e0: 0x101c6e0: j	 0x101c784 addu  v0, zero, zero
+// 0x0101c6f0: 0x101c6f0: j	 0x101c794 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_101c784
+	br L_101c794
 // --- basic block ---
-L_101c6e8:
-// 0x0101c6e8: 0x101c6e8: lw    s0, 56(s1)
+L_101c6f8:
+// 0x0101c6f8: 0x101c6f8: lw    s0, 56(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5674,14 +5674,14 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c6ec: 0x101c6ec: sll   zero, zero, 0
-// 0x0101c6f0: 0x101c6f0: beq   s0, zero, 0x101c784 addiu v0, zero, 1
+// 0x0101c6fc: 0x101c6fc: sll   zero, zero, 0
+// 0x0101c700: 0x101c700: beq   s0, zero, 0x101c794 addiu v0, zero, 1
 	ldloc 11
 	ldc.i4.1
 	stloc 6
-	brfalse L_101c784
+	brfalse L_101c794
 // --- basic block ---
-// 0x0101c6f8: 0x101c6f8: lw    a0, 8(s1)
+// 0x0101c708: 0x101c708: lw    a0, 8(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5690,12 +5690,12 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c6fc: 0x101c6fc: jal   0x101c7d4 sll   zero, zero, 0
+// 0x0101c70c: 0x101c70c: jal   0x101c7e4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c704: 0x101c704: lw    a0, 12(s1)
+// 0x0101c714: 0x101c714: lw    a0, 12(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5704,14 +5704,14 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c708: 0x101c708: jal   0x101c7d4 addu  s2, v0, zero
+// 0x0101c718: 0x101c718: jal   0x101c7e4 addu  s2, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c710: 0x101c710: lw    a0, 16(s1)
+// 0x0101c720: 0x101c720: lw    a0, 16(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5720,7 +5720,7 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c714: 0x101c714: jal   0x101c7d4 sw    v0, 52(sp)
+// 0x0101c724: 0x101c724: jal   0x101c7e4 sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5730,10 +5730,10 @@ L_101c6e8:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c71c: 0x101c71c: lw    a0, 4(s1)
+// 0x0101c72c: 0x101c72c: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5742,7 +5742,7 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c720: 0x101c720: lw    s5, 76(s1)
+// 0x0101c730: 0x101c730: lw    s5, 76(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5751,7 +5751,7 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101c724: 0x101c724: lw    s4, 80(s1)
+// 0x0101c734: 0x101c734: lw    s4, 80(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5760,7 +5760,7 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101c728: 0x101c728: jal   0x101c7d4 sw    v0, 48(sp)
+// 0x0101c738: 0x101c738: jal   0x101c7e4 sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5770,10 +5770,10 @@ L_101c6e8:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c730: 0x101c730: lw    a0, 20(s1)
+// 0x0101c740: 0x101c740: lw    a0, 20(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5782,14 +5782,14 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101c734: 0x101c734: jal   0x101c7d4 addu  s3, v0, zero
+// 0x0101c744: 0x101c744: jal   0x101c7e4 addu  s3, v0, zero
 	ldloc 6
 	stloc 12
 	ldloc.1
-	call int32 Cibyl20::roadmap_string_get_101c7d4(int32)
+	call int32 Cibyl20::roadmap_string_get_101c7e4(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101c73c: 0x101c73c: sw    v0, 36(sp)
+// 0x0101c74c: 0x101c74c: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5798,15 +5798,15 @@ L_101c6e8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c740: 0x101c740: addiu v1, s1, 44
+// 0x0101c750: 0x101c750: addiu v1, s1, 44
 	ldloc 8
 	ldc.i4.s 44
 	add
 	stloc 7
-// 0x0101c744: 0x101c744: addiu v0, zero, 1
+// 0x0101c754: 0x101c754: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0101c748: 0x101c748: lw    a1, 52(sp)
+// 0x0101c758: 0x101c758: lw    a1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5815,7 +5815,7 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101c74c: 0x101c74c: lw    a2, 48(sp)
+// 0x0101c75c: 0x101c75c: lw    a2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5824,7 +5824,7 @@ L_101c6e8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101c750: 0x101c750: sw    v0, 20(sp)
+// 0x0101c760: 0x101c760: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5833,7 +5833,7 @@ L_101c6e8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c754: 0x101c754: sw    v1, 16(sp)
+// 0x0101c764: 0x101c764: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5842,15 +5842,15 @@ L_101c6e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c758: 0x101c758: addu  a0, s2, zero
+// 0x0101c768: 0x101c768: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0101c75c: 0x101c75c: addiu a3, s1, 24
+// 0x0101c76c: 0x101c76c: addiu a3, s1, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x0101c760: 0x101c760: sw    s5, 24(sp)
+// 0x0101c770: 0x101c770: sw    s5, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5859,7 +5859,7 @@ L_101c6e8:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101c764: 0x101c764: sw    s4, 28(sp)
+// 0x0101c774: 0x101c774: sw    s4, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5868,7 +5868,7 @@ L_101c6e8:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101c768: 0x101c768: jalr  s0 sw    s3, 32(sp)
+// 0x0101c778: 0x101c778: jalr  s0 sw    s3, 32(sp)
 	ldloc 11
 	ldloc 5
 	ldloc.0
@@ -5888,29 +5888,29 @@ L_101c6e8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c770: 0x101c770: jal   0x10256e4 sll   zero, zero, 0
+// 0x0101c780: 0x101c780: jal   0x10256f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_screen_touched_10256e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_screen_touched_10256f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101c778: 0x101c778: j	 0x101c784 addiu v0, zero, 1
+// 0x0101c788: 0x101c788: j	 0x101c794 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_101c784
+	br L_101c794
 // --- basic block ---
-L_101c780:
-// 0x0101c780: 0x101c780: addu  v0, zero, zero
+L_101c790:
+// 0x0101c790: 0x101c790: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_101c784:
-// 0x0101c784: 0x101c784: lw    ra, 92(sp)
-// 0x0101c788: 0x101c788: lw    s7, 88(sp)
+L_101c794:
+// 0x0101c794: 0x101c794: lw    ra, 92(sp)
+// 0x0101c798: 0x101c798: lw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5919,7 +5919,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101c78c: 0x101c78c: lw    s6, 84(sp)
+// 0x0101c79c: 0x101c79c: lw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5928,7 +5928,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101c790: 0x101c790: lw    s5, 80(sp)
+// 0x0101c7a0: 0x101c7a0: lw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5937,7 +5937,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101c794: 0x101c794: lw    s4, 76(sp)
+// 0x0101c7a4: 0x101c7a4: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5946,7 +5946,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101c798: 0x101c798: lw    s3, 72(sp)
+// 0x0101c7a8: 0x101c7a8: lw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5955,7 +5955,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101c79c: 0x101c79c: lw    s2, 68(sp)
+// 0x0101c7ac: 0x101c7ac: lw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5964,7 +5964,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101c7a0: 0x101c7a0: lw    s1, 64(sp)
+// 0x0101c7b0: 0x101c7b0: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5973,7 +5973,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c7a4: 0x101c7a4: lw    s0, 60(sp)
+// 0x0101c7b4: 0x101c7b4: lw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5982,7 +5982,7 @@ L_101c784:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c7a8: 0x101c7a8: jr    ra addiu sp, sp, 96
+// 0x0101c7b8: 0x101c7b8: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -5994,7 +5994,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_string_lock_101c7b0(int32)
+.method public static int32 roadmap_string_lock_101c7c0(int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6017,37 +6017,37 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c7b0: 0x101c7b0: beq   a0, zero, 0x101c7cc ori   v1, zero, 65535
+// 0x0101c7c0: 0x101c7c0: beq   a0, zero, 0x101c7dc ori   v1, zero, 65535
 	ldloc.0
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc.2
-	brfalse L_101c7cc
-// 0x0101c7b8: 0x101c7b8: lhu   v0, 8(a0)
+	brfalse L_101c7dc
+// 0x0101c7c8: 0x101c7c8: lhu   v0, 8(a0)
 	ldloc.0
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x0101c7bc: 0x101c7bc: sll   zero, zero, 0
-// 0x0101c7c0: 0x101c7c0: beq   v0, v1, 0x101c7cc addiu v0, v0, 1
+// 0x0101c7cc: 0x101c7cc: sll   zero, zero, 0
+// 0x0101c7d0: 0x101c7d0: beq   v0, v1, 0x101c7dc addiu v0, v0, 1
 	ldloc.1
 	ldloc.2
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	beq  L_101c7cc
+	beq  L_101c7dc
 // --- basic block ---
-// 0x0101c7c8: 0x101c7c8: sh    v0, 8(a0)
+// 0x0101c7d8: 0x101c7d8: sh    v0, 8(a0)
 	ldloc.0
 	ldc.i4.8
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_101c7cc:
-// 0x0101c7cc: 0x101c7cc: jr    ra sll   zero, zero, 0
+L_101c7dc:
+// 0x0101c7dc: 0x101c7dc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -6055,7 +6055,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_string_get_101c7d4(int32)
+.method public static int32 roadmap_string_get_101c7e4(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -6072,21 +6072,21 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c7d4: 0x101c7d4: sltu  v0, zero, a0
+// 0x0101c7e4: 0x101c7e4: sltu  v0, zero, a0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
 	stloc.1
-// 0x0101c7d8: 0x101c7d8: subu  v0, zero, v0
+// 0x0101c7e8: 0x101c7e8: subu  v0, zero, v0
 	ldloc.1
 	neg
 	stloc.1
-// 0x0101c7dc: 0x101c7dc: addiu a0, a0, 11
+// 0x0101c7ec: 0x101c7ec: addiu a0, a0, 11
 	ldloc.0
 	ldc.i4.s 11
 	add
 	stloc.0
-// 0x0101c7e0: 0x101c7e0: jr    ra and   v0, a0, v0
+// 0x0101c7f0: 0x101c7f0: jr    ra and   v0, a0, v0
 	ldloc.0
 	ldloc.1
 	and
@@ -6096,7 +6096,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_string_compare_ignore_case_101c7e8(int32,int32)
+.method public static int32 roadmap_string_compare_ignore_case_101c7f8(int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6122,43 +6122,43 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c7e8: 0x101c7e8: j	 0x101c7f8 sll   zero, zero, 0
-	br L_101c7f8
-L_101c7f0:
-// 0x0101c7f0: 0x101c7f0: beq   v0, zero, 0x101c810 addiu a1, a1, 1
+// 0x0101c7f8: 0x101c7f8: j	 0x101c808 sll   zero, zero, 0
+	br L_101c808
+L_101c800:
+// 0x0101c800: 0x101c800: beq   v0, zero, 0x101c820 addiu a1, a1, 1
 	ldloc.2
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brfalse L_101c810
+	brfalse L_101c820
 // --- basic block ---
-L_101c7f8:
-// 0x0101c7f8: 0x101c7f8: lb    v0, 0(a0)
+L_101c808:
+// 0x0101c808: 0x101c808: lb    v0, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0101c7fc: 0x101c7fc: lb    v1, 0(a1)
+// 0x0101c80c: 0x101c80c: lb    v1, 0(a1)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0101c800: 0x101c800: sll   zero, zero, 0
-// 0x0101c804: 0x101c804: beq   v0, v1, 0x101c7f0 addiu a0, a0, 1
+// 0x0101c810: 0x101c810: sll   zero, zero, 0
+// 0x0101c814: 0x101c814: beq   v0, v1, 0x101c800 addiu a0, a0, 1
 	ldloc.2
 	ldloc.3
 	ldloc.0
 	ldc.i4.1
 	add
 	stloc.0
-	beq  L_101c7f0
+	beq  L_101c800
 // --- basic block ---
-// 0x0101c80c: 0x101c80c: subu  v0, v0, v1
+// 0x0101c81c: 0x101c81c: subu  v0, v0, v1
 	ldloc.2
 	ldloc.3
 	sub
 	stloc.2
-L_101c810:
-// 0x0101c810: 0x101c810: jr    ra sll   zero, zero, 0
+L_101c820:
+// 0x0101c820: 0x101c820: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -6166,7 +6166,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_string_is_sub_ignore_case_101c818(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_string_is_sub_ignore_case_101c828(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra,int32 v1)
@@ -6216,12 +6216,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c818: 0x101c818: addiu sp, sp, -48
+// 0x0101c828: 0x101c828: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101c81c: 0x101c81c: sw    s0, 24(sp)
+// 0x0101c82c: 0x101c82c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6230,8 +6230,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c820: 0x101c820: sw    ra, 44(sp)
-// 0x0101c824: 0x101c824: sw    s4, 40(sp)
+// 0x0101c830: 0x101c830: sw    ra, 44(sp)
+// 0x0101c834: 0x101c834: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6240,7 +6240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101c828: 0x101c828: sw    s3, 36(sp)
+// 0x0101c838: 0x101c838: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6249,7 +6249,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101c82c: 0x101c82c: sw    s2, 32(sp)
+// 0x0101c83c: 0x101c83c: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6258,7 +6258,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101c830: 0x101c830: sw    s1, 28(sp)
+// 0x0101c840: 0x101c840: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6267,24 +6267,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101c834: 0x101c834: lb    v0, 0(a1)
+// 0x0101c844: 0x101c844: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101c838: 0x101c838: sll   zero, zero, 0
-// 0x0101c83c: 0x101c83c: bne   v0, zero, 0x101c890 addu  s0, a0, zero
+// 0x0101c848: 0x101c848: sll   zero, zero, 0
+// 0x0101c84c: 0x101c84c: bne   v0, zero, 0x101c8a0 addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brtrue L_101c890
+	brtrue L_101c8a0
 // --- basic block ---
-// 0x0101c844: 0x101c844: j	 0x101c8ac addiu v0, zero, 1
+// 0x0101c854: 0x101c854: j	 0x101c8bc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_101c8ac
+	br L_101c8bc
 // --- basic block ---
-L_101c84c:
-// 0x0101c84c: 0x101c84c: jal   0x1000364 sw    a1, 16(sp)
+L_101c85c:
+// 0x0101c85c: 0x101c85c: jal   0x1000364 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6299,10 +6299,10 @@ L_101c84c:
 	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x0101c854: 0x101c854: addu  a0, s3, zero
+// 0x0101c864: 0x101c864: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0101c858: 0x101c858: jal   0x1000364 addu  s4, v0, zero
+// 0x0101c868: 0x101c868: jal   0x1000364 addu  s4, v0, zero
 	ldloc 6
 	stloc 11
 	ldloc.1
@@ -6311,7 +6311,7 @@ L_101c84c:
 	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x0101c860: 0x101c860: lw    a1, 16(sp)
+// 0x0101c870: 0x101c870: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6320,70 +6320,70 @@ L_101c84c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101c864: 0x101c864: bne   s4, v0, 0x101c88c sll   zero, zero, 0
+// 0x0101c874: 0x101c874: bne   s4, v0, 0x101c89c sll   zero, zero, 0
 	ldloc 11
 	ldloc 6
-	bne.un L_101c88c
+	bne.un L_101c89c
 // --- basic block ---
-L_101c86c:
-// 0x0101c86c: 0x101c86c: lb    v0, 0(s1)
+L_101c87c:
+// 0x0101c87c: 0x101c87c: lb    v0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101c870: 0x101c870: addiu s1, s1, 1
+// 0x0101c880: 0x101c880: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0101c874: 0x101c874: beq   v0, zero, 0x101c8a8 addu  a0, v0, zero
+// 0x0101c884: 0x101c884: beq   v0, zero, 0x101c8b8 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_101c8a8
+	brfalse L_101c8b8
 // --- basic block ---
-// 0x0101c87c: 0x101c87c: lb    s3, 0(s2)
+// 0x0101c88c: 0x101c88c: lb    s3, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x0101c880: 0x101c880: sll   zero, zero, 0
-// 0x0101c884: 0x101c884: bne   s3, zero, 0x101c84c addiu s2, s2, 1
+// 0x0101c890: 0x101c890: sll   zero, zero, 0
+// 0x0101c894: 0x101c894: bne   s3, zero, 0x101c85c addiu s2, s2, 1
 	ldloc 10
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brtrue L_101c84c
+	brtrue L_101c85c
 // --- basic block ---
-L_101c88c:
-// 0x0101c88c: 0x101c88c: addiu s0, s0, 1
+L_101c89c:
+// 0x0101c89c: 0x101c89c: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_101c890:
-// 0x0101c890: 0x101c890: lb    v0, 0(s0)
+L_101c8a0:
+// 0x0101c8a0: 0x101c8a0: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101c894: 0x101c894: sll   zero, zero, 0
-// 0x0101c898: 0x101c898: beq   v0, zero, 0x101c8ac addu  s2, s0, zero
+// 0x0101c8a4: 0x101c8a4: sll   zero, zero, 0
+// 0x0101c8a8: 0x101c8a8: beq   v0, zero, 0x101c8bc addu  s2, s0, zero
 	ldloc 6
 	ldloc 7
 	stloc 9
-	brfalse L_101c8ac
+	brfalse L_101c8bc
 // --- basic block ---
-// 0x0101c8a0: 0x101c8a0: j	 0x101c86c addu  s1, a1, zero
+// 0x0101c8b0: 0x101c8b0: j	 0x101c87c addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-	br L_101c86c
+	br L_101c87c
 // --- basic block ---
-L_101c8a8:
-// 0x0101c8a8: 0x101c8a8: addiu v0, zero, 1
+L_101c8b8:
+// 0x0101c8b8: 0x101c8b8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_101c8ac:
-// 0x0101c8ac: 0x101c8ac: lw    ra, 44(sp)
-// 0x0101c8b0: 0x101c8b0: lw    s4, 40(sp)
+L_101c8bc:
+// 0x0101c8bc: 0x101c8bc: lw    ra, 44(sp)
+// 0x0101c8c0: 0x101c8c0: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6392,7 +6392,7 @@ L_101c8ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101c8b4: 0x101c8b4: lw    s3, 36(sp)
+// 0x0101c8c4: 0x101c8c4: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6401,7 +6401,7 @@ L_101c8ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101c8b8: 0x101c8b8: lw    s2, 32(sp)
+// 0x0101c8c8: 0x101c8c8: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6410,7 +6410,7 @@ L_101c8ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101c8bc: 0x101c8bc: lw    s1, 28(sp)
+// 0x0101c8cc: 0x101c8cc: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6419,7 +6419,7 @@ L_101c8ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c8c0: 0x101c8c0: lw    s0, 24(sp)
+// 0x0101c8d0: 0x101c8d0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6428,7 +6428,7 @@ L_101c8ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c8c4: 0x101c8c4: jr    ra addiu sp, sp, 48
+// 0x0101c8d4: 0x101c8d4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6440,7 +6440,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6475,50 +6475,50 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c8f8: 0x101c8f8: addiu sp, sp, -24
+// 0x0101c908: 0x101c908: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101c8fc: 0x101c8fc: beq   a0, zero, 0x101c96c sw    ra, 20(sp)
+// 0x0101c90c: 0x101c90c: beq   a0, zero, 0x101c97c sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_101c96c
+	brfalse L_101c97c
 // --- basic block ---
-// 0x0101c904: 0x101c904: lhu   v0, 8(a0)
+// 0x0101c914: 0x101c914: lhu   v0, 8(a0)
 	ldloc.1
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x0101c908: 0x101c908: ori   v1, zero, 65535
+// 0x0101c918: 0x101c918: ori   v1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-// 0x0101c90c: 0x101c90c: beq   v0, v1, 0x101c96c addiu v0, v0, -1
+// 0x0101c91c: 0x101c91c: beq   v0, v1, 0x101c97c addiu v0, v0, -1
 	ldloc 5
 	ldloc 6
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-	beq  L_101c96c
+	beq  L_101c97c
 // --- basic block ---
-// 0x0101c914: 0x101c914: andi  v0, v0, 65535
+// 0x0101c924: 0x101c924: andi  v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	and
 	stloc 5
-// 0x0101c918: 0x101c918: bne   v0, zero, 0x101c96c sh    v0, 8(a0)
+// 0x0101c928: 0x101c928: bne   v0, zero, 0x101c97c sh    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.8
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	brtrue L_101c96c
+	brtrue L_101c97c
 // --- basic block ---
-// 0x0101c920: 0x101c920: lw    v1, 4(a0)
+// 0x0101c930: 0x101c930: lw    v1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6527,62 +6527,62 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c924: 0x101c924: lw    v0, 0(a0)
+// 0x0101c934: 0x101c934: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101c928: 0x101c928: bne   v1, zero, 0x101c944 sll   zero, zero, 0
+// 0x0101c938: 0x101c938: bne   v1, zero, 0x101c954 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101c944
+	brtrue L_101c954
 // --- basic block ---
-// 0x0101c930: 0x101c930: lbu   a1, 10(a0)
+// 0x0101c940: 0x101c940: lbu   a1, 10(a0)
 	ldloc.1
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x0101c934: 0x101c934: lui   v1, 0x30000
+// 0x0101c944: 0x101c944: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101c938: 0x101c938: sll   a1, a1, 2
+// 0x0101c948: 0x101c948: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0101c93c: 0x101c93c: addiu v1, v1, 27096
+// 0x0101c94c: 0x101c94c: addiu v1, v1, 27560
 	ldloc 6
-	ldc.i4 27096
+	ldc.i4 27560
 	add
 	stloc 6
-// 0x0101c940: 0x101c940: addu  v1, a1, v1
+// 0x0101c950: 0x101c950: addu  v1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-L_101c944:
-// 0x0101c944: 0x101c944: sw    v0, 0(v1)
+L_101c954:
+// 0x0101c954: 0x101c954: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0101c948: 0x101c948: lw    v0, 0(a0)
+// 0x0101c958: 0x101c958: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101c94c: 0x101c94c: sll   zero, zero, 0
-// 0x0101c950: 0x101c950: beq   v0, zero, 0x101c964 sll   zero, zero, 0
+// 0x0101c95c: 0x101c95c: sll   zero, zero, 0
+// 0x0101c960: 0x101c960: beq   v0, zero, 0x101c974 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101c964
+	brfalse L_101c974
 // --- basic block ---
-// 0x0101c958: 0x101c958: lw    v1, 4(a0)
+// 0x0101c968: 0x101c968: lw    v1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6591,8 +6591,8 @@ L_101c944:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101c95c: 0x101c95c: sll   zero, zero, 0
-// 0x0101c960: 0x101c960: sw    v1, 4(v0)
+// 0x0101c96c: 0x101c96c: sll   zero, zero, 0
+// 0x0101c970: 0x101c970: sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6601,8 +6601,8 @@ L_101c944:
 	add
 	ldloc 6
 	stelem.i4
-L_101c964:
-// 0x0101c964: 0x101c964: jal   0x1000930 sll   zero, zero, 0
+L_101c974:
+// 0x0101c974: 0x101c974: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6613,10 +6613,10 @@ L_101c964:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_101c96c:
-// 0x0101c96c: 0x101c96c: lw    ra, 20(sp)
-// 0x0101c970: 0x101c970: sll   zero, zero, 0
-// 0x0101c974: 0x101c974: jr    ra addiu sp, sp, 24
+L_101c97c:
+// 0x0101c97c: 0x101c97c: lw    ra, 20(sp)
+// 0x0101c980: 0x101c980: sll   zero, zero, 0
+// 0x0101c984: 0x101c984: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6628,7 +6628,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_string_release_all_101c97c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_string_release_all_101c98c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s2,int32 s3,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -6675,12 +6675,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101c97c: 0x101c97c: addiu sp, sp, -40
+// 0x0101c98c: 0x101c98c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101c980: 0x101c980: sw    s1, 24(sp)
+// 0x0101c990: 0x101c990: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6689,7 +6689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101c984: 0x101c984: sw    s0, 20(sp)
+// 0x0101c994: 0x101c994: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6698,14 +6698,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101c988: 0x101c988: addu  s1, a0, zero
+// 0x0101c998: 0x101c998: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0101c98c: 0x101c98c: addu  s0, a0, zero
+// 0x0101c99c: 0x101c99c: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0101c990: 0x101c990: sw    ra, 36(sp)
-// 0x0101c994: 0x101c994: sw    s3, 32(sp)
+// 0x0101c9a0: 0x101c9a0: sw    ra, 36(sp)
+// 0x0101c9a4: 0x101c9a4: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6714,7 +6714,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101c998: 0x101c998: sw    s2, 28(sp)
+// 0x0101c9a8: 0x101c9a8: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6723,17 +6723,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101c99c: 0x101c99c: j	 0x101c9e0 addu  a0, zero, zero
+// 0x0101c9ac: 0x101c9ac: j	 0x101c9f0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_101c9e0
+	br L_101c9f0
 // --- basic block ---
-L_101c9a4:
-// 0x0101c9a4: 0x101c9a4: beq   a0, zero, 0x101c9b4 sll   zero, zero, 0
+L_101c9b4:
+// 0x0101c9b4: 0x101c9b4: beq   a0, zero, 0x101c9c4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101c9b4
+	brfalse L_101c9c4
 // --- basic block ---
-// 0x0101c9ac: 0x101c9ac: jal   0x1000930 sll   zero, zero, 0
+// 0x0101c9bc: 0x101c9bc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6744,8 +6744,8 @@ L_101c9a4:
 	stloc 12
 	stloc 11
 // --- basic block ---
-L_101c9b4:
-// 0x0101c9b4: 0x101c9b4: lw    s2, 4(s0)
+L_101c9c4:
+// 0x0101c9c4: 0x101c9c4: lw    s2, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6754,22 +6754,22 @@ L_101c9b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c9b8: 0x101c9b8: j	 0x101c9d0 addiu s3, s0, 8
+// 0x0101c9c8: 0x101c9c8: j	 0x101c9e0 addiu s3, s0, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 8
-	br L_101c9d0
+	br L_101c9e0
 // --- basic block ---
-L_101c9c0:
-// 0x0101c9c0: 0x101c9c0: lw    a0, 0(s3)
+L_101c9d0:
+// 0x0101c9d0: 0x101c9d0: lw    a0, 0(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0101c9c4: 0x101c9c4: jal   0x101c8f8 addiu s2, s2, -1
+// 0x0101c9d4: 0x101c9d4: jal   0x101c908 addiu s2, s2, -1
 	ldloc 7
 	ldc.i4.m1
 	add
@@ -6779,46 +6779,46 @@ L_101c9c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 11
 // --- basic block ---
-// 0x0101c9cc: 0x101c9cc: addiu s3, s3, 4
+// 0x0101c9dc: 0x101c9dc: addiu s3, s3, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_101c9d0:
-// 0x0101c9d0: 0x101c9d0: bgtz  s2, 0x101c9c0 addu  a0, s0, zero
+L_101c9e0:
+// 0x0101c9e0: 0x101c9e0: bgtz  s2, 0x101c9d0 addu  a0, s0, zero
 	ldloc 7
 	ldloc 6
 	stloc.1
 	ldc.i4.s 0
-	bgt L_101c9c0
+	bgt L_101c9d0
 // --- basic block ---
-// 0x0101c9d8: 0x101c9d8: lw    s0, 0(s0)
+// 0x0101c9e8: 0x101c9e8: lw    s0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101c9dc: 0x101c9dc: sll   zero, zero, 0
-L_101c9e0:
-// 0x0101c9e0: 0x101c9e0: bne   s0, zero, 0x101c9a4 sll   zero, zero, 0
+// 0x0101c9ec: 0x101c9ec: sll   zero, zero, 0
+L_101c9f0:
+// 0x0101c9f0: 0x101c9f0: bne   s0, zero, 0x101c9b4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101c9a4
+	brtrue L_101c9b4
 // --- basic block ---
-// 0x0101c9e8: 0x101c9e8: lw    ra, 36(sp)
-// 0x0101c9ec: 0x101c9ec: sw    zero, 0(s1)
+// 0x0101c9f8: 0x101c9f8: lw    ra, 36(sp)
+// 0x0101c9fc: 0x101c9fc: sw    zero, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101c9f0: 0x101c9f0: sw    zero, 4(s1)
+// 0x0101ca00: 0x101ca00: sw    zero, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -6827,7 +6827,7 @@ L_101c9e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101c9f4: 0x101c9f4: lw    s3, 32(sp)
+// 0x0101ca04: 0x101ca04: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6836,7 +6836,7 @@ L_101c9e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101c9f8: 0x101c9f8: lw    s2, 28(sp)
+// 0x0101ca08: 0x101ca08: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6845,7 +6845,7 @@ L_101c9e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101c9fc: 0x101c9fc: lw    s1, 24(sp)
+// 0x0101ca0c: 0x101ca0c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6854,7 +6854,7 @@ L_101c9e0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101ca00: 0x101ca00: lw    s0, 20(sp)
+// 0x0101ca10: 0x101ca10: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6863,7 +6863,7 @@ L_101c9e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101ca04: 0x101ca04: jr    ra addiu sp, sp, 40
+// 0x0101ca14: 0x101ca14: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl21.j b/converted/Cibyl21.j
index 488b4b0..0c2da75 100644
--- a/converted/Cibyl21.j
+++ b/converted/Cibyl21.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl21::.ctor
 
-.method public static int32 roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s2,int32 s1,int32 ra,int32 hi,int32 lo)
@@ -94,12 +94,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ca0c: 0x101ca0c: addiu sp, sp, -40
+// 0x0101ca1c: 0x101ca1c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101ca10: 0x101ca10: sw    s3, 32(sp)
+// 0x0101ca20: 0x101ca20: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -108,7 +108,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101ca14: 0x101ca14: sw    s2, 28(sp)
+// 0x0101ca24: 0x101ca24: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -117,7 +117,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101ca18: 0x101ca18: sw    s1, 24(sp)
+// 0x0101ca28: 0x101ca28: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -126,11 +126,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101ca1c: 0x101ca1c: addu  s2, a0, zero
+// 0x0101ca2c: 0x101ca2c: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0101ca20: 0x101ca20: sw    ra, 36(sp)
-// 0x0101ca24: 0x101ca24: jal   0x1001b48 sw    s0, 20(sp)
+// 0x0101ca30: 0x101ca30: sw    ra, 36(sp)
+// 0x0101ca34: 0x101ca34: jal   0x1001b48 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -145,65 +145,65 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ca2c: 0x101ca2c: addu  s1, v0, zero
+// 0x0101ca3c: 0x101ca3c: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0101ca30: 0x101ca30: addiu v1, v0, -1
+// 0x0101ca40: 0x101ca40: addiu v1, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0101ca34: 0x101ca34: lb    s3, 0(s2)
+// 0x0101ca44: 0x101ca44: lb    s3, 0(s2)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x0101ca38: 0x101ca38: addu  v0, s2, v0
+// 0x0101ca48: 0x101ca48: addu  v0, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x0101ca3c: 0x101ca3c: j	 0x101ca58 addiu a0, zero, 9
+// 0x0101ca4c: 0x101ca4c: j	 0x101ca68 addiu a0, zero, 9
 	ldc.i4.s 9
 	stloc.1
-	br L_101ca58
+	br L_101ca68
 // --- basic block ---
-L_101ca44:
-// 0x0101ca44: 0x101ca44: mult  s3, a0
+L_101ca54:
+// 0x0101ca54: 0x101ca54: mult  s3, a0
 	ldloc 9
 	ldloc.1
 	mul
 	stloc 14
-// 0x0101ca48: 0x101ca48: lb    a1, 0(v0)
+// 0x0101ca58: 0x101ca58: lb    a1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0101ca4c: 0x101ca4c: addiu v1, v1, -1
+// 0x0101ca5c: 0x101ca5c: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0101ca50: 0x101ca50: mflo  lo
+// 0x0101ca60: 0x101ca60: mflo  lo
 	ldloc 14
 	stloc 9
-// 0x0101ca54: 0x101ca54: addu  s3, s3, a1
+// 0x0101ca64: 0x101ca64: addu  s3, s3, a1
 	ldloc 9
 	ldloc.2
 	add
 	stloc 9
-L_101ca58:
-// 0x0101ca58: 0x101ca58: bgtz  v1, 0x101ca44 addiu v0, v0, -1
+L_101ca68:
+// 0x0101ca68: 0x101ca68: bgtz  v1, 0x101ca54 addiu v0, v0, -1
 	ldloc 7
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
 	ldc.i4.s 0
-	bgt L_101ca44
+	bgt L_101ca54
 // --- basic block ---
-// 0x0101ca60: 0x101ca60: addiu v0, zero, 253
+// 0x0101ca70: 0x101ca70: addiu v0, zero, 253
 	ldc.i4 253
 	stloc 5
-// 0x0101ca64: 0x101ca64: divu  s3, v0
+// 0x0101ca74: 0x101ca74: divu  s3, v0
 	ldloc 9
 	ldloc 5
 	div.un
@@ -212,106 +212,106 @@ L_101ca58:
 	ldloc 5
 	rem.un
 	stloc 13
-// 0x0101ca68: 0x101ca68: lui   v0, 0x30000
+// 0x0101ca78: 0x101ca78: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101ca6c: 0x101ca6c: addiu v0, v0, 27096
+// 0x0101ca7c: 0x101ca7c: addiu v0, v0, 27560
 	ldloc 5
-	ldc.i4 27096
+	ldc.i4 27560
 	add
 	stloc 5
-// 0x0101ca70: 0x101ca70: mfhi  hi
+// 0x0101ca80: 0x101ca80: mfhi  hi
 	ldloc 13
 	stloc 9
-// 0x0101ca74: 0x101ca74: sll   v1, s3, 2
+// 0x0101ca84: 0x101ca84: sll   v1, s3, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0101ca78: 0x101ca78: addu  v0, v1, v0
+// 0x0101ca88: 0x101ca88: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0101ca7c: 0x101ca7c: lw    s0, 0(v0)
+// 0x0101ca8c: 0x101ca8c: lw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0101ca80: 0x101ca80: j	 0x101caa4 addiu a1, s0, 11
+// 0x0101ca90: 0x101ca90: j	 0x101cab4 addiu a1, s0, 11
 	ldloc 8
 	ldc.i4.s 11
 	add
 	stloc.2
-	br L_101caa4
+	br L_101cab4
 // --- basic block ---
-L_101ca88:
-// 0x0101ca88: 0x101ca88: jal   0x1001b14 sll   zero, zero, 0
+L_101ca98:
+// 0x0101ca98: 0x101ca98: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101ca90: 0x101ca90: beq   v0, zero, 0x101cab4 ori   v1, zero, 65535
+// 0x0101caa0: 0x101caa0: beq   v0, zero, 0x101cac4 ori   v1, zero, 65535
 	ldloc 5
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 7
-	brfalse L_101cab4
+	brfalse L_101cac4
 // --- basic block ---
-// 0x0101ca98: 0x101ca98: lw    s0, 0(s0)
+// 0x0101caa8: 0x101caa8: lw    s0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0101ca9c: 0x101ca9c: sll   zero, zero, 0
-// 0x0101caa0: 0x101caa0: addiu a1, s0, 11
+// 0x0101caac: 0x101caac: sll   zero, zero, 0
+// 0x0101cab0: 0x101cab0: addiu a1, s0, 11
 	ldloc 8
 	ldc.i4.s 11
 	add
 	stloc.2
-L_101caa4:
-// 0x0101caa4: 0x101caa4: bne   s0, zero, 0x101ca88 addu  a0, s2, zero
+L_101cab4:
+// 0x0101cab4: 0x101cab4: bne   s0, zero, 0x101ca98 addu  a0, s2, zero
 	ldloc 8
 	ldloc 10
 	stloc.1
-	brtrue L_101ca88
+	brtrue L_101ca98
 // --- basic block ---
-// 0x0101caac: 0x101caac: j	 0x101cb0c sll   zero, zero, 0
-	br L_101cb0c
+// 0x0101cabc: 0x101cabc: j	 0x101cb1c sll   zero, zero, 0
+	br L_101cb1c
 // --- basic block ---
-L_101cab4:
-// 0x0101cab4: 0x101cab4: lhu   v0, 8(s0)
+L_101cac4:
+// 0x0101cac4: 0x101cac4: lhu   v0, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x0101cab8: 0x101cab8: sll   zero, zero, 0
-// 0x0101cabc: 0x101cabc: beq   v0, v1, 0x101caec addiu v0, v0, 1
+// 0x0101cac8: 0x101cac8: sll   zero, zero, 0
+// 0x0101cacc: 0x101cacc: beq   v0, v1, 0x101cafc addiu v0, v0, 1
 	ldloc 5
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_101caec
+	beq  L_101cafc
 // --- basic block ---
-// 0x0101cac4: 0x101cac4: j	 0x101caec sh    v0, 8(s0)
+// 0x0101cad4: 0x101cad4: j	 0x101cafc sh    v0, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_101caec
+	br L_101cafc
 // --- basic block ---
-L_101cacc:
-// 0x0101cacc: 0x101cacc: sw    s0, 4(v0)
+L_101cadc:
+// 0x0101cadc: 0x101cadc: sw    s0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -320,31 +320,31 @@ L_101cacc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101cad0: 0x101cad0: addiu v0, zero, 1
+// 0x0101cae0: 0x101cae0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_101cad4:
-// 0x0101cad4: 0x101cad4: sh    v0, 8(a0)
+L_101cae4:
+// 0x0101cae4: 0x101cae4: sh    v0, 8(a0)
 	ldloc.1
 	ldc.i4.8
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0101cad8: 0x101cad8: sb    s3, 10(a0)
+// 0x0101cae8: 0x101cae8: sb    s3, 10(a0)
 	ldloc.1
 	ldc.i4.s 10
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101cadc: 0x101cadc: addu  a1, s2, zero
+// 0x0101caec: 0x101caec: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0101cae0: 0x101cae0: addiu a0, a0, 11
+// 0x0101caf0: 0x101caf0: addiu a0, a0, 11
 	ldloc.1
 	ldc.i4.s 11
 	add
 	stloc.1
-// 0x0101cae4: 0x101cae4: jal   0x1001800 addiu a2, s1, 1
+// 0x0101caf4: 0x101caf4: jal   0x1001800 addiu a2, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
@@ -358,12 +358,12 @@ L_101cad4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101caec:
-// 0x0101caec: 0x101caec: lw    ra, 36(sp)
-// 0x0101caf0: 0x101caf0: addu  v0, s0, zero
+L_101cafc:
+// 0x0101cafc: 0x101cafc: lw    ra, 36(sp)
+// 0x0101cb00: 0x101cb00: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0101caf4: 0x101caf4: lw    s3, 32(sp)
+// 0x0101cb04: 0x101cb04: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -372,7 +372,7 @@ L_101caec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101caf8: 0x101caf8: lw    s2, 28(sp)
+// 0x0101cb08: 0x101cb08: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -381,7 +381,7 @@ L_101caec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101cafc: 0x101cafc: lw    s1, 24(sp)
+// 0x0101cb0c: 0x101cb0c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -390,7 +390,7 @@ L_101caec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101cb00: 0x101cb00: lw    s0, 20(sp)
+// 0x0101cb10: 0x101cb10: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -399,15 +399,15 @@ L_101caec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101cb04: 0x101cb04: jr    ra addiu sp, sp, 40
+// 0x0101cb14: 0x101cb14: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_101cb0c:
-// 0x0101cb0c: 0x101cb0c: jal   0x1000910 addiu a0, s1, 12
+L_101cb1c:
+// 0x0101cb1c: 0x101cb1c: jal   0x1000910 addiu a0, s1, 12
 	ldloc 11
 	ldc.i4.s 12
 	add
@@ -422,21 +422,21 @@ L_101cb0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cb14: 0x101cb14: lui   a0, 0x10000
+// 0x0101cb24: 0x101cb24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101cb18: 0x101cb18: addiu a0, a0, -30492
+// 0x0101cb28: 0x101cb28: addiu a0, a0, -30492
 	ldloc.1
 	ldc.i4 -30492
 	add
 	stloc.1
-// 0x0101cb1c: 0x101cb1c: addu  a2, v0, zero
+// 0x0101cb2c: 0x101cb2c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101cb20: 0x101cb20: addiu a1, zero, 85
+// 0x0101cb30: 0x101cb30: addiu a1, zero, 85
 	ldc.i4.s 85
 	stloc.2
-// 0x0101cb24: 0x101cb24: jal   0x1004a38 addu  s0, v0, zero
+// 0x0101cb34: 0x101cb34: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -444,30 +444,30 @@ L_101cb0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cb2c: 0x101cb2c: lui   v1, 0x30000
+// 0x0101cb3c: 0x101cb3c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101cb30: 0x101cb30: sll   v0, s3, 2
+// 0x0101cb40: 0x101cb40: sll   v0, s3, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0101cb34: 0x101cb34: addiu v1, v1, 27096
+// 0x0101cb44: 0x101cb44: addiu v1, v1, 27560
 	ldloc 7
-	ldc.i4 27096
+	ldc.i4 27560
 	add
 	stloc 7
-// 0x0101cb38: 0x101cb38: addu  v1, v0, v1
+// 0x0101cb48: 0x101cb48: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x0101cb3c: 0x101cb3c: sw    zero, 4(s0)
+// 0x0101cb4c: 0x101cb4c: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -476,24 +476,24 @@ L_101cb0c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101cb40: 0x101cb40: lw    v0, 0(v1)
+// 0x0101cb50: 0x101cb50: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101cb44: 0x101cb44: addu  a0, s0, zero
+// 0x0101cb54: 0x101cb54: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0101cb48: 0x101cb48: sw    v0, 0(s0)
+// 0x0101cb58: 0x101cb58: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0101cb4c: 0x101cb4c: bne   v0, zero, 0x101cacc sw    s0, 0(v1)
+// 0x0101cb5c: 0x101cb5c: bne   v0, zero, 0x101cadc sw    s0, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
@@ -501,19 +501,19 @@ L_101cb0c:
 	shr.un
 	ldloc 8
 	stelem.i4
-	brtrue L_101cacc
+	brtrue L_101cadc
 // --- basic block ---
-// 0x0101cb54: 0x101cb54: j	 0x101cad4 addiu v0, zero, 1
+// 0x0101cb64: 0x101cb64: j	 0x101cae4 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_101cad4
+	br L_101cae4
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -554,12 +554,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101cb5c: 0x101cb5c: addiu sp, sp, -32
+// 0x0101cb6c: 0x101cb6c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101cb60: 0x101cb60: sw    s1, 24(sp)
+// 0x0101cb70: 0x101cb70: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -568,7 +568,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101cb64: 0x101cb64: sw    s0, 20(sp)
+// 0x0101cb74: 0x101cb74: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -577,8 +577,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101cb68: 0x101cb68: sw    ra, 28(sp)
-// 0x0101cb6c: 0x101cb6c: jal   0x101ca0c addu  s0, a1, zero
+// 0x0101cb78: 0x101cb78: sw    ra, 28(sp)
+// 0x0101cb7c: 0x101cb7c: jal   0x101ca1c addu  s0, a1, zero
 	ldloc.2
 	stloc 7
 	ldloc.0
@@ -586,34 +586,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101cb74: 0x101cb74: addu  s1, v0, zero
+// 0x0101cb84: 0x101cb84: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-L_101cb78:
-// 0x0101cb78: 0x101cb78: lw    v0, 0(s0)
+L_101cb88:
+// 0x0101cb88: 0x101cb88: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101cb7c: 0x101cb7c: sll   zero, zero, 0
-// 0x0101cb80: 0x101cb80: beq   v0, zero, 0x101cb90 sll   zero, zero, 0
+// 0x0101cb8c: 0x101cb8c: sll   zero, zero, 0
+// 0x0101cb90: 0x101cb90: beq   v0, zero, 0x101cba0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101cb90
+	brfalse L_101cba0
 // --- basic block ---
-// 0x0101cb88: 0x101cb88: j	 0x101cb78 addu  s0, v0, zero
+// 0x0101cb98: 0x101cb98: j	 0x101cb88 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-	br L_101cb78
+	br L_101cb88
 // --- basic block ---
-L_101cb90:
-// 0x0101cb90: 0x101cb90: lw    v0, 4(s0)
+L_101cba0:
+// 0x0101cba0: 0x101cba0: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -622,17 +622,17 @@ L_101cb90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101cb94: 0x101cb94: sll   zero, zero, 0
-// 0x0101cb98: 0x101cb98: slti  v0, v0, 16
+// 0x0101cba4: 0x101cba4: sll   zero, zero, 0
+// 0x0101cba8: 0x101cba8: slti  v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	clt
 	stloc 5
-// 0x0101cb9c: 0x101cb9c: bne   v0, zero, 0x101cbd0 sll   zero, zero, 0
+// 0x0101cbac: 0x101cbac: bne   v0, zero, 0x101cbe0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101cbd0
+	brtrue L_101cbe0
 // --- basic block ---
-// 0x0101cba4: 0x101cba4: jal   0x1000910 addiu a0, zero, 72
+// 0x0101cbb4: 0x101cbb4: jal   0x1000910 addiu a0, zero, 72
 	ldc.i4.s 72
 	stloc.1
 	ldloc.0
@@ -645,25 +645,25 @@ L_101cb90:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101cbac: 0x101cbac: lui   a0, 0x10000
+// 0x0101cbbc: 0x101cbbc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101cbb0: 0x101cbb0: sw    v0, 0(s0)
+// 0x0101cbc0: 0x101cbc0: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0101cbb4: 0x101cbb4: addiu a0, a0, -30492
+// 0x0101cbc4: 0x101cbc4: addiu a0, a0, -30492
 	ldloc.1
 	ldc.i4 -30492
 	add
 	stloc.1
-// 0x0101cbb8: 0x101cbb8: addu  a2, v0, zero
+// 0x0101cbc8: 0x101cbc8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101cbbc: 0x101cbbc: jal   0x1004a38 addiu a1, zero, 115
+// 0x0101cbcc: 0x101cbcc: jal   0x1004a48 addiu a1, zero, 115
 	ldc.i4.s 115
 	stloc.2
 	ldloc.0
@@ -671,20 +671,20 @@ L_101cb90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101cbc4: 0x101cbc4: lw    s0, 0(s0)
+// 0x0101cbd4: 0x101cbd4: lw    s0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101cbc8: 0x101cbc8: sll   zero, zero, 0
-// 0x0101cbcc: 0x101cbcc: sw    zero, 4(s0)
+// 0x0101cbd8: 0x101cbd8: sll   zero, zero, 0
+// 0x0101cbdc: 0x101cbdc: sw    zero, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -693,8 +693,8 @@ L_101cb90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101cbd0:
-// 0x0101cbd0: 0x101cbd0: lw    v1, 4(s0)
+L_101cbe0:
+// 0x0101cbe0: 0x101cbe0: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -703,31 +703,31 @@ L_101cbd0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101cbd4: 0x101cbd4: lw    ra, 28(sp)
-// 0x0101cbd8: 0x101cbd8: addiu a0, v1, 2
+// 0x0101cbe4: 0x101cbe4: lw    ra, 28(sp)
+// 0x0101cbe8: 0x101cbe8: addiu a0, v1, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc.1
-// 0x0101cbdc: 0x101cbdc: sll   a0, a0, 2
+// 0x0101cbec: 0x101cbec: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0101cbe0: 0x101cbe0: addu  a0, s0, a0
+// 0x0101cbf0: 0x101cbf0: addu  a0, s0, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x0101cbe4: 0x101cbe4: addiu v1, v1, 1
+// 0x0101cbf4: 0x101cbf4: addiu v1, v1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0101cbe8: 0x101cbe8: addu  v0, s1, zero
+// 0x0101cbf8: 0x101cbf8: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-// 0x0101cbec: 0x101cbec: sw    v1, 4(s0)
+// 0x0101cbfc: 0x101cbfc: sw    v1, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -736,14 +736,14 @@ L_101cbd0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101cbf0: 0x101cbf0: sw    s1, 0(a0)
+// 0x0101cc00: 0x101cc00: sw    s1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x0101cbf4: 0x101cbf4: lw    s0, 20(sp)
+// 0x0101cc04: 0x101cc04: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -752,7 +752,7 @@ L_101cbd0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101cbf8: 0x101cbf8: lw    s1, 24(sp)
+// 0x0101cc08: 0x101cc08: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -761,7 +761,7 @@ L_101cbd0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101cbfc: 0x101cbfc: jr    ra addiu sp, sp, 32
+// 0x0101cc0c: 0x101cc0c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -773,7 +773,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_rtl_101cc04()
+.method public static int32 roadmap_lang_rtl_101cc14()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -790,25 +790,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101cc04: 0x101cc04: lui   v0, 0x30000
+// 0x0101cc14: 0x101cc14: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101cc08: 0x101cc08: lw    v0, 28112(v0)
+// 0x0101cc18: 0x101cc18: lw    v0, 28576(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7028
+	ldc.i4 7144
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101cc0c: 0x101cc0c: jr    ra sll   zero, zero, 0
+// 0x0101cc1c: 0x101cc1c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_lang_get_available_langs_count_101cc14()
+.method public static int32 roadmap_lang_get_available_langs_count_101cc24()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -825,25 +825,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101cc14: 0x101cc14: lui   v0, 0x30000
+// 0x0101cc24: 0x101cc24: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101cc18: 0x101cc18: lw    v0, 28108(v0)
+// 0x0101cc28: 0x101cc28: lw    v0, 28572(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101cc1c: 0x101cc1c: jr    ra sll   zero, zero, 0
+// 0x0101cc2c: 0x101cc2c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_lang_get_available_langs_values_101cc24()
+.method public static int32 roadmap_lang_get_available_langs_values_101cc34()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -857,12 +857,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101cc24: 0x101cc24: lui   v0, 0xe0000
+// 0x0101cc34: 0x101cc34: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x0101cc28: 0x101cc28: jr    ra addiu v0, v0, 29732
+// 0x0101cc38: 0x101cc38: jr    ra addiu v0, v0, 30196
 	ldloc.0
-	ldc.i4 29732
+	ldc.i4 30196
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -870,7 +870,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_lang_get_available_langs_labels_101cc30()
+.method public static int32 roadmap_lang_get_available_langs_labels_101cc40()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -884,12 +884,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101cc30: 0x101cc30: lui   v0, 0xe0000
+// 0x0101cc40: 0x101cc40: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x0101cc34: 0x101cc34: jr    ra addiu v0, v0, 30132
+// 0x0101cc44: 0x101cc44: jr    ra addiu v0, v0, 30596
 	ldloc.0
-	ldc.i4 30132
+	ldc.i4 30596
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -897,7 +897,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_lang_get_lang_value_101ccd4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_get_lang_value_101cce4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra,int32 v1)
@@ -947,12 +947,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ccd4: 0x101ccd4: addiu sp, sp, -40
+// 0x0101cce4: 0x101cce4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101ccd8: 0x101ccd8: sw    s1, 20(sp)
+// 0x0101cce8: 0x101cce8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -961,10 +961,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ccdc: 0x101ccdc: lui   s1, 0xe0000
+// 0x0101ccec: 0x101ccec: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x0101cce0: 0x101cce0: sw    s4, 32(sp)
+// 0x0101ccf0: 0x101ccf0: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -973,7 +973,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101cce4: 0x101cce4: sw    s2, 24(sp)
+// 0x0101ccf4: 0x101ccf4: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -982,7 +982,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101cce8: 0x101cce8: sw    s0, 16(sp)
+// 0x0101ccf8: 0x101ccf8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -991,8 +991,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101ccec: 0x101ccec: sw    ra, 36(sp)
-// 0x0101ccf0: 0x101ccf0: sw    s3, 28(sp)
+// 0x0101ccfc: 0x101ccfc: sw    ra, 36(sp)
+// 0x0101cd00: 0x101cd00: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1001,36 +1001,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101ccf4: 0x101ccf4: addu  s2, a0, zero
+// 0x0101cd04: 0x101cd04: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0101ccf8: 0x101ccf8: addiu s1, s1, 29732
+// 0x0101cd08: 0x101cd08: addiu s1, s1, 30196
 	ldloc 7
-	ldc.i4 29732
+	ldc.i4 30196
 	add
 	stloc 7
-// 0x0101ccfc: 0x101ccfc: addu  s0, zero, zero
+// 0x0101cd0c: 0x101cd0c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0101cd00: 0x101cd00: j	 0x101cd28 lui   s4, 0x30000
+// 0x0101cd10: 0x101cd10: j	 0x101cd38 lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 11
-	br L_101cd28
+	br L_101cd38
 // --- basic block ---
-L_101cd08:
-// 0x0101cd08: 0x101cd08: lw    s3, 0(s1)
+L_101cd18:
+// 0x0101cd18: 0x101cd18: lw    s3, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0101cd0c: 0x101cd0c: addiu s1, s1, 4
+// 0x0101cd1c: 0x101cd1c: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0101cd10: 0x101cd10: jal   0x1001b14 addu  a0, s3, zero
+// 0x0101cd20: 0x101cd20: jal   0x1001b14 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -1038,47 +1038,47 @@ L_101cd08:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101cd18: 0x101cd18: bne   v0, zero, 0x101cd28 addiu s0, s0, 1
+// 0x0101cd28: 0x101cd28: bne   v0, zero, 0x101cd38 addiu s0, s0, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_101cd28
+	brtrue L_101cd38
 // --- basic block ---
-// 0x0101cd20: 0x101cd20: j	 0x101cd40 addu  v0, s3, zero
+// 0x0101cd30: 0x101cd30: j	 0x101cd50 addu  v0, s3, zero
 	ldloc 10
 	stloc 6
-	br L_101cd40
+	br L_101cd50
 // --- basic block ---
-L_101cd28:
-// 0x0101cd28: 0x101cd28: lw    v0, 28108(s4)
+L_101cd38:
+// 0x0101cd38: 0x101cd38: lw    v0, 28572(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101cd2c: 0x101cd2c: sll   zero, zero, 0
-// 0x0101cd30: 0x101cd30: slt   v0, s0, v0
+// 0x0101cd3c: 0x101cd3c: sll   zero, zero, 0
+// 0x0101cd40: 0x101cd40: slt   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0101cd34: 0x101cd34: bne   v0, zero, 0x101cd08 addu  a1, s2, zero
+// 0x0101cd44: 0x101cd44: bne   v0, zero, 0x101cd18 addu  a1, s2, zero
 	ldloc 6
 	ldloc 9
 	stloc.2
-	brtrue L_101cd08
+	brtrue L_101cd18
 // --- basic block ---
-// 0x0101cd3c: 0x101cd3c: addu  v0, s2, zero
+// 0x0101cd4c: 0x101cd4c: addu  v0, s2, zero
 	ldloc 9
 	stloc 6
-L_101cd40:
-// 0x0101cd40: 0x101cd40: lw    ra, 36(sp)
-// 0x0101cd44: 0x101cd44: lw    s4, 32(sp)
+L_101cd50:
+// 0x0101cd50: 0x101cd50: lw    ra, 36(sp)
+// 0x0101cd54: 0x101cd54: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1087,7 +1087,7 @@ L_101cd40:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101cd48: 0x101cd48: lw    s3, 28(sp)
+// 0x0101cd58: 0x101cd58: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1096,7 +1096,7 @@ L_101cd40:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101cd4c: 0x101cd4c: lw    s2, 24(sp)
+// 0x0101cd5c: 0x101cd5c: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1105,7 +1105,7 @@ L_101cd40:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101cd50: 0x101cd50: lw    s1, 20(sp)
+// 0x0101cd60: 0x101cd60: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1114,7 +1114,7 @@ L_101cd40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101cd54: 0x101cd54: lw    s0, 16(sp)
+// 0x0101cd64: 0x101cd64: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ L_101cd40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101cd58: 0x101cd58: jr    ra addiu sp, sp, 40
+// 0x0101cd68: 0x101cd68: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1135,7 +1135,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s1,int32 v1,int32 s3,int32 s4,int32 ra)
@@ -1185,24 +1185,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101cd60: 0x101cd60: lui   v0, 0x30000
+// 0x0101cd70: 0x101cd70: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101cd64: 0x101cd64: lw    v0, 28116(v0)
+// 0x0101cd74: 0x101cd74: lw    v0, 28580(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7029
+	ldc.i4 7145
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101cd68: 0x101cd68: addiu sp, sp, -40
+// 0x0101cd78: 0x101cd78: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101cd6c: 0x101cd6c: sw    s0, 16(sp)
+// 0x0101cd7c: 0x101cd7c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1211,8 +1211,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101cd70: 0x101cd70: sw    ra, 36(sp)
-// 0x0101cd74: 0x101cd74: sw    s4, 32(sp)
+// 0x0101cd80: 0x101cd80: sw    ra, 36(sp)
+// 0x0101cd84: 0x101cd84: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1221,7 +1221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101cd78: 0x101cd78: sw    s3, 28(sp)
+// 0x0101cd88: 0x101cd88: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1230,7 +1230,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101cd7c: 0x101cd7c: sw    s2, 24(sp)
+// 0x0101cd8c: 0x101cd8c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1239,7 +1239,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101cd80: 0x101cd80: sw    s1, 20(sp)
+// 0x0101cd90: 0x101cd90: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1248,38 +1248,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101cd84: 0x101cd84: beq   v0, zero, 0x101ce24 addu  s0, a0, zero
+// 0x0101cd94: 0x101cd94: beq   v0, zero, 0x101ce34 addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 8
-	brfalse L_101ce24
+	brfalse L_101ce34
 // --- basic block ---
-// 0x0101cd8c: 0x101cd8c: bne   a0, zero, 0x101cdb8 lui   a1, 0x10000
+// 0x0101cd9c: 0x101cd9c: bne   a0, zero, 0x101cdc8 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brtrue L_101cdb8
+	brtrue L_101cdc8
 // --- basic block ---
-// 0x0101cd94: 0x101cd94: lui   a3, 0x10000
+// 0x0101cda4: 0x101cda4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101cd98: 0x101cd98: addiu a1, a1, -30464
+// 0x0101cda8: 0x101cda8: addiu a1, a1, -30464
 	ldloc.2
 	ldc.i4 -30464
 	add
 	stloc.2
-// 0x0101cd9c: 0x101cd9c: addiu a3, a3, -30436
+// 0x0101cdac: 0x101cdac: addiu a3, a3, -30436
 	ldloc 4
 	ldc.i4 -30436
 	add
 	stloc 4
-// 0x0101cda0: 0x101cda0: addiu a0, zero, 4
+// 0x0101cdb0: 0x101cdb0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101cda4: 0x101cda4: addiu a2, zero, 506
+// 0x0101cdb4: 0x101cdb4: addiu a2, zero, 506
 	ldc.i4 506
 	stloc.3
-// 0x0101cda8: 0x101cda8: jal   0x100449c lui   s0, 0x10000
+// 0x0101cdb8: 0x101cdb8: jal   0x100449c lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
 	ldloc.0
@@ -1292,88 +1292,88 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101cdb0: 0x101cdb0: j	 0x101ce24 addiu s0, s0, 18500
+// 0x0101cdc0: 0x101cdc0: j	 0x101ce34 addiu s0, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 8
-	br L_101ce24
+	br L_101ce34
 // --- basic block ---
-L_101cdb8:
-// 0x0101cdb8: 0x101cdb8: jal   0x10155ac lui   s2, 0x30000
+L_101cdc8:
+// 0x0101cdc8: 0x101cdc8: jal   0x10155bc lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 7
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_string_10155ac(int32,int32)
+	call int32 Cibyl15::roadmap_hash_string_10155bc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101cdc0: 0x101cdc0: lw    a0, 28144(s2)
+// 0x0101cdd0: 0x101cdd0: lw    a0, 28608(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7036
+	ldc.i4 7152
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101cdc4: 0x101cdc4: jal   0x1015518 addu  a1, v0, zero
+// 0x0101cdd4: 0x101cdd4: jal   0x1015528 addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_get_first_1015518(int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_first_1015528(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101cdcc: 0x101cdcc: addu  s1, v0, zero
+// 0x0101cddc: 0x101cddc: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-// 0x0101cdd0: 0x101cdd0: addu  s4, s2, zero
+// 0x0101cde0: 0x101cde0: addu  s4, s2, zero
 	ldloc 7
 	stloc 12
-// 0x0101cdd4: 0x101cdd4: j	 0x101ce18 lui   s3, 0x30000
+// 0x0101cde4: 0x101cde4: j	 0x101ce28 lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 11
-	br L_101ce18
+	br L_101ce28
 // --- basic block ---
-L_101cddc:
-// 0x0101cddc: 0x101cddc: lw    s2, 28132(s3)
+L_101cdec:
+// 0x0101cdec: 0x101cdec: lw    s2, 28596(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7033
+	ldc.i4 7149
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101cde0: 0x101cde0: sll   zero, zero, 0
-// 0x0101cde4: 0x101cde4: addu  s2, s2, v0
+// 0x0101cdf0: 0x101cdf0: sll   zero, zero, 0
+// 0x0101cdf4: 0x101cdf4: addu  s2, s2, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0101cde8: 0x101cde8: lw    a1, 0(s2)
+// 0x0101cdf8: 0x101cdf8: lw    a1, 0(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101cdec: 0x101cdec: jal   0x1001b14 sll   zero, zero, 0
+// 0x0101cdfc: 0x101cdfc: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101cdf4: 0x101cdf4: bne   v0, zero, 0x101ce08 addu  a1, s1, zero
+// 0x0101ce04: 0x101ce04: bne   v0, zero, 0x101ce18 addu  a1, s1, zero
 	ldloc 6
 	ldloc 9
 	stloc.2
-	brtrue L_101ce08
+	brtrue L_101ce18
 // --- basic block ---
-// 0x0101cdfc: 0x101cdfc: lw    s0, 4(s2)
+// 0x0101ce0c: 0x101ce0c: lw    s0, 4(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1382,52 +1382,52 @@ L_101cddc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101ce00: 0x101ce00: j	 0x101ce24 sll   zero, zero, 0
-	br L_101ce24
+// 0x0101ce10: 0x101ce10: j	 0x101ce34 sll   zero, zero, 0
+	br L_101ce34
 // --- basic block ---
-L_101ce08:
-// 0x0101ce08: 0x101ce08: lw    a0, 28144(s4)
+L_101ce18:
+// 0x0101ce18: 0x101ce18: lw    a0, 28608(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7036
+	ldc.i4 7152
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ce0c: 0x101ce0c: jal   0x1015744 sll   zero, zero, 0
+// 0x0101ce1c: 0x101ce1c: jal   0x1015754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101ce14: 0x101ce14: addu  s1, v0, zero
+// 0x0101ce24: 0x101ce24: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-L_101ce18:
-// 0x0101ce18: 0x101ce18: sll   v0, s1, 3
+L_101ce28:
+// 0x0101ce28: 0x101ce28: sll   v0, s1, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x0101ce1c: 0x101ce1c: bgez  s1, 0x101cddc addu  a0, s0, zero
+// 0x0101ce2c: 0x101ce2c: bgez  s1, 0x101cdec addu  a0, s0, zero
 	ldloc 9
 	ldloc 8
 	stloc.1
 	ldc.i4.s 0
-	bge L_101cddc
+	bge L_101cdec
 // --- basic block ---
-L_101ce24:
-// 0x0101ce24: 0x101ce24: lw    ra, 36(sp)
-// 0x0101ce28: 0x101ce28: addu  v0, s0, zero
+L_101ce34:
+// 0x0101ce34: 0x101ce34: lw    ra, 36(sp)
+// 0x0101ce38: 0x101ce38: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x0101ce2c: 0x101ce2c: lw    s4, 32(sp)
+// 0x0101ce3c: 0x101ce3c: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1436,7 +1436,7 @@ L_101ce24:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101ce30: 0x101ce30: lw    s3, 28(sp)
+// 0x0101ce40: 0x101ce40: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1445,7 +1445,7 @@ L_101ce24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101ce34: 0x101ce34: lw    s2, 24(sp)
+// 0x0101ce44: 0x101ce44: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1454,7 +1454,7 @@ L_101ce24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ce38: 0x101ce38: lw    s1, 20(sp)
+// 0x0101ce48: 0x101ce48: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1463,7 +1463,7 @@ L_101ce24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101ce3c: 0x101ce3c: lw    s0, 16(sp)
+// 0x0101ce4c: 0x101ce4c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1472,7 +1472,7 @@ L_101ce24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101ce40: 0x101ce40: jr    ra addiu sp, sp, 40
+// 0x0101ce50: 0x101ce50: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1484,7 +1484,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_lang_allocate_101ce48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_allocate_101ce58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -1531,12 +1531,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ce48: 0x101ce48: addiu sp, sp, -40
+// 0x0101ce58: 0x101ce58: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101ce4c: 0x101ce4c: sw    s0, 20(sp)
+// 0x0101ce5c: 0x101ce5c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1545,19 +1545,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ce50: 0x101ce50: lui   s0, 0x30000
+// 0x0101ce60: 0x101ce60: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101ce54: 0x101ce54: lw    v0, 28136(s0)
+// 0x0101ce64: 0x101ce64: lw    v0, 28600(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7034
+	ldc.i4 7150
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101ce58: 0x101ce58: sw    s2, 28(sp)
+// 0x0101ce68: 0x101ce68: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1566,7 +1566,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101ce5c: 0x101ce5c: sw    s1, 24(sp)
+// 0x0101ce6c: 0x101ce6c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1575,8 +1575,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101ce60: 0x101ce60: sw    ra, 36(sp)
-// 0x0101ce64: 0x101ce64: sw    s3, 32(sp)
+// 0x0101ce70: 0x101ce70: sw    ra, 36(sp)
+// 0x0101ce74: 0x101ce74: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1585,27 +1585,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101ce68: 0x101ce68: lui   s1, 0x30000
+// 0x0101ce78: 0x101ce78: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x0101ce6c: 0x101ce6c: bne   v0, zero, 0x101ceb4 lui   s2, 0x30000
+// 0x0101ce7c: 0x101ce7c: bne   v0, zero, 0x101cec4 lui   s2, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 10
-	brtrue L_101ceb4
+	brtrue L_101cec4
 // --- basic block ---
-// 0x0101ce74: 0x101ce74: addiu a0, zero, 400
+// 0x0101ce84: 0x101ce84: addiu a0, zero, 400
 	ldc.i4 400
 	stloc.1
-// 0x0101ce78: 0x101ce78: addiu v0, zero, 50
+// 0x0101ce88: 0x101ce88: addiu v0, zero, 50
 	ldc.i4.s 50
 	stloc 5
-// 0x0101ce7c: 0x101ce7c: jal   0x1000910 sw    v0, 28136(s0)
+// 0x0101ce8c: 0x101ce8c: jal   0x1000910 sw    v0, 28600(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7034
+	ldc.i4 7150
 	add
 	ldloc 5
 	stelem.i4
@@ -1619,16 +1619,16 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101ce84: 0x101ce84: addu  a0, v0, zero
+// 0x0101ce94: 0x101ce94: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101ce88: 0x101ce88: addu  a1, zero, zero
+// 0x0101ce98: 0x101ce98: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101ce8c: 0x101ce8c: addiu a2, zero, 400
+// 0x0101ce9c: 0x101ce9c: addiu a2, zero, 400
 	ldc.i4 400
 	stloc.3
-// 0x0101ce90: 0x101ce90: jal   0x100177c addu  s3, v0, zero
+// 0x0101cea0: 0x101cea0: jal   0x100177c addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
@@ -1640,29 +1640,29 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101ce98: 0x101ce98: lw    a1, 28136(s0)
+// 0x0101cea8: 0x101cea8: lw    a1, 28600(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7034
+	ldc.i4 7150
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101ce9c: 0x101ce9c: lui   a0, 0x10000
+// 0x0101ceac: 0x101ceac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101cea0: 0x101cea0: addiu a0, a0, -30364
+// 0x0101ceb0: 0x101ceb0: addiu a0, a0, -30364
 	ldloc.1
 	ldc.i4 -30364
 	add
 	stloc.1
-// 0x0101cea4: 0x101cea4: jal   0x10158bc sw    s3, 28132(s1)
+// 0x0101ceb4: 0x101ceb4: jal   0x10158cc sw    s3, 28596(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7033
+	ldc.i4 7149
 	add
 	ldloc 11
 	stelem.i4
@@ -1671,48 +1671,48 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_new_10158bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_new_10158cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101ceac: 0x101ceac: j	 0x101ced8 sw    v0, 28144(s2)
+// 0x0101cebc: 0x101cebc: j	 0x101cee8 sw    v0, 28608(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 7036
+	ldc.i4 7152
 	add
 	ldloc 5
 	stelem.i4
-	br L_101ced8
+	br L_101cee8
 // --- basic block ---
-L_101ceb4:
-// 0x0101ceb4: 0x101ceb4: lw    a0, 28132(s1)
+L_101cec4:
+// 0x0101cec4: 0x101cec4: lw    a0, 28596(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7033
+	ldc.i4 7149
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ceb8: 0x101ceb8: sll   a1, v0, 4
+// 0x0101cec8: 0x101cec8: sll   a1, v0, 4
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc.2
-// 0x0101cebc: 0x101cebc: sll   v0, v0, 1
+// 0x0101cecc: 0x101cecc: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x0101cec0: 0x101cec0: jal   0x1000a60 sw    v0, 28136(s0)
+// 0x0101ced0: 0x101ced0: jal   0x1000a60 sw    v0, 28600(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7034
+	ldc.i4 7150
 	add
 	ldloc 5
 	stelem.i4
@@ -1726,30 +1726,30 @@ L_101ceb4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101cec8: 0x101cec8: lw    a0, 28144(s2)
+// 0x0101ced8: 0x101ced8: lw    a0, 28608(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 7036
+	ldc.i4 7152
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101cecc: 0x101cecc: lw    a1, 28136(s0)
+// 0x0101cedc: 0x101cedc: lw    a1, 28600(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7034
+	ldc.i4 7150
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101ced0: 0x101ced0: jal   0x1015b18 sw    v0, 28132(s1)
+// 0x0101cee0: 0x101cee0: jal   0x1015b28 sw    v0, 28596(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7033
+	ldc.i4 7149
 	add
 	ldloc 5
 	stelem.i4
@@ -1758,48 +1758,48 @@ L_101ceb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_resize_1015b18(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_resize_1015b28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101ced8:
-// 0x0101ced8: 0x101ced8: lui   v0, 0x30000
+L_101cee8:
+// 0x0101cee8: 0x101cee8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101cedc: 0x101cedc: lw    v0, 28132(v0)
+// 0x0101ceec: 0x101ceec: lw    v0, 28596(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7033
+	ldc.i4 7149
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101cee0: 0x101cee0: sll   zero, zero, 0
-// 0x0101cee4: 0x101cee4: bne   v0, zero, 0x101cf04 lui   a1, 0x10000
+// 0x0101cef0: 0x101cef0: sll   zero, zero, 0
+// 0x0101cef4: 0x101cef4: bne   v0, zero, 0x101cf14 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_101cf04
+	brtrue L_101cf14
 // --- basic block ---
-// 0x0101ceec: 0x101ceec: lui   a3, 0x10000
+// 0x0101cefc: 0x101cefc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101cef0: 0x101cef0: addiu a1, a1, -30464
+// 0x0101cf00: 0x101cf00: addiu a1, a1, -30464
 	ldloc.2
 	ldc.i4 -30464
 	add
 	stloc.2
-// 0x0101cef4: 0x101cef4: addiu a3, a3, -30352
+// 0x0101cf04: 0x101cf04: addiu a3, a3, -30352
 	ldloc 4
 	ldc.i4 -30352
 	add
 	stloc 4
-// 0x0101cef8: 0x101cef8: addiu a0, zero, 5
+// 0x0101cf08: 0x101cf08: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0101cefc: 0x101cefc: jal   0x100449c addiu a2, zero, 202
+// 0x0101cf0c: 0x101cf0c: jal   0x100449c addiu a2, zero, 202
 	ldc.i4 202
 	stloc.3
 	ldloc.0
@@ -1812,9 +1812,9 @@ L_101ced8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101cf04:
-// 0x0101cf04: 0x101cf04: lw    ra, 36(sp)
-// 0x0101cf08: 0x101cf08: lw    s3, 32(sp)
+L_101cf14:
+// 0x0101cf14: 0x101cf14: lw    ra, 36(sp)
+// 0x0101cf18: 0x101cf18: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1823,7 +1823,7 @@ L_101cf04:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101cf0c: 0x101cf0c: lw    s2, 28(sp)
+// 0x0101cf1c: 0x101cf1c: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1832,7 +1832,7 @@ L_101cf04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101cf10: 0x101cf10: lw    s1, 24(sp)
+// 0x0101cf20: 0x101cf20: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1841,7 +1841,7 @@ L_101cf04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101cf14: 0x101cf14: lw    s0, 20(sp)
+// 0x0101cf24: 0x101cf24: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1850,7 +1850,7 @@ L_101cf04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101cf18: 0x101cf18: jr    ra addiu sp, sp, 40
+// 0x0101cf28: 0x101cf28: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1862,7 +1862,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_conf_load_101cf20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_conf_load_101cf30(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s5,int32 s3,int32 s0,int32 s2,int32 s7,int32 s4,int32 s6,int32 ra)
@@ -1921,12 +1921,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101cf20: 0x101cf20: addiu sp, sp, -1104
+// 0x0101cf30: 0x101cf30: addiu sp, sp, -1104
 	ldloc.0
 	ldc.i4 -1104
 	add
 	stloc.0
-// 0x0101cf24: 0x101cf24: sw    s1, 1072(sp)
+// 0x0101cf34: 0x101cf34: sw    s1, 1072(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1935,21 +1935,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101cf28: 0x101cf28: lui   a3, 0x10000
+// 0x0101cf38: 0x101cf38: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101cf2c: 0x101cf2c: lui   s1, 0x10000
+// 0x0101cf3c: 0x101cf3c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0101cf30: 0x101cf30: addiu a3, a3, -30340
+// 0x0101cf40: 0x101cf40: addiu a3, a3, -30340
 	ldloc 4
 	ldc.i4 -30340
 	add
 	stloc 4
-// 0x0101cf34: 0x101cf34: addiu a2, zero, 314
+// 0x0101cf44: 0x101cf44: addiu a2, zero, 314
 	ldc.i4 314
 	stloc.3
-// 0x0101cf38: 0x101cf38: sw    s0, 1068(sp)
+// 0x0101cf48: 0x101cf48: sw    s0, 1068(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1958,19 +1958,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101cf3c: 0x101cf3c: addiu a1, s1, -30464
+// 0x0101cf4c: 0x101cf4c: addiu a1, s1, -30464
 	ldloc 8
 	ldc.i4 -30464
 	add
 	stloc.2
-// 0x0101cf40: 0x101cf40: addu  s0, a0, zero
+// 0x0101cf50: 0x101cf50: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0101cf44: 0x101cf44: addiu a0, zero, 2
+// 0x0101cf54: 0x101cf54: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0101cf48: 0x101cf48: sw    ra, 1100(sp)
-// 0x0101cf4c: 0x101cf4c: sw    s3, 1080(sp)
+// 0x0101cf58: 0x101cf58: sw    ra, 1100(sp)
+// 0x0101cf5c: 0x101cf5c: sw    s3, 1080(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1979,7 +1979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101cf50: 0x101cf50: sw    s2, 1076(sp)
+// 0x0101cf60: 0x101cf60: sw    s2, 1076(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1988,12 +1988,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101cf54: 0x101cf54: addiu s3, sp, 16
+// 0x0101cf64: 0x101cf64: addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-// 0x0101cf58: 0x101cf58: sw    s7, 1096(sp)
+// 0x0101cf68: 0x101cf68: sw    s7, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2002,7 +2002,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101cf5c: 0x101cf5c: sw    s6, 1092(sp)
+// 0x0101cf6c: 0x101cf6c: sw    s6, 1092(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2011,7 +2011,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101cf60: 0x101cf60: sw    s5, 1088(sp)
+// 0x0101cf70: 0x101cf70: sw    s5, 1088(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2020,7 +2020,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101cf64: 0x101cf64: jal   0x100449c sw    s4, 1084(sp)
+// 0x0101cf74: 0x101cf74: jal   0x100449c sw    s4, 1084(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2039,26 +2039,26 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cf6c: 0x101cf6c: lui   a1, 0x10000
+// 0x0101cf7c: 0x101cf7c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101cf70: 0x101cf70: addiu a1, a1, -30304
+// 0x0101cf80: 0x101cf80: addiu a1, a1, -30304
 	ldloc.2
 	ldc.i4 -30304
 	add
 	stloc.2
-// 0x0101cf74: 0x101cf74: addu  a0, s3, zero
+// 0x0101cf84: 0x101cf84: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0101cf78: 0x101cf78: lui   s2, 0x30000
+// 0x0101cf88: 0x101cf88: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 12
-// 0x0101cf7c: 0x101cf7c: jal   0x1001b68 sw    zero, 28108(s2)
+// 0x0101cf8c: 0x101cf8c: jal   0x1001b68 sw    zero, 28572(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2069,16 +2069,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cf84: 0x101cf84: lui   a2, 0x0
+// 0x0101cf94: 0x101cf94: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101cf88: 0x101cf88: addu  a0, s0, zero
+// 0x0101cf98: 0x101cf98: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x0101cf8c: 0x101cf8c: addu  a1, s3, zero
+// 0x0101cf9c: 0x101cf9c: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x0101cf90: 0x101cf90: jal   0x104dac8 addiu a2, a2, 26128
+// 0x0101cfa0: 0x101cfa0: jal   0x104dad8 addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
@@ -2088,34 +2088,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cf98: 0x101cf98: bne   v0, zero, 0x101d060 addu  s0, v0, zero
+// 0x0101cfa8: 0x101cfa8: bne   v0, zero, 0x101d070 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brtrue L_101d060
+	brtrue L_101d070
 // --- basic block ---
-// 0x0101cfa0: 0x101cfa0: lui   a3, 0x10000
+// 0x0101cfb0: 0x101cfb0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101cfa4: 0x101cfa4: addiu a1, s1, -30464
+// 0x0101cfb4: 0x101cfb4: addiu a1, s1, -30464
 	ldloc 8
 	ldc.i4 -30464
 	add
 	stloc.2
-// 0x0101cfa8: 0x101cfa8: addiu a3, a3, -30292
+// 0x0101cfb8: 0x101cfb8: addiu a3, a3, -30292
 	ldloc 4
 	ldc.i4 -30292
 	add
 	stloc 4
-// 0x0101cfac: 0x101cfac: addiu a0, zero, 4
+// 0x0101cfbc: 0x101cfbc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101cfb0: 0x101cfb0: jal   0x100449c addiu a2, zero, 321
+// 0x0101cfc0: 0x101cfc0: jal   0x100449c addiu a2, zero, 321
 	ldc.i4 321
 	stloc.3
 	ldloc.0
@@ -2128,13 +2128,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cfb8: 0x101cfb8: j	 0x101d0e4 addu  v0, zero, zero
+// 0x0101cfc8: 0x101cfc8: j	 0x101d0f4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_101d0e4
+	br L_101d0f4
 // --- basic block ---
-L_101cfc0:
-// 0x0101cfc0: 0x101cfc0: jal   0x1001e98 sll   zero, zero, 0
+L_101cfd0:
+// 0x0101cfd0: 0x101cfd0: jal   0x1001e98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2145,104 +2145,104 @@ L_101cfc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cfc8: 0x101cfc8: addu  a0, s2, zero
+// 0x0101cfd8: 0x101cfd8: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x0101cfcc: 0x101cfcc: beq   v0, zero, 0x101d090 addiu a1, zero, 1024
+// 0x0101cfdc: 0x101cfdc: beq   v0, zero, 0x101d0a0 addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_101d090
+	brfalse L_101d0a0
 // --- basic block ---
-// 0x0101cfd4: 0x101cfd4: jal   0x100e038 sll   zero, zero, 0
+// 0x0101cfe4: 0x101cfe4: jal   0x100e048 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl10::roadmap_config_extract_data_100e038(int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_extract_data_100e048(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cfdc: 0x101cfdc: addu  s5, v0, zero
+// 0x0101cfec: 0x101cfec: addu  s5, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0101cfe0: 0x101cfe0: addu  a0, v0, zero
+// 0x0101cff0: 0x101cff0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101cfe4: 0x101cfe4: beq   v0, zero, 0x101d078 addiu a1, zero, 44
+// 0x0101cff4: 0x101cff4: beq   v0, zero, 0x101d088 addiu a1, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc.2
-	brfalse L_101d078
+	brfalse L_101d088
 // --- basic block ---
-// 0x0101cfec: 0x101cfec: jal   0x100dfc8 sll   zero, zero, 0
+// 0x0101cffc: 0x101cffc: jal   0x100dfd8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_until_100dfc8(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_until_100dfd8(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101cff4: 0x101cff4: lb    a0, 0(v0)
+// 0x0101d004: 0x101d004: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0101cff8: 0x101cff8: addiu v1, zero, 44
+// 0x0101d008: 0x101d008: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x0101cffc: 0x101cffc: bne   a0, v1, 0x101d078 addiu a0, v0, 1
+// 0x0101d00c: 0x101d00c: bne   a0, v1, 0x101d088 addiu a0, v0, 1
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_101d078
+	bne.un L_101d088
 // --- basic block ---
-// 0x0101d004: 0x101d004: jal   0x100e004 sb    zero, 0(v0)
+// 0x0101d014: 0x101d014: jal   0x100e014 sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_spaces_100e004(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_spaces_100e014(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101d00c: 0x101d00c: addu  a0, v0, zero
+// 0x0101d01c: 0x101d01c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101d010: 0x101d010: addu  a1, zero, zero
+// 0x0101d020: 0x101d020: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101d014: 0x101d014: jal   0x100dfc8 addu  s6, v0, zero
+// 0x0101d024: 0x101d024: jal   0x100dfd8 addu  s6, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_until_100dfc8(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_until_100dfd8(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101d01c: 0x101d01c: sb    zero, 0(v0)
+// 0x0101d02c: 0x101d02c: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101d020: 0x101d020: lw    s7, 28108(s1)
+// 0x0101d030: 0x101d030: lw    s7, 28572(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101d024: 0x101d024: addu  a0, s6, zero
+// 0x0101d034: 0x101d034: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x0101d028: 0x101d028: jal   0x1001ba8 sll   s7, s7, 2
+// 0x0101d038: 0x101d038: jal   0x1001ba8 sll   s7, s7, 2
 	ldloc 13
 	ldc.i4.2
 	shl
@@ -2257,31 +2257,31 @@ L_101cfc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101d030: 0x101d030: addu  s7, s7, s4
+// 0x0101d040: 0x101d040: addu  s7, s7, s4
 	ldloc 13
 	ldloc 14
 	add
 	stloc 13
-// 0x0101d034: 0x101d034: addu  a0, s5, zero
+// 0x0101d044: 0x101d044: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x0101d038: 0x101d038: sw    v0, 0(s7)
+// 0x0101d048: 0x101d048: sw    v0, 0(s7)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0101d03c: 0x101d03c: lw    s5, 28108(s1)
+// 0x0101d04c: 0x101d04c: lw    s5, 28572(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101d040: 0x101d040: jal   0x1001ba8 sll   s5, s5, 2
+// 0x0101d050: 0x101d050: jal   0x1001ba8 sll   s5, s5, 2
 	ldloc 9
 	ldc.i4.2
 	shl
@@ -2296,109 +2296,109 @@ L_101cfc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101d048: 0x101d048: lw    v1, 28108(s1)
+// 0x0101d058: 0x101d058: lw    v1, 28572(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101d04c: 0x101d04c: addu  s5, s5, s3
+// 0x0101d05c: 0x101d05c: addu  s5, s5, s3
 	ldloc 9
 	ldloc 10
 	add
 	stloc 9
-// 0x0101d050: 0x101d050: addiu v1, v1, 1
+// 0x0101d060: 0x101d060: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0101d054: 0x101d054: sw    v0, 0(s5)
+// 0x0101d064: 0x101d064: sw    v0, 0(s5)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0101d058: 0x101d058: j	 0x101d078 sw    v1, 28108(s1)
+// 0x0101d068: 0x101d068: j	 0x101d088 sw    v1, 28572(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldloc 7
 	stelem.i4
-	br L_101d078
+	br L_101d088
 // --- basic block ---
-L_101d060:
-// 0x0101d060: 0x101d060: lui   s4, 0xe0000
+L_101d070:
+// 0x0101d070: 0x101d070: lui   s4, 0xe0000
 	ldc.i4 917504
 	stloc 14
-// 0x0101d064: 0x101d064: lui   s3, 0xe0000
+// 0x0101d074: 0x101d074: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x0101d068: 0x101d068: addu  s1, s2, zero
+// 0x0101d078: 0x101d078: addu  s1, s2, zero
 	ldloc 12
 	stloc 8
-// 0x0101d06c: 0x101d06c: addiu s4, s4, 30132
+// 0x0101d07c: 0x101d07c: addiu s4, s4, 30596
 	ldloc 14
-	ldc.i4 30132
+	ldc.i4 30596
 	add
 	stloc 14
-// 0x0101d070: 0x101d070: addiu s3, s3, 29732
+// 0x0101d080: 0x101d080: addiu s3, s3, 30196
 	ldloc 10
-	ldc.i4 29732
+	ldc.i4 30196
 	add
 	stloc 10
-// 0x0101d074: 0x101d074: addiu s2, sp, 36
+// 0x0101d084: 0x101d084: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 12
-L_101d078:
-// 0x0101d078: 0x101d078: jal   0x1001e30 addu  a0, s0, zero
+L_101d088:
+// 0x0101d088: 0x101d088: jal   0x1001e30 addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x0101d080: 0x101d080: addu  a2, s0, zero
+// 0x0101d090: 0x101d090: addu  a2, s0, zero
 	ldloc 11
 	stloc.3
-// 0x0101d084: 0x101d084: addu  a0, s2, zero
+// 0x0101d094: 0x101d094: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x0101d088: 0x101d088: beq   v0, zero, 0x101cfc0 addiu a1, zero, 1024
+// 0x0101d098: 0x101d098: beq   v0, zero, 0x101cfd0 addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_101cfc0
+	brfalse L_101cfd0
 // --- basic block ---
-L_101d090:
-// 0x0101d090: 0x101d090: lui   a1, 0x10000
+L_101d0a0:
+// 0x0101d0a0: 0x101d0a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101d094: 0x101d094: lui   a3, 0x10000
+// 0x0101d0a4: 0x101d0a4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101d098: 0x101d098: addiu a1, a1, -30464
+// 0x0101d0a8: 0x101d0a8: addiu a1, a1, -30464
 	ldloc.2
 	ldc.i4 -30464
 	add
 	stloc.2
-// 0x0101d09c: 0x101d09c: addiu a3, a3, -30268
+// 0x0101d0ac: 0x101d0ac: addiu a3, a3, -30268
 	ldloc 4
 	ldc.i4 -30268
 	add
 	stloc 4
-// 0x0101d0a0: 0x101d0a0: addiu a2, zero, 351
+// 0x0101d0b0: 0x101d0b0: addiu a2, zero, 351
 	ldc.i4 351
 	stloc.3
-// 0x0101d0a4: 0x101d0a4: jal   0x100449c addiu a0, zero, 2
+// 0x0101d0b4: 0x101d0b4: jal   0x100449c addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -2411,7 +2411,7 @@ L_101d090:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101d0ac: 0x101d0ac: jal   0x10023b4 addu  a0, s0, zero
+// 0x0101d0bc: 0x101d0bc: jal   0x10023b4 addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2424,51 +2424,51 @@ L_101d090:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101d0b4: 0x101d0b4: lui   v0, 0x30000
+// 0x0101d0c4: 0x101d0c4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d0b8: 0x101d0b8: lui   a0, 0xe0000
+// 0x0101d0c8: 0x101d0c8: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x0101d0bc: 0x101d0bc: lui   v1, 0xe0000
+// 0x0101d0cc: 0x101d0cc: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x0101d0c0: 0x101d0c0: lw    a1, 28108(v0)
+// 0x0101d0d0: 0x101d0d0: lw    a1, 28572(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7027
+	ldc.i4 7143
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101d0c4: 0x101d0c4: addiu a0, a0, 29732
+// 0x0101d0d4: 0x101d0d4: addiu a0, a0, 30196
 	ldloc.1
-	ldc.i4 29732
+	ldc.i4 30196
 	add
 	stloc.1
-// 0x0101d0c8: 0x101d0c8: addiu v1, v1, 30132
+// 0x0101d0d8: 0x101d0d8: addiu v1, v1, 30596
 	ldloc 7
-	ldc.i4 30132
+	ldc.i4 30596
 	add
 	stloc 7
-// 0x0101d0cc: 0x101d0cc: cibyl_sysc_arg 0x3
+// 0x0101d0dc: 0x101d0dc: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0101d0d0: 0x101d0d0: cibyl_sysc_arg 0x4
+// 0x0101d0e0: 0x101d0e0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0101d0d4: 0x101d0d4: cibyl_sysc_arg 0x5
+// 0x0101d0e4: 0x101d0e4: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0101d0d8: 0x101d0d8: cibyl_sysc 0x359
+// 0x0101d0e8: 0x101d0e8: cibyl_sysc 0x359
 	call void [WazeWP7]Syscalls::NOPH_LanguagesLoaded(int32,int32,int32)
-// 0x0101d0dc: 0x101d0dc: addu  v1, v0, zero
+// 0x0101d0ec: 0x101d0ec: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0101d0e0: 0x101d0e0: addiu v0, zero, 1
+// 0x0101d0f0: 0x101d0f0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_101d0e4:
-// 0x0101d0e4: 0x101d0e4: lw    ra, 1100(sp)
-// 0x0101d0e8: 0x101d0e8: lw    s7, 1096(sp)
+L_101d0f4:
+// 0x0101d0f4: 0x101d0f4: lw    ra, 1100(sp)
+// 0x0101d0f8: 0x101d0f8: lw    s7, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2477,7 +2477,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101d0ec: 0x101d0ec: lw    s6, 1092(sp)
+// 0x0101d0fc: 0x101d0fc: lw    s6, 1092(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2486,7 +2486,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101d0f0: 0x101d0f0: lw    s5, 1088(sp)
+// 0x0101d100: 0x101d100: lw    s5, 1088(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2495,7 +2495,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101d0f4: 0x101d0f4: lw    s4, 1084(sp)
+// 0x0101d104: 0x101d104: lw    s4, 1084(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2504,7 +2504,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101d0f8: 0x101d0f8: lw    s3, 1080(sp)
+// 0x0101d108: 0x101d108: lw    s3, 1080(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2513,7 +2513,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101d0fc: 0x101d0fc: lw    s2, 1076(sp)
+// 0x0101d10c: 0x101d10c: lw    s2, 1076(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2522,7 +2522,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101d100: 0x101d100: lw    s1, 1072(sp)
+// 0x0101d110: 0x101d110: lw    s1, 1072(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2531,7 +2531,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101d104: 0x101d104: lw    s0, 1068(sp)
+// 0x0101d114: 0x101d114: lw    s0, 1068(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2540,7 +2540,7 @@ L_101d0e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101d108: 0x101d108: jr    ra addiu sp, sp, 1104
+// 0x0101d118: 0x101d118: jr    ra addiu sp, sp, 1104
 	ldloc.0
 	ldc.i4 1104
 	add
@@ -2552,7 +2552,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_get_lang_file_update_time_101d110(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_get_lang_file_update_time_101d120(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -2590,12 +2590,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d110: 0x101d110: addiu sp, sp, -40
+// 0x0101d120: 0x101d120: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101d114: 0x101d114: sw    s0, 32(sp)
+// 0x0101d124: 0x101d124: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2604,7 +2604,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101d118: 0x101d118: sw    a0, 16(sp)
+// 0x0101d128: 0x101d128: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2613,43 +2613,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101d11c: 0x101d11c: addiu s0, sp, 16
+// 0x0101d12c: 0x101d12c: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x0101d120: 0x101d120: lui   a0, 0x10000
+// 0x0101d130: 0x101d130: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101d124: 0x101d124: lui   a2, 0x10000
+// 0x0101d134: 0x101d134: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101d128: 0x101d128: lui   v0, 0x20000
+// 0x0101d138: 0x101d138: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0101d12c: 0x101d12c: addu  a1, s0, zero
+// 0x0101d13c: 0x101d13c: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0101d130: 0x101d130: addiu v0, v0, -20600
+// 0x0101d140: 0x101d140: addiu v0, v0, -20136
 	ldloc 5
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 5
-// 0x0101d134: 0x101d134: addiu a0, a0, 18248
+// 0x0101d144: 0x101d144: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0101d138: 0x101d138: addiu a2, a2, 18500
+// 0x0101d148: 0x101d148: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0101d13c: 0x101d13c: addu  a3, zero, zero
+// 0x0101d14c: 0x101d14c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101d140: 0x101d140: sw    ra, 36(sp)
-// 0x0101d144: 0x101d144: jal   0x100edb0 sw    v0, 20(sp)
+// 0x0101d150: 0x101d150: sw    ra, 36(sp)
+// 0x0101d154: 0x101d154: jal   0x100edc0 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2663,12 +2663,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0101d14c: 0x101d14c: jal   0x100e348 addu  a0, s0, zero
+// 0x0101d15c: 0x101d15c: jal   0x100e358 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -2676,13 +2676,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0101d154: 0x101d154: lw    ra, 36(sp)
-// 0x0101d158: 0x101d158: lw    s0, 32(sp)
+// 0x0101d164: 0x101d164: lw    ra, 36(sp)
+// 0x0101d168: 0x101d168: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2691,7 +2691,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101d15c: 0x101d15c: jr    ra addiu sp, sp, 40
+// 0x0101d16c: 0x101d16c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2703,7 +2703,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_download_lang_file_101d164(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_download_lang_file_101d174(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -2744,13 +2744,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d164: 0x101d164: addiu sp, sp, -312
+// 0x0101d174: 0x101d174: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x0101d168: 0x101d168: sw    ra, 308(sp)
-// 0x0101d16c: 0x101d16c: sw    s1, 304(sp)
+// 0x0101d178: 0x101d178: sw    ra, 308(sp)
+// 0x0101d17c: 0x101d17c: sw    s1, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2759,7 +2759,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101d170: 0x101d170: sw    s0, 300(sp)
+// 0x0101d180: 0x101d180: sw    s0, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2768,7 +2768,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101d174: 0x101d174: sw    a0, 288(sp)
+// 0x0101d184: 0x101d184: sw    a0, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2777,7 +2777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101d178: 0x101d178: jal   0x101d110 addu  s0, a1, zero
+// 0x0101d188: 0x101d188: jal   0x101d120 addu  s0, a1, zero
 	ldloc.2
 	stloc 9
 	ldloc.0
@@ -2785,15 +2785,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_lang_file_update_time_101d110(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_lang_file_update_time_101d120(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d180: 0x101d180: lui   a1, 0x10000
+// 0x0101d190: 0x101d190: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101d184: 0x101d184: lw    a2, 288(sp)
+// 0x0101d194: 0x101d194: lw    a2, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2802,15 +2802,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101d188: 0x101d188: addu  s1, v0, zero
+// 0x0101d198: 0x101d198: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0101d18c: 0x101d18c: addiu a1, a1, -30236
+// 0x0101d19c: 0x101d19c: addiu a1, a1, -30236
 	ldloc.2
 	ldc.i4 -30236
 	add
 	stloc.2
-// 0x0101d190: 0x101d190: jal   0x1000f64 addiu a0, sp, 32
+// 0x0101d1a0: 0x101d1a0: jal   0x1000f64 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2825,18 +2825,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d198: 0x101d198: lb    v1, 0(s1)
+// 0x0101d1a8: 0x101d1a8: lb    v1, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0101d19c: 0x101d19c: sll   zero, zero, 0
-// 0x0101d1a0: 0x101d1a0: beq   v1, zero, 0x101d1b0 addu  v0, zero, zero
+// 0x0101d1ac: 0x101d1ac: sll   zero, zero, 0
+// 0x0101d1b0: 0x101d1b0: beq   v1, zero, 0x101d1c0 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_101d1b0
+	brfalse L_101d1c0
 // --- basic block ---
-// 0x0101d1a8: 0x101d1a8: jal   0x106a58c addu  a0, s1, zero
+// 0x0101d1b8: 0x101d1b8: jal   0x106abb0 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2844,13 +2844,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::WDF_TimeFromModifiedSince_106a58c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::WDF_TimeFromModifiedSince_106abb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_101d1b0:
-// 0x0101d1b0: 0x101d1b0: sw    v0, 20(sp)
+L_101d1c0:
+// 0x0101d1c0: 0x101d1c0: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2859,37 +2859,37 @@ L_101d1b0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d1b4: 0x101d1b4: lui   a3, 0x10000
+// 0x0101d1c4: 0x101d1c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101d1b8: 0x101d1b8: lui   v0, 0x1020000
+// 0x0101d1c8: 0x101d1c8: lui   v0, 0x1020000
 	ldc.i4 16908288
 	stloc 6
-// 0x0101d1bc: 0x101d1bc: addiu a1, sp, 32
+// 0x0101d1cc: 0x101d1cc: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0101d1c0: 0x101d1c0: addiu v1, zero, 1
+// 0x0101d1d0: 0x101d1d0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0101d1c4: 0x101d1c4: addiu v0, v0, -9888
+// 0x0101d1d4: 0x101d1d4: addiu v0, v0, -9872
 	ldloc 6
-	ldc.i4 -9888
+	ldc.i4 -9872
 	add
 	stloc 6
-// 0x0101d1c8: 0x101d1c8: addiu a3, a3, 18500
+// 0x0101d1d8: 0x101d1d8: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0101d1cc: 0x101d1cc: addiu a0, zero, 3
+// 0x0101d1dc: 0x101d1dc: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0101d1d0: 0x101d1d0: addu  a2, zero, zero
+// 0x0101d1e0: 0x101d1e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101d1d4: 0x101d1d4: sw    s0, 28(sp)
+// 0x0101d1e4: 0x101d1e4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2898,7 +2898,7 @@ L_101d1b0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101d1d8: 0x101d1d8: sw    v1, 16(sp)
+// 0x0101d1e8: 0x101d1e8: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2907,7 +2907,7 @@ L_101d1b0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101d1dc: 0x101d1dc: jal   0x10a2c58 sw    v0, 24(sp)
+// 0x0101d1ec: 0x101d1ec: jal   0x10a32a0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2921,13 +2921,13 @@ L_101d1b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d1e4: 0x101d1e4: lw    ra, 308(sp)
-// 0x0101d1e8: 0x101d1e8: lw    s1, 304(sp)
+// 0x0101d1f4: 0x101d1f4: lw    ra, 308(sp)
+// 0x0101d1f8: 0x101d1f8: lw    s1, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2936,7 +2936,7 @@ L_101d1b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101d1ec: 0x101d1ec: lw    s0, 300(sp)
+// 0x0101d1fc: 0x101d1fc: lw    s0, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2945,7 +2945,7 @@ L_101d1b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101d1f0: 0x101d1f0: jr    ra addiu sp, sp, 312
+// 0x0101d200: 0x101d200: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
@@ -2957,7 +2957,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2992,37 +2992,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d1f8: 0x101d1f8: lui   a0, 0x20000
+// 0x0101d208: 0x101d208: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0101d1fc: 0x101d1fc: lui   a1, 0x0
+// 0x0101d20c: 0x101d20c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101d200: 0x101d200: lui   a2, 0x0
+// 0x0101d210: 0x101d210: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101d204: 0x101d204: addiu sp, sp, -24
+// 0x0101d214: 0x101d214: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d208: 0x101d208: addiu a0, a0, -26888
+// 0x0101d218: 0x101d218: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0101d20c: 0x101d20c: addiu a1, a1, 4844
+// 0x0101d21c: 0x101d21c: addiu a1, a1, 4844
 	ldloc.2
 	ldc.i4 4844
 	add
 	stloc.2
-// 0x0101d210: 0x101d210: addiu a2, a2, 28132
+// 0x0101d220: 0x101d220: addiu a2, a2, 28132
 	ldloc.3
 	ldc.i4 28132
 	add
 	stloc.3
-// 0x0101d214: 0x101d214: sw    ra, 20(sp)
-// 0x0101d218: 0x101d218: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101d224: 0x101d224: sw    ra, 20(sp)
+// 0x0101d228: 0x101d228: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3030,36 +3030,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d220: 0x101d220: lui   a0, 0x10000
+// 0x0101d230: 0x101d230: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101d224: 0x101d224: lui   a1, 0x0
+// 0x0101d234: 0x101d234: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101d228: 0x101d228: lui   a2, 0x10000
+// 0x0101d238: 0x101d238: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101d22c: 0x101d22c: addiu a0, a0, 12560
+// 0x0101d23c: 0x101d23c: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0101d230: 0x101d230: addiu a1, a1, 4828
+// 0x0101d240: 0x101d240: addiu a1, a1, 4828
 	ldloc.2
 	ldc.i4 4828
 	add
 	stloc.2
-// 0x0101d234: 0x101d234: addiu a2, a2, -30220
+// 0x0101d244: 0x101d244: addiu a2, a2, -30220
 	ldloc.3
 	ldc.i4 -30220
 	add
 	stloc.3
-// 0x0101d238: 0x101d238: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101d248: 0x101d248: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3067,36 +3067,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d240: 0x101d240: lui   a0, 0x10000
+// 0x0101d250: 0x101d250: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101d244: 0x101d244: lui   a1, 0x0
+// 0x0101d254: 0x101d254: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101d248: 0x101d248: lui   a2, 0x10000
+// 0x0101d258: 0x101d258: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101d24c: 0x101d24c: addiu a0, a0, 18248
+// 0x0101d25c: 0x101d25c: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0101d250: 0x101d250: addiu a1, a1, 4812
+// 0x0101d260: 0x101d260: addiu a1, a1, 4812
 	ldloc.2
 	ldc.i4 4812
 	add
 	stloc.2
-// 0x0101d254: 0x101d254: addiu a2, a2, 18500
+// 0x0101d264: 0x101d264: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0101d258: 0x101d258: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101d268: 0x101d268: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3104,14 +3104,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d260: 0x101d260: lw    ra, 20(sp)
-// 0x0101d264: 0x101d264: sll   zero, zero, 0
-// 0x0101d268: 0x101d268: jr    ra addiu sp, sp, 24
+// 0x0101d270: 0x101d270: lw    ra, 20(sp)
+// 0x0101d274: 0x101d274: sll   zero, zero, 0
+// 0x0101d278: 0x101d278: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3123,7 +3123,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_set_update_time_101d270(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_set_update_time_101d280(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3158,31 +3158,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d270: 0x101d270: lui   v0, 0x30000
+// 0x0101d280: 0x101d280: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d274: 0x101d274: lw    v0, 28120(v0)
+// 0x0101d284: 0x101d284: lw    v0, 28584(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7030
+	ldc.i4 7146
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101d278: 0x101d278: addiu sp, sp, -32
+// 0x0101d288: 0x101d288: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101d27c: 0x101d27c: sw    ra, 28(sp)
-// 0x0101d280: 0x101d280: bne   v0, zero, 0x101d294 addu  a1, a0, zero
+// 0x0101d28c: 0x101d28c: sw    ra, 28(sp)
+// 0x0101d290: 0x101d290: bne   v0, zero, 0x101d2a4 addu  a1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc.2
-	brtrue L_101d294
+	brtrue L_101d2a4
 // --- basic block ---
-// 0x0101d288: 0x101d288: jal   0x101d1f8 sw    a0, 16(sp)
+// 0x0101d298: 0x101d298: jal   0x101d208 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3196,12 +3196,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d290: 0x101d290: lw    a1, 16(sp)
+// 0x0101d2a0: 0x101d2a0: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3210,11 +3210,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_101d294:
-// 0x0101d294: 0x101d294: lui   a0, 0x0
+L_101d2a4:
+// 0x0101d2a4: 0x101d2a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101d298: 0x101d298: jal   0x100e5c0 addiu a0, a0, 4812
+// 0x0101d2a8: 0x101d2a8: jal   0x100e5d0 addiu a0, a0, 4812
 	ldloc.1
 	ldc.i4 4812
 	add
@@ -3224,14 +3224,14 @@ L_101d294:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d2a0: 0x101d2a0: lw    ra, 28(sp)
-// 0x0101d2a4: 0x101d2a4: sll   zero, zero, 0
-// 0x0101d2a8: 0x101d2a8: jr    ra addiu sp, sp, 32
+// 0x0101d2b0: 0x101d2b0: lw    ra, 28(sp)
+// 0x0101d2b4: 0x101d2b4: sll   zero, zero, 0
+// 0x0101d2b8: 0x101d2b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3243,7 +3243,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_conf_file_downloaded_101d2b0(int32,int32,int32,int32,int32)
+.method public static int32 on_conf_file_downloaded_101d2c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -3281,12 +3281,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d2b0: 0x101d2b0: addiu sp, sp, -24
+// 0x0101d2c0: 0x101d2c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d2b4: 0x101d2b4: sw    s0, 16(sp)
+// 0x0101d2c4: 0x101d2c4: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3295,53 +3295,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d2b8: 0x101d2b8: sw    ra, 20(sp)
-// 0x0101d2bc: 0x101d2bc: addu  s0, a2, zero
+// 0x0101d2c8: 0x101d2c8: sw    ra, 20(sp)
+// 0x0101d2cc: 0x101d2cc: addu  s0, a2, zero
 	ldloc.3
 	stloc 6
-// 0x0101d2c0: 0x101d2c0: beq   a1, zero, 0x101d2e8 addu  a0, a3, zero
+// 0x0101d2d0: 0x101d2d0: beq   a1, zero, 0x101d2f8 addu  a0, a3, zero
 	ldloc.2
 	ldloc 4
 	stloc.1
-	brfalse L_101d2e8
+	brfalse L_101d2f8
 // --- basic block ---
-// 0x0101d2c8: 0x101d2c8: beq   a3, zero, 0x101d2e8 sll   zero, zero, 0
+// 0x0101d2d8: 0x101d2d8: beq   a3, zero, 0x101d2f8 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_101d2e8
+	brfalse L_101d2f8
 // --- basic block ---
-// 0x0101d2d0: 0x101d2d0: lb    v0, 0(a3)
+// 0x0101d2e0: 0x101d2e0: lb    v0, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101d2d4: 0x101d2d4: sll   zero, zero, 0
-// 0x0101d2d8: 0x101d2d8: beq   v0, zero, 0x101d2e8 sll   zero, zero, 0
+// 0x0101d2e4: 0x101d2e4: sll   zero, zero, 0
+// 0x0101d2e8: 0x101d2e8: beq   v0, zero, 0x101d2f8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101d2e8
+	brfalse L_101d2f8
 // --- basic block ---
-// 0x0101d2e0: 0x101d2e0: jal   0x101d270 sll   zero, zero, 0
+// 0x0101d2f0: 0x101d2f0: jal   0x101d280 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_update_time_101d270(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_update_time_101d280(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101d2e8:
-// 0x0101d2e8: 0x101d2e8: jal   0x104c524 sll   zero, zero, 0
+L_101d2f8:
+// 0x0101d2f8: 0x101d2f8: jal   0x104c534 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d2f0: 0x101d2f0: jal   0x101cf20 addu  a0, v0, zero
+// 0x0101d300: 0x101d300: jal   0x101cf30 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3349,16 +3349,16 @@ L_101d2e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_conf_load_101cf20(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_conf_load_101cf30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d2f8: 0x101d2f8: beq   s0, zero, 0x101d308 sll   zero, zero, 0
+// 0x0101d308: 0x101d308: beq   s0, zero, 0x101d318 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101d308
+	brfalse L_101d318
 // --- basic block ---
-// 0x0101d300: 0x101d300: jalr  s0 sll   zero, zero, 0
+// 0x0101d310: 0x101d310: jalr  s0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -3370,9 +3370,9 @@ L_101d2e8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101d308:
-// 0x0101d308: 0x101d308: lw    ra, 20(sp)
-// 0x0101d30c: 0x101d30c: lw    s0, 16(sp)
+L_101d318:
+// 0x0101d318: 0x101d318: lw    ra, 20(sp)
+// 0x0101d31c: 0x101d31c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3381,7 +3381,7 @@ L_101d308:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101d310: 0x101d310: jr    ra addiu sp, sp, 24
+// 0x0101d320: 0x101d320: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3393,7 +3393,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_get_update_time_101d318(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_get_update_time_101d328(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3428,43 +3428,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d318: 0x101d318: lui   v0, 0x30000
+// 0x0101d328: 0x101d328: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d31c: 0x101d31c: lw    v0, 28120(v0)
+// 0x0101d32c: 0x101d32c: lw    v0, 28584(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7030
+	ldc.i4 7146
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101d320: 0x101d320: addiu sp, sp, -24
+// 0x0101d330: 0x101d330: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d324: 0x101d324: bne   v0, zero, 0x101d334 sw    ra, 20(sp)
+// 0x0101d334: 0x101d334: bne   v0, zero, 0x101d344 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_101d334
+	brtrue L_101d344
 // --- basic block ---
-// 0x0101d32c: 0x101d32c: jal   0x101d1f8 sll   zero, zero, 0
+// 0x0101d33c: 0x101d33c: jal   0x101d208 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101d334:
-// 0x0101d334: 0x101d334: lui   a0, 0x0
+L_101d344:
+// 0x0101d344: 0x101d344: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101d338: 0x101d338: jal   0x100e348 addiu a0, a0, 4812
+// 0x0101d348: 0x101d348: jal   0x100e358 addiu a0, a0, 4812
 	ldloc.1
 	ldc.i4 4812
 	add
@@ -3474,14 +3474,14 @@ L_101d334:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d340: 0x101d340: lw    ra, 20(sp)
-// 0x0101d344: 0x101d344: sll   zero, zero, 0
-// 0x0101d348: 0x101d348: jr    ra addiu sp, sp, 24
+// 0x0101d350: 0x101d350: lw    ra, 20(sp)
+// 0x0101d354: 0x101d354: sll   zero, zero, 0
+// 0x0101d358: 0x101d358: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3493,7 +3493,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_download_conf_file_101d350(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_download_conf_file_101d360(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -3531,12 +3531,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d350: 0x101d350: addiu sp, sp, -40
+// 0x0101d360: 0x101d360: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101d354: 0x101d354: sw    s0, 32(sp)
+// 0x0101d364: 0x101d364: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3545,8 +3545,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101d358: 0x101d358: sw    ra, 36(sp)
-// 0x0101d35c: 0x101d35c: jal   0x101d318 addu  s0, a0, zero
+// 0x0101d368: 0x101d368: sw    ra, 36(sp)
+// 0x0101d36c: 0x101d36c: jal   0x101d328 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -3554,72 +3554,72 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_update_time_101d318(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_update_time_101d328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d364: 0x101d364: addu  a0, v0, zero
+// 0x0101d374: 0x101d374: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101d368: 0x101d368: lui   v0, 0x30000
+// 0x0101d378: 0x101d378: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d36c: 0x101d36c: lw    v1, 28128(v0)
+// 0x0101d37c: 0x101d37c: lw    v1, 28592(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7032
+	ldc.i4 7148
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101d370: 0x101d370: sll   zero, zero, 0
-// 0x0101d374: 0x101d374: bne   v1, zero, 0x101d3d0 addiu v1, zero, 1
+// 0x0101d380: 0x101d380: sll   zero, zero, 0
+// 0x0101d384: 0x101d384: bne   v1, zero, 0x101d3e0 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_101d3d0
+	brtrue L_101d3e0
 // --- basic block ---
-// 0x0101d37c: 0x101d37c: sw    v1, 28128(v0)
+// 0x0101d38c: 0x101d38c: sw    v1, 28592(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7032
+	ldc.i4 7148
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d380: 0x101d380: lb    v1, 0(a0)
+// 0x0101d390: 0x101d390: lb    v1, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101d384: 0x101d384: sll   zero, zero, 0
-// 0x0101d388: 0x101d388: beq   v1, zero, 0x101d398 addu  v0, zero, zero
+// 0x0101d394: 0x101d394: sll   zero, zero, 0
+// 0x0101d398: 0x101d398: beq   v1, zero, 0x101d3a8 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_101d398
+	brfalse L_101d3a8
 // --- basic block ---
-// 0x0101d390: 0x101d390: jal   0x106a58c sll   zero, zero, 0
+// 0x0101d3a0: 0x101d3a0: jal   0x106abb0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::WDF_TimeFromModifiedSince_106a58c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::WDF_TimeFromModifiedSince_106abb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_101d398:
-// 0x0101d398: 0x101d398: lui   a1, 0x10000
+L_101d3a8:
+// 0x0101d3a8: 0x101d3a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101d39c: 0x101d39c: lui   a3, 0x10000
+// 0x0101d3ac: 0x101d3ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101d3a0: 0x101d3a0: sw    v0, 20(sp)
+// 0x0101d3b0: 0x101d3b0: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3628,34 +3628,34 @@ L_101d398:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101d3a4: 0x101d3a4: lui   v0, 0x1020000
+// 0x0101d3b4: 0x101d3b4: lui   v0, 0x1020000
 	ldc.i4 16908288
 	stloc 5
-// 0x0101d3a8: 0x101d3a8: addiu v1, zero, 1
+// 0x0101d3b8: 0x101d3b8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0101d3ac: 0x101d3ac: addiu v0, v0, -11600
+// 0x0101d3bc: 0x101d3bc: addiu v0, v0, -11584
 	ldloc 5
-	ldc.i4 -11600
+	ldc.i4 -11584
 	add
 	stloc 5
-// 0x0101d3b0: 0x101d3b0: addiu a1, a1, -30304
+// 0x0101d3c0: 0x101d3c0: addiu a1, a1, -30304
 	ldloc.2
 	ldc.i4 -30304
 	add
 	stloc.2
-// 0x0101d3b4: 0x101d3b4: addiu a3, a3, 18500
+// 0x0101d3c4: 0x101d3c4: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0101d3b8: 0x101d3b8: addiu a0, zero, 2
+// 0x0101d3c8: 0x101d3c8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0101d3bc: 0x101d3bc: addu  a2, zero, zero
+// 0x0101d3cc: 0x101d3cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101d3c0: 0x101d3c0: sw    v1, 16(sp)
+// 0x0101d3d0: 0x101d3d0: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3664,7 +3664,7 @@ L_101d398:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d3c4: 0x101d3c4: sw    v0, 24(sp)
+// 0x0101d3d4: 0x101d3d4: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3673,7 +3673,7 @@ L_101d398:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101d3c8: 0x101d3c8: jal   0x10a2c58 sw    s0, 28(sp)
+// 0x0101d3d8: 0x101d3d8: jal   0x10a32a0 sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3687,14 +3687,14 @@ L_101d398:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_101d3d0:
-// 0x0101d3d0: 0x101d3d0: lw    ra, 36(sp)
-// 0x0101d3d4: 0x101d3d4: lw    s0, 32(sp)
+L_101d3e0:
+// 0x0101d3e0: 0x101d3e0: lw    ra, 36(sp)
+// 0x0101d3e4: 0x101d3e4: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3703,7 +3703,7 @@ L_101d3d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101d3d8: 0x101d3d8: jr    ra addiu sp, sp, 40
+// 0x0101d3e8: 0x101d3e8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3715,7 +3715,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_get_default_lang_101d3e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_get_default_lang_101d3f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3750,43 +3750,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d3e0: 0x101d3e0: lui   v0, 0x30000
+// 0x0101d3f0: 0x101d3f0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d3e4: 0x101d3e4: lw    v0, 28120(v0)
+// 0x0101d3f4: 0x101d3f4: lw    v0, 28584(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7030
+	ldc.i4 7146
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101d3e8: 0x101d3e8: addiu sp, sp, -24
+// 0x0101d3f8: 0x101d3f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d3ec: 0x101d3ec: bne   v0, zero, 0x101d3fc sw    ra, 20(sp)
+// 0x0101d3fc: 0x101d3fc: bne   v0, zero, 0x101d40c sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_101d3fc
+	brtrue L_101d40c
 // --- basic block ---
-// 0x0101d3f4: 0x101d3f4: jal   0x101d1f8 sll   zero, zero, 0
+// 0x0101d404: 0x101d404: jal   0x101d208 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101d3fc:
-// 0x0101d3fc: 0x101d3fc: lui   a0, 0x0
+L_101d40c:
+// 0x0101d40c: 0x101d40c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101d400: 0x101d400: jal   0x100e348 addiu a0, a0, 4828
+// 0x0101d410: 0x101d410: jal   0x100e358 addiu a0, a0, 4828
 	ldloc.1
 	ldc.i4 4828
 	add
@@ -3796,14 +3796,14 @@ L_101d3fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d408: 0x101d408: lw    ra, 20(sp)
-// 0x0101d40c: 0x101d40c: sll   zero, zero, 0
-// 0x0101d410: 0x101d410: jr    ra addiu sp, sp, 24
+// 0x0101d418: 0x101d418: lw    ra, 20(sp)
+// 0x0101d41c: 0x101d41c: sll   zero, zero, 0
+// 0x0101d420: 0x101d420: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3815,7 +3815,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_get_user_lang_101d418(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_get_user_lang_101d428(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -3853,15 +3853,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d418: 0x101d418: lui   a0, 0x0
+// 0x0101d428: 0x101d428: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101d41c: 0x101d41c: addiu sp, sp, -24
+// 0x0101d42c: 0x101d42c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d420: 0x101d420: sw    s0, 16(sp)
+// 0x0101d430: 0x101d430: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3870,8 +3870,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d424: 0x101d424: sw    ra, 20(sp)
-// 0x0101d428: 0x101d428: jal   0x100e348 addiu a0, a0, 4844
+// 0x0101d434: 0x101d434: sw    ra, 20(sp)
+// 0x0101d438: 0x101d438: jal   0x100e358 addiu a0, a0, 4844
 	ldloc.1
 	ldc.i4 4844
 	add
@@ -3881,54 +3881,54 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d430: 0x101d430: addu  s0, v0, zero
+// 0x0101d440: 0x101d440: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0101d434: 0x101d434: lui   v0, 0x30000
+// 0x0101d444: 0x101d444: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d438: 0x101d438: lw    v0, 28120(v0)
+// 0x0101d448: 0x101d448: lw    v0, 28584(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7030
+	ldc.i4 7146
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101d43c: 0x101d43c: sll   zero, zero, 0
-// 0x0101d440: 0x101d440: bne   v0, zero, 0x101d454 lui   a1, 0x0
+// 0x0101d44c: 0x101d44c: sll   zero, zero, 0
+// 0x0101d450: 0x101d450: bne   v0, zero, 0x101d464 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_101d454
+	brtrue L_101d464
 // --- basic block ---
-// 0x0101d448: 0x101d448: jal   0x101d1f8 sll   zero, zero, 0
+// 0x0101d458: 0x101d458: jal   0x101d208 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d450: 0x101d450: lui   a1, 0x0
+// 0x0101d460: 0x101d460: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_101d454:
-// 0x0101d454: 0x101d454: addiu a1, a1, 28132
+L_101d464:
+// 0x0101d464: 0x101d464: addiu a1, a1, 28132
 	ldloc.2
 	ldc.i4 28132
 	add
 	stloc.2
-// 0x0101d458: 0x101d458: jal   0x1001b14 addu  a0, s0, zero
+// 0x0101d468: 0x101d468: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
@@ -3936,24 +3936,24 @@ L_101d454:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101d460: 0x101d460: bne   v0, zero, 0x101d470 sll   zero, zero, 0
+// 0x0101d470: 0x101d470: bne   v0, zero, 0x101d480 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101d470
+	brtrue L_101d480
 // --- basic block ---
-// 0x0101d468: 0x101d468: lui   s0, 0x10000
+// 0x0101d478: 0x101d478: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0101d46c: 0x101d46c: addiu s0, s0, 18500
+// 0x0101d47c: 0x101d47c: addiu s0, s0, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-L_101d470:
-// 0x0101d470: 0x101d470: lw    ra, 20(sp)
-// 0x0101d474: 0x101d474: addu  v0, s0, zero
+L_101d480:
+// 0x0101d480: 0x101d480: lw    ra, 20(sp)
+// 0x0101d484: 0x101d484: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-// 0x0101d478: 0x101d478: lw    s0, 16(sp)
+// 0x0101d488: 0x101d488: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3962,7 +3962,7 @@ L_101d470:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101d47c: 0x101d47c: jr    ra addiu sp, sp, 24
+// 0x0101d48c: 0x101d48c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3974,7 +3974,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -4012,15 +4012,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d484: 0x101d484: lui   a0, 0x0
+// 0x0101d494: 0x101d494: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101d488: 0x101d488: addiu sp, sp, -24
+// 0x0101d498: 0x101d498: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d48c: 0x101d48c: sw    s0, 16(sp)
+// 0x0101d49c: 0x101d49c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4029,8 +4029,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d490: 0x101d490: sw    ra, 20(sp)
-// 0x0101d494: 0x101d494: jal   0x100e348 addiu a0, a0, 4844
+// 0x0101d4a0: 0x101d4a0: sw    ra, 20(sp)
+// 0x0101d4a4: 0x101d4a4: jal   0x100e358 addiu a0, a0, 4844
 	ldloc.1
 	ldc.i4 4844
 	add
@@ -4040,54 +4040,54 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d49c: 0x101d49c: addu  s0, v0, zero
+// 0x0101d4ac: 0x101d4ac: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0101d4a0: 0x101d4a0: lui   v0, 0x30000
+// 0x0101d4b0: 0x101d4b0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d4a4: 0x101d4a4: lw    v0, 28120(v0)
+// 0x0101d4b4: 0x101d4b4: lw    v0, 28584(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7030
+	ldc.i4 7146
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101d4a8: 0x101d4a8: sll   zero, zero, 0
-// 0x0101d4ac: 0x101d4ac: bne   v0, zero, 0x101d4c0 lui   a1, 0x0
+// 0x0101d4b8: 0x101d4b8: sll   zero, zero, 0
+// 0x0101d4bc: 0x101d4bc: bne   v0, zero, 0x101d4d0 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_101d4c0
+	brtrue L_101d4d0
 // --- basic block ---
-// 0x0101d4b4: 0x101d4b4: jal   0x101d1f8 sll   zero, zero, 0
+// 0x0101d4c4: 0x101d4c4: jal   0x101d208 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d4bc: 0x101d4bc: lui   a1, 0x0
+// 0x0101d4cc: 0x101d4cc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_101d4c0:
-// 0x0101d4c0: 0x101d4c0: addiu a1, a1, 28132
+L_101d4d0:
+// 0x0101d4d0: 0x101d4d0: addiu a1, a1, 28132
 	ldloc.2
 	ldc.i4 28132
 	add
 	stloc.2
-// 0x0101d4c4: 0x101d4c4: jal   0x1001b14 addu  a0, s0, zero
+// 0x0101d4d4: 0x101d4d4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
@@ -4095,30 +4095,30 @@ L_101d4c0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101d4cc: 0x101d4cc: bne   v0, zero, 0x101d4e0 sll   zero, zero, 0
+// 0x0101d4dc: 0x101d4dc: bne   v0, zero, 0x101d4f0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101d4e0
+	brtrue L_101d4f0
 // --- basic block ---
-// 0x0101d4d4: 0x101d4d4: jal   0x101d3e0 sll   zero, zero, 0
+// 0x0101d4e4: 0x101d4e4: jal   0x101d3f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_default_lang_101d3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_default_lang_101d3f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d4dc: 0x101d4dc: addu  s0, v0, zero
+// 0x0101d4ec: 0x101d4ec: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-L_101d4e0:
-// 0x0101d4e0: 0x101d4e0: lw    ra, 20(sp)
-// 0x0101d4e4: 0x101d4e4: addu  v0, s0, zero
+L_101d4f0:
+// 0x0101d4f0: 0x101d4f0: lw    ra, 20(sp)
+// 0x0101d4f4: 0x101d4f4: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-// 0x0101d4e8: 0x101d4e8: lw    s0, 16(sp)
+// 0x0101d4f8: 0x101d4f8: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4127,7 +4127,7 @@ L_101d4e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101d4ec: 0x101d4ec: jr    ra addiu sp, sp, 24
+// 0x0101d4fc: 0x101d4fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4139,7 +4139,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_load_101d4f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_load_101d504(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -4201,13 +4201,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d4f4: 0x101d4f4: addiu sp, sp, -128
+// 0x0101d504: 0x101d504: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x0101d4f8: 0x101d4f8: sw    ra, 124(sp)
-// 0x0101d4fc: 0x101d4fc: sw    s1, 92(sp)
+// 0x0101d508: 0x101d508: sw    ra, 124(sp)
+// 0x0101d50c: 0x101d50c: sw    s1, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101d500: 0x101d500: sw    s0, 88(sp)
+// 0x0101d510: 0x101d510: sw    s0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4225,15 +4225,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101d504: 0x101d504: addu  s1, a0, zero
+// 0x0101d514: 0x101d514: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0101d508: 0x101d508: addiu s0, sp, 48
+// 0x0101d518: 0x101d518: addiu s0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 8
-// 0x0101d50c: 0x101d50c: sw    s8, 120(sp)
+// 0x0101d51c: 0x101d51c: sw    s8, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4242,7 +4242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101d510: 0x101d510: sw    s7, 116(sp)
+// 0x0101d520: 0x101d520: sw    s7, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4251,7 +4251,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101d514: 0x101d514: sw    s6, 112(sp)
+// 0x0101d524: 0x101d524: sw    s6, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4260,7 +4260,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101d518: 0x101d518: sw    s5, 108(sp)
+// 0x0101d528: 0x101d528: sw    s5, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4269,7 +4269,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101d51c: 0x101d51c: sw    s4, 104(sp)
+// 0x0101d52c: 0x101d52c: sw    s4, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4278,7 +4278,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101d520: 0x101d520: sw    s3, 100(sp)
+// 0x0101d530: 0x101d530: sw    s3, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4287,7 +4287,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101d524: 0x101d524: jal   0x101d484 sw    s2, 96(sp)
+// 0x0101d534: 0x101d534: jal   0x101d494 sw    s2, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4301,21 +4301,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d52c: 0x101d52c: lui   a1, 0x10000
+// 0x0101d53c: 0x101d53c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101d530: 0x101d530: addu  a0, s0, zero
+// 0x0101d540: 0x101d540: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0101d534: 0x101d534: addu  a2, v0, zero
+// 0x0101d544: 0x101d544: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0101d538: 0x101d538: jal   0x1000f64 addiu a1, a1, -30236
+// 0x0101d548: 0x101d548: jal   0x1000f64 addiu a1, a1, -30236
 	ldloc.2
 	ldc.i4 -30236
 	add
@@ -4330,16 +4330,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d540: 0x101d540: lui   a2, 0x0
+// 0x0101d550: 0x101d550: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101d544: 0x101d544: addu  a1, s0, zero
+// 0x0101d554: 0x101d554: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0101d548: 0x101d548: addu  a0, s1, zero
+// 0x0101d558: 0x101d558: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0101d54c: 0x101d54c: jal   0x104dac8 addiu a2, a2, 26128
+// 0x0101d55c: 0x101d55c: jal   0x104dad8 addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
@@ -4349,40 +4349,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d554: 0x101d554: addu  s0, v0, zero
+// 0x0101d564: 0x101d564: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0101d558: 0x101d558: bne   s0, zero, 0x101d614 addu  v0, zero, zero
+// 0x0101d568: 0x101d568: bne   s0, zero, 0x101d624 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_101d614
+	brtrue L_101d624
 // --- basic block ---
-// 0x0101d560: 0x101d560: j	 0x101d658 sll   zero, zero, 0
-	br L_101d658
+// 0x0101d570: 0x101d570: j	 0x101d668 sll   zero, zero, 0
+	br L_101d668
 // --- basic block ---
-L_101d568:
-// 0x0101d568: 0x101d568: jal   0x100eed8 sll   zero, zero, 0
+L_101d578:
+// 0x0101d578: 0x101d578: jal   0x100eee8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_config_get_name_value_binary_100eed8(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_config_get_name_value_binary_100eee8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d570: 0x101d570: beq   v0, zero, 0x101d64c sll   zero, zero, 0
+// 0x0101d580: 0x101d580: beq   v0, zero, 0x101d65c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101d64c
+	brfalse L_101d65c
 // --- basic block ---
-// 0x0101d578: 0x101d578: lw    v0, 24(sp)
+// 0x0101d588: 0x101d588: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4391,7 +4391,7 @@ L_101d568:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101d57c: 0x101d57c: lw    a1, 28(sp)
+// 0x0101d58c: 0x101d58c: lw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4400,10 +4400,10 @@ L_101d568:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101d580: 0x101d580: addu  a0, v0, zero
+// 0x0101d590: 0x101d590: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0101d584: 0x101d584: sw    a1, 72(sp)
+// 0x0101d594: 0x101d594: sw    a1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4412,7 +4412,7 @@ L_101d568:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101d588: 0x101d588: jal   0x10155ac sw    v0, 76(sp)
+// 0x0101d598: 0x101d598: jal   0x10155bc sw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4423,39 +4423,39 @@ L_101d568:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_string_10155ac(int32,int32)
+	call int32 Cibyl15::roadmap_hash_string_10155bc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d590: 0x101d590: lui   a1, 0x30000
+// 0x0101d5a0: 0x101d5a0: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x0101d594: 0x101d594: lw    a0, 28140(s1)
+// 0x0101d5a4: 0x101d5a4: lw    a0, 28604(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7035
+	ldc.i4 7151
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101d598: 0x101d598: lw    v1, 28136(a1)
+// 0x0101d5a8: 0x101d5a8: lw    v1, 28600(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7034
+	ldc.i4 7150
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101d59c: 0x101d59c: sll   zero, zero, 0
-// 0x0101d5a0: 0x101d5a0: bne   a0, v1, 0x101d5b4 sll   zero, zero, 0
+// 0x0101d5ac: 0x101d5ac: sll   zero, zero, 0
+// 0x0101d5b0: 0x101d5b0: bne   a0, v1, 0x101d5c4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_101d5b4
+	bne.un L_101d5c4
 // --- basic block ---
-// 0x0101d5a8: 0x101d5a8: jal   0x101ce48 sw    v0, 80(sp)
+// 0x0101d5b8: 0x101d5b8: jal   0x101ce58 sw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4469,12 +4469,12 @@ L_101d568:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_allocate_101ce48(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_allocate_101ce58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d5b0: 0x101d5b0: lw    v0, 80(sp)
+// 0x0101d5c0: 0x101d5c0: lw    v0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4483,26 +4483,26 @@ L_101d568:
 	add
 	ldelem.i4
 	stloc 6
-L_101d5b4:
-// 0x0101d5b4: 0x101d5b4: lw    a2, 28140(s1)
+L_101d5c4:
+// 0x0101d5c4: 0x101d5c4: lw    a2, 28604(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7035
+	ldc.i4 7151
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101d5b8: 0x101d5b8: lw    a0, 28132(s8)
+// 0x0101d5c8: 0x101d5c8: lw    a0, 28596(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7033
+	ldc.i4 7149
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101d5bc: 0x101d5bc: lw    a1, 76(sp)
+// 0x0101d5cc: 0x101d5cc: lw    a1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4511,24 +4511,24 @@ L_101d5b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101d5c0: 0x101d5c0: sll   v1, a2, 3
+// 0x0101d5d0: 0x101d5d0: sll   v1, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x0101d5c4: 0x101d5c4: addu  v1, a0, v1
+// 0x0101d5d4: 0x101d5d4: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0101d5c8: 0x101d5c8: sw    a1, 0(v1)
+// 0x0101d5d8: 0x101d5d8: sw    a1, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0101d5cc: 0x101d5cc: lw    a1, 72(sp)
+// 0x0101d5dc: 0x101d5dc: lw    a1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4537,16 +4537,16 @@ L_101d5b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101d5d0: 0x101d5d0: lw    a0, 28144(s7)
+// 0x0101d5e0: 0x101d5e0: lw    a0, 28608(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7036
+	ldc.i4 7152
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101d5d4: 0x101d5d4: sw    a1, 4(v1)
+// 0x0101d5e4: 0x101d5e4: sw    a1, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4555,7 +4555,7 @@ L_101d5b4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101d5d8: 0x101d5d8: jal   0x10157cc addu  a1, v0, zero
+// 0x0101d5e8: 0x101d5e8: jal   0x10157dc addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -4563,21 +4563,21 @@ L_101d5b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d5e0: 0x101d5e0: lw    v0, 28140(s1)
+// 0x0101d5f0: 0x101d5f0: lw    v0, 28604(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7035
+	ldc.i4 7151
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101d5e4: 0x101d5e4: lw    a0, 72(sp)
+// 0x0101d5f4: 0x101d5f4: lw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4586,30 +4586,30 @@ L_101d5b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101d5e8: 0x101d5e8: addiu v0, v0, 1
+// 0x0101d5f8: 0x101d5f8: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0101d5ec: 0x101d5ec: addiu a1, zero, -1
+// 0x0101d5fc: 0x101d5fc: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0101d5f0: 0x101d5f0: addu  a2, s5, zero
+// 0x0101d600: 0x101d600: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x0101d5f4: 0x101d5f4: addu  a3, s4, zero
+// 0x0101d604: 0x101d604: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x0101d5f8: 0x101d5f8: sw    v0, 28140(s1)
+// 0x0101d608: 0x101d608: sw    v0, 28604(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7035
+	ldc.i4 7151
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d5fc: 0x101d5fc: sw    s6, 44(sp)
+// 0x0101d60c: 0x101d60c: sw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4618,7 +4618,7 @@ L_101d5b4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101d600: 0x101d600: sw    s3, 16(sp)
+// 0x0101d610: 0x101d610: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4627,7 +4627,7 @@ L_101d5b4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101d604: 0x101d604: jal   0x104e968 sw    s2, 20(sp)
+// 0x0101d614: 0x101d614: jal   0x104e978 sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4641,73 +4641,73 @@ L_101d5b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d60c: 0x101d60c: j	 0x101d634 sll   zero, zero, 0
-	br L_101d634
+// 0x0101d61c: 0x101d61c: j	 0x101d644 sll   zero, zero, 0
+	br L_101d644
 // --- basic block ---
-L_101d614:
-// 0x0101d614: 0x101d614: lui   s1, 0x30000
+L_101d624:
+// 0x0101d624: 0x101d624: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x0101d618: 0x101d618: lui   s8, 0x30000
+// 0x0101d628: 0x101d628: lui   s8, 0x30000
 	ldc.i4 196608
 	stloc 16
-// 0x0101d61c: 0x101d61c: lui   s7, 0x30000
+// 0x0101d62c: 0x101d62c: lui   s7, 0x30000
 	ldc.i4 196608
 	stloc 15
-// 0x0101d620: 0x101d620: addiu s6, zero, 1
+// 0x0101d630: 0x101d630: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 14
-// 0x0101d624: 0x101d624: addiu s5, sp, 32
+// 0x0101d634: 0x101d634: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 13
-// 0x0101d628: 0x101d628: addiu s4, sp, 36
+// 0x0101d638: 0x101d638: addiu s4, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 12
-// 0x0101d62c: 0x101d62c: addiu s3, sp, 40
+// 0x0101d63c: 0x101d63c: addiu s3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 11
-// 0x0101d630: 0x101d630: addiu s2, sp, 44
+// 0x0101d640: 0x101d640: addiu s2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 10
-L_101d634:
-// 0x0101d634: 0x101d634: jal   0x1001e30 addu  a0, s0, zero
+L_101d644:
+// 0x0101d644: 0x101d644: jal   0x1001e30 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 6
 // --- basic block ---
-// 0x0101d63c: 0x101d63c: addiu a1, sp, 28
+// 0x0101d64c: 0x101d64c: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x0101d640: 0x101d640: addu  a2, s0, zero
+// 0x0101d650: 0x101d650: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x0101d644: 0x101d644: beq   v0, zero, 0x101d568 addiu a0, sp, 24
+// 0x0101d654: 0x101d654: beq   v0, zero, 0x101d578 addiu a0, sp, 24
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-	brfalse L_101d568
+	brfalse L_101d578
 // --- basic block ---
-L_101d64c:
-// 0x0101d64c: 0x101d64c: jal   0x10023b4 addu  a0, s0, zero
+L_101d65c:
+// 0x0101d65c: 0x101d65c: jal   0x10023b4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4720,12 +4720,12 @@ L_101d64c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d654: 0x101d654: addiu v0, zero, 1
+// 0x0101d664: 0x101d664: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_101d658:
-// 0x0101d658: 0x101d658: lw    ra, 124(sp)
-// 0x0101d65c: 0x101d65c: lw    s8, 120(sp)
+L_101d668:
+// 0x0101d668: 0x101d668: lw    ra, 124(sp)
+// 0x0101d66c: 0x101d66c: lw    s8, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4734,7 +4734,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101d660: 0x101d660: lw    s7, 116(sp)
+// 0x0101d670: 0x101d670: lw    s7, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4743,7 +4743,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101d664: 0x101d664: lw    s6, 112(sp)
+// 0x0101d674: 0x101d674: lw    s6, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4752,7 +4752,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101d668: 0x101d668: lw    s5, 108(sp)
+// 0x0101d678: 0x101d678: lw    s5, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4761,7 +4761,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101d66c: 0x101d66c: lw    s4, 104(sp)
+// 0x0101d67c: 0x101d67c: lw    s4, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4770,7 +4770,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101d670: 0x101d670: lw    s3, 100(sp)
+// 0x0101d680: 0x101d680: lw    s3, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4779,7 +4779,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101d674: 0x101d674: lw    s2, 96(sp)
+// 0x0101d684: 0x101d684: lw    s2, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4788,7 +4788,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101d678: 0x101d678: lw    s1, 92(sp)
+// 0x0101d688: 0x101d688: lw    s1, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4797,7 +4797,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101d67c: 0x101d67c: lw    s0, 88(sp)
+// 0x0101d68c: 0x101d68c: lw    s0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4806,7 +4806,7 @@ L_101d658:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101d680: 0x101d680: jr    ra addiu sp, sp, 128
+// 0x0101d690: 0x101d690: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -4818,7 +4818,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_lang_login_cb_101d71c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_login_cb_101d72c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -4856,12 +4856,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d71c: 0x101d71c: addiu sp, sp, -24
+// 0x0101d72c: 0x101d72c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d720: 0x101d720: sw    s0, 16(sp)
+// 0x0101d730: 0x101d730: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4870,24 +4870,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101d724: 0x101d724: lui   s0, 0x30000
+// 0x0101d734: 0x101d734: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101d728: 0x101d728: lw    v0, 28124(s0)
+// 0x0101d738: 0x101d738: lw    v0, 28588(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7031
+	ldc.i4 7147
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101d72c: 0x101d72c: sll   zero, zero, 0
-// 0x0101d730: 0x101d730: beq   v0, zero, 0x101d744 sw    ra, 20(sp)
+// 0x0101d73c: 0x101d73c: sll   zero, zero, 0
+// 0x0101d740: 0x101d740: beq   v0, zero, 0x101d754 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_101d744
+	brfalse L_101d754
 // --- basic block ---
-// 0x0101d738: 0x101d738: jalr  v0 sll   zero, zero, 0
+// 0x0101d748: 0x101d748: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4899,31 +4899,31 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d740: 0x101d740: sw    zero, 28124(s0)
+// 0x0101d750: 0x101d750: sw    zero, 28588(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7031
+	ldc.i4 7147
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101d744:
-// 0x0101d744: 0x101d744: jal   0x101d484 sll   zero, zero, 0
+L_101d754:
+// 0x0101d754: 0x101d754: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d74c: 0x101d74c: addu  a0, v0, zero
+// 0x0101d75c: 0x101d75c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101d750: 0x101d750: jal   0x101d164 addu  a1, zero, zero
+// 0x0101d760: 0x101d760: jal   0x101d174 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4931,12 +4931,12 @@ L_101d744:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_download_lang_file_101d164(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_download_lang_file_101d174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d758: 0x101d758: jal   0x101d350 addu  a0, zero, zero
+// 0x0101d768: 0x101d768: jal   0x101d360 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4944,13 +4944,13 @@ L_101d744:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_download_conf_file_101d350(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_download_conf_file_101d360(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101d760: 0x101d760: lw    ra, 20(sp)
-// 0x0101d764: 0x101d764: lw    s0, 16(sp)
+// 0x0101d770: 0x101d770: lw    ra, 20(sp)
+// 0x0101d774: 0x101d774: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4959,7 +4959,7 @@ L_101d744:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101d768: 0x101d768: jr    ra addiu sp, sp, 24
+// 0x0101d778: 0x101d778: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4971,7 +4971,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_initialize_101d7f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_initialize_101d804(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5009,50 +5009,50 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d7f4: 0x101d7f4: lui   a1, 0x10000
+// 0x0101d804: 0x101d804: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101d7f8: 0x101d7f8: lui   a3, 0x10000
+// 0x0101d808: 0x101d808: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101d7fc: 0x101d7fc: addiu sp, sp, -24
+// 0x0101d80c: 0x101d80c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101d800: 0x101d800: addiu a1, a1, -30464
+// 0x0101d810: 0x101d810: addiu a1, a1, -30464
 	ldloc.2
 	ldc.i4 -30464
 	add
 	stloc.2
-// 0x0101d804: 0x101d804: addiu a3, a3, -30212
+// 0x0101d814: 0x101d814: addiu a3, a3, -30212
 	ldloc 4
 	ldc.i4 -30212
 	add
 	stloc 4
-// 0x0101d808: 0x101d808: addiu a2, zero, 474
+// 0x0101d818: 0x101d818: addiu a2, zero, 474
 	ldc.i4 474
 	stloc.3
-// 0x0101d80c: 0x101d80c: addiu a0, zero, 2
+// 0x0101d81c: 0x101d81c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0101d810: 0x101d810: addiu v1, zero, 1
+// 0x0101d820: 0x101d820: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0101d814: 0x101d814: lui   v0, 0x30000
+// 0x0101d824: 0x101d824: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101d818: 0x101d818: sw    ra, 20(sp)
-// 0x0101d81c: 0x101d81c: sw    v1, 28120(v0)
+// 0x0101d828: 0x101d828: sw    ra, 20(sp)
+// 0x0101d82c: 0x101d82c: sw    v1, 28584(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7030
+	ldc.i4 7146
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d820: 0x101d820: jal   0x100449c sw    s0, 16(sp)
+// 0x0101d830: 0x101d830: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5071,65 +5071,65 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d828: 0x101d828: jal   0x101d1f8 sll   zero, zero, 0
+// 0x0101d838: 0x101d838: jal   0x101d208 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d830: 0x101d830: jal   0x101ce48 sll   zero, zero, 0
+// 0x0101d840: 0x101d840: jal   0x101ce58 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_allocate_101ce48(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_allocate_101ce58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d838: 0x101d838: lui   v1, 0x10000
+// 0x0101d848: 0x101d848: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0101d83c: 0x101d83c: addiu v1, v1, -30176
+// 0x0101d84c: 0x101d84c: addiu v1, v1, -30176
 	ldloc 6
 	ldc.i4 -30176
 	add
 	stloc 6
-// 0x0101d840: 0x101d840: lui   v0, 0xe0000
+// 0x0101d850: 0x101d850: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0101d844: 0x101d844: sw    v1, 30132(v0)
+// 0x0101d854: 0x101d854: sw    v1, 30596(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7533
+	ldc.i4 7649
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101d848: 0x101d848: lui   v1, 0x10000
+// 0x0101d858: 0x101d858: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0101d84c: 0x101d84c: addiu v1, v1, -30220
+// 0x0101d85c: 0x101d85c: addiu v1, v1, -30220
 	ldloc 6
 	ldc.i4 -30220
 	add
 	stloc 6
-// 0x0101d850: 0x101d850: lui   v0, 0xe0000
+// 0x0101d860: 0x101d860: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0101d854: 0x101d854: jal   0x104c564 sw    v1, 29732(v0)
+// 0x0101d864: 0x101d864: jal   0x104c574 sw    v1, 30196(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7433
+	ldc.i4 7549
 	add
 	ldloc 6
 	stelem.i4
@@ -5138,20 +5138,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d85c: 0x101d85c: lui   a0, 0x1020000
+// 0x0101d86c: 0x101d86c: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0101d860: 0x101d860: addiu a0, a0, -10468
+// 0x0101d870: 0x101d870: addiu a0, a0, -10452
 	ldloc.1
-	ldc.i4 -10468
+	ldc.i4 -10452
 	add
 	stloc.1
-// 0x0101d864: 0x101d864: jal   0x106bcfc addu  s0, v0, zero
+// 0x0101d874: 0x101d874: jal   0x106c320 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5159,20 +5159,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d86c: 0x101d86c: lui   v1, 0x30000
+// 0x0101d87c: 0x101d87c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101d870: 0x101d870: jal   0x104c524 sw    v0, 28124(v1)
+// 0x0101d880: 0x101d880: jal   0x104c534 sw    v0, 28588(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7031
+	ldc.i4 7147
 	add
 	ldloc 5
 	stelem.i4
@@ -5181,12 +5181,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d878: 0x101d878: jal   0x101cf20 addu  a0, v0, zero
+// 0x0101d888: 0x101d888: jal   0x101cf30 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5194,12 +5194,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_conf_load_101cf20(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_conf_load_101cf30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d880: 0x101d880: jal   0x101d4f4 addu  a0, s0, zero
+// 0x0101d890: 0x101d890: jal   0x101d504 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5207,38 +5207,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_load_101d4f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_load_101d504(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d888: 0x101d888: lui   s0, 0x30000
+// 0x0101d898: 0x101d898: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0101d88c: 0x101d88c: bne   v0, zero, 0x101d8a8 sw    v0, 28116(s0)
+// 0x0101d89c: 0x101d89c: bne   v0, zero, 0x101d8b8 sw    v0, 28580(s0)
 	ldloc 5
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7029
+	ldc.i4 7145
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_101d8a8
+	brtrue L_101d8b8
 // --- basic block ---
-// 0x0101d894: 0x101d894: jal   0x104c524 sll   zero, zero, 0
+// 0x0101d8a4: 0x101d8a4: jal   0x104c534 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d89c: 0x101d89c: jal   0x101d4f4 addu  a0, v0, zero
+// 0x0101d8ac: 0x101d8ac: jal   0x101d504 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5246,25 +5246,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_load_101d4f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_load_101d504(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d8a4: 0x101d8a4: sw    v0, 28116(s0)
+// 0x0101d8b4: 0x101d8b4: sw    v0, 28580(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7029
+	ldc.i4 7145
 	add
 	ldloc 5
 	stelem.i4
-L_101d8a8:
-// 0x0101d8a8: 0x101d8a8: lui   a0, 0x10000
+L_101d8b8:
+// 0x0101d8b8: 0x101d8b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101d8ac: 0x101d8ac: jal   0x101cd60 addiu a0, a0, -30216
+// 0x0101d8bc: 0x101d8bc: jal   0x101cd70 addiu a0, a0, -30216
 	ldloc.1
 	ldc.i4 -30216
 	add
@@ -5274,18 +5274,18 @@ L_101d8a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d8b4: 0x101d8b4: lui   a1, 0x0
+// 0x0101d8c4: 0x101d8c4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101d8b8: 0x101d8b8: addu  a0, v0, zero
+// 0x0101d8c8: 0x101d8c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0101d8bc: 0x101d8bc: jal   0x1001c08 addiu a1, a1, 32116
+// 0x0101d8cc: 0x101d8cc: jal   0x1001c08 addiu a1, a1, 32116
 	ldloc.2
 	ldc.i4 32116
 	add
@@ -5300,20 +5300,20 @@ L_101d8a8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d8c4: 0x101d8c4: sltiu v0, v0, 1
+// 0x0101d8d4: 0x101d8d4: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0101d8c8: 0x101d8c8: lui   v1, 0x30000
+// 0x0101d8d8: 0x101d8d8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101d8cc: 0x101d8cc: jal   0x101d484 sw    v0, 28112(v1)
+// 0x0101d8dc: 0x101d8dc: jal   0x101d494 sw    v0, 28576(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7028
+	ldc.i4 7144
 	add
 	ldloc 5
 	stelem.i4
@@ -5322,23 +5322,23 @@ L_101d8a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101d8d4: 0x101d8d4: addu  v1, v0, zero
+// 0x0101d8e4: 0x101d8e4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0101d8d8: 0x101d8d8: cibyl_sysc_arg 0x3
+// 0x0101d8e8: 0x101d8e8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0101d8dc: 0x101d8dc: cibyl_sysc 0x36e
+// 0x0101d8ec: 0x101d8ec: cibyl_sysc 0x36e
 	call void [WazeWP7]Syscalls::NOPH_SetSystemLanguage(int32)
-// 0x0101d8e0: 0x101d8e0: addu  v1, v0, zero
+// 0x0101d8f0: 0x101d8f0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0101d8e4: 0x101d8e4: lw    ra, 20(sp)
-// 0x0101d8e8: 0x101d8e8: lw    s0, 16(sp)
+// 0x0101d8f4: 0x101d8f4: lw    ra, 20(sp)
+// 0x0101d8f8: 0x101d8f8: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5347,7 +5347,7 @@ L_101d8a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101d8ec: 0x101d8ec: jr    ra addiu sp, sp, 24
+// 0x0101d8fc: 0x101d8fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5359,7 +5359,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_lang_set_lang_file_update_time_101d8f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_set_lang_file_update_time_101d904(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -5400,12 +5400,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d8f4: 0x101d8f4: addiu sp, sp, -48
+// 0x0101d904: 0x101d904: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0101d8f8: 0x101d8f8: sw    s0, 36(sp)
+// 0x0101d908: 0x101d908: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5414,7 +5414,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101d8fc: 0x101d8fc: sw    a0, 16(sp)
+// 0x0101d90c: 0x101d90c: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5423,26 +5423,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101d900: 0x101d900: addiu s0, sp, 16
+// 0x0101d910: 0x101d910: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x0101d904: 0x101d904: lui   a2, 0x10000
+// 0x0101d914: 0x101d914: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101d908: 0x101d908: lui   a0, 0x10000
+// 0x0101d918: 0x101d918: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101d90c: 0x101d90c: lui   v0, 0x20000
+// 0x0101d91c: 0x101d91c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0101d910: 0x101d910: addiu v0, v0, -20600
+// 0x0101d920: 0x101d920: addiu v0, v0, -20136
 	ldloc 6
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 6
-// 0x0101d914: 0x101d914: sw    s1, 40(sp)
+// 0x0101d924: 0x101d924: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5451,27 +5451,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101d918: 0x101d918: addiu a2, a2, 18500
+// 0x0101d928: 0x101d928: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0101d91c: 0x101d91c: addu  s1, a1, zero
+// 0x0101d92c: 0x101d92c: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0101d920: 0x101d920: addu  a3, zero, zero
+// 0x0101d930: 0x101d930: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101d924: 0x101d924: addu  a1, s0, zero
+// 0x0101d934: 0x101d934: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0101d928: 0x101d928: addiu a0, a0, 18248
+// 0x0101d938: 0x101d938: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0101d92c: 0x101d92c: sw    ra, 44(sp)
-// 0x0101d930: 0x101d930: jal   0x100edb0 sw    v0, 20(sp)
+// 0x0101d93c: 0x101d93c: sw    ra, 44(sp)
+// 0x0101d940: 0x101d940: jal   0x100edc0 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5485,15 +5485,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101d938: 0x101d938: addu  a0, s0, zero
+// 0x0101d948: 0x101d948: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0101d93c: 0x101d93c: jal   0x100e5c0 addu  a1, s1, zero
+// 0x0101d94c: 0x101d94c: jal   0x100e5d0 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5501,12 +5501,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101d944: 0x101d944: jal   0x100ea50 addu  a0, zero, zero
+// 0x0101d954: 0x101d954: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5514,13 +5514,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0101d94c: 0x101d94c: lw    ra, 44(sp)
-// 0x0101d950: 0x101d950: lw    s1, 40(sp)
+// 0x0101d95c: 0x101d95c: lw    ra, 44(sp)
+// 0x0101d960: 0x101d960: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5529,7 +5529,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101d954: 0x101d954: lw    s0, 36(sp)
+// 0x0101d964: 0x101d964: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5538,7 +5538,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101d958: 0x101d958: jr    ra addiu sp, sp, 48
+// 0x0101d968: 0x101d968: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5550,7 +5550,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_lang_file_downloaded_101d960(int32,int32,int32,int32,int32)
+.method public static int32 on_lang_file_downloaded_101d970(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -5597,12 +5597,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101d960: 0x101d960: addiu sp, sp, -72
+// 0x0101d970: 0x101d970: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0101d964: 0x101d964: sw    s3, 64(sp)
+// 0x0101d974: 0x101d974: sw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5611,13 +5611,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101d968: 0x101d968: addu  s3, a1, zero
+// 0x0101d978: 0x101d978: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0101d96c: 0x101d96c: addiu a1, zero, 46
+// 0x0101d97c: 0x101d97c: addiu a1, zero, 46
 	ldc.i4.s 46
 	stloc.2
-// 0x0101d970: 0x101d970: sw    s2, 60(sp)
+// 0x0101d980: 0x101d980: sw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5626,7 +5626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101d974: 0x101d974: sw    s0, 52(sp)
+// 0x0101d984: 0x101d984: sw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5635,8 +5635,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101d978: 0x101d978: sw    ra, 68(sp)
-// 0x0101d97c: 0x101d97c: sw    s1, 56(sp)
+// 0x0101d988: 0x101d988: sw    ra, 68(sp)
+// 0x0101d98c: 0x101d98c: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5645,10 +5645,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101d980: 0x101d980: addu  s0, a2, zero
+// 0x0101d990: 0x101d990: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0101d984: 0x101d984: jal   0x1001a94 addu  s2, a3, zero
+// 0x0101d994: 0x101d994: jal   0x1001a94 addu  s2, a3, zero
 	ldloc 4
 	stloc 10
 	ldloc.1
@@ -5658,29 +5658,29 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d98c: 0x101d98c: beq   v0, zero, 0x101da10 addiu s1, sp, 16
+// 0x0101d99c: 0x101d99c: beq   v0, zero, 0x101da20 addiu s1, sp, 16
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-	brfalse L_101da10
+	brfalse L_101da20
 // --- basic block ---
-// 0x0101d994: 0x101d994: lui   a2, 0x10000
+// 0x0101d9a4: 0x101d9a4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101d998: 0x101d998: addiu a1, zero, 32
+// 0x0101d9a8: 0x101d9a8: addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.2
-// 0x0101d99c: 0x101d99c: addu  a0, s1, zero
+// 0x0101d9ac: 0x101d9ac: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0101d9a0: 0x101d9a0: addiu a2, a2, 19912
+// 0x0101d9b0: 0x101d9b0: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0101d9a4: 0x101d9a4: jal   0x1000f9c addu  a3, v0, zero
+// 0x0101d9b4: 0x101d9b4: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -5693,13 +5693,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d9ac: 0x101d9ac: lui   a1, 0x10000
+// 0x0101d9bc: 0x101d9bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101d9b0: 0x101d9b0: addu  a0, s1, zero
+// 0x0101d9c0: 0x101d9c0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0101d9b4: 0x101d9b4: jal   0x1000420 addiu a1, a1, -30168
+// 0x0101d9c4: 0x101d9c4: jal   0x1000420 addiu a1, a1, -30168
 	ldloc.2
 	ldc.i4 -30168
 	add
@@ -5714,29 +5714,29 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d9bc: 0x101d9bc: bne   v0, zero, 0x101d9e4 lui   a1, 0x10000
+// 0x0101d9cc: 0x101d9cc: bne   v0, zero, 0x101d9f4 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_101d9e4
+	brtrue L_101d9f4
 // --- basic block ---
-// 0x0101d9c4: 0x101d9c4: lui   a3, 0x10000
+// 0x0101d9d4: 0x101d9d4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101d9c8: 0x101d9c8: addiu a1, a1, -30464
+// 0x0101d9d8: 0x101d9d8: addiu a1, a1, -30464
 	ldloc.2
 	ldc.i4 -30464
 	add
 	stloc.2
-// 0x0101d9cc: 0x101d9cc: addiu a3, a3, -30160
+// 0x0101d9dc: 0x101d9dc: addiu a3, a3, -30160
 	ldloc 4
 	ldc.i4 -30160
 	add
 	stloc 4
-// 0x0101d9d0: 0x101d9d0: addiu a0, zero, 4
+// 0x0101d9e0: 0x101d9e0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101d9d4: 0x101d9d4: jal   0x100449c addiu a2, zero, 370
+// 0x0101d9e4: 0x101d9e4: jal   0x100449c addiu a2, zero, 370
 	ldc.i4 370
 	stloc.3
 	ldloc.0
@@ -5749,22 +5749,22 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d9dc: 0x101d9dc: j	 0x101d9e8 sll   zero, zero, 0
-	br L_101d9e8
+// 0x0101d9ec: 0x101d9ec: j	 0x101d9f8 sll   zero, zero, 0
+	br L_101d9f8
 // --- basic block ---
-L_101d9e4:
-// 0x0101d9e4: 0x101d9e4: sb    zero, 0(v0)
+L_101d9f4:
+// 0x0101d9f4: 0x101d9f4: sb    zero, 0(v0)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_101d9e8:
-// 0x0101d9e8: 0x101d9e8: beq   s3, zero, 0x101da10 addu  a1, s2, zero
+L_101d9f8:
+// 0x0101d9f8: 0x101d9f8: beq   s3, zero, 0x101da20 addu  a1, s2, zero
 	ldloc 11
 	ldloc 10
 	stloc.2
-	brfalse L_101da10
+	brfalse L_101da20
 // --- basic block ---
-// 0x0101d9f0: 0x101d9f0: jal   0x101d8f4 addiu a0, sp, 17
+// 0x0101da00: 0x101da00: jal   0x101d904 addiu a0, sp, 17
 	ldloc.0
 	ldc.i4.s 17
 	add
@@ -5774,16 +5774,16 @@ L_101d9e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_lang_file_update_time_101d8f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_lang_file_update_time_101d904(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101d9f8: 0x101d9f8: j	 0x101da10 sll   zero, zero, 0
-	br L_101da10
+// 0x0101da08: 0x101da08: j	 0x101da20 sll   zero, zero, 0
+	br L_101da20
 // --- basic block ---
-L_101da00:
-// 0x0101da00: 0x101da00: jalr  s0 sll   zero, zero, 0
+L_101da10:
+// 0x0101da10: 0x101da10: jalr  s0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -5795,17 +5795,17 @@ L_101da00:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101da08: 0x101da08: j	 0x101da18 sll   zero, zero, 0
-	br L_101da18
+// 0x0101da18: 0x101da18: j	 0x101da28 sll   zero, zero, 0
+	br L_101da28
 // --- basic block ---
-L_101da10:
-// 0x0101da10: 0x101da10: bne   s0, zero, 0x101da00 sll   zero, zero, 0
+L_101da20:
+// 0x0101da20: 0x101da20: bne   s0, zero, 0x101da10 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_101da00
+	brtrue L_101da10
 // --- basic block ---
-L_101da18:
-// 0x0101da18: 0x101da18: lw    ra, 68(sp)
-// 0x0101da1c: 0x101da1c: lw    s3, 64(sp)
+L_101da28:
+// 0x0101da28: 0x101da28: lw    ra, 68(sp)
+// 0x0101da2c: 0x101da2c: lw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5814,7 +5814,7 @@ L_101da18:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101da20: 0x101da20: lw    s2, 60(sp)
+// 0x0101da30: 0x101da30: lw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5823,7 +5823,7 @@ L_101da18:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101da24: 0x101da24: lw    s1, 56(sp)
+// 0x0101da34: 0x101da34: lw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5832,7 +5832,7 @@ L_101da18:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101da28: 0x101da28: lw    s0, 52(sp)
+// 0x0101da38: 0x101da38: lw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5841,7 +5841,7 @@ L_101da18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101da2c: 0x101da2c: jr    ra addiu sp, sp, 72
+// 0x0101da3c: 0x101da3c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -5853,7 +5853,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -5891,24 +5891,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101da7c: 0x101da7c: lui   v0, 0x30000
+// 0x0101da8c: 0x101da8c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101da80: 0x101da80: lw    v0, 28120(v0)
+// 0x0101da90: 0x101da90: lw    v0, 28584(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7030
+	ldc.i4 7146
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101da84: 0x101da84: addiu sp, sp, -32
+// 0x0101da94: 0x101da94: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101da88: 0x101da88: sw    s0, 24(sp)
+// 0x0101da98: 0x101da98: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5917,14 +5917,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101da8c: 0x101da8c: sw    ra, 28(sp)
-// 0x0101da90: 0x101da90: bne   v0, zero, 0x101daa4 addu  s0, a0, zero
+// 0x0101da9c: 0x101da9c: sw    ra, 28(sp)
+// 0x0101daa0: 0x101daa0: bne   v0, zero, 0x101dab4 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 6
-	brtrue L_101daa4
+	brtrue L_101dab4
 // --- basic block ---
-// 0x0101da98: 0x101da98: jal   0x101d1f8 sw    a1, 16(sp)
+// 0x0101daa8: 0x101daa8: jal   0x101d208 sw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5938,12 +5938,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_params_101d1f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_params_101d208(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101daa0: 0x101daa0: lw    a1, 16(sp)
+// 0x0101dab0: 0x101dab0: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5952,8 +5952,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_101daa4:
-// 0x0101daa4: 0x101daa4: jal   0x101d164 addu  a0, s0, zero
+L_101dab4:
+// 0x0101dab4: 0x101dab4: jal   0x101d174 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -5961,18 +5961,18 @@ L_101daa4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_download_lang_file_101d164(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_download_lang_file_101d174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101daac: 0x101daac: lui   a0, 0x0
+// 0x0101dabc: 0x101dabc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101dab0: 0x101dab0: addu  a1, s0, zero
+// 0x0101dac0: 0x101dac0: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x0101dab4: 0x101dab4: jal   0x100e5c0 addiu a0, a0, 4844
+// 0x0101dac4: 0x101dac4: jal   0x100e5d0 addiu a0, a0, 4844
 	ldloc.1
 	ldc.i4 4844
 	add
@@ -5982,12 +5982,12 @@ L_101daa4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101dabc: 0x101dabc: jal   0x100ea50 addu  a0, zero, zero
+// 0x0101dacc: 0x101dacc: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5995,20 +5995,20 @@ L_101daa4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101dac4: 0x101dac4: cibyl_sysc_arg 0x10
+// 0x0101dad4: 0x101dad4: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x0101dac8: 0x101dac8: cibyl_sysc 0x385
+// 0x0101dad8: 0x101dad8: cibyl_sysc 0x385
 	call void [WazeWP7]Syscalls::NOPH_SetSystemLanguage(int32)
-// 0x0101dacc: 0x101dacc: addu  s0, v0, zero
+// 0x0101dadc: 0x101dadc: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0101dad0: 0x101dad0: lw    ra, 28(sp)
-// 0x0101dad4: 0x101dad4: lw    s0, 24(sp)
+// 0x0101dae0: 0x101dae0: lw    ra, 28(sp)
+// 0x0101dae4: 0x101dae4: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6017,7 +6017,7 @@ L_101daa4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101dad8: 0x101dad8: jr    ra addiu sp, sp, 32
+// 0x0101dae8: 0x101dae8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6029,7 +6029,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_adjust_initialize_101dae0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_adjust_initialize_101daf0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -6070,12 +6070,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101dae0: 0x101dae0: addiu sp, sp, -32
+// 0x0101daf0: 0x101daf0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101dae4: 0x101dae4: sw    s1, 24(sp)
+// 0x0101daf4: 0x101daf4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6084,7 +6084,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101dae8: 0x101dae8: sw    s0, 20(sp)
+// 0x0101daf8: 0x101daf8: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6093,32 +6093,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101daec: 0x101daec: lui   s1, 0x10000
+// 0x0101dafc: 0x101dafc: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0101daf0: 0x101daf0: lui   s0, 0x10000
+// 0x0101db00: 0x101db00: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0101daf4: 0x101daf4: lui   a1, 0x0
+// 0x0101db04: 0x101db04: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101daf8: 0x101daf8: addiu a0, s1, 12560
+// 0x0101db08: 0x101db08: addiu a0, s1, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0101dafc: 0x101dafc: addiu a2, s0, -48
+// 0x0101db0c: 0x101db0c: addiu a2, s0, -52
 	ldloc 6
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x0101db00: 0x101db00: addiu a1, a1, 4860
+// 0x0101db10: 0x101db10: addiu a1, a1, 4860
 	ldloc.2
 	ldc.i4 4860
 	add
 	stloc.2
-// 0x0101db04: 0x101db04: sw    ra, 28(sp)
-// 0x0101db08: 0x101db08: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101db14: 0x101db14: sw    ra, 28(sp)
+// 0x0101db18: 0x101db18: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6126,30 +6126,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0101db10: 0x101db10: lui   a1, 0x0
+// 0x0101db20: 0x101db20: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101db14: 0x101db14: addiu a0, s1, 12560
+// 0x0101db24: 0x101db24: addiu a0, s1, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0101db18: 0x101db18: addiu a2, s0, -48
+// 0x0101db28: 0x101db28: addiu a2, s0, -52
 	ldloc 6
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x0101db1c: 0x101db1c: addiu a1, a1, 4876
+// 0x0101db2c: 0x101db2c: addiu a1, a1, 4876
 	ldloc.2
 	ldc.i4 4876
 	add
 	stloc.2
-// 0x0101db20: 0x101db20: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101db30: 0x101db30: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6157,13 +6157,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0101db28: 0x101db28: lw    ra, 28(sp)
-// 0x0101db2c: 0x101db2c: lw    s1, 24(sp)
+// 0x0101db38: 0x101db38: lw    ra, 28(sp)
+// 0x0101db3c: 0x101db3c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6172,7 +6172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101db30: 0x101db30: lw    s0, 20(sp)
+// 0x0101db40: 0x101db40: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6181,7 +6181,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101db34: 0x101db34: jr    ra addiu sp, sp, 32
+// 0x0101db44: 0x101db44: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6193,7 +6193,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_adjust_offset_longitude_101db3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_adjust_offset_longitude_101db4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6228,16 +6228,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101db3c: 0x101db3c: lui   a0, 0x0
+// 0x0101db4c: 0x101db4c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101db40: 0x101db40: addiu sp, sp, -24
+// 0x0101db50: 0x101db50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101db44: 0x101db44: sw    ra, 20(sp)
-// 0x0101db48: 0x101db48: jal   0x100e788 addiu a0, a0, 4876
+// 0x0101db54: 0x101db54: sw    ra, 20(sp)
+// 0x0101db58: 0x101db58: jal   0x100e798 addiu a0, a0, 4876
 	ldloc.1
 	ldc.i4 4876
 	add
@@ -6247,14 +6247,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101db50: 0x101db50: lw    ra, 20(sp)
-// 0x0101db54: 0x101db54: sll   zero, zero, 0
-// 0x0101db58: 0x101db58: jr    ra addiu sp, sp, 24
+// 0x0101db60: 0x101db60: lw    ra, 20(sp)
+// 0x0101db64: 0x101db64: sll   zero, zero, 0
+// 0x0101db68: 0x101db68: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6266,7 +6266,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_adjust_offset_latitude_101db60(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_adjust_offset_latitude_101db70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6301,16 +6301,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101db60: 0x101db60: lui   a0, 0x0
+// 0x0101db70: 0x101db70: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101db64: 0x101db64: addiu sp, sp, -24
+// 0x0101db74: 0x101db74: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101db68: 0x101db68: sw    ra, 20(sp)
-// 0x0101db6c: 0x101db6c: jal   0x100e788 addiu a0, a0, 4860
+// 0x0101db78: 0x101db78: sw    ra, 20(sp)
+// 0x0101db7c: 0x101db7c: jal   0x100e798 addiu a0, a0, 4860
 	ldloc.1
 	ldc.i4 4860
 	add
@@ -6320,14 +6320,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101db74: 0x101db74: lw    ra, 20(sp)
-// 0x0101db78: 0x101db78: sll   zero, zero, 0
-// 0x0101db7c: 0x101db7c: jr    ra addiu sp, sp, 24
+// 0x0101db84: 0x101db84: lw    ra, 20(sp)
+// 0x0101db88: 0x101db88: sll   zero, zero, 0
+// 0x0101db8c: 0x101db8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6339,7 +6339,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_adjust_position_101db84(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_adjust_position_101db94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s0,int32 s3,int32 ra)
@@ -6386,20 +6386,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101db84: 0x101db84: lui   v0, 0x30000
+// 0x0101db94: 0x101db94: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101db88: 0x101db88: addiu sp, sp, -40
+// 0x0101db98: 0x101db98: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101db8c: 0x101db8c: addiu v1, v0, 28148
+// 0x0101db9c: 0x101db9c: addiu v1, v0, 28612
 	ldloc 5
-	ldc.i4 28148
+	ldc.i4 28612
 	add
 	stloc 7
-// 0x0101db90: 0x101db90: sw    s1, 24(sp)
+// 0x0101dba0: 0x101dba0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6408,7 +6408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101db94: 0x101db94: lw    v1, 4(v1)
+// 0x0101dba4: 0x101dba4: lw    v1, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6417,10 +6417,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101db98: 0x101db98: addu  s1, a0, zero
+// 0x0101dba8: 0x101dba8: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0101db9c: 0x101db9c: lw    a0, 4(a0)
+// 0x0101dbac: 0x101dbac: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6429,7 +6429,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101dba0: 0x101dba0: sw    s0, 20(sp)
+// 0x0101dbb0: 0x101dbb0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6438,8 +6438,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101dba4: 0x101dba4: sw    ra, 36(sp)
-// 0x0101dba8: 0x101dba8: sw    s3, 32(sp)
+// 0x0101dbb4: 0x101dbb4: sw    ra, 36(sp)
+// 0x0101dbb8: 0x101dbb8: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6448,7 +6448,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101dbac: 0x101dbac: sw    s2, 28(sp)
+// 0x0101dbbc: 0x101dbbc: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6457,74 +6457,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101dbb0: 0x101dbb0: bne   a0, v1, 0x101dbcc addu  s0, a1, zero
+// 0x0101dbc0: 0x101dbc0: bne   a0, v1, 0x101dbdc addu  s0, a1, zero
 	ldloc.1
 	ldloc 7
 	ldloc.2
 	stloc 10
-	bne.un L_101dbcc
+	bne.un L_101dbdc
 // --- basic block ---
-// 0x0101dbb8: 0x101dbb8: lw    v0, 28148(v0)
+// 0x0101dbc8: 0x101dbc8: lw    v0, 28612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7037
+	ldc.i4 7153
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101dbbc: 0x101dbbc: lw    v1, 0(s1)
+// 0x0101dbcc: 0x101dbcc: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101dbc0: 0x101dbc0: sll   zero, zero, 0
-// 0x0101dbc4: 0x101dbc4: beq   v1, v0, 0x101dc10 lui   v0, 0x30000
+// 0x0101dbd0: 0x101dbd0: sll   zero, zero, 0
+// 0x0101dbd4: 0x101dbd4: beq   v1, v0, 0x101dc20 lui   v0, 0x30000
 	ldloc 7
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	beq  L_101dc10
+	beq  L_101dc20
 // --- basic block ---
-L_101dbcc:
-// 0x0101dbcc: 0x101dbcc: lw    s2, 0(s1)
+L_101dbdc:
+// 0x0101dbdc: 0x101dbdc: lw    s2, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0101dbd0: 0x101dbd0: jal   0x101db3c sll   zero, zero, 0
+// 0x0101dbe0: 0x101dbe0: jal   0x101db4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_offset_longitude_101db3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_offset_longitude_101db4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101dbd8: 0x101dbd8: addu  v0, v0, s2
+// 0x0101dbe8: 0x101dbe8: addu  v0, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0101dbdc: 0x101dbdc: lui   s2, 0x30000
+// 0x0101dbec: 0x101dbec: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0101dbe0: 0x101dbe0: sw    v0, 28168(s2)
+// 0x0101dbf0: 0x101dbf0: sw    v0, 28632(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7042
+	ldc.i4 7158
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101dbe4: 0x101dbe4: lw    s3, 4(s1)
+// 0x0101dbf4: 0x101dbf4: lw    s3, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6533,9 +6533,9 @@ L_101dbcc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101dbe8: 0x101dbe8: jal   0x101db60 addiu s2, s2, 28168
+// 0x0101dbf8: 0x101dbf8: jal   0x101db70 addiu s2, s2, 28632
 	ldloc 8
-	ldc.i4 28168
+	ldc.i4 28632
 	add
 	stloc 8
 	ldloc.0
@@ -6543,31 +6543,31 @@ L_101dbcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_offset_latitude_101db60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_offset_latitude_101db70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101dbf0: 0x101dbf0: addu  v0, v0, s3
+// 0x0101dc00: 0x101dc00: addu  v0, v0, s3
 	ldloc 5
 	ldloc 11
 	add
 	stloc 5
-// 0x0101dbf4: 0x101dbf4: lui   a0, 0x30000
+// 0x0101dc04: 0x101dc04: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101dbf8: 0x101dbf8: addiu a0, a0, 28148
+// 0x0101dc08: 0x101dc08: addiu a0, a0, 28612
 	ldloc.1
-	ldc.i4 28148
+	ldc.i4 28612
 	add
 	stloc.1
-// 0x0101dbfc: 0x101dbfc: addu  a1, s1, zero
+// 0x0101dc0c: 0x101dc0c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0101dc00: 0x101dc00: addiu a2, zero, 20
+// 0x0101dc10: 0x101dc10: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x0101dc04: 0x101dc04: jal   0x1001800 sw    v0, 4(s2)
+// 0x0101dc14: 0x101dc14: jal   0x1001800 sw    v0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6585,32 +6585,32 @@ L_101dbcc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101dc0c: 0x101dc0c: lui   v0, 0x30000
+// 0x0101dc1c: 0x101dc1c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_101dc10:
-// 0x0101dc10: 0x101dc10: lw    v1, 28168(v0)
+L_101dc20:
+// 0x0101dc20: 0x101dc20: lw    v1, 28632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7042
+	ldc.i4 7158
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101dc14: 0x101dc14: addiu v0, v0, 28168
+// 0x0101dc24: 0x101dc24: addiu v0, v0, 28632
 	ldloc 5
-	ldc.i4 28168
+	ldc.i4 28632
 	add
 	stloc 5
-// 0x0101dc18: 0x101dc18: sw    v1, 0(s0)
+// 0x0101dc28: 0x101dc28: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0101dc1c: 0x101dc1c: lw    v0, 4(v0)
+// 0x0101dc2c: 0x101dc2c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6619,8 +6619,8 @@ L_101dc10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101dc20: 0x101dc20: lw    ra, 36(sp)
-// 0x0101dc24: 0x101dc24: sw    v0, 4(s0)
+// 0x0101dc30: 0x101dc30: lw    ra, 36(sp)
+// 0x0101dc34: 0x101dc34: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6629,7 +6629,7 @@ L_101dc10:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101dc28: 0x101dc28: lw    s3, 32(sp)
+// 0x0101dc38: 0x101dc38: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6638,7 +6638,7 @@ L_101dc10:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101dc2c: 0x101dc2c: lw    s2, 28(sp)
+// 0x0101dc3c: 0x101dc3c: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6647,7 +6647,7 @@ L_101dc10:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101dc30: 0x101dc30: lw    s1, 24(sp)
+// 0x0101dc40: 0x101dc40: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6656,7 +6656,7 @@ L_101dc10:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101dc34: 0x101dc34: lw    s0, 20(sp)
+// 0x0101dc44: 0x101dc44: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6665,7 +6665,7 @@ L_101dc10:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101dc38: 0x101dc38: jr    ra addiu sp, sp, 40
+// 0x0101dc48: 0x101dc48: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6677,7 +6677,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_coordinate_101dc40(int32,int32,int32,int32)
+.method public static int32 roadmap_trip_coordinate_101dc50(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 lo,int32 ra)
@@ -6712,22 +6712,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101dc40: 0x101dc40: lui   v0, 0xe0000
+// 0x0101dc50: 0x101dc50: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0101dc44: 0x101dc44: addiu v0, v0, 29604
+// 0x0101dc54: 0x101dc54: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x0101dc48: 0x101dc48: lw    a2, 0(a0)
+// 0x0101dc58: 0x101dc58: lw    a2, 0(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101dc4c: 0x101dc4c: lw    v1, 56(v0)
+// 0x0101dc5c: 0x101dc5c: lw    v1, 56(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6736,17 +6736,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101dc50: 0x101dc50: sll   zero, zero, 0
-// 0x0101dc54: 0x101dc54: slt   v1, v1, a2
+// 0x0101dc60: 0x101dc60: sll   zero, zero, 0
+// 0x0101dc64: 0x101dc64: slt   v1, v1, a2
 	ldloc 4
 	ldloc.2
 	clt
 	stloc 4
-// 0x0101dc58: 0x101dc58: bne   v1, zero, 0x101dca0 sll   zero, zero, 0
+// 0x0101dc68: 0x101dc68: bne   v1, zero, 0x101dcb0 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_101dca0
+	brtrue L_101dcb0
 // --- basic block ---
-// 0x0101dc60: 0x101dc60: lw    v1, 64(v0)
+// 0x0101dc70: 0x101dc70: lw    v1, 64(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6755,17 +6755,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101dc64: 0x101dc64: sll   zero, zero, 0
-// 0x0101dc68: 0x101dc68: slt   v1, a2, v1
+// 0x0101dc74: 0x101dc74: sll   zero, zero, 0
+// 0x0101dc78: 0x101dc78: slt   v1, a2, v1
 	ldloc.2
 	ldloc 4
 	clt
 	stloc 4
-// 0x0101dc6c: 0x101dc6c: bne   v1, zero, 0x101dca0 sll   zero, zero, 0
+// 0x0101dc7c: 0x101dc7c: bne   v1, zero, 0x101dcb0 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_101dca0
+	brtrue L_101dcb0
 // --- basic block ---
-// 0x0101dc74: 0x101dc74: lw    v1, 4(a0)
+// 0x0101dc84: 0x101dc84: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6774,7 +6774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101dc78: 0x101dc78: lw    a0, 60(v0)
+// 0x0101dc88: 0x101dc88: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6783,17 +6783,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dc7c: 0x101dc7c: sll   zero, zero, 0
-// 0x0101dc80: 0x101dc80: slt   a0, a0, v1
+// 0x0101dc8c: 0x101dc8c: sll   zero, zero, 0
+// 0x0101dc90: 0x101dc90: slt   a0, a0, v1
 	ldloc.0
 	ldloc 4
 	clt
 	stloc.0
-// 0x0101dc84: 0x101dc84: bne   a0, zero, 0x101dca0 sll   zero, zero, 0
+// 0x0101dc94: 0x101dc94: bne   a0, zero, 0x101dcb0 sll   zero, zero, 0
 	ldloc.0
-	brtrue L_101dca0
+	brtrue L_101dcb0
 // --- basic block ---
-// 0x0101dc8c: 0x101dc8c: lw    a0, 68(v0)
+// 0x0101dc9c: 0x101dc9c: lw    a0, 68(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6802,21 +6802,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dc90: 0x101dc90: sll   zero, zero, 0
-// 0x0101dc94: 0x101dc94: slt   a0, v1, a0
+// 0x0101dca0: 0x101dca0: sll   zero, zero, 0
+// 0x0101dca4: 0x101dca4: slt   a0, v1, a0
 	ldloc 4
 	ldloc.0
 	clt
 	stloc.0
-// 0x0101dc98: 0x101dc98: beq   a0, zero, 0x101dcb0 sll   zero, zero, 0
+// 0x0101dca8: 0x101dca8: beq   a0, zero, 0x101dcc0 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_101dcb0
+	brfalse L_101dcc0
 // --- basic block ---
-L_101dca0:
-// 0x0101dca0: 0x101dca0: addiu v0, zero, 32767
+L_101dcb0:
+// 0x0101dcb0: 0x101dcb0: addiu v0, zero, 32767
 	ldc.i4 32767
 	stloc 5
-// 0x0101dca4: 0x101dca4: sw    v0, 4(a1)
+// 0x0101dcb4: 0x101dcb4: sw    v0, 4(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6825,7 +6825,7 @@ L_101dca0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101dca8: 0x101dca8: jr    ra sw    v0, 0(a1)
+// 0x0101dcb8: 0x101dcb8: jr    ra sw    v0, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6834,8 +6834,8 @@ L_101dca0:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_101dcb0:
-// 0x0101dcb0: 0x101dcb0: lw    a0, 80(v0)
+L_101dcc0:
+// 0x0101dcc0: 0x101dcc0: lw    a0, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6844,7 +6844,7 @@ L_101dcb0:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dcb4: 0x101dcb4: lw    a3, 32(v0)
+// 0x0101dcc4: 0x101dcc4: lw    a3, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6853,27 +6853,27 @@ L_101dcb0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101dcb8: 0x101dcb8: subu  a2, a2, a0
+// 0x0101dcc8: 0x101dcc8: subu  a2, a2, a0
 	ldloc.2
 	ldloc.0
 	sub
 	stloc.2
-// 0x0101dcbc: 0x101dcbc: div   a2, a3
+// 0x0101dccc: 0x101dccc: div   a2, a3
 	ldloc.2
 	ldloc.3
 	div
 	stloc 7
-// 0x0101dcc0: 0x101dcc0: mflo  lo
+// 0x0101dcd0: 0x101dcd0: mflo  lo
 	ldloc 7
 	stloc.2
-// 0x0101dcc4: 0x101dcc4: sw    a2, 0(a1)
+// 0x0101dcd4: 0x101dcd4: sw    a2, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0101dcc8: 0x101dcc8: lw    a2, 76(v0)
+// 0x0101dcd8: 0x101dcd8: lw    a2, 76(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6882,7 +6882,7 @@ L_101dcb0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101dccc: 0x101dccc: lw    a0, 36(v0)
+// 0x0101dcdc: 0x101dcdc: lw    a0, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6891,20 +6891,20 @@ L_101dcb0:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dcd0: 0x101dcd0: subu  v1, a2, v1
+// 0x0101dce0: 0x101dce0: subu  v1, a2, v1
 	ldloc.2
 	ldloc 4
 	sub
 	stloc 4
-// 0x0101dcd4: 0x101dcd4: div   v1, a0
+// 0x0101dce4: 0x101dce4: div   v1, a0
 	ldloc 4
 	ldloc.0
 	div
 	stloc 7
-// 0x0101dcd8: 0x101dcd8: mflo  lo
+// 0x0101dce8: 0x101dce8: mflo  lo
 	ldloc 7
 	stloc 4
-// 0x0101dcdc: 0x101dcdc: jr    ra sw    v1, 4(a1)
+// 0x0101dcec: 0x101dcec: jr    ra sw    v1, 4(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6920,7 +6920,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_gps_state_101dce4(int32)
+.method public static int32 roadmap_trip_gps_state_101dcf4(int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6943,49 +6943,49 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101dce4: 0x101dce4: lui   v0, 0x30000
+// 0x0101dcf4: 0x101dcf4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101dce8: 0x101dce8: lw    v0, 28176(v0)
+// 0x0101dcf8: 0x101dcf8: lw    v0, 28640(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101dcec: 0x101dcec: sll   zero, zero, 0
-// 0x0101dcf0: 0x101dcf0: lb    v1, 23(v0)
+// 0x0101dcfc: 0x101dcfc: sll   zero, zero, 0
+// 0x0101dd00: 0x101dd00: lb    v1, 23(v0)
 	ldloc.1
 	ldc.i4.s 23
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0101dcf4: 0x101dcf4: sll   zero, zero, 0
-// 0x0101dcf8: 0x101dcf8: beq   v1, zero, 0x101dd24 lui   v1, 0x30000
+// 0x0101dd04: 0x101dd04: sll   zero, zero, 0
+// 0x0101dd08: 0x101dd08: beq   v1, zero, 0x101dd34 lui   v1, 0x30000
 	ldloc.2
 	ldc.i4 196608
 	stloc.2
-	brfalse L_101dd24
+	brfalse L_101dd34
 // --- basic block ---
-// 0x0101dd00: 0x101dd00: lw    a0, 28180(v1)
+// 0x0101dd10: 0x101dd10: lw    a0, 28644(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dd04: 0x101dd04: sll   zero, zero, 0
-// 0x0101dd08: 0x101dd08: beq   a0, zero, 0x101dd14 addu  v1, zero, zero
+// 0x0101dd14: 0x101dd14: sll   zero, zero, 0
+// 0x0101dd18: 0x101dd18: beq   a0, zero, 0x101dd24 addu  v1, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_101dd14
+	brfalse L_101dd24
 // --- basic block ---
-// 0x0101dd10: 0x101dd10: lw    v1, 8(a0)
+// 0x0101dd20: 0x101dd20: lw    v1, 8(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -6994,8 +6994,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_101dd14:
-// 0x0101dd14: 0x101dd14: lw    a0, 8(v0)
+L_101dd24:
+// 0x0101dd24: 0x101dd24: lw    a0, 8(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -7004,20 +7004,20 @@ L_101dd14:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dd18: 0x101dd18: sll   zero, zero, 0
-// 0x0101dd1c: 0x101dd1c: bne   v1, a0, 0x101dd28 addu  v0, zero, zero
+// 0x0101dd28: 0x101dd28: sll   zero, zero, 0
+// 0x0101dd2c: 0x101dd2c: bne   v1, a0, 0x101dd38 addu  v0, zero, zero
 	ldloc.2
 	ldloc.0
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_101dd28
+	bne.un L_101dd38
 // --- basic block ---
-L_101dd24:
-// 0x0101dd24: 0x101dd24: addiu v0, zero, -1
+L_101dd34:
+// 0x0101dd34: 0x101dd34: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.1
-L_101dd28:
-// 0x0101dd28: 0x101dd28: jr    ra sll   zero, zero, 0
+L_101dd38:
+// 0x0101dd38: 0x101dd38: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -7025,7 +7025,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_trip_is_focus_changed_101dd30(int32)
+.method public static int32 roadmap_trip_is_focus_changed_101dd40(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -7048,10 +7048,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101dd30: 0x101dd30: lui   v1, 0x0
+// 0x0101dd40: 0x101dd40: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101dd34: 0x101dd34: lw    a0, 6036(v1)
+// 0x0101dd44: 0x101dd44: lw    a0, 6036(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -7060,14 +7060,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dd38: 0x101dd38: sll   zero, zero, 0
-// 0x0101dd3c: 0x101dd3c: beq   a0, zero, 0x101dd4c addu  v0, zero, zero
+// 0x0101dd48: 0x101dd48: sll   zero, zero, 0
+// 0x0101dd4c: 0x101dd4c: beq   a0, zero, 0x101dd5c addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_101dd4c
+	brfalse L_101dd5c
 // --- basic block ---
-// 0x0101dd44: 0x101dd44: sw    zero, 6036(v1)
+// 0x0101dd54: 0x101dd54: sw    zero, 6036(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -7076,11 +7076,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101dd48: 0x101dd48: addiu v0, zero, 1
+// 0x0101dd58: 0x101dd58: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.2
-L_101dd4c:
-// 0x0101dd4c: 0x101dd4c: jr    ra sll   zero, zero, 0
+L_101dd5c:
+// 0x0101dd5c: 0x101dd5c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -7088,7 +7088,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_trip_is_focus_moved_101dd54(int32)
+.method public static int32 roadmap_trip_is_focus_moved_101dd64(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -7111,10 +7111,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101dd54: 0x101dd54: lui   v1, 0x0
+// 0x0101dd64: 0x101dd64: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101dd58: 0x101dd58: lw    a0, 6040(v1)
+// 0x0101dd68: 0x101dd68: lw    a0, 6040(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -7123,14 +7123,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dd5c: 0x101dd5c: sll   zero, zero, 0
-// 0x0101dd60: 0x101dd60: beq   a0, zero, 0x101dd70 addu  v0, zero, zero
+// 0x0101dd6c: 0x101dd6c: sll   zero, zero, 0
+// 0x0101dd70: 0x101dd70: beq   a0, zero, 0x101dd80 addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_101dd70
+	brfalse L_101dd80
 // --- basic block ---
-// 0x0101dd68: 0x101dd68: sw    zero, 6040(v1)
+// 0x0101dd78: 0x101dd78: sw    zero, 6040(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -7139,11 +7139,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101dd6c: 0x101dd6c: addiu v0, zero, 1
+// 0x0101dd7c: 0x101dd7c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.2
-L_101dd70:
-// 0x0101dd70: 0x101dd70: jr    ra sll   zero, zero, 0
+L_101dd80:
+// 0x0101dd80: 0x101dd80: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -7151,7 +7151,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_trip_is_refresh_needed_101dd78()
+.method public static int32 roadmap_trip_is_refresh_needed_101dd88()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -7171,10 +7171,10 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101dd78: 0x101dd78: lui   v0, 0x0
+// 0x0101dd88: 0x101dd88: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101dd7c: 0x101dd7c: lw    v0, 6028(v0)
+// 0x0101dd8c: 0x101dd8c: lw    v0, 6028(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7183,14 +7183,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dd80: 0x101dd80: sll   zero, zero, 0
-// 0x0101dd84: 0x101dd84: bne   v0, zero, 0x101ddb4 lui   v0, 0x0
+// 0x0101dd90: 0x101dd90: sll   zero, zero, 0
+// 0x0101dd94: 0x101dd94: bne   v0, zero, 0x101ddc4 lui   v0, 0x0
 	ldloc.0
 	ldc.i4.s 0
 	stloc.0
-	brtrue L_101ddb4
+	brtrue L_101ddc4
 // --- basic block ---
-// 0x0101dd8c: 0x101dd8c: lw    v0, 6036(v0)
+// 0x0101dd9c: 0x101dd9c: lw    v0, 6036(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7199,15 +7199,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dd90: 0x101dd90: sll   zero, zero, 0
-// 0x0101dd94: 0x101dd94: bne   v0, zero, 0x101ddb0 sll   zero, zero, 0
+// 0x0101dda0: 0x101dda0: sll   zero, zero, 0
+// 0x0101dda4: 0x101dda4: bne   v0, zero, 0x101ddc0 sll   zero, zero, 0
 	ldloc.0
-	brtrue L_101ddb0
+	brtrue L_101ddc0
 // --- basic block ---
-// 0x0101dd9c: 0x101dd9c: lui   v0, 0x0
+// 0x0101ddac: 0x101ddac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101dda0: 0x101dda0: lw    v1, 6040(v0)
+// 0x0101ddb0: 0x101ddb0: lw    v1, 6040(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7216,19 +7216,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101dda4: 0x101dda4: sll   zero, zero, 0
-// 0x0101dda8: 0x101dda8: beq   v1, zero, 0x101ddcc addu  v0, zero, zero
+// 0x0101ddb4: 0x101ddb4: sll   zero, zero, 0
+// 0x0101ddb8: 0x101ddb8: beq   v1, zero, 0x101dddc addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_101ddcc
+	brfalse L_101dddc
 // --- basic block ---
-L_101ddb0:
-// 0x0101ddb0: 0x101ddb0: lui   v0, 0x0
+L_101ddc0:
+// 0x0101ddc0: 0x101ddc0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-L_101ddb4:
-// 0x0101ddb4: 0x101ddb4: sw    zero, 6036(v0)
+L_101ddc4:
+// 0x0101ddc4: 0x101ddc4: sw    zero, 6036(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7237,10 +7237,10 @@ L_101ddb4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101ddb8: 0x101ddb8: lui   v0, 0x0
+// 0x0101ddc8: 0x101ddc8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101ddbc: 0x101ddbc: sw    zero, 6040(v0)
+// 0x0101ddcc: 0x101ddcc: sw    zero, 6040(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7249,10 +7249,10 @@ L_101ddb4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101ddc0: 0x101ddc0: lui   v0, 0x0
+// 0x0101ddd0: 0x101ddd0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101ddc4: 0x101ddc4: sw    zero, 6028(v0)
+// 0x0101ddd4: 0x101ddd4: sw    zero, 6028(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7261,11 +7261,11 @@ L_101ddb4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101ddc8: 0x101ddc8: addiu v0, zero, 1
+// 0x0101ddd8: 0x101ddd8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
-L_101ddcc:
-// 0x0101ddcc: 0x101ddcc: jr    ra sll   zero, zero, 0
+L_101dddc:
+// 0x0101dddc: 0x101dddc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -7273,7 +7273,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_trip_get_orientation_101ddd4()
+.method public static int32 roadmap_trip_get_orientation_101dde4()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -7293,10 +7293,10 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ddd4: 0x101ddd4: lui   v0, 0x0
+// 0x0101dde4: 0x101dde4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101ddd8: 0x101ddd8: lw    v0, 6032(v0)
+// 0x0101dde8: 0x101dde8: lw    v0, 6032(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7305,31 +7305,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101dddc: 0x101dddc: sll   zero, zero, 0
-// 0x0101dde0: 0x101dde0: beq   v0, zero, 0x101de08 sll   zero, zero, 0
+// 0x0101ddec: 0x101ddec: sll   zero, zero, 0
+// 0x0101ddf0: 0x101ddf0: beq   v0, zero, 0x101de18 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_101de08
+	brfalse L_101de18
 // --- basic block ---
-// 0x0101dde8: 0x101dde8: lui   v0, 0x30000
+// 0x0101ddf8: 0x101ddf8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101ddec: 0x101ddec: lw    v0, 28180(v0)
+// 0x0101ddfc: 0x101ddfc: lw    v0, 28644(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101ddf0: 0x101ddf0: sll   zero, zero, 0
-// 0x0101ddf4: 0x101ddf4: beq   v0, zero, 0x101de08 addiu v1, zero, 360
+// 0x0101de00: 0x101de00: sll   zero, zero, 0
+// 0x0101de04: 0x101de04: beq   v0, zero, 0x101de18 addiu v1, zero, 360
 	ldloc.0
 	ldc.i4 360
 	stloc.2
-	brfalse L_101de08
+	brfalse L_101de18
 // --- basic block ---
-// 0x0101ddfc: 0x101ddfc: lw    v0, 48(v0)
+// 0x0101de0c: 0x101de0c: lw    v0, 48(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -7338,15 +7338,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101de00: 0x101de00: jr    ra subu  v0, v1, v0
+// 0x0101de10: 0x101de10: jr    ra subu  v0, v1, v0
 	ldloc.2
 	ldloc.0
 	sub
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_101de08:
-// 0x0101de08: 0x101de08: jr    ra addu  v0, zero, zero
+L_101de18:
+// 0x0101de18: 0x101de18: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -7356,7 +7356,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_trip_get_focus_name_101de10()
+.method public static int32 roadmap_trip_get_focus_name_101de20()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -7376,26 +7376,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101de10: 0x101de10: lui   v0, 0x30000
+// 0x0101de20: 0x101de20: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101de14: 0x101de14: lw    v1, 28180(v0)
+// 0x0101de24: 0x101de24: lw    v1, 28644(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101de18: 0x101de18: sll   zero, zero, 0
-// 0x0101de1c: 0x101de1c: beq   v1, zero, 0x101de28 addu  v0, zero, zero
+// 0x0101de28: 0x101de28: sll   zero, zero, 0
+// 0x0101de2c: 0x101de2c: beq   v1, zero, 0x101de38 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_101de28
+	brfalse L_101de38
 // --- basic block ---
-// 0x0101de24: 0x101de24: lw    v0, 8(v1)
+// 0x0101de34: 0x101de34: lw    v0, 8(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -7404,8 +7404,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-L_101de28:
-// 0x0101de28: 0x101de28: jr    ra sll   zero, zero, 0
+L_101de38:
+// 0x0101de38: 0x101de38: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
diff --git a/converted/Cibyl22.j b/converted/Cibyl22.j
index 07861eb..53376f6 100644
--- a/converted/Cibyl22.j
+++ b/converted/Cibyl22.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl22::.ctor
 
-.method public static int32 roadmap_trip_get_focus_position_101de30()
+.method public static int32 roadmap_trip_get_focus_position_101de40()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -61,37 +61,37 @@
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101de30: 0x101de30: lui   v0, 0x30000
+// 0x0101de40: 0x101de40: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101de34: 0x101de34: lw    v1, 28180(v0)
+// 0x0101de44: 0x101de44: lw    v1, 28644(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101de38: 0x101de38: sll   zero, zero, 0
-// 0x0101de3c: 0x101de3c: bne   v1, zero, 0x101de4c addiu v0, v1, 24
+// 0x0101de48: 0x101de48: sll   zero, zero, 0
+// 0x0101de4c: 0x101de4c: bne   v1, zero, 0x101de5c addiu v0, v1, 24
 	ldloc.1
 	ldloc.1
 	ldc.i4.s 24
 	add
 	stloc.0
-	brtrue L_101de4c
+	brtrue L_101de5c
 // --- basic block ---
-// 0x0101de44: 0x101de44: lui   v0, 0x30000
+// 0x0101de54: 0x101de54: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101de48: 0x101de48: addiu v0, v0, 28216
+// 0x0101de58: 0x101de58: addiu v0, v0, 28680
 	ldloc.0
-	ldc.i4 28216
+	ldc.i4 28680
 	add
 	stloc.0
-L_101de4c:
-// 0x0101de4c: 0x101de4c: jr    ra sll   zero, zero, 0
+L_101de5c:
+// 0x0101de5c: 0x101de5c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -99,7 +99,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -146,15 +146,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101de54: 0x101de54: addiu sp, sp, -40
+// 0x0101de64: 0x101de64: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101de58: 0x101de58: lui   v0, 0x30000
+// 0x0101de68: 0x101de68: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101de5c: 0x101de5c: sw    s2, 28(sp)
+// 0x0101de6c: 0x101de6c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -163,7 +163,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101de60: 0x101de60: sw    s1, 24(sp)
+// 0x0101de70: 0x101de70: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -172,8 +172,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101de64: 0x101de64: sw    ra, 36(sp)
-// 0x0101de68: 0x101de68: sw    s3, 32(sp)
+// 0x0101de74: 0x101de74: sw    ra, 36(sp)
+// 0x0101de78: 0x101de78: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -182,7 +182,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101de6c: 0x101de6c: sw    s0, 20(sp)
+// 0x0101de7c: 0x101de7c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -191,27 +191,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101de70: 0x101de70: addu  s2, a0, zero
+// 0x0101de80: 0x101de80: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0101de74: 0x101de74: lw    v1, 28208(v0)
+// 0x0101de84: 0x101de84: lw    v1, 28672(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7052
+	ldc.i4 7168
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101de78: 0x101de78: j	 0x101de94 addiu s1, v0, 28208
+// 0x0101de88: 0x101de88: j	 0x101dea4 addiu s1, v0, 28672
 	ldloc 6
-	ldc.i4 28208
+	ldc.i4 28672
 	add
 	stloc 9
-	br L_101de94
+	br L_101dea4
 // --- basic block ---
-L_101de80:
-// 0x0101de80: 0x101de80: lw    a0, 8(s0)
+L_101de90:
+// 0x0101de90: 0x101de90: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -220,45 +220,45 @@ L_101de80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101de84: 0x101de84: jal   0x1001b14 sll   zero, zero, 0
+// 0x0101de94: 0x101de94: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101de8c: 0x101de8c: beq   v0, zero, 0x101dea8 addu  v1, s3, zero
+// 0x0101de9c: 0x101de9c: beq   v0, zero, 0x101deb8 addu  v1, s3, zero
 	ldloc 6
 	ldloc 11
 	stloc 7
-	brfalse L_101dea8
+	brfalse L_101deb8
 // --- basic block ---
-L_101de94:
-// 0x0101de94: 0x101de94: addu  s0, v1, zero
+L_101dea4:
+// 0x0101dea4: 0x101dea4: addu  s0, v1, zero
 	ldloc 7
 	stloc 8
-// 0x0101de98: 0x101de98: lw    s3, 0(v1)
+// 0x0101dea8: 0x101dea8: lw    s3, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0101de9c: 0x101de9c: bne   v1, s1, 0x101de80 addu  a1, s2, zero
+// 0x0101deac: 0x101deac: bne   v1, s1, 0x101de90 addu  a1, s2, zero
 	ldloc 7
 	ldloc 9
 	ldloc 10
 	stloc.2
-	bne.un L_101de80
+	bne.un L_101de90
 // --- basic block ---
-// 0x0101dea4: 0x101dea4: addu  s0, zero, zero
+// 0x0101deb4: 0x101deb4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_101dea8:
-// 0x0101dea8: 0x101dea8: lw    ra, 36(sp)
-// 0x0101deac: 0x101deac: addu  v0, s0, zero
+L_101deb8:
+// 0x0101deb8: 0x101deb8: lw    ra, 36(sp)
+// 0x0101debc: 0x101debc: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x0101deb0: 0x101deb0: lw    s3, 32(sp)
+// 0x0101dec0: 0x101dec0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -267,7 +267,7 @@ L_101dea8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101deb4: 0x101deb4: lw    s2, 28(sp)
+// 0x0101dec4: 0x101dec4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -276,7 +276,7 @@ L_101dea8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101deb8: 0x101deb8: lw    s1, 24(sp)
+// 0x0101dec8: 0x101dec8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -285,7 +285,7 @@ L_101dea8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101debc: 0x101debc: lw    s0, 20(sp)
+// 0x0101decc: 0x101decc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -294,7 +294,7 @@ L_101dea8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101dec0: 0x101dec0: jr    ra addiu sp, sp, 40
+// 0x0101ded0: 0x101ded0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -306,7 +306,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_get_nodes_101dec8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_get_nodes_101ded8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -341,29 +341,29 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101dec8: 0x101dec8: addiu v0, zero, -1
+// 0x0101ded8: 0x101ded8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0101decc: 0x101decc: addiu sp, sp, -32
+// 0x0101dedc: 0x101dedc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101ded0: 0x101ded0: sw    v0, 0(a1)
+// 0x0101dee0: 0x101dee0: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0101ded4: 0x101ded4: sw    v0, 0(a2)
+// 0x0101dee4: 0x101dee4: sw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0101ded8: 0x101ded8: sw    a1, 16(sp)
+// 0x0101dee8: 0x101dee8: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -372,7 +372,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101dedc: 0x101dedc: sw    a2, 20(sp)
+// 0x0101deec: 0x101deec: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -381,19 +381,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101dee0: 0x101dee0: sw    ra, 28(sp)
-// 0x0101dee4: 0x101dee4: jal   0x101de54 sll   zero, zero, 0
+// 0x0101def0: 0x101def0: sw    ra, 28(sp)
+// 0x0101def4: 0x101def4: jal   0x101de64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101deec: 0x101deec: lw    a1, 16(sp)
+// 0x0101defc: 0x101defc: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -402,7 +402,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101def0: 0x101def0: lw    a2, 20(sp)
+// 0x0101df00: 0x101df00: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -411,11 +411,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101def4: 0x101def4: beq   v0, zero, 0x101df14 sll   zero, zero, 0
+// 0x0101df04: 0x101df04: beq   v0, zero, 0x101df24 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101df14
+	brfalse L_101df24
 // --- basic block ---
-// 0x0101defc: 0x101defc: lw    v1, 88(v0)
+// 0x0101df0c: 0x101df0c: lw    v1, 88(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -424,15 +424,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101df00: 0x101df00: sll   zero, zero, 0
-// 0x0101df04: 0x101df04: sw    v1, 0(a1)
+// 0x0101df10: 0x101df10: sll   zero, zero, 0
+// 0x0101df14: 0x101df14: sw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0101df08: 0x101df08: lw    v0, 92(v0)
+// 0x0101df18: 0x101df18: lw    v0, 92(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -441,18 +441,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101df0c: 0x101df0c: sll   zero, zero, 0
-// 0x0101df10: 0x101df10: sw    v0, 0(a2)
+// 0x0101df1c: 0x101df1c: sll   zero, zero, 0
+// 0x0101df20: 0x101df20: sw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_101df14:
-// 0x0101df14: 0x101df14: lw    ra, 28(sp)
-// 0x0101df18: 0x101df18: sll   zero, zero, 0
-// 0x0101df1c: 0x101df1c: jr    ra addiu sp, sp, 32
+L_101df24:
+// 0x0101df24: 0x101df24: lw    ra, 28(sp)
+// 0x0101df28: 0x101df28: sll   zero, zero, 0
+// 0x0101df2c: 0x101df2c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -464,7 +464,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -499,44 +499,44 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101df24: 0x101df24: addiu sp, sp, -24
+// 0x0101df34: 0x101df34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101df28: 0x101df28: sw    ra, 20(sp)
-// 0x0101df2c: 0x101df2c: jal   0x101de54 sll   zero, zero, 0
+// 0x0101df38: 0x101df38: sw    ra, 20(sp)
+// 0x0101df3c: 0x101df3c: jal   0x101de64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101df34: 0x101df34: sltu  v1, zero, v0
+// 0x0101df44: 0x101df44: sltu  v1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 6
-// 0x0101df38: 0x101df38: lw    ra, 20(sp)
-// 0x0101df3c: 0x101df3c: subu  v1, zero, v1
+// 0x0101df48: 0x101df48: lw    ra, 20(sp)
+// 0x0101df4c: 0x101df4c: subu  v1, zero, v1
 	ldloc 6
 	neg
 	stloc 6
-// 0x0101df40: 0x101df40: addiu v0, v0, 32
+// 0x0101df50: 0x101df50: addiu v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0101df44: 0x101df44: and   v0, v0, v1
+// 0x0101df54: 0x101df54: and   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	and
 	stloc 5
-// 0x0101df48: 0x101df48: jr    ra addiu sp, sp, 24
+// 0x0101df58: 0x101df58: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -548,7 +548,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -583,44 +583,44 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101df50: 0x101df50: addiu sp, sp, -24
+// 0x0101df60: 0x101df60: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101df54: 0x101df54: sw    ra, 20(sp)
-// 0x0101df58: 0x101df58: jal   0x101de54 sll   zero, zero, 0
+// 0x0101df64: 0x101df64: sw    ra, 20(sp)
+// 0x0101df68: 0x101df68: jal   0x101de64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101df60: 0x101df60: sltu  v1, zero, v0
+// 0x0101df70: 0x101df70: sltu  v1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 6
-// 0x0101df64: 0x101df64: lw    ra, 20(sp)
-// 0x0101df68: 0x101df68: subu  v1, zero, v1
+// 0x0101df74: 0x101df74: lw    ra, 20(sp)
+// 0x0101df78: 0x101df78: subu  v1, zero, v1
 	ldloc 6
 	neg
 	stloc 6
-// 0x0101df6c: 0x101df6c: addiu v0, v0, 24
+// 0x0101df7c: 0x101df7c: addiu v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x0101df70: 0x101df70: and   v0, v0, v1
+// 0x0101df80: 0x101df80: and   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	and
 	stloc 5
-// 0x0101df74: 0x101df74: jr    ra addiu sp, sp, 24
+// 0x0101df84: 0x101df84: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -632,7 +632,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_initialize_101df7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_initialize_101df8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s3,int32 s1,int32 s6,int32 s7,int32 s8,int32 s2,int32 s4,int32 s5,int32 ra,int32 lo)
@@ -697,15 +697,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101df7c: 0x101df7c: addiu sp, sp, -72
+// 0x0101df8c: 0x101df8c: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0101df80: 0x101df80: lui   v1, 0x30000
+// 0x0101df90: 0x101df90: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101df84: 0x101df84: sw    s0, 32(sp)
+// 0x0101df94: 0x101df94: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -714,15 +714,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101df88: 0x101df88: lui   s0, 0x0
+// 0x0101df98: 0x101df98: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0101df8c: 0x101df8c: addiu v0, v1, 28208
+// 0x0101df9c: 0x101df9c: addiu v0, v1, 28672
 	ldloc 7
-	ldc.i4 28208
+	ldc.i4 28672
 	add
 	stloc 6
-// 0x0101df90: 0x101df90: sw    s8, 64(sp)
+// 0x0101dfa0: 0x101dfa0: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -731,7 +731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101df94: 0x101df94: sw    s7, 60(sp)
+// 0x0101dfa4: 0x101dfa4: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -740,7 +740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101df98: 0x101df98: sw    s6, 56(sp)
+// 0x0101dfa8: 0x101dfa8: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -749,7 +749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101df9c: 0x101df9c: sw    s3, 44(sp)
+// 0x0101dfac: 0x101dfac: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -758,24 +758,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101dfa0: 0x101dfa0: addiu s0, s0, 4892
+// 0x0101dfb0: 0x101dfb0: addiu s0, s0, 4892
 	ldloc 8
 	ldc.i4 4892
 	add
 	stloc 8
-// 0x0101dfa4: 0x101dfa4: lui   s3, 0x10000
+// 0x0101dfb4: 0x101dfb4: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0101dfa8: 0x101dfa8: lui   s8, 0x10000
+// 0x0101dfb8: 0x101dfb8: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x0101dfac: 0x101dfac: lui   s7, 0x10000
+// 0x0101dfbc: 0x101dfbc: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0101dfb0: 0x101dfb0: lui   s6, 0x10000
+// 0x0101dfc0: 0x101dfc0: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0101dfb4: 0x101dfb4: sw    s5, 52(sp)
+// 0x0101dfc4: 0x101dfc4: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -784,7 +784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101dfb8: 0x101dfb8: sw    s4, 48(sp)
+// 0x0101dfc8: 0x101dfc8: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -793,7 +793,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101dfbc: 0x101dfbc: sw    s2, 40(sp)
+// 0x0101dfcc: 0x101dfcc: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -802,7 +802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101dfc0: 0x101dfc0: sw    s1, 36(sp)
+// 0x0101dfd0: 0x101dfd0: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -811,17 +811,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101dfc4: 0x101dfc4: sw    ra, 68(sp)
-// 0x0101dfc8: 0x101dfc8: sw    v0, 28208(v1)
+// 0x0101dfd4: 0x101dfd4: sw    ra, 68(sp)
+// 0x0101dfd8: 0x101dfd8: sw    v0, 28672(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7052
+	ldc.i4 7168
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101dfcc: 0x101dfcc: sw    v0, 4(v0)
+// 0x0101dfdc: 0x101dfdc: sw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -830,79 +830,79 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101dfd0: 0x101dfd0: addiu s3, s3, 18248
+// 0x0101dfe0: 0x101dfe0: addiu s3, s3, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc 9
-// 0x0101dfd4: 0x101dfd4: addiu s8, s8, -30020
+// 0x0101dfe4: 0x101dfe4: addiu s8, s8, -30020
 	ldloc 13
 	ldc.i4 -30020
 	add
 	stloc 13
-// 0x0101dfd8: 0x101dfd8: addiu s7, s7, -48
+// 0x0101dfe8: 0x101dfe8: addiu s7, s7, -52
 	ldloc 12
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc 12
-// 0x0101dfdc: 0x101dfdc: addiu s6, s6, -31052
+// 0x0101dfec: 0x101dfec: addiu s6, s6, -31052
 	ldloc 11
 	ldc.i4 -31052
 	add
 	stloc 11
-// 0x0101dfe0: 0x101dfe0: addu  s1, zero, zero
+// 0x0101dff0: 0x101dff0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0101dfe4: 0x101dfe4: addiu s5, zero, 96
+// 0x0101dff4: 0x101dff4: addiu s5, zero, 96
 	ldc.i4.s 96
 	stloc 16
-// 0x0101dfe8: 0x101dfe8: addu  s2, s0, zero
+// 0x0101dff8: 0x101dff8: addu  s2, s0, zero
 	ldloc 8
 	stloc 14
-// 0x0101dfec: 0x101dfec: j	 0x101e068 lui   s4, 0x30000
+// 0x0101dffc: 0x101dffc: j	 0x101e078 lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 15
-	br L_101e068
+	br L_101e078
 // --- basic block ---
-L_101dff4:
-// 0x0101dff4: 0x101dff4: lb    v0, 22(s0)
+L_101e004:
+// 0x0101e004: 0x101e004: lb    v0, 22(s0)
 	ldloc 8
 	ldc.i4.s 22
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101dff8: 0x101dff8: sll   zero, zero, 0
-// 0x0101dffc: 0x101dffc: bne   v0, zero, 0x101e048 mult  s1, s5
+// 0x0101e008: 0x101e008: sll   zero, zero, 0
+// 0x0101e00c: 0x101e00c: bne   v0, zero, 0x101e058 mult  s1, s5
 	ldloc 6
 	ldloc 10
 	ldloc 16
 	mul
 	stloc 18
-	brtrue L_101e048
+	brtrue L_101e058
 // --- basic block ---
-// 0x0101e004: 0x101e004: addu  a0, s3, zero
+// 0x0101e014: 0x101e014: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0101e008: 0x101e008: addu  a2, s8, zero
+// 0x0101e018: 0x101e018: addu  a2, s8, zero
 	ldloc 13
 	stloc.3
-// 0x0101e00c: 0x101e00c: addu  a3, zero, zero
+// 0x0101e01c: 0x101e01c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101e010: 0x101e010: mflo  lo
+// 0x0101e020: 0x101e020: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x0101e014: 0x101e014: addu  a1, s2, v0
+// 0x0101e024: 0x101e024: addu  a1, s2, v0
 	ldloc 14
 	ldloc 6
 	add
 	stloc.2
-// 0x0101e018: 0x101e018: addiu a1, a1, 52
+// 0x0101e028: 0x101e028: addiu a1, a1, 52
 	ldloc.2
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x0101e01c: 0x101e01c: jal   0x100edb0 sw    v0, 24(sp)
+// 0x0101e02c: 0x101e02c: jal   0x100edc0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -916,18 +916,18 @@ L_101dff4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e024: 0x101e024: lb    v1, 21(s0)
+// 0x0101e034: 0x101e034: lb    v1, 21(s0)
 	ldloc 8
 	ldc.i4.s 21
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0101e028: 0x101e028: lw    v0, 24(sp)
+// 0x0101e038: 0x101e038: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -936,26 +936,26 @@ L_101dff4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e02c: 0x101e02c: beq   v1, zero, 0x101e048 addu  v0, s2, v0
+// 0x0101e03c: 0x101e03c: beq   v1, zero, 0x101e058 addu  v0, s2, v0
 	ldloc 7
 	ldloc 14
 	ldloc 6
 	add
 	stloc 6
-	brfalse L_101e048
+	brfalse L_101e058
 // --- basic block ---
-// 0x0101e034: 0x101e034: addiu a1, v0, 68
+// 0x0101e044: 0x101e044: addiu a1, v0, 68
 	ldloc 6
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x0101e038: 0x101e038: addu  a0, s3, zero
+// 0x0101e048: 0x101e048: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0101e03c: 0x101e03c: addu  a2, s7, zero
+// 0x0101e04c: 0x101e04c: addu  a2, s7, zero
 	ldloc 12
 	stloc.3
-// 0x0101e040: 0x101e040: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101e050: 0x101e050: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -963,13 +963,13 @@ L_101dff4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_101e048:
-// 0x0101e048: 0x101e048: lw    a0, 8(s0)
+L_101e058:
+// 0x0101e058: 0x101e058: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -978,7 +978,7 @@ L_101e048:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e04c: 0x101e04c: jal   0x1001b14 addu  a1, s6, zero
+// 0x0101e05c: 0x101e05c: jal   0x1001b14 addu  a1, s6, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -986,32 +986,32 @@ L_101e048:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101e054: 0x101e054: bne   v0, zero, 0x101e060 sll   zero, zero, 0
+// 0x0101e064: 0x101e064: bne   v0, zero, 0x101e070 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101e060
+	brtrue L_101e070
 // --- basic block ---
-// 0x0101e05c: 0x101e05c: sw    s0, 28176(s4)
+// 0x0101e06c: 0x101e06c: sw    s0, 28640(s4)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldloc 8
 	stelem.i4
-L_101e060:
-// 0x0101e060: 0x101e060: addiu s1, s1, 1
+L_101e070:
+// 0x0101e070: 0x101e070: addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0101e064: 0x101e064: addiu s0, s0, 96
+// 0x0101e074: 0x101e074: addiu s0, s0, 96
 	ldloc 8
 	ldc.i4.s 96
 	add
 	stloc 8
-L_101e068:
-// 0x0101e068: 0x101e068: lw    v0, 8(s0)
+L_101e078:
+// 0x0101e078: 0x101e078: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1020,35 +1020,35 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e06c: 0x101e06c: sll   zero, zero, 0
-// 0x0101e070: 0x101e070: bne   v0, zero, 0x101dff4 lui   a1, 0x0
+// 0x0101e07c: 0x101e07c: sll   zero, zero, 0
+// 0x0101e080: 0x101e080: bne   v0, zero, 0x101e004 lui   a1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_101dff4
+	brtrue L_101e004
 // --- basic block ---
-// 0x0101e078: 0x101e078: lui   s0, 0x10000
+// 0x0101e088: 0x101e088: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0101e07c: 0x101e07c: lui   a2, 0x0
+// 0x0101e08c: 0x101e08c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0101e080: 0x101e080: addiu a0, s0, 18248
+// 0x0101e090: 0x101e090: addiu a0, s0, 19712
 	ldloc 8
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0101e084: 0x101e084: addiu a1, a1, 5948
+// 0x0101e094: 0x101e094: addiu a1, a1, 5948
 	ldloc.2
 	ldc.i4 5948
 	add
 	stloc.2
-// 0x0101e088: 0x101e088: addiu a2, a2, 28132
+// 0x0101e098: 0x101e098: addiu a2, a2, 28132
 	ldloc.3
 	ldc.i4 28132
 	add
 	stloc.3
-// 0x0101e08c: 0x101e08c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101e09c: 0x101e09c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1056,47 +1056,47 @@ L_101e068:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e094: 0x101e094: lui   a0, 0x10000
+// 0x0101e0a4: 0x101e0a4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101e098: 0x101e098: lui   a1, 0x0
+// 0x0101e0a8: 0x101e0a8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101e09c: 0x101e09c: lui   a3, 0x0
+// 0x0101e0ac: 0x101e0ac: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0101e0a0: 0x101e0a0: lui   v0, 0x20000
+// 0x0101e0b0: 0x101e0b0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0101e0a4: 0x101e0a4: addiu a0, a0, 12560
+// 0x0101e0b4: 0x101e0b4: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0101e0a8: 0x101e0a8: addiu a1, a1, 5964
+// 0x0101e0b8: 0x101e0b8: addiu a1, a1, 5964
 	ldloc.2
 	ldc.i4 5964
 	add
 	stloc.2
-// 0x0101e0ac: 0x101e0ac: addiu a3, a3, 20820
+// 0x0101e0bc: 0x101e0bc: addiu a3, a3, 20820
 	ldloc 4
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0101e0b0: 0x101e0b0: addu  a2, zero, zero
+// 0x0101e0c0: 0x101e0c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101e0b4: 0x101e0b4: addiu v0, v0, 9464
+// 0x0101e0c4: 0x101e0c4: addiu v0, v0, 9928
 	ldloc 6
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 6
-// 0x0101e0b8: 0x101e0b8: sw    v0, 16(sp)
+// 0x0101e0c8: 0x101e0c8: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1105,7 +1105,7 @@ L_101e068:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101e0bc: 0x101e0bc: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0101e0cc: 0x101e0cc: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1119,33 +1119,33 @@ L_101e068:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e0c4: 0x101e0c4: lui   a1, 0x0
+// 0x0101e0d4: 0x101e0d4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101e0c8: 0x101e0c8: lui   a2, 0x10000
+// 0x0101e0d8: 0x101e0d8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101e0cc: 0x101e0cc: addiu a0, s0, 18248
+// 0x0101e0dc: 0x101e0dc: addiu a0, s0, 19712
 	ldloc 8
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0101e0d0: 0x101e0d0: addiu a1, a1, 5980
+// 0x0101e0e0: 0x101e0e0: addiu a1, a1, 5980
 	ldloc.2
 	ldc.i4 5980
 	add
 	stloc.2
-// 0x0101e0d4: 0x101e0d4: addiu a2, a2, -31052
+// 0x0101e0e4: 0x101e0e4: addiu a2, a2, -31052
 	ldloc.3
 	ldc.i4 -31052
 	add
 	stloc.3
-// 0x0101e0d8: 0x101e0d8: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101e0e8: 0x101e0e8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1153,33 +1153,33 @@ L_101e068:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e0e0: 0x101e0e0: lui   a1, 0x0
+// 0x0101e0f0: 0x101e0f0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101e0e4: 0x101e0e4: lui   a2, 0x10000
+// 0x0101e0f4: 0x101e0f4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101e0e8: 0x101e0e8: addiu a0, s0, 18248
+// 0x0101e0f8: 0x101e0f8: addiu a0, s0, 19712
 	ldloc 8
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0101e0ec: 0x101e0ec: addiu a1, a1, 5996
+// 0x0101e0fc: 0x101e0fc: addiu a1, a1, 5996
 	ldloc.2
 	ldc.i4 5996
 	add
 	stloc.2
-// 0x0101e0f0: 0x101e0f0: addiu a2, a2, -16892
+// 0x0101e100: 0x101e100: addiu a2, a2, 19396
 	ldloc.3
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc.3
-// 0x0101e0f4: 0x101e0f4: jal   0x100edb0 addu  a3, zero, zero
+// 0x0101e104: 0x101e104: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1187,36 +1187,36 @@ L_101e068:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e0fc: 0x101e0fc: lui   a1, 0x0
+// 0x0101e10c: 0x101e10c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101e100: 0x101e100: lui   a0, 0x20000
+// 0x0101e110: 0x101e110: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0101e104: 0x101e104: lui   a2, 0x10000
+// 0x0101e114: 0x101e114: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0101e108: 0x101e108: addiu a1, a1, 6012
+// 0x0101e118: 0x101e118: addiu a1, a1, 6012
 	ldloc.2
 	ldc.i4 6012
 	add
 	stloc.2
-// 0x0101e10c: 0x101e10c: addiu a2, a2, -30000
+// 0x0101e11c: 0x101e11c: addiu a2, a2, -30000
 	ldloc.3
 	ldc.i4 -30000
 	add
 	stloc.3
-// 0x0101e110: 0x101e110: addu  a3, zero, zero
+// 0x0101e120: 0x101e120: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101e114: 0x101e114: jal   0x100edb0 addiu a0, a0, -26888
+// 0x0101e124: 0x101e124: jal   0x100edc0 addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
 	ldloc.0
@@ -1224,50 +1224,50 @@ L_101e068:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e11c: 0x101e11c: lui   a0, 0x1020000
+// 0x0101e12c: 0x101e12c: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0101e120: 0x101e120: jal   0x101ada4 addiu a0, a0, -7820
+// 0x0101e130: 0x101e130: jal   0x101adb4 addiu a0, a0, -7804
 	ldloc.1
-	ldc.i4 -7820
+	ldc.i4 -7804
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl19::roadmap_message_register_101ada4(int32)
+	call int32 Cibyl19::roadmap_message_register_101adb4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e128: 0x101e128: lui   a0, 0x10000
+// 0x0101e138: 0x101e138: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101e12c: 0x101e12c: lui   a1, 0x1020000
+// 0x0101e13c: 0x101e13c: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x0101e130: 0x101e130: lui   v1, 0x30000
+// 0x0101e140: 0x101e140: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101e134: 0x101e134: addiu a0, a0, -29988
+// 0x0101e144: 0x101e144: addiu a0, a0, -29988
 	ldloc.1
 	ldc.i4 -29988
 	add
 	stloc.1
-// 0x0101e138: 0x101e138: addiu a1, a1, -8988
+// 0x0101e148: 0x101e148: addiu a1, a1, -8972
 	ldloc.2
-	ldc.i4 -8988
+	ldc.i4 -8972
 	add
 	stloc.2
-// 0x0101e13c: 0x101e13c: jal   0x100f48c sw    v0, 28204(v1)
+// 0x0101e14c: 0x101e14c: jal   0x100f49c sw    v0, 28668(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7051
+	ldc.i4 7167
 	add
 	ldloc 6
 	stelem.i4
@@ -1276,13 +1276,13 @@ L_101e068:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e144: 0x101e144: lw    ra, 68(sp)
-// 0x0101e148: 0x101e148: lw    s8, 64(sp)
+// 0x0101e154: 0x101e154: lw    ra, 68(sp)
+// 0x0101e158: 0x101e158: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1291,7 +1291,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101e14c: 0x101e14c: lw    s7, 60(sp)
+// 0x0101e15c: 0x101e15c: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1300,7 +1300,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101e150: 0x101e150: lw    s6, 56(sp)
+// 0x0101e160: 0x101e160: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1309,7 +1309,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101e154: 0x101e154: lw    s5, 52(sp)
+// 0x0101e164: 0x101e164: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1318,7 +1318,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101e158: 0x101e158: lw    s4, 48(sp)
+// 0x0101e168: 0x101e168: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1327,7 +1327,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101e15c: 0x101e15c: lw    s3, 44(sp)
+// 0x0101e16c: 0x101e16c: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1336,7 +1336,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101e160: 0x101e160: lw    s2, 40(sp)
+// 0x0101e170: 0x101e170: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1345,7 +1345,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101e164: 0x101e164: lw    s1, 36(sp)
+// 0x0101e174: 0x101e174: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1354,7 +1354,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101e168: 0x101e168: lw    s0, 32(sp)
+// 0x0101e178: 0x101e178: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1363,7 +1363,7 @@ L_101e068:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101e16c: 0x101e16c: jr    ra addiu sp, sp, 72
+// 0x0101e17c: 0x101e17c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1375,7 +1375,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_format_messages_101e174(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_format_messages_101e184(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 t1,int32 ra,int32 t0)
@@ -1431,15 +1431,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101e174: 0x101e174: addiu sp, sp, -64
+// 0x0101e184: 0x101e184: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0101e178: 0x101e178: lui   v0, 0x30000
+// 0x0101e188: 0x101e188: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101e17c: 0x101e17c: sw    s0, 40(sp)
+// 0x0101e18c: 0x101e18c: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1448,29 +1448,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101e180: 0x101e180: lw    s0, 28180(v0)
+// 0x0101e190: 0x101e190: lw    s0, 28644(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101e184: 0x101e184: lui   v0, 0x30000
+// 0x0101e194: 0x101e194: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101e188: 0x101e188: lw    v0, 28176(v0)
+// 0x0101e198: 0x101e198: lw    v0, 28640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101e18c: 0x101e18c: sw    ra, 60(sp)
-// 0x0101e190: 0x101e190: sw    s4, 56(sp)
+// 0x0101e19c: 0x101e19c: sw    ra, 60(sp)
+// 0x0101e1a0: 0x101e1a0: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1479,7 +1479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101e194: 0x101e194: sw    s3, 52(sp)
+// 0x0101e1a4: 0x101e1a4: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1488,7 +1488,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101e198: 0x101e198: sw    s2, 48(sp)
+// 0x0101e1a8: 0x101e1a8: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1497,7 +1497,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101e19c: 0x101e19c: bne   s0, v0, 0x101e448 sw    s1, 44(sp)
+// 0x0101e1ac: 0x101e1ac: bne   s0, v0, 0x101e458 sw    s1, 44(sp)
 	ldloc 9
 	ldloc 5
 	ldloc 6
@@ -1508,50 +1508,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_101e448
+	bne.un L_101e458
 // --- basic block ---
-// 0x0101e1a4: 0x101e1a4: lui   s1, 0x30000
+// 0x0101e1b4: 0x101e1b4: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0101e1a8: 0x101e1a8: lw    v0, 28184(s1)
+// 0x0101e1b8: 0x101e1b8: lw    v0, 28648(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101e1ac: 0x101e1ac: sll   zero, zero, 0
-// 0x0101e1b0: 0x101e1b0: beq   v0, zero, 0x101e448 sll   zero, zero, 0
+// 0x0101e1bc: 0x101e1bc: sll   zero, zero, 0
+// 0x0101e1c0: 0x101e1c0: beq   v0, zero, 0x101e458 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101e448
+	brfalse L_101e458
 // --- basic block ---
-// 0x0101e1b8: 0x101e1b8: lb    v0, 23(v0)
+// 0x0101e1c8: 0x101e1c8: lb    v0, 23(v0)
 	ldloc 5
 	ldc.i4.s 23
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101e1bc: 0x101e1bc: sll   zero, zero, 0
-// 0x0101e1c0: 0x101e1c0: beq   v0, zero, 0x101e44c lui   v0, 0x30000
+// 0x0101e1cc: 0x101e1cc: sll   zero, zero, 0
+// 0x0101e1d0: 0x101e1d0: beq   v0, zero, 0x101e45c lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_101e44c
+	brfalse L_101e45c
 // --- basic block ---
-// 0x0101e1c8: 0x101e1c8: addu  s2, zero, zero
+// 0x0101e1d8: 0x101e1d8: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0101e1cc: 0x101e1cc: cibyl_sysc_arg 0x12
+// 0x0101e1dc: 0x101e1dc: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x0101e1d0: 0x101e1d0: cibyl_sysc 0x39c
+// 0x0101e1e0: 0x101e1e0: cibyl_sysc 0x39c
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0101e1d4: 0x101e1d4: addu  s2, v0, zero
+// 0x0101e1e4: 0x101e1e4: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0101e1d8: 0x101e1d8: jal   0x104f8d8 addu  a0, s2, zero
+// 0x0101e1e8: 0x101e1e8: jal   0x104f8e8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1559,15 +1559,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e1e0: 0x101e1e0: addu  a1, v0, zero
+// 0x0101e1f0: 0x101e1f0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101e1e4: 0x101e1e4: jal   0x101aec4 addiu a0, zero, 84
+// 0x0101e1f4: 0x101e1f4: jal   0x101aed4 addiu a0, zero, 84
 	ldc.i4.s 84
 	stloc.1
 	ldloc.0
@@ -1575,31 +1575,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e1ec: 0x101e1ec: lw    a1, 28184(s1)
+// 0x0101e1fc: 0x101e1fc: lw    a1, 28648(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e1f0: 0x101e1f0: addiu s3, s0, 24
+// 0x0101e200: 0x101e200: addiu s3, s0, 24
 	ldloc 9
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x0101e1f4: 0x101e1f4: addiu a1, a1, 24
+// 0x0101e204: 0x101e204: addiu a1, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0101e1f8: 0x101e1f8: jal   0x1008eb0 addu  a0, s3, zero
+// 0x0101e208: 0x101e208: jal   0x1008ec0 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -1607,40 +1607,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e200: 0x101e200: jal   0x1007d6c addu  s1, v0, zero
+// 0x0101e210: 0x101e210: jal   0x1007d7c addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x0101e208: 0x101e208: lui   a1, 0x10000
+// 0x0101e218: 0x101e218: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101e20c: 0x101e20c: lui   a3, 0x10000
+// 0x0101e21c: 0x101e21c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101e210: 0x101e210: addiu a1, a1, -29976
+// 0x0101e220: 0x101e220: addiu a1, a1, -29976
 	ldloc.2
 	ldc.i4 -29976
 	add
 	stloc.2
-// 0x0101e214: 0x101e214: addiu a3, a3, -29948
+// 0x0101e224: 0x101e224: addiu a3, a3, -29948
 	ldloc 4
 	ldc.i4 -29948
 	add
 	stloc 4
-// 0x0101e218: 0x101e218: addiu a2, zero, 621
+// 0x0101e228: 0x101e228: addiu a2, zero, 621
 	ldc.i4 621
 	stloc.3
-// 0x0101e21c: 0x101e21c: addiu a0, zero, 1
+// 0x0101e22c: 0x101e22c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101e220: 0x101e220: sw    v0, 20(sp)
+// 0x0101e230: 0x101e230: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1649,7 +1649,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101e224: 0x101e224: jal   0x100449c sw    s1, 16(sp)
+// 0x0101e234: 0x101e234: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1668,21 +1668,21 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e22c: 0x101e22c: jal   0x1007df4 addu  a0, s1, zero
+// 0x0101e23c: 0x101e23c: jal   0x1007e04 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x0101e234: 0x101e234: blez  v0, 0x101e24c lui   s4, 0x20000
+// 0x0101e244: 0x101e244: blez  v0, 0x101e25c lui   s4, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 12
 	ldc.i4.s 0
-	ble L_101e24c
+	ble L_101e25c
 // --- basic block ---
-// 0x0101e23c: 0x101e23c: jal   0x1007d84 sw    v0, 32(sp)
+// 0x0101e24c: 0x101e24c: jal   0x1007d94 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1691,14 +1691,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0101e244: 0x101e244: j	 0x101e25c sll   zero, zero, 0
-	br L_101e25c
+// 0x0101e254: 0x101e254: j	 0x101e26c sll   zero, zero, 0
+	br L_101e26c
 // --- basic block ---
-L_101e24c:
-// 0x0101e24c: 0x101e24c: jal   0x1007db4 addu  a0, s1, zero
+L_101e25c:
+// 0x0101e25c: 0x101e25c: jal   0x1007dc4 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1706,12 +1706,12 @@ L_101e24c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e254: 0x101e254: jal   0x1007d6c sw    v0, 32(sp)
+// 0x0101e264: 0x101e264: jal   0x1007d7c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1720,11 +1720,11 @@ L_101e24c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-L_101e25c:
-// 0x0101e25c: 0x101e25c: lw    a2, 32(sp)
+L_101e26c:
+// 0x0101e26c: 0x101e26c: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1733,15 +1733,15 @@ L_101e25c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e260: 0x101e260: addu  a3, v0, zero
+// 0x0101e270: 0x101e270: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0101e264: 0x101e264: addiu a1, s4, 22696
+// 0x0101e274: 0x101e274: addiu a1, s4, 23156
 	ldloc 12
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.2
-// 0x0101e268: 0x101e268: jal   0x101aec4 addiu a0, zero, 68
+// 0x0101e278: 0x101e278: jal   0x101aed4 addiu a0, zero, 68
 	ldc.i4.s 68
 	stloc.1
 	ldloc.0
@@ -1749,77 +1749,77 @@ L_101e25c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e270: 0x101e270: lui   v0, 0x30000
+// 0x0101e280: 0x101e280: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101e274: 0x101e274: lw    a0, 28184(v0)
+// 0x0101e284: 0x101e284: lw    a0, 28648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e278: 0x101e278: lui   v1, 0x30000
+// 0x0101e288: 0x101e288: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101e27c: 0x101e27c: lui   v0, 0x30000
+// 0x0101e28c: 0x101e28c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101e280: 0x101e280: lw    t0, 28192(v1)
+// 0x0101e290: 0x101e290: lw    t0, 28656(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7048
+	ldc.i4 7164
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101e284: 0x101e284: addiu a3, v0, 28208
+// 0x0101e294: 0x101e294: addiu a3, v0, 28672
 	ldloc 5
-	ldc.i4 28208
+	ldc.i4 28672
 	add
 	stloc 4
-// 0x0101e288: 0x101e288: lw    v1, 28208(v0)
+// 0x0101e298: 0x101e298: lw    v1, 28672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7052
+	ldc.i4 7168
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e28c: 0x101e28c: j	 0x101e2dc addu  a1, a0, zero
+// 0x0101e29c: 0x101e29c: j	 0x101e2ec addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-	br L_101e2dc
+	br L_101e2ec
 // --- basic block ---
-L_101e294:
-// 0x0101e294: 0x101e294: lb    t1, 22(v0)
+L_101e2a4:
+// 0x0101e2a4: 0x101e2a4: lb    t1, 22(v0)
 	ldloc 5
 	ldc.i4.s 22
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 13
-// 0x0101e298: 0x101e298: sll   zero, zero, 0
-// 0x0101e29c: 0x101e29c: beq   t1, zero, 0x101e2d4 addu  v1, a2, zero
+// 0x0101e2a8: 0x101e2a8: sll   zero, zero, 0
+// 0x0101e2ac: 0x101e2ac: beq   t1, zero, 0x101e2e4 addu  v1, a2, zero
 	ldloc 13
 	ldloc.3
 	stloc 7
-	brfalse L_101e2d4
+	brfalse L_101e2e4
 // --- basic block ---
-// 0x0101e2a4: 0x101e2a4: beq   v0, t0, 0x101e2d4 sll   zero, zero, 0
+// 0x0101e2b4: 0x101e2b4: beq   v0, t0, 0x101e2e4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 15
-	beq  L_101e2d4
+	beq  L_101e2e4
 // --- basic block ---
-// 0x0101e2ac: 0x101e2ac: lw    a2, 84(v0)
+// 0x0101e2bc: 0x101e2bc: lw    a2, 84(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1828,17 +1828,17 @@ L_101e294:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e2b0: 0x101e2b0: sll   zero, zero, 0
-// 0x0101e2b4: 0x101e2b4: slt   t1, a2, s1
+// 0x0101e2c0: 0x101e2c0: sll   zero, zero, 0
+// 0x0101e2c4: 0x101e2c4: slt   t1, a2, s1
 	ldloc.3
 	ldloc 8
 	clt
 	stloc 13
-// 0x0101e2b8: 0x101e2b8: beq   t1, zero, 0x101e2d4 sll   zero, zero, 0
+// 0x0101e2c8: 0x101e2c8: beq   t1, zero, 0x101e2e4 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_101e2d4
+	brfalse L_101e2e4
 // --- basic block ---
-// 0x0101e2c0: 0x101e2c0: lw    t1, 84(a1)
+// 0x0101e2d0: 0x101e2d0: lw    t1, 84(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1847,59 +1847,59 @@ L_101e294:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101e2c4: 0x101e2c4: sll   zero, zero, 0
-// 0x0101e2c8: 0x101e2c8: slt   a2, t1, a2
+// 0x0101e2d4: 0x101e2d4: sll   zero, zero, 0
+// 0x0101e2d8: 0x101e2d8: slt   a2, t1, a2
 	ldloc 13
 	ldloc.3
 	clt
 	stloc.3
-// 0x0101e2cc: 0x101e2cc: bne   a2, zero, 0x101e2d8 sll   zero, zero, 0
+// 0x0101e2dc: 0x101e2dc: bne   a2, zero, 0x101e2e8 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_101e2d8
+	brtrue L_101e2e8
 // --- basic block ---
-L_101e2d4:
-// 0x0101e2d4: 0x101e2d4: addu  v0, a1, zero
+L_101e2e4:
+// 0x0101e2e4: 0x101e2e4: addu  v0, a1, zero
 	ldloc.2
 	stloc 5
-L_101e2d8:
-// 0x0101e2d8: 0x101e2d8: addu  a1, v0, zero
+L_101e2e8:
+// 0x0101e2e8: 0x101e2e8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-L_101e2dc:
-// 0x0101e2dc: 0x101e2dc: lw    a2, 0(v1)
+L_101e2ec:
+// 0x0101e2ec: 0x101e2ec: lw    a2, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0101e2e0: 0x101e2e0: bne   v1, a3, 0x101e294 addu  v0, v1, zero
+// 0x0101e2f0: 0x101e2f0: bne   v1, a3, 0x101e2a4 addu  v0, v1, zero
 	ldloc 7
 	ldloc 4
 	ldloc 7
 	stloc 5
-	bne.un L_101e294
+	bne.un L_101e2a4
 // --- basic block ---
-// 0x0101e2e8: 0x101e2e8: lui   s4, 0x30000
+// 0x0101e2f8: 0x101e2f8: lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 12
-// 0x0101e2ec: 0x101e2ec: beq   a1, a0, 0x101e370 sw    a1, 28188(s4)
+// 0x0101e2fc: 0x101e2fc: beq   a1, a0, 0x101e380 sw    a1, 28652(s4)
 	ldloc.2
 	ldloc.1
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7047
+	ldc.i4 7163
 	add
 	ldloc.2
 	stelem.i4
-	beq  L_101e370
+	beq  L_101e380
 // --- basic block ---
-// 0x0101e2f4: 0x101e2f4: addu  a0, s3, zero
+// 0x0101e304: 0x101e304: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0101e2f8: 0x101e2f8: jal   0x1008eb0 addiu a1, a1, 24
+// 0x0101e308: 0x101e308: jal   0x1008ec0 addiu a1, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	add
@@ -1909,25 +1909,25 @@ L_101e2dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e300: 0x101e300: addu  s1, v0, zero
+// 0x0101e310: 0x101e310: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0101e304: 0x101e304: lw    v0, 28188(s4)
+// 0x0101e314: 0x101e314: lw    v0, 28652(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7047
+	ldc.i4 7163
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101e308: 0x101e308: sll   zero, zero, 0
-// 0x0101e30c: 0x101e30c: lw    s3, 8(v0)
+// 0x0101e318: 0x101e318: sll   zero, zero, 0
+// 0x0101e31c: 0x101e31c: lw    s3, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1936,33 +1936,33 @@ L_101e2dc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101e310: 0x101e310: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x0101e320: 0x101e320: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x0101e318: 0x101e318: lui   a1, 0x10000
+// 0x0101e328: 0x101e328: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101e31c: 0x101e31c: lui   a3, 0x10000
+// 0x0101e32c: 0x101e32c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101e320: 0x101e320: addiu a1, a1, -29976
+// 0x0101e330: 0x101e330: addiu a1, a1, -29976
 	ldloc.2
 	ldc.i4 -29976
 	add
 	stloc.2
-// 0x0101e324: 0x101e324: addiu a3, a3, -29908
+// 0x0101e334: 0x101e334: addiu a3, a3, -29908
 	ldloc 4
 	ldc.i4 -29908
 	add
 	stloc 4
-// 0x0101e328: 0x101e328: addiu a2, zero, 660
+// 0x0101e338: 0x101e338: addiu a2, zero, 660
 	ldc.i4 660
 	stloc.3
-// 0x0101e32c: 0x101e32c: addiu a0, zero, 1
+// 0x0101e33c: 0x101e33c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101e330: 0x101e330: sw    v0, 24(sp)
+// 0x0101e340: 0x101e340: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1971,7 +1971,7 @@ L_101e2dc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101e334: 0x101e334: sw    s3, 16(sp)
+// 0x0101e344: 0x101e344: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1980,7 +1980,7 @@ L_101e2dc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101e338: 0x101e338: jal   0x100449c sw    s1, 20(sp)
+// 0x0101e348: 0x101e348: jal   0x100449c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1999,14 +1999,14 @@ L_101e2dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e340: 0x101e340: jal   0x1007df4 addu  a0, s1, zero
+// 0x0101e350: 0x101e350: jal   0x1007e04 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x0101e348: 0x101e348: jal   0x1007d84 sw    v0, 32(sp)
+// 0x0101e358: 0x101e358: jal   0x1007d94 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2015,13 +2015,13 @@ L_101e2dc:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0101e350: 0x101e350: lui   a1, 0x20000
+// 0x0101e360: 0x101e360: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0101e354: 0x101e354: lw    a2, 32(sp)
+// 0x0101e364: 0x101e364: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2030,15 +2030,15 @@ L_101e2dc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e358: 0x101e358: addiu a1, a1, 22696
+// 0x0101e368: 0x101e368: addiu a1, a1, 23156
 	ldloc.2
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.2
-// 0x0101e35c: 0x101e35c: addu  a3, v0, zero
+// 0x0101e36c: 0x101e36c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0101e360: 0x101e360: jal   0x101aec4 addiu a0, zero, 87
+// 0x0101e370: 0x101e370: jal   0x101aed4 addiu a0, zero, 87
 	ldc.i4.s 87
 	stloc.1
 	ldloc.0
@@ -2046,16 +2046,16 @@ L_101e2dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e368: 0x101e368: j	 0x101e378 sll   zero, zero, 0
-	br L_101e378
+// 0x0101e378: 0x101e378: j	 0x101e388 sll   zero, zero, 0
+	br L_101e388
 // --- basic block ---
-L_101e370:
-// 0x0101e370: 0x101e370: jal   0x101ae54 addiu a0, zero, 87
+L_101e380:
+// 0x0101e380: 0x101e380: jal   0x101ae64 addiu a0, zero, 87
 	ldc.i4.s 87
 	stloc.1
 	ldloc.0
@@ -2063,13 +2063,13 @@ L_101e370:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101e378:
-// 0x0101e378: 0x101e378: lw    a0, 44(s0)
+L_101e388:
+// 0x0101e388: 0x101e388: lw    a0, 44(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2078,7 +2078,7 @@ L_101e378:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e37c: 0x101e37c: jal   0x1007e4c addiu s1, s0, 32
+// 0x0101e38c: 0x101e38c: jal   0x1007e5c addiu s1, s0, 32
 	ldloc 9
 	ldc.i4.s 32
 	add
@@ -2088,12 +2088,12 @@ L_101e378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e384: 0x101e384: jal   0x1007d9c sw    v0, 32(sp)
+// 0x0101e394: 0x101e394: jal   0x1007dac sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2102,10 +2102,10 @@ L_101e378:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_speed_unit_1007d9c()
+	call int32 Cibyl5::roadmap_math_speed_unit_1007dac()
 	stloc 5
 // --- basic block ---
-// 0x0101e38c: 0x101e38c: lw    a2, 32(sp)
+// 0x0101e39c: 0x101e39c: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2114,18 +2114,18 @@ L_101e378:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e390: 0x101e390: lui   a1, 0x10000
+// 0x0101e3a0: 0x101e3a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101e394: 0x101e394: addiu a1, a1, -29864
+// 0x0101e3a4: 0x101e3a4: addiu a1, a1, -29864
 	ldloc.2
 	ldc.i4 -29864
 	add
 	stloc.2
-// 0x0101e398: 0x101e398: addu  a3, v0, zero
+// 0x0101e3a8: 0x101e3a8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0101e39c: 0x101e39c: jal   0x101aec4 addiu a0, zero, 83
+// 0x0101e3ac: 0x101e3ac: jal   0x101aed4 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -2133,12 +2133,12 @@ L_101e378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e3a4: 0x101e3a4: lw    a2, 40(s0)
+// 0x0101e3b4: 0x101e3b4: lw    a2, 40(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2147,10 +2147,10 @@ L_101e378:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e3a8: 0x101e3a8: addu  s0, zero, zero
+// 0x0101e3b8: 0x101e3b8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0101e3ac: 0x101e3ac: jal   0x1007d6c sw    a2, 32(sp)
+// 0x0101e3bc: 0x101e3bc: jal   0x1007d7c sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2159,10 +2159,10 @@ L_101e378:
 	add
 	ldloc.3
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x0101e3b4: 0x101e3b4: lw    a2, 32(sp)
+// 0x0101e3c4: 0x101e3c4: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2171,18 +2171,18 @@ L_101e378:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e3b8: 0x101e3b8: lui   a1, 0x20000
+// 0x0101e3c8: 0x101e3c8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0101e3bc: 0x101e3bc: addiu a1, a1, 22696
+// 0x0101e3cc: 0x101e3cc: addiu a1, a1, 23156
 	ldloc.2
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.2
-// 0x0101e3c0: 0x101e3c0: addu  a3, v0, zero
+// 0x0101e3d0: 0x101e3d0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0101e3c4: 0x101e3c4: jal   0x101aec4 addiu a0, zero, 72
+// 0x0101e3d4: 0x101e3d4: jal   0x101aed4 addiu a0, zero, 72
 	ldc.i4.s 72
 	stloc.1
 	ldloc.0
@@ -2190,20 +2190,20 @@ L_101e378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e3cc: 0x101e3cc: cibyl_sysc_arg 0x10
+// 0x0101e3dc: 0x101e3dc: cibyl_sysc_arg 0x10
 	ldloc 9
-// 0x0101e3d0: 0x101e3d0: cibyl_sysc 0x3a1
+// 0x0101e3e0: 0x101e3e0: cibyl_sysc 0x3a1
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0101e3d4: 0x101e3d4: addu  a1, v0, zero
+// 0x0101e3e4: 0x101e3e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101e3d8: 0x101e3d8: jal   0x10bfa34 addu  a0, s1, zero
+// 0x0101e3e8: 0x101e3e8: jal   0x10c007c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2211,23 +2211,23 @@ L_101e378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_sunset_10bfa34(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_sunset_10c007c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e3e0: 0x101e3e0: slt   s2, s2, v0
+// 0x0101e3f0: 0x101e3f0: slt   s2, s2, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 10
-// 0x0101e3e4: 0x101e3e4: beq   s2, zero, 0x101e40c addiu a0, zero, 77
+// 0x0101e3f4: 0x101e3f4: beq   s2, zero, 0x101e41c addiu a0, zero, 77
 	ldloc 10
 	ldc.i4.s 77
 	stloc.1
-	brfalse L_101e40c
+	brfalse L_101e41c
 // --- basic block ---
-// 0x0101e3ec: 0x101e3ec: jal   0x101ae54 sw    v0, 32(sp)
+// 0x0101e3fc: 0x101e3fc: jal   0x101ae64 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2241,12 +2241,12 @@ L_101e378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e3f4: 0x101e3f4: lw    v0, 32(sp)
+// 0x0101e404: 0x101e404: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2255,7 +2255,7 @@ L_101e378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101e3f8: 0x101e3f8: jal   0x104f8d8 addu  a0, v0, zero
+// 0x0101e408: 0x101e408: jal   0x104f8e8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2263,21 +2263,21 @@ L_101e378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e400: 0x101e400: addu  a1, v0, zero
+// 0x0101e410: 0x101e410: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101e404: 0x101e404: j	 0x101e438 addiu a0, zero, 69
+// 0x0101e414: 0x101e414: j	 0x101e448 addiu a0, zero, 69
 	ldc.i4.s 69
 	stloc.1
-	br L_101e438
+	br L_101e448
 // --- basic block ---
-L_101e40c:
-// 0x0101e40c: 0x101e40c: jal   0x101ae54 addiu a0, zero, 69
+L_101e41c:
+// 0x0101e41c: 0x101e41c: jal   0x101ae64 addiu a0, zero, 69
 	ldc.i4.s 69
 	stloc.1
 	ldloc.0
@@ -2285,20 +2285,20 @@ L_101e40c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e414: 0x101e414: cibyl_sysc_arg 0x10
+// 0x0101e424: 0x101e424: cibyl_sysc_arg 0x10
 	ldloc 9
-// 0x0101e418: 0x101e418: cibyl_sysc 0x3a6
+// 0x0101e428: 0x101e428: cibyl_sysc 0x3a6
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0101e41c: 0x101e41c: addu  a1, v0, zero
+// 0x0101e42c: 0x101e42c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101e420: 0x101e420: jal   0x10bfa70 addu  a0, s1, zero
+// 0x0101e430: 0x101e430: jal   0x10c00b8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2306,12 +2306,12 @@ L_101e40c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_sunrise_10bfa70(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_sunrise_10c00b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e428: 0x101e428: jal   0x104f8d8 addu  a0, v0, zero
+// 0x0101e438: 0x101e438: jal   0x104f8e8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2319,48 +2319,48 @@ L_101e40c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e430: 0x101e430: addu  a1, v0, zero
+// 0x0101e440: 0x101e440: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101e434: 0x101e434: addiu a0, zero, 77
+// 0x0101e444: 0x101e444: addiu a0, zero, 77
 	ldc.i4.s 77
 	stloc.1
-L_101e438:
-// 0x0101e438: 0x101e438: jal   0x101aec4 sll   zero, zero, 0
+L_101e448:
+// 0x0101e448: 0x101e448: jal   0x101aed4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e440: 0x101e440: j	 0x101e484 lui   v0, 0x30000
+// 0x0101e450: 0x101e450: j	 0x101e494 lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-	br L_101e484
+	br L_101e494
 // --- basic block ---
-L_101e448:
-// 0x0101e448: 0x101e448: lui   v0, 0x30000
+L_101e458:
+// 0x0101e458: 0x101e458: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_101e44c:
-// 0x0101e44c: 0x101e44c: addiu a0, zero, 68
+L_101e45c:
+// 0x0101e45c: 0x101e45c: addiu a0, zero, 68
 	ldc.i4.s 68
 	stloc.1
-// 0x0101e450: 0x101e450: jal   0x101ae54 sw    zero, 28188(v0)
+// 0x0101e460: 0x101e460: jal   0x101ae64 sw    zero, 28652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7047
+	ldc.i4 7163
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2369,12 +2369,12 @@ L_101e44c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e458: 0x101e458: jal   0x101ae54 addiu a0, zero, 83
+// 0x0101e468: 0x101e468: jal   0x101ae64 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -2382,12 +2382,12 @@ L_101e44c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e460: 0x101e460: jal   0x101ae54 addiu a0, zero, 84
+// 0x0101e470: 0x101e470: jal   0x101ae64 addiu a0, zero, 84
 	ldc.i4.s 84
 	stloc.1
 	ldloc.0
@@ -2395,12 +2395,12 @@ L_101e44c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e468: 0x101e468: jal   0x101ae54 addiu a0, zero, 87
+// 0x0101e478: 0x101e478: jal   0x101ae64 addiu a0, zero, 87
 	ldc.i4.s 87
 	stloc.1
 	ldloc.0
@@ -2408,12 +2408,12 @@ L_101e44c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e470: 0x101e470: jal   0x101ae54 addiu a0, zero, 77
+// 0x0101e480: 0x101e480: jal   0x101ae64 addiu a0, zero, 77
 	ldc.i4.s 77
 	stloc.1
 	ldloc.0
@@ -2421,12 +2421,12 @@ L_101e44c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e478: 0x101e478: jal   0x101ae54 addiu a0, zero, 69
+// 0x0101e488: 0x101e488: jal   0x101ae64 addiu a0, zero, 69
 	ldc.i4.s 69
 	stloc.1
 	ldloc.0
@@ -2434,26 +2434,26 @@ L_101e44c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e480: 0x101e480: lui   v0, 0x30000
+// 0x0101e490: 0x101e490: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_101e484:
-// 0x0101e484: 0x101e484: lw    v0, 28204(v0)
+L_101e494:
+// 0x0101e494: 0x101e494: lw    v0, 28668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7051
+	ldc.i4 7167
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101e488: 0x101e488: sll   zero, zero, 0
-// 0x0101e48c: 0x101e48c: jalr  v0 sll   zero, zero, 0
+// 0x0101e498: 0x101e498: sll   zero, zero, 0
+// 0x0101e49c: 0x101e49c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2465,8 +2465,8 @@ L_101e484:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101e494: 0x101e494: lw    ra, 60(sp)
-// 0x0101e498: 0x101e498: lw    s4, 56(sp)
+// 0x0101e4a4: 0x101e4a4: lw    ra, 60(sp)
+// 0x0101e4a8: 0x101e4a8: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2475,7 +2475,7 @@ L_101e484:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101e49c: 0x101e49c: lw    s3, 52(sp)
+// 0x0101e4ac: 0x101e4ac: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2484,7 +2484,7 @@ L_101e484:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101e4a0: 0x101e4a0: lw    s2, 48(sp)
+// 0x0101e4b0: 0x101e4b0: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2493,7 +2493,7 @@ L_101e484:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101e4a4: 0x101e4a4: lw    s1, 44(sp)
+// 0x0101e4b4: 0x101e4b4: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2502,7 +2502,7 @@ L_101e484:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101e4a8: 0x101e4a8: lw    s0, 40(sp)
+// 0x0101e4b8: 0x101e4b8: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2511,7 +2511,7 @@ L_101e484:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101e4ac: 0x101e4ac: jr    ra addiu sp, sp, 64
+// 0x0101e4bc: 0x101e4bc: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2523,7 +2523,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_new_101e4b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_new_101e4c4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -2585,15 +2585,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101e4b4: 0x101e4b4: addiu sp, sp, -72
+// 0x0101e4c4: 0x101e4c4: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0101e4b8: 0x101e4b8: lui   v0, 0x30000
+// 0x0101e4c8: 0x101e4c8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101e4bc: 0x101e4bc: sw    s2, 40(sp)
+// 0x0101e4cc: 0x101e4cc: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2602,7 +2602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101e4c0: 0x101e4c0: sw    s1, 36(sp)
+// 0x0101e4d0: 0x101e4d0: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2611,13 +2611,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101e4c4: 0x101e4c4: lui   s2, 0x30000
+// 0x0101e4d4: 0x101e4d4: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 10
-// 0x0101e4c8: 0x101e4c8: lui   s1, 0xe0000
+// 0x0101e4d8: 0x101e4d8: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x0101e4cc: 0x101e4cc: sw    s8, 64(sp)
+// 0x0101e4dc: 0x101e4dc: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2626,7 +2626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101e4d0: 0x101e4d0: sw    s7, 60(sp)
+// 0x0101e4e0: 0x101e4e0: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2635,7 +2635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101e4d4: 0x101e4d4: sw    s6, 56(sp)
+// 0x0101e4e4: 0x101e4e4: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2644,7 +2644,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101e4d8: 0x101e4d8: sw    s5, 52(sp)
+// 0x0101e4e8: 0x101e4e8: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2653,7 +2653,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101e4dc: 0x101e4dc: sw    s4, 48(sp)
+// 0x0101e4ec: 0x101e4ec: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2662,7 +2662,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101e4e0: 0x101e4e0: sw    s3, 44(sp)
+// 0x0101e4f0: 0x101e4f0: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2671,7 +2671,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101e4e4: 0x101e4e4: sw    s0, 32(sp)
+// 0x0101e4f4: 0x101e4f4: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2680,79 +2680,79 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101e4e8: 0x101e4e8: sw    ra, 68(sp)
-// 0x0101e4ec: 0x101e4ec: addiu a1, v0, 28208
+// 0x0101e4f8: 0x101e4f8: sw    ra, 68(sp)
+// 0x0101e4fc: 0x101e4fc: addiu a1, v0, 28672
 	ldloc 6
-	ldc.i4 28208
+	ldc.i4 28672
 	add
 	stloc.2
-// 0x0101e4f0: 0x101e4f0: addiu s1, s1, 29604
+// 0x0101e500: 0x101e500: addiu s1, s1, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x0101e4f4: 0x101e4f4: lw    s0, 28208(v0)
+// 0x0101e504: 0x101e504: lw    s0, 28672(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7052
+	ldc.i4 7168
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e4f8: 0x101e4f8: lui   s4, 0x30000
+// 0x0101e508: 0x101e508: lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 12
-// 0x0101e4fc: 0x101e4fc: lui   v1, 0x30000
+// 0x0101e50c: 0x101e50c: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0101e500: 0x101e500: addiu s3, zero, 1
+// 0x0101e510: 0x101e510: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x0101e504: 0x101e504: lui   s8, 0x0
+// 0x0101e514: 0x101e514: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x0101e508: 0x101e508: addiu s7, s2, 28216
+// 0x0101e518: 0x101e518: addiu s7, s2, 28680
 	ldloc 10
-	ldc.i4 28216
+	ldc.i4 28680
 	add
 	stloc 15
-// 0x0101e50c: 0x101e50c: lui   s6, 0x30000
+// 0x0101e51c: 0x101e51c: lui   s6, 0x30000
 	ldc.i4 196608
 	stloc 14
-// 0x0101e510: 0x101e510: j	 0x101e600 lui   s5, 0x30000
+// 0x0101e520: 0x101e520: j	 0x101e610 lui   s5, 0x30000
 	ldc.i4 196608
 	stloc 13
-	br L_101e600
+	br L_101e610
 // --- basic block ---
-L_101e518:
-// 0x0101e518: 0x101e518: lb    v0, 20(s0)
+L_101e528:
+// 0x0101e528: 0x101e528: lb    v0, 20(s0)
 	ldloc 7
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101e51c: 0x101e51c: sll   zero, zero, 0
-// 0x0101e520: 0x101e520: bne   v0, zero, 0x101e5f8 sll   zero, zero, 0
+// 0x0101e52c: 0x101e52c: sll   zero, zero, 0
+// 0x0101e530: 0x101e530: bne   v0, zero, 0x101e608 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101e5f8
+	brtrue L_101e608
 // --- basic block ---
-// 0x0101e528: 0x101e528: lw    v0, 28180(s4)
+// 0x0101e538: 0x101e538: lw    v0, 28644(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e52c: 0x101e52c: sll   zero, zero, 0
-// 0x0101e530: 0x101e530: bne   v0, s0, 0x101e554 sll   zero, zero, 0
+// 0x0101e53c: 0x101e53c: sll   zero, zero, 0
+// 0x0101e540: 0x101e540: bne   v0, s0, 0x101e564 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_101e554
+	bne.un L_101e564
 // --- basic block ---
-// 0x0101e538: 0x101e538: lw    v0, 24(s0)
+// 0x0101e548: 0x101e548: lw    v0, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2761,25 +2761,25 @@ L_101e518:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e53c: 0x101e53c: sw    zero, 28180(s4)
+// 0x0101e54c: 0x101e54c: sw    zero, 28644(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101e540: 0x101e540: sw    v0, 28216(s2)
+// 0x0101e550: 0x101e550: sw    v0, 28680(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 7054
+	ldc.i4 7170
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101e544: 0x101e544: lw    v0, 28(s0)
+// 0x0101e554: 0x101e554: lw    v0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2788,16 +2788,16 @@ L_101e518:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e548: 0x101e548: sw    zero, 28192(s6)
+// 0x0101e558: 0x101e558: sw    zero, 28656(s6)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7048
+	ldc.i4 7164
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101e54c: 0x101e54c: sw    v0, 4(s7)
+// 0x0101e55c: 0x101e55c: sw    v0, 4(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -2806,17 +2806,17 @@ L_101e518:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101e550: 0x101e550: sw    zero, 28184(s5)
+// 0x0101e560: 0x101e560: sw    zero, 28648(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101e554:
-// 0x0101e554: 0x101e554: lw    v0, 24(s0)
+L_101e564:
+// 0x0101e564: 0x101e564: lw    v0, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2825,7 +2825,7 @@ L_101e554:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e558: 0x101e558: lw    a0, 56(s1)
+// 0x0101e568: 0x101e568: lw    a0, 56(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2834,19 +2834,19 @@ L_101e554:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e55c: 0x101e55c: sll   zero, zero, 0
-// 0x0101e560: 0x101e560: slt   a0, a0, v0
+// 0x0101e56c: 0x101e56c: sll   zero, zero, 0
+// 0x0101e570: 0x101e570: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0101e564: 0x101e564: bne   a0, zero, 0x101e5b0 addu  a0, s0, zero
+// 0x0101e574: 0x101e574: bne   a0, zero, 0x101e5c0 addu  a0, s0, zero
 	ldloc.1
 	ldloc 7
 	stloc.1
-	brtrue L_101e5b0
+	brtrue L_101e5c0
 // --- basic block ---
-// 0x0101e56c: 0x101e56c: lw    a0, 64(s1)
+// 0x0101e57c: 0x101e57c: lw    a0, 64(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2855,19 +2855,19 @@ L_101e554:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e570: 0x101e570: sll   zero, zero, 0
-// 0x0101e574: 0x101e574: slt   v0, v0, a0
+// 0x0101e580: 0x101e580: sll   zero, zero, 0
+// 0x0101e584: 0x101e584: slt   v0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x0101e578: 0x101e578: bne   v0, zero, 0x101e5b0 addu  a0, s0, zero
+// 0x0101e588: 0x101e588: bne   v0, zero, 0x101e5c0 addu  a0, s0, zero
 	ldloc 6
 	ldloc 7
 	stloc.1
-	brtrue L_101e5b0
+	brtrue L_101e5c0
 // --- basic block ---
-// 0x0101e580: 0x101e580: lw    v0, 28(s0)
+// 0x0101e590: 0x101e590: lw    v0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2876,7 +2876,7 @@ L_101e554:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e584: 0x101e584: lw    a0, 60(s1)
+// 0x0101e594: 0x101e594: lw    a0, 60(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2885,19 +2885,19 @@ L_101e554:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e588: 0x101e588: sll   zero, zero, 0
-// 0x0101e58c: 0x101e58c: slt   a0, a0, v0
+// 0x0101e598: 0x101e598: sll   zero, zero, 0
+// 0x0101e59c: 0x101e59c: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0101e590: 0x101e590: bne   a0, zero, 0x101e5b0 addu  a0, s0, zero
+// 0x0101e5a0: 0x101e5a0: bne   a0, zero, 0x101e5c0 addu  a0, s0, zero
 	ldloc.1
 	ldloc 7
 	stloc.1
-	brtrue L_101e5b0
+	brtrue L_101e5c0
 // --- basic block ---
-// 0x0101e598: 0x101e598: lw    a0, 68(s1)
+// 0x0101e5a8: 0x101e5a8: lw    a0, 68(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2906,22 +2906,22 @@ L_101e554:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e59c: 0x101e59c: sll   zero, zero, 0
-// 0x0101e5a0: 0x101e5a0: slt   v0, v0, a0
+// 0x0101e5ac: 0x101e5ac: sll   zero, zero, 0
+// 0x0101e5b0: 0x101e5b0: slt   v0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x0101e5a4: 0x101e5a4: beq   v0, zero, 0x101e67c sll   zero, zero, 0
+// 0x0101e5b4: 0x101e5b4: beq   v0, zero, 0x101e68c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101e67c
+	brfalse L_101e68c
 // --- basic block ---
-L_101e5ac:
-// 0x0101e5ac: 0x101e5ac: addu  a0, s0, zero
+L_101e5bc:
+// 0x0101e5bc: 0x101e5bc: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-L_101e5b0:
-// 0x0101e5b0: 0x101e5b0: sw    v1, 24(sp)
+L_101e5c0:
+// 0x0101e5c0: 0x101e5c0: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2930,7 +2930,7 @@ L_101e5b0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101e5b4: 0x101e5b4: sw    a1, 20(sp)
+// 0x0101e5c4: 0x101e5c4: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2939,7 +2939,7 @@ L_101e5b0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101e5b8: 0x101e5b8: jal   0x1015bf8 sw    a2, 16(sp)
+// 0x0101e5c8: 0x101e5c8: jal   0x1015c08 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2950,12 +2950,12 @@ L_101e5b0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl16::roadmap_list_remove_1015bf8(int32,int32)
+	call int32 Cibyl16::roadmap_list_remove_1015c08(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101e5c0: 0x101e5c0: lw    a0, 8(s0)
+// 0x0101e5d0: 0x101e5d0: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2964,7 +2964,7 @@ L_101e5b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e5c4: 0x101e5c4: jal   0x1000930 sll   zero, zero, 0
+// 0x0101e5d4: 0x101e5d4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2975,7 +2975,7 @@ L_101e5b0:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101e5cc: 0x101e5cc: lw    a0, 12(s0)
+// 0x0101e5dc: 0x101e5dc: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2984,7 +2984,7 @@ L_101e5b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e5d0: 0x101e5d0: jal   0x1000930 sll   zero, zero, 0
+// 0x0101e5e0: 0x101e5e0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2995,7 +2995,7 @@ L_101e5b0:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101e5d8: 0x101e5d8: jal   0x1000930 addu  a0, s0, zero
+// 0x0101e5e8: 0x101e5e8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3008,7 +3008,7 @@ L_101e5b0:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101e5e0: 0x101e5e0: lw    v1, 24(sp)
+// 0x0101e5f0: 0x101e5f0: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3017,7 +3017,7 @@ L_101e5b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101e5e4: 0x101e5e4: lw    a1, 20(sp)
+// 0x0101e5f4: 0x101e5f4: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3026,16 +3026,16 @@ L_101e5b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e5e8: 0x101e5e8: sw    s3, 28196(v1)
+// 0x0101e5f8: 0x101e5f8: sw    s3, 28660(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7049
+	ldc.i4 7165
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101e5ec: 0x101e5ec: lw    a2, 16(sp)
+// 0x0101e5fc: 0x101e5fc: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3044,61 +3044,61 @@ L_101e5b0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e5f0: 0x101e5f0: j	 0x101e600 addu  s0, a2, zero
+// 0x0101e600: 0x101e600: j	 0x101e610 addu  s0, a2, zero
 	ldloc.3
 	stloc 7
-	br L_101e600
+	br L_101e610
 // --- basic block ---
-L_101e5f8:
-// 0x0101e5f8: 0x101e5f8: sb    zero, 23(s0)
+L_101e608:
+// 0x0101e608: 0x101e608: sb    zero, 23(s0)
 	ldloc 7
 	ldc.i4.s 23
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101e5fc: 0x101e5fc: addu  s0, a2, zero
+// 0x0101e60c: 0x101e60c: addu  s0, a2, zero
 	ldloc.3
 	stloc 7
-L_101e600:
-// 0x0101e600: 0x101e600: lw    a2, 0(s0)
+L_101e610:
+// 0x0101e610: 0x101e610: lw    a2, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0101e604: 0x101e604: bne   s0, a1, 0x101e518 lui   v0, 0x30000
+// 0x0101e614: 0x101e614: bne   s0, a1, 0x101e528 lui   v0, 0x30000
 	ldloc 7
 	ldloc.2
 	ldc.i4 196608
 	stloc 6
-	bne.un L_101e518
+	bne.un L_101e528
 // --- basic block ---
-// 0x0101e60c: 0x101e60c: lw    v0, 28196(v0)
+// 0x0101e61c: 0x101e61c: lw    v0, 28660(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7049
+	ldc.i4 7165
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e610: 0x101e610: sll   zero, zero, 0
-// 0x0101e614: 0x101e614: beq   v0, zero, 0x101e630 lui   a0, 0x0
+// 0x0101e620: 0x101e620: sll   zero, zero, 0
+// 0x0101e624: 0x101e624: beq   v0, zero, 0x101e640 lui   a0, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_101e630
+	brfalse L_101e640
 // --- basic block ---
-// 0x0101e61c: 0x101e61c: lui   a1, 0x0
+// 0x0101e62c: 0x101e62c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101e620: 0x101e620: addiu a0, a0, 5948
+// 0x0101e630: 0x101e630: addiu a0, a0, 5948
 	ldloc.1
 	ldc.i4 5948
 	add
 	stloc.1
-// 0x0101e624: 0x101e624: jal   0x100e5c0 addiu a1, a1, 28132
+// 0x0101e634: 0x101e634: jal   0x100e5d0 addiu a1, a1, 28132
 	ldloc.2
 	ldc.i4 28132
 	add
@@ -3108,24 +3108,24 @@ L_101e600:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101e62c: 0x101e62c: lui   a0, 0x0
+// 0x0101e63c: 0x101e63c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_101e630:
-// 0x0101e630: 0x101e630: lui   a1, 0x0
+L_101e640:
+// 0x0101e640: 0x101e640: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101e634: 0x101e634: addiu a0, a0, 5948
+// 0x0101e644: 0x101e644: addiu a0, a0, 5948
 	ldloc.1
 	ldc.i4 5948
 	add
 	stloc.1
-// 0x0101e638: 0x101e638: jal   0x100e5c0 addiu a1, a1, 28132
+// 0x0101e648: 0x101e648: jal   0x100e5d0 addiu a1, a1, 28132
 	ldloc.2
 	ldc.i4 28132
 	add
@@ -3135,19 +3135,19 @@ L_101e630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101e640: 0x101e640: lw    ra, 68(sp)
-// 0x0101e644: 0x101e644: addiu v1, zero, 1
+// 0x0101e650: 0x101e650: lw    ra, 68(sp)
+// 0x0101e654: 0x101e654: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0101e648: 0x101e648: lui   v0, 0x30000
+// 0x0101e658: 0x101e658: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101e64c: 0x101e64c: lw    s8, 64(sp)
+// 0x0101e65c: 0x101e65c: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3156,7 +3156,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101e650: 0x101e650: lw    s7, 60(sp)
+// 0x0101e660: 0x101e660: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3165,7 +3165,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101e654: 0x101e654: lw    s6, 56(sp)
+// 0x0101e664: 0x101e664: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3174,7 +3174,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101e658: 0x101e658: lw    s5, 52(sp)
+// 0x0101e668: 0x101e668: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3183,7 +3183,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101e65c: 0x101e65c: lw    s4, 48(sp)
+// 0x0101e66c: 0x101e66c: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3192,7 +3192,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101e660: 0x101e660: lw    s3, 44(sp)
+// 0x0101e670: 0x101e670: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3201,7 +3201,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101e664: 0x101e664: lw    s2, 40(sp)
+// 0x0101e674: 0x101e674: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3210,7 +3210,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101e668: 0x101e668: lw    s1, 36(sp)
+// 0x0101e678: 0x101e678: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3219,7 +3219,7 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101e66c: 0x101e66c: lw    s0, 32(sp)
+// 0x0101e67c: 0x101e67c: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3228,24 +3228,24 @@ L_101e630:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e670: 0x101e670: sw    v1, 28196(v0)
+// 0x0101e680: 0x101e680: sw    v1, 28660(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7049
+	ldc.i4 7165
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101e674: 0x101e674: jr    ra addiu sp, sp, 72
+// 0x0101e684: 0x101e684: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_101e67c:
-// 0x0101e67c: 0x101e67c: j	 0x101e5ac sw    s3, 6028(s8)
+L_101e68c:
+// 0x0101e68c: 0x101e68c: j	 0x101e5bc sw    s3, 6028(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -3254,14 +3254,14 @@ L_101e67c:
 	add
 	ldloc 11
 	stelem.i4
-	br L_101e5ac
+	br L_101e5bc
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_current_101e684(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_current_101e694(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3296,16 +3296,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101e684: 0x101e684: lui   a0, 0x0
+// 0x0101e694: 0x101e694: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101e688: 0x101e688: addiu sp, sp, -24
+// 0x0101e698: 0x101e698: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101e68c: 0x101e68c: sw    ra, 20(sp)
-// 0x0101e690: 0x101e690: jal   0x100e348 addiu a0, a0, 5948
+// 0x0101e69c: 0x101e69c: sw    ra, 20(sp)
+// 0x0101e6a0: 0x101e6a0: jal   0x100e358 addiu a0, a0, 5948
 	ldloc.1
 	ldc.i4 5948
 	add
@@ -3315,14 +3315,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0101e698: 0x101e698: lw    ra, 20(sp)
-// 0x0101e69c: 0x101e69c: sll   zero, zero, 0
-// 0x0101e6a0: 0x101e6a0: jr    ra addiu sp, sp, 24
+// 0x0101e6a8: 0x101e6a8: lw    ra, 20(sp)
+// 0x0101e6ac: 0x101e6ac: sll   zero, zero, 0
+// 0x0101e6b0: 0x101e6b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3334,7 +3334,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_trip_display_101e6a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_display_101e6b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 lo,int32 s0,int32 s2,int32 s5,int32 s1,int32 s7,int32 s3,int32 s4,int32 s8,int32 s6,int32 ra)
@@ -3399,27 +3399,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101e6a8: 0x101e6a8: lui   v0, 0x30000
+// 0x0101e6b8: 0x101e6b8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101e6ac: 0x101e6ac: lw    v0, 28180(v0)
+// 0x0101e6bc: 0x101e6bc: lw    v0, 28644(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e6b0: 0x101e6b0: addiu sp, sp, -96
+// 0x0101e6c0: 0x101e6c0: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0101e6b4: 0x101e6b4: lui   v1, 0x30000
+// 0x0101e6c4: 0x101e6c4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101e6b8: 0x101e6b8: sw    s4, 72(sp)
+// 0x0101e6c8: 0x101e6c8: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3428,7 +3428,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101e6bc: 0x101e6bc: sw    s2, 64(sp)
+// 0x0101e6cc: 0x101e6cc: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3437,8 +3437,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101e6c0: 0x101e6c0: sw    ra, 92(sp)
-// 0x0101e6c4: 0x101e6c4: sw    s8, 88(sp)
+// 0x0101e6d0: 0x101e6d0: sw    ra, 92(sp)
+// 0x0101e6d4: 0x101e6d4: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3447,7 +3447,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101e6c8: 0x101e6c8: sw    s7, 84(sp)
+// 0x0101e6d8: 0x101e6d8: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3456,7 +3456,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101e6cc: 0x101e6cc: sw    s6, 80(sp)
+// 0x0101e6dc: 0x101e6dc: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3465,7 +3465,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0101e6d0: 0x101e6d0: sw    s5, 76(sp)
+// 0x0101e6e0: 0x101e6e0: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3474,7 +3474,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101e6d4: 0x101e6d4: sw    s3, 68(sp)
+// 0x0101e6e4: 0x101e6e4: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3483,7 +3483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101e6d8: 0x101e6d8: sw    s1, 60(sp)
+// 0x0101e6e8: 0x101e6e8: sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3492,7 +3492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101e6dc: 0x101e6dc: sw    s0, 56(sp)
+// 0x0101e6ec: 0x101e6ec: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3501,22 +3501,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101e6e0: 0x101e6e0: lw    s4, 28176(v1)
+// 0x0101e6f0: 0x101e6f0: lw    s4, 28640(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101e6e4: 0x101e6e4: beq   v0, zero, 0x101e6f0 addu  s2, zero, zero
+// 0x0101e6f4: 0x101e6f4: beq   v0, zero, 0x101e700 addu  s2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_101e6f0
+	brfalse L_101e700
 // --- basic block ---
-// 0x0101e6ec: 0x101e6ec: lw    s2, 8(v0)
+// 0x0101e6fc: 0x101e6fc: lw    s2, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3525,52 +3525,52 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-L_101e6f0:
-// 0x0101e6f0: 0x101e6f0: lui   v0, 0x30000
+L_101e700:
+// 0x0101e700: 0x101e700: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101e6f4: 0x101e6f4: lw    v0, 28208(v0)
+// 0x0101e704: 0x101e704: lw    v0, 28672(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7052
+	ldc.i4 7168
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e6f8: 0x101e6f8: lui   s0, 0xe0000
+// 0x0101e708: 0x101e708: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x0101e6fc: 0x101e6fc: lui   s5, 0x20000
+// 0x0101e70c: 0x101e70c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x0101e700: 0x101e700: lui   s7, 0x10000
+// 0x0101e710: 0x101e710: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x0101e704: 0x101e704: lui   s8, 0x0
+// 0x0101e714: 0x101e714: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x0101e708: 0x101e708: addiu s0, s0, 29604
+// 0x0101e718: 0x101e718: addiu s0, s0, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x0101e70c: 0x101e70c: addiu s5, s5, 6792
+// 0x0101e71c: 0x101e71c: addiu s5, s5, 7256
 	ldloc 11
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc 11
-// 0x0101e710: 0x101e710: addiu s7, s7, -31052
+// 0x0101e720: 0x101e720: addiu s7, s7, -31052
 	ldloc 13
 	ldc.i4 -31052
 	add
 	stloc 13
-// 0x0101e714: 0x101e714: addiu s8, s8, 6012
+// 0x0101e724: 0x101e724: addiu s8, s8, 6012
 	ldloc 16
 	ldc.i4 6012
 	add
 	stloc 16
-// 0x0101e718: 0x101e718: sw    v0, 32(sp)
+// 0x0101e728: 0x101e728: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3579,23 +3579,23 @@ L_101e6f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101e71c: 0x101e71c: addiu s3, sp, 16
+// 0x0101e72c: 0x101e72c: addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 14
-// 0x0101e720: 0x101e720: addiu s1, zero, 2
+// 0x0101e730: 0x101e730: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 12
-// 0x0101e724: 0x101e724: j	 0x101ea80 addiu s6, sp, 24
+// 0x0101e734: 0x101e734: j	 0x101ea90 addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 17
-	br L_101ea80
+	br L_101ea90
 // --- basic block ---
-L_101e72c:
-// 0x0101e72c: 0x101e72c: lw    v1, 32(sp)
+L_101e73c:
+// 0x0101e73c: 0x101e73c: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3604,8 +3604,8 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e730: 0x101e730: sll   zero, zero, 0
-// 0x0101e734: 0x101e734: lw    v0, 12(v1)
+// 0x0101e740: 0x101e740: sll   zero, zero, 0
+// 0x0101e744: 0x101e744: lw    v0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3614,23 +3614,23 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e738: 0x101e738: sll   zero, zero, 0
-// 0x0101e73c: 0x101e73c: beq   v0, zero, 0x101ea74 sll   zero, zero, 0
+// 0x0101e748: 0x101e748: sll   zero, zero, 0
+// 0x0101e74c: 0x101e74c: beq   v0, zero, 0x101ea84 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101ea74
+	brfalse L_101ea84
 // --- basic block ---
-// 0x0101e744: 0x101e744: lb    v0, 23(v1)
+// 0x0101e754: 0x101e754: lb    v0, 23(v1)
 	ldloc 7
 	ldc.i4.s 23
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101e748: 0x101e748: sll   zero, zero, 0
-// 0x0101e74c: 0x101e74c: beq   v0, zero, 0x101ea74 sll   zero, zero, 0
+// 0x0101e758: 0x101e758: sll   zero, zero, 0
+// 0x0101e75c: 0x101e75c: beq   v0, zero, 0x101ea84 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101ea74
+	brfalse L_101ea84
 // --- basic block ---
-// 0x0101e754: 0x101e754: lw    a0, 24(v1)
+// 0x0101e764: 0x101e764: lw    a0, 24(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3639,7 +3639,7 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e758: 0x101e758: lw    v0, 56(s0)
+// 0x0101e768: 0x101e768: lw    v0, 56(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3648,17 +3648,17 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e75c: 0x101e75c: sll   zero, zero, 0
-// 0x0101e760: 0x101e760: slt   v0, v0, a0
+// 0x0101e76c: 0x101e76c: sll   zero, zero, 0
+// 0x0101e770: 0x101e770: slt   v0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x0101e764: 0x101e764: bne   v0, zero, 0x101ea74 sll   zero, zero, 0
+// 0x0101e774: 0x101e774: bne   v0, zero, 0x101ea84 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101ea74
+	brtrue L_101ea84
 // --- basic block ---
-// 0x0101e76c: 0x101e76c: lw    v0, 64(s0)
+// 0x0101e77c: 0x101e77c: lw    v0, 64(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3667,17 +3667,17 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e770: 0x101e770: sll   zero, zero, 0
-// 0x0101e774: 0x101e774: slt   v0, a0, v0
+// 0x0101e780: 0x101e780: sll   zero, zero, 0
+// 0x0101e784: 0x101e784: slt   v0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x0101e778: 0x101e778: bne   v0, zero, 0x101ea74 sll   zero, zero, 0
+// 0x0101e788: 0x101e788: bne   v0, zero, 0x101ea84 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101ea74
+	brtrue L_101ea84
 // --- basic block ---
-// 0x0101e780: 0x101e780: lw    v1, 28(v1)
+// 0x0101e790: 0x101e790: lw    v1, 28(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3686,7 +3686,7 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e784: 0x101e784: lw    v0, 60(s0)
+// 0x0101e794: 0x101e794: lw    v0, 60(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3695,17 +3695,17 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e788: 0x101e788: sll   zero, zero, 0
-// 0x0101e78c: 0x101e78c: slt   v0, v0, v1
+// 0x0101e798: 0x101e798: sll   zero, zero, 0
+// 0x0101e79c: 0x101e79c: slt   v0, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x0101e790: 0x101e790: bne   v0, zero, 0x101ea74 sll   zero, zero, 0
+// 0x0101e7a0: 0x101e7a0: bne   v0, zero, 0x101ea84 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101ea74
+	brtrue L_101ea84
 // --- basic block ---
-// 0x0101e798: 0x101e798: lw    v0, 68(s0)
+// 0x0101e7a8: 0x101e7a8: lw    v0, 68(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3714,21 +3714,21 @@ L_101e72c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e79c: 0x101e79c: sll   zero, zero, 0
-// 0x0101e7a0: 0x101e7a0: slt   v0, v1, v0
+// 0x0101e7ac: 0x101e7ac: sll   zero, zero, 0
+// 0x0101e7b0: 0x101e7b0: slt   v0, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x0101e7a4: 0x101e7a4: bne   v0, zero, 0x101ea74 sll   zero, zero, 0
+// 0x0101e7b4: 0x101e7b4: bne   v0, zero, 0x101ea84 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101ea74
+	brtrue L_101ea84
 // --- basic block ---
-// 0x0101e7ac: 0x101e7ac: j	 0x101eb30 sll   zero, zero, 0
-	br L_101eb30
+// 0x0101e7bc: 0x101e7bc: j	 0x101eb40 sll   zero, zero, 0
+	br L_101eb40
 // --- basic block ---
-L_101e7b4:
-// 0x0101e7b4: 0x101e7b4: lw    a2, 32(sp)
+L_101e7c4:
+// 0x0101e7c4: 0x101e7c4: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3737,8 +3737,8 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e7b8: 0x101e7b8: sll   zero, zero, 0
-// 0x0101e7bc: 0x101e7bc: lw    a0, 12(a2)
+// 0x0101e7c8: 0x101e7c8: sll   zero, zero, 0
+// 0x0101e7cc: 0x101e7cc: lw    a0, 12(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3747,7 +3747,7 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e7c0: 0x101e7c0: jal   0x1001b14 addu  a1, s7, zero
+// 0x0101e7d0: 0x101e7d0: jal   0x1001b14 addu  a1, s7, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
@@ -3755,13 +3755,13 @@ L_101e7b4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101e7c8: 0x101e7c8: bne   v0, zero, 0x101e944 addu  a0, s2, zero
+// 0x0101e7d8: 0x101e7d8: bne   v0, zero, 0x101e954 addu  a0, s2, zero
 	ldloc 6
 	ldloc 10
 	stloc.1
-	brtrue L_101e944
+	brtrue L_101e954
 // --- basic block ---
-// 0x0101e7d0: 0x101e7d0: jal   0x1001b14 addu  a1, s7, zero
+// 0x0101e7e0: 0x101e7e0: jal   0x1001b14 addu  a1, s7, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
@@ -3769,23 +3769,23 @@ L_101e7b4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101e7d8: 0x101e7d8: bne   v0, zero, 0x101e944 sll   zero, zero, 0
+// 0x0101e7e8: 0x101e7e8: bne   v0, zero, 0x101e954 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101e944
+	brtrue L_101e954
 // --- basic block ---
-// 0x0101e7e0: 0x101e7e0: jal   0x101f8bc sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_orientation_mode_101f8bc()
+// 0x0101e7f0: 0x101e7f0: jal   0x101f8cc sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_orientation_mode_101f8cc()
 	stloc 6
 // --- basic block ---
-// 0x0101e7e8: 0x101e7e8: addiu v1, zero, 1
+// 0x0101e7f8: 0x101e7f8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0101e7ec: 0x101e7ec: beq   v0, v1, 0x101e944 sll   zero, zero, 0
+// 0x0101e7fc: 0x101e7fc: beq   v0, v1, 0x101e954 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	beq  L_101e944
+	beq  L_101e954
 // --- basic block ---
-// 0x0101e7f4: 0x101e7f4: lw    v0, 32(sp)
+// 0x0101e804: 0x101e804: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3794,7 +3794,7 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e7f8: 0x101e7f8: lw    v1, 32(s0)
+// 0x0101e808: 0x101e808: lw    v1, 32(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3803,7 +3803,7 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e7fc: 0x101e7fc: lw    a0, 32(v0)
+// 0x0101e80c: 0x101e80c: lw    a0, 32(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3812,7 +3812,7 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e800: 0x101e800: lw    v0, 80(s0)
+// 0x0101e810: 0x101e810: lw    v0, 80(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3821,7 +3821,7 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e804: 0x101e804: lw    a1, 76(s0)
+// 0x0101e814: 0x101e814: lw    a1, 76(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3830,17 +3830,17 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e808: 0x101e808: subu  v0, a0, v0
+// 0x0101e818: 0x101e818: subu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc 6
-// 0x0101e80c: 0x101e80c: div   v0, v1
+// 0x0101e81c: 0x101e81c: div   v0, v1
 	ldloc 6
 	ldloc 7
 	div
 	stloc 8
-// 0x0101e810: 0x101e810: lw    v1, 36(s0)
+// 0x0101e820: 0x101e820: lw    v1, 36(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3849,13 +3849,13 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e814: 0x101e814: addu  a0, s6, zero
+// 0x0101e824: 0x101e824: addu  a0, s6, zero
 	ldloc 17
 	stloc.1
-// 0x0101e818: 0x101e818: mflo  lo
+// 0x0101e828: 0x101e828: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x0101e81c: 0x101e81c: sw    a2, 24(sp)
+// 0x0101e82c: 0x101e82c: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3864,7 +3864,7 @@ L_101e7b4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101e820: 0x101e820: lw    a2, 32(sp)
+// 0x0101e830: 0x101e830: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3873,8 +3873,8 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e824: 0x101e824: sll   zero, zero, 0
-// 0x0101e828: 0x101e828: lw    v0, 36(a2)
+// 0x0101e834: 0x101e834: sll   zero, zero, 0
+// 0x0101e838: 0x101e838: lw    v0, 36(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -3883,21 +3883,21 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e82c: 0x101e82c: sll   zero, zero, 0
-// 0x0101e830: 0x101e830: subu  v0, a1, v0
+// 0x0101e83c: 0x101e83c: sll   zero, zero, 0
+// 0x0101e840: 0x101e840: subu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	sub
 	stloc 6
-// 0x0101e834: 0x101e834: div   v0, v1
+// 0x0101e844: 0x101e844: div   v0, v1
 	ldloc 6
 	ldloc 7
 	div
 	stloc 8
-// 0x0101e838: 0x101e838: mflo  lo
+// 0x0101e848: 0x101e848: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0101e83c: 0x101e83c: jal   0x10073c4 sw    v1, 28(sp)
+// 0x0101e84c: 0x101e84c: jal   0x10073d4 sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3911,12 +3911,12 @@ L_101e7b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e844: 0x101e844: jal   0x100e348 addu  a0, s8, zero
+// 0x0101e854: 0x101e854: jal   0x100e358 addu  a0, s8, zero
 	ldloc 16
 	stloc.1
 	ldloc.0
@@ -3924,24 +3924,24 @@ L_101e7b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e84c: 0x101e84c: addu  a1, v0, zero
+// 0x0101e85c: 0x101e85c: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x0101e850: 0x101e850: lb    v0, 0(v0)
+// 0x0101e860: 0x101e860: lb    v0, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101e854: 0x101e854: sll   zero, zero, 0
-// 0x0101e858: 0x101e858: beq   v0, zero, 0x101e92c sll   zero, zero, 0
+// 0x0101e864: 0x101e864: sll   zero, zero, 0
+// 0x0101e868: 0x101e868: beq   v0, zero, 0x101e93c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101e92c
+	brfalse L_101e93c
 // --- basic block ---
-// 0x0101e860: 0x101e860: jal   0x10bd708 sw    a1, 48(sp)
+// 0x0101e870: 0x101e870: jal   0x10bdd50 sw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3955,12 +3955,12 @@ L_101e7b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_overide_car_10bd708(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_overide_car_10bdd50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e868: 0x101e868: lw    a1, 48(sp)
+// 0x0101e878: 0x101e878: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3969,13 +3969,13 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e86c: 0x101e86c: bne   v0, zero, 0x101e8ac addu  a2, v0, zero
+// 0x0101e87c: 0x101e87c: bne   v0, zero, 0x101e8bc addu  a2, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.3
-	brtrue L_101e8ac
+	brtrue L_101e8bc
 // --- basic block ---
-// 0x0101e874: 0x101e874: jal   0x104cb30 addu  a0, zero, zero
+// 0x0101e884: 0x101e884: jal   0x104cb40 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3983,21 +3983,21 @@ L_101e7b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e87c: 0x101e87c: addu  a2, v0, zero
+// 0x0101e88c: 0x101e88c: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0101e880: 0x101e880: addiu a1, zero, 1
+// 0x0101e890: 0x101e890: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0101e884: 0x101e884: addu  a0, zero, zero
+// 0x0101e894: 0x101e894: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0101e888: 0x101e888: jal   0x10a1918 sw    v0, 44(sp)
+// 0x0101e898: 0x101e898: jal   0x10a1f60 sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4011,12 +4011,12 @@ L_101e7b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e890: 0x101e890: lw    v1, 44(sp)
+// 0x0101e8a0: 0x101e8a0: lw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4025,7 +4025,7 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e894: 0x101e894: sw    v0, 48(sp)
+// 0x0101e8a4: 0x101e8a4: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4034,7 +4034,7 @@ L_101e7b4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101e898: 0x101e898: jal   0x104c670 addu  a0, v1, zero
+// 0x0101e8a8: 0x101e8a8: jal   0x104c680 addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4042,12 +4042,12 @@ L_101e7b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e8a0: 0x101e8a0: lw    a1, 48(sp)
+// 0x0101e8b0: 0x101e8b0: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4056,14 +4056,14 @@ L_101e7b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e8a4: 0x101e8a4: j	 0x101e8bc sll   zero, zero, 0
-	br L_101e8bc
+// 0x0101e8b4: 0x101e8b4: j	 0x101e8cc sll   zero, zero, 0
+	br L_101e8cc
 // --- basic block ---
-L_101e8ac:
-// 0x0101e8ac: 0x101e8ac: addiu a1, zero, 1
+L_101e8bc:
+// 0x0101e8bc: 0x101e8bc: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0101e8b0: 0x101e8b0: jal   0x10a1918 addu  a0, zero, zero
+// 0x0101e8c0: 0x101e8c0: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4071,20 +4071,20 @@ L_101e8ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e8b8: 0x101e8b8: addu  a1, v0, zero
+// 0x0101e8c8: 0x101e8c8: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-L_101e8bc:
-// 0x0101e8bc: 0x101e8bc: beq   a1, zero, 0x101ea28 sll   zero, zero, 0
+L_101e8cc:
+// 0x0101e8cc: 0x101e8cc: beq   a1, zero, 0x101ea38 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_101ea28
+	brfalse L_101ea38
 // --- basic block ---
-// 0x0101e8c4: 0x101e8c4: lw    a2, 24(sp)
+// 0x0101e8d4: 0x101e8d4: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4093,10 +4093,10 @@ L_101e8bc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e8c8: 0x101e8c8: addu  a0, a1, zero
+// 0x0101e8d8: 0x101e8d8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0101e8cc: 0x101e8cc: sw    a1, 48(sp)
+// 0x0101e8dc: 0x101e8dc: sw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4105,7 +4105,7 @@ L_101e8bc:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101e8d0: 0x101e8d0: jal   0x104dffc sw    a2, 44(sp)
+// 0x0101e8e0: 0x101e8e0: jal   0x104e00c sw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4115,17 +4115,17 @@ L_101e8bc:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e8d8: 0x101e8d8: div   v0, s1
+// 0x0101e8e8: 0x101e8e8: div   v0, s1
 	ldloc 6
 	ldloc 12
 	div
 	stloc 8
-// 0x0101e8dc: 0x101e8dc: lw    a1, 48(sp)
+// 0x0101e8ec: 0x101e8ec: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4134,7 +4134,7 @@ L_101e8bc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e8e0: 0x101e8e0: lw    a2, 44(sp)
+// 0x0101e8f0: 0x101e8f0: lw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4143,7 +4143,7 @@ L_101e8bc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e8e4: 0x101e8e4: lw    v1, 28(sp)
+// 0x0101e8f4: 0x101e8f4: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4152,10 +4152,10 @@ L_101e8bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e8e8: 0x101e8e8: addu  a0, a1, zero
+// 0x0101e8f8: 0x101e8f8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0101e8ec: 0x101e8ec: sw    v1, 44(sp)
+// 0x0101e8fc: 0x101e8fc: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4164,15 +4164,15 @@ L_101e8bc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101e8f0: 0x101e8f0: mflo  lo
+// 0x0101e900: 0x101e900: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x0101e8f4: 0x101e8f4: subu  a2, a2, v0
+// 0x0101e904: 0x101e904: subu  a2, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-// 0x0101e8f8: 0x101e8f8: jal   0x104e020 sw    a2, 24(sp)
+// 0x0101e908: 0x101e908: jal   0x104e030 sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4182,17 +4182,17 @@ L_101e8bc:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e900: 0x101e900: div   v0, s1
+// 0x0101e910: 0x101e910: div   v0, s1
 	ldloc 6
 	ldloc 12
 	div
 	stloc 8
-// 0x0101e904: 0x101e904: lw    v1, 44(sp)
+// 0x0101e914: 0x101e914: lw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4201,7 +4201,7 @@ L_101e8bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e908: 0x101e908: lw    a1, 48(sp)
+// 0x0101e918: 0x101e918: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4210,27 +4210,27 @@ L_101e8bc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e90c: 0x101e90c: addu  a2, zero, zero
+// 0x0101e91c: 0x101e91c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101e910: 0x101e910: addu  a0, a1, zero
+// 0x0101e920: 0x101e920: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0101e914: 0x101e914: addu  a3, zero, zero
+// 0x0101e924: 0x101e924: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101e918: 0x101e918: addu  a1, s6, zero
+// 0x0101e928: 0x101e928: addu  a1, s6, zero
 	ldloc 17
 	stloc.2
-// 0x0101e91c: 0x101e91c: mflo  lo
+// 0x0101e92c: 0x101e92c: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x0101e920: 0x101e920: subu  v1, v1, v0
+// 0x0101e930: 0x101e930: subu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 7
-// 0x0101e924: 0x101e924: j	 0x101ea18 sw    v1, 28(sp)
+// 0x0101e934: 0x101e934: j	 0x101ea28 sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4239,10 +4239,10 @@ L_101e8bc:
 	add
 	ldloc 7
 	stelem.i4
-	br L_101ea18
+	br L_101ea28
 // --- basic block ---
-L_101e92c:
-// 0x0101e92c: 0x101e92c: lw    v0, 32(sp)
+L_101e93c:
+// 0x0101e93c: 0x101e93c: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4251,8 +4251,8 @@ L_101e92c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101e930: 0x101e930: sll   zero, zero, 0
-// 0x0101e934: 0x101e934: lw    a2, 48(v0)
+// 0x0101e940: 0x101e940: sll   zero, zero, 0
+// 0x0101e944: 0x101e944: lw    a2, 48(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4261,7 +4261,7 @@ L_101e92c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e938: 0x101e938: lw    a0, 12(v0)
+// 0x0101e948: 0x101e948: lw    a0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4270,11 +4270,11 @@ L_101e92c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101e93c: 0x101e93c: j	 0x101ea6c sll   zero, zero, 0
-	br L_101ea6c
+// 0x0101e94c: 0x101e94c: j	 0x101ea7c sll   zero, zero, 0
+	br L_101ea7c
 // --- basic block ---
-L_101e944:
-// 0x0101e944: 0x101e944: lw    v1, 32(sp)
+L_101e954:
+// 0x0101e954: 0x101e954: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4283,10 +4283,10 @@ L_101e944:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e948: 0x101e948: addu  a1, s5, zero
+// 0x0101e958: 0x101e958: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x0101e94c: 0x101e94c: lw    v1, 12(v1)
+// 0x0101e95c: 0x101e95c: lw    v1, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4295,11 +4295,11 @@ L_101e944:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e950: 0x101e950: sll   zero, zero, 0
-// 0x0101e954: 0x101e954: addu  a0, v1, zero
+// 0x0101e960: 0x101e960: sll   zero, zero, 0
+// 0x0101e964: 0x101e964: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0101e958: 0x101e958: jal   0x1001b14 sw    v1, 36(sp)
+// 0x0101e968: 0x101e968: jal   0x1001b14 sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4313,7 +4313,7 @@ L_101e944:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101e960: 0x101e960: lw    v1, 32(sp)
+// 0x0101e970: 0x101e970: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4322,8 +4322,8 @@ L_101e944:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e964: 0x101e964: sll   zero, zero, 0
-// 0x0101e968: 0x101e968: lw    a2, 16(v1)
+// 0x0101e974: 0x101e974: sll   zero, zero, 0
+// 0x0101e978: 0x101e978: lw    a2, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4332,31 +4332,31 @@ L_101e944:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e96c: 0x101e96c: sll   zero, zero, 0
-// 0x0101e970: 0x101e970: beq   a2, zero, 0x101ea40 sltiu v0, v0, 1
+// 0x0101e97c: 0x101e97c: sll   zero, zero, 0
+// 0x0101e980: 0x101e980: beq   a2, zero, 0x101ea50 sltiu v0, v0, 1
 	ldloc.3
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-	brfalse L_101ea40
+	brfalse L_101ea50
 // --- basic block ---
-// 0x0101e978: 0x101e978: beq   v0, zero, 0x101e9a4 addu  a0, zero, zero
+// 0x0101e988: 0x101e988: beq   v0, zero, 0x101e9b4 addu  a0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_101e9a4
+	brfalse L_101e9b4
 // --- basic block ---
-// 0x0101e980: 0x101e980: beq   s2, zero, 0x101ea74 addu  a0, s2, zero
+// 0x0101e990: 0x101e990: beq   s2, zero, 0x101ea84 addu  a0, s2, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
-	brfalse L_101ea74
+	brfalse L_101ea84
 // --- basic block ---
-// 0x0101e988: 0x101e988: addu  a1, s5, zero
+// 0x0101e998: 0x101e998: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x0101e98c: 0x101e98c: jal   0x1001b14 sw    a2, 44(sp)
+// 0x0101e99c: 0x101e99c: jal   0x1001b14 sw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4370,7 +4370,7 @@ L_101e944:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101e994: 0x101e994: lw    a2, 44(sp)
+// 0x0101e9a4: 0x101e9a4: lw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4379,17 +4379,17 @@ L_101e944:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e998: 0x101e998: bne   v0, zero, 0x101ea50 addu  a0, s2, zero
+// 0x0101e9a8: 0x101e9a8: bne   v0, zero, 0x101ea60 addu  a0, s2, zero
 	ldloc 6
 	ldloc 10
 	stloc.1
-	brtrue L_101ea50
+	brtrue L_101ea60
 // --- basic block ---
-// 0x0101e9a0: 0x101e9a0: addu  a0, zero, zero
+// 0x0101e9b0: 0x101e9b0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_101e9a4:
-// 0x0101e9a4: 0x101e9a4: jal   0x10a1918 addiu a1, zero, 1
+L_101e9b4:
+// 0x0101e9b4: 0x101e9b4: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4397,16 +4397,16 @@ L_101e9a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e9ac: 0x101e9ac: beq   v0, zero, 0x101ea28 sll   zero, zero, 0
+// 0x0101e9bc: 0x101e9bc: beq   v0, zero, 0x101ea38 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101ea28
+	brfalse L_101ea38
 // --- basic block ---
-// 0x0101e9b4: 0x101e9b4: lw    a2, 16(sp)
+// 0x0101e9c4: 0x101e9c4: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4415,10 +4415,10 @@ L_101e9a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e9b8: 0x101e9b8: addu  a0, v0, zero
+// 0x0101e9c8: 0x101e9c8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0101e9bc: 0x101e9bc: sw    a2, 44(sp)
+// 0x0101e9cc: 0x101e9cc: sw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4427,7 +4427,7 @@ L_101e9a4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0101e9c0: 0x101e9c0: jal   0x104dffc sw    v0, 48(sp)
+// 0x0101e9d0: 0x101e9d0: jal   0x104e00c sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4437,17 +4437,17 @@ L_101e9a4:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e9c8: 0x101e9c8: div   v0, s1
+// 0x0101e9d8: 0x101e9d8: div   v0, s1
 	ldloc 6
 	ldloc 12
 	div
 	stloc 8
-// 0x0101e9cc: 0x101e9cc: lw    a1, 48(sp)
+// 0x0101e9dc: 0x101e9dc: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4456,7 +4456,7 @@ L_101e9a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e9d0: 0x101e9d0: lw    a2, 44(sp)
+// 0x0101e9e0: 0x101e9e0: lw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4465,7 +4465,7 @@ L_101e9a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101e9d4: 0x101e9d4: lw    v1, 20(sp)
+// 0x0101e9e4: 0x101e9e4: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4474,10 +4474,10 @@ L_101e9a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e9d8: 0x101e9d8: addu  a0, a1, zero
+// 0x0101e9e8: 0x101e9e8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0101e9dc: 0x101e9dc: sw    v1, 44(sp)
+// 0x0101e9ec: 0x101e9ec: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4486,15 +4486,15 @@ L_101e9a4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101e9e0: 0x101e9e0: mflo  lo
+// 0x0101e9f0: 0x101e9f0: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x0101e9e4: 0x101e9e4: subu  a2, a2, v0
+// 0x0101e9f4: 0x101e9f4: subu  a2, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-// 0x0101e9e8: 0x101e9e8: jal   0x104e020 sw    a2, 16(sp)
+// 0x0101e9f8: 0x101e9f8: jal   0x104e030 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4504,17 +4504,17 @@ L_101e9a4:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101e9f0: 0x101e9f0: div   v0, s1
+// 0x0101ea00: 0x101ea00: div   v0, s1
 	ldloc 6
 	ldloc 12
 	div
 	stloc 8
-// 0x0101e9f4: 0x101e9f4: lw    v1, 44(sp)
+// 0x0101ea04: 0x101ea04: lw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4523,7 +4523,7 @@ L_101e9a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101e9f8: 0x101e9f8: lw    a1, 48(sp)
+// 0x0101ea08: 0x101ea08: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4532,27 +4532,27 @@ L_101e9a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101e9fc: 0x101e9fc: addu  a2, zero, zero
+// 0x0101ea0c: 0x101ea0c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101ea00: 0x101ea00: addu  a0, a1, zero
+// 0x0101ea10: 0x101ea10: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0101ea04: 0x101ea04: addu  a3, zero, zero
+// 0x0101ea14: 0x101ea14: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0101ea08: 0x101ea08: addu  a1, s3, zero
+// 0x0101ea18: 0x101ea18: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x0101ea0c: 0x101ea0c: mflo  lo
+// 0x0101ea1c: 0x101ea1c: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x0101ea10: 0x101ea10: subu  v1, v1, v0
+// 0x0101ea20: 0x101ea20: subu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 7
-// 0x0101ea14: 0x101ea14: sw    v1, 20(sp)
+// 0x0101ea24: 0x101ea24: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4561,23 +4561,23 @@ L_101e9a4:
 	add
 	ldloc 7
 	stelem.i4
-L_101ea18:
-// 0x0101ea18: 0x101ea18: jal   0x104f4a8 sll   zero, zero, 0
+L_101ea28:
+// 0x0101ea28: 0x101ea28: jal   0x104f4b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101ea20: 0x101ea20: j	 0x101ea74 sll   zero, zero, 0
-	br L_101ea74
+// 0x0101ea30: 0x101ea30: j	 0x101ea84 sll   zero, zero, 0
+	br L_101ea84
 // --- basic block ---
-L_101ea28:
-// 0x0101ea28: 0x101ea28: lw    v1, 32(sp)
+L_101ea38:
+// 0x0101ea38: 0x101ea38: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4586,8 +4586,8 @@ L_101ea28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ea2c: 0x101ea2c: sll   zero, zero, 0
-// 0x0101ea30: 0x101ea30: lw    a2, 48(v1)
+// 0x0101ea3c: 0x101ea3c: sll   zero, zero, 0
+// 0x0101ea40: 0x101ea40: lw    a2, 48(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4596,7 +4596,7 @@ L_101ea28:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101ea34: 0x101ea34: lw    a0, 12(v1)
+// 0x0101ea44: 0x101ea44: lw    a0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4605,22 +4605,22 @@ L_101ea28:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ea38: 0x101ea38: j	 0x101ea6c sll   zero, zero, 0
-	br L_101ea6c
+// 0x0101ea48: 0x101ea48: j	 0x101ea7c sll   zero, zero, 0
+	br L_101ea7c
 // --- basic block ---
-L_101ea40:
-// 0x0101ea40: 0x101ea40: beq   v0, zero, 0x101ea60 sll   zero, zero, 0
+L_101ea50:
+// 0x0101ea50: 0x101ea50: beq   v0, zero, 0x101ea70 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101ea60
+	brfalse L_101ea70
 // --- basic block ---
-// 0x0101ea48: 0x101ea48: beq   s2, zero, 0x101ea74 addu  a0, s2, zero
+// 0x0101ea58: 0x101ea58: beq   s2, zero, 0x101ea84 addu  a0, s2, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
-	brfalse L_101ea74
+	brfalse L_101ea84
 // --- basic block ---
-L_101ea50:
-// 0x0101ea50: 0x101ea50: jal   0x1001b14 addu  a1, s5, zero
+L_101ea60:
+// 0x0101ea60: 0x101ea60: jal   0x1001b14 addu  a1, s5, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -4628,12 +4628,12 @@ L_101ea50:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101ea58: 0x101ea58: bne   v0, zero, 0x101ea74 sll   zero, zero, 0
+// 0x0101ea68: 0x101ea68: bne   v0, zero, 0x101ea84 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101ea74
+	brtrue L_101ea84
 // --- basic block ---
-L_101ea60:
-// 0x0101ea60: 0x101ea60: lw    v0, 32(sp)
+L_101ea70:
+// 0x0101ea70: 0x101ea70: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4642,7 +4642,7 @@ L_101ea60:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101ea64: 0x101ea64: lw    a0, 36(sp)
+// 0x0101ea74: 0x101ea74: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4651,7 +4651,7 @@ L_101ea60:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ea68: 0x101ea68: lw    a2, 48(v0)
+// 0x0101ea78: 0x101ea78: lw    a2, 48(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4660,8 +4660,8 @@ L_101ea60:
 	add
 	ldelem.i4
 	stloc.3
-L_101ea6c:
-// 0x0101ea6c: 0x101ea6c: jal   0x101bb50 addu  a1, s3, zero
+L_101ea7c:
+// 0x0101ea7c: 0x101ea7c: jal   0x101bb60 addu  a1, s3, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -4669,13 +4669,13 @@ L_101ea6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_101ea74:
-// 0x0101ea74: 0x101ea74: lw    v1, 40(sp)
+L_101ea84:
+// 0x0101ea84: 0x101ea84: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4684,8 +4684,8 @@ L_101ea74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ea78: 0x101ea78: sll   zero, zero, 0
-// 0x0101ea7c: 0x101ea7c: sw    v1, 32(sp)
+// 0x0101ea88: 0x101ea88: sll   zero, zero, 0
+// 0x0101ea8c: 0x101ea8c: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4694,8 +4694,8 @@ L_101ea74:
 	add
 	ldloc 7
 	stelem.i4
-L_101ea80:
-// 0x0101ea80: 0x101ea80: lw    a2, 32(sp)
+L_101ea90:
+// 0x0101ea90: 0x101ea90: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4704,17 +4704,17 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101ea84: 0x101ea84: lui   v1, 0x30000
+// 0x0101ea94: 0x101ea94: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101ea88: 0x101ea88: lw    a2, 0(a2)
+// 0x0101ea98: 0x101ea98: lw    a2, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0101ea8c: 0x101ea8c: lw    v0, 32(sp)
+// 0x0101ea9c: 0x101ea9c: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4723,12 +4723,12 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101ea90: 0x101ea90: addiu v1, v1, 28208
+// 0x0101eaa0: 0x101eaa0: addiu v1, v1, 28672
 	ldloc 7
-	ldc.i4 28208
+	ldc.i4 28672
 	add
 	stloc 7
-// 0x0101ea94: 0x101ea94: bne   v0, v1, 0x101e72c sw    a2, 40(sp)
+// 0x0101eaa4: 0x101eaa4: bne   v0, v1, 0x101e73c sw    a2, 40(sp)
 	ldloc 6
 	ldloc 7
 	ldloc 5
@@ -4739,30 +4739,30 @@ L_101ea80:
 	add
 	ldloc.3
 	stelem.i4
-	bne.un L_101e72c
+	bne.un L_101e73c
 // --- basic block ---
-// 0x0101ea9c: 0x101ea9c: lui   v0, 0x30000
+// 0x0101eaac: 0x101eaac: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101eaa0: 0x101eaa0: lw    a1, 28188(v0)
+// 0x0101eab0: 0x101eab0: lw    a1, 28652(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7047
+	ldc.i4 7163
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101eaa4: 0x101eaa4: sll   zero, zero, 0
-// 0x0101eaa8: 0x101eaa8: beq   a1, zero, 0x101eb7c addiu a0, s4, 24
+// 0x0101eab4: 0x101eab4: sll   zero, zero, 0
+// 0x0101eab8: 0x101eab8: beq   a1, zero, 0x101eb8c addiu a0, s4, 24
 	ldloc.2
 	ldloc 15
 	ldc.i4.s 24
 	add
 	stloc.1
-	brfalse L_101eb7c
+	brfalse L_101eb8c
 // --- basic block ---
-// 0x0101eab0: 0x101eab0: jal   0x1009824 addiu a1, a1, 24
+// 0x0101eac0: 0x101eac0: jal   0x1009834 addiu a1, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	add
@@ -4772,20 +4772,20 @@ L_101ea80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101eab8: 0x101eab8: lui   a0, 0xe0000
+// 0x0101eac8: 0x101eac8: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x0101eabc: 0x101eabc: addiu a0, a0, 29604
+// 0x0101eacc: 0x101eacc: addiu a0, a0, 30068
 	ldloc.1
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.1
-// 0x0101eac0: 0x101eac0: lw    a2, 24(s4)
+// 0x0101ead0: 0x101ead0: lw    a2, 24(s4)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -4794,7 +4794,7 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101eac4: 0x101eac4: lw    v1, 80(a0)
+// 0x0101ead4: 0x101ead4: lw    v1, 80(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4803,7 +4803,7 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101eac8: 0x101eac8: lw    a1, 32(a0)
+// 0x0101ead8: 0x101ead8: lw    a1, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4812,17 +4812,17 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101eacc: 0x101eacc: subu  v1, a2, v1
+// 0x0101eadc: 0x101eadc: subu  v1, a2, v1
 	ldloc.3
 	ldloc 7
 	sub
 	stloc 7
-// 0x0101ead0: 0x101ead0: div   v1, a1
+// 0x0101eae0: 0x101eae0: div   v1, a1
 	ldloc 7
 	ldloc.2
 	div
 	stloc 8
-// 0x0101ead4: 0x101ead4: lw    a3, 76(a0)
+// 0x0101eae4: 0x101eae4: lw    a3, 76(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4831,7 +4831,7 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101ead8: 0x101ead8: lw    a2, 36(a0)
+// 0x0101eae8: 0x101eae8: lw    a2, 36(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4840,15 +4840,15 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101eadc: 0x101eadc: addiu a1, sp, 16
+// 0x0101eaec: 0x101eaec: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0101eae0: 0x101eae0: addu  a0, a1, zero
+// 0x0101eaf0: 0x101eaf0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0101eae4: 0x101eae4: sw    v0, 44(sp)
+// 0x0101eaf4: 0x101eaf4: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4857,7 +4857,7 @@ L_101ea80:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101eae8: 0x101eae8: sw    a1, 48(sp)
+// 0x0101eaf8: 0x101eaf8: sw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4866,10 +4866,10 @@ L_101ea80:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101eaec: 0x101eaec: mflo  lo
+// 0x0101eafc: 0x101eafc: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0101eaf0: 0x101eaf0: sw    v1, 16(sp)
+// 0x0101eb00: 0x101eb00: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4878,7 +4878,7 @@ L_101ea80:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101eaf4: 0x101eaf4: lw    v1, 28(s4)
+// 0x0101eb04: 0x101eb04: lw    v1, 28(s4)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -4887,21 +4887,21 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101eaf8: 0x101eaf8: sll   zero, zero, 0
-// 0x0101eafc: 0x101eafc: subu  v1, a3, v1
+// 0x0101eb08: 0x101eb08: sll   zero, zero, 0
+// 0x0101eb0c: 0x101eb0c: subu  v1, a3, v1
 	ldloc 4
 	ldloc 7
 	sub
 	stloc 7
-// 0x0101eb00: 0x101eb00: div   v1, a2
+// 0x0101eb10: 0x101eb10: div   v1, a2
 	ldloc 7
 	ldloc.3
 	div
 	stloc 8
-// 0x0101eb04: 0x101eb04: mflo  lo
+// 0x0101eb14: 0x101eb14: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x0101eb08: 0x101eb08: jal   0x10073c4 sw    a2, 20(sp)
+// 0x0101eb18: 0x101eb18: jal   0x10073d4 sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4915,12 +4915,12 @@ L_101ea80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101eb10: 0x101eb10: lw    v0, 44(sp)
+// 0x0101eb20: 0x101eb20: lw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4929,10 +4929,10 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101eb14: 0x101eb14: lui   a0, 0x10000
+// 0x0101eb24: 0x101eb24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101eb18: 0x101eb18: lw    a1, 48(sp)
+// 0x0101eb28: 0x101eb28: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4941,12 +4941,12 @@ L_101ea80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101eb1c: 0x101eb1c: addiu a0, a0, -29856
+// 0x0101eb2c: 0x101eb2c: addiu a0, a0, -29856
 	ldloc.1
 	ldc.i4 -29856
 	add
 	stloc.1
-// 0x0101eb20: 0x101eb20: jal   0x101bb50 addu  a2, v0, zero
+// 0x0101eb30: 0x101eb30: jal   0x101bb60 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -4954,16 +4954,16 @@ L_101ea80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101eb28: 0x101eb28: j	 0x101eb7c sll   zero, zero, 0
-	br L_101eb7c
+// 0x0101eb38: 0x101eb38: j	 0x101eb8c sll   zero, zero, 0
+	br L_101eb8c
 // --- basic block ---
-L_101eb30:
-// 0x0101eb30: 0x101eb30: lw    a1, 80(s0)
+L_101eb40:
+// 0x0101eb40: 0x101eb40: lw    a1, 80(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4972,7 +4972,7 @@ L_101eb30:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101eb34: 0x101eb34: lw    a2, 32(s0)
+// 0x0101eb44: 0x101eb44: lw    a2, 32(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4981,17 +4981,17 @@ L_101eb30:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101eb38: 0x101eb38: subu  a0, a0, a1
+// 0x0101eb48: 0x101eb48: subu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.1
-// 0x0101eb3c: 0x101eb3c: div   a0, a2
+// 0x0101eb4c: 0x101eb4c: div   a0, a2
 	ldloc.1
 	ldloc.3
 	div
 	stloc 8
-// 0x0101eb40: 0x101eb40: lw    a3, 76(s0)
+// 0x0101eb50: 0x101eb50: lw    a3, 76(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5000,7 +5000,7 @@ L_101eb30:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101eb44: 0x101eb44: lw    v0, 36(s0)
+// 0x0101eb54: 0x101eb54: lw    v0, 36(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5009,18 +5009,18 @@ L_101eb30:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101eb48: 0x101eb48: subu  v1, a3, v1
+// 0x0101eb58: 0x101eb58: subu  v1, a3, v1
 	ldloc 4
 	ldloc 7
 	sub
 	stloc 7
-// 0x0101eb4c: 0x101eb4c: addu  a0, s3, zero
+// 0x0101eb5c: 0x101eb5c: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x0101eb50: 0x101eb50: mflo  lo
+// 0x0101eb60: 0x101eb60: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x0101eb54: 0x101eb54: sw    a1, 16(sp)
+// 0x0101eb64: 0x101eb64: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5029,16 +5029,16 @@ L_101eb30:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0101eb58: 0x101eb58: sll   zero, zero, 0
-// 0x0101eb5c: 0x101eb5c: div   v1, v0
+// 0x0101eb68: 0x101eb68: sll   zero, zero, 0
+// 0x0101eb6c: 0x101eb6c: div   v1, v0
 	ldloc 7
 	ldloc 6
 	div
 	stloc 8
-// 0x0101eb60: 0x101eb60: mflo  lo
+// 0x0101eb70: 0x101eb70: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0101eb64: 0x101eb64: jal   0x10073c4 sw    v1, 20(sp)
+// 0x0101eb74: 0x101eb74: jal   0x10073d4 sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5052,21 +5052,21 @@ L_101eb30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101eb6c: 0x101eb6c: bne   s2, zero, 0x101e7b4 sll   zero, zero, 0
+// 0x0101eb7c: 0x101eb7c: bne   s2, zero, 0x101e7c4 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_101e7b4
+	brtrue L_101e7c4
 // --- basic block ---
-// 0x0101eb74: 0x101eb74: j	 0x101e944 sll   zero, zero, 0
-	br L_101e944
+// 0x0101eb84: 0x101eb84: j	 0x101e954 sll   zero, zero, 0
+	br L_101e954
 // --- basic block ---
-L_101eb7c:
-// 0x0101eb7c: 0x101eb7c: lw    ra, 92(sp)
-// 0x0101eb80: 0x101eb80: lw    s8, 88(sp)
+L_101eb8c:
+// 0x0101eb8c: 0x101eb8c: lw    ra, 92(sp)
+// 0x0101eb90: 0x101eb90: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5075,7 +5075,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101eb84: 0x101eb84: lw    s7, 84(sp)
+// 0x0101eb94: 0x101eb94: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5084,7 +5084,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101eb88: 0x101eb88: lw    s6, 80(sp)
+// 0x0101eb98: 0x101eb98: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5093,7 +5093,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0101eb8c: 0x101eb8c: lw    s5, 76(sp)
+// 0x0101eb9c: 0x101eb9c: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5102,7 +5102,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101eb90: 0x101eb90: lw    s4, 72(sp)
+// 0x0101eba0: 0x101eba0: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5111,7 +5111,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101eb94: 0x101eb94: lw    s3, 68(sp)
+// 0x0101eba4: 0x101eba4: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5120,7 +5120,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101eb98: 0x101eb98: lw    s2, 64(sp)
+// 0x0101eba8: 0x101eba8: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5129,7 +5129,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101eb9c: 0x101eb9c: lw    s1, 60(sp)
+// 0x0101ebac: 0x101ebac: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5138,7 +5138,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101eba0: 0x101eba0: lw    s0, 56(sp)
+// 0x0101ebb0: 0x101ebb0: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5147,7 +5147,7 @@ L_101eb7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101eba4: 0x101eba4: jr    ra addiu sp, sp, 96
+// 0x0101ebb4: 0x101ebb4: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -5159,7 +5159,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_stop_101ebac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_stop_101ebbc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5194,19 +5194,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_101ebac:
-// 0x0101ebac: 0x101ebac: addiu v1, zero, 1
+L_101ebbc:
+// 0x0101ebbc: 0x101ebbc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0101ebb0: 0x101ebb0: lui   v0, 0x0
+// 0x0101ebc0: 0x101ebc0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101ebb4: 0x101ebb4: addiu sp, sp, -24
+// 0x0101ebc4: 0x101ebc4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101ebb8: 0x101ebb8: sw    v1, 6028(v0)
+// 0x0101ebc8: 0x101ebc8: sw    v1, 6028(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5215,16 +5215,16 @@ L_101ebac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ebbc: 0x101ebbc: lui   v0, 0x30000
+// 0x0101ebcc: 0x101ebcc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101ebc0: 0x101ebc0: sw    ra, 20(sp)
-// 0x0101ebc4: 0x101ebc4: jal   0x1021900 sw    zero, 28184(v0)
+// 0x0101ebd0: 0x101ebd0: sw    ra, 20(sp)
+// 0x0101ebd4: 0x101ebd4: jal   0x1021910 sw    zero, 28648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5233,14 +5233,14 @@ L_101ebac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ebcc: 0x101ebcc: lw    ra, 20(sp)
-// 0x0101ebd0: 0x101ebd0: sll   zero, zero, 0
-// 0x0101ebd4: 0x101ebd4: jr    ra addiu sp, sp, 24
+// 0x0101ebdc: 0x101ebdc: lw    ra, 20(sp)
+// 0x0101ebe0: 0x101ebe0: sll   zero, zero, 0
+// 0x0101ebe4: 0x101ebe4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5252,7 +5252,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_set_point_focus_101ebdc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_set_point_focus_101ebec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5293,12 +5293,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ebdc: 0x101ebdc: addiu sp, sp, -40
+// 0x0101ebec: 0x101ebec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101ebe0: 0x101ebe0: sw    s0, 28(sp)
+// 0x0101ebf0: 0x101ebf0: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5307,8 +5307,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101ebe4: 0x101ebe4: sw    ra, 36(sp)
-// 0x0101ebe8: 0x101ebe8: sw    s1, 32(sp)
+// 0x0101ebf4: 0x101ebf4: sw    ra, 36(sp)
+// 0x0101ebf8: 0x101ebf8: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5317,29 +5317,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101ebec: 0x101ebec: beq   a0, zero, 0x101ecd4 addu  s0, a0, zero
+// 0x0101ebfc: 0x101ebfc: beq   a0, zero, 0x101ece4 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_101ecd4
+	brfalse L_101ece4
 // --- basic block ---
-// 0x0101ebf4: 0x101ebf4: lb    v0, 21(a0)
+// 0x0101ec04: 0x101ec04: lb    v0, 21(a0)
 	ldloc.1
 	ldc.i4.s 21
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101ebf8: 0x101ebf8: sll   zero, zero, 0
-// 0x0101ebfc: 0x101ebfc: bne   v0, zero, 0x101ec1c addiu v0, zero, 1
+// 0x0101ec08: 0x101ec08: sll   zero, zero, 0
+// 0x0101ec0c: 0x101ec0c: bne   v0, zero, 0x101ec2c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_101ec1c
+	brtrue L_101ec2c
 // --- basic block ---
-// 0x0101ec04: 0x101ec04: lui   v1, 0x0
+// 0x0101ec14: 0x101ec14: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0101ec08: 0x101ec08: sw    v0, 6036(v1)
+// 0x0101ec18: 0x101ec18: sw    v0, 6036(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5348,10 +5348,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101ec0c: 0x101ec0c: lui   v1, 0x0
+// 0x0101ec1c: 0x101ec1c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0101ec10: 0x101ec10: sw    v0, 6028(v1)
+// 0x0101ec20: 0x101ec20: sw    v0, 6028(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5360,24 +5360,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101ec14: 0x101ec14: j	 0x101ec30 addu  v0, zero, zero
+// 0x0101ec24: 0x101ec24: j	 0x101ec40 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_101ec30
+	br L_101ec40
 // --- basic block ---
-L_101ec1c:
-// 0x0101ec1c: 0x101ec1c: lui   a0, 0x0
+L_101ec2c:
+// 0x0101ec2c: 0x101ec2c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101ec20: 0x101ec20: lui   a1, 0x0
+// 0x0101ec30: 0x101ec30: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0101ec24: 0x101ec24: addiu a0, a0, 5964
+// 0x0101ec34: 0x101ec34: addiu a0, a0, 5964
 	ldloc.1
 	ldc.i4 5964
 	add
 	stloc.1
-// 0x0101ec28: 0x101ec28: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x0101ec38: 0x101ec38: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5387,16 +5387,16 @@ L_101ec1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101ec30:
-// 0x0101ec30: 0x101ec30: lui   s1, 0x0
+L_101ec40:
+// 0x0101ec40: 0x101ec40: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0101ec34: 0x101ec34: lw    v1, 6032(s1)
+// 0x0101ec44: 0x101ec44: lw    v1, 6032(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5405,23 +5405,23 @@ L_101ec30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ec38: 0x101ec38: sll   zero, zero, 0
-// 0x0101ec3c: 0x101ec3c: beq   v1, v0, 0x101ec68 lui   a0, 0x0
+// 0x0101ec48: 0x101ec48: sll   zero, zero, 0
+// 0x0101ec4c: 0x101ec4c: beq   v1, v0, 0x101ec78 lui   a0, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	beq  L_101ec68
+	beq  L_101ec78
 // --- basic block ---
-// 0x0101ec44: 0x101ec44: addu  a1, v0, zero
+// 0x0101ec54: 0x101ec54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0101ec48: 0x101ec48: addiu a0, a0, 5996
+// 0x0101ec58: 0x101ec58: addiu a0, a0, 5996
 	ldloc.1
 	ldc.i4 5996
 	add
 	stloc.1
-// 0x0101ec4c: 0x101ec4c: jal   0x100e610 sw    v0, 16(sp)
+// 0x0101ec5c: 0x101ec5c: jal   0x100e620 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5435,12 +5435,12 @@ L_101ec30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ec54: 0x101ec54: lw    v0, 16(sp)
+// 0x0101ec64: 0x101ec64: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5449,10 +5449,10 @@ L_101ec30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101ec58: 0x101ec58: addiu v1, zero, 1
+// 0x0101ec68: 0x101ec68: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0101ec5c: 0x101ec5c: sw    v0, 6032(s1)
+// 0x0101ec6c: 0x101ec6c: sw    v0, 6032(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5461,10 +5461,10 @@ L_101ec30:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101ec60: 0x101ec60: lui   v0, 0x0
+// 0x0101ec70: 0x101ec70: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101ec64: 0x101ec64: sw    v1, 6028(v0)
+// 0x0101ec74: 0x101ec74: sw    v1, 6028(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5473,28 +5473,28 @@ L_101ec30:
 	add
 	ldloc 7
 	stelem.i4
-L_101ec68:
-// 0x0101ec68: 0x101ec68: lui   s1, 0x30000
+L_101ec78:
+// 0x0101ec78: 0x101ec78: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x0101ec6c: 0x101ec6c: lw    v0, 28180(s1)
+// 0x0101ec7c: 0x101ec7c: lw    v0, 28644(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101ec70: 0x101ec70: sll   zero, zero, 0
-// 0x0101ec74: 0x101ec74: beq   v0, s0, 0x101eca8 lui   a0, 0x0
+// 0x0101ec80: 0x101ec80: sll   zero, zero, 0
+// 0x0101ec84: 0x101ec84: beq   v0, s0, 0x101ecb8 lui   a0, 0x0
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 0
 	stloc.1
-	beq  L_101eca8
+	beq  L_101ecb8
 // --- basic block ---
-// 0x0101ec7c: 0x101ec7c: lw    a1, 8(s0)
+// 0x0101ec8c: 0x101ec8c: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5503,7 +5503,7 @@ L_101ec68:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101ec80: 0x101ec80: jal   0x100e5c0 addiu a0, a0, 5980
+// 0x0101ec90: 0x101ec90: jal   0x100e5d0 addiu a0, a0, 5980
 	ldloc.1
 	ldc.i4 5980
 	add
@@ -5513,18 +5513,18 @@ L_101ec68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ec88: 0x101ec88: addiu v0, zero, 1
+// 0x0101ec98: 0x101ec98: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101ec8c: 0x101ec8c: lui   v1, 0x0
+// 0x0101ec9c: 0x101ec9c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0101ec90: 0x101ec90: lw    a0, 8(s0)
+// 0x0101eca0: 0x101eca0: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5533,7 +5533,7 @@ L_101ec68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ec94: 0x101ec94: sw    v0, 6036(v1)
+// 0x0101eca4: 0x101eca4: sw    v0, 6036(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5542,19 +5542,19 @@ L_101ec68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101ec98: 0x101ec98: lui   v1, 0x0
+// 0x0101eca8: 0x101eca8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0101ec9c: 0x101ec9c: sw    s0, 28180(s1)
+// 0x0101ecac: 0x101ecac: sw    s0, 28644(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101eca0: 0x101eca0: jal   0x1019ad4 sw    v0, 6028(v1)
+// 0x0101ecb0: 0x101ecb0: jal   0x1019ae4 sw    v0, 6028(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5568,52 +5568,52 @@ L_101ec68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_page_1019ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_page_1019ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101eca8:
-// 0x0101eca8: 0x101eca8: lui   v0, 0x30000
+L_101ecb8:
+// 0x0101ecb8: 0x101ecb8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101ecac: 0x101ecac: lw    v0, 28176(v0)
+// 0x0101ecbc: 0x101ecbc: lw    v0, 28640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101ecb0: 0x101ecb0: sll   zero, zero, 0
-// 0x0101ecb4: 0x101ecb4: beq   s0, v0, 0x101ecd4 lui   v0, 0x30000
+// 0x0101ecc0: 0x101ecc0: sll   zero, zero, 0
+// 0x0101ecc4: 0x101ecc4: beq   s0, v0, 0x101ece4 lui   v0, 0x30000
 	ldloc 8
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	beq  L_101ecd4
+	beq  L_101ece4
 // --- basic block ---
-// 0x0101ecbc: 0x101ecbc: lw    v0, 28184(v0)
+// 0x0101eccc: 0x101eccc: lw    v0, 28648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101ecc0: 0x101ecc0: sll   zero, zero, 0
-// 0x0101ecc4: 0x101ecc4: beq   v0, zero, 0x101ecd4 addiu v1, zero, 1
+// 0x0101ecd0: 0x101ecd0: sll   zero, zero, 0
+// 0x0101ecd4: 0x101ecd4: beq   v0, zero, 0x101ece4 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_101ecd4
+	brfalse L_101ece4
 // --- basic block ---
-// 0x0101eccc: 0x101eccc: lui   v0, 0x0
+// 0x0101ecdc: 0x101ecdc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101ecd0: 0x101ecd0: sw    v1, 6028(v0)
+// 0x0101ece0: 0x101ece0: sw    v1, 6028(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5622,9 +5622,9 @@ L_101eca8:
 	add
 	ldloc 7
 	stelem.i4
-L_101ecd4:
-// 0x0101ecd4: 0x101ecd4: lw    ra, 36(sp)
-// 0x0101ecd8: 0x101ecd8: lw    s1, 32(sp)
+L_101ece4:
+// 0x0101ece4: 0x101ece4: lw    ra, 36(sp)
+// 0x0101ece8: 0x101ece8: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5633,7 +5633,7 @@ L_101ecd4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101ecdc: 0x101ecdc: lw    s0, 28(sp)
+// 0x0101ecec: 0x101ecec: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5642,7 +5642,7 @@ L_101ecd4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101ece0: 0x101ece0: jr    ra addiu sp, sp, 40
+// 0x0101ecf0: 0x101ecf0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5654,7 +5654,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5692,12 +5692,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ece8: 0x101ece8: addiu sp, sp, -32
+// 0x0101ecf8: 0x101ecf8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101ecec: 0x101ecec: sw    s0, 24(sp)
+// 0x0101ecfc: 0x101ecfc: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5706,8 +5706,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ecf0: 0x101ecf0: sw    ra, 28(sp)
-// 0x0101ecf4: 0x101ecf4: jal   0x101de54 addu  s0, a0, zero
+// 0x0101ed00: 0x101ed00: sw    ra, 28(sp)
+// 0x0101ed04: 0x101ed04: jal   0x101de64 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -5715,37 +5715,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101ecfc: 0x101ecfc: bne   v0, zero, 0x101ed28 lui   a1, 0x10000
+// 0x0101ed0c: 0x101ed0c: bne   v0, zero, 0x101ed38 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_101ed28
+	brtrue L_101ed38
 // --- basic block ---
-// 0x0101ed04: 0x101ed04: lui   a3, 0x10000
+// 0x0101ed14: 0x101ed14: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101ed08: 0x101ed08: addiu a1, a1, -29976
+// 0x0101ed18: 0x101ed18: addiu a1, a1, -29976
 	ldloc.2
 	ldc.i4 -29976
 	add
 	stloc.2
-// 0x0101ed0c: 0x101ed0c: addiu a3, a3, -29844
+// 0x0101ed1c: 0x101ed1c: addiu a3, a3, -29844
 	ldloc 4
 	ldc.i4 -29844
 	add
 	stloc 4
-// 0x0101ed10: 0x101ed10: addiu a0, zero, 4
+// 0x0101ed20: 0x101ed20: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101ed14: 0x101ed14: addiu a2, zero, 904
+// 0x0101ed24: 0x101ed24: addiu a2, zero, 904
 	ldc.i4 904
 	stloc.3
-// 0x0101ed18: 0x101ed18: jal   0x100449c sw    s0, 16(sp)
+// 0x0101ed28: 0x101ed28: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5764,11 +5764,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101ed20: 0x101ed20: j	 0x101ed30 sll   zero, zero, 0
-	br L_101ed30
+// 0x0101ed30: 0x101ed30: j	 0x101ed40 sll   zero, zero, 0
+	br L_101ed40
 // --- basic block ---
-L_101ed28:
-// 0x0101ed28: 0x101ed28: jal   0x101ebdc addu  a0, v0, zero
+L_101ed38:
+// 0x0101ed38: 0x101ed38: jal   0x101ebec addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5776,14 +5776,14 @@ L_101ed28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_point_focus_101ebdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_point_focus_101ebec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101ed30:
-// 0x0101ed30: 0x101ed30: lw    ra, 28(sp)
-// 0x0101ed34: 0x101ed34: lw    s0, 24(sp)
+L_101ed40:
+// 0x0101ed40: 0x101ed40: lw    ra, 28(sp)
+// 0x0101ed44: 0x101ed44: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5792,7 +5792,7 @@ L_101ed30:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ed38: 0x101ed38: jr    ra addiu sp, sp, 32
+// 0x0101ed48: 0x101ed48: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5804,7 +5804,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_activate_101ed40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_activate_101ed50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s8,int32 s0,int32 s3,int32 s4,int32 v1,int32 s1,int32 s2,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -5866,15 +5866,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ed40: 0x101ed40: addiu sp, sp, -72
+// 0x0101ed50: 0x101ed50: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0101ed44: 0x101ed44: lui   v0, 0x30000
+// 0x0101ed54: 0x101ed54: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101ed48: 0x101ed48: sw    s0, 32(sp)
+// 0x0101ed58: 0x101ed58: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5883,17 +5883,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101ed4c: 0x101ed4c: lw    s0, 28184(v0)
+// 0x0101ed5c: 0x101ed5c: lw    s0, 28648(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101ed50: 0x101ed50: sw    ra, 68(sp)
-// 0x0101ed54: 0x101ed54: sw    s8, 64(sp)
+// 0x0101ed60: 0x101ed60: sw    ra, 68(sp)
+// 0x0101ed64: 0x101ed64: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5902,7 +5902,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101ed58: 0x101ed58: sw    s7, 60(sp)
+// 0x0101ed68: 0x101ed68: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5911,7 +5911,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101ed5c: 0x101ed5c: sw    s6, 56(sp)
+// 0x0101ed6c: 0x101ed6c: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5920,7 +5920,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101ed60: 0x101ed60: sw    s5, 52(sp)
+// 0x0101ed70: 0x101ed70: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5929,7 +5929,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101ed64: 0x101ed64: sw    s4, 48(sp)
+// 0x0101ed74: 0x101ed74: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5938,7 +5938,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101ed68: 0x101ed68: sw    s3, 44(sp)
+// 0x0101ed78: 0x101ed78: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5947,7 +5947,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101ed6c: 0x101ed6c: sw    s2, 40(sp)
+// 0x0101ed7c: 0x101ed7c: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5956,7 +5956,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101ed70: 0x101ed70: beq   s0, zero, 0x101ee08 sw    s1, 36(sp)
+// 0x0101ed80: 0x101ed80: beq   s0, zero, 0x101ee18 sw    s1, 36(sp)
 	ldloc 8
 	ldloc 5
 	ldloc.0
@@ -5966,65 +5966,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-	brfalse L_101ee08
+	brfalse L_101ee18
 // --- basic block ---
-// 0x0101ed78: 0x101ed78: lui   v0, 0x30000
+// 0x0101ed88: 0x101ed88: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101ed7c: 0x101ed7c: lui   s4, 0x10000
+// 0x0101ed8c: 0x101ed8c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0101ed80: 0x101ed80: lui   s3, 0x10000
+// 0x0101ed90: 0x101ed90: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0101ed84: 0x101ed84: addiu s5, v0, 28208
+// 0x0101ed94: 0x101ed94: addiu s5, v0, 28672
 	ldloc 6
-	ldc.i4 28208
+	ldc.i4 28672
 	add
 	stloc 14
-// 0x0101ed88: 0x101ed88: addiu s4, s4, -29976
+// 0x0101ed98: 0x101ed98: addiu s4, s4, -29976
 	ldloc 10
 	ldc.i4 -29976
 	add
 	stloc 10
-// 0x0101ed8c: 0x101ed8c: addiu s3, s3, -29808
+// 0x0101ed9c: 0x101ed9c: addiu s3, s3, -29808
 	ldloc 9
 	ldc.i4 -29808
 	add
 	stloc 9
-// 0x0101ed90: 0x101ed90: lw    s8, 28208(v0)
+// 0x0101eda0: 0x101eda0: lw    s8, 28672(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7052
+	ldc.i4 7168
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ed94: 0x101ed94: j	 0x101ede8 addiu s2, s0, 24
+// 0x0101eda4: 0x101eda4: j	 0x101edf8 addiu s2, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 13
-	br L_101ede8
+	br L_101edf8
 // --- basic block ---
-L_101ed9c:
-// 0x0101ed9c: 0x101ed9c: lb    v0, 20(s8)
+L_101edac:
+// 0x0101edac: 0x101edac: lb    v0, 20(s8)
 	ldloc 7
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101eda0: 0x101eda0: sll   zero, zero, 0
-// 0x0101eda4: 0x101eda4: bne   v0, zero, 0x101ede4 addiu a1, s8, 24
+// 0x0101edb0: 0x101edb0: sll   zero, zero, 0
+// 0x0101edb4: 0x101edb4: bne   v0, zero, 0x101edf4 addiu a1, s8, 24
 	ldloc 6
 	ldloc 7
 	ldc.i4.s 24
 	add
 	stloc.2
-	brtrue L_101ede4
+	brtrue L_101edf4
 // --- basic block ---
-// 0x0101edac: 0x101edac: jal   0x1008eb0 addu  a0, s2, zero
+// 0x0101edbc: 0x101edbc: jal   0x1008ec0 addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -6032,12 +6032,12 @@ L_101ed9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0101edb4: 0x101edb4: sw    v0, 84(s8)
+// 0x0101edc4: 0x101edc4: sw    v0, 84(s8)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6046,7 +6046,7 @@ L_101ed9c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101edb8: 0x101edb8: lw    s7, 8(s8)
+// 0x0101edc8: 0x101edc8: lw    s7, 8(s8)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6055,25 +6055,25 @@ L_101ed9c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101edbc: 0x101edbc: jal   0x1007d6c addu  s1, v0, zero
+// 0x0101edcc: 0x101edcc: jal   0x1007d7c addu  s1, v0, zero
 	ldloc 6
 	stloc 12
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 6
 // --- basic block ---
-// 0x0101edc4: 0x101edc4: addiu a0, zero, 1
+// 0x0101edd4: 0x101edd4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101edc8: 0x101edc8: addu  a1, s4, zero
+// 0x0101edd8: 0x101edd8: addu  a1, s4, zero
 	ldloc 10
 	stloc.2
-// 0x0101edcc: 0x101edcc: addiu a2, zero, 551
+// 0x0101eddc: 0x101eddc: addiu a2, zero, 551
 	ldc.i4 551
 	stloc.3
-// 0x0101edd0: 0x101edd0: addu  a3, s3, zero
+// 0x0101ede0: 0x101ede0: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x0101edd4: 0x101edd4: sw    s7, 16(sp)
+// 0x0101ede4: 0x101ede4: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6082,7 +6082,7 @@ L_101ed9c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101edd8: 0x101edd8: sw    s1, 20(sp)
+// 0x0101ede8: 0x101ede8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6091,7 +6091,7 @@ L_101ed9c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101eddc: 0x101eddc: jal   0x100449c sw    v0, 24(sp)
+// 0x0101edec: 0x101edec: jal   0x100449c sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6110,31 +6110,31 @@ L_101ed9c:
 	stloc 11
 	stloc 6
 // --- basic block ---
-L_101ede4:
-// 0x0101ede4: 0x101ede4: addu  s8, s6, zero
+L_101edf4:
+// 0x0101edf4: 0x101edf4: addu  s8, s6, zero
 	ldloc 15
 	stloc 7
-L_101ede8:
-// 0x0101ede8: 0x101ede8: lw    s6, 0(s8)
+L_101edf8:
+// 0x0101edf8: 0x101edf8: lw    s6, 0(s8)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x0101edec: 0x101edec: bne   s8, s5, 0x101ed9c lui   a0, 0x10000
+// 0x0101edfc: 0x101edfc: bne   s8, s5, 0x101edac lui   a0, 0x10000
 	ldloc 7
 	ldloc 14
 	ldc.i4 65536
 	stloc.1
-	bne.un L_101ed9c
+	bne.un L_101edac
 // --- basic block ---
-// 0x0101edf4: 0x101edf4: addiu a0, a0, -31052
+// 0x0101ee04: 0x101ee04: addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
 	stloc.1
-// 0x0101edf8: 0x101edf8: jal   0x101ece8 sw    zero, 84(s0)
+// 0x0101ee08: 0x101ee08: jal   0x101ecf8 sw    zero, 84(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6148,25 +6148,25 @@ L_101ede8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0101ee00: 0x101ee00: jal   0x1021900 sll   zero, zero, 0
+// 0x0101ee10: 0x101ee10: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-L_101ee08:
-// 0x0101ee08: 0x101ee08: lw    ra, 68(sp)
-// 0x0101ee0c: 0x101ee0c: lw    s8, 64(sp)
+L_101ee18:
+// 0x0101ee18: 0x101ee18: lw    ra, 68(sp)
+// 0x0101ee1c: 0x101ee1c: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6175,7 +6175,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101ee10: 0x101ee10: lw    s7, 60(sp)
+// 0x0101ee20: 0x101ee20: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6184,7 +6184,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0101ee14: 0x101ee14: lw    s6, 56(sp)
+// 0x0101ee24: 0x101ee24: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6193,7 +6193,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101ee18: 0x101ee18: lw    s5, 52(sp)
+// 0x0101ee28: 0x101ee28: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6202,7 +6202,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101ee1c: 0x101ee1c: lw    s4, 48(sp)
+// 0x0101ee2c: 0x101ee2c: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6211,7 +6211,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101ee20: 0x101ee20: lw    s3, 44(sp)
+// 0x0101ee30: 0x101ee30: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6220,7 +6220,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101ee24: 0x101ee24: lw    s2, 40(sp)
+// 0x0101ee34: 0x101ee34: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6229,7 +6229,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101ee28: 0x101ee28: lw    s1, 36(sp)
+// 0x0101ee38: 0x101ee38: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6238,7 +6238,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101ee2c: 0x101ee2c: lw    s0, 32(sp)
+// 0x0101ee3c: 0x101ee3c: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6247,7 +6247,7 @@ L_101ee08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101ee30: 0x101ee30: jr    ra addiu sp, sp, 72
+// 0x0101ee40: 0x101ee40: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -6259,7 +6259,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_reverse_101ee38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_reverse_101ee48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -6297,20 +6297,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ee38: 0x101ee38: lui   a0, 0x10000
+// 0x0101ee48: 0x101ee48: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101ee3c: 0x101ee3c: addiu sp, sp, -24
+// 0x0101ee4c: 0x101ee4c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101ee40: 0x101ee40: addiu a0, a0, -29760
+// 0x0101ee50: 0x101ee50: addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
 	stloc.1
-// 0x0101ee44: 0x101ee44: sw    s0, 16(sp)
+// 0x0101ee54: 0x101ee54: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6319,8 +6319,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101ee48: 0x101ee48: sw    ra, 20(sp)
-// 0x0101ee4c: 0x101ee4c: jal   0x101de54 lui   s0, 0x30000
+// 0x0101ee58: 0x101ee58: sw    ra, 20(sp)
+// 0x0101ee5c: 0x101ee5c: jal   0x101de64 lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
 	ldloc.0
@@ -6328,27 +6328,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ee54: 0x101ee54: beq   v0, zero, 0x101ee88 sw    v0, 28184(s0)
+// 0x0101ee64: 0x101ee64: beq   v0, zero, 0x101ee98 sw    v0, 28648(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_101ee88
+	brfalse L_101ee98
 // --- basic block ---
-// 0x0101ee5c: 0x101ee5c: lui   a0, 0x10000
+// 0x0101ee6c: 0x101ee6c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101ee60: 0x101ee60: jal   0x101de54 addiu a0, a0, -29748
+// 0x0101ee70: 0x101ee70: jal   0x101de64 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -6358,53 +6358,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ee68: 0x101ee68: lui   v1, 0x30000
+// 0x0101ee78: 0x101ee78: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101ee6c: 0x101ee6c: beq   v0, zero, 0x101ee84 sw    v0, 28192(v1)
+// 0x0101ee7c: 0x101ee7c: beq   v0, zero, 0x101ee94 sw    v0, 28656(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7048
+	ldc.i4 7164
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_101ee84
+	brfalse L_101ee94
 // --- basic block ---
-// 0x0101ee74: 0x101ee74: jal   0x101ed40 sll   zero, zero, 0
+// 0x0101ee84: 0x101ee84: jal   0x101ed50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_activate_101ed40(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_activate_101ed50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ee7c: 0x101ee7c: j	 0x101ee88 sll   zero, zero, 0
-	br L_101ee88
+// 0x0101ee8c: 0x101ee8c: j	 0x101ee98 sll   zero, zero, 0
+	br L_101ee98
 // --- basic block ---
-L_101ee84:
-// 0x0101ee84: 0x101ee84: sw    zero, 28184(s0)
+L_101ee94:
+// 0x0101ee94: 0x101ee94: sw    zero, 28648(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101ee88:
-// 0x0101ee88: 0x101ee88: lw    ra, 20(sp)
-// 0x0101ee8c: 0x101ee8c: lw    s0, 16(sp)
+L_101ee98:
+// 0x0101ee98: 0x101ee98: lw    ra, 20(sp)
+// 0x0101ee9c: 0x101ee9c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6413,7 +6413,7 @@ L_101ee88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101ee90: 0x101ee90: jr    ra addiu sp, sp, 24
+// 0x0101eea0: 0x101eea0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6425,7 +6425,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_resume_101ee98(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_resume_101eea8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6460,16 +6460,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101ee98: 0x101ee98: lui   a0, 0x10000
+// 0x0101eea8: 0x101eea8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101ee9c: 0x101ee9c: addiu sp, sp, -24
+// 0x0101eeac: 0x101eeac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101eea0: 0x101eea0: sw    ra, 20(sp)
-// 0x0101eea4: 0x101eea4: jal   0x101de54 addiu a0, a0, -29760
+// 0x0101eeb0: 0x101eeb0: sw    ra, 20(sp)
+// 0x0101eeb4: 0x101eeb4: jal   0x101de64 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -6479,30 +6479,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101eeac: 0x101eeac: lui   v1, 0x30000
+// 0x0101eebc: 0x101eebc: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101eeb0: 0x101eeb0: beq   v0, zero, 0x101eed8 sw    v0, 28192(v1)
+// 0x0101eec0: 0x101eec0: beq   v0, zero, 0x101eee8 sw    v0, 28656(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7048
+	ldc.i4 7164
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_101eed8
+	brfalse L_101eee8
 // --- basic block ---
-// 0x0101eeb8: 0x101eeb8: lui   a0, 0x10000
+// 0x0101eec8: 0x101eec8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101eebc: 0x101eebc: jal   0x101de54 addiu a0, a0, -29748
+// 0x0101eecc: 0x101eecc: jal   0x101de64 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -6512,41 +6512,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101eec4: 0x101eec4: lui   v1, 0x30000
+// 0x0101eed4: 0x101eed4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101eec8: 0x101eec8: beq   v0, zero, 0x101eed8 sw    v0, 28184(v1)
+// 0x0101eed8: 0x101eed8: beq   v0, zero, 0x101eee8 sw    v0, 28648(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_101eed8
+	brfalse L_101eee8
 // --- basic block ---
-// 0x0101eed0: 0x101eed0: jal   0x101ed40 sll   zero, zero, 0
+// 0x0101eee0: 0x101eee0: jal   0x101ed50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_activate_101ed40(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_activate_101ed50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_101eed8:
-// 0x0101eed8: 0x101eed8: lw    ra, 20(sp)
-// 0x0101eedc: 0x101eedc: sll   zero, zero, 0
-// 0x0101eee0: 0x101eee0: jr    ra addiu sp, sp, 24
+L_101eee8:
+// 0x0101eee8: 0x101eee8: lw    ra, 20(sp)
+// 0x0101eeec: 0x101eeec: sll   zero, zero, 0
+// 0x0101eef0: 0x101eef0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6558,7 +6558,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s7,int32 s6,int32 s4,int32 s5,int32 lo,int32 ra)
@@ -6620,12 +6620,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101eee8: 0x101eee8: addiu sp, sp, -56
+// 0x0101eef8: 0x101eef8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0101eeec: 0x101eeec: sw    s6, 44(sp)
+// 0x0101eefc: 0x101eefc: sw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6634,7 +6634,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101eef0: 0x101eef0: sw    s1, 24(sp)
+// 0x0101ef00: 0x101ef00: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6643,7 +6643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101eef4: 0x101eef4: sw    s0, 20(sp)
+// 0x0101ef04: 0x101ef04: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6652,16 +6652,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101eef8: 0x101eef8: lui   s1, 0x0
+// 0x0101ef08: 0x101ef08: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0101eefc: 0x101eefc: lui   s0, 0x0
+// 0x0101ef0c: 0x101ef0c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0101ef00: 0x101ef00: lui   s6, 0x30000
+// 0x0101ef10: 0x101ef10: lui   s6, 0x30000
 	ldc.i4 196608
 	stloc 13
-// 0x0101ef04: 0x101ef04: sw    s5, 40(sp)
+// 0x0101ef14: 0x101ef14: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6670,7 +6670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101ef08: 0x101ef08: sw    s4, 36(sp)
+// 0x0101ef18: 0x101ef18: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6679,7 +6679,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101ef0c: 0x101ef0c: sw    s2, 28(sp)
+// 0x0101ef1c: 0x101ef1c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6688,8 +6688,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101ef10: 0x101ef10: sw    ra, 52(sp)
-// 0x0101ef14: 0x101ef14: sw    s7, 48(sp)
+// 0x0101ef20: 0x101ef20: sw    ra, 52(sp)
+// 0x0101ef24: 0x101ef24: sw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6698,7 +6698,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101ef18: 0x101ef18: sw    s3, 32(sp)
+// 0x0101ef28: 0x101ef28: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6707,34 +6707,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101ef1c: 0x101ef1c: addiu s0, s0, 4914
+// 0x0101ef2c: 0x101ef2c: addiu s0, s0, 4914
 	ldloc 7
 	ldc.i4 4914
 	add
 	stloc 7
-// 0x0101ef20: 0x101ef20: addiu s1, s1, 4892
+// 0x0101ef30: 0x101ef30: addiu s1, s1, 4892
 	ldloc 9
 	ldc.i4 4892
 	add
 	stloc 9
-// 0x0101ef24: 0x101ef24: addiu s6, s6, 28208
+// 0x0101ef34: 0x101ef34: addiu s6, s6, 28672
 	ldloc 13
-	ldc.i4 28208
+	ldc.i4 28672
 	add
 	stloc 13
-// 0x0101ef28: 0x101ef28: addu  s2, zero, zero
+// 0x0101ef38: 0x101ef38: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0101ef2c: 0x101ef2c: addiu s5, zero, 96
+// 0x0101ef3c: 0x101ef3c: addiu s5, zero, 96
 	ldc.i4.s 96
 	stloc 15
-// 0x0101ef30: 0x101ef30: j	 0x101efc0 addiu s4, zero, 3
+// 0x0101ef40: 0x101ef40: j	 0x101efd0 addiu s4, zero, 3
 	ldc.i4.3
 	stloc 14
-	br L_101efc0
+	br L_101efd0
 // --- basic block ---
-L_101ef38:
-// 0x0101ef38: 0x101ef38: lw    a1, 4(s6)
+L_101ef48:
+// 0x0101ef48: 0x101ef48: lw    a1, 4(s6)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -6743,48 +6743,48 @@ L_101ef38:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101ef3c: 0x101ef3c: mflo  lo
+// 0x0101ef4c: 0x101ef4c: mflo  lo
 	ldloc 16
 	stloc 12
-// 0x0101ef40: 0x101ef40: jal   0x1015bdc addu  a0, s1, s7
+// 0x0101ef50: 0x101ef50: jal   0x1015bec addu  a0, s1, s7
 	ldloc 9
 	ldloc 12
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl16::roadmap_list_enqueue_1015bdc(int32,int32)
+	call int32 Cibyl16::roadmap_list_enqueue_1015bec(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0101ef48: 0x101ef48: lb    v0, 0(s0)
+// 0x0101ef58: 0x101ef58: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101ef4c: 0x101ef4c: sll   zero, zero, 0
-// 0x0101ef50: 0x101ef50: bne   v0, zero, 0x101efb8 addiu s3, s7, 24
+// 0x0101ef5c: 0x101ef5c: sll   zero, zero, 0
+// 0x0101ef60: 0x101ef60: bne   v0, zero, 0x101efc8 addiu s3, s7, 24
 	ldloc 6
 	ldloc 12
 	ldc.i4.s 24
 	add
 	stloc 11
-	brtrue L_101efb8
+	brtrue L_101efc8
 // --- basic block ---
-// 0x0101ef58: 0x101ef58: addu  s3, s1, s3
+// 0x0101ef68: 0x101ef68: addu  s3, s1, s3
 	ldloc 9
 	ldloc 11
 	add
 	stloc 11
-// 0x0101ef5c: 0x101ef5c: addu  a0, s1, s7
+// 0x0101ef6c: 0x101ef6c: addu  a0, s1, s7
 	ldloc 9
 	ldloc 12
 	add
 	stloc.1
-// 0x0101ef60: 0x101ef60: addiu a0, a0, 52
+// 0x0101ef70: 0x101ef70: addiu a0, a0, 52
 	ldloc.1
 	ldc.i4.s 52
 	add
 	stloc.1
-// 0x0101ef64: 0x101ef64: jal   0x100e65c addu  a1, s3, zero
+// 0x0101ef74: 0x101ef74: jal   0x100e66c addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -6792,23 +6792,23 @@ L_101ef38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_position_100e65c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_position_100e66c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101ef6c: 0x101ef6c: lb    v0, -1(s0)
+// 0x0101ef7c: 0x101ef7c: lb    v0, -1(s0)
 	ldloc 7
 	ldc.i4.m1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0101ef70: 0x101ef70: sll   zero, zero, 0
-// 0x0101ef74: 0x101ef74: beq   v0, zero, 0x101efb8 sll   zero, zero, 0
+// 0x0101ef80: 0x101ef80: sll   zero, zero, 0
+// 0x0101ef84: 0x101ef84: beq   v0, zero, 0x101efc8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_101efb8
+	brfalse L_101efc8
 // --- basic block ---
-// 0x0101ef7c: 0x101ef7c: lw    v1, 2(s0)
+// 0x0101ef8c: 0x101ef8c: lw    v1, 2(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6817,7 +6817,7 @@ L_101ef38:
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0101ef80: 0x101ef80: lw    v0, 6(s0)
+// 0x0101ef90: 0x101ef90: lw    v0, 6(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.6
@@ -6826,17 +6826,17 @@ L_101ef38:
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101ef84: 0x101ef84: addu  a0, s1, s7
+// 0x0101ef94: 0x101ef94: addu  a0, s1, s7
 	ldloc 9
 	ldloc 12
 	add
 	stloc.1
-// 0x0101ef88: 0x101ef88: addiu a0, a0, 68
+// 0x0101ef98: 0x101ef98: addiu a0, a0, 68
 	ldloc.1
 	ldc.i4.s 68
 	add
 	stloc.1
-// 0x0101ef8c: 0x101ef8c: sw    v1, 10(s0)
+// 0x0101ef9c: 0x101ef9c: sw    v1, 10(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 10
@@ -6845,7 +6845,7 @@ L_101ef38:
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0101ef90: 0x101ef90: jal   0x100e788 sw    v0, 14(s0)
+// 0x0101efa0: 0x101efa0: jal   0x100e798 sw    v0, 14(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 14
@@ -6859,17 +6859,17 @@ L_101ef38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101ef98: 0x101ef98: mult  s2, s4
+// 0x0101efa8: 0x101efa8: mult  s2, s4
 	ldloc 10
 	ldloc 14
 	mul
 	stloc 16
-// 0x0101ef9c: 0x101ef9c: sw    v0, 26(s0)
+// 0x0101efac: 0x101efac: sw    v0, 26(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 26
@@ -6878,23 +6878,23 @@ L_101ef38:
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0101efa0: 0x101efa0: addu  a1, s3, zero
+// 0x0101efb0: 0x101efb0: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0101efa4: 0x101efa4: mflo  lo
+// 0x0101efb4: 0x101efb4: mflo  lo
 	ldloc 16
 	stloc 6
-// 0x0101efa8: 0x101efa8: addiu a0, v0, 1
+// 0x0101efb8: 0x101efb8: addiu a0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0101efac: 0x101efac: sll   a0, a0, 5
+// 0x0101efbc: 0x101efbc: sll   a0, a0, 5
 	ldloc.1
 	ldc.i4.5
 	shl
 	stloc.1
-// 0x0101efb0: 0x101efb0: jal   0x101db84 addu  a0, s1, a0
+// 0x0101efc0: 0x101efc0: jal   0x101db94 addu  a0, s1, a0
 	ldloc 9
 	ldloc.1
 	add
@@ -6904,24 +6904,24 @@ L_101ef38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_position_101db84(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_position_101db94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_101efb8:
-// 0x0101efb8: 0x101efb8: addiu s2, s2, 1
+L_101efc8:
+// 0x0101efc8: 0x101efc8: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0101efbc: 0x101efbc: addiu s0, s0, 96
+// 0x0101efcc: 0x101efcc: addiu s0, s0, 96
 	ldloc 7
 	ldc.i4.s 96
 	add
 	stloc 7
-L_101efc0:
-// 0x0101efc0: 0x101efc0: lw    v0, -14(s0)
+L_101efd0:
+// 0x0101efd0: 0x101efd0: lw    v0, -14(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.s -14
@@ -6930,19 +6930,19 @@ L_101efc0:
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0101efc4: 0x101efc4: sll   zero, zero, 0
-// 0x0101efc8: 0x101efc8: bne   v0, zero, 0x101ef38 mult  s2, s5
+// 0x0101efd4: 0x101efd4: sll   zero, zero, 0
+// 0x0101efd8: 0x101efd8: bne   v0, zero, 0x101ef48 mult  s2, s5
 	ldloc 6
 	ldloc 10
 	ldloc 15
 	mul
 	stloc 16
-	brtrue L_101ef38
+	brtrue L_101ef48
 // --- basic block ---
-// 0x0101efd0: 0x101efd0: lui   a0, 0x10000
+// 0x0101efe0: 0x101efe0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101efd4: 0x101efd4: jal   0x101de54 addiu a0, a0, -31052
+// 0x0101efe4: 0x101efe4: jal   0x101de64 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -6952,28 +6952,28 @@ L_101efc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101efdc: 0x101efdc: lui   a0, 0x0
+// 0x0101efec: 0x101efec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101efe0: 0x101efe0: addiu a0, a0, 5980
+// 0x0101eff0: 0x101eff0: addiu a0, a0, 5980
 	ldloc.1
 	ldc.i4 5980
 	add
 	stloc.1
-// 0x0101efe4: 0x101efe4: lui   s0, 0x30000
+// 0x0101eff4: 0x101eff4: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101efe8: 0x101efe8: jal   0x100e348 sw    v0, 28176(s0)
+// 0x0101eff8: 0x101eff8: jal   0x100e358 sw    v0, 28640(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldloc 6
 	stelem.i4
@@ -6982,12 +6982,12 @@ L_101efc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101eff0: 0x101eff0: jal   0x101de54 addu  a0, v0, zero
+// 0x0101f000: 0x101f000: jal   0x101de64 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6995,26 +6995,26 @@ L_101efc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101eff8: 0x101eff8: bne   v0, zero, 0x101f004 sll   zero, zero, 0
+// 0x0101f008: 0x101f008: bne   v0, zero, 0x101f014 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101f004
+	brtrue L_101f014
 // --- basic block ---
-// 0x0101f000: 0x101f000: lw    v0, 28176(s0)
+// 0x0101f010: 0x101f010: lw    v0, 28640(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldelem.i4
 	stloc 6
-L_101f004:
-// 0x0101f004: 0x101f004: jal   0x101ebdc addu  a0, v0, zero
+L_101f014:
+// 0x0101f014: 0x101f014: jal   0x101ebec addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -7022,19 +7022,19 @@ L_101f004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_point_focus_101ebdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_point_focus_101ebec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0101f00c: 0x101f00c: lw    ra, 52(sp)
-// 0x0101f010: 0x101f010: addiu v1, zero, 1
+// 0x0101f01c: 0x101f01c: lw    ra, 52(sp)
+// 0x0101f020: 0x101f020: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0101f014: 0x101f014: lui   v0, 0x0
+// 0x0101f024: 0x101f024: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0101f018: 0x101f018: lw    s7, 48(sp)
+// 0x0101f028: 0x101f028: lw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7043,7 +7043,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101f01c: 0x101f01c: lw    s6, 44(sp)
+// 0x0101f02c: 0x101f02c: lw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7052,7 +7052,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101f020: 0x101f020: lw    s5, 40(sp)
+// 0x0101f030: 0x101f030: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7061,7 +7061,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0101f024: 0x101f024: lw    s4, 36(sp)
+// 0x0101f034: 0x101f034: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7070,7 +7070,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101f028: 0x101f028: lw    s3, 32(sp)
+// 0x0101f038: 0x101f038: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7079,7 +7079,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101f02c: 0x101f02c: lw    s2, 28(sp)
+// 0x0101f03c: 0x101f03c: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7088,7 +7088,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101f030: 0x101f030: lw    s1, 24(sp)
+// 0x0101f040: 0x101f040: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7097,7 +7097,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101f034: 0x101f034: lw    s0, 20(sp)
+// 0x0101f044: 0x101f044: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7106,7 +7106,7 @@ L_101f004:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f038: 0x101f038: sw    v1, 6036(v0)
+// 0x0101f048: 0x101f048: sw    v1, 6036(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7115,7 +7115,7 @@ L_101f004:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101f03c: 0x101f03c: jr    ra addiu sp, sp, 56
+// 0x0101f04c: 0x101f04c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl23.j b/converted/Cibyl23.j
index 213f20d..8c39c16 100644
--- a/converted/Cibyl23.j
+++ b/converted/Cibyl23.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl23::.ctor
 
-.method public static int32 roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f044: 0x101f044: addiu sp, sp, -40
+// 0x0101f054: 0x101f054: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101f048: 0x101f048: sw    s1, 32(sp)
+// 0x0101f058: 0x101f058: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -96,7 +96,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101f04c: 0x101f04c: sw    s0, 28(sp)
+// 0x0101f05c: 0x101f05c: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -105,8 +105,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101f050: 0x101f050: sw    ra, 36(sp)
-// 0x0101f054: 0x101f054: jal   0x101de54 addu  s0, a0, zero
+// 0x0101f060: 0x101f060: sw    ra, 36(sp)
+// 0x0101f064: 0x101f064: jal   0x101de64 addu  s0, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -114,40 +114,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f05c: 0x101f05c: bne   v0, zero, 0x101f08c addu  s1, v0, zero
+// 0x0101f06c: 0x101f06c: bne   v0, zero, 0x101f09c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_101f08c
+	brtrue L_101f09c
 // --- basic block ---
-// 0x0101f064: 0x101f064: lui   a1, 0x10000
+// 0x0101f074: 0x101f074: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0101f068: 0x101f068: lui   a3, 0x10000
+// 0x0101f078: 0x101f078: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101f06c: 0x101f06c: addiu a1, a1, -29976
+// 0x0101f07c: 0x101f07c: addiu a1, a1, -29976
 	ldloc.2
 	ldc.i4 -29976
 	add
 	stloc.2
-// 0x0101f070: 0x101f070: addiu a3, a3, -29736
+// 0x0101f080: 0x101f080: addiu a3, a3, -29736
 	ldloc 4
 	ldc.i4 -29736
 	add
 	stloc 4
-// 0x0101f074: 0x101f074: addiu a0, zero, 4
+// 0x0101f084: 0x101f084: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0101f078: 0x101f078: addiu a2, zero, 821
+// 0x0101f088: 0x101f088: addiu a2, zero, 821
 	ldc.i4 821
 	stloc.3
-// 0x0101f07c: 0x101f07c: jal   0x100449c sw    s0, 16(sp)
+// 0x0101f08c: 0x101f08c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -166,88 +166,88 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f084: 0x101f084: j	 0x101f1b8 sll   zero, zero, 0
-	br L_101f1b8
+// 0x0101f094: 0x101f094: j	 0x101f1c8 sll   zero, zero, 0
+	br L_101f1c8
 // --- basic block ---
-L_101f08c:
-// 0x0101f08c: 0x101f08c: lb    v0, 20(v0)
+L_101f09c:
+// 0x0101f09c: 0x101f09c: lb    v0, 20(v0)
 	ldloc 5
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101f090: 0x101f090: sll   zero, zero, 0
-// 0x0101f094: 0x101f094: beq   v0, zero, 0x101f0a4 lui   v0, 0x30000
+// 0x0101f0a0: 0x101f0a0: sll   zero, zero, 0
+// 0x0101f0a4: 0x101f0a4: beq   v0, zero, 0x101f0b4 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_101f0a4
+	brfalse L_101f0b4
 // --- basic block ---
-// 0x0101f09c: 0x101f09c: j	 0x101f1b8 sb    zero, 23(s1)
+// 0x0101f0ac: 0x101f0ac: j	 0x101f1c8 sb    zero, 23(s1)
 	ldloc 8
 	ldc.i4.s 23
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_101f1b8
+	br L_101f1c8
 // --- basic block ---
-L_101f0a4:
-// 0x0101f0a4: 0x101f0a4: lw    v0, 28180(v0)
+L_101f0b4:
+// 0x0101f0b4: 0x101f0b4: lw    v0, 28644(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f0a8: 0x101f0a8: sll   zero, zero, 0
-// 0x0101f0ac: 0x101f0ac: beq   v0, s1, 0x101f0dc lui   v1, 0x30000
+// 0x0101f0b8: 0x101f0b8: sll   zero, zero, 0
+// 0x0101f0bc: 0x101f0bc: beq   v0, s1, 0x101f0ec lui   v1, 0x30000
 	ldloc 5
 	ldloc 8
 	ldc.i4 196608
 	stloc 6
-	beq  L_101f0dc
+	beq  L_101f0ec
 // --- basic block ---
-// 0x0101f0b4: 0x101f0b4: lw    v1, 28192(v1)
+// 0x0101f0c4: 0x101f0c4: lw    v1, 28656(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7048
+	ldc.i4 7164
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f0b8: 0x101f0b8: sll   zero, zero, 0
-// 0x0101f0bc: 0x101f0bc: beq   v1, s1, 0x101f0d4 lui   v1, 0x30000
+// 0x0101f0c8: 0x101f0c8: sll   zero, zero, 0
+// 0x0101f0cc: 0x101f0cc: beq   v1, s1, 0x101f0e4 lui   v1, 0x30000
 	ldloc 6
 	ldloc 8
 	ldc.i4 196608
 	stloc 6
-	beq  L_101f0d4
+	beq  L_101f0e4
 // --- basic block ---
-// 0x0101f0c4: 0x101f0c4: lw    v1, 28184(v1)
+// 0x0101f0d4: 0x101f0d4: lw    v1, 28648(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f0c8: 0x101f0c8: sll   zero, zero, 0
-// 0x0101f0cc: 0x101f0cc: bne   v1, s1, 0x101f10c sll   zero, zero, 0
+// 0x0101f0d8: 0x101f0d8: sll   zero, zero, 0
+// 0x0101f0dc: 0x101f0dc: bne   v1, s1, 0x101f11c sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	bne.un L_101f10c
+	bne.un L_101f11c
 // --- basic block ---
-L_101f0d4:
-// 0x0101f0d4: 0x101f0d4: beq   v0, zero, 0x101f0fc sll   zero, zero, 0
+L_101f0e4:
+// 0x0101f0e4: 0x101f0e4: beq   v0, zero, 0x101f10c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101f0fc
+	brfalse L_101f10c
 // --- basic block ---
-L_101f0dc:
-// 0x0101f0dc: 0x101f0dc: lw    a0, 24(v0)
+L_101f0ec:
+// 0x0101f0ec: 0x101f0ec: lw    a0, 24(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -256,19 +256,19 @@ L_101f0dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f0e0: 0x101f0e0: lui   v1, 0x30000
+// 0x0101f0f0: 0x101f0f0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101f0e4: 0x101f0e4: sw    a0, 28216(v1)
+// 0x0101f0f4: 0x101f0f4: sw    a0, 28680(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7054
+	ldc.i4 7170
 	add
 	ldloc.1
 	stelem.i4
-// 0x0101f0e8: 0x101f0e8: lw    v0, 28(v0)
+// 0x0101f0f8: 0x101f0f8: lw    v0, 28(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -277,12 +277,12 @@ L_101f0dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f0ec: 0x101f0ec: addiu v1, v1, 28216
+// 0x0101f0fc: 0x101f0fc: addiu v1, v1, 28680
 	ldloc 6
-	ldc.i4 28216
+	ldc.i4 28680
 	add
 	stloc 6
-// 0x0101f0f0: 0x101f0f0: sw    v0, 4(v1)
+// 0x0101f100: 0x101f100: sw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -291,53 +291,53 @@ L_101f0dc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101f0f4: 0x101f0f4: lui   v0, 0x30000
+// 0x0101f104: 0x101f104: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f0f8: 0x101f0f8: sw    zero, 28180(v0)
+// 0x0101f108: 0x101f108: sw    zero, 28644(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101f0fc:
-// 0x0101f0fc: 0x101f0fc: lui   v0, 0x30000
+L_101f10c:
+// 0x0101f10c: 0x101f10c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f100: 0x101f100: sw    zero, 28192(v0)
+// 0x0101f110: 0x101f110: sw    zero, 28656(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7048
+	ldc.i4 7164
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101f104: 0x101f104: lui   v0, 0x30000
+// 0x0101f114: 0x101f114: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f108: 0x101f108: sw    zero, 28184(v0)
+// 0x0101f118: 0x101f118: sw    zero, 28648(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101f10c:
-// 0x0101f10c: 0x101f10c: lui   v0, 0xe0000
+L_101f11c:
+// 0x0101f11c: 0x101f11c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0101f110: 0x101f110: addiu v0, v0, 29604
+// 0x0101f120: 0x101f120: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x0101f114: 0x101f114: lw    v1, 24(s1)
+// 0x0101f124: 0x101f124: lw    v1, 24(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -346,7 +346,7 @@ L_101f10c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f118: 0x101f118: lw    a0, 56(v0)
+// 0x0101f128: 0x101f128: lw    a0, 56(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -355,17 +355,17 @@ L_101f10c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f11c: 0x101f11c: sll   zero, zero, 0
-// 0x0101f120: 0x101f120: slt   a0, a0, v1
+// 0x0101f12c: 0x101f12c: sll   zero, zero, 0
+// 0x0101f130: 0x101f130: slt   a0, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0101f124: 0x101f124: bne   a0, zero, 0x101f16c sll   zero, zero, 0
+// 0x0101f134: 0x101f134: bne   a0, zero, 0x101f17c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_101f16c
+	brtrue L_101f17c
 // --- basic block ---
-// 0x0101f12c: 0x101f12c: lw    a0, 64(v0)
+// 0x0101f13c: 0x101f13c: lw    a0, 64(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -374,17 +374,17 @@ L_101f10c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f130: 0x101f130: sll   zero, zero, 0
-// 0x0101f134: 0x101f134: slt   v1, v1, a0
+// 0x0101f140: 0x101f140: sll   zero, zero, 0
+// 0x0101f144: 0x101f144: slt   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x0101f138: 0x101f138: bne   v1, zero, 0x101f16c sll   zero, zero, 0
+// 0x0101f148: 0x101f148: bne   v1, zero, 0x101f17c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101f16c
+	brtrue L_101f17c
 // --- basic block ---
-// 0x0101f140: 0x101f140: lw    v1, 28(s1)
+// 0x0101f150: 0x101f150: lw    v1, 28(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -393,7 +393,7 @@ L_101f10c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f144: 0x101f144: lw    a0, 60(v0)
+// 0x0101f154: 0x101f154: lw    a0, 60(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -402,17 +402,17 @@ L_101f10c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f148: 0x101f148: sll   zero, zero, 0
-// 0x0101f14c: 0x101f14c: slt   a0, a0, v1
+// 0x0101f158: 0x101f158: sll   zero, zero, 0
+// 0x0101f15c: 0x101f15c: slt   a0, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0101f150: 0x101f150: bne   a0, zero, 0x101f16c sll   zero, zero, 0
+// 0x0101f160: 0x101f160: bne   a0, zero, 0x101f17c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_101f16c
+	brtrue L_101f17c
 // --- basic block ---
-// 0x0101f158: 0x101f158: lw    v0, 68(v0)
+// 0x0101f168: 0x101f168: lw    v0, 68(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -421,30 +421,30 @@ L_101f10c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f15c: 0x101f15c: sll   zero, zero, 0
-// 0x0101f160: 0x101f160: slt   v1, v1, v0
+// 0x0101f16c: 0x101f16c: sll   zero, zero, 0
+// 0x0101f170: 0x101f170: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x0101f164: 0x101f164: beq   v1, zero, 0x101f1ac addiu v1, zero, 1
+// 0x0101f174: 0x101f174: beq   v1, zero, 0x101f1bc addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brfalse L_101f1ac
+	brfalse L_101f1bc
 // --- basic block ---
-L_101f16c:
-// 0x0101f16c: 0x101f16c: jal   0x1015bf8 addu  a0, s1, zero
+L_101f17c:
+// 0x0101f17c: 0x101f17c: jal   0x1015c08 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl16::roadmap_list_remove_1015bf8(int32,int32)
+	call int32 Cibyl16::roadmap_list_remove_1015c08(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f174: 0x101f174: lw    a0, 8(s1)
+// 0x0101f184: 0x101f184: lw    a0, 8(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -453,7 +453,7 @@ L_101f16c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f178: 0x101f178: jal   0x1000930 sll   zero, zero, 0
+// 0x0101f188: 0x101f188: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -464,7 +464,7 @@ L_101f16c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f180: 0x101f180: lw    a0, 12(s1)
+// 0x0101f190: 0x101f190: lw    a0, 12(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -473,7 +473,7 @@ L_101f16c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f184: 0x101f184: jal   0x1000930 sll   zero, zero, 0
+// 0x0101f194: 0x101f194: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -484,7 +484,7 @@ L_101f16c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f18c: 0x101f18c: jal   0x1000930 addu  a0, s1, zero
+// 0x0101f19c: 0x101f19c: jal   0x1000930 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -497,18 +497,18 @@ L_101f16c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f194: 0x101f194: addiu v1, zero, 1
+// 0x0101f1a4: 0x101f1a4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0101f198: 0x101f198: lui   v0, 0x30000
+// 0x0101f1a8: 0x101f1a8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f19c: 0x101f19c: jal   0x102146c sw    v1, 28196(v0)
+// 0x0101f1ac: 0x101f1ac: jal   0x102147c sw    v1, 28660(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7049
+	ldc.i4 7165
 	add
 	ldloc 6
 	stelem.i4
@@ -517,19 +517,19 @@ L_101f16c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f1a4: 0x101f1a4: j	 0x101f1b8 sll   zero, zero, 0
-	br L_101f1b8
+// 0x0101f1b4: 0x101f1b4: j	 0x101f1c8 sll   zero, zero, 0
+	br L_101f1c8
 // --- basic block ---
-L_101f1ac:
-// 0x0101f1ac: 0x101f1ac: lui   v0, 0x0
+L_101f1bc:
+// 0x0101f1bc: 0x101f1bc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101f1b0: 0x101f1b0: j	 0x101f16c sw    v1, 6028(v0)
+// 0x0101f1c0: 0x101f1c0: j	 0x101f17c sw    v1, 6028(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -538,11 +538,11 @@ L_101f1ac:
 	add
 	ldloc 6
 	stelem.i4
-	br L_101f16c
+	br L_101f17c
 // --- basic block ---
-L_101f1b8:
-// 0x0101f1b8: 0x101f1b8: lw    ra, 36(sp)
-// 0x0101f1bc: 0x101f1bc: lw    s1, 32(sp)
+L_101f1c8:
+// 0x0101f1c8: 0x101f1c8: lw    ra, 36(sp)
+// 0x0101f1cc: 0x101f1cc: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -551,7 +551,7 @@ L_101f1b8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101f1c0: 0x101f1c0: lw    s0, 28(sp)
+// 0x0101f1d0: 0x101f1d0: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -560,7 +560,7 @@ L_101f1b8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101f1c4: 0x101f1c4: jr    ra addiu sp, sp, 40
+// 0x0101f1d4: 0x101f1d4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -572,7 +572,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_copy_focus_101f1cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_copy_focus_101f1dc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -610,12 +610,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f1cc: 0x101f1cc: addiu sp, sp, -24
+// 0x0101f1dc: 0x101f1dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101f1d0: 0x101f1d0: sw    s0, 16(sp)
+// 0x0101f1e0: 0x101f1e0: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -624,47 +624,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101f1d4: 0x101f1d4: sw    ra, 20(sp)
-// 0x0101f1d8: 0x101f1d8: jal   0x101de54 sll   zero, zero, 0
+// 0x0101f1e4: 0x101f1e4: sw    ra, 20(sp)
+// 0x0101f1e8: 0x101f1e8: jal   0x101de64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101f1e0: 0x101f1e0: beq   v0, zero, 0x101f264 addu  s0, v0, zero
+// 0x0101f1f0: 0x101f1f0: beq   v0, zero, 0x101f274 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 6
-	brfalse L_101f264
+	brfalse L_101f274
 // --- basic block ---
-// 0x0101f1e8: 0x101f1e8: lui   v0, 0x30000
+// 0x0101f1f8: 0x101f1f8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f1ec: 0x101f1ec: lw    a1, 28180(v0)
+// 0x0101f1fc: 0x101f1fc: lw    a1, 28644(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101f1f0: 0x101f1f0: sll   zero, zero, 0
-// 0x0101f1f4: 0x101f1f4: beq   a1, zero, 0x101f264 sll   zero, zero, 0
+// 0x0101f200: 0x101f200: sll   zero, zero, 0
+// 0x0101f204: 0x101f204: beq   a1, zero, 0x101f274 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_101f264
+	brfalse L_101f274
 // --- basic block ---
-// 0x0101f1fc: 0x101f1fc: beq   s0, a1, 0x101f264 sll   zero, zero, 0
+// 0x0101f20c: 0x101f20c: beq   s0, a1, 0x101f274 sll   zero, zero, 0
 	ldloc 6
 	ldloc.2
-	beq  L_101f264
+	beq  L_101f274
 // --- basic block ---
-// 0x0101f204: 0x101f204: lw    v0, 24(a1)
+// 0x0101f214: 0x101f214: lw    v0, 24(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -673,13 +673,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f208: 0x101f208: lbu   v1, 23(a1)
+// 0x0101f218: 0x101f218: lbu   v1, 23(a1)
 	ldloc.2
 	ldc.i4.s 23
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 8
-// 0x0101f20c: 0x101f20c: sw    v0, 24(s0)
+// 0x0101f21c: 0x101f21c: sw    v0, 24(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -688,7 +688,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101f210: 0x101f210: lw    v0, 28(a1)
+// 0x0101f220: 0x101f220: lw    v0, 28(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -697,13 +697,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f214: 0x101f214: sb    v1, 23(s0)
+// 0x0101f224: 0x101f224: sb    v1, 23(s0)
 	ldloc 6
 	ldc.i4.s 23
 	add
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101f218: 0x101f218: sw    v0, 28(s0)
+// 0x0101f228: 0x101f228: sw    v0, 28(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -712,17 +712,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101f21c: 0x101f21c: addiu a1, a1, 32
+// 0x0101f22c: 0x101f22c: addiu a1, a1, 32
 	ldloc.2
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0101f220: 0x101f220: addiu a0, s0, 32
+// 0x0101f230: 0x101f230: addiu a0, s0, 32
 	ldloc 6
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0101f224: 0x101f224: jal   0x1001800 addiu a2, zero, 20
+// 0x0101f234: 0x101f234: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -734,34 +734,34 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101f22c: 0x101f22c: lb    v0, 20(s0)
+// 0x0101f23c: 0x101f23c: lb    v0, 20(s0)
 	ldloc 6
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101f230: 0x101f230: sll   zero, zero, 0
-// 0x0101f234: 0x101f234: beq   v0, zero, 0x101f264 sll   zero, zero, 0
+// 0x0101f240: 0x101f240: sll   zero, zero, 0
+// 0x0101f244: 0x101f244: beq   v0, zero, 0x101f274 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101f264
+	brfalse L_101f274
 // --- basic block ---
-// 0x0101f23c: 0x101f23c: lb    v0, 22(s0)
+// 0x0101f24c: 0x101f24c: lb    v0, 22(s0)
 	ldloc 6
 	ldc.i4.s 22
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101f240: 0x101f240: sll   zero, zero, 0
-// 0x0101f244: 0x101f244: bne   v0, zero, 0x101f264 sll   zero, zero, 0
+// 0x0101f250: 0x101f250: sll   zero, zero, 0
+// 0x0101f254: 0x101f254: bne   v0, zero, 0x101f274 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101f264
+	brtrue L_101f274
 // --- basic block ---
-// 0x0101f24c: 0x101f24c: addiu a0, s0, 52
+// 0x0101f25c: 0x101f25c: addiu a0, s0, 52
 	ldloc 6
 	ldc.i4.s 52
 	add
 	stloc.1
-// 0x0101f250: 0x101f250: jal   0x100e50c addiu a1, s0, 24
+// 0x0101f260: 0x101f260: jal   0x100e51c addiu a1, s0, 24
 	ldloc 6
 	ldc.i4.s 24
 	add
@@ -771,12 +771,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_position_100e50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_position_100e51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101f258: 0x101f258: lw    a1, 48(s0)
+// 0x0101f268: 0x101f268: lw    a1, 48(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -785,7 +785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101f25c: 0x101f25c: jal   0x100e610 addiu a0, s0, 68
+// 0x0101f26c: 0x101f26c: jal   0x100e620 addiu a0, s0, 68
 	ldloc 6
 	ldc.i4.s 68
 	add
@@ -795,14 +795,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_101f264:
-// 0x0101f264: 0x101f264: lw    ra, 20(sp)
-// 0x0101f268: 0x101f268: lw    s0, 16(sp)
+L_101f274:
+// 0x0101f274: 0x101f274: lw    ra, 20(sp)
+// 0x0101f278: 0x101f278: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -811,7 +811,7 @@ L_101f264:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f26c: 0x101f26c: jr    ra addiu sp, sp, 24
+// 0x0101f27c: 0x101f27c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -823,7 +823,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_update_101f274(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_update_101f284(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s2,int32 s0,int32 s1,int32 s3,int32 s5,int32 s6,int32 ra)
@@ -879,12 +879,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f274: 0x101f274: addiu sp, sp, -80
+// 0x0101f284: 0x101f284: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0101f278: 0x101f278: sw    s0, 48(sp)
+// 0x0101f288: 0x101f288: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -893,13 +893,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101f27c: 0x101f27c: addu  s0, a1, zero
+// 0x0101f28c: 0x101f28c: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0101f280: 0x101f280: addiu a1, zero, 44
+// 0x0101f290: 0x101f290: addiu a1, zero, 44
 	ldc.i4.s 44
 	stloc.2
-// 0x0101f284: 0x101f284: sw    s6, 72(sp)
+// 0x0101f294: 0x101f294: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -908,7 +908,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0101f288: 0x101f288: sw    s5, 68(sp)
+// 0x0101f298: 0x101f298: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -917,7 +917,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101f28c: 0x101f28c: sw    s3, 60(sp)
+// 0x0101f29c: 0x101f29c: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -926,7 +926,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0101f290: 0x101f290: sw    s1, 52(sp)
+// 0x0101f2a0: 0x101f2a0: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -935,8 +935,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101f294: 0x101f294: sw    ra, 76(sp)
-// 0x0101f298: 0x101f298: sw    s4, 64(sp)
+// 0x0101f2a4: 0x101f2a4: sw    ra, 76(sp)
+// 0x0101f2a8: 0x101f2a8: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -945,7 +945,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101f29c: 0x101f29c: sw    s2, 56(sp)
+// 0x0101f2ac: 0x101f2ac: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -954,13 +954,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101f2a0: 0x101f2a0: addu  s1, a2, zero
+// 0x0101f2b0: 0x101f2b0: addu  s1, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0101f2a4: 0x101f2a4: addu  s6, a3, zero
+// 0x0101f2b4: 0x101f2b4: addu  s6, a3, zero
 	ldloc 4
 	stloc 14
-// 0x0101f2a8: 0x101f2a8: lw    s3, 96(sp)
+// 0x0101f2b8: 0x101f2b8: lw    s3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -969,7 +969,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101f2ac: 0x101f2ac: jal   0x1001a5c addu  s5, a0, zero
+// 0x0101f2bc: 0x101f2bc: jal   0x1001a5c addu  s5, a0, zero
 	ldloc.1
 	stloc 13
 	ldloc.1
@@ -979,11 +979,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f2b4: 0x101f2b4: beq   v0, zero, 0x101f32c sll   zero, zero, 0
+// 0x0101f2c4: 0x101f2c4: beq   v0, zero, 0x101f33c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101f32c
+	brfalse L_101f33c
 // --- basic block ---
-// 0x0101f2bc: 0x101f2bc: jal   0x1001ba8 addu  a0, s5, zero
+// 0x0101f2cc: 0x101f2cc: jal   0x1001ba8 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -996,70 +996,70 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f2c4: 0x101f2c4: addu  s2, v0, zero
+// 0x0101f2d4: 0x101f2d4: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0101f2c8: 0x101f2c8: addu  v1, v0, zero
+// 0x0101f2d8: 0x101f2d8: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0101f2cc: 0x101f2cc: j	 0x101f2f0 addiu a1, zero, 44
+// 0x0101f2dc: 0x101f2dc: j	 0x101f300 addiu a1, zero, 44
 	ldc.i4.s 44
 	stloc.2
-	br L_101f2f0
+	br L_101f300
 // --- basic block ---
-L_101f2d4:
-// 0x0101f2d4: 0x101f2d4: beq   a0, a1, 0x101f2ec sll   zero, zero, 0
+L_101f2e4:
+// 0x0101f2e4: 0x101f2e4: beq   a0, a1, 0x101f2fc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	beq  L_101f2ec
+	beq  L_101f2fc
 // --- basic block ---
-// 0x0101f2dc: 0x101f2dc: beq   v0, v1, 0x101f2e8 sll   zero, zero, 0
+// 0x0101f2ec: 0x101f2ec: beq   v0, v1, 0x101f2f8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_101f2e8
+	beq  L_101f2f8
 // --- basic block ---
-// 0x0101f2e4: 0x101f2e4: sb    a0, 0(v0)
+// 0x0101f2f4: 0x101f2f4: sb    a0, 0(v0)
 	ldloc 5
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_101f2e8:
-// 0x0101f2e8: 0x101f2e8: addiu v0, v0, 1
+L_101f2f8:
+// 0x0101f2f8: 0x101f2f8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_101f2ec:
-// 0x0101f2ec: 0x101f2ec: addiu v1, v1, 1
+L_101f2fc:
+// 0x0101f2fc: 0x101f2fc: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_101f2f0:
-// 0x0101f2f0: 0x101f2f0: lb    a0, 0(v1)
+L_101f300:
+// 0x0101f300: 0x101f300: lb    a0, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0101f2f4: 0x101f2f4: sll   zero, zero, 0
-// 0x0101f2f8: 0x101f2f8: bne   a0, zero, 0x101f2d4 addu  a2, s1, zero
+// 0x0101f304: 0x101f304: sll   zero, zero, 0
+// 0x0101f308: 0x101f308: bne   a0, zero, 0x101f2e4 addu  a2, s1, zero
 	ldloc.1
 	ldloc 11
 	stloc.3
-	brtrue L_101f2d4
+	brtrue L_101f2e4
 // --- basic block ---
-// 0x0101f300: 0x101f300: addu  a0, s2, zero
+// 0x0101f310: 0x101f310: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0101f304: 0x101f304: addu  a1, s0, zero
+// 0x0101f314: 0x101f314: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0101f308: 0x101f308: addu  a3, s6, zero
+// 0x0101f318: 0x101f318: addu  a3, s6, zero
 	ldloc 14
 	stloc 4
-// 0x0101f30c: 0x101f30c: sb    zero, 0(v0)
+// 0x0101f31c: 0x101f31c: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101f310: 0x101f310: jal   0x101f274 sw    s3, 16(sp)
+// 0x0101f320: 0x101f320: jal   0x101f284 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1073,15 +1073,15 @@ L_101f2f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_update_101f274(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_update_101f284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f318: 0x101f318: addu  a0, s2, zero
+// 0x0101f328: 0x101f328: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0101f31c: 0x101f31c: jal   0x1000930 addu  s4, v0, zero
+// 0x0101f32c: 0x101f32c: jal   0x1000930 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1094,11 +1094,11 @@ L_101f2f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f324: 0x101f324: j	 0x101f570 sll   zero, zero, 0
-	br L_101f570
+// 0x0101f334: 0x101f334: j	 0x101f580 sll   zero, zero, 0
+	br L_101f580
 // --- basic block ---
-L_101f32c:
-// 0x0101f32c: 0x101f32c: jal   0x101de54 addu  a0, s5, zero
+L_101f33c:
+// 0x0101f33c: 0x101f33c: jal   0x101de64 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -1106,18 +1106,18 @@ L_101f32c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f334: 0x101f334: bne   v0, zero, 0x101f434 addu  s4, v0, zero
+// 0x0101f344: 0x101f344: bne   v0, zero, 0x101f444 addu  s4, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_101f434
+	brtrue L_101f444
 // --- basic block ---
-// 0x0101f33c: 0x101f33c: jal   0x1000910 addiu a0, zero, 96
+// 0x0101f34c: 0x101f34c: jal   0x1000910 addiu a0, zero, 96
 	ldc.i4.s 96
 	stloc.1
 	ldloc.0
@@ -1130,21 +1130,21 @@ L_101f32c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f344: 0x101f344: lui   s4, 0x10000
+// 0x0101f354: 0x101f354: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0101f348: 0x101f348: addiu a1, zero, 243
+// 0x0101f358: 0x101f358: addiu a1, zero, 243
 	ldc.i4 243
 	stloc.2
-// 0x0101f34c: 0x101f34c: addu  a2, v0, zero
+// 0x0101f35c: 0x101f35c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101f350: 0x101f350: addiu a0, s4, -29976
+// 0x0101f360: 0x101f360: addiu a0, s4, -29976
 	ldloc 8
 	ldc.i4 -29976
 	add
 	stloc.1
-// 0x0101f354: 0x101f354: jal   0x1004a38 addu  s2, v0, zero
+// 0x0101f364: 0x101f364: jal   0x1004a48 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -1152,12 +1152,12 @@ L_101f32c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f35c: 0x101f35c: jal   0x1001ba8 addu  a0, s5, zero
+// 0x0101f36c: 0x101f36c: jal   0x1001ba8 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -1170,18 +1170,18 @@ L_101f32c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f364: 0x101f364: addu  a2, v0, zero
+// 0x0101f374: 0x101f374: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0101f368: 0x101f368: addiu a0, s4, -29976
+// 0x0101f378: 0x101f378: addiu a0, s4, -29976
 	ldloc 8
 	ldc.i4 -29976
 	add
 	stloc.1
-// 0x0101f36c: 0x101f36c: addiu a1, zero, 246
+// 0x0101f37c: 0x101f37c: addiu a1, zero, 246
 	ldc.i4 246
 	stloc.2
-// 0x0101f370: 0x101f370: jal   0x1004a38 sw    v0, 8(s2)
+// 0x0101f380: 0x101f380: jal   0x1004a48 sw    v0, 8(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1195,24 +1195,24 @@ L_101f32c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f378: 0x101f378: addiu v0, zero, 1
+// 0x0101f388: 0x101f388: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101f37c: 0x101f37c: addu  a0, s6, zero
+// 0x0101f38c: 0x101f38c: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x0101f380: 0x101f380: sb    v0, 22(s2)
+// 0x0101f390: 0x101f390: sb    v0, 22(s2)
 	ldloc 9
 	ldc.i4.s 22
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101f384: 0x101f384: jal   0x1001ba8 sb    zero, 20(s2)
+// 0x0101f394: 0x101f394: jal   0x1001ba8 sb    zero, 20(s2)
 	ldloc 9
 	ldc.i4.s 20
 	add
@@ -1228,12 +1228,12 @@ L_101f32c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f38c: 0x101f38c: sltu  v1, zero, s1
+// 0x0101f39c: 0x101f39c: sltu  v1, zero, s1
 	ldc.i4.s 0
 	ldloc 11
 	clt.un
 	stloc 7
-// 0x0101f390: 0x101f390: sw    v0, 12(s2)
+// 0x0101f3a0: 0x101f3a0: sw    v0, 12(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1242,19 +1242,19 @@ L_101f32c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101f394: 0x101f394: sb    v1, 21(s2)
+// 0x0101f3a4: 0x101f3a4: sb    v1, 21(s2)
 	ldloc 9
 	ldc.i4.s 21
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101f398: 0x101f398: beq   s3, zero, 0x101f3b0 addu  s4, s2, zero
+// 0x0101f3a8: 0x101f3a8: beq   s3, zero, 0x101f3c0 addu  s4, s2, zero
 	ldloc 12
 	ldloc 9
 	stloc 8
-	brfalse L_101f3b0
+	brfalse L_101f3c0
 // --- basic block ---
-// 0x0101f3a0: 0x101f3a0: jal   0x1001ba8 addu  a0, s3, zero
+// 0x0101f3b0: 0x101f3b0: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -1267,7 +1267,7 @@ L_101f32c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f3a8: 0x101f3a8: j	 0x101f3b4 sw    v0, 16(s2)
+// 0x0101f3b8: 0x101f3b8: j	 0x101f3c4 sw    v0, 16(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1276,10 +1276,10 @@ L_101f32c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_101f3b4
+	br L_101f3c4
 // --- basic block ---
-L_101f3b0:
-// 0x0101f3b0: 0x101f3b0: sw    zero, 16(s2)
+L_101f3c0:
+// 0x0101f3c0: 0x101f3c0: sw    zero, 16(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1288,23 +1288,23 @@ L_101f3b0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101f3b4:
-// 0x0101f3b4: 0x101f3b4: lui   v0, 0xe0000
+L_101f3c4:
+// 0x0101f3c4: 0x101f3c4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0101f3b8: 0x101f3b8: addiu v0, v0, 29604
+// 0x0101f3c8: 0x101f3c8: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x0101f3bc: 0x101f3bc: lw    v1, 0(s0)
+// 0x0101f3cc: 0x101f3cc: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101f3c0: 0x101f3c0: lw    a0, 56(v0)
+// 0x0101f3d0: 0x101f3d0: lw    a0, 56(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1313,17 +1313,17 @@ L_101f3b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f3c4: 0x101f3c4: sll   zero, zero, 0
-// 0x0101f3c8: 0x101f3c8: slt   a0, a0, v1
+// 0x0101f3d4: 0x101f3d4: sll   zero, zero, 0
+// 0x0101f3d8: 0x101f3d8: slt   a0, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc.1
-// 0x0101f3cc: 0x101f3cc: bne   a0, zero, 0x101f414 sll   zero, zero, 0
+// 0x0101f3dc: 0x101f3dc: bne   a0, zero, 0x101f424 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_101f414
+	brtrue L_101f424
 // --- basic block ---
-// 0x0101f3d4: 0x101f3d4: lw    a0, 64(v0)
+// 0x0101f3e4: 0x101f3e4: lw    a0, 64(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1332,17 +1332,17 @@ L_101f3b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f3d8: 0x101f3d8: sll   zero, zero, 0
-// 0x0101f3dc: 0x101f3dc: slt   v1, v1, a0
+// 0x0101f3e8: 0x101f3e8: sll   zero, zero, 0
+// 0x0101f3ec: 0x101f3ec: slt   v1, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x0101f3e0: 0x101f3e0: bne   v1, zero, 0x101f414 sll   zero, zero, 0
+// 0x0101f3f0: 0x101f3f0: bne   v1, zero, 0x101f424 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_101f414
+	brtrue L_101f424
 // --- basic block ---
-// 0x0101f3e8: 0x101f3e8: lw    v1, 4(s0)
+// 0x0101f3f8: 0x101f3f8: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1351,7 +1351,7 @@ L_101f3b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f3ec: 0x101f3ec: lw    a0, 60(v0)
+// 0x0101f3fc: 0x101f3fc: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1360,17 +1360,17 @@ L_101f3b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f3f0: 0x101f3f0: sll   zero, zero, 0
-// 0x0101f3f4: 0x101f3f4: slt   a0, a0, v1
+// 0x0101f400: 0x101f400: sll   zero, zero, 0
+// 0x0101f404: 0x101f404: slt   a0, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc.1
-// 0x0101f3f8: 0x101f3f8: bne   a0, zero, 0x101f414 sll   zero, zero, 0
+// 0x0101f408: 0x101f408: bne   a0, zero, 0x101f424 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_101f414
+	brtrue L_101f424
 // --- basic block ---
-// 0x0101f400: 0x101f400: lw    v0, 68(v0)
+// 0x0101f410: 0x101f410: lw    v0, 68(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1379,58 +1379,58 @@ L_101f3b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f404: 0x101f404: sll   zero, zero, 0
-// 0x0101f408: 0x101f408: slt   v1, v1, v0
+// 0x0101f414: 0x101f414: sll   zero, zero, 0
+// 0x0101f418: 0x101f418: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x0101f40c: 0x101f40c: beq   v1, zero, 0x101f59c addiu v1, zero, 1
+// 0x0101f41c: 0x101f41c: beq   v1, zero, 0x101f5ac addiu v1, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 7
-	brfalse L_101f59c
+	brfalse L_101f5ac
 // --- basic block ---
-L_101f414:
-// 0x0101f414: 0x101f414: lui   v0, 0x30000
+L_101f424:
+// 0x0101f424: 0x101f424: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f418: 0x101f418: lw    a1, 28212(v0)
+// 0x0101f428: 0x101f428: lw    a1, 28676(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7053
+	ldc.i4 7169
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101f41c: 0x101f41c: jal   0x1015bdc addu  a0, s2, zero
+// 0x0101f42c: 0x101f42c: jal   0x1015bec addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl16::roadmap_list_enqueue_1015bdc(int32,int32)
+	call int32 Cibyl16::roadmap_list_enqueue_1015bec(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0101f424: 0x101f424: addiu v1, zero, 1
+// 0x0101f434: 0x101f434: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0101f428: 0x101f428: lui   v0, 0x30000
+// 0x0101f438: 0x101f438: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f42c: 0x101f42c: j	 0x101f4c4 sw    v1, 28196(v0)
+// 0x0101f43c: 0x101f43c: j	 0x101f4d4 sw    v1, 28660(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7049
+	ldc.i4 7165
 	add
 	ldloc 7
 	stelem.i4
-	br L_101f4c4
+	br L_101f4d4
 // --- basic block ---
-L_101f434:
-// 0x0101f434: 0x101f434: lw    v1, 28(v0)
+L_101f444:
+// 0x0101f444: 0x101f444: lw    v1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1439,7 +1439,7 @@ L_101f434:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f438: 0x101f438: lw    v0, 4(s0)
+// 0x0101f448: 0x101f448: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1448,15 +1448,15 @@ L_101f434:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f43c: 0x101f43c: sll   zero, zero, 0
-// 0x0101f440: 0x101f440: bne   v1, v0, 0x101f45c addu  a0, s0, zero
+// 0x0101f44c: 0x101f44c: sll   zero, zero, 0
+// 0x0101f450: 0x101f450: bne   v1, v0, 0x101f46c addu  a0, s0, zero
 	ldloc 7
 	ldloc 5
 	ldloc 10
 	stloc.1
-	bne.un L_101f45c
+	bne.un L_101f46c
 // --- basic block ---
-// 0x0101f448: 0x101f448: lw    v1, 24(s4)
+// 0x0101f458: 0x101f458: lw    v1, 24(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1465,21 +1465,21 @@ L_101f434:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f44c: 0x101f44c: lw    v0, 0(s0)
+// 0x0101f45c: 0x101f45c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0101f450: 0x101f450: sll   zero, zero, 0
-// 0x0101f454: 0x101f454: beq   v1, v0, 0x101f4c4 sll   zero, zero, 0
+// 0x0101f460: 0x101f460: sll   zero, zero, 0
+// 0x0101f464: 0x101f464: beq   v1, v0, 0x101f4d4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_101f4c4
+	beq  L_101f4d4
 // --- basic block ---
-L_101f45c:
-// 0x0101f45c: 0x101f45c: jal   0x101dc40 addiu a1, sp, 24
+L_101f46c:
+// 0x0101f46c: 0x101f46c: jal   0x101dc50 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1488,17 +1488,17 @@ L_101f45c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_trip_coordinate_101dc40(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_trip_coordinate_101dc50(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f464: 0x101f464: addiu a0, s4, 24
+// 0x0101f474: 0x101f474: addiu a0, s4, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x0101f468: 0x101f468: jal   0x101dc40 addiu a1, sp, 32
+// 0x0101f478: 0x101f478: jal   0x101dc50 addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1507,12 +1507,12 @@ L_101f45c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_trip_coordinate_101dc40(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_trip_coordinate_101dc50(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f470: 0x101f470: lw    v0, 32(sp)
+// 0x0101f480: 0x101f480: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1521,7 +1521,7 @@ L_101f45c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f474: 0x101f474: lw    v1, 24(sp)
+// 0x0101f484: 0x101f484: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1530,15 +1530,15 @@ L_101f45c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f478: 0x101f478: sll   zero, zero, 0
-// 0x0101f47c: 0x101f47c: bne   v1, v0, 0x101f498 addiu v1, zero, 1
+// 0x0101f488: 0x101f488: sll   zero, zero, 0
+// 0x0101f48c: 0x101f48c: bne   v1, v0, 0x101f4a8 addiu v1, zero, 1
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	bne.un L_101f498
+	bne.un L_101f4a8
 // --- basic block ---
-// 0x0101f484: 0x101f484: lw    v0, 36(sp)
+// 0x0101f494: 0x101f494: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1547,7 +1547,7 @@ L_101f45c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f488: 0x101f488: lw    v1, 28(sp)
+// 0x0101f498: 0x101f498: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1556,19 +1556,19 @@ L_101f45c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f48c: 0x101f48c: sll   zero, zero, 0
-// 0x0101f490: 0x101f490: beq   v1, v0, 0x101f4a0 addiu v1, zero, 1
+// 0x0101f49c: 0x101f49c: sll   zero, zero, 0
+// 0x0101f4a0: 0x101f4a0: beq   v1, v0, 0x101f4b0 addiu v1, zero, 1
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	beq  L_101f4a0
+	beq  L_101f4b0
 // --- basic block ---
-L_101f498:
-// 0x0101f498: 0x101f498: lui   v0, 0x0
+L_101f4a8:
+// 0x0101f4a8: 0x101f4a8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101f49c: 0x101f49c: sw    v1, 6028(v0)
+// 0x0101f4ac: 0x101f4ac: sw    v1, 6028(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1577,42 +1577,42 @@ L_101f498:
 	add
 	ldloc 7
 	stelem.i4
-L_101f4a0:
-// 0x0101f4a0: 0x101f4a0: lui   v0, 0x30000
+L_101f4b0:
+// 0x0101f4b0: 0x101f4b0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f4a4: 0x101f4a4: lw    v1, 28180(v0)
+// 0x0101f4b4: 0x101f4b4: lw    v1, 28644(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7045
+	ldc.i4 7161
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f4a8: 0x101f4a8: lui   a0, 0x30000
+// 0x0101f4b8: 0x101f4b8: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101f4ac: 0x101f4ac: addiu v0, zero, 1
+// 0x0101f4bc: 0x101f4bc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0101f4b0: 0x101f4b0: bne   s4, v1, 0x101f4c0 sw    v0, 28196(a0)
+// 0x0101f4c0: 0x101f4c0: bne   s4, v1, 0x101f4d0 sw    v0, 28660(a0)
 	ldloc 8
 	ldloc 7
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7049
+	ldc.i4 7165
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_101f4c0
+	bne.un L_101f4d0
 // --- basic block ---
-// 0x0101f4b8: 0x101f4b8: lui   v1, 0x0
+// 0x0101f4c8: 0x101f4c8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0101f4bc: 0x101f4bc: sw    v0, 6040(v1)
+// 0x0101f4cc: 0x101f4cc: sw    v0, 6040(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1621,8 +1621,8 @@ L_101f4a0:
 	add
 	ldloc 5
 	stelem.i4
-L_101f4c0:
-// 0x0101f4c0: 0x101f4c0: sw    zero, 84(s4)
+L_101f4d0:
+// 0x0101f4d0: 0x101f4d0: sw    zero, 84(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1631,18 +1631,18 @@ L_101f4c0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101f4c4:
-// 0x0101f4c4: 0x101f4c4: lw    v1, 0(s0)
+L_101f4d4:
+// 0x0101f4d4: 0x101f4d4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101f4c8: 0x101f4c8: addiu v0, zero, -1
+// 0x0101f4d8: 0x101f4d8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0101f4cc: 0x101f4cc: sw    v1, 24(s4)
+// 0x0101f4dc: 0x101f4dc: sw    v1, 24(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1651,7 +1651,7 @@ L_101f4c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101f4d0: 0x101f4d0: lw    v1, 4(s0)
+// 0x0101f4e0: 0x101f4e0: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1660,7 +1660,7 @@ L_101f4c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f4d4: 0x101f4d4: sw    v0, 92(s4)
+// 0x0101f4e4: 0x101f4e4: sw    v0, 92(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1669,7 +1669,7 @@ L_101f4c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101f4d8: 0x101f4d8: sw    v1, 28(s4)
+// 0x0101f4e8: 0x101f4e8: sw    v1, 28(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1678,16 +1678,16 @@ L_101f4c4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101f4dc: 0x101f4dc: addiu v1, zero, 1
+// 0x0101f4ec: 0x101f4ec: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0101f4e0: 0x101f4e0: sb    v1, 23(s4)
+// 0x0101f4f0: 0x101f4f0: sb    v1, 23(s4)
 	ldloc 8
 	ldc.i4.s 23
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0101f4e4: 0x101f4e4: beq   s1, zero, 0x101f504 sw    v0, 88(s4)
+// 0x0101f4f4: 0x101f4f4: beq   s1, zero, 0x101f514 sw    v0, 88(s4)
 	ldloc 11
 	ldloc 6
 	ldloc 8
@@ -1697,17 +1697,17 @@ L_101f4c4:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_101f504
+	brfalse L_101f514
 // --- basic block ---
-// 0x0101f4ec: 0x101f4ec: addu  a1, s1, zero
+// 0x0101f4fc: 0x101f4fc: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0101f4f0: 0x101f4f0: addiu a0, s4, 32
+// 0x0101f500: 0x101f500: addiu a0, s4, 32
 	ldloc 8
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0101f4f4: 0x101f4f4: jal   0x1001800 addiu a2, zero, 20
+// 0x0101f504: 0x101f504: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -1719,11 +1719,11 @@ L_101f4c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f4fc: 0x101f4fc: j	 0x101f50c sll   zero, zero, 0
-	br L_101f50c
+// 0x0101f50c: 0x101f50c: j	 0x101f51c sll   zero, zero, 0
+	br L_101f51c
 // --- basic block ---
-L_101f504:
-// 0x0101f504: 0x101f504: sw    zero, 44(s4)
+L_101f514:
+// 0x0101f514: 0x101f514: sw    zero, 44(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1732,7 +1732,7 @@ L_101f504:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101f508: 0x101f508: sw    zero, 48(s4)
+// 0x0101f518: 0x101f518: sw    zero, 48(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1741,45 +1741,45 @@ L_101f504:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_101f50c:
-// 0x0101f50c: 0x101f50c: lb    v0, 20(s4)
+L_101f51c:
+// 0x0101f51c: 0x101f51c: lb    v0, 20(s4)
 	ldloc 8
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101f510: 0x101f510: sll   zero, zero, 0
-// 0x0101f514: 0x101f514: beq   v0, zero, 0x101f570 sll   zero, zero, 0
+// 0x0101f520: 0x101f520: sll   zero, zero, 0
+// 0x0101f524: 0x101f524: beq   v0, zero, 0x101f580 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101f570
+	brfalse L_101f580
 // --- basic block ---
-// 0x0101f51c: 0x101f51c: lb    v0, 22(s4)
+// 0x0101f52c: 0x101f52c: lb    v0, 22(s4)
 	ldloc 8
 	ldc.i4.s 22
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101f520: 0x101f520: sll   zero, zero, 0
-// 0x0101f524: 0x101f524: bne   v0, zero, 0x101f570 sll   zero, zero, 0
+// 0x0101f530: 0x101f530: sll   zero, zero, 0
+// 0x0101f534: 0x101f534: bne   v0, zero, 0x101f580 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101f570
+	brtrue L_101f580
 // --- basic block ---
-// 0x0101f52c: 0x101f52c: lb    v0, 21(s4)
+// 0x0101f53c: 0x101f53c: lb    v0, 21(s4)
 	ldloc 8
 	ldc.i4.s 21
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0101f530: 0x101f530: sll   zero, zero, 0
-// 0x0101f534: 0x101f534: beq   v0, zero, 0x101f568 addiu a0, s4, 52
+// 0x0101f540: 0x101f540: sll   zero, zero, 0
+// 0x0101f544: 0x101f544: beq   v0, zero, 0x101f578 addiu a0, s4, 52
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 52
 	add
 	stloc.1
-	brfalse L_101f568
+	brfalse L_101f578
 // --- basic block ---
-// 0x0101f53c: 0x101f53c: lw    v0, 32(s4)
+// 0x0101f54c: 0x101f54c: lw    v0, 32(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1788,12 +1788,12 @@ L_101f50c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f540: 0x101f540: addiu a1, sp, 40
+// 0x0101f550: 0x101f550: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x0101f544: 0x101f544: sw    v0, 40(sp)
+// 0x0101f554: 0x101f554: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1802,7 +1802,7 @@ L_101f50c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101f548: 0x101f548: lw    v0, 36(s4)
+// 0x0101f558: 0x101f558: lw    v0, 36(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1811,7 +1811,7 @@ L_101f50c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101f54c: 0x101f54c: jal   0x100e50c sw    v0, 44(sp)
+// 0x0101f55c: 0x101f55c: jal   0x100e51c sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1825,12 +1825,12 @@ L_101f50c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_position_100e50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_position_100e51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f554: 0x101f554: lw    a1, 48(s4)
+// 0x0101f564: 0x101f564: lw    a1, 48(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1839,7 +1839,7 @@ L_101f50c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101f558: 0x101f558: jal   0x100e610 addiu a0, s4, 68
+// 0x0101f568: 0x101f568: jal   0x100e620 addiu a0, s4, 68
 	ldloc 8
 	ldc.i4.s 68
 	add
@@ -1849,16 +1849,16 @@ L_101f50c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101f560: 0x101f560: j	 0x101f570 sll   zero, zero, 0
-	br L_101f570
+// 0x0101f570: 0x101f570: j	 0x101f580 sll   zero, zero, 0
+	br L_101f580
 // --- basic block ---
-L_101f568:
-// 0x0101f568: 0x101f568: jal   0x100e50c addiu a1, s4, 24
+L_101f578:
+// 0x0101f578: 0x101f578: jal   0x100e51c addiu a1, s4, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
@@ -1868,17 +1868,17 @@ L_101f568:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_position_100e50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_position_100e51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101f570:
-// 0x0101f570: 0x101f570: lw    ra, 76(sp)
-// 0x0101f574: 0x101f574: addu  v0, s4, zero
+L_101f580:
+// 0x0101f580: 0x101f580: lw    ra, 76(sp)
+// 0x0101f584: 0x101f584: addu  v0, s4, zero
 	ldloc 8
 	stloc 5
-// 0x0101f578: 0x101f578: lw    s6, 72(sp)
+// 0x0101f588: 0x101f588: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1887,7 +1887,7 @@ L_101f570:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101f57c: 0x101f57c: lw    s5, 68(sp)
+// 0x0101f58c: 0x101f58c: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1896,7 +1896,7 @@ L_101f570:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0101f580: 0x101f580: lw    s4, 64(sp)
+// 0x0101f590: 0x101f590: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1905,7 +1905,7 @@ L_101f570:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101f584: 0x101f584: lw    s3, 60(sp)
+// 0x0101f594: 0x101f594: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1914,7 +1914,7 @@ L_101f570:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101f588: 0x101f588: lw    s2, 56(sp)
+// 0x0101f598: 0x101f598: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1923,7 +1923,7 @@ L_101f570:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101f58c: 0x101f58c: lw    s1, 52(sp)
+// 0x0101f59c: 0x101f59c: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1932,7 +1932,7 @@ L_101f570:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101f590: 0x101f590: lw    s0, 48(sp)
+// 0x0101f5a0: 0x101f5a0: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1941,18 +1941,18 @@ L_101f570:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101f594: 0x101f594: jr    ra addiu sp, sp, 80
+// 0x0101f5a4: 0x101f5a4: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_101f59c:
-// 0x0101f59c: 0x101f59c: lui   v0, 0x0
+L_101f5ac:
+// 0x0101f5ac: 0x101f5ac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0101f5a0: 0x101f5a0: j	 0x101f414 sw    v1, 6028(v0)
+// 0x0101f5b0: 0x101f5b0: j	 0x101f424 sw    v1, 6028(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1961,14 +1961,14 @@ L_101f59c:
 	add
 	ldloc 7
 	stelem.i4
-	br L_101f414
+	br L_101f424
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_trip_set_gps_and_nodes_position_101f5a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_set_gps_and_nodes_position_101f5b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra)
@@ -2015,12 +2015,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f5a8: 0x101f5a8: addiu sp, sp, -64
+// 0x0101f5b8: 0x101f5b8: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0101f5ac: 0x101f5ac: sw    s2, 52(sp)
+// 0x0101f5bc: 0x101f5bc: sw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2029,7 +2029,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101f5b0: 0x101f5b0: sw    s1, 48(sp)
+// 0x0101f5c0: 0x101f5c0: sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2038,15 +2038,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101f5b4: 0x101f5b4: addiu s2, sp, 24
+// 0x0101f5c4: 0x101f5c4: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x0101f5b8: 0x101f5b8: addu  s1, a3, zero
+// 0x0101f5c8: 0x101f5c8: addu  s1, a3, zero
 	ldloc 4
 	stloc 8
-// 0x0101f5bc: 0x101f5bc: sw    s3, 56(sp)
+// 0x0101f5cc: 0x101f5cc: sw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2055,19 +2055,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101f5c0: 0x101f5c0: addu  a3, a1, zero
+// 0x0101f5d0: 0x101f5d0: addu  a3, a1, zero
 	ldloc.2
 	stloc 4
-// 0x0101f5c4: 0x101f5c4: addu  s3, a0, zero
+// 0x0101f5d4: 0x101f5d4: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0101f5c8: 0x101f5c8: addu  a1, s2, zero
+// 0x0101f5d8: 0x101f5d8: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x0101f5cc: 0x101f5cc: addu  a0, s1, zero
+// 0x0101f5dc: 0x101f5dc: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0101f5d0: 0x101f5d0: sw    s0, 44(sp)
+// 0x0101f5e0: 0x101f5e0: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2076,7 +2076,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101f5d4: 0x101f5d4: sw    a3, 32(sp)
+// 0x0101f5e4: 0x101f5e4: sw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2085,8 +2085,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0101f5d8: 0x101f5d8: sw    ra, 60(sp)
-// 0x0101f5dc: 0x101f5dc: jal   0x101db84 addu  s0, a2, zero
+// 0x0101f5e8: 0x101f5e8: sw    ra, 60(sp)
+// 0x0101f5ec: 0x101f5ec: jal   0x101db94 addu  s0, a2, zero
 	ldloc.3
 	stloc 10
 	ldloc.0
@@ -2094,12 +2094,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_position_101db84(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_position_101db94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0101f5e4: 0x101f5e4: lw    a3, 32(sp)
+// 0x0101f5f4: 0x101f5f4: lw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2108,16 +2108,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101f5e8: 0x101f5e8: addu  a0, s3, zero
+// 0x0101f5f8: 0x101f5f8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0101f5ec: 0x101f5ec: addu  a1, s2, zero
+// 0x0101f5fc: 0x101f5fc: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x0101f5f0: 0x101f5f0: addu  a2, s1, zero
+// 0x0101f600: 0x101f600: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x0101f5f4: 0x101f5f4: jal   0x101f274 sw    s0, 16(sp)
+// 0x0101f604: 0x101f604: jal   0x101f284 sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2131,16 +2131,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_update_101f274(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_update_101f284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0101f5fc: 0x101f5fc: beq   v0, zero, 0x101f61c sll   zero, zero, 0
+// 0x0101f60c: 0x101f60c: beq   v0, zero, 0x101f62c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_101f61c
+	brfalse L_101f62c
 // --- basic block ---
-// 0x0101f604: 0x101f604: lw    v1, 84(sp)
+// 0x0101f614: 0x101f614: lw    v1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2149,8 +2149,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f608: 0x101f608: sll   zero, zero, 0
-// 0x0101f60c: 0x101f60c: sw    v1, 92(v0)
+// 0x0101f618: 0x101f618: sll   zero, zero, 0
+// 0x0101f61c: 0x101f61c: sw    v1, 92(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2159,7 +2159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101f610: 0x101f610: lw    v1, 80(sp)
+// 0x0101f620: 0x101f620: lw    v1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2168,8 +2168,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f614: 0x101f614: sll   zero, zero, 0
-// 0x0101f618: 0x101f618: sw    v1, 88(v0)
+// 0x0101f624: 0x101f624: sll   zero, zero, 0
+// 0x0101f628: 0x101f628: sw    v1, 88(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2178,9 +2178,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_101f61c:
-// 0x0101f61c: 0x101f61c: lw    ra, 60(sp)
-// 0x0101f620: 0x101f620: lw    s3, 56(sp)
+L_101f62c:
+// 0x0101f62c: 0x101f62c: lw    ra, 60(sp)
+// 0x0101f630: 0x101f630: lw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2189,7 +2189,7 @@ L_101f61c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101f624: 0x101f624: lw    s2, 52(sp)
+// 0x0101f634: 0x101f634: lw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2198,7 +2198,7 @@ L_101f61c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101f628: 0x101f628: lw    s1, 48(sp)
+// 0x0101f638: 0x101f638: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2207,7 +2207,7 @@ L_101f61c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101f62c: 0x101f62c: lw    s0, 44(sp)
+// 0x0101f63c: 0x101f63c: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2216,7 +2216,7 @@ L_101f61c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0101f630: 0x101f630: jr    ra addiu sp, sp, 64
+// 0x0101f640: 0x101f640: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2228,7 +2228,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_trip_set_gps_position_101f638(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_set_gps_position_101f648(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra,int32 v0,int32 v1)
@@ -2275,12 +2275,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f638: 0x101f638: addiu sp, sp, -64
+// 0x0101f648: 0x101f648: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0101f63c: 0x101f63c: sw    s2, 52(sp)
+// 0x0101f64c: 0x101f64c: sw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2289,7 +2289,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101f640: 0x101f640: sw    s1, 48(sp)
+// 0x0101f650: 0x101f650: sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2298,15 +2298,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101f644: 0x101f644: addiu s2, sp, 24
+// 0x0101f654: 0x101f654: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x0101f648: 0x101f648: addu  s1, a3, zero
+// 0x0101f658: 0x101f658: addu  s1, a3, zero
 	ldloc 4
 	stloc 6
-// 0x0101f64c: 0x101f64c: sw    s3, 56(sp)
+// 0x0101f65c: 0x101f65c: sw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2315,20 +2315,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101f650: 0x101f650: addu  a3, a1, zero
+// 0x0101f660: 0x101f660: addu  a3, a1, zero
 	ldloc.2
 	stloc 4
-// 0x0101f654: 0x101f654: addu  s3, a0, zero
+// 0x0101f664: 0x101f664: addu  s3, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0101f658: 0x101f658: addu  a1, s2, zero
+// 0x0101f668: 0x101f668: addu  a1, s2, zero
 	ldloc 7
 	stloc.2
-// 0x0101f65c: 0x101f65c: addu  a0, s1, zero
+// 0x0101f66c: 0x101f66c: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x0101f660: 0x101f660: sw    ra, 60(sp)
-// 0x0101f664: 0x101f664: sw    s0, 44(sp)
+// 0x0101f670: 0x101f670: sw    ra, 60(sp)
+// 0x0101f674: 0x101f674: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2337,7 +2337,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101f668: 0x101f668: sw    a3, 32(sp)
+// 0x0101f678: 0x101f678: sw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2346,7 +2346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0101f66c: 0x101f66c: jal   0x101db84 addu  s0, a2, zero
+// 0x0101f67c: 0x101f67c: jal   0x101db94 addu  s0, a2, zero
 	ldloc.3
 	stloc 8
 	ldloc.0
@@ -2354,12 +2354,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_position_101db84(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_position_101db94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 11
 // --- basic block ---
-// 0x0101f674: 0x101f674: lw    a3, 32(sp)
+// 0x0101f684: 0x101f684: lw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2368,16 +2368,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101f678: 0x101f678: addu  a0, s3, zero
+// 0x0101f688: 0x101f688: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0101f67c: 0x101f67c: addu  a1, s2, zero
+// 0x0101f68c: 0x101f68c: addu  a1, s2, zero
 	ldloc 7
 	stloc.2
-// 0x0101f680: 0x101f680: addu  a2, s1, zero
+// 0x0101f690: 0x101f690: addu  a2, s1, zero
 	ldloc 6
 	stloc.3
-// 0x0101f684: 0x101f684: jal   0x101f274 sw    s0, 16(sp)
+// 0x0101f694: 0x101f694: jal   0x101f284 sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2391,13 +2391,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_update_101f274(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_update_101f284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 11
 // --- basic block ---
-// 0x0101f68c: 0x101f68c: lw    ra, 60(sp)
-// 0x0101f690: 0x101f690: lw    s3, 56(sp)
+// 0x0101f69c: 0x101f69c: lw    ra, 60(sp)
+// 0x0101f6a0: 0x101f6a0: lw    s3, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2406,7 +2406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101f694: 0x101f694: lw    s2, 52(sp)
+// 0x0101f6a4: 0x101f6a4: lw    s2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2415,7 +2415,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f698: 0x101f698: lw    s1, 48(sp)
+// 0x0101f6a8: 0x101f6a8: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2424,7 +2424,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f69c: 0x101f69c: lw    s0, 44(sp)
+// 0x0101f6ac: 0x101f6ac: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2433,7 +2433,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101f6a0: 0x101f6a0: jr    ra addiu sp, sp, 64
+// 0x0101f6b0: 0x101f6b0: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2445,7 +2445,7 @@ __CIBYL_function_return:
 	ldloc 11
 	ret
 }
-.method public static int32 roadmap_trip_set_mobile_101f6a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_set_mobile_101f6b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -2486,15 +2486,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f6a8: 0x101f6a8: addiu sp, sp, -56
+// 0x0101f6b8: 0x101f6b8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0101f6ac: 0x101f6ac: addu  a2, a1, zero
+// 0x0101f6bc: 0x101f6bc: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0101f6b0: 0x101f6b0: sw    s0, 44(sp)
+// 0x0101f6c0: 0x101f6c0: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2503,12 +2503,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0101f6b4: 0x101f6b4: addiu s0, sp, 24
+// 0x0101f6c4: 0x101f6c4: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x0101f6b8: 0x101f6b8: sw    s1, 48(sp)
+// 0x0101f6c8: 0x101f6c8: sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2517,17 +2517,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101f6bc: 0x101f6bc: addu  a1, s0, zero
+// 0x0101f6cc: 0x101f6cc: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x0101f6c0: 0x101f6c0: addu  s1, a0, zero
+// 0x0101f6d0: 0x101f6d0: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0101f6c4: 0x101f6c4: addu  a0, a2, zero
+// 0x0101f6d4: 0x101f6d4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0101f6c8: 0x101f6c8: sw    ra, 52(sp)
-// 0x0101f6cc: 0x101f6cc: jal   0x101db84 sw    a2, 32(sp)
+// 0x0101f6d8: 0x101f6d8: sw    ra, 52(sp)
+// 0x0101f6dc: 0x101f6dc: jal   0x101db94 sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2541,12 +2541,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_position_101db84(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_position_101db94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0101f6d4: 0x101f6d4: lw    a2, 32(sp)
+// 0x0101f6e4: 0x101f6e4: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2555,21 +2555,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0101f6d8: 0x101f6d8: lui   a3, 0x10000
+// 0x0101f6e8: 0x101f6e8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101f6dc: 0x101f6dc: addu  a0, s1, zero
+// 0x0101f6ec: 0x101f6ec: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0101f6e0: 0x101f6e0: addu  a1, s0, zero
+// 0x0101f6f0: 0x101f6f0: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x0101f6e4: 0x101f6e4: addiu a3, a3, -29700
+// 0x0101f6f4: 0x101f6f4: addiu a3, a3, -29700
 	ldloc 4
 	ldc.i4 -29700
 	add
 	stloc 4
-// 0x0101f6e8: 0x101f6e8: jal   0x101f274 sw    zero, 16(sp)
+// 0x0101f6f8: 0x101f6f8: jal   0x101f284 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2583,13 +2583,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_update_101f274(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_update_101f284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0101f6f0: 0x101f6f0: lw    ra, 52(sp)
-// 0x0101f6f4: 0x101f6f4: lw    s1, 48(sp)
+// 0x0101f700: 0x101f700: lw    ra, 52(sp)
+// 0x0101f704: 0x101f704: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2598,7 +2598,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f6f8: 0x101f6f8: lw    s0, 44(sp)
+// 0x0101f708: 0x101f708: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2607,7 +2607,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f6fc: 0x101f6fc: jr    ra addiu sp, sp, 56
+// 0x0101f70c: 0x101f70c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2619,7 +2619,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_trip_set_selection_as_101f704(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_set_selection_as_101f714(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -2660,12 +2660,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f704: 0x101f704: addiu sp, sp, -40
+// 0x0101f714: 0x101f714: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0101f708: 0x101f708: sw    s0, 28(sp)
+// 0x0101f718: 0x101f718: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2674,19 +2674,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101f70c: 0x101f70c: lui   s0, 0x30000
+// 0x0101f71c: 0x101f71c: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x0101f710: 0x101f710: lw    v0, 28200(s0)
+// 0x0101f720: 0x101f720: lw    v0, 28664(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7050
+	ldc.i4 7166
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101f714: 0x101f714: sw    s1, 32(sp)
+// 0x0101f724: 0x101f724: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2695,19 +2695,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101f718: 0x101f718: sw    ra, 36(sp)
-// 0x0101f71c: 0x101f71c: bne   v0, zero, 0x101f734 addu  s1, a0, zero
+// 0x0101f728: 0x101f728: sw    ra, 36(sp)
+// 0x0101f72c: 0x101f72c: bne   v0, zero, 0x101f744 addu  s1, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 8
-	brtrue L_101f734
+	brtrue L_101f744
 // --- basic block ---
-// 0x0101f724: 0x101f724: lui   a0, 0x20000
+// 0x0101f734: 0x101f734: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0101f728: 0x101f728: jal   0x101de54 addiu a0, a0, -28932
+// 0x0101f738: 0x101f738: jal   0x101de64 addiu a0, a0, -28468
 	ldloc.1
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.1
 	ldloc.0
@@ -2715,53 +2715,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101f730: 0x101f730: sw    v0, 28200(s0)
+// 0x0101f740: 0x101f740: sw    v0, 28664(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7050
+	ldc.i4 7166
 	add
 	ldloc 6
 	stelem.i4
-L_101f734:
-// 0x0101f734: 0x101f734: lui   v0, 0x30000
+L_101f744:
+// 0x0101f744: 0x101f744: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101f738: 0x101f738: lw    a1, 28200(v0)
+// 0x0101f748: 0x101f748: lw    a1, 28664(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7050
+	ldc.i4 7166
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101f73c: 0x101f73c: lui   a3, 0x10000
+// 0x0101f74c: 0x101f74c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101f740: 0x101f740: addu  a0, s1, zero
+// 0x0101f750: 0x101f750: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0101f744: 0x101f744: addiu a1, a1, 24
+// 0x0101f754: 0x101f754: addiu a1, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0101f748: 0x101f748: addiu a3, a3, -29692
+// 0x0101f758: 0x101f758: addiu a3, a3, -29692
 	ldloc 4
 	ldc.i4 -29692
 	add
 	stloc 4
-// 0x0101f74c: 0x101f74c: addu  a2, zero, zero
+// 0x0101f75c: 0x101f75c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101f750: 0x101f750: jal   0x101f274 sw    zero, 16(sp)
+// 0x0101f760: 0x101f760: jal   0x101f284 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2775,13 +2775,13 @@ L_101f734:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_update_101f274(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_update_101f284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0101f758: 0x101f758: lw    ra, 36(sp)
-// 0x0101f75c: 0x101f75c: lw    s1, 32(sp)
+// 0x0101f768: 0x101f768: lw    ra, 36(sp)
+// 0x0101f76c: 0x101f76c: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2790,7 +2790,7 @@ L_101f734:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101f760: 0x101f760: lw    s0, 28(sp)
+// 0x0101f770: 0x101f770: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2799,7 +2799,7 @@ L_101f734:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101f764: 0x101f764: jr    ra addiu sp, sp, 40
+// 0x0101f774: 0x101f774: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2811,7 +2811,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2846,27 +2846,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f76c: 0x101f76c: addiu sp, sp, -32
+// 0x0101f77c: 0x101f77c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0101f770: 0x101f770: beq   a0, zero, 0x101f78c sw    ra, 28(sp)
+// 0x0101f780: 0x101f780: beq   a0, zero, 0x101f79c sw    ra, 28(sp)
 	ldloc.1
-	brfalse L_101f78c
+	brfalse L_101f79c
 // --- basic block ---
-// 0x0101f778: 0x101f778: lui   a3, 0x10000
+// 0x0101f788: 0x101f788: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0101f77c: 0x101f77c: addiu a3, a3, -29692
+// 0x0101f78c: 0x101f78c: addiu a3, a3, -29692
 	ldloc 4
 	ldc.i4 -29692
 	add
 	stloc 4
-// 0x0101f780: 0x101f780: addu  a2, zero, zero
+// 0x0101f790: 0x101f790: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0101f784: 0x101f784: jal   0x101f274 sw    zero, 16(sp)
+// 0x0101f794: 0x101f794: jal   0x101f284 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2880,15 +2880,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_update_101f274(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_update_101f284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_101f78c:
-// 0x0101f78c: 0x101f78c: lw    ra, 28(sp)
-// 0x0101f790: 0x101f790: sll   zero, zero, 0
-// 0x0101f794: 0x101f794: jr    ra addiu sp, sp, 32
+L_101f79c:
+// 0x0101f79c: 0x101f79c: lw    ra, 28(sp)
+// 0x0101f7a0: 0x101f7a0: sll   zero, zero, 0
+// 0x0101f7a4: 0x101f7a4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2900,7 +2900,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_trip_start_101f79c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_trip_start_101f7ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -2938,21 +2938,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f79c: 0x101f79c: lui   a0, 0x10000
+// 0x0101f7ac: 0x101f7ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101f7a0: 0x101f7a0: addiu sp, sp, -24
+// 0x0101f7b0: 0x101f7b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101f7a4: 0x101f7a4: addiu a0, a0, -29748
+// 0x0101f7b4: 0x101f7b4: addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
 	stloc.1
-// 0x0101f7a8: 0x101f7a8: sw    ra, 20(sp)
-// 0x0101f7ac: 0x101f7ac: jal   0x101de54 sw    s0, 16(sp)
+// 0x0101f7b8: 0x101f7b8: sw    ra, 20(sp)
+// 0x0101f7bc: 0x101f7bc: jal   0x101de64 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2966,47 +2966,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f7b4: 0x101f7b4: lui   v1, 0x30000
+// 0x0101f7c4: 0x101f7c4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101f7b8: 0x101f7b8: beq   v0, zero, 0x101f7ec sw    v0, 28184(v1)
+// 0x0101f7c8: 0x101f7c8: beq   v0, zero, 0x101f7fc sw    v0, 28648(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7046
+	ldc.i4 7162
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_101f7ec
+	brfalse L_101f7fc
 // --- basic block ---
-// 0x0101f7c0: 0x101f7c0: lui   v0, 0x30000
+// 0x0101f7d0: 0x101f7d0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101f7c4: 0x101f7c4: lw    a1, 28176(v0)
+// 0x0101f7d4: 0x101f7d4: lw    a1, 28640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7044
+	ldc.i4 7160
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101f7c8: 0x101f7c8: lui   s0, 0x10000
+// 0x0101f7d8: 0x101f7d8: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0101f7cc: 0x101f7cc: addiu a1, a1, 24
+// 0x0101f7dc: 0x101f7dc: addiu a1, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0101f7d0: 0x101f7d0: jal   0x101f76c addiu a0, s0, -29760
+// 0x0101f7e0: 0x101f7e0: jal   0x101f77c addiu a0, s0, -29760
 	ldloc 8
 	ldc.i4 -29760
 	add
@@ -3016,12 +3016,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f7d8: 0x101f7d8: jal   0x101de54 addiu a0, s0, -29760
+// 0x0101f7e8: 0x101f7e8: jal   0x101de64 addiu a0, s0, -29760
 	ldloc 8
 	ldc.i4 -29760
 	add
@@ -3031,20 +3031,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_search_101de54(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_search_101de64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101f7e0: 0x101f7e0: lui   v1, 0x30000
+// 0x0101f7f0: 0x101f7f0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101f7e4: 0x101f7e4: jal   0x101ed40 sw    v0, 28192(v1)
+// 0x0101f7f4: 0x101f7f4: jal   0x101ed50 sw    v0, 28656(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7048
+	ldc.i4 7164
 	add
 	ldloc 5
 	stelem.i4
@@ -3053,14 +3053,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_activate_101ed40(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_activate_101ed50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_101f7ec:
-// 0x0101f7ec: 0x101f7ec: lw    ra, 20(sp)
-// 0x0101f7f0: 0x101f7f0: lw    s0, 16(sp)
+L_101f7fc:
+// 0x0101f7fc: 0x101f7fc: lw    ra, 20(sp)
+// 0x0101f800: 0x101f800: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3069,7 +3069,7 @@ L_101f7ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101f7f4: 0x101f7f4: jr    ra addiu sp, sp, 24
+// 0x0101f804: 0x101f804: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3081,7 +3081,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void roadmap_screen_after_refresh_101f7fc()
+.method public static void roadmap_screen_after_refresh_101f80c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3092,13 +3092,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_101f7fc:
-// 0x0101f7fc: 0x101f7fc: jr    ra sll   zero, zero, 0
+L_101f80c:
+// 0x0101f80c: 0x101f80c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_screen_in_view_101f804(int32,int32,int32)
+.method public static int32 roadmap_screen_in_view_101f814(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3127,75 +3127,75 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f804: 0x101f804: lui   v0, 0x30000
+// 0x0101f814: 0x101f814: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x0101f808: 0x101f808: lw    a1, 28272(v0)
+// 0x0101f818: 0x101f818: lw    a1, 28736(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7068
+	ldc.i4 7184
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f80c: 0x101f80c: lui   v0, 0x30000
+// 0x0101f81c: 0x101f81c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x0101f810: 0x101f810: lw    v1, 28276(v0)
+// 0x0101f820: 0x101f820: lw    v1, 28740(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7069
+	ldc.i4 7185
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101f814: 0x101f814: j	 0x101f838 addu  v0, zero, zero
+// 0x0101f824: 0x101f824: j	 0x101f848 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_101f838
+	br L_101f848
 // --- basic block ---
-L_101f81c:
-// 0x0101f81c: 0x101f81c: lw    a2, 0(v1)
+L_101f82c:
+// 0x0101f82c: 0x101f82c: lw    a2, 0(v1)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0101f820: 0x101f820: sll   zero, zero, 0
-// 0x0101f824: 0x101f824: bne   a0, a2, 0x101f834 addiu v1, v1, 4
+// 0x0101f830: 0x101f830: sll   zero, zero, 0
+// 0x0101f834: 0x101f834: bne   a0, a2, 0x101f844 addiu v1, v1, 4
 	ldloc.0
 	ldloc.2
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-	bne.un L_101f834
+	bne.un L_101f844
 // --- basic block ---
-// 0x0101f82c: 0x101f82c: jr    ra addiu v0, zero, 1
+// 0x0101f83c: 0x101f83c: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.3
 	br __CIBYL_function_return
 // --- basic block ---
-L_101f834:
-// 0x0101f834: 0x101f834: addiu v0, v0, 1
+L_101f844:
+// 0x0101f844: 0x101f844: addiu v0, v0, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-L_101f838:
-// 0x0101f838: 0x101f838: slt   a2, v0, a1
+L_101f848:
+// 0x0101f848: 0x101f848: slt   a2, v0, a1
 	ldloc.3
 	ldloc.1
 	clt
 	stloc.2
-// 0x0101f83c: 0x101f83c: bne   a2, zero, 0x101f81c sll   zero, zero, 0
+// 0x0101f84c: 0x101f84c: bne   a2, zero, 0x101f82c sll   zero, zero, 0
 	ldloc.2
-	brtrue L_101f81c
+	brtrue L_101f82c
 // --- basic block ---
-// 0x0101f844: 0x101f844: jr    ra addu  v0, zero, zero
+// 0x0101f854: 0x101f854: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	br __CIBYL_function_return
@@ -3205,7 +3205,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_screen_subscribe_after_flow_control_refresh_101f84c(int32)
+.method public static int32 roadmap_screen_subscribe_after_flow_control_refresh_101f85c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3228,45 +3228,45 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f84c: 0x101f84c: lui   v0, 0x30000
+// 0x0101f85c: 0x101f85c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101f850: 0x101f850: lw    v0, 28412(v0)
+// 0x0101f860: 0x101f860: lw    v0, 28876(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7103
+	ldc.i4 7219
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f854: 0x101f854: beq   a0, zero, 0x101f86c lui   v1, 0x30000
+// 0x0101f864: 0x101f864: beq   a0, zero, 0x101f87c lui   v1, 0x30000
 	ldloc.0
 	ldc.i4 196608
 	stloc.2
-	brfalse L_101f86c
+	brfalse L_101f87c
 // --- basic block ---
-// 0x0101f85c: 0x101f85c: beq   v0, zero, 0x101f86c sll   zero, zero, 0
+// 0x0101f86c: 0x101f86c: beq   v0, zero, 0x101f87c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_101f86c
+	brfalse L_101f87c
 // --- basic block ---
-// 0x0101f864: 0x101f864: beq   a0, v0, 0x101f870 sll   zero, zero, 0
+// 0x0101f874: 0x101f874: beq   a0, v0, 0x101f880 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	beq  L_101f870
+	beq  L_101f880
 // --- basic block ---
-L_101f86c:
-// 0x0101f86c: 0x101f86c: sw    a0, 28412(v1)
+L_101f87c:
+// 0x0101f87c: 0x101f87c: sw    a0, 28876(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7103
+	ldc.i4 7219
 	add
 	ldloc.0
 	stelem.i4
-L_101f870:
-// 0x0101f870: 0x101f870: jr    ra sll   zero, zero, 0
+L_101f880:
+// 0x0101f880: 0x101f880: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -3274,7 +3274,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_screen_get_view_mode_101f878()
+.method public static int32 roadmap_screen_get_view_mode_101f888()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3291,25 +3291,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f878: 0x101f878: lui   v0, 0x30000
+// 0x0101f888: 0x101f888: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f87c: 0x101f87c: lw    v0, 28256(v0)
+// 0x0101f88c: 0x101f88c: lw    v0, 28720(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f880: 0x101f880: jr    ra sll   zero, zero, 0
+// 0x0101f890: 0x101f890: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_get_nonogl_view_mode_101f888()
+.method public static int32 roadmap_screen_get_nonogl_view_mode_101f898()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3326,25 +3326,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f888: 0x101f888: lui   v0, 0x30000
+// 0x0101f898: 0x101f898: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f88c: 0x101f88c: lw    v0, 28256(v0)
+// 0x0101f89c: 0x101f89c: lw    v0, 28720(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f890: 0x101f890: jr    ra sll   zero, zero, 0
+// 0x0101f8a0: 0x101f8a0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_get_view_mode_screen_touched_101f898()
+.method public static int32 roadmap_screen_get_view_mode_screen_touched_101f8a8()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3364,39 +3364,39 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f898: 0x101f898: lui   v0, 0x30000
+// 0x0101f8a8: 0x101f8a8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f89c: 0x101f89c: lw    v1, 28240(v0)
+// 0x0101f8ac: 0x101f8ac: lw    v1, 28704(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f8a0: 0x101f8a0: sll   zero, zero, 0
-// 0x0101f8a4: 0x101f8a4: beq   v1, zero, 0x101f8b4 addiu v0, zero, -1
+// 0x0101f8b0: 0x101f8b0: sll   zero, zero, 0
+// 0x0101f8b4: 0x101f8b4: beq   v1, zero, 0x101f8c4 addiu v0, zero, -1
 	ldloc.1
 	ldc.i4.m1
 	stloc.0
-	brfalse L_101f8b4
+	brfalse L_101f8c4
 // --- basic block ---
-// 0x0101f8ac: 0x101f8ac: lui   v0, 0x30000
+// 0x0101f8bc: 0x101f8bc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f8b0: 0x101f8b0: lw    v0, 28256(v0)
+// 0x0101f8c0: 0x101f8c0: lw    v0, 28720(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.0
-L_101f8b4:
-// 0x0101f8b4: 0x101f8b4: jr    ra sll   zero, zero, 0
+L_101f8c4:
+// 0x0101f8c4: 0x101f8c4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -3404,7 +3404,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_get_orientation_mode_101f8bc()
+.method public static int32 roadmap_screen_get_orientation_mode_101f8cc()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3421,25 +3421,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f8bc: 0x101f8bc: lui   v0, 0x30000
+// 0x0101f8cc: 0x101f8cc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f8c0: 0x101f8c0: lw    v0, 28348(v0)
+// 0x0101f8d0: 0x101f8d0: lw    v0, 28812(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f8c4: 0x101f8c4: jr    ra sll   zero, zero, 0
+// 0x0101f8d4: 0x101f8d4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_height_101f8cc(int32)
+.method public static int32 roadmap_screen_height_101f8dc(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 lo,int32 ra)
@@ -3465,67 +3465,67 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f8cc: 0x101f8cc: lui   v0, 0x30000
+// 0x0101f8dc: 0x101f8dc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101f8d0: 0x101f8d0: lw    v1, 28476(v0)
+// 0x0101f8e0: 0x101f8e0: lw    v1, 28940(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101f8d4: 0x101f8d4: lui   v0, 0x30000
+// 0x0101f8e4: 0x101f8e4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101f8d8: 0x101f8d8: lw    v0, 28464(v0)
+// 0x0101f8e8: 0x101f8e8: lw    v0, 28928(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101f8dc: 0x101f8dc: lui   a0, 0x30000
+// 0x0101f8ec: 0x101f8ec: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f8e0: 0x101f8e0: lw    a0, 28256(a0)
+// 0x0101f8f0: 0x101f8f0: lw    a0, 28720(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f8e4: 0x101f8e4: addu  v0, v1, v0
+// 0x0101f8f4: 0x101f8f4: addu  v0, v1, v0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0101f8e8: 0x101f8e8: addiu v1, zero, 1
+// 0x0101f8f8: 0x101f8f8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0101f8ec: 0x101f8ec: bne   a0, v1, 0x101f8fc addiu v1, zero, 3
+// 0x0101f8fc: 0x101f8fc: bne   a0, v1, 0x101f90c addiu v1, zero, 3
 	ldloc.0
 	ldloc.2
 	ldc.i4.3
 	stloc.2
-	bne.un L_101f8fc
+	bne.un L_101f90c
 // --- basic block ---
-// 0x0101f8f4: 0x101f8f4: mult  v0, v1
+// 0x0101f904: 0x101f904: mult  v0, v1
 	ldloc.1
 	ldloc.2
 	mul
 	stloc 4
-// 0x0101f8f8: 0x101f8f8: mflo  lo
+// 0x0101f908: 0x101f908: mflo  lo
 	ldloc 4
 	stloc.1
-L_101f8fc:
-// 0x0101f8fc: 0x101f8fc: jr    ra sll   zero, zero, 0
+L_101f90c:
+// 0x0101f90c: 0x101f90c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -3533,7 +3533,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_screen_mark_redraw_101f904()
+.method public static int32 roadmap_screen_mark_redraw_101f914()
 {
 .maxstack 5
 .locals init (int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -3553,30 +3553,30 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f904: 0x101f904: lui   v0, 0x30000
+// 0x0101f914: 0x101f914: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101f908: 0x101f908: lw    v1, 28516(v0)
+// 0x0101f918: 0x101f918: lw    v1, 28980(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7129
+	ldc.i4 7245
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f90c: 0x101f90c: sll   zero, zero, 0
-// 0x0101f910: 0x101f910: addiu v1, v1, 1
+// 0x0101f91c: 0x101f91c: sll   zero, zero, 0
+// 0x0101f920: 0x101f920: addiu v1, v1, 1
 	ldloc.0
 	ldc.i4.1
 	add
 	stloc.0
-// 0x0101f914: 0x101f914: jr    ra sw    v1, 28516(v0)
+// 0x0101f924: 0x101f924: jr    ra sw    v1, 28980(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7129
+	ldc.i4 7245
 	add
 	ldloc.0
 	stelem.i4
@@ -3587,7 +3587,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_screen_freeze_101f91c()
+.method public static int32 roadmap_screen_freeze_101f92c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3607,18 +3607,18 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f91c: 0x101f91c: addiu v1, zero, 1
+// 0x0101f92c: 0x101f92c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101f920: 0x101f920: lui   v0, 0x30000
+// 0x0101f930: 0x101f930: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f924: 0x101f924: jr    ra sw    v1, 28252(v0)
+// 0x0101f934: 0x101f934: jr    ra sw    v1, 28716(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7063
+	ldc.i4 7179
 	add
 	ldloc.1
 	stelem.i4
@@ -3629,7 +3629,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_set_orientation_dynamic_101f93c()
+.method public static int32 roadmap_screen_set_orientation_dynamic_101f94c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3646,15 +3646,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f93c: 0x101f93c: lui   v0, 0x30000
+// 0x0101f94c: 0x101f94c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f940: 0x101f940: jr    ra sw    zero, 28348(v0)
+// 0x0101f950: 0x101f950: jr    ra sw    zero, 28812(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3663,7 +3663,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_subscribe_after_refresh_101f970(int32)
+.method public static int32 roadmap_screen_subscribe_after_refresh_101f980(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32[] mem,int32 ra,int32 v0)
@@ -3686,10 +3686,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f970: 0x101f970: lui   v1, 0x0
+// 0x0101f980: 0x101f980: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101f974: 0x101f974: lw    v0, 6084(v1)
+// 0x0101f984: 0x101f984: lw    v0, 6084(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -3698,19 +3698,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101f978: 0x101f978: bne   a0, zero, 0x101f990 sll   zero, zero, 0
+// 0x0101f988: 0x101f988: bne   a0, zero, 0x101f9a0 sll   zero, zero, 0
 	ldloc.0
-	brtrue L_101f990
+	brtrue L_101f9a0
 // --- basic block ---
-// 0x0101f980: 0x101f980: lui   a0, 0x1020000
+// 0x0101f990: 0x101f990: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.0
-// 0x0101f984: 0x101f984: addiu a0, a0, -2052
+// 0x0101f994: 0x101f994: addiu a0, a0, -2036
 	ldloc.0
-	ldc.i4 -2052
+	ldc.i4 -2036
 	add
 	stloc.0
-// 0x0101f988: 0x101f988: jr    ra sw    a0, 6084(v1)
+// 0x0101f998: 0x101f998: jr    ra sw    a0, 6084(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -3721,8 +3721,8 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_101f990:
-// 0x0101f990: 0x101f990: jr    ra sw    a0, 6084(v1)
+L_101f9a0:
+// 0x0101f9a0: 0x101f9a0: jr    ra sw    a0, 6084(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -3738,7 +3738,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_screen_fast_refresh_101f998()
+.method public static int32 roadmap_screen_fast_refresh_101f9a8()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3755,25 +3755,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f998: 0x101f998: lui   v0, 0x30000
+// 0x0101f9a8: 0x101f9a8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f99c: 0x101f99c: lw    v0, 28228(v0)
+// 0x0101f9ac: 0x101f9ac: lw    v0, 28692(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f9a0: 0x101f9a0: jr    ra sll   zero, zero, 0
+// 0x0101f9b0: 0x101f9b0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void dbg_time_start_101f9b8()
+.method public static void dbg_time_start_101f9c8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3784,12 +3784,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f9b8: 0x101f9b8: jr    ra sll   zero, zero, 0
+// 0x0101f9c8: 0x101f9c8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void dbg_time_end_101f9c0()
+.method public static void dbg_time_end_101f9d0()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3800,12 +3800,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f9c0: 0x101f9c0: jr    ra sll   zero, zero, 0
+// 0x0101f9d0: 0x101f9d0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_screen_draw_flush_101f9d0()
+.method public static int32 roadmap_screen_draw_flush_101f9e0()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3822,15 +3822,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f9d0: 0x101f9d0: lui   v0, 0x30000
+// 0x0101f9e0: 0x101f9e0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f9d4: 0x101f9d4: jr    ra sw    zero, 28268(v0)
+// 0x0101f9e4: 0x101f9e4: jr    ra sw    zero, 28732(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3839,7 +3839,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_touched_state_101f9dc()
+.method public static int32 roadmap_screen_touched_state_101f9ec()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3856,25 +3856,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f9dc: 0x101f9dc: lui   v0, 0x30000
+// 0x0101f9ec: 0x101f9ec: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f9e0: 0x101f9e0: lw    v0, 28240(v0)
+// 0x0101f9f0: 0x101f9f0: lw    v0, 28704(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f9e4: 0x101f9e4: sll   zero, zero, 0
-// 0x0101f9e8: 0x101f9e8: sltu  v0, zero, v0
+// 0x0101f9f4: 0x101f9f4: sll   zero, zero, 0
+// 0x0101f9f8: 0x101f9f8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
 	stloc.0
-// 0x0101f9ec: 0x101f9ec: jr    ra addiu v0, v0, -1
+// 0x0101f9fc: 0x101f9fc: jr    ra addiu v0, v0, -1
 	ldloc.0
 	ldc.i4.m1
 	add
@@ -3884,7 +3884,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_not_touched_state_101f9f4()
+.method public static int32 roadmap_screen_not_touched_state_101fa04()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3901,25 +3901,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101f9f4: 0x101f9f4: lui   v0, 0x30000
+// 0x0101fa04: 0x101fa04: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101f9f8: 0x101f9f8: lw    v0, 28240(v0)
+// 0x0101fa08: 0x101fa08: lw    v0, 28704(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101f9fc: 0x101f9fc: sll   zero, zero, 0
-// 0x0101fa00: 0x101fa00: sltu  v0, zero, v0
+// 0x0101fa0c: 0x101fa0c: sll   zero, zero, 0
+// 0x0101fa10: 0x101fa10: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
 	stloc.0
-// 0x0101fa04: 0x101fa04: jr    ra subu  v0, zero, v0
+// 0x0101fa14: 0x101fa14: jr    ra subu  v0, zero, v0
 	ldloc.0
 	neg
 	stloc.0
@@ -3928,7 +3928,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_set_screen_type_101fa0c(int32)
+.method public static int32 roadmap_screen_set_screen_type_101fa1c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -3948,10 +3948,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fa0c: 0x101fa0c: lui   v0, 0x0
+// 0x0101fa1c: 0x101fa1c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101fa10: 0x101fa10: jr    ra sw    a0, 6048(v0)
+// 0x0101fa20: 0x101fa20: jr    ra sw    a0, 6048(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -3965,7 +3965,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_screen_is_hd_screen_101fa28()
+.method public static int32 roadmap_screen_is_hd_screen_101fa38()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3982,10 +3982,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fa28: 0x101fa28: lui   v0, 0x0
+// 0x0101fa38: 0x101fa38: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x0101fa2c: 0x101fa2c: lw    v0, 6048(v0)
+// 0x0101fa3c: 0x101fa3c: lw    v0, 6048(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -3994,13 +3994,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101fa30: 0x101fa30: sll   zero, zero, 0
-// 0x0101fa34: 0x101fa34: srl   v0, v0, 17
+// 0x0101fa40: 0x101fa40: sll   zero, zero, 0
+// 0x0101fa44: 0x101fa44: srl   v0, v0, 17
 	ldloc.0
 	ldc.i4.s 17
 	shr.un
 	stloc.0
-// 0x0101fa38: 0x101fa38: jr    ra andi  v0, v0, 1
+// 0x0101fa48: 0x101fa48: jr    ra andi  v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	and
@@ -4010,7 +4010,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_get_screen_scale_101fa7c(int32)
+.method public static int32 roadmap_screen_get_screen_scale_101fa8c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4033,10 +4033,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fa7c: 0x101fa7c: lui   v0, 0x0
+// 0x0101fa8c: 0x101fa8c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101fa80: 0x101fa80: lw    v1, 6048(v0)
+// 0x0101fa90: 0x101fa90: lw    v1, 6048(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4045,24 +4045,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0101fa84: 0x101fa84: lui   v0, 0x20000
+// 0x0101fa94: 0x101fa94: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0101fa88: 0x101fa88: and   v0, v1, v0
+// 0x0101fa98: 0x101fa98: and   v0, v1, v0
 	ldloc.2
 	ldloc.1
 	and
 	stloc.1
-// 0x0101fa8c: 0x101fa8c: beq   v0, zero, 0x101faa8 addiu v1, zero, 100
+// 0x0101fa9c: 0x101fa9c: beq   v0, zero, 0x101fab8 addiu v1, zero, 100
 	ldloc.1
 	ldc.i4.s 100
 	stloc.2
-	brfalse L_101faa8
+	brfalse L_101fab8
 // --- basic block ---
-// 0x0101fa94: 0x101fa94: lui   v0, 0x0
+// 0x0101faa4: 0x101faa4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101fa98: 0x101fa98: lw    a0, 6044(v0)
+// 0x0101faa8: 0x101faa8: lw    a0, 6044(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4071,19 +4071,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101fa9c: 0x101fa9c: sll   zero, zero, 0
-// 0x0101faa0: 0x101faa0: beq   a0, v1, 0x101fab0 addiu v0, zero, 150
+// 0x0101faac: 0x101faac: sll   zero, zero, 0
+// 0x0101fab0: 0x101fab0: beq   a0, v1, 0x101fac0 addiu v0, zero, 150
 	ldloc.0
 	ldloc.2
 	ldc.i4 150
 	stloc.1
-	beq  L_101fab0
+	beq  L_101fac0
 // --- basic block ---
-L_101faa8:
-// 0x0101faa8: 0x101faa8: lui   v0, 0x0
+L_101fab8:
+// 0x0101fab8: 0x101fab8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101faac: 0x101faac: lw    v0, 6044(v0)
+// 0x0101fabc: 0x101fabc: lw    v0, 6044(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4092,8 +4092,8 @@ L_101faa8:
 	add
 	ldelem.i4
 	stloc.1
-L_101fab0:
-// 0x0101fab0: 0x101fab0: jr    ra sll   zero, zero, 0
+L_101fac0:
+// 0x0101fac0: 0x101fac0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -4101,7 +4101,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_screen_is_xicon_open_101fab8()
+.method public static int32 roadmap_screen_is_xicon_open_101fac8()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -4118,25 +4118,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fab8: 0x101fab8: lui   v0, 0x30000
+// 0x0101fac8: 0x101fac8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101fabc: 0x101fabc: lw    v0, 28236(v0)
+// 0x0101facc: 0x101facc: lw    v0, 28700(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7059
+	ldc.i4 7175
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101fac0: 0x101fac0: jr    ra sll   zero, zero, 0
+// 0x0101fad0: 0x101fad0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_set_background_run_101fac8(int32)
+.method public static int32 roadmap_screen_set_background_run_101fad8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -4156,15 +4156,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fac8: 0x101fac8: lui   v0, 0x30000
+// 0x0101fad8: 0x101fad8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0101facc: 0x101facc: jr    ra sw    a0, 28232(v0)
+// 0x0101fadc: 0x101fadc: jr    ra sw    a0, 28696(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7058
+	ldc.i4 7174
 	add
 	ldloc.0
 	stelem.i4
@@ -4173,7 +4173,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_screen_get_background_run_101fad4()
+.method public static int32 roadmap_screen_get_background_run_101fae4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -4190,25 +4190,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fad4: 0x101fad4: lui   v0, 0x30000
+// 0x0101fae4: 0x101fae4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc.0
-// 0x0101fad8: 0x101fad8: lw    v0, 28232(v0)
+// 0x0101fae8: 0x101fae8: lw    v0, 28696(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7058
+	ldc.i4 7174
 	add
 	ldelem.i4
 	stloc.0
-// 0x0101fadc: 0x101fadc: jr    ra sll   zero, zero, 0
+// 0x0101faec: 0x101faec: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_screen_set_scale_101fb0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_set_scale_101fb1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -4243,42 +4243,42 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fb0c: 0x101fb0c: addiu sp, sp, -24
+// 0x0101fb1c: 0x101fb1c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fb10: 0x101fb10: sw    ra, 20(sp)
-// 0x0101fb14: 0x101fb14: jal   0x1009b10 sll   zero, zero, 0
+// 0x0101fb20: 0x101fb20: sw    ra, 20(sp)
+// 0x0101fb24: 0x101fb24: jal   0x1009b20 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_set_scale_1009b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_set_scale_1009b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101fb1c: 0x101fb1c: beq   v0, zero, 0x101fb2c sll   zero, zero, 0
+// 0x0101fb2c: 0x101fb2c: beq   v0, zero, 0x101fb3c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_101fb2c
+	brfalse L_101fb3c
 // --- basic block ---
-// 0x0101fb24: 0x101fb24: jal   0x1010a4c sll   zero, zero, 0
+// 0x0101fb34: 0x101fb34: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101fb2c:
-// 0x0101fb2c: 0x101fb2c: lw    ra, 20(sp)
-// 0x0101fb30: 0x101fb30: sll   zero, zero, 0
-// 0x0101fb34: 0x101fb34: jr    ra addiu sp, sp, 24
+L_101fb3c:
+// 0x0101fb3c: 0x101fb3c: lw    ra, 20(sp)
+// 0x0101fb40: 0x101fb40: sll   zero, zero, 0
+// 0x0101fb44: 0x101fb44: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4290,7 +4290,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_shade_bg_101fb3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_shade_bg_101fb4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4331,15 +4331,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fb3c: 0x101fb3c: addiu sp, sp, -80
+// 0x0101fb4c: 0x101fb4c: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0101fb40: 0x101fb40: lui   v0, 0xf0000
+// 0x0101fb50: 0x101fb50: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0101fb44: 0x101fb44: sw    s0, 68(sp)
+// 0x0101fb54: 0x101fb54: sw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4348,22 +4348,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101fb48: 0x101fb48: lui   a0, 0x10000
+// 0x0101fb58: 0x101fb58: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0101fb4c: 0x101fb4c: lw    s0, -30072(v0)
+// 0x0101fb5c: 0x101fb5c: lw    s0, -29608(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101fb50: 0x101fb50: lui   v0, 0xf0000
+// 0x0101fb60: 0x101fb60: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0101fb54: 0x101fb54: sw    s1, 72(sp)
+// 0x0101fb64: 0x101fb64: sw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4372,28 +4372,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101fb58: 0x101fb58: addiu a0, a0, -29592
+// 0x0101fb68: 0x101fb68: addiu a0, a0, -29592
 	ldloc.1
 	ldc.i4 -29592
 	add
 	stloc.1
-// 0x0101fb5c: 0x101fb5c: lw    s1, -30068(v0)
+// 0x0101fb6c: 0x101fb6c: lw    s1, -29604(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101fb60: 0x101fb60: addu  a1, zero, zero
+// 0x0101fb70: 0x101fb70: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0101fb64: 0x101fb64: addiu v0, zero, 4
+// 0x0101fb74: 0x101fb74: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x0101fb68: 0x101fb68: sw    ra, 76(sp)
-// 0x0101fb6c: 0x101fb6c: jal   0x104ef00 sw    v0, 24(sp)
+// 0x0101fb78: 0x101fb78: sw    ra, 76(sp)
+// 0x0101fb7c: 0x101fb7c: jal   0x104ef10 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4407,12 +4407,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101fb74: 0x101fb74: jal   0x104e35c addu  a0, v0, zero
+// 0x0101fb84: 0x101fb84: jal   0x104e36c addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4420,12 +4420,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101fb7c: 0x101fb7c: sw    s1, 44(sp)
+// 0x0101fb8c: 0x101fb8c: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4434,7 +4434,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101fb80: 0x101fb80: sw    s0, 56(sp)
+// 0x0101fb90: 0x101fb90: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4443,7 +4443,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101fb84: 0x101fb84: sw    zero, 28(sp)
+// 0x0101fb94: 0x101fb94: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4452,7 +4452,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101fb88: 0x101fb88: sw    zero, 32(sp)
+// 0x0101fb98: 0x101fb98: sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4461,7 +4461,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101fb8c: 0x101fb8c: sw    s1, 36(sp)
+// 0x0101fb9c: 0x101fb9c: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4470,7 +4470,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101fb90: 0x101fb90: sw    zero, 40(sp)
+// 0x0101fba0: 0x101fba0: sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4479,7 +4479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0101fb94: 0x101fb94: sw    s0, 48(sp)
+// 0x0101fba4: 0x101fba4: sw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4488,7 +4488,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101fb98: 0x101fb98: jal   0x1014194 sw    zero, 52(sp)
+// 0x0101fba8: 0x101fba8: jal   0x10141a4 sw    zero, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4502,19 +4502,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101fba0: 0x101fba0: bne   v0, zero, 0x101fbbc sll   zero, zero, 0
+// 0x0101fbb0: 0x101fbb0: bne   v0, zero, 0x101fbcc sll   zero, zero, 0
 	ldloc 6
-	brtrue L_101fbbc
+	brtrue L_101fbcc
 // --- basic block ---
-// 0x0101fba8: 0x101fba8: lui   a0, 0x0
+// 0x0101fbb8: 0x101fbb8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101fbac: 0x101fbac: jal   0x104edb0 addiu a0, a0, 23008
+// 0x0101fbbc: 0x101fbbc: jal   0x104edc0 addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
@@ -4524,21 +4524,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101fbb4: 0x101fbb4: j	 0x101fbcc addiu a0, zero, 160
+// 0x0101fbc4: 0x101fbc4: j	 0x101fbdc addiu a0, zero, 160
 	ldc.i4 160
 	stloc.1
-	br L_101fbcc
+	br L_101fbdc
 // --- basic block ---
-L_101fbbc:
-// 0x0101fbbc: 0x101fbbc: lui   a0, 0x0
+L_101fbcc:
+// 0x0101fbcc: 0x101fbcc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101fbc0: 0x101fbc0: jal   0x104edb0 addiu a0, a0, 31980
+// 0x0101fbd0: 0x101fbd0: jal   0x104edc0 addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
@@ -4548,43 +4548,43 @@ L_101fbbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101fbc8: 0x101fbc8: addiu a0, zero, 90
+// 0x0101fbd8: 0x101fbd8: addiu a0, zero, 90
 	ldc.i4.s 90
 	stloc.1
-L_101fbcc:
-// 0x0101fbcc: 0x101fbcc: jal   0x104e410 sll   zero, zero, 0
+L_101fbdc:
+// 0x0101fbdc: 0x101fbdc: jal   0x104e420 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101fbd4: 0x101fbd4: addiu a1, sp, 24
+// 0x0101fbe4: 0x101fbe4: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0101fbd8: 0x101fbd8: addiu a2, sp, 28
+// 0x0101fbe8: 0x101fbe8: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x0101fbdc: 0x101fbdc: addiu a0, zero, 1
+// 0x0101fbec: 0x101fbec: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101fbe0: 0x101fbe0: addiu a3, zero, 1
+// 0x0101fbf0: 0x101fbf0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0101fbe4: 0x101fbe4: jal   0x104ef80 sw    zero, 16(sp)
+// 0x0101fbf4: 0x101fbf4: jal   0x104ef90 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4598,13 +4598,13 @@ L_101fbcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0101fbec: 0x101fbec: lw    ra, 76(sp)
-// 0x0101fbf0: 0x101fbf0: lw    s1, 72(sp)
+// 0x0101fbfc: 0x101fbfc: lw    ra, 76(sp)
+// 0x0101fc00: 0x101fc00: lw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4613,7 +4613,7 @@ L_101fbcc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0101fbf4: 0x101fbf4: lw    s0, 68(sp)
+// 0x0101fc04: 0x101fc04: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4622,7 +4622,7 @@ L_101fbcc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0101fbf8: 0x101fbf8: jr    ra addiu sp, sp, 80
+// 0x0101fc08: 0x101fc08: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -4634,7 +4634,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -4672,24 +4672,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fc00: 0x101fc00: lui   v0, 0x30000
+// 0x0101fc10: 0x101fc10: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101fc04: 0x101fc04: lw    v0, 28236(v0)
+// 0x0101fc14: 0x101fc14: lw    v0, 28700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7059
+	ldc.i4 7175
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101fc08: 0x101fc08: addiu sp, sp, -24
+// 0x0101fc18: 0x101fc18: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fc0c: 0x101fc0c: sw    s0, 16(sp)
+// 0x0101fc1c: 0x101fc1c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4698,19 +4698,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101fc10: 0x101fc10: sw    ra, 20(sp)
-// 0x0101fc14: 0x101fc14: beq   v0, zero, 0x101fc28 addu  s0, a0, zero
+// 0x0101fc20: 0x101fc20: sw    ra, 20(sp)
+// 0x0101fc24: 0x101fc24: beq   v0, zero, 0x101fc38 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_101fc28
+	brfalse L_101fc38
 // --- basic block ---
-// 0x0101fc1c: 0x101fc1c: lui   a0, 0x1020000
+// 0x0101fc2c: 0x101fc2c: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0101fc20: 0x101fc20: jal   0x104fd00 addiu a0, a0, 6448
+// 0x0101fc30: 0x101fc30: jal   0x104fd10 addiu a0, a0, 6464
 	ldloc.1
-	ldc.i4 6448
+	ldc.i4 6464
 	add
 	stloc.1
 	ldloc.0
@@ -4718,24 +4718,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_101fc28:
-// 0x0101fc28: 0x101fc28: beq   s0, zero, 0x101fc3c lui   a1, 0x1020000
+L_101fc38:
+// 0x0101fc38: 0x101fc38: beq   s0, zero, 0x101fc4c lui   a1, 0x1020000
 	ldloc 7
 	ldc.i4 16908288
 	stloc.2
-	brfalse L_101fc3c
+	brfalse L_101fc4c
 // --- basic block ---
-// 0x0101fc30: 0x101fc30: addiu a1, a1, 6448
+// 0x0101fc40: 0x101fc40: addiu a1, a1, 6464
 	ldloc.2
-	ldc.i4 6448
+	ldc.i4 6464
 	add
 	stloc.2
-// 0x0101fc34: 0x101fc34: jal   0x104fe98 addiu a0, zero, 2500
+// 0x0101fc44: 0x101fc44: jal   0x104fea8 addiu a0, zero, 2500
 	ldc.i4 2500
 	stloc.1
 	ldloc.0
@@ -4743,26 +4743,26 @@ L_101fc28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_101fc3c:
-// 0x0101fc3c: 0x101fc3c: lw    ra, 20(sp)
-// 0x0101fc40: 0x101fc40: lui   v0, 0x30000
+L_101fc4c:
+// 0x0101fc4c: 0x101fc4c: lw    ra, 20(sp)
+// 0x0101fc50: 0x101fc50: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101fc44: 0x101fc44: sw    s0, 28236(v0)
+// 0x0101fc54: 0x101fc54: sw    s0, 28700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7059
+	ldc.i4 7175
 	add
 	ldloc 7
 	stelem.i4
-// 0x0101fc48: 0x101fc48: lw    s0, 16(sp)
+// 0x0101fc58: 0x101fc58: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4771,7 +4771,7 @@ L_101fc3c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101fc4c: 0x101fc4c: jr    ra addiu sp, sp, 24
+// 0x0101fc5c: 0x101fc5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4783,7 +4783,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -4818,47 +4818,47 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fc54: 0x101fc54: lui   v0, 0x30000
+// 0x0101fc64: 0x101fc64: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101fc58: 0x101fc58: lw    v1, 28340(v0)
+// 0x0101fc68: 0x101fc68: lw    v1, 28804(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7085
+	ldc.i4 7201
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101fc5c: 0x101fc5c: addiu sp, sp, -24
+// 0x0101fc6c: 0x101fc6c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fc60: 0x101fc60: bne   v1, zero, 0x101fc88 sw    ra, 20(sp)
+// 0x0101fc70: 0x101fc70: bne   v1, zero, 0x101fc98 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_101fc88
+	brtrue L_101fc98
 // --- basic block ---
-// 0x0101fc68: 0x101fc68: lui   a1, 0x1020000
+// 0x0101fc78: 0x101fc78: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x0101fc6c: 0x101fc6c: addiu v1, zero, 2
+// 0x0101fc7c: 0x101fc7c: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0101fc70: 0x101fc70: addiu a1, a1, 22188
+// 0x0101fc80: 0x101fc80: addiu a1, a1, 22204
 	ldloc.2
-	ldc.i4 22188
+	ldc.i4 22204
 	add
 	stloc.2
-// 0x0101fc74: 0x101fc74: addiu a0, zero, 20
+// 0x0101fc84: 0x101fc84: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0101fc78: 0x101fc78: jal   0x104fe98 sw    v1, 28340(v0)
+// 0x0101fc88: 0x101fc88: jal   0x104fea8 sw    v1, 28804(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7085
+	ldc.i4 7201
 	add
 	ldloc 5
 	stelem.i4
@@ -4867,33 +4867,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0101fc80: 0x101fc80: j	 0x101fc90 sll   zero, zero, 0
-	br L_101fc90
+// 0x0101fc90: 0x101fc90: j	 0x101fca0 sll   zero, zero, 0
+	br L_101fca0
 // --- basic block ---
-L_101fc88:
-// 0x0101fc88: 0x101fc88: addiu v1, v1, 1
+L_101fc98:
+// 0x0101fc98: 0x101fc98: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0101fc8c: 0x101fc8c: sw    v1, 28340(v0)
+// 0x0101fc9c: 0x101fc9c: sw    v1, 28804(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7085
+	ldc.i4 7201
 	add
 	ldloc 5
 	stelem.i4
-L_101fc90:
-// 0x0101fc90: 0x101fc90: lw    ra, 20(sp)
-// 0x0101fc94: 0x101fc94: sll   zero, zero, 0
-// 0x0101fc98: 0x101fc98: jr    ra addiu sp, sp, 24
+L_101fca0:
+// 0x0101fca0: 0x101fca0: lw    ra, 20(sp)
+// 0x0101fca4: 0x101fca4: sll   zero, zero, 0
+// 0x0101fca8: 0x101fca8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4905,7 +4905,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_touched_timer_101fca0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_touched_timer_101fcb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4940,18 +4940,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fca0: 0x101fca0: lui   a0, 0x1020000
+// 0x0101fcb0: 0x101fcb0: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0101fca4: 0x101fca4: addiu sp, sp, -24
+// 0x0101fcb4: 0x101fcb4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fca8: 0x101fca8: sw    ra, 20(sp)
-// 0x0101fcac: 0x101fcac: jal   0x104fd00 addiu a0, a0, -864
+// 0x0101fcb8: 0x101fcb8: sw    ra, 20(sp)
+// 0x0101fcbc: 0x101fcbc: jal   0x104fd10 addiu a0, a0, -848
 	ldloc.1
-	ldc.i4 -864
+	ldc.i4 -848
 	add
 	stloc.1
 	ldloc.0
@@ -4959,20 +4959,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101fcb4: 0x101fcb4: lui   v0, 0x30000
+// 0x0101fcc4: 0x101fcc4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101fcb8: 0x101fcb8: jal   0x101fc54 sw    zero, 28240(v0)
+// 0x0101fcc8: 0x101fcc8: jal   0x101fc64 sw    zero, 28704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4981,14 +4981,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101fcc0: 0x101fcc0: lw    ra, 20(sp)
-// 0x0101fcc4: 0x101fcc4: sll   zero, zero, 0
-// 0x0101fcc8: 0x101fcc8: jr    ra addiu sp, sp, 24
+// 0x0101fcd0: 0x101fcd0: lw    ra, 20(sp)
+// 0x0101fcd4: 0x101fcd4: sll   zero, zero, 0
+// 0x0101fcd8: 0x101fcd8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5000,7 +5000,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_unfreeze_101fcfc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_unfreeze_101fd0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5035,33 +5035,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fcfc: 0x101fcfc: lui   v0, 0x30000
+// 0x0101fd0c: 0x101fd0c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101fd00: 0x101fd00: lw    v1, 28252(v0)
+// 0x0101fd10: 0x101fd10: lw    v1, 28716(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7063
+	ldc.i4 7179
 	add
 	ldelem.i4
 	stloc 7
-// 0x0101fd04: 0x101fd04: addiu sp, sp, -24
+// 0x0101fd14: 0x101fd14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fd08: 0x101fd08: beq   v1, zero, 0x101fd18 sw    ra, 20(sp)
+// 0x0101fd18: 0x101fd18: beq   v1, zero, 0x101fd28 sw    ra, 20(sp)
 	ldloc 7
-	brfalse L_101fd18
+	brfalse L_101fd28
 // --- basic block ---
-// 0x0101fd10: 0x101fd10: jal   0x101fc54 sw    zero, 28252(v0)
+// 0x0101fd20: 0x101fd20: jal   0x101fc64 sw    zero, 28716(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7063
+	ldc.i4 7179
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5070,15 +5070,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_101fd18:
-// 0x0101fd18: 0x101fd18: lw    ra, 20(sp)
-// 0x0101fd1c: 0x101fd1c: sll   zero, zero, 0
-// 0x0101fd20: 0x101fd20: jr    ra addiu sp, sp, 24
+L_101fd28:
+// 0x0101fd28: 0x101fd28: lw    ra, 20(sp)
+// 0x0101fd2c: 0x101fd2c: sll   zero, zero, 0
+// 0x0101fd30: 0x101fd30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5090,7 +5090,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_show_top_bar_101fd28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_show_top_bar_101fd38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -5125,57 +5125,57 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fd28: 0x101fd28: addiu sp, sp, -24
+// 0x0101fd38: 0x101fd38: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fd2c: 0x101fd2c: sw    ra, 20(sp)
-// 0x0101fd30: 0x101fd30: jal   0x10a6ff0 sll   zero, zero, 0
+// 0x0101fd3c: 0x101fd3c: sw    ra, 20(sp)
+// 0x0101fd40: 0x101fd40: jal   0x10a7638 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isShowTopBarOnTap_10a6ff0(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isShowTopBarOnTap_10a7638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0101fd38: 0x101fd38: beq   v0, zero, 0x101fd54 addiu v1, zero, 1
+// 0x0101fd48: 0x101fd48: beq   v0, zero, 0x101fd64 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brfalse L_101fd54
+	brfalse L_101fd64
 // --- basic block ---
-// 0x0101fd40: 0x101fd40: lui   v0, 0x30000
+// 0x0101fd50: 0x101fd50: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0101fd44: 0x101fd44: lw    v1, 28240(v0)
+// 0x0101fd54: 0x101fd54: lw    v1, 28704(v0)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101fd48: 0x101fd48: sll   zero, zero, 0
-// 0x0101fd4c: 0x101fd4c: sltu  v1, zero, v1
+// 0x0101fd58: 0x101fd58: sll   zero, zero, 0
+// 0x0101fd5c: 0x101fd5c: sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0101fd50: 0x101fd50: subu  v1, zero, v1
+// 0x0101fd60: 0x101fd60: subu  v1, zero, v1
 	ldloc 5
 	neg
 	stloc 5
-L_101fd54:
-// 0x0101fd54: 0x101fd54: lw    ra, 20(sp)
-// 0x0101fd58: 0x101fd58: addu  v0, v1, zero
+L_101fd64:
+// 0x0101fd64: 0x101fd64: lw    ra, 20(sp)
+// 0x0101fd68: 0x101fd68: addu  v0, v1, zero
 	ldloc 5
 	stloc 6
-// 0x0101fd5c: 0x101fd5c: jr    ra addiu sp, sp, 24
+// 0x0101fd6c: 0x101fd6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5187,7 +5187,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_show_screen_icons_101fd64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_show_screen_icons_101fd74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5222,26 +5222,26 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fd64: 0x101fd64: lui   a0, 0x0
+// 0x0101fd74: 0x101fd74: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0101fd68: 0x101fd68: lui   a1, 0x20000
+// 0x0101fd78: 0x101fd78: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0101fd6c: 0x101fd6c: addiu sp, sp, -24
+// 0x0101fd7c: 0x101fd7c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fd70: 0x101fd70: addiu a0, a0, 6052
+// 0x0101fd80: 0x101fd80: addiu a0, a0, 6052
 	ldloc.1
 	ldc.i4 6052
 	add
 	stloc.1
-// 0x0101fd74: 0x101fd74: sw    ra, 20(sp)
-// 0x0101fd78: 0x101fd78: jal   0x100e7f4 addiu a1, a1, 9464
+// 0x0101fd84: 0x101fd84: sw    ra, 20(sp)
+// 0x0101fd88: 0x101fd88: jal   0x100e804 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -5249,18 +5249,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0101fd80: 0x101fd80: lw    ra, 20(sp)
-// 0x0101fd84: 0x101fd84: sltu  v0, zero, v0
+// 0x0101fd90: 0x101fd90: lw    ra, 20(sp)
+// 0x0101fd94: 0x101fd94: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0101fd88: 0x101fd88: jr    ra addiu sp, sp, 24
+// 0x0101fd98: 0x101fd98: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5272,7 +5272,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_show_icons_only_when_touched_101fd90(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_show_icons_only_when_touched_101fda0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5307,65 +5307,65 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fd90: 0x101fd90: addiu sp, sp, -24
+// 0x0101fda0: 0x101fda0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fd94: 0x101fd94: sw    ra, 20(sp)
-// 0x0101fd98: 0x101fd98: jal   0x1052da4 sll   zero, zero, 0
-	call int32 Cibyl61::roadmap_is_touchScreen_supported_1052da4()
+// 0x0101fda4: 0x101fda4: sw    ra, 20(sp)
+// 0x0101fda8: 0x101fda8: jal   0x1052db4 sll   zero, zero, 0
+	call int32 Cibyl61::roadmap_is_touchScreen_supported_1052db4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101fda0: 0x101fda0: beq   v0, zero, 0x101fdcc addu  v0, zero, zero
+// 0x0101fdb0: 0x101fdb0: beq   v0, zero, 0x101fddc addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_101fdcc
+	brfalse L_101fddc
 // --- basic block ---
-// 0x0101fda8: 0x101fda8: jal   0x101fd64 sll   zero, zero, 0
+// 0x0101fdb8: 0x101fdb8: jal   0x101fd74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_show_screen_icons_101fd64(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_show_screen_icons_101fd74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101fdb0: 0x101fdb0: bne   v0, zero, 0x101fdc8 lui   v0, 0x30000
+// 0x0101fdc0: 0x101fdc0: bne   v0, zero, 0x101fdd8 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_101fdc8
+	brtrue L_101fdd8
 // --- basic block ---
-// 0x0101fdb8: 0x101fdb8: lw    v1, 28240(v0)
+// 0x0101fdc8: 0x101fdc8: lw    v1, 28704(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc 6
-// 0x0101fdbc: 0x101fdbc: sll   zero, zero, 0
-// 0x0101fdc0: 0x101fdc0: beq   v1, zero, 0x101fdcc addiu v0, zero, -1
+// 0x0101fdcc: 0x101fdcc: sll   zero, zero, 0
+// 0x0101fdd0: 0x101fdd0: beq   v1, zero, 0x101fddc addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 5
-	brfalse L_101fdcc
+	brfalse L_101fddc
 // --- basic block ---
-L_101fdc8:
-// 0x0101fdc8: 0x101fdc8: addu  v0, zero, zero
+L_101fdd8:
+// 0x0101fdd8: 0x101fdd8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_101fdcc:
-// 0x0101fdcc: 0x101fdcc: lw    ra, 20(sp)
-// 0x0101fdd0: 0x101fdd0: sll   zero, zero, 0
-// 0x0101fdd4: 0x101fdd4: jr    ra addiu sp, sp, 24
+L_101fddc:
+// 0x0101fddc: 0x101fddc: lw    ra, 20(sp)
+// 0x0101fde0: 0x101fde0: sll   zero, zero, 0
+// 0x0101fde4: 0x101fde4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5377,7 +5377,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_get_orientation_mode_touched_101fddc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_get_orientation_mode_touched_101fdec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5412,51 +5412,51 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fddc: 0x101fddc: addiu sp, sp, -24
+// 0x0101fdec: 0x101fdec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0101fde0: 0x101fde0: sw    ra, 20(sp)
-// 0x0101fde4: 0x101fde4: jal   0x101fd90 sll   zero, zero, 0
+// 0x0101fdf0: 0x101fdf0: sw    ra, 20(sp)
+// 0x0101fdf4: 0x101fdf4: jal   0x101fda0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_show_icons_only_when_touched_101fd90(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_show_icons_only_when_touched_101fda0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0101fdec: 0x101fdec: addiu a0, zero, -1
+// 0x0101fdfc: 0x101fdfc: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0101fdf0: 0x101fdf0: beq   v0, a0, 0x101fe00 addiu v1, zero, -1
+// 0x0101fe00: 0x101fe00: beq   v0, a0, 0x101fe10 addiu v1, zero, -1
 	ldloc 5
 	ldloc.1
 	ldc.i4.m1
 	stloc 6
-	beq  L_101fe00
+	beq  L_101fe10
 // --- basic block ---
-// 0x0101fdf8: 0x101fdf8: lui   v0, 0x30000
+// 0x0101fe08: 0x101fe08: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101fdfc: 0x101fdfc: lw    v1, 28348(v0)
+// 0x0101fe0c: 0x101fe0c: lw    v1, 28812(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldelem.i4
 	stloc 6
-L_101fe00:
-// 0x0101fe00: 0x101fe00: lw    ra, 20(sp)
-// 0x0101fe04: 0x101fe04: addu  v0, v1, zero
+L_101fe10:
+// 0x0101fe10: 0x101fe10: lw    ra, 20(sp)
+// 0x0101fe14: 0x101fe14: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0101fe08: 0x101fe08: jr    ra addiu sp, sp, 24
+// 0x0101fe18: 0x101fe18: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5468,7 +5468,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_flush_polygons_101fe10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_flush_polygons_101fe20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s5,int32 s0,int32 s1,int32 t0,int32 s4,int32 t3,int32 s6,int32 s2,int32 s7,int32 s8,int32 t1,int32 ra,int32 t2,int32 t4)
@@ -5545,15 +5545,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0101fe10: 0x101fe10: addiu sp, sp, -80
+// 0x0101fe20: 0x101fe20: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0101fe14: 0x101fe14: lui   v0, 0x30000
+// 0x0101fe24: 0x101fe24: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101fe18: 0x101fe18: sw    s1, 44(sp)
+// 0x0101fe28: 0x101fe28: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5562,34 +5562,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0101fe1c: 0x101fe1c: lw    s1, 28532(v0)
+// 0x0101fe2c: 0x101fe2c: lw    s1, 28996(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 11
-// 0x0101fe20: 0x101fe20: lui   v0, 0x30000
+// 0x0101fe30: 0x101fe30: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0101fe24: 0x101fe24: addiu v0, v0, 28540
+// 0x0101fe34: 0x101fe34: addiu v0, v0, 29004
 	ldloc 5
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc 5
-// 0x0101fe28: 0x101fe28: subu  s1, s1, v0
+// 0x0101fe38: 0x101fe38: subu  s1, s1, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 11
-// 0x0101fe2c: 0x101fe2c: sra   s1, s1, 2
+// 0x0101fe3c: 0x101fe3c: sra   s1, s1, 2
 	ldloc 11
 	ldc.i4.2
 	shr
 	stloc 11
-// 0x0101fe30: 0x101fe30: sw    s5, 60(sp)
+// 0x0101fe40: 0x101fe40: sw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5598,8 +5598,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0101fe34: 0x101fe34: sw    ra, 76(sp)
-// 0x0101fe38: 0x101fe38: sw    s8, 72(sp)
+// 0x0101fe44: 0x101fe44: sw    ra, 76(sp)
+// 0x0101fe48: 0x101fe48: sw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5608,7 +5608,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0101fe3c: 0x101fe3c: sw    s7, 68(sp)
+// 0x0101fe4c: 0x101fe4c: sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5617,7 +5617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0101fe40: 0x101fe40: sw    s6, 64(sp)
+// 0x0101fe50: 0x101fe50: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5626,7 +5626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101fe44: 0x101fe44: sw    s4, 56(sp)
+// 0x0101fe54: 0x101fe54: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5635,7 +5635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0101fe48: 0x101fe48: sw    s3, 52(sp)
+// 0x0101fe58: 0x101fe58: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5644,7 +5644,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0101fe4c: 0x101fe4c: sw    s2, 48(sp)
+// 0x0101fe5c: 0x101fe5c: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5653,7 +5653,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0101fe50: 0x101fe50: sw    s0, 40(sp)
+// 0x0101fe60: 0x101fe60: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5662,47 +5662,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0101fe54: 0x101fe54: beq   s1, zero, 0x10200a0 addu  s5, a0, zero
+// 0x0101fe64: 0x101fe64: beq   s1, zero, 0x10200b0 addu  s5, a0, zero
 	ldloc 11
 	ldloc.1
 	stloc 9
-	brfalse L_10200a0
+	brfalse L_10200b0
 // --- basic block ---
-// 0x0101fe5c: 0x101fe5c: beq   a0, zero, 0x101ff1c lui   t1, 0x40000
+// 0x0101fe6c: 0x101fe6c: beq   a0, zero, 0x101ff2c lui   t1, 0x40000
 	ldloc.1
 	ldc.i4 262144
 	stloc 19
-	brfalse L_101ff1c
+	brfalse L_101ff2c
 // --- basic block ---
-// 0x0101fe64: 0x101fe64: addiu t1, t1, -20612
+// 0x0101fe74: 0x101fe74: addiu t1, t1, -20148
 	ldloc 19
-	ldc.i4 -20612
+	ldc.i4 -20148
 	add
 	stloc 19
-// 0x0101fe68: 0x101fe68: addu  v1, zero, zero
+// 0x0101fe78: 0x101fe78: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0101fe6c: 0x101fe6c: j	 0x101fee8 addu  a2, zero, zero
+// 0x0101fe7c: 0x101fe7c: j	 0x101fef8 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_101fee8
+	br L_101fef8
 // --- basic block ---
-L_101fe74:
-// 0x0101fe74: 0x101fe74: lw    t3, 0(a1)
+L_101fe84:
+// 0x0101fe84: 0x101fe84: lw    t3, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x0101fe78: 0x101fe78: sll   zero, zero, 0
-// 0x0101fe7c: 0x101fe7c: bne   t3, zero, 0x101febc addiu t0, zero, 1
+// 0x0101fe88: 0x101fe88: sll   zero, zero, 0
+// 0x0101fe8c: 0x101fe8c: bne   t3, zero, 0x101fecc addiu t0, zero, 1
 	ldloc 14
 	ldc.i4.1
 	stloc 12
-	brtrue L_101febc
+	brtrue L_101fecc
 // --- basic block ---
-// 0x0101fe84: 0x101fe84: lw    t3, 4(a1)
+// 0x0101fe94: 0x101fe94: lw    t3, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5711,12 +5711,12 @@ L_101fe74:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101fe88: 0x101fe88: sll   zero, zero, 0
-// 0x0101fe8c: 0x101fe8c: bne   t3, zero, 0x101febc sll   zero, zero, 0
+// 0x0101fe98: 0x101fe98: sll   zero, zero, 0
+// 0x0101fe9c: 0x101fe9c: bne   t3, zero, 0x101fecc sll   zero, zero, 0
 	ldloc 14
-	brtrue L_101febc
+	brtrue L_101fecc
 // --- basic block ---
-// 0x0101fe94: 0x101fe94: lw    t4, -4(a0)
+// 0x0101fea4: 0x101fea4: lw    t4, -4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5725,7 +5725,7 @@ L_101fe74:
 	add
 	ldelem.i4
 	stloc 22
-// 0x0101fe98: 0x101fe98: lw    t3, 4(a0)
+// 0x0101fea8: 0x101fea8: lw    t3, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5734,22 +5734,22 @@ L_101fe74:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0101fe9c: 0x101fe9c: sll   zero, zero, 0
-// 0x0101fea0: 0x101fea0: beq   t4, t3, 0x101febc addu  t0, zero, zero
+// 0x0101feac: 0x101feac: sll   zero, zero, 0
+// 0x0101feb0: 0x101feb0: beq   t4, t3, 0x101fecc addu  t0, zero, zero
 	ldloc 22
 	ldloc 14
 	ldc.i4.s 0
 	stloc 12
-	beq  L_101febc
+	beq  L_101fecc
 // --- basic block ---
-// 0x0101fea8: 0x101fea8: lw    t3, 0(a0)
+// 0x0101feb8: 0x101feb8: lw    t3, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x0101feac: 0x101feac: lw    t0, 8(a0)
+// 0x0101febc: 0x101febc: lw    t0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5758,166 +5758,166 @@ L_101fe74:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0101feb0: 0x101feb0: sll   zero, zero, 0
-// 0x0101feb4: 0x101feb4: xor   t0, t3, t0
+// 0x0101fec0: 0x101fec0: sll   zero, zero, 0
+// 0x0101fec4: 0x101fec4: xor   t0, t3, t0
 	ldloc 14
 	ldloc 12
 	xor
 	stloc 12
-// 0x0101feb8: 0x101feb8: sltu  t0, zero, t0
+// 0x0101fec8: 0x101fec8: sltu  t0, zero, t0
 	ldc.i4.s 0
 	ldloc 12
 	clt.un
 	stloc 12
-L_101febc:
-// 0x0101febc: 0x101febc: sw    t0, 0(a1)
+L_101fecc:
+// 0x0101fecc: 0x101fecc: sw    t0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x0101fec0: 0x101fec0: addiu v1, v1, 1
+// 0x0101fed0: 0x101fed0: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0101fec4: 0x101fec4: addiu a3, a3, 1
+// 0x0101fed4: 0x101fed4: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x0101fec8: 0x101fec8: addiu a1, a1, 4
+// 0x0101fed8: 0x101fed8: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x0101fecc: 0x101fecc: addiu a0, a0, 8
+// 0x0101fedc: 0x101fedc: addiu a0, a0, 8
 	ldloc.1
 	ldc.i4.8
 	add
 	stloc.1
-L_101fed0:
-// 0x0101fed0: 0x101fed0: slt   t0, a3, t2
+L_101fee0:
+// 0x0101fee0: 0x101fee0: slt   t0, a3, t2
 	ldloc 4
 	ldloc 21
 	clt
 	stloc 12
-// 0x0101fed4: 0x101fed4: bne   t0, zero, 0x101fe74 sll   zero, zero, 0
+// 0x0101fee4: 0x101fee4: bne   t0, zero, 0x101fe84 sll   zero, zero, 0
 	ldloc 12
-	brtrue L_101fe74
+	brtrue L_101fe84
 // --- basic block ---
-// 0x0101fedc: 0x101fedc: addiu v1, v1, 1
+// 0x0101feec: 0x101feec: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0101fee0: 0x101fee0: addiu a2, a2, 1
+// 0x0101fef0: 0x101fef0: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0101fee4: 0x101fee4: addiu v0, v0, 4
+// 0x0101fef4: 0x101fef4: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-L_101fee8:
-// 0x0101fee8: 0x101fee8: slt   a0, a2, s1
+L_101fef8:
+// 0x0101fef8: 0x101fef8: slt   a0, a2, s1
 	ldloc.3
 	ldloc 11
 	clt
 	stloc.1
-// 0x0101feec: 0x101feec: beq   a0, zero, 0x101ff1c addiu a1, v1, 8194
+// 0x0101fefc: 0x101fefc: beq   a0, zero, 0x101ff2c addiu a1, v1, 8194
 	ldloc.1
 	ldloc 7
 	ldc.i4 8194
 	add
 	stloc.2
-	brfalse L_101ff1c
+	brfalse L_101ff2c
 // --- basic block ---
-// 0x0101fef4: 0x101fef4: addiu a0, v1, 1
+// 0x0101ff04: 0x101ff04: addiu a0, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0101fef8: 0x101fef8: sll   a1, a1, 2
+// 0x0101ff08: 0x101ff08: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0101fefc: 0x101fefc: sll   a0, a0, 3
+// 0x0101ff0c: 0x101ff0c: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0101ff00: 0x101ff00: addu  a1, t1, a1
+// 0x0101ff10: 0x101ff10: addu  a1, t1, a1
 	ldloc 19
 	ldloc.2
 	add
 	stloc.2
-// 0x0101ff04: 0x101ff04: addu  a0, t1, a0
+// 0x0101ff14: 0x101ff14: addu  a0, t1, a0
 	ldloc 19
 	ldloc.1
 	add
 	stloc.1
-// 0x0101ff08: 0x101ff08: addiu a1, a1, 4
+// 0x0101ff18: 0x101ff18: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x0101ff0c: 0x101ff0c: addiu a0, a0, 8
+// 0x0101ff1c: 0x101ff1c: addiu a0, a0, 8
 	ldloc.1
 	ldc.i4.8
 	add
 	stloc.1
-// 0x0101ff10: 0x101ff10: lw    t2, 0(v0)
+// 0x0101ff20: 0x101ff20: lw    t2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 21
-// 0x0101ff14: 0x101ff14: j	 0x101fed0 addiu a3, zero, 1
+// 0x0101ff24: 0x101ff24: j	 0x101fee0 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-	br L_101fed0
+	br L_101fee0
 // --- basic block ---
-L_101ff1c:
-// 0x0101ff1c: 0x101ff1c: lui   s3, 0x40000
+L_101ff2c:
+// 0x0101ff2c: 0x101ff2c: lui   s3, 0x40000
 	ldc.i4 262144
 	stloc 8
-// 0x0101ff20: 0x101ff20: lw    a0, -20612(s3)
+// 0x0101ff30: 0x101ff30: lw    a0, -20148(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.1
-// 0x0101ff24: 0x101ff24: lui   s0, 0x40000
+// 0x0101ff34: 0x101ff34: lui   s0, 0x40000
 	ldc.i4 262144
 	stloc 10
-// 0x0101ff28: 0x101ff28: addiu s0, s0, -20600
+// 0x0101ff38: 0x101ff38: addiu s0, s0, -20136
 	ldloc 10
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 10
-// 0x0101ff2c: 0x101ff2c: subu  a0, a0, s0
+// 0x0101ff3c: 0x101ff3c: subu  a0, a0, s0
 	ldloc.1
 	ldloc 10
 	sub
 	stloc.1
-// 0x0101ff30: 0x101ff30: sra   a0, a0, 3
+// 0x0101ff40: 0x101ff40: sra   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-// 0x0101ff34: 0x101ff34: addu  a1, s0, zero
+// 0x0101ff44: 0x101ff44: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0101ff38: 0x101ff38: jal   0x10072a4 lui   s2, 0x30000
+// 0x0101ff48: 0x101ff48: jal   0x10072b4 lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 16
 	ldloc.0
@@ -5925,38 +5925,38 @@ L_101ff1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ff40: 0x101ff40: lui   s4, 0x30000
+// 0x0101ff50: 0x101ff50: lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 13
-// 0x0101ff44: 0x101ff44: lw    v0, 28228(s2)
+// 0x0101ff54: 0x101ff54: lw    v0, 28692(s2)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101ff48: 0x101ff48: addu  a0, s1, zero
+// 0x0101ff58: 0x101ff58: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0101ff4c: 0x101ff4c: addiu a1, s4, 28540
+// 0x0101ff5c: 0x101ff5c: addiu a1, s4, 29004
 	ldloc 13
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc.2
-// 0x0101ff50: 0x101ff50: addu  a2, s0, zero
+// 0x0101ff60: 0x101ff60: addu  a2, s0, zero
 	ldloc 10
 	stloc.3
-// 0x0101ff54: 0x101ff54: addiu a3, zero, 1
+// 0x0101ff64: 0x101ff64: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0101ff58: 0x101ff58: jal   0x104ef80 sw    v0, 16(sp)
+// 0x0101ff68: 0x101ff68: jal   0x104ef90 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5970,18 +5970,18 @@ L_101ff1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ff60: 0x101ff60: beq   s5, zero, 0x1020084 lui   v1, 0x30000
+// 0x0101ff70: 0x101ff70: beq   s5, zero, 0x1020094 lui   v1, 0x30000
 	ldloc 9
 	ldc.i4 196608
 	stloc 7
-	brfalse L_1020084
+	brfalse L_1020094
 // --- basic block ---
-// 0x0101ff68: 0x101ff68: jal   0x104e35c addu  a0, s5, zero
+// 0x0101ff78: 0x101ff78: jal   0x104e36c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5989,15 +5989,15 @@ L_101ff1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ff70: 0x101ff70: addiu a0, zero, 1
+// 0x0101ff80: 0x101ff80: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101ff74: 0x101ff74: sw    v0, 32(sp)
+// 0x0101ff84: 0x101ff84: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6006,53 +6006,53 @@ L_101ff1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0101ff78: 0x101ff78: jal   0x104dd5c addiu s4, s4, 28540
+// 0x0101ff88: 0x101ff88: jal   0x104dd6c addiu s4, s4, 29004
 	ldloc 13
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc 13
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0101ff80: 0x101ff80: addu  s5, zero, zero
+// 0x0101ff90: 0x101ff90: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0101ff84: 0x101ff84: addu  s7, zero, zero
+// 0x0101ff94: 0x101ff94: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 17
-// 0x0101ff88: 0x101ff88: addiu s6, zero, 1
+// 0x0101ff98: 0x101ff98: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 15
-// 0x0101ff8c: 0x101ff8c: j	 0x1020068 addiu s0, sp, 24
+// 0x0101ff9c: 0x101ff9c: j	 0x1020078 addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-	br L_1020068
+	br L_1020078
 // --- basic block ---
-L_101ff94:
-// 0x0101ff94: 0x101ff94: lui   v0, 0x40000
+L_101ffa4:
+// 0x0101ffa4: 0x101ffa4: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x0101ff98: 0x101ff98: sll   s3, s3, 2
+// 0x0101ffa8: 0x101ffa8: sll   s3, s3, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x0101ff9c: 0x101ff9c: addiu v0, v0, -20612
+// 0x0101ffac: 0x101ffac: addiu v0, v0, -20148
 	ldloc 5
-	ldc.i4 -20612
+	ldc.i4 -20148
 	add
 	stloc 5
-// 0x0101ffa0: 0x101ffa0: addu  s3, v0, s3
+// 0x0101ffb0: 0x101ffb0: addu  s3, v0, s3
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0101ffa4: 0x101ffa4: sw    s6, 24(sp)
+// 0x0101ffb4: 0x101ffb4: sw    s6, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6061,25 +6061,25 @@ L_101ff94:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0101ffa8: 0x101ffa8: addiu s3, s3, 4
+// 0x0101ffb8: 0x101ffb8: addiu s3, s3, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x0101ffac: 0x101ffac: j	 0x1020010 addiu s8, zero, 1
+// 0x0101ffbc: 0x101ffbc: j	 0x1020020 addiu s8, zero, 1
 	ldc.i4.1
 	stloc 18
-	br L_1020010
+	br L_1020020
 // --- basic block ---
-L_101ffb4:
-// 0x0101ffb4: 0x101ffb4: lw    v1, 0(s3)
+L_101ffc4:
+// 0x0101ffc4: 0x101ffc4: lw    v1, 0(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0101ffb8: 0x101ffb8: lw    v0, 24(sp)
+// 0x0101ffc8: 0x101ffc8: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6088,20 +6088,20 @@ L_101ffb4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0101ffbc: 0x101ffbc: beq   v1, zero, 0x101ffd0 subu  a2, s6, v0
+// 0x0101ffcc: 0x101ffcc: beq   v1, zero, 0x101ffe0 subu  a2, s6, v0
 	ldloc 7
 	ldloc 15
 	ldloc 5
 	sub
 	stloc.3
-	brfalse L_101ffd0
+	brfalse L_101ffe0
 // --- basic block ---
-// 0x0101ffc4: 0x101ffc4: addiu v0, v0, 1
+// 0x0101ffd4: 0x101ffd4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0101ffc8: 0x101ffc8: j	 0x1020004 sw    v0, 24(sp)
+// 0x0101ffd8: 0x101ffd8: j	 0x1020014 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6110,67 +6110,67 @@ L_101ffb4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1020004
+	br L_1020014
 // --- basic block ---
-L_101ffd0:
-// 0x0101ffd0: 0x101ffd0: addu  a2, a2, s5
+L_101ffe0:
+// 0x0101ffe0: 0x101ffe0: addu  a2, a2, s5
 	ldloc.3
 	ldloc 9
 	add
 	stloc.3
-// 0x0101ffd4: 0x101ffd4: lui   v1, 0x40000
+// 0x0101ffe4: 0x101ffe4: lui   v1, 0x40000
 	ldc.i4 262144
 	stloc 7
-// 0x0101ffd8: 0x101ffd8: sll   a2, a2, 3
+// 0x0101ffe8: 0x101ffe8: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x0101ffdc: 0x101ffdc: addiu v1, v1, -20600
+// 0x0101ffec: 0x101ffec: addiu v1, v1, -20136
 	ldloc 7
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 7
-// 0x0101ffe0: 0x101ffe0: slti  v0, v0, 2
+// 0x0101fff0: 0x101fff0: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0101ffe4: 0x101ffe4: addu  a2, v1, a2
+// 0x0101fff4: 0x101fff4: addu  a2, v1, a2
 	ldloc 7
 	ldloc.3
 	add
 	stloc.3
-// 0x0101ffe8: 0x101ffe8: addiu a0, zero, 1
+// 0x0101fff8: 0x101fff8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0101ffec: 0x101ffec: bne   v0, zero, 0x1020004 addu  a1, s0, zero
+// 0x0101fffc: 0x101fffc: bne   v0, zero, 0x1020014 addu  a1, s0, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brtrue L_1020004
+	brtrue L_1020014
 // --- basic block ---
-// 0x0101fff4: 0x101fff4: lw    a3, 28228(s2)
+// 0x01020004: 0x1020004: lw    a3, 28692(s2)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 4
-// 0x0101fff8: 0x101fff8: jal   0x104f290 sll   zero, zero, 0
+// 0x01020008: 0x1020008: jal   0x104f2a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f290(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f2a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01020000: 0x1020000: sw    s6, 24(sp)
+// 0x01020010: 0x1020010: sw    s6, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6179,41 +6179,41 @@ L_101ffd0:
 	add
 	ldloc 15
 	stelem.i4
-L_1020004:
-// 0x01020004: 0x1020004: addiu s5, s5, 1
+L_1020014:
+// 0x01020014: 0x1020014: addiu s5, s5, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01020008: 0x1020008: addiu s8, s8, 1
+// 0x01020018: 0x1020018: addiu s8, s8, 1
 	ldloc 18
 	ldc.i4.1
 	add
 	stloc 18
-// 0x0102000c: 0x102000c: addiu s3, s3, 4
+// 0x0102001c: 0x102001c: addiu s3, s3, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_1020010:
-// 0x01020010: 0x1020010: lw    v0, 0(s4)
+L_1020020:
+// 0x01020020: 0x1020020: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01020014: 0x1020014: sll   zero, zero, 0
-// 0x01020018: 0x1020018: slt   v0, s8, v0
+// 0x01020024: 0x1020024: sll   zero, zero, 0
+// 0x01020028: 0x1020028: slt   v0, s8, v0
 	ldloc 18
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102001c: 0x102001c: bne   v0, zero, 0x101ffb4 sll   zero, zero, 0
+// 0x0102002c: 0x102002c: bne   v0, zero, 0x101ffc4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_101ffb4
+	brtrue L_101ffc4
 // --- basic block ---
-// 0x01020024: 0x1020024: lw    a2, 24(sp)
+// 0x01020034: 0x1020034: lw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6222,56 +6222,56 @@ L_1020010:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020028: 0x1020028: sll   zero, zero, 0
-// 0x0102002c: 0x102002c: slti  v0, a2, 2
+// 0x01020038: 0x1020038: sll   zero, zero, 0
+// 0x0102003c: 0x102003c: slti  v0, a2, 2
 	ldloc.3
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01020030: 0x1020030: bne   v0, zero, 0x102005c subu  a2, s6, a2
+// 0x01020040: 0x1020040: bne   v0, zero, 0x102006c subu  a2, s6, a2
 	ldloc 5
 	ldloc 15
 	ldloc.3
 	sub
 	stloc.3
-	brtrue L_102005c
+	brtrue L_102006c
 // --- basic block ---
-// 0x01020038: 0x1020038: addu  a2, a2, s5
+// 0x01020048: 0x1020048: addu  a2, a2, s5
 	ldloc.3
 	ldloc 9
 	add
 	stloc.3
-// 0x0102003c: 0x102003c: lui   v0, 0x40000
+// 0x0102004c: 0x102004c: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x01020040: 0x1020040: sll   a2, a2, 3
+// 0x01020050: 0x1020050: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x01020044: 0x1020044: addiu v0, v0, -20600
+// 0x01020054: 0x1020054: addiu v0, v0, -20136
 	ldloc 5
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 5
-// 0x01020048: 0x1020048: lw    a3, 28228(s2)
+// 0x01020058: 0x1020058: lw    a3, 28692(s2)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102004c: 0x102004c: addu  a2, v0, a2
+// 0x0102005c: 0x102005c: addu  a2, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc.3
-// 0x01020050: 0x1020050: addiu a0, zero, 1
+// 0x01020060: 0x1020060: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01020054: 0x1020054: jal   0x104f290 addu  a1, s0, zero
+// 0x01020064: 0x1020064: jal   0x104f2a0 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -6279,42 +6279,42 @@ L_1020010:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f290(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f2a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102005c:
-// 0x0102005c: 0x102005c: addiu s5, s5, 1
+L_102006c:
+// 0x0102006c: 0x102006c: addiu s5, s5, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01020060: 0x1020060: addiu s7, s7, 1
+// 0x01020070: 0x1020070: addiu s7, s7, 1
 	ldloc 17
 	ldc.i4.1
 	add
 	stloc 17
-// 0x01020064: 0x1020064: addiu s4, s4, 4
+// 0x01020074: 0x1020074: addiu s4, s4, 4
 	ldloc 13
 	ldc.i4.4
 	add
 	stloc 13
-L_1020068:
-// 0x01020068: 0x1020068: slt   v0, s7, s1
+L_1020078:
+// 0x01020078: 0x1020078: slt   v0, s7, s1
 	ldloc 17
 	ldloc 11
 	clt
 	stloc 5
-// 0x0102006c: 0x102006c: bne   v0, zero, 0x101ff94 addiu s3, s5, 8194
+// 0x0102007c: 0x102007c: bne   v0, zero, 0x101ffa4 addiu s3, s5, 8194
 	ldloc 5
 	ldloc 9
 	ldc.i4 8194
 	add
 	stloc 8
-	brtrue L_101ff94
+	brtrue L_101ffa4
 // --- basic block ---
-// 0x01020074: 0x1020074: lw    a0, 32(sp)
+// 0x01020084: 0x1020084: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6323,61 +6323,61 @@ L_1020068:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020078: 0x1020078: jal   0x104e35c sll   zero, zero, 0
+// 0x01020088: 0x1020088: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01020080: 0x1020080: lui   v1, 0x30000
+// 0x01020090: 0x1020090: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-L_1020084:
-// 0x01020084: 0x1020084: addiu v1, v1, 28540
+L_1020094:
+// 0x01020094: 0x1020094: addiu v1, v1, 29004
 	ldloc 7
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc 7
-// 0x01020088: 0x1020088: lui   v0, 0x30000
+// 0x01020098: 0x1020098: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102008c: 0x102008c: sw    v1, 28532(v0)
+// 0x0102009c: 0x102009c: sw    v1, 28996(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc 7
 	stelem.i4
-// 0x01020090: 0x1020090: lui   v1, 0x40000
+// 0x010200a0: 0x10200a0: lui   v1, 0x40000
 	ldc.i4 262144
 	stloc 7
-// 0x01020094: 0x1020094: addiu v1, v1, -20600
+// 0x010200a4: 0x10200a4: addiu v1, v1, -20136
 	ldloc 7
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 7
-// 0x01020098: 0x1020098: lui   v0, 0x40000
+// 0x010200a8: 0x10200a8: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x0102009c: 0x102009c: sw    v1, -20612(v0)
+// 0x010200ac: 0x10200ac: sw    v1, -20148(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 7
 	stelem.i4
-L_10200a0:
-// 0x010200a0: 0x10200a0: lw    ra, 76(sp)
-// 0x010200a4: 0x10200a4: lw    s8, 72(sp)
+L_10200b0:
+// 0x010200b0: 0x10200b0: lw    ra, 76(sp)
+// 0x010200b4: 0x10200b4: lw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6386,7 +6386,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010200a8: 0x10200a8: lw    s7, 68(sp)
+// 0x010200b8: 0x10200b8: lw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6395,7 +6395,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010200ac: 0x10200ac: lw    s6, 64(sp)
+// 0x010200bc: 0x10200bc: lw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6404,7 +6404,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010200b0: 0x10200b0: lw    s5, 60(sp)
+// 0x010200c0: 0x10200c0: lw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6413,7 +6413,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010200b4: 0x10200b4: lw    s4, 56(sp)
+// 0x010200c4: 0x10200c4: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6422,7 +6422,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010200b8: 0x10200b8: lw    s3, 52(sp)
+// 0x010200c8: 0x10200c8: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6431,7 +6431,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010200bc: 0x10200bc: lw    s2, 48(sp)
+// 0x010200cc: 0x10200cc: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6440,7 +6440,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010200c0: 0x10200c0: lw    s1, 44(sp)
+// 0x010200d0: 0x10200d0: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6449,7 +6449,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010200c4: 0x10200c4: lw    s0, 40(sp)
+// 0x010200d4: 0x10200d4: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6458,7 +6458,7 @@ L_10200a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010200c8: 0x10200c8: jr    ra addiu sp, sp, 80
+// 0x010200d8: 0x10200d8: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -6470,7 +6470,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_draw_object_10200d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_draw_object_10200e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 lo,int32 v1,int32 s2,int32 s0,int32 s5,int32 s4,int32 s7,int32 s8,int32 s1,int32 s6,int32 s3,int32 ra,int32 t0)
@@ -6538,12 +6538,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010200d0: 0x10200d0: addiu sp, sp, -80
+// 0x010200e0: 0x10200e0: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010200d4: 0x10200d4: sw    s6, 64(sp)
+// 0x010200e4: 0x10200e4: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6552,7 +6552,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010200d8: 0x10200d8: sw    s5, 60(sp)
+// 0x010200e8: 0x10200e8: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6561,7 +6561,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010200dc: 0x10200dc: sw    s4, 56(sp)
+// 0x010200ec: 0x10200ec: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6570,7 +6570,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010200e0: 0x10200e0: sw    s3, 52(sp)
+// 0x010200f0: 0x10200f0: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6579,7 +6579,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010200e4: 0x10200e4: sw    s2, 48(sp)
+// 0x010200f4: 0x10200f4: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6588,8 +6588,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010200e8: 0x10200e8: sw    ra, 76(sp)
-// 0x010200ec: 0x10200ec: sw    s8, 72(sp)
+// 0x010200f8: 0x10200f8: sw    ra, 76(sp)
+// 0x010200fc: 0x10200fc: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6598,7 +6598,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010200f0: 0x10200f0: sw    s7, 68(sp)
+// 0x01020100: 0x1020100: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6607,7 +6607,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010200f4: 0x10200f4: sw    s1, 44(sp)
+// 0x01020104: 0x1020104: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6616,7 +6616,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010200f8: 0x10200f8: sw    s0, 40(sp)
+// 0x01020108: 0x1020108: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6625,10 +6625,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010200fc: 0x10200fc: addu  s2, a1, zero
+// 0x0102010c: 0x102010c: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01020100: 0x1020100: lw    s6, 96(sp)
+// 0x01020110: 0x1020110: lw    s6, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6637,7 +6637,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01020104: 0x1020104: lw    s4, 104(sp)
+// 0x01020114: 0x1020114: lw    s4, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6646,7 +6646,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01020108: 0x1020108: lw    s3, 116(sp)
+// 0x01020118: 0x1020118: lw    s3, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6655,13 +6655,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0102010c: 0x102010c: beq   a1, zero, 0x10202e8 addu  s5, a3, zero
+// 0x0102011c: 0x102011c: beq   a1, zero, 0x10202f8 addu  s5, a3, zero
 	ldloc.2
 	ldloc 4
 	stloc 11
-	brfalse L_10202e8
+	brfalse L_10202f8
 // --- basic block ---
-// 0x01020114: 0x1020114: lw    v0, 100(sp)
+// 0x01020124: 0x1020124: lw    v0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6670,7 +6670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020118: 0x1020118: lw    v1, 4(a3)
+// 0x01020128: 0x1020128: lw    v1, 4(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -6679,30 +6679,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102011c: 0x102011c: lw    a0, 0(a3)
+// 0x0102012c: 0x102012c: lw    a0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01020120: 0x1020120: beq   v0, zero, 0x10202e8 addiu s1, sp, 24
+// 0x01020130: 0x1020130: beq   v0, zero, 0x10202f8 addiu s1, sp, 24
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-	brfalse L_10202e8
+	brfalse L_10202f8
 // --- basic block ---
-// 0x01020128: 0x1020128: lui   a1, 0xe0000
+// 0x01020138: 0x1020138: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x0102012c: 0x102012c: addiu a1, a1, 29604
+// 0x0102013c: 0x102013c: addiu a1, a1, 30068
 	ldloc.2
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.2
-// 0x01020130: 0x1020130: lw    a3, 80(a1)
+// 0x01020140: 0x1020140: lw    a3, 80(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6711,7 +6711,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020134: 0x1020134: lw    t0, 76(a1)
+// 0x01020144: 0x1020144: lw    t0, 76(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6720,7 +6720,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01020138: 0x1020138: lw    v0, 36(a1)
+// 0x01020148: 0x1020148: lw    v0, 36(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6729,7 +6729,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102013c: 0x102013c: lw    a1, 32(a1)
+// 0x0102014c: 0x102014c: lw    a1, 32(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6738,28 +6738,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01020140: 0x1020140: subu  a0, a0, a3
+// 0x01020150: 0x1020150: subu  a0, a0, a3
 	ldloc.1
 	ldloc 4
 	sub
 	stloc.1
-// 0x01020144: 0x1020144: div   a0, a1
+// 0x01020154: 0x1020154: div   a0, a1
 	ldloc.1
 	ldloc.2
 	div
 	stloc 7
-// 0x01020148: 0x1020148: subu  v1, t0, v1
+// 0x01020158: 0x1020158: subu  v1, t0, v1
 	ldloc 19
 	ldloc 8
 	sub
 	stloc 8
-// 0x0102014c: 0x102014c: addiu a0, zero, 1
+// 0x0102015c: 0x102015c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01020150: 0x1020150: addu  a1, s1, zero
+// 0x01020160: 0x1020160: addu  a1, s1, zero
 	ldloc 15
 	stloc.2
-// 0x01020154: 0x1020154: sw    a2, 32(sp)
+// 0x01020164: 0x1020164: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6768,10 +6768,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01020158: 0x1020158: mflo  lo
+// 0x01020168: 0x1020168: mflo  lo
 	ldloc 7
 	stloc 4
-// 0x0102015c: 0x102015c: sw    a3, 24(sp)
+// 0x0102016c: 0x102016c: sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6780,16 +6780,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01020160: 0x1020160: sll   zero, zero, 0
-// 0x01020164: 0x1020164: div   v1, v0
+// 0x01020170: 0x1020170: sll   zero, zero, 0
+// 0x01020174: 0x1020174: div   v1, v0
 	ldloc 8
 	ldloc 6
 	div
 	stloc 7
-// 0x01020168: 0x1020168: mflo  lo
+// 0x01020178: 0x1020178: mflo  lo
 	ldloc 7
 	stloc 8
-// 0x0102016c: 0x102016c: jal   0x10072a4 sw    v1, 28(sp)
+// 0x0102017c: 0x102017c: jal   0x10072b4 sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6803,12 +6803,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01020174: 0x1020174: lw    a2, 32(sp)
+// 0x01020184: 0x1020184: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6817,14 +6817,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020178: 0x1020178: sll   zero, zero, 0
-// 0x0102017c: 0x102017c: beq   a2, zero, 0x10202e8 addu  a0, zero, zero
+// 0x01020188: 0x1020188: sll   zero, zero, 0
+// 0x0102018c: 0x102018c: beq   a2, zero, 0x10202f8 addu  a0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10202e8
+	brfalse L_10202f8
 // --- basic block ---
-// 0x01020184: 0x1020184: jal   0x10a1918 addiu a1, zero, 1
+// 0x01020194: 0x1020194: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6832,36 +6832,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102018c: 0x102018c: beq   v0, zero, 0x10202d8 addu  s0, v0, zero
+// 0x0102019c: 0x102019c: beq   v0, zero, 0x10202e8 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 10
-	brfalse L_10202d8
+	brfalse L_10202e8
 // --- basic block ---
-// 0x01020194: 0x1020194: lw    s8, 0(s6)
+// 0x010201a4: 0x10201a4: lw    s8, 0(s6)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x01020198: 0x1020198: addiu s5, zero, 100
+// 0x010201a8: 0x10201a8: addiu s5, zero, 100
 	ldc.i4.s 100
 	stloc 11
-// 0x0102019c: 0x102019c: mult  s4, s8
+// 0x010201ac: 0x10201ac: mult  s4, s8
 	ldloc 12
 	ldloc 14
 	mul
 	stloc 7
-// 0x010201a0: 0x10201a0: addu  a0, v0, zero
+// 0x010201b0: 0x10201b0: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010201a4: 0x10201a4: lw    s7, 24(sp)
+// 0x010201b4: 0x10201b4: lw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6870,29 +6870,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010201a8: 0x10201a8: mflo  lo
+// 0x010201b8: 0x10201b8: mflo  lo
 	ldloc 7
 	stloc 14
-// 0x010201ac: 0x10201ac: sll   zero, zero, 0
-// 0x010201b0: 0x10201b0: sll   zero, zero, 0
-// 0x010201b4: 0x10201b4: div   s8, s5
+// 0x010201bc: 0x10201bc: sll   zero, zero, 0
+// 0x010201c0: 0x10201c0: sll   zero, zero, 0
+// 0x010201c4: 0x10201c4: div   s8, s5
 	ldloc 14
 	ldloc 11
 	div
 	stloc 7
-// 0x010201b8: 0x10201b8: mflo  lo
+// 0x010201c8: 0x10201c8: mflo  lo
 	ldloc 7
 	stloc 14
-// 0x010201bc: 0x10201bc: jal   0x104dffc addiu s2, zero, -200
+// 0x010201cc: 0x10201cc: jal   0x104e00c addiu s2, zero, -200
 	ldc.i4 -200
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010201c4: 0x10201c4: lw    v1, 4(s6)
+// 0x010201d4: 0x10201d4: lw    v1, 4(s6)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -6901,20 +6901,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010201c8: 0x10201c8: addu  s7, s8, s7
+// 0x010201d8: 0x10201d8: addu  s7, s8, s7
 	ldloc 14
 	ldloc 13
 	add
 	stloc 13
-// 0x010201cc: 0x10201cc: mult  v0, s4
+// 0x010201dc: 0x10201dc: mult  v0, s4
 	ldloc 6
 	ldloc 12
 	mul
 	stloc 7
-// 0x010201d0: 0x10201d0: addu  a0, s0, zero
+// 0x010201e0: 0x10201e0: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x010201d4: 0x10201d4: lw    s6, 28(sp)
+// 0x010201e4: 0x10201e4: lw    s6, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6923,44 +6923,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010201d8: 0x10201d8: mflo  lo
+// 0x010201e8: 0x10201e8: mflo  lo
 	ldloc 7
 	stloc 6
-// 0x010201dc: 0x10201dc: sll   zero, zero, 0
-// 0x010201e0: 0x10201e0: sll   zero, zero, 0
-// 0x010201e4: 0x10201e4: div   v0, s2
+// 0x010201ec: 0x10201ec: sll   zero, zero, 0
+// 0x010201f0: 0x10201f0: sll   zero, zero, 0
+// 0x010201f4: 0x10201f4: div   v0, s2
 	ldloc 6
 	ldloc 9
 	div
 	stloc 7
-// 0x010201e8: 0x10201e8: mflo  lo
+// 0x010201f8: 0x10201f8: mflo  lo
 	ldloc 7
 	stloc 6
-// 0x010201ec: 0x10201ec: addu  s7, s7, v0
+// 0x010201fc: 0x10201fc: addu  s7, s7, v0
 	ldloc 13
 	ldloc 6
 	add
 	stloc 13
-// 0x010201f0: 0x10201f0: sll   zero, zero, 0
-// 0x010201f4: 0x10201f4: mult  s4, v1
+// 0x01020200: 0x1020200: sll   zero, zero, 0
+// 0x01020204: 0x1020204: mult  s4, v1
 	ldloc 12
 	ldloc 8
 	mul
 	stloc 7
-// 0x010201f8: 0x10201f8: mflo  lo
+// 0x01020208: 0x1020208: mflo  lo
 	ldloc 7
 	stloc 8
-// 0x010201fc: 0x10201fc: sll   zero, zero, 0
-// 0x01020200: 0x1020200: sll   zero, zero, 0
-// 0x01020204: 0x1020204: div   v1, s5
+// 0x0102020c: 0x102020c: sll   zero, zero, 0
+// 0x01020210: 0x1020210: sll   zero, zero, 0
+// 0x01020214: 0x1020214: div   v1, s5
 	ldloc 8
 	ldloc 11
 	div
 	stloc 7
-// 0x01020208: 0x1020208: mflo  lo
+// 0x01020218: 0x1020218: mflo  lo
 	ldloc 7
 	stloc 11
-// 0x0102020c: 0x102020c: jal   0x104e020 sw    s7, 24(sp)
+// 0x0102021c: 0x102021c: jal   0x104e030 sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6970,43 +6970,43 @@ __CIBYL_javamethod_begin:
 	ldloc 13
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01020214: 0x1020214: addu  s5, s5, s6
+// 0x01020224: 0x1020224: addu  s5, s5, s6
 	ldloc 11
 	ldloc 16
 	add
 	stloc 11
-// 0x01020218: 0x1020218: addu  a0, s0, zero
+// 0x01020228: 0x1020228: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0102021c: 0x102021c: mult  v0, s4
+// 0x0102022c: 0x102022c: mult  v0, s4
 	ldloc 6
 	ldloc 12
 	mul
 	stloc 7
-// 0x01020220: 0x1020220: mflo  lo
+// 0x01020230: 0x1020230: mflo  lo
 	ldloc 7
 	stloc 6
-// 0x01020224: 0x1020224: sll   zero, zero, 0
-// 0x01020228: 0x1020228: sll   zero, zero, 0
-// 0x0102022c: 0x102022c: div   v0, s2
+// 0x01020234: 0x1020234: sll   zero, zero, 0
+// 0x01020238: 0x1020238: sll   zero, zero, 0
+// 0x0102023c: 0x102023c: div   v0, s2
 	ldloc 6
 	ldloc 9
 	div
 	stloc 7
-// 0x01020230: 0x1020230: mflo  lo
+// 0x01020240: 0x1020240: mflo  lo
 	ldloc 7
 	stloc 9
-// 0x01020234: 0x1020234: addu  s5, s5, s2
+// 0x01020244: 0x1020244: addu  s5, s5, s2
 	ldloc 11
 	ldloc 9
 	add
 	stloc 11
-// 0x01020238: 0x1020238: jal   0x104dffc sw    s5, 28(sp)
+// 0x01020248: 0x1020248: jal   0x104e00c sw    s5, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7016,21 +7016,21 @@ __CIBYL_javamethod_begin:
 	ldloc 11
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01020240: 0x1020240: jal   0x104e020 addu  a0, s0, zero
+// 0x01020250: 0x1020250: jal   0x104e030 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01020248: 0x1020248: lw    a2, 108(sp)
+// 0x01020258: 0x1020258: lw    a2, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7039,13 +7039,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102024c: 0x102024c: addu  a0, s0, zero
+// 0x0102025c: 0x102025c: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x01020250: 0x1020250: addu  a1, s1, zero
+// 0x01020260: 0x1020260: addu  a1, s1, zero
 	ldloc 15
 	stloc.2
-// 0x01020254: 0x1020254: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01020264: 0x1020264: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -7053,18 +7053,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102025c: 0x102025c: beq   s3, zero, 0x10202e8 addu  a0, s0, zero
+// 0x0102026c: 0x102026c: beq   s3, zero, 0x10202f8 addu  a0, s0, zero
 	ldloc 17
 	ldloc 10
 	stloc.1
-	brfalse L_10202e8
+	brfalse L_10202f8
 // --- basic block ---
-// 0x01020264: 0x1020264: lw    s4, 24(sp)
+// 0x01020274: 0x1020274: lw    s4, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7073,24 +7073,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01020268: 0x1020268: jal   0x104dffc addiu s2, zero, 2
+// 0x01020278: 0x1020278: jal   0x104e00c addiu s2, zero, 2
 	ldc.i4.2
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01020270: 0x1020270: div   v0, s2
+// 0x01020280: 0x1020280: div   v0, s2
 	ldloc 6
 	ldloc 9
 	div
 	stloc 7
-// 0x01020274: 0x1020274: addu  a0, s0, zero
+// 0x01020284: 0x1020284: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x01020278: 0x1020278: lw    s0, 28(sp)
+// 0x01020288: 0x1020288: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7099,15 +7099,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102027c: 0x102027c: mflo  lo
+// 0x0102028c: 0x102028c: mflo  lo
 	ldloc 7
 	stloc 6
-// 0x01020280: 0x1020280: addu  s4, v0, s4
+// 0x01020290: 0x1020290: addu  s4, v0, s4
 	ldloc 6
 	ldloc 12
 	add
 	stloc 12
-// 0x01020284: 0x1020284: jal   0x104e020 sw    s4, 24(sp)
+// 0x01020294: 0x1020294: jal   0x104e030 sw    s4, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7117,36 +7117,36 @@ __CIBYL_javamethod_begin:
 	ldloc 12
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102028c: 0x102028c: div   v0, s2
+// 0x0102029c: 0x102029c: div   v0, s2
 	ldloc 6
 	ldloc 9
 	div
 	stloc 7
-// 0x01020290: 0x1020290: lui   a0, 0x10000
+// 0x010202a0: 0x10202a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01020294: 0x1020294: addu  a1, zero, zero
+// 0x010202a4: 0x10202a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01020298: 0x1020298: addiu a0, a0, -29580
+// 0x010202a8: 0x10202a8: addiu a0, a0, -29580
 	ldloc.1
 	ldc.i4 -29580
 	add
 	stloc.1
-// 0x0102029c: 0x102029c: mflo  lo
+// 0x010202ac: 0x10202ac: mflo  lo
 	ldloc 7
 	stloc 9
-// 0x010202a0: 0x10202a0: addu  s0, s2, s0
+// 0x010202b0: 0x10202b0: addu  s0, s2, s0
 	ldloc 9
 	ldloc 10
 	add
 	stloc 10
-// 0x010202a4: 0x10202a4: jal   0x104ef00 sw    s0, 28(sp)
+// 0x010202b4: 0x10202b4: jal   0x104ef10 sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7160,15 +7160,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010202ac: 0x10202ac: lui   a0, 0x0
+// 0x010202bc: 0x10202bc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010202b0: 0x10202b0: jal   0x104edb0 addiu a0, a0, 23008
+// 0x010202c0: 0x10202c0: jal   0x104edc0 addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
@@ -7178,24 +7178,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010202b8: 0x10202b8: addu  a0, s1, zero
+// 0x010202c8: 0x10202c8: addu  a0, s1, zero
 	ldloc 15
 	stloc.1
-// 0x010202bc: 0x10202bc: addiu a1, zero, 12
+// 0x010202cc: 0x10202cc: addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.2
-// 0x010202c0: 0x10202c0: addiu a2, zero, 12
+// 0x010202d0: 0x10202d0: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x010202c4: 0x10202c4: addiu a3, zero, 6
+// 0x010202d4: 0x10202d4: addiu a3, zero, 6
 	ldc.i4.6
 	stloc 4
-// 0x010202c8: 0x10202c8: jal   0x104ec20 sw    s3, 16(sp)
+// 0x010202d8: 0x10202d8: jal   0x104ec30 sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7209,16 +7209,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_formated_string_size_104ec20(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_formated_string_size_104ec30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010202d0: 0x10202d0: j	 0x10202e8 sll   zero, zero, 0
-	br L_10202e8
+// 0x010202e0: 0x10202e0: j	 0x10202f8 sll   zero, zero, 0
+	br L_10202f8
 // --- basic block ---
-L_10202d8:
-// 0x010202d8: 0x10202d8: lw    a2, 16(s5)
+L_10202e8:
+// 0x010202e8: 0x10202e8: lw    a2, 16(s5)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7227,10 +7227,10 @@ L_10202d8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010202dc: 0x10202dc: addu  a0, s2, zero
+// 0x010202ec: 0x10202ec: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010202e0: 0x10202e0: jal   0x101bb50 addu  a1, s1, zero
+// 0x010202f0: 0x10202f0: jal   0x101bb60 addu  a1, s1, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -7238,14 +7238,14 @@ L_10202d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10202e8:
-// 0x010202e8: 0x10202e8: lw    ra, 76(sp)
-// 0x010202ec: 0x10202ec: lw    s8, 72(sp)
+L_10202f8:
+// 0x010202f8: 0x10202f8: lw    ra, 76(sp)
+// 0x010202fc: 0x10202fc: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7254,7 +7254,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010202f0: 0x10202f0: lw    s7, 68(sp)
+// 0x01020300: 0x1020300: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7263,7 +7263,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010202f4: 0x10202f4: lw    s6, 64(sp)
+// 0x01020304: 0x1020304: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7272,7 +7272,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010202f8: 0x10202f8: lw    s5, 60(sp)
+// 0x01020308: 0x1020308: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7281,7 +7281,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010202fc: 0x10202fc: lw    s4, 56(sp)
+// 0x0102030c: 0x102030c: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7290,7 +7290,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01020300: 0x1020300: lw    s3, 52(sp)
+// 0x01020310: 0x1020310: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7299,7 +7299,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01020304: 0x1020304: lw    s2, 48(sp)
+// 0x01020314: 0x1020314: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7308,7 +7308,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01020308: 0x1020308: lw    s1, 44(sp)
+// 0x01020318: 0x1020318: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7317,7 +7317,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102030c: 0x102030c: lw    s0, 40(sp)
+// 0x0102031c: 0x102031c: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7326,7 +7326,7 @@ L_10202e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01020310: 0x1020310: jr    ra addiu sp, sp, 80
+// 0x01020320: 0x1020320: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -7338,7 +7338,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 is_screen_wide_1020318(int32,int32,int32,int32,int32)
+.method public static int32 is_screen_wide_1020328(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -7373,21 +7373,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020318: 0x1020318: addiu sp, sp, -24
+// 0x01020328: 0x1020328: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102031c: 0x102031c: sw    ra, 20(sp)
-// 0x01020320: 0x1020320: jal   0x104fa48 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa48()
+// 0x0102032c: 0x102032c: sw    ra, 20(sp)
+// 0x01020330: 0x1020330: jal   0x104fa58 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa58()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01020328: 0x1020328: lw    ra, 20(sp)
-// 0x0102032c: 0x102032c: sll   zero, zero, 0
-// 0x01020330: 0x1020330: jr    ra addiu sp, sp, 24
+// 0x01020338: 0x1020338: lw    ra, 20(sp)
+// 0x0102033c: 0x102033c: sll   zero, zero, 0
+// 0x01020340: 0x1020340: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7399,7 +7399,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_screen_adjust_width_1020388(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_adjust_width_1020398(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 ra)
@@ -7437,12 +7437,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020388: 0x1020388: addiu sp, sp, -32
+// 0x01020398: 0x1020398: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102038c: 0x102038c: sw    a0, 16(sp)
+// 0x0102039c: 0x102039c: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7451,14 +7451,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01020390: 0x1020390: sw    ra, 28(sp)
-// 0x01020394: 0x1020394: jal   0x104fa48 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa48()
+// 0x010203a0: 0x10203a0: sw    ra, 28(sp)
+// 0x010203a4: 0x10203a4: jal   0x104fa58 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa58()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102039c: 0x102039c: lw    a0, 16(sp)
+// 0x010203ac: 0x10203ac: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7467,48 +7467,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010203a0: 0x10203a0: bne   v0, zero, 0x10203ac addiu v1, zero, 480
+// 0x010203b0: 0x10203b0: bne   v0, zero, 0x10203bc addiu v1, zero, 480
 	ldloc 5
 	ldc.i4 480
 	stloc 7
-	brtrue L_10203ac
+	brtrue L_10203bc
 // --- basic block ---
-// 0x010203a8: 0x10203a8: addiu v1, zero, 320
+// 0x010203b8: 0x10203b8: addiu v1, zero, 320
 	ldc.i4 320
 	stloc 7
-L_10203ac:
-// 0x010203ac: 0x10203ac: lui   v0, 0xf0000
+L_10203bc:
+// 0x010203bc: 0x10203bc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010203b0: 0x10203b0: lw    v0, -30068(v0)
+// 0x010203c0: 0x10203c0: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x010203b4: 0x10203b4: lw    ra, 28(sp)
-// 0x010203b8: 0x10203b8: mult  a0, v0
+// 0x010203c4: 0x10203c4: lw    ra, 28(sp)
+// 0x010203c8: 0x10203c8: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 8
-// 0x010203bc: 0x10203bc: mflo  lo
+// 0x010203cc: 0x10203cc: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010203c0: 0x10203c0: sll   zero, zero, 0
-// 0x010203c4: 0x10203c4: sll   zero, zero, 0
-// 0x010203c8: 0x10203c8: div   a0, v1
+// 0x010203d0: 0x10203d0: sll   zero, zero, 0
+// 0x010203d4: 0x10203d4: sll   zero, zero, 0
+// 0x010203d8: 0x10203d8: div   a0, v1
 	ldloc.1
 	ldloc 7
 	div
 	stloc 8
-// 0x010203cc: 0x10203cc: mflo  lo
+// 0x010203dc: 0x10203dc: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010203d0: 0x10203d0: jr    ra addiu sp, sp, 32
+// 0x010203e0: 0x10203e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl24.j b/converted/Cibyl24.j
index d899d14..3712ff2 100644
--- a/converted/Cibyl24.j
+++ b/converted/Cibyl24.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl24::.ctor
 
-.method public static int32 roadmap_screen_set_initial_position_10203d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_set_initial_position_10203e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -79,15 +79,15 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010203d8: 0x10203d8: addiu sp, sp, -24
+// 0x010203e8: 0x10203e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010203dc: 0x10203dc: lui   v0, 0x30000
+// 0x010203ec: 0x10203ec: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010203e0: 0x10203e0: sw    s0, 16(sp)
+// 0x010203f0: 0x10203f0: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -96,16 +96,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010203e4: 0x10203e4: addiu s0, zero, 1
+// 0x010203f4: 0x10203f4: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x010203e8: 0x10203e8: sw    ra, 20(sp)
-// 0x010203ec: 0x10203ec: jal   0x101098c sw    s0, 28248(v0)
+// 0x010203f8: 0x10203f8: sw    ra, 20(sp)
+// 0x010203fc: 0x10203fc: jal   0x101099c sw    s0, 28712(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7062
+	ldc.i4 7178
 	add
 	ldloc 8
 	stelem.i4
@@ -114,18 +114,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_initialize_101098c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_initialize_101099c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010203f4: 0x10203f4: lui   a0, 0x10000
+// 0x01020404: 0x1020404: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010203f8: 0x10203f8: addu  a1, zero, zero
+// 0x01020408: 0x1020408: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010203fc: 0x10203fc: jal   0x104ef00 addiu a0, a0, -29568
+// 0x0102040c: 0x102040c: jal   0x104ef10 addiu a0, a0, -29568
 	ldloc.1
 	ldc.i4 -29568
 	add
@@ -135,28 +135,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020404: 0x1020404: lui   a0, 0x0
+// 0x01020414: 0x1020414: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01020408: 0x1020408: lui   v1, 0x30000
+// 0x01020418: 0x1020418: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0102040c: 0x102040c: addiu a0, a0, 6092
+// 0x0102041c: 0x102041c: addiu a0, a0, 6092
 	ldloc.1
 	ldc.i4 6092
 	add
 	stloc.1
-// 0x01020410: 0x1020410: jal   0x100e348 sw    v0, 28264(v1)
+// 0x01020420: 0x1020420: jal   0x100e358 sw    v0, 28728(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7066
+	ldc.i4 7182
 	add
 	ldloc 5
 	stelem.i4
@@ -165,12 +165,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020418: 0x1020418: jal   0x104edb0 addu  a0, v0, zero
+// 0x01020428: 0x1020428: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -178,18 +178,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020420: 0x1020420: lui   a0, 0x10000
+// 0x01020430: 0x1020430: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01020424: 0x1020424: addu  a1, zero, zero
+// 0x01020434: 0x1020434: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01020428: 0x1020428: jal   0x104ef00 addiu a0, a0, -29552
+// 0x01020438: 0x1020438: jal   0x104ef10 addiu a0, a0, -29552
 	ldloc.1
 	ldc.i4 -29552
 	add
@@ -199,36 +199,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020430: 0x1020430: lui   v1, 0x30000
+// 0x01020440: 0x1020440: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01020434: 0x1020434: addiu a0, zero, 4
+// 0x01020444: 0x1020444: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01020438: 0x1020438: jal   0x104dd5c sw    v0, 28344(v1)
+// 0x01020448: 0x1020448: jal   0x104dd6c sw    v0, 28808(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7086
+	ldc.i4 7202
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020440: 0x1020440: lui   a0, 0x10000
+// 0x01020450: 0x1020450: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01020444: 0x1020444: jal   0x104edb0 addiu a0, a0, -29540
+// 0x01020454: 0x1020454: jal   0x104edc0 addiu a0, a0, -29540
 	ldloc.1
 	ldc.i4 -29540
 	add
@@ -238,82 +238,82 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102044c: 0x102044c: jal   0x1010a4c sll   zero, zero, 0
+// 0x0102045c: 0x102045c: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020454: 0x1020454: lui   v0, 0xf0000
+// 0x01020464: 0x1020464: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01020458: 0x1020458: lw    a0, -30068(v0)
+// 0x01020468: 0x1020468: lw    a0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102045c: 0x102045c: lui   v0, 0xf0000
+// 0x0102046c: 0x102046c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01020460: 0x1020460: lw    v1, -30072(v0)
+// 0x01020470: 0x1020470: lw    v1, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020464: 0x1020464: sll   zero, zero, 0
-// 0x01020468: 0x1020468: slt   v1, v1, a0
+// 0x01020474: 0x1020474: sll   zero, zero, 0
+// 0x01020478: 0x1020478: slt   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x0102046c: 0x102046c: beq   v1, zero, 0x102047c lui   v0, 0x30000
+// 0x0102047c: 0x102047c: beq   v1, zero, 0x102048c lui   v0, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc 5
-	brfalse L_102047c
+	brfalse L_102048c
 // --- basic block ---
-// 0x01020474: 0x1020474: j	 0x1020480 sw    s0, 28528(v0)
+// 0x01020484: 0x1020484: j	 0x1020490 sw    s0, 28992(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7132
+	ldc.i4 7248
 	add
 	ldloc 8
 	stelem.i4
-	br L_1020480
+	br L_1020490
 // --- basic block ---
-L_102047c:
-// 0x0102047c: 0x102047c: sw    zero, 28528(v0)
+L_102048c:
+// 0x0102048c: 0x102048c: sw    zero, 28992(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7132
+	ldc.i4 7248
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1020480:
-// 0x01020480: 0x1020480: lw    ra, 20(sp)
-// 0x01020484: 0x1020484: lw    s0, 16(sp)
+L_1020490:
+// 0x01020490: 0x1020490: lw    ra, 20(sp)
+// 0x01020494: 0x1020494: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -322,7 +322,7 @@ L_1020480:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020488: 0x1020488: jr    ra addiu sp, sp, 24
+// 0x01020498: 0x1020498: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -334,7 +334,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_reset_pens_1020490(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_reset_pens_10204a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -369,19 +369,19 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020490: 0x1020490: lui   a0, 0x10000
+// 0x010204a0: 0x10204a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01020494: 0x1020494: addiu sp, sp, -24
+// 0x010204a4: 0x10204a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020498: 0x1020498: addu  a1, zero, zero
+// 0x010204a8: 0x10204a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102049c: 0x102049c: sw    ra, 20(sp)
-// 0x010204a0: 0x10204a0: jal   0x104ef00 addiu a0, a0, -29568
+// 0x010204ac: 0x10204ac: sw    ra, 20(sp)
+// 0x010204b0: 0x10204b0: jal   0x104ef10 addiu a0, a0, -29568
 	ldloc.1
 	ldc.i4 -29568
 	add
@@ -391,28 +391,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010204a8: 0x10204a8: lui   a0, 0x0
+// 0x010204b8: 0x10204b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010204ac: 0x10204ac: lui   v1, 0x30000
+// 0x010204bc: 0x10204bc: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010204b0: 0x10204b0: addiu a0, a0, 6092
+// 0x010204c0: 0x10204c0: addiu a0, a0, 6092
 	ldloc.1
 	ldc.i4 6092
 	add
 	stloc.1
-// 0x010204b4: 0x10204b4: jal   0x100e348 sw    v0, 28264(v1)
+// 0x010204c4: 0x10204c4: jal   0x100e358 sw    v0, 28728(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7066
+	ldc.i4 7182
 	add
 	ldloc 5
 	stelem.i4
@@ -421,12 +421,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010204bc: 0x10204bc: jal   0x104edb0 addu  a0, v0, zero
+// 0x010204cc: 0x10204cc: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -434,14 +434,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010204c4: 0x10204c4: lw    ra, 20(sp)
-// 0x010204c8: 0x10204c8: sll   zero, zero, 0
-// 0x010204cc: 0x10204cc: jr    ra addiu sp, sp, 24
+// 0x010204d4: 0x10204d4: lw    ra, 20(sp)
+// 0x010204d8: 0x10204d8: sll   zero, zero, 0
+// 0x010204dc: 0x10204dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -453,7 +453,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_shutdown_10204d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_shutdown_10204e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -491,15 +491,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010204d4: 0x10204d4: lui   a0, 0x30000
+// 0x010204e4: 0x10204e4: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x010204d8: 0x10204d8: addiu v0, a0, 28440
+// 0x010204e8: 0x10204e8: addiu v0, a0, 28904
 	ldloc.1
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc 5
-// 0x010204dc: 0x10204dc: lw    v1, 4(v0)
+// 0x010204ec: 0x10204ec: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -508,36 +508,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010204e0: 0x10204e0: lui   v0, 0x30000
+// 0x010204f0: 0x10204f0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010204e4: 0x10204e4: addiu sp, sp, -48
+// 0x010204f4: 0x10204f4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010204e8: 0x10204e8: lw    v0, 28456(v0)
+// 0x010204f8: 0x10204f8: lw    v0, 28920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldelem.i4
 	stloc 5
-// 0x010204ec: 0x10204ec: lw    a2, 28440(a0)
+// 0x010204fc: 0x10204fc: lw    a2, 28904(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7110
+	ldc.i4 7226
 	add
 	ldelem.i4
 	stloc.3
-// 0x010204f0: 0x10204f0: lui   a0, 0x10000
+// 0x01020500: 0x1020500: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010204f4: 0x10204f4: sw    s0, 40(sp)
+// 0x01020504: 0x1020504: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -546,20 +546,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010204f8: 0x10204f8: addiu a0, a0, -29680
+// 0x01020508: 0x1020508: addiu a0, a0, -29680
 	ldloc.1
 	ldc.i4 -29680
 	add
 	stloc.1
-// 0x010204fc: 0x10204fc: addiu a1, sp, 16
+// 0x0102050c: 0x102050c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01020500: 0x1020500: lui   s0, 0x30000
+// 0x01020510: 0x1020510: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x01020504: 0x1020504: sw    v0, 32(sp)
+// 0x01020514: 0x1020514: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -568,8 +568,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01020508: 0x1020508: sw    ra, 44(sp)
-// 0x0102050c: 0x102050c: sw    a2, 16(sp)
+// 0x01020518: 0x1020518: sw    ra, 44(sp)
+// 0x0102051c: 0x102051c: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -578,7 +578,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01020510: 0x1020510: jal   0x101f6a8 sw    v1, 20(sp)
+// 0x01020520: 0x1020520: jal   0x101f6b8 sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -592,33 +592,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_mobile_101f6a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_mobile_101f6b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01020518: 0x1020518: lw    v0, 28340(s0)
+// 0x01020528: 0x1020528: lw    v0, 28804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7085
+	ldc.i4 7201
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102051c: 0x102051c: sll   zero, zero, 0
-// 0x01020520: 0x1020520: beq   v0, zero, 0x102053c lui   v0, 0x30000
+// 0x0102052c: 0x102052c: sll   zero, zero, 0
+// 0x01020530: 0x1020530: beq   v0, zero, 0x102054c lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_102053c
+	brfalse L_102054c
 // --- basic block ---
-// 0x01020528: 0x1020528: lui   a0, 0x1020000
+// 0x01020538: 0x1020538: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102052c: 0x102052c: jal   0x104fd00 addiu a0, a0, 22188
+// 0x0102053c: 0x102053c: jal   0x104fd10 addiu a0, a0, 22204
 	ldloc.1
-	ldc.i4 22188
+	ldc.i4 22204
 	add
 	stloc.1
 	ldloc.0
@@ -626,41 +626,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01020534: 0x1020534: sw    zero, 28340(s0)
+// 0x01020544: 0x1020544: sw    zero, 28804(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7085
+	ldc.i4 7201
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01020538: 0x1020538: lui   v0, 0x30000
+// 0x01020548: 0x1020548: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_102053c:
-// 0x0102053c: 0x102053c: addiu v1, zero, 1
+L_102054c:
+// 0x0102054c: 0x102054c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01020540: 0x1020540: lw    ra, 44(sp)
-// 0x01020544: 0x1020544: sw    v1, 28252(v0)
+// 0x01020550: 0x1020550: lw    ra, 44(sp)
+// 0x01020554: 0x1020554: sw    v1, 28716(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7063
+	ldc.i4 7179
 	add
 	ldloc 7
 	stelem.i4
-// 0x01020548: 0x1020548: lui   v0, 0x30000
+// 0x01020558: 0x1020558: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102054c: 0x102054c: lw    s0, 40(sp)
+// 0x0102055c: 0x102055c: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -669,16 +669,16 @@ L_102053c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020550: 0x1020550: sw    zero, 28248(v0)
+// 0x01020560: 0x1020560: sw    zero, 28712(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7062
+	ldc.i4 7178
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01020554: 0x1020554: jr    ra addiu sp, sp, 48
+// 0x01020564: 0x1020564: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -690,7 +690,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_initialize_102055c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_initialize_102056c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 t1,int32 t2,int32 s2,int32 t3,int32 t0,int32 t4,int32 ra)
@@ -749,16 +749,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102055c: 0x102055c: addiu sp, sp, -40
+// 0x0102056c: 0x102056c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01020560: 0x1020560: addiu a0, zero, 8000
+// 0x01020570: 0x1020570: addiu a0, zero, 8000
 	ldc.i4 8000
 	stloc.1
-// 0x01020564: 0x1020564: sw    ra, 36(sp)
-// 0x01020568: 0x1020568: sw    s2, 32(sp)
+// 0x01020574: 0x1020574: sw    ra, 36(sp)
+// 0x01020578: 0x1020578: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -767,7 +767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102056c: 0x102056c: sw    s1, 28(sp)
+// 0x0102057c: 0x102057c: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -776,7 +776,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01020570: 0x1020570: jal   0x1000910 sw    s0, 24(sp)
+// 0x01020580: 0x1020580: jal   0x1000910 sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -795,16 +795,16 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020578: 0x1020578: addu  a0, v0, zero
+// 0x01020588: 0x1020588: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102057c: 0x102057c: addu  a1, zero, zero
+// 0x0102058c: 0x102058c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01020580: 0x1020580: addiu a2, zero, 8000
+// 0x01020590: 0x1020590: addiu a2, zero, 8000
 	ldc.i4 8000
 	stloc.3
-// 0x01020584: 0x1020584: jal   0x100177c addu  s0, v0, zero
+// 0x01020594: 0x1020594: jal   0x100177c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -816,29 +816,29 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102058c: 0x102058c: lui   a0, 0x10000
+// 0x0102059c: 0x102059c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01020590: 0x1020590: lui   v0, 0x30000
+// 0x010205a0: 0x10205a0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020594: 0x1020594: addu  a2, s0, zero
+// 0x010205a4: 0x10205a4: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x01020598: 0x1020598: addiu a0, a0, -29532
+// 0x010205a8: 0x10205a8: addiu a0, a0, -29532
 	ldloc.1
 	ldc.i4 -29532
 	add
 	stloc.1
-// 0x0102059c: 0x102059c: addiu a1, zero, 4294
+// 0x010205ac: 0x10205ac: addiu a1, zero, 4294
 	ldc.i4 4294
 	stloc.2
-// 0x010205a0: 0x10205a0: jal   0x1004a38 sw    s0, 28276(v0)
+// 0x010205b0: 0x10205b0: jal   0x1004a48 sw    s0, 28740(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7069
+	ldc.i4 7185
 	add
 	ldloc 8
 	stelem.i4
@@ -847,36 +847,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010205a8: 0x10205a8: lui   s0, 0x10000
+// 0x010205b8: 0x10205b8: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010205ac: 0x10205ac: lui   a1, 0x0
+// 0x010205bc: 0x10205bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010205b0: 0x10205b0: lui   a2, 0x0
+// 0x010205c0: 0x10205c0: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010205b4: 0x10205b4: addiu a0, s0, 12560
+// 0x010205c4: 0x10205c4: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010205b8: 0x10205b8: addiu a1, a1, 6108
+// 0x010205c8: 0x10205c8: addiu a1, a1, 6108
 	ldloc.2
 	ldc.i4 6108
 	add
 	stloc.2
-// 0x010205bc: 0x10205bc: addiu a2, a2, 24152
+// 0x010205cc: 0x10205cc: addiu a2, a2, 24152
 	ldloc.3
 	ldc.i4 24152
 	add
 	stloc.3
-// 0x010205c0: 0x10205c0: jal   0x100edb0 addu  a3, zero, zero
+// 0x010205d0: 0x10205d0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -884,36 +884,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010205c8: 0x10205c8: lui   a0, 0x0
+// 0x010205d8: 0x10205d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010205cc: 0x10205cc: lui   a1, 0x0
+// 0x010205dc: 0x10205dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010205d0: 0x10205d0: lui   a2, 0x10000
+// 0x010205e0: 0x10205e0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010205d4: 0x10205d4: addiu a0, a0, 26236
+// 0x010205e4: 0x10205e4: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x010205d8: 0x10205d8: addiu a1, a1, 6092
+// 0x010205e8: 0x10205e8: addiu a1, a1, 6092
 	ldloc.2
 	ldc.i4 6092
 	add
 	stloc.2
-// 0x010205dc: 0x10205dc: addiu a2, a2, -29504
+// 0x010205ec: 0x10205ec: addiu a2, a2, -29504
 	ldloc.3
 	ldc.i4 -29504
 	add
 	stloc.3
-// 0x010205e0: 0x10205e0: jal   0x100edb0 addu  a3, zero, zero
+// 0x010205f0: 0x10205f0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -921,44 +921,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010205e8: 0x10205e8: lui   s2, 0x0
+// 0x010205f8: 0x10205f8: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010205ec: 0x10205ec: lui   s1, 0x20000
+// 0x010205fc: 0x10205fc: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x010205f0: 0x10205f0: lui   a1, 0x0
+// 0x01020600: 0x1020600: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010205f4: 0x10205f4: addiu s1, s1, 9464
+// 0x01020604: 0x1020604: addiu s1, s1, 9928
 	ldloc 9
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 9
-// 0x010205f8: 0x10205f8: addiu a0, s0, 12560
+// 0x01020608: 0x1020608: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010205fc: 0x10205fc: addiu a3, s2, 20820
+// 0x0102060c: 0x102060c: addiu a3, s2, 20820
 	ldloc 12
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01020600: 0x1020600: addiu a1, a1, 6068
+// 0x01020610: 0x1020610: addiu a1, a1, 6068
 	ldloc.2
 	ldc.i4 6068
 	add
 	stloc.2
-// 0x01020604: 0x1020604: addu  a2, zero, zero
+// 0x01020614: 0x1020614: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020608: 0x1020608: sw    s1, 16(sp)
+// 0x01020618: 0x1020618: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -967,7 +967,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102060c: 0x102060c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0102061c: 0x102061c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -981,44 +981,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020614: 0x1020614: lui   a1, 0x0
+// 0x01020624: 0x1020624: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01020618: 0x1020618: lui   a3, 0x10000
+// 0x01020628: 0x1020628: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102061c: 0x102061c: lui   v0, 0x10000
+// 0x0102062c: 0x102062c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01020620: 0x1020620: addiu a0, s0, 12560
+// 0x01020630: 0x1020630: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01020624: 0x1020624: addiu a1, a1, 6124
+// 0x01020634: 0x1020634: addiu a1, a1, 6124
 	ldloc.2
 	ldc.i4 6124
 	add
 	stloc.2
-// 0x01020628: 0x1020628: addiu a3, a3, -29496
+// 0x01020638: 0x1020638: addiu a3, a3, -29496
 	ldloc 4
 	ldc.i4 -29496
 	add
 	stloc 4
-// 0x0102062c: 0x102062c: addu  a2, zero, zero
+// 0x0102063c: 0x102063c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020630: 0x1020630: addiu v0, v0, -29488
+// 0x01020640: 0x1020640: addiu v0, v0, -29488
 	ldloc 5
 	ldc.i4 -29488
 	add
 	stloc 5
-// 0x01020634: 0x1020634: sw    v0, 16(sp)
+// 0x01020644: 0x1020644: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1027,7 +1027,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01020638: 0x1020638: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01020648: 0x1020648: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1041,33 +1041,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020640: 0x1020640: lui   a1, 0x0
+// 0x01020650: 0x1020650: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01020644: 0x1020644: addiu a0, s0, 12560
+// 0x01020654: 0x1020654: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01020648: 0x1020648: addiu a3, s2, 20820
+// 0x01020658: 0x1020658: addiu a3, s2, 20820
 	ldloc 12
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0102064c: 0x102064c: addiu a1, a1, 6140
+// 0x0102065c: 0x102065c: addiu a1, a1, 6140
 	ldloc.2
 	ldc.i4 6140
 	add
 	stloc.2
-// 0x01020650: 0x1020650: addu  a2, zero, zero
+// 0x01020660: 0x1020660: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020654: 0x1020654: sw    s1, 16(sp)
+// 0x01020664: 0x1020664: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1076,7 +1076,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01020658: 0x1020658: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01020668: 0x1020668: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1090,33 +1090,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020660: 0x1020660: lui   a1, 0x0
+// 0x01020670: 0x1020670: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01020664: 0x1020664: addiu a0, s0, 12560
+// 0x01020674: 0x1020674: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01020668: 0x1020668: addiu a3, s2, 20820
+// 0x01020678: 0x1020678: addiu a3, s2, 20820
 	ldloc 12
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0102066c: 0x102066c: addiu a1, a1, 6156
+// 0x0102067c: 0x102067c: addiu a1, a1, 6156
 	ldloc.2
 	ldc.i4 6156
 	add
 	stloc.2
-// 0x01020670: 0x1020670: addu  a2, zero, zero
+// 0x01020680: 0x1020680: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020674: 0x1020674: sw    s1, 16(sp)
+// 0x01020684: 0x1020684: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1125,7 +1125,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01020678: 0x1020678: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01020688: 0x1020688: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1139,47 +1139,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020680: 0x1020680: lui   a1, 0x0
+// 0x01020690: 0x1020690: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01020684: 0x1020684: lui   a3, 0x10000
+// 0x01020694: 0x1020694: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01020688: 0x1020688: lui   v0, 0x20000
+// 0x01020698: 0x1020698: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0102068c: 0x102068c: addiu a0, s0, 12560
+// 0x0102069c: 0x102069c: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01020690: 0x1020690: addiu a1, a1, 6172
+// 0x010206a0: 0x10206a0: addiu a1, a1, 6172
 	ldloc.2
 	ldc.i4 6172
 	add
 	stloc.2
-// 0x01020694: 0x1020694: addiu a3, a3, -18984
+// 0x010206a4: 0x10206a4: addiu a3, a3, -18984
 	ldloc 4
 	ldc.i4 -18984
 	add
 	stloc 4
-// 0x01020698: 0x1020698: addu  a2, zero, zero
+// 0x010206a8: 0x10206a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102069c: 0x102069c: addiu v0, v0, -6760
+// 0x010206ac: 0x10206ac: addiu v0, v0, -6296
 	ldloc 5
-	ldc.i4 -6760
+	ldc.i4 -6296
 	add
 	stloc 5
-// 0x010206a0: 0x10206a0: lui   s0, 0x20000
+// 0x010206b0: 0x10206b0: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010206a4: 0x10206a4: sw    v0, 16(sp)
+// 0x010206b4: 0x10206b4: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1188,7 +1188,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010206a8: 0x10206a8: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010206b8: 0x10206b8: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1202,44 +1202,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010206b0: 0x10206b0: lui   a1, 0x0
+// 0x010206c0: 0x10206c0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010206b4: 0x10206b4: lui   a3, 0x10000
+// 0x010206c4: 0x10206c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010206b8: 0x10206b8: lui   v0, 0x10000
+// 0x010206c8: 0x10206c8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010206bc: 0x10206bc: addiu a0, s0, -26888
+// 0x010206cc: 0x10206cc: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010206c0: 0x10206c0: addiu a1, a1, 6188
+// 0x010206d0: 0x10206d0: addiu a1, a1, 6188
 	ldloc.2
 	ldc.i4 6188
 	add
 	stloc.2
-// 0x010206c4: 0x10206c4: addiu a3, a3, -29480
+// 0x010206d4: 0x10206d4: addiu a3, a3, -29480
 	ldloc 4
 	ldc.i4 -29480
 	add
 	stloc 4
-// 0x010206c8: 0x10206c8: addu  a2, zero, zero
+// 0x010206d8: 0x10206d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010206cc: 0x10206cc: addiu v0, v0, -29476
+// 0x010206dc: 0x10206dc: addiu v0, v0, -29476
 	ldloc 5
 	ldc.i4 -29476
 	add
 	stloc 5
-// 0x010206d0: 0x10206d0: sw    v0, 16(sp)
+// 0x010206e0: 0x10206e0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1248,7 +1248,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010206d4: 0x10206d4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010206e4: 0x10206e4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1262,33 +1262,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010206dc: 0x10206dc: lui   a1, 0x0
+// 0x010206ec: 0x10206ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010206e0: 0x10206e0: addiu a3, s2, 20820
+// 0x010206f0: 0x10206f0: addiu a3, s2, 20820
 	ldloc 12
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x010206e4: 0x10206e4: addu  a2, zero, zero
+// 0x010206f4: 0x10206f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010206e8: 0x10206e8: addiu a0, s0, -26888
+// 0x010206f8: 0x10206f8: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010206ec: 0x10206ec: addiu a1, a1, 6052
+// 0x010206fc: 0x10206fc: addiu a1, a1, 6052
 	ldloc.2
 	ldc.i4 6052
 	add
 	stloc.2
-// 0x010206f0: 0x10206f0: sw    s1, 16(sp)
+// 0x01020700: 0x1020700: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1297,7 +1297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010206f4: 0x10206f4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01020704: 0x1020704: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1311,23 +1311,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010206fc: 0x10206fc: lui   a0, 0x1020000
+// 0x0102070c: 0x102070c: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01020700: 0x1020700: lui   s0, 0x1020000
+// 0x01020710: 0x1020710: lui   s0, 0x1020000
 	ldc.i4 16908288
 	stloc 8
-// 0x01020704: 0x1020704: addiu a0, a0, 4068
+// 0x01020714: 0x1020714: addiu a0, a0, 4084
 	ldloc.1
-	ldc.i4 4068
+	ldc.i4 4084
 	add
 	stloc.1
-// 0x01020708: 0x1020708: jal   0x104ba38 addu  a1, zero, zero
+// 0x01020718: 0x1020718: jal   0x104ba48 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1335,17 +1335,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba38(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020710: 0x1020710: addiu a0, s0, 22364
+// 0x01020720: 0x1020720: addiu a0, s0, 22380
 	ldloc 8
-	ldc.i4 22364
+	ldc.i4 22380
 	add
 	stloc.1
-// 0x01020714: 0x1020714: jal   0x104bad8 addu  a1, zero, zero
+// 0x01020724: 0x1020724: jal   0x104bae8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1353,20 +1353,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102071c: 0x102071c: lui   a0, 0x1020000
+// 0x0102072c: 0x102072c: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01020720: 0x1020720: addiu a0, a0, 5152
+// 0x01020730: 0x1020730: addiu a0, a0, 5168
 	ldloc.1
-	ldc.i4 5152
+	ldc.i4 5168
 	add
 	stloc.1
-// 0x01020724: 0x1020724: jal   0x104ba88 addu  a1, zero, zero
+// 0x01020734: 0x1020734: jal   0x104ba98 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1374,17 +1374,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_double_click_104ba88(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_double_click_104ba98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102072c: 0x102072c: addiu a0, s0, 22364
+// 0x0102073c: 0x102073c: addiu a0, s0, 22380
 	ldloc 8
-	ldc.i4 22364
+	ldc.i4 22380
 	add
 	stloc.1
-// 0x01020730: 0x1020730: jal   0x104ba60 addu  a1, zero, zero
+// 0x01020740: 0x1020740: jal   0x104ba70 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1392,20 +1392,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba60(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020738: 0x1020738: lui   a0, 0x1020000
+// 0x01020748: 0x1020748: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102073c: 0x102073c: addiu a0, a0, 5856
+// 0x0102074c: 0x102074c: addiu a0, a0, 5872
 	ldloc.1
-	ldc.i4 5856
+	ldc.i4 5872
 	add
 	stloc.1
-// 0x01020740: 0x1020740: jal   0x104b9e8 addu  a1, zero, zero
+// 0x01020750: 0x1020750: jal   0x104b9f8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1413,20 +1413,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_drag_start_104b9e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_drag_start_104b9f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020748: 0x1020748: lui   a0, 0x1020000
+// 0x01020758: 0x1020758: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102074c: 0x102074c: addiu a0, a0, 3312
+// 0x0102075c: 0x102075c: addiu a0, a0, 3328
 	ldloc.1
-	ldc.i4 3312
+	ldc.i4 3328
 	add
 	stloc.1
-// 0x01020750: 0x1020750: jal   0x104b998 addu  a1, zero, zero
+// 0x01020760: 0x1020760: jal   0x104b9a8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1434,20 +1434,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_register_drag_end_104b998(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_register_drag_end_104b9a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020758: 0x1020758: lui   a0, 0x1020000
+// 0x01020768: 0x1020768: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102075c: 0x102075c: addu  a1, zero, zero
+// 0x0102076c: 0x102076c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01020760: 0x1020760: jal   0x104b9c0 addiu a0, a0, 2332
+// 0x01020770: 0x1020770: jal   0x104b9d0 addiu a0, a0, 2348
 	ldloc.1
-	ldc.i4 2332
+	ldc.i4 2348
 	add
 	stloc.1
 	ldloc.0
@@ -1455,40 +1455,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_drag_motion_104b9c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_drag_motion_104b9d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020768: 0x1020768: lui   a0, 0x1020000
+// 0x01020778: 0x1020778: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102076c: 0x102076c: jal   0x104dea4 addiu a0, a0, 22620
+// 0x0102077c: 0x102077c: jal   0x104deb4 addiu a0, a0, 22636
 	ldloc.1
-	ldc.i4 22620
+	ldc.i4 22636
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_register_configure_handler_104dea4(int32)
+	call int32 Cibyl57::roadmap_canvas_register_configure_handler_104deb4(int32)
 	stloc 5
 // --- basic block ---
-// 0x01020774: 0x1020774: lui   t2, 0x30000
+// 0x01020784: 0x1020784: lui   t2, 0x30000
 	ldc.i4 196608
 	stloc 11
-// 0x01020778: 0x1020778: lui   t4, 0x40000
+// 0x01020788: 0x1020788: lui   t4, 0x40000
 	ldc.i4 262144
 	stloc 15
-// 0x0102077c: 0x102077c: addiu t4, t4, -20612
+// 0x0102078c: 0x102078c: addiu t4, t4, -20148
 	ldloc 15
-	ldc.i4 -20612
+	ldc.i4 -20148
 	add
 	stloc 15
-// 0x01020780: 0x1020780: addiu t3, t2, 28532
+// 0x01020790: 0x1020790: addiu t3, t2, 28996
 	ldloc 11
-	ldc.i4 28532
+	ldc.i4 28996
 	add
 	stloc 13
-// 0x01020784: 0x1020784: sw    t4, 4(t3)
+// 0x01020794: 0x1020794: sw    t4, 4(t3)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -1497,96 +1497,96 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01020788: 0x1020788: lui   t3, 0x30000
+// 0x01020798: 0x1020798: lui   t3, 0x30000
 	ldc.i4 196608
 	stloc 13
-// 0x0102078c: 0x102078c: addiu t3, t3, 28540
+// 0x0102079c: 0x102079c: addiu t3, t3, 29004
 	ldloc 13
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc 13
-// 0x01020790: 0x1020790: sw    t3, 28532(t2)
+// 0x010207a0: 0x10207a0: sw    t3, 28996(t2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc 13
 	stelem.i4
-// 0x01020794: 0x1020794: lui   t2, 0x40000
+// 0x010207a4: 0x10207a4: lui   t2, 0x40000
 	ldc.i4 262144
 	stloc 11
-// 0x01020798: 0x1020798: addiu t2, t2, -20600
+// 0x010207a8: 0x10207a8: addiu t2, t2, -20136
 	ldloc 11
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 11
-// 0x0102079c: 0x102079c: lui   t1, 0x40000
+// 0x010207ac: 0x10207ac: lui   t1, 0x40000
 	ldc.i4 262144
 	stloc 10
-// 0x010207a0: 0x10207a0: addiu a2, t1, -20612
+// 0x010207b0: 0x10207b0: addiu a2, t1, -20148
 	ldloc 10
-	ldc.i4 -20612
+	ldc.i4 -20148
 	add
 	stloc.3
-// 0x010207a4: 0x10207a4: sw    t2, -20612(t1)
+// 0x010207b4: 0x10207b4: sw    t2, -20148(t1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 11
 	stelem.i4
-// 0x010207a8: 0x10207a8: lui   t0, 0x40000
+// 0x010207b8: 0x10207b8: lui   t0, 0x40000
 	ldc.i4 262144
 	stloc 14
-// 0x010207ac: 0x10207ac: lui   a3, 0x40000
+// 0x010207bc: 0x10207bc: lui   a3, 0x40000
 	ldc.i4 262144
 	stloc 4
-// 0x010207b0: 0x10207b0: lui   v1, 0x50000
+// 0x010207c0: 0x10207c0: lui   v1, 0x50000
 	ldc.i4 327680
 	stloc 6
-// 0x010207b4: 0x10207b4: lui   t1, 0x40000
+// 0x010207c4: 0x10207c4: lui   t1, 0x40000
 	ldc.i4 262144
 	stloc 10
-// 0x010207b8: 0x10207b8: addiu v0, t0, 28552
+// 0x010207c8: 0x10207c8: addiu v0, t0, 29016
 	ldloc 14
-	ldc.i4 28552
+	ldc.i4 29016
 	add
 	stloc 5
-// 0x010207bc: 0x10207bc: addiu a3, a3, 12168
+// 0x010207cc: 0x10207cc: addiu a3, a3, 12632
 	ldloc 4
-	ldc.i4 12168
+	ldc.i4 12632
 	add
 	stloc 4
-// 0x010207c0: 0x10207c0: addiu v1, v1, -4204
+// 0x010207d0: 0x10207d0: addiu v1, v1, -3740
 	ldloc 6
-	ldc.i4 -4204
+	ldc.i4 -3740
 	add
 	stloc 6
-// 0x010207c4: 0x10207c4: addiu t1, t1, 28564
+// 0x010207d4: 0x10207d4: addiu t1, t1, 29028
 	ldloc 10
-	ldc.i4 28564
+	ldc.i4 29028
 	add
 	stloc 10
-// 0x010207c8: 0x10207c8: lui   a0, 0x10000
+// 0x010207d8: 0x10207d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010207cc: 0x10207cc: lui   a1, 0x1020000
+// 0x010207dc: 0x10207dc: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x010207d0: 0x10207d0: sw    t1, 28552(t0)
+// 0x010207e0: 0x10207e0: sw    t1, 29016(t0)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7138
+	ldc.i4 7254
 	add
 	ldloc 10
 	stelem.i4
-// 0x010207d4: 0x10207d4: sw    a3, 8(a2)
+// 0x010207e4: 0x10207e4: sw    a3, 8(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -1595,10 +1595,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010207d8: 0x10207d8: lui   t0, 0x30000
+// 0x010207e8: 0x10207e8: lui   t0, 0x30000
 	ldc.i4 196608
 	stloc 14
-// 0x010207dc: 0x10207dc: sw    v1, 8(v0)
+// 0x010207ec: 0x10207ec: sw    v1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1607,7 +1607,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010207e0: 0x10207e0: sw    a3, 4(a2)
+// 0x010207f0: 0x10207f0: sw    a3, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -1616,7 +1616,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010207e4: 0x10207e4: sw    v1, 4(v0)
+// 0x010207f4: 0x10207f4: sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1625,22 +1625,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010207e8: 0x10207e8: addiu a0, a0, -29472
+// 0x010207f8: 0x10207f8: addiu a0, a0, -29472
 	ldloc.1
 	ldc.i4 -29472
 	add
 	stloc.1
-// 0x010207ec: 0x10207ec: addiu a1, a1, -1928
+// 0x010207fc: 0x10207fc: addiu a1, a1, -1912
 	ldloc.2
-	ldc.i4 -1928
+	ldc.i4 -1912
 	add
 	stloc.2
-// 0x010207f0: 0x10207f0: jal   0x100f48c sw    zero, 28448(t0)
+// 0x01020800: 0x1020800: jal   0x100f49c sw    zero, 28912(t0)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1649,25 +1649,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010207f8: 0x10207f8: lui   a0, 0x10000
+// 0x01020808: 0x1020808: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010207fc: 0x10207fc: lui   a1, 0x1020000
+// 0x0102080c: 0x102080c: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x01020800: 0x1020800: addiu a0, a0, -29460
+// 0x01020810: 0x1020810: addiu a0, a0, -29460
 	ldloc.1
 	ldc.i4 -29460
 	add
 	stloc.1
-// 0x01020804: 0x1020804: jal   0x100f48c addiu a1, a1, -1896
+// 0x01020814: 0x1020814: jal   0x100f49c addiu a1, a1, -1880
 	ldloc.2
-	ldc.i4 -1896
+	ldc.i4 -1880
 	add
 	stloc.2
 	ldloc.0
@@ -1675,25 +1675,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102080c: 0x102080c: lui   a0, 0x10000
+// 0x0102081c: 0x102081c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01020810: 0x1020810: lui   a1, 0x1020000
+// 0x01020820: 0x1020820: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x01020814: 0x1020814: addiu a0, a0, -29432
+// 0x01020824: 0x1020824: addiu a0, a0, -29432
 	ldloc.1
 	ldc.i4 -29432
 	add
 	stloc.1
-// 0x01020818: 0x1020818: jal   0x100f48c addiu a1, a1, -624
+// 0x01020828: 0x1020828: jal   0x100f49c addiu a1, a1, -608
 	ldloc.2
-	ldc.i4 -624
+	ldc.i4 -608
 	add
 	stloc.2
 	ldloc.0
@@ -1701,25 +1701,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020820: 0x1020820: lui   a0, 0x10000
+// 0x01020830: 0x1020830: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01020824: 0x1020824: lui   a1, 0x1020000
+// 0x01020834: 0x1020834: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x01020828: 0x1020828: addiu a0, a0, -29412
+// 0x01020838: 0x1020838: addiu a0, a0, -29412
 	ldloc.1
 	ldc.i4 -29412
 	add
 	stloc.1
-// 0x0102082c: 0x102082c: jal   0x100f48c addiu a1, a1, -728
+// 0x0102083c: 0x102083c: jal   0x100f49c addiu a1, a1, -712
 	ldloc.2
-	ldc.i4 -728
+	ldc.i4 -712
 	add
 	stloc.2
 	ldloc.0
@@ -1727,23 +1727,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020834: 0x1020834: lui   a1, 0x1020000
+// 0x01020844: 0x1020844: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x01020838: 0x1020838: lui   a0, 0x10000
+// 0x01020848: 0x1020848: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102083c: 0x102083c: addiu a1, a1, -548
+// 0x0102084c: 0x102084c: addiu a1, a1, -532
 	ldloc.2
-	ldc.i4 -548
+	ldc.i4 -532
 	add
 	stloc.2
-// 0x01020840: 0x1020840: jal   0x100f48c addiu a0, a0, -29396
+// 0x01020850: 0x1020850: jal   0x100f49c addiu a0, a0, -29396
 	ldloc.1
 	ldc.i4 -29396
 	add
@@ -1753,51 +1753,51 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020848: 0x1020848: lui   a0, 0x1020000
+// 0x01020858: 0x1020858: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102084c: 0x102084c: jal   0x1014064 addiu a0, a0, 1168
+// 0x0102085c: 0x102085c: jal   0x1014074 addiu a0, a0, 1184
 	ldloc.1
-	ldc.i4 1168
+	ldc.i4 1184
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020854: 0x1020854: lui   a0, 0x1020000
+// 0x01020864: 0x1020864: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01020858: 0x1020858: jal   0x100f3b0 addiu a0, a0, -1788
+// 0x01020868: 0x1020868: jal   0x100f3c0 addiu a0, a0, -1772
 	ldloc.1
-	ldc.i4 -1788
+	ldc.i4 -1772
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl11::roadmap_state_monitor_100f3b0(int32,int32)
+	call int32 Cibyl11::roadmap_state_monitor_100f3c0(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020860: 0x1020860: lui   a0, 0x1020000
+// 0x01020870: 0x1020870: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01020864: 0x1020864: addiu a0, a0, 6976
+// 0x01020874: 0x1020874: addiu a0, a0, 6992
 	ldloc.1
-	ldc.i4 6976
+	ldc.i4 6992
 	add
 	stloc.1
-// 0x01020868: 0x1020868: jal   0x10400d8 addu  a1, zero, zero
+// 0x01020878: 0x1020878: jal   0x10400e8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1805,13 +1805,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_events_register_10400d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_events_register_10400e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020870: 0x1020870: lw    ra, 36(sp)
-// 0x01020874: 0x1020874: lw    s2, 32(sp)
+// 0x01020880: 0x1020880: lw    ra, 36(sp)
+// 0x01020884: 0x1020884: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1820,7 +1820,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01020878: 0x1020878: lw    s1, 28(sp)
+// 0x01020888: 0x1020888: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1829,7 +1829,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102087c: 0x102087c: lw    s0, 24(sp)
+// 0x0102088c: 0x102088c: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1838,7 +1838,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020880: 0x1020880: jr    ra addiu sp, sp, 40
+// 0x01020890: 0x1020890: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1850,7 +1850,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 t4,int32 t5,int32 lo,int32 t2,int32 t3,int32 ra,int32 t0,int32 t1)
@@ -1909,68 +1909,68 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020888: 0x1020888: lui   v0, 0x30000
+// 0x01020898: 0x1020898: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0102088c: 0x102088c: lw    t0, 28460(v0)
+// 0x0102089c: 0x102089c: lw    t0, 28924(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7115
+	ldc.i4 7231
 	add
 	ldelem.i4
 	stloc 15
-// 0x01020890: 0x1020890: lui   v0, 0x30000
+// 0x010208a0: 0x10208a0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01020894: 0x1020894: lw    a3, 28464(v0)
+// 0x010208a4: 0x10208a4: lw    a3, 28928(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020898: 0x1020898: addiu v0, zero, 2
+// 0x010208a8: 0x10208a8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0102089c: 0x102089c: div   a3, v0
+// 0x010208ac: 0x10208ac: div   a3, v0
 	ldloc 4
 	ldloc 6
 	div
 	stloc 11
-// 0x010208a0: 0x10208a0: lui   t3, 0x30000
+// 0x010208b0: 0x10208b0: lui   t3, 0x30000
 	ldc.i4 196608
 	stloc 13
-// 0x010208a4: 0x10208a4: lui   t2, 0x30000
+// 0x010208b4: 0x10208b4: lui   t2, 0x30000
 	ldc.i4 196608
 	stloc 12
-// 0x010208a8: 0x10208a8: addiu sp, sp, -32
+// 0x010208b8: 0x10208b8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010208ac: 0x10208ac: lw    t5, 28468(t3)
+// 0x010208bc: 0x10208bc: lw    t5, 28932(t3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7117
+	ldc.i4 7233
 	add
 	ldelem.i4
 	stloc 10
-// 0x010208b0: 0x10208b0: lw    t4, 28472(t2)
+// 0x010208c0: 0x10208c0: lw    t4, 28936(t2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldelem.i4
 	stloc 9
-// 0x010208b4: 0x10208b4: sw    s0, 24(sp)
+// 0x010208c4: 0x10208c4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1979,66 +1979,66 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010208b8: 0x10208b8: addu  v1, a0, zero
+// 0x010208c8: 0x10208c8: addu  v1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010208bc: 0x10208bc: lui   s0, 0x30000
+// 0x010208cc: 0x10208cc: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x010208c0: 0x10208c0: addu  a3, a1, zero
+// 0x010208d0: 0x10208d0: addu  a3, a1, zero
 	ldloc.2
 	stloc 4
-// 0x010208c4: 0x10208c4: addu  t5, a0, t5
+// 0x010208d4: 0x10208d4: addu  t5, a0, t5
 	ldloc.1
 	ldloc 10
 	add
 	stloc 10
-// 0x010208c8: 0x10208c8: addu  t4, a1, t4
+// 0x010208d8: 0x10208d8: addu  t4, a1, t4
 	ldloc.2
 	ldloc 9
 	add
 	stloc 9
-// 0x010208cc: 0x10208cc: addiu a0, sp, 16
+// 0x010208dc: 0x10208dc: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010208d0: 0x10208d0: addiu a1, s0, 28440
+// 0x010208e0: 0x10208e0: addiu a1, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.2
-// 0x010208d4: 0x10208d4: addu  a2, zero, zero
+// 0x010208e4: 0x10208e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010208d8: 0x10208d8: sw    ra, 28(sp)
-// 0x010208dc: 0x10208dc: sw    t5, 28468(t3)
+// 0x010208e8: 0x10208e8: sw    ra, 28(sp)
+// 0x010208ec: 0x10208ec: sw    t5, 28932(t3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7117
+	ldc.i4 7233
 	add
 	ldloc 10
 	stelem.i4
-// 0x010208e0: 0x10208e0: sw    t4, 28472(t2)
+// 0x010208f0: 0x10208f0: sw    t4, 28936(t2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldloc 9
 	stelem.i4
-// 0x010208e4: 0x10208e4: mflo  lo
+// 0x010208f4: 0x10208f4: mflo  lo
 	ldloc 11
 	stloc 16
-// 0x010208e8: 0x10208e8: addu  a3, a3, t1
+// 0x010208f8: 0x10208f8: addu  a3, a3, t1
 	ldloc 4
 	ldloc 16
 	add
 	stloc 4
-// 0x010208ec: 0x10208ec: sw    a3, 20(sp)
+// 0x010208fc: 0x10208fc: sw    a3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2047,20 +2047,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010208f0: 0x10208f0: div   t0, v0
+// 0x01020900: 0x1020900: div   t0, v0
 	ldloc 15
 	ldloc 6
 	div
 	stloc 11
-// 0x010208f4: 0x10208f4: mflo  lo
+// 0x01020904: 0x1020904: mflo  lo
 	ldloc 11
 	stloc 6
-// 0x010208f8: 0x10208f8: addu  v1, v1, v0
+// 0x01020908: 0x1020908: addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x010208fc: 0x10208fc: jal   0x1007a6c sw    v1, 16(sp)
+// 0x0102090c: 0x102090c: jal   0x1007a7c sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2074,14 +2074,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020904: 0x1020904: jal   0x1008748 addiu a0, s0, 28440
+// 0x01020914: 0x1020914: jal   0x1008758 addiu a0, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.1
 	ldloc.0
@@ -2089,13 +2089,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_center_1008748(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_center_1008758(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102090c: 0x102090c: lw    ra, 28(sp)
-// 0x01020910: 0x1020910: lw    s0, 24(sp)
+// 0x0102091c: 0x102091c: lw    ra, 28(sp)
+// 0x01020920: 0x1020920: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2104,7 +2104,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020914: 0x1020914: jr    ra addiu sp, sp, 32
+// 0x01020924: 0x1020924: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2116,7 +2116,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_drag_motion_102091c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_drag_motion_102092c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s4,int32 s5,int32 s6,int32 s1,int32 s2,int32 s3,int32 t0,int32 s7,int32 ra,int32 t1)
@@ -2181,24 +2181,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102091c: 0x102091c: lui   v0, 0x30000
+// 0x0102092c: 0x102092c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01020920: 0x1020920: addiu sp, sp, -96
+// 0x01020930: 0x1020930: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01020924: 0x1020924: lw    v0, 28256(v0)
+// 0x01020934: 0x1020934: lw    v0, 28720(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020928: 0x1020928: sw    s2, 68(sp)
+// 0x01020938: 0x1020938: sw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2207,13 +2207,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102092c: 0x102092c: addiu v1, zero, 1
+// 0x0102093c: 0x102093c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01020930: 0x1020930: lui   s2, 0x30000
+// 0x01020940: 0x1020940: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 13
-// 0x01020934: 0x1020934: sw    s1, 64(sp)
+// 0x01020944: 0x1020944: sw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2222,7 +2222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01020938: 0x1020938: sw    s0, 60(sp)
+// 0x01020948: 0x1020948: sw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2231,8 +2231,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102093c: 0x102093c: sw    ra, 92(sp)
-// 0x01020940: 0x1020940: sw    s7, 88(sp)
+// 0x0102094c: 0x102094c: sw    ra, 92(sp)
+// 0x01020950: 0x1020950: sw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2241,7 +2241,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01020944: 0x1020944: sw    s6, 84(sp)
+// 0x01020954: 0x1020954: sw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2250,7 +2250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01020948: 0x1020948: sw    s5, 80(sp)
+// 0x01020958: 0x1020958: sw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2259,7 +2259,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102094c: 0x102094c: sw    s4, 76(sp)
+// 0x0102095c: 0x102095c: sw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2268,7 +2268,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01020950: 0x1020950: sw    s3, 72(sp)
+// 0x01020960: 0x1020960: sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2277,19 +2277,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01020954: 0x1020954: addu  s0, a0, zero
+// 0x01020964: 0x1020964: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01020958: 0x1020958: bne   v0, v1, 0x10209ac addiu s1, s2, 28432
+// 0x01020968: 0x1020968: bne   v0, v1, 0x10209bc addiu s1, s2, 28896
 	ldloc 6
 	ldloc 7
 	ldloc 13
-	ldc.i4 28432
+	ldc.i4 28896
 	add
 	stloc 12
-	bne.un L_10209ac
+	bne.un L_10209bc
 // --- basic block ---
-// 0x01020960: 0x1020960: lw    a1, 4(a0)
+// 0x01020970: 0x1020970: lw    a1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2298,14 +2298,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01020964: 0x1020964: lw    a2, 0(a0)
+// 0x01020974: 0x1020974: lw    a2, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01020968: 0x1020968: lw    v0, 4(s1)
+// 0x01020978: 0x1020978: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2314,21 +2314,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102096c: 0x102096c: lw    v1, 28432(s2)
+// 0x0102097c: 0x102097c: lw    v1, 28896(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7108
+	ldc.i4 7224
 	add
 	ldelem.i4
 	stloc 7
-// 0x01020970: 0x1020970: addiu a0, sp, 32
+// 0x01020980: 0x1020980: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01020974: 0x1020974: sw    a1, 36(sp)
+// 0x01020984: 0x1020984: sw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2337,7 +2337,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01020978: 0x1020978: sw    v0, 44(sp)
+// 0x01020988: 0x1020988: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2346,7 +2346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102097c: 0x102097c: sw    a2, 32(sp)
+// 0x0102098c: 0x102098c: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2355,7 +2355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01020980: 0x1020980: jal   0x1006f24 sw    v1, 40(sp)
+// 0x01020990: 0x1020990: jal   0x1006f34 sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2368,12 +2368,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020988: 0x1020988: jal   0x1006f24 addiu a0, sp, 40
+// 0x01020998: 0x1020998: jal   0x1006f34 addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2382,12 +2382,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020990: 0x1020990: lw    v0, 32(sp)
+// 0x010209a0: 0x10209a0: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2396,7 +2396,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020994: 0x1020994: lw    a0, 40(sp)
+// 0x010209a4: 0x10209a4: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2405,7 +2405,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020998: 0x1020998: lw    a1, 44(sp)
+// 0x010209a8: 0x10209a8: lw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2414,12 +2414,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102099c: 0x102099c: subu  a0, a0, v0
+// 0x010209ac: 0x10209ac: subu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.1
-// 0x010209a0: 0x10209a0: lw    v0, 36(sp)
+// 0x010209b0: 0x10209b0: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2428,19 +2428,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010209a4: 0x10209a4: j	 0x1020ad4 sll   zero, zero, 0
-	br L_1020ad4
+// 0x010209b4: 0x10209b4: j	 0x1020ae4 sll   zero, zero, 0
+	br L_1020ae4
 // --- basic block ---
-L_10209ac:
-// 0x010209ac: 0x10209ac: addiu a1, sp, 16
+L_10209bc:
+// 0x010209bc: 0x10209bc: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010209b0: 0x10209b0: addu  a2, zero, zero
+// 0x010209c0: 0x10209c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010209b4: 0x10209b4: jal   0x1007a6c addu  a0, s1, zero
+// 0x010209c4: 0x10209c4: jal   0x1007a7c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -2448,20 +2448,20 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010209bc: 0x10209bc: addiu a1, sp, 24
+// 0x010209cc: 0x10209cc: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x010209c0: 0x10209c0: addu  a2, zero, zero
+// 0x010209d0: 0x10209d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010209c4: 0x10209c4: jal   0x1007a6c addu  a0, s0, zero
+// 0x010209d4: 0x10209d4: jal   0x1007a7c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2469,12 +2469,12 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010209cc: 0x10209cc: lw    v0, 20(sp)
+// 0x010209dc: 0x10209dc: lw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2483,7 +2483,7 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010209d0: 0x10209d0: lw    a0, 28(sp)
+// 0x010209e0: 0x10209e0: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2492,51 +2492,51 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010209d4: 0x10209d4: lui   s5, 0x20000
+// 0x010209e4: 0x10209e4: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x010209d8: 0x10209d8: jal   0x10c09c0 subu  a0, a0, v0
+// 0x010209e8: 0x10209e8: jal   0x10c1000 subu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010209e0: 0x10209e0: lui   s3, 0x30000
+// 0x010209f0: 0x10209f0: lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 14
-// 0x010209e4: 0x10209e4: lw    a3, 23804(s5)
+// 0x010209f4: 0x10209f4: lw    a3, 24268(s5)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5951
+	ldc.i4 6067
 	add
 	ldelem.i4
 	stloc 4
-// 0x010209e8: 0x10209e8: lw    a2, 23800(s5)
+// 0x010209f8: 0x10209f8: lw    a2, 24264(s5)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5950
+	ldc.i4 6066
 	add
 	ldelem.i4
 	stloc.3
-// 0x010209ec: 0x10209ec: addu  a1, v1, zero
+// 0x010209fc: 0x10209fc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010209f0: 0x10209f0: addiu s6, s3, 28520
+// 0x01020a00: 0x1020a00: addiu s6, s3, 28984
 	ldloc 14
-	ldc.i4 28520
+	ldc.i4 28984
 	add
 	stloc 11
-// 0x010209f4: 0x10209f4: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020a04: 0x1020a04: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2544,12 +2544,12 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010209fc: 0x10209fc: lw    a0, 4(s6)
+// 0x01020a0c: 0x1020a0c: lw    a0, 4(s6)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -2558,13 +2558,13 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020a00: 0x1020a00: addu  t0, v0, zero
+// 0x01020a10: 0x1020a10: addu  t0, v0, zero
 	ldloc 6
 	stloc 15
-// 0x01020a04: 0x1020a04: lui   s4, 0x20000
+// 0x01020a14: 0x1020a14: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01020a08: 0x1020a08: sw    t0, 48(sp)
+// 0x01020a18: 0x1020a18: sw    t0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2573,7 +2573,7 @@ L_10209ac:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01020a0c: 0x1020a0c: jal   0x10c09c0 sw    v1, 52(sp)
+// 0x01020a1c: 0x1020a1c: jal   0x10c1000 sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2584,33 +2584,33 @@ L_10209ac:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a14: 0x1020a14: lw    a3, 23748(s4)
+// 0x01020a24: 0x1020a24: lw    a3, 24212(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5937
+	ldc.i4 6053
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020a18: 0x1020a18: lw    a2, 23744(s4)
+// 0x01020a28: 0x1020a28: lw    a2, 24208(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5936
+	ldc.i4 6052
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020a1c: 0x1020a1c: addu  a1, v1, zero
+// 0x01020a2c: 0x1020a2c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020a20: 0x1020a20: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020a30: 0x1020a30: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2618,12 +2618,12 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a28: 0x1020a28: lw    t0, 48(sp)
+// 0x01020a38: 0x1020a38: lw    t0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2632,7 +2632,7 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01020a2c: 0x1020a2c: lw    t1, 52(sp)
+// 0x01020a3c: 0x1020a3c: lw    t1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2641,16 +2641,16 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01020a30: 0x1020a30: addu  a0, t0, zero
+// 0x01020a40: 0x1020a40: addu  a0, t0, zero
 	ldloc 15
 	stloc.1
-// 0x01020a34: 0x1020a34: addu  a1, t1, zero
+// 0x01020a44: 0x1020a44: addu  a1, t1, zero
 	ldloc 18
 	stloc.2
-// 0x01020a38: 0x1020a38: addu  a3, v1, zero
+// 0x01020a48: 0x1020a48: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01020a3c: 0x1020a3c: jal   0x10c06e8 addu  a2, v0, zero
+// 0x01020a4c: 0x1020a4c: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -2658,26 +2658,26 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a44: 0x1020a44: addu  a1, v1, zero
+// 0x01020a54: 0x1020a54: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020a48: 0x1020a48: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01020a58: 0x1020a58: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a50: 0x1020a50: sw    v0, 4(s6)
+// 0x01020a60: 0x1020a60: sw    v0, 4(s6)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -2686,7 +2686,7 @@ L_10209ac:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01020a54: 0x1020a54: lw    a0, 24(sp)
+// 0x01020a64: 0x1020a64: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2695,7 +2695,7 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020a58: 0x1020a58: lw    v0, 16(sp)
+// 0x01020a68: 0x1020a68: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2704,40 +2704,40 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020a5c: 0x1020a5c: jal   0x10c09c0 subu  a0, a0, v0
+// 0x01020a6c: 0x1020a6c: jal   0x10c1000 subu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a64: 0x1020a64: lw    a3, 23804(s5)
+// 0x01020a74: 0x1020a74: lw    a3, 24268(s5)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5951
+	ldc.i4 6067
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020a68: 0x1020a68: lw    a2, 23800(s5)
+// 0x01020a78: 0x1020a78: lw    a2, 24264(s5)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5950
+	ldc.i4 6066
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020a6c: 0x1020a6c: addu  a1, v1, zero
+// 0x01020a7c: 0x1020a7c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020a70: 0x1020a70: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020a80: 0x1020a80: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2745,55 +2745,55 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a78: 0x1020a78: lw    a0, 28520(s3)
+// 0x01020a88: 0x1020a88: lw    a0, 28984(s3)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7130
+	ldc.i4 7246
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020a7c: 0x1020a7c: addu  s7, v1, zero
+// 0x01020a8c: 0x1020a8c: addu  s7, v1, zero
 	ldloc 7
 	stloc 16
-// 0x01020a80: 0x1020a80: jal   0x10c09c0 addu  s6, v0, zero
+// 0x01020a90: 0x1020a90: jal   0x10c1000 addu  s6, v0, zero
 	ldloc 6
 	stloc 11
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a88: 0x1020a88: lw    a3, 23748(s4)
+// 0x01020a98: 0x1020a98: lw    a3, 24212(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5937
+	ldc.i4 6053
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020a8c: 0x1020a8c: lw    a2, 23744(s4)
+// 0x01020a9c: 0x1020a9c: lw    a2, 24208(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5936
+	ldc.i4 6052
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020a90: 0x1020a90: addu  a1, v1, zero
+// 0x01020aa0: 0x1020aa0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020a94: 0x1020a94: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020aa4: 0x1020aa4: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2801,21 +2801,21 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020a9c: 0x1020a9c: addu  a3, v1, zero
+// 0x01020aac: 0x1020aac: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01020aa0: 0x1020aa0: addu  a1, s7, zero
+// 0x01020ab0: 0x1020ab0: addu  a1, s7, zero
 	ldloc 16
 	stloc.2
-// 0x01020aa4: 0x1020aa4: addu  a0, s6, zero
+// 0x01020ab4: 0x1020ab4: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x01020aa8: 0x1020aa8: jal   0x10c06e8 addu  a2, v0, zero
+// 0x01020ab8: 0x1020ab8: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -2823,51 +2823,51 @@ L_10209ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020ab0: 0x1020ab0: addu  a1, v1, zero
+// 0x01020ac0: 0x1020ac0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020ab4: 0x1020ab4: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01020ac4: 0x1020ac4: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020abc: 0x1020abc: sw    v0, 28520(s3)
+// 0x01020acc: 0x1020acc: sw    v0, 28984(s3)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7130
+	ldc.i4 7246
 	add
 	ldloc 6
 	stelem.i4
-// 0x01020ac0: 0x1020ac0: lw    a0, 28432(s2)
+// 0x01020ad0: 0x1020ad0: lw    a0, 28896(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7108
+	ldc.i4 7224
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020ac4: 0x1020ac4: lw    v1, 0(s0)
+// 0x01020ad4: 0x1020ad4: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01020ac8: 0x1020ac8: lw    a1, 4(s1)
+// 0x01020ad8: 0x1020ad8: lw    a1, 4(s1)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2876,7 +2876,7 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01020acc: 0x1020acc: lw    v0, 4(s0)
+// 0x01020adc: 0x1020adc: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2885,13 +2885,13 @@ L_10209ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020ad0: 0x1020ad0: subu  a0, a0, v1
+// 0x01020ae0: 0x1020ae0: subu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc.1
-L_1020ad4:
-// 0x01020ad4: 0x1020ad4: jal   0x1020888 subu  a1, a1, v0
+L_1020ae4:
+// 0x01020ae4: 0x1020ae4: jal   0x1020898 subu  a1, a1, v0
 	ldloc.2
 	ldloc 6
 	sub
@@ -2901,31 +2901,31 @@ L_1020ad4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020adc: 0x1020adc: lw    v1, 0(s0)
+// 0x01020aec: 0x1020aec: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01020ae0: 0x1020ae0: lui   v0, 0x30000
+// 0x01020af0: 0x1020af0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01020ae4: 0x1020ae4: sw    v1, 28432(v0)
+// 0x01020af4: 0x1020af4: sw    v1, 28896(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7108
+	ldc.i4 7224
 	add
 	ldloc 7
 	stelem.i4
-// 0x01020ae8: 0x1020ae8: lw    v1, 4(s0)
+// 0x01020af8: 0x1020af8: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2934,12 +2934,12 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01020aec: 0x1020aec: addiu v0, v0, 28432
+// 0x01020afc: 0x1020afc: addiu v0, v0, 28896
 	ldloc 6
-	ldc.i4 28432
+	ldc.i4 28896
 	add
 	stloc 6
-// 0x01020af0: 0x1020af0: jal   0x101fc54 sw    v1, 4(v0)
+// 0x01020b00: 0x1020b00: jal   0x101fc64 sw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2953,16 +2953,16 @@ L_1020ad4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020af8: 0x1020af8: lw    ra, 92(sp)
-// 0x01020afc: 0x1020afc: addiu v0, zero, 1
+// 0x01020b08: 0x1020b08: lw    ra, 92(sp)
+// 0x01020b0c: 0x1020b0c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01020b00: 0x1020b00: lw    s7, 88(sp)
+// 0x01020b10: 0x1020b10: lw    s7, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2971,7 +2971,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01020b04: 0x1020b04: lw    s6, 84(sp)
+// 0x01020b14: 0x1020b14: lw    s6, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2980,7 +2980,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01020b08: 0x1020b08: lw    s5, 80(sp)
+// 0x01020b18: 0x1020b18: lw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2989,7 +2989,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01020b0c: 0x1020b0c: lw    s4, 76(sp)
+// 0x01020b1c: 0x1020b1c: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2998,7 +2998,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01020b10: 0x1020b10: lw    s3, 72(sp)
+// 0x01020b20: 0x1020b20: lw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3007,7 +3007,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01020b14: 0x1020b14: lw    s2, 68(sp)
+// 0x01020b24: 0x1020b24: lw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3016,7 +3016,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01020b18: 0x1020b18: lw    s1, 64(sp)
+// 0x01020b28: 0x1020b28: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3025,7 +3025,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01020b1c: 0x1020b1c: lw    s0, 60(sp)
+// 0x01020b2c: 0x1020b2c: lw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3034,7 +3034,7 @@ L_1020ad4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020b20: 0x1020b20: jr    ra addiu sp, sp, 96
+// 0x01020b30: 0x1020b30: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -3046,7 +3046,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_move_left_1020b28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_move_left_1020b38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1,int32 lo)
@@ -3084,37 +3084,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1020b28:
-// 0x01020b28: 0x1020b28: lui   v0, 0x30000
+L_1020b38:
+// 0x01020b38: 0x1020b38: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020b2c: 0x1020b2c: lw    a0, 28464(v0)
+// 0x01020b3c: 0x1020b3c: lw    a0, 28928(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020b30: 0x1020b30: addiu v0, zero, -15
+// 0x01020b40: 0x1020b40: addiu v0, zero, -15
 	ldc.i4.s -15
 	stloc 5
-// 0x01020b34: 0x1020b34: div   a0, v0
+// 0x01020b44: 0x1020b44: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 9
-// 0x01020b38: 0x1020b38: addiu sp, sp, -24
+// 0x01020b48: 0x1020b48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020b3c: 0x1020b3c: sw    ra, 20(sp)
-// 0x01020b40: 0x1020b40: mflo  lo
+// 0x01020b4c: 0x1020b4c: sw    ra, 20(sp)
+// 0x01020b50: 0x1020b50: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x01020b44: 0x1020b44: jal   0x1020888 addu  a1, zero, zero
+// 0x01020b54: 0x1020b54: jal   0x1020898 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3122,25 +3122,25 @@ L_1020b28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020b4c: 0x1020b4c: jal   0x101fc54 sll   zero, zero, 0
+// 0x01020b5c: 0x1020b5c: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020b54: 0x1020b54: lw    ra, 20(sp)
-// 0x01020b58: 0x1020b58: sll   zero, zero, 0
-// 0x01020b5c: 0x1020b5c: jr    ra addiu sp, sp, 24
+// 0x01020b64: 0x1020b64: lw    ra, 20(sp)
+// 0x01020b68: 0x1020b68: sll   zero, zero, 0
+// 0x01020b6c: 0x1020b6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3152,7 +3152,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_move_right_1020b64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_move_right_1020b74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1,int32 lo)
@@ -3190,37 +3190,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1020b64:
-// 0x01020b64: 0x1020b64: lui   v0, 0x30000
+L_1020b74:
+// 0x01020b74: 0x1020b74: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020b68: 0x1020b68: lw    a0, 28464(v0)
+// 0x01020b78: 0x1020b78: lw    a0, 28928(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020b6c: 0x1020b6c: addiu v0, zero, 15
+// 0x01020b7c: 0x1020b7c: addiu v0, zero, 15
 	ldc.i4.s 15
 	stloc 5
-// 0x01020b70: 0x1020b70: div   a0, v0
+// 0x01020b80: 0x1020b80: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 9
-// 0x01020b74: 0x1020b74: addiu sp, sp, -24
+// 0x01020b84: 0x1020b84: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020b78: 0x1020b78: sw    ra, 20(sp)
-// 0x01020b7c: 0x1020b7c: mflo  lo
+// 0x01020b88: 0x1020b88: sw    ra, 20(sp)
+// 0x01020b8c: 0x1020b8c: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x01020b80: 0x1020b80: jal   0x1020888 addu  a1, zero, zero
+// 0x01020b90: 0x1020b90: jal   0x1020898 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3228,25 +3228,25 @@ L_1020b64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020b88: 0x1020b88: jal   0x101fc54 sll   zero, zero, 0
+// 0x01020b98: 0x1020b98: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020b90: 0x1020b90: lw    ra, 20(sp)
-// 0x01020b94: 0x1020b94: sll   zero, zero, 0
-// 0x01020b98: 0x1020b98: jr    ra addiu sp, sp, 24
+// 0x01020ba0: 0x1020ba0: lw    ra, 20(sp)
+// 0x01020ba4: 0x1020ba4: sll   zero, zero, 0
+// 0x01020ba8: 0x1020ba8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3258,7 +3258,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_move_down_1020ba0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_move_down_1020bb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1,int32 lo)
@@ -3296,37 +3296,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1020ba0:
-// 0x01020ba0: 0x1020ba0: lui   v0, 0x30000
+L_1020bb0:
+// 0x01020bb0: 0x1020bb0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020ba4: 0x1020ba4: lw    a1, 28464(v0)
+// 0x01020bb4: 0x1020bb4: lw    a1, 28928(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc.2
-// 0x01020ba8: 0x1020ba8: addiu v0, zero, 15
+// 0x01020bb8: 0x1020bb8: addiu v0, zero, 15
 	ldc.i4.s 15
 	stloc 5
-// 0x01020bac: 0x1020bac: div   a1, v0
+// 0x01020bbc: 0x1020bbc: div   a1, v0
 	ldloc.2
 	ldloc 5
 	div
 	stloc 9
-// 0x01020bb0: 0x1020bb0: addiu sp, sp, -24
+// 0x01020bc0: 0x1020bc0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020bb4: 0x1020bb4: sw    ra, 20(sp)
-// 0x01020bb8: 0x1020bb8: mflo  lo
+// 0x01020bc4: 0x1020bc4: sw    ra, 20(sp)
+// 0x01020bc8: 0x1020bc8: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x01020bbc: 0x1020bbc: jal   0x1020888 addu  a0, zero, zero
+// 0x01020bcc: 0x1020bcc: jal   0x1020898 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3334,25 +3334,25 @@ L_1020ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020bc4: 0x1020bc4: jal   0x101fc54 sll   zero, zero, 0
+// 0x01020bd4: 0x1020bd4: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020bcc: 0x1020bcc: lw    ra, 20(sp)
-// 0x01020bd0: 0x1020bd0: sll   zero, zero, 0
-// 0x01020bd4: 0x1020bd4: jr    ra addiu sp, sp, 24
+// 0x01020bdc: 0x1020bdc: lw    ra, 20(sp)
+// 0x01020be0: 0x1020be0: sll   zero, zero, 0
+// 0x01020be4: 0x1020be4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3364,7 +3364,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_move_up_1020bdc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_move_up_1020bec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1,int32 lo)
@@ -3402,37 +3402,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1020bdc:
-// 0x01020bdc: 0x1020bdc: lui   v0, 0x30000
+L_1020bec:
+// 0x01020bec: 0x1020bec: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020be0: 0x1020be0: lw    a1, 28464(v0)
+// 0x01020bf0: 0x1020bf0: lw    a1, 28928(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc.2
-// 0x01020be4: 0x1020be4: addiu v0, zero, -15
+// 0x01020bf4: 0x1020bf4: addiu v0, zero, -15
 	ldc.i4.s -15
 	stloc 5
-// 0x01020be8: 0x1020be8: div   a1, v0
+// 0x01020bf8: 0x1020bf8: div   a1, v0
 	ldloc.2
 	ldloc 5
 	div
 	stloc 9
-// 0x01020bec: 0x1020bec: addiu sp, sp, -24
+// 0x01020bfc: 0x1020bfc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020bf0: 0x1020bf0: sw    ra, 20(sp)
-// 0x01020bf4: 0x1020bf4: mflo  lo
+// 0x01020c00: 0x1020c00: sw    ra, 20(sp)
+// 0x01020c04: 0x1020c04: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x01020bf8: 0x1020bf8: jal   0x1020888 addu  a0, zero, zero
+// 0x01020c08: 0x1020c08: jal   0x1020898 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3440,25 +3440,25 @@ L_1020bdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020c00: 0x1020c00: jal   0x101fc54 sll   zero, zero, 0
+// 0x01020c10: 0x1020c10: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01020c08: 0x1020c08: lw    ra, 20(sp)
-// 0x01020c0c: 0x1020c0c: sll   zero, zero, 0
-// 0x01020c10: 0x1020c10: jr    ra addiu sp, sp, 24
+// 0x01020c18: 0x1020c18: lw    ra, 20(sp)
+// 0x01020c1c: 0x1020c1c: sll   zero, zero, 0
+// 0x01020c20: 0x1020c20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3470,7 +3470,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_move_1020c18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_move_1020c28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -3505,37 +3505,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020c18: 0x1020c18: addiu sp, sp, -24
+// 0x01020c28: 0x1020c28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020c1c: 0x1020c1c: sw    ra, 20(sp)
-// 0x01020c20: 0x1020c20: jal   0x1020888 sll   zero, zero, 0
+// 0x01020c2c: 0x1020c2c: sw    ra, 20(sp)
+// 0x01020c30: 0x1020c30: jal   0x1020898 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020c28: 0x1020c28: jal   0x101fc54 sll   zero, zero, 0
+// 0x01020c38: 0x1020c38: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020c30: 0x1020c30: lw    ra, 20(sp)
-// 0x01020c34: 0x1020c34: sll   zero, zero, 0
-// 0x01020c38: 0x1020c38: jr    ra addiu sp, sp, 24
+// 0x01020c40: 0x1020c40: lw    ra, 20(sp)
+// 0x01020c44: 0x1020c44: sll   zero, zero, 0
+// 0x01020c48: 0x1020c48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3547,7 +3547,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t1,int32 s0,int32 t0,int32 lo,int32 ra,int32 t2)
@@ -3597,26 +3597,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020c40: 0x1020c40: lw    v1, 0(a0)
+// 0x01020c50: 0x1020c50: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01020c44: 0x1020c44: lui   v0, 0x30000
+// 0x01020c54: 0x1020c54: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020c48: 0x1020c48: sw    v1, 28440(v0)
+// 0x01020c58: 0x1020c58: sw    v1, 28904(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7110
+	ldc.i4 7226
 	add
 	ldloc 7
 	stelem.i4
-// 0x01020c4c: 0x1020c4c: lw    v1, 4(a0)
+// 0x01020c5c: 0x1020c5c: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3625,35 +3625,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01020c50: 0x1020c50: lui   a1, 0x30000
+// 0x01020c60: 0x1020c60: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01020c54: 0x1020c54: addiu v0, v0, 28440
+// 0x01020c64: 0x1020c64: addiu v0, v0, 28904
 	ldloc 5
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc 5
-// 0x01020c58: 0x1020c58: sw    zero, 28468(a1)
+// 0x01020c68: 0x1020c68: sw    zero, 28932(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7117
+	ldc.i4 7233
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01020c5c: 0x1020c5c: lui   a1, 0x30000
+// 0x01020c6c: 0x1020c6c: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01020c60: 0x1020c60: addiu sp, sp, -32
+// 0x01020c70: 0x1020c70: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01020c64: 0x1020c64: addu  a0, v0, zero
+// 0x01020c74: 0x1020c74: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01020c68: 0x1020c68: sw    v1, 4(v0)
+// 0x01020c78: 0x1020c78: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3662,20 +3662,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01020c6c: 0x1020c6c: sw    zero, 28472(a1)
+// 0x01020c7c: 0x1020c7c: sw    zero, 28936(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01020c70: 0x1020c70: lui   a1, 0x30000
+// 0x01020c80: 0x1020c80: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01020c74: 0x1020c74: sw    ra, 28(sp)
-// 0x01020c78: 0x1020c78: sw    s0, 24(sp)
+// 0x01020c84: 0x1020c84: sw    ra, 28(sp)
+// 0x01020c88: 0x1020c88: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3684,12 +3684,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01020c7c: 0x1020c7c: jal   0x1008748 sw    zero, 28456(a1)
+// 0x01020c8c: 0x1020c8c: jal   0x1008758 sw    zero, 28920(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3698,86 +3698,86 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_center_1008748(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_center_1008758(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01020c84: 0x1020c84: lui   v0, 0x30000
+// 0x01020c94: 0x1020c94: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020c88: 0x1020c88: lw    t1, 28464(v0)
+// 0x01020c98: 0x1020c98: lw    t1, 28928(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020c8c: 0x1020c8c: lui   v0, 0x30000
+// 0x01020c9c: 0x1020c9c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020c90: 0x1020c90: lw    t0, 28460(v0)
+// 0x01020ca0: 0x1020ca0: lw    t0, 28924(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7115
+	ldc.i4 7231
 	add
 	ldelem.i4
 	stloc 10
-// 0x01020c94: 0x1020c94: addiu v0, zero, 2
+// 0x01020ca4: 0x1020ca4: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01020c98: 0x1020c98: div   t1, v0
+// 0x01020ca8: 0x1020ca8: div   t1, v0
 	ldloc 8
 	ldloc 5
 	div
 	stloc 11
-// 0x01020c9c: 0x1020c9c: lui   v1, 0x30000
+// 0x01020cac: 0x1020cac: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01020ca0: 0x1020ca0: lw    t1, 28476(v1)
+// 0x01020cb0: 0x1020cb0: lw    t1, 28940(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020ca4: 0x1020ca4: lui   v1, 0x30000
+// 0x01020cb4: 0x1020cb4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01020ca8: 0x1020ca8: addiu a3, v1, 28480
+// 0x01020cb8: 0x1020cb8: addiu a3, v1, 28944
 	ldloc 7
-	ldc.i4 28480
+	ldc.i4 28944
 	add
 	stloc 4
-// 0x01020cac: 0x1020cac: addiu s0, sp, 16
+// 0x01020cbc: 0x1020cbc: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x01020cb0: 0x1020cb0: addu  a0, a3, zero
+// 0x01020cc0: 0x1020cc0: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x01020cb4: 0x1020cb4: addu  a1, s0, zero
+// 0x01020cc4: 0x1020cc4: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x01020cb8: 0x1020cb8: addu  a2, zero, zero
+// 0x01020cc8: 0x1020cc8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020cbc: 0x1020cbc: mflo  lo
+// 0x01020ccc: 0x1020ccc: mflo  lo
 	ldloc 11
 	stloc 13
-// 0x01020cc0: 0x1020cc0: addu  t1, t2, t1
+// 0x01020cd0: 0x1020cd0: addu  t1, t2, t1
 	ldloc 13
 	ldloc 8
 	add
 	stloc 8
-// 0x01020cc4: 0x1020cc4: sw    t1, 4(a3)
+// 0x01020cd4: 0x1020cd4: sw    t1, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -3786,20 +3786,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01020cc8: 0x1020cc8: div   t0, v0
+// 0x01020cd8: 0x1020cd8: div   t0, v0
 	ldloc 10
 	ldloc 5
 	div
 	stloc 11
-// 0x01020ccc: 0x1020ccc: mflo  lo
+// 0x01020cdc: 0x1020cdc: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x01020cd0: 0x1020cd0: jal   0x1007a6c sw    t0, 28480(v1)
+// 0x01020ce0: 0x1020ce0: jal   0x1007a7c sw    t0, 28944(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7120
+	ldc.i4 7236
 	add
 	ldloc 10
 	stelem.i4
@@ -3808,12 +3808,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01020cd8: 0x1020cd8: jal   0x1008748 addu  a0, s0, zero
+// 0x01020ce8: 0x1020ce8: jal   0x1008758 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3821,13 +3821,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_center_1008748(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_center_1008758(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01020ce0: 0x1020ce0: lw    ra, 28(sp)
-// 0x01020ce4: 0x1020ce4: lw    s0, 24(sp)
+// 0x01020cf0: 0x1020cf0: lw    ra, 28(sp)
+// 0x01020cf4: 0x1020cf4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3836,7 +3836,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01020ce8: 0x1020ce8: jr    ra addiu sp, sp, 32
+// 0x01020cf8: 0x1020cf8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3848,7 +3848,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_drag_end_1020cf0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_drag_end_1020d00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 lo,int32 t0,int32 s1,int32 s4,int32 s2,int32 s3,int32 s7,int32 s8,int32 t1,int32 s6,int32 s5,int32 ra)
@@ -3919,10 +3919,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020cf0: 0x1020cf0: lui   v0, 0x0
+// 0x01020d00: 0x1020d00: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01020cf4: 0x1020cf4: lw    v1, 6048(v0)
+// 0x01020d04: 0x1020d04: lw    v1, 6048(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3931,20 +3931,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01020cf8: 0x1020cf8: lui   v0, 0x20000
+// 0x01020d08: 0x1020d08: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01020cfc: 0x1020cfc: addiu sp, sp, -80
+// 0x01020d0c: 0x1020d0c: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01020d00: 0x1020d00: and   v0, v1, v0
+// 0x01020d10: 0x1020d10: and   v0, v1, v0
 	ldloc 7
 	ldloc 6
 	and
 	stloc 6
-// 0x01020d04: 0x1020d04: sw    s2, 48(sp)
+// 0x01020d14: 0x1020d14: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3953,8 +3953,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01020d08: 0x1020d08: sw    ra, 76(sp)
-// 0x01020d0c: 0x1020d0c: sw    s8, 72(sp)
+// 0x01020d18: 0x1020d18: sw    ra, 76(sp)
+// 0x01020d1c: 0x1020d1c: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3963,7 +3963,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01020d10: 0x1020d10: sw    s7, 68(sp)
+// 0x01020d20: 0x1020d20: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3972,7 +3972,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01020d14: 0x1020d14: sw    s6, 64(sp)
+// 0x01020d24: 0x1020d24: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3981,7 +3981,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01020d18: 0x1020d18: sw    s5, 60(sp)
+// 0x01020d28: 0x1020d28: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3990,7 +3990,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01020d1c: 0x1020d1c: sw    s4, 56(sp)
+// 0x01020d2c: 0x1020d2c: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3999,7 +3999,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01020d20: 0x1020d20: sw    s3, 52(sp)
+// 0x01020d30: 0x1020d30: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4008,7 +4008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01020d24: 0x1020d24: sw    s1, 44(sp)
+// 0x01020d34: 0x1020d34: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4017,7 +4017,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01020d28: 0x1020d28: sw    s0, 40(sp)
+// 0x01020d38: 0x1020d38: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4026,40 +4026,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01020d2c: 0x1020d2c: bne   v0, zero, 0x1020d40 addu  s2, a0, zero
+// 0x01020d3c: 0x1020d3c: bne   v0, zero, 0x1020d50 addu  s2, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 13
-	brtrue L_1020d40
+	brtrue L_1020d50
 // --- basic block ---
-// 0x01020d34: 0x1020d34: addiu s4, zero, 1
+// 0x01020d44: 0x1020d44: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x01020d38: 0x1020d38: j	 0x1020d48 addiu s0, zero, 1
+// 0x01020d48: 0x1020d48: j	 0x1020d58 addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-	br L_1020d48
+	br L_1020d58
 // --- basic block ---
-L_1020d40:
-// 0x01020d40: 0x1020d40: addiu s4, zero, 3
+L_1020d50:
+// 0x01020d50: 0x1020d50: addiu s4, zero, 3
 	ldc.i4.3
 	stloc 12
-// 0x01020d44: 0x1020d44: addiu s0, zero, 2
+// 0x01020d54: 0x1020d54: addiu s0, zero, 2
 	ldc.i4.2
 	stloc 8
-L_1020d48:
-// 0x01020d48: 0x1020d48: lui   s1, 0x30000
+L_1020d58:
+// 0x01020d58: 0x1020d58: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 11
-// 0x01020d4c: 0x1020d4c: addu  a0, s2, zero
+// 0x01020d5c: 0x1020d5c: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x01020d50: 0x1020d50: addiu a1, s1, 28432
+// 0x01020d60: 0x1020d60: addiu a1, s1, 28896
 	ldloc 11
-	ldc.i4 28432
+	ldc.i4 28896
 	add
 	stloc.2
-// 0x01020d54: 0x1020d54: jal   0x1009694 addu  a2, zero, zero
+// 0x01020d64: 0x1020d64: jal   0x10096a4 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4067,42 +4067,42 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020d5c: 0x1020d5c: mult  s4, v0
+// 0x01020d6c: 0x1020d6c: mult  s4, v0
 	ldloc 12
 	ldloc 6
 	mul
 	stloc 9
-// 0x01020d60: 0x1020d60: addiu a0, s1, 28432
+// 0x01020d70: 0x1020d70: addiu a0, s1, 28896
 	ldloc 11
-	ldc.i4 28432
+	ldc.i4 28896
 	add
 	stloc.1
-// 0x01020d64: 0x1020d64: addiu a1, sp, 16
+// 0x01020d74: 0x1020d74: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01020d68: 0x1020d68: addu  a2, zero, zero
+// 0x01020d78: 0x1020d78: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020d6c: 0x1020d6c: lui   s8, 0x20000
+// 0x01020d7c: 0x1020d7c: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 16
-// 0x01020d70: 0x1020d70: lui   s3, 0x30000
+// 0x01020d80: 0x1020d80: lui   s3, 0x30000
 	ldc.i4 196608
 	stloc 14
-// 0x01020d74: 0x1020d74: lui   s7, 0x20000
+// 0x01020d84: 0x1020d84: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 15
-// 0x01020d78: 0x1020d78: mflo  lo
+// 0x01020d88: 0x1020d88: mflo  lo
 	ldloc 9
 	stloc 18
-// 0x01020d7c: 0x1020d7c: jal   0x1007a6c sll   s4, s4, 1
+// 0x01020d8c: 0x1020d8c: jal   0x1007a7c sll   s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	shl
@@ -4112,20 +4112,20 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020d84: 0x1020d84: addiu a1, sp, 24
+// 0x01020d94: 0x1020d94: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01020d88: 0x1020d88: addu  a2, zero, zero
+// 0x01020d98: 0x1020d98: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020d8c: 0x1020d8c: jal   0x1007a6c addu  a0, s2, zero
+// 0x01020d9c: 0x1020d9c: jal   0x1007a7c addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -4133,12 +4133,12 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020d94: 0x1020d94: lw    v0, 20(sp)
+// 0x01020da4: 0x1020da4: lw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4147,7 +4147,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020d98: 0x1020d98: lw    a0, 28(sp)
+// 0x01020da8: 0x1020da8: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4156,40 +4156,40 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020d9c: 0x1020d9c: jal   0x10c09c0 subu  a0, a0, v0
+// 0x01020dac: 0x1020dac: jal   0x10c1000 subu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020da4: 0x1020da4: lw    a3, 23812(s8)
+// 0x01020db4: 0x1020db4: lw    a3, 24276(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 5953
+	ldc.i4 6069
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020da8: 0x1020da8: lw    a2, 23808(s8)
+// 0x01020db8: 0x1020db8: lw    a2, 24272(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 5952
+	ldc.i4 6068
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020dac: 0x1020dac: addu  a1, v1, zero
+// 0x01020dbc: 0x1020dbc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020db0: 0x1020db0: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020dc0: 0x1020dc0: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4197,20 +4197,20 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020db8: 0x1020db8: addu  t0, v0, zero
+// 0x01020dc8: 0x1020dc8: addu  t0, v0, zero
 	ldloc 6
 	stloc 10
-// 0x01020dbc: 0x1020dbc: addiu v0, s3, 28520
+// 0x01020dcc: 0x1020dcc: addiu v0, s3, 28984
 	ldloc 14
-	ldc.i4 28520
+	ldc.i4 28984
 	add
 	stloc 6
-// 0x01020dc0: 0x1020dc0: lw    a0, 4(v0)
+// 0x01020dd0: 0x1020dd0: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4219,7 +4219,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020dc4: 0x1020dc4: sw    t0, 32(sp)
+// 0x01020dd4: 0x1020dd4: sw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4228,7 +4228,7 @@ L_1020d48:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01020dc8: 0x1020dc8: jal   0x10c09c0 sw    v1, 36(sp)
+// 0x01020dd8: 0x1020dd8: jal   0x10c1000 sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4239,33 +4239,33 @@ L_1020d48:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020dd0: 0x1020dd0: lw    a3, 23820(s7)
+// 0x01020de0: 0x1020de0: lw    a3, 24284(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5955
+	ldc.i4 6071
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020dd4: 0x1020dd4: lw    a2, 23816(s7)
+// 0x01020de4: 0x1020de4: lw    a2, 24280(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5954
+	ldc.i4 6070
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020dd8: 0x1020dd8: addu  a1, v1, zero
+// 0x01020de8: 0x1020de8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020ddc: 0x1020ddc: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020dec: 0x1020dec: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4273,12 +4273,12 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020de4: 0x1020de4: lw    t1, 36(sp)
+// 0x01020df4: 0x1020df4: lw    t1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4287,7 +4287,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01020de8: 0x1020de8: lw    t0, 32(sp)
+// 0x01020df8: 0x1020df8: lw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4296,16 +4296,16 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01020dec: 0x1020dec: addu  a1, t1, zero
+// 0x01020dfc: 0x1020dfc: addu  a1, t1, zero
 	ldloc 17
 	stloc.2
-// 0x01020df0: 0x1020df0: addu  a0, t0, zero
+// 0x01020e00: 0x1020e00: addu  a0, t0, zero
 	ldloc 10
 	stloc.1
-// 0x01020df4: 0x1020df4: addu  a3, v1, zero
+// 0x01020e04: 0x1020e04: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01020df8: 0x1020df8: jal   0x10c06e8 addu  a2, v0, zero
+// 0x01020e08: 0x1020e08: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -4313,34 +4313,34 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e00: 0x1020e00: addu  a1, v1, zero
+// 0x01020e10: 0x1020e10: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020e04: 0x1020e04: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01020e14: 0x1020e14: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e0c: 0x1020e0c: addu  s5, v0, zero
+// 0x01020e1c: 0x1020e1c: addu  s5, v0, zero
 	ldloc 6
 	stloc 19
-// 0x01020e10: 0x1020e10: addiu v0, s3, 28520
+// 0x01020e20: 0x1020e20: addiu v0, s3, 28984
 	ldloc 14
-	ldc.i4 28520
+	ldc.i4 28984
 	add
 	stloc 6
-// 0x01020e14: 0x1020e14: sw    s5, 4(v0)
+// 0x01020e24: 0x1020e24: sw    s5, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4349,7 +4349,7 @@ L_1020d48:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01020e18: 0x1020e18: lw    a0, 24(sp)
+// 0x01020e28: 0x1020e28: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4358,7 +4358,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020e1c: 0x1020e1c: lw    v0, 16(sp)
+// 0x01020e2c: 0x1020e2c: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4367,40 +4367,40 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020e20: 0x1020e20: jal   0x10c09c0 subu  a0, a0, v0
+// 0x01020e30: 0x1020e30: jal   0x10c1000 subu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e28: 0x1020e28: lw    a3, 23812(s8)
+// 0x01020e38: 0x1020e38: lw    a3, 24276(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 5953
+	ldc.i4 6069
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020e2c: 0x1020e2c: lw    a2, 23808(s8)
+// 0x01020e3c: 0x1020e3c: lw    a2, 24272(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 5952
+	ldc.i4 6068
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020e30: 0x1020e30: addu  a1, v1, zero
+// 0x01020e40: 0x1020e40: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020e34: 0x1020e34: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020e44: 0x1020e44: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4408,24 +4408,24 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e3c: 0x1020e3c: lw    a0, 28520(s3)
+// 0x01020e4c: 0x1020e4c: lw    a0, 28984(s3)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7130
+	ldc.i4 7246
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020e40: 0x1020e40: addu  t0, v0, zero
+// 0x01020e50: 0x1020e50: addu  t0, v0, zero
 	ldloc 6
 	stloc 10
-// 0x01020e44: 0x1020e44: sw    t0, 32(sp)
+// 0x01020e54: 0x1020e54: sw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4434,7 +4434,7 @@ L_1020d48:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01020e48: 0x1020e48: jal   0x10c09c0 sw    v1, 36(sp)
+// 0x01020e58: 0x1020e58: jal   0x10c1000 sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4445,33 +4445,33 @@ L_1020d48:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e50: 0x1020e50: lw    a3, 23820(s7)
+// 0x01020e60: 0x1020e60: lw    a3, 24284(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5955
+	ldc.i4 6071
 	add
 	ldelem.i4
 	stloc 4
-// 0x01020e54: 0x1020e54: lw    a2, 23816(s7)
+// 0x01020e64: 0x1020e64: lw    a2, 24280(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5954
+	ldc.i4 6070
 	add
 	ldelem.i4
 	stloc.3
-// 0x01020e58: 0x1020e58: addu  a1, v1, zero
+// 0x01020e68: 0x1020e68: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020e5c: 0x1020e5c: jal   0x10c0798 addu  a0, v0, zero
+// 0x01020e6c: 0x1020e6c: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4479,12 +4479,12 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e64: 0x1020e64: lw    t0, 32(sp)
+// 0x01020e74: 0x1020e74: lw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4493,7 +4493,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01020e68: 0x1020e68: lw    t1, 36(sp)
+// 0x01020e78: 0x1020e78: lw    t1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4502,16 +4502,16 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01020e6c: 0x1020e6c: addu  a0, t0, zero
+// 0x01020e7c: 0x1020e7c: addu  a0, t0, zero
 	ldloc 10
 	stloc.1
-// 0x01020e70: 0x1020e70: addu  a1, t1, zero
+// 0x01020e80: 0x1020e80: addu  a1, t1, zero
 	ldloc 17
 	stloc.2
-// 0x01020e74: 0x1020e74: addu  a3, v1, zero
+// 0x01020e84: 0x1020e84: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01020e78: 0x1020e78: jal   0x10c06e8 addu  a2, v0, zero
+// 0x01020e88: 0x1020e88: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -4519,88 +4519,88 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e80: 0x1020e80: addu  a1, v1, zero
+// 0x01020e90: 0x1020e90: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01020e84: 0x1020e84: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01020e94: 0x1020e94: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020e8c: 0x1020e8c: div   s6, s0
+// 0x01020e9c: 0x1020e9c: div   s6, s0
 	ldloc 18
 	ldloc 8
 	div
 	stloc 9
-// 0x01020e90: 0x1020e90: addiu a1, zero, -30
+// 0x01020ea0: 0x1020ea0: addiu a1, zero, -30
 	ldc.i4.s -30
 	stloc.2
-// 0x01020e94: 0x1020e94: sw    v0, 28520(s3)
+// 0x01020ea4: 0x1020ea4: sw    v0, 28984(s3)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7130
+	ldc.i4 7246
 	add
 	ldloc 6
 	stelem.i4
-// 0x01020e98: 0x1020e98: lw    a3, 0(s2)
+// 0x01020ea8: 0x1020ea8: lw    a3, 0(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01020e9c: 0x1020e9c: lui   a0, 0x30000
+// 0x01020eac: 0x1020eac: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01020ea0: 0x1020ea0: lui   a2, 0x30000
+// 0x01020eb0: 0x1020eb0: lui   a2, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x01020ea4: 0x1020ea4: addiu v1, a0, 28440
+// 0x01020eb4: 0x1020eb4: addiu v1, a0, 28904
 	ldloc.1
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc 7
-// 0x01020ea8: 0x1020ea8: sw    a3, 28432(s1)
+// 0x01020eb8: 0x1020eb8: sw    a3, 28896(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7108
+	ldc.i4 7224
 	add
 	ldloc 4
 	stelem.i4
-// 0x01020eac: 0x1020eac: lw    a0, 28440(a0)
+// 0x01020ebc: 0x1020ebc: lw    a0, 28904(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7110
+	ldc.i4 7226
 	add
 	ldelem.i4
 	stloc.1
-// 0x01020eb0: 0x1020eb0: lw    t1, 28228(a2)
+// 0x01020ec0: 0x1020ec0: lw    t1, 28692(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 17
-// 0x01020eb4: 0x1020eb4: lw    v1, 4(v1)
+// 0x01020ec4: 0x1020ec4: lw    v1, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4609,7 +4609,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01020eb8: 0x1020eb8: lw    t0, 4(s2)
+// 0x01020ec8: 0x1020ec8: lw    t0, 4(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4618,20 +4618,20 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01020ebc: 0x1020ebc: addiu a3, zero, -2
+// 0x01020ecc: 0x1020ecc: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x01020ec0: 0x1020ec0: and   a3, t1, a3
+// 0x01020ed0: 0x1020ed0: and   a3, t1, a3
 	ldloc 17
 	ldloc 4
 	and
 	stloc 4
-// 0x01020ec4: 0x1020ec4: addiu s1, s1, 28432
+// 0x01020ed4: 0x1020ed4: addiu s1, s1, 28896
 	ldloc 11
-	ldc.i4 28432
+	ldc.i4 28896
 	add
 	stloc 11
-// 0x01020ec8: 0x1020ec8: sw    t0, 4(s1)
+// 0x01020ed8: 0x1020ed8: sw    t0, 4(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4640,58 +4640,58 @@ L_1020d48:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01020ecc: 0x1020ecc: sw    a3, 28228(a2)
+// 0x01020edc: 0x1020edc: sw    a3, 28692(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldloc 4
 	stelem.i4
-// 0x01020ed0: 0x1020ed0: mflo  lo
+// 0x01020ee0: 0x1020ee0: mflo  lo
 	ldloc 9
 	stloc 18
-// 0x01020ed4: 0x1020ed4: sll   zero, zero, 0
-// 0x01020ed8: 0x1020ed8: sll   zero, zero, 0
-// 0x01020edc: 0x1020edc: div   s6, a1
+// 0x01020ee4: 0x1020ee4: sll   zero, zero, 0
+// 0x01020ee8: 0x1020ee8: sll   zero, zero, 0
+// 0x01020eec: 0x1020eec: div   s6, a1
 	ldloc 18
 	ldloc.2
 	div
 	stloc 9
-// 0x01020ee0: 0x1020ee0: mflo  lo
+// 0x01020ef0: 0x1020ef0: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x01020ee4: 0x1020ee4: sll   zero, zero, 0
-// 0x01020ee8: 0x1020ee8: sll   zero, zero, 0
-// 0x01020eec: 0x1020eec: div   s4, s0
+// 0x01020ef4: 0x1020ef4: sll   zero, zero, 0
+// 0x01020ef8: 0x1020ef8: sll   zero, zero, 0
+// 0x01020efc: 0x1020efc: div   s4, s0
 	ldloc 12
 	ldloc 8
 	div
 	stloc 9
-// 0x01020ef0: 0x1020ef0: mflo  lo
+// 0x01020f00: 0x1020f00: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01020ef4: 0x1020ef4: subu  s0, a1, s0
+// 0x01020f04: 0x1020f04: subu  s0, a1, s0
 	ldloc.2
 	ldloc 8
 	sub
 	stloc 8
-// 0x01020ef8: 0x1020ef8: sll   zero, zero, 0
-// 0x01020efc: 0x1020efc: mult  s0, v0
+// 0x01020f08: 0x1020f08: sll   zero, zero, 0
+// 0x01020f0c: 0x1020f0c: mult  s0, v0
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 9
-// 0x01020f00: 0x1020f00: mflo  lo
+// 0x01020f10: 0x1020f10: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x01020f04: 0x1020f04: addu  v0, v0, a0
+// 0x01020f14: 0x1020f14: addu  v0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-// 0x01020f08: 0x1020f08: sw    v0, 24(sp)
+// 0x01020f18: 0x1020f18: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4700,20 +4700,20 @@ L_1020d48:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01020f0c: 0x1020f0c: mult  s0, s5
+// 0x01020f1c: 0x1020f1c: mult  s0, s5
 	ldloc 8
 	ldloc 19
 	mul
 	stloc 9
-// 0x01020f10: 0x1020f10: mflo  lo
+// 0x01020f20: 0x1020f20: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01020f14: 0x1020f14: addu  v1, s0, v1
+// 0x01020f24: 0x1020f24: addu  v1, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x01020f18: 0x1020f18: jal   0x101fc54 sw    v1, 28(sp)
+// 0x01020f28: 0x1020f28: jal   0x101fc64 sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4727,12 +4727,12 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020f20: 0x1020f20: jal   0x1020c40 addiu a0, sp, 24
+// 0x01020f30: 0x1020f30: jal   0x1020c50 addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4742,16 +4742,16 @@ L_1020d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01020f28: 0x1020f28: lw    ra, 76(sp)
-// 0x01020f2c: 0x1020f2c: addiu v0, zero, 1
+// 0x01020f38: 0x1020f38: lw    ra, 76(sp)
+// 0x01020f3c: 0x1020f3c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01020f30: 0x1020f30: lw    s8, 72(sp)
+// 0x01020f40: 0x1020f40: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4760,7 +4760,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01020f34: 0x1020f34: lw    s7, 68(sp)
+// 0x01020f44: 0x1020f44: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4769,7 +4769,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01020f38: 0x1020f38: lw    s6, 64(sp)
+// 0x01020f48: 0x1020f48: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4778,7 +4778,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01020f3c: 0x1020f3c: lw    s5, 60(sp)
+// 0x01020f4c: 0x1020f4c: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4787,7 +4787,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01020f40: 0x1020f40: lw    s4, 56(sp)
+// 0x01020f50: 0x1020f50: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4796,7 +4796,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01020f44: 0x1020f44: lw    s3, 52(sp)
+// 0x01020f54: 0x1020f54: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4805,7 +4805,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01020f48: 0x1020f48: lw    s2, 48(sp)
+// 0x01020f58: 0x1020f58: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4814,7 +4814,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01020f4c: 0x1020f4c: lw    s1, 44(sp)
+// 0x01020f5c: 0x1020f5c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4823,7 +4823,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01020f50: 0x1020f50: lw    s0, 40(sp)
+// 0x01020f60: 0x1020f60: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4832,7 +4832,7 @@ L_1020d48:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020f54: 0x1020f54: jr    ra addiu sp, sp, 80
+// 0x01020f64: 0x1020f64: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -4844,7 +4844,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4879,26 +4879,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020f5c: 0x1020f5c: addiu sp, sp, -24
+// 0x01020f6c: 0x1020f6c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020f60: 0x1020f60: sw    ra, 20(sp)
-// 0x01020f64: 0x1020f64: jal   0x1020c40 sll   zero, zero, 0
+// 0x01020f70: 0x1020f70: sw    ra, 20(sp)
+// 0x01020f74: 0x1020f74: jal   0x1020c50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01020f6c: 0x1020f6c: lw    ra, 20(sp)
-// 0x01020f70: 0x1020f70: sll   zero, zero, 0
-// 0x01020f74: 0x1020f74: jr    ra addiu sp, sp, 24
+// 0x01020f7c: 0x1020f7c: lw    ra, 20(sp)
+// 0x01020f80: 0x1020f80: sll   zero, zero, 0
+// 0x01020f84: 0x1020f84: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4910,7 +4910,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra,int32 lo)
@@ -4951,55 +4951,55 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020f7c: 0x1020f7c: lui   v0, 0x30000
+// 0x01020f8c: 0x1020f8c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020f80: 0x1020f80: lw    v1, 28464(v0)
+// 0x01020f90: 0x1020f90: lw    v1, 28928(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 6
-// 0x01020f84: 0x1020f84: addiu v0, zero, 2
+// 0x01020f94: 0x1020f94: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01020f88: 0x1020f88: div   v1, v0
+// 0x01020f98: 0x1020f98: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 10
-// 0x01020f8c: 0x1020f8c: lui   a3, 0x30000
+// 0x01020f9c: 0x1020f9c: lui   a3, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x01020f90: 0x1020f90: addu  v1, a0, zero
+// 0x01020fa0: 0x1020fa0: addu  v1, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01020f94: 0x1020f94: addiu sp, sp, -24
+// 0x01020fa4: 0x1020fa4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020f98: 0x1020f98: sw    v1, 28476(a3)
+// 0x01020fa8: 0x1020fa8: sw    v1, 28940(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldloc 6
 	stelem.i4
-// 0x01020f9c: 0x1020f9c: lui   v0, 0x30000
+// 0x01020fac: 0x1020fac: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01020fa0: 0x1020fa0: addiu v0, v0, 28480
+// 0x01020fb0: 0x1020fb0: addiu v0, v0, 28944
 	ldloc 5
-	ldc.i4 28480
+	ldc.i4 28944
 	add
 	stloc 5
-// 0x01020fa4: 0x1020fa4: sw    s0, 16(sp)
+// 0x01020fb4: 0x1020fb4: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5008,30 +5008,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01020fa8: 0x1020fa8: lui   s0, 0x30000
+// 0x01020fb8: 0x1020fb8: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x01020fac: 0x1020fac: addu  a0, v0, zero
+// 0x01020fbc: 0x1020fbc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01020fb0: 0x1020fb0: addiu a1, s0, 28440
+// 0x01020fc0: 0x1020fc0: addiu a1, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.2
-// 0x01020fb4: 0x1020fb4: addu  a2, zero, zero
+// 0x01020fc4: 0x1020fc4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01020fb8: 0x1020fb8: sw    ra, 20(sp)
-// 0x01020fbc: 0x1020fbc: mflo  lo
+// 0x01020fc8: 0x1020fc8: sw    ra, 20(sp)
+// 0x01020fcc: 0x1020fcc: mflo  lo
 	ldloc 10
 	stloc 4
-// 0x01020fc0: 0x1020fc0: subu  v1, a3, v1
+// 0x01020fd0: 0x1020fd0: subu  v1, a3, v1
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 6
-// 0x01020fc4: 0x1020fc4: jal   0x1007a6c sw    v1, 4(v0)
+// 0x01020fd4: 0x1020fd4: jal   0x1007a7c sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5045,14 +5045,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020fcc: 0x1020fcc: jal   0x1020c40 addiu a0, s0, 28440
+// 0x01020fdc: 0x1020fdc: jal   0x1020c50 addiu a0, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.1
 	ldloc.0
@@ -5060,13 +5060,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01020fd4: 0x1020fd4: lw    ra, 20(sp)
-// 0x01020fd8: 0x1020fd8: lw    s0, 16(sp)
+// 0x01020fe4: 0x1020fe4: lw    ra, 20(sp)
+// 0x01020fe8: 0x1020fe8: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5075,7 +5075,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01020fdc: 0x1020fdc: jr    ra addiu sp, sp, 24
+// 0x01020fec: 0x1020fec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5087,7 +5087,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_pressed_1020fe4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_pressed_1020ff4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -5122,23 +5122,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01020fe4: 0x1020fe4: addiu sp, sp, -24
+// 0x01020ff4: 0x1020ff4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01020fe8: 0x1020fe8: sw    ra, 20(sp)
-// 0x01020fec: 0x1020fec: jal   0x104b650 sll   zero, zero, 0
-	call int32 Cibyl55::roadmap_pointer_enable_double_click_104b650()
+// 0x01020ff8: 0x1020ff8: sw    ra, 20(sp)
+// 0x01020ffc: 0x1020ffc: jal   0x104b660 sll   zero, zero, 0
+	call int32 Cibyl55::roadmap_pointer_enable_double_click_104b660()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01020ff4: 0x1020ff4: lw    ra, 20(sp)
-// 0x01020ff8: 0x1020ff8: addu  v0, zero, zero
+// 0x01021004: 0x1021004: lw    ra, 20(sp)
+// 0x01021008: 0x1021008: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01020ffc: 0x1020ffc: jr    ra addiu sp, sp, 24
+// 0x0102100c: 0x102100c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5150,7 +5150,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_zoom_reset_1021004(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_zoom_reset_1021014(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5185,41 +5185,41 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1021004:
-// 0x01021004: 0x1021004: addiu sp, sp, -24
+L_1021014:
+// 0x01021014: 0x1021014: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021008: 0x1021008: sw    ra, 20(sp)
-// 0x0102100c: 0x102100c: jal   0x1009a28 sll   zero, zero, 0
+// 0x01021018: 0x1021018: sw    ra, 20(sp)
+// 0x0102101c: 0x102101c: jal   0x1009a38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_zoom_reset_1009a28(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_zoom_reset_1009a38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021014: 0x1021014: jal   0x1010a4c sll   zero, zero, 0
+// 0x01021024: 0x1021024: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102101c: 0x102101c: lui   a0, 0x30000
+// 0x0102102c: 0x102102c: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01021020: 0x1021020: jal   0x1020c40 addiu a0, a0, 28440
+// 0x01021030: 0x1021030: jal   0x1020c50 addiu a0, a0, 28904
 	ldloc.1
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.1
 	ldloc.0
@@ -5227,25 +5227,25 @@ L_1021004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021028: 0x1021028: jal   0x101fc54 sll   zero, zero, 0
+// 0x01021038: 0x1021038: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021030: 0x1021030: lw    ra, 20(sp)
-// 0x01021034: 0x1021034: sll   zero, zero, 0
-// 0x01021038: 0x1021038: jr    ra addiu sp, sp, 24
+// 0x01021040: 0x1021040: lw    ra, 20(sp)
+// 0x01021044: 0x1021044: sll   zero, zero, 0
+// 0x01021048: 0x1021048: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5257,7 +5257,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_zoom_out_1021040(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_zoom_out_1021050(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 lo,int32 ra)
@@ -5298,14 +5298,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1021040:
-// 0x01021040: 0x1021040: addiu sp, sp, -24
+L_1021050:
+// 0x01021050: 0x1021050: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021044: 0x1021044: sw    ra, 20(sp)
-// 0x01021048: 0x1021048: jal   0x1025a40 sw    s0, 16(sp)
+// 0x01021054: 0x1021054: sw    ra, 20(sp)
+// 0x01021058: 0x1021058: jal   0x1025a50 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5319,177 +5319,177 @@ L_1021040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_auto_zoom_suspend_1025a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_auto_zoom_suspend_1025a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01021050: 0x1021050: lui   v0, 0x30000
+// 0x01021060: 0x1021060: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01021054: 0x1021054: lw    a0, 28476(v0)
+// 0x01021064: 0x1021064: lw    a0, 28940(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021058: 0x1021058: lui   v0, 0x30000
+// 0x01021068: 0x1021068: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0102105c: 0x102105c: lw    v0, 28464(v0)
+// 0x0102106c: 0x102106c: lw    v0, 28928(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021060: 0x1021060: lui   v1, 0x30000
+// 0x01021070: 0x1021070: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021064: 0x1021064: lw    v1, 28256(v1)
+// 0x01021074: 0x1021074: lw    v1, 28720(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021068: 0x1021068: addu  a0, a0, v0
+// 0x01021078: 0x1021078: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x0102106c: 0x102106c: addiu v0, zero, 1
+// 0x0102107c: 0x102107c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01021070: 0x1021070: bne   v1, v0, 0x1021080 addiu v0, zero, 3
+// 0x01021080: 0x1021080: bne   v1, v0, 0x1021090 addiu v0, zero, 3
 	ldloc 5
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	bne.un L_1021080
+	bne.un L_1021090
 // --- basic block ---
-// 0x01021078: 0x1021078: mult  a0, v0
+// 0x01021088: 0x1021088: mult  a0, v0
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 9
-// 0x0102107c: 0x102107c: mflo  lo
+// 0x0102108c: 0x102108c: mflo  lo
 	ldloc 9
 	stloc.1
-L_1021080:
-// 0x01021080: 0x1021080: jal   0x1006fc0 sll   zero, zero, 0
+L_1021090:
+// 0x01021090: 0x1021090: jal   0x1006fd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_get_scale_1006fc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_get_scale_1006fd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01021088: 0x1021088: lui   v1, 0x30000
+// 0x01021098: 0x1021098: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102108c: 0x102108c: lw    s0, 28476(v1)
+// 0x0102109c: 0x102109c: lw    s0, 28940(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021090: 0x1021090: lui   v1, 0x30000
+// 0x010210a0: 0x10210a0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021094: 0x1021094: lw    v1, 28464(v1)
+// 0x010210a4: 0x10210a4: lw    v1, 28928(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021098: 0x1021098: lui   a0, 0x30000
+// 0x010210a8: 0x10210a8: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0102109c: 0x102109c: lw    a0, 28256(a0)
+// 0x010210ac: 0x10210ac: lw    a0, 28720(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.1
-// 0x010210a0: 0x10210a0: addu  s0, s0, v1
+// 0x010210b0: 0x10210b0: addu  s0, s0, v1
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x010210a4: 0x10210a4: addiu v1, zero, 1
+// 0x010210b4: 0x10210b4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010210a8: 0x10210a8: bne   a0, v1, 0x10210b8 addiu v1, zero, 3
+// 0x010210b8: 0x10210b8: bne   a0, v1, 0x10210c8 addiu v1, zero, 3
 	ldloc.1
 	ldloc 5
 	ldc.i4.3
 	stloc 5
-	bne.un L_10210b8
+	bne.un L_10210c8
 // --- basic block ---
-// 0x010210b0: 0x10210b0: mult  s0, v1
+// 0x010210c0: 0x10210c0: mult  s0, v1
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 9
-// 0x010210b4: 0x10210b4: mflo  lo
+// 0x010210c4: 0x10210c4: mflo  lo
 	ldloc 9
 	stloc 8
-L_10210b8:
-// 0x010210b8: 0x10210b8: jal   0x10c09c0 addu  a0, v0, zero
+L_10210c8:
+// 0x010210c8: 0x10210c8: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010210c0: 0x10210c0: lui   a0, 0x20000
+// 0x010210d0: 0x10210d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010210c4: 0x10210c4: lw    a3, 23828(a0)
+// 0x010210d4: 0x10210d4: lw    a3, 24292(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5957
+	ldc.i4 6073
 	add
 	ldelem.i4
 	stloc 4
-// 0x010210c8: 0x10210c8: lw    a2, 23824(a0)
+// 0x010210d8: 0x10210d8: lw    a2, 24288(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5956
+	ldc.i4 6072
 	add
 	ldelem.i4
 	stloc.3
-// 0x010210cc: 0x10210cc: addu  a1, v1, zero
+// 0x010210dc: 0x10210dc: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010210d0: 0x10210d0: jal   0x10c0798 addu  a0, v0, zero
+// 0x010210e0: 0x10210e0: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -5497,29 +5497,29 @@ L_10210b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010210d8: 0x10210d8: addu  a1, v1, zero
+// 0x010210e8: 0x10210e8: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010210dc: 0x10210dc: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010210ec: 0x10210ec: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010210e4: 0x10210e4: addu  a0, v0, zero
+// 0x010210f4: 0x10210f4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010210e8: 0x10210e8: jal   0x1009b10 addu  a1, s0, zero
+// 0x010210f8: 0x10210f8: jal   0x1009b20 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5527,29 +5527,29 @@ L_10210b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_set_scale_1009b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_set_scale_1009b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010210f0: 0x10210f0: beq   v0, zero, 0x1021100 sll   zero, zero, 0
+// 0x01021100: 0x1021100: beq   v0, zero, 0x1021110 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1021100
+	brfalse L_1021110
 // --- basic block ---
-// 0x010210f8: 0x10210f8: jal   0x1010a4c sll   zero, zero, 0
+// 0x01021108: 0x1021108: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1021100:
-// 0x01021100: 0x1021100: lw    ra, 20(sp)
-// 0x01021104: 0x1021104: lw    s0, 16(sp)
+L_1021110:
+// 0x01021110: 0x1021110: lw    ra, 20(sp)
+// 0x01021114: 0x1021114: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5558,7 +5558,7 @@ L_1021100:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021108: 0x1021108: jr    ra addiu sp, sp, 24
+// 0x01021118: 0x1021118: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5570,7 +5570,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_zoom_in_1021110(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_zoom_in_1021120(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 lo,int32 ra)
@@ -5611,14 +5611,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1021110:
-// 0x01021110: 0x1021110: addiu sp, sp, -24
+L_1021120:
+// 0x01021120: 0x1021120: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021114: 0x1021114: sw    ra, 20(sp)
-// 0x01021118: 0x1021118: jal   0x1025a40 sw    s0, 16(sp)
+// 0x01021124: 0x1021124: sw    ra, 20(sp)
+// 0x01021128: 0x1021128: jal   0x1025a50 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5632,177 +5632,177 @@ L_1021110:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_auto_zoom_suspend_1025a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_auto_zoom_suspend_1025a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01021120: 0x1021120: lui   v0, 0x30000
+// 0x01021130: 0x1021130: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01021124: 0x1021124: lw    a0, 28476(v0)
+// 0x01021134: 0x1021134: lw    a0, 28940(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021128: 0x1021128: lui   v0, 0x30000
+// 0x01021138: 0x1021138: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0102112c: 0x102112c: lw    v0, 28464(v0)
+// 0x0102113c: 0x102113c: lw    v0, 28928(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021130: 0x1021130: lui   v1, 0x30000
+// 0x01021140: 0x1021140: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021134: 0x1021134: lw    v1, 28256(v1)
+// 0x01021144: 0x1021144: lw    v1, 28720(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021138: 0x1021138: addu  a0, a0, v0
+// 0x01021148: 0x1021148: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x0102113c: 0x102113c: addiu v0, zero, 1
+// 0x0102114c: 0x102114c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01021140: 0x1021140: bne   v1, v0, 0x1021150 addiu v0, zero, 3
+// 0x01021150: 0x1021150: bne   v1, v0, 0x1021160 addiu v0, zero, 3
 	ldloc 5
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	bne.un L_1021150
+	bne.un L_1021160
 // --- basic block ---
-// 0x01021148: 0x1021148: mult  a0, v0
+// 0x01021158: 0x1021158: mult  a0, v0
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 9
-// 0x0102114c: 0x102114c: mflo  lo
+// 0x0102115c: 0x102115c: mflo  lo
 	ldloc 9
 	stloc.1
-L_1021150:
-// 0x01021150: 0x1021150: jal   0x1006fc0 sll   zero, zero, 0
+L_1021160:
+// 0x01021160: 0x1021160: jal   0x1006fd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_get_scale_1006fc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_get_scale_1006fd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01021158: 0x1021158: lui   v1, 0x30000
+// 0x01021168: 0x1021168: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102115c: 0x102115c: lw    s0, 28476(v1)
+// 0x0102116c: 0x102116c: lw    s0, 28940(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021160: 0x1021160: lui   v1, 0x30000
+// 0x01021170: 0x1021170: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021164: 0x1021164: lw    v1, 28464(v1)
+// 0x01021174: 0x1021174: lw    v1, 28928(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021168: 0x1021168: lui   a0, 0x30000
+// 0x01021178: 0x1021178: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0102116c: 0x102116c: lw    a0, 28256(a0)
+// 0x0102117c: 0x102117c: lw    a0, 28720(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021170: 0x1021170: addu  s0, s0, v1
+// 0x01021180: 0x1021180: addu  s0, s0, v1
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01021174: 0x1021174: addiu v1, zero, 1
+// 0x01021184: 0x1021184: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01021178: 0x1021178: bne   a0, v1, 0x1021188 addiu v1, zero, 3
+// 0x01021188: 0x1021188: bne   a0, v1, 0x1021198 addiu v1, zero, 3
 	ldloc.1
 	ldloc 5
 	ldc.i4.3
 	stloc 5
-	bne.un L_1021188
+	bne.un L_1021198
 // --- basic block ---
-// 0x01021180: 0x1021180: mult  s0, v1
+// 0x01021190: 0x1021190: mult  s0, v1
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 9
-// 0x01021184: 0x1021184: mflo  lo
+// 0x01021194: 0x1021194: mflo  lo
 	ldloc 9
 	stloc 8
-L_1021188:
-// 0x01021188: 0x1021188: jal   0x10c09c0 addu  a0, v0, zero
+L_1021198:
+// 0x01021198: 0x1021198: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01021190: 0x1021190: lui   a0, 0x20000
+// 0x010211a0: 0x10211a0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01021194: 0x1021194: lw    a3, 23836(a0)
+// 0x010211a4: 0x10211a4: lw    a3, 24300(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5959
+	ldc.i4 6075
 	add
 	ldelem.i4
 	stloc 4
-// 0x01021198: 0x1021198: lw    a2, 23832(a0)
+// 0x010211a8: 0x10211a8: lw    a2, 24296(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5958
+	ldc.i4 6074
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102119c: 0x102119c: addu  a1, v1, zero
+// 0x010211ac: 0x10211ac: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010211a0: 0x10211a0: jal   0x10c0798 addu  a0, v0, zero
+// 0x010211b0: 0x10211b0: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -5810,29 +5810,29 @@ L_1021188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010211a8: 0x10211a8: addu  a1, v1, zero
+// 0x010211b8: 0x10211b8: addu  a1, v1, zero
 	ldloc 5
 	stloc.2
-// 0x010211ac: 0x10211ac: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010211bc: 0x10211bc: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010211b4: 0x10211b4: addu  a0, v0, zero
+// 0x010211c4: 0x10211c4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010211b8: 0x10211b8: jal   0x1009b10 addu  a1, s0, zero
+// 0x010211c8: 0x10211c8: jal   0x1009b20 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5840,29 +5840,29 @@ L_1021188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_set_scale_1009b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_set_scale_1009b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010211c0: 0x10211c0: beq   v0, zero, 0x10211d0 sll   zero, zero, 0
+// 0x010211d0: 0x10211d0: beq   v0, zero, 0x10211e0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10211d0
+	brfalse L_10211e0
 // --- basic block ---
-// 0x010211c8: 0x10211c8: jal   0x1010a4c sll   zero, zero, 0
+// 0x010211d8: 0x10211d8: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_10211d0:
-// 0x010211d0: 0x10211d0: lw    ra, 20(sp)
-// 0x010211d4: 0x10211d4: lw    s0, 16(sp)
+L_10211e0:
+// 0x010211e0: 0x10211e0: lw    ra, 20(sp)
+// 0x010211e4: 0x10211e4: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5871,7 +5871,7 @@ L_10211d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010211d8: 0x10211d8: jr    ra addiu sp, sp, 24
+// 0x010211e8: 0x10211e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5883,7 +5883,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_decrease_horizon_10211e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_decrease_horizon_10211f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5918,59 +5918,59 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10211e0:
-// 0x010211e0: 0x10211e0: lui   v0, 0x30000
+L_10211f0:
+// 0x010211f0: 0x10211f0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010211e4: 0x10211e4: lw    v1, 28256(v0)
+// 0x010211f4: 0x10211f4: lw    v1, 28720(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 6
-// 0x010211e8: 0x10211e8: addiu sp, sp, -24
+// 0x010211f8: 0x10211f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010211ec: 0x10211ec: addiu v0, zero, 1
+// 0x010211fc: 0x10211fc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010211f0: 0x10211f0: bne   v1, v0, 0x102121c sw    ra, 20(sp)
+// 0x01021200: 0x1021200: bne   v1, v0, 0x102122c sw    ra, 20(sp)
 	ldloc 6
 	ldloc 5
-	bne.un L_102121c
+	bne.un L_102122c
 // --- basic block ---
-// 0x010211f8: 0x10211f8: lui   v0, 0x30000
+// 0x01021208: 0x1021208: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010211fc: 0x10211fc: lw    v1, 28448(v0)
+// 0x0102120c: 0x102120c: lw    v1, 28912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021200: 0x1021200: sll   zero, zero, 0
-// 0x01021204: 0x1021204: addiu v1, v1, -100
+// 0x01021210: 0x1021210: sll   zero, zero, 0
+// 0x01021214: 0x1021214: addiu v1, v1, -100
 	ldloc 6
 	ldc.i4.s -100
 	add
 	stloc 6
-// 0x01021208: 0x1021208: addu  a0, v1, zero
+// 0x01021218: 0x1021218: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x0102120c: 0x102120c: jal   0x1008724 sw    v1, 28448(v0)
+// 0x0102121c: 0x102121c: jal   0x1008734 sw    v1, 28912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldloc 6
 	stelem.i4
@@ -5979,26 +5979,26 @@ L_10211e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_horizon_1008724(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_horizon_1008734(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021214: 0x1021214: jal   0x101fc54 sll   zero, zero, 0
+// 0x01021224: 0x1021224: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102121c:
-// 0x0102121c: 0x102121c: lw    ra, 20(sp)
-// 0x01021220: 0x1021220: sll   zero, zero, 0
-// 0x01021224: 0x1021224: jr    ra addiu sp, sp, 24
+L_102122c:
+// 0x0102122c: 0x102122c: lw    ra, 20(sp)
+// 0x01021230: 0x1021230: sll   zero, zero, 0
+// 0x01021234: 0x1021234: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6010,7 +6010,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_increase_horizon_102122c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_increase_horizon_102123c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -6045,67 +6045,67 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102122c:
-// 0x0102122c: 0x102122c: lui   v0, 0x30000
+L_102123c:
+// 0x0102123c: 0x102123c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01021230: 0x1021230: lw    v1, 28256(v0)
+// 0x01021240: 0x1021240: lw    v1, 28720(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021234: 0x1021234: addiu sp, sp, -24
+// 0x01021244: 0x1021244: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021238: 0x1021238: addiu v0, zero, 1
+// 0x01021248: 0x1021248: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0102123c: 0x102123c: bne   v1, v0, 0x1021270 sw    ra, 20(sp)
+// 0x0102124c: 0x102124c: bne   v1, v0, 0x1021280 sw    ra, 20(sp)
 	ldloc 5
 	ldloc 6
-	bne.un L_1021270
+	bne.un L_1021280
 // --- basic block ---
-// 0x01021244: 0x1021244: lui   v0, 0x30000
+// 0x01021254: 0x1021254: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01021248: 0x1021248: lw    v1, 28448(v0)
+// 0x01021258: 0x1021258: lw    v1, 28912(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102124c: 0x102124c: sll   zero, zero, 0
-// 0x01021250: 0x1021250: slti  a0, v1, -100
+// 0x0102125c: 0x102125c: sll   zero, zero, 0
+// 0x01021260: 0x1021260: slti  a0, v1, -100
 	ldloc 5
 	ldc.i4.s -100
 	clt
 	stloc.1
-// 0x01021254: 0x1021254: beq   a0, zero, 0x1021270 addiu v1, v1, 100
+// 0x01021264: 0x1021264: beq   a0, zero, 0x1021280 addiu v1, v1, 100
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 100
 	add
 	stloc 5
-	brfalse L_1021270
+	brfalse L_1021280
 // --- basic block ---
-// 0x0102125c: 0x102125c: addu  a0, v1, zero
+// 0x0102126c: 0x102126c: addu  a0, v1, zero
 	ldloc 5
 	stloc.1
-// 0x01021260: 0x1021260: jal   0x1008724 sw    v1, 28448(v0)
+// 0x01021270: 0x1021270: jal   0x1008734 sw    v1, 28912(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldloc 5
 	stelem.i4
@@ -6114,26 +6114,26 @@ L_102122c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_horizon_1008724(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_horizon_1008734(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01021268: 0x1021268: jal   0x101fc54 sll   zero, zero, 0
+// 0x01021278: 0x1021278: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1021270:
-// 0x01021270: 0x1021270: lw    ra, 20(sp)
-// 0x01021274: 0x1021274: sll   zero, zero, 0
-// 0x01021278: 0x1021278: jr    ra addiu sp, sp, 24
+L_1021280:
+// 0x01021280: 0x1021280: lw    ra, 20(sp)
+// 0x01021284: 0x1021284: sll   zero, zero, 0
+// 0x01021288: 0x1021288: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6145,7 +6145,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_set_orientation_fixed_1021280(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_set_orientation_fixed_1021290(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6180,39 +6180,39 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021280: 0x1021280: addiu v1, zero, 1
+// 0x01021290: 0x1021290: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01021284: 0x1021284: lui   v0, 0x30000
+// 0x01021294: 0x1021294: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021288: 0x1021288: addiu sp, sp, -24
+// 0x01021298: 0x1021298: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102128c: 0x102128c: sw    v1, 28348(v0)
+// 0x0102129c: 0x102129c: sw    v1, 28812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldloc 7
 	stelem.i4
-// 0x01021290: 0x1021290: addu  a0, zero, zero
+// 0x010212a0: 0x10212a0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01021294: 0x1021294: lui   v0, 0x30000
+// 0x010212a4: 0x10212a4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021298: 0x1021298: sw    ra, 20(sp)
-// 0x0102129c: 0x102129c: jal   0x1007b74 sw    zero, 28456(v0)
+// 0x010212a8: 0x10212a8: sw    ra, 20(sp)
+// 0x010212ac: 0x10212ac: jal   0x1007b84 sw    zero, 28920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6221,14 +6221,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010212a4: 0x10212a4: lw    ra, 20(sp)
-// 0x010212a8: 0x10212a8: sll   zero, zero, 0
-// 0x010212ac: 0x10212ac: jr    ra addiu sp, sp, 24
+// 0x010212b4: 0x10212b4: lw    ra, 20(sp)
+// 0x010212b8: 0x10212b8: sll   zero, zero, 0
+// 0x010212bc: 0x10212bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6240,7 +6240,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_rotate_10212b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_rotate_10212c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6278,15 +6278,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010212b4: 0x10212b4: addiu sp, sp, -24
+// 0x010212c4: 0x10212c4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010212b8: 0x10212b8: lui   v0, 0x30000
+// 0x010212c8: 0x10212c8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010212bc: 0x10212bc: sw    s0, 16(sp)
+// 0x010212cc: 0x10212cc: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6295,115 +6295,115 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010212c0: 0x10212c0: lw    s0, 28456(v0)
+// 0x010212d0: 0x10212d0: lw    s0, 28920(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldelem.i4
 	stloc 5
-// 0x010212c4: 0x10212c4: sw    ra, 20(sp)
-// 0x010212c8: 0x10212c8: addu  s0, a0, s0
+// 0x010212d4: 0x10212d4: sw    ra, 20(sp)
+// 0x010212d8: 0x10212d8: addu  s0, a0, s0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-L_10212cc:
-// 0x010212cc: 0x10212cc: slti  v0, s0, 360
+L_10212dc:
+// 0x010212dc: 0x10212dc: slti  v0, s0, 360
 	ldloc 5
 	ldc.i4 360
 	clt
 	stloc 6
-// 0x010212d0: 0x10212d0: beq   v0, zero, 0x10212cc addiu s0, s0, -360
+// 0x010212e0: 0x10212e0: beq   v0, zero, 0x10212dc addiu s0, s0, -360
 	ldloc 6
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-	brfalse L_10212cc
+	brfalse L_10212dc
 // --- basic block ---
-// 0x010212d8: 0x10212d8: addiu s0, s0, 360
+// 0x010212e8: 0x10212e8: addiu s0, s0, 360
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-L_10212dc:
-// 0x010212dc: 0x10212dc: bltz  s0, 0x10212dc addiu s0, s0, 360
+L_10212ec:
+// 0x010212ec: 0x10212ec: bltz  s0, 0x10212ec addiu s0, s0, 360
 	ldloc 5
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
 	ldc.i4.s 0
-	blt L_10212dc
+	blt L_10212ec
 // --- basic block ---
-// 0x010212e4: 0x10212e4: addiu s0, s0, -360
+// 0x010212f4: 0x10212f4: addiu s0, s0, -360
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-// 0x010212e8: 0x10212e8: lui   v0, 0x30000
+// 0x010212f8: 0x10212f8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010212ec: 0x10212ec: lw    v0, 28348(v0)
+// 0x010212fc: 0x10212fc: lw    v0, 28812(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldelem.i4
 	stloc 6
-// 0x010212f0: 0x10212f0: sll   zero, zero, 0
-// 0x010212f4: 0x10212f4: bne   v0, zero, 0x1021308 addu  a0, s0, zero
+// 0x01021300: 0x1021300: sll   zero, zero, 0
+// 0x01021304: 0x1021304: bne   v0, zero, 0x1021318 addu  a0, s0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
-	brtrue L_1021308
+	brtrue L_1021318
 // --- basic block ---
-// 0x010212fc: 0x10212fc: jal   0x1007a4c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_get_orientation_1007a4c()
+// 0x0102130c: 0x102130c: jal   0x1007a5c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_get_orientation_1007a5c()
 	stloc 6
 // --- basic block ---
-// 0x01021304: 0x1021304: addu  a0, v0, s0
+// 0x01021314: 0x1021314: addu  a0, v0, s0
 	ldloc 6
 	ldloc 5
 	add
 	stloc.1
-L_1021308:
-// 0x01021308: 0x1021308: jal   0x1007b74 sll   zero, zero, 0
+L_1021318:
+// 0x01021318: 0x1021318: jal   0x1007b84 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01021310: 0x1021310: beq   v0, zero, 0x1021330 lui   a0, 0x30000
+// 0x01021320: 0x1021320: beq   v0, zero, 0x1021340 lui   a0, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc.1
-	brfalse L_1021330
+	brfalse L_1021340
 // --- basic block ---
-// 0x01021318: 0x1021318: lui   v0, 0x30000
+// 0x01021328: 0x1021328: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x0102131c: 0x102131c: addiu a0, a0, 28440
+// 0x0102132c: 0x102132c: addiu a0, a0, 28904
 	ldloc.1
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.1
-// 0x01021320: 0x1021320: jal   0x1020c40 sw    s0, 28456(v0)
+// 0x01021330: 0x1021330: jal   0x1020c50 sw    s0, 28920(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldloc 5
 	stelem.i4
@@ -6412,25 +6412,25 @@ L_1021308:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01021328: 0x1021328: jal   0x101fc54 sll   zero, zero, 0
+// 0x01021338: 0x1021338: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1021330:
-// 0x01021330: 0x1021330: lw    ra, 20(sp)
-// 0x01021334: 0x1021334: lw    s0, 16(sp)
+L_1021340:
+// 0x01021340: 0x1021340: lw    ra, 20(sp)
+// 0x01021344: 0x1021344: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6439,7 +6439,7 @@ L_1021330:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021338: 0x1021338: jr    ra addiu sp, sp, 24
+// 0x01021348: 0x1021348: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6451,7 +6451,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_add_focus_on_me_softkey_1021340(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_add_focus_on_me_softkey_1021350(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s1,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -6492,12 +6492,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021340: 0x1021340: addiu sp, sp, -32
+// 0x01021350: 0x1021350: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01021344: 0x1021344: sw    s1, 24(sp)
+// 0x01021354: 0x1021354: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6506,7 +6506,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01021348: 0x1021348: sw    s0, 20(sp)
+// 0x01021358: 0x1021358: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6515,26 +6515,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102134c: 0x102134c: lui   s1, 0x30000
+// 0x0102135c: 0x102135c: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021350: 0x1021350: lui   s0, 0x10000
+// 0x01021360: 0x1021360: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01021354: 0x1021354: addiu a0, s1, 28356
+// 0x01021364: 0x1021364: addiu a0, s1, 28820
 	ldloc 5
-	ldc.i4 28356
+	ldc.i4 28820
 	add
 	stloc.1
-// 0x01021358: 0x1021358: addiu a1, s0, -29376
+// 0x01021368: 0x1021368: addiu a1, s0, -29376
 	ldloc 8
 	ldc.i4 -29376
 	add
 	stloc.2
-// 0x0102135c: 0x102135c: sw    ra, 28(sp)
-// 0x01021360: 0x1021360: jal   0x1001b68 addiu s1, s1, 28356
+// 0x0102136c: 0x102136c: sw    ra, 28(sp)
+// 0x01021370: 0x1021370: jal   0x1001b68 addiu s1, s1, 28820
 	ldloc 5
-	ldc.i4 28356
+	ldc.i4 28820
 	add
 	stloc 5
 	ldloc.1
@@ -6544,23 +6544,23 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01021368: 0x1021368: lui   v0, 0x1020000
+// 0x01021378: 0x1021378: lui   v0, 0x1020000
 	ldc.i4 16908288
 	stloc 7
-// 0x0102136c: 0x102136c: addiu a0, s0, -29376
+// 0x0102137c: 0x102137c: addiu a0, s0, -29376
 	ldloc 8
 	ldc.i4 -29376
 	add
 	stloc.1
-// 0x01021370: 0x1021370: addu  a1, s1, zero
+// 0x01021380: 0x1021380: addu  a1, s1, zero
 	ldloc 5
 	stloc.2
-// 0x01021374: 0x1021374: addiu v0, v0, 6192
+// 0x01021384: 0x1021384: addiu v0, v0, 6208
 	ldloc 7
-	ldc.i4 6192
+	ldc.i4 6208
 	add
 	stloc 7
-// 0x01021378: 0x1021378: jal   0x103ff3c sw    v0, 52(s1)
+// 0x01021388: 0x1021388: jal   0x103ff4c sw    v0, 52(s1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6574,13 +6574,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01021380: 0x1021380: lw    ra, 28(sp)
-// 0x01021384: 0x1021384: lw    s1, 24(sp)
+// 0x01021390: 0x1021390: lw    ra, 28(sp)
+// 0x01021394: 0x1021394: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6589,7 +6589,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021388: 0x1021388: lw    s0, 20(sp)
+// 0x01021398: 0x1021398: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6598,7 +6598,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102138c: 0x102138c: jr    ra addiu sp, sp, 32
+// 0x0102139c: 0x102139c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6610,7 +6610,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -6651,12 +6651,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021394: 0x1021394: addiu sp, sp, -32
+// 0x010213a4: 0x10213a4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01021398: 0x1021398: sw    s0, 20(sp)
+// 0x010213a8: 0x10213a8: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6665,16 +6665,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102139c: 0x102139c: lui   s0, 0x10000
+// 0x010213ac: 0x10213ac: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010213a0: 0x10213a0: addiu a0, s0, -29680
+// 0x010213b0: 0x10213b0: addiu a0, s0, -29680
 	ldloc 7
 	ldc.i4 -29680
 	add
 	stloc.1
-// 0x010213a4: 0x10213a4: sw    ra, 28(sp)
-// 0x010213a8: 0x10213a8: jal   0x101f1cc sw    s1, 24(sp)
+// 0x010213b4: 0x10213b4: sw    ra, 28(sp)
+// 0x010213b8: 0x10213b8: jal   0x101f1dc sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6688,12 +6688,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_copy_focus_101f1cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_copy_focus_101f1dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010213b0: 0x10213b0: jal   0x101ece8 addiu a0, s0, -29680
+// 0x010213c0: 0x10213c0: jal   0x101ecf8 addiu a0, s0, -29680
 	ldloc 7
 	ldc.i4 -29680
 	add
@@ -6703,59 +6703,59 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010213b8: 0x10213b8: jal   0x101dd30 lui   s0, 0x10000
+// 0x010213c8: 0x10213c8: jal   0x101dd40 lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
 	ldloc.1
-	call int32 Cibyl21::roadmap_trip_is_focus_changed_101dd30(int32)
+	call int32 Cibyl21::roadmap_trip_is_focus_changed_101dd40(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010213c0: 0x10213c0: lui   v0, 0x30000
+// 0x010213d0: 0x10213d0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010213c4: 0x10213c4: sw    zero, 28468(v0)
+// 0x010213d4: 0x10213d4: sw    zero, 28932(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7117
+	ldc.i4 7233
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010213c8: 0x10213c8: lui   v0, 0x30000
+// 0x010213d8: 0x10213d8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010213cc: 0x10213cc: lui   s1, 0x30000
+// 0x010213dc: 0x10213dc: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x010213d0: 0x10213d0: addu  a0, zero, zero
+// 0x010213e0: 0x10213e0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010213d4: 0x10213d4: sw    zero, 28472(v0)
+// 0x010213e4: 0x10213e4: sw    zero, 28936(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010213d8: 0x10213d8: lui   v0, 0x30000
+// 0x010213e8: 0x10213e8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010213dc: 0x10213dc: jal   0x1020f7c sw    zero, 28456(v0)
+// 0x010213ec: 0x10213ec: jal   0x1020f8c sw    zero, 28920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6764,17 +6764,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010213e4: 0x10213e4: addiu a0, s1, 28356
+// 0x010213f4: 0x10213f4: addiu a0, s1, 28820
 	ldloc 8
-	ldc.i4 28356
+	ldc.i4 28820
 	add
 	stloc.1
-// 0x010213e8: 0x10213e8: jal   0x1001b68 addiu a1, s0, -29376
+// 0x010213f8: 0x10213f8: jal   0x1001b68 addiu a1, s0, -29376
 	ldloc 7
 	ldc.i4 -29376
 	add
@@ -6786,28 +6786,28 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010213f0: 0x10213f0: addiu s1, s1, 28356
+// 0x01021400: 0x1021400: addiu s1, s1, 28820
 	ldloc 8
-	ldc.i4 28356
+	ldc.i4 28820
 	add
 	stloc 8
-// 0x010213f4: 0x10213f4: lui   v0, 0x1020000
+// 0x01021404: 0x1021404: lui   v0, 0x1020000
 	ldc.i4 16908288
 	stloc 5
-// 0x010213f8: 0x10213f8: addiu a0, s0, -29376
+// 0x01021408: 0x1021408: addiu a0, s0, -29376
 	ldloc 7
 	ldc.i4 -29376
 	add
 	stloc.1
-// 0x010213fc: 0x10213fc: addu  a1, s1, zero
+// 0x0102140c: 0x102140c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01021400: 0x1021400: addiu v0, v0, 6192
+// 0x01021410: 0x1021410: addiu v0, v0, 6208
 	ldloc 5
-	ldc.i4 6192
+	ldc.i4 6208
 	add
 	stloc 5
-// 0x01021404: 0x1021404: jal   0x103ff3c sw    v0, 52(s1)
+// 0x01021414: 0x1021414: jal   0x103ff4c sw    v0, 52(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6821,13 +6821,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0102140c: 0x102140c: lw    ra, 28(sp)
-// 0x01021410: 0x1021410: lw    s1, 24(sp)
+// 0x0102141c: 0x102141c: lw    ra, 28(sp)
+// 0x01021420: 0x1021420: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6836,7 +6836,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021414: 0x1021414: lw    s0, 20(sp)
+// 0x01021424: 0x1021424: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6845,7 +6845,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01021418: 0x1021418: jr    ra addiu sp, sp, 32
+// 0x01021428: 0x1021428: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6857,7 +6857,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_double_click_1021420(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_double_click_1021430(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -6895,13 +6895,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021420: 0x1021420: addiu sp, sp, -40
+// 0x01021430: 0x1021430: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01021424: 0x1021424: sw    ra, 36(sp)
-// 0x01021428: 0x1021428: sw    s0, 32(sp)
+// 0x01021434: 0x1021434: sw    ra, 36(sp)
+// 0x01021438: 0x1021438: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6910,7 +6910,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102142c: 0x102142c: sw    a0, 24(sp)
+// 0x0102143c: 0x102143c: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6919,7 +6919,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01021430: 0x1021430: jal   0x1021394 addiu s0, sp, 16
+// 0x01021440: 0x1021440: jal   0x10213a4 addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6929,12 +6929,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01021438: 0x1021438: lw    a0, 24(sp)
+// 0x01021448: 0x1021448: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6943,10 +6943,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102143c: 0x102143c: addu  a1, s0, zero
+// 0x0102144c: 0x102144c: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01021440: 0x1021440: jal   0x1007a6c addu  a2, zero, zero
+// 0x01021450: 0x1021450: jal   0x1007a7c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6954,12 +6954,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01021448: 0x1021448: jal   0x1020c40 addu  a0, s0, zero
+// 0x01021458: 0x1021458: jal   0x1020c50 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6967,27 +6967,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01021450: 0x1021450: jal   0x1021110 sll   zero, zero, 0
+// 0x01021460: 0x1021460: jal   0x1021120 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_in_1021110(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_in_1021120(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01021458: 0x1021458: lw    ra, 36(sp)
-// 0x0102145c: 0x102145c: addiu v0, zero, 1
+// 0x01021468: 0x1021468: lw    ra, 36(sp)
+// 0x0102146c: 0x102146c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01021460: 0x1021460: lw    s0, 32(sp)
+// 0x01021470: 0x1021470: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6996,7 +6996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01021464: 0x1021464: jr    ra addiu sp, sp, 40
+// 0x01021474: 0x1021474: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -7008,7 +7008,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 lo,int32 ra)
@@ -7049,24 +7049,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102146c: 0x102146c: lui   v0, 0x30000
+// 0x0102147c: 0x102147c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021470: 0x1021470: lw    v0, 28252(v0)
+// 0x01021480: 0x1021480: lw    v0, 28716(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7063
+	ldc.i4 7179
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021474: 0x1021474: addiu sp, sp, -24
+// 0x01021484: 0x1021484: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021478: 0x1021478: sw    s0, 16(sp)
+// 0x01021488: 0x1021488: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7075,68 +7075,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102147c: 0x102147c: sw    ra, 20(sp)
-// 0x01021480: 0x1021480: bne   v0, zero, 0x10216b4 addu  s0, zero, zero
+// 0x0102148c: 0x102148c: sw    ra, 20(sp)
+// 0x01021490: 0x1021490: bne   v0, zero, 0x10216c4 addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_10216b4
+	brtrue L_10216c4
 // --- basic block ---
-// 0x01021488: 0x1021488: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x01021498: 0x1021498: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021490: 0x1021490: beq   v0, zero, 0x1021660 lui   a0, 0x0
+// 0x010214a0: 0x10214a0: beq   v0, zero, 0x1021670 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1021660
+	brfalse L_1021670
 // --- basic block ---
-// 0x01021498: 0x1021498: jal   0x101dd30 sll   zero, zero, 0
+// 0x010214a8: 0x10214a8: jal   0x101dd40 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl21::roadmap_trip_is_focus_changed_101dd30(int32)
+	call int32 Cibyl21::roadmap_trip_is_focus_changed_101dd40(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010214a0: 0x10214a0: beq   v0, zero, 0x10216c8 lui   v0, 0x30000
+// 0x010214b0: 0x10214b0: beq   v0, zero, 0x10216d8 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_10216c8
+	brfalse L_10216d8
 // --- basic block ---
-// 0x010214a8: 0x10214a8: sw    zero, 28468(v0)
+// 0x010214b8: 0x10214b8: sw    zero, 28932(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7117
+	ldc.i4 7233
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010214ac: 0x10214ac: lui   v0, 0x30000
+// 0x010214bc: 0x10214bc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010214b0: 0x10214b0: sw    zero, 28472(v0)
+// 0x010214c0: 0x10214c0: sw    zero, 28936(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010214b4: 0x10214b4: lui   v0, 0x30000
+// 0x010214c4: 0x10214c4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010214b8: 0x10214b8: jal   0x1025ce8 sw    zero, 28456(v0)
+// 0x010214c8: 0x10214c8: jal   0x1025cf8 sw    zero, 28920(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -7145,43 +7145,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_refresh_1025ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_refresh_1025cf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010214c0: 0x10214c0: lui   v0, 0x30000
+// 0x010214d0: 0x10214d0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010214c4: 0x10214c4: lw    v1, 28348(v0)
+// 0x010214d4: 0x10214d4: lw    v1, 28812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldelem.i4
 	stloc 6
-// 0x010214c8: 0x10214c8: addiu v0, zero, 1
+// 0x010214d8: 0x10214d8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010214cc: 0x10214cc: beq   v1, v0, 0x10214e4 sll   zero, zero, 0
+// 0x010214dc: 0x10214dc: beq   v1, v0, 0x10214f4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_10214e4
+	beq  L_10214f4
 // --- basic block ---
-// 0x010214d4: 0x10214d4: jal   0x1025c30 sll   zero, zero, 0
+// 0x010214e4: 0x10214e4: jal   0x1025c40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_get_orientation_1025c30(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_get_orientation_1025c40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010214dc: 0x10214dc: jal   0x1007b74 addu  a0, v0, zero
+// 0x010214ec: 0x10214ec: jal   0x1007b84 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7189,84 +7189,84 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10214e4:
-// 0x010214e4: 0x10214e4: jal   0x1025b20 sll   zero, zero, 0
+L_10214f4:
+// 0x010214f4: 0x10214f4: jal   0x1025b30 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_get_scale_1025b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_get_scale_1025b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010214ec: 0x10214ec: lui   v1, 0x30000
+// 0x010214fc: 0x10214fc: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010214f0: 0x10214f0: lw    a1, 28476(v1)
+// 0x01021500: 0x1021500: lw    a1, 28940(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc.2
-// 0x010214f4: 0x10214f4: lui   v1, 0x30000
+// 0x01021504: 0x1021504: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010214f8: 0x10214f8: lw    v1, 28464(v1)
+// 0x01021508: 0x1021508: lw    v1, 28928(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 6
-// 0x010214fc: 0x10214fc: lui   a0, 0x30000
+// 0x0102150c: 0x102150c: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01021500: 0x1021500: lw    a0, 28256(a0)
+// 0x01021510: 0x1021510: lw    a0, 28720(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021504: 0x1021504: addu  a1, a1, v1
+// 0x01021514: 0x1021514: addu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc.2
-// 0x01021508: 0x1021508: addiu v1, zero, 1
+// 0x01021518: 0x1021518: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0102150c: 0x102150c: bne   a0, v1, 0x102151c addiu v1, zero, 3
+// 0x0102151c: 0x102151c: bne   a0, v1, 0x102152c addiu v1, zero, 3
 	ldloc.1
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	bne.un L_102151c
+	bne.un L_102152c
 // --- basic block ---
-// 0x01021514: 0x1021514: mult  a1, v1
+// 0x01021524: 0x1021524: mult  a1, v1
 	ldloc.2
 	ldloc 6
 	mul
 	stloc 9
-// 0x01021518: 0x1021518: mflo  lo
+// 0x01021528: 0x1021528: mflo  lo
 	ldloc 9
 	stloc.2
-L_102151c:
-// 0x0102151c: 0x102151c: jal   0x1009b10 addu  a0, v0, zero
+L_102152c:
+// 0x0102152c: 0x102152c: jal   0x1009b20 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7274,44 +7274,44 @@ L_102151c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_set_scale_1009b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_set_scale_1009b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021524: 0x1021524: beq   v0, zero, 0x1021534 sll   zero, zero, 0
+// 0x01021534: 0x1021534: beq   v0, zero, 0x1021544 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1021534
+	brfalse L_1021544
 // --- basic block ---
-// 0x0102152c: 0x102152c: jal   0x1010a4c sll   zero, zero, 0
+// 0x0102153c: 0x102153c: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1021534:
-// 0x01021534: 0x1021534: jal   0x1025980 sll   zero, zero, 0
-	call int32 Cibyl28::roadmap_view_hold_1025980()
+L_1021544:
+// 0x01021544: 0x1021544: jal   0x1025990 sll   zero, zero, 0
+	call int32 Cibyl28::roadmap_view_hold_1025990()
 	stloc 5
 // --- basic block ---
-// 0x0102153c: 0x102153c: bne   v0, zero, 0x1021658 sll   zero, zero, 0
+// 0x0102154c: 0x102154c: bne   v0, zero, 0x1021668 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1021658
+	brtrue L_1021668
 // --- basic block ---
-// 0x01021544: 0x1021544: jal   0x101de30 addiu s0, zero, 1
+// 0x01021554: 0x1021554: jal   0x101de40 addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-	call int32 Cibyl22::roadmap_trip_get_focus_position_101de30()
+	call int32 Cibyl22::roadmap_trip_get_focus_position_101de40()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102154c: 0x102154c: jal   0x1020c40 addu  a0, v0, zero
+// 0x0102155c: 0x102155c: jal   0x1020c50 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7319,43 +7319,43 @@ L_1021534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021554: 0x1021554: j	 0x1021660 lui   a0, 0x0
+// 0x01021564: 0x1021564: j	 0x1021670 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_1021660
+	br L_1021670
 // --- basic block ---
-L_102155c:
-// 0x0102155c: 0x102155c: lw    v0, 28352(v0)
+L_102156c:
+// 0x0102156c: 0x102156c: lw    v0, 28816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7088
+	ldc.i4 7204
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021560: 0x1021560: sll   zero, zero, 0
-// 0x01021564: 0x1021564: beq   v0, zero, 0x102165c addu  s0, zero, zero
+// 0x01021570: 0x1021570: sll   zero, zero, 0
+// 0x01021574: 0x1021574: beq   v0, zero, 0x102166c addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_102165c
+	brfalse L_102166c
 // --- basic block ---
-// 0x0102156c: 0x102156c: lui   v0, 0x30000
+// 0x0102157c: 0x102157c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_1021570:
-// 0x01021570: 0x1021570: jal   0x1025ce8 sw    zero, 28352(v0)
+L_1021580:
+// 0x01021580: 0x1021580: jal   0x1025cf8 sw    zero, 28816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7088
+	ldc.i4 7204
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -7364,55 +7364,55 @@ L_1021570:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_refresh_1025ce8(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_refresh_1025cf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021578: 0x1021578: lui   v0, 0x30000
+// 0x01021588: 0x1021588: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102157c: 0x102157c: lw    v1, 28348(v0)
+// 0x0102158c: 0x102158c: lw    v1, 28812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021580: 0x1021580: addiu v0, zero, 1
+// 0x01021590: 0x1021590: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01021584: 0x1021584: beq   v1, v0, 0x10215a4 sll   zero, zero, 0
+// 0x01021594: 0x1021594: beq   v1, v0, 0x10215b4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_10215a4
+	beq  L_10215b4
 // --- basic block ---
-// 0x0102158c: 0x102158c: jal   0x1025c30 sll   zero, zero, 0
+// 0x0102159c: 0x102159c: jal   0x1025c40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_get_orientation_1025c30(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_get_orientation_1025c40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021594: 0x1021594: lui   v1, 0x30000
+// 0x010215a4: 0x10215a4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01021598: 0x1021598: lw    a0, 28456(v1)
+// 0x010215a8: 0x10215a8: lw    a0, 28920(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102159c: 0x102159c: jal   0x1007b74 addu  a0, v0, a0
+// 0x010215ac: 0x10215ac: jal   0x1007b84 addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
@@ -7422,84 +7422,84 @@ L_1021570:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10215a4:
-// 0x010215a4: 0x10215a4: jal   0x1025b20 sll   zero, zero, 0
+L_10215b4:
+// 0x010215b4: 0x10215b4: jal   0x1025b30 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_get_scale_1025b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_get_scale_1025b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010215ac: 0x10215ac: lui   v1, 0x30000
+// 0x010215bc: 0x10215bc: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010215b0: 0x10215b0: lw    a1, 28476(v1)
+// 0x010215c0: 0x10215c0: lw    a1, 28940(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7119
+	ldc.i4 7235
 	add
 	ldelem.i4
 	stloc.2
-// 0x010215b4: 0x10215b4: lui   v1, 0x30000
+// 0x010215c4: 0x10215c4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010215b8: 0x10215b8: lw    v1, 28464(v1)
+// 0x010215c8: 0x10215c8: lw    v1, 28928(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc 6
-// 0x010215bc: 0x10215bc: lui   a0, 0x30000
+// 0x010215cc: 0x10215cc: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x010215c0: 0x10215c0: lw    a0, 28256(a0)
+// 0x010215d0: 0x10215d0: lw    a0, 28720(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.1
-// 0x010215c4: 0x10215c4: addu  a1, a1, v1
+// 0x010215d4: 0x10215d4: addu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc.2
-// 0x010215c8: 0x10215c8: addiu v1, zero, 1
+// 0x010215d8: 0x10215d8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010215cc: 0x10215cc: bne   a0, v1, 0x10215dc addiu v1, zero, 3
+// 0x010215dc: 0x10215dc: bne   a0, v1, 0x10215ec addiu v1, zero, 3
 	ldloc.1
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	bne.un L_10215dc
+	bne.un L_10215ec
 // --- basic block ---
-// 0x010215d4: 0x10215d4: mult  a1, v1
+// 0x010215e4: 0x10215e4: mult  a1, v1
 	ldloc.2
 	ldloc 6
 	mul
 	stloc 9
-// 0x010215d8: 0x10215d8: mflo  lo
+// 0x010215e8: 0x10215e8: mflo  lo
 	ldloc 9
 	stloc.2
-L_10215dc:
-// 0x010215dc: 0x10215dc: jal   0x1009b10 addu  a0, v0, zero
+L_10215ec:
+// 0x010215ec: 0x10215ec: jal   0x1009b20 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7507,44 +7507,44 @@ L_10215dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_set_scale_1009b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_set_scale_1009b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010215e4: 0x10215e4: beq   v0, zero, 0x10215f4 sll   zero, zero, 0
+// 0x010215f4: 0x10215f4: beq   v0, zero, 0x1021604 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10215f4
+	brfalse L_1021604
 // --- basic block ---
-// 0x010215ec: 0x10215ec: jal   0x1010a4c sll   zero, zero, 0
+// 0x010215fc: 0x10215fc: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10215f4:
-// 0x010215f4: 0x10215f4: jal   0x1025980 sll   zero, zero, 0
-	call int32 Cibyl28::roadmap_view_hold_1025980()
+L_1021604:
+// 0x01021604: 0x1021604: jal   0x1025990 sll   zero, zero, 0
+	call int32 Cibyl28::roadmap_view_hold_1025990()
 	stloc 5
 // --- basic block ---
-// 0x010215fc: 0x10215fc: bne   v0, zero, 0x1021618 lui   v0, 0x30000
+// 0x0102160c: 0x102160c: bne   v0, zero, 0x1021628 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1021618
+	brtrue L_1021628
 // --- basic block ---
-// 0x01021604: 0x1021604: jal   0x101de30 sll   zero, zero, 0
-	call int32 Cibyl22::roadmap_trip_get_focus_position_101de30()
+// 0x01021614: 0x1021614: jal   0x101de40 sll   zero, zero, 0
+	call int32 Cibyl22::roadmap_trip_get_focus_position_101de40()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102160c: 0x102160c: jal   0x1020c40 addu  a0, v0, zero
+// 0x0102161c: 0x102161c: jal   0x1020c50 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7552,76 +7552,76 @@ L_10215f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021614: 0x1021614: lui   v0, 0x30000
+// 0x01021624: 0x1021624: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_1021618:
-// 0x01021618: 0x1021618: lw    a0, 28468(v0)
+L_1021628:
+// 0x01021628: 0x1021628: lw    a0, 28932(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7117
+	ldc.i4 7233
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102161c: 0x102161c: sll   zero, zero, 0
-// 0x01021620: 0x1021620: bne   a0, zero, 0x1021638 lui   v0, 0x30000
+// 0x0102162c: 0x102162c: sll   zero, zero, 0
+// 0x01021630: 0x1021630: bne   a0, zero, 0x1021648 lui   v0, 0x30000
 	ldloc.1
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1021638
+	brtrue L_1021648
 // --- basic block ---
-// 0x01021628: 0x1021628: lw    v0, 28472(v0)
+// 0x01021638: 0x1021638: lw    v0, 28936(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102162c: 0x102162c: sll   zero, zero, 0
-// 0x01021630: 0x1021630: beq   v0, zero, 0x1021658 sll   zero, zero, 0
+// 0x0102163c: 0x102163c: sll   zero, zero, 0
+// 0x01021640: 0x1021640: beq   v0, zero, 0x1021668 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1021658
+	brfalse L_1021668
 // --- basic block ---
-L_1021638:
-// 0x01021638: 0x1021638: lui   v0, 0x30000
+L_1021648:
+// 0x01021648: 0x1021648: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102163c: 0x102163c: lw    a1, 28472(v0)
+// 0x0102164c: 0x102164c: lw    a1, 28936(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldelem.i4
 	stloc.2
-// 0x01021640: 0x1021640: sw    zero, 28472(v0)
+// 0x01021650: 0x1021650: sw    zero, 28936(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7118
+	ldc.i4 7234
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01021644: 0x1021644: lui   v0, 0x30000
+// 0x01021654: 0x1021654: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021648: 0x1021648: jal   0x1020888 sw    zero, 28468(v0)
+// 0x01021658: 0x1021658: jal   0x1020898 sw    zero, 28932(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7117
+	ldc.i4 7233
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -7630,34 +7630,34 @@ L_1021638:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_record_move_1020888(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_record_move_1020898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021650: 0x1021650: j	 0x102165c addiu s0, zero, 1
+// 0x01021660: 0x1021660: j	 0x102166c addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-	br L_102165c
+	br L_102166c
 // --- basic block ---
-L_1021658:
-// 0x01021658: 0x1021658: addiu s0, zero, 1
+L_1021668:
+// 0x01021668: 0x1021668: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_102165c:
-// 0x0102165c: 0x102165c: lui   a0, 0x0
+L_102166c:
+// 0x0102166c: 0x102166c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1021660:
-// 0x01021660: 0x1021660: lui   a1, 0x10000
+L_1021670:
+// 0x01021670: 0x1021670: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01021664: 0x1021664: addiu a0, a0, 6124
+// 0x01021674: 0x1021674: addiu a0, a0, 6124
 	ldloc.1
 	ldc.i4 6124
 	add
 	stloc.1
-// 0x01021668: 0x1021668: jal   0x100e7f4 addiu a1, a1, -29488
+// 0x01021678: 0x1021678: jal   0x100e804 addiu a1, a1, -29488
 	ldloc.2
 	ldc.i4 -29488
 	add
@@ -7667,64 +7667,64 @@ L_1021660:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021670: 0x1021670: beq   v0, zero, 0x102167c lui   v0, 0x30000
+// 0x01021680: 0x1021680: beq   v0, zero, 0x102168c lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_102167c
+	brfalse L_102168c
 // --- basic block ---
-// 0x01021678: 0x1021678: addiu s0, zero, 1
+// 0x01021688: 0x1021688: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_102167c:
-// 0x0102167c: 0x102167c: lw    v1, 28516(v0)
+L_102168c:
+// 0x0102168c: 0x102168c: lw    v1, 28980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7129
+	ldc.i4 7245
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021680: 0x1021680: sll   zero, zero, 0
-// 0x01021684: 0x1021684: beq   v1, zero, 0x1021694 sll   zero, zero, 0
+// 0x01021690: 0x1021690: sll   zero, zero, 0
+// 0x01021694: 0x1021694: beq   v1, zero, 0x10216a4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1021694
+	brfalse L_10216a4
 // --- basic block ---
-// 0x0102168c: 0x102168c: sw    zero, 28516(v0)
+// 0x0102169c: 0x102169c: sw    zero, 28980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7129
+	ldc.i4 7245
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01021690: 0x1021690: addiu s0, zero, 1
+// 0x010216a0: 0x10216a0: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_1021694:
-// 0x01021694: 0x1021694: jal   0x101dd78 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_is_refresh_needed_101dd78()
+L_10216a4:
+// 0x010216a4: 0x10216a4: jal   0x101dd88 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_is_refresh_needed_101dd88()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102169c: 0x102169c: bne   v0, zero, 0x10216ac sll   zero, zero, 0
+// 0x010216ac: 0x10216ac: bne   v0, zero, 0x10216bc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10216ac
+	brtrue L_10216bc
 // --- basic block ---
-// 0x010216a4: 0x10216a4: beq   s0, zero, 0x10216b4 sll   zero, zero, 0
+// 0x010216b4: 0x10216b4: beq   s0, zero, 0x10216c4 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10216b4
+	brfalse L_10216c4
 // --- basic block ---
-L_10216ac:
-// 0x010216ac: 0x10216ac: jal   0x101fc54 addiu s0, zero, 1
+L_10216bc:
+// 0x010216bc: 0x10216bc: jal   0x101fc64 addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
 	ldloc.0
@@ -7732,17 +7732,17 @@ L_10216ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10216b4:
-// 0x010216b4: 0x10216b4: lw    ra, 20(sp)
-// 0x010216b8: 0x10216b8: addu  v0, s0, zero
+L_10216c4:
+// 0x010216c4: 0x10216c4: lw    ra, 20(sp)
+// 0x010216c8: 0x10216c8: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010216bc: 0x10216bc: lw    s0, 16(sp)
+// 0x010216cc: 0x10216cc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7751,29 +7751,29 @@ L_10216b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010216c0: 0x10216c0: jr    ra addiu sp, sp, 24
+// 0x010216d0: 0x10216d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10216c8:
-// 0x010216c8: 0x10216c8: jal   0x101dd54 sll   zero, zero, 0
+L_10216d8:
+// 0x010216d8: 0x10216d8: jal   0x101dd64 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl21::roadmap_trip_is_focus_moved_101dd54(int32)
+	call int32 Cibyl21::roadmap_trip_is_focus_moved_101dd64(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010216d0: 0x10216d0: beq   v0, zero, 0x102155c lui   v0, 0x30000
+// 0x010216e0: 0x10216e0: beq   v0, zero, 0x102156c lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_102155c
+	brfalse L_102156c
 // --- basic block ---
-// 0x010216d8: 0x10216d8: j	 0x1021570 sll   zero, zero, 0
-	br L_1021570
+// 0x010216e8: 0x10216e8: j	 0x1021580 sll   zero, zero, 0
+	br L_1021580
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl25.j b/converted/Cibyl25.j
index 7a370d1..2429fb8 100644
--- a/converted/Cibyl25.j
+++ b/converted/Cibyl25.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl25::.ctor
 
-.method public static int32 roadmap_screen_drag_start_10216e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_drag_start_10216f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -76,38 +76,38 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010216e0: 0x10216e0: lw    a1, 0(a0)
+// 0x010216f0: 0x10216f0: lw    a1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010216e4: 0x10216e4: lui   v0, 0x30000
+// 0x010216f4: 0x10216f4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x010216e8: 0x10216e8: lui   v1, 0x30000
+// 0x010216f8: 0x10216f8: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010216ec: 0x10216ec: sw    a1, 28432(v1)
+// 0x010216fc: 0x10216fc: sw    a1, 28896(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7108
+	ldc.i4 7224
 	add
 	ldloc.2
 	stelem.i4
-// 0x010216f0: 0x10216f0: lw    a1, 28228(v0)
+// 0x01021700: 0x1021700: lw    a1, 28692(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc.2
-// 0x010216f4: 0x10216f4: lw    a0, 4(a0)
+// 0x01021704: 0x1021704: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -116,32 +116,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010216f8: 0x10216f8: addiu sp, sp, -24
+// 0x01021708: 0x1021708: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010216fc: 0x10216fc: ori   a1, a1, 1
+// 0x0102170c: 0x102170c: ori   a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	or
 	stloc.2
-// 0x01021700: 0x1021700: addiu v1, v1, 28432
+// 0x01021710: 0x1021710: addiu v1, v1, 28896
 	ldloc 6
-	ldc.i4 28432
+	ldc.i4 28896
 	add
 	stloc 6
-// 0x01021704: 0x1021704: sw    ra, 20(sp)
-// 0x01021708: 0x1021708: sw    a1, 28228(v0)
+// 0x01021714: 0x1021714: sw    ra, 20(sp)
+// 0x01021718: 0x1021718: sw    a1, 28692(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102170c: 0x102170c: jal   0x1021394 sw    a0, 4(v1)
+// 0x0102171c: 0x102171c: jal   0x10213a4 sw    a0, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -155,27 +155,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01021714: 0x1021714: jal   0x102146c sll   zero, zero, 0
+// 0x01021724: 0x1021724: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102171c: 0x102171c: lw    ra, 20(sp)
-// 0x01021720: 0x1021720: addiu v0, zero, 1
+// 0x0102172c: 0x102172c: lw    ra, 20(sp)
+// 0x01021730: 0x1021730: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01021724: 0x1021724: jr    ra addiu sp, sp, 24
+// 0x01021734: 0x1021734: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -187,7 +187,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_screen_toggle_orientation_mode_102172c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_toggle_orientation_mode_102173c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -222,62 +222,62 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102172c:
-// 0x0102172c: 0x102172c: lui   v0, 0x30000
+L_102173c:
+// 0x0102173c: 0x102173c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021730: 0x1021730: lw    v1, 28348(v0)
+// 0x01021740: 0x1021740: lw    v1, 28812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021734: 0x1021734: addiu sp, sp, -24
+// 0x01021744: 0x1021744: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021738: 0x1021738: bne   v1, zero, 0x102174c sw    ra, 20(sp)
+// 0x01021748: 0x1021748: bne   v1, zero, 0x102175c sw    ra, 20(sp)
 	ldloc 6
-	brtrue L_102174c
+	brtrue L_102175c
 // --- basic block ---
-// 0x01021740: 0x1021740: addiu v1, zero, 1
+// 0x01021750: 0x1021750: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01021744: 0x1021744: j	 0x1021750 sw    v1, 28348(v0)
+// 0x01021754: 0x1021754: j	 0x1021760 sw    v1, 28812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldloc 6
 	stelem.i4
-	br L_1021750
+	br L_1021760
 // --- basic block ---
-L_102174c:
-// 0x0102174c: 0x102174c: sw    zero, 28348(v0)
+L_102175c:
+// 0x0102175c: 0x102175c: sw    zero, 28812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1021750:
-// 0x01021750: 0x1021750: lui   v0, 0x30000
+L_1021760:
+// 0x01021760: 0x1021760: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021754: 0x1021754: jal   0x100f35c sw    zero, 28456(v0)
+// 0x01021764: 0x1021764: jal   0x100f36c sw    zero, 28920(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7114
+	ldc.i4 7230
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -286,37 +286,37 @@ L_1021750:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_refresh_100f35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_refresh_100f36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102175c: 0x102175c: lui   v0, 0x30000
+// 0x0102176c: 0x102176c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021760: 0x1021760: lw    v1, 28516(v0)
+// 0x01021770: 0x1021770: lw    v1, 28980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7129
+	ldc.i4 7245
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021764: 0x1021764: addu  a0, zero, zero
+// 0x01021774: 0x1021774: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01021768: 0x1021768: addiu v1, v1, 1
+// 0x01021778: 0x1021778: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0102176c: 0x102176c: jal   0x1007b74 sw    v1, 28516(v0)
+// 0x0102177c: 0x102177c: jal   0x1007b84 sw    v1, 28980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7129
+	ldc.i4 7245
 	add
 	ldloc 6
 	stelem.i4
@@ -325,25 +325,25 @@ L_1021750:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021774: 0x1021774: jal   0x102146c sll   zero, zero, 0
+// 0x01021784: 0x1021784: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102177c: 0x102177c: lw    ra, 20(sp)
-// 0x01021780: 0x1021780: sll   zero, zero, 0
-// 0x01021784: 0x1021784: jr    ra addiu sp, sp, 24
+// 0x0102178c: 0x102178c: lw    ra, 20(sp)
+// 0x01021790: 0x1021790: sll   zero, zero, 0
+// 0x01021794: 0x1021794: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -355,7 +355,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 focus_on_me_102178c(int32,int32,int32,int32,int32)
+.method public static int32 focus_on_me_102179c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -390,40 +390,40 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102178c: 0x102178c: addiu sp, sp, -24
+// 0x0102179c: 0x102179c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021790: 0x1021790: sw    ra, 20(sp)
-// 0x01021794: 0x1021794: jal   0x1021394 sll   zero, zero, 0
+// 0x010217a0: 0x10217a0: sw    ra, 20(sp)
+// 0x010217a4: 0x10217a4: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102179c: 0x102179c: lui   a0, 0x10000
+// 0x010217ac: 0x10217ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010217a0: 0x10217a0: lui   v0, 0x30000
+// 0x010217b0: 0x10217b0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010217a4: 0x10217a4: addiu a0, a0, -31052
+// 0x010217b4: 0x10217b4: addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
 	stloc.1
-// 0x010217a8: 0x10217a8: jal   0x101ece8 sw    zero, 28348(v0)
+// 0x010217b8: 0x10217b8: jal   0x101ecf8 sw    zero, 28812(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -432,26 +432,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010217b0: 0x10217b0: jal   0x1021004 sll   zero, zero, 0
+// 0x010217c0: 0x10217c0: jal   0x1021014 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_reset_1021004(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_reset_1021014(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010217b8: 0x10217b8: lui   a0, 0x10000
+// 0x010217c8: 0x10217c8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010217bc: 0x10217bc: jal   0x103fdbc addiu a0, a0, -29376
+// 0x010217cc: 0x10217cc: jal   0x103fdcc addiu a0, a0, -29376
 	ldloc.1
 	ldc.i4 -29376
 	add
@@ -461,36 +461,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010217c4: 0x10217c4: jal   0x100f35c sll   zero, zero, 0
+// 0x010217d4: 0x10217d4: jal   0x100f36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_refresh_100f35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_refresh_100f36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010217cc: 0x10217cc: jal   0x102146c sll   zero, zero, 0
+// 0x010217dc: 0x10217dc: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010217d4: 0x10217d4: lw    ra, 20(sp)
-// 0x010217d8: 0x10217d8: sll   zero, zero, 0
-// 0x010217dc: 0x10217dc: jr    ra addiu sp, sp, 24
+// 0x010217e4: 0x10217e4: lw    ra, 20(sp)
+// 0x010217e8: 0x10217e8: sll   zero, zero, 0
+// 0x010217ec: 0x10217ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -502,7 +502,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 focus_on_location_10217e4(int32,int32,int32,int32,int32)
+.method public static int32 focus_on_location_10217f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -537,40 +537,40 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010217e4: 0x10217e4: addiu sp, sp, -24
+// 0x010217f4: 0x10217f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010217e8: 0x10217e8: sw    ra, 20(sp)
-// 0x010217ec: 0x10217ec: jal   0x1021394 sll   zero, zero, 0
+// 0x010217f8: 0x10217f8: sw    ra, 20(sp)
+// 0x010217fc: 0x10217fc: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010217f4: 0x10217f4: lui   a0, 0x20000
+// 0x01021804: 0x1021804: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010217f8: 0x10217f8: lui   v0, 0x30000
+// 0x01021808: 0x1021808: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010217fc: 0x10217fc: addiu a0, a0, 6792
+// 0x0102180c: 0x102180c: addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
-// 0x01021800: 0x1021800: jal   0x101ece8 sw    zero, 28348(v0)
+// 0x01021810: 0x1021810: jal   0x101ecf8 sw    zero, 28812(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -579,47 +579,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021808: 0x1021808: jal   0x1021004 sll   zero, zero, 0
+// 0x01021818: 0x1021818: jal   0x1021014 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_reset_1021004(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_reset_1021014(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021810: 0x1021810: jal   0x100f35c sll   zero, zero, 0
+// 0x01021820: 0x1021820: jal   0x100f36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_refresh_100f35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_refresh_100f36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021818: 0x1021818: jal   0x102146c sll   zero, zero, 0
+// 0x01021828: 0x1021828: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021820: 0x1021820: lw    ra, 20(sp)
-// 0x01021824: 0x1021824: sll   zero, zero, 0
-// 0x01021828: 0x1021828: jr    ra addiu sp, sp, 24
+// 0x01021830: 0x1021830: lw    ra, 20(sp)
+// 0x01021834: 0x1021834: sll   zero, zero, 0
+// 0x01021838: 0x1021838: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -631,7 +631,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 show_me_on_map_1021830(int32,int32,int32,int32,int32)
+.method public static int32 show_me_on_map_1021840(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -666,14 +666,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1021830:
-// 0x01021830: 0x1021830: addiu sp, sp, -24
+L_1021840:
+// 0x01021840: 0x1021840: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021834: 0x1021834: sw    ra, 20(sp)
-// 0x01021838: 0x1021838: jal   0x1094a94 addu  a0, zero, zero
+// 0x01021844: 0x1021844: sw    ra, 20(sp)
+// 0x01021848: 0x1021848: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -681,23 +681,23 @@ L_1021830:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021840: 0x1021840: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+// 0x01021850: 0x1021850: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
 // --- basic block ---
-// 0x01021848: 0x1021848: bne   v0, zero, 0x10218b0 sll   zero, zero, 0
+// 0x01021858: 0x1021858: bne   v0, zero, 0x10218c0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10218b0
+	brtrue L_10218c0
 // --- basic block ---
-// 0x01021850: 0x1021850: lui   a0, 0x10000
+// 0x01021860: 0x1021860: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01021854: 0x1021854: jal   0x103fdbc addiu a0, a0, -29376
+// 0x01021864: 0x1021864: jal   0x103fdcc addiu a0, a0, -29376
 	ldloc.1
 	ldc.i4 -29376
 	add
@@ -707,17 +707,17 @@ L_1021830:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102185c: 0x102185c: lui   a0, 0x20000
+// 0x0102186c: 0x102186c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01021860: 0x1021860: jal   0x101df50 addiu a0, a0, 6792
+// 0x01021870: 0x1021870: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -725,35 +725,35 @@ L_1021830:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021868: 0x1021868: beq   v0, zero, 0x10218b0 lui   v1, 0x2120000
+// 0x01021878: 0x1021878: beq   v0, zero, 0x10218c0 lui   v1, 0x2120000
 	ldloc 5
 	ldc.i4 34734080
 	stloc 6
-	brfalse L_10218b0
+	brfalse L_10218c0
 // --- basic block ---
-// 0x01021870: 0x1021870: lw    a0, 0(v0)
+// 0x01021880: 0x1021880: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01021874: 0x1021874: ori   v1, v1, 60730
+// 0x01021884: 0x1021884: ori   v1, v1, 60730
 	ldloc 6
 	ldc.i4 60730
 	or
 	stloc 6
-// 0x01021878: 0x1021878: bne   a0, v1, 0x1021894 sll   zero, zero, 0
+// 0x01021888: 0x1021888: bne   a0, v1, 0x10218a4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_1021894
+	bne.un L_10218a4
 // --- basic block ---
-// 0x01021880: 0x1021880: lw    v1, 4(v0)
+// 0x01021890: 0x1021890: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -762,35 +762,35 @@ L_1021830:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021884: 0x1021884: lui   v0, 0x1e90000
+// 0x01021894: 0x1021894: lui   v0, 0x1e90000
 	ldc.i4 32047104
 	stloc 5
-// 0x01021888: 0x1021888: ori   v0, v0, 58906
+// 0x01021898: 0x1021898: ori   v0, v0, 58906
 	ldloc 5
 	ldc.i4 58906
 	or
 	stloc 5
-// 0x0102188c: 0x102188c: beq   v1, v0, 0x10218b0 sll   zero, zero, 0
+// 0x0102189c: 0x102189c: beq   v1, v0, 0x10218c0 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_10218b0
+	beq  L_10218c0
 // --- basic block ---
-L_1021894:
-// 0x01021894: 0x1021894: jal   0x10217e4 sll   zero, zero, 0
+L_10218a4:
+// 0x010218a4: 0x10218a4: jal   0x10217f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::focus_on_location_10217e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::focus_on_location_10217f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102189c: 0x102189c: lui   a0, 0x10000
+// 0x010218ac: 0x10218ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010218a0: 0x10218a0: jal   0x103fdbc addiu a0, a0, -29376
+// 0x010218b0: 0x10218b0: jal   0x103fdcc addiu a0, a0, -29376
 	ldloc.1
 	ldc.i4 -29376
 	add
@@ -800,43 +800,43 @@ L_1021894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010218a8: 0x10218a8: j	 0x10218f0 sll   zero, zero, 0
-	br L_10218f0
+// 0x010218b8: 0x10218b8: j	 0x1021900 sll   zero, zero, 0
+	br L_1021900
 // --- basic block ---
-L_10218b0:
-// 0x010218b0: 0x10218b0: jal   0x1021394 sll   zero, zero, 0
+L_10218c0:
+// 0x010218c0: 0x10218c0: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010218b8: 0x10218b8: lui   a0, 0x10000
+// 0x010218c8: 0x10218c8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010218bc: 0x10218bc: lui   v0, 0x30000
+// 0x010218cc: 0x10218cc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010218c0: 0x10218c0: addiu a0, a0, -31052
+// 0x010218d0: 0x10218d0: addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
 	stloc.1
-// 0x010218c4: 0x10218c4: jal   0x101ece8 sw    zero, 28348(v0)
+// 0x010218d4: 0x10218d4: jal   0x101ecf8 sw    zero, 28812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7087
+	ldc.i4 7203
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -845,12 +845,12 @@ L_10218b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010218cc: 0x10218cc: jal   0x101fc00 addu  a0, zero, zero
+// 0x010218dc: 0x10218dc: jal   0x101fc10 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -858,15 +858,15 @@ L_10218b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010218d4: 0x10218d4: lui   a0, 0x10000
+// 0x010218e4: 0x10218e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010218d8: 0x10218d8: jal   0x103fdbc addiu a0, a0, -29376
+// 0x010218e8: 0x10218e8: jal   0x103fdcc addiu a0, a0, -29376
 	ldloc.1
 	ldc.i4 -29376
 	add
@@ -876,37 +876,37 @@ L_10218b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010218e0: 0x10218e0: jal   0x100f35c sll   zero, zero, 0
+// 0x010218f0: 0x10218f0: jal   0x100f36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_refresh_100f35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_refresh_100f36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010218e8: 0x10218e8: jal   0x102146c sll   zero, zero, 0
+// 0x010218f8: 0x10218f8: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10218f0:
-// 0x010218f0: 0x10218f0: lw    ra, 20(sp)
-// 0x010218f4: 0x10218f4: sll   zero, zero, 0
-// 0x010218f8: 0x10218f8: jr    ra addiu sp, sp, 24
+L_1021900:
+// 0x01021900: 0x1021900: lw    ra, 20(sp)
+// 0x01021904: 0x1021904: sll   zero, zero, 0
+// 0x01021908: 0x1021908: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -918,7 +918,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -953,42 +953,42 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021900: 0x1021900: addiu sp, sp, -24
+// 0x01021910: 0x1021910: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021904: 0x1021904: sw    ra, 20(sp)
-// 0x01021908: 0x1021908: jal   0x102146c sll   zero, zero, 0
+// 0x01021914: 0x1021914: sw    ra, 20(sp)
+// 0x01021918: 0x1021918: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021910: 0x1021910: bne   v0, zero, 0x1021920 sll   zero, zero, 0
+// 0x01021920: 0x1021920: bne   v0, zero, 0x1021930 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1021920
+	brtrue L_1021930
 // --- basic block ---
-// 0x01021918: 0x1021918: jal   0x101fc54 sll   zero, zero, 0
+// 0x01021928: 0x1021928: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1021920:
-// 0x01021920: 0x1021920: lw    ra, 20(sp)
-// 0x01021924: 0x1021924: sll   zero, zero, 0
-// 0x01021928: 0x1021928: jr    ra addiu sp, sp, 24
+L_1021930:
+// 0x01021930: 0x1021930: lw    ra, 20(sp)
+// 0x01021934: 0x1021934: sll   zero, zero, 0
+// 0x01021938: 0x1021938: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1000,7 +1000,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 XiconTimer_1021930(int32,int32,int32,int32,int32)
+.method public static int32 XiconTimer_1021940(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1035,21 +1035,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021930: 0x1021930: addiu sp, sp, -24
+// 0x01021940: 0x1021940: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021934: 0x1021934: lui   v0, 0x30000
+// 0x01021944: 0x1021944: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021938: 0x1021938: sw    ra, 20(sp)
-// 0x0102193c: 0x102193c: jal   0x1021900 sw    zero, 28236(v0)
+// 0x01021948: 0x1021948: sw    ra, 20(sp)
+// 0x0102194c: 0x102194c: jal   0x1021910 sw    zero, 28700(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7059
+	ldc.i4 7175
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1058,14 +1058,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01021944: 0x1021944: lw    ra, 20(sp)
-// 0x01021948: 0x1021948: sll   zero, zero, 0
-// 0x0102194c: 0x102194c: jr    ra addiu sp, sp, 24
+// 0x01021954: 0x1021954: lw    ra, 20(sp)
+// 0x01021958: 0x1021958: sll   zero, zero, 0
+// 0x0102195c: 0x102195c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1077,7 +1077,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_set_view_1021954(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_set_view_1021964(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -1115,10 +1115,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021954: 0x1021954: lui   v0, 0x0
+// 0x01021964: 0x1021964: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01021958: 0x1021958: lw    v1, 6048(v0)
+// 0x01021968: 0x1021968: lw    v1, 6048(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1127,21 +1127,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102195c: 0x102195c: lui   v0, 0x20000
+// 0x0102196c: 0x102196c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01021960: 0x1021960: addiu sp, sp, -24
+// 0x01021970: 0x1021970: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021964: 0x1021964: and   v1, v1, v0
+// 0x01021974: 0x1021974: and   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	and
 	stloc 6
-// 0x01021968: 0x1021968: sw    ra, 20(sp)
-// 0x0102196c: 0x102196c: sw    s0, 16(sp)
+// 0x01021978: 0x1021978: sw    ra, 20(sp)
+// 0x0102197c: 0x102197c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1150,59 +1150,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01021970: 0x1021970: bne   v1, zero, 0x10219c8 addu  v0, a0, zero
+// 0x01021980: 0x1021980: bne   v1, zero, 0x10219d8 addu  v0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 5
-	brtrue L_10219c8
+	brtrue L_10219d8
 // --- basic block ---
-// 0x01021978: 0x1021978: addiu v1, zero, 1
+// 0x01021988: 0x1021988: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0102197c: 0x102197c: bne   a0, v1, 0x10219c8 lui   v1, 0x30000
+// 0x0102198c: 0x102198c: bne   a0, v1, 0x10219d8 lui   v1, 0x30000
 	ldloc.1
 	ldloc 6
 	ldc.i4 196608
 	stloc 6
-	bne.un L_10219c8
+	bne.un L_10219d8
 // --- basic block ---
-// 0x01021984: 0x1021984: lui   a0, 0x0
+// 0x01021994: 0x1021994: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01021988: 0x1021988: lui   a1, 0x10000
+// 0x01021998: 0x1021998: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102198c: 0x102198c: sw    v0, 28256(v1)
+// 0x0102199c: 0x102199c: sw    v0, 28720(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldloc 5
 	stelem.i4
-// 0x01021990: 0x1021990: addiu a0, a0, 6188
+// 0x010219a0: 0x10219a0: addiu a0, a0, 6188
 	ldloc.1
 	ldc.i4 6188
 	add
 	stloc.1
-// 0x01021994: 0x1021994: lui   v0, 0x30000
+// 0x010219a4: 0x10219a4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021998: 0x1021998: addiu a1, a1, -29476
+// 0x010219a8: 0x10219a8: addiu a1, a1, -29476
 	ldloc.2
 	ldc.i4 -29476
 	add
 	stloc.2
-// 0x0102199c: 0x102199c: addiu v1, zero, -100
+// 0x010219ac: 0x10219ac: addiu v1, zero, -100
 	ldc.i4.s -100
 	stloc 6
-// 0x010219a0: 0x10219a0: jal   0x100e5c0 sw    v1, 28448(v0)
+// 0x010219b0: 0x10219b0: jal   0x100e5d0 sw    v1, 28912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldloc 6
 	stelem.i4
@@ -1211,88 +1211,88 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010219a8: 0x10219a8: lui   v0, 0x20000
+// 0x010219b8: 0x10219b8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010219ac: 0x10219ac: lw    a0, 24904(v0)
+// 0x010219bc: 0x10219bc: lw    a0, 25368(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6226
+	ldc.i4 6342
 	add
 	ldelem.i4
 	stloc.1
-// 0x010219b0: 0x10219b0: lui   v0, 0x20000
+// 0x010219c0: 0x10219c0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010219b4: 0x10219b4: lw    a1, 24908(v0)
+// 0x010219c4: 0x10219c4: lw    a1, 25372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6227
+	ldc.i4 6343
 	add
 	ldelem.i4
 	stloc.2
-// 0x010219b8: 0x10219b8: lui   v0, 0x20000
+// 0x010219c8: 0x10219c8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010219bc: 0x10219bc: lw    a2, 24912(v0)
+// 0x010219cc: 0x10219cc: lw    a2, 25376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6228
+	ldc.i4 6344
 	add
 	ldelem.i4
 	stloc.3
-// 0x010219c0: 0x10219c0: j	 0x1021a04 sll   zero, zero, 0
-	br L_1021a04
+// 0x010219d0: 0x10219d0: j	 0x1021a14 sll   zero, zero, 0
+	br L_1021a14
 // --- basic block ---
-L_10219c8:
-// 0x010219c8: 0x10219c8: lui   v0, 0x30000
+L_10219d8:
+// 0x010219d8: 0x10219d8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010219cc: 0x10219cc: lui   a0, 0x0
+// 0x010219dc: 0x10219dc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010219d0: 0x10219d0: lui   a1, 0x10000
+// 0x010219e0: 0x10219e0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010219d4: 0x10219d4: addiu a0, a0, 6188
+// 0x010219e4: 0x10219e4: addiu a0, a0, 6188
 	ldloc.1
 	ldc.i4 6188
 	add
 	stloc.1
-// 0x010219d8: 0x10219d8: addiu a1, a1, -29480
+// 0x010219e8: 0x10219e8: addiu a1, a1, -29480
 	ldloc.2
 	ldc.i4 -29480
 	add
 	stloc.2
-// 0x010219dc: 0x10219dc: sw    zero, 28256(v0)
+// 0x010219ec: 0x10219ec: sw    zero, 28720(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010219e0: 0x10219e0: lui   v0, 0x30000
+// 0x010219f0: 0x10219f0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010219e4: 0x10219e4: jal   0x100e5c0 sw    zero, 28448(v0)
+// 0x010219f4: 0x10219f4: jal   0x100e5d0 sw    zero, 28912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1301,79 +1301,79 @@ L_10219c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010219ec: 0x10219ec: lui   v0, 0x20000
+// 0x010219fc: 0x10219fc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010219f0: 0x10219f0: lw    a0, 24904(v0)
+// 0x01021a00: 0x1021a00: lw    a0, 25368(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6226
+	ldc.i4 6342
 	add
 	ldelem.i4
 	stloc.1
-// 0x010219f4: 0x10219f4: lui   v0, 0x20000
+// 0x01021a04: 0x1021a04: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010219f8: 0x10219f8: lw    a1, 24908(v0)
+// 0x01021a08: 0x1021a08: lw    a1, 25372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6227
+	ldc.i4 6343
 	add
 	ldelem.i4
 	stloc.2
-// 0x010219fc: 0x10219fc: lui   v0, 0x20000
+// 0x01021a0c: 0x1021a0c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01021a00: 0x1021a00: lw    a2, 24916(v0)
+// 0x01021a10: 0x1021a10: lw    a2, 25380(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6229
+	ldc.i4 6345
 	add
 	ldelem.i4
 	stloc.3
-L_1021a04:
-// 0x01021a04: 0x1021a04: jal   0x104bfdc lui   s0, 0x30000
+L_1021a14:
+// 0x01021a14: 0x1021a14: jal   0x104bfec lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01021a0c: 0x1021a0c: lui   v0, 0x30000
+// 0x01021a1c: 0x1021a1c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021a10: 0x1021a10: lw    a0, 28448(v0)
+// 0x01021a20: 0x1021a20: lw    a0, 28912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021a14: 0x1021a14: jal   0x1008724 sll   zero, zero, 0
+// 0x01021a24: 0x1021a24: jal   0x1008734 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_horizon_1008724(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_horizon_1008734(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021a1c: 0x1021a1c: jal   0x1020c40 addiu a0, s0, 28440
+// 0x01021a2c: 0x1021a2c: jal   0x1020c50 addiu a0, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.1
 	ldloc.0
@@ -1381,20 +1381,20 @@ L_1021a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021a24: 0x1021a24: lui   a0, 0x10000
+// 0x01021a34: 0x1021a34: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01021a28: 0x1021a28: addiu a1, s0, 28440
+// 0x01021a38: 0x1021a38: addiu a1, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.2
-// 0x01021a2c: 0x1021a2c: jal   0x101f76c addiu a0, a0, -29680
+// 0x01021a3c: 0x1021a3c: jal   0x101f77c addiu a0, a0, -29680
 	ldloc.1
 	ldc.i4 -29680
 	add
@@ -1404,23 +1404,23 @@ L_1021a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021a34: 0x1021a34: addiu v1, zero, 1
+// 0x01021a44: 0x1021a44: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01021a38: 0x1021a38: lui   v0, 0x30000
+// 0x01021a48: 0x1021a48: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021a3c: 0x1021a3c: jal   0x1021900 sw    v1, 28352(v0)
+// 0x01021a4c: 0x1021a4c: jal   0x1021910 sw    v1, 28816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7088
+	ldc.i4 7204
 	add
 	ldloc 6
 	stelem.i4
@@ -1429,13 +1429,13 @@ L_1021a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021a44: 0x1021a44: lw    ra, 20(sp)
-// 0x01021a48: 0x1021a48: lw    s0, 16(sp)
+// 0x01021a54: 0x1021a54: lw    ra, 20(sp)
+// 0x01021a58: 0x1021a58: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1444,7 +1444,7 @@ L_1021a04:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021a4c: 0x1021a4c: jr    ra addiu sp, sp, 24
+// 0x01021a5c: 0x1021a5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1456,7 +1456,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_restore_view_1021a54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_restore_view_1021a64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1491,16 +1491,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021a54: 0x1021a54: lui   a0, 0x0
+// 0x01021a64: 0x1021a64: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01021a58: 0x1021a58: addiu sp, sp, -24
+// 0x01021a68: 0x1021a68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021a5c: 0x1021a5c: sw    ra, 20(sp)
-// 0x01021a60: 0x1021a60: jal   0x100e348 addiu a0, a0, 6188
+// 0x01021a6c: 0x1021a6c: sw    ra, 20(sp)
+// 0x01021a70: 0x1021a70: jal   0x100e358 addiu a0, a0, 6188
 	ldloc.1
 	ldc.i4 6188
 	add
@@ -1510,18 +1510,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021a68: 0x1021a68: lui   a1, 0x10000
+// 0x01021a78: 0x1021a78: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01021a6c: 0x1021a6c: addu  a0, v0, zero
+// 0x01021a7c: 0x1021a7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01021a70: 0x1021a70: jal   0x1001b14 addiu a1, a1, -29476
+// 0x01021a80: 0x1021a80: jal   0x1001b14 addiu a1, a1, -29476
 	ldloc.2
 	ldc.i4 -29476
 	add
@@ -1531,30 +1531,30 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01021a78: 0x1021a78: beq   v0, zero, 0x1021a84 addiu a0, zero, 1
+// 0x01021a88: 0x1021a88: beq   v0, zero, 0x1021a94 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brfalse L_1021a84
+	brfalse L_1021a94
 // --- basic block ---
-// 0x01021a80: 0x1021a80: addu  a0, zero, zero
+// 0x01021a90: 0x1021a90: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_1021a84:
-// 0x01021a84: 0x1021a84: jal   0x1021954 sll   zero, zero, 0
+L_1021a94:
+// 0x01021a94: 0x1021a94: jal   0x1021964 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_set_view_1021954(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_set_view_1021964(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021a8c: 0x1021a8c: lw    ra, 20(sp)
-// 0x01021a90: 0x1021a90: sll   zero, zero, 0
-// 0x01021a94: 0x1021a94: jr    ra addiu sp, sp, 24
+// 0x01021a9c: 0x1021a9c: lw    ra, 20(sp)
+// 0x01021aa0: 0x1021aa0: sll   zero, zero, 0
+// 0x01021aa4: 0x1021aa4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1566,7 +1566,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_toggle_view_mode_1021a9c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_toggle_view_mode_1021aac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1604,26 +1604,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1021a9c:
-// 0x01021a9c: 0x1021a9c: lui   v0, 0x30000
+L_1021aac:
+// 0x01021aac: 0x1021aac: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021aa0: 0x1021aa0: lw    a1, 28256(v0)
+// 0x01021ab0: 0x1021ab0: lw    a1, 28720(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc.2
-// 0x01021aa4: 0x1021aa4: addiu sp, sp, -24
+// 0x01021ab4: 0x1021ab4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021aa8: 0x1021aa8: sw    ra, 20(sp)
-// 0x01021aac: 0x1021aac: sw    s0, 16(sp)
+// 0x01021ab8: 0x1021ab8: sw    ra, 20(sp)
+// 0x01021abc: 0x1021abc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1632,88 +1632,88 @@ L_1021a9c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01021ab0: 0x1021ab0: lui   v1, 0x30000
+// 0x01021ac0: 0x1021ac0: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01021ab4: 0x1021ab4: bne   a1, zero, 0x1021adc lui   a0, 0x0
+// 0x01021ac4: 0x1021ac4: bne   a1, zero, 0x1021aec lui   a0, 0x0
 	ldloc.2
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1021adc
+	brtrue L_1021aec
 // --- basic block ---
-// 0x01021abc: 0x1021abc: addiu a2, zero, 1
+// 0x01021acc: 0x1021acc: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01021ac0: 0x1021ac0: lui   a1, 0x10000
+// 0x01021ad0: 0x1021ad0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01021ac4: 0x1021ac4: sw    a2, 28256(v0)
+// 0x01021ad4: 0x1021ad4: sw    a2, 28720(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldloc.3
 	stelem.i4
-// 0x01021ac8: 0x1021ac8: addiu v0, zero, -100
+// 0x01021ad8: 0x1021ad8: addiu v0, zero, -100
 	ldc.i4.s -100
 	stloc 5
-// 0x01021acc: 0x1021acc: addiu a0, a0, 6188
+// 0x01021adc: 0x1021adc: addiu a0, a0, 6188
 	ldloc.1
 	ldc.i4 6188
 	add
 	stloc.1
-// 0x01021ad0: 0x1021ad0: addiu a1, a1, -29476
+// 0x01021ae0: 0x1021ae0: addiu a1, a1, -29476
 	ldloc.2
 	ldc.i4 -29476
 	add
 	stloc.2
-// 0x01021ad4: 0x1021ad4: j	 0x1021af0 sw    v0, 28448(v1)
+// 0x01021ae4: 0x1021ae4: j	 0x1021b00 sw    v0, 28912(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldloc 5
 	stelem.i4
-	br L_1021af0
+	br L_1021b00
 // --- basic block ---
-L_1021adc:
-// 0x01021adc: 0x1021adc: lui   a1, 0x10000
+L_1021aec:
+// 0x01021aec: 0x1021aec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01021ae0: 0x1021ae0: addiu a0, a0, 6188
+// 0x01021af0: 0x1021af0: addiu a0, a0, 6188
 	ldloc.1
 	ldc.i4 6188
 	add
 	stloc.1
-// 0x01021ae4: 0x1021ae4: addiu a1, a1, -29480
+// 0x01021af4: 0x1021af4: addiu a1, a1, -29480
 	ldloc.2
 	ldc.i4 -29480
 	add
 	stloc.2
-// 0x01021ae8: 0x1021ae8: sw    zero, 28256(v0)
+// 0x01021af8: 0x1021af8: sw    zero, 28720(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01021aec: 0x1021aec: sw    zero, 28448(v1)
+// 0x01021afc: 0x1021afc: sw    zero, 28912(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1021af0:
-// 0x01021af0: 0x1021af0: jal   0x100e5c0 lui   s0, 0x30000
+L_1021b00:
+// 0x01021b00: 0x1021b00: jal   0x100e5d0 lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
 	ldloc.0
@@ -1721,37 +1721,37 @@ L_1021af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021af8: 0x1021af8: lui   v0, 0x30000
+// 0x01021b08: 0x1021b08: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021afc: 0x1021afc: lw    a0, 28448(v0)
+// 0x01021b0c: 0x1021b0c: lw    a0, 28912(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021b00: 0x1021b00: jal   0x1008724 sll   zero, zero, 0
+// 0x01021b10: 0x1021b10: jal   0x1008734 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_horizon_1008724(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_horizon_1008734(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021b08: 0x1021b08: jal   0x1020c40 addiu a0, s0, 28440
+// 0x01021b18: 0x1021b18: jal   0x1020c50 addiu a0, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.1
 	ldloc.0
@@ -1759,20 +1759,20 @@ L_1021af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_1020c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_1020c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021b10: 0x1021b10: lui   a0, 0x10000
+// 0x01021b20: 0x1021b20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01021b14: 0x1021b14: addiu a1, s0, 28440
+// 0x01021b24: 0x1021b24: addiu a1, s0, 28904
 	ldloc 8
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.2
-// 0x01021b18: 0x1021b18: jal   0x101f76c addiu a0, a0, -29680
+// 0x01021b28: 0x1021b28: jal   0x101f77c addiu a0, a0, -29680
 	ldloc.1
 	ldc.i4 -29680
 	add
@@ -1782,23 +1782,23 @@ L_1021af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021b20: 0x1021b20: addiu v1, zero, 1
+// 0x01021b30: 0x1021b30: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01021b24: 0x1021b24: lui   v0, 0x30000
+// 0x01021b34: 0x1021b34: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021b28: 0x1021b28: jal   0x1021900 sw    v1, 28352(v0)
+// 0x01021b38: 0x1021b38: jal   0x1021910 sw    v1, 28816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7088
+	ldc.i4 7204
 	add
 	ldloc 7
 	stelem.i4
@@ -1807,13 +1807,13 @@ L_1021af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021b30: 0x1021b30: lw    ra, 20(sp)
-// 0x01021b34: 0x1021b34: lw    s0, 16(sp)
+// 0x01021b40: 0x1021b40: lw    ra, 20(sp)
+// 0x01021b44: 0x1021b44: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1822,7 +1822,7 @@ L_1021af0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021b38: 0x1021b38: jr    ra addiu sp, sp, 24
+// 0x01021b48: 0x1021b48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1834,7 +1834,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_device_event_1021b40(int32,int32,int32,int32,int32)
+.method public static int32 on_device_event_1021b50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1869,110 +1869,110 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021b40: 0x1021b40: addiu sp, sp, -24
+// 0x01021b50: 0x1021b50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01021b44: 0x1021b44: addiu v0, zero, 10
+// 0x01021b54: 0x1021b54: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x01021b48: 0x1021b48: bne   a0, v0, 0x1021b98 sw    ra, 20(sp)
+// 0x01021b58: 0x1021b58: bne   a0, v0, 0x1021ba8 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1021b98
+	bne.un L_1021ba8
 // --- basic block ---
-// 0x01021b50: 0x1021b50: lui   v0, 0xf0000
+// 0x01021b60: 0x1021b60: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01021b54: 0x1021b54: lw    a0, -30068(v0)
+// 0x01021b64: 0x1021b64: lw    a0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021b58: 0x1021b58: lui   v0, 0xf0000
+// 0x01021b68: 0x1021b68: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01021b5c: 0x1021b5c: lw    v1, -30072(v0)
+// 0x01021b6c: 0x1021b6c: lw    v1, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021b60: 0x1021b60: sll   zero, zero, 0
-// 0x01021b64: 0x1021b64: slt   v1, v1, a0
+// 0x01021b70: 0x1021b70: sll   zero, zero, 0
+// 0x01021b74: 0x1021b74: slt   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x01021b68: 0x1021b68: beq   v1, zero, 0x1021b7c lui   v0, 0x30000
+// 0x01021b78: 0x1021b78: beq   v1, zero, 0x1021b8c lui   v0, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc 5
-	brfalse L_1021b7c
+	brfalse L_1021b8c
 // --- basic block ---
-// 0x01021b70: 0x1021b70: addiu v1, zero, 1
+// 0x01021b80: 0x1021b80: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01021b74: 0x1021b74: j	 0x1021b80 sw    v1, 28528(v0)
+// 0x01021b84: 0x1021b84: j	 0x1021b90 sw    v1, 28992(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7132
+	ldc.i4 7248
 	add
 	ldloc 6
 	stelem.i4
-	br L_1021b80
+	br L_1021b90
 // --- basic block ---
-L_1021b7c:
-// 0x01021b7c: 0x1021b7c: sw    zero, 28528(v0)
+L_1021b8c:
+// 0x01021b8c: 0x1021b8c: sw    zero, 28992(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7132
+	ldc.i4 7248
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1021b80:
-// 0x01021b80: 0x1021b80: jal   0x102146c sll   zero, zero, 0
+L_1021b90:
+// 0x01021b90: 0x1021b90: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021b88: 0x1021b88: bne   v0, zero, 0x1021b98 sll   zero, zero, 0
+// 0x01021b98: 0x1021b98: bne   v0, zero, 0x1021ba8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1021b98
+	brtrue L_1021ba8
 // --- basic block ---
-// 0x01021b90: 0x1021b90: jal   0x1021900 sll   zero, zero, 0
+// 0x01021ba0: 0x1021ba0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1021b98:
-// 0x01021b98: 0x1021b98: lw    ra, 20(sp)
-// 0x01021b9c: 0x1021b9c: sll   zero, zero, 0
-// 0x01021ba0: 0x1021ba0: jr    ra addiu sp, sp, 24
+L_1021ba8:
+// 0x01021ba8: 0x1021ba8: lw    ra, 20(sp)
+// 0x01021bac: 0x1021bac: sll   zero, zero, 0
+// 0x01021bb0: 0x1021bb0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1984,7 +1984,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_draw_sky_1021ba8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_draw_sky_1021bb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra,int32 lo)
@@ -2025,28 +2025,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021ba8: 0x1021ba8: lui   v0, 0x30000
+// 0x01021bb8: 0x1021bb8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021bac: 0x1021bac: lw    v1, 28256(v0)
+// 0x01021bbc: 0x1021bbc: lw    v1, 28720(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021bb0: 0x1021bb0: addiu sp, sp, -32
+// 0x01021bc0: 0x1021bc0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01021bb4: 0x1021bb4: addiu v0, zero, 1
+// 0x01021bc4: 0x1021bc4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01021bb8: 0x1021bb8: sw    ra, 28(sp)
-// 0x01021bbc: 0x1021bbc: bne   v1, v0, 0x1021c3c sw    s0, 24(sp)
+// 0x01021bc8: 0x1021bc8: sw    ra, 28(sp)
+// 0x01021bcc: 0x1021bcc: bne   v1, v0, 0x1021c4c sw    s0, 24(sp)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -2057,46 +2057,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_1021c3c
+	bne.un L_1021c4c
 // --- basic block ---
-// 0x01021bc4: 0x1021bc4: jal   0x1014194 sll   zero, zero, 0
+// 0x01021bd4: 0x1021bd4: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021bcc: 0x1021bcc: bne   v0, zero, 0x1021bdc lui   a2, 0x10000
+// 0x01021bdc: 0x1021bdc: bne   v0, zero, 0x1021bec lui   a2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	brtrue L_1021bdc
+	brtrue L_1021bec
 // --- basic block ---
-// 0x01021bd4: 0x1021bd4: j	 0x1021be4 addiu a2, a2, -29364
+// 0x01021be4: 0x1021be4: j	 0x1021bf4 addiu a2, a2, -29364
 	ldloc.3
 	ldc.i4 -29364
 	add
 	stloc.3
-	br L_1021be4
+	br L_1021bf4
 // --- basic block ---
-L_1021bdc:
-// 0x01021bdc: 0x1021bdc: lui   a2, 0x10000
+L_1021bec:
+// 0x01021bec: 0x1021bec: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01021be0: 0x1021be0: addiu a2, a2, -29356
+// 0x01021bf0: 0x1021bf0: addiu a2, a2, -29356
 	ldloc.3
 	ldc.i4 -29356
 	add
 	stloc.3
-L_1021be4:
-// 0x01021be4: 0x1021be4: addu  a0, zero, zero
+L_1021bf4:
+// 0x01021bf4: 0x1021bf4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01021be8: 0x1021be8: jal   0x10a1918 addiu a1, zero, 1
+// 0x01021bf8: 0x1021bf8: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2104,15 +2104,15 @@ L_1021be4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021bf0: 0x1021bf0: addu  s0, v0, zero
+// 0x01021c00: 0x1021c00: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01021bf4: 0x1021bf4: jal   0x10423fc sw    zero, 16(sp)
+// 0x01021c04: 0x1021c04: jal   0x104240c sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2121,18 +2121,18 @@ L_1021be4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021bfc: 0x1021bfc: beq   s0, zero, 0x1021c3c addu  a0, s0, zero
+// 0x01021c0c: 0x1021c0c: beq   s0, zero, 0x1021c4c addu  a0, s0, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
-	brfalse L_1021c3c
+	brfalse L_1021c4c
 // --- basic block ---
-// 0x01021c04: 0x1021c04: jal   0x104dffc sw    v0, 20(sp)
+// 0x01021c14: 0x1021c14: jal   0x104e00c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2142,54 +2142,54 @@ L_1021be4:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021c0c: 0x1021c0c: lui   v1, 0xf0000
+// 0x01021c1c: 0x1021c1c: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x01021c10: 0x1021c10: lw    a0, -30068(v1)
+// 0x01021c20: 0x1021c20: lw    a0, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021c14: 0x1021c14: addiu v1, zero, 2
+// 0x01021c24: 0x1021c24: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01021c18: 0x1021c18: subu  a0, a0, v0
+// 0x01021c28: 0x1021c28: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x01021c1c: 0x1021c1c: div   a0, v1
+// 0x01021c2c: 0x1021c2c: div   a0, v1
 	ldloc.1
 	ldloc 6
 	div
 	stloc 10
-// 0x01021c20: 0x1021c20: addiu a1, sp, 16
+// 0x01021c30: 0x1021c30: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01021c24: 0x1021c24: addu  a0, s0, zero
+// 0x01021c34: 0x1021c34: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01021c28: 0x1021c28: addu  a2, zero, zero
+// 0x01021c38: 0x1021c38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01021c2c: 0x1021c2c: addu  a3, zero, zero
+// 0x01021c3c: 0x1021c3c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01021c30: 0x1021c30: mflo  lo
+// 0x01021c40: 0x1021c40: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x01021c34: 0x1021c34: jal   0x104f4a8 sw    v0, 16(sp)
+// 0x01021c44: 0x1021c44: jal   0x104f4b8 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2203,14 +2203,14 @@ L_1021be4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1021c3c:
-// 0x01021c3c: 0x1021c3c: lw    ra, 28(sp)
-// 0x01021c40: 0x1021c40: lw    s0, 24(sp)
+L_1021c4c:
+// 0x01021c4c: 0x1021c4c: lw    ra, 28(sp)
+// 0x01021c50: 0x1021c50: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2219,7 +2219,7 @@ L_1021c3c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021c44: 0x1021c44: jr    ra addiu sp, sp, 32
+// 0x01021c54: 0x1021c54: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2231,7 +2231,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_draw_points_1021c4c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_draw_points_1021c5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s8,int32 s0,int32 s3,int32 s4,int32 s5,int32 s6,int32 t0,int32 s2,int32 s7,int32 ra)
@@ -2296,12 +2296,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021c4c: 0x1021c4c: addiu sp, sp, -104
+// 0x01021c5c: 0x1021c5c: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x01021c50: 0x1021c50: sw    s7, 92(sp)
+// 0x01021c60: 0x1021c60: sw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2310,7 +2310,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01021c54: 0x1021c54: sw    s6, 88(sp)
+// 0x01021c64: 0x1021c64: sw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2319,30 +2319,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01021c58: 0x1021c58: addu  s7, a0, zero
+// 0x01021c68: 0x1021c68: addu  s7, a0, zero
 	ldloc.1
 	stloc 17
-// 0x01021c5c: 0x1021c5c: lw    s6, 0(a0)
+// 0x01021c6c: 0x1021c6c: lw    s6, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x01021c60: 0x1021c60: lw    a0, 0(a1)
+// 0x01021c70: 0x1021c70: lw    a0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01021c64: 0x1021c64: sw    ra, 100(sp)
-// 0x01021c68: 0x1021c68: subu  a0, a0, s6
+// 0x01021c74: 0x1021c74: sw    ra, 100(sp)
+// 0x01021c78: 0x1021c78: subu  a0, a0, s6
 	ldloc.1
 	ldloc 14
 	sub
 	stloc.1
-// 0x01021c6c: 0x1021c6c: sw    s8, 96(sp)
+// 0x01021c7c: 0x1021c7c: sw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2351,7 +2351,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01021c70: 0x1021c70: sw    s5, 84(sp)
+// 0x01021c80: 0x1021c80: sw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2360,7 +2360,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01021c74: 0x1021c74: sw    s4, 80(sp)
+// 0x01021c84: 0x1021c84: sw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2369,7 +2369,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01021c78: 0x1021c78: sw    s3, 76(sp)
+// 0x01021c88: 0x1021c88: sw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2378,7 +2378,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01021c7c: 0x1021c7c: sw    s2, 72(sp)
+// 0x01021c8c: 0x1021c8c: sw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2387,7 +2387,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01021c80: 0x1021c80: sw    s1, 68(sp)
+// 0x01021c90: 0x1021c90: sw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2396,7 +2396,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01021c84: 0x1021c84: sw    s0, 64(sp)
+// 0x01021c94: 0x1021c94: sw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2405,7 +2405,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01021c88: 0x1021c88: jal   0x10c09c0 sw    a1, 56(sp)
+// 0x01021c98: 0x1021c98: jal   0x10c1000 sw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2416,12 +2416,12 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021c90: 0x1021c90: lw    a1, 56(sp)
+// 0x01021ca0: 0x1021ca0: lw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2430,7 +2430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01021c94: 0x1021c94: lw    s3, 4(s7)
+// 0x01021ca4: 0x1021ca4: lw    s3, 4(s7)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
@@ -2439,7 +2439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01021c98: 0x1021c98: lw    a0, 4(a1)
+// 0x01021ca8: 0x1021ca8: lw    a0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -2448,34 +2448,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021c9c: 0x1021c9c: addu  s5, v0, zero
+// 0x01021cac: 0x1021cac: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x01021ca0: 0x1021ca0: addu  s4, v1, zero
+// 0x01021cb0: 0x1021cb0: addu  s4, v1, zero
 	ldloc 6
 	stloc 12
-// 0x01021ca4: 0x1021ca4: jal   0x10c09c0 subu  a0, a0, s3
+// 0x01021cb4: 0x1021cb4: jal   0x10c1000 subu  a0, a0, s3
 	ldloc.1
 	ldloc 11
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021cac: 0x1021cac: addu  a0, s5, zero
+// 0x01021cbc: 0x1021cbc: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01021cb0: 0x1021cb0: addu  a1, s4, zero
+// 0x01021cc0: 0x1021cc0: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01021cb4: 0x1021cb4: addu  s8, v1, zero
+// 0x01021cc4: 0x1021cc4: addu  s8, v1, zero
 	ldloc 6
 	stloc 9
-// 0x01021cb8: 0x1021cb8: jal   0x10c08d0 sw    v0, 40(sp)
+// 0x01021cc8: 0x1021cc8: jal   0x10c0f10 sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2487,12 +2487,12 @@ __CIBYL_javamethod_begin:
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021cc0: 0x1021cc0: lw    v1, 40(sp)
+// 0x01021cd0: 0x1021cd0: lw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2501,23 +2501,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01021cc4: 0x1021cc4: addu  a1, s8, zero
+// 0x01021cd4: 0x1021cd4: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x01021cc8: 0x1021cc8: addu  a0, v1, zero
+// 0x01021cd8: 0x1021cd8: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01021ccc: 0x1021ccc: sra   v1, v0, 31
+// 0x01021cdc: 0x1021cdc: sra   v1, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc 6
-// 0x01021cd0: 0x1021cd0: xor   s2, v1, v0
+// 0x01021ce0: 0x1021ce0: xor   s2, v1, v0
 	ldloc 6
 	ldloc 5
 	xor
 	stloc 16
-// 0x01021cd4: 0x1021cd4: jal   0x10c08d0 subu  s2, s2, v1
+// 0x01021ce4: 0x1021ce4: jal   0x10c0f10 subu  s2, s2, v1
 	ldloc 16
 	ldloc 6
 	sub
@@ -2525,63 +2525,63 @@ __CIBYL_javamethod_begin:
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021cdc: 0x1021cdc: sra   v1, v0, 31
+// 0x01021cec: 0x1021cec: sra   v1, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc 6
-// 0x01021ce0: 0x1021ce0: xor   v0, v1, v0
+// 0x01021cf0: 0x1021cf0: xor   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	xor
 	stloc 5
-// 0x01021ce4: 0x1021ce4: subu  v1, v0, v1
+// 0x01021cf4: 0x1021cf4: subu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	sub
 	stloc 6
-// 0x01021ce8: 0x1021ce8: jal   0x10c09c0 addu  a0, v1, s2
+// 0x01021cf8: 0x1021cf8: jal   0x10c1000 addu  a0, v1, s2
 	ldloc 6
 	ldloc 16
 	add
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021cf0: 0x1021cf0: lui   a0, 0x20000
+// 0x01021d00: 0x1021d00: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01021cf4: 0x1021cf4: lw    a3, 23844(a0)
+// 0x01021d04: 0x1021d04: lw    a3, 24308(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5961
+	ldc.i4 6077
 	add
 	ldelem.i4
 	stloc 4
-// 0x01021cf8: 0x1021cf8: lw    a2, 23840(a0)
+// 0x01021d08: 0x1021d08: lw    a2, 24304(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5960
+	ldc.i4 6076
 	add
 	ldelem.i4
 	stloc.3
-// 0x01021cfc: 0x1021cfc: addu  a1, v1, zero
+// 0x01021d0c: 0x1021d0c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01021d00: 0x1021d00: jal   0x10c0798 addu  a0, v0, zero
+// 0x01021d10: 0x1021d10: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2589,42 +2589,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021d08: 0x1021d08: addu  s1, v0, zero
+// 0x01021d18: 0x1021d18: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01021d0c: 0x1021d0c: lui   v0, 0x20000
+// 0x01021d1c: 0x1021d1c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01021d10: 0x1021d10: lw    a3, 23764(v0)
+// 0x01021d20: 0x1021d20: lw    a3, 24228(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5941
+	ldc.i4 6057
 	add
 	ldelem.i4
 	stloc 4
-// 0x01021d14: 0x1021d14: lw    a2, 23760(v0)
+// 0x01021d24: 0x1021d24: lw    a2, 24224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5940
+	ldc.i4 6056
 	add
 	ldelem.i4
 	stloc.3
-// 0x01021d18: 0x1021d18: addu  a0, s1, zero
+// 0x01021d28: 0x1021d28: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01021d1c: 0x1021d1c: addu  a1, v1, zero
+// 0x01021d2c: 0x1021d2c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01021d20: 0x1021d20: jal   0x10c18fc addu  s0, v1, zero
+// 0x01021d30: 0x1021d30: jal   0x10c1f3c addu  s0, v1, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -2632,25 +2632,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gedf2_10c18fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gedf2_10c1f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021d28: 0x1021d28: bltz  v0, 0x1021f04 addu  a2, s1, zero
+// 0x01021d38: 0x1021d38: bltz  v0, 0x1021f14 addu  a2, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.3
 	ldc.i4.s 0
-	blt L_1021f04
+	blt L_1021f14
 // --- basic block ---
-// 0x01021d30: 0x1021d30: addu  a0, s5, zero
+// 0x01021d40: 0x1021d40: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01021d34: 0x1021d34: addu  a1, s4, zero
+// 0x01021d44: 0x1021d44: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01021d38: 0x1021d38: jal   0x10c07f0 addu  a3, s0, zero
+// 0x01021d48: 0x1021d48: jal   0x10c0e30 addu  a3, s0, zero
 	ldloc 10
 	stloc 4
 	ldloc.0
@@ -2658,15 +2658,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021d40: 0x1021d40: addu  s5, v0, zero
+// 0x01021d50: 0x1021d50: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x01021d44: 0x1021d44: lw    v0, 40(sp)
+// 0x01021d54: 0x1021d54: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2675,19 +2675,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021d48: 0x1021d48: addu  a2, s1, zero
+// 0x01021d58: 0x1021d58: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x01021d4c: 0x1021d4c: addu  a1, s8, zero
+// 0x01021d5c: 0x1021d5c: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x01021d50: 0x1021d50: addu  a3, s0, zero
+// 0x01021d60: 0x1021d60: addu  a3, s0, zero
 	ldloc 10
 	stloc 4
-// 0x01021d54: 0x1021d54: addu  a0, v0, zero
+// 0x01021d64: 0x1021d64: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01021d58: 0x1021d58: jal   0x10c07f0 addu  s4, v1, zero
+// 0x01021d68: 0x1021d68: jal   0x10c0e30 addu  s4, v1, zero
 	ldloc 6
 	stloc 12
 	ldloc.0
@@ -2695,18 +2695,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021d60: 0x1021d60: addu  a0, s6, zero
+// 0x01021d70: 0x1021d70: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01021d64: 0x1021d64: addu  s8, v1, zero
+// 0x01021d74: 0x1021d74: addu  s8, v1, zero
 	ldloc 6
 	stloc 9
-// 0x01021d68: 0x1021d68: jal   0x10c09c0 sw    v0, 40(sp)
+// 0x01021d78: 0x1021d78: jal   0x10c1000 sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2717,21 +2717,21 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021d70: 0x1021d70: addu  a3, v1, zero
+// 0x01021d80: 0x1021d80: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01021d74: 0x1021d74: addu  a1, s4, zero
+// 0x01021d84: 0x1021d84: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01021d78: 0x1021d78: addu  a2, v0, zero
+// 0x01021d88: 0x1021d88: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01021d7c: 0x1021d7c: jal   0x10c06e8 addu  a0, s5, zero
+// 0x01021d8c: 0x1021d8c: jal   0x10c0d28 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -2739,28 +2739,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021d84: 0x1021d84: addu  a0, s3, zero
+// 0x01021d94: 0x1021d94: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01021d88: 0x1021d88: addu  s1, v0, zero
+// 0x01021d98: 0x1021d98: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01021d8c: 0x1021d8c: jal   0x10c09c0 addu  s0, v1, zero
+// 0x01021d9c: 0x1021d9c: jal   0x10c1000 addu  s0, v1, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021d94: 0x1021d94: lw    a2, 40(sp)
+// 0x01021da4: 0x1021da4: lw    a2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2769,16 +2769,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01021d98: 0x1021d98: addu  a1, s8, zero
+// 0x01021da8: 0x1021da8: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x01021d9c: 0x1021d9c: addu  a0, a2, zero
+// 0x01021dac: 0x1021dac: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01021da0: 0x1021da0: addu  a3, v1, zero
+// 0x01021db0: 0x1021db0: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01021da4: 0x1021da4: jal   0x10c06e8 addu  a2, v0, zero
+// 0x01021db4: 0x1021db4: jal   0x10c0d28 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -2786,39 +2786,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021dac: 0x1021dac: lui   t0, 0x20000
+// 0x01021dbc: 0x1021dbc: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 15
-// 0x01021db0: 0x1021db0: lw    a3, 23852(t0)
+// 0x01021dc0: 0x1021dc0: lw    a3, 24316(t0)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5963
+	ldc.i4 6079
 	add
 	ldelem.i4
 	stloc 4
-// 0x01021db4: 0x1021db4: lw    a2, 23848(t0)
+// 0x01021dc4: 0x1021dc4: lw    a2, 24312(t0)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5962
+	ldc.i4 6078
 	add
 	ldelem.i4
 	stloc.3
-// 0x01021db8: 0x1021db8: addu  a0, s5, zero
+// 0x01021dc8: 0x1021dc8: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01021dbc: 0x1021dbc: addu  a1, s4, zero
+// 0x01021dcc: 0x1021dcc: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01021dc0: 0x1021dc0: sw    t0, 56(sp)
+// 0x01021dd0: 0x1021dd0: sw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2827,10 +2827,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01021dc4: 0x1021dc4: addu  s6, v0, zero
+// 0x01021dd4: 0x1021dd4: addu  s6, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01021dc8: 0x1021dc8: jal   0x10c0798 addu  s3, v1, zero
+// 0x01021dd8: 0x1021dd8: jal   0x10c0dd8 addu  s3, v1, zero
 	ldloc 6
 	stloc 11
 	ldloc.0
@@ -2838,12 +2838,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021dd0: 0x1021dd0: lw    t0, 56(sp)
+// 0x01021de0: 0x1021de0: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2852,7 +2852,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01021dd4: 0x1021dd4: sw    v0, 44(sp)
+// 0x01021de4: 0x1021de4: sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2861,7 +2861,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01021dd8: 0x1021dd8: lw    v0, 40(sp)
+// 0x01021de8: 0x1021de8: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2870,31 +2870,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021ddc: 0x1021ddc: lw    a3, 23852(t0)
+// 0x01021dec: 0x1021dec: lw    a3, 24316(t0)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5963
+	ldc.i4 6079
 	add
 	ldelem.i4
 	stloc 4
-// 0x01021de0: 0x1021de0: lw    a2, 23848(t0)
+// 0x01021df0: 0x1021df0: lw    a2, 24312(t0)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 5962
+	ldc.i4 6078
 	add
 	ldelem.i4
 	stloc.3
-// 0x01021de4: 0x1021de4: addu  a1, s8, zero
+// 0x01021df4: 0x1021df4: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x01021de8: 0x1021de8: addu  a0, v0, zero
+// 0x01021df8: 0x1021df8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01021dec: 0x1021dec: jal   0x10c0798 sw    v1, 48(sp)
+// 0x01021dfc: 0x1021dfc: jal   0x10c0dd8 sw    v1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2908,17 +2908,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021df4: 0x1021df4: addiu s8, sp, 28
+// 0x01021e04: 0x1021e04: addiu s8, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x01021df8: 0x1021df8: sw    v0, 40(sp)
+// 0x01021e08: 0x1021e08: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2927,7 +2927,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01021dfc: 0x1021dfc: j	 0x1021ea8 sw    v1, 52(sp)
+// 0x01021e0c: 0x1021e0c: j	 0x1021eb8 sw    v1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2936,51 +2936,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1021ea8
+	br L_1021eb8
 // --- basic block ---
-L_1021e04:
-// 0x01021e04: 0x1021e04: lui   v1, 0x30000
+L_1021e14:
+// 0x01021e14: 0x1021e14: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01021e08: 0x1021e08: lw    v0, 28420(v1)
+// 0x01021e18: 0x1021e18: lw    v0, 28884(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7105
+	ldc.i4 7221
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021e0c: 0x1021e0c: sll   zero, zero, 0
-// 0x01021e10: 0x1021e10: addiu v0, v0, 1
+// 0x01021e1c: 0x1021e1c: sll   zero, zero, 0
+// 0x01021e20: 0x1021e20: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01021e14: 0x1021e14: jal   0x10c08d0 sw    v0, 28420(v1)
+// 0x01021e24: 0x1021e24: jal   0x10c0f10 sw    v0, 28884(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7105
+	ldc.i4 7221
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021e1c: 0x1021e1c: addu  a0, s6, zero
+// 0x01021e2c: 0x1021e2c: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01021e20: 0x1021e20: addu  a1, s3, zero
+// 0x01021e30: 0x1021e30: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x01021e24: 0x1021e24: jal   0x10c08d0 sw    v0, 28(sp)
+// 0x01021e34: 0x1021e34: jal   0x10c0f10 sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2992,18 +2992,18 @@ L_1021e04:
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021e2c: 0x1021e2c: addiu a0, zero, 1
+// 0x01021e3c: 0x1021e3c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01021e30: 0x1021e30: addu  a1, s8, zero
+// 0x01021e40: 0x1021e40: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x01021e34: 0x1021e34: jal   0x10072a4 sw    v0, 32(sp)
+// 0x01021e44: 0x1021e44: jal   0x10072b4 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3017,29 +3017,29 @@ L_1021e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021e3c: 0x1021e3c: addiu v0, zero, 1
+// 0x01021e4c: 0x1021e4c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01021e40: 0x1021e40: addiu a0, zero, 1
+// 0x01021e50: 0x1021e50: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01021e44: 0x1021e44: addu  a1, s8, zero
+// 0x01021e54: 0x1021e54: addu  a1, s8, zero
 	ldloc 9
 	stloc.2
-// 0x01021e48: 0x1021e48: addiu a2, sp, 24
+// 0x01021e58: 0x1021e58: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01021e4c: 0x1021e4c: addiu a3, zero, 5
+// 0x01021e5c: 0x1021e5c: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x01021e50: 0x1021e50: sw    v0, 16(sp)
+// 0x01021e60: 0x1021e60: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3048,10 +3048,10 @@ L_1021e04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01021e54: 0x1021e54: addiu v0, zero, 2
+// 0x01021e64: 0x1021e64: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01021e58: 0x1021e58: jal   0x104f184 sw    v0, 24(sp)
+// 0x01021e68: 0x1021e68: jal   0x104f194 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3065,12 +3065,12 @@ L_1021e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_circles_104f184(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_circles_104f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021e60: 0x1021e60: lw    v0, 44(sp)
+// 0x01021e70: 0x1021e70: lw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3079,13 +3079,13 @@ L_1021e04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021e64: 0x1021e64: addu  a0, s1, zero
+// 0x01021e74: 0x1021e74: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01021e68: 0x1021e68: addu  a2, v0, zero
+// 0x01021e78: 0x1021e78: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01021e6c: 0x1021e6c: lw    v0, 48(sp)
+// 0x01021e7c: 0x1021e7c: lw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3094,10 +3094,10 @@ L_1021e04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021e70: 0x1021e70: addu  a1, s0, zero
+// 0x01021e80: 0x1021e80: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x01021e74: 0x1021e74: jal   0x10c06e8 addu  a3, v0, zero
+// 0x01021e84: 0x1021e84: jal   0x10c0d28 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -3105,15 +3105,15 @@ L_1021e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021e7c: 0x1021e7c: addu  s1, v0, zero
+// 0x01021e8c: 0x1021e8c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01021e80: 0x1021e80: lw    v0, 40(sp)
+// 0x01021e90: 0x1021e90: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3122,13 +3122,13 @@ L_1021e04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021e84: 0x1021e84: addu  a0, s6, zero
+// 0x01021e94: 0x1021e94: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01021e88: 0x1021e88: addu  a2, v0, zero
+// 0x01021e98: 0x1021e98: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01021e8c: 0x1021e8c: lw    v0, 52(sp)
+// 0x01021e9c: 0x1021e9c: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3137,13 +3137,13 @@ L_1021e04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021e90: 0x1021e90: addu  a1, s3, zero
+// 0x01021ea0: 0x1021ea0: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x01021e94: 0x1021e94: addu  a3, v0, zero
+// 0x01021ea4: 0x1021ea4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01021e98: 0x1021e98: jal   0x10c06e8 addu  s0, v1, zero
+// 0x01021ea8: 0x1021ea8: jal   0x10c0d28 addu  s0, v1, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -3151,43 +3151,43 @@ L_1021e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021ea0: 0x1021ea0: addu  s6, v0, zero
+// 0x01021eb0: 0x1021eb0: addu  s6, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01021ea4: 0x1021ea4: addu  s3, v1, zero
+// 0x01021eb4: 0x1021eb4: addu  s3, v1, zero
 	ldloc 6
 	stloc 11
-L_1021ea8:
-// 0x01021ea8: 0x1021ea8: lw    a0, 0(s7)
+L_1021eb8:
+// 0x01021eb8: 0x1021eb8: lw    a0, 0(s7)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01021eac: 0x1021eac: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01021ebc: 0x1021ebc: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021eb4: 0x1021eb4: addu  a3, v1, zero
+// 0x01021ec4: 0x1021ec4: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01021eb8: 0x1021eb8: addu  a0, s5, zero
+// 0x01021ec8: 0x1021ec8: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01021ebc: 0x1021ebc: addu  a1, s4, zero
+// 0x01021ecc: 0x1021ecc: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01021ec0: 0x1021ec0: jal   0x10c0740 addu  a2, v0, zero
+// 0x01021ed0: 0x1021ed0: jal   0x10c0d80 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3195,21 +3195,21 @@ L_1021ea8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021ec8: 0x1021ec8: addu  a1, v1, zero
+// 0x01021ed8: 0x1021ed8: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01021ecc: 0x1021ecc: addu  a0, v0, zero
+// 0x01021edc: 0x1021edc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01021ed0: 0x1021ed0: addu  a2, s1, zero
+// 0x01021ee0: 0x1021ee0: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x01021ed4: 0x1021ed4: jal   0x10c06e8 addu  a3, s0, zero
+// 0x01021ee4: 0x1021ee4: jal   0x10c0d28 addu  a3, s0, zero
 	ldloc 10
 	stloc 4
 	ldloc.0
@@ -3217,57 +3217,57 @@ L_1021ea8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021edc: 0x1021edc: addu  a1, v1, zero
+// 0x01021eec: 0x1021eec: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01021ee0: 0x1021ee0: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01021ef0: 0x1021ef0: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01021ee8: 0x1021ee8: sra   v1, v0, 31
+// 0x01021ef8: 0x1021ef8: sra   v1, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc 6
-// 0x01021eec: 0x1021eec: xor   v0, v1, v0
+// 0x01021efc: 0x1021efc: xor   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	xor
 	stloc 5
-// 0x01021ef0: 0x1021ef0: subu  v1, v0, v1
+// 0x01021f00: 0x1021f00: subu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	sub
 	stloc 6
-// 0x01021ef4: 0x1021ef4: slt   v1, v1, s2
+// 0x01021f04: 0x1021f04: slt   v1, v1, s2
 	ldloc 6
 	ldloc 16
 	clt
 	stloc 6
-// 0x01021ef8: 0x1021ef8: addu  a0, s1, zero
+// 0x01021f08: 0x1021f08: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01021efc: 0x1021efc: bne   v1, zero, 0x1021e04 addu  a1, s0, zero
+// 0x01021f0c: 0x1021f0c: bne   v1, zero, 0x1021e14 addu  a1, s0, zero
 	ldloc 6
 	ldloc 10
 	stloc.2
-	brtrue L_1021e04
+	brtrue L_1021e14
 // --- basic block ---
-L_1021f04:
-// 0x01021f04: 0x1021f04: lw    ra, 100(sp)
-// 0x01021f08: 0x1021f08: lw    s8, 96(sp)
+L_1021f14:
+// 0x01021f14: 0x1021f14: lw    ra, 100(sp)
+// 0x01021f18: 0x1021f18: lw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3276,7 +3276,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01021f0c: 0x1021f0c: lw    s7, 92(sp)
+// 0x01021f1c: 0x1021f1c: lw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3285,7 +3285,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01021f10: 0x1021f10: lw    s6, 88(sp)
+// 0x01021f20: 0x1021f20: lw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3294,7 +3294,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01021f14: 0x1021f14: lw    s5, 84(sp)
+// 0x01021f24: 0x1021f24: lw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3303,7 +3303,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01021f18: 0x1021f18: lw    s4, 80(sp)
+// 0x01021f28: 0x1021f28: lw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3312,7 +3312,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01021f1c: 0x1021f1c: lw    s3, 76(sp)
+// 0x01021f2c: 0x1021f2c: lw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3321,7 +3321,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01021f20: 0x1021f20: lw    s2, 72(sp)
+// 0x01021f30: 0x1021f30: lw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3330,7 +3330,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01021f24: 0x1021f24: lw    s1, 68(sp)
+// 0x01021f34: 0x1021f34: lw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3339,7 +3339,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01021f28: 0x1021f28: lw    s0, 64(sp)
+// 0x01021f38: 0x1021f38: lw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3348,7 +3348,7 @@ L_1021f04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01021f2c: 0x1021f2c: jr    ra addiu sp, sp, 104
+// 0x01021f3c: 0x1021f3c: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -3360,7 +3360,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3404,33 +3404,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01021f34: 0x1021f34: lui   v0, 0x30000
+// 0x01021f44: 0x1021f44: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021f38: 0x1021f38: lw    v1, 28532(v0)
+// 0x01021f48: 0x1021f48: lw    v1, 28996(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 7
-// 0x01021f3c: 0x1021f3c: lui   v0, 0x30000
+// 0x01021f4c: 0x1021f4c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021f40: 0x1021f40: addiu sp, sp, -40
+// 0x01021f50: 0x1021f50: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01021f44: 0x1021f44: addiu v0, v0, 28540
+// 0x01021f54: 0x1021f54: addiu v0, v0, 29004
 	ldloc 5
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc 5
-// 0x01021f48: 0x1021f48: sw    ra, 36(sp)
-// 0x01021f4c: 0x1021f4c: sw    s2, 32(sp)
+// 0x01021f58: 0x1021f58: sw    ra, 36(sp)
+// 0x01021f5c: 0x1021f5c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3439,7 +3439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01021f50: 0x1021f50: sw    s1, 28(sp)
+// 0x01021f60: 0x1021f60: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3448,7 +3448,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01021f54: 0x1021f54: beq   v1, v0, 0x1022058 sw    s0, 24(sp)
+// 0x01021f64: 0x1021f64: beq   v1, v0, 0x1022068 sw    s0, 24(sp)
 	ldloc 7
 	ldloc 5
 	ldloc 6
@@ -3459,74 +3459,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	beq  L_1022058
+	beq  L_1022068
 // --- basic block ---
-// 0x01021f5c: 0x1021f5c: lui   v0, 0x40000
+// 0x01021f6c: 0x1021f6c: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x01021f60: 0x1021f60: lw    v0, -20612(v0)
+// 0x01021f70: 0x1021f70: lw    v0, -20148(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021f64: 0x1021f64: lui   s0, 0x40000
+// 0x01021f74: 0x1021f74: lui   s0, 0x40000
 	ldc.i4 262144
 	stloc 8
-// 0x01021f68: 0x1021f68: addiu s0, s0, -20600
+// 0x01021f78: 0x1021f78: addiu s0, s0, -20136
 	ldloc 8
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 8
-// 0x01021f6c: 0x1021f6c: subu  v0, v0, s0
+// 0x01021f7c: 0x1021f7c: subu  v0, v0, s0
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 5
-// 0x01021f70: 0x1021f70: ori   v1, zero, 32768
+// 0x01021f80: 0x1021f80: ori   v1, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 7
-// 0x01021f74: 0x1021f74: slt   v1, v0, v1
+// 0x01021f84: 0x1021f84: slt   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 7
-// 0x01021f78: 0x1021f78: bne   v1, zero, 0x1021fa0 lui   a1, 0x10000
+// 0x01021f88: 0x1021f88: bne   v1, zero, 0x1021fb0 lui   a1, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1021fa0
+	brtrue L_1021fb0
 // --- basic block ---
-// 0x01021f80: 0x1021f80: lui   a3, 0x10000
+// 0x01021f90: 0x1021f90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01021f84: 0x1021f84: sra   v0, v0, 3
+// 0x01021f94: 0x1021f94: sra   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shr
 	stloc 5
-// 0x01021f88: 0x1021f88: addiu a1, a1, -29532
+// 0x01021f98: 0x1021f98: addiu a1, a1, -29532
 	ldloc.2
 	ldc.i4 -29532
 	add
 	stloc.2
-// 0x01021f8c: 0x1021f8c: addiu a3, a3, -29344
+// 0x01021f9c: 0x1021f9c: addiu a3, a3, -29344
 	ldloc 4
 	ldc.i4 -29344
 	add
 	stloc 4
-// 0x01021f90: 0x1021f90: addiu a0, zero, 5
+// 0x01021fa0: 0x1021fa0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01021f94: 0x1021f94: addiu a2, zero, 372
+// 0x01021fa4: 0x1021fa4: addiu a2, zero, 372
 	ldc.i4 372
 	stloc.3
-// 0x01021f98: 0x1021f98: jal   0x100449c sw    v0, 16(sp)
+// 0x01021fa8: 0x1021fa8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3545,35 +3545,35 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1021fa0:
-// 0x01021fa0: 0x1021fa0: lui   v0, 0x40000
+L_1021fb0:
+// 0x01021fb0: 0x1021fb0: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x01021fa4: 0x1021fa4: lw    v0, -20612(v0)
+// 0x01021fb4: 0x1021fb4: lw    v0, -20148(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021fa8: 0x1021fa8: lui   s1, 0x40000
+// 0x01021fb8: 0x1021fb8: lui   s1, 0x40000
 	ldc.i4 262144
 	stloc 9
-// 0x01021fac: 0x1021fac: subu  s0, v0, s0
+// 0x01021fbc: 0x1021fbc: subu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 8
-// 0x01021fb0: 0x1021fb0: sra   a0, s0, 3
+// 0x01021fc0: 0x1021fc0: sra   a0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	shr
 	stloc.1
-// 0x01021fb4: 0x1021fb4: jal   0x10072a4 addiu a1, s1, -20600
+// 0x01021fc4: 0x1021fc4: jal   0x10072b4 addiu a1, s1, -20136
 	ldloc 9
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc.2
 	ldloc.0
@@ -3581,75 +3581,75 @@ L_1021fa0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021fbc: 0x1021fbc: lui   v0, 0x30000
+// 0x01021fcc: 0x1021fcc: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021fc0: 0x1021fc0: lw    v0, 28424(v0)
+// 0x01021fd0: 0x1021fd0: lw    v0, 28888(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7106
+	ldc.i4 7222
 	add
 	ldelem.i4
 	stloc 5
-// 0x01021fc4: 0x1021fc4: sll   zero, zero, 0
-// 0x01021fc8: 0x1021fc8: bne   v0, zero, 0x1021ffc lui   v0, 0x40000
+// 0x01021fd4: 0x1021fd4: sll   zero, zero, 0
+// 0x01021fd8: 0x1021fd8: bne   v0, zero, 0x102200c lui   v0, 0x40000
 	ldloc 5
 	ldc.i4 262144
 	stloc 5
-	brtrue L_1021ffc
+	brtrue L_102200c
 // --- basic block ---
-// 0x01021fd0: 0x1021fd0: lui   v0, 0x30000
+// 0x01021fe0: 0x1021fe0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021fd4: 0x1021fd4: lw    a0, 28532(v0)
+// 0x01021fe4: 0x1021fe4: lw    a0, 28996(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc.1
-// 0x01021fd8: 0x1021fd8: lui   a1, 0x30000
+// 0x01021fe8: 0x1021fe8: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x01021fdc: 0x1021fdc: addiu a1, a1, 28540
+// 0x01021fec: 0x1021fec: addiu a1, a1, 29004
 	ldloc.2
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc.2
-// 0x01021fe0: 0x1021fe0: lui   v0, 0x30000
+// 0x01021ff0: 0x1021ff0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01021fe4: 0x1021fe4: subu  a0, a0, a1
+// 0x01021ff4: 0x1021ff4: subu  a0, a0, a1
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.1
-// 0x01021fe8: 0x1021fe8: lw    a3, 28228(v0)
+// 0x01021ff8: 0x1021ff8: lw    a3, 28692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 4
-// 0x01021fec: 0x1021fec: sra   a0, a0, 2
+// 0x01021ffc: 0x1021ffc: sra   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shr
 	stloc.1
-// 0x01021ff0: 0x1021ff0: jal   0x104f290 addiu a2, s1, -20600
+// 0x01022000: 0x1022000: jal   0x104f2a0 addiu a2, s1, -20136
 	ldloc 9
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc.3
 	ldloc.0
@@ -3657,28 +3657,28 @@ L_1021fa0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f290(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f2a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01021ff8: 0x1021ff8: lui   v0, 0x40000
+// 0x01022008: 0x1022008: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-L_1021ffc:
-// 0x01021ffc: 0x1021ffc: lui   s0, 0x0
+L_102200c:
+// 0x0102200c: 0x102200c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01022000: 0x1022000: lw    s2, -20612(v0)
+// 0x01022010: 0x1022010: lw    s2, -20148(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 10
-// 0x01022004: 0x1022004: lw    a1, 6204(s0)
+// 0x01022014: 0x1022014: lw    a1, 6204(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3687,41 +3687,41 @@ L_1021ffc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022008: 0x1022008: lui   s1, 0x40000
+// 0x01022018: 0x1022018: lui   s1, 0x40000
 	ldc.i4 262144
 	stloc 9
-// 0x0102200c: 0x102200c: sltu  v0, s2, a1
+// 0x0102201c: 0x102201c: sltu  v0, s2, a1
 	ldloc 10
 	ldloc.2
 	clt.un
 	stloc 5
-// 0x01022010: 0x1022010: beq   v0, zero, 0x1022034 addiu s1, s1, -20600
+// 0x01022020: 0x1022020: beq   v0, zero, 0x1022044 addiu s1, s1, -20136
 	ldloc 5
 	ldloc 9
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 9
-	brfalse L_1022034
+	brfalse L_1022044
 // --- basic block ---
-// 0x01022018: 0x1022018: subu  s2, a1, s2
+// 0x01022028: 0x1022028: subu  s2, a1, s2
 	ldloc.2
 	ldloc 10
 	sub
 	stloc 10
-// 0x0102201c: 0x102201c: sra   s2, s2, 3
+// 0x0102202c: 0x102202c: sra   s2, s2, 3
 	ldloc 10
 	ldc.i4.3
 	shr
 	stloc 10
-// 0x01022020: 0x1022020: sll   s2, s2, 3
+// 0x01022030: 0x1022030: sll   s2, s2, 3
 	ldloc 10
 	ldc.i4.3
 	shl
 	stloc 10
-// 0x01022024: 0x1022024: addu  a0, s1, zero
+// 0x01022034: 0x1022034: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01022028: 0x1022028: jal   0x100186c addu  a2, s2, zero
+// 0x01022038: 0x1022038: jal   0x100186c addu  a2, s2, zero
 	ldloc 10
 	stloc.3
 	ldloc.1
@@ -3733,44 +3733,44 @@ L_1021ffc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022030: 0x1022030: addu  s1, s1, s2
+// 0x01022040: 0x1022040: addu  s1, s1, s2
 	ldloc 9
 	ldloc 10
 	add
 	stloc 9
-L_1022034:
-// 0x01022034: 0x1022034: lui   v1, 0x30000
+L_1022044:
+// 0x01022044: 0x1022044: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x01022038: 0x1022038: addiu v1, v1, 28540
+// 0x01022048: 0x1022048: addiu v1, v1, 29004
 	ldloc 7
-	ldc.i4 28540
+	ldc.i4 29004
 	add
 	stloc 7
-// 0x0102203c: 0x102203c: lui   v0, 0x30000
+// 0x0102204c: 0x102204c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01022040: 0x1022040: sw    v1, 28532(v0)
+// 0x01022050: 0x1022050: sw    v1, 28996(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022044: 0x1022044: lui   v1, 0x40000
+// 0x01022054: 0x1022054: lui   v1, 0x40000
 	ldc.i4 262144
 	stloc 7
-// 0x01022048: 0x1022048: addiu v1, v1, -20600
+// 0x01022058: 0x1022058: addiu v1, v1, -20136
 	ldloc 7
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 7
-// 0x0102204c: 0x102204c: lui   v0, 0x40000
+// 0x0102205c: 0x102205c: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x01022050: 0x1022050: sw    s1, 6204(s0)
+// 0x01022060: 0x1022060: sw    s1, 6204(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3779,18 +3779,18 @@ L_1022034:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01022054: 0x1022054: sw    v1, -20612(v0)
+// 0x01022064: 0x1022064: sw    v1, -20148(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 7
 	stelem.i4
-L_1022058:
-// 0x01022058: 0x1022058: lw    ra, 36(sp)
-// 0x0102205c: 0x102205c: lw    s2, 32(sp)
+L_1022068:
+// 0x01022068: 0x1022068: lw    ra, 36(sp)
+// 0x0102206c: 0x102206c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3799,7 +3799,7 @@ L_1022058:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01022060: 0x1022060: lw    s1, 28(sp)
+// 0x01022070: 0x1022070: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3808,7 +3808,7 @@ L_1022058:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01022064: 0x1022064: lw    s0, 24(sp)
+// 0x01022074: 0x1022074: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3817,7 +3817,7 @@ L_1022058:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01022068: 0x1022068: jr    ra addiu sp, sp, 40
+// 0x01022078: 0x1022078: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3829,7 +3829,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_draw_line_points_1022070(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_draw_line_points_1022080(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s5,int32 s6,int32 s8,int32 s4,int32 s7,int32 lo,int32 ra)
@@ -3894,29 +3894,29 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01022070: 0x1022070: lui   v0, 0xe0000
+// 0x01022080: 0x1022080: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01022074: 0x1022074: lw    v0, 29728(v0)
+// 0x01022084: 0x1022084: lw    v0, 30192(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022078: 0x1022078: addiu sp, sp, -88
+// 0x01022088: 0x1022088: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x0102207c: 0x102207c: addiu v0, v0, 1344
+// 0x0102208c: 0x102208c: addiu v0, v0, 1344
 	ldloc 5
 	ldc.i4 1344
 	add
 	stloc 5
-// 0x01022080: 0x1022080: lw    v1, 8(v0)
+// 0x01022090: 0x1022090: lw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3925,7 +3925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022084: 0x1022084: sw    s5, 68(sp)
+// 0x01022094: 0x1022094: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3934,7 +3934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01022088: 0x1022088: sw    s4, 64(sp)
+// 0x01022098: 0x1022098: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3943,7 +3943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102208c: 0x102208c: sw    s2, 56(sp)
+// 0x0102209c: 0x102209c: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3952,7 +3952,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01022090: 0x1022090: sw    s1, 52(sp)
+// 0x010220a0: 0x10220a0: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3961,7 +3961,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01022094: 0x1022094: sw    s0, 48(sp)
+// 0x010220a4: 0x10220a4: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3970,8 +3970,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01022098: 0x1022098: sw    ra, 84(sp)
-// 0x0102209c: 0x102209c: sw    s8, 80(sp)
+// 0x010220a8: 0x10220a8: sw    ra, 84(sp)
+// 0x010220ac: 0x10220ac: sw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3980,7 +3980,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010220a0: 0x10220a0: sw    s7, 76(sp)
+// 0x010220b0: 0x10220b0: sw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3989,7 +3989,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010220a4: 0x10220a4: sw    s6, 72(sp)
+// 0x010220b4: 0x10220b4: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3998,7 +3998,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010220a8: 0x10220a8: sw    s3, 60(sp)
+// 0x010220b8: 0x10220b8: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4007,16 +4007,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010220ac: 0x10220ac: addu  s0, a0, zero
+// 0x010220bc: 0x10220bc: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010220b0: 0x10220b0: addu  s4, a1, zero
+// 0x010220c0: 0x10220c0: addu  s4, a1, zero
 	ldloc.2
 	stloc 15
-// 0x010220b4: 0x10220b4: addu  s1, a2, zero
+// 0x010220c4: 0x10220c4: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010220b8: 0x10220b8: lw    s5, 112(sp)
+// 0x010220c8: 0x10220c8: lw    s5, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4025,25 +4025,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010220bc: 0x10220bc: beq   v1, zero, 0x10223a4 addu  s2, a3, zero
+// 0x010220cc: 0x10220cc: beq   v1, zero, 0x10223b4 addu  s2, a3, zero
 	ldloc 7
 	ldloc 4
 	stloc 10
-	brfalse L_10223a4
+	brfalse L_10223b4
 // --- basic block ---
-// 0x010220c4: 0x10220c4: lui   v1, 0xe0000
+// 0x010220d4: 0x10220d4: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010220c8: 0x10220c8: lw    a0, 29604(v1)
+// 0x010220d8: 0x10220d8: lw    a0, 30068(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x010220cc: 0x10220cc: lw    v1, 16(v0)
+// 0x010220dc: 0x10220dc: lw    v1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4052,17 +4052,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010220d0: 0x10220d0: sll   zero, zero, 0
-// 0x010220d4: 0x10220d4: slt   v1, a0, v1
+// 0x010220e0: 0x10220e0: sll   zero, zero, 0
+// 0x010220e4: 0x10220e4: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x010220d8: 0x10220d8: beq   v1, zero, 0x10223a4 sll   zero, zero, 0
+// 0x010220e8: 0x10220e8: beq   v1, zero, 0x10223b4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10223a4
+	brfalse L_10223b4
 // --- basic block ---
-// 0x010220e0: 0x10220e0: lw    v1, 120(v0)
+// 0x010220f0: 0x10220f0: lw    v1, 120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4071,12 +4071,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010220e4: 0x10220e4: sll   zero, zero, 0
-// 0x010220e8: 0x10220e8: beq   v1, zero, 0x10223a4 sll   zero, zero, 0
+// 0x010220f4: 0x10220f4: sll   zero, zero, 0
+// 0x010220f8: 0x10220f8: beq   v1, zero, 0x10223b4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10223a4
+	brfalse L_10223b4
 // --- basic block ---
-// 0x010220f0: 0x10220f0: lw    s3, 48(v0)
+// 0x01022100: 0x1022100: lw    s3, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4085,12 +4085,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010220f4: 0x10220f4: sll   zero, zero, 0
-// 0x010220f8: 0x10220f8: beq   s3, zero, 0x10223a4 sll   zero, zero, 0
+// 0x01022104: 0x1022104: sll   zero, zero, 0
+// 0x01022108: 0x1022108: beq   s3, zero, 0x10223b4 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_10223a4
+	brfalse L_10223b4
 // --- basic block ---
-// 0x01022100: 0x1022100: jal   0x1021f34 lui   s6, 0x30000
+// 0x01022110: 0x1022110: jal   0x1021f44 lui   s6, 0x30000
 	ldc.i4 196608
 	stloc 13
 	ldloc.0
@@ -4098,26 +4098,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022108: 0x1022108: lw    a0, 28416(s6)
+// 0x01022118: 0x1022118: lw    a0, 28880(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7104
+	ldc.i4 7220
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102210c: 0x102210c: sll   zero, zero, 0
-// 0x01022110: 0x1022110: bne   a0, zero, 0x1022140 sll   zero, zero, 0
+// 0x0102211c: 0x102211c: sll   zero, zero, 0
+// 0x01022120: 0x1022120: bne   a0, zero, 0x1022150 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1022140
+	brtrue L_1022150
 // --- basic block ---
-// 0x01022118: 0x1022118: jal   0x104e35c addu  a0, s3, zero
+// 0x01022128: 0x1022128: jal   0x104e36c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4125,23 +4125,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022120: 0x1022120: lui   a0, 0x10000
+// 0x01022130: 0x1022130: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01022124: 0x1022124: addiu a0, a0, -29304
+// 0x01022134: 0x1022134: addiu a0, a0, -29304
 	ldloc.1
 	ldc.i4 -29304
 	add
 	stloc.1
-// 0x01022128: 0x1022128: addu  a1, zero, zero
+// 0x01022138: 0x1022138: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102212c: 0x102212c: jal   0x104ef00 addu  s3, v0, zero
+// 0x0102213c: 0x102213c: jal   0x104ef10 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4149,65 +4149,65 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022134: 0x1022134: sw    v0, 28416(s6)
+// 0x01022144: 0x1022144: sw    v0, 28880(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7104
+	ldc.i4 7220
 	add
 	ldloc 5
 	stelem.i4
-// 0x01022138: 0x1022138: j	 0x1022150 addu  a0, s5, zero
+// 0x01022148: 0x1022148: j	 0x1022160 addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-	br L_1022150
+	br L_1022160
 // --- basic block ---
-L_1022140:
-// 0x01022140: 0x1022140: jal   0x104e35c sll   zero, zero, 0
+L_1022150:
+// 0x01022150: 0x1022150: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022148: 0x1022148: addu  s3, v0, zero
+// 0x01022158: 0x1022158: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0102214c: 0x102214c: addu  a0, s5, zero
+// 0x0102215c: 0x102215c: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-L_1022150:
-// 0x01022150: 0x1022150: jal   0x104edb0 sll   zero, zero, 0
+L_1022160:
+// 0x01022160: 0x1022160: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022158: 0x1022158: bltz  s2, 0x1022338 addiu s8, sp, 32
+// 0x01022168: 0x1022168: bltz  s2, 0x1022348 addiu s8, sp, 32
 	ldloc 10
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 14
 	ldc.i4.s 0
-	blt L_1022338
+	blt L_1022348
 // --- basic block ---
-// 0x01022160: 0x1022160: lw    a0, 4(s0)
+// 0x01022170: 0x1022170: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ L_1022150:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022164: 0x1022164: lw    v0, 4(s1)
+// 0x01022174: 0x1022174: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4225,27 +4225,27 @@ L_1022150:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022168: 0x1022168: lw    a1, 0(s0)
+// 0x01022178: 0x1022178: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0102216c: 0x102216c: lw    v1, 0(s1)
+// 0x0102217c: 0x102217c: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01022170: 0x1022170: lui   s0, 0xe0000
+// 0x01022180: 0x1022180: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x01022174: 0x1022174: addu  s1, s2, zero
+// 0x01022184: 0x1022184: addu  s1, s2, zero
 	ldloc 10
 	stloc 9
-// 0x01022178: 0x1022178: sw    a1, 40(sp)
+// 0x01022188: 0x1022188: sw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4254,7 +4254,7 @@ L_1022150:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102217c: 0x102217c: sw    a0, 44(sp)
+// 0x0102218c: 0x102218c: sw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4263,7 +4263,7 @@ L_1022150:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01022180: 0x1022180: sw    v1, 32(sp)
+// 0x01022190: 0x1022190: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4272,7 +4272,7 @@ L_1022150:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022184: 0x1022184: sw    v0, 36(sp)
+// 0x01022194: 0x1022194: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4281,31 +4281,31 @@ L_1022150:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01022188: 0x1022188: addiu s0, s0, 29604
+// 0x01022198: 0x1022198: addiu s0, s0, 30068
 	ldloc 8
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x0102218c: 0x102218c: sll   s2, s2, 2
+// 0x0102219c: 0x102219c: sll   s2, s2, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x01022190: 0x1022190: lui   s7, 0x0
+// 0x010221a0: 0x10221a0: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x01022194: 0x1022194: lui   s6, 0x0
+// 0x010221a4: 0x10221a4: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01022198: 0x1022198: j	 0x10222fc addiu s5, sp, 24
+// 0x010221a8: 0x10221a8: j	 0x102230c addiu s5, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 12
-	br L_10222fc
+	br L_102230c
 // --- basic block ---
-L_10221a0:
-// 0x010221a0: 0x10221a0: lw    v0, 108(sp)
+L_10221b0:
+// 0x010221b0: 0x10221b0: lw    v0, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4314,17 +4314,17 @@ L_10221a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010221a4: 0x10221a4: sll   zero, zero, 0
-// 0x010221a8: 0x10221a8: bne   v0, zero, 0x1022224 addu  a0, s1, zero
+// 0x010221b4: 0x10221b4: sll   zero, zero, 0
+// 0x010221b8: 0x10221b8: bne   v0, zero, 0x1022234 addu  a0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_1022224
+	brtrue L_1022234
 // --- basic block ---
-// 0x010221b0: 0x10221b0: lui   v1, 0x0
+// 0x010221c0: 0x10221c0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010221b4: 0x10221b4: lw    v0, 576(v1)
+// 0x010221c4: 0x10221c4: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4333,7 +4333,7 @@ L_10221a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010221b8: 0x10221b8: lw    v1, 548(s7)
+// 0x010221c8: 0x10221c8: lw    v1, 548(s7)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -4342,13 +4342,13 @@ L_10221a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010221bc: 0x10221bc: sll   zero, zero, 0
-// 0x010221c0: 0x10221c0: beq   v0, v1, 0x10221d4 sll   zero, zero, 0
+// 0x010221cc: 0x10221cc: sll   zero, zero, 0
+// 0x010221d0: 0x10221d0: beq   v0, v1, 0x10221e4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_10221d4
+	beq  L_10221e4
 // --- basic block ---
-// 0x010221c8: 0x10221c8: jal   0x100ae78 sw    v0, 548(s7)
+// 0x010221d8: 0x10221d8: jal   0x100ae88 sw    v0, 548(s7)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -4362,12 +4362,12 @@ L_10221a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010221d0: 0x10221d0: sw    v0, 552(s6)
+// 0x010221e0: 0x10221e0: sw    v0, 552(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -4376,20 +4376,20 @@ L_10221a0:
 	add
 	ldloc 5
 	stelem.i4
-L_10221d4:
-// 0x010221d4: 0x10221d4: lui   v0, 0x20000
+L_10221e4:
+// 0x010221e4: 0x10221e4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010221d8: 0x10221d8: lw    a0, 31240(v0)
+// 0x010221e8: 0x10221e8: lw    a0, 31704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x010221dc: 0x10221dc: lw    v0, 552(s6)
+// 0x010221ec: 0x10221ec: lw    v0, 552(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -4398,37 +4398,37 @@ L_10221d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010221e0: 0x10221e0: addu  a0, a0, s2
+// 0x010221f0: 0x10221f0: addu  a0, a0, s2
 	ldloc.1
 	ldloc 10
 	add
 	stloc.1
-// 0x010221e4: 0x10221e4: lh    v1, 2(a0)
+// 0x010221f4: 0x10221f4: lh    v1, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x010221e8: 0x10221e8: lh    a0, 0(a0)
+// 0x010221f8: 0x10221f8: lh    a0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x010221ec: 0x10221ec: mult  v1, v0
+// 0x010221fc: 0x10221fc: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 17
-// 0x010221f0: 0x10221f0: mflo  lo
+// 0x01022200: 0x1022200: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x010221f4: 0x10221f4: sll   zero, zero, 0
-// 0x010221f8: 0x10221f8: sll   zero, zero, 0
-// 0x010221fc: 0x10221fc: mult  a0, v0
+// 0x01022204: 0x1022204: sll   zero, zero, 0
+// 0x01022208: 0x1022208: sll   zero, zero, 0
+// 0x0102220c: 0x102220c: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 17
-// 0x01022200: 0x1022200: lw    a0, 36(sp)
+// 0x01022210: 0x1022210: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4437,13 +4437,13 @@ L_10221d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022204: 0x1022204: sll   zero, zero, 0
-// 0x01022208: 0x1022208: addu  v1, a0, v1
+// 0x01022214: 0x1022214: sll   zero, zero, 0
+// 0x01022218: 0x1022218: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0102220c: 0x102220c: lw    a0, 32(sp)
+// 0x0102221c: 0x102221c: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4452,7 +4452,7 @@ L_10221d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022210: 0x1022210: sw    v1, 36(sp)
+// 0x01022220: 0x1022220: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4461,15 +4461,15 @@ L_10221d4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022214: 0x1022214: mflo  lo
+// 0x01022224: 0x1022224: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x01022218: 0x1022218: addu  v0, a0, v0
+// 0x01022228: 0x1022228: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0102221c: 0x102221c: j	 0x102222c sw    v0, 32(sp)
+// 0x0102222c: 0x102222c: j	 0x102223c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4478,10 +4478,10 @@ L_10221d4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_102222c
+	br L_102223c
 // --- basic block ---
-L_1022224:
-// 0x01022224: 0x1022224: jalr  v0 addu  a1, s8, zero
+L_1022234:
+// 0x01022234: 0x1022234: jalr  v0 addu  a1, s8, zero
 	ldloc 5
 	ldloc 14
 	stloc.2
@@ -4495,8 +4495,8 @@ L_1022224:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102222c:
-// 0x0102222c: 0x102222c: lw    v1, 40(sp)
+L_102223c:
+// 0x0102223c: 0x102223c: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4505,7 +4505,7 @@ L_102222c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022230: 0x1022230: lw    v0, 56(s0)
+// 0x01022240: 0x1022240: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4514,17 +4514,17 @@ L_102222c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022234: 0x1022234: sll   zero, zero, 0
-// 0x01022238: 0x1022238: slt   a0, v0, v1
+// 0x01022244: 0x1022244: sll   zero, zero, 0
+// 0x01022248: 0x1022248: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x0102223c: 0x102223c: beq   a0, zero, 0x1022258 sll   zero, zero, 0
+// 0x0102224c: 0x102224c: beq   a0, zero, 0x1022268 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1022258
+	brfalse L_1022268
 // --- basic block ---
-// 0x01022244: 0x1022244: lw    a0, 32(sp)
+// 0x01022254: 0x1022254: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4533,18 +4533,18 @@ L_102222c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022248: 0x1022248: sll   zero, zero, 0
-// 0x0102224c: 0x102224c: slt   v0, v0, a0
+// 0x01022258: 0x1022258: sll   zero, zero, 0
+// 0x0102225c: 0x102225c: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x01022250: 0x1022250: bne   v0, zero, 0x10222e4 sll   zero, zero, 0
+// 0x01022260: 0x1022260: bne   v0, zero, 0x10222f4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10222e4
+	brtrue L_10222f4
 // --- basic block ---
-L_1022258:
-// 0x01022258: 0x1022258: lw    v0, 64(s0)
+L_1022268:
+// 0x01022268: 0x1022268: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4553,17 +4553,17 @@ L_1022258:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102225c: 0x102225c: sll   zero, zero, 0
-// 0x01022260: 0x1022260: slt   v1, v1, v0
+// 0x0102226c: 0x102226c: sll   zero, zero, 0
+// 0x01022270: 0x1022270: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01022264: 0x1022264: beq   v1, zero, 0x1022280 sll   zero, zero, 0
+// 0x01022274: 0x1022274: beq   v1, zero, 0x1022290 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1022280
+	brfalse L_1022290
 // --- basic block ---
-// 0x0102226c: 0x102226c: lw    v1, 32(sp)
+// 0x0102227c: 0x102227c: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4572,18 +4572,18 @@ L_1022258:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022270: 0x1022270: sll   zero, zero, 0
-// 0x01022274: 0x1022274: slt   v0, v1, v0
+// 0x01022280: 0x1022280: sll   zero, zero, 0
+// 0x01022284: 0x1022284: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01022278: 0x1022278: bne   v0, zero, 0x10222e4 sll   zero, zero, 0
+// 0x01022288: 0x1022288: bne   v0, zero, 0x10222f4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10222e4
+	brtrue L_10222f4
 // --- basic block ---
-L_1022280:
-// 0x01022280: 0x1022280: lw    v1, 44(sp)
+L_1022290:
+// 0x01022290: 0x1022290: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4592,7 +4592,7 @@ L_1022280:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022284: 0x1022284: lw    v0, 60(s0)
+// 0x01022294: 0x1022294: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4601,17 +4601,17 @@ L_1022280:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022288: 0x1022288: sll   zero, zero, 0
-// 0x0102228c: 0x102228c: slt   a0, v0, v1
+// 0x01022298: 0x1022298: sll   zero, zero, 0
+// 0x0102229c: 0x102229c: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x01022290: 0x1022290: beq   a0, zero, 0x10222ac sll   zero, zero, 0
+// 0x010222a0: 0x10222a0: beq   a0, zero, 0x10222bc sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10222ac
+	brfalse L_10222bc
 // --- basic block ---
-// 0x01022298: 0x1022298: lw    a0, 36(sp)
+// 0x010222a8: 0x10222a8: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4620,18 +4620,18 @@ L_1022280:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102229c: 0x102229c: sll   zero, zero, 0
-// 0x010222a0: 0x10222a0: slt   v0, v0, a0
+// 0x010222ac: 0x10222ac: sll   zero, zero, 0
+// 0x010222b0: 0x10222b0: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010222a4: 0x10222a4: bne   v0, zero, 0x10222e4 sll   zero, zero, 0
+// 0x010222b4: 0x10222b4: bne   v0, zero, 0x10222f4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10222e4
+	brtrue L_10222f4
 // --- basic block ---
-L_10222ac:
-// 0x010222ac: 0x10222ac: lw    v0, 68(s0)
+L_10222bc:
+// 0x010222bc: 0x10222bc: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4640,21 +4640,21 @@ L_10222ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010222b0: 0x10222b0: sll   zero, zero, 0
-// 0x010222b4: 0x10222b4: slt   v1, v1, v0
+// 0x010222c0: 0x10222c0: sll   zero, zero, 0
+// 0x010222c4: 0x10222c4: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x010222b8: 0x10222b8: beq   v1, zero, 0x1022384 addiu a0, sp, 40
+// 0x010222c8: 0x10222c8: beq   v1, zero, 0x1022394 addiu a0, sp, 40
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	brfalse L_1022384
+	brfalse L_1022394
 // --- basic block ---
-// 0x010222c0: 0x10222c0: lw    v1, 36(sp)
+// 0x010222d0: 0x10222d0: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4663,23 +4663,23 @@ L_10222ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010222c4: 0x10222c4: sll   zero, zero, 0
-// 0x010222c8: 0x10222c8: slt   v0, v1, v0
+// 0x010222d4: 0x10222d4: sll   zero, zero, 0
+// 0x010222d8: 0x10222d8: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010222cc: 0x10222cc: bne   v0, zero, 0x10222e4 addu  a1, s8, zero
+// 0x010222dc: 0x10222dc: bne   v0, zero, 0x10222f4 addu  a1, s8, zero
 	ldloc 5
 	ldloc 14
 	stloc.2
-	brtrue L_10222e4
+	brtrue L_10222f4
 // --- basic block ---
-// 0x010222d4: 0x10222d4: j	 0x1022388 sll   zero, zero, 0
-	br L_1022388
+// 0x010222e4: 0x10222e4: j	 0x1022398 sll   zero, zero, 0
+	br L_1022398
 // --- basic block ---
-L_10222dc:
-// 0x010222dc: 0x10222dc: jal   0x1021c4c addu  a1, s5, zero
+L_10222ec:
+// 0x010222ec: 0x10222ec: jal   0x1021c5c addu  a1, s5, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -4687,13 +4687,13 @@ L_10222dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_draw_points_1021c4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_draw_points_1021c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10222e4:
-// 0x010222e4: 0x10222e4: lw    v0, 32(sp)
+L_10222f4:
+// 0x010222f4: 0x10222f4: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4702,12 +4702,12 @@ L_10222e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010222e8: 0x10222e8: addiu s1, s1, 1
+// 0x010222f8: 0x10222f8: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010222ec: 0x10222ec: sw    v0, 40(sp)
+// 0x010222fc: 0x10222fc: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4716,7 +4716,7 @@ L_10222e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010222f0: 0x10222f0: lw    v0, 36(sp)
+// 0x01022300: 0x1022300: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4725,12 +4725,12 @@ L_10222e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010222f4: 0x10222f4: addiu s2, s2, 4
+// 0x01022304: 0x1022304: addiu s2, s2, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-// 0x010222f8: 0x10222f8: sw    v0, 44(sp)
+// 0x01022308: 0x1022308: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4739,8 +4739,8 @@ L_10222e4:
 	add
 	ldloc 5
 	stelem.i4
-L_10222fc:
-// 0x010222fc: 0x10222fc: lw    v1, 104(sp)
+L_102230c:
+// 0x0102230c: 0x102230c: lw    v1, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4749,37 +4749,37 @@ L_10222fc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022300: 0x1022300: sll   zero, zero, 0
-// 0x01022304: 0x1022304: slt   v0, v1, s1
+// 0x01022310: 0x1022310: sll   zero, zero, 0
+// 0x01022314: 0x1022314: slt   v0, v1, s1
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 5
-// 0x01022308: 0x1022308: beq   v0, zero, 0x10221a0 addu  a1, s4, zero
+// 0x01022318: 0x1022318: beq   v0, zero, 0x10221b0 addu  a1, s4, zero
 	ldloc 5
 	ldloc 15
 	stloc.2
-	brfalse L_10221a0
+	brfalse L_10221b0
 // --- basic block ---
-// 0x01022310: 0x1022310: addiu s0, sp, 24
+// 0x01022320: 0x1022320: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01022314: 0x1022314: addiu s1, sp, 16
+// 0x01022324: 0x1022324: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x01022318: 0x1022318: addiu a0, sp, 40
+// 0x01022328: 0x1022328: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0102231c: 0x102231c: addu  a2, s1, zero
+// 0x0102232c: 0x102232c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x01022320: 0x1022320: jal   0x1008f78 addu  a3, s0, zero
+// 0x01022330: 0x1022330: jal   0x1008f88 addu  a3, s0, zero
 	ldloc 8
 	stloc 4
 	ldloc.0
@@ -4787,43 +4787,43 @@ L_10222fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022328: 0x1022328: beq   v0, zero, 0x1022368 addu  a0, s1, zero
+// 0x01022338: 0x1022338: beq   v0, zero, 0x1022378 addu  a0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_1022368
+	brfalse L_1022378
 // --- basic block ---
-// 0x01022330: 0x1022330: j	 0x1022360 addu  a1, s0, zero
+// 0x01022340: 0x1022340: j	 0x1022370 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-	br L_1022360
+	br L_1022370
 // --- basic block ---
-L_1022338:
-// 0x01022338: 0x1022338: addiu s1, sp, 24
+L_1022348:
+// 0x01022348: 0x1022348: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x0102233c: 0x102233c: addiu s2, sp, 16
+// 0x0102234c: 0x102234c: addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-// 0x01022340: 0x1022340: addu  a0, s0, zero
+// 0x01022350: 0x1022350: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01022344: 0x1022344: addu  a1, s4, zero
+// 0x01022354: 0x1022354: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x01022348: 0x1022348: addu  a2, s2, zero
+// 0x01022358: 0x1022358: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x0102234c: 0x102234c: jal   0x1008f78 addu  a3, s1, zero
+// 0x0102235c: 0x102235c: jal   0x1008f88 addu  a3, s1, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -4831,45 +4831,45 @@ L_1022338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022354: 0x1022354: beq   v0, zero, 0x1022368 addu  a0, s2, zero
+// 0x01022364: 0x1022364: beq   v0, zero, 0x1022378 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brfalse L_1022368
+	brfalse L_1022378
 // --- basic block ---
-// 0x0102235c: 0x102235c: addu  a1, s1, zero
+// 0x0102236c: 0x102236c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-L_1022360:
-// 0x01022360: 0x1022360: jal   0x1021c4c sll   zero, zero, 0
+L_1022370:
+// 0x01022370: 0x1022370: jal   0x1021c5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_draw_points_1021c4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_draw_points_1021c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1022368:
-// 0x01022368: 0x1022368: jal   0x1021f34 sll   zero, zero, 0
+L_1022378:
+// 0x01022378: 0x1022378: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022370: 0x1022370: jal   0x104e35c addu  a0, s3, zero
+// 0x01022380: 0x1022380: jal   0x104e36c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4877,36 +4877,36 @@ L_1022368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022378: 0x1022378: lui   v0, 0x30000
+// 0x01022388: 0x1022388: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102237c: 0x102237c: j	 0x10223a4 sw    zero, 28268(v0)
+// 0x0102238c: 0x102238c: j	 0x10223b4 sw    zero, 28732(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10223a4
+	br L_10223b4
 // --- basic block ---
-L_1022384:
-// 0x01022384: 0x1022384: addu  a1, s8, zero
+L_1022394:
+// 0x01022394: 0x1022394: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-L_1022388:
-// 0x01022388: 0x1022388: addiu a2, sp, 16
+L_1022398:
+// 0x01022398: 0x1022398: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x0102238c: 0x102238c: jal   0x1008f78 addu  a3, s5, zero
+// 0x0102239c: 0x102239c: jal   0x1008f88 addu  a3, s5, zero
 	ldloc 12
 	stloc 4
 	ldloc.0
@@ -4914,25 +4914,25 @@ L_1022388:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_get_visible_coordinates_1008f88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022394: 0x1022394: beq   v0, zero, 0x10222e4 addiu a0, sp, 16
+// 0x010223a4: 0x10223a4: beq   v0, zero, 0x10222f4 addiu a0, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	brfalse L_10222e4
+	brfalse L_10222f4
 // --- basic block ---
-// 0x0102239c: 0x102239c: j	 0x10222dc sll   zero, zero, 0
-	br L_10222dc
+// 0x010223ac: 0x10223ac: j	 0x10222ec sll   zero, zero, 0
+	br L_10222ec
 // --- basic block ---
-L_10223a4:
-// 0x010223a4: 0x10223a4: lw    ra, 84(sp)
-// 0x010223a8: 0x10223a8: lw    s8, 80(sp)
+L_10223b4:
+// 0x010223b4: 0x10223b4: lw    ra, 84(sp)
+// 0x010223b8: 0x10223b8: lw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4941,7 +4941,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010223ac: 0x10223ac: lw    s7, 76(sp)
+// 0x010223bc: 0x10223bc: lw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4950,7 +4950,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010223b0: 0x10223b0: lw    s6, 72(sp)
+// 0x010223c0: 0x10223c0: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4959,7 +4959,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010223b4: 0x10223b4: lw    s5, 68(sp)
+// 0x010223c4: 0x10223c4: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4968,7 +4968,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010223b8: 0x10223b8: lw    s4, 64(sp)
+// 0x010223c8: 0x10223c8: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4977,7 +4977,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010223bc: 0x10223bc: lw    s3, 60(sp)
+// 0x010223cc: 0x10223cc: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4986,7 +4986,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010223c0: 0x10223c0: lw    s2, 56(sp)
+// 0x010223d0: 0x10223d0: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4995,7 +4995,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010223c4: 0x10223c4: lw    s1, 52(sp)
+// 0x010223d4: 0x10223d4: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5004,7 +5004,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010223c8: 0x10223c8: lw    s0, 48(sp)
+// 0x010223d8: 0x10223d8: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5013,7 +5013,7 @@ L_10223a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010223cc: 0x10223cc: jr    ra addiu sp, sp, 88
+// 0x010223dc: 0x10223dc: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -5025,7 +5025,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -5066,12 +5066,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010223d4: 0x10223d4: addiu sp, sp, -32
+// 0x010223e4: 0x10223e4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010223d8: 0x10223d8: sw    s1, 24(sp)
+// 0x010223e8: 0x10223e8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5080,10 +5080,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010223dc: 0x10223dc: lui   s1, 0x40000
+// 0x010223ec: 0x10223ec: lui   s1, 0x40000
 	ldc.i4 262144
 	stloc 7
-// 0x010223e0: 0x10223e0: sw    s0, 20(sp)
+// 0x010223f0: 0x10223f0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5092,39 +5092,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010223e4: 0x10223e4: lw    a0, 28552(s1)
+// 0x010223f4: 0x10223f4: lw    a0, 29016(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7138
+	ldc.i4 7254
 	add
 	ldelem.i4
 	stloc.1
-// 0x010223e8: 0x10223e8: lui   s0, 0x40000
+// 0x010223f8: 0x10223f8: lui   s0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x010223ec: 0x10223ec: addiu s0, s0, 28564
+// 0x010223fc: 0x10223fc: addiu s0, s0, 29028
 	ldloc 5
-	ldc.i4 28564
+	ldc.i4 29028
 	add
 	stloc 5
-// 0x010223f0: 0x10223f0: beq   a0, s0, 0x1022420 sw    ra, 28(sp)
+// 0x01022400: 0x1022400: beq   a0, s0, 0x1022430 sw    ra, 28(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_1022420
+	beq  L_1022430
 // --- basic block ---
-// 0x010223f8: 0x10223f8: subu  a0, a0, s0
+// 0x01022408: 0x1022408: subu  a0, a0, s0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x010223fc: 0x10223fc: sra   a0, a0, 3
+// 0x0102240c: 0x102240c: sra   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-// 0x01022400: 0x1022400: jal   0x10072a4 addu  a1, s0, zero
+// 0x01022410: 0x1022410: jal   0x10072b4 addu  a1, s0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5132,29 +5132,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01022408: 0x1022408: lw    a0, 28552(s1)
+// 0x01022418: 0x1022418: lw    a0, 29016(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7138
+	ldc.i4 7254
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102240c: 0x102240c: addu  a1, s0, zero
+// 0x0102241c: 0x102241c: addu  a1, s0, zero
 	ldloc 5
 	stloc.2
-// 0x01022410: 0x1022410: subu  a0, a0, s0
+// 0x01022420: 0x1022420: subu  a0, a0, s0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x01022414: 0x1022414: jal   0x104de2c sra   a0, a0, 3
+// 0x01022424: 0x1022424: jal   0x104de3c sra   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shr
@@ -5163,23 +5163,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_draw_multiple_points_104de2c(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_draw_multiple_points_104de3c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0102241c: 0x102241c: sw    s0, 28552(s1)
+// 0x0102242c: 0x102242c: sw    s0, 29016(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7138
+	ldc.i4 7254
 	add
 	ldloc 5
 	stelem.i4
-L_1022420:
-// 0x01022420: 0x1022420: lw    ra, 28(sp)
-// 0x01022424: 0x1022424: lw    s1, 24(sp)
+L_1022430:
+// 0x01022430: 0x1022430: lw    ra, 28(sp)
+// 0x01022434: 0x1022434: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5188,7 +5188,7 @@ L_1022420:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022428: 0x1022428: lw    s0, 20(sp)
+// 0x01022438: 0x1022438: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5197,7 +5197,7 @@ L_1022420:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102242c: 0x102242c: jr    ra addiu sp, sp, 32
+// 0x0102243c: 0x102243c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5209,7 +5209,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_screen_flush_lines_and_points_1022434(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_flush_lines_and_points_1022444(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -5244,37 +5244,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01022434: 0x1022434: addiu sp, sp, -24
+// 0x01022444: 0x1022444: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01022438: 0x1022438: sw    ra, 20(sp)
-// 0x0102243c: 0x102243c: jal   0x1021f34 sll   zero, zero, 0
+// 0x01022448: 0x1022448: sw    ra, 20(sp)
+// 0x0102244c: 0x102244c: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01022444: 0x1022444: jal   0x10223d4 sll   zero, zero, 0
+// 0x01022454: 0x1022454: jal   0x10223e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102244c: 0x102244c: lw    ra, 20(sp)
-// 0x01022450: 0x1022450: sll   zero, zero, 0
-// 0x01022454: 0x1022454: jr    ra addiu sp, sp, 24
+// 0x0102245c: 0x102245c: lw    ra, 20(sp)
+// 0x01022460: 0x1022460: sll   zero, zero, 0
+// 0x01022464: 0x1022464: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5286,7 +5286,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_add_segment_point_102245c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_add_segment_point_102246c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s3,int32 s0,int32 s4,int32 s2,int32 ra,int32 t0)
@@ -5339,12 +5339,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102245c: 0x102245c: addiu sp, sp, -40
+// 0x0102246c: 0x102246c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01022460: 0x1022460: sw    s4, 32(sp)
+// 0x01022470: 0x1022470: sw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5353,7 +5353,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01022464: 0x1022464: sw    s3, 28(sp)
+// 0x01022474: 0x1022474: sw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5362,7 +5362,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01022468: 0x1022468: sw    s2, 24(sp)
+// 0x01022478: 0x1022478: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5371,7 +5371,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102246c: 0x102246c: sw    s1, 20(sp)
+// 0x0102247c: 0x102247c: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5380,7 +5380,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01022470: 0x1022470: sw    s0, 16(sp)
+// 0x01022480: 0x1022480: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5389,17 +5389,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01022474: 0x1022474: sw    ra, 36(sp)
-// 0x01022478: 0x1022478: addu  s0, a0, zero
+// 0x01022484: 0x1022484: sw    ra, 36(sp)
+// 0x01022488: 0x1022488: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0102247c: 0x102247c: addu  s1, a1, zero
+// 0x0102248c: 0x102248c: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01022480: 0x1022480: addu  s2, a2, zero
+// 0x01022490: 0x1022490: addu  s2, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01022484: 0x1022484: lw    s3, 56(sp)
+// 0x01022494: 0x1022494: lw    s3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5408,45 +5408,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01022488: 0x1022488: beq   a0, zero, 0x1022570 addu  s4, a3, zero
+// 0x01022498: 0x1022498: beq   a0, zero, 0x1022580 addu  s4, a3, zero
 	ldloc.1
 	ldloc 4
 	stloc 11
-	brfalse L_1022570
+	brfalse L_1022580
 // --- basic block ---
-// 0x01022490: 0x1022490: lui   v0, 0x30000
+// 0x010224a0: 0x10224a0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01022494: 0x1022494: lw    v1, 28256(v0)
+// 0x010224a4: 0x10224a4: lw    v1, 28720(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022498: 0x1022498: addiu v0, zero, 1
+// 0x010224a8: 0x10224a8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102249c: 0x102249c: bne   v1, v0, 0x10224f8 andi  v0, s3, 4
+// 0x010224ac: 0x10224ac: bne   v1, v0, 0x1022508 andi  v0, s3, 4
 	ldloc 6
 	ldloc 5
 	ldloc 9
 	ldc.i4.4
 	and
 	stloc 5
-	bne.un L_10224f8
+	bne.un L_1022508
 // --- basic block ---
-// 0x010224a4: 0x10224a4: lui   a1, 0x30000
+// 0x010224b4: 0x10224b4: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x010224a8: 0x10224a8: addiu a1, a1, 28488
+// 0x010224b8: 0x10224b8: addiu a1, a1, 28952
 	ldloc.2
-	ldc.i4 28488
+	ldc.i4 28952
 	add
 	stloc.2
-// 0x010224ac: 0x10224ac: jal   0x1009694 addiu a2, zero, 1
+// 0x010224bc: 0x10224bc: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5454,113 +5454,113 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010224b4: 0x10224b4: lui   a0, 0x30000
+// 0x010224c4: 0x10224c4: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x010224b8: 0x10224b8: addiu a0, a0, 28496
+// 0x010224c8: 0x10224c8: addiu a0, a0, 28960
 	ldloc.1
-	ldc.i4 28496
+	ldc.i4 28960
 	add
 	stloc.1
-// 0x010224bc: 0x10224bc: addu  v1, zero, zero
+// 0x010224cc: 0x10224cc: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010224c0: 0x10224c0: addiu a1, zero, 5
+// 0x010224d0: 0x10224d0: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-L_10224c4:
-// 0x010224c4: 0x10224c4: beq   v1, s2, 0x10224ec sll   zero, zero, 0
+L_10224d4:
+// 0x010224d4: 0x10224d4: beq   v1, s2, 0x10224fc sll   zero, zero, 0
 	ldloc 6
 	ldloc 12
-	beq  L_10224ec
+	beq  L_10224fc
 // --- basic block ---
-// 0x010224cc: 0x10224cc: lw    a2, 0(a0)
+// 0x010224dc: 0x10224dc: lw    a2, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010224d0: 0x10224d0: sll   zero, zero, 0
-// 0x010224d4: 0x10224d4: slt   a2, v0, a2
+// 0x010224e0: 0x10224e0: sll   zero, zero, 0
+// 0x010224e4: 0x10224e4: slt   a2, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc.3
-// 0x010224d8: 0x10224d8: bne   a2, zero, 0x10224ec addiu a0, a0, 4
+// 0x010224e8: 0x10224e8: bne   a2, zero, 0x10224fc addiu a0, a0, 4
 	ldloc.3
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-	brtrue L_10224ec
+	brtrue L_10224fc
 // --- basic block ---
-// 0x010224e0: 0x10224e0: addiu v1, v1, 1
+// 0x010224f0: 0x10224f0: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010224e4: 0x10224e4: bne   v1, a1, 0x10224c4 sll   zero, zero, 0
+// 0x010224f4: 0x10224f4: bne   v1, a1, 0x10224d4 sll   zero, zero, 0
 	ldloc 6
 	ldloc.2
-	bne.un L_10224c4
+	bne.un L_10224d4
 // --- basic block ---
-L_10224ec:
-// 0x010224ec: 0x10224ec: sll   v1, v1, 2
+L_10224fc:
+// 0x010224fc: 0x10224fc: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010224f0: 0x10224f0: addu  s1, s1, v1
+// 0x01022500: 0x1022500: addu  s1, s1, v1
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x010224f4: 0x10224f4: andi  v0, s3, 4
+// 0x01022504: 0x1022504: andi  v0, s3, 4
 	ldloc 9
 	ldc.i4.4
 	and
 	stloc 5
-L_10224f8:
-// 0x010224f8: 0x10224f8: lw    s1, 0(s1)
+L_1022508:
+// 0x01022508: 0x1022508: lw    s1, 0(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010224fc: 0x10224fc: beq   v0, zero, 0x1022550 lui   v1, 0x0
+// 0x0102250c: 0x102250c: beq   v0, zero, 0x1022560 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1022550
+	brfalse L_1022560
 // --- basic block ---
-// 0x01022504: 0x1022504: beq   s1, zero, 0x10226a8 lui   v0, 0x40000
+// 0x01022514: 0x1022514: beq   s1, zero, 0x10226b8 lui   v0, 0x40000
 	ldloc 8
 	ldc.i4 262144
 	stloc 5
-	brfalse L_10226a8
+	brfalse L_10226b8
 // --- basic block ---
-// 0x0102250c: 0x102250c: addiu a0, v0, 28552
+// 0x0102251c: 0x102251c: addiu a0, v0, 29016
 	ldloc 5
-	ldc.i4 28552
+	ldc.i4 29016
 	add
 	stloc.1
-// 0x01022510: 0x1022510: lw    v1, 28552(v0)
+// 0x01022520: 0x1022520: lw    v1, 29016(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7138
+	ldc.i4 7254
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022514: 0x1022514: lw    v0, 4(a0)
+// 0x01022524: 0x1022524: lw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5569,62 +5569,62 @@ L_10224f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022518: 0x1022518: sll   zero, zero, 0
-// 0x0102251c: 0x102251c: sltu  v0, v1, v0
+// 0x01022528: 0x1022528: sll   zero, zero, 0
+// 0x0102252c: 0x102252c: sltu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01022520: 0x1022520: bne   v0, zero, 0x1022534 lui   v1, 0x40000
+// 0x01022530: 0x1022530: bne   v0, zero, 0x1022544 lui   v1, 0x40000
 	ldloc 5
 	ldc.i4 262144
 	stloc 6
-	brtrue L_1022534
+	brtrue L_1022544
 // --- basic block ---
-// 0x01022528: 0x1022528: jal   0x10223d4 sll   zero, zero, 0
+// 0x01022538: 0x1022538: jal   0x10223e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01022530: 0x1022530: lui   v1, 0x40000
+// 0x01022540: 0x1022540: lui   v1, 0x40000
 	ldc.i4 262144
 	stloc 6
-L_1022534:
-// 0x01022534: 0x1022534: lw    v0, 28552(v1)
+L_1022544:
+// 0x01022544: 0x1022544: lw    v0, 29016(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7138
+	ldc.i4 7254
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022538: 0x1022538: lw    a0, 0(s0)
+// 0x01022548: 0x1022548: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102253c: 0x102253c: addiu a1, v0, 8
+// 0x0102254c: 0x102254c: addiu a1, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc.2
-// 0x01022540: 0x1022540: sw    a0, 0(v0)
+// 0x01022550: 0x1022550: sw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01022544: 0x1022544: lw    a0, 4(s0)
+// 0x01022554: 0x1022554: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5633,19 +5633,19 @@ L_1022534:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022548: 0x1022548: j	 0x1022568 sw    a1, 28552(v1)
+// 0x01022558: 0x1022558: j	 0x1022578 sw    a1, 29016(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7138
+	ldc.i4 7254
 	add
 	ldloc.2
 	stelem.i4
-	br L_1022568
+	br L_1022578
 // --- basic block ---
-L_1022550:
-// 0x01022550: 0x1022550: lw    v0, 6204(v1)
+L_1022560:
+// 0x01022560: 0x1022560: lw    v0, 6204(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5654,26 +5654,26 @@ L_1022550:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022554: 0x1022554: lw    a0, 0(s0)
+// 0x01022564: 0x1022564: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01022558: 0x1022558: addiu a1, v0, 8
+// 0x01022568: 0x1022568: addiu a1, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc.2
-// 0x0102255c: 0x102255c: sw    a0, 0(v0)
+// 0x0102256c: 0x102256c: sw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01022560: 0x1022560: lw    a0, 4(s0)
+// 0x01022570: 0x1022570: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5682,7 +5682,7 @@ L_1022550:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022564: 0x1022564: sw    a1, 6204(v1)
+// 0x01022574: 0x1022574: sw    a1, 6204(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5691,8 +5691,8 @@ L_1022550:
 	add
 	ldloc.2
 	stelem.i4
-L_1022568:
-// 0x01022568: 0x1022568: j	 0x1022578 sw    a0, 4(v0)
+L_1022578:
+// 0x01022578: 0x1022578: j	 0x1022588 sw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5701,97 +5701,97 @@ L_1022568:
 	add
 	ldloc.1
 	stelem.i4
-	br L_1022578
+	br L_1022588
 // --- basic block ---
-L_1022570:
-// 0x01022570: 0x1022570: lui   v0, 0x30000
+L_1022580:
+// 0x01022580: 0x1022580: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01022574: 0x1022574: lw    s1, 28268(v0)
+// 0x01022584: 0x1022584: lw    s1, 28732(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldelem.i4
 	stloc 8
-L_1022578:
-// 0x01022578: 0x1022578: lui   v0, 0x30000
+L_1022588:
+// 0x01022588: 0x1022588: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102257c: 0x102257c: lw    v0, 28268(v0)
+// 0x0102258c: 0x102258c: lw    v0, 28732(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022580: 0x1022580: sll   zero, zero, 0
-// 0x01022584: 0x1022584: bne   v0, s1, 0x10225b4 andi  v1, s3, 2
+// 0x01022590: 0x1022590: sll   zero, zero, 0
+// 0x01022594: 0x1022594: bne   v0, s1, 0x10225c4 andi  v1, s3, 2
 	ldloc 5
 	ldloc 8
 	ldloc 9
 	ldc.i4.2
 	and
 	stloc 6
-	bne.un L_10225b4
+	bne.un L_10225c4
 // --- basic block ---
-// 0x0102258c: 0x102258c: bne   v1, zero, 0x10225b4 lui   v1, 0x30000
+// 0x0102259c: 0x102259c: bne   v1, zero, 0x10225c4 lui   v1, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc 6
-	brtrue L_10225b4
+	brtrue L_10225c4
 // --- basic block ---
-// 0x01022594: 0x1022594: lw    v1, 28424(v1)
+// 0x010225a4: 0x10225a4: lw    v1, 28888(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7106
+	ldc.i4 7222
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022598: 0x1022598: sll   zero, zero, 0
-// 0x0102259c: 0x102259c: bne   v1, s4, 0x10225b4 lui   v1, 0x30000
+// 0x010225a8: 0x10225a8: sll   zero, zero, 0
+// 0x010225ac: 0x10225ac: bne   v1, s4, 0x10225c4 lui   v1, 0x30000
 	ldloc 6
 	ldloc 11
 	ldc.i4 196608
 	stloc 6
-	bne.un L_10225b4
+	bne.un L_10225c4
 // --- basic block ---
-// 0x010225a4: 0x10225a4: lw    a0, 28428(v1)
+// 0x010225b4: 0x10225b4: lw    a0, 28892(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7107
+	ldc.i4 7223
 	add
 	ldelem.i4
 	stloc.1
-// 0x010225a8: 0x10225a8: andi  v1, s3, 8
+// 0x010225b8: 0x10225b8: andi  v1, s3, 8
 	ldloc 9
 	ldc.i4.8
 	and
 	stloc 6
-// 0x010225ac: 0x10225ac: beq   a0, v1, 0x10226a8 sll   zero, zero, 0
+// 0x010225bc: 0x10225bc: beq   a0, v1, 0x10226b8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_10226a8
+	beq  L_10226b8
 // --- basic block ---
-L_10225b4:
-// 0x010225b4: 0x10225b4: beq   v0, zero, 0x10225fc lui   v1, 0x0
+L_10225c4:
+// 0x010225c4: 0x10225c4: beq   v0, zero, 0x102260c lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10225fc
+	brfalse L_102260c
 // --- basic block ---
-// 0x010225bc: 0x10225bc: lui   a1, 0x40000
+// 0x010225cc: 0x10225cc: lui   a1, 0x40000
 	ldc.i4 262144
 	stloc.2
-// 0x010225c0: 0x10225c0: lw    a2, 6204(v1)
+// 0x010225d0: 0x10225d0: lw    a2, 6204(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5800,99 +5800,99 @@ L_10225b4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010225c4: 0x10225c4: lw    a3, -20612(a1)
+// 0x010225d4: 0x10225d4: lw    a3, -20148(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 4
-// 0x010225c8: 0x10225c8: sll   zero, zero, 0
-// 0x010225cc: 0x10225cc: subu  a3, a2, a3
+// 0x010225d8: 0x10225d8: sll   zero, zero, 0
+// 0x010225dc: 0x10225dc: subu  a3, a2, a3
 	ldloc.3
 	ldloc 4
 	sub
 	stloc 4
-// 0x010225d0: 0x10225d0: slti  v1, a3, 16
+// 0x010225e0: 0x10225e0: slti  v1, a3, 16
 	ldloc 4
 	ldc.i4.s 16
 	clt
 	stloc 6
-// 0x010225d4: 0x10225d4: bne   v1, zero, 0x1022600 lui   v1, 0x40000
+// 0x010225e4: 0x10225e4: bne   v1, zero, 0x1022610 lui   v1, 0x40000
 	ldloc 6
 	ldc.i4 262144
 	stloc 6
-	brtrue L_1022600
+	brtrue L_1022610
 // --- basic block ---
-// 0x010225dc: 0x10225dc: lui   a0, 0x30000
+// 0x010225ec: 0x10225ec: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x010225e0: 0x10225e0: lw    v1, 28532(a0)
+// 0x010225f0: 0x10225f0: lw    v1, 28996(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 6
-// 0x010225e4: 0x10225e4: sra   a3, a3, 3
+// 0x010225f4: 0x10225f4: sra   a3, a3, 3
 	ldloc 4
 	ldc.i4.3
 	shr
 	stloc 4
-// 0x010225e8: 0x10225e8: addiu t0, v1, 4
+// 0x010225f8: 0x10225f8: addiu t0, v1, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 14
-// 0x010225ec: 0x10225ec: sw    a2, -20612(a1)
+// 0x010225fc: 0x10225fc: sw    a2, -20148(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc.3
 	stelem.i4
-// 0x010225f0: 0x10225f0: sw    t0, 28532(a0)
+// 0x01022600: 0x1022600: sw    t0, 28996(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc 14
 	stelem.i4
-// 0x010225f4: 0x10225f4: j	 0x102260c sw    a3, 0(v1)
+// 0x01022604: 0x1022604: j	 0x102261c sw    a3, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-	br L_102260c
+	br L_102261c
 // --- basic block ---
-L_10225fc:
-// 0x010225fc: 0x10225fc: lui   v1, 0x40000
+L_102260c:
+// 0x0102260c: 0x102260c: lui   v1, 0x40000
 	ldc.i4 262144
 	stloc 6
-L_1022600:
-// 0x01022600: 0x1022600: lw    a0, -20612(v1)
+L_1022610:
+// 0x01022610: 0x1022610: lw    a0, -20148(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022604: 0x1022604: lui   v1, 0x0
+// 0x01022614: 0x1022614: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01022608: 0x1022608: sw    a0, 6204(v1)
+// 0x01022618: 0x1022618: sw    a0, 6204(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5901,43 +5901,43 @@ L_1022600:
 	add
 	ldloc.1
 	stelem.i4
-L_102260c:
-// 0x0102260c: 0x102260c: beq   v0, s1, 0x1022644 lui   v0, 0x30000
+L_102261c:
+// 0x0102261c: 0x102261c: beq   v0, s1, 0x1022654 lui   v0, 0x30000
 	ldloc 5
 	ldloc 8
 	ldc.i4 196608
 	stloc 5
-	beq  L_1022644
+	beq  L_1022654
 // --- basic block ---
-// 0x01022614: 0x1022614: jal   0x1021f34 sll   zero, zero, 0
+// 0x01022624: 0x1022624: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102261c: 0x102261c: jal   0x10223d4 sll   zero, zero, 0
+// 0x0102262c: 0x102262c: jal   0x10223e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01022624: 0x1022624: beq   s1, zero, 0x1022638 lui   v0, 0x30000
+// 0x01022634: 0x1022634: beq   s1, zero, 0x1022648 lui   v0, 0x30000
 	ldloc 8
 	ldc.i4 196608
 	stloc 5
-	brfalse L_1022638
+	brfalse L_1022648
 // --- basic block ---
-// 0x0102262c: 0x102262c: jal   0x104e35c addu  a0, s1, zero
+// 0x0102263c: 0x102263c: jal   0x104e36c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5945,123 +5945,123 @@ L_102260c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01022634: 0x1022634: lui   v0, 0x30000
+// 0x01022644: 0x1022644: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_1022638:
-// 0x01022638: 0x1022638: andi  v1, s3, 8
+L_1022648:
+// 0x01022648: 0x1022648: andi  v1, s3, 8
 	ldloc 9
 	ldc.i4.8
 	and
 	stloc 6
-// 0x0102263c: 0x102263c: j	 0x1022670 sw    s1, 28268(v0)
+// 0x0102264c: 0x102264c: j	 0x1022680 sw    s1, 28732(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldloc 8
 	stelem.i4
-	br L_1022670
+	br L_1022680
 // --- basic block ---
-L_1022644:
-// 0x01022644: 0x1022644: lw    v0, 28424(v0)
+L_1022654:
+// 0x01022654: 0x1022654: lw    v0, 28888(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7106
+	ldc.i4 7222
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022648: 0x1022648: sll   zero, zero, 0
-// 0x0102264c: 0x102264c: bne   v0, s4, 0x1022664 lui   v0, 0x30000
+// 0x01022658: 0x1022658: sll   zero, zero, 0
+// 0x0102265c: 0x102265c: bne   v0, s4, 0x1022674 lui   v0, 0x30000
 	ldloc 5
 	ldloc 11
 	ldc.i4 196608
 	stloc 5
-	bne.un L_1022664
+	bne.un L_1022674
 // --- basic block ---
-// 0x01022654: 0x1022654: lw    v1, 28428(v0)
+// 0x01022664: 0x1022664: lw    v1, 28892(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7107
+	ldc.i4 7223
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022658: 0x1022658: andi  v0, s3, 8
+// 0x01022668: 0x1022668: andi  v0, s3, 8
 	ldloc 9
 	ldc.i4.8
 	and
 	stloc 5
-// 0x0102265c: 0x102265c: beq   v1, v0, 0x1022680 sll   zero, zero, 0
+// 0x0102266c: 0x102266c: beq   v1, v0, 0x1022690 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_1022680
+	beq  L_1022690
 // --- basic block ---
-L_1022664:
-// 0x01022664: 0x1022664: jal   0x1021f34 sll   zero, zero, 0
+L_1022674:
+// 0x01022674: 0x1022674: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102266c: 0x102266c: andi  v1, s3, 8
+// 0x0102267c: 0x102267c: andi  v1, s3, 8
 	ldloc 9
 	ldc.i4.8
 	and
 	stloc 6
-L_1022670:
-// 0x01022670: 0x1022670: lui   v0, 0x30000
+L_1022680:
+// 0x01022680: 0x1022680: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01022674: 0x1022674: sw    s4, 28424(v0)
+// 0x01022684: 0x1022684: sw    s4, 28888(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7106
+	ldc.i4 7222
 	add
 	ldloc 11
 	stelem.i4
-// 0x01022678: 0x1022678: lui   v0, 0x30000
+// 0x01022688: 0x1022688: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102267c: 0x102267c: sw    v1, 28428(v0)
+// 0x0102268c: 0x102268c: sw    v1, 28892(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7107
+	ldc.i4 7223
 	add
 	ldloc 6
 	stelem.i4
-L_1022680:
-// 0x01022680: 0x1022680: andi  s3, s3, 6
+L_1022690:
+// 0x01022690: 0x1022690: andi  s3, s3, 6
 	ldloc 9
 	ldc.i4.6
 	and
 	stloc 9
-// 0x01022684: 0x1022684: bne   s3, zero, 0x10226a8 lui   v1, 0x0
+// 0x01022694: 0x1022694: bne   s3, zero, 0x10226b8 lui   v1, 0x0
 	ldloc 9
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_10226a8
+	brtrue L_10226b8
 // --- basic block ---
-// 0x0102268c: 0x102268c: lw    v0, 6204(v1)
+// 0x0102269c: 0x102269c: lw    v0, 6204(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6070,26 +6070,26 @@ L_1022680:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022690: 0x1022690: lw    a0, 0(s0)
+// 0x010226a0: 0x10226a0: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01022694: 0x1022694: addiu a1, v0, 8
+// 0x010226a4: 0x10226a4: addiu a1, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc.2
-// 0x01022698: 0x1022698: sw    a0, 0(v0)
+// 0x010226a8: 0x10226a8: sw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0102269c: 0x102269c: lw    a0, 4(s0)
+// 0x010226ac: 0x10226ac: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6098,7 +6098,7 @@ L_1022680:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010226a0: 0x10226a0: sw    a1, 6204(v1)
+// 0x010226b0: 0x10226b0: sw    a1, 6204(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6107,7 +6107,7 @@ L_1022680:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010226a4: 0x10226a4: sw    a0, 4(v0)
+// 0x010226b4: 0x10226b4: sw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6116,9 +6116,9 @@ L_1022680:
 	add
 	ldloc.1
 	stelem.i4
-L_10226a8:
-// 0x010226a8: 0x10226a8: lw    ra, 36(sp)
-// 0x010226ac: 0x10226ac: lw    s4, 32(sp)
+L_10226b8:
+// 0x010226b8: 0x10226b8: lw    ra, 36(sp)
+// 0x010226bc: 0x10226bc: lw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6127,7 +6127,7 @@ L_10226a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010226b0: 0x10226b0: lw    s3, 28(sp)
+// 0x010226c0: 0x10226c0: lw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6136,7 +6136,7 @@ L_10226a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010226b4: 0x10226b4: lw    s2, 24(sp)
+// 0x010226c4: 0x10226c4: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6145,7 +6145,7 @@ L_10226a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010226b8: 0x10226b8: lw    s1, 20(sp)
+// 0x010226c8: 0x10226c8: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6154,7 +6154,7 @@ L_10226a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010226bc: 0x10226bc: lw    s0, 16(sp)
+// 0x010226cc: 0x10226cc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6163,7 +6163,7 @@ L_10226a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010226c0: 0x10226c0: jr    ra addiu sp, sp, 40
+// 0x010226d0: 0x10226d0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6175,7 +6175,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_draw_one_line_internal_10226c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_draw_one_line_internal_10226d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 lo,int32 s0,int32 s1,int32 t1,int32 s4,int32 s3,int32 s6,int32 s2,int32 s5,int32 t0,int32 s8,int32 s7,int32 ra)
@@ -6246,12 +6246,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010226c8: 0x10226c8: addiu sp, sp, -120
+// 0x010226d8: 0x10226d8: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x010226cc: 0x10226cc: sw    s3, 92(sp)
+// 0x010226dc: 0x10226dc: sw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6260,7 +6260,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010226d0: 0x10226d0: lw    s3, 168(sp)
+// 0x010226e0: 0x10226e0: lw    s3, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6269,7 +6269,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010226d4: 0x10226d4: sw    s8, 112(sp)
+// 0x010226e4: 0x10226e4: sw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6278,7 +6278,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010226d8: 0x10226d8: sw    s0, 80(sp)
+// 0x010226e8: 0x10226e8: sw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6287,7 +6287,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010226dc: 0x10226dc: lw    s8, 152(sp)
+// 0x010226ec: 0x10226ec: lw    s8, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6296,7 +6296,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010226e0: 0x10226e0: lw    s0, 160(sp)
+// 0x010226f0: 0x10226f0: lw    s0, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6305,12 +6305,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010226e4: 0x10226e4: sltu  s3, zero, s3
+// 0x010226f4: 0x10226f4: sltu  s3, zero, s3
 	ldc.i4.s 0
 	ldloc 13
 	clt.un
 	stloc 13
-// 0x010226e8: 0x10226e8: sw    s7, 108(sp)
+// 0x010226f8: 0x10226f8: sw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6319,7 +6319,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010226ec: 0x10226ec: sw    s5, 100(sp)
+// 0x010226fc: 0x10226fc: sw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6328,7 +6328,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010226f0: 0x10226f0: sw    s4, 96(sp)
+// 0x01022700: 0x1022700: sw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6337,7 +6337,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010226f4: 0x10226f4: sw    s2, 88(sp)
+// 0x01022704: 0x1022704: sw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6346,11 +6346,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010226f8: 0x10226f8: addu  s4, a0, zero
+// 0x01022708: 0x1022708: addu  s4, a0, zero
 	ldloc.1
 	stloc 12
-// 0x010226fc: 0x10226fc: sw    ra, 116(sp)
-// 0x01022700: 0x1022700: sw    s6, 104(sp)
+// 0x0102270c: 0x102270c: sw    ra, 116(sp)
+// 0x01022710: 0x1022710: sw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6359,7 +6359,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01022704: 0x1022704: sw    s1, 84(sp)
+// 0x01022714: 0x1022714: sw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6368,10 +6368,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01022708: 0x1022708: addu  s2, a1, zero
+// 0x01022718: 0x1022718: addu  s2, a1, zero
 	ldloc.2
 	stloc 15
-// 0x0102270c: 0x102270c: sw    a2, 128(sp)
+// 0x0102271c: 0x102271c: sw    a2, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6380,15 +6380,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01022710: 0x1022710: addu  s5, a3, zero
+// 0x01022720: 0x1022720: addu  s5, a3, zero
 	ldloc 4
 	stloc 16
-// 0x01022714: 0x1022714: sll   s3, s3, 3
+// 0x01022724: 0x1022724: sll   s3, s3, 3
 	ldloc 13
 	ldc.i4.3
 	shl
 	stloc 13
-// 0x01022718: 0x1022718: lw    v0, 136(sp)
+// 0x01022728: 0x1022728: lw    v0, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6397,7 +6397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102271c: 0x102271c: lw    a0, 140(sp)
+// 0x0102272c: 0x102272c: lw    a0, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6406,7 +6406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022720: 0x1022720: lw    s7, 164(sp)
+// 0x01022730: 0x1022730: lw    s7, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6415,35 +6415,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01022724: 0x1022724: beq   s0, zero, 0x1022730 addiu s8, s8, -1
+// 0x01022734: 0x1022734: beq   s0, zero, 0x1022740 addiu s8, s8, -1
 	ldloc 9
 	ldloc 18
 	ldc.i4.m1
 	add
 	stloc 18
-	brfalse L_1022730
+	brfalse L_1022740
 // --- basic block ---
-// 0x0102272c: 0x102272c: sw    zero, 0(s0)
+// 0x0102273c: 0x102273c: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1022730:
-// 0x01022730: 0x1022730: bltz  v0, 0x1022b44 lui   s1, 0x40000
+L_1022740:
+// 0x01022740: 0x1022740: bltz  v0, 0x1022b54 lui   s1, 0x40000
 	ldloc 7
 	ldc.i4 262144
 	stloc 10
 	ldc.i4.s 0
-	blt L_1022b44
+	blt L_1022b54
 // --- basic block ---
-// 0x01022738: 0x1022738: addiu v1, s1, -20612
+// 0x01022748: 0x1022748: addiu v1, s1, -20148
 	ldloc 10
-	ldc.i4 -20612
+	ldc.i4 -20148
 	add
 	stloc 6
-// 0x0102273c: 0x102273c: lw    a1, 8(v1)
+// 0x0102274c: 0x102274c: lw    a1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6452,93 +6452,93 @@ L_1022730:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022740: 0x1022740: lw    a2, -20612(s1)
+// 0x01022750: 0x1022750: lw    a2, -20148(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022744: 0x1022744: subu  v1, a0, v0
+// 0x01022754: 0x1022754: subu  v1, a0, v0
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 6
-// 0x01022748: 0x1022748: subu  a2, a1, a2
+// 0x01022758: 0x1022758: subu  a2, a1, a2
 	ldloc.2
 	ldloc.3
 	sub
 	stloc.3
-// 0x0102274c: 0x102274c: sra   a2, a2, 3
+// 0x0102275c: 0x102275c: sra   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shr
 	stloc.3
-// 0x01022750: 0x1022750: slt   a2, v1, a2
+// 0x01022760: 0x1022760: slt   a2, v1, a2
 	ldloc 6
 	ldloc.3
 	clt
 	stloc.3
-// 0x01022754: 0x1022754: bne   a2, zero, 0x10227c8 sll   zero, zero, 0
+// 0x01022764: 0x1022764: bne   a2, zero, 0x10227d8 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10227c8
+	brtrue L_10227d8
 // --- basic block ---
-// 0x0102275c: 0x102275c: lui   s6, 0x40000
+// 0x0102276c: 0x102276c: lui   s6, 0x40000
 	ldc.i4 262144
 	stloc 14
-// 0x01022760: 0x1022760: addiu s6, s6, -20600
+// 0x01022770: 0x1022770: addiu s6, s6, -20136
 	ldloc 14
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 14
-// 0x01022764: 0x1022764: subu  a1, a1, s6
+// 0x01022774: 0x1022774: subu  a1, a1, s6
 	ldloc.2
 	ldloc 14
 	sub
 	stloc.2
-// 0x01022768: 0x1022768: sra   a1, a1, 3
+// 0x01022778: 0x1022778: sra   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shr
 	stloc.2
-// 0x0102276c: 0x102276c: slt   a1, v1, a1
+// 0x0102277c: 0x102277c: slt   a1, v1, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc.2
-// 0x01022770: 0x1022770: bne   a1, zero, 0x10227b4 lui   a1, 0x10000
+// 0x01022780: 0x1022780: bne   a1, zero, 0x10227c4 lui   a1, 0x10000
 	ldloc.2
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10227b4
+	brtrue L_10227c4
 // --- basic block ---
-// 0x01022778: 0x1022778: lui   a3, 0x10000
+// 0x01022788: 0x1022788: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102277c: 0x102277c: addiu v1, v1, 3
+// 0x0102278c: 0x102278c: addiu v1, v1, 3
 	ldloc 6
 	ldc.i4.3
 	add
 	stloc 6
-// 0x01022780: 0x1022780: addiu a0, zero, 4
+// 0x01022790: 0x1022790: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01022784: 0x1022784: addiu a1, a1, -29532
+// 0x01022794: 0x1022794: addiu a1, a1, -29532
 	ldloc.2
 	ldc.i4 -29532
 	add
 	stloc.2
-// 0x01022788: 0x1022788: addiu a3, a3, -29292
+// 0x01022798: 0x1022798: addiu a3, a3, -29292
 	ldloc 4
 	ldc.i4 -29292
 	add
 	stloc 4
-// 0x0102278c: 0x102278c: addiu a2, zero, 1334
+// 0x0102279c: 0x102279c: addiu a2, zero, 1334
 	ldc.i4 1334
 	stloc.3
-// 0x01022790: 0x1022790: sw    v0, 76(sp)
+// 0x010227a0: 0x10227a0: sw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6547,7 +6547,7 @@ L_1022730:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022794: 0x1022794: jal   0x100449c sw    v1, 16(sp)
+// 0x010227a4: 0x10227a4: jal   0x100449c sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6566,16 +6566,16 @@ L_1022730:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102279c: 0x102279c: lw    a0, -20612(s1)
+// 0x010227ac: 0x10227ac: lw    a0, -20148(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.1
-// 0x010227a0: 0x10227a0: lw    v0, 76(sp)
+// 0x010227b0: 0x10227b0: lw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6584,28 +6584,28 @@ L_1022730:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010227a4: 0x10227a4: subu  a0, s6, a0
+// 0x010227b4: 0x10227b4: subu  a0, s6, a0
 	ldloc 14
 	ldloc.1
 	sub
 	stloc.1
-// 0x010227a8: 0x10227a8: sra   a0, a0, 3
+// 0x010227b8: 0x10227b8: sra   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-// 0x010227ac: 0x10227ac: addiu a0, a0, -3
+// 0x010227bc: 0x10227bc: addiu a0, a0, -3
 	ldloc.1
 	ldc.i4.s -3
 	add
 	stloc.1
-// 0x010227b0: 0x10227b0: addu  a0, a0, v0
+// 0x010227c0: 0x10227c0: addu  a0, a0, v0
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-L_10227b4:
-// 0x010227b4: 0x10227b4: sw    v0, 76(sp)
+L_10227c4:
+// 0x010227c4: 0x10227c4: sw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6614,7 +6614,7 @@ L_10227b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010227b8: 0x10227b8: jal   0x1021f34 sw    a0, 72(sp)
+// 0x010227c8: 0x10227c8: jal   0x1021f44 sw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6628,12 +6628,12 @@ L_10227b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010227c0: 0x10227c0: lw    a0, 72(sp)
+// 0x010227d0: 0x10227d0: lw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6642,7 +6642,7 @@ L_10227b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010227c4: 0x10227c4: lw    v0, 76(sp)
+// 0x010227d4: 0x10227d4: lw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6651,8 +6651,8 @@ L_10227b4:
 	add
 	ldelem.i4
 	stloc 7
-L_10227c8:
-// 0x010227c8: 0x10227c8: lw    v1, 4(s5)
+L_10227d8:
+// 0x010227d8: 0x10227d8: lw    v1, 4(s5)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -6661,19 +6661,19 @@ L_10227c8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010227cc: 0x10227cc: lw    a1, 0(s5)
+// 0x010227dc: 0x10227dc: lw    a1, 0(s5)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010227d0: 0x10227d0: addiu a0, a0, 1
+// 0x010227e0: 0x10227e0: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010227d4: 0x10227d4: sw    a1, 40(sp)
+// 0x010227e4: 0x10227e4: sw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6682,7 +6682,7 @@ L_10227c8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010227d8: 0x10227d8: sw    v1, 44(sp)
+// 0x010227e8: 0x10227e8: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6691,7 +6691,7 @@ L_10227c8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010227dc: 0x10227dc: sw    a0, 52(sp)
+// 0x010227ec: 0x10227ec: sw    a0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6700,38 +6700,38 @@ L_10227c8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010227e0: 0x10227e0: addu  s5, v0, zero
+// 0x010227f0: 0x10227f0: addu  s5, v0, zero
 	ldloc 7
 	stloc 16
-// 0x010227e4: 0x10227e4: lui   s1, 0xe0000
+// 0x010227f4: 0x10227f4: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x010227e8: 0x10227e8: sll   v0, v0, 2
+// 0x010227f8: 0x10227f8: sll   v0, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010227ec: 0x10227ec: addiu v1, zero, -1
+// 0x010227fc: 0x10227fc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010227f0: 0x10227f0: ori   a0, s3, 2
+// 0x01022800: 0x1022800: ori   a0, s3, 2
 	ldloc 13
 	ldc.i4.2
 	or
 	stloc.1
-// 0x010227f4: 0x10227f4: ori   a1, s3, 1
+// 0x01022804: 0x1022804: ori   a1, s3, 1
 	ldloc 13
 	ldc.i4.1
 	or
 	stloc.2
-// 0x010227f8: 0x10227f8: lw    s6, 0(s4)
+// 0x01022808: 0x1022808: lw    s6, 0(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x010227fc: 0x10227fc: sw    v0, 56(sp)
+// 0x0102280c: 0x102280c: sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6740,12 +6740,12 @@ L_10227c8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022800: 0x1022800: addiu s1, s1, 29604
+// 0x01022810: 0x1022810: addiu s1, s1, 30068
 	ldloc 10
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 10
-// 0x01022804: 0x1022804: lw    s4, 4(s4)
+// 0x01022814: 0x1022814: lw    s4, 4(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -6754,10 +6754,10 @@ L_10227c8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01022808: 0x1022808: addu  v0, zero, zero
+// 0x01022818: 0x1022818: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0102280c: 0x102280c: sw    zero, 48(sp)
+// 0x0102281c: 0x102281c: sw    zero, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6766,7 +6766,7 @@ L_10227c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01022810: 0x1022810: sw    v1, 60(sp)
+// 0x01022820: 0x1022820: sw    v1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6775,7 +6775,7 @@ L_10227c8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022814: 0x1022814: sw    a0, 64(sp)
+// 0x01022824: 0x1022824: sw    a0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6784,7 +6784,7 @@ L_10227c8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01022818: 0x1022818: j	 0x1022b28 sw    a1, 68(sp)
+// 0x01022828: 0x1022828: j	 0x1022b38 sw    a1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6793,10 +6793,10 @@ L_10227c8:
 	add
 	ldloc.2
 	stelem.i4
-	br L_1022b28
+	br L_1022b38
 // --- basic block ---
-L_1022820:
-// 0x01022820: 0x1022820: lw    a2, 52(sp)
+L_1022830:
+// 0x01022830: 0x1022830: lw    a2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6805,17 +6805,17 @@ L_1022820:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022824: 0x1022824: sll   zero, zero, 0
-// 0x01022828: 0x1022828: slt   v1, s5, a2
+// 0x01022834: 0x1022834: sll   zero, zero, 0
+// 0x01022838: 0x1022838: slt   v1, s5, a2
 	ldloc 16
 	ldloc.3
 	clt
 	stloc 6
-// 0x0102282c: 0x102282c: beq   v1, zero, 0x10228b0 sll   zero, zero, 0
+// 0x0102283c: 0x102283c: beq   v1, zero, 0x10228c0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10228b0
+	brfalse L_10228c0
 // --- basic block ---
-// 0x01022834: 0x1022834: lw    t1, 144(sp)
+// 0x01022844: 0x1022844: lw    t1, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6824,26 +6824,26 @@ L_1022820:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01022838: 0x1022838: sll   zero, zero, 0
-// 0x0102283c: 0x102283c: bne   t1, zero, 0x1022894 addu  a0, s5, zero
+// 0x01022848: 0x1022848: sll   zero, zero, 0
+// 0x0102284c: 0x102284c: bne   t1, zero, 0x10228a4 addu  a0, s5, zero
 	ldloc 11
 	ldloc 16
 	stloc.1
-	brtrue L_1022894
+	brtrue L_10228a4
 // --- basic block ---
-// 0x01022844: 0x1022844: lui   v1, 0x20000
+// 0x01022854: 0x1022854: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01022848: 0x1022848: lw    a0, 31240(v1)
+// 0x01022858: 0x1022858: lw    a0, 31704(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102284c: 0x102284c: lw    a2, 56(sp)
+// 0x0102285c: 0x102285c: lw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6852,22 +6852,22 @@ L_1022820:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022850: 0x1022850: lui   a1, 0x0
+// 0x01022860: 0x1022860: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01022854: 0x1022854: addu  a0, a0, a2
+// 0x01022864: 0x1022864: addu  a0, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc.1
-// 0x01022858: 0x1022858: lw    a0, 0(a0)
+// 0x01022868: 0x1022868: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102285c: 0x102285c: lw    v1, 556(a1)
+// 0x0102286c: 0x102286c: lw    v1, 556(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6876,30 +6876,30 @@ L_1022820:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022860: 0x1022860: sll   a2, a0, 16
+// 0x01022870: 0x1022870: sll   a2, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shl
 	stloc.3
-// 0x01022864: 0x1022864: addiu t1, zero, 16
+// 0x01022874: 0x1022874: addiu t1, zero, 16
 	ldc.i4.s 16
 	stloc 11
-// 0x01022868: 0x1022868: sra   a0, a0, 16
+// 0x01022878: 0x1022878: sra   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shr
 	stloc.1
-// 0x0102286c: 0x102286c: subu  a1, t1, v1
+// 0x0102287c: 0x102287c: subu  a1, t1, v1
 	ldloc 11
 	ldloc 6
 	sub
 	stloc.2
-// 0x01022870: 0x1022870: sllv  v1, v1, a0
+// 0x01022880: 0x1022880: sllv  v1, v1, a0
 	ldloc.1
 	ldloc 6
 	shl
 	stloc 6
-// 0x01022874: 0x1022874: lw    a0, 40(sp)
+// 0x01022884: 0x1022884: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6908,17 +6908,17 @@ L_1022820:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022878: 0x1022878: srav  a1, a1, a2
+// 0x01022888: 0x1022888: srav  a1, a1, a2
 	ldloc.3
 	ldloc.2
 	shr
 	stloc.2
-// 0x0102287c: 0x102287c: addu  v1, a0, v1
+// 0x0102288c: 0x102288c: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01022880: 0x1022880: lw    a0, 44(sp)
+// 0x01022890: 0x1022890: lw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6927,7 +6927,7 @@ L_1022820:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022884: 0x1022884: sw    v1, 40(sp)
+// 0x01022894: 0x1022894: sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6936,12 +6936,12 @@ L_1022820:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022888: 0x1022888: addu  a1, a0, a1
+// 0x01022898: 0x1022898: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x0102288c: 0x102288c: j	 0x10228c0 sw    a1, 44(sp)
+// 0x0102289c: 0x102289c: j	 0x10228d0 sw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6950,10 +6950,10 @@ L_1022820:
 	add
 	ldloc.2
 	stelem.i4
-	br L_10228c0
+	br L_10228d0
 // --- basic block ---
-L_1022894:
-// 0x01022894: 0x1022894: lw    v1, 144(sp)
+L_10228a4:
+// 0x010228a4: 0x10228a4: lw    v1, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6962,7 +6962,7 @@ L_1022894:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022898: 0x1022898: sw    v0, 76(sp)
+// 0x010228a8: 0x10228a8: sw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6971,7 +6971,7 @@ L_1022894:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102289c: 0x102289c: jalr  v1 addiu a1, sp, 40
+// 0x010228ac: 0x10228ac: jalr  v1 addiu a1, sp, 40
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 40
@@ -6987,7 +6987,7 @@ L_1022894:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010228a4: 0x10228a4: lw    v0, 76(sp)
+// 0x010228b4: 0x10228b4: lw    v0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6996,18 +6996,18 @@ L_1022894:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010228a8: 0x10228a8: j	 0x10228c0 sll   zero, zero, 0
-	br L_10228c0
+// 0x010228b8: 0x10228b8: j	 0x10228d0 sll   zero, zero, 0
+	br L_10228d0
 // --- basic block ---
-L_10228b0:
-// 0x010228b0: 0x10228b0: lw    a0, 0(s2)
+L_10228c0:
+// 0x010228c0: 0x10228c0: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010228b4: 0x10228b4: lw    v1, 4(s2)
+// 0x010228c4: 0x10228c4: lw    v1, 4(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -7016,7 +7016,7 @@ L_10228b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010228b8: 0x10228b8: sw    a0, 40(sp)
+// 0x010228c8: 0x10228c8: sw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7025,7 +7025,7 @@ L_10228b0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010228bc: 0x10228bc: sw    v1, 44(sp)
+// 0x010228cc: 0x10228cc: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7034,8 +7034,8 @@ L_10228b0:
 	add
 	ldloc 6
 	stelem.i4
-L_10228c0:
-// 0x010228c0: 0x10228c0: lw    a0, 128(sp)
+L_10228d0:
+// 0x010228d0: 0x10228d0: lw    a0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7044,12 +7044,12 @@ L_10228c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010228c4: 0x10228c4: sll   zero, zero, 0
-// 0x010228c8: 0x10228c8: bne   a0, zero, 0x10229a8 sll   zero, zero, 0
+// 0x010228d4: 0x10228d4: sll   zero, zero, 0
+// 0x010228d8: 0x10228d8: bne   a0, zero, 0x10229b8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10229a8
+	brtrue L_10229b8
 // --- basic block ---
-// 0x010228d0: 0x10228d0: lw    v1, 56(s1)
+// 0x010228e0: 0x10228e0: lw    v1, 56(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7058,17 +7058,17 @@ L_10228c0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010228d4: 0x10228d4: sll   zero, zero, 0
-// 0x010228d8: 0x10228d8: slt   a0, v1, s6
+// 0x010228e4: 0x10228e4: sll   zero, zero, 0
+// 0x010228e8: 0x10228e8: slt   a0, v1, s6
 	ldloc 6
 	ldloc 14
 	clt
 	stloc.1
-// 0x010228dc: 0x10228dc: beq   a0, zero, 0x10228f8 sll   zero, zero, 0
+// 0x010228ec: 0x10228ec: beq   a0, zero, 0x1022908 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10228f8
+	brfalse L_1022908
 // --- basic block ---
-// 0x010228e4: 0x10228e4: lw    a0, 40(sp)
+// 0x010228f4: 0x10228f4: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7077,18 +7077,18 @@ L_10228c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010228e8: 0x10228e8: sll   zero, zero, 0
-// 0x010228ec: 0x10228ec: slt   v1, v1, a0
+// 0x010228f8: 0x10228f8: sll   zero, zero, 0
+// 0x010228fc: 0x10228fc: slt   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x010228f0: 0x10228f0: bne   v1, zero, 0x1022970 sll   zero, zero, 0
+// 0x01022900: 0x1022900: bne   v1, zero, 0x1022980 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1022970
+	brtrue L_1022980
 // --- basic block ---
-L_10228f8:
-// 0x010228f8: 0x10228f8: lw    v1, 64(s1)
+L_1022908:
+// 0x01022908: 0x1022908: lw    v1, 64(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7097,17 +7097,17 @@ L_10228f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010228fc: 0x10228fc: sll   zero, zero, 0
-// 0x01022900: 0x1022900: slt   a0, s6, v1
+// 0x0102290c: 0x102290c: sll   zero, zero, 0
+// 0x01022910: 0x1022910: slt   a0, s6, v1
 	ldloc 14
 	ldloc 6
 	clt
 	stloc.1
-// 0x01022904: 0x1022904: beq   a0, zero, 0x1022920 sll   zero, zero, 0
+// 0x01022914: 0x1022914: beq   a0, zero, 0x1022930 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1022920
+	brfalse L_1022930
 // --- basic block ---
-// 0x0102290c: 0x102290c: lw    a0, 40(sp)
+// 0x0102291c: 0x102291c: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7116,18 +7116,18 @@ L_10228f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022910: 0x1022910: sll   zero, zero, 0
-// 0x01022914: 0x1022914: slt   v1, a0, v1
+// 0x01022920: 0x1022920: sll   zero, zero, 0
+// 0x01022924: 0x1022924: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01022918: 0x1022918: bne   v1, zero, 0x1022970 sll   zero, zero, 0
+// 0x01022928: 0x1022928: bne   v1, zero, 0x1022980 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1022970
+	brtrue L_1022980
 // --- basic block ---
-L_1022920:
-// 0x01022920: 0x1022920: lw    v1, 60(s1)
+L_1022930:
+// 0x01022930: 0x1022930: lw    v1, 60(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7136,17 +7136,17 @@ L_1022920:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022924: 0x1022924: sll   zero, zero, 0
-// 0x01022928: 0x1022928: slt   a0, v1, s4
+// 0x01022934: 0x1022934: sll   zero, zero, 0
+// 0x01022938: 0x1022938: slt   a0, v1, s4
 	ldloc 6
 	ldloc 12
 	clt
 	stloc.1
-// 0x0102292c: 0x102292c: beq   a0, zero, 0x1022948 sll   zero, zero, 0
+// 0x0102293c: 0x102293c: beq   a0, zero, 0x1022958 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1022948
+	brfalse L_1022958
 // --- basic block ---
-// 0x01022934: 0x1022934: lw    a0, 44(sp)
+// 0x01022944: 0x1022944: lw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7155,18 +7155,18 @@ L_1022920:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022938: 0x1022938: sll   zero, zero, 0
-// 0x0102293c: 0x102293c: slt   v1, v1, a0
+// 0x01022948: 0x1022948: sll   zero, zero, 0
+// 0x0102294c: 0x102294c: slt   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x01022940: 0x1022940: bne   v1, zero, 0x1022970 sll   zero, zero, 0
+// 0x01022950: 0x1022950: bne   v1, zero, 0x1022980 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1022970
+	brtrue L_1022980
 // --- basic block ---
-L_1022948:
-// 0x01022948: 0x1022948: lw    v1, 68(s1)
+L_1022958:
+// 0x01022958: 0x1022958: lw    v1, 68(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7175,17 +7175,17 @@ L_1022948:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102294c: 0x102294c: sll   zero, zero, 0
-// 0x01022950: 0x1022950: slt   a0, s4, v1
+// 0x0102295c: 0x102295c: sll   zero, zero, 0
+// 0x01022960: 0x1022960: slt   a0, s4, v1
 	ldloc 12
 	ldloc 6
 	clt
 	stloc.1
-// 0x01022954: 0x1022954: beq   a0, zero, 0x10229a8 sll   zero, zero, 0
+// 0x01022964: 0x1022964: beq   a0, zero, 0x10229b8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10229a8
+	brfalse L_10229b8
 // --- basic block ---
-// 0x0102295c: 0x102295c: lw    a0, 44(sp)
+// 0x0102296c: 0x102296c: lw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7194,18 +7194,18 @@ L_1022948:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022960: 0x1022960: sll   zero, zero, 0
-// 0x01022964: 0x1022964: slt   v1, a0, v1
+// 0x01022970: 0x1022970: sll   zero, zero, 0
+// 0x01022974: 0x1022974: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01022968: 0x1022968: beq   v1, zero, 0x10229a8 sll   zero, zero, 0
+// 0x01022978: 0x1022978: beq   v1, zero, 0x10229b8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10229a8
+	brfalse L_10229b8
 // --- basic block ---
-L_1022970:
-// 0x01022970: 0x1022970: lw    a1, 48(sp)
+L_1022980:
+// 0x01022980: 0x1022980: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7214,7 +7214,7 @@ L_1022970:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022974: 0x1022974: lw    s4, 44(sp)
+// 0x01022984: 0x1022984: lw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7223,7 +7223,7 @@ L_1022970:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01022978: 0x1022978: lw    s6, 40(sp)
+// 0x01022988: 0x1022988: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7232,13 +7232,13 @@ L_1022970:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102297c: 0x102297c: beq   a1, zero, 0x1022b18 addu  a0, zero, zero
+// 0x0102298c: 0x102298c: beq   a1, zero, 0x1022b28 addu  a0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1022b18
+	brfalse L_1022b28
 // --- basic block ---
-// 0x01022984: 0x1022984: lw    t1, 64(sp)
+// 0x01022994: 0x1022994: lw    t1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7247,7 +7247,7 @@ L_1022970:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01022988: 0x1022988: lw    a1, 148(sp)
+// 0x01022998: 0x1022998: lw    a1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7256,13 +7256,13 @@ L_1022970:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102298c: 0x102298c: addu  a2, s8, zero
+// 0x0102299c: 0x102299c: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x01022990: 0x1022990: addu  a3, s7, zero
+// 0x010229a0: 0x10229a0: addu  a3, s7, zero
 	ldloc 19
 	stloc 4
-// 0x01022994: 0x1022994: jal   0x102245c sw    t1, 16(sp)
+// 0x010229a4: 0x10229a4: jal   0x102246c sw    t1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7276,15 +7276,15 @@ L_1022970:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_add_segment_point_102245c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_add_segment_point_102246c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102299c: 0x102299c: addiu v0, zero, 1
+// 0x010229ac: 0x10229ac: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010229a0: 0x10229a0: j	 0x1022b18 sw    zero, 48(sp)
+// 0x010229b0: 0x10229b0: j	 0x1022b28 sw    zero, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7293,10 +7293,10 @@ L_1022970:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1022b18
+	br L_1022b28
 // --- basic block ---
-L_10229a8:
-// 0x010229a8: 0x10229a8: lw    v0, 48(sp)
+L_10229b8:
+// 0x010229b8: 0x10229b8: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7305,16 +7305,16 @@ L_10229a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010229ac: 0x10229ac: sll   zero, zero, 0
-// 0x010229b0: 0x10229b0: bne   v0, zero, 0x1022a0c addiu a0, sp, 24
+// 0x010229bc: 0x10229bc: sll   zero, zero, 0
+// 0x010229c0: 0x10229c0: bne   v0, zero, 0x1022a1c addiu a0, sp, 24
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-	brtrue L_1022a0c
+	brtrue L_1022a1c
 // --- basic block ---
-// 0x010229b8: 0x10229b8: lw    t0, 80(s1)
+// 0x010229c8: 0x10229c8: lw    t0, 80(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7323,7 +7323,7 @@ L_10229a8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010229bc: 0x10229bc: lw    a1, 32(s1)
+// 0x010229cc: 0x10229cc: lw    a1, 32(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7332,17 +7332,17 @@ L_10229a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010229c0: 0x10229c0: subu  t0, s6, t0
+// 0x010229d0: 0x10229d0: subu  t0, s6, t0
 	ldloc 14
 	ldloc 17
 	sub
 	stloc 17
-// 0x010229c4: 0x10229c4: div   t0, a1
+// 0x010229d4: 0x10229d4: div   t0, a1
 	ldloc 17
 	ldloc.2
 	div
 	stloc 8
-// 0x010229c8: 0x10229c8: lw    v1, 76(s1)
+// 0x010229d8: 0x10229d8: lw    v1, 76(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7351,7 +7351,7 @@ L_10229a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010229cc: 0x10229cc: lw    v0, 36(s1)
+// 0x010229dc: 0x10229dc: lw    v0, 36(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7360,12 +7360,12 @@ L_10229a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010229d0: 0x10229d0: subu  v1, v1, s4
+// 0x010229e0: 0x10229e0: subu  v1, v1, s4
 	ldloc 6
 	ldloc 12
 	sub
 	stloc 6
-// 0x010229d4: 0x10229d4: lw    t1, 68(sp)
+// 0x010229e4: 0x10229e4: lw    t1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7374,7 +7374,7 @@ L_10229a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010229d8: 0x10229d8: lw    a1, 148(sp)
+// 0x010229e8: 0x10229e8: lw    a1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7383,7 +7383,7 @@ L_10229a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010229dc: 0x10229dc: sw    t1, 16(sp)
+// 0x010229ec: 0x10229ec: sw    t1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7392,16 +7392,16 @@ L_10229a8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010229e0: 0x10229e0: addiu t1, zero, 1
+// 0x010229f0: 0x10229f0: addiu t1, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x010229e4: 0x10229e4: addu  a2, s8, zero
+// 0x010229f4: 0x10229f4: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x010229e8: 0x10229e8: addu  a3, s7, zero
+// 0x010229f8: 0x10229f8: addu  a3, s7, zero
 	ldloc 19
 	stloc 4
-// 0x010229ec: 0x10229ec: sw    t1, 48(sp)
+// 0x010229fc: 0x10229fc: sw    t1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7410,10 +7410,10 @@ L_10229a8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010229f0: 0x10229f0: mflo  lo
+// 0x01022a00: 0x1022a00: mflo  lo
 	ldloc 8
 	stloc 17
-// 0x010229f4: 0x10229f4: sw    t0, 24(sp)
+// 0x01022a04: 0x1022a04: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7422,16 +7422,16 @@ L_10229a8:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010229f8: 0x10229f8: sll   zero, zero, 0
-// 0x010229fc: 0x10229fc: div   v1, v0
+// 0x01022a08: 0x1022a08: sll   zero, zero, 0
+// 0x01022a0c: 0x1022a0c: div   v1, v0
 	ldloc 6
 	ldloc 7
 	div
 	stloc 8
-// 0x01022a00: 0x1022a00: mflo  lo
+// 0x01022a10: 0x1022a10: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01022a04: 0x1022a04: jal   0x102245c sw    v1, 28(sp)
+// 0x01022a14: 0x1022a14: jal   0x102246c sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7445,13 +7445,13 @@ L_10229a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_add_segment_point_102245c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_add_segment_point_102246c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_1022a0c:
-// 0x01022a0c: 0x1022a0c: lw    v0, 52(sp)
+L_1022a1c:
+// 0x01022a1c: 0x1022a1c: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7460,7 +7460,7 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022a10: 0x1022a10: lw    t1, 40(sp)
+// 0x01022a20: 0x1022a20: lw    t1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7469,12 +7469,12 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01022a14: 0x1022a14: slt   a3, s5, v0
+// 0x01022a24: 0x1022a24: slt   a3, s5, v0
 	ldloc 16
 	ldloc 7
 	clt
 	stloc 4
-// 0x01022a18: 0x1022a18: lw    a0, 80(s1)
+// 0x01022a28: 0x1022a28: lw    a0, 80(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7483,7 +7483,7 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022a1c: 0x1022a1c: lw    a1, 32(s1)
+// 0x01022a2c: 0x1022a2c: lw    a1, 32(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7492,7 +7492,7 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022a20: 0x1022a20: lw    a2, 76(s1)
+// 0x01022a30: 0x1022a30: lw    a2, 76(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7501,7 +7501,7 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022a24: 0x1022a24: lw    v1, 44(sp)
+// 0x01022a34: 0x1022a34: lw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7510,7 +7510,7 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022a28: 0x1022a28: lw    v0, 36(s1)
+// 0x01022a38: 0x1022a38: lw    v0, 36(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -7519,7 +7519,7 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022a2c: 0x1022a2c: lw    t0, 64(sp)
+// 0x01022a3c: 0x1022a3c: lw    t0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7528,30 +7528,30 @@ L_1022a0c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01022a30: 0x1022a30: beq   a3, zero, 0x1022a3c sll   zero, zero, 0
+// 0x01022a40: 0x1022a40: beq   a3, zero, 0x1022a4c sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1022a3c
+	brfalse L_1022a4c
 // --- basic block ---
-// 0x01022a38: 0x1022a38: addu  t0, s3, zero
+// 0x01022a48: 0x1022a48: addu  t0, s3, zero
 	ldloc 13
 	stloc 17
-L_1022a3c:
-// 0x01022a3c: 0x1022a3c: subu  t1, t1, a0
+L_1022a4c:
+// 0x01022a4c: 0x1022a4c: subu  t1, t1, a0
 	ldloc 11
 	ldloc.1
 	sub
 	stloc 11
-// 0x01022a40: 0x1022a40: div   t1, a1
+// 0x01022a50: 0x1022a50: div   t1, a1
 	ldloc 11
 	ldloc.2
 	div
 	stloc 8
-// 0x01022a44: 0x1022a44: subu  v1, a2, v1
+// 0x01022a54: 0x1022a54: subu  v1, a2, v1
 	ldloc.3
 	ldloc 6
 	sub
 	stloc 6
-// 0x01022a48: 0x1022a48: lw    a1, 148(sp)
+// 0x01022a58: 0x1022a58: lw    a1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7560,18 +7560,18 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022a4c: 0x1022a4c: addiu a0, sp, 32
+// 0x01022a5c: 0x1022a5c: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01022a50: 0x1022a50: addu  a2, s8, zero
+// 0x01022a60: 0x1022a60: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x01022a54: 0x1022a54: addu  a3, s7, zero
+// 0x01022a64: 0x1022a64: addu  a3, s7, zero
 	ldloc 19
 	stloc 4
-// 0x01022a58: 0x1022a58: sw    t0, 16(sp)
+// 0x01022a68: 0x1022a68: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7580,10 +7580,10 @@ L_1022a3c:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01022a5c: 0x1022a5c: mflo  lo
+// 0x01022a6c: 0x1022a6c: mflo  lo
 	ldloc 8
 	stloc 11
-// 0x01022a60: 0x1022a60: sw    t1, 32(sp)
+// 0x01022a70: 0x1022a70: sw    t1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7592,16 +7592,16 @@ L_1022a3c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01022a64: 0x1022a64: sll   zero, zero, 0
-// 0x01022a68: 0x1022a68: div   v1, v0
+// 0x01022a74: 0x1022a74: sll   zero, zero, 0
+// 0x01022a78: 0x1022a78: div   v1, v0
 	ldloc 6
 	ldloc 7
 	div
 	stloc 8
-// 0x01022a6c: 0x1022a6c: mflo  lo
+// 0x01022a7c: 0x1022a7c: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01022a70: 0x1022a70: jal   0x102245c sw    v1, 36(sp)
+// 0x01022a80: 0x1022a80: jal   0x102246c sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7615,25 +7615,25 @@ L_1022a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_add_segment_point_102245c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_add_segment_point_102246c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01022a78: 0x1022a78: beq   s0, zero, 0x1022afc addiu a0, sp, 32
+// 0x01022a88: 0x1022a88: beq   s0, zero, 0x1022b0c addiu a0, sp, 32
 	ldloc 9
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-	brfalse L_1022afc
+	brfalse L_1022b0c
 // --- basic block ---
-// 0x01022a80: 0x1022a80: addiu a1, sp, 24
+// 0x01022a90: 0x1022a90: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01022a84: 0x1022a84: jal   0x1009694 addiu a2, zero, 1
+// 0x01022a94: 0x1022a94: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -7641,19 +7641,19 @@ L_1022a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01022a8c: 0x1022a8c: lw    a0, 0(s0)
+// 0x01022a9c: 0x1022a9c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01022a90: 0x1022a90: lw    a1, 60(sp)
+// 0x01022aa0: 0x1022aa0: lw    a1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7662,17 +7662,17 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022a94: 0x1022a94: addu  a0, a0, v0
+// 0x01022aa4: 0x1022aa4: addu  a0, a0, v0
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-// 0x01022a98: 0x1022a98: slt   v1, a1, v0
+// 0x01022aa8: 0x1022aa8: slt   v1, a1, v0
 	ldloc.2
 	ldloc 7
 	clt
 	stloc 6
-// 0x01022a9c: 0x1022a9c: beq   v1, zero, 0x1022afc sw    a0, 0(s0)
+// 0x01022aac: 0x1022aac: beq   v1, zero, 0x1022b0c sw    a0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 9
@@ -7680,9 +7680,9 @@ L_1022a3c:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_1022afc
+	brfalse L_1022b0c
 // --- basic block ---
-// 0x01022aa4: 0x1022aa4: lw    v1, 32(sp)
+// 0x01022ab4: 0x1022ab4: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7691,7 +7691,7 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022aa8: 0x1022aa8: lw    a0, 24(sp)
+// 0x01022ab8: 0x1022ab8: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7700,20 +7700,20 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022aac: 0x1022aac: addiu a2, zero, 2
+// 0x01022abc: 0x1022abc: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01022ab0: 0x1022ab0: addu  a0, a0, v1
+// 0x01022ac0: 0x1022ac0: addu  a0, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x01022ab4: 0x1022ab4: div   a0, a2
+// 0x01022ac4: 0x1022ac4: div   a0, a2
 	ldloc.1
 	ldloc.3
 	div
 	stloc 8
-// 0x01022ab8: 0x1022ab8: lw    a1, 28(sp)
+// 0x01022ac8: 0x1022ac8: lw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7722,7 +7722,7 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022abc: 0x1022abc: lw    v1, 36(sp)
+// 0x01022acc: 0x1022acc: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7731,7 +7731,7 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022ac0: 0x1022ac0: lw    a2, 40(sp)
+// 0x01022ad0: 0x1022ad0: lw    a2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7740,12 +7740,12 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022ac4: 0x1022ac4: addu  v1, a1, v1
+// 0x01022ad4: 0x1022ad4: addu  v1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x01022ac8: 0x1022ac8: lw    a1, 44(sp)
+// 0x01022ad8: 0x1022ad8: lw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7754,7 +7754,7 @@ L_1022a3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022acc: 0x1022acc: sw    v0, 60(sp)
+// 0x01022adc: 0x1022adc: sw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7763,7 +7763,7 @@ L_1022a3c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022ad0: 0x1022ad0: sw    a1, 24(s0)
+// 0x01022ae0: 0x1022ae0: sw    a1, 24(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7772,10 +7772,10 @@ L_1022a3c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01022ad4: 0x1022ad4: addiu a1, zero, 2
+// 0x01022ae4: 0x1022ae4: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x01022ad8: 0x1022ad8: sw    s4, 16(s0)
+// 0x01022ae8: 0x1022ae8: sw    s4, 16(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7784,7 +7784,7 @@ L_1022a3c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01022adc: 0x1022adc: sw    s6, 12(s0)
+// 0x01022aec: 0x1022aec: sw    s6, 12(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7793,7 +7793,7 @@ L_1022a3c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01022ae0: 0x1022ae0: sw    a2, 20(s0)
+// 0x01022af0: 0x1022af0: sw    a2, 20(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7802,10 +7802,10 @@ L_1022a3c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01022ae4: 0x1022ae4: mflo  lo
+// 0x01022af4: 0x1022af4: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01022ae8: 0x1022ae8: sw    a0, 4(s0)
+// 0x01022af8: 0x1022af8: sw    a0, 4(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7814,16 +7814,16 @@ L_1022a3c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01022aec: 0x1022aec: sll   zero, zero, 0
-// 0x01022af0: 0x1022af0: div   v1, a1
+// 0x01022afc: 0x1022afc: sll   zero, zero, 0
+// 0x01022b00: 0x1022b00: div   v1, a1
 	ldloc 6
 	ldloc.2
 	div
 	stloc 8
-// 0x01022af4: 0x1022af4: mflo  lo
+// 0x01022b04: 0x1022b04: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01022af8: 0x1022af8: sw    v1, 8(s0)
+// 0x01022b08: 0x1022b08: sw    v1, 8(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7832,8 +7832,8 @@ L_1022a3c:
 	add
 	ldloc 6
 	stelem.i4
-L_1022afc:
-// 0x01022afc: 0x1022afc: lw    v0, 32(sp)
+L_1022b0c:
+// 0x01022b0c: 0x1022b0c: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7842,7 +7842,7 @@ L_1022afc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022b00: 0x1022b00: lw    s4, 44(sp)
+// 0x01022b10: 0x1022b10: lw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7851,7 +7851,7 @@ L_1022afc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01022b04: 0x1022b04: sw    v0, 24(sp)
+// 0x01022b14: 0x1022b14: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7860,7 +7860,7 @@ L_1022afc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022b08: 0x1022b08: lw    v0, 36(sp)
+// 0x01022b18: 0x1022b18: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7869,7 +7869,7 @@ L_1022afc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022b0c: 0x1022b0c: lw    s6, 40(sp)
+// 0x01022b1c: 0x1022b1c: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7878,7 +7878,7 @@ L_1022afc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01022b10: 0x1022b10: sw    v0, 28(sp)
+// 0x01022b20: 0x1022b20: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7887,11 +7887,11 @@ L_1022afc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022b14: 0x1022b14: addiu v0, zero, 1
+// 0x01022b24: 0x1022b24: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1022b18:
-// 0x01022b18: 0x1022b18: lw    a2, 56(sp)
+L_1022b28:
+// 0x01022b28: 0x1022b28: lw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7900,17 +7900,17 @@ L_1022b18:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022b1c: 0x1022b1c: addiu s5, s5, 1
+// 0x01022b2c: 0x1022b2c: addiu s5, s5, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x01022b20: 0x1022b20: addiu a2, a2, 4
+// 0x01022b30: 0x1022b30: addiu a2, a2, 4
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-// 0x01022b24: 0x1022b24: sw    a2, 56(sp)
+// 0x01022b34: 0x1022b34: sw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7919,8 +7919,8 @@ L_1022b18:
 	add
 	ldloc.3
 	stelem.i4
-L_1022b28:
-// 0x01022b28: 0x1022b28: lw    t1, 52(sp)
+L_1022b38:
+// 0x01022b38: 0x1022b38: lw    t1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7929,21 +7929,21 @@ L_1022b28:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01022b2c: 0x1022b2c: sll   zero, zero, 0
-// 0x01022b30: 0x1022b30: slt   v1, t1, s5
+// 0x01022b3c: 0x1022b3c: sll   zero, zero, 0
+// 0x01022b40: 0x1022b40: slt   v1, t1, s5
 	ldloc 11
 	ldloc 16
 	clt
 	stloc 6
-// 0x01022b34: 0x1022b34: beq   v1, zero, 0x1022820 sll   zero, zero, 0
+// 0x01022b44: 0x1022b44: beq   v1, zero, 0x1022830 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1022820
+	brfalse L_1022830
 // --- basic block ---
-// 0x01022b3c: 0x1022b3c: j	 0x1022d68 sll   zero, zero, 0
-	br L_1022d68
+// 0x01022b4c: 0x1022b4c: j	 0x1022d78 sll   zero, zero, 0
+	br L_1022d78
 // --- basic block ---
-L_1022b44:
-// 0x01022b44: 0x1022b44: lw    v0, 128(sp)
+L_1022b54:
+// 0x01022b54: 0x1022b54: lw    v0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7952,117 +7952,117 @@ L_1022b44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022b48: 0x1022b48: sll   zero, zero, 0
-// 0x01022b4c: 0x1022b4c: bne   v0, zero, 0x1022c10 lui   v1, 0xe0000
+// 0x01022b58: 0x1022b58: sll   zero, zero, 0
+// 0x01022b5c: 0x1022b5c: bne   v0, zero, 0x1022c20 lui   v1, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc 6
-	brtrue L_1022c10
+	brtrue L_1022c20
 // --- basic block ---
-// 0x01022b54: 0x1022b54: lui   v0, 0xe0000
+// 0x01022b64: 0x1022b64: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01022b58: 0x1022b58: lw    v0, 29660(v0)
+// 0x01022b68: 0x1022b68: lw    v0, 30124(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7415
+	ldc.i4 7531
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022b5c: 0x1022b5c: lw    v1, 0(s4)
+// 0x01022b6c: 0x1022b6c: lw    v1, 0(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01022b60: 0x1022b60: sll   zero, zero, 0
-// 0x01022b64: 0x1022b64: slt   a0, v0, v1
+// 0x01022b70: 0x1022b70: sll   zero, zero, 0
+// 0x01022b74: 0x1022b74: slt   a0, v0, v1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc.1
-// 0x01022b68: 0x1022b68: beq   a0, zero, 0x1022b84 sll   zero, zero, 0
+// 0x01022b78: 0x1022b78: beq   a0, zero, 0x1022b94 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1022b84
+	brfalse L_1022b94
 // --- basic block ---
-// 0x01022b70: 0x1022b70: lw    a0, 0(s2)
+// 0x01022b80: 0x1022b80: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01022b74: 0x1022b74: sll   zero, zero, 0
-// 0x01022b78: 0x1022b78: slt   v0, v0, a0
+// 0x01022b84: 0x1022b84: sll   zero, zero, 0
+// 0x01022b88: 0x1022b88: slt   v0, v0, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x01022b7c: 0x1022b7c: bne   v0, zero, 0x1022d68 addu  v0, zero, zero
+// 0x01022b8c: 0x1022b8c: bne   v0, zero, 0x1022d78 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1022d68
+	brtrue L_1022d78
 // --- basic block ---
-L_1022b84:
-// 0x01022b84: 0x1022b84: lui   v0, 0xe0000
+L_1022b94:
+// 0x01022b94: 0x1022b94: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01022b88: 0x1022b88: lw    v0, 29668(v0)
+// 0x01022b98: 0x1022b98: lw    v0, 30132(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7417
+	ldc.i4 7533
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022b8c: 0x1022b8c: sll   zero, zero, 0
-// 0x01022b90: 0x1022b90: slt   v1, v1, v0
+// 0x01022b9c: 0x1022b9c: sll   zero, zero, 0
+// 0x01022ba0: 0x1022ba0: slt   v1, v1, v0
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x01022b94: 0x1022b94: beq   v1, zero, 0x1022bb0 sll   zero, zero, 0
+// 0x01022ba4: 0x1022ba4: beq   v1, zero, 0x1022bc0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1022bb0
+	brfalse L_1022bc0
 // --- basic block ---
-// 0x01022b9c: 0x1022b9c: lw    v1, 0(s2)
+// 0x01022bac: 0x1022bac: lw    v1, 0(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01022ba0: 0x1022ba0: sll   zero, zero, 0
-// 0x01022ba4: 0x1022ba4: slt   v0, v1, v0
+// 0x01022bb0: 0x1022bb0: sll   zero, zero, 0
+// 0x01022bb4: 0x1022bb4: slt   v0, v1, v0
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 7
-// 0x01022ba8: 0x1022ba8: bne   v0, zero, 0x1022d68 addu  v0, zero, zero
+// 0x01022bb8: 0x1022bb8: bne   v0, zero, 0x1022d78 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1022d68
+	brtrue L_1022d78
 // --- basic block ---
-L_1022bb0:
-// 0x01022bb0: 0x1022bb0: lui   v0, 0xe0000
+L_1022bc0:
+// 0x01022bc0: 0x1022bc0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01022bb4: 0x1022bb4: lw    v0, 29664(v0)
+// 0x01022bc4: 0x1022bc4: lw    v0, 30128(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7416
+	ldc.i4 7532
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022bb8: 0x1022bb8: lw    v1, 4(s4)
+// 0x01022bc8: 0x1022bc8: lw    v1, 4(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -8071,17 +8071,17 @@ L_1022bb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022bbc: 0x1022bbc: sll   zero, zero, 0
-// 0x01022bc0: 0x1022bc0: slt   a0, v0, v1
+// 0x01022bcc: 0x1022bcc: sll   zero, zero, 0
+// 0x01022bd0: 0x1022bd0: slt   a0, v0, v1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc.1
-// 0x01022bc4: 0x1022bc4: beq   a0, zero, 0x1022be0 sll   zero, zero, 0
+// 0x01022bd4: 0x1022bd4: beq   a0, zero, 0x1022bf0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1022be0
+	brfalse L_1022bf0
 // --- basic block ---
-// 0x01022bcc: 0x1022bcc: lw    a0, 4(s2)
+// 0x01022bdc: 0x1022bdc: lw    a0, 4(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -8090,44 +8090,44 @@ L_1022bb0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022bd0: 0x1022bd0: sll   zero, zero, 0
-// 0x01022bd4: 0x1022bd4: slt   v0, v0, a0
+// 0x01022be0: 0x1022be0: sll   zero, zero, 0
+// 0x01022be4: 0x1022be4: slt   v0, v0, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x01022bd8: 0x1022bd8: bne   v0, zero, 0x1022d68 addu  v0, zero, zero
+// 0x01022be8: 0x1022be8: bne   v0, zero, 0x1022d78 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1022d68
+	brtrue L_1022d78
 // --- basic block ---
-L_1022be0:
-// 0x01022be0: 0x1022be0: lui   v0, 0xe0000
+L_1022bf0:
+// 0x01022bf0: 0x1022bf0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01022be4: 0x1022be4: lw    v0, 29672(v0)
+// 0x01022bf4: 0x1022bf4: lw    v0, 30136(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7418
+	ldc.i4 7534
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022be8: 0x1022be8: sll   zero, zero, 0
-// 0x01022bec: 0x1022bec: slt   v1, v1, v0
+// 0x01022bf8: 0x1022bf8: sll   zero, zero, 0
+// 0x01022bfc: 0x1022bfc: slt   v1, v1, v0
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x01022bf0: 0x1022bf0: beq   v1, zero, 0x1022c10 lui   v1, 0xe0000
+// 0x01022c00: 0x1022c00: beq   v1, zero, 0x1022c20 lui   v1, 0xe0000
 	ldloc 6
 	ldc.i4 917504
 	stloc 6
-	brfalse L_1022c10
+	brfalse L_1022c20
 // --- basic block ---
-// 0x01022bf8: 0x1022bf8: lw    v1, 4(s2)
+// 0x01022c08: 0x1022c08: lw    v1, 4(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -8136,35 +8136,35 @@ L_1022be0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022bfc: 0x1022bfc: sll   zero, zero, 0
-// 0x01022c00: 0x1022c00: slt   v0, v1, v0
+// 0x01022c0c: 0x1022c0c: sll   zero, zero, 0
+// 0x01022c10: 0x1022c10: slt   v0, v1, v0
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 7
-// 0x01022c04: 0x1022c04: bne   v0, zero, 0x1022d68 addu  v0, zero, zero
+// 0x01022c14: 0x1022c14: bne   v0, zero, 0x1022d78 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1022d68
+	brtrue L_1022d78
 // --- basic block ---
-// 0x01022c0c: 0x1022c0c: lui   v1, 0xe0000
+// 0x01022c1c: 0x1022c1c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-L_1022c10:
-// 0x01022c10: 0x1022c10: addiu v1, v1, 29604
+L_1022c20:
+// 0x01022c20: 0x1022c20: addiu v1, v1, 30068
 	ldloc 6
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 6
-// 0x01022c14: 0x1022c14: lw    a3, 0(s2)
+// 0x01022c24: 0x1022c24: lw    a3, 0(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01022c18: 0x1022c18: lw    a1, 80(v1)
+// 0x01022c28: 0x1022c28: lw    a1, 80(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8173,7 +8173,7 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022c1c: 0x1022c1c: lw    a0, 76(v1)
+// 0x01022c2c: 0x1022c2c: lw    a0, 76(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8182,7 +8182,7 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022c20: 0x1022c20: lw    v0, 36(v1)
+// 0x01022c30: 0x1022c30: lw    v0, 36(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8191,7 +8191,7 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022c24: 0x1022c24: lw    v1, 32(v1)
+// 0x01022c34: 0x1022c34: lw    v1, 32(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8200,17 +8200,17 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022c28: 0x1022c28: subu  a3, a3, a1
+// 0x01022c38: 0x1022c38: subu  a3, a3, a1
 	ldloc 4
 	ldloc.2
 	sub
 	stloc 4
-// 0x01022c2c: 0x1022c2c: div   a3, v1
+// 0x01022c3c: 0x1022c3c: div   a3, v1
 	ldloc 4
 	ldloc 6
 	div
 	stloc 8
-// 0x01022c30: 0x1022c30: lw    a2, 4(s2)
+// 0x01022c40: 0x1022c40: lw    a2, 4(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -8219,24 +8219,24 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022c34: 0x1022c34: lw    t1, 0(s4)
+// 0x01022c44: 0x1022c44: lw    t1, 0(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01022c38: 0x1022c38: subu  a2, a0, a2
+// 0x01022c48: 0x1022c48: subu  a2, a0, a2
 	ldloc.1
 	ldloc.3
 	sub
 	stloc.3
-// 0x01022c3c: 0x1022c3c: subu  a1, t1, a1
+// 0x01022c4c: 0x1022c4c: subu  a1, t1, a1
 	ldloc 11
 	ldloc.2
 	sub
 	stloc.2
-// 0x01022c40: 0x1022c40: lw    t0, 4(s4)
+// 0x01022c50: 0x1022c50: lw    t0, 4(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -8245,16 +8245,16 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01022c44: 0x1022c44: sll   zero, zero, 0
-// 0x01022c48: 0x1022c48: subu  a0, a0, t0
+// 0x01022c54: 0x1022c54: sll   zero, zero, 0
+// 0x01022c58: 0x1022c58: subu  a0, a0, t0
 	ldloc.1
 	ldloc 17
 	sub
 	stloc.1
-// 0x01022c4c: 0x1022c4c: mflo  lo
+// 0x01022c5c: 0x1022c5c: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x01022c50: 0x1022c50: sw    a3, 32(sp)
+// 0x01022c60: 0x1022c60: sw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8263,16 +8263,16 @@ L_1022c10:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01022c54: 0x1022c54: sll   zero, zero, 0
-// 0x01022c58: 0x1022c58: div   a2, v0
+// 0x01022c64: 0x1022c64: sll   zero, zero, 0
+// 0x01022c68: 0x1022c68: div   a2, v0
 	ldloc.3
 	ldloc 7
 	div
 	stloc 8
-// 0x01022c5c: 0x1022c5c: mflo  lo
+// 0x01022c6c: 0x1022c6c: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x01022c60: 0x1022c60: sw    a2, 36(sp)
+// 0x01022c70: 0x1022c70: sw    a2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8281,16 +8281,16 @@ L_1022c10:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01022c64: 0x1022c64: sll   zero, zero, 0
-// 0x01022c68: 0x1022c68: div   a1, v1
+// 0x01022c74: 0x1022c74: sll   zero, zero, 0
+// 0x01022c78: 0x1022c78: div   a1, v1
 	ldloc.2
 	ldloc 6
 	div
 	stloc 8
-// 0x01022c6c: 0x1022c6c: mflo  lo
+// 0x01022c7c: 0x1022c7c: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01022c70: 0x1022c70: sw    v1, 24(sp)
+// 0x01022c80: 0x1022c80: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8299,16 +8299,16 @@ L_1022c10:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022c74: 0x1022c74: sll   zero, zero, 0
-// 0x01022c78: 0x1022c78: div   a0, v0
+// 0x01022c84: 0x1022c84: sll   zero, zero, 0
+// 0x01022c88: 0x1022c88: div   a0, v0
 	ldloc.1
 	ldloc 7
 	div
 	stloc 8
-// 0x01022c7c: 0x1022c7c: mflo  lo
+// 0x01022c8c: 0x1022c8c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01022c80: 0x1022c80: beq   s0, zero, 0x1022d04 sw    a0, 28(sp)
+// 0x01022c90: 0x1022c90: beq   s0, zero, 0x1022d14 sw    a0, 28(sp)
 	ldloc 9
 	ldloc 5
 	ldloc.0
@@ -8318,19 +8318,19 @@ L_1022c10:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_1022d04
+	brfalse L_1022d14
 // --- basic block ---
-// 0x01022c88: 0x1022c88: addiu a0, sp, 32
+// 0x01022c98: 0x1022c98: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01022c8c: 0x1022c8c: addiu a1, sp, 24
+// 0x01022c9c: 0x1022c9c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01022c90: 0x1022c90: jal   0x1009694 addiu a2, zero, 1
+// 0x01022ca0: 0x1022ca0: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -8338,12 +8338,12 @@ L_1022c10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01022c98: 0x1022c98: lw    v1, 32(sp)
+// 0x01022ca8: 0x1022ca8: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8352,7 +8352,7 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022c9c: 0x1022c9c: lw    a0, 24(sp)
+// 0x01022cac: 0x1022cac: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8361,7 +8361,7 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022ca0: 0x1022ca0: lw    a1, 28(sp)
+// 0x01022cb0: 0x1022cb0: lw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8370,12 +8370,12 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022ca4: 0x1022ca4: addu  a0, a0, v1
+// 0x01022cb4: 0x1022cb4: addu  a0, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x01022ca8: 0x1022ca8: lw    v1, 36(sp)
+// 0x01022cb8: 0x1022cb8: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8384,35 +8384,35 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022cac: 0x1022cac: sw    v0, 0(s0)
+// 0x01022cbc: 0x1022cbc: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01022cb0: 0x1022cb0: addu  a1, a1, v1
+// 0x01022cc0: 0x1022cc0: addu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc.2
-// 0x01022cb4: 0x1022cb4: addiu v1, zero, 2
+// 0x01022cc4: 0x1022cc4: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01022cb8: 0x1022cb8: div   a1, v1
+// 0x01022cc8: 0x1022cc8: div   a1, v1
 	ldloc.2
 	ldloc 6
 	div
 	stloc 8
-// 0x01022cbc: 0x1022cbc: lw    v0, 0(s4)
+// 0x01022ccc: 0x1022ccc: lw    v0, 0(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01022cc0: 0x1022cc0: sll   zero, zero, 0
-// 0x01022cc4: 0x1022cc4: sw    v0, 12(s0)
+// 0x01022cd0: 0x1022cd0: sll   zero, zero, 0
+// 0x01022cd4: 0x1022cd4: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -8421,7 +8421,7 @@ L_1022c10:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022cc8: 0x1022cc8: lw    v0, 4(s4)
+// 0x01022cd8: 0x1022cd8: lw    v0, 4(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -8430,8 +8430,8 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022ccc: 0x1022ccc: sll   zero, zero, 0
-// 0x01022cd0: 0x1022cd0: sw    v0, 16(s0)
+// 0x01022cdc: 0x1022cdc: sll   zero, zero, 0
+// 0x01022ce0: 0x1022ce0: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -8440,15 +8440,15 @@ L_1022c10:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022cd4: 0x1022cd4: lw    v0, 0(s2)
+// 0x01022ce4: 0x1022ce4: lw    v0, 0(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01022cd8: 0x1022cd8: sll   zero, zero, 0
-// 0x01022cdc: 0x1022cdc: sw    v0, 20(s0)
+// 0x01022ce8: 0x1022ce8: sll   zero, zero, 0
+// 0x01022cec: 0x1022cec: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -8457,7 +8457,7 @@ L_1022c10:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022ce0: 0x1022ce0: lw    v0, 4(s2)
+// 0x01022cf0: 0x1022cf0: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -8466,8 +8466,8 @@ L_1022c10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022ce4: 0x1022ce4: sll   zero, zero, 0
-// 0x01022ce8: 0x1022ce8: sw    v0, 24(s0)
+// 0x01022cf4: 0x1022cf4: sll   zero, zero, 0
+// 0x01022cf8: 0x1022cf8: sw    v0, 24(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -8476,10 +8476,10 @@ L_1022c10:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022cec: 0x1022cec: mflo  lo
+// 0x01022cfc: 0x1022cfc: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01022cf0: 0x1022cf0: sw    a1, 8(s0)
+// 0x01022d00: 0x1022d00: sw    a1, 8(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -8488,16 +8488,16 @@ L_1022c10:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01022cf4: 0x1022cf4: sll   zero, zero, 0
-// 0x01022cf8: 0x1022cf8: div   a0, v1
+// 0x01022d04: 0x1022d04: sll   zero, zero, 0
+// 0x01022d08: 0x1022d08: div   a0, v1
 	ldloc.1
 	ldloc 6
 	div
 	stloc 8
-// 0x01022cfc: 0x1022cfc: mflo  lo
+// 0x01022d0c: 0x1022d0c: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01022d00: 0x1022d00: sw    v1, 4(s0)
+// 0x01022d10: 0x1022d10: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -8506,25 +8506,25 @@ L_1022c10:
 	add
 	ldloc 6
 	stelem.i4
-L_1022d04:
-// 0x01022d04: 0x1022d04: lui   v0, 0x40000
+L_1022d14:
+// 0x01022d14: 0x1022d14: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 7
-// 0x01022d08: 0x1022d08: addiu a0, v0, -20612
+// 0x01022d18: 0x1022d18: addiu a0, v0, -20148
 	ldloc 7
-	ldc.i4 -20612
+	ldc.i4 -20148
 	add
 	stloc.1
-// 0x01022d0c: 0x1022d0c: lw    v1, -20612(v0)
+// 0x01022d1c: 0x1022d1c: lw    v1, -20148(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022d10: 0x1022d10: lw    v0, 8(a0)
+// 0x01022d20: 0x1022d20: lw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -8533,29 +8533,29 @@ L_1022d04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022d14: 0x1022d14: sll   zero, zero, 0
-// 0x01022d18: 0x1022d18: sltu  v0, v1, v0
+// 0x01022d24: 0x1022d24: sll   zero, zero, 0
+// 0x01022d28: 0x1022d28: sltu  v0, v1, v0
 	ldloc 6
 	ldloc 7
 	clt.un
 	stloc 7
-// 0x01022d1c: 0x1022d1c: bne   v0, zero, 0x1022d2c sll   zero, zero, 0
+// 0x01022d2c: 0x1022d2c: bne   v0, zero, 0x1022d3c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1022d2c
+	brtrue L_1022d3c
 // --- basic block ---
-// 0x01022d24: 0x1022d24: jal   0x1021f34 sll   zero, zero, 0
+// 0x01022d34: 0x1022d34: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_1022d2c:
-// 0x01022d2c: 0x1022d2c: lw    a1, 148(sp)
+L_1022d3c:
+// 0x01022d3c: 0x1022d3c: lw    a1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8564,23 +8564,23 @@ L_1022d2c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022d30: 0x1022d30: ori   v0, s3, 1
+// 0x01022d40: 0x1022d40: ori   v0, s3, 1
 	ldloc 13
 	ldc.i4.1
 	or
 	stloc 7
-// 0x01022d34: 0x1022d34: addiu a0, sp, 24
+// 0x01022d44: 0x1022d44: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x01022d38: 0x1022d38: addu  a2, s8, zero
+// 0x01022d48: 0x1022d48: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x01022d3c: 0x1022d3c: addu  a3, s7, zero
+// 0x01022d4c: 0x1022d4c: addu  a3, s7, zero
 	ldloc 19
 	stloc 4
-// 0x01022d40: 0x1022d40: jal   0x102245c sw    v0, 16(sp)
+// 0x01022d50: 0x1022d50: jal   0x102246c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8594,12 +8594,12 @@ L_1022d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_add_segment_point_102245c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_add_segment_point_102246c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01022d48: 0x1022d48: lw    a1, 148(sp)
+// 0x01022d58: 0x1022d58: lw    a1, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8608,23 +8608,23 @@ L_1022d2c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022d4c: 0x1022d4c: ori   s3, s3, 2
+// 0x01022d5c: 0x1022d5c: ori   s3, s3, 2
 	ldloc 13
 	ldc.i4.2
 	or
 	stloc 13
-// 0x01022d50: 0x1022d50: addu  a2, s8, zero
+// 0x01022d60: 0x1022d60: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x01022d54: 0x1022d54: addu  a3, s7, zero
+// 0x01022d64: 0x1022d64: addu  a3, s7, zero
 	ldloc 19
 	stloc 4
-// 0x01022d58: 0x1022d58: addiu a0, sp, 32
+// 0x01022d68: 0x1022d68: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01022d5c: 0x1022d5c: jal   0x102245c sw    s3, 16(sp)
+// 0x01022d6c: 0x1022d6c: jal   0x102246c sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8638,17 +8638,17 @@ L_1022d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_add_segment_point_102245c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_add_segment_point_102246c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01022d64: 0x1022d64: addiu v0, zero, 1
+// 0x01022d74: 0x1022d74: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1022d68:
-// 0x01022d68: 0x1022d68: lw    ra, 116(sp)
-// 0x01022d6c: 0x1022d6c: lw    s8, 112(sp)
+L_1022d78:
+// 0x01022d78: 0x1022d78: lw    ra, 116(sp)
+// 0x01022d7c: 0x1022d7c: lw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8657,7 +8657,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01022d70: 0x1022d70: lw    s7, 108(sp)
+// 0x01022d80: 0x1022d80: lw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8666,7 +8666,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01022d74: 0x1022d74: lw    s6, 104(sp)
+// 0x01022d84: 0x1022d84: lw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8675,7 +8675,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01022d78: 0x1022d78: lw    s5, 100(sp)
+// 0x01022d88: 0x1022d88: lw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8684,7 +8684,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01022d7c: 0x1022d7c: lw    s4, 96(sp)
+// 0x01022d8c: 0x1022d8c: lw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8693,7 +8693,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01022d80: 0x1022d80: lw    s3, 92(sp)
+// 0x01022d90: 0x1022d90: lw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8702,7 +8702,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01022d84: 0x1022d84: lw    s2, 88(sp)
+// 0x01022d94: 0x1022d94: lw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8711,7 +8711,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01022d88: 0x1022d88: lw    s1, 84(sp)
+// 0x01022d98: 0x1022d98: lw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8720,7 +8720,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01022d8c: 0x1022d8c: lw    s0, 80(sp)
+// 0x01022d9c: 0x1022d9c: lw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8729,7 +8729,7 @@ L_1022d68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01022d90: 0x1022d90: jr    ra addiu sp, sp, 120
+// 0x01022da0: 0x1022da0: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
diff --git a/converted/Cibyl26.j b/converted/Cibyl26.j
index d6ec56e..4ea0442 100644
--- a/converted/Cibyl26.j
+++ b/converted/Cibyl26.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl26::.ctor
 
-.method public static int32 roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -76,13 +76,13 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01022e0c: 0x1022e0c: addiu sp, sp, -80
+// 0x01022e1c: 0x1022e1c: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01022e10: 0x1022e10: sw    ra, 76(sp)
-// 0x01022e14: 0x1022e14: sw    a0, 56(sp)
+// 0x01022e20: 0x1022e20: sw    ra, 76(sp)
+// 0x01022e24: 0x1022e24: sw    a0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -91,7 +91,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01022e18: 0x1022e18: sw    a1, 60(sp)
+// 0x01022e28: 0x1022e28: sw    a1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -100,7 +100,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01022e1c: 0x1022e1c: sw    a2, 64(sp)
+// 0x01022e2c: 0x1022e2c: sw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -109,7 +109,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01022e20: 0x1022e20: jal   0x100a6c8 sw    a3, 68(sp)
+// 0x01022e30: 0x1022e30: jal   0x100a6d8 sw    a3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -123,12 +123,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_shape_set_square_100a6c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_shape_set_square_100a6d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01022e28: 0x1022e28: lw    v0, 96(sp)
+// 0x01022e38: 0x1022e38: lw    v0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -137,7 +137,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022e2c: 0x1022e2c: lw    a0, 56(sp)
+// 0x01022e3c: 0x1022e3c: lw    a0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -146,7 +146,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022e30: 0x1022e30: sw    v0, 16(sp)
+// 0x01022e40: 0x1022e40: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -155,7 +155,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022e34: 0x1022e34: lw    v0, 100(sp)
+// 0x01022e44: 0x1022e44: lw    v0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -164,7 +164,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022e38: 0x1022e38: lw    a1, 60(sp)
+// 0x01022e48: 0x1022e48: lw    a1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -173,7 +173,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022e3c: 0x1022e3c: sw    v0, 20(sp)
+// 0x01022e4c: 0x1022e4c: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -182,7 +182,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022e40: 0x1022e40: lw    v0, 104(sp)
+// 0x01022e50: 0x1022e50: lw    v0, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -191,7 +191,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022e44: 0x1022e44: lw    a2, 64(sp)
+// 0x01022e54: 0x1022e54: lw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -200,7 +200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01022e48: 0x1022e48: sw    v0, 24(sp)
+// 0x01022e58: 0x1022e58: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -209,7 +209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022e4c: 0x1022e4c: lw    v0, 108(sp)
+// 0x01022e5c: 0x1022e5c: lw    v0, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -218,7 +218,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022e50: 0x1022e50: lw    a3, 68(sp)
+// 0x01022e60: 0x1022e60: lw    a3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -227,7 +227,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01022e54: 0x1022e54: sw    v0, 28(sp)
+// 0x01022e64: 0x1022e64: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -236,7 +236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022e58: 0x1022e58: lw    v0, 112(sp)
+// 0x01022e68: 0x1022e68: lw    v0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -245,7 +245,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022e5c: 0x1022e5c: sw    zero, 40(sp)
+// 0x01022e6c: 0x1022e6c: sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -254,7 +254,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01022e60: 0x1022e60: sw    v0, 32(sp)
+// 0x01022e70: 0x1022e70: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -263,7 +263,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022e64: 0x1022e64: lw    v0, 116(sp)
+// 0x01022e74: 0x1022e74: lw    v0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -272,7 +272,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01022e68: 0x1022e68: sw    zero, 44(sp)
+// 0x01022e78: 0x1022e78: sw    zero, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -281,7 +281,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01022e6c: 0x1022e6c: sw    v0, 36(sp)
+// 0x01022e7c: 0x1022e7c: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -290,7 +290,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01022e70: 0x1022e70: jal   0x10226c8 sw    zero, 48(sp)
+// 0x01022e80: 0x1022e80: jal   0x10226d8 sw    zero, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -304,14 +304,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_draw_one_line_internal_10226c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_draw_one_line_internal_10226d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01022e78: 0x1022e78: lw    ra, 76(sp)
-// 0x01022e7c: 0x1022e7c: sll   zero, zero, 0
-// 0x01022e80: 0x1022e80: jr    ra addiu sp, sp, 80
+// 0x01022e88: 0x1022e88: lw    ra, 76(sp)
+// 0x01022e8c: 0x1022e8c: sll   zero, zero, 0
+// 0x01022e90: 0x1022e90: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -323,7 +323,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_draw_square_1022e88(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_draw_square_1022e98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 s0,int32 s1,int32 s5,int32 s2,int32 t0,int32 s6,int32 s7,int32 s8,int32 s3,int32 t1,int32 s4,int32 t2,int32 t3,int32 t4,int32 t5,int32 t6,int32 t7,int32 ra)
@@ -412,12 +412,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01022e88: 0x1022e88: addiu sp, sp, -248
+// 0x01022e98: 0x1022e98: addiu sp, sp, -248
 	ldloc.0
 	ldc.i4 -248
 	add
 	stloc.0
-// 0x01022e8c: 0x1022e8c: lw    v1, 268(sp)
+// 0x01022e9c: 0x1022e9c: lw    v1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -426,7 +426,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022e90: 0x1022e90: sw    a0, 248(sp)
+// 0x01022ea0: 0x1022ea0: sw    a0, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -435,62 +435,62 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01022e94: 0x1022e94: sll   v0, v1, 8
+// 0x01022ea4: 0x1022ea4: sll   v0, v1, 8
 	ldloc 7
 	ldc.i4.8
 	shl
 	stloc 5
-// 0x01022e98: 0x1022e98: addu  v0, v0, a3
+// 0x01022ea8: 0x1022ea8: addu  v0, v0, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
-// 0x01022e9c: 0x1022e9c: lui   v1, 0x60000
+// 0x01022eac: 0x1022eac: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01022ea0: 0x1022ea0: lui   a3, 0x50000
+// 0x01022eb0: 0x1022eb0: lui   a3, 0x50000
 	ldc.i4 327680
 	stloc 4
-// 0x01022ea4: 0x1022ea4: sll   v0, v0, 2
+// 0x01022eb4: 0x1022eb4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01022ea8: 0x1022ea8: addiu v1, v1, -30664
+// 0x01022eb8: 0x1022eb8: addiu v1, v1, -30200
 	ldloc 7
-	ldc.i4 -30664
+	ldc.i4 -30200
 	add
 	stloc 7
-// 0x01022eac: 0x1022eac: addiu a3, a3, 28580
+// 0x01022ebc: 0x1022ebc: addiu a3, a3, 29044
 	ldloc 4
-	ldc.i4 28580
+	ldc.i4 29044
 	add
 	stloc 4
-// 0x01022eb0: 0x1022eb0: addu  v1, v0, v1
+// 0x01022ec0: 0x1022ec0: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01022eb4: 0x1022eb4: addu  v0, v0, a3
+// 0x01022ec4: 0x1022ec4: addu  v0, v0, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
-// 0x01022eb8: 0x1022eb8: lw    v0, 0(v0)
+// 0x01022ec8: 0x1022ec8: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01022ebc: 0x1022ebc: lw    v1, 0(v1)
+// 0x01022ecc: 0x1022ecc: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01022ec0: 0x1022ec0: lw    a0, 268(sp)
+// 0x01022ed0: 0x1022ed0: lw    a0, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -499,7 +499,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022ec4: 0x1022ec4: sw    v0, 136(sp)
+// 0x01022ed4: 0x1022ed4: sw    v0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -508,10 +508,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01022ec8: 0x1022ec8: addiu v0, zero, 1
+// 0x01022ed8: 0x1022ed8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01022ecc: 0x1022ecc: sw    s2, 216(sp)
+// 0x01022edc: 0x1022edc: sw    s2, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -520,8 +520,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01022ed0: 0x1022ed0: sw    ra, 244(sp)
-// 0x01022ed4: 0x1022ed4: sw    s8, 240(sp)
+// 0x01022ee0: 0x1022ee0: sw    ra, 244(sp)
+// 0x01022ee4: 0x1022ee4: sw    s8, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -530,7 +530,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01022ed8: 0x1022ed8: sw    s7, 236(sp)
+// 0x01022ee8: 0x1022ee8: sw    s7, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -539,7 +539,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01022edc: 0x1022edc: sw    s6, 232(sp)
+// 0x01022eec: 0x1022eec: sw    s6, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -548,7 +548,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01022ee0: 0x1022ee0: sw    s5, 228(sp)
+// 0x01022ef0: 0x1022ef0: sw    s5, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -557,7 +557,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01022ee4: 0x1022ee4: sw    s4, 224(sp)
+// 0x01022ef4: 0x1022ef4: sw    s4, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -566,7 +566,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01022ee8: 0x1022ee8: sw    s3, 220(sp)
+// 0x01022ef8: 0x1022ef8: sw    s3, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -575,7 +575,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01022eec: 0x1022eec: sw    s1, 212(sp)
+// 0x01022efc: 0x1022efc: sw    s1, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -584,7 +584,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01022ef0: 0x1022ef0: sw    s0, 208(sp)
+// 0x01022f00: 0x1022f00: sw    s0, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -593,7 +593,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01022ef4: 0x1022ef4: sw    v1, 84(sp)
+// 0x01022f04: 0x1022f04: sw    v1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -602,10 +602,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022ef8: 0x1022ef8: addu  s2, a1, zero
+// 0x01022f08: 0x1022f08: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01022efc: 0x1022efc: bne   a0, v0, 0x1022fd4 sw    a2, 256(sp)
+// 0x01022f0c: 0x1022f0c: bne   a0, v0, 0x1022fe4 sw    a2, 256(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -616,61 +616,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-	bne.un L_1022fd4
+	bne.un L_1022fe4
 // --- basic block ---
-// 0x01022f04: 0x1022f04: lui   v0, 0x30000
+// 0x01022f14: 0x1022f14: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01022f08: 0x1022f08: lw    v0, 28228(v0)
+// 0x01022f18: 0x1022f18: lw    v0, 28692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022f0c: 0x1022f0c: sll   zero, zero, 0
-// 0x01022f10: 0x1022f10: bne   v0, zero, 0x1022fd4 lui   v0, 0x30000
+// 0x01022f1c: 0x1022f1c: sll   zero, zero, 0
+// 0x01022f20: 0x1022f20: bne   v0, zero, 0x1022fe4 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1022fd4
+	brtrue L_1022fe4
 // --- basic block ---
-// 0x01022f18: 0x1022f18: lw    v0, 28452(v0)
+// 0x01022f28: 0x1022f28: lw    v0, 28916(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7113
+	ldc.i4 7229
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022f1c: 0x1022f1c: sll   zero, zero, 0
-// 0x01022f20: 0x1022f20: beq   v0, zero, 0x1022fd4 lui   v0, 0x30000
+// 0x01022f2c: 0x1022f2c: sll   zero, zero, 0
+// 0x01022f30: 0x1022f30: beq   v0, zero, 0x1022fe4 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_1022fd4
+	brfalse L_1022fe4
 // --- basic block ---
-// 0x01022f28: 0x1022f28: lw    v0, 28256(v0)
+// 0x01022f38: 0x1022f38: lw    v0, 28720(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022f2c: 0x1022f2c: sll   zero, zero, 0
-// 0x01022f30: 0x1022f30: bne   v0, a0, 0x1022f50 lui   v0, 0x30000
+// 0x01022f3c: 0x1022f3c: sll   zero, zero, 0
+// 0x01022f40: 0x1022f40: bne   v0, a0, 0x1022f60 lui   v0, 0x30000
 	ldloc 5
 	ldloc.1
 	ldc.i4 196608
 	stloc 5
-	bne.un L_1022f50
+	bne.un L_1022f60
 // --- basic block ---
-// 0x01022f38: 0x1022f38: lw    a0, 136(sp)
+// 0x01022f48: 0x1022f48: lw    a0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -679,12 +679,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01022f3c: 0x1022f3c: addiu a1, sp, 84
+// 0x01022f4c: 0x1022f4c: addiu a1, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc.2
-// 0x01022f40: 0x1022f40: jal   0x1025aac addiu a2, zero, 6
+// 0x01022f50: 0x1022f50: jal   0x1025abc addiu a2, zero, 6
 	ldc.i4.6
 	stloc.3
 	ldloc.0
@@ -692,38 +692,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_show_labels_1025aac(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_show_labels_1025abc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022f48: 0x1022f48: bltz  v0, 0x1022fd4 lui   v0, 0x30000
+// 0x01022f58: 0x1022f58: bltz  v0, 0x1022fe4 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
 	ldc.i4.s 0
-	blt L_1022fd4
+	blt L_1022fe4
 // --- basic block ---
-L_1022f50:
-// 0x01022f50: 0x1022f50: lw    v0, 28448(v0)
+L_1022f60:
+// 0x01022f60: 0x1022f60: lw    v0, 28912(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022f54: 0x1022f54: sll   zero, zero, 0
-// 0x01022f58: 0x1022f58: bne   v0, zero, 0x1022f68 addiu s1, sp, 108
+// 0x01022f64: 0x1022f64: sll   zero, zero, 0
+// 0x01022f68: 0x1022f68: bne   v0, zero, 0x1022f78 addiu s1, sp, 108
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc 10
-	brtrue L_1022f68
+	brtrue L_1022f78
 // --- basic block ---
-// 0x01022f60: 0x1022f60: j	 0x1022fdc sw    zero, 148(sp)
+// 0x01022f70: 0x1022f70: j	 0x1022fec sw    zero, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -732,58 +732,58 @@ L_1022f50:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1022fdc
+	br L_1022fec
 // --- basic block ---
-L_1022f68:
-// 0x01022f68: 0x1022f68: lui   v0, 0xf0000
+L_1022f78:
+// 0x01022f78: 0x1022f78: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01022f6c: 0x1022f6c: lw    v0, -30072(v0)
+// 0x01022f7c: 0x1022f7c: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x01022f70: 0x1022f70: addiu a2, zero, 4
+// 0x01022f80: 0x1022f80: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x01022f74: 0x1022f74: div   v0, a2
+// 0x01022f84: 0x1022f84: div   v0, a2
 	ldloc 5
 	ldloc.3
 	div
 	stloc 8
-// 0x01022f78: 0x1022f78: lui   v1, 0xf0000
+// 0x01022f88: 0x1022f88: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x01022f7c: 0x1022f7c: lw    a1, -30068(v1)
+// 0x01022f8c: 0x1022f8c: lw    a1, -29604(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.2
-// 0x01022f80: 0x1022f80: addiu v1, zero, 2
+// 0x01022f90: 0x1022f90: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01022f84: 0x1022f84: addiu s3, sp, 40
+// 0x01022f94: 0x1022f94: addiu s3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 17
-// 0x01022f88: 0x1022f88: addu  a0, s3, zero
+// 0x01022f98: 0x1022f98: addu  a0, s3, zero
 	ldloc 17
 	stloc.1
-// 0x01022f8c: 0x1022f8c: addiu s0, sp, 32
+// 0x01022f9c: 0x1022f9c: addiu s0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
-// 0x01022f90: 0x1022f90: sw    v0, 36(sp)
+// 0x01022fa0: 0x1022fa0: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -792,10 +792,10 @@ L_1022f68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01022f94: 0x1022f94: mflo  lo
+// 0x01022fa4: 0x1022fa4: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x01022f98: 0x1022f98: sw    a2, 44(sp)
+// 0x01022fa8: 0x1022fa8: sw    a2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -804,16 +804,16 @@ L_1022f68:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01022f9c: 0x1022f9c: sll   zero, zero, 0
-// 0x01022fa0: 0x1022fa0: div   a1, v1
+// 0x01022fac: 0x1022fac: sll   zero, zero, 0
+// 0x01022fb0: 0x1022fb0: div   a1, v1
 	ldloc.2
 	ldloc 7
 	div
 	stloc 8
-// 0x01022fa4: 0x1022fa4: mflo  lo
+// 0x01022fb4: 0x1022fb4: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01022fa8: 0x1022fa8: sw    v1, 32(sp)
+// 0x01022fb8: 0x1022fb8: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -822,7 +822,7 @@ L_1022f68:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01022fac: 0x1022fac: jal   0x1006f24 sw    v1, 40(sp)
+// 0x01022fbc: 0x1022fbc: jal   0x1006f34 sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -835,30 +835,30 @@ L_1022f68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022fb4: 0x1022fb4: jal   0x1006f24 addu  a0, s0, zero
+// 0x01022fc4: 0x1022fc4: jal   0x1006f34 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022fbc: 0x1022fbc: addu  a0, s3, zero
+// 0x01022fcc: 0x1022fcc: addu  a0, s3, zero
 	ldloc 17
 	stloc.1
-// 0x01022fc0: 0x1022fc0: addu  a1, s0, zero
+// 0x01022fd0: 0x1022fd0: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x01022fc4: 0x1022fc4: jal   0x1009694 addiu a2, zero, 1
+// 0x01022fd4: 0x1022fd4: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -866,12 +866,12 @@ L_1022f68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01022fcc: 0x1022fcc: j	 0x1022fdc sw    v0, 148(sp)
+// 0x01022fdc: 0x1022fdc: j	 0x1022fec sw    v0, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -880,10 +880,10 @@ L_1022f68:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1022fdc
+	br L_1022fec
 // --- basic block ---
-L_1022fd4:
-// 0x01022fd4: 0x1022fd4: sw    zero, 148(sp)
+L_1022fe4:
+// 0x01022fe4: 0x1022fe4: sw    zero, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -892,11 +892,11 @@ L_1022fd4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01022fd8: 0x1022fd8: addu  s1, zero, zero
+// 0x01022fe8: 0x1022fe8: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_1022fdc:
-// 0x01022fdc: 0x1022fdc: lw    v1, 136(sp)
+L_1022fec:
+// 0x01022fec: 0x1022fec: lw    v1, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -905,18 +905,18 @@ L_1022fdc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01022fe0: 0x1022fe0: addiu v0, zero, 192
+// 0x01022ff0: 0x1022ff0: addiu v0, zero, 192
 	ldc.i4 192
 	stloc 5
-// 0x01022fe4: 0x1022fe4: mult  v1, v0
+// 0x01022ff4: 0x1022ff4: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 8
-// 0x01022fe8: 0x1022fe8: lui   a0, 0xe0000
+// 0x01022ff8: 0x1022ff8: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x01022fec: 0x1022fec: sw    s2, 144(sp)
+// 0x01022ffc: 0x1022ffc: sw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -925,17 +925,17 @@ L_1022fdc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01022ff0: 0x1022ff0: addiu a1, s1, 4
+// 0x01023000: 0x1023000: addiu a1, s1, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01022ff4: 0x1022ff4: sll   s2, s2, 3
+// 0x01023004: 0x1023004: sll   s2, s2, 3
 	ldloc 12
 	ldc.i4.3
 	shl
 	stloc 12
-// 0x01022ff8: 0x1022ff8: sw    s2, 152(sp)
+// 0x01023008: 0x1023008: sw    s2, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -944,12 +944,12 @@ L_1022fdc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01022ffc: 0x1022ffc: addiu s0, a0, 29604
+// 0x0102300c: 0x102300c: addiu s0, a0, 30068
 	ldloc.1
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x01023000: 0x1023000: sw    a1, 164(sp)
+// 0x01023010: 0x1023010: sw    a1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -958,7 +958,7 @@ L_1022fdc:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023004: 0x1023004: sw    zero, 160(sp)
+// 0x01023014: 0x1023014: sw    zero, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -967,19 +967,19 @@ L_1022fdc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01023008: 0x1023008: lui   s3, 0x40000
+// 0x01023018: 0x1023018: lui   s3, 0x40000
 	ldc.i4 262144
 	stloc 17
-// 0x0102300c: 0x102300c: lui   s2, 0x0
+// 0x0102301c: 0x102301c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01023010: 0x1023010: lui   s4, 0x30000
+// 0x01023020: 0x1023020: lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 19
-// 0x01023014: 0x1023014: mflo  lo
+// 0x01023024: 0x1023024: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01023018: 0x1023018: j	 0x1023f98 sw    v1, 156(sp)
+// 0x01023028: 0x1023028: j	 0x1023fa8 sw    v1, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -988,19 +988,19 @@ L_1022fdc:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1023f98
+	br L_1023fa8
 // --- basic block ---
-L_1023020:
-// 0x01023020: 0x1023020: lw    v1, 31152(v0)
+L_1023030:
+// 0x01023030: 0x1023030: lw    v1, 31616(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023024: 0x1023024: lw    a0, 152(sp)
+// 0x01023034: 0x1023034: lw    a0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1009,13 +1009,13 @@ L_1023020:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023028: 0x1023028: sll   zero, zero, 0
-// 0x0102302c: 0x102302c: addu  v1, v1, a0
+// 0x01023038: 0x1023038: sll   zero, zero, 0
+// 0x0102303c: 0x102303c: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01023030: 0x1023030: lw    v0, 4(v1)
+// 0x01023040: 0x1023040: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1024,59 +1024,59 @@ L_1023020:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023034: 0x1023034: sll   zero, zero, 0
-// 0x01023038: 0x1023038: bltz  v0, 0x1023064 addiu s6, zero, -1
+// 0x01023044: 0x1023044: sll   zero, zero, 0
+// 0x01023048: 0x1023048: bltz  v0, 0x1023074 addiu s6, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 14
 	ldc.i4.s 0
-	blt L_1023064
+	blt L_1023074
 // --- basic block ---
-// 0x01023040: 0x1023040: lui   a0, 0x20000
+// 0x01023050: 0x1023050: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01023044: 0x1023044: sra   v0, v0, 16
+// 0x01023054: 0x1023054: sra   v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	shr
 	stloc 5
-// 0x01023048: 0x1023048: lw    a1, 31240(a0)
+// 0x01023058: 0x1023058: lw    a1, 31704(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102304c: 0x102304c: sll   a0, v0, 2
+// 0x0102305c: 0x102305c: sll   a0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01023050: 0x1023050: addu  a0, a1, a0
+// 0x01023060: 0x1023060: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01023054: 0x1023054: lw    a0, 0(a0)
+// 0x01023064: 0x1023064: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01023058: 0x1023058: addiu s6, v0, 1
+// 0x01023068: 0x1023068: addiu s6, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 14
-// 0x0102305c: 0x102305c: addu  a0, v0, a0
+// 0x0102306c: 0x102306c: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x01023060: 0x1023060: sw    a0, 140(sp)
+// 0x01023070: 0x1023070: sw    a0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1085,59 +1085,59 @@ L_1023020:
 	add
 	ldloc.1
 	stelem.i4
-L_1023064:
-// 0x01023064: 0x1023064: lw    v0, 0(v1)
+L_1023074:
+// 0x01023074: 0x1023074: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01023068: 0x1023068: lui   a1, 0x20000
+// 0x01023078: 0x1023078: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0102306c: 0x102306c: sra   a0, v0, 16
+// 0x0102307c: 0x102307c: sra   a0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	shr
 	stloc.1
-// 0x01023070: 0x1023070: lw    v1, 31228(a1)
+// 0x01023080: 0x1023080: lw    v1, 31692(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023074: 0x1023074: andi  a0, a0, 32767
+// 0x01023084: 0x1023084: andi  a0, a0, 32767
 	ldloc.1
 	ldc.i4 32767
 	and
 	stloc.1
-// 0x01023078: 0x1023078: sll   a0, a0, 3
+// 0x01023088: 0x1023088: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0102307c: 0x102307c: addu  a0, v1, a0
+// 0x0102308c: 0x102308c: addu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x01023080: 0x1023080: lw    a1, 0(a0)
+// 0x01023090: 0x1023090: lw    a1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01023084: 0x1023084: andi  v0, v0, 32767
+// 0x01023094: 0x1023094: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01023088: 0x1023088: sw    a1, 48(sp)
+// 0x01023098: 0x1023098: sw    a1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1146,7 +1146,7 @@ L_1023064:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102308c: 0x102308c: lw    a0, 4(a0)
+// 0x0102309c: 0x102309c: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1155,12 +1155,12 @@ L_1023064:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023090: 0x1023090: sll   v0, v0, 3
+// 0x010230a0: 0x10230a0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01023094: 0x1023094: sw    a0, 52(sp)
+// 0x010230a4: 0x10230a4: sw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1169,19 +1169,19 @@ L_1023064:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01023098: 0x1023098: addu  v0, v1, v0
+// 0x010230a8: 0x10230a8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0102309c: 0x102309c: lw    v1, 0(v0)
+// 0x010230ac: 0x10230ac: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010230a0: 0x10230a0: lw    a0, 144(sp)
+// 0x010230b0: 0x10230b0: lw    a0, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1190,7 +1190,7 @@ L_1023064:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010230a4: 0x10230a4: sw    v1, 56(sp)
+// 0x010230b4: 0x10230b4: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1199,7 +1199,7 @@ L_1023064:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010230a8: 0x10230a8: lw    v0, 4(v0)
+// 0x010230b8: 0x10230b8: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1208,19 +1208,19 @@ L_1023064:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010230ac: 0x10230ac: lui   v1, 0x20000
+// 0x010230bc: 0x10230bc: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x010230b0: 0x10230b0: lw    s5, 31248(v1)
+// 0x010230c0: 0x10230c0: lw    s5, 31712(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc 11
-// 0x010230b4: 0x10230b4: jal   0x1004ae4 sw    v0, 60(sp)
+// 0x010230c4: 0x10230c4: jal   0x1004af4 sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1230,12 +1230,12 @@ L_1023064:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004ae4(int32)
+	call int32 Cibyl3::roadmap_line_route_is_low_weight_1004af4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010230bc: 0x10230bc: lw    a0, 136(sp)
+// 0x010230cc: 0x10230cc: lw    a0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1244,19 +1244,19 @@ L_1023064:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010230c0: 0x10230c0: sll   zero, zero, 0
-// 0x010230c4: 0x10230c4: slti  v1, a0, 8
+// 0x010230d0: 0x10230d0: sll   zero, zero, 0
+// 0x010230d4: 0x10230d4: slti  v1, a0, 8
 	ldloc.1
 	ldc.i4.8
 	clt
 	stloc 7
-// 0x010230c8: 0x10230c8: beq   v1, zero, 0x102378c addiu v1, zero, 1
+// 0x010230d8: 0x10230d8: beq   v1, zero, 0x102379c addiu v1, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 7
-	brfalse L_102378c
+	brfalse L_102379c
 // --- basic block ---
-// 0x010230d0: 0x10230d0: lw    a1, 268(sp)
+// 0x010230e0: 0x10230e0: lw    a1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1265,57 +1265,57 @@ L_1023064:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010230d4: 0x10230d4: sll   zero, zero, 0
-// 0x010230d8: 0x10230d8: bne   a1, v1, 0x102378c sll   zero, zero, 0
+// 0x010230e4: 0x10230e4: sll   zero, zero, 0
+// 0x010230e8: 0x10230e8: bne   a1, v1, 0x102379c sll   zero, zero, 0
 	ldloc.2
 	ldloc 7
-	bne.un L_102378c
+	bne.un L_102379c
 // --- basic block ---
-// 0x010230e0: 0x10230e0: beq   v0, zero, 0x102378c sll   zero, zero, 0
+// 0x010230f0: 0x10230f0: beq   v0, zero, 0x102379c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102378c
+	brfalse L_102379c
 // --- basic block ---
-// 0x010230e8: 0x10230e8: jal   0x10bd6dc sll   zero, zero, 0
+// 0x010230f8: 0x10230f8: jal   0x10bdd24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_screen_gray_scale_10bd6dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_screen_gray_scale_10bdd24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010230f0: 0x10230f0: beq   v0, zero, 0x102378c sll   zero, zero, 0
+// 0x01023100: 0x1023100: beq   v0, zero, 0x102379c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102378c
+	brfalse L_102379c
 // --- basic block ---
-// 0x010230f8: 0x10230f8: bne   s5, zero, 0x102378c sll   zero, zero, 0
+// 0x01023108: 0x1023108: bne   s5, zero, 0x102379c sll   zero, zero, 0
 	ldloc 11
-	brtrue L_102378c
+	brtrue L_102379c
 // --- basic block ---
-// 0x01023100: 0x1023100: beq   s1, zero, 0x102310c addiu v0, zero, -1
+// 0x01023110: 0x1023110: beq   s1, zero, 0x102311c addiu v0, zero, -1
 	ldloc 10
 	ldc.i4.m1
 	stloc 5
-	brfalse L_102310c
+	brfalse L_102311c
 // --- basic block ---
-// 0x01023108: 0x1023108: sw    zero, 0(s1)
+// 0x01023118: 0x1023118: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_102310c:
-// 0x0102310c: 0x102310c: beq   s6, v0, 0x10235dc lui   a0, 0x40000
+L_102311c:
+// 0x0102311c: 0x102311c: beq   s6, v0, 0x10235ec lui   a0, 0x40000
 	ldloc 14
 	ldloc 5
 	ldc.i4 262144
 	stloc.1
-	beq  L_10235dc
+	beq  L_10235ec
 // --- basic block ---
-// 0x01023114: 0x1023114: lw    v1, 140(sp)
+// 0x01023124: 0x1023124: lw    v1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1324,57 +1324,57 @@ L_102310c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023118: 0x1023118: sll   zero, zero, 0
-// 0x0102311c: 0x102311c: subu  v0, v1, s6
+// 0x01023128: 0x1023128: sll   zero, zero, 0
+// 0x0102312c: 0x102312c: subu  v0, v1, s6
 	ldloc 7
 	ldloc 14
 	sub
 	stloc 5
-// 0x01023120: 0x1023120: addiu v0, v0, 3
+// 0x01023130: 0x1023130: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x01023124: 0x1023124: lw    v1, -20612(s3)
+// 0x01023134: 0x1023134: lw    v1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023128: 0x1023128: sll   v0, v0, 3
+// 0x01023138: 0x1023138: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0102312c: 0x102312c: addu  v0, v1, v0
+// 0x0102313c: 0x102313c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01023130: 0x1023130: addiu a0, a0, -20600
+// 0x01023140: 0x1023140: addiu a0, a0, -20136
 	ldloc.1
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc.1
-// 0x01023134: 0x1023134: subu  v0, v0, a0
+// 0x01023144: 0x1023144: subu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc 5
-// 0x01023138: 0x1023138: ori   v1, zero, 32768
+// 0x01023148: 0x1023148: ori   v1, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 7
-// 0x0102313c: 0x102313c: slt   v0, v0, v1
+// 0x0102314c: 0x102314c: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01023140: 0x1023140: lw    s8, 52(sp)
+// 0x01023150: 0x1023150: lw    s8, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1383,7 +1383,7 @@ L_102310c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01023144: 0x1023144: lw    s7, 48(sp)
+// 0x01023154: 0x1023154: lw    s7, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1392,78 +1392,78 @@ L_102310c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01023148: 0x1023148: bne   v0, zero, 0x1023158 sll   zero, zero, 0
+// 0x01023158: 0x1023158: bne   v0, zero, 0x1023168 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023158
+	brtrue L_1023168
 // --- basic block ---
-// 0x01023150: 0x1023150: jal   0x1021f34 sll   zero, zero, 0
+// 0x01023160: 0x1023160: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1023158:
-// 0x01023158: 0x1023158: sll   t3, s6, 2
+L_1023168:
+// 0x01023168: 0x1023168: sll   t3, s6, 2
 	ldloc 14
 	ldc.i4.2
 	shl
 	stloc 21
-// 0x0102315c: 0x102315c: addu  t2, s7, zero
+// 0x0102316c: 0x102316c: addu  t2, s7, zero
 	ldloc 15
 	stloc 20
-// 0x01023160: 0x1023160: addu  t1, s8, zero
+// 0x01023170: 0x1023170: addu  t1, s8, zero
 	ldloc 16
 	stloc 18
-// 0x01023164: 0x1023164: addu  t4, s6, zero
+// 0x01023174: 0x1023174: addu  t4, s6, zero
 	ldloc 14
 	stloc 22
-// 0x01023168: 0x1023168: addu  t0, zero, zero
+// 0x01023178: 0x1023178: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x0102316c: 0x102316c: addiu a3, zero, -1
+// 0x0102317c: 0x102317c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01023170: 0x1023170: addu  s5, zero, zero
+// 0x01023180: 0x1023180: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01023174: 0x1023174: addiu t6, zero, 16
+// 0x01023184: 0x1023184: addiu t6, zero, 16
 	ldc.i4.s 16
 	stloc 24
-// 0x01023178: 0x1023178: addiu t5, zero, 2
+// 0x01023188: 0x1023188: addiu t5, zero, 2
 	ldc.i4.2
 	stloc 23
-// 0x0102317c: 0x102317c: j	 0x10233d0 addu  v1, s6, zero
+// 0x0102318c: 0x102318c: j	 0x10233e0 addu  v1, s6, zero
 	ldloc 14
 	stloc 7
-	br L_10233d0
+	br L_10233e0
 // --- basic block ---
-L_1023184:
-// 0x01023184: 0x1023184: lui   a1, 0x20000
+L_1023194:
+// 0x01023194: 0x1023194: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01023188: 0x1023188: lw    v0, 31240(a1)
+// 0x01023198: 0x1023198: lw    v0, 31704(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102318c: 0x102318c: lui   a1, 0x0
+// 0x0102319c: 0x102319c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01023190: 0x1023190: addu  v0, v0, t3
+// 0x010231a0: 0x10231a0: addu  v0, v0, t3
 	ldloc 5
 	ldloc 21
 	add
 	stloc 5
-// 0x01023194: 0x1023194: lw    a0, 556(a1)
+// 0x010231a4: 0x10231a4: lw    a0, 556(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1472,14 +1472,14 @@ L_1023184:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023198: 0x1023198: lw    a1, 0(v0)
+// 0x010231a8: 0x10231a8: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0102319c: 0x102319c: lw    v0, 56(s0)
+// 0x010231ac: 0x10231ac: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1488,60 +1488,60 @@ L_1023184:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010231a0: 0x10231a0: sll   t7, a1, 16
+// 0x010231b0: 0x10231b0: sll   t7, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc 25
-// 0x010231a4: 0x10231a4: subu  a2, t6, a0
+// 0x010231b4: 0x10231b4: subu  a2, t6, a0
 	ldloc 24
 	ldloc.1
 	sub
 	stloc.3
-// 0x010231a8: 0x10231a8: sra   a1, a1, 16
+// 0x010231b8: 0x10231b8: sra   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x010231ac: 0x10231ac: srav  a2, a2, t7
+// 0x010231bc: 0x10231bc: srav  a2, a2, t7
 	ldloc 25
 	ldloc.3
 	shr
 	stloc.3
-// 0x010231b0: 0x10231b0: sllv  a1, a0, a1
+// 0x010231c0: 0x10231c0: sllv  a1, a0, a1
 	ldloc.2
 	ldloc.1
 	shl
 	stloc.2
-// 0x010231b4: 0x10231b4: slt   t7, v0, t2
+// 0x010231c4: 0x10231c4: slt   t7, v0, t2
 	ldloc 5
 	ldloc 20
 	clt
 	stloc 25
-// 0x010231b8: 0x10231b8: addu  s7, s7, a1
+// 0x010231c8: 0x10231c8: addu  s7, s7, a1
 	ldloc 15
 	ldloc.2
 	add
 	stloc 15
-// 0x010231bc: 0x10231bc: beq   t7, zero, 0x10231d0 addu  s8, s8, a2
+// 0x010231cc: 0x10231cc: beq   t7, zero, 0x10231e0 addu  s8, s8, a2
 	ldloc 25
 	ldloc 16
 	ldloc.3
 	add
 	stloc 16
-	brfalse L_10231d0
+	brfalse L_10231e0
 // --- basic block ---
-// 0x010231c4: 0x10231c4: slt   v0, v0, s7
+// 0x010231d4: 0x10231d4: slt   v0, v0, s7
 	ldloc 5
 	ldloc 15
 	clt
 	stloc 5
-// 0x010231c8: 0x10231c8: bne   v0, zero, 0x1023224 sll   zero, zero, 0
+// 0x010231d8: 0x10231d8: bne   v0, zero, 0x1023234 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023224
+	brtrue L_1023234
 // --- basic block ---
-L_10231d0:
-// 0x010231d0: 0x10231d0: lw    v0, 64(s0)
+L_10231e0:
+// 0x010231e0: 0x10231e0: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1550,26 +1550,26 @@ L_10231d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010231d4: 0x10231d4: sll   zero, zero, 0
-// 0x010231d8: 0x10231d8: slt   a0, t2, v0
+// 0x010231e4: 0x10231e4: sll   zero, zero, 0
+// 0x010231e8: 0x10231e8: slt   a0, t2, v0
 	ldloc 20
 	ldloc 5
 	clt
 	stloc.1
-// 0x010231dc: 0x10231dc: beq   a0, zero, 0x10231ec slt   v0, s7, v0
+// 0x010231ec: 0x10231ec: beq   a0, zero, 0x10231fc slt   v0, s7, v0
 	ldloc.1
 	ldloc 15
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_10231ec
+	brfalse L_10231fc
 // --- basic block ---
-// 0x010231e4: 0x10231e4: bne   v0, zero, 0x1023224 sll   zero, zero, 0
+// 0x010231f4: 0x10231f4: bne   v0, zero, 0x1023234 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023224
+	brtrue L_1023234
 // --- basic block ---
-L_10231ec:
-// 0x010231ec: 0x10231ec: lw    v0, 60(s0)
+L_10231fc:
+// 0x010231fc: 0x10231fc: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1578,26 +1578,26 @@ L_10231ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010231f0: 0x10231f0: sll   zero, zero, 0
-// 0x010231f4: 0x10231f4: slt   a0, v0, t1
+// 0x01023200: 0x1023200: sll   zero, zero, 0
+// 0x01023204: 0x1023204: slt   a0, v0, t1
 	ldloc 5
 	ldloc 18
 	clt
 	stloc.1
-// 0x010231f8: 0x10231f8: beq   a0, zero, 0x1023208 slt   v0, v0, s8
+// 0x01023208: 0x1023208: beq   a0, zero, 0x1023218 slt   v0, v0, s8
 	ldloc.1
 	ldloc 5
 	ldloc 16
 	clt
 	stloc 5
-	brfalse L_1023208
+	brfalse L_1023218
 // --- basic block ---
-// 0x01023200: 0x1023200: bne   v0, zero, 0x1023224 sll   zero, zero, 0
+// 0x01023210: 0x1023210: bne   v0, zero, 0x1023234 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023224
+	brtrue L_1023234
 // --- basic block ---
-L_1023208:
-// 0x01023208: 0x1023208: lw    v0, 68(s0)
+L_1023218:
+// 0x01023218: 0x1023218: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1606,41 +1606,41 @@ L_1023208:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102320c: 0x102320c: sll   zero, zero, 0
-// 0x01023210: 0x1023210: slt   a0, t1, v0
+// 0x0102321c: 0x102321c: sll   zero, zero, 0
+// 0x01023220: 0x1023220: slt   a0, t1, v0
 	ldloc 18
 	ldloc 5
 	clt
 	stloc.1
-// 0x01023214: 0x1023214: beq   a0, zero, 0x1023fe4 slt   v0, s8, v0
+// 0x01023224: 0x1023224: beq   a0, zero, 0x1023ff4 slt   v0, s8, v0
 	ldloc.1
 	ldloc 16
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_1023fe4
+	brfalse L_1023ff4
 // --- basic block ---
-// 0x0102321c: 0x102321c: beq   v0, zero, 0x1023fe4 sll   zero, zero, 0
+// 0x0102322c: 0x102322c: beq   v0, zero, 0x1023ff4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1023fe4
+	brfalse L_1023ff4
 // --- basic block ---
-L_1023224:
-// 0x01023224: 0x1023224: beq   t0, zero, 0x10233bc addu  v0, a3, zero
+L_1023234:
+// 0x01023234: 0x1023234: beq   t0, zero, 0x10233cc addu  v0, a3, zero
 	ldloc 13
 	ldloc 4
 	stloc 5
-	brfalse L_10233bc
+	brfalse L_10233cc
 // --- basic block ---
-// 0x0102322c: 0x102322c: lw    v0, -20612(s3)
+// 0x0102323c: 0x102323c: lw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023230: 0x1023230: lw    a0, 6204(s2)
+// 0x01023240: 0x1023240: lw    a0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1649,69 +1649,69 @@ L_1023224:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023234: 0x1023234: sll   zero, zero, 0
-// 0x01023238: 0x1023238: subu  a1, a0, v0
+// 0x01023244: 0x1023244: sll   zero, zero, 0
+// 0x01023248: 0x1023248: subu  a1, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.2
-// 0x0102323c: 0x102323c: slti  a2, a1, 16
+// 0x0102324c: 0x102324c: slti  a2, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	clt
 	stloc.3
-// 0x01023240: 0x1023240: bne   a2, zero, 0x1023264 sra   a1, a1, 3
+// 0x01023250: 0x1023250: bne   a2, zero, 0x1023274 sra   a1, a1, 3
 	ldloc.3
 	ldloc.2
 	ldc.i4.3
 	shr
 	stloc.2
-	brtrue L_1023264
+	brtrue L_1023274
 // --- basic block ---
-// 0x01023248: 0x1023248: lw    v0, 28532(s4)
+// 0x01023258: 0x1023258: lw    v0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102324c: 0x102324c: sll   zero, zero, 0
-// 0x01023250: 0x1023250: addiu a2, v0, 4
+// 0x0102325c: 0x102325c: sll   zero, zero, 0
+// 0x01023260: 0x1023260: addiu a2, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc.3
-// 0x01023254: 0x1023254: sw    a1, 0(v0)
+// 0x01023264: 0x1023264: sw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01023258: 0x1023258: sw    a0, -20612(s3)
+// 0x01023268: 0x1023268: sw    a0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc.1
 	stelem.i4
-// 0x0102325c: 0x102325c: j	 0x1023268 sw    a2, 28532(s4)
+// 0x0102326c: 0x102326c: j	 0x1023278 sw    a2, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.3
 	stelem.i4
-	br L_1023268
+	br L_1023278
 // --- basic block ---
-L_1023264:
-// 0x01023264: 0x1023264: sw    v0, 6204(s2)
+L_1023274:
+// 0x01023274: 0x1023274: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1720,17 +1720,17 @@ L_1023264:
 	add
 	ldloc 5
 	stelem.i4
-L_1023268:
-// 0x01023268: 0x1023268: addu  v0, a3, zero
+L_1023278:
+// 0x01023278: 0x1023278: addu  v0, a3, zero
 	ldloc 4
 	stloc 5
-// 0x0102326c: 0x102326c: j	 0x10233bc addu  t0, zero, zero
+// 0x0102327c: 0x102327c: j	 0x10233cc addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_10233bc
+	br L_10233cc
 // --- basic block ---
-L_1023274:
-// 0x01023274: 0x1023274: lw    v0, 80(s0)
+L_1023284:
+// 0x01023284: 0x1023284: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1739,7 +1739,7 @@ L_1023274:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023278: 0x1023278: lw    a0, 32(s0)
+// 0x01023288: 0x1023288: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1748,17 +1748,17 @@ L_1023274:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102327c: 0x102327c: subu  v0, t2, v0
+// 0x0102328c: 0x102328c: subu  v0, t2, v0
 	ldloc 20
 	ldloc 5
 	sub
 	stloc 5
-// 0x01023280: 0x1023280: div   v0, a0
+// 0x01023290: 0x1023290: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x01023284: 0x1023284: lw    s5, 6204(s2)
+// 0x01023294: 0x1023294: lw    s5, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1767,15 +1767,15 @@ L_1023274:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01023288: 0x1023288: addiu t0, zero, 1
+// 0x01023298: 0x1023298: addiu t0, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x0102328c: 0x102328c: addiu v0, s5, 8
+// 0x0102329c: 0x102329c: addiu v0, s5, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01023290: 0x1023290: sw    v0, 6204(s2)
+// 0x010232a0: 0x10232a0: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1784,17 +1784,17 @@ L_1023274:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01023294: 0x1023294: mflo  lo
+// 0x010232a4: 0x10232a4: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x01023298: 0x1023298: sw    v0, 0(s5)
+// 0x010232a8: 0x10232a8: sw    v0, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0102329c: 0x102329c: lw    v0, 76(s0)
+// 0x010232ac: 0x10232ac: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1803,7 +1803,7 @@ L_1023274:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010232a0: 0x10232a0: lw    a0, 36(s0)
+// 0x010232b0: 0x10232b0: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1812,20 +1812,20 @@ L_1023274:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010232a4: 0x10232a4: subu  v0, v0, t1
+// 0x010232b4: 0x10232b4: subu  v0, v0, t1
 	ldloc 5
 	ldloc 18
 	sub
 	stloc 5
-// 0x010232a8: 0x10232a8: div   v0, a0
+// 0x010232b8: 0x10232b8: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x010232ac: 0x10232ac: mflo  lo
+// 0x010232bc: 0x10232bc: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010232b0: 0x10232b0: sw    a0, 4(s5)
+// 0x010232c0: 0x10232c0: sw    a0, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1834,8 +1834,8 @@ L_1023274:
 	add
 	ldloc.1
 	stelem.i4
-L_10232b4:
-// 0x010232b4: 0x10232b4: lw    v0, 80(s0)
+L_10232c4:
+// 0x010232c4: 0x10232c4: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1844,7 +1844,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010232b8: 0x10232b8: lw    a0, 32(s0)
+// 0x010232c8: 0x10232c8: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1853,17 +1853,17 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010232bc: 0x10232bc: subu  v0, s7, v0
+// 0x010232cc: 0x10232cc: subu  v0, s7, v0
 	ldloc 15
 	ldloc 5
 	sub
 	stloc 5
-// 0x010232c0: 0x10232c0: div   v0, a0
+// 0x010232d0: 0x10232d0: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x010232c4: 0x10232c4: lw    s6, 6204(s2)
+// 0x010232d4: 0x10232d4: lw    s6, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1872,13 +1872,13 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010232c8: 0x10232c8: sll   zero, zero, 0
-// 0x010232cc: 0x10232cc: addiu v0, s6, 8
+// 0x010232d8: 0x10232d8: sll   zero, zero, 0
+// 0x010232dc: 0x10232dc: addiu v0, s6, 8
 	ldloc 14
 	ldc.i4.8
 	add
 	stloc 5
-// 0x010232d0: 0x10232d0: sw    v0, 6204(s2)
+// 0x010232e0: 0x10232e0: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1887,17 +1887,17 @@ L_10232b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010232d4: 0x10232d4: mflo  lo
+// 0x010232e4: 0x10232e4: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010232d8: 0x10232d8: sw    v0, 0(s6)
+// 0x010232e8: 0x10232e8: sw    v0, 0(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010232dc: 0x10232dc: lw    v0, 76(s0)
+// 0x010232ec: 0x10232ec: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1906,7 +1906,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010232e0: 0x10232e0: lw    a0, 36(s0)
+// 0x010232f0: 0x10232f0: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1915,20 +1915,20 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010232e4: 0x10232e4: subu  v0, v0, s8
+// 0x010232f4: 0x10232f4: subu  v0, v0, s8
 	ldloc 5
 	ldloc 16
 	sub
 	stloc 5
-// 0x010232e8: 0x10232e8: div   v0, a0
+// 0x010232f8: 0x10232f8: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x010232ec: 0x10232ec: mflo  lo
+// 0x010232fc: 0x10232fc: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010232f0: 0x10232f0: beq   s1, zero, 0x10233b4 sw    a0, 4(s6)
+// 0x01023300: 0x1023300: beq   s1, zero, 0x10233c4 sw    a0, 4(s6)
 	ldloc 10
 	ldloc 6
 	ldloc 14
@@ -1938,18 +1938,18 @@ L_10232b4:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_10233b4
+	brfalse L_10233c4
 // --- basic block ---
-// 0x010232f8: 0x10232f8: addu  a0, s6, zero
+// 0x01023308: 0x1023308: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x010232fc: 0x10232fc: addu  a1, s5, zero
+// 0x0102330c: 0x102330c: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x01023300: 0x1023300: addiu a2, zero, 1
+// 0x01023310: 0x1023310: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01023304: 0x1023304: sw    v1, 200(sp)
+// 0x01023314: 0x1023314: sw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1958,7 +1958,7 @@ L_10232b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023308: 0x1023308: sw    a3, 192(sp)
+// 0x01023318: 0x1023318: sw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1967,7 +1967,7 @@ L_10232b4:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0102330c: 0x102330c: sw    t0, 196(sp)
+// 0x0102331c: 0x102331c: sw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1976,7 +1976,7 @@ L_10232b4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01023310: 0x1023310: sw    t1, 188(sp)
+// 0x01023320: 0x1023320: sw    t1, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1985,7 +1985,7 @@ L_10232b4:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01023314: 0x1023314: sw    t2, 184(sp)
+// 0x01023324: 0x1023324: sw    t2, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1994,7 +1994,7 @@ L_10232b4:
 	add
 	ldloc 20
 	stelem.i4
-// 0x01023318: 0x1023318: sw    t3, 180(sp)
+// 0x01023328: 0x1023328: sw    t3, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2003,7 +2003,7 @@ L_10232b4:
 	add
 	ldloc 21
 	stelem.i4
-// 0x0102331c: 0x102331c: sw    t4, 176(sp)
+// 0x0102332c: 0x102332c: sw    t4, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2012,7 +2012,7 @@ L_10232b4:
 	add
 	ldloc 22
 	stelem.i4
-// 0x01023320: 0x1023320: sw    t5, 172(sp)
+// 0x01023330: 0x1023330: sw    t5, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2021,7 +2021,7 @@ L_10232b4:
 	add
 	ldloc 23
 	stelem.i4
-// 0x01023324: 0x1023324: jal   0x1009694 sw    t6, 168(sp)
+// 0x01023334: 0x1023334: jal   0x10096a4 sw    t6, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2035,19 +2035,19 @@ L_10232b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102332c: 0x102332c: lw    a1, 0(s1)
+// 0x0102333c: 0x102333c: lw    a1, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01023330: 0x1023330: lw    a3, 192(sp)
+// 0x01023340: 0x1023340: lw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2056,24 +2056,24 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01023334: 0x1023334: addu  a1, a1, v0
+// 0x01023344: 0x1023344: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x01023338: 0x1023338: slt   a0, a3, v0
+// 0x01023348: 0x1023348: slt   a0, a3, v0
 	ldloc 4
 	ldloc 5
 	clt
 	stloc.1
-// 0x0102333c: 0x102333c: sw    a1, 0(s1)
+// 0x0102334c: 0x102334c: sw    a1, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01023340: 0x1023340: lw    v1, 200(sp)
+// 0x01023350: 0x1023350: lw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2082,7 +2082,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023344: 0x1023344: lw    t0, 196(sp)
+// 0x01023354: 0x1023354: lw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2091,7 +2091,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01023348: 0x1023348: lw    t1, 188(sp)
+// 0x01023358: 0x1023358: lw    t1, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2100,7 +2100,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0102334c: 0x102334c: lw    t2, 184(sp)
+// 0x0102335c: 0x102335c: lw    t2, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2109,7 +2109,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01023350: 0x1023350: lw    t3, 180(sp)
+// 0x01023360: 0x1023360: lw    t3, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2118,7 +2118,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 21
-// 0x01023354: 0x1023354: lw    t4, 176(sp)
+// 0x01023364: 0x1023364: lw    t4, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2127,7 +2127,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 22
-// 0x01023358: 0x1023358: lw    t5, 172(sp)
+// 0x01023368: 0x1023368: lw    t5, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2136,7 +2136,7 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 23
-// 0x0102335c: 0x102335c: lw    t6, 168(sp)
+// 0x0102336c: 0x102336c: lw    t6, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2145,11 +2145,11 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 24
-// 0x01023360: 0x1023360: beq   a0, zero, 0x10233b4 sll   zero, zero, 0
+// 0x01023370: 0x1023370: beq   a0, zero, 0x10233c4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10233b4
+	brfalse L_10233c4
 // --- basic block ---
-// 0x01023368: 0x1023368: sw    t1, 16(s1)
+// 0x01023378: 0x1023378: sw    t1, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2158,7 +2158,7 @@ L_10232b4:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0102336c: 0x102336c: sw    t2, 12(s1)
+// 0x0102337c: 0x102337c: sw    t2, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2167,7 +2167,7 @@ L_10232b4:
 	add
 	ldloc 20
 	stelem.i4
-// 0x01023370: 0x1023370: sw    s8, 24(s1)
+// 0x01023380: 0x1023380: sw    s8, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2176,7 +2176,7 @@ L_10232b4:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01023374: 0x1023374: sw    s7, 20(s1)
+// 0x01023384: 0x1023384: sw    s7, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2185,21 +2185,21 @@ L_10232b4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01023378: 0x1023378: lw    a2, 0(s5)
+// 0x01023388: 0x1023388: lw    a2, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0102337c: 0x102337c: lw    a1, 0(s6)
+// 0x0102338c: 0x102338c: lw    a1, 0(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01023380: 0x1023380: lw    a3, 4(s5)
+// 0x01023390: 0x1023390: lw    a3, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2208,17 +2208,17 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01023384: 0x1023384: addu  a1, a2, a1
+// 0x01023394: 0x1023394: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x01023388: 0x1023388: div   a1, t5
+// 0x01023398: 0x1023398: div   a1, t5
 	ldloc.2
 	ldloc 23
 	div
 	stloc 8
-// 0x0102338c: 0x102338c: lw    a0, 4(s6)
+// 0x0102339c: 0x102339c: lw    a0, 4(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -2227,18 +2227,18 @@ L_10232b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023390: 0x1023390: addu  s5, s6, zero
+// 0x010233a0: 0x10233a0: addu  s5, s6, zero
 	ldloc 14
 	stloc 11
-// 0x01023394: 0x1023394: addu  a0, a3, a0
+// 0x010233a4: 0x10233a4: addu  a0, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc.1
-// 0x01023398: 0x1023398: mflo  lo
+// 0x010233a8: 0x10233a8: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x0102339c: 0x102339c: sw    a1, 4(s1)
+// 0x010233ac: 0x10233ac: sw    a1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2247,16 +2247,16 @@ L_10232b4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010233a0: 0x10233a0: sll   zero, zero, 0
-// 0x010233a4: 0x10233a4: div   a0, t5
+// 0x010233b0: 0x10233b0: sll   zero, zero, 0
+// 0x010233b4: 0x10233b4: div   a0, t5
 	ldloc.1
 	ldloc 23
 	div
 	stloc 8
-// 0x010233a8: 0x10233a8: mflo  lo
+// 0x010233b8: 0x10233b8: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010233ac: 0x10233ac: j	 0x10233bc sw    a0, 8(s1)
+// 0x010233bc: 0x10233bc: j	 0x10233cc sw    a0, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2265,37 +2265,37 @@ L_10232b4:
 	add
 	ldloc.1
 	stelem.i4
-	br L_10233bc
+	br L_10233cc
 // --- basic block ---
-L_10233b4:
-// 0x010233b4: 0x10233b4: addu  v0, a3, zero
+L_10233c4:
+// 0x010233c4: 0x10233c4: addu  v0, a3, zero
 	ldloc 4
 	stloc 5
-// 0x010233b8: 0x10233b8: addu  s5, s6, zero
+// 0x010233c8: 0x10233c8: addu  s5, s6, zero
 	ldloc 14
 	stloc 11
-L_10233bc:
-// 0x010233bc: 0x10233bc: addiu t4, t4, 1
+L_10233cc:
+// 0x010233cc: 0x10233cc: addiu t4, t4, 1
 	ldloc 22
 	ldc.i4.1
 	add
 	stloc 22
-// 0x010233c0: 0x10233c0: addiu t3, t3, 4
+// 0x010233d0: 0x10233d0: addiu t3, t3, 4
 	ldloc 21
 	ldc.i4.4
 	add
 	stloc 21
-// 0x010233c4: 0x10233c4: addu  a3, v0, zero
+// 0x010233d4: 0x10233d4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010233c8: 0x10233c8: addu  t2, s7, zero
+// 0x010233d8: 0x10233d8: addu  t2, s7, zero
 	ldloc 15
 	stloc 20
-// 0x010233cc: 0x10233cc: addu  t1, s8, zero
+// 0x010233dc: 0x10233dc: addu  t1, s8, zero
 	ldloc 16
 	stloc 18
-L_10233d0:
-// 0x010233d0: 0x10233d0: lw    a1, 140(sp)
+L_10233e0:
+// 0x010233e0: 0x10233e0: lw    a1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2304,27 +2304,27 @@ L_10233d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010233d4: 0x10233d4: sll   zero, zero, 0
-// 0x010233d8: 0x10233d8: slt   v0, a1, t4
+// 0x010233e4: 0x10233e4: sll   zero, zero, 0
+// 0x010233e8: 0x10233e8: slt   v0, a1, t4
 	ldloc.2
 	ldloc 22
 	clt
 	stloc 5
-// 0x010233dc: 0x10233dc: beq   v0, zero, 0x1023184 addu  s6, v1, zero
+// 0x010233ec: 0x10233ec: beq   v0, zero, 0x1023194 addu  s6, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc 14
-	brfalse L_1023184
+	brfalse L_1023194
 // --- basic block ---
-// 0x010233e4: 0x10233e4: lui   v1, 0xe0000
+// 0x010233f4: 0x10233f4: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010233e8: 0x10233e8: addiu v1, v1, 29604
+// 0x010233f8: 0x10233f8: addiu v1, v1, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x010233ec: 0x10233ec: lw    v0, 56(v1)
+// 0x010233fc: 0x10233fc: lw    v0, 56(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2333,7 +2333,7 @@ L_10233d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010233f0: 0x10233f0: lw    t1, 56(sp)
+// 0x01023400: 0x1023400: lw    t1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2342,12 +2342,12 @@ L_10233d0:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010233f4: 0x10233f4: slt   a0, v0, s7
+// 0x01023404: 0x1023404: slt   a0, v0, s7
 	ldloc 5
 	ldloc 15
 	clt
 	stloc.1
-// 0x010233f8: 0x10233f8: lw    v1, 60(sp)
+// 0x01023408: 0x1023408: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2356,20 +2356,20 @@ L_10233d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010233fc: 0x10233fc: beq   a0, zero, 0x102340c slt   v0, v0, t1
+// 0x0102340c: 0x102340c: beq   a0, zero, 0x102341c slt   v0, v0, t1
 	ldloc.1
 	ldloc 5
 	ldloc 18
 	clt
 	stloc 5
-	brfalse L_102340c
+	brfalse L_102341c
 // --- basic block ---
-// 0x01023404: 0x1023404: bne   v0, zero, 0x1023460 sll   zero, zero, 0
+// 0x01023414: 0x1023414: bne   v0, zero, 0x1023470 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023460
+	brtrue L_1023470
 // --- basic block ---
-L_102340c:
-// 0x0102340c: 0x102340c: lw    v0, 64(s0)
+L_102341c:
+// 0x0102341c: 0x102341c: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2378,26 +2378,26 @@ L_102340c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023410: 0x1023410: sll   zero, zero, 0
-// 0x01023414: 0x1023414: slt   a0, s7, v0
+// 0x01023420: 0x1023420: sll   zero, zero, 0
+// 0x01023424: 0x1023424: slt   a0, s7, v0
 	ldloc 15
 	ldloc 5
 	clt
 	stloc.1
-// 0x01023418: 0x1023418: beq   a0, zero, 0x1023428 slt   v0, t1, v0
+// 0x01023428: 0x1023428: beq   a0, zero, 0x1023438 slt   v0, t1, v0
 	ldloc.1
 	ldloc 18
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_1023428
+	brfalse L_1023438
 // --- basic block ---
-// 0x01023420: 0x1023420: bne   v0, zero, 0x1023460 sll   zero, zero, 0
+// 0x01023430: 0x1023430: bne   v0, zero, 0x1023470 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023460
+	brtrue L_1023470
 // --- basic block ---
-L_1023428:
-// 0x01023428: 0x1023428: lw    v0, 60(s0)
+L_1023438:
+// 0x01023438: 0x1023438: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2406,26 +2406,26 @@ L_1023428:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102342c: 0x102342c: sll   zero, zero, 0
-// 0x01023430: 0x1023430: slt   a0, v0, s8
+// 0x0102343c: 0x102343c: sll   zero, zero, 0
+// 0x01023440: 0x1023440: slt   a0, v0, s8
 	ldloc 5
 	ldloc 16
 	clt
 	stloc.1
-// 0x01023434: 0x1023434: beq   a0, zero, 0x1023444 slt   v0, v0, v1
+// 0x01023444: 0x1023444: beq   a0, zero, 0x1023454 slt   v0, v0, v1
 	ldloc.1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-	brfalse L_1023444
+	brfalse L_1023454
 // --- basic block ---
-// 0x0102343c: 0x102343c: bne   v0, zero, 0x1023460 sll   zero, zero, 0
+// 0x0102344c: 0x102344c: bne   v0, zero, 0x1023470 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023460
+	brtrue L_1023470
 // --- basic block ---
-L_1023444:
-// 0x01023444: 0x1023444: lw    v0, 68(s0)
+L_1023454:
+// 0x01023454: 0x1023454: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2434,43 +2434,43 @@ L_1023444:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023448: 0x1023448: sll   zero, zero, 0
-// 0x0102344c: 0x102344c: slt   a0, s8, v0
+// 0x01023458: 0x1023458: sll   zero, zero, 0
+// 0x0102345c: 0x102345c: slt   a0, s8, v0
 	ldloc 16
 	ldloc 5
 	clt
 	stloc.1
-// 0x01023450: 0x1023450: beq   a0, zero, 0x1023ff4 slt   v0, v1, v0
+// 0x01023460: 0x1023460: beq   a0, zero, 0x1024004 slt   v0, v1, v0
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_1023ff4
+	brfalse L_1024004
 // --- basic block ---
-// 0x01023458: 0x1023458: beq   v0, zero, 0x1023ff4 sll   zero, zero, 0
+// 0x01023468: 0x1023468: beq   v0, zero, 0x1024004 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1023ff4
+	brfalse L_1024004
 // --- basic block ---
-L_1023460:
-// 0x01023460: 0x1023460: beq   t0, zero, 0x102375c addiu a0, sp, 48
+L_1023470:
+// 0x01023470: 0x1023470: beq   t0, zero, 0x102376c addiu a0, sp, 48
 	ldloc 13
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-	brfalse L_102375c
+	brfalse L_102376c
 // --- basic block ---
-// 0x01023468: 0x1023468: lw    v0, -20612(s3)
+// 0x01023478: 0x1023478: lw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102346c: 0x102346c: lw    v1, 6204(s2)
+// 0x0102347c: 0x102347c: lw    v1, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2479,69 +2479,69 @@ L_1023460:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023470: 0x1023470: sll   zero, zero, 0
-// 0x01023474: 0x1023474: subu  a0, v1, v0
+// 0x01023480: 0x1023480: sll   zero, zero, 0
+// 0x01023484: 0x1023484: subu  a0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc.1
-// 0x01023478: 0x1023478: slti  a1, a0, 16
+// 0x01023488: 0x1023488: slti  a1, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	clt
 	stloc.2
-// 0x0102347c: 0x102347c: bne   a1, zero, 0x10234a0 sra   a0, a0, 3
+// 0x0102348c: 0x102348c: bne   a1, zero, 0x10234b0 sra   a0, a0, 3
 	ldloc.2
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-	brtrue L_10234a0
+	brtrue L_10234b0
 // --- basic block ---
-// 0x01023484: 0x1023484: lw    v0, 28532(s4)
+// 0x01023494: 0x1023494: lw    v0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023488: 0x1023488: sll   zero, zero, 0
-// 0x0102348c: 0x102348c: addiu a1, v0, 4
+// 0x01023498: 0x1023498: sll   zero, zero, 0
+// 0x0102349c: 0x102349c: addiu a1, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01023490: 0x1023490: sw    a0, 0(v0)
+// 0x010234a0: 0x10234a0: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01023494: 0x1023494: sw    v1, -20612(s3)
+// 0x010234a4: 0x10234a4: sw    v1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023498: 0x1023498: j	 0x1023758 sw    a1, 28532(s4)
+// 0x010234a8: 0x10234a8: j	 0x1023768 sw    a1, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.2
 	stelem.i4
-	br L_1023758
+	br L_1023768
 // --- basic block ---
-L_10234a0:
-// 0x010234a0: 0x10234a0: j	 0x1023758 sw    v0, 6204(s2)
+L_10234b0:
+// 0x010234b0: 0x10234b0: j	 0x1023768 sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2550,10 +2550,10 @@ L_10234a0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1023758
+	br L_1023768
 // --- basic block ---
-L_10234a8:
-// 0x010234a8: 0x10234a8: lw    v0, 80(s0)
+L_10234b8:
+// 0x010234b8: 0x10234b8: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2562,7 +2562,7 @@ L_10234a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010234ac: 0x10234ac: lw    a0, 32(s0)
+// 0x010234bc: 0x10234bc: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2571,17 +2571,17 @@ L_10234a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010234b0: 0x10234b0: subu  v0, s7, v0
+// 0x010234c0: 0x10234c0: subu  v0, s7, v0
 	ldloc 15
 	ldloc 5
 	sub
 	stloc 5
-// 0x010234b4: 0x10234b4: div   v0, a0
+// 0x010234c4: 0x10234c4: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x010234b8: 0x10234b8: lw    s5, 6204(s2)
+// 0x010234c8: 0x10234c8: lw    s5, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2590,13 +2590,13 @@ L_10234a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010234bc: 0x10234bc: sll   zero, zero, 0
-// 0x010234c0: 0x10234c0: addiu v0, s5, 8
+// 0x010234cc: 0x10234cc: sll   zero, zero, 0
+// 0x010234d0: 0x10234d0: addiu v0, s5, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 5
-// 0x010234c4: 0x10234c4: sw    v0, 6204(s2)
+// 0x010234d4: 0x10234d4: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2605,17 +2605,17 @@ L_10234a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010234c8: 0x10234c8: mflo  lo
+// 0x010234d8: 0x10234d8: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010234cc: 0x10234cc: sw    a0, 0(s5)
+// 0x010234dc: 0x10234dc: sw    a0, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010234d0: 0x10234d0: lw    v0, 76(s0)
+// 0x010234e0: 0x10234e0: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2624,7 +2624,7 @@ L_10234a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010234d4: 0x10234d4: lw    a0, 36(s0)
+// 0x010234e4: 0x10234e4: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2633,20 +2633,20 @@ L_10234a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010234d8: 0x10234d8: subu  v0, v0, s8
+// 0x010234e8: 0x10234e8: subu  v0, v0, s8
 	ldloc 5
 	ldloc 16
 	sub
 	stloc 5
-// 0x010234dc: 0x10234dc: div   v0, a0
+// 0x010234ec: 0x10234ec: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x010234e0: 0x10234e0: mflo  lo
+// 0x010234f0: 0x10234f0: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010234e4: 0x10234e4: sw    a0, 4(s5)
+// 0x010234f4: 0x10234f4: sw    a0, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2655,8 +2655,8 @@ L_10234a8:
 	add
 	ldloc.1
 	stelem.i4
-L_10234e8:
-// 0x010234e8: 0x10234e8: lw    v0, 80(s0)
+L_10234f8:
+// 0x010234f8: 0x10234f8: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2665,7 +2665,7 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010234ec: 0x10234ec: lw    a0, 32(s0)
+// 0x010234fc: 0x10234fc: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2674,17 +2674,17 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010234f0: 0x10234f0: subu  v0, t1, v0
+// 0x01023500: 0x1023500: subu  v0, t1, v0
 	ldloc 18
 	ldloc 5
 	sub
 	stloc 5
-// 0x010234f4: 0x10234f4: div   v0, a0
+// 0x01023504: 0x1023504: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x010234f8: 0x10234f8: lw    t0, 6204(s2)
+// 0x01023508: 0x1023508: lw    t0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2693,44 +2693,44 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010234fc: 0x10234fc: lw    a0, -20612(s3)
+// 0x0102350c: 0x102350c: lw    a0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023500: 0x1023500: addiu a1, t0, 8
+// 0x01023510: 0x1023510: addiu a1, t0, 8
 	ldloc 13
 	ldc.i4.8
 	add
 	stloc.2
-// 0x01023504: 0x1023504: lw    v0, 28532(s4)
+// 0x01023514: 0x1023514: lw    v0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023508: 0x1023508: subu  a0, a1, a0
+// 0x01023518: 0x1023518: subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-// 0x0102350c: 0x102350c: sw    a1, -20612(s3)
+// 0x0102351c: 0x102351c: sw    a1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023510: 0x1023510: sw    a1, 6204(s2)
+// 0x01023520: 0x1023520: sw    a1, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2739,36 +2739,36 @@ L_10234e8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023514: 0x1023514: addiu a2, v0, 4
+// 0x01023524: 0x1023524: addiu a2, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc.3
-// 0x01023518: 0x1023518: sw    a2, 28532(s4)
+// 0x01023528: 0x1023528: sw    a2, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102351c: 0x102351c: sra   a0, a0, 3
+// 0x0102352c: 0x102352c: sra   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-// 0x01023520: 0x1023520: mflo  lo
+// 0x01023530: 0x1023530: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01023524: 0x1023524: sw    a1, 0(t0)
+// 0x01023534: 0x1023534: sw    a1, 0(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01023528: 0x1023528: lw    a1, 76(s0)
+// 0x01023538: 0x1023538: lw    a1, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2777,7 +2777,7 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102352c: 0x102352c: lw    a2, 36(s0)
+// 0x0102353c: 0x102353c: lw    a2, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2786,20 +2786,20 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01023530: 0x1023530: subu  a1, a1, v1
+// 0x01023540: 0x1023540: subu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	sub
 	stloc.2
-// 0x01023534: 0x1023534: div   a1, a2
+// 0x01023544: 0x1023544: div   a1, a2
 	ldloc.2
 	ldloc.3
 	div
 	stloc 8
-// 0x01023538: 0x1023538: mflo  lo
+// 0x01023548: 0x1023548: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x0102353c: 0x102353c: sw    a2, 4(t0)
+// 0x0102354c: 0x102354c: sw    a2, 4(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2808,7 +2808,7 @@ L_10234e8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01023540: 0x1023540: beq   s1, zero, 0x1023758 sw    a0, 0(v0)
+// 0x01023550: 0x1023550: beq   s1, zero, 0x1023768 sw    a0, 0(v0)
 	ldloc 10
 	ldloc 6
 	ldloc 5
@@ -2816,18 +2816,18 @@ L_10234e8:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_1023758
+	brfalse L_1023768
 // --- basic block ---
-// 0x01023548: 0x1023548: addu  a0, t0, zero
+// 0x01023558: 0x1023558: addu  a0, t0, zero
 	ldloc 13
 	stloc.1
-// 0x0102354c: 0x102354c: addu  a1, s5, zero
+// 0x0102355c: 0x102355c: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x01023550: 0x1023550: addiu a2, zero, 1
+// 0x01023560: 0x1023560: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01023554: 0x1023554: sw    v1, 200(sp)
+// 0x01023564: 0x1023564: sw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2836,7 +2836,7 @@ L_10234e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023558: 0x1023558: sw    a3, 192(sp)
+// 0x01023568: 0x1023568: sw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2845,7 +2845,7 @@ L_10234e8:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0102355c: 0x102355c: sw    t0, 196(sp)
+// 0x0102356c: 0x102356c: sw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2854,7 +2854,7 @@ L_10234e8:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01023560: 0x1023560: jal   0x1009694 sw    t1, 188(sp)
+// 0x01023570: 0x1023570: jal   0x10096a4 sw    t1, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2868,19 +2868,19 @@ L_10234e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01023568: 0x1023568: lw    a0, 0(s1)
+// 0x01023578: 0x1023578: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102356c: 0x102356c: lw    a3, 192(sp)
+// 0x0102357c: 0x102357c: lw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2889,7 +2889,7 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01023570: 0x1023570: lw    v1, 200(sp)
+// 0x01023580: 0x1023580: lw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2898,24 +2898,24 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023574: 0x1023574: slt   a3, a3, v0
+// 0x01023584: 0x1023584: slt   a3, a3, v0
 	ldloc 4
 	ldloc 5
 	clt
 	stloc 4
-// 0x01023578: 0x1023578: addu  v0, a0, v0
+// 0x01023588: 0x1023588: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0102357c: 0x102357c: sw    v0, 0(s1)
+// 0x0102358c: 0x102358c: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01023580: 0x1023580: lw    t0, 196(sp)
+// 0x01023590: 0x1023590: lw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2924,7 +2924,7 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01023584: 0x1023584: lw    t1, 188(sp)
+// 0x01023594: 0x1023594: lw    t1, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2933,15 +2933,15 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01023588: 0x1023588: beq   a3, zero, 0x102375c addiu a0, sp, 48
+// 0x01023598: 0x1023598: beq   a3, zero, 0x102376c addiu a0, sp, 48
 	ldloc 4
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-	brfalse L_102375c
+	brfalse L_102376c
 // --- basic block ---
-// 0x01023590: 0x1023590: sw    s8, 16(s1)
+// 0x010235a0: 0x10235a0: sw    s8, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2950,7 +2950,7 @@ L_10234e8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01023594: 0x1023594: sw    s7, 12(s1)
+// 0x010235a4: 0x10235a4: sw    s7, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2959,7 +2959,7 @@ L_10234e8:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01023598: 0x1023598: sw    v1, 24(s1)
+// 0x010235a8: 0x10235a8: sw    v1, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2968,7 +2968,7 @@ L_10234e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102359c: 0x102359c: sw    t1, 20(s1)
+// 0x010235ac: 0x10235ac: sw    t1, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2977,14 +2977,14 @@ L_10234e8:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010235a0: 0x10235a0: lw    v0, 0(t0)
+// 0x010235b0: 0x10235b0: lw    v0, 0(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010235a4: 0x10235a4: lw    a1, 4(s5)
+// 0x010235b4: 0x10235b4: lw    a1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2993,7 +2993,7 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010235a8: 0x10235a8: lw    a0, 4(t0)
+// 0x010235b8: 0x10235b8: lw    a0, 4(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -3002,35 +3002,35 @@ L_10234e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010235ac: 0x10235ac: lw    v1, 0(s5)
+// 0x010235bc: 0x10235bc: lw    v1, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010235b0: 0x10235b0: addu  a0, a1, a0
+// 0x010235c0: 0x10235c0: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x010235b4: 0x10235b4: addu  v1, v1, v0
+// 0x010235c4: 0x10235c4: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010235b8: 0x10235b8: addiu v0, zero, 2
+// 0x010235c8: 0x10235c8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010235bc: 0x10235bc: div   a0, v0
+// 0x010235cc: 0x10235cc: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 8
-// 0x010235c0: 0x10235c0: mflo  lo
+// 0x010235d0: 0x10235d0: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010235c4: 0x10235c4: sw    a0, 8(s1)
+// 0x010235d4: 0x10235d4: sw    a0, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3039,16 +3039,16 @@ L_10234e8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010235c8: 0x10235c8: sll   zero, zero, 0
-// 0x010235cc: 0x10235cc: div   v1, v0
+// 0x010235d8: 0x10235d8: sll   zero, zero, 0
+// 0x010235dc: 0x10235dc: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 8
-// 0x010235d0: 0x10235d0: mflo  lo
+// 0x010235e0: 0x10235e0: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x010235d4: 0x10235d4: j	 0x1023758 sw    v1, 4(s1)
+// 0x010235e4: 0x10235e4: j	 0x1023768 sw    v1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3057,63 +3057,63 @@ L_10234e8:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1023758
+	br L_1023768
 // --- basic block ---
-L_10235dc:
-// 0x010235dc: 0x10235dc: lw    v0, -20612(s3)
+L_10235ec:
+// 0x010235ec: 0x10235ec: lw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x010235e0: 0x10235e0: lui   v1, 0x40000
+// 0x010235f0: 0x10235f0: lui   v1, 0x40000
 	ldc.i4 262144
 	stloc 7
-// 0x010235e4: 0x10235e4: addiu v1, v1, -20600
+// 0x010235f4: 0x10235f4: addiu v1, v1, -20136
 	ldloc 7
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 7
-// 0x010235e8: 0x10235e8: addiu v0, v0, 16
+// 0x010235f8: 0x10235f8: addiu v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010235ec: 0x10235ec: subu  v0, v0, v1
+// 0x010235fc: 0x10235fc: subu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 5
-// 0x010235f0: 0x10235f0: ori   v1, zero, 32768
+// 0x01023600: 0x1023600: ori   v1, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 7
-// 0x010235f4: 0x10235f4: slt   v0, v0, v1
+// 0x01023604: 0x1023604: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010235f8: 0x10235f8: bne   v0, zero, 0x1023608 sll   zero, zero, 0
+// 0x01023608: 0x1023608: bne   v0, zero, 0x1023618 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023608
+	brtrue L_1023618
 // --- basic block ---
-// 0x01023600: 0x1023600: jal   0x1021f34 sll   zero, zero, 0
+// 0x01023610: 0x1023610: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1023608:
-// 0x01023608: 0x1023608: lw    v1, 48(sp)
+L_1023618:
+// 0x01023618: 0x1023618: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3122,7 +3122,7 @@ L_1023608:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102360c: 0x102360c: lw    v0, 56(s0)
+// 0x0102361c: 0x102361c: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3131,17 +3131,17 @@ L_1023608:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023610: 0x1023610: sll   zero, zero, 0
-// 0x01023614: 0x1023614: slt   a0, v0, v1
+// 0x01023620: 0x1023620: sll   zero, zero, 0
+// 0x01023624: 0x1023624: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x01023618: 0x1023618: beq   a0, zero, 0x1023634 sll   zero, zero, 0
+// 0x01023628: 0x1023628: beq   a0, zero, 0x1023644 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1023634
+	brfalse L_1023644
 // --- basic block ---
-// 0x01023620: 0x1023620: lw    a0, 56(sp)
+// 0x01023630: 0x1023630: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3150,22 +3150,22 @@ L_1023608:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023624: 0x1023624: sll   zero, zero, 0
-// 0x01023628: 0x1023628: slt   v0, v0, a0
+// 0x01023634: 0x1023634: sll   zero, zero, 0
+// 0x01023638: 0x1023638: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x0102362c: 0x102362c: bne   v0, zero, 0x102375c addiu a0, sp, 48
+// 0x0102363c: 0x102363c: bne   v0, zero, 0x102376c addiu a0, sp, 48
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-	brtrue L_102375c
+	brtrue L_102376c
 // --- basic block ---
-L_1023634:
-// 0x01023634: 0x1023634: lw    v0, 64(s0)
+L_1023644:
+// 0x01023644: 0x1023644: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3174,17 +3174,17 @@ L_1023634:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023638: 0x1023638: sll   zero, zero, 0
-// 0x0102363c: 0x102363c: slt   v1, v1, v0
+// 0x01023648: 0x1023648: sll   zero, zero, 0
+// 0x0102364c: 0x102364c: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01023640: 0x1023640: beq   v1, zero, 0x102365c sll   zero, zero, 0
+// 0x01023650: 0x1023650: beq   v1, zero, 0x102366c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_102365c
+	brfalse L_102366c
 // --- basic block ---
-// 0x01023648: 0x1023648: lw    v1, 56(sp)
+// 0x01023658: 0x1023658: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3193,22 +3193,22 @@ L_1023634:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102364c: 0x102364c: sll   zero, zero, 0
-// 0x01023650: 0x1023650: slt   v0, v1, v0
+// 0x0102365c: 0x102365c: sll   zero, zero, 0
+// 0x01023660: 0x1023660: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01023654: 0x1023654: bne   v0, zero, 0x102375c addiu a0, sp, 48
+// 0x01023664: 0x1023664: bne   v0, zero, 0x102376c addiu a0, sp, 48
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-	brtrue L_102375c
+	brtrue L_102376c
 // --- basic block ---
-L_102365c:
-// 0x0102365c: 0x102365c: lw    v1, 52(sp)
+L_102366c:
+// 0x0102366c: 0x102366c: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3217,7 +3217,7 @@ L_102365c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023660: 0x1023660: lw    v0, 60(s0)
+// 0x01023670: 0x1023670: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3226,17 +3226,17 @@ L_102365c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023664: 0x1023664: sll   zero, zero, 0
-// 0x01023668: 0x1023668: slt   a0, v0, v1
+// 0x01023674: 0x1023674: sll   zero, zero, 0
+// 0x01023678: 0x1023678: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x0102366c: 0x102366c: beq   a0, zero, 0x1023688 sll   zero, zero, 0
+// 0x0102367c: 0x102367c: beq   a0, zero, 0x1023698 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1023688
+	brfalse L_1023698
 // --- basic block ---
-// 0x01023674: 0x1023674: lw    a0, 60(sp)
+// 0x01023684: 0x1023684: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3245,22 +3245,22 @@ L_102365c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023678: 0x1023678: sll   zero, zero, 0
-// 0x0102367c: 0x102367c: slt   v0, v0, a0
+// 0x01023688: 0x1023688: sll   zero, zero, 0
+// 0x0102368c: 0x102368c: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x01023680: 0x1023680: bne   v0, zero, 0x102375c addiu a0, sp, 48
+// 0x01023690: 0x1023690: bne   v0, zero, 0x102376c addiu a0, sp, 48
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-	brtrue L_102375c
+	brtrue L_102376c
 // --- basic block ---
-L_1023688:
-// 0x01023688: 0x1023688: lw    v0, 68(s0)
+L_1023698:
+// 0x01023698: 0x1023698: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3269,17 +3269,17 @@ L_1023688:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102368c: 0x102368c: sll   zero, zero, 0
-// 0x01023690: 0x1023690: slt   v1, v1, v0
+// 0x0102369c: 0x102369c: sll   zero, zero, 0
+// 0x010236a0: 0x10236a0: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01023694: 0x1023694: beq   v1, zero, 0x1024004 sll   zero, zero, 0
+// 0x010236a4: 0x10236a4: beq   v1, zero, 0x1024014 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1024004
+	brfalse L_1024014
 // --- basic block ---
-// 0x0102369c: 0x102369c: lw    v1, 60(sp)
+// 0x010236ac: 0x10236ac: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3288,31 +3288,31 @@ L_1023688:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010236a0: 0x10236a0: sll   zero, zero, 0
-// 0x010236a4: 0x10236a4: slt   v0, v1, v0
+// 0x010236b0: 0x10236b0: sll   zero, zero, 0
+// 0x010236b4: 0x10236b4: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010236a8: 0x10236a8: bne   v0, zero, 0x102375c addiu a0, sp, 48
+// 0x010236b8: 0x10236b8: bne   v0, zero, 0x102376c addiu a0, sp, 48
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-	brtrue L_102375c
+	brtrue L_102376c
 // --- basic block ---
-// 0x010236b0: 0x10236b0: j	 0x1024004 sll   zero, zero, 0
-	br L_1024004
+// 0x010236c0: 0x10236c0: j	 0x1024014 sll   zero, zero, 0
+	br L_1024014
 // --- basic block ---
-L_10236b8:
-// 0x010236b8: 0x10236b8: addu  a0, s7, zero
+L_10236c8:
+// 0x010236c8: 0x10236c8: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-// 0x010236bc: 0x10236bc: addu  a1, s5, zero
+// 0x010236cc: 0x10236cc: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x010236c0: 0x10236c0: jal   0x1009694 addiu a2, zero, 1
+// 0x010236d0: 0x10236d0: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -3320,19 +3320,19 @@ L_10236b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010236c8: 0x10236c8: sw    v0, 0(s1)
+// 0x010236d8: 0x10236d8: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010236cc: 0x10236cc: lw    v1, 48(sp)
+// 0x010236dc: 0x10236dc: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3341,10 +3341,10 @@ L_10236b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010236d0: 0x10236d0: addiu v0, zero, 2
+// 0x010236e0: 0x10236e0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010236d4: 0x10236d4: sw    v1, 12(s1)
+// 0x010236e4: 0x10236e4: sw    v1, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3353,7 +3353,7 @@ L_10236b8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010236d8: 0x10236d8: lw    v1, 52(sp)
+// 0x010236e8: 0x10236e8: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3362,8 +3362,8 @@ L_10236b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010236dc: 0x10236dc: sll   zero, zero, 0
-// 0x010236e0: 0x10236e0: sw    v1, 16(s1)
+// 0x010236ec: 0x10236ec: sll   zero, zero, 0
+// 0x010236f0: 0x10236f0: sw    v1, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3372,7 +3372,7 @@ L_10236b8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010236e4: 0x10236e4: lw    v1, 56(sp)
+// 0x010236f4: 0x10236f4: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3381,8 +3381,8 @@ L_10236b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010236e8: 0x10236e8: sll   zero, zero, 0
-// 0x010236ec: 0x10236ec: sw    v1, 20(s1)
+// 0x010236f8: 0x10236f8: sll   zero, zero, 0
+// 0x010236fc: 0x10236fc: sw    v1, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3391,7 +3391,7 @@ L_10236b8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010236f0: 0x10236f0: lw    v1, 60(sp)
+// 0x01023700: 0x1023700: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3400,8 +3400,8 @@ L_10236b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010236f4: 0x10236f4: sll   zero, zero, 0
-// 0x010236f8: 0x10236f8: sw    v1, 24(s1)
+// 0x01023704: 0x1023704: sll   zero, zero, 0
+// 0x01023708: 0x1023708: sw    v1, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3410,7 +3410,7 @@ L_10236b8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010236fc: 0x10236fc: lw    a1, 4(s5)
+// 0x0102370c: 0x102370c: lw    a1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3419,7 +3419,7 @@ L_10236b8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023700: 0x1023700: lw    a0, 4(s7)
+// 0x01023710: 0x1023710: lw    a0, 4(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -3428,24 +3428,24 @@ L_10236b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023704: 0x1023704: lw    a2, 0(s5)
+// 0x01023714: 0x1023714: lw    a2, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01023708: 0x1023708: addu  a0, a1, a0
+// 0x01023718: 0x1023718: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0102370c: 0x102370c: div   a0, v0
+// 0x0102371c: 0x102371c: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 8
-// 0x01023710: 0x1023710: lw    v1, 8(s5)
+// 0x01023720: 0x1023720: lw    v1, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3454,16 +3454,16 @@ L_10236b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023714: 0x1023714: sll   zero, zero, 0
-// 0x01023718: 0x1023718: addu  v1, a2, v1
+// 0x01023724: 0x1023724: sll   zero, zero, 0
+// 0x01023728: 0x1023728: addu  v1, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x0102371c: 0x102371c: mflo  lo
+// 0x0102372c: 0x102372c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01023720: 0x1023720: sw    a0, 8(s1)
+// 0x01023730: 0x1023730: sw    a0, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3472,16 +3472,16 @@ L_10236b8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01023724: 0x1023724: sll   zero, zero, 0
-// 0x01023728: 0x1023728: div   v1, v0
+// 0x01023734: 0x1023734: sll   zero, zero, 0
+// 0x01023738: 0x1023738: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 8
-// 0x0102372c: 0x102372c: mflo  lo
+// 0x0102373c: 0x102373c: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01023730: 0x1023730: sw    v1, 4(s1)
+// 0x01023740: 0x1023740: sw    v1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3490,8 +3490,8 @@ L_10236b8:
 	add
 	ldloc 7
 	stelem.i4
-L_1023734:
-// 0x01023734: 0x1023734: lw    v0, 6204(s2)
+L_1023744:
+// 0x01023744: 0x1023744: lw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3500,72 +3500,72 @@ L_1023734:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023738: 0x1023738: lw    a1, -20612(s3)
+// 0x01023748: 0x1023748: lw    a1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102373c: 0x102373c: lw    v1, 28532(s4)
+// 0x0102374c: 0x102374c: lw    v1, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023740: 0x1023740: subu  a1, v0, a1
+// 0x01023750: 0x1023750: subu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	sub
 	stloc.2
-// 0x01023744: 0x1023744: sra   a1, a1, 3
+// 0x01023754: 0x1023754: sra   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shr
 	stloc.2
-// 0x01023748: 0x1023748: addiu a0, v1, 4
+// 0x01023758: 0x1023758: addiu a0, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc.1
-// 0x0102374c: 0x102374c: sw    a1, 0(v1)
+// 0x0102375c: 0x102375c: sw    a1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01023750: 0x1023750: sw    v0, -20612(s3)
+// 0x01023760: 0x1023760: sw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 5
 	stelem.i4
-// 0x01023754: 0x1023754: sw    a0, 28532(s4)
+// 0x01023764: 0x1023764: sw    a0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.1
 	stelem.i4
-L_1023758:
-// 0x01023758: 0x1023758: addiu a0, sp, 48
+L_1023768:
+// 0x01023768: 0x1023768: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-L_102375c:
-// 0x0102375c: 0x102375c: lw    v0, 140(sp)
+L_102376c:
+// 0x0102376c: 0x102376c: lw    v0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3574,26 +3574,26 @@ L_102375c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023760: 0x1023760: lui   v1, 0x10000
+// 0x01023770: 0x1023770: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01023764: 0x1023764: addiu v1, v1, -29240
+// 0x01023774: 0x1023774: addiu v1, v1, -29240
 	ldloc 7
 	ldc.i4 -29240
 	add
 	stloc 7
-// 0x01023768: 0x1023768: addu  a3, s6, zero
+// 0x01023778: 0x1023778: addu  a3, s6, zero
 	ldloc 14
 	stloc 4
-// 0x0102376c: 0x102376c: addiu a1, sp, 56
+// 0x0102377c: 0x102377c: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x01023770: 0x1023770: addu  a2, a0, zero
+// 0x01023780: 0x1023780: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x01023774: 0x1023774: sw    v0, 16(sp)
+// 0x01023784: 0x1023784: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3602,7 +3602,7 @@ L_102375c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01023778: 0x1023778: sw    zero, 20(sp)
+// 0x01023788: 0x1023788: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3611,7 +3611,7 @@ L_102375c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102377c: 0x102377c: jal   0x1022070 sw    v1, 24(sp)
+// 0x0102378c: 0x102378c: jal   0x1022080 sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3625,37 +3625,37 @@ L_102375c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_draw_line_points_1022070(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_draw_line_points_1022080(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01023784: 0x1023784: j	 0x1023dc4 sll   zero, zero, 0
-	br L_1023dc4
+// 0x01023794: 0x1023794: j	 0x1023dd4 sll   zero, zero, 0
+	br L_1023dd4
 // --- basic block ---
-L_102378c:
-// 0x0102378c: 0x102378c: beq   s1, zero, 0x1023798 addiu v0, zero, -1
+L_102379c:
+// 0x0102379c: 0x102379c: beq   s1, zero, 0x10237a8 addiu v0, zero, -1
 	ldloc 10
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1023798
+	brfalse L_10237a8
 // --- basic block ---
-// 0x01023794: 0x1023794: sw    zero, 0(s1)
+// 0x010237a4: 0x10237a4: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1023798:
-// 0x01023798: 0x1023798: beq   s6, v0, 0x1023c48 lui   a1, 0x40000
+L_10237a8:
+// 0x010237a8: 0x10237a8: beq   s6, v0, 0x1023c58 lui   a1, 0x40000
 	ldloc 14
 	ldloc 5
 	ldc.i4 262144
 	stloc.2
-	beq  L_1023c48
+	beq  L_1023c58
 // --- basic block ---
-// 0x010237a0: 0x10237a0: lw    a0, 140(sp)
+// 0x010237b0: 0x10237b0: lw    a0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3664,56 +3664,56 @@ L_1023798:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010237a4: 0x10237a4: lw    v1, -20612(s3)
+// 0x010237b4: 0x10237b4: lw    v1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 7
-// 0x010237a8: 0x10237a8: subu  v0, a0, s6
+// 0x010237b8: 0x10237b8: subu  v0, a0, s6
 	ldloc.1
 	ldloc 14
 	sub
 	stloc 5
-// 0x010237ac: 0x10237ac: addiu v0, v0, 3
+// 0x010237bc: 0x10237bc: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x010237b0: 0x10237b0: sll   v0, v0, 3
+// 0x010237c0: 0x10237c0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010237b4: 0x10237b4: addu  v0, v1, v0
+// 0x010237c4: 0x10237c4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010237b8: 0x10237b8: addiu a1, a1, -20600
+// 0x010237c8: 0x10237c8: addiu a1, a1, -20136
 	ldloc.2
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc.2
-// 0x010237bc: 0x10237bc: subu  v0, v0, a1
+// 0x010237cc: 0x10237cc: subu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	sub
 	stloc 5
-// 0x010237c0: 0x10237c0: ori   v1, zero, 32768
+// 0x010237d0: 0x10237d0: ori   v1, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 7
-// 0x010237c4: 0x10237c4: slt   v0, v0, v1
+// 0x010237d4: 0x10237d4: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010237c8: 0x10237c8: lw    s7, 52(sp)
+// 0x010237d8: 0x10237d8: lw    s7, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3722,7 +3722,7 @@ L_1023798:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010237cc: 0x10237cc: lw    s8, 48(sp)
+// 0x010237dc: 0x10237dc: lw    s8, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3731,69 +3731,69 @@ L_1023798:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010237d0: 0x10237d0: bne   v0, zero, 0x10237e0 sll   zero, zero, 0
+// 0x010237e0: 0x10237e0: bne   v0, zero, 0x10237f0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10237e0
+	brtrue L_10237f0
 // --- basic block ---
-// 0x010237d8: 0x10237d8: jal   0x1021f34 sll   zero, zero, 0
+// 0x010237e8: 0x10237e8: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10237e0:
-// 0x010237e0: 0x10237e0: sll   t3, s6, 2
+L_10237f0:
+// 0x010237f0: 0x10237f0: sll   t3, s6, 2
 	ldloc 14
 	ldc.i4.2
 	shl
 	stloc 21
-// 0x010237e4: 0x10237e4: addu  t2, s8, zero
+// 0x010237f4: 0x10237f4: addu  t2, s8, zero
 	ldloc 16
 	stloc 20
-// 0x010237e8: 0x10237e8: addu  t1, s7, zero
+// 0x010237f8: 0x10237f8: addu  t1, s7, zero
 	ldloc 15
 	stloc 18
-// 0x010237ec: 0x10237ec: addu  t0, zero, zero
+// 0x010237fc: 0x10237fc: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010237f0: 0x10237f0: addiu a3, zero, -1
+// 0x01023800: 0x1023800: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010237f4: 0x10237f4: addu  s5, zero, zero
+// 0x01023804: 0x1023804: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010237f8: 0x10237f8: addiu t5, zero, 16
+// 0x01023808: 0x1023808: addiu t5, zero, 16
 	ldc.i4.s 16
 	stloc 23
-// 0x010237fc: 0x10237fc: j	 0x1023a44 addiu t4, zero, 2
+// 0x0102380c: 0x102380c: j	 0x1023a54 addiu t4, zero, 2
 	ldc.i4.2
 	stloc 22
-	br L_1023a44
+	br L_1023a54
 // --- basic block ---
-L_1023804:
-// 0x01023804: 0x1023804: lw    v0, 31240(v1)
+L_1023814:
+// 0x01023814: 0x1023814: lw    v0, 31704(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023808: 0x1023808: lui   a0, 0x0
+// 0x01023818: 0x1023818: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102380c: 0x102380c: addu  v0, v0, t3
+// 0x0102381c: 0x102381c: addu  v0, v0, t3
 	ldloc 5
 	ldloc 21
 	add
 	stloc 5
-// 0x01023810: 0x1023810: lw    v1, 556(a0)
+// 0x01023820: 0x1023820: lw    v1, 556(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3802,14 +3802,14 @@ L_1023804:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023814: 0x1023814: lw    a0, 0(v0)
+// 0x01023824: 0x1023824: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01023818: 0x1023818: lw    v0, 56(s0)
+// 0x01023828: 0x1023828: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3818,60 +3818,60 @@ L_1023804:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102381c: 0x102381c: sll   a2, a0, 16
+// 0x0102382c: 0x102382c: sll   a2, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shl
 	stloc.3
-// 0x01023820: 0x1023820: subu  a1, t5, v1
+// 0x01023830: 0x1023830: subu  a1, t5, v1
 	ldloc 23
 	ldloc 7
 	sub
 	stloc.2
-// 0x01023824: 0x1023824: sra   a0, a0, 16
+// 0x01023834: 0x1023834: sra   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shr
 	stloc.1
-// 0x01023828: 0x1023828: srav  a1, a1, a2
+// 0x01023838: 0x1023838: srav  a1, a1, a2
 	ldloc.3
 	ldloc.2
 	shr
 	stloc.2
-// 0x0102382c: 0x102382c: sllv  a0, v1, a0
+// 0x0102383c: 0x102383c: sllv  a0, v1, a0
 	ldloc.1
 	ldloc 7
 	shl
 	stloc.1
-// 0x01023830: 0x1023830: slt   a2, v0, t2
+// 0x01023840: 0x1023840: slt   a2, v0, t2
 	ldloc 5
 	ldloc 20
 	clt
 	stloc.3
-// 0x01023834: 0x1023834: addu  s8, s8, a0
+// 0x01023844: 0x1023844: addu  s8, s8, a0
 	ldloc 16
 	ldloc.1
 	add
 	stloc 16
-// 0x01023838: 0x1023838: beq   a2, zero, 0x102384c addu  s7, s7, a1
+// 0x01023848: 0x1023848: beq   a2, zero, 0x102385c addu  s7, s7, a1
 	ldloc.3
 	ldloc 15
 	ldloc.2
 	add
 	stloc 15
-	brfalse L_102384c
+	brfalse L_102385c
 // --- basic block ---
-// 0x01023840: 0x1023840: slt   v0, v0, s8
+// 0x01023850: 0x1023850: slt   v0, v0, s8
 	ldloc 5
 	ldloc 16
 	clt
 	stloc 5
-// 0x01023844: 0x1023844: bne   v0, zero, 0x10238a0 sll   zero, zero, 0
+// 0x01023854: 0x1023854: bne   v0, zero, 0x10238b0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10238a0
+	brtrue L_10238b0
 // --- basic block ---
-L_102384c:
-// 0x0102384c: 0x102384c: lw    v0, 64(s0)
+L_102385c:
+// 0x0102385c: 0x102385c: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3880,26 +3880,26 @@ L_102384c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023850: 0x1023850: sll   zero, zero, 0
-// 0x01023854: 0x1023854: slt   v1, t2, v0
+// 0x01023860: 0x1023860: sll   zero, zero, 0
+// 0x01023864: 0x1023864: slt   v1, t2, v0
 	ldloc 20
 	ldloc 5
 	clt
 	stloc 7
-// 0x01023858: 0x1023858: beq   v1, zero, 0x1023868 slt   v0, s8, v0
+// 0x01023868: 0x1023868: beq   v1, zero, 0x1023878 slt   v0, s8, v0
 	ldloc 7
 	ldloc 16
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_1023868
+	brfalse L_1023878
 // --- basic block ---
-// 0x01023860: 0x1023860: bne   v0, zero, 0x10238a0 sll   zero, zero, 0
+// 0x01023870: 0x1023870: bne   v0, zero, 0x10238b0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10238a0
+	brtrue L_10238b0
 // --- basic block ---
-L_1023868:
-// 0x01023868: 0x1023868: lw    v0, 60(s0)
+L_1023878:
+// 0x01023878: 0x1023878: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3908,26 +3908,26 @@ L_1023868:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102386c: 0x102386c: sll   zero, zero, 0
-// 0x01023870: 0x1023870: slt   v1, v0, t1
+// 0x0102387c: 0x102387c: sll   zero, zero, 0
+// 0x01023880: 0x1023880: slt   v1, v0, t1
 	ldloc 5
 	ldloc 18
 	clt
 	stloc 7
-// 0x01023874: 0x1023874: beq   v1, zero, 0x1023884 slt   v0, v0, s7
+// 0x01023884: 0x1023884: beq   v1, zero, 0x1023894 slt   v0, v0, s7
 	ldloc 7
 	ldloc 5
 	ldloc 15
 	clt
 	stloc 5
-	brfalse L_1023884
+	brfalse L_1023894
 // --- basic block ---
-// 0x0102387c: 0x102387c: bne   v0, zero, 0x10238a0 sll   zero, zero, 0
+// 0x0102388c: 0x102388c: bne   v0, zero, 0x10238b0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10238a0
+	brtrue L_10238b0
 // --- basic block ---
-L_1023884:
-// 0x01023884: 0x1023884: lw    v0, 68(s0)
+L_1023894:
+// 0x01023894: 0x1023894: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3936,41 +3936,41 @@ L_1023884:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023888: 0x1023888: sll   zero, zero, 0
-// 0x0102388c: 0x102388c: slt   v1, t1, v0
+// 0x01023898: 0x1023898: sll   zero, zero, 0
+// 0x0102389c: 0x102389c: slt   v1, t1, v0
 	ldloc 18
 	ldloc 5
 	clt
 	stloc 7
-// 0x01023890: 0x1023890: beq   v1, zero, 0x1024094 slt   v0, s7, v0
+// 0x010238a0: 0x10238a0: beq   v1, zero, 0x10240a4 slt   v0, s7, v0
 	ldloc 7
 	ldloc 15
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_1024094
+	brfalse L_10240a4
 // --- basic block ---
-// 0x01023898: 0x1023898: beq   v0, zero, 0x1024094 sll   zero, zero, 0
+// 0x010238a8: 0x10238a8: beq   v0, zero, 0x10240a4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1024094
+	brfalse L_10240a4
 // --- basic block ---
-L_10238a0:
-// 0x010238a0: 0x10238a0: beq   t0, zero, 0x1023a30 addu  v0, a3, zero
+L_10238b0:
+// 0x010238b0: 0x10238b0: beq   t0, zero, 0x1023a40 addu  v0, a3, zero
 	ldloc 13
 	ldloc 4
 	stloc 5
-	brfalse L_1023a30
+	brfalse L_1023a40
 // --- basic block ---
-// 0x010238a8: 0x10238a8: lw    v0, -20612(s3)
+// 0x010238b8: 0x10238b8: lw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x010238ac: 0x10238ac: lw    v1, 6204(s2)
+// 0x010238bc: 0x10238bc: lw    v1, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3979,69 +3979,69 @@ L_10238a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010238b0: 0x10238b0: sll   zero, zero, 0
-// 0x010238b4: 0x10238b4: subu  a0, v1, v0
+// 0x010238c0: 0x10238c0: sll   zero, zero, 0
+// 0x010238c4: 0x10238c4: subu  a0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc.1
-// 0x010238b8: 0x10238b8: slti  a1, a0, 16
+// 0x010238c8: 0x10238c8: slti  a1, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	clt
 	stloc.2
-// 0x010238bc: 0x10238bc: bne   a1, zero, 0x10238e0 sra   a0, a0, 3
+// 0x010238cc: 0x10238cc: bne   a1, zero, 0x10238f0 sra   a0, a0, 3
 	ldloc.2
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-	brtrue L_10238e0
+	brtrue L_10238f0
 // --- basic block ---
-// 0x010238c4: 0x10238c4: lw    v0, 28532(s4)
+// 0x010238d4: 0x10238d4: lw    v0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 5
-// 0x010238c8: 0x10238c8: sll   zero, zero, 0
-// 0x010238cc: 0x10238cc: addiu a1, v0, 4
+// 0x010238d8: 0x10238d8: sll   zero, zero, 0
+// 0x010238dc: 0x10238dc: addiu a1, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc.2
-// 0x010238d0: 0x10238d0: sw    a0, 0(v0)
+// 0x010238e0: 0x10238e0: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010238d4: 0x10238d4: sw    v1, -20612(s3)
+// 0x010238e4: 0x10238e4: sw    v1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 7
 	stelem.i4
-// 0x010238d8: 0x10238d8: j	 0x10238e4 sw    a1, 28532(s4)
+// 0x010238e8: 0x10238e8: j	 0x10238f4 sw    a1, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.2
 	stelem.i4
-	br L_10238e4
+	br L_10238f4
 // --- basic block ---
-L_10238e0:
-// 0x010238e0: 0x10238e0: sw    v0, 6204(s2)
+L_10238f0:
+// 0x010238f0: 0x10238f0: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4050,17 +4050,17 @@ L_10238e0:
 	add
 	ldloc 5
 	stelem.i4
-L_10238e4:
-// 0x010238e4: 0x10238e4: addu  v0, a3, zero
+L_10238f4:
+// 0x010238f4: 0x10238f4: addu  v0, a3, zero
 	ldloc 4
 	stloc 5
-// 0x010238e8: 0x10238e8: j	 0x1023a30 addu  t0, zero, zero
+// 0x010238f8: 0x10238f8: j	 0x1023a40 addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_1023a30
+	br L_1023a40
 // --- basic block ---
-L_10238f0:
-// 0x010238f0: 0x10238f0: lw    v0, 80(s0)
+L_1023900:
+// 0x01023900: 0x1023900: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4069,7 +4069,7 @@ L_10238f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010238f4: 0x10238f4: lw    v1, 32(s0)
+// 0x01023904: 0x1023904: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4078,17 +4078,17 @@ L_10238f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010238f8: 0x10238f8: subu  v0, t2, v0
+// 0x01023908: 0x1023908: subu  v0, t2, v0
 	ldloc 20
 	ldloc 5
 	sub
 	stloc 5
-// 0x010238fc: 0x10238fc: div   v0, v1
+// 0x0102390c: 0x102390c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01023900: 0x1023900: lw    s5, 6204(s2)
+// 0x01023910: 0x1023910: lw    s5, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4097,15 +4097,15 @@ L_10238f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01023904: 0x1023904: addiu t0, zero, 1
+// 0x01023914: 0x1023914: addiu t0, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x01023908: 0x1023908: addiu v0, s5, 8
+// 0x01023918: 0x1023918: addiu v0, s5, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0102390c: 0x102390c: sw    v0, 6204(s2)
+// 0x0102391c: 0x102391c: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4114,17 +4114,17 @@ L_10238f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01023910: 0x1023910: mflo  lo
+// 0x01023920: 0x1023920: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01023914: 0x1023914: sw    a1, 0(s5)
+// 0x01023924: 0x1023924: sw    a1, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01023918: 0x1023918: lw    v0, 76(s0)
+// 0x01023928: 0x1023928: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4133,7 +4133,7 @@ L_10238f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102391c: 0x102391c: lw    v1, 36(s0)
+// 0x0102392c: 0x102392c: lw    v1, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4142,20 +4142,20 @@ L_10238f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023920: 0x1023920: subu  v0, v0, t1
+// 0x01023930: 0x1023930: subu  v0, v0, t1
 	ldloc 5
 	ldloc 18
 	sub
 	stloc 5
-// 0x01023924: 0x1023924: div   v0, v1
+// 0x01023934: 0x1023934: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01023928: 0x1023928: mflo  lo
+// 0x01023938: 0x1023938: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0102392c: 0x102392c: sw    v1, 4(s5)
+// 0x0102393c: 0x102393c: sw    v1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4164,8 +4164,8 @@ L_10238f0:
 	add
 	ldloc 7
 	stelem.i4
-L_1023930:
-// 0x01023930: 0x1023930: lw    v0, 80(s0)
+L_1023940:
+// 0x01023940: 0x1023940: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4174,7 +4174,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023934: 0x1023934: lw    v1, 32(s0)
+// 0x01023944: 0x1023944: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4183,17 +4183,17 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023938: 0x1023938: subu  v0, s8, v0
+// 0x01023948: 0x1023948: subu  v0, s8, v0
 	ldloc 16
 	ldloc 5
 	sub
 	stloc 5
-// 0x0102393c: 0x102393c: div   v0, v1
+// 0x0102394c: 0x102394c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01023940: 0x1023940: lw    v1, 6204(s2)
+// 0x01023950: 0x1023950: lw    v1, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4202,13 +4202,13 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023944: 0x1023944: sll   zero, zero, 0
-// 0x01023948: 0x1023948: addiu v0, v1, 8
+// 0x01023954: 0x1023954: sll   zero, zero, 0
+// 0x01023958: 0x1023958: addiu v0, v1, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0102394c: 0x102394c: sw    v0, 6204(s2)
+// 0x0102395c: 0x102395c: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4217,17 +4217,17 @@ L_1023930:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01023950: 0x1023950: mflo  lo
+// 0x01023960: 0x1023960: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x01023954: 0x1023954: sw    v0, 0(v1)
+// 0x01023964: 0x1023964: sw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01023958: 0x1023958: lw    v0, 76(s0)
+// 0x01023968: 0x1023968: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4236,7 +4236,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102395c: 0x102395c: lw    a0, 36(s0)
+// 0x0102396c: 0x102396c: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4245,20 +4245,20 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023960: 0x1023960: subu  v0, v0, s7
+// 0x01023970: 0x1023970: subu  v0, v0, s7
 	ldloc 5
 	ldloc 15
 	sub
 	stloc 5
-// 0x01023964: 0x1023964: div   v0, a0
+// 0x01023974: 0x1023974: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x01023968: 0x1023968: mflo  lo
+// 0x01023978: 0x1023978: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x0102396c: 0x102396c: beq   s1, zero, 0x1023a28 sw    a0, 4(v1)
+// 0x0102397c: 0x102397c: beq   s1, zero, 0x1023a38 sw    a0, 4(v1)
 	ldloc 10
 	ldloc 6
 	ldloc 7
@@ -4268,18 +4268,18 @@ L_1023930:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_1023a28
+	brfalse L_1023a38
 // --- basic block ---
-// 0x01023974: 0x1023974: addu  a0, v1, zero
+// 0x01023984: 0x1023984: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01023978: 0x1023978: addu  a1, s5, zero
+// 0x01023988: 0x1023988: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x0102397c: 0x102397c: addiu a2, zero, 1
+// 0x0102398c: 0x102398c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01023980: 0x1023980: sw    v1, 200(sp)
+// 0x01023990: 0x1023990: sw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4288,7 +4288,7 @@ L_1023930:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023984: 0x1023984: sw    a3, 192(sp)
+// 0x01023994: 0x1023994: sw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4297,7 +4297,7 @@ L_1023930:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01023988: 0x1023988: sw    t0, 196(sp)
+// 0x01023998: 0x1023998: sw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4306,7 +4306,7 @@ L_1023930:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102398c: 0x102398c: sw    t1, 188(sp)
+// 0x0102399c: 0x102399c: sw    t1, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4315,7 +4315,7 @@ L_1023930:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01023990: 0x1023990: sw    t2, 184(sp)
+// 0x010239a0: 0x10239a0: sw    t2, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4324,7 +4324,7 @@ L_1023930:
 	add
 	ldloc 20
 	stelem.i4
-// 0x01023994: 0x1023994: sw    t3, 180(sp)
+// 0x010239a4: 0x10239a4: sw    t3, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4333,7 +4333,7 @@ L_1023930:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01023998: 0x1023998: sw    t4, 176(sp)
+// 0x010239a8: 0x10239a8: sw    t4, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4342,7 +4342,7 @@ L_1023930:
 	add
 	ldloc 22
 	stelem.i4
-// 0x0102399c: 0x102399c: jal   0x1009694 sw    t5, 172(sp)
+// 0x010239ac: 0x10239ac: jal   0x10096a4 sw    t5, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4356,19 +4356,19 @@ L_1023930:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010239a4: 0x10239a4: lw    a1, 0(s1)
+// 0x010239b4: 0x10239b4: lw    a1, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010239a8: 0x10239a8: lw    a3, 192(sp)
+// 0x010239b8: 0x10239b8: lw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4377,24 +4377,24 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010239ac: 0x10239ac: addu  a1, a1, v0
+// 0x010239bc: 0x10239bc: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x010239b0: 0x10239b0: slt   a0, a3, v0
+// 0x010239c0: 0x10239c0: slt   a0, a3, v0
 	ldloc 4
 	ldloc 5
 	clt
 	stloc.1
-// 0x010239b4: 0x10239b4: sw    a1, 0(s1)
+// 0x010239c4: 0x10239c4: sw    a1, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010239b8: 0x10239b8: lw    v1, 200(sp)
+// 0x010239c8: 0x10239c8: lw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4403,7 +4403,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010239bc: 0x10239bc: lw    t0, 196(sp)
+// 0x010239cc: 0x10239cc: lw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4412,7 +4412,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010239c0: 0x10239c0: lw    t1, 188(sp)
+// 0x010239d0: 0x10239d0: lw    t1, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4421,7 +4421,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 18
-// 0x010239c4: 0x10239c4: lw    t2, 184(sp)
+// 0x010239d4: 0x10239d4: lw    t2, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4430,7 +4430,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010239c8: 0x10239c8: lw    t3, 180(sp)
+// 0x010239d8: 0x10239d8: lw    t3, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4439,7 +4439,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 21
-// 0x010239cc: 0x10239cc: lw    t4, 176(sp)
+// 0x010239dc: 0x10239dc: lw    t4, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4448,7 +4448,7 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 22
-// 0x010239d0: 0x10239d0: lw    t5, 172(sp)
+// 0x010239e0: 0x10239e0: lw    t5, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4457,11 +4457,11 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 23
-// 0x010239d4: 0x10239d4: beq   a0, zero, 0x1023a28 sll   zero, zero, 0
+// 0x010239e4: 0x10239e4: beq   a0, zero, 0x1023a38 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1023a28
+	brfalse L_1023a38
 // --- basic block ---
-// 0x010239dc: 0x10239dc: sw    t1, 16(s1)
+// 0x010239ec: 0x10239ec: sw    t1, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4470,7 +4470,7 @@ L_1023930:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010239e0: 0x10239e0: sw    t2, 12(s1)
+// 0x010239f0: 0x10239f0: sw    t2, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4479,7 +4479,7 @@ L_1023930:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010239e4: 0x10239e4: sw    s7, 24(s1)
+// 0x010239f4: 0x10239f4: sw    s7, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4488,7 +4488,7 @@ L_1023930:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010239e8: 0x10239e8: sw    s8, 20(s1)
+// 0x010239f8: 0x10239f8: sw    s8, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4497,21 +4497,21 @@ L_1023930:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010239ec: 0x10239ec: lw    a2, 0(s5)
+// 0x010239fc: 0x10239fc: lw    a2, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010239f0: 0x10239f0: lw    a1, 0(v1)
+// 0x01023a00: 0x1023a00: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010239f4: 0x10239f4: lw    a3, 4(s5)
+// 0x01023a04: 0x1023a04: lw    a3, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4520,17 +4520,17 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010239f8: 0x10239f8: addu  a1, a2, a1
+// 0x01023a08: 0x1023a08: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x010239fc: 0x10239fc: div   a1, t4
+// 0x01023a0c: 0x1023a0c: div   a1, t4
 	ldloc.2
 	ldloc 22
 	div
 	stloc 8
-// 0x01023a00: 0x1023a00: lw    a0, 4(v1)
+// 0x01023a10: 0x1023a10: lw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4539,18 +4539,18 @@ L_1023930:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023a04: 0x1023a04: addu  s5, v1, zero
+// 0x01023a14: 0x1023a14: addu  s5, v1, zero
 	ldloc 7
 	stloc 11
-// 0x01023a08: 0x1023a08: addu  a0, a3, a0
+// 0x01023a18: 0x1023a18: addu  a0, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc.1
-// 0x01023a0c: 0x1023a0c: mflo  lo
+// 0x01023a1c: 0x1023a1c: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01023a10: 0x1023a10: sw    a1, 4(s1)
+// 0x01023a20: 0x1023a20: sw    a1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4559,16 +4559,16 @@ L_1023930:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023a14: 0x1023a14: sll   zero, zero, 0
-// 0x01023a18: 0x1023a18: div   a0, t4
+// 0x01023a24: 0x1023a24: sll   zero, zero, 0
+// 0x01023a28: 0x1023a28: div   a0, t4
 	ldloc.1
 	ldloc 22
 	div
 	stloc 8
-// 0x01023a1c: 0x1023a1c: mflo  lo
+// 0x01023a2c: 0x1023a2c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01023a20: 0x1023a20: j	 0x1023a30 sw    a0, 8(s1)
+// 0x01023a30: 0x1023a30: j	 0x1023a40 sw    a0, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4577,37 +4577,37 @@ L_1023930:
 	add
 	ldloc.1
 	stelem.i4
-	br L_1023a30
+	br L_1023a40
 // --- basic block ---
-L_1023a28:
-// 0x01023a28: 0x1023a28: addu  v0, a3, zero
+L_1023a38:
+// 0x01023a38: 0x1023a38: addu  v0, a3, zero
 	ldloc 4
 	stloc 5
-// 0x01023a2c: 0x1023a2c: addu  s5, v1, zero
+// 0x01023a3c: 0x1023a3c: addu  s5, v1, zero
 	ldloc 7
 	stloc 11
-L_1023a30:
-// 0x01023a30: 0x1023a30: addiu s6, s6, 1
+L_1023a40:
+// 0x01023a40: 0x1023a40: addiu s6, s6, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x01023a34: 0x1023a34: addiu t3, t3, 4
+// 0x01023a44: 0x1023a44: addiu t3, t3, 4
 	ldloc 21
 	ldc.i4.4
 	add
 	stloc 21
-// 0x01023a38: 0x1023a38: addu  a3, v0, zero
+// 0x01023a48: 0x1023a48: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01023a3c: 0x1023a3c: addu  t2, s8, zero
+// 0x01023a4c: 0x1023a4c: addu  t2, s8, zero
 	ldloc 16
 	stloc 20
-// 0x01023a40: 0x1023a40: addu  t1, s7, zero
+// 0x01023a50: 0x1023a50: addu  t1, s7, zero
 	ldloc 15
 	stloc 18
-L_1023a44:
-// 0x01023a44: 0x1023a44: lw    v1, 140(sp)
+L_1023a54:
+// 0x01023a54: 0x1023a54: lw    v1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4616,27 +4616,27 @@ L_1023a44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023a48: 0x1023a48: sll   zero, zero, 0
-// 0x01023a4c: 0x1023a4c: slt   v0, v1, s6
+// 0x01023a58: 0x1023a58: sll   zero, zero, 0
+// 0x01023a5c: 0x1023a5c: slt   v0, v1, s6
 	ldloc 7
 	ldloc 14
 	clt
 	stloc 5
-// 0x01023a50: 0x1023a50: beq   v0, zero, 0x1023804 lui   v1, 0x20000
+// 0x01023a60: 0x1023a60: beq   v0, zero, 0x1023814 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 7
-	brfalse L_1023804
+	brfalse L_1023814
 // --- basic block ---
-// 0x01023a58: 0x1023a58: lui   a0, 0xe0000
+// 0x01023a68: 0x1023a68: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x01023a5c: 0x1023a5c: addiu a0, a0, 29604
+// 0x01023a6c: 0x1023a6c: addiu a0, a0, 30068
 	ldloc.1
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.1
-// 0x01023a60: 0x1023a60: lw    v0, 56(a0)
+// 0x01023a70: 0x1023a70: lw    v0, 56(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4645,7 +4645,7 @@ L_1023a44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023a64: 0x1023a64: lw    s6, 60(sp)
+// 0x01023a74: 0x1023a74: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4654,12 +4654,12 @@ L_1023a44:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01023a68: 0x1023a68: slt   a0, v0, s8
+// 0x01023a78: 0x1023a78: slt   a0, v0, s8
 	ldloc 5
 	ldloc 16
 	clt
 	stloc.1
-// 0x01023a6c: 0x1023a6c: lw    v1, 56(sp)
+// 0x01023a7c: 0x1023a7c: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4668,20 +4668,20 @@ L_1023a44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023a70: 0x1023a70: beq   a0, zero, 0x1023a80 slt   v0, v0, v1
+// 0x01023a80: 0x1023a80: beq   a0, zero, 0x1023a90 slt   v0, v0, v1
 	ldloc.1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-	brfalse L_1023a80
+	brfalse L_1023a90
 // --- basic block ---
-// 0x01023a78: 0x1023a78: bne   v0, zero, 0x1023ad4 sll   zero, zero, 0
+// 0x01023a88: 0x1023a88: bne   v0, zero, 0x1023ae4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023ad4
+	brtrue L_1023ae4
 // --- basic block ---
-L_1023a80:
-// 0x01023a80: 0x1023a80: lw    v0, 64(s0)
+L_1023a90:
+// 0x01023a90: 0x1023a90: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4690,26 +4690,26 @@ L_1023a80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023a84: 0x1023a84: sll   zero, zero, 0
-// 0x01023a88: 0x1023a88: slt   a0, s8, v0
+// 0x01023a94: 0x1023a94: sll   zero, zero, 0
+// 0x01023a98: 0x1023a98: slt   a0, s8, v0
 	ldloc 16
 	ldloc 5
 	clt
 	stloc.1
-// 0x01023a8c: 0x1023a8c: beq   a0, zero, 0x1023a9c slt   v0, v1, v0
+// 0x01023a9c: 0x1023a9c: beq   a0, zero, 0x1023aac slt   v0, v1, v0
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_1023a9c
+	brfalse L_1023aac
 // --- basic block ---
-// 0x01023a94: 0x1023a94: bne   v0, zero, 0x1023ad4 sll   zero, zero, 0
+// 0x01023aa4: 0x1023aa4: bne   v0, zero, 0x1023ae4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023ad4
+	brtrue L_1023ae4
 // --- basic block ---
-L_1023a9c:
-// 0x01023a9c: 0x1023a9c: lw    v0, 60(s0)
+L_1023aac:
+// 0x01023aac: 0x1023aac: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4718,26 +4718,26 @@ L_1023a9c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023aa0: 0x1023aa0: sll   zero, zero, 0
-// 0x01023aa4: 0x1023aa4: slt   a0, v0, s7
+// 0x01023ab0: 0x1023ab0: sll   zero, zero, 0
+// 0x01023ab4: 0x1023ab4: slt   a0, v0, s7
 	ldloc 5
 	ldloc 15
 	clt
 	stloc.1
-// 0x01023aa8: 0x1023aa8: beq   a0, zero, 0x1023ab8 slt   v0, v0, s6
+// 0x01023ab8: 0x1023ab8: beq   a0, zero, 0x1023ac8 slt   v0, v0, s6
 	ldloc.1
 	ldloc 5
 	ldloc 14
 	clt
 	stloc 5
-	brfalse L_1023ab8
+	brfalse L_1023ac8
 // --- basic block ---
-// 0x01023ab0: 0x1023ab0: bne   v0, zero, 0x1023ad4 sll   zero, zero, 0
+// 0x01023ac0: 0x1023ac0: bne   v0, zero, 0x1023ae4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023ad4
+	brtrue L_1023ae4
 // --- basic block ---
-L_1023ab8:
-// 0x01023ab8: 0x1023ab8: lw    v0, 68(s0)
+L_1023ac8:
+// 0x01023ac8: 0x1023ac8: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4746,39 +4746,39 @@ L_1023ab8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023abc: 0x1023abc: sll   zero, zero, 0
-// 0x01023ac0: 0x1023ac0: slt   a0, s7, v0
+// 0x01023acc: 0x1023acc: sll   zero, zero, 0
+// 0x01023ad0: 0x1023ad0: slt   a0, s7, v0
 	ldloc 15
 	ldloc 5
 	clt
 	stloc.1
-// 0x01023ac4: 0x1023ac4: beq   a0, zero, 0x10240a4 slt   v0, s6, v0
+// 0x01023ad4: 0x1023ad4: beq   a0, zero, 0x10240b4 slt   v0, s6, v0
 	ldloc.1
 	ldloc 14
 	ldloc 5
 	clt
 	stloc 5
-	brfalse L_10240a4
+	brfalse L_10240b4
 // --- basic block ---
-// 0x01023acc: 0x1023acc: beq   v0, zero, 0x10240a4 sll   zero, zero, 0
+// 0x01023adc: 0x1023adc: beq   v0, zero, 0x10240b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10240a4
+	brfalse L_10240b4
 // --- basic block ---
-L_1023ad4:
-// 0x01023ad4: 0x1023ad4: beq   t0, zero, 0x1023dc4 sll   zero, zero, 0
+L_1023ae4:
+// 0x01023ae4: 0x1023ae4: beq   t0, zero, 0x1023dd4 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1023dc4
+	brfalse L_1023dd4
 // --- basic block ---
-// 0x01023adc: 0x1023adc: lw    v0, -20612(s3)
+// 0x01023aec: 0x1023aec: lw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023ae0: 0x1023ae0: lw    v1, 6204(s2)
+// 0x01023af0: 0x1023af0: lw    v1, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4787,69 +4787,69 @@ L_1023ad4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023ae4: 0x1023ae4: sll   zero, zero, 0
-// 0x01023ae8: 0x1023ae8: subu  a0, v1, v0
+// 0x01023af4: 0x1023af4: sll   zero, zero, 0
+// 0x01023af8: 0x1023af8: subu  a0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc.1
-// 0x01023aec: 0x1023aec: slti  a1, a0, 16
+// 0x01023afc: 0x1023afc: slti  a1, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	clt
 	stloc.2
-// 0x01023af0: 0x1023af0: bne   a1, zero, 0x1023b14 sra   a0, a0, 3
+// 0x01023b00: 0x1023b00: bne   a1, zero, 0x1023b24 sra   a0, a0, 3
 	ldloc.2
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-	brtrue L_1023b14
+	brtrue L_1023b24
 // --- basic block ---
-// 0x01023af8: 0x1023af8: lw    v0, 28532(s4)
+// 0x01023b08: 0x1023b08: lw    v0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023afc: 0x1023afc: sll   zero, zero, 0
-// 0x01023b00: 0x1023b00: addiu a1, v0, 4
+// 0x01023b0c: 0x1023b0c: sll   zero, zero, 0
+// 0x01023b10: 0x1023b10: addiu a1, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01023b04: 0x1023b04: sw    a0, 0(v0)
+// 0x01023b14: 0x1023b14: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01023b08: 0x1023b08: sw    v1, -20612(s3)
+// 0x01023b18: 0x1023b18: sw    v1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023b0c: 0x1023b0c: j	 0x1023dc4 sw    a1, 28532(s4)
+// 0x01023b1c: 0x1023b1c: j	 0x1023dd4 sw    a1, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.2
 	stelem.i4
-	br L_1023dc4
+	br L_1023dd4
 // --- basic block ---
-L_1023b14:
-// 0x01023b14: 0x1023b14: j	 0x1023dc4 sw    v0, 6204(s2)
+L_1023b24:
+// 0x01023b24: 0x1023b24: j	 0x1023dd4 sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4858,10 +4858,10 @@ L_1023b14:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1023dc4
+	br L_1023dd4
 // --- basic block ---
-L_1023b1c:
-// 0x01023b1c: 0x1023b1c: lw    v0, 80(s0)
+L_1023b2c:
+// 0x01023b2c: 0x1023b2c: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4870,7 +4870,7 @@ L_1023b1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023b20: 0x1023b20: lw    a0, 32(s0)
+// 0x01023b30: 0x1023b30: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4879,17 +4879,17 @@ L_1023b1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023b24: 0x1023b24: subu  v0, s8, v0
+// 0x01023b34: 0x1023b34: subu  v0, s8, v0
 	ldloc 16
 	ldloc 5
 	sub
 	stloc 5
-// 0x01023b28: 0x1023b28: div   v0, a0
+// 0x01023b38: 0x1023b38: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x01023b2c: 0x1023b2c: lw    s5, 6204(s2)
+// 0x01023b3c: 0x1023b3c: lw    s5, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4898,13 +4898,13 @@ L_1023b1c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01023b30: 0x1023b30: sll   zero, zero, 0
-// 0x01023b34: 0x1023b34: addiu v0, s5, 8
+// 0x01023b40: 0x1023b40: sll   zero, zero, 0
+// 0x01023b44: 0x1023b44: addiu v0, s5, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01023b38: 0x1023b38: sw    v0, 6204(s2)
+// 0x01023b48: 0x1023b48: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4913,17 +4913,17 @@ L_1023b1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01023b3c: 0x1023b3c: mflo  lo
+// 0x01023b4c: 0x1023b4c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01023b40: 0x1023b40: sw    a0, 0(s5)
+// 0x01023b50: 0x1023b50: sw    a0, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01023b44: 0x1023b44: lw    v0, 76(s0)
+// 0x01023b54: 0x1023b54: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4932,7 +4932,7 @@ L_1023b1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023b48: 0x1023b48: lw    a0, 36(s0)
+// 0x01023b58: 0x1023b58: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4941,20 +4941,20 @@ L_1023b1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023b4c: 0x1023b4c: subu  v0, v0, s7
+// 0x01023b5c: 0x1023b5c: subu  v0, v0, s7
 	ldloc 5
 	ldloc 15
 	sub
 	stloc 5
-// 0x01023b50: 0x1023b50: div   v0, a0
+// 0x01023b60: 0x1023b60: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x01023b54: 0x1023b54: mflo  lo
+// 0x01023b64: 0x1023b64: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01023b58: 0x1023b58: sw    a0, 4(s5)
+// 0x01023b68: 0x1023b68: sw    a0, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4963,8 +4963,8 @@ L_1023b1c:
 	add
 	ldloc.1
 	stelem.i4
-L_1023b5c:
-// 0x01023b5c: 0x1023b5c: lw    v0, 80(s0)
+L_1023b6c:
+// 0x01023b6c: 0x1023b6c: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4973,7 +4973,7 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023b60: 0x1023b60: lw    a0, 32(s0)
+// 0x01023b70: 0x1023b70: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4982,17 +4982,17 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023b64: 0x1023b64: subu  v0, v1, v0
+// 0x01023b74: 0x1023b74: subu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x01023b68: 0x1023b68: div   v0, a0
+// 0x01023b78: 0x1023b78: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 8
-// 0x01023b6c: 0x1023b6c: lw    t0, 6204(s2)
+// 0x01023b7c: 0x1023b7c: lw    t0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -5001,44 +5001,44 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01023b70: 0x1023b70: lw    a0, -20612(s3)
+// 0x01023b80: 0x1023b80: lw    a0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023b74: 0x1023b74: addiu a1, t0, 8
+// 0x01023b84: 0x1023b84: addiu a1, t0, 8
 	ldloc 13
 	ldc.i4.8
 	add
 	stloc.2
-// 0x01023b78: 0x1023b78: lw    v0, 28532(s4)
+// 0x01023b88: 0x1023b88: lw    v0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023b7c: 0x1023b7c: subu  a0, a1, a0
+// 0x01023b8c: 0x1023b8c: subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-// 0x01023b80: 0x1023b80: sw    a1, -20612(s3)
+// 0x01023b90: 0x1023b90: sw    a1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023b84: 0x1023b84: sw    a1, 6204(s2)
+// 0x01023b94: 0x1023b94: sw    a1, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -5047,36 +5047,36 @@ L_1023b5c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023b88: 0x1023b88: addiu a2, v0, 4
+// 0x01023b98: 0x1023b98: addiu a2, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc.3
-// 0x01023b8c: 0x1023b8c: sw    a2, 28532(s4)
+// 0x01023b9c: 0x1023b9c: sw    a2, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.3
 	stelem.i4
-// 0x01023b90: 0x1023b90: sra   a0, a0, 3
+// 0x01023ba0: 0x1023ba0: sra   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shr
 	stloc.1
-// 0x01023b94: 0x1023b94: mflo  lo
+// 0x01023ba4: 0x1023ba4: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01023b98: 0x1023b98: sw    a1, 0(t0)
+// 0x01023ba8: 0x1023ba8: sw    a1, 0(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01023b9c: 0x1023b9c: lw    a1, 76(s0)
+// 0x01023bac: 0x1023bac: lw    a1, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5085,7 +5085,7 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023ba0: 0x1023ba0: lw    a2, 36(s0)
+// 0x01023bb0: 0x1023bb0: lw    a2, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5094,20 +5094,20 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01023ba4: 0x1023ba4: subu  a1, a1, s6
+// 0x01023bb4: 0x1023bb4: subu  a1, a1, s6
 	ldloc.2
 	ldloc 14
 	sub
 	stloc.2
-// 0x01023ba8: 0x1023ba8: div   a1, a2
+// 0x01023bb8: 0x1023bb8: div   a1, a2
 	ldloc.2
 	ldloc.3
 	div
 	stloc 8
-// 0x01023bac: 0x1023bac: mflo  lo
+// 0x01023bbc: 0x1023bbc: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x01023bb0: 0x1023bb0: sw    a2, 4(t0)
+// 0x01023bc0: 0x1023bc0: sw    a2, 4(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5116,7 +5116,7 @@ L_1023b5c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01023bb4: 0x1023bb4: beq   s1, zero, 0x1023f74 sw    a0, 0(v0)
+// 0x01023bc4: 0x1023bc4: beq   s1, zero, 0x1023f84 sw    a0, 0(v0)
 	ldloc 10
 	ldloc 6
 	ldloc 5
@@ -5124,18 +5124,18 @@ L_1023b5c:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023bbc: 0x1023bbc: addu  a0, t0, zero
+// 0x01023bcc: 0x1023bcc: addu  a0, t0, zero
 	ldloc 13
 	stloc.1
-// 0x01023bc0: 0x1023bc0: addu  a1, s5, zero
+// 0x01023bd0: 0x1023bd0: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x01023bc4: 0x1023bc4: addiu a2, zero, 1
+// 0x01023bd4: 0x1023bd4: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01023bc8: 0x1023bc8: sw    v1, 200(sp)
+// 0x01023bd8: 0x1023bd8: sw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5144,7 +5144,7 @@ L_1023b5c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023bcc: 0x1023bcc: sw    a3, 192(sp)
+// 0x01023bdc: 0x1023bdc: sw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5153,7 +5153,7 @@ L_1023b5c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01023bd0: 0x1023bd0: jal   0x1009694 sw    t0, 196(sp)
+// 0x01023be0: 0x1023be0: jal   0x10096a4 sw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5167,19 +5167,19 @@ L_1023b5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01023bd8: 0x1023bd8: lw    a0, 0(s1)
+// 0x01023be8: 0x1023be8: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01023bdc: 0x1023bdc: lw    a3, 192(sp)
+// 0x01023bec: 0x1023bec: lw    a3, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5188,7 +5188,7 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01023be0: 0x1023be0: lw    v1, 200(sp)
+// 0x01023bf0: 0x1023bf0: lw    v1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5197,24 +5197,24 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023be4: 0x1023be4: slt   a3, a3, v0
+// 0x01023bf4: 0x1023bf4: slt   a3, a3, v0
 	ldloc 4
 	ldloc 5
 	clt
 	stloc 4
-// 0x01023be8: 0x1023be8: addu  v0, a0, v0
+// 0x01023bf8: 0x1023bf8: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01023bec: 0x1023bec: sw    v0, 0(s1)
+// 0x01023bfc: 0x1023bfc: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01023bf0: 0x1023bf0: lw    t0, 196(sp)
+// 0x01023c00: 0x1023c00: lw    t0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5223,11 +5223,11 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01023bf4: 0x1023bf4: beq   a3, zero, 0x1023dcc sll   zero, zero, 0
+// 0x01023c04: 0x1023c04: beq   a3, zero, 0x1023ddc sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1023dcc
+	brfalse L_1023ddc
 // --- basic block ---
-// 0x01023bfc: 0x1023bfc: sw    s7, 16(s1)
+// 0x01023c0c: 0x1023c0c: sw    s7, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5236,7 +5236,7 @@ L_1023b5c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01023c00: 0x1023c00: sw    s8, 12(s1)
+// 0x01023c10: 0x1023c10: sw    s8, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5245,7 +5245,7 @@ L_1023b5c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01023c04: 0x1023c04: sw    s6, 24(s1)
+// 0x01023c14: 0x1023c14: sw    s6, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5254,7 +5254,7 @@ L_1023b5c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01023c08: 0x1023c08: sw    v1, 20(s1)
+// 0x01023c18: 0x1023c18: sw    v1, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5263,14 +5263,14 @@ L_1023b5c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023c0c: 0x1023c0c: lw    v0, 0(t0)
+// 0x01023c1c: 0x1023c1c: lw    v0, 0(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01023c10: 0x1023c10: lw    a1, 4(s5)
+// 0x01023c20: 0x1023c20: lw    a1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5279,7 +5279,7 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023c14: 0x1023c14: lw    a0, 4(t0)
+// 0x01023c24: 0x1023c24: lw    a0, 4(t0)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5288,35 +5288,35 @@ L_1023b5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023c18: 0x1023c18: lw    v1, 0(s5)
+// 0x01023c28: 0x1023c28: lw    v1, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01023c1c: 0x1023c1c: addu  a0, a1, a0
+// 0x01023c2c: 0x1023c2c: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01023c20: 0x1023c20: addu  v1, v1, v0
+// 0x01023c30: 0x1023c30: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x01023c24: 0x1023c24: addiu v0, zero, 2
+// 0x01023c34: 0x1023c34: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01023c28: 0x1023c28: div   a0, v0
+// 0x01023c38: 0x1023c38: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 8
-// 0x01023c2c: 0x1023c2c: mflo  lo
+// 0x01023c3c: 0x1023c3c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01023c30: 0x1023c30: sw    a0, 8(s1)
+// 0x01023c40: 0x1023c40: sw    a0, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5325,16 +5325,16 @@ L_1023b5c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01023c34: 0x1023c34: sll   zero, zero, 0
-// 0x01023c38: 0x1023c38: div   v1, v0
+// 0x01023c44: 0x1023c44: sll   zero, zero, 0
+// 0x01023c48: 0x1023c48: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 8
-// 0x01023c3c: 0x1023c3c: mflo  lo
+// 0x01023c4c: 0x1023c4c: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01023c40: 0x1023c40: j	 0x1023dcc sw    v1, 4(s1)
+// 0x01023c50: 0x1023c50: j	 0x1023ddc sw    v1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5343,63 +5343,63 @@ L_1023b5c:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1023dcc
+	br L_1023ddc
 // --- basic block ---
-L_1023c48:
-// 0x01023c48: 0x1023c48: lw    v0, -20612(s3)
+L_1023c58:
+// 0x01023c58: 0x1023c58: lw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023c4c: 0x1023c4c: lui   v1, 0x40000
+// 0x01023c5c: 0x1023c5c: lui   v1, 0x40000
 	ldc.i4 262144
 	stloc 7
-// 0x01023c50: 0x1023c50: addiu v1, v1, -20600
+// 0x01023c60: 0x1023c60: addiu v1, v1, -20136
 	ldloc 7
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc 7
-// 0x01023c54: 0x1023c54: addiu v0, v0, 16
+// 0x01023c64: 0x1023c64: addiu v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x01023c58: 0x1023c58: subu  v0, v0, v1
+// 0x01023c68: 0x1023c68: subu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 5
-// 0x01023c5c: 0x1023c5c: ori   v1, zero, 32768
+// 0x01023c6c: 0x1023c6c: ori   v1, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 7
-// 0x01023c60: 0x1023c60: slt   v0, v0, v1
+// 0x01023c70: 0x1023c70: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01023c64: 0x1023c64: bne   v0, zero, 0x1023c74 sll   zero, zero, 0
+// 0x01023c74: 0x1023c74: bne   v0, zero, 0x1023c84 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023c74
+	brtrue L_1023c84
 // --- basic block ---
-// 0x01023c6c: 0x1023c6c: jal   0x1021f34 sll   zero, zero, 0
+// 0x01023c7c: 0x1023c7c: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1023c74:
-// 0x01023c74: 0x1023c74: lw    v1, 48(sp)
+L_1023c84:
+// 0x01023c84: 0x1023c84: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5408,7 +5408,7 @@ L_1023c74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023c78: 0x1023c78: lw    v0, 56(s0)
+// 0x01023c88: 0x1023c88: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5417,17 +5417,17 @@ L_1023c74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023c7c: 0x1023c7c: sll   zero, zero, 0
-// 0x01023c80: 0x1023c80: slt   a0, v0, v1
+// 0x01023c8c: 0x1023c8c: sll   zero, zero, 0
+// 0x01023c90: 0x1023c90: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x01023c84: 0x1023c84: beq   a0, zero, 0x1023ca0 sll   zero, zero, 0
+// 0x01023c94: 0x1023c94: beq   a0, zero, 0x1023cb0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1023ca0
+	brfalse L_1023cb0
 // --- basic block ---
-// 0x01023c8c: 0x1023c8c: lw    a0, 56(sp)
+// 0x01023c9c: 0x1023c9c: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5436,18 +5436,18 @@ L_1023c74:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023c90: 0x1023c90: sll   zero, zero, 0
-// 0x01023c94: 0x1023c94: slt   v0, v0, a0
+// 0x01023ca0: 0x1023ca0: sll   zero, zero, 0
+// 0x01023ca4: 0x1023ca4: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x01023c98: 0x1023c98: bne   v0, zero, 0x1023dc4 sll   zero, zero, 0
+// 0x01023ca8: 0x1023ca8: bne   v0, zero, 0x1023dd4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023dc4
+	brtrue L_1023dd4
 // --- basic block ---
-L_1023ca0:
-// 0x01023ca0: 0x1023ca0: lw    v0, 64(s0)
+L_1023cb0:
+// 0x01023cb0: 0x1023cb0: lw    v0, 64(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5456,17 +5456,17 @@ L_1023ca0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023ca4: 0x1023ca4: sll   zero, zero, 0
-// 0x01023ca8: 0x1023ca8: slt   v1, v1, v0
+// 0x01023cb4: 0x1023cb4: sll   zero, zero, 0
+// 0x01023cb8: 0x1023cb8: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01023cac: 0x1023cac: beq   v1, zero, 0x1023cc8 sll   zero, zero, 0
+// 0x01023cbc: 0x1023cbc: beq   v1, zero, 0x1023cd8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1023cc8
+	brfalse L_1023cd8
 // --- basic block ---
-// 0x01023cb4: 0x1023cb4: lw    v1, 56(sp)
+// 0x01023cc4: 0x1023cc4: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5475,18 +5475,18 @@ L_1023ca0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023cb8: 0x1023cb8: sll   zero, zero, 0
-// 0x01023cbc: 0x1023cbc: slt   v0, v1, v0
+// 0x01023cc8: 0x1023cc8: sll   zero, zero, 0
+// 0x01023ccc: 0x1023ccc: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01023cc0: 0x1023cc0: bne   v0, zero, 0x1023dc4 sll   zero, zero, 0
+// 0x01023cd0: 0x1023cd0: bne   v0, zero, 0x1023dd4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023dc4
+	brtrue L_1023dd4
 // --- basic block ---
-L_1023cc8:
-// 0x01023cc8: 0x1023cc8: lw    v1, 52(sp)
+L_1023cd8:
+// 0x01023cd8: 0x1023cd8: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5495,7 +5495,7 @@ L_1023cc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023ccc: 0x1023ccc: lw    v0, 60(s0)
+// 0x01023cdc: 0x1023cdc: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5504,17 +5504,17 @@ L_1023cc8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023cd0: 0x1023cd0: sll   zero, zero, 0
-// 0x01023cd4: 0x1023cd4: slt   a0, v0, v1
+// 0x01023ce0: 0x1023ce0: sll   zero, zero, 0
+// 0x01023ce4: 0x1023ce4: slt   a0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-// 0x01023cd8: 0x1023cd8: beq   a0, zero, 0x1023cf4 sll   zero, zero, 0
+// 0x01023ce8: 0x1023ce8: beq   a0, zero, 0x1023d04 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1023cf4
+	brfalse L_1023d04
 // --- basic block ---
-// 0x01023ce0: 0x1023ce0: lw    a0, 60(sp)
+// 0x01023cf0: 0x1023cf0: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5523,18 +5523,18 @@ L_1023cc8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023ce4: 0x1023ce4: sll   zero, zero, 0
-// 0x01023ce8: 0x1023ce8: slt   v0, v0, a0
+// 0x01023cf4: 0x1023cf4: sll   zero, zero, 0
+// 0x01023cf8: 0x1023cf8: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x01023cec: 0x1023cec: bne   v0, zero, 0x1023dc4 sll   zero, zero, 0
+// 0x01023cfc: 0x1023cfc: bne   v0, zero, 0x1023dd4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023dc4
+	brtrue L_1023dd4
 // --- basic block ---
-L_1023cf4:
-// 0x01023cf4: 0x1023cf4: lw    v0, 68(s0)
+L_1023d04:
+// 0x01023d04: 0x1023d04: lw    v0, 68(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5543,17 +5543,17 @@ L_1023cf4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023cf8: 0x1023cf8: sll   zero, zero, 0
-// 0x01023cfc: 0x1023cfc: slt   v1, v1, v0
+// 0x01023d08: 0x1023d08: sll   zero, zero, 0
+// 0x01023d0c: 0x1023d0c: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01023d00: 0x1023d00: beq   v1, zero, 0x10240b4 sll   zero, zero, 0
+// 0x01023d10: 0x1023d10: beq   v1, zero, 0x10240c4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10240b4
+	brfalse L_10240c4
 // --- basic block ---
-// 0x01023d08: 0x1023d08: lw    v1, 60(sp)
+// 0x01023d18: 0x1023d18: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5562,27 +5562,27 @@ L_1023cf4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023d0c: 0x1023d0c: sll   zero, zero, 0
-// 0x01023d10: 0x1023d10: slt   v0, v1, v0
+// 0x01023d1c: 0x1023d1c: sll   zero, zero, 0
+// 0x01023d20: 0x1023d20: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01023d14: 0x1023d14: bne   v0, zero, 0x1023dc4 sll   zero, zero, 0
+// 0x01023d24: 0x1023d24: bne   v0, zero, 0x1023dd4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1023dc4
+	brtrue L_1023dd4
 // --- basic block ---
-// 0x01023d1c: 0x1023d1c: j	 0x10240b4 sll   zero, zero, 0
-	br L_10240b4
+// 0x01023d2c: 0x1023d2c: j	 0x10240c4 sll   zero, zero, 0
+	br L_10240c4
 // --- basic block ---
-L_1023d24:
-// 0x01023d24: 0x1023d24: addu  a0, s6, zero
+L_1023d34:
+// 0x01023d34: 0x1023d34: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01023d28: 0x1023d28: addu  a1, s5, zero
+// 0x01023d38: 0x1023d38: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x01023d2c: 0x1023d2c: jal   0x1009694 addiu a2, zero, 1
+// 0x01023d3c: 0x1023d3c: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5590,19 +5590,19 @@ L_1023d24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01023d34: 0x1023d34: sw    v0, 0(s1)
+// 0x01023d44: 0x1023d44: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01023d38: 0x1023d38: lw    v1, 48(sp)
+// 0x01023d48: 0x1023d48: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5611,10 +5611,10 @@ L_1023d24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023d3c: 0x1023d3c: addiu v0, zero, 2
+// 0x01023d4c: 0x1023d4c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01023d40: 0x1023d40: sw    v1, 12(s1)
+// 0x01023d50: 0x1023d50: sw    v1, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5623,7 +5623,7 @@ L_1023d24:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023d44: 0x1023d44: lw    v1, 52(sp)
+// 0x01023d54: 0x1023d54: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5632,8 +5632,8 @@ L_1023d24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023d48: 0x1023d48: sll   zero, zero, 0
-// 0x01023d4c: 0x1023d4c: sw    v1, 16(s1)
+// 0x01023d58: 0x1023d58: sll   zero, zero, 0
+// 0x01023d5c: 0x1023d5c: sw    v1, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5642,7 +5642,7 @@ L_1023d24:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023d50: 0x1023d50: lw    v1, 56(sp)
+// 0x01023d60: 0x1023d60: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5651,8 +5651,8 @@ L_1023d24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023d54: 0x1023d54: sll   zero, zero, 0
-// 0x01023d58: 0x1023d58: sw    v1, 20(s1)
+// 0x01023d64: 0x1023d64: sll   zero, zero, 0
+// 0x01023d68: 0x1023d68: sw    v1, 20(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5661,7 +5661,7 @@ L_1023d24:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023d5c: 0x1023d5c: lw    v1, 60(sp)
+// 0x01023d6c: 0x1023d6c: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5670,8 +5670,8 @@ L_1023d24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023d60: 0x1023d60: sll   zero, zero, 0
-// 0x01023d64: 0x1023d64: sw    v1, 24(s1)
+// 0x01023d70: 0x1023d70: sll   zero, zero, 0
+// 0x01023d74: 0x1023d74: sw    v1, 24(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5680,7 +5680,7 @@ L_1023d24:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023d68: 0x1023d68: lw    a1, 4(s5)
+// 0x01023d78: 0x1023d78: lw    a1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5689,7 +5689,7 @@ L_1023d24:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023d6c: 0x1023d6c: lw    a0, 4(s6)
+// 0x01023d7c: 0x1023d7c: lw    a0, 4(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -5698,24 +5698,24 @@ L_1023d24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023d70: 0x1023d70: lw    a2, 0(s5)
+// 0x01023d80: 0x1023d80: lw    a2, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01023d74: 0x1023d74: addu  a0, a1, a0
+// 0x01023d84: 0x1023d84: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01023d78: 0x1023d78: div   a0, v0
+// 0x01023d88: 0x1023d88: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 8
-// 0x01023d7c: 0x1023d7c: lw    v1, 8(s5)
+// 0x01023d8c: 0x1023d8c: lw    v1, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5724,16 +5724,16 @@ L_1023d24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023d80: 0x1023d80: sll   zero, zero, 0
-// 0x01023d84: 0x1023d84: addu  v1, a2, v1
+// 0x01023d90: 0x1023d90: sll   zero, zero, 0
+// 0x01023d94: 0x1023d94: addu  v1, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x01023d88: 0x1023d88: mflo  lo
+// 0x01023d98: 0x1023d98: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01023d8c: 0x1023d8c: sw    a0, 8(s1)
+// 0x01023d9c: 0x1023d9c: sw    a0, 8(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5742,16 +5742,16 @@ L_1023d24:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01023d90: 0x1023d90: sll   zero, zero, 0
-// 0x01023d94: 0x1023d94: div   v1, v0
+// 0x01023da0: 0x1023da0: sll   zero, zero, 0
+// 0x01023da4: 0x1023da4: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 8
-// 0x01023d98: 0x1023d98: mflo  lo
+// 0x01023da8: 0x1023da8: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01023d9c: 0x1023d9c: sw    v1, 4(s1)
+// 0x01023dac: 0x1023dac: sw    v1, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5760,8 +5760,8 @@ L_1023d24:
 	add
 	ldloc 7
 	stelem.i4
-L_1023da0:
-// 0x01023da0: 0x1023da0: lw    v0, 6204(s2)
+L_1023db0:
+// 0x01023db0: 0x1023db0: lw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -5770,83 +5770,83 @@ L_1023da0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023da4: 0x1023da4: lw    a1, -20612(s3)
+// 0x01023db4: 0x1023db4: lw    a1, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023da8: 0x1023da8: lw    v1, 28532(s4)
+// 0x01023db8: 0x1023db8: lw    v1, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023dac: 0x1023dac: subu  a1, v0, a1
+// 0x01023dbc: 0x1023dbc: subu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	sub
 	stloc.2
-// 0x01023db0: 0x1023db0: sra   a1, a1, 3
+// 0x01023dc0: 0x1023dc0: sra   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shr
 	stloc.2
-// 0x01023db4: 0x1023db4: addiu a0, v1, 4
+// 0x01023dc4: 0x1023dc4: addiu a0, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc.1
-// 0x01023db8: 0x1023db8: sw    a1, 0(v1)
+// 0x01023dc8: 0x1023dc8: sw    a1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01023dbc: 0x1023dbc: sw    v0, -20612(s3)
+// 0x01023dcc: 0x1023dcc: sw    v0, -20148(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc 5
 	stelem.i4
-// 0x01023dc0: 0x1023dc0: sw    a0, 28532(s4)
+// 0x01023dd0: 0x1023dd0: sw    a0, 28996(s4)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.1
 	stelem.i4
-L_1023dc4:
-// 0x01023dc4: 0x1023dc4: beq   s1, zero, 0x1023f74 sll   zero, zero, 0
+L_1023dd4:
+// 0x01023dd4: 0x1023dd4: beq   s1, zero, 0x1023f84 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-L_1023dcc:
-// 0x01023dcc: 0x1023dcc: lw    v0, 0(s1)
+L_1023ddc:
+// 0x01023ddc: 0x1023ddc: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01023dd0: 0x1023dd0: sll   zero, zero, 0
-// 0x01023dd4: 0x1023dd4: beq   v0, zero, 0x1023f74 sll   zero, zero, 0
+// 0x01023de0: 0x1023de0: sll   zero, zero, 0
+// 0x01023de4: 0x1023de4: beq   v0, zero, 0x1023f84 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023ddc: 0x1023ddc: lw    v0, 148(sp)
+// 0x01023dec: 0x1023dec: lw    v0, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5855,14 +5855,14 @@ L_1023dcc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023de0: 0x1023de0: sll   zero, zero, 0
-// 0x01023de4: 0x1023de4: beq   v0, zero, 0x1023e10 lui   v1, 0x10000
+// 0x01023df0: 0x1023df0: sll   zero, zero, 0
+// 0x01023df4: 0x1023df4: beq   v0, zero, 0x1023e20 lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 7
-	brfalse L_1023e10
+	brfalse L_1023e20
 // --- basic block ---
-// 0x01023dec: 0x1023dec: lw    a0, 164(sp)
+// 0x01023dfc: 0x1023dfc: lw    a0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5871,12 +5871,12 @@ L_1023dcc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023df0: 0x1023df0: addiu a1, sp, 32
+// 0x01023e00: 0x1023e00: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01023df4: 0x1023df4: jal   0x1009694 addiu a2, zero, 1
+// 0x01023e04: 0x1023e04: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -5884,12 +5884,12 @@ L_1023dcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01023dfc: 0x1023dfc: lw    v1, 148(sp)
+// 0x01023e0c: 0x1023e0c: lw    v1, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5898,20 +5898,20 @@ L_1023dcc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023e00: 0x1023e00: sll   zero, zero, 0
-// 0x01023e04: 0x1023e04: slt   v0, v0, v1
+// 0x01023e10: 0x1023e10: sll   zero, zero, 0
+// 0x01023e14: 0x1023e14: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01023e08: 0x1023e08: beq   v0, zero, 0x1023f74 lui   v1, 0x10000
+// 0x01023e18: 0x1023e18: beq   v0, zero, 0x1023f84 lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 7
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-L_1023e10:
-// 0x01023e10: 0x1023e10: lw    a0, 136(sp)
+L_1023e20:
+// 0x01023e20: 0x1023e20: lw    a0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5920,12 +5920,12 @@ L_1023e10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023e14: 0x1023e14: ori   v1, v1, 11465
+// 0x01023e24: 0x1023e24: ori   v1, v1, 11465
 	ldloc 7
 	ldc.i4 11465
 	or
 	stloc 7
-// 0x01023e18: 0x1023e18: sw    v1, 80(sp)
+// 0x01023e28: 0x1023e28: sw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5934,7 +5934,7 @@ L_1023e10:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01023e1c: 0x1023e1c: lw    a1, 144(sp)
+// 0x01023e2c: 0x1023e2c: lw    a1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5943,7 +5943,7 @@ L_1023e10:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023e20: 0x1023e20: lw    v1, 248(sp)
+// 0x01023e30: 0x1023e30: lw    v1, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5952,12 +5952,12 @@ L_1023e10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023e24: 0x1023e24: slti  v0, a0, 8
+// 0x01023e34: 0x1023e34: slti  v0, a0, 8
 	ldloc.1
 	ldc.i4.8
 	clt
 	stloc 5
-// 0x01023e28: 0x1023e28: sw    zero, 64(sp)
+// 0x01023e38: 0x1023e38: sw    zero, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5966,7 +5966,7 @@ L_1023e10:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01023e2c: 0x1023e2c: sw    a1, 68(sp)
+// 0x01023e3c: 0x1023e3c: sw    a1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5975,7 +5975,7 @@ L_1023e10:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023e30: 0x1023e30: sw    a0, 72(sp)
+// 0x01023e40: 0x1023e40: sw    a0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5984,7 +5984,7 @@ L_1023e10:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01023e34: 0x1023e34: bne   v0, zero, 0x1023eb4 sw    v1, 76(sp)
+// 0x01023e44: 0x1023e44: bne   v0, zero, 0x1023ec4 sw    v1, 76(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5994,21 +5994,21 @@ L_1023e10:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1023eb4
+	brtrue L_1023ec4
 // --- basic block ---
-// 0x01023e3c: 0x1023e3c: lui   a0, 0xe0000
+// 0x01023e4c: 0x1023e4c: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x01023e40: 0x1023e40: lw    v0, 29728(a0)
+// 0x01023e50: 0x1023e50: lw    v0, 30192(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023e44: 0x1023e44: lw    a1, 156(sp)
+// 0x01023e54: 0x1023e54: lw    a1, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6017,13 +6017,13 @@ L_1023e10:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023e48: 0x1023e48: sll   zero, zero, 0
-// 0x01023e4c: 0x1023e4c: addu  v0, v0, a1
+// 0x01023e58: 0x1023e58: sll   zero, zero, 0
+// 0x01023e5c: 0x1023e5c: addu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-// 0x01023e50: 0x1023e50: lw    v1, 8(v0)
+// 0x01023e60: 0x1023e60: lw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6032,23 +6032,23 @@ L_1023e10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023e54: 0x1023e54: sll   zero, zero, 0
-// 0x01023e58: 0x1023e58: beq   v1, zero, 0x1023f74 lui   v1, 0xe0000
+// 0x01023e64: 0x1023e64: sll   zero, zero, 0
+// 0x01023e68: 0x1023e68: beq   v1, zero, 0x1023f84 lui   v1, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc 7
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023e60: 0x1023e60: lw    a0, 29604(v1)
+// 0x01023e70: 0x1023e70: lw    a0, 30068(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023e64: 0x1023e64: lw    v1, 16(v0)
+// 0x01023e74: 0x1023e74: lw    v1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6057,19 +6057,19 @@ L_1023e10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023e68: 0x1023e68: sll   zero, zero, 0
-// 0x01023e6c: 0x1023e6c: slt   v1, a0, v1
+// 0x01023e78: 0x1023e78: sll   zero, zero, 0
+// 0x01023e7c: 0x1023e7c: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x01023e70: 0x1023e70: beq   v1, zero, 0x1023f74 addiu v1, zero, 16
+// 0x01023e80: 0x1023e80: beq   v1, zero, 0x1023f84 addiu v1, zero, 16
 	ldloc 7
 	ldc.i4.s 16
 	stloc 7
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023e78: 0x1023e78: lw    a0, 136(sp)
+// 0x01023e88: 0x1023e88: lw    a0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6078,30 +6078,30 @@ L_1023e10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023e7c: 0x1023e7c: sll   zero, zero, 0
-// 0x01023e80: 0x1023e80: bne   a0, v1, 0x1023e98 lui   v1, 0x30000
+// 0x01023e8c: 0x1023e8c: sll   zero, zero, 0
+// 0x01023e90: 0x1023e90: bne   a0, v1, 0x1023ea8 lui   v1, 0x30000
 	ldloc.1
 	ldloc 7
 	ldc.i4 196608
 	stloc 7
-	bne.un L_1023e98
+	bne.un L_1023ea8
 // --- basic block ---
-// 0x01023e88: 0x1023e88: lw    v1, 28228(v1)
+// 0x01023e98: 0x1023e98: lw    v1, 28692(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023e8c: 0x1023e8c: sll   zero, zero, 0
-// 0x01023e90: 0x1023e90: bne   v1, zero, 0x1023f74 sll   zero, zero, 0
+// 0x01023e9c: 0x1023e9c: sll   zero, zero, 0
+// 0x01023ea0: 0x1023ea0: bne   v1, zero, 0x1023f84 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1023f74
+	brtrue L_1023f84
 // --- basic block ---
-L_1023e98:
-// 0x01023e98: 0x1023e98: lw    v1, 120(v0)
+L_1023ea8:
+// 0x01023ea8: 0x1023ea8: lw    v1, 120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6110,12 +6110,12 @@ L_1023e98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023e9c: 0x1023e9c: sll   zero, zero, 0
-// 0x01023ea0: 0x1023ea0: beq   v1, zero, 0x1023f74 sll   zero, zero, 0
+// 0x01023eac: 0x1023eac: sll   zero, zero, 0
+// 0x01023eb0: 0x1023eb0: beq   v1, zero, 0x1023f84 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023ea8: 0x1023ea8: lw    a0, 48(v0)
+// 0x01023eb8: 0x1023eb8: lw    a0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6124,14 +6124,14 @@ L_1023e98:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023eac: 0x1023eac: j	 0x1023f08 sll   zero, zero, 0
-	br L_1023f08
+// 0x01023ebc: 0x1023ebc: j	 0x1023f18 sll   zero, zero, 0
+	br L_1023f18
 // --- basic block ---
-L_1023eb4:
-// 0x01023eb4: 0x1023eb4: lui   a1, 0xe0000
+L_1023ec4:
+// 0x01023ec4: 0x1023ec4: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x01023eb8: 0x1023eb8: lw    v1, 156(sp)
+// 0x01023ec8: 0x1023ec8: lw    v1, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6140,22 +6140,22 @@ L_1023eb4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023ebc: 0x1023ebc: lw    v0, 29728(a1)
+// 0x01023ecc: 0x1023ecc: lw    v0, 30192(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023ec0: 0x1023ec0: sll   zero, zero, 0
-// 0x01023ec4: 0x1023ec4: addu  v0, v0, v1
+// 0x01023ed0: 0x1023ed0: sll   zero, zero, 0
+// 0x01023ed4: 0x1023ed4: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01023ec8: 0x1023ec8: lw    v1, 8(v0)
+// 0x01023ed8: 0x1023ed8: lw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6164,23 +6164,23 @@ L_1023eb4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023ecc: 0x1023ecc: sll   zero, zero, 0
-// 0x01023ed0: 0x1023ed0: beq   v1, zero, 0x1023f74 lui   a1, 0xe0000
+// 0x01023edc: 0x1023edc: sll   zero, zero, 0
+// 0x01023ee0: 0x1023ee0: beq   v1, zero, 0x1023f84 lui   a1, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc.2
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023ed8: 0x1023ed8: lw    a0, 29604(a1)
+// 0x01023ee8: 0x1023ee8: lw    a0, 30068(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023edc: 0x1023edc: lw    v1, 16(v0)
+// 0x01023eec: 0x1023eec: lw    v1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6189,17 +6189,17 @@ L_1023eb4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023ee0: 0x1023ee0: sll   zero, zero, 0
-// 0x01023ee4: 0x1023ee4: slt   v1, a0, v1
+// 0x01023ef0: 0x1023ef0: sll   zero, zero, 0
+// 0x01023ef4: 0x1023ef4: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x01023ee8: 0x1023ee8: beq   v1, zero, 0x1023f74 sll   zero, zero, 0
+// 0x01023ef8: 0x1023ef8: beq   v1, zero, 0x1023f84 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023ef0: 0x1023ef0: lw    v1, 124(v0)
+// 0x01023f00: 0x1023f00: lw    v1, 124(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6208,12 +6208,12 @@ L_1023eb4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023ef4: 0x1023ef4: sll   zero, zero, 0
-// 0x01023ef8: 0x1023ef8: beq   v1, zero, 0x1023f74 sll   zero, zero, 0
+// 0x01023f04: 0x1023f04: sll   zero, zero, 0
+// 0x01023f08: 0x1023f08: beq   v1, zero, 0x1023f84 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023f00: 0x1023f00: lw    a0, 52(v0)
+// 0x01023f10: 0x1023f10: lw    a0, 52(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6222,38 +6222,38 @@ L_1023eb4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023f04: 0x1023f04: sll   zero, zero, 0
-L_1023f08:
-// 0x01023f08: 0x1023f08: beq   a0, zero, 0x1023f74 sll   zero, zero, 0
+// 0x01023f14: 0x1023f14: sll   zero, zero, 0
+L_1023f18:
+// 0x01023f18: 0x1023f18: beq   a0, zero, 0x1023f84 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023f10: 0x1023f10: jal   0x104dd48 sll   zero, zero, 0
+// 0x01023f20: 0x1023f20: jal   0x104dd58 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd48(int32)
+	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd58(int32)
 	stloc 5
 // --- basic block ---
-// 0x01023f18: 0x1023f18: slti  v0, v0, 2
+// 0x01023f28: 0x1023f28: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01023f1c: 0x1023f1c: bne   v0, zero, 0x1023f74 lui   v1, 0xe0000
+// 0x01023f2c: 0x1023f2c: bne   v0, zero, 0x1023f84 lui   v1, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 7
-	brtrue L_1023f74
+	brtrue L_1023f84
 // --- basic block ---
-// 0x01023f24: 0x1023f24: lw    v0, 29728(v1)
+// 0x01023f34: 0x1023f34: lw    v0, 30192(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023f28: 0x1023f28: lw    a0, 156(sp)
+// 0x01023f38: 0x1023f38: lw    a0, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6262,13 +6262,13 @@ L_1023f08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023f2c: 0x1023f2c: sll   zero, zero, 0
-// 0x01023f30: 0x1023f30: addu  v0, v0, a0
+// 0x01023f3c: 0x1023f3c: sll   zero, zero, 0
+// 0x01023f40: 0x1023f40: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01023f34: 0x1023f34: lw    v1, 24(v0)
+// 0x01023f44: 0x1023f44: lw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6277,14 +6277,14 @@ L_1023f08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023f38: 0x1023f38: sll   zero, zero, 0
-// 0x01023f3c: 0x1023f3c: beq   v1, zero, 0x1023f74 lui   a1, 0xe0000
+// 0x01023f48: 0x1023f48: sll   zero, zero, 0
+// 0x01023f4c: 0x1023f4c: beq   v1, zero, 0x1023f84 lui   a1, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc.2
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023f44: 0x1023f44: lw    v0, 28(v0)
+// 0x01023f54: 0x1023f54: lw    v0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6293,28 +6293,28 @@ L_1023f08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023f48: 0x1023f48: lw    v1, 29604(a1)
+// 0x01023f58: 0x1023f58: lw    v1, 30068(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023f4c: 0x1023f4c: sll   zero, zero, 0
-// 0x01023f50: 0x1023f50: slt   v0, v1, v0
+// 0x01023f5c: 0x1023f5c: sll   zero, zero, 0
+// 0x01023f60: 0x1023f60: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01023f54: 0x1023f54: beq   v0, zero, 0x1023f74 addiu v0, zero, 4
+// 0x01023f64: 0x1023f64: beq   v0, zero, 0x1023f84 addiu v0, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	brfalse L_1023f74
+	brfalse L_1023f84
 // --- basic block ---
-// 0x01023f5c: 0x1023f5c: lw    v1, 136(sp)
+// 0x01023f6c: 0x1023f6c: lw    v1, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6323,17 +6323,17 @@ L_1023f08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023f60: 0x1023f60: sll   zero, zero, 0
-// 0x01023f64: 0x1023f64: beq   v1, v0, 0x1023f74 addiu a0, sp, 64
+// 0x01023f70: 0x1023f70: sll   zero, zero, 0
+// 0x01023f74: 0x1023f74: beq   v1, v0, 0x1023f84 addiu a0, sp, 64
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-	beq  L_1023f74
+	beq  L_1023f84
 // --- basic block ---
-// 0x01023f6c: 0x1023f6c: jal   0x10bfb94 addu  a1, s1, zero
+// 0x01023f7c: 0x1023f7c: jal   0x10c01dc addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -6341,13 +6341,13 @@ L_1023f08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_label_add_10bfb94(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_label_add_10c01dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1023f74:
-// 0x01023f74: 0x1023f74: lw    a0, 160(sp)
+L_1023f84:
+// 0x01023f84: 0x1023f84: lw    a0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6356,7 +6356,7 @@ L_1023f74:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023f78: 0x1023f78: lw    a1, 144(sp)
+// 0x01023f88: 0x1023f88: lw    a1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6365,7 +6365,7 @@ L_1023f74:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01023f7c: 0x1023f7c: lw    v0, 152(sp)
+// 0x01023f8c: 0x1023f8c: lw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6374,22 +6374,22 @@ L_1023f74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023f80: 0x1023f80: addiu a0, a0, 1
+// 0x01023f90: 0x1023f90: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01023f84: 0x1023f84: addiu a1, a1, 1
+// 0x01023f94: 0x1023f94: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01023f88: 0x1023f88: addiu v0, v0, 8
+// 0x01023f98: 0x1023f98: addiu v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01023f8c: 0x1023f8c: sw    a0, 160(sp)
+// 0x01023f9c: 0x1023f9c: sw    a0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6398,7 +6398,7 @@ L_1023f74:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01023f90: 0x1023f90: sw    a1, 144(sp)
+// 0x01023fa0: 0x1023fa0: sw    a1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6407,7 +6407,7 @@ L_1023f74:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01023f94: 0x1023f94: sw    v0, 152(sp)
+// 0x01023fa4: 0x1023fa4: sw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6416,8 +6416,8 @@ L_1023f74:
 	add
 	ldloc 5
 	stelem.i4
-L_1023f98:
-// 0x01023f98: 0x1023f98: lw    v1, 144(sp)
+L_1023fa8:
+// 0x01023fa8: 0x1023fa8: lw    v1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6426,7 +6426,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01023f9c: 0x1023f9c: lw    a0, 256(sp)
+// 0x01023fac: 0x1023fac: lw    a0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6435,20 +6435,20 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01023fa0: 0x1023fa0: sll   zero, zero, 0
-// 0x01023fa4: 0x1023fa4: slt   v0, a0, v1
+// 0x01023fb0: 0x1023fb0: sll   zero, zero, 0
+// 0x01023fb4: 0x1023fb4: slt   v0, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 5
-// 0x01023fa8: 0x1023fa8: beq   v0, zero, 0x1023020 lui   v0, 0x20000
+// 0x01023fb8: 0x1023fb8: beq   v0, zero, 0x1023030 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1023020
+	brfalse L_1023030
 // --- basic block ---
-// 0x01023fb0: 0x1023fb0: lw    ra, 244(sp)
-// 0x01023fb4: 0x1023fb4: lw    v0, 160(sp)
+// 0x01023fc0: 0x1023fc0: lw    ra, 244(sp)
+// 0x01023fc4: 0x1023fc4: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6457,7 +6457,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01023fb8: 0x1023fb8: lw    s8, 240(sp)
+// 0x01023fc8: 0x1023fc8: lw    s8, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6466,7 +6466,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01023fbc: 0x1023fbc: lw    s7, 236(sp)
+// 0x01023fcc: 0x1023fcc: lw    s7, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6475,7 +6475,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01023fc0: 0x1023fc0: lw    s6, 232(sp)
+// 0x01023fd0: 0x1023fd0: lw    s6, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6484,7 +6484,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01023fc4: 0x1023fc4: lw    s5, 228(sp)
+// 0x01023fd4: 0x1023fd4: lw    s5, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6493,7 +6493,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01023fc8: 0x1023fc8: lw    s4, 224(sp)
+// 0x01023fd8: 0x1023fd8: lw    s4, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6502,7 +6502,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01023fcc: 0x1023fcc: lw    s3, 220(sp)
+// 0x01023fdc: 0x1023fdc: lw    s3, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6511,7 +6511,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01023fd0: 0x1023fd0: lw    s2, 216(sp)
+// 0x01023fe0: 0x1023fe0: lw    s2, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6520,7 +6520,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01023fd4: 0x1023fd4: lw    s1, 212(sp)
+// 0x01023fe4: 0x1023fe4: lw    s1, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6529,7 +6529,7 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01023fd8: 0x1023fd8: lw    s0, 208(sp)
+// 0x01023fe8: 0x1023fe8: lw    s0, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6538,31 +6538,31 @@ L_1023f98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01023fdc: 0x1023fdc: jr    ra addiu sp, sp, 248
+// 0x01023fec: 0x1023fec: jr    ra addiu sp, sp, 248
 	ldloc.0
 	ldc.i4 248
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1023fe4:
-// 0x01023fe4: 0x1023fe4: beq   t0, zero, 0x1023274 sll   zero, zero, 0
+L_1023ff4:
+// 0x01023ff4: 0x1023ff4: beq   t0, zero, 0x1023284 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1023274
+	brfalse L_1023284
 // --- basic block ---
-// 0x01023fec: 0x1023fec: j	 0x10232b4 sll   zero, zero, 0
-	br L_10232b4
+// 0x01023ffc: 0x1023ffc: j	 0x10232c4 sll   zero, zero, 0
+	br L_10232c4
 // --- basic block ---
-L_1023ff4:
-// 0x01023ff4: 0x1023ff4: beq   t0, zero, 0x10234a8 sll   zero, zero, 0
+L_1024004:
+// 0x01024004: 0x1024004: beq   t0, zero, 0x10234b8 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_10234a8
+	brfalse L_10234b8
 // --- basic block ---
-// 0x01023ffc: 0x1023ffc: j	 0x10234e8 sll   zero, zero, 0
-	br L_10234e8
+// 0x0102400c: 0x102400c: j	 0x10234f8 sll   zero, zero, 0
+	br L_10234f8
 // --- basic block ---
-L_1024004:
-// 0x01024004: 0x1024004: lw    a0, 48(sp)
+L_1024014:
+// 0x01024014: 0x1024014: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6571,7 +6571,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024008: 0x1024008: lw    v0, 80(s0)
+// 0x01024018: 0x1024018: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6580,7 +6580,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102400c: 0x102400c: lw    v1, 32(s0)
+// 0x0102401c: 0x102401c: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6589,17 +6589,17 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01024010: 0x1024010: subu  v0, a0, v0
+// 0x01024020: 0x1024020: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01024014: 0x1024014: div   v0, v1
+// 0x01024024: 0x1024024: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01024018: 0x1024018: lw    s5, 6204(s2)
+// 0x01024028: 0x1024028: lw    s5, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6608,13 +6608,13 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102401c: 0x102401c: sll   zero, zero, 0
-// 0x01024020: 0x1024020: addiu v0, s5, 16
+// 0x0102402c: 0x102402c: sll   zero, zero, 0
+// 0x01024030: 0x1024030: addiu v0, s5, 16
 	ldloc 11
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x01024024: 0x1024024: sw    v0, 6204(s2)
+// 0x01024034: 0x1024034: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6623,22 +6623,22 @@ L_1024004:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01024028: 0x1024028: addiu s7, s5, 8
+// 0x01024038: 0x1024038: addiu s7, s5, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 15
-// 0x0102402c: 0x102402c: mflo  lo
+// 0x0102403c: 0x102403c: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01024030: 0x1024030: sw    v1, 0(s5)
+// 0x01024040: 0x1024040: sw    v1, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01024034: 0x1024034: lw    a0, 76(s0)
+// 0x01024044: 0x1024044: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6647,7 +6647,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024038: 0x1024038: lw    v0, 52(sp)
+// 0x01024048: 0x1024048: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6656,7 +6656,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102403c: 0x102403c: lw    v1, 36(s0)
+// 0x0102404c: 0x102404c: lw    v1, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6665,20 +6665,20 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01024040: 0x1024040: subu  v0, a0, v0
+// 0x01024050: 0x1024050: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01024044: 0x1024044: div   v0, v1
+// 0x01024054: 0x1024054: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01024048: 0x1024048: mflo  lo
+// 0x01024058: 0x1024058: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0102404c: 0x102404c: sw    v1, 4(s5)
+// 0x0102405c: 0x102405c: sw    v1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6687,7 +6687,7 @@ L_1024004:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01024050: 0x1024050: lw    a0, 56(sp)
+// 0x01024060: 0x1024060: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6696,7 +6696,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024054: 0x1024054: lw    v0, 80(s0)
+// 0x01024064: 0x1024064: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6705,7 +6705,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024058: 0x1024058: lw    v1, 32(s0)
+// 0x01024068: 0x1024068: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6714,20 +6714,20 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102405c: 0x102405c: subu  v0, a0, v0
+// 0x0102406c: 0x102406c: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01024060: 0x1024060: div   v0, v1
+// 0x01024070: 0x1024070: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01024064: 0x1024064: mflo  lo
+// 0x01024074: 0x1024074: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01024068: 0x1024068: sw    v1, 8(s5)
+// 0x01024078: 0x1024078: sw    v1, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6736,7 +6736,7 @@ L_1024004:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102406c: 0x102406c: lw    a0, 76(s0)
+// 0x0102407c: 0x102407c: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6745,7 +6745,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024070: 0x1024070: lw    v0, 60(sp)
+// 0x01024080: 0x1024080: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6754,7 +6754,7 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024074: 0x1024074: lw    v1, 36(s0)
+// 0x01024084: 0x1024084: lw    v1, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6763,20 +6763,20 @@ L_1024004:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01024078: 0x1024078: subu  v0, a0, v0
+// 0x01024088: 0x1024088: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x0102407c: 0x102407c: div   v0, v1
+// 0x0102408c: 0x102408c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01024080: 0x1024080: mflo  lo
+// 0x01024090: 0x1024090: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01024084: 0x1024084: bne   s1, zero, 0x10236b8 sw    v1, 4(s7)
+// 0x01024094: 0x1024094: bne   s1, zero, 0x10236c8 sw    v1, 4(s7)
 	ldloc 10
 	ldloc 6
 	ldloc 15
@@ -6786,29 +6786,29 @@ L_1024004:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_10236b8
+	brtrue L_10236c8
 // --- basic block ---
-// 0x0102408c: 0x102408c: j	 0x1023734 sll   zero, zero, 0
-	br L_1023734
+// 0x0102409c: 0x102409c: j	 0x1023744 sll   zero, zero, 0
+	br L_1023744
 // --- basic block ---
-L_1024094:
-// 0x01024094: 0x1024094: beq   t0, zero, 0x10238f0 sll   zero, zero, 0
+L_10240a4:
+// 0x010240a4: 0x10240a4: beq   t0, zero, 0x1023900 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_10238f0
+	brfalse L_1023900
 // --- basic block ---
-// 0x0102409c: 0x102409c: j	 0x1023930 sll   zero, zero, 0
-	br L_1023930
+// 0x010240ac: 0x10240ac: j	 0x1023940 sll   zero, zero, 0
+	br L_1023940
 // --- basic block ---
-L_10240a4:
-// 0x010240a4: 0x10240a4: beq   t0, zero, 0x1023b1c sll   zero, zero, 0
+L_10240b4:
+// 0x010240b4: 0x10240b4: beq   t0, zero, 0x1023b2c sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1023b1c
+	brfalse L_1023b2c
 // --- basic block ---
-// 0x010240ac: 0x10240ac: j	 0x1023b5c sll   zero, zero, 0
-	br L_1023b5c
+// 0x010240bc: 0x10240bc: j	 0x1023b6c sll   zero, zero, 0
+	br L_1023b6c
 // --- basic block ---
-L_10240b4:
-// 0x010240b4: 0x10240b4: lw    a0, 48(sp)
+L_10240c4:
+// 0x010240c4: 0x10240c4: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6817,7 +6817,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010240b8: 0x10240b8: lw    v0, 80(s0)
+// 0x010240c8: 0x10240c8: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6826,7 +6826,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010240bc: 0x10240bc: lw    v1, 32(s0)
+// 0x010240cc: 0x10240cc: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6835,17 +6835,17 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010240c0: 0x10240c0: subu  v0, a0, v0
+// 0x010240d0: 0x10240d0: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x010240c4: 0x10240c4: div   v0, v1
+// 0x010240d4: 0x10240d4: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x010240c8: 0x10240c8: lw    s5, 6204(s2)
+// 0x010240d8: 0x10240d8: lw    s5, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6854,13 +6854,13 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010240cc: 0x10240cc: sll   zero, zero, 0
-// 0x010240d0: 0x10240d0: addiu v0, s5, 16
+// 0x010240dc: 0x10240dc: sll   zero, zero, 0
+// 0x010240e0: 0x10240e0: addiu v0, s5, 16
 	ldloc 11
 	ldc.i4.s 16
 	add
 	stloc 5
-// 0x010240d4: 0x10240d4: sw    v0, 6204(s2)
+// 0x010240e4: 0x10240e4: sw    v0, 6204(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6869,22 +6869,22 @@ L_10240b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010240d8: 0x10240d8: addiu s6, s5, 8
+// 0x010240e8: 0x10240e8: addiu s6, s5, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 14
-// 0x010240dc: 0x10240dc: mflo  lo
+// 0x010240ec: 0x10240ec: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x010240e0: 0x10240e0: sw    v1, 0(s5)
+// 0x010240f0: 0x10240f0: sw    v1, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010240e4: 0x10240e4: lw    a0, 76(s0)
+// 0x010240f4: 0x10240f4: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6893,7 +6893,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010240e8: 0x10240e8: lw    v0, 52(sp)
+// 0x010240f8: 0x10240f8: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6902,7 +6902,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010240ec: 0x10240ec: lw    v1, 36(s0)
+// 0x010240fc: 0x10240fc: lw    v1, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6911,20 +6911,20 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010240f0: 0x10240f0: subu  v0, a0, v0
+// 0x01024100: 0x1024100: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x010240f4: 0x10240f4: div   v0, v1
+// 0x01024104: 0x1024104: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x010240f8: 0x10240f8: mflo  lo
+// 0x01024108: 0x1024108: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x010240fc: 0x10240fc: sw    v1, 4(s5)
+// 0x0102410c: 0x102410c: sw    v1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6933,7 +6933,7 @@ L_10240b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01024100: 0x1024100: lw    a0, 56(sp)
+// 0x01024110: 0x1024110: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6942,7 +6942,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024104: 0x1024104: lw    v0, 80(s0)
+// 0x01024114: 0x1024114: lw    v0, 80(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6951,7 +6951,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024108: 0x1024108: lw    v1, 32(s0)
+// 0x01024118: 0x1024118: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6960,20 +6960,20 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102410c: 0x102410c: subu  v0, a0, v0
+// 0x0102411c: 0x102411c: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01024110: 0x1024110: div   v0, v1
+// 0x01024120: 0x1024120: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01024114: 0x1024114: mflo  lo
+// 0x01024124: 0x1024124: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01024118: 0x1024118: sw    v1, 8(s5)
+// 0x01024128: 0x1024128: sw    v1, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6982,7 +6982,7 @@ L_10240b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102411c: 0x102411c: lw    a0, 76(s0)
+// 0x0102412c: 0x102412c: lw    a0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6991,7 +6991,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024120: 0x1024120: lw    v0, 60(sp)
+// 0x01024130: 0x1024130: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7000,7 +7000,7 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024124: 0x1024124: lw    v1, 36(s0)
+// 0x01024134: 0x1024134: lw    v1, 36(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7009,20 +7009,20 @@ L_10240b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01024128: 0x1024128: subu  v0, a0, v0
+// 0x01024138: 0x1024138: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x0102412c: 0x102412c: div   v0, v1
+// 0x0102413c: 0x102413c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 8
-// 0x01024130: 0x1024130: mflo  lo
+// 0x01024140: 0x1024140: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01024134: 0x1024134: bne   s1, zero, 0x1023d24 sw    v1, 4(s6)
+// 0x01024144: 0x1024144: bne   s1, zero, 0x1023d34 sw    v1, 4(s6)
 	ldloc 10
 	ldloc 6
 	ldloc 14
@@ -7032,10 +7032,10 @@ L_10240b4:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1023d24
+	brtrue L_1023d34
 // --- basic block ---
-// 0x0102413c: 0x102413c: j	 0x1023da0 sll   zero, zero, 0
-	br L_1023da0
+// 0x0102414c: 0x102414c: j	 0x1023db0 sll   zero, zero, 0
+	br L_1023db0
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl27.j b/converted/Cibyl27.j
index 5a5ecf8..4f403d8 100644
--- a/converted/Cibyl27.j
+++ b/converted/Cibyl27.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl27::.ctor
 
-.method public static int32 roadmap_screen_repaint_square_1024144(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_repaint_square_1024154(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s4,int32 s1,int32 s0,int32 s2,int32 s3,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -103,34 +103,34 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01024144: 0x1024144: lui   v0, 0x30000
+// 0x01024154: 0x1024154: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01024148: 0x1024148: lw    v0, 28276(v0)
+// 0x01024158: 0x1024158: lw    v0, 28740(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7069
+	ldc.i4 7185
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102414c: 0x102414c: addiu sp, sp, -80
+// 0x0102415c: 0x102415c: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01024150: 0x1024150: sll   a0, a0, 2
+// 0x01024160: 0x1024160: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01024154: 0x1024154: addu  v0, v0, a0
+// 0x01024164: 0x1024164: addu  v0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-// 0x01024158: 0x1024158: sw    s4, 56(sp)
+// 0x01024168: 0x1024168: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102415c: 0x102415c: sw    s0, 40(sp)
+// 0x0102416c: 0x102416c: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -148,17 +148,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01024160: 0x1024160: sll   s4, a1, 8
+// 0x01024170: 0x1024170: sll   s4, a1, 8
 	ldloc.2
 	ldc.i4.8
 	shl
 	stloc 8
-// 0x01024164: 0x1024164: addiu s0, a2, -1
+// 0x01024174: 0x1024174: addiu s0, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x01024168: 0x1024168: sw    s2, 48(sp)
+// 0x01024178: 0x1024178: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -167,40 +167,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102416c: 0x102416c: addu  s4, s0, s4
+// 0x0102417c: 0x102417c: addu  s4, s0, s4
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x01024170: 0x1024170: addiu a2, a2, 767
+// 0x01024180: 0x1024180: addiu a2, a2, 767
 	ldloc.3
 	ldc.i4 767
 	add
 	stloc.3
-// 0x01024174: 0x1024174: lui   v1, 0x60000
+// 0x01024184: 0x1024184: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01024178: 0x1024178: lw    s2, 0(v0)
+// 0x01024188: 0x1024188: lw    s2, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0102417c: 0x102417c: lui   v0, 0x50000
+// 0x0102418c: 0x102418c: lui   v0, 0x50000
 	ldc.i4 327680
 	stloc 6
-// 0x01024180: 0x1024180: sll   s4, s4, 2
+// 0x01024190: 0x1024190: sll   s4, s4, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x01024184: 0x1024184: addiu v1, v1, -30664
+// 0x01024194: 0x1024194: addiu v1, v1, -30200
 	ldloc 7
-	ldc.i4 -30664
+	ldc.i4 -30200
 	add
 	stloc 7
-// 0x01024188: 0x1024188: sw    s5, 60(sp)
+// 0x01024198: 0x1024198: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -209,7 +209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102418c: 0x102418c: sw    s1, 44(sp)
+// 0x0102419c: 0x102419c: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -218,20 +218,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01024190: 0x1024190: lui   s5, 0x30000
+// 0x010241a0: 0x10241a0: lui   s5, 0x30000
 	ldc.i4 196608
 	stloc 13
-// 0x01024194: 0x1024194: sll   s1, a2, 2
+// 0x010241a4: 0x10241a4: sll   s1, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x01024198: 0x1024198: addiu v0, v0, 28580
+// 0x010241a8: 0x10241a8: addiu v0, v0, 29044
 	ldloc 6
-	ldc.i4 28580
+	ldc.i4 29044
 	add
 	stloc 6
-// 0x0102419c: 0x102419c: sw    s8, 72(sp)
+// 0x010241ac: 0x10241ac: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -240,7 +240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010241a0: 0x10241a0: sw    s7, 68(sp)
+// 0x010241b0: 0x10241b0: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -249,7 +249,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010241a4: 0x10241a4: sw    s6, 64(sp)
+// 0x010241b4: 0x10241b4: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -258,7 +258,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010241a8: 0x10241a8: sw    s3, 52(sp)
+// 0x010241b8: 0x10241b8: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -267,58 +267,58 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010241ac: 0x10241ac: sw    ra, 76(sp)
-// 0x010241b0: 0x10241b0: addu  s3, v1, s4
+// 0x010241bc: 0x10241bc: sw    ra, 76(sp)
+// 0x010241c0: 0x10241c0: addu  s3, v1, s4
 	ldloc 7
 	ldloc 8
 	add
 	stloc 12
-// 0x010241b4: 0x10241b4: addu  s7, a1, zero
+// 0x010241c4: 0x10241c4: addu  s7, a1, zero
 	ldloc.2
 	stloc 15
-// 0x010241b8: 0x10241b8: addu  s6, a3, zero
+// 0x010241c8: 0x10241c8: addu  s6, a3, zero
 	ldloc 4
 	stloc 14
-// 0x010241bc: 0x10241bc: sw    zero, 28268(s5)
+// 0x010241cc: 0x10241cc: sw    zero, 28732(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010241c0: 0x10241c0: addu  s4, v0, s4
+// 0x010241d0: 0x10241d0: addu  s4, v0, s4
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x010241c4: 0x10241c4: addu  s1, v1, s1
+// 0x010241d4: 0x10241d4: addu  s1, v1, s1
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-// 0x010241c8: 0x10241c8: j	 0x10242b4 lui   s8, 0x20000
+// 0x010241d8: 0x10241d8: j	 0x10242c4 lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 16
-	br L_10242b4
+	br L_10242c4
 // --- basic block ---
-L_10241d0:
-// 0x010241d0: 0x10241d0: lw    v1, 0(s4)
+L_10241e0:
+// 0x010241e0: 0x10241e0: lw    v1, 0(s4)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010241d4: 0x10241d4: bltz  s2, 0x10242a4 lui   a0, 0x0
+// 0x010241e4: 0x10241e4: bltz  s2, 0x10242b4 lui   a0, 0x0
 	ldloc 11
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	blt L_10242a4
+	blt L_10242b4
 // --- basic block ---
-// 0x010241dc: 0x10241dc: lw    v0, 576(a0)
+// 0x010241ec: 0x10241ec: lw    v0, 576(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -327,15 +327,15 @@ L_10241d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010241e0: 0x10241e0: sll   zero, zero, 0
-// 0x010241e4: 0x10241e4: beq   s2, v0, 0x10241f8 addu  a0, s2, zero
+// 0x010241f0: 0x10241f0: sll   zero, zero, 0
+// 0x010241f4: 0x10241f4: beq   s2, v0, 0x1024208 addu  a0, s2, zero
 	ldloc 11
 	ldloc 6
 	ldloc 11
 	stloc.1
-	beq  L_10241f8
+	beq  L_1024208
 // --- basic block ---
-// 0x010241ec: 0x10241ec: jal   0x100b164 sw    v1, 32(sp)
+// 0x010241fc: 0x10241fc: jal   0x100b174 sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -349,12 +349,12 @@ L_10241d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010241f4: 0x10241f4: lw    v1, 32(sp)
+// 0x01024204: 0x1024204: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -363,26 +363,26 @@ L_10241d0:
 	add
 	ldelem.i4
 	stloc 7
-L_10241f8:
-// 0x010241f8: 0x10241f8: lw    v0, 31148(s8)
+L_1024208:
+// 0x01024208: 0x1024208: lw    v0, 31612(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 6
-// 0x010241fc: 0x10241fc: sll   zero, zero, 0
-// 0x01024200: 0x1024200: beq   v0, zero, 0x10242a4 sll   a0, v1, 1
+// 0x0102420c: 0x102420c: sll   zero, zero, 0
+// 0x01024210: 0x1024210: beq   v0, zero, 0x10242b4 sll   a0, v1, 1
 	ldloc 6
 	ldloc 7
 	ldc.i4.1
 	shl
 	stloc.1
-	brfalse L_10242a4
+	brfalse L_10242b4
 // --- basic block ---
-// 0x01024208: 0x1024208: lw    v0, 12(v0)
+// 0x01024218: 0x1024218: lw    v0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -391,60 +391,60 @@ L_10241f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102420c: 0x102420c: addiu v1, v1, -1
+// 0x0102421c: 0x102421c: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01024210: 0x1024210: addu  a0, v0, a0
+// 0x01024220: 0x1024220: addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc.1
-// 0x01024214: 0x1024214: sll   v1, v1, 1
+// 0x01024224: 0x1024224: sll   v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	shl
 	stloc 7
-// 0x01024218: 0x1024218: addu  v0, v0, v1
+// 0x01024228: 0x1024228: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0102421c: 0x102421c: lhu   a2, 0(a0)
+// 0x0102422c: 0x102422c: lhu   a2, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x01024220: 0x1024220: lhu   a1, 0(v0)
+// 0x01024230: 0x1024230: lhu   a1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01024224: 0x1024224: addiu a2, a2, -1
+// 0x01024234: 0x1024234: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01024228: 0x1024228: slt   v0, a2, a1
+// 0x01024238: 0x1024238: slt   v0, a2, a1
 	ldloc.3
 	ldloc.2
 	clt
 	stloc 6
-// 0x0102422c: 0x102422c: bne   v0, zero, 0x10242a4 sll   zero, zero, 0
+// 0x0102423c: 0x102423c: bne   v0, zero, 0x10242b4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10242a4
+	brtrue L_10242b4
 // --- basic block ---
-// 0x01024234: 0x1024234: beq   s6, zero, 0x1024264 sll   zero, zero, 0
+// 0x01024244: 0x1024244: beq   s6, zero, 0x1024274 sll   zero, zero, 0
 	ldloc 14
-	brfalse L_1024264
+	brfalse L_1024274
 // --- basic block ---
-// 0x0102423c: 0x102423c: lw    a0, 0(s1)
+// 0x0102424c: 0x102424c: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01024240: 0x1024240: sw    a1, 36(sp)
+// 0x01024250: 0x1024250: sw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -453,7 +453,7 @@ L_10241f8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01024244: 0x1024244: jal   0x104e35c sw    a2, 32(sp)
+// 0x01024254: 0x1024254: jal   0x104e36c sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -467,19 +467,19 @@ L_10241f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102424c: 0x102424c: lw    v0, 0(s1)
+// 0x0102425c: 0x102425c: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01024250: 0x1024250: lw    a1, 36(sp)
+// 0x01024260: 0x1024260: lw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -488,16 +488,16 @@ L_10241f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024254: 0x1024254: sw    v0, 28268(s5)
+// 0x01024264: 0x1024264: sw    v0, 28732(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldloc 6
 	stelem.i4
-// 0x01024258: 0x1024258: lw    a2, 32(sp)
+// 0x01024268: 0x1024268: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -506,20 +506,20 @@ L_10241f8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102425c: 0x102425c: j	 0x1024288 addu  a0, s2, zero
+// 0x0102426c: 0x102426c: j	 0x1024298 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-	br L_1024288
+	br L_1024298
 // --- basic block ---
-L_1024264:
-// 0x01024264: 0x1024264: lw    a0, 0(s3)
+L_1024274:
+// 0x01024274: 0x1024274: lw    a0, 0(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01024268: 0x1024268: sw    a1, 36(sp)
+// 0x01024278: 0x1024278: sw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -528,7 +528,7 @@ L_1024264:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102426c: 0x102426c: jal   0x104e35c sw    a2, 32(sp)
+// 0x0102427c: 0x102427c: jal   0x104e36c sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -542,19 +542,19 @@ L_1024264:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01024274: 0x1024274: lw    v0, 0(s3)
+// 0x01024284: 0x1024284: lw    v0, 0(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01024278: 0x1024278: lw    a2, 32(sp)
+// 0x01024288: 0x1024288: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -563,7 +563,7 @@ L_1024264:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102427c: 0x102427c: lw    a1, 36(sp)
+// 0x0102428c: 0x102428c: lw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -572,23 +572,23 @@ L_1024264:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024280: 0x1024280: sw    v0, 28268(s5)
+// 0x01024290: 0x1024290: sw    v0, 28732(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldloc 6
 	stelem.i4
-// 0x01024284: 0x1024284: addu  a0, s2, zero
+// 0x01024294: 0x1024294: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-L_1024288:
-// 0x01024288: 0x1024288: addu  a3, s0, zero
+L_1024298:
+// 0x01024298: 0x1024298: addu  a3, s0, zero
 	ldloc 10
 	stloc 4
-// 0x0102428c: 0x102428c: sw    zero, 16(sp)
+// 0x0102429c: 0x102429c: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -597,7 +597,7 @@ L_1024288:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01024290: 0x1024290: sw    s7, 20(sp)
+// 0x010242a0: 0x10242a0: sw    s7, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -606,7 +606,7 @@ L_1024288:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01024294: 0x1024294: jal   0x1022e88 sw    s6, 24(sp)
+// 0x010242a4: 0x10242a4: jal   0x1022e98 sw    s6, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -620,65 +620,65 @@ L_1024288:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_square_1022e88(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_square_1022e98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102429c: 0x102429c: jal   0x1021f34 sll   zero, zero, 0
+// 0x010242ac: 0x10242ac: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10242a4:
-// 0x010242a4: 0x10242a4: addiu s0, s0, -1
+L_10242b4:
+// 0x010242b4: 0x10242b4: addiu s0, s0, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x010242a8: 0x10242a8: addiu s4, s4, -4
+// 0x010242b8: 0x10242b8: addiu s4, s4, -4
 	ldloc 8
 	ldc.i4.s -4
 	add
 	stloc 8
-// 0x010242ac: 0x10242ac: addiu s1, s1, -4
+// 0x010242bc: 0x10242bc: addiu s1, s1, -4
 	ldloc 9
 	ldc.i4.s -4
 	add
 	stloc 9
-// 0x010242b0: 0x10242b0: addiu s3, s3, -4
+// 0x010242c0: 0x10242c0: addiu s3, s3, -4
 	ldloc 12
 	ldc.i4.s -4
 	add
 	stloc 12
-L_10242b4:
-// 0x010242b4: 0x10242b4: bgez  s0, 0x10241d0 sll   zero, zero, 0
+L_10242c4:
+// 0x010242c4: 0x10242c4: bgez  s0, 0x10241e0 sll   zero, zero, 0
 	ldloc 10
 	ldc.i4.s 0
-	bge L_10241d0
+	bge L_10241e0
 // --- basic block ---
-// 0x010242bc: 0x10242bc: jal   0x10223d4 sll   zero, zero, 0
+// 0x010242cc: 0x10242cc: jal   0x10223e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010242c4: 0x10242c4: lw    ra, 76(sp)
-// 0x010242c8: 0x10242c8: addu  v0, zero, zero
+// 0x010242d4: 0x10242d4: lw    ra, 76(sp)
+// 0x010242d8: 0x10242d8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010242cc: 0x10242cc: lw    s8, 72(sp)
+// 0x010242dc: 0x10242dc: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -687,7 +687,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010242d0: 0x10242d0: lw    s7, 68(sp)
+// 0x010242e0: 0x10242e0: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -696,7 +696,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010242d4: 0x10242d4: lw    s6, 64(sp)
+// 0x010242e4: 0x10242e4: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -705,7 +705,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010242d8: 0x10242d8: lw    s5, 60(sp)
+// 0x010242e8: 0x10242e8: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -714,7 +714,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010242dc: 0x10242dc: lw    s4, 56(sp)
+// 0x010242ec: 0x10242ec: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -723,7 +723,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010242e0: 0x10242e0: lw    s3, 52(sp)
+// 0x010242f0: 0x10242f0: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -732,7 +732,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010242e4: 0x10242e4: lw    s2, 48(sp)
+// 0x010242f4: 0x10242f4: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -741,7 +741,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010242e8: 0x10242e8: lw    s1, 44(sp)
+// 0x010242f8: 0x10242f8: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -750,7 +750,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010242ec: 0x10242ec: lw    s0, 40(sp)
+// 0x010242fc: 0x10242fc: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -759,7 +759,7 @@ L_10242b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010242f0: 0x10242f0: jr    ra addiu sp, sp, 80
+// 0x01024300: 0x1024300: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -771,7 +771,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_repaint_now_10242f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_repaint_now_1024308(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 lo,int32 t0,int32 s3,int32 s2,int32 s6,int32 s4,int32 t1,int32 s5,int32 s7,int32 s8,int32 t2,int32 t3,int32 ra)
@@ -848,25 +848,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010242f8: 0x10242f8: lui   v0, 0x30000
+// 0x01024308: 0x1024308: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010242fc: 0x10242fc: lw    v0, 28248(v0)
+// 0x0102430c: 0x102430c: lw    v0, 28712(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7062
+	ldc.i4 7178
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024300: 0x1024300: addiu sp, sp, -168
+// 0x01024310: 0x1024310: addiu sp, sp, -168
 	ldloc.0
 	ldc.i4 -168
 	add
 	stloc.0
-// 0x01024304: 0x1024304: sw    ra, 164(sp)
-// 0x01024308: 0x1024308: sw    s8, 160(sp)
+// 0x01024314: 0x1024314: sw    ra, 164(sp)
+// 0x01024318: 0x1024318: sw    s8, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -875,7 +875,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0102430c: 0x102430c: sw    s7, 156(sp)
+// 0x0102431c: 0x102431c: sw    s7, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -884,7 +884,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01024310: 0x1024310: sw    s6, 152(sp)
+// 0x01024320: 0x1024320: sw    s6, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -893,7 +893,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01024314: 0x1024314: sw    s5, 148(sp)
+// 0x01024324: 0x1024324: sw    s5, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -902,7 +902,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01024318: 0x1024318: sw    s4, 144(sp)
+// 0x01024328: 0x1024328: sw    s4, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -911,7 +911,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102431c: 0x102431c: sw    s3, 140(sp)
+// 0x0102432c: 0x102432c: sw    s3, 140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -920,7 +920,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01024320: 0x1024320: sw    s2, 136(sp)
+// 0x01024330: 0x1024330: sw    s2, 136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -929,7 +929,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01024324: 0x1024324: sw    s1, 132(sp)
+// 0x01024334: 0x1024334: sw    s1, 132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -938,7 +938,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01024328: 0x1024328: beq   v0, zero, 0x1025634 sw    s0, 128(sp)
+// 0x01024338: 0x1024338: beq   v0, zero, 0x1025644 sw    s0, 128(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -948,63 +948,63 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1025634
+	brfalse L_1025644
 // --- basic block ---
-// 0x01024330: 0x1024330: lui   v0, 0x30000
+// 0x01024340: 0x1024340: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024334: 0x1024334: lw    v0, 28232(v0)
+// 0x01024344: 0x1024344: lw    v0, 28696(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7058
+	ldc.i4 7174
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024338: 0x1024338: sll   zero, zero, 0
-// 0x0102433c: 0x102433c: bne   v0, zero, 0x1025634 lui   v0, 0x30000
+// 0x01024348: 0x1024348: sll   zero, zero, 0
+// 0x0102434c: 0x102434c: bne   v0, zero, 0x1025644 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1025634
+	brtrue L_1025644
 // --- basic block ---
-// 0x01024344: 0x1024344: lw    v0, 28252(v0)
+// 0x01024354: 0x1024354: lw    v0, 28716(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7063
+	ldc.i4 7179
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024348: 0x1024348: sll   zero, zero, 0
-// 0x0102434c: 0x102434c: beq   v0, zero, 0x102437c sll   zero, zero, 0
+// 0x01024358: 0x1024358: sll   zero, zero, 0
+// 0x0102435c: 0x102435c: beq   v0, zero, 0x102438c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102437c
+	brfalse L_102438c
 // --- basic block ---
-// 0x01024354: 0x1024354: jal   0x1095828 sll   zero, zero, 0
+// 0x01024364: 0x1024364: jal   0x1095e70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_draw_prev_1095828(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_draw_prev_1095e70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102435c: 0x102435c: jal   0x104fa48 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa48()
+// 0x0102436c: 0x102436c: jal   0x104fa58 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa58()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024364: 0x1024364: beq   v0, zero, 0x1025544 sll   zero, zero, 0
+// 0x01024374: 0x1024374: beq   v0, zero, 0x1025554 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1025544
+	brfalse L_1025554
 // --- basic block ---
-// 0x0102436c: 0x102436c: jal   0x1043240 addiu a0, zero, 1
+// 0x0102437c: 0x102437c: jal   0x1043250 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -1012,68 +1012,68 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_draw_top_bar_1043240(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_draw_top_bar_1043250(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024374: 0x1024374: j	 0x1025544 sll   zero, zero, 0
-	br L_1025544
+// 0x01024384: 0x1024384: j	 0x1025554 sll   zero, zero, 0
+	br L_1025554
 // --- basic block ---
-L_102437c:
-// 0x0102437c: 0x102437c: cibyl_sysc 0x3ab
+L_102438c:
+// 0x0102438c: 0x102438c: cibyl_sysc 0x3ab
 	call int32 [WazeWP7]Syscalls::NOPH_UIWorker_pendingDraws()
 	stloc 5
-// 0x01024380: 0x1024380: addu  v1, v0, zero
+// 0x01024390: 0x1024390: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01024384: 0x1024384: lui   v0, 0x30000
+// 0x01024394: 0x1024394: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024388: 0x1024388: sw    v1, 28228(v0)
+// 0x01024398: 0x1024398: sw    v1, 28692(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102438c: 0x102438c: lui   v0, 0xe0000
+// 0x0102439c: 0x102439c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01024390: 0x1024390: lw    s0, 29608(v0)
+// 0x010243a0: 0x10243a0: lw    s0, 30072(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7402
+	ldc.i4 7518
 	add
 	ldelem.i4
 	stloc 8
-// 0x01024394: 0x1024394: jal   0x1007a5c addiu s1, sp, 68
+// 0x010243a4: 0x10243a4: jal   0x1007a6c addiu s1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 9
-	call int32 Cibyl5::roadmap_math_get_zoom_1007a5c()
+	call int32 Cibyl5::roadmap_math_get_zoom_1007a6c()
 	stloc 5
 // --- basic block ---
-// 0x0102439c: 0x102439c: addu  s2, v0, zero
+// 0x010243ac: 0x10243ac: addu  s2, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010243a0: 0x10243a0: addu  a0, s1, zero
+// 0x010243b0: 0x10243b0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010243a4: 0x10243a4: lui   v0, 0x30000
+// 0x010243b4: 0x10243b4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010243a8: 0x10243a8: jal   0x1007f28 sw    zero, 28280(v0)
+// 0x010243b8: 0x10243b8: jal   0x1007f38 sw    zero, 28744(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7070
+	ldc.i4 7186
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1082,72 +1082,72 @@ L_102437c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_screen_edges_1007f28(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_screen_edges_1007f38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010243b0: 0x10243b0: lui   a0, 0x30000
+// 0x010243c0: 0x10243c0: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x010243b4: 0x10243b4: addiu a0, a0, 28296
+// 0x010243c4: 0x10243c4: addiu a0, a0, 28760
 	ldloc.1
-	ldc.i4 28296
+	ldc.i4 28760
 	add
 	stloc.1
-// 0x010243b8: 0x10243b8: jal   0x1007f78 addu  a1, s1, zero
+// 0x010243c8: 0x10243c8: jal   0x1007f88 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_area_contains_1007f78(int32,int32)
+	call int32 Cibyl5::roadmap_math_area_contains_1007f88(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010243c0: 0x10243c0: sltiu s4, v0, 1
+// 0x010243d0: 0x10243d0: sltiu s4, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 15
-// 0x010243c4: 0x10243c4: addiu v0, zero, -1
+// 0x010243d4: 0x10243d4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010243c8: 0x10243c8: bne   s0, v0, 0x10243dc lui   v0, 0x30000
+// 0x010243d8: 0x10243d8: bne   s0, v0, 0x10243ec lui   v0, 0x30000
 	ldloc 8
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	bne.un L_10243dc
+	bne.un L_10243ec
 // --- basic block ---
-// 0x010243d0: 0x10243d0: beq   s4, zero, 0x10243fc lui   v0, 0x0
+// 0x010243e0: 0x10243e0: beq   s4, zero, 0x102440c lui   v0, 0x0
 	ldloc 15
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10243fc
+	brfalse L_102440c
 // --- basic block ---
-// 0x010243d8: 0x10243d8: lui   v0, 0x30000
+// 0x010243e8: 0x10243e8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_10243dc:
-// 0x010243dc: 0x10243dc: lw    a0, 28276(v0)
+L_10243ec:
+// 0x010243ec: 0x10243ec: lw    a0, 28740(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7069
+	ldc.i4 7185
 	add
 	ldelem.i4
 	stloc.1
-// 0x010243e0: 0x10243e0: lui   a2, 0x30000
+// 0x010243f0: 0x10243f0: lui   a2, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x010243e4: 0x10243e4: addiu a2, a2, 28296
+// 0x010243f4: 0x10243f4: addiu a2, a2, 28760
 	ldloc.3
-	ldc.i4 28296
+	ldc.i4 28760
 	add
 	stloc.3
-// 0x010243e8: 0x10243e8: jal   0x100bdb4 addiu a1, zero, 2000
+// 0x010243f8: 0x10243f8: jal   0x100bdc4 addiu a1, zero, 2000
 	ldc.i4 2000
 	stloc.2
 	ldloc.0
@@ -1155,28 +1155,28 @@ L_10243dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_view_100bdb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_view_100bdc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010243f0: 0x10243f0: lui   v1, 0x30000
+// 0x01024400: 0x1024400: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x010243f4: 0x10243f4: sw    v0, 28272(v1)
+// 0x01024404: 0x1024404: sw    v0, 28736(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7068
+	ldc.i4 7184
 	add
 	ldloc 5
 	stelem.i4
-// 0x010243f8: 0x10243f8: lui   v0, 0x0
+// 0x01024408: 0x1024408: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10243fc:
-// 0x010243fc: 0x10243fc: lw    v0, 6088(v0)
+L_102440c:
+// 0x0102440c: 0x102440c: lw    v0, 6088(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1185,15 +1185,15 @@ L_10243fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024400: 0x1024400: sll   zero, zero, 0
-// 0x01024404: 0x1024404: beq   s2, v0, 0x10244b4 lui   v0, 0x0
+// 0x01024410: 0x1024410: sll   zero, zero, 0
+// 0x01024414: 0x1024414: beq   s2, v0, 0x10244c4 lui   v0, 0x0
 	ldloc 13
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_10244b4
+	beq  L_10244c4
 // --- basic block ---
-// 0x0102440c: 0x102440c: lw    v0, 1144(v0)
+// 0x0102441c: 0x102441c: lw    v0, 1144(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1202,154 +1202,154 @@ L_10243fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024410: 0x1024410: sll   zero, zero, 0
-// 0x01024414: 0x1024414: slti  v1, v0, 3
+// 0x01024420: 0x1024420: sll   zero, zero, 0
+// 0x01024424: 0x1024424: slti  v1, v0, 3
 	ldloc 5
 	ldc.i4.3
 	clt
 	stloc 6
-// 0x01024418: 0x1024418: bne   v1, zero, 0x1024424 lui   v1, 0x30000
+// 0x01024428: 0x1024428: bne   v1, zero, 0x1024434 lui   v1, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc 6
-	brtrue L_1024424
+	brtrue L_1024434
 // --- basic block ---
-// 0x01024420: 0x1024420: addiu v0, zero, 2
+// 0x01024430: 0x1024430: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-L_1024424:
-// 0x01024424: 0x1024424: lui   s3, 0x50000
+L_1024434:
+// 0x01024434: 0x1024434: lui   s3, 0x50000
 	ldc.i4 327680
 	stloc 12
-// 0x01024428: 0x1024428: lui   s8, 0x50000
+// 0x01024438: 0x1024438: lui   s8, 0x50000
 	ldc.i4 327680
 	stloc 19
-// 0x0102442c: 0x102442c: lui   s7, 0x60000
+// 0x0102443c: 0x102443c: lui   s7, 0x60000
 	ldc.i4 393216
 	stloc 18
-// 0x01024430: 0x1024430: sw    v0, 28260(v1)
+// 0x01024440: 0x1024440: sw    v0, 28724(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7065
+	ldc.i4 7181
 	add
 	ldloc 5
 	stelem.i4
-// 0x01024434: 0x1024434: addiu s3, s3, 28564
+// 0x01024444: 0x1024444: addiu s3, s3, 29028
 	ldloc 12
-	ldc.i4 28564
+	ldc.i4 29028
 	add
 	stloc 12
-// 0x01024438: 0x1024438: addiu s8, s8, 28580
+// 0x01024448: 0x1024448: addiu s8, s8, 29044
 	ldloc 19
-	ldc.i4 28580
+	ldc.i4 29044
 	add
 	stloc 19
-// 0x0102443c: 0x102443c: addiu s7, s7, -30664
+// 0x0102444c: 0x102444c: addiu s7, s7, -30200
 	ldloc 18
-	ldc.i4 -30664
+	ldc.i4 -30200
 	add
 	stloc 18
-// 0x01024440: 0x1024440: addu  s1, zero, zero
+// 0x01024450: 0x1024450: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01024444: 0x1024444: addu  s0, zero, zero
+// 0x01024454: 0x1024454: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01024448: 0x1024448: j	 0x1024460 addu  s6, v1, zero
+// 0x01024458: 0x1024458: j	 0x1024470 addu  s6, v1, zero
 	ldloc 6
 	stloc 14
-	br L_1024460
+	br L_1024470
 // --- basic block ---
-L_1024450:
-// 0x01024450: 0x1024450: jal   0x10100ac sll   zero, zero, 0
+L_1024460:
+// 0x01024460: 0x1024460: jal   0x10100bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_visible_lines_10100ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_visible_lines_10100bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024458: 0x1024458: sw    v0, 0(s3)
+// 0x01024468: 0x1024468: sw    v0, 0(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0102445c: 0x102445c: addiu s3, s3, 4
+// 0x0102446c: 0x102446c: addiu s3, s3, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-L_1024460:
-// 0x01024460: 0x1024460: lw    v0, 28260(s6)
+L_1024470:
+// 0x01024470: 0x1024470: lw    v0, 28724(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7065
+	ldc.i4 7181
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024464: 0x1024464: addu  a0, s8, s1
+// 0x01024474: 0x1024474: addu  a0, s8, s1
 	ldloc 19
 	ldloc 9
 	add
 	stloc.1
-// 0x01024468: 0x1024468: slt   v0, s0, v0
+// 0x01024478: 0x1024478: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102446c: 0x102446c: addu  a2, s0, zero
+// 0x0102447c: 0x102447c: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x01024470: 0x1024470: addu  a3, s7, s1
+// 0x01024480: 0x1024480: addu  a3, s7, s1
 	ldloc 18
 	ldloc 9
 	add
 	stloc 4
-// 0x01024474: 0x1024474: addiu a1, zero, 256
+// 0x01024484: 0x1024484: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x01024478: 0x1024478: addiu s1, s1, 1024
+// 0x01024488: 0x1024488: addiu s1, s1, 1024
 	ldloc 9
 	ldc.i4 1024
 	add
 	stloc 9
-// 0x0102447c: 0x102447c: addiu s0, s0, 1
+// 0x0102448c: 0x102448c: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01024480: 0x1024480: bne   v0, zero, 0x1024450 lui   s5, 0x30000
+// 0x01024490: 0x1024490: bne   v0, zero, 0x1024460 lui   s5, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 17
-	brtrue L_1024450
+	brtrue L_1024460
 // --- basic block ---
-// 0x01024488: 0x1024488: lui   a0, 0x50000
+// 0x01024498: 0x1024498: lui   a0, 0x50000
 	ldc.i4 327680
 	stloc.1
-// 0x0102448c: 0x102448c: lui   a3, 0x60000
+// 0x0102449c: 0x102449c: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01024490: 0x1024490: addiu a0, a0, 31652
+// 0x010244a0: 0x10244a0: addiu a0, a0, 32116
 	ldloc.1
-	ldc.i4 31652
+	ldc.i4 32116
 	add
 	stloc.1
-// 0x01024494: 0x1024494: addiu a3, a3, -27592
+// 0x010244a4: 0x10244a4: addiu a3, a3, -27128
 	ldloc 4
-	ldc.i4 -27592
+	ldc.i4 -27128
 	add
 	stloc 4
-// 0x01024498: 0x1024498: jal   0x10100ac addiu a2, zero, -1
+// 0x010244a8: 0x10244a8: jal   0x10100bc addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -1357,51 +1357,51 @@ L_1024460:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_visible_lines_10100ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_visible_lines_10100bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010244a0: 0x10244a0: lw    v1, 28260(s5)
+// 0x010244b0: 0x10244b0: lw    v1, 28724(s5)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7065
+	ldc.i4 7181
 	add
 	ldelem.i4
 	stloc 6
-// 0x010244a4: 0x10244a4: lui   a0, 0x50000
+// 0x010244b4: 0x10244b4: lui   a0, 0x50000
 	ldc.i4 327680
 	stloc.1
-// 0x010244a8: 0x10244a8: addiu v1, v1, -1
+// 0x010244b8: 0x10244b8: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010244ac: 0x10244ac: sw    v0, 28576(a0)
+// 0x010244bc: 0x10244bc: sw    v0, 29040(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7144
+	ldc.i4 7260
 	add
 	ldloc 5
 	stelem.i4
-// 0x010244b0: 0x10244b0: sw    v1, 28260(s5)
+// 0x010244c0: 0x10244c0: sw    v1, 28724(s5)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7065
+	ldc.i4 7181
 	add
 	ldloc 6
 	stelem.i4
-L_10244b4:
-// 0x010244b4: 0x10244b4: lui   v0, 0x0
+L_10244c4:
+// 0x010244c4: 0x10244c4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010244b8: 0x10244b8: lw    v0, 6088(v0)
+// 0x010244c8: 0x10244c8: lw    v0, 6088(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1410,99 +1410,99 @@ L_10244b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010244bc: 0x10244bc: sll   zero, zero, 0
-// 0x010244c0: 0x10244c0: bne   s2, v0, 0x10244d0 lui   v0, 0x30000
+// 0x010244cc: 0x10244cc: sll   zero, zero, 0
+// 0x010244d0: 0x10244d0: bne   s2, v0, 0x10244e0 lui   v0, 0x30000
 	ldloc 13
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	bne.un L_10244d0
+	bne.un L_10244e0
 // --- basic block ---
-// 0x010244c8: 0x10244c8: beq   s4, zero, 0x1024504 sll   zero, zero, 0
+// 0x010244d8: 0x10244d8: beq   s4, zero, 0x1024514 sll   zero, zero, 0
 	ldloc 15
-	brfalse L_1024504
+	brfalse L_1024514
 // --- basic block ---
-L_10244d0:
-// 0x010244d0: 0x10244d0: lw    v0, 28272(v0)
+L_10244e0:
+// 0x010244e0: 0x10244e0: lw    v0, 28736(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7068
+	ldc.i4 7184
 	add
 	ldelem.i4
 	stloc 5
-// 0x010244d4: 0x10244d4: addiu v1, zero, 244
+// 0x010244e4: 0x10244e4: addiu v1, zero, 244
 	ldc.i4 244
 	stloc 6
-// 0x010244d8: 0x10244d8: addiu v0, v0, -1
+// 0x010244e8: 0x10244e8: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010244dc: 0x10244dc: mult  v0, v1
+// 0x010244ec: 0x10244ec: mult  v0, v1
 	ldloc 5
 	ldloc 6
 	mul
 	stloc 10
-// 0x010244e0: 0x10244e0: lui   v1, 0x50000
-	ldc.i4 327680
+// 0x010244f0: 0x10244f0: lui   v1, 0x60000
+	ldc.i4 393216
 	stloc 6
-// 0x010244e4: 0x10244e4: addiu v1, v1, 32676
+// 0x010244f4: 0x10244f4: addiu v1, v1, -32396
 	ldloc 6
-	ldc.i4 32676
+	ldc.i4 -32396
 	add
 	stloc 6
-// 0x010244e8: 0x10244e8: mflo  lo
+// 0x010244f8: 0x10244f8: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010244ec: 0x10244ec: j	 0x10244fc addu  v1, v1, a0
+// 0x010244fc: 0x10244fc: j	 0x102450c addu  v1, v1, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-	br L_10244fc
+	br L_102450c
 // --- basic block ---
-L_10244f4:
-// 0x010244f4: 0x10244f4: sw    zero, 0(v1)
+L_1024504:
+// 0x01024504: 0x1024504: sw    zero, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010244f8: 0x10244f8: addiu v1, v1, -244
+// 0x01024508: 0x1024508: addiu v1, v1, -244
 	ldloc 6
 	ldc.i4 -244
 	add
 	stloc 6
-L_10244fc:
-// 0x010244fc: 0x10244fc: bgez  v0, 0x10244f4 addiu v0, v0, -1
+L_102450c:
+// 0x0102450c: 0x102450c: bgez  v0, 0x1024504 addiu v0, v0, -1
 	ldloc 5
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
 	ldc.i4.s 0
-	bge L_10244f4
+	bge L_1024504
 // --- basic block ---
-L_1024504:
-// 0x01024504: 0x1024504: lui   v0, 0x30000
+L_1024514:
+// 0x01024514: 0x1024514: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024508: 0x1024508: lw    v1, 28256(v0)
+// 0x01024518: 0x1024518: lw    v1, 28720(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7064
+	ldc.i4 7180
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102450c: 0x102450c: lui   v0, 0x0
+// 0x0102451c: 0x102451c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01024510: 0x1024510: sw    s2, 6088(v0)
+// 0x01024520: 0x1024520: sw    s2, 6088(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1511,60 +1511,60 @@ L_1024504:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01024514: 0x1024514: addiu v0, zero, 1
+// 0x01024524: 0x1024524: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01024518: 0x1024518: bne   v1, v0, 0x10245e0 lui   v0, 0x30000
+// 0x01024528: 0x1024528: bne   v1, v0, 0x10245f0 lui   v0, 0x30000
 	ldloc 6
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	bne.un L_10245e0
+	bne.un L_10245f0
 // --- basic block ---
-// 0x01024520: 0x1024520: lui   s6, 0xf0000
+// 0x01024530: 0x1024530: lui   s6, 0xf0000
 	ldc.i4 983040
 	stloc 14
-// 0x01024524: 0x1024524: lw    v1, -30068(s6)
+// 0x01024534: 0x1024534: lw    v1, -29604(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024528: 0x1024528: addiu v0, zero, 2
+// 0x01024538: 0x1024538: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102452c: 0x102452c: div   v1, v0
+// 0x0102453c: 0x102453c: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 10
-// 0x01024530: 0x1024530: lui   s7, 0xf0000
+// 0x01024540: 0x1024540: lui   s7, 0xf0000
 	ldc.i4 983040
 	stloc 18
-// 0x01024534: 0x1024534: lui   v0, 0x30000
+// 0x01024544: 0x1024544: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024538: 0x1024538: lw    v1, -30072(s7)
+// 0x01024548: 0x1024548: lw    v1, -29608(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102453c: 0x102453c: addiu s1, v0, 28488
+// 0x0102454c: 0x102454c: addiu s1, v0, 28952
 	ldloc 5
-	ldc.i4 28488
+	ldc.i4 28952
 	add
 	stloc 9
-// 0x01024540: 0x1024540: addu  a0, s1, zero
+// 0x01024550: 0x1024550: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01024544: 0x1024544: sw    v1, 4(s1)
+// 0x01024554: 0x1024554: sw    v1, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1573,32 +1573,32 @@ L_1024504:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01024548: 0x1024548: addu  s5, s1, zero
+// 0x01024558: 0x1024558: addu  s5, s1, zero
 	ldloc 9
 	stloc 17
-// 0x0102454c: 0x102454c: addiu s0, zero, 5
+// 0x0102455c: 0x102455c: addiu s0, zero, 5
 	ldc.i4.5
 	stloc 8
-// 0x01024550: 0x1024550: addiu s4, zero, 6
+// 0x01024560: 0x1024560: addiu s4, zero, 6
 	ldc.i4.6
 	stloc 15
-// 0x01024554: 0x1024554: addiu s3, zero, 2
+// 0x01024564: 0x1024564: addiu s3, zero, 2
 	ldc.i4.2
 	stloc 12
-// 0x01024558: 0x1024558: addiu s2, sp, 28
+// 0x01024568: 0x1024568: addiu s2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 13
-// 0x0102455c: 0x102455c: mflo  lo
+// 0x0102456c: 0x102456c: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x01024560: 0x1024560: jal   0x1006f24 sw    a2, 28488(v0)
+// 0x01024570: 0x1024570: jal   0x1006f34 sw    a2, 28952(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7122
+	ldc.i4 7238
 	add
 	ldloc.3
 	stelem.i4
@@ -1606,72 +1606,72 @@ L_1024504:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024568: 0x1024568: addu  a0, s1, zero
+// 0x01024578: 0x1024578: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0102456c: 0x102456c: jal   0x1006df4 lui   s1, 0x30000
+// 0x0102457c: 0x102457c: jal   0x1006e04 lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_counter_rotate_coordinate_1006df4(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_counter_rotate_coordinate_1006e04(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024574: 0x1024574: addiu s1, s1, 28496
+// 0x01024584: 0x1024584: addiu s1, s1, 28960
 	ldloc 9
-	ldc.i4 28496
+	ldc.i4 28960
 	add
 	stloc 9
-L_1024578:
-// 0x01024578: 0x1024578: lw    v1, -30072(s7)
+L_1024588:
+// 0x01024588: 0x1024588: lw    v1, -29608(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102457c: 0x102457c: lw    v0, -30068(s6)
+// 0x0102458c: 0x102458c: lw    v0, -29604(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024580: 0x1024580: div   v1, s4
+// 0x01024590: 0x1024590: div   v1, s4
 	ldloc 6
 	ldloc 15
 	div
 	stloc 10
-// 0x01024584: 0x1024584: addu  a0, s2, zero
+// 0x01024594: 0x1024594: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x01024588: 0x1024588: mflo  lo
+// 0x01024598: 0x1024598: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x0102458c: 0x102458c: sll   zero, zero, 0
-// 0x01024590: 0x1024590: sll   zero, zero, 0
-// 0x01024594: 0x1024594: div   v0, s3
+// 0x0102459c: 0x102459c: sll   zero, zero, 0
+// 0x010245a0: 0x10245a0: sll   zero, zero, 0
+// 0x010245a4: 0x10245a4: div   v0, s3
 	ldloc 5
 	ldloc 12
 	div
 	stloc 10
-// 0x01024598: 0x1024598: mflo  lo
+// 0x010245a8: 0x10245a8: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0102459c: 0x102459c: sw    v0, 28(sp)
+// 0x010245ac: 0x10245ac: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1680,21 +1680,21 @@ L_1024578:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010245a0: 0x10245a0: sll   zero, zero, 0
-// 0x010245a4: 0x10245a4: mult  s0, v1
+// 0x010245b0: 0x10245b0: sll   zero, zero, 0
+// 0x010245b4: 0x10245b4: mult  s0, v1
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 10
-// 0x010245a8: 0x10245a8: addiu s0, s0, -1
+// 0x010245b8: 0x10245b8: addiu s0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x010245ac: 0x10245ac: mflo  lo
+// 0x010245bc: 0x10245bc: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x010245b0: 0x10245b0: jal   0x1006f24 sw    v1, 32(sp)
+// 0x010245c0: 0x10245c0: jal   0x1006f34 sw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1707,30 +1707,30 @@ L_1024578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010245b8: 0x10245b8: jal   0x1006df4 addu  a0, s2, zero
+// 0x010245c8: 0x10245c8: jal   0x1006e04 addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_counter_rotate_coordinate_1006df4(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_counter_rotate_coordinate_1006e04(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010245c0: 0x10245c0: addu  a0, s2, zero
+// 0x010245d0: 0x10245d0: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x010245c4: 0x10245c4: addu  a1, s5, zero
+// 0x010245d4: 0x10245d4: addu  a1, s5, zero
 	ldloc 17
 	stloc.2
-// 0x010245c8: 0x10245c8: jal   0x1009694 addiu a2, zero, 1
+// 0x010245d8: 0x10245d8: jal   0x10096a4 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -1738,50 +1738,50 @@ L_1024578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010245d0: 0x10245d0: sw    v0, 0(s1)
+// 0x010245e0: 0x10245e0: sw    v0, 0(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010245d4: 0x10245d4: bne   s0, zero, 0x1024578 addiu s1, s1, 4
+// 0x010245e4: 0x10245e4: bne   s0, zero, 0x1024588 addiu s1, s1, 4
 	ldloc 8
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	brtrue L_1024578
+	brtrue L_1024588
 // --- basic block ---
-// 0x010245dc: 0x10245dc: lui   v0, 0x30000
+// 0x010245ec: 0x10245ec: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_10245e0:
-// 0x010245e0: 0x10245e0: lw    v0, 28228(v0)
+L_10245f0:
+// 0x010245f0: 0x10245f0: lw    v0, 28692(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 5
-// 0x010245e4: 0x10245e4: sll   zero, zero, 0
-// 0x010245e8: 0x10245e8: beq   v0, zero, 0x1024600 lui   v0, 0x30000
+// 0x010245f4: 0x10245f4: sll   zero, zero, 0
+// 0x010245f8: 0x10245f8: beq   v0, zero, 0x1024610 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_1024600
+	brfalse L_1024610
 // --- basic block ---
-// 0x010245f0: 0x10245f0: addiu v0, zero, 1
+// 0x01024600: 0x1024600: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010245f4: 0x10245f4: sw    v0, 112(sp)
+// 0x01024604: 0x1024604: sw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1790,7 +1790,7 @@ L_10245e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010245f8: 0x10245f8: j	 0x102460c sw    zero, 100(sp)
+// 0x01024608: 0x1024608: j	 0x102461c sw    zero, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1799,19 +1799,19 @@ L_10245e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_102460c
+	br L_102461c
 // --- basic block ---
-L_1024600:
-// 0x01024600: 0x1024600: lw    v0, 28260(v0)
+L_1024610:
+// 0x01024610: 0x1024610: lw    v0, 28724(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7065
+	ldc.i4 7181
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024604: 0x1024604: sw    zero, 112(sp)
+// 0x01024614: 0x1024614: sw    zero, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1820,7 +1820,7 @@ L_1024600:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01024608: 0x1024608: sw    v0, 100(sp)
+// 0x01024618: 0x1024618: sw    v0, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1829,37 +1829,37 @@ L_1024600:
 	add
 	ldloc 5
 	stelem.i4
-L_102460c:
-// 0x0102460c: 0x102460c: lui   s0, 0x30000
+L_102461c:
+// 0x0102461c: 0x102461c: lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x01024610: 0x1024610: lw    v0, 28292(s0)
+// 0x01024620: 0x1024620: lw    v0, 28756(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7073
+	ldc.i4 7189
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024614: 0x1024614: sll   zero, zero, 0
-// 0x01024618: 0x1024618: bne   v0, zero, 0x102464c addiu s6, zero, 1
+// 0x01024624: 0x1024624: sll   zero, zero, 0
+// 0x01024628: 0x1024628: bne   v0, zero, 0x102465c addiu s6, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 14
-	brtrue L_102464c
+	brtrue L_102465c
 // --- basic block ---
-// 0x01024620: 0x1024620: lui   a0, 0x30000
+// 0x01024630: 0x1024630: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01024624: 0x1024624: addiu a0, a0, 28440
+// 0x01024634: 0x1024634: addiu a0, a0, 28904
 	ldloc.1
-	ldc.i4 28440
+	ldc.i4 28904
 	add
 	stloc.1
-// 0x01024628: 0x1024628: jal   0x1013cec addiu a1, s0, 28292
+// 0x01024638: 0x1024638: jal   0x1013cfc addiu a1, s0, 28756
 	ldloc 8
-	ldc.i4 28292
+	ldc.i4 28756
 	add
 	stloc.2
 	ldloc.0
@@ -1867,59 +1867,59 @@ L_102460c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_by_position_1013cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_by_position_1013cfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024630: 0x1024630: beq   v0, zero, 0x102464c addu  s6, v0, zero
+// 0x01024640: 0x1024640: beq   v0, zero, 0x102465c addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 14
-	brfalse L_102464c
+	brfalse L_102465c
 // --- basic block ---
-// 0x01024638: 0x1024638: lw    v0, 28292(s0)
+// 0x01024648: 0x1024648: lw    v0, 28756(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7073
+	ldc.i4 7189
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102463c: 0x102463c: sll   zero, zero, 0
-// 0x01024640: 0x1024640: lw    a0, 0(v0)
+// 0x0102464c: 0x102464c: sll   zero, zero, 0
+// 0x01024650: 0x1024650: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01024644: 0x1024644: jal   0x1013c44 sll   zero, zero, 0
+// 0x01024654: 0x1024654: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102464c:
-// 0x0102464c: 0x102464c: lui   v0, 0x30000
+L_102465c:
+// 0x0102465c: 0x102465c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024650: 0x1024650: lw    a0, 28264(v0)
+// 0x01024660: 0x1024660: lw    a0, 28728(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7066
+	ldc.i4 7182
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024654: 0x1024654: jal   0x104e35c lui   s0, 0x30000
+// 0x01024664: 0x1024664: jal   0x104e36c lui   s0, 0x30000
 	ldc.i4 196608
 	stloc 8
 	ldloc.0
@@ -1927,39 +1927,39 @@ L_102464c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102465c: 0x102465c: jal   0x104dd8c sll   zero, zero, 0
+// 0x0102466c: 0x102466c: jal   0x104dd9c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl57::roadmap_canvas_erase_104dd8c(int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_erase_104dd9c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024664: 0x1024664: lui   v0, 0x30000
+// 0x01024674: 0x1024674: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024668: 0x1024668: bne   s6, zero, 0x1024698 sw    zero, 28268(v0)
+// 0x01024678: 0x1024678: bne   s6, zero, 0x10246a8 sw    zero, 28732(v0)
 	ldloc 14
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_1024698
+	brtrue L_10246a8
 // --- basic block ---
-// 0x01024670: 0x1024670: lui   a0, 0x10000
+// 0x01024680: 0x1024680: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01024674: 0x1024674: jal   0x101cd60 addiu a0, a0, -29232
+// 0x01024684: 0x1024684: jal   0x101cd70 addiu a0, a0, -29232
 	ldloc.1
 	ldc.i4 -29232
 	add
@@ -1969,18 +1969,18 @@ L_102464c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102467c: 0x102467c: lui   a0, 0x10000
+// 0x0102468c: 0x102468c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01024680: 0x1024680: addu  a1, v0, zero
+// 0x01024690: 0x1024690: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01024684: 0x1024684: jal   0x1019ba8 addiu a0, a0, -30972
+// 0x01024694: 0x1024694: jal   0x1019bb8 addiu a0, a0, -30972
 	ldloc.1
 	ldc.i4 -30972
 	add
@@ -1990,46 +1990,46 @@ L_102464c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_text_1019ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_text_1019bb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102468c: 0x102468c: addiu v0, zero, 1
+// 0x0102469c: 0x102469c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01024690: 0x1024690: j	 0x10246b8 sw    v0, 28288(s0)
+// 0x010246a0: 0x10246a0: j	 0x10246c8 sw    v0, 28752(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7072
+	ldc.i4 7188
 	add
 	ldloc 5
 	stelem.i4
-	br L_10246b8
+	br L_10246c8
 // --- basic block ---
-L_1024698:
-// 0x01024698: 0x1024698: lw    v0, 28288(s0)
+L_10246a8:
+// 0x010246a8: 0x10246a8: lw    v0, 28752(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7072
+	ldc.i4 7188
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102469c: 0x102469c: sll   zero, zero, 0
-// 0x010246a0: 0x10246a0: beq   v0, zero, 0x10246bc lui   v0, 0x30000
+// 0x010246ac: 0x10246ac: sll   zero, zero, 0
+// 0x010246b0: 0x10246b0: beq   v0, zero, 0x10246cc lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_10246bc
+	brfalse L_10246cc
 // --- basic block ---
-// 0x010246a8: 0x10246a8: lui   a0, 0x10000
+// 0x010246b8: 0x10246b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010246ac: 0x10246ac: jal   0x1019564 addiu a0, a0, -30972
+// 0x010246bc: 0x10246bc: jal   0x1019574 addiu a0, a0, -30972
 	ldloc.1
 	ldc.i4 -30972
 	add
@@ -2039,68 +2039,68 @@ L_1024698:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010246b4: 0x10246b4: sw    zero, 28288(s0)
+// 0x010246c4: 0x10246c4: sw    zero, 28752(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7072
+	ldc.i4 7188
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10246b8:
-// 0x010246b8: 0x10246b8: lui   v0, 0x30000
+L_10246c8:
+// 0x010246c8: 0x10246c8: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-L_10246bc:
-// 0x010246bc: 0x10246bc: lw    v0, 28228(v0)
+L_10246cc:
+// 0x010246cc: 0x10246cc: lw    v0, 28692(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 5
-// 0x010246c0: 0x10246c0: sll   zero, zero, 0
-// 0x010246c4: 0x10246c4: bne   v0, zero, 0x10246d8 lui   v0, 0x50000
+// 0x010246d0: 0x10246d0: sll   zero, zero, 0
+// 0x010246d4: 0x10246d4: bne   v0, zero, 0x10246e8 lui   v0, 0x50000
 	ldloc 5
 	ldc.i4 327680
 	stloc 5
-	brtrue L_10246d8
+	brtrue L_10246e8
 // --- basic block ---
-// 0x010246cc: 0x10246cc: jal   0x10bfed8 sll   zero, zero, 0
+// 0x010246dc: 0x10246dc: jal   0x10c0520 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::roadmap_label_start_10bfed8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::roadmap_label_start_10c0520(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010246d4: 0x10246d4: lui   v0, 0x50000
+// 0x010246e4: 0x10246e4: lui   v0, 0x50000
 	ldc.i4 327680
 	stloc 5
-L_10246d8:
-// 0x010246d8: 0x10246d8: lui   s7, 0xe0000
+L_10246e8:
+// 0x010246e8: 0x10246e8: lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 18
-// 0x010246dc: 0x10246dc: lui   s3, 0x40000
+// 0x010246ec: 0x10246ec: lui   s3, 0x40000
 	ldc.i4 262144
 	stloc 12
-// 0x010246e0: 0x10246e0: addiu v0, v0, 28564
+// 0x010246f0: 0x10246f0: addiu v0, v0, 29028
 	ldloc 5
-	ldc.i4 28564
+	ldc.i4 29028
 	add
 	stloc 5
-// 0x010246e4: 0x10246e4: sw    v0, 88(sp)
+// 0x010246f4: 0x10246f4: sw    v0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2109,20 +2109,20 @@ L_10246d8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010246e8: 0x10246e8: addu  s4, zero, zero
+// 0x010246f8: 0x10246f8: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x010246ec: 0x10246ec: addiu s0, s7, 29604
+// 0x010246fc: 0x10246fc: addiu s0, s7, 30068
 	ldloc 18
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x010246f0: 0x10246f0: addiu s2, s3, -20612
+// 0x01024700: 0x1024700: addiu s2, s3, -20148
 	ldloc 12
-	ldc.i4 -20612
+	ldc.i4 -20148
 	add
 	stloc 13
-// 0x010246f4: 0x10246f4: j	 0x1024c7c sw    s6, 116(sp)
+// 0x01024704: 0x1024704: j	 0x1024c8c sw    s6, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2131,10 +2131,10 @@ L_10246d8:
 	add
 	ldloc 14
 	stelem.i4
-	br L_1024c7c
+	br L_1024c8c
 // --- basic block ---
-L_10246fc:
-// 0x010246fc: 0x10246fc: lw    v1, 88(sp)
+L_102470c:
+// 0x0102470c: 0x102470c: lw    v1, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2143,16 +2143,16 @@ L_10246fc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024700: 0x1024700: sll   zero, zero, 0
-// 0x01024704: 0x1024704: lw    v1, 0(v1)
+// 0x01024710: 0x1024710: sll   zero, zero, 0
+// 0x01024714: 0x1024714: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01024708: 0x1024708: sll   zero, zero, 0
-// 0x0102470c: 0x102470c: beq   v1, zero, 0x1024c6c sw    v1, 108(sp)
+// 0x01024718: 0x1024718: sll   zero, zero, 0
+// 0x0102471c: 0x102471c: beq   v1, zero, 0x1024c7c sw    v1, 108(sp)
 	ldloc 6
 	ldloc 7
 	ldloc.0
@@ -2162,34 +2162,34 @@ L_10246fc:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_1024c6c
+	brfalse L_1024c7c
 // --- basic block ---
-// 0x01024714: 0x1024714: lui   v0, 0x30000
+// 0x01024724: 0x1024724: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024718: 0x1024718: lw    s5, 28272(v0)
+// 0x01024728: 0x1024728: lw    s5, 28736(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7068
+	ldc.i4 7184
 	add
 	ldelem.i4
 	stloc 17
-// 0x0102471c: 0x102471c: lui   s8, 0xe0000
+// 0x0102472c: 0x102472c: lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 19
-// 0x01024720: 0x1024720: addiu s5, s5, -1
+// 0x01024730: 0x1024730: addiu s5, s5, -1
 	ldloc 17
 	ldc.i4.m1
 	add
 	stloc 17
-// 0x01024724: 0x1024724: sll   a0, s5, 2
+// 0x01024734: 0x1024734: sll   a0, s5, 2
 	ldloc 17
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01024728: 0x1024728: sw    a0, 92(sp)
+// 0x01024738: 0x1024738: sw    a0, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2198,7 +2198,7 @@ L_10246fc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0102472c: 0x102472c: j	 0x1024c3c sw    s4, 104(sp)
+// 0x0102473c: 0x102473c: j	 0x1024c4c sw    s4, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2207,19 +2207,19 @@ L_10246fc:
 	add
 	ldloc 15
 	stelem.i4
-	br L_1024c3c
+	br L_1024c4c
 // --- basic block ---
-L_1024734:
-// 0x01024734: 0x1024734: lw    v0, 28276(v0)
+L_1024744:
+// 0x01024744: 0x1024744: lw    v0, 28740(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7069
+	ldc.i4 7185
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024738: 0x1024738: lw    a2, 92(sp)
+// 0x01024748: 0x1024748: lw    a2, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2228,23 +2228,23 @@ L_1024734:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102473c: 0x102473c: sll   zero, zero, 0
-// 0x01024740: 0x1024740: addu  v0, v0, a2
+// 0x0102474c: 0x102474c: sll   zero, zero, 0
+// 0x01024750: 0x1024750: addu  v0, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc 5
-// 0x01024744: 0x1024744: lw    a0, 0(v0)
+// 0x01024754: 0x1024754: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01024748: 0x1024748: lui   v0, 0x0
+// 0x01024758: 0x1024758: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102474c: 0x102474c: lw    v0, 576(v0)
+// 0x0102475c: 0x102475c: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2253,76 +2253,76 @@ L_1024734:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024750: 0x1024750: sll   zero, zero, 0
-// 0x01024754: 0x1024754: beq   a0, v0, 0x1024788 sll   zero, zero, 0
+// 0x01024760: 0x1024760: sll   zero, zero, 0
+// 0x01024764: 0x1024764: beq   a0, v0, 0x1024798 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1024788
+	beq  L_1024798
 // --- basic block ---
-// 0x0102475c: 0x102475c: bltz  a0, 0x1024774 lui   v0, 0x30000
+// 0x0102476c: 0x102476c: bltz  a0, 0x1024784 lui   v0, 0x30000
 	ldloc.1
 	ldc.i4 196608
 	stloc 5
 	ldc.i4.s 0
-	blt L_1024774
+	blt L_1024784
 // --- basic block ---
-// 0x01024764: 0x1024764: jal   0x100b164 sll   zero, zero, 0
+// 0x01024774: 0x1024774: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102476c: 0x102476c: bne   v0, zero, 0x1024788 lui   v0, 0x30000
+// 0x0102477c: 0x102477c: bne   v0, zero, 0x1024798 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1024788
+	brtrue L_1024798
 // --- basic block ---
-L_1024774:
-// 0x01024774: 0x1024774: lw    v1, 28280(v0)
+L_1024784:
+// 0x01024784: 0x1024784: lw    v1, 28744(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7070
+	ldc.i4 7186
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024778: 0x1024778: sll   zero, zero, 0
-// 0x0102477c: 0x102477c: addiu v1, v1, 1
+// 0x01024788: 0x1024788: sll   zero, zero, 0
+// 0x0102478c: 0x102478c: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01024780: 0x1024780: j	 0x1024c2c sw    v1, 28280(v0)
+// 0x01024790: 0x1024790: j	 0x1024c3c sw    v1, 28744(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7070
+	ldc.i4 7186
 	add
 	ldloc 6
 	stelem.i4
-	br L_1024c2c
+	br L_1024c3c
 // --- basic block ---
-L_1024788:
-// 0x01024788: 0x1024788: jal   0x100a6c8 sll   zero, zero, 0
+L_1024798:
+// 0x01024798: 0x1024798: jal   0x100a6d8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_shape_set_square_100a6c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_shape_set_square_100a6d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024790: 0x1024790: lw    a3, 104(sp)
+// 0x010247a0: 0x10247a0: lw    a3, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2331,87 +2331,87 @@ L_1024788:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01024794: 0x1024794: sll   zero, zero, 0
-// 0x01024798: 0x1024798: bne   a3, zero, 0x1024c18 lui   v0, 0x30000
+// 0x010247a4: 0x10247a4: sll   zero, zero, 0
+// 0x010247a8: 0x10247a8: bne   a3, zero, 0x1024c28 lui   v0, 0x30000
 	ldloc 4
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1024c18
+	brtrue L_1024c28
 // --- basic block ---
-// 0x010247a0: 0x10247a0: addiu a0, zero, 1
+// 0x010247b0: 0x10247b0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010247a4: 0x10247a4: jal   0x1015c3c sw    zero, 28268(v0)
+// 0x010247b4: 0x10247b4: jal   0x1015c4c sw    zero, 28732(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl16::roadmap_is_visible_1015c3c(int32)
+	call int32 Cibyl16::roadmap_is_visible_1015c4c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010247ac: 0x10247ac: beq   v0, zero, 0x1024c18 sll   zero, zero, 0
+// 0x010247bc: 0x10247bc: beq   v0, zero, 0x1024c28 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1024c18
+	brfalse L_1024c28
 // --- basic block ---
-// 0x010247b4: 0x10247b4: jal   0x100a1f8 lui   s4, 0x30000
+// 0x010247c4: 0x10247c4: jal   0x100a208 lui   s4, 0x30000
 	ldc.i4 196608
 	stloc 15
-	call int32 Cibyl7::roadmap_polygon_count_100a1f8()
+	call int32 Cibyl7::roadmap_polygon_count_100a208()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010247bc: 0x10247bc: j	 0x1024c08 addiu s1, v0, -1
+// 0x010247cc: 0x10247cc: j	 0x1024c18 addiu s1, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 9
-	br L_1024c08
+	br L_1024c18
 // --- basic block ---
-L_10247c4:
-// 0x010247c4: 0x10247c4: jal   0x100a218 addu  a0, s1, zero
+L_10247d4:
+// 0x010247d4: 0x10247d4: jal   0x100a228 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl7::roadmap_polygon_category_100a218(int32)
+	call int32 Cibyl7::roadmap_polygon_category_100a228(int32)
 	stloc 5
 // --- basic block ---
-// 0x010247cc: 0x10247cc: addu  s6, v0, zero
+// 0x010247dc: 0x10247dc: addu  s6, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010247d0: 0x10247d0: addiu v0, zero, 192
+// 0x010247e0: 0x10247e0: addiu v0, zero, 192
 	ldc.i4 192
 	stloc 5
-// 0x010247d4: 0x10247d4: mult  s6, v0
+// 0x010247e4: 0x10247e4: mult  s6, v0
 	ldloc 14
 	ldloc 5
 	mul
 	stloc 10
-// 0x010247d8: 0x10247d8: lw    v0, 29728(s8)
+// 0x010247e8: 0x10247e8: lw    v0, 30192(s8)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x010247dc: 0x10247dc: mflo  lo
+// 0x010247ec: 0x10247ec: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x010247e0: 0x10247e0: addu  v0, v0, v1
+// 0x010247f0: 0x10247f0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x010247e4: 0x10247e4: sw    v1, 96(sp)
+// 0x010247f4: 0x10247f4: sw    v1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2420,7 +2420,7 @@ L_10247c4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010247e8: 0x10247e8: lw    v1, 8(v0)
+// 0x010247f8: 0x10247f8: lw    v1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2429,21 +2429,21 @@ L_10247c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010247ec: 0x10247ec: sll   zero, zero, 0
-// 0x010247f0: 0x10247f0: beq   v1, zero, 0x1024c04 sll   zero, zero, 0
+// 0x010247fc: 0x10247fc: sll   zero, zero, 0
+// 0x01024800: 0x1024800: beq   v1, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1024c04
+	brfalse L_1024c14
 // --- basic block ---
-// 0x010247f8: 0x10247f8: lw    a0, 29604(s7)
+// 0x01024808: 0x1024808: lw    a0, 30068(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x010247fc: 0x10247fc: lw    v1, 16(v0)
+// 0x0102480c: 0x102480c: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2452,39 +2452,39 @@ L_10247c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024800: 0x1024800: sll   zero, zero, 0
-// 0x01024804: 0x1024804: slt   v1, a0, v1
+// 0x01024810: 0x1024810: sll   zero, zero, 0
+// 0x01024814: 0x1024814: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01024808: 0x1024808: beq   v1, zero, 0x1024c04 addiu v1, zero, 16
+// 0x01024818: 0x1024818: beq   v1, zero, 0x1024c14 addiu v1, zero, 16
 	ldloc 6
 	ldc.i4.s 16
 	stloc 6
-	brfalse L_1024c04
+	brfalse L_1024c14
 // --- basic block ---
-// 0x01024810: 0x1024810: bne   s6, v1, 0x1024828 sll   zero, zero, 0
+// 0x01024820: 0x1024820: bne   s6, v1, 0x1024838 sll   zero, zero, 0
 	ldloc 14
 	ldloc 6
-	bne.un L_1024828
+	bne.un L_1024838
 // --- basic block ---
-// 0x01024818: 0x1024818: lw    v1, 28228(s4)
+// 0x01024828: 0x1024828: lw    v1, 28692(s4)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102481c: 0x102481c: sll   zero, zero, 0
-// 0x01024820: 0x1024820: bne   v1, zero, 0x1024c04 sll   zero, zero, 0
+// 0x0102482c: 0x102482c: sll   zero, zero, 0
+// 0x01024830: 0x1024830: bne   v1, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1024c04
+	brtrue L_1024c14
 // --- basic block ---
-L_1024828:
-// 0x01024828: 0x1024828: lw    v1, 120(v0)
+L_1024838:
+// 0x01024838: 0x1024838: lw    v1, 120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2493,12 +2493,12 @@ L_1024828:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102482c: 0x102482c: sll   zero, zero, 0
-// 0x01024830: 0x1024830: beq   v1, zero, 0x1024c04 sll   zero, zero, 0
+// 0x0102483c: 0x102483c: sll   zero, zero, 0
+// 0x01024840: 0x1024840: beq   v1, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1024c04
+	brfalse L_1024c14
 // --- basic block ---
-// 0x01024838: 0x1024838: lw    v1, 48(v0)
+// 0x01024848: 0x1024848: lw    v1, 48(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2507,31 +2507,31 @@ L_1024828:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102483c: 0x102483c: sll   zero, zero, 0
-// 0x01024840: 0x1024840: beq   v1, zero, 0x1024c04 lui   a0, 0x30000
+// 0x0102484c: 0x102484c: sll   zero, zero, 0
+// 0x01024850: 0x1024850: beq   v1, zero, 0x1024c14 lui   a0, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc.1
-	brfalse L_1024c04
+	brfalse L_1024c14
 // --- basic block ---
-// 0x01024848: 0x1024848: lw    v0, 28268(a0)
+// 0x01024858: 0x1024858: lw    v0, 28732(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102484c: 0x102484c: sll   zero, zero, 0
-// 0x01024850: 0x1024850: beq   v0, v1, 0x1024878 addu  a0, zero, zero
+// 0x0102485c: 0x102485c: sll   zero, zero, 0
+// 0x01024860: 0x1024860: beq   v0, v1, 0x1024888 addu  a0, zero, zero
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	beq  L_1024878
+	beq  L_1024888
 // --- basic block ---
-// 0x01024858: 0x1024858: jal   0x101fe10 sw    v1, 124(sp)
+// 0x01024868: 0x1024868: jal   0x101fe20 sw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2545,12 +2545,12 @@ L_1024828:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe10(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024860: 0x1024860: lw    v1, 124(sp)
+// 0x01024870: 0x1024870: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2559,7 +2559,7 @@ L_1024828:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024864: 0x1024864: jal   0x104e35c addu  a0, v1, zero
+// 0x01024874: 0x1024874: jal   0x104e36c addu  a0, v1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2567,12 +2567,12 @@ L_1024828:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102486c: 0x102486c: lw    v1, 124(sp)
+// 0x0102487c: 0x102487c: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2581,23 +2581,23 @@ L_1024828:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024870: 0x1024870: lui   a2, 0x30000
+// 0x01024880: 0x1024880: lui   a2, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x01024874: 0x1024874: sw    v1, 28268(a2)
+// 0x01024884: 0x1024884: sw    v1, 28732(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7067
+	ldc.i4 7183
 	add
 	ldloc 6
 	stelem.i4
-L_1024878:
-// 0x01024878: 0x1024878: addu  a0, s1, zero
+L_1024888:
+// 0x01024888: 0x1024888: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0102487c: 0x102487c: jal   0x100a470 addiu a1, sp, 68
+// 0x0102488c: 0x102488c: jal   0x100a480 addiu a1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
@@ -2607,12 +2607,12 @@ L_1024878:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_polygon_edges_100a470(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_polygon_edges_100a480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024884: 0x1024884: lw    t0, 76(sp)
+// 0x01024894: 0x1024894: lw    t0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2621,7 +2621,7 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01024888: 0x1024888: lw    v0, 56(s0)
+// 0x01024898: 0x1024898: lw    v0, 56(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2630,17 +2630,17 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102488c: 0x102488c: sll   zero, zero, 0
-// 0x01024890: 0x1024890: slt   v0, v0, t0
+// 0x0102489c: 0x102489c: sll   zero, zero, 0
+// 0x010248a0: 0x10248a0: slt   v0, v0, t0
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 5
-// 0x01024894: 0x1024894: bne   v0, zero, 0x1024c04 sll   zero, zero, 0
+// 0x010248a4: 0x10248a4: bne   v0, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024c04
+	brtrue L_1024c14
 // --- basic block ---
-// 0x0102489c: 0x102489c: lw    a2, 68(sp)
+// 0x010248ac: 0x10248ac: lw    a2, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2649,7 +2649,7 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010248a0: 0x10248a0: lw    v0, 64(s0)
+// 0x010248b0: 0x10248b0: lw    v0, 64(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2658,17 +2658,17 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010248a4: 0x10248a4: sll   zero, zero, 0
-// 0x010248a8: 0x10248a8: slt   v0, a2, v0
+// 0x010248b4: 0x10248b4: sll   zero, zero, 0
+// 0x010248b8: 0x10248b8: slt   v0, a2, v0
 	ldloc.3
 	ldloc 5
 	clt
 	stloc 5
-// 0x010248ac: 0x10248ac: bne   v0, zero, 0x1024c04 sll   zero, zero, 0
+// 0x010248bc: 0x10248bc: bne   v0, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024c04
+	brtrue L_1024c14
 // --- basic block ---
-// 0x010248b4: 0x10248b4: lw    a0, 80(sp)
+// 0x010248c4: 0x10248c4: lw    a0, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2677,7 +2677,7 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010248b8: 0x10248b8: lw    v0, 60(s0)
+// 0x010248c8: 0x10248c8: lw    v0, 60(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2686,17 +2686,17 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010248bc: 0x10248bc: sll   zero, zero, 0
-// 0x010248c0: 0x10248c0: slt   v0, v0, a0
+// 0x010248cc: 0x10248cc: sll   zero, zero, 0
+// 0x010248d0: 0x10248d0: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010248c4: 0x10248c4: bne   v0, zero, 0x1024c04 sll   zero, zero, 0
+// 0x010248d4: 0x10248d4: bne   v0, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024c04
+	brtrue L_1024c14
 // --- basic block ---
-// 0x010248cc: 0x10248cc: lw    a1, 72(sp)
+// 0x010248dc: 0x10248dc: lw    a1, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2705,7 +2705,7 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010248d0: 0x10248d0: lw    v0, 68(s0)
+// 0x010248e0: 0x10248e0: lw    v0, 68(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2714,51 +2714,51 @@ L_1024878:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010248d4: 0x10248d4: sll   zero, zero, 0
-// 0x010248d8: 0x10248d8: slt   v0, a1, v0
+// 0x010248e4: 0x10248e4: sll   zero, zero, 0
+// 0x010248e8: 0x10248e8: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x010248dc: 0x10248dc: bne   v0, zero, 0x1024c04 sll   zero, zero, 0
+// 0x010248ec: 0x10248ec: bne   v0, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024c04
+	brtrue L_1024c14
 // --- basic block ---
-// 0x010248e4: 0x10248e4: j	 0x102555c sll   zero, zero, 0
-	br L_102555c
+// 0x010248f4: 0x10248f4: j	 0x102556c sll   zero, zero, 0
+	br L_102556c
 // --- basic block ---
-L_10248ec:
-// 0x010248ec: 0x10248ec: subu  v0, v0, a0
+L_10248fc:
+// 0x010248fc: 0x10248fc: subu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc 5
-// 0x010248f0: 0x10248f0: sra   v1, v0, 31
+// 0x01024900: 0x1024900: sra   v1, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc 6
-// 0x010248f4: 0x10248f4: xor   v0, v1, v0
+// 0x01024904: 0x1024904: xor   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	xor
 	stloc 5
-// 0x010248f8: 0x10248f8: subu  v1, v0, v1
+// 0x01024908: 0x1024908: subu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	sub
 	stloc 6
-// 0x010248fc: 0x10248fc: slti  v1, v1, 5
+// 0x0102490c: 0x102490c: slti  v1, v1, 5
 	ldloc 6
 	ldc.i4.5
 	clt
 	stloc 6
-// 0x01024900: 0x1024900: bne   v1, zero, 0x1024c04 sll   zero, zero, 0
+// 0x01024910: 0x1024910: bne   v1, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1024c04
+	brtrue L_1024c14
 // --- basic block ---
-L_1024908:
-// 0x01024908: 0x1024908: lw    a2, 4(s2)
+L_1024918:
+// 0x01024918: 0x1024918: lw    a2, 4(s2)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -2767,55 +2767,55 @@ L_1024908:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102490c: 0x102490c: lw    v0, -20612(s3)
+// 0x0102491c: 0x102491c: lw    v0, -20148(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024910: 0x1024910: lui   a1, 0x50000
+// 0x01024920: 0x1024920: lui   a1, 0x50000
 	ldc.i4 327680
 	stloc.2
-// 0x01024914: 0x1024914: subu  a2, a2, v0
+// 0x01024924: 0x1024924: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01024918: 0x1024918: sra   a2, a2, 3
+// 0x01024928: 0x1024928: sra   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shr
 	stloc.3
-// 0x0102491c: 0x102491c: addu  a0, s1, zero
+// 0x0102492c: 0x102492c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01024920: 0x1024920: addiu a2, a2, -1
+// 0x01024930: 0x1024930: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01024924: 0x1024924: jal   0x100a23c addiu a1, a1, 12180
+// 0x01024934: 0x1024934: jal   0x100a24c addiu a1, a1, 12644
 	ldloc.2
-	ldc.i4 12180
+	ldc.i4 12644
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl7::roadmap_polygon_points_100a23c(int32,int32,int32)
+	call int32 Cibyl7::roadmap_polygon_points_100a24c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102492c: 0x102492c: bgtz  v0, 0x1024960 sll   zero, zero, 0
+// 0x0102493c: 0x102493c: bgtz  v0, 0x1024970 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_1024960
+	bgt L_1024970
 // --- basic block ---
-// 0x01024934: 0x1024934: jal   0x101fe10 addu  a0, zero, zero
+// 0x01024944: 0x1024944: jal   0x101fe20 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2823,12 +2823,12 @@ L_1024908:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe10(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102493c: 0x102493c: lw    a2, 4(s2)
+// 0x0102494c: 0x102494c: lw    a2, 4(s2)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -2837,98 +2837,98 @@ L_1024908:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01024940: 0x1024940: lw    v0, -20612(s3)
+// 0x01024950: 0x1024950: lw    v0, -20148(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024944: 0x1024944: lui   a1, 0x50000
+// 0x01024954: 0x1024954: lui   a1, 0x50000
 	ldc.i4 327680
 	stloc.2
-// 0x01024948: 0x1024948: subu  a2, a2, v0
+// 0x01024958: 0x1024958: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x0102494c: 0x102494c: sra   a2, a2, 3
+// 0x0102495c: 0x102495c: sra   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shr
 	stloc.3
-// 0x01024950: 0x1024950: addu  a0, s1, zero
+// 0x01024960: 0x1024960: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01024954: 0x1024954: addiu a2, a2, -1
+// 0x01024964: 0x1024964: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01024958: 0x1024958: jal   0x100a23c addiu a1, a1, 12180
+// 0x01024968: 0x1024968: jal   0x100a24c addiu a1, a1, 12644
 	ldloc.2
-	ldc.i4 12180
+	ldc.i4 12644
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl7::roadmap_polygon_points_100a23c(int32,int32,int32)
+	call int32 Cibyl7::roadmap_polygon_points_100a24c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1024960:
-// 0x01024960: 0x1024960: lui   a0, 0x20000
+L_1024970:
+// 0x01024970: 0x1024970: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01024964: 0x1024964: lw    a3, 31228(a0)
+// 0x01024974: 0x1024974: lw    a3, 31692(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 4
-// 0x01024968: 0x1024968: lui   a1, 0x30000
+// 0x01024978: 0x1024978: lui   a1, 0x30000
 	ldc.i4 196608
 	stloc.2
-// 0x0102496c: 0x102496c: lui   a0, 0x50000
+// 0x0102497c: 0x102497c: lui   a0, 0x50000
 	ldc.i4 327680
 	stloc.1
-// 0x01024970: 0x1024970: lw    v1, -20612(s3)
+// 0x01024980: 0x1024980: lw    v1, -20148(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024974: 0x1024974: addiu a1, a1, 28312
+// 0x01024984: 0x1024984: addiu a1, a1, 28776
 	ldloc.2
-	ldc.i4 28312
+	ldc.i4 28776
 	add
 	stloc.2
-// 0x01024978: 0x1024978: j	 0x1024a20 addiu a0, a0, 12180
+// 0x01024988: 0x1024988: j	 0x1024a30 addiu a0, a0, 12644
 	ldloc.1
-	ldc.i4 12180
+	ldc.i4 12644
 	add
 	stloc.1
-	br L_1024a20
+	br L_1024a30
 // --- basic block ---
-L_1024980:
-// 0x01024980: 0x1024980: lw    a2, 0(a0)
+L_1024990:
+// 0x01024990: 0x1024990: lw    a2, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01024984: 0x1024984: lw    t1, 80(s0)
+// 0x01024994: 0x1024994: lw    t1, 80(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2937,29 +2937,29 @@ L_1024980:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01024988: 0x1024988: andi  a2, a2, 32767
+// 0x01024998: 0x1024998: andi  a2, a2, 32767
 	ldloc.3
 	ldc.i4 32767
 	and
 	stloc.3
-// 0x0102498c: 0x102498c: sll   a2, a2, 3
+// 0x0102499c: 0x102499c: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x01024990: 0x1024990: addu  a2, a3, a2
+// 0x010249a0: 0x10249a0: addu  a2, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x01024994: 0x1024994: lw    t3, 0(a2)
+// 0x010249a4: 0x10249a4: lw    t3, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 21
-// 0x01024998: 0x1024998: lw    t2, 32(s0)
+// 0x010249a8: 0x10249a8: lw    t2, 32(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2968,17 +2968,17 @@ L_1024980:
 	add
 	ldelem.i4
 	stloc 20
-// 0x0102499c: 0x102499c: subu  t1, t3, t1
+// 0x010249ac: 0x10249ac: subu  t1, t3, t1
 	ldloc 21
 	ldloc 16
 	sub
 	stloc 16
-// 0x010249a0: 0x10249a0: div   t1, t2
+// 0x010249b0: 0x10249b0: div   t1, t2
 	ldloc 16
 	ldloc 20
 	div
 	stloc 10
-// 0x010249a4: 0x10249a4: lw    t3, 4(a2)
+// 0x010249b4: 0x10249b4: lw    t3, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -2987,17 +2987,17 @@ L_1024980:
 	add
 	ldelem.i4
 	stloc 21
-// 0x010249a8: 0x10249a8: mflo  lo
+// 0x010249b8: 0x10249b8: mflo  lo
 	ldloc 10
 	stloc 20
-// 0x010249ac: 0x10249ac: sw    t2, 0(v1)
+// 0x010249bc: 0x10249bc: sw    t2, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 20
 	stelem.i4
-// 0x010249b0: 0x10249b0: lw    t1, 76(s0)
+// 0x010249c0: 0x10249c0: lw    t1, 76(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3006,7 +3006,7 @@ L_1024980:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010249b4: 0x10249b4: lw    t2, 36(s0)
+// 0x010249c4: 0x10249c4: lw    t2, 36(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3015,20 +3015,20 @@ L_1024980:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010249b8: 0x10249b8: subu  t1, t1, t3
+// 0x010249c8: 0x10249c8: subu  t1, t1, t3
 	ldloc 16
 	ldloc 21
 	sub
 	stloc 16
-// 0x010249bc: 0x10249bc: div   t1, t2
+// 0x010249cc: 0x10249cc: div   t1, t2
 	ldloc 16
 	ldloc 20
 	div
 	stloc 10
-// 0x010249c0: 0x10249c0: mflo  lo
+// 0x010249d0: 0x10249d0: mflo  lo
 	ldloc 10
 	stloc 20
-// 0x010249c4: 0x10249c4: sw    t2, 4(v1)
+// 0x010249d4: 0x10249d4: sw    t2, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3037,30 +3037,30 @@ L_1024980:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010249c8: 0x10249c8: lw    t1, 0(a0)
+// 0x010249d8: 0x10249d8: lw    t1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 16
-// 0x010249cc: 0x10249cc: sll   zero, zero, 0
-// 0x010249d0: 0x10249d0: srl   t1, t1, 15
+// 0x010249dc: 0x10249dc: sll   zero, zero, 0
+// 0x010249e0: 0x10249e0: srl   t1, t1, 15
 	ldloc 16
 	ldc.i4.s 15
 	shr.un
 	stloc 16
-// 0x010249d4: 0x10249d4: xori  t1, t1, 1
+// 0x010249e4: 0x10249e4: xori  t1, t1, 1
 	ldloc 16
 	ldc.i4.1
 	xor
 	stloc 16
-// 0x010249d8: 0x10249d8: andi  t1, t1, 1
+// 0x010249e8: 0x10249e8: andi  t1, t1, 1
 	ldloc 16
 	ldc.i4.1
 	and
 	stloc 16
-// 0x010249dc: 0x10249dc: sw    t1, 4(t0)
+// 0x010249ec: 0x10249ec: sw    t1, 4(t0)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -3069,31 +3069,31 @@ L_1024980:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010249e0: 0x10249e0: lw    t1, 0(v1)
+// 0x010249f0: 0x10249f0: lw    t1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 16
-// 0x010249e4: 0x10249e4: lw    t0, 0(a1)
+// 0x010249f4: 0x10249f4: lw    t0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x010249e8: 0x10249e8: sll   zero, zero, 0
-// 0x010249ec: 0x10249ec: bne   t1, t0, 0x1024a10 addiu a2, v1, 8
+// 0x010249f8: 0x10249f8: sll   zero, zero, 0
+// 0x010249fc: 0x10249fc: bne   t1, t0, 0x1024a20 addiu a2, v1, 8
 	ldloc 16
 	ldloc 11
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc.3
-	bne.un L_1024a10
+	bne.un L_1024a20
 // --- basic block ---
-// 0x010249f4: 0x10249f4: lw    t1, 4(v1)
+// 0x01024a04: 0x1024a04: lw    t1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3102,7 +3102,7 @@ L_1024980:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010249f8: 0x10249f8: lw    t0, 4(a1)
+// 0x01024a08: 0x1024a08: lw    t0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3111,116 +3111,116 @@ L_1024980:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010249fc: 0x10249fc: sll   zero, zero, 0
-// 0x01024a00: 0x1024a00: bne   t1, t0, 0x1024a10 sll   zero, zero, 0
+// 0x01024a0c: 0x1024a0c: sll   zero, zero, 0
+// 0x01024a10: 0x1024a10: bne   t1, t0, 0x1024a20 sll   zero, zero, 0
 	ldloc 16
 	ldloc 11
-	bne.un L_1024a10
+	bne.un L_1024a20
 // --- basic block ---
-// 0x01024a08: 0x1024a08: addu  a2, v1, zero
+// 0x01024a18: 0x1024a18: addu  a2, v1, zero
 	ldloc 6
 	stloc.3
-// 0x01024a0c: 0x1024a0c: addu  v1, a1, zero
+// 0x01024a1c: 0x1024a1c: addu  v1, a1, zero
 	ldloc.2
 	stloc 6
-L_1024a10:
-// 0x01024a10: 0x1024a10: addu  a1, v1, zero
+L_1024a20:
+// 0x01024a20: 0x1024a20: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01024a14: 0x1024a14: addiu a0, a0, 4
+// 0x01024a24: 0x1024a24: addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x01024a18: 0x1024a18: addiu v0, v0, -1
+// 0x01024a28: 0x1024a28: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01024a1c: 0x1024a1c: addu  v1, a2, zero
+// 0x01024a2c: 0x1024a2c: addu  v1, a2, zero
 	ldloc.3
 	stloc 6
-L_1024a20:
-// 0x01024a20: 0x1024a20: lui   a2, 0x40000
+L_1024a30:
+// 0x01024a30: 0x1024a30: lui   a2, 0x40000
 	ldc.i4 262144
 	stloc.3
-// 0x01024a24: 0x1024a24: addiu a2, a2, -20600
+// 0x01024a34: 0x1024a34: addiu a2, a2, -20136
 	ldloc.3
-	ldc.i4 -20600
+	ldc.i4 -20136
 	add
 	stloc.3
-// 0x01024a28: 0x1024a28: subu  t0, v1, a2
+// 0x01024a38: 0x1024a38: subu  t0, v1, a2
 	ldloc 6
 	ldloc.3
 	sub
 	stloc 11
-// 0x01024a2c: 0x1024a2c: sra   t0, t0, 3
+// 0x01024a3c: 0x1024a3c: sra   t0, t0, 3
 	ldloc 11
 	ldc.i4.3
 	shr
 	stloc 11
-// 0x01024a30: 0x1024a30: addiu t0, t0, 8194
+// 0x01024a40: 0x1024a40: addiu t0, t0, 8194
 	ldloc 11
 	ldc.i4 8194
 	add
 	stloc 11
-// 0x01024a34: 0x1024a34: sll   t0, t0, 2
+// 0x01024a44: 0x1024a44: sll   t0, t0, 2
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 11
-// 0x01024a38: 0x1024a38: bgtz  v0, 0x1024980 addu  t0, s2, t0
+// 0x01024a48: 0x1024a48: bgtz  v0, 0x1024990 addu  t0, s2, t0
 	ldloc 5
 	ldloc 13
 	ldloc 11
 	add
 	stloc 11
 	ldc.i4.s 0
-	bgt L_1024980
+	bgt L_1024990
 // --- basic block ---
-// 0x01024a40: 0x1024a40: lui   v0, 0x40000
+// 0x01024a50: 0x1024a50: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x01024a44: 0x1024a44: lw    v0, -20612(v0)
+// 0x01024a54: 0x1024a54: lw    v0, -20148(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024a48: 0x1024a48: sll   zero, zero, 0
-// 0x01024a4c: 0x1024a4c: beq   v1, v0, 0x1024c04 subu  a1, v0, a2
+// 0x01024a58: 0x1024a58: sll   zero, zero, 0
+// 0x01024a5c: 0x1024a5c: beq   v1, v0, 0x1024c14 subu  a1, v0, a2
 	ldloc 6
 	ldloc 5
 	ldloc 5
 	ldloc.3
 	sub
 	stloc.2
-	beq  L_1024c04
+	beq  L_1024c14
 // --- basic block ---
-// 0x01024a54: 0x1024a54: sra   a1, a1, 3
+// 0x01024a64: 0x1024a64: sra   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shr
 	stloc.2
-// 0x01024a58: 0x1024a58: addiu a1, a1, 8194
+// 0x01024a68: 0x1024a68: addiu a1, a1, 8194
 	ldloc.2
 	ldc.i4 8194
 	add
 	stloc.2
-// 0x01024a5c: 0x1024a5c: sll   a1, a1, 2
+// 0x01024a6c: 0x1024a6c: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01024a60: 0x1024a60: addu  a1, s2, a1
+// 0x01024a70: 0x1024a70: addu  a1, s2, a1
 	ldloc 13
 	ldloc.2
 	add
 	stloc.2
-// 0x01024a64: 0x1024a64: lw    a1, 4(a1)
+// 0x01024a74: 0x1024a74: lw    a1, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3229,10 +3229,10 @@ L_1024a20:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024a68: 0x1024a68: lui   a3, 0x30000
+// 0x01024a78: 0x1024a78: lui   a3, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x01024a6c: 0x1024a6c: sw    a1, 4(t0)
+// 0x01024a7c: 0x1024a7c: sw    a1, 4(t0)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -3241,35 +3241,35 @@ L_1024a20:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01024a70: 0x1024a70: lw    a1, 0(v0)
+// 0x01024a80: 0x1024a80: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01024a74: 0x1024a74: addiu a0, v1, 8
+// 0x01024a84: 0x1024a84: addiu a0, v1, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc.1
-// 0x01024a78: 0x1024a78: sw    a1, 0(v1)
+// 0x01024a88: 0x1024a88: sw    a1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01024a7c: 0x1024a7c: lw    a1, 28532(a3)
+// 0x01024a8c: 0x1024a8c: lw    a1, 28996(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024a80: 0x1024a80: lw    a3, 4(v0)
+// 0x01024a90: 0x1024a90: lw    a3, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3278,12 +3278,12 @@ L_1024a20:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01024a84: 0x1024a84: subu  a2, a0, v0
+// 0x01024a94: 0x1024a94: subu  a2, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.3
-// 0x01024a88: 0x1024a88: sw    a3, 4(v1)
+// 0x01024a98: 0x1024a98: sw    a3, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3292,16 +3292,16 @@ L_1024a20:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01024a8c: 0x1024a8c: lw    v0, 29728(s8)
+// 0x01024a9c: 0x1024a9c: lw    v0, 30192(s8)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024a90: 0x1024a90: lw    v1, 96(sp)
+// 0x01024aa0: 0x1024aa0: lw    v1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3310,24 +3310,24 @@ L_1024a20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024a94: 0x1024a94: sra   a2, a2, 3
+// 0x01024aa4: 0x1024aa4: sra   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shr
 	stloc.3
-// 0x01024a98: 0x1024a98: sw    a2, 0(a1)
+// 0x01024aa8: 0x1024aa8: sw    a2, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01024a9c: 0x1024a9c: addu  v0, v0, v1
+// 0x01024aac: 0x1024aac: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01024aa0: 0x1024aa0: lw    v1, 8(v0)
+// 0x01024ab0: 0x1024ab0: lw    v1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3336,45 +3336,45 @@ L_1024a20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024aa4: 0x1024aa4: addiu a1, a1, 4
+// 0x01024ab4: 0x1024ab4: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01024aa8: 0x1024aa8: lui   a2, 0x30000
+// 0x01024ab8: 0x1024ab8: lui   a2, 0x30000
 	ldc.i4 196608
 	stloc.3
-// 0x01024aac: 0x1024aac: sw    a1, 28532(a2)
+// 0x01024abc: 0x1024abc: sw    a1, 28996(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 7133
+	ldc.i4 7249
 	add
 	ldloc.2
 	stelem.i4
-// 0x01024ab0: 0x1024ab0: beq   v1, zero, 0x1024b04 sw    a0, -20612(s3)
+// 0x01024ac0: 0x1024ac0: beq   v1, zero, 0x1024b14 sw    a0, -20148(s3)
 	ldloc 6
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5153
+	ldc.i4 -5037
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_1024b04
+	brfalse L_1024b14
 // --- basic block ---
-// 0x01024ab8: 0x1024ab8: lw    a0, 29604(s7)
+// 0x01024ac8: 0x1024ac8: lw    a0, 30068(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024abc: 0x1024abc: lw    v1, 16(v0)
+// 0x01024acc: 0x1024acc: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3383,41 +3383,41 @@ L_1024a20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024ac0: 0x1024ac0: sll   zero, zero, 0
-// 0x01024ac4: 0x1024ac4: slt   v1, a0, v1
+// 0x01024ad0: 0x1024ad0: sll   zero, zero, 0
+// 0x01024ad4: 0x1024ad4: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01024ac8: 0x1024ac8: beq   v1, zero, 0x1024b04 addiu v1, zero, 16
+// 0x01024ad8: 0x1024ad8: beq   v1, zero, 0x1024b14 addiu v1, zero, 16
 	ldloc 6
 	ldc.i4.s 16
 	stloc 6
-	brfalse L_1024b04
+	brfalse L_1024b14
 // --- basic block ---
-// 0x01024ad0: 0x1024ad0: bne   s6, v1, 0x1024ae8 sll   zero, zero, 0
+// 0x01024ae0: 0x1024ae0: bne   s6, v1, 0x1024af8 sll   zero, zero, 0
 	ldloc 14
 	ldloc 6
-	bne.un L_1024ae8
+	bne.un L_1024af8
 // --- basic block ---
-// 0x01024ad8: 0x1024ad8: lw    v1, 28228(s4)
+// 0x01024ae8: 0x1024ae8: lw    v1, 28692(s4)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024adc: 0x1024adc: sll   zero, zero, 0
-// 0x01024ae0: 0x1024ae0: bne   v1, zero, 0x1024b08 addu  a0, zero, zero
+// 0x01024aec: 0x1024aec: sll   zero, zero, 0
+// 0x01024af0: 0x1024af0: bne   v1, zero, 0x1024b18 addu  a0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1024b08
+	brtrue L_1024b18
 // --- basic block ---
-L_1024ae8:
-// 0x01024ae8: 0x1024ae8: lw    v1, 124(v0)
+L_1024af8:
+// 0x01024af8: 0x1024af8: lw    v1, 124(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3426,12 +3426,12 @@ L_1024ae8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024aec: 0x1024aec: sll   zero, zero, 0
-// 0x01024af0: 0x1024af0: beq   v1, zero, 0x1024b04 sll   zero, zero, 0
+// 0x01024afc: 0x1024afc: sll   zero, zero, 0
+// 0x01024b00: 0x1024b00: beq   v1, zero, 0x1024b14 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1024b04
+	brfalse L_1024b14
 // --- basic block ---
-// 0x01024af8: 0x1024af8: lw    a0, 52(v0)
+// 0x01024b08: 0x1024b08: lw    a0, 52(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3440,42 +3440,42 @@ L_1024ae8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024afc: 0x1024afc: j	 0x1024b08 sll   zero, zero, 0
-	br L_1024b08
+// 0x01024b0c: 0x1024b0c: j	 0x1024b18 sll   zero, zero, 0
+	br L_1024b18
 // --- basic block ---
-L_1024b04:
-// 0x01024b04: 0x1024b04: addu  a0, zero, zero
+L_1024b14:
+// 0x01024b14: 0x1024b14: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_1024b08:
-// 0x01024b08: 0x1024b08: jal   0x101fe10 sll   zero, zero, 0
+L_1024b18:
+// 0x01024b18: 0x1024b18: jal   0x101fe20 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe10(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024b10: 0x1024b10: lw    v0, 28228(s4)
+// 0x01024b20: 0x1024b20: lw    v0, 28692(s4)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024b14: 0x1024b14: sll   zero, zero, 0
-// 0x01024b18: 0x1024b18: bne   v0, zero, 0x1024c04 addiu a2, zero, 1
+// 0x01024b24: 0x1024b24: sll   zero, zero, 0
+// 0x01024b28: 0x1024b28: bne   v0, zero, 0x1024c14 addiu a2, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.3
-	brtrue L_1024c04
+	brtrue L_1024c14
 // --- basic block ---
-// 0x01024b20: 0x1024b20: lw    v0, 36(sp)
+// 0x01024b30: 0x1024b30: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3484,7 +3484,7 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024b24: 0x1024b24: lw    v1, 52(sp)
+// 0x01024b34: 0x1024b34: lw    v1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3493,7 +3493,7 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024b28: 0x1024b28: lw    a3, 56(sp)
+// 0x01024b38: 0x1024b38: lw    a3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3502,12 +3502,12 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01024b2c: 0x1024b2c: addu  v1, v1, v0
+// 0x01024b3c: 0x1024b3c: addu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x01024b30: 0x1024b30: lw    v0, 40(sp)
+// 0x01024b40: 0x1024b40: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3516,34 +3516,34 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024b34: 0x1024b34: sll   zero, zero, 0
-// 0x01024b38: 0x1024b38: addu  a3, a3, v0
+// 0x01024b44: 0x1024b44: sll   zero, zero, 0
+// 0x01024b48: 0x1024b48: addu  a3, a3, v0
 	ldloc 4
 	ldloc 5
 	add
 	stloc 4
-// 0x01024b3c: 0x1024b3c: addiu v0, zero, 2
+// 0x01024b4c: 0x1024b4c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01024b40: 0x1024b40: div   a3, v0
+// 0x01024b50: 0x1024b50: div   a3, v0
 	ldloc 4
 	ldloc 5
 	div
 	stloc 10
-// 0x01024b44: 0x1024b44: addiu a0, sp, 36
+// 0x01024b54: 0x1024b54: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x01024b48: 0x1024b48: addiu a1, sp, 52
+// 0x01024b58: 0x1024b58: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x01024b4c: 0x1024b4c: mflo  lo
+// 0x01024b5c: 0x1024b5c: mflo  lo
 	ldloc 10
 	stloc 4
-// 0x01024b50: 0x1024b50: sw    a3, 64(sp)
+// 0x01024b60: 0x1024b60: sw    a3, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3552,16 +3552,16 @@ L_1024b08:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01024b54: 0x1024b54: sll   zero, zero, 0
-// 0x01024b58: 0x1024b58: div   v1, v0
+// 0x01024b64: 0x1024b64: sll   zero, zero, 0
+// 0x01024b68: 0x1024b68: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 10
-// 0x01024b5c: 0x1024b5c: mflo  lo
+// 0x01024b6c: 0x1024b6c: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01024b60: 0x1024b60: jal   0x1009694 sw    v1, 60(sp)
+// 0x01024b70: 0x1024b70: jal   0x10096a4 sw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3575,50 +3575,50 @@ L_1024b08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024b68: 0x1024b68: lui   v1, 0x30000
+// 0x01024b78: 0x1024b78: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01024b6c: 0x1024b6c: addu  a2, v0, zero
+// 0x01024b7c: 0x1024b7c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01024b70: 0x1024b70: lw    v0, 28460(v1)
+// 0x01024b80: 0x1024b80: lw    v0, 28924(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7115
+	ldc.i4 7231
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024b74: 0x1024b74: sll   zero, zero, 0
-// 0x01024b78: 0x1024b78: mult  v0, v0
+// 0x01024b84: 0x1024b84: sll   zero, zero, 0
+// 0x01024b88: 0x1024b88: mult  v0, v0
 	ldloc 5
 	ldloc 5
 	mul
 	stloc 10
-// 0x01024b7c: 0x1024b7c: mflo  lo
+// 0x01024b8c: 0x1024b8c: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x01024b80: 0x1024b80: sll   v0, v0, 2
+// 0x01024b90: 0x1024b90: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01024b84: 0x1024b84: slt   v0, a2, v0
+// 0x01024b94: 0x1024b94: slt   v0, a2, v0
 	ldloc.3
 	ldloc 5
 	clt
 	stloc 5
-// 0x01024b88: 0x1024b88: beq   v0, zero, 0x1024c04 sll   zero, zero, 0
+// 0x01024b98: 0x1024b98: beq   v0, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1024c04
+	brfalse L_1024c14
 // --- basic block ---
-// 0x01024b90: 0x1024b90: lw    v1, 96(sp)
+// 0x01024ba0: 0x1024ba0: lw    v1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3627,22 +3627,22 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024b94: 0x1024b94: lw    v0, 29728(s8)
+// 0x01024ba4: 0x1024ba4: lw    v0, 30192(s8)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024b98: 0x1024b98: sll   zero, zero, 0
-// 0x01024b9c: 0x1024b9c: addu  v0, v0, v1
+// 0x01024ba8: 0x1024ba8: sll   zero, zero, 0
+// 0x01024bac: 0x1024bac: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01024ba0: 0x1024ba0: lw    v1, 24(v0)
+// 0x01024bb0: 0x1024bb0: lw    v1, 24(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3651,12 +3651,12 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024ba4: 0x1024ba4: sll   zero, zero, 0
-// 0x01024ba8: 0x1024ba8: beq   v1, zero, 0x1024c04 sll   zero, zero, 0
+// 0x01024bb4: 0x1024bb4: sll   zero, zero, 0
+// 0x01024bb8: 0x1024bb8: beq   v1, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1024c04
+	brfalse L_1024c14
 // --- basic block ---
-// 0x01024bb0: 0x1024bb0: lw    v0, 28(v0)
+// 0x01024bc0: 0x1024bc0: lw    v0, 28(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3665,26 +3665,26 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024bb4: 0x1024bb4: lw    v1, 29604(s7)
+// 0x01024bc4: 0x1024bc4: lw    v1, 30068(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024bb8: 0x1024bb8: sll   zero, zero, 0
-// 0x01024bbc: 0x1024bbc: slt   v0, v1, v0
+// 0x01024bc8: 0x1024bc8: sll   zero, zero, 0
+// 0x01024bcc: 0x1024bcc: slt   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x01024bc0: 0x1024bc0: beq   v0, zero, 0x1024c04 sll   zero, zero, 0
+// 0x01024bd0: 0x1024bd0: beq   v0, zero, 0x1024c14 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1024c04
+	brfalse L_1024c14
 // --- basic block ---
-// 0x01024bc8: 0x1024bc8: jal   0x1007a4c sw    a2, 120(sp)
+// 0x01024bd8: 0x1024bd8: jal   0x1007a5c sw    a2, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3693,13 +3693,13 @@ L_1024b08:
 	add
 	ldloc.3
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_get_orientation_1007a4c()
+	call int32 Cibyl5::roadmap_math_get_orientation_1007a5c()
 	stloc 5
 // --- basic block ---
-// 0x01024bd0: 0x1024bd0: addu  a0, s1, zero
+// 0x01024be0: 0x1024be0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01024bd4: 0x1024bd4: jal   0x100a51c sw    v0, 124(sp)
+// 0x01024be4: 0x1024be4: jal   0x100a52c sw    v0, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3713,12 +3713,12 @@ L_1024b08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_polygon_name_100a51c(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_polygon_name_100a52c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024bdc: 0x1024bdc: lw    v1, 124(sp)
+// 0x01024bec: 0x1024bec: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3727,10 +3727,10 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024be0: 0x1024be0: addiu a1, zero, 90
+// 0x01024bf0: 0x1024bf0: addiu a1, zero, 90
 	ldc.i4.s 90
 	stloc.2
-// 0x01024be4: 0x1024be4: lw    a2, 120(sp)
+// 0x01024bf4: 0x1024bf4: lw    a2, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3739,23 +3739,23 @@ L_1024b08:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01024be8: 0x1024be8: addu  a3, v0, zero
+// 0x01024bf8: 0x1024bf8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01024bec: 0x1024bec: subu  a1, a1, v1
+// 0x01024bfc: 0x1024bfc: subu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-// 0x01024bf0: 0x1024bf0: addiu v0, zero, 1
+// 0x01024c00: 0x1024c00: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01024bf4: 0x1024bf4: addiu a0, sp, 60
+// 0x01024c04: 0x1024c04: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x01024bf8: 0x1024bf8: sw    s6, 16(sp)
+// 0x01024c08: 0x1024c08: sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3764,7 +3764,7 @@ L_1024b08:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01024bfc: 0x1024bfc: jal   0x10bfaac sw    v0, 20(sp)
+// 0x01024c0c: 0x1024c0c: jal   0x10c00f4 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3773,22 +3773,22 @@ L_1024b08:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl142::roadmap_label_add_place_10bfaac()
+	call int32 Cibyl142::roadmap_label_add_place_10c00f4()
 	stloc 5
 // --- basic block ---
-L_1024c04:
-// 0x01024c04: 0x1024c04: addiu s1, s1, -1
+L_1024c14:
+// 0x01024c14: 0x1024c14: addiu s1, s1, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-L_1024c08:
-// 0x01024c08: 0x1024c08: bgez  s1, 0x10247c4 sll   zero, zero, 0
+L_1024c18:
+// 0x01024c18: 0x1024c18: bgez  s1, 0x10247d4 sll   zero, zero, 0
 	ldloc 9
 	ldc.i4.s 0
-	bge L_10247c4
+	bge L_10247d4
 // --- basic block ---
-// 0x01024c10: 0x1024c10: jal   0x101fe10 addu  a0, zero, zero
+// 0x01024c20: 0x1024c20: jal   0x101fe20 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3796,13 +3796,13 @@ L_1024c08:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe10(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_flush_polygons_101fe20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1024c18:
-// 0x01024c18: 0x1024c18: lw    a1, 104(sp)
+L_1024c28:
+// 0x01024c28: 0x1024c28: lw    a1, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3811,7 +3811,7 @@ L_1024c18:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024c1c: 0x1024c1c: lw    a2, 108(sp)
+// 0x01024c2c: 0x1024c2c: lw    a2, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3820,7 +3820,7 @@ L_1024c18:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01024c20: 0x1024c20: lw    a3, 112(sp)
+// 0x01024c30: 0x1024c30: lw    a3, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3829,7 +3829,7 @@ L_1024c18:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01024c24: 0x1024c24: jal   0x1024144 addu  a0, s5, zero
+// 0x01024c34: 0x1024c34: jal   0x1024154 addu  a0, s5, zero
 	ldloc 17
 	stloc.1
 	ldloc.0
@@ -3837,13 +3837,13 @@ L_1024c18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl27::roadmap_screen_repaint_square_1024144(int32,int32,int32,int32,int32)
+	call int32 Cibyl27::roadmap_screen_repaint_square_1024154(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1024c2c:
-// 0x01024c2c: 0x1024c2c: lw    a0, 92(sp)
+L_1024c3c:
+// 0x01024c3c: 0x1024c3c: lw    a0, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3852,17 +3852,17 @@ L_1024c2c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024c30: 0x1024c30: addiu s5, s5, -1
+// 0x01024c40: 0x1024c40: addiu s5, s5, -1
 	ldloc 17
 	ldc.i4.m1
 	add
 	stloc 17
-// 0x01024c34: 0x1024c34: addiu a0, a0, -4
+// 0x01024c44: 0x1024c44: addiu a0, a0, -4
 	ldloc.1
 	ldc.i4.s -4
 	add
 	stloc.1
-// 0x01024c38: 0x1024c38: sw    a0, 92(sp)
+// 0x01024c48: 0x1024c48: sw    a0, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3871,27 +3871,27 @@ L_1024c2c:
 	add
 	ldloc.1
 	stelem.i4
-L_1024c3c:
-// 0x01024c3c: 0x1024c3c: bgez  s5, 0x1024734 lui   v0, 0x30000
+L_1024c4c:
+// 0x01024c4c: 0x1024c4c: bgez  s5, 0x1024744 lui   v0, 0x30000
 	ldloc 17
 	ldc.i4 196608
 	stloc 5
 	ldc.i4.s 0
-	bge L_1024734
+	bge L_1024744
 // --- basic block ---
-// 0x01024c44: 0x1024c44: lui   v1, 0x30000
+// 0x01024c54: 0x1024c54: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 6
-// 0x01024c48: 0x1024c48: lw    v0, 28228(v1)
+// 0x01024c58: 0x1024c58: lw    v0, 28692(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024c4c: 0x1024c4c: lw    s4, 104(sp)
+// 0x01024c5c: 0x1024c5c: lw    s4, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3900,33 +3900,33 @@ L_1024c3c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01024c50: 0x1024c50: bne   v0, zero, 0x1024c6c sll   zero, zero, 0
+// 0x01024c60: 0x1024c60: bne   v0, zero, 0x1024c7c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024c6c
+	brtrue L_1024c7c
 // --- basic block ---
-// 0x01024c58: 0x1024c58: cibyl_sysc 0x3c6
+// 0x01024c68: 0x1024c68: cibyl_sysc 0x3c6
 	call int32 [WazeWP7]Syscalls::NOPH_UIWorker_pendingDraws()
 	stloc 5
-// 0x01024c5c: 0x1024c5c: addu  a0, v0, zero
+// 0x01024c6c: 0x1024c6c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01024c60: 0x1024c60: beq   a0, zero, 0x1024c6c addiu v0, zero, 1
+// 0x01024c70: 0x1024c70: beq   a0, zero, 0x1024c7c addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	brfalse L_1024c6c
+	brfalse L_1024c7c
 // --- basic block ---
-// 0x01024c68: 0x1024c68: sw    v0, 28228(v1)
+// 0x01024c78: 0x1024c78: sw    v0, 28692(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldloc 5
 	stelem.i4
-L_1024c6c:
-// 0x01024c6c: 0x1024c6c: lw    a2, 88(sp)
+L_1024c7c:
+// 0x01024c7c: 0x1024c7c: lw    a2, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3935,17 +3935,17 @@ L_1024c6c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01024c70: 0x1024c70: addiu s4, s4, 1
+// 0x01024c80: 0x1024c80: addiu s4, s4, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x01024c74: 0x1024c74: addiu a2, a2, 4
+// 0x01024c84: 0x1024c84: addiu a2, a2, 4
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-// 0x01024c78: 0x1024c78: sw    a2, 88(sp)
+// 0x01024c88: 0x1024c88: sw    a2, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3954,8 +3954,8 @@ L_1024c6c:
 	add
 	ldloc.3
 	stelem.i4
-L_1024c7c:
-// 0x01024c7c: 0x1024c7c: lw    a3, 100(sp)
+L_1024c8c:
+// 0x01024c8c: 0x1024c8c: lw    a3, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3964,17 +3964,17 @@ L_1024c7c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01024c80: 0x1024c80: sll   zero, zero, 0
-// 0x01024c84: 0x1024c84: slt   v0, a3, s4
+// 0x01024c90: 0x1024c90: sll   zero, zero, 0
+// 0x01024c94: 0x1024c94: slt   v0, a3, s4
 	ldloc 4
 	ldloc 15
 	clt
 	stloc 5
-// 0x01024c88: 0x1024c88: beq   v0, zero, 0x10246fc sll   zero, zero, 0
+// 0x01024c98: 0x1024c98: beq   v0, zero, 0x102470c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10246fc
+	brfalse L_102470c
 // --- basic block ---
-// 0x01024c90: 0x1024c90: lw    s6, 116(sp)
+// 0x01024ca0: 0x1024ca0: lw    s6, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3983,29 +3983,29 @@ L_1024c7c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01024c94: 0x1024c94: jal   0x1021f34 sll   zero, zero, 0
+// 0x01024ca4: 0x1024ca4: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024c9c: 0x1024c9c: jal   0x10223d4 sll   zero, zero, 0
+// 0x01024cac: 0x1024cac: jal   0x10223e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024ca4: 0x1024ca4: lw    a0, 100(sp)
+// 0x01024cb4: 0x1024cb4: lw    a0, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4014,68 +4014,68 @@ L_1024c7c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024ca8: 0x1024ca8: jal   0x101477c sll   zero, zero, 0
+// 0x01024cb8: 0x1024cb8: jal   0x101478c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_plugin_screen_repaint_101477c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_plugin_screen_repaint_101478c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024cb0: 0x1024cb0: jal   0x1021f34 sll   zero, zero, 0
+// 0x01024cc0: 0x1024cc0: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024cb8: 0x1024cb8: jal   0x10223d4 sll   zero, zero, 0
+// 0x01024cc8: 0x1024cc8: jal   0x10223e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024cc0: 0x1024cc0: lui   v0, 0x30000
+// 0x01024cd0: 0x1024cd0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024cc4: 0x1024cc4: lw    v0, 28284(v0)
+// 0x01024cd4: 0x1024cd4: lw    v0, 28748(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7071
+	ldc.i4 7187
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024cc8: 0x1024cc8: sll   zero, zero, 0
-// 0x01024ccc: 0x1024ccc: bne   v0, zero, 0x1024ce0 lui   v0, 0x30000
+// 0x01024cd8: 0x1024cd8: sll   zero, zero, 0
+// 0x01024cdc: 0x1024cdc: bne   v0, zero, 0x1024cf0 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brtrue L_1024ce0
+	brtrue L_1024cf0
 // --- basic block ---
-// 0x01024cd4: 0x1024cd4: lw    a0, 28448(v0)
+// 0x01024ce4: 0x1024ce4: lw    a0, 28912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7112
+	ldc.i4 7228
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024cd8: 0x1024cd8: jal   0x10c0034 sltiu a0, a0, 1
+// 0x01024ce8: 0x1024ce8: jal   0x10c067c sltiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
@@ -4085,96 +4085,96 @@ L_1024c7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::roadmap_label_draw_cache_10c0034(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::roadmap_label_draw_cache_10c067c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1024ce0:
-// 0x01024ce0: 0x1024ce0: jal   0x1021f34 sll   zero, zero, 0
+L_1024cf0:
+// 0x01024cf0: 0x1024cf0: jal   0x1021f44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_1021f34(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_1021f44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024ce8: 0x1024ce8: jal   0x10223d4 sll   zero, zero, 0
+// 0x01024cf8: 0x1024cf8: jal   0x10223e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_points_10223d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_points_10223e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024cf0: 0x1024cf0: lui   v0, 0x30000
+// 0x01024d00: 0x1024d00: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01024cf4: 0x1024cf4: lw    v0, 28228(v0)
+// 0x01024d04: 0x1024d04: lw    v0, 28692(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7057
+	ldc.i4 7173
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024cf8: 0x1024cf8: sll   zero, zero, 0
-// 0x01024cfc: 0x1024cfc: bne   v0, zero, 0x102536c sll   zero, zero, 0
+// 0x01024d08: 0x1024d08: sll   zero, zero, 0
+// 0x01024d0c: 0x1024d0c: bne   v0, zero, 0x102537c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102536c
+	brtrue L_102537c
 // --- basic block ---
-// 0x01024d04: 0x1024d04: addiu s6, s6, -1
+// 0x01024d14: 0x1024d14: addiu s6, s6, -1
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 14
-// 0x01024d08: 0x1024d08: lui   s4, 0xe0000
+// 0x01024d18: 0x1024d18: lui   s4, 0xe0000
 	ldc.i4 917504
 	stloc 15
-// 0x01024d0c: 0x1024d0c: sll   s3, s6, 2
+// 0x01024d1c: 0x1024d1c: sll   s3, s6, 2
 	ldloc 14
 	ldc.i4.2
 	shl
 	stloc 12
-// 0x01024d10: 0x1024d10: lui   s8, 0x30000
+// 0x01024d20: 0x1024d20: lui   s8, 0x30000
 	ldc.i4 196608
 	stloc 19
-// 0x01024d14: 0x1024d14: lui   s7, 0x0
+// 0x01024d24: 0x1024d24: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 18
-// 0x01024d18: 0x1024d18: addiu s0, s4, 29604
+// 0x01024d28: 0x1024d28: addiu s0, s4, 30068
 	ldloc 15
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x01024d1c: 0x1024d1c: addiu s2, sp, 60
+// 0x01024d2c: 0x1024d2c: addiu s2, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 13
-// 0x01024d20: 0x1024d20: j	 0x1024f6c lui   s5, 0xe0000
+// 0x01024d30: 0x1024d30: j	 0x1024f7c lui   s5, 0xe0000
 	ldc.i4 917504
 	stloc 17
-	br L_1024f6c
+	br L_1024f7c
 // --- basic block ---
-L_1024d28:
-// 0x01024d28: 0x1024d28: lw    v1, 28276(s8)
+L_1024d38:
+// 0x01024d38: 0x1024d38: lw    v1, 28740(s8)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7069
+	ldc.i4 7185
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024d2c: 0x1024d2c: lw    v0, 576(s7)
+// 0x01024d3c: 0x1024d3c: lw    v0, 576(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
@@ -4183,68 +4183,68 @@ L_1024d28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024d30: 0x1024d30: addu  v1, v1, s3
+// 0x01024d40: 0x1024d40: addu  v1, v1, s3
 	ldloc 6
 	ldloc 12
 	add
 	stloc 6
-// 0x01024d34: 0x1024d34: lw    a0, 0(v1)
+// 0x01024d44: 0x1024d44: lw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01024d38: 0x1024d38: sll   zero, zero, 0
-// 0x01024d3c: 0x1024d3c: beq   a0, v0, 0x1024d60 sll   zero, zero, 0
+// 0x01024d48: 0x1024d48: sll   zero, zero, 0
+// 0x01024d4c: 0x1024d4c: beq   a0, v0, 0x1024d70 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1024d60
+	beq  L_1024d70
 // --- basic block ---
-// 0x01024d44: 0x1024d44: bltz  a0, 0x1024f64 sll   zero, zero, 0
+// 0x01024d54: 0x1024d54: bltz  a0, 0x1024f74 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1024f64
+	blt L_1024f74
 // --- basic block ---
-// 0x01024d4c: 0x1024d4c: jal   0x100b164 sll   zero, zero, 0
+// 0x01024d5c: 0x1024d5c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024d54: 0x1024d54: beq   v0, zero, 0x1024f68 addiu s6, s6, -1
+// 0x01024d64: 0x1024d64: beq   v0, zero, 0x1024f78 addiu s6, s6, -1
 	ldloc 5
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 14
-	brfalse L_1024f68
+	brfalse L_1024f78
 // --- basic block ---
-// 0x01024d5c: 0x1024d5c: addiu s6, s6, 1
+// 0x01024d6c: 0x1024d6c: addiu s6, s6, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-L_1024d60:
-// 0x01024d60: 0x1024d60: jal   0x1032ab8 addu  s1, zero, zero
+L_1024d70:
+// 0x01024d70: 0x1024d70: jal   0x1032ac8 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	call int32 Cibyl37::roadmap_alert_count_1032ab8()
+	call int32 Cibyl37::roadmap_alert_count_1032ac8()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024d68: 0x1024d68: addiu a0, sp, 68
+// 0x01024d78: 0x1024d78: addiu a0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.1
-// 0x01024d6c: 0x1024d6c: jal   0x1007f28 sw    v0, 88(sp)
+// 0x01024d7c: 0x1024d7c: jal   0x1007f38 sw    v0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4258,38 +4258,38 @@ L_1024d60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_screen_edges_1007f28(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_screen_edges_1007f38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024d74: 0x1024d74: j	 0x1024f50 sll   zero, zero, 0
-	br L_1024f50
+// 0x01024d84: 0x1024d84: j	 0x1024f60 sll   zero, zero, 0
+	br L_1024f60
 // --- basic block ---
-L_1024d7c:
-// 0x01024d7c: 0x1024d7c: jal   0x10a7038 sll   zero, zero, 0
+L_1024d8c:
+// 0x01024d8c: 0x1024d8c: jal   0x10a7680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isShowSpeedCams_10a7038(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isShowSpeedCams_10a7680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024d84: 0x1024d84: beq   v0, zero, 0x1024f4c addu  a0, s1, zero
+// 0x01024d94: 0x1024d94: beq   v0, zero, 0x1024f5c addu  a0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_1024f4c
+	brfalse L_1024f5c
 // --- basic block ---
-// 0x01024d8c: 0x1024d8c: addiu a1, sp, 44
+// 0x01024d9c: 0x1024d9c: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x01024d90: 0x1024d90: jal   0x1032ad8 addiu a2, sp, 24
+// 0x01024da0: 0x1024da0: jal   0x1032ae8 addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4298,12 +4298,12 @@ L_1024d7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::roadmap_alert_get_position_1032ad8(int32,int32,int32,int32)
+	call int32 Cibyl37::roadmap_alert_get_position_1032ae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024d98: 0x1024d98: lw    a1, 44(sp)
+// 0x01024da8: 0x1024da8: lw    a1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4312,7 +4312,7 @@ L_1024d7c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024d9c: 0x1024d9c: lw    v0, 56(s0)
+// 0x01024dac: 0x1024dac: lw    v0, 56(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4321,17 +4321,17 @@ L_1024d7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024da0: 0x1024da0: sll   zero, zero, 0
-// 0x01024da4: 0x1024da4: slt   v0, v0, a1
+// 0x01024db0: 0x1024db0: sll   zero, zero, 0
+// 0x01024db4: 0x1024db4: slt   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x01024da8: 0x1024da8: bne   v0, zero, 0x1024f4c sll   zero, zero, 0
+// 0x01024db8: 0x1024db8: bne   v0, zero, 0x1024f5c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024f4c
+	brtrue L_1024f5c
 // --- basic block ---
-// 0x01024db0: 0x1024db0: lw    v0, 64(s0)
+// 0x01024dc0: 0x1024dc0: lw    v0, 64(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4340,17 +4340,17 @@ L_1024d7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024db4: 0x1024db4: sll   zero, zero, 0
-// 0x01024db8: 0x1024db8: slt   v0, a1, v0
+// 0x01024dc4: 0x1024dc4: sll   zero, zero, 0
+// 0x01024dc8: 0x1024dc8: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x01024dbc: 0x1024dbc: bne   v0, zero, 0x1024f4c sll   zero, zero, 0
+// 0x01024dcc: 0x1024dcc: bne   v0, zero, 0x1024f5c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024f4c
+	brtrue L_1024f5c
 // --- basic block ---
-// 0x01024dc4: 0x1024dc4: lw    v1, 48(sp)
+// 0x01024dd4: 0x1024dd4: lw    v1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4359,7 +4359,7 @@ L_1024d7c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024dc8: 0x1024dc8: lw    v0, 60(s0)
+// 0x01024dd8: 0x1024dd8: lw    v0, 60(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4368,17 +4368,17 @@ L_1024d7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024dcc: 0x1024dcc: sll   zero, zero, 0
-// 0x01024dd0: 0x1024dd0: slt   v0, v0, v1
+// 0x01024ddc: 0x1024ddc: sll   zero, zero, 0
+// 0x01024de0: 0x1024de0: slt   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	clt
 	stloc 5
-// 0x01024dd4: 0x1024dd4: bne   v0, zero, 0x1024f4c sll   zero, zero, 0
+// 0x01024de4: 0x1024de4: bne   v0, zero, 0x1024f5c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024f4c
+	brtrue L_1024f5c
 // --- basic block ---
-// 0x01024ddc: 0x1024ddc: lw    v0, 68(s0)
+// 0x01024dec: 0x1024dec: lw    v0, 68(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4387,32 +4387,32 @@ L_1024d7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024de0: 0x1024de0: sll   zero, zero, 0
-// 0x01024de4: 0x1024de4: slt   v0, v1, v0
+// 0x01024df0: 0x1024df0: sll   zero, zero, 0
+// 0x01024df4: 0x1024df4: slt   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x01024de8: 0x1024de8: bne   v0, zero, 0x1024f4c addiu a0, zero, 1
+// 0x01024df8: 0x1024df8: bne   v0, zero, 0x1024f5c addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brtrue L_1024f4c
+	brtrue L_1024f5c
 // --- basic block ---
-// 0x01024df0: 0x1024df0: j	 0x10255d4 sll   zero, zero, 0
-	br L_10255d4
+// 0x01024e00: 0x1024e00: j	 0x10255e4 sll   zero, zero, 0
+	br L_10255e4
 // --- basic block ---
-L_1024df8:
-// 0x01024df8: 0x1024df8: lw    a0, 29604(s4)
+L_1024e08:
+// 0x01024e08: 0x1024e08: lw    a0, 30068(s4)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x01024dfc: 0x1024dfc: lw    v1, 16(v0)
+// 0x01024e0c: 0x1024e0c: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4421,17 +4421,17 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024e00: 0x1024e00: sll   zero, zero, 0
-// 0x01024e04: 0x1024e04: slt   v1, a0, v1
+// 0x01024e10: 0x1024e10: sll   zero, zero, 0
+// 0x01024e14: 0x1024e14: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01024e08: 0x1024e08: beq   v1, zero, 0x1024f4c sll   zero, zero, 0
+// 0x01024e18: 0x1024e18: beq   v1, zero, 0x1024f5c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1024f4c
+	brfalse L_1024f5c
 // --- basic block ---
-// 0x01024e10: 0x1024e10: lw    v1, 120(v0)
+// 0x01024e20: 0x1024e20: lw    v1, 120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4440,12 +4440,12 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024e14: 0x1024e14: sll   zero, zero, 0
-// 0x01024e18: 0x1024e18: beq   v1, zero, 0x1024f4c sll   zero, zero, 0
+// 0x01024e24: 0x1024e24: sll   zero, zero, 0
+// 0x01024e28: 0x1024e28: beq   v1, zero, 0x1024f5c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1024f4c
+	brfalse L_1024f5c
 // --- basic block ---
-// 0x01024e20: 0x1024e20: lw    v0, 48(v0)
+// 0x01024e30: 0x1024e30: lw    v0, 48(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4454,19 +4454,19 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024e24: 0x1024e24: sll   zero, zero, 0
-// 0x01024e28: 0x1024e28: beq   v0, zero, 0x1024f4c sll   zero, zero, 0
+// 0x01024e34: 0x1024e34: sll   zero, zero, 0
+// 0x01024e38: 0x1024e38: beq   v0, zero, 0x1024f5c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1024f4c
+	brfalse L_1024f5c
 // --- basic block ---
-// 0x01024e30: 0x1024e30: jal   0x1007a5c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_get_zoom_1007a5c()
+// 0x01024e40: 0x1024e40: jal   0x1007a6c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_get_zoom_1007a6c()
 	stloc 5
 // --- basic block ---
-// 0x01024e38: 0x1024e38: addu  a0, s1, zero
+// 0x01024e48: 0x1024e48: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01024e3c: 0x1024e3c: jal   0x1032b54 sw    v0, 124(sp)
+// 0x01024e4c: 0x1024e4c: jal   0x1032b64 sw    v0, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4476,22 +4476,22 @@ L_1024df8:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl37::roadmap_alert_get_id_1032b54(int32)
+	call int32 Cibyl37::roadmap_alert_get_id_1032b64(int32)
 	stloc 5
 // --- basic block ---
-// 0x01024e44: 0x1024e44: jal   0x1032c54 addu  a0, v0, zero
+// 0x01024e54: 0x1024e54: jal   0x1032c64 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::roadmap_alert_get_map_icon_1032c54(int32,int32,int32,int32)
+	call int32 Cibyl37::roadmap_alert_get_map_icon_1032c64(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024e4c: 0x1024e4c: lw    v1, 124(sp)
+// 0x01024e5c: 0x1024e5c: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4500,24 +4500,24 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024e50: 0x1024e50: beq   v0, zero, 0x1024f4c slti  v1, v1, 23
+// 0x01024e60: 0x1024e60: beq   v0, zero, 0x1024f5c slti  v1, v1, 23
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 23
 	clt
 	stloc 6
-	brfalse L_1024f4c
+	brfalse L_1024f5c
 // --- basic block ---
-// 0x01024e58: 0x1024e58: beq   v1, zero, 0x1024ecc addiu a1, zero, 1
+// 0x01024e68: 0x1024e68: beq   v1, zero, 0x1024edc addiu a1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.2
-	brfalse L_1024ecc
+	brfalse L_1024edc
 // --- basic block ---
-// 0x01024e60: 0x1024e60: addu  a2, v0, zero
+// 0x01024e70: 0x1024e70: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01024e64: 0x1024e64: jal   0x10a1918 addu  a0, zero, zero
+// 0x01024e74: 0x1024e74: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4525,15 +4525,15 @@ L_1024df8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024e6c: 0x1024e6c: addu  v1, v0, zero
+// 0x01024e7c: 0x1024e7c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01024e70: 0x1024e70: lw    v0, 60(sp)
+// 0x01024e80: 0x1024e80: lw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4542,7 +4542,7 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024e74: 0x1024e74: lw    a1, 64(sp)
+// 0x01024e84: 0x1024e84: lw    a1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4551,15 +4551,15 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024e78: 0x1024e78: addu  a0, v1, zero
+// 0x01024e88: 0x1024e88: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01024e7c: 0x1024e7c: addiu v0, v0, -10
+// 0x01024e8c: 0x1024e8c: addiu v0, v0, -10
 	ldloc 5
 	ldc.i4.s -10
 	add
 	stloc 5
-// 0x01024e80: 0x1024e80: sw    v1, 124(sp)
+// 0x01024e90: 0x1024e90: sw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4568,7 +4568,7 @@ L_1024df8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01024e84: 0x1024e84: sw    a1, 120(sp)
+// 0x01024e94: 0x1024e94: sw    a1, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4577,7 +4577,7 @@ L_1024df8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01024e88: 0x1024e88: jal   0x104e020 sw    v0, 52(sp)
+// 0x01024e98: 0x1024e98: jal   0x104e030 sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4587,12 +4587,12 @@ L_1024df8:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024e90: 0x1024e90: lw    a1, 120(sp)
+// 0x01024ea0: 0x1024ea0: lw    a1, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4601,7 +4601,7 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024e94: 0x1024e94: lw    a2, 24(sp)
+// 0x01024ea4: 0x1024ea4: lw    a2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4610,28 +4610,28 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01024e98: 0x1024e98: addiu a1, a1, 2
+// 0x01024ea8: 0x1024ea8: addiu a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	add
 	stloc.2
-// 0x01024e9c: 0x1024e9c: lui   a0, 0x10000
+// 0x01024eac: 0x1024eac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01024ea0: 0x1024ea0: subu  v0, a1, v0
+// 0x01024eb0: 0x1024eb0: subu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc 5
-// 0x01024ea4: 0x1024ea4: addiu a0, a0, -29212
+// 0x01024eb4: 0x1024eb4: addiu a0, a0, -29212
 	ldloc.1
 	ldc.i4 -29212
 	add
 	stloc.1
-// 0x01024ea8: 0x1024ea8: addu  a1, s2, zero
+// 0x01024eb8: 0x1024eb8: addu  a1, s2, zero
 	ldloc 13
 	stloc.2
-// 0x01024eac: 0x1024eac: jal   0x101bb50 sw    v0, 56(sp)
+// 0x01024ebc: 0x1024ebc: jal   0x101bb60 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4645,12 +4645,12 @@ L_1024df8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024eb4: 0x1024eb4: lw    v1, 124(sp)
+// 0x01024ec4: 0x1024ec4: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4659,30 +4659,30 @@ L_1024df8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024eb8: 0x1024eb8: addiu a1, sp, 52
+// 0x01024ec8: 0x1024ec8: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x01024ebc: 0x1024ebc: addu  a0, v1, zero
+// 0x01024ecc: 0x1024ecc: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01024ec0: 0x1024ec0: addu  a2, zero, zero
+// 0x01024ed0: 0x1024ed0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01024ec4: 0x1024ec4: j	 0x1024f28 addu  a3, zero, zero
+// 0x01024ed4: 0x1024ed4: j	 0x1024f38 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_1024f28
+	br L_1024f38
 // --- basic block ---
-L_1024ecc:
-// 0x01024ecc: 0x1024ecc: lui   a2, 0x10000
+L_1024edc:
+// 0x01024edc: 0x1024edc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01024ed0: 0x1024ed0: addu  a0, zero, zero
+// 0x01024ee0: 0x1024ee0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01024ed4: 0x1024ed4: jal   0x10a1918 addiu a2, a2, -29196
+// 0x01024ee4: 0x1024ee4: jal   0x10a1f60 addiu a2, a2, -29196
 	ldloc.3
 	ldc.i4 -29196
 	add
@@ -4692,18 +4692,18 @@ L_1024ecc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024edc: 0x1024edc: beq   v0, zero, 0x1024f38 addu  v1, v0, zero
+// 0x01024eec: 0x1024eec: beq   v0, zero, 0x1024f48 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 6
-	brfalse L_1024f38
+	brfalse L_1024f48
 // --- basic block ---
-// 0x01024ee4: 0x1024ee4: lw    v0, 60(sp)
+// 0x01024ef4: 0x1024ef4: lw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4712,7 +4712,7 @@ L_1024ecc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024ee8: 0x1024ee8: lw    a1, 64(sp)
+// 0x01024ef8: 0x1024ef8: lw    a1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4721,15 +4721,15 @@ L_1024ecc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024eec: 0x1024eec: addu  a0, v1, zero
+// 0x01024efc: 0x1024efc: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01024ef0: 0x1024ef0: addiu v0, v0, -3
+// 0x01024f00: 0x1024f00: addiu v0, v0, -3
 	ldloc 5
 	ldc.i4.s -3
 	add
 	stloc 5
-// 0x01024ef4: 0x1024ef4: sw    v1, 124(sp)
+// 0x01024f04: 0x1024f04: sw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4738,7 +4738,7 @@ L_1024ecc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01024ef8: 0x1024ef8: sw    a1, 120(sp)
+// 0x01024f08: 0x1024f08: sw    a1, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4747,7 +4747,7 @@ L_1024ecc:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01024efc: 0x1024efc: jal   0x104e020 sw    v0, 52(sp)
+// 0x01024f0c: 0x1024f0c: jal   0x104e030 sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4757,12 +4757,12 @@ L_1024ecc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024f04: 0x1024f04: lw    a1, 120(sp)
+// 0x01024f14: 0x1024f14: lw    a1, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4771,7 +4771,7 @@ L_1024ecc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01024f08: 0x1024f08: lw    v1, 124(sp)
+// 0x01024f18: 0x1024f18: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4780,31 +4780,31 @@ L_1024ecc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024f0c: 0x1024f0c: addiu a1, a1, 5
+// 0x01024f1c: 0x1024f1c: addiu a1, a1, 5
 	ldloc.2
 	ldc.i4.5
 	add
 	stloc.2
-// 0x01024f10: 0x1024f10: subu  v0, a1, v0
+// 0x01024f20: 0x1024f20: subu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc 5
-// 0x01024f14: 0x1024f14: addu  a0, v1, zero
+// 0x01024f24: 0x1024f24: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01024f18: 0x1024f18: addiu a1, sp, 52
+// 0x01024f28: 0x1024f28: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x01024f1c: 0x1024f1c: addu  a2, zero, zero
+// 0x01024f2c: 0x1024f2c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01024f20: 0x1024f20: addu  a3, zero, zero
+// 0x01024f30: 0x1024f30: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01024f24: 0x1024f24: sw    v0, 56(sp)
+// 0x01024f34: 0x1024f34: sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4813,8 +4813,8 @@ L_1024ecc:
 	add
 	ldloc 5
 	stelem.i4
-L_1024f28:
-// 0x01024f28: 0x1024f28: jal   0x104f4a8 addiu s1, s1, 1
+L_1024f38:
+// 0x01024f38: 0x1024f38: jal   0x104f4b8 addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -4824,19 +4824,19 @@ L_1024f28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024f30: 0x1024f30: j	 0x1024f50 sll   zero, zero, 0
-	br L_1024f50
+// 0x01024f40: 0x1024f40: j	 0x1024f60 sll   zero, zero, 0
+	br L_1024f60
 // --- basic block ---
-L_1024f38:
-// 0x01024f38: 0x1024f38: lui   a0, 0x10000
+L_1024f48:
+// 0x01024f48: 0x1024f48: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01024f3c: 0x1024f3c: lw    a2, 24(sp)
+// 0x01024f4c: 0x1024f4c: lw    a2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4845,12 +4845,12 @@ L_1024f38:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01024f40: 0x1024f40: addiu a0, a0, 2260
+// 0x01024f50: 0x1024f50: addiu a0, a0, 2256
 	ldloc.1
-	ldc.i4 2260
+	ldc.i4 2256
 	add
 	stloc.1
-// 0x01024f44: 0x1024f44: jal   0x101bb50 addu  a1, s2, zero
+// 0x01024f54: 0x1024f54: jal   0x101bb60 addu  a1, s2, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -4858,19 +4858,19 @@ L_1024f38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1024f4c:
-// 0x01024f4c: 0x1024f4c: addiu s1, s1, 1
+L_1024f5c:
+// 0x01024f5c: 0x1024f5c: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1024f50:
-// 0x01024f50: 0x1024f50: lw    v1, 88(sp)
+L_1024f60:
+// 0x01024f60: 0x1024f60: lw    v1, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4879,66 +4879,66 @@ L_1024f50:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01024f54: 0x1024f54: sll   zero, zero, 0
-// 0x01024f58: 0x1024f58: slt   v0, s1, v1
+// 0x01024f64: 0x1024f64: sll   zero, zero, 0
+// 0x01024f68: 0x1024f68: slt   v0, s1, v1
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 5
-// 0x01024f5c: 0x1024f5c: bne   v0, zero, 0x1024d7c sll   zero, zero, 0
+// 0x01024f6c: 0x1024f6c: bne   v0, zero, 0x1024d8c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1024d7c
+	brtrue L_1024d8c
 // --- basic block ---
-L_1024f64:
-// 0x01024f64: 0x1024f64: addiu s6, s6, -1
+L_1024f74:
+// 0x01024f74: 0x1024f74: addiu s6, s6, -1
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 14
-L_1024f68:
-// 0x01024f68: 0x1024f68: addiu s3, s3, -4
+L_1024f78:
+// 0x01024f78: 0x1024f78: addiu s3, s3, -4
 	ldloc 12
 	ldc.i4.s -4
 	add
 	stloc 12
-L_1024f6c:
-// 0x01024f6c: 0x1024f6c: bgez  s6, 0x1024d28 sll   zero, zero, 0
+L_1024f7c:
+// 0x01024f7c: 0x1024f7c: bgez  s6, 0x1024d38 sll   zero, zero, 0
 	ldloc 14
 	ldc.i4.s 0
-	bge L_1024d28
+	bge L_1024d38
 // --- basic block ---
-// 0x01024f74: 0x1024f74: jal   0x10a6f18 sll   zero, zero, 0
+// 0x01024f84: 0x1024f84: jal   0x10a7560 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_color_roads_10a6f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_color_roads_10a7560(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024f7c: 0x1024f7c: beq   v0, zero, 0x1025364 lui   a0, 0x1020000
+// 0x01024f8c: 0x1024f8c: beq   v0, zero, 0x1025374 lui   a0, 0x1020000
 	ldloc 5
 	ldc.i4 16908288
 	stloc.1
-	brfalse L_1025364
+	brfalse L_1025374
 // --- basic block ---
-// 0x01024f84: 0x1024f84: jal   0x108289c lui   s2, 0x30000
+// 0x01024f94: 0x1024f94: jal   0x1082ec0 lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 13
-	call int32 Cibyl98::RTTrafficInfo_Count_108289c()
+	call int32 Cibyl98::RTTrafficInfo_Count_1082ec0()
 	stloc 5
 // --- basic block ---
-// 0x01024f8c: 0x1024f8c: addiu s2, s2, 28320
+// 0x01024f9c: 0x1024f9c: addiu s2, s2, 28784
 	ldloc 13
-	ldc.i4 28320
+	ldc.i4 28784
 	add
 	stloc 13
-// 0x01024f90: 0x1024f90: lui   s8, 0xe0000
+// 0x01024fa0: 0x1024fa0: lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 19
-// 0x01024f94: 0x1024f94: sw    v0, 88(sp)
+// 0x01024fa4: 0x1024fa4: sw    v0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4947,44 +4947,44 @@ L_1024f6c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01024f98: 0x1024f98: addu  s3, zero, zero
+// 0x01024fa8: 0x1024fa8: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x01024f9c: 0x1024f9c: addiu s1, s8, 29604
+// 0x01024fac: 0x1024fac: addiu s1, s8, 30068
 	ldloc 19
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x01024fa0: 0x1024fa0: addiu s4, sp, 60
+// 0x01024fb0: 0x1024fb0: addiu s4, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 15
-// 0x01024fa4: 0x1024fa4: lui   s7, 0x0
+// 0x01024fb4: 0x1024fb4: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 18
-// 0x01024fa8: 0x1024fa8: lui   s6, 0x20000
+// 0x01024fb8: 0x1024fb8: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x01024fac: 0x1024fac: j	 0x1025350 addu  s5, s2, zero
+// 0x01024fbc: 0x1024fbc: j	 0x1025360 addu  s5, s2, zero
 	ldloc 13
 	stloc 17
-	br L_1025350
+	br L_1025360
 // --- basic block ---
-L_1024fb4:
-// 0x01024fb4: 0x1024fb4: jal   0x1082934 addu  a0, s3, zero
+L_1024fc4:
+// 0x01024fc4: 0x1024fc4: jal   0x1082f58 addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
-	call int32 Cibyl98::RTTrafficInfo_Get_1082934(int32)
+	call int32 Cibyl98::RTTrafficInfo_Get_1082f58(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024fbc: 0x1024fbc: addu  s0, v0, zero
+// 0x01024fcc: 0x1024fcc: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01024fc0: 0x1024fc0: lw    v0, 12(v0)
+// 0x01024fd0: 0x1024fd0: lw    v0, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4993,55 +4993,55 @@ L_1024fb4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01024fc4: 0x1024fc4: sll   zero, zero, 0
-// 0x01024fc8: 0x1024fc8: sll   v0, v0, 2
+// 0x01024fd4: 0x1024fd4: sll   zero, zero, 0
+// 0x01024fd8: 0x1024fd8: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01024fcc: 0x1024fcc: addu  v1, v0, s2
+// 0x01024fdc: 0x1024fdc: addu  v1, v0, s2
 	ldloc 5
 	ldloc 13
 	add
 	stloc 6
-// 0x01024fd0: 0x1024fd0: lw    a0, 0(v1)
+// 0x01024fe0: 0x1024fe0: lw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01024fd4: 0x1024fd4: sll   zero, zero, 0
-// 0x01024fd8: 0x1024fd8: bne   a0, zero, 0x1025008 lui   a0, 0x20000
+// 0x01024fe4: 0x1024fe4: sll   zero, zero, 0
+// 0x01024fe8: 0x1024fe8: bne   a0, zero, 0x1025018 lui   a0, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1025008
+	brtrue L_1025018
 // --- basic block ---
-// 0x01024fe0: 0x1024fe0: addiu a0, a0, 24888
+// 0x01024ff0: 0x1024ff0: addiu a0, a0, 25352
 	ldloc.1
-	ldc.i4 24888
+	ldc.i4 25352
 	add
 	stloc.1
-// 0x01024fe4: 0x1024fe4: addu  v0, v0, a0
+// 0x01024ff4: 0x1024ff4: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01024fe8: 0x1024fe8: lw    a2, 0(v0)
+// 0x01024ff8: 0x1024ff8: lw    a2, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01024fec: 0x1024fec: addu  a0, zero, zero
+// 0x01024ffc: 0x1024ffc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01024ff0: 0x1024ff0: addiu a1, zero, 3
+// 0x01025000: 0x1025000: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01024ff4: 0x1024ff4: jal   0x10a1918 sw    v1, 124(sp)
+// 0x01025004: 0x1025004: jal   0x10a1f60 sw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5055,12 +5055,12 @@ L_1024fb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01024ffc: 0x1024ffc: lw    v1, 124(sp)
+// 0x0102500c: 0x102500c: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5069,16 +5069,16 @@ L_1024fb4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025000: 0x1025000: sll   zero, zero, 0
-// 0x01025004: 0x1025004: sw    v0, 0(v1)
+// 0x01025010: 0x1025010: sll   zero, zero, 0
+// 0x01025014: 0x1025014: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1025008:
-// 0x01025008: 0x1025008: lw    a3, 56(s1)
+L_1025018:
+// 0x01025018: 0x1025018: lw    a3, 56(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5087,7 +5087,7 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102500c: 0x102500c: lw    v0, 2436(s0)
+// 0x0102501c: 0x102501c: lw    v0, 2436(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5096,17 +5096,17 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025010: 0x1025010: sll   zero, zero, 0
-// 0x01025014: 0x1025014: slt   v0, a3, v0
+// 0x01025020: 0x1025020: sll   zero, zero, 0
+// 0x01025024: 0x1025024: slt   v0, a3, v0
 	ldloc 4
 	ldloc 5
 	clt
 	stloc 5
-// 0x01025018: 0x1025018: bne   v0, zero, 0x102534c sll   zero, zero, 0
+// 0x01025028: 0x1025028: bne   v0, zero, 0x102535c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102534c
+	brtrue L_102535c
 // --- basic block ---
-// 0x01025020: 0x1025020: lw    a2, 64(s1)
+// 0x01025030: 0x1025030: lw    a2, 64(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5115,7 +5115,7 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01025024: 0x1025024: lw    v0, 2428(s0)
+// 0x01025034: 0x1025034: lw    v0, 2428(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5124,17 +5124,17 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025028: 0x1025028: sll   zero, zero, 0
-// 0x0102502c: 0x102502c: slt   v0, v0, a2
+// 0x01025038: 0x1025038: sll   zero, zero, 0
+// 0x0102503c: 0x102503c: slt   v0, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 5
-// 0x01025030: 0x1025030: bne   v0, zero, 0x102534c sll   zero, zero, 0
+// 0x01025040: 0x1025040: bne   v0, zero, 0x102535c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102534c
+	brtrue L_102535c
 // --- basic block ---
-// 0x01025038: 0x1025038: lw    a1, 60(s1)
+// 0x01025048: 0x1025048: lw    a1, 60(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5143,7 +5143,7 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102503c: 0x102503c: lw    v0, 2440(s0)
+// 0x0102504c: 0x102504c: lw    v0, 2440(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5152,17 +5152,17 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025040: 0x1025040: sll   zero, zero, 0
-// 0x01025044: 0x1025044: slt   v0, a1, v0
+// 0x01025050: 0x1025050: sll   zero, zero, 0
+// 0x01025054: 0x1025054: slt   v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 5
-// 0x01025048: 0x1025048: bne   v0, zero, 0x102534c sll   zero, zero, 0
+// 0x01025058: 0x1025058: bne   v0, zero, 0x102535c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102534c
+	brtrue L_102535c
 // --- basic block ---
-// 0x01025050: 0x1025050: lw    a0, 68(s1)
+// 0x01025060: 0x1025060: lw    a0, 68(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5171,7 +5171,7 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01025054: 0x1025054: lw    v0, 2432(s0)
+// 0x01025064: 0x1025064: lw    v0, 2432(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5180,25 +5180,25 @@ L_1025008:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025058: 0x1025058: sll   zero, zero, 0
-// 0x0102505c: 0x102505c: slt   v0, v0, a0
+// 0x01025068: 0x1025068: sll   zero, zero, 0
+// 0x0102506c: 0x102506c: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x01025060: 0x1025060: bne   v0, zero, 0x102534c addu  v1, s0, zero
+// 0x01025070: 0x1025070: bne   v0, zero, 0x102535c addu  v1, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc 6
-	brtrue L_102534c
+	brtrue L_102535c
 // --- basic block ---
-// 0x01025068: 0x1025068: j	 0x1025138 addu  v0, zero, zero
+// 0x01025078: 0x1025078: j	 0x1025148 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1025138
+	br L_1025148
 // --- basic block ---
-L_1025070:
-// 0x01025070: 0x1025070: lw    t0, 828(v1)
+L_1025080:
+// 0x01025080: 0x1025080: lw    t0, 828(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5207,26 +5207,26 @@ L_1025070:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01025074: 0x1025074: sll   zero, zero, 0
-// 0x01025078: 0x1025078: slt   t2, t0, a2
+// 0x01025084: 0x1025084: sll   zero, zero, 0
+// 0x01025088: 0x1025088: slt   t2, t0, a2
 	ldloc 11
 	ldloc.3
 	clt
 	stloc 20
-// 0x0102507c: 0x102507c: slt   t0, a3, t0
+// 0x0102508c: 0x102508c: slt   t0, a3, t0
 	ldloc 4
 	ldloc 11
 	clt
 	stloc 11
-// 0x01025080: 0x1025080: bne   t0, zero, 0x10250b0 sll   zero, zero, 0
+// 0x01025090: 0x1025090: bne   t0, zero, 0x10250c0 sll   zero, zero, 0
 	ldloc 11
-	brtrue L_10250b0
+	brtrue L_10250c0
 // --- basic block ---
-// 0x01025088: 0x1025088: bne   t2, zero, 0x10250b0 sll   zero, zero, 0
+// 0x01025098: 0x1025098: bne   t2, zero, 0x10250c0 sll   zero, zero, 0
 	ldloc 20
-	brtrue L_10250b0
+	brtrue L_10250c0
 // --- basic block ---
-// 0x01025090: 0x1025090: lw    t0, 832(v1)
+// 0x010250a0: 0x10250a0: lw    t0, 832(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5235,55 +5235,55 @@ L_1025070:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01025094: 0x1025094: sll   zero, zero, 0
-// 0x01025098: 0x1025098: slt   t2, t0, a0
+// 0x010250a4: 0x10250a4: sll   zero, zero, 0
+// 0x010250a8: 0x10250a8: slt   t2, t0, a0
 	ldloc 11
 	ldloc.1
 	clt
 	stloc 20
-// 0x0102509c: 0x102509c: slt   t0, a1, t0
+// 0x010250ac: 0x10250ac: slt   t0, a1, t0
 	ldloc.2
 	ldloc 11
 	clt
 	stloc 11
-// 0x010250a0: 0x10250a0: bne   t0, zero, 0x10250b0 sll   zero, zero, 0
+// 0x010250b0: 0x10250b0: bne   t0, zero, 0x10250c0 sll   zero, zero, 0
 	ldloc 11
-	brtrue L_10250b0
+	brtrue L_10250c0
 // --- basic block ---
-// 0x010250a8: 0x10250a8: beq   t2, zero, 0x10250bc sll   zero, zero, 0
+// 0x010250b8: 0x10250b8: beq   t2, zero, 0x10250cc sll   zero, zero, 0
 	ldloc 20
-	brfalse L_10250bc
+	brfalse L_10250cc
 // --- basic block ---
-L_10250b0:
-// 0x010250b0: 0x10250b0: addiu v0, v0, 1
+L_10250c0:
+// 0x010250c0: 0x10250c0: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010250b4: 0x10250b4: j	 0x1025140 addiu v1, v1, 8
+// 0x010250c4: 0x10250c4: j	 0x1025150 addiu v1, v1, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-	br L_1025140
+	br L_1025150
 // --- basic block ---
-L_10250bc:
-// 0x010250bc: 0x10250bc: addiu v0, v0, 103
+L_10250cc:
+// 0x010250cc: 0x10250cc: addiu v0, v0, 103
 	ldloc 5
 	ldc.i4.s 103
 	add
 	stloc 5
-// 0x010250c0: 0x10250c0: sll   v0, v0, 3
+// 0x010250d0: 0x10250d0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010250c4: 0x10250c4: addu  v0, s0, v0
+// 0x010250d4: 0x10250d4: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x010250c8: 0x10250c8: lw    a2, 4(v0)
+// 0x010250d8: 0x10250d8: lw    a2, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5292,7 +5292,7 @@ L_10250bc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010250cc: 0x10250cc: lw    a0, 80(s1)
+// 0x010250dc: 0x10250dc: lw    a0, 80(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5301,7 +5301,7 @@ L_10250bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010250d0: 0x10250d0: lw    a1, 32(s1)
+// 0x010250e0: 0x10250e0: lw    a1, 32(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5310,17 +5310,17 @@ L_10250bc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010250d4: 0x10250d4: subu  a2, a2, a0
+// 0x010250e4: 0x10250e4: subu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	sub
 	stloc.3
-// 0x010250d8: 0x10250d8: div   a2, a1
+// 0x010250e8: 0x10250e8: div   a2, a1
 	ldloc.3
 	ldloc.2
 	div
 	stloc 10
-// 0x010250dc: 0x10250dc: lw    v1, 8(v0)
+// 0x010250ec: 0x10250ec: lw    v1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5329,7 +5329,7 @@ L_10250bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010250e0: 0x10250e0: lw    a3, 76(s1)
+// 0x010250f0: 0x10250f0: lw    a3, 76(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5338,7 +5338,7 @@ L_10250bc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010250e4: 0x10250e4: lw    v0, 36(s1)
+// 0x010250f4: 0x10250f4: lw    v0, 36(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5347,23 +5347,23 @@ L_10250bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010250e8: 0x10250e8: subu  v1, a3, v1
+// 0x010250f8: 0x10250f8: subu  v1, a3, v1
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 6
-// 0x010250ec: 0x10250ec: addiu a0, zero, 1
+// 0x010250fc: 0x10250fc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010250f0: 0x10250f0: addiu a1, sp, 52
+// 0x01025100: 0x1025100: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x010250f4: 0x10250f4: mflo  lo
+// 0x01025104: 0x1025104: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x010250f8: 0x10250f8: sw    a2, 52(sp)
+// 0x01025108: 0x1025108: sw    a2, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5372,16 +5372,16 @@ L_10250bc:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010250fc: 0x10250fc: sll   zero, zero, 0
-// 0x01025100: 0x1025100: div   v1, v0
+// 0x0102510c: 0x102510c: sll   zero, zero, 0
+// 0x01025110: 0x1025110: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 10
-// 0x01025104: 0x1025104: mflo  lo
+// 0x01025114: 0x1025114: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01025108: 0x1025108: jal   0x10072a4 sw    v1, 56(sp)
+// 0x01025118: 0x1025118: jal   0x10072b4 sw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5395,30 +5395,30 @@ L_10250bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025110: 0x1025110: lui   v1, 0xe0000
+// 0x01025120: 0x1025120: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x01025114: 0x1025114: lw    v0, 29728(v1)
+// 0x01025124: 0x1025124: lw    v0, 30192(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025118: 0x1025118: sll   zero, zero, 0
-// 0x0102511c: 0x102511c: addiu v0, v0, 1344
+// 0x01025128: 0x1025128: sll   zero, zero, 0
+// 0x0102512c: 0x102512c: addiu v0, v0, 1344
 	ldloc 5
 	ldc.i4 1344
 	add
 	stloc 5
-// 0x01025120: 0x1025120: lw    v1, 8(v0)
+// 0x01025130: 0x1025130: lw    v1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5427,16 +5427,16 @@ L_10250bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025124: 0x1025124: sll   zero, zero, 0
-// 0x01025128: 0x1025128: beq   v1, zero, 0x102534c sll   zero, zero, 0
+// 0x01025134: 0x1025134: sll   zero, zero, 0
+// 0x01025138: 0x1025138: beq   v1, zero, 0x102535c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_102534c
+	brfalse L_102535c
 // --- basic block ---
-// 0x01025130: 0x1025130: j	 0x1025154 sll   zero, zero, 0
-	br L_1025154
+// 0x01025140: 0x1025140: j	 0x1025164 sll   zero, zero, 0
+	br L_1025164
 // --- basic block ---
-L_1025138:
-// 0x01025138: 0x1025138: lw    t1, 824(s0)
+L_1025148:
+// 0x01025148: 0x1025148: lw    t1, 824(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5445,35 +5445,35 @@ L_1025138:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0102513c: 0x102513c: sll   zero, zero, 0
-L_1025140:
-// 0x01025140: 0x1025140: slt   t0, v0, t1
+// 0x0102514c: 0x102514c: sll   zero, zero, 0
+L_1025150:
+// 0x01025150: 0x1025150: slt   t0, v0, t1
 	ldloc 5
 	ldloc 16
 	clt
 	stloc 11
-// 0x01025144: 0x1025144: bne   t0, zero, 0x1025070 sll   zero, zero, 0
+// 0x01025154: 0x1025154: bne   t0, zero, 0x1025080 sll   zero, zero, 0
 	ldloc 11
-	brtrue L_1025070
+	brtrue L_1025080
 // --- basic block ---
-// 0x0102514c: 0x102514c: j	 0x1025350 addiu s3, s3, 1
+// 0x0102515c: 0x102515c: j	 0x1025360 addiu s3, s3, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-	br L_1025350
+	br L_1025360
 // --- basic block ---
-L_1025154:
-// 0x01025154: 0x1025154: lw    a0, 29604(s8)
+L_1025164:
+// 0x01025164: 0x1025164: lw    a0, 30068(s8)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x01025158: 0x1025158: lw    v1, 16(v0)
+// 0x01025168: 0x1025168: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5482,17 +5482,17 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102515c: 0x102515c: sll   zero, zero, 0
-// 0x01025160: 0x1025160: slt   v1, a0, v1
+// 0x0102516c: 0x102516c: sll   zero, zero, 0
+// 0x01025170: 0x1025170: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01025164: 0x1025164: beq   v1, zero, 0x102534c sll   zero, zero, 0
+// 0x01025174: 0x1025174: beq   v1, zero, 0x102535c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_102534c
+	brfalse L_102535c
 // --- basic block ---
-// 0x0102516c: 0x102516c: lw    v1, 120(v0)
+// 0x0102517c: 0x102517c: lw    v1, 120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5501,12 +5501,12 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025170: 0x1025170: sll   zero, zero, 0
-// 0x01025174: 0x1025174: beq   v1, zero, 0x102534c sll   zero, zero, 0
+// 0x01025180: 0x1025180: sll   zero, zero, 0
+// 0x01025184: 0x1025184: beq   v1, zero, 0x102535c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_102534c
+	brfalse L_102535c
 // --- basic block ---
-// 0x0102517c: 0x102517c: lw    v0, 48(v0)
+// 0x0102518c: 0x102518c: lw    v0, 48(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5515,12 +5515,12 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025180: 0x1025180: sll   zero, zero, 0
-// 0x01025184: 0x1025184: beq   v0, zero, 0x102534c sll   zero, zero, 0
+// 0x01025190: 0x1025190: sll   zero, zero, 0
+// 0x01025194: 0x1025194: beq   v0, zero, 0x102535c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102534c
+	brfalse L_102535c
 // --- basic block ---
-// 0x0102518c: 0x102518c: lw    v0, 12(s0)
+// 0x0102519c: 0x102519c: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5529,7 +5529,7 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025190: 0x1025190: lw    a1, 52(sp)
+// 0x010251a0: 0x10251a0: lw    a1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5538,24 +5538,24 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01025194: 0x1025194: sll   v0, v0, 2
+// 0x010251a4: 0x10251a4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01025198: 0x1025198: addu  v0, v0, s2
+// 0x010251a8: 0x10251a8: addu  v0, v0, s2
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-// 0x0102519c: 0x102519c: lw    a0, 0(v0)
+// 0x010251ac: 0x10251ac: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010251a0: 0x10251a0: jal   0x104dffc sw    a1, 120(sp)
+// 0x010251b0: 0x10251b0: jal   0x104e00c sw    a1, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5565,20 +5565,20 @@ L_1025154:
 	ldloc.2
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010251a8: 0x10251a8: addiu a0, zero, 2
+// 0x010251b8: 0x10251b8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010251ac: 0x10251ac: div   v0, a0
+// 0x010251bc: 0x10251bc: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 10
-// 0x010251b0: 0x10251b0: lw    a1, 120(sp)
+// 0x010251c0: 0x10251c0: lw    a1, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5587,7 +5587,7 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010251b4: 0x10251b4: lw    v1, 56(sp)
+// 0x010251c4: 0x10251c4: lw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5596,8 +5596,8 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010251b8: 0x10251b8: sll   zero, zero, 0
-// 0x010251bc: 0x10251bc: sw    v1, 124(sp)
+// 0x010251c8: 0x10251c8: sll   zero, zero, 0
+// 0x010251cc: 0x10251cc: sw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5606,15 +5606,15 @@ L_1025154:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010251c0: 0x10251c0: mflo  lo
+// 0x010251d0: 0x10251d0: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010251c4: 0x10251c4: subu  a1, a1, v0
+// 0x010251d4: 0x10251d4: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x010251c8: 0x10251c8: sw    a1, 60(sp)
+// 0x010251d8: 0x10251d8: sw    a1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5623,7 +5623,7 @@ L_1025154:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010251cc: 0x10251cc: lw    v0, 12(s0)
+// 0x010251dc: 0x10251dc: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5632,32 +5632,32 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010251d0: 0x10251d0: sll   zero, zero, 0
-// 0x010251d4: 0x10251d4: sll   v0, v0, 2
+// 0x010251e0: 0x10251e0: sll   zero, zero, 0
+// 0x010251e4: 0x10251e4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010251d8: 0x10251d8: addu  v0, v0, s2
+// 0x010251e8: 0x10251e8: addu  v0, v0, s2
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-// 0x010251dc: 0x10251dc: lw    a0, 0(v0)
+// 0x010251ec: 0x10251ec: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010251e0: 0x10251e0: jal   0x104e020 sll   zero, zero, 0
+// 0x010251f0: 0x10251f0: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010251e8: 0x10251e8: lw    v1, 124(sp)
+// 0x010251f8: 0x10251f8: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5666,15 +5666,15 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010251ec: 0x10251ec: addiu a2, zero, 225
+// 0x010251fc: 0x10251fc: addiu a2, zero, 225
 	ldc.i4 225
 	stloc.3
-// 0x010251f0: 0x10251f0: subu  v0, v1, v0
+// 0x01025200: 0x1025200: subu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 5
-// 0x010251f4: 0x10251f4: sw    v0, 64(sp)
+// 0x01025204: 0x1025204: sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5683,7 +5683,7 @@ L_1025154:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010251f8: 0x10251f8: lw    v0, 12(s0)
+// 0x01025208: 0x1025208: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5692,27 +5692,27 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010251fc: 0x10251fc: addu  a3, zero, zero
+// 0x0102520c: 0x102520c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01025200: 0x1025200: sll   v0, v0, 2
+// 0x01025210: 0x1025210: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01025204: 0x1025204: addu  v0, v0, s2
+// 0x01025214: 0x1025214: addu  v0, v0, s2
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-// 0x01025208: 0x1025208: lw    a0, 0(v0)
+// 0x01025218: 0x1025218: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102520c: 0x102520c: jal   0x104f4a8 addu  a1, s4, zero
+// 0x0102521c: 0x102521c: jal   0x104f4b8 addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -5720,15 +5720,15 @@ L_1025154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025214: 0x1025214: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x01025224: 0x1025224: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01025218: 0x1025218: lw    a2, 8(s0)
+// 0x01025228: 0x1025228: lw    a2, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5737,14 +5737,14 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102521c: 0x102521c: addiu a0, sp, 68
+// 0x0102522c: 0x102522c: addiu a0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.1
-// 0x01025220: 0x1025220: jal   0x1000f64 addiu a1, a1, -13884
+// 0x01025230: 0x1025230: jal   0x1000f64 addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
 	ldloc.0
@@ -5757,7 +5757,7 @@ L_1025154:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025228: 0x1025228: lw    a0, 6048(s7)
+// 0x01025238: 0x1025238: lw    a0, 6048(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
@@ -5766,7 +5766,7 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102522c: 0x102522c: lw    v0, 52(sp)
+// 0x0102523c: 0x102523c: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5775,12 +5775,12 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025230: 0x1025230: and   a0, a0, s6
+// 0x01025240: 0x1025240: and   a0, a0, s6
 	ldloc.1
 	ldloc 14
 	and
 	stloc.1
-// 0x01025234: 0x1025234: lw    v1, 56(sp)
+// 0x01025244: 0x1025244: lw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5789,16 +5789,16 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025238: 0x1025238: beq   a0, zero, 0x1025270 sll   zero, zero, 0
+// 0x01025248: 0x1025248: beq   a0, zero, 0x1025280 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1025270
+	brfalse L_1025280
 // --- basic block ---
-// 0x01025240: 0x1025240: addiu v0, v0, 10
+// 0x01025250: 0x1025250: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x01025244: 0x1025244: sw    v0, 60(sp)
+// 0x01025254: 0x1025254: sw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5807,7 +5807,7 @@ L_1025154:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01025248: 0x1025248: lw    v0, 12(s0)
+// 0x01025258: 0x1025258: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5816,7 +5816,7 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102524c: 0x102524c: sw    v1, 124(sp)
+// 0x0102525c: 0x102525c: sw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5825,31 +5825,31 @@ L_1025154:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01025250: 0x1025250: sll   v0, v0, 2
+// 0x01025260: 0x1025260: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01025254: 0x1025254: addu  v0, s5, v0
+// 0x01025264: 0x1025264: addu  v0, s5, v0
 	ldloc 17
 	ldloc 5
 	add
 	stloc 5
-// 0x01025258: 0x1025258: lw    a0, 0(v0)
+// 0x01025268: 0x1025268: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102525c: 0x102525c: jal   0x104e020 sll   zero, zero, 0
+// 0x0102526c: 0x102526c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025264: 0x1025264: lw    v1, 124(sp)
+// 0x01025274: 0x1025274: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5858,20 +5858,20 @@ L_1025154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025268: 0x1025268: j	 0x10252a0 addiu v1, v1, 20
+// 0x01025278: 0x1025278: j	 0x10252b0 addiu v1, v1, 20
 	ldloc 6
 	ldc.i4.s 20
 	add
 	stloc 6
-	br L_10252a0
+	br L_10252b0
 // --- basic block ---
-L_1025270:
-// 0x01025270: 0x1025270: addiu v0, v0, 10
+L_1025280:
+// 0x01025280: 0x1025280: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x01025274: 0x1025274: sw    v0, 60(sp)
+// 0x01025284: 0x1025284: sw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5880,7 +5880,7 @@ L_1025270:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01025278: 0x1025278: lw    v0, 12(s0)
+// 0x01025288: 0x1025288: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5889,7 +5889,7 @@ L_1025270:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102527c: 0x102527c: sw    v1, 124(sp)
+// 0x0102528c: 0x102528c: sw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5898,31 +5898,31 @@ L_1025270:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01025280: 0x1025280: sll   v0, v0, 2
+// 0x01025290: 0x1025290: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01025284: 0x1025284: addu  v0, s5, v0
+// 0x01025294: 0x1025294: addu  v0, s5, v0
 	ldloc 17
 	ldloc 5
 	add
 	stloc 5
-// 0x01025288: 0x1025288: lw    a0, 0(v0)
+// 0x01025298: 0x1025298: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102528c: 0x102528c: jal   0x104e020 sll   zero, zero, 0
+// 0x0102529c: 0x102529c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025294: 0x1025294: lw    v1, 124(sp)
+// 0x010252a4: 0x10252a4: lw    v1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5931,30 +5931,30 @@ L_1025270:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025298: 0x1025298: sll   zero, zero, 0
-// 0x0102529c: 0x102529c: addiu v1, v1, 14
+// 0x010252a8: 0x10252a8: sll   zero, zero, 0
+// 0x010252ac: 0x10252ac: addiu v1, v1, 14
 	ldloc 6
 	ldc.i4.s 14
 	add
 	stloc 6
-L_10252a0:
-// 0x010252a0: 0x10252a0: lui   a0, 0x10000
+L_10252b0:
+// 0x010252b0: 0x10252b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010252a4: 0x10252a4: subu  v1, v1, v0
+// 0x010252b4: 0x10252b4: subu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 6
-// 0x010252a8: 0x10252a8: addu  a1, zero, zero
+// 0x010252b8: 0x10252b8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010252ac: 0x10252ac: addiu a0, a0, -14896
+// 0x010252bc: 0x10252bc: addiu a0, a0, -14900
 	ldloc.1
-	ldc.i4 -14896
+	ldc.i4 -14900
 	add
 	stloc.1
-// 0x010252b0: 0x10252b0: jal   0x104ef00 sw    v1, 64(sp)
+// 0x010252c0: 0x10252c0: jal   0x104ef10 sw    v1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5968,15 +5968,15 @@ L_10252a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010252b8: 0x10252b8: lui   a0, 0x0
+// 0x010252c8: 0x10252c8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010252bc: 0x10252bc: jal   0x104edb0 addiu a0, a0, 31980
+// 0x010252cc: 0x10252cc: jal   0x104edc0 addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
@@ -5986,21 +5986,21 @@ L_10252a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010252c4: 0x10252c4: addu  a0, s4, zero
+// 0x010252d4: 0x10252d4: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x010252c8: 0x10252c8: addiu a1, zero, 3
+// 0x010252d8: 0x10252d8: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010252cc: 0x10252cc: addiu a2, zero, 14
+// 0x010252dc: 0x10252dc: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010252d0: 0x10252d0: jal   0x104ea60 addiu a3, sp, 68
+// 0x010252e0: 0x10252e0: jal   0x104ea70 addiu a3, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
@@ -6010,12 +6010,12 @@ L_10252a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010252d8: 0x10252d8: lw    a0, 6048(s7)
+// 0x010252e8: 0x10252e8: lw    a0, 6048(s7)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
@@ -6024,7 +6024,7 @@ L_10252a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010252dc: 0x10252dc: lw    v0, 52(sp)
+// 0x010252ec: 0x10252ec: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6033,12 +6033,12 @@ L_10252a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010252e0: 0x10252e0: and   a0, a0, s6
+// 0x010252f0: 0x10252f0: and   a0, a0, s6
 	ldloc.1
 	ldloc 14
 	and
 	stloc.1
-// 0x010252e4: 0x10252e4: lw    v1, 56(sp)
+// 0x010252f4: 0x10252f4: lw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6047,46 +6047,46 @@ L_10252a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010252e8: 0x10252e8: beq   a0, zero, 0x10252fc sll   zero, zero, 0
+// 0x010252f8: 0x10252f8: beq   a0, zero, 0x102530c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10252fc
+	brfalse L_102530c
 // --- basic block ---
-// 0x010252f0: 0x10252f0: addiu v0, v0, 22
+// 0x01025300: 0x1025300: addiu v0, v0, 22
 	ldloc 5
 	ldc.i4.s 22
 	add
 	stloc 5
-// 0x010252f4: 0x10252f4: j	 0x1025304 addiu v1, v1, -24
+// 0x01025304: 0x1025304: j	 0x1025314 addiu v1, v1, -24
 	ldloc 6
 	ldc.i4.s -24
 	add
 	stloc 6
-	br L_1025304
+	br L_1025314
 // --- basic block ---
-L_10252fc:
-// 0x010252fc: 0x10252fc: addiu v0, v0, 14
+L_102530c:
+// 0x0102530c: 0x102530c: addiu v0, v0, 14
 	ldloc 5
 	ldc.i4.s 14
 	add
 	stloc 5
-// 0x01025300: 0x1025300: addiu v1, v1, -18
+// 0x01025310: 0x1025310: addiu v1, v1, -18
 	ldloc 6
 	ldc.i4.s -18
 	add
 	stloc 6
-L_1025304:
-// 0x01025304: 0x1025304: lui   a0, 0x10000
+L_1025314:
+// 0x01025314: 0x1025314: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01025308: 0x1025308: addu  a1, zero, zero
+// 0x01025318: 0x1025318: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102530c: 0x102530c: addiu a0, a0, -14896
+// 0x0102531c: 0x102531c: addiu a0, a0, -14900
 	ldloc.1
-	ldc.i4 -14896
+	ldc.i4 -14900
 	add
 	stloc.1
-// 0x01025310: 0x1025310: sw    v1, 64(sp)
+// 0x01025320: 0x1025320: sw    v1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6095,7 +6095,7 @@ L_1025304:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01025314: 0x1025314: jal   0x104ef00 sw    v0, 60(sp)
+// 0x01025324: 0x1025324: jal   0x104ef10 sw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6109,15 +6109,15 @@ L_1025304:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102531c: 0x102531c: lui   a0, 0x0
+// 0x0102532c: 0x102532c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01025320: 0x1025320: jal   0x104edb0 addiu a0, a0, 31980
+// 0x01025330: 0x1025330: jal   0x104edc0 addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
@@ -6127,16 +6127,16 @@ L_1025304:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025328: 0x1025328: jal   0x1007d9c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_speed_unit_1007d9c()
+// 0x01025338: 0x1025338: jal   0x1007dac sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_speed_unit_1007dac()
 	stloc 5
 // --- basic block ---
-// 0x01025330: 0x1025330: jal   0x101cd60 addu  a0, v0, zero
+// 0x01025340: 0x1025340: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6144,21 +6144,21 @@ L_1025304:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025338: 0x1025338: addu  a3, v0, zero
+// 0x01025348: 0x1025348: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0102533c: 0x102533c: addu  a0, s4, zero
+// 0x0102534c: 0x102534c: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x01025340: 0x1025340: addiu a1, zero, 3
+// 0x01025350: 0x1025350: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01025344: 0x1025344: jal   0x104ea60 addiu a2, zero, 10
+// 0x01025354: 0x1025354: jal   0x104ea70 addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
 	ldloc.0
@@ -6166,19 +6166,19 @@ L_1025304:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102534c:
-// 0x0102534c: 0x102534c: addiu s3, s3, 1
+L_102535c:
+// 0x0102535c: 0x102535c: addiu s3, s3, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-L_1025350:
-// 0x01025350: 0x1025350: lw    a2, 88(sp)
+L_1025360:
+// 0x01025360: 0x1025360: lw    a2, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6187,22 +6187,22 @@ L_1025350:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01025354: 0x1025354: sll   zero, zero, 0
-// 0x01025358: 0x1025358: slt   v0, s3, a2
+// 0x01025364: 0x1025364: sll   zero, zero, 0
+// 0x01025368: 0x1025368: slt   v0, s3, a2
 	ldloc 12
 	ldloc.3
 	clt
 	stloc 5
-// 0x0102535c: 0x102535c: bne   v0, zero, 0x1024fb4 lui   a0, 0x1020000
+// 0x0102536c: 0x102536c: bne   v0, zero, 0x1024fc4 lui   a0, 0x1020000
 	ldloc 5
 	ldc.i4 16908288
 	stloc.1
-	brtrue L_1024fb4
+	brtrue L_1024fc4
 // --- basic block ---
-L_1025364:
-// 0x01025364: 0x1025364: jal   0x101bfd8 addiu a0, a0, 208
+L_1025374:
+// 0x01025374: 0x1025374: jal   0x101bfe8 addiu a0, a0, 224
 	ldloc.1
-	ldc.i4 208
+	ldc.i4 224
 	add
 	stloc.1
 	ldloc.0
@@ -6210,31 +6210,31 @@ L_1025364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_iterate_101bfd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_iterate_101bfe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102536c:
-// 0x0102536c: 0x102536c: jal   0x10565cc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+L_102537c:
+// 0x0102537c: 0x102537c: jal   0x10565dc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x01025374: 0x1025374: bne   v0, zero, 0x102539c lui   a0, 0x0
+// 0x01025384: 0x1025384: bne   v0, zero, 0x10253ac lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_102539c
+	brtrue L_10253ac
 // --- basic block ---
-// 0x0102537c: 0x102537c: lui   a1, 0x0
+// 0x0102538c: 0x102538c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01025380: 0x1025380: addiu a0, a0, 6068
+// 0x01025390: 0x1025390: addiu a0, a0, 6068
 	ldloc.1
 	ldc.i4 6068
 	add
 	stloc.1
-// 0x01025384: 0x1025384: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01025394: 0x1025394: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6244,71 +6244,71 @@ L_102536c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102538c: 0x102538c: beq   v0, zero, 0x102539c sll   zero, zero, 0
+// 0x0102539c: 0x102539c: beq   v0, zero, 0x10253ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102539c
+	brfalse L_10253ac
 // --- basic block ---
-// 0x01025394: 0x1025394: jal   0x101e6a8 sll   zero, zero, 0
+// 0x010253a4: 0x10253a4: jal   0x101e6b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_display_101e6a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_display_101e6b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102539c:
-// 0x0102539c: 0x102539c: jal   0x101adb4 sll   zero, zero, 0
+L_10253ac:
+// 0x010253ac: 0x10253ac: jal   0x101adc4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_update_101adb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_update_101adc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010253a4: 0x10253a4: jal   0x10565cc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+// 0x010253b4: 0x10253b4: jal   0x10565dc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x010253ac: 0x10253ac: beq   v0, zero, 0x10253e4 lui   v0, 0x0
+// 0x010253bc: 0x10253bc: beq   v0, zero, 0x10253f4 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10253e4
+	brfalse L_10253f4
 // --- basic block ---
-// 0x010253b4: 0x10253b4: jal   0x101fb3c sll   zero, zero, 0
+// 0x010253c4: 0x10253c4: jal   0x101fb4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_shade_bg_101fb3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_shade_bg_101fb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010253bc: 0x10253bc: lui   a0, 0x0
+// 0x010253cc: 0x10253cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010253c0: 0x10253c0: lui   a1, 0x0
+// 0x010253d0: 0x10253d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010253c4: 0x10253c4: addiu a0, a0, 6068
+// 0x010253d4: 0x10253d4: addiu a0, a0, 6068
 	ldloc.1
 	ldc.i4 6068
 	add
 	stloc.1
-// 0x010253c8: 0x10253c8: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010253d8: 0x10253d8: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6318,33 +6318,33 @@ L_102539c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010253d0: 0x10253d0: beq   v0, zero, 0x10253e4 lui   v0, 0x0
+// 0x010253e0: 0x10253e0: beq   v0, zero, 0x10253f4 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10253e4
+	brfalse L_10253f4
 // --- basic block ---
-// 0x010253d8: 0x10253d8: jal   0x101e6a8 sll   zero, zero, 0
+// 0x010253e8: 0x10253e8: jal   0x101e6b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_display_101e6a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_display_101e6b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010253e0: 0x10253e0: lui   v0, 0x0
+// 0x010253f0: 0x10253f0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10253e4:
-// 0x010253e4: 0x10253e4: lw    v0, 6084(v0)
+L_10253f4:
+// 0x010253f4: 0x10253f4: lw    v0, 6084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6353,8 +6353,8 @@ L_10253e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010253e8: 0x10253e8: sll   zero, zero, 0
-// 0x010253ec: 0x10253ec: jalr  v0 sll   zero, zero, 0
+// 0x010253f8: 0x10253f8: sll   zero, zero, 0
+// 0x010253fc: 0x10253fc: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -6366,124 +6366,124 @@ L_10253e4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010253f4: 0x10253f4: jal   0x1043284 sll   zero, zero, 0
+// 0x01025404: 0x1025404: jal   0x1043294 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_draw_1043284(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_draw_1043294(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010253fc: 0x10253fc: jal   0x104fa48 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa48()
+// 0x0102540c: 0x102540c: jal   0x104fa58 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_horizontal_screen_orientation_104fa58()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025404: 0x1025404: bne   v0, zero, 0x1025414 sll   zero, zero, 0
+// 0x01025414: 0x1025414: bne   v0, zero, 0x1025424 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1025414
+	brtrue L_1025424
 // --- basic block ---
-// 0x0102540c: 0x102540c: jal   0x1021ba8 sll   zero, zero, 0
+// 0x0102541c: 0x102541c: jal   0x1021bb8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_draw_sky_1021ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_draw_sky_1021bb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1025414:
-// 0x01025414: 0x1025414: jal   0x10303bc sll   zero, zero, 0
+L_1025424:
+// 0x01025424: 0x1025424: jal   0x10303cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_screen_obj_draw_10303bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_screen_obj_draw_10303cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102541c: 0x102541c: jal   0x103449c sll   zero, zero, 0
+// 0x0102542c: 0x102542c: jal   0x10344ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_alerter_display_103449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_alerter_display_10344ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025424: 0x1025424: jal   0x10166d4 sll   zero, zero, 0
+// 0x01025434: 0x1025434: jal   0x10166e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_ticker_display_10166d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_ticker_display_10166e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102542c: 0x102542c: jal   0x1053c14 sll   zero, zero, 0
+// 0x0102543c: 0x102543c: jal   0x1053c24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_display_1053c14(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_display_1053c24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025434: 0x1025434: jal   0x101a6c0 sll   zero, zero, 0
+// 0x01025444: 0x1025444: jal   0x101a6d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_display_signs_101a6c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_display_signs_101a6d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102543c: 0x102543c: lui   v0, 0x30000
+// 0x0102544c: 0x102544c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01025440: 0x1025440: lw    v0, 28236(v0)
+// 0x01025450: 0x1025450: lw    v0, 28700(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7059
+	ldc.i4 7175
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025444: 0x1025444: sll   zero, zero, 0
-// 0x01025448: 0x1025448: beq   v0, zero, 0x102552c sll   zero, zero, 0
+// 0x01025454: 0x1025454: sll   zero, zero, 0
+// 0x01025458: 0x1025458: beq   v0, zero, 0x102553c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102552c
+	brfalse L_102553c
 // --- basic block ---
-// 0x01025450: 0x1025450: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x01025460: 0x1025460: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025458: 0x1025458: lui   a1, 0x10000
+// 0x01025468: 0x1025468: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102545c: 0x102545c: addu  a0, v0, zero
+// 0x0102546c: 0x102546c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01025460: 0x1025460: jal   0x1001b14 addiu a1, a1, -29680
+// 0x01025470: 0x1025470: jal   0x1001b14 addiu a1, a1, -29680
 	ldloc.2
 	ldc.i4 -29680
 	add
@@ -6493,40 +6493,40 @@ L_1025414:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01025468: 0x1025468: bne   v0, zero, 0x1025524 lui   s0, 0x30000
+// 0x01025478: 0x1025478: bne   v0, zero, 0x1025534 lui   s0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 8
-	brtrue L_1025524
+	brtrue L_1025534
 // --- basic block ---
-// 0x01025470: 0x1025470: lw    v0, 28336(s0)
+// 0x01025480: 0x1025480: lw    v0, 28800(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7084
+	ldc.i4 7200
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025474: 0x1025474: sll   zero, zero, 0
-// 0x01025478: 0x1025478: bne   v0, zero, 0x102549c lui   v0, 0xf0000
+// 0x01025484: 0x1025484: sll   zero, zero, 0
+// 0x01025488: 0x1025488: bne   v0, zero, 0x10254ac lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brtrue L_102549c
+	brtrue L_10254ac
 // --- basic block ---
-// 0x01025480: 0x1025480: lui   a2, 0x10000
+// 0x01025490: 0x1025490: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01025484: 0x1025484: addiu a2, a2, -29176
+// 0x01025494: 0x1025494: addiu a2, a2, -29176
 	ldloc.3
 	ldc.i4 -29176
 	add
 	stloc.3
-// 0x01025488: 0x1025488: addu  a0, zero, zero
+// 0x01025498: 0x1025498: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0102548c: 0x102548c: jal   0x10a1918 addiu a1, zero, 3
+// 0x0102549c: 0x102549c: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6534,69 +6534,69 @@ L_1025414:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025494: 0x1025494: sw    v0, 28336(s0)
+// 0x010254a4: 0x10254a4: sw    v0, 28800(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7084
+	ldc.i4 7200
 	add
 	ldloc 5
 	stelem.i4
-// 0x01025498: 0x1025498: lui   v0, 0xf0000
+// 0x010254a8: 0x10254a8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-L_102549c:
-// 0x0102549c: 0x102549c: lw    s3, -30068(v0)
+L_10254ac:
+// 0x010254ac: 0x10254ac: lw    s3, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 12
-// 0x010254a0: 0x10254a0: addiu s1, zero, 2
+// 0x010254b0: 0x10254b0: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 9
-// 0x010254a4: 0x10254a4: div   s3, s1
+// 0x010254b4: 0x10254b4: div   s3, s1
 	ldloc 12
 	ldloc 9
 	div
 	stloc 10
-// 0x010254a8: 0x10254a8: lui   v0, 0xf0000
+// 0x010254b8: 0x10254b8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010254ac: 0x10254ac: lw    v0, -30072(v0)
+// 0x010254bc: 0x10254bc: lw    v0, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x010254b0: 0x10254b0: lui   s2, 0x30000
+// 0x010254c0: 0x10254c0: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 13
-// 0x010254b4: 0x10254b4: lw    a0, 28336(s2)
+// 0x010254c4: 0x10254c4: lw    a0, 28800(s2)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7084
+	ldc.i4 7200
 	add
 	ldelem.i4
 	stloc.1
-// 0x010254b8: 0x10254b8: mflo  lo
+// 0x010254c8: 0x10254c8: mflo  lo
 	ldloc 10
 	stloc 12
-// 0x010254bc: 0x10254bc: sw    s3, 60(sp)
+// 0x010254cc: 0x10254cc: sw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6605,16 +6605,16 @@ L_102549c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010254c0: 0x10254c0: sll   zero, zero, 0
-// 0x010254c4: 0x10254c4: div   v0, s1
+// 0x010254d0: 0x10254d0: sll   zero, zero, 0
+// 0x010254d4: 0x10254d4: div   v0, s1
 	ldloc 5
 	ldloc 9
 	div
 	stloc 10
-// 0x010254c8: 0x10254c8: mflo  lo
+// 0x010254d8: 0x10254d8: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010254cc: 0x10254cc: beq   a0, zero, 0x102552c sw    v0, 64(sp)
+// 0x010254dc: 0x10254dc: beq   a0, zero, 0x102553c sw    v0, 64(sp)
 	ldloc.1
 	ldloc 7
 	ldloc.0
@@ -6624,30 +6624,30 @@ L_102549c:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_102552c
+	brfalse L_102553c
 // --- basic block ---
-// 0x010254d4: 0x10254d4: jal   0x104dffc sll   zero, zero, 0
+// 0x010254e4: 0x10254e4: jal   0x104e00c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010254dc: 0x10254dc: div   v0, s1
+// 0x010254ec: 0x10254ec: div   v0, s1
 	ldloc 5
 	ldloc 9
 	div
 	stloc 10
-// 0x010254e0: 0x10254e0: lw    a0, 28336(s2)
+// 0x010254f0: 0x10254f0: lw    a0, 28800(s2)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7084
+	ldc.i4 7200
 	add
 	ldelem.i4
 	stloc.1
-// 0x010254e4: 0x10254e4: lw    s0, 64(sp)
+// 0x010254f4: 0x10254f4: lw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6656,15 +6656,15 @@ L_102549c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010254e8: 0x10254e8: mflo  lo
+// 0x010254f8: 0x10254f8: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x010254ec: 0x10254ec: subu  s3, s3, v1
+// 0x010254fc: 0x10254fc: subu  s3, s3, v1
 	ldloc 12
 	ldloc 6
 	sub
 	stloc 12
-// 0x010254f0: 0x10254f0: jal   0x104e020 sw    s3, 60(sp)
+// 0x01025500: 0x1025500: jal   0x104e030 sw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6674,45 +6674,45 @@ L_102549c:
 	ldloc 12
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010254f8: 0x10254f8: div   v0, s1
+// 0x01025508: 0x1025508: div   v0, s1
 	ldloc 5
 	ldloc 9
 	div
 	stloc 10
-// 0x010254fc: 0x10254fc: lw    a0, 28336(s2)
+// 0x0102550c: 0x102550c: lw    a0, 28800(s2)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7084
+	ldc.i4 7200
 	add
 	ldelem.i4
 	stloc.1
-// 0x01025500: 0x1025500: addiu a1, sp, 60
+// 0x01025510: 0x1025510: addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.2
-// 0x01025504: 0x1025504: addu  a2, zero, zero
+// 0x01025514: 0x1025514: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01025508: 0x1025508: addu  a3, zero, zero
+// 0x01025518: 0x1025518: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102550c: 0x102550c: mflo  lo
+// 0x0102551c: 0x102551c: mflo  lo
 	ldloc 10
 	stloc 9
-// 0x01025510: 0x1025510: subu  s0, s0, s1
+// 0x01025520: 0x1025520: subu  s0, s0, s1
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 8
-// 0x01025514: 0x1025514: jal   0x104f4a8 sw    s0, 64(sp)
+// 0x01025524: 0x1025524: jal   0x104f4b8 sw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6726,16 +6726,16 @@ L_102549c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102551c: 0x102551c: j	 0x102552c sll   zero, zero, 0
-	br L_102552c
+// 0x0102552c: 0x102552c: j	 0x102553c sll   zero, zero, 0
+	br L_102553c
 // --- basic block ---
-L_1025524:
-// 0x01025524: 0x1025524: jal   0x101fc00 addu  a0, zero, zero
+L_1025534:
+// 0x01025534: 0x1025534: jal   0x101fc10 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6743,66 +6743,66 @@ L_1025524:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102552c:
-// 0x0102552c: 0x102552c: jal   0x10940d8 sll   zero, zero, 0
+L_102553c:
+// 0x0102553c: 0x102553c: jal   0x10946fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_is_context_menu_10940d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_is_context_menu_10946fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025534: 0x1025534: beq   v0, zero, 0x1025544 sll   zero, zero, 0
+// 0x01025544: 0x1025544: beq   v0, zero, 0x1025554 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1025544
+	brfalse L_1025554
 // --- basic block ---
-// 0x0102553c: 0x102553c: jal   0x1095828 sll   zero, zero, 0
+// 0x0102554c: 0x102554c: jal   0x1095e70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_draw_prev_1095828(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_draw_prev_1095e70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1025544:
-// 0x01025544: 0x1025544: jal   0x1095874 sll   zero, zero, 0
+L_1025554:
+// 0x01025554: 0x1025554: jal   0x1095ebc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_draw_now_1095874(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_draw_now_1095ebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102554c: 0x102554c: jal   0x104e31c sll   zero, zero, 0
+// 0x0102555c: 0x102555c: jal   0x104e32c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_refresh_104e31c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_refresh_104e32c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025554: 0x1025554: j	 0x1025634 sll   zero, zero, 0
-	br L_1025634
+// 0x01025564: 0x1025564: j	 0x1025644 sll   zero, zero, 0
+	br L_1025644
 // --- basic block ---
-L_102555c:
-// 0x0102555c: 0x102555c: lw    a3, 80(s0)
+L_102556c:
+// 0x0102556c: 0x102556c: lw    a3, 80(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6811,7 +6811,7 @@ L_102555c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01025560: 0x1025560: lw    v1, 32(s0)
+// 0x01025570: 0x1025570: lw    v1, 32(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6820,22 +6820,22 @@ L_102555c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025564: 0x1025564: subu  a2, a2, a3
+// 0x01025574: 0x1025574: subu  a2, a2, a3
 	ldloc.3
 	ldloc 4
 	sub
 	stloc.3
-// 0x01025568: 0x1025568: div   a2, v1
+// 0x01025578: 0x1025578: div   a2, v1
 	ldloc.3
 	ldloc 6
 	div
 	stloc 10
-// 0x0102556c: 0x102556c: subu  a3, t0, a3
+// 0x0102557c: 0x102557c: subu  a3, t0, a3
 	ldloc 11
 	ldloc 4
 	sub
 	stloc 4
-// 0x01025570: 0x1025570: lw    t0, 76(s0)
+// 0x01025580: 0x1025580: lw    t0, 76(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6844,7 +6844,7 @@ L_102555c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01025574: 0x1025574: lw    v0, 36(s0)
+// 0x01025584: 0x1025584: lw    v0, 36(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6853,20 +6853,20 @@ L_102555c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025578: 0x1025578: subu  a0, t0, a0
+// 0x01025588: 0x1025588: subu  a0, t0, a0
 	ldloc 11
 	ldloc.1
 	sub
 	stloc.1
-// 0x0102557c: 0x102557c: subu  a1, t0, a1
+// 0x0102558c: 0x102558c: subu  a1, t0, a1
 	ldloc 11
 	ldloc.2
 	sub
 	stloc.2
-// 0x01025580: 0x1025580: mflo  lo
+// 0x01025590: 0x1025590: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x01025584: 0x1025584: sw    a2, 52(sp)
+// 0x01025594: 0x1025594: sw    a2, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6875,46 +6875,46 @@ L_102555c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01025588: 0x1025588: sll   zero, zero, 0
-// 0x0102558c: 0x102558c: div   a3, v1
+// 0x01025598: 0x1025598: sll   zero, zero, 0
+// 0x0102559c: 0x102559c: div   a3, v1
 	ldloc 4
 	ldloc 6
 	div
 	stloc 10
-// 0x01025590: 0x1025590: mflo  lo
+// 0x010255a0: 0x10255a0: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01025594: 0x1025594: subu  a2, v1, a2
+// 0x010255a4: 0x10255a4: subu  a2, v1, a2
 	ldloc 6
 	ldloc.3
 	sub
 	stloc.3
-// 0x01025598: 0x1025598: sra   a3, a2, 31
+// 0x010255a8: 0x10255a8: sra   a3, a2, 31
 	ldloc.3
 	ldc.i4.s 31
 	shr
 	stloc 4
-// 0x0102559c: 0x102559c: div   a0, v0
+// 0x010255ac: 0x10255ac: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 10
-// 0x010255a0: 0x10255a0: xor   a2, a3, a2
+// 0x010255b0: 0x10255b0: xor   a2, a3, a2
 	ldloc 4
 	ldloc.3
 	xor
 	stloc.3
-// 0x010255a4: 0x10255a4: subu  a2, a2, a3
+// 0x010255b4: 0x10255b4: subu  a2, a2, a3
 	ldloc.3
 	ldloc 4
 	sub
 	stloc.3
-// 0x010255a8: 0x10255a8: slti  a2, a2, 5
+// 0x010255b8: 0x10255b8: slti  a2, a2, 5
 	ldloc.3
 	ldc.i4.5
 	clt
 	stloc.3
-// 0x010255ac: 0x10255ac: sw    v1, 36(sp)
+// 0x010255bc: 0x10255bc: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6923,10 +6923,10 @@ L_102555c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010255b0: 0x10255b0: mflo  lo
+// 0x010255c0: 0x10255c0: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010255b4: 0x10255b4: sw    a0, 56(sp)
+// 0x010255c4: 0x10255c4: sw    a0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6935,16 +6935,16 @@ L_102555c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010255b8: 0x10255b8: sll   zero, zero, 0
-// 0x010255bc: 0x10255bc: div   a1, v0
+// 0x010255c8: 0x10255c8: sll   zero, zero, 0
+// 0x010255cc: 0x10255cc: div   a1, v0
 	ldloc.2
 	ldloc 5
 	div
 	stloc 10
-// 0x010255c0: 0x10255c0: mflo  lo
+// 0x010255d0: 0x10255d0: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010255c4: 0x10255c4: bne   a2, zero, 0x10248ec sw    v0, 40(sp)
+// 0x010255d4: 0x10255d4: bne   a2, zero, 0x10248fc sw    v0, 40(sp)
 	ldloc.3
 	ldloc 7
 	ldloc.0
@@ -6954,13 +6954,13 @@ L_102555c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10248ec
+	brtrue L_10248fc
 // --- basic block ---
-// 0x010255cc: 0x10255cc: j	 0x1024908 sll   zero, zero, 0
-	br L_1024908
+// 0x010255dc: 0x10255dc: j	 0x1024918 sll   zero, zero, 0
+	br L_1024918
 // --- basic block ---
-L_10255d4:
-// 0x010255d4: 0x10255d4: lw    a2, 80(s0)
+L_10255e4:
+// 0x010255e4: 0x10255e4: lw    a2, 80(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6969,7 +6969,7 @@ L_10255d4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010255d8: 0x10255d8: lw    a3, 32(s0)
+// 0x010255e8: 0x10255e8: lw    a3, 32(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6978,17 +6978,17 @@ L_10255d4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010255dc: 0x10255dc: subu  a2, a1, a2
+// 0x010255ec: 0x10255ec: subu  a2, a1, a2
 	ldloc.2
 	ldloc.3
 	sub
 	stloc.3
-// 0x010255e0: 0x10255e0: div   a2, a3
+// 0x010255f0: 0x10255f0: div   a2, a3
 	ldloc.3
 	ldloc 4
 	div
 	stloc 10
-// 0x010255e4: 0x10255e4: lw    t0, 76(s0)
+// 0x010255f4: 0x10255f4: lw    t0, 76(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6997,7 +6997,7 @@ L_10255d4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010255e8: 0x10255e8: lw    v0, 36(s0)
+// 0x010255f8: 0x10255f8: lw    v0, 36(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7006,18 +7006,18 @@ L_10255d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010255ec: 0x10255ec: subu  v1, t0, v1
+// 0x010255fc: 0x10255fc: subu  v1, t0, v1
 	ldloc 11
 	ldloc 6
 	sub
 	stloc 6
-// 0x010255f0: 0x10255f0: addu  a1, s2, zero
+// 0x01025600: 0x1025600: addu  a1, s2, zero
 	ldloc 13
 	stloc.2
-// 0x010255f4: 0x10255f4: mflo  lo
+// 0x01025604: 0x1025604: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x010255f8: 0x10255f8: sw    a2, 60(sp)
+// 0x01025608: 0x1025608: sw    a2, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7026,16 +7026,16 @@ L_10255d4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010255fc: 0x10255fc: sll   zero, zero, 0
-// 0x01025600: 0x1025600: div   v1, v0
+// 0x0102560c: 0x102560c: sll   zero, zero, 0
+// 0x01025610: 0x1025610: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 10
-// 0x01025604: 0x1025604: mflo  lo
+// 0x01025614: 0x1025614: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01025608: 0x1025608: jal   0x10072a4 sw    v1, 64(sp)
+// 0x01025618: 0x1025618: jal   0x10072b4 sw    v1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7049,27 +7049,27 @@ L_10255d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025610: 0x1025610: lw    v0, 29728(s5)
+// 0x01025620: 0x1025620: lw    v0, 30192(s5)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025614: 0x1025614: sll   zero, zero, 0
-// 0x01025618: 0x1025618: addiu v0, v0, 960
+// 0x01025624: 0x1025624: sll   zero, zero, 0
+// 0x01025628: 0x1025628: addiu v0, v0, 960
 	ldloc 5
 	ldc.i4 960
 	add
 	stloc 5
-// 0x0102561c: 0x102561c: lw    v1, 8(v0)
+// 0x0102562c: 0x102562c: lw    v1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7078,17 +7078,17 @@ L_10255d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025620: 0x1025620: sll   zero, zero, 0
-// 0x01025624: 0x1025624: beq   v1, zero, 0x1024f4c sll   zero, zero, 0
+// 0x01025630: 0x1025630: sll   zero, zero, 0
+// 0x01025634: 0x1025634: beq   v1, zero, 0x1024f5c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1024f4c
+	brfalse L_1024f5c
 // --- basic block ---
-// 0x0102562c: 0x102562c: j	 0x1024df8 sll   zero, zero, 0
-	br L_1024df8
+// 0x0102563c: 0x102563c: j	 0x1024e08 sll   zero, zero, 0
+	br L_1024e08
 // --- basic block ---
-L_1025634:
-// 0x01025634: 0x1025634: lw    ra, 164(sp)
-// 0x01025638: 0x1025638: lw    s8, 160(sp)
+L_1025644:
+// 0x01025644: 0x1025644: lw    ra, 164(sp)
+// 0x01025648: 0x1025648: lw    s8, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7097,7 +7097,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0102563c: 0x102563c: lw    s7, 156(sp)
+// 0x0102564c: 0x102564c: lw    s7, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7106,7 +7106,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01025640: 0x1025640: lw    s6, 152(sp)
+// 0x01025650: 0x1025650: lw    s6, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7115,7 +7115,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01025644: 0x1025644: lw    s5, 148(sp)
+// 0x01025654: 0x1025654: lw    s5, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7124,7 +7124,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01025648: 0x1025648: lw    s4, 144(sp)
+// 0x01025658: 0x1025658: lw    s4, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7133,7 +7133,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102564c: 0x102564c: lw    s3, 140(sp)
+// 0x0102565c: 0x102565c: lw    s3, 140(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7142,7 +7142,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01025650: 0x1025650: lw    s2, 136(sp)
+// 0x01025660: 0x1025660: lw    s2, 136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7151,7 +7151,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01025654: 0x1025654: lw    s1, 132(sp)
+// 0x01025664: 0x1025664: lw    s1, 132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7160,7 +7160,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01025658: 0x1025658: lw    s0, 128(sp)
+// 0x01025668: 0x1025668: lw    s0, 128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7169,7 +7169,7 @@ L_1025634:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102565c: 0x102565c: jr    ra addiu sp, sp, 168
+// 0x0102566c: 0x102566c: jr    ra addiu sp, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
diff --git a/converted/Cibyl28.j b/converted/Cibyl28.j
index dacb56c..5e0b48b 100644
--- a/converted/Cibyl28.j
+++ b/converted/Cibyl28.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl28::.ctor
 
-.method public static int32 roadmap_screen_touched_off_1025664(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_touched_off_1025674(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -76,34 +76,34 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1025664:
-// 0x01025664: 0x1025664: lui   v0, 0x30000
+L_1025674:
+// 0x01025674: 0x1025674: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01025668: 0x1025668: lw    v0, 28240(v0)
+// 0x01025678: 0x1025678: lw    v0, 28704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102566c: 0x102566c: addiu sp, sp, -24
+// 0x0102567c: 0x102567c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01025670: 0x1025670: beq   v0, zero, 0x1025684 sw    ra, 20(sp)
+// 0x01025680: 0x1025680: beq   v0, zero, 0x1025694 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1025684
+	brfalse L_1025694
 // --- basic block ---
-// 0x01025678: 0x1025678: lui   a0, 0x1020000
+// 0x01025688: 0x1025688: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102567c: 0x102567c: jal   0x104fd00 addiu a0, a0, -864
+// 0x0102568c: 0x102568c: jal   0x104fd10 addiu a0, a0, -848
 	ldloc.1
-	ldc.i4 -864
+	ldc.i4 -848
 	add
 	stloc.1
 	ldloc.0
@@ -111,36 +111,36 @@ L_1025664:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1025684:
-// 0x01025684: 0x1025684: addiu v1, zero, 1
+L_1025694:
+// 0x01025694: 0x1025694: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01025688: 0x1025688: lui   v0, 0x30000
+// 0x01025698: 0x1025698: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102568c: 0x102568c: sw    v1, 28244(v0)
+// 0x0102569c: 0x102569c: sw    v1, 28708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7061
+	ldc.i4 7177
 	add
 	ldloc 7
 	stelem.i4
-// 0x01025690: 0x1025690: lui   v0, 0x30000
+// 0x010256a0: 0x10256a0: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01025694: 0x1025694: jal   0x10242f8 sw    zero, 28240(v0)
+// 0x010256a4: 0x10256a4: jal   0x1024308 sw    zero, 28704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -149,14 +149,14 @@ L_1025684:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl27::roadmap_screen_repaint_now_10242f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl27::roadmap_screen_repaint_now_1024308(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102569c: 0x102569c: lw    ra, 20(sp)
-// 0x010256a0: 0x10256a0: sll   zero, zero, 0
-// 0x010256a4: 0x10256a4: jr    ra addiu sp, sp, 24
+// 0x010256ac: 0x10256ac: lw    ra, 20(sp)
+// 0x010256b0: 0x10256b0: sll   zero, zero, 0
+// 0x010256b4: 0x10256b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -168,7 +168,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_refresh_flow_control_10256ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_refresh_flow_control_10256bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -203,18 +203,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010256ac: 0x10256ac: lui   a0, 0x1020000
+// 0x010256bc: 0x10256bc: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x010256b0: 0x10256b0: addiu sp, sp, -24
+// 0x010256c0: 0x10256c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010256b4: 0x10256b4: sw    ra, 20(sp)
-// 0x010256b8: 0x10256b8: jal   0x104fd00 addiu a0, a0, 22188
+// 0x010256c4: 0x10256c4: sw    ra, 20(sp)
+// 0x010256c8: 0x10256c8: jal   0x104fd10 addiu a0, a0, 22204
 	ldloc.1
-	ldc.i4 22188
+	ldc.i4 22204
 	add
 	stloc.1
 	ldloc.0
@@ -222,47 +222,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010256c0: 0x10256c0: jal   0x102146c sll   zero, zero, 0
+// 0x010256d0: 0x10256d0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010256c8: 0x10256c8: jal   0x10242f8 sll   zero, zero, 0
+// 0x010256d8: 0x10256d8: jal   0x1024308 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl27::roadmap_screen_repaint_now_10242f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl27::roadmap_screen_repaint_now_1024308(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010256d0: 0x10256d0: lw    ra, 20(sp)
-// 0x010256d4: 0x10256d4: lui   v0, 0x30000
+// 0x010256e0: 0x10256e0: lw    ra, 20(sp)
+// 0x010256e4: 0x10256e4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010256d8: 0x10256d8: sw    zero, 28340(v0)
+// 0x010256e8: 0x10256e8: sw    zero, 28804(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7085
+	ldc.i4 7201
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010256dc: 0x10256dc: jr    ra addiu sp, sp, 24
+// 0x010256ec: 0x10256ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -274,7 +274,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_touched_10256e4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_touched_10256f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -309,64 +309,64 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010256e4: 0x10256e4: lui   v0, 0x30000
+// 0x010256f4: 0x10256f4: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x010256e8: 0x10256e8: lw    v1, 28244(v0)
+// 0x010256f8: 0x10256f8: lw    v1, 28708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7061
+	ldc.i4 7177
 	add
 	ldelem.i4
 	stloc 6
-// 0x010256ec: 0x10256ec: addiu sp, sp, -24
+// 0x010256fc: 0x10256fc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010256f0: 0x10256f0: beq   v1, zero, 0x1025700 sw    ra, 20(sp)
+// 0x01025700: 0x1025700: beq   v1, zero, 0x1025710 sw    ra, 20(sp)
 	ldloc 6
-	brfalse L_1025700
+	brfalse L_1025710
 // --- basic block ---
-// 0x010256f8: 0x10256f8: j	 0x102574c sw    zero, 28244(v0)
+// 0x01025708: 0x1025708: j	 0x102575c sw    zero, 28708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7061
+	ldc.i4 7177
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_102574c
+	br L_102575c
 // --- basic block ---
-L_1025700:
-// 0x01025700: 0x1025700: lui   v0, 0x30000
+L_1025710:
+// 0x01025710: 0x1025710: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01025704: 0x1025704: lw    v1, 28240(v0)
+// 0x01025714: 0x1025714: lw    v1, 28704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025708: 0x1025708: sll   zero, zero, 0
-// 0x0102570c: 0x102570c: beq   v1, zero, 0x1025728 addiu v1, zero, 1
+// 0x01025718: 0x1025718: sll   zero, zero, 0
+// 0x0102571c: 0x102571c: beq   v1, zero, 0x1025738 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brfalse L_1025728
+	brfalse L_1025738
 // --- basic block ---
-// 0x01025714: 0x1025714: lui   a0, 0x1020000
+// 0x01025724: 0x1025724: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01025718: 0x1025718: jal   0x104fd00 addiu a0, a0, -864
+// 0x01025728: 0x1025728: jal   0x104fd10 addiu a0, a0, -848
 	ldloc.1
-	ldc.i4 -864
+	ldc.i4 -848
 	add
 	stloc.1
 	ldloc.0
@@ -374,23 +374,23 @@ L_1025700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025720: 0x1025720: j	 0x1025734 lui   a1, 0x1020000
+// 0x01025730: 0x1025730: j	 0x1025744 lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-	br L_1025734
+	br L_1025744
 // --- basic block ---
-L_1025728:
-// 0x01025728: 0x1025728: jal   0x10242f8 sw    v1, 28240(v0)
+L_1025738:
+// 0x01025738: 0x1025738: jal   0x1024308 sw    v1, 28704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldloc 6
 	stelem.i4
@@ -399,35 +399,35 @@ L_1025728:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl27::roadmap_screen_repaint_now_10242f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl27::roadmap_screen_repaint_now_1024308(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025730: 0x1025730: lui   a1, 0x1020000
+// 0x01025740: 0x1025740: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-L_1025734:
-// 0x01025734: 0x1025734: addiu v1, zero, 1
+L_1025744:
+// 0x01025744: 0x1025744: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01025738: 0x1025738: lui   v0, 0x30000
+// 0x01025748: 0x1025748: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x0102573c: 0x102573c: addiu a1, a1, -864
+// 0x0102574c: 0x102574c: addiu a1, a1, -848
 	ldloc.2
-	ldc.i4 -864
+	ldc.i4 -848
 	add
 	stloc.2
-// 0x01025740: 0x1025740: addiu a0, zero, 5000
+// 0x01025750: 0x1025750: addiu a0, zero, 5000
 	ldc.i4 5000
 	stloc.1
-// 0x01025744: 0x1025744: jal   0x104fe98 sw    v1, 28240(v0)
+// 0x01025754: 0x1025754: jal   0x104fea8 sw    v1, 28704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldloc 6
 	stelem.i4
@@ -436,15 +436,15 @@ L_1025734:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102574c:
-// 0x0102574c: 0x102574c: lw    ra, 20(sp)
-// 0x01025750: 0x1025750: sll   zero, zero, 0
-// 0x01025754: 0x1025754: jr    ra addiu sp, sp, 24
+L_102575c:
+// 0x0102575c: 0x102575c: lw    ra, 20(sp)
+// 0x01025760: 0x1025760: sll   zero, zero, 0
+// 0x01025764: 0x1025764: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -456,7 +456,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_short_click_102575c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_short_click_102576c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -500,21 +500,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102575c: 0x102575c: addiu sp, sp, -88
+// 0x0102576c: 0x102576c: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01025760: 0x1025760: addiu a1, sp, 28
+// 0x01025770: 0x1025770: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x01025764: 0x1025764: addiu a2, zero, 1
+// 0x01025774: 0x1025774: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01025768: 0x1025768: sw    ra, 84(sp)
-// 0x0102576c: 0x102576c: sw    s2, 80(sp)
+// 0x01025778: 0x1025778: sw    ra, 84(sp)
+// 0x0102577c: 0x102577c: sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -523,7 +523,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01025770: 0x1025770: sw    s1, 76(sp)
+// 0x01025780: 0x1025780: sw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -532,7 +532,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01025774: 0x1025774: jal   0x1007a6c sw    s0, 72(sp)
+// 0x01025784: 0x1025784: jal   0x1007a7c sw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -546,35 +546,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102577c: 0x102577c: lui   v0, 0x30000
+// 0x0102578c: 0x102578c: lui   v0, 0x30000
 	ldc.i4 196608
 	stloc 5
-// 0x01025780: 0x1025780: lw    v0, 28240(v0)
+// 0x01025790: 0x1025790: lw    v0, 28704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7060
+	ldc.i4 7176
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025784: 0x1025784: sll   zero, zero, 0
-// 0x01025788: 0x1025788: beq   v0, zero, 0x1025844 lui   v0, 0x30000
+// 0x01025794: 0x1025794: sll   zero, zero, 0
+// 0x01025798: 0x1025798: beq   v0, zero, 0x1025854 lui   v0, 0x30000
 	ldloc 5
 	ldc.i4 196608
 	stloc 5
-	brfalse L_1025844
+	brfalse L_1025854
 // --- basic block ---
-// 0x01025790: 0x1025790: lui   a0, 0x0
+// 0x010257a0: 0x10257a0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1025794:
-// 0x01025794: 0x1025794: jal   0x100e788 addiu a0, a0, 6108
+L_10257a4:
+// 0x010257a4: 0x10257a4: jal   0x100e798 addiu a0, a0, 6108
 	ldloc.1
 	ldc.i4 6108
 	add
@@ -584,30 +584,30 @@ L_1025794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102579c: 0x102579c: addu  a2, v0, zero
+// 0x010257ac: 0x10257ac: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010257a0: 0x10257a0: addiu s0, sp, 28
+// 0x010257b0: 0x10257b0: addiu s0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 8
-// 0x010257a4: 0x10257a4: addiu v0, sp, 24
+// 0x010257b4: 0x10257b4: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010257a8: 0x10257a8: addiu s2, sp, 52
+// 0x010257b8: 0x10257b8: addiu s2, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 10
-// 0x010257ac: 0x10257ac: sw    v0, 16(sp)
+// 0x010257bc: 0x10257bc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -616,19 +616,19 @@ L_1025794:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010257b0: 0x10257b0: addu  a0, s0, zero
+// 0x010257c0: 0x10257c0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010257b4: 0x10257b4: addiu v0, zero, 2
+// 0x010257c4: 0x10257c4: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010257b8: 0x10257b8: addiu a1, zero, -1
+// 0x010257c8: 0x10257c8: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x010257bc: 0x10257bc: addu  a3, s2, zero
+// 0x010257cc: 0x10257cc: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x010257c0: 0x10257c0: jal   0x102ac0c sw    v0, 20(sp)
+// 0x010257d0: 0x10257d0: jal   0x102ac1c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -642,35 +642,35 @@ L_1025794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010257c8: 0x10257c8: addiu v1, zero, -1
+// 0x010257d8: 0x10257d8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010257cc: 0x10257cc: beq   v0, v1, 0x1025820 lui   a0, 0x20000
+// 0x010257dc: 0x10257dc: beq   v0, v1, 0x1025830 lui   a0, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc.1
-	beq  L_1025820
+	beq  L_1025830
 // --- basic block ---
-// 0x010257d4: 0x10257d4: addu  a1, s0, zero
+// 0x010257e4: 0x10257e4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010257d8: 0x10257d8: addiu a0, a0, -28932
+// 0x010257e8: 0x10257e8: addiu a0, a0, -28468
 	ldloc.1
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.1
-// 0x010257dc: 0x10257dc: addiu s1, sp, 36
+// 0x010257ec: 0x10257ec: addiu s1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 9
-// 0x010257e0: 0x10257e0: jal   0x101f76c addiu s0, sp, 44
+// 0x010257f0: 0x10257f0: jal   0x101f77c addiu s0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -680,24 +680,24 @@ L_1025794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010257e8: 0x10257e8: addu  a0, s2, zero
+// 0x010257f8: 0x10257f8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010257ec: 0x10257ec: addu  a1, s1, zero
+// 0x010257fc: 0x10257fc: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010257f0: 0x10257f0: addu  a2, s0, zero
+// 0x01025800: 0x1025800: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010257f4: 0x10257f4: addiu a3, zero, 3
+// 0x01025804: 0x1025804: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010257f8: 0x10257f8: sw    zero, 16(sp)
+// 0x01025808: 0x1025808: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -706,7 +706,7 @@ L_1025794:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010257fc: 0x10257fc: jal   0x1012790 sw    zero, 20(sp)
+// 0x0102580c: 0x102580c: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -720,23 +720,23 @@ L_1025794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01025804: 0x1025804: lui   a0, 0x10000
+// 0x01025814: 0x1025814: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01025808: 0x1025808: addiu a0, a0, -30992
+// 0x01025818: 0x1025818: addiu a0, a0, -30992
 	ldloc.1
 	ldc.i4 -30992
 	add
 	stloc.1
-// 0x0102580c: 0x102580c: addu  a1, s1, zero
+// 0x0102581c: 0x102581c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01025810: 0x1025810: jal   0x1019590 addu  a2, s0, zero
+// 0x01025820: 0x1025820: jal   0x10195a0 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -744,39 +744,39 @@ L_1025794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_update_points_1019590(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_update_points_10195a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01025818: 0x1025818: jal   0x101fc54 sll   zero, zero, 0
+// 0x01025828: 0x1025828: jal   0x101fc64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_repaint_101fc54(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_repaint_101fc64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1025820:
-// 0x01025820: 0x1025820: jal   0x10256e4 sll   zero, zero, 0
+L_1025830:
+// 0x01025830: 0x1025830: jal   0x10256f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_screen_touched_10256e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_screen_touched_10256f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01025828: 0x1025828: lw    ra, 84(sp)
-// 0x0102582c: 0x102582c: addiu v0, zero, 1
+// 0x01025838: 0x1025838: lw    ra, 84(sp)
+// 0x0102583c: 0x102583c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01025830: 0x1025830: lw    s2, 80(sp)
+// 0x01025840: 0x1025840: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -785,7 +785,7 @@ L_1025820:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01025834: 0x1025834: lw    s1, 76(sp)
+// 0x01025844: 0x1025844: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -794,7 +794,7 @@ L_1025820:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01025838: 0x1025838: lw    s0, 72(sp)
+// 0x01025848: 0x1025848: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -803,39 +803,39 @@ L_1025820:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102583c: 0x102583c: jr    ra addiu sp, sp, 88
+// 0x0102584c: 0x102584c: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1025844:
-// 0x01025844: 0x1025844: lw    v0, 28236(v0)
+L_1025854:
+// 0x01025854: 0x1025854: lw    v0, 28700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7059
+	ldc.i4 7175
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025848: 0x1025848: sll   zero, zero, 0
-// 0x0102584c: 0x102584c: bne   v0, zero, 0x1025794 lui   a0, 0x0
+// 0x01025858: 0x1025858: sll   zero, zero, 0
+// 0x0102585c: 0x102585c: bne   v0, zero, 0x10257a4 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1025794
+	brtrue L_10257a4
 // --- basic block ---
-// 0x01025854: 0x1025854: j	 0x1025820 sll   zero, zero, 0
-	br L_1025820
+// 0x01025864: 0x1025864: j	 0x1025830 sll   zero, zero, 0
+	br L_1025830
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_configure_102585c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_configure_102586c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -879,36 +879,36 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102585c: 0x102585c: lui   v0, 0xf0000
+// 0x0102586c: 0x102586c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x01025860: 0x1025860: addiu sp, sp, -40
+// 0x01025870: 0x1025870: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01025864: 0x1025864: lw    v1, -30068(v0)
+// 0x01025874: 0x1025874: lw    v1, -29604(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x01025868: 0x1025868: lui   v0, 0xf0000
+// 0x01025878: 0x1025878: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0102586c: 0x102586c: lw    v0, -30072(v0)
+// 0x0102587c: 0x102587c: lw    v0, -29608(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025870: 0x1025870: sw    s0, 24(sp)
+// 0x01025880: 0x1025880: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -917,21 +917,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01025874: 0x1025874: lui   a3, 0x10000
+// 0x01025884: 0x1025884: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01025878: 0x1025878: lui   s0, 0x10000
+// 0x01025888: 0x1025888: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0102587c: 0x102587c: addiu a3, a3, -29164
+// 0x0102588c: 0x102588c: addiu a3, a3, -29164
 	ldloc 4
 	ldc.i4 -29164
 	add
 	stloc 4
-// 0x01025880: 0x1025880: addiu a2, zero, 3214
+// 0x01025890: 0x1025890: addiu a2, zero, 3214
 	ldc.i4 3214
 	stloc.3
-// 0x01025884: 0x1025884: sw    s2, 32(sp)
+// 0x01025894: 0x1025894: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -940,7 +940,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01025888: 0x1025888: sw    s1, 28(sp)
+// 0x01025898: 0x1025898: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -949,22 +949,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102588c: 0x102588c: lui   s2, 0x30000
+// 0x0102589c: 0x102589c: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 10
-// 0x01025890: 0x1025890: lui   s1, 0x30000
+// 0x010258a0: 0x10258a0: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x01025894: 0x1025894: addiu a0, zero, 1
+// 0x010258a4: 0x10258a4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01025898: 0x1025898: addiu a1, s0, -29532
+// 0x010258a8: 0x10258a8: addiu a1, s0, -29532
 	ldloc 9
 	ldc.i4 -29532
 	add
 	stloc.2
-// 0x0102589c: 0x102589c: sw    ra, 36(sp)
-// 0x010258a0: 0x10258a0: sw    v1, 16(sp)
+// 0x010258ac: 0x10258ac: sw    ra, 36(sp)
+// 0x010258b0: 0x10258b0: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -973,25 +973,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010258a4: 0x10258a4: sw    v1, 28460(s2)
+// 0x010258b4: 0x10258b4: sw    v1, 28924(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 7115
+	ldc.i4 7231
 	add
 	ldloc 7
 	stelem.i4
-// 0x010258a8: 0x10258a8: sw    v0, 28464(s1)
+// 0x010258b8: 0x10258b8: sw    v0, 28928(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldloc 6
 	stelem.i4
-// 0x010258ac: 0x10258ac: jal   0x100449c sw    v0, 20(sp)
+// 0x010258bc: 0x10258bc: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1010,20 +1010,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010258b4: 0x10258b4: lui   a0, 0x0
+// 0x010258c4: 0x10258c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010258b8: 0x10258b8: lui   a1, 0x20000
+// 0x010258c8: 0x10258c8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010258bc: 0x10258bc: addiu a0, a0, 6172
+// 0x010258cc: 0x10258cc: addiu a0, a0, 6172
 	ldloc.1
 	ldc.i4 6172
 	add
 	stloc.1
-// 0x010258c0: 0x10258c0: jal   0x100e7f4 addiu a1, a1, -6760
+// 0x010258d0: 0x10258d0: jal   0x100e804 addiu a1, a1, -6296
 	ldloc.2
-	ldc.i4 -6760
+	ldc.i4 -6296
 	add
 	stloc.2
 	ldloc.0
@@ -1031,46 +1031,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010258c8: 0x10258c8: lw    a1, 28464(s1)
+// 0x010258d8: 0x10258d8: lw    a1, 28928(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7116
+	ldc.i4 7232
 	add
 	ldelem.i4
 	stloc.2
-// 0x010258cc: 0x10258cc: lw    a0, 28460(s2)
+// 0x010258dc: 0x10258dc: lw    a0, 28924(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 7115
+	ldc.i4 7231
 	add
 	ldelem.i4
 	stloc.1
-// 0x010258d0: 0x10258d0: sltiu v0, v0, 1
+// 0x010258e0: 0x10258e0: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x010258d4: 0x10258d4: lui   v1, 0x30000
+// 0x010258e4: 0x10258e4: lui   v1, 0x30000
 	ldc.i4 196608
 	stloc 7
-// 0x010258d8: 0x10258d8: lui   s1, 0x30000
+// 0x010258e8: 0x10258e8: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x010258dc: 0x10258dc: jal   0x100877c sw    v0, 28452(v1)
+// 0x010258ec: 0x10258ec: jal   0x100878c sw    v0, 28916(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7113
+	ldc.i4 7229
 	add
 	ldloc 6
 	stelem.i4
@@ -1079,40 +1079,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_size_100877c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_size_100878c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010258e4: 0x10258e4: lw    v0, 28248(s1)
+// 0x010258f4: 0x10258f4: lw    v0, 28712(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7062
+	ldc.i4 7178
 	add
 	ldelem.i4
 	stloc 6
-// 0x010258e8: 0x10258e8: lui   a3, 0x10000
+// 0x010258f8: 0x10258f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010258ec: 0x10258ec: addiu a1, s0, -29532
+// 0x010258fc: 0x10258fc: addiu a1, s0, -29532
 	ldloc 9
 	ldc.i4 -29532
 	add
 	stloc.2
-// 0x010258f0: 0x10258f0: addiu a3, a3, -29112
+// 0x01025900: 0x1025900: addiu a3, a3, -29112
 	ldloc 4
 	ldc.i4 -29112
 	add
 	stloc 4
-// 0x010258f4: 0x10258f4: addiu a0, zero, 1
+// 0x01025904: 0x1025904: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010258f8: 0x10258f8: addiu a2, zero, 3219
+// 0x01025908: 0x1025908: addiu a2, zero, 3219
 	ldc.i4 3219
 	stloc.3
-// 0x010258fc: 0x10258fc: jal   0x100449c sw    v0, 16(sp)
+// 0x0102590c: 0x102590c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1131,34 +1131,34 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01025904: 0x1025904: lw    v0, 28248(s1)
+// 0x01025914: 0x1025914: lw    v0, 28712(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7062
+	ldc.i4 7178
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025908: 0x1025908: sll   zero, zero, 0
-// 0x0102590c: 0x102590c: beq   v0, zero, 0x102591c sll   zero, zero, 0
+// 0x01025918: 0x1025918: sll   zero, zero, 0
+// 0x0102591c: 0x102591c: beq   v0, zero, 0x102592c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_102591c
+	brfalse L_102592c
 // --- basic block ---
-// 0x01025914: 0x1025914: jal   0x10242f8 sll   zero, zero, 0
+// 0x01025924: 0x1025924: jal   0x1024308 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl27::roadmap_screen_repaint_now_10242f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl27::roadmap_screen_repaint_now_1024308(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_102591c:
-// 0x0102591c: 0x102591c: lw    ra, 36(sp)
-// 0x01025920: 0x1025920: lw    s2, 32(sp)
+L_102592c:
+// 0x0102592c: 0x102592c: lw    ra, 36(sp)
+// 0x01025930: 0x1025930: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ L_102591c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01025924: 0x1025924: lw    s1, 28(sp)
+// 0x01025934: 0x1025934: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1176,7 +1176,7 @@ L_102591c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01025928: 0x1025928: lw    s0, 24(sp)
+// 0x01025938: 0x1025938: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1185,7 +1185,7 @@ L_102591c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102592c: 0x102592c: jr    ra addiu sp, sp, 40
+// 0x0102593c: 0x102593c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1197,7 +1197,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void roadmap_view_menu_1025978()
+.method public static void roadmap_view_menu_1025988()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1208,13 +1208,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1025978:
-// 0x01025978: 0x1025978: jr    ra sll   zero, zero, 0
+L_1025988:
+// 0x01025988: 0x1025988: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_view_hold_1025980()
+.method public static int32 roadmap_view_hold_1025990()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1231,25 +1231,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01025980: 0x1025980: lui   v0, 0x60000
+// 0x01025990: 0x1025990: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01025984: 0x1025984: lw    v0, -26568(v0)
+// 0x01025994: 0x1025994: lw    v0, -26104(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc.0
-// 0x01025988: 0x1025988: sll   zero, zero, 0
-// 0x0102598c: 0x102598c: addiu v0, v0, -1
+// 0x01025998: 0x1025998: sll   zero, zero, 0
+// 0x0102599c: 0x102599c: addiu v0, v0, -1
 	ldloc.0
 	ldc.i4.m1
 	add
 	stloc.0
-// 0x01025990: 0x1025990: jr    ra sltiu v0, v0, 2
+// 0x010259a0: 0x10259a0: jr    ra sltiu v0, v0, 2
 	ldloc.0
 	ldc.i4.2
 	clt.un
@@ -1259,7 +1259,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_view_auto_zoom_restore_1025998(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_auto_zoom_restore_10259a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1294,29 +1294,29 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01025998: 0x1025998: lui   a0, 0x1020000
+// 0x010259a8: 0x10259a8: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102599c: 0x102599c: addiu sp, sp, -24
+// 0x010259ac: 0x10259ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010259a0: 0x10259a0: lui   v0, 0x60000
+// 0x010259b0: 0x10259b0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010259a4: 0x10259a4: addiu a0, a0, 22936
+// 0x010259b4: 0x10259b4: addiu a0, a0, 22952
 	ldloc.1
-	ldc.i4 22936
+	ldc.i4 22952
 	add
 	stloc.1
-// 0x010259a8: 0x10259a8: sw    ra, 20(sp)
-// 0x010259ac: 0x10259ac: jal   0x104fd00 sw    zero, -26564(v0)
+// 0x010259b8: 0x10259b8: sw    ra, 20(sp)
+// 0x010259bc: 0x10259bc: jal   0x104fd10 sw    zero, -26100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6641
+	ldc.i4 -6525
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1325,14 +1325,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010259b4: 0x10259b4: lw    ra, 20(sp)
-// 0x010259b8: 0x10259b8: sll   zero, zero, 0
-// 0x010259bc: 0x10259bc: jr    ra addiu sp, sp, 24
+// 0x010259c4: 0x10259c4: lw    ra, 20(sp)
+// 0x010259c8: 0x10259c8: sll   zero, zero, 0
+// 0x010259cc: 0x10259cc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1344,7 +1344,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_view_reset_10259c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_reset_10259d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1379,42 +1379,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010259c4: 0x10259c4: lui   v0, 0x60000
+// 0x010259d4: 0x10259d4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010259c8: 0x10259c8: lw    v0, -26564(v0)
+// 0x010259d8: 0x10259d8: lw    v0, -26100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6641
+	ldc.i4 -6525
 	add
 	ldelem.i4
 	stloc 5
-// 0x010259cc: 0x10259cc: addiu sp, sp, -24
+// 0x010259dc: 0x10259dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010259d0: 0x10259d0: beq   v0, zero, 0x10259e0 sw    ra, 20(sp)
+// 0x010259e0: 0x10259e0: beq   v0, zero, 0x10259f0 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_10259e0
+	brfalse L_10259f0
 // --- basic block ---
-// 0x010259d8: 0x10259d8: jal   0x1025998 sll   zero, zero, 0
+// 0x010259e8: 0x10259e8: jal   0x10259a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_auto_zoom_restore_1025998(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_auto_zoom_restore_10259a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10259e0:
-// 0x010259e0: 0x10259e0: lw    ra, 20(sp)
-// 0x010259e4: 0x10259e4: sll   zero, zero, 0
-// 0x010259e8: 0x10259e8: jr    ra addiu sp, sp, 24
+L_10259f0:
+// 0x010259f0: 0x10259f0: lw    ra, 20(sp)
+// 0x010259f4: 0x10259f4: sll   zero, zero, 0
+// 0x010259f8: 0x10259f8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1426,7 +1426,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_view_navigation_10259f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_navigation_1025a00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1461,32 +1461,32 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10259f0:
-// 0x010259f0: 0x10259f0: addiu sp, sp, -24
+L_1025a00:
+// 0x01025a00: 0x1025a00: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010259f4: 0x10259f4: sw    ra, 20(sp)
-// 0x010259f8: 0x10259f8: jal   0x10259c4 sll   zero, zero, 0
+// 0x01025a04: 0x1025a04: sw    ra, 20(sp)
+// 0x01025a08: 0x1025a08: jal   0x10259d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_reset_10259c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_reset_10259d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025a00: 0x1025a00: lw    ra, 20(sp)
-// 0x01025a04: 0x1025a04: addiu v1, zero, 2
+// 0x01025a10: 0x1025a10: lw    ra, 20(sp)
+// 0x01025a14: 0x1025a14: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01025a08: 0x1025a08: lui   v0, 0x0
+// 0x01025a18: 0x1025a18: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01025a0c: 0x1025a0c: sw    v1, 6208(v0)
+// 0x01025a1c: 0x1025a1c: sw    v1, 6208(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -1495,7 +1495,7 @@ L_10259f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01025a10: 0x1025a10: jr    ra addiu sp, sp, 24
+// 0x01025a20: 0x1025a20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1507,7 +1507,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_view_commute_1025a18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_commute_1025a28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1542,20 +1542,20 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1025a18:
-// 0x01025a18: 0x1025a18: addiu sp, sp, -24
+L_1025a28:
+// 0x01025a28: 0x1025a28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01025a1c: 0x1025a1c: addiu v1, zero, 1
+// 0x01025a2c: 0x1025a2c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01025a20: 0x1025a20: lui   v0, 0x0
+// 0x01025a30: 0x1025a30: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01025a24: 0x1025a24: sw    ra, 20(sp)
-// 0x01025a28: 0x1025a28: jal   0x10259c4 sw    v1, 6208(v0)
+// 0x01025a34: 0x1025a34: sw    ra, 20(sp)
+// 0x01025a38: 0x1025a38: jal   0x10259d4 sw    v1, 6208(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -1569,14 +1569,14 @@ L_1025a18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_reset_10259c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_reset_10259d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025a30: 0x1025a30: lw    ra, 20(sp)
-// 0x01025a34: 0x1025a34: sll   zero, zero, 0
-// 0x01025a38: 0x1025a38: jr    ra addiu sp, sp, 24
+// 0x01025a40: 0x1025a40: lw    ra, 20(sp)
+// 0x01025a44: 0x1025a44: sll   zero, zero, 0
+// 0x01025a48: 0x1025a48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1588,7 +1588,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_view_auto_zoom_suspend_1025a40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_auto_zoom_suspend_1025a50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1623,66 +1623,66 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01025a40: 0x1025a40: lui   v0, 0x60000
+// 0x01025a50: 0x1025a50: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025a44: 0x1025a44: lw    v0, -26560(v0)
+// 0x01025a54: 0x1025a54: lw    v0, -26096(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6640
+	ldc.i4 -6524
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025a48: 0x1025a48: addiu sp, sp, -24
+// 0x01025a58: 0x1025a58: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01025a4c: 0x1025a4c: beq   v0, zero, 0x1025a9c sw    ra, 20(sp)
+// 0x01025a5c: 0x1025a5c: beq   v0, zero, 0x1025aac sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1025a9c
+	brfalse L_1025aac
 // --- basic block ---
-// 0x01025a54: 0x1025a54: jal   0x10573dc sll   zero, zero, 0
+// 0x01025a64: 0x1025a64: jal   0x10573ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_is_auto_zoom_10573dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_is_auto_zoom_10573ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025a5c: 0x1025a5c: beq   v0, zero, 0x1025a9c lui   v0, 0x60000
+// 0x01025a6c: 0x1025a6c: beq   v0, zero, 0x1025aac lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1025a9c
+	brfalse L_1025aac
 // --- basic block ---
-// 0x01025a64: 0x1025a64: lw    v0, -26564(v0)
+// 0x01025a74: 0x1025a74: lw    v0, -26100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6641
+	ldc.i4 -6525
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025a68: 0x1025a68: sll   zero, zero, 0
-// 0x01025a6c: 0x1025a6c: beq   v0, zero, 0x1025a84 lui   a1, 0x1020000
+// 0x01025a78: 0x1025a78: sll   zero, zero, 0
+// 0x01025a7c: 0x1025a7c: beq   v0, zero, 0x1025a94 lui   a1, 0x1020000
 	ldloc 5
 	ldc.i4 16908288
 	stloc.2
-	brfalse L_1025a84
+	brfalse L_1025a94
 // --- basic block ---
-// 0x01025a74: 0x1025a74: lui   a0, 0x1020000
+// 0x01025a84: 0x1025a84: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01025a78: 0x1025a78: jal   0x104fd00 addiu a0, a0, 22936
+// 0x01025a88: 0x1025a88: jal   0x104fd10 addiu a0, a0, 22952
 	ldloc.1
-	ldc.i4 22936
+	ldc.i4 22952
 	add
 	stloc.1
 	ldloc.0
@@ -1690,35 +1690,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025a80: 0x1025a80: lui   a1, 0x1020000
+// 0x01025a90: 0x1025a90: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-L_1025a84:
-// 0x01025a84: 0x1025a84: addiu v1, zero, 1
+L_1025a94:
+// 0x01025a94: 0x1025a94: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01025a88: 0x1025a88: lui   v0, 0x60000
+// 0x01025a98: 0x1025a98: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025a8c: 0x1025a8c: addiu a1, a1, 22936
+// 0x01025a9c: 0x1025a9c: addiu a1, a1, 22952
 	ldloc.2
-	ldc.i4 22936
+	ldc.i4 22952
 	add
 	stloc.2
-// 0x01025a90: 0x1025a90: addiu a0, zero, 30000
+// 0x01025aa0: 0x1025aa0: addiu a0, zero, 30000
 	ldc.i4 30000
 	stloc.1
-// 0x01025a94: 0x1025a94: jal   0x104fe98 sw    v1, -26564(v0)
+// 0x01025aa4: 0x1025aa4: jal   0x104fea8 sw    v1, -26100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6641
+	ldc.i4 -6525
 	add
 	ldloc 6
 	stelem.i4
@@ -1727,15 +1727,15 @@ L_1025a84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1025a9c:
-// 0x01025a9c: 0x1025a9c: lw    ra, 20(sp)
-// 0x01025aa0: 0x1025aa0: sll   zero, zero, 0
-// 0x01025aa4: 0x1025aa4: jr    ra addiu sp, sp, 24
+L_1025aac:
+// 0x01025aac: 0x1025aac: lw    ra, 20(sp)
+// 0x01025ab0: 0x1025ab0: sll   zero, zero, 0
+// 0x01025ab4: 0x1025ab4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1747,7 +1747,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_view_show_labels_1025aac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_show_labels_1025abc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -1788,12 +1788,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01025aac: 0x1025aac: addiu sp, sp, -40
+// 0x01025abc: 0x1025abc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01025ab0: 0x1025ab0: sw    s1, 32(sp)
+// 0x01025ac0: 0x1025ac0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1802,7 +1802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01025ab4: 0x1025ab4: sw    s0, 28(sp)
+// 0x01025ac4: 0x1025ac4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1811,35 +1811,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01025ab8: 0x1025ab8: sw    ra, 36(sp)
-// 0x01025abc: 0x1025abc: addiu s1, zero, -1
+// 0x01025ac8: 0x1025ac8: sw    ra, 36(sp)
+// 0x01025acc: 0x1025acc: addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x01025ac0: 0x1025ac0: j	 0x1025b00 addu  s0, zero, zero
+// 0x01025ad0: 0x1025ad0: j	 0x1025b10 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1025b00
+	br L_1025b10
 // --- basic block ---
-L_1025ac8:
-// 0x01025ac8: 0x1025ac8: lw    v0, 0(a1)
+L_1025ad8:
+// 0x01025ad8: 0x1025ad8: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01025acc: 0x1025acc: addiu a1, a1, 4
+// 0x01025adc: 0x1025adc: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01025ad0: 0x1025ad0: beq   v0, zero, 0x1025afc addu  a0, v0, zero
+// 0x01025ae0: 0x1025ae0: beq   v0, zero, 0x1025b0c addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_1025afc
+	brfalse L_1025b0c
 // --- basic block ---
-// 0x01025ad8: 0x1025ad8: sw    a1, 16(sp)
+// 0x01025ae8: 0x1025ae8: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1848,7 +1848,7 @@ L_1025ac8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01025adc: 0x1025adc: jal   0x104dd48 sw    a2, 20(sp)
+// 0x01025aec: 0x1025aec: jal   0x104dd58 sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1858,15 +1858,15 @@ L_1025ac8:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd48(int32)
+	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd58(int32)
 	stloc 6
 // --- basic block ---
-// 0x01025ae4: 0x1025ae4: slti  v0, v0, 6
+// 0x01025af4: 0x1025af4: slti  v0, v0, 6
 	ldloc 6
 	ldc.i4.6
 	clt
 	stloc 6
-// 0x01025ae8: 0x1025ae8: lw    a1, 16(sp)
+// 0x01025af8: 0x1025af8: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1875,7 +1875,7 @@ L_1025ac8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01025aec: 0x1025aec: lw    a2, 20(sp)
+// 0x01025afc: 0x1025afc: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1884,33 +1884,33 @@ L_1025ac8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01025af0: 0x1025af0: bne   v0, zero, 0x1025afc sll   zero, zero, 0
+// 0x01025b00: 0x1025b00: bne   v0, zero, 0x1025b0c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1025afc
+	brtrue L_1025b0c
 // --- basic block ---
-// 0x01025af8: 0x1025af8: addu  s1, s0, zero
+// 0x01025b08: 0x1025b08: addu  s1, s0, zero
 	ldloc 7
 	stloc 8
-L_1025afc:
-// 0x01025afc: 0x1025afc: addiu s0, s0, 1
+L_1025b0c:
+// 0x01025b0c: 0x1025b0c: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_1025b00:
-// 0x01025b00: 0x1025b00: slt   v0, s0, a2
+L_1025b10:
+// 0x01025b10: 0x1025b10: slt   v0, s0, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 6
-// 0x01025b04: 0x1025b04: bne   v0, zero, 0x1025ac8 addu  v0, s1, zero
+// 0x01025b14: 0x1025b14: bne   v0, zero, 0x1025ad8 addu  v0, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc 6
-	brtrue L_1025ac8
+	brtrue L_1025ad8
 // --- basic block ---
-// 0x01025b0c: 0x1025b0c: lw    ra, 36(sp)
-// 0x01025b10: 0x1025b10: lw    s1, 32(sp)
+// 0x01025b1c: 0x1025b1c: lw    ra, 36(sp)
+// 0x01025b20: 0x1025b20: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1919,7 +1919,7 @@ L_1025b00:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01025b14: 0x1025b14: lw    s0, 28(sp)
+// 0x01025b24: 0x1025b24: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1928,7 +1928,7 @@ L_1025b00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01025b18: 0x1025b18: jr    ra addiu sp, sp, 40
+// 0x01025b28: 0x1025b28: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1940,7 +1940,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_view_get_scale_1025b20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_get_scale_1025b30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -1978,13 +1978,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01025b20: 0x1025b20: addiu sp, sp, -24
+// 0x01025b30: 0x1025b30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01025b24: 0x1025b24: sw    ra, 20(sp)
-// 0x01025b28: 0x1025b28: jal   0x10565cc sw    s0, 16(sp)
+// 0x01025b34: 0x1025b34: sw    ra, 20(sp)
+// 0x01025b38: 0x1025b38: jal   0x10565dc sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1993,147 +1993,147 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x01025b30: 0x1025b30: bne   v0, zero, 0x1025bb4 lui   v0, 0x60000
+// 0x01025b40: 0x1025b40: bne   v0, zero, 0x1025bc4 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_1025bb4
+	brtrue L_1025bc4
 // --- basic block ---
-// 0x01025b38: 0x1025b38: jal   0x10565bc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_track_enabled_10565bc()
+// 0x01025b48: 0x1025b48: jal   0x10565cc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_track_enabled_10565cc()
 	stloc 5
 // --- basic block ---
-// 0x01025b40: 0x1025b40: beq   v0, zero, 0x1025b5c lui   v0, 0x60000
+// 0x01025b50: 0x1025b50: beq   v0, zero, 0x1025b6c lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1025b5c
+	brfalse L_1025b6c
 // --- basic block ---
-// 0x01025b48: 0x1025b48: jal   0x10565ec sll   zero, zero, 0
-	call int32 Cibyl64::navigate_offtrack_10565ec()
+// 0x01025b58: 0x1025b58: jal   0x10565fc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_offtrack_10565fc()
 	stloc 5
 // --- basic block ---
-// 0x01025b50: 0x1025b50: bne   v0, zero, 0x1025c20 addiu v0, zero, -1
+// 0x01025b60: 0x1025b60: bne   v0, zero, 0x1025c30 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1025c20
+	brtrue L_1025c30
 // --- basic block ---
-// 0x01025b58: 0x1025b58: lui   v0, 0x60000
+// 0x01025b68: 0x1025b68: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1025b5c:
-// 0x01025b5c: 0x1025b5c: lw    v0, -26560(v0)
+L_1025b6c:
+// 0x01025b6c: 0x1025b6c: lw    v0, -26096(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6640
+	ldc.i4 -6524
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025b60: 0x1025b60: sll   zero, zero, 0
-// 0x01025b64: 0x1025b64: beq   v0, zero, 0x1025c20 addiu v0, zero, -1
+// 0x01025b70: 0x1025b70: sll   zero, zero, 0
+// 0x01025b74: 0x1025b74: beq   v0, zero, 0x1025c30 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1025c20
+	brfalse L_1025c30
 // --- basic block ---
-// 0x01025b6c: 0x1025b6c: lui   v0, 0x60000
+// 0x01025b7c: 0x1025b7c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025b70: 0x1025b70: lw    v0, -26564(v0)
+// 0x01025b80: 0x1025b80: lw    v0, -26100(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6641
+	ldc.i4 -6525
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025b74: 0x1025b74: sll   zero, zero, 0
-// 0x01025b78: 0x1025b78: bne   v0, zero, 0x1025c20 addiu v0, zero, -1
+// 0x01025b84: 0x1025b84: sll   zero, zero, 0
+// 0x01025b88: 0x1025b88: bne   v0, zero, 0x1025c30 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1025c20
+	brtrue L_1025c30
 // --- basic block ---
-// 0x01025b80: 0x1025b80: lui   s0, 0x60000
+// 0x01025b90: 0x1025b90: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01025b84: 0x1025b84: lw    v0, -26568(s0)
+// 0x01025b94: 0x1025b94: lw    v0, -26104(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025b88: 0x1025b88: sll   zero, zero, 0
-// 0x01025b8c: 0x1025b8c: beq   v0, zero, 0x1025c20 addiu v0, zero, -1
+// 0x01025b98: 0x1025b98: sll   zero, zero, 0
+// 0x01025b9c: 0x1025b9c: beq   v0, zero, 0x1025c30 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1025c20
+	brfalse L_1025c30
 // --- basic block ---
-// 0x01025b94: 0x1025b94: jal   0x10573dc sll   zero, zero, 0
+// 0x01025ba4: 0x1025ba4: jal   0x10573ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_is_auto_zoom_10573dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_is_auto_zoom_10573ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025b9c: 0x1025b9c: beq   v0, zero, 0x1025c20 addiu v0, zero, -1
+// 0x01025bac: 0x1025bac: beq   v0, zero, 0x1025c30 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1025c20
+	brfalse L_1025c30
 // --- basic block ---
-// 0x01025ba4: 0x1025ba4: lw    v1, -26568(s0)
+// 0x01025bb4: 0x1025bb4: lw    v1, -26104(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025ba8: 0x1025ba8: addiu v0, zero, 1
+// 0x01025bb8: 0x1025bb8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01025bac: 0x1025bac: bne   v1, v0, 0x1025bc0 lui   v0, 0x60000
+// 0x01025bbc: 0x1025bbc: bne   v1, v0, 0x1025bd0 lui   v0, 0x60000
 	ldloc 6
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_1025bc0
+	bne.un L_1025bd0
 // --- basic block ---
-L_1025bb4:
-// 0x01025bb4: 0x1025bb4: lw    v0, -26548(v0)
+L_1025bc4:
+// 0x01025bc4: 0x1025bc4: lw    v0, -26084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6637
+	ldc.i4 -6521
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025bb8: 0x1025bb8: j	 0x1025c20 sll   zero, zero, 0
-	br L_1025c20
+// 0x01025bc8: 0x1025bc8: j	 0x1025c30 sll   zero, zero, 0
+	br L_1025c30
 // --- basic block ---
-L_1025bc0:
-// 0x01025bc0: 0x1025bc0: lui   v0, 0x0
+L_1025bd0:
+// 0x01025bd0: 0x1025bd0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01025bc4: 0x1025bc4: lw    v1, 6208(v0)
+// 0x01025bd4: 0x1025bd4: lw    v1, 6208(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2142,76 +2142,76 @@ L_1025bc0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025bc8: 0x1025bc8: addiu v0, zero, 2
+// 0x01025bd8: 0x1025bd8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01025bcc: 0x1025bcc: bne   v1, v0, 0x1025be4 sll   zero, zero, 0
+// 0x01025bdc: 0x1025bdc: bne   v1, v0, 0x1025bf4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_1025be4
+	bne.un L_1025bf4
 // --- basic block ---
-// 0x01025bd4: 0x1025bd4: jal   0x105feb4 sll   zero, zero, 0
-	call int32 Cibyl71::navigate_zoom_get_scale_105feb4()
+// 0x01025be4: 0x1025be4: jal   0x105fec4 sll   zero, zero, 0
+	call int32 Cibyl71::navigate_zoom_get_scale_105fec4()
 	stloc 5
 // --- basic block ---
-// 0x01025bdc: 0x1025bdc: j	 0x1025c20 sll   zero, zero, 0
-	br L_1025c20
+// 0x01025bec: 0x1025bec: j	 0x1025c30 sll   zero, zero, 0
+	br L_1025c30
 // --- basic block ---
-L_1025be4:
-// 0x01025be4: 0x1025be4: jal   0x10565bc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_track_enabled_10565bc()
+L_1025bf4:
+// 0x01025bf4: 0x1025bf4: jal   0x10565cc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_track_enabled_10565cc()
 	stloc 5
 // --- basic block ---
-// 0x01025bec: 0x1025bec: beq   v0, zero, 0x1025c1c lui   v0, 0x60000
+// 0x01025bfc: 0x1025bfc: beq   v0, zero, 0x1025c2c lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1025c1c
+	brfalse L_1025c2c
 // --- basic block ---
-// 0x01025bf4: 0x1025bf4: lw    v0, -26548(v0)
+// 0x01025c04: 0x1025c04: lw    v0, -26084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6637
+	ldc.i4 -6521
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025bf8: 0x1025bf8: sll   zero, zero, 0
-// 0x01025bfc: 0x1025bfc: addiu v1, v0, -2001
+// 0x01025c08: 0x1025c08: sll   zero, zero, 0
+// 0x01025c0c: 0x1025c0c: addiu v1, v0, -2001
 	ldloc 5
 	ldc.i4 -2001
 	add
 	stloc 6
-// 0x01025c00: 0x1025c00: sltiu v1, v1, 4999
+// 0x01025c10: 0x1025c10: sltiu v1, v1, 4999
 	ldloc 6
 	ldc.i4 4999
 	clt.un
 	stloc 6
-// 0x01025c04: 0x1025c04: bne   v1, zero, 0x1025c1c slti  v1, v0, 3000
+// 0x01025c14: 0x1025c14: bne   v1, zero, 0x1025c2c slti  v1, v0, 3000
 	ldloc 6
 	ldloc 5
 	ldc.i4 3000
 	clt
 	stloc 6
-	brtrue L_1025c1c
+	brtrue L_1025c2c
 // --- basic block ---
-// 0x01025c0c: 0x1025c0c: beq   v1, zero, 0x1025c20 sll   zero, zero, 0
+// 0x01025c1c: 0x1025c1c: beq   v1, zero, 0x1025c30 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1025c20
+	brfalse L_1025c30
 // --- basic block ---
-// 0x01025c14: 0x1025c14: j	 0x1025c20 addiu v0, zero, 3000
+// 0x01025c24: 0x1025c24: j	 0x1025c30 addiu v0, zero, 3000
 	ldc.i4 3000
 	stloc 5
-	br L_1025c20
+	br L_1025c30
 // --- basic block ---
-L_1025c1c:
-// 0x01025c1c: 0x1025c1c: addiu v0, zero, 7000
+L_1025c2c:
+// 0x01025c2c: 0x1025c2c: addiu v0, zero, 7000
 	ldc.i4 7000
 	stloc 5
-L_1025c20:
-// 0x01025c20: 0x1025c20: lw    ra, 20(sp)
-// 0x01025c24: 0x1025c24: lw    s0, 16(sp)
+L_1025c30:
+// 0x01025c30: 0x1025c30: lw    ra, 20(sp)
+// 0x01025c34: 0x1025c34: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2220,7 +2220,7 @@ L_1025c20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01025c28: 0x1025c28: jr    ra addiu sp, sp, 24
+// 0x01025c38: 0x1025c38: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2232,7 +2232,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_view_get_orientation_1025c30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_get_orientation_1025c40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2267,39 +2267,39 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01025c30: 0x1025c30: lui   v0, 0x60000
+// 0x01025c40: 0x1025c40: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025c34: 0x1025c34: lw    v0, -26560(v0)
+// 0x01025c44: 0x1025c44: lw    v0, -26096(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6640
+	ldc.i4 -6524
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025c38: 0x1025c38: addiu sp, sp, -24
+// 0x01025c48: 0x1025c48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01025c3c: 0x1025c3c: bne   v0, zero, 0x1025c54 sw    ra, 20(sp)
+// 0x01025c4c: 0x1025c4c: bne   v0, zero, 0x1025c64 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1025c54
+	brtrue L_1025c64
 // --- basic block ---
-// 0x01025c44: 0x1025c44: jal   0x1007a4c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_get_orientation_1007a4c()
+// 0x01025c54: 0x1025c54: jal   0x1007a5c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_get_orientation_1007a5c()
 	stloc 5
 // --- basic block ---
-// 0x01025c4c: 0x1025c4c: j	 0x1025cd8 sll   zero, zero, 0
-	br L_1025cd8
+// 0x01025c5c: 0x1025c5c: j	 0x1025ce8 sll   zero, zero, 0
+	br L_1025ce8
 // --- basic block ---
-L_1025c54:
-// 0x01025c54: 0x1025c54: lui   v0, 0x0
+L_1025c64:
+// 0x01025c64: 0x1025c64: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01025c58: 0x1025c58: lw    v1, 6208(v0)
+// 0x01025c68: 0x1025c68: lw    v1, 6208(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2308,44 +2308,44 @@ L_1025c54:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025c5c: 0x1025c5c: addiu v0, zero, 1
+// 0x01025c6c: 0x1025c6c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01025c60: 0x1025c60: beq   v1, v0, 0x1025c78 sll   zero, zero, 0
+// 0x01025c70: 0x1025c70: beq   v1, v0, 0x1025c88 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_1025c78
+	beq  L_1025c88
 // --- basic block ---
-// 0x01025c68: 0x1025c68: jal   0x101ddd4 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_orientation_101ddd4()
+// 0x01025c78: 0x1025c78: jal   0x101dde4 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_orientation_101dde4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025c70: 0x1025c70: j	 0x1025cd8 sll   zero, zero, 0
-	br L_1025cd8
+// 0x01025c80: 0x1025c80: j	 0x1025ce8 sll   zero, zero, 0
+	br L_1025ce8
 // --- basic block ---
-L_1025c78:
-// 0x01025c78: 0x1025c78: jal   0x10565bc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_track_enabled_10565bc()
+L_1025c88:
+// 0x01025c88: 0x1025c88: jal   0x10565cc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_track_enabled_10565cc()
 	stloc 5
 // --- basic block ---
-// 0x01025c80: 0x1025c80: bne   v0, zero, 0x1025cd4 lui   v0, 0x60000
+// 0x01025c90: 0x1025c90: bne   v0, zero, 0x1025ce4 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_1025cd4
+	brtrue L_1025ce4
 // --- basic block ---
-// 0x01025c88: 0x1025c88: jal   0x101ddd4 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_orientation_101ddd4()
+// 0x01025c98: 0x1025c98: jal   0x101dde4 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_orientation_101dde4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025c90: 0x1025c90: lui   v1, 0x0
+// 0x01025ca0: 0x1025ca0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01025c94: 0x1025c94: lw    a0, 6212(v1)
+// 0x01025ca4: 0x1025ca4: lw    a0, 6212(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2354,47 +2354,47 @@ L_1025c78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01025c98: 0x1025c98: addiu v1, zero, -1
+// 0x01025ca8: 0x1025ca8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01025c9c: 0x1025c9c: beq   a0, v1, 0x1025cbc subu  a0, v0, a0
+// 0x01025cac: 0x1025cac: beq   a0, v1, 0x1025ccc subu  a0, v0, a0
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldloc.1
 	sub
 	stloc.1
-	beq  L_1025cbc
+	beq  L_1025ccc
 // --- basic block ---
-// 0x01025ca4: 0x1025ca4: sra   v1, a0, 31
+// 0x01025cb4: 0x1025cb4: sra   v1, a0, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc 6
-// 0x01025ca8: 0x1025ca8: xor   a0, v1, a0
+// 0x01025cb8: 0x1025cb8: xor   a0, v1, a0
 	ldloc 6
 	ldloc.1
 	xor
 	stloc.1
-// 0x01025cac: 0x1025cac: subu  v1, a0, v1
+// 0x01025cbc: 0x1025cbc: subu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	sub
 	stloc 6
-// 0x01025cb0: 0x1025cb0: slti  v1, v1, 11
+// 0x01025cc0: 0x1025cc0: slti  v1, v1, 11
 	ldloc 6
 	ldc.i4.s 11
 	clt
 	stloc 6
-// 0x01025cb4: 0x1025cb4: bne   v1, zero, 0x1025cc4 sll   zero, zero, 0
+// 0x01025cc4: 0x1025cc4: bne   v1, zero, 0x1025cd4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1025cc4
+	brtrue L_1025cd4
 // --- basic block ---
-L_1025cbc:
-// 0x01025cbc: 0x1025cbc: lui   v1, 0x0
+L_1025ccc:
+// 0x01025ccc: 0x1025ccc: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01025cc0: 0x1025cc0: sw    v0, 6212(v1)
+// 0x01025cd0: 0x1025cd0: sw    v0, 6212(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2403,11 +2403,11 @@ L_1025cbc:
 	add
 	ldloc 5
 	stelem.i4
-L_1025cc4:
-// 0x01025cc4: 0x1025cc4: lui   v0, 0x0
+L_1025cd4:
+// 0x01025cd4: 0x1025cd4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01025cc8: 0x1025cc8: lw    v0, 6212(v0)
+// 0x01025cd8: 0x1025cd8: lw    v0, 6212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2416,23 +2416,23 @@ L_1025cc4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025ccc: 0x1025ccc: j	 0x1025cd8 sll   zero, zero, 0
-	br L_1025cd8
+// 0x01025cdc: 0x1025cdc: j	 0x1025ce8 sll   zero, zero, 0
+	br L_1025ce8
 // --- basic block ---
-L_1025cd4:
-// 0x01025cd4: 0x1025cd4: lw    v0, -26544(v0)
+L_1025ce4:
+// 0x01025ce4: 0x1025ce4: lw    v0, -26080(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6636
+	ldc.i4 -6520
 	add
 	ldelem.i4
 	stloc 5
-L_1025cd8:
-// 0x01025cd8: 0x1025cd8: lw    ra, 20(sp)
-// 0x01025cdc: 0x1025cdc: sll   zero, zero, 0
-// 0x01025ce0: 0x1025ce0: jr    ra addiu sp, sp, 24
+L_1025ce8:
+// 0x01025ce8: 0x1025ce8: lw    ra, 20(sp)
+// 0x01025cec: 0x1025cec: sll   zero, zero, 0
+// 0x01025cf0: 0x1025cf0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2444,7 +2444,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_view_refresh_1025ce8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_view_refresh_1025cf8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 lo,int32 s2,int32 ra,int32 t0)
@@ -2494,13 +2494,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01025ce8: 0x1025ce8: addiu sp, sp, -32
+// 0x01025cf8: 0x1025cf8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01025cec: 0x1025cec: sw    ra, 28(sp)
-// 0x01025cf0: 0x1025cf0: sw    s2, 24(sp)
+// 0x01025cfc: 0x1025cfc: sw    ra, 28(sp)
+// 0x01025d00: 0x1025d00: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2509,7 +2509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01025cf4: 0x1025cf4: sw    s1, 20(sp)
+// 0x01025d04: 0x1025d04: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2518,7 +2518,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01025cf8: 0x1025cf8: jal   0x101de10 sw    s0, 16(sp)
+// 0x01025d08: 0x1025d08: jal   0x101de20 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2527,24 +2527,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025d00: 0x1025d00: beq   v0, zero, 0x1025d1c addu  v1, zero, zero
+// 0x01025d10: 0x1025d10: beq   v0, zero, 0x1025d2c addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1025d1c
+	brfalse L_1025d2c
 // --- basic block ---
-// 0x01025d08: 0x1025d08: lui   a1, 0x10000
+// 0x01025d18: 0x1025d18: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01025d0c: 0x1025d0c: addu  a0, v0, zero
+// 0x01025d1c: 0x1025d1c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01025d10: 0x1025d10: jal   0x1001b14 addiu a1, a1, -31052
+// 0x01025d20: 0x1025d20: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -2554,648 +2554,648 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01025d18: 0x1025d18: sltiu v1, v0, 1
+// 0x01025d28: 0x1025d28: sltiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 6
-L_1025d1c:
-// 0x01025d1c: 0x1025d1c: lui   v0, 0x60000
+L_1025d2c:
+// 0x01025d2c: 0x1025d2c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025d20: 0x1025d20: beq   v1, zero, 0x1025d64 sw    v1, -26560(v0)
+// 0x01025d30: 0x1025d30: beq   v1, zero, 0x1025d74 sw    v1, -26096(v0)
 	ldloc 6
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6640
+	ldc.i4 -6524
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_1025d64
+	brfalse L_1025d74
 // --- basic block ---
-// 0x01025d28: 0x1025d28: jal   0x101f8bc addiu s0, zero, 1
+// 0x01025d38: 0x1025d38: jal   0x101f8cc addiu s0, zero, 1
 	ldc.i4.1
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_get_orientation_mode_101f8bc()
+	call int32 Cibyl23::roadmap_screen_get_orientation_mode_101f8cc()
 	stloc 5
 // --- basic block ---
-// 0x01025d30: 0x1025d30: beq   v0, s0, 0x1025d68 addu  a0, zero, zero
+// 0x01025d40: 0x1025d40: beq   v0, s0, 0x1025d78 addu  a0, zero, zero
 	ldloc 5
 	ldloc 9
 	ldc.i4.s 0
 	stloc.1
-	beq  L_1025d68
+	beq  L_1025d78
 // --- basic block ---
-// 0x01025d38: 0x1025d38: jal   0x101f888 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_nonogl_view_mode_101f888()
+// 0x01025d48: 0x1025d48: jal   0x101f898 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_nonogl_view_mode_101f898()
 	stloc 5
 // --- basic block ---
-// 0x01025d40: 0x1025d40: beq   v0, s0, 0x1025d64 sll   zero, zero, 0
+// 0x01025d50: 0x1025d50: beq   v0, s0, 0x1025d74 sll   zero, zero, 0
 	ldloc 5
 	ldloc 9
-	beq  L_1025d64
+	beq  L_1025d74
 // --- basic block ---
-// 0x01025d48: 0x1025d48: jal   0x101f8cc sll   zero, zero, 0
+// 0x01025d58: 0x1025d58: jal   0x101f8dc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_height_101f8cc(int32)
+	call int32 Cibyl23::roadmap_screen_height_101f8dc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025d50: 0x1025d50: addiu a0, zero, -6
+// 0x01025d60: 0x1025d60: addiu a0, zero, -6
 	ldc.i4.s -6
 	stloc.1
-// 0x01025d54: 0x1025d54: div   v0, a0
+// 0x01025d64: 0x1025d64: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 10
-// 0x01025d58: 0x1025d58: mflo  lo
+// 0x01025d68: 0x1025d68: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x01025d5c: 0x1025d5c: j	 0x1025d68 sll   zero, zero, 0
-	br L_1025d68
+// 0x01025d6c: 0x1025d6c: j	 0x1025d78 sll   zero, zero, 0
+	br L_1025d78
 // --- basic block ---
-L_1025d64:
-// 0x01025d64: 0x1025d64: addu  a0, zero, zero
+L_1025d74:
+// 0x01025d74: 0x1025d74: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_1025d68:
-// 0x01025d68: 0x1025d68: jal   0x1020f7c sll   zero, zero, 0
+L_1025d78:
+// 0x01025d78: 0x1025d78: jal   0x1020f8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025d70: 0x1025d70: jal   0x10565cc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+// 0x01025d80: 0x1025d80: jal   0x10565dc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x01025d78: 0x1025d78: bne   v0, zero, 0x1025df0 sll   zero, zero, 0
+// 0x01025d88: 0x1025d88: bne   v0, zero, 0x1025e00 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1025df0
+	brtrue L_1025e00
 // --- basic block ---
-// 0x01025d80: 0x1025d80: jal   0x10565bc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_track_enabled_10565bc()
+// 0x01025d90: 0x1025d90: jal   0x10565cc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_track_enabled_10565cc()
 	stloc 5
 // --- basic block ---
-// 0x01025d88: 0x1025d88: bne   v0, zero, 0x1025dd0 sll   zero, zero, 0
+// 0x01025d98: 0x1025d98: bne   v0, zero, 0x1025de0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1025dd0
+	brtrue L_1025de0
 // --- basic block ---
-// 0x01025d90: 0x1025d90: jal   0x10565ec sll   zero, zero, 0
-	call int32 Cibyl64::navigate_offtrack_10565ec()
+// 0x01025da0: 0x1025da0: jal   0x10565fc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_offtrack_10565fc()
 	stloc 5
 // --- basic block ---
-// 0x01025d98: 0x1025d98: bne   v0, zero, 0x1025dd0 addu  v1, v0, zero
+// 0x01025da8: 0x1025da8: bne   v0, zero, 0x1025de0 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 6
-	brtrue L_1025dd0
+	brtrue L_1025de0
 // --- basic block ---
-// 0x01025da0: 0x1025da0: lui   v0, 0x60000
+// 0x01025db0: 0x1025db0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025da4: 0x1025da4: lw    a0, -26568(v0)
+// 0x01025db4: 0x1025db4: lw    a0, -26104(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc.1
-// 0x01025da8: 0x1025da8: sll   zero, zero, 0
-// 0x01025dac: 0x1025dac: beq   a0, zero, 0x1026218 sll   zero, zero, 0
+// 0x01025db8: 0x1025db8: sll   zero, zero, 0
+// 0x01025dbc: 0x1025dbc: beq   a0, zero, 0x1026228 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1026218
+	brfalse L_1026228
 // --- basic block ---
-// 0x01025db4: 0x1025db4: sw    zero, -26568(v0)
+// 0x01025dc4: 0x1025dc4: sw    zero, -26104(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01025db8: 0x1025db8: cibyl_sysc_arg 0x3
+// 0x01025dc8: 0x1025dc8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01025dbc: 0x1025dbc: cibyl_sysc 0x3e1
+// 0x01025dcc: 0x1025dcc: cibyl_sysc 0x3e1
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025dc0: 0x1025dc0: addu  v1, v0, zero
+// 0x01025dd0: 0x1025dd0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01025dc4: 0x1025dc4: lui   v0, 0x60000
+// 0x01025dd4: 0x1025dd4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025dc8: 0x1025dc8: j	 0x1026218 sw    v1, -26540(v0)
+// 0x01025dd8: 0x1025dd8: j	 0x1026228 sw    v1, -26076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldloc 6
 	stelem.i4
-	br L_1026218
+	br L_1026228
 // --- basic block ---
-L_1025dd0:
-// 0x01025dd0: 0x1025dd0: jal   0x10565ec sll   zero, zero, 0
-	call int32 Cibyl64::navigate_offtrack_10565ec()
+L_1025de0:
+// 0x01025de0: 0x1025de0: jal   0x10565fc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_offtrack_10565fc()
 	stloc 5
 // --- basic block ---
-// 0x01025dd8: 0x1025dd8: bne   v0, zero, 0x1026218 sll   zero, zero, 0
+// 0x01025de8: 0x1025de8: bne   v0, zero, 0x1026228 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1026218
+	brtrue L_1026228
 // --- basic block ---
-// 0x01025de0: 0x1025de0: jal   0x10573dc sll   zero, zero, 0
+// 0x01025df0: 0x1025df0: jal   0x10573ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_is_auto_zoom_10573dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_is_auto_zoom_10573ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025de8: 0x1025de8: beq   v0, zero, 0x1026218 sll   zero, zero, 0
+// 0x01025df8: 0x1025df8: beq   v0, zero, 0x1026228 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1026218
+	brfalse L_1026228
 // --- basic block ---
-L_1025df0:
-// 0x01025df0: 0x1025df0: jal   0x10565cc lui   s0, 0x60000
+L_1025e00:
+// 0x01025e00: 0x1025e00: jal   0x10565dc lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 9
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x01025df8: 0x1025df8: beq   v0, zero, 0x1025f94 addu  v1, v0, zero
+// 0x01025e08: 0x1025e08: beq   v0, zero, 0x1025fa4 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 6
-	brfalse L_1025f94
+	brfalse L_1025fa4
 // --- basic block ---
-// 0x01025e00: 0x1025e00: lw    s1, -26568(s0)
+// 0x01025e10: 0x1025e10: lw    s1, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 8
-// 0x01025e04: 0x1025e04: sll   zero, zero, 0
-// 0x01025e08: 0x1025e08: bne   s1, zero, 0x1025e6c addiu v0, zero, 1
+// 0x01025e14: 0x1025e14: sll   zero, zero, 0
+// 0x01025e18: 0x1025e18: bne   s1, zero, 0x1025e7c addiu v0, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc 5
-	brtrue L_1025e6c
+	brtrue L_1025e7c
 // --- basic block ---
-// 0x01025e10: 0x1025e10: jal   0x10259c4 sll   zero, zero, 0
+// 0x01025e20: 0x1025e20: jal   0x10259d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_reset_10259c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_reset_10259d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025e18: 0x1025e18: jal   0x10565cc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+// 0x01025e28: 0x1025e28: jal   0x10565dc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x01025e20: 0x1025e20: beq   v0, zero, 0x1025e54 addu  v1, v0, zero
+// 0x01025e30: 0x1025e30: beq   v0, zero, 0x1025e64 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 6
-	brfalse L_1025e54
+	brfalse L_1025e64
 // --- basic block ---
-// 0x01025e28: 0x1025e28: lw    v1, -26568(s0)
+// 0x01025e38: 0x1025e38: lw    v1, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025e2c: 0x1025e2c: addiu v0, zero, 2
+// 0x01025e3c: 0x1025e3c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01025e30: 0x1025e30: beq   v1, v0, 0x1025f84 sll   zero, zero, 0
+// 0x01025e40: 0x1025e40: beq   v1, v0, 0x1025f94 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_1025f84
+	beq  L_1025f94
 // --- basic block ---
-// 0x01025e38: 0x1025e38: sw    v0, -26568(s0)
+// 0x01025e48: 0x1025e48: sw    v0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldloc 5
 	stelem.i4
-// 0x01025e3c: 0x1025e3c: cibyl_sysc_arg 0x11
+// 0x01025e4c: 0x1025e4c: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x01025e40: 0x1025e40: cibyl_sysc 0x3e6
+// 0x01025e50: 0x1025e50: cibyl_sysc 0x3e6
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025e44: 0x1025e44: addu  s1, v0, zero
+// 0x01025e54: 0x1025e54: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01025e48: 0x1025e48: lui   v0, 0x60000
+// 0x01025e58: 0x1025e58: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025e4c: 0x1025e4c: j	 0x1025f84 sw    s1, -26540(v0)
+// 0x01025e5c: 0x1025e5c: j	 0x1025f94 sw    s1, -26076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldloc 8
 	stelem.i4
-	br L_1025f84
+	br L_1025f94
 // --- basic block ---
-L_1025e54:
-// 0x01025e54: 0x1025e54: lw    a0, -26568(s0)
+L_1025e64:
+// 0x01025e64: 0x1025e64: lw    a0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc.1
-// 0x01025e58: 0x1025e58: addiu v0, zero, 1
+// 0x01025e68: 0x1025e68: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01025e5c: 0x1025e5c: beq   a0, v0, 0x1025f84 sll   zero, zero, 0
+// 0x01025e6c: 0x1025e6c: beq   a0, v0, 0x1025f94 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1025f84
+	beq  L_1025f94
 // --- basic block ---
-// 0x01025e64: 0x1025e64: j	 0x1025e98 sw    v0, -26568(s0)
+// 0x01025e74: 0x1025e74: j	 0x1025ea8 sw    v0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldloc 5
 	stelem.i4
-	br L_1025e98
+	br L_1025ea8
 // --- basic block ---
-L_1025e6c:
-// 0x01025e6c: 0x1025e6c: bne   s1, v0, 0x1025f3c addiu v0, zero, 2
+L_1025e7c:
+// 0x01025e7c: 0x1025e7c: bne   s1, v0, 0x1025f4c addiu v0, zero, 2
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	bne.un L_1025f3c
+	bne.un L_1025f4c
 // --- basic block ---
-// 0x01025e74: 0x1025e74: jal   0x10565cc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+// 0x01025e84: 0x1025e84: jal   0x10565dc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x01025e7c: 0x1025e7c: beq   v0, zero, 0x1025eb0 addu  s1, v0, zero
+// 0x01025e8c: 0x1025e8c: beq   v0, zero, 0x1025ec0 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_1025eb0
+	brfalse L_1025ec0
 // --- basic block ---
-// 0x01025e84: 0x1025e84: lw    v1, -26568(s0)
+// 0x01025e94: 0x1025e94: lw    v1, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025e88: 0x1025e88: addiu v0, zero, 2
+// 0x01025e98: 0x1025e98: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01025e8c: 0x1025e8c: beq   v1, v0, 0x1025f84 addu  v1, zero, zero
+// 0x01025e9c: 0x1025e9c: beq   v1, v0, 0x1025f94 addu  v1, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	beq  L_1025f84
+	beq  L_1025f94
 // --- basic block ---
-// 0x01025e94: 0x1025e94: sw    v0, -26568(s0)
+// 0x01025ea4: 0x1025ea4: sw    v0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldloc 5
 	stelem.i4
-L_1025e98:
-// 0x01025e98: 0x1025e98: cibyl_sysc_arg 0x3
+L_1025ea8:
+// 0x01025ea8: 0x1025ea8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01025e9c: 0x1025e9c: cibyl_sysc 0x3eb
+// 0x01025eac: 0x1025eac: cibyl_sysc 0x3eb
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025ea0: 0x1025ea0: addu  v1, v0, zero
+// 0x01025eb0: 0x1025eb0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01025ea4: 0x1025ea4: lui   v0, 0x60000
+// 0x01025eb4: 0x1025eb4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025ea8: 0x1025ea8: j	 0x1025f84 sw    v1, -26540(v0)
+// 0x01025eb8: 0x1025eb8: j	 0x1025f94 sw    v1, -26076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldloc 6
 	stelem.i4
-	br L_1025f84
+	br L_1025f94
 // --- basic block ---
-L_1025eb0:
-// 0x01025eb0: 0x1025eb0: jal   0x10565dc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_is_alt_routes_10565dc()
+L_1025ec0:
+// 0x01025ec0: 0x1025ec0: jal   0x10565ec sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_is_alt_routes_10565ec()
 	stloc 5
 // --- basic block ---
-// 0x01025eb8: 0x1025eb8: beq   v0, zero, 0x1025eec addu  v1, v0, zero
+// 0x01025ec8: 0x1025ec8: beq   v0, zero, 0x1025efc addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 6
-	brfalse L_1025eec
+	brfalse L_1025efc
 // --- basic block ---
-// 0x01025ec0: 0x1025ec0: lw    v1, -26568(s0)
+// 0x01025ed0: 0x1025ed0: lw    v1, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 6
-// 0x01025ec4: 0x1025ec4: addiu v0, zero, 3
+// 0x01025ed4: 0x1025ed4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01025ec8: 0x1025ec8: beq   v1, v0, 0x1025fc4 sll   zero, zero, 0
+// 0x01025ed8: 0x1025ed8: beq   v1, v0, 0x1025fd4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_1025fc4
+	beq  L_1025fd4
 // --- basic block ---
-// 0x01025ed0: 0x1025ed0: sw    v0, -26568(s0)
+// 0x01025ee0: 0x1025ee0: sw    v0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldloc 5
 	stelem.i4
-// 0x01025ed4: 0x1025ed4: cibyl_sysc_arg 0x11
+// 0x01025ee4: 0x1025ee4: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x01025ed8: 0x1025ed8: cibyl_sysc 0x3f0
+// 0x01025ee8: 0x1025ee8: cibyl_sysc 0x3f0
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025edc: 0x1025edc: addu  s1, v0, zero
+// 0x01025eec: 0x1025eec: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01025ee0: 0x1025ee0: lui   v0, 0x60000
+// 0x01025ef0: 0x1025ef0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025ee4: 0x1025ee4: j	 0x1025fc4 sw    s1, -26540(v0)
+// 0x01025ef4: 0x1025ef4: j	 0x1025fd4 sw    s1, -26076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldloc 8
 	stelem.i4
-	br L_1025fc4
+	br L_1025fd4
 // --- basic block ---
-L_1025eec:
-// 0x01025eec: 0x1025eec: cibyl_sysc_arg 0x3
+L_1025efc:
+// 0x01025efc: 0x1025efc: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01025ef0: 0x1025ef0: cibyl_sysc 0x3f5
+// 0x01025f00: 0x1025f00: cibyl_sysc 0x3f5
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025ef4: 0x1025ef4: addu  a1, v0, zero
+// 0x01025f04: 0x1025f04: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01025ef8: 0x1025ef8: lui   a0, 0x60000
+// 0x01025f08: 0x1025f08: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01025efc: 0x1025efc: lw    v0, -26540(a0)
+// 0x01025f0c: 0x1025f0c: lw    v0, -26076(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025f00: 0x1025f00: sll   zero, zero, 0
-// 0x01025f04: 0x1025f04: subu  a1, a1, v0
+// 0x01025f10: 0x1025f10: sll   zero, zero, 0
+// 0x01025f14: 0x1025f14: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x01025f08: 0x1025f08: slti  a1, a1, 9
+// 0x01025f18: 0x1025f18: slti  a1, a1, 9
 	ldloc.2
 	ldc.i4.s 9
 	clt
 	stloc.2
-// 0x01025f0c: 0x1025f0c: bne   a1, zero, 0x1025fcc addiu v0, zero, 3
+// 0x01025f1c: 0x1025f1c: bne   a1, zero, 0x1025fdc addiu v0, zero, 3
 	ldloc.2
 	ldc.i4.3
 	stloc 5
-	brtrue L_1025fcc
+	brtrue L_1025fdc
 // --- basic block ---
-// 0x01025f14: 0x1025f14: lw    a1, -26568(s0)
+// 0x01025f24: 0x1025f24: lw    a1, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc.2
-// 0x01025f18: 0x1025f18: sll   zero, zero, 0
-// 0x01025f1c: 0x1025f1c: beq   a1, v0, 0x1025fc4 sll   zero, zero, 0
+// 0x01025f28: 0x1025f28: sll   zero, zero, 0
+// 0x01025f2c: 0x1025f2c: beq   a1, v0, 0x1025fd4 sll   zero, zero, 0
 	ldloc.2
 	ldloc 5
-	beq  L_1025fc4
+	beq  L_1025fd4
 // --- basic block ---
-// 0x01025f24: 0x1025f24: sw    v0, -26568(s0)
+// 0x01025f34: 0x1025f34: sw    v0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldloc 5
 	stelem.i4
-// 0x01025f28: 0x1025f28: cibyl_sysc_arg 0x3
+// 0x01025f38: 0x1025f38: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01025f2c: 0x1025f2c: cibyl_sysc 0x3fa
+// 0x01025f3c: 0x1025f3c: cibyl_sysc 0x3fa
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025f30: 0x1025f30: addu  v1, v0, zero
+// 0x01025f40: 0x1025f40: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01025f34: 0x1025f34: j	 0x1025fc4 sw    v1, -26540(a0)
+// 0x01025f44: 0x1025f44: j	 0x1025fd4 sw    v1, -26076(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldloc 6
 	stelem.i4
-	br L_1025fc4
+	br L_1025fd4
 // --- basic block ---
-L_1025f3c:
-// 0x01025f3c: 0x1025f3c: bne   s1, v0, 0x1025fcc sll   zero, zero, 0
+L_1025f4c:
+// 0x01025f4c: 0x1025f4c: bne   s1, v0, 0x1025fdc sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_1025fcc
+	bne.un L_1025fdc
 // --- basic block ---
-// 0x01025f44: 0x1025f44: jal   0x10565cc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+// 0x01025f54: 0x1025f54: jal   0x10565dc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x01025f4c: 0x1025f4c: bne   v0, zero, 0x1025f84 addu  v1, v0, zero
+// 0x01025f5c: 0x1025f5c: bne   v0, zero, 0x1025f94 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 6
-	brtrue L_1025f84
+	brtrue L_1025f94
 // --- basic block ---
-// 0x01025f54: 0x1025f54: lw    v0, -26568(s0)
+// 0x01025f64: 0x1025f64: lw    v0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 5
-// 0x01025f58: 0x1025f58: sll   zero, zero, 0
-// 0x01025f5c: 0x1025f5c: beq   v0, zero, 0x1025f7c sll   zero, zero, 0
+// 0x01025f68: 0x1025f68: sll   zero, zero, 0
+// 0x01025f6c: 0x1025f6c: beq   v0, zero, 0x1025f8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1025f7c
+	brfalse L_1025f8c
 // --- basic block ---
-// 0x01025f64: 0x1025f64: sw    zero, -26568(s0)
+// 0x01025f74: 0x1025f74: sw    zero, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01025f68: 0x1025f68: cibyl_sysc_arg 0x3
+// 0x01025f78: 0x1025f78: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01025f6c: 0x1025f6c: cibyl_sysc 0x3ff
+// 0x01025f7c: 0x1025f7c: cibyl_sysc 0x3ff
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025f70: 0x1025f70: addu  v1, v0, zero
+// 0x01025f80: 0x1025f80: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01025f74: 0x1025f74: lui   v0, 0x60000
+// 0x01025f84: 0x1025f84: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025f78: 0x1025f78: sw    v1, -26540(v0)
+// 0x01025f88: 0x1025f88: sw    v1, -26076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldloc 6
 	stelem.i4
-L_1025f7c:
-// 0x01025f7c: 0x1025f7c: jal   0x101f93c sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_set_orientation_dynamic_101f93c()
+L_1025f8c:
+// 0x01025f8c: 0x1025f8c: jal   0x101f94c sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_set_orientation_dynamic_101f94c()
 	stloc 5
 // --- basic block ---
-L_1025f84:
-// 0x01025f84: 0x1025f84: jal   0x1021280 sll   zero, zero, 0
+L_1025f94:
+// 0x01025f94: 0x1025f94: jal   0x1021290 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_set_orientation_fixed_1021280(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_set_orientation_fixed_1021290(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025f8c: 0x1025f8c: j	 0x1025fcc sll   zero, zero, 0
-	br L_1025fcc
+// 0x01025f9c: 0x1025f9c: j	 0x1025fdc sll   zero, zero, 0
+	br L_1025fdc
 // --- basic block ---
-L_1025f94:
-// 0x01025f94: 0x1025f94: lw    a0, -26568(s0)
+L_1025fa4:
+// 0x01025fa4: 0x1025fa4: lw    a0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc.1
-// 0x01025f98: 0x1025f98: addiu v0, zero, 3
+// 0x01025fa8: 0x1025fa8: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01025f9c: 0x1025f9c: beq   a0, v0, 0x1025fbc sll   zero, zero, 0
+// 0x01025fac: 0x1025fac: beq   a0, v0, 0x1025fcc sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1025fbc
+	beq  L_1025fcc
 // --- basic block ---
-// 0x01025fa4: 0x1025fa4: sw    v0, -26568(s0)
+// 0x01025fb4: 0x1025fb4: sw    v0, -26104(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldloc 5
 	stelem.i4
-// 0x01025fa8: 0x1025fa8: cibyl_sysc_arg 0x3
+// 0x01025fb8: 0x1025fb8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01025fac: 0x1025fac: cibyl_sysc 0x404
+// 0x01025fbc: 0x1025fbc: cibyl_sysc 0x404
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01025fb0: 0x1025fb0: addu  v1, v0, zero
+// 0x01025fc0: 0x1025fc0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01025fb4: 0x1025fb4: lui   v0, 0x60000
+// 0x01025fc4: 0x1025fc4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025fb8: 0x1025fb8: sw    v1, -26540(v0)
+// 0x01025fc8: 0x1025fc8: sw    v1, -26076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6635
+	ldc.i4 -6519
 	add
 	ldloc 6
 	stelem.i4
-L_1025fbc:
-// 0x01025fbc: 0x1025fbc: jal   0x1020f7c addu  a0, zero, zero
+L_1025fcc:
+// 0x01025fcc: 0x1025fcc: jal   0x1020f8c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3203,74 +3203,74 @@ L_1025fbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1025fc4:
-// 0x01025fc4: 0x1025fc4: jal   0x101f93c sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_set_orientation_dynamic_101f93c()
+L_1025fd4:
+// 0x01025fd4: 0x1025fd4: jal   0x101f94c sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_set_orientation_dynamic_101f94c()
 	stloc 5
 // --- basic block ---
-L_1025fcc:
-// 0x01025fcc: 0x1025fcc: jal   0x101de30 addiu s1, zero, 1
+L_1025fdc:
+// 0x01025fdc: 0x1025fdc: jal   0x101de40 addiu s1, zero, 1
 	ldc.i4.1
 	stloc 8
-	call int32 Cibyl22::roadmap_trip_get_focus_position_101de30()
+	call int32 Cibyl22::roadmap_trip_get_focus_position_101de40()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025fd4: 0x1025fd4: addu  s0, v0, zero
+// 0x01025fe4: 0x1025fe4: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01025fd8: 0x1025fd8: lui   v0, 0x60000
+// 0x01025fe8: 0x1025fe8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01025fdc: 0x1025fdc: lw    s2, -26568(v0)
+// 0x01025fec: 0x1025fec: lw    s2, -26104(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6642
+	ldc.i4 -6526
 	add
 	ldelem.i4
 	stloc 11
-// 0x01025fe0: 0x1025fe0: sll   zero, zero, 0
-// 0x01025fe4: 0x1025fe4: bne   s2, s1, 0x1026090 addiu v0, zero, 2
+// 0x01025ff0: 0x1025ff0: sll   zero, zero, 0
+// 0x01025ff4: 0x1025ff4: bne   s2, s1, 0x10260a0 addiu v0, zero, 2
 	ldloc 11
 	ldloc 8
 	ldc.i4.2
 	stloc 5
-	bne.un L_1026090
+	bne.un L_10260a0
 // --- basic block ---
-// 0x01025fec: 0x1025fec: lui   s1, 0x60000
+// 0x01025ffc: 0x1025ffc: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01025ff0: 0x1025ff0: addiu a1, s1, -26556
+// 0x01026000: 0x1026000: addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x01025ff4: 0x1025ff4: jal   0x10565fc addiu a0, zero, -1
+// 0x01026004: 0x1026004: jal   0x105660c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_get_waypoint_10565fc(int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_get_waypoint_105660c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01025ffc: 0x1025ffc: addu  a0, s0, zero
+// 0x0102600c: 0x102600c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01026000: 0x1026000: jal   0x1008eb0 addiu a1, s1, -26556
+// 0x01026010: 0x1026010: jal   0x1008ec0 addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
 	ldloc.0
@@ -3278,52 +3278,52 @@ L_1025fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026008: 0x1026008: addiu v1, zero, 9
+// 0x01026018: 0x1026018: addiu v1, zero, 9
 	ldc.i4.s 9
 	stloc 6
-// 0x0102600c: 0x102600c: mult  v0, v1
+// 0x0102601c: 0x102601c: mult  v0, v1
 	ldloc 5
 	ldloc 6
 	mul
 	stloc 10
-// 0x01026010: 0x1026010: addiu v1, zero, 4
+// 0x01026020: 0x1026020: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x01026014: 0x1026014: lui   a2, 0x60000
+// 0x01026024: 0x1026024: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01026018: 0x1026018: addu  a0, s0, zero
+// 0x01026028: 0x1026028: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102601c: 0x102601c: addiu a1, s1, -26556
+// 0x0102602c: 0x102602c: addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x01026020: 0x1026020: mflo  lo
+// 0x01026030: 0x1026030: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x01026024: 0x1026024: sll   zero, zero, 0
-// 0x01026028: 0x1026028: sll   zero, zero, 0
-// 0x0102602c: 0x102602c: div   v0, v1
+// 0x01026034: 0x1026034: sll   zero, zero, 0
+// 0x01026038: 0x1026038: sll   zero, zero, 0
+// 0x0102603c: 0x102603c: div   v0, v1
 	ldloc 5
 	ldloc 6
 	div
 	stloc 10
-// 0x01026030: 0x1026030: mflo  lo
+// 0x01026040: 0x1026040: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01026034: 0x1026034: jal   0x1009824 sw    v1, -26548(a2)
+// 0x01026044: 0x1026044: jal   0x1009834 sw    v1, -26084(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6637
+	ldc.i4 -6521
 	add
 	ldloc 6
 	stelem.i4
@@ -3332,17 +3332,17 @@ L_1025fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102603c: 0x102603c: addiu a1, s1, -26556
+// 0x0102604c: 0x102604c: addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x01026040: 0x1026040: lw    a3, 4(s0)
+// 0x01026050: 0x1026050: lw    a3, 4(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3351,23 +3351,23 @@ L_1025fcc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01026044: 0x1026044: lw    a2, 0(s0)
+// 0x01026054: 0x1026054: lw    a2, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01026048: 0x1026048: lw    v1, -26556(s1)
+// 0x01026058: 0x1026058: lw    v1, -26092(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6639
+	ldc.i4 -6523
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102604c: 0x102604c: lw    a0, 4(a1)
+// 0x0102605c: 0x102605c: lw    a0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3376,51 +3376,51 @@ L_1025fcc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01026050: 0x1026050: addu  a2, a2, v1
+// 0x01026060: 0x1026060: addu  a2, a2, v1
 	ldloc.3
 	ldloc 6
 	add
 	stloc.3
-// 0x01026054: 0x1026054: addu  a3, a3, a0
+// 0x01026064: 0x1026064: addu  a3, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc 4
-// 0x01026058: 0x1026058: addiu v1, zero, 2
+// 0x01026068: 0x1026068: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0102605c: 0x102605c: div   a3, v1
+// 0x0102606c: 0x102606c: div   a3, v1
 	ldloc 4
 	ldloc 6
 	div
 	stloc 10
-// 0x01026060: 0x1026060: addiu a0, zero, 360
+// 0x01026070: 0x1026070: addiu a0, zero, 360
 	ldc.i4 360
 	stloc.1
-// 0x01026064: 0x1026064: subu  v0, a0, v0
+// 0x01026074: 0x1026074: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01026068: 0x1026068: lui   t0, 0x60000
+// 0x01026078: 0x1026078: lui   t0, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x0102606c: 0x102606c: addu  a0, zero, zero
+// 0x0102607c: 0x102607c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01026070: 0x1026070: sw    v0, -26544(t0)
+// 0x01026080: 0x1026080: sw    v0, -26080(t0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6636
+	ldc.i4 -6520
 	add
 	ldloc 5
 	stelem.i4
-// 0x01026074: 0x1026074: mflo  lo
+// 0x01026084: 0x1026084: mflo  lo
 	ldloc 10
 	stloc 4
-// 0x01026078: 0x1026078: sw    a3, 4(a1)
+// 0x01026088: 0x1026088: sw    a3, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3429,38 +3429,38 @@ L_1025fcc:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0102607c: 0x102607c: sll   zero, zero, 0
-// 0x01026080: 0x1026080: div   a2, v1
+// 0x0102608c: 0x102608c: sll   zero, zero, 0
+// 0x01026090: 0x1026090: div   a2, v1
 	ldloc.3
 	ldloc 6
 	div
 	stloc 10
-// 0x01026084: 0x1026084: mflo  lo
+// 0x01026094: 0x1026094: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01026088: 0x1026088: j	 0x102613c sw    v1, -26556(s1)
+// 0x01026098: 0x1026098: j	 0x102614c sw    v1, -26092(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6639
+	ldc.i4 -6523
 	add
 	ldloc 6
 	stelem.i4
-	br L_102613c
+	br L_102614c
 // --- basic block ---
-L_1026090:
-// 0x01026090: 0x1026090: bne   s2, v0, 0x102614c lui   v0, 0x0
+L_10260a0:
+// 0x010260a0: 0x10260a0: bne   s2, v0, 0x102615c lui   v0, 0x0
 	ldloc 11
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_102614c
+	bne.un L_102615c
 // --- basic block ---
-// 0x01026098: 0x1026098: lui   s1, 0x60000
+// 0x010260a8: 0x10260a8: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0102609c: 0x102609c: jal   0x10477e0 addu  a0, s0, zero
+// 0x010260ac: 0x10260ac: jal   0x10477f0 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3468,17 +3468,17 @@ L_1026090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::roadmap_alternative_route_get_src_10477e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::roadmap_alternative_route_get_src_10477f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010260a4: 0x10260a4: addiu a1, s1, -26556
+// 0x010260b4: 0x10260b4: addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x010260a8: 0x10260a8: jal   0x104783c addiu a0, zero, -1
+// 0x010260b8: 0x10260b8: jal   0x104784c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.0
@@ -3486,17 +3486,17 @@ L_1026090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::roadmap_alternative_route_get_waypoint_104783c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::roadmap_alternative_route_get_waypoint_104784c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010260b0: 0x10260b0: addu  a0, s0, zero
+// 0x010260c0: 0x10260c0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010260b4: 0x10260b4: jal   0x1008eb0 addiu a1, s1, -26556
+// 0x010260c4: 0x10260c4: jal   0x1008ec0 addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
 	ldloc.0
@@ -3504,52 +3504,52 @@ L_1026090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010260bc: 0x10260bc: addiu v1, zero, 7
+// 0x010260cc: 0x10260cc: addiu v1, zero, 7
 	ldc.i4.7
 	stloc 6
-// 0x010260c0: 0x10260c0: mult  v0, v1
+// 0x010260d0: 0x10260d0: mult  v0, v1
 	ldloc 5
 	ldloc 6
 	mul
 	stloc 10
-// 0x010260c4: 0x10260c4: addiu v1, zero, 4
+// 0x010260d4: 0x10260d4: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x010260c8: 0x10260c8: lui   a2, 0x60000
+// 0x010260d8: 0x10260d8: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x010260cc: 0x10260cc: addu  a0, s0, zero
+// 0x010260dc: 0x10260dc: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010260d0: 0x10260d0: addiu a1, s1, -26556
+// 0x010260e0: 0x10260e0: addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x010260d4: 0x10260d4: mflo  lo
+// 0x010260e4: 0x10260e4: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010260d8: 0x10260d8: sll   zero, zero, 0
-// 0x010260dc: 0x10260dc: sll   zero, zero, 0
-// 0x010260e0: 0x10260e0: div   v0, v1
+// 0x010260e8: 0x10260e8: sll   zero, zero, 0
+// 0x010260ec: 0x10260ec: sll   zero, zero, 0
+// 0x010260f0: 0x10260f0: div   v0, v1
 	ldloc 5
 	ldloc 6
 	div
 	stloc 10
-// 0x010260e4: 0x10260e4: mflo  lo
+// 0x010260f4: 0x10260f4: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x010260e8: 0x10260e8: jal   0x1009824 sw    v1, -26548(a2)
+// 0x010260f8: 0x10260f8: jal   0x1009834 sw    v1, -26084(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6637
+	ldc.i4 -6521
 	add
 	ldloc 6
 	stelem.i4
@@ -3558,43 +3558,43 @@ L_1026090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010260f0: 0x10260f0: lw    a2, 0(s0)
+// 0x01026100: 0x1026100: lw    a2, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010260f4: 0x10260f4: lw    a0, -26556(s1)
+// 0x01026104: 0x1026104: lw    a0, -26092(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6639
+	ldc.i4 -6523
 	add
 	ldelem.i4
 	stloc.1
-// 0x010260f8: 0x10260f8: addiu v1, s1, -26556
+// 0x01026108: 0x1026108: addiu v1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc 6
-// 0x010260fc: 0x10260fc: addu  a2, a2, a0
+// 0x0102610c: 0x102610c: addu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.3
-// 0x01026100: 0x1026100: div   a2, s2
+// 0x01026110: 0x1026110: div   a2, s2
 	ldloc.3
 	ldloc 11
 	div
 	stloc 10
-// 0x01026104: 0x1026104: lw    a3, 4(s0)
+// 0x01026114: 0x1026114: lw    a3, 4(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3603,7 +3603,7 @@ L_1026090:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01026108: 0x1026108: lw    a1, 4(v1)
+// 0x01026118: 0x1026118: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3612,56 +3612,56 @@ L_1026090:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102610c: 0x102610c: addiu a0, zero, 360
+// 0x0102611c: 0x102611c: addiu a0, zero, 360
 	ldc.i4 360
 	stloc.1
-// 0x01026110: 0x1026110: addu  a1, a3, a1
+// 0x01026120: 0x1026120: addu  a1, a3, a1
 	ldloc 4
 	ldloc.2
 	add
 	stloc.2
-// 0x01026114: 0x1026114: subu  v0, a0, v0
+// 0x01026124: 0x1026124: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01026118: 0x1026118: lui   a3, 0x60000
+// 0x01026128: 0x1026128: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0102611c: 0x102611c: addiu a0, zero, 20
+// 0x0102612c: 0x102612c: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x01026120: 0x1026120: sw    v0, -26544(a3)
+// 0x01026130: 0x1026130: sw    v0, -26080(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6636
+	ldc.i4 -6520
 	add
 	ldloc 5
 	stelem.i4
-// 0x01026124: 0x1026124: mflo  lo
+// 0x01026134: 0x1026134: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x01026128: 0x1026128: sw    a2, -26556(s1)
+// 0x01026138: 0x1026138: sw    a2, -26092(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6639
+	ldc.i4 -6523
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102612c: 0x102612c: sll   zero, zero, 0
-// 0x01026130: 0x1026130: div   a1, s2
+// 0x0102613c: 0x102613c: sll   zero, zero, 0
+// 0x01026140: 0x1026140: div   a1, s2
 	ldloc.2
 	ldloc 11
 	div
 	stloc 10
-// 0x01026134: 0x1026134: mflo  lo
+// 0x01026144: 0x1026144: mflo  lo
 	ldloc 10
 	stloc 11
-// 0x01026138: 0x1026138: sw    s2, 4(v1)
+// 0x01026148: 0x1026148: sw    s2, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3670,23 +3670,23 @@ L_1026090:
 	add
 	ldloc 11
 	stelem.i4
-L_102613c:
-// 0x0102613c: 0x102613c: jal   0x1020f7c sll   zero, zero, 0
+L_102614c:
+// 0x0102614c: 0x102614c: jal   0x1020f8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026144: 0x1026144: j	 0x1026218 sll   zero, zero, 0
-	br L_1026218
+// 0x01026154: 0x1026154: j	 0x1026228 sll   zero, zero, 0
+	br L_1026228
 // --- basic block ---
-L_102614c:
-// 0x0102614c: 0x102614c: lw    v0, 6208(v0)
+L_102615c:
+// 0x0102615c: 0x102615c: lw    v0, 6208(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3695,103 +3695,103 @@ L_102614c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01026150: 0x1026150: sll   zero, zero, 0
-// 0x01026154: 0x1026154: beq   v0, s1, 0x1026218 lui   v0, 0x60000
+// 0x01026160: 0x1026160: sll   zero, zero, 0
+// 0x01026164: 0x1026164: beq   v0, s1, 0x1026228 lui   v0, 0x60000
 	ldloc 5
 	ldloc 8
 	ldc.i4 393216
 	stloc 5
-	beq  L_1026218
+	beq  L_1026228
 // --- basic block ---
-// 0x0102615c: 0x102615c: lw    v0, -26560(v0)
+// 0x0102616c: 0x102616c: lw    v0, -26096(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6640
+	ldc.i4 -6524
 	add
 	ldelem.i4
 	stloc 5
-// 0x01026160: 0x1026160: sll   zero, zero, 0
-// 0x01026164: 0x1026164: beq   v0, zero, 0x10261ac addu  a0, zero, zero
+// 0x01026170: 0x1026170: sll   zero, zero, 0
+// 0x01026174: 0x1026174: beq   v0, zero, 0x10261bc addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10261ac
+	brfalse L_10261bc
 // --- basic block ---
-// 0x0102616c: 0x102616c: jal   0x101f8bc sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_orientation_mode_101f8bc()
+// 0x0102617c: 0x102617c: jal   0x101f8cc sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_orientation_mode_101f8cc()
 	stloc 5
 // --- basic block ---
-// 0x01026174: 0x1026174: beq   v0, s1, 0x10261ac addu  a0, zero, zero
+// 0x01026184: 0x1026184: beq   v0, s1, 0x10261bc addu  a0, zero, zero
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 0
 	stloc.1
-	beq  L_10261ac
+	beq  L_10261bc
 // --- basic block ---
-// 0x0102617c: 0x102617c: jal   0x101f888 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_nonogl_view_mode_101f888()
+// 0x0102618c: 0x102618c: jal   0x101f898 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_nonogl_view_mode_101f898()
 	stloc 5
 // --- basic block ---
-// 0x01026184: 0x1026184: beq   v0, s1, 0x10261a8 sll   zero, zero, 0
+// 0x01026194: 0x1026194: beq   v0, s1, 0x10261b8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	beq  L_10261a8
+	beq  L_10261b8
 // --- basic block ---
-// 0x0102618c: 0x102618c: jal   0x101f8cc sll   zero, zero, 0
+// 0x0102619c: 0x102619c: jal   0x101f8dc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_height_101f8cc(int32)
+	call int32 Cibyl23::roadmap_screen_height_101f8dc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026194: 0x1026194: addiu a0, zero, -6
+// 0x010261a4: 0x10261a4: addiu a0, zero, -6
 	ldc.i4.s -6
 	stloc.1
-// 0x01026198: 0x1026198: div   v0, a0
+// 0x010261a8: 0x10261a8: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 10
-// 0x0102619c: 0x102619c: mflo  lo
+// 0x010261ac: 0x10261ac: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010261a0: 0x10261a0: j	 0x10261ac sll   zero, zero, 0
-	br L_10261ac
+// 0x010261b0: 0x10261b0: j	 0x10261bc sll   zero, zero, 0
+	br L_10261bc
 // --- basic block ---
-L_10261a8:
-// 0x010261a8: 0x10261a8: addu  a0, zero, zero
+L_10261b8:
+// 0x010261b8: 0x10261b8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_10261ac:
-// 0x010261ac: 0x10261ac: jal   0x1020f7c sll   zero, zero, 0
+L_10261bc:
+// 0x010261bc: 0x10261bc: jal   0x1020f8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010261b4: 0x10261b4: jal   0x10565cc sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_alt_routes_display_10565cc()
+// 0x010261c4: 0x10261c4: jal   0x10565dc sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_alt_routes_display_10565dc()
 	stloc 5
 // --- basic block ---
-// 0x010261bc: 0x10261bc: beq   v0, zero, 0x10261d8 lui   a1, 0x60000
+// 0x010261cc: 0x10261cc: beq   v0, zero, 0x10261e8 lui   a1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.2
-	brfalse L_10261d8
+	brfalse L_10261e8
 // --- basic block ---
-// 0x010261c4: 0x10261c4: addiu a1, a1, -26556
+// 0x010261d4: 0x10261d4: addiu a1, a1, -26092
 	ldloc.2
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x010261c8: 0x10261c8: jal   0x104783c addiu a0, zero, -1
+// 0x010261d8: 0x10261d8: jal   0x104784c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.0
@@ -3799,44 +3799,44 @@ L_10261ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::roadmap_alternative_route_get_waypoint_104783c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::roadmap_alternative_route_get_waypoint_104784c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010261d0: 0x10261d0: j	 0x10261e8 lui   s1, 0x60000
+// 0x010261e0: 0x10261e0: j	 0x10261f8 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-	br L_10261e8
+	br L_10261f8
 // --- basic block ---
-L_10261d8:
-// 0x010261d8: 0x10261d8: addiu a1, a1, -26556
+L_10261e8:
+// 0x010261e8: 0x10261e8: addiu a1, a1, -26092
 	ldloc.2
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x010261dc: 0x10261dc: jal   0x10565fc addiu a0, zero, 25000
+// 0x010261ec: 0x10261ec: jal   0x105660c addiu a0, zero, 25000
 	ldc.i4 25000
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_get_waypoint_10565fc(int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_get_waypoint_105660c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010261e4: 0x10261e4: lui   s1, 0x60000
+// 0x010261f4: 0x10261f4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-L_10261e8:
-// 0x010261e8: 0x10261e8: addu  a0, s0, zero
+L_10261f8:
+// 0x010261f8: 0x10261f8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010261ec: 0x10261ec: jal   0x1008eb0 addiu a1, s1, -26556
+// 0x010261fc: 0x10261fc: jal   0x1008ec0 addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
 	ldloc.0
@@ -3844,28 +3844,28 @@ L_10261e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010261f4: 0x10261f4: lui   v1, 0x60000
+// 0x01026204: 0x1026204: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010261f8: 0x10261f8: addu  a0, s0, zero
+// 0x01026208: 0x1026208: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010261fc: 0x10261fc: addiu a1, s1, -26556
+// 0x0102620c: 0x102620c: addiu a1, s1, -26092
 	ldloc 8
-	ldc.i4 -26556
+	ldc.i4 -26092
 	add
 	stloc.2
-// 0x01026200: 0x1026200: jal   0x1009824 sw    v0, -26548(v1)
+// 0x01026210: 0x1026210: jal   0x1009834 sw    v0, -26084(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6637
+	ldc.i4 -6521
 	add
 	ldloc 5
 	stelem.i4
@@ -3874,34 +3874,34 @@ L_10261e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026208: 0x1026208: addiu v1, zero, 360
+// 0x01026218: 0x1026218: addiu v1, zero, 360
 	ldc.i4 360
 	stloc 6
-// 0x0102620c: 0x102620c: subu  v0, v1, v0
+// 0x0102621c: 0x102621c: subu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 5
-// 0x01026210: 0x1026210: lui   a0, 0x60000
+// 0x01026220: 0x1026220: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01026214: 0x1026214: sw    v0, -26544(a0)
+// 0x01026224: 0x1026224: sw    v0, -26080(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6636
+	ldc.i4 -6520
 	add
 	ldloc 5
 	stelem.i4
-L_1026218:
-// 0x01026218: 0x1026218: lw    ra, 28(sp)
-// 0x0102621c: 0x102621c: lw    s2, 24(sp)
+L_1026228:
+// 0x01026228: 0x1026228: lw    ra, 28(sp)
+// 0x0102622c: 0x102622c: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3910,7 +3910,7 @@ L_1026218:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01026220: 0x1026220: lw    s1, 20(sp)
+// 0x01026230: 0x1026230: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3919,7 +3919,7 @@ L_1026218:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01026224: 0x1026224: lw    s0, 16(sp)
+// 0x01026234: 0x1026234: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3928,7 +3928,7 @@ L_1026218:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01026228: 0x1026228: jr    ra addiu sp, sp, 32
+// 0x01026238: 0x1026238: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3940,7 +3940,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_ok_softkey_1026230(int32,int32,int32,int32,int32)
+.method public static int32 on_ok_softkey_1026240(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -3975,13 +3975,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026230: 0x1026230: addiu sp, sp, -24
+// 0x01026240: 0x1026240: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026234: 0x1026234: sw    ra, 20(sp)
-// 0x01026238: 0x1026238: jal   0x1094b64 addiu a0, zero, 1
+// 0x01026244: 0x1026244: sw    ra, 20(sp)
+// 0x01026248: 0x1026248: jal   0x10951ac addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3989,16 +3989,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01026240: 0x1026240: lw    ra, 20(sp)
-// 0x01026244: 0x1026244: addu  v0, zero, zero
+// 0x01026250: 0x1026250: lw    ra, 20(sp)
+// 0x01026254: 0x1026254: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01026248: 0x1026248: jr    ra addiu sp, sp, 24
+// 0x01026258: 0x1026258: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4010,7 +4010,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 dest_checkbox_callback_facebook_1026250(int32,int32,int32,int32,int32)
+.method public static int32 dest_checkbox_callback_facebook_1026260(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 v1)
@@ -4063,12 +4063,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026250: 0x1026250: addiu sp, sp, -48
+// 0x01026260: 0x1026260: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01026254: 0x1026254: sw    s4, 36(sp)
+// 0x01026264: 0x1026264: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4077,7 +4077,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01026258: 0x1026258: sw    s3, 32(sp)
+// 0x01026268: 0x1026268: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4086,7 +4086,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102625c: 0x102625c: sw    s2, 28(sp)
+// 0x0102626c: 0x102626c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4095,7 +4095,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01026260: 0x1026260: sw    s1, 24(sp)
+// 0x01026270: 0x1026270: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4104,19 +4104,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01026264: 0x1026264: lui   s4, 0x60000
+// 0x01026274: 0x1026274: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01026268: 0x1026268: lui   s1, 0x60000
+// 0x01026278: 0x1026278: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0102626c: 0x102626c: lui   s3, 0x0
+// 0x0102627c: 0x102627c: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01026270: 0x1026270: lui   s2, 0x20000
+// 0x01026280: 0x1026280: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01026274: 0x1026274: sw    s5, 40(sp)
+// 0x01026284: 0x1026284: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4125,8 +4125,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01026278: 0x1026278: sw    ra, 44(sp)
-// 0x0102627c: 0x102627c: sw    s0, 20(sp)
+// 0x01026288: 0x1026288: sw    ra, 44(sp)
+// 0x0102628c: 0x102628c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4135,43 +4135,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01026280: 0x1026280: addu  s5, a0, zero
+// 0x01026290: 0x1026290: addu  s5, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01026284: 0x1026284: addiu s1, s1, -26492
+// 0x01026294: 0x1026294: addiu s1, s1, -26028
 	ldloc 8
-	ldc.i4 -26492
+	ldc.i4 -26028
 	add
 	stloc 8
-// 0x01026288: 0x1026288: addiu s4, s4, -26476
+// 0x01026298: 0x1026298: addiu s4, s4, -26012
 	ldloc 11
-	ldc.i4 -26476
+	ldc.i4 -26012
 	add
 	stloc 11
-// 0x0102628c: 0x102628c: addiu s3, s3, 20820
+// 0x0102629c: 0x102629c: addiu s3, s3, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 10
-// 0x01026290: 0x1026290: addiu s2, s2, 9464
+// 0x010262a0: 0x10262a0: addiu s2, s2, 9928
 	ldloc 9
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 9
-L_1026294:
-// 0x01026294: 0x1026294: lw    s0, 0(s1)
+L_10262a4:
+// 0x010262a4: 0x10262a4: lw    s0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01026298: 0x1026298: sll   zero, zero, 0
-// 0x0102629c: 0x102629c: beq   s0, zero, 0x10262cc sll   zero, zero, 0
+// 0x010262a8: 0x10262a8: sll   zero, zero, 0
+// 0x010262ac: 0x10262ac: beq   s0, zero, 0x10262dc sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10262cc
+	brfalse L_10262dc
 // --- basic block ---
-// 0x010262a4: 0x10262a4: lw    v0, 4(s5)
+// 0x010262b4: 0x10262b4: lw    v0, 4(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -4180,7 +4180,7 @@ L_1026294:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010262a8: 0x10262a8: lw    a1, 16(s0)
+// 0x010262b8: 0x10262b8: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4189,7 +4189,7 @@ L_1026294:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010262ac: 0x10262ac: lw    a0, 16(v0)
+// 0x010262bc: 0x10262bc: lw    a0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4198,19 +4198,19 @@ L_1026294:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010262b0: 0x10262b0: jal   0x1001b14 sll   zero, zero, 0
+// 0x010262c0: 0x10262c0: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010262b8: 0x10262b8: beq   v0, zero, 0x10262cc addu  a0, s0, zero
+// 0x010262c8: 0x10262c8: beq   v0, zero, 0x10262dc addu  a0, s0, zero
 	ldloc 6
 	ldloc 7
 	stloc.1
-	brfalse L_10262cc
+	brfalse L_10262dc
 // --- basic block ---
-// 0x010262c0: 0x10262c0: lw    v0, 180(s0)
+// 0x010262d0: 0x10262d0: lw    v0, 180(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4219,13 +4219,13 @@ L_1026294:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010262c4: 0x10262c4: j	 0x10262d8 addu  a1, s2, zero
+// 0x010262d4: 0x10262d4: j	 0x10262e8 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-	br L_10262d8
+	br L_10262e8
 // --- basic block ---
-L_10262cc:
-// 0x010262cc: 0x10262cc: lw    v0, 180(s0)
+L_10262dc:
+// 0x010262dc: 0x10262dc: lw    v0, 180(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4234,14 +4234,14 @@ L_10262cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010262d0: 0x10262d0: addu  a0, s0, zero
+// 0x010262e0: 0x10262e0: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x010262d4: 0x10262d4: addu  a1, s3, zero
+// 0x010262e4: 0x10262e4: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-L_10262d8:
-// 0x010262d8: 0x10262d8: jalr  v0 addiu s1, s1, 4
+L_10262e8:
+// 0x010262e8: 0x10262e8: jalr  v0 addiu s1, s1, 4
 	ldloc 6
 	ldloc 8
 	ldc.i4.4
@@ -4257,15 +4257,15 @@ L_10262d8:
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x010262e0: 0x10262e0: bne   s1, s4, 0x1026294 addiu v0, zero, 1
+// 0x010262f0: 0x10262f0: bne   s1, s4, 0x10262a4 addiu v0, zero, 1
 	ldloc 8
 	ldloc 11
 	ldc.i4.1
 	stloc 6
-	bne.un L_1026294
+	bne.un L_10262a4
 // --- basic block ---
-// 0x010262e8: 0x10262e8: lw    ra, 44(sp)
-// 0x010262ec: 0x10262ec: lw    s5, 40(sp)
+// 0x010262f8: 0x10262f8: lw    ra, 44(sp)
+// 0x010262fc: 0x10262fc: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4274,7 +4274,7 @@ L_10262d8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010262f0: 0x10262f0: lw    s4, 36(sp)
+// 0x01026300: 0x1026300: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4283,7 +4283,7 @@ L_10262d8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010262f4: 0x10262f4: lw    s3, 32(sp)
+// 0x01026304: 0x1026304: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4292,7 +4292,7 @@ L_10262d8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010262f8: 0x10262f8: lw    s2, 28(sp)
+// 0x01026308: 0x1026308: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4301,7 +4301,7 @@ L_10262d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010262fc: 0x10262fc: lw    s1, 24(sp)
+// 0x0102630c: 0x102630c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4310,7 +4310,7 @@ L_10262d8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01026300: 0x1026300: lw    s0, 20(sp)
+// 0x01026310: 0x1026310: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4319,7 +4319,7 @@ L_10262d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01026304: 0x1026304: jr    ra addiu sp, sp, 48
+// 0x01026314: 0x1026314: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4331,7 +4331,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 dest_checkbox_callback_twitter_102630c(int32,int32,int32,int32,int32)
+.method public static int32 dest_checkbox_callback_twitter_102631c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 v1)
@@ -4384,12 +4384,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102630c: 0x102630c: addiu sp, sp, -48
+// 0x0102631c: 0x102631c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01026310: 0x1026310: sw    s4, 36(sp)
+// 0x01026320: 0x1026320: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4398,7 +4398,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01026314: 0x1026314: sw    s3, 32(sp)
+// 0x01026324: 0x1026324: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4407,7 +4407,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01026318: 0x1026318: sw    s2, 28(sp)
+// 0x01026328: 0x1026328: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4416,7 +4416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102631c: 0x102631c: sw    s1, 24(sp)
+// 0x0102632c: 0x102632c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4425,19 +4425,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01026320: 0x1026320: lui   s4, 0x60000
+// 0x01026330: 0x1026330: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01026324: 0x1026324: lui   s1, 0x60000
+// 0x01026334: 0x1026334: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01026328: 0x1026328: lui   s3, 0x0
+// 0x01026338: 0x1026338: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0102632c: 0x102632c: lui   s2, 0x20000
+// 0x0102633c: 0x102633c: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01026330: 0x1026330: sw    s5, 40(sp)
+// 0x01026340: 0x1026340: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4446,8 +4446,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01026334: 0x1026334: sw    ra, 44(sp)
-// 0x01026338: 0x1026338: sw    s0, 20(sp)
+// 0x01026344: 0x1026344: sw    ra, 44(sp)
+// 0x01026348: 0x1026348: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4456,43 +4456,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102633c: 0x102633c: addu  s5, a0, zero
+// 0x0102634c: 0x102634c: addu  s5, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01026340: 0x1026340: addiu s1, s1, -26508
+// 0x01026350: 0x1026350: addiu s1, s1, -26044
 	ldloc 8
-	ldc.i4 -26508
+	ldc.i4 -26044
 	add
 	stloc 8
-// 0x01026344: 0x1026344: addiu s4, s4, -26492
+// 0x01026354: 0x1026354: addiu s4, s4, -26028
 	ldloc 11
-	ldc.i4 -26492
+	ldc.i4 -26028
 	add
 	stloc 11
-// 0x01026348: 0x1026348: addiu s3, s3, 20820
+// 0x01026358: 0x1026358: addiu s3, s3, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 10
-// 0x0102634c: 0x102634c: addiu s2, s2, 9464
+// 0x0102635c: 0x102635c: addiu s2, s2, 9928
 	ldloc 9
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 9
-L_1026350:
-// 0x01026350: 0x1026350: lw    s0, 0(s1)
+L_1026360:
+// 0x01026360: 0x1026360: lw    s0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01026354: 0x1026354: sll   zero, zero, 0
-// 0x01026358: 0x1026358: beq   s0, zero, 0x1026388 sll   zero, zero, 0
+// 0x01026364: 0x1026364: sll   zero, zero, 0
+// 0x01026368: 0x1026368: beq   s0, zero, 0x1026398 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1026388
+	brfalse L_1026398
 // --- basic block ---
-// 0x01026360: 0x1026360: lw    v0, 4(s5)
+// 0x01026370: 0x1026370: lw    v0, 4(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -4501,7 +4501,7 @@ L_1026350:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01026364: 0x1026364: lw    a1, 16(s0)
+// 0x01026374: 0x1026374: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4510,7 +4510,7 @@ L_1026350:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01026368: 0x1026368: lw    a0, 16(v0)
+// 0x01026378: 0x1026378: lw    a0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4519,19 +4519,19 @@ L_1026350:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102636c: 0x102636c: jal   0x1001b14 sll   zero, zero, 0
+// 0x0102637c: 0x102637c: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01026374: 0x1026374: beq   v0, zero, 0x1026388 addu  a0, s0, zero
+// 0x01026384: 0x1026384: beq   v0, zero, 0x1026398 addu  a0, s0, zero
 	ldloc 6
 	ldloc 7
 	stloc.1
-	brfalse L_1026388
+	brfalse L_1026398
 // --- basic block ---
-// 0x0102637c: 0x102637c: lw    v0, 180(s0)
+// 0x0102638c: 0x102638c: lw    v0, 180(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4540,13 +4540,13 @@ L_1026350:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01026380: 0x1026380: j	 0x1026394 addu  a1, s2, zero
+// 0x01026390: 0x1026390: j	 0x10263a4 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-	br L_1026394
+	br L_10263a4
 // --- basic block ---
-L_1026388:
-// 0x01026388: 0x1026388: lw    v0, 180(s0)
+L_1026398:
+// 0x01026398: 0x1026398: lw    v0, 180(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4555,14 +4555,14 @@ L_1026388:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102638c: 0x102638c: addu  a0, s0, zero
+// 0x0102639c: 0x102639c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01026390: 0x1026390: addu  a1, s3, zero
+// 0x010263a0: 0x10263a0: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-L_1026394:
-// 0x01026394: 0x1026394: jalr  v0 addiu s1, s1, 4
+L_10263a4:
+// 0x010263a4: 0x10263a4: jalr  v0 addiu s1, s1, 4
 	ldloc 6
 	ldloc 8
 	ldc.i4.4
@@ -4578,15 +4578,15 @@ L_1026394:
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x0102639c: 0x102639c: bne   s1, s4, 0x1026350 addiu v0, zero, 1
+// 0x010263ac: 0x10263ac: bne   s1, s4, 0x1026360 addiu v0, zero, 1
 	ldloc 8
 	ldloc 11
 	ldc.i4.1
 	stloc 6
-	bne.un L_1026350
+	bne.un L_1026360
 // --- basic block ---
-// 0x010263a4: 0x10263a4: lw    ra, 44(sp)
-// 0x010263a8: 0x10263a8: lw    s5, 40(sp)
+// 0x010263b4: 0x10263b4: lw    ra, 44(sp)
+// 0x010263b8: 0x10263b8: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4595,7 +4595,7 @@ L_1026394:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010263ac: 0x10263ac: lw    s4, 36(sp)
+// 0x010263bc: 0x10263bc: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4604,7 +4604,7 @@ L_1026394:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010263b0: 0x10263b0: lw    s3, 32(sp)
+// 0x010263c0: 0x10263c0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4613,7 +4613,7 @@ L_1026394:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010263b4: 0x10263b4: lw    s2, 28(sp)
+// 0x010263c4: 0x10263c4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4622,7 +4622,7 @@ L_1026394:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010263b8: 0x10263b8: lw    s1, 24(sp)
+// 0x010263c8: 0x10263c8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4631,7 +4631,7 @@ L_1026394:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010263bc: 0x10263bc: lw    s0, 20(sp)
+// 0x010263cc: 0x10263cc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4640,7 +4640,7 @@ L_1026394:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010263c0: 0x10263c0: jr    ra addiu sp, sp, 48
+// 0x010263d0: 0x10263d0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4652,7 +4652,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 twitter_pw_empty_10263c8(int32,int32,int32,int32,int32)
+.method public static int32 twitter_pw_empty_10263d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4687,18 +4687,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010263c8: 0x10263c8: lui   a0, 0x1020000
+// 0x010263d8: 0x10263d8: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x010263cc: 0x10263cc: addiu sp, sp, -24
+// 0x010263dc: 0x10263dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010263d0: 0x10263d0: sw    ra, 20(sp)
-// 0x010263d4: 0x10263d4: jal   0x104fd00 addiu a0, a0, 25544
+// 0x010263e0: 0x10263e0: sw    ra, 20(sp)
+// 0x010263e4: 0x10263e4: jal   0x104fd10 addiu a0, a0, 25560
 	ldloc.1
-	ldc.i4 25544
+	ldc.i4 25560
 	add
 	stloc.1
 	ldloc.0
@@ -4706,23 +4706,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010263dc: 0x10263dc: lui   a0, 0x0
+// 0x010263ec: 0x10263ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010263e0: 0x10263e0: lui   a1, 0x10000
+// 0x010263f0: 0x10263f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010263e4: 0x10263e4: addiu a0, a0, 30152
+// 0x010263f4: 0x10263f4: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x010263e8: 0x10263e8: jal   0x104c148 addiu a1, a1, -28876
+// 0x010263f8: 0x10263f8: jal   0x104c158 addiu a1, a1, -28876
 	ldloc.2
 	ldc.i4 -28876
 	add
@@ -4732,14 +4732,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010263f0: 0x10263f0: lw    ra, 20(sp)
-// 0x010263f4: 0x10263f4: sll   zero, zero, 0
-// 0x010263f8: 0x10263f8: jr    ra addiu sp, sp, 24
+// 0x01026400: 0x1026400: lw    ra, 20(sp)
+// 0x01026404: 0x1026404: sll   zero, zero, 0
+// 0x01026408: 0x1026408: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4751,7 +4751,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 twitter_un_empty_1026400(int32,int32,int32,int32,int32)
+.method public static int32 twitter_un_empty_1026410(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4786,18 +4786,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026400: 0x1026400: lui   a0, 0x1020000
+// 0x01026410: 0x1026410: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01026404: 0x1026404: addiu sp, sp, -24
+// 0x01026414: 0x1026414: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026408: 0x1026408: sw    ra, 20(sp)
-// 0x0102640c: 0x102640c: jal   0x104fd00 addiu a0, a0, 25600
+// 0x01026418: 0x1026418: sw    ra, 20(sp)
+// 0x0102641c: 0x102641c: jal   0x104fd10 addiu a0, a0, 25616
 	ldloc.1
-	ldc.i4 25600
+	ldc.i4 25616
 	add
 	stloc.1
 	ldloc.0
@@ -4805,23 +4805,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01026414: 0x1026414: lui   a0, 0x0
+// 0x01026424: 0x1026424: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026418: 0x1026418: lui   a1, 0x10000
+// 0x01026428: 0x1026428: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102641c: 0x102641c: addiu a0, a0, 30152
+// 0x0102642c: 0x102642c: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x01026420: 0x1026420: jal   0x104c148 addiu a1, a1, -28824
+// 0x01026430: 0x1026430: jal   0x104c158 addiu a1, a1, -28824
 	ldloc.2
 	ldc.i4 -28824
 	add
@@ -4831,14 +4831,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01026428: 0x1026428: lw    ra, 20(sp)
-// 0x0102642c: 0x102642c: sll   zero, zero, 0
-// 0x01026430: 0x1026430: jr    ra addiu sp, sp, 24
+// 0x01026438: 0x1026438: lw    ra, 20(sp)
+// 0x0102643c: 0x102643c: sll   zero, zero, 0
+// 0x01026440: 0x1026440: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4850,7 +4850,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_social_set_show_profile_1026438(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_set_show_profile_1026448(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -4885,69 +4885,69 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026438: 0x1026438: addiu sp, sp, -24
+// 0x01026448: 0x1026448: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102643c: 0x102643c: addiu v0, zero, 1
+// 0x0102644c: 0x102644c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01026440: 0x1026440: beq   a1, v0, 0x102645c sw    ra, 20(sp)
+// 0x01026450: 0x1026450: beq   a1, v0, 0x102646c sw    ra, 20(sp)
 	ldloc.2
 	ldloc 5
-	beq  L_102645c
+	beq  L_102646c
 // --- basic block ---
-// 0x01026448: 0x1026448: addiu v0, zero, 2
+// 0x01026458: 0x1026458: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102644c: 0x102644c: bne   a1, v0, 0x1026468 lui   a1, 0x0
+// 0x0102645c: 0x102645c: bne   a1, v0, 0x1026478 lui   a1, 0x0
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_1026468
+	bne.un L_1026478
 // --- basic block ---
-// 0x01026454: 0x1026454: j	 0x1026470 addiu a1, a1, 21112
+// 0x01026464: 0x1026464: j	 0x1026480 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
 	stloc.2
-	br L_1026470
+	br L_1026480
 // --- basic block ---
-L_102645c:
-// 0x0102645c: 0x102645c: lui   a1, 0x10000
+L_102646c:
+// 0x0102646c: 0x102646c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026460: 0x1026460: j	 0x1026470 addiu a1, a1, -28772
+// 0x01026470: 0x1026470: j	 0x1026480 addiu a1, a1, -28772
 	ldloc.2
 	ldc.i4 -28772
 	add
 	stloc.2
-	br L_1026470
+	br L_1026480
 // --- basic block ---
-L_1026468:
-// 0x01026468: 0x1026468: lui   a1, 0x0
+L_1026478:
+// 0x01026478: 0x1026478: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102646c: 0x102646c: addiu a1, a1, 31272
+// 0x0102647c: 0x102647c: addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
 	stloc.2
-L_1026470:
-// 0x01026470: 0x1026470: jal   0x100e5c0 sll   zero, zero, 0
+L_1026480:
+// 0x01026480: 0x1026480: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026478: 0x1026478: jal   0x100ea50 addu  a0, zero, zero
+// 0x01026488: 0x1026488: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4955,14 +4955,14 @@ L_1026470:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026480: 0x1026480: lw    ra, 20(sp)
-// 0x01026484: 0x1026484: sll   zero, zero, 0
-// 0x01026488: 0x1026488: jr    ra addiu sp, sp, 24
+// 0x01026490: 0x1026490: lw    ra, 20(sp)
+// 0x01026494: 0x1026494: sll   zero, zero, 0
+// 0x01026498: 0x1026498: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4974,7 +4974,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_set_show_picture_10264f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_set_show_picture_1026500(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5009,90 +5009,90 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010264f0: 0x10264f0: addiu sp, sp, -24
+// 0x01026500: 0x1026500: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010264f4: 0x10264f4: addiu v0, zero, 1
+// 0x01026504: 0x1026504: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010264f8: 0x10264f8: beq   a0, v0, 0x102651c sw    ra, 20(sp)
+// 0x01026508: 0x1026508: beq   a0, v0, 0x102652c sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_102651c
+	beq  L_102652c
 // --- basic block ---
-// 0x01026500: 0x1026500: addiu v1, zero, 2
+// 0x01026510: 0x1026510: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01026504: 0x1026504: bne   a0, v1, 0x1026530 lui   v0, 0x0
+// 0x01026514: 0x1026514: bne   a0, v1, 0x1026540 lui   v0, 0x0
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1026530
+	bne.un L_1026540
 // --- basic block ---
-// 0x0102650c: 0x102650c: lui   a1, 0x0
+// 0x0102651c: 0x102651c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026510: 0x1026510: addiu a0, v0, 6440
+// 0x01026520: 0x1026520: addiu a0, v0, 6440
 	ldloc 5
 	ldc.i4 6440
 	add
 	stloc.1
-// 0x01026514: 0x1026514: j	 0x102653c addiu a1, a1, 21112
+// 0x01026524: 0x1026524: j	 0x102654c addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
 	stloc.2
-	br L_102653c
+	br L_102654c
 // --- basic block ---
-L_102651c:
-// 0x0102651c: 0x102651c: lui   a0, 0x0
+L_102652c:
+// 0x0102652c: 0x102652c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026520: 0x1026520: lui   a1, 0x10000
+// 0x01026530: 0x1026530: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026524: 0x1026524: addiu a0, a0, 6440
+// 0x01026534: 0x1026534: addiu a0, a0, 6440
 	ldloc.1
 	ldc.i4 6440
 	add
 	stloc.1
-// 0x01026528: 0x1026528: j	 0x102653c addiu a1, a1, -28772
+// 0x01026538: 0x1026538: j	 0x102654c addiu a1, a1, -28772
 	ldloc.2
 	ldc.i4 -28772
 	add
 	stloc.2
-	br L_102653c
+	br L_102654c
 // --- basic block ---
-L_1026530:
-// 0x01026530: 0x1026530: lui   a1, 0x0
+L_1026540:
+// 0x01026540: 0x1026540: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026534: 0x1026534: addiu a0, v0, 6440
+// 0x01026544: 0x1026544: addiu a0, v0, 6440
 	ldloc 5
 	ldc.i4 6440
 	add
 	stloc.1
-// 0x01026538: 0x1026538: addiu a1, a1, 31272
+// 0x01026548: 0x1026548: addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
 	stloc.2
-L_102653c:
-// 0x0102653c: 0x102653c: jal   0x100e5c0 sll   zero, zero, 0
+L_102654c:
+// 0x0102654c: 0x102654c: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026544: 0x1026544: jal   0x100ea50 addu  a0, zero, zero
+// 0x01026554: 0x1026554: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5100,25 +5100,25 @@ L_102653c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102654c: 0x102654c: jal   0x106e298 sll   zero, zero, 0
+// 0x0102655c: 0x102655c: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026554: 0x1026554: lw    ra, 20(sp)
-// 0x01026558: 0x1026558: sll   zero, zero, 0
-// 0x0102655c: 0x102655c: jr    ra addiu sp, sp, 24
+// 0x01026564: 0x1026564: lw    ra, 20(sp)
+// 0x01026568: 0x1026568: sll   zero, zero, 0
+// 0x0102656c: 0x102656c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5130,7 +5130,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_set_show_name_1026564(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_set_show_name_1026574(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5165,90 +5165,90 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026564: 0x1026564: addiu sp, sp, -24
+// 0x01026574: 0x1026574: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026568: 0x1026568: addiu v0, zero, 1
+// 0x01026578: 0x1026578: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102656c: 0x102656c: beq   a0, v0, 0x1026590 sw    ra, 20(sp)
+// 0x0102657c: 0x102657c: beq   a0, v0, 0x10265a0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_1026590
+	beq  L_10265a0
 // --- basic block ---
-// 0x01026574: 0x1026574: addiu v1, zero, 2
+// 0x01026584: 0x1026584: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01026578: 0x1026578: bne   a0, v1, 0x10265a4 lui   v0, 0x0
+// 0x01026588: 0x1026588: bne   a0, v1, 0x10265b4 lui   v0, 0x0
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_10265a4
+	bne.un L_10265b4
 // --- basic block ---
-// 0x01026580: 0x1026580: lui   a1, 0x0
+// 0x01026590: 0x1026590: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026584: 0x1026584: addiu a0, v0, 6424
+// 0x01026594: 0x1026594: addiu a0, v0, 6424
 	ldloc 5
 	ldc.i4 6424
 	add
 	stloc.1
-// 0x01026588: 0x1026588: j	 0x10265b0 addiu a1, a1, 21112
+// 0x01026598: 0x1026598: j	 0x10265c0 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
 	stloc.2
-	br L_10265b0
+	br L_10265c0
 // --- basic block ---
-L_1026590:
-// 0x01026590: 0x1026590: lui   a0, 0x0
+L_10265a0:
+// 0x010265a0: 0x10265a0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026594: 0x1026594: lui   a1, 0x10000
+// 0x010265a4: 0x10265a4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026598: 0x1026598: addiu a0, a0, 6424
+// 0x010265a8: 0x10265a8: addiu a0, a0, 6424
 	ldloc.1
 	ldc.i4 6424
 	add
 	stloc.1
-// 0x0102659c: 0x102659c: j	 0x10265b0 addiu a1, a1, -28772
+// 0x010265ac: 0x10265ac: j	 0x10265c0 addiu a1, a1, -28772
 	ldloc.2
 	ldc.i4 -28772
 	add
 	stloc.2
-	br L_10265b0
+	br L_10265c0
 // --- basic block ---
-L_10265a4:
-// 0x010265a4: 0x10265a4: lui   a1, 0x0
+L_10265b4:
+// 0x010265b4: 0x10265b4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010265a8: 0x10265a8: addiu a0, v0, 6424
+// 0x010265b8: 0x10265b8: addiu a0, v0, 6424
 	ldloc 5
 	ldc.i4 6424
 	add
 	stloc.1
-// 0x010265ac: 0x10265ac: addiu a1, a1, 31272
+// 0x010265bc: 0x10265bc: addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
 	stloc.2
-L_10265b0:
-// 0x010265b0: 0x10265b0: jal   0x100e5c0 sll   zero, zero, 0
+L_10265c0:
+// 0x010265c0: 0x10265c0: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010265b8: 0x10265b8: jal   0x100ea50 addu  a0, zero, zero
+// 0x010265c8: 0x10265c8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5256,25 +5256,25 @@ L_10265b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010265c0: 0x10265c0: jal   0x106e298 sll   zero, zero, 0
+// 0x010265d0: 0x10265d0: jal   0x106e8bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010265c8: 0x10265c8: lw    ra, 20(sp)
-// 0x010265cc: 0x10265cc: sll   zero, zero, 0
-// 0x010265d0: 0x10265d0: jr    ra addiu sp, sp, 24
+// 0x010265d8: 0x10265d8: lw    ra, 20(sp)
+// 0x010265dc: 0x10265dc: sll   zero, zero, 0
+// 0x010265e0: 0x10265e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5286,7 +5286,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_social_set_munching_1026624(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_set_munching_1026634(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -5321,47 +5321,47 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026624: 0x1026624: addiu sp, sp, -24
+// 0x01026634: 0x1026634: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026628: 0x1026628: beq   a1, zero, 0x102663c sw    ra, 20(sp)
+// 0x01026638: 0x1026638: beq   a1, zero, 0x102664c sw    ra, 20(sp)
 	ldloc.2
-	brfalse L_102663c
+	brfalse L_102664c
 // --- basic block ---
-// 0x01026630: 0x1026630: lui   a1, 0x0
+// 0x01026640: 0x1026640: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026634: 0x1026634: j	 0x1026644 addiu a1, a1, 21112
+// 0x01026644: 0x1026644: j	 0x1026654 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
 	stloc.2
-	br L_1026644
+	br L_1026654
 // --- basic block ---
-L_102663c:
-// 0x0102663c: 0x102663c: lui   a1, 0x0
+L_102664c:
+// 0x0102664c: 0x102664c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026640: 0x1026640: addiu a1, a1, 31272
+// 0x01026650: 0x1026650: addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
 	stloc.2
-L_1026644:
-// 0x01026644: 0x1026644: jal   0x100e5c0 sll   zero, zero, 0
+L_1026654:
+// 0x01026654: 0x1026654: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102664c: 0x102664c: jal   0x100ea50 addu  a0, zero, zero
+// 0x0102665c: 0x102665c: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5369,14 +5369,14 @@ L_1026644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01026654: 0x1026654: lw    ra, 20(sp)
-// 0x01026658: 0x1026658: sll   zero, zero, 0
-// 0x0102665c: 0x102665c: jr    ra addiu sp, sp, 24
+// 0x01026664: 0x1026664: lw    ra, 20(sp)
+// 0x01026668: 0x1026668: sll   zero, zero, 0
+// 0x0102666c: 0x102666c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5388,7 +5388,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_facebook_disable_munching_1026664(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_disable_munching_1026674(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5423,21 +5423,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026664: 0x1026664: lui   a0, 0x0
+// 0x01026674: 0x1026674: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026668: 0x1026668: addiu sp, sp, -24
+// 0x01026678: 0x1026678: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102666c: 0x102666c: addiu a0, a0, 6392
+// 0x0102667c: 0x102667c: addiu a0, a0, 6392
 	ldloc.1
 	ldc.i4 6392
 	add
 	stloc.1
-// 0x01026670: 0x1026670: sw    ra, 20(sp)
-// 0x01026674: 0x1026674: jal   0x1026624 addu  a1, zero, zero
+// 0x01026680: 0x1026680: sw    ra, 20(sp)
+// 0x01026684: 0x1026684: jal   0x1026634 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5445,14 +5445,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_munching_1026624(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_munching_1026634(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102667c: 0x102667c: lw    ra, 20(sp)
-// 0x01026680: 0x1026680: sll   zero, zero, 0
-// 0x01026684: 0x1026684: jr    ra addiu sp, sp, 24
+// 0x0102668c: 0x102668c: lw    ra, 20(sp)
+// 0x01026690: 0x1026690: sll   zero, zero, 0
+// 0x01026694: 0x1026694: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5464,7 +5464,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_disable_munching_102668c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_disable_munching_102669c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5499,21 +5499,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102668c: 0x102668c: lui   a0, 0x0
+// 0x0102669c: 0x102669c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026690: 0x1026690: addiu sp, sp, -24
+// 0x010266a0: 0x10266a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026694: 0x1026694: addiu a0, a0, 6280
+// 0x010266a4: 0x10266a4: addiu a0, a0, 6280
 	ldloc.1
 	ldc.i4 6280
 	add
 	stloc.1
-// 0x01026698: 0x1026698: sw    ra, 20(sp)
-// 0x0102669c: 0x102669c: jal   0x1026624 addu  a1, zero, zero
+// 0x010266a8: 0x10266a8: sw    ra, 20(sp)
+// 0x010266ac: 0x10266ac: jal   0x1026634 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5521,14 +5521,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_munching_1026624(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_munching_1026634(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010266a4: 0x10266a4: lw    ra, 20(sp)
-// 0x010266a8: 0x10266a8: sll   zero, zero, 0
-// 0x010266ac: 0x10266ac: jr    ra addiu sp, sp, 24
+// 0x010266b4: 0x10266b4: lw    ra, 20(sp)
+// 0x010266b8: 0x10266b8: sll   zero, zero, 0
+// 0x010266bc: 0x10266bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5540,7 +5540,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_facebook_enable_munching_10266b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_enable_munching_10266c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5575,21 +5575,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010266b4: 0x10266b4: lui   a0, 0x0
+// 0x010266c4: 0x10266c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010266b8: 0x10266b8: addiu sp, sp, -24
+// 0x010266c8: 0x10266c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010266bc: 0x10266bc: addiu a0, a0, 6392
+// 0x010266cc: 0x10266cc: addiu a0, a0, 6392
 	ldloc.1
 	ldc.i4 6392
 	add
 	stloc.1
-// 0x010266c0: 0x10266c0: sw    ra, 20(sp)
-// 0x010266c4: 0x10266c4: jal   0x1026624 addiu a1, zero, 1
+// 0x010266d0: 0x10266d0: sw    ra, 20(sp)
+// 0x010266d4: 0x10266d4: jal   0x1026634 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5597,14 +5597,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_munching_1026624(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_munching_1026634(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010266cc: 0x10266cc: lw    ra, 20(sp)
-// 0x010266d0: 0x10266d0: sll   zero, zero, 0
-// 0x010266d4: 0x10266d4: jr    ra addiu sp, sp, 24
+// 0x010266dc: 0x10266dc: lw    ra, 20(sp)
+// 0x010266e0: 0x10266e0: sll   zero, zero, 0
+// 0x010266e4: 0x10266e4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5616,7 +5616,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_enable_munching_10266dc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_enable_munching_10266ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5651,21 +5651,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010266dc: 0x10266dc: lui   a0, 0x0
+// 0x010266ec: 0x10266ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010266e0: 0x10266e0: addiu sp, sp, -24
+// 0x010266f0: 0x10266f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010266e4: 0x10266e4: addiu a0, a0, 6280
+// 0x010266f4: 0x10266f4: addiu a0, a0, 6280
 	ldloc.1
 	ldc.i4 6280
 	add
 	stloc.1
-// 0x010266e8: 0x10266e8: sw    ra, 20(sp)
-// 0x010266ec: 0x10266ec: jal   0x1026624 addiu a1, zero, 1
+// 0x010266f8: 0x10266f8: sw    ra, 20(sp)
+// 0x010266fc: 0x10266fc: jal   0x1026634 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5673,14 +5673,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_munching_1026624(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_munching_1026634(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010266f4: 0x10266f4: lw    ra, 20(sp)
-// 0x010266f8: 0x10266f8: sll   zero, zero, 0
-// 0x010266fc: 0x10266fc: jr    ra addiu sp, sp, 24
+// 0x01026704: 0x1026704: lw    ra, 20(sp)
+// 0x01026708: 0x1026708: sll   zero, zero, 0
+// 0x0102670c: 0x102670c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5692,7 +5692,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_social_set_destination_mode_1026704(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_set_destination_mode_1026714(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -5727,69 +5727,69 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026704: 0x1026704: addiu sp, sp, -24
+// 0x01026714: 0x1026714: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026708: 0x1026708: addiu v0, zero, 1
+// 0x01026718: 0x1026718: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102670c: 0x102670c: beq   a1, v0, 0x1026728 sw    ra, 20(sp)
+// 0x0102671c: 0x102671c: beq   a1, v0, 0x1026738 sw    ra, 20(sp)
 	ldloc.2
 	ldloc 5
-	beq  L_1026728
+	beq  L_1026738
 // --- basic block ---
-// 0x01026714: 0x1026714: addiu v0, zero, 3
+// 0x01026724: 0x1026724: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01026718: 0x1026718: bne   a1, v0, 0x1026734 lui   a1, 0x10000
+// 0x01026728: 0x1026728: bne   a1, v0, 0x1026744 lui   a1, 0x10000
 	ldloc.2
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1026734
+	bne.un L_1026744
 // --- basic block ---
-// 0x01026720: 0x1026720: j	 0x102673c addiu a1, a1, -28764
+// 0x01026730: 0x1026730: j	 0x102674c addiu a1, a1, -28764
 	ldloc.2
 	ldc.i4 -28764
 	add
 	stloc.2
-	br L_102673c
+	br L_102674c
 // --- basic block ---
-L_1026728:
-// 0x01026728: 0x1026728: lui   a1, 0x10000
+L_1026738:
+// 0x01026738: 0x1026738: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102672c: 0x102672c: j	 0x102673c addiu a1, a1, -28756
+// 0x0102673c: 0x102673c: j	 0x102674c addiu a1, a1, -28756
 	ldloc.2
 	ldc.i4 -28756
 	add
 	stloc.2
-	br L_102673c
+	br L_102674c
 // --- basic block ---
-L_1026734:
-// 0x01026734: 0x1026734: lui   a1, 0x0
+L_1026744:
+// 0x01026744: 0x1026744: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026738: 0x1026738: addiu a1, a1, 31272
+// 0x01026748: 0x1026748: addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
 	stloc.2
-L_102673c:
-// 0x0102673c: 0x102673c: jal   0x100e5c0 sll   zero, zero, 0
+L_102674c:
+// 0x0102674c: 0x102674c: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026744: 0x1026744: jal   0x100ea50 addu  a0, zero, zero
+// 0x01026754: 0x1026754: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5797,14 +5797,14 @@ L_102673c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102674c: 0x102674c: lw    ra, 20(sp)
-// 0x01026750: 0x1026750: sll   zero, zero, 0
-// 0x01026754: 0x1026754: jr    ra addiu sp, sp, 24
+// 0x0102675c: 0x102675c: lw    ra, 20(sp)
+// 0x01026760: 0x1026760: sll   zero, zero, 0
+// 0x01026764: 0x1026764: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5816,7 +5816,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_set_destination_mode_102675c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_set_destination_mode_102676c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5851,19 +5851,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102675c: 0x102675c: addu  a1, a0, zero
+// 0x0102676c: 0x102676c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01026760: 0x1026760: lui   a0, 0x0
+// 0x01026770: 0x1026770: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026764: 0x1026764: addiu sp, sp, -24
+// 0x01026774: 0x1026774: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026768: 0x1026768: sw    ra, 20(sp)
-// 0x0102676c: 0x102676c: jal   0x1026704 addiu a0, a0, 6376
+// 0x01026778: 0x1026778: sw    ra, 20(sp)
+// 0x0102677c: 0x102677c: jal   0x1026714 addiu a0, a0, 6376
 	ldloc.1
 	ldc.i4 6376
 	add
@@ -5873,14 +5873,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_destination_mode_1026704(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_destination_mode_1026714(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026774: 0x1026774: lw    ra, 20(sp)
-// 0x01026778: 0x1026778: sll   zero, zero, 0
-// 0x0102677c: 0x102677c: jr    ra addiu sp, sp, 24
+// 0x01026784: 0x1026784: lw    ra, 20(sp)
+// 0x01026788: 0x1026788: sll   zero, zero, 0
+// 0x0102678c: 0x102678c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5892,7 +5892,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_set_destination_mode_1026784(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_set_destination_mode_1026794(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5927,19 +5927,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026784: 0x1026784: addu  a1, a0, zero
+// 0x01026794: 0x1026794: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01026788: 0x1026788: lui   a0, 0x0
+// 0x01026798: 0x1026798: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102678c: 0x102678c: addiu sp, sp, -24
+// 0x0102679c: 0x102679c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026790: 0x1026790: sw    ra, 20(sp)
-// 0x01026794: 0x1026794: jal   0x1026704 addiu a0, a0, 6264
+// 0x010267a0: 0x10267a0: sw    ra, 20(sp)
+// 0x010267a4: 0x10267a4: jal   0x1026714 addiu a0, a0, 6264
 	ldloc.1
 	ldc.i4 6264
 	add
@@ -5949,14 +5949,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_destination_mode_1026704(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_destination_mode_1026714(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102679c: 0x102679c: lw    ra, 20(sp)
-// 0x010267a0: 0x10267a0: sll   zero, zero, 0
-// 0x010267a4: 0x10267a4: jr    ra addiu sp, sp, 24
+// 0x010267ac: 0x10267ac: lw    ra, 20(sp)
+// 0x010267b0: 0x10267b0: sll   zero, zero, 0
+// 0x010267b4: 0x10267b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5968,7 +5968,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_social_set_sending_10267ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_set_sending_10267bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -6003,47 +6003,47 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010267ac: 0x10267ac: addiu sp, sp, -24
+// 0x010267bc: 0x10267bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010267b0: 0x10267b0: beq   a1, zero, 0x10267c4 sw    ra, 20(sp)
+// 0x010267c0: 0x10267c0: beq   a1, zero, 0x10267d4 sw    ra, 20(sp)
 	ldloc.2
-	brfalse L_10267c4
+	brfalse L_10267d4
 // --- basic block ---
-// 0x010267b8: 0x10267b8: lui   a1, 0x0
+// 0x010267c8: 0x10267c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010267bc: 0x10267bc: j	 0x10267cc addiu a1, a1, 21112
+// 0x010267cc: 0x10267cc: j	 0x10267dc addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
 	stloc.2
-	br L_10267cc
+	br L_10267dc
 // --- basic block ---
-L_10267c4:
-// 0x010267c4: 0x10267c4: lui   a1, 0x0
+L_10267d4:
+// 0x010267d4: 0x10267d4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010267c8: 0x10267c8: addiu a1, a1, 31272
+// 0x010267d8: 0x10267d8: addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
 	stloc.2
-L_10267cc:
-// 0x010267cc: 0x10267cc: jal   0x100e5c0 sll   zero, zero, 0
+L_10267dc:
+// 0x010267dc: 0x10267dc: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010267d4: 0x10267d4: jal   0x100ea50 addu  a0, zero, zero
+// 0x010267e4: 0x10267e4: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6051,14 +6051,14 @@ L_10267cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010267dc: 0x10267dc: lw    ra, 20(sp)
-// 0x010267e0: 0x10267e0: sll   zero, zero, 0
-// 0x010267e4: 0x10267e4: jr    ra addiu sp, sp, 24
+// 0x010267ec: 0x10267ec: lw    ra, 20(sp)
+// 0x010267f0: 0x10267f0: sll   zero, zero, 0
+// 0x010267f4: 0x10267f4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6070,7 +6070,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_facebook_disable_sending_10267ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_disable_sending_10267fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6105,21 +6105,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010267ec: 0x10267ec: lui   a0, 0x0
+// 0x010267fc: 0x10267fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010267f0: 0x10267f0: addiu sp, sp, -24
+// 0x01026800: 0x1026800: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010267f4: 0x10267f4: addiu a0, a0, 6360
+// 0x01026804: 0x1026804: addiu a0, a0, 6360
 	ldloc.1
 	ldc.i4 6360
 	add
 	stloc.1
-// 0x010267f8: 0x10267f8: sw    ra, 20(sp)
-// 0x010267fc: 0x10267fc: jal   0x10267ac addu  a1, zero, zero
+// 0x01026808: 0x1026808: sw    ra, 20(sp)
+// 0x0102680c: 0x102680c: jal   0x10267bc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6127,14 +6127,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_sending_10267ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_sending_10267bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026804: 0x1026804: lw    ra, 20(sp)
-// 0x01026808: 0x1026808: sll   zero, zero, 0
-// 0x0102680c: 0x102680c: jr    ra addiu sp, sp, 24
+// 0x01026814: 0x1026814: lw    ra, 20(sp)
+// 0x01026818: 0x1026818: sll   zero, zero, 0
+// 0x0102681c: 0x102681c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6146,7 +6146,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_disable_sending_1026814(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_disable_sending_1026824(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6181,21 +6181,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026814: 0x1026814: lui   a0, 0x0
+// 0x01026824: 0x1026824: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026818: 0x1026818: addiu sp, sp, -24
+// 0x01026828: 0x1026828: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102681c: 0x102681c: addiu a0, a0, 6248
+// 0x0102682c: 0x102682c: addiu a0, a0, 6248
 	ldloc.1
 	ldc.i4 6248
 	add
 	stloc.1
-// 0x01026820: 0x1026820: sw    ra, 20(sp)
-// 0x01026824: 0x1026824: jal   0x10267ac addu  a1, zero, zero
+// 0x01026830: 0x1026830: sw    ra, 20(sp)
+// 0x01026834: 0x1026834: jal   0x10267bc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6203,14 +6203,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_sending_10267ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_sending_10267bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102682c: 0x102682c: lw    ra, 20(sp)
-// 0x01026830: 0x1026830: sll   zero, zero, 0
-// 0x01026834: 0x1026834: jr    ra addiu sp, sp, 24
+// 0x0102683c: 0x102683c: lw    ra, 20(sp)
+// 0x01026840: 0x1026840: sll   zero, zero, 0
+// 0x01026844: 0x1026844: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6222,7 +6222,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_facebook_enable_sending_102683c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_enable_sending_102684c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6257,21 +6257,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102683c: 0x102683c: lui   a0, 0x0
+// 0x0102684c: 0x102684c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026840: 0x1026840: addiu sp, sp, -24
+// 0x01026850: 0x1026850: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026844: 0x1026844: addiu a0, a0, 6360
+// 0x01026854: 0x1026854: addiu a0, a0, 6360
 	ldloc.1
 	ldc.i4 6360
 	add
 	stloc.1
-// 0x01026848: 0x1026848: sw    ra, 20(sp)
-// 0x0102684c: 0x102684c: jal   0x10267ac addiu a1, zero, 1
+// 0x01026858: 0x1026858: sw    ra, 20(sp)
+// 0x0102685c: 0x102685c: jal   0x10267bc addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6279,14 +6279,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_sending_10267ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_sending_10267bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026854: 0x1026854: lw    ra, 20(sp)
-// 0x01026858: 0x1026858: sll   zero, zero, 0
-// 0x0102685c: 0x102685c: jr    ra addiu sp, sp, 24
+// 0x01026864: 0x1026864: lw    ra, 20(sp)
+// 0x01026868: 0x1026868: sll   zero, zero, 0
+// 0x0102686c: 0x102686c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6298,7 +6298,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_enable_sending_1026864(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_enable_sending_1026874(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6333,21 +6333,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026864: 0x1026864: lui   a0, 0x0
+// 0x01026874: 0x1026874: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026868: 0x1026868: addiu sp, sp, -24
+// 0x01026878: 0x1026878: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102686c: 0x102686c: addiu a0, a0, 6248
+// 0x0102687c: 0x102687c: addiu a0, a0, 6248
 	ldloc.1
 	ldc.i4 6248
 	add
 	stloc.1
-// 0x01026870: 0x1026870: sw    ra, 20(sp)
-// 0x01026874: 0x1026874: jal   0x10267ac addiu a1, zero, 1
+// 0x01026880: 0x1026880: sw    ra, 20(sp)
+// 0x01026884: 0x1026884: jal   0x10267bc addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6355,14 +6355,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_set_sending_10267ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_set_sending_10267bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102687c: 0x102687c: lw    ra, 20(sp)
-// 0x01026880: 0x1026880: sll   zero, zero, 0
-// 0x01026884: 0x1026884: jr    ra addiu sp, sp, 24
+// 0x0102688c: 0x102688c: lw    ra, 20(sp)
+// 0x01026890: 0x1026890: sll   zero, zero, 0
+// 0x01026894: 0x1026894: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6374,7 +6374,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_set_password_102688c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_set_password_102689c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -6409,26 +6409,26 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102688c: 0x102688c: lui   a0, 0x0
+// 0x0102689c: 0x102689c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026890: 0x1026890: lui   a1, 0x10000
+// 0x010268a0: 0x10268a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026894: 0x1026894: addiu sp, sp, -24
+// 0x010268a4: 0x10268a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026898: 0x1026898: addiu a0, a0, 6232
+// 0x010268a8: 0x10268a8: addiu a0, a0, 6232
 	ldloc.1
 	ldc.i4 6232
 	add
 	stloc.1
-// 0x0102689c: 0x102689c: sw    ra, 20(sp)
-// 0x010268a0: 0x10268a0: jal   0x100e5c0 addiu a1, a1, 18500
+// 0x010268ac: 0x10268ac: sw    ra, 20(sp)
+// 0x010268b0: 0x10268b0: jal   0x100e5d0 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -6436,12 +6436,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010268a8: 0x10268a8: jal   0x100ea50 addu  a0, zero, zero
+// 0x010268b8: 0x10268b8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6449,14 +6449,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010268b0: 0x10268b0: lw    ra, 20(sp)
-// 0x010268b4: 0x10268b4: sll   zero, zero, 0
-// 0x010268b8: 0x10268b8: jr    ra addiu sp, sp, 24
+// 0x010268c0: 0x10268c0: lw    ra, 20(sp)
+// 0x010268c4: 0x10268c4: sll   zero, zero, 0
+// 0x010268c8: 0x10268c8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6468,7 +6468,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_twitter_set_username_10268c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_set_username_10268d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -6503,19 +6503,19 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010268c0: 0x10268c0: addu  a1, a0, zero
+// 0x010268d0: 0x10268d0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010268c4: 0x10268c4: lui   a0, 0x0
+// 0x010268d4: 0x10268d4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010268c8: 0x10268c8: addiu sp, sp, -24
+// 0x010268d8: 0x10268d8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010268cc: 0x10268cc: sw    ra, 20(sp)
-// 0x010268d0: 0x10268d0: jal   0x100e5c0 addiu a0, a0, 6216
+// 0x010268dc: 0x10268dc: sw    ra, 20(sp)
+// 0x010268e0: 0x10268e0: jal   0x100e5d0 addiu a0, a0, 6216
 	ldloc.1
 	ldc.i4 6216
 	add
@@ -6525,12 +6525,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010268d8: 0x10268d8: jal   0x100ea50 addu  a0, zero, zero
+// 0x010268e8: 0x10268e8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6538,14 +6538,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010268e0: 0x10268e0: lw    ra, 20(sp)
-// 0x010268e4: 0x10268e4: sll   zero, zero, 0
-// 0x010268e8: 0x10268e8: jr    ra addiu sp, sp, 24
+// 0x010268f0: 0x10268f0: lw    ra, 20(sp)
+// 0x010268f4: 0x10268f4: sll   zero, zero, 0
+// 0x010268f8: 0x10268f8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6557,7 +6557,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_twitter_set_logged_in_10268f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_set_logged_in_1026900(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -6592,60 +6592,60 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010268f0: 0x10268f0: addiu sp, sp, -24
+// 0x01026900: 0x1026900: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010268f4: 0x10268f4: sw    ra, 20(sp)
-// 0x010268f8: 0x10268f8: beq   a0, zero, 0x1026910 lui   v0, 0x0
+// 0x01026904: 0x1026904: sw    ra, 20(sp)
+// 0x01026908: 0x1026908: beq   a0, zero, 0x1026920 lui   v0, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1026910
+	brfalse L_1026920
 // --- basic block ---
-// 0x01026900: 0x1026900: lui   a1, 0x0
+// 0x01026910: 0x1026910: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026904: 0x1026904: addiu a0, v0, 6344
+// 0x01026914: 0x1026914: addiu a0, v0, 6344
 	ldloc 5
 	ldc.i4 6344
 	add
 	stloc.1
-// 0x01026908: 0x1026908: j	 0x102691c addiu a1, a1, 20820
+// 0x01026918: 0x1026918: j	 0x102692c addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-	br L_102691c
+	br L_102692c
 // --- basic block ---
-L_1026910:
-// 0x01026910: 0x1026910: lui   a1, 0x20000
+L_1026920:
+// 0x01026920: 0x1026920: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01026914: 0x1026914: addiu a0, v0, 6344
+// 0x01026924: 0x1026924: addiu a0, v0, 6344
 	ldloc 5
 	ldc.i4 6344
 	add
 	stloc.1
-// 0x01026918: 0x1026918: addiu a1, a1, 9464
+// 0x01026928: 0x1026928: addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-L_102691c:
-// 0x0102691c: 0x102691c: jal   0x100e5c0 sll   zero, zero, 0
+L_102692c:
+// 0x0102692c: 0x102692c: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026924: 0x1026924: jal   0x100ea50 addu  a0, zero, zero
+// 0x01026934: 0x1026934: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6653,14 +6653,14 @@ L_102691c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102692c: 0x102692c: lw    ra, 20(sp)
-// 0x01026930: 0x1026930: sll   zero, zero, 0
-// 0x01026934: 0x1026934: jr    ra addiu sp, sp, 24
+// 0x0102693c: 0x102693c: lw    ra, 20(sp)
+// 0x01026940: 0x1026940: sll   zero, zero, 0
+// 0x01026944: 0x1026944: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6672,7 +6672,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_social_get_show_profile_102693c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_get_show_profile_102694c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -6710,13 +6710,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102693c: 0x102693c: addiu sp, sp, -24
+// 0x0102694c: 0x102694c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026940: 0x1026940: sw    ra, 20(sp)
-// 0x01026944: 0x1026944: sw    s0, 16(sp)
+// 0x01026950: 0x1026950: sw    ra, 20(sp)
+// 0x01026954: 0x1026954: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6725,7 +6725,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01026948: 0x1026948: jal   0x100e348 addu  s0, a0, zero
+// 0x01026958: 0x1026958: jal   0x100e358 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -6733,18 +6733,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026950: 0x1026950: lui   a1, 0x0
+// 0x01026960: 0x1026960: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026954: 0x1026954: addu  a0, v0, zero
+// 0x01026964: 0x1026964: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026958: 0x1026958: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01026968: 0x1026968: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -6754,13 +6754,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026960: 0x1026960: beq   v0, zero, 0x1026984 addiu v1, zero, 2
+// 0x01026970: 0x1026970: beq   v0, zero, 0x1026994 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_1026984
+	brfalse L_1026994
 // --- basic block ---
-// 0x01026968: 0x1026968: jal   0x100e348 addu  a0, s0, zero
+// 0x01026978: 0x1026978: jal   0x100e358 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6768,18 +6768,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026970: 0x1026970: lui   a1, 0x10000
+// 0x01026980: 0x1026980: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026974: 0x1026974: addu  a0, v0, zero
+// 0x01026984: 0x1026984: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026978: 0x1026978: jal   0x1001b14 addiu a1, a1, -28772
+// 0x01026988: 0x1026988: jal   0x1001b14 addiu a1, a1, -28772
 	ldloc.2
 	ldc.i4 -28772
 	add
@@ -6789,17 +6789,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026980: 0x1026980: sltiu v1, v0, 1
+// 0x01026990: 0x1026990: sltiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 6
-L_1026984:
-// 0x01026984: 0x1026984: lw    ra, 20(sp)
-// 0x01026988: 0x1026988: addu  v0, v1, zero
+L_1026994:
+// 0x01026994: 0x1026994: lw    ra, 20(sp)
+// 0x01026998: 0x1026998: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0102698c: 0x102698c: lw    s0, 16(sp)
+// 0x0102699c: 0x102699c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6808,7 +6808,7 @@ L_1026984:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01026990: 0x1026990: jr    ra addiu sp, sp, 24
+// 0x010269a0: 0x10269a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6820,7 +6820,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_twitter_get_show_profile_1026998(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_get_show_profile_10269a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6855,16 +6855,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026998: 0x1026998: lui   a0, 0x0
+// 0x010269a8: 0x10269a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102699c: 0x102699c: addiu sp, sp, -24
+// 0x010269ac: 0x10269ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010269a0: 0x10269a0: sw    ra, 20(sp)
-// 0x010269a4: 0x10269a4: jal   0x102693c addiu a0, a0, 6328
+// 0x010269b0: 0x10269b0: sw    ra, 20(sp)
+// 0x010269b4: 0x10269b4: jal   0x102694c addiu a0, a0, 6328
 	ldloc.1
 	ldc.i4 6328
 	add
@@ -6874,14 +6874,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_get_show_profile_102693c(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_get_show_profile_102694c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010269ac: 0x10269ac: lw    ra, 20(sp)
-// 0x010269b0: 0x10269b0: sll   zero, zero, 0
-// 0x010269b4: 0x10269b4: jr    ra addiu sp, sp, 24
+// 0x010269bc: 0x10269bc: lw    ra, 20(sp)
+// 0x010269c0: 0x10269c0: sll   zero, zero, 0
+// 0x010269c4: 0x10269c4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl29.j b/converted/Cibyl29.j
index 8f2c3cf..3be2b88 100644
--- a/converted/Cibyl29.j
+++ b/converted/Cibyl29.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl29::.ctor
 
-.method public static int32 roadmap_facebook_get_show_profile_10269bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_get_show_profile_10269cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -76,16 +76,16 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010269bc: 0x10269bc: lui   a0, 0x0
+// 0x010269cc: 0x10269cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010269c0: 0x10269c0: addiu sp, sp, -24
+// 0x010269d0: 0x10269d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010269c4: 0x10269c4: sw    ra, 20(sp)
-// 0x010269c8: 0x10269c8: jal   0x102693c addiu a0, a0, 6456
+// 0x010269d4: 0x10269d4: sw    ra, 20(sp)
+// 0x010269d8: 0x10269d8: jal   0x102694c addiu a0, a0, 6456
 	ldloc.1
 	ldc.i4 6456
 	add
@@ -95,14 +95,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_social_get_show_profile_102693c(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_social_get_show_profile_102694c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010269d0: 0x10269d0: lw    ra, 20(sp)
-// 0x010269d4: 0x10269d4: sll   zero, zero, 0
-// 0x010269d8: 0x10269d8: jr    ra addiu sp, sp, 24
+// 0x010269e0: 0x10269e0: lw    ra, 20(sp)
+// 0x010269e4: 0x10269e4: sll   zero, zero, 0
+// 0x010269e8: 0x10269e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -114,7 +114,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -152,12 +152,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010269e0: 0x10269e0: addiu sp, sp, -24
+// 0x010269f0: 0x10269f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010269e4: 0x10269e4: sw    s0, 16(sp)
+// 0x010269f4: 0x10269f4: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -166,11 +166,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010269e8: 0x10269e8: lui   s0, 0x0
+// 0x010269f8: 0x10269f8: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010269ec: 0x10269ec: sw    ra, 20(sp)
-// 0x010269f0: 0x10269f0: jal   0x100e348 addiu a0, s0, 6440
+// 0x010269fc: 0x10269fc: sw    ra, 20(sp)
+// 0x01026a00: 0x1026a00: jal   0x100e358 addiu a0, s0, 6440
 	ldloc 7
 	ldc.i4 6440
 	add
@@ -180,18 +180,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010269f8: 0x10269f8: lui   a1, 0x0
+// 0x01026a08: 0x1026a08: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010269fc: 0x10269fc: addu  a0, v0, zero
+// 0x01026a0c: 0x1026a0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026a00: 0x1026a00: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01026a10: 0x1026a10: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -201,13 +201,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026a08: 0x1026a08: beq   v0, zero, 0x1026a2c addiu v1, zero, 2
+// 0x01026a18: 0x1026a18: beq   v0, zero, 0x1026a3c addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_1026a2c
+	brfalse L_1026a3c
 // --- basic block ---
-// 0x01026a10: 0x1026a10: jal   0x100e348 addiu a0, s0, 6440
+// 0x01026a20: 0x1026a20: jal   0x100e358 addiu a0, s0, 6440
 	ldloc 7
 	ldc.i4 6440
 	add
@@ -217,18 +217,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026a18: 0x1026a18: lui   a1, 0x10000
+// 0x01026a28: 0x1026a28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026a1c: 0x1026a1c: addu  a0, v0, zero
+// 0x01026a2c: 0x1026a2c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026a20: 0x1026a20: jal   0x1001b14 addiu a1, a1, -28772
+// 0x01026a30: 0x1026a30: jal   0x1001b14 addiu a1, a1, -28772
 	ldloc.2
 	ldc.i4 -28772
 	add
@@ -238,17 +238,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026a28: 0x1026a28: sltiu v1, v0, 1
+// 0x01026a38: 0x1026a38: sltiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 6
-L_1026a2c:
-// 0x01026a2c: 0x1026a2c: lw    ra, 20(sp)
-// 0x01026a30: 0x1026a30: addu  v0, v1, zero
+L_1026a3c:
+// 0x01026a3c: 0x1026a3c: lw    ra, 20(sp)
+// 0x01026a40: 0x1026a40: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01026a34: 0x1026a34: lw    s0, 16(sp)
+// 0x01026a44: 0x1026a44: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -257,7 +257,7 @@ L_1026a2c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01026a38: 0x1026a38: jr    ra addiu sp, sp, 24
+// 0x01026a48: 0x1026a48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -269,7 +269,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -307,12 +307,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026a40: 0x1026a40: addiu sp, sp, -24
+// 0x01026a50: 0x1026a50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026a44: 0x1026a44: sw    s0, 16(sp)
+// 0x01026a54: 0x1026a54: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -321,11 +321,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01026a48: 0x1026a48: lui   s0, 0x0
+// 0x01026a58: 0x1026a58: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01026a4c: 0x1026a4c: sw    ra, 20(sp)
-// 0x01026a50: 0x1026a50: jal   0x100e348 addiu a0, s0, 6424
+// 0x01026a5c: 0x1026a5c: sw    ra, 20(sp)
+// 0x01026a60: 0x1026a60: jal   0x100e358 addiu a0, s0, 6424
 	ldloc 7
 	ldc.i4 6424
 	add
@@ -335,18 +335,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026a58: 0x1026a58: lui   a1, 0x0
+// 0x01026a68: 0x1026a68: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026a5c: 0x1026a5c: addu  a0, v0, zero
+// 0x01026a6c: 0x1026a6c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026a60: 0x1026a60: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01026a70: 0x1026a70: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -356,13 +356,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026a68: 0x1026a68: beq   v0, zero, 0x1026a8c addiu v1, zero, 2
+// 0x01026a78: 0x1026a78: beq   v0, zero, 0x1026a9c addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_1026a8c
+	brfalse L_1026a9c
 // --- basic block ---
-// 0x01026a70: 0x1026a70: jal   0x100e348 addiu a0, s0, 6424
+// 0x01026a80: 0x1026a80: jal   0x100e358 addiu a0, s0, 6424
 	ldloc 7
 	ldc.i4 6424
 	add
@@ -372,18 +372,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026a78: 0x1026a78: lui   a1, 0x10000
+// 0x01026a88: 0x1026a88: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026a7c: 0x1026a7c: addu  a0, v0, zero
+// 0x01026a8c: 0x1026a8c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026a80: 0x1026a80: jal   0x1001b14 addiu a1, a1, -28772
+// 0x01026a90: 0x1026a90: jal   0x1001b14 addiu a1, a1, -28772
 	ldloc.2
 	ldc.i4 -28772
 	add
@@ -393,17 +393,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026a88: 0x1026a88: sltiu v1, v0, 1
+// 0x01026a98: 0x1026a98: sltiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 6
-L_1026a8c:
-// 0x01026a8c: 0x1026a8c: lw    ra, 20(sp)
-// 0x01026a90: 0x1026a90: addu  v0, v1, zero
+L_1026a9c:
+// 0x01026a9c: 0x1026a9c: lw    ra, 20(sp)
+// 0x01026aa0: 0x1026aa0: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01026a94: 0x1026a94: lw    s0, 16(sp)
+// 0x01026aa4: 0x1026aa4: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -412,7 +412,7 @@ L_1026a8c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01026a98: 0x1026a98: jr    ra addiu sp, sp, 24
+// 0x01026aa8: 0x1026aa8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -424,7 +424,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_social_send_permissions_1026aa0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_send_permissions_1026ab0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -459,71 +459,71 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026aa0: 0x1026aa0: addiu sp, sp, -40
+// 0x01026ab0: 0x1026ab0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01026aa4: 0x1026aa4: sw    ra, 36(sp)
-// 0x01026aa8: 0x1026aa8: jal   0x106ab70 sll   zero, zero, 0
+// 0x01026ab4: 0x1026ab4: sw    ra, 36(sp)
+// 0x01026ab8: 0x1026ab8: jal   0x106b194 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_IsAnonymous_106ab70(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_IsAnonymous_106b194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026ab0: 0x1026ab0: bne   v0, zero, 0x1026ac8 addu  a0, zero, zero
+// 0x01026ac0: 0x1026ac0: bne   v0, zero, 0x1026ad8 addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1026ac8
+	brtrue L_1026ad8
 // --- basic block ---
-// 0x01026ab8: 0x1026ab8: jal   0x106b068 sll   zero, zero, 0
+// 0x01026ac8: 0x1026ac8: jal   0x106b68c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026ac0: 0x1026ac0: beq   v0, zero, 0x1026ad8 addu  a0, zero, zero
+// 0x01026ad0: 0x1026ad0: beq   v0, zero, 0x1026ae8 addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1026ad8
+	brfalse L_1026ae8
 // --- basic block ---
-L_1026ac8:
-// 0x01026ac8: 0x1026ac8: addu  a1, zero, zero
+L_1026ad8:
+// 0x01026ad8: 0x1026ad8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01026acc: 0x1026acc: addu  a2, zero, zero
+// 0x01026adc: 0x1026adc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01026ad0: 0x1026ad0: j	 0x1026b08 addu  a3, zero, zero
+// 0x01026ae0: 0x1026ae0: j	 0x1026b18 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_1026b08
+	br L_1026b18
 // --- basic block ---
-L_1026ad8:
-// 0x01026ad8: 0x1026ad8: jal   0x1026a40 sll   zero, zero, 0
+L_1026ae8:
+// 0x01026ae8: 0x1026ae8: jal   0x1026a50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026ae0: 0x1026ae0: jal   0x10269e0 sw    v0, 24(sp)
+// 0x01026af0: 0x1026af0: jal   0x10269f0 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -537,12 +537,12 @@ L_1026ad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026ae8: 0x1026ae8: jal   0x10269bc sw    v0, 20(sp)
+// 0x01026af8: 0x1026af8: jal   0x10269cc sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -556,12 +556,12 @@ L_1026ad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_profile_10269bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_profile_10269cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026af0: 0x1026af0: jal   0x1026998 sw    v0, 16(sp)
+// 0x01026b00: 0x1026b00: jal   0x10269a8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -575,12 +575,12 @@ L_1026ad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_get_show_profile_1026998(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_get_show_profile_10269a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026af8: 0x1026af8: lw    a0, 24(sp)
+// 0x01026b08: 0x1026b08: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -589,7 +589,7 @@ L_1026ad8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01026afc: 0x1026afc: lw    a1, 20(sp)
+// 0x01026b0c: 0x1026b0c: lw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -598,7 +598,7 @@ L_1026ad8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01026b00: 0x1026b00: lw    a2, 16(sp)
+// 0x01026b10: 0x1026b10: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -607,24 +607,24 @@ L_1026ad8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01026b04: 0x1026b04: addu  a3, v0, zero
+// 0x01026b14: 0x1026b14: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-L_1026b08:
-// 0x01026b08: 0x1026b08: jal   0x106b3b0 sll   zero, zero, 0
+L_1026b18:
+// 0x01026b18: 0x1026b18: jal   0x106b9d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_FacebookPermissions_106b3b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_FacebookPermissions_106b9d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026b10: 0x1026b10: lw    ra, 36(sp)
-// 0x01026b14: 0x1026b14: sll   zero, zero, 0
-// 0x01026b18: 0x1026b18: jr    ra addiu sp, sp, 40
+// 0x01026b20: 0x1026b20: lw    ra, 36(sp)
+// 0x01026b24: 0x1026b24: sll   zero, zero, 0
+// 0x01026b28: 0x1026b28: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -636,7 +636,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_twitter_is_signup_enabled_1026b20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_is_signup_enabled_1026b30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -671,16 +671,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026b20: 0x1026b20: lui   a0, 0x0
+// 0x01026b30: 0x1026b30: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026b24: 0x1026b24: addiu sp, sp, -24
+// 0x01026b34: 0x1026b34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026b28: 0x1026b28: sw    ra, 20(sp)
-// 0x01026b2c: 0x1026b2c: jal   0x100e348 addiu a0, a0, 6312
+// 0x01026b38: 0x1026b38: sw    ra, 20(sp)
+// 0x01026b3c: 0x1026b3c: jal   0x100e358 addiu a0, a0, 6312
 	ldloc.1
 	ldc.i4 6312
 	add
@@ -690,18 +690,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026b34: 0x1026b34: lui   a1, 0x0
+// 0x01026b44: 0x1026b44: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026b38: 0x1026b38: addu  a0, v0, zero
+// 0x01026b48: 0x1026b48: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026b3c: 0x1026b3c: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01026b4c: 0x1026b4c: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -711,13 +711,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026b44: 0x1026b44: lw    ra, 20(sp)
-// 0x01026b48: 0x1026b48: sltiu v0, v0, 1
+// 0x01026b54: 0x1026b54: lw    ra, 20(sp)
+// 0x01026b58: 0x1026b58: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01026b4c: 0x1026b4c: jr    ra addiu sp, sp, 24
+// 0x01026b5c: 0x1026b5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -729,7 +729,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_twitter_is_show_munching_1026b54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_is_show_munching_1026b64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -764,16 +764,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026b54: 0x1026b54: lui   a0, 0x0
+// 0x01026b64: 0x1026b64: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026b58: 0x1026b58: addiu sp, sp, -24
+// 0x01026b68: 0x1026b68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026b5c: 0x1026b5c: sw    ra, 20(sp)
-// 0x01026b60: 0x1026b60: jal   0x100e348 addiu a0, a0, 6296
+// 0x01026b6c: 0x1026b6c: sw    ra, 20(sp)
+// 0x01026b70: 0x1026b70: jal   0x100e358 addiu a0, a0, 6296
 	ldloc.1
 	ldc.i4 6296
 	add
@@ -783,18 +783,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026b68: 0x1026b68: lui   a1, 0x0
+// 0x01026b78: 0x1026b78: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026b6c: 0x1026b6c: addu  a0, v0, zero
+// 0x01026b7c: 0x1026b7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026b70: 0x1026b70: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01026b80: 0x1026b80: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -804,13 +804,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026b78: 0x1026b78: lw    ra, 20(sp)
-// 0x01026b7c: 0x1026b7c: sltiu v0, v0, 1
+// 0x01026b88: 0x1026b88: lw    ra, 20(sp)
+// 0x01026b8c: 0x1026b8c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01026b80: 0x1026b80: jr    ra addiu sp, sp, 24
+// 0x01026b90: 0x1026b90: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -822,7 +822,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_social_is_munching_enabled_1026b88(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_is_munching_enabled_1026b98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -857,30 +857,30 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026b88: 0x1026b88: addiu sp, sp, -24
+// 0x01026b98: 0x1026b98: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026b8c: 0x1026b8c: sw    ra, 20(sp)
-// 0x01026b90: 0x1026b90: jal   0x100e348 sll   zero, zero, 0
+// 0x01026b9c: 0x1026b9c: sw    ra, 20(sp)
+// 0x01026ba0: 0x1026ba0: jal   0x100e358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026b98: 0x1026b98: lui   a1, 0x0
+// 0x01026ba8: 0x1026ba8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026b9c: 0x1026b9c: addu  a0, v0, zero
+// 0x01026bac: 0x1026bac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026ba0: 0x1026ba0: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01026bb0: 0x1026bb0: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -890,13 +890,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026ba8: 0x1026ba8: lw    ra, 20(sp)
-// 0x01026bac: 0x1026bac: sltiu v0, v0, 1
+// 0x01026bb8: 0x1026bb8: lw    ra, 20(sp)
+// 0x01026bbc: 0x1026bbc: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01026bb0: 0x1026bb0: jr    ra addiu sp, sp, 24
+// 0x01026bc0: 0x1026bc0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -908,7 +908,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_is_munching_enabled_1026bb8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_is_munching_enabled_1026bc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -943,16 +943,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026bb8: 0x1026bb8: lui   a0, 0x0
+// 0x01026bc8: 0x1026bc8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026bbc: 0x1026bbc: addiu sp, sp, -24
+// 0x01026bcc: 0x1026bcc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026bc0: 0x1026bc0: sw    ra, 20(sp)
-// 0x01026bc4: 0x1026bc4: jal   0x1026b88 addiu a0, a0, 6392
+// 0x01026bd0: 0x1026bd0: sw    ra, 20(sp)
+// 0x01026bd4: 0x1026bd4: jal   0x1026b98 addiu a0, a0, 6392
 	ldloc.1
 	ldc.i4 6392
 	add
@@ -962,14 +962,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_is_munching_enabled_1026b88(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_is_munching_enabled_1026b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026bcc: 0x1026bcc: lw    ra, 20(sp)
-// 0x01026bd0: 0x1026bd0: sll   zero, zero, 0
-// 0x01026bd4: 0x1026bd4: jr    ra addiu sp, sp, 24
+// 0x01026bdc: 0x1026bdc: lw    ra, 20(sp)
+// 0x01026be0: 0x1026be0: sll   zero, zero, 0
+// 0x01026be4: 0x1026be4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -981,7 +981,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_is_munching_enabled_1026bdc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_is_munching_enabled_1026bec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1016,16 +1016,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026bdc: 0x1026bdc: lui   a0, 0x0
+// 0x01026bec: 0x1026bec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026be0: 0x1026be0: addiu sp, sp, -24
+// 0x01026bf0: 0x1026bf0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026be4: 0x1026be4: sw    ra, 20(sp)
-// 0x01026be8: 0x1026be8: jal   0x1026b88 addiu a0, a0, 6280
+// 0x01026bf4: 0x1026bf4: sw    ra, 20(sp)
+// 0x01026bf8: 0x1026bf8: jal   0x1026b98 addiu a0, a0, 6280
 	ldloc.1
 	ldc.i4 6280
 	add
@@ -1035,14 +1035,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_is_munching_enabled_1026b88(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_is_munching_enabled_1026b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026bf0: 0x1026bf0: lw    ra, 20(sp)
-// 0x01026bf4: 0x1026bf4: sll   zero, zero, 0
-// 0x01026bf8: 0x1026bf8: jr    ra addiu sp, sp, 24
+// 0x01026c00: 0x1026c00: lw    ra, 20(sp)
+// 0x01026c04: 0x1026c04: sll   zero, zero, 0
+// 0x01026c08: 0x1026c08: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1054,7 +1054,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_social_destination_mode_1026c00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_destination_mode_1026c10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -1092,13 +1092,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026c00: 0x1026c00: addiu sp, sp, -24
+// 0x01026c10: 0x1026c10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026c04: 0x1026c04: sw    ra, 20(sp)
-// 0x01026c08: 0x1026c08: sw    s0, 16(sp)
+// 0x01026c14: 0x1026c14: sw    ra, 20(sp)
+// 0x01026c18: 0x1026c18: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1107,7 +1107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01026c0c: 0x1026c0c: jal   0x100e348 addu  s0, a0, zero
+// 0x01026c1c: 0x1026c1c: jal   0x100e358 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -1115,18 +1115,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026c14: 0x1026c14: lui   a1, 0x10000
+// 0x01026c24: 0x1026c24: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026c18: 0x1026c18: addu  a0, v0, zero
+// 0x01026c28: 0x1026c28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026c1c: 0x1026c1c: jal   0x1001b14 addiu a1, a1, -28764
+// 0x01026c2c: 0x1026c2c: jal   0x1001b14 addiu a1, a1, -28764
 	ldloc.2
 	ldc.i4 -28764
 	add
@@ -1136,13 +1136,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026c24: 0x1026c24: beq   v0, zero, 0x1026c48 addiu v1, zero, 3
+// 0x01026c34: 0x1026c34: beq   v0, zero, 0x1026c58 addiu v1, zero, 3
 	ldloc 5
 	ldc.i4.3
 	stloc 6
-	brfalse L_1026c48
+	brfalse L_1026c58
 // --- basic block ---
-// 0x01026c2c: 0x1026c2c: jal   0x100e348 addu  a0, s0, zero
+// 0x01026c3c: 0x1026c3c: jal   0x100e358 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1150,18 +1150,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026c34: 0x1026c34: lui   a1, 0x10000
+// 0x01026c44: 0x1026c44: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026c38: 0x1026c38: addu  a0, v0, zero
+// 0x01026c48: 0x1026c48: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026c3c: 0x1026c3c: jal   0x1001b14 addiu a1, a1, -28756
+// 0x01026c4c: 0x1026c4c: jal   0x1001b14 addiu a1, a1, -28756
 	ldloc.2
 	ldc.i4 -28756
 	add
@@ -1171,17 +1171,17 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026c44: 0x1026c44: sltiu v1, v0, 1
+// 0x01026c54: 0x1026c54: sltiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 6
-L_1026c48:
-// 0x01026c48: 0x1026c48: lw    ra, 20(sp)
-// 0x01026c4c: 0x1026c4c: addu  v0, v1, zero
+L_1026c58:
+// 0x01026c58: 0x1026c58: lw    ra, 20(sp)
+// 0x01026c5c: 0x1026c5c: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01026c50: 0x1026c50: lw    s0, 16(sp)
+// 0x01026c60: 0x1026c60: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1190,7 +1190,7 @@ L_1026c48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01026c54: 0x1026c54: jr    ra addiu sp, sp, 24
+// 0x01026c64: 0x1026c64: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1202,7 +1202,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_destination_mode_1026c5c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_destination_mode_1026c6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1237,16 +1237,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026c5c: 0x1026c5c: lui   a0, 0x0
+// 0x01026c6c: 0x1026c6c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026c60: 0x1026c60: addiu sp, sp, -24
+// 0x01026c70: 0x1026c70: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026c64: 0x1026c64: sw    ra, 20(sp)
-// 0x01026c68: 0x1026c68: jal   0x1026c00 addiu a0, a0, 6376
+// 0x01026c74: 0x1026c74: sw    ra, 20(sp)
+// 0x01026c78: 0x1026c78: jal   0x1026c10 addiu a0, a0, 6376
 	ldloc.1
 	ldc.i4 6376
 	add
@@ -1256,14 +1256,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_destination_mode_1026c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_destination_mode_1026c10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026c70: 0x1026c70: lw    ra, 20(sp)
-// 0x01026c74: 0x1026c74: sll   zero, zero, 0
-// 0x01026c78: 0x1026c78: jr    ra addiu sp, sp, 24
+// 0x01026c80: 0x1026c80: lw    ra, 20(sp)
+// 0x01026c84: 0x1026c84: sll   zero, zero, 0
+// 0x01026c88: 0x1026c88: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1275,7 +1275,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_destination_mode_1026c80(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_destination_mode_1026c90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1310,16 +1310,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026c80: 0x1026c80: lui   a0, 0x0
+// 0x01026c90: 0x1026c90: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026c84: 0x1026c84: addiu sp, sp, -24
+// 0x01026c94: 0x1026c94: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026c88: 0x1026c88: sw    ra, 20(sp)
-// 0x01026c8c: 0x1026c8c: jal   0x1026c00 addiu a0, a0, 6264
+// 0x01026c98: 0x1026c98: sw    ra, 20(sp)
+// 0x01026c9c: 0x1026c9c: jal   0x1026c10 addiu a0, a0, 6264
 	ldloc.1
 	ldc.i4 6264
 	add
@@ -1329,14 +1329,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_destination_mode_1026c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_destination_mode_1026c10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026c94: 0x1026c94: lw    ra, 20(sp)
-// 0x01026c98: 0x1026c98: sll   zero, zero, 0
-// 0x01026c9c: 0x1026c9c: jr    ra addiu sp, sp, 24
+// 0x01026ca4: 0x1026ca4: lw    ra, 20(sp)
+// 0x01026ca8: 0x1026ca8: sll   zero, zero, 0
+// 0x01026cac: 0x1026cac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1348,7 +1348,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_social_is_sending_enabled_1026ca4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_is_sending_enabled_1026cb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -1383,30 +1383,30 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026ca4: 0x1026ca4: addiu sp, sp, -24
+// 0x01026cb4: 0x1026cb4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026ca8: 0x1026ca8: sw    ra, 20(sp)
-// 0x01026cac: 0x1026cac: jal   0x100e348 sll   zero, zero, 0
+// 0x01026cb8: 0x1026cb8: sw    ra, 20(sp)
+// 0x01026cbc: 0x1026cbc: jal   0x100e358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026cb4: 0x1026cb4: lui   a1, 0x0
+// 0x01026cc4: 0x1026cc4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026cb8: 0x1026cb8: addu  a0, v0, zero
+// 0x01026cc8: 0x1026cc8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026cbc: 0x1026cbc: jal   0x1001b14 addiu a1, a1, 21112
+// 0x01026ccc: 0x1026ccc: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
@@ -1416,13 +1416,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026cc4: 0x1026cc4: lw    ra, 20(sp)
-// 0x01026cc8: 0x1026cc8: sltiu v0, v0, 1
+// 0x01026cd4: 0x1026cd4: lw    ra, 20(sp)
+// 0x01026cd8: 0x1026cd8: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01026ccc: 0x1026ccc: jr    ra addiu sp, sp, 24
+// 0x01026cdc: 0x1026cdc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1434,7 +1434,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_is_sending_enabled_1026cd4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_is_sending_enabled_1026ce4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1469,16 +1469,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026cd4: 0x1026cd4: lui   a0, 0x0
+// 0x01026ce4: 0x1026ce4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026cd8: 0x1026cd8: addiu sp, sp, -24
+// 0x01026ce8: 0x1026ce8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026cdc: 0x1026cdc: sw    ra, 20(sp)
-// 0x01026ce0: 0x1026ce0: jal   0x1026ca4 addiu a0, a0, 6360
+// 0x01026cec: 0x1026cec: sw    ra, 20(sp)
+// 0x01026cf0: 0x1026cf0: jal   0x1026cb4 addiu a0, a0, 6360
 	ldloc.1
 	ldc.i4 6360
 	add
@@ -1488,14 +1488,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_is_sending_enabled_1026ca4(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_is_sending_enabled_1026cb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026ce8: 0x1026ce8: lw    ra, 20(sp)
-// 0x01026cec: 0x1026cec: sll   zero, zero, 0
-// 0x01026cf0: 0x1026cf0: jr    ra addiu sp, sp, 24
+// 0x01026cf8: 0x1026cf8: lw    ra, 20(sp)
+// 0x01026cfc: 0x1026cfc: sll   zero, zero, 0
+// 0x01026d00: 0x1026d00: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1507,7 +1507,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_is_sending_enabled_1026cf8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_is_sending_enabled_1026d08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1542,16 +1542,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026cf8: 0x1026cf8: lui   a0, 0x0
+// 0x01026d08: 0x1026d08: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026cfc: 0x1026cfc: addiu sp, sp, -24
+// 0x01026d0c: 0x1026d0c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026d00: 0x1026d00: sw    ra, 20(sp)
-// 0x01026d04: 0x1026d04: jal   0x1026ca4 addiu a0, a0, 6248
+// 0x01026d10: 0x1026d10: sw    ra, 20(sp)
+// 0x01026d14: 0x1026d14: jal   0x1026cb4 addiu a0, a0, 6248
 	ldloc.1
 	ldc.i4 6248
 	add
@@ -1561,14 +1561,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_is_sending_enabled_1026ca4(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_is_sending_enabled_1026cb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026d0c: 0x1026d0c: lw    ra, 20(sp)
-// 0x01026d10: 0x1026d10: sll   zero, zero, 0
-// 0x01026d14: 0x1026d14: jr    ra addiu sp, sp, 24
+// 0x01026d1c: 0x1026d1c: lw    ra, 20(sp)
+// 0x01026d20: 0x1026d20: sll   zero, zero, 0
+// 0x01026d24: 0x1026d24: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1580,7 +1580,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_get_password_1026d1c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_get_password_1026d2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1615,16 +1615,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026d1c: 0x1026d1c: lui   a0, 0x0
+// 0x01026d2c: 0x1026d2c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026d20: 0x1026d20: addiu sp, sp, -24
+// 0x01026d30: 0x1026d30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026d24: 0x1026d24: sw    ra, 20(sp)
-// 0x01026d28: 0x1026d28: jal   0x100e348 addiu a0, a0, 6232
+// 0x01026d34: 0x1026d34: sw    ra, 20(sp)
+// 0x01026d38: 0x1026d38: jal   0x100e358 addiu a0, a0, 6232
 	ldloc.1
 	ldc.i4 6232
 	add
@@ -1634,14 +1634,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026d30: 0x1026d30: lw    ra, 20(sp)
-// 0x01026d34: 0x1026d34: sll   zero, zero, 0
-// 0x01026d38: 0x1026d38: jr    ra addiu sp, sp, 24
+// 0x01026d40: 0x1026d40: lw    ra, 20(sp)
+// 0x01026d44: 0x1026d44: sll   zero, zero, 0
+// 0x01026d48: 0x1026d48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1653,7 +1653,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_twitter_get_username_1026d40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_get_username_1026d50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1688,16 +1688,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026d40: 0x1026d40: lui   a0, 0x0
+// 0x01026d50: 0x1026d50: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026d44: 0x1026d44: addiu sp, sp, -24
+// 0x01026d54: 0x1026d54: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026d48: 0x1026d48: sw    ra, 20(sp)
-// 0x01026d4c: 0x1026d4c: jal   0x100e348 addiu a0, a0, 6216
+// 0x01026d58: 0x1026d58: sw    ra, 20(sp)
+// 0x01026d5c: 0x1026d5c: jal   0x100e358 addiu a0, a0, 6216
 	ldloc.1
 	ldc.i4 6216
 	add
@@ -1707,14 +1707,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026d54: 0x1026d54: lw    ra, 20(sp)
-// 0x01026d58: 0x1026d58: sll   zero, zero, 0
-// 0x01026d5c: 0x1026d5c: jr    ra addiu sp, sp, 24
+// 0x01026d64: 0x1026d64: lw    ra, 20(sp)
+// 0x01026d68: 0x1026d68: sll   zero, zero, 0
+// 0x01026d6c: 0x1026d6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1726,7 +1726,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_social_logged_in_1026d64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_logged_in_1026d74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -1761,30 +1761,30 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026d64: 0x1026d64: addiu sp, sp, -24
+// 0x01026d74: 0x1026d74: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026d68: 0x1026d68: sw    ra, 20(sp)
-// 0x01026d6c: 0x1026d6c: jal   0x100e348 sll   zero, zero, 0
+// 0x01026d78: 0x1026d78: sw    ra, 20(sp)
+// 0x01026d7c: 0x1026d7c: jal   0x100e358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01026d74: 0x1026d74: lui   a1, 0x0
+// 0x01026d84: 0x1026d84: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026d78: 0x1026d78: addu  a0, v0, zero
+// 0x01026d88: 0x1026d88: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026d7c: 0x1026d7c: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01026d8c: 0x1026d8c: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -1794,13 +1794,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026d84: 0x1026d84: lw    ra, 20(sp)
-// 0x01026d88: 0x1026d88: sltiu v0, v0, 1
+// 0x01026d94: 0x1026d94: lw    ra, 20(sp)
+// 0x01026d98: 0x1026d98: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01026d8c: 0x1026d8c: jr    ra addiu sp, sp, 24
+// 0x01026d9c: 0x1026d9c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1812,7 +1812,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1847,16 +1847,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026d94: 0x1026d94: lui   a0, 0x0
+// 0x01026da4: 0x1026da4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026d98: 0x1026d98: addiu sp, sp, -24
+// 0x01026da8: 0x1026da8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026d9c: 0x1026d9c: sw    ra, 20(sp)
-// 0x01026da0: 0x1026da0: jal   0x1026d64 addiu a0, a0, 6472
+// 0x01026dac: 0x1026dac: sw    ra, 20(sp)
+// 0x01026db0: 0x1026db0: jal   0x1026d74 addiu a0, a0, 6472
 	ldloc.1
 	ldc.i4 6472
 	add
@@ -1866,14 +1866,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_logged_in_1026d64(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_logged_in_1026d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026da8: 0x1026da8: lw    ra, 20(sp)
-// 0x01026dac: 0x1026dac: sll   zero, zero, 0
-// 0x01026db0: 0x1026db0: jr    ra addiu sp, sp, 24
+// 0x01026db8: 0x1026db8: lw    ra, 20(sp)
+// 0x01026dbc: 0x1026dbc: sll   zero, zero, 0
+// 0x01026dc0: 0x1026dc0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1885,7 +1885,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_facebook_refresh_connection_1026db8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_refresh_connection_1026dc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1929,13 +1929,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026db8: 0x1026db8: addiu sp, sp, -32
+// 0x01026dc8: 0x1026dc8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01026dbc: 0x1026dbc: sw    ra, 28(sp)
-// 0x01026dc0: 0x1026dc0: sw    s2, 24(sp)
+// 0x01026dcc: 0x1026dcc: sw    ra, 28(sp)
+// 0x01026dd0: 0x1026dd0: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1944,7 +1944,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01026dc4: 0x1026dc4: sw    s1, 20(sp)
+// 0x01026dd4: 0x1026dd4: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1953,7 +1953,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01026dc8: 0x1026dc8: jal   0x1093fc0 sw    s0, 16(sp)
+// 0x01026dd8: 0x1026dd8: jal   0x10945e4 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1962,21 +1962,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026dd0: 0x1026dd0: beq   v0, zero, 0x1026e70 lui   a1, 0x10000
+// 0x01026de0: 0x1026de0: beq   v0, zero, 0x1026e80 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1026e70
+	brfalse L_1026e80
 // --- basic block ---
-// 0x01026dd8: 0x1026dd8: addu  a0, v0, zero
+// 0x01026de8: 0x1026de8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026ddc: 0x1026ddc: jal   0x1001b14 addiu a1, a1, -28748
+// 0x01026dec: 0x1026dec: jal   0x1001b14 addiu a1, a1, -28748
 	ldloc.2
 	ldc.i4 -28748
 	add
@@ -1986,19 +1986,19 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01026de4: 0x1026de4: bne   v0, zero, 0x1026e70 sll   zero, zero, 0
+// 0x01026df4: 0x1026df4: bne   v0, zero, 0x1026e80 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1026e70
+	brtrue L_1026e80
 // --- basic block ---
-// 0x01026dec: 0x1026dec: jal   0x1093fa0 lui   s2, 0x0
+// 0x01026dfc: 0x1026dfc: jal   0x10945c4 lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026df4: 0x1026df4: jal   0x1026d94 addu  s1, v0, zero
+// 0x01026e04: 0x1026e04: jal   0x1026da4 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2006,21 +2006,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026dfc: 0x1026dfc: beq   v0, zero, 0x1026e38 lui   s0, 0x10000
+// 0x01026e0c: 0x1026e0c: beq   v0, zero, 0x1026e48 lui   s0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brfalse L_1026e38
+	brfalse L_1026e48
 // --- basic block ---
-// 0x01026e04: 0x1026e04: lui   a0, 0x10000
+// 0x01026e14: 0x1026e14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01026e08: 0x1026e08: jal   0x101cd60 addiu a0, a0, -32232
+// 0x01026e18: 0x1026e18: jal   0x101cd70 addiu a0, a0, -32232
 	ldloc.1
 	ldc.i4 -32232
 	add
@@ -2030,15 +2030,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026e10: 0x1026e10: addu  a1, v0, zero
+// 0x01026e20: 0x1026e20: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01026e14: 0x1026e14: jal   0x1094770 addiu a0, s2, 32648
+// 0x01026e24: 0x1026e24: jal   0x1094d94 addiu a0, s2, 32648
 	ldloc 10
 	ldc.i4 32648
 	add
@@ -2048,15 +2048,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026e1c: 0x1026e1c: addu  a0, s1, zero
+// 0x01026e2c: 0x1026e2c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01026e20: 0x1026e20: jal   0x109b304 addiu a1, s0, -28728
+// 0x01026e30: 0x1026e30: jal   0x109b94c addiu a1, s0, -28728
 	ldloc 8
 	ldc.i4 -28728
 	add
@@ -2066,29 +2066,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026e28: 0x1026e28: lui   a1, 0x10000
+// 0x01026e38: 0x1026e38: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026e2c: 0x1026e2c: addu  a0, v0, zero
+// 0x01026e3c: 0x1026e3c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026e30: 0x1026e30: j	 0x1026e68 addiu a1, a1, -28708
+// 0x01026e40: 0x1026e40: j	 0x1026e78 addiu a1, a1, -28708
 	ldloc.2
 	ldc.i4 -28708
 	add
 	stloc.2
-	br L_1026e68
+	br L_1026e78
 // --- basic block ---
-L_1026e38:
-// 0x01026e38: 0x1026e38: lui   a0, 0x10000
+L_1026e48:
+// 0x01026e48: 0x1026e48: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01026e3c: 0x1026e3c: jal   0x101cd60 addiu a0, a0, -32212
+// 0x01026e4c: 0x1026e4c: jal   0x101cd70 addiu a0, a0, -32212
 	ldloc.1
 	ldc.i4 -32212
 	add
@@ -2098,15 +2098,15 @@ L_1026e38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026e44: 0x1026e44: addu  a1, v0, zero
+// 0x01026e54: 0x1026e54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01026e48: 0x1026e48: jal   0x1094770 addiu a0, s2, 32648
+// 0x01026e58: 0x1026e58: jal   0x1094d94 addiu a0, s2, 32648
 	ldloc 10
 	ldc.i4 32648
 	add
@@ -2116,15 +2116,15 @@ L_1026e38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026e50: 0x1026e50: addu  a0, s1, zero
+// 0x01026e60: 0x1026e60: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01026e54: 0x1026e54: jal   0x109b304 addiu a1, s0, -28728
+// 0x01026e64: 0x1026e64: jal   0x109b94c addiu a1, s0, -28728
 	ldloc 8
 	ldc.i4 -28728
 	add
@@ -2134,37 +2134,37 @@ L_1026e38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026e5c: 0x1026e5c: lui   a1, 0x10000
+// 0x01026e6c: 0x1026e6c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01026e60: 0x1026e60: addu  a0, v0, zero
+// 0x01026e70: 0x1026e70: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01026e64: 0x1026e64: addiu a1, a1, -28688
+// 0x01026e74: 0x1026e74: addiu a1, a1, -28688
 	ldloc.2
 	ldc.i4 -28688
 	add
 	stloc.2
-L_1026e68:
-// 0x01026e68: 0x1026e68: jal   0x109df10 sll   zero, zero, 0
+L_1026e78:
+// 0x01026e78: 0x1026e78: jal   0x109e558 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1026e70:
-// 0x01026e70: 0x1026e70: lw    ra, 28(sp)
-// 0x01026e74: 0x1026e74: lw    s2, 24(sp)
+L_1026e80:
+// 0x01026e80: 0x1026e80: lw    ra, 28(sp)
+// 0x01026e84: 0x1026e84: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2173,7 +2173,7 @@ L_1026e70:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01026e78: 0x1026e78: lw    s1, 20(sp)
+// 0x01026e88: 0x1026e88: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2182,7 +2182,7 @@ L_1026e70:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01026e7c: 0x1026e7c: lw    s0, 16(sp)
+// 0x01026e8c: 0x1026e8c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2191,7 +2191,7 @@ L_1026e70:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01026e80: 0x1026e80: jr    ra addiu sp, sp, 32
+// 0x01026e90: 0x1026e90: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2203,7 +2203,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_check_login_completed_1026e88(int32,int32,int32,int32,int32)
+.method public static int32 on_check_login_completed_1026e98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2238,60 +2238,60 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026e88: 0x1026e88: addiu sp, sp, -24
+// 0x01026e98: 0x1026e98: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026e8c: 0x1026e8c: sw    ra, 20(sp)
-// 0x01026e90: 0x1026e90: bne   a1, zero, 0x1026ea8 lui   a0, 0x0
+// 0x01026e9c: 0x1026e9c: sw    ra, 20(sp)
+// 0x01026ea0: 0x1026ea0: bne   a1, zero, 0x1026eb8 lui   a0, 0x0
 	ldloc.2
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1026ea8
+	brtrue L_1026eb8
 // --- basic block ---
-// 0x01026e98: 0x1026e98: lui   a1, 0x0
+// 0x01026ea8: 0x1026ea8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01026e9c: 0x1026e9c: addiu a0, a0, 6472
+// 0x01026eac: 0x1026eac: addiu a0, a0, 6472
 	ldloc.1
 	ldc.i4 6472
 	add
 	stloc.1
-// 0x01026ea0: 0x1026ea0: j	 0x1026eb4 addiu a1, a1, 20820
+// 0x01026eb0: 0x1026eb0: j	 0x1026ec4 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-	br L_1026eb4
+	br L_1026ec4
 // --- basic block ---
-L_1026ea8:
-// 0x01026ea8: 0x1026ea8: lui   a1, 0x20000
+L_1026eb8:
+// 0x01026eb8: 0x1026eb8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01026eac: 0x1026eac: addiu a0, a0, 6472
+// 0x01026ebc: 0x1026ebc: addiu a0, a0, 6472
 	ldloc.1
 	ldc.i4 6472
 	add
 	stloc.1
-// 0x01026eb0: 0x1026eb0: addiu a1, a1, 9464
+// 0x01026ec0: 0x1026ec0: addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-L_1026eb4:
-// 0x01026eb4: 0x1026eb4: jal   0x100e5c0 sll   zero, zero, 0
+L_1026ec4:
+// 0x01026ec4: 0x1026ec4: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026ebc: 0x1026ebc: jal   0x100ea50 addu  a0, zero, zero
+// 0x01026ecc: 0x1026ecc: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2299,25 +2299,25 @@ L_1026eb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026ec4: 0x1026ec4: jal   0x1026db8 sll   zero, zero, 0
+// 0x01026ed4: 0x1026ed4: jal   0x1026dc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_refresh_connection_1026db8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_refresh_connection_1026dc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026ecc: 0x1026ecc: lw    ra, 20(sp)
-// 0x01026ed0: 0x1026ed0: sll   zero, zero, 0
-// 0x01026ed4: 0x1026ed4: jr    ra addiu sp, sp, 24
+// 0x01026edc: 0x1026edc: lw    ra, 20(sp)
+// 0x01026ee0: 0x1026ee0: sll   zero, zero, 0
+// 0x01026ee4: 0x1026ee4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2329,7 +2329,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2364,16 +2364,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026edc: 0x1026edc: lui   a0, 0x0
+// 0x01026eec: 0x1026eec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01026ee0: 0x1026ee0: addiu sp, sp, -24
+// 0x01026ef0: 0x1026ef0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01026ee4: 0x1026ee4: sw    ra, 20(sp)
-// 0x01026ee8: 0x1026ee8: jal   0x1026d64 addiu a0, a0, 6344
+// 0x01026ef4: 0x1026ef4: sw    ra, 20(sp)
+// 0x01026ef8: 0x1026ef8: jal   0x1026d74 addiu a0, a0, 6344
 	ldloc.1
 	ldc.i4 6344
 	add
@@ -2383,14 +2383,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_logged_in_1026d64(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_logged_in_1026d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01026ef0: 0x1026ef0: lw    ra, 20(sp)
-// 0x01026ef4: 0x1026ef4: sll   zero, zero, 0
-// 0x01026ef8: 0x1026ef8: jr    ra addiu sp, sp, 24
+// 0x01026f00: 0x1026f00: lw    ra, 20(sp)
+// 0x01026f04: 0x1026f04: sll   zero, zero, 0
+// 0x01026f08: 0x1026f08: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2402,7 +2402,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_dlg_close_1026f00(int32,int32,int32,int32,int32)
+.method public static int32 on_dlg_close_1026f10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s3,int32 s8,int32 s4,int32 s2,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -2464,15 +2464,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01026f00: 0x1026f00: addiu sp, sp, -64
+// 0x01026f10: 0x1026f10: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01026f04: 0x1026f04: addiu v0, zero, 1
+// 0x01026f14: 0x1026f14: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01026f08: 0x1026f08: sw    s7, 52(sp)
+// 0x01026f18: 0x1026f18: sw    s7, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2481,8 +2481,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01026f0c: 0x1026f0c: sw    ra, 60(sp)
-// 0x01026f10: 0x1026f10: sw    s8, 56(sp)
+// 0x01026f1c: 0x1026f1c: sw    ra, 60(sp)
+// 0x01026f20: 0x1026f20: sw    s8, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2491,7 +2491,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01026f14: 0x1026f14: sw    s6, 48(sp)
+// 0x01026f24: 0x1026f24: sw    s6, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2500,7 +2500,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01026f18: 0x1026f18: sw    s5, 44(sp)
+// 0x01026f28: 0x1026f28: sw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2509,7 +2509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01026f1c: 0x1026f1c: sw    s4, 40(sp)
+// 0x01026f2c: 0x1026f2c: sw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2518,7 +2518,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01026f20: 0x1026f20: sw    s3, 36(sp)
+// 0x01026f30: 0x1026f30: sw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2527,7 +2527,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01026f24: 0x1026f24: sw    s2, 32(sp)
+// 0x01026f34: 0x1026f34: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2536,7 +2536,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01026f28: 0x1026f28: sw    s1, 28(sp)
+// 0x01026f38: 0x1026f38: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2545,7 +2545,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01026f2c: 0x1026f2c: sw    s0, 24(sp)
+// 0x01026f3c: 0x1026f3c: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2554,21 +2554,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01026f30: 0x1026f30: bne   a0, v0, 0x1027210 addu  s7, a1, zero
+// 0x01026f40: 0x1026f40: bne   a0, v0, 0x1027220 addu  s7, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 16
-	bne.un L_1027210
+	bne.un L_1027220
 // --- basic block ---
-// 0x01026f38: 0x1026f38: bne   a1, zero, 0x1026f74 sll   zero, zero, 0
+// 0x01026f48: 0x1026f48: bne   a1, zero, 0x1026f84 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1026f74
+	brtrue L_1026f84
 // --- basic block ---
-// 0x01026f40: 0x1026f40: lui   a0, 0x10000
+// 0x01026f50: 0x1026f50: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01026f44: 0x1026f44: jal   0x10947dc addiu a0, a0, -28668
+// 0x01026f54: 0x1026f54: jal   0x1094e00 addiu a0, a0, -28668
 	ldloc.1
 	ldc.i4 -28668
 	add
@@ -2578,20 +2578,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026f4c: 0x1026f4c: lui   a0, 0x10000
+// 0x01026f5c: 0x1026f5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01026f50: 0x1026f50: addiu a0, a0, -28652
+// 0x01026f60: 0x1026f60: addiu a0, a0, -28652
 	ldloc.1
 	ldc.i4 -28652
 	add
 	stloc.1
-// 0x01026f54: 0x1026f54: jal   0x10947dc addu  s4, v0, zero
+// 0x01026f64: 0x1026f64: jal   0x1094e00 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2599,12 +2599,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_value_10947dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_value_1094e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026f5c: 0x1026f5c: jal   0x1026edc addu  s3, v0, zero
+// 0x01026f6c: 0x1026f6c: jal   0x1026eec addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -2612,18 +2612,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026f64: 0x1026f64: addu  s5, zero, zero
+// 0x01026f74: 0x1026f74: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x01026f68: 0x1026f68: addu  s6, zero, zero
+// 0x01026f78: 0x1026f78: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01026f6c: 0x1026f6c: j	 0x1026fb4 sw    v0, 16(sp)
+// 0x01026f7c: 0x1026f7c: j	 0x1026fc4 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2632,10 +2632,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1026fb4
+	br L_1026fc4
 // --- basic block ---
-L_1026f74:
-// 0x01026f74: 0x1026f74: jal   0x1026d94 addu  s3, zero, zero
+L_1026f84:
+// 0x01026f84: 0x1026f84: jal   0x1026da4 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -2643,20 +2643,20 @@ L_1026f74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026f7c: 0x1026f7c: lui   a0, 0x10000
+// 0x01026f8c: 0x1026f8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01026f80: 0x1026f80: addiu a0, a0, -28636
+// 0x01026f90: 0x1026f90: addiu a0, a0, -28636
 	ldloc.1
 	ldc.i4 -28636
 	add
 	stloc.1
-// 0x01026f84: 0x1026f84: jal   0x10947ac sw    v0, 16(sp)
+// 0x01026f94: 0x1026f94: jal   0x1094dd0 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2670,12 +2670,12 @@ L_1026f74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026f8c: 0x1026f8c: jal   0x1000d8c addu  a0, v0, zero
+// 0x01026f9c: 0x1026f9c: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2688,15 +2688,15 @@ L_1026f74:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026f94: 0x1026f94: lui   a0, 0x10000
+// 0x01026fa4: 0x1026fa4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01026f98: 0x1026f98: addiu a0, a0, -28616
+// 0x01026fa8: 0x1026fa8: addiu a0, a0, -28616
 	ldloc.1
 	ldc.i4 -28616
 	add
 	stloc.1
-// 0x01026f9c: 0x1026f9c: jal   0x10947ac addu  s6, v0, zero
+// 0x01026fac: 0x1026fac: jal   0x1094dd0 addu  s6, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -2704,12 +2704,12 @@ L_1026f74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026fa4: 0x1026fa4: jal   0x1000d8c addu  a0, v0, zero
+// 0x01026fb4: 0x1026fb4: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2722,17 +2722,17 @@ L_1026f74:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026fac: 0x1026fac: addu  s5, v0, zero
+// 0x01026fbc: 0x1026fbc: addu  s5, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01026fb0: 0x1026fb0: addu  s4, zero, zero
+// 0x01026fc0: 0x1026fc0: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-L_1026fb4:
-// 0x01026fb4: 0x1026fb4: lui   a0, 0x10000
+L_1026fc4:
+// 0x01026fc4: 0x1026fc4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01026fb8: 0x1026fb8: jal   0x10947ac addiu a0, a0, -28600
+// 0x01026fc8: 0x1026fc8: jal   0x1094dd0 addiu a0, a0, -28600
 	ldloc.1
 	ldc.i4 -28600
 	add
@@ -2742,24 +2742,24 @@ L_1026fb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026fc0: 0x1026fc0: lui   v1, 0x60000
+// 0x01026fd0: 0x1026fd0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01026fc4: 0x1026fc4: lw    a1, -26516(v1)
+// 0x01026fd4: 0x1026fd4: lw    a1, -26052(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6629
+	ldc.i4 -6513
 	add
 	ldelem.i4
 	stloc.2
-// 0x01026fc8: 0x1026fc8: jal   0x1001c08 addu  a0, v0, zero
+// 0x01026fd8: 0x1026fd8: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2772,56 +2772,56 @@ L_1026fb4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01026fd0: 0x1026fd0: lui   s8, 0x60000
+// 0x01026fe0: 0x1026fe0: lui   s8, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01026fd4: 0x1026fd4: lui   s1, 0x60000
+// 0x01026fe4: 0x1026fe4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01026fd8: 0x1026fd8: sltiu s2, v0, 1
+// 0x01026fe8: 0x1026fe8: sltiu s2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 13
-// 0x01026fdc: 0x1026fdc: addiu s8, s8, -26508
+// 0x01026fec: 0x1026fec: addiu s8, s8, -26044
 	ldloc 11
-	ldc.i4 -26508
+	ldc.i4 -26044
 	add
 	stloc 11
-// 0x01026fe0: 0x1026fe0: addiu s1, s1, -26492
+// 0x01026ff0: 0x1026ff0: addiu s1, s1, -26028
 	ldloc 8
-	ldc.i4 -26492
+	ldc.i4 -26028
 	add
 	stloc 8
-// 0x01026fe4: 0x1026fe4: addu  s0, zero, zero
+// 0x01026ff4: 0x1026ff4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_1026fe8:
-// 0x01026fe8: 0x1026fe8: bne   s7, zero, 0x1026ffc sll   zero, zero, 0
+L_1026ff8:
+// 0x01026ff8: 0x1026ff8: bne   s7, zero, 0x102700c sll   zero, zero, 0
 	ldloc 16
-	brtrue L_1026ffc
+	brtrue L_102700c
 // --- basic block ---
-// 0x01026ff0: 0x1026ff0: lw    v0, 0(s8)
+// 0x01027000: 0x1027000: lw    v0, 0(s8)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01026ff4: 0x1026ff4: j	 0x1027004 sll   zero, zero, 0
-	br L_1027004
+// 0x01027004: 0x1027004: j	 0x1027014 sll   zero, zero, 0
+	br L_1027014
 // --- basic block ---
-L_1026ffc:
-// 0x01026ffc: 0x1026ffc: lw    v0, 0(s1)
+L_102700c:
+// 0x0102700c: 0x102700c: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01027000: 0x1027000: sll   zero, zero, 0
-L_1027004:
-// 0x01027004: 0x1027004: lw    a0, 16(v0)
+// 0x01027010: 0x1027010: sll   zero, zero, 0
+L_1027014:
+// 0x01027014: 0x1027014: lw    a0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2830,24 +2830,24 @@ L_1027004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01027008: 0x1027008: jal   0x10947ac sll   zero, zero, 0
+// 0x01027018: 0x1027018: jal   0x1094dd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027010: 0x1027010: lui   a1, 0x0
+// 0x01027020: 0x1027020: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027014: 0x1027014: addu  a0, v0, zero
+// 0x01027024: 0x1027024: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027018: 0x1027018: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01027028: 0x1027028: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2857,56 +2857,56 @@ L_1027004:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01027020: 0x1027020: beq   v0, zero, 0x102703c addiu v0, zero, 4
+// 0x01027030: 0x1027030: beq   v0, zero, 0x102704c addiu v0, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	brfalse L_102703c
+	brfalse L_102704c
 // --- basic block ---
-// 0x01027028: 0x1027028: addiu s0, s0, 1
+// 0x01027038: 0x1027038: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0102702c: 0x102702c: addiu s8, s8, 4
+// 0x0102703c: 0x102703c: addiu s8, s8, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-// 0x01027030: 0x1027030: bne   s0, v0, 0x1026fe8 addiu s1, s1, 4
+// 0x01027040: 0x1027040: bne   s0, v0, 0x1026ff8 addiu s1, s1, 4
 	ldloc 9
 	ldloc 5
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	bne.un L_1026fe8
+	bne.un L_1026ff8
 // --- basic block ---
-// 0x01027038: 0x1027038: addu  s0, zero, zero
+// 0x01027048: 0x1027048: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_102703c:
-// 0x0102703c: 0x102703c: jal   0x1026b54 sll   zero, zero, 0
+L_102704c:
+// 0x0102704c: 0x102704c: jal   0x1026b64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_show_munching_1026b54(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_is_show_munching_1026b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027044: 0x1027044: beq   v0, zero, 0x1027074 addu  s1, zero, zero
+// 0x01027054: 0x1027054: beq   v0, zero, 0x1027084 addu  s1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_1027074
+	brfalse L_1027084
 // --- basic block ---
-// 0x0102704c: 0x102704c: lui   a0, 0x10000
+// 0x0102705c: 0x102705c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027050: 0x1027050: jal   0x10947ac addiu a0, a0, -28580
+// 0x01027060: 0x1027060: jal   0x1094dd0 addiu a0, a0, -28580
 	ldloc.1
 	ldc.i4 -28580
 	add
@@ -2916,24 +2916,24 @@ L_102703c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027058: 0x1027058: lui   v1, 0x60000
+// 0x01027068: 0x1027068: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0102705c: 0x102705c: lw    a1, -26516(v1)
+// 0x0102706c: 0x102706c: lw    a1, -26052(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6629
+	ldc.i4 -6513
 	add
 	ldelem.i4
 	stloc.2
-// 0x01027060: 0x1027060: jal   0x1001c08 addu  a0, v0, zero
+// 0x01027070: 0x1027070: jal   0x1001c08 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2946,39 +2946,39 @@ L_102703c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027068: 0x1027068: beq   v0, zero, 0x1027074 addiu s1, zero, 1
+// 0x01027078: 0x1027078: beq   v0, zero, 0x1027084 addiu s1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 8
-	brfalse L_1027074
+	brfalse L_1027084
 // --- basic block ---
-// 0x01027070: 0x1027070: addu  s1, zero, zero
+// 0x01027080: 0x1027080: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_1027074:
-// 0x01027074: 0x1027074: bne   s7, zero, 0x1027190 sll   zero, zero, 0
+L_1027084:
+// 0x01027084: 0x1027084: bne   s7, zero, 0x10271a0 sll   zero, zero, 0
 	ldloc 16
-	brtrue L_1027190
+	brtrue L_10271a0
 // --- basic block ---
-// 0x0102707c: 0x102707c: lb    v0, 0(s4)
+// 0x0102708c: 0x102708c: lb    v0, 0(s4)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01027080: 0x1027080: sll   zero, zero, 0
-// 0x01027084: 0x1027084: beq   v0, zero, 0x10270e4 sll   zero, zero, 0
+// 0x01027090: 0x1027090: sll   zero, zero, 0
+// 0x01027094: 0x1027094: beq   v0, zero, 0x10270f4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10270e4
+	brfalse L_10270f4
 // --- basic block ---
-// 0x0102708c: 0x102708c: lb    v1, 0(s3)
+// 0x0102709c: 0x102709c: lb    v1, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01027090: 0x1027090: sll   zero, zero, 0
-// 0x01027094: 0x1027094: beq   v1, zero, 0x10270e4 sll   zero, zero, 0
+// 0x010270a0: 0x10270a0: sll   zero, zero, 0
+// 0x010270a4: 0x10270a4: beq   v1, zero, 0x10270f4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10270e4
+	brfalse L_10270f4
 // --- basic block ---
-// 0x0102709c: 0x102709c: jal   0x10268c0 addu  a0, s4, zero
+// 0x010270ac: 0x10270ac: jal   0x10268d0 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -2986,12 +2986,12 @@ L_1027074:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_username_10268c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_username_10268d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010270a4: 0x10270a4: jal   0x102688c addu  a0, s3, zero
+// 0x010270b4: 0x10270b4: jal   0x102689c addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2999,29 +2999,29 @@ L_1027074:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_password_102688c(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_password_102689c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010270ac: 0x10270ac: jal   0x1026b20 sll   zero, zero, 0
+// 0x010270bc: 0x10270bc: jal   0x1026b30 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_signup_enabled_1026b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_is_signup_enabled_1026b30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010270b4: 0x10270b4: addu  a2, v0, zero
+// 0x010270c4: 0x10270c4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010270b8: 0x10270b8: addu  a0, s4, zero
+// 0x010270c8: 0x10270c8: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010270bc: 0x10270bc: jal   0x106cd0c addu  a1, s3, zero
+// 0x010270cc: 0x10270cc: jal   0x106d330 addu  a1, s3, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3029,26 +3029,26 @@ L_1027074:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_TwitterConnect_106cd0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TwitterConnect_106d330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010270c4: 0x10270c4: bne   v0, zero, 0x10270d4 lui   a1, 0x1030000
+// 0x010270d4: 0x10270d4: bne   v0, zero, 0x10270e4 lui   a1, 0x1030000
 	ldloc 5
 	ldc.i4 16973824
 	stloc.2
-	brtrue L_10270d4
+	brtrue L_10270e4
 // --- basic block ---
-// 0x010270cc: 0x10270cc: j	 0x1027118 addiu a1, a1, -29524
+// 0x010270dc: 0x10270dc: j	 0x1027128 addiu a1, a1, -29508
 	ldloc.2
-	ldc.i4 -29524
+	ldc.i4 -29508
 	add
 	stloc.2
-	br L_1027118
+	br L_1027128
 // --- basic block ---
-L_10270d4:
-// 0x010270d4: 0x10270d4: jal   0x10268f0 addiu a0, zero, 1
+L_10270e4:
+// 0x010270e4: 0x10270e4: jal   0x1026900 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3056,16 +3056,16 @@ L_10270d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_logged_in_10268f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_logged_in_1026900(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010270dc: 0x10270dc: j	 0x1027140 sll   zero, zero, 0
-	br L_1027140
+// 0x010270ec: 0x10270ec: j	 0x1027150 sll   zero, zero, 0
+	br L_1027150
 // --- basic block ---
-L_10270e4:
-// 0x010270e4: 0x10270e4: lw    v1, 16(sp)
+L_10270f4:
+// 0x010270f4: 0x10270f4: lw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3074,37 +3074,37 @@ L_10270e4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010270e8: 0x10270e8: sll   zero, zero, 0
-// 0x010270ec: 0x10270ec: bne   v1, zero, 0x1027140 sll   zero, zero, 0
+// 0x010270f8: 0x10270f8: sll   zero, zero, 0
+// 0x010270fc: 0x10270fc: bne   v1, zero, 0x1027150 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1027140
+	brtrue L_1027150
 // --- basic block ---
-// 0x010270f4: 0x10270f4: bne   s2, zero, 0x102710c sll   zero, zero, 0
+// 0x01027104: 0x1027104: bne   s2, zero, 0x102711c sll   zero, zero, 0
 	ldloc 13
-	brtrue L_102710c
+	brtrue L_102711c
 // --- basic block ---
-// 0x010270fc: 0x10270fc: bne   s0, zero, 0x102710c sll   zero, zero, 0
+// 0x0102710c: 0x102710c: bne   s0, zero, 0x102711c sll   zero, zero, 0
 	ldloc 9
-	brtrue L_102710c
+	brtrue L_102711c
 // --- basic block ---
-// 0x01027104: 0x1027104: beq   s1, zero, 0x1027158 sll   zero, zero, 0
+// 0x01027114: 0x1027114: beq   s1, zero, 0x1027168 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1027158
+	brfalse L_1027168
 // --- basic block ---
-L_102710c:
-// 0x0102710c: 0x102710c: bne   v0, zero, 0x1027128 lui   a1, 0x1020000
+L_102711c:
+// 0x0102711c: 0x102711c: bne   v0, zero, 0x1027138 lui   a1, 0x1020000
 	ldloc 5
 	ldc.i4 16908288
 	stloc.2
-	brtrue L_1027128
+	brtrue L_1027138
 // --- basic block ---
-// 0x01027114: 0x1027114: addiu a1, a1, 25600
+// 0x01027124: 0x1027124: addiu a1, a1, 25616
 	ldloc.2
-	ldc.i4 25600
+	ldc.i4 25616
 	add
 	stloc.2
-L_1027118:
-// 0x01027118: 0x1027118: jal   0x104fe98 addiu a0, zero, 100
+L_1027128:
+// 0x01027128: 0x1027128: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -3112,66 +3112,66 @@ L_1027118:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027120: 0x1027120: j	 0x1027210 sll   zero, zero, 0
-	br L_1027210
+// 0x01027130: 0x1027130: j	 0x1027220 sll   zero, zero, 0
+	br L_1027220
 // --- basic block ---
-L_1027128:
-// 0x01027128: 0x1027128: lb    v0, 0(s3)
+L_1027138:
+// 0x01027138: 0x1027138: lb    v0, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0102712c: 0x102712c: sll   zero, zero, 0
-// 0x01027130: 0x1027130: bne   v0, zero, 0x1027140 lui   a1, 0x1020000
+// 0x0102713c: 0x102713c: sll   zero, zero, 0
+// 0x01027140: 0x1027140: bne   v0, zero, 0x1027150 lui   a1, 0x1020000
 	ldloc 5
 	ldc.i4 16908288
 	stloc.2
-	brtrue L_1027140
+	brtrue L_1027150
 // --- basic block ---
-// 0x01027138: 0x1027138: j	 0x1027118 addiu a1, a1, 25544
+// 0x01027148: 0x1027148: j	 0x1027128 addiu a1, a1, 25560
 	ldloc.2
-	ldc.i4 25544
+	ldc.i4 25560
 	add
 	stloc.2
-	br L_1027118
+	br L_1027128
 // --- basic block ---
-L_1027140:
-// 0x01027140: 0x1027140: beq   s2, zero, 0x1027158 sll   zero, zero, 0
+L_1027150:
+// 0x01027150: 0x1027150: beq   s2, zero, 0x1027168 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1027158
+	brfalse L_1027168
 // --- basic block ---
-// 0x01027148: 0x1027148: jal   0x1026864 sll   zero, zero, 0
+// 0x01027158: 0x1027158: jal   0x1026874 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_enable_sending_1026864(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_enable_sending_1026874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027150: 0x1027150: j	 0x1027160 sll   zero, zero, 0
-	br L_1027160
+// 0x01027160: 0x1027160: j	 0x1027170 sll   zero, zero, 0
+	br L_1027170
 // --- basic block ---
-L_1027158:
-// 0x01027158: 0x1027158: jal   0x1026814 sll   zero, zero, 0
+L_1027168:
+// 0x01027168: 0x1027168: jal   0x1026824 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_disable_sending_1026814(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_disable_sending_1026824(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1027160:
-// 0x01027160: 0x1027160: jal   0x1026784 addu  a0, s0, zero
+L_1027170:
+// 0x01027170: 0x1027170: jal   0x1026794 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3179,62 +3179,62 @@ L_1027160:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_destination_mode_1026784(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_destination_mode_1026794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027168: 0x1027168: beq   s1, zero, 0x1027180 sll   zero, zero, 0
+// 0x01027178: 0x1027178: beq   s1, zero, 0x1027190 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1027180
+	brfalse L_1027190
 // --- basic block ---
-// 0x01027170: 0x1027170: jal   0x10266dc sll   zero, zero, 0
+// 0x01027180: 0x1027180: jal   0x10266ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_enable_munching_10266dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_enable_munching_10266ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027178: 0x1027178: j	 0x1027210 sll   zero, zero, 0
-	br L_1027210
+// 0x01027188: 0x1027188: j	 0x1027220 sll   zero, zero, 0
+	br L_1027220
 // --- basic block ---
-L_1027180:
-// 0x01027180: 0x1027180: jal   0x102668c sll   zero, zero, 0
+L_1027190:
+// 0x01027190: 0x1027190: jal   0x102669c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_disable_munching_102668c(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_disable_munching_102669c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027188: 0x1027188: j	 0x1027210 sll   zero, zero, 0
-	br L_1027210
+// 0x01027198: 0x1027198: j	 0x1027220 sll   zero, zero, 0
+	br L_1027220
 // --- basic block ---
-L_1027190:
-// 0x01027190: 0x1027190: jal   0x1026a40 sll   zero, zero, 0
+L_10271a0:
+// 0x010271a0: 0x10271a0: jal   0x1026a50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027198: 0x1027198: beq   s6, v0, 0x10271a8 sll   zero, zero, 0
+// 0x010271a8: 0x10271a8: beq   s6, v0, 0x10271b8 sll   zero, zero, 0
 	ldloc 15
 	ldloc 5
-	beq  L_10271a8
+	beq  L_10271b8
 // --- basic block ---
-// 0x010271a0: 0x10271a0: jal   0x1026564 addu  a0, s6, zero
+// 0x010271b0: 0x10271b0: jal   0x1026574 addu  a0, s6, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -3242,29 +3242,29 @@ L_1027190:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_facebook_set_show_name_1026564(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_facebook_set_show_name_1026574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10271a8:
-// 0x010271a8: 0x10271a8: jal   0x10269e0 sll   zero, zero, 0
+L_10271b8:
+// 0x010271b8: 0x10271b8: jal   0x10269f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010271b0: 0x10271b0: beq   s5, v0, 0x10271c0 sll   zero, zero, 0
+// 0x010271c0: 0x10271c0: beq   s5, v0, 0x10271d0 sll   zero, zero, 0
 	ldloc 14
 	ldloc 5
-	beq  L_10271c0
+	beq  L_10271d0
 // --- basic block ---
-// 0x010271b8: 0x10271b8: jal   0x10264f0 addu  a0, s5, zero
+// 0x010271c8: 0x10271c8: jal   0x1026500 addu  a0, s5, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -3272,55 +3272,55 @@ L_10271a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_facebook_set_show_picture_10264f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_facebook_set_show_picture_1026500(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10271c0:
-// 0x010271c0: 0x10271c0: jal   0x1026aa0 sll   zero, zero, 0
+L_10271d0:
+// 0x010271d0: 0x10271d0: jal   0x1026ab0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_send_permissions_1026aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_send_permissions_1026ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010271c8: 0x10271c8: beq   s2, zero, 0x10271e0 sll   zero, zero, 0
+// 0x010271d8: 0x10271d8: beq   s2, zero, 0x10271f0 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_10271e0
+	brfalse L_10271f0
 // --- basic block ---
-// 0x010271d0: 0x10271d0: jal   0x102683c sll   zero, zero, 0
+// 0x010271e0: 0x10271e0: jal   0x102684c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_facebook_enable_sending_102683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_facebook_enable_sending_102684c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010271d8: 0x10271d8: j	 0x10271e8 sll   zero, zero, 0
-	br L_10271e8
+// 0x010271e8: 0x10271e8: j	 0x10271f8 sll   zero, zero, 0
+	br L_10271f8
 // --- basic block ---
-L_10271e0:
-// 0x010271e0: 0x10271e0: jal   0x10267ec sll   zero, zero, 0
+L_10271f0:
+// 0x010271f0: 0x10271f0: jal   0x10267fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_facebook_disable_sending_10267ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_facebook_disable_sending_10267fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10271e8:
-// 0x010271e8: 0x10271e8: jal   0x102675c addu  a0, s0, zero
+L_10271f8:
+// 0x010271f8: 0x10271f8: jal   0x102676c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3328,44 +3328,44 @@ L_10271e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_facebook_set_destination_mode_102675c(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_facebook_set_destination_mode_102676c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010271f0: 0x10271f0: beq   s1, zero, 0x1027208 sll   zero, zero, 0
+// 0x01027200: 0x1027200: beq   s1, zero, 0x1027218 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1027208
+	brfalse L_1027218
 // --- basic block ---
-// 0x010271f8: 0x10271f8: jal   0x10266b4 sll   zero, zero, 0
+// 0x01027208: 0x1027208: jal   0x10266c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_facebook_enable_munching_10266b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_facebook_enable_munching_10266c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027200: 0x1027200: j	 0x1027210 sll   zero, zero, 0
-	br L_1027210
+// 0x01027210: 0x1027210: j	 0x1027220 sll   zero, zero, 0
+	br L_1027220
 // --- basic block ---
-L_1027208:
-// 0x01027208: 0x1027208: jal   0x1026664 sll   zero, zero, 0
+L_1027218:
+// 0x01027218: 0x1027218: jal   0x1026674 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_facebook_disable_munching_1026664(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_facebook_disable_munching_1026674(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1027210:
-// 0x01027210: 0x1027210: lw    ra, 60(sp)
-// 0x01027214: 0x1027214: lw    s8, 56(sp)
+L_1027220:
+// 0x01027220: 0x1027220: lw    ra, 60(sp)
+// 0x01027224: 0x1027224: lw    s8, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3374,7 +3374,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01027218: 0x1027218: lw    s7, 52(sp)
+// 0x01027228: 0x1027228: lw    s7, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3383,7 +3383,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0102721c: 0x102721c: lw    s6, 48(sp)
+// 0x0102722c: 0x102722c: lw    s6, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3392,7 +3392,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01027220: 0x1027220: lw    s5, 44(sp)
+// 0x01027230: 0x1027230: lw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3401,7 +3401,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01027224: 0x1027224: lw    s4, 40(sp)
+// 0x01027234: 0x1027234: lw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3410,7 +3410,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01027228: 0x1027228: lw    s3, 36(sp)
+// 0x01027238: 0x1027238: lw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3419,7 +3419,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102722c: 0x102722c: lw    s2, 32(sp)
+// 0x0102723c: 0x102723c: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3428,7 +3428,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01027230: 0x1027230: lw    s1, 28(sp)
+// 0x01027240: 0x1027240: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3437,7 +3437,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01027234: 0x1027234: lw    s0, 24(sp)
+// 0x01027244: 0x1027244: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3446,7 +3446,7 @@ L_1027210:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01027238: 0x1027238: jr    ra addiu sp, sp, 64
+// 0x01027248: 0x1027248: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3458,7 +3458,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_twitter_login_failed_1027240(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_login_failed_1027250(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -3496,12 +3496,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027240: 0x1027240: addiu sp, sp, -32
+// 0x01027250: 0x1027250: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01027244: 0x1027244: sw    s0, 24(sp)
+// 0x01027254: 0x1027254: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3510,8 +3510,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027248: 0x1027248: sw    ra, 28(sp)
-// 0x0102724c: 0x102724c: jal   0x1026edc addu  s0, a0, zero
+// 0x01027258: 0x1027258: sw    ra, 28(sp)
+// 0x0102725c: 0x102725c: jal   0x1026eec addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.0
@@ -3519,66 +3519,66 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01027254: 0x1027254: beq   v0, zero, 0x1027290 addiu v0, zero, 701
+// 0x01027264: 0x1027264: beq   v0, zero, 0x10272a0 addiu v0, zero, 701
 	ldloc 5
 	ldc.i4 701
 	stloc 5
-	brfalse L_1027290
+	brfalse L_10272a0
 // --- basic block ---
-// 0x0102725c: 0x102725c: bne   s0, v0, 0x1027274 lui   a0, 0x0
+// 0x0102726c: 0x102726c: bne   s0, v0, 0x1027284 lui   a0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_1027274
+	bne.un L_1027284
 // --- basic block ---
-// 0x01027264: 0x1027264: lui   a1, 0x10000
+// 0x01027274: 0x1027274: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027268: 0x1027268: addiu a0, a0, 30092
+// 0x01027278: 0x1027278: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x0102726c: 0x102726c: j	 0x1027280 addiu a1, a1, -28560
+// 0x0102727c: 0x102727c: j	 0x1027290 addiu a1, a1, -28560
 	ldloc.2
 	ldc.i4 -28560
 	add
 	stloc.2
-	br L_1027280
+	br L_1027290
 // --- basic block ---
-L_1027274:
-// 0x01027274: 0x1027274: lui   a1, 0x10000
+L_1027284:
+// 0x01027284: 0x1027284: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027278: 0x1027278: addiu a0, a0, 30092
+// 0x01027288: 0x1027288: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x0102727c: 0x102727c: addiu a1, a1, -28452
+// 0x0102728c: 0x102728c: addiu a1, a1, -28452
 	ldloc.2
 	ldc.i4 -28452
 	add
 	stloc.2
-L_1027280:
-// 0x01027280: 0x1027280: jal   0x104c148 sll   zero, zero, 0
+L_1027290:
+// 0x01027290: 0x1027290: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01027288: 0x1027288: jal   0x10268f0 addu  a0, zero, zero
+// 0x01027298: 0x1027298: jal   0x1026900 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3586,35 +3586,35 @@ L_1027280:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_logged_in_10268f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_logged_in_1026900(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1027290:
-// 0x01027290: 0x1027290: lui   a1, 0x10000
+L_10272a0:
+// 0x010272a0: 0x10272a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027294: 0x1027294: lui   a3, 0x10000
+// 0x010272a4: 0x10272a4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01027298: 0x1027298: addiu a1, a1, -28436
+// 0x010272a8: 0x10272a8: addiu a1, a1, -28436
 	ldloc.2
 	ldc.i4 -28436
 	add
 	stloc.2
-// 0x0102729c: 0x102729c: addiu a3, a3, -28408
+// 0x010272ac: 0x10272ac: addiu a3, a3, -28408
 	ldloc 4
 	ldc.i4 -28408
 	add
 	stloc 4
-// 0x010272a0: 0x10272a0: addiu a0, zero, 1
+// 0x010272b0: 0x10272b0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010272a4: 0x10272a4: addiu a2, zero, 442
+// 0x010272b4: 0x10272b4: addiu a2, zero, 442
 	ldc.i4 442
 	stloc.3
-// 0x010272a8: 0x10272a8: jal   0x100449c sw    s0, 16(sp)
+// 0x010272b8: 0x10272b8: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3633,8 +3633,8 @@ L_1027290:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010272b0: 0x10272b0: lw    ra, 28(sp)
-// 0x010272b4: 0x10272b4: lw    s0, 24(sp)
+// 0x010272c0: 0x10272c0: lw    ra, 28(sp)
+// 0x010272c4: 0x10272c4: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3643,7 +3643,7 @@ L_1027290:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010272b8: 0x10272b8: jr    ra addiu sp, sp, 32
+// 0x010272c8: 0x10272c8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3655,7 +3655,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_disconnect_1027348(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_disconnect_1027358(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3690,40 +3690,40 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027348: 0x1027348: lui   a0, 0x10000
+// 0x01027358: 0x1027358: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102734c: 0x102734c: lui   a1, 0x10000
+// 0x0102735c: 0x102735c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027350: 0x1027350: lui   a3, 0x1020000
+// 0x01027360: 0x1027360: lui   a3, 0x1020000
 	ldc.i4 16908288
 	stloc 4
-// 0x01027354: 0x1027354: addiu sp, sp, -32
+// 0x01027364: 0x1027364: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01027358: 0x1027358: addiu a0, a0, 18500
+// 0x01027368: 0x1027368: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0102735c: 0x102735c: addiu a1, a1, -28320
+// 0x0102736c: 0x102736c: addiu a1, a1, -28320
 	ldloc.2
 	ldc.i4 -28320
 	add
 	stloc.2
-// 0x01027360: 0x1027360: addiu a3, a3, 29572
+// 0x01027370: 0x1027370: addiu a3, a3, 29588
 	ldloc 4
-	ldc.i4 29572
+	ldc.i4 29588
 	add
 	stloc 4
-// 0x01027364: 0x1027364: addiu a2, zero, 1
+// 0x01027374: 0x1027374: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01027368: 0x1027368: sw    ra, 28(sp)
-// 0x0102736c: 0x102736c: jal   0x104c320 sw    zero, 16(sp)
+// 0x01027378: 0x1027378: sw    ra, 28(sp)
+// 0x0102737c: 0x102737c: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3737,14 +3737,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01027374: 0x1027374: lw    ra, 28(sp)
-// 0x01027378: 0x1027378: sll   zero, zero, 0
-// 0x0102737c: 0x102737c: jr    ra addiu sp, sp, 32
+// 0x01027384: 0x1027384: lw    ra, 28(sp)
+// 0x01027388: 0x1027388: sll   zero, zero, 0
+// 0x0102738c: 0x102738c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3756,7 +3756,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 facebook_disconnect_confirmed_cb_1027384(int32,int32,int32,int32,int32)
+.method public static int32 facebook_disconnect_confirmed_cb_1027394(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3791,39 +3791,39 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027384: 0x1027384: addiu sp, sp, -560
+// 0x01027394: 0x1027394: addiu sp, sp, -560
 	ldloc.0
 	ldc.i4 -560
 	add
 	stloc.0
-// 0x01027388: 0x1027388: addiu v0, zero, 3
+// 0x01027398: 0x1027398: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0102738c: 0x102738c: bne   a0, v0, 0x1027488 sw    ra, 556(sp)
+// 0x0102739c: 0x102739c: bne   a0, v0, 0x1027498 sw    ra, 556(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1027488
+	bne.un L_1027498
 // --- basic block ---
-// 0x01027394: 0x1027394: lui   a1, 0x10000
+// 0x010273a4: 0x10273a4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027398: 0x1027398: lui   a3, 0x10000
+// 0x010273a8: 0x10273a8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102739c: 0x102739c: addiu a1, a1, -28436
+// 0x010273ac: 0x10273ac: addiu a1, a1, -28436
 	ldloc.2
 	ldc.i4 -28436
 	add
 	stloc.2
-// 0x010273a0: 0x10273a0: addiu a3, a3, -28292
+// 0x010273b0: 0x10273b0: addiu a3, a3, -28292
 	ldloc 4
 	ldc.i4 -28292
 	add
 	stloc 4
-// 0x010273a4: 0x10273a4: addiu a2, zero, 395
+// 0x010273b4: 0x10273b4: addiu a2, zero, 395
 	ldc.i4 395
 	stloc.3
-// 0x010273a8: 0x10273a8: jal   0x100449c addiu a0, zero, 1
+// 0x010273b8: 0x10273b8: jal   0x100449c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3836,22 +3836,22 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010273b0: 0x10273b0: lui   a0, 0x10000
+// 0x010273c0: 0x10273c0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010273b4: 0x10273b4: jal   0x104c3d0 addiu a0, a0, -28276
+// 0x010273c4: 0x10273c4: jal   0x104c3e0 addiu a0, a0, -28276
 	ldloc.1
 	ldc.i4 -28276
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010273bc: 0x10273bc: lui   a0, 0x0
+// 0x010273cc: 0x10273cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010273c0: 0x10273c0: jal   0x100e348 addiu a0, a0, 6488
+// 0x010273d0: 0x10273d0: jal   0x100e358 addiu a0, a0, 6488
 	ldloc.1
 	ldc.i4 6488
 	add
@@ -3861,39 +3861,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010273c8: 0x10273c8: addu  a3, v0, zero
+// 0x010273d8: 0x10273d8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010273cc: 0x10273cc: lui   a2, 0x20000
+// 0x010273dc: 0x10273dc: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010273d0: 0x10273d0: lui   v0, 0x10000
+// 0x010273e0: 0x10273e0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010273d4: 0x10273d4: addiu a2, a2, 21592
+// 0x010273e4: 0x10273e4: addiu a2, a2, 22052
 	ldloc.3
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x010273d8: 0x10273d8: addiu a0, sp, 32
+// 0x010273e8: 0x10273e8: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x010273dc: 0x10273dc: addiu a1, zero, 256
+// 0x010273ec: 0x10273ec: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010273e0: 0x10273e0: addiu v0, v0, -28248
+// 0x010273f0: 0x10273f0: addiu v0, v0, -28248
 	ldloc 5
 	ldc.i4 -28248
 	add
 	stloc 5
-// 0x010273e4: 0x10273e4: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010273f4: 0x10273f4: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3912,11 +3912,11 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010273ec: 0x10273ec: jal   0x106ab1c sll   zero, zero, 0
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+// 0x010273fc: 0x10273fc: jal   0x106b140 sll   zero, zero, 0
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 5
 // --- basic block ---
-// 0x010273f4: 0x10273f4: jal   0x106ab10 sw    v0, 544(sp)
+// 0x01027404: 0x1027404: jal   0x106b134 sw    v0, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3925,13 +3925,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 5
 // --- basic block ---
-// 0x010273fc: 0x10273fc: lui   a2, 0x10000
+// 0x0102740c: 0x102740c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01027400: 0x1027400: lw    a3, 544(sp)
+// 0x01027410: 0x1027410: lw    a3, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3940,12 +3940,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01027404: 0x1027404: addiu a0, sp, 288
+// 0x01027414: 0x1027414: addiu a0, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc.1
-// 0x01027408: 0x1027408: sw    v0, 16(sp)
+// 0x01027418: 0x1027418: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3954,18 +3954,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102740c: 0x102740c: addiu a2, a2, -28220
+// 0x0102741c: 0x102741c: addiu a2, a2, -28220
 	ldloc.3
 	ldc.i4 -28220
 	add
 	stloc.3
-// 0x01027410: 0x1027410: addiu v0, zero, 70
+// 0x01027420: 0x1027420: addiu v0, zero, 70
 	ldc.i4.s 70
 	stloc 5
-// 0x01027414: 0x1027414: addiu a1, zero, 256
+// 0x01027424: 0x1027424: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x01027418: 0x1027418: jal   0x1000f9c sw    v0, 20(sp)
+// 0x01027428: 0x1027428: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3984,46 +3984,46 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027420: 0x1027420: lui   v0, 0x60000
+// 0x01027430: 0x1027430: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01027424: 0x1027424: lw    a0, -26524(v0)
+// 0x01027434: 0x1027434: lw    a0, -26060(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6631
+	ldc.i4 -6515
 	add
 	ldelem.i4
 	stloc.1
-// 0x01027428: 0x1027428: sll   zero, zero, 0
-// 0x0102742c: 0x102742c: beq   a0, zero, 0x1027440 lui   a1, 0x10000
+// 0x01027438: 0x1027438: sll   zero, zero, 0
+// 0x0102743c: 0x102743c: beq   a0, zero, 0x1027450 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1027440
+	brfalse L_1027450
 // --- basic block ---
-// 0x01027434: 0x1027434: jal   0x106a494 sll   zero, zero, 0
+// 0x01027444: 0x1027444: jal   0x106aa9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_term_106a494(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_term_106aa9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102743c: 0x102743c: lui   a1, 0x10000
+// 0x0102744c: 0x102744c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_1027440:
-// 0x01027440: 0x1027440: addiu a1, a1, -28184
+L_1027450:
+// 0x01027450: 0x1027450: addiu a1, a1, -28184
 	ldloc.2
 	ldc.i4 -28184
 	add
 	stloc.2
-// 0x01027444: 0x1027444: jal   0x106a1ac addiu a0, sp, 32
+// 0x01027454: 0x1027454: jal   0x106a798 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4033,38 +4033,38 @@ L_1027440:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_init_106a1ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_init_106a798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102744c: 0x102744c: lui   v1, 0x60000
+// 0x0102745c: 0x102745c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01027450: 0x1027450: sw    v0, -26524(v1)
+// 0x01027460: 0x1027460: sw    v0, -26060(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6631
+	ldc.i4 -6515
 	add
 	ldloc 5
 	stelem.i4
-// 0x01027454: 0x1027454: lui   v1, 0x1020000
+// 0x01027464: 0x1027464: lui   v1, 0x1020000
 	ldc.i4 16908288
 	stloc 6
-// 0x01027458: 0x1027458: addiu v1, v1, 30248
+// 0x01027468: 0x1027468: addiu v1, v1, 30264
 	ldloc 6
-	ldc.i4 30248
+	ldc.i4 30264
 	add
 	stloc 6
-// 0x0102745c: 0x102745c: lui   a1, 0x10000
+// 0x0102746c: 0x102746c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027460: 0x1027460: lui   a2, 0x0
+// 0x01027470: 0x1027470: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01027464: 0x1027464: sw    v1, 16(sp)
+// 0x01027474: 0x1027474: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4073,28 +4073,28 @@ L_1027440:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027468: 0x1027468: addu  a0, v0, zero
+// 0x01027478: 0x1027478: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102746c: 0x102746c: addiu v1, sp, 288
+// 0x0102747c: 0x102747c: addiu v1, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 6
-// 0x01027470: 0x1027470: addiu a1, a1, -28132
+// 0x01027480: 0x1027480: addiu a1, a1, -28132
 	ldloc.2
 	ldc.i4 -28132
 	add
 	stloc.2
-// 0x01027474: 0x1027474: addiu a2, a2, 6516
+// 0x01027484: 0x1027484: addiu a2, a2, 6516
 	ldloc.3
 	ldc.i4 6516
 	add
 	stloc.3
-// 0x01027478: 0x1027478: addiu a3, zero, 1
+// 0x01027488: 0x1027488: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0102747c: 0x102747c: sw    v1, 24(sp)
+// 0x0102748c: 0x102748c: sw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4103,7 +4103,7 @@ L_1027440:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027480: 0x1027480: jal   0x1069ec8 sw    v0, 20(sp)
+// 0x01027490: 0x1027490: jal   0x106a4b4 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4117,15 +4117,15 @@ L_1027440:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1027488:
-// 0x01027488: 0x1027488: lw    ra, 556(sp)
-// 0x0102748c: 0x102748c: sll   zero, zero, 0
-// 0x01027490: 0x1027490: jr    ra addiu sp, sp, 560
+L_1027498:
+// 0x01027498: 0x1027498: lw    ra, 556(sp)
+// 0x0102749c: 0x102749c: sll   zero, zero, 0
+// 0x010274a0: 0x10274a0: jr    ra addiu sp, sp, 560
 	ldloc.0
 	ldc.i4 560
 	add
@@ -4137,7 +4137,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_facebook_check_login_1027498(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_check_login_10274a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4172,32 +4172,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027498: 0x1027498: lui   a1, 0x10000
+// 0x010274a8: 0x10274a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102749c: 0x102749c: lui   a3, 0x10000
+// 0x010274ac: 0x10274ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010274a0: 0x10274a0: addiu sp, sp, -560
+// 0x010274b0: 0x10274b0: addiu sp, sp, -560
 	ldloc.0
 	ldc.i4 -560
 	add
 	stloc.0
-// 0x010274a4: 0x10274a4: addiu a1, a1, -28436
+// 0x010274b4: 0x10274b4: addiu a1, a1, -28436
 	ldloc.2
 	ldc.i4 -28436
 	add
 	stloc.2
-// 0x010274a8: 0x10274a8: addiu a3, a3, -28112
+// 0x010274b8: 0x10274b8: addiu a3, a3, -28112
 	ldloc 4
 	ldc.i4 -28112
 	add
 	stloc 4
-// 0x010274ac: 0x10274ac: addiu a2, zero, 326
+// 0x010274bc: 0x10274bc: addiu a2, zero, 326
 	ldc.i4 326
 	stloc.3
-// 0x010274b0: 0x10274b0: sw    ra, 556(sp)
-// 0x010274b4: 0x10274b4: jal   0x100449c addiu a0, zero, 1
+// 0x010274c0: 0x10274c0: sw    ra, 556(sp)
+// 0x010274c4: 0x10274c4: jal   0x100449c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -4210,10 +4210,10 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010274bc: 0x10274bc: lui   a0, 0x0
+// 0x010274cc: 0x10274cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010274c0: 0x10274c0: jal   0x100e348 addiu a0, a0, 6488
+// 0x010274d0: 0x10274d0: jal   0x100e358 addiu a0, a0, 6488
 	ldloc.1
 	ldc.i4 6488
 	add
@@ -4223,39 +4223,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010274c8: 0x10274c8: addu  a3, v0, zero
+// 0x010274d8: 0x10274d8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010274cc: 0x10274cc: lui   a2, 0x20000
+// 0x010274dc: 0x10274dc: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010274d0: 0x10274d0: lui   v0, 0x10000
+// 0x010274e0: 0x10274e0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010274d4: 0x10274d4: addiu a2, a2, 21592
+// 0x010274e4: 0x10274e4: addiu a2, a2, 22052
 	ldloc.3
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x010274d8: 0x10274d8: addiu a0, sp, 32
+// 0x010274e8: 0x10274e8: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x010274dc: 0x10274dc: addiu a1, zero, 256
+// 0x010274ec: 0x10274ec: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010274e0: 0x10274e0: addiu v0, v0, -28100
+// 0x010274f0: 0x10274f0: addiu v0, v0, -28100
 	ldloc 5
 	ldc.i4 -28100
 	add
 	stloc 5
-// 0x010274e4: 0x10274e4: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010274f4: 0x10274f4: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4274,11 +4274,11 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010274ec: 0x10274ec: jal   0x106ab1c sll   zero, zero, 0
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+// 0x010274fc: 0x10274fc: jal   0x106b140 sll   zero, zero, 0
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 5
 // --- basic block ---
-// 0x010274f4: 0x10274f4: jal   0x106ab10 sw    v0, 544(sp)
+// 0x01027504: 0x1027504: jal   0x106b134 sw    v0, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4287,13 +4287,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 5
 // --- basic block ---
-// 0x010274fc: 0x10274fc: lui   a2, 0x10000
+// 0x0102750c: 0x102750c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01027500: 0x1027500: lw    a3, 544(sp)
+// 0x01027510: 0x1027510: lw    a3, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4302,12 +4302,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01027504: 0x1027504: addiu a0, sp, 288
+// 0x01027514: 0x1027514: addiu a0, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc.1
-// 0x01027508: 0x1027508: sw    v0, 16(sp)
+// 0x01027518: 0x1027518: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4316,18 +4316,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102750c: 0x102750c: addiu a2, a2, -28220
+// 0x0102751c: 0x102751c: addiu a2, a2, -28220
 	ldloc.3
 	ldc.i4 -28220
 	add
 	stloc.3
-// 0x01027510: 0x1027510: addiu v0, zero, 70
+// 0x01027520: 0x1027520: addiu v0, zero, 70
 	ldc.i4.s 70
 	stloc 5
-// 0x01027514: 0x1027514: addiu a1, zero, 256
+// 0x01027524: 0x1027524: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x01027518: 0x1027518: jal   0x1000f9c sw    v0, 20(sp)
+// 0x01027528: 0x1027528: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4346,46 +4346,46 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027520: 0x1027520: lui   v0, 0x60000
+// 0x01027530: 0x1027530: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01027524: 0x1027524: lw    a0, -26524(v0)
+// 0x01027534: 0x1027534: lw    a0, -26060(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6631
+	ldc.i4 -6515
 	add
 	ldelem.i4
 	stloc.1
-// 0x01027528: 0x1027528: sll   zero, zero, 0
-// 0x0102752c: 0x102752c: beq   a0, zero, 0x1027540 lui   a1, 0x10000
+// 0x01027538: 0x1027538: sll   zero, zero, 0
+// 0x0102753c: 0x102753c: beq   a0, zero, 0x1027550 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1027540
+	brfalse L_1027550
 // --- basic block ---
-// 0x01027534: 0x1027534: jal   0x106a494 sll   zero, zero, 0
+// 0x01027544: 0x1027544: jal   0x106aa9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_term_106a494(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_term_106aa9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102753c: 0x102753c: lui   a1, 0x10000
+// 0x0102754c: 0x102754c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_1027540:
-// 0x01027540: 0x1027540: addiu a1, a1, -28184
+L_1027550:
+// 0x01027550: 0x1027550: addiu a1, a1, -28184
 	ldloc.2
 	ldc.i4 -28184
 	add
 	stloc.2
-// 0x01027544: 0x1027544: jal   0x106a1ac addiu a0, sp, 32
+// 0x01027554: 0x1027554: jal   0x106a798 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4395,46 +4395,46 @@ L_1027540:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_init_106a1ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_init_106a798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102754c: 0x102754c: lui   v1, 0x60000
+// 0x0102755c: 0x102755c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01027550: 0x1027550: bne   v0, zero, 0x102757c sw    v0, -26524(v1)
+// 0x01027560: 0x1027560: bne   v0, zero, 0x102758c sw    v0, -26060(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6631
+	ldc.i4 -6515
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_102757c
+	brtrue L_102758c
 // --- basic block ---
-// 0x01027558: 0x1027558: lui   a1, 0x10000
+// 0x01027568: 0x1027568: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102755c: 0x102755c: lui   a3, 0x10000
+// 0x0102756c: 0x102756c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01027560: 0x1027560: addiu a1, a1, -28436
+// 0x01027570: 0x1027570: addiu a1, a1, -28436
 	ldloc.2
 	ldc.i4 -28436
 	add
 	stloc.2
-// 0x01027564: 0x1027564: addiu a3, a3, -28072
+// 0x01027574: 0x1027574: addiu a3, a3, -28072
 	ldloc 4
 	ldc.i4 -28072
 	add
 	stloc 4
-// 0x01027568: 0x1027568: addiu a0, zero, 4
+// 0x01027578: 0x1027578: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102756c: 0x102756c: jal   0x100449c addiu a2, zero, 341
+// 0x0102757c: 0x102757c: jal   0x100449c addiu a2, zero, 341
 	ldc.i4 341
 	stloc.3
 	ldloc.0
@@ -4447,25 +4447,25 @@ L_1027540:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027574: 0x1027574: j	 0x10275b0 sll   zero, zero, 0
-	br L_10275b0
+// 0x01027584: 0x1027584: j	 0x10275c0 sll   zero, zero, 0
+	br L_10275c0
 // --- basic block ---
-L_102757c:
-// 0x0102757c: 0x102757c: lui   v1, 0x1020000
+L_102758c:
+// 0x0102758c: 0x102758c: lui   v1, 0x1020000
 	ldc.i4 16908288
 	stloc 6
-// 0x01027580: 0x1027580: addiu v1, v1, 28296
+// 0x01027590: 0x1027590: addiu v1, v1, 28312
 	ldloc 6
-	ldc.i4 28296
+	ldc.i4 28312
 	add
 	stloc 6
-// 0x01027584: 0x1027584: lui   a1, 0x10000
+// 0x01027594: 0x1027594: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027588: 0x1027588: lui   a2, 0x0
+// 0x01027598: 0x1027598: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0102758c: 0x102758c: sw    v1, 16(sp)
+// 0x0102759c: 0x102759c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4474,28 +4474,28 @@ L_102757c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027590: 0x1027590: addu  a0, v0, zero
+// 0x010275a0: 0x10275a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027594: 0x1027594: addiu v1, sp, 288
+// 0x010275a4: 0x10275a4: addiu v1, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
 	stloc 6
-// 0x01027598: 0x1027598: addiu a1, a1, -28132
+// 0x010275a8: 0x10275a8: addiu a1, a1, -28132
 	ldloc.2
 	ldc.i4 -28132
 	add
 	stloc.2
-// 0x0102759c: 0x102759c: addiu a2, a2, 6516
+// 0x010275ac: 0x10275ac: addiu a2, a2, 6516
 	ldloc.3
 	ldc.i4 6516
 	add
 	stloc.3
-// 0x010275a0: 0x10275a0: addiu a3, zero, 1
+// 0x010275b0: 0x10275b0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010275a4: 0x10275a4: sw    v1, 24(sp)
+// 0x010275b4: 0x10275b4: sw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4504,7 +4504,7 @@ L_102757c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010275a8: 0x10275a8: jal   0x1069ec8 sw    v0, 20(sp)
+// 0x010275b8: 0x10275b8: jal   0x106a4b4 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4518,15 +4518,15 @@ L_102757c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10275b0:
-// 0x010275b0: 0x10275b0: lw    ra, 556(sp)
-// 0x010275b4: 0x10275b4: sll   zero, zero, 0
-// 0x010275b8: 0x10275b8: jr    ra addiu sp, sp, 560
+L_10275c0:
+// 0x010275c0: 0x10275c0: lw    ra, 556(sp)
+// 0x010275c4: 0x10275c4: sll   zero, zero, 0
+// 0x010275c8: 0x10275c8: jr    ra addiu sp, sp, 560
 	ldloc.0
 	ldc.i4 560
 	add
@@ -4538,7 +4538,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 after_facebook_connect_10275c0(int32,int32,int32,int32,int32)
+.method public static int32 after_facebook_connect_10275d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4573,37 +4573,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010275c0: 0x10275c0: addiu sp, sp, -24
+// 0x010275d0: 0x10275d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010275c4: 0x10275c4: sw    ra, 20(sp)
-// 0x010275c8: 0x10275c8: jal   0x1027498 sll   zero, zero, 0
+// 0x010275d4: 0x10275d4: sw    ra, 20(sp)
+// 0x010275d8: 0x10275d8: jal   0x10274a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_check_login_1027498(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_check_login_10274a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010275d0: 0x10275d0: jal   0x1026aa0 sll   zero, zero, 0
+// 0x010275e0: 0x10275e0: jal   0x1026ab0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_send_permissions_1026aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_send_permissions_1026ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010275d8: 0x10275d8: lw    ra, 20(sp)
-// 0x010275dc: 0x10275dc: sll   zero, zero, 0
-// 0x010275e0: 0x10275e0: jr    ra addiu sp, sp, 24
+// 0x010275e8: 0x10275e8: lw    ra, 20(sp)
+// 0x010275ec: 0x10275ec: sll   zero, zero, 0
+// 0x010275f0: 0x10275f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4615,7 +4615,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_social_login_cb_10275e8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_login_cb_10275f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -4653,12 +4653,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010275e8: 0x10275e8: addiu sp, sp, -24
+// 0x010275f8: 0x10275f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010275ec: 0x10275ec: sw    s0, 16(sp)
+// 0x010275fc: 0x10275fc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4667,8 +4667,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010275f0: 0x10275f0: sw    ra, 20(sp)
-// 0x010275f4: 0x10275f4: jal   0x1027498 lui   s0, 0x60000
+// 0x01027600: 0x1027600: sw    ra, 20(sp)
+// 0x01027604: 0x1027604: jal   0x10274a8 lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
 	ldloc.0
@@ -4676,26 +4676,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_check_login_1027498(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_check_login_10274a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010275fc: 0x10275fc: lw    v0, -26520(s0)
+// 0x0102760c: 0x102760c: lw    v0, -26056(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6630
+	ldc.i4 -6514
 	add
 	ldelem.i4
 	stloc 6
-// 0x01027600: 0x1027600: sll   zero, zero, 0
-// 0x01027604: 0x1027604: beq   v0, zero, 0x1027618 sll   zero, zero, 0
+// 0x01027610: 0x1027610: sll   zero, zero, 0
+// 0x01027614: 0x1027614: beq   v0, zero, 0x1027628 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1027618
+	brfalse L_1027628
 // --- basic block ---
-// 0x0102760c: 0x102760c: jalr  v0 sll   zero, zero, 0
+// 0x0102761c: 0x102761c: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -4707,18 +4707,18 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01027614: 0x1027614: sw    zero, -26520(s0)
+// 0x01027624: 0x1027624: sw    zero, -26056(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6630
+	ldc.i4 -6514
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1027618:
-// 0x01027618: 0x1027618: lw    ra, 20(sp)
-// 0x0102761c: 0x102761c: lw    s0, 16(sp)
+L_1027628:
+// 0x01027628: 0x1027628: lw    ra, 20(sp)
+// 0x0102762c: 0x102762c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4727,7 +4727,7 @@ L_1027618:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01027620: 0x1027620: jr    ra addiu sp, sp, 24
+// 0x01027630: 0x1027630: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4739,7 +4739,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_disconnect_completed_1027628(int32,int32,int32,int32,int32)
+.method public static int32 on_disconnect_completed_1027638(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4774,32 +4774,32 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027628: 0x1027628: addiu sp, sp, -24
+// 0x01027638: 0x1027638: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102762c: 0x102762c: sw    ra, 20(sp)
-// 0x01027630: 0x1027630: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x0102763c: 0x102763c: sw    ra, 20(sp)
+// 0x01027640: 0x1027640: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01027638: 0x1027638: jal   0x1027498 sll   zero, zero, 0
+// 0x01027648: 0x1027648: jal   0x10274a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_check_login_1027498(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_check_login_10274a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01027640: 0x1027640: lw    ra, 20(sp)
-// 0x01027644: 0x1027644: sll   zero, zero, 0
-// 0x01027648: 0x1027648: jr    ra addiu sp, sp, 24
+// 0x01027650: 0x1027650: lw    ra, 20(sp)
+// 0x01027654: 0x1027654: sll   zero, zero, 0
+// 0x01027658: 0x1027658: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4811,7 +4811,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_facebook_connect_1027650(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_connect_1027660(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4861,12 +4861,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027650: 0x1027650: addiu sp, sp, -336
+// 0x01027660: 0x1027660: addiu sp, sp, -336
 	ldloc.0
 	ldc.i4 -336
 	add
 	stloc.0
-// 0x01027654: 0x1027654: sw    s1, 316(sp)
+// 0x01027664: 0x1027664: sw    s1, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4875,19 +4875,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01027658: 0x1027658: addu  s1, a0, zero
+// 0x01027668: 0x1027668: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0102765c: 0x102765c: lui   a0, 0x0
+// 0x0102766c: 0x102766c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01027660: 0x1027660: addiu a0, a0, 6488
+// 0x01027670: 0x1027670: addiu a0, a0, 6488
 	ldloc.1
 	ldc.i4 6488
 	add
 	stloc.1
-// 0x01027664: 0x1027664: sw    ra, 332(sp)
-// 0x01027668: 0x1027668: sw    s4, 328(sp)
+// 0x01027674: 0x1027674: sw    ra, 332(sp)
+// 0x01027678: 0x1027678: sw    s4, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4896,7 +4896,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102766c: 0x102766c: sw    s3, 324(sp)
+// 0x0102767c: 0x102767c: sw    s3, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4905,7 +4905,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01027670: 0x1027670: sw    s2, 320(sp)
+// 0x01027680: 0x1027680: sw    s2, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4914,7 +4914,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01027674: 0x1027674: jal   0x100e348 sw    s0, 312(sp)
+// 0x01027684: 0x1027684: jal   0x100e358 sw    s0, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4928,12 +4928,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102767c: 0x102767c: jal   0x106ab1c sw    v0, 304(sp)
+// 0x0102768c: 0x102768c: jal   0x106b140 sw    v0, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4942,16 +4942,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 7
 // --- basic block ---
-// 0x01027684: 0x1027684: jal   0x106ab10 addu  s4, v0, zero
+// 0x01027694: 0x1027694: jal   0x106b134 addu  s4, v0, zero
 	ldloc 7
 	stloc 12
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 7
 // --- basic block ---
-// 0x0102768c: 0x102768c: jal   0x102c3f0 addu  s3, v0, zero
+// 0x0102769c: 0x102769c: jal   0x102c400 addu  s3, v0, zero
 	ldloc 7
 	stloc 11
 	ldloc.0
@@ -4959,12 +4959,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027694: 0x1027694: jal   0x101d484 addu  s2, v0, zero
+// 0x010276a4: 0x10276a4: jal   0x101d494 addu  s2, v0, zero
 	ldloc 7
 	stloc 10
 	ldloc.0
@@ -4972,20 +4972,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102769c: 0x102769c: lui   v1, 0x10000
+// 0x010276ac: 0x10276ac: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010276a0: 0x10276a0: addiu v1, v1, -27904
+// 0x010276b0: 0x10276b0: addiu v1, v1, -27904
 	ldloc 6
 	ldc.i4 -27904
 	add
 	stloc 6
-// 0x010276a4: 0x10276a4: sw    v1, 16(sp)
+// 0x010276b4: 0x10276b4: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4994,18 +4994,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010276a8: 0x10276a8: addiu v1, zero, 70
+// 0x010276b8: 0x10276b8: addiu v1, zero, 70
 	ldc.i4.s 70
 	stloc 6
-// 0x010276ac: 0x10276ac: addiu s0, sp, 48
+// 0x010276bc: 0x10276bc: addiu s0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 8
-// 0x010276b0: 0x10276b0: lui   a2, 0x10000
+// 0x010276c0: 0x10276c0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010276b4: 0x10276b4: sw    v1, 28(sp)
+// 0x010276c4: 0x10276c4: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5014,7 +5014,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010276b8: 0x10276b8: lw    a3, 304(sp)
+// 0x010276c8: 0x10276c8: lw    a3, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5023,26 +5023,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010276bc: 0x10276bc: lui   v1, 0x10000
+// 0x010276cc: 0x10276cc: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010276c0: 0x10276c0: addiu v1, v1, -16892
+// 0x010276d0: 0x10276d0: addiu v1, v1, 19396
 	ldloc 6
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc 6
-// 0x010276c4: 0x10276c4: addiu a2, a2, -28016
+// 0x010276d4: 0x10276d4: addiu a2, a2, -28016
 	ldloc.3
 	ldc.i4 -28016
 	add
 	stloc.3
-// 0x010276c8: 0x10276c8: addu  a0, s0, zero
+// 0x010276d8: 0x10276d8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010276cc: 0x10276cc: addiu a1, zero, 256
+// 0x010276dc: 0x10276dc: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010276d0: 0x10276d0: sw    s4, 20(sp)
+// 0x010276e0: 0x10276e0: sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5051,7 +5051,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010276d4: 0x10276d4: sw    s3, 24(sp)
+// 0x010276e4: 0x10276e4: sw    s3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5060,7 +5060,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010276d8: 0x10276d8: sw    s2, 32(sp)
+// 0x010276e8: 0x10276e8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5069,7 +5069,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010276dc: 0x10276dc: sw    v1, 36(sp)
+// 0x010276ec: 0x10276ec: sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5078,7 +5078,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010276e0: 0x10276e0: jal   0x1000f9c sw    v0, 40(sp)
+// 0x010276f0: 0x10276f0: jal   0x1000f9c sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5097,29 +5097,29 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010276e8: 0x10276e8: bne   s1, zero, 0x1027708 lui   a0, 0x10000
+// 0x010276f8: 0x10276f8: bne   s1, zero, 0x1027718 lui   a0, 0x10000
 	ldloc 9
 	ldc.i4 65536
 	stloc.1
-	brtrue L_1027708
+	brtrue L_1027718
 // --- basic block ---
-// 0x010276f0: 0x10276f0: lui   a2, 0x1020000
+// 0x01027700: 0x1027700: lui   a2, 0x1020000
 	ldc.i4 16908288
 	stloc.3
-// 0x010276f4: 0x10276f4: addiu a0, a0, -27884
+// 0x01027704: 0x1027704: addiu a0, a0, -27884
 	ldloc.1
 	ldc.i4 -27884
 	add
 	stloc.1
-// 0x010276f8: 0x10276f8: addu  a1, s0, zero
+// 0x01027708: 0x1027708: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010276fc: 0x10276fc: addiu a2, a2, 30144
+// 0x0102770c: 0x102770c: addiu a2, a2, 30160
 	ldloc.3
-	ldc.i4 30144
+	ldc.i4 30160
 	add
 	stloc.3
-// 0x01027700: 0x1027700: jal   0x1055238 addu  a3, zero, zero
+// 0x01027710: 0x1027710: jal   0x1055248 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5127,14 +5127,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_show_1055238(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_show_1055248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_1027708:
-// 0x01027708: 0x1027708: lw    ra, 332(sp)
-// 0x0102770c: 0x102770c: lw    s4, 328(sp)
+L_1027718:
+// 0x01027718: 0x1027718: lw    ra, 332(sp)
+// 0x0102771c: 0x102771c: lw    s4, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5143,7 +5143,7 @@ L_1027708:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01027710: 0x1027710: lw    s3, 324(sp)
+// 0x01027720: 0x1027720: lw    s3, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5152,7 +5152,7 @@ L_1027708:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01027714: 0x1027714: lw    s2, 320(sp)
+// 0x01027724: 0x1027724: lw    s2, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5161,7 +5161,7 @@ L_1027708:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01027718: 0x1027718: lw    s1, 316(sp)
+// 0x01027728: 0x1027728: lw    s1, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5170,7 +5170,7 @@ L_1027708:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102771c: 0x102771c: lw    s0, 312(sp)
+// 0x0102772c: 0x102772c: lw    s0, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5179,7 +5179,7 @@ L_1027708:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01027720: 0x1027720: jr    ra addiu sp, sp, 336
+// 0x01027730: 0x1027730: jr    ra addiu sp, sp, 336
 	ldloc.0
 	ldc.i4 336
 	add
@@ -5191,7 +5191,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 login_button_callback_facebook_1027728(int32,int32,int32,int32,int32)
+.method public static int32 login_button_callback_facebook_1027738(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5226,43 +5226,43 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027728: 0x1027728: addiu sp, sp, -24
+// 0x01027738: 0x1027738: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102772c: 0x102772c: sw    ra, 20(sp)
-// 0x01027730: 0x1027730: jal   0x1026d94 sll   zero, zero, 0
+// 0x0102773c: 0x102773c: sw    ra, 20(sp)
+// 0x01027740: 0x1027740: jal   0x1026da4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027738: 0x1027738: beq   v0, zero, 0x1027750 sll   zero, zero, 0
+// 0x01027748: 0x1027748: beq   v0, zero, 0x1027760 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1027750
+	brfalse L_1027760
 // --- basic block ---
-// 0x01027740: 0x1027740: jal   0x1027348 sll   zero, zero, 0
+// 0x01027750: 0x1027750: jal   0x1027358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_disconnect_1027348(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_disconnect_1027358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027748: 0x1027748: j	 0x1027758 sll   zero, zero, 0
-	br L_1027758
+// 0x01027758: 0x1027758: j	 0x1027768 sll   zero, zero, 0
+	br L_1027768
 // --- basic block ---
-L_1027750:
-// 0x01027750: 0x1027750: jal   0x1027650 addu  a0, zero, zero
+L_1027760:
+// 0x01027760: 0x1027760: jal   0x1027660 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5270,17 +5270,17 @@ L_1027750:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_connect_1027650(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_connect_1027660(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1027758:
-// 0x01027758: 0x1027758: lw    ra, 20(sp)
-// 0x0102775c: 0x102775c: addu  v0, zero, zero
+L_1027768:
+// 0x01027768: 0x1027768: lw    ra, 20(sp)
+// 0x0102776c: 0x102776c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01027760: 0x1027760: jr    ra addiu sp, sp, 24
+// 0x01027770: 0x1027770: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5292,7 +5292,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_social_initialize_1027768(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_initialize_1027778(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s5,int32 t0,int32 s4,int32 s8,int32 s6,int32 s7,int32 ra)
@@ -5357,12 +5357,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027768: 0x1027768: addiu sp, sp, -80
+// 0x01027778: 0x1027778: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0102776c: 0x102776c: sw    s6, 64(sp)
+// 0x0102777c: 0x102777c: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5371,7 +5371,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01027770: 0x1027770: sw    s0, 40(sp)
+// 0x01027780: 0x1027780: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5380,35 +5380,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01027774: 0x1027774: lui   s6, 0x10000
+// 0x01027784: 0x1027784: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x01027778: 0x1027778: lui   s0, 0x20000
+// 0x01027788: 0x1027788: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0102777c: 0x102777c: lui   a1, 0x0
+// 0x0102778c: 0x102778c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027780: 0x1027780: addu  a3, zero, zero
+// 0x01027790: 0x1027790: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01027784: 0x1027784: addiu a0, s0, -26888
+// 0x01027794: 0x1027794: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027788: 0x1027788: addiu a2, s6, 18500
+// 0x01027798: 0x1027798: addiu a2, s6, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0102778c: 0x102778c: addiu a1, a1, 6216
+// 0x0102779c: 0x102779c: addiu a1, a1, 6216
 	ldloc.2
 	ldc.i4 6216
 	add
 	stloc.2
-// 0x01027790: 0x1027790: sw    ra, 76(sp)
-// 0x01027794: 0x1027794: sw    s8, 72(sp)
+// 0x010277a0: 0x10277a0: sw    ra, 76(sp)
+// 0x010277a4: 0x10277a4: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5417,7 +5417,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01027798: 0x1027798: sw    s7, 68(sp)
+// 0x010277a8: 0x10277a8: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5426,7 +5426,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0102779c: 0x102779c: sw    s5, 60(sp)
+// 0x010277ac: 0x10277ac: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5435,7 +5435,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010277a0: 0x10277a0: sw    s4, 56(sp)
+// 0x010277b0: 0x10277b0: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5444,7 +5444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010277a4: 0x10277a4: sw    s3, 52(sp)
+// 0x010277b4: 0x10277b4: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5453,7 +5453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010277a8: 0x10277a8: sw    s2, 48(sp)
+// 0x010277b8: 0x10277b8: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5462,7 +5462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010277ac: 0x10277ac: jal   0x100edb0 sw    s1, 44(sp)
+// 0x010277bc: 0x10277bc: jal   0x100edc0 sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5476,25 +5476,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010277b4: 0x10277b4: lui   a1, 0x0
+// 0x010277c4: 0x10277c4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010277b8: 0x10277b8: addiu a0, s0, -26888
+// 0x010277c8: 0x10277c8: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010277bc: 0x10277bc: addiu a2, s6, 18500
+// 0x010277cc: 0x10277cc: addiu a2, s6, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010277c0: 0x10277c0: jal   0x100ed70 addiu a1, a1, 6232
+// 0x010277d0: 0x10277d0: jal   0x100ed80 addiu a1, a1, 6232
 	ldloc.2
 	ldc.i4 6232
 	add
@@ -5504,44 +5504,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_password_100ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_password_100ed80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010277c8: 0x10277c8: lui   s2, 0x0
+// 0x010277d8: 0x10277d8: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010277cc: 0x10277cc: lui   s1, 0x0
+// 0x010277dc: 0x10277dc: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010277d0: 0x10277d0: lui   a1, 0x0
+// 0x010277e0: 0x10277e0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010277d4: 0x10277d4: addiu s1, s1, 31272
+// 0x010277e4: 0x10277e4: addiu s1, s1, 31272
 	ldloc 9
 	ldc.i4 31272
 	add
 	stloc 9
-// 0x010277d8: 0x10277d8: addiu a0, s0, -26888
+// 0x010277e8: 0x10277e8: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010277dc: 0x10277dc: addiu a3, s2, 21112
+// 0x010277ec: 0x10277ec: addiu a3, s2, 21112
 	ldloc 10
 	ldc.i4 21112
 	add
 	stloc 4
-// 0x010277e0: 0x10277e0: addiu a1, a1, 6248
+// 0x010277f0: 0x10277f0: addiu a1, a1, 6248
 	ldloc.2
 	ldc.i4 6248
 	add
 	stloc.2
-// 0x010277e4: 0x10277e4: addu  a2, zero, zero
+// 0x010277f4: 0x10277f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010277e8: 0x10277e8: sw    s1, 16(sp)
+// 0x010277f8: 0x10277f8: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5550,7 +5550,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010277ec: 0x10277ec: sw    zero, 20(sp)
+// 0x010277fc: 0x10277fc: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5559,7 +5559,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010277f0: 0x10277f0: jal   0x100edf8 lui   s8, 0x10000
+// 0x01027800: 0x1027800: jal   0x100ee08 lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 15
 	ldloc.0
@@ -5567,52 +5567,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010277f8: 0x10277f8: lui   t0, 0x10000
+// 0x01027808: 0x1027808: lui   t0, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x010277fc: 0x10277fc: lui   v1, 0x10000
+// 0x0102780c: 0x102780c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01027800: 0x1027800: lui   a1, 0x0
+// 0x01027810: 0x1027810: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027804: 0x1027804: addiu t0, t0, -28756
+// 0x01027814: 0x1027814: addiu t0, t0, -28756
 	ldloc 13
 	ldc.i4 -28756
 	add
 	stloc 13
-// 0x01027808: 0x1027808: addiu v1, v1, -31172
+// 0x01027818: 0x1027818: addiu v1, v1, -31172
 	ldloc 6
 	ldc.i4 -31172
 	add
 	stloc 6
-// 0x0102780c: 0x102780c: addiu s8, s8, -28764
+// 0x0102781c: 0x102781c: addiu s8, s8, -28764
 	ldloc 15
 	ldc.i4 -28764
 	add
 	stloc 15
-// 0x01027810: 0x1027810: addiu a0, s0, -26888
+// 0x01027820: 0x1027820: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027814: 0x1027814: addu  a3, s1, zero
+// 0x01027824: 0x1027824: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x01027818: 0x1027818: addiu a1, a1, 6264
+// 0x01027828: 0x1027828: addiu a1, a1, 6264
 	ldloc.2
 	ldc.i4 6264
 	add
 	stloc.2
-// 0x0102781c: 0x102781c: addu  a2, zero, zero
+// 0x0102782c: 0x102782c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027820: 0x1027820: sw    t0, 16(sp)
+// 0x01027830: 0x1027830: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5621,7 +5621,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01027824: 0x1027824: sw    v1, 20(sp)
+// 0x01027834: 0x1027834: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5630,7 +5630,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027828: 0x1027828: sw    v1, 36(sp)
+// 0x01027838: 0x1027838: sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5639,7 +5639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102782c: 0x102782c: sw    t0, 32(sp)
+// 0x0102783c: 0x102783c: sw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5648,7 +5648,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01027830: 0x1027830: sw    s8, 24(sp)
+// 0x01027840: 0x1027840: sw    s8, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01027834: 0x1027834: jal   0x100edf8 sw    zero, 28(sp)
+// 0x01027844: 0x1027844: jal   0x100ee08 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5671,39 +5671,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102783c: 0x102783c: lui   a1, 0x0
+// 0x0102784c: 0x102784c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027840: 0x1027840: addiu a0, s0, -26888
+// 0x01027850: 0x1027850: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027844: 0x1027844: addiu a3, s2, 21112
+// 0x01027854: 0x1027854: addiu a3, s2, 21112
 	ldloc 10
 	ldc.i4 21112
 	add
 	stloc 4
-// 0x01027848: 0x1027848: addiu a1, a1, 6280
+// 0x01027858: 0x1027858: addiu a1, a1, 6280
 	ldloc.2
 	ldc.i4 6280
 	add
 	stloc.2
-// 0x0102784c: 0x102784c: addu  a2, zero, zero
+// 0x0102785c: 0x102785c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027850: 0x1027850: lui   s4, 0x20000
+// 0x01027860: 0x1027860: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x01027854: 0x1027854: lui   s7, 0x10000
+// 0x01027864: 0x1027864: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 17
-// 0x01027858: 0x1027858: sw    s1, 16(sp)
+// 0x01027868: 0x1027868: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5712,7 +5712,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102785c: 0x102785c: sw    zero, 20(sp)
+// 0x0102786c: 0x102786c: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5721,7 +5721,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01027860: 0x1027860: jal   0x100edf8 lui   s3, 0x0
+// 0x01027870: 0x1027870: jal   0x100ee08 lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
 	ldloc.0
@@ -5729,38 +5729,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027868: 0x1027868: lui   a1, 0x0
+// 0x01027878: 0x1027878: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102786c: 0x102786c: addiu s3, s3, 20820
+// 0x0102787c: 0x102787c: addiu s3, s3, 20820
 	ldloc 11
 	ldc.i4 20820
 	add
 	stloc 11
-// 0x01027870: 0x1027870: addiu a0, s7, 12560
+// 0x01027880: 0x1027880: addiu a0, s7, 12556
 	ldloc 17
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01027874: 0x1027874: addiu a3, s4, 9464
+// 0x01027884: 0x1027884: addiu a3, s4, 9928
 	ldloc 14
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01027878: 0x1027878: addiu a1, a1, 6296
+// 0x01027888: 0x1027888: addiu a1, a1, 6296
 	ldloc.2
 	ldc.i4 6296
 	add
 	stloc.2
-// 0x0102787c: 0x102787c: addu  a2, zero, zero
+// 0x0102788c: 0x102788c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027880: 0x1027880: sw    s3, 16(sp)
+// 0x01027890: 0x1027890: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5769,7 +5769,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01027884: 0x1027884: sw    zero, 20(sp)
+// 0x01027894: 0x1027894: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5778,7 +5778,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01027888: 0x1027888: jal   0x100edf8 lui   s5, 0x10000
+// 0x01027898: 0x1027898: jal   0x100ee08 lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 12
 	ldloc.0
@@ -5786,41 +5786,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027890: 0x1027890: lui   a1, 0x0
+// 0x010278a0: 0x10278a0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027894: 0x1027894: addiu s2, s2, 21112
+// 0x010278a4: 0x10278a4: addiu s2, s2, 21112
 	ldloc 10
 	ldc.i4 21112
 	add
 	stloc 10
-// 0x01027898: 0x1027898: addiu s5, s5, -28772
+// 0x010278a8: 0x10278a8: addiu s5, s5, -28772
 	ldloc 12
 	ldc.i4 -28772
 	add
 	stloc 12
-// 0x0102789c: 0x102789c: addiu a0, s0, -26888
+// 0x010278ac: 0x10278ac: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010278a0: 0x10278a0: addu  a3, s1, zero
+// 0x010278b0: 0x10278b0: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x010278a4: 0x10278a4: addiu a1, a1, 6328
+// 0x010278b4: 0x10278b4: addiu a1, a1, 6328
 	ldloc.2
 	ldc.i4 6328
 	add
 	stloc.2
-// 0x010278a8: 0x10278a8: addu  a2, zero, zero
+// 0x010278b8: 0x10278b8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010278ac: 0x10278ac: sw    s5, 16(sp)
+// 0x010278bc: 0x10278bc: sw    s5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5829,7 +5829,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010278b0: 0x10278b0: sw    s2, 20(sp)
+// 0x010278c0: 0x10278c0: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5838,7 +5838,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010278b4: 0x10278b4: jal   0x100edf8 sw    zero, 24(sp)
+// 0x010278c4: 0x10278c4: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5852,31 +5852,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010278bc: 0x10278bc: lui   a1, 0x0
+// 0x010278cc: 0x10278cc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010278c0: 0x10278c0: addiu a0, s0, -26888
+// 0x010278d0: 0x10278d0: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010278c4: 0x10278c4: addu  a3, s2, zero
+// 0x010278d4: 0x10278d4: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x010278c8: 0x10278c8: addiu a1, a1, 6312
+// 0x010278d8: 0x10278d8: addiu a1, a1, 6312
 	ldloc.2
 	ldc.i4 6312
 	add
 	stloc.2
-// 0x010278cc: 0x10278cc: addu  a2, zero, zero
+// 0x010278dc: 0x10278dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010278d0: 0x10278d0: sw    s1, 16(sp)
+// 0x010278e0: 0x10278e0: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5885,7 +5885,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010278d4: 0x10278d4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010278e4: 0x10278e4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5899,33 +5899,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010278dc: 0x10278dc: lui   a1, 0x0
+// 0x010278ec: 0x10278ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010278e0: 0x10278e0: addiu a0, s0, -26888
+// 0x010278f0: 0x10278f0: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010278e4: 0x10278e4: addiu a3, s4, 9464
+// 0x010278f4: 0x10278f4: addiu a3, s4, 9928
 	ldloc 14
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010278e8: 0x10278e8: addiu a1, a1, 6344
+// 0x010278f8: 0x10278f8: addiu a1, a1, 6344
 	ldloc.2
 	ldc.i4 6344
 	add
 	stloc.2
-// 0x010278ec: 0x10278ec: addu  a2, zero, zero
+// 0x010278fc: 0x10278fc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010278f0: 0x10278f0: sw    s3, 16(sp)
+// 0x01027900: 0x1027900: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5934,7 +5934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010278f4: 0x10278f4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01027904: 0x1027904: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5948,31 +5948,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010278fc: 0x10278fc: lui   a1, 0x0
+// 0x0102790c: 0x102790c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027900: 0x1027900: addiu a0, s0, -26888
+// 0x01027910: 0x1027910: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027904: 0x1027904: addu  a3, s1, zero
+// 0x01027914: 0x1027914: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x01027908: 0x1027908: addiu a1, a1, 6424
+// 0x01027918: 0x1027918: addiu a1, a1, 6424
 	ldloc.2
 	ldc.i4 6424
 	add
 	stloc.2
-// 0x0102790c: 0x102790c: addu  a2, zero, zero
+// 0x0102791c: 0x102791c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027910: 0x1027910: sw    s5, 16(sp)
+// 0x01027920: 0x1027920: sw    s5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5981,7 +5981,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01027914: 0x1027914: sw    s2, 20(sp)
+// 0x01027924: 0x1027924: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5990,7 +5990,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01027918: 0x1027918: jal   0x100edf8 sw    zero, 24(sp)
+// 0x01027928: 0x1027928: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6004,31 +6004,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027920: 0x1027920: lui   a1, 0x0
+// 0x01027930: 0x1027930: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027924: 0x1027924: addiu a0, s0, -26888
+// 0x01027934: 0x1027934: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027928: 0x1027928: addu  a3, s1, zero
+// 0x01027938: 0x1027938: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0102792c: 0x102792c: addiu a1, a1, 6440
+// 0x0102793c: 0x102793c: addiu a1, a1, 6440
 	ldloc.2
 	ldc.i4 6440
 	add
 	stloc.2
-// 0x01027930: 0x1027930: addu  a2, zero, zero
+// 0x01027940: 0x1027940: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027934: 0x1027934: sw    s5, 16(sp)
+// 0x01027944: 0x1027944: sw    s5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6037,7 +6037,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01027938: 0x1027938: sw    s2, 20(sp)
+// 0x01027948: 0x1027948: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6046,7 +6046,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102793c: 0x102793c: jal   0x100edf8 sw    zero, 24(sp)
+// 0x0102794c: 0x102794c: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6060,31 +6060,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027944: 0x1027944: lui   a1, 0x0
+// 0x01027954: 0x1027954: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027948: 0x1027948: addiu a0, s0, -26888
+// 0x01027958: 0x1027958: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0102794c: 0x102794c: addu  a3, s1, zero
+// 0x0102795c: 0x102795c: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x01027950: 0x1027950: addiu a1, a1, 6456
+// 0x01027960: 0x1027960: addiu a1, a1, 6456
 	ldloc.2
 	ldc.i4 6456
 	add
 	stloc.2
-// 0x01027954: 0x1027954: addu  a2, zero, zero
+// 0x01027964: 0x1027964: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027958: 0x1027958: sw    s5, 16(sp)
+// 0x01027968: 0x1027968: sw    s5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6093,7 +6093,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102795c: 0x102795c: sw    s2, 20(sp)
+// 0x0102796c: 0x102796c: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6102,7 +6102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01027960: 0x1027960: jal   0x100edf8 sw    zero, 24(sp)
+// 0x01027970: 0x1027970: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6116,31 +6116,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027968: 0x1027968: lui   a1, 0x0
+// 0x01027978: 0x1027978: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102796c: 0x102796c: addiu a0, s0, -26888
+// 0x0102797c: 0x102797c: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027970: 0x1027970: addu  a3, s2, zero
+// 0x01027980: 0x1027980: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x01027974: 0x1027974: addiu a1, a1, 6360
+// 0x01027984: 0x1027984: addiu a1, a1, 6360
 	ldloc.2
 	ldc.i4 6360
 	add
 	stloc.2
-// 0x01027978: 0x1027978: addu  a2, zero, zero
+// 0x01027988: 0x1027988: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102797c: 0x102797c: sw    s1, 16(sp)
+// 0x0102798c: 0x102798c: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6149,7 +6149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01027980: 0x1027980: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01027990: 0x1027990: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6163,12 +6163,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027988: 0x1027988: lw    t0, 32(sp)
+// 0x01027998: 0x1027998: lw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6177,7 +6177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102798c: 0x102798c: lw    v1, 36(sp)
+// 0x0102799c: 0x102799c: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6186,26 +6186,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01027990: 0x1027990: lui   a1, 0x0
+// 0x010279a0: 0x10279a0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027994: 0x1027994: addiu a0, s0, -26888
+// 0x010279a4: 0x10279a4: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027998: 0x1027998: addu  a3, s1, zero
+// 0x010279a8: 0x10279a8: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0102799c: 0x102799c: addiu a1, a1, 6376
+// 0x010279ac: 0x10279ac: addiu a1, a1, 6376
 	ldloc.2
 	ldc.i4 6376
 	add
 	stloc.2
-// 0x010279a0: 0x10279a0: addu  a2, zero, zero
+// 0x010279b0: 0x10279b0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010279a4: 0x10279a4: sw    t0, 16(sp)
+// 0x010279b4: 0x10279b4: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6214,7 +6214,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010279a8: 0x10279a8: sw    v1, 20(sp)
+// 0x010279b8: 0x10279b8: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6223,7 +6223,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010279ac: 0x10279ac: sw    s8, 24(sp)
+// 0x010279bc: 0x10279bc: sw    s8, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6232,7 +6232,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010279b0: 0x10279b0: jal   0x100edf8 sw    zero, 28(sp)
+// 0x010279c0: 0x10279c0: jal   0x100ee08 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6246,31 +6246,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010279b8: 0x10279b8: lui   a1, 0x0
+// 0x010279c8: 0x10279c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010279bc: 0x10279bc: addu  a3, s1, zero
+// 0x010279cc: 0x10279cc: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x010279c0: 0x10279c0: addiu a0, s0, -26888
+// 0x010279d0: 0x10279d0: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010279c4: 0x10279c4: addiu a1, a1, 6392
+// 0x010279d4: 0x10279d4: addiu a1, a1, 6392
 	ldloc.2
 	ldc.i4 6392
 	add
 	stloc.2
-// 0x010279c8: 0x10279c8: addu  a2, zero, zero
+// 0x010279d8: 0x10279d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010279cc: 0x10279cc: sw    s2, 16(sp)
+// 0x010279dc: 0x10279dc: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6279,7 +6279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010279d0: 0x10279d0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010279e0: 0x10279e0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6293,33 +6293,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010279d8: 0x10279d8: lui   a1, 0x0
+// 0x010279e8: 0x10279e8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010279dc: 0x10279dc: addiu a0, s7, 12560
+// 0x010279ec: 0x10279ec: addiu a0, s7, 12556
 	ldloc 17
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010279e0: 0x10279e0: addiu a3, s4, 9464
+// 0x010279f0: 0x10279f0: addiu a3, s4, 9928
 	ldloc 14
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010279e4: 0x10279e4: addiu a1, a1, 6408
+// 0x010279f4: 0x10279f4: addiu a1, a1, 6408
 	ldloc.2
 	ldc.i4 6408
 	add
 	stloc.2
-// 0x010279e8: 0x10279e8: addu  a2, zero, zero
+// 0x010279f8: 0x10279f8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010279ec: 0x10279ec: sw    s3, 16(sp)
+// 0x010279fc: 0x10279fc: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6328,7 +6328,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010279f0: 0x10279f0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01027a00: 0x1027a00: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6342,33 +6342,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010279f8: 0x10279f8: lui   a1, 0x0
+// 0x01027a08: 0x1027a08: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010279fc: 0x10279fc: addiu a0, s0, -26888
+// 0x01027a0c: 0x1027a0c: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01027a00: 0x1027a00: addiu a3, s4, 9464
+// 0x01027a10: 0x1027a10: addiu a3, s4, 9928
 	ldloc 14
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01027a04: 0x1027a04: addiu a1, a1, 6472
+// 0x01027a14: 0x1027a14: addiu a1, a1, 6472
 	ldloc.2
 	ldc.i4 6472
 	add
 	stloc.2
-// 0x01027a08: 0x1027a08: addu  a2, zero, zero
+// 0x01027a18: 0x1027a18: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027a0c: 0x1027a0c: sw    s3, 16(sp)
+// 0x01027a1c: 0x1027a1c: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6377,7 +6377,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01027a10: 0x1027a10: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01027a20: 0x1027a20: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6391,33 +6391,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027a18: 0x1027a18: lui   a1, 0x0
+// 0x01027a28: 0x1027a28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027a1c: 0x1027a1c: addiu a0, s7, 12560
+// 0x01027a2c: 0x1027a2c: addiu a0, s7, 12556
 	ldloc 17
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01027a20: 0x1027a20: addiu a3, s6, 18500
+// 0x01027a30: 0x1027a30: addiu a3, s6, 18768
 	ldloc 16
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01027a24: 0x1027a24: addiu a1, a1, 6488
+// 0x01027a34: 0x1027a34: addiu a1, a1, 6488
 	ldloc.2
 	ldc.i4 6488
 	add
 	stloc.2
-// 0x01027a28: 0x1027a28: addu  a2, zero, zero
+// 0x01027a38: 0x1027a38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027a2c: 0x1027a2c: jal   0x100edf8 sw    zero, 16(sp)
+// 0x01027a3c: 0x1027a3c: jal   0x100ee08 sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6431,28 +6431,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027a34: 0x1027a34: lui   v0, 0x60000
+// 0x01027a44: 0x1027a44: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01027a38: 0x1027a38: lui   a1, 0x0
+// 0x01027a48: 0x1027a48: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01027a3c: 0x1027a3c: addiu v1, v0, -26516
+// 0x01027a4c: 0x1027a4c: addiu v1, v0, -26052
 	ldloc 7
-	ldc.i4 -26516
+	ldc.i4 -26052
 	add
 	stloc 6
-// 0x01027a40: 0x1027a40: addiu a1, a1, 32120
+// 0x01027a50: 0x1027a50: addiu a1, a1, 32120
 	ldloc.2
 	ldc.i4 32120
 	add
 	stloc.2
-// 0x01027a44: 0x1027a44: sw    a1, 4(v1)
+// 0x01027a54: 0x1027a54: sw    a1, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6461,28 +6461,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01027a48: 0x1027a48: lui   a0, 0x1020000
+// 0x01027a58: 0x1027a58: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x01027a4c: 0x1027a4c: lui   v1, 0x0
+// 0x01027a5c: 0x1027a5c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01027a50: 0x1027a50: addiu v1, v1, 32116
+// 0x01027a60: 0x1027a60: addiu v1, v1, 32116
 	ldloc 6
 	ldc.i4 32116
 	add
 	stloc 6
-// 0x01027a54: 0x1027a54: addiu a0, a0, 30184
+// 0x01027a64: 0x1027a64: addiu a0, a0, 30200
 	ldloc.1
-	ldc.i4 30184
+	ldc.i4 30200
 	add
 	stloc.1
-// 0x01027a58: 0x1027a58: jal   0x106bcfc sw    v1, -26516(v0)
+// 0x01027a68: 0x1027a68: jal   0x106c320 sw    v1, -26052(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6629
+	ldc.i4 -6513
 	add
 	ldloc 6
 	stelem.i4
@@ -6491,25 +6491,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01027a60: 0x1027a60: lw    ra, 76(sp)
-// 0x01027a64: 0x1027a64: lui   v1, 0x60000
+// 0x01027a70: 0x1027a70: lw    ra, 76(sp)
+// 0x01027a74: 0x1027a74: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01027a68: 0x1027a68: sw    v0, -26520(v1)
+// 0x01027a78: 0x1027a78: sw    v0, -26056(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6630
+	ldc.i4 -6514
 	add
 	ldloc 7
 	stelem.i4
-// 0x01027a6c: 0x1027a6c: lw    s8, 72(sp)
+// 0x01027a7c: 0x1027a7c: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6518,10 +6518,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01027a70: 0x1027a70: addiu v0, zero, 1
+// 0x01027a80: 0x1027a80: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01027a74: 0x1027a74: lw    s7, 68(sp)
+// 0x01027a84: 0x1027a84: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6530,7 +6530,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01027a78: 0x1027a78: lw    s6, 64(sp)
+// 0x01027a88: 0x1027a88: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6539,7 +6539,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01027a7c: 0x1027a7c: lw    s5, 60(sp)
+// 0x01027a8c: 0x1027a8c: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6548,7 +6548,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01027a80: 0x1027a80: lw    s4, 56(sp)
+// 0x01027a90: 0x1027a90: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6557,7 +6557,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01027a84: 0x1027a84: lw    s3, 52(sp)
+// 0x01027a94: 0x1027a94: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6566,7 +6566,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01027a88: 0x1027a88: lw    s2, 48(sp)
+// 0x01027a98: 0x1027a98: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6575,7 +6575,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01027a8c: 0x1027a8c: lw    s1, 44(sp)
+// 0x01027a9c: 0x1027a9c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6584,7 +6584,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01027a90: 0x1027a90: lw    s0, 40(sp)
+// 0x01027aa0: 0x1027aa0: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6593,7 +6593,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01027a94: 0x1027a94: jr    ra addiu sp, sp, 80
+// 0x01027aa4: 0x1027aa4: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -6605,7 +6605,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 T_60_1027a9c(int32,int32,int32,int32,int32)
+.method public static int32 T_60_1027aac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6640,33 +6640,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027a9c: 0x1027a9c: lui   a0, 0x0
+// 0x01027aac: 0x1027aac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01027aa0: 0x1027aa0: addiu sp, sp, -40
+// 0x01027ab0: 0x1027ab0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01027aa4: 0x1027aa4: addiu a0, a0, 32124
+// 0x01027ab4: 0x1027ab4: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01027aa8: 0x1027aa8: addu  a1, zero, zero
+// 0x01027ab8: 0x1027ab8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027aac: 0x1027aac: addiu a2, zero, -2
+// 0x01027abc: 0x1027abc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027ab0: 0x1027ab0: addiu a3, zero, 5
+// 0x01027ac0: 0x1027ac0: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x01027ab4: 0x1027ab4: addiu v0, zero, 136
+// 0x01027ac4: 0x1027ac4: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x01027ab8: 0x1027ab8: sw    ra, 36(sp)
-// 0x01027abc: 0x1027abc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01027ac8: 0x1027ac8: sw    ra, 36(sp)
+// 0x01027acc: 0x1027acc: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6680,21 +6680,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01027ac4: 0x1027ac4: addu  a0, v0, zero
+// 0x01027ad4: 0x1027ad4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027ac8: 0x1027ac8: addu  a1, zero, zero
+// 0x01027ad8: 0x1027ad8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027acc: 0x1027acc: addu  a2, zero, zero
+// 0x01027adc: 0x1027adc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01027ad0: 0x1027ad0: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01027ae0: 0x1027ae0: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6706,10 +6706,10 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01027ad8: 0x1027ad8: lw    ra, 36(sp)
-// 0x01027adc: 0x1027adc: lw    v0, 24(sp)
+// 0x01027ae8: 0x1027ae8: lw    ra, 36(sp)
+// 0x01027aec: 0x1027aec: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6718,7 +6718,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01027ae0: 0x1027ae0: jr    ra addiu sp, sp, 40
+// 0x01027af0: 0x1027af0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6730,7 +6730,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_dialog_1027ae8(int32,int32,int32,int32,int32)
+.method public static int32 create_dialog_1027af8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s2,int32 s7,int32 s8,int32 s0,int32 t0,int32 s3,int32 t2,int32 s4,int32 s5,int32 s6,int32 t1,int32 lo,int32 t3,int32 t4,int32 t5,int32 ra)
@@ -6813,24 +6813,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01027ae8: 0x1027ae8: lui   v0, 0xf0000
+// 0x01027af8: 0x1027af8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01027aec: 0x1027aec: addiu sp, sp, -104
+// 0x01027afc: 0x1027afc: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x01027af0: 0x1027af0: lw    v0, -30068(v0)
+// 0x01027b00: 0x1027b00: lw    v0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x01027af4: 0x1027af4: sw    s6, 88(sp)
+// 0x01027b04: 0x1027b04: sw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6839,12 +6839,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01027af8: 0x1027af8: sltiu s6, a0, 1
+// 0x01027b08: 0x1027b08: sltiu s6, a0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
 	stloc 18
-// 0x01027afc: 0x1027afc: sw    s0, 64(sp)
+// 0x01027b0c: 0x1027b0c: sw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6853,8 +6853,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01027b00: 0x1027b00: sw    ra, 100(sp)
-// 0x01027b04: 0x1027b04: sw    s8, 96(sp)
+// 0x01027b10: 0x1027b10: sw    ra, 100(sp)
+// 0x01027b14: 0x1027b14: sw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6863,7 +6863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01027b08: 0x1027b08: sw    s7, 92(sp)
+// 0x01027b18: 0x1027b18: sw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6872,7 +6872,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01027b0c: 0x1027b0c: sw    s5, 84(sp)
+// 0x01027b1c: 0x1027b1c: sw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6881,7 +6881,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01027b10: 0x1027b10: sw    s4, 80(sp)
+// 0x01027b20: 0x1027b20: sw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6890,7 +6890,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01027b14: 0x1027b14: sw    s3, 76(sp)
+// 0x01027b24: 0x1027b24: sw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6899,7 +6899,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01027b18: 0x1027b18: sw    s2, 72(sp)
+// 0x01027b28: 0x1027b28: sw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6908,7 +6908,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01027b1c: 0x1027b1c: sw    s1, 68(sp)
+// 0x01027b2c: 0x1027b2c: sw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6917,7 +6917,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01027b20: 0x1027b20: sw    v0, 32(sp)
+// 0x01027b30: 0x1027b30: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6926,16 +6926,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01027b24: 0x1027b24: beq   s6, zero, 0x1027b68 lui   s0, 0x1020000
+// 0x01027b34: 0x1027b34: beq   s6, zero, 0x1027b78 lui   s0, 0x1020000
 	ldloc 18
 	ldc.i4 16908288
 	stloc 12
-	brfalse L_1027b68
+	brfalse L_1027b78
 // --- basic block ---
-// 0x01027b2c: 0x1027b2c: lui   a0, 0x10000
+// 0x01027b3c: 0x1027b3c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027b30: 0x1027b30: jal   0x101cd60 addiu a0, a0, -27864
+// 0x01027b40: 0x1027b40: jal   0x101cd70 addiu a0, a0, -27864
 	ldloc.1
 	ldc.i4 -27864
 	add
@@ -6945,28 +6945,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027b38: 0x1027b38: lui   a0, 0x10000
+// 0x01027b48: 0x1027b48: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027b3c: 0x1027b3c: addiu a2, s0, 28416
+// 0x01027b4c: 0x1027b4c: addiu a2, s0, 28432
 	ldloc 12
-	ldc.i4 28416
+	ldc.i4 28432
 	add
 	stloc.3
-// 0x01027b40: 0x1027b40: addiu a0, a0, -27856
+// 0x01027b50: 0x1027b50: addiu a0, a0, -27856
 	ldloc.1
 	ldc.i4 -27856
 	add
 	stloc.1
-// 0x01027b44: 0x1027b44: addu  a1, v0, zero
+// 0x01027b54: 0x1027b54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027b48: 0x1027b48: jal   0x1095a08 addiu a3, zero, 8192
+// 0x01027b58: 0x1027b58: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -6974,37 +6974,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027b50: 0x1027b50: lui   s5, 0x1020000
+// 0x01027b60: 0x1027b60: lui   s5, 0x1020000
 	ldc.i4 16908288
 	stloc 17
-// 0x01027b54: 0x1027b54: lui   s4, 0x60000
+// 0x01027b64: 0x1027b64: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 16
-// 0x01027b58: 0x1027b58: addu  s0, v0, zero
+// 0x01027b68: 0x1027b68: addu  s0, v0, zero
 	ldloc 5
 	stloc 12
-// 0x01027b5c: 0x1027b5c: addiu s5, s5, 25356
+// 0x01027b6c: 0x1027b6c: addiu s5, s5, 25372
 	ldloc 17
-	ldc.i4 25356
+	ldc.i4 25372
 	add
 	stloc 17
-// 0x01027b60: 0x1027b60: j	 0x1027ba0 addiu s4, s4, -26508
+// 0x01027b70: 0x1027b70: j	 0x1027bb0 addiu s4, s4, -26044
 	ldloc 16
-	ldc.i4 -26508
+	ldc.i4 -26044
 	add
 	stloc 16
-	br L_1027ba0
+	br L_1027bb0
 // --- basic block ---
-L_1027b68:
-// 0x01027b68: 0x1027b68: lui   a0, 0x10000
+L_1027b78:
+// 0x01027b78: 0x1027b78: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027b6c: 0x1027b6c: jal   0x101cd60 addiu a0, a0, -27836
+// 0x01027b7c: 0x1027b7c: jal   0x101cd70 addiu a0, a0, -27836
 	ldloc.1
 	ldc.i4 -27836
 	add
@@ -7014,28 +7014,28 @@ L_1027b68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027b74: 0x1027b74: lui   a0, 0x10000
+// 0x01027b84: 0x1027b84: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027b78: 0x1027b78: addiu a2, s0, 28416
+// 0x01027b88: 0x1027b88: addiu a2, s0, 28432
 	ldloc 12
-	ldc.i4 28416
+	ldc.i4 28432
 	add
 	stloc.3
-// 0x01027b7c: 0x1027b7c: addiu a0, a0, -28748
+// 0x01027b8c: 0x1027b8c: addiu a0, a0, -28748
 	ldloc.1
 	ldc.i4 -28748
 	add
 	stloc.1
-// 0x01027b80: 0x1027b80: addu  a1, v0, zero
+// 0x01027b90: 0x1027b90: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027b84: 0x1027b84: jal   0x1095a08 addiu a3, zero, 8192
+// 0x01027b94: 0x1027b94: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -7043,57 +7043,57 @@ L_1027b68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027b8c: 0x1027b8c: lui   s5, 0x1020000
+// 0x01027b9c: 0x1027b9c: lui   s5, 0x1020000
 	ldc.i4 16908288
 	stloc 17
-// 0x01027b90: 0x1027b90: lui   s4, 0x60000
+// 0x01027ba0: 0x1027ba0: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 16
-// 0x01027b94: 0x1027b94: addu  s0, v0, zero
+// 0x01027ba4: 0x1027ba4: addu  s0, v0, zero
 	ldloc 5
 	stloc 12
-// 0x01027b98: 0x1027b98: addiu s5, s5, 25168
+// 0x01027ba8: 0x1027ba8: addiu s5, s5, 25184
 	ldloc 17
-	ldc.i4 25168
+	ldc.i4 25184
 	add
 	stloc 17
-// 0x01027b9c: 0x1027b9c: addiu s4, s4, -26492
+// 0x01027bac: 0x1027bac: addiu s4, s4, -26028
 	ldloc 16
-	ldc.i4 -26492
+	ldc.i4 -26028
 	add
 	stloc 16
-L_1027ba0:
-// 0x01027ba0: 0x1027ba0: lui   a0, 0x0
+L_1027bb0:
+// 0x01027bb0: 0x1027bb0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01027ba4: 0x1027ba4: lui   v0, 0x41000000
+// 0x01027bb4: 0x1027bb4: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x01027ba8: 0x1027ba8: ori   v0, v0, 20616
+// 0x01027bb8: 0x1027bb8: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x01027bac: 0x1027bac: addiu a0, a0, 32556
+// 0x01027bbc: 0x1027bbc: addiu a0, a0, 32556
 	ldloc.1
 	ldc.i4 32556
 	add
 	stloc.1
-// 0x01027bb0: 0x1027bb0: addu  a1, zero, zero
+// 0x01027bc0: 0x1027bc0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027bb4: 0x1027bb4: addiu a2, zero, -2
+// 0x01027bc4: 0x1027bc4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027bb8: 0x1027bb8: addiu a3, zero, -1
+// 0x01027bc8: 0x1027bc8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01027bbc: 0x1027bbc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01027bcc: 0x1027bcc: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7107,47 +7107,47 @@ L_1027ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027bc4: 0x1027bc4: addu  s3, v0, zero
+// 0x01027bd4: 0x1027bd4: addu  s3, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01027bc8: 0x1027bc8: lui   s2, 0x0
+// 0x01027bd8: 0x1027bd8: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01027bcc: 0x1027bcc: lui   s1, 0x0
+// 0x01027bdc: 0x1027bdc: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01027bd0: 0x1027bd0: beq   s6, zero, 0x1027cc4 lui   s8, 0x10000
+// 0x01027be0: 0x1027be0: beq   s6, zero, 0x1027cd4 lui   s8, 0x10000
 	ldloc 18
 	ldc.i4 65536
 	stloc 11
-	brfalse L_1027cc4
+	brfalse L_1027cd4
 // --- basic block ---
-// 0x01027bd8: 0x1027bd8: lui   a0, 0x10000
+// 0x01027be8: 0x1027be8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027bdc: 0x1027bdc: addiu v1, zero, 136
+// 0x01027bec: 0x1027bec: addiu v1, zero, 136
 	ldc.i4 136
 	stloc 6
-// 0x01027be0: 0x1027be0: addiu a3, zero, -1
+// 0x01027bf0: 0x1027bf0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01027be4: 0x1027be4: addiu a0, a0, -27824
+// 0x01027bf4: 0x1027bf4: addiu a0, a0, -27824
 	ldloc.1
 	ldc.i4 -27824
 	add
 	stloc.1
-// 0x01027be8: 0x1027be8: addu  a1, zero, zero
+// 0x01027bf8: 0x1027bf8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027bec: 0x1027bec: addiu a2, zero, -2
+// 0x01027bfc: 0x1027bfc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027bf0: 0x1027bf0: sw    v1, 16(sp)
+// 0x01027c00: 0x1027c00: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7156,7 +7156,7 @@ L_1027ba0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027bf4: 0x1027bf4: jal   0x1093a24 sw    v1, 60(sp)
+// 0x01027c04: 0x1027c04: jal   0x1094048 sw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7170,36 +7170,36 @@ L_1027ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027bfc: 0x1027bfc: addu  a0, v0, zero
+// 0x01027c0c: 0x1027c0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027c00: 0x1027c00: addiu a1, s2, 31980
+// 0x01027c10: 0x1027c10: addiu a1, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01027c04: 0x1027c04: addiu a2, s1, 23008
+// 0x01027c14: 0x1027c14: addiu a2, s1, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01027c08: 0x1027c08: jal   0x1098fe0 addu  s7, v0, zero
+// 0x01027c18: 0x1027c18: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01027c10: 0x1027c10: lui   a0, 0x0
+// 0x01027c20: 0x1027c20: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01027c14: 0x1027c14: jal   0x101cd60 addiu a0, a0, 32600
+// 0x01027c24: 0x1027c24: jal   0x101cd70 addiu a0, a0, 32600
 	ldloc.1
 	ldc.i4 32600
 	add
@@ -7209,26 +7209,26 @@ L_1027ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c1c: 0x1027c1c: lui   a0, 0x20000
+// 0x01027c2c: 0x1027c2c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01027c20: 0x1027c20: addiu a3, zero, 4112
+// 0x01027c30: 0x1027c30: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x01027c24: 0x1027c24: addiu a2, zero, 16
+// 0x01027c34: 0x1027c34: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01027c28: 0x1027c28: addiu a0, a0, 9016
+// 0x01027c38: 0x1027c38: addiu a0, a0, 9480
 	ldloc.1
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x01027c2c: 0x1027c2c: jal   0x1098d10 addu  a1, v0, zero
+// 0x01027c3c: 0x1027c3c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7236,39 +7236,39 @@ L_1027ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c34: 0x1027c34: addu  a1, v0, zero
+// 0x01027c44: 0x1027c44: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027c38: 0x1027c38: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027c48: 0x1027c48: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c40: 0x1027c40: lui   a0, 0x10000
+// 0x01027c50: 0x1027c50: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027c44: 0x1027c44: lui   a1, 0x10000
+// 0x01027c54: 0x1027c54: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027c48: 0x1027c48: addiu a2, zero, 2
+// 0x01027c58: 0x1027c58: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01027c4c: 0x1027c4c: addiu a0, a0, -27792
+// 0x01027c5c: 0x1027c5c: addiu a0, a0, -27792
 	ldloc.1
 	ldc.i4 -27792
 	add
 	stloc.1
-// 0x01027c50: 0x1027c50: jal   0x109e13c addiu a1, a1, -27776
+// 0x01027c60: 0x1027c60: jal   0x109e784 addiu a1, a1, -27776
 	ldloc.2
 	ldc.i4 -27776
 	add
@@ -7278,33 +7278,33 @@ L_1027ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c58: 0x1027c58: addu  a1, v0, zero
+// 0x01027c68: 0x1027c68: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027c5c: 0x1027c5c: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027c6c: 0x1027c6c: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c64: 0x1027c64: lui   a0, 0x0
+// 0x01027c74: 0x1027c74: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01027c68: 0x1027c68: addiu a0, a0, 32244
+// 0x01027c78: 0x1027c78: addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01027c6c: 0x1027c6c: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01027c7c: 0x1027c7c: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -7312,38 +7312,38 @@ L_1027ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c74: 0x1027c74: addu  a1, v0, zero
+// 0x01027c84: 0x1027c84: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027c78: 0x1027c78: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027c88: 0x1027c88: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c80: 0x1027c80: addu  a0, s3, zero
+// 0x01027c90: 0x1027c90: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x01027c84: 0x1027c84: jal   0x1098ec4 addu  a1, s7, zero
+// 0x01027c94: 0x1027c94: jal   0x109950c addu  a1, s7, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027c8c: 0x1027c8c: lw    v1, 60(sp)
+// 0x01027c9c: 0x1027c9c: lw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7352,21 +7352,21 @@ L_1027ba0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01027c90: 0x1027c90: addiu a0, s8, -27760
+// 0x01027ca0: 0x1027ca0: addiu a0, s8, -27760
 	ldloc 11
 	ldc.i4 -27760
 	add
 	stloc.1
-// 0x01027c94: 0x1027c94: addu  a1, zero, zero
+// 0x01027ca4: 0x1027ca4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027c98: 0x1027c98: addiu a2, zero, -2
+// 0x01027ca8: 0x1027ca8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027c9c: 0x1027c9c: addiu a3, zero, -1
+// 0x01027cac: 0x1027cac: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01027ca0: 0x1027ca0: jal   0x1093a24 sw    v1, 16(sp)
+// 0x01027cb0: 0x1027cb0: jal   0x1094048 sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7380,61 +7380,61 @@ L_1027ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027ca8: 0x1027ca8: addu  a0, v0, zero
+// 0x01027cb8: 0x1027cb8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027cac: 0x1027cac: addiu a1, s2, 31980
+// 0x01027cbc: 0x1027cbc: addiu a1, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01027cb0: 0x1027cb0: addiu a2, s1, 23008
+// 0x01027cc0: 0x1027cc0: addiu a2, s1, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01027cb4: 0x1027cb4: jal   0x1098fe0 addu  s7, v0, zero
+// 0x01027cc4: 0x1027cc4: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01027cbc: 0x1027cbc: j	 0x1027d2c lui   s8, 0x10000
+// 0x01027ccc: 0x1027ccc: j	 0x1027d3c lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 11
-	br L_1027d2c
+	br L_1027d3c
 // --- basic block ---
-L_1027cc4:
-// 0x01027cc4: 0x1027cc4: lui   v0, 0x100000
+L_1027cd4:
+// 0x01027cd4: 0x1027cd4: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x01027cc8: 0x1027cc8: addiu a3, zero, -1
+// 0x01027cd8: 0x1027cd8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01027ccc: 0x1027ccc: addiu a0, s8, -27760
+// 0x01027cdc: 0x1027cdc: addiu a0, s8, -27760
 	ldloc 11
 	ldc.i4 -27760
 	add
 	stloc.1
-// 0x01027cd0: 0x1027cd0: addu  a1, zero, zero
+// 0x01027ce0: 0x1027ce0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027cd4: 0x1027cd4: addiu a2, zero, -2
+// 0x01027ce4: 0x1027ce4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027cd8: 0x1027cd8: ori   v0, v0, 136
+// 0x01027ce8: 0x1027ce8: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x01027cdc: 0x1027cdc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01027cec: 0x1027cec: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7448,23 +7448,23 @@ L_1027cc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027ce4: 0x1027ce4: addu  s7, v0, zero
+// 0x01027cf4: 0x1027cf4: addu  s7, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01027ce8: 0x1027ce8: lui   v0, 0x1020000
+// 0x01027cf8: 0x1027cf8: lui   v0, 0x1020000
 	ldc.i4 16908288
 	stloc 5
-// 0x01027cec: 0x1027cec: addiu v0, v0, 30504
+// 0x01027cfc: 0x1027cfc: addiu v0, v0, 30520
 	ldloc 5
-	ldc.i4 30504
+	ldc.i4 30520
 	add
 	stloc 5
-// 0x01027cf0: 0x1027cf0: sw    v0, 112(s7)
+// 0x01027d00: 0x1027d00: sw    v0, 112(s7)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7473,41 +7473,41 @@ L_1027cc4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01027cf4: 0x1027cf4: addiu a1, s2, 31980
+// 0x01027d04: 0x1027d04: addiu a1, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01027cf8: 0x1027cf8: addiu a2, s1, 23008
+// 0x01027d08: 0x1027d08: addiu a2, s1, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01027cfc: 0x1027cfc: jal   0x1098fe0 addu  a0, s7, zero
+// 0x01027d0c: 0x1027d0c: jal   0x1099628 addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01027d04: 0x1027d04: lui   a0, 0x10000
+// 0x01027d14: 0x1027d14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027d08: 0x1027d08: lui   a1, 0x10000
+// 0x01027d18: 0x1027d18: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01027d0c: 0x1027d0c: addiu a0, a0, -28728
+// 0x01027d1c: 0x1027d1c: addiu a0, a0, -28728
 	ldloc.1
 	ldc.i4 -28728
 	add
 	stloc.1
-// 0x01027d10: 0x1027d10: addiu a1, a1, -28688
+// 0x01027d20: 0x1027d20: addiu a1, a1, -28688
 	ldloc.2
 	ldc.i4 -28688
 	add
 	stloc.2
-// 0x01027d14: 0x1027d14: jal   0x109e13c addiu a2, zero, 2
+// 0x01027d24: 0x1027d24: jal   0x109e784 addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -7515,45 +7515,45 @@ L_1027cc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027d1c: 0x1027d1c: addu  a1, v0, zero
+// 0x01027d2c: 0x1027d2c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027d20: 0x1027d20: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027d30: 0x1027d30: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027d28: 0x1027d28: lui   s8, 0x10000
+// 0x01027d38: 0x1027d38: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 11
-L_1027d2c:
-// 0x01027d2c: 0x1027d2c: lui   a0, 0x0
+L_1027d3c:
+// 0x01027d3c: 0x1027d3c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01027d30: 0x1027d30: addiu a2, zero, 16
+// 0x01027d40: 0x1027d40: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01027d34: 0x1027d34: addiu a3, zero, 4112
+// 0x01027d44: 0x1027d44: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x01027d38: 0x1027d38: addiu a0, a0, 32648
+// 0x01027d48: 0x1027d48: addiu a0, a0, 32648
 	ldloc.1
 	ldc.i4 32648
 	add
 	stloc.1
-// 0x01027d3c: 0x1027d3c: jal   0x1098d10 addiu a1, s8, 18500
+// 0x01027d4c: 0x1027d4c: jal   0x1099358 addiu a1, s8, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -7561,50 +7561,50 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027d44: 0x1027d44: addu  a1, v0, zero
+// 0x01027d54: 0x1027d54: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027d48: 0x1027d48: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027d58: 0x1027d58: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027d50: 0x1027d50: addu  a0, s3, zero
+// 0x01027d60: 0x1027d60: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x01027d54: 0x1027d54: jal   0x1098ec4 addu  a1, s7, zero
+// 0x01027d64: 0x1027d64: jal   0x109950c addu  a1, s7, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027d5c: 0x1027d5c: lui   s2, 0x0
+// 0x01027d6c: 0x1027d6c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01027d60: 0x1027d60: lui   s1, 0x0
+// 0x01027d70: 0x1027d70: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01027d64: 0x1027d64: beq   s6, zero, 0x1027f04 lui   v1, 0x0
+// 0x01027d74: 0x1027d74: beq   s6, zero, 0x1027f14 lui   v1, 0x0
 	ldloc 18
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1027f04
+	brfalse L_1027f14
 // --- basic block ---
-// 0x01027d6c: 0x1027d6c: lw    a0, 32(sp)
+// 0x01027d7c: 0x1027d7c: lw    a0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7613,21 +7613,21 @@ L_1027d2c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01027d70: 0x1027d70: addiu v0, zero, 2
+// 0x01027d80: 0x1027d80: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01027d74: 0x1027d74: div   a0, v0
+// 0x01027d84: 0x1027d84: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 20
-// 0x01027d78: 0x1027d78: addiu a1, zero, 512
+// 0x01027d88: 0x1027d88: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x01027d7c: 0x1027d7c: mflo  lo
+// 0x01027d8c: 0x1027d8c: mflo  lo
 	ldloc 20
 	stloc.1
-// 0x01027d80: 0x1027d80: sw    a0, 32(sp)
+// 0x01027d90: 0x1027d90: sw    a0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7636,7 +7636,7 @@ L_1027d2c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01027d84: 0x1027d84: jal   0x109e6d0 addiu a0, v1, 32244
+// 0x01027d94: 0x1027d94: jal   0x109ed18 addiu a0, v1, 32244
 	ldloc 6
 	ldc.i4 32244
 	add
@@ -7646,45 +7646,45 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027d8c: 0x1027d8c: addu  a1, v0, zero
+// 0x01027d9c: 0x1027d9c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027d90: 0x1027d90: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027da0: 0x1027da0: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027d98: 0x1027d98: lui   a0, 0x10000
+// 0x01027da8: 0x1027da8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027d9c: 0x1027d9c: addiu t1, zero, 136
+// 0x01027dac: 0x1027dac: addiu t1, zero, 136
 	ldc.i4 136
 	stloc 19
-// 0x01027da0: 0x1027da0: addiu a3, zero, -1
+// 0x01027db0: 0x1027db0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01027da4: 0x1027da4: addiu a0, a0, -27732
+// 0x01027db4: 0x1027db4: addiu a0, a0, -27732
 	ldloc.1
 	ldc.i4 -27732
 	add
 	stloc.1
-// 0x01027da8: 0x1027da8: addu  a1, zero, zero
+// 0x01027db8: 0x1027db8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027dac: 0x1027dac: addiu a2, zero, -2
+// 0x01027dbc: 0x1027dbc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027db0: 0x1027db0: sw    t1, 16(sp)
+// 0x01027dc0: 0x1027dc0: sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7693,7 +7693,7 @@ L_1027d2c:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01027db4: 0x1027db4: jal   0x1093a24 sw    t1, 52(sp)
+// 0x01027dc4: 0x1027dc4: jal   0x1094048 sw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7707,36 +7707,36 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027dbc: 0x1027dbc: addu  a0, v0, zero
+// 0x01027dcc: 0x1027dcc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027dc0: 0x1027dc0: addiu a1, s2, 31980
+// 0x01027dd0: 0x1027dd0: addiu a1, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01027dc4: 0x1027dc4: addiu a2, s1, 23008
+// 0x01027dd4: 0x1027dd4: addiu a2, s1, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01027dc8: 0x1027dc8: jal   0x1098fe0 addu  s7, v0, zero
+// 0x01027dd8: 0x1027dd8: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01027dd0: 0x1027dd0: lui   v0, 0x0
+// 0x01027de0: 0x1027de0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01027dd4: 0x1027dd4: jal   0x101cd60 addiu a0, v0, 32704
+// 0x01027de4: 0x1027de4: jal   0x101cd70 addiu a0, v0, 32704
 	ldloc 5
 	ldc.i4 32704
 	add
@@ -7746,29 +7746,29 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027ddc: 0x1027ddc: lui   t0, 0x20000
+// 0x01027dec: 0x1027dec: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x01027de0: 0x1027de0: addiu a0, t0, 9016
+// 0x01027df0: 0x1027df0: addiu a0, t0, 9480
 	ldloc 13
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x01027de4: 0x1027de4: addiu a2, zero, -1
+// 0x01027df4: 0x1027df4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01027de8: 0x1027de8: addiu a3, zero, 4112
+// 0x01027df8: 0x1027df8: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x01027dec: 0x1027dec: addu  a1, v0, zero
+// 0x01027dfc: 0x1027dfc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027df0: 0x1027df0: jal   0x1098d10 sw    t0, 56(sp)
+// 0x01027e00: 0x1027e00: jal   0x1099358 sw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7782,28 +7782,28 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027df8: 0x1027df8: addu  a1, v0, zero
+// 0x01027e08: 0x1027e08: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027dfc: 0x1027dfc: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027e0c: 0x1027e0c: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027e04: 0x1027e04: lui   v1, 0x0
+// 0x01027e14: 0x1027e14: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01027e08: 0x1027e08: jal   0x101cd60 addiu a0, v1, 32704
+// 0x01027e18: 0x1027e18: jal   0x101cd70 addiu a0, v1, 32704
 	ldloc 6
 	ldc.i4 32704
 	add
@@ -7813,12 +7813,12 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027e10: 0x1027e10: sw    v0, 24(sp)
+// 0x01027e20: 0x1027e20: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7827,10 +7827,10 @@ L_1027d2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01027e14: 0x1027e14: lui   v1, 0x100000
+// 0x01027e24: 0x1027e24: lui   v1, 0x100000
 	ldc.i4 1048576
 	stloc 6
-// 0x01027e18: 0x1027e18: lw    v0, 32(sp)
+// 0x01027e28: 0x1027e28: lw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7839,31 +7839,31 @@ L_1027d2c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01027e1c: 0x1027e1c: lui   a0, 0x10000
+// 0x01027e2c: 0x1027e2c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027e20: 0x1027e20: addiu t2, zero, -1
+// 0x01027e30: 0x1027e30: addiu t2, zero, -1
 	ldc.i4.m1
 	stloc 15
-// 0x01027e24: 0x1027e24: ori   a2, v1, 18
+// 0x01027e34: 0x1027e34: ori   a2, v1, 18
 	ldloc 6
 	ldc.i4.s 18
 	or
 	stloc.3
-// 0x01027e28: 0x1027e28: addu  a3, zero, zero
+// 0x01027e38: 0x1027e38: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01027e2c: 0x1027e2c: addiu a1, s8, 18500
+// 0x01027e3c: 0x1027e3c: addiu a1, s8, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01027e30: 0x1027e30: addiu a0, a0, -28668
+// 0x01027e40: 0x1027e40: addiu a0, a0, -28668
 	ldloc.1
 	ldc.i4 -28668
 	add
 	stloc.1
-// 0x01027e34: 0x1027e34: sw    t2, 20(sp)
+// 0x01027e44: 0x1027e44: sw    t2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7872,7 +7872,7 @@ L_1027d2c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01027e38: 0x1027e38: sw    v1, 60(sp)
+// 0x01027e48: 0x1027e48: sw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7881,7 +7881,7 @@ L_1027d2c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027e3c: 0x1027e3c: sw    t2, 48(sp)
+// 0x01027e4c: 0x1027e4c: sw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7890,7 +7890,7 @@ L_1027d2c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01027e40: 0x1027e40: jal   0x109683c sw    v0, 16(sp)
+// 0x01027e50: 0x1027e50: jal   0x1096e84 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7904,38 +7904,38 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027e48: 0x1027e48: addu  a1, v0, zero
+// 0x01027e58: 0x1027e58: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027e4c: 0x1027e4c: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027e5c: 0x1027e5c: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027e54: 0x1027e54: addu  a0, s3, zero
+// 0x01027e64: 0x1027e64: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x01027e58: 0x1027e58: jal   0x1098ec4 addu  a1, s7, zero
+// 0x01027e68: 0x1027e68: jal   0x109950c addu  a1, s7, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027e60: 0x1027e60: lw    t1, 52(sp)
+// 0x01027e70: 0x1027e70: lw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7944,24 +7944,24 @@ L_1027d2c:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01027e64: 0x1027e64: lui   a0, 0x10000
+// 0x01027e74: 0x1027e74: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027e68: 0x1027e68: addiu a3, zero, 40
+// 0x01027e78: 0x1027e78: addiu a3, zero, 40
 	ldc.i4.s 40
 	stloc 4
-// 0x01027e6c: 0x1027e6c: addiu a0, a0, -27712
+// 0x01027e7c: 0x1027e7c: addiu a0, a0, -27712
 	ldloc.1
 	ldc.i4 -27712
 	add
 	stloc.1
-// 0x01027e70: 0x1027e70: addu  a1, zero, zero
+// 0x01027e80: 0x1027e80: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027e74: 0x1027e74: addiu a2, zero, -2
+// 0x01027e84: 0x1027e84: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027e78: 0x1027e78: jal   0x1093a24 sw    t1, 16(sp)
+// 0x01027e88: 0x1027e88: jal   0x1094048 sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7975,36 +7975,36 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027e80: 0x1027e80: addu  a0, v0, zero
+// 0x01027e90: 0x1027e90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027e84: 0x1027e84: addiu a1, s2, 31980
+// 0x01027e94: 0x1027e94: addiu a1, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01027e88: 0x1027e88: addiu a2, s1, 23008
+// 0x01027e98: 0x1027e98: addiu a2, s1, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01027e8c: 0x1027e8c: lui   s1, 0x0
+// 0x01027e9c: 0x1027e9c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01027e90: 0x1027e90: jal   0x1098fe0 addu  s7, v0, zero
+// 0x01027ea0: 0x1027ea0: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01027e98: 0x1027e98: jal   0x101cd60 addiu a0, s1, 32736
+// 0x01027ea8: 0x1027ea8: jal   0x101cd70 addiu a0, s1, 32736
 	ldloc 8
 	ldc.i4 32736
 	add
@@ -8014,12 +8014,12 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027ea0: 0x1027ea0: lw    t0, 56(sp)
+// 0x01027eb0: 0x1027eb0: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8028,18 +8028,18 @@ L_1027d2c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01027ea4: 0x1027ea4: addiu a2, zero, -1
+// 0x01027eb4: 0x1027eb4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01027ea8: 0x1027ea8: addiu a0, t0, 9016
+// 0x01027eb8: 0x1027eb8: addiu a0, t0, 9480
 	ldloc 13
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x01027eac: 0x1027eac: addiu a3, zero, 4112
+// 0x01027ebc: 0x1027ebc: addiu a3, zero, 4112
 	ldc.i4 4112
 	stloc 4
-// 0x01027eb0: 0x1027eb0: jal   0x1098d10 addu  a1, v0, zero
+// 0x01027ec0: 0x1027ec0: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -8047,25 +8047,25 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027eb8: 0x1027eb8: addu  a1, v0, zero
+// 0x01027ec8: 0x1027ec8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027ebc: 0x1027ebc: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027ecc: 0x1027ecc: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027ec4: 0x1027ec4: jal   0x101cd60 addiu a0, s1, 32736
+// 0x01027ed4: 0x1027ed4: jal   0x101cd70 addiu a0, s1, 32736
 	ldloc 8
 	ldc.i4 32736
 	add
@@ -8075,12 +8075,12 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027ecc: 0x1027ecc: lw    v1, 60(sp)
+// 0x01027edc: 0x1027edc: lw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8089,7 +8089,7 @@ L_1027d2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01027ed0: 0x1027ed0: lw    t2, 48(sp)
+// 0x01027ee0: 0x1027ee0: lw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8098,15 +8098,15 @@ L_1027d2c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01027ed4: 0x1027ed4: ori   a2, v1, 18
+// 0x01027ee4: 0x1027ee4: ori   a2, v1, 18
 	ldloc 6
 	ldc.i4.s 18
 	or
 	stloc.3
-// 0x01027ed8: 0x1027ed8: lui   a0, 0x10000
+// 0x01027ee8: 0x1027ee8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027edc: 0x1027edc: lw    v1, 32(sp)
+// 0x01027eec: 0x1027eec: lw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8115,20 +8115,20 @@ L_1027d2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01027ee0: 0x1027ee0: addiu a0, a0, -28652
+// 0x01027ef0: 0x1027ef0: addiu a0, a0, -28652
 	ldloc.1
 	ldc.i4 -28652
 	add
 	stloc.1
-// 0x01027ee4: 0x1027ee4: addiu a1, s8, 18500
+// 0x01027ef4: 0x1027ef4: addiu a1, s8, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01027ee8: 0x1027ee8: addiu a3, zero, 8192
+// 0x01027ef8: 0x1027ef8: addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
-// 0x01027eec: 0x1027eec: sw    v1, 16(sp)
+// 0x01027efc: 0x1027efc: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8137,7 +8137,7 @@ L_1027d2c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01027ef0: 0x1027ef0: sw    t2, 20(sp)
+// 0x01027f00: 0x1027f00: sw    t2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8146,7 +8146,7 @@ L_1027d2c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01027ef4: 0x1027ef4: jal   0x109683c sw    v0, 24(sp)
+// 0x01027f04: 0x1027f04: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8160,26 +8160,26 @@ L_1027d2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027efc: 0x1027efc: j	 0x10281b8 addu  a1, v0, zero
+// 0x01027f0c: 0x1027f0c: j	 0x10281c8 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-	br L_10281b8
+	br L_10281c8
 // --- basic block ---
-L_1027f04:
-// 0x01027f04: 0x1027f04: lui   a0, 0x10000
+L_1027f14:
+// 0x01027f14: 0x1027f14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027f08: 0x1027f08: addiu a0, a0, -27692
+// 0x01027f18: 0x1027f18: addiu a0, a0, -27692
 	ldloc.1
 	ldc.i4 -27692
 	add
 	stloc.1
-// 0x01027f0c: 0x1027f0c: jal   0x101cd60 sw    v1, 60(sp)
+// 0x01027f1c: 0x1027f1c: jal   0x101cd70 sw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8193,12 +8193,12 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f14: 0x1027f14: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01027f24: 0x1027f24: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -8211,23 +8211,23 @@ L_1027f04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f1c: 0x1027f1c: lui   a0, 0x10000
+// 0x01027f2c: 0x1027f2c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027f20: 0x1027f20: addiu a0, a0, -27680
+// 0x01027f30: 0x1027f30: addiu a0, a0, -27680
 	ldloc.1
 	ldc.i4 -27680
 	add
 	stloc.1
-// 0x01027f24: 0x1027f24: lui   s8, 0x60000
+// 0x01027f34: 0x1027f34: lui   s8, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01027f28: 0x1027f28: jal   0x101cd60 sw    v0, -26536(s8)
+// 0x01027f38: 0x1027f38: jal   0x101cd70 sw    v0, -26072(s8)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6634
+	ldc.i4 -6518
 	add
 	ldloc 5
 	stelem.i4
@@ -8236,12 +8236,12 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f30: 0x1027f30: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01027f40: 0x1027f40: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -8254,20 +8254,20 @@ L_1027f04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f38: 0x1027f38: addiu s8, s8, -26536
+// 0x01027f48: 0x1027f48: addiu s8, s8, -26072
 	ldloc 11
-	ldc.i4 -26536
+	ldc.i4 -26072
 	add
 	stloc 11
-// 0x01027f3c: 0x1027f3c: lui   a0, 0x10000
+// 0x01027f4c: 0x1027f4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027f40: 0x1027f40: addiu a0, a0, -27664
+// 0x01027f50: 0x1027f50: addiu a0, a0, -27664
 	ldloc.1
 	ldc.i4 -27664
 	add
 	stloc.1
-// 0x01027f44: 0x1027f44: jal   0x101cd60 sw    v0, 4(s8)
+// 0x01027f54: 0x1027f54: jal   0x101cd70 sw    v0, 4(s8)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -8281,12 +8281,12 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f4c: 0x1027f4c: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01027f5c: 0x1027f5c: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -8299,7 +8299,7 @@ L_1027f04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f54: 0x1027f54: lw    v1, 60(sp)
+// 0x01027f64: 0x1027f64: lw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8308,15 +8308,15 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01027f58: 0x1027f58: addiu a1, zero, 512
+// 0x01027f68: 0x1027f68: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x01027f5c: 0x1027f5c: addiu a0, v1, 32244
+// 0x01027f6c: 0x1027f6c: addiu a0, v1, 32244
 	ldloc 6
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01027f60: 0x1027f60: jal   0x109e6d0 sw    v0, 8(s8)
+// 0x01027f70: 0x1027f70: jal   0x109ed18 sw    v0, 8(s8)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -8330,50 +8330,50 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f68: 0x1027f68: addu  a1, v0, zero
+// 0x01027f78: 0x1027f78: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01027f6c: 0x1027f6c: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01027f7c: 0x1027f7c: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f74: 0x1027f74: lui   t2, 0x100000
+// 0x01027f84: 0x1027f84: lui   t2, 0x100000
 	ldc.i4 1048576
 	stloc 15
-// 0x01027f78: 0x1027f78: lui   a0, 0x10000
+// 0x01027f88: 0x1027f88: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01027f7c: 0x1027f7c: ori   t2, t2, 140
+// 0x01027f8c: 0x1027f8c: ori   t2, t2, 140
 	ldloc 15
 	ldc.i4 140
 	or
 	stloc 15
-// 0x01027f80: 0x1027f80: addiu a3, zero, -1
+// 0x01027f90: 0x1027f90: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01027f84: 0x1027f84: addiu a0, a0, -27652
+// 0x01027f94: 0x1027f94: addiu a0, a0, -27652
 	ldloc.1
 	ldc.i4 -27652
 	add
 	stloc.1
-// 0x01027f88: 0x1027f88: addu  a1, zero, zero
+// 0x01027f98: 0x1027f98: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027f8c: 0x1027f8c: addiu a2, zero, -2
+// 0x01027f9c: 0x1027f9c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01027f90: 0x1027f90: sw    t2, 16(sp)
+// 0x01027fa0: 0x1027fa0: sw    t2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8382,7 +8382,7 @@ L_1027f04:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01027f94: 0x1027f94: jal   0x1093a24 sw    t2, 48(sp)
+// 0x01027fa4: 0x1027fa4: jal   0x1094048 sw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8396,31 +8396,31 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027f9c: 0x1027f9c: addu  a0, v0, zero
+// 0x01027fac: 0x1027fac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027fa0: 0x1027fa0: addiu a2, s1, 23008
+// 0x01027fb0: 0x1027fb0: addiu a2, s1, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01027fa4: 0x1027fa4: lui   t1, 0xf0000
+// 0x01027fb4: 0x1027fb4: lui   t1, 0xf0000
 	ldc.i4 983040
 	stloc 19
-// 0x01027fa8: 0x1027fa8: addiu a1, s2, 31980
+// 0x01027fb8: 0x1027fb8: addiu a1, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01027fac: 0x1027fac: addu  s7, v0, zero
+// 0x01027fbc: 0x1027fbc: addu  s7, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01027fb0: 0x1027fb0: jal   0x1098fe0 sw    t1, 52(sp)
+// 0x01027fc0: 0x1027fc0: jal   0x1099628 sw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8432,9 +8432,9 @@ L_1027f04:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01027fb8: 0x1027fb8: lw    t1, 52(sp)
+// 0x01027fc8: 0x1027fc8: lw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8443,46 +8443,46 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01027fbc: 0x1027fbc: addiu t4, zero, 3
+// 0x01027fcc: 0x1027fcc: addiu t4, zero, 3
 	ldc.i4.3
 	stloc 22
-// 0x01027fc0: 0x1027fc0: lw    a2, -30068(t1)
+// 0x01027fd0: 0x1027fd0: lw    a2, -29604(t1)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x01027fc4: 0x1027fc4: lui   t3, 0x10000
+// 0x01027fd4: 0x1027fd4: lui   t3, 0x10000
 	ldc.i4 65536
 	stloc 21
-// 0x01027fc8: 0x1027fc8: sll   a2, a2, 1
+// 0x01027fd8: 0x1027fd8: sll   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x01027fcc: 0x1027fcc: div   a2, t4
+// 0x01027fdc: 0x1027fdc: div   a2, t4
 	ldloc.3
 	ldloc 22
 	div
 	stloc 20
-// 0x01027fd0: 0x1027fd0: addiu t5, zero, 16
+// 0x01027fe0: 0x1027fe0: addiu t5, zero, 16
 	ldc.i4.s 16
 	stloc 23
-// 0x01027fd4: 0x1027fd4: addiu a0, t3, -27636
+// 0x01027fe4: 0x1027fe4: addiu a0, t3, -27636
 	ldloc 21
 	ldc.i4 -27636
 	add
 	stloc.1
-// 0x01027fd8: 0x1027fd8: addiu a3, zero, -1
+// 0x01027fe8: 0x1027fe8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01027fdc: 0x1027fdc: addu  a1, zero, zero
+// 0x01027fec: 0x1027fec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01027fe0: 0x1027fe0: sw    t5, 16(sp)
+// 0x01027ff0: 0x1027ff0: sw    t5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8491,7 +8491,7 @@ L_1027f04:
 	add
 	ldloc 23
 	stelem.i4
-// 0x01027fe4: 0x1027fe4: sw    t3, 44(sp)
+// 0x01027ff4: 0x1027ff4: sw    t3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8500,7 +8500,7 @@ L_1027f04:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01027fe8: 0x1027fe8: sw    t4, 36(sp)
+// 0x01027ff8: 0x1027ff8: sw    t4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8509,10 +8509,10 @@ L_1027f04:
 	add
 	ldloc 22
 	stelem.i4
-// 0x01027fec: 0x1027fec: mflo  lo
+// 0x01027ffc: 0x1027ffc: mflo  lo
 	ldloc 20
 	stloc.3
-// 0x01027ff0: 0x1027ff0: jal   0x1093a24 sw    t5, 40(sp)
+// 0x01028000: 0x1028000: jal   0x1094048 sw    t5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8526,21 +8526,21 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01027ff8: 0x1027ff8: addu  a0, v0, zero
+// 0x01028008: 0x1028008: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01027ffc: 0x1027ffc: addu  a1, zero, zero
+// 0x0102800c: 0x102800c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028000: 0x1028000: addu  a2, zero, zero
+// 0x01028010: 0x1028010: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028004: 0x1028004: jal   0x1098fe0 sw    v0, 56(sp)
+// 0x01028014: 0x1028014: jal   0x1099628 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8552,12 +8552,12 @@ L_1027f04:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102800c: 0x102800c: lui   v0, 0x10000
+// 0x0102801c: 0x102801c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01028010: 0x1028010: jal   0x101cd60 addiu a0, v0, -27628
+// 0x01028020: 0x1028020: jal   0x101cd70 addiu a0, v0, -27628
 	ldloc 5
 	ldc.i4 -27628
 	add
@@ -8567,26 +8567,26 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028018: 0x1028018: lui   a0, 0x10000
+// 0x01028028: 0x1028028: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102801c: 0x102801c: addiu a2, zero, -1
+// 0x0102802c: 0x102802c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01028020: 0x1028020: addiu a3, zero, 4240
+// 0x01028030: 0x1028030: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01028024: 0x1028024: addiu a0, a0, -27588
+// 0x01028034: 0x1028034: addiu a0, a0, -27588
 	ldloc.1
 	ldc.i4 -27588
 	add
 	stloc.1
-// 0x01028028: 0x1028028: jal   0x1098d10 addu  a1, v0, zero
+// 0x01028038: 0x1028038: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -8594,12 +8594,12 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028030: 0x1028030: lw    t0, 56(sp)
+// 0x01028040: 0x1028040: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8608,20 +8608,20 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01028034: 0x1028034: addu  a1, v0, zero
+// 0x01028044: 0x1028044: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028038: 0x1028038: jal   0x1098ec4 addu  a0, t0, zero
+// 0x01028048: 0x1028048: jal   0x109950c addu  a0, t0, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028040: 0x1028040: lw    t0, 56(sp)
+// 0x01028050: 0x1028050: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8630,23 +8630,23 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01028044: 0x1028044: addu  a0, s7, zero
+// 0x01028054: 0x1028054: addu  a0, s7, zero
 	ldloc 10
 	stloc.1
-// 0x01028048: 0x1028048: jal   0x1098ec4 addu  a1, t0, zero
+// 0x01028058: 0x1028058: jal   0x109950c addu  a1, t0, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028050: 0x1028050: lui   v0, 0x10000
+// 0x01028060: 0x1028060: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01028054: 0x1028054: jal   0x101cd60 addiu a0, v0, -27628
+// 0x01028064: 0x1028064: jal   0x101cd70 addiu a0, v0, -27628
 	ldloc 5
 	ldc.i4 -27628
 	add
@@ -8656,40 +8656,40 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102805c: 0x102805c: lui   t0, 0x0
+// 0x0102806c: 0x102806c: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01028060: 0x1028060: lui   a0, 0x10000
+// 0x01028070: 0x1028070: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028064: 0x1028064: addiu t0, t0, 6504
+// 0x01028074: 0x1028074: addiu t0, t0, 6504
 	ldloc 13
 	ldc.i4 6504
 	add
 	stloc 13
-// 0x01028068: 0x1028068: addiu a2, zero, 3
+// 0x01028078: 0x1028078: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x0102806c: 0x102806c: addu  a3, s8, zero
+// 0x0102807c: 0x102807c: addu  a3, s8, zero
 	ldloc 11
 	stloc 4
-// 0x01028070: 0x1028070: addu  a1, v0, zero
+// 0x01028080: 0x1028080: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028074: 0x1028074: addiu a0, a0, -28636
+// 0x01028084: 0x1028084: addiu a0, a0, -28636
 	ldloc.1
 	ldc.i4 -28636
 	add
 	stloc.1
-// 0x01028078: 0x1028078: addiu v0, zero, 2
+// 0x01028088: 0x1028088: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102807c: 0x102807c: sw    t0, 16(sp)
+// 0x0102808c: 0x102808c: sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8698,7 +8698,7 @@ L_1027f04:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01028080: 0x1028080: sw    t0, 56(sp)
+// 0x01028090: 0x1028090: sw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8707,7 +8707,7 @@ L_1027f04:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01028084: 0x1028084: sw    v0, 20(sp)
+// 0x01028094: 0x1028094: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8716,7 +8716,7 @@ L_1027f04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01028088: 0x1028088: jal   0x10929e0 sw    zero, 24(sp)
+// 0x01028098: 0x1028098: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8730,38 +8730,38 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028090: 0x1028090: addu  a1, v0, zero
+// 0x010280a0: 0x10280a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028094: 0x1028094: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010280a4: 0x10280a4: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102809c: 0x102809c: addu  a1, s7, zero
+// 0x010280ac: 0x10280ac: addu  a1, s7, zero
 	ldloc 10
 	stloc.2
-// 0x010280a0: 0x10280a0: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010280b0: 0x10280b0: jal   0x109950c addu  a0, s3, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010280a8: 0x10280a8: lw    v1, 60(sp)
+// 0x010280b8: 0x10280b8: lw    v1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8770,10 +8770,10 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010280ac: 0x10280ac: addiu a1, zero, 512
+// 0x010280bc: 0x10280bc: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x010280b0: 0x10280b0: jal   0x109e6d0 addiu a0, v1, 32244
+// 0x010280c0: 0x10280c0: jal   0x109ed18 addiu a0, v1, 32244
 	ldloc 6
 	ldc.i4 32244
 	add
@@ -8783,25 +8783,25 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010280b8: 0x10280b8: addu  a1, v0, zero
+// 0x010280c8: 0x10280c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010280bc: 0x10280bc: jal   0x1098ec4 addu  a0, s7, zero
+// 0x010280cc: 0x10280cc: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010280c4: 0x10280c4: lw    t2, 48(sp)
+// 0x010280d4: 0x10280d4: lw    t2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8810,24 +8810,24 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010280c8: 0x10280c8: lui   a0, 0x10000
+// 0x010280d8: 0x10280d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010280cc: 0x10280cc: addiu a3, zero, -1
+// 0x010280dc: 0x10280dc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010280d0: 0x10280d0: addiu a0, a0, -27572
+// 0x010280e0: 0x10280e0: addiu a0, a0, -27572
 	ldloc.1
 	ldc.i4 -27572
 	add
 	stloc.1
-// 0x010280d4: 0x10280d4: addu  a1, zero, zero
+// 0x010280e4: 0x10280e4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010280d8: 0x10280d8: addiu a2, zero, -2
+// 0x010280e8: 0x10280e8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010280dc: 0x10280dc: jal   0x1093a24 sw    t2, 16(sp)
+// 0x010280ec: 0x10280ec: jal   0x1094048 sw    t2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8841,33 +8841,33 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010280e4: 0x10280e4: addu  a0, v0, zero
+// 0x010280f4: 0x10280f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010280e8: 0x10280e8: addiu a2, s1, 23008
+// 0x010280f8: 0x10280f8: addiu a2, s1, 23008
 	ldloc 8
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010280ec: 0x10280ec: addiu a1, s2, 31980
+// 0x010280fc: 0x10280fc: addiu a1, s2, 31980
 	ldloc 9
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010280f0: 0x10280f0: jal   0x1098fe0 addu  s7, v0, zero
+// 0x01028100: 0x1028100: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010280f8: 0x10280f8: lw    t1, 52(sp)
+// 0x01028108: 0x1028108: lw    t1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8876,7 +8876,7 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010280fc: 0x10280fc: lw    t4, 36(sp)
+// 0x0102810c: 0x102810c: lw    t4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8885,16 +8885,16 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 22
-// 0x01028100: 0x1028100: lw    a2, -30068(t1)
+// 0x01028110: 0x1028110: lw    a2, -29604(t1)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x01028104: 0x1028104: lw    t3, 44(sp)
+// 0x01028114: 0x1028114: lw    t3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8903,17 +8903,17 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 21
-// 0x01028108: 0x1028108: sll   a2, a2, 1
+// 0x01028118: 0x1028118: sll   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x0102810c: 0x102810c: div   a2, t4
+// 0x0102811c: 0x102811c: div   a2, t4
 	ldloc.3
 	ldloc 22
 	div
 	stloc 20
-// 0x01028110: 0x1028110: lw    t5, 40(sp)
+// 0x01028120: 0x1028120: lw    t5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8922,21 +8922,21 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 23
-// 0x01028114: 0x1028114: addiu a0, t3, -27636
+// 0x01028124: 0x1028124: addiu a0, t3, -27636
 	ldloc 21
 	ldc.i4 -27636
 	add
 	stloc.1
-// 0x01028118: 0x1028118: addiu a3, zero, -1
+// 0x01028128: 0x1028128: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102811c: 0x102811c: addu  a1, zero, zero
+// 0x0102812c: 0x102812c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028120: 0x1028120: mflo  lo
+// 0x01028130: 0x1028130: mflo  lo
 	ldloc 20
 	stloc.3
-// 0x01028124: 0x1028124: jal   0x1093a24 sw    t5, 16(sp)
+// 0x01028134: 0x1028134: jal   0x1094048 sw    t5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8950,32 +8950,32 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102812c: 0x102812c: addu  a0, v0, zero
+// 0x0102813c: 0x102813c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01028130: 0x1028130: addu  a1, zero, zero
+// 0x01028140: 0x1028140: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028134: 0x1028134: addu  a2, zero, zero
+// 0x01028144: 0x1028144: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028138: 0x1028138: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01028148: 0x1028148: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028140: 0x1028140: lui   v0, 0x10000
+// 0x01028150: 0x1028150: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01028144: 0x1028144: jal   0x101cd60 addiu a0, v0, -27556
+// 0x01028154: 0x1028154: jal   0x101cd70 addiu a0, v0, -27556
 	ldloc 5
 	ldc.i4 -27556
 	add
@@ -8985,26 +8985,26 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102814c: 0x102814c: lui   a0, 0x10000
+// 0x0102815c: 0x102815c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028150: 0x1028150: addiu a2, zero, -1
+// 0x01028160: 0x1028160: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01028154: 0x1028154: addiu a3, zero, 4240
+// 0x01028164: 0x1028164: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01028158: 0x1028158: addiu a0, a0, -27520
+// 0x01028168: 0x1028168: addiu a0, a0, -27520
 	ldloc.1
 	ldc.i4 -27520
 	add
 	stloc.1
-// 0x0102815c: 0x102815c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0102816c: 0x102816c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -9012,41 +9012,41 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028164: 0x1028164: addu  a1, v0, zero
+// 0x01028174: 0x1028174: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028168: 0x1028168: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01028178: 0x1028178: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028170: 0x1028170: addu  a1, s1, zero
+// 0x01028180: 0x1028180: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01028174: 0x1028174: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01028184: 0x1028184: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102817c: 0x102817c: lui   v1, 0x10000
+// 0x0102818c: 0x102818c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01028180: 0x1028180: jal   0x101cd60 addiu a0, v1, -27556
+// 0x01028190: 0x1028190: jal   0x101cd70 addiu a0, v1, -27556
 	ldloc 6
 	ldc.i4 -27556
 	add
@@ -9056,15 +9056,15 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028188: 0x1028188: lui   a0, 0x10000
+// 0x01028198: 0x1028198: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102818c: 0x102818c: lw    t0, 56(sp)
+// 0x0102819c: 0x102819c: lw    t0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9073,24 +9073,24 @@ L_1027f04:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01028190: 0x1028190: addu  a1, v0, zero
+// 0x010281a0: 0x10281a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028194: 0x1028194: addu  a3, s8, zero
+// 0x010281a4: 0x10281a4: addu  a3, s8, zero
 	ldloc 11
 	stloc 4
-// 0x01028198: 0x1028198: addiu v0, zero, 2
+// 0x010281a8: 0x10281a8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102819c: 0x102819c: addiu a0, a0, -28616
+// 0x010281ac: 0x10281ac: addiu a0, a0, -28616
 	ldloc.1
 	ldc.i4 -28616
 	add
 	stloc.1
-// 0x010281a0: 0x10281a0: addiu a2, zero, 3
+// 0x010281b0: 0x10281b0: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x010281a4: 0x10281a4: sw    t0, 16(sp)
+// 0x010281b4: 0x10281b4: sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9099,7 +9099,7 @@ L_1027f04:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010281a8: 0x10281a8: sw    v0, 20(sp)
+// 0x010281b8: 0x10281b8: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9108,7 +9108,7 @@ L_1027f04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010281ac: 0x10281ac: jal   0x10929e0 sw    zero, 24(sp)
+// 0x010281bc: 0x10281bc: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9122,52 +9122,52 @@ L_1027f04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010281b4: 0x10281b4: addu  a1, v0, zero
+// 0x010281c4: 0x10281c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-L_10281b8:
-// 0x010281b8: 0x10281b8: jal   0x1098ec4 addu  a0, s7, zero
+L_10281c8:
+// 0x010281c8: 0x10281c8: jal   0x109950c addu  a0, s7, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010281c0: 0x10281c0: addu  a0, s3, zero
+// 0x010281d0: 0x10281d0: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x010281c4: 0x10281c4: jal   0x1098ec4 addu  a1, s7, zero
+// 0x010281d4: 0x10281d4: jal   0x109950c addu  a1, s7, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010281cc: 0x10281cc: addu  a1, s3, zero
+// 0x010281dc: 0x10281dc: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x010281d0: 0x10281d0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010281e0: 0x10281e0: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010281d8: 0x10281d8: jal   0x1027a9c lui   s2, 0x10000
+// 0x010281e8: 0x10281e8: jal   0x1027aac lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -9175,45 +9175,45 @@ L_10281b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::T_60_1027a9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::T_60_1027aac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010281e0: 0x10281e0: addu  a1, v0, zero
+// 0x010281f0: 0x10281f0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010281e4: 0x10281e4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010281f4: 0x10281f4: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010281ec: 0x10281ec: lui   a0, 0x10000
+// 0x010281fc: 0x10281fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010281f0: 0x10281f0: addiu v0, zero, 136
+// 0x01028200: 0x1028200: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010281f4: 0x10281f4: addiu a0, a0, -27504
+// 0x01028204: 0x1028204: addiu a0, a0, -27504
 	ldloc.1
 	ldc.i4 -27504
 	add
 	stloc.1
-// 0x010281f8: 0x10281f8: addu  a1, zero, zero
+// 0x01028208: 0x1028208: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010281fc: 0x10281fc: addiu a2, zero, -1
+// 0x0102820c: 0x102820c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01028200: 0x1028200: addiu a3, zero, -1
+// 0x01028210: 0x1028210: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01028204: 0x1028204: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01028214: 0x1028214: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9227,38 +9227,38 @@ L_10281b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102820c: 0x102820c: beq   s6, zero, 0x1028220 addu  s1, v0, zero
+// 0x0102821c: 0x102821c: beq   s6, zero, 0x1028230 addu  s1, v0, zero
 	ldloc 18
 	ldloc 5
 	stloc 8
-	brfalse L_1028220
+	brfalse L_1028230
 // --- basic block ---
-// 0x01028214: 0x1028214: lui   a0, 0x10000
+// 0x01028224: 0x1028224: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028218: 0x1028218: j	 0x1028228 addiu a0, a0, -27468
+// 0x01028228: 0x1028228: j	 0x1028238 addiu a0, a0, -27468
 	ldloc.1
 	ldc.i4 -27468
 	add
 	stloc.1
-	br L_1028228
+	br L_1028238
 // --- basic block ---
-L_1028220:
-// 0x01028220: 0x1028220: lui   a0, 0x10000
+L_1028230:
+// 0x01028230: 0x1028230: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028224: 0x1028224: addiu a0, a0, -27396
+// 0x01028234: 0x1028234: addiu a0, a0, -27396
 	ldloc.1
 	ldc.i4 -27396
 	add
 	stloc.1
-L_1028228:
-// 0x01028228: 0x1028228: jal   0x101cd60 addiu s3, zero, 136
+L_1028238:
+// 0x01028238: 0x1028238: jal   0x101cd70 addiu s3, zero, 136
 	ldc.i4 136
 	stloc 14
 	ldloc.0
@@ -9266,23 +9266,23 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028230: 0x1028230: addu  a1, v0, zero
+// 0x01028240: 0x1028240: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028234: 0x1028234: addiu a3, zero, 4240
+// 0x01028244: 0x1028244: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01028238: 0x1028238: addiu a0, s2, -27428
+// 0x01028248: 0x1028248: addiu a0, s2, -27428
 	ldloc 9
 	ldc.i4 -27428
 	add
 	stloc.1
-// 0x0102823c: 0x102823c: jal   0x1098d10 addiu a2, zero, 16
+// 0x0102824c: 0x102824c: jal   0x1099358 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.0
@@ -9290,52 +9290,52 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028244: 0x1028244: addu  a1, v0, zero
+// 0x01028254: 0x1028254: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028248: 0x1028248: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01028258: 0x1028258: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028250: 0x1028250: addu  a2, zero, zero
+// 0x01028260: 0x1028260: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028254: 0x1028254: addu  a0, s1, zero
+// 0x01028264: 0x1028264: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01028258: 0x1028258: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01028268: 0x1028268: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028260: 0x1028260: addu  a1, s1, zero
+// 0x01028270: 0x1028270: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01028264: 0x1028264: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01028274: 0x1028274: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102826c: 0x102826c: jal   0x1027a9c addiu s7, zero, 1
+// 0x0102827c: 0x102827c: jal   0x1027aac addiu s7, zero, 1
 	ldc.i4.1
 	stloc 10
 	ldloc.0
@@ -9343,50 +9343,50 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::T_60_1027a9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::T_60_1027aac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028274: 0x1028274: addu  a1, v0, zero
+// 0x01028284: 0x1028284: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028278: 0x1028278: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01028288: 0x1028288: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028280: 0x1028280: lui   a0, 0x10000
+// 0x01028290: 0x1028290: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028284: 0x1028284: lui   v1, 0x41100000
+// 0x01028294: 0x1028294: lui   v1, 0x41100000
 	ldc.i4 1091567616
 	stloc 6
-// 0x01028288: 0x1028288: addiu a3, zero, -1
+// 0x01028298: 0x1028298: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102828c: 0x102828c: ori   v1, v1, 20620
+// 0x0102829c: 0x102829c: ori   v1, v1, 20620
 	ldloc 6
 	ldc.i4 20620
 	or
 	stloc 6
-// 0x01028290: 0x1028290: addiu a0, a0, -27364
+// 0x010282a0: 0x10282a0: addiu a0, a0, -27364
 	ldloc.1
 	ldc.i4 -27364
 	add
 	stloc.1
-// 0x01028294: 0x1028294: addu  a1, zero, zero
+// 0x010282a4: 0x10282a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028298: 0x1028298: addiu a2, zero, -2
+// 0x010282a8: 0x10282a8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0102829c: 0x102829c: jal   0x1093a24 sw    v1, 16(sp)
+// 0x010282ac: 0x10282ac: jal   0x1094048 sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9400,29 +9400,29 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010282a4: 0x10282a4: addu  s1, v0, zero
+// 0x010282b4: 0x10282b4: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010282a8: 0x10282a8: lui   v1, 0x0
+// 0x010282b8: 0x10282b8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010282ac: 0x10282ac: addu  a0, v0, zero
+// 0x010282bc: 0x10282bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010282b0: 0x10282b0: lui   v0, 0x0
+// 0x010282c0: 0x10282c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010282b4: 0x10282b4: addiu a2, v1, 23008
+// 0x010282c4: 0x10282c4: addiu a2, v1, 23008
 	ldloc 6
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010282b8: 0x10282b8: jal   0x1098fe0 addiu a1, v0, 31980
+// 0x010282c8: 0x10282c8: jal   0x1099628 addiu a1, v0, 31980
 	ldloc 5
 	ldc.i4 31980
 	add
@@ -9430,12 +9430,12 @@ L_1028228:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010282c0: 0x10282c0: lui   a0, 0x10000
+// 0x010282d0: 0x10282d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010282c4: 0x10282c4: jal   0x101cd60 addiu a0, a0, -27344
+// 0x010282d4: 0x10282d4: jal   0x101cd70 addiu a0, a0, -27344
 	ldloc.1
 	ldc.i4 -27344
 	add
@@ -9445,26 +9445,26 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010282cc: 0x10282cc: lui   a0, 0x10000
+// 0x010282dc: 0x10282dc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010282d0: 0x10282d0: addiu a2, zero, -1
+// 0x010282e0: 0x10282e0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010282d4: 0x10282d4: addiu a3, zero, 4240
+// 0x010282e4: 0x10282e4: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010282d8: 0x10282d8: addiu a0, a0, -27328
+// 0x010282e8: 0x10282e8: addiu a0, a0, -27328
 	ldloc.1
 	ldc.i4 -27328
 	add
 	stloc.1
-// 0x010282dc: 0x10282dc: jal   0x1098d10 addu  a1, v0, zero
+// 0x010282ec: 0x10282ec: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -9472,42 +9472,42 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010282e4: 0x10282e4: addu  a1, v0, zero
+// 0x010282f4: 0x10282f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010282e8: 0x10282e8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010282f8: 0x10282f8: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010282f0: 0x10282f0: lui   a0, 0x10000
+// 0x01028300: 0x1028300: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010282f4: 0x10282f4: addiu a2, zero, 26
+// 0x01028304: 0x1028304: addiu a2, zero, 26
 	ldc.i4.s 26
 	stloc.3
-// 0x010282f8: 0x10282f8: addu  a3, zero, zero
+// 0x01028308: 0x1028308: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010282fc: 0x10282fc: addiu a0, a0, -28600
+// 0x0102830c: 0x102830c: addiu a0, a0, -28600
 	ldloc.1
 	ldc.i4 -28600
 	add
 	stloc.1
-// 0x01028300: 0x1028300: addiu a1, zero, 1
+// 0x01028310: 0x1028310: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01028304: 0x1028304: sw    zero, 16(sp)
+// 0x01028314: 0x1028314: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9516,7 +9516,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01028308: 0x1028308: sw    zero, 20(sp)
+// 0x01028318: 0x1028318: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9525,7 +9525,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102830c: 0x102830c: jal   0x109c14c sw    zero, 24(sp)
+// 0x0102831c: 0x102831c: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9539,55 +9539,55 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028314: 0x1028314: addu  a1, v0, zero
+// 0x01028324: 0x1028324: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028318: 0x1028318: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01028328: 0x1028328: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028320: 0x1028320: addu  a1, s1, zero
+// 0x01028330: 0x1028330: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01028324: 0x1028324: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01028334: 0x1028334: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102832c: 0x102832c: lui   a0, 0x10000
+// 0x0102833c: 0x102833c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028330: 0x1028330: addu  a1, zero, zero
+// 0x01028340: 0x1028340: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028334: 0x1028334: addiu a2, zero, -1
+// 0x01028344: 0x1028344: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01028338: 0x1028338: addiu a3, zero, -1
+// 0x01028348: 0x1028348: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102833c: 0x102833c: addiu a0, a0, -27308
+// 0x0102834c: 0x102834c: addiu a0, a0, -27308
 	ldloc.1
 	ldc.i4 -27308
 	add
 	stloc.1
-// 0x01028340: 0x1028340: jal   0x1093a24 sw    s3, 16(sp)
+// 0x01028350: 0x1028350: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9601,20 +9601,20 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028348: 0x1028348: lui   a0, 0x10000
+// 0x01028358: 0x1028358: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102834c: 0x102834c: addiu a0, a0, -27284
+// 0x0102835c: 0x102835c: addiu a0, a0, -27284
 	ldloc.1
 	ldc.i4 -27284
 	add
 	stloc.1
-// 0x01028350: 0x1028350: jal   0x101cd60 addu  s1, v0, zero
+// 0x01028360: 0x1028360: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -9622,24 +9622,24 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028358: 0x1028358: lui   a0, 0x10000
+// 0x01028368: 0x1028368: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102835c: 0x102835c: addiu a3, zero, 4240
+// 0x0102836c: 0x102836c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01028360: 0x1028360: addiu a2, zero, 14
+// 0x01028370: 0x1028370: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01028364: 0x1028364: addu  a1, v0, zero
+// 0x01028374: 0x1028374: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028368: 0x1028368: jal   0x1098d10 addiu a0, a0, -27204
+// 0x01028378: 0x1028378: jal   0x1099358 addiu a0, a0, -27204
 	ldloc.1
 	ldc.i4 -27204
 	add
@@ -9649,23 +9649,23 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028370: 0x1028370: lui   v1, 0x10000
+// 0x01028380: 0x1028380: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01028374: 0x1028374: addiu a1, v1, -27176
+// 0x01028384: 0x1028384: addiu a1, v1, -27176
 	ldloc 6
 	ldc.i4 -27176
 	add
 	stloc.2
-// 0x01028378: 0x1028378: addu  a0, v0, zero
+// 0x01028388: 0x1028388: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102837c: 0x102837c: jal   0x1097af8 sw    v0, 36(sp)
+// 0x0102838c: 0x102838c: jal   0x1098140 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9676,9 +9676,9 @@ L_1028228:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01028384: 0x1028384: lw    v0, 36(sp)
+// 0x01028394: 0x1028394: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9687,47 +9687,47 @@ L_1028228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028388: 0x1028388: addu  a0, s1, zero
+// 0x01028398: 0x1028398: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102838c: 0x102838c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0102839c: 0x102839c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028394: 0x1028394: addu  a2, zero, zero
+// 0x010283a4: 0x10283a4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028398: 0x1028398: addu  a0, s1, zero
+// 0x010283a8: 0x10283a8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102839c: 0x102839c: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010283ac: 0x10283ac: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010283a4: 0x10283a4: addu  a1, s1, zero
+// 0x010283b4: 0x10283b4: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010283a8: 0x10283a8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010283b8: 0x10283b8: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010283b0: 0x10283b0: jal   0x1027a9c lui   s6, 0x10000
+// 0x010283c0: 0x10283c0: jal   0x1027aac lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 18
 	ldloc.0
@@ -9735,50 +9735,50 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::T_60_1027a9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::T_60_1027aac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010283b8: 0x10283b8: addu  a1, v0, zero
+// 0x010283c8: 0x10283c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010283bc: 0x10283bc: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010283cc: 0x10283cc: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010283c4: 0x10283c4: lui   a0, 0x10000
+// 0x010283d4: 0x10283d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010283c8: 0x10283c8: lui   v0, 0x41000000
+// 0x010283d8: 0x10283d8: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x010283cc: 0x10283cc: addiu a0, a0, -27168
+// 0x010283dc: 0x10283dc: addiu a0, a0, -27168
 	ldloc.1
 	ldc.i4 -27168
 	add
 	stloc.1
-// 0x010283d0: 0x10283d0: addu  a1, zero, zero
+// 0x010283e0: 0x10283e0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010283d4: 0x10283d4: addiu a2, zero, -2
+// 0x010283e4: 0x10283e4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010283d8: 0x10283d8: addiu a3, zero, -1
+// 0x010283e8: 0x10283e8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010283dc: 0x10283dc: ori   v0, v0, 20620
+// 0x010283ec: 0x10283ec: ori   v0, v0, 20620
 	ldloc 5
 	ldc.i4 20620
 	or
 	stloc 5
-// 0x010283e0: 0x10283e0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010283f0: 0x10283f0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9792,32 +9792,32 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010283e8: 0x10283e8: lui   a0, 0x10000
+// 0x010283f8: 0x10283f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010283ec: 0x10283ec: addu  a1, zero, zero
+// 0x010283fc: 0x10283fc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010283f0: 0x10283f0: addiu a2, zero, -2
+// 0x01028400: 0x1028400: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010283f4: 0x10283f4: addiu a3, zero, -1
+// 0x01028404: 0x1028404: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010283f8: 0x10283f8: addiu a0, a0, -27144
+// 0x01028408: 0x1028408: addiu a0, a0, -27144
 	ldloc.1
 	ldc.i4 -27144
 	add
 	stloc.1
-// 0x010283fc: 0x10283fc: addu  s1, v0, zero
+// 0x0102840c: 0x102840c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01028400: 0x1028400: jal   0x1093a24 sw    s3, 16(sp)
+// 0x01028410: 0x1028410: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9831,20 +9831,20 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028408: 0x1028408: lui   a0, 0x10000
+// 0x01028418: 0x1028418: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102840c: 0x102840c: addiu a0, a0, -27116
+// 0x0102841c: 0x102841c: addiu a0, a0, -27116
 	ldloc.1
 	ldc.i4 -27116
 	add
 	stloc.1
-// 0x01028410: 0x1028410: jal   0x101cd60 addu  s2, v0, zero
+// 0x01028420: 0x1028420: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -9852,26 +9852,26 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028418: 0x1028418: lui   a0, 0x10000
+// 0x01028428: 0x1028428: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102841c: 0x102841c: addiu a3, zero, 4248
+// 0x0102842c: 0x102842c: addiu a3, zero, 4248
 	ldc.i4 4248
 	stloc 4
-// 0x01028420: 0x1028420: addiu a2, zero, 16
+// 0x01028430: 0x1028430: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01028424: 0x1028424: addiu a0, a0, -27092
+// 0x01028434: 0x1028434: addiu a0, a0, -27092
 	ldloc.1
 	ldc.i4 -27092
 	add
 	stloc.1
-// 0x01028428: 0x1028428: jal   0x1098d10 addu  a1, v0, zero
+// 0x01028438: 0x1028438: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -9879,33 +9879,33 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028430: 0x1028430: addu  a1, v0, zero
+// 0x01028440: 0x1028440: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028434: 0x1028434: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028444: 0x1028444: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102843c: 0x102843c: lui   v0, 0x0
+// 0x0102844c: 0x102844c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01028440: 0x1028440: addiu a0, v0, 32244
+// 0x01028450: 0x1028450: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01028444: 0x1028444: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01028454: 0x1028454: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -9913,77 +9913,77 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102844c: 0x102844c: addu  a1, v0, zero
+// 0x0102845c: 0x102845c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028450: 0x1028450: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028460: 0x1028460: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028458: 0x1028458: addu  a0, s2, zero
+// 0x01028468: 0x1028468: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0102845c: 0x102845c: addu  a2, zero, zero
+// 0x0102846c: 0x102846c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028460: 0x1028460: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01028470: 0x1028470: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028468: 0x1028468: addu  a0, s1, zero
+// 0x01028478: 0x1028478: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102846c: 0x102846c: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0102847c: 0x102847c: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028474: 0x1028474: lui   v1, 0x100000
+// 0x01028484: 0x1028484: lui   v1, 0x100000
 	ldc.i4 1048576
 	stloc 6
-// 0x01028478: 0x1028478: lui   a0, 0x10000
+// 0x01028488: 0x1028488: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102847c: 0x102847c: ori   s8, v1, 136
+// 0x0102848c: 0x102848c: ori   s8, v1, 136
 	ldloc 6
 	ldc.i4 136
 	or
 	stloc 11
-// 0x01028480: 0x1028480: addiu a0, a0, -27064
+// 0x01028490: 0x1028490: addiu a0, a0, -27064
 	ldloc.1
 	ldc.i4 -27064
 	add
 	stloc.1
-// 0x01028484: 0x1028484: addu  a1, zero, zero
+// 0x01028494: 0x1028494: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028488: 0x1028488: addiu a2, zero, -2
+// 0x01028498: 0x1028498: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0102848c: 0x102848c: addiu a3, zero, -1
+// 0x0102849c: 0x102849c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01028490: 0x1028490: jal   0x1093a24 sw    s8, 16(sp)
+// 0x010284a0: 0x10284a0: jal   0x1094048 sw    s8, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9997,12 +9997,12 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028498: 0x1028498: jal   0x1026c80 addu  s2, v0, zero
+// 0x010284a8: 0x10284a8: jal   0x1026c90 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -10010,31 +10010,31 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c80(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010284a0: 0x10284a0: sltiu a1, v0, 1
+// 0x010284b0: 0x10284b0: sltiu a1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x010284a4: 0x10284a4: lui   v0, 0x0
+// 0x010284b4: 0x10284b4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010284a8: 0x10284a8: addiu a2, zero, 16
+// 0x010284b8: 0x10284b8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010284ac: 0x10284ac: addu  a3, s5, zero
+// 0x010284bc: 0x10284bc: addu  a3, s5, zero
 	ldloc 17
 	stloc 4
-// 0x010284b0: 0x10284b0: addiu a0, v0, 31272
+// 0x010284c0: 0x10284c0: addiu a0, v0, 31272
 	ldloc 5
 	ldc.i4 31272
 	add
 	stloc.1
-// 0x010284b4: 0x10284b4: sw    zero, 16(sp)
+// 0x010284c4: 0x10284c4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10043,7 +10043,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010284b8: 0x10284b8: sw    zero, 20(sp)
+// 0x010284c8: 0x10284c8: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10052,7 +10052,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010284bc: 0x10284bc: jal   0x109c14c sw    s7, 24(sp)
+// 0x010284cc: 0x10284cc: jal   0x109c794 sw    s7, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10066,18 +10066,18 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010284c4: 0x10284c4: addu  a1, v0, zero
+// 0x010284d4: 0x10284d4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010284c8: 0x10284c8: addu  a0, s2, zero
+// 0x010284d8: 0x10284d8: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010284cc: 0x10284cc: jal   0x1098ec4 sw    v0, 0(s4)
+// 0x010284dc: 0x10284dc: jal   0x109950c sw    v0, 0(s4)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -10086,26 +10086,26 @@ L_1028228:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010284d4: 0x10284d4: addiu a3, zero, 14
+// 0x010284e4: 0x10284e4: addiu a3, zero, 14
 	ldc.i4.s 14
 	stloc 4
-// 0x010284d8: 0x10284d8: addu  a1, zero, zero
+// 0x010284e8: 0x10284e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010284dc: 0x10284dc: addiu a2, zero, 10
+// 0x010284ec: 0x10284ec: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010284e0: 0x10284e0: addiu a0, s6, -27036
+// 0x010284f0: 0x10284f0: addiu a0, s6, -27036
 	ldloc 18
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010284e4: 0x10284e4: jal   0x1093a24 sw    zero, 16(sp)
+// 0x010284f4: 0x10284f4: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10119,21 +10119,21 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010284ec: 0x10284ec: addu  a0, v0, zero
+// 0x010284fc: 0x10284fc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010284f0: 0x10284f0: addu  a2, zero, zero
+// 0x01028500: 0x1028500: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010284f4: 0x10284f4: addu  a1, zero, zero
+// 0x01028504: 0x1028504: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010284f8: 0x10284f8: jal   0x1098fe0 sw    v0, 36(sp)
+// 0x01028508: 0x1028508: jal   0x1099628 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10145,9 +10145,9 @@ L_1028228:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028500: 0x1028500: lw    v0, 36(sp)
+// 0x01028510: 0x1028510: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10156,23 +10156,23 @@ L_1028228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028504: 0x1028504: addu  a0, s2, zero
+// 0x01028514: 0x1028514: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028508: 0x1028508: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01028518: 0x1028518: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028510: 0x1028510: lui   v1, 0x0
+// 0x01028520: 0x1028520: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01028514: 0x1028514: jal   0x101cd60 addiu a0, v1, 31272
+// 0x01028524: 0x1028524: jal   0x101cd70 addiu a0, v1, 31272
 	ldloc 6
 	ldc.i4 31272
 	add
@@ -10182,26 +10182,26 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102851c: 0x102851c: lui   a0, 0x10000
+// 0x0102852c: 0x102852c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028520: 0x1028520: addiu a3, zero, 152
+// 0x01028530: 0x1028530: addiu a3, zero, 152
 	ldc.i4 152
 	stloc 4
-// 0x01028524: 0x1028524: addiu a2, zero, 14
+// 0x01028534: 0x1028534: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01028528: 0x1028528: addiu a0, a0, -27028
+// 0x01028538: 0x1028538: addiu a0, a0, -27028
 	ldloc.1
 	ldc.i4 -27028
 	add
 	stloc.1
-// 0x0102852c: 0x102852c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0102853c: 0x102853c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -10209,33 +10209,33 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028534: 0x1028534: addu  a1, v0, zero
+// 0x01028544: 0x1028544: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028538: 0x1028538: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028548: 0x1028548: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028540: 0x1028540: lui   v0, 0x0
+// 0x01028550: 0x1028550: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01028544: 0x1028544: addiu a0, v0, 32244
+// 0x01028554: 0x1028554: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01028548: 0x1028548: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01028558: 0x1028558: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -10243,69 +10243,69 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028550: 0x1028550: addu  a1, v0, zero
+// 0x01028560: 0x1028560: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028554: 0x1028554: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028564: 0x1028564: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102855c: 0x102855c: addu  a0, s2, zero
+// 0x0102856c: 0x102856c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028560: 0x1028560: addu  a2, zero, zero
+// 0x01028570: 0x1028570: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028564: 0x1028564: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01028574: 0x1028574: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102856c: 0x102856c: addu  a0, s1, zero
+// 0x0102857c: 0x102857c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01028570: 0x1028570: jal   0x1098ec4 addu  a1, s2, zero
+// 0x01028580: 0x1028580: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028578: 0x1028578: lui   a0, 0x10000
+// 0x01028588: 0x1028588: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102857c: 0x102857c: addiu a0, a0, -27004
+// 0x0102858c: 0x102858c: addiu a0, a0, -27004
 	ldloc.1
 	ldc.i4 -27004
 	add
 	stloc.1
-// 0x01028580: 0x1028580: addu  a1, zero, zero
+// 0x01028590: 0x1028590: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028584: 0x1028584: addiu a2, zero, -2
+// 0x01028594: 0x1028594: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01028588: 0x1028588: addiu a3, zero, -1
+// 0x01028598: 0x1028598: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102858c: 0x102858c: jal   0x1093a24 sw    s8, 16(sp)
+// 0x0102859c: 0x102859c: jal   0x1094048 sw    s8, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10319,12 +10319,12 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028594: 0x1028594: jal   0x1026c80 addu  s2, v0, zero
+// 0x010285a4: 0x10285a4: jal   0x1026c90 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -10332,36 +10332,36 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c80(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102859c: 0x102859c: xori  v0, v0, 1
+// 0x010285ac: 0x10285ac: xori  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	xor
 	stloc 5
-// 0x010285a0: 0x10285a0: lui   a0, 0x10000
+// 0x010285b0: 0x10285b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010285a4: 0x10285a4: addiu a2, zero, 16
+// 0x010285b4: 0x10285b4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010285a8: 0x10285a8: addu  a3, s5, zero
+// 0x010285b8: 0x10285b8: addu  a3, s5, zero
 	ldloc 17
 	stloc 4
-// 0x010285ac: 0x10285ac: addiu a0, a0, -28756
+// 0x010285bc: 0x10285bc: addiu a0, a0, -28756
 	ldloc.1
 	ldc.i4 -28756
 	add
 	stloc.1
-// 0x010285b0: 0x10285b0: sltiu a1, v0, 1
+// 0x010285c0: 0x10285c0: sltiu a1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x010285b4: 0x10285b4: sw    zero, 16(sp)
+// 0x010285c4: 0x10285c4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10370,7 +10370,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010285b8: 0x10285b8: sw    zero, 20(sp)
+// 0x010285c8: 0x10285c8: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10379,7 +10379,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010285bc: 0x10285bc: jal   0x109c14c sw    s7, 24(sp)
+// 0x010285cc: 0x10285cc: jal   0x109c794 sw    s7, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10393,18 +10393,18 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010285c4: 0x10285c4: addu  a1, v0, zero
+// 0x010285d4: 0x10285d4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010285c8: 0x10285c8: addu  a0, s2, zero
+// 0x010285d8: 0x10285d8: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010285cc: 0x10285cc: jal   0x1098ec4 sw    v0, 4(s4)
+// 0x010285dc: 0x10285dc: jal   0x109950c sw    v0, 4(s4)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -10415,26 +10415,26 @@ L_1028228:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010285d4: 0x10285d4: addiu a3, zero, 14
+// 0x010285e4: 0x10285e4: addiu a3, zero, 14
 	ldc.i4.s 14
 	stloc 4
-// 0x010285d8: 0x10285d8: addu  a1, zero, zero
+// 0x010285e8: 0x10285e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010285dc: 0x10285dc: addiu a2, zero, 10
+// 0x010285ec: 0x10285ec: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010285e0: 0x10285e0: addiu a0, s6, -27036
+// 0x010285f0: 0x10285f0: addiu a0, s6, -27036
 	ldloc 18
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010285e4: 0x10285e4: jal   0x1093a24 sw    zero, 16(sp)
+// 0x010285f4: 0x10285f4: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10448,21 +10448,21 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010285ec: 0x10285ec: addu  a0, v0, zero
+// 0x010285fc: 0x10285fc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010285f0: 0x10285f0: addu  a2, zero, zero
+// 0x01028600: 0x1028600: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010285f4: 0x10285f4: addu  a1, zero, zero
+// 0x01028604: 0x1028604: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010285f8: 0x10285f8: jal   0x1098fe0 sw    v0, 36(sp)
+// 0x01028608: 0x1028608: jal   0x1099628 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10474,9 +10474,9 @@ L_1028228:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028600: 0x1028600: lw    v0, 36(sp)
+// 0x01028610: 0x1028610: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10485,23 +10485,23 @@ L_1028228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028604: 0x1028604: addu  a0, s2, zero
+// 0x01028614: 0x1028614: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028608: 0x1028608: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01028618: 0x1028618: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028610: 0x1028610: lui   a0, 0x10000
+// 0x01028620: 0x1028620: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028614: 0x1028614: jal   0x101cd60 addiu a0, a0, -26980
+// 0x01028624: 0x1028624: jal   0x101cd70 addiu a0, a0, -26980
 	ldloc.1
 	ldc.i4 -26980
 	add
@@ -10511,26 +10511,26 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102861c: 0x102861c: lui   a0, 0x10000
+// 0x0102862c: 0x102862c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028620: 0x1028620: addiu a3, zero, 152
+// 0x01028630: 0x1028630: addiu a3, zero, 152
 	ldc.i4 152
 	stloc 4
-// 0x01028624: 0x1028624: addiu a2, zero, 14
+// 0x01028634: 0x1028634: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01028628: 0x1028628: addiu a0, a0, -26960
+// 0x01028638: 0x1028638: addiu a0, a0, -26960
 	ldloc.1
 	ldc.i4 -26960
 	add
 	stloc.1
-// 0x0102862c: 0x102862c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0102863c: 0x102863c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -10538,33 +10538,33 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028634: 0x1028634: addu  a1, v0, zero
+// 0x01028644: 0x1028644: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028638: 0x1028638: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028648: 0x1028648: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028640: 0x1028640: lui   v1, 0x0
+// 0x01028650: 0x1028650: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01028644: 0x1028644: addiu a0, v1, 32244
+// 0x01028654: 0x1028654: addiu a0, v1, 32244
 	ldloc 6
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01028648: 0x1028648: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01028658: 0x1028658: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -10572,69 +10572,69 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028650: 0x1028650: addu  a1, v0, zero
+// 0x01028660: 0x1028660: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028654: 0x1028654: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028664: 0x1028664: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102865c: 0x102865c: addu  a0, s2, zero
+// 0x0102866c: 0x102866c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028660: 0x1028660: addu  a2, zero, zero
+// 0x01028670: 0x1028670: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028664: 0x1028664: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01028674: 0x1028674: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102866c: 0x102866c: addu  a0, s1, zero
+// 0x0102867c: 0x102867c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01028670: 0x1028670: jal   0x1098ec4 addu  a1, s2, zero
+// 0x01028680: 0x1028680: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028678: 0x1028678: lui   a0, 0x10000
+// 0x01028688: 0x1028688: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102867c: 0x102867c: addiu a0, a0, -26940
+// 0x0102868c: 0x102868c: addiu a0, a0, -26940
 	ldloc.1
 	ldc.i4 -26940
 	add
 	stloc.1
-// 0x01028680: 0x1028680: addu  a1, zero, zero
+// 0x01028690: 0x1028690: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028684: 0x1028684: addiu a2, zero, -2
+// 0x01028694: 0x1028694: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01028688: 0x1028688: addiu a3, zero, -1
+// 0x01028698: 0x1028698: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102868c: 0x102868c: jal   0x1093a24 sw    s8, 16(sp)
+// 0x0102869c: 0x102869c: jal   0x1094048 sw    s8, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10648,12 +10648,12 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028694: 0x1028694: jal   0x1026c80 addu  s2, v0, zero
+// 0x010286a4: 0x10286a4: jal   0x1026c90 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -10661,36 +10661,36 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c80(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102869c: 0x102869c: xori  v0, v0, 2
+// 0x010286ac: 0x10286ac: xori  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	xor
 	stloc 5
-// 0x010286a0: 0x10286a0: lui   a0, 0x10000
+// 0x010286b0: 0x10286b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010286a4: 0x10286a4: addiu a2, zero, 16
+// 0x010286b4: 0x10286b4: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010286a8: 0x10286a8: addu  a3, s5, zero
+// 0x010286b8: 0x10286b8: addu  a3, s5, zero
 	ldloc 17
 	stloc 4
-// 0x010286ac: 0x10286ac: addiu a0, a0, -31172
+// 0x010286bc: 0x10286bc: addiu a0, a0, -31172
 	ldloc.1
 	ldc.i4 -31172
 	add
 	stloc.1
-// 0x010286b0: 0x10286b0: sltiu a1, v0, 1
+// 0x010286c0: 0x10286c0: sltiu a1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x010286b4: 0x10286b4: sw    zero, 16(sp)
+// 0x010286c4: 0x10286c4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10699,7 +10699,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010286b8: 0x10286b8: sw    zero, 20(sp)
+// 0x010286c8: 0x10286c8: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10708,7 +10708,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010286bc: 0x10286bc: jal   0x109c14c sw    s7, 24(sp)
+// 0x010286cc: 0x10286cc: jal   0x109c794 sw    s7, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10722,18 +10722,18 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010286c4: 0x10286c4: addu  a1, v0, zero
+// 0x010286d4: 0x10286d4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010286c8: 0x10286c8: addu  a0, s2, zero
+// 0x010286d8: 0x10286d8: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010286cc: 0x10286cc: jal   0x1098ec4 sw    v0, 8(s4)
+// 0x010286dc: 0x10286dc: jal   0x109950c sw    v0, 8(s4)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -10744,26 +10744,26 @@ L_1028228:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010286d4: 0x10286d4: addiu a3, zero, 14
+// 0x010286e4: 0x10286e4: addiu a3, zero, 14
 	ldc.i4.s 14
 	stloc 4
-// 0x010286d8: 0x10286d8: addu  a1, zero, zero
+// 0x010286e8: 0x10286e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010286dc: 0x10286dc: addiu a2, zero, 10
+// 0x010286ec: 0x10286ec: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010286e0: 0x10286e0: addiu a0, s6, -27036
+// 0x010286f0: 0x10286f0: addiu a0, s6, -27036
 	ldloc 18
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010286e4: 0x10286e4: jal   0x1093a24 sw    zero, 16(sp)
+// 0x010286f4: 0x10286f4: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10777,21 +10777,21 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010286ec: 0x10286ec: addu  a0, v0, zero
+// 0x010286fc: 0x10286fc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010286f0: 0x10286f0: addu  a2, zero, zero
+// 0x01028700: 0x1028700: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010286f4: 0x10286f4: addu  a1, zero, zero
+// 0x01028704: 0x1028704: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010286f8: 0x10286f8: jal   0x1098fe0 sw    v0, 36(sp)
+// 0x01028708: 0x1028708: jal   0x1099628 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10803,9 +10803,9 @@ L_1028228:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028700: 0x1028700: lw    v0, 36(sp)
+// 0x01028710: 0x1028710: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10814,23 +10814,23 @@ L_1028228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028704: 0x1028704: addu  a0, s2, zero
+// 0x01028714: 0x1028714: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028708: 0x1028708: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01028718: 0x1028718: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028710: 0x1028710: lui   a0, 0x10000
+// 0x01028720: 0x1028720: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028714: 0x1028714: jal   0x101cd60 addiu a0, a0, -26912
+// 0x01028724: 0x1028724: jal   0x101cd70 addiu a0, a0, -26912
 	ldloc.1
 	ldc.i4 -26912
 	add
@@ -10840,26 +10840,26 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102871c: 0x102871c: lui   a0, 0x10000
+// 0x0102872c: 0x102872c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028720: 0x1028720: addiu a3, zero, 152
+// 0x01028730: 0x1028730: addiu a3, zero, 152
 	ldc.i4 152
 	stloc 4
-// 0x01028724: 0x1028724: addiu a2, zero, 14
+// 0x01028734: 0x1028734: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01028728: 0x1028728: addiu a0, a0, -26888
+// 0x01028738: 0x1028738: addiu a0, a0, -26888
 	ldloc.1
 	ldc.i4 -26888
 	add
 	stloc.1
-// 0x0102872c: 0x102872c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0102873c: 0x102873c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -10867,33 +10867,33 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028734: 0x1028734: addu  a1, v0, zero
+// 0x01028744: 0x1028744: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028738: 0x1028738: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028748: 0x1028748: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028740: 0x1028740: lui   v0, 0x0
+// 0x01028750: 0x1028750: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01028744: 0x1028744: addiu a0, v0, 32244
+// 0x01028754: 0x1028754: addiu a0, v0, 32244
 	ldloc 5
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01028748: 0x1028748: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01028758: 0x1028758: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -10901,76 +10901,76 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028750: 0x1028750: addu  a1, v0, zero
+// 0x01028760: 0x1028760: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028754: 0x1028754: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028764: 0x1028764: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102875c: 0x102875c: addu  a2, zero, zero
+// 0x0102876c: 0x102876c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01028760: 0x1028760: addu  a0, s2, zero
+// 0x01028770: 0x1028770: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028764: 0x1028764: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01028774: 0x1028774: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102876c: 0x102876c: addu  a1, s2, zero
+// 0x0102877c: 0x102877c: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x01028770: 0x1028770: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01028780: 0x1028780: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028778: 0x1028778: jal   0x1099098 addu  a0, s2, zero
+// 0x01028788: 0x1028788: jal   0x10996e0 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01028780: 0x1028780: lui   a0, 0x10000
+// 0x01028790: 0x1028790: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028784: 0x1028784: addiu a0, a0, -26868
+// 0x01028794: 0x1028794: addiu a0, a0, -26868
 	ldloc.1
 	ldc.i4 -26868
 	add
 	stloc.1
-// 0x01028788: 0x1028788: addu  a1, zero, zero
+// 0x01028798: 0x1028798: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102878c: 0x102878c: addiu a2, zero, -2
+// 0x0102879c: 0x102879c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01028790: 0x1028790: addiu a3, zero, -1
+// 0x010287a0: 0x10287a0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01028794: 0x1028794: jal   0x1093a24 sw    s8, 16(sp)
+// 0x010287a4: 0x10287a4: jal   0x1094048 sw    s8, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10984,12 +10984,12 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102879c: 0x102879c: jal   0x1026c80 addu  s2, v0, zero
+// 0x010287ac: 0x10287ac: jal   0x1026c90 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -10997,36 +10997,36 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c80(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010287a4: 0x10287a4: xori  v0, v0, 3
+// 0x010287b4: 0x10287b4: xori  v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	xor
 	stloc 5
-// 0x010287a8: 0x10287a8: lui   a0, 0x10000
+// 0x010287b8: 0x10287b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010287ac: 0x10287ac: addu  a3, s5, zero
+// 0x010287bc: 0x10287bc: addu  a3, s5, zero
 	ldloc 17
 	stloc 4
-// 0x010287b0: 0x10287b0: addiu a2, zero, 16
+// 0x010287c0: 0x10287c0: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010287b4: 0x10287b4: addiu a0, a0, -28764
+// 0x010287c4: 0x10287c4: addiu a0, a0, -28764
 	ldloc.1
 	ldc.i4 -28764
 	add
 	stloc.1
-// 0x010287b8: 0x10287b8: sltiu a1, v0, 1
+// 0x010287c8: 0x10287c8: sltiu a1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x010287bc: 0x10287bc: sw    s7, 24(sp)
+// 0x010287cc: 0x10287cc: sw    s7, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11035,7 +11035,7 @@ L_1028228:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010287c0: 0x10287c0: sw    zero, 16(sp)
+// 0x010287d0: 0x10287d0: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11044,7 +11044,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010287c4: 0x10287c4: jal   0x109c14c sw    zero, 20(sp)
+// 0x010287d4: 0x10287d4: jal   0x109c794 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11058,15 +11058,15 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010287cc: 0x10287cc: addu  a1, v0, zero
+// 0x010287dc: 0x10287dc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010287d0: 0x10287d0: sw    v0, 12(s4)
+// 0x010287e0: 0x10287e0: sw    v0, 12(s4)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -11075,31 +11075,31 @@ L_1028228:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010287d4: 0x10287d4: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010287e4: 0x10287e4: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010287dc: 0x10287dc: addiu a3, zero, 14
+// 0x010287ec: 0x10287ec: addiu a3, zero, 14
 	ldc.i4.s 14
 	stloc 4
-// 0x010287e0: 0x10287e0: addiu a0, s6, -27036
+// 0x010287f0: 0x10287f0: addiu a0, s6, -27036
 	ldloc 18
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010287e4: 0x10287e4: addu  a1, zero, zero
+// 0x010287f4: 0x10287f4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010287e8: 0x10287e8: addiu a2, zero, 10
+// 0x010287f8: 0x10287f8: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010287ec: 0x10287ec: jal   0x1093a24 sw    zero, 16(sp)
+// 0x010287fc: 0x10287fc: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11113,21 +11113,21 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010287f4: 0x10287f4: addu  a0, v0, zero
+// 0x01028804: 0x1028804: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010287f8: 0x10287f8: addu  a2, zero, zero
+// 0x01028808: 0x1028808: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010287fc: 0x10287fc: addu  a1, zero, zero
+// 0x0102880c: 0x102880c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028800: 0x1028800: jal   0x1098fe0 sw    v0, 36(sp)
+// 0x01028810: 0x1028810: jal   0x1099628 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11139,9 +11139,9 @@ L_1028228:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028808: 0x1028808: lw    v0, 36(sp)
+// 0x01028818: 0x1028818: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11150,23 +11150,23 @@ L_1028228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102880c: 0x102880c: addu  a0, s2, zero
+// 0x0102881c: 0x102881c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028810: 0x1028810: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01028820: 0x1028820: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028818: 0x1028818: lui   a0, 0x10000
+// 0x01028828: 0x1028828: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102881c: 0x102881c: jal   0x101cd60 addiu a0, a0, -26844
+// 0x0102882c: 0x102882c: jal   0x101cd70 addiu a0, a0, -26844
 	ldloc.1
 	ldc.i4 -26844
 	add
@@ -11176,26 +11176,26 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028824: 0x1028824: lui   a0, 0x10000
+// 0x01028834: 0x1028834: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028828: 0x1028828: addiu a3, zero, 152
+// 0x01028838: 0x1028838: addiu a3, zero, 152
 	ldc.i4 152
 	stloc 4
-// 0x0102882c: 0x102882c: addiu a2, zero, 14
+// 0x0102883c: 0x102883c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01028830: 0x1028830: addiu a0, a0, -26812
+// 0x01028840: 0x1028840: addiu a0, a0, -26812
 	ldloc.1
 	ldc.i4 -26812
 	add
 	stloc.1
-// 0x01028834: 0x1028834: jal   0x1098d10 addu  a1, v0, zero
+// 0x01028844: 0x1028844: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -11203,82 +11203,82 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102883c: 0x102883c: addu  a1, v0, zero
+// 0x0102884c: 0x102884c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028840: 0x1028840: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01028850: 0x1028850: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028848: 0x1028848: addu  a2, zero, zero
+// 0x01028858: 0x1028858: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102884c: 0x102884c: addu  a0, s2, zero
+// 0x0102885c: 0x102885c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01028850: 0x1028850: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01028860: 0x1028860: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028858: 0x1028858: addu  a0, s1, zero
+// 0x01028868: 0x1028868: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102885c: 0x102885c: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0102886c: 0x102886c: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028864: 0x1028864: addu  a1, s1, zero
+// 0x01028874: 0x1028874: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01028868: 0x1028868: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01028878: 0x1028878: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028870: 0x1028870: lui   a0, 0x10000
+// 0x01028880: 0x1028880: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028874: 0x1028874: addu  a1, zero, zero
+// 0x01028884: 0x1028884: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028878: 0x1028878: addiu a2, zero, -1
+// 0x01028888: 0x1028888: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0102887c: 0x102887c: addiu a3, zero, -1
+// 0x0102888c: 0x102888c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01028880: 0x1028880: addiu a0, a0, -26792
+// 0x01028890: 0x1028890: addiu a0, a0, -26792
 	ldloc.1
 	ldc.i4 -26792
 	add
 	stloc.1
-// 0x01028884: 0x1028884: jal   0x1093a24 sw    s3, 16(sp)
+// 0x01028894: 0x1028894: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11292,20 +11292,20 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102888c: 0x102888c: lui   a0, 0x10000
+// 0x0102889c: 0x102889c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028890: 0x1028890: addiu a0, a0, -26764
+// 0x010288a0: 0x10288a0: addiu a0, a0, -26764
 	ldloc.1
 	ldc.i4 -26764
 	add
 	stloc.1
-// 0x01028894: 0x1028894: jal   0x101cd60 addu  s1, v0, zero
+// 0x010288a4: 0x10288a4: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -11313,24 +11313,24 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102889c: 0x102889c: lui   a0, 0x10000
+// 0x010288ac: 0x10288ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010288a0: 0x10288a0: addiu a3, zero, 4240
+// 0x010288b0: 0x10288b0: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010288a4: 0x10288a4: addiu a2, zero, 14
+// 0x010288b4: 0x10288b4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010288a8: 0x10288a8: addu  a1, v0, zero
+// 0x010288b8: 0x10288b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010288ac: 0x10288ac: jal   0x1098d10 addiu a0, a0, -26696
+// 0x010288bc: 0x10288bc: jal   0x1099358 addiu a0, a0, -26696
 	ldloc.1
 	ldc.i4 -26696
 	add
@@ -11340,23 +11340,23 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010288b4: 0x10288b4: lui   v1, 0x10000
+// 0x010288c4: 0x10288c4: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010288b8: 0x10288b8: addiu a1, v1, -27176
+// 0x010288c8: 0x10288c8: addiu a1, v1, -27176
 	ldloc 6
 	ldc.i4 -27176
 	add
 	stloc.2
-// 0x010288bc: 0x10288bc: addu  a0, v0, zero
+// 0x010288cc: 0x10288cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010288c0: 0x10288c0: jal   0x1097af8 sw    v0, 36(sp)
+// 0x010288d0: 0x10288d0: jal   0x1098140 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11367,9 +11367,9 @@ L_1028228:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010288c8: 0x10288c8: lw    v0, 36(sp)
+// 0x010288d8: 0x10288d8: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11378,111 +11378,111 @@ L_1028228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010288cc: 0x10288cc: addu  a0, s1, zero
+// 0x010288dc: 0x10288dc: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010288d0: 0x10288d0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010288e0: 0x10288e0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010288d8: 0x10288d8: addu  a0, s1, zero
+// 0x010288e8: 0x10288e8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010288dc: 0x10288dc: addu  a2, zero, zero
+// 0x010288ec: 0x10288ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010288e0: 0x10288e0: jal   0x1098fe0 addu  a1, zero, zero
+// 0x010288f0: 0x10288f0: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010288e8: 0x10288e8: addu  a0, s0, zero
+// 0x010288f8: 0x10288f8: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x010288ec: 0x10288ec: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010288fc: 0x10288fc: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010288f4: 0x10288f4: jal   0x1026b54 sll   zero, zero, 0
+// 0x01028904: 0x1028904: jal   0x1026b64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_show_munching_1026b54(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_is_show_munching_1026b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010288fc: 0x10288fc: beq   v0, zero, 0x1028a4c sll   zero, zero, 0
+// 0x0102890c: 0x102890c: beq   v0, zero, 0x1028a5c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1028a4c
+	brfalse L_1028a5c
 // --- basic block ---
-// 0x01028904: 0x1028904: jal   0x1027a9c sll   zero, zero, 0
+// 0x01028914: 0x1028914: jal   0x1027aac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::T_60_1027a9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::T_60_1027aac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102890c: 0x102890c: addu  a1, v0, zero
+// 0x0102891c: 0x102891c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028910: 0x1028910: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01028920: 0x1028920: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028918: 0x1028918: lui   a0, 0x10000
+// 0x01028928: 0x1028928: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102891c: 0x102891c: lui   v0, 0x41100000
+// 0x0102892c: 0x102892c: lui   v0, 0x41100000
 	ldc.i4 1091567616
 	stloc 5
-// 0x01028920: 0x1028920: addiu a3, zero, -1
+// 0x01028930: 0x1028930: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01028924: 0x1028924: addiu a0, a0, -26664
+// 0x01028934: 0x1028934: addiu a0, a0, -26664
 	ldloc.1
 	ldc.i4 -26664
 	add
 	stloc.1
-// 0x01028928: 0x1028928: addu  a1, zero, zero
+// 0x01028938: 0x1028938: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102892c: 0x102892c: addiu a2, zero, -2
+// 0x0102893c: 0x102893c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01028930: 0x1028930: ori   v0, v0, 20620
+// 0x01028940: 0x1028940: ori   v0, v0, 20620
 	ldloc 5
 	ldc.i4 20620
 	or
 	stloc 5
-// 0x01028934: 0x1028934: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01028944: 0x1028944: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11496,29 +11496,29 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102893c: 0x102893c: addu  s1, v0, zero
+// 0x0102894c: 0x102894c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01028940: 0x1028940: lui   v1, 0x0
+// 0x01028950: 0x1028950: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01028944: 0x1028944: addu  a0, v0, zero
+// 0x01028954: 0x1028954: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01028948: 0x1028948: lui   v0, 0x0
+// 0x01028958: 0x1028958: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102894c: 0x102894c: addiu a1, v1, 31980
+// 0x0102895c: 0x102895c: addiu a1, v1, 31980
 	ldloc 6
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01028950: 0x1028950: jal   0x1098fe0 addiu a2, v0, 23008
+// 0x01028960: 0x1028960: jal   0x1099628 addiu a2, v0, 23008
 	ldloc 5
 	ldc.i4 23008
 	add
@@ -11526,12 +11526,12 @@ L_1028228:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028958: 0x1028958: lui   a0, 0x10000
+// 0x01028968: 0x1028968: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102895c: 0x102895c: jal   0x101cd60 addiu a0, a0, -26644
+// 0x0102896c: 0x102896c: jal   0x101cd70 addiu a0, a0, -26644
 	ldloc.1
 	ldc.i4 -26644
 	add
@@ -11541,26 +11541,26 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028964: 0x1028964: lui   a0, 0x10000
+// 0x01028974: 0x1028974: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028968: 0x1028968: addiu a2, zero, -1
+// 0x01028978: 0x1028978: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0102896c: 0x102896c: addiu a3, zero, 4240
+// 0x0102897c: 0x102897c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01028970: 0x1028970: addiu a0, a0, -26624
+// 0x01028980: 0x1028980: addiu a0, a0, -26624
 	ldloc.1
 	ldc.i4 -26624
 	add
 	stloc.1
-// 0x01028974: 0x1028974: jal   0x1098d10 addu  a1, v0, zero
+// 0x01028984: 0x1028984: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -11568,42 +11568,42 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102897c: 0x102897c: addu  a1, v0, zero
+// 0x0102898c: 0x102898c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028980: 0x1028980: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01028990: 0x1028990: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028988: 0x1028988: lui   a0, 0x10000
+// 0x01028998: 0x1028998: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102898c: 0x102898c: addiu a2, zero, 26
+// 0x0102899c: 0x102899c: addiu a2, zero, 26
 	ldc.i4.s 26
 	stloc.3
-// 0x01028990: 0x1028990: addu  a3, zero, zero
+// 0x010289a0: 0x10289a0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01028994: 0x1028994: addiu a0, a0, -28580
+// 0x010289a4: 0x10289a4: addiu a0, a0, -28580
 	ldloc.1
 	ldc.i4 -28580
 	add
 	stloc.1
-// 0x01028998: 0x1028998: addiu a1, zero, 1
+// 0x010289a8: 0x10289a8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0102899c: 0x102899c: sw    zero, 16(sp)
+// 0x010289ac: 0x10289ac: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11612,7 +11612,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010289a0: 0x10289a0: sw    zero, 20(sp)
+// 0x010289b0: 0x10289b0: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11621,7 +11621,7 @@ L_1028228:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010289a4: 0x10289a4: jal   0x109c14c sw    zero, 24(sp)
+// 0x010289b4: 0x10289b4: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11635,55 +11635,55 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010289ac: 0x10289ac: addu  a1, v0, zero
+// 0x010289bc: 0x10289bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010289b0: 0x10289b0: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010289c0: 0x10289c0: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010289b8: 0x10289b8: addu  a1, s1, zero
+// 0x010289c8: 0x10289c8: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x010289bc: 0x10289bc: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010289cc: 0x10289cc: jal   0x109950c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010289c4: 0x10289c4: lui   a0, 0x10000
+// 0x010289d4: 0x10289d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010289c8: 0x10289c8: addu  a1, zero, zero
+// 0x010289d8: 0x10289d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010289cc: 0x10289cc: addiu a2, zero, -1
+// 0x010289dc: 0x10289dc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010289d0: 0x10289d0: addiu a3, zero, -1
+// 0x010289e0: 0x10289e0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010289d4: 0x10289d4: addiu a0, a0, -26604
+// 0x010289e4: 0x10289e4: addiu a0, a0, -26604
 	ldloc.1
 	ldc.i4 -26604
 	add
 	stloc.1
-// 0x010289d8: 0x10289d8: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010289e8: 0x10289e8: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11697,20 +11697,20 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010289e0: 0x10289e0: lui   a0, 0x10000
+// 0x010289f0: 0x10289f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010289e4: 0x10289e4: addiu a0, a0, -26584
+// 0x010289f4: 0x10289f4: addiu a0, a0, -26584
 	ldloc.1
 	ldc.i4 -26584
 	add
 	stloc.1
-// 0x010289e8: 0x10289e8: jal   0x101cd60 addu  s1, v0, zero
+// 0x010289f8: 0x10289f8: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -11718,29 +11718,29 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010289f0: 0x10289f0: lui   v1, 0x100000
+// 0x01028a00: 0x1028a00: lui   v1, 0x100000
 	ldc.i4 1048576
 	stloc 6
-// 0x010289f4: 0x10289f4: lui   a0, 0x10000
+// 0x01028a04: 0x1028a04: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010289f8: 0x10289f8: ori   a3, v1, 4240
+// 0x01028a08: 0x1028a08: ori   a3, v1, 4240
 	ldloc 6
 	ldc.i4 4240
 	or
 	stloc 4
-// 0x010289fc: 0x10289fc: addiu a2, zero, 14
+// 0x01028a0c: 0x1028a0c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01028a00: 0x1028a00: addu  a1, v0, zero
+// 0x01028a10: 0x1028a10: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028a04: 0x1028a04: jal   0x1098d10 addiu a0, a0, -26480
+// 0x01028a14: 0x1028a14: jal   0x1099358 addiu a0, a0, -26480
 	ldloc.1
 	ldc.i4 -26480
 	add
@@ -11750,23 +11750,23 @@ L_1028228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028a0c: 0x1028a0c: lui   v1, 0x10000
+// 0x01028a1c: 0x1028a1c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01028a10: 0x1028a10: addiu a1, v1, -27176
+// 0x01028a20: 0x1028a20: addiu a1, v1, -27176
 	ldloc 6
 	ldc.i4 -27176
 	add
 	stloc.2
-// 0x01028a14: 0x1028a14: addu  a0, v0, zero
+// 0x01028a24: 0x1028a24: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01028a18: 0x1028a18: jal   0x1097af8 sw    v0, 36(sp)
+// 0x01028a28: 0x1028a28: jal   0x1098140 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11777,9 +11777,9 @@ L_1028228:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01028a20: 0x1028a20: lw    v0, 36(sp)
+// 0x01028a30: 0x1028a30: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11788,51 +11788,51 @@ L_1028228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028a24: 0x1028a24: addu  a0, s1, zero
+// 0x01028a34: 0x1028a34: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01028a28: 0x1028a28: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01028a38: 0x1028a38: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028a30: 0x1028a30: addu  a0, s1, zero
+// 0x01028a40: 0x1028a40: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01028a34: 0x1028a34: addu  a1, zero, zero
+// 0x01028a44: 0x1028a44: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028a38: 0x1028a38: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01028a48: 0x1028a48: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01028a40: 0x1028a40: addu  a0, s0, zero
+// 0x01028a50: 0x1028a50: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x01028a44: 0x1028a44: jal   0x1098ec4 addu  a1, s1, zero
+// 0x01028a54: 0x1028a54: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1028a4c:
-// 0x01028a4c: 0x1028a4c: lui   a0, 0x0
+L_1028a5c:
+// 0x01028a5c: 0x1028a5c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01028a50: 0x1028a50: jal   0x101cd60 addiu a0, a0, 32524
+// 0x01028a60: 0x1028a60: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -11842,15 +11842,15 @@ L_1028a4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028a58: 0x1028a58: addu  a1, v0, zero
+// 0x01028a68: 0x1028a68: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028a5c: 0x1028a5c: jal   0x109b434 addu  a0, s0, zero
+// 0x01028a6c: 0x1028a6c: jal   0x109ba7c addu  a0, s0, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -11858,28 +11858,28 @@ L_1028a4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028a64: 0x1028a64: lui   a1, 0x1020000
+// 0x01028a74: 0x1028a74: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x01028a68: 0x1028a68: addu  a0, s0, zero
+// 0x01028a78: 0x1028a78: addu  a0, s0, zero
 	ldloc 12
 	stloc.1
-// 0x01028a6c: 0x1028a6c: jal   0x1099174 addiu a1, a1, 25136
+// 0x01028a7c: 0x1028a7c: jal   0x10997bc addiu a1, a1, 25152
 	ldloc.2
-	ldc.i4 25136
+	ldc.i4 25152
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01028a74: 0x1028a74: lw    ra, 100(sp)
-// 0x01028a78: 0x1028a78: lw    s8, 96(sp)
+// 0x01028a84: 0x1028a84: lw    ra, 100(sp)
+// 0x01028a88: 0x1028a88: lw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11888,7 +11888,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01028a7c: 0x1028a7c: lw    s7, 92(sp)
+// 0x01028a8c: 0x1028a8c: lw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11897,7 +11897,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01028a80: 0x1028a80: lw    s6, 88(sp)
+// 0x01028a90: 0x1028a90: lw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11906,7 +11906,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01028a84: 0x1028a84: lw    s5, 84(sp)
+// 0x01028a94: 0x1028a94: lw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11915,7 +11915,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01028a88: 0x1028a88: lw    s4, 80(sp)
+// 0x01028a98: 0x1028a98: lw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11924,7 +11924,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01028a8c: 0x1028a8c: lw    s3, 76(sp)
+// 0x01028a9c: 0x1028a9c: lw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11933,7 +11933,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01028a90: 0x1028a90: lw    s2, 72(sp)
+// 0x01028aa0: 0x1028aa0: lw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11942,7 +11942,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01028a94: 0x1028a94: lw    s1, 68(sp)
+// 0x01028aa4: 0x1028aa4: lw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11951,7 +11951,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01028a98: 0x1028a98: lw    s0, 64(sp)
+// 0x01028aa8: 0x1028aa8: lw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -11960,7 +11960,7 @@ L_1028a4c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01028a9c: 0x1028a9c: jr    ra addiu sp, sp, 104
+// 0x01028aac: 0x1028aac: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
diff --git a/converted/Cibyl3.j b/converted/Cibyl3.j
index 6808477..b3fb663 100644
--- a/converted/Cibyl3.j
+++ b/converted/Cibyl3.j
@@ -99,12 +99,12 @@ __CIBYL_javamethod_begin:
 // 0x01003fd0: 0x1003fd0: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01003fd4: 0x1003fd4: lw    v0, 31152(s1)
+// 0x01003fd4: 0x1003fd4: lw    v0, 31616(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
@@ -146,7 +146,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01003ff4: 0x1003ff4: jal   0x100a028 sw    a1, 16(sp)
+// 0x01003ff4: 0x1003ff4: jal   0x100a038 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -156,15 +156,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl7::roadmap_point_db_id_100a028(int32)
+	call int32 Cibyl7::roadmap_point_db_id_100a038(int32)
 	stloc 6
 // --- basic block ---
-// 0x01003ffc: 0x1003ffc: lw    v1, 31152(s1)
+// 0x01003ffc: 0x1003ffc: lw    v1, 31616(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 9
@@ -195,13 +195,13 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01004010: 0x1004010: jal   0x100a028 andi  a0, a0, 32767
+// 0x01004010: 0x1004010: jal   0x100a038 andi  a0, a0, 32767
 	ldloc.1
 	ldc.i4 32767
 	and
 	stloc.1
 	ldloc.1
-	call int32 Cibyl7::roadmap_point_db_id_100a028(int32)
+	call int32 Cibyl7::roadmap_point_db_id_100a038(int32)
 	stloc 6
 // --- basic block ---
 // 0x01004018: 0x1004018: lw    a2, 20(sp)
@@ -303,11 +303,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004044: 0x1004044: jal   0x1041920 addu  a0, v0, zero
+// 0x01004044: 0x1004044: jal   0x1041930 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl48::roadmap_range_get_street_1041920(int32)
+	call int32 Cibyl48::roadmap_range_get_street_1041930(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -399,12 +399,12 @@ __CIBYL_javamethod_begin:
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01004064: 0x1004064: lw    v0, 31152(v0)
+// 0x01004064: 0x1004064: lw    v0, 31616(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
@@ -434,12 +434,12 @@ __CIBYL_javamethod_begin:
 // 0x01004078: 0x1004078: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0100407c: 0x100407c: lw    a0, 31228(a0)
+// 0x0100407c: 0x100407c: lw    a0, 31692(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.1
@@ -583,12 +583,12 @@ __CIBYL_javamethod_begin:
 // 0x010040cc: 0x10040cc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010040d0: 0x10040d0: lw    a2, 31240(v0)
+// 0x010040d0: 0x10040d0: lw    a2, 31704(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.3
@@ -720,7 +720,7 @@ L_1004120:
 	stloc 11
 	beq  L_1004140
 // --- basic block ---
-// 0x01004134: 0x1004134: jal   0x100ae78 sw    v0, 548(s5)
+// 0x01004134: 0x1004134: jal   0x100ae88 sw    v0, 548(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -734,7 +734,7 @@ L_1004120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
@@ -752,12 +752,12 @@ L_1004140:
 // 0x01004140: 0x1004140: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01004144: 0x1004144: lw    a0, 31240(v0)
+// 0x01004144: 0x1004144: lw    a0, 31704(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
@@ -852,7 +852,7 @@ L_1004140:
 	ldloc 6
 	add
 	stloc 6
-// 0x01004194: 0x1004194: jal   0x1008eb0 sw    v0, 24(sp)
+// 0x01004194: 0x1004194: jal   0x1008ec0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -866,7 +866,7 @@ L_1004140:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
@@ -960,12 +960,12 @@ L_10041d8:
 	ldc.i4 131072
 	stloc 6
 L_10041e0:
-// 0x010041e0: 0x10041e0: lw    v0, 31152(v0)
+// 0x010041e0: 0x10041e0: lw    v0, 31616(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 6
@@ -983,12 +983,12 @@ L_10041e0:
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x010041f0: 0x10041f0: lw    v1, 31228(v1)
+// 0x010041f0: 0x10041f0: lw    v1, 31692(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
@@ -1042,7 +1042,7 @@ L_10041e0:
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01004214: 0x1004214: jal   0x1008eb0 sw    v0, 28(sp)
+// 0x01004214: 0x1004214: jal   0x1008ec0 sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1056,7 +1056,7 @@ L_10041e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
@@ -1196,12 +1196,12 @@ __CIBYL_javamethod_begin:
 // 0x01004258: 0x1004258: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.0
-// 0x0100425c: 0x100425c: jr    ra sw    zero, 31176(v0)
+// 0x0100425c: 0x100425c: jr    ra sw    zero, 31640(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7794
+	ldc.i4 7910
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1348,12 +1348,12 @@ __CIBYL_javamethod_begin:
 // 0x010042a8: 0x10042a8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010042ac: 0x10042ac: lw    a0, 31156(v0)
+// 0x010042ac: 0x10042ac: lw    a0, 31620(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc.1
@@ -1430,12 +1430,12 @@ __CIBYL_javamethod_begin:
 // 0x01004310: 0x1004310: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004314: 0x1004314: lw    v0, 31156(v0)
+// 0x01004314: 0x1004314: lw    v0, 31620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc 5
@@ -1570,13 +1570,13 @@ L_1004398:
 	add
 	stloc.0
 // 0x0100439c: 0x100439c: sw    ra, 20(sp)
-// 0x010043a0: 0x10043a0: jal   0x104c564 sll   zero, zero, 0
+// 0x010043a0: 0x10043a0: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -1587,7 +1587,7 @@ L_1004398:
 // 0x010043ac: 0x10043ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010043b0: 0x10043b0: jal   0x104da04 addiu a1, a1, 22460
+// 0x010043b0: 0x10043b0: jal   0x104da14 addiu a1, a1, 22460
 	ldloc.2
 	ldc.i4 22460
 	add
@@ -1597,7 +1597,7 @@ L_1004398:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
@@ -1758,13 +1758,13 @@ __CIBYL_javamethod_begin:
 	add
 	stloc.0
 // 0x01004458: 0x1004458: sw    ra, 20(sp)
-// 0x0100445c: 0x100445c: jal   0x104c504 sll   zero, zero, 0
+// 0x0100445c: 0x100445c: jal   0x104c514 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
@@ -1824,7 +1824,7 @@ __CIBYL_javamethod_begin:
 	add
 	stloc.0
 // 0x01004478: 0x1004478: sw    ra, 28(sp)
-// 0x0100447c: 0x100447c: jal   0x1015c94 sw    a0, 16(sp)
+// 0x0100447c: 0x100447c: jal   0x1015ca4 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1833,7 +1833,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-	call int32 Cibyl16::roadmap_verbosity_1015c94()
+	call int32 Cibyl16::roadmap_verbosity_1015ca4()
 	stloc 5
 // --- basic block ---
 // 0x01004484: 0x1004484: lw    a0, 16(sp)
@@ -1871,7 +1871,7 @@ __CIBYL_function_return:
 .method public static int32 roadmap_log_100449c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s5,int32 s0,int32 s8,int32 s2,int32 s4,int32 s3,int32 s6,int32 s7,int32 ra,int32 lo,int32 ecb,int32 ear)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s5,int32 s4,int32 s2,int32 s3,int32 s6,int32 s8,int32 s7,int32 ra,int32 lo,int32 ecb,int32 ear)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -1879,16 +1879,16 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register s0
+// local  9 is register s0
 // local  8 is register s1
 // local 12 is register s2
-// local 14 is register s3
-// local 13 is register s4
-// local  9 is register s5
-// local 15 is register s6
+// local 13 is register s3
+// local 11 is register s4
+// local 10 is register s5
+// local 14 is register s6
 // local 16 is register s7
 // local  0 is register sp
-// local 11 is register s8
+// local 15 is register s8
 // local 17 is register ra
 // local 18 is register lo
 // local 19 is register ecb
@@ -1908,25 +1908,25 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 12
 	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
 	stloc 13
 	ldc.i4.s 0
-	stloc 9
+	stloc 11
 	ldc.i4.s 0
-	stloc 15
+	stloc 10
+	ldc.i4.s 0
+	stloc 14
 	ldc.i4.s 0
 	stloc 16
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 15
 	ldc.i4.s 0
 	stloc 17
 	ldc.i4.s 0
@@ -1944,131 +1944,123 @@ __CIBYL_javamethod_begin:
 	ldc.i4 -1392
 	add
 	stloc.0
-// 0x010044a0: 0x10044a0: slti  v0, a0, 5
-	ldloc.1
-	ldc.i4.5
-	clt
+// 0x010044a0: 0x10044a0: addiu v0, sp, 1408
+	ldloc.0
+	ldc.i4 1408
+	add
 	stloc 5
-// 0x010044a4: 0x10044a4: sw    s6, 1376(sp)
+// 0x010044a4: 0x10044a4: sw    s2, 1360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 344
+	ldc.i4 340
 	add
-	ldloc 15
+	ldloc 12
 	stelem.i4
-// 0x010044a8: 0x10044a8: sw    s4, 1368(sp)
+// 0x010044a8: 0x10044a8: sw    s0, 1352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 342
+	ldc.i4 338
 	add
-	ldloc 13
+	ldloc 9
 	stelem.i4
-// 0x010044ac: 0x10044ac: sw    s3, 1364(sp)
+// 0x010044ac: 0x10044ac: addu  s2, a3, zero
+	ldloc 4
+	stloc 12
+// 0x010044b0: 0x10044b0: addiu s0, sp, 344
+	ldloc.0
+	ldc.i4 344
+	add
+	stloc 9
+// 0x010044b4: 0x10044b4: sw    s6, 1376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 341
+	ldc.i4 344
 	add
 	ldloc 14
 	stelem.i4
-// 0x010044b0: 0x10044b0: sw    s2, 1360(sp)
+// 0x010044b8: 0x10044b8: sw    s3, 1364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 340
+	ldc.i4 341
 	add
-	ldloc 12
+	ldloc 13
 	stelem.i4
-// 0x010044b4: 0x10044b4: sw    ra, 1388(sp)
-// 0x010044b8: 0x10044b8: sw    s8, 1384(sp)
+// 0x010044bc: 0x10044bc: sw    s1, 1356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 346
+	ldc.i4 339
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x010044bc: 0x10044bc: sw    s7, 1380(sp)
+// 0x010044c0: 0x10044c0: addu  s3, a1, zero
+	ldloc.2
+	stloc 13
+// 0x010044c4: 0x10044c4: addu  s1, a0, zero
+	ldloc.1
+	stloc 8
+// 0x010044c8: 0x10044c8: addu  s6, a2, zero
+	ldloc.3
+	stloc 14
+// 0x010044cc: 0x10044cc: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x010044d0: 0x10044d0: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x010044d4: 0x10044d4: addiu a1, zero, 500
+	ldc.i4 500
+	stloc.2
+// 0x010044d8: 0x10044d8: addu  a2, s2, zero
+	ldloc 12
+	stloc.3
+// 0x010044dc: 0x10044dc: sw    ra, 1388(sp)
+// 0x010044e0: 0x10044e0: sw    s8, 1384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 345
+	ldc.i4 346
 	add
-	ldloc 16
+	ldloc 15
 	stelem.i4
-// 0x010044c0: 0x10044c0: sw    s5, 1372(sp)
+// 0x010044e4: 0x10044e4: sw    s7, 1380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 343
+	ldc.i4 345
 	add
-	ldloc 9
+	ldloc 16
 	stelem.i4
-// 0x010044c4: 0x10044c4: sw    s1, 1356(sp)
+// 0x010044e8: 0x10044e8: sw    s5, 1372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 339
+	ldc.i4 343
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-// 0x010044c8: 0x10044c8: sw    s0, 1352(sp)
+// 0x010044ec: 0x10044ec: sw    s4, 1368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 338
+	ldc.i4 342
 	add
-	ldloc 10
+	ldloc 11
 	stelem.i4
-// 0x010044cc: 0x10044cc: addu  s4, a0, zero
-	ldloc.1
-	stloc 13
-// 0x010044d0: 0x10044d0: addu  s3, a1, zero
-	ldloc.2
-	stloc 14
-// 0x010044d4: 0x10044d4: addu  s6, a2, zero
-	ldloc.3
-	stloc 15
-// 0x010044d8: 0x10044d8: bne   v0, zero, 0x10049a4 addu  s2, a3, zero
-	ldloc 5
-	ldloc 4
-	stloc 12
-	brtrue L_10049a4
-// --- basic block ---
-// 0x010044e0: 0x10044e0: addiu v0, sp, 1408
-	ldloc.0
-	ldc.i4 1408
-	add
-	stloc 5
-// 0x010044e4: 0x10044e4: addiu s1, sp, 344
-	ldloc.0
-	ldc.i4 344
-	add
-	stloc 8
-// 0x010044e8: 0x10044e8: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x010044ec: 0x10044ec: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x010044f0: 0x10044f0: addiu a1, zero, 500
-	ldc.i4 500
-	stloc.2
-// 0x010044f4: 0x10044f4: addu  a2, s2, zero
-	ldloc 12
-	stloc.3
-// 0x010044f8: 0x10044f8: sw    zero, 44(sp)
+// 0x010044f0: 0x10044f0: sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2077,7 +2069,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010044fc: 0x10044fc: jal   0x10c0a70 sw    v0, 48(sp)
+// 0x010044f4: 0x10044f4: jal   0x10c10b0 sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2091,68 +2083,68 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004504: 0x1004504: lui   v0, 0x20000
+// 0x010044fc: 0x10044fc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004508: 0x1004508: lw    v0, 31164(v0)
+// 0x01004500: 0x1004500: lw    v0, 31628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7791
+	ldc.i4 7907
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100450c: 0x100450c: addiu v1, zero, 1
+// 0x01004504: 0x1004504: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01004510: 0x1004510: bne   v0, v1, 0x1004524 lui   v0, 0x20000
+// 0x01004508: 0x1004508: bne   v0, v1, 0x100451c lui   v0, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc 5
-	bne.un L_1004524
+	bne.un L_100451c
 // --- basic block ---
-// 0x01004518: 0x1004518: lui   a0, 0x0
+// 0x01004510: 0x1004510: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100451c: 0x100451c: j	 0x1004538 addiu a0, a0, 22536
+// 0x01004514: 0x1004514: j	 0x1004530 addiu a0, a0, 22536
 	ldloc.1
 	ldc.i4 22536
 	add
 	stloc.1
-	br L_1004538
+	br L_1004530
 // --- basic block ---
-L_1004524:
-// 0x01004524: 0x1004524: lw    s5, 31172(v0)
+L_100451c:
+// 0x0100451c: 0x100451c: lw    s4, 31636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7793
+	ldc.i4 7909
 	add
 	ldelem.i4
-	stloc 9
-// 0x01004528: 0x1004528: sll   zero, zero, 0
-// 0x0100452c: 0x100452c: beq   s5, zero, 0x1004548 lui   a0, 0x0
-	ldloc 9
+	stloc 11
+// 0x01004520: 0x1004520: sll   zero, zero, 0
+// 0x01004524: 0x1004524: beq   s4, zero, 0x1004540 lui   a0, 0x0
+	ldloc 11
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1004548
+	brfalse L_1004540
 // --- basic block ---
-// 0x01004534: 0x1004534: addiu a0, a0, 22564
+// 0x0100452c: 0x100452c: addiu a0, a0, 22564
 	ldloc.1
 	ldc.i4 22564
 	add
 	stloc.1
-L_1004538:
-// 0x01004538: 0x1004538: jal   0x1000e78 addu  a1, s1, zero
-	ldloc 8
+L_1004530:
+// 0x01004530: 0x1004530: jal   0x1000e78 addu  a1, s0, zero
+	ldloc 9
 	stloc.2
 	ldloc.0
 	ldloc.1
@@ -2164,29 +2156,29 @@ L_1004538:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004540: 0x1004540: j	 0x10049a4 sll   zero, zero, 0
-	br L_10049a4
+// 0x01004538: 0x1004538: j	 0x10049b4 sll   zero, zero, 0
+	br L_10049b4
 // --- basic block ---
-L_1004548:
-// 0x01004548: 0x1004548: sw    v1, 31172(v0)
+L_1004540:
+// 0x01004540: 0x1004540: sw    v1, 31636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7793
+	ldc.i4 7909
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100454c: 0x100454c: lui   a0, 0x1000000
+// 0x01004544: 0x1004544: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x01004550: 0x1004550: addiu a0, a0, 17416
+// 0x01004548: 0x1004548: addiu a0, a0, 17416
 	ldloc.1
 	ldc.i4 17416
 	add
 	stloc.1
-L_1004554:
-// 0x01004554: 0x1004554: jal   0x1000120 addiu a1, sp, 44
+L_100454c:
+// 0x0100454c: 0x100454c: jal   0x1000120 addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -2196,102 +2188,101 @@ L_1004554:
 	ldloc.2
 	stloc 20
 // --- basic block ---
-// 0x0100455c: 0x100455c: lw    v0, 0(s5)
+// 0x01004554: 0x1004554: lw    v0, 0(s4)
 	ldloc 6
-	ldloc 9
+	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01004560: 0x1004560: sll   zero, zero, 0
-// 0x01004564: 0x1004564: beq   v0, zero, 0x10048fc sll   zero, zero, 0
+// 0x01004558: 0x1004558: sll   zero, zero, 0
+// 0x0100455c: 0x100455c: beq   v0, zero, 0x100490c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10048fc
+	brfalse L_100490c
 // --- basic block ---
-// 0x0100456c: 0x100456c: jal   0x1015ca4 sll   zero, zero, 0
-	call int32 Cibyl16::roadmap_debug_1015ca4()
+// 0x01004564: 0x1004564: jal   0x1015cb4 sll   zero, zero, 0
+	call int32 Cibyl16::roadmap_debug_1015cb4()
 	stloc 5
 // --- basic block ---
-// 0x01004574: 0x1004574: lb    v1, 0(v0)
+// 0x0100456c: 0x100456c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01004578: 0x1004578: sll   zero, zero, 0
-// 0x0100457c: 0x100457c: beq   v1, zero, 0x10045b0 lui   s0, 0x0
+// 0x01004570: 0x1004570: sll   zero, zero, 0
+// 0x01004574: 0x1004574: beq   v1, zero, 0x10045a8 lui   s0, 0x0
 	ldloc 7
 	ldc.i4.s 0
-	stloc 10
-	brfalse L_10045b0
+	stloc 9
+	brfalse L_10045a8
 // --- basic block ---
-// 0x01004584: 0x1004584: addu  a0, v0, zero
+// 0x0100457c: 0x100457c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01004588: 0x1004588: jal   0x1001b14 addu  a1, s3, zero
-	ldloc 14
+// 0x01004580: 0x1004580: jal   0x1001b14 addu  a1, s3, zero
+	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01004590: 0x1004590: beq   v0, zero, 0x10045b0 lui   s0, 0x0
+// 0x01004588: 0x1004588: beq   v0, zero, 0x10045a8 lui   s0, 0x0
 	ldloc 5
 	ldc.i4.s 0
-	stloc 10
-	brfalse L_10045b0
+	stloc 9
+	brfalse L_10045a8
 // --- basic block ---
-// 0x01004598: 0x1004598: j	 0x10049a4 sll   zero, zero, 0
-	br L_10049a4
+// 0x01004590: 0x1004590: j	 0x10049b4 sll   zero, zero, 0
+	br L_10049b4
 // --- basic block ---
-L_10045a0:
-// 0x010045a0: 0x10045a0: beq   v0, s4, 0x10045c4 sll   zero, zero, 0
+L_1004598:
+// 0x01004598: 0x1004598: beq   v0, s1, 0x10045bc sll   zero, zero, 0
 	ldloc 5
-	ldloc 13
-	beq  L_10045c4
+	ldloc 8
+	beq  L_10045bc
 // --- basic block ---
-// 0x010045a8: 0x10045a8: j	 0x10045b4 addiu s0, s0, 20
-	ldloc 10
+// 0x010045a0: 0x10045a0: j	 0x10045ac addiu s0, s0, 20
+	ldloc 9
 	ldc.i4.s 20
 	add
-	stloc 10
-	br L_10045b4
+	stloc 9
+	br L_10045ac
 // --- basic block ---
-L_10045b0:
-// 0x010045b0: 0x10045b0: addiu s0, s0, 208
-	ldloc 10
+L_10045a8:
+// 0x010045a8: 0x10045a8: addiu s0, s0, 208
+	ldloc 9
 	ldc.i4 208
 	add
-	stloc 10
-L_10045b4:
-// 0x010045b4: 0x10045b4: lw    v0, 0(s0)
+	stloc 9
+L_10045ac:
+// 0x010045ac: 0x10045ac: lw    v0, 0(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010045b8: 0x10045b8: sll   zero, zero, 0
-// 0x010045bc: 0x10045bc: bne   v0, zero, 0x10045a0 sll   zero, zero, 0
+// 0x010045b0: 0x10045b0: sll   zero, zero, 0
+// 0x010045b4: 0x10045b4: bne   v0, zero, 0x1004598 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10045a0
+	brtrue L_1004598
 // --- basic block ---
-L_10045c4:
-// 0x010045c4: 0x10045c4: lw    v0, 8(s0)
+L_10045bc:
+// 0x010045bc: 0x10045bc: lw    v0, 8(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.2
 	add
 	ldelem.i4
 	stloc 5
-// 0x010045c8: 0x10045c8: addiu v1, sp, 1408
+// 0x010045c0: 0x10045c0: addiu v1, sp, 1408
 	ldloc.0
 	ldc.i4 1408
 	add
 	stloc 7
-// 0x010045cc: 0x10045cc: beq   v0, zero, 0x10048fc sw    v1, 40(sp)
-	ldloc 5
+// 0x010045c4: 0x10045c4: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2300,87 +2291,91 @@ L_10045c4:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_10048fc
+// 0x010045c8: 0x10045c8: beq   v0, zero, 0x100490c addu  s7, s0, zero
+	ldloc 5
+	ldloc 9
+	stloc 16
+	brfalse L_100490c
 // --- basic block ---
-// 0x010045d4: 0x10045d4: lui   v0, 0x20000
+// 0x010045d0: 0x10045d0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010045d8: 0x10045d8: lw    v0, 31156(v0)
+// 0x010045d4: 0x10045d4: lw    v0, 31620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc 5
-// 0x010045dc: 0x10045dc: sll   zero, zero, 0
-// 0x010045e0: 0x10045e0: bne   v0, zero, 0x100470c lui   v0, 0x20000
+// 0x010045d8: 0x10045d8: sll   zero, zero, 0
+// 0x010045dc: 0x10045dc: bne   v0, zero, 0x1004708 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brtrue L_100470c
+	brtrue L_1004708
 // --- basic block ---
-// 0x010045e8: 0x10045e8: lui   v0, 0x20000
+// 0x010045e4: 0x10045e4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010045ec: 0x10045ec: lw    v0, 31168(v0)
+// 0x010045e8: 0x10045e8: lw    v0, 31632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7792
+	ldc.i4 7908
 	add
 	ldelem.i4
 	stloc 5
-// 0x010045f0: 0x10045f0: sll   zero, zero, 0
-// 0x010045f4: 0x10045f4: beq   v0, zero, 0x100460c lui   v0, 0x20000
+// 0x010045ec: 0x10045ec: sll   zero, zero, 0
+// 0x010045f0: 0x10045f0: beq   v0, zero, 0x1004608 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_100460c
+	brfalse L_1004608
 // --- basic block ---
-// 0x010045fc: 0x10045fc: lw    v0, 31160(v0)
+// 0x010045f8: 0x10045f8: lw    v0, 31624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7790
+	ldc.i4 7906
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004600: 0x1004600: sll   zero, zero, 0
-// 0x01004604: 0x1004604: beq   v0, zero, 0x100470c lui   v0, 0x20000
+// 0x010045fc: 0x10045fc: sll   zero, zero, 0
+// 0x01004600: 0x1004600: beq   v0, zero, 0x1004708 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_100470c
+	brfalse L_1004708
 // --- basic block ---
-L_100460c:
-// 0x0100460c: 0x100460c: addiu v1, zero, 1
+L_1004608:
+// 0x01004608: 0x1004608: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01004610: 0x1004610: lui   v0, 0x20000
+// 0x0100460c: 0x100460c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004614: 0x1004614: sw    v1, 31168(v0)
+// 0x01004610: 0x1004610: sw    v1, 31632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7792
+	ldc.i4 7908
 	add
 	ldloc 7
 	stelem.i4
-// 0x01004618: 0x1004618: lui   v0, 0x20000
+// 0x01004614: 0x1004614: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100461c: 0x100461c: jal   0x104c504 sw    zero, 31160(v0)
+// 0x01004618: 0x1004618: jal   0x104c514 sw    zero, 31624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7790
+	ldc.i4 7906
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2389,28 +2384,28 @@ L_100460c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004624: 0x1004624: lui   a1, 0x0
+// 0x01004620: 0x1004620: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004628: 0x1004628: lui   a2, 0x20000
+// 0x01004624: 0x1004624: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0100462c: 0x100462c: addu  a0, v0, zero
+// 0x01004628: 0x1004628: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01004630: 0x1004630: addiu a1, a1, 22444
+// 0x0100462c: 0x100462c: addiu a1, a1, 22444
 	ldloc.2
 	ldc.i4 22444
 	add
 	stloc.2
-// 0x01004634: 0x1004634: jal   0x104dac8 addiu a2, a2, 14484
+// 0x01004630: 0x1004630: jal   0x104dad8 addiu a2, a2, 14944
 	ldloc.3
-	ldc.i4 14484
+	ldc.i4 14944
 	add
 	stloc.3
 	ldloc.0
@@ -2418,41 +2413,41 @@ L_100460c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100463c: 0x100463c: lui   s1, 0x20000
+// 0x01004638: 0x1004638: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01004640: 0x1004640: addu  a0, v0, zero
+// 0x0100463c: 0x100463c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01004644: 0x1004644: beq   v0, zero, 0x1004708 sw    v0, 31156(s1)
+// 0x01004640: 0x1004640: beq   v0, zero, 0x1004704 sw    v0, 31620(s1)
 	ldloc 5
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1004708
+	brfalse L_1004704
 // --- basic block ---
-// 0x0100464c: 0x100464c: addu  a2, zero, zero
+// 0x01004648: 0x1004648: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01004650: 0x1004650: cibyl_sysc_arg 0x6
+// 0x0100464c: 0x100464c: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01004654: 0x1004654: cibyl_sysc 0x19d
+// 0x01004650: 0x1004650: cibyl_sysc 0x19d
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01004658: 0x1004658: addu  a2, v0, zero
+// 0x01004654: 0x1004654: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0100465c: 0x100465c: sw    a0, 1348(sp)
+// 0x01004658: 0x1004658: sw    a0, 1348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2461,7 +2456,7 @@ L_100460c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01004660: 0x1004660: jal   0x102c3f0 sw    a2, 1344(sp)
+// 0x0100465c: 0x100465c: jal   0x102c400 sw    a2, 1344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2475,12 +2470,12 @@ L_100460c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004668: 0x1004668: lw    a0, 1348(sp)
+// 0x01004664: 0x1004664: lw    a0, 1348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2489,10 +2484,10 @@ L_100460c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100466c: 0x100466c: lui   a1, 0x0
+// 0x01004668: 0x1004668: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004670: 0x1004670: lw    a2, 1344(sp)
+// 0x0100466c: 0x100466c: lw    a2, 1344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2501,12 +2496,12 @@ L_100460c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004674: 0x1004674: addiu a1, a1, 22616
+// 0x01004670: 0x1004670: addiu a1, a1, 22616
 	ldloc.2
 	ldc.i4 22616
 	add
 	stloc.2
-// 0x01004678: 0x1004678: jal   0x1000ef4 addu  a3, v0, zero
+// 0x01004674: 0x1004674: jal   0x1000ef4 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -2519,26 +2514,26 @@ L_100460c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004680: 0x1004680: jal   0x100e0c8 sll   zero, zero, 0
-	call int32 Cibyl10::roadmap_config_is_loaded_100e0c8()
+// 0x0100467c: 0x100467c: jal   0x100e0d8 sll   zero, zero, 0
+	call int32 Cibyl10::roadmap_config_is_loaded_100e0d8()
 	stloc 5
 // --- basic block ---
-// 0x01004688: 0x1004688: beq   v0, zero, 0x10046c0 lui   v0, 0x20000
+// 0x01004684: 0x1004684: beq   v0, zero, 0x10046bc lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10046c0
+	brfalse L_10046bc
 // --- basic block ---
-// 0x01004690: 0x1004690: lw    a0, 31156(s1)
+// 0x0100468c: 0x100468c: lw    a0, 31620(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc.1
-// 0x01004694: 0x1004694: jal   0x101d484 sw    a0, 1348(sp)
+// 0x01004690: 0x1004690: jal   0x101d494 sw    a0, 1348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2552,12 +2547,12 @@ L_100460c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100469c: 0x100469c: jal   0x10aa980 sw    v0, 1344(sp)
+// 0x01004698: 0x1004698: jal   0x10aafc8 sw    v0, 1344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2571,15 +2566,15 @@ L_100460c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_get_server_id_10aa980(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_get_server_id_10aafc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010046a4: 0x10046a4: lui   a1, 0x0
+// 0x010046a0: 0x10046a0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010046a8: 0x10046a8: lw    a0, 1348(sp)
+// 0x010046a4: 0x10046a4: lw    a0, 1348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2588,7 +2583,7 @@ L_100460c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010046ac: 0x10046ac: lw    a2, 1344(sp)
+// 0x010046a8: 0x10046a8: lw    a2, 1344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2597,12 +2592,12 @@ L_100460c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010046b0: 0x10046b0: addiu a1, a1, 22660
+// 0x010046ac: 0x10046ac: addiu a1, a1, 22660
 	ldloc.2
 	ldc.i4 22660
 	add
 	stloc.2
-// 0x010046b4: 0x10046b4: jal   0x1000ef4 addu  a3, v0, zero
+// 0x010046b0: 0x10046b0: jal   0x1000ef4 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -2615,33 +2610,33 @@ L_100460c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010046bc: 0x10046bc: lui   v0, 0x20000
+// 0x010046b8: 0x10046b8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10046c0:
-// 0x010046c0: 0x10046c0: lw    a0, 31156(v0)
+L_10046bc:
+// 0x010046bc: 0x10046bc: lw    a0, 31620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc.1
-// 0x010046c4: 0x10046c4: sll   zero, zero, 0
-// 0x010046c8: 0x10046c8: cibyl_sysc 0x1a2
+// 0x010046c0: 0x10046c0: sll   zero, zero, 0
+// 0x010046c4: 0x10046c4: cibyl_sysc 0x1a2
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_getDeviceVersion()
 	stloc 5
-// 0x010046cc: 0x10046cc: addu  a2, v0, zero
+// 0x010046c8: 0x10046c8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010046d0: 0x10046d0: cibyl_sysc 0x1c3
+// 0x010046cc: 0x10046cc: cibyl_sysc 0x1c3
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_getInternalMemoryLeft()
 	stloc 5
-// 0x010046d4: 0x10046d4: addu  s1, v0, zero
+// 0x010046d0: 0x10046d0: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010046d8: 0x10046d8: sw    a0, 1348(sp)
+// 0x010046d4: 0x10046d4: sw    a0, 1348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2650,7 +2645,7 @@ L_10046c0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010046dc: 0x10046dc: jal   0x104c504 sw    a2, 1344(sp)
+// 0x010046d8: 0x10046d8: jal   0x104c514 sw    a2, 1344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2664,23 +2659,23 @@ L_10046c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010046e4: 0x10046e4: addiu a3, zero, 1000
+// 0x010046e0: 0x10046e0: addiu a3, zero, 1000
 	ldc.i4 1000
 	stloc 4
-// 0x010046e8: 0x10046e8: div   s1, a3
+// 0x010046e4: 0x10046e4: div   s1, a3
 	ldloc 8
 	ldloc 4
 	div
 	stloc 18
-// 0x010046ec: 0x10046ec: lui   a1, 0x0
+// 0x010046e8: 0x10046e8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010046f0: 0x10046f0: lw    a0, 1348(sp)
+// 0x010046ec: 0x10046ec: lw    a0, 1348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2689,7 +2684,7 @@ L_10046c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010046f4: 0x10046f4: lw    a2, 1344(sp)
+// 0x010046f0: 0x10046f0: lw    a2, 1344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2698,15 +2693,15 @@ L_10046c0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010046f8: 0x10046f8: addiu a1, a1, 22688
+// 0x010046f4: 0x10046f4: addiu a1, a1, 22688
 	ldloc.2
 	ldc.i4 22688
 	add
 	stloc.2
-// 0x010046fc: 0x10046fc: mflo  lo
+// 0x010046f8: 0x10046f8: mflo  lo
 	ldloc 18
 	stloc 4
-// 0x01004700: 0x1004700: jal   0x1000ef4 sw    v0, 16(sp)
+// 0x010046fc: 0x10046fc: jal   0x1000ef4 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2725,30 +2720,30 @@ L_10046c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1004708:
-// 0x01004708: 0x1004708: lui   v0, 0x20000
+L_1004704:
+// 0x01004704: 0x1004704: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_100470c:
-// 0x0100470c: 0x100470c: lw    s7, 31156(v0)
+L_1004708:
+// 0x01004708: 0x1004708: lw    s8, 31620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
-	stloc 16
-// 0x01004710: 0x1004710: sll   zero, zero, 0
-// 0x01004714: 0x1004714: beq   s7, zero, 0x10048fc addiu a0, sp, 52
-	ldloc 16
+	stloc 15
+// 0x0100470c: 0x100470c: sll   zero, zero, 0
+// 0x01004710: 0x1004710: beq   s8, zero, 0x100490c addiu a0, sp, 52
+	ldloc 15
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.1
-	brfalse L_10048fc
+	brfalse L_100490c
 // --- basic block ---
-// 0x0100471c: 0x100471c: lw    s4, 40(sp)
+// 0x01004718: 0x1004718: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2756,50 +2751,51 @@ L_100470c:
 	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 13
-// 0x01004720: 0x1004720: sll   zero, zero, 0
-// 0x01004724: 0x1004724: cibyl_sysc_arg 0x4
+	stloc 11
+// 0x0100471c: 0x100471c: sll   zero, zero, 0
+// 0x01004720: 0x1004720: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01004728: 0x1004728: cibyl_sysc 0x1e9
+// 0x01004724: 0x1004724: cibyl_sysc 0x1e9
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0100472c: 0x100472c: addu  v1, v0, zero
+// 0x01004728: 0x1004728: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01004730: 0x1004730: jal   0x10c3558 addiu s8, zero, 48
-	ldc.i4.s 48
-	stloc 11
+// 0x0100472c: 0x100472c: jal   0x10c3b98 lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004738: 0x1004738: sb    s8, 72(sp)
+// 0x01004734: 0x1004734: addu  s5, v0, zero
+	ldloc 5
+	stloc 10
+// 0x01004738: 0x1004738: addiu v0, zero, 48
+	ldc.i4.s 48
+	stloc 5
+// 0x0100473c: 0x100473c: sb    v0, 72(sp)
 	ldloc.0
 	ldc.i4.s 72
 	add
-	ldloc 11
+	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100473c: 0x100473c: lw    a2, 12(v0)
+// 0x01004740: 0x1004740: lw    a2, 12(s5)
 	ldloc 6
-	ldloc 5
+	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.3
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004740: 0x1004740: addu  s5, v0, zero
-	ldloc 5
-	stloc 9
-// 0x01004744: 0x1004744: lui   s1, 0x20000
-	ldc.i4 131072
-	stloc 8
+// 0x01004744: 0x1004744: sll   zero, zero, 0
 // 0x01004748: 0x1004748: slti  v0, a2, 10
 	ldloc.3
 	ldc.i4.s 10
@@ -2810,9 +2806,9 @@ L_100470c:
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x01004750: 0x1004750: addiu a1, s1, -13884
+// 0x01004750: 0x1004750: addiu a1, s1, 19088
 	ldloc 8
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
 // 0x01004754: 0x1004754: jal   0x1000f64 addu  a0, a0, v0
@@ -2830,42 +2826,45 @@ L_100470c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100475c: 0x100475c: sb    s8, 64(sp)
+// 0x0100475c: 0x100475c: addiu v0, zero, 48
+	ldc.i4.s 48
+	stloc 5
+// 0x01004760: 0x1004760: sb    v0, 64(sp)
 	ldloc.0
 	ldc.i4.s 64
 	add
-	ldloc 11
+	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01004760: 0x1004760: lw    a2, 16(s5)
+// 0x01004764: 0x1004764: lw    a2, 16(s5)
 	ldloc 6
-	ldloc 9
+	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004764: 0x1004764: addiu a0, sp, 64
+// 0x01004768: 0x1004768: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x01004768: 0x1004768: slti  v0, a2, 9
+// 0x0100476c: 0x100476c: slti  v0, a2, 9
 	ldloc.3
 	ldc.i4.s 9
 	clt
 	stloc 5
-// 0x0100476c: 0x100476c: addiu a1, s1, -13884
+// 0x01004770: 0x1004770: addiu a1, s1, 19088
 	ldloc 8
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01004770: 0x1004770: addu  a0, a0, v0
+// 0x01004774: 0x1004774: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x01004774: 0x1004774: jal   0x1000f64 addiu a2, a2, 1
+// 0x01004778: 0x1004778: jal   0x1000f64 addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
@@ -2880,42 +2879,45 @@ L_100470c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100477c: 0x100477c: sb    s8, 56(sp)
+// 0x01004780: 0x1004780: addiu v0, zero, 48
+	ldc.i4.s 48
+	stloc 5
+// 0x01004784: 0x1004784: sb    v0, 56(sp)
 	ldloc.0
 	ldc.i4.s 56
 	add
-	ldloc 11
+	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01004780: 0x1004780: lw    a2, 20(s5)
+// 0x01004788: 0x1004788: lw    a2, 20(s5)
 	ldloc 6
-	ldloc 9
+	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004784: 0x1004784: addiu a0, sp, 56
+// 0x0100478c: 0x100478c: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x01004788: 0x1004788: slti  v0, a2, 110
+// 0x01004790: 0x1004790: slti  v0, a2, 110
 	ldloc.3
 	ldc.i4.s 110
 	clt
 	stloc 5
-// 0x0100478c: 0x100478c: addu  a0, a0, v0
+// 0x01004794: 0x1004794: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x01004790: 0x1004790: addiu a1, s1, -13884
+// 0x01004798: 0x1004798: addiu a1, s1, 19088
 	ldloc 8
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01004794: 0x1004794: jal   0x1000f64 addiu a2, a2, -100
+// 0x0100479c: 0x100479c: jal   0x1000f64 addiu a2, a2, -100
 	ldloc.3
 	ldc.i4.s -100
 	add
@@ -2930,19 +2932,19 @@ L_100470c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100479c: 0x100479c: addiu v1, sp, 80
+// 0x010047a4: 0x10047a4: addiu v1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 7
-// 0x010047a0: 0x10047a0: cibyl_sysc_arg 0x3
+// 0x010047a8: 0x10047a8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010047a4: 0x10047a4: cibyl_sysc 0x1ee
+// 0x010047ac: 0x10047ac: cibyl_sysc 0x1ee
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x010047a8: 0x10047a8: addu  v1, v0, zero
+// 0x010047b0: 0x10047b0: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010047ac: 0x10047ac: lw    s1, 84(sp)
+// 0x010047b4: 0x10047b4: lw    s1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2951,25 +2953,25 @@ L_100470c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010047b0: 0x10047b0: jal   0x104f848 addiu s5, sp, 844
+// 0x010047b8: 0x10047b8: jal   0x104f858 addiu s5, sp, 844
 	ldloc.0
 	ldc.i4 844
 	add
-	stloc 9
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_time_get_time_wseconds_104f848(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_time_get_time_wseconds_104f858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010047b8: 0x10047b8: addiu v1, zero, 32
+// 0x010047c0: 0x10047c0: addiu v1, zero, 32
 	ldc.i4.s 32
 	stloc 7
-// 0x010047bc: 0x10047bc: sw    s1, 16(sp)
+// 0x010047c4: 0x10047c4: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2978,7 +2980,7 @@ L_100470c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010047c0: 0x10047c0: sw    v1, 20(sp)
+// 0x010047c8: 0x10047c8: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2987,33 +2989,33 @@ L_100470c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010047c4: 0x10047c4: lw    v1, 16(s0)
+// 0x010047cc: 0x10047cc: lw    v1, 16(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldelem.i4
 	stloc 7
-// 0x010047c8: 0x10047c8: lui   a2, 0x0
+// 0x010047d0: 0x10047d0: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010047cc: 0x10047cc: addiu a2, a2, 22760
+// 0x010047d4: 0x10047d4: addiu a2, a2, 22760
 	ldloc.3
 	ldc.i4 22760
 	add
 	stloc.3
-// 0x010047d0: 0x10047d0: addu  a3, v0, zero
+// 0x010047d8: 0x10047d8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010047d4: 0x10047d4: addu  a0, s5, zero
-	ldloc 9
+// 0x010047dc: 0x10047dc: addu  a0, s5, zero
+	ldloc 10
 	stloc.1
-// 0x010047d8: 0x10047d8: addiu a1, zero, 500
+// 0x010047e0: 0x10047e0: addiu a1, zero, 500
 	ldc.i4 500
 	stloc.2
-// 0x010047dc: 0x10047dc: sw    v1, 24(sp)
+// 0x010047e4: 0x10047e4: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3022,27 +3024,24 @@ L_100470c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010047e0: 0x10047e0: sw    s3, 28(sp)
+// 0x010047e8: 0x10047e8: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
-	ldloc 14
+	ldloc 13
 	stelem.i4
-// 0x010047e4: 0x10047e4: sw    s6, 32(sp)
+// 0x010047ec: 0x10047ec: jal   0x1000f9c sw    s6, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 15
+	ldloc 14
 	stelem.i4
-// 0x010047e8: 0x10047e8: jal   0x1000f9c addiu s8, zero, 499
-	ldc.i4 499
-	stloc 11
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3053,26 +3052,38 @@ L_100470c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010047f0: 0x10047f0: subu  s8, s8, v0
-	ldloc 11
+// 0x010047f4: 0x10047f4: addiu v1, zero, 499
+	ldc.i4 499
+	stloc 7
+// 0x010047f8: 0x10047f8: subu  v1, v1, v0
+	ldloc 7
 	ldloc 5
 	sub
-	stloc 11
-// 0x010047f4: 0x10047f4: addu  a1, s8, zero
-	ldloc 11
+	stloc 7
+// 0x010047fc: 0x10047fc: addu  a1, v1, zero
+	ldloc 7
 	stloc.2
-// 0x010047f8: 0x10047f8: addu  a2, s2, zero
+// 0x01004800: 0x1004800: addu  a2, s2, zero
 	ldloc 12
 	stloc.3
-// 0x010047fc: 0x10047fc: addu  a3, s4, zero
-	ldloc 13
+// 0x01004804: 0x1004804: addu  a3, s4, zero
+	ldloc 11
 	stloc 4
-// 0x01004800: 0x1004800: addu  a0, s5, v0
-	ldloc 9
+// 0x01004808: 0x1004808: addu  a0, s5, v0
+	ldloc 10
 	ldloc 5
 	add
 	stloc.1
-// 0x01004804: 0x1004804: jal   0x10c0a70 addu  s1, v0, zero
+// 0x0100480c: 0x100480c: sw    v1, 1348(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 337
+	add
+	ldloc 7
+	stelem.i4
+// 0x01004810: 0x1004810: jal   0x10c10b0 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -3080,23 +3091,23 @@ L_100470c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100480c: 0x100480c: lui   a1, 0x10000
+// 0x01004818: 0x1004818: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01004810: 0x1004810: addu  a0, s5, zero
-	ldloc 9
+// 0x0100481c: 0x100481c: addu  a0, s5, zero
+	ldloc 10
 	stloc.1
-// 0x01004814: 0x1004814: addiu a1, a1, 19160
+// 0x01004820: 0x1004820: addiu a1, a1, 18632
 	ldloc.2
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc.2
-// 0x01004818: 0x1004818: jal   0x1001ac4 sw    v0, 1344(sp)
+// 0x01004824: 0x1004824: jal   0x1001ac4 sw    v0, 1344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3110,50 +3121,59 @@ L_100470c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01004820: 0x1004820: lw    v1, 1344(sp)
+// 0x0100482c: 0x100482c: lw    v1, 1348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 336
+	ldc.i4 337
 	add
 	ldelem.i4
 	stloc 7
-// 0x01004824: 0x1004824: sll   zero, zero, 0
-// 0x01004828: 0x1004828: sltu  s8, s8, v1
-	ldloc 11
+// 0x01004830: 0x1004830: lw    a3, 1344(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 336
+	add
+	ldelem.i4
+	stloc 4
+// 0x01004834: 0x1004834: sll   zero, zero, 0
+// 0x01004838: 0x1004838: sltu  v1, v1, a3
 	ldloc 7
+	ldloc 4
 	clt.un
-	stloc 11
-// 0x0100482c: 0x100482c: bne   s8, zero, 0x100483c addiu a2, zero, 500
-	ldloc 11
+	stloc 7
+// 0x0100483c: 0x100483c: bne   v1, zero, 0x100484c addiu a2, zero, 500
+	ldloc 7
 	ldc.i4 500
 	stloc.3
-	brtrue L_100483c
+	brtrue L_100484c
 // --- basic block ---
-// 0x01004834: 0x1004834: addu  s1, s1, v1
+// 0x01004844: 0x1004844: addu  s1, s1, a3
 	ldloc 8
-	ldloc 7
+	ldloc 4
 	add
 	stloc 8
-// 0x01004838: 0x1004838: addiu a2, s1, 1
+// 0x01004848: 0x1004848: addiu a2, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc.3
-L_100483c:
-// 0x0100483c: 0x100483c: addiu s1, sp, 844
+L_100484c:
+// 0x0100484c: 0x100484c: addiu s1, sp, 844
 	ldloc.0
 	ldc.i4 844
 	add
 	stloc 8
-// 0x01004840: 0x1004840: addu  a3, s7, zero
-	ldloc 16
+// 0x01004850: 0x1004850: addu  a3, s8, zero
+	ldloc 15
 	stloc 4
-// 0x01004844: 0x1004844: addu  a0, s1, zero
+// 0x01004854: 0x1004854: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01004848: 0x1004848: jal   0x1001da4 addiu a1, zero, 1
+// 0x01004858: 0x1004858: jal   0x1001da4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3166,18 +3186,18 @@ L_100483c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004850: 0x1004850: cibyl_sysc_arg 0x11
+// 0x01004860: 0x1004860: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x01004854: 0x1004854: cibyl_sysc 0x20e
+// 0x01004864: 0x1004864: cibyl_sysc 0x20e
 	call void [WazeWP7]Syscalls::NOPH_Logger_log(int32)
-// 0x01004858: 0x1004858: addu  v1, v0, zero
+// 0x01004868: 0x1004868: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0100485c: 0x100485c: addu  a0, s2, zero
+// 0x0100486c: 0x100486c: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x01004860: 0x1004860: jal   0x1000e10 addu  a1, s4, zero
-	ldloc 13
+// 0x01004870: 0x1004870: jal   0x1000e10 addu  a1, s4, zero
+	ldloc 11
 	stloc.2
 	ldloc.0
 	ldloc.1
@@ -3189,56 +3209,56 @@ L_100483c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004868: 0x1004868: lui   v0, 0x20000
+// 0x01004878: 0x1004878: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100486c: 0x100486c: lw    s5, 31180(v0)
+// 0x0100487c: 0x100487c: lw    s5, 31644(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7795
+	ldc.i4 7911
 	add
 	ldelem.i4
-	stloc 9
-// 0x01004870: 0x1004870: sll   zero, zero, 0
-// 0x01004874: 0x1004874: beq   s5, zero, 0x10048e8 lui   v0, 0x20000
-	ldloc 9
+	stloc 10
+// 0x01004880: 0x1004880: sll   zero, zero, 0
+// 0x01004884: 0x1004884: beq   s5, zero, 0x10048f8 lui   v0, 0x20000
+	ldloc 10
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10048e8
+	brfalse L_10048f8
 // --- basic block ---
-// 0x0100487c: 0x100487c: lw    v0, 12(s0)
+// 0x0100488c: 0x100488c: lw    v0, 12(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.3
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004880: 0x1004880: sll   zero, zero, 0
-// 0x01004884: 0x1004884: beq   v0, zero, 0x10048e8 lui   v0, 0x20000
+// 0x01004890: 0x1004890: sll   zero, zero, 0
+// 0x01004894: 0x1004894: beq   v0, zero, 0x10048f8 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10048e8
+	brfalse L_10048f8
 // --- basic block ---
-// 0x0100488c: 0x100488c: lui   a1, 0xfff0000
+// 0x0100489c: 0x100489c: lui   a1, 0xfff0000
 	ldc.i4 268369920
 	stloc.2
-// 0x01004890: 0x1004890: addu  a2, s2, zero
-	ldloc 12
-	stloc.3
-// 0x01004894: 0x1004894: ori   a1, a1, 65535
+// 0x010048a0: 0x10048a0: ori   a1, a1, 65535
 	ldloc.2
 	ldc.i4 65535
 	or
 	stloc.2
-// 0x01004898: 0x1004898: addu  a3, s4, zero
-	ldloc 13
+// 0x010048a4: 0x10048a4: addu  a2, s2, zero
+	ldloc 12
+	stloc.3
+// 0x010048a8: 0x10048a8: addu  a3, s4, zero
+	ldloc 11
 	stloc 4
-// 0x0100489c: 0x100489c: jal   0x10c0a70 addu  a0, s1, zero
+// 0x010048ac: 0x10048ac: jal   0x10c10b0 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3246,58 +3266,58 @@ L_100483c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010048a4: 0x10048a4: addiu s2, sp, 88
-	ldloc.0
-	ldc.i4.s 88
-	add
-	stloc 12
-// 0x010048a8: 0x10048a8: lw    a3, 16(s0)
+// 0x010048b4: 0x10048b4: lw    a3, 16(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldelem.i4
 	stloc 4
-// 0x010048ac: 0x10048ac: lui   a1, 0x0
+// 0x010048b8: 0x10048b8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010048b0: 0x10048b0: addiu a1, a1, 22784
+// 0x010048bc: 0x10048bc: addiu s0, sp, 88
+	ldloc.0
+	ldc.i4.s 88
+	add
+	stloc 9
+// 0x010048c0: 0x10048c0: addiu a1, a1, 22784
 	ldloc.2
 	ldc.i4 22784
 	add
 	stloc.2
-// 0x010048b4: 0x10048b4: addiu a2, zero, 32
+// 0x010048c4: 0x10048c4: addiu a2, zero, 32
 	ldc.i4.s 32
 	stloc.3
-// 0x010048b8: 0x10048b8: addu  a0, s2, zero
-	ldloc 12
+// 0x010048c8: 0x10048c8: addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x010048bc: 0x10048bc: sw    s3, 16(sp)
+// 0x010048cc: 0x10048cc: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 14
+	ldloc 13
 	stelem.i4
-// 0x010048c0: 0x10048c0: sw    s6, 20(sp)
+// 0x010048d0: 0x10048d0: sw    s6, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 15
+	ldloc 14
 	stelem.i4
-// 0x010048c4: 0x10048c4: jal   0x1000f64 sw    s1, 24(sp)
+// 0x010048d4: 0x10048d4: jal   0x1000f64 sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3316,24 +3336,24 @@ L_100483c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010048cc: 0x10048cc: jal   0x1000350 addu  a0, s2, zero
-	ldloc 12
+// 0x010048dc: 0x10048dc: jal   0x1000350 addu  a0, s0, zero
+	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl::puts_1000350(int32)
 	stloc 5
 // --- basic block ---
-// 0x010048d4: 0x10048d4: lui   a0, 0x0
+// 0x010048e4: 0x10048e4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010048d8: 0x10048d8: addiu a0, a0, 22804
+// 0x010048e8: 0x10048e8: addiu a0, a0, 22804
 	ldloc.1
 	ldc.i4 22804
 	add
 	stloc.1
-// 0x010048dc: 0x10048dc: jalr  s5 addu  a1, s2, zero
+// 0x010048ec: 0x10048ec: jalr  s5 addu  a1, s0, zero
+	ldloc 10
 	ldloc 9
-	ldloc 12
 	stloc.2
 	ldloc.0
 	ldloc.1
@@ -3345,20 +3365,20 @@ L_100483c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010048e4: 0x10048e4: lui   v0, 0x20000
+// 0x010048f4: 0x10048f4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10048e8:
-// 0x010048e8: 0x10048e8: lw    a0, 31156(v0)
+L_10048f8:
+// 0x010048f8: 0x10048f8: lw    a0, 31620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc.1
-// 0x010048ec: 0x10048ec: jal   0x1001e3c sll   zero, zero, 0
+// 0x010048fc: 0x10048fc: jal   0x1001e3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3369,12 +3389,12 @@ L_10048e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010048f4: 0x10048f4: addiu v0, sp, 1408
+// 0x01004904: 0x1004904: addiu v0, sp, 1408
 	ldloc.0
 	ldc.i4 1408
 	add
 	stloc 5
-// 0x010048f8: 0x10048f8: sw    v0, 40(sp)
+// 0x01004908: 0x1004908: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3383,12 +3403,12 @@ L_10048e8:
 	add
 	ldloc 5
 	stelem.i4
-L_10048fc:
-// 0x010048fc: 0x10048fc: sll   zero, zero, 0
-// 0x01004900: 0x1004900: Unknown instruction 0x0
-L_1004900:
-// 0x01004904: 0x1004904: sll   zero, zero, 0
-// 0x01004908: 0x1004908: lw    a1, 44(sp)
+L_100490c:
+// 0x0100490c: 0x100490c: sll   zero, zero, 0
+// 0x01004910: 0x1004910: Unknown instruction 0x0
+L_1004910:
+// 0x01004914: 0x1004914: sll   zero, zero, 0
+// 0x01004918: 0x1004918: lw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3397,54 +3417,54 @@ L_1004900:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100490c: 0x100490c: addiu v0, zero, -1
+// 0x0100491c: 0x100491c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01004910: 0x1004910: beq   a1, v0, 0x1004928 lui   v0, 0x20000
+// 0x01004920: 0x1004920: beq   a1, v0, 0x1004938 lui   v0, 0x20000
 	ldloc.2
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_1004928
+	beq  L_1004938
 // --- basic block ---
-// 0x01004918: 0x1004918: lw    v0, 31156(v0)
+// 0x01004928: 0x1004928: lw    v0, 31620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100491c: 0x100491c: sll   zero, zero, 0
-// 0x01004920: 0x1004920: bne   v0, zero, 0x100498c lui   v1, 0x20000
+// 0x0100492c: 0x100492c: sll   zero, zero, 0
+// 0x01004930: 0x1004930: bne   v0, zero, 0x100499c lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 7
-	brtrue L_100498c
+	brtrue L_100499c
 // --- basic block ---
-L_1004928:
-// 0x01004928: 0x1004928: lui   v0, 0x20000
+L_1004938:
+// 0x01004938: 0x1004938: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100492c: 0x100492c: lw    a2, 31156(v0)
+// 0x0100493c: 0x100493c: lw    a2, 31620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004930: 0x1004930: lui   a0, 0x0
+// 0x01004940: 0x1004940: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01004934: 0x1004934: addiu a0, a0, 22816
+// 0x01004944: 0x1004944: addiu a0, a0, 22816
 	ldloc.1
 	ldc.i4 22816
 	add
 	stloc.1
-// 0x01004938: 0x1004938: jal   0x1000e78 addiu a3, sp, 344
+// 0x01004948: 0x1004948: jal   0x1000e78 addiu a3, sp, 344
 	ldloc.0
 	ldc.i4 344
 	add
@@ -3459,10 +3479,10 @@ L_1004928:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004940: 0x1004940: addiu v0, zero, 12
+// 0x01004950: 0x1004950: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x01004944: 0x1004944: sw    v0, 16(sp)
+// 0x01004954: 0x1004954: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3471,42 +3491,42 @@ L_1004928:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01004948: 0x1004948: lui   a0, 0x0
+// 0x01004958: 0x1004958: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100494c: 0x100494c: lui   a1, 0x0
+// 0x0100495c: 0x100495c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004950: 0x1004950: lui   a3, 0x0
+// 0x01004960: 0x1004960: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004954: 0x1004954: lui   v0, 0x0
+// 0x01004964: 0x1004964: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01004958: 0x1004958: addiu v0, v0, 23008
+// 0x01004968: 0x1004968: addiu v0, v0, 23008
 	ldloc 5
 	ldc.i4 23008
 	add
 	stloc 5
-// 0x0100495c: 0x100495c: addiu a0, a0, 22884
+// 0x0100496c: 0x100496c: addiu a0, a0, 22884
 	ldloc.1
 	ldc.i4 22884
 	add
 	stloc.1
-// 0x01004960: 0x1004960: addiu a1, a1, 22892
+// 0x01004970: 0x1004970: addiu a1, a1, 22892
 	ldloc.2
 	ldc.i4 22892
 	add
 	stloc.2
-// 0x01004964: 0x1004964: addiu a3, a3, 23000
+// 0x01004974: 0x1004974: addiu a3, a3, 23000
 	ldloc 4
 	ldc.i4 23000
 	add
 	stloc 4
-// 0x01004968: 0x1004968: addiu a2, zero, 12
+// 0x01004978: 0x1004978: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0100496c: 0x100496c: jal   0x104c0cc sw    v0, 20(sp)
+// 0x0100497c: 0x100497c: jal   0x104c0dc sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3520,73 +3540,73 @@ L_1004928:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_custom_104c0cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_custom_104c0dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004974: 0x1004974: lui   v0, 0x20000
+// 0x01004984: 0x1004984: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004978: 0x1004978: addiu v1, zero, 1
+// 0x01004988: 0x1004988: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0100497c: 0x100497c: sw    v1, 31164(v0)
+// 0x0100498c: 0x100498c: sw    v1, 31628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7791
+	ldc.i4 7907
 	add
 	ldloc 7
 	stelem.i4
-// 0x01004980: 0x1004980: lui   v0, 0x20000
+// 0x01004990: 0x1004990: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004984: 0x1004984: j	 0x10049a4 sw    zero, 31172(v0)
+// 0x01004994: 0x1004994: j	 0x10049b4 sw    zero, 31636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7793
+	ldc.i4 7909
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10049a4
+	br L_10049b4
 // --- basic block ---
-L_100498c:
-// 0x0100498c: 0x100498c: lw    v0, 12(s0)
+L_100499c:
+// 0x0100499c: 0x100499c: lw    v0, 12(s7)
 	ldloc 6
-	ldloc 10
+	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldc.i4.3
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004990: 0x1004990: sll   zero, zero, 0
-// 0x01004994: 0x1004994: beq   v0, zero, 0x10049a4 sw    zero, 31172(v1)
+// 0x010049a0: 0x10049a0: sll   zero, zero, 0
+// 0x010049a4: 0x10049a4: beq   v0, zero, 0x10049b4 sw    zero, 31636(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7793
+	ldc.i4 7909
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10049a4
+	brfalse L_10049b4
 // --- basic block ---
-// 0x0100499c: 0x100499c: jal   0x1000ac0 addiu a0, zero, 1
+// 0x010049ac: 0x10049ac: jal   0x1000ac0 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
 	call int32 Cibyl::exit_1000ac0(int32)
 	stloc 5
 // --- basic block ---
-L_10049a4:
-// 0x010049a4: 0x10049a4: lw    ra, 1388(sp)
-// 0x010049a8: 0x10049a8: lw    s8, 1384(sp)
+L_10049b4:
+// 0x010049b4: 0x10049b4: lw    ra, 1388(sp)
+// 0x010049b8: 0x10049b8: lw    s8, 1384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3594,8 +3614,8 @@ L_10049a4:
 	ldc.i4 346
 	add
 	ldelem.i4
-	stloc 11
-// 0x010049ac: 0x10049ac: lw    s7, 1380(sp)
+	stloc 15
+// 0x010049bc: 0x10049bc: lw    s7, 1380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3604,7 +3624,7 @@ L_10049a4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010049b0: 0x10049b0: lw    s6, 1376(sp)
+// 0x010049c0: 0x10049c0: lw    s6, 1376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3612,8 +3632,8 @@ L_10049a4:
 	ldc.i4 344
 	add
 	ldelem.i4
-	stloc 15
-// 0x010049b4: 0x10049b4: lw    s5, 1372(sp)
+	stloc 14
+// 0x010049c4: 0x10049c4: lw    s5, 1372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3621,8 +3641,8 @@ L_10049a4:
 	ldc.i4 343
 	add
 	ldelem.i4
-	stloc 9
-// 0x010049b8: 0x10049b8: lw    s4, 1368(sp)
+	stloc 10
+// 0x010049c8: 0x10049c8: lw    s4, 1368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3630,8 +3650,8 @@ L_10049a4:
 	ldc.i4 342
 	add
 	ldelem.i4
-	stloc 13
-// 0x010049bc: 0x10049bc: lw    s3, 1364(sp)
+	stloc 11
+// 0x010049cc: 0x10049cc: lw    s3, 1364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3639,8 +3659,8 @@ L_10049a4:
 	ldc.i4 341
 	add
 	ldelem.i4
-	stloc 14
-// 0x010049c0: 0x10049c0: lw    s2, 1360(sp)
+	stloc 13
+// 0x010049d0: 0x10049d0: lw    s2, 1360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3649,7 +3669,7 @@ L_10049a4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010049c4: 0x10049c4: lw    s1, 1356(sp)
+// 0x010049d4: 0x10049d4: lw    s1, 1356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3658,7 +3678,7 @@ L_10049a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010049c8: 0x10049c8: lw    s0, 1352(sp)
+// 0x010049d8: 0x10049d8: lw    s0, 1352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3666,8 +3686,8 @@ L_10049a4:
 	ldc.i4 338
 	add
 	ldelem.i4
-	stloc 10
-// 0x010049cc: 0x10049cc: jr    ra addiu sp, sp, 1392
+	stloc 9
+// 0x010049dc: 0x10049dc: jr    ra addiu sp, sp, 1392
 	ldloc.0
 	ldc.i4 1392
 	add
@@ -3679,7 +3699,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_log_close_log_file_10049d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_log_close_log_file_10049e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -3717,18 +3737,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010049d4: 0x10049d4: addiu sp, sp, -24
+// 0x010049e4: 0x10049e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010049d8: 0x10049d8: lui   a1, 0x0
+// 0x010049e8: 0x10049e8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010049dc: 0x10049dc: lui   a3, 0x0
+// 0x010049ec: 0x10049ec: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010049e0: 0x10049e0: sw    s0, 16(sp)
+// 0x010049f0: 0x10049f0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3737,24 +3757,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010049e4: 0x10049e4: addiu a0, zero, 1
+// 0x010049f4: 0x10049f4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010049e8: 0x10049e8: addiu a1, a1, 23016
+// 0x010049f8: 0x10049f8: addiu a1, a1, 23016
 	ldloc.2
 	ldc.i4 23016
 	add
 	stloc.2
-// 0x010049ec: 0x10049ec: addiu a3, a3, 23040
+// 0x010049fc: 0x10049fc: addiu a3, a3, 23040
 	ldloc 4
 	ldc.i4 23040
 	add
 	stloc 4
-// 0x010049f0: 0x10049f0: addiu a2, zero, 607
+// 0x01004a00: 0x1004a00: addiu a2, zero, 607
 	ldc.i4 607
 	stloc.3
-// 0x010049f4: 0x10049f4: sw    ra, 20(sp)
-// 0x010049f8: 0x10049f8: jal   0x100449c lui   s0, 0x20000
+// 0x01004a04: 0x1004a04: sw    ra, 20(sp)
+// 0x01004a08: 0x1004a08: jal   0x100449c lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 6
 	ldloc.0
@@ -3767,21 +3787,21 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01004a00: 0x1004a00: lw    a0, 31156(s0)
+// 0x01004a10: 0x1004a10: lw    a0, 31620(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldelem.i4
 	stloc.1
-// 0x01004a04: 0x1004a04: sll   zero, zero, 0
-// 0x01004a08: 0x1004a08: beq   a0, zero, 0x1004a28 sll   zero, zero, 0
+// 0x01004a14: 0x1004a14: sll   zero, zero, 0
+// 0x01004a18: 0x1004a18: beq   a0, zero, 0x1004a38 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1004a28
+	brfalse L_1004a38
 // --- basic block ---
-// 0x01004a10: 0x1004a10: jal   0x10023b4 sll   zero, zero, 0
+// 0x01004a20: 0x1004a20: jal   0x10023b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3792,33 +3812,33 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01004a18: 0x1004a18: addiu v1, zero, 1
+// 0x01004a28: 0x1004a28: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01004a1c: 0x1004a1c: lui   v0, 0x20000
+// 0x01004a2c: 0x1004a2c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01004a20: 0x1004a20: sw    v1, 31160(v0)
+// 0x01004a30: 0x1004a30: sw    v1, 31624(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7790
+	ldc.i4 7906
 	add
 	ldloc 8
 	stelem.i4
-// 0x01004a24: 0x1004a24: sw    zero, 31156(s0)
+// 0x01004a34: 0x1004a34: sw    zero, 31620(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7789
+	ldc.i4 7905
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1004a28:
-// 0x01004a28: 0x1004a28: lw    ra, 20(sp)
-// 0x01004a2c: 0x1004a2c: lw    s0, 16(sp)
+L_1004a38:
+// 0x01004a38: 0x1004a38: lw    ra, 20(sp)
+// 0x01004a3c: 0x1004a3c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3827,7 +3847,7 @@ L_1004a28:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01004a30: 0x1004a30: jr    ra addiu sp, sp, 24
+// 0x01004a40: 0x1004a40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3839,7 +3859,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3874,33 +3894,33 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01004a38: 0x1004a38: addiu sp, sp, -24
+// 0x01004a48: 0x1004a48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01004a3c: 0x1004a3c: sw    ra, 20(sp)
-// 0x01004a40: 0x1004a40: bne   a2, zero, 0x1004a60 addu  v0, a1, zero
+// 0x01004a4c: 0x1004a4c: sw    ra, 20(sp)
+// 0x01004a50: 0x1004a50: bne   a2, zero, 0x1004a70 addu  v0, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 5
-	brtrue L_1004a60
+	brtrue L_1004a70
 // --- basic block ---
-// 0x01004a48: 0x1004a48: lui   a3, 0x0
+// 0x01004a58: 0x1004a58: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004a4c: 0x1004a4c: addu  a1, a0, zero
+// 0x01004a5c: 0x1004a5c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x01004a50: 0x1004a50: addu  a2, v0, zero
+// 0x01004a60: 0x1004a60: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01004a54: 0x1004a54: addiu a3, a3, 22224
+// 0x01004a64: 0x1004a64: addiu a3, a3, 22224
 	ldloc 4
 	ldc.i4 22224
 	add
 	stloc 4
-// 0x01004a58: 0x1004a58: jal   0x100449c addiu a0, zero, 5
+// 0x01004a68: 0x1004a68: jal   0x100449c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -3913,10 +3933,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1004a60:
-// 0x01004a60: 0x1004a60: lw    ra, 20(sp)
-// 0x01004a64: 0x1004a64: sll   zero, zero, 0
-// 0x01004a68: 0x1004a68: jr    ra addiu sp, sp, 24
+L_1004a70:
+// 0x01004a70: 0x1004a70: lw    ra, 20(sp)
+// 0x01004a74: 0x1004a74: sll   zero, zero, 0
+// 0x01004a78: 0x1004a78: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3928,7 +3948,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_route_get_direction_1004a70(int32,int32)
+.method public static int32 roadmap_line_route_get_direction_1004a80(int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3954,24 +3974,24 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01004a70: 0x1004a70: lui   v0, 0x20000
+// 0x01004a80: 0x1004a80: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01004a74: 0x1004a74: lw    v0, 31184(v0)
+// 0x01004a84: 0x1004a84: lw    v0, 31648(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7796
+	ldc.i4 7912
 	add
 	ldelem.i4
 	stloc.2
-// 0x01004a78: 0x1004a78: sll   zero, zero, 0
-// 0x01004a7c: 0x1004a7c: beq   v0, zero, 0x1004ad8 sll   zero, zero, 0
+// 0x01004a88: 0x1004a88: sll   zero, zero, 0
+// 0x01004a8c: 0x1004a8c: beq   v0, zero, 0x1004ae8 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1004ad8
+	brfalse L_1004ae8
 // --- basic block ---
-// 0x01004a84: 0x1004a84: lw    v1, 8(v0)
+// 0x01004a94: 0x1004a94: lw    v1, 8(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -3980,21 +4000,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004a88: 0x1004a88: sll   zero, zero, 0
-// 0x01004a8c: 0x1004a8c: slt   v1, a0, v1
+// 0x01004a98: 0x1004a98: sll   zero, zero, 0
+// 0x01004a9c: 0x1004a9c: slt   v1, a0, v1
 	ldloc.0
 	ldloc.3
 	clt
 	stloc.3
-// 0x01004a90: 0x1004a90: beq   v1, zero, 0x1004ad8 sll   a0, a0, 2
+// 0x01004aa0: 0x1004aa0: beq   v1, zero, 0x1004ae8 sll   a0, a0, 2
 	ldloc.3
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-	brfalse L_1004ad8
+	brfalse L_1004ae8
 // --- basic block ---
-// 0x01004a98: 0x1004a98: lw    v0, 4(v0)
+// 0x01004aa8: 0x1004aa8: lw    v0, 4(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -4003,65 +4023,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01004a9c: 0x1004a9c: sll   zero, zero, 0
-// 0x01004aa0: 0x1004aa0: addu  a0, v0, a0
+// 0x01004aac: 0x1004aac: sll   zero, zero, 0
+// 0x01004ab0: 0x1004ab0: addu  a0, v0, a0
 	ldloc.2
 	ldloc.0
 	add
 	stloc.0
-// 0x01004aa4: 0x1004aa4: lbu   v1, 0(a0)
+// 0x01004ab4: 0x1004ab4: lbu   v1, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x01004aa8: 0x1004aa8: lbu   v0, 1(a0)
+// 0x01004ab8: 0x1004ab8: lbu   v0, 1(a0)
 	ldloc.0
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x01004aac: 0x1004aac: and   v1, a1, v1
+// 0x01004abc: 0x1004abc: and   v1, a1, v1
 	ldloc.1
 	ldloc.3
 	and
 	stloc.3
-// 0x01004ab0: 0x1004ab0: beq   v1, zero, 0x1004acc sll   zero, zero, 0
+// 0x01004ac0: 0x1004ac0: beq   v1, zero, 0x1004adc sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1004acc
+	brfalse L_1004adc
 // --- basic block ---
-// 0x01004ab8: 0x1004ab8: and   a1, a1, v0
+// 0x01004ac8: 0x1004ac8: and   a1, a1, v0
 	ldloc.1
 	ldloc.2
 	and
 	stloc.1
-// 0x01004abc: 0x1004abc: bne   a1, zero, 0x1004adc addiu v0, zero, 3
+// 0x01004acc: 0x1004acc: bne   a1, zero, 0x1004aec addiu v0, zero, 3
 	ldloc.1
 	ldc.i4.3
 	stloc.2
-	brtrue L_1004adc
+	brtrue L_1004aec
 // --- basic block ---
-// 0x01004ac4: 0x1004ac4: jr    ra addiu v0, zero, 1
+// 0x01004ad4: 0x1004ad4: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.2
 	br __CIBYL_function_return
 // --- basic block ---
-L_1004acc:
-// 0x01004acc: 0x1004acc: and   a1, a1, v0
+L_1004adc:
+// 0x01004adc: 0x1004adc: and   a1, a1, v0
 	ldloc.1
 	ldloc.2
 	and
 	stloc.1
-// 0x01004ad0: 0x1004ad0: bne   a1, zero, 0x1004adc addiu v0, zero, 2
+// 0x01004ae0: 0x1004ae0: bne   a1, zero, 0x1004aec addiu v0, zero, 2
 	ldloc.1
 	ldc.i4.2
 	stloc.2
-	brtrue L_1004adc
+	brtrue L_1004aec
 // --- basic block ---
-L_1004ad8:
-// 0x01004ad8: 0x1004ad8: addu  v0, zero, zero
+L_1004ae8:
+// 0x01004ae8: 0x1004ae8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_1004adc:
-// 0x01004adc: 0x1004adc: jr    ra sll   zero, zero, 0
+L_1004aec:
+// 0x01004aec: 0x1004aec: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -4069,7 +4089,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_line_route_is_low_weight_1004ae4(int32)
+.method public static int32 roadmap_line_route_is_low_weight_1004af4(int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4092,24 +4112,24 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01004ae4: 0x1004ae4: lui   v0, 0x20000
+// 0x01004af4: 0x1004af4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01004ae8: 0x1004ae8: lw    v0, 31184(v0)
+// 0x01004af8: 0x1004af8: lw    v0, 31648(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7796
+	ldc.i4 7912
 	add
 	ldelem.i4
 	stloc.1
-// 0x01004aec: 0x1004aec: sll   zero, zero, 0
-// 0x01004af0: 0x1004af0: beq   v0, zero, 0x1004b40 sll   zero, zero, 0
+// 0x01004afc: 0x1004afc: sll   zero, zero, 0
+// 0x01004b00: 0x1004b00: beq   v0, zero, 0x1004b50 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1004b40
+	brfalse L_1004b50
 // --- basic block ---
-// 0x01004af8: 0x1004af8: lw    v1, 8(v0)
+// 0x01004b08: 0x1004b08: lw    v1, 8(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -4118,21 +4138,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004afc: 0x1004afc: sll   zero, zero, 0
-// 0x01004b00: 0x1004b00: slt   v1, a0, v1
+// 0x01004b0c: 0x1004b0c: sll   zero, zero, 0
+// 0x01004b10: 0x1004b10: slt   v1, a0, v1
 	ldloc.0
 	ldloc.3
 	clt
 	stloc.3
-// 0x01004b04: 0x1004b04: beq   v1, zero, 0x1004b40 sll   a0, a0, 2
+// 0x01004b14: 0x1004b14: beq   v1, zero, 0x1004b50 sll   a0, a0, 2
 	ldloc.3
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-	brfalse L_1004b40
+	brfalse L_1004b50
 // --- basic block ---
-// 0x01004b0c: 0x1004b0c: lw    v0, 4(v0)
+// 0x01004b1c: 0x1004b1c: lw    v0, 4(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -4141,47 +4161,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01004b10: 0x1004b10: sll   zero, zero, 0
-// 0x01004b14: 0x1004b14: addu  a0, v0, a0
+// 0x01004b20: 0x1004b20: sll   zero, zero, 0
+// 0x01004b24: 0x1004b24: addu  a0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x01004b18: 0x1004b18: lbu   v0, 0(a0)
+// 0x01004b28: 0x1004b28: lbu   v0, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x01004b1c: 0x1004b1c: sll   zero, zero, 0
-// 0x01004b20: 0x1004b20: andi  v0, v0, 2
+// 0x01004b2c: 0x1004b2c: sll   zero, zero, 0
+// 0x01004b30: 0x1004b30: andi  v0, v0, 2
 	ldloc.1
 	ldc.i4.2
 	and
 	stloc.1
-// 0x01004b24: 0x1004b24: beq   v0, zero, 0x1004b40 sll   zero, zero, 0
+// 0x01004b34: 0x1004b34: beq   v0, zero, 0x1004b50 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1004b40
+	brfalse L_1004b50
 // --- basic block ---
-// 0x01004b2c: 0x1004b2c: lbu   v0, 1(a0)
+// 0x01004b3c: 0x1004b3c: lbu   v0, 1(a0)
 	ldloc.0
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x01004b30: 0x1004b30: sll   zero, zero, 0
-// 0x01004b34: 0x1004b34: srl   v0, v0, 1
+// 0x01004b40: 0x1004b40: sll   zero, zero, 0
+// 0x01004b44: 0x1004b44: srl   v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	shr.un
 	stloc.1
-// 0x01004b38: 0x1004b38: jr    ra andi  v0, v0, 1
+// 0x01004b48: 0x1004b48: jr    ra andi  v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	and
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_1004b40:
-// 0x01004b40: 0x1004b40: jr    ra addu  v0, zero, zero
+L_1004b50:
+// 0x01004b50: 0x1004b50: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	br __CIBYL_function_return
@@ -4191,7 +4211,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_line_route_activate_1004bdc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_route_activate_1004bec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -4229,13 +4249,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1004bdc:
-// 0x01004bdc: 0x1004bdc: addiu sp, sp, -24
+L_1004bec:
+// 0x01004bec: 0x1004bec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01004be0: 0x1004be0: sw    s0, 16(sp)
+// 0x01004bf0: 0x1004bf0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4244,57 +4264,57 @@ L_1004bdc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01004be4: 0x1004be4: sw    ra, 20(sp)
-// 0x01004be8: 0x1004be8: beq   a0, zero, 0x1004c20 addu  s0, a0, zero
+// 0x01004bf4: 0x1004bf4: sw    ra, 20(sp)
+// 0x01004bf8: 0x1004bf8: beq   a0, zero, 0x1004c30 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1004c20
+	brfalse L_1004c30
 // --- basic block ---
-// 0x01004bf0: 0x1004bf0: lui   v0, 0x20000
+// 0x01004c00: 0x1004c00: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004bf4: 0x1004bf4: lw    v1, 0(a0)
+// 0x01004c04: 0x1004c04: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01004bf8: 0x1004bf8: lw    v0, 24368(v0)
+// 0x01004c08: 0x1004c08: lw    v0, 24832(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6092
+	ldc.i4 6208
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004bfc: 0x1004bfc: sll   zero, zero, 0
-// 0x01004c00: 0x1004c00: beq   v1, v0, 0x1004c20 lui   a1, 0x0
+// 0x01004c0c: 0x1004c0c: sll   zero, zero, 0
+// 0x01004c10: 0x1004c10: beq   v1, v0, 0x1004c30 lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_1004c20
+	beq  L_1004c30
 // --- basic block ---
-// 0x01004c08: 0x1004c08: lui   a3, 0x0
+// 0x01004c18: 0x1004c18: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004c0c: 0x1004c0c: addiu a1, a1, 23124
+// 0x01004c1c: 0x1004c1c: addiu a1, a1, 23124
 	ldloc.2
 	ldc.i4 23124
 	add
 	stloc.2
-// 0x01004c10: 0x1004c10: addiu a3, a3, 23156
+// 0x01004c20: 0x1004c20: addiu a3, a3, 23156
 	ldloc 4
 	ldc.i4 23156
 	add
 	stloc 4
-// 0x01004c14: 0x1004c14: addiu a0, zero, 5
+// 0x01004c24: 0x1004c24: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01004c18: 0x1004c18: jal   0x100449c addiu a2, zero, 87
+// 0x01004c28: 0x1004c28: jal   0x100449c addiu a2, zero, 87
 	ldc.i4.s 87
 	stloc.3
 	ldloc.0
@@ -4307,21 +4327,21 @@ L_1004bdc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1004c20:
-// 0x01004c20: 0x1004c20: lw    ra, 20(sp)
-// 0x01004c24: 0x1004c24: lui   v0, 0x20000
+L_1004c30:
+// 0x01004c30: 0x1004c30: lw    ra, 20(sp)
+// 0x01004c34: 0x1004c34: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004c28: 0x1004c28: sw    s0, 31184(v0)
+// 0x01004c38: 0x1004c38: sw    s0, 31648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7796
+	ldc.i4 7912
 	add
 	ldloc 7
 	stelem.i4
-// 0x01004c2c: 0x1004c2c: lw    s0, 16(sp)
+// 0x01004c3c: 0x1004c3c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4330,7 +4350,7 @@ L_1004c20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01004c30: 0x1004c30: jr    ra addiu sp, sp, 24
+// 0x01004c40: 0x1004c40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4342,7 +4362,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_route_get_restrictions_1004c38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_route_get_restrictions_1004c48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4383,24 +4403,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01004c38: 0x1004c38: lui   v0, 0x20000
+// 0x01004c48: 0x1004c48: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01004c3c: 0x1004c3c: lw    v1, 31184(v0)
+// 0x01004c4c: 0x1004c4c: lw    v1, 31648(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7796
+	ldc.i4 7912
 	add
 	ldelem.i4
 	stloc 7
-// 0x01004c40: 0x1004c40: addiu sp, sp, -48
+// 0x01004c50: 0x1004c50: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01004c44: 0x1004c44: sw    s1, 40(sp)
+// 0x01004c54: 0x1004c54: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4409,7 +4429,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01004c48: 0x1004c48: sw    s0, 36(sp)
+// 0x01004c58: 0x1004c58: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4418,20 +4438,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01004c4c: 0x1004c4c: sw    ra, 44(sp)
-// 0x01004c50: 0x1004c50: addu  s0, a0, zero
+// 0x01004c5c: 0x1004c5c: sw    ra, 44(sp)
+// 0x01004c60: 0x1004c60: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01004c54: 0x1004c54: addu  s1, a1, zero
+// 0x01004c64: 0x1004c64: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01004c58: 0x1004c58: beq   v1, zero, 0x1004cc8 addiu v0, zero, -1
+// 0x01004c68: 0x1004c68: beq   v1, zero, 0x1004cd8 addiu v0, zero, -1
 	ldloc 7
 	ldc.i4.m1
 	stloc 6
-	brfalse L_1004cc8
+	brfalse L_1004cd8
 // --- basic block ---
-// 0x01004c60: 0x1004c60: lw    v0, 8(v1)
+// 0x01004c70: 0x1004c70: lw    v0, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4440,19 +4460,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01004c64: 0x1004c64: sll   zero, zero, 0
-// 0x01004c68: 0x1004c68: slt   v1, a0, v0
+// 0x01004c74: 0x1004c74: sll   zero, zero, 0
+// 0x01004c78: 0x1004c78: slt   v1, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 7
-// 0x01004c6c: 0x1004c6c: bne   v1, zero, 0x1004ca0 lui   v1, 0x0
+// 0x01004c7c: 0x1004c7c: bne   v1, zero, 0x1004cb0 lui   v1, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1004ca0
+	brtrue L_1004cb0
 // --- basic block ---
-// 0x01004c74: 0x1004c74: lw    v1, 576(v1)
+// 0x01004c84: 0x1004c84: lw    v1, 576(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4461,29 +4481,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01004c78: 0x1004c78: lui   a1, 0x0
+// 0x01004c88: 0x1004c88: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004c7c: 0x1004c7c: lui   a3, 0x0
+// 0x01004c8c: 0x1004c8c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004c80: 0x1004c80: addiu a1, a1, 23124
+// 0x01004c90: 0x1004c90: addiu a1, a1, 23124
 	ldloc.2
 	ldc.i4 23124
 	add
 	stloc.2
-// 0x01004c84: 0x1004c84: addiu a3, a3, 23196
+// 0x01004c94: 0x1004c94: addiu a3, a3, 23196
 	ldloc 4
 	ldc.i4 23196
 	add
 	stloc 4
-// 0x01004c88: 0x1004c88: addiu a0, zero, 5
+// 0x01004c98: 0x1004c98: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01004c8c: 0x1004c8c: addiu a2, zero, 186
+// 0x01004c9c: 0x1004c9c: addiu a2, zero, 186
 	ldc.i4 186
 	stloc.3
-// 0x01004c90: 0x1004c90: sw    v0, 20(sp)
+// 0x01004ca0: 0x1004ca0: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4492,7 +4512,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01004c94: 0x1004c94: sw    v1, 24(sp)
+// 0x01004ca4: 0x1004ca4: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4501,7 +4521,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01004c98: 0x1004c98: jal   0x100449c sw    s0, 16(sp)
+// 0x01004ca8: 0x1004ca8: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4520,25 +4540,25 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1004ca0:
-// 0x01004ca0: 0x1004ca0: lui   v0, 0x20000
+L_1004cb0:
+// 0x01004cb0: 0x1004cb0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01004ca4: 0x1004ca4: lw    v0, 31184(v0)
+// 0x01004cb4: 0x1004cb4: lw    v0, 31648(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7796
+	ldc.i4 7912
 	add
 	ldelem.i4
 	stloc 6
-// 0x01004ca8: 0x1004ca8: sll   s0, s0, 2
+// 0x01004cb8: 0x1004cb8: sll   s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x01004cac: 0x1004cac: lw    v0, 4(v0)
+// 0x01004cbc: 0x1004cbc: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4547,33 +4567,33 @@ L_1004ca0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01004cb0: 0x1004cb0: bne   s1, zero, 0x1004cc4 addu  s0, v0, s0
+// 0x01004cc0: 0x1004cc0: bne   s1, zero, 0x1004cd4 addu  s0, v0, s0
 	ldloc 9
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-	brtrue L_1004cc4
+	brtrue L_1004cd4
 // --- basic block ---
-// 0x01004cb8: 0x1004cb8: lbu   v0, 3(s0)
+// 0x01004cc8: 0x1004cc8: lbu   v0, 3(s0)
 	ldloc 8
 	ldc.i4.3
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x01004cbc: 0x1004cbc: j	 0x1004cc8 sll   zero, zero, 0
-	br L_1004cc8
+// 0x01004ccc: 0x1004ccc: j	 0x1004cd8 sll   zero, zero, 0
+	br L_1004cd8
 // --- basic block ---
-L_1004cc4:
-// 0x01004cc4: 0x1004cc4: lbu   v0, 2(s0)
+L_1004cd4:
+// 0x01004cd4: 0x1004cd4: lbu   v0, 2(s0)
 	ldloc 8
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-L_1004cc8:
-// 0x01004cc8: 0x1004cc8: lw    ra, 44(sp)
-// 0x01004ccc: 0x1004ccc: lw    s1, 40(sp)
+L_1004cd8:
+// 0x01004cd8: 0x1004cd8: lw    ra, 44(sp)
+// 0x01004cdc: 0x1004cdc: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4582,7 +4602,7 @@ L_1004cc8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01004cd0: 0x1004cd0: lw    s0, 36(sp)
+// 0x01004ce0: 0x1004ce0: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4591,7 +4611,7 @@ L_1004cc8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01004cd4: 0x1004cd4: jr    ra addiu sp, sp, 48
+// 0x01004ce4: 0x1004ce4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4603,7 +4623,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_line_route_unmap_1004cdc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_route_unmap_1004cec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -4641,32 +4661,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1004cdc:
-// 0x01004cdc: 0x1004cdc: lui   v0, 0x20000
+L_1004cec:
+// 0x01004cec: 0x1004cec: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004ce0: 0x1004ce0: lw    v1, 0(a0)
+// 0x01004cf0: 0x1004cf0: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01004ce4: 0x1004ce4: lw    v0, 24368(v0)
+// 0x01004cf4: 0x1004cf4: lw    v0, 24832(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6092
+	ldc.i4 6208
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004ce8: 0x1004ce8: addiu sp, sp, -24
+// 0x01004cf8: 0x1004cf8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01004cec: 0x1004cec: sw    s0, 16(sp)
+// 0x01004cfc: 0x1004cfc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4675,34 +4695,34 @@ L_1004cdc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01004cf0: 0x1004cf0: sw    ra, 20(sp)
-// 0x01004cf4: 0x1004cf4: beq   v1, v0, 0x1004d18 addu  s0, a0, zero
+// 0x01004d00: 0x1004d00: sw    ra, 20(sp)
+// 0x01004d04: 0x1004d04: beq   v1, v0, 0x1004d28 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_1004d18
+	beq  L_1004d28
 // --- basic block ---
-// 0x01004cfc: 0x1004cfc: lui   a1, 0x0
+// 0x01004d0c: 0x1004d0c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004d00: 0x1004d00: lui   a3, 0x0
+// 0x01004d10: 0x1004d10: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004d04: 0x1004d04: addiu a1, a1, 23124
+// 0x01004d14: 0x1004d14: addiu a1, a1, 23124
 	ldloc.2
 	ldc.i4 23124
 	add
 	stloc.2
-// 0x01004d08: 0x1004d08: addiu a3, a3, 22192
+// 0x01004d18: 0x1004d18: addiu a3, a3, 22192
 	ldloc 4
 	ldc.i4 22192
 	add
 	stloc 4
-// 0x01004d0c: 0x1004d0c: addiu a0, zero, 5
+// 0x01004d1c: 0x1004d1c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01004d10: 0x1004d10: jal   0x100449c addiu a2, zero, 98
+// 0x01004d20: 0x1004d20: jal   0x100449c addiu a2, zero, 98
 	ldc.i4.s 98
 	stloc.3
 	ldloc.0
@@ -4715,8 +4735,8 @@ L_1004cdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1004d18:
-// 0x01004d18: 0x1004d18: jal   0x1000930 addu  a0, s0, zero
+L_1004d28:
+// 0x01004d28: 0x1004d28: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4729,8 +4749,8 @@ L_1004d18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004d20: 0x1004d20: lw    ra, 20(sp)
-// 0x01004d24: 0x1004d24: lw    s0, 16(sp)
+// 0x01004d30: 0x1004d30: lw    ra, 20(sp)
+// 0x01004d34: 0x1004d34: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4739,7 +4759,7 @@ L_1004d18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01004d28: 0x1004d28: jr    ra addiu sp, sp, 24
+// 0x01004d38: 0x1004d38: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4751,7 +4771,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_route_map_1004d30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_route_map_1004d40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4792,13 +4812,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1004d30:
-// 0x01004d30: 0x1004d30: addiu sp, sp, -40
+L_1004d40:
+// 0x01004d40: 0x1004d40: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01004d34: 0x1004d34: sw    s1, 32(sp)
+// 0x01004d44: 0x1004d44: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4807,10 +4827,10 @@ L_1004d30:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01004d38: 0x1004d38: addu  s1, a0, zero
+// 0x01004d48: 0x1004d48: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01004d3c: 0x1004d3c: sw    s0, 28(sp)
+// 0x01004d4c: 0x1004d4c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4819,8 +4839,8 @@ L_1004d30:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01004d40: 0x1004d40: sw    ra, 36(sp)
-// 0x01004d44: 0x1004d44: jal   0x1000910 addiu a0, zero, 12
+// 0x01004d50: 0x1004d50: sw    ra, 36(sp)
+// 0x01004d54: 0x1004d54: jal   0x1000910 addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
 	ldloc.0
@@ -4833,32 +4853,32 @@ L_1004d30:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004d4c: 0x1004d4c: bne   v0, zero, 0x1004d78 addu  s0, v0, zero
+// 0x01004d5c: 0x1004d5c: bne   v0, zero, 0x1004d88 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1004d78
+	brtrue L_1004d88
 // --- basic block ---
-// 0x01004d54: 0x1004d54: lui   a1, 0x0
+// 0x01004d64: 0x1004d64: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004d58: 0x1004d58: lui   a3, 0x0
+// 0x01004d68: 0x1004d68: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004d5c: 0x1004d5c: addiu a1, a1, 23124
+// 0x01004d6c: 0x1004d6c: addiu a1, a1, 23124
 	ldloc.2
 	ldc.i4 23124
 	add
 	stloc.2
-// 0x01004d60: 0x1004d60: addiu a3, a3, 22224
+// 0x01004d70: 0x1004d70: addiu a3, a3, 22224
 	ldloc 4
 	ldc.i4 22224
 	add
 	stloc 4
-// 0x01004d64: 0x1004d64: addiu a0, zero, 4
+// 0x01004d74: 0x1004d74: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01004d68: 0x1004d68: jal   0x100449c addiu a2, zero, 63
+// 0x01004d78: 0x1004d78: jal   0x100449c addiu a2, zero, 63
 	ldc.i4.s 63
 	stloc.3
 	ldloc.0
@@ -4871,51 +4891,51 @@ L_1004d30:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004d70: 0x1004d70: j	 0x1004dc8 addu  v0, zero, zero
+// 0x01004d80: 0x1004d80: j	 0x1004dd8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1004dc8
+	br L_1004dd8
 // --- basic block ---
-L_1004d78:
-// 0x01004d78: 0x1004d78: lui   v1, 0x20000
+L_1004d88:
+// 0x01004d88: 0x1004d88: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01004d7c: 0x1004d7c: lw    v1, 24368(v1)
+// 0x01004d8c: 0x1004d8c: lw    v1, 24832(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6092
+	ldc.i4 6208
 	add
 	ldelem.i4
 	stloc 7
-// 0x01004d80: 0x1004d80: addiu v0, v0, 8
+// 0x01004d90: 0x1004d90: addiu v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01004d84: 0x1004d84: addu  a0, s1, zero
+// 0x01004d94: 0x1004d94: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01004d88: 0x1004d88: addiu a1, zero, 15
+// 0x01004d98: 0x1004d98: addiu a1, zero, 15
 	ldc.i4.s 15
 	stloc.2
-// 0x01004d8c: 0x1004d8c: addiu a2, zero, 4
+// 0x01004d9c: 0x1004d9c: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x01004d90: 0x1004d90: addiu a3, s0, 4
+// 0x01004da0: 0x1004da0: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x01004d94: 0x1004d94: sw    v1, 0(s0)
+// 0x01004da4: 0x1004da4: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01004d98: 0x1004d98: jal   0x10031b0 sw    v0, 16(sp)
+// 0x01004da8: 0x1004da8: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4934,32 +4954,32 @@ L_1004d78:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004da0: 0x1004da0: bne   v0, zero, 0x1004dc8 addu  v0, s0, zero
+// 0x01004db0: 0x1004db0: bne   v0, zero, 0x1004dd8 addu  v0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc 5
-	brtrue L_1004dc8
+	brtrue L_1004dd8
 // --- basic block ---
-// 0x01004da8: 0x1004da8: lui   a1, 0x0
+// 0x01004db8: 0x1004db8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004dac: 0x1004dac: lui   a3, 0x0
+// 0x01004dbc: 0x1004dbc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004db0: 0x1004db0: addiu a1, a1, 23124
+// 0x01004dc0: 0x1004dc0: addiu a1, a1, 23124
 	ldloc.2
 	ldc.i4 23124
 	add
 	stloc.2
-// 0x01004db4: 0x1004db4: addiu a3, a3, 23284
+// 0x01004dc4: 0x1004dc4: addiu a3, a3, 23284
 	ldloc 4
 	ldc.i4 23284
 	add
 	stloc 4
-// 0x01004db8: 0x1004db8: addiu a0, zero, 5
+// 0x01004dc8: 0x1004dc8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01004dbc: 0x1004dbc: jal   0x100449c addiu a2, zero, 74
+// 0x01004dcc: 0x1004dcc: jal   0x100449c addiu a2, zero, 74
 	ldc.i4.s 74
 	stloc.3
 	ldloc.0
@@ -4972,12 +4992,12 @@ L_1004d78:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01004dc4: 0x1004dc4: addu  v0, s0, zero
+// 0x01004dd4: 0x1004dd4: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-L_1004dc8:
-// 0x01004dc8: 0x1004dc8: lw    ra, 36(sp)
-// 0x01004dcc: 0x1004dcc: lw    s1, 32(sp)
+L_1004dd8:
+// 0x01004dd8: 0x1004dd8: lw    ra, 36(sp)
+// 0x01004ddc: 0x1004ddc: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4986,7 +5006,7 @@ L_1004dc8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01004dd0: 0x1004dd0: lw    s0, 28(sp)
+// 0x01004de0: 0x1004de0: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4995,7 +5015,7 @@ L_1004dc8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01004dd4: 0x1004dd4: jr    ra addiu sp, sp, 40
+// 0x01004de4: 0x1004de4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5007,7 +5027,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_activate_1004e30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_activate_1004e40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5045,13 +5065,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1004e30:
-// 0x01004e30: 0x1004e30: addiu sp, sp, -24
+L_1004e40:
+// 0x01004e40: 0x1004e40: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01004e34: 0x1004e34: sw    s0, 16(sp)
+// 0x01004e44: 0x1004e44: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5060,57 +5080,57 @@ L_1004e30:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01004e38: 0x1004e38: sw    ra, 20(sp)
-// 0x01004e3c: 0x1004e3c: beq   a0, zero, 0x1004e74 addu  s0, a0, zero
+// 0x01004e48: 0x1004e48: sw    ra, 20(sp)
+// 0x01004e4c: 0x1004e4c: beq   a0, zero, 0x1004e84 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1004e74
+	brfalse L_1004e84
 // --- basic block ---
-// 0x01004e44: 0x1004e44: lui   v0, 0x20000
+// 0x01004e54: 0x1004e54: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004e48: 0x1004e48: lw    v1, 0(a0)
+// 0x01004e58: 0x1004e58: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01004e4c: 0x1004e4c: lw    v0, 24372(v0)
+// 0x01004e5c: 0x1004e5c: lw    v0, 24836(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6093
+	ldc.i4 6209
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004e50: 0x1004e50: sll   zero, zero, 0
-// 0x01004e54: 0x1004e54: beq   v1, v0, 0x1004e74 lui   a1, 0x0
+// 0x01004e60: 0x1004e60: sll   zero, zero, 0
+// 0x01004e64: 0x1004e64: beq   v1, v0, 0x1004e84 lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_1004e74
+	beq  L_1004e84
 // --- basic block ---
-// 0x01004e5c: 0x1004e5c: lui   a3, 0x0
+// 0x01004e6c: 0x1004e6c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01004e60: 0x1004e60: addiu a1, a1, 23356
+// 0x01004e70: 0x1004e70: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x01004e64: 0x1004e64: addiu a3, a3, 23388
+// 0x01004e74: 0x1004e74: addiu a3, a3, 23388
 	ldloc 4
 	ldc.i4 23388
 	add
 	stloc 4
-// 0x01004e68: 0x1004e68: addiu a0, zero, 5
+// 0x01004e78: 0x1004e78: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01004e6c: 0x1004e6c: jal   0x100449c addiu a2, zero, 121
+// 0x01004e7c: 0x1004e7c: jal   0x100449c addiu a2, zero, 121
 	ldc.i4.s 121
 	stloc.3
 	ldloc.0
@@ -5123,21 +5143,21 @@ L_1004e30:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1004e74:
-// 0x01004e74: 0x1004e74: lw    ra, 20(sp)
-// 0x01004e78: 0x1004e78: lui   v0, 0x20000
+L_1004e84:
+// 0x01004e84: 0x1004e84: lw    ra, 20(sp)
+// 0x01004e88: 0x1004e88: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004e7c: 0x1004e7c: sw    s0, 31188(v0)
+// 0x01004e8c: 0x1004e8c: sw    s0, 31652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldloc 7
 	stelem.i4
-// 0x01004e80: 0x1004e80: lw    s0, 16(sp)
+// 0x01004e90: 0x1004e90: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5146,7 +5166,7 @@ L_1004e74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01004e84: 0x1004e84: jr    ra addiu sp, sp, 24
+// 0x01004e94: 0x1004e94: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5158,7 +5178,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_get_1004e8c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_get_1004e9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5193,34 +5213,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01004e8c: 0x1004e8c: lui   v0, 0x20000
+// 0x01004e9c: 0x1004e9c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004e90: 0x1004e90: lw    a2, 31188(v0)
+// 0x01004ea0: 0x1004ea0: lw    a2, 31652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc.3
-// 0x01004e94: 0x1004e94: addiu sp, sp, -32
+// 0x01004ea4: 0x1004ea4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01004e98: 0x1004e98: sw    ra, 28(sp)
-// 0x01004e9c: 0x1004e9c: addu  v1, a0, zero
+// 0x01004ea8: 0x1004ea8: sw    ra, 28(sp)
+// 0x01004eac: 0x1004eac: addu  v1, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01004ea0: 0x1004ea0: beq   a2, zero, 0x1004f38 addu  v0, zero, zero
+// 0x01004eb0: 0x1004eb0: beq   a2, zero, 0x1004f48 addu  v0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1004f38
+	brfalse L_1004f48
 // --- basic block ---
-// 0x01004ea8: 0x1004ea8: lw    v0, 32(a2)
+// 0x01004eb8: 0x1004eb8: lw    v0, 32(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -5229,38 +5249,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004eac: 0x1004eac: sll   zero, zero, 0
-// 0x01004eb0: 0x1004eb0: slt   v0, a0, v0
+// 0x01004ebc: 0x1004ebc: sll   zero, zero, 0
+// 0x01004ec0: 0x1004ec0: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x01004eb4: 0x1004eb4: bne   v0, zero, 0x1004ee0 lui   a3, 0x0
+// 0x01004ec4: 0x1004ec4: bne   v0, zero, 0x1004ef0 lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_1004ee0
+	brtrue L_1004ef0
 // --- basic block ---
-// 0x01004ebc: 0x1004ebc: lui   a1, 0x0
+// 0x01004ecc: 0x1004ecc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004ec0: 0x1004ec0: addiu a1, a1, 23356
+// 0x01004ed0: 0x1004ed0: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x01004ec4: 0x1004ec4: addiu a3, a3, 23428
+// 0x01004ed4: 0x1004ed4: addiu a3, a3, 23428
 	ldloc 4
 	ldc.i4 23428
 	add
 	stloc 4
-// 0x01004ec8: 0x1004ec8: addiu a0, zero, 4
+// 0x01004ed8: 0x1004ed8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01004ecc: 0x1004ecc: addiu a2, zero, 252
+// 0x01004edc: 0x1004edc: addiu a2, zero, 252
 	ldc.i4 252
 	stloc.3
-// 0x01004ed0: 0x1004ed0: jal   0x100449c sw    v1, 16(sp)
+// 0x01004ee0: 0x1004ee0: jal   0x100449c sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5279,13 +5299,13 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01004ed8: 0x1004ed8: j	 0x1004f38 addu  v0, zero, zero
+// 0x01004ee8: 0x1004ee8: j	 0x1004f48 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1004f38
+	br L_1004f48
 // --- basic block ---
-L_1004ee0:
-// 0x01004ee0: 0x1004ee0: lw    v0, 28(a2)
+L_1004ef0:
+// 0x01004ef0: 0x1004ef0: lw    v0, 28(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -5294,24 +5314,24 @@ L_1004ee0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004ee4: 0x1004ee4: sll   v1, a0, 2
+// 0x01004ef4: 0x1004ef4: sll   v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01004ee8: 0x1004ee8: addu  v1, v0, v1
+// 0x01004ef8: 0x1004ef8: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01004eec: 0x1004eec: lw    v0, 0(v1)
+// 0x01004efc: 0x1004efc: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01004ef0: 0x1004ef0: lw    v1, 20(a2)
+// 0x01004f00: 0x1004f00: lw    v1, 20(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -5320,75 +5340,75 @@ L_1004ee0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01004ef4: 0x1004ef4: sll   v0, v0, 1
+// 0x01004f04: 0x1004f04: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x01004ef8: 0x1004ef8: addu  v0, v1, v0
+// 0x01004f08: 0x1004f08: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01004efc: 0x1004efc: addiu a0, zero, -65
+// 0x01004f0c: 0x1004f0c: addiu a0, zero, -65
 	ldc.i4.s -65
 	stloc.1
-L_1004f00:
-// 0x01004f00: 0x1004f00: lbu   a2, 1(v0)
+L_1004f10:
+// 0x01004f10: 0x1004f10: lbu   a2, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x01004f04: 0x1004f04: sll   zero, zero, 0
-// 0x01004f08: 0x1004f08: andi  a2, a2, 64
+// 0x01004f14: 0x1004f14: sll   zero, zero, 0
+// 0x01004f18: 0x1004f18: andi  a2, a2, 64
 	ldloc.3
 	ldc.i4.s 64
 	and
 	stloc.3
-// 0x01004f0c: 0x1004f0c: bne   a2, zero, 0x1004f34 addiu v1, v0, 2
+// 0x01004f1c: 0x1004f1c: bne   a2, zero, 0x1004f44 addiu v1, v0, 2
 	ldloc.3
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 6
-	brtrue L_1004f34
+	brtrue L_1004f44
 // --- basic block ---
-// 0x01004f14: 0x1004f14: lbu   a2, 1(v1)
+// 0x01004f24: 0x1004f24: lbu   a2, 1(v1)
 	ldloc 6
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x01004f18: 0x1004f18: sll   zero, zero, 0
-// 0x01004f1c: 0x1004f1c: and   a2, a2, a0
+// 0x01004f28: 0x1004f28: sll   zero, zero, 0
+// 0x01004f2c: 0x1004f2c: and   a2, a2, a0
 	ldloc.3
 	ldloc.1
 	and
 	stloc.3
-// 0x01004f20: 0x1004f20: slt   a2, a1, a2
+// 0x01004f30: 0x1004f30: slt   a2, a1, a2
 	ldloc.2
 	ldloc.3
 	clt
 	stloc.3
-// 0x01004f24: 0x1004f24: bne   a2, zero, 0x1004f34 sll   zero, zero, 0
+// 0x01004f34: 0x1004f34: bne   a2, zero, 0x1004f44 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_1004f34
+	brtrue L_1004f44
 // --- basic block ---
-// 0x01004f2c: 0x1004f2c: j	 0x1004f00 addu  v0, v1, zero
+// 0x01004f3c: 0x1004f3c: j	 0x1004f10 addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-	br L_1004f00
+	br L_1004f10
 // --- basic block ---
-L_1004f34:
-// 0x01004f34: 0x1004f34: lbu   v0, 0(v0)
+L_1004f44:
+// 0x01004f44: 0x1004f44: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-L_1004f38:
-// 0x01004f38: 0x1004f38: lw    ra, 28(sp)
-// 0x01004f3c: 0x1004f3c: sll   zero, zero, 0
-// 0x01004f40: 0x1004f40: jr    ra addiu sp, sp, 32
+L_1004f48:
+// 0x01004f48: 0x1004f48: lw    ra, 28(sp)
+// 0x01004f4c: 0x1004f4c: sll   zero, zero, 0
+// 0x01004f50: 0x1004f50: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5400,7 +5420,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_get_speed_1004f48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_get_speed_1004f58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5435,28 +5455,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01004f48: 0x1004f48: lui   v0, 0x20000
+// 0x01004f58: 0x1004f58: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004f4c: 0x1004f4c: lw    v0, 31188(v0)
+// 0x01004f5c: 0x1004f5c: lw    v0, 31652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004f50: 0x1004f50: addiu sp, sp, -24
+// 0x01004f60: 0x1004f60: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01004f54: 0x1004f54: beq   v0, zero, 0x1004fb4 sw    ra, 20(sp)
+// 0x01004f64: 0x1004f64: beq   v0, zero, 0x1004fc4 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1004fb4
+	brfalse L_1004fc4
 // --- basic block ---
-// 0x01004f5c: 0x1004f5c: lw    v1, 16(v0)
+// 0x01004f6c: 0x1004f6c: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5465,21 +5485,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01004f60: 0x1004f60: sll   zero, zero, 0
-// 0x01004f64: 0x1004f64: slt   v1, a0, v1
+// 0x01004f70: 0x1004f70: sll   zero, zero, 0
+// 0x01004f74: 0x1004f74: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01004f68: 0x1004f68: beq   v1, zero, 0x1004fb4 sll   a0, a0, 2
+// 0x01004f78: 0x1004f78: beq   v1, zero, 0x1004fc4 sll   a0, a0, 2
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-	brfalse L_1004fb4
+	brfalse L_1004fc4
 // --- basic block ---
-// 0x01004f70: 0x1004f70: lw    v0, 12(v0)
+// 0x01004f80: 0x1004f80: lw    v0, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5488,54 +5508,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004f74: 0x1004f74: beq   a1, zero, 0x1004f88 addu  a0, v0, a0
+// 0x01004f84: 0x1004f84: beq   a1, zero, 0x1004f98 addu  a0, v0, a0
 	ldloc.2
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-	brfalse L_1004f88
+	brfalse L_1004f98
 // --- basic block ---
-// 0x01004f7c: 0x1004f7c: lhu   a0, 2(a0)
+// 0x01004f8c: 0x1004f8c: lhu   a0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01004f80: 0x1004f80: j	 0x1004f90 ori   v0, zero, 65535
+// 0x01004f90: 0x1004f90: j	 0x1004fa0 ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-	br L_1004f90
+	br L_1004fa0
 // --- basic block ---
-L_1004f88:
-// 0x01004f88: 0x1004f88: lhu   a0, 0(a0)
+L_1004f98:
+// 0x01004f98: 0x1004f98: lhu   a0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01004f8c: 0x1004f8c: ori   v0, zero, 65535
+// 0x01004f9c: 0x1004f9c: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-L_1004f90:
-// 0x01004f90: 0x1004f90: beq   a0, v0, 0x1004fb4 addu  v1, zero, zero
+L_1004fa0:
+// 0x01004fa0: 0x1004fa0: beq   a0, v0, 0x1004fc4 addu  v1, zero, zero
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	beq  L_1004fb4
+	beq  L_1004fc4
 // --- basic block ---
-// 0x01004f98: 0x1004f98: cibyl_sysc_arg 0x3
+// 0x01004fa8: 0x1004fa8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01004f9c: 0x1004f9c: cibyl_sysc 0x21e
+// 0x01004fac: 0x1004fac: cibyl_sysc 0x21e
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01004fa0: 0x1004fa0: addu  v1, v0, zero
+// 0x01004fb0: 0x1004fb0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01004fa4: 0x1004fa4: jal   0x1004e8c addiu a1, zero, 24
+// 0x01004fb4: 0x1004fb4: jal   0x1004e9c addiu a1, zero, 24
 	ldc.i4.s 24
 	stloc.2
 	ldloc.0
@@ -5543,22 +5563,22 @@ L_1004f90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_1004e8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_1004e9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01004fac: 0x1004fac: j	 0x1004fb8 sll   zero, zero, 0
-	br L_1004fb8
+// 0x01004fbc: 0x1004fbc: j	 0x1004fc8 sll   zero, zero, 0
+	br L_1004fc8
 // --- basic block ---
-L_1004fb4:
-// 0x01004fb4: 0x1004fb4: addu  v0, zero, zero
+L_1004fc4:
+// 0x01004fc4: 0x1004fc4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1004fb8:
-// 0x01004fb8: 0x1004fb8: lw    ra, 20(sp)
-// 0x01004fbc: 0x1004fbc: sll   zero, zero, 0
-// 0x01004fc0: 0x1004fc0: jr    ra addiu sp, sp, 24
+L_1004fc8:
+// 0x01004fc8: 0x1004fc8: lw    ra, 20(sp)
+// 0x01004fcc: 0x1004fcc: sll   zero, zero, 0
+// 0x01004fd0: 0x1004fd0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5570,7 +5590,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_get_avg_1004fc8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_get_avg_1004fd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -5608,34 +5628,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01004fc8: 0x1004fc8: lui   v0, 0x20000
+// 0x01004fd8: 0x1004fd8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01004fcc: 0x1004fcc: lw    a1, 31188(v0)
+// 0x01004fdc: 0x1004fdc: lw    a1, 31652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc.2
-// 0x01004fd0: 0x1004fd0: addiu sp, sp, -32
+// 0x01004fe0: 0x1004fe0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01004fd4: 0x1004fd4: sw    ra, 28(sp)
-// 0x01004fd8: 0x1004fd8: addu  v1, a0, zero
+// 0x01004fe4: 0x1004fe4: sw    ra, 28(sp)
+// 0x01004fe8: 0x1004fe8: addu  v1, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01004fdc: 0x1004fdc: beq   a1, zero, 0x1005068 addu  v0, zero, zero
+// 0x01004fec: 0x1004fec: beq   a1, zero, 0x1005078 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1005068
+	brfalse L_1005078
 // --- basic block ---
-// 0x01004fe4: 0x1004fe4: lw    v0, 32(a1)
+// 0x01004ff4: 0x1004ff4: lw    v0, 32(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -5644,38 +5664,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01004fe8: 0x1004fe8: sll   zero, zero, 0
-// 0x01004fec: 0x1004fec: slt   v0, a0, v0
+// 0x01004ff8: 0x1004ff8: sll   zero, zero, 0
+// 0x01004ffc: 0x1004ffc: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x01004ff0: 0x1004ff0: bne   v0, zero, 0x100501c lui   a3, 0x0
+// 0x01005000: 0x1005000: bne   v0, zero, 0x100502c lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_100501c
+	brtrue L_100502c
 // --- basic block ---
-// 0x01004ff8: 0x1004ff8: lui   a1, 0x0
+// 0x01005008: 0x1005008: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01004ffc: 0x1004ffc: addiu a1, a1, 23356
+// 0x0100500c: 0x100500c: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x01005000: 0x1005000: addiu a3, a3, 23428
+// 0x01005010: 0x1005010: addiu a3, a3, 23428
 	ldloc 4
 	ldc.i4 23428
 	add
 	stloc 4
-// 0x01005004: 0x1005004: addiu a0, zero, 4
+// 0x01005014: 0x1005014: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01005008: 0x1005008: addiu a2, zero, 225
+// 0x01005018: 0x1005018: addiu a2, zero, 225
 	ldc.i4 225
 	stloc.3
-// 0x0100500c: 0x100500c: jal   0x100449c sw    v1, 16(sp)
+// 0x0100501c: 0x100501c: jal   0x100449c sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5694,13 +5714,13 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005014: 0x1005014: j	 0x1005068 addu  v0, zero, zero
+// 0x01005024: 0x1005024: j	 0x1005078 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1005068
+	br L_1005078
 // --- basic block ---
-L_100501c:
-// 0x0100501c: 0x100501c: lw    v0, 28(a1)
+L_100502c:
+// 0x0100502c: 0x100502c: lw    v0, 28(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -5709,24 +5729,24 @@ L_100501c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01005020: 0x1005020: sll   v1, a0, 2
+// 0x01005030: 0x1005030: sll   v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01005024: 0x1005024: addu  v1, v0, v1
+// 0x01005034: 0x1005034: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01005028: 0x1005028: lw    a0, 0(v1)
+// 0x01005038: 0x1005038: lw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100502c: 0x100502c: lw    v0, 20(a1)
+// 0x0100503c: 0x100503c: lw    v0, 20(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -5735,71 +5755,71 @@ L_100501c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01005030: 0x1005030: sll   a0, a0, 1
+// 0x01005040: 0x1005040: sll   a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
 	stloc.1
-// 0x01005034: 0x1005034: addu  a0, v0, a0
+// 0x01005044: 0x1005044: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x01005038: 0x1005038: addu  v1, zero, zero
+// 0x01005048: 0x1005048: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0100503c: 0x100503c: addu  v0, zero, zero
+// 0x0100504c: 0x100504c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1005040:
-// 0x01005040: 0x1005040: lbu   a1, 1(a0)
+L_1005050:
+// 0x01005050: 0x1005050: lbu   a1, 1(a0)
 	ldloc.1
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x01005044: 0x1005044: lbu   a2, 0(a0)
+// 0x01005054: 0x1005054: lbu   a2, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x01005048: 0x1005048: andi  a1, a1, 64
+// 0x01005058: 0x1005058: andi  a1, a1, 64
 	ldloc.2
 	ldc.i4.s 64
 	and
 	stloc.2
-// 0x0100504c: 0x100504c: addu  v1, v1, a2
+// 0x0100505c: 0x100505c: addu  v1, v1, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc 6
-// 0x01005050: 0x1005050: bne   a1, zero, 0x1005060 addiu v0, v0, 1
+// 0x01005060: 0x1005060: bne   a1, zero, 0x1005070 addiu v0, v0, 1
 	ldloc.2
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_1005060
+	brtrue L_1005070
 // --- basic block ---
-// 0x01005058: 0x1005058: j	 0x1005040 addiu a0, a0, 2
+// 0x01005068: 0x1005068: j	 0x1005050 addiu a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	add
 	stloc.1
-	br L_1005040
+	br L_1005050
 // --- basic block ---
-L_1005060:
-// 0x01005060: 0x1005060: div   v1, v0
+L_1005070:
+// 0x01005070: 0x1005070: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 9
-// 0x01005064: 0x1005064: mflo  lo
+// 0x01005074: 0x1005074: mflo  lo
 	ldloc 9
 	stloc 5
-L_1005068:
-// 0x01005068: 0x1005068: lw    ra, 28(sp)
-// 0x0100506c: 0x100506c: sll   zero, zero, 0
-// 0x01005070: 0x1005070: jr    ra addiu sp, sp, 32
+L_1005078:
+// 0x01005078: 0x1005078: lw    ra, 28(sp)
+// 0x0100507c: 0x100507c: sll   zero, zero, 0
+// 0x01005080: 0x1005080: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5811,7 +5831,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_get_avg_speed_1005078(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_get_avg_speed_1005088(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5846,28 +5866,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01005078: 0x1005078: lui   v0, 0x20000
+// 0x01005088: 0x1005088: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100507c: 0x100507c: lw    v0, 31188(v0)
+// 0x0100508c: 0x100508c: lw    v0, 31652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc 5
-// 0x01005080: 0x1005080: addiu sp, sp, -24
+// 0x01005090: 0x1005090: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01005084: 0x1005084: beq   v0, zero, 0x10050d8 sw    ra, 20(sp)
+// 0x01005094: 0x1005094: beq   v0, zero, 0x10050e8 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_10050d8
+	brfalse L_10050e8
 // --- basic block ---
-// 0x0100508c: 0x100508c: lw    v1, 16(v0)
+// 0x0100509c: 0x100509c: lw    v1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5876,21 +5896,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01005090: 0x1005090: sll   zero, zero, 0
-// 0x01005094: 0x1005094: slt   v1, a0, v1
+// 0x010050a0: 0x10050a0: sll   zero, zero, 0
+// 0x010050a4: 0x10050a4: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x01005098: 0x1005098: beq   v1, zero, 0x10050d8 sll   a0, a0, 2
+// 0x010050a8: 0x10050a8: beq   v1, zero, 0x10050e8 sll   a0, a0, 2
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-	brfalse L_10050d8
+	brfalse L_10050e8
 // --- basic block ---
-// 0x010050a0: 0x10050a0: lw    v0, 12(v0)
+// 0x010050b0: 0x10050b0: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5899,65 +5919,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010050a4: 0x10050a4: beq   a1, zero, 0x10050b8 addu  a0, v0, a0
+// 0x010050b4: 0x10050b4: beq   a1, zero, 0x10050c8 addu  a0, v0, a0
 	ldloc.2
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-	brfalse L_10050b8
+	brfalse L_10050c8
 // --- basic block ---
-// 0x010050ac: 0x10050ac: lhu   a0, 2(a0)
+// 0x010050bc: 0x10050bc: lhu   a0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x010050b0: 0x10050b0: j	 0x10050c0 ori   v0, zero, 65535
+// 0x010050c0: 0x10050c0: j	 0x10050d0 ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-	br L_10050c0
+	br L_10050d0
 // --- basic block ---
-L_10050b8:
-// 0x010050b8: 0x10050b8: lhu   a0, 0(a0)
+L_10050c8:
+// 0x010050c8: 0x10050c8: lhu   a0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x010050bc: 0x10050bc: ori   v0, zero, 65535
+// 0x010050cc: 0x10050cc: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-L_10050c0:
-// 0x010050c0: 0x10050c0: beq   a0, v0, 0x10050d8 sll   zero, zero, 0
+L_10050d0:
+// 0x010050d0: 0x10050d0: beq   a0, v0, 0x10050e8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10050d8
+	beq  L_10050e8
 // --- basic block ---
-// 0x010050c8: 0x10050c8: jal   0x1004fc8 sll   zero, zero, 0
+// 0x010050d8: 0x10050d8: jal   0x1004fd8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_avg_1004fc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_avg_1004fd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010050d0: 0x10050d0: j	 0x10050dc sll   zero, zero, 0
-	br L_10050dc
+// 0x010050e0: 0x10050e0: j	 0x10050ec sll   zero, zero, 0
+	br L_10050ec
 // --- basic block ---
-L_10050d8:
-// 0x010050d8: 0x10050d8: addu  v0, zero, zero
+L_10050e8:
+// 0x010050e8: 0x10050e8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10050dc:
-// 0x010050dc: 0x10050dc: lw    ra, 20(sp)
-// 0x010050e0: 0x10050e0: sll   zero, zero, 0
-// 0x010050e4: 0x10050e4: jr    ra addiu sp, sp, 24
+L_10050ec:
+// 0x010050ec: 0x10050ec: lw    ra, 20(sp)
+// 0x010050f0: 0x10050f0: sll   zero, zero, 0
+// 0x010050f4: 0x10050f4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5969,7 +5989,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_unmap_10050ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_unmap_10050fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -6007,32 +6027,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10050ec:
-// 0x010050ec: 0x10050ec: lui   v0, 0x20000
+L_10050fc:
+// 0x010050fc: 0x10050fc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010050f0: 0x10050f0: lw    v1, 0(a0)
+// 0x01005100: 0x1005100: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010050f4: 0x10050f4: lw    v0, 24372(v0)
+// 0x01005104: 0x1005104: lw    v0, 24836(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6093
+	ldc.i4 6209
 	add
 	ldelem.i4
 	stloc 5
-// 0x010050f8: 0x10050f8: addiu sp, sp, -24
+// 0x01005108: 0x1005108: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010050fc: 0x10050fc: sw    s0, 16(sp)
+// 0x0100510c: 0x100510c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6041,34 +6061,34 @@ L_10050ec:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01005100: 0x1005100: sw    ra, 20(sp)
-// 0x01005104: 0x1005104: beq   v1, v0, 0x1005128 addu  s0, a0, zero
+// 0x01005110: 0x1005110: sw    ra, 20(sp)
+// 0x01005114: 0x1005114: beq   v1, v0, 0x1005138 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_1005128
+	beq  L_1005138
 // --- basic block ---
-// 0x0100510c: 0x100510c: lui   a1, 0x0
+// 0x0100511c: 0x100511c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01005110: 0x1005110: lui   a3, 0x0
+// 0x01005120: 0x1005120: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01005114: 0x1005114: addiu a1, a1, 23356
+// 0x01005124: 0x1005124: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x01005118: 0x1005118: addiu a3, a3, 23456
+// 0x01005128: 0x1005128: addiu a3, a3, 23456
 	ldloc 4
 	ldc.i4 23456
 	add
 	stloc 4
-// 0x0100511c: 0x100511c: addiu a0, zero, 5
+// 0x0100512c: 0x100512c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01005120: 0x1005120: jal   0x100449c addiu a2, zero, 132
+// 0x01005130: 0x1005130: jal   0x100449c addiu a2, zero, 132
 	ldc.i4 132
 	stloc.3
 	ldloc.0
@@ -6081,8 +6101,8 @@ L_10050ec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1005128:
-// 0x01005128: 0x1005128: jal   0x1000930 addu  a0, s0, zero
+L_1005138:
+// 0x01005138: 0x1005138: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6095,8 +6115,8 @@ L_1005128:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005130: 0x1005130: lw    ra, 20(sp)
-// 0x01005134: 0x1005134: lw    s0, 16(sp)
+// 0x01005140: 0x1005140: lw    ra, 20(sp)
+// 0x01005144: 0x1005144: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6105,7 +6125,7 @@ L_1005128:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01005138: 0x1005138: jr    ra addiu sp, sp, 24
+// 0x01005148: 0x1005148: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6117,7 +6137,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_map_1005140(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_map_1005150(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32 v1,int32[] mem,int32 s1,int32 ra)
@@ -6158,13 +6178,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1005140:
-// 0x01005140: 0x1005140: addiu sp, sp, -40
+L_1005150:
+// 0x01005150: 0x1005150: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01005144: 0x1005144: sw    s1, 32(sp)
+// 0x01005154: 0x1005154: sw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6173,10 +6193,10 @@ L_1005140:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01005148: 0x1005148: addu  s1, a0, zero
+// 0x01005158: 0x1005158: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100514c: 0x100514c: sw    s0, 28(sp)
+// 0x0100515c: 0x100515c: sw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6185,8 +6205,8 @@ L_1005140:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01005150: 0x1005150: sw    ra, 36(sp)
-// 0x01005154: 0x1005154: jal   0x1000910 addiu a0, zero, 36
+// 0x01005160: 0x1005160: sw    ra, 36(sp)
+// 0x01005164: 0x1005164: jal   0x1000910 addiu a0, zero, 36
 	ldc.i4.s 36
 	stloc.1
 	ldloc.0
@@ -6199,16 +6219,16 @@ L_1005140:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100515c: 0x100515c: addu  s0, v0, zero
+// 0x0100516c: 0x100516c: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01005160: 0x1005160: addu  a0, v0, zero
+// 0x01005170: 0x1005170: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01005164: 0x1005164: addu  a1, zero, zero
+// 0x01005174: 0x1005174: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01005168: 0x1005168: jal   0x100177c addiu a2, zero, 36
+// 0x01005178: 0x1005178: jal   0x100177c addiu a2, zero, 36
 	ldc.i4.s 36
 	stloc.3
 	ldloc.1
@@ -6220,32 +6240,32 @@ L_1005140:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005170: 0x1005170: bne   s0, zero, 0x100519c lui   v1, 0x20000
+// 0x01005180: 0x1005180: bne   s0, zero, 0x10051ac lui   v1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 7
-	brtrue L_100519c
+	brtrue L_10051ac
 // --- basic block ---
-// 0x01005178: 0x1005178: lui   a1, 0x0
+// 0x01005188: 0x1005188: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100517c: 0x100517c: lui   a3, 0x0
+// 0x0100518c: 0x100518c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01005180: 0x1005180: addiu a1, a1, 23356
+// 0x01005190: 0x1005190: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x01005184: 0x1005184: addiu a3, a3, 22224
+// 0x01005194: 0x1005194: addiu a3, a3, 22224
 	ldloc 4
 	ldc.i4 22224
 	add
 	stloc 4
-// 0x01005188: 0x1005188: addiu a0, zero, 4
+// 0x01005198: 0x1005198: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100518c: 0x100518c: jal   0x100449c addiu a2, zero, 70
+// 0x0100519c: 0x100519c: jal   0x100449c addiu a2, zero, 70
 	ldc.i4.s 70
 	stloc.3
 	ldloc.0
@@ -6258,48 +6278,48 @@ L_1005140:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005194: 0x1005194: j	 0x10052b4 addu  v0, zero, zero
+// 0x010051a4: 0x10051a4: j	 0x10052c4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10052b4
+	br L_10052c4
 // --- basic block ---
-L_100519c:
-// 0x0100519c: 0x100519c: lw    v1, 24372(v1)
+L_10051ac:
+// 0x010051ac: 0x10051ac: lw    v1, 24836(v1)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6093
+	ldc.i4 6209
 	add
 	ldelem.i4
 	stloc 7
-// 0x010051a0: 0x10051a0: addiu v0, s0, 8
+// 0x010051b0: 0x10051b0: addiu v0, s0, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 5
-// 0x010051a4: 0x10051a4: addu  a0, s1, zero
+// 0x010051b4: 0x10051b4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010051a8: 0x10051a8: addiu a1, zero, 21
+// 0x010051b8: 0x10051b8: addiu a1, zero, 21
 	ldc.i4.s 21
 	stloc.2
-// 0x010051ac: 0x10051ac: addiu a2, zero, 2
+// 0x010051bc: 0x10051bc: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010051b0: 0x10051b0: addiu a3, s0, 4
+// 0x010051c0: 0x10051c0: addiu a3, s0, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 4
-// 0x010051b4: 0x10051b4: sw    v1, 0(s0)
+// 0x010051c4: 0x10051c4: sw    v1, 0(s0)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010051b8: 0x10051b8: jal   0x10031b0 sw    v0, 16(sp)
+// 0x010051c8: 0x10051c8: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6318,34 +6338,34 @@ L_100519c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010051c0: 0x10051c0: bne   v0, zero, 0x10051e8 addiu v0, s0, 16
+// 0x010051d0: 0x10051d0: bne   v0, zero, 0x10051f8 addiu v0, s0, 16
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 16
 	add
 	stloc 5
-	brtrue L_10051e8
+	brtrue L_10051f8
 // --- basic block ---
-// 0x010051c8: 0x10051c8: lui   a1, 0x0
+// 0x010051d8: 0x10051d8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010051cc: 0x10051cc: lui   a3, 0x0
+// 0x010051dc: 0x10051dc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010051d0: 0x10051d0: addiu a1, a1, 23356
+// 0x010051e0: 0x10051e0: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x010051d4: 0x10051d4: addiu a3, a3, 23496
+// 0x010051e4: 0x10051e4: addiu a3, a3, 23496
 	ldloc 4
 	ldc.i4 23496
 	add
 	stloc 4
-// 0x010051d8: 0x10051d8: addiu a0, zero, 5
+// 0x010051e8: 0x10051e8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010051dc: 0x10051dc: jal   0x100449c addiu a2, zero, 81
+// 0x010051ec: 0x10051ec: jal   0x100449c addiu a2, zero, 81
 	ldc.i4.s 81
 	stloc.3
 	ldloc.0
@@ -6358,27 +6378,27 @@ L_100519c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010051e4: 0x10051e4: addiu v0, s0, 16
+// 0x010051f4: 0x10051f4: addiu v0, s0, 16
 	ldloc 6
 	ldc.i4.s 16
 	add
 	stloc 5
-L_10051e8:
-// 0x010051e8: 0x10051e8: addu  a0, s1, zero
+L_10051f8:
+// 0x010051f8: 0x10051f8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010051ec: 0x10051ec: addiu a1, zero, 20
+// 0x010051fc: 0x10051fc: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x010051f0: 0x10051f0: addiu a2, zero, 4
+// 0x01005200: 0x1005200: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x010051f4: 0x10051f4: addiu a3, s0, 12
+// 0x01005204: 0x1005204: addiu a3, s0, 12
 	ldloc 6
 	ldc.i4.s 12
 	add
 	stloc 4
-// 0x010051f8: 0x10051f8: jal   0x10031b0 sw    v0, 16(sp)
+// 0x01005208: 0x1005208: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6397,29 +6417,29 @@ L_10051e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005200: 0x1005200: bne   v0, zero, 0x1005220 lui   a1, 0x0
+// 0x01005210: 0x1005210: bne   v0, zero, 0x1005230 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1005220
+	brtrue L_1005230
 // --- basic block ---
-// 0x01005208: 0x1005208: lui   a3, 0x0
+// 0x01005218: 0x1005218: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100520c: 0x100520c: addiu a1, a1, 23356
+// 0x0100521c: 0x100521c: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x01005210: 0x1005210: addiu a3, a3, 23532
+// 0x01005220: 0x1005220: addiu a3, a3, 23532
 	ldloc 4
 	ldc.i4 23532
 	add
 	stloc 4
-// 0x01005214: 0x1005214: addiu a0, zero, 5
+// 0x01005224: 0x1005224: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01005218: 0x1005218: jal   0x100449c addiu a2, zero, 89
+// 0x01005228: 0x1005228: jal   0x100449c addiu a2, zero, 89
 	ldc.i4.s 89
 	stloc.3
 	ldloc.0
@@ -6432,8 +6452,8 @@ L_10051e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1005220:
-// 0x01005220: 0x1005220: lw    v0, 16(s0)
+L_1005230:
+// 0x01005230: 0x1005230: lw    v0, 16(s0)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
@@ -6442,33 +6462,33 @@ L_1005220:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01005224: 0x1005224: sll   zero, zero, 0
-// 0x01005228: 0x1005228: beq   v0, zero, 0x10052b4 addu  v0, s0, zero
+// 0x01005234: 0x1005234: sll   zero, zero, 0
+// 0x01005238: 0x1005238: beq   v0, zero, 0x10052c4 addu  v0, s0, zero
 	ldloc 5
 	ldloc 6
 	stloc 5
-	brfalse L_10052b4
+	brfalse L_10052c4
 // --- basic block ---
-// 0x01005230: 0x1005230: addiu v0, s0, 32
+// 0x01005240: 0x1005240: addiu v0, s0, 32
 	ldloc 6
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01005234: 0x1005234: addu  a0, s1, zero
+// 0x01005244: 0x1005244: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01005238: 0x1005238: addiu a1, zero, 22
+// 0x01005248: 0x1005248: addiu a1, zero, 22
 	ldc.i4.s 22
 	stloc.2
-// 0x0100523c: 0x100523c: addiu a2, zero, 4
+// 0x0100524c: 0x100524c: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x01005240: 0x1005240: addiu a3, s0, 28
+// 0x01005250: 0x1005250: addiu a3, s0, 28
 	ldloc 6
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01005244: 0x1005244: jal   0x10031b0 sw    v0, 16(sp)
+// 0x01005254: 0x1005254: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6487,34 +6507,34 @@ L_1005220:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100524c: 0x100524c: bne   v0, zero, 0x1005274 addiu v0, s0, 24
+// 0x0100525c: 0x100525c: bne   v0, zero, 0x1005284 addiu v0, s0, 24
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 24
 	add
 	stloc 5
-	brtrue L_1005274
+	brtrue L_1005284
 // --- basic block ---
-// 0x01005254: 0x1005254: lui   a1, 0x0
+// 0x01005264: 0x1005264: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01005258: 0x1005258: lui   a3, 0x0
+// 0x01005268: 0x1005268: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100525c: 0x100525c: addiu a1, a1, 23356
+// 0x0100526c: 0x100526c: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x01005260: 0x1005260: addiu a3, a3, 23572
+// 0x01005270: 0x1005270: addiu a3, a3, 23572
 	ldloc 4
 	ldc.i4 23572
 	add
 	stloc 4
-// 0x01005264: 0x1005264: addiu a0, zero, 5
+// 0x01005274: 0x1005274: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01005268: 0x1005268: jal   0x100449c addiu a2, zero, 99
+// 0x01005278: 0x1005278: jal   0x100449c addiu a2, zero, 99
 	ldc.i4.s 99
 	stloc.3
 	ldloc.0
@@ -6527,27 +6547,27 @@ L_1005220:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005270: 0x1005270: addiu v0, s0, 24
+// 0x01005280: 0x1005280: addiu v0, s0, 24
 	ldloc 6
 	ldc.i4.s 24
 	add
 	stloc 5
-L_1005274:
-// 0x01005274: 0x1005274: addu  a0, s1, zero
+L_1005284:
+// 0x01005284: 0x1005284: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01005278: 0x1005278: addiu a1, zero, 23
+// 0x01005288: 0x1005288: addiu a1, zero, 23
 	ldc.i4.s 23
 	stloc.2
-// 0x0100527c: 0x100527c: addiu a2, zero, 2
+// 0x0100528c: 0x100528c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01005280: 0x1005280: addiu a3, s0, 20
+// 0x01005290: 0x1005290: addiu a3, s0, 20
 	ldloc 6
 	ldc.i4.s 20
 	add
 	stloc 4
-// 0x01005284: 0x1005284: jal   0x10031b0 sw    v0, 16(sp)
+// 0x01005294: 0x1005294: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6566,32 +6586,32 @@ L_1005274:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100528c: 0x100528c: bne   v0, zero, 0x10052b4 addu  v0, s0, zero
+// 0x0100529c: 0x100529c: bne   v0, zero, 0x10052c4 addu  v0, s0, zero
 	ldloc 5
 	ldloc 6
 	stloc 5
-	brtrue L_10052b4
+	brtrue L_10052c4
 // --- basic block ---
-// 0x01005294: 0x1005294: lui   a1, 0x0
+// 0x010052a4: 0x10052a4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01005298: 0x1005298: lui   a3, 0x0
+// 0x010052a8: 0x10052a8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100529c: 0x100529c: addiu a1, a1, 23356
+// 0x010052ac: 0x10052ac: addiu a1, a1, 23356
 	ldloc.2
 	ldc.i4 23356
 	add
 	stloc.2
-// 0x010052a0: 0x10052a0: addiu a3, a3, 23572
+// 0x010052b0: 0x10052b0: addiu a3, a3, 23572
 	ldloc 4
 	ldc.i4 23572
 	add
 	stloc 4
-// 0x010052a4: 0x10052a4: addiu a0, zero, 5
+// 0x010052b4: 0x10052b4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010052a8: 0x10052a8: jal   0x100449c addiu a2, zero, 107
+// 0x010052b8: 0x10052b8: jal   0x100449c addiu a2, zero, 107
 	ldc.i4.s 107
 	stloc.3
 	ldloc.0
@@ -6604,12 +6624,12 @@ L_1005274:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010052b0: 0x10052b0: addu  v0, s0, zero
+// 0x010052c0: 0x10052c0: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-L_10052b4:
-// 0x010052b4: 0x10052b4: lw    ra, 36(sp)
-// 0x010052b8: 0x10052b8: lw    s1, 32(sp)
+L_10052c4:
+// 0x010052c4: 0x10052c4: lw    ra, 36(sp)
+// 0x010052c8: 0x10052c8: lw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6618,7 +6638,7 @@ L_10052b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010052bc: 0x10052bc: lw    s0, 28(sp)
+// 0x010052cc: 0x10052cc: lw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6627,7 +6647,7 @@ L_10052b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010052c0: 0x10052c0: jr    ra addiu sp, sp, 40
+// 0x010052d0: 0x10052d0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6639,7 +6659,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_get_avg_cross_time_10052c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_get_avg_cross_time_10052d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 lo,int32 ra)
@@ -6695,24 +6715,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010052c8: 0x10052c8: lui   v0, 0x20000
+// 0x010052d8: 0x10052d8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010052cc: 0x10052cc: lw    v1, 31188(v0)
+// 0x010052dc: 0x10052dc: lw    v1, 31652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc 6
-// 0x010052d0: 0x10052d0: addiu sp, sp, -48
+// 0x010052e0: 0x10052e0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010052d4: 0x10052d4: sw    s1, 24(sp)
+// 0x010052e4: 0x10052e4: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6721,7 +6741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010052d8: 0x10052d8: sw    s0, 20(sp)
+// 0x010052e8: 0x10052e8: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6730,8 +6750,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010052dc: 0x10052dc: sw    ra, 44(sp)
-// 0x010052e0: 0x10052e0: sw    s5, 40(sp)
+// 0x010052ec: 0x10052ec: sw    ra, 44(sp)
+// 0x010052f0: 0x10052f0: sw    s5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6740,7 +6760,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010052e4: 0x10052e4: sw    s4, 36(sp)
+// 0x010052f4: 0x10052f4: sw    s4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6749,7 +6769,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010052e8: 0x10052e8: sw    s3, 32(sp)
+// 0x010052f8: 0x10052f8: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6758,7 +6778,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010052ec: 0x10052ec: sw    s2, 28(sp)
+// 0x010052fc: 0x10052fc: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6767,19 +6787,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010052f0: 0x10052f0: addu  s0, a0, zero
+// 0x01005300: 0x1005300: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010052f4: 0x10052f4: addu  s1, a1, zero
+// 0x01005304: 0x1005304: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010052f8: 0x10052f8: beq   v1, zero, 0x100548c addu  v0, zero, zero
+// 0x01005308: 0x1005308: beq   v1, zero, 0x100549c addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_100548c
+	brfalse L_100549c
 // --- basic block ---
-// 0x01005300: 0x1005300: lw    v0, 16(v1)
+// 0x01005310: 0x1005310: lw    v0, 16(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6788,17 +6808,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01005304: 0x1005304: sll   zero, zero, 0
-// 0x01005308: 0x1005308: slt   v0, a0, v0
+// 0x01005314: 0x1005314: sll   zero, zero, 0
+// 0x01005318: 0x1005318: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x0100530c: 0x100530c: beq   v0, zero, 0x10053cc sll   zero, zero, 0
+// 0x0100531c: 0x100531c: beq   v0, zero, 0x10053dc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10053cc
+	brfalse L_10053dc
 // --- basic block ---
-// 0x01005314: 0x1005314: lw    v1, 12(v1)
+// 0x01005324: 0x1005324: lw    v1, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6807,68 +6827,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01005318: 0x1005318: sll   v0, a0, 2
+// 0x01005328: 0x1005328: sll   v0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100531c: 0x100531c: beq   a1, zero, 0x1005330 addu  v0, v1, v0
+// 0x0100532c: 0x100532c: beq   a1, zero, 0x1005340 addu  v0, v1, v0
 	ldloc.2
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-	brfalse L_1005330
+	brfalse L_1005340
 // --- basic block ---
-// 0x01005324: 0x1005324: lhu   a0, 2(v0)
+// 0x01005334: 0x1005334: lhu   a0, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01005328: 0x1005328: j	 0x1005338 ori   v0, zero, 65535
+// 0x01005338: 0x1005338: j	 0x1005348 ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-	br L_1005338
+	br L_1005348
 // --- basic block ---
-L_1005330:
-// 0x01005330: 0x1005330: lhu   a0, 0(v0)
+L_1005340:
+// 0x01005340: 0x1005340: lhu   a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01005334: 0x1005334: ori   v0, zero, 65535
+// 0x01005344: 0x1005344: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-L_1005338:
-// 0x01005338: 0x1005338: beq   a0, v0, 0x10053d0 lui   v0, 0x20000
+L_1005348:
+// 0x01005348: 0x1005348: beq   a0, v0, 0x10053e0 lui   v0, 0x20000
 	ldloc.1
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_10053d0
+	beq  L_10053e0
 // --- basic block ---
-// 0x01005340: 0x1005340: jal   0x1004fc8 sll   zero, zero, 0
+// 0x01005350: 0x1005350: jal   0x1004fd8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_avg_1004fc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_avg_1004fd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005348: 0x1005348: beq   v0, zero, 0x10053cc addu  s2, v0, zero
+// 0x01005358: 0x1005358: beq   v0, zero, 0x10053dc addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_10053cc
+	brfalse L_10053dc
 // --- basic block ---
-// 0x01005350: 0x1005350: jal   0x100405c addu  a0, s0, zero
+// 0x01005360: 0x1005360: jal   0x100405c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6881,7 +6901,7 @@ L_1005338:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005358: 0x1005358: jal   0x1007eb8 addu  a0, v0, zero
+// 0x01005368: 0x1005368: jal   0x1007ec8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6889,55 +6909,55 @@ L_1005338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_cm_1007eb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_cm_1007ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005360: 0x1005360: addiu a0, zero, 100
+// 0x01005370: 0x1005370: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x01005364: 0x1005364: div   v0, a0
+// 0x01005374: 0x1005374: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 14
-// 0x01005368: 0x1005368: mflo  lo
+// 0x01005378: 0x1005378: mflo  lo
 	ldloc 14
 	stloc.1
-// 0x0100536c: 0x100536c: jal   0x10c09c0 sll   zero, zero, 0
+// 0x0100537c: 0x100537c: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005374: 0x1005374: lui   a0, 0x20000
+// 0x01005384: 0x1005384: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01005378: 0x1005378: lw    a3, 23700(a0)
+// 0x01005388: 0x1005388: lw    a3, 24164(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5925
+	ldc.i4 6041
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100537c: 0x100537c: lw    a2, 23696(a0)
+// 0x0100538c: 0x100538c: lw    a2, 24160(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5924
+	ldc.i4 6040
 	add
 	ldelem.i4
 	stloc.3
-// 0x01005380: 0x1005380: addu  a1, v1, zero
+// 0x01005390: 0x1005390: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01005384: 0x1005384: jal   0x10c0798 addu  a0, v0, zero
+// 0x01005394: 0x1005394: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6945,37 +6965,37 @@ L_1005338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100538c: 0x100538c: addu  a0, s2, zero
+// 0x0100539c: 0x100539c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01005390: 0x1005390: addu  s5, v1, zero
+// 0x010053a0: 0x10053a0: addu  s5, v1, zero
 	ldloc 6
 	stloc 13
-// 0x01005394: 0x1005394: jal   0x10c09c0 addu  s4, v0, zero
+// 0x010053a4: 0x10053a4: jal   0x10c1000 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100539c: 0x100539c: addu  a3, v1, zero
+// 0x010053ac: 0x10053ac: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010053a0: 0x10053a0: addu  a1, s5, zero
+// 0x010053b0: 0x10053b0: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x010053a4: 0x10053a4: addu  a0, s4, zero
+// 0x010053b4: 0x10053b4: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x010053a8: 0x10053a8: jal   0x10c07f0 addu  a2, v0, zero
+// 0x010053b8: 0x10053b8: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -6983,55 +7003,55 @@ L_1005338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010053b0: 0x10053b0: addu  a1, v1, zero
+// 0x010053c0: 0x10053c0: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010053b4: 0x10053b4: jal   0x10c0948 addu  a0, v0, zero
+// 0x010053c4: 0x10053c4: jal   0x10c0f88 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixunsdfsi_10c0948(int32,int32,int32)
+	call int32 Cibyl143::__fixunsdfsi_10c0f88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010053bc: 0x10053bc: addiu v0, v0, 1
+// 0x010053cc: 0x10053cc: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010053c0: 0x10053c0: andi  v0, v0, 65535
+// 0x010053d0: 0x10053d0: andi  v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	and
 	stloc 5
-// 0x010053c4: 0x10053c4: bne   v0, zero, 0x100548c sll   zero, zero, 0
+// 0x010053d4: 0x10053d4: bne   v0, zero, 0x100549c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100548c
+	brtrue L_100549c
 // --- basic block ---
-L_10053cc:
-// 0x010053cc: 0x10053cc: lui   v0, 0x20000
+L_10053dc:
+// 0x010053dc: 0x10053dc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10053d0:
-// 0x010053d0: 0x10053d0: lw    v1, 31188(v0)
+L_10053e0:
+// 0x010053e0: 0x10053e0: lw    v1, 31652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc 6
-// 0x010053d4: 0x10053d4: sll   zero, zero, 0
-// 0x010053d8: 0x10053d8: lw    a0, 8(v1)
+// 0x010053e4: 0x10053e4: sll   zero, zero, 0
+// 0x010053e8: 0x10053e8: lw    a0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7040,19 +7060,19 @@ L_10053d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010053dc: 0x10053dc: sll   zero, zero, 0
-// 0x010053e0: 0x10053e0: slt   a0, s0, a0
+// 0x010053ec: 0x10053ec: sll   zero, zero, 0
+// 0x010053f0: 0x10053f0: slt   a0, s0, a0
 	ldloc 9
 	ldloc.1
 	clt
 	stloc.1
-// 0x010053e4: 0x10053e4: beq   a0, zero, 0x100548c addiu v0, zero, -1
+// 0x010053f4: 0x10053f4: beq   a0, zero, 0x100549c addiu v0, zero, -1
 	ldloc.1
 	ldc.i4.m1
 	stloc 5
-	brfalse L_100548c
+	brfalse L_100549c
 // --- basic block ---
-// 0x010053ec: 0x10053ec: lw    v1, 4(v1)
+// 0x010053fc: 0x10053fc: lw    v1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7061,44 +7081,44 @@ L_10053d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010053f0: 0x10053f0: sll   v0, s0, 1
+// 0x01005400: 0x1005400: sll   v0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x010053f4: 0x10053f4: bne   s1, zero, 0x1005408 addu  v0, v1, v0
+// 0x01005404: 0x1005404: bne   s1, zero, 0x1005418 addu  v0, v1, v0
 	ldloc 8
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-	brtrue L_1005408
+	brtrue L_1005418
 // --- basic block ---
-// 0x010053fc: 0x10053fc: lbu   s1, 0(v0)
+// 0x0100540c: 0x100540c: lbu   s1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 8
-// 0x01005400: 0x1005400: j	 0x1005410 sll   zero, zero, 0
-	br L_1005410
+// 0x01005410: 0x1005410: j	 0x1005420 sll   zero, zero, 0
+	br L_1005420
 // --- basic block ---
-L_1005408:
-// 0x01005408: 0x1005408: lbu   s1, 1(v0)
+L_1005418:
+// 0x01005418: 0x1005418: lbu   s1, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 8
-// 0x0100540c: 0x100540c: sll   zero, zero, 0
-L_1005410:
-// 0x01005410: 0x1005410: bne   s1, zero, 0x100541c sll   zero, zero, 0
+// 0x0100541c: 0x100541c: sll   zero, zero, 0
+L_1005420:
+// 0x01005420: 0x1005420: bne   s1, zero, 0x100542c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_100541c
+	brtrue L_100542c
 // --- basic block ---
-// 0x01005418: 0x1005418: addiu s1, zero, 30
+// 0x01005428: 0x1005428: addiu s1, zero, 30
 	ldc.i4.s 30
 	stloc 8
-L_100541c:
-// 0x0100541c: 0x100541c: jal   0x100405c addu  a0, s0, zero
+L_100542c:
+// 0x0100542c: 0x100542c: jal   0x100405c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7111,7 +7131,7 @@ L_100541c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005424: 0x1005424: jal   0x1007eb8 addu  a0, v0, zero
+// 0x01005434: 0x1005434: jal   0x1007ec8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7119,55 +7139,55 @@ L_100541c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_cm_1007eb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_cm_1007ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100542c: 0x100542c: addiu a0, zero, 100
+// 0x0100543c: 0x100543c: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x01005430: 0x1005430: div   v0, a0
+// 0x01005440: 0x1005440: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 14
-// 0x01005434: 0x1005434: mflo  lo
+// 0x01005444: 0x1005444: mflo  lo
 	ldloc 14
 	stloc.1
-// 0x01005438: 0x1005438: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01005448: 0x1005448: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005440: 0x1005440: lui   a0, 0x20000
+// 0x01005450: 0x1005450: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01005444: 0x1005444: lw    a3, 23700(a0)
+// 0x01005454: 0x1005454: lw    a3, 24164(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5925
+	ldc.i4 6041
 	add
 	ldelem.i4
 	stloc 4
-// 0x01005448: 0x1005448: lw    a2, 23696(a0)
+// 0x01005458: 0x1005458: lw    a2, 24160(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5924
+	ldc.i4 6040
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100544c: 0x100544c: addu  a1, v1, zero
+// 0x0100545c: 0x100545c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01005450: 0x1005450: jal   0x10c0798 addu  a0, v0, zero
+// 0x01005460: 0x1005460: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7175,37 +7195,37 @@ L_100541c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005458: 0x1005458: addu  a0, s1, zero
+// 0x01005468: 0x1005468: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0100545c: 0x100545c: addu  s3, v1, zero
+// 0x0100546c: 0x100546c: addu  s3, v1, zero
 	ldloc 6
 	stloc 11
-// 0x01005460: 0x1005460: jal   0x10c09c0 addu  s2, v0, zero
+// 0x01005470: 0x1005470: jal   0x10c1000 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005468: 0x1005468: addu  a3, v1, zero
+// 0x01005478: 0x1005478: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x0100546c: 0x100546c: addu  a1, s3, zero
+// 0x0100547c: 0x100547c: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x01005470: 0x1005470: addu  a0, s2, zero
+// 0x01005480: 0x1005480: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01005474: 0x1005474: jal   0x10c07f0 addu  a2, v0, zero
+// 0x01005484: 0x1005484: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -7213,33 +7233,33 @@ L_100541c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100547c: 0x100547c: addu  a1, v1, zero
+// 0x0100548c: 0x100548c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01005480: 0x1005480: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01005490: 0x1005490: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005488: 0x1005488: addiu v0, v0, 1
+// 0x01005498: 0x1005498: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_100548c:
-// 0x0100548c: 0x100548c: lw    ra, 44(sp)
-// 0x01005490: 0x1005490: lw    s5, 40(sp)
+L_100549c:
+// 0x0100549c: 0x100549c: lw    ra, 44(sp)
+// 0x010054a0: 0x10054a0: lw    s5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7248,7 +7268,7 @@ L_100548c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01005494: 0x1005494: lw    s4, 36(sp)
+// 0x010054a4: 0x10054a4: lw    s4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7257,7 +7277,7 @@ L_100548c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01005498: 0x1005498: lw    s3, 32(sp)
+// 0x010054a8: 0x10054a8: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7266,7 +7286,7 @@ L_100548c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100549c: 0x100549c: lw    s2, 28(sp)
+// 0x010054ac: 0x10054ac: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7275,7 +7295,7 @@ L_100548c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010054a0: 0x10054a0: lw    s1, 24(sp)
+// 0x010054b0: 0x10054b0: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7284,7 +7304,7 @@ L_100548c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010054a4: 0x10054a4: lw    s0, 20(sp)
+// 0x010054b4: 0x10054b4: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7293,7 +7313,7 @@ L_100548c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010054a8: 0x10054a8: jr    ra addiu sp, sp, 48
+// 0x010054b8: 0x10054b8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
diff --git a/converted/Cibyl30.j b/converted/Cibyl30.j
index 82b67d9..776ce4b 100644
--- a/converted/Cibyl30.j
+++ b/converted/Cibyl30.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl30::.ctor
 
-.method public static int32 roadmap_facebook_setting_dialog_1028aa4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_facebook_setting_dialog_1028ab4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 s0,int32[] mem,int32 s1,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028aa4: 0x1028aa4: addiu sp, sp, -32
+// 0x01028ab4: 0x1028ab4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01028aa8: 0x1028aa8: sw    s0, 20(sp)
+// 0x01028ab8: 0x1028ab8: sw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -96,19 +96,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01028aac: 0x1028aac: lui   s0, 0x10000
+// 0x01028abc: 0x1028abc: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01028ab0: 0x1028ab0: addiu a0, s0, -28748
+// 0x01028ac0: 0x1028ac0: addiu a0, s0, -28748
 	ldloc 7
 	ldc.i4 -28748
 	add
 	stloc.1
-// 0x01028ab4: 0x1028ab4: addiu a1, zero, 1
+// 0x01028ac4: 0x1028ac4: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01028ab8: 0x1028ab8: sw    ra, 28(sp)
-// 0x01028abc: 0x1028abc: jal   0x1095eec sw    s1, 24(sp)
+// 0x01028ac8: 0x1028ac8: sw    ra, 28(sp)
+// 0x01028acc: 0x1028acc: jal   0x1096534 sw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -122,16 +122,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028ac4: 0x1028ac4: bne   v0, zero, 0x1028ae0 sll   zero, zero, 0
+// 0x01028ad4: 0x1028ad4: bne   v0, zero, 0x1028af0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1028ae0
+	brtrue L_1028af0
 // --- basic block ---
-// 0x01028acc: 0x1028acc: jal   0x1027ae8 addiu a0, zero, 1
+// 0x01028adc: 0x1028adc: jal   0x1027af8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -139,17 +139,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::create_dialog_1027ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::create_dialog_1027af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028ad4: 0x1028ad4: addiu a0, s0, -28748
+// 0x01028ae4: 0x1028ae4: addiu a0, s0, -28748
 	ldloc 7
 	ldc.i4 -28748
 	add
 	stloc.1
-// 0x01028ad8: 0x1028ad8: jal   0x1095eec addiu a1, zero, 1
+// 0x01028ae8: 0x1028ae8: jal   0x1096534 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -157,13 +157,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1028ae0:
-// 0x01028ae0: 0x1028ae0: jal   0x1026db8 lui   s0, 0x0
+L_1028af0:
+// 0x01028af0: 0x1028af0: jal   0x1026dc8 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
 	ldloc.0
@@ -171,12 +171,12 @@ L_1028ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_refresh_connection_1026db8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_refresh_connection_1026dc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028ae8: 0x1028ae8: jal   0x10269e0 addiu s0, s0, 6504
+// 0x01028af8: 0x1028af8: jal   0x10269f0 addiu s0, s0, 6504
 	ldloc 7
 	ldc.i4 6504
 	add
@@ -186,12 +186,12 @@ L_1028ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028af0: 0x1028af0: jal   0x1026a40 addu  s1, v0, zero
+// 0x01028b00: 0x1028b00: jal   0x1026a50 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -199,42 +199,42 @@ L_1028ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028af8: 0x1028af8: sll   v0, v0, 2
+// 0x01028b08: 0x1028b08: sll   v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01028afc: 0x1028afc: addu  v0, v0, s0
+// 0x01028b0c: 0x1028b0c: addu  v0, v0, s0
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x01028b00: 0x1028b00: lw    a1, 0(v0)
+// 0x01028b10: 0x1028b10: lw    a1, 0(v0)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01028b04: 0x1028b04: lui   a0, 0x10000
+// 0x01028b14: 0x1028b14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028b08: 0x1028b08: sll   s1, s1, 2
+// 0x01028b18: 0x1028b18: sll   s1, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x01028b0c: 0x1028b0c: addiu a0, a0, -28636
+// 0x01028b1c: 0x1028b1c: addiu a0, a0, -28636
 	ldloc.1
 	ldc.i4 -28636
 	add
 	stloc.1
-// 0x01028b10: 0x1028b10: jal   0x1094734 addu  s0, s1, s0
+// 0x01028b20: 0x1028b20: jal   0x1094d58 addu  s0, s1, s0
 	ldloc 9
 	ldloc 7
 	add
@@ -244,22 +244,22 @@ L_1028ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028b18: 0x1028b18: lw    a1, 0(s0)
+// 0x01028b28: 0x1028b28: lw    a1, 0(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01028b1c: 0x1028b1c: lui   a0, 0x10000
+// 0x01028b2c: 0x1028b2c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028b20: 0x1028b20: jal   0x1094734 addiu a0, a0, -28616
+// 0x01028b30: 0x1028b30: jal   0x1094d58 addiu a0, a0, -28616
 	ldloc.1
 	ldc.i4 -28616
 	add
@@ -269,49 +269,49 @@ L_1028ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028b28: 0x1028b28: jal   0x1026cd4 sll   zero, zero, 0
+// 0x01028b38: 0x1028b38: jal   0x1026ce4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_is_sending_enabled_1026cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_is_sending_enabled_1026ce4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028b30: 0x1028b30: beq   v0, zero, 0x1028b44 lui   v1, 0x60000
+// 0x01028b40: 0x1028b40: beq   v0, zero, 0x1028b54 lui   v1, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1028b44
+	brfalse L_1028b54
 // --- basic block ---
-// 0x01028b38: 0x1028b38: lw    a1, -26516(v1)
+// 0x01028b48: 0x1028b48: lw    a1, -26052(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6629
+	ldc.i4 -6513
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028b3c: 0x1028b3c: j	 0x1028b50 lui   a0, 0x10000
+// 0x01028b4c: 0x1028b4c: j	 0x1028b60 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1028b50
+	br L_1028b60
 // --- basic block ---
-L_1028b44:
-// 0x01028b44: 0x1028b44: addiu v1, v1, -26516
+L_1028b54:
+// 0x01028b54: 0x1028b54: addiu v1, v1, -26052
 	ldloc 5
-	ldc.i4 -26516
+	ldc.i4 -26052
 	add
 	stloc 5
-// 0x01028b48: 0x1028b48: lw    a1, 4(v1)
+// 0x01028b58: 0x1028b58: lw    a1, 4(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -320,11 +320,11 @@ L_1028b44:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028b4c: 0x1028b4c: lui   a0, 0x10000
+// 0x01028b5c: 0x1028b5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1028b50:
-// 0x01028b50: 0x1028b50: jal   0x1094734 addiu a0, a0, -28600
+L_1028b60:
+// 0x01028b60: 0x1028b60: jal   0x1094d58 addiu a0, a0, -28600
 	ldloc.1
 	ldc.i4 -28600
 	add
@@ -334,49 +334,49 @@ L_1028b50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028b58: 0x1028b58: jal   0x1026bb8 sll   zero, zero, 0
+// 0x01028b68: 0x1028b68: jal   0x1026bc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_is_munching_enabled_1026bb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_is_munching_enabled_1026bc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028b60: 0x1028b60: beq   v0, zero, 0x1028b74 lui   v1, 0x60000
+// 0x01028b70: 0x1028b70: beq   v0, zero, 0x1028b84 lui   v1, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1028b74
+	brfalse L_1028b84
 // --- basic block ---
-// 0x01028b68: 0x1028b68: lw    a1, -26516(v1)
+// 0x01028b78: 0x1028b78: lw    a1, -26052(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6629
+	ldc.i4 -6513
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028b6c: 0x1028b6c: j	 0x1028b80 lui   a0, 0x10000
+// 0x01028b7c: 0x1028b7c: j	 0x1028b90 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1028b80
+	br L_1028b90
 // --- basic block ---
-L_1028b74:
-// 0x01028b74: 0x1028b74: addiu v1, v1, -26516
+L_1028b84:
+// 0x01028b84: 0x1028b84: addiu v1, v1, -26052
 	ldloc 5
-	ldc.i4 -26516
+	ldc.i4 -26052
 	add
 	stloc 5
-// 0x01028b78: 0x1028b78: lw    a1, 4(v1)
+// 0x01028b88: 0x1028b88: lw    a1, 4(v1)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -385,11 +385,11 @@ L_1028b74:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028b7c: 0x1028b7c: lui   a0, 0x10000
+// 0x01028b8c: 0x1028b8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1028b80:
-// 0x01028b80: 0x1028b80: jal   0x1094734 addiu a0, a0, -28580
+L_1028b90:
+// 0x01028b90: 0x1028b90: jal   0x1094d58 addiu a0, a0, -28580
 	ldloc.1
 	ldc.i4 -28580
 	add
@@ -399,13 +399,13 @@ L_1028b80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028b88: 0x1028b88: lw    ra, 28(sp)
-// 0x01028b8c: 0x1028b8c: lw    s1, 24(sp)
+// 0x01028b98: 0x1028b98: lw    ra, 28(sp)
+// 0x01028b9c: 0x1028b9c: lw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -414,7 +414,7 @@ L_1028b80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01028b90: 0x1028b90: lw    s0, 20(sp)
+// 0x01028ba0: 0x1028ba0: lw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -423,7 +423,7 @@ L_1028b80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01028b94: 0x1028b94: jr    ra addiu sp, sp, 32
+// 0x01028ba4: 0x1028ba4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -435,7 +435,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_twitter_setting_dialog_1028b9c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_twitter_setting_dialog_1028bac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 ra)
@@ -473,12 +473,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028b9c: 0x1028b9c: addiu sp, sp, -24
+// 0x01028bac: 0x1028bac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01028ba0: 0x1028ba0: sw    s0, 16(sp)
+// 0x01028bb0: 0x1028bb0: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -487,16 +487,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01028ba4: 0x1028ba4: lui   s0, 0x10000
+// 0x01028bb4: 0x1028bb4: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01028ba8: 0x1028ba8: addiu a0, s0, -27856
+// 0x01028bb8: 0x1028bb8: addiu a0, s0, -27856
 	ldloc 8
 	ldc.i4 -27856
 	add
 	stloc.1
-// 0x01028bac: 0x1028bac: sw    ra, 20(sp)
-// 0x01028bb0: 0x1028bb0: jal   0x1095eec addu  a1, zero, zero
+// 0x01028bbc: 0x1028bbc: sw    ra, 20(sp)
+// 0x01028bc0: 0x1028bc0: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -504,16 +504,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028bb8: 0x1028bb8: bne   v0, zero, 0x1028bd4 sll   zero, zero, 0
+// 0x01028bc8: 0x1028bc8: bne   v0, zero, 0x1028be4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1028bd4
+	brtrue L_1028be4
 // --- basic block ---
-// 0x01028bc0: 0x1028bc0: jal   0x1027ae8 addu  a0, zero, zero
+// 0x01028bd0: 0x1028bd0: jal   0x1027af8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -521,17 +521,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::create_dialog_1027ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::create_dialog_1027af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028bc8: 0x1028bc8: addiu a0, s0, -27856
+// 0x01028bd8: 0x1028bd8: addiu a0, s0, -27856
 	ldloc 8
 	ldc.i4 -27856
 	add
 	stloc.1
-// 0x01028bcc: 0x1028bcc: jal   0x1095eec addu  a1, zero, zero
+// 0x01028bdc: 0x1028bdc: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -539,13 +539,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1028bd4:
-// 0x01028bd4: 0x1028bd4: jal   0x1026edc lui   s0, 0x0
+L_1028be4:
+// 0x01028be4: 0x1028be4: jal   0x1026eec lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -553,50 +553,50 @@ L_1028bd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028bdc: 0x1028bdc: beq   v0, zero, 0x1028bf0 sll   zero, zero, 0
+// 0x01028bec: 0x1028bec: beq   v0, zero, 0x1028c00 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1028bf0
+	brfalse L_1028c00
 // --- basic block ---
-// 0x01028be4: 0x1028be4: lui   a0, 0x10000
+// 0x01028bf4: 0x1028bf4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028be8: 0x1028be8: j	 0x1028bf8 addiu a0, a0, -32232
+// 0x01028bf8: 0x1028bf8: j	 0x1028c08 addiu a0, a0, -32232
 	ldloc.1
 	ldc.i4 -32232
 	add
 	stloc.1
-	br L_1028bf8
+	br L_1028c08
 // --- basic block ---
-L_1028bf0:
-// 0x01028bf0: 0x1028bf0: lui   a0, 0x10000
+L_1028c00:
+// 0x01028c00: 0x1028c00: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028bf4: 0x1028bf4: addiu a0, a0, -32212
+// 0x01028c04: 0x1028c04: addiu a0, a0, -32212
 	ldloc.1
 	ldc.i4 -32212
 	add
 	stloc.1
-L_1028bf8:
-// 0x01028bf8: 0x1028bf8: jal   0x101cd60 sll   zero, zero, 0
+L_1028c08:
+// 0x01028c08: 0x1028c08: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c00: 0x1028c00: addu  a1, v0, zero
+// 0x01028c10: 0x1028c10: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01028c04: 0x1028c04: jal   0x1094770 addiu a0, s0, 32648
+// 0x01028c14: 0x1028c14: jal   0x1094d94 addiu a0, s0, 32648
 	ldloc 8
 	ldc.i4 32648
 	add
@@ -606,31 +606,31 @@ L_1028bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c0c: 0x1028c0c: jal   0x1026d40 sll   zero, zero, 0
+// 0x01028c1c: 0x1028c1c: jal   0x1026d50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_get_username_1026d40(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_get_username_1026d50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c14: 0x1028c14: lui   a0, 0x10000
+// 0x01028c24: 0x1028c24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028c18: 0x1028c18: addiu a0, a0, -28668
+// 0x01028c28: 0x1028c28: addiu a0, a0, -28668
 	ldloc.1
 	ldc.i4 -28668
 	add
 	stloc.1
-// 0x01028c1c: 0x1028c1c: jal   0x1094770 addu  a1, v0, zero
+// 0x01028c2c: 0x1028c2c: jal   0x1094d94 addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -638,31 +638,31 @@ L_1028bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c24: 0x1028c24: jal   0x1026d1c sll   zero, zero, 0
+// 0x01028c34: 0x1028c34: jal   0x1026d2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_get_password_1026d1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_get_password_1026d2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c2c: 0x1028c2c: lui   a0, 0x10000
+// 0x01028c3c: 0x1028c3c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028c30: 0x1028c30: addiu a0, a0, -28652
+// 0x01028c40: 0x1028c40: addiu a0, a0, -28652
 	ldloc.1
 	ldc.i4 -28652
 	add
 	stloc.1
-// 0x01028c34: 0x1028c34: jal   0x1094770 addu  a1, v0, zero
+// 0x01028c44: 0x1028c44: jal   0x1094d94 addu  a1, v0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -670,49 +670,49 @@ L_1028bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c3c: 0x1028c3c: jal   0x1026cf8 sll   zero, zero, 0
+// 0x01028c4c: 0x1028c4c: jal   0x1026d08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_sending_enabled_1026cf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_is_sending_enabled_1026d08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c44: 0x1028c44: beq   v0, zero, 0x1028c58 lui   v1, 0x60000
+// 0x01028c54: 0x1028c54: beq   v0, zero, 0x1028c68 lui   v1, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1028c58
+	brfalse L_1028c68
 // --- basic block ---
-// 0x01028c4c: 0x1028c4c: lw    a1, -26516(v1)
+// 0x01028c5c: 0x1028c5c: lw    a1, -26052(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6629
+	ldc.i4 -6513
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028c50: 0x1028c50: j	 0x1028c64 lui   a0, 0x10000
+// 0x01028c60: 0x1028c60: j	 0x1028c74 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1028c64
+	br L_1028c74
 // --- basic block ---
-L_1028c58:
-// 0x01028c58: 0x1028c58: addiu v1, v1, -26516
+L_1028c68:
+// 0x01028c68: 0x1028c68: addiu v1, v1, -26052
 	ldloc 5
-	ldc.i4 -26516
+	ldc.i4 -26052
 	add
 	stloc 5
-// 0x01028c5c: 0x1028c5c: lw    a1, 4(v1)
+// 0x01028c6c: 0x1028c6c: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -721,11 +721,11 @@ L_1028c58:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028c60: 0x1028c60: lui   a0, 0x10000
+// 0x01028c70: 0x1028c70: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1028c64:
-// 0x01028c64: 0x1028c64: jal   0x1094734 addiu a0, a0, -28600
+L_1028c74:
+// 0x01028c74: 0x1028c74: jal   0x1094d58 addiu a0, a0, -28600
 	ldloc.1
 	ldc.i4 -28600
 	add
@@ -735,49 +735,49 @@ L_1028c64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c6c: 0x1028c6c: jal   0x1026bdc sll   zero, zero, 0
+// 0x01028c7c: 0x1028c7c: jal   0x1026bec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_munching_enabled_1026bdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_is_munching_enabled_1026bec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c74: 0x1028c74: beq   v0, zero, 0x1028c88 lui   v1, 0x60000
+// 0x01028c84: 0x1028c84: beq   v0, zero, 0x1028c98 lui   v1, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1028c88
+	brfalse L_1028c98
 // --- basic block ---
-// 0x01028c7c: 0x1028c7c: lw    a1, -26516(v1)
+// 0x01028c8c: 0x1028c8c: lw    a1, -26052(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6629
+	ldc.i4 -6513
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028c80: 0x1028c80: j	 0x1028c94 lui   a0, 0x10000
+// 0x01028c90: 0x1028c90: j	 0x1028ca4 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1028c94
+	br L_1028ca4
 // --- basic block ---
-L_1028c88:
-// 0x01028c88: 0x1028c88: addiu v1, v1, -26516
+L_1028c98:
+// 0x01028c98: 0x1028c98: addiu v1, v1, -26052
 	ldloc 5
-	ldc.i4 -26516
+	ldc.i4 -26052
 	add
 	stloc 5
-// 0x01028c8c: 0x1028c8c: lw    a1, 4(v1)
+// 0x01028c9c: 0x1028c9c: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -786,11 +786,11 @@ L_1028c88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028c90: 0x1028c90: lui   a0, 0x10000
+// 0x01028ca0: 0x1028ca0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1028c94:
-// 0x01028c94: 0x1028c94: jal   0x1094734 addiu a0, a0, -28580
+L_1028ca4:
+// 0x01028ca4: 0x1028ca4: jal   0x1094d58 addiu a0, a0, -28580
 	ldloc.1
 	ldc.i4 -28580
 	add
@@ -800,13 +800,13 @@ L_1028c94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01028c9c: 0x1028c9c: lw    ra, 20(sp)
-// 0x01028ca0: 0x1028ca0: lw    s0, 16(sp)
+// 0x01028cac: 0x1028cac: lw    ra, 20(sp)
+// 0x01028cb0: 0x1028cb0: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -815,7 +815,7 @@ L_1028c94:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01028ca4: 0x1028ca4: jr    ra addiu sp, sp, 24
+// 0x01028cb4: 0x1028cb4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -827,7 +827,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 twitter_network_error_1028cac(int32,int32,int32,int32,int32)
+.method public static int32 twitter_network_error_1028cbc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -862,18 +862,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028cac: 0x1028cac: lui   a0, 0x1030000
+// 0x01028cbc: 0x1028cbc: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01028cb0: 0x1028cb0: addiu sp, sp, -24
+// 0x01028cc0: 0x1028cc0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01028cb4: 0x1028cb4: sw    ra, 20(sp)
-// 0x01028cb8: 0x1028cb8: jal   0x104fd00 addiu a0, a0, -29524
+// 0x01028cc4: 0x1028cc4: sw    ra, 20(sp)
+// 0x01028cc8: 0x1028cc8: jal   0x104fd10 addiu a0, a0, -29508
 	ldloc.1
-	ldc.i4 -29524
+	ldc.i4 -29508
 	add
 	stloc.1
 	ldloc.0
@@ -881,15 +881,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028cc0: 0x1028cc0: lui   a0, 0x10000
+// 0x01028cd0: 0x1028cd0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028cc4: 0x1028cc4: jal   0x101cd60 addiu a0, a0, -26456
+// 0x01028cd4: 0x1028cd4: jal   0x101cd70 addiu a0, a0, -26456
 	ldloc.1
 	ldc.i4 -26456
 	add
@@ -899,18 +899,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028ccc: 0x1028ccc: lui   a0, 0x0
+// 0x01028cdc: 0x1028cdc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01028cd0: 0x1028cd0: addu  a1, v0, zero
+// 0x01028ce0: 0x1028ce0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01028cd4: 0x1028cd4: jal   0x104c148 addiu a0, a0, 30092
+// 0x01028ce4: 0x1028ce4: jal   0x104c158 addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
@@ -920,12 +920,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028cdc: 0x1028cdc: jal   0x10268f0 addu  a0, zero, zero
+// 0x01028cec: 0x1028cec: jal   0x1026900 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -933,25 +933,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_logged_in_10268f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_twitter_set_logged_in_1026900(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028ce4: 0x1028ce4: jal   0x1028b9c sll   zero, zero, 0
+// 0x01028cf4: 0x1028cf4: jal   0x1028bac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_twitter_setting_dialog_1028b9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_twitter_setting_dialog_1028bac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01028cec: 0x1028cec: lw    ra, 20(sp)
-// 0x01028cf0: 0x1028cf0: sll   zero, zero, 0
-// 0x01028cf4: 0x1028cf4: jr    ra addiu sp, sp, 24
+// 0x01028cfc: 0x1028cfc: lw    ra, 20(sp)
+// 0x01028d00: 0x1028d00: sll   zero, zero, 0
+// 0x01028d04: 0x1028d04: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -963,7 +963,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_factory_find_action_1028cfc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_find_action_1028d0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -1004,12 +1004,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028cfc: 0x1028cfc: addiu sp, sp, -32
+// 0x01028d0c: 0x1028d0c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01028d00: 0x1028d00: sw    s1, 24(sp)
+// 0x01028d10: 0x1028d10: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1018,7 +1018,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01028d04: 0x1028d04: sw    s0, 20(sp)
+// 0x01028d14: 0x1028d14: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1027,57 +1027,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01028d08: 0x1028d08: sw    ra, 28(sp)
-// 0x01028d0c: 0x1028d0c: addu  s0, a0, zero
+// 0x01028d18: 0x1028d18: sw    ra, 28(sp)
+// 0x01028d1c: 0x1028d1c: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01028d10: 0x1028d10: j	 0x1028d2c addu  s1, a1, zero
+// 0x01028d20: 0x1028d20: j	 0x1028d3c addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-	br L_1028d2c
+	br L_1028d3c
 // --- basic block ---
-L_1028d18:
-// 0x01028d18: 0x1028d18: jal   0x1001b14 sll   zero, zero, 0
+L_1028d28:
+// 0x01028d28: 0x1028d28: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01028d20: 0x1028d20: beq   v0, zero, 0x1028d40 sll   zero, zero, 0
+// 0x01028d30: 0x1028d30: beq   v0, zero, 0x1028d50 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1028d40
+	brfalse L_1028d50
 // --- basic block ---
-// 0x01028d28: 0x1028d28: addiu s0, s0, 24
+// 0x01028d38: 0x1028d38: addiu s0, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 5
-L_1028d2c:
-// 0x01028d2c: 0x1028d2c: lw    v0, 0(s0)
+L_1028d3c:
+// 0x01028d3c: 0x1028d3c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01028d30: 0x1028d30: addu  a1, s1, zero
+// 0x01028d40: 0x1028d40: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01028d34: 0x1028d34: bne   v0, zero, 0x1028d18 addu  a0, v0, zero
+// 0x01028d44: 0x1028d44: bne   v0, zero, 0x1028d28 addu  a0, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_1028d18
+	brtrue L_1028d28
 // --- basic block ---
-// 0x01028d3c: 0x1028d3c: addu  s0, zero, zero
+// 0x01028d4c: 0x1028d4c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1028d40:
-// 0x01028d40: 0x1028d40: lw    ra, 28(sp)
-// 0x01028d44: 0x1028d44: addu  v0, s0, zero
+L_1028d50:
+// 0x01028d50: 0x1028d50: lw    ra, 28(sp)
+// 0x01028d54: 0x1028d54: addu  v0, s0, zero
 	ldloc 5
 	stloc 7
-// 0x01028d48: 0x1028d48: lw    s1, 24(sp)
+// 0x01028d58: 0x1028d58: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1086,7 +1086,7 @@ L_1028d40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01028d4c: 0x1028d4c: lw    s0, 20(sp)
+// 0x01028d5c: 0x1028d5c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1095,7 +1095,7 @@ L_1028d40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028d50: 0x1028d50: jr    ra addiu sp, sp, 32
+// 0x01028d60: 0x1028d60: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1107,7 +1107,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_factory_keyboard_1028d58(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_keyboard_1028d68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 ra,int32 v1)
@@ -1148,15 +1148,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028d58: 0x1028d58: addiu sp, sp, -32
+// 0x01028d68: 0x1028d68: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01028d5c: 0x1028d5c: lui   v0, 0x60000
+// 0x01028d6c: 0x1028d6c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01028d60: 0x1028d60: sw    s0, 20(sp)
+// 0x01028d70: 0x1028d70: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1165,16 +1165,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01028d64: 0x1028d64: lw    s0, -26476(v0)
+// 0x01028d74: 0x1028d74: lw    s0, -26012(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6619
+	ldc.i4 -6503
 	add
 	ldelem.i4
 	stloc 6
-// 0x01028d68: 0x1028d68: sw    s1, 24(sp)
+// 0x01028d78: 0x1028d78: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1183,18 +1183,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01028d6c: 0x1028d6c: sw    ra, 28(sp)
-// 0x01028d70: 0x1028d70: bne   s0, zero, 0x1028dc4 addu  s1, a0, zero
+// 0x01028d7c: 0x1028d7c: sw    ra, 28(sp)
+// 0x01028d80: 0x1028d80: bne   s0, zero, 0x1028dd4 addu  s1, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 8
-	brtrue L_1028dc4
+	brtrue L_1028dd4
 // --- basic block ---
-// 0x01028d78: 0x1028d78: j	 0x1028dd4 sll   zero, zero, 0
-	br L_1028dd4
+// 0x01028d88: 0x1028d88: j	 0x1028de4 sll   zero, zero, 0
+	br L_1028de4
 // --- basic block ---
-L_1028d80:
-// 0x01028d80: 0x1028d80: jal   0x1001c08 sll   zero, zero, 0
+L_1028d90:
+// 0x01028d90: 0x1028d90: jal   0x1001c08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1205,11 +1205,11 @@ L_1028d80:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01028d88: 0x1028d88: bne   v0, zero, 0x1028dc0 sll   zero, zero, 0
+// 0x01028d98: 0x1028d98: bne   v0, zero, 0x1028dd0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1028dc0
+	brtrue L_1028dd0
 // --- basic block ---
-// 0x01028d90: 0x1028d90: lw    v0, 4(s0)
+// 0x01028da0: 0x1028da0: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1218,12 +1218,12 @@ L_1028d80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028d94: 0x1028d94: sll   zero, zero, 0
-// 0x01028d98: 0x1028d98: beq   v0, zero, 0x1028dc0 sll   zero, zero, 0
+// 0x01028da4: 0x1028da4: sll   zero, zero, 0
+// 0x01028da8: 0x1028da8: beq   v0, zero, 0x1028dd0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1028dc0
+	brfalse L_1028dd0
 // --- basic block ---
-// 0x01028da0: 0x1028da0: lw    v0, 20(v0)
+// 0x01028db0: 0x1028db0: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1232,16 +1232,16 @@ L_1028d80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028da4: 0x1028da4: sll   zero, zero, 0
-// 0x01028da8: 0x1028da8: beq   v0, zero, 0x1028dc4 addiu s0, s0, 8
+// 0x01028db4: 0x1028db4: sll   zero, zero, 0
+// 0x01028db8: 0x1028db8: beq   v0, zero, 0x1028dd4 addiu s0, s0, 8
 	ldloc 5
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-	brfalse L_1028dc4
+	brfalse L_1028dd4
 // --- basic block ---
-// 0x01028db0: 0x1028db0: jalr  v0 sll   zero, zero, 0
+// 0x01028dc0: 0x1028dc0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1253,35 +1253,35 @@ L_1028d80:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01028db8: 0x1028db8: j	 0x1028dd4 sll   zero, zero, 0
-	br L_1028dd4
+// 0x01028dc8: 0x1028dc8: j	 0x1028de4 sll   zero, zero, 0
+	br L_1028de4
 // --- basic block ---
-L_1028dc0:
-// 0x01028dc0: 0x1028dc0: addiu s0, s0, 8
+L_1028dd0:
+// 0x01028dd0: 0x1028dd0: addiu s0, s0, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-L_1028dc4:
-// 0x01028dc4: 0x1028dc4: lw    v0, 0(s0)
+L_1028dd4:
+// 0x01028dd4: 0x1028dd4: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01028dc8: 0x1028dc8: addu  a1, s1, zero
+// 0x01028dd8: 0x1028dd8: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01028dcc: 0x1028dcc: bne   v0, zero, 0x1028d80 addu  a0, v0, zero
+// 0x01028ddc: 0x1028ddc: bne   v0, zero, 0x1028d90 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brtrue L_1028d80
+	brtrue L_1028d90
 // --- basic block ---
-L_1028dd4:
-// 0x01028dd4: 0x1028dd4: lw    ra, 28(sp)
-// 0x01028dd8: 0x1028dd8: lw    s1, 24(sp)
+L_1028de4:
+// 0x01028de4: 0x1028de4: lw    ra, 28(sp)
+// 0x01028de8: 0x1028de8: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1290,7 +1290,7 @@ L_1028dd4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01028ddc: 0x1028ddc: lw    s0, 20(sp)
+// 0x01028dec: 0x1028dec: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1299,7 +1299,7 @@ L_1028dd4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01028de0: 0x1028de0: jr    ra addiu sp, sp, 32
+// 0x01028df0: 0x1028df0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1311,7 +1311,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_factory_usage_1028de8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_usage_1028df8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 v1,int32 s4,int32 s2,int32 s3,int32 ra)
@@ -1361,12 +1361,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028de8: 0x1028de8: addiu sp, sp, -48
+// 0x01028df8: 0x1028df8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01028dec: 0x1028dec: sw    s2, 32(sp)
+// 0x01028dfc: 0x1028dfc: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1375,7 +1375,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01028df0: 0x1028df0: sw    s0, 24(sp)
+// 0x01028e00: 0x1028e00: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1384,8 +1384,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01028df4: 0x1028df4: sw    ra, 44(sp)
-// 0x01028df8: 0x1028df8: sw    s4, 40(sp)
+// 0x01028e04: 0x1028e04: sw    ra, 44(sp)
+// 0x01028e08: 0x1028e08: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1394,7 +1394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01028dfc: 0x1028dfc: sw    s3, 36(sp)
+// 0x01028e0c: 0x1028e0c: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1403,7 +1403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01028e00: 0x1028e00: sw    s1, 28(sp)
+// 0x01028e10: 0x1028e10: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1412,19 +1412,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01028e04: 0x1028e04: addu  s2, a0, zero
+// 0x01028e14: 0x1028e14: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01028e08: 0x1028e08: beq   a0, zero, 0x1028e24 addu  s0, a1, zero
+// 0x01028e18: 0x1028e18: beq   a0, zero, 0x1028e34 addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 8
-	brfalse L_1028e24
+	brfalse L_1028e34
 // --- basic block ---
-// 0x01028e10: 0x1028e10: lui   a1, 0x10000
+// 0x01028e20: 0x1028e20: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01028e14: 0x1028e14: jal   0x1001c08 addiu a1, a1, -26244
+// 0x01028e24: 0x1028e24: jal   0x1001c08 addiu a1, a1, -26244
 	ldloc.2
 	ldc.i4 -26244
 	add
@@ -1439,17 +1439,17 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01028e1c: 0x1028e1c: bne   v0, zero, 0x1028e88 lui   a1, 0x10000
+// 0x01028e2c: 0x1028e2c: bne   v0, zero, 0x1028e98 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1028e88
+	brtrue L_1028e98
 // --- basic block ---
-L_1028e24:
-// 0x01028e24: 0x1028e24: lui   a0, 0x10000
+L_1028e34:
+// 0x01028e34: 0x1028e34: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01028e28: 0x1028e28: jal   0x1000350 addiu a0, a0, -26236
+// 0x01028e38: 0x1028e38: jal   0x1000350 addiu a0, a0, -26236
 	ldloc.1
 	ldc.i4 -26236
 	add
@@ -1458,33 +1458,33 @@ L_1028e24:
 	call int32 Cibyl::puts_1000350(int32)
 	stloc 5
 // --- basic block ---
-// 0x01028e30: 0x1028e30: lui   s4, 0x10000
+// 0x01028e40: 0x1028e40: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01028e34: 0x1028e34: lui   v0, 0x60000
+// 0x01028e44: 0x1028e44: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01028e38: 0x1028e38: lw    s1, -26476(v0)
+// 0x01028e48: 0x1028e48: lw    s1, -26012(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6619
+	ldc.i4 -6503
 	add
 	ldelem.i4
 	stloc 7
-// 0x01028e3c: 0x1028e3c: addiu s4, s4, -26224
+// 0x01028e4c: 0x1028e4c: addiu s4, s4, -26224
 	ldloc 10
 	ldc.i4 -26224
 	add
 	stloc 10
-// 0x01028e40: 0x1028e40: j	 0x1028e6c lui   s3, 0x60000
+// 0x01028e50: 0x1028e50: j	 0x1028e7c lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 12
-	br L_1028e6c
+	br L_1028e7c
 // --- basic block ---
-L_1028e48:
-// 0x01028e48: 0x1028e48: lw    v0, 4(s1)
+L_1028e58:
+// 0x01028e58: 0x1028e58: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1493,25 +1493,25 @@ L_1028e48:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028e4c: 0x1028e4c: sll   zero, zero, 0
-// 0x01028e50: 0x1028e50: beq   v0, zero, 0x1028e6c addiu s1, s1, 8
+// 0x01028e5c: 0x1028e5c: sll   zero, zero, 0
+// 0x01028e60: 0x1028e60: beq   v0, zero, 0x1028e7c addiu s1, s1, 8
 	ldloc 5
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 7
-	brfalse L_1028e6c
+	brfalse L_1028e7c
 // --- basic block ---
-// 0x01028e58: 0x1028e58: lw    a1, -26472(s3)
+// 0x01028e68: 0x1028e68: lw    a1, -26008(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6618
+	ldc.i4 -6502
 	add
 	ldelem.i4
 	stloc.2
-// 0x01028e5c: 0x1028e5c: lw    v0, 16(v0)
+// 0x01028e6c: 0x1028e6c: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1520,10 +1520,10 @@ L_1028e48:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028e60: 0x1028e60: addu  a2, a1, zero
+// 0x01028e70: 0x1028e70: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01028e64: 0x1028e64: jal   0x1000e78 sw    v0, 16(sp)
+// 0x01028e74: 0x1028e74: jal   0x1000e78 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1542,37 +1542,37 @@ L_1028e48:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1028e6c:
-// 0x01028e6c: 0x1028e6c: lw    v0, 0(s1)
+L_1028e7c:
+// 0x01028e7c: 0x1028e7c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01028e70: 0x1028e70: addu  a0, s4, zero
+// 0x01028e80: 0x1028e80: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x01028e74: 0x1028e74: bne   v0, zero, 0x1028e48 addu  a3, v0, zero
+// 0x01028e84: 0x1028e84: bne   v0, zero, 0x1028e58 addu  a3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 4
-	brtrue L_1028e48
+	brtrue L_1028e58
 // --- basic block ---
-// 0x01028e7c: 0x1028e7c: beq   s2, zero, 0x1028ea0 lui   a0, 0x10000
+// 0x01028e8c: 0x1028e8c: beq   s2, zero, 0x1028eb0 lui   a0, 0x10000
 	ldloc 11
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1028ea0
+	brfalse L_1028eb0
 // --- basic block ---
-// 0x01028e84: 0x1028e84: lui   a1, 0x10000
+// 0x01028e94: 0x1028e94: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_1028e88:
-// 0x01028e88: 0x1028e88: addu  a0, s2, zero
+L_1028e98:
+// 0x01028e98: 0x1028e98: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01028e8c: 0x1028e8c: jal   0x1001c08 addiu a1, a1, -26208
+// 0x01028e9c: 0x1028e9c: jal   0x1001c08 addiu a1, a1, -26208
 	ldloc.2
 	ldc.i4 -26208
 	add
@@ -1587,35 +1587,35 @@ L_1028e88:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01028e94: 0x1028e94: bne   v0, zero, 0x1028ed0 sll   zero, zero, 0
+// 0x01028ea4: 0x1028ea4: bne   v0, zero, 0x1028ee0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1028ed0
+	brtrue L_1028ee0
 // --- basic block ---
-// 0x01028e9c: 0x1028e9c: lui   a0, 0x10000
+// 0x01028eac: 0x1028eac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1028ea0:
-// 0x01028ea0: 0x1028ea0: addiu a0, a0, -26200
+L_1028eb0:
+// 0x01028eb0: 0x1028eb0: addiu a0, a0, -26200
 	ldloc.1
 	ldc.i4 -26200
 	add
 	stloc.1
-// 0x01028ea4: 0x1028ea4: jal   0x1000350 lui   s1, 0x10000
+// 0x01028eb4: 0x1028eb4: jal   0x1000350 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 7
 	ldloc.1
 	call int32 Cibyl::puts_1000350(int32)
 	stloc 5
 // --- basic block ---
-// 0x01028eac: 0x1028eac: j	 0x1028ec0 addiu s1, s1, -26188
+// 0x01028ebc: 0x1028ebc: j	 0x1028ed0 addiu s1, s1, -26188
 	ldloc 7
 	ldc.i4 -26188
 	add
 	stloc 7
-	br L_1028ec0
+	br L_1028ed0
 // --- basic block ---
-L_1028eb4:
-// 0x01028eb4: 0x1028eb4: lw    a2, 16(s0)
+L_1028ec4:
+// 0x01028ec4: 0x1028ec4: lw    a2, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1624,7 +1624,7 @@ L_1028eb4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01028eb8: 0x1028eb8: jal   0x1000e78 addiu s0, s0, 24
+// 0x01028ec8: 0x1028ec8: jal   0x1000e78 addiu s0, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
@@ -1639,26 +1639,26 @@ L_1028eb4:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1028ec0:
-// 0x01028ec0: 0x1028ec0: lw    v0, 0(s0)
+L_1028ed0:
+// 0x01028ed0: 0x1028ed0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01028ec4: 0x1028ec4: addu  a0, s1, zero
+// 0x01028ed4: 0x1028ed4: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x01028ec8: 0x1028ec8: bne   v0, zero, 0x1028eb4 addu  a1, v0, zero
+// 0x01028ed8: 0x1028ed8: bne   v0, zero, 0x1028ec4 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
-	brtrue L_1028eb4
+	brtrue L_1028ec4
 // --- basic block ---
-L_1028ed0:
-// 0x01028ed0: 0x1028ed0: lw    ra, 44(sp)
-// 0x01028ed4: 0x1028ed4: lw    s4, 40(sp)
+L_1028ee0:
+// 0x01028ee0: 0x1028ee0: lw    ra, 44(sp)
+// 0x01028ee4: 0x1028ee4: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1667,7 +1667,7 @@ L_1028ed0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01028ed8: 0x1028ed8: lw    s3, 36(sp)
+// 0x01028ee8: 0x1028ee8: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1676,7 +1676,7 @@ L_1028ed0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01028edc: 0x1028edc: lw    s2, 32(sp)
+// 0x01028eec: 0x1028eec: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1685,7 +1685,7 @@ L_1028ed0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01028ee0: 0x1028ee0: lw    s1, 28(sp)
+// 0x01028ef0: 0x1028ef0: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1694,7 +1694,7 @@ L_1028ed0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01028ee4: 0x1028ee4: lw    s0, 24(sp)
+// 0x01028ef4: 0x1028ef4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1703,7 +1703,7 @@ L_1028ed0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01028ee8: 0x1028ee8: jr    ra addiu sp, sp, 48
+// 0x01028ef8: 0x1028ef8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1715,7 +1715,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 calloc_1028ef0(int32,int32,int32,int32,int32)
+.method public static int32 calloc_1028f00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 lo,int32 v1)
@@ -1756,18 +1756,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028ef0: 0x1028ef0: mult  a1, a0
+// 0x01028f00: 0x1028f00: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 9
-// 0x01028ef4: 0x1028ef4: addiu sp, sp, -32
+// 0x01028f04: 0x1028f04: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01028ef8: 0x1028ef8: sw    ra, 28(sp)
-// 0x01028efc: 0x1028efc: sw    s0, 24(sp)
+// 0x01028f08: 0x1028f08: sw    ra, 28(sp)
+// 0x01028f0c: 0x1028f0c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1776,13 +1776,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01028f00: 0x1028f00: mflo  lo
+// 0x01028f10: 0x1028f10: mflo  lo
 	ldloc 9
 	stloc.3
-// 0x01028f04: 0x1028f04: mflo  lo
+// 0x01028f14: 0x1028f14: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x01028f08: 0x1028f08: jal   0x1000910 sw    a2, 16(sp)
+// 0x01028f18: 0x1028f18: jal   0x1000910 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1801,7 +1801,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01028f10: 0x1028f10: lw    a2, 16(sp)
+// 0x01028f20: 0x1028f20: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1810,13 +1810,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01028f14: 0x1028f14: addu  a0, v0, zero
+// 0x01028f24: 0x1028f24: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01028f18: 0x1028f18: addu  a1, zero, zero
+// 0x01028f28: 0x1028f28: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01028f1c: 0x1028f1c: jal   0x100177c addu  s0, v0, zero
+// 0x01028f2c: 0x1028f2c: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -1828,11 +1828,11 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01028f24: 0x1028f24: lw    ra, 28(sp)
-// 0x01028f28: 0x1028f28: addu  v0, s0, zero
+// 0x01028f34: 0x1028f34: lw    ra, 28(sp)
+// 0x01028f38: 0x1028f38: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01028f2c: 0x1028f2c: lw    s0, 24(sp)
+// 0x01028f3c: 0x1028f3c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1841,7 +1841,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01028f30: 0x1028f30: jr    ra addiu sp, sp, 32
+// 0x01028f40: 0x1028f40: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1853,7 +1853,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_factory_keymap_1028f38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_keymap_1028f48(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s3,int32 s1,int32 s7,int32 s6,int32 s4,int32 s5,int32 s0,int32 s8,int32 ra)
@@ -1915,24 +1915,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01028f38: 0x1028f38: lui   v0, 0x60000
+// 0x01028f48: 0x1028f48: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01028f3c: 0x1028f3c: lw    v0, -26476(v0)
+// 0x01028f4c: 0x1028f4c: lw    v0, -26012(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6619
+	ldc.i4 -6503
 	add
 	ldelem.i4
 	stloc 5
-// 0x01028f40: 0x1028f40: addiu sp, sp, -56
+// 0x01028f50: 0x1028f50: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01028f44: 0x1028f44: sw    s3, 28(sp)
+// 0x01028f54: 0x1028f54: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1941,7 +1941,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01028f48: 0x1028f48: sw    s0, 16(sp)
+// 0x01028f58: 0x1028f58: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1950,8 +1950,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01028f4c: 0x1028f4c: sw    ra, 52(sp)
-// 0x01028f50: 0x1028f50: sw    s8, 48(sp)
+// 0x01028f5c: 0x1028f5c: sw    ra, 52(sp)
+// 0x01028f60: 0x1028f60: sw    s8, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1960,7 +1960,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01028f54: 0x1028f54: sw    s7, 44(sp)
+// 0x01028f64: 0x1028f64: sw    s7, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1969,7 +1969,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01028f58: 0x1028f58: sw    s6, 40(sp)
+// 0x01028f68: 0x1028f68: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1978,7 +1978,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01028f5c: 0x1028f5c: sw    s5, 36(sp)
+// 0x01028f6c: 0x1028f6c: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1987,7 +1987,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01028f60: 0x1028f60: sw    s4, 32(sp)
+// 0x01028f70: 0x1028f70: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1996,7 +1996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01028f64: 0x1028f64: sw    s2, 24(sp)
+// 0x01028f74: 0x1028f74: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2005,7 +2005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01028f68: 0x1028f68: sw    s1, 20(sp)
+// 0x01028f78: 0x1028f78: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2014,35 +2014,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01028f6c: 0x1028f6c: addu  s0, a0, zero
+// 0x01028f7c: 0x1028f7c: addu  s0, a0, zero
 	ldloc.1
 	stloc 15
-// 0x01028f70: 0x1028f70: beq   v0, zero, 0x1028f94 addu  s3, a1, zero
+// 0x01028f80: 0x1028f80: beq   v0, zero, 0x1028fa4 addu  s3, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 9
-	brfalse L_1028f94
+	brfalse L_1028fa4
 // --- basic block ---
-// 0x01028f78: 0x1028f78: lui   a1, 0x10000
+// 0x01028f88: 0x1028f88: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01028f7c: 0x1028f7c: lui   a3, 0x10000
+// 0x01028f8c: 0x1028f8c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01028f80: 0x1028f80: addiu a1, a1, -26172
+// 0x01028f90: 0x1028f90: addiu a1, a1, -26172
 	ldloc.2
 	ldc.i4 -26172
 	add
 	stloc.2
-// 0x01028f84: 0x1028f84: addiu a3, a3, -26144
+// 0x01028f94: 0x1028f94: addiu a3, a3, -26144
 	ldloc 4
 	ldc.i4 -26144
 	add
 	stloc 4
-// 0x01028f88: 0x1028f88: addiu a0, zero, 5
+// 0x01028f98: 0x1028f98: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01028f8c: 0x1028f8c: jal   0x100449c addiu a2, zero, 498
+// 0x01028f9c: 0x1028f9c: jal   0x100449c addiu a2, zero, 498
 	ldc.i4 498
 	stloc.3
 	ldloc.0
@@ -2055,47 +2055,47 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1028f94:
-// 0x01028f94: 0x1028f94: addu  v0, s3, zero
+L_1028fa4:
+// 0x01028fa4: 0x1028fa4: addu  v0, s3, zero
 	ldloc 9
 	stloc 5
-// 0x01028f98: 0x1028f98: j	 0x1028fa4 addu  a0, zero, zero
+// 0x01028fa8: 0x1028fa8: j	 0x1028fb4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_1028fa4
+	br L_1028fb4
 // --- basic block ---
-L_1028fa0:
-// 0x01028fa0: 0x1028fa0: addiu a0, a0, 1
+L_1028fb0:
+// 0x01028fb0: 0x1028fb0: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-L_1028fa4:
-// 0x01028fa4: 0x1028fa4: lw    v1, 0(v0)
+L_1028fb4:
+// 0x01028fb4: 0x1028fb4: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01028fa8: 0x1028fa8: sll   zero, zero, 0
-// 0x01028fac: 0x1028fac: bne   v1, zero, 0x1028fa0 addiu v0, v0, 4
+// 0x01028fb8: 0x1028fb8: sll   zero, zero, 0
+// 0x01028fbc: 0x1028fbc: bne   v1, zero, 0x1028fb0 addiu v0, v0, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brtrue L_1028fa0
+	brtrue L_1028fb0
 // --- basic block ---
-// 0x01028fb4: 0x1028fb4: beq   a0, zero, 0x10290f4 addiu a0, a0, 1
+// 0x01028fc4: 0x1028fc4: beq   a0, zero, 0x1029104 addiu a0, a0, 1
 	ldloc.1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brfalse L_10290f4
+	brfalse L_1029104
 // --- basic block ---
-// 0x01028fbc: 0x1028fbc: jal   0x1028ef0 addiu a1, zero, 8
+// 0x01028fcc: 0x1028fcc: jal   0x1028f00 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -2103,41 +2103,41 @@ L_1028fa4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::calloc_1028ef0(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::calloc_1028f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01028fc4: 0x1028fc4: lui   s7, 0x10000
+// 0x01028fd4: 0x1028fd4: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01028fc8: 0x1028fc8: addiu a0, s7, -26172
+// 0x01028fd8: 0x1028fd8: addiu a0, s7, -26172
 	ldloc 11
 	ldc.i4 -26172
 	add
 	stloc.1
-// 0x01028fcc: 0x1028fcc: addu  a2, v0, zero
+// 0x01028fdc: 0x1028fdc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01028fd0: 0x1028fd0: lui   s5, 0x60000
+// 0x01028fe0: 0x1028fe0: lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 14
-// 0x01028fd4: 0x1028fd4: addiu a1, zero, 513
+// 0x01028fe4: 0x1028fe4: addiu a1, zero, 513
 	ldc.i4 513
 	stloc.2
-// 0x01028fd8: 0x1028fd8: lui   s6, 0x10000
+// 0x01028fe8: 0x1028fe8: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x01028fdc: 0x1028fdc: sw    v0, -26476(s5)
+// 0x01028fec: 0x1028fec: sw    v0, -26012(s5)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6619
+	ldc.i4 -6503
 	add
 	ldloc 5
 	stelem.i4
-// 0x01028fe0: 0x1028fe0: jal   0x1004a38 addiu s7, s7, -26172
+// 0x01028ff0: 0x1028ff0: jal   0x1004a48 addiu s7, s7, -26172
 	ldloc 11
 	ldc.i4 -26172
 	add
@@ -2147,26 +2147,26 @@ L_1028fa4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01028fe8: 0x1028fe8: addiu s6, s6, -26108
+// 0x01028ff8: 0x1028ff8: addiu s6, s6, -26108
 	ldloc 12
 	ldc.i4 -26108
 	add
 	stloc 12
-// 0x01028fec: 0x1028fec: addu  s2, zero, zero
+// 0x01028ffc: 0x1028ffc: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01028ff0: 0x1028ff0: j	 0x10290c8 lui   s4, 0x60000
+// 0x01029000: 0x1029000: j	 0x10290d8 lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 13
-	br L_10290c8
+	br L_10290d8
 // --- basic block ---
-L_1028ff8:
-// 0x01028ff8: 0x1028ff8: jal   0x1001ba8 sll   zero, zero, 0
+L_1029008:
+// 0x01029008: 0x1029008: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2177,16 +2177,16 @@ L_1028ff8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029000: 0x1029000: addu  s1, v0, zero
+// 0x01029010: 0x1029010: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01029004: 0x1029004: addu  a0, s7, zero
+// 0x01029014: 0x1029014: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x01029008: 0x1029008: addu  a2, v0, zero
+// 0x01029018: 0x1029018: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0102900c: 0x102900c: jal   0x1004a38 addiu a1, zero, 522
+// 0x0102901c: 0x102901c: jal   0x1004a48 addiu a1, zero, 522
 	ldc.i4 522
 	stloc.2
 	ldloc.0
@@ -2194,15 +2194,15 @@ L_1028ff8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029014: 0x1029014: addu  a0, s1, zero
+// 0x01029024: 0x1029024: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01029018: 0x1029018: jal   0x1000420 addu  a1, s6, zero
+// 0x01029028: 0x1029028: jal   0x1000420 addu  a1, s6, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -2215,82 +2215,82 @@ L_1028ff8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029020: 0x1029020: bne   v0, zero, 0x1029038 addu  v1, v0, zero
+// 0x01029030: 0x1029030: bne   v0, zero, 0x1029048 addu  v1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_1029038
+	brtrue L_1029048
 // --- basic block ---
-// 0x01029028: 0x1029028: j	 0x10290c8 addiu s3, s3, 4
+// 0x01029038: 0x1029038: j	 0x10290d8 addiu s3, s3, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	br L_10290c8
+	br L_10290d8
 // --- basic block ---
-L_1029030:
-// 0x01029030: 0x1029030: sb    zero, 0(v1)
+L_1029040:
+// 0x01029040: 0x1029040: sb    zero, 0(v1)
 	ldloc 7
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01029034: 0x1029034: addiu v1, v1, -1
+// 0x01029044: 0x1029044: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-L_1029038:
-// 0x01029038: 0x1029038: lb    a0, 0(v1)
+L_1029048:
+// 0x01029048: 0x1029048: lb    a0, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0102903c: 0x102903c: sll   zero, zero, 0
-// 0x01029040: 0x1029040: beq   a0, zero, 0x1029050 slti  a1, a0, 33
+// 0x0102904c: 0x102904c: sll   zero, zero, 0
+// 0x01029050: 0x1029050: beq   a0, zero, 0x1029060 slti  a1, a0, 33
 	ldloc.1
 	ldloc.1
 	ldc.i4.s 33
 	clt
 	stloc.2
-	brfalse L_1029050
+	brfalse L_1029060
 // --- basic block ---
-// 0x01029048: 0x1029048: bne   a1, zero, 0x1029030 sll   zero, zero, 0
+// 0x01029058: 0x1029058: bne   a1, zero, 0x1029040 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1029030
+	brtrue L_1029040
 // --- basic block ---
-L_1029050:
-// 0x01029050: 0x1029050: addiu a1, v0, 3
+L_1029060:
+// 0x01029060: 0x1029060: addiu a1, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc.2
-L_1029054:
-// 0x01029054: 0x1029054: lb    v0, 0(a1)
+L_1029064:
+// 0x01029064: 0x1029064: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01029058: 0x1029058: sll   zero, zero, 0
-// 0x0102905c: 0x102905c: beq   v0, zero, 0x1029070 slti  v1, v0, 33
+// 0x01029068: 0x1029068: sll   zero, zero, 0
+// 0x0102906c: 0x102906c: beq   v0, zero, 0x1029080 slti  v1, v0, 33
 	ldloc 5
 	ldloc 5
 	ldc.i4.s 33
 	clt
 	stloc 7
-	brfalse L_1029070
+	brfalse L_1029080
 // --- basic block ---
-// 0x01029064: 0x1029064: bne   v1, zero, 0x1029054 addiu a1, a1, 1
+// 0x01029074: 0x1029074: bne   v1, zero, 0x1029064 addiu a1, a1, 1
 	ldloc 7
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	brtrue L_1029054
+	brtrue L_1029064
 // --- basic block ---
-// 0x0102906c: 0x102906c: addiu a1, a1, -1
+// 0x0102907c: 0x102907c: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-L_1029070:
-// 0x01029070: 0x1029070: jal   0x1028cfc addu  a0, s0, zero
+L_1029080:
+// 0x01029080: 0x1029080: jal   0x1028d0c addu  a0, s0, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -2298,18 +2298,18 @@ L_1029070:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_find_action_1028cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_find_action_1028d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029078: 0x1029078: beq   v0, zero, 0x10290bc addu  s8, v0, zero
+// 0x01029088: 0x1029088: beq   v0, zero, 0x10290cc addu  s8, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 16
-	brfalse L_10290bc
+	brfalse L_10290cc
 // --- basic block ---
-// 0x01029080: 0x1029080: jal   0x1001b48 addu  a0, s1, zero
+// 0x01029090: 0x1029090: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -2318,55 +2318,55 @@ L_1029070:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029088: 0x1029088: lw    v1, -26472(s4)
+// 0x01029098: 0x1029098: lw    v1, -26008(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6618
+	ldc.i4 -6502
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102908c: 0x102908c: sll   zero, zero, 0
-// 0x01029090: 0x1029090: slt   v1, v1, v0
+// 0x0102909c: 0x102909c: sll   zero, zero, 0
+// 0x010290a0: 0x10290a0: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01029094: 0x1029094: beq   v1, zero, 0x10290a0 sll   zero, zero, 0
+// 0x010290a4: 0x10290a4: beq   v1, zero, 0x10290b0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10290a0
+	brfalse L_10290b0
 // --- basic block ---
-// 0x0102909c: 0x102909c: sw    v0, -26472(s4)
+// 0x010290ac: 0x10290ac: sw    v0, -26008(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6618
+	ldc.i4 -6502
 	add
 	ldloc 5
 	stelem.i4
-L_10290a0:
-// 0x010290a0: 0x10290a0: lw    v1, -26476(s5)
+L_10290b0:
+// 0x010290b0: 0x10290b0: lw    v1, -26012(s5)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6619
+	ldc.i4 -6503
 	add
 	ldelem.i4
 	stloc 7
-// 0x010290a4: 0x10290a4: sll   v0, s2, 3
+// 0x010290b4: 0x10290b4: sll   v0, s2, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010290a8: 0x10290a8: addu  v0, v1, v0
+// 0x010290b8: 0x10290b8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010290ac: 0x10290ac: sw    s8, 4(v0)
+// 0x010290bc: 0x10290bc: sw    s8, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2375,22 +2375,22 @@ L_10290a0:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010290b0: 0x10290b0: sw    s1, 0(v0)
+// 0x010290c0: 0x10290c0: sw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010290b4: 0x10290b4: j	 0x10290c4 addiu s2, s2, 1
+// 0x010290c4: 0x10290c4: j	 0x10290d4 addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_10290c4
+	br L_10290d4
 // --- basic block ---
-L_10290bc:
-// 0x010290bc: 0x10290bc: jal   0x1000930 addu  a0, s1, zero
+L_10290cc:
+// 0x010290cc: 0x10290cc: jal   0x1000930 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2403,66 +2403,66 @@ L_10290bc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10290c4:
-// 0x010290c4: 0x10290c4: addiu s3, s3, 4
+L_10290d4:
+// 0x010290d4: 0x10290d4: addiu s3, s3, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_10290c8:
-// 0x010290c8: 0x10290c8: lw    a0, 0(s3)
+L_10290d8:
+// 0x010290d8: 0x10290d8: lw    a0, 0(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010290cc: 0x10290cc: sll   zero, zero, 0
-// 0x010290d0: 0x10290d0: bne   a0, zero, 0x1028ff8 lui   v0, 0x60000
+// 0x010290dc: 0x10290dc: sll   zero, zero, 0
+// 0x010290e0: 0x10290e0: bne   a0, zero, 0x1029008 lui   v0, 0x60000
 	ldloc.1
 	ldc.i4 393216
 	stloc 5
-	brtrue L_1028ff8
+	brtrue L_1029008
 // --- basic block ---
-// 0x010290d8: 0x10290d8: lw    a0, -26476(v0)
+// 0x010290e8: 0x10290e8: lw    a0, -26012(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6619
+	ldc.i4 -6503
 	add
 	ldelem.i4
 	stloc.1
-// 0x010290dc: 0x10290dc: sll   s2, s2, 3
+// 0x010290ec: 0x10290ec: sll   s2, s2, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x010290e0: 0x10290e0: addu  s2, a0, s2
+// 0x010290f0: 0x10290f0: addu  s2, a0, s2
 	ldloc.1
 	ldloc 8
 	add
 	stloc 8
-// 0x010290e4: 0x10290e4: lui   a1, 0x1030000
+// 0x010290f4: 0x10290f4: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x010290e8: 0x10290e8: sw    zero, 0(s2)
+// 0x010290f8: 0x10290f8: sw    zero, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010290ec: 0x10290ec: jal   0x104fa68 addiu a1, a1, -29352
+// 0x010290fc: 0x10290fc: jal   0x104fa78 addiu a1, a1, -29336
 	ldloc.2
-	ldc.i4 -29352
+	ldc.i4 -29336
 	add
 	stloc.2
-	call void Cibyl59::roadmap_main_set_keyboard_104fa68()
+	call void Cibyl59::roadmap_main_set_keyboard_104fa78()
 // --- basic block ---
-L_10290f4:
-// 0x010290f4: 0x10290f4: lw    ra, 52(sp)
-// 0x010290f8: 0x10290f8: lw    s8, 48(sp)
+L_1029104:
+// 0x01029104: 0x1029104: lw    ra, 52(sp)
+// 0x01029108: 0x1029108: lw    s8, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2471,7 +2471,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010290fc: 0x10290fc: lw    s7, 44(sp)
+// 0x0102910c: 0x102910c: lw    s7, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2480,7 +2480,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01029100: 0x1029100: lw    s6, 40(sp)
+// 0x01029110: 0x1029110: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2489,7 +2489,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01029104: 0x1029104: lw    s5, 36(sp)
+// 0x01029114: 0x1029114: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2498,7 +2498,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01029108: 0x1029108: lw    s4, 32(sp)
+// 0x01029118: 0x1029118: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2507,7 +2507,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102910c: 0x102910c: lw    s3, 28(sp)
+// 0x0102911c: 0x102911c: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2516,7 +2516,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01029110: 0x1029110: lw    s2, 24(sp)
+// 0x01029120: 0x1029120: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2525,7 +2525,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01029114: 0x1029114: lw    s1, 20(sp)
+// 0x01029124: 0x1029124: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2534,7 +2534,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01029118: 0x1029118: lw    s0, 16(sp)
+// 0x01029128: 0x1029128: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2543,7 +2543,7 @@ L_10290f4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102911c: 0x102911c: jr    ra addiu sp, sp, 56
+// 0x0102912c: 0x102912c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2555,7 +2555,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_factory_load_config_1029124(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_load_config_1029134(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s8,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -2617,21 +2617,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029124: 0x1029124: addiu sp, sp, -320
+// 0x01029134: 0x1029134: addiu sp, sp, -320
 	ldloc.0
 	ldc.i4 -320
 	add
 	stloc.0
-// 0x01029128: 0x1029128: addu  v0, a0, zero
+// 0x01029138: 0x1029138: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0102912c: 0x102912c: addu  a0, a2, zero
+// 0x0102913c: 0x102913c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01029130: 0x1029130: lui   a2, 0x0
+// 0x01029140: 0x1029140: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01029134: 0x1029134: sw    a1, 324(sp)
+// 0x01029144: 0x1029144: sw    a1, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2640,15 +2640,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01029138: 0x1029138: addiu a2, a2, 26128
+// 0x01029148: 0x1029148: addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
 	stloc.3
-// 0x0102913c: 0x102913c: addu  a1, v0, zero
+// 0x0102914c: 0x102914c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01029140: 0x1029140: sw    s1, 284(sp)
+// 0x01029150: 0x1029150: sw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2657,8 +2657,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01029144: 0x1029144: sw    ra, 316(sp)
-// 0x01029148: 0x1029148: sw    s8, 312(sp)
+// 0x01029154: 0x1029154: sw    ra, 316(sp)
+// 0x01029158: 0x1029158: sw    s8, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2667,7 +2667,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102914c: 0x102914c: sw    s7, 308(sp)
+// 0x0102915c: 0x102915c: sw    s7, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2676,7 +2676,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01029150: 0x1029150: sw    s6, 304(sp)
+// 0x01029160: 0x1029160: sw    s6, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2685,7 +2685,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01029154: 0x1029154: sw    s5, 300(sp)
+// 0x01029164: 0x1029164: sw    s5, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2694,7 +2694,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01029158: 0x1029158: sw    s4, 296(sp)
+// 0x01029168: 0x1029168: sw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2703,7 +2703,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102915c: 0x102915c: sw    s3, 292(sp)
+// 0x0102916c: 0x102916c: sw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2712,7 +2712,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029160: 0x1029160: sw    s2, 288(sp)
+// 0x01029170: 0x1029170: sw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2721,7 +2721,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01029164: 0x1029164: jal   0x104dac8 sw    s0, 280(sp)
+// 0x01029174: 0x1029174: jal   0x104dad8 sw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2735,57 +2735,57 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102916c: 0x102916c: beq   v0, zero, 0x10292e8 addu  s1, v0, zero
+// 0x0102917c: 0x102917c: beq   v0, zero, 0x10292f8 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_10292e8
+	brfalse L_10292f8
 // --- basic block ---
-// 0x01029174: 0x1029174: lui   s4, 0x60000
+// 0x01029184: 0x1029184: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x01029178: 0x1029178: lui   s8, 0x10000
+// 0x01029188: 0x1029188: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x0102917c: 0x102917c: addiu s4, s4, -26468
+// 0x0102918c: 0x102918c: addiu s4, s4, -26004
 	ldloc 12
-	ldc.i4 -26468
+	ldc.i4 -26004
 	add
 	stloc 12
-// 0x01029180: 0x1029180: addiu s8, s8, -26104
+// 0x01029190: 0x1029190: addiu s8, s8, -26104
 	ldloc 13
 	ldc.i4 -26104
 	add
 	stloc 13
-// 0x01029184: 0x1029184: addu  s0, zero, zero
+// 0x01029194: 0x1029194: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01029188: 0x1029188: addiu s3, sp, 24
+// 0x01029198: 0x1029198: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x0102918c: 0x102918c: addiu s7, zero, 10
+// 0x0102919c: 0x102919c: addiu s7, zero, 10
 	ldc.i4.s 10
 	stloc 16
-// 0x01029190: 0x1029190: addiu s6, zero, 13
+// 0x010291a0: 0x10291a0: addiu s6, zero, 13
 	ldc.i4.s 13
 	stloc 15
-// 0x01029194: 0x1029194: j	 0x10292b4 addiu s5, zero, 32
+// 0x010291a4: 0x10291a4: j	 0x10292c4 addiu s5, zero, 32
 	ldc.i4.s 32
 	stloc 14
-	br L_10292b4
+	br L_10292c4
 // --- basic block ---
-L_102919c:
-// 0x0102919c: 0x102919c: addiu a1, zero, 256
+L_10291ac:
+// 0x010291ac: 0x10291ac: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x010291a0: 0x10291a0: jal   0x1001e98 addu  a2, s1, zero
+// 0x010291b0: 0x10291b0: jal   0x1001e98 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -2798,34 +2798,34 @@ L_102919c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010291a8: 0x10291a8: jal   0x1001e30 addu  a0, s1, zero
+// 0x010291b8: 0x10291b8: jal   0x1001e30 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x010291b0: 0x10291b0: bne   v0, zero, 0x10292c4 sll   zero, zero, 0
+// 0x010291c0: 0x10291c0: bne   v0, zero, 0x10292d4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10292c4
+	brtrue L_10292d4
 // --- basic block ---
-// 0x010291b8: 0x10291b8: jal   0x1001e24 addu  a0, s1, zero
+// 0x010291c8: 0x10291c8: jal   0x1001e24 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::ferror_1001e24(int32)
 	stloc 5
 // --- basic block ---
-// 0x010291c0: 0x10291c0: bne   v0, zero, 0x10292c4 addu  a0, s3, zero
+// 0x010291d0: 0x10291d0: bne   v0, zero, 0x10292d4 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brtrue L_10292c4
+	brtrue L_10292d4
 // --- basic block ---
-// 0x010291c8: 0x10291c8: addiu a1, zero, 10
+// 0x010291d8: 0x10291d8: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010291cc: 0x10291cc: jal   0x1001a5c sb    zero, 279(sp)
+// 0x010291dc: 0x10291dc: jal   0x1001a5c sb    zero, 279(sp)
 	ldloc.0
 	ldc.i4 279
 	add
@@ -2838,18 +2838,18 @@ L_102919c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010291d4: 0x10291d4: beq   v0, zero, 0x10291e0 addu  a0, s3, zero
+// 0x010291e4: 0x10291e4: beq   v0, zero, 0x10291f0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brfalse L_10291e0
+	brfalse L_10291f0
 // --- basic block ---
-// 0x010291dc: 0x10291dc: sb    zero, 0(v0)
+// 0x010291ec: 0x10291ec: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10291e0:
-// 0x010291e0: 0x10291e0: jal   0x1001a5c addiu a1, zero, 13
+L_10291f0:
+// 0x010291f0: 0x10291f0: jal   0x1001a5c addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
 	ldloc.1
@@ -2859,116 +2859,116 @@ L_10291e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010291e8: 0x10291e8: beq   v0, zero, 0x10291f4 addu  s2, s3, zero
+// 0x010291f8: 0x10291f8: beq   v0, zero, 0x1029204 addu  s2, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc 10
-	brfalse L_10291f4
+	brfalse L_1029204
 // --- basic block ---
-// 0x010291f0: 0x10291f0: sb    zero, 0(v0)
+// 0x01029200: 0x1029200: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10291f4:
-// 0x010291f4: 0x10291f4: lb    v0, 0(s2)
+L_1029204:
+// 0x01029204: 0x1029204: lb    v0, 0(s2)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010291f8: 0x10291f8: sll   zero, zero, 0
-// 0x010291fc: 0x10291fc: beq   v0, s5, 0x102922c addiu v1, zero, 12
+// 0x01029208: 0x1029208: sll   zero, zero, 0
+// 0x0102920c: 0x102920c: beq   v0, s5, 0x102923c addiu v1, zero, 12
 	ldloc 5
 	ldloc 14
 	ldc.i4.s 12
 	stloc 7
-	beq  L_102922c
+	beq  L_102923c
 // --- basic block ---
-// 0x01029204: 0x1029204: beq   v0, v1, 0x102922c sll   zero, zero, 0
+// 0x01029214: 0x1029214: beq   v0, v1, 0x102923c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_102922c
+	beq  L_102923c
 // --- basic block ---
-// 0x0102920c: 0x102920c: beq   v0, s7, 0x102922c sll   zero, zero, 0
+// 0x0102921c: 0x102921c: beq   v0, s7, 0x102923c sll   zero, zero, 0
 	ldloc 5
 	ldloc 16
-	beq  L_102922c
+	beq  L_102923c
 // --- basic block ---
-// 0x01029214: 0x1029214: beq   v0, s6, 0x102922c addiu v1, zero, 9
+// 0x01029224: 0x1029224: beq   v0, s6, 0x102923c addiu v1, zero, 9
 	ldloc 5
 	ldloc 15
 	ldc.i4.s 9
 	stloc 7
-	beq  L_102922c
+	beq  L_102923c
 // --- basic block ---
-// 0x0102921c: 0x102921c: beq   v0, v1, 0x102922c addiu v1, zero, 11
+// 0x0102922c: 0x102922c: beq   v0, v1, 0x102923c addiu v1, zero, 11
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 11
 	stloc 7
-	beq  L_102922c
+	beq  L_102923c
 // --- basic block ---
-// 0x01029224: 0x1029224: bne   v0, v1, 0x1029234 sll   zero, zero, 0
+// 0x01029234: 0x1029234: bne   v0, v1, 0x1029244 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1029234
+	bne.un L_1029244
 // --- basic block ---
-L_102922c:
-// 0x0102922c: 0x102922c: j	 0x10291f4 addiu s2, s2, 1
+L_102923c:
+// 0x0102923c: 0x102923c: j	 0x1029204 addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	br L_10291f4
+	br L_1029204
 // --- basic block ---
-L_1029234:
-// 0x01029234: 0x1029234: beq   v0, zero, 0x10292b4 addiu v1, zero, 35
+L_1029244:
+// 0x01029244: 0x1029244: beq   v0, zero, 0x10292c4 addiu v1, zero, 35
 	ldloc 5
 	ldc.i4.s 35
 	stloc 7
-	brfalse L_10292b4
+	brfalse L_10292c4
 // --- basic block ---
-// 0x0102923c: 0x102923c: beq   v0, v1, 0x10292b4 addiu v1, zero, 124
+// 0x0102924c: 0x102924c: beq   v0, v1, 0x10292c4 addiu v1, zero, 124
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 124
 	stloc 7
-	beq  L_10292b4
+	beq  L_10292c4
 // --- basic block ---
-// 0x01029244: 0x1029244: beq   v0, v1, 0x1029258 sll   zero, zero, 0
+// 0x01029254: 0x1029254: beq   v0, v1, 0x1029268 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_1029258
+	beq  L_1029268
 // --- basic block ---
-// 0x0102924c: 0x102924c: addiu v1, zero, 45
+// 0x0102925c: 0x102925c: addiu v1, zero, 45
 	ldc.i4.s 45
 	stloc 7
-// 0x01029250: 0x1029250: bne   v0, v1, 0x102926c sll   zero, zero, 0
+// 0x01029260: 0x1029260: bne   v0, v1, 0x102927c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_102926c
+	bne.un L_102927c
 // --- basic block ---
-L_1029258:
-// 0x01029258: 0x1029258: sll   v0, s0, 2
+L_1029268:
+// 0x01029268: 0x1029268: sll   v0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0102925c: 0x102925c: lui   v1, 0x20000
+// 0x0102926c: 0x102926c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01029260: 0x1029260: addu  v0, v0, s4
+// 0x01029270: 0x1029270: addu  v0, v0, s4
 	ldloc 5
 	ldloc 12
 	add
 	stloc 5
-// 0x01029264: 0x1029264: j	 0x10292ac addiu v1, v1, 24920
+// 0x01029274: 0x1029274: j	 0x10292bc addiu v1, v1, 25384
 	ldloc 7
-	ldc.i4 24920
+	ldc.i4 25384
 	add
 	stloc 7
-	br L_10292ac
+	br L_10292bc
 // --- basic block ---
-L_102926c:
-// 0x0102926c: 0x102926c: lw    a0, 324(sp)
+L_102927c:
+// 0x0102927c: 0x102927c: lw    a0, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2977,7 +2977,7 @@ L_102926c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01029270: 0x1029270: jal   0x1028cfc addu  a1, s2, zero
+// 0x01029280: 0x1029280: jal   0x1028d0c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -2985,32 +2985,32 @@ L_102926c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_find_action_1028cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_find_action_1028d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029278: 0x1029278: bne   v0, zero, 0x10292a0 lui   a1, 0x10000
+// 0x01029288: 0x1029288: bne   v0, zero, 0x10292b0 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10292a0
+	brtrue L_10292b0
 // --- basic block ---
-// 0x01029280: 0x1029280: addiu a0, zero, 4
+// 0x01029290: 0x1029290: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01029284: 0x1029284: addiu a1, a1, -26172
+// 0x01029294: 0x1029294: addiu a1, a1, -26172
 	ldloc.2
 	ldc.i4 -26172
 	add
 	stloc.2
-// 0x01029288: 0x1029288: addiu a2, zero, 164
+// 0x01029298: 0x1029298: addiu a2, zero, 164
 	ldc.i4 164
 	stloc.3
-// 0x0102928c: 0x102928c: addu  a3, s8, zero
+// 0x0102929c: 0x102929c: addu  a3, s8, zero
 	ldloc 13
 	stloc 4
-// 0x01029290: 0x1029290: jal   0x100449c sw    s2, 16(sp)
+// 0x010292a0: 0x10292a0: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3029,56 +3029,56 @@ L_102926c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029298: 0x1029298: j	 0x10292b4 sll   zero, zero, 0
-	br L_10292b4
+// 0x010292a8: 0x10292a8: j	 0x10292c4 sll   zero, zero, 0
+	br L_10292c4
 // --- basic block ---
-L_10292a0:
-// 0x010292a0: 0x10292a0: lw    v1, 0(v0)
+L_10292b0:
+// 0x010292b0: 0x10292b0: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010292a4: 0x10292a4: sll   v0, s0, 2
+// 0x010292b4: 0x10292b4: sll   v0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010292a8: 0x10292a8: addu  v0, v0, s4
+// 0x010292b8: 0x10292b8: addu  v0, v0, s4
 	ldloc 5
 	ldloc 12
 	add
 	stloc 5
-L_10292ac:
-// 0x010292ac: 0x10292ac: sw    v1, 0(v0)
+L_10292bc:
+// 0x010292bc: 0x10292bc: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010292b0: 0x10292b0: addiu s0, s0, 1
+// 0x010292c0: 0x10292c0: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10292b4:
-// 0x010292b4: 0x10292b4: jal   0x1001e30 addu  a0, s1, zero
+L_10292c4:
+// 0x010292c4: 0x10292c4: jal   0x1001e30 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x010292bc: 0x10292bc: beq   v0, zero, 0x102919c addu  a0, s3, zero
+// 0x010292cc: 0x10292cc: beq   v0, zero, 0x10291ac addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brfalse L_102919c
+	brfalse L_10291ac
 // --- basic block ---
-L_10292c4:
-// 0x010292c4: 0x10292c4: jal   0x10023b4 addu  a0, s1, zero
+L_10292d4:
+// 0x010292d4: 0x10292d4: jal   0x10023b4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3091,43 +3091,43 @@ L_10292c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010292cc: 0x10292cc: beq   s0, zero, 0x10292e8 lui   v0, 0x60000
+// 0x010292dc: 0x10292dc: beq   s0, zero, 0x10292f8 lui   v0, 0x60000
 	ldloc 8
 	ldc.i4 393216
 	stloc 5
-	brfalse L_10292e8
+	brfalse L_10292f8
 // --- basic block ---
-// 0x010292d4: 0x10292d4: addiu v0, v0, -26468
+// 0x010292e4: 0x10292e4: addiu v0, v0, -26004
 	ldloc 5
-	ldc.i4 -26468
+	ldc.i4 -26004
 	add
 	stloc 5
-// 0x010292d8: 0x10292d8: sll   s0, s0, 2
+// 0x010292e8: 0x10292e8: sll   s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x010292dc: 0x10292dc: addu  s0, s0, v0
+// 0x010292ec: 0x10292ec: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x010292e0: 0x10292e0: j	 0x10292ec sw    zero, 0(s0)
+// 0x010292f0: 0x10292f0: j	 0x10292fc sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_10292ec
+	br L_10292fc
 // --- basic block ---
-L_10292e8:
-// 0x010292e8: 0x10292e8: addu  v0, zero, zero
+L_10292f8:
+// 0x010292f8: 0x10292f8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10292ec:
-// 0x010292ec: 0x10292ec: lw    ra, 316(sp)
-// 0x010292f0: 0x10292f0: lw    s8, 312(sp)
+L_10292fc:
+// 0x010292fc: 0x10292fc: lw    ra, 316(sp)
+// 0x01029300: 0x1029300: lw    s8, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3136,7 +3136,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010292f4: 0x10292f4: lw    s7, 308(sp)
+// 0x01029304: 0x1029304: lw    s7, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3145,7 +3145,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010292f8: 0x10292f8: lw    s6, 304(sp)
+// 0x01029308: 0x1029308: lw    s6, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3154,7 +3154,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010292fc: 0x10292fc: lw    s5, 300(sp)
+// 0x0102930c: 0x102930c: lw    s5, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3163,7 +3163,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01029300: 0x1029300: lw    s4, 296(sp)
+// 0x01029310: 0x1029310: lw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3172,7 +3172,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01029304: 0x1029304: lw    s3, 292(sp)
+// 0x01029314: 0x1029314: lw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3181,7 +3181,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01029308: 0x1029308: lw    s2, 288(sp)
+// 0x01029318: 0x1029318: lw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3190,7 +3190,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102930c: 0x102930c: lw    s1, 284(sp)
+// 0x0102931c: 0x102931c: lw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3199,7 +3199,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01029310: 0x1029310: lw    s0, 280(sp)
+// 0x01029320: 0x1029320: lw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3208,7 +3208,7 @@ L_10292ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01029314: 0x1029314: jr    ra addiu sp, sp, 320
+// 0x01029324: 0x1029324: jr    ra addiu sp, sp, 320
 	ldloc.0
 	ldc.i4 320
 	add
@@ -3220,7 +3220,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_factory_user_config_102931c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_user_config_102932c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 s3,int32 ra)
@@ -3270,12 +3270,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102931c: 0x102931c: addiu sp, sp, -304
+// 0x0102932c: 0x102932c: addiu sp, sp, -304
 	ldloc.0
 	ldc.i4 -304
 	add
 	stloc.0
-// 0x01029320: 0x1029320: sw    s2, 288(sp)
+// 0x01029330: 0x1029330: sw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3284,7 +3284,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01029324: 0x1029324: sw    s1, 284(sp)
+// 0x01029334: 0x1029334: sw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3293,8 +3293,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029328: 0x1029328: sw    ra, 300(sp)
-// 0x0102932c: 0x102932c: sw    s4, 296(sp)
+// 0x01029338: 0x1029338: sw    ra, 300(sp)
+// 0x0102933c: 0x102933c: sw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3303,7 +3303,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01029330: 0x1029330: sw    s3, 292(sp)
+// 0x01029340: 0x1029340: sw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3312,7 +3312,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01029334: 0x1029334: sw    s0, 280(sp)
+// 0x01029344: 0x1029344: sw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3321,41 +3321,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01029338: 0x1029338: addu  v0, a1, zero
+// 0x01029348: 0x1029348: addu  v0, a1, zero
 	ldloc.2
 	stloc 5
-// 0x0102933c: 0x102933c: addu  s1, a2, zero
+// 0x0102934c: 0x102934c: addu  s1, a2, zero
 	ldloc.3
 	stloc 11
-// 0x01029340: 0x1029340: beq   a0, zero, 0x10293d8 addu  s2, zero, zero
+// 0x01029350: 0x1029350: beq   a0, zero, 0x10293e8 addu  s2, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_10293d8
+	brfalse L_10293e8
 // --- basic block ---
-// 0x01029348: 0x1029348: addiu s0, sp, 24
+// 0x01029358: 0x1029358: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0102934c: 0x102934c: lui   a2, 0x0
+// 0x0102935c: 0x102935c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01029350: 0x1029350: addu  a3, a0, zero
+// 0x01029360: 0x1029360: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01029354: 0x1029354: addiu a2, a2, 26076
+// 0x01029364: 0x1029364: addiu a2, a2, 26076
 	ldloc.3
 	ldc.i4 26076
 	add
 	stloc.3
-// 0x01029358: 0x1029358: addiu a1, zero, 256
+// 0x01029368: 0x1029368: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0102935c: 0x102935c: addu  a0, s0, zero
+// 0x0102936c: 0x102936c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01029360: 0x1029360: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01029370: 0x1029370: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3374,12 +3374,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029368: 0x1029368: lui   a0, 0x20000
+// 0x01029378: 0x1029378: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0102936c: 0x102936c: jal   0x104d04c addiu a0, a0, -26888
+// 0x0102937c: 0x102937c: jal   0x104d05c addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
 	ldloc.0
@@ -3387,18 +3387,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_preferred_104d04c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_preferred_104d05c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029374: 0x1029374: addu  a2, v0, zero
+// 0x01029384: 0x1029384: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01029378: 0x1029378: addu  a0, s0, zero
+// 0x01029388: 0x1029388: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102937c: 0x102937c: jal   0x1029124 addu  a1, s1, zero
+// 0x0102938c: 0x102938c: jal   0x1029134 addu  a1, s1, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -3406,26 +3406,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_load_config_1029124(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_load_config_1029134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029384: 0x1029384: bne   v0, zero, 0x10293d8 addu  s2, v0, zero
+// 0x01029394: 0x1029394: bne   v0, zero, 0x10293e8 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10293d8
+	brtrue L_10293e8
 // --- basic block ---
-// 0x0102938c: 0x102938c: lui   s4, 0x0
+// 0x0102939c: 0x102939c: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01029390: 0x1029390: addiu a0, s4, 26228
+// 0x010293a0: 0x10293a0: addiu a0, s4, 26228
 	ldloc 10
 	ldc.i4 26228
 	add
 	stloc.1
-// 0x01029394: 0x1029394: jal   0x104d204 addu  s4, a0, zero
+// 0x010293a4: 0x10293a4: jal   0x104d214 addu  s4, a0, zero
 	ldloc.1
 	stloc 10
 	ldloc.0
@@ -3433,73 +3433,73 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102939c: 0x102939c: j	 0x10293c8 addu  s3, v0, zero
+// 0x010293ac: 0x10293ac: j	 0x10293d8 addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-	br L_10293c8
+	br L_10293d8
 // --- basic block ---
-L_10293a4:
-// 0x010293a4: 0x10293a4: jal   0x1029124 sll   zero, zero, 0
+L_10293b4:
+// 0x010293b4: 0x10293b4: jal   0x1029134 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_load_config_1029124(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_load_config_1029134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010293ac: 0x10293ac: addu  s2, v0, zero
+// 0x010293bc: 0x10293bc: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010293b0: 0x10293b0: addu  a1, s3, zero
+// 0x010293c0: 0x10293c0: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010293b4: 0x10293b4: bne   v0, zero, 0x10293d8 addu  a0, s4, zero
+// 0x010293c4: 0x10293c4: bne   v0, zero, 0x10293e8 addu  a0, s4, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_10293d8
+	brtrue L_10293e8
 // --- basic block ---
-// 0x010293bc: 0x10293bc: jal   0x104d18c sll   zero, zero, 0
+// 0x010293cc: 0x10293cc: jal   0x104d19c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010293c4: 0x10293c4: addu  s3, v0, zero
+// 0x010293d4: 0x10293d4: addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-L_10293c8:
-// 0x010293c8: 0x10293c8: addu  a0, s0, zero
+L_10293d8:
+// 0x010293d8: 0x10293d8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010293cc: 0x10293cc: addu  a1, s1, zero
+// 0x010293dc: 0x10293dc: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x010293d0: 0x10293d0: bne   v0, zero, 0x10293a4 addu  a2, v0, zero
+// 0x010293e0: 0x10293e0: bne   v0, zero, 0x10293b4 addu  a2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.3
-	brtrue L_10293a4
+	brtrue L_10293b4
 // --- basic block ---
-L_10293d8:
-// 0x010293d8: 0x10293d8: lw    ra, 300(sp)
-// 0x010293dc: 0x10293dc: addu  v0, s2, zero
+L_10293e8:
+// 0x010293e8: 0x10293e8: lw    ra, 300(sp)
+// 0x010293ec: 0x10293ec: addu  v0, s2, zero
 	ldloc 9
 	stloc 5
-// 0x010293e0: 0x10293e0: lw    s4, 296(sp)
+// 0x010293f0: 0x10293f0: lw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3508,7 +3508,7 @@ L_10293d8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010293e4: 0x10293e4: lw    s3, 292(sp)
+// 0x010293f4: 0x10293f4: lw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3517,7 +3517,7 @@ L_10293d8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010293e8: 0x10293e8: lw    s2, 288(sp)
+// 0x010293f8: 0x10293f8: lw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3526,7 +3526,7 @@ L_10293d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010293ec: 0x10293ec: lw    s1, 284(sp)
+// 0x010293fc: 0x10293fc: lw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3535,7 +3535,7 @@ L_10293d8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010293f0: 0x10293f0: lw    s0, 280(sp)
+// 0x01029400: 0x1029400: lw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3544,7 +3544,7 @@ L_10293d8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010293f4: 0x10293f4: jr    ra addiu sp, sp, 304
+// 0x01029404: 0x1029404: jr    ra addiu sp, sp, 304
 	ldloc.0
 	ldc.i4 304
 	add
@@ -3556,7 +3556,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_factory_10294d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_10294e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -3618,12 +3618,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010294d8: 0x10294d8: addiu sp, sp, -72
+// 0x010294e8: 0x10294e8: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010294dc: 0x10294dc: sw    s7, 60(sp)
+// 0x010294ec: 0x10294ec: sw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3632,7 +3632,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010294e0: 0x10294e0: sw    s0, 32(sp)
+// 0x010294f0: 0x10294f0: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3641,16 +3641,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010294e4: 0x10294e4: addu  s7, a0, zero
+// 0x010294f4: 0x10294f4: addu  s7, a0, zero
 	ldloc.1
 	stloc 15
-// 0x010294e8: 0x10294e8: lui   s0, 0x0
+// 0x010294f8: 0x10294f8: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010294ec: 0x10294ec: lui   a0, 0x0
+// 0x010294fc: 0x10294fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010294f0: 0x10294f0: sw    s1, 36(sp)
+// 0x01029500: 0x1029500: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3659,21 +3659,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010294f4: 0x10294f4: addiu a0, a0, 6524
+// 0x01029504: 0x1029504: addiu a0, a0, 6524
 	ldloc.1
 	ldc.i4 6524
 	add
 	stloc.1
-// 0x010294f8: 0x10294f8: addu  s1, a1, zero
+// 0x01029508: 0x1029508: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010294fc: 0x10294fc: addiu a1, s0, 20820
+// 0x0102950c: 0x102950c: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x01029500: 0x1029500: sw    ra, 68(sp)
-// 0x01029504: 0x1029504: sw    s8, 64(sp)
+// 0x01029510: 0x1029510: sw    ra, 68(sp)
+// 0x01029514: 0x1029514: sw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3682,7 +3682,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01029508: 0x1029508: sw    s6, 56(sp)
+// 0x01029518: 0x1029518: sw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3691,7 +3691,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102950c: 0x102950c: sw    s5, 52(sp)
+// 0x0102951c: 0x102951c: sw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3700,7 +3700,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01029510: 0x1029510: sw    s4, 48(sp)
+// 0x01029520: 0x1029520: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3709,7 +3709,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01029514: 0x1029514: sw    s3, 44(sp)
+// 0x01029524: 0x1029524: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3718,7 +3718,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029518: 0x1029518: sw    s2, 40(sp)
+// 0x01029528: 0x1029528: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3727,10 +3727,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102951c: 0x102951c: addu  s6, a3, zero
+// 0x0102952c: 0x102952c: addu  s6, a3, zero
 	ldloc 4
 	stloc 14
-// 0x01029520: 0x1029520: jal   0x100e7f4 addu  s2, a2, zero
+// 0x01029530: 0x1029530: jal   0x100e804 addu  s2, a2, zero
 	ldloc.3
 	stloc 9
 	ldloc.0
@@ -3738,25 +3738,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029528: 0x1029528: lui   a0, 0x0
+// 0x01029538: 0x1029538: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102952c: 0x102952c: addiu a1, s0, 20820
+// 0x0102953c: 0x102953c: addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x01029530: 0x1029530: addiu a0, a0, 6540
+// 0x01029540: 0x1029540: addiu a0, a0, 6540
 	ldloc.1
 	ldc.i4 6540
 	add
 	stloc.1
-// 0x01029534: 0x1029534: jal   0x100e7f4 addu  s8, v0, zero
+// 0x01029544: 0x1029544: jal   0x100e804 addu  s8, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -3764,90 +3764,90 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102953c: 0x102953c: addu  s5, v0, zero
+// 0x0102954c: 0x102954c: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x01029540: 0x1029540: addu  s0, zero, zero
+// 0x01029550: 0x1029550: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01029544: 0x1029544: addiu s4, sp, 20
+// 0x01029554: 0x1029554: addiu s4, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 12
-// 0x01029548: 0x1029548: j	 0x102965c addiu s3, sp, 16
+// 0x01029558: 0x1029558: j	 0x102966c addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 11
-	br L_102965c
+	br L_102966c
 // --- basic block ---
-L_1029550:
-// 0x01029550: 0x1029550: addiu v0, v0, 24920
+L_1029560:
+// 0x01029560: 0x1029560: addiu v0, v0, 25384
 	ldloc 5
-	ldc.i4 24920
+	ldc.i4 25384
 	add
 	stloc 5
-// 0x01029554: 0x1029554: bne   a1, v0, 0x102956c lui   v1, 0x20000
+// 0x01029564: 0x1029564: bne   a1, v0, 0x102957c lui   v1, 0x20000
 	ldloc.2
 	ldloc 5
 	ldc.i4 131072
 	stloc 7
-	bne.un L_102956c
+	bne.un L_102957c
 // --- basic block ---
-// 0x0102955c: 0x102955c: jal   0x104fbb0 addu  a0, s0, zero
+// 0x0102956c: 0x102956c: jal   0x104fbc0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl59::roadmap_main_add_separator_104fbb0(int32)
+	call int32 Cibyl59::roadmap_main_add_separator_104fbc0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029564: 0x1029564: j	 0x102965c addiu s2, s2, 4
+// 0x01029574: 0x1029574: j	 0x102966c addiu s2, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	br L_102965c
+	br L_102966c
 // --- basic block ---
-L_102956c:
-// 0x0102956c: 0x102956c: addiu v1, v1, 24936
+L_102957c:
+// 0x0102957c: 0x102957c: addiu v1, v1, 25400
 	ldloc 7
-	ldc.i4 24936
+	ldc.i4 25400
 	add
 	stloc 7
-// 0x01029570: 0x1029570: bne   a1, v1, 0x10295d4 addiu v1, zero, 47
+// 0x01029580: 0x1029580: bne   a1, v1, 0x10295e4 addiu v1, zero, 47
 	ldloc.2
 	ldloc 7
 	ldc.i4.s 47
 	stloc 7
-	bne.un L_10295d4
+	bne.un L_10295e4
 // --- basic block ---
-// 0x01029578: 0x1029578: addu  a0, s3, zero
+// 0x01029588: 0x1029588: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0102957c: 0x102957c: jal   0x1055490 addu  a1, s4, zero
+// 0x0102958c: 0x102958c: jal   0x10554a0 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl63::roadmap_help_first_topic_1055490(int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_first_topic_10554a0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029584: 0x1029584: j	 0x10295c4 sll   zero, zero, 0
-	br L_10295c4
+// 0x01029594: 0x1029594: j	 0x10295d4 sll   zero, zero, 0
+	br L_10295d4
 // --- basic block ---
-L_102958c:
-// 0x0102958c: 0x102958c: lw    a0, 16(sp)
+L_102959c:
+// 0x0102959c: 0x102959c: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3856,18 +3856,18 @@ L_102958c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01029590: 0x1029590: jal   0x101cd60 sll   zero, zero, 0
+// 0x010295a0: 0x10295a0: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029598: 0x1029598: lw    a0, 16(sp)
+// 0x010295a8: 0x10295a8: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3876,7 +3876,7 @@ L_102958c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102959c: 0x102959c: jal   0x101cd60 sw    v0, 28(sp)
+// 0x010295ac: 0x10295ac: jal   0x101cd70 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3890,12 +3890,12 @@ L_102958c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010295a4: 0x10295a4: lw    a1, 28(sp)
+// 0x010295b4: 0x10295b4: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3904,7 +3904,7 @@ L_102958c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010295a8: 0x10295a8: lw    a3, 20(sp)
+// 0x010295b8: 0x10295b8: lw    a3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3913,25 +3913,25 @@ L_102958c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010295ac: 0x10295ac: addu  a0, s0, zero
+// 0x010295bc: 0x10295bc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010295b0: 0x10295b0: jal   0x104fb48 addu  a2, v0, zero
+// 0x010295c0: 0x10295c0: jal   0x104fb58 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_add_menu_item_104fb48(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_add_menu_item_104fb58(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010295b8: 0x10295b8: addu  a0, s3, zero
+// 0x010295c8: 0x10295c8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x010295bc: 0x10295bc: jal   0x10557b8 addu  a1, s4, zero
+// 0x010295cc: 0x10295cc: jal   0x10557c8 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -3939,35 +3939,35 @@ L_102958c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_next_topic_10557b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_next_topic_10557c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10295c4:
-// 0x010295c4: 0x10295c4: bne   v0, zero, 0x102958c sll   zero, zero, 0
+L_10295d4:
+// 0x010295d4: 0x10295d4: bne   v0, zero, 0x102959c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102958c
+	brtrue L_102959c
 // --- basic block ---
-// 0x010295cc: 0x10295cc: j	 0x102965c addiu s2, s2, 4
+// 0x010295dc: 0x10295dc: j	 0x102966c addiu s2, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	br L_102965c
+	br L_102966c
 // --- basic block ---
-L_10295d4:
-// 0x010295d4: 0x10295d4: lbu   v0, 0(a1)
+L_10295e4:
+// 0x010295e4: 0x10295e4: lbu   v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010295d8: 0x10295d8: sll   zero, zero, 0
-// 0x010295dc: 0x10295dc: bne   v0, v1, 0x1029610 sll   zero, zero, 0
+// 0x010295e8: 0x10295e8: sll   zero, zero, 0
+// 0x010295ec: 0x10295ec: bne   v0, v1, 0x1029620 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1029610
+	bne.un L_1029620
 // --- basic block ---
-// 0x010295e4: 0x10295e4: jal   0x104fa70 sw    a1, 28(sp)
+// 0x010295f4: 0x10295f4: jal   0x104fa80 sw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3976,10 +3976,10 @@ L_10295d4:
 	add
 	ldloc.2
 	stelem.i4
-	call int32 Cibyl59::roadmap_main_new_menu_104fa70()
+	call int32 Cibyl59::roadmap_main_new_menu_104fa80()
 	stloc 5
 // --- basic block ---
-// 0x010295ec: 0x10295ec: lw    a1, 28(sp)
+// 0x010295fc: 0x10295fc: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3988,10 +3988,10 @@ L_10295d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010295f0: 0x10295f0: addu  s0, v0, zero
+// 0x01029600: 0x1029600: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010295f4: 0x10295f4: jal   0x101cd60 addiu a0, a1, 1
+// 0x01029604: 0x1029604: jal   0x101cd70 addiu a0, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
@@ -4001,28 +4001,28 @@ L_10295d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010295fc: 0x10295fc: addu  a1, v0, zero
+// 0x0102960c: 0x102960c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01029600: 0x1029600: jal   0x104fa80 addu  a0, s0, zero
+// 0x01029610: 0x1029610: jal   0x104fa90 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-	call void Cibyl59::roadmap_main_add_menu_104fa80()
+	call void Cibyl59::roadmap_main_add_menu_104fa90()
 // --- basic block ---
-// 0x01029608: 0x1029608: j	 0x102965c addiu s2, s2, 4
+// 0x01029618: 0x1029618: j	 0x102966c addiu s2, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	br L_102965c
+	br L_102966c
 // --- basic block ---
-L_1029610:
-// 0x01029610: 0x1029610: jal   0x1028cfc addu  a0, s1, zero
+L_1029620:
+// 0x01029620: 0x1029620: jal   0x1028d0c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4030,16 +4030,16 @@ L_1029610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_find_action_1028cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_find_action_1028d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029618: 0x1029618: beq   v0, zero, 0x1029658 sll   zero, zero, 0
+// 0x01029628: 0x1029628: beq   v0, zero, 0x1029668 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1029658
+	brfalse L_1029668
 // --- basic block ---
-// 0x01029620: 0x1029620: lw    a0, 4(v0)
+// 0x01029630: 0x1029630: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4048,7 +4048,7 @@ L_1029610:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01029624: 0x1029624: jal   0x101cd60 sw    v0, 24(sp)
+// 0x01029634: 0x1029634: jal   0x101cd70 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4062,12 +4062,12 @@ L_1029610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102962c: 0x102962c: lw    v1, 24(sp)
+// 0x0102963c: 0x102963c: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4076,7 +4076,7 @@ L_1029610:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029630: 0x1029630: sw    v0, 28(sp)
+// 0x01029640: 0x1029640: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4085,7 +4085,7 @@ L_1029610:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01029634: 0x1029634: lw    a0, 16(v1)
+// 0x01029644: 0x1029644: lw    a0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4094,18 +4094,18 @@ L_1029610:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01029638: 0x1029638: jal   0x101cd60 sll   zero, zero, 0
+// 0x01029648: 0x1029648: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029640: 0x1029640: lw    v1, 24(sp)
+// 0x01029650: 0x1029650: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4114,7 +4114,7 @@ L_1029610:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029644: 0x1029644: lw    a1, 28(sp)
+// 0x01029654: 0x1029654: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4123,7 +4123,7 @@ L_1029610:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01029648: 0x1029648: lw    a3, 20(v1)
+// 0x01029658: 0x1029658: lw    a3, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4132,57 +4132,57 @@ L_1029610:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102964c: 0x102964c: addu  a0, s0, zero
+// 0x0102965c: 0x102965c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01029650: 0x1029650: jal   0x104fb48 addu  a2, v0, zero
+// 0x01029660: 0x1029660: jal   0x104fb58 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_add_menu_item_104fb48(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_add_menu_item_104fb58(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1029658:
-// 0x01029658: 0x1029658: addiu s2, s2, 4
+L_1029668:
+// 0x01029668: 0x1029668: addiu s2, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_102965c:
-// 0x0102965c: 0x102965c: lw    a1, 0(s2)
+L_102966c:
+// 0x0102966c: 0x102966c: lw    a1, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01029660: 0x1029660: sll   zero, zero, 0
-// 0x01029664: 0x1029664: bne   a1, zero, 0x1029550 lui   v0, 0x20000
+// 0x01029670: 0x1029670: sll   zero, zero, 0
+// 0x01029674: 0x1029674: bne   a1, zero, 0x1029560 lui   v0, 0x20000
 	ldloc.2
 	ldc.i4 131072
 	stloc 5
-	brtrue L_1029550
+	brtrue L_1029560
 // --- basic block ---
-// 0x0102966c: 0x102966c: beq   s8, zero, 0x102971c addu  a0, s7, zero
+// 0x0102967c: 0x102967c: beq   s8, zero, 0x102972c addu  a0, s7, zero
 	ldloc 16
 	ldloc 15
 	stloc.1
-	brfalse L_102971c
+	brfalse L_102972c
 // --- basic block ---
-// 0x01029674: 0x1029674: lui   a1, 0x10000
+// 0x01029684: 0x1029684: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01029678: 0x1029678: addiu a1, a1, -26076
+// 0x01029688: 0x1029688: addiu a1, a1, -26076
 	ldloc.2
 	ldc.i4 -26076
 	add
 	stloc.2
-// 0x0102967c: 0x102967c: jal   0x102931c addu  a2, s1, zero
+// 0x0102968c: 0x102968c: jal   0x102932c addu  a2, s1, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -4190,50 +4190,50 @@ L_102965c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_user_config_102931c(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_user_config_102932c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029684: 0x1029684: bne   v0, zero, 0x1029690 sll   zero, zero, 0
+// 0x01029694: 0x1029694: bne   v0, zero, 0x10296a0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1029690
+	brtrue L_10296a0
 // --- basic block ---
-// 0x0102968c: 0x102968c: addu  v0, s6, zero
+// 0x0102969c: 0x102969c: addu  v0, s6, zero
 	ldloc 14
 	stloc 5
-L_1029690:
-// 0x01029690: 0x1029690: lui   s2, 0x20000
+L_10296a0:
+// 0x010296a0: 0x10296a0: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01029694: 0x1029694: addu  s0, v0, zero
+// 0x010296a4: 0x10296a4: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01029698: 0x1029698: j	 0x102970c addiu s2, s2, 24920
+// 0x010296a8: 0x10296a8: j	 0x102971c addiu s2, s2, 25384
 	ldloc 9
-	ldc.i4 24920
+	ldc.i4 25384
 	add
 	stloc 9
-	br L_102970c
+	br L_102971c
 // --- basic block ---
-L_10296a0:
-// 0x010296a0: 0x10296a0: bne   a1, s2, 0x10296b8 sll   zero, zero, 0
+L_10296b0:
+// 0x010296b0: 0x10296b0: bne   a1, s2, 0x10296c8 sll   zero, zero, 0
 	ldloc.2
 	ldloc 9
-	bne.un L_10296b8
+	bne.un L_10296c8
 // --- basic block ---
-// 0x010296a8: 0x10296a8: jal   0x104fbd8 addiu s0, s0, 4
+// 0x010296b8: 0x10296b8: jal   0x104fbe8 addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	call void Cibyl59::roadmap_main_add_tool_space_104fbd8()
+	call void Cibyl59::roadmap_main_add_tool_space_104fbe8()
 // --- basic block ---
-// 0x010296b0: 0x10296b0: j	 0x102970c sll   zero, zero, 0
-	br L_102970c
+// 0x010296c0: 0x10296c0: j	 0x102971c sll   zero, zero, 0
+	br L_102971c
 // --- basic block ---
-L_10296b8:
-// 0x010296b8: 0x10296b8: jal   0x1028cfc addu  a0, s1, zero
+L_10296c8:
+// 0x010296c8: 0x10296c8: jal   0x1028d0c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4241,16 +4241,16 @@ L_10296b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_find_action_1028cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_find_action_1028d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010296c0: 0x10296c0: beq   v0, zero, 0x1029708 sll   zero, zero, 0
+// 0x010296d0: 0x10296d0: beq   v0, zero, 0x1029718 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1029708
+	brfalse L_1029718
 // --- basic block ---
-// 0x010296c8: 0x10296c8: lw    a0, 12(v0)
+// 0x010296d8: 0x10296d8: lw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4259,12 +4259,12 @@ L_10296b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010296cc: 0x10296cc: sll   zero, zero, 0
-// 0x010296d0: 0x10296d0: bne   a0, zero, 0x10296ec sll   zero, zero, 0
+// 0x010296dc: 0x10296dc: sll   zero, zero, 0
+// 0x010296e0: 0x10296e0: bne   a0, zero, 0x10296fc sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10296ec
+	brtrue L_10296fc
 // --- basic block ---
-// 0x010296d8: 0x10296d8: lw    a0, 8(v0)
+// 0x010296e8: 0x10296e8: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4273,12 +4273,12 @@ L_10296b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010296dc: 0x10296dc: sll   zero, zero, 0
-// 0x010296e0: 0x10296e0: bne   a0, zero, 0x10296ec sll   zero, zero, 0
+// 0x010296ec: 0x10296ec: sll   zero, zero, 0
+// 0x010296f0: 0x10296f0: bne   a0, zero, 0x10296fc sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10296ec
+	brtrue L_10296fc
 // --- basic block ---
-// 0x010296e8: 0x10296e8: lw    a0, 4(v0)
+// 0x010296f8: 0x10296f8: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4287,22 +4287,22 @@ L_10296b8:
 	add
 	ldelem.i4
 	stloc.1
-L_10296ec:
-// 0x010296ec: 0x10296ec: beq   s5, zero, 0x10296f8 addu  a1, zero, zero
+L_10296fc:
+// 0x010296fc: 0x10296fc: beq   s5, zero, 0x1029708 addu  a1, zero, zero
 	ldloc 13
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10296f8
+	brfalse L_1029708
 // --- basic block ---
-// 0x010296f4: 0x10296f4: lw    a1, 0(v0)
+// 0x01029704: 0x1029704: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-L_10296f8:
-// 0x010296f8: 0x10296f8: lw    a3, 20(v0)
+L_1029708:
+// 0x01029708: 0x1029708: lw    a3, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4311,7 +4311,7 @@ L_10296f8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010296fc: 0x10296fc: lw    a2, 16(v0)
+// 0x0102970c: 0x102970c: lw    a2, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4320,31 +4320,31 @@ L_10296f8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029700: 0x1029700: jal   0x104fbd0 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_add_tool_104fbd0()
+// 0x01029710: 0x1029710: jal   0x104fbe0 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_add_tool_104fbe0()
 // --- basic block ---
-L_1029708:
-// 0x01029708: 0x1029708: addiu s0, s0, 4
+L_1029718:
+// 0x01029718: 0x1029718: addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_102970c:
-// 0x0102970c: 0x102970c: lw    a1, 0(s0)
+L_102971c:
+// 0x0102971c: 0x102971c: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01029710: 0x1029710: sll   zero, zero, 0
-// 0x01029714: 0x1029714: bne   a1, zero, 0x10296a0 sll   zero, zero, 0
+// 0x01029720: 0x1029720: sll   zero, zero, 0
+// 0x01029724: 0x1029724: bne   a1, zero, 0x10296b0 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_10296a0
+	brtrue L_10296b0
 // --- basic block ---
-L_102971c:
-// 0x0102971c: 0x102971c: lw    ra, 68(sp)
-// 0x01029720: 0x1029720: lw    s8, 64(sp)
+L_102972c:
+// 0x0102972c: 0x102972c: lw    ra, 68(sp)
+// 0x01029730: 0x1029730: lw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4353,7 +4353,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01029724: 0x1029724: lw    s7, 60(sp)
+// 0x01029734: 0x1029734: lw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4362,7 +4362,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01029728: 0x1029728: lw    s6, 56(sp)
+// 0x01029738: 0x1029738: lw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4371,7 +4371,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102972c: 0x102972c: lw    s5, 52(sp)
+// 0x0102973c: 0x102973c: lw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4380,7 +4380,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01029730: 0x1029730: lw    s4, 48(sp)
+// 0x01029740: 0x1029740: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4389,7 +4389,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01029734: 0x1029734: lw    s3, 44(sp)
+// 0x01029744: 0x1029744: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4398,7 +4398,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01029738: 0x1029738: lw    s2, 40(sp)
+// 0x01029748: 0x1029748: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4407,7 +4407,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102973c: 0x102973c: lw    s1, 36(sp)
+// 0x0102974c: 0x102974c: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4416,7 +4416,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01029740: 0x1029740: lw    s0, 32(sp)
+// 0x01029750: 0x1029750: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4425,7 +4425,7 @@ L_102971c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01029744: 0x1029744: jr    ra addiu sp, sp, 72
+// 0x01029754: 0x1029754: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -4437,7 +4437,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_factory_load_menu_item_102974c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_load_menu_item_102975c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s1,int32 s0,int32 s6,int32 s3,int32 s4,int32 s5,int32 s7,int32 lo,int32 ra)
@@ -4499,12 +4499,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102974c: 0x102974c: addiu sp, sp, -104
+// 0x0102975c: 0x102975c: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x01029750: 0x1029750: sw    s2, 76(sp)
+// 0x01029760: 0x1029760: sw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4513,7 +4513,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01029754: 0x1029754: lw    s2, 4(a0)
+// 0x01029764: 0x1029764: lw    s2, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4522,22 +4522,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01029758: 0x1029758: addiu v0, zero, 28
+// 0x01029768: 0x1029768: addiu v0, zero, 28
 	ldc.i4.s 28
 	stloc 6
-// 0x0102975c: 0x102975c: mult  s2, v0
+// 0x0102976c: 0x102976c: mult  s2, v0
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 16
-// 0x01029760: 0x1029760: lw    v0, 0(a0)
+// 0x01029770: 0x1029770: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01029764: 0x1029764: sw    s5, 88(sp)
+// 0x01029774: 0x1029774: sw    s5, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4546,7 +4546,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01029768: 0x1029768: sw    s4, 84(sp)
+// 0x01029778: 0x1029778: sw    s4, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4555,7 +4555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102976c: 0x102976c: sw    s3, 80(sp)
+// 0x0102977c: 0x102977c: sw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4564,7 +4564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01029770: 0x1029770: sw    s0, 68(sp)
+// 0x01029780: 0x1029780: sw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4573,8 +4573,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01029774: 0x1029774: sw    ra, 100(sp)
-// 0x01029778: 0x1029778: sw    s7, 96(sp)
+// 0x01029784: 0x1029784: sw    ra, 100(sp)
+// 0x01029788: 0x1029788: sw    s7, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4583,7 +4583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102977c: 0x102977c: sw    s6, 92(sp)
+// 0x0102978c: 0x102978c: sw    s6, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4592,7 +4592,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029780: 0x1029780: sw    s1, 72(sp)
+// 0x01029790: 0x1029790: sw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4601,34 +4601,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01029784: 0x1029784: addu  s3, a0, zero
+// 0x01029794: 0x1029794: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01029788: 0x1029788: addu  s0, a1, zero
+// 0x01029798: 0x1029798: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0102978c: 0x102978c: addu  a0, a1, zero
+// 0x0102979c: 0x102979c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01029790: 0x1029790: mflo  lo
+// 0x010297a0: 0x10297a0: mflo  lo
 	ldloc 16
 	stloc 8
-// 0x01029794: 0x1029794: addiu a1, zero, 46
+// 0x010297a4: 0x10297a4: addiu a1, zero, 46
 	ldc.i4.s 46
 	stloc.2
-// 0x01029798: 0x1029798: addu  s2, v0, s2
+// 0x010297a8: 0x10297a8: addu  s2, v0, s2
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x0102979c: 0x102979c: sw    zero, 0(s2)
+// 0x010297ac: 0x10297ac: sw    zero, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010297a0: 0x10297a0: sw    zero, 4(s2)
+// 0x010297b0: 0x10297b0: sw    zero, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4637,7 +4637,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010297a4: 0x10297a4: sw    zero, 8(s2)
+// 0x010297b4: 0x10297b4: sw    zero, 8(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4646,7 +4646,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010297a8: 0x10297a8: sw    zero, 12(s2)
+// 0x010297b8: 0x10297b8: sw    zero, 12(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4655,7 +4655,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010297ac: 0x10297ac: sw    zero, 16(s2)
+// 0x010297bc: 0x10297bc: sw    zero, 16(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4664,7 +4664,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010297b0: 0x10297b0: sw    zero, 20(s2)
+// 0x010297c0: 0x10297c0: sw    zero, 20(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4673,7 +4673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010297b4: 0x10297b4: sw    zero, 24(s2)
+// 0x010297c4: 0x10297c4: sw    zero, 24(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4682,7 +4682,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010297b8: 0x10297b8: jal   0x1001a5c addu  s4, a2, zero
+// 0x010297c8: 0x10297c8: jal   0x1001a5c addu  s4, a2, zero
 	ldloc.3
 	stloc 13
 	ldloc.1
@@ -4692,43 +4692,43 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010297c0: 0x10297c0: beq   v0, zero, 0x102990c addu  s5, v0, zero
+// 0x010297d0: 0x10297d0: beq   v0, zero, 0x102991c addu  s5, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 14
-	brfalse L_102990c
+	brfalse L_102991c
 // --- basic block ---
-// 0x010297c8: 0x10297c8: subu  s6, v0, s0
+// 0x010297d8: 0x10297d8: subu  s6, v0, s0
 	ldloc 6
 	ldloc 10
 	sub
 	stloc 11
-// 0x010297cc: 0x10297cc: slti  v0, s6, 33
+// 0x010297dc: 0x10297dc: slti  v0, s6, 33
 	ldloc 11
 	ldc.i4.s 33
 	clt
 	stloc 6
-// 0x010297d0: 0x10297d0: beq   v0, zero, 0x10299c0 addu  v0, zero, zero
+// 0x010297e0: 0x10297e0: beq   v0, zero, 0x10299d0 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10299c0
+	brfalse L_10299d0
 // --- basic block ---
-// 0x010297d8: 0x10297d8: addiu s1, sp, 24
+// 0x010297e8: 0x10297e8: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x010297dc: 0x10297dc: addu  a1, s0, zero
+// 0x010297ec: 0x10297ec: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x010297e0: 0x10297e0: addu  a0, s1, zero
+// 0x010297f0: 0x10297f0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010297e4: 0x10297e4: addu  a2, s6, zero
+// 0x010297f4: 0x10297f4: addu  a2, s6, zero
 	ldloc 11
 	stloc.3
-// 0x010297e8: 0x10297e8: jal   0x1001af8 addu  s6, s1, s6
+// 0x010297f8: 0x10297f8: jal   0x1001af8 addu  s6, s1, s6
 	ldloc 9
 	ldloc 11
 	add
@@ -4739,13 +4739,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x010297f0: 0x10297f0: addu  a0, s4, zero
+// 0x01029800: 0x1029800: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x010297f4: 0x10297f4: addu  a1, s1, zero
+// 0x01029804: 0x1029804: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010297f8: 0x10297f8: jal   0x1028cfc sb    zero, 0(s6)
+// 0x01029808: 0x1029808: jal   0x1028d0c sb    zero, 0(s6)
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -4754,40 +4754,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_find_action_1028cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_find_action_1028d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029800: 0x1029800: bne   v0, zero, 0x1029828 addiu v1, zero, 1
+// 0x01029810: 0x1029810: bne   v0, zero, 0x1029838 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 7
-	brtrue L_1029828
+	brtrue L_1029838
 // --- basic block ---
-// 0x01029808: 0x1029808: lui   a1, 0x10000
+// 0x01029818: 0x1029818: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102980c: 0x102980c: lui   a3, 0x10000
+// 0x0102981c: 0x102981c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01029810: 0x1029810: addiu a1, a1, -26172
+// 0x01029820: 0x1029820: addiu a1, a1, -26172
 	ldloc.2
 	ldc.i4 -26172
 	add
 	stloc.2
-// 0x01029814: 0x1029814: addiu a3, a3, -26068
+// 0x01029824: 0x1029824: addiu a3, a3, -26068
 	ldloc 4
 	ldc.i4 -26068
 	add
 	stloc 4
-// 0x01029818: 0x1029818: addiu a0, zero, 4
+// 0x01029828: 0x1029828: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102981c: 0x102981c: addiu a2, zero, 210
+// 0x0102982c: 0x102982c: addiu a2, zero, 210
 	ldc.i4 210
 	stloc.3
-// 0x01029820: 0x1029820: j	 0x102997c sw    s1, 16(sp)
+// 0x01029830: 0x1029830: j	 0x102998c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4796,16 +4796,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	br L_102997c
+	br L_102998c
 // --- basic block ---
-L_1029828:
-// 0x01029828: 0x1029828: sb    v1, 8(s2)
+L_1029838:
+// 0x01029838: 0x1029838: sb    v1, 8(s2)
 	ldloc 8
 	ldc.i4.8
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0102982c: 0x102982c: lw    v1, 4(v0)
+// 0x0102983c: 0x102983c: lw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4814,7 +4814,7 @@ L_1029828:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029830: 0x1029830: sw    v0, 16(s2)
+// 0x01029840: 0x1029840: sw    v0, 16(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4823,14 +4823,14 @@ L_1029828:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01029834: 0x1029834: sw    v1, 0(s2)
+// 0x01029844: 0x1029844: sw    v1, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01029838: 0x1029838: jal   0x1001ba8 addu  a0, s1, zero
+// 0x01029848: 0x1029848: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4843,7 +4843,7 @@ L_1029828:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029840: 0x1029840: sw    v0, 4(s2)
+// 0x01029850: 0x1029850: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4852,75 +4852,75 @@ L_1029828:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01029844: 0x1029844: addu  s0, zero, zero
+// 0x01029854: 0x1029854: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01029848: 0x1029848: j	 0x10298a0 addiu s7, zero, 28
+// 0x01029858: 0x1029858: j	 0x10298b0 addiu s7, zero, 28
 	ldc.i4.s 28
 	stloc 15
-	br L_10298a0
+	br L_10298b0
 // --- basic block ---
-L_1029850:
-// 0x01029850: 0x1029850: lw    s6, 0(s3)
+L_1029860:
+// 0x01029860: 0x1029860: lw    s6, 0(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01029854: 0x1029854: mflo  lo
+// 0x01029864: 0x1029864: mflo  lo
 	ldloc 16
 	stloc 6
-// 0x01029858: 0x1029858: addu  s6, s6, v0
+// 0x01029868: 0x1029868: addu  s6, s6, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 11
-// 0x0102985c: 0x102985c: lbu   v0, 8(s6)
+// 0x0102986c: 0x102986c: lbu   v0, 8(s6)
 	ldloc 11
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x01029860: 0x1029860: sll   zero, zero, 0
-// 0x01029864: 0x1029864: andi  v0, v0, 1
+// 0x01029870: 0x1029870: sll   zero, zero, 0
+// 0x01029874: 0x1029874: andi  v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	and
 	stloc 6
-// 0x01029868: 0x1029868: beq   v0, zero, 0x10298a0 addiu s0, s0, 1
+// 0x01029878: 0x1029878: beq   v0, zero, 0x10298b0 addiu s0, s0, 1
 	ldloc 6
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	brfalse L_10298a0
+	brfalse L_10298b0
 // --- basic block ---
-// 0x01029870: 0x1029870: lw    a0, 0(s6)
+// 0x01029880: 0x1029880: lw    a0, 0(s6)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01029874: 0x1029874: lw    a1, 0(s2)
+// 0x01029884: 0x1029884: lw    a1, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01029878: 0x1029878: jal   0x1001b14 sll   zero, zero, 0
+// 0x01029888: 0x1029888: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01029880: 0x1029880: bne   v0, zero, 0x10298a0 sll   zero, zero, 0
+// 0x01029890: 0x1029890: bne   v0, zero, 0x10298b0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10298a0
+	brtrue L_10298b0
 // --- basic block ---
-// 0x01029888: 0x1029888: lw    a0, 24(s6)
+// 0x01029898: 0x1029898: lw    a0, 24(s6)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4929,22 +4929,22 @@ L_1029850:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102988c: 0x102988c: sll   zero, zero, 0
-// 0x01029890: 0x1029890: bne   a0, zero, 0x10298fc addiu a1, s5, 1
+// 0x0102989c: 0x102989c: sll   zero, zero, 0
+// 0x010298a0: 0x10298a0: bne   a0, zero, 0x102990c addiu a1, s5, 1
 	ldloc.1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc.2
-	brtrue L_10298fc
+	brtrue L_102990c
 // --- basic block ---
-// 0x01029898: 0x1029898: j	 0x10298b8 addiu v0, zero, 16
+// 0x010298a8: 0x10298a8: j	 0x10298c8 addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 6
-	br L_10298b8
+	br L_10298c8
 // --- basic block ---
-L_10298a0:
-// 0x010298a0: 0x10298a0: lw    s1, 4(s3)
+L_10298b0:
+// 0x010298b0: 0x10298b0: lw    s1, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -4953,37 +4953,37 @@ L_10298a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010298a4: 0x10298a4: sll   zero, zero, 0
-// 0x010298a8: 0x10298a8: slt   v0, s0, s1
+// 0x010298b4: 0x10298b4: sll   zero, zero, 0
+// 0x010298b8: 0x10298b8: slt   v0, s0, s1
 	ldloc 10
 	ldloc 9
 	clt
 	stloc 6
-// 0x010298ac: 0x10298ac: bne   v0, zero, 0x1029850 mult  s0, s7
+// 0x010298bc: 0x10298bc: bne   v0, zero, 0x1029860 mult  s0, s7
 	ldloc 6
 	ldloc 10
 	ldloc 15
 	mul
 	stloc 16
-	brtrue L_1029850
+	brtrue L_1029860
 // --- basic block ---
-// 0x010298b4: 0x10298b4: addiu v0, zero, 16
+// 0x010298c4: 0x10298c4: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 6
-L_10298b8:
-// 0x010298b8: 0x10298b8: beq   s1, v0, 0x10299bc addiu s1, s1, 1
+L_10298c8:
+// 0x010298c8: 0x10298c8: beq   s1, v0, 0x10299cc addiu s1, s1, 1
 	ldloc 9
 	ldloc 6
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	beq  L_10299bc
+	beq  L_10299cc
 // --- basic block ---
-// 0x010298c0: 0x10298c0: addiu a0, zero, 16
+// 0x010298d0: 0x10298d0: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-// 0x010298c4: 0x10298c4: jal   0x1000910 sw    s1, 4(s3)
+// 0x010298d4: 0x10298d4: jal   0x1000910 sw    s1, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -5002,7 +5002,7 @@ L_10298b8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010298cc: 0x10298cc: sw    v0, 24(s2)
+// 0x010298dc: 0x10298dc: sw    v0, 24(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5011,7 +5011,7 @@ L_10298b8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010298d0: 0x10298d0: sw    zero, 12(v0)
+// 0x010298e0: 0x10298e0: sw    zero, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5020,14 +5020,14 @@ L_10298b8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010298d4: 0x10298d4: sw    zero, 0(v0)
+// 0x010298e4: 0x10298e4: sw    zero, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010298d8: 0x10298d8: sw    zero, 4(v0)
+// 0x010298e8: 0x10298e8: sw    zero, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5036,7 +5036,7 @@ L_10298b8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010298dc: 0x10298dc: sw    zero, 8(v0)
+// 0x010298ec: 0x10298ec: sw    zero, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5045,7 +5045,7 @@ L_10298b8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010298e0: 0x10298e0: lw    s0, 24(s2)
+// 0x010298f0: 0x10298f0: lw    s0, 24(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5054,10 +5054,10 @@ L_10298b8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010298e4: 0x10298e4: addiu a0, zero, 28
+// 0x010298f4: 0x10298f4: addiu a0, zero, 28
 	ldc.i4.s 28
 	stloc.1
-// 0x010298e8: 0x10298e8: jal   0x1028ef0 addiu a1, zero, 16
+// 0x010298f8: 0x10298f8: jal   0x1028f00 addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
 	ldloc.0
@@ -5065,12 +5065,12 @@ L_10298b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::calloc_1028ef0(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::calloc_1028f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010298f0: 0x10298f0: lw    a0, 24(s2)
+// 0x01029900: 0x1029900: lw    a0, 24(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5079,20 +5079,20 @@ L_10298b8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010298f4: 0x10298f4: sw    v0, 0(s0)
+// 0x01029904: 0x1029904: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010298f8: 0x10298f8: addiu a1, s5, 1
+// 0x01029908: 0x1029908: addiu a1, s5, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc.2
-L_10298fc:
-// 0x010298fc: 0x10298fc: jal   0x102974c addu  a2, s4, zero
+L_102990c:
+// 0x0102990c: 0x102990c: jal   0x102975c addu  a2, s4, zero
 	ldloc 13
 	stloc.3
 	ldloc.0
@@ -5100,16 +5100,16 @@ L_10298fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_load_menu_item_102974c(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_load_menu_item_102975c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029904: 0x1029904: j	 0x10299c0 sll   zero, zero, 0
-	br L_10299c0
+// 0x01029914: 0x1029914: j	 0x10299d0 sll   zero, zero, 0
+	br L_10299d0
 // --- basic block ---
-L_102990c:
-// 0x0102990c: 0x102990c: lw    v1, 4(s3)
+L_102991c:
+// 0x0102991c: 0x102991c: lw    v1, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -5118,46 +5118,46 @@ L_102990c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029910: 0x1029910: addiu v0, zero, 16
+// 0x01029920: 0x1029920: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 6
-// 0x01029914: 0x1029914: beq   v1, v0, 0x10299bc addiu v1, zero, 124
+// 0x01029924: 0x1029924: beq   v1, v0, 0x10299cc addiu v1, zero, 124
 	ldloc 7
 	ldloc 6
 	ldc.i4.s 124
 	stloc 7
-	beq  L_10299bc
+	beq  L_10299cc
 // --- basic block ---
-// 0x0102991c: 0x102991c: lb    v0, 0(s0)
+// 0x0102992c: 0x102992c: lb    v0, 0(s0)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01029920: 0x1029920: sll   zero, zero, 0
-// 0x01029924: 0x1029924: beq   v0, v1, 0x1029934 addiu v1, zero, 45
+// 0x01029930: 0x1029930: sll   zero, zero, 0
+// 0x01029934: 0x1029934: beq   v0, v1, 0x1029944 addiu v1, zero, 45
 	ldloc 6
 	ldloc 7
 	ldc.i4.s 45
 	stloc 7
-	beq  L_1029934
+	beq  L_1029944
 // --- basic block ---
-// 0x0102992c: 0x102992c: bne   v0, v1, 0x1029950 addu  a0, s4, zero
+// 0x0102993c: 0x102993c: bne   v0, v1, 0x1029960 addu  a0, s4, zero
 	ldloc 6
 	ldloc 7
 	ldloc 13
 	stloc.1
-	bne.un L_1029950
+	bne.un L_1029960
 // --- basic block ---
-L_1029934:
-// 0x01029934: 0x1029934: addiu v0, zero, 4
+L_1029944:
+// 0x01029944: 0x1029944: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x01029938: 0x1029938: sb    v0, 8(s2)
+// 0x01029948: 0x1029948: sb    v0, 8(s2)
 	ldloc 8
 	ldc.i4.8
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0102993c: 0x102993c: lw    v1, 4(s3)
+// 0x0102994c: 0x102994c: lw    v1, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -5166,15 +5166,15 @@ L_1029934:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029940: 0x1029940: addiu v0, zero, 1
+// 0x01029950: 0x1029950: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01029944: 0x1029944: addiu v1, v1, 1
+// 0x01029954: 0x1029954: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01029948: 0x1029948: j	 0x10299c0 sw    v1, 4(s3)
+// 0x01029958: 0x1029958: j	 0x10299d0 sw    v1, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -5183,10 +5183,10 @@ L_1029934:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10299c0
+	br L_10299d0
 // --- basic block ---
-L_1029950:
-// 0x01029950: 0x1029950: jal   0x1028cfc addu  a1, s0, zero
+L_1029960:
+// 0x01029960: 0x1029960: jal   0x1028d0c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5194,40 +5194,40 @@ L_1029950:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_find_action_1028cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_find_action_1028d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029958: 0x1029958: bne   v0, zero, 0x102998c addu  s1, v0, zero
+// 0x01029968: 0x1029968: bne   v0, zero, 0x102999c addu  s1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 9
-	brtrue L_102998c
+	brtrue L_102999c
 // --- basic block ---
-// 0x01029960: 0x1029960: lui   a1, 0x10000
+// 0x01029970: 0x1029970: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01029964: 0x1029964: lui   a3, 0x10000
+// 0x01029974: 0x1029974: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01029968: 0x1029968: addiu a1, a1, -26172
+// 0x01029978: 0x1029978: addiu a1, a1, -26172
 	ldloc.2
 	ldc.i4 -26172
 	add
 	stloc.2
-// 0x0102996c: 0x102996c: addiu a3, a3, -26104
+// 0x0102997c: 0x102997c: addiu a3, a3, -26104
 	ldloc 4
 	ldc.i4 -26104
 	add
 	stloc 4
-// 0x01029970: 0x1029970: addiu a0, zero, 4
+// 0x01029980: 0x1029980: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01029974: 0x1029974: addiu a2, zero, 269
+// 0x01029984: 0x1029984: addiu a2, zero, 269
 	ldc.i4 269
 	stloc.3
-// 0x01029978: 0x1029978: sw    s0, 16(sp)
+// 0x01029988: 0x1029988: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5236,8 +5236,8 @@ L_1029950:
 	add
 	ldloc 10
 	stelem.i4
-L_102997c:
-// 0x0102997c: 0x102997c: jal   0x100449c sll   zero, zero, 0
+L_102998c:
+// 0x0102998c: 0x102998c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5248,13 +5248,13 @@ L_102997c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029984: 0x1029984: j	 0x10299c0 addu  v0, zero, zero
+// 0x01029994: 0x1029994: j	 0x10299d0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10299c0
+	br L_10299d0
 // --- basic block ---
-L_102998c:
-// 0x0102998c: 0x102998c: jal   0x1001ba8 addu  a0, s0, zero
+L_102999c:
+// 0x0102999c: 0x102999c: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5267,13 +5267,13 @@ L_102998c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029994: 0x1029994: sb    zero, 8(s2)
+// 0x010299a4: 0x10299a4: sb    zero, 8(s2)
 	ldloc 8
 	ldc.i4.8
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01029998: 0x1029998: lw    v1, 4(s3)
+// 0x010299a8: 0x10299a8: lw    v1, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -5282,7 +5282,7 @@ L_102998c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102999c: 0x102999c: sw    v0, 4(s2)
+// 0x010299ac: 0x10299ac: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ L_102998c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010299a0: 0x10299a0: lw    v0, 4(s1)
+// 0x010299b0: 0x10299b0: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -5300,19 +5300,19 @@ L_102998c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010299a4: 0x10299a4: addiu v1, v1, 1
+// 0x010299b4: 0x10299b4: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010299a8: 0x10299a8: sw    v0, 0(s2)
+// 0x010299b8: 0x10299b8: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010299ac: 0x10299ac: sw    s1, 16(s2)
+// 0x010299bc: 0x10299bc: sw    s1, 16(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5321,7 +5321,7 @@ L_102998c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010299b0: 0x10299b0: sw    v1, 4(s3)
+// 0x010299c0: 0x10299c0: sw    v1, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -5330,18 +5330,18 @@ L_102998c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010299b4: 0x10299b4: j	 0x10299c0 addiu v0, zero, 1
+// 0x010299c4: 0x10299c4: j	 0x10299d0 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10299c0
+	br L_10299d0
 // --- basic block ---
-L_10299bc:
-// 0x010299bc: 0x10299bc: addu  v0, zero, zero
+L_10299cc:
+// 0x010299cc: 0x10299cc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10299c0:
-// 0x010299c0: 0x10299c0: lw    ra, 100(sp)
-// 0x010299c4: 0x10299c4: lw    s7, 96(sp)
+L_10299d0:
+// 0x010299d0: 0x10299d0: lw    ra, 100(sp)
+// 0x010299d4: 0x10299d4: lw    s7, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5350,7 +5350,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010299c8: 0x10299c8: lw    s6, 92(sp)
+// 0x010299d8: 0x10299d8: lw    s6, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5359,7 +5359,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010299cc: 0x10299cc: lw    s5, 88(sp)
+// 0x010299dc: 0x10299dc: lw    s5, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5368,7 +5368,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010299d0: 0x10299d0: lw    s4, 84(sp)
+// 0x010299e0: 0x10299e0: lw    s4, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5377,7 +5377,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010299d4: 0x10299d4: lw    s3, 80(sp)
+// 0x010299e4: 0x10299e4: lw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5386,7 +5386,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010299d8: 0x10299d8: lw    s2, 76(sp)
+// 0x010299e8: 0x10299e8: lw    s2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5395,7 +5395,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010299dc: 0x10299dc: lw    s1, 72(sp)
+// 0x010299ec: 0x10299ec: lw    s1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5404,7 +5404,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010299e0: 0x10299e0: lw    s0, 68(sp)
+// 0x010299f0: 0x10299f0: lw    s0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5413,7 +5413,7 @@ L_10299c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010299e4: 0x10299e4: jr    ra addiu sp, sp, 104
+// 0x010299f4: 0x10299f4: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -5425,7 +5425,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_factory_load_menu_file_10299ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_load_menu_file_10299fc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -5487,12 +5487,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010299ec: 0x10299ec: addiu sp, sp, -320
+// 0x010299fc: 0x10299fc: addiu sp, sp, -320
 	ldloc.0
 	ldc.i4 -320
 	add
 	stloc.0
-// 0x010299f0: 0x10299f0: sw    s0, 280(sp)
+// 0x01029a00: 0x1029a00: sw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5501,13 +5501,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010299f4: 0x10299f4: lui   a2, 0x0
+// 0x01029a04: 0x1029a04: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010299f8: 0x10299f8: addu  s0, a0, zero
+// 0x01029a08: 0x1029a08: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010299fc: 0x10299fc: sw    a1, 324(sp)
+// 0x01029a0c: 0x1029a0c: sw    a1, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5516,18 +5516,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01029a00: 0x1029a00: addiu a2, a2, 26128
+// 0x01029a10: 0x1029a10: addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
 	stloc.3
-// 0x01029a04: 0x1029a04: addu  a0, zero, zero
+// 0x01029a14: 0x1029a14: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01029a08: 0x1029a08: addu  a1, s0, zero
+// 0x01029a18: 0x1029a18: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01029a0c: 0x1029a0c: sw    s1, 284(sp)
+// 0x01029a1c: 0x1029a1c: sw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5536,8 +5536,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01029a10: 0x1029a10: sw    ra, 316(sp)
-// 0x01029a14: 0x1029a14: sw    s8, 312(sp)
+// 0x01029a20: 0x1029a20: sw    ra, 316(sp)
+// 0x01029a24: 0x1029a24: sw    s8, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5546,7 +5546,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01029a18: 0x1029a18: sw    s7, 308(sp)
+// 0x01029a28: 0x1029a28: sw    s7, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5555,7 +5555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01029a1c: 0x1029a1c: sw    s6, 304(sp)
+// 0x01029a2c: 0x1029a2c: sw    s6, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5564,7 +5564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01029a20: 0x1029a20: sw    s5, 300(sp)
+// 0x01029a30: 0x1029a30: sw    s5, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5573,7 +5573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01029a24: 0x1029a24: sw    s4, 296(sp)
+// 0x01029a34: 0x1029a34: sw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5582,7 +5582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01029a28: 0x1029a28: sw    s3, 292(sp)
+// 0x01029a38: 0x1029a38: sw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5591,7 +5591,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029a2c: 0x1029a2c: jal   0x104dac8 sw    s2, 288(sp)
+// 0x01029a3c: 0x1029a3c: jal   0x104dad8 sw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5605,40 +5605,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029a34: 0x1029a34: bne   v0, zero, 0x1029a68 addu  s1, v0, zero
+// 0x01029a44: 0x1029a44: bne   v0, zero, 0x1029a78 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1029a68
+	brtrue L_1029a78
 // --- basic block ---
-// 0x01029a3c: 0x1029a3c: lui   a1, 0x10000
+// 0x01029a4c: 0x1029a4c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01029a40: 0x1029a40: lui   a3, 0x10000
+// 0x01029a50: 0x1029a50: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01029a44: 0x1029a44: addiu a1, a1, -26172
+// 0x01029a54: 0x1029a54: addiu a1, a1, -26172
 	ldloc.2
 	ldc.i4 -26172
 	add
 	stloc.2
-// 0x01029a48: 0x1029a48: addiu a3, a3, -26008
+// 0x01029a58: 0x1029a58: addiu a3, a3, -26008
 	ldloc 4
 	ldc.i4 -26008
 	add
 	stloc 4
-// 0x01029a4c: 0x1029a4c: addiu a0, zero, 4
+// 0x01029a5c: 0x1029a5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01029a50: 0x1029a50: addiu a2, zero, 301
+// 0x01029a60: 0x1029a60: addiu a2, zero, 301
 	ldc.i4 301
 	stloc.3
-// 0x01029a54: 0x1029a54: sw    s0, 16(sp)
+// 0x01029a64: 0x1029a64: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5647,7 +5647,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01029a58: 0x1029a58: jal   0x100449c addu  s3, zero, zero
+// 0x01029a68: 0x1029a68: jal   0x100449c addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
 	ldloc.0
@@ -5660,11 +5660,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029a60: 0x1029a60: j	 0x1029b98 sll   zero, zero, 0
-	br L_1029b98
+// 0x01029a70: 0x1029a70: j	 0x1029ba8 sll   zero, zero, 0
+	br L_1029ba8
 // --- basic block ---
-L_1029a68:
-// 0x01029a68: 0x1029a68: jal   0x1000910 addiu a0, zero, 16
+L_1029a78:
+// 0x01029a78: 0x1029a78: jal   0x1000910 addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
 	ldloc.0
@@ -5677,20 +5677,20 @@ L_1029a68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029a70: 0x1029a70: sw    zero, 0(v0)
+// 0x01029a80: 0x1029a80: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01029a74: 0x1029a74: addiu a0, zero, 28
+// 0x01029a84: 0x1029a84: addiu a0, zero, 28
 	ldc.i4.s 28
 	stloc.1
-// 0x01029a78: 0x1029a78: addiu a1, zero, 16
+// 0x01029a88: 0x1029a88: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-// 0x01029a7c: 0x1029a7c: sw    zero, 4(v0)
+// 0x01029a8c: 0x1029a8c: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5699,7 +5699,7 @@ L_1029a68:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01029a80: 0x1029a80: sw    zero, 8(v0)
+// 0x01029a90: 0x1029a90: sw    zero, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5708,7 +5708,7 @@ L_1029a68:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01029a84: 0x1029a84: sw    zero, 12(v0)
+// 0x01029a94: 0x1029a94: sw    zero, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5717,7 +5717,7 @@ L_1029a68:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01029a88: 0x1029a88: jal   0x1028ef0 addu  s0, v0, zero
+// 0x01029a98: 0x1029a98: jal   0x1028f00 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5725,54 +5725,54 @@ L_1029a68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::calloc_1028ef0(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::calloc_1028f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029a90: 0x1029a90: sw    v0, 0(s0)
+// 0x01029aa0: 0x1029aa0: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01029a94: 0x1029a94: addu  s3, s0, zero
+// 0x01029aa4: 0x1029aa4: addu  s3, s0, zero
 	ldloc 8
 	stloc 11
-// 0x01029a98: 0x1029a98: sb    zero, 279(sp)
+// 0x01029aa8: 0x1029aa8: sb    zero, 279(sp)
 	ldloc.0
 	ldc.i4 279
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01029a9c: 0x1029a9c: addiu s2, sp, 24
+// 0x01029aac: 0x1029aac: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01029aa0: 0x1029aa0: addiu s8, zero, 32
+// 0x01029ab0: 0x1029ab0: addiu s8, zero, 32
 	ldc.i4.s 32
 	stloc 16
-// 0x01029aa4: 0x1029aa4: addiu s7, zero, 12
+// 0x01029ab4: 0x1029ab4: addiu s7, zero, 12
 	ldc.i4.s 12
 	stloc 15
-// 0x01029aa8: 0x1029aa8: addiu s6, zero, 9
+// 0x01029ab8: 0x1029ab8: addiu s6, zero, 9
 	ldc.i4.s 9
 	stloc 14
-// 0x01029aac: 0x1029aac: addiu s5, zero, 11
+// 0x01029abc: 0x1029abc: addiu s5, zero, 11
 	ldc.i4.s 11
 	stloc 13
-// 0x01029ab0: 0x1029ab0: j	 0x1029b80 addiu s4, zero, 35
+// 0x01029ac0: 0x1029ac0: j	 0x1029b90 addiu s4, zero, 35
 	ldc.i4.s 35
 	stloc 12
-	br L_1029b80
+	br L_1029b90
 // --- basic block ---
-L_1029ab8:
-// 0x01029ab8: 0x1029ab8: addiu a1, zero, 255
+L_1029ac8:
+// 0x01029ac8: 0x1029ac8: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01029abc: 0x1029abc: jal   0x1001e98 addu  a2, s1, zero
+// 0x01029acc: 0x1029acc: jal   0x1001e98 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -5785,31 +5785,31 @@ L_1029ab8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029ac4: 0x1029ac4: jal   0x1001e30 addu  a0, s1, zero
+// 0x01029ad4: 0x1029ad4: jal   0x1001e30 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x01029acc: 0x1029acc: bne   v0, zero, 0x1029b90 sll   zero, zero, 0
+// 0x01029adc: 0x1029adc: bne   v0, zero, 0x1029ba0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1029b90
+	brtrue L_1029ba0
 // --- basic block ---
-// 0x01029ad4: 0x1029ad4: jal   0x1001e24 addu  a0, s1, zero
+// 0x01029ae4: 0x1029ae4: jal   0x1001e24 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::ferror_1001e24(int32)
 	stloc 5
 // --- basic block ---
-// 0x01029adc: 0x1029adc: bne   v0, zero, 0x1029b90 addu  a0, s2, zero
+// 0x01029aec: 0x1029aec: bne   v0, zero, 0x1029ba0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_1029b90
+	brtrue L_1029ba0
 // --- basic block ---
-// 0x01029ae4: 0x1029ae4: jal   0x1001a5c addiu a1, zero, 13
+// 0x01029af4: 0x1029af4: jal   0x1001a5c addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
 	ldloc.1
@@ -5819,18 +5819,18 @@ L_1029ab8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029aec: 0x1029aec: beq   v0, zero, 0x1029af8 addu  a0, s2, zero
+// 0x01029afc: 0x1029afc: beq   v0, zero, 0x1029b08 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brfalse L_1029af8
+	brfalse L_1029b08
 // --- basic block ---
-// 0x01029af4: 0x1029af4: sb    zero, 0(v0)
+// 0x01029b04: 0x1029b04: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1029af8:
-// 0x01029af8: 0x1029af8: jal   0x1001a5c addiu a1, zero, 10
+L_1029b08:
+// 0x01029b08: 0x1029b08: jal   0x1001a5c addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
 	ldloc.1
@@ -5840,75 +5840,75 @@ L_1029af8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029b00: 0x1029b00: beq   v0, zero, 0x1029b0c addu  a1, s2, zero
+// 0x01029b10: 0x1029b10: beq   v0, zero, 0x1029b1c addu  a1, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brfalse L_1029b0c
+	brfalse L_1029b1c
 // --- basic block ---
-// 0x01029b08: 0x1029b08: sb    zero, 0(v0)
+// 0x01029b18: 0x1029b18: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1029b0c:
-// 0x01029b0c: 0x1029b0c: lb    v0, 0(a1)
+L_1029b1c:
+// 0x01029b1c: 0x1029b1c: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01029b10: 0x1029b10: sll   zero, zero, 0
-// 0x01029b14: 0x1029b14: beq   v0, s8, 0x1029b44 sll   zero, zero, 0
+// 0x01029b20: 0x1029b20: sll   zero, zero, 0
+// 0x01029b24: 0x1029b24: beq   v0, s8, 0x1029b54 sll   zero, zero, 0
 	ldloc 5
 	ldloc 16
-	beq  L_1029b44
+	beq  L_1029b54
 // --- basic block ---
-// 0x01029b1c: 0x1029b1c: beq   v0, s7, 0x1029b44 addiu v1, zero, 10
+// 0x01029b2c: 0x1029b2c: beq   v0, s7, 0x1029b54 addiu v1, zero, 10
 	ldloc 5
 	ldloc 15
 	ldc.i4.s 10
 	stloc 7
-	beq  L_1029b44
+	beq  L_1029b54
 // --- basic block ---
-// 0x01029b24: 0x1029b24: beq   v0, v1, 0x1029b44 addiu v1, zero, 13
+// 0x01029b34: 0x1029b34: beq   v0, v1, 0x1029b54 addiu v1, zero, 13
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 13
 	stloc 7
-	beq  L_1029b44
+	beq  L_1029b54
 // --- basic block ---
-// 0x01029b2c: 0x1029b2c: beq   v0, v1, 0x1029b44 sll   zero, zero, 0
+// 0x01029b3c: 0x1029b3c: beq   v0, v1, 0x1029b54 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_1029b44
+	beq  L_1029b54
 // --- basic block ---
-// 0x01029b34: 0x1029b34: beq   v0, s6, 0x1029b44 sll   zero, zero, 0
+// 0x01029b44: 0x1029b44: beq   v0, s6, 0x1029b54 sll   zero, zero, 0
 	ldloc 5
 	ldloc 14
-	beq  L_1029b44
+	beq  L_1029b54
 // --- basic block ---
-// 0x01029b3c: 0x1029b3c: bne   v0, s5, 0x1029b4c sll   zero, zero, 0
+// 0x01029b4c: 0x1029b4c: bne   v0, s5, 0x1029b5c sll   zero, zero, 0
 	ldloc 5
 	ldloc 13
-	bne.un L_1029b4c
+	bne.un L_1029b5c
 // --- basic block ---
-L_1029b44:
-// 0x01029b44: 0x1029b44: j	 0x1029b0c addiu a1, a1, 1
+L_1029b54:
+// 0x01029b54: 0x1029b54: j	 0x1029b1c addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	br L_1029b0c
+	br L_1029b1c
 // --- basic block ---
-L_1029b4c:
-// 0x01029b4c: 0x1029b4c: beq   v0, zero, 0x1029b80 sll   zero, zero, 0
+L_1029b5c:
+// 0x01029b5c: 0x1029b5c: beq   v0, zero, 0x1029b90 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1029b80
+	brfalse L_1029b90
 // --- basic block ---
-// 0x01029b54: 0x1029b54: beq   v0, s4, 0x1029b80 sll   zero, zero, 0
+// 0x01029b64: 0x1029b64: beq   v0, s4, 0x1029b90 sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	beq  L_1029b80
+	beq  L_1029b90
 // --- basic block ---
-// 0x01029b5c: 0x1029b5c: lw    a2, 324(sp)
+// 0x01029b6c: 0x1029b6c: lw    a2, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5917,7 +5917,7 @@ L_1029b4c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029b60: 0x1029b60: jal   0x102974c addu  a0, s0, zero
+// 0x01029b70: 0x1029b70: jal   0x102975c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5925,18 +5925,18 @@ L_1029b4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_load_menu_item_102974c(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_load_menu_item_102975c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029b68: 0x1029b68: bne   v0, zero, 0x1029b80 addu  a0, s0, zero
+// 0x01029b78: 0x1029b78: bne   v0, zero, 0x1029b90 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_1029b80
+	brtrue L_1029b90
 // --- basic block ---
-// 0x01029b70: 0x1029b70: jal   0x109c8e4 addu  a1, zero, zero
+// 0x01029b80: 0x1029b80: jal   0x109cf2c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5944,32 +5944,32 @@ L_1029b4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_contextmenu_delete_109c8e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_contextmenu_delete_109cf2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029b78: 0x1029b78: j	 0x1029b90 addu  s3, zero, zero
+// 0x01029b88: 0x1029b88: j	 0x1029ba0 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_1029b90
+	br L_1029ba0
 // --- basic block ---
-L_1029b80:
-// 0x01029b80: 0x1029b80: jal   0x1001e30 addu  a0, s1, zero
+L_1029b90:
+// 0x01029b90: 0x1029b90: jal   0x1001e30 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x01029b88: 0x1029b88: beq   v0, zero, 0x1029ab8 addu  a0, s2, zero
+// 0x01029b98: 0x1029b98: beq   v0, zero, 0x1029ac8 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brfalse L_1029ab8
+	brfalse L_1029ac8
 // --- basic block ---
-L_1029b90:
-// 0x01029b90: 0x1029b90: jal   0x10023b4 addu  a0, s1, zero
+L_1029ba0:
+// 0x01029ba0: 0x1029ba0: jal   0x10023b4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5982,12 +5982,12 @@ L_1029b90:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1029b98:
-// 0x01029b98: 0x1029b98: lw    ra, 316(sp)
-// 0x01029b9c: 0x1029b9c: addu  v0, s3, zero
+L_1029ba8:
+// 0x01029ba8: 0x1029ba8: lw    ra, 316(sp)
+// 0x01029bac: 0x1029bac: addu  v0, s3, zero
 	ldloc 11
 	stloc 5
-// 0x01029ba0: 0x1029ba0: lw    s8, 312(sp)
+// 0x01029bb0: 0x1029bb0: lw    s8, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5996,7 +5996,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01029ba4: 0x1029ba4: lw    s7, 308(sp)
+// 0x01029bb4: 0x1029bb4: lw    s7, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6005,7 +6005,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01029ba8: 0x1029ba8: lw    s6, 304(sp)
+// 0x01029bb8: 0x1029bb8: lw    s6, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6014,7 +6014,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01029bac: 0x1029bac: lw    s5, 300(sp)
+// 0x01029bbc: 0x1029bbc: lw    s5, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6023,7 +6023,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01029bb0: 0x1029bb0: lw    s4, 296(sp)
+// 0x01029bc0: 0x1029bc0: lw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6032,7 +6032,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01029bb4: 0x1029bb4: lw    s3, 292(sp)
+// 0x01029bc4: 0x1029bc4: lw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6041,7 +6041,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01029bb8: 0x1029bb8: lw    s2, 288(sp)
+// 0x01029bc8: 0x1029bc8: lw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6050,7 +6050,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01029bbc: 0x1029bbc: lw    s1, 284(sp)
+// 0x01029bcc: 0x1029bcc: lw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6059,7 +6059,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01029bc0: 0x1029bc0: lw    s0, 280(sp)
+// 0x01029bd0: 0x1029bd0: lw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6068,7 +6068,7 @@ L_1029b98:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01029bc4: 0x1029bc4: jr    ra addiu sp, sp, 320
+// 0x01029bd4: 0x1029bd4: jr    ra addiu sp, sp, 320
 	ldloc.0
 	ldc.i4 320
 	add
@@ -6080,7 +6080,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_factory_load_menu_1029bcc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_factory_load_menu_1029bdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s5,int32 s2,int32 s3,int32 s1,int32 s4,int32 ra)
@@ -6133,12 +6133,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029bcc: 0x1029bcc: addiu sp, sp, -48
+// 0x01029bdc: 0x1029bdc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01029bd0: 0x1029bd0: sw    s0, 20(sp)
+// 0x01029be0: 0x1029be0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6147,10 +6147,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01029bd4: 0x1029bd4: lui   s0, 0x0
+// 0x01029be4: 0x1029be4: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01029bd8: 0x1029bd8: sw    s2, 28(sp)
+// 0x01029be8: 0x1029be8: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6159,16 +6159,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01029bdc: 0x1029bdc: addu  s2, a0, zero
+// 0x01029bec: 0x1029bec: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01029be0: 0x1029be0: addiu a0, s0, 26228
+// 0x01029bf0: 0x1029bf0: addiu a0, s0, 26228
 	ldloc 7
 	ldc.i4 26228
 	add
 	stloc.1
-// 0x01029be4: 0x1029be4: sw    ra, 44(sp)
-// 0x01029be8: 0x1029be8: sw    s3, 32(sp)
+// 0x01029bf4: 0x1029bf4: sw    ra, 44(sp)
+// 0x01029bf8: 0x1029bf8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6177,7 +6177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029bec: 0x1029bec: sw    s1, 24(sp)
+// 0x01029bfc: 0x1029bfc: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6186,10 +6186,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01029bf0: 0x1029bf0: addu  s3, a1, zero
+// 0x01029c00: 0x1029c00: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01029bf4: 0x1029bf4: sw    s5, 40(sp)
+// 0x01029c04: 0x1029c04: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6198,7 +6198,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01029bf8: 0x1029bf8: jal   0x104d204 sw    s4, 36(sp)
+// 0x01029c08: 0x1029c08: jal   0x104d214 sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6212,29 +6212,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01029c00: 0x1029c00: jal   0x104c564 sll   zero, zero, 0
+// 0x01029c10: 0x1029c10: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01029c08: 0x1029c08: addu  a2, v0, zero
+// 0x01029c18: 0x1029c18: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x01029c0c: 0x1029c0c: addu  a0, s2, zero
+// 0x01029c1c: 0x1029c1c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01029c10: 0x1029c10: jal   0x10299ec addu  a1, s3, zero
+// 0x01029c20: 0x1029c20: jal   0x10299fc addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -6242,23 +6242,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_load_menu_file_10299ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_load_menu_file_10299fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01029c18: 0x1029c18: bne   v0, zero, 0x1029c64 addu  s1, v0, zero
+// 0x01029c28: 0x1029c28: bne   v0, zero, 0x1029c74 addu  s1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 12
-	brtrue L_1029c64
+	brtrue L_1029c74
 // --- basic block ---
-// 0x01029c20: 0x1029c20: addiu a0, s0, 26228
+// 0x01029c30: 0x1029c30: addiu a0, s0, 26228
 	ldloc 7
 	ldc.i4 26228
 	add
 	stloc.1
-// 0x01029c24: 0x1029c24: jal   0x104d204 addu  s4, a0, zero
+// 0x01029c34: 0x1029c34: jal   0x104d214 addu  s4, a0, zero
 	ldloc.1
 	stloc 13
 	ldloc.0
@@ -6266,35 +6266,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01029c2c: 0x1029c2c: j	 0x1029c54 addu  s0, v0, zero
+// 0x01029c3c: 0x1029c3c: j	 0x1029c64 addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-	br L_1029c54
+	br L_1029c64
 // --- basic block ---
-L_1029c34:
-// 0x01029c34: 0x1029c34: jal   0x10299ec sll   zero, zero, 0
+L_1029c44:
+// 0x01029c44: 0x1029c44: jal   0x10299fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_load_menu_file_10299ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_load_menu_file_10299fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01029c3c: 0x1029c3c: addu  a1, s0, zero
+// 0x01029c4c: 0x1029c4c: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01029c40: 0x1029c40: addu  a0, s4, zero
+// 0x01029c50: 0x1029c50: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x01029c44: 0x1029c44: jal   0x104d18c addu  s5, v0, zero
+// 0x01029c54: 0x1029c54: jal   0x104d19c addu  s5, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -6302,40 +6302,40 @@ L_1029c34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01029c4c: 0x1029c4c: bne   s5, zero, 0x1029c68 addu  s0, v0, zero
+// 0x01029c5c: 0x1029c5c: bne   s5, zero, 0x1029c78 addu  s0, v0, zero
 	ldloc 9
 	ldloc 6
 	stloc 7
-	brtrue L_1029c68
+	brtrue L_1029c78
 // --- basic block ---
-L_1029c54:
-// 0x01029c54: 0x1029c54: addu  a2, s0, zero
+L_1029c64:
+// 0x01029c64: 0x1029c64: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x01029c58: 0x1029c58: addu  a0, s2, zero
+// 0x01029c68: 0x1029c68: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01029c5c: 0x1029c5c: bne   s0, zero, 0x1029c34 addu  a1, s3, zero
+// 0x01029c6c: 0x1029c6c: bne   s0, zero, 0x1029c44 addu  a1, s3, zero
 	ldloc 7
 	ldloc 11
 	stloc.2
-	brtrue L_1029c34
+	brtrue L_1029c44
 // --- basic block ---
-L_1029c64:
-// 0x01029c64: 0x1029c64: addu  s5, s1, zero
+L_1029c74:
+// 0x01029c74: 0x1029c74: addu  s5, s1, zero
 	ldloc 12
 	stloc 9
-L_1029c68:
-// 0x01029c68: 0x1029c68: lw    ra, 44(sp)
-// 0x01029c6c: 0x1029c6c: addu  v0, s5, zero
+L_1029c78:
+// 0x01029c78: 0x1029c78: lw    ra, 44(sp)
+// 0x01029c7c: 0x1029c7c: addu  v0, s5, zero
 	ldloc 9
 	stloc 6
-// 0x01029c70: 0x1029c70: lw    s5, 40(sp)
+// 0x01029c80: 0x1029c80: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6344,7 +6344,7 @@ L_1029c68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01029c74: 0x1029c74: lw    s4, 36(sp)
+// 0x01029c84: 0x1029c84: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6353,7 +6353,7 @@ L_1029c68:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01029c78: 0x1029c78: lw    s3, 32(sp)
+// 0x01029c88: 0x1029c88: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6362,7 +6362,7 @@ L_1029c68:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01029c7c: 0x1029c7c: lw    s2, 28(sp)
+// 0x01029c8c: 0x1029c8c: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6371,7 +6371,7 @@ L_1029c68:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01029c80: 0x1029c80: lw    s1, 24(sp)
+// 0x01029c90: 0x1029c90: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6380,7 +6380,7 @@ L_1029c68:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01029c84: 0x1029c84: lw    s0, 20(sp)
+// 0x01029c94: 0x1029c94: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6389,7 +6389,7 @@ L_1029c68:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029c88: 0x1029c88: jr    ra addiu sp, sp, 48
+// 0x01029c98: 0x1029c98: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6401,7 +6401,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_navigate_register_segment_changed_1029c90(int32,int32)
+.method public static int32 roadmap_navigate_register_segment_changed_1029ca0(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6427,31 +6427,31 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029c90: 0x1029c90: lui   v0, 0x60000
+// 0x01029ca0: 0x1029ca0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01029c94: 0x1029c94: lw    v1, -24420(v0)
+// 0x01029ca4: 0x1029ca4: lw    v1, -23956(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6105
+	ldc.i4 -5989
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029c98: 0x1029c98: sll   zero, zero, 0
-// 0x01029c9c: 0x1029c9c: beq   v1, zero, 0x1029cec addu  a1, zero, zero
+// 0x01029ca8: 0x1029ca8: sll   zero, zero, 0
+// 0x01029cac: 0x1029cac: beq   v1, zero, 0x1029cfc addu  a1, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1029cec
+	brfalse L_1029cfc
 // --- basic block ---
-// 0x01029ca4: 0x1029ca4: addiu v0, v0, -24420
+// 0x01029cb4: 0x1029cb4: addiu v0, v0, -23956
 	ldloc.2
-	ldc.i4 -24420
+	ldc.i4 -23956
 	add
 	stloc.2
-// 0x01029ca8: 0x1029ca8: lw    v1, 4(v0)
+// 0x01029cb8: 0x1029cb8: lw    v1, 4(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -6460,14 +6460,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029cac: 0x1029cac: sll   zero, zero, 0
-// 0x01029cb0: 0x1029cb0: beq   v1, zero, 0x1029ce8 addiu a1, zero, 1
+// 0x01029cbc: 0x1029cbc: sll   zero, zero, 0
+// 0x01029cc0: 0x1029cc0: beq   v1, zero, 0x1029cf8 addiu a1, zero, 1
 	ldloc.3
 	ldc.i4.1
 	stloc.1
-	brfalse L_1029ce8
+	brfalse L_1029cf8
 // --- basic block ---
-// 0x01029cb8: 0x1029cb8: lw    v1, 8(v0)
+// 0x01029cc8: 0x1029cc8: lw    v1, 8(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -6476,14 +6476,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029cbc: 0x1029cbc: sll   zero, zero, 0
-// 0x01029cc0: 0x1029cc0: beq   v1, zero, 0x1029ce8 addiu a1, zero, 2
+// 0x01029ccc: 0x1029ccc: sll   zero, zero, 0
+// 0x01029cd0: 0x1029cd0: beq   v1, zero, 0x1029cf8 addiu a1, zero, 2
 	ldloc.3
 	ldc.i4.2
 	stloc.1
-	brfalse L_1029ce8
+	brfalse L_1029cf8
 // --- basic block ---
-// 0x01029cc8: 0x1029cc8: lw    v1, 12(v0)
+// 0x01029cd8: 0x1029cd8: lw    v1, 12(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -6492,14 +6492,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029ccc: 0x1029ccc: sll   zero, zero, 0
-// 0x01029cd0: 0x1029cd0: beq   v1, zero, 0x1029ce8 addiu a1, zero, 3
+// 0x01029cdc: 0x1029cdc: sll   zero, zero, 0
+// 0x01029ce0: 0x1029ce0: beq   v1, zero, 0x1029cf8 addiu a1, zero, 3
 	ldloc.3
 	ldc.i4.3
 	stloc.1
-	brfalse L_1029ce8
+	brfalse L_1029cf8
 // --- basic block ---
-// 0x01029cd8: 0x1029cd8: lw    v0, 16(v0)
+// 0x01029ce8: 0x1029ce8: lw    v0, 16(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -6508,42 +6508,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01029cdc: 0x1029cdc: sll   zero, zero, 0
-// 0x01029ce0: 0x1029ce0: bne   v0, zero, 0x1029cfc addiu a1, zero, 4
+// 0x01029cec: 0x1029cec: sll   zero, zero, 0
+// 0x01029cf0: 0x1029cf0: bne   v0, zero, 0x1029d0c addiu a1, zero, 4
 	ldloc.2
 	ldc.i4.4
 	stloc.1
-	brtrue L_1029cfc
+	brtrue L_1029d0c
 // --- basic block ---
-L_1029ce8:
-// 0x01029ce8: 0x1029ce8: lui   v0, 0x60000
+L_1029cf8:
+// 0x01029cf8: 0x1029cf8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-L_1029cec:
-// 0x01029cec: 0x1029cec: sll   a1, a1, 2
+L_1029cfc:
+// 0x01029cfc: 0x1029cfc: sll   a1, a1, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01029cf0: 0x1029cf0: addiu v0, v0, -24420
+// 0x01029d00: 0x1029d00: addiu v0, v0, -23956
 	ldloc.2
-	ldc.i4 -24420
+	ldc.i4 -23956
 	add
 	stloc.2
-// 0x01029cf4: 0x1029cf4: addu  a1, a1, v0
+// 0x01029d04: 0x1029d04: addu  a1, a1, v0
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01029cf8: 0x1029cf8: sw    a0, 0(a1)
+// 0x01029d08: 0x1029d08: sw    a0, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-L_1029cfc:
-// 0x01029cfc: 0x1029cfc: jr    ra sll   zero, zero, 0
+L_1029d0c:
+// 0x01029d0c: 0x1029d0c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
diff --git a/converted/Cibyl31.j b/converted/Cibyl31.j
index 89bc8a3..a8718b7 100644
--- a/converted/Cibyl31.j
+++ b/converted/Cibyl31.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl31::.ctor
 
-.method public static int32 roadmap_navigate_unregister_segment_changed_1029d04(int32,int32)
+.method public static int32 roadmap_navigate_unregister_segment_changed_1029d14(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -67,32 +67,32 @@
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029d04: 0x1029d04: lui   v0, 0x60000
+// 0x01029d14: 0x1029d14: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01029d08: 0x1029d08: lw    v1, -24420(v0)
+// 0x01029d18: 0x1029d18: lw    v1, -23956(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6105
+	ldc.i4 -5989
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029d0c: 0x1029d0c: sll   zero, zero, 0
-// 0x01029d10: 0x1029d10: beq   v1, a0, 0x1029d60 addu  a1, zero, zero
+// 0x01029d1c: 0x1029d1c: sll   zero, zero, 0
+// 0x01029d20: 0x1029d20: beq   v1, a0, 0x1029d70 addu  a1, zero, zero
 	ldloc.3
 	ldloc.0
 	ldc.i4.s 0
 	stloc.1
-	beq  L_1029d60
+	beq  L_1029d70
 // --- basic block ---
-// 0x01029d18: 0x1029d18: addiu v0, v0, -24420
+// 0x01029d28: 0x1029d28: addiu v0, v0, -23956
 	ldloc.2
-	ldc.i4 -24420
+	ldc.i4 -23956
 	add
 	stloc.2
-// 0x01029d1c: 0x1029d1c: lw    v1, 4(v0)
+// 0x01029d2c: 0x1029d2c: lw    v1, 4(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -101,15 +101,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029d20: 0x1029d20: sll   zero, zero, 0
-// 0x01029d24: 0x1029d24: beq   v1, a0, 0x1029d5c addiu a1, zero, 1
+// 0x01029d30: 0x1029d30: sll   zero, zero, 0
+// 0x01029d34: 0x1029d34: beq   v1, a0, 0x1029d6c addiu a1, zero, 1
 	ldloc.3
 	ldloc.0
 	ldc.i4.1
 	stloc.1
-	beq  L_1029d5c
+	beq  L_1029d6c
 // --- basic block ---
-// 0x01029d2c: 0x1029d2c: lw    v1, 8(v0)
+// 0x01029d3c: 0x1029d3c: lw    v1, 8(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -118,15 +118,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029d30: 0x1029d30: sll   zero, zero, 0
-// 0x01029d34: 0x1029d34: beq   v1, a0, 0x1029d5c addiu a1, zero, 2
+// 0x01029d40: 0x1029d40: sll   zero, zero, 0
+// 0x01029d44: 0x1029d44: beq   v1, a0, 0x1029d6c addiu a1, zero, 2
 	ldloc.3
 	ldloc.0
 	ldc.i4.2
 	stloc.1
-	beq  L_1029d5c
+	beq  L_1029d6c
 // --- basic block ---
-// 0x01029d3c: 0x1029d3c: lw    v1, 12(v0)
+// 0x01029d4c: 0x1029d4c: lw    v1, 12(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -135,15 +135,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01029d40: 0x1029d40: sll   zero, zero, 0
-// 0x01029d44: 0x1029d44: beq   v1, a0, 0x1029d5c addiu a1, zero, 3
+// 0x01029d50: 0x1029d50: sll   zero, zero, 0
+// 0x01029d54: 0x1029d54: beq   v1, a0, 0x1029d6c addiu a1, zero, 3
 	ldloc.3
 	ldloc.0
 	ldc.i4.3
 	stloc.1
-	beq  L_1029d5c
+	beq  L_1029d6c
 // --- basic block ---
-// 0x01029d4c: 0x1029d4c: lw    v0, 16(v0)
+// 0x01029d5c: 0x1029d5c: lw    v0, 16(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -152,43 +152,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01029d50: 0x1029d50: sll   zero, zero, 0
-// 0x01029d54: 0x1029d54: bne   v0, a0, 0x1029d70 addiu a1, zero, 4
+// 0x01029d60: 0x1029d60: sll   zero, zero, 0
+// 0x01029d64: 0x1029d64: bne   v0, a0, 0x1029d80 addiu a1, zero, 4
 	ldloc.2
 	ldloc.0
 	ldc.i4.4
 	stloc.1
-	bne.un L_1029d70
+	bne.un L_1029d80
 // --- basic block ---
-L_1029d5c:
-// 0x01029d5c: 0x1029d5c: lui   v0, 0x60000
+L_1029d6c:
+// 0x01029d6c: 0x1029d6c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-L_1029d60:
-// 0x01029d60: 0x1029d60: sll   a1, a1, 2
+L_1029d70:
+// 0x01029d70: 0x1029d70: sll   a1, a1, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01029d64: 0x1029d64: addiu v0, v0, -24420
+// 0x01029d74: 0x1029d74: addiu v0, v0, -23956
 	ldloc.2
-	ldc.i4 -24420
+	ldc.i4 -23956
 	add
 	stloc.2
-// 0x01029d68: 0x1029d68: addu  a1, a1, v0
+// 0x01029d78: 0x1029d78: addu  a1, a1, v0
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01029d6c: 0x1029d6c: sw    zero, 0(a1)
+// 0x01029d7c: 0x1029d7c: sw    zero, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1029d70:
-// 0x01029d70: 0x1029d70: jr    ra sll   zero, zero, 0
+L_1029d80:
+// 0x01029d80: 0x1029d80: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -196,7 +196,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_navigate_end_route_1029d78()
+.method public static int32 roadmap_navigate_end_route_1029d88()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -213,15 +213,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029d78: 0x1029d78: lui   v0, 0x60000
+// 0x01029d88: 0x1029d88: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01029d7c: 0x1029d7c: jr    ra sw    zero, -25208(v0)
+// 0x01029d8c: 0x1029d8c: jr    ra sw    zero, -24744(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6302
+	ldc.i4 -6186
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -230,7 +230,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_navigate_resume_route_1029d84()
+.method public static int32 roadmap_navigate_resume_route_1029d94()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -250,15 +250,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029d84: 0x1029d84: lui   v0, 0x60000
+// 0x01029d94: 0x1029d94: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01029d88: 0x1029d88: addiu v0, v0, -25260
+// 0x01029d98: 0x1029d98: addiu v0, v0, -24796
 	ldloc.0
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc.0
-// 0x01029d8c: 0x1029d8c: lw    v1, 56(v0)
+// 0x01029d9c: 0x1029d9c: lw    v1, 56(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -267,14 +267,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01029d90: 0x1029d90: sll   zero, zero, 0
-// 0x01029d94: 0x1029d94: beq   v1, zero, 0x1029da0 addiu v1, zero, 1
+// 0x01029da0: 0x1029da0: sll   zero, zero, 0
+// 0x01029da4: 0x1029da4: beq   v1, zero, 0x1029db0 addiu v1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc.1
-	brfalse L_1029da0
+	brfalse L_1029db0
 // --- basic block ---
-// 0x01029d9c: 0x1029d9c: sw    v1, 52(v0)
+// 0x01029dac: 0x1029dac: sw    v1, 52(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -283,8 +283,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-L_1029da0:
-// 0x01029da0: 0x1029da0: jr    ra sll   zero, zero, 0
+L_1029db0:
+// 0x01029db0: 0x1029db0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -292,7 +292,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -336,12 +336,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029da8: 0x1029da8: addiu sp, sp, -32
+// 0x01029db8: 0x1029db8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01029dac: 0x1029dac: sw    s1, 20(sp)
+// 0x01029dbc: 0x1029dbc: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -350,7 +350,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01029db0: 0x1029db0: sw    s0, 16(sp)
+// 0x01029dc0: 0x1029dc0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -359,8 +359,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01029db4: 0x1029db4: sw    ra, 28(sp)
-// 0x01029db8: 0x1029db8: sw    s2, 24(sp)
+// 0x01029dc4: 0x1029dc4: sw    ra, 28(sp)
+// 0x01029dc8: 0x1029dc8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -369,24 +369,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01029dbc: 0x1029dbc: addu  s1, a1, zero
+// 0x01029dcc: 0x1029dcc: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01029dc0: 0x1029dc0: beq   a0, zero, 0x1029dd8 addu  s0, a2, zero
+// 0x01029dd0: 0x1029dd0: beq   a0, zero, 0x1029de8 addu  s0, a2, zero
 	ldloc.1
 	ldloc.3
 	stloc 8
-	brfalse L_1029dd8
+	brfalse L_1029de8
 // --- basic block ---
-// 0x01029dc8: 0x1029dc8: lui   a1, 0x0
+// 0x01029dd8: 0x1029dd8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01029dcc: 0x1029dcc: addiu a1, a1, 6556
+// 0x01029ddc: 0x1029ddc: addiu a1, a1, 6556
 	ldloc.2
 	ldc.i4 6556
 	add
 	stloc.2
-// 0x01029dd0: 0x1029dd0: jal   0x1001800 addiu a2, zero, 20
+// 0x01029de0: 0x1029de0: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -398,20 +398,20 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-L_1029dd8:
-// 0x01029dd8: 0x1029dd8: beq   s1, zero, 0x1029e28 addu  v0, zero, zero
+L_1029de8:
+// 0x01029de8: 0x1029de8: beq   s1, zero, 0x1029e38 addu  v0, zero, zero
 	ldloc 9
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1029e28
+	brfalse L_1029e38
 // --- basic block ---
-// 0x01029de0: 0x1029de0: beq   s0, zero, 0x1029e28 lui   s2, 0x0
+// 0x01029df0: 0x1029df0: beq   s0, zero, 0x1029e38 lui   s2, 0x0
 	ldloc 8
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1029e28
+	brfalse L_1029e38
 // --- basic block ---
-// 0x01029de8: 0x1029de8: lw    v0, 6576(s2)
+// 0x01029df8: 0x1029df8: lw    v0, 6576(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -420,25 +420,25 @@ L_1029dd8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01029dec: 0x1029dec: sll   zero, zero, 0
-// 0x01029df0: 0x1029df0: beq   v0, zero, 0x1029e1c lui   a1, 0x0
+// 0x01029dfc: 0x1029dfc: sll   zero, zero, 0
+// 0x01029e00: 0x1029e00: beq   v0, zero, 0x1029e2c lui   a1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1029e1c
+	brfalse L_1029e2c
 // --- basic block ---
-// 0x01029df8: 0x1029df8: addu  a0, s1, zero
+// 0x01029e08: 0x1029e08: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01029dfc: 0x1029dfc: addiu a1, a1, 6652
+// 0x01029e0c: 0x1029e0c: addiu a1, a1, 6652
 	ldloc.2
 	ldc.i4 6652
 	add
 	stloc.2
-// 0x01029e00: 0x1029e00: addiu a2, zero, 20
+// 0x01029e10: 0x1029e10: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x01029e04: 0x1029e04: jal   0x1001800 addiu s2, s2, 6576
+// 0x01029e14: 0x1029e14: jal   0x1001800 addiu s2, s2, 6576
 	ldloc 7
 	ldc.i4 6576
 	add
@@ -452,7 +452,7 @@ L_1029dd8:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01029e0c: 0x1029e0c: lw    v1, 20(s2)
+// 0x01029e1c: 0x1029e1c: lw    v1, 20(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -461,39 +461,39 @@ L_1029dd8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01029e10: 0x1029e10: addu  v0, zero, zero
+// 0x01029e20: 0x1029e20: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01029e14: 0x1029e14: j	 0x1029e28 sw    v1, 0(s0)
+// 0x01029e24: 0x1029e24: j	 0x1029e38 sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-	br L_1029e28
+	br L_1029e38
 // --- basic block ---
-L_1029e1c:
-// 0x01029e1c: 0x1029e1c: addiu v0, zero, -1
+L_1029e2c:
+// 0x01029e2c: 0x1029e2c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01029e20: 0x1029e20: sw    v0, 0(s1)
+// 0x01029e30: 0x1029e30: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01029e24: 0x1029e24: sw    zero, 0(s0)
+// 0x01029e34: 0x1029e34: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1029e28:
-// 0x01029e28: 0x1029e28: lw    ra, 28(sp)
-// 0x01029e2c: 0x1029e2c: lw    s2, 24(sp)
+L_1029e38:
+// 0x01029e38: 0x1029e38: lw    ra, 28(sp)
+// 0x01029e3c: 0x1029e3c: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -502,7 +502,7 @@ L_1029e28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029e30: 0x1029e30: lw    s1, 20(sp)
+// 0x01029e40: 0x1029e40: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -511,7 +511,7 @@ L_1029e28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01029e34: 0x1029e34: lw    s0, 16(sp)
+// 0x01029e44: 0x1029e44: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -520,7 +520,7 @@ L_1029e28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01029e38: 0x1029e38: jr    ra addiu sp, sp, 32
+// 0x01029e48: 0x1029e48: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -532,7 +532,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_navigate_get_time_1029e40()
+.method public static int32 roadmap_navigate_get_time_1029e50()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -552,33 +552,33 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029e40: 0x1029e40: lui   v0, 0x60000
+// 0x01029e50: 0x1029e50: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01029e44: 0x1029e44: lw    v1, -25444(v0)
+// 0x01029e54: 0x1029e54: lw    v1, -24980(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6361
+	ldc.i4 -6245
 	add
 	ldelem.i4
 	stloc.1
-// 0x01029e48: 0x1029e48: sll   zero, zero, 0
-// 0x01029e4c: 0x1029e4c: bne   v1, zero, 0x1029e60 sll   zero, zero, 0
+// 0x01029e58: 0x1029e58: sll   zero, zero, 0
+// 0x01029e5c: 0x1029e5c: bne   v1, zero, 0x1029e70 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1029e60
+	brtrue L_1029e70
 // --- basic block ---
-// 0x01029e54: 0x1029e54: cibyl_sysc_arg 0x3
+// 0x01029e64: 0x1029e64: cibyl_sysc_arg 0x3
 	ldloc.1
-// 0x01029e58: 0x1029e58: cibyl_sysc 0x409
+// 0x01029e68: 0x1029e68: cibyl_sysc 0x409
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc.0
-// 0x01029e5c: 0x1029e5c: addu  v1, v0, zero
+// 0x01029e6c: 0x1029e6c: addu  v1, v0, zero
 	ldloc.0
 	stloc.1
-L_1029e60:
-// 0x01029e60: 0x1029e60: jr    ra addu  v0, v1, zero
+L_1029e70:
+// 0x01029e70: 0x1029e70: jr    ra addu  v0, v1, zero
 	ldloc.1
 	stloc.0
 	br __CIBYL_function_return
@@ -588,7 +588,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_navigate_route_1029e68(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_route_1029e78(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 ra)
@@ -635,24 +635,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029e68: 0x1029e68: lui   v0, 0x60000
+// 0x01029e78: 0x1029e78: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01029e6c: 0x1029e6c: lw    v1, -25440(v0)
+// 0x01029e7c: 0x1029e7c: lw    v1, -24976(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6360
+	ldc.i4 -6244
 	add
 	ldelem.i4
 	stloc 7
-// 0x01029e70: 0x1029e70: addiu sp, sp, -40
+// 0x01029e80: 0x1029e80: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01029e74: 0x1029e74: sw    s2, 28(sp)
+// 0x01029e84: 0x1029e84: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -661,7 +661,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029e78: 0x1029e78: sw    s1, 24(sp)
+// 0x01029e88: 0x1029e88: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -670,8 +670,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01029e7c: 0x1029e7c: sw    ra, 36(sp)
-// 0x01029e80: 0x1029e80: sw    s3, 32(sp)
+// 0x01029e8c: 0x1029e8c: sw    ra, 36(sp)
+// 0x01029e90: 0x1029e90: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -680,7 +680,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01029e84: 0x1029e84: sw    s0, 20(sp)
+// 0x01029e94: 0x1029e94: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -689,7 +689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01029e88: 0x1029e88: sw    a0, 40(sp)
+// 0x01029e98: 0x1029e98: sw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -698,7 +698,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01029e8c: 0x1029e8c: sw    a1, 44(sp)
+// 0x01029e9c: 0x1029e9c: sw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -707,7 +707,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01029e90: 0x1029e90: sw    a2, 48(sp)
+// 0x01029ea0: 0x1029ea0: sw    a2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -716,35 +716,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01029e94: 0x1029e94: addu  s2, a1, zero
+// 0x01029ea4: 0x1029ea4: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01029e98: 0x1029e98: beq   v1, zero, 0x1029ec4 addu  s1, a0, zero
+// 0x01029ea8: 0x1029ea8: beq   v1, zero, 0x1029ed4 addu  s1, a0, zero
 	ldloc 7
 	ldloc.1
 	stloc 10
-	brfalse L_1029ec4
+	brfalse L_1029ed4
 // --- basic block ---
-// 0x01029ea0: 0x1029ea0: lui   a1, 0x10000
+// 0x01029eb0: 0x1029eb0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01029ea4: 0x1029ea4: lui   a3, 0x10000
+// 0x01029eb4: 0x1029eb4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01029ea8: 0x1029ea8: addiu a1, a1, -25980
+// 0x01029eb8: 0x1029eb8: addiu a1, a1, -25980
 	ldloc.2
 	ldc.i4 -25980
 	add
 	stloc.2
-// 0x01029eac: 0x1029eac: addiu a3, a3, -25948
+// 0x01029ebc: 0x1029ebc: addiu a3, a3, -25948
 	ldloc 4
 	ldc.i4 -25948
 	add
 	stloc 4
-// 0x01029eb0: 0x1029eb0: addiu a0, zero, 4
+// 0x01029ec0: 0x1029ec0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01029eb4: 0x1029eb4: jal   0x100449c addiu a2, zero, 1148
+// 0x01029ec4: 0x1029ec4: jal   0x100449c addiu a2, zero, 1148
 	ldc.i4 1148
 	stloc.3
 	ldloc.0
@@ -757,17 +757,17 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029ebc: 0x1029ebc: j	 0x1029f48 sll   zero, zero, 0
-	br L_1029f48
+// 0x01029ecc: 0x1029ecc: j	 0x1029f58 sll   zero, zero, 0
+	br L_1029f58
 // --- basic block ---
-L_1029ec4:
-// 0x01029ec4: 0x1029ec4: lui   s3, 0x0
+L_1029ed4:
+// 0x01029ed4: 0x1029ed4: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01029ec8: 0x1029ec8: lui   v1, 0x60000
+// 0x01029ed8: 0x1029ed8: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01029ecc: 0x1029ecc: lw    a1, 6576(s3)
+// 0x01029edc: 0x1029edc: lw    a1, 6576(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -776,24 +776,24 @@ L_1029ec4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01029ed0: 0x1029ed0: addiu a0, v1, -25260
+// 0x01029ee0: 0x1029ee0: addiu a0, v1, -24796
 	ldloc 7
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc.1
-// 0x01029ed4: 0x1029ed4: addiu a3, zero, 1
+// 0x01029ee4: 0x1029ee4: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01029ed8: 0x1029ed8: sw    a3, -25440(v0)
+// 0x01029ee8: 0x1029ee8: sw    a3, -24976(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6360
+	ldc.i4 -6244
 	add
 	ldloc 4
 	stelem.i4
-// 0x01029edc: 0x1029edc: sw    a2, 8(a0)
+// 0x01029eec: 0x1029eec: sw    a2, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -802,16 +802,16 @@ L_1029ec4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01029ee0: 0x1029ee0: sw    s1, -25260(v1)
+// 0x01029ef0: 0x1029ef0: sw    s1, -24796(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6315
+	ldc.i4 -6199
 	add
 	ldloc 10
 	stelem.i4
-// 0x01029ee4: 0x1029ee4: beq   a1, zero, 0x1029f2c sw    s2, 4(a0)
+// 0x01029ef4: 0x1029ef4: beq   a1, zero, 0x1029f3c sw    s2, 4(a0)
 	ldloc.2
 	ldloc 5
 	ldloc.1
@@ -821,28 +821,28 @@ L_1029ec4:
 	add
 	ldloc 11
 	stelem.i4
-	brfalse L_1029f2c
+	brfalse L_1029f3c
 // --- basic block ---
-// 0x01029eec: 0x1029eec: lui   s0, 0x0
+// 0x01029efc: 0x1029efc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01029ef0: 0x1029ef0: addiu s0, s0, 6652
+// 0x01029f00: 0x1029f00: addiu s0, s0, 6652
 	ldloc 8
 	ldc.i4 6652
 	add
 	stloc 8
-// 0x01029ef4: 0x1029ef4: addiu a0, a0, 12
+// 0x01029f04: 0x1029f04: addiu a0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	add
 	stloc.1
-// 0x01029ef8: 0x1029ef8: addu  a1, s0, zero
+// 0x01029f08: 0x1029f08: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01029efc: 0x1029efc: addiu a2, zero, 20
+// 0x01029f0c: 0x1029f0c: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x01029f00: 0x1029f00: jal   0x1001800 addiu s3, s3, 6576
+// 0x01029f10: 0x1029f10: jal   0x1001800 addiu s3, s3, 6576
 	ldloc 9
 	ldc.i4 6576
 	add
@@ -856,7 +856,7 @@ L_1029ec4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029f08: 0x1029f08: lw    a1, 20(s3)
+// 0x01029f18: 0x1029f18: lw    a1, 20(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -865,16 +865,16 @@ L_1029ec4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01029f0c: 0x1029f0c: lui   a2, 0x60000
+// 0x01029f1c: 0x1029f1c: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01029f10: 0x1029f10: addu  a0, s0, zero
+// 0x01029f20: 0x1029f20: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01029f14: 0x1029f14: jalr  s2 addiu a2, a2, -25228
+// 0x01029f24: 0x1029f24: jalr  s2 addiu a2, a2, -24764
 	ldloc 11
 	ldloc.3
-	ldc.i4 -25228
+	ldc.i4 -24764
 	add
 	stloc.3
 	ldloc.0
@@ -887,15 +887,15 @@ L_1029ec4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01029f1c: 0x1029f1c: lui   a0, 0x60000
+// 0x01029f2c: 0x1029f2c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01029f20: 0x1029f20: addiu a0, a0, -25200
+// 0x01029f30: 0x1029f30: addiu a0, a0, -24736
 	ldloc.1
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.1
-// 0x01029f24: 0x1029f24: jalr  s1 addu  a1, s0, zero
+// 0x01029f34: 0x1029f34: jalr  s1 addu  a1, s0, zero
 	ldloc 10
 	ldloc 8
 	stloc.2
@@ -909,22 +909,22 @@ L_1029ec4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1029f2c:
-// 0x01029f2c: 0x1029f2c: lui   v0, 0x60000
+L_1029f3c:
+// 0x01029f3c: 0x1029f3c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01029f30: 0x1029f30: addiu v0, v0, -25260
+// 0x01029f40: 0x1029f40: addiu v0, v0, -24796
 	ldloc 6
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc 6
-// 0x01029f34: 0x1029f34: addiu v1, zero, 1
+// 0x01029f44: 0x1029f44: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01029f38: 0x1029f38: lui   a0, 0x60000
+// 0x01029f48: 0x1029f48: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01029f3c: 0x1029f3c: sw    v1, 56(v0)
+// 0x01029f4c: 0x1029f4c: sw    v1, 56(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -933,16 +933,16 @@ L_1029f2c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01029f40: 0x1029f40: sw    zero, -25440(a0)
+// 0x01029f50: 0x1029f50: sw    zero, -24976(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6360
+	ldc.i4 -6244
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01029f44: 0x1029f44: sw    v1, 52(v0)
+// 0x01029f54: 0x1029f54: sw    v1, 52(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -951,9 +951,9 @@ L_1029f2c:
 	add
 	ldloc 7
 	stelem.i4
-L_1029f48:
-// 0x01029f48: 0x1029f48: lw    ra, 36(sp)
-// 0x01029f4c: 0x1029f4c: lw    s3, 32(sp)
+L_1029f58:
+// 0x01029f58: 0x1029f58: lw    ra, 36(sp)
+// 0x01029f5c: 0x1029f5c: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -962,7 +962,7 @@ L_1029f48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01029f50: 0x1029f50: lw    s2, 28(sp)
+// 0x01029f60: 0x1029f60: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -971,7 +971,7 @@ L_1029f48:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01029f54: 0x1029f54: lw    s1, 24(sp)
+// 0x01029f64: 0x1029f64: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -980,7 +980,7 @@ L_1029f48:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01029f58: 0x1029f58: lw    s0, 20(sp)
+// 0x01029f68: 0x1029f68: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -989,7 +989,7 @@ L_1029f48:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01029f5c: 0x1029f5c: jr    ra addiu sp, sp, 40
+// 0x01029f6c: 0x1029f6c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1001,7 +1001,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_navigate_initialize_1029f64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_initialize_1029f74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 s3,int32 ra)
@@ -1048,13 +1048,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01029f64: 0x1029f64: addiu sp, sp, -48
+// 0x01029f74: 0x1029f74: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01029f68: 0x1029f68: sw    ra, 44(sp)
-// 0x01029f6c: 0x1029f6c: sw    s3, 40(sp)
+// 0x01029f78: 0x1029f78: sw    ra, 44(sp)
+// 0x01029f7c: 0x1029f7c: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1063,7 +1063,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01029f70: 0x1029f70: sw    s2, 36(sp)
+// 0x01029f80: 0x1029f80: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1072,7 +1072,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01029f74: 0x1029f74: sw    s1, 32(sp)
+// 0x01029f84: 0x1029f84: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1081,7 +1081,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01029f78: 0x1029f78: jal   0x102c094 sw    s0, 28(sp)
+// 0x01029f88: 0x1029f88: jal   0x102c0a4 sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1095,53 +1095,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_fuzzy_reset_cycle_102c094(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_reset_cycle_102c0a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029f80: 0x1029f80: lui   a0, 0x10000
+// 0x01029f90: 0x1029f90: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01029f84: 0x1029f84: lui   a1, 0x0
+// 0x01029f94: 0x1029f94: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01029f88: 0x1029f88: lui   a3, 0x0
+// 0x01029f98: 0x1029f98: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01029f8c: 0x1029f8c: lui   v0, 0x20000
+// 0x01029f9c: 0x1029f9c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01029f90: 0x1029f90: addiu a0, a0, 18248
+// 0x01029fa0: 0x1029fa0: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01029f94: 0x1029f94: addiu a1, a1, 6700
+// 0x01029fa4: 0x1029fa4: addiu a1, a1, 6700
 	ldloc.2
 	ldc.i4 6700
 	add
 	stloc.2
-// 0x01029f98: 0x1029f98: addiu a3, a3, 20820
+// 0x01029fa8: 0x1029fa8: addiu a3, a3, 20820
 	ldloc 4
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01029f9c: 0x1029f9c: addu  a2, zero, zero
+// 0x01029fac: 0x1029fac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01029fa0: 0x1029fa0: addiu v0, v0, 9464
+// 0x01029fb0: 0x1029fb0: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x01029fa4: 0x1029fa4: lui   s2, 0x10000
+// 0x01029fb4: 0x1029fb4: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01029fa8: 0x1029fa8: lui   s3, 0x0
+// 0x01029fb8: 0x1029fb8: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01029fac: 0x1029fac: sw    v0, 16(sp)
+// 0x01029fbc: 0x1029fbc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1150,7 +1150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01029fb0: 0x1029fb0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01029fc0: 0x1029fc0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1164,30 +1164,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029fb8: 0x1029fb8: lui   a2, 0x0
+// 0x01029fc8: 0x1029fc8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01029fbc: 0x1029fbc: addiu a0, s2, 12560
+// 0x01029fcc: 0x1029fcc: addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01029fc0: 0x1029fc0: addiu a1, s3, 6716
+// 0x01029fd0: 0x1029fd0: addiu a1, s3, 6716
 	ldloc 11
 	ldc.i4 6716
 	add
 	stloc.2
-// 0x01029fc4: 0x1029fc4: addiu a2, a2, 24152
+// 0x01029fd4: 0x1029fd4: addiu a2, a2, 24152
 	ldloc.3
 	ldc.i4 24152
 	add
 	stloc.3
-// 0x01029fc8: 0x1029fc8: jal   0x100edb0 addu  a3, zero, zero
+// 0x01029fd8: 0x1029fd8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1195,33 +1195,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029fd0: 0x1029fd0: lui   s1, 0x0
+// 0x01029fe0: 0x1029fe0: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01029fd4: 0x1029fd4: lui   a2, 0x10000
+// 0x01029fe4: 0x1029fe4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01029fd8: 0x1029fd8: addiu a0, s2, 12560
+// 0x01029fe8: 0x1029fe8: addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01029fdc: 0x1029fdc: addiu a1, s1, 6732
+// 0x01029fec: 0x1029fec: addiu a1, s1, 6732
 	ldloc 10
 	ldc.i4 6732
 	add
 	stloc.2
-// 0x01029fe0: 0x1029fe0: addiu a2, a2, -30004
+// 0x01029ff0: 0x1029ff0: addiu a2, a2, -30004
 	ldloc.3
 	ldc.i4 -30004
 	add
 	stloc.3
-// 0x01029fe4: 0x1029fe4: jal   0x100edb0 addu  a3, zero, zero
+// 0x01029ff4: 0x1029ff4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1229,33 +1229,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01029fec: 0x1029fec: lui   s0, 0x0
+// 0x01029ffc: 0x1029ffc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01029ff0: 0x1029ff0: lui   a2, 0x10000
+// 0x0102a000: 0x102a000: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01029ff4: 0x1029ff4: addiu a1, s0, 6748
+// 0x0102a004: 0x102a004: addiu a1, s0, 6748
 	ldloc 9
 	ldc.i4 6748
 	add
 	stloc.2
-// 0x01029ff8: 0x1029ff8: addiu a2, a2, -25904
+// 0x0102a008: 0x102a008: addiu a2, a2, -25904
 	ldloc.3
 	ldc.i4 -25904
 	add
 	stloc.3
-// 0x01029ffc: 0x1029ffc: addu  a3, zero, zero
+// 0x0102a00c: 0x102a00c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102a000: 0x102a000: jal   0x100edb0 addiu a0, s2, 12560
+// 0x0102a010: 0x102a010: jal   0x100edc0 addiu a0, s2, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
 	ldloc.0
@@ -1263,12 +1263,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a008: 0x102a008: jal   0x100e788 addiu a0, s3, 6716
+// 0x0102a018: 0x102a018: jal   0x100e798 addiu a0, s3, 6716
 	ldloc 11
 	ldc.i4 6716
 	add
@@ -1278,20 +1278,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a010: 0x102a010: addiu a0, s1, 6732
+// 0x0102a020: 0x102a020: addiu a0, s1, 6732
 	ldloc 10
 	ldc.i4 6732
 	add
 	stloc.1
-// 0x0102a014: 0x102a014: lui   v1, 0x0
+// 0x0102a024: 0x102a024: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0102a018: 0x102a018: jal   0x100e788 sw    v0, 6764(v1)
+// 0x0102a028: 0x102a028: jal   0x100e798 sw    v0, 6764(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1305,20 +1305,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a020: 0x102a020: lui   v1, 0x0
+// 0x0102a030: 0x102a030: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0102a024: 0x102a024: addiu a0, s0, 6748
+// 0x0102a034: 0x102a034: addiu a0, s0, 6748
 	ldloc 9
 	ldc.i4 6748
 	add
 	stloc.1
-// 0x0102a028: 0x102a028: jal   0x100e788 sw    v0, 6768(v1)
+// 0x0102a038: 0x102a038: jal   0x100e798 sw    v0, 6768(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1332,16 +1332,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a030: 0x102a030: lw    ra, 44(sp)
-// 0x0102a034: 0x102a034: lui   v1, 0x60000
+// 0x0102a040: 0x102a040: lw    ra, 44(sp)
+// 0x0102a044: 0x102a044: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0102a038: 0x102a038: lw    s3, 40(sp)
+// 0x0102a048: 0x102a048: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1350,7 +1350,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102a03c: 0x102a03c: lw    s2, 36(sp)
+// 0x0102a04c: 0x102a04c: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1359,7 +1359,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102a040: 0x102a040: lw    s1, 32(sp)
+// 0x0102a050: 0x102a050: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1368,7 +1368,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102a044: 0x102a044: lw    s0, 28(sp)
+// 0x0102a054: 0x102a054: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1377,16 +1377,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102a048: 0x102a048: sw    v0, -25436(v1)
+// 0x0102a058: 0x102a058: sw    v0, -24972(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6359
+	ldc.i4 -6243
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102a04c: 0x102a04c: jr    ra addiu sp, sp, 48
+// 0x0102a05c: 0x102a05c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1398,7 +1398,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_check_alerts_102a054(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_check_alerts_102a064(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1433,15 +1433,15 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102a054: 0x102a054: lui   a1, 0x0
+// 0x0102a064: 0x102a064: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102a058: 0x102a058: addiu a1, a1, 6652
+// 0x0102a068: 0x102a068: addiu a1, a1, 6652
 	ldloc.2
 	ldc.i4 6652
 	add
 	stloc.2
-// 0x0102a05c: 0x102a05c: lw    v1, 4(a1)
+// 0x0102a06c: 0x102a06c: lw    v1, 4(a1)
 	ldloc 8
 	ldloc.2
 	ldc.i4.2
@@ -1450,34 +1450,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a060: 0x102a060: addiu sp, sp, -24
+// 0x0102a070: 0x102a070: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102a064: 0x102a064: addiu v0, zero, -1
+// 0x0102a074: 0x102a074: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0102a068: 0x102a068: beq   v1, v0, 0x102a078 sw    ra, 20(sp)
+// 0x0102a078: 0x102a078: beq   v1, v0, 0x102a088 sw    ra, 20(sp)
 	ldloc 6
 	ldloc 5
-	beq  L_102a078
+	beq  L_102a088
 // --- basic block ---
-// 0x0102a070: 0x102a070: jal   0x1034604 sll   zero, zero, 0
+// 0x0102a080: 0x102a080: jal   0x1034614 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_alerter_check_1034604(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_alerter_check_1034614(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102a078:
-// 0x0102a078: 0x102a078: lw    ra, 20(sp)
-// 0x0102a07c: 0x102a07c: sll   zero, zero, 0
-// 0x0102a080: 0x102a080: jr    ra addiu sp, sp, 24
+L_102a088:
+// 0x0102a088: 0x102a088: lw    ra, 20(sp)
+// 0x0102a08c: 0x102a08c: sll   zero, zero, 0
+// 0x0102a090: 0x102a090: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1489,7 +1489,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_is_intersection_102a088(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_is_intersection_102a098(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
@@ -1530,12 +1530,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102a088: 0x102a088: addiu sp, sp, -56
+// 0x0102a098: 0x102a098: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0102a08c: 0x102a08c: sw    s1, 48(sp)
+// 0x0102a09c: 0x102a09c: sw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1544,7 +1544,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102a090: 0x102a090: sw    s0, 44(sp)
+// 0x0102a0a0: 0x102a0a0: sw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1553,27 +1553,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102a094: 0x102a094: sw    ra, 52(sp)
-// 0x0102a098: 0x102a098: addu  s1, a0, zero
+// 0x0102a0a4: 0x102a0a4: sw    ra, 52(sp)
+// 0x0102a0a8: 0x102a0a8: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0102a09c: 0x102a09c: beq   a0, zero, 0x102a108 addu  s0, a1, zero
+// 0x0102a0ac: 0x102a0ac: beq   a0, zero, 0x102a118 addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 9
-	brfalse L_102a108
+	brfalse L_102a118
 // --- basic block ---
-// 0x0102a0a4: 0x102a0a4: lui   v0, 0x0
+// 0x0102a0b4: 0x102a0b4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102a0a8: 0x102a0a8: lw    v1, 0(a0)
+// 0x0102a0b8: 0x102a0b8: lw    v1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102a0ac: 0x102a0ac: lw    a0, 6652(v0)
+// 0x0102a0bc: 0x102a0bc: lw    a0, 6652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1582,22 +1582,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a0b0: 0x102a0b0: sll   zero, zero, 0
-// 0x0102a0b4: 0x102a0b4: bne   v1, a0, 0x102a108 sll   zero, zero, 0
+// 0x0102a0c0: 0x102a0c0: sll   zero, zero, 0
+// 0x0102a0c4: 0x102a0c4: bne   v1, a0, 0x102a118 sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	bne.un L_102a108
+	bne.un L_102a118
 // --- basic block ---
-// 0x0102a0bc: 0x102a0bc: bne   v1, zero, 0x102a0dc sll   zero, zero, 0
+// 0x0102a0cc: 0x102a0cc: bne   v1, zero, 0x102a0ec sll   zero, zero, 0
 	ldloc 6
-	brtrue L_102a0dc
+	brtrue L_102a0ec
 // --- basic block ---
-// 0x0102a0c4: 0x102a0c4: addiu v0, v0, 6652
+// 0x0102a0d4: 0x102a0d4: addiu v0, v0, 6652
 	ldloc 5
 	ldc.i4 6652
 	add
 	stloc 5
-// 0x0102a0c8: 0x102a0c8: lw    v0, 12(v0)
+// 0x0102a0d8: 0x102a0d8: lw    v0, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1606,7 +1606,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a0cc: 0x102a0cc: lw    v1, 12(s1)
+// 0x0102a0dc: 0x102a0dc: lw    v1, 12(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1615,21 +1615,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a0d0: 0x102a0d0: sll   zero, zero, 0
-// 0x0102a0d4: 0x102a0d4: bne   v1, v0, 0x102a108 lui   v0, 0x0
+// 0x0102a0e0: 0x102a0e0: sll   zero, zero, 0
+// 0x0102a0e4: 0x102a0e4: bne   v1, v0, 0x102a118 lui   v0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_102a108
+	bne.un L_102a118
 // --- basic block ---
-L_102a0dc:
-// 0x0102a0dc: 0x102a0dc: addiu v0, v0, 6652
+L_102a0ec:
+// 0x0102a0ec: 0x102a0ec: addiu v0, v0, 6652
 	ldloc 5
 	ldc.i4 6652
 	add
 	stloc 5
-// 0x0102a0e0: 0x102a0e0: lw    a0, 4(s1)
+// 0x0102a0f0: 0x102a0f0: lw    a0, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1638,7 +1638,7 @@ L_102a0dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a0e4: 0x102a0e4: lw    v1, 4(v0)
+// 0x0102a0f4: 0x102a0f4: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1647,13 +1647,13 @@ L_102a0dc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a0e8: 0x102a0e8: sll   zero, zero, 0
-// 0x0102a0ec: 0x102a0ec: bne   a0, v1, 0x102a108 sll   zero, zero, 0
+// 0x0102a0f8: 0x102a0f8: sll   zero, zero, 0
+// 0x0102a0fc: 0x102a0fc: bne   a0, v1, 0x102a118 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_102a108
+	bne.un L_102a118
 // --- basic block ---
-// 0x0102a0f4: 0x102a0f4: lw    v0, 16(v0)
+// 0x0102a104: 0x102a104: lw    v0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1662,7 +1662,7 @@ L_102a0dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a0f8: 0x102a0f8: lw    v1, 16(s1)
+// 0x0102a108: 0x102a108: lw    v1, 16(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1671,22 +1671,22 @@ L_102a0dc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a0fc: 0x102a0fc: sll   zero, zero, 0
-// 0x0102a100: 0x102a100: beq   v1, v0, 0x102a1ac sll   zero, zero, 0
+// 0x0102a10c: 0x102a10c: sll   zero, zero, 0
+// 0x0102a110: 0x102a110: beq   v1, v0, 0x102a1bc sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_102a1ac
+	beq  L_102a1bc
 // --- basic block ---
-L_102a108:
-// 0x0102a108: 0x102a108: addiu a1, sp, 16
+L_102a118:
+// 0x0102a118: 0x102a118: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0102a10c: 0x102a10c: addu  a0, s1, zero
+// 0x0102a11c: 0x102a11c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102a110: 0x102a110: jal   0x1014ccc sw    a2, 32(sp)
+// 0x0102a120: 0x102a120: jal   0x1014cdc sw    a2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1700,15 +1700,15 @@ L_102a108:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a118: 0x102a118: addu  a0, s1, zero
+// 0x0102a128: 0x102a128: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102a11c: 0x102a11c: jal   0x1014dd8 addiu a1, sp, 24
+// 0x0102a12c: 0x102a12c: jal   0x1014de8 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1718,12 +1718,12 @@ L_102a108:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a124: 0x102a124: lw    a2, 32(sp)
+// 0x0102a134: 0x102a134: lw    a2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1732,7 +1732,7 @@ L_102a108:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102a128: 0x102a128: lw    v1, 28(sp)
+// 0x0102a138: 0x102a138: lw    v1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1741,7 +1741,7 @@ L_102a108:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a12c: 0x102a12c: lw    v0, 4(a2)
+// 0x0102a13c: 0x102a13c: lw    v0, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -1750,20 +1750,20 @@ L_102a108:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a130: 0x102a130: sll   zero, zero, 0
-// 0x0102a134: 0x102a134: bne   v1, v0, 0x102a150 sll   zero, zero, 0
+// 0x0102a140: 0x102a140: sll   zero, zero, 0
+// 0x0102a144: 0x102a144: bne   v1, v0, 0x102a160 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_102a150
+	bne.un L_102a160
 // --- basic block ---
-// 0x0102a13c: 0x102a13c: lw    v1, 0(a2)
+// 0x0102a14c: 0x102a14c: lw    v1, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102a140: 0x102a140: lw    a0, 24(sp)
+// 0x0102a150: 0x102a150: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1772,18 +1772,18 @@ L_102a108:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a144: 0x102a144: sll   zero, zero, 0
-// 0x0102a148: 0x102a148: beq   a0, v1, 0x102a178 addiu a0, sp, 24
+// 0x0102a154: 0x102a154: sll   zero, zero, 0
+// 0x0102a158: 0x102a158: beq   a0, v1, 0x102a188 addiu a0, sp, 24
 	ldloc.1
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-	beq  L_102a178
+	beq  L_102a188
 // --- basic block ---
-L_102a150:
-// 0x0102a150: 0x102a150: lw    v1, 20(sp)
+L_102a160:
+// 0x0102a160: 0x102a160: lw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1792,20 +1792,20 @@ L_102a150:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a154: 0x102a154: sll   zero, zero, 0
-// 0x0102a158: 0x102a158: bne   v1, v0, 0x102a1ac sll   zero, zero, 0
+// 0x0102a164: 0x102a164: sll   zero, zero, 0
+// 0x0102a168: 0x102a168: bne   v1, v0, 0x102a1bc sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_102a1ac
+	bne.un L_102a1bc
 // --- basic block ---
-// 0x0102a160: 0x102a160: lw    v0, 0(a2)
+// 0x0102a170: 0x102a170: lw    v0, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102a164: 0x102a164: lw    v1, 16(sp)
+// 0x0102a174: 0x102a174: lw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1814,19 +1814,19 @@ L_102a150:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a168: 0x102a168: sll   zero, zero, 0
-// 0x0102a16c: 0x102a16c: bne   v1, v0, 0x102a1ac sll   zero, zero, 0
+// 0x0102a178: 0x102a178: sll   zero, zero, 0
+// 0x0102a17c: 0x102a17c: bne   v1, v0, 0x102a1bc sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_102a1ac
+	bne.un L_102a1bc
 // --- basic block ---
-// 0x0102a174: 0x102a174: addiu a0, sp, 24
+// 0x0102a184: 0x102a184: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-L_102a178:
-// 0x0102a178: 0x102a178: jal   0x1009824 addiu a1, sp, 16
+L_102a188:
+// 0x0102a188: 0x102a188: jal   0x1009834 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1836,38 +1836,38 @@ L_102a178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a180: 0x102a180: addu  a0, v0, zero
+// 0x0102a190: 0x102a190: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102a184: 0x102a184: addu  a1, s0, zero
+// 0x0102a194: 0x102a194: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0102a188: 0x102a188: jal   0x102bd14 addiu a2, zero, 1
+// 0x0102a198: 0x102a198: jal   0x102bd24 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl32::roadmap_fuzzy_direction_102bd14(int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_direction_102bd24(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a190: 0x102a190: jal   0x102be2c addu  a0, v0, zero
+// 0x0102a1a0: 0x102a1a0: jal   0x102be3c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_not_102be2c(int32)
+	call int32 Cibyl32::roadmap_fuzzy_not_102be3c(int32)
 	stloc 5
 // --- basic block ---
-L_102a198:
-// 0x0102a198: 0x102a198: lw    ra, 52(sp)
-// 0x0102a19c: 0x102a19c: lw    s1, 48(sp)
+L_102a1a8:
+// 0x0102a1a8: 0x102a1a8: lw    ra, 52(sp)
+// 0x0102a1ac: 0x102a1ac: lw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1876,7 +1876,7 @@ L_102a198:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102a1a0: 0x102a1a0: lw    s0, 44(sp)
+// 0x0102a1b0: 0x102a1b0: lw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1885,27 +1885,27 @@ L_102a198:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102a1a4: 0x102a1a4: jr    ra addiu sp, sp, 56
+// 0x0102a1b4: 0x102a1b4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_102a1ac:
-// 0x0102a1ac: 0x102a1ac: jal   0x102be38 sll   zero, zero, 0
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+L_102a1bc:
+// 0x0102a1bc: 0x102a1bc: jal   0x102be48 sll   zero, zero, 0
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x0102a1b4: 0x102a1b4: j	 0x102a198 sll   zero, zero, 0
-	br L_102a198
+// 0x0102a1c4: 0x102a1c4: j	 0x102a1a8 sll   zero, zero, 0
+	br L_102a1a8
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_trace_102a1bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_trace_102a1cc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -1946,12 +1946,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102a1bc: 0x102a1bc: addiu sp, sp, -1112
+// 0x0102a1cc: 0x102a1cc: addiu sp, sp, -1112
 	ldloc.0
 	ldc.i4 -1112
 	add
 	stloc.0
-// 0x0102a1c0: 0x102a1c0: sw    s0, 1100(sp)
+// 0x0102a1d0: 0x102a1d0: sw    s0, 1100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1960,13 +1960,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102a1c4: 0x102a1c4: addu  s0, a1, zero
+// 0x0102a1d4: 0x102a1d4: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0102a1c8: 0x102a1c8: lui   a1, 0x10000
+// 0x0102a1d8: 0x102a1d8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102a1cc: 0x102a1cc: sw    s1, 1104(sp)
+// 0x0102a1dc: 0x102a1dc: sw    s1, 1104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1975,19 +1975,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102a1d0: 0x102a1d0: addiu a1, a1, -25980
+// 0x0102a1e0: 0x102a1e0: addiu a1, a1, -25980
 	ldloc.2
 	ldc.i4 -25980
 	add
 	stloc.2
-// 0x0102a1d4: 0x102a1d4: addu  s1, a0, zero
+// 0x0102a1e4: 0x102a1e4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0102a1d8: 0x102a1d8: addiu a2, zero, 145
+// 0x0102a1e8: 0x102a1e8: addiu a2, zero, 145
 	ldc.i4 145
 	stloc.3
-// 0x0102a1dc: 0x102a1dc: sw    ra, 1108(sp)
-// 0x0102a1e0: 0x102a1e0: jal   0x1004474 addiu a0, zero, 1
+// 0x0102a1ec: 0x102a1ec: sw    ra, 1108(sp)
+// 0x0102a1f0: 0x102a1f0: jal   0x1004474 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -2000,15 +2000,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a1e8: 0x102a1e8: beq   v0, zero, 0x102a29c addiu a1, sp, 24
+// 0x0102a1f8: 0x102a1f8: beq   v0, zero, 0x102a2ac addiu a1, sp, 24
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-	brfalse L_102a29c
+	brfalse L_102a2ac
 // --- basic block ---
-// 0x0102a1f0: 0x102a1f0: jal   0x101507c addu  a0, s0, zero
+// 0x0102a200: 0x102a200: jal   0x101508c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2016,18 +2016,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_101507c(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_101508c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a1f8: 0x102a1f8: addu  a2, zero, zero
+// 0x0102a208: 0x102a208: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102a1fc: 0x102a1fc: addu  a0, s0, zero
+// 0x0102a20c: 0x102a20c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102a200: 0x102a200: jal   0x1015174 addiu a1, sp, 36
+// 0x0102a210: 0x102a210: jal   0x1015184 addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -2037,12 +2037,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a208: 0x102a208: lw    a1, 36(sp)
+// 0x0102a218: 0x102a218: lw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2051,7 +2051,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102a20c: 0x102a20c: jal   0x101aec4 addiu a0, zero, 35
+// 0x0102a21c: 0x102a21c: jal   0x101aed4 addiu a0, zero, 35
 	ldc.i4.s 35
 	stloc.1
 	ldloc.0
@@ -2059,12 +2059,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a214: 0x102a214: lw    a1, 40(sp)
+// 0x0102a224: 0x102a224: lw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2073,7 +2073,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102a218: 0x102a218: jal   0x101aec4 addiu a0, zero, 78
+// 0x0102a228: 0x102a228: jal   0x101aed4 addiu a0, zero, 78
 	ldc.i4.s 78
 	stloc.1
 	ldloc.0
@@ -2081,12 +2081,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a220: 0x102a220: lw    a1, 48(sp)
+// 0x0102a230: 0x102a230: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2095,7 +2095,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102a224: 0x102a224: jal   0x101aec4 addiu a0, zero, 67
+// 0x0102a234: 0x102a234: jal   0x101aed4 addiu a0, zero, 67
 	ldc.i4.s 67
 	stloc.1
 	ldloc.0
@@ -2103,23 +2103,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a22c: 0x102a22c: addu  a2, s1, zero
+// 0x0102a23c: 0x102a23c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0102a230: 0x102a230: addiu a0, sp, 64
+// 0x0102a240: 0x102a240: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x0102a234: 0x102a234: addiu a1, zero, 1024
+// 0x0102a244: 0x102a244: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x0102a238: 0x102a238: jal   0x101afb8 sb    zero, 64(sp)
+// 0x0102a248: 0x102a248: jal   0x101afc8 sb    zero, 64(sp)
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2130,30 +2130,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a240: 0x102a240: beq   v0, zero, 0x102a29c sll   zero, zero, 0
+// 0x0102a250: 0x102a250: beq   v0, zero, 0x102a2ac sll   zero, zero, 0
 	ldloc 6
-	brfalse L_102a29c
+	brfalse L_102a2ac
 // --- basic block ---
-// 0x0102a248: 0x102a248: lw    a2, 0(s0)
+// 0x0102a258: 0x102a258: lw    a2, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0102a24c: 0x102a24c: sll   zero, zero, 0
-// 0x0102a250: 0x102a250: bne   a2, zero, 0x102a280 lui   v0, 0x0
+// 0x0102a25c: 0x102a25c: sll   zero, zero, 0
+// 0x0102a260: 0x102a260: bne   a2, zero, 0x102a290 lui   v0, 0x0
 	ldloc.3
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_102a280
+	brtrue L_102a290
 // --- basic block ---
-// 0x0102a258: 0x102a258: lw    v0, 576(v0)
+// 0x0102a268: 0x102a268: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2162,7 +2162,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a25c: 0x102a25c: lw    a0, 12(s0)
+// 0x0102a26c: 0x102a26c: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2171,18 +2171,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a260: 0x102a260: sll   zero, zero, 0
-// 0x0102a264: 0x102a264: beq   a0, v0, 0x102a280 sll   zero, zero, 0
+// 0x0102a270: 0x102a270: sll   zero, zero, 0
+// 0x0102a274: 0x102a274: beq   a0, v0, 0x102a290 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_102a280
+	beq  L_102a290
 // --- basic block ---
-// 0x0102a26c: 0x102a26c: bltz  a0, 0x102a280 sll   zero, zero, 0
+// 0x0102a27c: 0x102a27c: bltz  a0, 0x102a290 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_102a280
+	blt L_102a290
 // --- basic block ---
-// 0x0102a274: 0x102a274: jal   0x100b164 sw    a2, 1088(sp)
+// 0x0102a284: 0x102a284: jal   0x100b174 sw    a2, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2196,12 +2196,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a27c: 0x102a27c: lw    a2, 1088(sp)
+// 0x0102a28c: 0x102a28c: lw    a2, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2210,8 +2210,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-L_102a280:
-// 0x0102a280: 0x102a280: lw    a3, 4(s0)
+L_102a290:
+// 0x0102a290: 0x102a290: lw    a3, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2220,10 +2220,10 @@ L_102a280:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102a284: 0x102a284: lui   a0, 0x10000
+// 0x0102a294: 0x102a294: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102a288: 0x102a288: lw    v0, 32(sp)
+// 0x0102a298: 0x102a298: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2232,17 +2232,17 @@ L_102a280:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a28c: 0x102a28c: addiu a0, a0, -25900
+// 0x0102a29c: 0x102a29c: addiu a0, a0, -25900
 	ldloc.1
 	ldc.i4 -25900
 	add
 	stloc.1
-// 0x0102a290: 0x102a290: addiu a1, sp, 64
+// 0x0102a2a0: 0x102a2a0: addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x0102a294: 0x102a294: jal   0x1000e78 sw    v0, 16(sp)
+// 0x0102a2a4: 0x102a2a4: jal   0x1000e78 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2261,9 +2261,9 @@ L_102a280:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_102a29c:
-// 0x0102a29c: 0x102a29c: lw    ra, 1108(sp)
-// 0x0102a2a0: 0x102a2a0: lw    s1, 1104(sp)
+L_102a2ac:
+// 0x0102a2ac: 0x102a2ac: lw    ra, 1108(sp)
+// 0x0102a2b0: 0x102a2b0: lw    s1, 1104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2272,7 +2272,7 @@ L_102a29c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102a2a4: 0x102a2a4: lw    s0, 1100(sp)
+// 0x0102a2b4: 0x102a2b4: lw    s0, 1100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2281,7 +2281,7 @@ L_102a29c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102a2a8: 0x102a2a8: jr    ra addiu sp, sp, 1112
+// 0x0102a2b8: 0x102a2b8: jr    ra addiu sp, sp, 1112
 	ldloc.0
 	ldc.i4 1112
 	add
@@ -2293,7 +2293,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_navigate_is_jammed_102a2b0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_is_jammed_102a2c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2337,24 +2337,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102a2b0: 0x102a2b0: lui   v0, 0x60000
+// 0x0102a2c0: 0x102a2c0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102a2b4: 0x102a2b4: lw    v1, -25268(v0)
+// 0x0102a2c4: 0x102a2c4: lw    v1, -24804(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6317
+	ldc.i4 -6201
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a2b8: 0x102a2b8: addiu sp, sp, -96
+// 0x0102a2c8: 0x102a2c8: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0102a2bc: 0x102a2bc: sw    s2, 88(sp)
+// 0x0102a2cc: 0x102a2cc: sw    s2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2363,7 +2363,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102a2c0: 0x102a2c0: sw    s1, 84(sp)
+// 0x0102a2d0: 0x102a2d0: sw    s1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2372,8 +2372,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102a2c4: 0x102a2c4: sw    ra, 92(sp)
-// 0x0102a2c8: 0x102a2c8: sw    s0, 80(sp)
+// 0x0102a2d4: 0x102a2d4: sw    ra, 92(sp)
+// 0x0102a2d8: 0x102a2d8: sw    s0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2382,32 +2382,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102a2cc: 0x102a2cc: addu  s2, a0, zero
+// 0x0102a2dc: 0x102a2dc: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0102a2d0: 0x102a2d0: addu  s1, a1, zero
+// 0x0102a2e0: 0x102a2e0: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0102a2d4: 0x102a2d4: beq   v1, zero, 0x102a3b4 addu  v0, zero, zero
+// 0x0102a2e4: 0x102a2e4: beq   v1, zero, 0x102a3c4 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_102a3b4
+	brfalse L_102a3c4
 // --- basic block ---
-// 0x0102a2dc: 0x102a2dc: addiu s0, sp, 36
+// 0x0102a2ec: 0x102a2ec: addiu s0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-// 0x0102a2e0: 0x102a2e0: addiu a0, sp, 56
+// 0x0102a2f0: 0x102a2f0: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x0102a2e4: 0x102a2e4: addu  a1, s0, zero
+// 0x0102a2f4: 0x102a2f4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0102a2e8: 0x102a2e8: jal   0x1029da8 addiu a2, sp, 24
+// 0x0102a2f8: 0x102a2f8: jal   0x1029db8 addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2417,38 +2417,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a2f0: 0x102a2f0: addiu v1, zero, -1
+// 0x0102a300: 0x102a300: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0102a2f4: 0x102a2f4: bne   v0, v1, 0x102a31c lui   a3, 0x10000
+// 0x0102a304: 0x102a304: bne   v0, v1, 0x102a32c lui   a3, 0x10000
 	ldloc 5
 	ldloc 7
 	ldc.i4 65536
 	stloc 4
-	bne.un L_102a31c
+	bne.un L_102a32c
 // --- basic block ---
-// 0x0102a2fc: 0x102a2fc: lui   a1, 0x10000
+// 0x0102a30c: 0x102a30c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102a300: 0x102a300: addiu a1, a1, -25980
+// 0x0102a310: 0x102a310: addiu a1, a1, -25980
 	ldloc.2
 	ldc.i4 -25980
 	add
 	stloc.2
-// 0x0102a304: 0x102a304: addiu a3, a3, -25852
+// 0x0102a314: 0x102a314: addiu a3, a3, -25852
 	ldloc 4
 	ldc.i4 -25852
 	add
 	stloc 4
-// 0x0102a308: 0x102a308: addiu a0, zero, 4
+// 0x0102a318: 0x102a318: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102a30c: 0x102a30c: jal   0x100449c addiu a2, zero, 728
+// 0x0102a31c: 0x102a31c: jal   0x100449c addiu a2, zero, 728
 	ldc.i4 728
 	stloc.3
 	ldloc.0
@@ -2461,13 +2461,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a314: 0x102a314: j	 0x102a3b4 addu  v0, zero, zero
+// 0x0102a324: 0x102a324: j	 0x102a3c4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_102a3b4
+	br L_102a3c4
 // --- basic block ---
-L_102a31c:
-// 0x0102a31c: 0x102a31c: lw    v1, 24(sp)
+L_102a32c:
+// 0x0102a32c: 0x102a32c: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2476,44 +2476,44 @@ L_102a31c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a320: 0x102a320: addiu v0, zero, 2
+// 0x0102a330: 0x102a330: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102a324: 0x102a324: bne   v1, v0, 0x102a33c addiu a1, sp, 28
+// 0x0102a334: 0x102a334: bne   v1, v0, 0x102a34c addiu a1, sp, 28
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-	bne.un L_102a33c
+	bne.un L_102a34c
 // --- basic block ---
-// 0x0102a32c: 0x102a32c: addu  a0, s0, zero
+// 0x0102a33c: 0x102a33c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102a330: 0x102a330: addu  a2, zero, zero
+// 0x0102a340: 0x102a340: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102a334: 0x102a334: j	 0x102a34c addiu a3, zero, 1
+// 0x0102a344: 0x102a344: j	 0x102a35c addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-	br L_102a34c
+	br L_102a35c
 // --- basic block ---
-L_102a33c:
-// 0x0102a33c: 0x102a33c: addu  a2, a1, zero
+L_102a34c:
+// 0x0102a34c: 0x102a34c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0102a340: 0x102a340: addu  a0, s0, zero
+// 0x0102a350: 0x102a350: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102a344: 0x102a344: addu  a1, zero, zero
+// 0x0102a354: 0x102a354: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102a348: 0x102a348: addiu a3, zero, 2
+// 0x0102a358: 0x102a358: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-L_102a34c:
-// 0x0102a34c: 0x102a34c: sw    zero, 16(sp)
+L_102a35c:
+// 0x0102a35c: 0x102a35c: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2522,7 +2522,7 @@ L_102a34c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102a350: 0x102a350: jal   0x1012790 sw    zero, 20(sp)
+// 0x0102a360: 0x102a360: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2536,17 +2536,17 @@ L_102a34c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a358: 0x102a358: addiu a0, sp, 56
+// 0x0102a368: 0x102a368: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x0102a35c: 0x102a35c: jal   0x1008eb0 addiu a1, sp, 28
+// 0x0102a36c: 0x102a36c: jal   0x1008ec0 addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -2556,37 +2556,37 @@ L_102a34c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a364: 0x102a364: lui   a1, 0x10000
+// 0x0102a374: 0x102a374: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102a368: 0x102a368: lui   a3, 0x10000
+// 0x0102a378: 0x102a378: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102a36c: 0x102a36c: addiu a1, a1, -25980
+// 0x0102a37c: 0x102a37c: addiu a1, a1, -25980
 	ldloc.2
 	ldc.i4 -25980
 	add
 	stloc.2
-// 0x0102a370: 0x102a370: addiu a3, a3, -25792
+// 0x0102a380: 0x102a380: addiu a3, a3, -25792
 	ldloc 4
 	ldc.i4 -25792
 	add
 	stloc 4
-// 0x0102a374: 0x102a374: addiu a2, zero, 739
+// 0x0102a384: 0x102a384: addiu a2, zero, 739
 	ldc.i4 739
 	stloc.3
-// 0x0102a378: 0x102a378: addiu a0, zero, 1
+// 0x0102a388: 0x102a388: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0102a37c: 0x102a37c: addu  s0, v0, zero
+// 0x0102a38c: 0x102a38c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0102a380: 0x102a380: jal   0x100449c sw    v0, 16(sp)
+// 0x0102a390: 0x102a390: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2605,15 +2605,15 @@ L_102a34c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a388: 0x102a388: addu  a0, s2, zero
+// 0x0102a398: 0x102a398: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0102a38c: 0x102a38c: addiu a1, sp, 36
+// 0x0102a39c: 0x102a39c: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0102a390: 0x102a390: jal   0x1001800 addiu a2, zero, 20
+// 0x0102a3a0: 0x102a3a0: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -2625,7 +2625,7 @@ L_102a34c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a398: 0x102a398: lw    v0, 24(sp)
+// 0x0102a3a8: 0x102a3a8: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2634,35 +2634,35 @@ L_102a34c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a39c: 0x102a39c: sll   zero, zero, 0
-// 0x0102a3a0: 0x102a3a0: sw    v0, 0(s1)
+// 0x0102a3ac: 0x102a3ac: sll   zero, zero, 0
+// 0x0102a3b0: 0x102a3b0: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0102a3a4: 0x102a3a4: lui   v0, 0x60000
+// 0x0102a3b4: 0x102a3b4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102a3a8: 0x102a3a8: lw    v0, -25436(v0)
+// 0x0102a3b8: 0x102a3b8: lw    v0, -24972(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6359
+	ldc.i4 -6243
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a3ac: 0x102a3ac: sll   zero, zero, 0
-// 0x0102a3b0: 0x102a3b0: slt   v0, v0, s0
+// 0x0102a3bc: 0x102a3bc: sll   zero, zero, 0
+// 0x0102a3c0: 0x102a3c0: slt   v0, v0, s0
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-L_102a3b4:
-// 0x0102a3b4: 0x102a3b4: lw    ra, 92(sp)
-// 0x0102a3b8: 0x102a3b8: lw    s2, 88(sp)
+L_102a3c4:
+// 0x0102a3c4: 0x102a3c4: lw    ra, 92(sp)
+// 0x0102a3c8: 0x102a3c8: lw    s2, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2671,7 +2671,7 @@ L_102a3b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102a3bc: 0x102a3bc: lw    s1, 84(sp)
+// 0x0102a3cc: 0x102a3cc: lw    s1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2680,7 +2680,7 @@ L_102a3b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102a3c0: 0x102a3c0: lw    s0, 80(sp)
+// 0x0102a3d0: 0x102a3d0: lw    s0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2689,7 +2689,7 @@ L_102a3b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102a3c4: 0x102a3c4: jr    ra addiu sp, sp, 96
+// 0x0102a3d4: 0x102a3d4: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -2701,7 +2701,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s5,int32 s6,int32 s8,int32 s2,int32 s3,int32 s4,int32 s7,int32 ra)
@@ -2763,12 +2763,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102a3cc: 0x102a3cc: addiu sp, sp, -64
+// 0x0102a3dc: 0x102a3dc: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0102a3d0: 0x102a3d0: sw    s1, 28(sp)
+// 0x0102a3e0: 0x102a3e0: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2777,7 +2777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102a3d4: 0x102a3d4: lw    s1, 80(sp)
+// 0x0102a3e4: 0x102a3e4: lw    s1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2786,7 +2786,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102a3d8: 0x102a3d8: sw    s6, 48(sp)
+// 0x0102a3e8: 0x102a3e8: sw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2795,7 +2795,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102a3dc: 0x102a3dc: sw    s4, 40(sp)
+// 0x0102a3ec: 0x102a3ec: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2804,7 +2804,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102a3e0: 0x102a3e0: sw    s3, 36(sp)
+// 0x0102a3f0: 0x102a3f0: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2813,7 +2813,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102a3e4: 0x102a3e4: sw    s0, 24(sp)
+// 0x0102a3f4: 0x102a3f4: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2822,8 +2822,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102a3e8: 0x102a3e8: sw    ra, 60(sp)
-// 0x0102a3ec: 0x102a3ec: sw    s8, 56(sp)
+// 0x0102a3f8: 0x102a3f8: sw    ra, 60(sp)
+// 0x0102a3fc: 0x102a3fc: sw    s8, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2832,7 +2832,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102a3f0: 0x102a3f0: sw    s7, 52(sp)
+// 0x0102a400: 0x102a400: sw    s7, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2841,7 +2841,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0102a3f4: 0x102a3f4: sw    s5, 44(sp)
+// 0x0102a404: 0x102a404: sw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2850,7 +2850,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102a3f8: 0x102a3f8: sw    s2, 32(sp)
+// 0x0102a408: 0x102a408: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2859,19 +2859,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102a3fc: 0x102a3fc: addu  s0, a0, zero
+// 0x0102a40c: 0x102a40c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0102a400: 0x102a400: addu  s3, a1, zero
+// 0x0102a410: 0x102a410: addu  s3, a1, zero
 	ldloc.2
 	stloc 14
-// 0x0102a404: 0x102a404: addu  s4, a2, zero
+// 0x0102a414: 0x102a414: addu  s4, a2, zero
 	ldloc.3
 	stloc 15
-// 0x0102a408: 0x102a408: addu  s6, a3, zero
+// 0x0102a418: 0x102a418: addu  s6, a3, zero
 	ldloc 4
 	stloc 11
-// 0x0102a40c: 0x102a40c: beq   a1, zero, 0x102a424 sw    s1, 24(a0)
+// 0x0102a41c: 0x102a41c: beq   a1, zero, 0x102a434 sw    s1, 24(a0)
 	ldloc.2
 	ldloc 6
 	ldloc.1
@@ -2881,26 +2881,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_102a424
+	brfalse L_102a434
 // --- basic block ---
-// 0x0102a414: 0x102a414: lw    v0, 0(a1)
+// 0x0102a424: 0x102a424: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102a418: 0x102a418: sll   zero, zero, 0
-// 0x0102a41c: 0x102a41c: bne   v0, zero, 0x102a428 sll   zero, zero, 0
+// 0x0102a428: 0x102a428: sll   zero, zero, 0
+// 0x0102a42c: 0x102a42c: bne   v0, zero, 0x102a438 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102a428
+	brtrue L_102a438
 // --- basic block ---
-L_102a424:
-// 0x0102a424: 0x102a424: addu  s4, zero, zero
+L_102a434:
+// 0x0102a434: 0x102a434: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-L_102a428:
-// 0x0102a428: 0x102a428: lw    a0, 20(s6)
+L_102a438:
+// 0x0102a438: 0x102a438: lw    a0, 20(s6)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2909,32 +2909,32 @@ L_102a428:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a42c: 0x102a42c: jal   0x102bda0 sll   zero, zero, 0
+// 0x0102a43c: 0x102a43c: jal   0x102bdb0 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl32::roadmap_fuzzy_distance_102bda0(int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_distance_102bdb0(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a434: 0x102a434: addu  a0, v0, zero
+// 0x0102a444: 0x102a444: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102a438: 0x102a438: jal   0x102be40 addu  s2, v0, zero
+// 0x0102a448: 0x102a448: jal   0x102be50 addu  s2, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102a440: 0x102a440: beq   v0, zero, 0x102a518 sll   zero, zero, 0
+// 0x0102a450: 0x102a450: beq   v0, zero, 0x102a528 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102a518
+	brfalse L_102a528
 // --- basic block ---
-// 0x0102a448: 0x102a448: addu  a0, s6, zero
+// 0x0102a458: 0x102a458: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x0102a44c: 0x102a44c: jal   0x1014c00 addiu a1, zero, 1
+// 0x0102a45c: 0x102a45c: jal   0x1014c10 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2942,57 +2942,57 @@ L_102a428:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_direction_1014c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_direction_1014c10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a454: 0x102a454: beq   v0, zero, 0x102a480 addu  s5, v0, zero
+// 0x0102a464: 0x102a464: beq   v0, zero, 0x102a490 addu  s5, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_102a480
+	brfalse L_102a490
 // --- basic block ---
-// 0x0102a45c: 0x102a45c: addiu v0, zero, 3
+// 0x0102a46c: 0x102a46c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0102a460: 0x102a460: beq   s5, v0, 0x102a484 addiu s8, zero, 1
+// 0x0102a470: 0x102a470: beq   s5, v0, 0x102a494 addiu s8, zero, 1
 	ldloc 10
 	ldloc 5
 	ldc.i4.1
 	stloc 12
-	beq  L_102a484
+	beq  L_102a494
 // --- basic block ---
-// 0x0102a468: 0x102a468: beq   s1, zero, 0x102a5b0 addiu v0, zero, 1
+// 0x0102a478: 0x102a478: beq   s1, zero, 0x102a5c0 addiu v0, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 5
-	brfalse L_102a5b0
+	brfalse L_102a5c0
 // --- basic block ---
-// 0x0102a470: 0x102a470: beq   s5, v0, 0x102a5c0 addu  s8, zero, zero
+// 0x0102a480: 0x102a480: beq   s5, v0, 0x102a5d0 addu  s8, zero, zero
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	beq  L_102a5c0
+	beq  L_102a5d0
 // --- basic block ---
-// 0x0102a478: 0x102a478: j	 0x102a484 addiu s5, zero, 1
+// 0x0102a488: 0x102a488: j	 0x102a494 addiu s5, zero, 1
 	ldc.i4.1
 	stloc 10
-	br L_102a484
+	br L_102a494
 // --- basic block ---
-L_102a480:
-// 0x0102a480: 0x102a480: addiu s8, zero, 1
+L_102a490:
+// 0x0102a490: 0x102a490: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 12
-L_102a484:
-// 0x0102a484: 0x102a484: addiu a0, s6, 24
+L_102a494:
+// 0x0102a494: 0x102a494: addiu a0, s6, 24
 	ldloc 11
 	ldc.i4.s 24
 	add
 	stloc.1
-L_102a488:
-// 0x0102a488: 0x102a488: jal   0x1009824 addiu a1, s6, 32
+L_102a498:
+// 0x0102a498: 0x102a498: jal   0x1009834 addiu a1, s6, 32
 	ldloc 11
 	ldc.i4.s 32
 	add
@@ -3002,12 +3002,12 @@ L_102a488:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a490: 0x102a490: lw    a1, 84(sp)
+// 0x0102a4a0: 0x102a4a0: lw    a1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3016,52 +3016,52 @@ L_102a488:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102a494: 0x102a494: addu  a0, v0, zero
+// 0x0102a4a4: 0x102a4a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102a498: 0x102a498: addu  a2, zero, zero
+// 0x0102a4a8: 0x102a4a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102a49c: 0x102a49c: jal   0x102bd14 addu  s7, v0, zero
+// 0x0102a4ac: 0x102a4ac: jal   0x102bd24 addu  s7, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl32::roadmap_fuzzy_direction_102bd14(int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_direction_102bd24(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a4a4: 0x102a4a4: bne   s8, zero, 0x102a4c0 addu  s1, v0, zero
+// 0x0102a4b4: 0x102a4b4: bne   s8, zero, 0x102a4d0 addu  s1, v0, zero
 	ldloc 12
 	ldloc 5
 	stloc 9
-	brtrue L_102a4c0
+	brtrue L_102a4d0
 // --- basic block ---
-L_102a4ac:
-// 0x0102a4ac: 0x102a4ac: addiu v0, zero, 2
+L_102a4bc:
+// 0x0102a4bc: 0x102a4bc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102a4b0: 0x102a4b0: beq   s5, v0, 0x102a4c0 addu  s5, zero, zero
+// 0x0102a4c0: 0x102a4c0: beq   s5, v0, 0x102a4d0 addu  s5, zero, zero
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	beq  L_102a4c0
+	beq  L_102a4d0
 // --- basic block ---
-// 0x0102a4b8: 0x102a4b8: j	 0x102a4e0 addu  v0, zero, zero
+// 0x0102a4c8: 0x102a4c8: j	 0x102a4f0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_102a4e0
+	br L_102a4f0
 // --- basic block ---
-L_102a4c0:
-// 0x0102a4c0: 0x102a4c0: addiu a0, s6, 32
+L_102a4d0:
+// 0x0102a4d0: 0x102a4d0: addiu a0, s6, 32
 	ldloc 11
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0102a4c4: 0x102a4c4: jal   0x1009824 addiu a1, s6, 24
+// 0x0102a4d4: 0x102a4d4: jal   0x1009834 addiu a1, s6, 24
 	ldloc 11
 	ldc.i4.s 24
 	add
@@ -3071,12 +3071,12 @@ L_102a4c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a4cc: 0x102a4cc: lw    a1, 84(sp)
+// 0x0102a4dc: 0x102a4dc: lw    a1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3085,36 +3085,36 @@ L_102a4c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102a4d0: 0x102a4d0: addu  a0, v0, zero
+// 0x0102a4e0: 0x102a4e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102a4d4: 0x102a4d4: addu  a2, zero, zero
+// 0x0102a4e4: 0x102a4e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102a4d8: 0x102a4d8: jal   0x102bd14 addu  s5, v0, zero
+// 0x0102a4e8: 0x102a4e8: jal   0x102bd24 addu  s5, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl32::roadmap_fuzzy_direction_102bd14(int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_direction_102bd24(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102a4e0:
-// 0x0102a4e0: 0x102a4e0: slt   v1, s1, v0
+L_102a4f0:
+// 0x0102a4f0: 0x102a4f0: slt   v1, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 7
-// 0x0102a4e4: 0x102a4e4: beq   v1, zero, 0x102a4fc addiu v1, zero, 2
+// 0x0102a4f4: 0x102a4f4: beq   v1, zero, 0x102a50c addiu v1, zero, 2
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	brfalse L_102a4fc
+	brfalse L_102a50c
 // --- basic block ---
-// 0x0102a4ec: 0x102a4ec: sw    s5, 16(s0)
+// 0x0102a4fc: 0x102a4fc: sw    s5, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3123,7 +3123,7 @@ L_102a4e0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102a4f0: 0x102a4f0: sw    v1, 20(s0)
+// 0x0102a500: 0x102a500: sw    v1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3132,16 +3132,16 @@ L_102a4e0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102a4f4: 0x102a4f4: j	 0x102a508 addu  s1, v0, zero
+// 0x0102a504: 0x102a504: j	 0x102a518 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-	br L_102a508
+	br L_102a518
 // --- basic block ---
-L_102a4fc:
-// 0x0102a4fc: 0x102a4fc: addiu v0, zero, 1
+L_102a50c:
+// 0x0102a50c: 0x102a50c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102a500: 0x102a500: sw    s7, 16(s0)
+// 0x0102a510: 0x102a510: sw    s7, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3150,7 +3150,7 @@ L_102a4fc:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0102a504: 0x102a504: sw    v0, 20(s0)
+// 0x0102a514: 0x102a514: sw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3159,36 +3159,36 @@ L_102a4fc:
 	add
 	ldloc 5
 	stelem.i4
-L_102a508:
-// 0x0102a508: 0x102a508: jal   0x102be40 addu  a0, s1, zero
+L_102a518:
+// 0x0102a518: 0x102a518: jal   0x102be50 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102a510: 0x102a510: bne   v0, zero, 0x102a528 sll   zero, zero, 0
+// 0x0102a520: 0x102a520: bne   v0, zero, 0x102a538 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102a528
+	brtrue L_102a538
 // --- basic block ---
-L_102a518:
-// 0x0102a518: 0x102a518: jal   0x102be38 sll   zero, zero, 0
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+L_102a528:
+// 0x0102a528: 0x102a528: jal   0x102be48 sll   zero, zero, 0
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x0102a520: 0x102a520: j	 0x102a580 sll   zero, zero, 0
-	br L_102a580
+// 0x0102a530: 0x102a530: j	 0x102a590 sll   zero, zero, 0
+	br L_102a590
 // --- basic block ---
-L_102a528:
-// 0x0102a528: 0x102a528: beq   s4, zero, 0x102a550 addiu v0, s0, 56
+L_102a538:
+// 0x0102a538: 0x102a538: beq   s4, zero, 0x102a560 addiu v0, s0, 56
 	ldloc 15
 	ldloc 8
 	ldc.i4.s 56
 	add
 	stloc 5
-	brfalse L_102a550
+	brfalse L_102a560
 // --- basic block ---
-// 0x0102a530: 0x102a530: lw    a2, 20(s3)
+// 0x0102a540: 0x102a540: lw    a2, 20(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -3197,7 +3197,7 @@ L_102a528:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102a534: 0x102a534: lw    a3, 20(s0)
+// 0x0102a544: 0x102a544: lw    a3, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3206,13 +3206,13 @@ L_102a528:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102a538: 0x102a538: addu  a0, s6, zero
+// 0x0102a548: 0x102a548: addu  a0, s6, zero
 	ldloc 11
 	stloc.1
-// 0x0102a53c: 0x102a53c: addu  a1, s4, zero
+// 0x0102a54c: 0x102a54c: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x0102a540: 0x102a540: jal   0x102bee0 sw    v0, 16(sp)
+// 0x0102a550: 0x102a550: jal   0x102bef0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3226,32 +3226,32 @@ L_102a528:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_fuzzy_connected_102bee0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_connected_102bef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102a548: 0x102a548: j	 0x102a55c addu  a0, s2, zero
+// 0x0102a558: 0x102a558: j	 0x102a56c addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-	br L_102a55c
+	br L_102a56c
 // --- basic block ---
-L_102a550:
-// 0x0102a550: 0x102a550: jal   0x102be2c addu  a0, zero, zero
+L_102a560:
+// 0x0102a560: 0x102a560: jal   0x102be3c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_not_102be2c(int32)
+	call int32 Cibyl32::roadmap_fuzzy_not_102be3c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102a558: 0x102a558: addu  a0, s2, zero
+// 0x0102a568: 0x102a568: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-L_102a55c:
-// 0x0102a55c: 0x102a55c: addu  a1, s1, zero
+L_102a56c:
+// 0x0102a56c: 0x102a56c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0102a560: 0x102a560: sw    v0, 72(s0)
+// 0x0102a570: 0x102a570: sw    v0, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3260,7 +3260,7 @@ L_102a55c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102a564: 0x102a564: sw    s1, 64(s0)
+// 0x0102a574: 0x102a574: sw    s1, 64(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3269,7 +3269,7 @@ L_102a55c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102a568: 0x102a568: sw    s2, 68(s0)
+// 0x0102a578: 0x102a578: sw    s2, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3278,28 +3278,28 @@ L_102a55c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102a56c: 0x102a56c: jal   0x102bdf0 addu  s3, v0, zero
+// 0x0102a57c: 0x102a57c: jal   0x102be00 addu  s3, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl32::roadmap_fuzzy_and_102bdf0(int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_and_102be00(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102a574: 0x102a574: addu  a1, v0, zero
+// 0x0102a584: 0x102a584: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102a578: 0x102a578: jal   0x102bdf0 addu  a0, s3, zero
+// 0x0102a588: 0x102a588: jal   0x102be00 addu  a0, s3, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl32::roadmap_fuzzy_and_102bdf0(int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_and_102be00(int32,int32)
 	stloc 5
 // --- basic block ---
-L_102a580:
-// 0x0102a580: 0x102a580: lw    ra, 60(sp)
-// 0x0102a584: 0x102a584: lw    s8, 56(sp)
+L_102a590:
+// 0x0102a590: 0x102a590: lw    ra, 60(sp)
+// 0x0102a594: 0x102a594: lw    s8, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3308,7 +3308,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102a588: 0x102a588: lw    s7, 52(sp)
+// 0x0102a598: 0x102a598: lw    s7, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3317,7 +3317,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0102a58c: 0x102a58c: lw    s6, 48(sp)
+// 0x0102a59c: 0x102a59c: lw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3326,7 +3326,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102a590: 0x102a590: lw    s5, 44(sp)
+// 0x0102a5a0: 0x102a5a0: lw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3335,7 +3335,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102a594: 0x102a594: lw    s4, 40(sp)
+// 0x0102a5a4: 0x102a5a4: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3344,7 +3344,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102a598: 0x102a598: lw    s3, 36(sp)
+// 0x0102a5a8: 0x102a5a8: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3353,7 +3353,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102a59c: 0x102a59c: lw    s2, 32(sp)
+// 0x0102a5ac: 0x102a5ac: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3362,7 +3362,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102a5a0: 0x102a5a0: lw    s1, 28(sp)
+// 0x0102a5b0: 0x102a5b0: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3371,7 +3371,7 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102a5a4: 0x102a5a4: lw    s0, 24(sp)
+// 0x0102a5b4: 0x102a5b4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3380,47 +3380,47 @@ L_102a580:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102a5a8: 0x102a5a8: jr    ra addiu sp, sp, 64
+// 0x0102a5b8: 0x102a5b8: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_102a5b0:
-// 0x0102a5b0: 0x102a5b0: bne   s5, v0, 0x102a5c4 addu  s8, zero, zero
+L_102a5c0:
+// 0x0102a5c0: 0x102a5c0: bne   s5, v0, 0x102a5d4 addu  s8, zero, zero
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	bne.un L_102a5c4
+	bne.un L_102a5d4
 // --- basic block ---
-// 0x0102a5b8: 0x102a5b8: j	 0x102a488 addiu a0, s6, 24
+// 0x0102a5c8: 0x102a5c8: j	 0x102a498 addiu a0, s6, 24
 	ldloc 11
 	ldc.i4.s 24
 	add
 	stloc.1
-	br L_102a488
+	br L_102a498
 // --- basic block ---
-L_102a5c0:
-// 0x0102a5c0: 0x102a5c0: addiu s5, zero, 2
+L_102a5d0:
+// 0x0102a5d0: 0x102a5d0: addiu s5, zero, 2
 	ldc.i4.2
 	stloc 10
-L_102a5c4:
-// 0x0102a5c4: 0x102a5c4: addu  s7, zero, zero
+L_102a5d4:
+// 0x0102a5d4: 0x102a5d4: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 16
-// 0x0102a5c8: 0x102a5c8: j	 0x102a4ac addu  s1, zero, zero
+// 0x0102a5d8: 0x102a5d8: j	 0x102a4bc addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_102a4ac
+	br L_102a4bc
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_enable_102a5d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_enable_102a5e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3455,41 +3455,41 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102a5d0:
-// 0x0102a5d0: 0x102a5d0: lui   a0, 0x0
+L_102a5e0:
+// 0x0102a5e0: 0x102a5e0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102a5d4: 0x102a5d4: lui   a1, 0x0
+// 0x0102a5e4: 0x102a5e4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102a5d8: 0x102a5d8: addiu sp, sp, -24
+// 0x0102a5e8: 0x102a5e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102a5dc: 0x102a5dc: addiu v1, zero, 1
+// 0x0102a5ec: 0x102a5ec: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0102a5e0: 0x102a5e0: lui   v0, 0x60000
+// 0x0102a5f0: 0x102a5f0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102a5e4: 0x102a5e4: addiu a0, a0, 6700
+// 0x0102a5f4: 0x102a5f4: addiu a0, a0, 6700
 	ldloc.1
 	ldc.i4 6700
 	add
 	stloc.1
-// 0x0102a5e8: 0x102a5e8: addiu a1, a1, 20820
+// 0x0102a5f8: 0x102a5f8: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x0102a5ec: 0x102a5ec: sw    ra, 20(sp)
-// 0x0102a5f0: 0x102a5f0: jal   0x100e5c0 sw    v1, -25432(v0)
+// 0x0102a5fc: 0x102a5fc: sw    ra, 20(sp)
+// 0x0102a600: 0x102a600: jal   0x100e5d0 sw    v1, -24968(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6358
+	ldc.i4 -6242
 	add
 	ldloc 6
 	stelem.i4
@@ -3498,14 +3498,14 @@ L_102a5d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a5f8: 0x102a5f8: lw    ra, 20(sp)
-// 0x0102a5fc: 0x102a5fc: sll   zero, zero, 0
-// 0x0102a600: 0x102a600: jr    ra addiu sp, sp, 24
+// 0x0102a608: 0x102a608: lw    ra, 20(sp)
+// 0x0102a60c: 0x102a60c: sll   zero, zero, 0
+// 0x0102a610: 0x102a610: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3517,7 +3517,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_disable_102a608(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_disable_102a618(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3552,30 +3552,30 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102a608:
-// 0x0102a608: 0x102a608: lui   a0, 0x10000
+L_102a618:
+// 0x0102a618: 0x102a618: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102a60c: 0x102a60c: addiu sp, sp, -24
+// 0x0102a61c: 0x102a61c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102a610: 0x102a610: lui   v0, 0x60000
+// 0x0102a620: 0x102a620: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102a614: 0x102a614: addiu a0, a0, -31048
+// 0x0102a624: 0x102a624: addiu a0, a0, -31048
 	ldloc.1
 	ldc.i4 -31048
 	add
 	stloc.1
-// 0x0102a618: 0x102a618: sw    ra, 20(sp)
-// 0x0102a61c: 0x102a61c: jal   0x1019564 sw    zero, -25432(v0)
+// 0x0102a628: 0x102a628: sw    ra, 20(sp)
+// 0x0102a62c: 0x102a62c: jal   0x1019574 sw    zero, -24968(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6358
+	ldc.i4 -6242
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3584,15 +3584,15 @@ L_102a608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a624: 0x102a624: lui   a0, 0x10000
+// 0x0102a634: 0x102a634: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102a628: 0x102a628: jal   0x1019564 addiu a0, a0, -31180
+// 0x0102a638: 0x102a638: jal   0x1019574 addiu a0, a0, -31180
 	ldloc.1
 	ldc.i4 -31180
 	add
@@ -3602,25 +3602,25 @@ L_102a608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a630: 0x102a630: lui   a0, 0x0
+// 0x0102a640: 0x102a640: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102a634: 0x102a634: lui   a1, 0x20000
+// 0x0102a644: 0x102a644: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0102a638: 0x102a638: addiu a0, a0, 6700
+// 0x0102a648: 0x102a648: addiu a0, a0, 6700
 	ldloc.1
 	ldc.i4 6700
 	add
 	stloc.1
-// 0x0102a63c: 0x102a63c: jal   0x100e5c0 addiu a1, a1, 9464
+// 0x0102a64c: 0x102a64c: jal   0x100e5d0 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -3628,14 +3628,14 @@ L_102a608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102a644: 0x102a644: lw    ra, 20(sp)
-// 0x0102a648: 0x102a648: sll   zero, zero, 0
-// 0x0102a64c: 0x102a64c: jr    ra addiu sp, sp, 24
+// 0x0102a654: 0x102a654: lw    ra, 20(sp)
+// 0x0102a658: 0x102a658: sll   zero, zero, 0
+// 0x0102a65c: 0x102a65c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3647,7 +3647,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_adjust_focus_102a654(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_adjust_focus_102a664(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 ra)
@@ -3685,12 +3685,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102a654: 0x102a654: addiu sp, sp, -32
+// 0x0102a664: 0x102a664: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102a658: 0x102a658: sw    s0, 24(sp)
+// 0x0102a668: 0x102a668: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3699,17 +3699,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102a65c: 0x102a65c: addiu a2, zero, 1
+// 0x0102a66c: 0x102a66c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0102a660: 0x102a660: addu  s0, a0, zero
+// 0x0102a670: 0x102a670: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0102a664: 0x102a664: addu  a0, a1, zero
+// 0x0102a674: 0x102a674: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0102a668: 0x102a668: sw    ra, 28(sp)
-// 0x0102a66c: 0x102a66c: jal   0x1007a6c addiu a1, sp, 16
+// 0x0102a678: 0x102a678: sw    ra, 28(sp)
+// 0x0102a67c: 0x102a67c: jal   0x1007a7c addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3719,12 +3719,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0102a674: 0x102a674: lw    v0, 16(sp)
+// 0x0102a684: 0x102a684: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3733,7 +3733,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a678: 0x102a678: lw    v1, 8(s0)
+// 0x0102a688: 0x102a688: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3742,17 +3742,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a67c: 0x102a67c: sll   zero, zero, 0
-// 0x0102a680: 0x102a680: slt   v1, v0, v1
+// 0x0102a68c: 0x102a68c: sll   zero, zero, 0
+// 0x0102a690: 0x102a690: slt   v1, v0, v1
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102a684: 0x102a684: beq   v1, zero, 0x102a690 sll   zero, zero, 0
+// 0x0102a694: 0x102a694: beq   v1, zero, 0x102a6a0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102a690
+	brfalse L_102a6a0
 // --- basic block ---
-// 0x0102a68c: 0x102a68c: sw    v0, 8(s0)
+// 0x0102a69c: 0x102a69c: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3761,33 +3761,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-L_102a690:
-// 0x0102a690: 0x102a690: lw    v1, 0(s0)
+L_102a6a0:
+// 0x0102a6a0: 0x102a6a0: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102a694: 0x102a694: sll   zero, zero, 0
-// 0x0102a698: 0x102a698: slt   v1, v1, v0
+// 0x0102a6a4: 0x102a6a4: sll   zero, zero, 0
+// 0x0102a6a8: 0x102a6a8: slt   v1, v1, v0
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x0102a69c: 0x102a69c: beq   v1, zero, 0x102a6a8 sll   zero, zero, 0
+// 0x0102a6ac: 0x102a6ac: beq   v1, zero, 0x102a6b8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102a6a8
+	brfalse L_102a6b8
 // --- basic block ---
-// 0x0102a6a4: 0x102a6a4: sw    v0, 0(s0)
+// 0x0102a6b4: 0x102a6b4: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_102a6a8:
-// 0x0102a6a8: 0x102a6a8: lw    v0, 20(sp)
+L_102a6b8:
+// 0x0102a6b8: 0x102a6b8: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3796,7 +3796,7 @@ L_102a6a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a6ac: 0x102a6ac: lw    v1, 12(s0)
+// 0x0102a6bc: 0x102a6bc: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3805,17 +3805,17 @@ L_102a6a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a6b0: 0x102a6b0: sll   zero, zero, 0
-// 0x0102a6b4: 0x102a6b4: slt   v1, v0, v1
+// 0x0102a6c0: 0x102a6c0: sll   zero, zero, 0
+// 0x0102a6c4: 0x102a6c4: slt   v1, v0, v1
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102a6b8: 0x102a6b8: beq   v1, zero, 0x102a6c4 sll   zero, zero, 0
+// 0x0102a6c8: 0x102a6c8: beq   v1, zero, 0x102a6d4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102a6c4
+	brfalse L_102a6d4
 // --- basic block ---
-// 0x0102a6c0: 0x102a6c0: sw    v0, 12(s0)
+// 0x0102a6d0: 0x102a6d0: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3824,8 +3824,8 @@ L_102a6a8:
 	add
 	ldloc 7
 	stelem.i4
-L_102a6c4:
-// 0x0102a6c4: 0x102a6c4: lw    v1, 4(s0)
+L_102a6d4:
+// 0x0102a6d4: 0x102a6d4: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3834,17 +3834,17 @@ L_102a6c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102a6c8: 0x102a6c8: sll   zero, zero, 0
-// 0x0102a6cc: 0x102a6cc: slt   v1, v1, v0
+// 0x0102a6d8: 0x102a6d8: sll   zero, zero, 0
+// 0x0102a6dc: 0x102a6dc: slt   v1, v1, v0
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x0102a6d0: 0x102a6d0: beq   v1, zero, 0x102a6dc sll   zero, zero, 0
+// 0x0102a6e0: 0x102a6e0: beq   v1, zero, 0x102a6ec sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102a6dc
+	brfalse L_102a6ec
 // --- basic block ---
-// 0x0102a6d8: 0x102a6d8: sw    v0, 4(s0)
+// 0x0102a6e8: 0x102a6e8: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3853,9 +3853,9 @@ L_102a6c4:
 	add
 	ldloc 7
 	stelem.i4
-L_102a6dc:
-// 0x0102a6dc: 0x102a6dc: lw    ra, 28(sp)
-// 0x0102a6e0: 0x102a6e0: lw    s0, 24(sp)
+L_102a6ec:
+// 0x0102a6ec: 0x102a6ec: lw    ra, 28(sp)
+// 0x0102a6f0: 0x102a6f0: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3864,7 +3864,7 @@ L_102a6dc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102a6e4: 0x102a6e4: jr    ra addiu sp, sp, 32
+// 0x0102a6f4: 0x102a6f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3876,7 +3876,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_navigate_get_neighbours_102a6ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_get_neighbours_102a6fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s5,int32 s0,int32 s7,int32 lo,int32 s2,int32 s3,int32 s4,int32 s6,int32 ra,int32 t0,int32 t1)
@@ -3944,27 +3944,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102a6ec: 0x102a6ec: lui   v1, 0xe0000
+// 0x0102a6fc: 0x102a6fc: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x0102a6f0: 0x102a6f0: addiu sp, sp, -624
+// 0x0102a700: 0x102a700: addiu sp, sp, -624
 	ldloc.0
 	ldc.i4 -624
 	add
 	stloc.0
-// 0x0102a6f4: 0x102a6f4: addiu v1, v1, 29604
+// 0x0102a704: 0x102a704: addiu v1, v1, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x0102a6f8: 0x102a6f8: lw    v0, 0(a0)
+// 0x0102a708: 0x102a708: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102a6fc: 0x102a6fc: sw    s0, 588(sp)
+// 0x0102a70c: 0x102a70c: sw    s0, 588(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3973,10 +3973,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102a700: 0x102a700: addu  s0, a0, zero
+// 0x0102a710: 0x102a710: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0102a704: 0x102a704: lw    a0, 56(v1)
+// 0x0102a714: 0x102a714: lw    a0, 56(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3985,7 +3985,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a708: 0x102a708: sw    s6, 612(sp)
+// 0x0102a718: 0x102a718: sw    s6, 612(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3994,12 +3994,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0102a70c: 0x102a70c: slt   a0, a0, v0
+// 0x0102a71c: 0x102a71c: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0102a710: 0x102a710: sw    s4, 604(sp)
+// 0x0102a720: 0x102a720: sw    s4, 604(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4008,7 +4008,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102a714: 0x102a714: sw    s3, 600(sp)
+// 0x0102a724: 0x102a724: sw    s3, 600(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4017,7 +4017,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102a718: 0x102a718: sw    s2, 596(sp)
+// 0x0102a728: 0x102a728: sw    s2, 596(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4026,8 +4026,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102a71c: 0x102a71c: sw    ra, 620(sp)
-// 0x0102a720: 0x102a720: sw    s7, 616(sp)
+// 0x0102a72c: 0x102a72c: sw    ra, 620(sp)
+// 0x0102a730: 0x102a730: sw    s7, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4036,7 +4036,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102a724: 0x102a724: sw    s5, 608(sp)
+// 0x0102a734: 0x102a734: sw    s5, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4045,7 +4045,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102a728: 0x102a728: sw    s1, 592(sp)
+// 0x0102a738: 0x102a738: sw    s1, 592(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4054,10 +4054,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102a72c: 0x102a72c: addu  s6, a1, zero
+// 0x0102a73c: 0x102a73c: addu  s6, a1, zero
 	ldloc.2
 	stloc 16
-// 0x0102a730: 0x102a730: lw    s3, 640(sp)
+// 0x0102a740: 0x102a740: lw    s3, 640(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4066,7 +4066,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102a734: 0x102a734: lw    s4, 644(sp)
+// 0x0102a744: 0x102a744: lw    s4, 644(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4075,13 +4075,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102a738: 0x102a738: bne   a0, zero, 0x102a780 addu  s2, a3, zero
+// 0x0102a748: 0x102a748: bne   a0, zero, 0x102a790 addu  s2, a3, zero
 	ldloc.1
 	ldloc 4
 	stloc 13
-	brtrue L_102a780
+	brtrue L_102a790
 // --- basic block ---
-// 0x0102a740: 0x102a740: lw    a0, 64(v1)
+// 0x0102a750: 0x102a750: lw    a0, 64(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4090,17 +4090,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a744: 0x102a744: sll   zero, zero, 0
-// 0x0102a748: 0x102a748: slt   a0, v0, a0
+// 0x0102a754: 0x102a754: sll   zero, zero, 0
+// 0x0102a758: 0x102a758: slt   a0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc.1
-// 0x0102a74c: 0x102a74c: bne   a0, zero, 0x102a780 sll   zero, zero, 0
+// 0x0102a75c: 0x102a75c: bne   a0, zero, 0x102a790 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_102a780
+	brtrue L_102a790
 // --- basic block ---
-// 0x0102a754: 0x102a754: lw    a3, 4(s0)
+// 0x0102a764: 0x102a764: lw    a3, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4109,7 +4109,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102a758: 0x102a758: lw    a0, 60(v1)
+// 0x0102a768: 0x102a768: lw    a0, 60(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4118,17 +4118,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a75c: 0x102a75c: sll   zero, zero, 0
-// 0x0102a760: 0x102a760: slt   a0, a0, a3
+// 0x0102a76c: 0x102a76c: sll   zero, zero, 0
+// 0x0102a770: 0x102a770: slt   a0, a0, a3
 	ldloc.1
 	ldloc 4
 	clt
 	stloc.1
-// 0x0102a764: 0x102a764: bne   a0, zero, 0x102a780 sll   zero, zero, 0
+// 0x0102a774: 0x102a774: bne   a0, zero, 0x102a790 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_102a780
+	brtrue L_102a790
 // --- basic block ---
-// 0x0102a76c: 0x102a76c: lw    a0, 68(v1)
+// 0x0102a77c: 0x102a77c: lw    a0, 68(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4137,30 +4137,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a770: 0x102a770: sll   zero, zero, 0
-// 0x0102a774: 0x102a774: slt   a0, a3, a0
+// 0x0102a780: 0x102a780: sll   zero, zero, 0
+// 0x0102a784: 0x102a784: slt   a0, a3, a0
 	ldloc 4
 	ldloc.1
 	clt
 	stloc.1
-// 0x0102a778: 0x102a778: beq   a0, zero, 0x102a868 addiu s1, sp, 32
+// 0x0102a788: 0x102a788: beq   a0, zero, 0x102a878 addiu s1, sp, 32
 	ldloc.1
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
-	brfalse L_102a868
+	brfalse L_102a878
 // --- basic block ---
-L_102a780:
-// 0x0102a780: 0x102a780: addiu v1, zero, 100
+L_102a790:
+// 0x0102a790: 0x102a790: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x0102a784: 0x102a784: mult  a2, v1
+// 0x0102a794: 0x102a794: mult  a2, v1
 	ldloc.3
 	ldloc 7
 	mul
 	stloc 12
-// 0x0102a788: 0x102a788: lw    v1, 4(s0)
+// 0x0102a798: 0x102a798: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4169,30 +4169,30 @@ L_102a780:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a78c: 0x102a78c: mflo  lo
+// 0x0102a79c: 0x102a79c: mflo  lo
 	ldloc 12
 	stloc.3
-// 0x0102a790: 0x102a790: addu  a1, a2, v0
+// 0x0102a7a0: 0x102a7a0: addu  a1, a2, v0
 	ldloc.3
 	ldloc 6
 	add
 	stloc.2
-// 0x0102a794: 0x102a794: subu  a0, v1, a2
+// 0x0102a7a4: 0x102a7a4: subu  a0, v1, a2
 	ldloc 7
 	ldloc.3
 	sub
 	stloc.1
-// 0x0102a798: 0x102a798: subu  v0, v0, a2
+// 0x0102a7a8: 0x102a7a8: subu  v0, v0, a2
 	ldloc 6
 	ldloc.3
 	sub
 	stloc 6
-// 0x0102a79c: 0x102a79c: addu  a2, a2, v1
+// 0x0102a7ac: 0x102a7ac: addu  a2, a2, v1
 	ldloc.3
 	ldloc 7
 	add
 	stloc.3
-// 0x0102a7a0: 0x102a7a0: sw    v0, 56(sp)
+// 0x0102a7b0: 0x102a7b0: sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4201,7 +4201,7 @@ L_102a780:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102a7a4: 0x102a7a4: sw    a1, 48(sp)
+// 0x0102a7b4: 0x102a7b4: sw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4210,7 +4210,7 @@ L_102a780:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102a7a8: 0x102a7a8: sw    a2, 52(sp)
+// 0x0102a7b8: 0x102a7b8: sw    a2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4219,7 +4219,7 @@ L_102a780:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102a7ac: 0x102a7ac: sw    a0, 60(sp)
+// 0x0102a7bc: 0x102a7bc: sw    a0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4228,8 +4228,8 @@ L_102a780:
 	add
 	ldloc.1
 	stelem.i4
-L_102a7b0:
-// 0x0102a7b0: 0x102a7b0: lw    v1, 648(sp)
+L_102a7c0:
+// 0x0102a7c0: 0x102a7c0: lw    v1, 648(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4238,65 +4238,65 @@ L_102a7b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a7b4: 0x102a7b4: addiu v0, zero, 1
+// 0x0102a7c4: 0x102a7c4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0102a7b8: 0x102a7b8: bne   v1, v0, 0x102a7d0 addiu a0, sp, 64
+// 0x0102a7c8: 0x102a7c8: bne   v1, v0, 0x102a7e0 addiu a0, sp, 64
 	ldloc 7
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-	bne.un L_102a7d0
+	bne.un L_102a7e0
 // --- basic block ---
-// 0x0102a7c0: 0x102a7c0: jal   0x1010234 addiu a1, zero, 128
+// 0x0102a7d0: 0x102a7d0: jal   0x1010244 addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_visible_roads_1010234(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_visible_roads_1010244(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a7c8: 0x102a7c8: j	 0x102a7dc addu  s1, v0, zero
+// 0x0102a7d8: 0x102a7d8: j	 0x102a7ec addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-	br L_102a7dc
+	br L_102a7ec
 // --- basic block ---
-L_102a7d0:
-// 0x0102a7d0: 0x102a7d0: jal   0x1010058 addiu a1, zero, 128
+L_102a7e0:
+// 0x0102a7e0: 0x102a7e0: jal   0x1010068 addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a7d8: 0x102a7d8: addu  s1, v0, zero
+// 0x0102a7e8: 0x102a7e8: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-L_102a7dc:
-// 0x0102a7dc: 0x102a7dc: blez  s1, 0x102a83c addu  v0, zero, zero
+L_102a7ec:
+// 0x0102a7ec: 0x102a7ec: blez  s1, 0x102a84c addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	ble L_102a83c
+	ble L_102a84c
 // --- basic block ---
-// 0x0102a7e4: 0x102a7e4: addiu a0, sp, 48
+// 0x0102a7f4: 0x102a7f4: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x0102a7e8: 0x102a7e8: jal   0x10076a8 addiu s5, sp, 64
+// 0x0102a7f8: 0x102a7f8: jal   0x10076b8 addiu s5, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4306,24 +4306,24 @@ L_102a7dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_focus_10076a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_focus_10076b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a7f0: 0x102a7f0: addu  a1, s6, zero
+// 0x0102a800: 0x102a800: addu  a1, s6, zero
 	ldloc 16
 	stloc.2
-// 0x0102a7f4: 0x102a7f4: addu  a0, s0, zero
+// 0x0102a804: 0x102a804: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0102a7f8: 0x102a7f8: addu  a2, s5, zero
+// 0x0102a808: 0x102a808: addu  a2, s5, zero
 	ldloc 9
 	stloc.3
-// 0x0102a7fc: 0x102a7fc: addu  a3, s1, zero
+// 0x0102a80c: 0x102a80c: addu  a3, s1, zero
 	ldloc 8
 	stloc 4
-// 0x0102a800: 0x102a800: sw    s2, 16(sp)
+// 0x0102a810: 0x102a810: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4332,7 +4332,7 @@ L_102a7dc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102a804: 0x102a804: sw    s3, 20(sp)
+// 0x0102a814: 0x102a814: sw    s3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4341,7 +4341,7 @@ L_102a7dc:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102a808: 0x102a808: jal   0x1013028 sw    s4, 24(sp)
+// 0x0102a818: 0x102a818: jal   0x1013038 sw    s4, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4355,24 +4355,24 @@ L_102a7dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a810: 0x102a810: addu  a0, s0, zero
+// 0x0102a820: 0x102a820: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0102a814: 0x102a814: addu  a1, s5, zero
+// 0x0102a824: 0x102a824: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x0102a818: 0x102a818: addu  a2, s1, zero
+// 0x0102a828: 0x102a828: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x0102a81c: 0x102a81c: addu  a3, s2, zero
+// 0x0102a82c: 0x102a82c: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0102a820: 0x102a820: sw    s3, 16(sp)
+// 0x0102a830: 0x102a830: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4381,7 +4381,7 @@ L_102a7dc:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102a824: 0x102a824: sw    v0, 20(sp)
+// 0x0102a834: 0x102a834: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4390,7 +4390,7 @@ L_102a7dc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102a828: 0x102a828: jal   0x1014978 sw    s4, 24(sp)
+// 0x0102a838: 0x102a838: jal   0x1014988 sw    s4, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4404,12 +4404,12 @@ L_102a7dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_closest_1014978(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_closest_1014988(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a830: 0x102a830: jal   0x1007718 sw    v0, 576(sp)
+// 0x0102a840: 0x102a840: jal   0x1007728 sw    v0, 576(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4423,12 +4423,12 @@ L_102a7dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_release_focus_1007718(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_release_focus_1007728(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a838: 0x102a838: lw    v0, 576(sp)
+// 0x0102a848: 0x102a848: lw    v0, 576(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4437,9 +4437,9 @@ L_102a7dc:
 	add
 	ldelem.i4
 	stloc 6
-L_102a83c:
-// 0x0102a83c: 0x102a83c: lw    ra, 620(sp)
-// 0x0102a840: 0x102a840: lw    s7, 616(sp)
+L_102a84c:
+// 0x0102a84c: 0x102a84c: lw    ra, 620(sp)
+// 0x0102a850: 0x102a850: lw    s7, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4448,7 +4448,7 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102a844: 0x102a844: lw    s6, 612(sp)
+// 0x0102a854: 0x102a854: lw    s6, 612(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4457,7 +4457,7 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0102a848: 0x102a848: lw    s5, 608(sp)
+// 0x0102a858: 0x102a858: lw    s5, 608(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4466,7 +4466,7 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102a84c: 0x102a84c: lw    s4, 604(sp)
+// 0x0102a85c: 0x102a85c: lw    s4, 604(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4475,7 +4475,7 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102a850: 0x102a850: lw    s3, 600(sp)
+// 0x0102a860: 0x102a860: lw    s3, 600(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4484,7 +4484,7 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102a854: 0x102a854: lw    s2, 596(sp)
+// 0x0102a864: 0x102a864: lw    s2, 596(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4493,7 +4493,7 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102a858: 0x102a858: lw    s1, 592(sp)
+// 0x0102a868: 0x102a868: lw    s1, 592(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4502,7 +4502,7 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102a85c: 0x102a85c: lw    s0, 588(sp)
+// 0x0102a86c: 0x102a86c: lw    s0, 588(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4511,15 +4511,15 @@ L_102a83c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102a860: 0x102a860: jr    ra addiu sp, sp, 624
+// 0x0102a870: 0x102a870: jr    ra addiu sp, sp, 624
 	ldloc.0
 	ldc.i4 624
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_102a868:
-// 0x0102a868: 0x102a868: lw    a0, 80(v1)
+L_102a878:
+// 0x0102a878: 0x102a878: lw    a0, 80(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4528,7 +4528,7 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102a86c: 0x102a86c: lw    t0, 32(v1)
+// 0x0102a87c: 0x102a87c: lw    t0, 32(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4537,17 +4537,17 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0102a870: 0x102a870: subu  v0, v0, a0
+// 0x0102a880: 0x102a880: subu  v0, v0, a0
 	ldloc 6
 	ldloc.1
 	sub
 	stloc 6
-// 0x0102a874: 0x102a874: div   v0, t0
+// 0x0102a884: 0x102a884: div   v0, t0
 	ldloc 6
 	ldloc 18
 	div
 	stloc 12
-// 0x0102a878: 0x102a878: lw    t1, 76(v1)
+// 0x0102a888: 0x102a888: lw    t1, 76(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4556,7 +4556,7 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0102a87c: 0x102a87c: lw    a1, 36(v1)
+// 0x0102a88c: 0x102a88c: lw    a1, 36(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4565,20 +4565,20 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102a880: 0x102a880: subu  v1, t1, a3
+// 0x0102a890: 0x102a890: subu  v1, t1, a3
 	ldloc 19
 	ldloc 4
 	sub
 	stloc 7
-// 0x0102a884: 0x102a884: addu  a0, s1, zero
+// 0x0102a894: 0x102a894: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102a888: 0x102a888: sll   s5, a2, 1
+// 0x0102a898: 0x102a898: sll   s5, a2, 1
 	ldloc.3
 	ldc.i4.1
 	shl
 	stloc 9
-// 0x0102a88c: 0x102a88c: sw    a2, 576(sp)
+// 0x0102a89c: 0x102a89c: sw    a2, 576(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4587,15 +4587,15 @@ L_102a868:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102a890: 0x102a890: addiu s7, sp, 48
+// 0x0102a8a0: 0x102a8a0: addiu s7, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 11
-// 0x0102a894: 0x102a894: mflo  lo
+// 0x0102a8a4: 0x102a8a4: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x0102a898: 0x102a898: sw    v0, 32(sp)
+// 0x0102a8a8: 0x102a8a8: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4604,16 +4604,16 @@ L_102a868:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102a89c: 0x102a89c: sll   zero, zero, 0
-// 0x0102a8a0: 0x102a8a0: div   v1, a1
+// 0x0102a8ac: 0x102a8ac: sll   zero, zero, 0
+// 0x0102a8b0: 0x102a8b0: div   v1, a1
 	ldloc 7
 	ldloc.2
 	div
 	stloc 12
-// 0x0102a8a4: 0x102a8a4: mflo  lo
+// 0x0102a8b4: 0x102a8b4: mflo  lo
 	ldloc 12
 	stloc.2
-// 0x0102a8a8: 0x102a8a8: jal   0x10073c4 sw    a1, 36(sp)
+// 0x0102a8b8: 0x102a8b8: jal   0x10073d4 sw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4627,12 +4627,12 @@ L_102a868:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a8b0: 0x102a8b0: lw    a2, 576(sp)
+// 0x0102a8c0: 0x102a8c0: lw    a2, 576(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4641,7 +4641,7 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102a8b4: 0x102a8b4: lw    v1, 32(sp)
+// 0x0102a8c4: 0x102a8c4: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4650,7 +4650,7 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a8b8: 0x102a8b8: lw    v0, 36(sp)
+// 0x0102a8c8: 0x102a8c8: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4659,28 +4659,28 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a8bc: 0x102a8bc: addu  v1, v1, a2
+// 0x0102a8cc: 0x102a8cc: addu  v1, v1, a2
 	ldloc 7
 	ldloc.3
 	add
 	stloc 7
-// 0x0102a8c0: 0x102a8c0: addu  v0, v0, a2
+// 0x0102a8d0: 0x102a8d0: addu  v0, v0, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc 6
-// 0x0102a8c4: 0x102a8c4: addu  a0, s1, zero
+// 0x0102a8d4: 0x102a8d4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102a8c8: 0x102a8c8: addiu a1, sp, 40
+// 0x0102a8d8: 0x102a8d8: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x0102a8cc: 0x102a8cc: addiu a2, zero, 1
+// 0x0102a8dc: 0x102a8dc: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0102a8d0: 0x102a8d0: sw    v1, 32(sp)
+// 0x0102a8e0: 0x102a8e0: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4689,7 +4689,7 @@ L_102a868:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102a8d4: 0x102a8d4: jal   0x1007a6c sw    v0, 36(sp)
+// 0x0102a8e4: 0x102a8e4: jal   0x1007a7c sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4703,12 +4703,12 @@ L_102a868:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a8dc: 0x102a8dc: lw    a2, 32(sp)
+// 0x0102a8ec: 0x102a8ec: lw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4717,7 +4717,7 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102a8e0: 0x102a8e0: lw    v1, 40(sp)
+// 0x0102a8f0: 0x102a8f0: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4726,7 +4726,7 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102a8e4: 0x102a8e4: lw    v0, 44(sp)
+// 0x0102a8f4: 0x102a8f4: lw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4735,18 +4735,18 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a8e8: 0x102a8e8: subu  a2, a2, s5
+// 0x0102a8f8: 0x102a8f8: subu  a2, a2, s5
 	ldloc.3
 	ldloc 9
 	sub
 	stloc.3
-// 0x0102a8ec: 0x102a8ec: addu  a0, s7, zero
+// 0x0102a8fc: 0x102a8fc: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x0102a8f0: 0x102a8f0: addu  a1, s1, zero
+// 0x0102a900: 0x102a900: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102a8f4: 0x102a8f4: sw    v1, 48(sp)
+// 0x0102a904: 0x102a904: sw    v1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4755,7 +4755,7 @@ L_102a868:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102a8f8: 0x102a8f8: sw    v0, 60(sp)
+// 0x0102a908: 0x102a908: sw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4764,7 +4764,7 @@ L_102a868:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102a8fc: 0x102a8fc: sw    a2, 32(sp)
+// 0x0102a90c: 0x102a90c: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4773,7 +4773,7 @@ L_102a868:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102a900: 0x102a900: sw    v1, 56(sp)
+// 0x0102a910: 0x102a910: sw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4782,7 +4782,7 @@ L_102a868:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102a904: 0x102a904: jal   0x102a654 sw    v0, 52(sp)
+// 0x0102a914: 0x102a914: jal   0x102a664 sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4796,12 +4796,12 @@ L_102a868:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_adjust_focus_102a654(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_adjust_focus_102a664(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a90c: 0x102a90c: lw    v0, 36(sp)
+// 0x0102a91c: 0x102a91c: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4810,18 +4810,18 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a910: 0x102a910: addu  a0, s7, zero
+// 0x0102a920: 0x102a920: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x0102a914: 0x102a914: subu  v0, v0, s5
+// 0x0102a924: 0x102a924: subu  v0, v0, s5
 	ldloc 6
 	ldloc 9
 	sub
 	stloc 6
-// 0x0102a918: 0x102a918: addu  a1, s1, zero
+// 0x0102a928: 0x102a928: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102a91c: 0x102a91c: jal   0x102a654 sw    v0, 36(sp)
+// 0x0102a92c: 0x102a92c: jal   0x102a664 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4835,12 +4835,12 @@ L_102a868:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_adjust_focus_102a654(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_adjust_focus_102a664(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a924: 0x102a924: lw    v0, 32(sp)
+// 0x0102a934: 0x102a934: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4849,18 +4849,18 @@ L_102a868:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102a928: 0x102a928: addu  a0, s7, zero
+// 0x0102a938: 0x102a938: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x0102a92c: 0x102a92c: addu  s5, v0, s5
+// 0x0102a93c: 0x102a93c: addu  s5, v0, s5
 	ldloc 6
 	ldloc 9
 	add
 	stloc 9
-// 0x0102a930: 0x102a930: addu  a1, s1, zero
+// 0x0102a940: 0x102a940: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102a934: 0x102a934: jal   0x102a654 sw    s5, 32(sp)
+// 0x0102a944: 0x102a944: jal   0x102a664 sw    s5, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4874,20 +4874,20 @@ L_102a868:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_adjust_focus_102a654(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_adjust_focus_102a664(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102a93c: 0x102a93c: j	 0x102a7b0 sll   zero, zero, 0
-	br L_102a7b0
+// 0x0102a94c: 0x102a94c: j	 0x102a7c0 sll   zero, zero, 0
+	br L_102a7c0
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_navigate_retrieve_line_102ac0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_retrieve_line_102ac1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4928,15 +4928,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102ac0c: 0x102ac0c: addiu sp, sp, -96
+// 0x0102ac1c: 0x102ac1c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0102ac10: 0x102ac10: addiu v0, zero, 1
+// 0x0102ac20: 0x102ac20: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102ac14: 0x102ac14: sw    v0, 20(sp)
+// 0x0102ac24: 0x102ac24: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4945,7 +4945,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ac18: 0x102ac18: lw    v0, 116(sp)
+// 0x0102ac28: 0x102ac28: lw    v0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4954,7 +4954,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ac1c: 0x102ac1c: sw    s1, 88(sp)
+// 0x0102ac2c: 0x102ac2c: sw    s1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4963,7 +4963,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102ac20: 0x102ac20: sw    s0, 84(sp)
+// 0x0102ac30: 0x102ac30: sw    s0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4972,19 +4972,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102ac24: 0x102ac24: addu  s1, a3, zero
+// 0x0102ac34: 0x102ac34: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x0102ac28: 0x102ac28: addiu s0, sp, 32
+// 0x0102ac38: 0x102ac38: addiu s0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
-// 0x0102ac2c: 0x102ac2c: addiu a3, zero, 1
+// 0x0102ac3c: 0x102ac3c: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0102ac30: 0x102ac30: sw    ra, 92(sp)
-// 0x0102ac34: 0x102ac34: sw    v0, 24(sp)
+// 0x0102ac40: 0x102ac40: sw    ra, 92(sp)
+// 0x0102ac44: 0x102ac44: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4993,7 +4993,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ac38: 0x102ac38: jal   0x102a6ec sw    s0, 16(sp)
+// 0x0102ac48: 0x102ac48: jal   0x102a6fc sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5007,19 +5007,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_neighbours_102a6ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_neighbours_102a6fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ac40: 0x102ac40: blez  v0, 0x102ac80 addiu v0, zero, -1
+// 0x0102ac50: 0x102ac50: blez  v0, 0x102ac90 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	ble L_102ac80
+	ble L_102ac90
 // --- basic block ---
-// 0x0102ac48: 0x102ac48: lw    v1, 52(sp)
+// 0x0102ac58: 0x102ac58: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5028,7 +5028,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102ac4c: 0x102ac4c: lw    v0, 112(sp)
+// 0x0102ac5c: 0x102ac5c: lw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5037,10 +5037,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ac50: 0x102ac50: addu  a0, s0, zero
+// 0x0102ac60: 0x102ac60: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102ac54: 0x102ac54: jal   0x1015474 sw    v1, 0(v0)
+// 0x0102ac64: 0x102ac64: jal   0x1015484 sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5052,25 +5052,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_activate_db_1015474(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_activate_db_1015484(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ac5c: 0x102ac5c: addiu v1, zero, -1
+// 0x0102ac6c: 0x102ac6c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0102ac60: 0x102ac60: beq   v0, v1, 0x102ac7c addu  a0, s1, zero
+// 0x0102ac70: 0x102ac70: beq   v0, v1, 0x102ac8c addu  a0, s1, zero
 	ldloc 5
 	ldloc 7
 	ldloc 9
 	stloc.1
-	beq  L_102ac7c
+	beq  L_102ac8c
 // --- basic block ---
-// 0x0102ac68: 0x102ac68: addu  a1, s0, zero
+// 0x0102ac78: 0x102ac78: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0102ac6c: 0x102ac6c: jal   0x1001800 addiu a2, zero, 20
+// 0x0102ac7c: 0x102ac7c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -5082,18 +5082,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ac74: 0x102ac74: j	 0x102ac80 addu  v0, zero, zero
+// 0x0102ac84: 0x102ac84: j	 0x102ac90 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_102ac80
+	br L_102ac90
 // --- basic block ---
-L_102ac7c:
-// 0x0102ac7c: 0x102ac7c: addiu v0, zero, -1
+L_102ac8c:
+// 0x0102ac8c: 0x102ac8c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_102ac80:
-// 0x0102ac80: 0x102ac80: lw    ra, 92(sp)
-// 0x0102ac84: 0x102ac84: lw    s1, 88(sp)
+L_102ac90:
+// 0x0102ac90: 0x102ac90: lw    ra, 92(sp)
+// 0x0102ac94: 0x102ac94: lw    s1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5102,7 +5102,7 @@ L_102ac80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102ac88: 0x102ac88: lw    s0, 84(sp)
+// 0x0102ac98: 0x102ac98: lw    s0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5111,7 +5111,7 @@ L_102ac80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102ac8c: 0x102ac8c: jr    ra addiu sp, sp, 96
+// 0x0102ac9c: 0x102ac9c: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -5123,7 +5123,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_126_102ac94(int32,int32,int32,int32,int32)
+.method public static int32 T_126_102aca4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s3,int32 s2,int32 s5,int32 s4,int32 s0,int32 s6,int32 s8,int32 s7,int32 ra)
@@ -5185,12 +5185,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102ac94: 0x102ac94: addiu sp, sp, -2128
+// 0x0102aca4: 0x102aca4: addiu sp, sp, -2128
 	ldloc.0
 	ldc.i4 -2128
 	add
 	stloc.0
-// 0x0102ac98: 0x102ac98: sw    s3, 2100(sp)
+// 0x0102aca8: 0x102aca8: sw    s3, 2100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5199,10 +5199,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102ac9c: 0x102ac9c: lui   s3, 0x0
+// 0x0102acac: 0x102acac: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0102aca0: 0x102aca0: sw    s2, 2096(sp)
+// 0x0102acb0: 0x102acb0: sw    s2, 2096(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5211,18 +5211,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102aca4: 0x102aca4: addiu s3, s3, 6556
+// 0x0102acb4: 0x102acb4: addiu s3, s3, 6556
 	ldloc 9
 	ldc.i4 6556
 	add
 	stloc 9
-// 0x0102aca8: 0x102aca8: lui   s2, 0x60000
+// 0x0102acb8: 0x102acb8: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x0102acac: 0x102acac: lui   a1, 0x0
+// 0x0102acbc: 0x102acbc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102acb0: 0x102acb0: sw    s1, 2092(sp)
+// 0x0102acc0: 0x102acc0: sw    s1, 2092(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102acb4: 0x102acb4: sw    s0, 2088(sp)
+// 0x0102acc4: 0x102acc4: sw    s0, 2088(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5240,7 +5240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102acb8: 0x102acb8: lw    s1, 16(s3)
+// 0x0102acc8: 0x102acc8: lw    s1, 16(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5249,19 +5249,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102acbc: 0x102acbc: addiu a1, a1, 6676
+// 0x0102accc: 0x102accc: addiu a1, a1, 6676
 	ldloc.2
 	ldc.i4 6676
 	add
 	stloc.2
-// 0x0102acc0: 0x102acc0: lui   v0, 0x0
+// 0x0102acd0: 0x102acd0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102acc4: 0x102acc4: addu  s0, a0, zero
+// 0x0102acd4: 0x102acd4: addu  s0, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0102acc8: 0x102acc8: sw    ra, 2124(sp)
-// 0x0102accc: 0x102accc: sw    s8, 2120(sp)
+// 0x0102acd8: 0x102acd8: sw    ra, 2124(sp)
+// 0x0102acdc: 0x102acdc: sw    s8, 2120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5270,7 +5270,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102acd0: 0x102acd0: sw    s7, 2116(sp)
+// 0x0102ace0: 0x102ace0: sw    s7, 2116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5279,7 +5279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0102acd4: 0x102acd4: sw    s6, 2112(sp)
+// 0x0102ace4: 0x102ace4: sw    s6, 2112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5288,7 +5288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102acd8: 0x102acd8: sw    s5, 2108(sp)
+// 0x0102ace8: 0x102ace8: sw    s5, 2108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5297,7 +5297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102acdc: 0x102acdc: sw    s4, 2104(sp)
+// 0x0102acec: 0x102acec: sw    s4, 2104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5306,7 +5306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102ace0: 0x102ace0: lw    s8, 1816(v0)
+// 0x0102acf0: 0x102acf0: lw    s8, 1816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5315,9 +5315,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102ace4: 0x102ace4: jal   0x1009824 addiu a0, s2, -25200
+// 0x0102acf4: 0x102acf4: jal   0x1009834 addiu a0, s2, -24736
 	ldloc 10
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.1
 	ldloc.0
@@ -5325,26 +5325,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102acec: 0x102acec: addu  a1, v0, zero
+// 0x0102acfc: 0x102acfc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102acf0: 0x102acf0: jal   0x1008410 addu  a0, s1, zero
+// 0x0102ad00: 0x102ad00: jal   0x1008420 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102acf8: 0x102acf8: lui   a1, 0x0
+// 0x0102ad08: 0x102ad08: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102acfc: 0x102acfc: lw    s3, 16(s3)
+// 0x0102ad0c: 0x102ad0c: lw    s3, 16(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5353,17 +5353,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102ad00: 0x102ad00: addiu a0, s2, -25200
+// 0x0102ad10: 0x102ad10: addiu a0, s2, -24736
 	ldloc 10
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.1
-// 0x0102ad04: 0x102ad04: addiu a1, a1, 6684
+// 0x0102ad14: 0x102ad14: addiu a1, a1, 6684
 	ldloc.2
 	ldc.i4 6684
 	add
 	stloc.2
-// 0x0102ad08: 0x102ad08: jal   0x1009824 addu  s1, v0, zero
+// 0x0102ad18: 0x102ad18: jal   0x1009834 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5371,44 +5371,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ad10: 0x102ad10: addu  a1, v0, zero
+// 0x0102ad20: 0x102ad20: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102ad14: 0x102ad14: jal   0x1008410 addu  a0, s3, zero
+// 0x0102ad24: 0x102ad24: jal   0x1008420 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102ad1c: 0x102ad1c: addiu v1, s1, -30
+// 0x0102ad2c: 0x102ad2c: addiu v1, s1, -30
 	ldloc 8
 	ldc.i4.s -30
 	add
 	stloc 6
-// 0x0102ad20: 0x102ad20: slt   v1, v0, v1
+// 0x0102ad30: 0x102ad30: slt   v1, v0, v1
 	ldloc 5
 	ldloc 6
 	clt
 	stloc 6
-// 0x0102ad24: 0x102ad24: beq   v1, zero, 0x102ad40 lui   a0, 0x0
+// 0x0102ad34: 0x102ad34: beq   v1, zero, 0x102ad50 lui   a0, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_102ad40
+	brfalse L_102ad50
 // --- basic block ---
-// 0x0102ad2c: 0x102ad2c: addiu a0, a0, 6652
+// 0x0102ad3c: 0x102ad3c: addiu a0, a0, 6652
 	ldloc.1
 	ldc.i4 6652
 	add
 	stloc.1
-// 0x0102ad30: 0x102ad30: jal   0x1014ccc addiu a1, sp, 16
+// 0x0102ad40: 0x102ad40: jal   0x1014cdc addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5418,40 +5418,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_to_1014ccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_to_1014cdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ad38: 0x102ad38: j	 0x102ad60 sll   zero, zero, 0
-	br L_102ad60
+// 0x0102ad48: 0x102ad48: j	 0x102ad70 sll   zero, zero, 0
+	br L_102ad70
 // --- basic block ---
-L_102ad40:
-// 0x0102ad40: 0x102ad40: addiu v0, v0, -30
+L_102ad50:
+// 0x0102ad50: 0x102ad50: addiu v0, v0, -30
 	ldloc 5
 	ldc.i4.s -30
 	add
 	stloc 5
-// 0x0102ad44: 0x102ad44: slt   s1, s1, v0
+// 0x0102ad54: 0x102ad54: slt   s1, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 8
-// 0x0102ad48: 0x102ad48: beq   s1, zero, 0x102b078 addu  v0, zero, zero
+// 0x0102ad58: 0x102ad58: beq   s1, zero, 0x102b088 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_102b078
+	brfalse L_102b088
 // --- basic block ---
-// 0x0102ad50: 0x102ad50: lui   a0, 0x0
+// 0x0102ad60: 0x102ad60: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102ad54: 0x102ad54: addiu a0, a0, 6652
+// 0x0102ad64: 0x102ad64: addiu a0, a0, 6652
 	ldloc.1
 	ldc.i4 6652
 	add
 	stloc.1
-// 0x0102ad58: 0x102ad58: jal   0x1014dd8 addiu a1, sp, 16
+// 0x0102ad68: 0x102ad68: jal   0x1014de8 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5461,25 +5461,25 @@ L_102ad40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_line_from_1014dd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_line_from_1014de8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102ad60:
-// 0x0102ad60: 0x102ad60: jal   0x102be38 sll   zero, zero, 0
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+L_102ad70:
+// 0x0102ad70: 0x102ad70: jal   0x102be48 sll   zero, zero, 0
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x0102ad68: 0x102ad68: addiu a0, sp, 16
+// 0x0102ad78: 0x102ad78: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0102ad6c: 0x102ad6c: addu  a1, zero, zero
+// 0x0102ad7c: 0x102ad7c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102ad70: 0x102ad70: jal   0x100b7a8 addu  s2, v0, zero
+// 0x0102ad80: 0x102ad80: jal   0x100b7b8 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -5487,25 +5487,25 @@ L_102ad60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ad78: 0x102ad78: addu  s1, v0, zero
+// 0x0102ad88: 0x102ad88: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0102ad7c: 0x102ad7c: addiu v0, zero, -1
+// 0x0102ad8c: 0x102ad8c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0102ad80: 0x102ad80: beq   s1, v0, 0x102aef8 lui   v0, 0x0
+// 0x0102ad90: 0x102ad90: beq   s1, v0, 0x102af08 lui   v0, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_102aef8
+	beq  L_102af08
 // --- basic block ---
-// 0x0102ad88: 0x102ad88: lw    v0, 576(v0)
+// 0x0102ad98: 0x102ad98: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5514,24 +5514,24 @@ L_102ad60:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ad8c: 0x102ad8c: sll   zero, zero, 0
-// 0x0102ad90: 0x102ad90: beq   s1, v0, 0x102adac lui   s5, 0x0
+// 0x0102ad9c: 0x102ad9c: sll   zero, zero, 0
+// 0x0102ada0: 0x102ada0: beq   s1, v0, 0x102adbc lui   s5, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	beq  L_102adac
+	beq  L_102adbc
 // --- basic block ---
-// 0x0102ad98: 0x102ad98: bltz  s1, 0x102adb0 addiu s5, s5, 6576
+// 0x0102ada8: 0x102ada8: bltz  s1, 0x102adc0 addiu s5, s5, 6576
 	ldloc 8
 	ldloc 11
 	ldc.i4 6576
 	add
 	stloc 11
 	ldc.i4.s 0
-	blt L_102adb0
+	blt L_102adc0
 // --- basic block ---
-// 0x0102ada0: 0x102ada0: jal   0x100b164 addu  a0, s1, zero
+// 0x0102adb0: 0x102adb0: jal   0x100b174 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5539,33 +5539,33 @@ L_102ad60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ada8: 0x102ada8: lui   s5, 0x0
+// 0x0102adb8: 0x102adb8: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 11
-L_102adac:
-// 0x0102adac: 0x102adac: addiu s5, s5, 6576
+L_102adbc:
+// 0x0102adbc: 0x102adbc: addiu s5, s5, 6576
 	ldloc 11
 	ldc.i4 6576
 	add
 	stloc 11
-L_102adb0:
-// 0x0102adb0: 0x102adb0: addiu s3, zero, 1
+L_102adc0:
+// 0x0102adc0: 0x102adc0: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 9
-L_102adb4:
-// 0x0102adb4: 0x102adb4: bltz  s1, 0x102aee8 lui   v1, 0x0
+L_102adc4:
+// 0x0102adc4: 0x102adc4: bltz  s1, 0x102aef8 lui   v1, 0x0
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	blt L_102aee8
+	blt L_102aef8
 // --- basic block ---
-// 0x0102adbc: 0x102adbc: lw    v0, 576(v1)
+// 0x0102adcc: 0x102adcc: lw    v0, 576(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5574,15 +5574,15 @@ L_102adb4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102adc0: 0x102adc0: sll   zero, zero, 0
-// 0x0102adc4: 0x102adc4: beq   s1, v0, 0x102add8 lui   a0, 0x20000
+// 0x0102add0: 0x102add0: sll   zero, zero, 0
+// 0x0102add4: 0x102add4: beq   s1, v0, 0x102ade8 lui   a0, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	beq  L_102add8
+	beq  L_102ade8
 // --- basic block ---
-// 0x0102adcc: 0x102adcc: jal   0x100b164 addu  a0, s1, zero
+// 0x0102addc: 0x102addc: jal   0x100b174 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5590,32 +5590,32 @@ L_102adb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102add4: 0x102add4: lui   a0, 0x20000
+// 0x0102ade4: 0x102ade4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_102add8:
-// 0x0102add8: 0x102add8: lw    v0, 31148(a0)
+L_102ade8:
+// 0x0102ade8: 0x102ade8: lw    v0, 31612(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102addc: 0x102addc: sll   zero, zero, 0
-// 0x0102ade0: 0x102ade0: beq   v0, zero, 0x102aee8 lui   v1, 0x7fff0000
+// 0x0102adec: 0x102adec: sll   zero, zero, 0
+// 0x0102adf0: 0x102adf0: beq   v0, zero, 0x102aef8 lui   v1, 0x7fff0000
 	ldloc 5
 	ldc.i4 2147418112
 	stloc 6
-	brfalse L_102aee8
+	brfalse L_102aef8
 // --- basic block ---
-// 0x0102ade8: 0x102ade8: lw    v0, 12(v0)
+// 0x0102adf8: 0x102adf8: lw    v0, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5624,50 +5624,50 @@ L_102add8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102adec: 0x102adec: ori   v1, v1, 65535
+// 0x0102adfc: 0x102adfc: ori   v1, v1, 65535
 	ldloc 6
 	ldc.i4 65535
 	or
 	stloc 6
-// 0x0102adf0: 0x102adf0: addu  a0, s3, v1
+// 0x0102ae00: 0x102ae00: addu  a0, s3, v1
 	ldloc 9
 	ldloc 6
 	add
 	stloc.1
-// 0x0102adf4: 0x102adf4: sll   v1, s3, 1
+// 0x0102ae04: 0x102ae04: sll   v1, s3, 1
 	ldloc 9
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x0102adf8: 0x102adf8: addu  v1, v0, v1
+// 0x0102ae08: 0x102ae08: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x0102adfc: 0x102adfc: sll   a0, a0, 1
+// 0x0102ae0c: 0x102ae0c: sll   a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
 	stloc.1
-// 0x0102ae00: 0x102ae00: addu  v0, v0, a0
+// 0x0102ae10: 0x102ae10: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x0102ae04: 0x102ae04: lhu   v1, 0(v1)
+// 0x0102ae14: 0x102ae14: lhu   v1, 0(v1)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x0102ae08: 0x102ae08: lhu   v0, 0(v0)
+// 0x0102ae18: 0x102ae18: lhu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x0102ae0c: 0x102ae0c: addiu v1, v1, -1
+// 0x0102ae1c: 0x102ae1c: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0102ae10: 0x102ae10: sw    v0, 2084(sp)
+// 0x0102ae20: 0x102ae20: sw    v0, 2084(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5676,12 +5676,12 @@ L_102add8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ae14: 0x102ae14: slt   v0, v1, v0
+// 0x0102ae24: 0x102ae24: slt   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102ae18: 0x102ae18: sw    v1, 2080(sp)
+// 0x0102ae28: 0x102ae28: sw    v1, 2080(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5690,21 +5690,21 @@ L_102add8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102ae1c: 0x102ae1c: beq   v0, zero, 0x102aec8 addu  s6, zero, zero
+// 0x0102ae2c: 0x102ae2c: beq   v0, zero, 0x102aed8 addu  s6, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 14
-	brfalse L_102aec8
+	brfalse L_102aed8
 // --- basic block ---
-// 0x0102ae24: 0x102ae24: j	 0x102aeec addiu s3, s3, 1
+// 0x0102ae34: 0x102ae34: j	 0x102aefc addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_102aeec
+	br L_102aefc
 // --- basic block ---
-L_102ae2c:
-// 0x0102ae2c: 0x102ae2c: sw    zero, 36(sp)
+L_102ae3c:
+// 0x0102ae3c: 0x102ae3c: sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5713,7 +5713,7 @@ L_102ae2c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102ae30: 0x102ae30: sw    s4, 40(sp)
+// 0x0102ae40: 0x102ae40: sw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5722,7 +5722,7 @@ L_102ae2c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102ae34: 0x102ae34: sw    s3, 44(sp)
+// 0x0102ae44: 0x102ae44: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5731,7 +5731,7 @@ L_102ae2c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102ae38: 0x102ae38: sw    s1, 48(sp)
+// 0x0102ae48: 0x102ae48: sw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5740,7 +5740,7 @@ L_102ae2c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102ae3c: 0x102ae3c: jal   0x101476c sw    s8, 52(sp)
+// 0x0102ae4c: 0x102ae4c: jal   0x101477c sw    s8, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5749,21 +5749,21 @@ L_102ae2c:
 	add
 	ldloc 15
 	stelem.i4
-	call int32 Cibyl14::roadmap_plugin_override_line_101476c()
+	call int32 Cibyl14::roadmap_plugin_override_line_101477c()
 	stloc 5
 // --- basic block ---
-// 0x0102ae44: 0x102ae44: bne   v0, zero, 0x102aebc lui   a0, 0x0
+// 0x0102ae54: 0x102ae54: bne   v0, zero, 0x102aecc lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_102aebc
+	brtrue L_102aecc
 // --- basic block ---
-// 0x0102ae4c: 0x102ae4c: addiu a0, a0, 6556
+// 0x0102ae5c: 0x102ae5c: addiu a0, a0, 6556
 	ldloc.1
 	ldc.i4 6556
 	add
 	stloc.1
-// 0x0102ae50: 0x102ae50: lw    a1, 16(a0)
+// 0x0102ae60: 0x102ae60: lw    a1, 16(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5772,12 +5772,12 @@ L_102ae2c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102ae54: 0x102ae54: addiu a2, sp, 16
+// 0x0102ae64: 0x102ae64: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x0102ae58: 0x102ae58: jal   0x102a088 addiu a0, sp, 36
+// 0x0102ae68: 0x102ae68: jal   0x102a098 addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -5787,26 +5787,26 @@ L_102ae2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_is_intersection_102a088(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_is_intersection_102a098(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ae60: 0x102ae60: addu  s7, v0, zero
+// 0x0102ae70: 0x102ae70: addu  s7, v0, zero
 	ldloc 5
 	stloc 16
-// 0x0102ae64: 0x102ae64: slt   v0, s2, v0
+// 0x0102ae74: 0x102ae74: slt   v0, s2, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102ae68: 0x102ae68: beq   v0, zero, 0x102aebc addu  a0, s4, zero
+// 0x0102ae78: 0x102ae78: beq   v0, zero, 0x102aecc addu  a0, s4, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brfalse L_102aebc
+	brfalse L_102aecc
 // --- basic block ---
-// 0x0102ae70: 0x102ae70: jal   0x1011a4c addiu a1, sp, 56
+// 0x0102ae80: 0x102ae80: jal   0x1011a5c addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5816,12 +5816,12 @@ L_102ae2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ae78: 0x102ae78: lw    v0, 72(sp)
+// 0x0102ae88: 0x102ae88: lw    v0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5830,22 +5830,22 @@ L_102ae2c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ae7c: 0x102ae7c: addu  a0, s0, zero
+// 0x0102ae8c: 0x102ae8c: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x0102ae80: 0x102ae80: addiu a1, sp, 36
+// 0x0102ae90: 0x102ae90: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0102ae84: 0x102ae84: blez  v0, 0x102aebc addiu a2, zero, 20
+// 0x0102ae94: 0x102ae94: blez  v0, 0x102aecc addiu a2, zero, 20
 	ldloc 5
 	ldc.i4.s 20
 	stloc.3
 	ldc.i4.s 0
-	ble L_102aebc
+	ble L_102aecc
 // --- basic block ---
-// 0x0102ae8c: 0x102ae8c: lw    v1, 4(s5)
+// 0x0102ae9c: 0x102ae9c: lw    v1, 4(s5)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -5854,12 +5854,12 @@ L_102ae2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102ae90: 0x102ae90: sll   zero, zero, 0
-// 0x0102ae94: 0x102ae94: bne   v1, zero, 0x102b0a8 sll   zero, zero, 0
+// 0x0102aea0: 0x102aea0: sll   zero, zero, 0
+// 0x0102aea4: 0x102aea4: bne   v1, zero, 0x102b0b8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_102b0a8
+	brtrue L_102b0b8
 // --- basic block ---
-// 0x0102ae9c: 0x102ae9c: lw    v1, 8(s5)
+// 0x0102aeac: 0x102aeac: lw    v1, 8(s5)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -5868,13 +5868,13 @@ L_102ae2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102aea0: 0x102aea0: sll   zero, zero, 0
-// 0x0102aea4: 0x102aea4: bne   s1, v1, 0x102b0a8 sll   zero, zero, 0
+// 0x0102aeb0: 0x102aeb0: sll   zero, zero, 0
+// 0x0102aeb4: 0x102aeb4: bne   s1, v1, 0x102b0b8 sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	bne.un L_102b0a8
+	bne.un L_102b0b8
 // --- basic block ---
-// 0x0102aeac: 0x102aeac: lw    v1, 12(s5)
+// 0x0102aebc: 0x102aebc: lw    v1, 12(s5)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -5883,26 +5883,26 @@ L_102ae2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102aeb0: 0x102aeb0: sll   zero, zero, 0
-// 0x0102aeb4: 0x102aeb4: bne   v0, v1, 0x102b0a8 sll   zero, zero, 0
+// 0x0102aec0: 0x102aec0: sll   zero, zero, 0
+// 0x0102aec4: 0x102aec4: bne   v0, v1, 0x102b0b8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_102b0a8
+	bne.un L_102b0b8
 // --- basic block ---
-L_102aebc:
-// 0x0102aebc: 0x102aebc: addu  s7, s2, zero
+L_102aecc:
+// 0x0102aecc: 0x102aecc: addu  s7, s2, zero
 	ldloc 10
 	stloc 16
-// 0x0102aec0: 0x102aec0: addiu s6, s6, 1
+// 0x0102aed0: 0x102aed0: addiu s6, s6, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x0102aec4: 0x102aec4: addu  s2, s7, zero
+// 0x0102aed4: 0x102aed4: addu  s2, s7, zero
 	ldloc 16
 	stloc 10
-L_102aec8:
-// 0x0102aec8: 0x102aec8: lw    v0, 2084(sp)
+L_102aed8:
+// 0x0102aed8: 0x102aed8: lw    v0, 2084(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5911,7 +5911,7 @@ L_102aec8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102aecc: 0x102aecc: lw    v1, 2080(sp)
+// 0x0102aedc: 0x102aedc: lw    v1, 2080(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5920,61 +5920,61 @@ L_102aec8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102aed0: 0x102aed0: addu  s4, s6, v0
+// 0x0102aee0: 0x102aee0: addu  s4, s6, v0
 	ldloc 14
 	ldloc 5
 	add
 	stloc 12
-// 0x0102aed4: 0x102aed4: slt   v0, v1, s4
+// 0x0102aee4: 0x102aee4: slt   v0, v1, s4
 	ldloc 6
 	ldloc 12
 	clt
 	stloc 5
-// 0x0102aed8: 0x102aed8: addu  a0, s4, zero
+// 0x0102aee8: 0x102aee8: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0102aedc: 0x102aedc: addu  a1, s3, zero
+// 0x0102aeec: 0x102aeec: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0102aee0: 0x102aee0: beq   v0, zero, 0x102ae2c addu  a2, s8, zero
+// 0x0102aef0: 0x102aef0: beq   v0, zero, 0x102ae3c addu  a2, s8, zero
 	ldloc 5
 	ldloc 15
 	stloc.3
-	brfalse L_102ae2c
+	brfalse L_102ae3c
 // --- basic block ---
-L_102aee8:
-// 0x0102aee8: 0x102aee8: addiu s3, s3, 1
+L_102aef8:
+// 0x0102aef8: 0x102aef8: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_102aeec:
-// 0x0102aeec: 0x102aeec: addiu a0, zero, 12
+L_102aefc:
+// 0x0102aefc: 0x102aefc: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0102aef0: 0x102aef0: bne   s3, a0, 0x102adb4 sll   zero, zero, 0
+// 0x0102af00: 0x102af00: bne   s3, a0, 0x102adc4 sll   zero, zero, 0
 	ldloc 9
 	ldloc.1
-	bne.un L_102adb4
+	bne.un L_102adc4
 // --- basic block ---
-L_102aef8:
-// 0x0102aef8: 0x102aef8: addiu s3, sp, 16
+L_102af08:
+// 0x0102af08: 0x102af08: addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x0102aefc: 0x102aefc: addiu s1, sp, 80
+// 0x0102af0c: 0x102af0c: addiu s1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 8
-// 0x0102af00: 0x102af00: addu  a0, s3, zero
+// 0x0102af10: 0x102af10: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0102af04: 0x102af04: addu  a1, s1, zero
+// 0x0102af14: 0x102af14: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102af08: 0x102af08: jal   0x1014808 addiu a2, zero, 100
+// 0x0102af18: 0x102af18: jal   0x1014818 addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.0
@@ -5982,21 +5982,21 @@ L_102aef8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_plugin_find_connected_lines_1014808(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_plugin_find_connected_lines_1014818(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102af10: 0x102af10: lui   s8, 0x0
+// 0x0102af20: 0x102af20: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x0102af14: 0x102af14: lui   s4, 0x0
+// 0x0102af24: 0x102af24: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x0102af18: 0x102af18: addu  s7, s3, zero
+// 0x0102af28: 0x102af28: addu  s7, s3, zero
 	ldloc 9
 	stloc 16
-// 0x0102af1c: 0x102af1c: sw    v0, 2080(sp)
+// 0x0102af2c: 0x102af2c: sw    v0, 2080(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6005,28 +6005,28 @@ L_102aef8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102af20: 0x102af20: addiu s8, s8, 6556
+// 0x0102af30: 0x102af30: addiu s8, s8, 6556
 	ldloc 15
 	ldc.i4 6556
 	add
 	stloc 15
-// 0x0102af24: 0x102af24: addiu s4, s4, 6576
+// 0x0102af34: 0x102af34: addiu s4, s4, 6576
 	ldloc 12
 	ldc.i4 6576
 	add
 	stloc 12
-// 0x0102af28: 0x102af28: addu  s3, zero, zero
+// 0x0102af38: 0x102af38: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0102af2c: 0x102af2c: j	 0x102afb0 addiu s6, sp, 24
+// 0x0102af3c: 0x102af3c: j	 0x102afc0 addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-	br L_102afb0
+	br L_102afc0
 // --- basic block ---
-L_102af34:
-// 0x0102af34: 0x102af34: lw    a1, 16(s8)
+L_102af44:
+// 0x0102af44: 0x102af44: lw    a1, 16(s8)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -6035,32 +6035,32 @@ L_102af34:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102af38: 0x102af38: jal   0x102a088 sll   zero, zero, 0
+// 0x0102af48: 0x102af48: jal   0x102a098 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_is_intersection_102a088(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_is_intersection_102a098(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102af40: 0x102af40: addu  s5, v0, zero
+// 0x0102af50: 0x102af50: addu  s5, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0102af44: 0x102af44: slt   v0, s2, v0
+// 0x0102af54: 0x102af54: slt   v0, s2, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102af48: 0x102af48: beq   v0, zero, 0x102afa0 addu  a0, s1, zero
+// 0x0102af58: 0x102af58: beq   v0, zero, 0x102afb0 addu  a0, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brfalse L_102afa0
+	brfalse L_102afb0
 // --- basic block ---
-// 0x0102af50: 0x102af50: jal   0x101507c addu  a1, s6, zero
+// 0x0102af60: 0x102af60: jal   0x101508c addu  a1, s6, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -6068,12 +6068,12 @@ L_102af34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_101507c(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_101508c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102af58: 0x102af58: lw    v0, 24(sp)
+// 0x0102af68: 0x102af68: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6082,7 +6082,7 @@ L_102af34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102af5c: 0x102af5c: lw    v1, 4(s4)
+// 0x0102af6c: 0x102af6c: lw    v1, 4(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -6091,24 +6091,24 @@ L_102af34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102af60: 0x102af60: addu  a0, s0, zero
+// 0x0102af70: 0x102af70: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x0102af64: 0x102af64: addu  a1, s1, zero
+// 0x0102af74: 0x102af74: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102af68: 0x102af68: bne   v0, v1, 0x102b0b8 addiu a2, zero, 20
+// 0x0102af78: 0x102af78: bne   v0, v1, 0x102b0c8 addiu a2, zero, 20
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 20
 	stloc.3
-	bne.un L_102b0b8
+	bne.un L_102b0c8
 // --- basic block ---
-// 0x0102af70: 0x102af70: bne   v0, zero, 0x102af8c sll   zero, zero, 0
+// 0x0102af80: 0x102af80: bne   v0, zero, 0x102af9c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102af8c
+	brtrue L_102af9c
 // --- basic block ---
-// 0x0102af78: 0x102af78: lw    v0, 8(s4)
+// 0x0102af88: 0x102af88: lw    v0, 8(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -6117,7 +6117,7 @@ L_102af34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102af7c: 0x102af7c: lw    v1, 28(sp)
+// 0x0102af8c: 0x102af8c: lw    v1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6126,14 +6126,14 @@ L_102af34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102af80: 0x102af80: sll   zero, zero, 0
-// 0x0102af84: 0x102af84: bne   v1, v0, 0x102b0b8 sll   zero, zero, 0
+// 0x0102af90: 0x102af90: sll   zero, zero, 0
+// 0x0102af94: 0x102af94: bne   v1, v0, 0x102b0c8 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_102b0b8
+	bne.un L_102b0c8
 // --- basic block ---
-L_102af8c:
-// 0x0102af8c: 0x102af8c: lw    v0, 12(s4)
+L_102af9c:
+// 0x0102af9c: 0x102af9c: lw    v0, 12(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -6142,7 +6142,7 @@ L_102af8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102af90: 0x102af90: lw    v1, 32(sp)
+// 0x0102afa0: 0x102afa0: lw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6151,32 +6151,32 @@ L_102af8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102af94: 0x102af94: sll   zero, zero, 0
-// 0x0102af98: 0x102af98: bne   v1, v0, 0x102b0b8 sll   zero, zero, 0
+// 0x0102afa4: 0x102afa4: sll   zero, zero, 0
+// 0x0102afa8: 0x102afa8: bne   v1, v0, 0x102b0c8 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_102b0b8
+	bne.un L_102b0c8
 // --- basic block ---
-L_102afa0:
-// 0x0102afa0: 0x102afa0: addu  s5, s2, zero
+L_102afb0:
+// 0x0102afb0: 0x102afb0: addu  s5, s2, zero
 	ldloc 10
 	stloc 11
-// 0x0102afa4: 0x102afa4: addiu s3, s3, 1
+// 0x0102afb4: 0x102afb4: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0102afa8: 0x102afa8: addiu s1, s1, 20
+// 0x0102afb8: 0x102afb8: addiu s1, s1, 20
 	ldloc 8
 	ldc.i4.s 20
 	add
 	stloc 8
-L_102afac:
-// 0x0102afac: 0x102afac: addu  s2, s5, zero
+L_102afbc:
+// 0x0102afbc: 0x102afbc: addu  s2, s5, zero
 	ldloc 11
 	stloc 10
-L_102afb0:
-// 0x0102afb0: 0x102afb0: lw    v1, 2080(sp)
+L_102afc0:
+// 0x0102afc0: 0x102afc0: lw    v1, 2080(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6185,34 +6185,34 @@ L_102afb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102afb4: 0x102afb4: addu  a0, s1, zero
+// 0x0102afc4: 0x102afc4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102afb8: 0x102afb8: slt   v0, s3, v1
+// 0x0102afc8: 0x102afc8: slt   v0, s3, v1
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 5
-// 0x0102afbc: 0x102afbc: bne   v0, zero, 0x102af34 addu  a2, s7, zero
+// 0x0102afcc: 0x102afcc: bne   v0, zero, 0x102af44 addu  a2, s7, zero
 	ldloc 5
 	ldloc 16
 	stloc.3
-	brtrue L_102af34
+	brtrue L_102af44
 // --- basic block ---
-// 0x0102afc4: 0x102afc4: jal   0x102be40 addu  a0, s2, zero
+// 0x0102afd4: 0x102afd4: jal   0x102be50 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102afcc: 0x102afcc: bne   v0, zero, 0x102afe4 lui   a0, 0x10000
+// 0x0102afdc: 0x102afdc: bne   v0, zero, 0x102aff4 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_102afe4
+	brtrue L_102aff4
 // --- basic block ---
-// 0x0102afd4: 0x102afd4: jal   0x1019564 addiu a0, a0, -31180
+// 0x0102afe4: 0x102afe4: jal   0x1019574 addiu a0, a0, -31180
 	ldloc.1
 	ldc.i4 -31180
 	add
@@ -6222,26 +6222,26 @@ L_102afb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102afdc: 0x102afdc: j	 0x102b078 addu  v0, zero, zero
+// 0x0102afec: 0x102afec: j	 0x102b088 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_102b078
+	br L_102b088
 // --- basic block ---
-L_102afe4:
-// 0x0102afe4: 0x102afe4: lui   a0, 0x10000
+L_102aff4:
+// 0x0102aff4: 0x102aff4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102afe8: 0x102afe8: addiu a0, a0, -25748
+// 0x0102aff8: 0x102aff8: addiu a0, a0, -25748
 	ldloc.1
 	ldc.i4 -25748
 	add
 	stloc.1
-// 0x0102afec: 0x102afec: jal   0x102a1bc addu  a1, s0, zero
+// 0x0102affc: 0x102affc: jal   0x102a1cc addu  a1, s0, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -6249,30 +6249,30 @@ L_102afe4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_trace_102a1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_trace_102a1cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102aff4: 0x102aff4: beq   s0, zero, 0x102b060 lui   v0, 0x0
+// 0x0102b004: 0x102b004: beq   s0, zero, 0x102b070 lui   v0, 0x0
 	ldloc 13
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_102b060
+	brfalse L_102b070
 // --- basic block ---
-// 0x0102affc: 0x102affc: addiu v0, v0, 6576
+// 0x0102b00c: 0x102b00c: addiu v0, v0, 6576
 	ldloc 5
 	ldc.i4 6576
 	add
 	stloc 5
-// 0x0102b000: 0x102b000: lw    v1, 0(s0)
+// 0x0102b010: 0x102b010: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102b004: 0x102b004: lw    a0, 36(v0)
+// 0x0102b014: 0x102b014: lw    a0, 36(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6281,17 +6281,17 @@ L_102afe4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b008: 0x102b008: sll   zero, zero, 0
-// 0x0102b00c: 0x102b00c: bne   v1, a0, 0x102b060 sll   zero, zero, 0
+// 0x0102b018: 0x102b018: sll   zero, zero, 0
+// 0x0102b01c: 0x102b01c: bne   v1, a0, 0x102b070 sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	bne.un L_102b060
+	bne.un L_102b070
 // --- basic block ---
-// 0x0102b014: 0x102b014: bne   v1, zero, 0x102b030 sll   zero, zero, 0
+// 0x0102b024: 0x102b024: bne   v1, zero, 0x102b040 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_102b030
+	brtrue L_102b040
 // --- basic block ---
-// 0x0102b01c: 0x102b01c: lw    v0, 48(v0)
+// 0x0102b02c: 0x102b02c: lw    v0, 48(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6300,7 +6300,7 @@ L_102afe4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b020: 0x102b020: lw    v1, 12(s0)
+// 0x0102b030: 0x102b030: lw    v1, 12(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -6309,24 +6309,24 @@ L_102afe4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b024: 0x102b024: sll   zero, zero, 0
-// 0x0102b028: 0x102b028: bne   v1, v0, 0x102b064 lui   a0, 0x0
+// 0x0102b034: 0x102b034: sll   zero, zero, 0
+// 0x0102b038: 0x102b038: bne   v1, v0, 0x102b074 lui   a0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_102b064
+	bne.un L_102b074
 // --- basic block ---
-L_102b030:
-// 0x0102b030: 0x102b030: lui   v0, 0x0
+L_102b040:
+// 0x0102b040: 0x102b040: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102b034: 0x102b034: addiu v0, v0, 6576
+// 0x0102b044: 0x102b044: addiu v0, v0, 6576
 	ldloc 5
 	ldc.i4 6576
 	add
 	stloc 5
-// 0x0102b038: 0x102b038: lw    a0, 4(s0)
+// 0x0102b048: 0x102b048: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -6335,7 +6335,7 @@ L_102b030:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b03c: 0x102b03c: lw    v1, 40(v0)
+// 0x0102b04c: 0x102b04c: lw    v1, 40(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6344,15 +6344,15 @@ L_102b030:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b040: 0x102b040: sll   zero, zero, 0
-// 0x0102b044: 0x102b044: bne   a0, v1, 0x102b064 lui   a0, 0x0
+// 0x0102b050: 0x102b050: sll   zero, zero, 0
+// 0x0102b054: 0x102b054: bne   a0, v1, 0x102b074 lui   a0, 0x0
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_102b064
+	bne.un L_102b074
 // --- basic block ---
-// 0x0102b04c: 0x102b04c: lw    v1, 52(v0)
+// 0x0102b05c: 0x102b05c: lw    v1, 52(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6361,7 +6361,7 @@ L_102b030:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b050: 0x102b050: lw    a0, 16(s0)
+// 0x0102b060: 0x102b060: lw    a0, 16(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -6370,28 +6370,28 @@ L_102b030:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b054: 0x102b054: sll   zero, zero, 0
-// 0x0102b058: 0x102b058: beq   a0, v1, 0x102b078 addiu v0, zero, 1
+// 0x0102b064: 0x102b064: sll   zero, zero, 0
+// 0x0102b068: 0x102b068: beq   a0, v1, 0x102b088 addiu v0, zero, 1
 	ldloc.1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	beq  L_102b078
+	beq  L_102b088
 // --- basic block ---
-L_102b060:
-// 0x0102b060: 0x102b060: lui   a0, 0x0
+L_102b070:
+// 0x0102b070: 0x102b070: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_102b064:
-// 0x0102b064: 0x102b064: addiu a0, a0, 6612
+L_102b074:
+// 0x0102b074: 0x102b074: addiu a0, a0, 6612
 	ldloc.1
 	ldc.i4 6612
 	add
 	stloc.1
-// 0x0102b068: 0x102b068: addu  a1, s0, zero
+// 0x0102b078: 0x102b078: addu  a1, s0, zero
 	ldloc 13
 	stloc.2
-// 0x0102b06c: 0x102b06c: jal   0x1001800 addiu a2, zero, 20
+// 0x0102b07c: 0x102b07c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -6403,12 +6403,12 @@ L_102b064:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b074: 0x102b074: addiu v0, zero, 1
+// 0x0102b084: 0x102b084: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_102b078:
-// 0x0102b078: 0x102b078: lw    ra, 2124(sp)
-// 0x0102b07c: 0x102b07c: lw    s8, 2120(sp)
+L_102b088:
+// 0x0102b088: 0x102b088: lw    ra, 2124(sp)
+// 0x0102b08c: 0x102b08c: lw    s8, 2120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6417,7 +6417,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102b080: 0x102b080: lw    s7, 2116(sp)
+// 0x0102b090: 0x102b090: lw    s7, 2116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6426,7 +6426,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0102b084: 0x102b084: lw    s6, 2112(sp)
+// 0x0102b094: 0x102b094: lw    s6, 2112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6435,7 +6435,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102b088: 0x102b088: lw    s5, 2108(sp)
+// 0x0102b098: 0x102b098: lw    s5, 2108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6444,7 +6444,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102b08c: 0x102b08c: lw    s4, 2104(sp)
+// 0x0102b09c: 0x102b09c: lw    s4, 2104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6453,7 +6453,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102b090: 0x102b090: lw    s3, 2100(sp)
+// 0x0102b0a0: 0x102b0a0: lw    s3, 2100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6462,7 +6462,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102b094: 0x102b094: lw    s2, 2096(sp)
+// 0x0102b0a4: 0x102b0a4: lw    s2, 2096(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6471,7 +6471,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102b098: 0x102b098: lw    s1, 2092(sp)
+// 0x0102b0a8: 0x102b0a8: lw    s1, 2092(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6480,7 +6480,7 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102b09c: 0x102b09c: lw    s0, 2088(sp)
+// 0x0102b0ac: 0x102b0ac: lw    s0, 2088(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6489,15 +6489,15 @@ L_102b078:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102b0a0: 0x102b0a0: jr    ra addiu sp, sp, 2128
+// 0x0102b0b0: 0x102b0b0: jr    ra addiu sp, sp, 2128
 	ldloc.0
 	ldc.i4 2128
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_102b0a8:
-// 0x0102b0a8: 0x102b0a8: jal   0x1001800 addiu s6, s6, 1
+L_102b0b8:
+// 0x0102b0b8: 0x102b0b8: jal   0x1001800 addiu s6, s6, 1
 	ldloc 14
 	ldc.i4.1
 	add
@@ -6511,13 +6511,13 @@ L_102b0a8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b0b0: 0x102b0b0: j	 0x102aec8 addu  s2, s7, zero
+// 0x0102b0c0: 0x102b0c0: j	 0x102aed8 addu  s2, s7, zero
 	ldloc 16
 	stloc 10
-	br L_102aec8
+	br L_102aed8
 // --- basic block ---
-L_102b0b8:
-// 0x0102b0b8: 0x102b0b8: jal   0x1001800 addiu s3, s3, 1
+L_102b0c8:
+// 0x0102b0c8: 0x102b0c8: jal   0x1001800 addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -6531,19 +6531,19 @@ L_102b0b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b0c0: 0x102b0c0: j	 0x102afac addiu s1, s1, 20
+// 0x0102b0d0: 0x102b0d0: j	 0x102afbc addiu s1, s1, 20
 	ldloc 8
 	ldc.i4.s 20
 	add
 	stloc 8
-	br L_102afac
+	br L_102afbc
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 T_127_102b0c8(int32,int32,int32,int32,int32)
+.method public static int32 T_127_102b0d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 s2,int32 ra)
@@ -6587,12 +6587,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102b0c8: 0x102b0c8: addiu sp, sp, -56
+// 0x0102b0d8: 0x102b0d8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0102b0cc: 0x102b0cc: sw    s1, 44(sp)
+// 0x0102b0dc: 0x102b0dc: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6601,15 +6601,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102b0d0: 0x102b0d0: lui   s1, 0x0
+// 0x0102b0e0: 0x102b0e0: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0102b0d4: 0x102b0d4: addiu s1, s1, 6556
+// 0x0102b0e4: 0x102b0e4: addiu s1, s1, 6556
 	ldloc 7
 	ldc.i4 6556
 	add
 	stloc 7
-// 0x0102b0d8: 0x102b0d8: sw    s2, 48(sp)
+// 0x0102b0e8: 0x102b0e8: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6618,7 +6618,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102b0dc: 0x102b0dc: sw    s0, 40(sp)
+// 0x0102b0ec: 0x102b0ec: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6627,22 +6627,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102b0e0: 0x102b0e0: addu  s2, a0, zero
+// 0x0102b0f0: 0x102b0f0: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0102b0e4: 0x102b0e4: addu  s0, a1, zero
+// 0x0102b0f4: 0x102b0f4: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0102b0e8: 0x102b0e8: addiu a0, sp, 16
+// 0x0102b0f8: 0x102b0f8: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0102b0ec: 0x102b0ec: addu  a1, s1, zero
+// 0x0102b0fc: 0x102b0fc: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x0102b0f0: 0x102b0f0: sw    ra, 52(sp)
-// 0x0102b0f4: 0x102b0f4: jal   0x1001800 addiu a2, zero, 20
+// 0x0102b100: 0x102b100: sw    ra, 52(sp)
+// 0x0102b104: 0x102b104: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -6654,11 +6654,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0102b0fc: 0x102b0fc: beq   s2, zero, 0x102b158 sll   zero, zero, 0
+// 0x0102b10c: 0x102b10c: beq   s2, zero, 0x102b168 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_102b158
+	brfalse L_102b168
 // --- basic block ---
-// 0x0102b104: 0x102b104: lw    v0, 4(s2)
+// 0x0102b114: 0x102b114: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6667,14 +6667,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b108: 0x102b108: lw    v1, 0(s2)
+// 0x0102b118: 0x102b118: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0102b10c: 0x102b10c: lw    a1, 16(s1)
+// 0x0102b11c: 0x102b11c: lw    a1, 16(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6683,10 +6683,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102b110: 0x102b110: addu  a0, s0, zero
+// 0x0102b120: 0x102b120: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102b114: 0x102b114: sw    v1, 16(sp)
+// 0x0102b124: 0x102b124: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6695,7 +6695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102b118: 0x102b118: jal   0x1008410 sw    v0, 20(sp)
+// 0x0102b128: 0x102b128: jal   0x1008420 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6706,19 +6706,19 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102b120: 0x102b120: slti  v0, v0, 45
+// 0x0102b130: 0x102b130: slti  v0, v0, 45
 	ldloc 5
 	ldc.i4.s 45
 	clt
 	stloc 5
-// 0x0102b124: 0x102b124: bne   v0, zero, 0x102b154 sll   zero, zero, 0
+// 0x0102b134: 0x102b134: bne   v0, zero, 0x102b164 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102b154
+	brtrue L_102b164
 // --- basic block ---
-// 0x0102b12c: 0x102b12c: lw    a1, 16(s1)
+// 0x0102b13c: 0x102b13c: lw    a1, 16(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6727,33 +6727,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102b130: 0x102b130: addiu s1, s0, 180
+// 0x0102b140: 0x102b140: addiu s1, s0, 180
 	ldloc 9
 	ldc.i4 180
 	add
 	stloc 7
-// 0x0102b134: 0x102b134: jal   0x1008410 addu  a0, s1, zero
+// 0x0102b144: 0x102b144: jal   0x1008420 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl5::roadmap_math_delta_direction_1008410(int32,int32)
+	call int32 Cibyl5::roadmap_math_delta_direction_1008420(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102b13c: 0x102b13c: slti  v0, v0, 90
+// 0x0102b14c: 0x102b14c: slti  v0, v0, 90
 	ldloc 5
 	ldc.i4.s 90
 	clt
 	stloc 5
-// 0x0102b140: 0x102b140: beq   v0, zero, 0x102b158 slti  v0, s1, 360
+// 0x0102b150: 0x102b150: beq   v0, zero, 0x102b168 slti  v0, s1, 360
 	ldloc 5
 	ldloc 7
 	ldc.i4 360
 	clt
 	stloc 5
-	brfalse L_102b158
+	brfalse L_102b168
 // --- basic block ---
-// 0x0102b148: 0x102b148: bne   v0, zero, 0x102b158 sw    s1, 32(sp)
+// 0x0102b158: 0x102b158: bne   v0, zero, 0x102b168 sw    s1, 32(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6763,15 +6763,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_102b158
+	brtrue L_102b168
 // --- basic block ---
-// 0x0102b150: 0x102b150: addiu s0, s0, -180
+// 0x0102b160: 0x102b160: addiu s0, s0, -180
 	ldloc 9
 	ldc.i4 -180
 	add
 	stloc 9
-L_102b154:
-// 0x0102b154: 0x102b154: sw    s0, 32(sp)
+L_102b164:
+// 0x0102b164: 0x102b164: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6780,19 +6780,19 @@ L_102b154:
 	add
 	ldloc 9
 	stelem.i4
-L_102b158:
-// 0x0102b158: 0x102b158: addiu s0, sp, 16
+L_102b168:
+// 0x0102b168: 0x102b168: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x0102b15c: 0x102b15c: lui   a0, 0x10000
+// 0x0102b16c: 0x102b16c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102b160: 0x102b160: addu  a1, s0, zero
+// 0x0102b170: 0x102b170: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0102b164: 0x102b164: jal   0x101f6a8 addiu a0, a0, -31052
+// 0x0102b174: 0x102b174: jal   0x101f6b8 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -6802,12 +6802,12 @@ L_102b158:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_mobile_101f6a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_mobile_101f6b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0102b16c: 0x102b16c: jal   0x102a054 addu  a0, s0, zero
+// 0x0102b17c: 0x102b17c: jal   0x102a064 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6815,27 +6815,27 @@ L_102b158:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_check_alerts_102a054(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_check_alerts_102a064(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0102b174: 0x102b174: addu  v1, zero, zero
+// 0x0102b184: 0x102b184: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0102b178: 0x102b178: cibyl_sysc_arg 0x3
+// 0x0102b188: 0x102b188: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0102b17c: 0x102b17c: cibyl_sysc 0x40e
+// 0x0102b18c: 0x102b18c: cibyl_sysc 0x40e
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0102b180: 0x102b180: addu  v1, v0, zero
+// 0x0102b190: 0x102b190: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0102b184: 0x102b184: lw    ra, 52(sp)
-// 0x0102b188: 0x102b188: lui   v0, 0x60000
+// 0x0102b194: 0x102b194: lw    ra, 52(sp)
+// 0x0102b198: 0x102b198: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102b18c: 0x102b18c: lw    s2, 48(sp)
+// 0x0102b19c: 0x102b19c: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6844,7 +6844,7 @@ L_102b158:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102b190: 0x102b190: lw    s1, 44(sp)
+// 0x0102b1a0: 0x102b1a0: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6853,7 +6853,7 @@ L_102b158:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102b194: 0x102b194: lw    s0, 40(sp)
+// 0x0102b1a4: 0x102b1a4: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6862,16 +6862,16 @@ L_102b158:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102b198: 0x102b198: sw    v1, -25192(v0)
+// 0x0102b1a8: 0x102b1a8: sw    v1, -24728(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6298
+	ldc.i4 -6182
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102b19c: 0x102b19c: jr    ra addiu sp, sp, 56
+// 0x0102b1ac: 0x102b1ac: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6883,7 +6883,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_navigate_locate_102b1a4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_navigate_locate_102b1b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s3,int32 s0,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 t0,int32 lo,int32 ra)
@@ -6951,24 +6951,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102b1a4: 0x102b1a4: lui   v0, 0x60000
+// 0x0102b1b4: 0x102b1b4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102b1a8: 0x102b1a8: lw    v0, -25444(v0)
+// 0x0102b1b8: 0x102b1b8: lw    v0, -24980(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6361
+	ldc.i4 -6245
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b1ac: 0x102b1ac: addiu sp, sp, -200
+// 0x0102b1bc: 0x102b1bc: addiu sp, sp, -200
 	ldloc.0
 	ldc.i4 -200
 	add
 	stloc.0
-// 0x0102b1b0: 0x102b1b0: sw    s1, 164(sp)
+// 0x0102b1c0: 0x102b1c0: sw    s1, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6977,7 +6977,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102b1b4: 0x102b1b4: sw    s0, 160(sp)
+// 0x0102b1c4: 0x102b1c4: sw    s0, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6986,8 +6986,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102b1b8: 0x102b1b8: sw    ra, 196(sp)
-// 0x0102b1bc: 0x102b1bc: sw    s8, 192(sp)
+// 0x0102b1c8: 0x102b1c8: sw    ra, 196(sp)
+// 0x0102b1cc: 0x102b1cc: sw    s8, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6996,7 +6996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0102b1c0: 0x102b1c0: sw    s7, 188(sp)
+// 0x0102b1d0: 0x102b1d0: sw    s7, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7005,7 +7005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102b1c4: 0x102b1c4: sw    s6, 184(sp)
+// 0x0102b1d4: 0x102b1d4: sw    s6, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7014,7 +7014,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102b1c8: 0x102b1c8: sw    s5, 180(sp)
+// 0x0102b1d8: 0x102b1d8: sw    s5, 180(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7023,7 +7023,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102b1cc: 0x102b1cc: sw    s4, 176(sp)
+// 0x0102b1dc: 0x102b1dc: sw    s4, 176(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7032,7 +7032,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102b1d0: 0x102b1d0: sw    s3, 172(sp)
+// 0x0102b1e0: 0x102b1e0: sw    s3, 172(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7041,7 +7041,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102b1d4: 0x102b1d4: sw    s2, 168(sp)
+// 0x0102b1e4: 0x102b1e4: sw    s2, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7050,29 +7050,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102b1d8: 0x102b1d8: addu  s0, a0, zero
+// 0x0102b1e8: 0x102b1e8: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0102b1dc: 0x102b1dc: bne   v0, zero, 0x102b1f8 addu  s1, a1, zero
+// 0x0102b1ec: 0x102b1ec: bne   v0, zero, 0x102b208 addu  s1, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 8
-	brtrue L_102b1f8
+	brtrue L_102b208
 // --- basic block ---
-// 0x0102b1e4: 0x102b1e4: lui   a0, 0xfffc0000
+// 0x0102b1f4: 0x102b1f4: lui   a0, 0xfffc0000
 	ldc.i4 4294705152
 	stloc.1
-// 0x0102b1e8: 0x102b1e8: ori   a0, a0, 2944
+// 0x0102b1f8: 0x102b1f8: ori   a0, a0, 2944
 	ldloc.1
 	ldc.i4 2944
 	or
 	stloc.1
-// 0x0102b1ec: 0x102b1ec: addu  a0, a1, a0
+// 0x0102b1fc: 0x102b1fc: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0102b1f0: 0x102b1f0: jal   0x10b98b4 addu  a1, zero, zero
+// 0x0102b200: 0x102b200: jal   0x10b9efc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7080,37 +7080,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl138::editor_cleanup_test_10b98b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl138::editor_cleanup_test_10b9efc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102b1f8:
-// 0x0102b1f8: 0x102b1f8: lui   s3, 0x60000
+L_102b208:
+// 0x0102b208: 0x102b208: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0102b1fc: 0x102b1fc: lw    v0, -25264(s3)
+// 0x0102b20c: 0x102b20c: lw    v0, -24800(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6316
+	ldc.i4 -6200
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b200: 0x102b200: lui   v1, 0x60000
+// 0x0102b210: 0x102b210: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0102b204: 0x102b204: sw    s1, -25444(v1)
+// 0x0102b214: 0x102b214: sw    s1, -24980(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6361
+	ldc.i4 -6245
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102b208: 0x102b208: lw    s1, 12(s0)
+// 0x0102b218: 0x102b218: lw    s1, 12(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7119,16 +7119,16 @@ L_102b1f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102b20c: 0x102b20c: bne   v0, zero, 0x102b254 lui   v0, 0x60000
+// 0x0102b21c: 0x102b21c: bne   v0, zero, 0x102b264 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_102b254
+	brtrue L_102b264
 // --- basic block ---
-// 0x0102b214: 0x102b214: lui   v0, 0x0
+// 0x0102b224: 0x102b224: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102b218: 0x102b218: lw    v0, 6764(v0)
+// 0x0102b228: 0x102b228: lw    v0, 6764(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7137,38 +7137,38 @@ L_102b1f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b21c: 0x102b21c: sll   zero, zero, 0
-// 0x0102b220: 0x102b220: slt   v0, s1, v0
+// 0x0102b22c: 0x102b22c: sll   zero, zero, 0
+// 0x0102b230: 0x102b230: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102b224: 0x102b224: bne   v0, zero, 0x102b254 lui   v0, 0x60000
+// 0x0102b234: 0x102b234: bne   v0, zero, 0x102b264 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_102b254
+	brtrue L_102b264
 // --- basic block ---
-// 0x0102b22c: 0x102b22c: lui   a1, 0x10000
+// 0x0102b23c: 0x102b23c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102b230: 0x102b230: lui   a3, 0x10000
+// 0x0102b240: 0x102b240: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102b234: 0x102b234: addiu a1, a1, -25980
+// 0x0102b244: 0x102b244: addiu a1, a1, -25980
 	ldloc.2
 	ldc.i4 -25980
 	add
 	stloc.2
-// 0x0102b238: 0x102b238: addiu a3, a3, -25700
+// 0x0102b248: 0x102b248: addiu a3, a3, -25700
 	ldloc 4
 	ldc.i4 -25700
 	add
 	stloc 4
-// 0x0102b23c: 0x102b23c: addiu a0, zero, 2
+// 0x0102b24c: 0x102b24c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0102b240: 0x102b240: jal   0x100449c addiu a2, zero, 698
+// 0x0102b250: 0x102b250: jal   0x100449c addiu a2, zero, 698
 	ldc.i4 698
 	stloc.3
 	ldloc.0
@@ -7181,60 +7181,60 @@ L_102b1f8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b248: 0x102b248: addiu v0, zero, 1
+// 0x0102b258: 0x102b258: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102b24c: 0x102b24c: sw    v0, -25264(s3)
+// 0x0102b25c: 0x102b25c: sw    v0, -24800(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6316
+	ldc.i4 -6200
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102b250: 0x102b250: lui   v0, 0x60000
+// 0x0102b260: 0x102b260: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_102b254:
-// 0x0102b254: 0x102b254: lw    v0, -25264(v0)
+L_102b264:
+// 0x0102b264: 0x102b264: lw    v0, -24800(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6316
+	ldc.i4 -6200
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b258: 0x102b258: sll   zero, zero, 0
-// 0x0102b25c: 0x102b25c: beq   v0, zero, 0x102b2f8 addiu a0, sp, 36
+// 0x0102b268: 0x102b268: sll   zero, zero, 0
+// 0x0102b26c: 0x102b26c: beq   v0, zero, 0x102b308 addiu a0, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-	brfalse L_102b2f8
+	brfalse L_102b308
 // --- basic block ---
-// 0x0102b264: 0x102b264: lui   v1, 0x60000
+// 0x0102b274: 0x102b274: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0102b268: 0x102b268: lw    t0, -25268(v1)
+// 0x0102b278: 0x102b278: lw    t0, -24804(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6317
+	ldc.i4 -6201
 	add
 	ldelem.i4
 	stloc 17
-// 0x0102b26c: 0x102b26c: sll   zero, zero, 0
-// 0x0102b270: 0x102b270: bne   t0, zero, 0x102b2b8 lui   v0, 0x0
+// 0x0102b27c: 0x102b27c: sll   zero, zero, 0
+// 0x0102b280: 0x102b280: bne   t0, zero, 0x102b2c8 lui   v0, 0x0
 	ldloc 17
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_102b2b8
+	brtrue L_102b2c8
 // --- basic block ---
-// 0x0102b278: 0x102b278: lw    v0, 6768(v0)
+// 0x0102b288: 0x102b288: lw    v0, 6768(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7243,68 +7243,68 @@ L_102b254:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b27c: 0x102b27c: sll   zero, zero, 0
-// 0x0102b280: 0x102b280: slt   s1, s1, v0
+// 0x0102b28c: 0x102b28c: sll   zero, zero, 0
+// 0x0102b290: 0x102b290: slt   s1, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 8
-// 0x0102b284: 0x102b284: beq   s1, zero, 0x102b2f8 sll   zero, zero, 0
+// 0x0102b294: 0x102b294: beq   s1, zero, 0x102b308 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_102b2f8
+	brfalse L_102b308
 // --- basic block ---
-// 0x0102b28c: 0x102b28c: cibyl_sysc_arg 0x8
+// 0x0102b29c: 0x102b29c: cibyl_sysc_arg 0x8
 	ldloc 17
-// 0x0102b290: 0x102b290: cibyl_sysc 0x413
+// 0x0102b2a0: 0x102b2a0: cibyl_sysc 0x413
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0102b294: 0x102b294: addu  t0, v0, zero
+// 0x0102b2a4: 0x102b2a4: addu  t0, v0, zero
 	ldloc 5
 	stloc 17
-// 0x0102b298: 0x102b298: lui   a1, 0x10000
+// 0x0102b2a8: 0x102b2a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102b29c: 0x102b29c: lui   a3, 0x10000
+// 0x0102b2ac: 0x102b2ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102b2a0: 0x102b2a0: addiu a1, a1, -25980
+// 0x0102b2b0: 0x102b2b0: addiu a1, a1, -25980
 	ldloc.2
 	ldc.i4 -25980
 	add
 	stloc.2
-// 0x0102b2a4: 0x102b2a4: addiu a3, a3, -25680
+// 0x0102b2b4: 0x102b2b4: addiu a3, a3, -25680
 	ldloc 4
 	ldc.i4 -25680
 	add
 	stloc 4
-// 0x0102b2a8: 0x102b2a8: addiu a0, zero, 2
+// 0x0102b2b8: 0x102b2b8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0102b2ac: 0x102b2ac: addiu a2, zero, 705
+// 0x0102b2bc: 0x102b2bc: addiu a2, zero, 705
 	ldc.i4 705
 	stloc.3
-// 0x0102b2b0: 0x102b2b0: j	 0x102b2ec sw    t0, -25268(v1)
+// 0x0102b2c0: 0x102b2c0: j	 0x102b2fc sw    t0, -24804(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6317
+	ldc.i4 -6201
 	add
 	ldloc 17
 	stelem.i4
-	br L_102b2ec
+	br L_102b2fc
 // --- basic block ---
-L_102b2b8:
-// 0x0102b2b8: 0x102b2b8: blez  t0, 0x102b2f8 addiu a0, sp, 36
+L_102b2c8:
+// 0x0102b2c8: 0x102b2c8: blez  t0, 0x102b308 addiu a0, sp, 36
 	ldloc 17
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
 	ldc.i4.s 0
-	ble L_102b2f8
+	ble L_102b308
 // --- basic block ---
-// 0x0102b2c0: 0x102b2c0: lw    v0, 6768(v0)
+// 0x0102b2d0: 0x102b2d0: lw    v0, 6768(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7313,48 +7313,48 @@ L_102b2b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b2c4: 0x102b2c4: sll   zero, zero, 0
-// 0x0102b2c8: 0x102b2c8: slt   s1, v0, s1
+// 0x0102b2d4: 0x102b2d4: sll   zero, zero, 0
+// 0x0102b2d8: 0x102b2d8: slt   s1, v0, s1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 8
-// 0x0102b2cc: 0x102b2cc: beq   s1, zero, 0x102b2f8 lui   a1, 0x10000
+// 0x0102b2dc: 0x102b2dc: beq   s1, zero, 0x102b308 lui   a1, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc.2
-	brfalse L_102b2f8
+	brfalse L_102b308
 // --- basic block ---
-// 0x0102b2d4: 0x102b2d4: lui   a3, 0x10000
+// 0x0102b2e4: 0x102b2e4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102b2d8: 0x102b2d8: addiu a1, a1, -25980
+// 0x0102b2e8: 0x102b2e8: addiu a1, a1, -25980
 	ldloc.2
 	ldc.i4 -25980
 	add
 	stloc.2
-// 0x0102b2dc: 0x102b2dc: addiu a3, a3, -25664
+// 0x0102b2ec: 0x102b2ec: addiu a3, a3, -25664
 	ldloc 4
 	ldc.i4 -25664
 	add
 	stloc 4
-// 0x0102b2e0: 0x102b2e0: addiu a0, zero, 2
+// 0x0102b2f0: 0x102b2f0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0102b2e4: 0x102b2e4: addiu a2, zero, 708
+// 0x0102b2f4: 0x102b2f4: addiu a2, zero, 708
 	ldc.i4 708
 	stloc.3
-// 0x0102b2e8: 0x102b2e8: sw    zero, -25268(v1)
+// 0x0102b2f8: 0x102b2f8: sw    zero, -24804(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6317
+	ldc.i4 -6201
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_102b2ec:
-// 0x0102b2ec: 0x102b2ec: jal   0x100449c sll   zero, zero, 0
+L_102b2fc:
+// 0x0102b2fc: 0x102b2fc: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7365,13 +7365,13 @@ L_102b2ec:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b2f4: 0x102b2f4: addiu a0, sp, 36
+// 0x0102b304: 0x102b304: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-L_102b2f8:
-// 0x0102b2f8: 0x102b2f8: jal   0x100844c addiu a1, sp, 32
+L_102b308:
+// 0x0102b308: 0x102b308: jal   0x100845c addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -7379,15 +7379,15 @@ L_102b2f8:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b300: 0x102b300: addiu a1, zero, 20
+// 0x0102b310: 0x102b310: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0102b304: 0x102b304: jal   0x10086bc addu  a0, s0, zero
+// 0x0102b314: 0x102b314: jal   0x10086cc addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7395,12 +7395,12 @@ L_102b2f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b30c: 0x102b30c: jal   0x100c300 addu  a0, s0, zero
+// 0x0102b31c: 0x102b31c: jal   0x100c310 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7408,12 +7408,12 @@ L_102b2f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_request_location_100c300(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_request_location_100c310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b314: 0x102b314: lw    s1, 12(s0)
+// 0x0102b324: 0x102b324: lw    s1, 12(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7422,7 +7422,7 @@ L_102b2f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102b318: 0x102b318: jal   0x1030fd8 lui   s4, 0x0
+// 0x0102b328: 0x102b328: jal   0x1030fe8 lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
 	ldloc.0
@@ -7430,28 +7430,28 @@ L_102b2f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b320: 0x102b320: slt   v0, s1, v0
+// 0x0102b330: 0x102b330: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102b324: 0x102b324: addu  s1, s0, zero
+// 0x0102b334: 0x102b334: addu  s1, s0, zero
 	ldloc 10
 	stloc 8
-// 0x0102b328: 0x102b328: beq   v0, zero, 0x102b4d4 addiu s3, s4, 6556
+// 0x0102b338: 0x102b338: beq   v0, zero, 0x102b4e4 addiu s3, s4, 6556
 	ldloc 5
 	ldloc 12
 	ldc.i4 6556
 	add
 	stloc 9
-	brfalse L_102b4d4
+	brfalse L_102b4e4
 // --- basic block ---
-// 0x0102b330: 0x102b330: lw    a0, 12(s0)
+// 0x0102b340: 0x102b340: lw    a0, 12(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7460,7 +7460,7 @@ L_102b2f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b334: 0x102b334: lw    v1, 4(s3)
+// 0x0102b344: 0x102b344: lw    v1, 4(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7469,7 +7469,7 @@ L_102b2f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b338: 0x102b338: lw    v0, 4(s0)
+// 0x0102b348: 0x102b348: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7478,8 +7478,8 @@ L_102b2f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b33c: 0x102b33c: sll   zero, zero, 0
-// 0x0102b340: 0x102b340: bne   v1, v0, 0x102b35c sw    a0, 12(s3)
+// 0x0102b34c: 0x102b34c: sll   zero, zero, 0
+// 0x0102b350: 0x102b350: bne   v1, v0, 0x102b36c sw    a0, 12(s3)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -7490,9 +7490,9 @@ L_102b2f8:
 	add
 	ldloc.1
 	stelem.i4
-	bne.un L_102b35c
+	bne.un L_102b36c
 // --- basic block ---
-// 0x0102b348: 0x102b348: lw    v1, 6556(s4)
+// 0x0102b358: 0x102b358: lw    v1, 6556(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -7501,29 +7501,29 @@ L_102b2f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b34c: 0x102b34c: lw    v0, 0(s0)
+// 0x0102b35c: 0x102b35c: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102b350: 0x102b350: sll   zero, zero, 0
-// 0x0102b354: 0x102b354: beq   v1, v0, 0x102bc84 sll   zero, zero, 0
+// 0x0102b360: 0x102b360: sll   zero, zero, 0
+// 0x0102b364: 0x102b364: beq   v1, v0, 0x102bc94 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_102bc84
+	beq  L_102bc94
 // --- basic block ---
-L_102b35c:
-// 0x0102b35c: 0x102b35c: lui   s3, 0x0
+L_102b36c:
+// 0x0102b36c: 0x102b36c: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0102b360: 0x102b360: addiu s3, s3, 6556
+// 0x0102b370: 0x102b370: addiu s3, s3, 6556
 	ldloc 9
 	ldc.i4 6556
 	add
 	stloc 9
-// 0x0102b364: 0x102b364: lw    v1, 16(s3)
+// 0x0102b374: 0x102b374: lw    v1, 16(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7532,23 +7532,23 @@ L_102b35c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b368: 0x102b368: addiu v0, zero, 4096
+// 0x0102b378: 0x102b378: addiu v0, zero, 4096
 	ldc.i4 4096
 	stloc 5
-// 0x0102b36c: 0x102b36c: bne   v1, v0, 0x102b3a0 addu  v1, zero, zero
+// 0x0102b37c: 0x102b37c: bne   v1, v0, 0x102b3b0 addu  v1, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	bne.un L_102b3a0
+	bne.un L_102b3b0
 // --- basic block ---
-// 0x0102b374: 0x102b374: addu  a0, s3, zero
+// 0x0102b384: 0x102b384: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0102b378: 0x102b378: addu  a1, s0, zero
+// 0x0102b388: 0x102b388: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0102b37c: 0x102b37c: jal   0x1001800 addiu a2, zero, 20
+// 0x0102b38c: 0x102b38c: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -7560,26 +7560,26 @@ L_102b35c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b384: 0x102b384: lw    v1, 0(s0)
+// 0x0102b394: 0x102b394: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102b388: 0x102b388: lui   v0, 0x60000
+// 0x0102b398: 0x102b398: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102b38c: 0x102b38c: sw    v1, -25276(v0)
+// 0x0102b39c: 0x102b39c: sw    v1, -24812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6319
+	ldc.i4 -6203
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102b390: 0x102b390: lw    v1, 4(s0)
+// 0x0102b3a0: 0x102b3a0: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7588,12 +7588,12 @@ L_102b35c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b394: 0x102b394: addiu v0, v0, -25276
+// 0x0102b3a4: 0x102b3a4: addiu v0, v0, -24812
 	ldloc 5
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc 5
-// 0x0102b398: 0x102b398: j	 0x102bc84 sw    v1, 4(v0)
+// 0x0102b3a8: 0x102b3a8: j	 0x102bc94 sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7602,47 +7602,47 @@ L_102b35c:
 	add
 	ldloc 6
 	stelem.i4
-	br L_102bc84
+	br L_102bc94
 // --- basic block ---
-L_102b3a0:
-// 0x0102b3a0: 0x102b3a0: cibyl_sysc_arg 0x3
+L_102b3b0:
+// 0x0102b3b0: 0x102b3b0: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0102b3a4: 0x102b3a4: cibyl_sysc 0x418
+// 0x0102b3b4: 0x102b3b4: cibyl_sysc 0x418
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0102b3a8: 0x102b3a8: addu  v1, v0, zero
+// 0x0102b3b8: 0x102b3b8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0102b3ac: 0x102b3ac: lui   v0, 0x60000
+// 0x0102b3bc: 0x102b3bc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102b3b0: 0x102b3b0: lw    v0, -25192(v0)
+// 0x0102b3c0: 0x102b3c0: lw    v0, -24728(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6298
+	ldc.i4 -6182
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b3b4: 0x102b3b4: sll   zero, zero, 0
-// 0x0102b3b8: 0x102b3b8: subu  v1, v1, v0
+// 0x0102b3c4: 0x102b3c4: sll   zero, zero, 0
+// 0x0102b3c8: 0x102b3c8: subu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 6
-// 0x0102b3bc: 0x102b3bc: slti  v1, v1, 2
+// 0x0102b3cc: 0x102b3cc: slti  v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	clt
 	stloc 6
-// 0x0102b3c0: 0x102b3c0: bne   v1, zero, 0x102bc84 addu  a0, s3, zero
+// 0x0102b3d0: 0x102b3d0: bne   v1, zero, 0x102bc94 addu  a0, s3, zero
 	ldloc 6
 	ldloc 9
 	stloc.1
-	brtrue L_102bc84
+	brtrue L_102bc94
 // --- basic block ---
-// 0x0102b3c8: 0x102b3c8: jal   0x1008eb0 addu  a1, s0, zero
+// 0x0102b3d8: 0x102b3d8: jal   0x1008ec0 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -7650,23 +7650,23 @@ L_102b3a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b3d0: 0x102b3d0: slti  v0, v0, 16
+// 0x0102b3e0: 0x102b3e0: slti  v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	clt
 	stloc 5
-// 0x0102b3d4: 0x102b3d4: bne   v0, zero, 0x102bc84 lui   v0, 0x0
+// 0x0102b3e4: 0x102b3e4: bne   v0, zero, 0x102bc94 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_102bc84
+	brtrue L_102bc94
 // --- basic block ---
-// 0x0102b3dc: 0x102b3dc: lw    v0, 6576(v0)
+// 0x0102b3ec: 0x102b3ec: lw    v0, 6576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7675,25 +7675,25 @@ L_102b3a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b3e0: 0x102b3e0: sll   zero, zero, 0
-// 0x0102b3e4: 0x102b3e4: beq   v0, zero, 0x102b4ac addu  a0, s3, zero
+// 0x0102b3f0: 0x102b3f0: sll   zero, zero, 0
+// 0x0102b3f4: 0x102b3f4: beq   v0, zero, 0x102b4bc addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_102b4ac
+	brfalse L_102b4bc
 // --- basic block ---
-// 0x0102b3ec: 0x102b3ec: lui   s1, 0x0
+// 0x0102b3fc: 0x102b3fc: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0102b3f0: 0x102b3f0: addu  a0, s0, zero
+// 0x0102b400: 0x102b400: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0102b3f4: 0x102b3f4: addiu a1, s1, 6652
+// 0x0102b404: 0x102b404: addiu a1, s1, 6652
 	ldloc 8
 	ldc.i4 6652
 	add
 	stloc.2
-// 0x0102b3f8: 0x102b3f8: jal   0x1015394 addiu a2, sp, 92
+// 0x0102b408: 0x102b408: jal   0x10153a4 addiu a2, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
@@ -7703,16 +7703,16 @@ L_102b3a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_distance_1015394(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_distance_10153a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b400: 0x102b400: beq   v0, zero, 0x102bc84 sll   zero, zero, 0
+// 0x0102b410: 0x102b410: beq   v0, zero, 0x102bc94 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102bc84
+	brfalse L_102bc94
 // --- basic block ---
-// 0x0102b408: 0x102b408: lw    v0, 92(sp)
+// 0x0102b418: 0x102b418: lw    v0, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7721,7 +7721,7 @@ L_102b3a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b40c: 0x102b40c: lw    v1, 6652(s1)
+// 0x0102b41c: 0x102b41c: lw    v1, 6652(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7730,24 +7730,24 @@ L_102b3a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b410: 0x102b410: sll   zero, zero, 0
-// 0x0102b414: 0x102b414: bne   v0, v1, 0x102bc84 sll   zero, zero, 0
+// 0x0102b420: 0x102b420: sll   zero, zero, 0
+// 0x0102b424: 0x102b424: bne   v0, v1, 0x102bc94 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_102bc84
+	bne.un L_102bc94
 // --- basic block ---
-// 0x0102b41c: 0x102b41c: bne   v0, zero, 0x102b440 lui   v0, 0x0
+// 0x0102b42c: 0x102b42c: bne   v0, zero, 0x102b450 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_102b440
+	brtrue L_102b450
 // --- basic block ---
-// 0x0102b424: 0x102b424: addiu s1, s1, 6652
+// 0x0102b434: 0x102b434: addiu s1, s1, 6652
 	ldloc 8
 	ldc.i4 6652
 	add
 	stloc 8
-// 0x0102b428: 0x102b428: lw    v0, 12(s1)
+// 0x0102b438: 0x102b438: lw    v0, 12(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7756,7 +7756,7 @@ L_102b3a0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b42c: 0x102b42c: lw    v1, 104(sp)
+// 0x0102b43c: 0x102b43c: lw    v1, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7765,24 +7765,24 @@ L_102b3a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b430: 0x102b430: sll   zero, zero, 0
-// 0x0102b434: 0x102b434: bne   v1, v0, 0x102bc88 addu  s1, zero, zero
+// 0x0102b440: 0x102b440: sll   zero, zero, 0
+// 0x0102b444: 0x102b444: bne   v1, v0, 0x102bc98 addu  s1, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	bne.un L_102bc88
+	bne.un L_102bc98
 // --- basic block ---
-// 0x0102b43c: 0x102b43c: lui   v0, 0x0
+// 0x0102b44c: 0x102b44c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_102b440:
-// 0x0102b440: 0x102b440: addiu v0, v0, 6652
+L_102b450:
+// 0x0102b450: 0x102b450: addiu v0, v0, 6652
 	ldloc 5
 	ldc.i4 6652
 	add
 	stloc 5
-// 0x0102b444: 0x102b444: lw    v1, 4(v0)
+// 0x0102b454: 0x102b454: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7791,7 +7791,7 @@ L_102b440:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b448: 0x102b448: lw    a0, 96(sp)
+// 0x0102b458: 0x102b458: lw    a0, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7800,15 +7800,15 @@ L_102b440:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b44c: 0x102b44c: sll   zero, zero, 0
-// 0x0102b450: 0x102b450: bne   a0, v1, 0x102bc88 addu  s1, zero, zero
+// 0x0102b45c: 0x102b45c: sll   zero, zero, 0
+// 0x0102b460: 0x102b460: bne   a0, v1, 0x102bc98 addu  s1, zero, zero
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc 8
-	bne.un L_102bc88
+	bne.un L_102bc98
 // --- basic block ---
-// 0x0102b458: 0x102b458: lw    v0, 16(v0)
+// 0x0102b468: 0x102b468: lw    v0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7817,7 +7817,7 @@ L_102b440:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b45c: 0x102b45c: lw    v1, 108(sp)
+// 0x0102b46c: 0x102b46c: lw    v1, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7826,22 +7826,22 @@ L_102b440:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b460: 0x102b460: sll   zero, zero, 0
-// 0x0102b464: 0x102b464: bne   v1, v0, 0x102bc88 lui   v0, 0x0
+// 0x0102b470: 0x102b470: sll   zero, zero, 0
+// 0x0102b474: 0x102b474: bne   v1, v0, 0x102bc98 lui   v0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_102bc88
+	bne.un L_102bc98
 // --- basic block ---
-// 0x0102b46c: 0x102b46c: lw    v1, 0(s0)
+// 0x0102b47c: 0x102b47c: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102b470: 0x102b470: lw    a1, 4(s0)
+// 0x0102b480: 0x102b480: lw    a1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7850,12 +7850,12 @@ L_102b440:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102b474: 0x102b474: addiu a0, v0, 6556
+// 0x0102b484: 0x102b484: addiu a0, v0, 6556
 	ldloc 5
 	ldc.i4 6556
 	add
 	stloc.1
-// 0x0102b478: 0x102b478: sw    a1, 4(a0)
+// 0x0102b488: 0x102b488: sw    a1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7864,7 +7864,7 @@ L_102b440:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102b47c: 0x102b47c: sw    v1, 6556(v0)
+// 0x0102b48c: 0x102b48c: sw    v1, 6556(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7873,26 +7873,26 @@ L_102b440:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102b480: 0x102b480: lw    v1, 0(s0)
+// 0x0102b490: 0x102b490: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102b484: 0x102b484: lui   v0, 0x60000
+// 0x0102b494: 0x102b494: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102b488: 0x102b488: sw    v1, -25276(v0)
+// 0x0102b498: 0x102b498: sw    v1, -24812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6319
+	ldc.i4 -6203
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102b48c: 0x102b48c: lw    v1, 4(s0)
+// 0x0102b49c: 0x102b49c: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7901,28 +7901,28 @@ L_102b440:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b490: 0x102b490: addiu v0, v0, -25276
+// 0x0102b4a0: 0x102b4a0: addiu v0, v0, -24812
 	ldloc 5
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc 5
-// 0x0102b494: 0x102b494: lui   a0, 0x0
+// 0x0102b4a4: 0x102b4a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102b498: 0x102b498: lui   a1, 0x0
+// 0x0102b4a8: 0x102b4a8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102b49c: 0x102b49c: addiu a0, a0, 6676
+// 0x0102b4ac: 0x102b4ac: addiu a0, a0, 6676
 	ldloc.1
 	ldc.i4 6676
 	add
 	stloc.1
-// 0x0102b4a0: 0x102b4a0: addiu a1, a1, 6684
+// 0x0102b4b0: 0x102b4b0: addiu a1, a1, 6684
 	ldloc.2
 	ldc.i4 6684
 	add
 	stloc.2
-// 0x0102b4a4: 0x102b4a4: j	 0x102b758 sw    v1, 4(v0)
+// 0x0102b4b4: 0x102b4b4: j	 0x102b768 sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7931,10 +7931,10 @@ L_102b440:
 	add
 	ldloc 6
 	stelem.i4
-	br L_102b758
+	br L_102b768
 // --- basic block ---
-L_102b4ac:
-// 0x0102b4ac: 0x102b4ac: jal   0x1009824 addu  a1, s0, zero
+L_102b4bc:
+// 0x0102b4bc: 0x102b4bc: jal   0x1009834 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -7942,34 +7942,34 @@ L_102b4ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b4b4: 0x102b4b4: lw    v1, 0(s0)
+// 0x0102b4c4: 0x102b4c4: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102b4b8: 0x102b4b8: addu  s2, v0, zero
+// 0x0102b4c8: 0x102b4c8: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0102b4bc: 0x102b4bc: lui   v0, 0x60000
+// 0x0102b4cc: 0x102b4cc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102b4c0: 0x102b4c0: sw    v1, -25276(v0)
+// 0x0102b4d0: 0x102b4d0: sw    v1, -24812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6319
+	ldc.i4 -6203
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102b4c4: 0x102b4c4: lw    v1, 4(s0)
+// 0x0102b4d4: 0x102b4d4: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7978,12 +7978,12 @@ L_102b4ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b4c8: 0x102b4c8: addiu v0, v0, -25276
+// 0x0102b4d8: 0x102b4d8: addiu v0, v0, -24812
 	ldloc 5
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc 5
-// 0x0102b4cc: 0x102b4cc: j	 0x102bc88 sw    v1, 4(v0)
+// 0x0102b4dc: 0x102b4dc: j	 0x102bc98 sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7992,10 +7992,10 @@ L_102b4ac:
 	add
 	ldloc 6
 	stelem.i4
-	br L_102bc88
+	br L_102bc98
 // --- basic block ---
-L_102b4d4:
-// 0x0102b4d4: 0x102b4d4: lw    v1, 16(s3)
+L_102b4e4:
+// 0x0102b4e4: 0x102b4e4: lw    v1, 16(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8004,34 +8004,34 @@ L_102b4d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b4d8: 0x102b4d8: addiu v0, zero, 4096
+// 0x0102b4e8: 0x102b4e8: addiu v0, zero, 4096
 	ldc.i4 4096
 	stloc 5
-// 0x0102b4dc: 0x102b4dc: bne   v1, v0, 0x102b500 lui   v0, 0x60000
+// 0x0102b4ec: 0x102b4ec: bne   v1, v0, 0x102b510 lui   v0, 0x60000
 	ldloc 6
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_102b500
+	bne.un L_102b510
 // --- basic block ---
-// 0x0102b4e4: 0x102b4e4: lw    v1, 0(s0)
+// 0x0102b4f4: 0x102b4f4: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102b4e8: 0x102b4e8: sll   zero, zero, 0
-// 0x0102b4ec: 0x102b4ec: sw    v1, -25276(v0)
+// 0x0102b4f8: 0x102b4f8: sll   zero, zero, 0
+// 0x0102b4fc: 0x102b4fc: sw    v1, -24812(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6319
+	ldc.i4 -6203
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102b4f0: 0x102b4f0: lw    v1, 4(s0)
+// 0x0102b500: 0x102b500: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8040,12 +8040,12 @@ L_102b4d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b4f4: 0x102b4f4: addiu v0, v0, -25276
+// 0x0102b504: 0x102b504: addiu v0, v0, -24812
 	ldloc 5
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc 5
-// 0x0102b4f8: 0x102b4f8: j	 0x102b530 sw    v1, 4(v0)
+// 0x0102b508: 0x102b508: j	 0x102b540 sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8054,10 +8054,10 @@ L_102b4d4:
 	add
 	ldloc 6
 	stelem.i4
-	br L_102b530
+	br L_102b540
 // --- basic block ---
-L_102b500:
-// 0x0102b500: 0x102b500: lw    s1, 12(s0)
+L_102b510:
+// 0x0102b510: 0x102b510: lw    s1, 12(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8066,34 +8066,34 @@ L_102b500:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102b504: 0x102b504: jal   0x1030fd8 sll   zero, zero, 0
+// 0x0102b514: 0x102b514: jal   0x1030fe8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b50c: 0x102b50c: sll   v0, v0, 1
+// 0x0102b51c: 0x102b51c: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x0102b510: 0x102b510: slt   v0, v0, s1
+// 0x0102b520: 0x102b520: slt   v0, v0, s1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x0102b514: 0x102b514: beq   v0, zero, 0x102b53c lui   s1, 0x60000
+// 0x0102b524: 0x102b524: beq   v0, zero, 0x102b54c lui   s1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 8
-	brfalse L_102b53c
+	brfalse L_102b54c
 // --- basic block ---
-// 0x0102b51c: 0x102b51c: lw    v0, 6556(s4)
+// 0x0102b52c: 0x102b52c: lw    v0, 6556(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -8102,7 +8102,7 @@ L_102b500:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b520: 0x102b520: lw    a0, 4(s3)
+// 0x0102b530: 0x102b530: lw    a0, 4(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8111,12 +8111,12 @@ L_102b500:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b524: 0x102b524: addiu v1, s1, -25276
+// 0x0102b534: 0x102b534: addiu v1, s1, -24812
 	ldloc 8
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc 6
-// 0x0102b528: 0x102b528: sw    a0, 4(v1)
+// 0x0102b538: 0x102b538: sw    a0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -8125,17 +8125,17 @@ L_102b500:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0102b52c: 0x102b52c: sw    v0, -25276(s1)
+// 0x0102b53c: 0x102b53c: sw    v0, -24812(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6319
+	ldc.i4 -6203
 	add
 	ldloc 5
 	stelem.i4
-L_102b530:
-// 0x0102b530: 0x102b530: lw    v0, 16(s0)
+L_102b540:
+// 0x0102b540: 0x102b540: lw    v0, 16(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8144,7 +8144,7 @@ L_102b530:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b534: 0x102b534: j	 0x102b578 sw    v0, 16(s3)
+// 0x0102b544: 0x102b544: j	 0x102b588 sw    v0, 16(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8153,15 +8153,15 @@ L_102b530:
 	add
 	ldloc 5
 	stelem.i4
-	br L_102b578
+	br L_102b588
 // --- basic block ---
-L_102b53c:
-// 0x0102b53c: 0x102b53c: addiu a0, s1, -25276
+L_102b54c:
+// 0x0102b54c: 0x102b54c: addiu a0, s1, -24812
 	ldloc 8
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc.1
-// 0x0102b540: 0x102b540: jal   0x1008eb0 addu  a1, s0, zero
+// 0x0102b550: 0x102b550: jal   0x1008ec0 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -8169,25 +8169,25 @@ L_102b53c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b548: 0x102b548: slti  v0, v0, 21
+// 0x0102b558: 0x102b558: slti  v0, v0, 21
 	ldloc 5
 	ldc.i4.s 21
 	clt
 	stloc 5
-// 0x0102b54c: 0x102b54c: bne   v0, zero, 0x102b578 addiu a0, s1, -25276
+// 0x0102b55c: 0x102b55c: bne   v0, zero, 0x102b588 addiu a0, s1, -24812
 	ldloc 5
 	ldloc 8
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc.1
-	brtrue L_102b578
+	brtrue L_102b588
 // --- basic block ---
-// 0x0102b554: 0x102b554: jal   0x1009824 addu  a1, s0, zero
+// 0x0102b564: 0x102b564: jal   0x1009834 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -8195,12 +8195,12 @@ L_102b53c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b55c: 0x102b55c: sw    v0, 16(s3)
+// 0x0102b56c: 0x102b56c: sw    v0, 16(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8209,28 +8209,28 @@ L_102b53c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102b560: 0x102b560: lw    v1, 0(s0)
+// 0x0102b570: 0x102b570: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0102b564: 0x102b564: addiu v0, s1, -25276
+// 0x0102b574: 0x102b574: addiu v0, s1, -24812
 	ldloc 8
-	ldc.i4 -25276
+	ldc.i4 -24812
 	add
 	stloc 5
-// 0x0102b568: 0x102b568: sw    v1, -25276(s1)
+// 0x0102b578: 0x102b578: sw    v1, -24812(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6319
+	ldc.i4 -6203
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102b56c: 0x102b56c: lw    v1, 4(s0)
+// 0x0102b57c: 0x102b57c: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8239,8 +8239,8 @@ L_102b53c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b570: 0x102b570: sll   zero, zero, 0
-// 0x0102b574: 0x102b574: sw    v1, 4(v0)
+// 0x0102b580: 0x102b580: sll   zero, zero, 0
+// 0x0102b584: 0x102b584: sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8249,14 +8249,14 @@ L_102b53c:
 	add
 	ldloc 6
 	stelem.i4
-L_102b578:
-// 0x0102b578: 0x102b578: lui   s1, 0x60000
+L_102b588:
+// 0x0102b588: 0x102b588: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0102b57c: 0x102b57c: lui   v1, 0x0
+// 0x0102b58c: 0x102b58c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0102b580: 0x102b580: lw    t0, 12(s0)
+// 0x0102b590: 0x102b590: lw    t0, 12(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8265,14 +8265,14 @@ L_102b578:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0102b584: 0x102b584: lw    a3, 0(s0)
+// 0x0102b594: 0x102b594: lw    a3, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0102b588: 0x102b588: lw    a2, 4(s0)
+// 0x0102b598: 0x102b598: lw    a2, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8281,7 +8281,7 @@ L_102b578:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102b58c: 0x102b58c: lw    a1, 8(s0)
+// 0x0102b59c: 0x102b59c: lw    a1, 8(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8290,21 +8290,21 @@ L_102b578:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102b590: 0x102b590: lw    a0, -25432(s1)
+// 0x0102b5a0: 0x102b5a0: lw    a0, -24968(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6358
+	ldc.i4 -6242
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b594: 0x102b594: addiu v0, v1, 6556
+// 0x0102b5a4: 0x102b5a4: addiu v0, v1, 6556
 	ldloc 6
 	ldc.i4 6556
 	add
 	stloc 5
-// 0x0102b598: 0x102b598: sw    t0, 12(v0)
+// 0x0102b5a8: 0x102b5a8: sw    t0, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8313,7 +8313,7 @@ L_102b578:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0102b59c: 0x102b59c: sw    a3, 6556(v1)
+// 0x0102b5ac: 0x102b5ac: sw    a3, 6556(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -8322,7 +8322,7 @@ L_102b578:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0102b5a0: 0x102b5a0: sw    a2, 4(v0)
+// 0x0102b5b0: 0x102b5b0: sw    a2, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8331,7 +8331,7 @@ L_102b578:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102b5a4: 0x102b5a4: bne   a0, zero, 0x102b5ec sw    a1, 8(v0)
+// 0x0102b5b4: 0x102b5b4: bne   a0, zero, 0x102b5fc sw    a1, 8(v0)
 	ldloc.1
 	ldloc 7
 	ldloc 5
@@ -8341,12 +8341,12 @@ L_102b578:
 	add
 	ldloc.2
 	stelem.i4
-	brtrue L_102b5ec
+	brtrue L_102b5fc
 // --- basic block ---
-// 0x0102b5ac: 0x102b5ac: lui   a0, 0x0
+// 0x0102b5bc: 0x102b5bc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102b5b0: 0x102b5b0: jal   0x100e348 addiu a0, a0, 6700
+// 0x0102b5c0: 0x102b5c0: jal   0x100e358 addiu a0, a0, 6700
 	ldloc.1
 	ldc.i4 6700
 	add
@@ -8356,18 +8356,18 @@ L_102b578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b5b8: 0x102b5b8: lui   a1, 0x0
+// 0x0102b5c8: 0x102b5c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102b5bc: 0x102b5bc: addu  a0, v0, zero
+// 0x0102b5cc: 0x102b5cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102b5c0: 0x102b5c0: jal   0x1001c08 addiu a1, a1, 20820
+// 0x0102b5d0: 0x102b5d0: jal   0x1001c08 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -8382,28 +8382,28 @@ L_102b578:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b5c8: 0x102b5c8: bne   v0, zero, 0x102b5d8 addiu v0, zero, 1
+// 0x0102b5d8: 0x102b5d8: bne   v0, zero, 0x102b5e8 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_102b5d8
+	brtrue L_102b5e8
 // --- basic block ---
-// 0x0102b5d0: 0x102b5d0: j	 0x102b5ec sw    v0, -25432(s1)
+// 0x0102b5e0: 0x102b5e0: j	 0x102b5fc sw    v0, -24968(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6358
+	ldc.i4 -6242
 	add
 	ldloc 5
 	stelem.i4
-	br L_102b5ec
+	br L_102b5fc
 // --- basic block ---
-L_102b5d8:
-// 0x0102b5d8: 0x102b5d8: addu  a0, zero, zero
+L_102b5e8:
+// 0x0102b5e8: 0x102b5e8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0102b5dc: 0x102b5dc: jal   0x102b0c8 addu  a1, zero, zero
+// 0x0102b5ec: 0x102b5ec: jal   0x102b0d8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -8411,31 +8411,31 @@ L_102b5d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::T_127_102b0c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::T_127_102b0d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b5e4: 0x102b5e4: j	 0x102bc88 addu  s1, zero, zero
+// 0x0102b5f4: 0x102b5f4: j	 0x102bc98 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_102bc88
+	br L_102bc98
 // --- basic block ---
-L_102b5ec:
-// 0x0102b5ec: 0x102b5ec: lui   s4, 0x60000
+L_102b5fc:
+// 0x0102b5fc: 0x102b5fc: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x0102b5f0: 0x102b5f0: lui   a0, 0x0
+// 0x0102b600: 0x102b600: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102b5f4: 0x102b5f4: addiu a0, a0, 6556
+// 0x0102b604: 0x102b604: addiu a0, a0, 6556
 	ldloc.1
 	ldc.i4 6556
 	add
 	stloc.1
-// 0x0102b5f8: 0x102b5f8: jal   0x101db84 addiu a1, s4, -25200
+// 0x0102b608: 0x102b608: jal   0x101db94 addiu a1, s4, -24736
 	ldloc 12
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.2
 	ldloc.0
@@ -8443,15 +8443,15 @@ L_102b5ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_position_101db84(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_position_101db94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b600: 0x102b600: lui   v0, 0x0
+// 0x0102b610: 0x102b610: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102b604: 0x102b604: lw    v1, 6576(v0)
+// 0x0102b614: 0x102b614: lw    v1, 6576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8460,19 +8460,19 @@ L_102b5ec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b608: 0x102b608: sll   zero, zero, 0
-// 0x0102b60c: 0x102b60c: beq   v1, zero, 0x102b76c addiu v0, v0, 6576
+// 0x0102b618: 0x102b618: sll   zero, zero, 0
+// 0x0102b61c: 0x102b61c: beq   v1, zero, 0x102b77c addiu v0, v0, 6576
 	ldloc 6
 	ldloc 5
 	ldc.i4 6576
 	add
 	stloc 5
-	brfalse L_102b76c
+	brfalse L_102b77c
 // --- basic block ---
-// 0x0102b614: 0x102b614: lui   s3, 0x0
+// 0x0102b624: 0x102b624: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0102b618: 0x102b618: lw    s1, 20(v0)
+// 0x0102b628: 0x102b628: lw    s1, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8481,7 +8481,7 @@ L_102b5ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102b61c: 0x102b61c: lw    s0, 32(v0)
+// 0x0102b62c: 0x102b62c: lw    s0, 32(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8490,7 +8490,7 @@ L_102b5ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102b620: 0x102b620: jal   0x1015474 addiu a0, s3, 6652
+// 0x0102b630: 0x102b630: jal   0x1015484 addiu a0, s3, 6652
 	ldloc 9
 	ldc.i4 6652
 	add
@@ -8500,29 +8500,29 @@ L_102b5ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_activate_db_1015474(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_activate_db_1015484(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b628: 0x102b628: addiu v1, zero, -1
+// 0x0102b638: 0x102b638: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0102b62c: 0x102b62c: beq   v0, v1, 0x102bc84 addiu a0, s4, -25200
+// 0x0102b63c: 0x102b63c: beq   v0, v1, 0x102bc94 addiu a0, s4, -24736
 	ldloc 5
 	ldloc 6
 	ldloc 12
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.1
-	beq  L_102bc84
+	beq  L_102bc94
 // --- basic block ---
-// 0x0102b634: 0x102b634: addiu a1, s3, 6652
+// 0x0102b644: 0x102b644: addiu a1, s3, 6652
 	ldloc 9
 	ldc.i4 6652
 	add
 	stloc.2
-// 0x0102b638: 0x102b638: jal   0x1015394 addiu a2, sp, 92
+// 0x0102b648: 0x102b648: jal   0x10153a4 addiu a2, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
@@ -8532,16 +8532,16 @@ L_102b5ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_distance_1015394(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_distance_10153a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b640: 0x102b640: beq   v0, zero, 0x102b6e4 sll   zero, zero, 0
+// 0x0102b650: 0x102b650: beq   v0, zero, 0x102b6f4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102b6e4
+	brfalse L_102b6f4
 // --- basic block ---
-// 0x0102b648: 0x102b648: lw    v0, 92(sp)
+// 0x0102b658: 0x102b658: lw    v0, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8550,7 +8550,7 @@ L_102b5ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b64c: 0x102b64c: lw    v1, 6652(s3)
+// 0x0102b65c: 0x102b65c: lw    v1, 6652(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8559,21 +8559,21 @@ L_102b5ec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b650: 0x102b650: sll   zero, zero, 0
-// 0x0102b654: 0x102b654: bne   v0, v1, 0x102b6e4 sll   zero, zero, 0
+// 0x0102b660: 0x102b660: sll   zero, zero, 0
+// 0x0102b664: 0x102b664: bne   v0, v1, 0x102b6f4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_102b6e4
+	bne.un L_102b6f4
 // --- basic block ---
-// 0x0102b65c: 0x102b65c: bne   v0, zero, 0x102b678 addiu s3, s3, 6652
+// 0x0102b66c: 0x102b66c: bne   v0, zero, 0x102b688 addiu s3, s3, 6652
 	ldloc 5
 	ldloc 9
 	ldc.i4 6652
 	add
 	stloc 9
-	brtrue L_102b678
+	brtrue L_102b688
 // --- basic block ---
-// 0x0102b664: 0x102b664: lw    v0, 12(s3)
+// 0x0102b674: 0x102b674: lw    v0, 12(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8582,7 +8582,7 @@ L_102b5ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b668: 0x102b668: lw    v1, 104(sp)
+// 0x0102b678: 0x102b678: lw    v1, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8591,24 +8591,24 @@ L_102b5ec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b66c: 0x102b66c: sll   zero, zero, 0
-// 0x0102b670: 0x102b670: bne   v1, v0, 0x102b6e8 addu  s3, zero, zero
+// 0x0102b67c: 0x102b67c: sll   zero, zero, 0
+// 0x0102b680: 0x102b680: bne   v1, v0, 0x102b6f8 addu  s3, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	bne.un L_102b6e8
+	bne.un L_102b6f8
 // --- basic block ---
-L_102b678:
-// 0x0102b678: 0x102b678: lui   s3, 0x0
+L_102b688:
+// 0x0102b688: 0x102b688: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0102b67c: 0x102b67c: addiu s3, s3, 6652
+// 0x0102b68c: 0x102b68c: addiu s3, s3, 6652
 	ldloc 9
 	ldc.i4 6652
 	add
 	stloc 9
-// 0x0102b680: 0x102b680: lw    v0, 4(s3)
+// 0x0102b690: 0x102b690: lw    v0, 4(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8617,7 +8617,7 @@ L_102b678:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b684: 0x102b684: lw    v1, 96(sp)
+// 0x0102b694: 0x102b694: lw    v1, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8626,13 +8626,13 @@ L_102b678:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b688: 0x102b688: sll   zero, zero, 0
-// 0x0102b68c: 0x102b68c: bne   v1, v0, 0x102b6e4 sll   zero, zero, 0
+// 0x0102b698: 0x102b698: sll   zero, zero, 0
+// 0x0102b69c: 0x102b69c: bne   v1, v0, 0x102b6f4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_102b6e4
+	bne.un L_102b6f4
 // --- basic block ---
-// 0x0102b694: 0x102b694: lw    v0, 16(s3)
+// 0x0102b6a4: 0x102b6a4: lw    v0, 16(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -8641,7 +8641,7 @@ L_102b678:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b698: 0x102b698: lw    v1, 108(sp)
+// 0x0102b6a8: 0x102b6a8: lw    v1, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8650,20 +8650,20 @@ L_102b678:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b69c: 0x102b69c: sll   zero, zero, 0
-// 0x0102b6a0: 0x102b6a0: bne   v1, v0, 0x102b6e4 addu  a0, s3, zero
+// 0x0102b6ac: 0x102b6ac: sll   zero, zero, 0
+// 0x0102b6b0: 0x102b6b0: bne   v1, v0, 0x102b6f4 addu  a0, s3, zero
 	ldloc 6
 	ldloc 5
 	ldloc 9
 	stloc.1
-	bne.un L_102b6e4
+	bne.un L_102b6f4
 // --- basic block ---
-// 0x0102b6a8: 0x102b6a8: addiu a1, sp, 92
+// 0x0102b6b8: 0x102b6b8: addiu a1, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.2
-// 0x0102b6ac: 0x102b6ac: jal   0x1001800 addiu a2, zero, 48
+// 0x0102b6bc: 0x102b6bc: jal   0x1001800 addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
 	ldloc.1
@@ -8675,13 +8675,13 @@ L_102b678:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b6b4: 0x102b6b4: lui   v0, 0x0
+// 0x0102b6c4: 0x102b6c4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102b6b8: 0x102b6b8: lui   a0, 0x0
+// 0x0102b6c8: 0x102b6c8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102b6bc: 0x102b6bc: lw    v0, 6572(v0)
+// 0x0102b6cc: 0x102b6cc: lw    v0, 6572(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -8690,21 +8690,21 @@ L_102b678:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b6c0: 0x102b6c0: addiu a0, a0, 6576
+// 0x0102b6d0: 0x102b6d0: addiu a0, a0, 6576
 	ldloc.1
 	ldc.i4 6576
 	add
 	stloc.1
-// 0x0102b6c4: 0x102b6c4: addu  a2, s3, zero
+// 0x0102b6d4: 0x102b6d4: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x0102b6c8: 0x102b6c8: addu  a3, s3, zero
+// 0x0102b6d8: 0x102b6d8: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x0102b6cc: 0x102b6cc: addu  a1, a0, zero
+// 0x0102b6dc: 0x102b6dc: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0102b6d0: 0x102b6d0: sw    v0, 20(sp)
+// 0x0102b6e0: 0x102b6e0: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8713,7 +8713,7 @@ L_102b678:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102b6d4: 0x102b6d4: jal   0x102a3cc sw    zero, 16(sp)
+// 0x0102b6e4: 0x102b6e4: jal   0x102a3dc sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8727,30 +8727,30 @@ L_102b678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b6dc: 0x102b6dc: j	 0x102b6e8 addu  s3, v0, zero
+// 0x0102b6ec: 0x102b6ec: j	 0x102b6f8 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-	br L_102b6e8
+	br L_102b6f8
 // --- basic block ---
-L_102b6e4:
-// 0x0102b6e4: 0x102b6e4: addu  s3, zero, zero
+L_102b6f4:
+// 0x0102b6f4: 0x102b6f4: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_102b6e8:
-// 0x0102b6e8: 0x102b6e8: lui   s4, 0x0
+L_102b6f8:
+// 0x0102b6f8: 0x102b6f8: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x0102b6ec: 0x102b6ec: addiu s4, s4, 6576
+// 0x0102b6fc: 0x102b6fc: addiu s4, s4, 6576
 	ldloc 12
 	ldc.i4 6576
 	add
 	stloc 12
-// 0x0102b6f0: 0x102b6f0: lw    v0, 20(s4)
+// 0x0102b700: 0x102b700: lw    v0, 20(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -8759,40 +8759,40 @@ L_102b6e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b6f4: 0x102b6f4: sll   zero, zero, 0
-// 0x0102b6f8: 0x102b6f8: bne   s1, v0, 0x102b76c sll   zero, zero, 0
+// 0x0102b704: 0x102b704: sll   zero, zero, 0
+// 0x0102b708: 0x102b708: bne   s1, v0, 0x102b77c sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_102b76c
+	bne.un L_102b77c
 // --- basic block ---
-// 0x0102b700: 0x102b700: slt   s0, s3, s0
+// 0x0102b710: 0x102b710: slt   s0, s3, s0
 	ldloc 9
 	ldloc 10
 	clt
 	stloc 10
-// 0x0102b704: 0x102b704: bne   s0, zero, 0x102b76c sll   zero, zero, 0
+// 0x0102b714: 0x102b714: bne   s0, zero, 0x102b77c sll   zero, zero, 0
 	ldloc 10
-	brtrue L_102b76c
+	brtrue L_102b77c
 // --- basic block ---
-// 0x0102b70c: 0x102b70c: jal   0x102be58 addu  a0, s3, zero
+// 0x0102b71c: 0x102b71c: jal   0x102be68 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_good_102be58(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_good_102be68(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102b714: 0x102b714: beq   v0, zero, 0x102b76c lui   v0, 0x60000
+// 0x0102b724: 0x102b724: beq   v0, zero, 0x102b77c lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_102b76c
+	brfalse L_102b77c
 // --- basic block ---
-// 0x0102b71c: 0x102b71c: addiu v1, v0, -25260
+// 0x0102b72c: 0x102b72c: addiu v1, v0, -24796
 	ldloc 5
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc 6
-// 0x0102b720: 0x102b720: lw    v1, 52(v1)
+// 0x0102b730: 0x102b730: lw    v1, 52(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -8801,8 +8801,8 @@ L_102b6e8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b724: 0x102b724: sll   zero, zero, 0
-// 0x0102b728: 0x102b728: beq   v1, zero, 0x102b748 sw    s3, 32(s4)
+// 0x0102b734: 0x102b734: sll   zero, zero, 0
+// 0x0102b738: 0x102b738: beq   v1, zero, 0x102b758 sw    s3, 32(s4)
 	ldloc 6
 	ldloc 7
 	ldloc 12
@@ -8812,29 +8812,29 @@ L_102b6e8:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_102b748
+	brfalse L_102b758
 // --- basic block ---
-// 0x0102b730: 0x102b730: lui   a0, 0x60000
+// 0x0102b740: 0x102b740: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0102b734: 0x102b734: lui   a1, 0x0
+// 0x0102b744: 0x102b744: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102b738: 0x102b738: lw    v0, -25260(v0)
+// 0x0102b748: 0x102b748: lw    v0, -24796(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6315
+	ldc.i4 -6199
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b73c: 0x102b73c: addiu a0, a0, -25200
+// 0x0102b74c: 0x102b74c: addiu a0, a0, -24736
 	ldloc.1
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.1
-// 0x0102b740: 0x102b740: jalr  v0 addiu a1, a1, 6652
+// 0x0102b750: 0x102b750: jalr  v0 addiu a1, a1, 6652
 	ldloc 5
 	ldloc.2
 	ldc.i4 6652
@@ -8850,25 +8850,25 @@ L_102b6e8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102b748:
-// 0x0102b748: 0x102b748: lui   a0, 0x0
+L_102b758:
+// 0x0102b758: 0x102b758: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102b74c: 0x102b74c: lui   a1, 0x0
+// 0x0102b75c: 0x102b75c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102b750: 0x102b750: addiu a0, a0, 6676
+// 0x0102b760: 0x102b760: addiu a0, a0, 6676
 	ldloc.1
 	ldc.i4 6676
 	add
 	stloc.1
-// 0x0102b754: 0x102b754: addiu a1, a1, 6684
+// 0x0102b764: 0x102b764: addiu a1, a1, 6684
 	ldloc.2
 	ldc.i4 6684
 	add
 	stloc.2
-L_102b758:
-// 0x0102b758: 0x102b758: jal   0x1009824 lui   s1, 0x0
+L_102b768:
+// 0x0102b768: 0x102b768: jal   0x1009834 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -8876,49 +8876,49 @@ L_102b758:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b760: 0x102b760: addu  s2, v0, zero
+// 0x0102b770: 0x102b770: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0102b764: 0x102b764: j	 0x102bc88 addiu s1, s1, 6692
+// 0x0102b774: 0x102b774: j	 0x102bc98 addiu s1, s1, 6692
 	ldloc 8
 	ldc.i4 6692
 	add
 	stloc 8
-	br L_102bc88
+	br L_102bc98
 // --- basic block ---
-L_102b76c:
-// 0x0102b76c: 0x102b76c: jal   0x102bd04 lui   s5, 0x60000
+L_102b77c:
+// 0x0102b77c: 0x102b77c: jal   0x102bd14 lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 13
-	call int32 Cibyl32::roadmap_fuzzy_max_distance_102bd04()
+	call int32 Cibyl32::roadmap_fuzzy_max_distance_102bd14()
 	stloc 5
 // --- basic block ---
-// 0x0102b774: 0x102b774: addu  a2, v0, zero
+// 0x0102b784: 0x102b784: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0102b778: 0x102b778: addiu v0, zero, 16
+// 0x0102b788: 0x102b788: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0102b77c: 0x102b77c: lui   a0, 0x60000
+// 0x0102b78c: 0x102b78c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0102b780: 0x102b780: addiu a0, a0, -25200
+// 0x0102b790: 0x102b790: addiu a0, a0, -24736
 	ldloc.1
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.1
-// 0x0102b784: 0x102b784: addu  a1, zero, zero
+// 0x0102b794: 0x102b794: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102b788: 0x102b788: addiu a3, zero, 3
+// 0x0102b798: 0x102b798: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x0102b78c: 0x102b78c: sw    v0, 20(sp)
+// 0x0102b79c: 0x102b79c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8927,15 +8927,15 @@ L_102b76c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102b790: 0x102b790: addiu s5, s5, -25188
+// 0x0102b7a0: 0x102b7a0: addiu s5, s5, -24724
 	ldloc 13
-	ldc.i4 -25188
+	ldc.i4 -24724
 	add
 	stloc 13
-// 0x0102b794: 0x102b794: addiu v0, zero, 2
+// 0x0102b7a4: 0x102b7a4: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102b798: 0x102b798: sw    v0, 24(sp)
+// 0x0102b7a8: 0x102b7a8: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8944,7 +8944,7 @@ L_102b76c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102b79c: 0x102b79c: jal   0x102a6ec sw    s5, 16(sp)
+// 0x0102b7ac: 0x102b7ac: jal   0x102a6fc sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8958,12 +8958,12 @@ L_102b76c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_neighbours_102a6ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_neighbours_102a6fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b7a4: 0x102b7a4: jal   0x102be38 sw    v0, 148(sp)
+// 0x0102b7b4: 0x102b7b4: jal   0x102be48 sw    v0, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8972,47 +8972,47 @@ L_102b76c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x0102b7ac: 0x102b7ac: addu  s0, v0, zero
+// 0x0102b7bc: 0x102b7bc: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0102b7b0: 0x102b7b0: jal   0x102be38 lui   s8, 0x60000
+// 0x0102b7c0: 0x102b7c0: jal   0x102be48 lui   s8, 0x60000
 	ldc.i4 393216
 	stloc 16
-	call int32 Cibyl32::roadmap_fuzzy_false_102be38()
+	call int32 Cibyl32::roadmap_fuzzy_false_102be48()
 	stloc 5
 // --- basic block ---
-// 0x0102b7b8: 0x102b7b8: addu  s1, v0, zero
+// 0x0102b7c8: 0x102b7c8: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0102b7bc: 0x102b7bc: addiu s8, s8, -25352
+// 0x0102b7cc: 0x102b7cc: addiu s8, s8, -24888
 	ldloc 16
-	ldc.i4 -25352
+	ldc.i4 -24888
 	add
 	stloc 16
-// 0x0102b7c0: 0x102b7c0: addu  s4, zero, zero
+// 0x0102b7d0: 0x102b7d0: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x0102b7c4: 0x102b7c4: addu  s6, zero, zero
+// 0x0102b7d4: 0x102b7d4: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x0102b7c8: 0x102b7c8: addu  s7, zero, zero
+// 0x0102b7d8: 0x102b7d8: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x0102b7cc: 0x102b7cc: j	 0x102b918 addu  s3, zero, zero
+// 0x0102b7dc: 0x102b7dc: j	 0x102b928 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_102b918
+	br L_102b928
 // --- basic block ---
-L_102b7d4:
-// 0x0102b7d4: 0x102b7d4: addiu v1, v1, 6556
+L_102b7e4:
+// 0x0102b7e4: 0x102b7e4: addiu v1, v1, 6556
 	ldloc 6
 	ldc.i4 6556
 	add
 	stloc 6
-// 0x0102b7d8: 0x102b7d8: lw    v0, 16(v1)
+// 0x0102b7e8: 0x102b7e8: lw    v0, 16(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -9021,29 +9021,29 @@ L_102b7d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b7dc: 0x102b7dc: lui   a1, 0x0
+// 0x0102b7ec: 0x102b7ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102b7e0: 0x102b7e0: lui   a2, 0x0
+// 0x0102b7f0: 0x102b7f0: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0102b7e4: 0x102b7e4: addu  a0, s8, zero
+// 0x0102b7f4: 0x102b7f4: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x0102b7e8: 0x102b7e8: addiu a1, a1, 6576
+// 0x0102b7f8: 0x102b7f8: addiu a1, a1, 6576
 	ldloc.2
 	ldc.i4 6576
 	add
 	stloc.2
-// 0x0102b7ec: 0x102b7ec: addiu a2, a2, 6652
+// 0x0102b7fc: 0x102b7fc: addiu a2, a2, 6652
 	ldloc.3
 	ldc.i4 6652
 	add
 	stloc.3
-// 0x0102b7f0: 0x102b7f0: addu  a3, s5, zero
+// 0x0102b800: 0x102b800: addu  a3, s5, zero
 	ldloc 13
 	stloc 4
-// 0x0102b7f4: 0x102b7f4: sw    v0, 20(sp)
+// 0x0102b804: 0x102b804: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9052,7 +9052,7 @@ L_102b7d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102b7f8: 0x102b7f8: jal   0x102a3cc sw    zero, 16(sp)
+// 0x0102b808: 0x102b808: jal   0x102a3dc sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9066,23 +9066,23 @@ L_102b7d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_fuzzify_102a3dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b800: 0x102b800: lui   a0, 0x60000
+// 0x0102b810: 0x102b810: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0102b804: 0x102b804: addiu a0, a0, -25260
+// 0x0102b814: 0x102b814: addiu a0, a0, -24796
 	ldloc.1
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc.1
-// 0x0102b808: 0x102b808: addu  v1, v0, zero
+// 0x0102b818: 0x102b818: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0102b80c: 0x102b80c: lw    v0, 52(a0)
+// 0x0102b81c: 0x102b81c: lw    v0, 52(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -9091,30 +9091,30 @@ L_102b7d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b810: 0x102b810: sll   zero, zero, 0
-// 0x0102b814: 0x102b814: beq   v0, zero, 0x102b85c addiu v0, zero, 48
+// 0x0102b820: 0x102b820: sll   zero, zero, 0
+// 0x0102b824: 0x102b824: beq   v0, zero, 0x102b86c addiu v0, zero, 48
 	ldloc 5
 	ldc.i4.s 48
 	stloc 5
-	brfalse L_102b85c
+	brfalse L_102b86c
 // --- basic block ---
-// 0x0102b81c: 0x102b81c: mult  s3, v0
+// 0x0102b82c: 0x102b82c: mult  s3, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 18
-// 0x0102b820: 0x102b820: addiu a2, zero, 1
+// 0x0102b830: 0x102b830: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0102b824: 0x102b824: lui   a1, 0x60000
+// 0x0102b834: 0x102b834: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0102b828: 0x102b828: addiu a1, a1, -25260
+// 0x0102b838: 0x102b838: addiu a1, a1, -24796
 	ldloc.2
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc.2
-// 0x0102b82c: 0x102b82c: sw    a2, 144(sp)
+// 0x0102b83c: 0x102b83c: sw    a2, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9123,10 +9123,10 @@ L_102b7d4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102b830: 0x102b830: lui   a2, 0x60000
+// 0x0102b840: 0x102b840: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0102b834: 0x102b834: lw    v0, 8(a1)
+// 0x0102b844: 0x102b844: lw    v0, 8(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -9135,12 +9135,12 @@ L_102b7d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b838: 0x102b838: addiu a2, a2, -25188
+// 0x0102b848: 0x102b848: addiu a2, a2, -24724
 	ldloc.3
-	ldc.i4 -25188
+	ldc.i4 -24724
 	add
 	stloc.3
-// 0x0102b83c: 0x102b83c: lw    a1, 20(s8)
+// 0x0102b84c: 0x102b84c: lw    a1, 20(s8)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -9149,7 +9149,7 @@ L_102b7d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102b840: 0x102b840: sw    v1, 152(sp)
+// 0x0102b850: 0x102b850: sw    v1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9158,10 +9158,10 @@ L_102b7d4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102b844: 0x102b844: mflo  lo
+// 0x0102b854: 0x102b854: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x0102b848: 0x102b848: jalr  v0 addu  a0, a2, a0
+// 0x0102b858: 0x102b858: jalr  v0 addu  a0, a2, a0
 	ldloc 5
 	ldloc.3
 	ldloc.1
@@ -9177,7 +9177,7 @@ L_102b7d4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b850: 0x102b850: lw    v1, 152(sp)
+// 0x0102b860: 0x102b860: lw    v1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9186,16 +9186,16 @@ L_102b7d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b854: 0x102b854: bne   v0, zero, 0x102b864 slt   v0, s1, v1
+// 0x0102b864: 0x102b864: bne   v0, zero, 0x102b874 slt   v0, s1, v1
 	ldloc 5
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 5
-	brtrue L_102b864
+	brtrue L_102b874
 // --- basic block ---
-L_102b85c:
-// 0x0102b85c: 0x102b85c: sw    zero, 144(sp)
+L_102b86c:
+// 0x0102b86c: 0x102b86c: sw    zero, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9204,25 +9204,25 @@ L_102b85c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102b860: 0x102b860: slt   v0, s1, v1
+// 0x0102b870: 0x102b870: slt   v0, s1, v1
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 5
-L_102b864:
-// 0x0102b864: 0x102b864: bne   v0, zero, 0x102b8a4 sll   zero, zero, 0
+L_102b874:
+// 0x0102b874: 0x102b874: bne   v0, zero, 0x102b8b4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102b8a4
+	brtrue L_102b8b4
 // --- basic block ---
-// 0x0102b86c: 0x102b86c: bne   s4, zero, 0x102b900 slt   v0, s0, v1
+// 0x0102b87c: 0x102b87c: bne   s4, zero, 0x102b910 slt   v0, s0, v1
 	ldloc 12
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 5
-	brtrue L_102b900
+	brtrue L_102b910
 // --- basic block ---
-// 0x0102b874: 0x102b874: lw    v0, 144(sp)
+// 0x0102b884: 0x102b884: lw    v0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9231,19 +9231,19 @@ L_102b864:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b878: 0x102b878: sll   zero, zero, 0
-// 0x0102b87c: 0x102b87c: beq   v0, zero, 0x102b900 slt   v0, s0, v1
+// 0x0102b888: 0x102b888: sll   zero, zero, 0
+// 0x0102b88c: 0x102b88c: beq   v0, zero, 0x102b910 slt   v0, s0, v1
 	ldloc 5
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 5
-	brfalse L_102b900
+	brfalse L_102b910
 // --- basic block ---
-// 0x0102b884: 0x102b884: addu  a0, v1, zero
+// 0x0102b894: 0x102b894: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x0102b888: 0x102b888: jal   0x102be40 sw    v1, 152(sp)
+// 0x0102b898: 0x102b898: jal   0x102be50 sw    v1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9253,10 +9253,10 @@ L_102b864:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102b890: 0x102b890: lw    v1, 152(sp)
+// 0x0102b8a0: 0x102b8a0: lw    v1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9265,27 +9265,27 @@ L_102b864:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b894: 0x102b894: bne   v0, zero, 0x102b8d0 lui   a0, 0x60000
+// 0x0102b8a4: 0x102b8a4: bne   v0, zero, 0x102b8e0 lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	brtrue L_102b8d0
+	brtrue L_102b8e0
 // --- basic block ---
-// 0x0102b89c: 0x102b89c: j	 0x102b900 slt   v0, s0, v1
+// 0x0102b8ac: 0x102b8ac: j	 0x102b910 slt   v0, s0, v1
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 5
-	br L_102b900
+	br L_102b910
 // --- basic block ---
-L_102b8a4:
-// 0x0102b8a4: 0x102b8a4: beq   s4, zero, 0x102b8d0 lui   a0, 0x60000
+L_102b8b4:
+// 0x0102b8b4: 0x102b8b4: beq   s4, zero, 0x102b8e0 lui   a0, 0x60000
 	ldloc 12
 	ldc.i4 393216
 	stloc.1
-	brfalse L_102b8d0
+	brfalse L_102b8e0
 // --- basic block ---
-// 0x0102b8ac: 0x102b8ac: lw    a0, 144(sp)
+// 0x0102b8bc: 0x102b8bc: lw    a0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9294,43 +9294,43 @@ L_102b8a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102b8b0: 0x102b8b0: sll   zero, zero, 0
-// 0x0102b8b4: 0x102b8b4: bne   a0, zero, 0x102b8cc slt   v0, s0, v1
+// 0x0102b8c0: 0x102b8c0: sll   zero, zero, 0
+// 0x0102b8c4: 0x102b8c4: bne   a0, zero, 0x102b8dc slt   v0, s0, v1
 	ldloc.1
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 5
-	brtrue L_102b8cc
+	brtrue L_102b8dc
 // --- basic block ---
-// 0x0102b8bc: 0x102b8bc: beq   v0, zero, 0x102b910 addiu s4, zero, 1
+// 0x0102b8cc: 0x102b8cc: beq   v0, zero, 0x102b920 addiu s4, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 12
-	brfalse L_102b910
+	brfalse L_102b920
 // --- basic block ---
-// 0x0102b8c4: 0x102b8c4: j	 0x102b910 addu  s0, v1, zero
+// 0x0102b8d4: 0x102b8d4: j	 0x102b920 addu  s0, v1, zero
 	ldloc 6
 	stloc 10
-	br L_102b910
+	br L_102b920
 // --- basic block ---
-L_102b8cc:
-// 0x0102b8cc: 0x102b8cc: lui   a0, 0x60000
+L_102b8dc:
+// 0x0102b8dc: 0x102b8dc: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-L_102b8d0:
-// 0x0102b8d0: 0x102b8d0: addiu a0, a0, -25428
+L_102b8e0:
+// 0x0102b8e0: 0x102b8e0: addiu a0, a0, -24964
 	ldloc.1
-	ldc.i4 -25428
+	ldc.i4 -24964
 	add
 	stloc.1
-// 0x0102b8d4: 0x102b8d4: addu  a1, s8, zero
+// 0x0102b8e4: 0x102b8e4: addu  a1, s8, zero
 	ldloc 16
 	stloc.2
-// 0x0102b8d8: 0x102b8d8: addiu a2, zero, 76
+// 0x0102b8e8: 0x102b8e8: addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
-// 0x0102b8dc: 0x102b8dc: jal   0x1001800 sw    v1, 152(sp)
+// 0x0102b8ec: 0x102b8ec: jal   0x1001800 sw    v1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9348,7 +9348,7 @@ L_102b8d0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b8e4: 0x102b8e4: lw    v1, 152(sp)
+// 0x0102b8f4: 0x102b8f4: lw    v1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9357,16 +9357,16 @@ L_102b8d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b8e8: 0x102b8e8: addu  s0, s1, zero
+// 0x0102b8f8: 0x102b8f8: addu  s0, s1, zero
 	ldloc 8
 	stloc 10
-// 0x0102b8ec: 0x102b8ec: addu  s6, s7, zero
+// 0x0102b8fc: 0x102b8fc: addu  s6, s7, zero
 	ldloc 15
 	stloc 14
-// 0x0102b8f0: 0x102b8f0: addu  s1, v1, zero
+// 0x0102b900: 0x102b900: addu  s1, v1, zero
 	ldloc 6
 	stloc 8
-// 0x0102b8f4: 0x102b8f4: lw    s4, 144(sp)
+// 0x0102b904: 0x102b904: lw    s4, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9375,35 +9375,35 @@ L_102b8d0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102b8f8: 0x102b8f8: j	 0x102b910 addu  s7, s3, zero
+// 0x0102b908: 0x102b908: j	 0x102b920 addu  s7, s3, zero
 	ldloc 9
 	stloc 15
-	br L_102b910
+	br L_102b920
 // --- basic block ---
-L_102b900:
-// 0x0102b900: 0x102b900: beq   v0, zero, 0x102b910 sll   zero, zero, 0
+L_102b910:
+// 0x0102b910: 0x102b910: beq   v0, zero, 0x102b920 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102b910
+	brfalse L_102b920
 // --- basic block ---
-// 0x0102b908: 0x102b908: addu  s0, v1, zero
+// 0x0102b918: 0x102b918: addu  s0, v1, zero
 	ldloc 6
 	stloc 10
-// 0x0102b90c: 0x102b90c: addu  s6, s3, zero
+// 0x0102b91c: 0x102b91c: addu  s6, s3, zero
 	ldloc 9
 	stloc 14
-L_102b910:
-// 0x0102b910: 0x102b910: addiu s3, s3, 1
+L_102b920:
+// 0x0102b920: 0x102b920: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0102b914: 0x102b914: addiu s5, s5, 48
+// 0x0102b924: 0x102b924: addiu s5, s5, 48
 	ldloc 13
 	ldc.i4.s 48
 	add
 	stloc 13
-L_102b918:
-// 0x0102b918: 0x102b918: lw    a1, 148(sp)
+L_102b928:
+// 0x0102b928: 0x102b928: lw    a1, 148(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9412,45 +9412,45 @@ L_102b918:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102b91c: 0x102b91c: sll   zero, zero, 0
-// 0x0102b920: 0x102b920: slt   v0, s3, a1
+// 0x0102b92c: 0x102b92c: sll   zero, zero, 0
+// 0x0102b930: 0x102b930: slt   v0, s3, a1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc 5
-// 0x0102b924: 0x102b924: bne   v0, zero, 0x102b7d4 lui   v1, 0x0
+// 0x0102b934: 0x102b934: bne   v0, zero, 0x102b7e4 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_102b7d4
+	brtrue L_102b7e4
 // --- basic block ---
-// 0x0102b92c: 0x102b92c: jal   0x102be40 addu  a0, s1, zero
+// 0x0102b93c: 0x102b93c: jal   0x102be50 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be40(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_acceptable_102be50(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102b934: 0x102b934: beq   v0, zero, 0x102bbe4 lui   s3, 0x0
+// 0x0102b944: 0x102b944: beq   v0, zero, 0x102bbf4 lui   s3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_102bbe4
+	brfalse L_102bbf4
 // --- basic block ---
-// 0x0102b93c: 0x102b93c: addiu s5, s3, 6652
+// 0x0102b94c: 0x102b94c: addiu s5, s3, 6652
 	ldloc 9
 	ldc.i4 6652
 	add
 	stloc 13
-// 0x0102b940: 0x102b940: addiu a0, sp, 52
+// 0x0102b950: 0x102b950: addiu a0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.1
-// 0x0102b944: 0x102b944: addu  a1, s5, zero
+// 0x0102b954: 0x102b954: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x0102b948: 0x102b948: jal   0x1001800 addiu a2, zero, 20
+// 0x0102b958: 0x102b958: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -9462,37 +9462,37 @@ L_102b918:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b950: 0x102b950: addiu a1, zero, 48
+// 0x0102b960: 0x102b960: addiu a1, zero, 48
 	ldc.i4.s 48
 	stloc.2
-// 0x0102b954: 0x102b954: mult  s7, a1
+// 0x0102b964: 0x102b964: mult  s7, a1
 	ldloc 15
 	ldloc.2
 	mul
 	stloc 18
-// 0x0102b958: 0x102b958: lui   a1, 0x60000
+// 0x0102b968: 0x102b968: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0102b95c: 0x102b95c: addiu a1, a1, -25188
+// 0x0102b96c: 0x102b96c: addiu a1, a1, -24724
 	ldloc.2
-	ldc.i4 -25188
+	ldc.i4 -24724
 	add
 	stloc.2
-// 0x0102b960: 0x102b960: addiu s8, zero, -1
+// 0x0102b970: 0x102b970: addiu s8, zero, -1
 	ldc.i4.m1
 	stloc 16
-// 0x0102b964: 0x102b964: mflo  lo
+// 0x0102b974: 0x102b974: mflo  lo
 	ldloc 18
 	stloc 15
-// 0x0102b968: 0x102b968: addu  a1, a1, s7
+// 0x0102b978: 0x102b978: addu  a1, a1, s7
 	ldloc.2
 	ldloc 15
 	add
 	stloc.2
-// 0x0102b96c: 0x102b96c: addu  a0, a1, zero
+// 0x0102b97c: 0x102b97c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0102b970: 0x102b970: jal   0x1015474 sw    a1, 152(sp)
+// 0x0102b980: 0x102b980: jal   0x1015484 sw    a1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9506,12 +9506,12 @@ L_102b918:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_activate_db_1015474(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_activate_db_1015484(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b978: 0x102b978: lw    a1, 152(sp)
+// 0x0102b988: 0x102b988: lw    a1, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9520,17 +9520,17 @@ L_102b918:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102b97c: 0x102b97c: beq   v0, s8, 0x102bc84 addu  a0, s5, zero
+// 0x0102b98c: 0x102b98c: beq   v0, s8, 0x102bc94 addu  a0, s5, zero
 	ldloc 5
 	ldloc 16
 	ldloc 13
 	stloc.1
-	beq  L_102bc84
+	beq  L_102bc94
 // --- basic block ---
-// 0x0102b984: 0x102b984: addiu a2, zero, 48
+// 0x0102b994: 0x102b994: addiu a2, zero, 48
 	ldc.i4.s 48
 	stloc.3
-// 0x0102b988: 0x102b988: jal   0x1001800 lui   s7, 0x0
+// 0x0102b998: 0x102b998: jal   0x1001800 lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 15
 	ldloc.1
@@ -9542,23 +9542,23 @@ L_102b918:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b990: 0x102b990: addiu s2, s7, 6576
+// 0x0102b9a0: 0x102b9a0: addiu s2, s7, 6576
 	ldloc 15
 	ldc.i4 6576
 	add
 	stloc 11
-// 0x0102b994: 0x102b994: lui   a1, 0x60000
+// 0x0102b9a4: 0x102b9a4: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0102b998: 0x102b998: addiu a1, a1, -25428
+// 0x0102b9a8: 0x102b9a8: addiu a1, a1, -24964
 	ldloc.2
-	ldc.i4 -25428
+	ldc.i4 -24964
 	add
 	stloc.2
-// 0x0102b99c: 0x102b99c: addu  a0, s2, zero
+// 0x0102b9ac: 0x102b9ac: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0102b9a0: 0x102b9a0: jal   0x1001800 addiu a2, zero, 76
+// 0x0102b9b0: 0x102b9b0: jal   0x1001800 addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
 	ldloc.1
@@ -9570,32 +9570,32 @@ L_102b918:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b9a8: 0x102b9a8: lui   a0, 0x10000
+// 0x0102b9b8: 0x102b9b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102b9ac: 0x102b9ac: lui   a3, 0x0
+// 0x0102b9bc: 0x102b9bc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0102b9b0: 0x102b9b0: addiu v0, zero, 1
+// 0x0102b9c0: 0x102b9c0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102b9b4: 0x102b9b4: addiu a0, a0, -31180
+// 0x0102b9c4: 0x102b9c4: addiu a0, a0, -31180
 	ldloc.1
 	ldc.i4 -31180
 	add
 	stloc.1
-// 0x0102b9b8: 0x102b9b8: addiu a3, a3, 6580
+// 0x0102b9c8: 0x102b9c8: addiu a3, a3, 6580
 	ldloc 4
 	ldc.i4 6580
 	add
 	stloc 4
-// 0x0102b9bc: 0x102b9bc: addu  a1, s5, zero
+// 0x0102b9cc: 0x102b9cc: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x0102b9c0: 0x102b9c0: addu  a2, zero, zero
+// 0x0102b9d0: 0x102b9d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102b9c4: 0x102b9c4: sw    s8, 36(s2)
+// 0x0102b9d4: 0x102b9d4: sw    s8, 36(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -9604,7 +9604,7 @@ L_102b918:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0102b9c8: 0x102b9c8: sw    s1, 32(s2)
+// 0x0102b9d8: 0x102b9d8: sw    s1, 32(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -9613,7 +9613,7 @@ L_102b918:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102b9cc: 0x102b9cc: jal   0x1019e40 sw    v0, 6576(s7)
+// 0x0102b9dc: 0x102b9dc: jal   0x1019e50 sw    v0, 6576(s7)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -9627,12 +9627,12 @@ L_102b918:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_activate_1019e40(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_activate_1019e50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102b9d4: 0x102b9d4: lw    v0, 6652(s3)
+// 0x0102b9e4: 0x102b9e4: lw    v0, 6652(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -9641,7 +9641,7 @@ L_102b918:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b9d8: 0x102b9d8: lw    v1, 52(sp)
+// 0x0102b9e8: 0x102b9e8: lw    v1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9650,19 +9650,19 @@ L_102b918:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b9dc: 0x102b9dc: sll   zero, zero, 0
-// 0x0102b9e0: 0x102b9e0: bne   v0, v1, 0x102bcd0 sll   zero, zero, 0
+// 0x0102b9ec: 0x102b9ec: sll   zero, zero, 0
+// 0x0102b9f0: 0x102b9f0: bne   v0, v1, 0x102bce0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_102bcd0
+	bne.un L_102bce0
 // --- basic block ---
-// 0x0102b9e8: 0x102b9e8: bne   v0, zero, 0x102ba08 lui   v0, 0x0
+// 0x0102b9f8: 0x102b9f8: bne   v0, zero, 0x102ba18 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_102ba08
+	brtrue L_102ba18
 // --- basic block ---
-// 0x0102b9f0: 0x102b9f0: lw    v1, 12(s5)
+// 0x0102ba00: 0x102ba00: lw    v1, 12(s5)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -9671,7 +9671,7 @@ L_102b918:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102b9f4: 0x102b9f4: lw    v0, 64(sp)
+// 0x0102ba04: 0x102ba04: lw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9680,24 +9680,24 @@ L_102b918:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102b9f8: 0x102b9f8: sll   zero, zero, 0
-// 0x0102b9fc: 0x102b9fc: bne   v1, v0, 0x102bcd4 lui   v0, 0x0
+// 0x0102ba08: 0x102ba08: sll   zero, zero, 0
+// 0x0102ba0c: 0x102ba0c: bne   v1, v0, 0x102bce4 lui   v0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_102bcd4
+	bne.un L_102bce4
 // --- basic block ---
-// 0x0102ba04: 0x102ba04: lui   v0, 0x0
+// 0x0102ba14: 0x102ba14: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_102ba08:
-// 0x0102ba08: 0x102ba08: addiu v0, v0, 6652
+L_102ba18:
+// 0x0102ba18: 0x102ba18: addiu v0, v0, 6652
 	ldloc 5
 	ldc.i4 6652
 	add
 	stloc 5
-// 0x0102ba0c: 0x102ba0c: lw    a0, 4(v0)
+// 0x0102ba1c: 0x102ba1c: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -9706,7 +9706,7 @@ L_102ba08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102ba10: 0x102ba10: lw    v1, 56(sp)
+// 0x0102ba20: 0x102ba20: lw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9715,13 +9715,13 @@ L_102ba08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102ba14: 0x102ba14: sll   zero, zero, 0
-// 0x0102ba18: 0x102ba18: bne   a0, v1, 0x102bcd0 sll   zero, zero, 0
+// 0x0102ba24: 0x102ba24: sll   zero, zero, 0
+// 0x0102ba28: 0x102ba28: bne   a0, v1, 0x102bce0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_102bcd0
+	bne.un L_102bce0
 // --- basic block ---
-// 0x0102ba20: 0x102ba20: lw    v1, 16(v0)
+// 0x0102ba30: 0x102ba30: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -9730,7 +9730,7 @@ L_102ba08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102ba24: 0x102ba24: lw    v0, 68(sp)
+// 0x0102ba34: 0x102ba34: lw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9739,27 +9739,27 @@ L_102ba08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ba28: 0x102ba28: sll   zero, zero, 0
-// 0x0102ba2c: 0x102ba2c: bne   v1, v0, 0x102bcd0 lui   v0, 0x60000
+// 0x0102ba38: 0x102ba38: sll   zero, zero, 0
+// 0x0102ba3c: 0x102ba3c: bne   v1, v0, 0x102bce0 lui   v0, 0x60000
 	ldloc 6
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_102bcd0
+	bne.un L_102bce0
 // --- basic block ---
-// 0x0102ba34: 0x102ba34: j	 0x102baf8 sll   zero, zero, 0
-	br L_102baf8
+// 0x0102ba44: 0x102ba44: j	 0x102bb08 sll   zero, zero, 0
+	br L_102bb08
 // --- basic block ---
-L_102ba3c:
-// 0x0102ba3c: 0x102ba3c: lui   a0, 0x10000
+L_102ba4c:
+// 0x0102ba4c: 0x102ba4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102ba40: 0x102ba40: addiu a0, a0, -25652
+// 0x0102ba50: 0x102ba50: addiu a0, a0, -25652
 	ldloc.1
 	ldc.i4 -25652
 	add
 	stloc.1
-// 0x0102ba44: 0x102ba44: jal   0x102a1bc addiu a1, sp, 52
+// 0x0102ba54: 0x102ba54: jal   0x102a1cc addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -9769,24 +9769,24 @@ L_102ba3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_trace_102a1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_trace_102a1cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ba4c: 0x102ba4c: lui   s2, 0x0
+// 0x0102ba5c: 0x102ba5c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0102ba50: 0x102ba50: lui   a0, 0x10000
+// 0x0102ba60: 0x102ba60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_102ba54:
-// 0x0102ba54: 0x102ba54: addiu a1, s2, 6652
+L_102ba64:
+// 0x0102ba64: 0x102ba64: addiu a1, s2, 6652
 	ldloc 11
 	ldc.i4 6652
 	add
 	stloc.2
-// 0x0102ba58: 0x102ba58: jal   0x102a1bc addiu a0, a0, -25636
+// 0x0102ba68: 0x102ba68: jal   0x102a1cc addiu a0, a0, -25636
 	ldloc.1
 	ldc.i4 -25636
 	add
@@ -9796,21 +9796,21 @@ L_102ba54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_trace_102a1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_trace_102a1cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ba60: 0x102ba60: lui   v0, 0x0
+// 0x0102ba70: 0x102ba70: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102ba64: 0x102ba64: lui   s1, 0x60000
+// 0x0102ba74: 0x102ba74: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0102ba68: 0x102ba68: lui   s3, 0x60000
+// 0x0102ba78: 0x102ba78: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0102ba6c: 0x102ba6c: lw    s5, 6596(v0)
+// 0x0102ba7c: 0x102ba7c: lw    s5, 6596(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -9819,44 +9819,44 @@ L_102ba54:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102ba70: 0x102ba70: addiu s1, s1, -24420
+// 0x0102ba80: 0x102ba80: addiu s1, s1, -23956
 	ldloc 8
-	ldc.i4 -24420
+	ldc.i4 -23956
 	add
 	stloc 8
-// 0x0102ba74: 0x102ba74: addiu s3, s3, -24400
+// 0x0102ba84: 0x102ba84: addiu s3, s3, -23936
 	ldloc 9
-	ldc.i4 -24400
+	ldc.i4 -23936
 	add
 	stloc 9
-// 0x0102ba78: 0x102ba78: addiu s2, s2, 6652
+// 0x0102ba88: 0x102ba88: addiu s2, s2, 6652
 	ldloc 11
 	ldc.i4 6652
 	add
 	stloc 11
-L_102ba7c:
-// 0x0102ba7c: 0x102ba7c: lw    v0, 0(s1)
+L_102ba8c:
+// 0x0102ba8c: 0x102ba8c: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102ba80: 0x102ba80: addu  a0, s2, zero
+// 0x0102ba90: 0x102ba90: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0102ba84: 0x102ba84: addiu s1, s1, 4
+// 0x0102ba94: 0x102ba94: addiu s1, s1, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x0102ba88: 0x102ba88: beq   v0, zero, 0x102ba98 addu  a1, s5, zero
+// 0x0102ba98: 0x102ba98: beq   v0, zero, 0x102baa8 addu  a1, s5, zero
 	ldloc 5
 	ldloc 13
 	stloc.2
-	brfalse L_102ba98
+	brfalse L_102baa8
 // --- basic block ---
-// 0x0102ba90: 0x102ba90: jalr  v0 sll   zero, zero, 0
+// 0x0102baa0: 0x102baa0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -9868,25 +9868,25 @@ L_102ba7c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102ba98:
-// 0x0102ba98: 0x102ba98: bne   s1, s3, 0x102ba7c lui   a0, 0x10000
+L_102baa8:
+// 0x0102baa8: 0x102baa8: bne   s1, s3, 0x102ba8c lui   a0, 0x10000
 	ldloc 8
 	ldloc 9
 	ldc.i4 65536
 	stloc.1
-	bne.un L_102ba7c
+	bne.un L_102ba8c
 // --- basic block ---
-// 0x0102baa0: 0x102baa0: lui   s1, 0x60000
+// 0x0102bab0: 0x102bab0: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0102baa4: 0x102baa4: addiu a0, a0, -31048
+// 0x0102bab4: 0x102bab4: addiu a0, a0, -31048
 	ldloc.1
 	ldc.i4 -31048
 	add
 	stloc.1
-// 0x0102baa8: 0x102baa8: jal   0x1019564 addiu s1, s1, -25260
+// 0x0102bab8: 0x102bab8: jal   0x1019574 addiu s1, s1, -24796
 	ldloc 8
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc 8
 	ldloc.0
@@ -9894,12 +9894,12 @@ L_102ba98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bab0: 0x102bab0: lw    v0, 52(s1)
+// 0x0102bac0: 0x102bac0: lw    v0, 52(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -9908,30 +9908,30 @@ L_102ba98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102bab4: 0x102bab4: sll   zero, zero, 0
-// 0x0102bab8: 0x102bab8: beq   v0, zero, 0x102baf8 lui   v0, 0x60000
+// 0x0102bac4: 0x102bac4: sll   zero, zero, 0
+// 0x0102bac8: 0x102bac8: beq   v0, zero, 0x102bb08 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_102baf8
+	brfalse L_102bb08
 // --- basic block ---
-// 0x0102bac0: 0x102bac0: lui   s2, 0x0
+// 0x0102bad0: 0x102bad0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0102bac4: 0x102bac4: addiu s2, s2, 6652
+// 0x0102bad4: 0x102bad4: addiu s2, s2, 6652
 	ldloc 11
 	ldc.i4 6652
 	add
 	stloc 11
-// 0x0102bac8: 0x102bac8: addiu a0, s1, 12
+// 0x0102bad8: 0x102bad8: addiu a0, s1, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc.1
-// 0x0102bacc: 0x102bacc: addu  a1, s2, zero
+// 0x0102badc: 0x102badc: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x0102bad0: 0x102bad0: jal   0x1001800 addiu a2, zero, 20
+// 0x0102bae0: 0x102bae0: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -9943,13 +9943,13 @@ L_102ba98:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bad8: 0x102bad8: lui   v1, 0x0
+// 0x0102bae8: 0x102bae8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0102badc: 0x102badc: lui   a2, 0x60000
+// 0x0102baec: 0x102baec: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0102bae0: 0x102bae0: lw    v0, 4(s1)
+// 0x0102baf0: 0x102baf0: lw    v0, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -9958,7 +9958,7 @@ L_102ba98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102bae4: 0x102bae4: lw    a1, 6596(v1)
+// 0x0102baf4: 0x102baf4: lw    a1, 6596(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -9967,13 +9967,13 @@ L_102ba98:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102bae8: 0x102bae8: addu  a0, s2, zero
+// 0x0102baf8: 0x102baf8: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0102baec: 0x102baec: jalr  v0 addiu a2, a2, -25228
+// 0x0102bafc: 0x102bafc: jalr  v0 addiu a2, a2, -24764
 	ldloc 5
 	ldloc.3
-	ldc.i4 -25228
+	ldc.i4 -24764
 	add
 	stloc.3
 	ldloc.0
@@ -9986,27 +9986,27 @@ L_102ba98:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102baf4: 0x102baf4: lui   v0, 0x60000
+// 0x0102bb04: 0x102bb04: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_102baf8:
-// 0x0102baf8: 0x102baf8: lw    v0, -25208(v0)
+L_102bb08:
+// 0x0102bb08: 0x102bb08: lw    v0, -24744(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6302
+	ldc.i4 -6186
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102bafc: 0x102bafc: sll   zero, zero, 0
-// 0x0102bb00: 0x102bb00: bne   v0, zero, 0x102bb28 lui   v0, 0x0
+// 0x0102bb0c: 0x102bb0c: sll   zero, zero, 0
+// 0x0102bb10: 0x102bb10: bne   v0, zero, 0x102bb38 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_102bb28
+	brtrue L_102bb38
 // --- basic block ---
-// 0x0102bb08: 0x102bb08: lw    s1, 6568(v0)
+// 0x0102bb18: 0x102bb18: lw    s1, 6568(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -10015,27 +10015,27 @@ L_102baf8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102bb0c: 0x102bb0c: jal   0x1030fd8 sll   zero, zero, 0
+// 0x0102bb1c: 0x102bb1c: jal   0x1030fe8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bb14: 0x102bb14: slt   v0, v0, s1
+// 0x0102bb24: 0x102bb24: slt   v0, v0, s1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x0102bb18: 0x102bb18: beq   v0, zero, 0x102bb28 sll   zero, zero, 0
+// 0x0102bb28: 0x102bb28: beq   v0, zero, 0x102bb38 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102bb28
+	brfalse L_102bb38
 // --- basic block ---
-// 0x0102bb20: 0x102bb20: jal   0x102ac94 addiu a0, sp, 72
+// 0x0102bb30: 0x102bb30: jal   0x102aca4 addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -10045,44 +10045,44 @@ L_102baf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::T_126_102ac94(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::T_126_102aca4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102bb28:
-// 0x0102bb28: 0x102bb28: bne   s4, zero, 0x102bb44 lui   a0, 0x0
+L_102bb38:
+// 0x0102bb38: 0x102bb38: bne   s4, zero, 0x102bb54 lui   a0, 0x0
 	ldloc 12
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_102bb44
+	brtrue L_102bb54
 // --- basic block ---
-// 0x0102bb30: 0x102bb30: jal   0x102be64 addu  a0, s0, zero
+// 0x0102bb40: 0x102bb40: jal   0x102be74 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be64(int32)
+	call int32 Cibyl32::roadmap_fuzzy_is_certain_102be74(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102bb38: 0x102bb38: bne   v0, zero, 0x102bb64 lui   a0, 0x10000
+// 0x0102bb48: 0x102bb48: bne   v0, zero, 0x102bb74 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_102bb64
+	brtrue L_102bb74
 // --- basic block ---
-// 0x0102bb40: 0x102bb40: lui   a0, 0x0
+// 0x0102bb50: 0x102bb50: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_102bb44:
-// 0x0102bb44: 0x102bb44: lui   a1, 0x0
+L_102bb54:
+// 0x0102bb54: 0x102bb54: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102bb48: 0x102bb48: addiu a0, a0, 6676
+// 0x0102bb58: 0x102bb58: addiu a0, a0, 6676
 	ldloc.1
 	ldc.i4 6676
 	add
 	stloc.1
-// 0x0102bb4c: 0x102bb4c: jal   0x1009824 addiu a1, a1, 6684
+// 0x0102bb5c: 0x102bb5c: jal   0x1009834 addiu a1, a1, 6684
 	ldloc.2
 	ldc.i4 6684
 	add
@@ -10092,26 +10092,26 @@ L_102bb44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bb54: 0x102bb54: lui   s1, 0x0
+// 0x0102bb64: 0x102bb64: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0102bb58: 0x102bb58: addu  s2, v0, zero
+// 0x0102bb68: 0x102bb68: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0102bb5c: 0x102bb5c: j	 0x102bc50 addiu s1, s1, 6692
+// 0x0102bb6c: 0x102bb6c: j	 0x102bc60 addiu s1, s1, 6692
 	ldloc 8
 	ldc.i4 6692
 	add
 	stloc 8
-	br L_102bc50
+	br L_102bc60
 // --- basic block ---
-L_102bb64:
-// 0x0102bb64: 0x102bb64: jal   0x101df24 addiu a0, a0, -31052
+L_102bb74:
+// 0x0102bb74: 0x102bb74: jal   0x101df34 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -10121,23 +10121,23 @@ L_102bb64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bb6c: 0x102bb6c: addiu v1, zero, 48
+// 0x0102bb7c: 0x102bb7c: addiu v1, zero, 48
 	ldc.i4.s 48
 	stloc 6
-// 0x0102bb70: 0x102bb70: mult  s6, v1
+// 0x0102bb80: 0x102bb80: mult  s6, v1
 	ldloc 14
 	ldloc 6
 	mul
 	stloc 18
-// 0x0102bb74: 0x102bb74: lui   a3, 0x0
+// 0x0102bb84: 0x102bb84: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0102bb78: 0x102bb78: lw    s2, 6572(a3)
+// 0x0102bb88: 0x102bb88: lw    s2, 6572(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
@@ -10146,23 +10146,23 @@ L_102bb64:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102bb7c: 0x102bb7c: lui   a3, 0x60000
+// 0x0102bb8c: 0x102bb8c: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0102bb80: 0x102bb80: addiu a3, a3, -25188
+// 0x0102bb90: 0x102bb90: addiu a3, a3, -24724
 	ldloc 4
-	ldc.i4 -25188
+	ldc.i4 -24724
 	add
 	stloc 4
-// 0x0102bb84: 0x102bb84: lui   v1, 0x0
+// 0x0102bb94: 0x102bb94: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0102bb88: 0x102bb88: addiu v1, v1, 6652
+// 0x0102bb98: 0x102bb98: addiu v1, v1, 6652
 	ldloc 6
 	ldc.i4 6652
 	add
 	stloc 6
-// 0x0102bb8c: 0x102bb8c: lw    a2, 44(v1)
+// 0x0102bb9c: 0x102bb9c: lw    a2, 44(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -10171,7 +10171,7 @@ L_102bb64:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102bb90: 0x102bb90: lw    a1, 40(v1)
+// 0x0102bba0: 0x102bba0: lw    a1, 40(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -10180,26 +10180,26 @@ L_102bb64:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102bb94: 0x102bb94: addiu v1, zero, 2
+// 0x0102bba4: 0x102bba4: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0102bb98: 0x102bb98: addiu a0, sp, 44
+// 0x0102bba8: 0x102bba8: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x0102bb9c: 0x102bb9c: addu  s1, a0, zero
+// 0x0102bbac: 0x102bbac: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0102bba0: 0x102bba0: mflo  lo
+// 0x0102bbb0: 0x102bbb0: mflo  lo
 	ldloc 18
 	stloc 14
-// 0x0102bba4: 0x102bba4: addu  s6, s6, a3
+// 0x0102bbb4: 0x102bbb4: addu  s6, s6, a3
 	ldloc 14
 	ldloc 4
 	add
 	stloc 14
-// 0x0102bba8: 0x102bba8: lw    a3, 44(s6)
+// 0x0102bbb8: 0x102bbb8: lw    a3, 44(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -10208,7 +10208,7 @@ L_102bb64:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102bbac: 0x102bbac: lw    t0, 40(s6)
+// 0x0102bbbc: 0x102bbbc: lw    t0, 40(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -10217,25 +10217,25 @@ L_102bb64:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0102bbb0: 0x102bbb0: addu  a2, a3, a2
+// 0x0102bbc0: 0x102bbc0: addu  a2, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x0102bbb4: 0x102bbb4: div   a2, v1
+// 0x0102bbc4: 0x102bbc4: div   a2, v1
 	ldloc.3
 	ldloc 6
 	div
 	stloc 18
-// 0x0102bbb8: 0x102bbb8: addu  a1, t0, a1
+// 0x0102bbc8: 0x102bbc8: addu  a1, t0, a1
 	ldloc 17
 	ldloc.2
 	add
 	stloc.2
-// 0x0102bbbc: 0x102bbbc: mflo  lo
+// 0x0102bbcc: 0x102bbcc: mflo  lo
 	ldloc 18
 	stloc.3
-// 0x0102bbc0: 0x102bbc0: sw    a2, 48(sp)
+// 0x0102bbd0: 0x102bbd0: sw    a2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10244,16 +10244,16 @@ L_102bb64:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102bbc4: 0x102bbc4: sll   zero, zero, 0
-// 0x0102bbc8: 0x102bbc8: div   a1, v1
+// 0x0102bbd4: 0x102bbd4: sll   zero, zero, 0
+// 0x0102bbd8: 0x102bbd8: div   a1, v1
 	ldloc.2
 	ldloc 6
 	div
 	stloc 18
-// 0x0102bbcc: 0x102bbcc: mflo  lo
+// 0x0102bbdc: 0x102bbdc: mflo  lo
 	ldloc 18
 	stloc.2
-// 0x0102bbd0: 0x102bbd0: beq   v0, zero, 0x102bc50 sw    a1, 44(sp)
+// 0x0102bbe0: 0x102bbe0: beq   v0, zero, 0x102bc60 sw    a1, 44(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -10263,9 +10263,9 @@ L_102bb64:
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_102bc50
+	brfalse L_102bc60
 // --- basic block ---
-// 0x0102bbd8: 0x102bbd8: lw    s2, 16(v0)
+// 0x0102bbe8: 0x102bbe8: lw    s2, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -10274,13 +10274,13 @@ L_102bb64:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102bbdc: 0x102bbdc: j	 0x102bc54 lui   v0, 0x60000
+// 0x0102bbec: 0x102bbec: j	 0x102bc64 lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-	br L_102bc54
+	br L_102bc64
 // --- basic block ---
-L_102bbe4:
-// 0x0102bbe4: 0x102bbe4: lw    v0, 6652(s3)
+L_102bbf4:
+// 0x0102bbf4: 0x102bbf4: lw    v0, 6652(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -10289,15 +10289,15 @@ L_102bbe4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102bbe8: 0x102bbe8: sll   zero, zero, 0
-// 0x0102bbec: 0x102bbec: bltz  v0, 0x102bc30 addiu v1, zero, -1
+// 0x0102bbf8: 0x102bbf8: sll   zero, zero, 0
+// 0x0102bbfc: 0x102bbfc: bltz  v0, 0x102bc40 addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
 	ldc.i4.s 0
-	blt L_102bc30
+	blt L_102bc40
 // --- basic block ---
-// 0x0102bbf4: 0x102bbf4: jal   0x1015474 addiu a0, s3, 6652
+// 0x0102bc04: 0x102bc04: jal   0x1015484 addiu a0, s3, 6652
 	ldloc 9
 	ldc.i4 6652
 	add
@@ -10307,27 +10307,27 @@ L_102bbe4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_activate_db_1015474(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_activate_db_1015484(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bbfc: 0x102bbfc: addiu v1, zero, -1
+// 0x0102bc0c: 0x102bc0c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0102bc00: 0x102bc00: beq   v0, v1, 0x102bc84 lui   a0, 0x10000
+// 0x0102bc10: 0x102bc10: beq   v0, v1, 0x102bc94 lui   a0, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	beq  L_102bc84
+	beq  L_102bc94
 // --- basic block ---
-// 0x0102bc08: 0x102bc08: addiu a0, a0, -25600
+// 0x0102bc18: 0x102bc18: addiu a0, a0, -25600
 	ldloc.1
 	ldc.i4 -25600
 	add
 	stloc.1
-// 0x0102bc0c: 0x102bc0c: jal   0x102a1bc addiu a1, s3, 6652
+// 0x0102bc1c: 0x102bc1c: jal   0x102a1cc addiu a1, s3, 6652
 	ldloc 9
 	ldc.i4 6652
 	add
@@ -10337,15 +10337,15 @@ L_102bbe4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_trace_102a1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_trace_102a1cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bc14: 0x102bc14: lui   a0, 0x10000
+// 0x0102bc24: 0x102bc24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102bc18: 0x102bc18: jal   0x1019564 addiu a0, a0, -31180
+// 0x0102bc28: 0x102bc28: jal   0x1019574 addiu a0, a0, -31180
 	ldloc.1
 	ldc.i4 -31180
 	add
@@ -10355,15 +10355,15 @@ L_102bbe4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bc20: 0x102bc20: lui   a0, 0x10000
+// 0x0102bc30: 0x102bc30: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102bc24: 0x102bc24: jal   0x1019564 addiu a0, a0, -31048
+// 0x0102bc34: 0x102bc34: jal   0x1019574 addiu a0, a0, -31048
 	ldloc.1
 	ldc.i4 -31048
 	add
@@ -10373,19 +10373,19 @@ L_102bbe4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bc2c: 0x102bc2c: addiu v1, zero, -1
+// 0x0102bc3c: 0x102bc3c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_102bc30:
-// 0x0102bc30: 0x102bc30: lui   v0, 0x0
+L_102bc40:
+// 0x0102bc40: 0x102bc40: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102bc34: 0x102bc34: sw    v1, 6652(v0)
+// 0x0102bc44: 0x102bc44: sw    v1, 6652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -10394,16 +10394,16 @@ L_102bc30:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102bc38: 0x102bc38: addu  a0, zero, zero
+// 0x0102bc48: 0x102bc48: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0102bc3c: 0x102bc3c: lui   v0, 0x0
+// 0x0102bc4c: 0x102bc4c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102bc40: 0x102bc40: addu  a1, zero, zero
+// 0x0102bc50: 0x102bc50: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102bc44: 0x102bc44: sw    zero, 6576(v0)
+// 0x0102bc54: 0x102bc54: sw    zero, 6576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -10412,7 +10412,7 @@ L_102bc30:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102bc48: 0x102bc48: jal   0x102b0c8 addu  s1, zero, zero
+// 0x0102bc58: 0x102bc58: jal   0x102b0d8 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -10420,22 +10420,22 @@ L_102bc30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::T_127_102b0c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::T_127_102b0d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102bc50:
-// 0x0102bc50: 0x102bc50: lui   v0, 0x60000
+L_102bc60:
+// 0x0102bc60: 0x102bc60: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_102bc54:
-// 0x0102bc54: 0x102bc54: addiu v1, v0, -25260
+L_102bc64:
+// 0x0102bc64: 0x102bc64: addiu v1, v0, -24796
 	ldloc 5
-	ldc.i4 -25260
+	ldc.i4 -24796
 	add
 	stloc 6
-// 0x0102bc58: 0x102bc58: lw    v1, 52(v1)
+// 0x0102bc68: 0x102bc68: lw    v1, 52(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -10444,31 +10444,31 @@ L_102bc54:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102bc5c: 0x102bc5c: sll   zero, zero, 0
-// 0x0102bc60: 0x102bc60: beq   v1, zero, 0x102bc88 lui   a0, 0x60000
+// 0x0102bc6c: 0x102bc6c: sll   zero, zero, 0
+// 0x0102bc70: 0x102bc70: beq   v1, zero, 0x102bc98 lui   a0, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc.1
-	brfalse L_102bc88
+	brfalse L_102bc98
 // --- basic block ---
-// 0x0102bc68: 0x102bc68: lw    v0, -25260(v0)
+// 0x0102bc78: 0x102bc78: lw    v0, -24796(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6315
+	ldc.i4 -6199
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102bc6c: 0x102bc6c: lui   a1, 0x0
+// 0x0102bc7c: 0x102bc7c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102bc70: 0x102bc70: addiu a0, a0, -25200
+// 0x0102bc80: 0x102bc80: addiu a0, a0, -24736
 	ldloc.1
-	ldc.i4 -25200
+	ldc.i4 -24736
 	add
 	stloc.1
-// 0x0102bc74: 0x102bc74: jalr  v0 addiu a1, a1, 6652
+// 0x0102bc84: 0x102bc84: jalr  v0 addiu a1, a1, 6652
 	ldloc 5
 	ldloc.2
 	ldc.i4 6652
@@ -10484,15 +10484,15 @@ L_102bc54:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bc7c: 0x102bc7c: j	 0x102bc88 sll   zero, zero, 0
-	br L_102bc88
+// 0x0102bc8c: 0x102bc8c: j	 0x102bc98 sll   zero, zero, 0
+	br L_102bc98
 // --- basic block ---
-L_102bc84:
-// 0x0102bc84: 0x102bc84: addu  s1, zero, zero
+L_102bc94:
+// 0x0102bc94: 0x102bc94: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_102bc88:
-// 0x0102bc88: 0x102bc88: lw    a1, 32(sp)
+L_102bc98:
+// 0x0102bc98: 0x102bc98: lw    a1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10501,7 +10501,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102bc8c: 0x102bc8c: jal   0x10086bc addiu a0, sp, 36
+// 0x0102bc9c: 0x102bc9c: jal   0x10086cc addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -10511,15 +10511,15 @@ L_102bc88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bc94: 0x102bc94: addu  a0, s1, zero
+// 0x0102bca4: 0x102bca4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102bc98: 0x102bc98: jal   0x102b0c8 addu  a1, s2, zero
+// 0x0102bca8: 0x102bca8: jal   0x102b0d8 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -10527,13 +10527,13 @@ L_102bc88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::T_127_102b0c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::T_127_102b0d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102bca0: 0x102bca0: lw    ra, 196(sp)
-// 0x0102bca4: 0x102bca4: lw    s8, 192(sp)
+// 0x0102bcb0: 0x102bcb0: lw    ra, 196(sp)
+// 0x0102bcb4: 0x102bcb4: lw    s8, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10542,7 +10542,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0102bca8: 0x102bca8: lw    s7, 188(sp)
+// 0x0102bcb8: 0x102bcb8: lw    s7, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10551,7 +10551,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102bcac: 0x102bcac: lw    s6, 184(sp)
+// 0x0102bcbc: 0x102bcbc: lw    s6, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10560,7 +10560,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102bcb0: 0x102bcb0: lw    s5, 180(sp)
+// 0x0102bcc0: 0x102bcc0: lw    s5, 180(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10569,7 +10569,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102bcb4: 0x102bcb4: lw    s4, 176(sp)
+// 0x0102bcc4: 0x102bcc4: lw    s4, 176(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10578,7 +10578,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102bcb8: 0x102bcb8: lw    s3, 172(sp)
+// 0x0102bcc8: 0x102bcc8: lw    s3, 172(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10587,7 +10587,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102bcbc: 0x102bcbc: lw    s2, 168(sp)
+// 0x0102bccc: 0x102bccc: lw    s2, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10596,7 +10596,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102bcc0: 0x102bcc0: lw    s1, 164(sp)
+// 0x0102bcd0: 0x102bcd0: lw    s1, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10605,7 +10605,7 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102bcc4: 0x102bcc4: lw    s0, 160(sp)
+// 0x0102bcd4: 0x102bcd4: lw    s0, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10614,19 +10614,19 @@ L_102bc88:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102bcc8: 0x102bcc8: jr    ra addiu sp, sp, 200
+// 0x0102bcd8: 0x102bcd8: jr    ra addiu sp, sp, 200
 	ldloc.0
 	ldc.i4 200
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_102bcd0:
-// 0x0102bcd0: 0x102bcd0: lui   v0, 0x0
+L_102bce0:
+// 0x0102bce0: 0x102bce0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_102bcd4:
-// 0x0102bcd4: 0x102bcd4: sw    s1, 6604(v0)
+L_102bce4:
+// 0x0102bce4: 0x102bce4: sw    s1, 6604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -10635,7 +10635,7 @@ L_102bcd4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102bcd8: 0x102bcd8: lw    v0, 52(sp)
+// 0x0102bce8: 0x102bce8: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10644,18 +10644,18 @@ L_102bcd4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102bcdc: 0x102bcdc: sll   zero, zero, 0
-// 0x0102bce0: 0x102bce0: bgez  v0, 0x102ba3c lui   s2, 0x0
+// 0x0102bcec: 0x102bcec: sll   zero, zero, 0
+// 0x0102bcf0: 0x102bcf0: bgez  v0, 0x102ba4c lui   s2, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
 	ldc.i4.s 0
-	bge L_102ba3c
+	bge L_102ba4c
 // --- basic block ---
-// 0x0102bce8: 0x102bce8: j	 0x102ba54 lui   a0, 0x10000
+// 0x0102bcf8: 0x102bcf8: j	 0x102ba64 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_102ba54
+	br L_102ba64
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl32.j b/converted/Cibyl32.j
index ec6ea66..c03fd7b 100644
--- a/converted/Cibyl32.j
+++ b/converted/Cibyl32.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl32::.ctor
 
-.method public static int32 roadmap_fuzzy_set_cycle_params_102bcf0(int32,int32)
+.method public static int32 roadmap_fuzzy_set_cycle_params_102bd00(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -64,27 +64,27 @@
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102bcf0: 0x102bcf0: lui   v0, 0x60000
+// 0x0102bd00: 0x102bd00: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0102bcf4: 0x102bcf4: sw    a0, -24400(v0)
+// 0x0102bd04: 0x102bd04: sw    a0, -23936(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6100
+	ldc.i4 -5984
 	add
 	ldloc.0
 	stelem.i4
-// 0x0102bcf8: 0x102bcf8: lui   v0, 0x60000
+// 0x0102bd08: 0x102bd08: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0102bcfc: 0x102bcfc: jr    ra sw    a1, -24396(v0)
+// 0x0102bd0c: 0x102bd0c: jr    ra sw    a1, -23932(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6099
+	ldc.i4 -5983
 	add
 	ldloc.1
 	stelem.i4
@@ -93,7 +93,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_fuzzy_max_distance_102bd04()
+.method public static int32 roadmap_fuzzy_max_distance_102bd14()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -110,25 +110,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102bd04: 0x102bd04: lui   v0, 0x60000
+// 0x0102bd14: 0x102bd14: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x0102bd08: 0x102bd08: lw    v0, -24400(v0)
+// 0x0102bd18: 0x102bd18: lw    v0, -23936(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6100
+	ldc.i4 -5984
 	add
 	ldelem.i4
 	stloc.0
-// 0x0102bd0c: 0x102bd0c: jr    ra sll   zero, zero, 0
+// 0x0102bd1c: 0x102bd1c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_fuzzy_direction_102bd14(int32,int32,int32)
+.method public static int32 roadmap_fuzzy_direction_102bd24(int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32 hi,int32 lo,int32 ra)
@@ -160,17 +160,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102bd14: 0x102bd14: beq   a2, zero, 0x102bd4c subu  a0, a0, a1
+// 0x0102bd24: 0x102bd24: beq   a2, zero, 0x102bd5c subu  a0, a0, a1
 	ldloc.2
 	ldloc.0
 	ldloc.1
 	sub
 	stloc.0
-	brfalse L_102bd4c
-// 0x0102bd1c: 0x102bd1c: addiu v0, zero, 180
+	brfalse L_102bd5c
+// 0x0102bd2c: 0x102bd2c: addiu v0, zero, 180
 	ldc.i4 180
 	stloc.3
-// 0x0102bd20: 0x102bd20: div   a0, v0
+// 0x0102bd30: 0x102bd30: div   a0, v0
 	ldloc.0
 	ldloc.3
 	ldloc.0
@@ -179,52 +179,52 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	rem
 	stloc 5
-// 0x0102bd24: 0x102bd24: mfhi  hi
+// 0x0102bd34: 0x102bd34: mfhi  hi
 	ldloc 5
 	stloc.0
-L_102bd28:
-// 0x0102bd28: 0x102bd28: bltz  a0, 0x102bd28 addiu a0, a0, 180
+L_102bd38:
+// 0x0102bd38: 0x102bd38: bltz  a0, 0x102bd38 addiu a0, a0, 180
 	ldloc.0
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc.0
 	ldc.i4.s 0
-	blt L_102bd28
+	blt L_102bd38
 // --- basic block ---
-// 0x0102bd30: 0x102bd30: addiu a0, a0, -180
+// 0x0102bd40: 0x102bd40: addiu a0, a0, -180
 	ldloc.0
 	ldc.i4 -180
 	add
 	stloc.0
-// 0x0102bd34: 0x102bd34: slti  v0, a0, 91
+// 0x0102bd44: 0x102bd44: slti  v0, a0, 91
 	ldloc.0
 	ldc.i4.s 91
 	clt
 	stloc.3
-// 0x0102bd38: 0x102bd38: bne   v0, zero, 0x102bd7c slti  v1, a0, 90
+// 0x0102bd48: 0x102bd48: bne   v0, zero, 0x102bd8c slti  v1, a0, 90
 	ldloc.3
 	ldloc.0
 	ldc.i4.s 90
 	clt
 	stloc 4
-	brtrue L_102bd7c
+	brtrue L_102bd8c
 // --- basic block ---
-// 0x0102bd40: 0x102bd40: addiu v0, zero, 180
+// 0x0102bd50: 0x102bd50: addiu v0, zero, 180
 	ldc.i4 180
 	stloc.3
-// 0x0102bd44: 0x102bd44: j	 0x102bd84 subu  a0, v0, a0
+// 0x0102bd54: 0x102bd54: j	 0x102bd94 subu  a0, v0, a0
 	ldloc.3
 	ldloc.0
 	sub
 	stloc.0
-	br L_102bd84
+	br L_102bd94
 // --- basic block ---
-L_102bd4c:
-// 0x0102bd4c: 0x102bd4c: addiu v0, zero, 360
+L_102bd5c:
+// 0x0102bd5c: 0x102bd5c: addiu v0, zero, 360
 	ldc.i4 360
 	stloc.3
-// 0x0102bd50: 0x102bd50: div   a0, v0
+// 0x0102bd60: 0x102bd60: div   a0, v0
 	ldloc.0
 	ldloc.3
 	ldloc.0
@@ -233,72 +233,72 @@ L_102bd4c:
 	stloc 6
 	rem
 	stloc 5
-// 0x0102bd54: 0x102bd54: mfhi  hi
+// 0x0102bd64: 0x102bd64: mfhi  hi
 	ldloc 5
 	stloc.0
-L_102bd58:
-// 0x0102bd58: 0x102bd58: bltz  a0, 0x102bd58 addiu a0, a0, 360
+L_102bd68:
+// 0x0102bd68: 0x102bd68: bltz  a0, 0x102bd68 addiu a0, a0, 360
 	ldloc.0
 	ldloc.0
 	ldc.i4 360
 	add
 	stloc.0
 	ldc.i4.s 0
-	blt L_102bd58
+	blt L_102bd68
 // --- basic block ---
-// 0x0102bd60: 0x102bd60: addiu a0, a0, -360
+// 0x0102bd70: 0x102bd70: addiu a0, a0, -360
 	ldloc.0
 	ldc.i4 -360
 	add
 	stloc.0
-// 0x0102bd64: 0x102bd64: slti  v0, a0, 181
+// 0x0102bd74: 0x102bd74: slti  v0, a0, 181
 	ldloc.0
 	ldc.i4 181
 	clt
 	stloc.3
-// 0x0102bd68: 0x102bd68: bne   v0, zero, 0x102bd7c slti  v1, a0, 90
+// 0x0102bd78: 0x102bd78: bne   v0, zero, 0x102bd8c slti  v1, a0, 90
 	ldloc.3
 	ldloc.0
 	ldc.i4.s 90
 	clt
 	stloc 4
-	brtrue L_102bd7c
+	brtrue L_102bd8c
 // --- basic block ---
-// 0x0102bd70: 0x102bd70: addiu v0, zero, 360
+// 0x0102bd80: 0x102bd80: addiu v0, zero, 360
 	ldc.i4 360
 	stloc.3
-// 0x0102bd74: 0x102bd74: subu  a0, v0, a0
+// 0x0102bd84: 0x102bd84: subu  a0, v0, a0
 	ldloc.3
 	ldloc.0
 	sub
 	stloc.0
-// 0x0102bd78: 0x102bd78: slti  v1, a0, 90
+// 0x0102bd88: 0x102bd88: slti  v1, a0, 90
 	ldloc.0
 	ldc.i4.s 90
 	clt
 	stloc 4
-L_102bd7c:
-// 0x0102bd7c: 0x102bd7c: beq   v1, zero, 0x102bd98 addu  v0, zero, zero
+L_102bd8c:
+// 0x0102bd8c: 0x102bd8c: beq   v1, zero, 0x102bda8 addu  v0, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_102bd98
+	brfalse L_102bda8
 // --- basic block ---
-L_102bd84:
-// 0x0102bd84: 0x102bd84: addiu v0, zero, 100
+L_102bd94:
+// 0x0102bd94: 0x102bd94: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc.3
-// 0x0102bd88: 0x102bd88: subu  v1, v0, a0
+// 0x0102bd98: 0x102bd98: subu  v1, v0, a0
 	ldloc.3
 	ldloc.0
 	sub
 	stloc 4
-// 0x0102bd8c: 0x102bd8c: sll   v1, v1, 10
+// 0x0102bd9c: 0x102bd9c: sll   v1, v1, 10
 	ldloc 4
 	ldc.i4.s 10
 	shl
 	stloc 4
-// 0x0102bd90: 0x102bd90: div   v1, v0
+// 0x0102bda0: 0x102bda0: div   v1, v0
 	ldloc 4
 	ldloc.3
 	ldloc 4
@@ -307,11 +307,11 @@ L_102bd84:
 	stloc 6
 	rem
 	stloc 5
-// 0x0102bd94: 0x102bd94: mflo  lo
+// 0x0102bda4: 0x102bda4: mflo  lo
 	ldloc 6
 	stloc.3
-L_102bd98:
-// 0x0102bd98: 0x102bd98: jr    ra sll   zero, zero, 0
+L_102bda8:
+// 0x0102bda8: 0x102bda8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -319,7 +319,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_fuzzy_distance_102bda0(int32,int32)
+.method public static int32 roadmap_fuzzy_distance_102bdb0(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v1,int32 v0,int32 lo,int32 ra,int32[] mem)
@@ -348,82 +348,82 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102bda0: 0x102bda0: lui   v0, 0x60000
+// 0x0102bdb0: 0x102bdb0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0102bda4: 0x102bda4: lw    v1, -24400(v0)
+// 0x0102bdb4: 0x102bdb4: lw    v1, -23936(v0)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6100
+	ldc.i4 -5984
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102bda8: 0x102bda8: sll   zero, zero, 0
-// 0x0102bdac: 0x102bdac: slt   a1, a0, v1
+// 0x0102bdb8: 0x102bdb8: sll   zero, zero, 0
+// 0x0102bdbc: 0x102bdbc: slt   a1, a0, v1
 	ldloc.0
 	ldloc.2
 	clt
 	stloc.1
-// 0x0102bdb0: 0x102bdb0: beq   a1, zero, 0x102bde8 addu  v0, zero, zero
+// 0x0102bdc0: 0x102bdc0: beq   a1, zero, 0x102bdf8 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_102bde8
+	brfalse L_102bdf8
 // --- basic block ---
-// 0x0102bdb8: 0x102bdb8: slti  a1, a0, 11
+// 0x0102bdc8: 0x102bdc8: slti  a1, a0, 11
 	ldloc.0
 	ldc.i4.s 11
 	clt
 	stloc.1
-// 0x0102bdbc: 0x102bdbc: bne   a1, zero, 0x102bde8 addiu v0, zero, 1024
+// 0x0102bdcc: 0x102bdcc: bne   a1, zero, 0x102bdf8 addiu v0, zero, 1024
 	ldloc.1
 	ldc.i4 1024
 	stloc.3
-	brtrue L_102bde8
+	brtrue L_102bdf8
 // --- basic block ---
-// 0x0102bdc4: 0x102bdc4: sll   a0, a0, 1
+// 0x0102bdd4: 0x102bdd4: sll   a0, a0, 1
 	ldloc.0
 	ldc.i4.1
 	shl
 	stloc.0
-// 0x0102bdc8: 0x102bdc8: slt   a1, a0, v1
+// 0x0102bdd8: 0x102bdd8: slt   a1, a0, v1
 	ldloc.0
 	ldloc.2
 	clt
 	stloc.1
-// 0x0102bdcc: 0x102bdcc: beq   a1, zero, 0x102bde8 addiu v0, zero, 341
+// 0x0102bddc: 0x102bddc: beq   a1, zero, 0x102bdf8 addiu v0, zero, 341
 	ldloc.1
 	ldc.i4 341
 	stloc.3
-	brfalse L_102bde8
+	brfalse L_102bdf8
 // --- basic block ---
-// 0x0102bdd4: 0x102bdd4: subu  a0, v1, a0
+// 0x0102bde4: 0x102bde4: subu  a0, v1, a0
 	ldloc.2
 	ldloc.0
 	sub
 	stloc.0
-// 0x0102bdd8: 0x102bdd8: sll   a0, a0, 10
+// 0x0102bde8: 0x102bde8: sll   a0, a0, 10
 	ldloc.0
 	ldc.i4.s 10
 	shl
 	stloc.0
-// 0x0102bddc: 0x102bddc: div   a0, v1
+// 0x0102bdec: 0x102bdec: div   a0, v1
 	ldloc.0
 	ldloc.2
 	div
 	stloc 4
-// 0x0102bde0: 0x102bde0: mflo  lo
+// 0x0102bdf0: 0x102bdf0: mflo  lo
 	ldloc 4
 	stloc.2
-// 0x0102bde4: 0x102bde4: addiu v0, v1, -10
+// 0x0102bdf4: 0x102bdf4: addiu v0, v1, -10
 	ldloc.2
 	ldc.i4.s -10
 	add
 	stloc.3
-L_102bde8:
-// 0x0102bde8: 0x102bde8: jr    ra sll   zero, zero, 0
+L_102bdf8:
+// 0x0102bdf8: 0x102bdf8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -431,7 +431,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_fuzzy_and_102bdf0(int32,int32)
+.method public static int32 roadmap_fuzzy_and_102be00(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 lo,int32 v0,int32 ra)
@@ -454,34 +454,34 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102bdf0: 0x102bdf0: mult  a1, a0
+// 0x0102be00: 0x102be00: mult  a1, a0
 	ldloc.1
 	ldloc.0
 	mul
 	stloc.2
-// 0x0102bdf4: 0x102bdf4: addiu v0, zero, 1024
+// 0x0102be04: 0x102be04: addiu v0, zero, 1024
 	ldc.i4 1024
 	stloc.3
-// 0x0102bdf8: 0x102bdf8: mflo  lo
+// 0x0102be08: 0x102be08: mflo  lo
 	ldloc.2
 	stloc.0
-// 0x0102bdfc: 0x102bdfc: sll   zero, zero, 0
-// 0x0102be00: 0x102be00: sll   zero, zero, 0
-// 0x0102be04: 0x102be04: div   a0, v0
+// 0x0102be0c: 0x102be0c: sll   zero, zero, 0
+// 0x0102be10: 0x102be10: sll   zero, zero, 0
+// 0x0102be14: 0x102be14: div   a0, v0
 	ldloc.0
 	ldloc.3
 	div
 	stloc.2
-// 0x0102be08: 0x102be08: mflo  lo
+// 0x0102be18: 0x102be18: mflo  lo
 	ldloc.2
 	stloc.3
-// 0x0102be0c: 0x102be0c: jr    ra sll   zero, zero, 0
+// 0x0102be1c: 0x102be1c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_fuzzy_not_102be2c(int32)
+.method public static int32 roadmap_fuzzy_not_102be3c(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -498,10 +498,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be2c: 0x102be2c: addiu v0, zero, 1024
+// 0x0102be3c: 0x102be3c: addiu v0, zero, 1024
 	ldc.i4 1024
 	stloc.1
-// 0x0102be30: 0x102be30: jr    ra subu  v0, v0, a0
+// 0x0102be40: 0x102be40: jr    ra subu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	sub
@@ -511,7 +511,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_fuzzy_false_102be38()
+.method public static int32 roadmap_fuzzy_false_102be48()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -525,7 +525,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be38: 0x102be38: jr    ra addu  v0, zero, zero
+// 0x0102be48: 0x102be48: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -533,7 +533,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_fuzzy_is_acceptable_102be40(int32)
+.method public static int32 roadmap_fuzzy_is_acceptable_102be50(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -553,25 +553,25 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be40: 0x102be40: lui   v0, 0x60000
+// 0x0102be50: 0x102be50: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0102be44: 0x102be44: lw    v0, -24396(v0)
+// 0x0102be54: 0x102be54: lw    v0, -23932(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6099
+	ldc.i4 -5983
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102be48: 0x102be48: sll   zero, zero, 0
-// 0x0102be4c: 0x102be4c: slt   v0, a0, v0
+// 0x0102be58: 0x102be58: sll   zero, zero, 0
+// 0x0102be5c: 0x102be5c: slt   v0, a0, v0
 	ldloc.0
 	ldloc.1
 	clt
 	stloc.1
-// 0x0102be50: 0x102be50: jr    ra xori  v0, v0, 1
+// 0x0102be60: 0x102be60: jr    ra xori  v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	xor
@@ -581,7 +581,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_fuzzy_is_good_102be58(int32)
+.method public static int32 roadmap_fuzzy_is_good_102be68(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -598,12 +598,12 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be58: 0x102be58: slti  v0, a0, 512
+// 0x0102be68: 0x102be68: slti  v0, a0, 512
 	ldloc.0
 	ldc.i4 512
 	clt
 	stloc.1
-// 0x0102be5c: 0x102be5c: jr    ra xori  v0, v0, 1
+// 0x0102be6c: 0x102be6c: jr    ra xori  v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	xor
@@ -613,7 +613,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_fuzzy_is_certain_102be64(int32)
+.method public static int32 roadmap_fuzzy_is_certain_102be74(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -630,12 +630,12 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be64: 0x102be64: slti  v0, a0, 682
+// 0x0102be74: 0x102be74: slti  v0, a0, 682
 	ldloc.0
 	ldc.i4 682
 	clt
 	stloc.1
-// 0x0102be68: 0x102be68: jr    ra xori  v0, v0, 1
+// 0x0102be78: 0x102be78: jr    ra xori  v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	xor
@@ -645,7 +645,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_fuzzy_good_102be70()
+.method public static int32 roadmap_fuzzy_good_102be80()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -659,7 +659,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be70: 0x102be70: jr    ra addiu v0, zero, 512
+// 0x0102be80: 0x102be80: jr    ra addiu v0, zero, 512
 	ldc.i4 512
 	stloc.0
 	br __CIBYL_function_return
@@ -667,7 +667,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_fuzzy_acceptable_102be78()
+.method public static int32 roadmap_fuzzy_acceptable_102be88()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -684,25 +684,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be78: 0x102be78: lui   v0, 0x60000
+// 0x0102be88: 0x102be88: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x0102be7c: 0x102be7c: lw    v0, -24396(v0)
+// 0x0102be8c: 0x102be8c: lw    v0, -23932(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6099
+	ldc.i4 -5983
 	add
 	ldelem.i4
 	stloc.0
-// 0x0102be80: 0x102be80: jr    ra sll   zero, zero, 0
+// 0x0102be90: 0x102be90: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_fuzzy_initialize_102be88(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_fuzzy_initialize_102be98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -740,12 +740,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102be88: 0x102be88: addiu sp, sp, -24
+// 0x0102be98: 0x102be98: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102be8c: 0x102be8c: sw    s0, 16(sp)
+// 0x0102be9c: 0x102be9c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -754,32 +754,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102be90: 0x102be90: lui   a1, 0x0
+// 0x0102bea0: 0x102bea0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102be94: 0x102be94: lui   s0, 0x10000
+// 0x0102bea4: 0x102bea4: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0102be98: 0x102be98: lui   a2, 0x10000
+// 0x0102bea8: 0x102bea8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102be9c: 0x102be9c: addiu a0, s0, 12560
+// 0x0102beac: 0x102beac: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0102bea0: 0x102bea0: addiu a1, a1, 6772
+// 0x0102beb0: 0x102beb0: addiu a1, a1, 6772
 	ldloc.2
 	ldc.i4 6772
 	add
 	stloc.2
-// 0x0102bea4: 0x102bea4: addiu a2, a2, -25520
+// 0x0102beb4: 0x102beb4: addiu a2, a2, -25520
 	ldloc.3
 	ldc.i4 -25520
 	add
 	stloc.3
-// 0x0102bea8: 0x102bea8: sw    ra, 20(sp)
-// 0x0102beac: 0x102beac: jal   0x100edb0 addu  a3, zero, zero
+// 0x0102beb8: 0x102beb8: sw    ra, 20(sp)
+// 0x0102bebc: 0x102bebc: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -787,33 +787,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0102beb4: 0x102beb4: lui   a1, 0x0
+// 0x0102bec4: 0x102bec4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102beb8: 0x102beb8: lui   a2, 0x10000
+// 0x0102bec8: 0x102bec8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102bebc: 0x102bebc: addiu a0, s0, 12560
+// 0x0102becc: 0x102becc: addiu a0, s0, 12556
 	ldloc 5
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0102bec0: 0x102bec0: addiu a1, a1, 6788
+// 0x0102bed0: 0x102bed0: addiu a1, a1, 6788
 	ldloc.2
 	ldc.i4 6788
 	add
 	stloc.2
-// 0x0102bec4: 0x102bec4: addiu a2, a2, -25516
+// 0x0102bed4: 0x102bed4: addiu a2, a2, -25516
 	ldloc.3
 	ldc.i4 -25516
 	add
 	stloc.3
-// 0x0102bec8: 0x102bec8: jal   0x100edb0 addu  a3, zero, zero
+// 0x0102bed8: 0x102bed8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -821,13 +821,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0102bed0: 0x102bed0: lw    ra, 20(sp)
-// 0x0102bed4: 0x102bed4: lw    s0, 16(sp)
+// 0x0102bee0: 0x102bee0: lw    ra, 20(sp)
+// 0x0102bee4: 0x102bee4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -836,7 +836,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102bed8: 0x102bed8: jr    ra addiu sp, sp, 24
+// 0x0102bee8: 0x102bee8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -848,7 +848,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_fuzzy_connected_102bee0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_fuzzy_connected_102bef0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s1,int32 s2,int32 s0,int32 s3,int32 s4,int32 ra)
@@ -898,12 +898,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102bee0: 0x102bee0: addiu sp, sp, -96
+// 0x0102bef0: 0x102bef0: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0102bee4: 0x102bee4: sw    s4, 88(sp)
+// 0x0102bef4: 0x102bef4: sw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -912,7 +912,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102bee8: 0x102bee8: sw    s3, 84(sp)
+// 0x0102bef8: 0x102bef8: sw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -921,7 +921,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102beec: 0x102beec: sw    s2, 80(sp)
+// 0x0102befc: 0x102befc: sw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -930,7 +930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102bef0: 0x102bef0: sw    s1, 76(sp)
+// 0x0102bf00: 0x102bf00: sw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -939,7 +939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102bef4: 0x102bef4: sw    s0, 72(sp)
+// 0x0102bf04: 0x102bf04: sw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -948,17 +948,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102bef8: 0x102bef8: sw    ra, 92(sp)
-// 0x0102befc: 0x102befc: addu  s1, a2, zero
+// 0x0102bf08: 0x102bf08: sw    ra, 92(sp)
+// 0x0102bf0c: 0x102bf0c: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0102bf00: 0x102bf00: addu  s2, a3, zero
+// 0x0102bf10: 0x102bf10: addu  s2, a3, zero
 	ldloc 4
 	stloc 9
-// 0x0102bf04: 0x102bf04: addu  s4, a0, zero
+// 0x0102bf14: 0x102bf14: addu  s4, a0, zero
 	ldloc.1
 	stloc 12
-// 0x0102bf08: 0x102bf08: lw    s0, 112(sp)
+// 0x0102bf18: 0x102bf18: lw    s0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -967,7 +967,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102bf0c: 0x102bf0c: jal   0x1014b10 addu  s3, a1, zero
+// 0x0102bf1c: 0x102bf1c: jal   0x1014b20 addu  s3, a1, zero
 	ldloc.2
 	stloc 11
 	ldloc.0
@@ -975,44 +975,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_same_db_line_1014b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102bf14: 0x102bf14: bne   v0, zero, 0x102c070 addiu v1, zero, 768
+// 0x0102bf24: 0x102bf24: bne   v0, zero, 0x102c080 addiu v1, zero, 768
 	ldloc 7
 	ldc.i4 768
 	stloc 6
-	brtrue L_102c070
+	brtrue L_102c080
 // --- basic block ---
-// 0x0102bf1c: 0x102bf1c: addu  a0, s4, zero
+// 0x0102bf2c: 0x102bf2c: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0102bf20: 0x102bf20: addiu a1, sp, 40
+// 0x0102bf30: 0x102bf30: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x0102bf24: 0x102bf24: addiu a2, sp, 48
+// 0x0102bf34: 0x102bf34: addiu a2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.3
-// 0x0102bf28: 0x102bf28: addiu a3, zero, 3
+// 0x0102bf38: 0x102bf38: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x0102bf2c: 0x102bf2c: xori  s2, s2, 2
+// 0x0102bf3c: 0x102bf3c: xori  s2, s2, 2
 	ldloc 9
 	ldc.i4.2
 	xor
 	stloc 9
-// 0x0102bf30: 0x102bf30: xori  s1, s1, 2
+// 0x0102bf40: 0x102bf40: xori  s1, s1, 2
 	ldloc 8
 	ldc.i4.2
 	xor
 	stloc 8
-// 0x0102bf34: 0x102bf34: sw    zero, 16(sp)
+// 0x0102bf44: 0x102bf44: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1021,7 +1021,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102bf38: 0x102bf38: sw    zero, 20(sp)
+// 0x0102bf48: 0x102bf48: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1030,7 +1030,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102bf3c: 0x102bf3c: jal   0x1012790 sltiu s2, s2, 1
+// 0x0102bf4c: 0x102bf4c: jal   0x10127a0 sltiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	clt.un
@@ -1040,33 +1040,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102bf44: 0x102bf44: sltu  s1, zero, s1
+// 0x0102bf54: 0x102bf54: sltu  s1, zero, s1
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
-// 0x0102bf48: 0x102bf48: addu  a0, s3, zero
+// 0x0102bf58: 0x102bf58: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0102bf4c: 0x102bf4c: addiu a1, sp, 56
+// 0x0102bf5c: 0x102bf5c: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x0102bf50: 0x102bf50: addiu a2, sp, 64
+// 0x0102bf60: 0x102bf60: addiu a2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.3
-// 0x0102bf54: 0x102bf54: addiu a3, zero, 3
+// 0x0102bf64: 0x102bf64: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x0102bf58: 0x102bf58: sw    zero, 16(sp)
+// 0x0102bf68: 0x102bf68: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1075,7 +1075,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102bf5c: 0x102bf5c: jal   0x1012790 sw    zero, 20(sp)
+// 0x0102bf6c: 0x102bf6c: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1089,37 +1089,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102bf64: 0x102bf64: addiu v0, sp, 24
+// 0x0102bf74: 0x102bf74: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x0102bf68: 0x102bf68: sll   v1, s2, 3
+// 0x0102bf78: 0x102bf78: sll   v1, s2, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x0102bf6c: 0x102bf6c: sll   a0, s1, 3
+// 0x0102bf7c: 0x102bf7c: sll   a0, s1, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0102bf70: 0x102bf70: addu  a0, v0, a0
+// 0x0102bf80: 0x102bf80: addu  a0, v0, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x0102bf74: 0x102bf74: addu  v1, v0, v1
+// 0x0102bf84: 0x102bf84: addu  v1, v0, v1
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x0102bf78: 0x102bf78: lw    v0, 20(v1)
+// 0x0102bf88: 0x102bf88: lw    v0, 20(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1128,7 +1128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102bf7c: 0x102bf7c: lw    a1, 36(a0)
+// 0x0102bf8c: 0x102bf8c: lw    a1, 36(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1137,13 +1137,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102bf80: 0x102bf80: sll   zero, zero, 0
-// 0x0102bf84: 0x102bf84: bne   v0, a1, 0x102bfac sll   zero, zero, 0
+// 0x0102bf90: 0x102bf90: sll   zero, zero, 0
+// 0x0102bf94: 0x102bf94: bne   v0, a1, 0x102bfbc sll   zero, zero, 0
 	ldloc 7
 	ldloc.2
-	bne.un L_102bfac
+	bne.un L_102bfbc
 // --- basic block ---
-// 0x0102bf8c: 0x102bf8c: lw    v1, 16(v1)
+// 0x0102bf9c: 0x102bf9c: lw    v1, 16(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1152,7 +1152,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102bf90: 0x102bf90: lw    a0, 32(a0)
+// 0x0102bfa0: 0x102bfa0: lw    a0, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1161,17 +1161,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102bf94: 0x102bf94: sll   zero, zero, 0
-// 0x0102bf98: 0x102bf98: bne   v1, a0, 0x102bfb0 xori  a0, s1, 1
+// 0x0102bfa4: 0x102bfa4: sll   zero, zero, 0
+// 0x0102bfa8: 0x102bfa8: bne   v1, a0, 0x102bfc0 xori  a0, s1, 1
 	ldloc 6
 	ldloc.1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc.1
-	bne.un L_102bfb0
+	bne.un L_102bfc0
 // --- basic block ---
-// 0x0102bfa0: 0x102bfa0: sw    v0, 4(s0)
+// 0x0102bfb0: 0x102bfb0: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1180,38 +1180,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102bfa4: 0x102bfa4: j	 0x102c05c sw    v1, 0(s0)
+// 0x0102bfb4: 0x102bfb4: j	 0x102c06c sw    v1, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_102c05c
+	br L_102c06c
 // --- basic block ---
-L_102bfac:
-// 0x0102bfac: 0x102bfac: xori  a0, s1, 1
+L_102bfbc:
+// 0x0102bfbc: 0x102bfbc: xori  a0, s1, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc.1
-L_102bfb0:
-// 0x0102bfb0: 0x102bfb0: sll   a0, a0, 3
+L_102bfc0:
+// 0x0102bfc0: 0x102bfc0: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0102bfb4: 0x102bfb4: addiu v1, sp, 24
+// 0x0102bfc4: 0x102bfc4: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x0102bfb8: 0x102bfb8: addu  a0, v1, a0
+// 0x0102bfc8: 0x102bfc8: addu  a0, v1, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc.1
-// 0x0102bfbc: 0x102bfbc: lw    a1, 36(a0)
+// 0x0102bfcc: 0x102bfcc: lw    a1, 36(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1220,27 +1220,27 @@ L_102bfb0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102bfc0: 0x102bfc0: sll   zero, zero, 0
-// 0x0102bfc4: 0x102bfc4: bne   v0, a1, 0x102bffc addiu s3, sp, 24
+// 0x0102bfd0: 0x102bfd0: sll   zero, zero, 0
+// 0x0102bfd4: 0x102bfd4: bne   v0, a1, 0x102c00c addiu s3, sp, 24
 	ldloc 7
 	ldloc.2
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-	bne.un L_102bffc
+	bne.un L_102c00c
 // --- basic block ---
-// 0x0102bfcc: 0x102bfcc: sll   v0, s2, 3
+// 0x0102bfdc: 0x102bfdc: sll   v0, s2, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x0102bfd0: 0x102bfd0: addu  v1, v1, v0
+// 0x0102bfe0: 0x102bfe0: addu  v1, v1, v0
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0102bfd4: 0x102bfd4: lw    a0, 32(a0)
+// 0x0102bfe4: 0x102bfe4: lw    a0, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1249,7 +1249,7 @@ L_102bfb0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102bfd8: 0x102bfd8: lw    v0, 16(v1)
+// 0x0102bfe8: 0x102bfe8: lw    v0, 16(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1258,17 +1258,17 @@ L_102bfb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102bfdc: 0x102bfdc: sll   zero, zero, 0
-// 0x0102bfe0: 0x102bfe0: bne   v0, a0, 0x102c000 sll   s2, s2, 3
+// 0x0102bfec: 0x102bfec: sll   zero, zero, 0
+// 0x0102bff0: 0x102bff0: bne   v0, a0, 0x102c010 sll   s2, s2, 3
 	ldloc 7
 	ldloc.1
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 9
-	bne.un L_102c000
+	bne.un L_102c010
 // --- basic block ---
-// 0x0102bfe8: 0x102bfe8: lw    v1, 20(v1)
+// 0x0102bff8: 0x102bff8: lw    v1, 20(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1277,14 +1277,14 @@ L_102bfb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102bfec: 0x102bfec: sw    v0, 0(s0)
+// 0x0102bffc: 0x102bffc: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0102bff0: 0x102bff0: sw    v1, 4(s0)
+// 0x0102c000: 0x102c000: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1293,34 +1293,34 @@ L_102bfb0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102bff4: 0x102bff4: j	 0x102c070 addiu v1, zero, 512
+// 0x0102c004: 0x102c004: j	 0x102c080 addiu v1, zero, 512
 	ldc.i4 512
 	stloc 6
-	br L_102c070
+	br L_102c080
 // --- basic block ---
-L_102bffc:
-// 0x0102bffc: 0x102bffc: sll   s2, s2, 3
+L_102c00c:
+// 0x0102c00c: 0x102c00c: sll   s2, s2, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 9
-L_102c000:
-// 0x0102c000: 0x102c000: sll   s1, s1, 3
+L_102c010:
+// 0x0102c010: 0x102c010: sll   s1, s1, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x0102c004: 0x102c004: addu  s1, s3, s1
+// 0x0102c014: 0x102c014: addu  s1, s3, s1
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x0102c008: 0x102c008: addu  s2, s3, s2
+// 0x0102c018: 0x102c018: addu  s2, s3, s2
 	ldloc 11
 	ldloc 9
 	add
 	stloc 9
-// 0x0102c00c: 0x102c00c: lw    v1, 32(s1)
+// 0x0102c01c: 0x102c01c: lw    v1, 32(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1329,7 +1329,7 @@ L_102c000:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102c010: 0x102c010: lw    a2, 20(s2)
+// 0x0102c020: 0x102c020: lw    a2, 20(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1338,7 +1338,7 @@ L_102c000:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102c014: 0x102c014: lw    v0, 36(s1)
+// 0x0102c024: 0x102c024: lw    v0, 36(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1347,7 +1347,7 @@ L_102c000:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102c018: 0x102c018: lw    a3, 16(s2)
+// 0x0102c028: 0x102c028: lw    a3, 16(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1356,18 +1356,18 @@ L_102c000:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102c01c: 0x102c01c: addiu s1, sp, 32
+// 0x0102c02c: 0x102c02c: addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
-// 0x0102c020: 0x102c020: addu  a0, s3, zero
+// 0x0102c030: 0x102c030: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0102c024: 0x102c024: addu  a1, s1, zero
+// 0x0102c034: 0x102c034: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102c028: 0x102c028: sw    a3, 24(sp)
+// 0x0102c038: 0x102c038: sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1376,7 +1376,7 @@ L_102c000:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0102c02c: 0x102c02c: sw    a2, 28(sp)
+// 0x0102c03c: 0x102c03c: sw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1385,7 +1385,7 @@ L_102c000:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102c030: 0x102c030: sw    v1, 32(sp)
+// 0x0102c040: 0x102c040: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1394,7 +1394,7 @@ L_102c000:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102c034: 0x102c034: jal   0x1008eb0 sw    v0, 36(sp)
+// 0x0102c044: 0x102c044: jal   0x1008ec0 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1408,15 +1408,15 @@ L_102c000:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102c03c: 0x102c03c: addu  a0, s3, zero
+// 0x0102c04c: 0x102c04c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0102c040: 0x102c040: jal   0x1008eb0 addu  a1, s1, zero
+// 0x0102c050: 0x102c050: jal   0x1008ec0 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -1424,28 +1424,28 @@ L_102c000:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0102c048: 0x102c048: slti  v0, v0, 50
+// 0x0102c058: 0x102c058: slti  v0, v0, 50
 	ldloc 7
 	ldc.i4.s 50
 	clt
 	stloc 7
-// 0x0102c04c: 0x102c04c: beq   v0, zero, 0x102c064 sll   zero, zero, 0
+// 0x0102c05c: 0x102c05c: beq   v0, zero, 0x102c074 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_102c064
+	brfalse L_102c074
 // --- basic block ---
-// 0x0102c054: 0x102c054: sw    zero, 0(s0)
+// 0x0102c064: 0x102c064: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102c058: 0x102c058: sw    zero, 4(s0)
+// 0x0102c068: 0x102c068: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1454,21 +1454,21 @@ L_102c000:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_102c05c:
-// 0x0102c05c: 0x102c05c: j	 0x102c070 addiu v1, zero, 682
+L_102c06c:
+// 0x0102c06c: 0x102c06c: j	 0x102c080 addiu v1, zero, 682
 	ldc.i4 682
 	stloc 6
-	br L_102c070
+	br L_102c080
 // --- basic block ---
-L_102c064:
-// 0x0102c064: 0x102c064: sw    zero, 0(s0)
+L_102c074:
+// 0x0102c074: 0x102c074: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102c068: 0x102c068: sw    zero, 4(s0)
+// 0x0102c078: 0x102c078: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1477,15 +1477,15 @@ L_102c064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102c06c: 0x102c06c: addiu v1, zero, 341
+// 0x0102c07c: 0x102c07c: addiu v1, zero, 341
 	ldc.i4 341
 	stloc 6
-L_102c070:
-// 0x0102c070: 0x102c070: lw    ra, 92(sp)
-// 0x0102c074: 0x102c074: addu  v0, v1, zero
+L_102c080:
+// 0x0102c080: 0x102c080: lw    ra, 92(sp)
+// 0x0102c084: 0x102c084: addu  v0, v1, zero
 	ldloc 6
 	stloc 7
-// 0x0102c078: 0x102c078: lw    s4, 88(sp)
+// 0x0102c088: 0x102c088: lw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1494,7 +1494,7 @@ L_102c070:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102c07c: 0x102c07c: lw    s3, 84(sp)
+// 0x0102c08c: 0x102c08c: lw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1503,7 +1503,7 @@ L_102c070:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102c080: 0x102c080: lw    s2, 80(sp)
+// 0x0102c090: 0x102c090: lw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1512,7 +1512,7 @@ L_102c070:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102c084: 0x102c084: lw    s1, 76(sp)
+// 0x0102c094: 0x102c094: lw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1521,7 +1521,7 @@ L_102c070:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102c088: 0x102c088: lw    s0, 72(sp)
+// 0x0102c098: 0x102c098: lw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1530,7 +1530,7 @@ L_102c070:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102c08c: 0x102c08c: jr    ra addiu sp, sp, 96
+// 0x0102c09c: 0x102c09c: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -1542,7 +1542,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_fuzzy_reset_cycle_102c094(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_fuzzy_reset_cycle_102c0a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -1577,16 +1577,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c094: 0x102c094: lui   a0, 0x0
+// 0x0102c0a4: 0x102c0a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102c098: 0x102c098: addiu sp, sp, -24
+// 0x0102c0a8: 0x102c0a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c09c: 0x102c09c: sw    ra, 20(sp)
-// 0x0102c0a0: 0x102c0a0: jal   0x100e788 addiu a0, a0, 6772
+// 0x0102c0ac: 0x102c0ac: sw    ra, 20(sp)
+// 0x0102c0b0: 0x102c0b0: jal   0x100e798 addiu a0, a0, 6772
 	ldloc.1
 	ldc.i4 6772
 	add
@@ -1596,28 +1596,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0102c0a8: 0x102c0a8: lui   a0, 0x0
+// 0x0102c0b8: 0x102c0b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102c0ac: 0x102c0ac: lui   v1, 0x60000
+// 0x0102c0bc: 0x102c0bc: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102c0b0: 0x102c0b0: addiu a0, a0, 6788
+// 0x0102c0c0: 0x102c0c0: addiu a0, a0, 6788
 	ldloc.1
 	ldc.i4 6788
 	add
 	stloc.1
-// 0x0102c0b4: 0x102c0b4: jal   0x100e788 sw    v0, -24400(v1)
+// 0x0102c0c4: 0x102c0c4: jal   0x100e798 sw    v0, -23936(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6100
+	ldc.i4 -5984
 	add
 	ldloc 6
 	stelem.i4
@@ -1626,25 +1626,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0102c0bc: 0x102c0bc: lw    ra, 20(sp)
-// 0x0102c0c0: 0x102c0c0: lui   v1, 0x60000
+// 0x0102c0cc: 0x102c0cc: lw    ra, 20(sp)
+// 0x0102c0d0: 0x102c0d0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102c0c4: 0x102c0c4: sw    v0, -24396(v1)
+// 0x0102c0d4: 0x102c0d4: sw    v0, -23932(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6099
+	ldc.i4 -5983
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102c0c8: 0x102c0c8: jr    ra addiu sp, sp, 24
+// 0x0102c0d8: 0x102c0d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1656,7 +1656,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void roadmap_start_export_data_102c0d0()
+.method public static void roadmap_start_export_data_102c0e0()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1667,13 +1667,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c0d0:
-// 0x0102c0d0: 0x102c0d0: jr    ra sll   zero, zero, 0
+L_102c0e0:
+// 0x0102c0e0: 0x102c0e0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_start_export_reset_102c0d8()
+.method public static void roadmap_start_export_reset_102c0e8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1684,13 +1684,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c0d8:
-// 0x0102c0d8: 0x102c0d8: jr    ra sll   zero, zero, 0
+L_102c0e8:
+// 0x0102c0e8: 0x102c0e8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_start_download_map_102c0e0()
+.method public static void roadmap_start_download_map_102c0f0()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1701,13 +1701,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c0e0:
-// 0x0102c0e0: 0x102c0e0: jr    ra sll   zero, zero, 0
+L_102c0f0:
+// 0x0102c0f0: 0x102c0f0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 on_contextmenu_closed_102c0e8(int32,int32,int32,int32,int32)
+.method public static int32 on_contextmenu_closed_102c0f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1742,16 +1742,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c0e8: 0x102c0e8: addiu sp, sp, -24
+// 0x0102c0f8: 0x102c0f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c0ec: 0x102c0ec: beq   a0, zero, 0x102c10c sw    ra, 20(sp)
+// 0x0102c0fc: 0x102c0fc: beq   a0, zero, 0x102c11c sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_102c10c
+	brfalse L_102c11c
 // --- basic block ---
-// 0x0102c0f4: 0x102c0f4: lw    v0, 16(a1)
+// 0x0102c104: 0x102c104: lw    v0, 16(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1760,8 +1760,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c0f8: 0x102c0f8: sll   zero, zero, 0
-// 0x0102c0fc: 0x102c0fc: lw    v0, 20(v0)
+// 0x0102c108: 0x102c108: sll   zero, zero, 0
+// 0x0102c10c: 0x102c10c: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1770,8 +1770,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c100: 0x102c100: sll   zero, zero, 0
-// 0x0102c104: 0x102c104: jalr  v0 sll   zero, zero, 0
+// 0x0102c110: 0x102c110: sll   zero, zero, 0
+// 0x0102c114: 0x102c114: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1783,10 +1783,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_102c10c:
-// 0x0102c10c: 0x102c10c: lw    ra, 20(sp)
-// 0x0102c110: 0x102c110: sll   zero, zero, 0
-// 0x0102c114: 0x102c114: jr    ra addiu sp, sp, 24
+L_102c11c:
+// 0x0102c11c: 0x102c11c: lw    ra, 20(sp)
+// 0x0102c120: 0x102c120: sll   zero, zero, 0
+// 0x0102c124: 0x102c124: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1798,7 +1798,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void roadmap_help_menu_102c11c()
+.method public static void roadmap_help_menu_102c12c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1809,13 +1809,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c11c:
-// 0x0102c11c: 0x102c11c: jr    ra sll   zero, zero, 0
+L_102c12c:
+// 0x0102c12c: 0x102c12c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void start_settings_quick_menu_102c124()
+.method public static void start_settings_quick_menu_102c134()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1826,13 +1826,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c124:
-// 0x0102c124: 0x102c124: jr    ra sll   zero, zero, 0
+L_102c134:
+// 0x0102c134: 0x102c134: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_start_login_cb_102c13c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_login_cb_102c14c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -1870,12 +1870,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c13c: 0x102c13c: addiu sp, sp, -24
+// 0x0102c14c: 0x102c14c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c140: 0x102c140: sw    s0, 16(sp)
+// 0x0102c150: 0x102c150: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1884,24 +1884,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102c144: 0x102c144: lui   s0, 0x60000
+// 0x0102c154: 0x102c154: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0102c148: 0x102c148: lw    v0, -24012(s0)
+// 0x0102c158: 0x102c158: lw    v0, -23548(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6003
+	ldc.i4 -5887
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102c14c: 0x102c14c: sll   zero, zero, 0
-// 0x0102c150: 0x102c150: beq   v0, zero, 0x102c164 sw    ra, 20(sp)
+// 0x0102c15c: 0x102c15c: sll   zero, zero, 0
+// 0x0102c160: 0x102c160: beq   v0, zero, 0x102c174 sw    ra, 20(sp)
 	ldloc 7
-	brfalse L_102c164
+	brfalse L_102c174
 // --- basic block ---
-// 0x0102c158: 0x102c158: jalr  v0 sll   zero, zero, 0
+// 0x0102c168: 0x102c168: jalr  v0 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
 	ldloc.1
@@ -1913,18 +1913,18 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0102c160: 0x102c160: sw    zero, -24012(s0)
+// 0x0102c170: 0x102c170: sw    zero, -23548(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6003
+	ldc.i4 -5887
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_102c164:
-// 0x0102c164: 0x102c164: lw    ra, 20(sp)
-// 0x0102c168: 0x102c168: lw    s0, 16(sp)
+L_102c174:
+// 0x0102c174: 0x102c174: lw    ra, 20(sp)
+// 0x0102c178: 0x102c178: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1933,7 +1933,7 @@ L_102c164:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102c16c: 0x102c16c: jr    ra addiu sp, sp, 24
+// 0x0102c17c: 0x102c17c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1945,7 +1945,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_subscribe_102c180(int32)
+.method public static int32 roadmap_start_subscribe_102c190(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -1968,24 +1968,24 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c180: 0x102c180: lui   v1, 0x60000
+// 0x0102c190: 0x102c190: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0102c184: 0x102c184: lw    v0, -24024(v1)
+// 0x0102c194: 0x102c194: lw    v0, -23560(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6006
+	ldc.i4 -5890
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102c188: 0x102c188: jr    ra sw    a0, -24024(v1)
+// 0x0102c198: 0x102c198: jr    ra sw    a0, -23560(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6006
+	ldc.i4 -5890
 	add
 	ldloc.0
 	stelem.i4
@@ -1996,7 +1996,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static void roadmap_start_my_points_menu_102c198()
+.method public static void roadmap_start_my_points_menu_102c1a8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2007,13 +2007,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c198:
-// 0x0102c198: 0x102c198: jr    ra sll   zero, zero, 0
+L_102c1a8:
+// 0x0102c1a8: 0x102c1a8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_confirmed_exit_callback_102c1a0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_confirmed_exit_callback_102c1b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2048,34 +2048,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c1a0: 0x102c1a0: addiu sp, sp, -24
+// 0x0102c1b0: 0x102c1b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c1a4: 0x102c1a4: addiu v0, zero, 3
+// 0x0102c1b4: 0x102c1b4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0102c1a8: 0x102c1a8: bne   a0, v0, 0x102c1b8 sw    ra, 20(sp)
+// 0x0102c1b8: 0x102c1b8: bne   a0, v0, 0x102c1c8 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_102c1b8
+	bne.un L_102c1c8
 // --- basic block ---
-// 0x0102c1b0: 0x102c1b0: jal   0x1050b24 sll   zero, zero, 0
+// 0x0102c1c0: 0x102c1c0: jal   0x1050b34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_102c1b8:
-// 0x0102c1b8: 0x102c1b8: lw    ra, 20(sp)
-// 0x0102c1bc: 0x102c1bc: sll   zero, zero, 0
-// 0x0102c1c0: 0x102c1c0: jr    ra addiu sp, sp, 24
+L_102c1c8:
+// 0x0102c1c8: 0x102c1c8: lw    ra, 20(sp)
+// 0x0102c1cc: 0x102c1cc: sll   zero, zero, 0
+// 0x0102c1d0: 0x102c1d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2087,7 +2087,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 viewMyPoints_102c1c8(int32,int32,int32,int32,int32)
+.method public static int32 viewMyPoints_102c1d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2122,14 +2122,14 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c1c8:
-// 0x0102c1c8: 0x102c1c8: addiu sp, sp, -24
+L_102c1d8:
+// 0x0102c1d8: 0x102c1d8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c1cc: 0x102c1cc: sw    ra, 20(sp)
-// 0x0102c1d0: 0x102c1d0: jal   0x1094b64 addu  a0, zero, zero
+// 0x0102c1dc: 0x102c1dc: sw    ra, 20(sp)
+// 0x0102c1e0: 0x102c1e0: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2137,38 +2137,38 @@ L_102c1c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c1d8: 0x102c1d8: jal   0x1016438 addiu a0, zero, 1
+// 0x0102c1e8: 0x102c1e8: jal   0x1016448 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl16::roadmap_ticker_set_suppress_hide_1016438(int32)
+	call int32 Cibyl16::roadmap_ticker_set_suppress_hide_1016448(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102c1e0: 0x102c1e0: jal   0x1016444 sll   zero, zero, 0
+// 0x0102c1f0: 0x102c1f0: jal   0x1016454 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_ticker_show_1016444(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_ticker_show_1016454(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c1e8: 0x102c1e8: lui   a1, 0x1010000
+// 0x0102c1f8: 0x102c1f8: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0102c1ec: 0x102c1ec: addiu a1, a1, 25836
+// 0x0102c1fc: 0x102c1fc: addiu a1, a1, 25852
 	ldloc.2
-	ldc.i4 25836
+	ldc.i4 25852
 	add
 	stloc.2
-// 0x0102c1f0: 0x102c1f0: jal   0x104fe98 addiu a0, zero, 5000
+// 0x0102c200: 0x102c200: jal   0x104fea8 addiu a0, zero, 5000
 	ldc.i4 5000
 	stloc.1
 	ldloc.0
@@ -2176,20 +2176,20 @@ L_102c1c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c1f8: 0x102c1f8: lui   a1, 0x1010000
+// 0x0102c208: 0x102c208: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0102c1fc: 0x102c1fc: addiu a1, a1, 25892
+// 0x0102c20c: 0x102c20c: addiu a1, a1, 25908
 	ldloc.2
-	ldc.i4 25892
+	ldc.i4 25908
 	add
 	stloc.2
-// 0x0102c200: 0x102c200: jal   0x104fe98 addiu a0, zero, 5000
+// 0x0102c210: 0x102c210: jal   0x104fea8 addiu a0, zero, 5000
 	ldc.i4 5000
 	stloc.1
 	ldloc.0
@@ -2197,14 +2197,14 @@ L_102c1c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c208: 0x102c208: lw    ra, 20(sp)
-// 0x0102c20c: 0x102c20c: sll   zero, zero, 0
-// 0x0102c210: 0x102c210: jr    ra addiu sp, sp, 24
+// 0x0102c218: 0x102c218: lw    ra, 20(sp)
+// 0x0102c21c: 0x102c21c: sll   zero, zero, 0
+// 0x0102c220: 0x102c220: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2216,7 +2216,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_set_timeout_102c218(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_set_timeout_102c228(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2251,16 +2251,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c218: 0x102c218: addiu sp, sp, -24
+// 0x0102c228: 0x102c228: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c21c: 0x102c21c: addu  a1, a0, zero
+// 0x0102c22c: 0x102c22c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0102c220: 0x102c220: sw    ra, 20(sp)
-// 0x0102c224: 0x102c224: jal   0x104fe98 addiu a0, zero, 3000
+// 0x0102c230: 0x102c230: sw    ra, 20(sp)
+// 0x0102c234: 0x102c234: jal   0x104fea8 addiu a0, zero, 3000
 	ldc.i4 3000
 	stloc.1
 	ldloc.0
@@ -2268,14 +2268,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102c22c: 0x102c22c: lw    ra, 20(sp)
-// 0x0102c230: 0x102c230: sll   zero, zero, 0
-// 0x0102c234: 0x102c234: jr    ra addiu sp, sp, 24
+// 0x0102c23c: 0x102c23c: lw    ra, 20(sp)
+// 0x0102c240: 0x102c240: sll   zero, zero, 0
+// 0x0102c244: 0x102c244: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2287,7 +2287,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_quick_menu_102c23c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_quick_menu_102c24c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -2331,13 +2331,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c23c:
-// 0x0102c23c: 0x102c23c: addiu sp, sp, -56
+L_102c24c:
+// 0x0102c24c: 0x102c24c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0102c240: 0x102c240: sw    s0, 40(sp)
+// 0x0102c250: 0x102c250: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2346,20 +2346,20 @@ L_102c23c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102c244: 0x102c244: lui   s0, 0x60000
+// 0x0102c254: 0x102c254: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0102c248: 0x102c248: lw    v0, -24392(s0)
+// 0x0102c258: 0x102c258: lw    v0, -23928(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6098
+	ldc.i4 -5982
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102c24c: 0x102c24c: sw    ra, 52(sp)
-// 0x0102c250: 0x102c250: sw    s2, 48(sp)
+// 0x0102c25c: 0x102c25c: sw    ra, 52(sp)
+// 0x0102c260: 0x102c260: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2368,7 +2368,7 @@ L_102c23c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102c254: 0x102c254: bne   v0, zero, 0x102c278 sw    s1, 44(sp)
+// 0x0102c264: 0x102c264: bne   v0, zero, 0x102c288 sw    s1, 44(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -2378,20 +2378,20 @@ L_102c23c:
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_102c278
+	brtrue L_102c288
 // --- basic block ---
-// 0x0102c25c: 0x102c25c: lui   a0, 0x10000
+// 0x0102c26c: 0x102c26c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c260: 0x102c260: lui   a1, 0x0
+// 0x0102c270: 0x102c270: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102c264: 0x102c264: addiu a0, a0, -25500
+// 0x0102c274: 0x102c274: addiu a0, a0, -25500
 	ldloc.1
 	ldc.i4 -25500
 	add
 	stloc.1
-// 0x0102c268: 0x102c268: jal   0x1029bcc addiu a1, a1, 6836
+// 0x0102c278: 0x102c278: jal   0x1029bdc addiu a1, a1, 6836
 	ldloc.2
 	ldc.i4 6836
 	add
@@ -2401,25 +2401,25 @@ L_102c23c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_load_menu_1029bcc(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_load_menu_1029bdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102c270: 0x102c270: beq   v0, zero, 0x102c310 sw    v0, -24392(s0)
+// 0x0102c280: 0x102c280: beq   v0, zero, 0x102c320 sw    v0, -23928(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6098
+	ldc.i4 -5982
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_102c310
+	brfalse L_102c320
 // --- basic block ---
-L_102c278:
-// 0x0102c278: 0x102c278: jal   0x10393f0 lui   s0, 0x60000
+L_102c288:
+// 0x0102c288: 0x102c288: jal   0x1039400 lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
 	ldloc.0
@@ -2427,12 +2427,12 @@ L_102c278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::search_menu_set_local_search_attrs_10393f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::search_menu_set_local_search_attrs_1039400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102c280: 0x102c280: jal   0x109a424 addu  a0, zero, zero
+// 0x0102c290: 0x102c290: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2440,26 +2440,26 @@ L_102c278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102c288: 0x102c288: lw    a0, -24392(s0)
+// 0x0102c298: 0x102c298: lw    a0, -23928(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6098
+	ldc.i4 -5982
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102c28c: 0x102c28c: sltu  s1, zero, v0
+// 0x0102c29c: 0x102c29c: sltu  s1, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 9
-// 0x0102c290: 0x102c290: jal   0x1056874 sw    a0, 32(sp)
+// 0x0102c2a0: 0x102c2a0: jal   0x1056884 sw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2468,10 +2468,10 @@ L_102c278:
 	add
 	ldloc.1
 	stelem.i4
-	call int32 Cibyl64::navigate_main_state_1056874()
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 6
 // --- basic block ---
-// 0x0102c298: 0x102c298: lw    a0, 32(sp)
+// 0x0102c2a8: 0x102c2a8: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2480,20 +2480,20 @@ L_102c278:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102c29c: 0x102c29c: lui   a1, 0x10000
+// 0x0102c2ac: 0x102c2ac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102c2a0: 0x102c2a0: addiu a1, a1, -25488
+// 0x0102c2b0: 0x102c2b0: addiu a1, a1, -25488
 	ldloc.2
 	ldc.i4 -25488
 	add
 	stloc.2
-// 0x0102c2a4: 0x102c2a4: sltiu a2, v0, 1
+// 0x0102c2b4: 0x102c2b4: sltiu a2, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x0102c2a8: 0x102c2a8: jal   0x109ca4c addiu a3, zero, 1
+// 0x0102c2b8: 0x102c2b8: jal   0x109d094 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -2501,24 +2501,24 @@ L_102c278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_contextmenu_show_item__by_action_name_109ca4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_contextmenu_show_item__by_action_name_109d094(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102c2b0: 0x102c2b0: lw    a0, -24392(s0)
+// 0x0102c2c0: 0x102c2c0: lw    a0, -23928(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6098
+	ldc.i4 -5982
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102c2b4: 0x102c2b4: lui   s2, 0x10000
+// 0x0102c2c4: 0x102c2c4: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0102c2b8: 0x102c2b8: jal   0x1056874 sw    a0, 32(sp)
+// 0x0102c2c8: 0x102c2c8: jal   0x1056884 sw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2527,10 +2527,10 @@ L_102c278:
 	add
 	ldloc.1
 	stelem.i4
-	call int32 Cibyl64::navigate_main_state_1056874()
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 6
 // --- basic block ---
-// 0x0102c2c0: 0x102c2c0: lw    a0, 32(sp)
+// 0x0102c2d0: 0x102c2d0: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2539,15 +2539,15 @@ L_102c278:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102c2c4: 0x102c2c4: sltiu a2, v0, 1
+// 0x0102c2d4: 0x102c2d4: sltiu a2, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x0102c2c8: 0x102c2c8: addiu a3, zero, 1
+// 0x0102c2d8: 0x102c2d8: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0102c2cc: 0x102c2cc: jal   0x109ca4c addiu a1, s2, -25472
+// 0x0102c2dc: 0x102c2dc: jal   0x109d094 addiu a1, s2, -25472
 	ldloc 10
 	ldc.i4 -25472
 	add
@@ -2557,21 +2557,21 @@ L_102c278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_contextmenu_show_item__by_action_name_109ca4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_contextmenu_show_item__by_action_name_109d094(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102c2d4: 0x102c2d4: lw    a0, -24392(s0)
+// 0x0102c2e4: 0x102c2e4: lw    a0, -23928(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6098
+	ldc.i4 -5982
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102c2d8: 0x102c2d8: jal   0x109c9a4 addiu a1, s2, -25472
+// 0x0102c2e8: 0x102c2e8: jal   0x109cfec addiu a1, s2, -25472
 	ldloc 10
 	ldc.i4 -25472
 	add
@@ -2581,43 +2581,43 @@ L_102c278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_contextmenu_set_separator_109c9a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_contextmenu_set_separator_109cfec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102c2e0: 0x102c2e0: nor   s1, zero, s1
+// 0x0102c2f0: 0x102c2f0: nor   s1, zero, s1
 	ldloc 9
 	ldc.i4.m1
 	xor
 	stloc 9
-// 0x0102c2e4: 0x102c2e4: lui   a3, 0x1030000
+// 0x0102c2f4: 0x102c2f4: lui   a3, 0x1030000
 	ldc.i4 16973824
 	stloc 4
-// 0x0102c2e8: 0x102c2e8: lw    a2, -24392(s0)
+// 0x0102c2f8: 0x102c2f8: lw    a2, -23928(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6098
+	ldc.i4 -5982
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102c2ec: 0x102c2ec: addiu v0, zero, 2
+// 0x0102c2fc: 0x102c2fc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0102c2f0: 0x102c2f0: addu  a0, s1, zero
+// 0x0102c300: 0x102c300: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0102c2f4: 0x102c2f4: addiu a3, a3, -16152
+// 0x0102c304: 0x102c304: addiu a3, a3, -16136
 	ldloc 4
-	ldc.i4 -16152
+	ldc.i4 -16136
 	add
 	stloc 4
-// 0x0102c2f8: 0x102c2f8: addiu a1, zero, -2
+// 0x0102c308: 0x102c308: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x0102c2fc: 0x102c2fc: sw    v0, 20(sp)
+// 0x0102c30c: 0x102c30c: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2626,7 +2626,7 @@ L_102c278:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102c300: 0x102c300: sw    zero, 16(sp)
+// 0x0102c310: 0x102c310: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2635,7 +2635,7 @@ L_102c278:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102c304: 0x102c304: sw    zero, 24(sp)
+// 0x0102c314: 0x102c314: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2644,7 +2644,7 @@ L_102c278:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102c308: 0x102c308: jal   0x109c7f0 sw    zero, 28(sp)
+// 0x0102c318: 0x102c318: jal   0x109ce38 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2658,14 +2658,14 @@ L_102c278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_102c310:
-// 0x0102c310: 0x102c310: lw    ra, 52(sp)
-// 0x0102c314: 0x102c314: lw    s2, 48(sp)
+L_102c320:
+// 0x0102c320: 0x102c320: lw    ra, 52(sp)
+// 0x0102c324: 0x102c324: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2674,7 +2674,7 @@ L_102c310:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102c318: 0x102c318: lw    s1, 44(sp)
+// 0x0102c328: 0x102c328: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2683,7 +2683,7 @@ L_102c310:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102c31c: 0x102c31c: lw    s0, 40(sp)
+// 0x0102c32c: 0x102c32c: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2692,7 +2692,7 @@ L_102c310:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102c320: 0x102c320: jr    ra addiu sp, sp, 56
+// 0x0102c330: 0x102c330: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2704,7 +2704,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_start_sync_data_102c328(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_sync_data_102c338(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2739,41 +2739,41 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c328:
-// 0x0102c328: 0x102c328: lui   a0, 0x0
+L_102c338:
+// 0x0102c338: 0x102c338: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102c32c: 0x102c32c: lui   a1, 0x10000
+// 0x0102c33c: 0x102c33c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102c330: 0x102c330: lui   a3, 0x1030000
+// 0x0102c340: 0x102c340: lui   a3, 0x1030000
 	ldc.i4 16973824
 	stloc 4
-// 0x0102c334: 0x102c334: addiu sp, sp, -32
+// 0x0102c344: 0x102c344: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102c338: 0x102c338: addiu a0, a0, 25892
+// 0x0102c348: 0x102c348: addiu a0, a0, 25892
 	ldloc.1
 	ldc.i4 25892
 	add
 	stloc.1
-// 0x0102c33c: 0x102c33c: addiu a1, a1, -25456
+// 0x0102c34c: 0x102c34c: addiu a1, a1, -25456
 	ldloc.2
 	ldc.i4 -25456
 	add
 	stloc.2
-// 0x0102c340: 0x102c340: addiu a3, a3, -15456
+// 0x0102c350: 0x102c350: addiu a3, a3, -15440
 	ldloc 4
-	ldc.i4 -15456
+	ldc.i4 -15440
 	add
 	stloc 4
-// 0x0102c344: 0x102c344: addiu a2, zero, 1
+// 0x0102c354: 0x102c354: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0102c348: 0x102c348: sw    ra, 28(sp)
-// 0x0102c34c: 0x102c34c: jal   0x104c320 sw    zero, 16(sp)
+// 0x0102c358: 0x102c358: sw    ra, 28(sp)
+// 0x0102c35c: 0x102c35c: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2787,14 +2787,14 @@ L_102c328:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102c354: 0x102c354: lw    ra, 28(sp)
-// 0x0102c358: 0x102c358: sll   zero, zero, 0
-// 0x0102c35c: 0x102c35c: jr    ra addiu sp, sp, 32
+// 0x0102c364: 0x102c364: lw    ra, 28(sp)
+// 0x0102c368: 0x102c368: sll   zero, zero, 0
+// 0x0102c36c: 0x102c36c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2806,7 +2806,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_confirmed_exit_102c364(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_confirmed_exit_102c374(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2841,41 +2841,41 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c364:
-// 0x0102c364: 0x102c364: lui   a0, 0x10000
+L_102c374:
+// 0x0102c374: 0x102c374: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c368: 0x102c368: lui   a1, 0x10000
+// 0x0102c378: 0x102c378: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102c36c: 0x102c36c: lui   a3, 0x1030000
+// 0x0102c37c: 0x102c37c: lui   a3, 0x1030000
 	ldc.i4 16973824
 	stloc 4
-// 0x0102c370: 0x102c370: addiu sp, sp, -32
+// 0x0102c380: 0x102c380: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102c374: 0x102c374: addiu a0, a0, 18500
+// 0x0102c384: 0x102c384: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0102c378: 0x102c378: addiu a1, a1, -25408
+// 0x0102c388: 0x102c388: addiu a1, a1, -25408
 	ldloc.2
 	ldc.i4 -25408
 	add
 	stloc.2
-// 0x0102c37c: 0x102c37c: addiu a3, a3, -15968
+// 0x0102c38c: 0x102c38c: addiu a3, a3, -15952
 	ldloc 4
-	ldc.i4 -15968
+	ldc.i4 -15952
 	add
 	stloc 4
-// 0x0102c380: 0x102c380: addiu a2, zero, 1
+// 0x0102c390: 0x102c390: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0102c384: 0x102c384: sw    ra, 28(sp)
-// 0x0102c388: 0x102c388: jal   0x104c320 sw    zero, 16(sp)
+// 0x0102c394: 0x102c394: sw    ra, 28(sp)
+// 0x0102c398: 0x102c398: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2889,14 +2889,14 @@ L_102c364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102c390: 0x102c390: lw    ra, 28(sp)
-// 0x0102c394: 0x102c394: sll   zero, zero, 0
-// 0x0102c398: 0x102c398: jr    ra addiu sp, sp, 32
+// 0x0102c3a0: 0x102c3a0: lw    ra, 28(sp)
+// 0x0102c3a4: 0x102c3a4: sll   zero, zero, 0
+// 0x0102c3a8: 0x102c3a8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2908,7 +2908,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_confirmed_start_sync_callback_102c3a0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_confirmed_start_sync_callback_102c3b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -2943,45 +2943,45 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c3a0: 0x102c3a0: addiu sp, sp, -24
+// 0x0102c3b0: 0x102c3b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c3a4: 0x102c3a4: addiu v0, zero, 3
+// 0x0102c3b4: 0x102c3b4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0102c3a8: 0x102c3a8: bne   a0, v0, 0x102c3c0 sw    ra, 20(sp)
+// 0x0102c3b8: 0x102c3b8: bne   a0, v0, 0x102c3d0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_102c3c0
+	bne.un L_102c3d0
 // --- basic block ---
-// 0x0102c3b0: 0x102c3b0: jal   0x10bd094 sll   zero, zero, 0
+// 0x0102c3c0: 0x102c3c0: jal   0x10bd6dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::editor_report_markers_10bd094(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::editor_report_markers_10bd6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102c3b8: 0x102c3b8: jal   0x10bce90 sll   zero, zero, 0
+// 0x0102c3c8: 0x102c3c8: jal   0x10bd4d8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl141::export_sync_10bce90(int32,int32,int32,int32,int32)
+	call int32 Cibyl141::export_sync_10bd4d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102c3c0:
-// 0x0102c3c0: 0x102c3c0: lw    ra, 20(sp)
-// 0x0102c3c4: 0x102c3c4: sll   zero, zero, 0
-// 0x0102c3c8: 0x102c3c8: jr    ra addiu sp, sp, 24
+L_102c3d0:
+// 0x0102c3d0: 0x102c3d0: lw    ra, 20(sp)
+// 0x0102c3d4: 0x102c3d4: sll   zero, zero, 0
+// 0x0102c3d8: 0x102c3d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2993,7 +2993,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_detect_receiver_102c3d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_detect_receiver_102c3e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3028,27 +3028,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c3d0:
-// 0x0102c3d0: 0x102c3d0: addiu sp, sp, -24
+L_102c3e0:
+// 0x0102c3e0: 0x102c3e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102c3d4: 0x102c3d4: sw    ra, 20(sp)
-// 0x0102c3d8: 0x102c3d8: jal   0x1030f08 sll   zero, zero, 0
+// 0x0102c3e4: 0x102c3e4: sw    ra, 20(sp)
+// 0x0102c3e8: 0x102c3e8: jal   0x1030f18 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_detect_receiver_1030f08(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_detect_receiver_1030f18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102c3e0: 0x102c3e0: lw    ra, 20(sp)
-// 0x0102c3e4: 0x102c3e4: sll   zero, zero, 0
-// 0x0102c3e8: 0x102c3e8: jr    ra addiu sp, sp, 24
+// 0x0102c3f0: 0x102c3f0: lw    ra, 20(sp)
+// 0x0102c3f4: 0x102c3f4: sll   zero, zero, 0
+// 0x0102c3f8: 0x102c3f8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3060,7 +3060,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -3098,12 +3098,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c3f0: 0x102c3f0: addiu sp, sp, -32
+// 0x0102c400: 0x102c400: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102c3f4: 0x102c3f4: sw    s0, 24(sp)
+// 0x0102c404: 0x102c404: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3112,33 +3112,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102c3f8: 0x102c3f8: lui   s0, 0x60000
+// 0x0102c408: 0x102c408: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0102c3fc: 0x102c3fc: lw    v0, -24344(s0)
+// 0x0102c40c: 0x102c40c: lw    v0, -23880(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6086
+	ldc.i4 -5970
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c400: 0x102c400: sll   zero, zero, 0
-// 0x0102c404: 0x102c404: bne   v0, zero, 0x102c440 sw    ra, 28(sp)
+// 0x0102c410: 0x102c410: sll   zero, zero, 0
+// 0x0102c414: 0x102c414: bne   v0, zero, 0x102c450 sw    ra, 28(sp)
 	ldloc 5
-	brtrue L_102c440
+	brtrue L_102c450
 // --- basic block ---
-// 0x0102c40c: 0x102c40c: addiu v0, zero, 2
+// 0x0102c41c: 0x102c41c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102c410: 0x102c410: lui   a0, 0x60000
+// 0x0102c420: 0x102c420: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0102c414: 0x102c414: lui   a1, 0x10000
+// 0x0102c424: 0x102c424: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102c418: 0x102c418: sw    v0, 16(sp)
+// 0x0102c428: 0x102c428: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3147,26 +3147,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102c41c: 0x102c41c: addiu a0, a0, -24340
+// 0x0102c42c: 0x102c42c: addiu a0, a0, -23876
 	ldloc.1
-	ldc.i4 -24340
+	ldc.i4 -23876
 	add
 	stloc.1
-// 0x0102c420: 0x102c420: addiu v0, zero, 3
+// 0x0102c430: 0x102c430: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0102c424: 0x102c424: addiu a1, a1, -25400
+// 0x0102c434: 0x102c434: addiu a1, a1, -25400
 	ldloc.2
 	ldc.i4 -25400
 	add
 	stloc.2
-// 0x0102c428: 0x102c428: addiu a2, zero, 2
+// 0x0102c438: 0x102c438: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0102c42c: 0x102c42c: addu  a3, zero, zero
+// 0x0102c43c: 0x102c43c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102c430: 0x102c430: jal   0x1000f64 sw    v0, 20(sp)
+// 0x0102c440: 0x102c440: jal   0x1000f64 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3185,29 +3185,29 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0102c438: 0x102c438: addiu v0, zero, 1
+// 0x0102c448: 0x102c448: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102c43c: 0x102c43c: sw    v0, -24344(s0)
+// 0x0102c44c: 0x102c44c: sw    v0, -23880(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6086
+	ldc.i4 -5970
 	add
 	ldloc 5
 	stelem.i4
-L_102c440:
-// 0x0102c440: 0x102c440: lw    ra, 28(sp)
-// 0x0102c444: 0x102c444: lui   v0, 0x60000
+L_102c450:
+// 0x0102c450: 0x102c450: lw    ra, 28(sp)
+// 0x0102c454: 0x102c454: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102c448: 0x102c448: addiu v0, v0, -24340
+// 0x0102c458: 0x102c458: addiu v0, v0, -23876
 	ldloc 5
-	ldc.i4 -24340
+	ldc.i4 -23876
 	add
 	stloc 5
-// 0x0102c44c: 0x102c44c: lw    s0, 24(sp)
+// 0x0102c45c: 0x102c45c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3216,7 +3216,7 @@ L_102c440:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102c450: 0x102c450: jr    ra addiu sp, sp, 32
+// 0x0102c460: 0x102c460: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3228,7 +3228,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_about_exit_102c458(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_about_exit_102c468(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -3275,22 +3275,22 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102c458:
-// 0x0102c458: 0x102c458: lui   a0, 0x10000
+L_102c468:
+// 0x0102c468: 0x102c468: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c45c: 0x102c45c: addiu sp, sp, -560
+// 0x0102c46c: 0x102c46c: addiu sp, sp, -560
 	ldloc.0
 	ldc.i4 -560
 	add
 	stloc.0
-// 0x0102c460: 0x102c460: addiu a0, a0, -25388
+// 0x0102c470: 0x102c470: addiu a0, a0, -25388
 	ldloc.1
 	ldc.i4 -25388
 	add
 	stloc.1
-// 0x0102c464: 0x102c464: sw    ra, 556(sp)
-// 0x0102c468: 0x102c468: sw    s1, 544(sp)
+// 0x0102c474: 0x102c474: sw    ra, 556(sp)
+// 0x0102c478: 0x102c478: sw    s1, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3299,7 +3299,7 @@ L_102c458:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102c46c: 0x102c46c: sw    s0, 540(sp)
+// 0x0102c47c: 0x102c47c: sw    s0, 540(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3308,7 +3308,7 @@ L_102c458:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102c470: 0x102c470: sw    s3, 552(sp)
+// 0x0102c480: 0x102c480: sw    s3, 552(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3317,7 +3317,7 @@ L_102c458:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102c474: 0x102c474: jal   0x101cd60 sw    s2, 548(sp)
+// 0x0102c484: 0x102c484: jal   0x101cd70 sw    s2, 548(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3331,20 +3331,20 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c47c: 0x102c47c: lui   a0, 0x10000
+// 0x0102c48c: 0x102c48c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c480: 0x102c480: addiu a0, a0, -25360
+// 0x0102c490: 0x102c490: addiu a0, a0, -25360
 	ldloc.1
 	ldc.i4 -25360
 	add
 	stloc.1
-// 0x0102c484: 0x102c484: sw    v0, 528(sp)
+// 0x0102c494: 0x102c494: sw    v0, 528(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3353,7 +3353,7 @@ L_102c458:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102c488: 0x102c488: jal   0x101cd60 addiu s1, sp, 24
+// 0x0102c498: 0x102c498: jal   0x101cd70 addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3363,15 +3363,15 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c490: 0x102c490: lui   a1, 0x10000
+// 0x0102c4a0: 0x102c4a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102c494: 0x102c494: lw    a2, 528(sp)
+// 0x0102c4a4: 0x102c4a4: lw    a2, 528(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3380,18 +3380,18 @@ L_102c458:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102c498: 0x102c498: addu  a0, s1, zero
+// 0x0102c4a8: 0x102c4a8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0102c49c: 0x102c49c: addiu a1, a1, -25344
+// 0x0102c4ac: 0x102c4ac: addiu a1, a1, -25344
 	ldloc.2
 	ldc.i4 -25344
 	add
 	stloc.2
-// 0x0102c4a0: 0x102c4a0: addu  a3, v0, zero
+// 0x0102c4b0: 0x102c4b0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0102c4a4: 0x102c4a4: jal   0x1000f64 lui   s0, 0x10000
+// 0x0102c4b4: 0x102c4b4: jal   0x1000f64 lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
 	ldloc.0
@@ -3404,7 +3404,7 @@ L_102c458:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c4ac: 0x102c4ac: jal   0x10941a4 addiu a0, s0, -25336
+// 0x0102c4bc: 0x102c4bc: jal   0x10947c8 addiu a0, s0, -25336
 	ldloc 8
 	ldc.i4 -25336
 	add
@@ -3414,36 +3414,36 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_exists_10941a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_exists_10947c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c4b4: 0x102c4b4: bne   v0, zero, 0x102c60c lui   a3, 0x10010000
+// 0x0102c4c4: 0x102c4c4: bne   v0, zero, 0x102c61c lui   a3, 0x10010000
 	ldloc 5
 	ldc.i4 268500992
 	stloc 4
-	brtrue L_102c60c
+	brtrue L_102c61c
 // --- basic block ---
-// 0x0102c4bc: 0x102c4bc: lui   a1, 0x10000
+// 0x0102c4cc: 0x102c4cc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102c4c0: 0x102c4c0: ori   a3, a3, 20497
+// 0x0102c4d0: 0x102c4d0: ori   a3, a3, 20497
 	ldloc 4
 	ldc.i4 20497
 	or
 	stloc 4
-// 0x0102c4c4: 0x102c4c4: addiu a0, s0, -25336
+// 0x0102c4d4: 0x102c4d4: addiu a0, s0, -25336
 	ldloc 8
 	ldc.i4 -25336
 	add
 	stloc.1
-// 0x0102c4c8: 0x102c4c8: addiu a1, a1, 18500
+// 0x0102c4d8: 0x102c4d8: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0102c4cc: 0x102c4cc: jal   0x1095a08 addu  a2, zero, zero
+// 0x0102c4dc: 0x102c4dc: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3451,54 +3451,54 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c4d4: 0x102c4d4: lui   a1, 0x0
+// 0x0102c4e4: 0x102c4e4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102c4d8: 0x102c4d8: addu  a0, v0, zero
+// 0x0102c4e8: 0x102c4e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102c4dc: 0x102c4dc: addiu a1, a1, 31980
+// 0x0102c4ec: 0x102c4ec: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x0102c4e0: 0x102c4e0: addu  a2, zero, zero
+// 0x0102c4f0: 0x102c4f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102c4e4: 0x102c4e4: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0102c4f4: 0x102c4f4: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102c4ec: 0x102c4ec: lui   a0, 0x10000
+// 0x0102c4fc: 0x102c4fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c4f0: 0x102c4f0: addu  a2, zero, zero
+// 0x0102c500: 0x102c500: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102c4f4: 0x102c4f4: addiu a3, zero, 20
+// 0x0102c504: 0x102c504: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0102c4f8: 0x102c4f8: addiu a0, a0, -27036
+// 0x0102c508: 0x102c508: addiu a0, a0, -27036
 	ldloc.1
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x0102c4fc: 0x102c4fc: addu  a1, zero, zero
+// 0x0102c50c: 0x102c50c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102c500: 0x102c500: addiu v0, zero, 8
+// 0x0102c510: 0x102c510: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0102c504: 0x102c504: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0102c514: 0x102c514: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3512,41 +3512,41 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c50c: 0x102c50c: addu  a1, v0, zero
+// 0x0102c51c: 0x102c51c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102c510: 0x102c510: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102c520: 0x102c520: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c518: 0x102c518: lui   a0, 0x20000
+// 0x0102c528: 0x102c528: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0102c51c: 0x102c51c: addiu a2, zero, 14
+// 0x0102c52c: 0x102c52c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x0102c520: 0x102c520: ori   a3, zero, 32905
+// 0x0102c530: 0x102c530: ori   a3, zero, 32905
 	ldc.i4.s 0
 	ldc.i4 32905
 	or
 	stloc 4
-// 0x0102c524: 0x102c524: addu  a1, s1, zero
+// 0x0102c534: 0x102c534: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0102c528: 0x102c528: jal   0x1098d10 addiu a0, a0, -2684
+// 0x0102c538: 0x102c538: jal   0x1099358 addiu a0, a0, -2220
 	ldloc.1
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -3554,23 +3554,23 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c530: 0x102c530: lui   a1, 0x0
+// 0x0102c540: 0x102c540: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102c534: 0x102c534: addu  a0, v0, zero
+// 0x0102c544: 0x102c544: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102c538: 0x102c538: addiu a1, a1, 23008
+// 0x0102c548: 0x102c548: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102c53c: 0x102c53c: jal   0x1097af8 sw    v0, 528(sp)
+// 0x0102c54c: 0x102c54c: jal   0x1098140 sw    v0, 528(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3581,9 +3581,9 @@ L_102c458:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102c544: 0x102c544: lw    v0, 528(sp)
+// 0x0102c554: 0x102c554: lw    v0, 528(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3592,40 +3592,40 @@ L_102c458:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c548: 0x102c548: addu  a0, s0, zero
+// 0x0102c558: 0x102c558: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102c54c: 0x102c54c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0102c55c: 0x102c55c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c554: 0x102c554: lui   a0, 0x10000
+// 0x0102c564: 0x102c564: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c558: 0x102c558: addu  a2, zero, zero
+// 0x0102c568: 0x102c568: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102c55c: 0x102c55c: addiu a3, zero, 20
+// 0x0102c56c: 0x102c56c: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0102c560: 0x102c560: addiu a0, a0, -25324
+// 0x0102c570: 0x102c570: addiu a0, a0, -25324
 	ldloc.1
 	ldc.i4 -25324
 	add
 	stloc.1
-// 0x0102c564: 0x102c564: addu  a1, zero, zero
+// 0x0102c574: 0x102c574: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102c568: 0x102c568: addiu v0, zero, 12
+// 0x0102c578: 0x102c578: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x0102c56c: 0x102c56c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0102c57c: 0x102c57c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3639,28 +3639,28 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c574: 0x102c574: addu  a1, v0, zero
+// 0x0102c584: 0x102c584: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102c578: 0x102c578: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102c588: 0x102c588: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c580: 0x102c580: lui   a0, 0x10000
+// 0x0102c590: 0x102c590: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c584: 0x102c584: jal   0x101cd60 addiu a0, a0, -25316
+// 0x0102c594: 0x102c594: jal   0x101cd70 addiu a0, a0, -25316
 	ldloc.1
 	ldc.i4 -25316
 	add
@@ -3670,34 +3670,34 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c58c: 0x102c58c: lui   s2, 0x300000
+// 0x0102c59c: 0x102c59c: lui   s2, 0x300000
 	ldc.i4 3145728
 	stloc 10
-// 0x0102c590: 0x102c590: lui   s1, 0x1030000
+// 0x0102c5a0: 0x102c5a0: lui   s1, 0x1030000
 	ldc.i4 16973824
 	stloc 9
-// 0x0102c594: 0x102c594: lui   a0, 0x20000
+// 0x0102c5a4: 0x102c5a4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0102c598: 0x102c598: addiu a3, s1, -13704
+// 0x0102c5a8: 0x102c5a8: addiu a3, s1, -13688
 	ldloc 9
-	ldc.i4 -13704
+	ldc.i4 -13688
 	add
 	stloc 4
-// 0x0102c59c: 0x102c59c: addiu a0, a0, -23916
+// 0x0102c5ac: 0x102c5ac: addiu a0, a0, -23452
 	ldloc.1
-	ldc.i4 -23916
+	ldc.i4 -23452
 	add
 	stloc.1
-// 0x0102c5a0: 0x102c5a0: addu  a1, v0, zero
+// 0x0102c5b0: 0x102c5b0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102c5a4: 0x102c5a4: jal   0x1091088 ori   a2, s2, 1
+// 0x0102c5b4: 0x102c5b4: jal   0x10916ac ori   a2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	or
@@ -3707,26 +3707,26 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c5ac: 0x102c5ac: lui   a0, 0x10000
+// 0x0102c5bc: 0x102c5bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c5b0: 0x102c5b0: addiu a0, a0, -25304
+// 0x0102c5c0: 0x102c5c0: addiu a0, a0, -25304
 	ldloc.1
 	ldc.i4 -25304
 	add
 	stloc.1
-// 0x0102c5b4: 0x102c5b4: addu  a2, zero, zero
+// 0x0102c5c4: 0x102c5c4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102c5b8: 0x102c5b8: addu  a1, a0, zero
+// 0x0102c5c8: 0x102c5c8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0102c5bc: 0x102c5bc: jal   0x109e13c addu  s3, v0, zero
+// 0x0102c5cc: 0x102c5cc: jal   0x109e784 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -3734,41 +3734,41 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c5c4: 0x102c5c4: addu  a1, v0, zero
+// 0x0102c5d4: 0x102c5d4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102c5c8: 0x102c5c8: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0102c5d8: 0x102c5d8: jal   0x109950c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c5d0: 0x102c5d0: addu  a1, s3, zero
+// 0x0102c5e0: 0x102c5e0: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0102c5d4: 0x102c5d4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102c5e4: 0x102c5e4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c5dc: 0x102c5dc: lui   a0, 0x10000
+// 0x0102c5ec: 0x102c5ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c5e0: 0x102c5e0: jal   0x101cd60 addiu a0, a0, -25292
+// 0x0102c5f0: 0x102c5f0: jal   0x101cd70 addiu a0, a0, -25292
 	ldloc.1
 	ldc.i4 -25292
 	add
@@ -3778,30 +3778,30 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c5e8: 0x102c5e8: lui   a0, 0x10000
+// 0x0102c5f8: 0x102c5f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c5ec: 0x102c5ec: addiu a0, a0, -25284
+// 0x0102c5fc: 0x102c5fc: addiu a0, a0, -25284
 	ldloc.1
 	ldc.i4 -25284
 	add
 	stloc.1
-// 0x0102c5f0: 0x102c5f0: addu  a1, v0, zero
+// 0x0102c600: 0x102c600: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102c5f4: 0x102c5f4: ori   a2, s2, 1
+// 0x0102c604: 0x102c604: ori   a2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	or
 	stloc.3
-// 0x0102c5f8: 0x102c5f8: jal   0x1091088 addiu a3, s1, -13704
+// 0x0102c608: 0x102c608: jal   0x10916ac addiu a3, s1, -13688
 	ldloc 9
-	ldc.i4 -13704
+	ldc.i4 -13688
 	add
 	stloc 4
 	ldloc.0
@@ -3809,34 +3809,34 @@ L_102c458:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c600: 0x102c600: addu  a1, v0, zero
+// 0x0102c610: 0x102c610: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102c604: 0x102c604: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102c614: 0x102c614: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102c60c:
-// 0x0102c60c: 0x102c60c: lui   a0, 0x10000
+L_102c61c:
+// 0x0102c61c: 0x102c61c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102c610: 0x102c610: addiu a0, a0, -25336
+// 0x0102c620: 0x102c620: addiu a0, a0, -25336
 	ldloc.1
 	ldc.i4 -25336
 	add
 	stloc.1
-// 0x0102c614: 0x102c614: jal   0x1095eec addu  a1, zero, zero
+// 0x0102c624: 0x102c624: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3844,24 +3844,24 @@ L_102c60c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c61c: 0x102c61c: jal   0x1021900 sll   zero, zero, 0
+// 0x0102c62c: 0x102c62c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102c624: 0x102c624: lw    ra, 556(sp)
-// 0x0102c628: 0x102c628: lw    s3, 552(sp)
+// 0x0102c634: 0x102c634: lw    ra, 556(sp)
+// 0x0102c638: 0x102c638: lw    s3, 552(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3870,7 +3870,7 @@ L_102c60c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102c62c: 0x102c62c: lw    s2, 548(sp)
+// 0x0102c63c: 0x102c63c: lw    s2, 548(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3879,7 +3879,7 @@ L_102c60c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102c630: 0x102c630: lw    s1, 544(sp)
+// 0x0102c640: 0x102c640: lw    s1, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3888,7 +3888,7 @@ L_102c60c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102c634: 0x102c634: lw    s0, 540(sp)
+// 0x0102c644: 0x102c644: lw    s0, 540(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3897,7 +3897,7 @@ L_102c60c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102c638: 0x102c638: jr    ra addiu sp, sp, 560
+// 0x0102c648: 0x102c648: jr    ra addiu sp, sp, 560
 	ldloc.0
 	ldc.i4 560
 	add
@@ -3909,7 +3909,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -3950,12 +3950,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c720: 0x102c720: addiu sp, sp, -32
+// 0x0102c730: 0x102c730: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102c724: 0x102c724: sw    s0, 20(sp)
+// 0x0102c734: 0x102c734: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3964,10 +3964,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102c728: 0x102c728: lui   s0, 0x0
+// 0x0102c738: 0x102c738: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102c72c: 0x102c72c: sw    s1, 24(sp)
+// 0x0102c73c: 0x102c73c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3976,59 +3976,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102c730: 0x102c730: sw    ra, 28(sp)
-// 0x0102c734: 0x102c734: addu  s1, a0, zero
+// 0x0102c740: 0x102c740: sw    ra, 28(sp)
+// 0x0102c744: 0x102c744: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0102c738: 0x102c738: j	 0x102c754 addiu s0, s0, 6836
+// 0x0102c748: 0x102c748: j	 0x102c764 addiu s0, s0, 6836
 	ldloc 5
 	ldc.i4 6836
 	add
 	stloc 5
-	br L_102c754
+	br L_102c764
 // --- basic block ---
-L_102c740:
-// 0x0102c740: 0x102c740: jal   0x1001b14 sll   zero, zero, 0
+L_102c750:
+// 0x0102c750: 0x102c750: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0102c748: 0x102c748: beq   v0, zero, 0x102c768 sll   zero, zero, 0
+// 0x0102c758: 0x102c758: beq   v0, zero, 0x102c778 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_102c768
+	brfalse L_102c778
 // --- basic block ---
-// 0x0102c750: 0x102c750: addiu s0, s0, 24
+// 0x0102c760: 0x102c760: addiu s0, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 5
-L_102c754:
-// 0x0102c754: 0x102c754: lw    v0, 0(s0)
+L_102c764:
+// 0x0102c764: 0x102c764: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0102c758: 0x102c758: addu  a1, s1, zero
+// 0x0102c768: 0x102c768: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102c75c: 0x102c75c: bne   v0, zero, 0x102c740 addu  a0, v0, zero
+// 0x0102c76c: 0x102c76c: bne   v0, zero, 0x102c750 addu  a0, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_102c740
+	brtrue L_102c750
 // --- basic block ---
-// 0x0102c764: 0x102c764: addu  s0, zero, zero
+// 0x0102c774: 0x102c774: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_102c768:
-// 0x0102c768: 0x102c768: lw    ra, 28(sp)
-// 0x0102c76c: 0x102c76c: addu  v0, s0, zero
+L_102c778:
+// 0x0102c778: 0x102c778: lw    ra, 28(sp)
+// 0x0102c77c: 0x102c77c: addu  v0, s0, zero
 	ldloc 5
 	stloc 7
-// 0x0102c770: 0x102c770: lw    s1, 24(sp)
+// 0x0102c780: 0x102c780: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4037,7 +4037,7 @@ L_102c768:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102c774: 0x102c774: lw    s0, 20(sp)
+// 0x0102c784: 0x102c784: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4046,7 +4046,7 @@ L_102c768:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c778: 0x102c778: jr    ra addiu sp, sp, 32
+// 0x0102c788: 0x102c788: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4058,7 +4058,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_get_menu_item_102c780(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_get_menu_item_102c790(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s5,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 lo,int32 v1,int32 ra)
@@ -4114,12 +4114,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c780: 0x102c780: addiu sp, sp, -48
+// 0x0102c790: 0x102c790: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0102c784: 0x102c784: sw    s3, 32(sp)
+// 0x0102c794: 0x102c794: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4128,7 +4128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102c788: 0x102c788: sw    s2, 28(sp)
+// 0x0102c798: 0x102c798: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4137,7 +4137,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102c78c: 0x102c78c: sw    s0, 20(sp)
+// 0x0102c79c: 0x102c79c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4146,8 +4146,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102c790: 0x102c790: sw    ra, 44(sp)
-// 0x0102c794: 0x102c794: sw    s5, 40(sp)
+// 0x0102c7a0: 0x102c7a0: sw    ra, 44(sp)
+// 0x0102c7a4: 0x102c7a4: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4156,7 +4156,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102c798: 0x102c798: sw    s4, 36(sp)
+// 0x0102c7a8: 0x102c7a8: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4165,7 +4165,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102c79c: 0x102c79c: sw    s1, 24(sp)
+// 0x0102c7ac: 0x102c7ac: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4174,80 +4174,80 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102c7a0: 0x102c7a0: addu  s0, a2, zero
+// 0x0102c7b0: 0x102c7b0: addu  s0, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0102c7a4: 0x102c7a4: addu  s2, a0, zero
+// 0x0102c7b4: 0x102c7b4: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0102c7a8: 0x102c7a8: beq   a2, zero, 0x102c8bc addu  s3, a1, zero
+// 0x0102c7b8: 0x102c7b8: beq   a2, zero, 0x102c8cc addu  s3, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 11
-	brfalse L_102c8bc
+	brfalse L_102c8cc
 // --- basic block ---
-// 0x0102c7b0: 0x102c7b0: beq   a0, zero, 0x102c864 addu  s1, zero, zero
+// 0x0102c7c0: 0x102c7c0: beq   a0, zero, 0x102c874 addu  s1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_102c864
+	brfalse L_102c874
 // --- basic block ---
-// 0x0102c7b8: 0x102c7b8: lb    v0, 0(a0)
+// 0x0102c7c8: 0x102c7c8: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0102c7bc: 0x102c7bc: sll   zero, zero, 0
-// 0x0102c7c0: 0x102c7c0: beq   v0, zero, 0x102c864 addiu s4, zero, 28
+// 0x0102c7cc: 0x102c7cc: sll   zero, zero, 0
+// 0x0102c7d0: 0x102c7d0: beq   v0, zero, 0x102c874 addiu s4, zero, 28
 	ldloc 5
 	ldc.i4.s 28
 	stloc 12
-	brfalse L_102c864
+	brfalse L_102c874
 // --- basic block ---
-// 0x0102c7c8: 0x102c7c8: j	 0x102c848 sll   zero, zero, 0
-	br L_102c848
+// 0x0102c7d8: 0x102c7d8: j	 0x102c858 sll   zero, zero, 0
+	br L_102c858
 // --- basic block ---
-L_102c7d0:
-// 0x0102c7d0: 0x102c7d0: mult  s1, s4
+L_102c7e0:
+// 0x0102c7e0: 0x102c7e0: mult  s1, s4
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 13
-// 0x0102c7d4: 0x102c7d4: lw    s5, 0(s0)
+// 0x0102c7e4: 0x102c7e4: lw    s5, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0102c7d8: 0x102c7d8: mflo  lo
+// 0x0102c7e8: 0x102c7e8: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0102c7dc: 0x102c7dc: addu  s5, s5, v0
+// 0x0102c7ec: 0x102c7ec: addu  s5, s5, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0102c7e0: 0x102c7e0: lbu   v0, 8(s5)
+// 0x0102c7f0: 0x102c7f0: lbu   v0, 8(s5)
 	ldloc 7
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0102c7e4: 0x102c7e4: sll   zero, zero, 0
-// 0x0102c7e8: 0x102c7e8: andi  v0, v0, 1
+// 0x0102c7f4: 0x102c7f4: sll   zero, zero, 0
+// 0x0102c7f8: 0x102c7f8: andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-// 0x0102c7ec: 0x102c7ec: beq   v0, zero, 0x102c848 addiu s1, s1, 1
+// 0x0102c7fc: 0x102c7fc: beq   v0, zero, 0x102c858 addiu s1, s1, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_102c848
+	brfalse L_102c858
 // --- basic block ---
-// 0x0102c7f4: 0x102c7f4: lw    v0, 16(s5)
+// 0x0102c804: 0x102c804: lw    v0, 16(s5)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4256,29 +4256,29 @@ L_102c7d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c7f8: 0x102c7f8: sll   zero, zero, 0
-// 0x0102c7fc: 0x102c7fc: beq   v0, zero, 0x102c830 sll   zero, zero, 0
+// 0x0102c808: 0x102c808: sll   zero, zero, 0
+// 0x0102c80c: 0x102c80c: beq   v0, zero, 0x102c840 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102c830
+	brfalse L_102c840
 // --- basic block ---
-// 0x0102c804: 0x102c804: lw    a1, 0(v0)
+// 0x0102c814: 0x102c814: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0102c808: 0x102c808: jal   0x1001b14 sll   zero, zero, 0
+// 0x0102c818: 0x102c818: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102c810: 0x102c810: bne   v0, zero, 0x102c830 sll   zero, zero, 0
+// 0x0102c820: 0x102c820: bne   v0, zero, 0x102c840 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102c830
+	brtrue L_102c840
 // --- basic block ---
-// 0x0102c818: 0x102c818: lw    s0, 24(s5)
+// 0x0102c828: 0x102c828: lw    s0, 24(s5)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4287,20 +4287,20 @@ L_102c7d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102c81c: 0x102c81c: sll   zero, zero, 0
-// 0x0102c820: 0x102c820: bne   s0, zero, 0x102c864 addu  s1, zero, zero
+// 0x0102c82c: 0x102c82c: sll   zero, zero, 0
+// 0x0102c830: 0x102c830: bne   s0, zero, 0x102c874 addu  s1, zero, zero
 	ldloc 9
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_102c864
+	brtrue L_102c874
 // --- basic block ---
-// 0x0102c828: 0x102c828: j	 0x102c8c0 addu  s5, zero, zero
+// 0x0102c838: 0x102c838: j	 0x102c8d0 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_102c8c0
+	br L_102c8d0
 // --- basic block ---
-L_102c830:
-// 0x0102c830: 0x102c830: lw    a2, 24(s5)
+L_102c840:
+// 0x0102c840: 0x102c840: lw    a2, 24(s5)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4309,10 +4309,10 @@ L_102c830:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102c834: 0x102c834: addu  a0, s2, zero
+// 0x0102c844: 0x102c844: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0102c838: 0x102c838: jal   0x102c780 addu  a1, s3, zero
+// 0x0102c848: 0x102c848: jal   0x102c790 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -4320,19 +4320,19 @@ L_102c830:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_get_menu_item_102c780(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_get_menu_item_102c790(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 14
 	stloc 5
 // --- basic block ---
-// 0x0102c840: 0x102c840: bne   v0, zero, 0x102c8c0 addu  s5, v0, zero
+// 0x0102c850: 0x102c850: bne   v0, zero, 0x102c8d0 addu  s5, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_102c8c0
+	brtrue L_102c8d0
 // --- basic block ---
-L_102c848:
-// 0x0102c848: 0x102c848: lw    v0, 4(s0)
+L_102c858:
+// 0x0102c858: 0x102c858: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4341,56 +4341,56 @@ L_102c848:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c84c: 0x102c84c: sll   zero, zero, 0
-// 0x0102c850: 0x102c850: slt   v0, s1, v0
+// 0x0102c85c: 0x102c85c: sll   zero, zero, 0
+// 0x0102c860: 0x102c860: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102c854: 0x102c854: bne   v0, zero, 0x102c7d0 addu  a0, s2, zero
+// 0x0102c864: 0x102c864: bne   v0, zero, 0x102c7e0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_102c7d0
+	brtrue L_102c7e0
 // --- basic block ---
-// 0x0102c85c: 0x102c85c: j	 0x102c8c0 addu  s5, zero, zero
+// 0x0102c86c: 0x102c86c: j	 0x102c8d0 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_102c8c0
+	br L_102c8d0
 // --- basic block ---
-L_102c864:
-// 0x0102c864: 0x102c864: j	 0x102c8a8 addiu s2, zero, 28
+L_102c874:
+// 0x0102c874: 0x102c874: j	 0x102c8b8 addiu s2, zero, 28
 	ldc.i4.s 28
 	stloc 10
-	br L_102c8a8
+	br L_102c8b8
 // --- basic block ---
-L_102c86c:
-// 0x0102c86c: 0x102c86c: mult  s1, s2
+L_102c87c:
+// 0x0102c87c: 0x102c87c: mult  s1, s2
 	ldloc 8
 	ldloc 10
 	mul
 	stloc 13
-// 0x0102c870: 0x102c870: lw    s5, 0(s0)
+// 0x0102c880: 0x102c880: lw    s5, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0102c874: 0x102c874: addiu s1, s1, 1
+// 0x0102c884: 0x102c884: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0102c878: 0x102c878: mflo  lo
+// 0x0102c888: 0x102c888: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0102c87c: 0x102c87c: addu  s5, s5, v0
+// 0x0102c88c: 0x102c88c: addu  s5, s5, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0102c880: 0x102c880: lw    v0, 16(s5)
+// 0x0102c890: 0x102c890: lw    v0, 16(s5)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4399,33 +4399,33 @@ L_102c86c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c884: 0x102c884: sll   zero, zero, 0
-// 0x0102c888: 0x102c888: lw    v0, 0(v0)
+// 0x0102c894: 0x102c894: sll   zero, zero, 0
+// 0x0102c898: 0x102c898: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102c88c: 0x102c88c: sll   zero, zero, 0
-// 0x0102c890: 0x102c890: beq   v0, zero, 0x102c8a8 addu  a0, v0, zero
+// 0x0102c89c: 0x102c89c: sll   zero, zero, 0
+// 0x0102c8a0: 0x102c8a0: beq   v0, zero, 0x102c8b8 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_102c8a8
+	brfalse L_102c8b8
 // --- basic block ---
-// 0x0102c898: 0x102c898: jal   0x1001b14 sll   zero, zero, 0
+// 0x0102c8a8: 0x102c8a8: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102c8a0: 0x102c8a0: beq   v0, zero, 0x102c8c0 sll   zero, zero, 0
+// 0x0102c8b0: 0x102c8b0: beq   v0, zero, 0x102c8d0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102c8c0
+	brfalse L_102c8d0
 // --- basic block ---
-L_102c8a8:
-// 0x0102c8a8: 0x102c8a8: lw    v0, 4(s0)
+L_102c8b8:
+// 0x0102c8b8: 0x102c8b8: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4434,28 +4434,28 @@ L_102c8a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102c8ac: 0x102c8ac: sll   zero, zero, 0
-// 0x0102c8b0: 0x102c8b0: slt   v0, s1, v0
+// 0x0102c8bc: 0x102c8bc: sll   zero, zero, 0
+// 0x0102c8c0: 0x102c8c0: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x0102c8b4: 0x102c8b4: bne   v0, zero, 0x102c86c addu  a1, s3, zero
+// 0x0102c8c4: 0x102c8c4: bne   v0, zero, 0x102c87c addu  a1, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brtrue L_102c86c
+	brtrue L_102c87c
 // --- basic block ---
-L_102c8bc:
-// 0x0102c8bc: 0x102c8bc: addu  s5, zero, zero
+L_102c8cc:
+// 0x0102c8cc: 0x102c8cc: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_102c8c0:
-// 0x0102c8c0: 0x102c8c0: lw    ra, 44(sp)
-// 0x0102c8c4: 0x102c8c4: addu  v0, s5, zero
+L_102c8d0:
+// 0x0102c8d0: 0x102c8d0: lw    ra, 44(sp)
+// 0x0102c8d4: 0x102c8d4: addu  v0, s5, zero
 	ldloc 7
 	stloc 5
-// 0x0102c8c8: 0x102c8c8: lw    s5, 40(sp)
+// 0x0102c8d8: 0x102c8d8: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4464,7 +4464,7 @@ L_102c8c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102c8cc: 0x102c8cc: lw    s4, 36(sp)
+// 0x0102c8dc: 0x102c8dc: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4473,7 +4473,7 @@ L_102c8c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102c8d0: 0x102c8d0: lw    s3, 32(sp)
+// 0x0102c8e0: 0x102c8e0: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4482,7 +4482,7 @@ L_102c8c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102c8d4: 0x102c8d4: lw    s2, 28(sp)
+// 0x0102c8e4: 0x102c8e4: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4491,7 +4491,7 @@ L_102c8c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102c8d8: 0x102c8d8: lw    s1, 24(sp)
+// 0x0102c8e8: 0x102c8e8: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4500,7 +4500,7 @@ L_102c8c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102c8dc: 0x102c8dc: lw    s0, 20(sp)
+// 0x0102c8ec: 0x102c8ec: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4509,7 +4509,7 @@ L_102c8c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102c8e0: 0x102c8e0: jr    ra addiu sp, sp, 48
+// 0x0102c8f0: 0x102c8f0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4521,7 +4521,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_menu_item_names_102c8e8(int32,int32,int32,int32,int32)
+.method public static int32 get_menu_item_names_102c8f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s6,int32 s4,int32 v1,int32 s2,int32 s3,int32 t0,int32 s0,int32 s5,int32 lo,int32 ra)
@@ -4583,12 +4583,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102c8e8: 0x102c8e8: addiu sp, sp, -48
+// 0x0102c8f8: 0x102c8f8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0102c8ec: 0x102c8ec: sw    s4, 32(sp)
+// 0x0102c8fc: 0x102c8fc: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4597,7 +4597,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102c8f0: 0x102c8f0: sw    s3, 28(sp)
+// 0x0102c900: 0x102c900: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4606,7 +4606,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102c8f4: 0x102c8f4: sw    s1, 20(sp)
+// 0x0102c904: 0x102c904: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4615,7 +4615,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102c8f8: 0x102c8f8: sw    s0, 16(sp)
+// 0x0102c908: 0x102c908: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4624,8 +4624,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102c8fc: 0x102c8fc: sw    ra, 44(sp)
-// 0x0102c900: 0x102c900: sw    s6, 40(sp)
+// 0x0102c90c: 0x102c90c: sw    ra, 44(sp)
+// 0x0102c910: 0x102c910: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4634,7 +4634,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102c904: 0x102c904: sw    s5, 36(sp)
+// 0x0102c914: 0x102c914: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4643,7 +4643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102c908: 0x102c908: sw    s2, 24(sp)
+// 0x0102c918: 0x102c918: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4652,97 +4652,97 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102c90c: 0x102c90c: addu  s0, a3, zero
+// 0x0102c91c: 0x102c91c: addu  s0, a3, zero
 	ldloc 4
 	stloc 14
-// 0x0102c910: 0x102c910: addu  s3, a0, zero
+// 0x0102c920: 0x102c920: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x0102c914: 0x102c914: addu  s1, a1, zero
+// 0x0102c924: 0x102c924: addu  s1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0102c918: 0x102c918: beq   a3, zero, 0x102c924 addu  s4, a2, zero
+// 0x0102c928: 0x102c928: beq   a3, zero, 0x102c934 addu  s4, a2, zero
 	ldloc 4
 	ldloc.3
 	stloc 9
-	brfalse L_102c924
+	brfalse L_102c934
 // --- basic block ---
-// 0x0102c920: 0x102c920: sw    zero, 0(a3)
+// 0x0102c930: 0x102c930: sw    zero, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_102c924:
-// 0x0102c924: 0x102c924: beq   s1, zero, 0x102ca50 addu  v0, zero, zero
+L_102c934:
+// 0x0102c934: 0x102c934: beq   s1, zero, 0x102ca60 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_102ca50
+	brfalse L_102ca60
 // --- basic block ---
-// 0x0102c92c: 0x102c92c: beq   s3, zero, 0x102c9e4 sll   zero, zero, 0
+// 0x0102c93c: 0x102c93c: beq   s3, zero, 0x102c9f4 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_102c9e4
+	brfalse L_102c9f4
 // --- basic block ---
-// 0x0102c934: 0x102c934: lb    v0, 0(s3)
+// 0x0102c944: 0x102c944: lb    v0, 0(s3)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0102c938: 0x102c938: sll   zero, zero, 0
-// 0x0102c93c: 0x102c93c: beq   v0, zero, 0x102c9e4 addu  s2, zero, zero
+// 0x0102c948: 0x102c948: sll   zero, zero, 0
+// 0x0102c94c: 0x102c94c: beq   v0, zero, 0x102c9f4 addu  s2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 11
-	brfalse L_102c9e4
+	brfalse L_102c9f4
 // --- basic block ---
-// 0x0102c944: 0x102c944: j	 0x102c9c8 addiu s5, zero, 28
+// 0x0102c954: 0x102c954: j	 0x102c9d8 addiu s5, zero, 28
 	ldc.i4.s 28
 	stloc 15
-	br L_102c9c8
+	br L_102c9d8
 // --- basic block ---
-L_102c94c:
-// 0x0102c94c: 0x102c94c: mult  s2, s5
+L_102c95c:
+// 0x0102c95c: 0x102c95c: mult  s2, s5
 	ldloc 11
 	ldloc 15
 	mul
 	stloc 16
-// 0x0102c950: 0x102c950: lw    s6, 0(s1)
+// 0x0102c960: 0x102c960: lw    s6, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0102c954: 0x102c954: mflo  lo
+// 0x0102c964: 0x102c964: mflo  lo
 	ldloc 16
 	stloc 6
-// 0x0102c958: 0x102c958: addu  s6, s6, v0
+// 0x0102c968: 0x102c968: addu  s6, s6, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x0102c95c: 0x102c95c: lbu   v0, 8(s6)
+// 0x0102c96c: 0x102c96c: lbu   v0, 8(s6)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x0102c960: 0x102c960: sll   zero, zero, 0
-// 0x0102c964: 0x102c964: andi  v0, v0, 1
+// 0x0102c970: 0x102c970: sll   zero, zero, 0
+// 0x0102c974: 0x102c974: andi  v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	and
 	stloc 6
-// 0x0102c968: 0x102c968: beq   v0, zero, 0x102c9c8 addiu s2, s2, 1
+// 0x0102c978: 0x102c978: beq   v0, zero, 0x102c9d8 addiu s2, s2, 1
 	ldloc 6
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brfalse L_102c9c8
+	brfalse L_102c9d8
 // --- basic block ---
-// 0x0102c970: 0x102c970: lw    v0, 16(s6)
+// 0x0102c980: 0x102c980: lw    v0, 16(s6)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4751,29 +4751,29 @@ L_102c94c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102c974: 0x102c974: sll   zero, zero, 0
-// 0x0102c978: 0x102c978: beq   v0, zero, 0x102c9ac sll   zero, zero, 0
+// 0x0102c984: 0x102c984: sll   zero, zero, 0
+// 0x0102c988: 0x102c988: beq   v0, zero, 0x102c9bc sll   zero, zero, 0
 	ldloc 6
-	brfalse L_102c9ac
+	brfalse L_102c9bc
 // --- basic block ---
-// 0x0102c980: 0x102c980: lw    a1, 0(v0)
+// 0x0102c990: 0x102c990: lw    a1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0102c984: 0x102c984: jal   0x1001b14 sll   zero, zero, 0
+// 0x0102c994: 0x102c994: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0102c98c: 0x102c98c: bne   v0, zero, 0x102c9ac sll   zero, zero, 0
+// 0x0102c99c: 0x102c99c: bne   v0, zero, 0x102c9bc sll   zero, zero, 0
 	ldloc 6
-	brtrue L_102c9ac
+	brtrue L_102c9bc
 // --- basic block ---
-// 0x0102c994: 0x102c994: lw    s1, 24(s6)
+// 0x0102c9a4: 0x102c9a4: lw    s1, 24(s6)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4782,18 +4782,18 @@ L_102c94c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102c998: 0x102c998: sll   zero, zero, 0
-// 0x0102c99c: 0x102c99c: bne   s1, zero, 0x102c9e4 sll   zero, zero, 0
+// 0x0102c9a8: 0x102c9a8: sll   zero, zero, 0
+// 0x0102c9ac: 0x102c9ac: bne   s1, zero, 0x102c9f4 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_102c9e4
+	brtrue L_102c9f4
 // --- basic block ---
-// 0x0102c9a4: 0x102c9a4: j	 0x102ca50 addu  v0, zero, zero
+// 0x0102c9b4: 0x102c9b4: j	 0x102ca60 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_102ca50
+	br L_102ca60
 // --- basic block ---
-L_102c9ac:
-// 0x0102c9ac: 0x102c9ac: lw    a1, 24(s6)
+L_102c9bc:
+// 0x0102c9bc: 0x102c9bc: lw    a1, 24(s6)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4802,13 +4802,13 @@ L_102c9ac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102c9b0: 0x102c9b0: addu  a0, s3, zero
+// 0x0102c9c0: 0x102c9c0: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x0102c9b4: 0x102c9b4: addu  a2, s4, zero
+// 0x0102c9c4: 0x102c9c4: addu  a2, s4, zero
 	ldloc 9
 	stloc.3
-// 0x0102c9b8: 0x102c9b8: jal   0x102c8e8 addu  a3, s0, zero
+// 0x0102c9c8: 0x102c9c8: jal   0x102c8f8 addu  a3, s0, zero
 	ldloc 14
 	stloc 4
 	ldloc.0
@@ -4816,19 +4816,19 @@ L_102c9ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::get_menu_item_names_102c8e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::get_menu_item_names_102c8f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0102c9c0: 0x102c9c0: bne   v0, zero, 0x102ca50 addiu v0, zero, 1
+// 0x0102c9d0: 0x102c9d0: bne   v0, zero, 0x102ca60 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_102ca50
+	brtrue L_102ca60
 // --- basic block ---
-L_102c9c8:
-// 0x0102c9c8: 0x102c9c8: lw    v0, 4(s1)
+L_102c9d8:
+// 0x0102c9d8: 0x102c9d8: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4837,25 +4837,25 @@ L_102c9c8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102c9cc: 0x102c9cc: sll   zero, zero, 0
-// 0x0102c9d0: 0x102c9d0: slt   v0, s2, v0
+// 0x0102c9dc: 0x102c9dc: sll   zero, zero, 0
+// 0x0102c9e0: 0x102c9e0: slt   v0, s2, v0
 	ldloc 11
 	ldloc 6
 	clt
 	stloc 6
-// 0x0102c9d4: 0x102c9d4: bne   v0, zero, 0x102c94c addu  a0, s3, zero
+// 0x0102c9e4: 0x102c9e4: bne   v0, zero, 0x102c95c addu  a0, s3, zero
 	ldloc 6
 	ldloc 12
 	stloc.1
-	brtrue L_102c94c
+	brtrue L_102c95c
 // --- basic block ---
-// 0x0102c9dc: 0x102c9dc: j	 0x102ca50 addu  v0, zero, zero
+// 0x0102c9ec: 0x102c9ec: j	 0x102ca60 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_102ca50
+	br L_102ca60
 // --- basic block ---
-L_102c9e4:
-// 0x0102c9e4: 0x102c9e4: lw    a1, 4(s1)
+L_102c9f4:
+// 0x0102c9f4: 0x102c9f4: lw    a1, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4864,45 +4864,45 @@ L_102c9e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102c9e8: 0x102c9e8: addu  v1, zero, zero
+// 0x0102c9f8: 0x102c9f8: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0102c9ec: 0x102c9ec: addu  v0, zero, zero
+// 0x0102c9fc: 0x102c9fc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0102c9f0: 0x102c9f0: j	 0x102ca28 addiu a0, zero, 28
+// 0x0102ca00: 0x102ca00: j	 0x102ca38 addiu a0, zero, 28
 	ldc.i4.s 28
 	stloc.1
-	br L_102ca28
+	br L_102ca38
 // --- basic block ---
-L_102c9f8:
-// 0x0102c9f8: 0x102c9f8: mult  v0, a0
+L_102ca08:
+// 0x0102ca08: 0x102ca08: mult  v0, a0
 	ldloc 6
 	ldloc.1
 	mul
 	stloc 16
-// 0x0102c9fc: 0x102c9fc: lw    a3, 0(s1)
+// 0x0102ca0c: 0x102ca0c: lw    a3, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0102ca00: 0x102ca00: mflo  lo
+// 0x0102ca10: 0x102ca10: mflo  lo
 	ldloc 16
 	stloc 13
-// 0x0102ca04: 0x102ca04: addu  a3, a3, t0
+// 0x0102ca14: 0x102ca14: addu  a3, a3, t0
 	ldloc 4
 	ldloc 13
 	add
 	stloc 4
-// 0x0102ca08: 0x102ca08: lbu   t0, 8(a3)
+// 0x0102ca18: 0x102ca18: lbu   t0, 8(a3)
 	ldloc 4
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 13
-// 0x0102ca0c: 0x102ca0c: lw    a3, 16(a3)
+// 0x0102ca1c: 0x102ca1c: lw    a3, 16(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -4911,68 +4911,68 @@ L_102c9f8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102ca10: 0x102ca10: andi  t0, t0, 2
+// 0x0102ca20: 0x102ca20: andi  t0, t0, 2
 	ldloc 13
 	ldc.i4.2
 	and
 	stloc 13
-// 0x0102ca14: 0x102ca14: bne   t0, zero, 0x102ca28 addiu v0, v0, 1
+// 0x0102ca24: 0x102ca24: bne   t0, zero, 0x102ca38 addiu v0, v0, 1
 	ldloc 13
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_102ca28
+	brtrue L_102ca38
 // --- basic block ---
-// 0x0102ca1c: 0x102ca1c: lw    a3, 0(a3)
+// 0x0102ca2c: 0x102ca2c: lw    a3, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0102ca20: 0x102ca20: addiu v1, v1, 1
+// 0x0102ca30: 0x102ca30: addiu v1, v1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0102ca24: 0x102ca24: sw    a3, 0(a2)
+// 0x0102ca34: 0x102ca34: sw    a3, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-L_102ca28:
-// 0x0102ca28: 0x102ca28: sll   a2, v1, 2
+L_102ca38:
+// 0x0102ca38: 0x102ca38: sll   a2, v1, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x0102ca2c: 0x102ca2c: slt   a3, v0, a1
+// 0x0102ca3c: 0x102ca3c: slt   a3, v0, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc 4
-// 0x0102ca30: 0x102ca30: bne   a3, zero, 0x102c9f8 addu  a2, s4, a2
+// 0x0102ca40: 0x102ca40: bne   a3, zero, 0x102ca08 addu  a2, s4, a2
 	ldloc 4
 	ldloc 9
 	ldloc.3
 	add
 	stloc.3
-	brtrue L_102c9f8
+	brtrue L_102ca08
 // --- basic block ---
-// 0x0102ca38: 0x102ca38: sll   v0, v0, 2
+// 0x0102ca48: 0x102ca48: sll   v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0102ca3c: 0x102ca3c: addu  s4, s4, v0
+// 0x0102ca4c: 0x102ca4c: addu  s4, s4, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x0102ca40: 0x102ca40: beq   s0, zero, 0x102ca4c sw    zero, 0(s4)
+// 0x0102ca50: 0x102ca50: beq   s0, zero, 0x102ca5c sw    zero, 0(s4)
 	ldloc 14
 	ldloc 5
 	ldloc 9
@@ -4980,22 +4980,22 @@ L_102ca28:
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_102ca4c
+	brfalse L_102ca5c
 // --- basic block ---
-// 0x0102ca48: 0x102ca48: sw    v1, 0(s0)
+// 0x0102ca58: 0x102ca58: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-L_102ca4c:
-// 0x0102ca4c: 0x102ca4c: addiu v0, zero, 1
+L_102ca5c:
+// 0x0102ca5c: 0x102ca5c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_102ca50:
-// 0x0102ca50: 0x102ca50: lw    ra, 44(sp)
-// 0x0102ca54: 0x102ca54: lw    s6, 40(sp)
+L_102ca60:
+// 0x0102ca60: 0x102ca60: lw    ra, 44(sp)
+// 0x0102ca64: 0x102ca64: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5004,7 +5004,7 @@ L_102ca50:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102ca58: 0x102ca58: lw    s5, 36(sp)
+// 0x0102ca68: 0x102ca68: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5013,7 +5013,7 @@ L_102ca50:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0102ca5c: 0x102ca5c: lw    s4, 32(sp)
+// 0x0102ca6c: 0x102ca6c: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5022,7 +5022,7 @@ L_102ca50:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102ca60: 0x102ca60: lw    s3, 28(sp)
+// 0x0102ca70: 0x102ca70: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5031,7 +5031,7 @@ L_102ca50:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102ca64: 0x102ca64: lw    s2, 24(sp)
+// 0x0102ca74: 0x102ca74: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5040,7 +5040,7 @@ L_102ca50:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102ca68: 0x102ca68: lw    s1, 20(sp)
+// 0x0102ca78: 0x102ca78: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5049,7 +5049,7 @@ L_102ca50:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102ca6c: 0x102ca6c: lw    s0, 16(sp)
+// 0x0102ca7c: 0x102ca7c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5058,7 +5058,7 @@ L_102ca50:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0102ca70: 0x102ca70: jr    ra addiu sp, sp, 48
+// 0x0102ca80: 0x102ca80: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5070,7 +5070,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 about_callbak_102ca78(int32,int32,int32,int32,int32)
+.method public static int32 about_callbak_102ca88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5105,10 +5105,10 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102ca78: 0x102ca78: lui   a1, 0x20000
+// 0x0102ca88: 0x102ca88: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0102ca7c: 0x102ca7c: lw    a0, 16(a0)
+// 0x0102ca8c: 0x102ca8c: lw    a0, 16(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -5117,15 +5117,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102ca80: 0x102ca80: addiu sp, sp, -24
+// 0x0102ca90: 0x102ca90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102ca84: 0x102ca84: sw    ra, 20(sp)
-// 0x0102ca88: 0x102ca88: jal   0x1001b14 addiu a1, a1, -23916
+// 0x0102ca94: 0x102ca94: sw    ra, 20(sp)
+// 0x0102ca98: 0x102ca98: jal   0x1001b14 addiu a1, a1, -23452
 	ldloc.2
-	ldc.i4 -23916
+	ldc.i4 -23452
 	add
 	stloc.2
 	ldloc.1
@@ -5133,18 +5133,18 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102ca90: 0x102ca90: beq   v0, zero, 0x102caac lui   a0, 0x10000
+// 0x0102caa0: 0x102caa0: beq   v0, zero, 0x102cabc lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_102caac
+	brfalse L_102cabc
 // --- basic block ---
-// 0x0102ca98: 0x102ca98: addiu a0, a0, -25336
+// 0x0102caa8: 0x102caa8: addiu a0, a0, -25336
 	ldloc.1
 	ldc.i4 -25336
 	add
 	stloc.1
-// 0x0102ca9c: 0x102ca9c: jal   0x1094884 addiu a1, zero, 1
+// 0x0102caac: 0x102caac: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5152,32 +5152,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102caa4: 0x102caa4: j	 0x102cab4 sll   zero, zero, 0
-	br L_102cab4
+// 0x0102cab4: 0x102cab4: j	 0x102cac4 sll   zero, zero, 0
+	br L_102cac4
 // --- basic block ---
-L_102caac:
-// 0x0102caac: 0x102caac: jal   0x1050b24 sll   zero, zero, 0
+L_102cabc:
+// 0x0102cabc: 0x102cabc: jal   0x1050b34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102cab4:
-// 0x0102cab4: 0x102cab4: lw    ra, 20(sp)
-// 0x0102cab8: 0x102cab8: addu  v0, zero, zero
+L_102cac4:
+// 0x0102cac4: 0x102cac4: lw    ra, 20(sp)
+// 0x0102cac8: 0x102cac8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0102cabc: 0x102cabc: jr    ra addiu sp, sp, 24
+// 0x0102cacc: 0x102cacc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5189,7 +5189,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 network_status_callbak_102cac4(int32,int32,int32,int32,int32)
+.method public static int32 network_status_callbak_102cad4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -5224,21 +5224,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102cac4: 0x102cac4: lui   a0, 0x10000
+// 0x0102cad4: 0x102cad4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102cac8: 0x102cac8: addiu sp, sp, -24
+// 0x0102cad8: 0x102cad8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cacc: 0x102cacc: addiu a0, a0, -25276
+// 0x0102cadc: 0x102cadc: addiu a0, a0, -25276
 	ldloc.1
 	ldc.i4 -25276
 	add
 	stloc.1
-// 0x0102cad0: 0x102cad0: sw    ra, 20(sp)
-// 0x0102cad4: 0x102cad4: jal   0x1094884 addiu a1, zero, 1
+// 0x0102cae0: 0x102cae0: sw    ra, 20(sp)
+// 0x0102cae4: 0x102cae4: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5246,16 +5246,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0102cadc: 0x102cadc: lw    ra, 20(sp)
-// 0x0102cae0: 0x102cae0: addu  v0, zero, zero
+// 0x0102caec: 0x102caec: lw    ra, 20(sp)
+// 0x0102caf0: 0x102caf0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0102cae4: 0x102cae4: jr    ra addiu sp, sp, 24
+// 0x0102caf4: 0x102caf4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5267,7 +5267,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_start_delete_waypoint_102caec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_delete_waypoint_102cafc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5302,14 +5302,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102caec:
-// 0x0102caec: 0x102caec: addiu sp, sp, -24
+L_102cafc:
+// 0x0102cafc: 0x102cafc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102caf0: 0x102caf0: sw    ra, 20(sp)
-// 0x0102caf4: 0x102caf4: jal   0x101f044 addu  a0, zero, zero
+// 0x0102cb00: 0x102cb00: sw    ra, 20(sp)
+// 0x0102cb04: 0x102cb04: jal   0x101f054 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5317,14 +5317,14 @@ L_102caec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102cafc: 0x102cafc: lw    ra, 20(sp)
-// 0x0102cb00: 0x102cb00: sll   zero, zero, 0
-// 0x0102cb04: 0x102cb04: jr    ra addiu sp, sp, 24
+// 0x0102cb0c: 0x102cb0c: lw    ra, 20(sp)
+// 0x0102cb10: 0x102cb10: sll   zero, zero, 0
+// 0x0102cb14: 0x102cb14: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5336,7 +5336,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_set_waypoint_102cb0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_set_waypoint_102cb1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5371,17 +5371,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cb0c:
-// 0x0102cb0c: 0x102cb0c: lui   a0, 0x10000
+L_102cb1c:
+// 0x0102cb1c: 0x102cb1c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102cb10: 0x102cb10: addiu sp, sp, -24
+// 0x0102cb20: 0x102cb20: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cb14: 0x102cb14: sw    ra, 20(sp)
-// 0x0102cb18: 0x102cb18: jal   0x10194f0 addiu a0, a0, -30992
+// 0x0102cb24: 0x102cb24: sw    ra, 20(sp)
+// 0x0102cb28: 0x102cb28: jal   0x1019500 addiu a0, a0, -30992
 	ldloc.1
 	ldc.i4 -30992
 	add
@@ -5391,16 +5391,16 @@ L_102cb0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_get_id_10194f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_get_id_1019500(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cb20: 0x102cb20: beq   v0, zero, 0x102cb38 sll   zero, zero, 0
+// 0x0102cb30: 0x102cb30: beq   v0, zero, 0x102cb48 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102cb38
+	brfalse L_102cb48
 // --- basic block ---
-// 0x0102cb28: 0x102cb28: jal   0x101f704 addu  a0, v0, zero
+// 0x0102cb38: 0x102cb38: jal   0x101f714 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5408,26 +5408,26 @@ L_102cb0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_selection_as_101f704(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_selection_as_101f714(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cb30: 0x102cb30: jal   0x102146c sll   zero, zero, 0
+// 0x0102cb40: 0x102cb40: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102cb38:
-// 0x0102cb38: 0x102cb38: lw    ra, 20(sp)
-// 0x0102cb3c: 0x102cb3c: sll   zero, zero, 0
-// 0x0102cb40: 0x102cb40: jr    ra addiu sp, sp, 24
+L_102cb48:
+// 0x0102cb48: 0x102cb48: lw    ra, 20(sp)
+// 0x0102cb4c: 0x102cb4c: sll   zero, zero, 0
+// 0x0102cb50: 0x102cb50: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5439,7 +5439,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_set_departure_102cb48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_set_departure_102cb58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5474,17 +5474,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cb48:
-// 0x0102cb48: 0x102cb48: lui   a0, 0x10000
+L_102cb58:
+// 0x0102cb58: 0x102cb58: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102cb4c: 0x102cb4c: addiu sp, sp, -24
+// 0x0102cb5c: 0x102cb5c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cb50: 0x102cb50: sw    ra, 20(sp)
-// 0x0102cb54: 0x102cb54: jal   0x101f704 addiu a0, a0, -29760
+// 0x0102cb60: 0x102cb60: sw    ra, 20(sp)
+// 0x0102cb64: 0x102cb64: jal   0x101f714 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -5494,12 +5494,12 @@ L_102cb48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_selection_as_101f704(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_selection_as_101f714(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cb5c: 0x102cb5c: jal   0x1094b64 addu  a0, zero, zero
+// 0x0102cb6c: 0x102cb6c: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5507,25 +5507,25 @@ L_102cb48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cb64: 0x102cb64: jal   0x102146c sll   zero, zero, 0
+// 0x0102cb74: 0x102cb74: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cb6c: 0x102cb6c: lw    ra, 20(sp)
-// 0x0102cb70: 0x102cb70: sll   zero, zero, 0
-// 0x0102cb74: 0x102cb74: jr    ra addiu sp, sp, 24
+// 0x0102cb7c: 0x102cb7c: lw    ra, 20(sp)
+// 0x0102cb80: 0x102cb80: sll   zero, zero, 0
+// 0x0102cb84: 0x102cb84: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5537,7 +5537,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_navigate_102cb7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_navigate_102cb8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5572,27 +5572,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cb7c:
-// 0x0102cb7c: 0x102cb7c: addiu sp, sp, -24
+L_102cb8c:
+// 0x0102cb8c: 0x102cb8c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cb80: 0x102cb80: sw    ra, 20(sp)
-// 0x0102cb84: 0x102cb84: jal   0x105c348 sll   zero, zero, 0
+// 0x0102cb90: 0x102cb90: sw    ra, 20(sp)
+// 0x0102cb94: 0x102cb94: jal   0x105c358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_calc_route_105c348(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_calc_route_105c358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102cb8c: 0x102cb8c: lw    ra, 20(sp)
-// 0x0102cb90: 0x102cb90: sll   zero, zero, 0
-// 0x0102cb94: 0x102cb94: jr    ra addiu sp, sp, 24
+// 0x0102cb9c: 0x102cb9c: lw    ra, 20(sp)
+// 0x0102cba0: 0x102cba0: sll   zero, zero, 0
+// 0x0102cba4: 0x102cba4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5604,7 +5604,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 save_destination_to_history_102cb9c(int32,int32,int32,int32,int32)
+.method public static int32 save_destination_to_history_102cbac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
@@ -5651,20 +5651,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102cb9c: 0x102cb9c: lui   a0, 0x10000
+// 0x0102cbac: 0x102cbac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102cba0: 0x102cba0: addiu sp, sp, -720
+// 0x0102cbb0: 0x102cbb0: addiu sp, sp, -720
 	ldloc.0
 	ldc.i4 -720
 	add
 	stloc.0
-// 0x0102cba4: 0x102cba4: addiu a0, a0, -29748
+// 0x0102cbb4: 0x102cbb4: addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
 	stloc.1
-// 0x0102cba8: 0x102cba8: sw    s0, 700(sp)
+// 0x0102cbb8: 0x102cbb8: sw    s0, 700(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5673,8 +5673,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102cbac: 0x102cbac: sw    ra, 716(sp)
-// 0x0102cbb0: 0x102cbb0: sw    s3, 712(sp)
+// 0x0102cbbc: 0x102cbbc: sw    ra, 716(sp)
+// 0x0102cbc0: 0x102cbc0: sw    s3, 712(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5683,7 +5683,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102cbb4: 0x102cbb4: sw    s2, 708(sp)
+// 0x0102cbc4: 0x102cbc4: sw    s2, 708(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5692,7 +5692,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102cbb8: 0x102cbb8: jal   0x101df50 sw    s1, 704(sp)
+// 0x0102cbc8: 0x102cbc8: jal   0x101df60 sw    s1, 704(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5706,29 +5706,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cbc0: 0x102cbc0: beq   v0, zero, 0x102ccd4 addu  s0, v0, zero
+// 0x0102cbd0: 0x102cbd0: beq   v0, zero, 0x102cce4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_102ccd4
+	brfalse L_102cce4
 // --- basic block ---
-// 0x0102cbc8: 0x102cbc8: addiu a2, sp, 172
+// 0x0102cbd8: 0x102cbd8: addiu a2, sp, 172
 	ldloc.0
 	ldc.i4 172
 	add
 	stloc.3
-// 0x0102cbcc: 0x102cbcc: addu  a0, a2, zero
+// 0x0102cbdc: 0x102cbdc: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0102cbd0: 0x102cbd0: addiu a1, zero, 128
+// 0x0102cbe0: 0x102cbe0: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0102cbd4: 0x102cbd4: jal   0x1010058 sw    a2, 692(sp)
+// 0x0102cbe4: 0x102cbe4: jal   0x1010068 sw    a2, 692(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5741,18 +5741,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cbdc: 0x102cbdc: addu  a0, s0, zero
+// 0x0102cbec: 0x102cbec: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102cbe0: 0x102cbe0: addiu a1, zero, 20
+// 0x0102cbf0: 0x102cbf0: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0102cbe4: 0x102cbe4: jal   0x10086bc sw    v0, 688(sp)
+// 0x0102cbf4: 0x102cbf4: jal   0x10086cc sw    v0, 688(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5766,12 +5766,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cbec: 0x102cbec: lw    v0, 688(sp)
+// 0x0102cbfc: 0x102cbfc: lw    v0, 688(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5780,7 +5780,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102cbf0: 0x102cbf0: lw    a2, 692(sp)
+// 0x0102cc00: 0x102cc00: lw    a2, 692(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5789,24 +5789,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102cbf4: 0x102cbf4: addu  a3, v0, zero
+// 0x0102cc04: 0x102cc04: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0102cbf8: 0x102cbf8: addiu s1, sp, 76
+// 0x0102cc08: 0x102cc08: addiu s1, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 8
-// 0x0102cbfc: 0x102cbfc: addiu v0, zero, 1
+// 0x0102cc0c: 0x102cc0c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102cc00: 0x102cc00: addu  a0, s0, zero
+// 0x0102cc10: 0x102cc10: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102cc04: 0x102cc04: addu  a1, zero, zero
+// 0x0102cc14: 0x102cc14: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102cc08: 0x102cc08: sw    v0, 24(sp)
+// 0x0102cc18: 0x102cc18: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5815,7 +5815,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102cc0c: 0x102cc0c: sw    v0, 16(sp)
+// 0x0102cc1c: 0x102cc1c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5824,7 +5824,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102cc10: 0x102cc10: jal   0x1013028 sw    s1, 20(sp)
+// 0x0102cc20: 0x102cc20: jal   0x1013038 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5838,22 +5838,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc18: 0x102cc18: blez  v0, 0x102ccd4 addu  a2, zero, zero
+// 0x0102cc28: 0x102cc28: blez  v0, 0x102cce4 addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
 	ldc.i4.s 0
-	ble L_102ccd4
+	ble L_102cce4
 // --- basic block ---
-// 0x0102cc20: 0x102cc20: addu  a0, s1, zero
+// 0x0102cc30: 0x102cc30: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102cc24: 0x102cc24: jal   0x1015174 addiu a1, sp, 48
+// 0x0102cc34: 0x102cc34: jal   0x1015184 addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5863,15 +5863,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc2c: 0x102cc2c: addiu a1, zero, 8
+// 0x0102cc3c: 0x102cc3c: addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
-// 0x0102cc30: 0x102cc30: jal   0x1037918 addiu a0, zero, 65
+// 0x0102cc40: 0x102cc40: jal   0x1037928 addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
 	ldloc.0
@@ -5879,12 +5879,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc38: 0x102cc38: lw    a0, 48(sp)
+// 0x0102cc48: 0x102cc48: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5893,7 +5893,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102cc3c: 0x102cc3c: jal   0x1001ba8 lui   s1, 0x60000
+// 0x0102cc4c: 0x102cc4c: jal   0x1001ba8 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
 	ldloc.0
@@ -5906,7 +5906,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc44: 0x102cc44: lw    a0, 52(sp)
+// 0x0102cc54: 0x102cc54: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5915,18 +5915,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102cc48: 0x102cc48: sw    v0, -24384(s1)
+// 0x0102cc58: 0x102cc58: sw    v0, -23920(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6096
+	ldc.i4 -5980
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102cc4c: 0x102cc4c: jal   0x1001ba8 addiu s1, s1, -24384
+// 0x0102cc5c: 0x102cc5c: jal   0x1001ba8 addiu s1, s1, -23920
 	ldloc 8
-	ldc.i4 -24384
+	ldc.i4 -23920
 	add
 	stloc 8
 	ldloc.0
@@ -5939,7 +5939,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc54: 0x102cc54: lw    a0, 60(sp)
+// 0x0102cc64: 0x102cc64: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5948,7 +5948,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102cc58: 0x102cc58: jal   0x1001ba8 sw    v0, 4(s1)
+// 0x0102cc68: 0x102cc68: jal   0x1001ba8 sw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5967,20 +5967,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc60: 0x102cc60: lui   v1, 0x10000
+// 0x0102cc70: 0x102cc70: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0102cc64: 0x102cc64: addiu v1, v1, 18500
+// 0x0102cc74: 0x102cc74: addiu v1, v1, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-// 0x0102cc68: 0x102cc68: addiu s2, sp, 32
+// 0x0102cc78: 0x102cc78: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x0102cc6c: 0x102cc6c: lw    a2, 4(s0)
+// 0x0102cc7c: 0x102cc7c: lw    a2, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5989,10 +5989,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102cc70: 0x102cc70: lui   s3, 0x20000
-	ldc.i4 131072
+// 0x0102cc80: 0x102cc80: lui   s3, 0x10000
+	ldc.i4 65536
 	stloc 11
-// 0x0102cc74: 0x102cc74: sw    v1, 16(s1)
+// 0x0102cc84: 0x102cc84: sw    v1, 16(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6001,7 +6001,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102cc78: 0x102cc78: sw    v1, 12(s1)
+// 0x0102cc88: 0x102cc88: sw    v1, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6010,15 +6010,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102cc7c: 0x102cc7c: addiu a1, s3, -13884
+// 0x0102cc8c: 0x102cc8c: addiu a1, s3, 19088
 	ldloc 11
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0102cc80: 0x102cc80: addu  a0, s2, zero
+// 0x0102cc90: 0x102cc90: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0102cc84: 0x102cc84: jal   0x1000f64 sw    v0, 8(s1)
+// 0x0102cc94: 0x102cc94: jal   0x1000f64 sw    v0, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6037,7 +6037,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc8c: 0x102cc8c: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0102cc9c: 0x102cc9c: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6050,22 +6050,22 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cc94: 0x102cc94: lw    a2, 0(s0)
+// 0x0102cca4: 0x102cca4: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0102cc98: 0x102cc98: addiu a1, s3, -13884
+// 0x0102cca8: 0x102cca8: addiu a1, s3, 19088
 	ldloc 11
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0102cc9c: 0x102cc9c: addu  a0, s2, zero
+// 0x0102ccac: 0x102ccac: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0102cca0: 0x102cca0: jal   0x1000f64 sw    v0, 20(s1)
+// 0x0102ccb0: 0x102ccb0: jal   0x1000f64 sw    v0, 20(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6084,7 +6084,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cca8: 0x102cca8: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0102ccb8: 0x102ccb8: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6097,7 +6097,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ccb0: 0x102ccb0: sw    v0, 24(s1)
+// 0x0102ccc0: 0x102ccc0: sw    v0, 24(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6106,21 +6106,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ccb4: 0x102ccb4: lui   v0, 0x10000
+// 0x0102ccc4: 0x102ccc4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0102ccb8: 0x102ccb8: addiu v0, v0, -25260
+// 0x0102ccc8: 0x102ccc8: addiu v0, v0, -25260
 	ldloc 5
 	ldc.i4 -25260
 	add
 	stloc 5
-// 0x0102ccbc: 0x102ccbc: addu  a1, s1, zero
+// 0x0102cccc: 0x102cccc: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102ccc0: 0x102ccc0: addiu a0, zero, 65
+// 0x0102ccd0: 0x102ccd0: addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
-// 0x0102ccc4: 0x102ccc4: jal   0x103822c sw    v0, 28(s1)
+// 0x0102ccd4: 0x102ccd4: jal   0x103823c sw    v0, 28(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6134,25 +6134,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cccc: 0x102cccc: jal   0x103788c sll   zero, zero, 0
+// 0x0102ccdc: 0x102ccdc: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102ccd4:
-// 0x0102ccd4: 0x102ccd4: lw    ra, 716(sp)
-// 0x0102ccd8: 0x102ccd8: lw    s3, 712(sp)
+L_102cce4:
+// 0x0102cce4: 0x102cce4: lw    ra, 716(sp)
+// 0x0102cce8: 0x102cce8: lw    s3, 712(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6161,7 +6161,7 @@ L_102ccd4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102ccdc: 0x102ccdc: lw    s2, 708(sp)
+// 0x0102ccec: 0x102ccec: lw    s2, 708(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6170,7 +6170,7 @@ L_102ccd4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102cce0: 0x102cce0: lw    s1, 704(sp)
+// 0x0102ccf0: 0x102ccf0: lw    s1, 704(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6179,7 +6179,7 @@ L_102ccd4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102cce4: 0x102cce4: lw    s0, 700(sp)
+// 0x0102ccf4: 0x102ccf4: lw    s0, 700(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6188,7 +6188,7 @@ L_102ccd4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102cce8: 0x102cce8: jr    ra addiu sp, sp, 720
+// 0x0102ccf8: 0x102ccf8: jr    ra addiu sp, sp, 720
 	ldloc.0
 	ldc.i4 720
 	add
@@ -6200,7 +6200,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_set_destination_102ccf0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_set_destination_102cd00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6235,17 +6235,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102ccf0:
-// 0x0102ccf0: 0x102ccf0: lui   a0, 0x10000
+L_102cd00:
+// 0x0102cd00: 0x102cd00: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102ccf4: 0x102ccf4: addiu sp, sp, -24
+// 0x0102cd04: 0x102cd04: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102ccf8: 0x102ccf8: sw    ra, 20(sp)
-// 0x0102ccfc: 0x102ccfc: jal   0x101f704 addiu a0, a0, -29748
+// 0x0102cd08: 0x102cd08: sw    ra, 20(sp)
+// 0x0102cd0c: 0x102cd0c: jal   0x101f714 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -6255,12 +6255,12 @@ L_102ccf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_selection_as_101f704(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_selection_as_101f714(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cd04: 0x102cd04: jal   0x1094b64 addu  a0, zero, zero
+// 0x0102cd14: 0x102cd14: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6268,47 +6268,47 @@ L_102ccf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cd0c: 0x102cd0c: jal   0x102146c sll   zero, zero, 0
+// 0x0102cd1c: 0x102cd1c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cd14: 0x102cd14: jal   0x105c960 sll   zero, zero, 0
+// 0x0102cd24: 0x102cd24: jal   0x105c970 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_main_route_105c960(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_main_route_105c970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cd1c: 0x102cd1c: jal   0x102cb9c sll   zero, zero, 0
+// 0x0102cd2c: 0x102cd2c: jal   0x102cbac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::save_destination_to_history_102cb9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::save_destination_to_history_102cbac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102cd24: 0x102cd24: lw    ra, 20(sp)
-// 0x0102cd28: 0x102cd28: sll   zero, zero, 0
-// 0x0102cd2c: 0x102cd2c: jr    ra addiu sp, sp, 24
+// 0x0102cd34: 0x102cd34: lw    ra, 20(sp)
+// 0x0102cd38: 0x102cd38: sll   zero, zero, 0
+// 0x0102cd3c: 0x102cd3c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6320,7 +6320,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_trip_reverse_102cd34(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_trip_reverse_102cd44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6355,27 +6355,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cd34:
-// 0x0102cd34: 0x102cd34: addiu sp, sp, -24
+L_102cd44:
+// 0x0102cd44: 0x102cd44: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cd38: 0x102cd38: sw    ra, 20(sp)
-// 0x0102cd3c: 0x102cd3c: jal   0x101ee38 sll   zero, zero, 0
+// 0x0102cd48: 0x102cd48: sw    ra, 20(sp)
+// 0x0102cd4c: 0x102cd4c: jal   0x101ee48 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_reverse_101ee38(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_reverse_101ee48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102cd44: 0x102cd44: lw    ra, 20(sp)
-// 0x0102cd48: 0x102cd48: sll   zero, zero, 0
-// 0x0102cd4c: 0x102cd4c: jr    ra addiu sp, sp, 24
+// 0x0102cd54: 0x102cd54: lw    ra, 20(sp)
+// 0x0102cd58: 0x102cd58: sll   zero, zero, 0
+// 0x0102cd5c: 0x102cd5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6387,7 +6387,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_trip_resume_102cd54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_trip_resume_102cd64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6422,27 +6422,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cd54:
-// 0x0102cd54: 0x102cd54: addiu sp, sp, -24
+L_102cd64:
+// 0x0102cd64: 0x102cd64: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cd58: 0x102cd58: sw    ra, 20(sp)
-// 0x0102cd5c: 0x102cd5c: jal   0x101ee98 sll   zero, zero, 0
+// 0x0102cd68: 0x102cd68: sw    ra, 20(sp)
+// 0x0102cd6c: 0x102cd6c: jal   0x101eea8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_resume_101ee98(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_resume_101eea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102cd64: 0x102cd64: lw    ra, 20(sp)
-// 0x0102cd68: 0x102cd68: sll   zero, zero, 0
-// 0x0102cd6c: 0x102cd6c: jr    ra addiu sp, sp, 24
+// 0x0102cd74: 0x102cd74: lw    ra, 20(sp)
+// 0x0102cd78: 0x102cd78: sll   zero, zero, 0
+// 0x0102cd7c: 0x102cd7c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6454,7 +6454,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_trip_102cd74(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_trip_102cd84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6489,27 +6489,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cd74:
-// 0x0102cd74: 0x102cd74: addiu sp, sp, -24
+L_102cd84:
+// 0x0102cd84: 0x102cd84: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cd78: 0x102cd78: sw    ra, 20(sp)
-// 0x0102cd7c: 0x102cd7c: jal   0x101f79c sll   zero, zero, 0
+// 0x0102cd88: 0x102cd88: sw    ra, 20(sp)
+// 0x0102cd8c: 0x102cd8c: jal   0x101f7ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_start_101f79c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_start_101f7ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102cd84: 0x102cd84: lw    ra, 20(sp)
-// 0x0102cd88: 0x102cd88: sll   zero, zero, 0
-// 0x0102cd8c: 0x102cd8c: jr    ra addiu sp, sp, 24
+// 0x0102cd94: 0x102cd94: lw    ra, 20(sp)
+// 0x0102cd98: 0x102cd98: sll   zero, zero, 0
+// 0x0102cd9c: 0x102cd9c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6521,7 +6521,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_save_trip_as_102cd94(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_save_trip_as_102cda4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6556,21 +6556,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cd94:
-// 0x0102cd94: 0x102cd94: addiu sp, sp, -24
+L_102cda4:
+// 0x0102cda4: 0x102cda4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cd98: 0x102cd98: sw    ra, 20(sp)
-// 0x0102cd9c: 0x102cd9c: jal   0x10ac574 addu  a0, zero, zero
+// 0x0102cda8: 0x102cda8: sw    ra, 20(sp)
+// 0x0102cdac: 0x102cdac: jal   0x10acbbc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	call void Cibyl129::roadmap_trip_save_10ac574()
+	call void Cibyl129::roadmap_trip_save_10acbbc()
 // --- basic block ---
-// 0x0102cda4: 0x102cda4: lw    ra, 20(sp)
-// 0x0102cda8: 0x102cda8: sll   zero, zero, 0
-// 0x0102cdac: 0x102cdac: jr    ra addiu sp, sp, 24
+// 0x0102cdb4: 0x102cdb4: lw    ra, 20(sp)
+// 0x0102cdb8: 0x102cdb8: sll   zero, zero, 0
+// 0x0102cdbc: 0x102cdbc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6582,7 +6582,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_save_trip_102cdb4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_save_trip_102cdc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -6617,32 +6617,32 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cdb4:
-// 0x0102cdb4: 0x102cdb4: addiu sp, sp, -24
+L_102cdc4:
+// 0x0102cdc4: 0x102cdc4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cdb8: 0x102cdb8: sw    ra, 20(sp)
-// 0x0102cdbc: 0x102cdbc: jal   0x101e684 sll   zero, zero, 0
+// 0x0102cdc8: 0x102cdc8: sw    ra, 20(sp)
+// 0x0102cdcc: 0x102cdcc: jal   0x101e694 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_current_101e684(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_current_101e694(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102cdc4: 0x102cdc4: jal   0x10ac574 addu  a0, v0, zero
+// 0x0102cdd4: 0x102cdd4: jal   0x10acbbc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	call void Cibyl129::roadmap_trip_save_10ac574()
+	call void Cibyl129::roadmap_trip_save_10acbbc()
 // --- basic block ---
-// 0x0102cdcc: 0x102cdcc: lw    ra, 20(sp)
-// 0x0102cdd0: 0x102cdd0: sll   zero, zero, 0
-// 0x0102cdd4: 0x102cdd4: jr    ra addiu sp, sp, 24
+// 0x0102cddc: 0x102cddc: lw    ra, 20(sp)
+// 0x0102cde0: 0x102cde0: sll   zero, zero, 0
+// 0x0102cde4: 0x102cde4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6654,7 +6654,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_open_trip_102cddc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_open_trip_102cdec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6689,25 +6689,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cddc:
-// 0x0102cddc: 0x102cddc: addiu sp, sp, -24
+L_102cdec:
+// 0x0102cdec: 0x102cdec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cde0: 0x102cde0: addu  a0, zero, zero
+// 0x0102cdf0: 0x102cdf0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0102cde4: 0x102cde4: sw    ra, 20(sp)
-// 0x0102cde8: 0x102cde8: jal   0x10ac56c addu  a1, zero, zero
+// 0x0102cdf4: 0x102cdf4: sw    ra, 20(sp)
+// 0x0102cdf8: 0x102cdf8: jal   0x10acbb4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	call int32 Cibyl129::roadmap_trip_load_10ac56c()
+	call int32 Cibyl129::roadmap_trip_load_10acbb4()
 	stloc 7
 // --- basic block ---
-// 0x0102cdf0: 0x102cdf0: lw    ra, 20(sp)
-// 0x0102cdf4: 0x102cdf4: sll   zero, zero, 0
-// 0x0102cdf8: 0x102cdf8: jr    ra addiu sp, sp, 24
+// 0x0102ce00: 0x102ce00: lw    ra, 20(sp)
+// 0x0102ce04: 0x102ce04: sll   zero, zero, 0
+// 0x0102ce08: 0x102ce08: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6719,7 +6719,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_create_trip_102ce00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_create_trip_102ce10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6754,27 +6754,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102ce00:
-// 0x0102ce00: 0x102ce00: addiu sp, sp, -24
+L_102ce10:
+// 0x0102ce10: 0x102ce10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102ce04: 0x102ce04: sw    ra, 20(sp)
-// 0x0102ce08: 0x102ce08: jal   0x101e4b4 sll   zero, zero, 0
+// 0x0102ce14: 0x102ce14: sw    ra, 20(sp)
+// 0x0102ce18: 0x102ce18: jal   0x101e4c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_new_101e4b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_new_101e4c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102ce10: 0x102ce10: lw    ra, 20(sp)
-// 0x0102ce14: 0x102ce14: sll   zero, zero, 0
-// 0x0102ce18: 0x102ce18: jr    ra addiu sp, sp, 24
+// 0x0102ce20: 0x102ce20: lw    ra, 20(sp)
+// 0x0102ce24: 0x102ce24: sll   zero, zero, 0
+// 0x0102ce28: 0x102ce28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6786,7 +6786,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_toggle_download_102ce20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_toggle_download_102ce30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -6827,14 +6827,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102ce20:
-// 0x0102ce20: 0x102ce20: addiu sp, sp, -32
+L_102ce30:
+// 0x0102ce30: 0x102ce30: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102ce24: 0x102ce24: sw    ra, 28(sp)
-// 0x0102ce28: 0x102ce28: sw    s1, 24(sp)
+// 0x0102ce34: 0x102ce34: sw    ra, 28(sp)
+// 0x0102ce38: 0x102ce38: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6843,7 +6843,7 @@ L_102ce20:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102ce2c: 0x102ce2c: jal   0x10ac5a4 sw    s0, 20(sp)
+// 0x0102ce3c: 0x102ce3c: jal   0x10acbec sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6852,108 +6852,108 @@ L_102ce20:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl129::roadmap_download_enabled_10ac5a4()
+	call int32 Cibyl129::roadmap_download_enabled_10acbec()
 	stloc 5
 // --- basic block ---
-// 0x0102ce34: 0x102ce34: beq   v0, zero, 0x102ce58 lui   s0, 0x60000
+// 0x0102ce44: 0x102ce44: beq   v0, zero, 0x102ce68 lui   s0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 8
-	brfalse L_102ce58
+	brfalse L_102ce68
 // --- basic block ---
-// 0x0102ce3c: 0x102ce3c: jal   0x10ac59c addu  a0, zero, zero
+// 0x0102ce4c: 0x102ce4c: jal   0x10acbe4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	call void Cibyl129::roadmap_download_subscribe_when_done_10ac59c()
+	call void Cibyl129::roadmap_download_subscribe_when_done_10acbe4()
 // --- basic block ---
-// 0x0102ce44: 0x102ce44: lui   a0, 0x1030000
+// 0x0102ce54: 0x102ce54: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102ce48: 0x102ce48: jal   0x10137a0 addiu a0, a0, -12420
+// 0x0102ce58: 0x102ce58: jal   0x10137b0 addiu a0, a0, -12404
 	ldloc.1
-	ldc.i4 -12420
+	ldc.i4 -12404
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl14::roadmap_locator_declare_10137a0(int32)
+	call int32 Cibyl14::roadmap_locator_declare_10137b0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ce50: 0x102ce50: j	 0x102ce94 sll   zero, zero, 0
-	br L_102ce94
+// 0x0102ce60: 0x102ce60: j	 0x102cea4 sll   zero, zero, 0
+	br L_102cea4
 // --- basic block ---
-L_102ce58:
-// 0x0102ce58: 0x102ce58: lw    v0, -24352(s0)
+L_102ce68:
+// 0x0102ce68: 0x102ce68: lw    v0, -23888(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6088
+	ldc.i4 -5972
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ce5c: 0x102ce5c: sll   zero, zero, 0
-// 0x0102ce60: 0x102ce60: bne   v0, zero, 0x102ce80 lui   s1, 0x10b0000
+// 0x0102ce6c: 0x102ce6c: sll   zero, zero, 0
+// 0x0102ce70: 0x102ce70: bne   v0, zero, 0x102ce90 lui   s1, 0x10b0000
 	ldloc 5
 	ldc.i4 17498112
 	stloc 9
-	brtrue L_102ce80
+	brtrue L_102ce90
 // --- basic block ---
-// 0x0102ce68: 0x102ce68: jal   0x10ac5d4 addiu a0, s1, -14956
+// 0x0102ce78: 0x102ce78: jal   0x10acc1c addiu a0, s1, -13348
 	ldloc 9
-	ldc.i4 -14956
+	ldc.i4 -13348
 	add
 	stloc.1
-	call void Cibyl129::roadmap_copy_init_10ac5d4()
+	call void Cibyl129::roadmap_copy_init_10acc1c()
 // --- basic block ---
-// 0x0102ce70: 0x102ce70: jal   0x10ac5dc addiu a0, s1, -14956
+// 0x0102ce80: 0x102ce80: jal   0x10acc24 addiu a0, s1, -13348
 	ldloc 9
-	ldc.i4 -14956
+	ldc.i4 -13348
 	add
 	stloc.1
-	call void Cibyl129::roadmap_httpcopy_init_10ac5dc()
+	call void Cibyl129::roadmap_httpcopy_init_10acc24()
 // --- basic block ---
-// 0x0102ce78: 0x102ce78: addiu v0, zero, 1
+// 0x0102ce88: 0x102ce88: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102ce7c: 0x102ce7c: sw    v0, -24352(s0)
+// 0x0102ce8c: 0x102ce8c: sw    v0, -23888(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6088
+	ldc.i4 -5972
 	add
 	ldloc 5
 	stelem.i4
-L_102ce80:
-// 0x0102ce80: 0x102ce80: lui   a0, 0x1020000
+L_102ce90:
+// 0x0102ce90: 0x102ce90: lui   a0, 0x1020000
 	ldc.i4 16908288
 	stloc.1
-// 0x0102ce84: 0x102ce84: jal   0x10ac59c addiu a0, a0, 6400
+// 0x0102ce94: 0x102ce94: jal   0x10acbe4 addiu a0, a0, 6416
 	ldloc.1
-	ldc.i4 6400
+	ldc.i4 6416
 	add
 	stloc.1
-	call void Cibyl129::roadmap_download_subscribe_when_done_10ac59c()
+	call void Cibyl129::roadmap_download_subscribe_when_done_10acbe4()
 // --- basic block ---
-// 0x0102ce8c: 0x102ce8c: jal   0x10ac5c4 sll   zero, zero, 0
-	call void Cibyl129::roadmap_download_unblock_all_10ac5c4()
+// 0x0102ce9c: 0x102ce9c: jal   0x10acc0c sll   zero, zero, 0
+	call void Cibyl129::roadmap_download_unblock_all_10acc0c()
 // --- basic block ---
-L_102ce94:
-// 0x0102ce94: 0x102ce94: jal   0x1021900 sll   zero, zero, 0
+L_102cea4:
+// 0x0102cea4: 0x102cea4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ce9c: 0x102ce9c: lw    ra, 28(sp)
-// 0x0102cea0: 0x102cea0: lw    s1, 24(sp)
+// 0x0102ceac: 0x102ceac: lw    ra, 28(sp)
+// 0x0102ceb0: 0x102ceb0: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6962,7 +6962,7 @@ L_102ce94:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102cea4: 0x102cea4: lw    s0, 20(sp)
+// 0x0102ceb4: 0x102ceb4: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6971,7 +6971,7 @@ L_102ce94:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102cea8: 0x102cea8: jr    ra addiu sp, sp, 32
+// 0x0102ceb8: 0x102ceb8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6983,7 +6983,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_add_action_102ceb0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_add_action_102cec0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 t0,int32 v1,int32[] mem,int32 t3,int32 v0,int32 t2,int32 lo,int32 t1,int32 ra)
@@ -7033,74 +7033,74 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102ceb0: 0x102ceb0: addiu sp, sp, -24
+// 0x0102cec0: 0x102cec0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102ceb4: 0x102ceb4: lui   v0, 0x0
+// 0x0102cec4: 0x102cec4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0102ceb8: 0x102ceb8: sw    ra, 20(sp)
-// 0x0102cebc: 0x102cebc: addiu v0, v0, 6836
+// 0x0102cec8: 0x102cec8: sw    ra, 20(sp)
+// 0x0102cecc: 0x102cecc: addiu v0, v0, 6836
 	ldloc 9
 	ldc.i4 6836
 	add
 	stloc 9
-// 0x0102cec0: 0x102cec0: addu  v1, zero, zero
+// 0x0102ced0: 0x102ced0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0102cec4: 0x102cec4: addiu t0, zero, 200
+// 0x0102ced4: 0x102ced4: addiu t0, zero, 200
 	ldc.i4 200
 	stloc 5
-L_102cec8:
-// 0x0102cec8: 0x102cec8: lw    t1, 0(v0)
+L_102ced8:
+// 0x0102ced8: 0x102ced8: lw    t1, 0(v0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x0102cecc: 0x102cecc: addiu t2, v1, 1
+// 0x0102cedc: 0x102cedc: addiu t2, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0102ced0: 0x102ced0: beq   t1, zero, 0x102cf04 addiu v0, v0, 24
+// 0x0102cee0: 0x102cee0: beq   t1, zero, 0x102cf14 addiu v0, v0, 24
 	ldloc 12
 	ldloc 9
 	ldc.i4.s 24
 	add
 	stloc 9
-	brfalse L_102cf04
+	brfalse L_102cf14
 // --- basic block ---
-// 0x0102ced8: 0x102ced8: bne   t2, t0, 0x102cec8 addu  v1, t2, zero
+// 0x0102cee8: 0x102cee8: bne   t2, t0, 0x102ced8 addu  v1, t2, zero
 	ldloc 10
 	ldloc 5
 	ldloc 10
 	stloc 6
-	bne.un L_102cec8
+	bne.un L_102ced8
 // --- basic block ---
-// 0x0102cee0: 0x102cee0: lui   a1, 0x10000
+// 0x0102cef0: 0x102cef0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102cee4: 0x102cee4: lui   a3, 0x10000
+// 0x0102cef4: 0x102cef4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102cee8: 0x102cee8: addiu a1, a1, -25252
+// 0x0102cef8: 0x102cef8: addiu a1, a1, -25252
 	ldloc.2
 	ldc.i4 -25252
 	add
 	stloc.2
-// 0x0102ceec: 0x102ceec: addiu a3, a3, -25224
+// 0x0102cefc: 0x102cefc: addiu a3, a3, -25224
 	ldloc 4
 	ldc.i4 -25224
 	add
 	stloc 4
-// 0x0102cef0: 0x102cef0: addiu a0, zero, 4
+// 0x0102cf00: 0x102cf00: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102cef4: 0x102cef4: jal   0x100449c addiu a2, zero, 3310
+// 0x0102cf04: 0x102cf04: jal   0x100449c addiu a2, zero, 3310
 	ldc.i4 3310
 	stloc.3
 	ldloc.0
@@ -7113,65 +7113,65 @@ L_102cec8:
 	stloc 6
 	stloc 9
 // --- basic block ---
-// 0x0102cefc: 0x102cefc: j	 0x102cf6c addiu v0, zero, -1
+// 0x0102cf0c: 0x102cf0c: j	 0x102cf7c addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 9
-	br L_102cf6c
+	br L_102cf7c
 // --- basic block ---
-L_102cf04:
-// 0x0102cf04: 0x102cf04: addiu t3, zero, 3
+L_102cf14:
+// 0x0102cf14: 0x102cf14: addiu t3, zero, 3
 	ldc.i4.3
 	stloc 8
-// 0x0102cf08: 0x102cf08: mult  v1, t3
+// 0x0102cf18: 0x102cf18: mult  v1, t3
 	ldloc 6
 	ldloc 8
 	mul
 	stloc 11
-// 0x0102cf0c: 0x102cf0c: addiu t1, zero, 24
+// 0x0102cf1c: 0x102cf1c: addiu t1, zero, 24
 	ldc.i4.s 24
 	stloc 12
-// 0x0102cf10: 0x102cf10: lui   t0, 0x0
+// 0x0102cf20: 0x102cf20: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102cf14: 0x102cf14: addiu t0, t0, 6836
+// 0x0102cf24: 0x102cf24: addiu t0, t0, 6836
 	ldloc 5
 	ldc.i4 6836
 	add
 	stloc 5
-// 0x0102cf18: 0x102cf18: addu  v0, zero, zero
+// 0x0102cf28: 0x102cf28: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0102cf1c: 0x102cf1c: mflo  lo
+// 0x0102cf2c: 0x102cf2c: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x0102cf20: 0x102cf20: addiu t3, t3, 1
+// 0x0102cf30: 0x102cf30: addiu t3, t3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0102cf24: 0x102cf24: sll   t3, t3, 3
+// 0x0102cf34: 0x102cf34: sll   t3, t3, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x0102cf28: 0x102cf28: mult  t2, t1
+// 0x0102cf38: 0x102cf38: mult  t2, t1
 	ldloc 10
 	ldloc 12
 	mul
 	stloc 11
-// 0x0102cf2c: 0x102cf2c: addu  t3, t0, t3
+// 0x0102cf3c: 0x102cf3c: addu  t3, t0, t3
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0102cf30: 0x102cf30: sw    a2, 0(t3)
+// 0x0102cf40: 0x102cf40: sw    a2, 0(t3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x0102cf34: 0x102cf34: sw    a3, 4(t3)
+// 0x0102cf44: 0x102cf44: sw    a3, 4(t3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7180,29 +7180,29 @@ L_102cf04:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0102cf38: 0x102cf38: mflo  lo
+// 0x0102cf48: 0x102cf48: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x0102cf3c: 0x102cf3c: addu  t2, t2, t0
+// 0x0102cf4c: 0x102cf4c: addu  t2, t2, t0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x0102cf40: 0x102cf40: sll   zero, zero, 0
-// 0x0102cf44: 0x102cf44: mult  v1, t1
+// 0x0102cf50: 0x102cf50: sll   zero, zero, 0
+// 0x0102cf54: 0x102cf54: mult  v1, t1
 	ldloc 6
 	ldloc 12
 	mul
 	stloc 11
-// 0x0102cf48: 0x102cf48: mflo  lo
+// 0x0102cf58: 0x102cf58: mflo  lo
 	ldloc 11
 	stloc 6
-// 0x0102cf4c: 0x102cf4c: addu  t0, t0, v1
+// 0x0102cf5c: 0x102cf5c: addu  t0, t0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0102cf50: 0x102cf50: lw    v1, 44(sp)
+// 0x0102cf60: 0x102cf60: lw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7211,14 +7211,14 @@ L_102cf04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102cf54: 0x102cf54: sw    a0, 0(t0)
+// 0x0102cf64: 0x102cf64: sw    a0, 0(t0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0102cf58: 0x102cf58: sw    v1, 20(t0)
+// 0x0102cf68: 0x102cf68: sw    v1, 20(t0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7227,7 +7227,7 @@ L_102cf04:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102cf5c: 0x102cf5c: lw    v1, 40(sp)
+// 0x0102cf6c: 0x102cf6c: lw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7236,7 +7236,7 @@ L_102cf04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102cf60: 0x102cf60: sw    a1, 4(t0)
+// 0x0102cf70: 0x102cf70: sw    a1, 4(t0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7245,7 +7245,7 @@ L_102cf04:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102cf64: 0x102cf64: sw    v1, 16(t0)
+// 0x0102cf74: 0x102cf74: sw    v1, 16(t0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7254,17 +7254,17 @@ L_102cf04:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102cf68: 0x102cf68: sw    zero, 0(t2)
+// 0x0102cf78: 0x102cf78: sw    zero, 0(t2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_102cf6c:
-// 0x0102cf6c: 0x102cf6c: lw    ra, 20(sp)
-// 0x0102cf70: 0x102cf70: sll   zero, zero, 0
-// 0x0102cf74: 0x102cf74: jr    ra addiu sp, sp, 24
+L_102cf7c:
+// 0x0102cf7c: 0x102cf7c: lw    ra, 20(sp)
+// 0x0102cf80: 0x102cf80: sll   zero, zero, 0
+// 0x0102cf84: 0x102cf84: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7276,7 +7276,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_start_no_download_102cf7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_no_download_102cf8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -7314,12 +7314,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102cf7c: 0x102cf7c: addiu sp, sp, -32
+// 0x0102cf8c: 0x102cf8c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102cf80: 0x102cf80: sw    s0, 24(sp)
+// 0x0102cf90: 0x102cf90: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7328,39 +7328,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102cf84: 0x102cf84: sw    ra, 28(sp)
-// 0x0102cf88: 0x102cf88: jal   0x10ac5cc addu  s0, a0, zero
+// 0x0102cf94: 0x102cf94: sw    ra, 28(sp)
+// 0x0102cf98: 0x102cf98: jal   0x10acc14 addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-	call int32 Cibyl129::roadmap_download_blocked_10ac5cc()
+	call int32 Cibyl129::roadmap_download_blocked_10acc14()
 	stloc 5
 // --- basic block ---
-// 0x0102cf90: 0x102cf90: bne   v0, zero, 0x102cfbc lui   a1, 0x10000
+// 0x0102cfa0: 0x102cfa0: bne   v0, zero, 0x102cfcc lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_102cfbc
+	brtrue L_102cfcc
 // --- basic block ---
-// 0x0102cf98: 0x102cf98: lui   a3, 0x10000
+// 0x0102cfa8: 0x102cfa8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102cf9c: 0x102cf9c: addiu a0, zero, 3
+// 0x0102cfac: 0x102cfac: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0102cfa0: 0x102cfa0: addiu a1, a1, -25252
+// 0x0102cfb0: 0x102cfb0: addiu a1, a1, -25252
 	ldloc.2
 	ldc.i4 -25252
 	add
 	stloc.2
-// 0x0102cfa4: 0x102cfa4: addiu a3, a3, -25204
+// 0x0102cfb4: 0x102cfb4: addiu a3, a3, -25204
 	ldloc 4
 	ldc.i4 -25204
 	add
 	stloc 4
-// 0x0102cfa8: 0x102cfa8: addiu a2, zero, 560
+// 0x0102cfb8: 0x102cfb8: addiu a2, zero, 560
 	ldc.i4 560
 	stloc.3
-// 0x0102cfac: 0x102cfac: jal   0x100449c sw    s0, 16(sp)
+// 0x0102cfbc: 0x102cfbc: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7379,17 +7379,17 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0102cfb4: 0x102cfb4: jal   0x10ac5b4 addu  a0, s0, zero
+// 0x0102cfc4: 0x102cfc4: jal   0x10acbfc addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-	call void Cibyl129::roadmap_download_block_10ac5b4()
+	call void Cibyl129::roadmap_download_block_10acbfc()
 // --- basic block ---
-L_102cfbc:
-// 0x0102cfbc: 0x102cfbc: lw    ra, 28(sp)
-// 0x0102cfc0: 0x102cfc0: addu  v0, zero, zero
+L_102cfcc:
+// 0x0102cfcc: 0x102cfcc: lw    ra, 28(sp)
+// 0x0102cfd0: 0x102cfd0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0102cfc4: 0x102cfc4: lw    s0, 24(sp)
+// 0x0102cfd4: 0x102cfd4: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7398,7 +7398,7 @@ L_102cfbc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102cfc8: 0x102cfc8: jr    ra addiu sp, sp, 32
+// 0x0102cfd8: 0x102cfd8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -7410,7 +7410,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_show_location_102cfd0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_show_location_102cfe0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -7445,17 +7445,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cfd0:
-// 0x0102cfd0: 0x102cfd0: lui   a0, 0x0
+L_102cfe0:
+// 0x0102cfe0: 0x102cfe0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102cfd4: 0x102cfd4: addiu sp, sp, -24
+// 0x0102cfe4: 0x102cfe4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102cfd8: 0x102cfd8: sw    ra, 20(sp)
-// 0x0102cfdc: 0x102cfdc: jal   0x101ece8 addiu a0, a0, 27208
+// 0x0102cfe8: 0x102cfe8: sw    ra, 20(sp)
+// 0x0102cfec: 0x102cfec: jal   0x101ecf8 addiu a0, a0, 27208
 	ldloc.1
 	ldc.i4 27208
 	add
@@ -7465,25 +7465,25 @@ L_102cfd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102cfe4: 0x102cfe4: jal   0x102146c sll   zero, zero, 0
+// 0x0102cff4: 0x102cff4: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102cfec: 0x102cfec: lw    ra, 20(sp)
-// 0x0102cff0: 0x102cff0: sll   zero, zero, 0
-// 0x0102cff4: 0x102cff4: jr    ra addiu sp, sp, 24
+// 0x0102cffc: 0x102cffc: lw    ra, 20(sp)
+// 0x0102d000: 0x102d000: sll   zero, zero, 0
+// 0x0102d004: 0x102d004: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7495,7 +7495,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_start_show_destination_102cffc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_show_destination_102d00c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -7530,17 +7530,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102cffc:
-// 0x0102cffc: 0x102cffc: lui   a0, 0x10000
+L_102d00c:
+// 0x0102d00c: 0x102d00c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102d000: 0x102d000: addiu sp, sp, -24
+// 0x0102d010: 0x102d010: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d004: 0x102d004: sw    ra, 20(sp)
-// 0x0102d008: 0x102d008: jal   0x101ece8 addiu a0, a0, -29748
+// 0x0102d014: 0x102d014: sw    ra, 20(sp)
+// 0x0102d018: 0x102d018: jal   0x101ecf8 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -7550,25 +7550,25 @@ L_102cffc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102d010: 0x102d010: jal   0x102146c sll   zero, zero, 0
+// 0x0102d020: 0x102d020: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102d018: 0x102d018: lw    ra, 20(sp)
-// 0x0102d01c: 0x102d01c: sll   zero, zero, 0
-// 0x0102d020: 0x102d020: jr    ra addiu sp, sp, 24
+// 0x0102d028: 0x102d028: lw    ra, 20(sp)
+// 0x0102d02c: 0x102d02c: sll   zero, zero, 0
+// 0x0102d030: 0x102d030: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7580,7 +7580,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_start_show_gps_102d028(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_show_gps_102d038(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -7615,28 +7615,28 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d028:
-// 0x0102d028: 0x102d028: addiu sp, sp, -24
+L_102d038:
+// 0x0102d038: 0x102d038: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d02c: 0x102d02c: sw    ra, 20(sp)
-// 0x0102d030: 0x102d030: jal   0x1021394 sll   zero, zero, 0
+// 0x0102d03c: 0x102d03c: sw    ra, 20(sp)
+// 0x0102d040: 0x102d040: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d038: 0x102d038: lui   a0, 0x10000
+// 0x0102d048: 0x102d048: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102d03c: 0x102d03c: jal   0x101ece8 addiu a0, a0, -31052
+// 0x0102d04c: 0x102d04c: jal   0x101ecf8 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -7646,36 +7646,36 @@ L_102d028:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d044: 0x102d044: jal   0x102146c sll   zero, zero, 0
+// 0x0102d054: 0x102d054: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d04c: 0x102d04c: jal   0x100f35c sll   zero, zero, 0
+// 0x0102d05c: 0x102d05c: jal   0x100f36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_refresh_100f35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_refresh_100f36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d054: 0x102d054: lw    ra, 20(sp)
-// 0x0102d058: 0x102d058: sll   zero, zero, 0
-// 0x0102d05c: 0x102d05c: jr    ra addiu sp, sp, 24
+// 0x0102d064: 0x102d064: lw    ra, 20(sp)
+// 0x0102d068: 0x102d068: sll   zero, zero, 0
+// 0x0102d06c: 0x102d06c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7687,7 +7687,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_periodic_102d064(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_periodic_102d074(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -7722,38 +7722,38 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d064: 0x102d064: addiu sp, sp, -24
+// 0x0102d074: 0x102d074: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d068: 0x102d068: sw    ra, 20(sp)
-// 0x0102d06c: 0x102d06c: jal   0x10ac5e4 sll   zero, zero, 0
-	call void Cibyl129::roadmap_spawn_check_10ac5e4()
+// 0x0102d078: 0x102d078: sw    ra, 20(sp)
+// 0x0102d07c: 0x102d07c: jal   0x10acc2c sll   zero, zero, 0
+	call void Cibyl129::roadmap_spawn_check_10acc2c()
 // --- basic block ---
-// 0x0102d074: 0x102d074: lui   v0, 0x60000
+// 0x0102d084: 0x102d084: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102d078: 0x102d078: lw    v1, -24348(v0)
+// 0x0102d088: 0x102d088: lw    v1, -23884(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6087
+	ldc.i4 -5971
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102d07c: 0x102d07c: sll   zero, zero, 0
-// 0x0102d080: 0x102d080: beq   v1, zero, 0x102d098 sll   zero, zero, 0
+// 0x0102d08c: 0x102d08c: sll   zero, zero, 0
+// 0x0102d090: 0x102d090: beq   v1, zero, 0x102d0a8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_102d098
+	brfalse L_102d0a8
 // --- basic block ---
-// 0x0102d088: 0x102d088: jal   0x102146c sw    zero, -24348(v0)
+// 0x0102d098: 0x102d098: jal   0x102147c sw    zero, -23884(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6087
+	ldc.i4 -5971
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -7762,19 +7762,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d090: 0x102d090: jal   0x1004258 sll   zero, zero, 0
+// 0x0102d0a0: 0x102d0a0: jal   0x1004258 sll   zero, zero, 0
 	call int32 Cibyl3::roadmap_log_reset_stack_1004258()
 	stloc 5
 // --- basic block ---
-L_102d098:
-// 0x0102d098: 0x102d098: lw    ra, 20(sp)
-// 0x0102d09c: 0x102d09c: sll   zero, zero, 0
-// 0x0102d0a0: 0x102d0a0: jr    ra addiu sp, sp, 24
+L_102d0a8:
+// 0x0102d0a8: 0x102d0a8: lw    ra, 20(sp)
+// 0x0102d0ac: 0x102d0ac: sll   zero, zero, 0
+// 0x0102d0b0: 0x102d0b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl33.j b/converted/Cibyl33.j
index ca27f9d..fa61bda 100644
--- a/converted/Cibyl33.j
+++ b/converted/Cibyl33.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl33::.ctor
 
-.method public static int32 roadmap_start_hold_map_102d0a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_hold_map_102d0b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -76,38 +76,38 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d0a8:
-// 0x0102d0a8: 0x102d0a8: addiu sp, sp, -24
+L_102d0b8:
+// 0x0102d0b8: 0x102d0b8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d0ac: 0x102d0ac: sw    ra, 20(sp)
-// 0x0102d0b0: 0x102d0b0: jal   0x102d064 sll   zero, zero, 0
+// 0x0102d0bc: 0x102d0bc: sw    ra, 20(sp)
+// 0x0102d0c0: 0x102d0c0: jal   0x102d074 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_periodic_102d064(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_periodic_102d074(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102d0b8: 0x102d0b8: jal   0x1021394 sll   zero, zero, 0
+// 0x0102d0c8: 0x102d0c8: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102d0c0: 0x102d0c0: lw    ra, 20(sp)
-// 0x0102d0c4: 0x102d0c4: sll   zero, zero, 0
-// 0x0102d0c8: 0x102d0c8: jr    ra addiu sp, sp, 24
+// 0x0102d0d0: 0x102d0d0: lw    ra, 20(sp)
+// 0x0102d0d4: 0x102d0d4: sll   zero, zero, 0
+// 0x0102d0d8: 0x102d0d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -119,7 +119,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_start_counter_rotate_102d0d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_counter_rotate_102d0e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -154,14 +154,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d0d0:
-// 0x0102d0d0: 0x102d0d0: addiu sp, sp, -24
+L_102d0e0:
+// 0x0102d0e0: 0x102d0e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d0d4: 0x102d0d4: sw    ra, 20(sp)
-// 0x0102d0d8: 0x102d0d8: jal   0x10212b4 addiu a0, zero, -10
+// 0x0102d0e4: 0x102d0e4: sw    ra, 20(sp)
+// 0x0102d0e8: 0x102d0e8: jal   0x10212c4 addiu a0, zero, -10
 	ldc.i4.s -10
 	stloc.1
 	ldloc.0
@@ -169,14 +169,14 @@ L_102d0d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_rotate_10212b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_rotate_10212c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102d0e0: 0x102d0e0: lw    ra, 20(sp)
-// 0x0102d0e4: 0x102d0e4: sll   zero, zero, 0
-// 0x0102d0e8: 0x102d0e8: jr    ra addiu sp, sp, 24
+// 0x0102d0f0: 0x102d0f0: lw    ra, 20(sp)
+// 0x0102d0f4: 0x102d0f4: sll   zero, zero, 0
+// 0x0102d0f8: 0x102d0f8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -188,7 +188,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_rotate_102d0f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_rotate_102d100(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -223,14 +223,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d0f0:
-// 0x0102d0f0: 0x102d0f0: addiu sp, sp, -24
+L_102d100:
+// 0x0102d100: 0x102d100: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d0f4: 0x102d0f4: sw    ra, 20(sp)
-// 0x0102d0f8: 0x102d0f8: jal   0x10212b4 addiu a0, zero, 10
+// 0x0102d104: 0x102d104: sw    ra, 20(sp)
+// 0x0102d108: 0x102d108: jal   0x10212c4 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -238,14 +238,14 @@ L_102d0f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_rotate_10212b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_rotate_10212c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102d100: 0x102d100: lw    ra, 20(sp)
-// 0x0102d104: 0x102d104: sll   zero, zero, 0
-// 0x0102d108: 0x102d108: jr    ra addiu sp, sp, 24
+// 0x0102d110: 0x102d110: lw    ra, 20(sp)
+// 0x0102d114: 0x102d114: sll   zero, zero, 0
+// 0x0102d118: 0x102d118: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -257,7 +257,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_purge_102d110(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_purge_102d120(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -292,14 +292,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d110:
-// 0x0102d110: 0x102d110: addiu sp, sp, -24
+L_102d120:
+// 0x0102d120: 0x102d120: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d114: 0x102d114: sw    ra, 20(sp)
-// 0x0102d118: 0x102d118: jal   0x1037ab0 addiu a0, zero, 10
+// 0x0102d124: 0x102d124: sw    ra, 20(sp)
+// 0x0102d128: 0x102d128: jal   0x1037ac0 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -307,14 +307,14 @@ L_102d110:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_purge_1037ab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_purge_1037ac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102d120: 0x102d120: lw    ra, 20(sp)
-// 0x0102d124: 0x102d124: sll   zero, zero, 0
-// 0x0102d128: 0x102d128: jr    ra addiu sp, sp, 24
+// 0x0102d130: 0x102d130: lw    ra, 20(sp)
+// 0x0102d134: 0x102d134: sll   zero, zero, 0
+// 0x0102d138: 0x102d138: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -326,7 +326,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_console_102d130(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_console_102d140(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -367,13 +367,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d130:
-// 0x0102d130: 0x102d130: addiu sp, sp, -1056
+L_102d140:
+// 0x0102d140: 0x102d140: addiu sp, sp, -1056
 	ldloc.0
 	ldc.i4 -1056
 	add
 	stloc.0
-// 0x0102d134: 0x102d134: sw    s1, 1048(sp)
+// 0x0102d144: 0x102d144: sw    s1, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -382,8 +382,8 @@ L_102d130:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102d138: 0x102d138: sw    ra, 1052(sp)
-// 0x0102d13c: 0x102d13c: jal   0x1015c84 sw    s0, 1044(sp)
+// 0x0102d148: 0x102d148: sw    ra, 1052(sp)
+// 0x0102d14c: 0x102d14c: jal   0x1015c94 sw    s0, 1044(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -392,51 +392,51 @@ L_102d130:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl16::roadmap_gps_source_1015c84()
+	call int32 Cibyl16::roadmap_gps_source_1015c94()
 	stloc 6
 // --- basic block ---
-// 0x0102d144: 0x102d144: bne   v0, zero, 0x102d15c lui   s1, 0x10000
+// 0x0102d154: 0x102d154: bne   v0, zero, 0x102d16c lui   s1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 8
-	brtrue L_102d15c
+	brtrue L_102d16c
 // --- basic block ---
-// 0x0102d14c: 0x102d14c: lui   a1, 0x10000
+// 0x0102d15c: 0x102d15c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102d150: 0x102d150: addiu a0, s1, -25168
+// 0x0102d160: 0x102d160: addiu a0, s1, -25168
 	ldloc 8
 	ldc.i4 -25168
 	add
 	stloc.1
-// 0x0102d154: 0x102d154: j	 0x102d180 addiu a1, a1, 18500
+// 0x0102d164: 0x102d164: j	 0x102d190 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-	br L_102d180
+	br L_102d190
 // --- basic block ---
-L_102d15c:
-// 0x0102d15c: 0x102d15c: addiu s0, sp, 16
+L_102d16c:
+// 0x0102d16c: 0x102d16c: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x0102d160: 0x102d160: lui   a2, 0x10000
+// 0x0102d170: 0x102d170: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102d164: 0x102d164: addu  a0, s0, zero
+// 0x0102d174: 0x102d174: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0102d168: 0x102d168: addiu a1, zero, 1024
+// 0x0102d178: 0x102d178: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x0102d16c: 0x102d16c: addiu a2, a2, -25160
+// 0x0102d17c: 0x102d17c: addiu a2, a2, -25160
 	ldloc.3
 	ldc.i4 -25160
 	add
 	stloc.3
-// 0x0102d170: 0x102d170: jal   0x1000f9c addu  a3, v0, zero
+// 0x0102d180: 0x102d180: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -449,21 +449,21 @@ L_102d15c:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0102d178: 0x102d178: addiu a0, s1, -25168
+// 0x0102d188: 0x102d188: addiu a0, s1, -25168
 	ldloc 8
 	ldc.i4 -25168
 	add
 	stloc.1
-// 0x0102d17c: 0x102d17c: addu  a1, s0, zero
+// 0x0102d18c: 0x102d18c: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-L_102d180:
-// 0x0102d180: 0x102d180: jal   0x10ac5f4 sll   zero, zero, 0
-	call int32 Cibyl129::roadmap_spawn_10ac5f4()
+L_102d190:
+// 0x0102d190: 0x102d190: jal   0x10acc3c sll   zero, zero, 0
+	call int32 Cibyl129::roadmap_spawn_10acc3c()
 	stloc 6
 // --- basic block ---
-// 0x0102d188: 0x102d188: lw    ra, 1052(sp)
-// 0x0102d18c: 0x102d18c: lw    s1, 1048(sp)
+// 0x0102d198: 0x102d198: lw    ra, 1052(sp)
+// 0x0102d19c: 0x102d19c: lw    s1, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -472,7 +472,7 @@ L_102d180:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102d190: 0x102d190: lw    s0, 1044(sp)
+// 0x0102d1a0: 0x102d1a0: lw    s0, 1044(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -481,7 +481,7 @@ L_102d180:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102d194: 0x102d194: jr    ra addiu sp, sp, 1056
+// 0x0102d1a4: 0x102d1a4: jr    ra addiu sp, sp, 1056
 	ldloc.0
 	ldc.i4 1056
 	add
@@ -493,7 +493,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_start_reset_debug_mode_102d19c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_reset_debug_mode_102d1ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -528,41 +528,41 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d19c: 0x102d19c: addiu sp, sp, -152
+// 0x0102d1ac: 0x102d1ac: addiu sp, sp, -152
 	ldloc.0
 	ldc.i4 -152
 	add
 	stloc.0
-// 0x0102d1a0: 0x102d1a0: sw    ra, 148(sp)
-// 0x0102d1a4: 0x102d1a4: jal   0x1015c94 sll   zero, zero, 0
-	call int32 Cibyl16::roadmap_verbosity_1015c94()
+// 0x0102d1b0: 0x102d1b0: sw    ra, 148(sp)
+// 0x0102d1b4: 0x102d1b4: jal   0x1015ca4 sll   zero, zero, 0
+	call int32 Cibyl16::roadmap_verbosity_1015ca4()
 	stloc 5
 // --- basic block ---
-// 0x0102d1ac: 0x102d1ac: slti  v0, v0, 2
+// 0x0102d1bc: 0x102d1bc: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0102d1b0: 0x102d1b0: addiu a0, sp, 16
+// 0x0102d1c0: 0x102d1c0: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0102d1b4: 0x102d1b4: bne   v0, zero, 0x102d1fc lui   a1, 0x10000
+// 0x0102d1c4: 0x102d1c4: bne   v0, zero, 0x102d20c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_102d1fc
+	brtrue L_102d20c
 // --- basic block ---
-// 0x0102d1bc: 0x102d1bc: lui   a2, 0x10000
+// 0x0102d1cc: 0x102d1cc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102d1c0: 0x102d1c0: addiu a1, a1, -25148
+// 0x0102d1d0: 0x102d1d0: addiu a1, a1, -25148
 	ldloc.2
 	ldc.i4 -25148
 	add
 	stloc.2
-// 0x0102d1c4: 0x102d1c4: jal   0x1000f64 addiu a2, a2, -25124
+// 0x0102d1d4: 0x102d1d4: jal   0x1000f64 addiu a2, a2, -25124
 	ldloc.3
 	ldc.i4 -25124
 	add
@@ -577,22 +577,22 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d1cc: 0x102d1cc: jal   0x1015d18 addiu a0, zero, 1
+// 0x0102d1dc: 0x102d1dc: jal   0x1015d28 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl16::roadmap_option_set_verbosity_1015d18(int32)
+	call int32 Cibyl16::roadmap_option_set_verbosity_1015d28(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d1d4: 0x102d1d4: jal   0x1030eb0 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_csv_tracker_get_enable_1030eb0()
+// 0x0102d1e4: 0x102d1e4: jal   0x1030ec0 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_csv_tracker_get_enable_1030ec0()
 	stloc 5
 // --- basic block ---
-// 0x0102d1dc: 0x102d1dc: bne   v0, zero, 0x102d224 sll   zero, zero, 0
+// 0x0102d1ec: 0x102d1ec: bne   v0, zero, 0x102d234 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102d224
+	brtrue L_102d234
 // --- basic block ---
-// 0x0102d1e4: 0x102d1e4: jal   0x1031298 addiu a0, zero, 1
+// 0x0102d1f4: 0x102d1f4: jal   0x10312a8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -600,35 +600,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_csv_tracker_set_enable_1031298(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_csv_tracker_set_enable_10312a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d1ec: 0x102d1ec: jal   0x10310e0 sll   zero, zero, 0
+// 0x0102d1fc: 0x102d1fc: jal   0x10310f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_csv_tracker_initialize_10310e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_csv_tracker_initialize_10310f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d1f4: 0x102d1f4: j	 0x102d224 sll   zero, zero, 0
-	br L_102d224
+// 0x0102d204: 0x102d204: j	 0x102d234 sll   zero, zero, 0
+	br L_102d234
 // --- basic block ---
-L_102d1fc:
-// 0x0102d1fc: 0x102d1fc: lui   a2, 0x10000
+L_102d20c:
+// 0x0102d20c: 0x102d20c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102d200: 0x102d200: addiu a1, a1, -25148
+// 0x0102d210: 0x102d210: addiu a1, a1, -25148
 	ldloc.2
 	ldc.i4 -25148
 	add
 	stloc.2
-// 0x0102d204: 0x102d204: jal   0x1000f64 addiu a2, a2, -25116
+// 0x0102d214: 0x102d214: jal   0x1000f64 addiu a2, a2, -25116
 	ldloc.3
 	ldc.i4 -25116
 	add
@@ -643,14 +643,14 @@ L_102d1fc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d20c: 0x102d20c: jal   0x1015d18 addiu a0, zero, 3
+// 0x0102d21c: 0x102d21c: jal   0x1015d28 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.1
-	call int32 Cibyl16::roadmap_option_set_verbosity_1015d18(int32)
+	call int32 Cibyl16::roadmap_option_set_verbosity_1015d28(int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d214: 0x102d214: jal   0x1031298 addu  a0, zero, zero
+// 0x0102d224: 0x102d224: jal   0x10312a8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -658,34 +658,34 @@ L_102d1fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_csv_tracker_set_enable_1031298(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_csv_tracker_set_enable_10312a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d21c: 0x102d21c: jal   0x1031268 sll   zero, zero, 0
+// 0x0102d22c: 0x102d22c: jal   0x1031278 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_csv_tracker_shutdown_1031268(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_csv_tracker_shutdown_1031278(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102d224:
-// 0x0102d224: 0x102d224: jal   0x1015c94 sll   zero, zero, 0
-	call int32 Cibyl16::roadmap_verbosity_1015c94()
+L_102d234:
+// 0x0102d234: 0x102d234: jal   0x1015ca4 sll   zero, zero, 0
+	call int32 Cibyl16::roadmap_verbosity_1015ca4()
 	stloc 5
 // --- basic block ---
-// 0x0102d22c: 0x102d22c: lui   a0, 0x0
+// 0x0102d23c: 0x102d23c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102d230: 0x102d230: addu  a1, v0, zero
+// 0x0102d240: 0x102d240: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102d234: 0x102d234: jal   0x100e610 addiu a0, a0, 1916
+// 0x0102d244: 0x102d244: jal   0x100e620 addiu a0, a0, 1916
 	ldloc.1
 	ldc.i4 1916
 	add
@@ -695,20 +695,20 @@ L_102d224:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d23c: 0x102d23c: lui   a0, 0x10000
+// 0x0102d24c: 0x102d24c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102d240: 0x102d240: addiu a1, sp, 16
+// 0x0102d250: 0x102d250: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0102d244: 0x102d244: jal   0x104c148 addiu a0, a0, -25108
+// 0x0102d254: 0x102d254: jal   0x104c158 addiu a0, a0, -25108
 	ldloc.1
 	ldc.i4 -25108
 	add
@@ -718,14 +718,14 @@ L_102d224:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d24c: 0x102d24c: lw    ra, 148(sp)
-// 0x0102d250: 0x102d250: sll   zero, zero, 0
-// 0x0102d254: 0x102d254: jr    ra addiu sp, sp, 152
+// 0x0102d25c: 0x102d25c: lw    ra, 148(sp)
+// 0x0102d260: 0x102d260: sll   zero, zero, 0
+// 0x0102d264: 0x102d264: jr    ra addiu sp, sp, 152
 	ldloc.0
 	ldc.i4 152
 	add
@@ -737,7 +737,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_hide_menu_102d25c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_hide_menu_102d26c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -772,26 +772,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d25c: 0x102d25c: addiu sp, sp, -24
+// 0x0102d26c: 0x102d26c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d260: 0x102d260: sw    ra, 20(sp)
-// 0x0102d264: 0x102d264: jal   0x1096d98 sll   zero, zero, 0
+// 0x0102d270: 0x102d270: sw    ra, 20(sp)
+// 0x0102d274: 0x102d274: jal   0x10973e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_hide_1096d98(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_hide_10973e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102d26c: 0x102d26c: lw    ra, 20(sp)
-// 0x0102d270: 0x102d270: sll   zero, zero, 0
-// 0x0102d274: 0x102d274: jr    ra addiu sp, sp, 24
+// 0x0102d27c: 0x102d27c: lw    ra, 20(sp)
+// 0x0102d280: 0x102d280: sll   zero, zero, 0
+// 0x0102d284: 0x102d284: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -803,7 +803,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 bottom_bar_status_102d27c(int32,int32,int32,int32,int32)
+.method public static int32 bottom_bar_status_102d28c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -838,31 +838,31 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d27c: 0x102d27c: addiu sp, sp, -24
+// 0x0102d28c: 0x102d28c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d280: 0x102d280: sw    ra, 20(sp)
-// 0x0102d284: 0x102d284: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x0102d290: 0x102d290: sw    ra, 20(sp)
+// 0x0102d294: 0x102d294: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102d28c: 0x102d28c: addu  a0, v0, zero
+// 0x0102d29c: 0x102d29c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102d290: 0x102d290: beq   a0, zero, 0x102d2a8 addu  v0, zero, zero
+// 0x0102d2a0: 0x102d2a0: beq   a0, zero, 0x102d2b8 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_102d2a8
+	brfalse L_102d2b8
 // --- basic block ---
-// 0x0102d298: 0x102d298: lui   a1, 0x10000
+// 0x0102d2a8: 0x102d2a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102d29c: 0x102d29c: jal   0x1001b14 addiu a1, a1, -31052
+// 0x0102d2ac: 0x102d2ac: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -872,15 +872,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d2a4: 0x102d2a4: sltiu v0, v0, 1
+// 0x0102d2b4: 0x102d2b4: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-L_102d2a8:
-// 0x0102d2a8: 0x102d2a8: lw    ra, 20(sp)
-// 0x0102d2ac: 0x102d2ac: sll   zero, zero, 0
-// 0x0102d2b0: 0x102d2b0: jr    ra addiu sp, sp, 24
+L_102d2b8:
+// 0x0102d2b8: 0x102d2b8: lw    ra, 20(sp)
+// 0x0102d2bc: 0x102d2bc: sll   zero, zero, 0
+// 0x0102d2c0: 0x102d2c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -892,7 +892,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_popup_menu_102d2b8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_popup_menu_102d2c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra)
@@ -936,12 +936,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d2b8: 0x102d2b8: addiu sp, sp, -48
+// 0x0102d2c8: 0x102d2c8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0102d2bc: 0x102d2bc: sw    s1, 36(sp)
+// 0x0102d2cc: 0x102d2cc: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -950,18 +950,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102d2c0: 0x102d2c0: addu  s1, a1, zero
+// 0x0102d2d0: 0x102d2d0: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0102d2c4: 0x102d2c4: lui   a1, 0x10000
+// 0x0102d2d4: 0x102d2d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102d2c8: 0x102d2c8: addiu a1, a1, -25096
+// 0x0102d2d8: 0x102d2d8: addiu a1, a1, -25096
 	ldloc.2
 	ldc.i4 -25096
 	add
 	stloc.2
-// 0x0102d2cc: 0x102d2cc: sw    s2, 40(sp)
+// 0x0102d2dc: 0x102d2dc: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -970,7 +970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102d2d0: 0x102d2d0: sw    s0, 32(sp)
+// 0x0102d2e0: 0x102d2e0: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -979,11 +979,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102d2d4: 0x102d2d4: sw    ra, 44(sp)
-// 0x0102d2d8: 0x102d2d8: addu  s0, a2, zero
+// 0x0102d2e4: 0x102d2e4: sw    ra, 44(sp)
+// 0x0102d2e8: 0x102d2e8: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0102d2dc: 0x102d2dc: jal   0x1001b14 addu  s2, a0, zero
+// 0x0102d2ec: 0x102d2ec: jal   0x1001b14 addu  s2, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.1
@@ -991,28 +991,28 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d2e4: 0x102d2e4: bne   v0, zero, 0x102d390 lui   v0, 0x0
+// 0x0102d2f4: 0x102d2f4: bne   v0, zero, 0x102d3a0 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_102d390
+	brtrue L_102d3a0
 // --- basic block ---
-// 0x0102d2ec: 0x102d2ec: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x0102d2fc: 0x102d2fc: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102d2f4: 0x102d2f4: beq   v0, zero, 0x102d33c lui   a1, 0x10000
+// 0x0102d304: 0x102d304: beq   v0, zero, 0x102d34c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_102d33c
+	brfalse L_102d34c
 // --- basic block ---
-// 0x0102d2fc: 0x102d2fc: addu  a0, v0, zero
+// 0x0102d30c: 0x102d30c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102d300: 0x102d300: jal   0x1001b14 addiu a1, a1, -29680
+// 0x0102d310: 0x102d310: jal   0x1001b14 addiu a1, a1, -29680
 	ldloc.2
 	ldc.i4 -29680
 	add
@@ -1022,14 +1022,14 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d308: 0x102d308: bne   v0, zero, 0x102d33c sll   zero, zero, 0
+// 0x0102d318: 0x102d318: bne   v0, zero, 0x102d34c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102d33c
+	brtrue L_102d34c
 // --- basic block ---
-// 0x0102d310: 0x102d310: lui   a0, 0x10000
+// 0x0102d320: 0x102d320: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102d314: 0x102d314: jal   0x102c720 addiu a0, a0, -25084
+// 0x0102d324: 0x102d324: jal   0x102c730 addiu a0, a0, -25084
 	ldloc.1
 	ldc.i4 -25084
 	add
@@ -1039,12 +1039,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102d31c: 0x102d31c: lw    a0, 4(v0)
+// 0x0102d32c: 0x102d32c: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1053,7 +1053,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102d320: 0x102d320: jal   0x101cd60 addu  s2, v0, zero
+// 0x0102d330: 0x102d330: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -1061,15 +1061,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102d328: 0x102d328: addiu s0, zero, 1
+// 0x0102d338: 0x102d338: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0102d32c: 0x102d32c: lw    a2, 20(s2)
+// 0x0102d33c: 0x102d33c: lw    a2, 20(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1078,33 +1078,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102d330: 0x102d330: addu  a1, v0, zero
+// 0x0102d340: 0x102d340: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102d334: 0x102d334: j	 0x102d364 addiu a0, zero, 1
+// 0x0102d344: 0x102d344: j	 0x102d374 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-	br L_102d364
+	br L_102d374
 // --- basic block ---
-L_102d33c:
-// 0x0102d33c: 0x102d33c: j	 0x102d36c addu  s0, zero, zero
+L_102d34c:
+// 0x0102d34c: 0x102d34c: j	 0x102d37c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_102d36c
+	br L_102d37c
 // --- basic block ---
-L_102d344:
-// 0x0102d344: 0x102d344: jal   0x102c720 sll   zero, zero, 0
+L_102d354:
+// 0x0102d354: 0x102d354: jal   0x102c730 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102d34c: 0x102d34c: lw    a0, 4(v0)
+// 0x0102d35c: 0x102d35c: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1113,7 +1113,7 @@ L_102d344:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102d350: 0x102d350: jal   0x101cd60 addu  s2, v0, zero
+// 0x0102d360: 0x102d360: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -1121,12 +1121,12 @@ L_102d344:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102d358: 0x102d358: lw    a2, 20(s2)
+// 0x0102d368: 0x102d368: lw    a2, 20(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1135,66 +1135,66 @@ L_102d344:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102d35c: 0x102d35c: addu  a0, s0, zero
+// 0x0102d36c: 0x102d36c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102d360: 0x102d360: addu  a1, v0, zero
+// 0x0102d370: 0x102d370: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-L_102d364:
-// 0x0102d364: 0x102d364: jal   0x104fad8 sll   zero, zero, 0
+L_102d374:
+// 0x0102d374: 0x102d374: jal   0x104fae8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102d36c:
-// 0x0102d36c: 0x102d36c: lw    v0, 0(s1)
+L_102d37c:
+// 0x0102d37c: 0x102d37c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102d370: 0x102d370: addiu s0, s0, 1
+// 0x0102d380: 0x102d380: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0102d374: 0x102d374: addiu s1, s1, 4
+// 0x0102d384: 0x102d384: addiu s1, s1, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-// 0x0102d378: 0x102d378: bne   v0, zero, 0x102d344 addu  a0, v0, zero
+// 0x0102d388: 0x102d388: bne   v0, zero, 0x102d354 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brtrue L_102d344
+	brtrue L_102d354
 // --- basic block ---
-// 0x0102d380: 0x102d380: jal   0x104fce4 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_main_show_miniMenu_104fce4()
+// 0x0102d390: 0x102d390: jal   0x104fcf4 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_main_show_miniMenu_104fcf4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102d388: 0x102d388: j	 0x102d3c0 sll   zero, zero, 0
-	br L_102d3c0
+// 0x0102d398: 0x102d398: j	 0x102d3d0 sll   zero, zero, 0
+	br L_102d3d0
 // --- basic block ---
-L_102d390:
-// 0x0102d390: 0x102d390: addiu v0, v0, 6836
+L_102d3a0:
+// 0x0102d3a0: 0x102d3a0: addiu v0, v0, 6836
 	ldloc 5
 	ldc.i4 6836
 	add
 	stloc 5
-// 0x0102d394: 0x102d394: lui   a1, 0x10000
+// 0x0102d3a4: 0x102d3a4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102d398: 0x102d398: sw    v0, 20(sp)
+// 0x0102d3a8: 0x102d3a8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1203,29 +1203,29 @@ L_102d390:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102d39c: 0x102d39c: lui   v0, 0x10010000
+// 0x0102d3ac: 0x102d3ac: lui   v0, 0x10010000
 	ldc.i4 268500992
 	stloc 5
-// 0x0102d3a0: 0x102d3a0: ori   v0, v0, 20497
+// 0x0102d3b0: 0x102d3b0: ori   v0, v0, 20497
 	ldloc 5
 	ldc.i4 20497
 	or
 	stloc 5
-// 0x0102d3a4: 0x102d3a4: addu  a0, s2, zero
+// 0x0102d3b4: 0x102d3b4: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0102d3a8: 0x102d3a8: addiu a1, a1, 18500
+// 0x0102d3b8: 0x102d3b8: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0102d3ac: 0x102d3ac: addu  a2, s1, zero
+// 0x0102d3bc: 0x102d3bc: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x0102d3b0: 0x102d3b0: addu  a3, zero, zero
+// 0x0102d3c0: 0x102d3c0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102d3b4: 0x102d3b4: sw    s0, 16(sp)
+// 0x0102d3c4: 0x102d3c4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1234,7 +1234,7 @@ L_102d390:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102d3b8: 0x102d3b8: jal   0x1097814 sw    v0, 24(sp)
+// 0x0102d3c8: 0x102d3c8: jal   0x1097e5c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1248,14 +1248,14 @@ L_102d390:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_menu_activate_1097814(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_menu_activate_1097e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102d3c0:
-// 0x0102d3c0: 0x102d3c0: lw    ra, 44(sp)
-// 0x0102d3c4: 0x102d3c4: lw    s2, 40(sp)
+L_102d3d0:
+// 0x0102d3d0: 0x102d3d0: lw    ra, 44(sp)
+// 0x0102d3d4: 0x102d3d4: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1264,7 +1264,7 @@ L_102d3c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102d3c8: 0x102d3c8: lw    s1, 36(sp)
+// 0x0102d3d8: 0x102d3d8: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1273,7 +1273,7 @@ L_102d3c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102d3cc: 0x102d3cc: lw    s0, 32(sp)
+// 0x0102d3dc: 0x102d3dc: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1282,7 +1282,7 @@ L_102d3c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102d3d0: 0x102d3d0: jr    ra addiu sp, sp, 48
+// 0x0102d3e0: 0x102d3e0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1294,7 +1294,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 start_side_menu_102d3d8(int32,int32,int32,int32,int32)
+.method public static int32 start_side_menu_102d3e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1329,25 +1329,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d3d8: 0x102d3d8: lui   v0, 0x4090000
+// 0x0102d3e8: 0x102d3e8: lui   v0, 0x4090000
 	ldc.i4 67698688
 	stloc 5
-// 0x0102d3dc: 0x102d3dc: addiu sp, sp, -40
+// 0x0102d3ec: 0x102d3ec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0102d3e0: 0x102d3e0: ori   v0, v0, 16400
+// 0x0102d3f0: 0x102d3f0: ori   v0, v0, 16400
 	ldloc 5
 	ldc.i4 16400
 	or
 	stloc 5
-// 0x0102d3e4: 0x102d3e4: or    v0, a3, v0
+// 0x0102d3f4: 0x102d3f4: or    v0, a3, v0
 	ldloc 4
 	ldloc 5
 	or
 	stloc 5
-// 0x0102d3e8: 0x102d3e8: sw    a2, 20(sp)
+// 0x0102d3f8: 0x102d3f8: sw    a2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1356,17 +1356,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102d3ec: 0x102d3ec: addu  a3, zero, zero
+// 0x0102d3fc: 0x102d3fc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102d3f0: 0x102d3f0: addu  a2, a1, zero
+// 0x0102d400: 0x102d400: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0102d3f4: 0x102d3f4: addu  a1, zero, zero
+// 0x0102d404: 0x102d404: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102d3f8: 0x102d3f8: sw    ra, 36(sp)
-// 0x0102d3fc: 0x102d3fc: sw    v0, 24(sp)
+// 0x0102d408: 0x102d408: sw    ra, 36(sp)
+// 0x0102d40c: 0x102d40c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1375,7 +1375,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102d400: 0x102d400: jal   0x1097814 sw    zero, 16(sp)
+// 0x0102d410: 0x102d410: jal   0x1097e5c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1389,14 +1389,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_menu_activate_1097814(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_menu_activate_1097e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0102d408: 0x102d408: lw    ra, 36(sp)
-// 0x0102d40c: 0x102d40c: sll   zero, zero, 0
-// 0x0102d410: 0x102d410: jr    ra addiu sp, sp, 40
+// 0x0102d418: 0x102d418: lw    ra, 36(sp)
+// 0x0102d41c: 0x102d41c: sll   zero, zero, 0
+// 0x0102d420: 0x102d420: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1408,7 +1408,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 start_rotate_side_menu_102d418(int32,int32,int32,int32,int32)
+.method public static int32 start_rotate_side_menu_102d428(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1443,38 +1443,38 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d418:
-// 0x0102d418: 0x102d418: lui   a0, 0x10000
+L_102d428:
+// 0x0102d428: 0x102d428: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102d41c: 0x102d41c: lui   a1, 0x0
+// 0x0102d42c: 0x102d42c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102d420: 0x102d420: lui   a2, 0x0
+// 0x0102d430: 0x102d430: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0102d424: 0x102d424: addiu sp, sp, -24
+// 0x0102d434: 0x102d434: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d428: 0x102d428: addiu a0, a0, -25076
+// 0x0102d438: 0x102d438: addiu a0, a0, -25076
 	ldloc.1
 	ldc.i4 -25076
 	add
 	stloc.1
-// 0x0102d42c: 0x102d42c: addiu a1, a1, 12064
+// 0x0102d43c: 0x102d43c: addiu a1, a1, 12064
 	ldloc.2
 	ldc.i4 12064
 	add
 	stloc.2
-// 0x0102d430: 0x102d430: addiu a2, a2, 6836
+// 0x0102d440: 0x102d440: addiu a2, a2, 6836
 	ldloc.3
 	ldc.i4 6836
 	add
 	stloc.3
-// 0x0102d434: 0x102d434: sw    ra, 20(sp)
-// 0x0102d438: 0x102d438: jal   0x102d3d8 ori   a3, zero, 32768
+// 0x0102d444: 0x102d444: sw    ra, 20(sp)
+// 0x0102d448: 0x102d448: jal   0x102d3e8 ori   a3, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
@@ -1484,14 +1484,14 @@ L_102d418:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::start_side_menu_102d3d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::start_side_menu_102d3e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102d440: 0x102d440: lw    ra, 20(sp)
-// 0x0102d444: 0x102d444: sll   zero, zero, 0
-// 0x0102d448: 0x102d448: jr    ra addiu sp, sp, 24
+// 0x0102d450: 0x102d450: lw    ra, 20(sp)
+// 0x0102d454: 0x102d454: sll   zero, zero, 0
+// 0x0102d458: 0x102d458: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1503,7 +1503,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 start_zoom_side_menu_102d450(int32,int32,int32,int32,int32)
+.method public static int32 start_zoom_side_menu_102d460(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1538,38 +1538,38 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102d450:
-// 0x0102d450: 0x102d450: lui   a0, 0x10000
+L_102d460:
+// 0x0102d460: 0x102d460: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102d454: 0x102d454: lui   a1, 0x0
+// 0x0102d464: 0x102d464: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102d458: 0x102d458: lui   a2, 0x0
+// 0x0102d468: 0x102d468: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0102d45c: 0x102d45c: addiu sp, sp, -24
+// 0x0102d46c: 0x102d46c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d460: 0x102d460: addiu a0, a0, -25064
+// 0x0102d470: 0x102d470: addiu a0, a0, -25064
 	ldloc.1
 	ldc.i4 -25064
 	add
 	stloc.1
-// 0x0102d464: 0x102d464: addiu a1, a1, 12080
+// 0x0102d474: 0x102d474: addiu a1, a1, 12080
 	ldloc.2
 	ldc.i4 12080
 	add
 	stloc.2
-// 0x0102d468: 0x102d468: addiu a2, a2, 6836
+// 0x0102d478: 0x102d478: addiu a2, a2, 6836
 	ldloc.3
 	ldc.i4 6836
 	add
 	stloc.3
-// 0x0102d46c: 0x102d46c: sw    ra, 20(sp)
-// 0x0102d470: 0x102d470: jal   0x102d3d8 ori   a3, zero, 32768
+// 0x0102d47c: 0x102d47c: sw    ra, 20(sp)
+// 0x0102d480: 0x102d480: jal   0x102d3e8 ori   a3, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
@@ -1579,14 +1579,14 @@ L_102d450:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::start_side_menu_102d3d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::start_side_menu_102d3e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102d478: 0x102d478: lw    ra, 20(sp)
-// 0x0102d47c: 0x102d47c: sll   zero, zero, 0
-// 0x0102d480: 0x102d480: jr    ra addiu sp, sp, 24
+// 0x0102d488: 0x102d488: lw    ra, 20(sp)
+// 0x0102d48c: 0x102d48c: sll   zero, zero, 0
+// 0x0102d490: 0x102d490: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1598,7 +1598,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_set_closed_properly_102d634(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_set_closed_properly_102d644(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -1633,19 +1633,19 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d634: 0x102d634: addu  a1, a0, zero
+// 0x0102d644: 0x102d644: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0102d638: 0x102d638: lui   a0, 0x0
+// 0x0102d648: 0x102d648: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102d63c: 0x102d63c: addiu sp, sp, -24
+// 0x0102d64c: 0x102d64c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d640: 0x102d640: sw    ra, 20(sp)
-// 0x0102d644: 0x102d644: jal   0x100e5c0 addiu a0, a0, 11664
+// 0x0102d650: 0x102d650: sw    ra, 20(sp)
+// 0x0102d654: 0x102d654: jal   0x100e5d0 addiu a0, a0, 11664
 	ldloc.1
 	ldc.i4 11664
 	add
@@ -1655,12 +1655,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102d64c: 0x102d64c: jal   0x100ea50 addu  a0, zero, zero
+// 0x0102d65c: 0x102d65c: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1668,14 +1668,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102d654: 0x102d654: lw    ra, 20(sp)
-// 0x0102d658: 0x102d658: sll   zero, zero, 0
-// 0x0102d65c: 0x102d65c: jr    ra addiu sp, sp, 24
+// 0x0102d664: 0x102d664: lw    ra, 20(sp)
+// 0x0102d668: 0x102d668: sll   zero, zero, 0
+// 0x0102d66c: 0x102d66c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1687,7 +1687,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_start_exit_102d664(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_exit_102d674(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -1725,12 +1725,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d664: 0x102d664: addiu sp, sp, -24
+// 0x0102d674: 0x102d674: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d668: 0x102d668: sw    s0, 16(sp)
+// 0x0102d678: 0x102d678: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1739,40 +1739,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102d66c: 0x102d66c: lui   s0, 0x60000
+// 0x0102d67c: 0x102d67c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0102d670: 0x102d670: lw    v0, -24020(s0)
+// 0x0102d680: 0x102d680: lw    v0, -23556(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6005
+	ldc.i4 -5889
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102d674: 0x102d674: sll   zero, zero, 0
-// 0x0102d678: 0x102d678: beq   v0, zero, 0x102d73c sw    ra, 20(sp)
+// 0x0102d684: 0x102d684: sll   zero, zero, 0
+// 0x0102d688: 0x102d688: beq   v0, zero, 0x102d74c sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_102d73c
+	brfalse L_102d74c
 // --- basic block ---
-// 0x0102d680: 0x102d680: jal   0x103ec44 sll   zero, zero, 0
+// 0x0102d690: 0x102d690: jal   0x103ec54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::single_search_term_103ec44(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::single_search_term_103ec54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d688: 0x102d688: lui   a0, 0x1030000
+// 0x0102d698: 0x102d698: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102d68c: 0x102d68c: jal   0x1038aa0 addiu a0, a0, -6000
+// 0x0102d69c: 0x102d69c: jal   0x1038ab0 addiu a0, a0, -5984
 	ldloc.1
-	ldc.i4 -6000
+	ldc.i4 -5984
 	add
 	stloc.1
 	ldloc.0
@@ -1780,34 +1780,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_unregister_from_event__key_pressed_1038aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_unregister_from_event__key_pressed_1038ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d694: 0x102d694: jal   0x100dca8 sll   zero, zero, 0
+// 0x0102d6a4: 0x102d6a4: jal   0x100dcb8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_shutdown_100dca8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_shutdown_100dcb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d69c: 0x102d69c: jal   0x1059398 sll   zero, zero, 0
+// 0x0102d6ac: 0x102d6ac: jal   0x10593a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_shutdown_1059398(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_shutdown_10593a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6a4: 0x102d6a4: jal   0x1050ad4 addiu a0, zero, 2
+// 0x0102d6b4: 0x102d6b4: jal   0x1050ae4 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1815,157 +1815,157 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6ac: 0x102d6ac: jal   0x1014a54 sll   zero, zero, 0
+// 0x0102d6bc: 0x102d6bc: jal   0x1014a64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_shutdown_1014a54(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_shutdown_1014a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6b4: 0x102d6b4: jal   0x105194c sll   zero, zero, 0
-	call void Cibyl60::roadmap_sound_shutdown_105194c()
+// 0x0102d6c4: 0x102d6c4: jal   0x105195c sll   zero, zero, 0
+	call void Cibyl60::roadmap_sound_shutdown_105195c()
 // --- basic block ---
-// 0x0102d6bc: 0x102d6bc: jal   0x1051a80 sll   zero, zero, 0
+// 0x0102d6cc: 0x102d6cc: jal   0x1051a90 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_net_shutdown_1051a80(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_net_shutdown_1051a90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6c4: 0x102d6c4: jal   0x103788c sll   zero, zero, 0
+// 0x0102d6d4: 0x102d6d4: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6cc: 0x102d6cc: jal   0x10204d4 sll   zero, zero, 0
+// 0x0102d6dc: 0x102d6dc: jal   0x10204e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_shutdown_10204d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_shutdown_10204e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6d4: 0x102d6d4: jal   0x102cdb4 sll   zero, zero, 0
+// 0x0102d6e4: 0x102d6e4: jal   0x102cdc4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_save_trip_102cdb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_save_trip_102cdc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6dc: 0x102d6dc: jal   0x10ac718 sll   zero, zero, 0
+// 0x0102d6ec: 0x102d6ec: jal   0x10acd60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_main_shutdown_10ac718(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_main_shutdown_10acd60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6e4: 0x102d6e4: jal   0x1052a64 sll   zero, zero, 0
+// 0x0102d6f4: 0x102d6f4: jal   0x1052a74 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl61::roadmap_tile_shutdown_1052a64(int32)
+	call int32 Cibyl61::roadmap_tile_shutdown_1052a74(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6ec: 0x102d6ec: jal   0x10312ec sll   zero, zero, 0
+// 0x0102d6fc: 0x102d6fc: jal   0x10312fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_shutdown_10312ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_shutdown_10312fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6f4: 0x102d6f4: jal   0x10a1708 sll   zero, zero, 0
+// 0x0102d704: 0x102d704: jal   0x10a1d50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl120::roadmap_res_shutdown_10a1708(int32,int32,int32,int32,int32)
+	call int32 Cibyl120::roadmap_res_shutdown_10a1d50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d6fc: 0x102d6fc: jal   0x1040108 sll   zero, zero, 0
+// 0x0102d70c: 0x102d70c: jal   0x1040118 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_events_term_1040108(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_events_term_1040118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d704: 0x102d704: jal   0x100f538 sll   zero, zero, 0
+// 0x0102d714: 0x102d714: jal   0x100f548 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_camera_image_shutdown_100f538(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_camera_image_shutdown_100f548(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d70c: 0x102d70c: jal   0x1044bd8 sll   zero, zero, 0
+// 0x0102d71c: 0x102d71c: jal   0x1044be8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_border_shutdown_1044bd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_border_shutdown_1044be8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d714: 0x102d714: jal   0x104afec sll   zero, zero, 0
+// 0x0102d724: 0x102d724: jal   0x104affc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_terminate_104afec(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_social_image_terminate_104affc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d71c: 0x102d71c: jal   0x1053f9c sll   zero, zero, 0
-	call void Cibyl62::roadmap_groups_term_1053f9c()
+// 0x0102d72c: 0x102d72c: jal   0x1053fac sll   zero, zero, 0
+	call void Cibyl62::roadmap_groups_term_1053fac()
 // --- basic block ---
-// 0x0102d724: 0x102d724: jal   0x1050ad4 addiu a0, zero, 1
+// 0x0102d734: 0x102d734: jal   0x1050ae4 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -1973,15 +1973,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d72c: 0x102d72c: lui   a0, 0x0
+// 0x0102d73c: 0x102d73c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102d730: 0x102d730: jal   0x102d634 addiu a0, a0, 20820
+// 0x0102d740: 0x102d740: jal   0x102d644 addiu a0, a0, 20820
 	ldloc.1
 	ldc.i4 20820
 	add
@@ -1991,23 +1991,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_set_closed_properly_102d634(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_set_closed_properly_102d644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d738: 0x102d738: sw    zero, -24020(s0)
+// 0x0102d748: 0x102d748: sw    zero, -23556(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6005
+	ldc.i4 -5889
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_102d73c:
-// 0x0102d73c: 0x102d73c: lw    ra, 20(sp)
-// 0x0102d740: 0x102d740: lw    s0, 16(sp)
+L_102d74c:
+// 0x0102d74c: 0x102d74c: lw    ra, 20(sp)
+// 0x0102d750: 0x102d750: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2016,7 +2016,7 @@ L_102d73c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102d744: 0x102d744: jr    ra addiu sp, sp, 24
+// 0x0102d754: 0x102d754: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2028,7 +2028,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 mark_location_callback_102d74c(int32,int32,int32,int32,int32)
+.method public static int32 mark_location_callback_102d75c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -2066,15 +2066,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d74c: 0x102d74c: addiu sp, sp, -24
+// 0x0102d75c: 0x102d75c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d750: 0x102d750: addiu v0, zero, 3
+// 0x0102d760: 0x102d760: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0102d754: 0x102d754: sw    s0, 16(sp)
+// 0x0102d764: 0x102d764: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2083,29 +2083,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102d758: 0x102d758: sw    ra, 20(sp)
-// 0x0102d75c: 0x102d75c: beq   a0, v0, 0x102d788 addu  s0, a1, zero
+// 0x0102d768: 0x102d768: sw    ra, 20(sp)
+// 0x0102d76c: 0x102d76c: beq   a0, v0, 0x102d798 addu  s0, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 8
-	beq  L_102d788
+	beq  L_102d798
 // --- basic block ---
-// 0x0102d764: 0x102d764: jal   0x1021830 sll   zero, zero, 0
+// 0x0102d774: 0x102d774: jal   0x1021840 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::show_me_on_map_1021830(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::show_me_on_map_1021840(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d76c: 0x102d76c: lui   a0, 0x10000
+// 0x0102d77c: 0x102d77c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102d770: 0x102d770: jal   0x101f044 addiu a0, a0, -29660
+// 0x0102d780: 0x102d780: jal   0x101f054 addiu a0, a0, -29660
 	ldloc.1
 	ldc.i4 -29660
 	add
@@ -2115,27 +2115,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d778: 0x102d778: jal   0x101eee8 sll   zero, zero, 0
+// 0x0102d788: 0x102d788: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d780: 0x102d780: j	 0x102d7b0 sll   zero, zero, 0
-	br L_102d7b0
+// 0x0102d790: 0x102d790: j	 0x102d7c0 sll   zero, zero, 0
+	br L_102d7c0
 // --- basic block ---
-L_102d788:
-// 0x0102d788: 0x102d788: jal   0x103822c addiu a0, zero, 83
+L_102d798:
+// 0x0102d798: 0x102d798: jal   0x103823c addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -2143,39 +2143,39 @@ L_102d788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d790: 0x102d790: jal   0x103788c sll   zero, zero, 0
+// 0x0102d7a0: 0x102d7a0: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d798: 0x102d798: jal   0x101e684 sll   zero, zero, 0
+// 0x0102d7a8: 0x102d7a8: jal   0x101e694 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_current_101e684(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_current_101e694(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d7a0: 0x102d7a0: jal   0x10ac574 addu  a0, v0, zero
+// 0x0102d7b0: 0x102d7b0: jal   0x10acbbc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	call void Cibyl129::roadmap_trip_save_10ac574()
+	call void Cibyl129::roadmap_trip_save_10acbbc()
 // --- basic block ---
-// 0x0102d7a8: 0x102d7a8: jal   0x1094b64 addu  a0, zero, zero
+// 0x0102d7b8: 0x102d7b8: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2183,20 +2183,20 @@ L_102d788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102d7b0:
-// 0x0102d7b0: 0x102d7b0: lw    a0, 0(s0)
+L_102d7c0:
+// 0x0102d7c0: 0x102d7c0: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102d7b4: 0x102d7b4: jal   0x1000930 sll   zero, zero, 0
+// 0x0102d7c4: 0x102d7c4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2207,7 +2207,7 @@ L_102d7b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d7bc: 0x102d7bc: lw    a0, 4(s0)
+// 0x0102d7cc: 0x102d7cc: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2216,7 +2216,7 @@ L_102d7b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102d7c0: 0x102d7c0: jal   0x1000930 sll   zero, zero, 0
+// 0x0102d7d0: 0x102d7d0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2227,7 +2227,7 @@ L_102d7b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d7c8: 0x102d7c8: lw    a0, 8(s0)
+// 0x0102d7d8: 0x102d7d8: lw    a0, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2236,7 +2236,7 @@ L_102d7b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102d7cc: 0x102d7cc: jal   0x1000930 sll   zero, zero, 0
+// 0x0102d7dc: 0x102d7dc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2247,7 +2247,7 @@ L_102d7b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d7d4: 0x102d7d4: lw    a0, 20(s0)
+// 0x0102d7e4: 0x102d7e4: lw    a0, 20(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2256,7 +2256,7 @@ L_102d7b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102d7d8: 0x102d7d8: jal   0x1000930 sll   zero, zero, 0
+// 0x0102d7e8: 0x102d7e8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2267,7 +2267,7 @@ L_102d7b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d7e0: 0x102d7e0: lw    a0, 24(s0)
+// 0x0102d7f0: 0x102d7f0: lw    a0, 24(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -2276,7 +2276,7 @@ L_102d7b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102d7e4: 0x102d7e4: jal   0x1000930 sll   zero, zero, 0
+// 0x0102d7f4: 0x102d7f4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2287,8 +2287,8 @@ L_102d7b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d7ec: 0x102d7ec: lw    ra, 20(sp)
-// 0x0102d7f0: 0x102d7f0: lw    s0, 16(sp)
+// 0x0102d7fc: 0x102d7fc: lw    ra, 20(sp)
+// 0x0102d800: 0x102d800: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2297,7 +2297,7 @@ L_102d7b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102d7f4: 0x102d7f4: jr    ra addiu sp, sp, 24
+// 0x0102d804: 0x102d804: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2309,7 +2309,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_closed_alerts_quick_menu_102d7fc(int32,int32,int32,int32,int32)
+.method public static int32 on_closed_alerts_quick_menu_102d80c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2344,46 +2344,46 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d7fc: 0x102d7fc: addiu sp, sp, -24
+// 0x0102d80c: 0x102d80c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102d800: 0x102d800: addiu v0, zero, 2
+// 0x0102d810: 0x102d810: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102d804: 0x102d804: beq   a0, v0, 0x102d81c sw    ra, 20(sp)
+// 0x0102d814: 0x102d814: beq   a0, v0, 0x102d82c sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_102d81c
+	beq  L_102d82c
 // --- basic block ---
-// 0x0102d80c: 0x102d80c: beq   a0, zero, 0x102d81c addiu v0, zero, 1
+// 0x0102d81c: 0x102d81c: beq   a0, zero, 0x102d82c addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	brfalse L_102d81c
+	brfalse L_102d82c
 // --- basic block ---
-// 0x0102d814: 0x102d814: bne   a0, v0, 0x102d824 sll   zero, zero, 0
+// 0x0102d824: 0x102d824: bne   a0, v0, 0x102d834 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_102d824
+	bne.un L_102d834
 // --- basic block ---
-L_102d81c:
-// 0x0102d81c: 0x102d81c: jal   0x101eee8 sll   zero, zero, 0
+L_102d82c:
+// 0x0102d82c: 0x102d82c: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_102d824:
-// 0x0102d824: 0x102d824: lw    ra, 20(sp)
-// 0x0102d828: 0x102d828: sll   zero, zero, 0
-// 0x0102d82c: 0x102d82c: jr    ra addiu sp, sp, 24
+L_102d834:
+// 0x0102d834: 0x102d834: lw    ra, 20(sp)
+// 0x0102d838: 0x102d838: sll   zero, zero, 0
+// 0x0102d83c: 0x102d83c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2395,7 +2395,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_continue_102d834(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_continue_102d844(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -2433,13 +2433,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102d834: 0x102d834: addiu sp, sp, -32
+// 0x0102d844: 0x102d844: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102d838: 0x102d838: sw    ra, 28(sp)
-// 0x0102d83c: 0x102d83c: jal   0x101e684 sw    s0, 24(sp)
+// 0x0102d848: 0x102d848: sw    ra, 28(sp)
+// 0x0102d84c: 0x102d84c: jal   0x101e694 sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2453,48 +2453,48 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_current_101e684(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_current_101e694(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d844: 0x102d844: addu  a0, v0, zero
+// 0x0102d854: 0x102d854: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102d848: 0x102d848: jal   0x10ac56c addiu a1, zero, 1
+// 0x0102d858: 0x102d858: jal   0x10acbb4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-	call int32 Cibyl129::roadmap_trip_load_10ac56c()
+	call int32 Cibyl129::roadmap_trip_load_10acbb4()
 	stloc 5
 // --- basic block ---
-// 0x0102d850: 0x102d850: bne   v0, zero, 0x102d860 sll   zero, zero, 0
+// 0x0102d860: 0x102d860: bne   v0, zero, 0x102d870 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102d860
+	brtrue L_102d870
 // --- basic block ---
-// 0x0102d858: 0x102d858: jal   0x101e4b4 sll   zero, zero, 0
+// 0x0102d868: 0x102d868: jal   0x101e4c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_new_101e4b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_new_101e4c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102d860:
-// 0x0102d860: 0x102d860: jal   0x10a4778 sll   zero, zero, 0
+L_102d870:
+// 0x0102d870: 0x102d870: jal   0x10a4dc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_general_settings_init_10a4778(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_general_settings_init_10a4dc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d868: 0x102d868: jal   0x1002dc0 sll   zero, zero, 0
+// 0x0102d878: 0x102d878: jal   0x1002dc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2505,66 +2505,66 @@ L_102d860:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d870: 0x102d870: jal   0x1044508 sll   zero, zero, 0
+// 0x0102d880: 0x102d880: jal   0x1044518 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_1044508(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_1044518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d878: 0x102d878: jal   0x10ac534 sll   zero, zero, 0
-	call void Cibyl129::roadmap_voice_initialize_10ac534()
+// 0x0102d888: 0x102d888: jal   0x10acb7c sll   zero, zero, 0
+	call void Cibyl129::roadmap_voice_initialize_10acb7c()
 // --- basic block ---
-// 0x0102d880: 0x102d880: jal   0x10ac5ac sll   zero, zero, 0
-	call void Cibyl129::roadmap_download_initialize_10ac5ac()
+// 0x0102d890: 0x102d890: jal   0x10acbf4 sll   zero, zero, 0
+	call void Cibyl129::roadmap_download_initialize_10acbf4()
 // --- basic block ---
-// 0x0102d888: 0x102d888: jal   0x101d7f4 sll   zero, zero, 0
+// 0x0102d898: 0x102d898: jal   0x101d804 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_initialize_101d7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_initialize_101d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d890: 0x102d890: jal   0x1051938 sll   zero, zero, 0
-	call int32 Cibyl60::roadmap_sound_initialize_1051938()
+// 0x0102d8a0: 0x102d8a0: jal   0x1051948 sll   zero, zero, 0
+	call int32 Cibyl60::roadmap_sound_initialize_1051948()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d898: 0x102d898: jal   0x103f9ac sll   zero, zero, 0
+// 0x0102d8a8: 0x102d8a8: jal   0x103f9bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_initialize_103f9ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_initialize_103f9bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d8a0: 0x102d8a0: jal   0x103900c sll   zero, zero, 0
+// 0x0102d8b0: 0x102d8b0: jal   0x103901c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::roadmap_phone_keyboard_init_103900c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::roadmap_phone_keyboard_init_103901c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d8a8: 0x102d8a8: lui   a0, 0x0
+// 0x0102d8b8: 0x102d8b8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102d8ac: 0x102d8ac: jal   0x100e348 addiu a0, a0, 11856
+// 0x0102d8bc: 0x102d8bc: jal   0x100e358 addiu a0, a0, 11856
 	ldloc.1
 	ldc.i4 11856
 	add
@@ -2574,23 +2574,23 @@ L_102d860:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d8b4: 0x102d8b4: lui   a1, 0x0
+// 0x0102d8c4: 0x102d8c4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102d8b8: 0x102d8b8: addu  a0, v0, zero
+// 0x0102d8c8: 0x102d8c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102d8bc: 0x102d8bc: addiu a1, a1, 28376
+// 0x0102d8cc: 0x102d8cc: addiu a1, a1, 28376
 	ldloc.2
 	ldc.i4 28376
 	add
 	stloc.2
-// 0x0102d8c0: 0x102d8c0: jal   0x1001b14 addu  s0, v0, zero
+// 0x0102d8d0: 0x102d8d0: jal   0x1001b14 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -2598,19 +2598,19 @@ L_102d860:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d8c8: 0x102d8c8: beq   v0, zero, 0x102d914 sll   zero, zero, 0
+// 0x0102d8d8: 0x102d8d8: beq   v0, zero, 0x102d924 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102d914
+	brfalse L_102d924
 // --- basic block ---
-// 0x0102d8d0: 0x102d8d0: lui   a1, 0x20000
+// 0x0102d8e0: 0x102d8e0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0102d8d4: 0x102d8d4: addiu a1, a1, 6872
+// 0x0102d8e4: 0x102d8e4: addiu a1, a1, 7336
 	ldloc.2
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc.2
-// 0x0102d8d8: 0x102d8d8: jal   0x1001b14 addu  a0, s0, zero
+// 0x0102d8e8: 0x102d8e8: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2618,47 +2618,47 @@ L_102d860:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d8e0: 0x102d8e0: bne   v0, zero, 0x102d8f8 lui   a3, 0x10000
+// 0x0102d8f0: 0x102d8f0: bne   v0, zero, 0x102d908 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_102d8f8
+	brtrue L_102d908
 // --- basic block ---
-// 0x0102d8e8: 0x102d8e8: jal   0x1007630 sll   zero, zero, 0
+// 0x0102d8f8: 0x102d8f8: jal   0x1007640 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_use_metric_1007630(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_use_metric_1007640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d8f0: 0x102d8f0: j	 0x102d91c sll   zero, zero, 0
-	br L_102d91c
+// 0x0102d900: 0x102d900: j	 0x102d92c sll   zero, zero, 0
+	br L_102d92c
 // --- basic block ---
-L_102d8f8:
-// 0x0102d8f8: 0x102d8f8: lui   a1, 0x10000
+L_102d908:
+// 0x0102d908: 0x102d908: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102d8fc: 0x102d8fc: addiu a1, a1, -25252
+// 0x0102d90c: 0x102d90c: addiu a1, a1, -25252
 	ldloc.2
 	ldc.i4 -25252
 	add
 	stloc.2
-// 0x0102d900: 0x102d900: addiu a3, a3, -25004
+// 0x0102d910: 0x102d910: addiu a3, a3, -25004
 	ldloc 4
 	ldc.i4 -25004
 	add
 	stloc 4
-// 0x0102d904: 0x102d904: addiu a0, zero, 4
+// 0x0102d914: 0x102d914: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102d908: 0x102d908: addiu a2, zero, 2538
+// 0x0102d918: 0x102d918: addiu a2, zero, 2538
 	ldc.i4 2538
 	stloc.3
-// 0x0102d90c: 0x102d90c: jal   0x100449c sw    s0, 16(sp)
+// 0x0102d91c: 0x102d91c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2677,97 +2677,97 @@ L_102d8f8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102d914:
-// 0x0102d914: 0x102d914: jal   0x100766c sll   zero, zero, 0
+L_102d924:
+// 0x0102d924: 0x102d924: jal   0x100767c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_use_imperial_100766c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_use_imperial_100767c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102d91c:
-// 0x0102d91c: 0x102d91c: jal   0x1027768 sll   zero, zero, 0
+L_102d92c:
+// 0x0102d92c: 0x102d92c: jal   0x1027778 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_social_initialize_1027768(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_social_initialize_1027778(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d924: 0x102d924: jal   0x1017e34 sll   zero, zero, 0
+// 0x0102d934: 0x102d934: jal   0x1017e44 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_initialize_1017e34(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_initialize_1017e44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d92c: 0x102d92c: jal   0x103eca8 sll   zero, zero, 0
+// 0x0102d93c: 0x102d93c: jal   0x103ecb8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::single_search_init_103eca8(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::single_search_init_103ecb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d934: 0x102d934: jal   0x1034cf4 sll   zero, zero, 0
+// 0x0102d944: 0x102d944: jal   0x1034d04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_init_1034cf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_init_1034d04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d93c: 0x102d93c: jal   0x1043c14 sll   zero, zero, 0
+// 0x0102d94c: 0x102d94c: jal   0x1043c24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_bar_initialize_1043c14(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_bar_initialize_1043c24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d944: 0x102d944: jal   0x103061c sll   zero, zero, 0
+// 0x0102d954: 0x102d954: jal   0x103062c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_screen_obj_initialize_103061c(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_screen_obj_initialize_103062c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d94c: 0x102d94c: jal   0x1016564 sll   zero, zero, 0
+// 0x0102d95c: 0x102d95c: jal   0x1016574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_ticker_initialize_1016564(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_ticker_initialize_1016574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d954: 0x102d954: jal   0x10516e0 addiu a0, zero, 2
+// 0x0102d964: 0x102d964: jal   0x10516f0 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -2775,92 +2775,92 @@ L_102d91c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d95c: 0x102d95c: jal   0x1053854 sll   zero, zero, 0
+// 0x0102d96c: 0x102d96c: jal   0x1053864 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_initialize_1053854(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_initialize_1053864(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d964: 0x102d964: jal   0x104a830 sll   zero, zero, 0
+// 0x0102d974: 0x102d974: jal   0x104a840 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_reminder_init_104a830(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_reminder_init_104a840(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d96c: 0x102d96c: jal   0x104b570 sll   zero, zero, 0
+// 0x0102d97c: 0x102d97c: jal   0x104b580 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_initialize_104b570(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_social_image_initialize_104b580(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d974: 0x102d974: jal   0x10549fc sll   zero, zero, 0
+// 0x0102d984: 0x102d984: jal   0x1054a0c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_init_10549fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_init_1054a0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d97c: 0x102d97c: jal   0x1083cc0 sll   zero, zero, 0
+// 0x0102d98c: 0x102d98c: jal   0x10842e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RTTrafficInfo_Init_1083cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RTTrafficInfo_Init_10842e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d984: 0x102d984: jal   0x1058f8c sll   zero, zero, 0
+// 0x0102d994: 0x102d994: jal   0x1058f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_initialize_1058f8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_initialize_1058f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d98c: 0x102d98c: jal   0x100f5c4 sll   zero, zero, 0
+// 0x0102d99c: 0x102d99c: jal   0x100f5d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_camera_image_initialize_100f5c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_camera_image_initialize_100f5d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d994: 0x102d994: lui   a0, 0x0
+// 0x0102d9a4: 0x102d9a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102d998: 0x102d998: jal   0x100e348 addiu a0, a0, 11664
+// 0x0102d9a8: 0x102d9a8: jal   0x100e358 addiu a0, a0, 11664
 	ldloc.1
 	ldc.i4 11664
 	add
@@ -2870,20 +2870,20 @@ L_102d91c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d9a0: 0x102d9a0: lui   a1, 0x20000
+// 0x0102d9b0: 0x102d9b0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0102d9a4: 0x102d9a4: addu  a0, v0, zero
+// 0x0102d9b4: 0x102d9b4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102d9a8: 0x102d9a8: jal   0x1001b14 addiu a1, a1, 9464
+// 0x0102d9b8: 0x102d9b8: jal   0x1001b14 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.1
@@ -2891,29 +2891,29 @@ L_102d91c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102d9b0: 0x102d9b0: bne   v0, zero, 0x102d9e0 lui   a1, 0x10000
+// 0x0102d9c0: 0x102d9c0: bne   v0, zero, 0x102d9f0 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_102d9e0
+	brtrue L_102d9f0
 // --- basic block ---
-// 0x0102d9b8: 0x102d9b8: lui   a3, 0x10000
+// 0x0102d9c8: 0x102d9c8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102d9bc: 0x102d9bc: addiu a1, a1, -25252
+// 0x0102d9cc: 0x102d9cc: addiu a1, a1, -25252
 	ldloc.2
 	ldc.i4 -25252
 	add
 	stloc.2
-// 0x0102d9c0: 0x102d9c0: addiu a3, a3, -24976
+// 0x0102d9d0: 0x102d9d0: addiu a3, a3, -24976
 	ldloc 4
 	ldc.i4 -24976
 	add
 	stloc 4
-// 0x0102d9c4: 0x102d9c4: addiu a0, zero, 4
+// 0x0102d9d4: 0x102d9d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102d9c8: 0x102d9c8: jal   0x100449c addiu a2, zero, 3160
+// 0x0102d9d8: 0x102d9d8: jal   0x100449c addiu a2, zero, 3160
 	ldc.i4 3160
 	stloc.3
 	ldloc.0
@@ -2926,18 +2926,18 @@ L_102d91c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d9d0: 0x102d9d0: addiu v1, zero, 1
+// 0x0102d9e0: 0x102d9e0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0102d9d4: 0x102d9d4: lui   v0, 0x60000
+// 0x0102d9e4: 0x102d9e4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102d9d8: 0x102d9d8: jal   0x106ade0 sw    v1, -24016(v0)
+// 0x0102d9e8: 0x102d9e8: jal   0x106b404 sw    v1, -23552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6004
+	ldc.i4 -5888
 	add
 	ldloc 6
 	stelem.i4
@@ -2946,18 +2946,18 @@ L_102d91c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_CheckDumpOfflineAfterCrash_106ade0(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_CheckDumpOfflineAfterCrash_106b404(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102d9e0:
-// 0x0102d9e0: 0x102d9e0: lui   a0, 0x20000
+L_102d9f0:
+// 0x0102d9f0: 0x102d9f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0102d9e4: 0x102d9e4: jal   0x102d634 addiu a0, a0, 9464
+// 0x0102d9f4: 0x102d9f4: jal   0x102d644 addiu a0, a0, 9928
 	ldloc.1
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.1
 	ldloc.0
@@ -2965,31 +2965,31 @@ L_102d9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_set_closed_properly_102d634(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_set_closed_properly_102d644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102d9ec: 0x102d9ec: lui   a0, 0x1030000
+// 0x0102d9fc: 0x102d9fc: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102d9f0: 0x102d9f0: addiu v1, zero, 1
+// 0x0102da00: 0x102da00: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0102d9f4: 0x102d9f4: addiu a0, a0, -16068
+// 0x0102da04: 0x102da04: addiu a0, a0, -16052
 	ldloc.1
-	ldc.i4 -16068
+	ldc.i4 -16052
 	add
 	stloc.1
-// 0x0102d9f8: 0x102d9f8: lui   v0, 0x60000
+// 0x0102da08: 0x102da08: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102d9fc: 0x102d9fc: jal   0x106bcfc sw    v1, -24020(v0)
+// 0x0102da0c: 0x102da0c: jal   0x106c320 sw    v1, -23556(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6005
+	ldc.i4 -5889
 	add
 	ldloc 6
 	stelem.i4
@@ -2998,28 +2998,28 @@ L_102d9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da04: 0x102da04: lui   a0, 0x1030000
+// 0x0102da14: 0x102da14: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102da08: 0x102da08: lui   v1, 0x60000
+// 0x0102da18: 0x102da18: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0102da0c: 0x102da0c: addiu a0, a0, -9128
+// 0x0102da1c: 0x102da1c: addiu a0, a0, -9112
 	ldloc.1
-	ldc.i4 -9128
+	ldc.i4 -9112
 	add
 	stloc.1
-// 0x0102da10: 0x102da10: jal   0x10a399c sw    v0, -24012(v1)
+// 0x0102da20: 0x102da20: jal   0x10a3fe4 sw    v0, -23548(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6003
+	ldc.i4 -5887
 	add
 	ldloc 5
 	stelem.i4
@@ -3028,61 +3028,61 @@ L_102d9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_term_of_use_10a399c(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_term_of_use_10a3fe4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da18: 0x102da18: jal   0x102146c sll   zero, zero, 0
+// 0x0102da28: 0x102da28: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da20: 0x102da20: jal   0x1021a54 sll   zero, zero, 0
+// 0x0102da30: 0x102da30: jal   0x1021a64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_restore_view_1021a54(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_restore_view_1021a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da28: 0x102da28: lui   a2, 0x0
+// 0x0102da38: 0x102da38: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0102da2c: 0x102da2c: lui   a3, 0x0
+// 0x0102da3c: 0x102da3c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0102da30: 0x102da30: lui   a1, 0x0
+// 0x0102da40: 0x102da40: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102da34: 0x102da34: lui   a0, 0x10000
+// 0x0102da44: 0x102da44: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102da38: 0x102da38: addiu a2, a2, 11680
+// 0x0102da48: 0x102da48: addiu a2, a2, 11680
 	ldloc.3
 	ldc.i4 11680
 	add
 	stloc.3
-// 0x0102da3c: 0x102da3c: addiu a3, a3, 11780
+// 0x0102da4c: 0x102da4c: addiu a3, a3, 11780
 	ldloc 4
 	ldc.i4 11780
 	add
 	stloc 4
-// 0x0102da40: 0x102da40: addiu a1, a1, 6836
+// 0x0102da50: 0x102da50: addiu a1, a1, 6836
 	ldloc.2
 	ldc.i4 6836
 	add
 	stloc.2
-// 0x0102da44: 0x102da44: jal   0x10294d8 addiu a0, a0, -24948
+// 0x0102da54: 0x102da54: jal   0x10294e8 addiu a0, a0, -24948
 	ldloc.1
 	ldc.i4 -24948
 	add
@@ -3092,28 +3092,28 @@ L_102d9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_10294d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_10294e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da4c: 0x102da4c: jal   0x101460c sll   zero, zero, 0
+// 0x0102da5c: 0x102da5c: jal   0x101461c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_init_101460c(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_init_101461c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da54: 0x102da54: lui   a0, 0x1030000
+// 0x0102da64: 0x102da64: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102da58: 0x102da58: jal   0x1038a70 addiu a0, a0, -6000
+// 0x0102da68: 0x102da68: jal   0x1038a80 addiu a0, a0, -5984
 	ldloc.1
-	ldc.i4 -6000
+	ldc.i4 -5984
 	add
 	stloc.1
 	ldloc.0
@@ -3121,20 +3121,20 @@ L_102d9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_register_to_event__key_pressed_1038a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_register_to_event__key_pressed_1038a80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da60: 0x102da60: lui   a1, 0x1030000
+// 0x0102da70: 0x102da70: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x0102da64: 0x102da64: addiu a1, a1, -12188
+// 0x0102da74: 0x102da74: addiu a1, a1, -12172
 	ldloc.2
-	ldc.i4 -12188
+	ldc.i4 -12172
 	add
 	stloc.2
-// 0x0102da68: 0x102da68: jal   0x104fe98 addiu a0, zero, 500
+// 0x0102da78: 0x102da78: jal   0x104fea8 addiu a0, zero, 500
 	ldc.i4 500
 	stloc.1
 	ldloc.0
@@ -3142,30 +3142,30 @@ L_102d9e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da70: 0x102da70: jal   0x10102cc sll   zero, zero, 0
-	call int32 Cibyl11::roadmap_layer_reset_10102cc()
+// 0x0102da80: 0x102da80: jal   0x10102dc sll   zero, zero, 0
+	call int32 Cibyl11::roadmap_layer_reset_10102dc()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da78: 0x102da78: jal   0x1010a4c sll   zero, zero, 0
+// 0x0102da88: 0x102da88: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102da80: 0x102da80: lw    ra, 28(sp)
-// 0x0102da84: 0x102da84: lw    s0, 24(sp)
+// 0x0102da90: 0x102da90: lw    ra, 28(sp)
+// 0x0102da94: 0x102da94: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3174,7 +3174,7 @@ L_102d9e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102da88: 0x102da88: jr    ra addiu sp, sp, 32
+// 0x0102da98: 0x102da98: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3186,7 +3186,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_remove_gps_102da90(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_remove_gps_102daa0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3221,26 +3221,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102da90: 0x102da90: addiu sp, sp, -24
+// 0x0102daa0: 0x102daa0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102da94: 0x102da94: sw    ra, 20(sp)
-// 0x0102da98: 0x102da98: jal   0x1050eac sll   zero, zero, 0
+// 0x0102daa4: 0x102daa4: sw    ra, 20(sp)
+// 0x0102daa8: 0x102daa8: jal   0x1050ebc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_remove_input_1050eac(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_remove_input_1050ebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102daa0: 0x102daa0: lw    ra, 20(sp)
-// 0x0102daa4: 0x102daa4: sll   zero, zero, 0
-// 0x0102daa8: 0x102daa8: jr    ra addiu sp, sp, 24
+// 0x0102dab0: 0x102dab0: lw    ra, 20(sp)
+// 0x0102dab4: 0x102dab4: sll   zero, zero, 0
+// 0x0102dab8: 0x102dab8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3252,7 +3252,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_add_gps_102dab0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_add_gps_102dac0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3287,18 +3287,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102dab0: 0x102dab0: lui   a1, 0x1030000
+// 0x0102dac0: 0x102dac0: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x0102dab4: 0x102dab4: addiu sp, sp, -24
+// 0x0102dac4: 0x102dac4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102dab8: 0x102dab8: sw    ra, 20(sp)
-// 0x0102dabc: 0x102dabc: jal   0x1050f84 addiu a1, a1, 5972
+// 0x0102dac8: 0x102dac8: sw    ra, 20(sp)
+// 0x0102dacc: 0x102dacc: jal   0x1050f94 addiu a1, a1, 5988
 	ldloc.2
-	ldc.i4 5972
+	ldc.i4 5988
 	add
 	stloc.2
 	ldloc.0
@@ -3306,14 +3306,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_input_1050f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_input_1050f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102dac4: 0x102dac4: lw    ra, 20(sp)
-// 0x0102dac8: 0x102dac8: sll   zero, zero, 0
-// 0x0102dacc: 0x102dacc: jr    ra addiu sp, sp, 24
+// 0x0102dad4: 0x102dad4: lw    ra, 20(sp)
+// 0x0102dad8: 0x102dad8: sll   zero, zero, 0
+// 0x0102dadc: 0x102dadc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3325,7 +3325,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_after_refresh_102dad4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_after_refresh_102dae4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3360,43 +3360,43 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102dad4: 0x102dad4: addiu sp, sp, -32
+// 0x0102dae4: 0x102dae4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102dad8: 0x102dad8: sw    ra, 28(sp)
-// 0x0102dadc: 0x102dadc: jal   0x10ac5a4 sll   zero, zero, 0
-	call int32 Cibyl129::roadmap_download_enabled_10ac5a4()
+// 0x0102dae8: 0x102dae8: sw    ra, 28(sp)
+// 0x0102daec: 0x102daec: jal   0x10acbec sll   zero, zero, 0
+	call int32 Cibyl129::roadmap_download_enabled_10acbec()
 	stloc 5
 // --- basic block ---
-// 0x0102dae4: 0x102dae4: beq   v0, zero, 0x102db2c lui   v0, 0x60000
+// 0x0102daf4: 0x102daf4: beq   v0, zero, 0x102db3c lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_102db2c
+	brfalse L_102db3c
 // --- basic block ---
-// 0x0102daec: 0x102daec: lui   v0, 0xf0000
+// 0x0102dafc: 0x102dafc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0102daf0: 0x102daf0: lw    v0, -30068(v0)
+// 0x0102db00: 0x102db00: lw    v0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102daf4: 0x102daf4: addiu v1, zero, 20
+// 0x0102db04: 0x102db04: addiu v1, zero, 20
 	ldc.i4.s 20
 	stloc 7
-// 0x0102daf8: 0x102daf8: addiu v0, v0, -20
+// 0x0102db08: 0x102db08: addiu v0, v0, -20
 	ldloc 5
 	ldc.i4.s -20
 	add
 	stloc 5
-// 0x0102dafc: 0x102dafc: sw    v1, 20(sp)
+// 0x0102db0c: 0x102db0c: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3405,7 +3405,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102db00: 0x102db00: bgez  v0, 0x102db0c sw    v0, 16(sp)
+// 0x0102db10: 0x102db10: bgez  v0, 0x102db1c sw    v0, 16(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3416,9 +3416,9 @@ __CIBYL_javamethod_begin:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	bge L_102db0c
+	bge L_102db1c
 // --- basic block ---
-// 0x0102db08: 0x102db08: sw    zero, 16(sp)
+// 0x0102db18: 0x102db18: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3427,24 +3427,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_102db0c:
-// 0x0102db0c: 0x102db0c: jal   0x1007a4c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_get_orientation_1007a4c()
+L_102db1c:
+// 0x0102db1c: 0x102db1c: jal   0x1007a5c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_get_orientation_1007a5c()
 	stloc 5
 // --- basic block ---
-// 0x0102db14: 0x102db14: lui   a0, 0x10000
+// 0x0102db24: 0x102db24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102db18: 0x102db18: addiu a0, a0, -21592
+// 0x0102db28: 0x102db28: addiu a0, a0, -21592
 	ldloc.1
 	ldc.i4 -21592
 	add
 	stloc.1
-// 0x0102db1c: 0x102db1c: subu  a2, zero, v0
+// 0x0102db2c: 0x102db2c: subu  a2, zero, v0
 	ldloc 5
 	neg
 	stloc.3
-// 0x0102db20: 0x102db20: jal   0x101bb50 addiu a1, sp, 16
+// 0x0102db30: 0x102db30: jal   0x101bb60 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3454,30 +3454,30 @@ L_102db0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102db28: 0x102db28: lui   v0, 0x60000
+// 0x0102db38: 0x102db38: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_102db2c:
-// 0x0102db2c: 0x102db2c: lw    v0, -24008(v0)
+L_102db3c:
+// 0x0102db3c: 0x102db3c: lw    v0, -23544(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6002
+	ldc.i4 -5886
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102db30: 0x102db30: sll   zero, zero, 0
-// 0x0102db34: 0x102db34: beq   v0, zero, 0x102db44 sll   zero, zero, 0
+// 0x0102db40: 0x102db40: sll   zero, zero, 0
+// 0x0102db44: 0x102db44: beq   v0, zero, 0x102db54 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102db44
+	brfalse L_102db54
 // --- basic block ---
-// 0x0102db3c: 0x102db3c: jalr  v0 sll   zero, zero, 0
+// 0x0102db4c: 0x102db4c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3489,10 +3489,10 @@ L_102db2c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102db44:
-// 0x0102db44: 0x102db44: lw    ra, 28(sp)
-// 0x0102db48: 0x102db48: sll   zero, zero, 0
-// 0x0102db4c: 0x102db4c: jr    ra addiu sp, sp, 32
+L_102db54:
+// 0x0102db54: 0x102db54: lw    ra, 28(sp)
+// 0x0102db58: 0x102db58: sll   zero, zero, 0
+// 0x0102db5c: 0x102db5c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3504,7 +3504,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_update_102db54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_update_102db64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3545,24 +3545,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102db54: 0x102db54: lui   v0, 0x60000
+// 0x0102db64: 0x102db64: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102db58: 0x102db58: lw    v0, -24004(v0)
+// 0x0102db68: 0x102db68: lw    v0, -23540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6001
+	ldc.i4 -5885
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102db5c: 0x102db5c: addiu sp, sp, -32
+// 0x0102db6c: 0x102db6c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102db60: 0x102db60: sw    s1, 24(sp)
+// 0x0102db70: 0x102db70: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3571,7 +3571,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102db64: 0x102db64: sw    s0, 20(sp)
+// 0x0102db74: 0x102db74: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3580,44 +3580,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102db68: 0x102db68: sw    ra, 28(sp)
-// 0x0102db6c: 0x102db6c: addu  s0, a0, zero
+// 0x0102db78: 0x102db78: sw    ra, 28(sp)
+// 0x0102db7c: 0x102db7c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0102db70: 0x102db70: beq   v0, zero, 0x102db84 addu  s1, a2, zero
+// 0x0102db80: 0x102db80: beq   v0, zero, 0x102db94 addu  s1, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 9
-	brfalse L_102db84
+	brfalse L_102db94
 // --- basic block ---
-// 0x0102db78: 0x102db78: lui   v0, 0x60000
+// 0x0102db88: 0x102db88: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102db7c: 0x102db7c: j	 0x102dbfc sw    zero, -24348(v0)
+// 0x0102db8c: 0x102db8c: j	 0x102dc0c sw    zero, -23884(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6087
+	ldc.i4 -5971
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_102dbfc
+	br L_102dc0c
 // --- basic block ---
-L_102db84:
-// 0x0102db84: 0x102db84: jal   0x1004258 sll   zero, zero, 0
+L_102db94:
+// 0x0102db94: 0x102db94: jal   0x1004258 sll   zero, zero, 0
 	call int32 Cibyl3::roadmap_log_reset_stack_1004258()
 	stloc 5
 // --- basic block ---
-// 0x0102db8c: 0x102db8c: lui   a0, 0x20000
+// 0x0102db9c: 0x102db9c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0102db90: 0x102db90: addiu a0, a0, 6792
+// 0x0102dba0: 0x102dba0: addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
-// 0x0102db94: 0x102db94: jal   0x101f76c addu  a1, s1, zero
+// 0x0102dba4: 0x102dba4: jal   0x101f77c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -3625,18 +3625,18 @@ L_102db84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102db9c: 0x102db9c: addu  a1, s0, zero
+// 0x0102dbac: 0x102dbac: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0102dba0: 0x102dba0: addu  a0, s1, zero
+// 0x0102dbb0: 0x102dbb0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0102dba4: 0x102dba4: jal   0x102b1a4 lui   s0, 0x0
+// 0x0102dbb4: 0x102dbb4: jal   0x102b1b4 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -3644,16 +3644,16 @@ L_102db84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_locate_102b1a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_locate_102b1b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102dbac: 0x102dbac: jal   0x1004258 sll   zero, zero, 0
+// 0x0102dbbc: 0x102dbbc: jal   0x1004258 sll   zero, zero, 0
 	call int32 Cibyl3::roadmap_log_reset_stack_1004258()
 	stloc 5
 // --- basic block ---
-// 0x0102dbb4: 0x102dbb4: lw    v0, 12060(s0)
+// 0x0102dbc4: 0x102dbc4: lw    v0, 12060(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3662,25 +3662,25 @@ L_102db84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102dbb8: 0x102dbb8: sll   zero, zero, 0
-// 0x0102dbbc: 0x102dbbc: beq   v0, zero, 0x102dbf4 addiu v1, zero, 1
+// 0x0102dbc8: 0x102dbc8: sll   zero, zero, 0
+// 0x0102dbcc: 0x102dbcc: beq   v0, zero, 0x102dc04 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_102dbf4
+	brfalse L_102dc04
 // --- basic block ---
-// 0x0102dbc4: 0x102dbc4: bgez  v0, 0x102dbdc lui   v0, 0x60000
+// 0x0102dbd4: 0x102dbd4: bgez  v0, 0x102dbec lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
 	ldc.i4.s 0
-	bge L_102dbdc
+	bge L_102dbec
 // --- basic block ---
-// 0x0102dbcc: 0x102dbcc: jal   0x1015cb4 sll   zero, zero, 0
-	call int32 Cibyl16::roadmap_option_is_synchronous_1015cb4()
+// 0x0102dbdc: 0x102dbdc: jal   0x1015cc4 sll   zero, zero, 0
+	call int32 Cibyl16::roadmap_option_is_synchronous_1015cc4()
 	stloc 5
 // --- basic block ---
-// 0x0102dbd4: 0x102dbd4: sw    v0, 12060(s0)
+// 0x0102dbe4: 0x102dbe4: sw    v0, 12060(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3689,16 +3689,16 @@ L_102db84:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102dbd8: 0x102dbd8: lui   v0, 0x60000
+// 0x0102dbe8: 0x102dbe8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_102dbdc:
-// 0x0102dbdc: 0x102dbdc: jal   0x102146c sw    zero, -24348(v0)
+L_102dbec:
+// 0x0102dbec: 0x102dbec: jal   0x102147c sw    zero, -23884(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6087
+	ldc.i4 -5971
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3707,34 +3707,34 @@ L_102dbdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102dbe4: 0x102dbe4: jal   0x1004258 sll   zero, zero, 0
+// 0x0102dbf4: 0x102dbf4: jal   0x1004258 sll   zero, zero, 0
 	call int32 Cibyl3::roadmap_log_reset_stack_1004258()
 	stloc 5
 // --- basic block ---
-// 0x0102dbec: 0x102dbec: j	 0x102dbfc sll   zero, zero, 0
-	br L_102dbfc
+// 0x0102dbfc: 0x102dbfc: j	 0x102dc0c sll   zero, zero, 0
+	br L_102dc0c
 // --- basic block ---
-L_102dbf4:
-// 0x0102dbf4: 0x102dbf4: lui   v0, 0x60000
+L_102dc04:
+// 0x0102dc04: 0x102dc04: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102dbf8: 0x102dbf8: sw    v1, -24348(v0)
+// 0x0102dc08: 0x102dc08: sw    v1, -23884(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6087
+	ldc.i4 -5971
 	add
 	ldloc 7
 	stelem.i4
-L_102dbfc:
-// 0x0102dbfc: 0x102dbfc: lw    ra, 28(sp)
-// 0x0102dc00: 0x102dc00: lw    s1, 24(sp)
+L_102dc0c:
+// 0x0102dc0c: 0x102dc0c: lw    ra, 28(sp)
+// 0x0102dc10: 0x102dc10: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3743,7 +3743,7 @@ L_102dbfc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102dc04: 0x102dc04: lw    s0, 20(sp)
+// 0x0102dc14: 0x102dc14: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3752,7 +3752,7 @@ L_102dbfc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102dc08: 0x102dc08: jr    ra addiu sp, sp, 32
+// 0x0102dc18: 0x102dc18: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3764,7 +3764,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_usage_102dc10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_usage_102dc20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -3805,12 +3805,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102dc10: 0x102dc10: addiu sp, sp, -32
+// 0x0102dc20: 0x102dc20: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102dc14: 0x102dc14: sw    s0, 20(sp)
+// 0x0102dc24: 0x102dc24: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3819,13 +3819,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102dc18: 0x102dc18: lui   a1, 0x0
+// 0x0102dc28: 0x102dc28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102dc1c: 0x102dc1c: lui   s0, 0x0
+// 0x0102dc2c: 0x102dc2c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0102dc20: 0x102dc20: sw    s1, 24(sp)
+// 0x0102dc30: 0x102dc30: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3834,16 +3834,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0102dc24: 0x102dc24: addiu a1, a1, 11920
+// 0x0102dc34: 0x102dc34: addiu a1, a1, 11920
 	ldloc.2
 	ldc.i4 11920
 	add
 	stloc.2
-// 0x0102dc28: 0x102dc28: addu  s1, a0, zero
+// 0x0102dc38: 0x102dc38: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0102dc2c: 0x102dc2c: sw    ra, 28(sp)
-// 0x0102dc30: 0x102dc30: jal   0x1028f38 addiu a0, s0, 6836
+// 0x0102dc3c: 0x102dc3c: sw    ra, 28(sp)
+// 0x0102dc40: 0x102dc40: jal   0x1028f48 addiu a0, s0, 6836
 	ldloc 6
 	ldc.i4 6836
 	add
@@ -3853,15 +3853,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_keymap_1028f38(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_keymap_1028f48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0102dc38: 0x102dc38: addu  a0, s1, zero
+// 0x0102dc48: 0x102dc48: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0102dc3c: 0x102dc3c: jal   0x1028de8 addiu a1, s0, 6836
+// 0x0102dc4c: 0x102dc4c: jal   0x1028df8 addiu a1, s0, 6836
 	ldloc 6
 	ldc.i4 6836
 	add
@@ -3871,13 +3871,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_usage_1028de8(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_usage_1028df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0102dc44: 0x102dc44: lw    ra, 28(sp)
-// 0x0102dc48: 0x102dc48: lw    s1, 24(sp)
+// 0x0102dc54: 0x102dc54: lw    ra, 28(sp)
+// 0x0102dc58: 0x102dc58: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3886,7 +3886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102dc4c: 0x102dc4c: lw    s0, 20(sp)
+// 0x0102dc5c: 0x102dc5c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3895,7 +3895,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102dc50: 0x102dc50: jr    ra addiu sp, sp, 32
+// 0x0102dc60: 0x102dc60: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3907,7 +3907,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_start_after_intro_screen_102dc58(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_after_intro_screen_102dc68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -3942,46 +3942,46 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102dc58: 0x102dc58: addiu sp, sp, -24
+// 0x0102dc68: 0x102dc68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102dc5c: 0x102dc5c: sw    ra, 20(sp)
-// 0x0102dc60: 0x102dc60: jal   0x1071abc sll   zero, zero, 0
+// 0x0102dc6c: 0x102dc6c: sw    ra, 20(sp)
+// 0x0102dc70: 0x102dc70: jal   0x10720e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::Realtime_Initialize_1071abc(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::Realtime_Initialize_10720e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102dc68: 0x102dc68: bne   v0, zero, 0x102dc88 lui   a1, 0x10000
+// 0x0102dc78: 0x102dc78: bne   v0, zero, 0x102dc98 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_102dc88
+	brtrue L_102dc98
 // --- basic block ---
-// 0x0102dc70: 0x102dc70: lui   a3, 0x10000
+// 0x0102dc80: 0x102dc80: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102dc74: 0x102dc74: addiu a1, a1, -25252
+// 0x0102dc84: 0x102dc84: addiu a1, a1, -25252
 	ldloc.2
 	ldc.i4 -25252
 	add
 	stloc.2
-// 0x0102dc78: 0x102dc78: addiu a3, a3, -24940
+// 0x0102dc88: 0x102dc88: addiu a3, a3, -24940
 	ldloc 4
 	ldc.i4 -24940
 	add
 	stloc 4
-// 0x0102dc7c: 0x102dc7c: addiu a0, zero, 4
+// 0x0102dc8c: 0x102dc8c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102dc80: 0x102dc80: jal   0x100449c addiu a2, zero, 2643
+// 0x0102dc90: 0x102dc90: jal   0x100449c addiu a2, zero, 2643
 	ldc.i4 2643
 	stloc.3
 	ldloc.0
@@ -3994,10 +3994,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102dc88:
-// 0x0102dc88: 0x102dc88: lw    ra, 20(sp)
-// 0x0102dc8c: 0x102dc8c: sll   zero, zero, 0
-// 0x0102dc90: 0x102dc90: jr    ra addiu sp, sp, 24
+L_102dc98:
+// 0x0102dc98: 0x102dc98: lw    ra, 20(sp)
+// 0x0102dc9c: 0x102dc9c: sll   zero, zero, 0
+// 0x0102dca0: 0x102dca0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4009,7 +4009,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_get_first_time_use_102dc98(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_get_first_time_use_102dca8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4044,16 +4044,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102dc98: 0x102dc98: lui   a0, 0x0
+// 0x0102dca8: 0x102dca8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102dc9c: 0x102dc9c: addiu sp, sp, -24
+// 0x0102dcac: 0x102dcac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102dca0: 0x102dca0: sw    ra, 20(sp)
-// 0x0102dca4: 0x102dca4: jal   0x100e788 addiu a0, a0, 11904
+// 0x0102dcb0: 0x102dcb0: sw    ra, 20(sp)
+// 0x0102dcb4: 0x102dcb4: jal   0x100e798 addiu a0, a0, 11904
 	ldloc.1
 	ldc.i4 11904
 	add
@@ -4063,14 +4063,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0102dcac: 0x102dcac: lw    ra, 20(sp)
-// 0x0102dcb0: 0x102dcb0: sll   zero, zero, 0
-// 0x0102dcb4: 0x102dcb4: jr    ra addiu sp, sp, 24
+// 0x0102dcbc: 0x102dcbc: lw    ra, 20(sp)
+// 0x0102dcc0: 0x102dcc0: sll   zero, zero, 0
+// 0x0102dcc4: 0x102dcc4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4082,7 +4082,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_start_102dcbc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_102dccc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4132,12 +4132,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102dcbc: 0x102dcbc: addiu sp, sp, -80
+// 0x0102dccc: 0x102dccc: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0102dcc0: 0x102dcc0: sw    s4, 72(sp)
+// 0x0102dcd0: 0x102dcd0: sw    s4, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4146,7 +4146,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102dcc4: 0x102dcc4: sw    s1, 60(sp)
+// 0x0102dcd4: 0x102dcd4: sw    s1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4155,8 +4155,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102dcc8: 0x102dcc8: sw    ra, 76(sp)
-// 0x0102dccc: 0x102dccc: sw    s3, 68(sp)
+// 0x0102dcd8: 0x102dcd8: sw    ra, 76(sp)
+// 0x0102dcdc: 0x102dcdc: sw    s3, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4165,7 +4165,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102dcd0: 0x102dcd0: sw    s2, 64(sp)
+// 0x0102dce0: 0x102dce0: sw    s2, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4174,7 +4174,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102dcd4: 0x102dcd4: sw    s0, 56(sp)
+// 0x0102dce4: 0x102dce4: sw    s0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4183,28 +4183,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102dcd8: 0x102dcd8: addu  s4, a0, zero
+// 0x0102dce8: 0x102dce8: addu  s4, a0, zero
 	ldloc.1
 	stloc 12
-// 0x0102dcdc: 0x102dcdc: addu  s1, a1, zero
+// 0x0102dcec: 0x102dcec: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0102dce0: 0x102dce0: addiu v1, sp, 40
+// 0x0102dcf0: 0x102dcf0: addiu v1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 6
-// 0x0102dce4: 0x102dce4: cibyl_sysc_arg 0x3
+// 0x0102dcf4: 0x102dcf4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0102dce8: 0x102dce8: cibyl_sysc 0x41d
+// 0x0102dcf8: 0x102dcf8: cibyl_sysc 0x41d
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x0102dcec: 0x102dcec: addu  v1, v0, zero
+// 0x0102dcfc: 0x102dcfc: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0102dcf0: 0x102dcf0: lui   a0, 0x10000
+// 0x0102dd00: 0x102dd00: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102dcf4: 0x102dcf4: lw    a1, 44(sp)
+// 0x0102dd04: 0x102dd04: lw    a1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4213,7 +4213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102dcf8: 0x102dcf8: jal   0x1000e78 addiu a0, a0, -24884
+// 0x0102dd08: 0x102dd08: jal   0x1000e78 addiu a0, a0, -24884
 	ldloc.1
 	ldc.i4 -24884
 	add
@@ -4228,7 +4228,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dd00: 0x102dd00: jal   0x100f31c lui   s0, 0x10000
+// 0x0102dd10: 0x102dd10: jal   0x100f32c lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
 	ldloc.0
@@ -4236,47 +4236,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_config_initialize_100f31c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_config_initialize_100f32c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dd08: 0x102dd08: lui   a1, 0x0
+// 0x0102dd18: 0x102dd18: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102dd0c: 0x102dd0c: lui   a3, 0x0
+// 0x0102dd1c: 0x102dd1c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0102dd10: 0x102dd10: lui   v0, 0x20000
+// 0x0102dd20: 0x102dd20: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0102dd14: 0x102dd14: addiu a0, s0, 12560
+// 0x0102dd24: 0x102dd24: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0102dd18: 0x102dd18: addiu a1, a1, 11856
+// 0x0102dd28: 0x102dd28: addiu a1, a1, 11856
 	ldloc.2
 	ldc.i4 11856
 	add
 	stloc.2
-// 0x0102dd1c: 0x102dd1c: addiu a3, a3, 28376
+// 0x0102dd2c: 0x102dd2c: addiu a3, a3, 28376
 	ldloc 4
 	ldc.i4 28376
 	add
 	stloc 4
-// 0x0102dd20: 0x102dd20: addu  a2, zero, zero
+// 0x0102dd30: 0x102dd30: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102dd24: 0x102dd24: addiu v0, v0, 6872
+// 0x0102dd34: 0x102dd34: addiu v0, v0, 7336
 	ldloc 5
-	ldc.i4 6872
+	ldc.i4 7336
 	add
 	stloc 5
-// 0x0102dd28: 0x102dd28: lui   s2, 0x0
+// 0x0102dd38: 0x102dd38: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0102dd2c: 0x102dd2c: sw    v0, 16(sp)
+// 0x0102dd3c: 0x102dd3c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4285,7 +4285,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102dd30: 0x102dd30: sw    zero, 20(sp)
+// 0x0102dd40: 0x102dd40: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4294,7 +4294,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102dd34: 0x102dd34: jal   0x100edf8 lui   s3, 0x20000
+// 0x0102dd44: 0x102dd44: jal   0x100ee08 lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 11
 	ldloc.0
@@ -4302,38 +4302,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dd3c: 0x102dd3c: lui   a1, 0x0
+// 0x0102dd4c: 0x102dd4c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102dd40: 0x102dd40: addiu s3, s3, 9464
+// 0x0102dd50: 0x102dd50: addiu s3, s3, 9928
 	ldloc 11
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 11
-// 0x0102dd44: 0x102dd44: addiu a0, s0, 12560
+// 0x0102dd54: 0x102dd54: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0102dd48: 0x102dd48: addiu a3, s2, 20820
+// 0x0102dd58: 0x102dd58: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0102dd4c: 0x102dd4c: addiu a1, a1, 11872
+// 0x0102dd5c: 0x102dd5c: addiu a1, a1, 11872
 	ldloc.2
 	ldc.i4 11872
 	add
 	stloc.2
-// 0x0102dd50: 0x102dd50: addu  a2, zero, zero
+// 0x0102dd60: 0x102dd60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102dd54: 0x102dd54: sw    s3, 16(sp)
+// 0x0102dd64: 0x102dd64: sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4342,7 +4342,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102dd58: 0x102dd58: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0102dd68: 0x102dd68: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4356,33 +4356,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dd60: 0x102dd60: lui   a1, 0x0
+// 0x0102dd70: 0x102dd70: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102dd64: 0x102dd64: lui   a2, 0x10000
+// 0x0102dd74: 0x102dd74: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102dd68: 0x102dd68: addiu a0, s0, 12560
+// 0x0102dd78: 0x102dd78: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0102dd6c: 0x102dd6c: addiu a1, a1, 11888
+// 0x0102dd7c: 0x102dd7c: addiu a1, a1, 11888
 	ldloc.2
 	ldc.i4 11888
 	add
 	stloc.2
-// 0x0102dd70: 0x102dd70: addiu a2, a2, -24860
+// 0x0102dd80: 0x102dd80: addiu a2, a2, -24860
 	ldloc.3
 	ldc.i4 -24860
 	add
 	stloc.3
-// 0x0102dd74: 0x102dd74: jal   0x100edb0 addu  a3, zero, zero
+// 0x0102dd84: 0x102dd84: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4390,33 +4390,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dd7c: 0x102dd7c: lui   a1, 0x0
+// 0x0102dd8c: 0x102dd8c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102dd80: 0x102dd80: lui   a2, 0x10000
+// 0x0102dd90: 0x102dd90: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102dd84: 0x102dd84: addiu a0, s0, 12560
+// 0x0102dd94: 0x102dd94: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0102dd88: 0x102dd88: addiu a1, a1, 6804
+// 0x0102dd98: 0x102dd98: addiu a1, a1, 6804
 	ldloc.2
 	ldc.i4 6804
 	add
 	stloc.2
-// 0x0102dd8c: 0x102dd8c: addiu a2, a2, 18500
+// 0x0102dd9c: 0x102dd9c: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0102dd90: 0x102dd90: jal   0x100edb0 addu  a3, zero, zero
+// 0x0102dda0: 0x102dda0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4424,36 +4424,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dd98: 0x102dd98: lui   s0, 0x20000
+// 0x0102dda8: 0x102dda8: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0102dd9c: 0x102dd9c: lui   a1, 0x0
+// 0x0102ddac: 0x102ddac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102dda0: 0x102dda0: lui   a2, 0x10000
+// 0x0102ddb0: 0x102ddb0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102dda4: 0x102dda4: addiu a1, a1, 11904
+// 0x0102ddb4: 0x102ddb4: addiu a1, a1, 11904
 	ldloc.2
 	ldc.i4 11904
 	add
 	stloc.2
-// 0x0102dda8: 0x102dda8: addiu a2, a2, 9424
+// 0x0102ddb8: 0x102ddb8: addiu a2, a2, 9420
 	ldloc.3
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.3
-// 0x0102ddac: 0x102ddac: addiu a0, s0, -26888
+// 0x0102ddbc: 0x102ddbc: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0102ddb0: 0x102ddb0: jal   0x100edb0 addu  a3, zero, zero
+// 0x0102ddc0: 0x102ddc0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4461,36 +4461,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ddb8: 0x102ddb8: lui   a0, 0x10000
+// 0x0102ddc8: 0x102ddc8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102ddbc: 0x102ddbc: lui   a1, 0x0
+// 0x0102ddcc: 0x102ddcc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102ddc0: 0x102ddc0: addiu a3, s2, 20820
+// 0x0102ddd0: 0x102ddd0: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0102ddc4: 0x102ddc4: addiu a0, a0, 18248
+// 0x0102ddd4: 0x102ddd4: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0102ddc8: 0x102ddc8: addiu a1, a1, 11664
+// 0x0102ddd8: 0x102ddd8: addiu a1, a1, 11664
 	ldloc.2
 	ldc.i4 11664
 	add
 	stloc.2
-// 0x0102ddcc: 0x102ddcc: addu  a2, zero, zero
+// 0x0102dddc: 0x102dddc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102ddd0: 0x102ddd0: sw    s3, 16(sp)
+// 0x0102dde0: 0x102dde0: sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4499,7 +4499,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102ddd4: 0x102ddd4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0102dde4: 0x102dde4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4513,44 +4513,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dddc: 0x102dddc: lui   a1, 0x0
+// 0x0102ddec: 0x102ddec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102dde0: 0x102dde0: lui   v0, 0x10000
+// 0x0102ddf0: 0x102ddf0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0102dde4: 0x102dde4: addu  a3, s3, zero
+// 0x0102ddf4: 0x102ddf4: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x0102dde8: 0x102dde8: addiu a0, s0, -26888
+// 0x0102ddf8: 0x102ddf8: addiu a0, s0, -26424
 	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0102ddec: 0x102ddec: addiu a1, a1, 6820
+// 0x0102ddfc: 0x102ddfc: addiu a1, a1, 6820
 	ldloc.2
 	ldc.i4 6820
 	add
 	stloc.2
-// 0x0102ddf0: 0x102ddf0: addu  a2, zero, zero
+// 0x0102de00: 0x102de00: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102ddf4: 0x102ddf4: addiu v0, v0, -24852
+// 0x0102de04: 0x102de04: addiu v0, v0, -24852
 	ldloc 5
 	ldc.i4 -24852
 	add
 	stloc 5
-// 0x0102ddf8: 0x102ddf8: addiu s2, s2, 20820
+// 0x0102de08: 0x102de08: addiu s2, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 10
-// 0x0102ddfc: 0x102ddfc: sw    s2, 16(sp)
+// 0x0102de0c: 0x102de0c: sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4559,7 +4559,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102de00: 0x102de00: sw    v0, 20(sp)
+// 0x0102de10: 0x102de10: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4568,7 +4568,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102de04: 0x102de04: jal   0x100edf8 sw    zero, 24(sp)
+// 0x0102de14: 0x102de14: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4582,23 +4582,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102de0c: 0x102de0c: lui   a2, 0x1030000
+// 0x0102de1c: 0x102de1c: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x0102de10: 0x102de10: addu  a0, s4, zero
+// 0x0102de20: 0x102de20: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0102de14: 0x102de14: addu  a1, s1, zero
+// 0x0102de24: 0x102de24: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0102de18: 0x102de18: jal   0x1015e18 addiu a2, a2, -9200
+// 0x0102de28: 0x102de28: jal   0x1015e28 addiu a2, a2, -9184
 	ldloc.3
-	ldc.i4 -9200
+	ldc.i4 -9184
 	add
 	stloc.3
 	ldloc.0
@@ -4606,62 +4606,62 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_option_1015e18(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_option_1015e28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102de20: 0x102de20: beq   s1, zero, 0x102de2c addu  a0, zero, zero
+// 0x0102de30: 0x102de30: beq   s1, zero, 0x102de3c addu  a0, zero, zero
 	ldloc 9
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_102de2c
+	brfalse L_102de3c
 // --- basic block ---
-// 0x0102de28: 0x102de28: lw    a0, 0(s1)
+// 0x0102de38: 0x102de38: lw    a0, 0(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-L_102de2c:
-// 0x0102de2c: 0x102de2c: jal   0x10ac5ec sll   zero, zero, 0
-	call void Cibyl129::roadmap_spawn_initialize_10ac5ec()
+L_102de3c:
+// 0x0102de3c: 0x102de3c: jal   0x10acc34 sll   zero, zero, 0
+	call void Cibyl129::roadmap_spawn_initialize_10acc34()
 // --- basic block ---
-// 0x0102de34: 0x102de34: jal   0x102dc98 sll   zero, zero, 0
+// 0x0102de44: 0x102de44: jal   0x102dca8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_get_first_time_use_102dc98(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_get_first_time_use_102dca8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102de3c: 0x102de3c: addiu v1, zero, -1
+// 0x0102de4c: 0x102de4c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0102de40: 0x102de40: bne   v0, v1, 0x102de6c sll   zero, zero, 0
+// 0x0102de50: 0x102de50: bne   v0, v1, 0x102de7c sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_102de6c
+	bne.un L_102de7c
 // --- basic block ---
-// 0x0102de48: 0x102de48: addu  a1, zero, zero
+// 0x0102de58: 0x102de58: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102de4c: 0x102de4c: cibyl_sysc_arg 0x5
+// 0x0102de5c: 0x102de5c: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0102de50: 0x102de50: cibyl_sysc 0x43d
+// 0x0102de60: 0x102de60: cibyl_sysc 0x43d
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0102de54: 0x102de54: addu  a1, v0, zero
+// 0x0102de64: 0x102de64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102de58: 0x102de58: lui   a0, 0x0
+// 0x0102de68: 0x102de68: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102de5c: 0x102de5c: jal   0x100e610 addiu a0, a0, 11904
+// 0x0102de6c: 0x102de6c: jal   0x100e620 addiu a0, a0, 11904
 	ldloc.1
 	ldc.i4 11904
 	add
@@ -4671,12 +4671,12 @@ L_102de2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102de64: 0x102de64: jal   0x100ea50 addu  a0, zero, zero
+// 0x0102de74: 0x102de74: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4684,18 +4684,18 @@ L_102de2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102de6c:
-// 0x0102de6c: 0x102de6c: jal   0x10ac674 lui   s0, 0x0
+L_102de7c:
+// 0x0102de7c: 0x102de7c: jal   0x10accbc lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-	call void Cibyl129::roadmap_net_initialize_10ac674()
+	call void Cibyl129::roadmap_net_initialize_10accbc()
 // --- basic block ---
-// 0x0102de74: 0x102de74: jal   0x1040134 lui   s1, 0x60000
+// 0x0102de84: 0x102de84: jal   0x1040144 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
 	ldloc.0
@@ -4703,242 +4703,242 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_events_init_1040134(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_events_init_1040144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102de7c: 0x102de7c: lui   a0, 0x1050000
+// 0x0102de8c: 0x102de8c: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0102de80: 0x102de80: jal   0x1004250 addiu a0, a0, -16056
+// 0x0102de90: 0x102de90: jal   0x1004250 addiu a0, a0, -16040
 	ldloc.1
-	ldc.i4 -16056
+	ldc.i4 -16040
 	add
 	stloc.1
 	call void Cibyl3::roadmap_log_register_msgbox_1004250()
 // --- basic block ---
-// 0x0102de88: 0x102de88: jal   0x1015d24 sll   zero, zero, 0
+// 0x0102de98: 0x102de98: jal   0x1015d34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_option_initialize_1015d24(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_option_initialize_1015d34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102de90: 0x102de90: jal   0x1034314 sll   zero, zero, 0
+// 0x0102dea0: 0x102dea0: jal   0x1034324 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_alerter_initialize_1034314(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_alerter_initialize_1034324(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102de98: 0x102de98: jal   0x1009d18 sll   zero, zero, 0
+// 0x0102dea8: 0x102dea8: jal   0x1009d28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_initialize_1009d18(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_initialize_1009d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dea0: 0x102dea0: jal   0x101df7c sll   zero, zero, 0
+// 0x0102deb0: 0x102deb0: jal   0x101df8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_initialize_101df7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_initialize_101df8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dea8: 0x102dea8: jal   0x104bb00 sll   zero, zero, 0
+// 0x0102deb8: 0x102deb8: jal   0x104bb10 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_initialize_104bb00(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_initialize_104bb10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102deb0: 0x102deb0: jal   0x102055c sll   zero, zero, 0
+// 0x0102dec0: 0x102dec0: jal   0x102056c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_initialize_102055c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_initialize_102056c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102deb8: 0x102deb8: jal   0x102be88 sll   zero, zero, 0
+// 0x0102dec8: 0x102dec8: jal   0x102be98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_fuzzy_initialize_102be88(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_fuzzy_initialize_102be98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dec0: 0x102dec0: jal   0x10a9b94 sll   zero, zero, 0
+// 0x0102ded0: 0x102ded0: jal   0x10aa1dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_trip_server_init_10a9b94(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_trip_server_init_10aa1dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dec8: 0x102dec8: jal   0x1048c74 sll   zero, zero, 0
+// 0x0102ded8: 0x102ded8: jal   0x1048c84 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_routes_init_1048c74(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_routes_init_1048c84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ded0: 0x102ded0: jal   0x1029f64 sll   zero, zero, 0
+// 0x0102dee0: 0x102dee0: jal   0x1029f74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_initialize_1029f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_initialize_1029f74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ded8: 0x102ded8: jal   0x10bfac8 sll   zero, zero, 0
+// 0x0102dee8: 0x102dee8: jal   0x10c0110 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_label_initialize_10bfac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_label_initialize_10c0110(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dee0: 0x102dee0: jal   0x10190a8 sll   zero, zero, 0
+// 0x0102def0: 0x102def0: jal   0x10190b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_initialize_10190a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_initialize_10190b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dee8: 0x102dee8: jal   0x100dccc sll   zero, zero, 0
+// 0x0102def8: 0x102def8: jal   0x100dcdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_initialize_100dccc(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_initialize_100dcdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102def0: 0x102def0: jal   0x1052a5c sll   zero, zero, 0
-	call int32 Cibyl61::roadmap_tile_initialize_1052a5c()
+// 0x0102df00: 0x102df00: jal   0x1052a6c sll   zero, zero, 0
+	call int32 Cibyl61::roadmap_tile_initialize_1052a6c()
 	stloc 5
 // --- basic block ---
-// 0x0102def8: 0x102def8: jal   0x1031f64 sll   zero, zero, 0
+// 0x0102df08: 0x102df08: jal   0x1031f74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_initialize_1031f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_initialize_1031f74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df00: 0x102df00: jal   0x1038478 sll   zero, zero, 0
+// 0x0102df10: 0x102df10: jal   0x1038488 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_initialize_1038478(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_initialize_1038488(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df08: 0x102df08: jal   0x101dae0 sll   zero, zero, 0
+// 0x0102df18: 0x102df18: jal   0x101daf0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_initialize_101dae0(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_initialize_101daf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df10: 0x102df10: jal   0x10ac67c sll   zero, zero, 0
-	call int32 Cibyl129::roadmap_device_initialize_10ac67c()
+// 0x0102df20: 0x102df20: jal   0x10accc4 sll   zero, zero, 0
+	call int32 Cibyl129::roadmap_device_initialize_10accc4()
 	stloc 5
 // --- basic block ---
-// 0x0102df18: 0x102df18: jal   0x10a9b24 sll   zero, zero, 0
+// 0x0102df28: 0x102df28: jal   0x10aa16c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_login_initialize_10a9b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_login_initialize_10aa16c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df20: 0x102df20: jal   0x10a747c sll   zero, zero, 0
+// 0x0102df30: 0x102df30: jal   0x10a7ac4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl125::roadmap_map_settings_init_10a747c(int32,int32,int32,int32,int32)
+	call int32 Cibyl125::roadmap_map_settings_init_10a7ac4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df28: 0x102df28: jal   0x10a8a3c sll   zero, zero, 0
+// 0x0102df38: 0x102df38: jal   0x10a9084 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_download_settings_init_10a8a3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_download_settings_init_10a9084(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df30: 0x102df30: lui   a0, 0x10000
+// 0x0102df40: 0x102df40: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102df34: 0x102df34: jal   0x101cd60 addiu a0, a0, -24836
+// 0x0102df44: 0x102df44: jal   0x101cd70 addiu a0, a0, -24836
 	ldloc.1
 	ldc.i4 -24836
 	add
@@ -4948,20 +4948,20 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df3c: 0x102df3c: lui   a0, 0x1030000
+// 0x0102df4c: 0x102df4c: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102df40: 0x102df40: addiu a0, a0, -9388
+// 0x0102df50: 0x102df50: addiu a0, a0, -9372
 	ldloc.1
-	ldc.i4 -9388
+	ldc.i4 -9372
 	add
 	stloc.1
-// 0x0102df44: 0x102df44: jal   0x1030d38 sw    v0, 11660(s0)
+// 0x0102df54: 0x102df54: jal   0x1030d48 sw    v0, 11660(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4973,15 +4973,15 @@ L_102de6c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl35::roadmap_gps_register_listener_1030d38(int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_listener_1030d48(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df4c: 0x102df4c: lui   a0, 0x10000
+// 0x0102df5c: 0x102df5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102df50: 0x102df50: jal   0x101ca0c addiu a0, a0, -31052
+// 0x0102df60: 0x102df60: jal   0x101ca1c addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -4991,25 +4991,25 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df58: 0x102df58: lui   a0, 0x10000
+// 0x0102df68: 0x102df68: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102df5c: 0x102df5c: addiu a0, a0, -24828
+// 0x0102df6c: 0x102df6c: addiu a0, a0, -24828
 	ldloc.1
 	ldc.i4 -24828
 	add
 	stloc.1
-// 0x0102df60: 0x102df60: jal   0x101ca0c sw    v0, -23904(s1)
+// 0x0102df70: 0x102df70: jal   0x101ca1c sw    v0, -23440(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5976
+	ldc.i4 -5860
 	add
 	ldloc 5
 	stelem.i4
@@ -5018,30 +5018,30 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df68: 0x102df68: lw    a1, -23904(s1)
+// 0x0102df78: 0x102df78: lw    a1, -23440(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5976
+	ldc.i4 -5860
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102df6c: 0x102df6c: addu  a3, zero, zero
+// 0x0102df7c: 0x102df7c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102df70: 0x102df70: addu  a2, zero, zero
+// 0x0102df80: 0x102df80: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102df74: 0x102df74: addu  a0, v0, zero
+// 0x0102df84: 0x102df84: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102df78: 0x102df78: sw    zero, 16(sp)
+// 0x0102df88: 0x102df88: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5050,7 +5050,7 @@ L_102de6c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102df7c: 0x102df7c: sw    zero, 20(sp)
+// 0x0102df8c: 0x102df8c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5059,7 +5059,7 @@ L_102de6c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102df80: 0x102df80: sw    zero, 24(sp)
+// 0x0102df90: 0x102df90: sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5068,7 +5068,7 @@ L_102de6c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102df84: 0x102df84: sw    zero, 28(sp)
+// 0x0102df94: 0x102df94: sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5077,7 +5077,7 @@ L_102de6c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102df88: 0x102df88: jal   0x101c4fc sw    zero, 32(sp)
+// 0x0102df98: 0x102df98: jal   0x101c50c sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5091,15 +5091,15 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df90: 0x102df90: lui   a0, 0x0
+// 0x0102dfa0: 0x102dfa0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102df94: 0x102df94: jal   0x100e348 addiu a0, a0, 6804
+// 0x0102dfa4: 0x102dfa4: jal   0x100e358 addiu a0, a0, 6804
 	ldloc.1
 	ldc.i4 6804
 	add
@@ -5109,23 +5109,23 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102df9c: 0x102df9c: lui   a0, 0x0
+// 0x0102dfac: 0x102dfac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102dfa0: 0x102dfa0: addu  a1, v0, zero
+// 0x0102dfb0: 0x102dfb0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102dfa4: 0x102dfa4: addiu a0, a0, 21376
+// 0x0102dfb4: 0x102dfb4: addiu a0, a0, 21376
 	ldloc.1
 	ldc.i4 21376
 	add
 	stloc.1
-// 0x0102dfa8: 0x102dfa8: jal   0x104d274 lui   s1, 0x0
+// 0x0102dfb8: 0x102dfb8: jal   0x104d284 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -5133,23 +5133,23 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_set_104d274(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_set_104d284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dfb0: 0x102dfb0: jal   0x1009998 sll   zero, zero, 0
+// 0x0102dfc0: 0x102dfc0: jal   0x10099a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_restore_zoom_1009998(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_restore_zoom_10099a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dfb8: 0x102dfb8: lw    s0, 11660(s0)
+// 0x0102dfc8: 0x102dfc8: lw    s0, 11660(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5158,7 +5158,7 @@ L_102de6c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102dfbc: 0x102dfbc: jal   0x1016370 addiu a0, s1, 29680
+// 0x0102dfcc: 0x102dfcc: jal   0x1016380 addiu a0, s1, 29680
 	ldloc 9
 	ldc.i4 29680
 	add
@@ -5168,17 +5168,17 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_option_width_1016370(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_option_width_1016380(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dfc4: 0x102dfc4: addiu a0, s1, 29680
+// 0x0102dfd4: 0x102dfd4: addiu a0, s1, 29680
 	ldloc 9
 	ldc.i4 29680
 	add
 	stloc.1
-// 0x0102dfc8: 0x102dfc8: jal   0x101631c sw    v0, 48(sp)
+// 0x0102dfd8: 0x102dfd8: jal   0x101632c sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5192,12 +5192,12 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl16::roadmap_option_height_101631c(int32,int32,int32,int32,int32)
+	call int32 Cibyl16::roadmap_option_height_101632c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dfd0: 0x102dfd0: lw    a1, 48(sp)
+// 0x0102dfe0: 0x102dfe0: lw    a1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5206,10 +5206,10 @@ L_102de6c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102dfd4: 0x102dfd4: addu  a2, v0, zero
+// 0x0102dfe4: 0x102dfe4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0102dfd8: 0x102dfd8: jal   0x10516c0 addu  a0, s0, zero
+// 0x0102dfe8: 0x102dfe8: jal   0x10516d0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5217,26 +5217,26 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_new_10516c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_new_10516d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dfe0: 0x102dfe0: jal   0x10502f0 sll   zero, zero, 0
+// 0x0102dff0: 0x102dff0: jal   0x1050300 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_add_canvas_10502f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_add_canvas_1050300(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dfe8: 0x102dfe8: jal   0x104fbe8 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_show_104fbe8()
+// 0x0102dff8: 0x102dff8: jal   0x104fbf8 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_show_104fbf8()
 // --- basic block ---
-// 0x0102dff0: 0x102dff0: jal   0x100280c sll   zero, zero, 0
+// 0x0102e000: 0x102e000: jal   0x100280c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5247,82 +5247,82 @@ L_102de6c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102dff8: 0x102dff8: lui   a0, 0x1030000
+// 0x0102e008: 0x102e008: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102dffc: 0x102dffc: lui   a1, 0x1030000
+// 0x0102e00c: 0x102e00c: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x0102e000: 0x102e000: addiu a0, a0, -9552
+// 0x0102e010: 0x102e010: addiu a0, a0, -9536
 	ldloc.1
-	ldc.i4 -9552
+	ldc.i4 -9536
 	add
 	stloc.1
-// 0x0102e004: 0x102e004: jal   0x1030e70 addiu a1, a1, -9584
+// 0x0102e014: 0x102e014: jal   0x1030e80 addiu a1, a1, -9568
 	ldloc.2
-	ldc.i4 -9584
+	ldc.i4 -9568
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl35::roadmap_gps_register_link_control_1030e70(int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_link_control_1030e80(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102e00c: 0x102e00c: lui   a0, 0x1030000
+// 0x0102e01c: 0x102e01c: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102e010: 0x102e010: lui   a1, 0x1050000
+// 0x0102e020: 0x102e020: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0102e014: 0x102e014: addiu a0, a0, -15848
+// 0x0102e024: 0x102e024: addiu a0, a0, -15832
 	ldloc.1
-	ldc.i4 -15848
+	ldc.i4 -15832
 	add
 	stloc.1
-// 0x0102e018: 0x102e018: jal   0x1030e84 addiu a1, a1, -768
+// 0x0102e028: 0x102e028: jal   0x1030e94 addiu a1, a1, -752
 	ldloc.2
-	ldc.i4 -768
+	ldc.i4 -752
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl35::roadmap_gps_register_periodic_control_1030e84(int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_periodic_control_1030e94(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102e020: 0x102e020: jal   0x1045cb8 sll   zero, zero, 0
+// 0x0102e030: 0x102e030: jal   0x1045cc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_border_initialize_1045cb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_border_initialize_1045cc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e028: 0x102e028: jal   0x104aa14 sll   zero, zero, 0
+// 0x0102e038: 0x102e038: jal   0x104aa24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_speedometer_initialize_104aa14(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_speedometer_initialize_104aa24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e030: 0x102e030: lui   a1, 0x0
+// 0x0102e040: 0x102e040: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102e034: 0x102e034: lui   a0, 0x0
+// 0x0102e044: 0x102e044: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102e038: 0x102e038: addiu a1, a1, 11920
+// 0x0102e048: 0x102e048: addiu a1, a1, 11920
 	ldloc.2
 	ldc.i4 11920
 	add
 	stloc.2
-// 0x0102e03c: 0x102e03c: jal   0x1028f38 addiu a0, a0, 6836
+// 0x0102e04c: 0x102e04c: jal   0x1028f48 addiu a0, a0, 6836
 	ldloc.1
 	ldc.i4 6836
 	add
@@ -5332,111 +5332,111 @@ L_102de6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl30::roadmap_factory_keymap_1028f38(int32,int32,int32,int32,int32)
+	call int32 Cibyl30::roadmap_factory_keymap_1028f48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e044: 0x102e044: jal   0x10bfb30 sll   zero, zero, 0
+// 0x0102e054: 0x102e054: jal   0x10c0178 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl142::roadmap_label_activate_10bfb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl142::roadmap_label_activate_10c0178(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e04c: 0x102e04c: jal   0x101b788 sll   zero, zero, 0
+// 0x0102e05c: 0x102e05c: jal   0x101b798 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_initialize_101b788(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_initialize_101b798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e054: 0x102e054: jal   0x1038368 sll   zero, zero, 0
+// 0x0102e064: 0x102e064: jal   0x1038378 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_load_1038368(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_load_1038378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e05c: 0x102e05c: jal   0x10554c4 sll   zero, zero, 0
+// 0x0102e06c: 0x102e06c: jal   0x10554d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_initialize_10554c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_initialize_10554d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e064: 0x102e064: lui   a0, 0x1030000
+// 0x0102e074: 0x102e074: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102e068: 0x102e068: jal   0x10137a0 addiu a0, a0, -12420
+// 0x0102e078: 0x102e078: jal   0x10137b0 addiu a0, a0, -12404
 	ldloc.1
-	ldc.i4 -12420
+	ldc.i4 -12404
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl14::roadmap_locator_declare_10137a0(int32)
+	call int32 Cibyl14::roadmap_locator_declare_10137b0(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e070: 0x102e070: lui   a0, 0x1030000
+// 0x0102e080: 0x102e080: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102e074: 0x102e074: jal   0x101f970 addiu a0, a0, -9516
+// 0x0102e084: 0x102e084: jal   0x101f980 addiu a0, a0, -9500
 	ldloc.1
-	ldc.i4 -9516
+	ldc.i4 -9500
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e07c: 0x102e07c: lui   v1, 0x60000
+// 0x0102e08c: 0x102e08c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0102e080: 0x102e080: lw    v1, -24024(v1)
+// 0x0102e090: 0x102e090: lw    v1, -23560(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6006
+	ldc.i4 -5890
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102e084: 0x102e084: lui   a0, 0x60000
+// 0x0102e094: 0x102e094: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0102e088: 0x102e088: beq   v1, zero, 0x102e098 sw    v0, -24008(a0)
+// 0x0102e098: 0x102e098: beq   v1, zero, 0x102e0a8 sw    v0, -23544(a0)
 	ldloc 6
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6002
+	ldc.i4 -5886
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_102e098
+	brfalse L_102e0a8
 // --- basic block ---
-// 0x0102e090: 0x102e090: jalr  v1 addiu a0, zero, 1
+// 0x0102e0a0: 0x102e0a0: jalr  v1 addiu a0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.1
@@ -5450,54 +5450,54 @@ L_102de6c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102e098:
-// 0x0102e098: 0x102e098: jal   0x10ac740 sll   zero, zero, 0
+L_102e0a8:
+// 0x0102e0a8: 0x102e0a8: jal   0x10acd88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_main_initialize_10ac740(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_main_initialize_10acd88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e0a0: 0x102e0a0: jal   0x10acbdc sll   zero, zero, 0
+// 0x0102e0b0: 0x102e0b0: jal   0x10ad224 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_initialize_10acbdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_initialize_10ad224(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e0a8: 0x102e0a8: jal   0x10509a4 sll   zero, zero, 0
+// 0x0102e0b8: 0x102e0b8: jal   0x10509b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_sound_level_init_10509a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_sound_level_init_10509b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e0b0: 0x102e0b0: lui   a0, 0x10000
+// 0x0102e0c0: 0x102e0c0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e0b4: 0x102e0b4: lui   a1, 0x1050000
+// 0x0102e0c4: 0x102e0c4: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0102e0b8: 0x102e0b8: addiu a0, a0, -24820
+// 0x0102e0c8: 0x102e0c8: addiu a0, a0, -24820
 	ldloc.1
 	ldc.i4 -24820
 	add
 	stloc.1
-// 0x0102e0bc: 0x102e0bc: jal   0x100f48c addiu a1, a1, 29704
+// 0x0102e0cc: 0x102e0cc: jal   0x100f49c addiu a1, a1, 29720
 	ldloc.2
-	ldc.i4 29704
+	ldc.i4 29720
 	add
 	stloc.2
 	ldloc.0
@@ -5505,25 +5505,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e0c4: 0x102e0c4: lui   a0, 0x10000
+// 0x0102e0d4: 0x102e0d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e0c8: 0x102e0c8: lui   a1, 0x1070000
+// 0x0102e0d8: 0x102e0d8: lui   a1, 0x1070000
 	ldc.i4 17235968
 	stloc.2
-// 0x0102e0cc: 0x102e0cc: addiu a0, a0, -24792
+// 0x0102e0dc: 0x102e0dc: addiu a0, a0, -24792
 	ldloc.1
 	ldc.i4 -24792
 	add
 	stloc.1
-// 0x0102e0d0: 0x102e0d0: jal   0x100f48c addiu a1, a1, -16016
+// 0x0102e0e0: 0x102e0e0: jal   0x100f49c addiu a1, a1, -14444
 	ldloc.2
-	ldc.i4 -16016
+	ldc.i4 -14444
 	add
 	stloc.2
 	ldloc.0
@@ -5531,25 +5531,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e0d8: 0x102e0d8: lui   a0, 0x10000
+// 0x0102e0e8: 0x102e0e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e0dc: 0x102e0dc: lui   a1, 0x1070000
+// 0x0102e0ec: 0x102e0ec: lui   a1, 0x1070000
 	ldc.i4 17235968
 	stloc.2
-// 0x0102e0e0: 0x102e0e0: addiu a0, a0, -24776
+// 0x0102e0f0: 0x102e0f0: addiu a0, a0, -24776
 	ldloc.1
 	ldc.i4 -24776
 	add
 	stloc.1
-// 0x0102e0e4: 0x102e0e4: jal   0x100f48c addiu a1, a1, 29048
+// 0x0102e0f4: 0x102e0f4: jal   0x100f49c addiu a1, a1, 30620
 	ldloc.2
-	ldc.i4 29048
+	ldc.i4 30620
 	add
 	stloc.2
 	ldloc.0
@@ -5557,25 +5557,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e0ec: 0x102e0ec: lui   a0, 0x10000
+// 0x0102e0fc: 0x102e0fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e0f0: 0x102e0f0: lui   a1, 0x1070000
-	ldc.i4 17235968
+// 0x0102e100: 0x102e100: lui   a1, 0x1080000
+	ldc.i4 17301504
 	stloc.2
-// 0x0102e0f4: 0x102e0f4: addiu a0, a0, -24760
+// 0x0102e104: 0x102e104: addiu a0, a0, -24760
 	ldloc.1
 	ldc.i4 -24760
 	add
 	stloc.1
-// 0x0102e0f8: 0x102e0f8: jal   0x100f48c addiu a1, a1, 32104
+// 0x0102e108: 0x102e108: jal   0x100f49c addiu a1, a1, -31860
 	ldloc.2
-	ldc.i4 32104
+	ldc.i4 -31860
 	add
 	stloc.2
 	ldloc.0
@@ -5583,25 +5583,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e100: 0x102e100: lui   a0, 0x10000
+// 0x0102e110: 0x102e110: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e104: 0x102e104: lui   a1, 0x1080000
+// 0x0102e114: 0x102e114: lui   a1, 0x1080000
 	ldc.i4 17301504
 	stloc.2
-// 0x0102e108: 0x102e108: addiu a0, a0, -24744
+// 0x0102e118: 0x102e118: addiu a0, a0, -24744
 	ldloc.1
 	ldc.i4 -24744
 	add
 	stloc.1
-// 0x0102e10c: 0x102e10c: jal   0x100f48c addiu a1, a1, 15796
+// 0x0102e11c: 0x102e11c: jal   0x100f49c addiu a1, a1, 17368
 	ldloc.2
-	ldc.i4 15796
+	ldc.i4 17368
 	add
 	stloc.2
 	ldloc.0
@@ -5609,25 +5609,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e114: 0x102e114: lui   a0, 0x10000
+// 0x0102e124: 0x102e124: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e118: 0x102e118: lui   a1, 0x1010000
+// 0x0102e128: 0x102e128: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0102e11c: 0x102e11c: addiu a0, a0, -24724
+// 0x0102e12c: 0x102e12c: addiu a0, a0, -24724
 	ldloc.1
 	ldc.i4 -24724
 	add
 	stloc.1
-// 0x0102e120: 0x102e120: jal   0x100f48c addiu a1, a1, 16788
+// 0x0102e130: 0x102e130: jal   0x100f49c addiu a1, a1, 16804
 	ldloc.2
-	ldc.i4 16788
+	ldc.i4 16804
 	add
 	stloc.2
 	ldloc.0
@@ -5635,25 +5635,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e128: 0x102e128: lui   a0, 0x10000
+// 0x0102e138: 0x102e138: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e12c: 0x102e12c: lui   a1, 0x1010000
+// 0x0102e13c: 0x102e13c: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0102e130: 0x102e130: addiu a0, a0, -24712
+// 0x0102e140: 0x102e140: addiu a0, a0, -24712
 	ldloc.1
 	ldc.i4 -24712
 	add
 	stloc.1
-// 0x0102e134: 0x102e134: jal   0x100f48c addiu a1, a1, 16904
+// 0x0102e144: 0x102e144: jal   0x100f49c addiu a1, a1, 16920
 	ldloc.2
-	ldc.i4 16904
+	ldc.i4 16920
 	add
 	stloc.2
 	ldloc.0
@@ -5661,25 +5661,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e13c: 0x102e13c: lui   a0, 0x10000
+// 0x0102e14c: 0x102e14c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e140: 0x102e140: lui   a1, 0x1080000
+// 0x0102e150: 0x102e150: lui   a1, 0x1080000
 	ldc.i4 17301504
 	stloc.2
-// 0x0102e144: 0x102e144: addiu a0, a0, -24684
+// 0x0102e154: 0x102e154: addiu a0, a0, -24684
 	ldloc.1
 	ldc.i4 -24684
 	add
 	stloc.1
-// 0x0102e148: 0x102e148: jal   0x100f48c addiu a1, a1, -29900
+// 0x0102e158: 0x102e158: jal   0x100f49c addiu a1, a1, -28328
 	ldloc.2
-	ldc.i4 -29900
+	ldc.i4 -28328
 	add
 	stloc.2
 	ldloc.0
@@ -5687,25 +5687,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e150: 0x102e150: lui   a0, 0x10000
+// 0x0102e160: 0x102e160: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e154: 0x102e154: lui   a1, 0x1090000
+// 0x0102e164: 0x102e164: lui   a1, 0x1090000
 	ldc.i4 17367040
 	stloc.2
-// 0x0102e158: 0x102e158: addiu a0, a0, -24668
+// 0x0102e168: 0x102e168: addiu a0, a0, -24668
 	ldloc.1
 	ldc.i4 -24668
 	add
 	stloc.1
-// 0x0102e15c: 0x102e15c: jal   0x100f48c addiu a1, a1, -9296
+// 0x0102e16c: 0x102e16c: jal   0x100f49c addiu a1, a1, -7724
 	ldloc.2
-	ldc.i4 -9296
+	ldc.i4 -7724
 	add
 	stloc.2
 	ldloc.0
@@ -5713,25 +5713,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e164: 0x102e164: lui   a0, 0x10000
+// 0x0102e174: 0x102e174: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e168: 0x102e168: lui   a1, 0x1040000
+// 0x0102e178: 0x102e178: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x0102e16c: 0x102e16c: addiu a0, a0, -24652
+// 0x0102e17c: 0x102e17c: addiu a0, a0, -24652
 	ldloc.1
 	ldc.i4 -24652
 	add
 	stloc.1
-// 0x0102e170: 0x102e170: jal   0x100f48c addiu a1, a1, -1516
+// 0x0102e180: 0x102e180: jal   0x100f49c addiu a1, a1, -1500
 	ldloc.2
-	ldc.i4 -1516
+	ldc.i4 -1500
 	add
 	stloc.2
 	ldloc.0
@@ -5739,25 +5739,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e178: 0x102e178: lui   a0, 0x10000
+// 0x0102e188: 0x102e188: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e17c: 0x102e17c: lui   a1, 0x1020000
+// 0x0102e18c: 0x102e18c: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x0102e180: 0x102e180: addiu a0, a0, -24636
+// 0x0102e190: 0x102e190: addiu a0, a0, -24636
 	ldloc.1
 	ldc.i4 -24636
 	add
 	stloc.1
-// 0x0102e184: 0x102e184: jal   0x100f48c addiu a1, a1, 792
+// 0x0102e194: 0x102e194: jal   0x100f49c addiu a1, a1, 808
 	ldloc.2
-	ldc.i4 792
+	ldc.i4 808
 	add
 	stloc.2
 	ldloc.0
@@ -5765,25 +5765,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e18c: 0x102e18c: lui   a0, 0x10000
+// 0x0102e19c: 0x102e19c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e190: 0x102e190: lui   a1, 0x1060000
+// 0x0102e1a0: 0x102e1a0: lui   a1, 0x1060000
 	ldc.i4 17170432
 	stloc.2
-// 0x0102e194: 0x102e194: addiu a0, a0, -24624
+// 0x0102e1a4: 0x102e1a4: addiu a0, a0, -24624
 	ldloc.1
 	ldc.i4 -24624
 	add
 	stloc.1
-// 0x0102e198: 0x102e198: jal   0x100f48c addiu a1, a1, -31884
+// 0x0102e1a8: 0x102e1a8: jal   0x100f49c addiu a1, a1, -31868
 	ldloc.2
-	ldc.i4 -31884
+	ldc.i4 -31868
 	add
 	stloc.2
 	ldloc.0
@@ -5791,25 +5791,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e1a0: 0x102e1a0: lui   a0, 0x10000
+// 0x0102e1b0: 0x102e1b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e1a4: 0x102e1a4: lui   a1, 0x1020000
+// 0x0102e1b4: 0x102e1b4: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x0102e1a8: 0x102e1a8: addiu a0, a0, -24600
+// 0x0102e1b8: 0x102e1b8: addiu a0, a0, -24600
 	ldloc.1
 	ldc.i4 -24600
 	add
 	stloc.1
-// 0x0102e1ac: 0x102e1ac: jal   0x100f48c addiu a1, a1, -1572
+// 0x0102e1bc: 0x102e1bc: jal   0x100f49c addiu a1, a1, -1556
 	ldloc.2
-	ldc.i4 -1572
+	ldc.i4 -1556
 	add
 	stloc.2
 	ldloc.0
@@ -5817,25 +5817,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e1b4: 0x102e1b4: lui   a0, 0x10000
+// 0x0102e1c4: 0x102e1c4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e1b8: 0x102e1b8: lui   a1, 0x1020000
+// 0x0102e1c8: 0x102e1c8: lui   a1, 0x1020000
 	ldc.i4 16908288
 	stloc.2
-// 0x0102e1bc: 0x102e1bc: addiu a0, a0, -24576
+// 0x0102e1cc: 0x102e1cc: addiu a0, a0, -24576
 	ldloc.1
 	ldc.i4 -24576
 	add
 	stloc.1
-// 0x0102e1c0: 0x102e1c0: jal   0x100f48c addiu a1, a1, -1548
+// 0x0102e1d0: 0x102e1d0: jal   0x100f49c addiu a1, a1, -1532
 	ldloc.2
-	ldc.i4 -1548
+	ldc.i4 -1532
 	add
 	stloc.2
 	ldloc.0
@@ -5843,25 +5843,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e1c8: 0x102e1c8: lui   a0, 0x10000
+// 0x0102e1d8: 0x102e1d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e1cc: 0x102e1cc: lui   a1, 0x1030000
+// 0x0102e1dc: 0x102e1dc: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x0102e1d0: 0x102e1d0: addiu a0, a0, -24548
+// 0x0102e1e0: 0x102e1e0: addiu a0, a0, -24548
 	ldloc.1
 	ldc.i4 -24548
 	add
 	stloc.1
-// 0x0102e1d4: 0x102e1d4: jal   0x100f48c addiu a1, a1, -11652
+// 0x0102e1e4: 0x102e1e4: jal   0x100f49c addiu a1, a1, -11636
 	ldloc.2
-	ldc.i4 -11652
+	ldc.i4 -11636
 	add
 	stloc.2
 	ldloc.0
@@ -5869,25 +5869,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e1dc: 0x102e1dc: lui   a0, 0x10000
+// 0x0102e1ec: 0x102e1ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e1e0: 0x102e1e0: lui   a1, 0x1080000
+// 0x0102e1f0: 0x102e1f0: lui   a1, 0x1080000
 	ldc.i4 17301504
 	stloc.2
-// 0x0102e1e4: 0x102e1e4: addiu a0, a0, -24536
+// 0x0102e1f4: 0x102e1f4: addiu a0, a0, -24536
 	ldloc.1
 	ldc.i4 -24536
 	add
 	stloc.1
-// 0x0102e1e8: 0x102e1e8: jal   0x100f48c addiu a1, a1, -29968
+// 0x0102e1f8: 0x102e1f8: jal   0x100f49c addiu a1, a1, -28396
 	ldloc.2
-	ldc.i4 -29968
+	ldc.i4 -28396
 	add
 	stloc.2
 	ldloc.0
@@ -5895,25 +5895,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e1f0: 0x102e1f0: lui   a0, 0x10000
+// 0x0102e200: 0x102e200: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e1f4: 0x102e1f4: lui   a1, 0x1080000
+// 0x0102e204: 0x102e204: lui   a1, 0x1080000
 	ldc.i4 17301504
 	stloc.2
-// 0x0102e1f8: 0x102e1f8: addiu a0, a0, -24520
+// 0x0102e208: 0x102e208: addiu a0, a0, -24520
 	ldloc.1
 	ldc.i4 -24520
 	add
 	stloc.1
-// 0x0102e1fc: 0x102e1fc: jal   0x100f48c addiu a1, a1, -30108
+// 0x0102e20c: 0x102e20c: jal   0x100f49c addiu a1, a1, -28536
 	ldloc.2
-	ldc.i4 -30108
+	ldc.i4 -28536
 	add
 	stloc.2
 	ldloc.0
@@ -5921,25 +5921,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e204: 0x102e204: lui   a0, 0x10000
+// 0x0102e214: 0x102e214: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e208: 0x102e208: lui   a1, 0x1030000
+// 0x0102e218: 0x102e218: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x0102e20c: 0x102e20c: addiu a0, a0, -24500
+// 0x0102e21c: 0x102e21c: addiu a0, a0, -24500
 	ldloc.1
 	ldc.i4 -24500
 	add
 	stloc.1
-// 0x0102e210: 0x102e210: jal   0x100f48c addiu a1, a1, 19124
+// 0x0102e220: 0x102e220: jal   0x100f49c addiu a1, a1, 19140
 	ldloc.2
-	ldc.i4 19124
+	ldc.i4 19140
 	add
 	stloc.2
 	ldloc.0
@@ -5947,25 +5947,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e218: 0x102e218: lui   a0, 0x10000
+// 0x0102e228: 0x102e228: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e21c: 0x102e21c: lui   a1, 0x1070000
-	ldc.i4 17235968
+// 0x0102e22c: 0x102e22c: lui   a1, 0x1080000
+	ldc.i4 17301504
 	stloc.2
-// 0x0102e220: 0x102e220: addiu a0, a0, -24488
+// 0x0102e230: 0x102e230: addiu a0, a0, -24488
 	ldloc.1
 	ldc.i4 -24488
 	add
 	stloc.1
-// 0x0102e224: 0x102e224: jal   0x100f48c addiu a1, a1, 31608
+// 0x0102e234: 0x102e234: jal   0x100f49c addiu a1, a1, -32356
 	ldloc.2
-	ldc.i4 31608
+	ldc.i4 -32356
 	add
 	stloc.2
 	ldloc.0
@@ -5973,25 +5973,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e22c: 0x102e22c: lui   a0, 0x10000
+// 0x0102e23c: 0x102e23c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e230: 0x102e230: lui   a1, 0x1050000
+// 0x0102e240: 0x102e240: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0102e234: 0x102e234: addiu a0, a0, -24472
+// 0x0102e244: 0x102e244: addiu a0, a0, -24472
 	ldloc.1
 	ldc.i4 -24472
 	add
 	stloc.1
-// 0x0102e238: 0x102e238: jal   0x100f48c addiu a1, a1, 26740
+// 0x0102e248: 0x102e248: jal   0x100f49c addiu a1, a1, 26756
 	ldloc.2
-	ldc.i4 26740
+	ldc.i4 26756
 	add
 	stloc.2
 	ldloc.0
@@ -5999,25 +5999,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e240: 0x102e240: lui   a0, 0x10000
+// 0x0102e250: 0x102e250: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e244: 0x102e244: lui   a1, 0x1010000
+// 0x0102e254: 0x102e254: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0102e248: 0x102e248: addiu a0, a0, -24452
+// 0x0102e258: 0x102e258: addiu a0, a0, -24452
 	ldloc.1
 	ldc.i4 -24452
 	add
 	stloc.1
-// 0x0102e24c: 0x102e24c: jal   0x100f48c addiu a1, a1, 25612
+// 0x0102e25c: 0x102e25c: jal   0x100f49c addiu a1, a1, 25628
 	ldloc.2
-	ldc.i4 25612
+	ldc.i4 25628
 	add
 	stloc.2
 	ldloc.0
@@ -6025,25 +6025,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e254: 0x102e254: lui   a0, 0x10000
+// 0x0102e264: 0x102e264: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e258: 0x102e258: lui   a1, 0x1070000
+// 0x0102e268: 0x102e268: lui   a1, 0x1070000
 	ldc.i4 17235968
 	stloc.2
-// 0x0102e25c: 0x102e25c: addiu a0, a0, -24436
+// 0x0102e26c: 0x102e26c: addiu a0, a0, -24436
 	ldloc.1
 	ldc.i4 -24436
 	add
 	stloc.1
-// 0x0102e260: 0x102e260: jal   0x100f48c addiu a1, a1, -21716
+// 0x0102e270: 0x102e270: jal   0x100f49c addiu a1, a1, -20144
 	ldloc.2
-	ldc.i4 -21716
+	ldc.i4 -20144
 	add
 	stloc.2
 	ldloc.0
@@ -6051,25 +6051,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e268: 0x102e268: lui   a0, 0x10000
+// 0x0102e278: 0x102e278: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e26c: 0x102e26c: lui   a1, 0x1070000
+// 0x0102e27c: 0x102e27c: lui   a1, 0x1070000
 	ldc.i4 17235968
 	stloc.2
-// 0x0102e270: 0x102e270: addiu a0, a0, -24416
+// 0x0102e280: 0x102e280: addiu a0, a0, -24416
 	ldloc.1
 	ldc.i4 -24416
 	add
 	stloc.1
-// 0x0102e274: 0x102e274: jal   0x100f48c addiu a1, a1, -21856
+// 0x0102e284: 0x102e284: jal   0x100f49c addiu a1, a1, -20284
 	ldloc.2
-	ldc.i4 -21856
+	ldc.i4 -20284
 	add
 	stloc.2
 	ldloc.0
@@ -6077,25 +6077,25 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e27c: 0x102e27c: lui   a0, 0x10000
+// 0x0102e28c: 0x102e28c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e280: 0x102e280: lui   a1, 0x1050000
+// 0x0102e290: 0x102e290: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0102e284: 0x102e284: addiu a0, a0, -24396
+// 0x0102e294: 0x102e294: addiu a0, a0, -24396
 	ldloc.1
 	ldc.i4 -24396
 	add
 	stloc.1
-// 0x0102e288: 0x102e288: jal   0x100f48c addiu a1, a1, 26060
+// 0x0102e298: 0x102e298: jal   0x100f49c addiu a1, a1, 26076
 	ldloc.2
-	ldc.i4 26060
+	ldc.i4 26076
 	add
 	stloc.2
 	ldloc.0
@@ -6103,50 +6103,50 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e290: 0x102e290: jal   0x101eee8 sll   zero, zero, 0
+// 0x0102e2a0: 0x102e2a0: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e298: 0x102e298: jal   0x1031458 sll   zero, zero, 0
+// 0x0102e2a8: 0x102e2a8: jal   0x1031468 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_open_1031458(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_open_1031468(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e2a0: 0x102e2a0: jal   0x10203d8 sll   zero, zero, 0
+// 0x0102e2b0: 0x102e2b0: jal   0x10203e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_set_initial_position_10203d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_set_initial_position_10203e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e2a8: 0x102e2a8: lui   a0, 0x1030000
+// 0x0102e2b8: 0x102e2b8: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0102e2ac: 0x102e2ac: jal   0x10ab4ec addiu a0, a0, -10188
+// 0x0102e2bc: 0x102e2bc: jal   0x10abb34 addiu a0, a0, -10172
 	ldloc.1
-	ldc.i4 -10188
+	ldc.i4 -10172
 	add
 	stloc.1
 	ldloc.0
@@ -6154,13 +6154,13 @@ L_102e098:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::roadmap_geo_config_10ab4ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::roadmap_geo_config_10abb34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e2b4: 0x102e2b4: lw    ra, 76(sp)
-// 0x0102e2b8: 0x102e2b8: lw    s4, 72(sp)
+// 0x0102e2c4: 0x102e2c4: lw    ra, 76(sp)
+// 0x0102e2c8: 0x102e2c8: lw    s4, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6169,7 +6169,7 @@ L_102e098:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102e2bc: 0x102e2bc: lw    s3, 68(sp)
+// 0x0102e2cc: 0x102e2cc: lw    s3, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6178,7 +6178,7 @@ L_102e098:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102e2c0: 0x102e2c0: lw    s2, 64(sp)
+// 0x0102e2d0: 0x102e2d0: lw    s2, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6187,7 +6187,7 @@ L_102e098:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102e2c4: 0x102e2c4: lw    s1, 60(sp)
+// 0x0102e2d4: 0x102e2d4: lw    s1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6196,7 +6196,7 @@ L_102e098:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102e2c8: 0x102e2c8: lw    s0, 56(sp)
+// 0x0102e2d8: 0x102e2d8: lw    s0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6205,7 +6205,7 @@ L_102e098:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102e2cc: 0x102e2cc: jr    ra addiu sp, sp, 80
+// 0x0102e2dc: 0x102e2dc: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -6217,7 +6217,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_screen_refresh_102e3a4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_screen_refresh_102e3b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -6252,40 +6252,40 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102e3a4: 0x102e3a4: addiu sp, sp, -24
+// 0x0102e3b4: 0x102e3b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102e3a8: 0x102e3a8: beq   a0, zero, 0x102e3c0 sw    ra, 20(sp)
+// 0x0102e3b8: 0x102e3b8: beq   a0, zero, 0x102e3d0 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_102e3c0
+	brfalse L_102e3d0
 // --- basic block ---
-// 0x0102e3b0: 0x102e3b0: jal   0x101fcfc sll   zero, zero, 0
+// 0x0102e3c0: 0x102e3c0: jal   0x101fd0c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_unfreeze_101fcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_unfreeze_101fd0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0102e3b8: 0x102e3b8: j	 0x102e3c8 sll   zero, zero, 0
-	br L_102e3c8
+// 0x0102e3c8: 0x102e3c8: j	 0x102e3d8 sll   zero, zero, 0
+	br L_102e3d8
 // --- basic block ---
-L_102e3c0:
-// 0x0102e3c0: 0x102e3c0: jal   0x101f91c sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_freeze_101f91c()
+L_102e3d0:
+// 0x0102e3d0: 0x102e3d0: jal   0x101f92c sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_freeze_101f92c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_102e3c8:
-// 0x0102e3c8: 0x102e3c8: lw    ra, 20(sp)
-// 0x0102e3cc: 0x102e3cc: sll   zero, zero, 0
-// 0x0102e3d0: 0x102e3d0: jr    ra addiu sp, sp, 24
+L_102e3d8:
+// 0x0102e3d8: 0x102e3d8: lw    ra, 20(sp)
+// 0x0102e3dc: 0x102e3dc: sll   zero, zero, 0
+// 0x0102e3e0: 0x102e3e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6297,7 +6297,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 start_more_menu_102e4cc(int32,int32,int32,int32,int32)
+.method public static int32 start_more_menu_102e4dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6332,36 +6332,36 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102e4cc:
-// 0x0102e4cc: 0x102e4cc: addiu sp, sp, -40
+L_102e4dc:
+// 0x0102e4dc: 0x102e4dc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0102e4d0: 0x102e4d0: sw    ra, 36(sp)
-// 0x0102e4d4: 0x102e4d4: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x0102e4e0: 0x102e4e0: sw    ra, 36(sp)
+// 0x0102e4e4: 0x102e4e4: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0102e4dc: 0x102e4dc: beq   v0, zero, 0x102e51c lui   v0, 0x0
+// 0x0102e4ec: 0x102e4ec: beq   v0, zero, 0x102e52c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_102e51c
+	brfalse L_102e52c
 // --- basic block ---
-// 0x0102e4e4: 0x102e4e4: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0102e4f4: 0x102e4f4: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e4ec: 0x102e4ec: lui   a1, 0x10000
+// 0x0102e4fc: 0x102e4fc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102e4f0: 0x102e4f0: addu  a0, v0, zero
+// 0x0102e500: 0x102e500: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102e4f4: 0x102e4f4: jal   0x1001b14 addiu a1, a1, -24316
+// 0x0102e504: 0x102e504: jal   0x1001b14 addiu a1, a1, -24316
 	ldloc.2
 	ldc.i4 -24316
 	add
@@ -6371,13 +6371,13 @@ L_102e4cc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102e4fc: 0x102e4fc: bne   v0, zero, 0x102e51c lui   v0, 0x0
+// 0x0102e50c: 0x102e50c: bne   v0, zero, 0x102e52c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_102e51c
+	brtrue L_102e52c
 // --- basic block ---
-// 0x0102e504: 0x102e504: jal   0x1094b64 addu  a0, zero, zero
+// 0x0102e514: 0x102e514: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6385,41 +6385,41 @@ L_102e4cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e50c: 0x102e50c: jal   0x102146c sll   zero, zero, 0
+// 0x0102e51c: 0x102e51c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e514: 0x102e514: j	 0x102e554 sll   zero, zero, 0
-	br L_102e554
+// 0x0102e524: 0x102e524: j	 0x102e564 sll   zero, zero, 0
+	br L_102e564
 // --- basic block ---
-L_102e51c:
-// 0x0102e51c: 0x102e51c: addiu v0, v0, 6836
+L_102e52c:
+// 0x0102e52c: 0x102e52c: addiu v0, v0, 6836
 	ldloc 5
 	ldc.i4 6836
 	add
 	stloc 5
-// 0x0102e520: 0x102e520: lui   a0, 0x10000
+// 0x0102e530: 0x102e530: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e524: 0x102e524: lui   a1, 0x10000
+// 0x0102e534: 0x102e534: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102e528: 0x102e528: lui   a2, 0x60000
+// 0x0102e538: 0x102e538: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0102e52c: 0x102e52c: sw    v0, 20(sp)
+// 0x0102e53c: 0x102e53c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6428,33 +6428,33 @@ L_102e51c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102e530: 0x102e530: lui   v0, 0x10010000
+// 0x0102e540: 0x102e540: lui   v0, 0x10010000
 	ldc.i4 268500992
 	stloc 5
-// 0x0102e534: 0x102e534: ori   v0, v0, 20497
+// 0x0102e544: 0x102e544: ori   v0, v0, 20497
 	ldloc 5
 	ldc.i4 20497
 	or
 	stloc 5
-// 0x0102e538: 0x102e538: addiu a0, a0, -24316
+// 0x0102e548: 0x102e548: addiu a0, a0, -24316
 	ldloc.1
 	ldc.i4 -24316
 	add
 	stloc.1
-// 0x0102e53c: 0x102e53c: addiu a1, a1, -24308
+// 0x0102e54c: 0x102e54c: addiu a1, a1, -24308
 	ldloc.2
 	ldc.i4 -24308
 	add
 	stloc.2
-// 0x0102e540: 0x102e540: addiu a2, a2, -23996
+// 0x0102e550: 0x102e550: addiu a2, a2, -23532
 	ldloc.3
-	ldc.i4 -23996
+	ldc.i4 -23532
 	add
 	stloc.3
-// 0x0102e544: 0x102e544: addu  a3, zero, zero
+// 0x0102e554: 0x102e554: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102e548: 0x102e548: sw    v0, 24(sp)
+// 0x0102e558: 0x102e558: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6463,7 +6463,7 @@ L_102e51c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102e54c: 0x102e54c: jal   0x1097814 sw    zero, 16(sp)
+// 0x0102e55c: 0x102e55c: jal   0x1097e5c sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6477,15 +6477,15 @@ L_102e51c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_menu_activate_1097814(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_menu_activate_1097e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102e554:
-// 0x0102e554: 0x102e554: lw    ra, 36(sp)
-// 0x0102e558: 0x102e558: sll   zero, zero, 0
-// 0x0102e55c: 0x102e55c: jr    ra addiu sp, sp, 40
+L_102e564:
+// 0x0102e564: 0x102e564: lw    ra, 36(sp)
+// 0x0102e568: 0x102e568: sll   zero, zero, 0
+// 0x0102e56c: 0x102e56c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6497,7 +6497,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 start_map_updates_menu_102e564(int32,int32,int32,int32,int32)
+.method public static int32 start_map_updates_menu_102e574(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6532,32 +6532,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102e564:
-// 0x0102e564: 0x102e564: lui   a0, 0x10000
+L_102e574:
+// 0x0102e574: 0x102e574: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e568: 0x102e568: lui   v0, 0x0
+// 0x0102e578: 0x102e578: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102e56c: 0x102e56c: addiu sp, sp, -32
+// 0x0102e57c: 0x102e57c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102e570: 0x102e570: addiu a0, a0, -24300
+// 0x0102e580: 0x102e580: addiu a0, a0, -24300
 	ldloc.1
 	ldc.i4 -24300
 	add
 	stloc.1
-// 0x0102e574: 0x102e574: addiu v0, v0, 6836
+// 0x0102e584: 0x102e584: addiu v0, v0, 6836
 	ldloc 5
 	ldc.i4 6836
 	add
 	stloc 5
-// 0x0102e578: 0x102e578: lui   a2, 0x60000
+// 0x0102e588: 0x102e588: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0102e57c: 0x102e57c: sw    v0, 16(sp)
+// 0x0102e58c: 0x102e58c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6566,22 +6566,22 @@ L_102e564:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102e580: 0x102e580: addiu a2, a2, -23996
+// 0x0102e590: 0x102e590: addiu a2, a2, -23532
 	ldloc.3
-	ldc.i4 -23996
+	ldc.i4 -23532
 	add
 	stloc.3
-// 0x0102e584: 0x102e584: lui   v0, 0x90000
+// 0x0102e594: 0x102e594: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x0102e588: 0x102e588: addu  a1, a0, zero
+// 0x0102e598: 0x102e598: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0102e58c: 0x102e58c: addu  a3, zero, zero
+// 0x0102e59c: 0x102e59c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0102e590: 0x102e590: sw    ra, 28(sp)
-// 0x0102e594: 0x102e594: jal   0x1096e4c sw    v0, 20(sp)
+// 0x0102e5a0: 0x102e5a0: sw    ra, 28(sp)
+// 0x0102e5a4: 0x102e5a4: jal   0x1097494 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6595,14 +6595,14 @@ L_102e564:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_list_menu_activate_1096e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_list_menu_activate_1097494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0102e59c: 0x102e59c: lw    ra, 28(sp)
-// 0x0102e5a0: 0x102e5a0: sll   zero, zero, 0
-// 0x0102e5a4: 0x102e5a4: jr    ra addiu sp, sp, 32
+// 0x0102e5ac: 0x102e5ac: lw    ra, 28(sp)
+// 0x0102e5b0: 0x102e5b0: sll   zero, zero, 0
+// 0x0102e5b4: 0x102e5b4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6614,7 +6614,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 start_alerts_menu_102e5ac(int32,int32,int32,int32,int32)
+.method public static int32 start_alerts_menu_102e5bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -6658,13 +6658,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102e5ac:
-// 0x0102e5ac: 0x102e5ac: addiu sp, sp, -80
+L_102e5bc:
+// 0x0102e5bc: 0x102e5bc: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0102e5b0: 0x102e5b0: sw    s2, 72(sp)
+// 0x0102e5c0: 0x102e5c0: sw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6673,8 +6673,8 @@ L_102e5ac:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102e5b4: 0x102e5b4: sw    ra, 76(sp)
-// 0x0102e5b8: 0x102e5b8: sw    s1, 68(sp)
+// 0x0102e5c4: 0x102e5c4: sw    ra, 76(sp)
+// 0x0102e5c8: 0x102e5c8: sw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6683,7 +6683,7 @@ L_102e5ac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102e5bc: 0x102e5bc: jal   0x1030e98 sw    s0, 64(sp)
+// 0x0102e5cc: 0x102e5cc: jal   0x1030ea8 sw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6692,32 +6692,32 @@ L_102e5ac:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
 // --- basic block ---
-// 0x0102e5c4: 0x102e5c4: jal   0x1093f90 addu  s2, v0, zero
+// 0x0102e5d4: 0x102e5d4: jal   0x10945b4 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0102e5cc: 0x102e5cc: beq   v0, zero, 0x102e638 sll   zero, zero, 0
+// 0x0102e5dc: 0x102e5dc: beq   v0, zero, 0x102e648 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102e638
+	brfalse L_102e648
 // --- basic block ---
-// 0x0102e5d4: 0x102e5d4: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0102e5e4: 0x102e5e4: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e5dc: 0x102e5dc: lui   a1, 0x10000
+// 0x0102e5ec: 0x102e5ec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102e5e0: 0x102e5e0: addu  a0, v0, zero
+// 0x0102e5f0: 0x102e5f0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102e5e4: 0x102e5e4: jal   0x1001b14 addiu a1, a1, -24288
+// 0x0102e5f4: 0x102e5f4: jal   0x1001b14 addiu a1, a1, -24288
 	ldloc.2
 	ldc.i4 -24288
 	add
@@ -6727,25 +6727,25 @@ L_102e5ac:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102e5ec: 0x102e5ec: beq   v0, zero, 0x102e614 sll   zero, zero, 0
+// 0x0102e5fc: 0x102e5fc: beq   v0, zero, 0x102e624 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102e614
+	brfalse L_102e624
 // --- basic block ---
-// 0x0102e5f4: 0x102e5f4: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0102e604: 0x102e604: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e5fc: 0x102e5fc: lui   a1, 0x10000
+// 0x0102e60c: 0x102e60c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102e600: 0x102e600: addu  a0, v0, zero
+// 0x0102e610: 0x102e610: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102e604: 0x102e604: jal   0x1001b14 addiu a1, a1, -2564
+// 0x0102e614: 0x102e614: jal   0x1001b14 addiu a1, a1, -2568
 	ldloc.2
-	ldc.i4 -2564
+	ldc.i4 -2568
 	add
 	stloc.2
 	ldloc.1
@@ -6753,15 +6753,15 @@ L_102e5ac:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102e60c: 0x102e60c: bne   v0, zero, 0x102e638 sll   zero, zero, 0
+// 0x0102e61c: 0x102e61c: bne   v0, zero, 0x102e648 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102e638
+	brtrue L_102e648
 // --- basic block ---
-L_102e614:
-// 0x0102e614: 0x102e614: addu  a1, zero, zero
+L_102e624:
+// 0x0102e624: 0x102e624: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102e618: 0x102e618: jal   0x102d7fc addu  a0, zero, zero
+// 0x0102e628: 0x102e628: jal   0x102d80c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6769,12 +6769,12 @@ L_102e614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::on_closed_alerts_quick_menu_102d7fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::on_closed_alerts_quick_menu_102d80c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e620: 0x102e620: jal   0x1094b64 addu  a0, zero, zero
+// 0x0102e630: 0x102e630: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6782,86 +6782,86 @@ L_102e614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e628: 0x102e628: jal   0x102146c sll   zero, zero, 0
+// 0x0102e638: 0x102e638: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e630: 0x102e630: j	 0x102e878 sll   zero, zero, 0
-	br L_102e878
+// 0x0102e640: 0x102e640: j	 0x102e888 sll   zero, zero, 0
+	br L_102e888
 // --- basic block ---
-L_102e638:
-// 0x0102e638: 0x102e638: jal   0x106c170 sll   zero, zero, 0
+L_102e648:
+// 0x0102e648: 0x102e648: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e640: 0x102e640: bne   v0, zero, 0x102e678 addu  s1, v0, zero
+// 0x0102e650: 0x102e650: bne   v0, zero, 0x102e688 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_102e678
+	brtrue L_102e688
 // --- basic block ---
-// 0x0102e648: 0x102e648: bne   s2, zero, 0x102e664 sll   zero, zero, 0
+// 0x0102e658: 0x102e658: bne   s2, zero, 0x102e674 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_102e664
+	brtrue L_102e674
 // --- basic block ---
-// 0x0102e650: 0x102e650: lui   a0, 0x10000
+// 0x0102e660: 0x102e660: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e654: 0x102e654: lui   a1, 0x10000
+// 0x0102e664: 0x102e664: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102e658: 0x102e658: addiu a0, a0, -24272
+// 0x0102e668: 0x102e668: addiu a0, a0, -24272
 	ldloc.1
 	ldc.i4 -24272
 	add
 	stloc.1
-// 0x0102e65c: 0x102e65c: j	 0x102e748 addiu a1, a1, -24252
+// 0x0102e66c: 0x102e66c: j	 0x102e758 addiu a1, a1, -24252
 	ldloc.2
 	ldc.i4 -24252
 	add
 	stloc.2
-	br L_102e748
+	br L_102e758
 // --- basic block ---
-L_102e664:
-// 0x0102e664: 0x102e664: lui   a0, 0x10000
+L_102e674:
+// 0x0102e674: 0x102e674: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e668: 0x102e668: lui   a1, 0x10000
+// 0x0102e678: 0x102e678: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102e66c: 0x102e66c: addiu a0, a0, -24164
+// 0x0102e67c: 0x102e67c: addiu a0, a0, -24164
 	ldloc.1
 	ldc.i4 -24164
 	add
 	stloc.1
-// 0x0102e670: 0x102e670: j	 0x102e748 addiu a1, a1, -24140
+// 0x0102e680: 0x102e680: j	 0x102e758 addiu a1, a1, -24140
 	ldloc.2
 	ldc.i4 -24140
 	add
 	stloc.2
-	br L_102e748
+	br L_102e758
 // --- basic block ---
-L_102e678:
-// 0x0102e678: 0x102e678: jal   0x1000910 addiu a0, zero, 20
+L_102e688:
+// 0x0102e688: 0x102e688: jal   0x1000910 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -6874,21 +6874,21 @@ L_102e678:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e680: 0x102e680: lui   a0, 0x10000
+// 0x0102e690: 0x102e690: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e684: 0x102e684: addu  s0, v0, zero
+// 0x0102e694: 0x102e694: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0102e688: 0x102e688: addu  a2, v0, zero
+// 0x0102e698: 0x102e698: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0102e68c: 0x102e68c: addiu a0, a0, -25252
+// 0x0102e69c: 0x102e69c: addiu a0, a0, -25252
 	ldloc.1
 	ldc.i4 -25252
 	add
 	stloc.1
-// 0x0102e690: 0x102e690: jal   0x1004a38 addiu a1, zero, 2148
+// 0x0102e6a0: 0x102e6a0: jal   0x1004a48 addiu a1, zero, 2148
 	ldc.i4 2148
 	stloc.2
 	ldloc.0
@@ -6896,20 +6896,20 @@ L_102e678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e698: 0x102e698: addu  a0, s0, zero
+// 0x0102e6a8: 0x102e6a8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102e69c: 0x102e69c: addiu a1, sp, 44
+// 0x0102e6ac: 0x102e6ac: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x0102e6a0: 0x102e6a0: jal   0x1029da8 addiu a2, sp, 24
+// 0x0102e6b0: 0x102e6b0: jal   0x1029db8 addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6919,22 +6919,22 @@ L_102e678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e6a8: 0x102e6a8: addiu v1, zero, -1
+// 0x0102e6b8: 0x102e6b8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0102e6ac: 0x102e6ac: bne   v0, v1, 0x102e860 lui   a0, 0x10000
+// 0x0102e6bc: 0x102e6bc: bne   v0, v1, 0x102e870 lui   a0, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	bne.un L_102e860
+	bne.un L_102e870
 // --- basic block ---
-// 0x0102e6b4: 0x102e6b4: jal   0x101df50 addiu a0, a0, -31052
+// 0x0102e6c4: 0x102e6c4: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -6944,38 +6944,38 @@ L_102e678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e6bc: 0x102e6bc: beq   v0, zero, 0x102e6cc sll   zero, zero, 0
+// 0x0102e6cc: 0x102e6cc: beq   v0, zero, 0x102e6dc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102e6cc
+	brfalse L_102e6dc
 // --- basic block ---
-// 0x0102e6c4: 0x102e6c4: bne   s2, zero, 0x102e710 sll   zero, zero, 0
+// 0x0102e6d4: 0x102e6d4: bne   s2, zero, 0x102e720 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_102e710
+	brtrue L_102e720
 // --- basic block ---
-L_102e6cc:
-// 0x0102e6cc: 0x102e6cc: jal   0x1015c94 sll   zero, zero, 0
-	call int32 Cibyl16::roadmap_verbosity_1015c94()
+L_102e6dc:
+// 0x0102e6dc: 0x102e6dc: jal   0x1015ca4 sll   zero, zero, 0
+	call int32 Cibyl16::roadmap_verbosity_1015ca4()
 	stloc 5
 // --- basic block ---
-// 0x0102e6d4: 0x102e6d4: slti  v0, v0, 2
+// 0x0102e6e4: 0x102e6e4: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0102e6d8: 0x102e6d8: beq   v0, zero, 0x102e730 lui   a0, 0x20000
+// 0x0102e6e8: 0x102e6e8: beq   v0, zero, 0x102e740 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_102e730
+	brfalse L_102e740
 // --- basic block ---
-// 0x0102e6e0: 0x102e6e0: jal   0x101df50 addiu a0, a0, 6792
+// 0x0102e6f0: 0x102e6f0: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -6983,37 +6983,37 @@ L_102e6cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e6e8: 0x102e6e8: beq   v0, zero, 0x102e804 lui   v1, 0x2120000
+// 0x0102e6f8: 0x102e6f8: beq   v0, zero, 0x102e814 lui   v1, 0x2120000
 	ldloc 5
 	ldc.i4 34734080
 	stloc 6
-	brfalse L_102e804
+	brfalse L_102e814
 // --- basic block ---
-// 0x0102e6f0: 0x102e6f0: lw    a0, 0(v0)
+// 0x0102e700: 0x102e700: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0102e6f4: 0x102e6f4: ori   v1, v1, 60730
+// 0x0102e704: 0x102e704: ori   v1, v1, 60730
 	ldloc 6
 	ldc.i4 60730
 	or
 	stloc 6
-// 0x0102e6f8: 0x102e6f8: bne   a0, v1, 0x102e710 lui   v1, 0x1e90000
+// 0x0102e708: 0x102e708: bne   a0, v1, 0x102e720 lui   v1, 0x1e90000
 	ldloc.1
 	ldloc 6
 	ldc.i4 32047104
 	stloc 6
-	bne.un L_102e710
+	bne.un L_102e720
 // --- basic block ---
-// 0x0102e700: 0x102e700: lw    a0, 4(v0)
+// 0x0102e710: 0x102e710: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7022,18 +7022,18 @@ L_102e6cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102e704: 0x102e704: ori   v1, v1, 58906
+// 0x0102e714: 0x102e714: ori   v1, v1, 58906
 	ldloc 6
 	ldc.i4 58906
 	or
 	stloc 6
-// 0x0102e708: 0x102e708: beq   a0, v1, 0x102e804 sll   zero, zero, 0
+// 0x0102e718: 0x102e718: beq   a0, v1, 0x102e814 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_102e804
+	beq  L_102e814
 // --- basic block ---
-L_102e710:
-// 0x0102e710: 0x102e710: lw    v1, 4(v0)
+L_102e720:
+// 0x0102e720: 0x102e720: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7042,8 +7042,8 @@ L_102e710:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102e714: 0x102e714: sll   zero, zero, 0
-// 0x0102e718: 0x102e718: sw    v1, 4(s0)
+// 0x0102e724: 0x102e724: sll   zero, zero, 0
+// 0x0102e728: 0x102e728: sw    v1, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7052,14 +7052,14 @@ L_102e710:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102e71c: 0x102e71c: lw    v0, 0(v0)
+// 0x0102e72c: 0x102e72c: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102e720: 0x102e720: sw    zero, 12(s0)
+// 0x0102e730: 0x102e730: sw    zero, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7068,14 +7068,14 @@ L_102e710:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102e724: 0x102e724: sw    v0, 0(s0)
+// 0x0102e734: 0x102e734: sw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0102e728: 0x102e728: j	 0x102e860 sw    zero, 16(s0)
+// 0x0102e738: 0x102e738: j	 0x102e870 sw    zero, 16(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7084,10 +7084,10 @@ L_102e710:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_102e860
+	br L_102e870
 // --- basic block ---
-L_102e730:
-// 0x0102e730: 0x102e730: jal   0x1000930 addu  a0, s0, zero
+L_102e740:
+// 0x0102e740: 0x102e740: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7100,24 +7100,24 @@ L_102e730:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e738: 0x102e738: lui   a0, 0x10000
+// 0x0102e748: 0x102e748: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102e73c: 0x102e73c: lui   a1, 0x10000
+// 0x0102e74c: 0x102e74c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102e740: 0x102e740: addiu a0, a0, -24072
+// 0x0102e750: 0x102e750: addiu a0, a0, -24072
 	ldloc.1
 	ldc.i4 -24072
 	add
 	stloc.1
-// 0x0102e744: 0x102e744: addiu a1, a1, -24052
+// 0x0102e754: 0x102e754: addiu a1, a1, -24052
 	ldloc.2
 	ldc.i4 -24052
 	add
 	stloc.2
-L_102e748:
-// 0x0102e748: 0x102e748: jal   0x104bfe4 addiu a2, zero, 5
+L_102e758:
+// 0x0102e758: 0x102e758: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -7125,19 +7125,19 @@ L_102e748:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e750: 0x102e750: j	 0x102e878 sll   zero, zero, 0
-	br L_102e878
+// 0x0102e760: 0x102e760: j	 0x102e888 sll   zero, zero, 0
+	br L_102e888
 // --- basic block ---
-L_102e758:
-// 0x0102e758: 0x102e758: lui   v0, 0x0
+L_102e768:
+// 0x0102e768: 0x102e768: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102e75c: 0x102e75c: lw    v0, 576(v0)
+// 0x0102e76c: 0x102e76c: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7146,7 +7146,7 @@ L_102e758:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102e760: 0x102e760: lw    a0, 56(sp)
+// 0x0102e770: 0x102e770: lw    a0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7155,30 +7155,30 @@ L_102e758:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102e764: 0x102e764: sll   zero, zero, 0
-// 0x0102e768: 0x102e768: beq   a0, v0, 0x102e780 sll   zero, zero, 0
+// 0x0102e774: 0x102e774: sll   zero, zero, 0
+// 0x0102e778: 0x102e778: beq   a0, v0, 0x102e790 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_102e780
+	beq  L_102e790
 // --- basic block ---
-// 0x0102e770: 0x102e770: bltz  a0, 0x102e780 sll   zero, zero, 0
+// 0x0102e780: 0x102e780: bltz  a0, 0x102e790 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_102e780
+	blt L_102e790
 // --- basic block ---
-// 0x0102e778: 0x102e778: jal   0x100b164 sll   zero, zero, 0
+// 0x0102e788: 0x102e788: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102e780:
-// 0x0102e780: 0x102e780: lw    a1, 24(sp)
+L_102e790:
+// 0x0102e790: 0x102e790: lw    a1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7187,10 +7187,10 @@ L_102e780:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102e784: 0x102e784: addiu v1, zero, 2
+// 0x0102e794: 0x102e794: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0102e788: 0x102e788: lw    a0, 48(sp)
+// 0x0102e798: 0x102e798: lw    a0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7199,34 +7199,34 @@ L_102e780:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102e78c: 0x102e78c: addiu v0, sp, 28
+// 0x0102e79c: 0x102e79c: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x0102e790: 0x102e790: beq   a1, v1, 0x102e7a0 addiu a2, sp, 32
+// 0x0102e7a0: 0x102e7a0: beq   a1, v1, 0x102e7b0 addiu a2, sp, 32
 	ldloc.2
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-	beq  L_102e7a0
+	beq  L_102e7b0
 // --- basic block ---
-// 0x0102e798: 0x102e798: j	 0x102e7a8 addu  a1, v0, zero
+// 0x0102e7a8: 0x102e7a8: j	 0x102e7b8 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-	br L_102e7a8
+	br L_102e7b8
 // --- basic block ---
-L_102e7a0:
-// 0x0102e7a0: 0x102e7a0: addu  a1, a2, zero
+L_102e7b0:
+// 0x0102e7b0: 0x102e7b0: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x0102e7a4: 0x102e7a4: addu  a2, v0, zero
+// 0x0102e7b4: 0x102e7b4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_102e7a8:
-// 0x0102e7a8: 0x102e7a8: jal   0x1003fc8 sll   zero, zero, 0
+L_102e7b8:
+// 0x0102e7b8: 0x102e7b8: jal   0x1003fc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7237,11 +7237,11 @@ L_102e7a8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e7b0: 0x102e7b0: j	 0x102e7bc sll   zero, zero, 0
-	br L_102e7bc
+// 0x0102e7c0: 0x102e7c0: j	 0x102e7cc sll   zero, zero, 0
+	br L_102e7cc
 // --- basic block ---
-L_102e7b8:
-// 0x0102e7b8: 0x102e7b8: sw    v0, 28(sp)
+L_102e7c8:
+// 0x0102e7c8: 0x102e7c8: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7250,8 +7250,8 @@ L_102e7b8:
 	add
 	ldloc 5
 	stelem.i4
-L_102e7bc:
-// 0x0102e7bc: 0x102e7bc: lw    v0, 28(sp)
+L_102e7cc:
+// 0x0102e7cc: 0x102e7cc: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7260,10 +7260,10 @@ L_102e7bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102e7c0: 0x102e7c0: lui   s2, 0x10000
+// 0x0102e7d0: 0x102e7d0: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0102e7c4: 0x102e7c4: sw    v0, 16(sp)
+// 0x0102e7d4: 0x102e7d4: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7272,10 +7272,10 @@ L_102e7bc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102e7c8: 0x102e7c8: lui   a1, 0x20000
+// 0x0102e7d8: 0x102e7d8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0102e7cc: 0x102e7cc: lw    v0, 32(sp)
+// 0x0102e7dc: 0x102e7dc: lw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7284,28 +7284,28 @@ L_102e7bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102e7d0: 0x102e7d0: lui   a2, 0x10000
+// 0x0102e7e0: 0x102e7e0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102e7d4: 0x102e7d4: addiu a1, a1, -28932
+// 0x0102e7e4: 0x102e7e4: addiu a1, a1, -28468
 	ldloc.2
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.2
-// 0x0102e7d8: 0x102e7d8: addiu a2, a2, -23956
+// 0x0102e7e8: 0x102e7e8: addiu a2, a2, -23956
 	ldloc.3
 	ldc.i4 -23956
 	add
 	stloc.3
-// 0x0102e7dc: 0x102e7dc: addu  a3, s0, zero
+// 0x0102e7ec: 0x102e7ec: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x0102e7e0: 0x102e7e0: addiu a0, s2, -23972
+// 0x0102e7f0: 0x102e7f0: addiu a0, s2, -23972
 	ldloc 10
 	ldc.i4 -23972
 	add
 	stloc.1
-// 0x0102e7e4: 0x102e7e4: jal   0x101f5a8 sw    v0, 20(sp)
+// 0x0102e7f4: 0x102e7f4: jal   0x101f5b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7319,12 +7319,12 @@ L_102e7bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_gps_and_nodes_position_101f5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_gps_and_nodes_position_101f5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e7ec: 0x102e7ec: jal   0x101ece8 addiu a0, s2, -23972
+// 0x0102e7fc: 0x102e7fc: jal   0x101ecf8 addiu a0, s2, -23972
 	ldloc 10
 	ldc.i4 -23972
 	add
@@ -7334,12 +7334,12 @@ L_102e7bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e7f4: 0x102e7f4: jal   0x1000930 addu  a0, s0, zero
+// 0x0102e804: 0x102e804: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7352,37 +7352,37 @@ L_102e7bc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e7fc: 0x102e7fc: jal   0x102146c sll   zero, zero, 0
+// 0x0102e80c: 0x102e80c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102e804:
-// 0x0102e804: 0x102e804: jal   0x1077b68 sll   s1, s1, 2
+L_102e814:
+// 0x0102e814: 0x102e814: jal   0x107818c sll   s1, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-	call int32 Cibyl89::RTAlerts_Resert_Minimized_1077b68()
+	call int32 Cibyl90::RTAlerts_Resert_Minimized_107818c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e80c: 0x102e80c: lui   v0, 0x10000
+// 0x0102e81c: 0x102e81c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0102e810: 0x102e810: addiu v0, v0, -24288
+// 0x0102e820: 0x102e820: addiu v0, v0, -24288
 	ldloc 5
 	ldc.i4 -24288
 	add
 	stloc 5
-// 0x0102e814: 0x102e814: sw    v0, 36(sp)
+// 0x0102e824: 0x102e824: sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7391,15 +7391,15 @@ L_102e804:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102e818: 0x102e818: lui   v0, 0x10000
+// 0x0102e828: 0x102e828: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0102e81c: 0x102e81c: addiu v0, v0, -2564
+// 0x0102e82c: 0x102e82c: addiu v0, v0, -2568
 	ldloc 5
-	ldc.i4 -2564
+	ldc.i4 -2568
 	add
 	stloc 5
-// 0x0102e820: 0x102e820: sw    v0, 40(sp)
+// 0x0102e830: 0x102e830: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7408,12 +7408,12 @@ L_102e804:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102e824: 0x102e824: addu  s1, sp, s1
+// 0x0102e834: 0x102e834: addu  s1, sp, s1
 	ldloc.0
 	ldloc 9
 	add
 	stloc 9
-// 0x0102e828: 0x102e828: lw    a0, 36(s1)
+// 0x0102e838: 0x102e838: lw    a0, 36(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7422,21 +7422,21 @@ L_102e804:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102e82c: 0x102e82c: lui   v0, 0x0
+// 0x0102e83c: 0x102e83c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0102e830: 0x102e830: addiu v0, v0, 6836
+// 0x0102e840: 0x102e840: addiu v0, v0, 6836
 	ldloc 5
 	ldc.i4 6836
 	add
 	stloc 5
-// 0x0102e834: 0x102e834: lui   a2, 0x60000
+// 0x0102e844: 0x102e844: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0102e838: 0x102e838: lui   a3, 0x1030000
+// 0x0102e848: 0x102e848: lui   a3, 0x1030000
 	ldc.i4 16973824
 	stloc 4
-// 0x0102e83c: 0x102e83c: sw    v0, 16(sp)
+// 0x0102e84c: 0x102e84c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7445,23 +7445,23 @@ L_102e804:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102e840: 0x102e840: addiu a2, a2, -23996
+// 0x0102e850: 0x102e850: addiu a2, a2, -23532
 	ldloc.3
-	ldc.i4 -23996
+	ldc.i4 -23532
 	add
 	stloc.3
-// 0x0102e844: 0x102e844: lui   v0, 0x90000
+// 0x0102e854: 0x102e854: lui   v0, 0x90000
 	ldc.i4 589824
 	stloc 5
-// 0x0102e848: 0x102e848: addiu a3, a3, -10244
+// 0x0102e858: 0x102e858: addiu a3, a3, -10228
 	ldloc 4
-	ldc.i4 -10244
+	ldc.i4 -10228
 	add
 	stloc 4
-// 0x0102e84c: 0x102e84c: addu  a1, a0, zero
+// 0x0102e85c: 0x102e85c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0102e850: 0x102e850: jal   0x1096e4c sw    v0, 20(sp)
+// 0x0102e860: 0x102e860: jal   0x1097494 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7475,16 +7475,16 @@ L_102e804:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_list_menu_activate_1096e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_list_menu_activate_1097494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e858: 0x102e858: j	 0x102e878 sll   zero, zero, 0
-	br L_102e878
+// 0x0102e868: 0x102e868: j	 0x102e888 sll   zero, zero, 0
+	br L_102e888
 // --- basic block ---
-L_102e860:
-// 0x0102e860: 0x102e860: lw    v0, 44(sp)
+L_102e870:
+// 0x0102e870: 0x102e870: lw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7493,15 +7493,15 @@ L_102e860:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102e864: 0x102e864: addiu v1, zero, -1
+// 0x0102e874: 0x102e874: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0102e868: 0x102e868: bne   v0, v1, 0x102e758 sll   zero, zero, 0
+// 0x0102e878: 0x102e878: bne   v0, v1, 0x102e768 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_102e758
+	bne.un L_102e768
 // --- basic block ---
-// 0x0102e870: 0x102e870: j	 0x102e7b8 sw    v0, 32(sp)
+// 0x0102e880: 0x102e880: j	 0x102e7c8 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7510,11 +7510,11 @@ L_102e860:
 	add
 	ldloc 5
 	stelem.i4
-	br L_102e7b8
+	br L_102e7c8
 // --- basic block ---
-L_102e878:
-// 0x0102e878: 0x102e878: lw    ra, 76(sp)
-// 0x0102e87c: 0x102e87c: lw    s2, 72(sp)
+L_102e888:
+// 0x0102e888: 0x102e888: lw    ra, 76(sp)
+// 0x0102e88c: 0x102e88c: lw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7523,7 +7523,7 @@ L_102e878:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102e880: 0x102e880: lw    s1, 68(sp)
+// 0x0102e890: 0x102e890: lw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7532,7 +7532,7 @@ L_102e878:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102e884: 0x102e884: lw    s0, 64(sp)
+// 0x0102e894: 0x102e894: lw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7541,7 +7541,7 @@ L_102e878:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102e888: 0x102e888: jr    ra addiu sp, sp, 80
+// 0x0102e898: 0x102e898: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
diff --git a/converted/Cibyl34.j b/converted/Cibyl34.j
index 61bf501..dcab940 100644
--- a/converted/Cibyl34.j
+++ b/converted/Cibyl34.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl34::.ctor
 
-.method public static int32 on_key_pressed_102e890(int32,int32,int32,int32,int32)
+.method public static int32 on_key_pressed_102e8a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 lo,int32 ra)
@@ -88,12 +88,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102e890: 0x102e890: addiu sp, sp, -48
+// 0x0102e8a0: 0x102e8a0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0102e894: 0x102e894: sw    a0, 24(sp)
+// 0x0102e8a4: 0x102e8a4: sw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -102,7 +102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0102e898: 0x102e898: sw    a1, 28(sp)
+// 0x0102e8a8: 0x102e8a8: sw    a1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -111,8 +111,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0102e89c: 0x102e89c: sw    ra, 44(sp)
-// 0x0102e8a0: 0x102e8a0: sw    s2, 40(sp)
+// 0x0102e8ac: 0x102e8ac: sw    ra, 44(sp)
+// 0x0102e8b0: 0x102e8b0: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -121,7 +121,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102e8a4: 0x102e8a4: sw    s1, 36(sp)
+// 0x0102e8b4: 0x102e8b4: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -130,7 +130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102e8a8: 0x102e8a8: jal   0x1093f90 sw    s0, 32(sp)
+// 0x0102e8b8: 0x102e8b8: jal   0x10945b4 sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -139,10 +139,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0102e8b0: 0x102e8b0: lw    a0, 24(sp)
+// 0x0102e8c0: 0x102e8c0: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -151,7 +151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102e8b4: 0x102e8b4: lw    a1, 28(sp)
+// 0x0102e8c4: 0x102e8c4: lw    a1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -160,180 +160,180 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102e8b8: 0x102e8b8: bne   v0, zero, 0x102ec88 addu  v1, zero, zero
+// 0x0102e8c8: 0x102e8c8: bne   v0, zero, 0x102ec98 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_102ec88
+	brtrue L_102ec98
 // --- basic block ---
-// 0x0102e8c0: 0x102e8c0: andi  v0, a1, 1
+// 0x0102e8d0: 0x102e8d0: andi  v0, a1, 1
 	ldloc.2
 	ldc.i4.1
 	and
 	stloc 5
-// 0x0102e8c4: 0x102e8c4: beq   v0, zero, 0x102e990 sll   zero, zero, 0
+// 0x0102e8d4: 0x102e8d4: beq   v0, zero, 0x102e9a0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102e990
+	brfalse L_102e9a0
 // --- basic block ---
-// 0x0102e8cc: 0x102e8cc: lbu   v0, 0(a0)
+// 0x0102e8dc: 0x102e8dc: lbu   v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0102e8d0: 0x102e8d0: sll   zero, zero, 0
-// 0x0102e8d4: 0x102e8d4: addiu v0, v0, -1
+// 0x0102e8e0: 0x102e8e0: sll   zero, zero, 0
+// 0x0102e8e4: 0x102e8e4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0102e8d8: 0x102e8d8: andi  v0, v0, 255
+// 0x0102e8e8: 0x102e8e8: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x0102e8dc: 0x102e8dc: sltiu v1, v0, 7
+// 0x0102e8ec: 0x102e8ec: sltiu v1, v0, 7
 	ldloc 5
 	ldc.i4.7
 	clt.un
 	stloc 6
-// 0x0102e8e0: 0x102e8e0: beq   v1, zero, 0x102ec88 addu  v1, zero, zero
+// 0x0102e8f0: 0x102e8f0: beq   v1, zero, 0x102ec98 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_102ec88
+	brfalse L_102ec98
 // --- basic block ---
-// 0x0102e8e8: 0x102e8e8: lui   v1, 0x20000
+// 0x0102e8f8: 0x102e8f8: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0102e8ec: 0x102e8ec: sll   v0, v0, 2
+// 0x0102e8fc: 0x102e8fc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0102e8f0: 0x102e8f0: addiu v1, v1, 24952
+// 0x0102e900: 0x102e900: addiu v1, v1, 25416
 	ldloc 6
-	ldc.i4 24952
+	ldc.i4 25416
 	add
 	stloc 6
-// 0x0102e8f4: 0x102e8f4: addu  v0, v1, v0
+// 0x0102e904: 0x102e904: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0102e8f8: 0x102e8f8: lw    v0, 0(v0)
+// 0x0102e908: 0x102e908: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102e8fc: 0x102e8fc: sll   zero, zero, 0
-// 0x0102e900: 0x102e900: jr    v0 sll   zero, zero, 0
+// 0x0102e90c: 0x102e90c: sll   zero, zero, 0
+// 0x0102e910: 0x102e910: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_102e908:
-// 0x0102e908: 0x102e908: jal   0x1021394 sll   zero, zero, 0
+L_102e918:
+// 0x0102e918: 0x102e918: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e910: 0x102e910: jal   0x1020bdc sll   zero, zero, 0
+// 0x0102e920: 0x102e920: jal   0x1020bec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_up_1020bdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_up_1020bec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e918: 0x102e918: j	 0x102e960 sll   zero, zero, 0
-	br L_102e960
+// 0x0102e928: 0x102e928: j	 0x102e970 sll   zero, zero, 0
+	br L_102e970
 // --- basic block ---
-L_102e920:
-// 0x0102e920: 0x102e920: jal   0x1021394 sll   zero, zero, 0
+L_102e930:
+// 0x0102e930: 0x102e930: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e928: 0x102e928: jal   0x1020ba0 sll   zero, zero, 0
+// 0x0102e938: 0x102e938: jal   0x1020bb0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_down_1020ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_down_1020bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e930: 0x102e930: j	 0x102e960 sll   zero, zero, 0
-	br L_102e960
+// 0x0102e940: 0x102e940: j	 0x102e970 sll   zero, zero, 0
+	br L_102e970
 // --- basic block ---
-L_102e938:
-// 0x0102e938: 0x102e938: jal   0x1021394 sll   zero, zero, 0
+L_102e948:
+// 0x0102e948: 0x102e948: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e940: 0x102e940: jal   0x1020b28 sll   zero, zero, 0
+// 0x0102e950: 0x102e950: jal   0x1020b38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_left_1020b28(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_left_1020b38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e948: 0x102e948: j	 0x102e960 sll   zero, zero, 0
-	br L_102e960
+// 0x0102e958: 0x102e958: j	 0x102e970 sll   zero, zero, 0
+	br L_102e970
 // --- basic block ---
-L_102e950:
-// 0x0102e950: 0x102e950: jal   0x1021394 sll   zero, zero, 0
+L_102e960:
+// 0x0102e960: 0x102e960: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e958: 0x102e958: jal   0x1020b64 sll   zero, zero, 0
+// 0x0102e968: 0x102e968: jal   0x1020b74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_right_1020b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_right_1020b74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102e960:
-// 0x0102e960: 0x102e960: jal   0x101fc00 addiu a0, zero, 1
+L_102e970:
+// 0x0102e970: 0x102e970: jal   0x101fc10 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -341,164 +341,164 @@ L_102e960:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e968: 0x102e968: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102e978: 0x102e978: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
-L_102e970:
-// 0x0102e970: 0x102e970: jal   0x103fa1c sll   zero, zero, 0
+L_102e980:
+// 0x0102e980: 0x102e980: jal   0x103fa2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_left_softkey_callback_103fa1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_left_softkey_callback_103fa2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e978: 0x102e978: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102e988: 0x102e988: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
-L_102e980:
-// 0x0102e980: 0x102e980: jal   0x103fa80 sll   zero, zero, 0
+L_102e990:
+// 0x0102e990: 0x102e990: jal   0x103fa90 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_right_softkey_callback_103fa80(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_right_softkey_callback_103fa90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102e988: 0x102e988: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102e998: 0x102e998: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
-L_102e990:
-// 0x0102e990: 0x102e990: andi  a1, a1, 2
+L_102e9a0:
+// 0x0102e9a0: 0x102e9a0: andi  a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	and
 	stloc.2
-// 0x0102e994: 0x102e994: beq   a1, zero, 0x102ec88 addu  v1, zero, zero
+// 0x0102e9a4: 0x102e9a4: beq   a1, zero, 0x102ec98 addu  v1, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_102ec88
+	brfalse L_102ec98
 // --- basic block ---
-// 0x0102e99c: 0x102e99c: lbu   v0, 0(a0)
+// 0x0102e9ac: 0x102e9ac: lbu   v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0102e9a0: 0x102e9a0: sll   zero, zero, 0
-// 0x0102e9a4: 0x102e9a4: addiu v0, v0, -13
+// 0x0102e9b0: 0x102e9b0: sll   zero, zero, 0
+// 0x0102e9b4: 0x102e9b4: addiu v0, v0, -13
 	ldloc 5
 	ldc.i4.s -13
 	add
 	stloc 5
-// 0x0102e9a8: 0x102e9a8: andi  v0, v0, 255
+// 0x0102e9b8: 0x102e9b8: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x0102e9ac: 0x102e9ac: sltiu v1, v0, 110
+// 0x0102e9bc: 0x102e9bc: sltiu v1, v0, 110
 	ldloc 5
 	ldc.i4.s 110
 	clt.un
 	stloc 6
-// 0x0102e9b0: 0x102e9b0: beq   v1, zero, 0x102ec88 addu  v1, zero, zero
+// 0x0102e9c0: 0x102e9c0: beq   v1, zero, 0x102ec98 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_102ec88
+	brfalse L_102ec98
 // --- basic block ---
-// 0x0102e9b8: 0x102e9b8: lui   v1, 0x20000
+// 0x0102e9c8: 0x102e9c8: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0102e9bc: 0x102e9bc: sll   v0, v0, 2
+// 0x0102e9cc: 0x102e9cc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0102e9c0: 0x102e9c0: addiu v1, v1, 24980
+// 0x0102e9d0: 0x102e9d0: addiu v1, v1, 25444
 	ldloc 6
-	ldc.i4 24980
+	ldc.i4 25444
 	add
 	stloc 6
-// 0x0102e9c4: 0x102e9c4: addu  v0, v1, v0
+// 0x0102e9d4: 0x102e9d4: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0102e9c8: 0x102e9c8: lw    v0, 0(v0)
+// 0x0102e9d8: 0x102e9d8: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102e9cc: 0x102e9cc: sll   zero, zero, 0
-// 0x0102e9d0: 0x102e9d0: jr    v0 sll   zero, zero, 0
+// 0x0102e9dc: 0x102e9dc: sll   zero, zero, 0
+// 0x0102e9e0: 0x102e9e0: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_102e9d8:
-// 0x0102e9d8: 0x102e9d8: jal   0x101fab8 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_xicon_open_101fab8()
+L_102e9e8:
+// 0x0102e9e8: 0x102e9e8: jal   0x101fac8 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_xicon_open_101fac8()
 	stloc 5
 // --- basic block ---
-// 0x0102e9e0: 0x102e9e0: beq   v0, zero, 0x102ea28 lui   v0, 0xf0000
+// 0x0102e9f0: 0x102e9f0: beq   v0, zero, 0x102ea38 lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brfalse L_102ea28
+	brfalse L_102ea38
 // --- basic block ---
-// 0x0102e9e8: 0x102e9e8: lw    v1, -30072(v0)
+// 0x0102e9f8: 0x102e9f8: lw    v1, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102e9ec: 0x102e9ec: lui   v0, 0xf0000
+// 0x0102e9fc: 0x102e9fc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0102e9f0: 0x102e9f0: lw    a2, -30068(v0)
+// 0x0102ea00: 0x102ea00: lw    a2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102e9f4: 0x102e9f4: addiu v0, zero, 2
+// 0x0102ea04: 0x102ea04: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0102e9f8: 0x102e9f8: div   a2, v0
+// 0x0102ea08: 0x102ea08: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 11
-// 0x0102e9fc: 0x102e9fc: addiu a0, zero, 8
+// 0x0102ea0c: 0x102ea0c: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x0102ea00: 0x102ea00: addiu a1, sp, 16
+// 0x0102ea10: 0x102ea10: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0102ea04: 0x102ea04: mflo  lo
+// 0x0102ea14: 0x102ea14: mflo  lo
 	ldloc 11
 	stloc.3
-// 0x0102ea08: 0x102ea08: sw    a2, 16(sp)
+// 0x0102ea18: 0x102ea18: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -507,16 +507,16 @@ L_102e9d8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0102ea0c: 0x102ea0c: sll   zero, zero, 0
-// 0x0102ea10: 0x102ea10: div   v1, v0
+// 0x0102ea1c: 0x102ea1c: sll   zero, zero, 0
+// 0x0102ea20: 0x102ea20: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 11
-// 0x0102ea14: 0x102ea14: mflo  lo
+// 0x0102ea24: 0x102ea24: mflo  lo
 	ldloc 11
 	stloc 6
-// 0x0102ea18: 0x102ea18: jal   0x104b624 sw    v1, 20(sp)
+// 0x0102ea28: 0x102ea28: jal   0x104b634 sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -530,34 +530,34 @@ L_102e9d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_force_click_104b624(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_force_click_104b634(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ea20: 0x102ea20: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102ea30: 0x102ea30: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
-L_102ea28:
-// 0x0102ea28: 0x102ea28: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+L_102ea38:
+// 0x0102ea38: 0x102ea38: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ea30: 0x102ea30: beq   v0, zero, 0x102ea88 addiu s0, zero, 1
+// 0x0102ea40: 0x102ea40: beq   v0, zero, 0x102ea98 addiu s0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 8
-	brfalse L_102ea88
+	brfalse L_102ea98
 // --- basic block ---
-// 0x0102ea38: 0x102ea38: lui   a1, 0x10000
+// 0x0102ea48: 0x102ea48: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102ea3c: 0x102ea3c: addu  a0, v0, zero
+// 0x0102ea4c: 0x102ea4c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102ea40: 0x102ea40: jal   0x1001b14 addiu a1, a1, -29680
+// 0x0102ea50: 0x102ea50: jal   0x1001b14 addiu a1, a1, -29680
 	ldloc.2
 	ldc.i4 -29680
 	add
@@ -567,14 +567,14 @@ L_102ea28:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102ea48: 0x102ea48: bne   v0, zero, 0x102ea84 sll   zero, zero, 0
+// 0x0102ea58: 0x102ea58: bne   v0, zero, 0x102ea94 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102ea84
+	brtrue L_102ea94
 // --- basic block ---
-// 0x0102ea50: 0x102ea50: lui   a0, 0x10000
+// 0x0102ea60: 0x102ea60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102ea54: 0x102ea54: jal   0x102c720 addiu a0, a0, -25084
+// 0x0102ea64: 0x102ea64: jal   0x102c730 addiu a0, a0, -25084
 	ldloc.1
 	ldc.i4 -25084
 	add
@@ -584,12 +584,12 @@ L_102ea28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ea5c: 0x102ea5c: lw    a0, 4(v0)
+// 0x0102ea6c: 0x102ea6c: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -598,7 +598,7 @@ L_102ea28:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102ea60: 0x102ea60: jal   0x101cd60 addu  s1, v0, zero
+// 0x0102ea70: 0x102ea70: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -606,12 +606,12 @@ L_102ea28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ea68: 0x102ea68: lw    a2, 20(s1)
+// 0x0102ea78: 0x102ea78: lw    a2, 20(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -620,39 +620,39 @@ L_102ea28:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102ea6c: 0x102ea6c: addu  a1, v0, zero
+// 0x0102ea7c: 0x102ea7c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102ea70: 0x102ea70: addiu a0, zero, 1
+// 0x0102ea80: 0x102ea80: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0102ea74: 0x102ea74: jal   0x104fad8 addiu s0, zero, 2
+// 0x0102ea84: 0x102ea84: jal   0x104fae8 addiu s0, zero, 2
 	ldc.i4.2
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ea7c: 0x102ea7c: j	 0x102ea8c lui   a0, 0x10000
+// 0x0102ea8c: 0x102ea8c: j	 0x102ea9c lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_102ea8c
+	br L_102ea9c
 // --- basic block ---
-L_102ea84:
-// 0x0102ea84: 0x102ea84: addiu s0, zero, 1
+L_102ea94:
+// 0x0102ea94: 0x102ea94: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_102ea88:
-// 0x0102ea88: 0x102ea88: lui   a0, 0x10000
+L_102ea98:
+// 0x0102ea98: 0x102ea98: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_102ea8c:
-// 0x0102ea8c: 0x102ea8c: jal   0x101cd60 addiu a0, a0, -23936
+L_102ea9c:
+// 0x0102ea9c: 0x102ea9c: jal   0x101cd70 addiu a0, a0, -23936
 	ldloc.1
 	ldc.i4 -23936
 	add
@@ -662,38 +662,38 @@ L_102ea8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ea94: 0x102ea94: lui   a2, 0x1030000
+// 0x0102eaa4: 0x102eaa4: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x0102ea98: 0x102ea98: addu  a1, v0, zero
+// 0x0102eaa8: 0x102eaa8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102ea9c: 0x102ea9c: addiu a2, a2, -6740
+// 0x0102eaac: 0x102eaac: addiu a2, a2, -6724
 	ldloc.3
-	ldc.i4 -6740
+	ldc.i4 -6724
 	add
 	stloc.3
-// 0x0102eaa0: 0x102eaa0: jal   0x104fad8 addu  a0, s0, zero
+// 0x0102eab0: 0x102eab0: jal   0x104fae8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eaa8: 0x102eaa8: lui   a0, 0x10000
+// 0x0102eab8: 0x102eab8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102eaac: 0x102eaac: jal   0x102c720 addiu a0, a0, -23928
+// 0x0102eabc: 0x102eabc: jal   0x102c730 addiu a0, a0, -23928
 	ldloc.1
 	ldc.i4 -23928
 	add
@@ -703,12 +703,12 @@ L_102ea8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eab4: 0x102eab4: lw    a0, 4(v0)
+// 0x0102eac4: 0x102eac4: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -717,10 +717,10 @@ L_102ea8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102eab8: 0x102eab8: addu  s1, v0, zero
+// 0x0102eac8: 0x102eac8: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0102eabc: 0x102eabc: jal   0x101cd60 addiu s2, s0, 1
+// 0x0102eacc: 0x102eacc: jal   0x101cd70 addiu s2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -730,12 +730,12 @@ L_102ea8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eac4: 0x102eac4: lw    a2, 20(s1)
+// 0x0102ead4: 0x102ead4: lw    a2, 20(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -744,25 +744,25 @@ L_102ea8c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102eac8: 0x102eac8: addu  a1, v0, zero
+// 0x0102ead8: 0x102ead8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102eacc: 0x102eacc: jal   0x104fad8 addu  a0, s2, zero
+// 0x0102eadc: 0x102eadc: jal   0x104fae8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ead4: 0x102ead4: lui   a0, 0x10000
+// 0x0102eae4: 0x102eae4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102ead8: 0x102ead8: jal   0x102c720 addiu a0, a0, -23912
+// 0x0102eae8: 0x102eae8: jal   0x102c730 addiu a0, a0, -23912
 	ldloc.1
 	ldc.i4 -23912
 	add
@@ -772,12 +772,12 @@ L_102ea8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eae0: 0x102eae0: lw    a0, 4(v0)
+// 0x0102eaf0: 0x102eaf0: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -786,10 +786,10 @@ L_102ea8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102eae4: 0x102eae4: addu  s2, v0, zero
+// 0x0102eaf4: 0x102eaf4: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0102eae8: 0x102eae8: jal   0x101cd60 addiu s1, s0, 2
+// 0x0102eaf8: 0x102eaf8: jal   0x101cd70 addiu s1, s0, 2
 	ldloc 8
 	ldc.i4.2
 	add
@@ -799,12 +799,12 @@ L_102ea8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eaf0: 0x102eaf0: lw    a2, 20(s2)
+// 0x0102eb00: 0x102eb00: lw    a2, 20(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -813,32 +813,32 @@ L_102ea8c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102eaf4: 0x102eaf4: addu  a0, s1, zero
+// 0x0102eb04: 0x102eb04: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0102eaf8: 0x102eaf8: jal   0x104fad8 addu  a1, v0, zero
+// 0x0102eb08: 0x102eb08: jal   0x104fae8 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb00: 0x102eb00: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x0102eb10: 0x102eb10: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x0102eb08: 0x102eb08: bne   v0, zero, 0x102eb34 lui   a0, 0x10000
+// 0x0102eb18: 0x102eb18: bne   v0, zero, 0x102eb44 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_102eb34
+	brtrue L_102eb44
 // --- basic block ---
-// 0x0102eb10: 0x102eb10: jal   0x102c720 addiu a0, a0, -25488
+// 0x0102eb20: 0x102eb20: jal   0x102c730 addiu a0, a0, -25488
 	ldloc.1
 	ldc.i4 -25488
 	add
@@ -848,12 +848,12 @@ L_102ea8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb18: 0x102eb18: lw    a0, 4(v0)
+// 0x0102eb28: 0x102eb28: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -862,7 +862,7 @@ L_102ea8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102eb1c: 0x102eb1c: jal   0x101cd60 addu  s1, v0, zero
+// 0x0102eb2c: 0x102eb2c: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -870,12 +870,12 @@ L_102ea8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb24: 0x102eb24: lw    a2, 20(s1)
+// 0x0102eb34: 0x102eb34: lw    a2, 20(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -884,246 +884,246 @@ L_102ea8c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102eb28: 0x102eb28: addiu a0, s0, 3
+// 0x0102eb38: 0x102eb38: addiu a0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	add
 	stloc.1
-// 0x0102eb2c: 0x102eb2c: jal   0x104fad8 addu  a1, v0, zero
+// 0x0102eb3c: 0x102eb3c: jal   0x104fae8 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_102eb34:
-// 0x0102eb34: 0x102eb34: jal   0x104fce4 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_main_show_miniMenu_104fce4()
+	call int32 Cibyl59::roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb3c: 0x102eb3c: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
-// --- basic block ---
 L_102eb44:
-// 0x0102eb44: 0x102eb44: jal   0x1021110 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_in_1021110(int32,int32,int32,int32,int32)
+// 0x0102eb44: 0x102eb44: jal   0x104fcf4 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_main_show_miniMenu_104fcf4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb4c: 0x102eb4c: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102eb4c: 0x102eb4c: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102eb54:
-// 0x0102eb54: 0x102eb54: jal   0x1021040 sll   zero, zero, 0
+// 0x0102eb54: 0x102eb54: jal   0x1021120 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_out_1021040(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_in_1021120(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb5c: 0x102eb5c: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102eb5c: 0x102eb5c: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102eb64:
-// 0x0102eb64: 0x102eb64: jal   0x107e894 sll   zero, zero, 0
+// 0x0102eb64: 0x102eb64: jal   0x1021050 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Scroll_Prev_107e894(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_out_1021050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb6c: 0x102eb6c: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102eb6c: 0x102eb6c: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102eb74:
-// 0x0102eb74: 0x102eb74: jal   0x1014670 sll   zero, zero, 0
+// 0x0102eb74: 0x102eb74: jal   0x107eeb8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_toggle_1014670(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Scroll_Prev_107eeb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb7c: 0x102eb7c: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102eb7c: 0x102eb7c: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102eb84:
-// 0x0102eb84: 0x102eb84: jal   0x102e5ac sll   zero, zero, 0
+// 0x0102eb84: 0x102eb84: jal   0x1014680 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::start_alerts_menu_102e5ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_toggle_1014680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb8c: 0x102eb8c: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102eb8c: 0x102eb8c: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102eb94:
-// 0x0102eb94: 0x102eb94: jal   0x107e96c sll   zero, zero, 0
+// 0x0102eb94: 0x102eb94: jal   0x102e5bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Scroll_Next_107e96c(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::start_alerts_menu_102e5bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102eb9c: 0x102eb9c: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102eb9c: 0x102eb9c: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102eba4:
-// 0x0102eba4: 0x102eba4: jal   0x102e564 sll   zero, zero, 0
+// 0x0102eba4: 0x102eba4: jal   0x107ef90 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::start_map_updates_menu_102e564(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Scroll_Next_107ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ebac: 0x102ebac: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102ebac: 0x102ebac: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102ebb4:
-// 0x0102ebb4: 0x102ebb4: jal   0x1039520 sll   zero, zero, 0
+// 0x0102ebb4: 0x102ebb4: jal   0x102e574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::search_menu_single_search_1039520(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::start_map_updates_menu_102e574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ebbc: 0x102ebbc: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102ebbc: 0x102ebbc: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102ebc4:
-// 0x0102ebc4: 0x102ebc4: jal   0x1050b24 sll   zero, zero, 0
+// 0x0102ebc4: 0x102ebc4: jal   0x1039530 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::search_menu_single_search_1039530(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ebcc: 0x102ebcc: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102ebcc: 0x102ebcc: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102ebd4:
-// 0x0102ebd4: 0x102ebd4: jal   0x105931c sll   zero, zero, 0
+// 0x0102ebd4: 0x102ebd4: jal   0x1050b34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::toggle_navigation_guidance_105931c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ebdc: 0x102ebdc: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102ebdc: 0x102ebdc: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102ebe4:
-// 0x0102ebe4: 0x102ebe4: jal   0x1021394 sll   zero, zero, 0
+// 0x0102ebe4: 0x102ebe4: jal   0x105932c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::toggle_navigation_guidance_105932c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ebec: 0x102ebec: jal   0x102172c sll   zero, zero, 0
+// 0x0102ebec: 0x102ebec: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
+// --- basic block ---
+L_102ebf4:
+// 0x0102ebf4: 0x102ebf4: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_toggle_orientation_mode_102172c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ebf4: 0x102ebf4: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
-// --- basic block ---
-L_102ebfc:
-// 0x0102ebfc: 0x102ebfc: jal   0x1039df4 sll   zero, zero, 0
+// 0x0102ebfc: 0x102ebfc: jal   0x102173c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::search_menu_search_favorites_1039df4(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_toggle_orientation_mode_102173c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ec04: 0x102ec04: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102ec04: 0x102ec04: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
 L_102ec0c:
-// 0x0102ec0c: 0x102ec0c: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x0102ec0c: 0x102ec0c: jal   0x1039e04 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl42::search_menu_search_favorites_1039e04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ec14: 0x102ec14: beq   v0, zero, 0x102ec44 addu  s0, v0, zero
+// 0x0102ec14: 0x102ec14: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
+// --- basic block ---
+L_102ec1c:
+// 0x0102ec1c: 0x102ec1c: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0102ec24: 0x102ec24: beq   v0, zero, 0x102ec54 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_102ec44
+	brfalse L_102ec54
 // --- basic block ---
-// 0x0102ec1c: 0x102ec1c: lui   a1, 0x10000
+// 0x0102ec2c: 0x102ec2c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102ec20: 0x102ec20: addiu a1, a1, -23972
+// 0x0102ec30: 0x102ec30: addiu a1, a1, -23972
 	ldloc.2
 	ldc.i4 -23972
 	add
 	stloc.2
-// 0x0102ec24: 0x102ec24: jal   0x1001b14 addu  a0, v0, zero
+// 0x0102ec34: 0x102ec34: jal   0x1001b14 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -1131,35 +1131,35 @@ L_102ec0c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102ec2c: 0x102ec2c: bne   v0, zero, 0x102ec48 lui   a1, 0x10000
+// 0x0102ec3c: 0x102ec3c: bne   v0, zero, 0x102ec58 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_102ec48
+	brtrue L_102ec58
 // --- basic block ---
-// 0x0102ec34: 0x102ec34: jal   0x101eee8 sll   zero, zero, 0
+// 0x0102ec44: 0x102ec44: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ec3c: 0x102ec3c: j	 0x102ec6c sll   zero, zero, 0
-	br L_102ec6c
+// 0x0102ec4c: 0x102ec4c: j	 0x102ec7c sll   zero, zero, 0
+	br L_102ec7c
 // --- basic block ---
-L_102ec44:
-// 0x0102ec44: 0x102ec44: lui   a1, 0x10000
+L_102ec54:
+// 0x0102ec54: 0x102ec54: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_102ec48:
-// 0x0102ec48: 0x102ec48: addu  a0, s0, zero
+L_102ec58:
+// 0x0102ec58: 0x102ec58: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102ec4c: 0x102ec4c: jal   0x1001b14 addiu a1, a1, -29680
+// 0x0102ec5c: 0x102ec5c: jal   0x1001b14 addiu a1, a1, -29680
 	ldloc.2
 	ldc.i4 -29680
 	add
@@ -1169,63 +1169,63 @@ L_102ec48:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0102ec54: 0x102ec54: beq   v0, zero, 0x102ec6c sll   zero, zero, 0
+// 0x0102ec64: 0x102ec64: beq   v0, zero, 0x102ec7c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102ec6c
+	brfalse L_102ec7c
 // --- basic block ---
-// 0x0102ec5c: 0x102ec5c: jal   0x102c364 sll   zero, zero, 0
+// 0x0102ec6c: 0x102ec6c: jal   0x102c374 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_confirmed_exit_102c364(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_confirmed_exit_102c374(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ec64: 0x102ec64: j	 0x102ec74 sll   zero, zero, 0
-	br L_102ec74
+// 0x0102ec74: 0x102ec74: j	 0x102ec84 sll   zero, zero, 0
+	br L_102ec84
 // --- basic block ---
-L_102ec6c:
-// 0x0102ec6c: 0x102ec6c: jal   0x1021830 sll   zero, zero, 0
+L_102ec7c:
+// 0x0102ec7c: 0x102ec7c: jal   0x1021840 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::show_me_on_map_1021830(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::show_me_on_map_1021840(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_102ec74:
-// 0x0102ec74: 0x102ec74: jal   0x1021900 sll   zero, zero, 0
+L_102ec84:
+// 0x0102ec84: 0x102ec84: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102ec7c: 0x102ec7c: j	 0x102ec88 addiu v1, zero, 1
+// 0x0102ec8c: 0x102ec8c: j	 0x102ec98 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_102ec88
+	br L_102ec98
 // --- basic block ---
-L_102ec84:
-// 0x0102ec84: 0x102ec84: addu  v1, zero, zero
+L_102ec94:
+// 0x0102ec94: 0x102ec94: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_102ec88:
-// 0x0102ec88: 0x102ec88: lw    ra, 44(sp)
-// 0x0102ec8c: 0x102ec8c: addu  v0, v1, zero
+L_102ec98:
+// 0x0102ec98: 0x102ec98: lw    ra, 44(sp)
+// 0x0102ec9c: 0x102ec9c: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0102ec90: 0x102ec90: lw    s2, 40(sp)
+// 0x0102eca0: 0x102eca0: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1234,7 +1234,7 @@ L_102ec88:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102ec94: 0x102ec94: lw    s1, 36(sp)
+// 0x0102eca4: 0x102eca4: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1243,7 +1243,7 @@ L_102ec88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102ec98: 0x102ec98: lw    s0, 32(sp)
+// 0x0102eca8: 0x102eca8: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1252,7 +1252,7 @@ L_102ec88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102ec9c: 0x102ec9c: jr    ra addiu sp, sp, 48
+// 0x0102ecac: 0x102ecac: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1262,29 +1262,26 @@ L_102ec88:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 16967944
-	beq  L_102e908
+	ldc.i4 16967960
+	beq  L_102e918
 	ldloc 5
-	ldc.i4 16967968
-	beq  L_102e920
+	ldc.i4 16967984
+	beq  L_102e930
 	ldloc 5
-	ldc.i4 16967992
-	beq  L_102e938
+	ldc.i4 16968008
+	beq  L_102e948
 	ldloc 5
-	ldc.i4 16968016
-	beq  L_102e950
-	ldloc 5
-	ldc.i4 16968048
-	beq  L_102e970
+	ldc.i4 16968032
+	beq  L_102e960
 	ldloc 5
 	ldc.i4 16968064
 	beq  L_102e980
 	ldloc 5
-	ldc.i4 16968152
-	beq  L_102e9d8
+	ldc.i4 16968080
+	beq  L_102e990
 	ldloc 5
-	ldc.i4 16968516
-	beq  L_102eb44
+	ldc.i4 16968168
+	beq  L_102e9e8
 	ldloc 5
 	ldc.i4 16968532
 	beq  L_102eb54
@@ -1316,17 +1313,20 @@ __CIBYL_local_jumptab:
 	ldc.i4 16968676
 	beq  L_102ebe4
 	ldloc 5
-	ldc.i4 16968700
-	beq  L_102ebfc
+	ldc.i4 16968692
+	beq  L_102ebf4
 	ldloc 5
 	ldc.i4 16968716
 	beq  L_102ec0c
 	ldloc 5
-	ldc.i4 16968820
-	beq  L_102ec74
+	ldc.i4 16968732
+	beq  L_102ec1c
 	ldloc 5
 	ldc.i4 16968836
 	beq  L_102ec84
+	ldloc 5
+	ldc.i4 16968852
+	beq  L_102ec94
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
@@ -1334,7 +1334,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 mark_location_102ee90(int32,int32,int32,int32,int32)
+.method public static int32 mark_location_102eea0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s4,int32 s3,int32 s5,int32 ra)
@@ -1387,17 +1387,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102ee90:
-// 0x0102ee90: 0x102ee90: addiu sp, sp, -736
+L_102eea0:
+// 0x0102eea0: 0x102eea0: addiu sp, sp, -736
 	ldloc.0
 	ldc.i4 -736
 	add
 	stloc.0
-// 0x0102ee94: 0x102ee94: addiu a0, zero, 20
+// 0x0102eea4: 0x102eea4: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0102ee98: 0x102ee98: sw    ra, 732(sp)
-// 0x0102ee9c: 0x102ee9c: sw    s1, 712(sp)
+// 0x0102eea8: 0x102eea8: sw    ra, 732(sp)
+// 0x0102eeac: 0x102eeac: sw    s1, 712(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1406,7 +1406,7 @@ L_102ee90:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102eea0: 0x102eea0: sw    s5, 728(sp)
+// 0x0102eeb0: 0x102eeb0: sw    s5, 728(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1415,7 +1415,7 @@ L_102ee90:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102eea4: 0x102eea4: sw    s4, 724(sp)
+// 0x0102eeb4: 0x102eeb4: sw    s4, 724(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1424,7 +1424,7 @@ L_102ee90:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102eea8: 0x102eea8: sw    s3, 720(sp)
+// 0x0102eeb8: 0x102eeb8: sw    s3, 720(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1433,7 +1433,7 @@ L_102ee90:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102eeac: 0x102eeac: sw    s2, 716(sp)
+// 0x0102eebc: 0x102eebc: sw    s2, 716(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1442,7 +1442,7 @@ L_102ee90:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102eeb0: 0x102eeb0: jal   0x1000910 sw    s0, 708(sp)
+// 0x0102eec0: 0x102eec0: jal   0x1000910 sw    s0, 708(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1461,21 +1461,21 @@ L_102ee90:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102eeb8: 0x102eeb8: lui   a0, 0x10000
+// 0x0102eec8: 0x102eec8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102eebc: 0x102eebc: addu  s1, v0, zero
+// 0x0102eecc: 0x102eecc: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0102eec0: 0x102eec0: addu  a2, v0, zero
+// 0x0102eed0: 0x102eed0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0102eec4: 0x102eec4: addiu a0, a0, -25252
+// 0x0102eed4: 0x102eed4: addiu a0, a0, -25252
 	ldloc.1
 	ldc.i4 -25252
 	add
 	stloc.1
-// 0x0102eec8: 0x102eec8: jal   0x1004a38 addiu a1, zero, 2005
+// 0x0102eed8: 0x102eed8: jal   0x1004a48 addiu a1, zero, 2005
 	ldc.i4 2005
 	stloc.2
 	ldloc.0
@@ -1483,20 +1483,20 @@ L_102ee90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102eed0: 0x102eed0: addu  a0, s1, zero
+// 0x0102eee0: 0x102eee0: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0102eed4: 0x102eed4: addiu a1, sp, 36
+// 0x0102eee4: 0x102eee4: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0102eed8: 0x102eed8: jal   0x1029da8 addiu a2, sp, 32
+// 0x0102eee8: 0x102eee8: jal   0x1029db8 addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1506,53 +1506,53 @@ L_102ee90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102eee0: 0x102eee0: addiu v1, zero, -1
+// 0x0102eef0: 0x102eef0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0102eee4: 0x102eee4: bne   v0, v1, 0x102efdc addu  a2, zero, zero
+// 0x0102eef4: 0x102eef4: bne   v0, v1, 0x102efec addu  a2, zero, zero
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc.3
-	bne.un L_102efdc
+	bne.un L_102efec
 // --- basic block ---
-// 0x0102eeec: 0x102eeec: jal   0x1030c08 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+// 0x0102eefc: 0x102eefc: jal   0x1030c18 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x0102eef4: 0x102eef4: addiu v1, zero, 1
+// 0x0102ef04: 0x102ef04: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0102eef8: 0x102eef8: beq   v0, v1, 0x102ef14 addu  s2, zero, zero
+// 0x0102ef08: 0x102ef08: beq   v0, v1, 0x102ef24 addu  s2, zero, zero
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc 9
-	beq  L_102ef14
+	beq  L_102ef24
 // --- basic block ---
-// 0x0102ef00: 0x102ef00: jal   0x1030c08 addiu s2, zero, 1
+// 0x0102ef10: 0x102ef10: jal   0x1030c18 addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x0102ef08: 0x102ef08: bne   v0, zero, 0x102ef14 sll   zero, zero, 0
+// 0x0102ef18: 0x102ef18: bne   v0, zero, 0x102ef24 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_102ef14
+	brtrue L_102ef24
 // --- basic block ---
-// 0x0102ef10: 0x102ef10: addu  s2, zero, zero
+// 0x0102ef20: 0x102ef20: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_102ef14:
-// 0x0102ef14: 0x102ef14: lui   a0, 0x10000
+L_102ef24:
+// 0x0102ef24: 0x102ef24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102ef18: 0x102ef18: jal   0x101df50 addiu a0, a0, -31052
+// 0x0102ef28: 0x102ef28: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -1562,32 +1562,32 @@ L_102ef14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ef20: 0x102ef20: beq   v0, zero, 0x102efb4 addu  s0, v0, zero
+// 0x0102ef30: 0x102ef30: beq   v0, zero, 0x102efc4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_102efb4
+	brfalse L_102efc4
 // --- basic block ---
-// 0x0102ef28: 0x102ef28: beq   s2, zero, 0x102efb4 addiu a2, sp, 180
+// 0x0102ef38: 0x102ef38: beq   s2, zero, 0x102efc4 addiu a2, sp, 180
 	ldloc 9
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc.3
-	brfalse L_102efb4
+	brfalse L_102efc4
 // --- basic block ---
-// 0x0102ef30: 0x102ef30: addu  a0, a2, zero
+// 0x0102ef40: 0x102ef40: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0102ef34: 0x102ef34: addiu a1, zero, 128
+// 0x0102ef44: 0x102ef44: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0102ef38: 0x102ef38: jal   0x1010058 sw    a2, 700(sp)
+// 0x0102ef48: 0x102ef48: jal   0x1010068 sw    a2, 700(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1600,18 +1600,18 @@ L_102ef14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ef40: 0x102ef40: addu  a0, s0, zero
+// 0x0102ef50: 0x102ef50: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102ef44: 0x102ef44: addiu a1, zero, 20
+// 0x0102ef54: 0x102ef54: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0102ef48: 0x102ef48: jal   0x10086bc sw    v0, 696(sp)
+// 0x0102ef58: 0x102ef58: jal   0x10086cc sw    v0, 696(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1625,12 +1625,12 @@ L_102ef14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ef50: 0x102ef50: lw    v0, 696(sp)
+// 0x0102ef60: 0x102ef60: lw    v0, 696(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1639,7 +1639,7 @@ L_102ef14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ef54: 0x102ef54: lw    a2, 700(sp)
+// 0x0102ef64: 0x102ef64: lw    a2, 700(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1648,24 +1648,24 @@ L_102ef14:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102ef58: 0x102ef58: addu  a3, v0, zero
+// 0x0102ef68: 0x102ef68: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0102ef5c: 0x102ef5c: addiu s2, sp, 84
+// 0x0102ef6c: 0x102ef6c: addiu s2, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc 9
-// 0x0102ef60: 0x102ef60: addiu v0, zero, 1
+// 0x0102ef70: 0x102ef70: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102ef64: 0x102ef64: addu  a0, s0, zero
+// 0x0102ef74: 0x102ef74: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102ef68: 0x102ef68: addu  a1, zero, zero
+// 0x0102ef78: 0x102ef78: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102ef6c: 0x102ef6c: sw    v0, 24(sp)
+// 0x0102ef7c: 0x102ef7c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1674,7 +1674,7 @@ L_102ef14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ef70: 0x102ef70: sw    v0, 16(sp)
+// 0x0102ef80: 0x102ef80: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1683,7 +1683,7 @@ L_102ef14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ef74: 0x102ef74: jal   0x1013028 sw    s2, 20(sp)
+// 0x0102ef84: 0x102ef84: jal   0x1013038 sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1697,19 +1697,19 @@ L_102ef14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ef7c: 0x102ef7c: blez  v0, 0x102efb4 addu  a1, s2, zero
+// 0x0102ef8c: 0x102ef8c: blez  v0, 0x102efc4 addu  a1, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
 	ldc.i4.s 0
-	ble L_102efb4
+	ble L_102efc4
 // --- basic block ---
-// 0x0102ef84: 0x102ef84: lw    v0, 4(s0)
+// 0x0102ef94: 0x102ef94: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1718,8 +1718,8 @@ L_102ef14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ef88: 0x102ef88: sll   zero, zero, 0
-// 0x0102ef8c: 0x102ef8c: sw    v0, 4(s1)
+// 0x0102ef98: 0x102ef98: sll   zero, zero, 0
+// 0x0102ef9c: 0x102ef9c: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1728,29 +1728,29 @@ L_102ef14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ef90: 0x102ef90: lw    v0, 0(s0)
+// 0x0102efa0: 0x102efa0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102ef94: 0x102ef94: addiu a0, sp, 36
+// 0x0102efa4: 0x102efa4: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x0102ef98: 0x102ef98: addiu a2, zero, 20
+// 0x0102efa8: 0x102efa8: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x0102ef9c: 0x102ef9c: sw    v0, 0(s1)
+// 0x0102efac: 0x102efac: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0102efa0: 0x102efa0: sw    zero, 12(s1)
+// 0x0102efb0: 0x102efb0: sw    zero, 12(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1759,7 +1759,7 @@ L_102ef14:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0102efa4: 0x102efa4: jal   0x1001800 sw    zero, 16(s1)
+// 0x0102efb4: 0x102efb4: jal   0x1001800 sw    zero, 16(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1777,13 +1777,13 @@ L_102ef14:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102efac: 0x102efac: j	 0x102efdc addu  a2, zero, zero
+// 0x0102efbc: 0x102efbc: j	 0x102efec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_102efdc
+	br L_102efec
 // --- basic block ---
-L_102efb4:
-// 0x0102efb4: 0x102efb4: jal   0x1000930 addu  a0, s1, zero
+L_102efc4:
+// 0x0102efc4: 0x102efc4: jal   0x1000930 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1796,23 +1796,23 @@ L_102efb4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102efbc: 0x102efbc: lui   a0, 0x10000
+// 0x0102efcc: 0x102efcc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102efc0: 0x102efc0: lui   a1, 0x10000
+// 0x0102efd0: 0x102efd0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102efc4: 0x102efc4: addiu a0, a0, -24072
+// 0x0102efd4: 0x102efd4: addiu a0, a0, -24072
 	ldloc.1
 	ldc.i4 -24072
 	add
 	stloc.1
-// 0x0102efc8: 0x102efc8: addiu a1, a1, -24052
+// 0x0102efd8: 0x102efd8: addiu a1, a1, -24052
 	ldloc.2
 	ldc.i4 -24052
 	add
 	stloc.2
-// 0x0102efcc: 0x102efcc: jal   0x104bfe4 addiu a2, zero, 5
+// 0x0102efdc: 0x102efdc: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -1820,21 +1820,21 @@ L_102efb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102efd4: 0x102efd4: j	 0x102f0fc sll   zero, zero, 0
-	br L_102f0fc
+// 0x0102efe4: 0x102efe4: j	 0x102f10c sll   zero, zero, 0
+	br L_102f10c
 // --- basic block ---
-L_102efdc:
-// 0x0102efdc: 0x102efdc: addiu a0, sp, 36
+L_102efec:
+// 0x0102efec: 0x102efec: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x0102efe0: 0x102efe0: jal   0x1015174 addiu a1, sp, 56
+// 0x0102eff0: 0x102eff0: jal   0x1015184 addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1844,15 +1844,15 @@ L_102efdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102efe8: 0x102efe8: addiu a1, zero, 11
+// 0x0102eff8: 0x102eff8: addiu a1, zero, 11
 	ldc.i4.s 11
 	stloc.2
-// 0x0102efec: 0x102efec: jal   0x1037918 addiu a0, zero, 83
+// 0x0102effc: 0x102effc: jal   0x1037928 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -1860,12 +1860,12 @@ L_102efdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102eff4: 0x102eff4: lw    a0, 56(sp)
+// 0x0102f004: 0x102f004: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1874,7 +1874,7 @@ L_102efdc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102eff8: 0x102eff8: jal   0x1001ba8 lui   s3, 0x60000
+// 0x0102f008: 0x102f008: jal   0x1001ba8 lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 12
 	ldloc.0
@@ -1887,7 +1887,7 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f000: 0x102f000: lw    a0, 60(sp)
+// 0x0102f010: 0x102f010: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1896,17 +1896,17 @@ L_102efdc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102f004: 0x102f004: addiu s0, s3, -23948
+// 0x0102f014: 0x102f014: addiu s0, s3, -23484
 	ldloc 12
-	ldc.i4 -23948
+	ldc.i4 -23484
 	add
 	stloc 8
-// 0x0102f008: 0x102f008: jal   0x1001ba8 sw    v0, -23948(s3)
+// 0x0102f018: 0x102f018: jal   0x1001ba8 sw    v0, -23484(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5987
+	ldc.i4 -5871
 	add
 	ldloc 5
 	stelem.i4
@@ -1920,7 +1920,7 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f010: 0x102f010: lw    a0, 68(sp)
+// 0x0102f020: 0x102f020: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1929,7 +1929,7 @@ L_102efdc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102f014: 0x102f014: sw    v0, 4(s0)
+// 0x0102f024: 0x102f024: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1938,7 +1938,7 @@ L_102efdc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102f018: 0x102f018: jal   0x1001ba8 lui   s2, 0x10000
+// 0x0102f028: 0x102f028: jal   0x1001ba8 lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -1951,17 +1951,17 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f020: 0x102f020: addiu s2, s2, 18500
+// 0x0102f030: 0x102f030: addiu s2, s2, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 9
-// 0x0102f024: 0x102f024: addiu s4, sp, 84
+// 0x0102f034: 0x102f034: addiu s4, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc 11
-// 0x0102f028: 0x102f028: lw    a2, 4(s1)
+// 0x0102f038: 0x102f038: lw    a2, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1970,18 +1970,18 @@ L_102efdc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102f02c: 0x102f02c: lui   s5, 0x20000
-	ldc.i4 131072
+// 0x0102f03c: 0x102f03c: lui   s5, 0x10000
+	ldc.i4 65536
 	stloc 13
-// 0x0102f030: 0x102f030: addiu a1, s5, -13884
+// 0x0102f040: 0x102f040: addiu a1, s5, 19088
 	ldloc 13
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0102f034: 0x102f034: addu  a0, s4, zero
+// 0x0102f044: 0x102f044: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x0102f038: 0x102f038: sw    v0, 8(s0)
+// 0x0102f048: 0x102f048: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1990,7 +1990,7 @@ L_102efdc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102f03c: 0x102f03c: sw    s2, 12(s0)
+// 0x0102f04c: 0x102f04c: sw    s2, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1999,7 +1999,7 @@ L_102efdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102f040: 0x102f040: jal   0x1000f64 sw    s2, 16(s0)
+// 0x0102f050: 0x102f050: jal   0x1000f64 sw    s2, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2018,7 +2018,7 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f048: 0x102f048: jal   0x1001ba8 addu  a0, s4, zero
+// 0x0102f058: 0x102f058: jal   0x1001ba8 addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2031,22 +2031,22 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f050: 0x102f050: lw    a2, 0(s1)
+// 0x0102f060: 0x102f060: lw    a2, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0102f054: 0x102f054: addiu a1, s5, -13884
+// 0x0102f064: 0x102f064: addiu a1, s5, 19088
 	ldloc 13
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0102f058: 0x102f058: addu  a0, s4, zero
+// 0x0102f068: 0x102f068: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x0102f05c: 0x102f05c: jal   0x1000f64 sw    v0, 20(s0)
+// 0x0102f06c: 0x102f06c: jal   0x1000f64 sw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2065,7 +2065,7 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f064: 0x102f064: jal   0x1001ba8 addu  a0, s4, zero
+// 0x0102f074: 0x102f074: jal   0x1001ba8 addu  a0, s4, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2078,24 +2078,24 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f06c: 0x102f06c: lui   s4, 0x10000
+// 0x0102f07c: 0x102f07c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0102f070: 0x102f070: lui   a2, 0x10000
+// 0x0102f080: 0x102f080: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0102f074: 0x102f074: addu  a3, s1, zero
+// 0x0102f084: 0x102f084: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x0102f078: 0x102f078: addu  a1, s2, zero
+// 0x0102f088: 0x102f088: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x0102f07c: 0x102f07c: addiu a2, a2, -29644
+// 0x0102f08c: 0x102f08c: addiu a2, a2, -29644
 	ldloc.3
 	ldc.i4 -29644
 	add
 	stloc.3
-// 0x0102f080: 0x102f080: sw    v0, 24(s0)
+// 0x0102f090: 0x102f090: sw    v0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2104,12 +2104,12 @@ L_102efdc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102f084: 0x102f084: addiu a0, s4, -29660
+// 0x0102f094: 0x102f094: addiu a0, s4, -29660
 	ldloc 11
 	ldc.i4 -29660
 	add
 	stloc.1
-// 0x0102f088: 0x102f088: sw    s2, 28(s0)
+// 0x0102f098: 0x102f098: sw    s2, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2118,7 +2118,7 @@ L_102efdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102f08c: 0x102f08c: sw    s2, 32(s0)
+// 0x0102f09c: 0x102f09c: sw    s2, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2127,7 +2127,7 @@ L_102efdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102f090: 0x102f090: sw    s2, 36(s0)
+// 0x0102f0a0: 0x102f0a0: sw    s2, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2136,7 +2136,7 @@ L_102efdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102f094: 0x102f094: jal   0x101f638 sw    s2, 40(s0)
+// 0x0102f0a4: 0x102f0a4: jal   0x101f648 sw    s2, 40(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2150,12 +2150,12 @@ L_102efdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_gps_position_101f638(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_gps_position_101f648(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f09c: 0x102f09c: jal   0x101ece8 addiu a0, s4, -29660
+// 0x0102f0ac: 0x102f0ac: jal   0x101ecf8 addiu a0, s4, -29660
 	ldloc 11
 	ldc.i4 -29660
 	add
@@ -2165,12 +2165,12 @@ L_102efdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f0a4: 0x102f0a4: jal   0x1010a4c addiu s1, sp, 180
+// 0x0102f0b4: 0x102f0b4: jal   0x1010a5c addiu s1, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
@@ -2180,26 +2180,26 @@ L_102efdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f0ac: 0x102f0ac: jal   0x102146c sll   zero, zero, 0
+// 0x0102f0bc: 0x102f0bc: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f0b4: 0x102f0b4: lui   a0, 0x10000
+// 0x0102f0c4: 0x102f0c4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f0b8: 0x102f0b8: jal   0x101cd60 addiu a0, a0, -23892
+// 0x0102f0c8: 0x102f0c8: jal   0x101cd70 addiu a0, a0, -23892
 	ldloc.1
 	ldc.i4 -23892
 	add
@@ -2209,12 +2209,12 @@ L_102efdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f0c0: 0x102f0c0: lw    a2, 4(s0)
+// 0x0102f0d0: 0x102f0d0: lw    a2, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2223,16 +2223,16 @@ L_102efdc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102f0c4: 0x102f0c4: lw    a3, -23948(s3)
+// 0x0102f0d4: 0x102f0d4: lw    a3, -23484(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5987
+	ldc.i4 -5871
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102f0c8: 0x102f0c8: lw    v1, 8(s0)
+// 0x0102f0d8: 0x102f0d8: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2241,13 +2241,13 @@ L_102efdc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102f0cc: 0x102f0cc: addu  a1, v0, zero
+// 0x0102f0dc: 0x102f0dc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f0d0: 0x102f0d0: addu  a0, s1, zero
+// 0x0102f0e0: 0x102f0e0: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0102f0d4: 0x102f0d4: jal   0x1000f64 sw    v1, 16(sp)
+// 0x0102f0e4: 0x102f0e4: jal   0x1000f64 sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2266,29 +2266,29 @@ L_102efdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102f0dc: 0x102f0dc: lui   a0, 0x10000
+// 0x0102f0ec: 0x102f0ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f0e0: 0x102f0e0: lui   a3, 0x1030000
+// 0x0102f0f0: 0x102f0f0: lui   a3, 0x1030000
 	ldc.i4 16973824
 	stloc 4
-// 0x0102f0e4: 0x102f0e4: addiu a0, a0, -23836
+// 0x0102f0f4: 0x102f0f4: addiu a0, a0, -23836
 	ldloc.1
 	ldc.i4 -23836
 	add
 	stloc.1
-// 0x0102f0e8: 0x102f0e8: addu  a1, s1, zero
+// 0x0102f0f8: 0x102f0f8: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0102f0ec: 0x102f0ec: addiu a3, a3, -10420
+// 0x0102f0fc: 0x102f0fc: addiu a3, a3, -10404
 	ldloc 4
-	ldc.i4 -10420
+	ldc.i4 -10404
 	add
 	stloc 4
-// 0x0102f0f0: 0x102f0f0: addiu a2, zero, 1
+// 0x0102f100: 0x102f100: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0102f0f4: 0x102f0f4: jal   0x104c320 sw    s0, 16(sp)
+// 0x0102f104: 0x102f104: jal   0x104c330 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2302,14 +2302,14 @@ L_102efdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102f0fc:
-// 0x0102f0fc: 0x102f0fc: lw    ra, 732(sp)
-// 0x0102f100: 0x102f100: lw    s5, 728(sp)
+L_102f10c:
+// 0x0102f10c: 0x102f10c: lw    ra, 732(sp)
+// 0x0102f110: 0x102f110: lw    s5, 728(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2318,7 +2318,7 @@ L_102f0fc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0102f104: 0x102f104: lw    s4, 724(sp)
+// 0x0102f114: 0x102f114: lw    s4, 724(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2327,7 +2327,7 @@ L_102f0fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102f108: 0x102f108: lw    s3, 720(sp)
+// 0x0102f118: 0x102f118: lw    s3, 720(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2336,7 +2336,7 @@ L_102f0fc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102f10c: 0x102f10c: lw    s2, 716(sp)
+// 0x0102f11c: 0x102f11c: lw    s2, 716(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2345,7 +2345,7 @@ L_102f0fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102f110: 0x102f110: lw    s1, 712(sp)
+// 0x0102f120: 0x102f120: lw    s1, 712(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2354,7 +2354,7 @@ L_102f0fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102f114: 0x102f114: lw    s0, 708(sp)
+// 0x0102f124: 0x102f124: lw    s0, 708(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2363,7 +2363,7 @@ L_102f0fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102f118: 0x102f118: jr    ra addiu sp, sp, 736
+// 0x0102f128: 0x102f128: jr    ra addiu sp, sp, 736
 	ldloc.0
 	ldc.i4 736
 	add
@@ -2375,7 +2375,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 gps_network_status_102f120(int32,int32,int32,int32,int32)
+.method public static int32 gps_network_status_102f130(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -2425,14 +2425,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_102f120:
-// 0x0102f120: 0x102f120: addiu sp, sp, -216
+L_102f130:
+// 0x0102f130: 0x102f130: addiu sp, sp, -216
 	ldloc.0
 	ldc.i4 -216
 	add
 	stloc.0
-// 0x0102f124: 0x102f124: sw    ra, 212(sp)
-// 0x0102f128: 0x102f128: sw    s4, 208(sp)
+// 0x0102f134: 0x102f134: sw    ra, 212(sp)
+// 0x0102f138: 0x102f138: sw    s4, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2441,7 +2441,7 @@ L_102f120:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102f12c: 0x102f12c: sw    s2, 200(sp)
+// 0x0102f13c: 0x102f13c: sw    s2, 200(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2450,7 +2450,7 @@ L_102f120:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102f130: 0x102f130: sw    s1, 196(sp)
+// 0x0102f140: 0x102f140: sw    s1, 196(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2459,7 +2459,7 @@ L_102f120:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102f134: 0x102f134: sw    s0, 192(sp)
+// 0x0102f144: 0x102f144: sw    s0, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2468,7 +2468,7 @@ L_102f120:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102f138: 0x102f138: jal   0x1030c08 sw    s3, 204(sp)
+// 0x0102f148: 0x102f148: jal   0x1030c18 sw    s3, 204(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2477,10 +2477,10 @@ L_102f120:
 	add
 	ldloc 11
 	stelem.i4
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x0102f140: 0x102f140: jal   0x106c170 addu  s2, v0, zero
+// 0x0102f150: 0x102f150: jal   0x106c794 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -2488,39 +2488,39 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f148: 0x102f148: lui   a0, 0x10000
+// 0x0102f158: 0x102f158: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f14c: 0x102f14c: lui   a1, 0x10000
+// 0x0102f15c: 0x102f15c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102f150: 0x102f150: lui   a3, 0x10010000
+// 0x0102f160: 0x102f160: lui   a3, 0x10010000
 	ldc.i4 268500992
 	stloc 4
-// 0x0102f154: 0x102f154: addiu a0, a0, -25276
+// 0x0102f164: 0x102f164: addiu a0, a0, -25276
 	ldloc.1
 	ldc.i4 -25276
 	add
 	stloc.1
-// 0x0102f158: 0x102f158: addiu a1, a1, 18500
+// 0x0102f168: 0x102f168: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0102f15c: 0x102f15c: ori   a3, a3, 20497
+// 0x0102f16c: 0x102f16c: ori   a3, a3, 20497
 	ldloc 4
 	ldc.i4 20497
 	or
 	stloc 4
-// 0x0102f160: 0x102f160: addu  a2, zero, zero
+// 0x0102f170: 0x102f170: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f164: 0x102f164: jal   0x1095a08 addu  s4, v0, zero
+// 0x0102f174: 0x102f174: jal   0x1096050 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2528,35 +2528,35 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f16c: 0x102f16c: lui   a0, 0x10000
+// 0x0102f17c: 0x102f17c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f170: 0x102f170: addiu a0, a0, -27036
+// 0x0102f180: 0x102f180: addiu a0, a0, -27036
 	ldloc.1
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x0102f174: 0x102f174: addu  a2, zero, zero
+// 0x0102f184: 0x102f184: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f178: 0x102f178: addiu a3, zero, 5
+// 0x0102f188: 0x102f188: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x0102f17c: 0x102f17c: addu  a1, zero, zero
+// 0x0102f18c: 0x102f18c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f180: 0x102f180: addiu s1, zero, 8
+// 0x0102f190: 0x102f190: addiu s1, zero, 8
 	ldc.i4.8
 	stloc 8
-// 0x0102f184: 0x102f184: addu  s0, v0, zero
+// 0x0102f194: 0x102f194: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0102f188: 0x102f188: jal   0x1093a24 sw    s1, 16(sp)
+// 0x0102f198: 0x102f198: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2570,44 +2570,44 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f190: 0x102f190: addu  a1, v0, zero
+// 0x0102f1a0: 0x102f1a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f194: 0x102f194: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102f1a4: 0x102f1a4: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f19c: 0x102f19c: sltiu v0, s2, 2
+// 0x0102f1ac: 0x102f1ac: sltiu v0, s2, 2
 	ldloc 10
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x0102f1a0: 0x102f1a0: beq   v0, zero, 0x102f28c addiu v0, zero, 2
+// 0x0102f1b0: 0x102f1b0: beq   v0, zero, 0x102f29c addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brfalse L_102f28c
+	brfalse L_102f29c
 // --- basic block ---
-// 0x0102f1a8: 0x102f1a8: addiu a1, sp, 24
+// 0x0102f1b8: 0x102f1b8: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0102f1ac: 0x102f1ac: addu  a0, s0, zero
+// 0x0102f1bc: 0x102f1bc: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f1b0: 0x102f1b0: jal   0x1099350 addu  a2, zero, zero
+// 0x0102f1c0: 0x102f1c0: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2615,18 +2615,18 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f1b8: 0x102f1b8: addu  a0, s0, zero
+// 0x0102f1c8: 0x102f1c8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f1bc: 0x102f1bc: addiu a1, zero, 5
+// 0x0102f1cc: 0x102f1cc: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f1c0: 0x102f1c0: jal   0x109434c addu  a2, zero, zero
+// 0x0102f1d0: 0x102f1d0: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2634,29 +2634,29 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f1c8: 0x102f1c8: lui   a0, 0x10000
+// 0x0102f1d8: 0x102f1d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f1cc: 0x102f1cc: addiu a3, zero, -1
+// 0x0102f1dc: 0x102f1dc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102f1d0: 0x102f1d0: addiu a0, a0, -23820
+// 0x0102f1e0: 0x102f1e0: addiu a0, a0, -23820
 	ldloc.1
 	ldc.i4 -23820
 	add
 	stloc.1
-// 0x0102f1d4: 0x102f1d4: addu  a1, zero, zero
+// 0x0102f1e4: 0x102f1e4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f1d8: 0x102f1d8: addiu a2, zero, -1
+// 0x0102f1e8: 0x102f1e8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0102f1dc: 0x102f1dc: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0102f1ec: 0x102f1ec: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2670,43 +2670,43 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f1e4: 0x102f1e4: addu  a0, v0, zero
+// 0x0102f1f4: 0x102f1f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f1e8: 0x102f1e8: addu  a1, zero, zero
+// 0x0102f1f8: 0x102f1f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f1ec: 0x102f1ec: addu  a2, zero, zero
+// 0x0102f1fc: 0x102f1fc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f1f0: 0x102f1f0: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0102f200: 0x102f200: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102f1f8: 0x102f1f8: lui   a0, 0x10000
+// 0x0102f208: 0x102f208: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f1fc: 0x102f1fc: lui   a1, 0x10000
+// 0x0102f20c: 0x102f20c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102f200: 0x102f200: addiu a2, zero, 16
+// 0x0102f210: 0x102f210: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f204: 0x102f204: addiu a0, a0, -23812
+// 0x0102f214: 0x102f214: addiu a0, a0, -23812
 	ldloc.1
 	ldc.i4 -23812
 	add
 	stloc.1
-// 0x0102f208: 0x102f208: jal   0x109e13c addiu a1, a1, -23792
+// 0x0102f218: 0x102f218: jal   0x109e784 addiu a1, a1, -23792
 	ldloc.2
 	ldc.i4 -23792
 	add
@@ -2716,31 +2716,31 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f210: 0x102f210: addu  a1, v0, zero
+// 0x0102f220: 0x102f220: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f214: 0x102f214: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0102f224: 0x102f224: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f21c: 0x102f21c: addiu a1, zero, 5
+// 0x0102f22c: 0x102f22c: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f220: 0x102f220: addu  a2, zero, zero
+// 0x0102f230: 0x102f230: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f224: 0x102f224: jal   0x109434c addu  a0, s1, zero
+// 0x0102f234: 0x102f234: jal   0x1094970 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2748,15 +2748,15 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f22c: 0x102f22c: lui   a0, 0x10000
+// 0x0102f23c: 0x102f23c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f230: 0x102f230: jal   0x101cd60 addiu a0, a0, -24072
+// 0x0102f240: 0x102f240: jal   0x101cd70 addiu a0, a0, -24072
 	ldloc.1
 	ldc.i4 -24072
 	add
@@ -2766,26 +2766,26 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f238: 0x102f238: lui   s3, 0x20000
+// 0x0102f248: 0x102f248: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x0102f23c: 0x102f23c: addiu a2, zero, 16
+// 0x0102f24c: 0x102f24c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f240: 0x102f240: addiu a3, zero, 25
+// 0x0102f250: 0x102f250: addiu a3, zero, 25
 	ldc.i4.s 25
 	stloc 4
-// 0x0102f244: 0x102f244: addu  a1, v0, zero
+// 0x0102f254: 0x102f254: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f248: 0x102f248: jal   0x1098d10 addiu a0, s3, -2684
+// 0x0102f258: 0x102f258: jal   0x1099358 addiu a0, s3, -2220
 	ldloc 11
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -2793,23 +2793,23 @@ L_102f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f250: 0x102f250: lui   s2, 0x0
+// 0x0102f260: 0x102f260: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0102f254: 0x102f254: addu  a0, v0, zero
+// 0x0102f264: 0x102f264: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f258: 0x102f258: addiu a1, s2, 23008
+// 0x0102f268: 0x102f268: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102f25c: 0x102f25c: jal   0x1097af8 sw    v0, 184(sp)
+// 0x0102f26c: 0x102f26c: jal   0x1098140 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2820,9 +2820,9 @@ L_102f120:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102f264: 0x102f264: lw    v0, 184(sp)
+// 0x0102f274: 0x102f274: lw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2831,57 +2831,57 @@ L_102f120:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f268: 0x102f268: addu  a0, s1, zero
+// 0x0102f278: 0x102f278: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102f26c: 0x102f26c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0102f27c: 0x102f27c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f274: 0x102f274: addu  a0, s0, zero
+// 0x0102f284: 0x102f284: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f278: 0x102f278: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0102f288: 0x102f288: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f280: 0x102f280: lui   a0, 0x10000
+// 0x0102f290: 0x102f290: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f284: 0x102f284: j	 0x102f39c addiu a0, a0, -23768
+// 0x0102f294: 0x102f294: j	 0x102f3ac addiu a0, a0, -23768
 	ldloc.1
 	ldc.i4 -23768
 	add
 	stloc.1
-	br L_102f39c
+	br L_102f3ac
 // --- basic block ---
-L_102f28c:
-// 0x0102f28c: 0x102f28c: bne   s2, v0, 0x102f3d8 addiu v0, zero, 3
+L_102f29c:
+// 0x0102f29c: 0x102f29c: bne   s2, v0, 0x102f3e8 addiu v0, zero, 3
 	ldloc 10
 	ldloc 5
 	ldc.i4.3
 	stloc 5
-	bne.un L_102f3d8
+	bne.un L_102f3e8
 // --- basic block ---
-// 0x0102f294: 0x102f294: addu  a0, s0, zero
+// 0x0102f2a4: 0x102f2a4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f298: 0x102f298: addiu a1, zero, 5
+// 0x0102f2a8: 0x102f2a8: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f29c: 0x102f29c: jal   0x109434c addu  a2, zero, zero
+// 0x0102f2ac: 0x102f2ac: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2889,29 +2889,29 @@ L_102f28c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f2a4: 0x102f2a4: lui   a0, 0x10000
+// 0x0102f2b4: 0x102f2b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f2a8: 0x102f2a8: addiu a3, zero, -1
+// 0x0102f2b8: 0x102f2b8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102f2ac: 0x102f2ac: addiu a0, a0, -23820
+// 0x0102f2bc: 0x102f2bc: addiu a0, a0, -23820
 	ldloc.1
 	ldc.i4 -23820
 	add
 	stloc.1
-// 0x0102f2b0: 0x102f2b0: addu  a1, zero, zero
+// 0x0102f2c0: 0x102f2c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f2b4: 0x102f2b4: addiu a2, zero, -1
+// 0x0102f2c4: 0x102f2c4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0102f2b8: 0x102f2b8: jal   0x1093a24 sw    s1, 16(sp)
+// 0x0102f2c8: 0x102f2c8: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2925,40 +2925,40 @@ L_102f28c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f2c0: 0x102f2c0: addu  a0, v0, zero
+// 0x0102f2d0: 0x102f2d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f2c4: 0x102f2c4: addu  a1, zero, zero
+// 0x0102f2d4: 0x102f2d4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f2c8: 0x102f2c8: addu  a2, zero, zero
+// 0x0102f2d8: 0x102f2d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f2cc: 0x102f2cc: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0102f2dc: 0x102f2dc: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102f2d4: 0x102f2d4: lui   a0, 0x10000
+// 0x0102f2e4: 0x102f2e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f2d8: 0x102f2d8: addiu a0, a0, -23684
+// 0x0102f2e8: 0x102f2e8: addiu a0, a0, -23684
 	ldloc.1
 	ldc.i4 -23684
 	add
 	stloc.1
-// 0x0102f2dc: 0x102f2dc: addiu a2, zero, 16
+// 0x0102f2ec: 0x102f2ec: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f2e0: 0x102f2e0: jal   0x109e13c addu  a1, a0, zero
+// 0x0102f2f0: 0x102f2f0: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -2966,31 +2966,31 @@ L_102f28c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f2e8: 0x102f2e8: addu  a1, v0, zero
+// 0x0102f2f8: 0x102f2f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f2ec: 0x102f2ec: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0102f2fc: 0x102f2fc: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f2f4: 0x102f2f4: addiu a1, zero, 5
+// 0x0102f304: 0x102f304: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f2f8: 0x102f2f8: addu  a2, zero, zero
+// 0x0102f308: 0x102f308: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f2fc: 0x102f2fc: jal   0x109434c addu  a0, s1, zero
+// 0x0102f30c: 0x102f30c: jal   0x1094970 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2998,20 +2998,20 @@ L_102f28c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f304: 0x102f304: lui   a0, 0x10000
+// 0x0102f314: 0x102f314: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f308: 0x102f308: addiu a0, a0, -23660
+// 0x0102f318: 0x102f318: addiu a0, a0, -23660
 	ldloc.1
 	ldc.i4 -23660
 	add
 	stloc.1
-// 0x0102f30c: 0x102f30c: jal   0x101cd60 sb    zero, 32(sp)
+// 0x0102f31c: 0x102f31c: jal   0x101cd70 sb    zero, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3022,12 +3022,12 @@ L_102f28c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f314: 0x102f314: jal   0x1030ef8 sw    v0, 188(sp)
+// 0x0102f324: 0x102f324: jal   0x1030f08 sw    v0, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3036,23 +3036,23 @@ L_102f28c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl35::roadmap_gps_satelite_count_1030ef8()
+	call int32 Cibyl35::roadmap_gps_satelite_count_1030f08()
 	stloc 5
 // --- basic block ---
-// 0x0102f31c: 0x102f31c: lui   a0, 0x10000
+// 0x0102f32c: 0x102f32c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f320: 0x102f320: addiu a0, a0, -23640
+// 0x0102f330: 0x102f330: addiu a0, a0, -23640
 	ldloc.1
 	ldc.i4 -23640
 	add
 	stloc.1
-// 0x0102f324: 0x102f324: addiu s2, sp, 32
+// 0x0102f334: 0x102f334: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x0102f328: 0x102f328: jal   0x101cd60 sw    v0, 184(sp)
+// 0x0102f338: 0x102f338: jal   0x101cd70 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3066,12 +3066,12 @@ L_102f28c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f330: 0x102f330: lw    a2, 188(sp)
+// 0x0102f340: 0x102f340: lw    a2, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3080,7 +3080,7 @@ L_102f28c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102f334: 0x102f334: lw    a3, 184(sp)
+// 0x0102f344: 0x102f344: lw    a3, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3089,21 +3089,21 @@ L_102f28c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102f338: 0x102f338: lui   a1, 0x10000
+// 0x0102f348: 0x102f348: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102f33c: 0x102f33c: addu  a0, s2, zero
+// 0x0102f34c: 0x102f34c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0102f340: 0x102f340: addiu a1, a1, -23628
+// 0x0102f350: 0x102f350: addiu a1, a1, -23628
 	ldloc.2
 	ldc.i4 -23628
 	add
 	stloc.2
-// 0x0102f344: 0x102f344: lui   s3, 0x20000
+// 0x0102f354: 0x102f354: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x0102f348: 0x102f348: jal   0x1000f64 sw    v0, 16(sp)
+// 0x0102f358: 0x102f358: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3122,18 +3122,18 @@ L_102f28c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f350: 0x102f350: addiu a2, zero, 16
+// 0x0102f360: 0x102f360: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f354: 0x102f354: addiu a3, zero, 24
+// 0x0102f364: 0x102f364: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0102f358: 0x102f358: addu  a1, s2, zero
+// 0x0102f368: 0x102f368: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0102f35c: 0x102f35c: jal   0x1098d10 addiu a0, s3, -2684
+// 0x0102f36c: 0x102f36c: jal   0x1099358 addiu a0, s3, -2220
 	ldloc 11
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -3141,23 +3141,23 @@ L_102f28c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f364: 0x102f364: lui   s2, 0x0
+// 0x0102f374: 0x102f374: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0102f368: 0x102f368: addu  a0, v0, zero
+// 0x0102f378: 0x102f378: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f36c: 0x102f36c: addiu a1, s2, 23008
+// 0x0102f37c: 0x102f37c: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102f370: 0x102f370: jal   0x1097af8 sw    v0, 184(sp)
+// 0x0102f380: 0x102f380: jal   0x1098140 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3168,9 +3168,9 @@ L_102f28c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102f378: 0x102f378: lw    v0, 184(sp)
+// 0x0102f388: 0x102f388: lw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3179,64 +3179,64 @@ L_102f28c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f37c: 0x102f37c: addu  a0, s1, zero
+// 0x0102f38c: 0x102f38c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102f380: 0x102f380: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0102f390: 0x102f390: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f388: 0x102f388: addu  a0, s0, zero
+// 0x0102f398: 0x102f398: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f38c: 0x102f38c: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0102f39c: 0x102f39c: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f394: 0x102f394: lui   a0, 0x10000
+// 0x0102f3a4: 0x102f3a4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f398: 0x102f398: addiu a0, a0, -23616
+// 0x0102f3a8: 0x102f3a8: addiu a0, a0, -23616
 	ldloc.1
 	ldc.i4 -23616
 	add
 	stloc.1
-L_102f39c:
-// 0x0102f39c: 0x102f39c: jal   0x101cd60 sll   zero, zero, 0
+L_102f3ac:
+// 0x0102f3ac: 0x102f3ac: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f3a4: 0x102f3a4: addu  a1, v0, zero
+// 0x0102f3b4: 0x102f3b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f3a8: 0x102f3a8: addiu a0, s3, -2684
+// 0x0102f3b8: 0x102f3b8: addiu a0, s3, -2220
 	ldloc 11
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
-// 0x0102f3ac: 0x102f3ac: addiu a2, zero, 16
+// 0x0102f3bc: 0x102f3bc: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f3b0: 0x102f3b0: jal   0x1098d10 ori   a3, zero, 32777
+// 0x0102f3c0: 0x102f3c0: jal   0x1099358 ori   a3, zero, 32777
 	ldc.i4.s 0
 	ldc.i4 32777
 	or
@@ -3246,20 +3246,20 @@ L_102f39c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f3b8: 0x102f3b8: addu  a0, v0, zero
+// 0x0102f3c8: 0x102f3c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f3bc: 0x102f3bc: addiu a1, s2, 23008
+// 0x0102f3cc: 0x102f3cc: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102f3c0: 0x102f3c0: jal   0x1097af8 sw    v0, 184(sp)
+// 0x0102f3d0: 0x102f3d0: jal   0x1098140 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3270,9 +3270,9 @@ L_102f39c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102f3c8: 0x102f3c8: lw    v0, 184(sp)
+// 0x0102f3d8: 0x102f3d8: lw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3281,29 +3281,29 @@ L_102f39c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f3cc: 0x102f3cc: addu  a0, s0, zero
+// 0x0102f3dc: 0x102f3dc: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f3d0: 0x102f3d0: j	 0x102f4d8 addu  a1, v0, zero
+// 0x0102f3e0: 0x102f3e0: j	 0x102f4e8 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-	br L_102f4d8
+	br L_102f4e8
 // --- basic block ---
-L_102f3d8:
-// 0x0102f3d8: 0x102f3d8: bne   s2, v0, 0x102f4e4 addiu a2, zero, 8
+L_102f3e8:
+// 0x0102f3e8: 0x102f3e8: bne   s2, v0, 0x102f4f4 addiu a2, zero, 8
 	ldloc 10
 	ldloc 5
 	ldc.i4.8
 	stloc.3
-	bne.un L_102f4e4
+	bne.un L_102f4f4
 // --- basic block ---
-// 0x0102f3e0: 0x102f3e0: addu  a0, s0, zero
+// 0x0102f3f0: 0x102f3f0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f3e4: 0x102f3e4: addiu a1, zero, 5
+// 0x0102f3f4: 0x102f3f4: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f3e8: 0x102f3e8: jal   0x109434c addu  a2, zero, zero
+// 0x0102f3f8: 0x102f3f8: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3311,29 +3311,29 @@ L_102f3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f3f0: 0x102f3f0: lui   a0, 0x10000
+// 0x0102f400: 0x102f400: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f3f4: 0x102f3f4: addiu a3, zero, -1
+// 0x0102f404: 0x102f404: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102f3f8: 0x102f3f8: addiu a0, a0, -23820
+// 0x0102f408: 0x102f408: addiu a0, a0, -23820
 	ldloc.1
 	ldc.i4 -23820
 	add
 	stloc.1
-// 0x0102f3fc: 0x102f3fc: addu  a1, zero, zero
+// 0x0102f40c: 0x102f40c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f400: 0x102f400: addiu a2, zero, -1
+// 0x0102f410: 0x102f410: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0102f404: 0x102f404: jal   0x1093a24 sw    s1, 16(sp)
+// 0x0102f414: 0x102f414: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3347,40 +3347,40 @@ L_102f3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f40c: 0x102f40c: addu  a0, v0, zero
+// 0x0102f41c: 0x102f41c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f410: 0x102f410: addu  a1, zero, zero
+// 0x0102f420: 0x102f420: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f414: 0x102f414: addu  a2, zero, zero
+// 0x0102f424: 0x102f424: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f418: 0x102f418: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0102f428: 0x102f428: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102f420: 0x102f420: lui   a0, 0x10000
+// 0x0102f430: 0x102f430: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f424: 0x102f424: addiu a0, a0, -23588
+// 0x0102f434: 0x102f434: addiu a0, a0, -23588
 	ldloc.1
 	ldc.i4 -23588
 	add
 	stloc.1
-// 0x0102f428: 0x102f428: addiu a2, zero, 16
+// 0x0102f438: 0x102f438: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f42c: 0x102f42c: jal   0x109e13c addu  a1, a0, zero
+// 0x0102f43c: 0x102f43c: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -3388,31 +3388,31 @@ L_102f3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f434: 0x102f434: addu  a1, v0, zero
+// 0x0102f444: 0x102f444: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f438: 0x102f438: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0102f448: 0x102f448: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f440: 0x102f440: addiu a1, zero, 5
+// 0x0102f450: 0x102f450: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f444: 0x102f444: addu  a2, zero, zero
+// 0x0102f454: 0x102f454: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f448: 0x102f448: jal   0x109434c addu  a0, s1, zero
+// 0x0102f458: 0x102f458: jal   0x1094970 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3420,15 +3420,15 @@ L_102f3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f450: 0x102f450: lui   a0, 0x10000
+// 0x0102f460: 0x102f460: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f454: 0x102f454: jal   0x101cd60 addiu a0, a0, -23568
+// 0x0102f464: 0x102f464: jal   0x101cd70 addiu a0, a0, -23568
 	ldloc.1
 	ldc.i4 -23568
 	add
@@ -3438,12 +3438,12 @@ L_102f3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f45c: 0x102f45c: jal   0x1030ef8 sw    v0, 188(sp)
+// 0x0102f46c: 0x102f46c: jal   0x1030f08 sw    v0, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3452,23 +3452,23 @@ L_102f3d8:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl35::roadmap_gps_satelite_count_1030ef8()
+	call int32 Cibyl35::roadmap_gps_satelite_count_1030f08()
 	stloc 5
 // --- basic block ---
-// 0x0102f464: 0x102f464: lui   a0, 0x10000
+// 0x0102f474: 0x102f474: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f468: 0x102f468: addiu a0, a0, -23640
+// 0x0102f478: 0x102f478: addiu a0, a0, -23640
 	ldloc.1
 	ldc.i4 -23640
 	add
 	stloc.1
-// 0x0102f46c: 0x102f46c: addiu s2, sp, 32
+// 0x0102f47c: 0x102f47c: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x0102f470: 0x102f470: jal   0x101cd60 sw    v0, 184(sp)
+// 0x0102f480: 0x102f480: jal   0x101cd70 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3482,12 +3482,12 @@ L_102f3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f478: 0x102f478: lw    a2, 188(sp)
+// 0x0102f488: 0x102f488: lw    a2, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3496,7 +3496,7 @@ L_102f3d8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102f47c: 0x102f47c: lw    a3, 184(sp)
+// 0x0102f48c: 0x102f48c: lw    a3, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3505,18 +3505,18 @@ L_102f3d8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102f480: 0x102f480: lui   a1, 0x10000
+// 0x0102f490: 0x102f490: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0102f484: 0x102f484: addiu a1, a1, -23628
+// 0x0102f494: 0x102f494: addiu a1, a1, -23628
 	ldloc.2
 	ldc.i4 -23628
 	add
 	stloc.2
-// 0x0102f488: 0x102f488: addu  a0, s2, zero
+// 0x0102f498: 0x102f498: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0102f48c: 0x102f48c: jal   0x1000f64 sw    v0, 16(sp)
+// 0x0102f49c: 0x102f49c: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3535,21 +3535,21 @@ L_102f3d8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f494: 0x102f494: lui   a0, 0x20000
+// 0x0102f4a4: 0x102f4a4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0102f498: 0x102f498: addiu a2, zero, 16
+// 0x0102f4a8: 0x102f4a8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f49c: 0x102f49c: addiu a3, zero, 24
+// 0x0102f4ac: 0x102f4ac: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0102f4a0: 0x102f4a0: addu  a1, s2, zero
+// 0x0102f4b0: 0x102f4b0: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0102f4a4: 0x102f4a4: jal   0x1098d10 addiu a0, a0, -2684
+// 0x0102f4b4: 0x102f4b4: jal   0x1099358 addiu a0, a0, -2220
 	ldloc.1
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -3557,23 +3557,23 @@ L_102f3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f4ac: 0x102f4ac: lui   a1, 0x0
+// 0x0102f4bc: 0x102f4bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f4b0: 0x102f4b0: addu  a0, v0, zero
+// 0x0102f4c0: 0x102f4c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f4b4: 0x102f4b4: addiu a1, a1, 23008
+// 0x0102f4c4: 0x102f4c4: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102f4b8: 0x102f4b8: jal   0x1097af8 sw    v0, 184(sp)
+// 0x0102f4c8: 0x102f4c8: jal   0x1098140 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3584,9 +3584,9 @@ L_102f3d8:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102f4c0: 0x102f4c0: lw    v0, 184(sp)
+// 0x0102f4d0: 0x102f4d0: lw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3595,42 +3595,42 @@ L_102f3d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f4c4: 0x102f4c4: addu  a0, s1, zero
+// 0x0102f4d4: 0x102f4d4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102f4c8: 0x102f4c8: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0102f4d8: 0x102f4d8: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f4d0: 0x102f4d0: addu  a0, s0, zero
+// 0x0102f4e0: 0x102f4e0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f4d4: 0x102f4d4: addu  a1, s1, zero
+// 0x0102f4e4: 0x102f4e4: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-L_102f4d8:
-// 0x0102f4d8: 0x102f4d8: jal   0x1098ec4 sll   zero, zero, 0
+L_102f4e8:
+// 0x0102f4e8: 0x102f4e8: jal   0x109950c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f4e0: 0x102f4e0: addiu a2, zero, 8
+// 0x0102f4f0: 0x102f4f0: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-L_102f4e4:
-// 0x0102f4e4: 0x102f4e4: addu  a0, s0, zero
+L_102f4f4:
+// 0x0102f4f4: 0x102f4f4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f4e8: 0x102f4e8: jal   0x10942e8 addiu a1, zero, 10
+// 0x0102f4f8: 0x102f4f8: jal   0x109490c addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
 	ldloc.0
@@ -3638,20 +3638,20 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f4f0: 0x102f4f0: lui   a0, 0x10000
+// 0x0102f500: 0x102f500: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f4f4: 0x102f4f4: addiu a0, a0, -23548
+// 0x0102f504: 0x102f504: addiu a0, a0, -23548
 	ldloc.1
 	ldc.i4 -23548
 	add
 	stloc.1
-// 0x0102f4f8: 0x102f4f8: jal   0x109e6d0 addiu a1, zero, 8
+// 0x0102f508: 0x102f508: jal   0x109ed18 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -3659,43 +3659,43 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f500: 0x102f500: addu  a1, v0, zero
+// 0x0102f510: 0x102f510: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f504: 0x102f504: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102f514: 0x102f514: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f50c: 0x102f50c: lui   s1, 0x10000
+// 0x0102f51c: 0x102f51c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0102f510: 0x102f510: lui   s3, 0x20000
+// 0x0102f520: 0x102f520: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x0102f514: 0x102f514: bne   s4, zero, 0x102f618 lui   s2, 0x0
+// 0x0102f524: 0x102f524: bne   s4, zero, 0x102f628 lui   s2, 0x0
 	ldloc 12
 	ldc.i4.s 0
 	stloc 10
-	brtrue L_102f618
+	brtrue L_102f628
 // --- basic block ---
-// 0x0102f51c: 0x102f51c: addu  a0, s0, zero
+// 0x0102f52c: 0x102f52c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f520: 0x102f520: addiu a1, zero, 5
+// 0x0102f530: 0x102f530: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f524: 0x102f524: jal   0x109434c addu  a2, zero, zero
+// 0x0102f534: 0x102f534: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3703,29 +3703,29 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f52c: 0x102f52c: addiu a3, zero, -1
+// 0x0102f53c: 0x102f53c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102f530: 0x102f530: addiu a0, s1, -23820
+// 0x0102f540: 0x102f540: addiu a0, s1, -23820
 	ldloc 8
 	ldc.i4 -23820
 	add
 	stloc.1
-// 0x0102f534: 0x102f534: addu  a1, zero, zero
+// 0x0102f544: 0x102f544: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f538: 0x102f538: addiu a2, zero, -1
+// 0x0102f548: 0x102f548: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0102f53c: 0x102f53c: addiu v0, zero, 8
+// 0x0102f54c: 0x102f54c: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0102f540: 0x102f540: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0102f550: 0x102f550: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3739,40 +3739,40 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f548: 0x102f548: addu  a0, v0, zero
+// 0x0102f558: 0x102f558: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f54c: 0x102f54c: addu  a1, zero, zero
+// 0x0102f55c: 0x102f55c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f550: 0x102f550: addu  a2, zero, zero
+// 0x0102f560: 0x102f560: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f554: 0x102f554: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0102f564: 0x102f564: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102f55c: 0x102f55c: lui   a0, 0x10000
+// 0x0102f56c: 0x102f56c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f560: 0x102f560: addiu a0, a0, -23544
+// 0x0102f570: 0x102f570: addiu a0, a0, -23544
 	ldloc.1
 	ldc.i4 -23544
 	add
 	stloc.1
-// 0x0102f564: 0x102f564: addiu a2, zero, 16
+// 0x0102f574: 0x102f574: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f568: 0x102f568: jal   0x109e13c addu  a1, a0, zero
+// 0x0102f578: 0x102f578: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -3780,31 +3780,31 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f570: 0x102f570: addu  a1, v0, zero
+// 0x0102f580: 0x102f580: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f574: 0x102f574: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0102f584: 0x102f584: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f57c: 0x102f57c: addiu a1, zero, 5
+// 0x0102f58c: 0x102f58c: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f580: 0x102f580: addu  a2, zero, zero
+// 0x0102f590: 0x102f590: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f584: 0x102f584: jal   0x109434c addu  a0, s1, zero
+// 0x0102f594: 0x102f594: jal   0x1094970 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3812,15 +3812,15 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f58c: 0x102f58c: lui   a0, 0x10000
+// 0x0102f59c: 0x102f59c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f590: 0x102f590: jal   0x101cd60 addiu a0, a0, -23520
+// 0x0102f5a0: 0x102f5a0: jal   0x101cd70 addiu a0, a0, -23520
 	ldloc.1
 	ldc.i4 -23520
 	add
@@ -3830,23 +3830,23 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f598: 0x102f598: addu  a1, v0, zero
+// 0x0102f5a8: 0x102f5a8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f59c: 0x102f59c: addiu a2, zero, 16
+// 0x0102f5ac: 0x102f5ac: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f5a0: 0x102f5a0: addiu a3, zero, 24
+// 0x0102f5b0: 0x102f5b0: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0102f5a4: 0x102f5a4: jal   0x1098d10 addiu a0, s3, -2684
+// 0x0102f5b4: 0x102f5b4: jal   0x1099358 addiu a0, s3, -2220
 	ldloc 11
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -3854,20 +3854,20 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f5ac: 0x102f5ac: addu  a0, v0, zero
+// 0x0102f5bc: 0x102f5bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f5b0: 0x102f5b0: addiu a1, s2, 23008
+// 0x0102f5c0: 0x102f5c0: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102f5b4: 0x102f5b4: jal   0x1097af8 sw    v0, 184(sp)
+// 0x0102f5c4: 0x102f5c4: jal   0x1098140 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3878,9 +3878,9 @@ L_102f4e4:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102f5bc: 0x102f5bc: lw    v0, 184(sp)
+// 0x0102f5cc: 0x102f5cc: lw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3889,36 +3889,36 @@ L_102f4e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f5c0: 0x102f5c0: addu  a0, s1, zero
+// 0x0102f5d0: 0x102f5d0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102f5c4: 0x102f5c4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0102f5d4: 0x102f5d4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f5cc: 0x102f5cc: addu  a1, s1, zero
+// 0x0102f5dc: 0x102f5dc: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0102f5d0: 0x102f5d0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102f5e0: 0x102f5e0: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f5d8: 0x102f5d8: lui   a0, 0x10000
+// 0x0102f5e8: 0x102f5e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f5dc: 0x102f5dc: jal   0x101cd60 addiu a0, a0, -23496
+// 0x0102f5ec: 0x102f5ec: jal   0x101cd70 addiu a0, a0, -23496
 	ldloc.1
 	ldc.i4 -23496
 	add
@@ -3928,23 +3928,23 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f5e4: 0x102f5e4: addu  a1, v0, zero
+// 0x0102f5f4: 0x102f5f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f5e8: 0x102f5e8: addiu a0, s3, -2684
+// 0x0102f5f8: 0x102f5f8: addiu a0, s3, -2220
 	ldloc 11
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
-// 0x0102f5ec: 0x102f5ec: addiu a2, zero, 16
+// 0x0102f5fc: 0x102f5fc: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f5f0: 0x102f5f0: jal   0x1098d10 ori   a3, zero, 32777
+// 0x0102f600: 0x102f600: jal   0x1099358 ori   a3, zero, 32777
 	ldc.i4.s 0
 	ldc.i4 32777
 	or
@@ -3954,20 +3954,20 @@ L_102f4e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f5f8: 0x102f5f8: addu  a0, v0, zero
+// 0x0102f608: 0x102f608: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f5fc: 0x102f5fc: addiu a1, s2, 23008
+// 0x0102f60c: 0x102f60c: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102f600: 0x102f600: jal   0x1097af8 sw    v0, 184(sp)
+// 0x0102f610: 0x102f610: jal   0x1098140 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3978,9 +3978,9 @@ L_102f4e4:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102f608: 0x102f608: lw    v0, 184(sp)
+// 0x0102f618: 0x102f618: lw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3989,22 +3989,22 @@ L_102f4e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f60c: 0x102f60c: addu  a0, s0, zero
+// 0x0102f61c: 0x102f61c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f610: 0x102f610: j	 0x102f6d0 addu  a1, v0, zero
+// 0x0102f620: 0x102f620: j	 0x102f6e0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-	br L_102f6d0
+	br L_102f6e0
 // --- basic block ---
-L_102f618:
-// 0x0102f618: 0x102f618: addu  a0, s0, zero
+L_102f628:
+// 0x0102f628: 0x102f628: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f61c: 0x102f61c: addiu a1, zero, 5
+// 0x0102f62c: 0x102f62c: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f620: 0x102f620: jal   0x109434c addu  a2, zero, zero
+// 0x0102f630: 0x102f630: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4012,29 +4012,29 @@ L_102f618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f628: 0x102f628: addiu a3, zero, -1
+// 0x0102f638: 0x102f638: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0102f62c: 0x102f62c: addiu a0, s1, -23820
+// 0x0102f63c: 0x102f63c: addiu a0, s1, -23820
 	ldloc 8
 	ldc.i4 -23820
 	add
 	stloc.1
-// 0x0102f630: 0x102f630: addu  a1, zero, zero
+// 0x0102f640: 0x102f640: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f634: 0x102f634: addiu a2, zero, -1
+// 0x0102f644: 0x102f644: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0102f638: 0x102f638: addiu v0, zero, 8
+// 0x0102f648: 0x102f648: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0102f63c: 0x102f63c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0102f64c: 0x102f64c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4048,40 +4048,40 @@ L_102f618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f644: 0x102f644: addu  a0, v0, zero
+// 0x0102f654: 0x102f654: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f648: 0x102f648: addu  a1, zero, zero
+// 0x0102f658: 0x102f658: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0102f64c: 0x102f64c: addu  a2, zero, zero
+// 0x0102f65c: 0x102f65c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f650: 0x102f650: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0102f660: 0x102f660: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0102f658: 0x102f658: lui   a0, 0x10000
+// 0x0102f668: 0x102f668: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f65c: 0x102f65c: addiu a0, a0, -23448
+// 0x0102f66c: 0x102f66c: addiu a0, a0, -23448
 	ldloc.1
 	ldc.i4 -23448
 	add
 	stloc.1
-// 0x0102f660: 0x102f660: addiu a2, zero, 16
+// 0x0102f670: 0x102f670: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f664: 0x102f664: jal   0x109e13c addu  a1, a0, zero
+// 0x0102f674: 0x102f674: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -4089,31 +4089,31 @@ L_102f618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f66c: 0x102f66c: addu  a1, v0, zero
+// 0x0102f67c: 0x102f67c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f670: 0x102f670: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0102f680: 0x102f680: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f678: 0x102f678: addiu a1, zero, 5
+// 0x0102f688: 0x102f688: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0102f67c: 0x102f67c: addu  a2, zero, zero
+// 0x0102f68c: 0x102f68c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0102f680: 0x102f680: jal   0x109434c addu  a0, s1, zero
+// 0x0102f690: 0x102f690: jal   0x1094970 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4121,15 +4121,15 @@ L_102f618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f688: 0x102f688: lui   a0, 0x10000
+// 0x0102f698: 0x102f698: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f68c: 0x102f68c: jal   0x101cd60 addiu a0, a0, -23428
+// 0x0102f69c: 0x102f69c: jal   0x101cd70 addiu a0, a0, -23428
 	ldloc.1
 	ldc.i4 -23428
 	add
@@ -4139,23 +4139,23 @@ L_102f618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f694: 0x102f694: addu  a1, v0, zero
+// 0x0102f6a4: 0x102f6a4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f698: 0x102f698: addiu a2, zero, 16
+// 0x0102f6a8: 0x102f6a8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0102f69c: 0x102f69c: addiu a3, zero, 24
+// 0x0102f6ac: 0x102f6ac: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0102f6a0: 0x102f6a0: jal   0x1098d10 addiu a0, s3, -2684
+// 0x0102f6b0: 0x102f6b0: jal   0x1099358 addiu a0, s3, -2220
 	ldloc 11
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -4163,20 +4163,20 @@ L_102f618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f6a8: 0x102f6a8: addu  a0, v0, zero
+// 0x0102f6b8: 0x102f6b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0102f6ac: 0x102f6ac: addiu a1, s2, 23008
+// 0x0102f6bc: 0x102f6bc: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0102f6b0: 0x102f6b0: jal   0x1097af8 sw    v0, 184(sp)
+// 0x0102f6c0: 0x102f6c0: jal   0x1098140 sw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4187,9 +4187,9 @@ L_102f618:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0102f6b8: 0x102f6b8: lw    v0, 184(sp)
+// 0x0102f6c8: 0x102f6c8: lw    v0, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4198,41 +4198,41 @@ L_102f618:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f6bc: 0x102f6bc: addu  a0, s1, zero
+// 0x0102f6cc: 0x102f6cc: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0102f6c0: 0x102f6c0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0102f6d0: 0x102f6d0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f6c8: 0x102f6c8: addu  a0, s0, zero
+// 0x0102f6d8: 0x102f6d8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0102f6cc: 0x102f6cc: addu  a1, s1, zero
+// 0x0102f6dc: 0x102f6dc: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-L_102f6d0:
-// 0x0102f6d0: 0x102f6d0: jal   0x1098ec4 sll   zero, zero, 0
+L_102f6e0:
+// 0x0102f6e0: 0x102f6e0: jal   0x109950c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f6d8: 0x102f6d8: addiu a1, zero, 10
+// 0x0102f6e8: 0x102f6e8: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0102f6dc: 0x102f6dc: addiu a2, zero, 8
+// 0x0102f6ec: 0x102f6ec: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x0102f6e0: 0x102f6e0: jal   0x10942e8 addu  a0, s0, zero
+// 0x0102f6f0: 0x102f6f0: jal   0x109490c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4240,15 +4240,15 @@ L_102f6d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f6e8: 0x102f6e8: lui   a0, 0x0
+// 0x0102f6f8: 0x102f6f8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102f6ec: 0x102f6ec: jal   0x101cd60 addiu a0, a0, 32524
+// 0x0102f6fc: 0x102f6fc: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -4258,36 +4258,36 @@ L_102f6d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f6f4: 0x102f6f4: lui   a2, 0x300000
+// 0x0102f704: 0x102f704: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x0102f6f8: 0x102f6f8: lui   a3, 0x1030000
+// 0x0102f708: 0x102f708: lui   a3, 0x1030000
 	ldc.i4 16973824
 	stloc 4
-// 0x0102f6fc: 0x102f6fc: lui   a0, 0x0
+// 0x0102f70c: 0x102f70c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0102f700: 0x102f700: ori   a2, a2, 5
+// 0x0102f710: 0x102f710: ori   a2, a2, 5
 	ldloc.3
 	ldc.i4.5
 	or
 	stloc.3
-// 0x0102f704: 0x102f704: addiu a3, a3, -13628
+// 0x0102f714: 0x102f714: addiu a3, a3, -13612
 	ldloc 4
-	ldc.i4 -13628
+	ldc.i4 -13612
 	add
 	stloc 4
-// 0x0102f708: 0x102f708: addiu a0, a0, 32528
+// 0x0102f718: 0x102f718: addiu a0, a0, 32528
 	ldloc.1
 	ldc.i4 32528
 	add
 	stloc.1
-// 0x0102f70c: 0x102f70c: jal   0x1091088 addu  a1, v0, zero
+// 0x0102f71c: 0x102f71c: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4295,33 +4295,33 @@ L_102f6d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f714: 0x102f714: addu  a1, v0, zero
+// 0x0102f724: 0x102f724: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0102f718: 0x102f718: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0102f728: 0x102f728: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f720: 0x102f720: lui   a0, 0x10000
+// 0x0102f730: 0x102f730: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102f724: 0x102f724: addiu a0, a0, -25276
+// 0x0102f734: 0x102f734: addiu a0, a0, -25276
 	ldloc.1
 	ldc.i4 -25276
 	add
 	stloc.1
-// 0x0102f728: 0x102f728: jal   0x1095eec addu  a1, zero, zero
+// 0x0102f738: 0x102f738: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4329,24 +4329,24 @@ L_102f6d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f730: 0x102f730: jal   0x1021900 sll   zero, zero, 0
+// 0x0102f740: 0x102f740: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f738: 0x102f738: lw    ra, 212(sp)
-// 0x0102f73c: 0x102f73c: lw    s4, 208(sp)
+// 0x0102f748: 0x102f748: lw    ra, 212(sp)
+// 0x0102f74c: 0x102f74c: lw    s4, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4355,7 +4355,7 @@ L_102f6d0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0102f740: 0x102f740: lw    s3, 204(sp)
+// 0x0102f750: 0x102f750: lw    s3, 204(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4364,7 +4364,7 @@ L_102f6d0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0102f744: 0x102f744: lw    s2, 200(sp)
+// 0x0102f754: 0x102f754: lw    s2, 200(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4373,7 +4373,7 @@ L_102f6d0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0102f748: 0x102f748: lw    s1, 196(sp)
+// 0x0102f758: 0x102f758: lw    s1, 196(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4382,7 +4382,7 @@ L_102f6d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102f74c: 0x102f74c: lw    s0, 192(sp)
+// 0x0102f75c: 0x102f75c: lw    s0, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4391,7 +4391,7 @@ L_102f6d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102f750: 0x102f750: jr    ra addiu sp, sp, 216
+// 0x0102f760: 0x102f760: jr    ra addiu sp, sp, 216
 	ldloc.0
 	ldc.i4 216
 	add
@@ -4403,7 +4403,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 obj_is_active_102f864(int32,int32,int32,int32,int32)
+.method public static int32 obj_is_active_102f874(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -4441,7 +4441,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102f864: 0x102f864: lw    v0, 108(a0)
+// 0x0102f874: 0x102f874: lw    v0, 108(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4450,12 +4450,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f868: 0x102f868: addiu sp, sp, -24
+// 0x0102f878: 0x102f878: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102f86c: 0x102f86c: sw    s0, 16(sp)
+// 0x0102f87c: 0x102f87c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4464,14 +4464,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102f870: 0x102f870: sw    ra, 20(sp)
-// 0x0102f874: 0x102f874: beq   v0, zero, 0x102f890 addu  s0, a0, zero
+// 0x0102f880: 0x102f880: sw    ra, 20(sp)
+// 0x0102f884: 0x102f884: beq   v0, zero, 0x102f8a0 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_102f890
+	brfalse L_102f8a0
 // --- basic block ---
-// 0x0102f87c: 0x102f87c: jalr  v0 sll   zero, zero, 0
+// 0x0102f88c: 0x102f88c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4483,19 +4483,19 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f884: 0x102f884: sltiu v1, v0, 9
+// 0x0102f894: 0x102f894: sltiu v1, v0, 9
 	ldloc 5
 	ldc.i4.s 9
 	clt.un
 	stloc 6
-// 0x0102f888: 0x102f888: beq   v1, zero, 0x102f8b8 addu  v0, zero, zero
+// 0x0102f898: 0x102f898: beq   v1, zero, 0x102f8c8 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_102f8b8
+	brfalse L_102f8c8
 // --- basic block ---
-L_102f890:
-// 0x0102f890: 0x102f890: lw    v1, 112(s0)
+L_102f8a0:
+// 0x0102f8a0: 0x102f8a0: lw    v1, 112(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4504,14 +4504,14 @@ L_102f890:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102f894: 0x102f894: sll   zero, zero, 0
-// 0x0102f898: 0x102f898: beq   v1, zero, 0x102f8b8 addiu v0, zero, 1
+// 0x0102f8a4: 0x102f8a4: sll   zero, zero, 0
+// 0x0102f8a8: 0x102f8a8: beq   v1, zero, 0x102f8c8 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brfalse L_102f8b8
+	brfalse L_102f8c8
 // --- basic block ---
-// 0x0102f8a0: 0x102f8a0: jalr  v1 sll   zero, zero, 0
+// 0x0102f8b0: 0x102f8b0: jalr  v1 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -4523,7 +4523,7 @@ L_102f890:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0102f8a8: 0x102f8a8: lw    v1, 116(s0)
+// 0x0102f8b8: 0x102f8b8: lw    v1, 116(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4532,20 +4532,20 @@ L_102f890:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102f8ac: 0x102f8ac: sll   zero, zero, 0
-// 0x0102f8b0: 0x102f8b0: xor   v0, v0, v1
+// 0x0102f8bc: 0x102f8bc: sll   zero, zero, 0
+// 0x0102f8c0: 0x102f8c0: xor   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	xor
 	stloc 5
-// 0x0102f8b4: 0x102f8b4: sltiu v0, v0, 1
+// 0x0102f8c4: 0x102f8c4: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-L_102f8b8:
-// 0x0102f8b8: 0x102f8b8: lw    ra, 20(sp)
-// 0x0102f8bc: 0x102f8bc: lw    s0, 16(sp)
+L_102f8c8:
+// 0x0102f8c8: 0x102f8c8: lw    ra, 20(sp)
+// 0x0102f8cc: 0x102f8cc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4554,7 +4554,7 @@ L_102f8b8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102f8c0: 0x102f8c0: jr    ra addiu sp, sp, 24
+// 0x0102f8d0: 0x102f8d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4566,7 +4566,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_obj_repeat_102f8c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_repeat_102f8d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4601,28 +4601,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102f8c8: 0x102f8c8: lui   v0, 0x60000
+// 0x0102f8d8: 0x102f8d8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102f8cc: 0x102f8cc: lw    v0, -23892(v0)
+// 0x0102f8dc: 0x102f8dc: lw    v0, -23428(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f8d0: 0x102f8d0: addiu sp, sp, -24
+// 0x0102f8e0: 0x102f8e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0102f8d4: 0x102f8d4: beq   v0, zero, 0x102f8fc sw    ra, 20(sp)
+// 0x0102f8e4: 0x102f8e4: beq   v0, zero, 0x102f90c sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_102f8fc
+	brfalse L_102f90c
 // --- basic block ---
-// 0x0102f8dc: 0x102f8dc: lw    v0, 96(v0)
+// 0x0102f8ec: 0x102f8ec: lw    v0, 96(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4631,12 +4631,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f8e0: 0x102f8e0: sll   zero, zero, 0
-// 0x0102f8e4: 0x102f8e4: beq   v0, zero, 0x102f8fc sll   zero, zero, 0
+// 0x0102f8f0: 0x102f8f0: sll   zero, zero, 0
+// 0x0102f8f4: 0x102f8f4: beq   v0, zero, 0x102f90c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102f8fc
+	brfalse L_102f90c
 // --- basic block ---
-// 0x0102f8ec: 0x102f8ec: lw    v0, 20(v0)
+// 0x0102f8fc: 0x102f8fc: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4645,8 +4645,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102f8f0: 0x102f8f0: sll   zero, zero, 0
-// 0x0102f8f4: 0x102f8f4: jalr  v0 sll   zero, zero, 0
+// 0x0102f900: 0x102f900: sll   zero, zero, 0
+// 0x0102f904: 0x102f904: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4658,10 +4658,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_102f8fc:
-// 0x0102f8fc: 0x102f8fc: lw    ra, 20(sp)
-// 0x0102f900: 0x102f900: sll   zero, zero, 0
-// 0x0102f904: 0x102f904: jr    ra addiu sp, sp, 24
+L_102f90c:
+// 0x0102f90c: 0x102f90c: lw    ra, 20(sp)
+// 0x0102f910: 0x102f910: sll   zero, zero, 0
+// 0x0102f914: 0x102f914: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4673,7 +4673,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_obj_global_offset_102f90c(int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_global_offset_102f91c(int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -4705,55 +4705,55 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102f90c: 0x102f90c: lui   v1, 0x60000
+// 0x0102f91c: 0x102f91c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0102f910: 0x102f910: lui   v0, 0x60000
+// 0x0102f920: 0x102f920: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0102f914: 0x102f914: lw    a3, -23888(v1)
+// 0x0102f924: 0x102f924: lw    a3, -23424(v1)
 	ldloc 4
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5972
+	ldc.i4 -5856
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102f918: 0x102f918: lw    a2, -23884(v0)
+// 0x0102f928: 0x102f928: lw    a2, -23420(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5971
+	ldc.i4 -5855
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102f91c: 0x102f91c: addu  a0, a0, a3
+// 0x0102f92c: 0x102f92c: addu  a0, a0, a3
 	ldloc.0
 	ldloc.3
 	add
 	stloc.0
-// 0x0102f920: 0x102f920: addu  a1, a1, a2
+// 0x0102f930: 0x102f930: addu  a1, a1, a2
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x0102f924: 0x102f924: sw    a0, -23888(v1)
+// 0x0102f934: 0x102f934: sw    a0, -23424(v1)
 	ldloc 4
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5972
+	ldc.i4 -5856
 	add
 	ldloc.0
 	stelem.i4
-// 0x0102f928: 0x102f928: jr    ra sw    a1, -23884(v0)
+// 0x0102f938: 0x102f938: jr    ra sw    a1, -23420(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5971
+	ldc.i4 -5855
 	add
 	ldloc.1
 	stelem.i4
@@ -4764,7 +4764,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -4802,22 +4802,22 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102fa24: 0x102fa24: addiu v0, a1, -1
+// 0x0102fa34: 0x102fa34: addiu v0, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0102fa28: 0x102fa28: addiu sp, sp, -32
+// 0x0102fa38: 0x102fa38: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102fa2c: 0x102fa2c: slt   v1, v0, a3
+// 0x0102fa3c: 0x102fa3c: slt   v1, v0, a3
 	ldloc 7
 	ldloc 4
 	clt
 	stloc 8
-// 0x0102fa30: 0x102fa30: sw    s0, 24(sp)
+// 0x0102fa40: 0x102fa40: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4826,27 +4826,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102fa34: 0x102fa34: sw    ra, 28(sp)
-// 0x0102fa38: 0x102fa38: addu  s0, a0, zero
+// 0x0102fa44: 0x102fa44: sw    ra, 28(sp)
+// 0x0102fa48: 0x102fa48: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0102fa3c: 0x102fa3c: beq   v1, zero, 0x102fa48 addu  a1, a2, zero
+// 0x0102fa4c: 0x102fa4c: beq   v1, zero, 0x102fa58 addu  a1, a2, zero
 	ldloc 8
 	ldloc.3
 	stloc.2
-	brfalse L_102fa48
+	brfalse L_102fa58
 // --- basic block ---
-// 0x0102fa44: 0x102fa44: addu  a3, v0, zero
+// 0x0102fa54: 0x102fa54: addu  a3, v0, zero
 	ldloc 7
 	stloc 4
-L_102fa48:
-// 0x0102fa48: 0x102fa48: addu  a0, s0, zero
+L_102fa58:
+// 0x0102fa58: 0x102fa58: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x0102fa4c: 0x102fa4c: addu  a2, a3, zero
+// 0x0102fa5c: 0x102fa5c: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x0102fa50: 0x102fa50: jal   0x1001af8 sw    a3, 16(sp)
+// 0x0102fa60: 0x102fa60: jal   0x1001af8 sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4861,7 +4861,7 @@ L_102fa48:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0102fa58: 0x102fa58: lw    a3, 16(sp)
+// 0x0102fa68: 0x102fa68: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4870,18 +4870,18 @@ L_102fa48:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fa5c: 0x102fa5c: sll   zero, zero, 0
-// 0x0102fa60: 0x102fa60: addu  a3, s0, a3
+// 0x0102fa6c: 0x102fa6c: sll   zero, zero, 0
+// 0x0102fa70: 0x102fa70: addu  a3, s0, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 4
-// 0x0102fa64: 0x102fa64: sb    zero, 0(a3)
+// 0x0102fa74: 0x102fa74: sb    zero, 0(a3)
 	ldloc 4
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0102fa68: 0x102fa68: lw    ra, 28(sp)
-// 0x0102fa6c: 0x102fa6c: lw    s0, 24(sp)
+// 0x0102fa78: 0x102fa78: lw    ra, 28(sp)
+// 0x0102fa7c: 0x102fa7c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4890,7 +4890,7 @@ L_102fa48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102fa70: 0x102fa70: jr    ra addiu sp, sp, 32
+// 0x0102fa80: 0x102fa80: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4902,7 +4902,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_object_string_102fa78(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_object_string_102fa88(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 s0,int32 s2,int32 v1,int32 ra)
@@ -4946,12 +4946,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102fa78: 0x102fa78: addiu sp, sp, -32
+// 0x0102fa88: 0x102fa88: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0102fa7c: 0x102fa7c: sw    s2, 24(sp)
+// 0x0102fa8c: 0x102fa8c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4960,16 +4960,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102fa80: 0x102fa80: addu  s2, a0, zero
+// 0x0102fa90: 0x102fa90: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0102fa84: 0x102fa84: addiu a0, a1, 1
+// 0x0102fa94: 0x102fa94: addiu a0, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0102fa88: 0x102fa88: sw    ra, 28(sp)
-// 0x0102fa8c: 0x102fa8c: sw    s1, 20(sp)
+// 0x0102fa98: 0x102fa98: sw    ra, 28(sp)
+// 0x0102fa9c: 0x102fa9c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4978,7 +4978,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0102fa90: 0x102fa90: sw    s0, 16(sp)
+// 0x0102faa0: 0x102faa0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4987,7 +4987,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102fa94: 0x102fa94: jal   0x1000910 addu  s1, a1, zero
+// 0x0102faa4: 0x102faa4: jal   0x1000910 addu  s1, a1, zero
 	ldloc.2
 	stloc 6
 	ldloc.0
@@ -5000,21 +5000,21 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0102fa9c: 0x102fa9c: lui   a0, 0x10000
+// 0x0102faac: 0x102faac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0102faa0: 0x102faa0: addu  s0, v0, zero
+// 0x0102fab0: 0x102fab0: addu  s0, v0, zero
 	ldloc 7
 	stloc 8
-// 0x0102faa4: 0x102faa4: addu  a2, v0, zero
+// 0x0102fab4: 0x102fab4: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x0102faa8: 0x102faa8: addiu a0, a0, -16588
+// 0x0102fab8: 0x102fab8: addiu a0, a0, -16588
 	ldloc.1
 	ldc.i4 -16588
 	add
 	stloc.1
-// 0x0102faac: 0x102faac: jal   0x1004a38 addiu a1, zero, 132
+// 0x0102fabc: 0x102fabc: jal   0x1004a48 addiu a1, zero, 132
 	ldc.i4 132
 	stloc.2
 	ldloc.0
@@ -5022,21 +5022,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0102fab4: 0x102fab4: addu  a0, s0, zero
+// 0x0102fac4: 0x102fac4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0102fab8: 0x102fab8: addu  a1, s2, zero
+// 0x0102fac8: 0x102fac8: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x0102fabc: 0x102fabc: addu  a2, s1, zero
+// 0x0102facc: 0x102facc: addu  a2, s1, zero
 	ldloc 6
 	stloc.3
-// 0x0102fac0: 0x102fac0: jal   0x1001af8 addu  s1, s0, s1
+// 0x0102fad0: 0x102fad0: jal   0x1001af8 addu  s1, s0, s1
 	ldloc 8
 	ldloc 6
 	add
@@ -5047,15 +5047,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0102fac8: 0x102fac8: sb    zero, 0(s1)
+// 0x0102fad8: 0x102fad8: sb    zero, 0(s1)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0102facc: 0x102facc: lw    ra, 28(sp)
-// 0x0102fad0: 0x102fad0: addu  v0, s0, zero
+// 0x0102fadc: 0x102fadc: lw    ra, 28(sp)
+// 0x0102fae0: 0x102fae0: addu  v0, s0, zero
 	ldloc 8
 	stloc 7
-// 0x0102fad4: 0x102fad4: lw    s2, 24(sp)
+// 0x0102fae4: 0x102fae4: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5064,7 +5064,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0102fad8: 0x102fad8: lw    s1, 20(sp)
+// 0x0102fae8: 0x102fae8: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5073,7 +5073,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0102fadc: 0x102fadc: lw    s0, 16(sp)
+// 0x0102faec: 0x102faec: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5082,7 +5082,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0102fae0: 0x102fae0: jr    ra addiu sp, sp, 32
+// 0x0102faf0: 0x102faf0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5094,7 +5094,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_screen_obj_load_102fae8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_load_102faf8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 s1,int32 s5,int32 s4,int32 s7,int32 s6,int32 s8,int32 t0,int32 ra)
@@ -5159,12 +5159,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0102fae8: 0x102fae8: addiu sp, sp, -2376
+// 0x0102faf8: 0x102faf8: addiu sp, sp, -2376
 	ldloc.0
 	ldc.i4 -2376
 	add
 	stloc.0
-// 0x0102faec: 0x102faec: sw    s1, 2340(sp)
+// 0x0102fafc: 0x102fafc: sw    s1, 2340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5173,10 +5173,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0102faf0: 0x102faf0: lui   s1, 0x10000
+// 0x0102fb00: 0x102fb00: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0102faf4: 0x102faf4: sw    s8, 2368(sp)
+// 0x0102fb04: 0x102fb04: sw    s8, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5185,7 +5185,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0102faf8: 0x102faf8: sw    s4, 2352(sp)
+// 0x0102fb08: 0x102fb08: sw    s4, 2352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5194,7 +5194,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0102fafc: 0x102fafc: sw    s0, 2336(sp)
+// 0x0102fb0c: 0x102fb0c: sw    s0, 2336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5203,8 +5203,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0102fb00: 0x102fb00: sw    ra, 2372(sp)
-// 0x0102fb04: 0x102fb04: sw    s7, 2364(sp)
+// 0x0102fb10: 0x102fb10: sw    ra, 2372(sp)
+// 0x0102fb14: 0x102fb14: sw    s7, 2364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5213,7 +5213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0102fb08: 0x102fb08: sw    s6, 2360(sp)
+// 0x0102fb18: 0x102fb18: sw    s6, 2360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5222,7 +5222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0102fb0c: 0x102fb0c: sw    s5, 2356(sp)
+// 0x0102fb1c: 0x102fb1c: sw    s5, 2356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0102fb10: 0x102fb10: sw    s3, 2348(sp)
+// 0x0102fb20: 0x102fb20: sw    s3, 2348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5240,7 +5240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0102fb14: 0x102fb14: sw    s2, 2344(sp)
+// 0x0102fb24: 0x102fb24: sw    s2, 2344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5249,145 +5249,145 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0102fb18: 0x102fb18: addu  s4, a0, a1
+// 0x0102fb28: 0x102fb28: addu  s4, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc 13
-// 0x0102fb1c: 0x102fb1c: addiu s1, s1, -16588
+// 0x0102fb2c: 0x102fb2c: addiu s1, s1, -16588
 	ldloc 11
 	ldc.i4 -16588
 	add
 	stloc 11
-// 0x0102fb20: 0x102fb20: addu  s0, zero, zero
+// 0x0102fb30: 0x102fb30: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0102fb24: 0x102fb24: j	 0x1030270 lui   s8, 0x60000
+// 0x0102fb34: 0x102fb34: j	 0x1030280 lui   s8, 0x60000
 	ldc.i4 393216
 	stloc 16
-	br L_1030270
+	br L_1030280
 // --- basic block ---
-L_102fb2c:
-// 0x0102fb2c: 0x102fb2c: bne   v0, v1, 0x102fb68 addiu a0, a0, 1
+L_102fb3c:
+// 0x0102fb3c: 0x102fb3c: bne   v0, v1, 0x102fb78 addiu a0, a0, 1
 	ldloc 5
 	ldloc 7
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_102fb68
+	bne.un L_102fb78
 // --- basic block ---
-// 0x0102fb34: 0x102fb34: j	 0x102fb40 sltu  v0, a0, s4
+// 0x0102fb44: 0x102fb44: j	 0x102fb50 sltu  v0, a0, s4
 	ldloc.1
 	ldloc 13
 	clt.un
 	stloc 5
-	br L_102fb40
+	br L_102fb50
 // --- basic block ---
-L_102fb3c:
-// 0x0102fb3c: 0x102fb3c: sltu  v0, a0, s4
+L_102fb4c:
+// 0x0102fb4c: 0x102fb4c: sltu  v0, a0, s4
 	ldloc.1
 	ldloc 13
 	clt.un
 	stloc 5
-L_102fb40:
-// 0x0102fb40: 0x102fb40: beq   v0, zero, 0x102fb6c sltu  v0, a0, s4
+L_102fb50:
+// 0x0102fb50: 0x102fb50: beq   v0, zero, 0x102fb7c sltu  v0, a0, s4
 	ldloc 5
 	ldloc.1
 	ldloc 13
 	clt.un
 	stloc 5
-	brfalse L_102fb6c
+	brfalse L_102fb7c
 // --- basic block ---
-// 0x0102fb48: 0x102fb48: lb    v0, 0(a0)
+// 0x0102fb58: 0x102fb58: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0102fb4c: 0x102fb4c: sll   zero, zero, 0
-// 0x0102fb50: 0x102fb50: slti  v0, v0, 32
+// 0x0102fb5c: 0x102fb5c: sll   zero, zero, 0
+// 0x0102fb60: 0x102fb60: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x0102fb54: 0x102fb54: beq   v0, zero, 0x102fb3c addiu a0, a0, 1
+// 0x0102fb64: 0x102fb64: beq   v0, zero, 0x102fb4c addiu a0, a0, 1
 	ldloc 5
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brfalse L_102fb3c
+	brfalse L_102fb4c
 // --- basic block ---
-// 0x0102fb5c: 0x102fb5c: addiu a0, a0, -1
+// 0x0102fb6c: 0x102fb6c: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x0102fb60: 0x102fb60: j	 0x102fb6c sltu  v0, a0, s4
+// 0x0102fb70: 0x102fb70: j	 0x102fb7c sltu  v0, a0, s4
 	ldloc.1
 	ldloc 13
 	clt.un
 	stloc 5
-	br L_102fb6c
+	br L_102fb7c
 // --- basic block ---
-L_102fb68:
-// 0x0102fb68: 0x102fb68: sltu  v0, a0, s4
+L_102fb78:
+// 0x0102fb78: 0x102fb78: sltu  v0, a0, s4
 	ldloc.1
 	ldloc 13
 	clt.un
 	stloc 5
-L_102fb6c:
-// 0x0102fb6c: 0x102fb6c: beq   v0, zero, 0x102fb90 sll   zero, zero, 0
+L_102fb7c:
+// 0x0102fb7c: 0x102fb7c: beq   v0, zero, 0x102fba0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102fb90
+	brfalse L_102fba0
 // --- basic block ---
-// 0x0102fb74: 0x102fb74: lb    v0, 0(a0)
+// 0x0102fb84: 0x102fb84: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0102fb78: 0x102fb78: sll   zero, zero, 0
-// 0x0102fb7c: 0x102fb7c: beq   v0, a1, 0x102fb68 addiu a0, a0, 1
+// 0x0102fb88: 0x102fb88: sll   zero, zero, 0
+// 0x0102fb8c: 0x102fb8c: beq   v0, a1, 0x102fb78 addiu a0, a0, 1
 	ldloc 5
 	ldloc.2
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	beq  L_102fb68
+	beq  L_102fb78
 // --- basic block ---
-// 0x0102fb84: 0x102fb84: j	 0x102fb98 addiu a0, a0, -1
+// 0x0102fb94: 0x102fb94: j	 0x102fba8 addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-	br L_102fb98
+	br L_102fba8
 // --- basic block ---
-L_102fb8c:
-// 0x0102fb8c: 0x102fb8c: addiu a1, zero, 10
+L_102fb9c:
+// 0x0102fb9c: 0x102fb9c: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-L_102fb90:
-// 0x0102fb90: 0x102fb90: lb    v0, 0(a0)
+L_102fba0:
+// 0x0102fba0: 0x102fba0: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0102fb94: 0x102fb94: sll   zero, zero, 0
-L_102fb98:
-// 0x0102fb98: 0x102fb98: beq   v0, v1, 0x102fb2c slti  a2, v0, 32
+// 0x0102fba4: 0x102fba4: sll   zero, zero, 0
+L_102fba8:
+// 0x0102fba8: 0x102fba8: beq   v0, v1, 0x102fb3c slti  a2, v0, 32
 	ldloc 5
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc.3
-	beq  L_102fb2c
+	beq  L_102fb3c
 // --- basic block ---
-// 0x0102fba0: 0x102fba0: bne   a2, zero, 0x102fb2c addu  s3, a0, zero
+// 0x0102fbb0: 0x102fbb0: bne   a2, zero, 0x102fb3c addu  s3, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 10
-	brtrue L_102fb2c
+	brtrue L_102fb3c
 // --- basic block ---
-// 0x0102fba8: 0x102fba8: sw    a0, 1304(sp)
+// 0x0102fbb8: 0x102fbb8: sw    a0, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5396,50 +5396,50 @@ L_102fb98:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0102fbac: 0x102fbac: addiu s2, zero, 1
+// 0x0102fbbc: 0x102fbbc: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0102fbb0: 0x102fbb0: addiu a0, zero, 32
+// 0x0102fbc0: 0x102fbc0: addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
-// 0x0102fbb4: 0x102fbb4: j	 0x102fc18 addiu v0, sp, 24
+// 0x0102fbc4: 0x102fbc4: j	 0x102fc28 addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-	br L_102fc18
+	br L_102fc28
 // --- basic block ---
-L_102fbbc:
-// 0x0102fbbc: 0x102fbbc: lb    v1, 0(s3)
+L_102fbcc:
+// 0x0102fbcc: 0x102fbcc: lb    v1, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0102fbc0: 0x102fbc0: sll   zero, zero, 0
-// 0x0102fbc4: 0x102fbc4: bne   v1, a0, 0x102fc0c slti  v1, v1, 32
+// 0x0102fbd0: 0x102fbd0: sll   zero, zero, 0
+// 0x0102fbd4: 0x102fbd4: bne   v1, a0, 0x102fc1c slti  v1, v1, 32
 	ldloc 7
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 32
 	clt
 	stloc 7
-	bne.un L_102fc0c
+	bne.un L_102fc1c
 // --- basic block ---
-// 0x0102fbcc: 0x102fbcc: addiu v1, s2, -1
+// 0x0102fbdc: 0x102fbdc: addiu v1, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0102fbd0: 0x102fbd0: sll   v1, v1, 2
+// 0x0102fbe0: 0x102fbe0: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0102fbd4: 0x102fbd4: addu  v1, v0, v1
+// 0x0102fbe4: 0x102fbe4: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x0102fbd8: 0x102fbd8: lw    t0, 1280(v1)
+// 0x0102fbe8: 0x102fbe8: lw    t0, 1280(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5448,37 +5448,37 @@ L_102fbbc:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0102fbdc: 0x102fbdc: sll   a2, s2, 2
+// 0x0102fbec: 0x102fbec: sll   a2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x0102fbe0: 0x102fbe0: addiu s2, s2, 1
+// 0x0102fbf0: 0x102fbf0: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0102fbe4: 0x102fbe4: subu  t0, s3, t0
+// 0x0102fbf4: 0x102fbf4: subu  t0, s3, t0
 	ldloc 10
 	ldloc 17
 	sub
 	stloc 17
-// 0x0102fbe8: 0x102fbe8: addu  a2, v0, a2
+// 0x0102fbf8: 0x102fbf8: addu  a2, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc.3
-// 0x0102fbec: 0x102fbec: addiu a3, s3, 1
+// 0x0102fbfc: 0x102fbfc: addiu a3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 4
-// 0x0102fbf0: 0x102fbf0: slti  a1, s2, 255
+// 0x0102fc00: 0x102fc00: slti  a1, s2, 255
 	ldloc 8
 	ldc.i4 255
 	clt
 	stloc.2
-// 0x0102fbf4: 0x102fbf4: sw    t0, 256(v1)
+// 0x0102fc04: 0x102fc04: sw    t0, 256(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5487,7 +5487,7 @@ L_102fbbc:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0102fbf8: 0x102fbf8: beq   a1, zero, 0x102fc24 sw    a3, 1280(a2)
+// 0x0102fc08: 0x102fc08: beq   a1, zero, 0x102fc34 sw    a3, 1280(a2)
 	ldloc.2
 	ldloc 6
 	ldloc.3
@@ -5497,65 +5497,65 @@ L_102fbbc:
 	add
 	ldloc 4
 	stelem.i4
-	brfalse L_102fc24
+	brfalse L_102fc34
 // --- basic block ---
-// 0x0102fc00: 0x102fc00: lb    v1, 0(s3)
+// 0x0102fc10: 0x102fc10: lb    v1, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0102fc04: 0x102fc04: sll   zero, zero, 0
-// 0x0102fc08: 0x102fc08: slti  v1, v1, 32
+// 0x0102fc14: 0x102fc14: sll   zero, zero, 0
+// 0x0102fc18: 0x102fc18: slti  v1, v1, 32
 	ldloc 7
 	ldc.i4.s 32
 	clt
 	stloc 7
-L_102fc0c:
-// 0x0102fc0c: 0x102fc0c: bne   v1, zero, 0x102fc28 addiu s5, s2, -1
+L_102fc1c:
+// 0x0102fc1c: 0x102fc1c: bne   v1, zero, 0x102fc38 addiu s5, s2, -1
 	ldloc 7
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 12
-	brtrue L_102fc28
+	brtrue L_102fc38
 // --- basic block ---
-// 0x0102fc14: 0x102fc14: addiu s3, s3, 1
+// 0x0102fc24: 0x102fc24: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_102fc18:
-// 0x0102fc18: 0x102fc18: sltu  v1, s3, s4
+L_102fc28:
+// 0x0102fc28: 0x102fc28: sltu  v1, s3, s4
 	ldloc 10
 	ldloc 13
 	clt.un
 	stloc 7
-// 0x0102fc1c: 0x102fc1c: bne   v1, zero, 0x102fbbc sll   zero, zero, 0
+// 0x0102fc2c: 0x102fc2c: bne   v1, zero, 0x102fbcc sll   zero, zero, 0
 	ldloc 7
-	brtrue L_102fbbc
+	brtrue L_102fbcc
 // --- basic block ---
-L_102fc24:
-// 0x0102fc24: 0x102fc24: addiu s5, s2, -1
+L_102fc34:
+// 0x0102fc34: 0x102fc34: addiu s5, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 12
-L_102fc28:
-// 0x0102fc28: 0x102fc28: addiu v1, sp, 24
+L_102fc38:
+// 0x0102fc38: 0x102fc38: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x0102fc2c: 0x102fc2c: sll   v0, s5, 2
+// 0x0102fc3c: 0x102fc3c: sll   v0, s5, 2
 	ldloc 12
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0102fc30: 0x102fc30: addu  v0, v1, v0
+// 0x0102fc40: 0x102fc40: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0102fc34: 0x102fc34: lw    v1, 1280(v0)
+// 0x0102fc44: 0x102fc44: lw    v1, 1280(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5564,13 +5564,13 @@ L_102fc28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102fc38: 0x102fc38: sll   zero, zero, 0
-// 0x0102fc3c: 0x102fc3c: subu  v1, s3, v1
+// 0x0102fc48: 0x102fc48: sll   zero, zero, 0
+// 0x0102fc4c: 0x102fc4c: subu  v1, s3, v1
 	ldloc 10
 	ldloc 7
 	sub
 	stloc 7
-// 0x0102fc40: 0x102fc40: sw    v1, 256(v0)
+// 0x0102fc50: 0x102fc50: sw    v1, 256(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5579,50 +5579,50 @@ L_102fc28:
 	add
 	ldloc 7
 	stelem.i4
-L_102fc44:
-// 0x0102fc44: 0x102fc44: sltu  v0, s3, s4
+L_102fc54:
+// 0x0102fc54: 0x102fc54: sltu  v0, s3, s4
 	ldloc 10
 	ldloc 13
 	clt.un
 	stloc 5
-// 0x0102fc48: 0x102fc48: beq   v0, zero, 0x102fc70 sll   zero, zero, 0
+// 0x0102fc58: 0x102fc58: beq   v0, zero, 0x102fc80 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_102fc70
+	brfalse L_102fc80
 // --- basic block ---
-// 0x0102fc50: 0x102fc50: lb    v0, 0(s3)
+// 0x0102fc60: 0x102fc60: lb    v0, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0102fc54: 0x102fc54: sll   zero, zero, 0
-// 0x0102fc58: 0x102fc58: slti  v1, v0, 32
+// 0x0102fc64: 0x102fc64: sll   zero, zero, 0
+// 0x0102fc68: 0x102fc68: slti  v1, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 7
-// 0x0102fc5c: 0x102fc5c: beq   v1, zero, 0x102fc70 sll   zero, zero, 0
+// 0x0102fc6c: 0x102fc6c: beq   v1, zero, 0x102fc80 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_102fc70
+	brfalse L_102fc80
 // --- basic block ---
-// 0x0102fc64: 0x102fc64: bgtz  v0, 0x102fc44 addiu s3, s3, 1
+// 0x0102fc74: 0x102fc74: bgtz  v0, 0x102fc54 addiu s3, s3, 1
 	ldloc 5
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
 	ldc.i4.s 0
-	bgt L_102fc44
+	bgt L_102fc54
 // --- basic block ---
-// 0x0102fc6c: 0x102fc6c: addiu s3, s3, -1
+// 0x0102fc7c: 0x102fc7c: addiu s3, s3, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-L_102fc70:
-// 0x0102fc70: 0x102fc70: bne   s0, zero, 0x102fcb0 sll   zero, zero, 0
+L_102fc80:
+// 0x0102fc80: 0x102fc80: bne   s0, zero, 0x102fcc0 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_102fcb0
+	brtrue L_102fcc0
 // --- basic block ---
-// 0x0102fc78: 0x102fc78: lw    v0, 1304(sp)
+// 0x0102fc88: 0x102fc88: lw    v0, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5631,38 +5631,38 @@ L_102fc70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102fc7c: 0x102fc7c: sll   zero, zero, 0
-// 0x0102fc80: 0x102fc80: lb    v1, 0(v0)
+// 0x0102fc8c: 0x102fc8c: sll   zero, zero, 0
+// 0x0102fc90: 0x102fc90: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0102fc84: 0x102fc84: addiu v0, zero, 78
+// 0x0102fc94: 0x102fc94: addiu v0, zero, 78
 	ldc.i4.s 78
 	stloc 5
-// 0x0102fc88: 0x102fc88: beq   v1, v0, 0x102fcb0 lui   a1, 0x10000
+// 0x0102fc98: 0x102fc98: beq   v1, v0, 0x102fcc0 lui   a1, 0x10000
 	ldloc 7
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_102fcb0
+	beq  L_102fcc0
 // --- basic block ---
-// 0x0102fc90: 0x102fc90: lui   a3, 0x10000
+// 0x0102fca0: 0x102fca0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102fc94: 0x102fc94: addiu a1, a1, -16588
+// 0x0102fca4: 0x102fca4: addiu a1, a1, -16588
 	ldloc.2
 	ldc.i4 -16588
 	add
 	stloc.2
-// 0x0102fc98: 0x102fc98: addiu a3, a3, -16556
+// 0x0102fca8: 0x102fca8: addiu a3, a3, -16556
 	ldloc 4
 	ldc.i4 -16556
 	add
 	stloc 4
-// 0x0102fc9c: 0x102fc9c: addiu a0, zero, 4
+// 0x0102fcac: 0x102fcac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fca0: 0x102fca0: jal   0x100449c addiu a2, zero, 456
+// 0x0102fcb0: 0x102fcb0: jal   0x100449c addiu a2, zero, 456
 	ldc.i4 456
 	stloc.3
 	ldloc.0
@@ -5675,11 +5675,11 @@ L_102fc70:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fca8: 0x102fca8: j	 0x103027c sll   zero, zero, 0
-	br L_103027c
+// 0x0102fcb8: 0x102fcb8: j	 0x103028c sll   zero, zero, 0
+	br L_103028c
 // --- basic block ---
-L_102fcb0:
-// 0x0102fcb0: 0x102fcb0: lw    v0, 1304(sp)
+L_102fcc0:
+// 0x0102fcc0: 0x102fcc0: lw    v0, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5688,94 +5688,94 @@ L_102fcb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102fcb4: 0x102fcb4: sll   zero, zero, 0
-// 0x0102fcb8: 0x102fcb8: lbu   v1, 0(v0)
+// 0x0102fcc4: 0x102fcc4: sll   zero, zero, 0
+// 0x0102fcc8: 0x102fcc8: lbu   v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x0102fcbc: 0x102fcbc: sll   zero, zero, 0
-// 0x0102fcc0: 0x102fcc0: addiu v1, v1, -65
+// 0x0102fccc: 0x102fccc: sll   zero, zero, 0
+// 0x0102fcd0: 0x102fcd0: addiu v1, v1, -65
 	ldloc 7
 	ldc.i4.s -65
 	add
 	stloc 7
-// 0x0102fcc4: 0x102fcc4: andi  v1, v1, 255
+// 0x0102fcd4: 0x102fcd4: andi  v1, v1, 255
 	ldloc 7
 	ldc.i4 255
 	and
 	stloc 7
-// 0x0102fcc8: 0x102fcc8: sltiu a0, v1, 20
+// 0x0102fcd8: 0x102fcd8: sltiu a0, v1, 20
 	ldloc 7
 	ldc.i4.s 20
 	clt.un
 	stloc.1
-// 0x0102fccc: 0x102fccc: beq   a0, zero, 0x1030248 lui   a0, 0x20000
+// 0x0102fcdc: 0x102fcdc: beq   a0, zero, 0x1030258 lui   a0, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.1
-	brfalse L_1030248
+	brfalse L_1030258
 // --- basic block ---
-// 0x0102fcd4: 0x102fcd4: sll   v1, v1, 2
+// 0x0102fce4: 0x102fce4: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0102fcd8: 0x102fcd8: addiu a0, a0, 25500
+// 0x0102fce8: 0x102fce8: addiu a0, a0, 25964
 	ldloc.1
-	ldc.i4 25500
+	ldc.i4 25964
 	add
 	stloc.1
-// 0x0102fcdc: 0x102fcdc: addu  v1, a0, v1
+// 0x0102fcec: 0x102fcec: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0102fce0: 0x102fce0: lw    v1, 0(v1)
+// 0x0102fcf0: 0x102fcf0: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0102fce4: 0x102fce4: sll   zero, zero, 0
-// 0x0102fce8: 0x102fce8: jr    v1 sll   zero, zero, 0
+// 0x0102fcf4: 0x102fcf4: sll   zero, zero, 0
+// 0x0102fcf8: 0x102fcf8: jr    v1 sll   zero, zero, 0
 	ldloc 7
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_102fcf0:
-// 0x0102fcf0: 0x102fcf0: addiu v1, zero, 2
+L_102fd00:
+// 0x0102fd00: 0x102fd00: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0102fcf4: 0x102fcf4: beq   s2, v1, 0x102fd10 lui   a3, 0x10000
+// 0x0102fd04: 0x102fd04: beq   s2, v1, 0x102fd20 lui   a3, 0x10000
 	ldloc 8
 	ldloc 7
 	ldc.i4 65536
 	stloc 4
-	beq  L_102fd10
+	beq  L_102fd20
 // --- basic block ---
-// 0x0102fcfc: 0x102fcfc: addiu a3, a3, -16532
+// 0x0102fd0c: 0x102fd0c: addiu a3, a3, -16532
 	ldloc 4
 	ldc.i4 -16532
 	add
 	stloc 4
-// 0x0102fd00: 0x102fd00: addiu a0, zero, 4
+// 0x0102fd10: 0x102fd10: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fd04: 0x102fd04: addu  a1, s1, zero
+// 0x0102fd14: 0x102fd14: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102fd08: 0x102fd08: j	 0x102fd58 addiu a2, zero, 239
+// 0x0102fd18: 0x102fd18: j	 0x102fd68 addiu a2, zero, 239
 	ldc.i4 239
 	stloc.3
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_102fd10:
-// 0x0102fd10: 0x102fd10: addiu s2, sp, 24
+L_102fd20:
+// 0x0102fd20: 0x102fd20: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0102fd14: 0x102fd14: lw    a2, 1308(sp)
+// 0x0102fd24: 0x102fd24: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5784,7 +5784,7 @@ L_102fd10:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102fd18: 0x102fd18: lw    a3, 284(sp)
+// 0x0102fd28: 0x102fd28: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5793,10 +5793,10 @@ L_102fd10:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fd1c: 0x102fd1c: addiu a1, zero, 255
+// 0x0102fd2c: 0x102fd2c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102fd20: 0x102fd20: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102fd30: 0x102fd30: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5804,12 +5804,12 @@ L_102fd10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fd28: 0x102fd28: jal   0x1000d8c addu  a0, s2, zero
+// 0x0102fd38: 0x102fd38: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5822,7 +5822,7 @@ L_102fd10:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fd30: 0x102fd30: j	 0x1030248 sw    v0, 92(s0)
+// 0x0102fd40: 0x102fd40: j	 0x1030258 sw    v0, 92(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5831,43 +5831,43 @@ L_102fd10:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1030248
+	br L_1030258
 // --- basic block ---
-L_102fd38:
-// 0x0102fd38: 0x102fd38: bne   s5, zero, 0x102fd68 addiu s2, sp, 24
+L_102fd48:
+// 0x0102fd48: 0x102fd48: bne   s5, zero, 0x102fd78 addiu s2, sp, 24
 	ldloc 12
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	brtrue L_102fd68
+	brtrue L_102fd78
 // --- basic block ---
-// 0x0102fd40: 0x102fd40: lui   a3, 0x10000
+// 0x0102fd50: 0x102fd50: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102fd44: 0x102fd44: lw    v0, 0(s0)
+// 0x0102fd54: 0x102fd54: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102fd48: 0x102fd48: addiu a3, a3, -16488
+// 0x0102fd58: 0x102fd58: addiu a3, a3, -16488
 	ldloc 4
 	ldc.i4 -16488
 	add
 	stloc 4
-// 0x0102fd4c: 0x102fd4c: addiu a0, zero, 4
+// 0x0102fd5c: 0x102fd5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fd50: 0x102fd50: addu  a1, s1, zero
+// 0x0102fd60: 0x102fd60: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102fd54: 0x102fd54: addiu a2, zero, 360
+// 0x0102fd64: 0x102fd64: addiu a2, zero, 360
 	ldc.i4 360
 	stloc.3
-L_102fd58:
-// 0x0102fd58: 0x102fd58: jal   0x100449c sw    v0, 16(sp)
+L_102fd68:
+// 0x0102fd68: 0x102fd68: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5886,15 +5886,15 @@ L_102fd58:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fd60: 0x102fd60: j	 0x103024c sltu  v0, s3, s4
+// 0x0102fd70: 0x102fd70: j	 0x103025c sltu  v0, s3, s4
 	ldloc 10
 	ldloc 13
 	clt.un
 	stloc 5
-	br L_103024c
+	br L_103025c
 // --- basic block ---
-L_102fd68:
-// 0x0102fd68: 0x102fd68: lw    a2, 1308(sp)
+L_102fd78:
+// 0x0102fd78: 0x102fd78: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5903,7 +5903,7 @@ L_102fd68:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102fd6c: 0x102fd6c: lw    a3, 284(sp)
+// 0x0102fd7c: 0x102fd7c: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5912,10 +5912,10 @@ L_102fd68:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fd70: 0x102fd70: addiu a1, zero, 255
+// 0x0102fd80: 0x102fd80: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102fd74: 0x102fd74: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102fd84: 0x102fd84: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5923,12 +5923,12 @@ L_102fd68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fd7c: 0x102fd7c: jal   0x102c720 addu  a0, s2, zero
+// 0x0102fd8c: 0x102fd8c: jal   0x102c730 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5936,12 +5936,12 @@ L_102fd68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fd84: 0x102fd84: bne   v0, zero, 0x102fdac sw    v0, 96(s0)
+// 0x0102fd94: 0x102fd94: bne   v0, zero, 0x102fdbc sw    v0, 96(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -5951,33 +5951,33 @@ L_102fd68:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_102fdac
+	brtrue L_102fdbc
 // --- basic block ---
-// 0x0102fd8c: 0x102fd8c: lw    v0, 0(s0)
+// 0x0102fd9c: 0x102fd9c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102fd90: 0x102fd90: lui   a3, 0x10000
+// 0x0102fda0: 0x102fda0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102fd94: 0x102fd94: addiu a3, a3, -16452
+// 0x0102fda4: 0x102fda4: addiu a3, a3, -16452
 	ldloc 4
 	ldc.i4 -16452
 	add
 	stloc 4
-// 0x0102fd98: 0x102fd98: addiu a0, zero, 4
+// 0x0102fda8: 0x102fda8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fd9c: 0x102fd9c: addu  a1, s1, zero
+// 0x0102fdac: 0x102fdac: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102fda0: 0x102fda0: addiu a2, zero, 370
+// 0x0102fdb0: 0x102fdb0: addiu a2, zero, 370
 	ldc.i4 370
 	stloc.3
-// 0x0102fda4: 0x102fda4: jal   0x100449c sw    v0, 16(sp)
+// 0x0102fdb4: 0x102fdb4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5996,20 +5996,20 @@ L_102fd68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_102fdac:
-// 0x0102fdac: 0x102fdac: addiu v0, zero, 1
+L_102fdbc:
+// 0x0102fdbc: 0x102fdbc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102fdb0: 0x102fdb0: beq   s5, v0, 0x1030248 addiu s2, sp, 24
+// 0x0102fdc0: 0x102fdc0: beq   s5, v0, 0x1030258 addiu s2, sp, 24
 	ldloc 12
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	beq  L_1030248
+	beq  L_1030258
 // --- basic block ---
-// 0x0102fdb8: 0x102fdb8: lw    a2, 1312(sp)
+// 0x0102fdc8: 0x102fdc8: lw    a2, 1312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6018,7 +6018,7 @@ L_102fdac:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102fdbc: 0x102fdbc: lw    a3, 288(sp)
+// 0x0102fdcc: 0x102fdcc: lw    a3, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6027,10 +6027,10 @@ L_102fdac:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fdc0: 0x102fdc0: addiu a1, zero, 255
+// 0x0102fdd0: 0x102fdd0: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102fdc4: 0x102fdc4: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102fdd4: 0x102fdd4: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6038,12 +6038,12 @@ L_102fdac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fdcc: 0x102fdcc: jal   0x102c720 addu  a0, s2, zero
+// 0x0102fddc: 0x102fddc: jal   0x102c730 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6051,12 +6051,12 @@ L_102fdac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fdd4: 0x102fdd4: bne   v0, zero, 0x1030248 sw    v0, 100(s0)
+// 0x0102fde4: 0x102fde4: bne   v0, zero, 0x1030258 sw    v0, 100(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -6066,75 +6066,75 @@ L_102fdac:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1030248
+	brtrue L_1030258
 // --- basic block ---
-// 0x0102fddc: 0x102fddc: lui   a3, 0x10000
+// 0x0102fdec: 0x102fdec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102fde0: 0x102fde0: lw    v0, 0(s0)
+// 0x0102fdf0: 0x102fdf0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102fde4: 0x102fde4: addiu a3, a3, -16452
+// 0x0102fdf4: 0x102fdf4: addiu a3, a3, -16452
 	ldloc 4
 	ldc.i4 -16452
 	add
 	stloc 4
-// 0x0102fde8: 0x102fde8: addiu a0, zero, 4
+// 0x0102fdf8: 0x102fdf8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fdec: 0x102fdec: addu  a1, s1, zero
+// 0x0102fdfc: 0x102fdfc: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102fdf0: 0x102fdf0: j	 0x102fd58 addiu a2, zero, 381
+// 0x0102fe00: 0x102fe00: j	 0x102fd68 addiu a2, zero, 381
 	ldc.i4 381
 	stloc.3
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_102fdf8:
-// 0x0102fdf8: 0x102fdf8: addiu v0, zero, 1
+L_102fe08:
+// 0x0102fe08: 0x102fe08: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0102fdfc: 0x102fdfc: bne   s2, v0, 0x102fe20 addiu s2, sp, 24
+// 0x0102fe0c: 0x102fe0c: bne   s2, v0, 0x102fe30 addiu s2, sp, 24
 	ldloc 8
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	bne.un L_102fe20
+	bne.un L_102fe30
 // --- basic block ---
-// 0x0102fe04: 0x102fe04: lui   a3, 0x10000
+// 0x0102fe14: 0x102fe14: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102fe08: 0x102fe08: lw    v0, 0(s0)
+// 0x0102fe18: 0x102fe18: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102fe0c: 0x102fe0c: addiu a3, a3, -16412
+// 0x0102fe1c: 0x102fe1c: addiu a3, a3, -16412
 	ldloc 4
 	ldc.i4 -16412
 	add
 	stloc 4
-// 0x0102fe10: 0x102fe10: addiu a0, zero, 4
+// 0x0102fe20: 0x102fe20: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fe14: 0x102fe14: addu  a1, s1, zero
+// 0x0102fe24: 0x102fe24: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102fe18: 0x102fe18: j	 0x102fd58 addiu a2, zero, 394
+// 0x0102fe28: 0x102fe28: j	 0x102fd68 addiu a2, zero, 394
 	ldc.i4 394
 	stloc.3
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_102fe20:
-// 0x0102fe20: 0x102fe20: lw    a2, 1308(sp)
+L_102fe30:
+// 0x0102fe30: 0x102fe30: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6143,7 +6143,7 @@ L_102fe20:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102fe24: 0x102fe24: lw    a3, 284(sp)
+// 0x0102fe34: 0x102fe34: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6152,10 +6152,10 @@ L_102fe20:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fe28: 0x102fe28: addiu a1, zero, 255
+// 0x0102fe38: 0x102fe38: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102fe2c: 0x102fe2c: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102fe3c: 0x102fe3c: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6163,12 +6163,12 @@ L_102fe20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fe34: 0x102fe34: jal   0x102c720 addu  a0, s2, zero
+// 0x0102fe44: 0x102fe44: jal   0x102c730 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6176,12 +6176,12 @@ L_102fe20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fe3c: 0x102fe3c: bne   v0, zero, 0x1030248 sw    v0, 104(s0)
+// 0x0102fe4c: 0x102fe4c: bne   v0, zero, 0x1030258 sw    v0, 104(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -6191,75 +6191,75 @@ L_102fe20:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1030248
+	brtrue L_1030258
 // --- basic block ---
-// 0x0102fe44: 0x102fe44: lui   a3, 0x10000
+// 0x0102fe54: 0x102fe54: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0102fe48: 0x102fe48: lw    v0, 0(s0)
+// 0x0102fe58: 0x102fe58: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102fe4c: 0x102fe4c: addiu a0, zero, 4
+// 0x0102fe5c: 0x102fe5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fe50: 0x102fe50: addu  a1, s1, zero
+// 0x0102fe60: 0x102fe60: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102fe54: 0x102fe54: addiu a2, zero, 404
+// 0x0102fe64: 0x102fe64: addiu a2, zero, 404
 	ldc.i4 404
 	stloc.3
-// 0x0102fe58: 0x102fe58: j	 0x102fd58 addiu a3, a3, -16364
+// 0x0102fe68: 0x102fe68: j	 0x102fd68 addiu a3, a3, -16364
 	ldloc 4
 	ldc.i4 -16364
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_102fe60:
-// 0x0102fe60: 0x102fe60: addiu v0, zero, 5
+L_102fe70:
+// 0x0102fe70: 0x102fe70: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x0102fe64: 0x102fe64: beq   s2, v0, 0x102fe84 lui   a3, 0x10000
+// 0x0102fe74: 0x102fe74: beq   s2, v0, 0x102fe94 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_102fe84
+	beq  L_102fe94
 // --- basic block ---
-// 0x0102fe6c: 0x102fe6c: lw    v0, 0(s0)
+// 0x0102fe7c: 0x102fe7c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102fe70: 0x102fe70: addiu a0, zero, 4
+// 0x0102fe80: 0x102fe80: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102fe74: 0x102fe74: addu  a1, s1, zero
+// 0x0102fe84: 0x102fe84: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102fe78: 0x102fe78: addiu a2, zero, 257
+// 0x0102fe88: 0x102fe88: addiu a2, zero, 257
 	ldc.i4 257
 	stloc.3
-// 0x0102fe7c: 0x102fe7c: j	 0x102fd58 addiu a3, a3, -16312
+// 0x0102fe8c: 0x102fe8c: j	 0x102fd68 addiu a3, a3, -16312
 	ldloc 4
 	ldc.i4 -16312
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_102fe84:
-// 0x0102fe84: 0x102fe84: addiu s2, sp, 24
+L_102fe94:
+// 0x0102fe94: 0x102fe94: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0102fe88: 0x102fe88: lw    a2, 1308(sp)
+// 0x0102fe98: 0x102fe98: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6268,7 +6268,7 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102fe8c: 0x102fe8c: lw    a3, 284(sp)
+// 0x0102fe9c: 0x102fe9c: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6277,10 +6277,10 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fe90: 0x102fe90: addiu a1, zero, 255
+// 0x0102fea0: 0x102fea0: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102fe94: 0x102fe94: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102fea4: 0x102fea4: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6288,12 +6288,12 @@ L_102fe84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fe9c: 0x102fe9c: jal   0x1000d8c addu  a0, s2, zero
+// 0x0102feac: 0x102feac: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6306,7 +6306,7 @@ L_102fe84:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fea4: 0x102fea4: sw    v0, 120(s0)
+// 0x0102feb4: 0x102feb4: sw    v0, 120(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6315,7 +6315,7 @@ L_102fe84:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102fea8: 0x102fea8: lw    a2, 1312(sp)
+// 0x0102feb8: 0x102feb8: lw    a2, 1312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6324,7 +6324,7 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102feac: 0x102feac: lw    a3, 288(sp)
+// 0x0102febc: 0x102febc: lw    a3, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6333,10 +6333,10 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102feb0: 0x102feb0: addiu a1, zero, 255
+// 0x0102fec0: 0x102fec0: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102feb4: 0x102feb4: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102fec4: 0x102fec4: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6344,12 +6344,12 @@ L_102fe84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102febc: 0x102febc: jal   0x1000d8c addu  a0, s2, zero
+// 0x0102fecc: 0x102fecc: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6362,7 +6362,7 @@ L_102fe84:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fec4: 0x102fec4: sw    v0, 124(s0)
+// 0x0102fed4: 0x102fed4: sw    v0, 124(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6371,7 +6371,7 @@ L_102fe84:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102fec8: 0x102fec8: lw    a2, 1316(sp)
+// 0x0102fed8: 0x102fed8: lw    a2, 1316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6380,7 +6380,7 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102fecc: 0x102fecc: lw    a3, 292(sp)
+// 0x0102fedc: 0x102fedc: lw    a3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6389,10 +6389,10 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fed0: 0x102fed0: addiu a1, zero, 255
+// 0x0102fee0: 0x102fee0: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102fed4: 0x102fed4: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102fee4: 0x102fee4: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6400,12 +6400,12 @@ L_102fe84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fedc: 0x102fedc: jal   0x1000d8c addu  a0, s2, zero
+// 0x0102feec: 0x102feec: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6418,7 +6418,7 @@ L_102fe84:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fee4: 0x102fee4: sw    v0, 128(s0)
+// 0x0102fef4: 0x102fef4: sw    v0, 128(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6427,7 +6427,7 @@ L_102fe84:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102fee8: 0x102fee8: lw    a2, 1320(sp)
+// 0x0102fef8: 0x102fef8: lw    a2, 1320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6436,7 +6436,7 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102feec: 0x102feec: lw    a3, 296(sp)
+// 0x0102fefc: 0x102fefc: lw    a3, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6445,10 +6445,10 @@ L_102fe84:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102fef0: 0x102fef0: addiu a1, zero, 255
+// 0x0102ff00: 0x102ff00: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102fef4: 0x102fef4: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102ff04: 0x102ff04: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6456,12 +6456,12 @@ L_102fe84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fefc: 0x102fefc: jal   0x1000d8c addu  a0, s2, zero
+// 0x0102ff0c: 0x102ff0c: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6474,7 +6474,7 @@ L_102fe84:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ff04: 0x102ff04: j	 0x1030248 sw    v0, 132(s0)
+// 0x0102ff14: 0x102ff14: j	 0x1030258 sw    v0, 132(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6483,49 +6483,49 @@ L_102fe84:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1030248
+	br L_1030258
 // --- basic block ---
-L_102ff0c:
-// 0x0102ff0c: 0x102ff0c: addiu v0, zero, 3
+L_102ff1c:
+// 0x0102ff1c: 0x102ff1c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0102ff10: 0x102ff10: beq   s2, v0, 0x102ff30 lui   a3, 0x10000
+// 0x0102ff20: 0x102ff20: beq   s2, v0, 0x102ff40 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_102ff30
+	beq  L_102ff40
 // --- basic block ---
-// 0x0102ff18: 0x102ff18: lw    v0, 0(s0)
+// 0x0102ff28: 0x102ff28: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102ff1c: 0x102ff1c: addiu a0, zero, 4
+// 0x0102ff2c: 0x102ff2c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102ff20: 0x102ff20: addu  a1, s1, zero
+// 0x0102ff30: 0x102ff30: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102ff24: 0x102ff24: addiu a2, zero, 282
+// 0x0102ff34: 0x102ff34: addiu a2, zero, 282
 	ldc.i4 282
 	stloc.3
-// 0x0102ff28: 0x102ff28: j	 0x102fd58 addiu a3, a3, -16276
+// 0x0102ff38: 0x102ff38: j	 0x102fd68 addiu a3, a3, -16276
 	ldloc 4
 	ldc.i4 -16276
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_102ff30:
-// 0x0102ff30: 0x102ff30: addiu s2, sp, 24
+L_102ff40:
+// 0x0102ff40: 0x102ff40: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0102ff34: 0x102ff34: lw    a2, 1308(sp)
+// 0x0102ff44: 0x102ff44: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6534,7 +6534,7 @@ L_102ff30:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102ff38: 0x102ff38: lw    a3, 284(sp)
+// 0x0102ff48: 0x102ff48: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6543,10 +6543,10 @@ L_102ff30:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102ff3c: 0x102ff3c: addiu a1, zero, 255
+// 0x0102ff4c: 0x102ff4c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102ff40: 0x102ff40: jal   0x102fa24 addu  a0, s2, zero
+// 0x0102ff50: 0x102ff50: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6554,12 +6554,12 @@ L_102ff30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ff48: 0x102ff48: jal   0x1000d8c addu  a0, s2, zero
+// 0x0102ff58: 0x102ff58: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6572,7 +6572,7 @@ L_102ff30:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ff50: 0x102ff50: lw    a2, 1312(sp)
+// 0x0102ff60: 0x102ff60: lw    a2, 1312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6581,7 +6581,7 @@ L_102ff30:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102ff54: 0x102ff54: lw    a3, 288(sp)
+// 0x0102ff64: 0x102ff64: lw    a3, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6590,19 +6590,19 @@ L_102ff30:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102ff58: 0x102ff58: sh    v0, 80(s0)
+// 0x0102ff68: 0x102ff68: sh    v0, 80(s0)
 	ldloc 9
 	ldc.i4.s 80
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0102ff5c: 0x102ff5c: addiu a1, zero, 255
+// 0x0102ff6c: 0x102ff6c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0102ff60: 0x102ff60: addu  a0, s2, zero
+// 0x0102ff70: 0x102ff70: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0102ff64: 0x102ff64: jal   0x102fa24 sh    zero, 84(s0)
+// 0x0102ff74: 0x102ff74: jal   0x102fa34 sh    zero, 84(s0)
 	ldloc 9
 	ldc.i4.s 84
 	add
@@ -6613,12 +6613,12 @@ L_102ff30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ff6c: 0x102ff6c: jal   0x1000d8c addu  a0, s2, zero
+// 0x0102ff7c: 0x102ff7c: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6631,22 +6631,22 @@ L_102ff30:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ff74: 0x102ff74: sh    v0, 82(s0)
+// 0x0102ff84: 0x102ff84: sh    v0, 82(s0)
 	ldloc 9
 	ldc.i4.s 82
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0102ff78: 0x102ff78: j	 0x1030248 sh    zero, 86(s0)
+// 0x0102ff88: 0x102ff88: j	 0x1030258 sh    zero, 86(s0)
 	ldloc 9
 	ldc.i4.s 86
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_1030248
+	br L_1030258
 // --- basic block ---
-L_102ff80:
-// 0x0102ff80: 0x102ff80: lw    v0, 76(s0)
+L_102ff90:
+// 0x0102ff90: 0x102ff90: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6655,29 +6655,29 @@ L_102ff80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0102ff84: 0x102ff84: sll   zero, zero, 0
-// 0x0102ff88: 0x102ff88: slti  v0, v0, 10
+// 0x0102ff94: 0x102ff94: sll   zero, zero, 0
+// 0x0102ff98: 0x102ff98: slti  v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt
 	stloc 5
-// 0x0102ff8c: 0x102ff8c: beq   v0, zero, 0x102ffa8 addiu s7, zero, 1
+// 0x0102ff9c: 0x102ff9c: beq   v0, zero, 0x102ffb8 addiu s7, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 14
-	brfalse L_102ffa8
+	brfalse L_102ffb8
 // --- basic block ---
-// 0x0102ff94: 0x102ff94: addiu v0, sp, 1304
+// 0x0102ffa4: 0x102ffa4: addiu v0, sp, 1304
 	ldloc.0
 	ldc.i4 1304
 	add
 	stloc 5
-// 0x0102ff98: 0x102ff98: addiu s5, sp, 280
+// 0x0102ffa8: 0x102ffa8: addiu s5, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
 	stloc 12
-// 0x0102ff9c: 0x102ff9c: sw    v0, 2328(sp)
+// 0x0102ffac: 0x102ffac: sw    v0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6686,34 +6686,34 @@ L_102ff80:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0102ffa0: 0x102ffa0: j	 0x1030038 addiu s6, sp, 24
+// 0x0102ffb0: 0x102ffb0: j	 0x1030048 addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-	br L_1030038
+	br L_1030048
 // --- basic block ---
-L_102ffa8:
-// 0x0102ffa8: 0x102ffa8: lw    v0, 0(s0)
+L_102ffb8:
+// 0x0102ffb8: 0x102ffb8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102ffac: 0x102ffac: addiu a0, zero, 4
+// 0x0102ffbc: 0x102ffbc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0102ffb0: 0x102ffb0: addu  a1, s1, zero
+// 0x0102ffc0: 0x102ffc0: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x0102ffb4: 0x102ffb4: j	 0x103007c addiu a2, zero, 180
+// 0x0102ffc4: 0x102ffc4: j	 0x103008c addiu a2, zero, 180
 	ldc.i4 180
 	stloc.3
-	br L_103007c
+	br L_103008c
 // --- basic block ---
-L_102ffbc:
-// 0x0102ffbc: 0x102ffbc: lw    a0, 2328(sp)
+L_102ffcc:
+// 0x0102ffcc: 0x102ffcc: lw    a0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6722,7 +6722,7 @@ L_102ffbc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0102ffc0: 0x102ffc0: lw    a3, 4(s5)
+// 0x0102ffd0: 0x102ffd0: lw    a3, 4(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6731,7 +6731,7 @@ L_102ffbc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0102ffc4: 0x102ffc4: lw    a2, 4(a0)
+// 0x0102ffd4: 0x102ffd4: lw    a2, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6740,7 +6740,7 @@ L_102ffbc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0102ffc8: 0x102ffc8: jal   0x102fa24 addu  a0, s6, zero
+// 0x0102ffd8: 0x102ffd8: jal   0x102fa34 addu  a0, s6, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -6748,12 +6748,12 @@ L_102ffbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102ffd0: 0x102ffd0: lw    v1, 76(s0)
+// 0x0102ffe0: 0x102ffe0: lw    v1, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6762,7 +6762,7 @@ L_102ffbc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0102ffd4: 0x102ffd4: lw    a1, 4(s5)
+// 0x0102ffe4: 0x102ffe4: lw    a1, 4(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6771,36 +6771,36 @@ L_102ffbc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0102ffd8: 0x102ffd8: addiu a2, v1, 10
+// 0x0102ffe8: 0x102ffe8: addiu a2, v1, 10
 	ldloc 7
 	ldc.i4.s 10
 	add
 	stloc.3
-// 0x0102ffdc: 0x102ffdc: sll   a2, a2, 2
+// 0x0102ffec: 0x102ffec: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x0102ffe0: 0x102ffe0: addu  a2, s0, a2
+// 0x0102fff0: 0x102fff0: addu  a2, s0, a2
 	ldloc 9
 	ldloc.3
 	add
 	stloc.3
-// 0x0102ffe4: 0x102ffe4: lw    v0, 0(a2)
+// 0x0102fff4: 0x102fff4: lw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0102ffe8: 0x102ffe8: sll   zero, zero, 0
-// 0x0102ffec: 0x102ffec: bne   v0, zero, 0x1030008 addu  a0, s6, zero
+// 0x0102fff8: 0x102fff8: sll   zero, zero, 0
+// 0x0102fffc: 0x102fffc: bne   v0, zero, 0x1030018 addu  a0, s6, zero
 	ldloc 5
 	ldloc 15
 	stloc.1
-	brtrue L_1030008
+	brtrue L_1030018
 // --- basic block ---
-// 0x0102fff4: 0x102fff4: jal   0x102fa78 sw    a2, 2332(sp)
+// 0x01030004: 0x1030004: jal   0x102fa88 sw    a2, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6814,12 +6814,12 @@ L_102ffbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_object_string_102fa78(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_object_string_102fa88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0102fffc: 0x102fffc: lw    a2, 2332(sp)
+// 0x0103000c: 0x103000c: lw    a2, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6828,17 +6828,17 @@ L_102ffbc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030000: 0x1030000: j	 0x1030024 sw    v0, 0(a2)
+// 0x01030010: 0x1030010: j	 0x1030034 sw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1030024
+	br L_1030034
 // --- basic block ---
-L_1030008:
-// 0x01030008: 0x1030008: jal   0x102fa78 sw    v1, 2332(sp)
+L_1030018:
+// 0x01030018: 0x1030018: jal   0x102fa88 sw    v1, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6852,12 +6852,12 @@ L_1030008:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_object_string_102fa78(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_object_string_102fa88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030010: 0x1030010: lw    v1, 2332(sp)
+// 0x01030020: 0x1030020: lw    v1, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6866,18 +6866,18 @@ L_1030008:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030014: 0x1030014: sll   zero, zero, 0
-// 0x01030018: 0x1030018: sll   v1, v1, 2
+// 0x01030024: 0x1030024: sll   zero, zero, 0
+// 0x01030028: 0x1030028: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0103001c: 0x103001c: addu  v1, s0, v1
+// 0x0103002c: 0x103002c: addu  v1, s0, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x01030020: 0x1030020: sw    v0, 4(v1)
+// 0x01030030: 0x1030030: sw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6886,8 +6886,8 @@ L_1030008:
 	add
 	ldloc 5
 	stelem.i4
-L_1030024:
-// 0x01030024: 0x1030024: lw    v0, 2328(sp)
+L_1030034:
+// 0x01030034: 0x1030034: lw    v0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6896,22 +6896,22 @@ L_1030024:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030028: 0x1030028: addiu s7, s7, 1
+// 0x01030038: 0x1030038: addiu s7, s7, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x0103002c: 0x103002c: addiu v0, v0, 4
+// 0x0103003c: 0x103003c: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01030030: 0x1030030: addiu s5, s5, 4
+// 0x01030040: 0x1030040: addiu s5, s5, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-// 0x01030034: 0x1030034: sw    v0, 2328(sp)
+// 0x01030044: 0x1030044: sw    v0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6920,23 +6920,23 @@ L_1030024:
 	add
 	ldloc 5
 	stelem.i4
-L_1030038:
-// 0x01030038: 0x1030038: slt   v0, s7, s2
+L_1030048:
+// 0x01030048: 0x1030048: slt   v0, s7, s2
 	ldloc 14
 	ldloc 8
 	clt
 	stloc 5
-// 0x0103003c: 0x103003c: bne   v0, zero, 0x102ffbc addiu a1, zero, 256
+// 0x0103004c: 0x103004c: bne   v0, zero, 0x102ffcc addiu a1, zero, 256
 	ldloc 5
 	ldc.i4 256
 	stloc.2
-	brtrue L_102ffbc
+	brtrue L_102ffcc
 // --- basic block ---
-// 0x01030044: 0x1030044: j	 0x10300d4 sll   zero, zero, 0
-	br L_10300d4
+// 0x01030054: 0x1030054: j	 0x10300e4 sll   zero, zero, 0
+	br L_10300e4
 // --- basic block ---
-L_103004c:
-// 0x0103004c: 0x103004c: lw    v0, 76(s0)
+L_103005c:
+// 0x0103005c: 0x103005c: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6945,79 +6945,79 @@ L_103004c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030050: 0x1030050: sll   zero, zero, 0
-// 0x01030054: 0x1030054: slti  v0, v0, 10
+// 0x01030060: 0x1030060: sll   zero, zero, 0
+// 0x01030064: 0x1030064: slti  v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt
 	stloc 5
-// 0x01030058: 0x1030058: beq   v0, zero, 0x103006c addiu s7, sp, 1304
+// 0x01030068: 0x1030068: beq   v0, zero, 0x103007c addiu s7, sp, 1304
 	ldloc 5
 	ldloc.0
 	ldc.i4 1304
 	add
 	stloc 14
-	brfalse L_103006c
+	brfalse L_103007c
 // --- basic block ---
-// 0x01030060: 0x1030060: addiu s5, sp, 280
+// 0x01030070: 0x1030070: addiu s5, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
 	stloc 12
-// 0x01030064: 0x1030064: j	 0x10300c4 addiu s6, zero, 1
+// 0x01030074: 0x1030074: j	 0x10300d4 addiu s6, zero, 1
 	ldc.i4.1
 	stloc 15
-	br L_10300c4
+	br L_10300d4
 // --- basic block ---
-L_103006c:
-// 0x0103006c: 0x103006c: lw    v0, 0(s0)
+L_103007c:
+// 0x0103007c: 0x103007c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01030070: 0x1030070: addiu a0, zero, 4
+// 0x01030080: 0x1030080: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01030074: 0x1030074: addu  a1, s1, zero
+// 0x01030084: 0x1030084: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01030078: 0x1030078: addiu a2, zero, 213
+// 0x01030088: 0x1030088: addiu a2, zero, 213
 	ldc.i4 213
 	stloc.3
-L_103007c:
-// 0x0103007c: 0x103007c: lui   a3, 0x10000
+L_103008c:
+// 0x0103008c: 0x103008c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01030080: 0x1030080: j	 0x102fd58 addiu a3, a3, -16236
+// 0x01030090: 0x1030090: j	 0x102fd68 addiu a3, a3, -16236
 	ldloc 4
 	ldc.i4 -16236
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_1030088:
-// 0x01030088: 0x1030088: lw    a2, 0(s7)
+L_1030098:
+// 0x01030098: 0x1030098: lw    a2, 0(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0103008c: 0x103008c: lw    a3, 0(s5)
+// 0x0103009c: 0x103009c: lw    a3, 0(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01030090: 0x1030090: addiu a0, sp, 24
+// 0x010300a0: 0x10300a0: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x01030094: 0x1030094: jal   0x102fa24 addiu a1, zero, 256
+// 0x010300a4: 0x10300a4: jal   0x102fa34 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -7025,12 +7025,12 @@ L_1030088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103009c: 0x103009c: lw    v1, 76(s0)
+// 0x010300ac: 0x10300ac: lw    v1, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7039,19 +7039,19 @@ L_1030088:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010300a0: 0x10300a0: lw    a1, 0(s5)
+// 0x010300b0: 0x10300b0: lw    a1, 0(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010300a4: 0x10300a4: addiu a0, sp, 24
+// 0x010300b4: 0x10300b4: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x010300a8: 0x10300a8: jal   0x102fa78 sw    v1, 2332(sp)
+// 0x010300b8: 0x10300b8: jal   0x102fa88 sw    v1, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7065,12 +7065,12 @@ L_1030088:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_object_string_102fa78(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_object_string_102fa88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010300b0: 0x10300b0: lw    v1, 2332(sp)
+// 0x010300c0: 0x10300c0: lw    v1, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7079,22 +7079,22 @@ L_1030088:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010300b4: 0x10300b4: addiu s6, s6, 1
+// 0x010300c4: 0x10300c4: addiu s6, s6, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x010300b8: 0x10300b8: sll   v1, v1, 2
+// 0x010300c8: 0x10300c8: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010300bc: 0x10300bc: addu  v1, s0, v1
+// 0x010300cc: 0x10300cc: addu  v1, s0, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x010300c0: 0x10300c0: sw    v0, 4(v1)
+// 0x010300d0: 0x10300d0: sw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7103,27 +7103,27 @@ L_1030088:
 	add
 	ldloc 5
 	stelem.i4
-L_10300c4:
-// 0x010300c4: 0x10300c4: slt   v0, s6, s2
+L_10300d4:
+// 0x010300d4: 0x10300d4: slt   v0, s6, s2
 	ldloc 15
 	ldloc 8
 	clt
 	stloc 5
-// 0x010300c8: 0x10300c8: addiu s7, s7, 4
+// 0x010300d8: 0x10300d8: addiu s7, s7, 4
 	ldloc 14
 	ldc.i4.4
 	add
 	stloc 14
-// 0x010300cc: 0x10300cc: bne   v0, zero, 0x1030088 addiu s5, s5, 4
+// 0x010300dc: 0x10300dc: bne   v0, zero, 0x1030098 addiu s5, s5, 4
 	ldloc 5
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-	brtrue L_1030088
+	brtrue L_1030098
 // --- basic block ---
-L_10300d4:
-// 0x010300d4: 0x10300d4: lw    v0, 76(s0)
+L_10300e4:
+// 0x010300e4: 0x10300e4: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7132,13 +7132,13 @@ L_10300d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010300d8: 0x10300d8: sll   zero, zero, 0
-// 0x010300dc: 0x10300dc: addiu v0, v0, 1
+// 0x010300e8: 0x10300e8: sll   zero, zero, 0
+// 0x010300ec: 0x10300ec: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010300e0: 0x10300e0: j	 0x1030248 sw    v0, 76(s0)
+// 0x010300f0: 0x10300f0: j	 0x1030258 sw    v0, 76(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7147,49 +7147,49 @@ L_10300d4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1030248
+	br L_1030258
 // --- basic block ---
-L_10300e8:
-// 0x010300e8: 0x10300e8: addiu v0, zero, 2
+L_10300f8:
+// 0x010300f8: 0x10300f8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010300ec: 0x10300ec: beq   s2, v0, 0x103010c lui   a3, 0x10000
+// 0x010300fc: 0x10300fc: beq   s2, v0, 0x103011c lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_103010c
+	beq  L_103011c
 // --- basic block ---
-// 0x010300f4: 0x10300f4: lw    v0, 0(s0)
+// 0x01030104: 0x1030104: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010300f8: 0x10300f8: addiu a0, zero, 4
+// 0x01030108: 0x1030108: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010300fc: 0x10300fc: addu  a1, s1, zero
+// 0x0103010c: 0x103010c: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01030100: 0x1030100: addiu a2, zero, 307
+// 0x01030110: 0x1030110: addiu a2, zero, 307
 	ldc.i4 307
 	stloc.3
-// 0x01030104: 0x1030104: j	 0x102fd58 addiu a3, a3, -16196
+// 0x01030114: 0x1030114: j	 0x102fd68 addiu a3, a3, -16196
 	ldloc 4
 	ldc.i4 -16196
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_103010c:
-// 0x0103010c: 0x103010c: addiu s2, sp, 24
+L_103011c:
+// 0x0103011c: 0x103011c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01030110: 0x1030110: lw    a2, 1308(sp)
+// 0x01030120: 0x1030120: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7198,7 +7198,7 @@ L_103010c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030114: 0x1030114: lw    a3, 284(sp)
+// 0x01030124: 0x1030124: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7207,10 +7207,10 @@ L_103010c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01030118: 0x1030118: addiu a1, zero, 255
+// 0x01030128: 0x1030128: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0103011c: 0x103011c: jal   0x102fa24 addu  a0, s2, zero
+// 0x0103012c: 0x103012c: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7218,12 +7218,12 @@ L_103010c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030124: 0x1030124: jal   0x100f424 addu  a0, s2, zero
+// 0x01030134: 0x1030134: jal   0x100f434 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7231,12 +7231,12 @@ L_103010c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_find_100f424(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_find_100f434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103012c: 0x103012c: bne   v0, zero, 0x1030248 sw    v0, 108(s0)
+// 0x0103013c: 0x103013c: bne   v0, zero, 0x1030258 sw    v0, 108(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -7246,75 +7246,75 @@ L_103010c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1030248
+	brtrue L_1030258
 // --- basic block ---
-// 0x01030134: 0x1030134: lui   a3, 0x10000
+// 0x01030144: 0x1030144: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01030138: 0x1030138: lw    v0, 0(s0)
+// 0x01030148: 0x1030148: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103013c: 0x103013c: addiu a0, zero, 4
+// 0x0103014c: 0x103014c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01030140: 0x1030140: addu  a1, s1, zero
+// 0x01030150: 0x1030150: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01030144: 0x1030144: addiu a2, zero, 317
+// 0x01030154: 0x1030154: addiu a2, zero, 317
 	ldc.i4 317
 	stloc.3
-// 0x01030148: 0x1030148: j	 0x102fd58 addiu a3, a3, -16152
+// 0x01030158: 0x1030158: j	 0x102fd68 addiu a3, a3, -16152
 	ldloc 4
 	ldc.i4 -16152
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_1030150:
-// 0x01030150: 0x1030150: addiu v0, zero, 3
+L_1030160:
+// 0x01030160: 0x1030160: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01030154: 0x1030154: beq   s2, v0, 0x1030174 lui   a3, 0x10000
+// 0x01030164: 0x1030164: beq   s2, v0, 0x1030184 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_1030174
+	beq  L_1030184
 // --- basic block ---
-// 0x0103015c: 0x103015c: lw    v0, 0(s0)
+// 0x0103016c: 0x103016c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01030160: 0x1030160: addiu a0, zero, 4
+// 0x01030170: 0x1030170: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01030164: 0x1030164: addu  a1, s1, zero
+// 0x01030174: 0x1030174: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01030168: 0x1030168: addiu a2, zero, 331
+// 0x01030178: 0x1030178: addiu a2, zero, 331
 	ldc.i4 331
 	stloc.3
-// 0x0103016c: 0x103016c: j	 0x102fd58 addiu a3, a3, -16104
+// 0x0103017c: 0x103017c: j	 0x102fd68 addiu a3, a3, -16104
 	ldloc 4
 	ldc.i4 -16104
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_1030174:
-// 0x01030174: 0x1030174: addiu s2, sp, 24
+L_1030184:
+// 0x01030184: 0x1030184: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01030178: 0x1030178: lw    a2, 1308(sp)
+// 0x01030188: 0x1030188: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7323,7 +7323,7 @@ L_1030174:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103017c: 0x103017c: lw    a3, 284(sp)
+// 0x0103018c: 0x103018c: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7332,10 +7332,10 @@ L_1030174:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01030180: 0x1030180: addiu a1, zero, 255
+// 0x01030190: 0x1030190: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01030184: 0x1030184: jal   0x102fa24 addu  a0, s2, zero
+// 0x01030194: 0x1030194: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7343,12 +7343,12 @@ L_1030174:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103018c: 0x103018c: jal   0x100f424 addu  a0, s2, zero
+// 0x0103019c: 0x103019c: jal   0x100f434 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7356,12 +7356,12 @@ L_1030174:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_find_100f424(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_find_100f434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030194: 0x1030194: bne   v0, zero, 0x10301b8 sw    v0, 112(s0)
+// 0x010301a4: 0x10301a4: bne   v0, zero, 0x10301c8 sw    v0, 112(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -7371,36 +7371,36 @@ L_1030174:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10301b8
+	brtrue L_10301c8
 // --- basic block ---
-// 0x0103019c: 0x103019c: lui   a3, 0x10000
+// 0x010301ac: 0x10301ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010301a0: 0x10301a0: lw    v0, 0(s0)
+// 0x010301b0: 0x10301b0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010301a4: 0x10301a4: addiu a0, zero, 4
+// 0x010301b4: 0x10301b4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010301a8: 0x10301a8: addu  a1, s1, zero
+// 0x010301b8: 0x10301b8: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x010301ac: 0x10301ac: addiu a2, zero, 341
+// 0x010301bc: 0x10301bc: addiu a2, zero, 341
 	ldc.i4 341
 	stloc.3
-// 0x010301b0: 0x10301b0: j	 0x102fd58 addiu a3, a3, -16056
+// 0x010301c0: 0x10301c0: j	 0x102fd68 addiu a3, a3, -16056
 	ldloc 4
 	ldc.i4 -16056
 	add
 	stloc 4
-	br L_102fd58
+	br L_102fd68
 // --- basic block ---
-L_10301b8:
-// 0x010301b8: 0x10301b8: lw    a2, 1312(sp)
+L_10301c8:
+// 0x010301c8: 0x10301c8: lw    a2, 1312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7409,7 +7409,7 @@ L_10301b8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010301bc: 0x10301bc: lw    a3, 288(sp)
+// 0x010301cc: 0x10301cc: lw    a3, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7418,10 +7418,10 @@ L_10301b8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010301c0: 0x10301c0: addiu a1, zero, 255
+// 0x010301d0: 0x10301d0: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x010301c4: 0x10301c4: jal   0x102fa24 addu  a0, s2, zero
+// 0x010301d4: 0x10301d4: jal   0x102fa34 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7429,12 +7429,12 @@ L_10301b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa24(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_decode_arg_102fa34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010301cc: 0x10301cc: jal   0x1000d8c addu  a0, s2, zero
+// 0x010301dc: 0x10301dc: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7447,7 +7447,7 @@ L_10301b8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010301d4: 0x10301d4: j	 0x1030248 sw    v0, 116(s0)
+// 0x010301e4: 0x10301e4: j	 0x1030258 sw    v0, 116(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7456,10 +7456,10 @@ L_10301b8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1030248
+	br L_1030258
 // --- basic block ---
-L_10301dc:
-// 0x010301dc: 0x10301dc: lw    v0, 88(s0)
+L_10301ec:
+// 0x010301ec: 0x10301ec: lw    v0, 88(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7468,15 +7468,15 @@ L_10301dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010301e0: 0x10301e0: j	 0x10301f4 ori   v0, v0, 1
+// 0x010301f0: 0x10301f0: j	 0x1030204 ori   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 5
-	br L_10301f4
+	br L_1030204
 // --- basic block ---
-L_10301e8:
-// 0x010301e8: 0x10301e8: lw    v0, 88(s0)
+L_10301f8:
+// 0x010301f8: 0x10301f8: lw    v0, 88(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7485,14 +7485,14 @@ L_10301e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010301ec: 0x10301ec: sll   zero, zero, 0
-// 0x010301f0: 0x10301f0: ori   v0, v0, 2
+// 0x010301fc: 0x10301fc: sll   zero, zero, 0
+// 0x01030200: 0x1030200: ori   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	or
 	stloc 5
-L_10301f4:
-// 0x010301f4: 0x10301f4: j	 0x1030248 sw    v0, 88(s0)
+L_1030204:
+// 0x01030204: 0x1030204: j	 0x1030258 sw    v0, 88(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7501,10 +7501,10 @@ L_10301f4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1030248
+	br L_1030258
 // --- basic block ---
-L_10301fc:
-// 0x010301fc: 0x10301fc: jal   0x1000910 addiu a0, zero, 140
+L_103020c:
+// 0x0103020c: 0x103020c: jal   0x1000910 addiu a0, zero, 140
 	ldc.i4 140
 	stloc.1
 	ldloc.0
@@ -7517,16 +7517,16 @@ L_10301fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030204: 0x1030204: addu  s0, v0, zero
+// 0x01030214: 0x1030214: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01030208: 0x1030208: addu  a0, v0, zero
+// 0x01030218: 0x1030218: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103020c: 0x103020c: addu  a1, zero, zero
+// 0x0103021c: 0x103021c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01030210: 0x1030210: jal   0x100177c addiu a2, zero, 140
+// 0x01030220: 0x1030220: jal   0x100177c addiu a2, zero, 140
 	ldc.i4 140
 	stloc.3
 	ldloc.1
@@ -7538,13 +7538,13 @@ L_10301fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030218: 0x1030218: addu  a0, s1, zero
+// 0x01030228: 0x1030228: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0103021c: 0x103021c: addiu a1, zero, 146
+// 0x0103022c: 0x103022c: addiu a1, zero, 146
 	ldc.i4 146
 	stloc.2
-// 0x01030220: 0x1030220: jal   0x1004a38 addu  a2, s0, zero
+// 0x01030230: 0x1030230: jal   0x1004a48 addu  a2, s0, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -7552,12 +7552,12 @@ L_10301fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030228: 0x1030228: lw    a0, 1308(sp)
+// 0x01030238: 0x1030238: lw    a0, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7566,7 +7566,7 @@ L_10301fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103022c: 0x103022c: lw    a1, 284(sp)
+// 0x0103023c: 0x103023c: lw    a1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7575,34 +7575,34 @@ L_10301fc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01030230: 0x1030230: jal   0x102fa78 sll   zero, zero, 0
+// 0x01030240: 0x1030240: jal   0x102fa88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_object_string_102fa78(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_object_string_102fa88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030238: 0x1030238: lw    v1, -23896(s8)
+// 0x01030248: 0x1030248: lw    v1, -23432(s8)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5974
+	ldc.i4 -5858
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103023c: 0x103023c: sw    v0, 0(s0)
+// 0x0103024c: 0x103024c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01030240: 0x1030240: sw    v1, 136(s0)
+// 0x01030250: 0x1030250: sw    v1, 136(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7611,69 +7611,69 @@ L_10301fc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01030244: 0x1030244: sw    s0, -23896(s8)
+// 0x01030254: 0x1030254: sw    s0, -23432(s8)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5974
+	ldc.i4 -5858
 	add
 	ldloc 9
 	stelem.i4
-L_1030248:
-// 0x01030248: 0x1030248: sltu  v0, s3, s4
+L_1030258:
+// 0x01030258: 0x1030258: sltu  v0, s3, s4
 	ldloc 10
 	ldloc 13
 	clt.un
 	stloc 5
-L_103024c:
-// 0x0103024c: 0x103024c: beq   v0, zero, 0x1030270 addu  a0, s3, zero
+L_103025c:
+// 0x0103025c: 0x103025c: beq   v0, zero, 0x1030280 addu  a0, s3, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brfalse L_1030270
+	brfalse L_1030280
 // --- basic block ---
-// 0x01030254: 0x1030254: lb    v0, 0(s3)
+// 0x01030264: 0x1030264: lb    v0, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01030258: 0x1030258: sll   zero, zero, 0
-// 0x0103025c: 0x103025c: slti  v0, v0, 32
+// 0x01030268: 0x1030268: sll   zero, zero, 0
+// 0x0103026c: 0x103026c: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x01030260: 0x1030260: bne   v0, zero, 0x1030248 addiu s3, s3, 1
+// 0x01030270: 0x1030270: bne   v0, zero, 0x1030258 addiu s3, s3, 1
 	ldloc 5
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	brtrue L_1030248
+	brtrue L_1030258
 // --- basic block ---
-// 0x01030268: 0x1030268: addiu s3, s3, -1
+// 0x01030278: 0x1030278: addiu s3, s3, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0103026c: 0x103026c: addu  a0, s3, zero
+// 0x0103027c: 0x103027c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-L_1030270:
-// 0x01030270: 0x1030270: sltu  v0, a0, s4
+L_1030280:
+// 0x01030280: 0x1030280: sltu  v0, a0, s4
 	ldloc.1
 	ldloc 13
 	clt.un
 	stloc 5
-// 0x01030274: 0x1030274: bne   v0, zero, 0x102fb8c addiu v1, zero, 35
+// 0x01030284: 0x1030284: bne   v0, zero, 0x102fb9c addiu v1, zero, 35
 	ldloc 5
 	ldc.i4.s 35
 	stloc 7
-	brtrue L_102fb8c
+	brtrue L_102fb9c
 // --- basic block ---
-L_103027c:
-// 0x0103027c: 0x103027c: lw    ra, 2372(sp)
-// 0x01030280: 0x1030280: lw    s8, 2368(sp)
+L_103028c:
+// 0x0103028c: 0x103028c: lw    ra, 2372(sp)
+// 0x01030290: 0x1030290: lw    s8, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7682,7 +7682,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01030284: 0x1030284: lw    s7, 2364(sp)
+// 0x01030294: 0x1030294: lw    s7, 2364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7691,7 +7691,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01030288: 0x1030288: lw    s6, 2360(sp)
+// 0x01030298: 0x1030298: lw    s6, 2360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7700,7 +7700,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0103028c: 0x103028c: lw    s5, 2356(sp)
+// 0x0103029c: 0x103029c: lw    s5, 2356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7709,7 +7709,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01030290: 0x1030290: lw    s4, 2352(sp)
+// 0x010302a0: 0x10302a0: lw    s4, 2352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7718,7 +7718,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01030294: 0x1030294: lw    s3, 2348(sp)
+// 0x010302a4: 0x10302a4: lw    s3, 2348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7727,7 +7727,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01030298: 0x1030298: lw    s2, 2344(sp)
+// 0x010302a8: 0x10302a8: lw    s2, 2344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7736,7 +7736,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103029c: 0x103029c: lw    s1, 2340(sp)
+// 0x010302ac: 0x10302ac: lw    s1, 2340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7745,7 +7745,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010302a0: 0x10302a0: lw    s0, 2336(sp)
+// 0x010302b0: 0x10302b0: lw    s0, 2336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7754,7 +7754,7 @@ L_103027c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010302a4: 0x10302a4: jr    ra addiu sp, sp, 2376
+// 0x010302b4: 0x10302b4: jr    ra addiu sp, sp, 2376
 	ldloc.0
 	ldc.i4 2376
 	add
@@ -7764,44 +7764,44 @@ L_103027c:
 __CIBYL_local_jumptab:
 	stloc 7
 	ldloc 7
-	ldc.i4 16973040
-	beq  L_102fcf0
+	ldc.i4 16973056
+	beq  L_102fd00
 	ldloc 7
-	ldc.i4 16973112
-	beq  L_102fd38
+	ldc.i4 16973128
+	beq  L_102fd48
 	ldloc 7
-	ldc.i4 16973304
-	beq  L_102fdf8
+	ldc.i4 16973320
+	beq  L_102fe08
 	ldloc 7
-	ldc.i4 16973408
-	beq  L_102fe60
+	ldc.i4 16973424
+	beq  L_102fe70
 	ldloc 7
-	ldc.i4 16973580
-	beq  L_102ff0c
+	ldc.i4 16973596
+	beq  L_102ff1c
 	ldloc 7
-	ldc.i4 16973696
-	beq  L_102ff80
+	ldc.i4 16973712
+	beq  L_102ff90
 	ldloc 7
-	ldc.i4 16973900
-	beq  L_103004c
+	ldc.i4 16973916
+	beq  L_103005c
 	ldloc 7
-	ldc.i4 16974056
-	beq  L_10300e8
+	ldc.i4 16974072
+	beq  L_10300f8
 	ldloc 7
-	ldc.i4 16974160
-	beq  L_1030150
+	ldc.i4 16974176
+	beq  L_1030160
 	ldloc 7
-	ldc.i4 16974300
-	beq  L_10301dc
+	ldc.i4 16974316
+	beq  L_10301ec
 	ldloc 7
-	ldc.i4 16974312
-	beq  L_10301e8
+	ldc.i4 16974328
+	beq  L_10301f8
 	ldloc 7
-	ldc.i4 16974332
-	beq  L_10301fc
+	ldc.i4 16974348
+	beq  L_103020c
 	ldloc 7
-	ldc.i4 16974408
-	beq  L_1030248
+	ldc.i4 16974424
+	beq  L_1030258
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
diff --git a/converted/Cibyl35.j b/converted/Cibyl35.j
index a242208..af94224 100644
--- a/converted/Cibyl35.j
+++ b/converted/Cibyl35.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl35::.ctor
 
-.method public static int32 roadmap_screen_obj_reload_10302ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_reload_10302bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 s1,int32 ra)
@@ -82,69 +82,69 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010302ac: 0x10302ac: lui   v0, 0xf0000
+// 0x010302bc: 0x10302bc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010302b0: 0x10302b0: lw    v1, -30072(v0)
+// 0x010302c0: 0x10302c0: lw    v1, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 8
-// 0x010302b4: 0x10302b4: lui   v0, 0xf0000
+// 0x010302c4: 0x10302c4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010302b8: 0x10302b8: lw    v0, -30068(v0)
+// 0x010302c8: 0x10302c8: lw    v0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x010302bc: 0x10302bc: lui   a1, 0x60000
+// 0x010302cc: 0x10302cc: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010302c0: 0x10302c0: sw    zero, -23896(a1)
+// 0x010302d0: 0x10302d0: sw    zero, -23432(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5974
+	ldc.i4 -5858
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010302c4: 0x10302c4: lui   a1, 0x60000
+// 0x010302d4: 0x10302d4: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010302c8: 0x10302c8: addiu sp, sp, -304
+// 0x010302d8: 0x10302d8: addiu sp, sp, -304
 	ldloc.0
 	ldc.i4 -304
 	add
 	stloc.0
-// 0x010302cc: 0x10302cc: slt   a0, v1, v0
+// 0x010302dc: 0x10302dc: slt   a0, v1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc.1
-// 0x010302d0: 0x10302d0: sw    v1, -23876(a1)
+// 0x010302e0: 0x10302e0: sw    v1, -23412(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5969
+	ldc.i4 -5853
 	add
 	ldloc 8
 	stelem.i4
-// 0x010302d4: 0x10302d4: lui   v1, 0x60000
+// 0x010302e4: 0x10302e4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x010302d8: 0x10302d8: sw    ra, 300(sp)
-// 0x010302dc: 0x10302dc: sw    s1, 296(sp)
+// 0x010302e8: 0x10302e8: sw    ra, 300(sp)
+// 0x010302ec: 0x10302ec: sw    s1, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -153,7 +153,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010302e0: 0x10302e0: sw    s0, 292(sp)
+// 0x010302f0: 0x10302f0: sw    s0, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -162,56 +162,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010302e4: 0x10302e4: bne   a0, zero, 0x10302f8 sw    v0, -23872(v1)
+// 0x010302f4: 0x10302f4: bne   a0, zero, 0x1030308 sw    v0, -23408(v1)
 	ldloc.1
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5968
+	ldc.i4 -5852
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10302f8
+	brtrue L_1030308
 // --- basic block ---
-// 0x010302ec: 0x10302ec: lui   s0, 0x10000
+// 0x010302fc: 0x10302fc: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010302f0: 0x10302f0: j	 0x1030300 addiu s0, s0, -16004
+// 0x01030300: 0x1030300: j	 0x1030310 addiu s0, s0, -16004
 	ldloc 6
 	ldc.i4 -16004
 	add
 	stloc 6
-	br L_1030300
+	br L_1030310
 // --- basic block ---
-L_10302f8:
-// 0x010302f8: 0x10302f8: lui   s0, 0x10000
+L_1030308:
+// 0x01030308: 0x1030308: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010302fc: 0x10302fc: addiu s0, s0, -15996
+// 0x0103030c: 0x103030c: addiu s0, s0, -15996
 	ldloc 6
 	ldc.i4 -15996
 	add
 	stloc 6
-L_1030300:
-// 0x01030300: 0x1030300: jal   0x1052da4 sll   zero, zero, 0
-	call int32 Cibyl61::roadmap_is_touchScreen_supported_1052da4()
+L_1030310:
+// 0x01030310: 0x1030310: jal   0x1052db4 sll   zero, zero, 0
+	call int32 Cibyl61::roadmap_is_touchScreen_supported_1052db4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01030308: 0x1030308: beq   v0, zero, 0x1030330 addiu s1, sp, 28
+// 0x01030318: 0x1030318: beq   v0, zero, 0x1030340 addiu s1, sp, 28
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-	brfalse L_1030330
+	brfalse L_1030340
 // --- basic block ---
-// 0x01030310: 0x1030310: addu  a1, s0, zero
+// 0x01030320: 0x1030320: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x01030314: 0x1030314: jal   0x1001b68 addu  a0, s1, zero
+// 0x01030324: 0x1030324: jal   0x1001b68 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -221,13 +221,13 @@ L_1030300:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103031c: 0x103031c: lui   a1, 0x10000
+// 0x0103032c: 0x103032c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01030320: 0x1030320: addu  a0, s1, zero
+// 0x01030330: 0x1030330: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01030324: 0x1030324: jal   0x1001ac4 addiu a1, a1, -15980
+// 0x01030334: 0x1030334: jal   0x1001ac4 addiu a1, a1, -15980
 	ldloc.2
 	ldc.i4 -15980
 	add
@@ -237,33 +237,33 @@ L_1030300:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103032c: 0x103032c: addu  s0, s1, zero
+// 0x0103033c: 0x103033c: addu  s0, s1, zero
 	ldloc 9
 	stloc 6
-L_1030330:
-// 0x01030330: 0x1030330: lui   a1, 0x10000
+L_1030340:
+// 0x01030340: 0x1030340: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01030334: 0x1030334: lui   a3, 0x10000
+// 0x01030344: 0x1030344: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01030338: 0x1030338: addiu a1, a1, -16588
+// 0x01030348: 0x1030348: addiu a1, a1, -16588
 	ldloc.2
 	ldc.i4 -16588
 	add
 	stloc.2
-// 0x0103033c: 0x103033c: addiu a3, a3, -15972
+// 0x0103034c: 0x103034c: addiu a3, a3, -15972
 	ldloc 4
 	ldc.i4 -15972
 	add
 	stloc 4
-// 0x01030340: 0x1030340: addiu a0, zero, 1
+// 0x01030350: 0x1030350: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01030344: 0x1030344: addiu a2, zero, 872
+// 0x01030354: 0x1030354: addiu a2, zero, 872
 	ldc.i4 872
 	stloc.3
-// 0x01030348: 0x1030348: jal   0x100449c sw    s0, 16(sp)
+// 0x01030358: 0x1030358: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -282,34 +282,34 @@ L_1030330:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01030350: 0x1030350: lui   a0, 0x0
+// 0x01030360: 0x1030360: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01030354: 0x1030354: lui   a3, 0x10000
+// 0x01030364: 0x1030364: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01030358: 0x1030358: addu  a1, s0, zero
+// 0x01030368: 0x1030368: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x0103035c: 0x103035c: addiu a0, a0, 26244
+// 0x0103036c: 0x103036c: addiu a0, a0, 26244
 	ldloc.1
 	ldc.i4 26244
 	add
 	stloc.1
-// 0x01030360: 0x1030360: addiu s0, sp, 24
+// 0x01030370: 0x1030370: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x01030364: 0x1030364: addiu a3, a3, 6924
+// 0x01030374: 0x1030374: addiu a3, a3, 6920
 	ldloc 4
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 4
-// 0x01030368: 0x1030368: addu  a2, zero, zero
+// 0x01030378: 0x1030378: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103036c: 0x103036c: jal   0x104d770 sw    s0, 16(sp)
+// 0x0103037c: 0x103037c: jal   0x104d780 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -323,16 +323,16 @@ L_1030330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_map_104d770(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_map_104d780(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01030374: 0x1030374: beq   v0, zero, 0x10303a8 sll   zero, zero, 0
+// 0x01030384: 0x1030384: beq   v0, zero, 0x10303b8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10303a8
+	brfalse L_10303b8
 // --- basic block ---
-// 0x0103037c: 0x103037c: lw    a0, 24(sp)
+// 0x0103038c: 0x103038c: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -341,12 +341,12 @@ L_1030330:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030380: 0x1030380: jal   0x104d414 sll   zero, zero, 0
+// 0x01030390: 0x1030390: jal   0x104d424 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_base_104d414(int32)
+	call int32 Cibyl57::roadmap_file_base_104d424(int32)
 	stloc 5
 // --- basic block ---
-// 0x01030388: 0x1030388: lw    a0, 24(sp)
+// 0x01030398: 0x1030398: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -355,17 +355,17 @@ L_1030330:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103038c: 0x103038c: jal   0x104d428 addu  s1, v0, zero
+// 0x0103039c: 0x103039c: jal   0x104d438 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_size_104d428(int32)
+	call int32 Cibyl57::roadmap_file_size_104d438(int32)
 	stloc 5
 // --- basic block ---
-// 0x01030394: 0x1030394: addu  a1, v0, zero
+// 0x010303a4: 0x10303a4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01030398: 0x1030398: jal   0x102fae8 addu  a0, s1, zero
+// 0x010303a8: 0x10303a8: jal   0x102faf8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -373,12 +373,12 @@ L_1030330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_load_102fae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_load_102faf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010303a0: 0x10303a0: jal   0x104d628 addu  a0, s0, zero
+// 0x010303b0: 0x10303b0: jal   0x104d638 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -386,14 +386,14 @@ L_1030330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_unmap_104d628(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_unmap_104d638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10303a8:
-// 0x010303a8: 0x10303a8: lw    ra, 300(sp)
-// 0x010303ac: 0x10303ac: lw    s1, 296(sp)
+L_10303b8:
+// 0x010303b8: 0x10303b8: lw    ra, 300(sp)
+// 0x010303bc: 0x10303bc: lw    s1, 296(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -402,7 +402,7 @@ L_10303a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010303b0: 0x10303b0: lw    s0, 292(sp)
+// 0x010303c0: 0x10303c0: lw    s0, 292(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -411,7 +411,7 @@ L_10303a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010303b4: 0x10303b4: jr    ra addiu sp, sp, 304
+// 0x010303c4: 0x10303c4: jr    ra addiu sp, sp, 304
 	ldloc.0
 	ldc.i4 304
 	add
@@ -423,7 +423,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_obj_draw_10303bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_draw_10303cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 s8,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -485,40 +485,40 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010303bc: 0x10303bc: lui   v0, 0x60000
+// 0x010303cc: 0x10303cc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010303c0: 0x10303c0: lui   v1, 0xf0000
+// 0x010303d0: 0x10303d0: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x010303c4: 0x10303c4: lw    v0, -23900(v0)
+// 0x010303d4: 0x10303d4: lw    v0, -23436(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5975
+	ldc.i4 -5859
 	add
 	ldelem.i4
 	stloc 6
-// 0x010303c8: 0x10303c8: addiu sp, sp, -80
+// 0x010303d8: 0x10303d8: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010303cc: 0x10303cc: lw    a0, -30072(v1)
+// 0x010303dc: 0x10303dc: lw    a0, -29608(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x010303d0: 0x10303d0: lui   v1, 0xf0000
+// 0x010303e0: 0x10303e0: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x010303d4: 0x10303d4: sw    ra, 76(sp)
-// 0x010303d8: 0x10303d8: sw    s8, 72(sp)
+// 0x010303e4: 0x10303e4: sw    ra, 76(sp)
+// 0x010303e8: 0x10303e8: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -527,7 +527,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010303dc: 0x10303dc: sw    s7, 68(sp)
+// 0x010303ec: 0x10303ec: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -536,7 +536,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010303e0: 0x10303e0: sw    s6, 64(sp)
+// 0x010303f0: 0x10303f0: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -545,7 +545,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010303e4: 0x10303e4: sw    s5, 60(sp)
+// 0x010303f4: 0x10303f4: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -554,7 +554,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010303e8: 0x10303e8: sw    s4, 56(sp)
+// 0x010303f8: 0x10303f8: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -563,7 +563,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010303ec: 0x10303ec: sw    s3, 52(sp)
+// 0x010303fc: 0x10303fc: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -572,7 +572,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010303f0: 0x10303f0: sw    s2, 48(sp)
+// 0x01030400: 0x1030400: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -581,7 +581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010303f4: 0x10303f4: sw    s1, 44(sp)
+// 0x01030404: 0x1030404: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -590,7 +590,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010303f8: 0x10303f8: sw    s0, 40(sp)
+// 0x01030408: 0x1030408: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -599,112 +599,112 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010303fc: 0x10303fc: lw    v1, -30068(v1)
+// 0x0103040c: 0x103040c: lw    v1, -29604(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030400: 0x1030400: beq   v0, zero, 0x10305ec lui   v0, 0x60000
+// 0x01030410: 0x1030410: beq   v0, zero, 0x10305fc lui   v0, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 6
-	brfalse L_10305ec
+	brfalse L_10305fc
 // --- basic block ---
-// 0x01030408: 0x1030408: lw    v0, -23876(v0)
+// 0x01030418: 0x1030418: lw    v0, -23412(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5969
+	ldc.i4 -5853
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103040c: 0x103040c: sll   zero, zero, 0
-// 0x01030410: 0x1030410: beq   a0, v0, 0x1030430 lui   v0, 0x60000
+// 0x0103041c: 0x103041c: sll   zero, zero, 0
+// 0x01030420: 0x1030420: beq   a0, v0, 0x1030440 lui   v0, 0x60000
 	ldloc.1
 	ldloc 6
 	ldc.i4 393216
 	stloc 6
-	beq  L_1030430
+	beq  L_1030440
 // --- basic block ---
-// 0x01030418: 0x1030418: lw    v0, -23872(v0)
+// 0x01030428: 0x1030428: lw    v0, -23408(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5968
+	ldc.i4 -5852
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103041c: 0x103041c: sll   zero, zero, 0
-// 0x01030420: 0x1030420: beq   v1, v0, 0x1030434 lui   v0, 0x60000
+// 0x0103042c: 0x103042c: sll   zero, zero, 0
+// 0x01030430: 0x1030430: beq   v1, v0, 0x1030444 lui   v0, 0x60000
 	ldloc 7
 	ldloc 6
 	ldc.i4 393216
 	stloc 6
-	beq  L_1030434
+	beq  L_1030444
 // --- basic block ---
-// 0x01030428: 0x1030428: jal   0x10302ac sll   zero, zero, 0
+// 0x01030438: 0x1030438: jal   0x10302bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_screen_obj_reload_10302ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_screen_obj_reload_10302bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1030430:
-// 0x01030430: 0x1030430: lui   v0, 0x60000
+L_1030440:
+// 0x01030440: 0x1030440: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-L_1030434:
-// 0x01030434: 0x1030434: lui   s8, 0x10000
+L_1030444:
+// 0x01030444: 0x1030444: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01030438: 0x1030438: lw    s0, -23896(v0)
+// 0x01030448: 0x1030448: lw    s0, -23432(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5974
+	ldc.i4 -5858
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103043c: 0x103043c: addiu s8, s8, -15948
+// 0x0103044c: 0x103044c: addiu s8, s8, -15948
 	ldloc 11
 	ldc.i4 -15948
 	add
 	stloc 11
-// 0x01030440: 0x1030440: lui   s7, 0x60000
+// 0x01030450: 0x1030450: lui   s7, 0x60000
 	ldc.i4 393216
 	stloc 16
-// 0x01030444: 0x1030444: addiu s1, sp, 24
+// 0x01030454: 0x1030454: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01030448: 0x1030448: lui   s6, 0x60000
+// 0x01030458: 0x1030458: lui   s6, 0x60000
 	ldc.i4 393216
 	stloc 15
-// 0x0103044c: 0x103044c: lui   s5, 0xf0000
+// 0x0103045c: 0x103045c: lui   s5, 0xf0000
 	ldc.i4 983040
 	stloc 14
-// 0x01030450: 0x1030450: lui   s4, 0x60000
+// 0x01030460: 0x1030460: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x01030454: 0x1030454: j	 0x10305e4 lui   s3, 0xf0000
+// 0x01030464: 0x1030464: j	 0x10305f4 lui   s3, 0xf0000
 	ldc.i4 983040
 	stloc 12
-	br L_10305e4
+	br L_10305f4
 // --- basic block ---
-L_103045c:
-// 0x0103045c: 0x103045c: jal   0x102f864 addu  a0, s0, zero
+L_103046c:
+// 0x0103046c: 0x103046c: jal   0x102f874 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -712,16 +712,16 @@ L_103045c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::obj_is_active_102f864(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::obj_is_active_102f874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01030464: 0x1030464: beq   v0, zero, 0x10305dc sll   zero, zero, 0
+// 0x01030474: 0x1030474: beq   v0, zero, 0x10305ec sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10305dc
+	brfalse L_10305ec
 // --- basic block ---
-// 0x0103046c: 0x103046c: lw    v0, 108(s0)
+// 0x0103047c: 0x103047c: lw    v0, 108(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -730,14 +730,14 @@ L_103045c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01030470: 0x1030470: sll   zero, zero, 0
-// 0x01030474: 0x1030474: beq   v0, zero, 0x1030488 addu  s2, zero, zero
+// 0x01030480: 0x1030480: sll   zero, zero, 0
+// 0x01030484: 0x1030484: beq   v0, zero, 0x1030498 addu  s2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_1030488
+	brfalse L_1030498
 // --- basic block ---
-// 0x0103047c: 0x103047c: jalr  v0 sll   zero, zero, 0
+// 0x0103048c: 0x103048c: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -749,23 +749,23 @@ L_103045c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01030484: 0x1030484: addu  s2, v0, zero
+// 0x01030494: 0x1030494: addu  s2, v0, zero
 	ldloc 6
 	stloc 9
-L_1030488:
-// 0x01030488: 0x1030488: lh    v0, 80(s0)
+L_1030498:
+// 0x01030498: 0x1030498: lh    v0, 80(s0)
 	ldloc 8
 	ldc.i4.s 80
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x0103048c: 0x103048c: lh    v1, 82(s0)
+// 0x0103049c: 0x103049c: lh    v1, 82(s0)
 	ldloc 8
 	ldc.i4.s 82
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01030490: 0x1030490: sw    v0, 24(sp)
+// 0x010304a0: 0x10304a0: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -774,7 +774,7 @@ L_1030488:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01030494: 0x1030494: sw    v1, 28(sp)
+// 0x010304a4: 0x10304a4: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -783,54 +783,54 @@ L_1030488:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01030498: 0x1030498: lw    a3, -23892(s7)
+// 0x010304a8: 0x10304a8: lw    a3, -23428(s7)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103049c: 0x103049c: bgez  v0, 0x10304b0 sll   zero, zero, 0
+// 0x010304ac: 0x10304ac: bgez  v0, 0x10304c0 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_10304b0
+	bge L_10304c0
 // --- basic block ---
-// 0x010304a4: 0x10304a4: lw    v1, -30068(s3)
+// 0x010304b4: 0x10304b4: lw    v1, -29604(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x010304a8: 0x10304a8: j	 0x10304bc addu  v0, v0, v1
+// 0x010304b8: 0x10304b8: j	 0x10304cc addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-	br L_10304bc
+	br L_10304cc
 // --- basic block ---
-L_10304b0:
-// 0x010304b0: 0x10304b0: lw    v1, -23888(s4)
+L_10304c0:
+// 0x010304c0: 0x10304c0: lw    v1, -23424(s4)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5972
+	ldc.i4 -5856
 	add
 	ldelem.i4
 	stloc 7
-// 0x010304b4: 0x10304b4: sll   zero, zero, 0
-// 0x010304b8: 0x10304b8: addu  v0, v0, v1
+// 0x010304c4: 0x10304c4: sll   zero, zero, 0
+// 0x010304c8: 0x10304c8: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-L_10304bc:
-// 0x010304bc: 0x10304bc: sw    v0, 24(sp)
+L_10304cc:
+// 0x010304cc: 0x10304cc: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -839,7 +839,7 @@ L_10304bc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010304c0: 0x10304c0: lw    v0, 28(sp)
+// 0x010304d0: 0x10304d0: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -848,46 +848,46 @@ L_10304bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010304c4: 0x10304c4: sll   zero, zero, 0
-// 0x010304c8: 0x10304c8: bgez  v0, 0x10304dc sll   zero, zero, 0
+// 0x010304d4: 0x10304d4: sll   zero, zero, 0
+// 0x010304d8: 0x10304d8: bgez  v0, 0x10304ec sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_10304dc
+	bge L_10304ec
 // --- basic block ---
-// 0x010304d0: 0x10304d0: lw    v1, -30072(s5)
+// 0x010304e0: 0x10304e0: lw    v1, -29608(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x010304d4: 0x10304d4: j	 0x10304e8 addu  v0, v1, v0
+// 0x010304e4: 0x10304e4: j	 0x10304f8 addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-	br L_10304e8
+	br L_10304f8
 // --- basic block ---
-L_10304dc:
-// 0x010304dc: 0x10304dc: lw    v1, -23884(s6)
+L_10304ec:
+// 0x010304ec: 0x10304ec: lw    v1, -23420(s6)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5971
+	ldc.i4 -5855
 	add
 	ldelem.i4
 	stloc 7
-// 0x010304e0: 0x10304e0: sll   zero, zero, 0
-// 0x010304e4: 0x10304e4: addu  v0, v1, v0
+// 0x010304f0: 0x10304f0: sll   zero, zero, 0
+// 0x010304f4: 0x10304f4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-L_10304e8:
-// 0x010304e8: 0x10304e8: lw    a1, 24(sp)
+L_10304f8:
+// 0x010304f8: 0x10304f8: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -896,18 +896,18 @@ L_10304e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010304ec: 0x10304ec: addiu v1, s2, 10
+// 0x010304fc: 0x10304fc: addiu v1, s2, 10
 	ldloc 9
 	ldc.i4.s 10
 	add
 	stloc 7
-// 0x010304f0: 0x10304f0: lh    a0, 84(s0)
+// 0x01030500: 0x1030500: lh    a0, 84(s0)
 	ldloc 8
 	ldc.i4.s 84
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x010304f4: 0x10304f4: sw    v0, 28(sp)
+// 0x01030504: 0x1030504: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -916,22 +916,22 @@ L_10304e8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010304f8: 0x10304f8: sll   v1, v1, 2
+// 0x01030508: 0x1030508: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010304fc: 0x10304fc: addu  a0, a1, a0
+// 0x0103050c: 0x103050c: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01030500: 0x1030500: addu  v1, s0, v1
+// 0x01030510: 0x1030510: addu  v1, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x01030504: 0x1030504: lw    a1, 28(sp)
+// 0x01030514: 0x1030514: lw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -940,25 +940,25 @@ L_10304e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01030508: 0x1030508: lh    v0, 86(s0)
+// 0x01030518: 0x1030518: lh    v0, 86(s0)
 	ldloc 8
 	ldc.i4.s 86
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x0103050c: 0x103050c: lw    a2, 0(v1)
+// 0x0103051c: 0x103051c: lw    a2, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01030510: 0x1030510: addu  v0, a1, v0
+// 0x01030520: 0x1030520: addu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x01030514: 0x1030514: sw    a0, 24(sp)
+// 0x01030524: 0x1030524: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -967,7 +967,7 @@ L_10304e8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01030518: 0x1030518: beq   a2, zero, 0x1030588 sw    v0, 28(sp)
+// 0x01030528: 0x1030528: beq   a2, zero, 0x1030598 sw    v0, 28(sp)
 	ldloc.3
 	ldloc 5
 	ldloc.0
@@ -977,15 +977,15 @@ L_10304e8:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_1030588
+	brfalse L_1030598
 // --- basic block ---
-// 0x01030520: 0x1030520: addu  a0, zero, zero
+// 0x01030530: 0x1030530: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01030524: 0x1030524: addiu a1, zero, 1
+// 0x01030534: 0x1030534: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01030528: 0x1030528: sw    v1, 36(sp)
+// 0x01030538: 0x1030538: sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -994,7 +994,7 @@ L_10304e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103052c: 0x103052c: jal   0x10a1918 sw    a3, 32(sp)
+// 0x0103053c: 0x103053c: jal   0x10a1f60 sw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1008,12 +1008,12 @@ L_10304e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01030534: 0x1030534: lw    v1, 36(sp)
+// 0x01030544: 0x1030544: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1022,7 +1022,7 @@ L_10304e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030538: 0x1030538: lw    a3, 32(sp)
+// 0x01030548: 0x1030548: lw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1031,25 +1031,25 @@ L_10304e8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103053c: 0x103053c: bne   v0, zero, 0x1030574 xor   a3, s0, a3
+// 0x0103054c: 0x103054c: bne   v0, zero, 0x1030584 xor   a3, s0, a3
 	ldloc 6
 	ldloc 8
 	ldloc 4
 	xor
 	stloc 4
-	brtrue L_1030574
+	brtrue L_1030584
 // --- basic block ---
-// 0x01030544: 0x1030544: lw    v0, 0(s0)
+// 0x01030554: 0x1030554: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01030548: 0x1030548: lui   a1, 0x10000
+// 0x01030558: 0x1030558: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103054c: 0x103054c: sw    v0, 16(sp)
+// 0x0103055c: 0x103055c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1058,28 +1058,28 @@ L_10304e8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01030550: 0x1030550: lw    v0, 0(v1)
+// 0x01030560: 0x1030560: lw    v0, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01030554: 0x1030554: addiu a0, zero, 4
+// 0x01030564: 0x1030564: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01030558: 0x1030558: addiu a1, a1, -16588
+// 0x01030568: 0x1030568: addiu a1, a1, -16588
 	ldloc.2
 	ldc.i4 -16588
 	add
 	stloc.2
-// 0x0103055c: 0x103055c: addiu a2, zero, 1008
+// 0x0103056c: 0x103056c: addiu a2, zero, 1008
 	ldc.i4 1008
 	stloc.3
-// 0x01030560: 0x1030560: addu  a3, s8, zero
+// 0x01030570: 0x1030570: addu  a3, s8, zero
 	ldloc 11
 	stloc 4
-// 0x01030564: 0x1030564: jal   0x100449c sw    v0, 20(sp)
+// 0x01030574: 0x1030574: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1098,15 +1098,15 @@ L_10304e8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103056c: 0x103056c: j	 0x103058c sll   s2, s2, 2
+// 0x0103057c: 0x103057c: j	 0x103059c sll   s2, s2, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-	br L_103058c
+	br L_103059c
 // --- basic block ---
-L_1030574:
-// 0x01030574: 0x1030574: lw    a2, 92(s0)
+L_1030584:
+// 0x01030584: 0x1030584: lw    a2, 92(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1115,15 +1115,15 @@ L_1030574:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030578: 0x1030578: addu  a0, v0, zero
+// 0x01030588: 0x1030588: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0103057c: 0x103057c: sltiu a3, a3, 1
+// 0x0103058c: 0x103058c: sltiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	clt.un
 	stloc 4
-// 0x01030580: 0x1030580: jal   0x104f4a8 addu  a1, s1, zero
+// 0x01030590: 0x1030590: jal   0x104f4b8 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -1131,24 +1131,24 @@ L_1030574:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1030588:
-// 0x01030588: 0x1030588: sll   s2, s2, 2
+L_1030598:
+// 0x01030598: 0x1030598: sll   s2, s2, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-L_103058c:
-// 0x0103058c: 0x103058c: addu  s2, s0, s2
+L_103059c:
+// 0x0103059c: 0x103059c: addu  s2, s0, s2
 	ldloc 8
 	ldloc 9
 	add
 	stloc 9
-// 0x01030590: 0x1030590: lw    a0, 4(s2)
+// 0x010305a0: 0x10305a0: lw    a0, 4(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1157,12 +1157,12 @@ L_103058c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030594: 0x1030594: sll   zero, zero, 0
-// 0x01030598: 0x1030598: beq   a0, zero, 0x10305dc sll   zero, zero, 0
+// 0x010305a4: 0x10305a4: sll   zero, zero, 0
+// 0x010305a8: 0x10305a8: beq   a0, zero, 0x10305ec sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10305dc
+	brfalse L_10305ec
 // --- basic block ---
-// 0x010305a0: 0x10305a0: lw    v0, 88(s0)
+// 0x010305b0: 0x10305b0: lw    v0, 88(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1171,17 +1171,17 @@ L_103058c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010305a4: 0x10305a4: sll   zero, zero, 0
-// 0x010305a8: 0x10305a8: andi  v0, v0, 1
+// 0x010305b4: 0x10305b4: sll   zero, zero, 0
+// 0x010305b8: 0x10305b8: andi  v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	and
 	stloc 6
-// 0x010305ac: 0x10305ac: beq   v0, zero, 0x10305cc sll   zero, zero, 0
+// 0x010305bc: 0x10305bc: beq   v0, zero, 0x10305dc sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10305cc
+	brfalse L_10305dc
 // --- basic block ---
-// 0x010305b4: 0x10305b4: jal   0x1007a4c sw    a0, 32(sp)
+// 0x010305c4: 0x10305c4: jal   0x1007a5c sw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1190,14 +1190,14 @@ L_103058c:
 	add
 	ldloc.1
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_get_orientation_1007a4c()
+	call int32 Cibyl5::roadmap_math_get_orientation_1007a5c()
 	stloc 6
 // --- basic block ---
-// 0x010305bc: 0x10305bc: subu  a2, zero, v0
+// 0x010305cc: 0x10305cc: subu  a2, zero, v0
 	ldloc 6
 	neg
 	stloc.3
-// 0x010305c0: 0x10305c0: lw    a0, 32(sp)
+// 0x010305d0: 0x10305d0: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1206,32 +1206,32 @@ L_103058c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010305c4: 0x10305c4: j	 0x10305d4 addu  a1, s1, zero
+// 0x010305d4: 0x10305d4: j	 0x10305e4 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-	br L_10305d4
+	br L_10305e4
 // --- basic block ---
-L_10305cc:
-// 0x010305cc: 0x10305cc: addu  a1, s1, zero
+L_10305dc:
+// 0x010305dc: 0x10305dc: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010305d0: 0x10305d0: addu  a2, zero, zero
+// 0x010305e0: 0x10305e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_10305d4:
-// 0x010305d4: 0x10305d4: jal   0x101bb50 sll   zero, zero, 0
+L_10305e4:
+// 0x010305e4: 0x10305e4: jal   0x101bb60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_sprite_draw_101bb50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_sprite_draw_101bb60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10305dc:
-// 0x010305dc: 0x10305dc: lw    s0, 136(s0)
+L_10305ec:
+// 0x010305ec: 0x10305ec: lw    s0, 136(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1240,15 +1240,15 @@ L_10305dc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010305e0: 0x10305e0: sll   zero, zero, 0
-L_10305e4:
-// 0x010305e4: 0x10305e4: bne   s0, zero, 0x103045c sll   zero, zero, 0
+// 0x010305f0: 0x10305f0: sll   zero, zero, 0
+L_10305f4:
+// 0x010305f4: 0x10305f4: bne   s0, zero, 0x103046c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_103045c
+	brtrue L_103046c
 // --- basic block ---
-L_10305ec:
-// 0x010305ec: 0x10305ec: lw    ra, 76(sp)
-// 0x010305f0: 0x10305f0: lw    s8, 72(sp)
+L_10305fc:
+// 0x010305fc: 0x10305fc: lw    ra, 76(sp)
+// 0x01030600: 0x1030600: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1257,7 +1257,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010305f4: 0x10305f4: lw    s7, 68(sp)
+// 0x01030604: 0x1030604: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1266,7 +1266,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010305f8: 0x10305f8: lw    s6, 64(sp)
+// 0x01030608: 0x1030608: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1275,7 +1275,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010305fc: 0x10305fc: lw    s5, 60(sp)
+// 0x0103060c: 0x103060c: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1284,7 +1284,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01030600: 0x1030600: lw    s4, 56(sp)
+// 0x01030610: 0x1030610: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1293,7 +1293,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01030604: 0x1030604: lw    s3, 52(sp)
+// 0x01030614: 0x1030614: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1302,7 +1302,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01030608: 0x1030608: lw    s2, 48(sp)
+// 0x01030618: 0x1030618: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1311,7 +1311,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103060c: 0x103060c: lw    s1, 44(sp)
+// 0x0103061c: 0x103061c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1320,7 +1320,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01030610: 0x1030610: lw    s0, 40(sp)
+// 0x01030620: 0x1030620: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1329,7 +1329,7 @@ L_10305ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01030614: 0x1030614: jr    ra addiu sp, sp, 80
+// 0x01030624: 0x1030624: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -1341,7 +1341,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_screen_obj_initialize_103061c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_initialize_103062c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -1379,24 +1379,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103061c: 0x103061c: lui   a0, 0x1030000
+// 0x0103062c: 0x103062c: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01030620: 0x1030620: addiu sp, sp, -24
+// 0x01030630: 0x1030630: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01030624: 0x1030624: addiu a0, a0, 2272
+// 0x01030634: 0x1030634: addiu a0, a0, 2288
 	ldloc.1
-	ldc.i4 2272
+	ldc.i4 2288
 	add
 	stloc.1
-// 0x01030628: 0x1030628: addiu a1, zero, 2
+// 0x01030638: 0x1030638: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0103062c: 0x103062c: sw    ra, 20(sp)
-// 0x01030630: 0x1030630: jal   0x104ba38 sw    s0, 16(sp)
+// 0x0103063c: 0x103063c: sw    ra, 20(sp)
+// 0x01030640: 0x1030640: jal   0x104ba48 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1410,23 +1410,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba38(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01030638: 0x1030638: lui   a0, 0x1030000
+// 0x01030648: 0x1030648: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0103063c: 0x103063c: lui   s0, 0x1030000
+// 0x0103064c: 0x103064c: lui   s0, 0x1030000
 	ldc.i4 16973824
 	stloc 7
-// 0x01030640: 0x1030640: addiu a0, a0, 2188
+// 0x01030650: 0x1030650: addiu a0, a0, 2204
 	ldloc.1
-	ldc.i4 2188
+	ldc.i4 2204
 	add
 	stloc.1
-// 0x01030644: 0x1030644: jal   0x104ba10 addiu a1, zero, 2
+// 0x01030654: 0x1030654: jal   0x104ba20 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -1434,17 +1434,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_released_104ba10(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_released_104ba20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103064c: 0x103064c: addiu a0, s0, 2016
+// 0x0103065c: 0x103065c: addiu a0, s0, 2032
 	ldloc 7
-	ldc.i4 2016
+	ldc.i4 2032
 	add
 	stloc.1
-// 0x01030650: 0x1030650: jal   0x104bad8 addiu a1, zero, 2
+// 0x01030660: 0x1030660: jal   0x104bae8 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -1452,17 +1452,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01030658: 0x1030658: addiu a0, s0, 2016
+// 0x01030668: 0x1030668: addiu a0, s0, 2032
 	ldloc 7
-	ldc.i4 2016
+	ldc.i4 2032
 	add
 	stloc.1
-// 0x0103065c: 0x103065c: jal   0x104ba60 addiu a1, zero, 2
+// 0x0103066c: 0x103066c: jal   0x104ba70 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -1470,20 +1470,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba60(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_enter_key_press_104ba70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01030664: 0x1030664: lui   a0, 0x1030000
+// 0x01030674: 0x1030674: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01030668: 0x1030668: addiu a0, a0, 1688
+// 0x01030678: 0x1030678: addiu a0, a0, 1704
 	ldloc.1
-	ldc.i4 1688
+	ldc.i4 1704
 	add
 	stloc.1
-// 0x0103066c: 0x103066c: jal   0x104bab0 addiu a1, zero, 2
+// 0x0103067c: 0x103067c: jal   0x104bac0 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -1491,30 +1491,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01030674: 0x1030674: jal   0x10302ac sll   zero, zero, 0
+// 0x01030684: 0x1030684: jal   0x10302bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_screen_obj_reload_10302ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_screen_obj_reload_10302bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103067c: 0x103067c: lw    ra, 20(sp)
-// 0x01030680: 0x1030680: addiu v1, zero, 1
+// 0x0103068c: 0x103068c: lw    ra, 20(sp)
+// 0x01030690: 0x1030690: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01030684: 0x1030684: lui   v0, 0x60000
+// 0x01030694: 0x1030694: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01030688: 0x1030688: lw    s0, 16(sp)
+// 0x01030698: 0x1030698: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1523,16 +1523,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103068c: 0x103068c: sw    v1, -23900(v0)
+// 0x0103069c: 0x103069c: sw    v1, -23436(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5975
+	ldc.i4 -5859
 	add
 	ldloc 6
 	stelem.i4
-// 0x01030690: 0x1030690: jr    ra addiu sp, sp, 24
+// 0x010306a0: 0x10306a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1544,7 +1544,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_obj_long_click_1030698(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_long_click_10306a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1588,12 +1588,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030698: 0x1030698: addiu sp, sp, -32
+// 0x010306a8: 0x10306a8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103069c: 0x103069c: sw    s1, 20(sp)
+// 0x010306ac: 0x10306ac: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1602,10 +1602,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010306a0: 0x10306a0: lui   s1, 0x60000
+// 0x010306b0: 0x10306b0: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x010306a4: 0x10306a4: sw    s0, 16(sp)
+// 0x010306b4: 0x10306b4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1614,17 +1614,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010306a8: 0x10306a8: lw    s0, -23892(s1)
+// 0x010306b8: 0x10306b8: lw    s0, -23428(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 8
-// 0x010306ac: 0x10306ac: sw    ra, 28(sp)
-// 0x010306b0: 0x10306b0: beq   s0, zero, 0x10307bc sw    s2, 24(sp)
+// 0x010306bc: 0x10306bc: sw    ra, 28(sp)
+// 0x010306c0: 0x10306c0: beq   s0, zero, 0x10307cc sw    s2, 24(sp)
 	ldloc 8
 	ldloc 6
 	ldloc.0
@@ -1634,9 +1634,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	brfalse L_10307bc
+	brfalse L_10307cc
 // --- basic block ---
-// 0x010306b8: 0x10306b8: lw    v0, 88(s0)
+// 0x010306c8: 0x10306c8: lw    v0, 88(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1645,19 +1645,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010306bc: 0x10306bc: sll   zero, zero, 0
-// 0x010306c0: 0x10306c0: andi  v0, v0, 2
+// 0x010306cc: 0x10306cc: sll   zero, zero, 0
+// 0x010306d0: 0x10306d0: andi  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	and
 	stloc 5
-// 0x010306c4: 0x10306c4: bne   v0, zero, 0x10307c8 addiu v0, zero, 1
+// 0x010306d4: 0x10306d4: bne   v0, zero, 0x10307d8 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10307c8
+	brtrue L_10307d8
 // --- basic block ---
-// 0x010306cc: 0x10306cc: jal   0x102f864 addu  a0, s0, zero
+// 0x010306dc: 0x10306dc: jal   0x102f874 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1665,84 +1665,84 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::obj_is_active_102f864(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::obj_is_active_102f874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010306d4: 0x10306d4: beq   v0, zero, 0x10307bc lui   s2, 0x60000
+// 0x010306e4: 0x10306e4: beq   v0, zero, 0x10307cc lui   s2, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 10
-	brfalse L_10307bc
+	brfalse L_10307cc
 // --- basic block ---
-// 0x010306dc: 0x10306dc: lw    v0, -23880(s2)
+// 0x010306ec: 0x10306ec: lw    v0, -23416(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5970
+	ldc.i4 -5854
 	add
 	ldelem.i4
 	stloc 5
-// 0x010306e0: 0x10306e0: sll   zero, zero, 0
-// 0x010306e4: 0x10306e4: bne   v0, zero, 0x1030718 sw    zero, -23892(s1)
+// 0x010306f0: 0x10306f0: sll   zero, zero, 0
+// 0x010306f4: 0x10306f4: bne   v0, zero, 0x1030728 sw    zero, -23428(s1)
 	ldloc 5
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_1030718
+	brtrue L_1030728
 // --- basic block ---
-// 0x010306ec: 0x10306ec: jal   0x10518a8 addiu a0, zero, 1
+// 0x010306fc: 0x10306fc: jal   0x10518b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010306f4: 0x10306f4: lui   s1, 0x10000
+// 0x01030704: 0x1030704: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010306f8: 0x10306f8: addu  a0, v0, zero
+// 0x01030708: 0x1030708: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010306fc: 0x10306fc: addiu a1, s1, -15908
+// 0x0103070c: 0x103070c: addiu a1, s1, -15908
 	ldloc 9
 	ldc.i4 -15908
 	add
 	stloc.2
-// 0x01030700: 0x1030700: jal   0x10518cc sw    v0, -23880(s2)
+// 0x01030710: 0x1030710: jal   0x10518dc sw    v0, -23416(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5970
+	ldc.i4 -5854
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030708: 0x1030708: addiu a2, s1, -15908
+// 0x01030718: 0x1030718: addiu a2, s1, -15908
 	ldloc 9
 	ldc.i4 -15908
 	add
 	stloc.3
-// 0x0103070c: 0x103070c: addiu a0, zero, 1
+// 0x0103071c: 0x103071c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01030710: 0x1030710: jal   0x10a1918 addu  a1, zero, zero
+// 0x01030720: 0x1030720: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1750,13 +1750,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1030718:
-// 0x01030718: 0x1030718: lw    v0, 100(s0)
+L_1030728:
+// 0x01030728: 0x1030728: lw    v0, 100(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1765,34 +1765,34 @@ L_1030718:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103071c: 0x103071c: sll   zero, zero, 0
-// 0x01030720: 0x1030720: beq   v0, zero, 0x1030760 lui   v0, 0x60000
+// 0x0103072c: 0x103072c: sll   zero, zero, 0
+// 0x01030730: 0x1030730: beq   v0, zero, 0x1030770 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1030760
+	brfalse L_1030770
 // --- basic block ---
-// 0x01030728: 0x1030728: lw    a0, -23880(v0)
+// 0x01030738: 0x1030738: lw    a0, -23416(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5970
+	ldc.i4 -5854
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103072c: 0x103072c: jal   0x105195c sll   zero, zero, 0
+// 0x0103073c: 0x103073c: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030734: 0x1030734: lw    v0, 100(s0)
+// 0x01030744: 0x1030744: lw    v0, 100(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1801,22 +1801,22 @@ L_1030718:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030738: 0x1030738: lui   v1, 0x20000
+// 0x01030748: 0x1030748: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0103073c: 0x103073c: lw    a0, 25580(v1)
+// 0x0103074c: 0x103074c: lw    a0, 26044(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6395
+	ldc.i4 6511
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030740: 0x1030740: lui   v1, 0x20000
+// 0x01030750: 0x1030750: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01030744: 0x1030744: lw    a2, 4(v0)
+// 0x01030754: 0x1030754: lw    a2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1825,19 +1825,19 @@ L_1030718:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030748: 0x1030748: lw    a1, 25584(v1)
+// 0x01030758: 0x1030758: lw    a1, 26048(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6396
+	ldc.i4 6512
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103074c: 0x103074c: jal   0x104bfdc sll   zero, zero, 0
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+// 0x0103075c: 0x103075c: jal   0x104bfec sll   zero, zero, 0
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01030754: 0x1030754: lw    v0, 100(s0)
+// 0x01030764: 0x1030764: lw    v0, 100(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1846,11 +1846,11 @@ L_1030718:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030758: 0x1030758: j	 0x10307a4 sll   zero, zero, 0
-	br L_10307a4
+// 0x01030768: 0x1030768: j	 0x10307b4 sll   zero, zero, 0
+	br L_10307b4
 // --- basic block ---
-L_1030760:
-// 0x01030760: 0x1030760: lw    v0, 96(s0)
+L_1030770:
+// 0x01030770: 0x1030770: lw    v0, 96(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1859,34 +1859,34 @@ L_1030760:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030764: 0x1030764: sll   zero, zero, 0
-// 0x01030768: 0x1030768: beq   v0, zero, 0x10307c4 lui   v0, 0x60000
+// 0x01030774: 0x1030774: sll   zero, zero, 0
+// 0x01030778: 0x1030778: beq   v0, zero, 0x10307d4 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_10307c4
+	brfalse L_10307d4
 // --- basic block ---
-// 0x01030770: 0x1030770: lw    a0, -23880(v0)
+// 0x01030780: 0x1030780: lw    a0, -23416(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5970
+	ldc.i4 -5854
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030774: 0x1030774: jal   0x105195c sll   zero, zero, 0
+// 0x01030784: 0x1030784: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103077c: 0x103077c: lw    v0, 96(s0)
+// 0x0103078c: 0x103078c: lw    v0, 96(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1895,22 +1895,22 @@ L_1030760:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030780: 0x1030780: lui   v1, 0x20000
+// 0x01030790: 0x1030790: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01030784: 0x1030784: lw    a0, 25580(v1)
+// 0x01030794: 0x1030794: lw    a0, 26044(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6395
+	ldc.i4 6511
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030788: 0x1030788: lui   v1, 0x20000
+// 0x01030798: 0x1030798: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0103078c: 0x103078c: lw    a2, 4(v0)
+// 0x0103079c: 0x103079c: lw    a2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1919,19 +1919,19 @@ L_1030760:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030790: 0x1030790: lw    a1, 25584(v1)
+// 0x010307a0: 0x10307a0: lw    a1, 26048(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6396
+	ldc.i4 6512
 	add
 	ldelem.i4
 	stloc.2
-// 0x01030794: 0x1030794: jal   0x104bfdc sll   zero, zero, 0
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+// 0x010307a4: 0x10307a4: jal   0x104bfec sll   zero, zero, 0
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x0103079c: 0x103079c: lw    v0, 96(s0)
+// 0x010307ac: 0x10307ac: lw    v0, 96(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1940,9 +1940,9 @@ L_1030760:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010307a0: 0x10307a0: sll   zero, zero, 0
-L_10307a4:
-// 0x010307a4: 0x10307a4: lw    v0, 20(v0)
+// 0x010307b0: 0x10307b0: sll   zero, zero, 0
+L_10307b4:
+// 0x010307b4: 0x10307b4: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1951,8 +1951,8 @@ L_10307a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010307a8: 0x10307a8: sll   zero, zero, 0
-// 0x010307ac: 0x10307ac: jalr  v0 sll   zero, zero, 0
+// 0x010307b8: 0x10307b8: sll   zero, zero, 0
+// 0x010307bc: 0x10307bc: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1964,24 +1964,24 @@ L_10307a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010307b4: 0x10307b4: j	 0x10307c8 addiu v0, zero, 1
+// 0x010307c4: 0x10307c4: j	 0x10307d8 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10307c8
+	br L_10307d8
 // --- basic block ---
-L_10307bc:
-// 0x010307bc: 0x10307bc: j	 0x10307c8 addu  v0, zero, zero
+L_10307cc:
+// 0x010307cc: 0x10307cc: j	 0x10307d8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10307c8
+	br L_10307d8
 // --- basic block ---
-L_10307c4:
-// 0x010307c4: 0x10307c4: addiu v0, zero, 1
+L_10307d4:
+// 0x010307d4: 0x10307d4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10307c8:
-// 0x010307c8: 0x10307c8: lw    ra, 28(sp)
-// 0x010307cc: 0x10307cc: lw    s2, 24(sp)
+L_10307d8:
+// 0x010307d8: 0x10307d8: lw    ra, 28(sp)
+// 0x010307dc: 0x10307dc: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1990,7 +1990,7 @@ L_10307c8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010307d0: 0x10307d0: lw    s1, 20(sp)
+// 0x010307e0: 0x10307e0: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1999,7 +1999,7 @@ L_10307c8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010307d4: 0x10307d4: lw    s0, 16(sp)
+// 0x010307e4: 0x10307e4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2008,7 +2008,7 @@ L_10307c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010307d8: 0x10307d8: jr    ra addiu sp, sp, 32
+// 0x010307e8: 0x10307e8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2020,7 +2020,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_obj_short_click_10307e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_short_click_10307f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2058,15 +2058,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010307e0: 0x10307e0: addiu sp, sp, -24
+// 0x010307f0: 0x10307f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010307e4: 0x10307e4: lui   v0, 0x60000
+// 0x010307f4: 0x10307f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010307e8: 0x10307e8: sw    s0, 16(sp)
+// 0x010307f8: 0x10307f8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2075,21 +2075,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010307ec: 0x10307ec: lw    s0, -23892(v0)
+// 0x010307fc: 0x10307fc: lw    s0, -23428(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 8
-// 0x010307f0: 0x10307f0: sll   zero, zero, 0
-// 0x010307f4: 0x10307f4: beq   s0, zero, 0x1030870 sw    ra, 20(sp)
+// 0x01030800: 0x1030800: sll   zero, zero, 0
+// 0x01030804: 0x1030804: beq   s0, zero, 0x1030880 sw    ra, 20(sp)
 	ldloc 8
-	brfalse L_1030870
+	brfalse L_1030880
 // --- basic block ---
-// 0x010307fc: 0x10307fc: lw    v1, 88(s0)
+// 0x0103080c: 0x103080c: lw    v1, 88(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2098,24 +2098,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030800: 0x1030800: sll   zero, zero, 0
-// 0x01030804: 0x1030804: andi  v1, v1, 2
+// 0x01030810: 0x1030810: sll   zero, zero, 0
+// 0x01030814: 0x1030814: andi  v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	and
 	stloc 7
-// 0x01030808: 0x1030808: bne   v1, zero, 0x1030878 addu  a0, s0, zero
+// 0x01030818: 0x1030818: bne   v1, zero, 0x1030888 addu  a0, s0, zero
 	ldloc 7
 	ldloc 8
 	stloc.1
-	brtrue L_1030878
+	brtrue L_1030888
 // --- basic block ---
-// 0x01030810: 0x1030810: jal   0x102f864 sw    zero, -23892(v0)
+// 0x01030820: 0x1030820: jal   0x102f874 sw    zero, -23428(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2124,18 +2124,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::obj_is_active_102f864(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::obj_is_active_102f874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030818: 0x1030818: beq   v0, zero, 0x103087c addu  v0, zero, zero
+// 0x01030828: 0x1030828: beq   v0, zero, 0x103088c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_103087c
+	brfalse L_103088c
 // --- basic block ---
-// 0x01030820: 0x1030820: lw    v0, 96(s0)
+// 0x01030830: 0x1030830: lw    v0, 96(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2144,26 +2144,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030824: 0x1030824: sll   zero, zero, 0
-// 0x01030828: 0x1030828: beq   v0, zero, 0x1030878 lui   v1, 0x20000
+// 0x01030834: 0x1030834: sll   zero, zero, 0
+// 0x01030838: 0x1030838: beq   v0, zero, 0x1030888 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 7
-	brfalse L_1030878
+	brfalse L_1030888
 // --- basic block ---
-// 0x01030830: 0x1030830: lw    a0, 25580(v1)
+// 0x01030840: 0x1030840: lw    a0, 26044(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6395
+	ldc.i4 6511
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030834: 0x1030834: lui   v1, 0x20000
+// 0x01030844: 0x1030844: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01030838: 0x1030838: lw    a2, 4(v0)
+// 0x01030848: 0x1030848: lw    a2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2172,19 +2172,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103083c: 0x103083c: lw    a1, 25584(v1)
+// 0x0103084c: 0x103084c: lw    a1, 26048(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6396
+	ldc.i4 6512
 	add
 	ldelem.i4
 	stloc.2
-// 0x01030840: 0x1030840: jal   0x104bfdc sll   zero, zero, 0
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+// 0x01030850: 0x1030850: jal   0x104bfec sll   zero, zero, 0
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01030848: 0x1030848: lw    v0, 96(s0)
+// 0x01030858: 0x1030858: lw    v0, 96(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2193,8 +2193,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103084c: 0x103084c: sll   zero, zero, 0
-// 0x01030850: 0x1030850: lw    v0, 20(v0)
+// 0x0103085c: 0x103085c: sll   zero, zero, 0
+// 0x01030860: 0x1030860: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2203,8 +2203,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030854: 0x1030854: sll   zero, zero, 0
-// 0x01030858: 0x1030858: jalr  v0 sll   zero, zero, 0
+// 0x01030864: 0x1030864: sll   zero, zero, 0
+// 0x01030868: 0x1030868: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2216,35 +2216,35 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030860: 0x1030860: jal   0x10256e4 sll   zero, zero, 0
+// 0x01030870: 0x1030870: jal   0x10256f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_screen_touched_10256e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_screen_touched_10256f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030868: 0x1030868: j	 0x103087c addiu v0, zero, 1
+// 0x01030878: 0x1030878: j	 0x103088c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_103087c
+	br L_103088c
 // --- basic block ---
-L_1030870:
-// 0x01030870: 0x1030870: j	 0x103087c addu  v0, zero, zero
+L_1030880:
+// 0x01030880: 0x1030880: j	 0x103088c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_103087c
+	br L_103088c
 // --- basic block ---
-L_1030878:
-// 0x01030878: 0x1030878: addiu v0, zero, 1
+L_1030888:
+// 0x01030888: 0x1030888: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_103087c:
-// 0x0103087c: 0x103087c: lw    ra, 20(sp)
-// 0x01030880: 0x1030880: lw    s0, 16(sp)
+L_103088c:
+// 0x0103088c: 0x103088c: lw    ra, 20(sp)
+// 0x01030890: 0x1030890: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2253,7 +2253,7 @@ L_103087c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01030884: 0x1030884: jr    ra addiu sp, sp, 24
+// 0x01030894: 0x1030894: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2265,7 +2265,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_screen_obj_released_103088c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_released_103089c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 s0,int32 v0,int32 ra)
@@ -2303,12 +2303,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103088c: 0x103088c: addiu sp, sp, -24
+// 0x0103089c: 0x103089c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01030890: 0x1030890: sw    s0, 16(sp)
+// 0x010308a0: 0x10308a0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2317,26 +2317,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01030894: 0x1030894: lui   s0, 0x60000
+// 0x010308a4: 0x10308a4: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01030898: 0x1030898: lw    v1, -23892(s0)
+// 0x010308a8: 0x10308a8: lw    v1, -23428(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103089c: 0x103089c: sw    ra, 20(sp)
-// 0x010308a0: 0x10308a0: beq   v1, zero, 0x10308d0 addu  v0, zero, zero
+// 0x010308ac: 0x10308ac: sw    ra, 20(sp)
+// 0x010308b0: 0x10308b0: beq   v1, zero, 0x10308e0 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_10308d0
+	brfalse L_10308e0
 // --- basic block ---
-// 0x010308a8: 0x10308a8: lw    v1, 88(v1)
+// 0x010308b8: 0x10308b8: lw    v1, 88(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2345,24 +2345,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010308ac: 0x10308ac: sll   zero, zero, 0
-// 0x010308b0: 0x10308b0: andi  v1, v1, 2
+// 0x010308bc: 0x10308bc: sll   zero, zero, 0
+// 0x010308c0: 0x10308c0: andi  v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	and
 	stloc 5
-// 0x010308b4: 0x10308b4: beq   v1, zero, 0x10308d0 addiu v0, zero, 1
+// 0x010308c4: 0x10308c4: beq   v1, zero, 0x10308e0 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 8
-	brfalse L_10308d0
+	brfalse L_10308e0
 // --- basic block ---
-// 0x010308bc: 0x10308bc: lui   a0, 0x1030000
+// 0x010308cc: 0x10308cc: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x010308c0: 0x10308c0: jal   0x104fd00 addiu a0, a0, -1848
+// 0x010308d0: 0x10308d0: jal   0x104fd10 addiu a0, a0, -1832
 	ldloc.1
-	ldc.i4 -1848
+	ldc.i4 -1832
 	add
 	stloc.1
 	ldloc.0
@@ -2370,26 +2370,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x010308c8: 0x10308c8: sw    zero, -23892(s0)
+// 0x010308d8: 0x10308d8: sw    zero, -23428(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010308cc: 0x10308cc: addiu v0, zero, 1
+// 0x010308dc: 0x10308dc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_10308d0:
-// 0x010308d0: 0x10308d0: lw    ra, 20(sp)
-// 0x010308d4: 0x10308d4: lw    s0, 16(sp)
+L_10308e0:
+// 0x010308e0: 0x10308e0: lw    ra, 20(sp)
+// 0x010308e4: 0x10308e4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2398,7 +2398,7 @@ L_10308d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010308d8: 0x10308d8: jr    ra addiu sp, sp, 24
+// 0x010308e8: 0x10308e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2410,7 +2410,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_screen_obj_pressed_10308e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_screen_obj_pressed_10308f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -2463,15 +2463,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010308e0: 0x10308e0: addiu sp, sp, -64
+// 0x010308f0: 0x10308f0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010308e4: 0x10308e4: lui   v0, 0x60000
+// 0x010308f4: 0x10308f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010308e8: 0x10308e8: sw    s5, 56(sp)
+// 0x010308f8: 0x10308f8: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2480,7 +2480,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010308ec: 0x10308ec: sw    s4, 52(sp)
+// 0x010308fc: 0x10308fc: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2489,7 +2489,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010308f0: 0x10308f0: sw    s3, 48(sp)
+// 0x01030900: 0x1030900: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2498,7 +2498,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010308f4: 0x10308f4: sw    s2, 44(sp)
+// 0x01030904: 0x1030904: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2507,7 +2507,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010308f8: 0x10308f8: sw    s1, 40(sp)
+// 0x01030908: 0x1030908: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2516,7 +2516,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010308fc: 0x10308fc: sw    s0, 36(sp)
+// 0x0103090c: 0x103090c: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2525,129 +2525,129 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01030900: 0x1030900: sw    ra, 60(sp)
-// 0x01030904: 0x1030904: addu  s1, a0, zero
+// 0x01030910: 0x1030910: sw    ra, 60(sp)
+// 0x01030914: 0x1030914: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01030908: 0x1030908: lw    s0, -23896(v0)
+// 0x01030918: 0x1030918: lw    s0, -23432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5974
+	ldc.i4 -5858
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103090c: 0x103090c: lui   s5, 0x60000
+// 0x0103091c: 0x103091c: lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x01030910: 0x1030910: lui   s4, 0xf0000
+// 0x01030920: 0x1030920: lui   s4, 0xf0000
 	ldc.i4 983040
 	stloc 12
-// 0x01030914: 0x1030914: lui   s3, 0x60000
+// 0x01030924: 0x1030924: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01030918: 0x1030918: j	 0x10309ec lui   s2, 0xf0000
+// 0x01030928: 0x1030928: j	 0x10309fc lui   s2, 0xf0000
 	ldc.i4 983040
 	stloc 10
-	br L_10309ec
+	br L_10309fc
 // --- basic block ---
-L_1030920:
-// 0x01030920: 0x1030920: lh    v1, 80(s0)
+L_1030930:
+// 0x01030930: 0x1030930: lh    v1, 80(s0)
 	ldloc 8
 	ldc.i4.s 80
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01030924: 0x1030924: lh    v0, 82(s0)
+// 0x01030934: 0x1030934: lh    v0, 82(s0)
 	ldloc 8
 	ldc.i4.s 82
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01030928: 0x1030928: bgez  v1, 0x103093c sll   zero, zero, 0
+// 0x01030938: 0x1030938: bgez  v1, 0x103094c sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bge L_103093c
+	bge L_103094c
 // --- basic block ---
-// 0x01030930: 0x1030930: lw    a0, -30068(s4)
+// 0x01030940: 0x1030940: lw    a0, -29604(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030934: 0x1030934: j	 0x1030948 addu  v1, v1, a0
+// 0x01030944: 0x1030944: j	 0x1030958 addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-	br L_1030948
+	br L_1030958
 // --- basic block ---
-L_103093c:
-// 0x0103093c: 0x103093c: lw    a0, -23888(s5)
+L_103094c:
+// 0x0103094c: 0x103094c: lw    a0, -23424(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5972
+	ldc.i4 -5856
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030940: 0x1030940: sll   zero, zero, 0
-// 0x01030944: 0x1030944: addu  v1, v1, a0
+// 0x01030950: 0x1030950: sll   zero, zero, 0
+// 0x01030954: 0x1030954: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-L_1030948:
-// 0x01030948: 0x1030948: bgez  v0, 0x103095c sll   zero, zero, 0
+L_1030958:
+// 0x01030958: 0x1030958: bgez  v0, 0x103096c sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_103095c
+	bge L_103096c
 // --- basic block ---
-// 0x01030950: 0x1030950: lw    a0, -30072(s2)
+// 0x01030960: 0x1030960: lw    a0, -29608(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030954: 0x1030954: j	 0x1030968 addu  v0, v0, a0
+// 0x01030964: 0x1030964: j	 0x1030978 addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-	br L_1030968
+	br L_1030978
 // --- basic block ---
-L_103095c:
-// 0x0103095c: 0x103095c: lw    a0, -23884(s3)
+L_103096c:
+// 0x0103096c: 0x103096c: lw    a0, -23420(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5971
+	ldc.i4 -5855
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030960: 0x1030960: sll   zero, zero, 0
-// 0x01030964: 0x1030964: addu  v0, v0, a0
+// 0x01030970: 0x1030970: sll   zero, zero, 0
+// 0x01030974: 0x1030974: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-L_1030968:
-// 0x01030968: 0x1030968: lh    a0, 84(s0)
+L_1030978:
+// 0x01030978: 0x1030978: lh    a0, 84(s0)
 	ldloc 8
 	ldc.i4.s 84
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0103096c: 0x103096c: lw    a2, 120(s0)
+// 0x0103097c: 0x103097c: lw    a2, 120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2656,39 +2656,39 @@ L_1030968:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030970: 0x1030970: addu  v1, v1, a0
+// 0x01030980: 0x1030980: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01030974: 0x1030974: lw    a0, 0(s1)
+// 0x01030984: 0x1030984: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01030978: 0x1030978: addu  a2, v1, a2
+// 0x01030988: 0x1030988: addu  a2, v1, a2
 	ldloc 7
 	ldloc.3
 	add
 	stloc.3
-// 0x0103097c: 0x103097c: slt   a2, a0, a2
+// 0x0103098c: 0x103098c: slt   a2, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc.3
-// 0x01030980: 0x1030980: lh    a1, 86(s0)
+// 0x01030990: 0x1030990: lh    a1, 86(s0)
 	ldloc 8
 	ldc.i4.s 86
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.2
-// 0x01030984: 0x1030984: bne   a2, zero, 0x10309e4 sll   zero, zero, 0
+// 0x01030994: 0x1030994: bne   a2, zero, 0x10309f4 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10309e4
+	brtrue L_10309f4
 // --- basic block ---
-// 0x0103098c: 0x103098c: lw    a2, 128(s0)
+// 0x0103099c: 0x103099c: lw    a2, 128(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2697,26 +2697,26 @@ L_1030968:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030990: 0x1030990: sll   zero, zero, 0
-// 0x01030994: 0x1030994: addu  v1, v1, a2
+// 0x010309a0: 0x10309a0: sll   zero, zero, 0
+// 0x010309a4: 0x10309a4: addu  v1, v1, a2
 	ldloc 7
 	ldloc.3
 	add
 	stloc 7
-// 0x01030998: 0x1030998: slt   a0, v1, a0
+// 0x010309a8: 0x10309a8: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x0103099c: 0x103099c: bne   a0, zero, 0x10309e4 addu  v0, v0, a1
+// 0x010309ac: 0x10309ac: bne   a0, zero, 0x10309f4 addu  v0, v0, a1
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-	brtrue L_10309e4
+	brtrue L_10309f4
 // --- basic block ---
-// 0x010309a4: 0x10309a4: lw    a0, 124(s0)
+// 0x010309b4: 0x10309b4: lw    a0, 124(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2725,7 +2725,7 @@ L_1030968:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010309a8: 0x10309a8: lw    v1, 4(s1)
+// 0x010309b8: 0x10309b8: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2734,21 +2734,21 @@ L_1030968:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010309ac: 0x10309ac: addu  a0, v0, a0
+// 0x010309bc: 0x10309bc: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x010309b0: 0x10309b0: slt   a0, v1, a0
+// 0x010309c0: 0x10309c0: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x010309b4: 0x10309b4: bne   a0, zero, 0x10309e4 sll   zero, zero, 0
+// 0x010309c4: 0x10309c4: bne   a0, zero, 0x10309f4 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10309e4
+	brtrue L_10309f4
 // --- basic block ---
-// 0x010309bc: 0x10309bc: lw    a0, 132(s0)
+// 0x010309cc: 0x10309cc: lw    a0, 132(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2757,22 +2757,22 @@ L_1030968:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010309c0: 0x10309c0: sll   zero, zero, 0
-// 0x010309c4: 0x10309c4: addu  v0, v0, a0
+// 0x010309d0: 0x10309d0: sll   zero, zero, 0
+// 0x010309d4: 0x10309d4: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x010309c8: 0x10309c8: slt   v1, v0, v1
+// 0x010309d8: 0x10309d8: slt   v1, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 7
-// 0x010309cc: 0x10309cc: bne   v1, zero, 0x10309e4 sll   zero, zero, 0
+// 0x010309dc: 0x10309dc: bne   v1, zero, 0x10309f4 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10309e4
+	brtrue L_10309f4
 // --- basic block ---
-// 0x010309d4: 0x10309d4: jal   0x102f864 addu  a0, s0, zero
+// 0x010309e4: 0x10309e4: jal   0x102f874 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2780,17 +2780,17 @@ L_1030968:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::obj_is_active_102f864(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::obj_is_active_102f874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010309dc: 0x10309dc: bne   v0, zero, 0x10309f4 sll   zero, zero, 0
+// 0x010309ec: 0x10309ec: bne   v0, zero, 0x1030a04 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10309f4
+	brtrue L_1030a04
 // --- basic block ---
-L_10309e4:
-// 0x010309e4: 0x10309e4: lw    s0, 136(s0)
+L_10309f4:
+// 0x010309f4: 0x10309f4: lw    s0, 136(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2799,32 +2799,32 @@ L_10309e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010309e8: 0x10309e8: sll   zero, zero, 0
-L_10309ec:
-// 0x010309ec: 0x10309ec: bne   s0, zero, 0x1030920 sll   zero, zero, 0
+// 0x010309f8: 0x10309f8: sll   zero, zero, 0
+L_10309fc:
+// 0x010309fc: 0x10309fc: bne   s0, zero, 0x1030930 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1030920
+	brtrue L_1030930
 // --- basic block ---
-L_10309f4:
-// 0x010309f4: 0x10309f4: lui   s1, 0x60000
+L_1030a04:
+// 0x01030a04: 0x1030a04: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x010309f8: 0x10309f8: sw    s0, -23892(s1)
+// 0x01030a08: 0x1030a08: sw    s0, -23428(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldloc 8
 	stelem.i4
-// 0x010309fc: 0x10309fc: beq   s0, zero, 0x1030bd4 addu  v0, zero, zero
+// 0x01030a0c: 0x1030a0c: beq   s0, zero, 0x1030be4 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1030bd4
+	brfalse L_1030be4
 // --- basic block ---
-// 0x01030a04: 0x1030a04: jal   0x102f864 addu  a0, s0, zero
+// 0x01030a14: 0x1030a14: jal   0x102f874 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2832,28 +2832,28 @@ L_10309f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::obj_is_active_102f864(int32,int32,int32,int32,int32)
+	call int32 Cibyl34::obj_is_active_102f874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030a0c: 0x1030a0c: beq   v0, zero, 0x1030bd4 addiu v0, zero, 1
+// 0x01030a1c: 0x1030a1c: beq   v0, zero, 0x1030be4 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_1030bd4
+	brfalse L_1030be4
 // --- basic block ---
-// 0x01030a14: 0x1030a14: lw    v0, -23892(s1)
+// 0x01030a24: 0x1030a24: lw    v0, -23428(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030a18: 0x1030a18: sll   zero, zero, 0
-// 0x01030a1c: 0x1030a1c: lw    v0, 108(v0)
+// 0x01030a28: 0x1030a28: sll   zero, zero, 0
+// 0x01030a2c: 0x1030a2c: lw    v0, 108(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2862,14 +2862,14 @@ L_10309f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030a20: 0x1030a20: sll   zero, zero, 0
-// 0x01030a24: 0x1030a24: beq   v0, zero, 0x1030a38 addu  s0, zero, zero
+// 0x01030a30: 0x1030a30: sll   zero, zero, 0
+// 0x01030a34: 0x1030a34: beq   v0, zero, 0x1030a48 addu  s0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_1030a38
+	brfalse L_1030a48
 // --- basic block ---
-// 0x01030a2c: 0x1030a2c: jalr  v0 sll   zero, zero, 0
+// 0x01030a3c: 0x1030a3c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2881,62 +2881,62 @@ L_10309f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030a34: 0x1030a34: addu  s0, v0, zero
+// 0x01030a44: 0x1030a44: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_1030a38:
-// 0x01030a38: 0x1030a38: lui   v0, 0x60000
+L_1030a48:
+// 0x01030a48: 0x1030a48: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01030a3c: 0x1030a3c: lw    v1, -23892(v0)
+// 0x01030a4c: 0x1030a4c: lw    v1, -23428(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030a40: 0x1030a40: addiu v0, s0, 10
+// 0x01030a50: 0x1030a50: addiu v0, s0, 10
 	ldloc 8
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x01030a44: 0x1030a44: sll   v0, v0, 2
+// 0x01030a54: 0x1030a54: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01030a48: 0x1030a48: addu  v0, v1, v0
+// 0x01030a58: 0x1030a58: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01030a4c: 0x1030a4c: lw    a2, 0(v0)
+// 0x01030a5c: 0x1030a5c: lw    a2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01030a50: 0x1030a50: sll   zero, zero, 0
-// 0x01030a54: 0x1030a54: beq   a2, zero, 0x1030b54 sll   zero, zero, 0
+// 0x01030a60: 0x1030a60: sll   zero, zero, 0
+// 0x01030a64: 0x1030a64: beq   a2, zero, 0x1030b64 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1030b54
+	brfalse L_1030b64
 // --- basic block ---
-// 0x01030a5c: 0x1030a5c: lh    v0, 80(v1)
+// 0x01030a6c: 0x1030a6c: lh    v0, 80(v1)
 	ldloc 7
 	ldc.i4.s 80
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01030a60: 0x1030a60: lh    a0, 82(v1)
+// 0x01030a70: 0x1030a70: lh    a0, 82(v1)
 	ldloc 7
 	ldc.i4.s 82
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01030a64: 0x1030a64: sw    v0, 24(sp)
+// 0x01030a74: 0x1030a74: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2945,7 +2945,7 @@ L_1030a38:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01030a68: 0x1030a68: bgez  v0, 0x1030a80 sw    a0, 28(sp)
+// 0x01030a78: 0x1030a78: bgez  v0, 0x1030a90 sw    a0, 28(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -2956,48 +2956,48 @@ L_1030a38:
 	ldloc.1
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1030a80
+	bge L_1030a90
 // --- basic block ---
-// 0x01030a70: 0x1030a70: lui   a0, 0xf0000
+// 0x01030a80: 0x1030a80: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x01030a74: 0x1030a74: lw    a0, -30068(a0)
+// 0x01030a84: 0x1030a84: lw    a0, -29604(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030a78: 0x1030a78: j	 0x1030a90 addu  v0, v0, a0
+// 0x01030a88: 0x1030a88: j	 0x1030aa0 addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-	br L_1030a90
+	br L_1030aa0
 // --- basic block ---
-L_1030a80:
-// 0x01030a80: 0x1030a80: lui   a0, 0x60000
+L_1030a90:
+// 0x01030a90: 0x1030a90: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01030a84: 0x1030a84: lw    a0, -23888(a0)
+// 0x01030a94: 0x1030a94: lw    a0, -23424(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5972
+	ldc.i4 -5856
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030a88: 0x1030a88: sll   zero, zero, 0
-// 0x01030a8c: 0x1030a8c: addu  v0, v0, a0
+// 0x01030a98: 0x1030a98: sll   zero, zero, 0
+// 0x01030a9c: 0x1030a9c: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-L_1030a90:
-// 0x01030a90: 0x1030a90: sw    v0, 24(sp)
+L_1030aa0:
+// 0x01030aa0: 0x1030aa0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3006,7 +3006,7 @@ L_1030a90:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01030a94: 0x1030a94: lw    v0, 28(sp)
+// 0x01030aa4: 0x1030aa4: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3015,51 +3015,51 @@ L_1030a90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030a98: 0x1030a98: sll   zero, zero, 0
-// 0x01030a9c: 0x1030a9c: bgez  v0, 0x1030ab4 lui   a0, 0x60000
+// 0x01030aa8: 0x1030aa8: sll   zero, zero, 0
+// 0x01030aac: 0x1030aac: bgez  v0, 0x1030ac4 lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
 	ldc.i4.s 0
-	bge L_1030ab4
+	bge L_1030ac4
 // --- basic block ---
-// 0x01030aa4: 0x1030aa4: lui   a0, 0xf0000
+// 0x01030ab4: 0x1030ab4: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x01030aa8: 0x1030aa8: lw    a0, -30072(a0)
+// 0x01030ab8: 0x1030ab8: lw    a0, -29608(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030aac: 0x1030aac: j	 0x1030ac0 addu  v0, a0, v0
+// 0x01030abc: 0x1030abc: j	 0x1030ad0 addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-	br L_1030ac0
+	br L_1030ad0
 // --- basic block ---
-L_1030ab4:
-// 0x01030ab4: 0x1030ab4: lw    a0, -23884(a0)
+L_1030ac4:
+// 0x01030ac4: 0x1030ac4: lw    a0, -23420(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5971
+	ldc.i4 -5855
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030ab8: 0x1030ab8: sll   zero, zero, 0
-// 0x01030abc: 0x1030abc: addu  v0, a0, v0
+// 0x01030ac8: 0x1030ac8: sll   zero, zero, 0
+// 0x01030acc: 0x1030acc: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-L_1030ac0:
-// 0x01030ac0: 0x1030ac0: sw    v0, 28(sp)
+L_1030ad0:
+// 0x01030ad0: 0x1030ad0: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3068,7 +3068,7 @@ L_1030ac0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01030ac4: 0x1030ac4: lw    a0, 28(sp)
+// 0x01030ad4: 0x1030ad4: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3077,24 +3077,24 @@ L_1030ac0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030ac8: 0x1030ac8: lh    v0, 86(v1)
+// 0x01030ad8: 0x1030ad8: lh    v0, 86(v1)
 	ldloc 7
 	ldc.i4.s 86
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01030acc: 0x1030acc: lh    v1, 84(v1)
+// 0x01030adc: 0x1030adc: lh    v1, 84(v1)
 	ldloc 7
 	ldc.i4.s 84
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01030ad0: 0x1030ad0: addu  v0, a0, v0
+// 0x01030ae0: 0x1030ae0: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01030ad4: 0x1030ad4: lw    a0, 24(sp)
+// 0x01030ae4: 0x1030ae4: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3103,18 +3103,18 @@ L_1030ac0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030ad8: 0x1030ad8: addiu a1, zero, 1
+// 0x01030ae8: 0x1030ae8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01030adc: 0x1030adc: addu  v1, a0, v1
+// 0x01030aec: 0x1030aec: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01030ae0: 0x1030ae0: addu  a0, zero, zero
+// 0x01030af0: 0x1030af0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01030ae4: 0x1030ae4: sw    v1, 24(sp)
+// 0x01030af4: 0x1030af4: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3123,7 +3123,7 @@ L_1030ac0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01030ae8: 0x1030ae8: jal   0x10a1918 sw    v0, 28(sp)
+// 0x01030af8: 0x1030af8: jal   0x10a1f60 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3137,44 +3137,44 @@ L_1030ac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030af0: 0x1030af0: bne   v0, zero, 0x1030b3c lui   v1, 0x60000
+// 0x01030b00: 0x1030b00: bne   v0, zero, 0x1030b4c lui   v1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 7
-	brtrue L_1030b3c
+	brtrue L_1030b4c
 // --- basic block ---
-// 0x01030af8: 0x1030af8: lw    v0, -23892(v1)
+// 0x01030b08: 0x1030b08: lw    v0, -23428(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030afc: 0x1030afc: addiu s0, s0, 10
+// 0x01030b0c: 0x1030b0c: addiu s0, s0, 10
 	ldloc 8
 	ldc.i4.s 10
 	add
 	stloc 8
-// 0x01030b00: 0x1030b00: lw    v1, 0(v0)
+// 0x01030b10: 0x1030b10: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01030b04: 0x1030b04: sll   s0, s0, 2
+// 0x01030b14: 0x1030b14: sll   s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x01030b08: 0x1030b08: sw    v1, 16(sp)
+// 0x01030b18: 0x1030b18: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3183,41 +3183,41 @@ L_1030ac0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01030b0c: 0x1030b0c: addu  v0, v0, s0
+// 0x01030b1c: 0x1030b1c: addu  v0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x01030b10: 0x1030b10: lw    v0, 0(v0)
+// 0x01030b20: 0x1030b20: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01030b14: 0x1030b14: lui   a1, 0x10000
+// 0x01030b24: 0x1030b24: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01030b18: 0x1030b18: lui   a3, 0x10000
+// 0x01030b28: 0x1030b28: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01030b1c: 0x1030b1c: addiu a1, a1, -16588
+// 0x01030b2c: 0x1030b2c: addiu a1, a1, -16588
 	ldloc.2
 	ldc.i4 -16588
 	add
 	stloc.2
-// 0x01030b20: 0x1030b20: addiu a3, a3, -15948
+// 0x01030b30: 0x1030b30: addiu a3, a3, -15948
 	ldloc 4
 	ldc.i4 -15948
 	add
 	stloc 4
-// 0x01030b24: 0x1030b24: addiu a0, zero, 4
+// 0x01030b34: 0x1030b34: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01030b28: 0x1030b28: addiu a2, zero, 671
+// 0x01030b38: 0x1030b38: addiu a2, zero, 671
 	ldc.i4 671
 	stloc.3
-// 0x01030b2c: 0x1030b2c: jal   0x100449c sw    v0, 20(sp)
+// 0x01030b3c: 0x1030b3c: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3236,25 +3236,25 @@ L_1030ac0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030b34: 0x1030b34: j	 0x1030bd4 addiu v0, zero, 1
+// 0x01030b44: 0x1030b44: j	 0x1030be4 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1030bd4
+	br L_1030be4
 // --- basic block ---
-L_1030b3c:
-// 0x01030b3c: 0x1030b3c: lw    v1, -23892(v1)
+L_1030b4c:
+// 0x01030b4c: 0x1030b4c: lw    v1, -23428(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030b40: 0x1030b40: addu  a0, v0, zero
+// 0x01030b50: 0x1030b50: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01030b44: 0x1030b44: lw    a2, 92(v1)
+// 0x01030b54: 0x1030b54: lw    a2, 92(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3263,12 +3263,12 @@ L_1030b3c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030b48: 0x1030b48: addiu a1, sp, 24
+// 0x01030b58: 0x1030b58: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01030b4c: 0x1030b4c: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01030b5c: 0x1030b5c: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3276,13 +3276,13 @@ L_1030b3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1030b54:
-// 0x01030b54: 0x1030b54: jal   0x104e31c lui   s0, 0x60000
+L_1030b64:
+// 0x01030b64: 0x1030b64: jal   0x104e32c lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
 	ldloc.0
@@ -3290,22 +3290,22 @@ L_1030b54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_refresh_104e31c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_refresh_104e32c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01030b5c: 0x1030b5c: lw    v0, -23892(s0)
+// 0x01030b6c: 0x1030b6c: lw    v0, -23428(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030b60: 0x1030b60: sll   zero, zero, 0
-// 0x01030b64: 0x1030b64: lw    v1, 88(v0)
+// 0x01030b70: 0x1030b70: sll   zero, zero, 0
+// 0x01030b74: 0x1030b74: lw    v1, 88(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3314,17 +3314,17 @@ L_1030b54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030b68: 0x1030b68: sll   zero, zero, 0
-// 0x01030b6c: 0x1030b6c: andi  v1, v1, 2
+// 0x01030b78: 0x1030b78: sll   zero, zero, 0
+// 0x01030b7c: 0x1030b7c: andi  v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	and
 	stloc 7
-// 0x01030b70: 0x1030b70: beq   v1, zero, 0x1030bd0 sll   zero, zero, 0
+// 0x01030b80: 0x1030b80: beq   v1, zero, 0x1030be0 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1030bd0
+	brfalse L_1030be0
 // --- basic block ---
-// 0x01030b78: 0x1030b78: lw    v0, 96(v0)
+// 0x01030b88: 0x1030b88: lw    v0, 96(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3333,26 +3333,26 @@ L_1030b54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030b7c: 0x1030b7c: sll   zero, zero, 0
-// 0x01030b80: 0x1030b80: beq   v0, zero, 0x1030bc0 lui   v1, 0x20000
+// 0x01030b8c: 0x1030b8c: sll   zero, zero, 0
+// 0x01030b90: 0x1030b90: beq   v0, zero, 0x1030bd0 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 7
-	brfalse L_1030bc0
+	brfalse L_1030bd0
 // --- basic block ---
-// 0x01030b88: 0x1030b88: lw    a0, 25580(v1)
+// 0x01030b98: 0x1030b98: lw    a0, 26044(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6395
+	ldc.i4 6511
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030b8c: 0x1030b8c: lui   v1, 0x20000
+// 0x01030b9c: 0x1030b9c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01030b90: 0x1030b90: lw    a2, 4(v0)
+// 0x01030ba0: 0x1030ba0: lw    a2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3361,29 +3361,29 @@ L_1030b54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01030b94: 0x1030b94: lw    a1, 25584(v1)
+// 0x01030ba4: 0x1030ba4: lw    a1, 26048(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6396
+	ldc.i4 6512
 	add
 	ldelem.i4
 	stloc.2
-// 0x01030b98: 0x1030b98: jal   0x104bfdc sll   zero, zero, 0
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+// 0x01030ba8: 0x1030ba8: jal   0x104bfec sll   zero, zero, 0
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01030ba0: 0x1030ba0: lw    v0, -23892(s0)
+// 0x01030bb0: 0x1030bb0: lw    v0, -23428(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5973
+	ldc.i4 -5857
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030ba4: 0x1030ba4: sll   zero, zero, 0
-// 0x01030ba8: 0x1030ba8: lw    v0, 96(v0)
+// 0x01030bb4: 0x1030bb4: sll   zero, zero, 0
+// 0x01030bb8: 0x1030bb8: lw    v0, 96(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3392,8 +3392,8 @@ L_1030b54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030bac: 0x1030bac: sll   zero, zero, 0
-// 0x01030bb0: 0x1030bb0: lw    v0, 20(v0)
+// 0x01030bbc: 0x1030bbc: sll   zero, zero, 0
+// 0x01030bc0: 0x1030bc0: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3402,8 +3402,8 @@ L_1030b54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030bb4: 0x1030bb4: sll   zero, zero, 0
-// 0x01030bb8: 0x1030bb8: jalr  v0 sll   zero, zero, 0
+// 0x01030bc4: 0x1030bc4: sll   zero, zero, 0
+// 0x01030bc8: 0x1030bc8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3415,16 +3415,16 @@ L_1030b54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1030bc0:
-// 0x01030bc0: 0x1030bc0: lui   a1, 0x1030000
+L_1030bd0:
+// 0x01030bd0: 0x1030bd0: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x01030bc4: 0x1030bc4: addiu a1, a1, -1848
+// 0x01030bd4: 0x1030bd4: addiu a1, a1, -1832
 	ldloc.2
-	ldc.i4 -1848
+	ldc.i4 -1832
 	add
 	stloc.2
-// 0x01030bc8: 0x1030bc8: jal   0x104fe98 addiu a0, zero, 100
+// 0x01030bd8: 0x1030bd8: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -3432,18 +3432,18 @@ L_1030bc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1030bd0:
-// 0x01030bd0: 0x1030bd0: addiu v0, zero, 1
+L_1030be0:
+// 0x01030be0: 0x1030be0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1030bd4:
-// 0x01030bd4: 0x1030bd4: lw    ra, 60(sp)
-// 0x01030bd8: 0x1030bd8: lw    s5, 56(sp)
+L_1030be4:
+// 0x01030be4: 0x1030be4: lw    ra, 60(sp)
+// 0x01030be8: 0x1030be8: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3452,7 +3452,7 @@ L_1030bd4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01030bdc: 0x1030bdc: lw    s4, 52(sp)
+// 0x01030bec: 0x1030bec: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3461,7 +3461,7 @@ L_1030bd4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01030be0: 0x1030be0: lw    s3, 48(sp)
+// 0x01030bf0: 0x1030bf0: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3470,7 +3470,7 @@ L_1030bd4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01030be4: 0x1030be4: lw    s2, 44(sp)
+// 0x01030bf4: 0x1030bf4: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3479,7 +3479,7 @@ L_1030bd4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01030be8: 0x1030be8: lw    s1, 40(sp)
+// 0x01030bf8: 0x1030bf8: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3488,7 +3488,7 @@ L_1030bd4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01030bec: 0x1030bec: lw    s0, 36(sp)
+// 0x01030bfc: 0x1030bfc: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3497,7 +3497,7 @@ L_1030bd4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01030bf0: 0x1030bf0: jr    ra addiu sp, sp, 64
+// 0x01030c00: 0x1030c00: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3509,7 +3509,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void roadmap_gps_no_link_control_1030bf8()
+.method public static void roadmap_gps_no_link_control_1030c08()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3520,13 +3520,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1030bf8:
-// 0x01030bf8: 0x1030bf8: jr    ra sll   zero, zero, 0
+L_1030c08:
+// 0x01030c08: 0x1030c08: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_gps_no_periodic_control_1030c00()
+.method public static void roadmap_gps_no_periodic_control_1030c10()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3537,13 +3537,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1030c00:
-// 0x01030c00: 0x1030c00: jr    ra sll   zero, zero, 0
+L_1030c10:
+// 0x01030c10: 0x1030c10: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_gps_reception_state_1030c08()
+.method public static int32 roadmap_gps_reception_state_1030c18()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3560,25 +3560,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030c08: 0x1030c08: lui   v0, 0x60000
+// 0x01030c18: 0x1030c18: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01030c0c: 0x1030c0c: lw    v0, -18616(v0)
+// 0x01030c1c: 0x1030c1c: lw    v0, -18152(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4654
+	ldc.i4 -4538
 	add
 	ldelem.i4
 	stloc.0
-// 0x01030c10: 0x1030c10: jr    ra sll   zero, zero, 0
+// 0x01030c20: 0x1030c20: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_gps_set_fix_1030c18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_set_fix_1030c28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s3,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -3625,15 +3625,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030c18: 0x1030c18: addiu sp, sp, -40
+// 0x01030c28: 0x1030c28: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01030c1c: 0x1030c1c: lui   v0, 0x60000
+// 0x01030c2c: 0x1030c2c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01030c20: 0x1030c20: sw    s3, 32(sp)
+// 0x01030c30: 0x1030c30: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3642,7 +3642,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01030c24: 0x1030c24: sw    s2, 28(sp)
+// 0x01030c34: 0x1030c34: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3651,7 +3651,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01030c28: 0x1030c28: sw    s1, 24(sp)
+// 0x01030c38: 0x1030c38: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3660,13 +3660,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01030c2c: 0x1030c2c: addu  s2, a1, zero
+// 0x01030c3c: 0x1030c3c: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01030c30: 0x1030c30: addu  s1, a0, zero
+// 0x01030c40: 0x1030c40: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01030c34: 0x1030c34: sw    s0, 20(sp)
+// 0x01030c44: 0x1030c44: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3675,34 +3675,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01030c38: 0x1030c38: addiu v1, v0, -18120
+// 0x01030c48: 0x1030c48: addiu v1, v0, -17656
 	ldloc 7
-	ldc.i4 -18120
+	ldc.i4 -17656
 	add
 	stloc 11
-// 0x01030c3c: 0x1030c3c: addiu a1, zero, 1
+// 0x01030c4c: 0x1030c4c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01030c40: 0x1030c40: lui   a0, 0x60000
+// 0x01030c50: 0x1030c50: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01030c44: 0x1030c44: lui   s0, 0x60000
+// 0x01030c54: 0x1030c54: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01030c48: 0x1030c48: lui   s3, 0x60000
+// 0x01030c58: 0x1030c58: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01030c4c: 0x1030c4c: sw    ra, 36(sp)
-// 0x01030c50: 0x1030c50: sw    a1, -18456(a0)
+// 0x01030c5c: 0x1030c5c: sw    ra, 36(sp)
+// 0x01030c60: 0x1030c60: sw    a1, -17992(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4614
+	ldc.i4 -4498
 	add
 	ldloc.2
 	stelem.i4
-// 0x01030c54: 0x1030c54: sw    s2, 4(v1)
+// 0x01030c64: 0x1030c64: sw    s2, 4(v1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3711,48 +3711,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01030c58: 0x1030c58: sw    s1, -18120(v0)
+// 0x01030c68: 0x1030c68: sw    s1, -17656(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4530
+	ldc.i4 -4414
 	add
 	ldloc 9
 	stelem.i4
-// 0x01030c5c: 0x1030c5c: addiu s0, s0, -18452
+// 0x01030c6c: 0x1030c6c: addiu s0, s0, -17988
 	ldloc 6
-	ldc.i4 -18452
+	ldc.i4 -17988
 	add
 	stloc 6
-// 0x01030c60: 0x1030c60: addiu s3, s3, -18388
+// 0x01030c70: 0x1030c70: addiu s3, s3, -17924
 	ldloc 8
-	ldc.i4 -18388
+	ldc.i4 -17924
 	add
 	stloc 8
-L_1030c64:
-// 0x01030c64: 0x1030c64: lw    v0, 0(s0)
+L_1030c74:
+// 0x01030c74: 0x1030c74: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01030c68: 0x1030c68: addu  a0, s1, zero
+// 0x01030c78: 0x1030c78: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01030c6c: 0x1030c6c: addiu s0, s0, 4
+// 0x01030c7c: 0x1030c7c: addiu s0, s0, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-// 0x01030c70: 0x1030c70: beq   v0, zero, 0x1030c88 addu  a1, s2, zero
+// 0x01030c80: 0x1030c80: beq   v0, zero, 0x1030c98 addu  a1, s2, zero
 	ldloc 7
 	ldloc 10
 	stloc.2
-	brfalse L_1030c88
+	brfalse L_1030c98
 // --- basic block ---
-// 0x01030c78: 0x1030c78: jalr  v0 sll   zero, zero, 0
+// 0x01030c88: 0x1030c88: jalr  v0 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
 	ldloc.1
@@ -3764,14 +3764,14 @@ L_1030c64:
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x01030c80: 0x1030c80: bne   s0, s3, 0x1030c64 sll   zero, zero, 0
+// 0x01030c90: 0x1030c90: bne   s0, s3, 0x1030c74 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	bne.un L_1030c64
+	bne.un L_1030c74
 // --- basic block ---
-L_1030c88:
-// 0x01030c88: 0x1030c88: lw    ra, 36(sp)
-// 0x01030c8c: 0x1030c8c: lw    s3, 32(sp)
+L_1030c98:
+// 0x01030c98: 0x1030c98: lw    ra, 36(sp)
+// 0x01030c9c: 0x1030c9c: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3780,7 +3780,7 @@ L_1030c88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01030c90: 0x1030c90: lw    s2, 28(sp)
+// 0x01030ca0: 0x1030ca0: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3789,7 +3789,7 @@ L_1030c88:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01030c94: 0x1030c94: lw    s1, 24(sp)
+// 0x01030ca4: 0x1030ca4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3798,7 +3798,7 @@ L_1030c88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01030c98: 0x1030c98: lw    s0, 20(sp)
+// 0x01030ca8: 0x1030ca8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3807,7 +3807,7 @@ L_1030c88:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01030c9c: 0x1030c9c: jr    ra addiu sp, sp, 40
+// 0x01030cac: 0x1030cac: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3819,7 +3819,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_gps_get_fix_1030ca4()
+.method public static int32 roadmap_gps_get_fix_1030cb4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3839,35 +3839,35 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030ca4: 0x1030ca4: lui   v0, 0x60000
+// 0x01030cb4: 0x1030cb4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01030ca8: 0x1030ca8: lw    v1, -18456(v0)
+// 0x01030cb8: 0x1030cb8: lw    v1, -17992(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4614
+	ldc.i4 -4498
 	add
 	ldelem.i4
 	stloc.1
-// 0x01030cac: 0x1030cac: sll   zero, zero, 0
-// 0x01030cb0: 0x1030cb0: beq   v1, zero, 0x1030cc0 addu  v0, zero, zero
+// 0x01030cbc: 0x1030cbc: sll   zero, zero, 0
+// 0x01030cc0: 0x1030cc0: beq   v1, zero, 0x1030cd0 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_1030cc0
+	brfalse L_1030cd0
 // --- basic block ---
-// 0x01030cb8: 0x1030cb8: lui   v0, 0x60000
+// 0x01030cc8: 0x1030cc8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01030cbc: 0x1030cbc: addiu v0, v0, -18120
+// 0x01030ccc: 0x1030ccc: addiu v0, v0, -17656
 	ldloc.0
-	ldc.i4 -18120
+	ldc.i4 -17656
 	add
 	stloc.0
-L_1030cc0:
-// 0x01030cc0: 0x1030cc0: jr    ra sll   zero, zero, 0
+L_1030cd0:
+// 0x01030cd0: 0x1030cd0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -3875,7 +3875,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_gps_call_loggers_1030cc8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_call_loggers_1030cd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 s2,int32 ra,int32 v1)
@@ -3919,12 +3919,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030cc8: 0x1030cc8: addiu sp, sp, -32
+// 0x01030cd8: 0x1030cd8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01030ccc: 0x1030ccc: sw    s1, 20(sp)
+// 0x01030cdc: 0x1030cdc: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3933,7 +3933,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01030cd0: 0x1030cd0: sw    s0, 16(sp)
+// 0x01030ce0: 0x1030ce0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3942,13 +3942,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01030cd4: 0x1030cd4: lui   s1, 0x60000
+// 0x01030ce4: 0x1030ce4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01030cd8: 0x1030cd8: lui   s0, 0x60000
+// 0x01030ce8: 0x1030ce8: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01030cdc: 0x1030cdc: sw    s2, 24(sp)
+// 0x01030cec: 0x1030cec: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3957,40 +3957,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01030ce0: 0x1030ce0: sw    ra, 28(sp)
-// 0x01030ce4: 0x1030ce4: addu  s2, a0, zero
+// 0x01030cf0: 0x1030cf0: sw    ra, 28(sp)
+// 0x01030cf4: 0x1030cf4: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01030ce8: 0x1030ce8: addiu s0, s0, -18684
+// 0x01030cf8: 0x1030cf8: addiu s0, s0, -18220
 	ldloc 5
-	ldc.i4 -18684
+	ldc.i4 -18220
 	add
 	stloc 5
-// 0x01030cec: 0x1030cec: addiu s1, s1, -18620
+// 0x01030cfc: 0x1030cfc: addiu s1, s1, -18156
 	ldloc 7
-	ldc.i4 -18620
+	ldc.i4 -18156
 	add
 	stloc 7
-L_1030cf0:
-// 0x01030cf0: 0x1030cf0: lw    v0, 0(s0)
+L_1030d00:
+// 0x01030d00: 0x1030d00: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01030cf4: 0x1030cf4: addu  a0, s2, zero
+// 0x01030d04: 0x1030d04: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01030cf8: 0x1030cf8: beq   v0, zero, 0x1030d10 addiu s0, s0, 4
+// 0x01030d08: 0x1030d08: beq   v0, zero, 0x1030d20 addiu s0, s0, 4
 	ldloc 8
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brfalse L_1030d10
+	brfalse L_1030d20
 // --- basic block ---
-// 0x01030d00: 0x1030d00: jalr  v0 sll   zero, zero, 0
+// 0x01030d10: 0x1030d10: jalr  v0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -4002,14 +4002,14 @@ L_1030cf0:
 	stloc 11
 	stloc 8
 // --- basic block ---
-// 0x01030d08: 0x1030d08: bne   s0, s1, 0x1030cf0 sll   zero, zero, 0
+// 0x01030d18: 0x1030d18: bne   s0, s1, 0x1030d00 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1030cf0
+	bne.un L_1030d00
 // --- basic block ---
-L_1030d10:
-// 0x01030d10: 0x1030d10: lw    ra, 28(sp)
-// 0x01030d14: 0x1030d14: lw    s2, 24(sp)
+L_1030d20:
+// 0x01030d20: 0x1030d20: lw    ra, 28(sp)
+// 0x01030d24: 0x1030d24: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4018,7 +4018,7 @@ L_1030d10:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01030d18: 0x1030d18: lw    s1, 20(sp)
+// 0x01030d28: 0x1030d28: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4027,7 +4027,7 @@ L_1030d10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030d1c: 0x1030d1c: lw    s0, 16(sp)
+// 0x01030d2c: 0x1030d2c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4036,7 +4036,7 @@ L_1030d10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01030d20: 0x1030d20: jr    ra addiu sp, sp, 32
+// 0x01030d30: 0x1030d30: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4048,7 +4048,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_gps_get_received_time_1030d28()
+.method public static int32 roadmap_gps_get_received_time_1030d38()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -4065,25 +4065,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030d28: 0x1030d28: lui   v0, 0x60000
+// 0x01030d38: 0x1030d38: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01030d2c: 0x1030d2c: lw    v0, -18548(v0)
+// 0x01030d3c: 0x1030d3c: lw    v0, -18084(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldelem.i4
 	stloc.0
-// 0x01030d30: 0x1030d30: jr    ra sll   zero, zero, 0
+// 0x01030d40: 0x1030d40: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_gps_register_listener_1030d38(int32,int32,int32)
+.method public static int32 roadmap_gps_register_listener_1030d48(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -4112,56 +4112,56 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030d38: 0x1030d38: lui   v1, 0x60000
+// 0x01030d48: 0x1030d48: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01030d3c: 0x1030d3c: addiu v1, v1, -18544
+// 0x01030d4c: 0x1030d4c: addiu v1, v1, -18080
 	ldloc.3
-	ldc.i4 -18544
+	ldc.i4 -18080
 	add
 	stloc.3
-// 0x01030d40: 0x1030d40: addu  v0, zero, zero
+// 0x01030d50: 0x1030d50: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01030d44: 0x1030d44: addiu a1, zero, 16
+// 0x01030d54: 0x1030d54: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.1
-L_1030d48:
-// 0x01030d48: 0x1030d48: lw    a2, 0(v1)
+L_1030d58:
+// 0x01030d58: 0x1030d58: lw    a2, 0(v1)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01030d4c: 0x1030d4c: sll   zero, zero, 0
-// 0x01030d50: 0x1030d50: bne   a2, zero, 0x1030d70 addiu v1, v1, 4
+// 0x01030d5c: 0x1030d5c: sll   zero, zero, 0
+// 0x01030d60: 0x1030d60: bne   a2, zero, 0x1030d80 addiu v1, v1, 4
 	ldloc.2
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-	brtrue L_1030d70
+	brtrue L_1030d80
 // --- basic block ---
-// 0x01030d58: 0x1030d58: lui   v1, 0x60000
+// 0x01030d68: 0x1030d68: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01030d5c: 0x1030d5c: sll   v0, v0, 2
+// 0x01030d6c: 0x1030d6c: sll   v0, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01030d60: 0x1030d60: addiu v1, v1, -18544
+// 0x01030d70: 0x1030d70: addiu v1, v1, -18080
 	ldloc.3
-	ldc.i4 -18544
+	ldc.i4 -18080
 	add
 	stloc.3
-// 0x01030d64: 0x1030d64: addu  v0, v0, v1
+// 0x01030d74: 0x1030d74: addu  v0, v0, v1
 	ldloc 4
 	ldloc.3
 	add
 	stloc 4
-// 0x01030d68: 0x1030d68: jr    ra sw    a0, 0(v0)
+// 0x01030d78: 0x1030d78: jr    ra sw    a0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4170,18 +4170,18 @@ L_1030d48:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1030d70:
-// 0x01030d70: 0x1030d70: addiu v0, v0, 1
+L_1030d80:
+// 0x01030d80: 0x1030d80: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01030d74: 0x1030d74: bne   v0, a1, 0x1030d48 sll   zero, zero, 0
+// 0x01030d84: 0x1030d84: bne   v0, a1, 0x1030d58 sll   zero, zero, 0
 	ldloc 4
 	ldloc.1
-	bne.un L_1030d48
+	bne.un L_1030d58
 // --- basic block ---
-// 0x01030d7c: 0x1030d7c: jr    ra sll   zero, zero, 0
+// 0x01030d8c: 0x1030d8c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -4189,7 +4189,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_gps_register_fix_listener_1030d84(int32,int32,int32)
+.method public static int32 roadmap_gps_register_fix_listener_1030d94(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -4218,56 +4218,56 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030d84: 0x1030d84: lui   v1, 0x60000
+// 0x01030d94: 0x1030d94: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01030d88: 0x1030d88: addiu v1, v1, -18452
+// 0x01030d98: 0x1030d98: addiu v1, v1, -17988
 	ldloc.3
-	ldc.i4 -18452
+	ldc.i4 -17988
 	add
 	stloc.3
-// 0x01030d8c: 0x1030d8c: addu  v0, zero, zero
+// 0x01030d9c: 0x1030d9c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01030d90: 0x1030d90: addiu a1, zero, 16
+// 0x01030da0: 0x1030da0: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.1
-L_1030d94:
-// 0x01030d94: 0x1030d94: lw    a2, 0(v1)
+L_1030da4:
+// 0x01030da4: 0x1030da4: lw    a2, 0(v1)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01030d98: 0x1030d98: sll   zero, zero, 0
-// 0x01030d9c: 0x1030d9c: bne   a2, zero, 0x1030dbc addiu v1, v1, 4
+// 0x01030da8: 0x1030da8: sll   zero, zero, 0
+// 0x01030dac: 0x1030dac: bne   a2, zero, 0x1030dcc addiu v1, v1, 4
 	ldloc.2
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-	brtrue L_1030dbc
+	brtrue L_1030dcc
 // --- basic block ---
-// 0x01030da4: 0x1030da4: lui   v1, 0x60000
+// 0x01030db4: 0x1030db4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01030da8: 0x1030da8: sll   v0, v0, 2
+// 0x01030db8: 0x1030db8: sll   v0, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01030dac: 0x1030dac: addiu v1, v1, -18452
+// 0x01030dbc: 0x1030dbc: addiu v1, v1, -17988
 	ldloc.3
-	ldc.i4 -18452
+	ldc.i4 -17988
 	add
 	stloc.3
-// 0x01030db0: 0x1030db0: addu  v0, v0, v1
+// 0x01030dc0: 0x1030dc0: addu  v0, v0, v1
 	ldloc 4
 	ldloc.3
 	add
 	stloc 4
-// 0x01030db4: 0x1030db4: jr    ra sw    a0, 0(v0)
+// 0x01030dc4: 0x1030dc4: jr    ra sw    a0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4276,18 +4276,18 @@ L_1030d94:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1030dbc:
-// 0x01030dbc: 0x1030dbc: addiu v0, v0, 1
+L_1030dcc:
+// 0x01030dcc: 0x1030dcc: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01030dc0: 0x1030dc0: bne   v0, a1, 0x1030d94 sll   zero, zero, 0
+// 0x01030dd0: 0x1030dd0: bne   v0, a1, 0x1030da4 sll   zero, zero, 0
 	ldloc 4
 	ldloc.1
-	bne.un L_1030d94
+	bne.un L_1030da4
 // --- basic block ---
-// 0x01030dc8: 0x1030dc8: jr    ra sll   zero, zero, 0
+// 0x01030dd8: 0x1030dd8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -4295,7 +4295,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_gps_register_logger_1030e1c(int32,int32,int32)
+.method public static int32 roadmap_gps_register_logger_1030e2c(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4324,70 +4324,70 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030e1c: 0x1030e1c: lui   v1, 0x60000
+// 0x01030e2c: 0x1030e2c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01030e20: 0x1030e20: addiu v1, v1, -18684
+// 0x01030e30: 0x1030e30: addiu v1, v1, -18220
 	ldloc 4
-	ldc.i4 -18684
+	ldc.i4 -18220
 	add
 	stloc 4
-// 0x01030e24: 0x1030e24: addu  v0, zero, zero
+// 0x01030e34: 0x1030e34: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01030e28: 0x1030e28: addiu a2, zero, 16
+// 0x01030e38: 0x1030e38: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.2
-L_1030e2c:
-// 0x01030e2c: 0x1030e2c: lw    a1, 0(v1)
+L_1030e3c:
+// 0x01030e3c: 0x1030e3c: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01030e30: 0x1030e30: sll   zero, zero, 0
-// 0x01030e34: 0x1030e34: beq   a1, a0, 0x1030e68 addiu v1, v1, 4
+// 0x01030e40: 0x1030e40: sll   zero, zero, 0
+// 0x01030e44: 0x1030e44: beq   a1, a0, 0x1030e78 addiu v1, v1, 4
 	ldloc.1
 	ldloc.0
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-	beq  L_1030e68
+	beq  L_1030e78
 // --- basic block ---
-// 0x01030e3c: 0x1030e3c: bne   a1, zero, 0x1030e60 addiu v0, v0, 1
+// 0x01030e4c: 0x1030e4c: bne   a1, zero, 0x1030e70 addiu v0, v0, 1
 	ldloc.1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-	brtrue L_1030e60
+	brtrue L_1030e70
 // --- basic block ---
-// 0x01030e44: 0x1030e44: addiu v0, v0, -1
+// 0x01030e54: 0x1030e54: addiu v0, v0, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01030e48: 0x1030e48: lui   v1, 0x60000
+// 0x01030e58: 0x1030e58: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01030e4c: 0x1030e4c: sll   v0, v0, 2
+// 0x01030e5c: 0x1030e5c: sll   v0, v0, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01030e50: 0x1030e50: addiu v1, v1, -18684
+// 0x01030e60: 0x1030e60: addiu v1, v1, -18220
 	ldloc 4
-	ldc.i4 -18684
+	ldc.i4 -18220
 	add
 	stloc 4
-// 0x01030e54: 0x1030e54: addu  v0, v0, v1
+// 0x01030e64: 0x1030e64: addu  v0, v0, v1
 	ldloc.3
 	ldloc 4
 	add
 	stloc.3
-// 0x01030e58: 0x1030e58: jr    ra sw    a0, 0(v0)
+// 0x01030e68: 0x1030e68: jr    ra sw    a0, 0(v0)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4396,14 +4396,14 @@ L_1030e2c:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1030e60:
-// 0x01030e60: 0x1030e60: bne   v0, a2, 0x1030e2c sll   zero, zero, 0
+L_1030e70:
+// 0x01030e70: 0x1030e70: bne   v0, a2, 0x1030e3c sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	bne.un L_1030e2c
+	bne.un L_1030e3c
 // --- basic block ---
-L_1030e68:
-// 0x01030e68: 0x1030e68: jr    ra sll   zero, zero, 0
+L_1030e78:
+// 0x01030e78: 0x1030e78: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -4411,7 +4411,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_gps_register_link_control_1030e70(int32,int32)
+.method public static int32 roadmap_gps_register_link_control_1030e80(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -4434,10 +4434,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030e70: 0x1030e70: lui   v0, 0x0
+// 0x01030e80: 0x1030e80: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01030e74: 0x1030e74: sw    a0, 12268(v0)
+// 0x01030e84: 0x1030e84: sw    a0, 12268(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4446,10 +4446,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.0
 	stelem.i4
-// 0x01030e78: 0x1030e78: lui   v0, 0x0
+// 0x01030e88: 0x1030e88: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01030e7c: 0x1030e7c: jr    ra sw    a1, 12208(v0)
+// 0x01030e8c: 0x1030e8c: jr    ra sw    a1, 12208(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4463,7 +4463,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_gps_register_periodic_control_1030e84(int32,int32)
+.method public static int32 roadmap_gps_register_periodic_control_1030e94(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -4486,10 +4486,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030e84: 0x1030e84: lui   v0, 0x0
+// 0x01030e94: 0x1030e94: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01030e88: 0x1030e88: sw    a0, 12264(v0)
+// 0x01030e98: 0x1030e98: sw    a0, 12264(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4498,10 +4498,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.0
 	stelem.i4
-// 0x01030e8c: 0x1030e8c: lui   v0, 0x0
+// 0x01030e9c: 0x1030e9c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01030e90: 0x1030e90: jr    ra sw    a1, 12212(v0)
+// 0x01030ea0: 0x1030ea0: jr    ra sw    a1, 12212(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -4515,7 +4515,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_gps_have_reception_1030e98()
+.method public static int32 roadmap_gps_have_reception_1030ea8()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -4532,25 +4532,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030e98: 0x1030e98: lui   v0, 0x60000
+// 0x01030ea8: 0x1030ea8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01030e9c: 0x1030e9c: lw    v0, -18616(v0)
+// 0x01030eac: 0x1030eac: lw    v0, -18152(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4654
+	ldc.i4 -4538
 	add
 	ldelem.i4
 	stloc.0
-// 0x01030ea0: 0x1030ea0: sll   zero, zero, 0
-// 0x01030ea4: 0x1030ea4: sltiu v0, v0, 2
+// 0x01030eb0: 0x1030eb0: sll   zero, zero, 0
+// 0x01030eb4: 0x1030eb4: sltiu v0, v0, 2
 	ldloc.0
 	ldc.i4.2
 	clt.un
 	stloc.0
-// 0x01030ea8: 0x1030ea8: jr    ra xori  v0, v0, 1
+// 0x01030eb8: 0x1030eb8: jr    ra xori  v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	xor
@@ -4560,7 +4560,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_gps_csv_tracker_get_enable_1030eb0()
+.method public static int32 roadmap_gps_csv_tracker_get_enable_1030ec0()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -4577,25 +4577,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030eb0: 0x1030eb0: lui   v0, 0x60000
+// 0x01030ec0: 0x1030ec0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01030eb4: 0x1030eb4: lw    v0, -23848(v0)
+// 0x01030ec4: 0x1030ec4: lw    v0, -23384(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5962
+	ldc.i4 -5846
 	add
 	ldelem.i4
 	stloc.0
-// 0x01030eb8: 0x1030eb8: jr    ra sll   zero, zero, 0
+// 0x01030ec8: 0x1030ec8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_gps_satelite_count_1030ef8()
+.method public static int32 roadmap_gps_satelite_count_1030f08()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -4612,25 +4612,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030ef8: 0x1030ef8: lui   v0, 0x60000
+// 0x01030f08: 0x1030f08: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01030efc: 0x1030efc: lw    v0, -18304(v0)
+// 0x01030f0c: 0x1030f0c: lw    v0, -17840(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4576
+	ldc.i4 -4460
 	add
 	ldelem.i4
 	stloc.0
-// 0x01030f00: 0x1030f00: jr    ra sll   zero, zero, 0
+// 0x01030f10: 0x1030f10: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_gps_detect_receiver_1030f08(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_detect_receiver_1030f18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -4671,13 +4671,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030f08: 0x1030f08: addiu sp, sp, -32
+// 0x01030f18: 0x1030f18: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01030f0c: 0x1030f0c: sw    ra, 28(sp)
-// 0x01030f10: 0x1030f10: sw    s1, 24(sp)
+// 0x01030f1c: 0x1030f1c: sw    ra, 28(sp)
+// 0x01030f20: 0x1030f20: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4686,7 +4686,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01030f14: 0x1030f14: sw    s0, 20(sp)
+// 0x01030f24: 0x1030f24: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4695,16 +4695,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01030f18: 0x1030f18: cibyl_sysc 0x459
+// 0x01030f28: 0x1030f28: cibyl_sysc 0x459
 	call int32 [WazeWP7]Syscalls::NOPH_GpsManager_getInstance()
 	stloc 5
-// 0x01030f1c: 0x1030f1c: addu  s0, v0, zero
+// 0x01030f2c: 0x1030f2c: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01030f20: 0x1030f20: lui   a0, 0x10000
+// 0x01030f30: 0x1030f30: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01030f24: 0x1030f24: jal   0x101cd60 addiu a0, a0, -15872
+// 0x01030f34: 0x1030f34: jal   0x101cd70 addiu a0, a0, -15872
 	ldloc.1
 	ldc.i4 -15872
 	add
@@ -4714,20 +4714,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01030f2c: 0x1030f2c: lui   a0, 0x10000
+// 0x01030f3c: 0x1030f3c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01030f30: 0x1030f30: addiu a0, a0, -15856
+// 0x01030f40: 0x1030f40: addiu a0, a0, -15856
 	ldloc.1
 	ldc.i4 -15856
 	add
 	stloc.1
-// 0x01030f34: 0x1030f34: jal   0x101cd60 addu  s1, v0, zero
+// 0x01030f44: 0x1030f44: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -4735,27 +4735,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01030f3c: 0x1030f3c: addu  v1, v0, zero
+// 0x01030f4c: 0x1030f4c: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01030f40: 0x1030f40: cibyl_sysc_arg 0x10
+// 0x01030f50: 0x1030f50: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x01030f44: 0x1030f44: cibyl_sysc_arg 0x11
+// 0x01030f54: 0x1030f54: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01030f48: 0x1030f48: cibyl_sysc_arg 0x3
+// 0x01030f58: 0x1030f58: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x01030f4c: 0x1030f4c: cibyl_sysc 0x475
+// 0x01030f5c: 0x1030f5c: cibyl_sysc 0x475
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_searchGpsRim(int32,int32,int32)
-// 0x01030f50: 0x1030f50: addu  s0, v0, zero
+// 0x01030f60: 0x1030f60: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01030f54: 0x1030f54: lw    ra, 28(sp)
-// 0x01030f58: 0x1030f58: lw    s1, 24(sp)
+// 0x01030f64: 0x1030f64: lw    ra, 28(sp)
+// 0x01030f68: 0x1030f68: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4764,7 +4764,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01030f5c: 0x1030f5c: lw    s0, 20(sp)
+// 0x01030f6c: 0x1030f6c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4773,7 +4773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030f60: 0x1030f60: jr    ra addiu sp, sp, 32
+// 0x01030f70: 0x1030f70: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4785,7 +4785,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_raw_1030f68(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_raw_1030f78(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -4820,51 +4820,51 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030f68: 0x1030f68: lui   v0, 0x60000
+// 0x01030f78: 0x1030f78: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01030f6c: 0x1030f6c: lw    v1, -18336(v0)
+// 0x01030f7c: 0x1030f7c: lw    v1, -17872(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4584
+	ldc.i4 -4468
 	add
 	ldelem.i4
 	stloc 7
-// 0x01030f70: 0x1030f70: addiu sp, sp, -56
+// 0x01030f80: 0x1030f80: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01030f74: 0x1030f74: sw    ra, 52(sp)
-// 0x01030f78: 0x1030f78: beq   v1, zero, 0x1030fc8 addu  v0, a1, zero
+// 0x01030f84: 0x1030f84: sw    ra, 52(sp)
+// 0x01030f88: 0x1030f88: beq   v1, zero, 0x1030fd8 addu  v0, a1, zero
 	ldloc 7
 	ldloc.2
 	stloc 6
-	brfalse L_1030fc8
+	brfalse L_1030fd8
 // --- basic block ---
-// 0x01030f80: 0x1030f80: addiu v1, zero, 4096
+// 0x01030f90: 0x1030f90: addiu v1, zero, 4096
 	ldc.i4 4096
 	stloc 7
-// 0x01030f84: 0x1030f84: bne   a3, v1, 0x1030fa8 lui   a0, 0x10000
+// 0x01030f94: 0x1030f94: bne   a3, v1, 0x1030fb8 lui   a0, 0x10000
 	ldloc 4
 	ldloc 7
 	ldc.i4 65536
 	stloc.1
-	bne.un L_1030fa8
+	bne.un L_1030fb8
 // --- basic block ---
-// 0x01030f8c: 0x1030f8c: addiu a0, a0, -29672
+// 0x01030f9c: 0x1030f9c: addiu a0, a0, -29672
 	ldloc.1
 	ldc.i4 -29672
 	add
 	stloc.1
-// 0x01030f90: 0x1030f90: addiu a1, sp, 16
+// 0x01030fa0: 0x1030fa0: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01030f94: 0x1030f94: sw    v0, 16(sp)
+// 0x01030fa4: 0x1030fa4: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4873,7 +4873,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01030f98: 0x1030f98: jal   0x101f76c sw    a2, 20(sp)
+// 0x01030fa8: 0x1030fa8: jal   0x101f77c sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4887,16 +4887,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01030fa0: 0x1030fa0: j	 0x1030fc8 sll   zero, zero, 0
-	br L_1030fc8
+// 0x01030fb0: 0x1030fb0: j	 0x1030fd8 sll   zero, zero, 0
+	br L_1030fd8
 // --- basic block ---
-L_1030fa8:
-// 0x01030fa8: 0x1030fa8: sw    v0, 24(sp)
+L_1030fb8:
+// 0x01030fb8: 0x1030fb8: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4905,7 +4905,7 @@ L_1030fa8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01030fac: 0x1030fac: lw    v0, 72(sp)
+// 0x01030fbc: 0x1030fbc: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4914,17 +4914,17 @@ L_1030fa8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01030fb0: 0x1030fb0: addiu a0, a0, -29672
+// 0x01030fc0: 0x1030fc0: addiu a0, a0, -29672
 	ldloc.1
 	ldc.i4 -29672
 	add
 	stloc.1
-// 0x01030fb4: 0x1030fb4: addiu a1, sp, 24
+// 0x01030fc4: 0x1030fc4: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01030fb8: 0x1030fb8: sw    a2, 28(sp)
+// 0x01030fc8: 0x1030fc8: sw    a2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4933,7 +4933,7 @@ L_1030fa8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01030fbc: 0x1030fbc: sw    a3, 40(sp)
+// 0x01030fcc: 0x1030fcc: sw    a3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4942,7 +4942,7 @@ L_1030fa8:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01030fc0: 0x1030fc0: jal   0x101f6a8 sw    v0, 36(sp)
+// 0x01030fd0: 0x1030fd0: jal   0x101f6b8 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4956,15 +4956,15 @@ L_1030fa8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_mobile_101f6a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_mobile_101f6b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1030fc8:
-// 0x01030fc8: 0x1030fc8: lw    ra, 52(sp)
-// 0x01030fcc: 0x1030fcc: sll   zero, zero, 0
-// 0x01030fd0: 0x1030fd0: jr    ra addiu sp, sp, 56
+L_1030fd8:
+// 0x01030fd8: 0x1030fd8: lw    ra, 52(sp)
+// 0x01030fdc: 0x1030fdc: sll   zero, zero, 0
+// 0x01030fe0: 0x1030fe0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4976,7 +4976,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_speed_accuracy_1030fd8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_speed_accuracy_1030fe8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5011,16 +5011,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030fd8: 0x1030fd8: lui   a0, 0x0
+// 0x01030fe8: 0x1030fe8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01030fdc: 0x1030fdc: addiu sp, sp, -24
+// 0x01030fec: 0x1030fec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01030fe0: 0x1030fe0: sw    ra, 20(sp)
-// 0x01030fe4: 0x1030fe4: jal   0x100e788 addiu a0, a0, 12144
+// 0x01030ff0: 0x1030ff0: sw    ra, 20(sp)
+// 0x01030ff4: 0x1030ff4: jal   0x100e798 addiu a0, a0, 12144
 	ldloc.1
 	ldc.i4 12144
 	add
@@ -5030,14 +5030,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01030fec: 0x1030fec: lw    ra, 20(sp)
-// 0x01030ff0: 0x1030ff0: sll   zero, zero, 0
-// 0x01030ff4: 0x1030ff4: jr    ra addiu sp, sp, 24
+// 0x01030ffc: 0x1030ffc: lw    ra, 20(sp)
+// 0x01031000: 0x1031000: sll   zero, zero, 0
+// 0x01031004: 0x1031004: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5049,7 +5049,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_gps_vtg_1030ffc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_vtg_103100c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -5090,12 +5090,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01030ffc: 0x1030ffc: addiu sp, sp, -40
+// 0x0103100c: 0x103100c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01031000: 0x1031000: sw    s0, 28(sp)
+// 0x01031010: 0x1031010: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5104,8 +5104,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01031004: 0x1031004: sw    ra, 36(sp)
-// 0x01031008: 0x1031008: sw    s1, 32(sp)
+// 0x01031014: 0x1031014: sw    ra, 36(sp)
+// 0x01031018: 0x1031018: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5114,7 +5114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103100c: 0x103100c: lw    s1, 4(a1)
+// 0x0103101c: 0x103101c: lw    s1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5123,15 +5123,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01031010: 0x1031010: lui   s0, 0x60000
+// 0x01031020: 0x1031020: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01031014: 0x1031014: addiu s0, s0, -18332
+// 0x01031024: 0x1031024: addiu s0, s0, -17868
 	ldloc 6
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 6
-// 0x01031018: 0x1031018: sw    a1, 16(sp)
+// 0x01031028: 0x1031028: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5140,7 +5140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103101c: 0x103101c: jal   0x1030fd8 sw    s1, 12(s0)
+// 0x0103102c: 0x103102c: jal   0x1030fe8 sw    s1, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5154,17 +5154,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01031024: 0x1031024: slt   v0, v0, s1
+// 0x01031034: 0x1031034: slt   v0, v0, s1
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 7
-// 0x01031028: 0x1031028: lw    a1, 16(sp)
+// 0x01031038: 0x1031038: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5173,19 +5173,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103102c: 0x103102c: beq   v0, zero, 0x1031040 sll   zero, zero, 0
+// 0x0103103c: 0x103103c: beq   v0, zero, 0x1031050 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1031040
+	brfalse L_1031050
 // --- basic block ---
-// 0x01031034: 0x1031034: lw    v0, 0(a1)
+// 0x01031044: 0x1031044: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01031038: 0x1031038: sll   zero, zero, 0
-// 0x0103103c: 0x103103c: sw    v0, 16(s0)
+// 0x01031048: 0x1031048: sll   zero, zero, 0
+// 0x0103104c: 0x103104c: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5194,9 +5194,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-L_1031040:
-// 0x01031040: 0x1031040: lw    ra, 36(sp)
-// 0x01031044: 0x1031044: lw    s1, 32(sp)
+L_1031050:
+// 0x01031050: 0x1031050: lw    ra, 36(sp)
+// 0x01031054: 0x1031054: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5205,7 +5205,7 @@ L_1031040:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01031048: 0x1031048: lw    s0, 28(sp)
+// 0x01031058: 0x1031058: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5214,7 +5214,7 @@ L_1031040:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103104c: 0x103104c: jr    ra addiu sp, sp, 40
+// 0x0103105c: 0x103105c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5226,7 +5226,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_gps_active_1031084(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_active_1031094(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5261,34 +5261,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031084: 0x1031084: lui   v0, 0x60000
+// 0x01031094: 0x1031094: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031088: 0x1031088: lw    v1, -18380(v0)
+// 0x01031098: 0x1031098: lw    v1, -17916(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4595
+	ldc.i4 -4479
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103108c: 0x103108c: addiu sp, sp, -24
+// 0x0103109c: 0x103109c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01031090: 0x1031090: sw    ra, 20(sp)
-// 0x01031094: 0x1031094: beq   v1, zero, 0x10310d0 addu  v0, zero, zero
+// 0x010310a0: 0x10310a0: sw    ra, 20(sp)
+// 0x010310a4: 0x10310a4: beq   v1, zero, 0x10310e0 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10310d0
+	brfalse L_10310e0
 // --- basic block ---
-// 0x0103109c: 0x103109c: lui   a0, 0x0
+// 0x010310ac: 0x10310ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010310a0: 0x10310a0: jal   0x100e788 addiu a0, a0, 12176
+// 0x010310b0: 0x10310b0: jal   0x100e798 addiu a0, a0, 12176
 	ldloc.1
 	ldc.i4 12176
 	add
@@ -5298,52 +5298,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010310a8: 0x10310a8: addu  v1, v0, zero
+// 0x010310b8: 0x10310b8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010310ac: 0x10310ac: addu  a0, zero, zero
+// 0x010310bc: 0x10310bc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010310b0: 0x10310b0: cibyl_sysc_arg 0x4
+// 0x010310c0: 0x10310c0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010310b4: 0x10310b4: cibyl_sysc 0x492
+// 0x010310c4: 0x10310c4: cibyl_sysc 0x492
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010310b8: 0x10310b8: addu  a0, v0, zero
+// 0x010310c8: 0x10310c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010310bc: 0x10310bc: lui   v0, 0x60000
+// 0x010310cc: 0x10310cc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010310c0: 0x10310c0: lw    v0, -23856(v0)
+// 0x010310d0: 0x10310d0: lw    v0, -23392(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5964
+	ldc.i4 -5848
 	add
 	ldelem.i4
 	stloc 5
-// 0x010310c4: 0x10310c4: sll   zero, zero, 0
-// 0x010310c8: 0x10310c8: subu  a0, a0, v0
+// 0x010310d4: 0x10310d4: sll   zero, zero, 0
+// 0x010310d8: 0x10310d8: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x010310cc: 0x10310cc: slt   v0, a0, v1
+// 0x010310dc: 0x10310dc: slt   v0, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 5
-L_10310d0:
-// 0x010310d0: 0x10310d0: lw    ra, 20(sp)
-// 0x010310d4: 0x10310d4: sll   zero, zero, 0
-// 0x010310d8: 0x10310d8: jr    ra addiu sp, sp, 24
+L_10310e0:
+// 0x010310e0: 0x10310e0: lw    ra, 20(sp)
+// 0x010310e4: 0x10310e4: sll   zero, zero, 0
+// 0x010310e8: 0x10310e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5355,7 +5355,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_csv_tracker_initialize_10310e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_csv_tracker_initialize_10310f0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
@@ -5402,13 +5402,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010310e0: 0x10310e0: addiu sp, sp, -224
+// 0x010310f0: 0x10310f0: addiu sp, sp, -224
 	ldloc.0
 	ldc.i4 -224
 	add
 	stloc.0
-// 0x010310e4: 0x10310e4: sw    ra, 220(sp)
-// 0x010310e8: 0x10310e8: sw    s3, 216(sp)
+// 0x010310f4: 0x10310f4: sw    ra, 220(sp)
+// 0x010310f8: 0x10310f8: sw    s3, 216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5417,7 +5417,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010310ec: 0x10310ec: sw    s2, 212(sp)
+// 0x010310fc: 0x10310fc: sw    s2, 212(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5426,7 +5426,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010310f0: 0x10310f0: sw    s1, 208(sp)
+// 0x01031100: 0x1031100: sw    s1, 208(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5435,7 +5435,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010310f4: 0x10310f4: sw    s0, 204(sp)
+// 0x01031104: 0x1031104: sw    s0, 204(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5444,20 +5444,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010310f8: 0x10310f8: addiu a0, sp, 32
+// 0x01031108: 0x1031108: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x010310fc: 0x10310fc: cibyl_sysc_arg 0x4
+// 0x0103110c: 0x103110c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01031100: 0x1031100: cibyl_sysc 0x497
+// 0x01031110: 0x1031110: cibyl_sysc 0x497
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 6
-// 0x01031104: 0x1031104: addu  v1, v0, zero
+// 0x01031114: 0x1031114: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x01031108: 0x1031108: jal   0x10c3558 addiu s2, zero, 48
+// 0x01031118: 0x1031118: jal   0x10c3b98 addiu s2, zero, 48
 	ldc.i4.s 48
 	stloc 9
 	ldloc.0
@@ -5465,18 +5465,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01031110: 0x1031110: sb    s2, 52(sp)
+// 0x01031120: 0x1031120: sb    s2, 52(sp)
 	ldloc.0
 	ldc.i4.s 52
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01031114: 0x1031114: lw    a2, 12(v0)
+// 0x01031124: 0x1031124: lw    a2, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5485,30 +5485,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01031118: 0x1031118: lui   s0, 0x20000
-	ldc.i4 131072
+// 0x01031128: 0x1031128: lui   s0, 0x10000
+	ldc.i4 65536
 	stloc 8
-// 0x0103111c: 0x103111c: slti  a0, a2, 10
+// 0x0103112c: 0x103112c: slti  a0, a2, 10
 	ldloc.3
 	ldc.i4.s 10
 	clt
 	stloc.1
-// 0x01031120: 0x1031120: addiu s3, sp, 52
+// 0x01031130: 0x1031130: addiu s3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 11
-// 0x01031124: 0x1031124: addiu a1, s0, -13884
+// 0x01031134: 0x1031134: addiu a1, s0, 19088
 	ldloc 8
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01031128: 0x1031128: addu  a0, s3, a0
+// 0x01031138: 0x1031138: addu  a0, s3, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc.1
-// 0x0103112c: 0x103112c: jal   0x1000f64 addu  s1, v0, zero
+// 0x0103113c: 0x103113c: jal   0x1000f64 addu  s1, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -5521,13 +5521,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01031134: 0x1031134: sb    s2, 44(sp)
+// 0x01031144: 0x1031144: sb    s2, 44(sp)
 	ldloc.0
 	ldc.i4.s 44
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01031138: 0x1031138: lw    a2, 16(s1)
+// 0x01031148: 0x1031148: lw    a2, 16(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5536,32 +5536,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103113c: 0x103113c: addiu a3, sp, 44
+// 0x0103114c: 0x103114c: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x01031140: 0x1031140: slti  a0, a2, 9
+// 0x01031150: 0x1031150: slti  a0, a2, 9
 	ldloc.3
 	ldc.i4.s 9
 	clt
 	stloc.1
-// 0x01031144: 0x1031144: addu  a0, a3, a0
+// 0x01031154: 0x1031154: addu  a0, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc.1
-// 0x01031148: 0x1031148: addiu a1, s0, -13884
+// 0x01031158: 0x1031158: addiu a1, s0, 19088
 	ldloc 8
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0103114c: 0x103114c: addiu a2, a2, 1
+// 0x0103115c: 0x103115c: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01031150: 0x1031150: jal   0x1000f64 sw    a3, 192(sp)
+// 0x01031160: 0x1031160: jal   0x1000f64 sw    a3, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5580,13 +5580,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01031158: 0x1031158: sb    s2, 36(sp)
+// 0x01031168: 0x1031168: sb    s2, 36(sp)
 	ldloc.0
 	ldc.i4.s 36
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0103115c: 0x103115c: lw    a2, 20(s1)
+// 0x0103116c: 0x103116c: lw    a2, 20(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5595,27 +5595,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01031160: 0x1031160: addiu s2, sp, 36
+// 0x01031170: 0x1031170: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 9
-// 0x01031164: 0x1031164: slti  a0, a2, 110
+// 0x01031174: 0x1031174: slti  a0, a2, 110
 	ldloc.3
 	ldc.i4.s 110
 	clt
 	stloc.1
-// 0x01031168: 0x1031168: addiu a1, s0, -13884
+// 0x01031178: 0x1031178: addiu a1, s0, 19088
 	ldloc 8
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0103116c: 0x103116c: addu  a0, s2, a0
+// 0x0103117c: 0x103117c: addu  a0, s2, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc.1
-// 0x01031170: 0x1031170: jal   0x1000f64 addiu a2, a2, -100
+// 0x01031180: 0x1031180: jal   0x1000f64 addiu a2, a2, -100
 	ldloc.3
 	ldc.i4.s -100
 	add
@@ -5630,7 +5630,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01031178: 0x1031178: sw    s2, 16(sp)
+// 0x01031188: 0x1031188: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5639,7 +5639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103117c: 0x103117c: lw    v0, 8(s1)
+// 0x0103118c: 0x103118c: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5648,7 +5648,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01031180: 0x1031180: lw    a3, 192(sp)
+// 0x01031190: 0x1031190: lw    a3, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01031184: 0x1031184: sw    v0, 20(sp)
+// 0x01031194: 0x1031194: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5666,12 +5666,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01031188: 0x1031188: addiu s0, sp, 60
+// 0x01031198: 0x1031198: addiu s0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 8
-// 0x0103118c: 0x103118c: lw    v0, 4(s1)
+// 0x0103119c: 0x103119c: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5680,21 +5680,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01031190: 0x1031190: lui   a1, 0x10000
+// 0x010311a0: 0x10311a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031194: 0x1031194: addu  a2, s3, zero
+// 0x010311a4: 0x10311a4: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01031198: 0x1031198: addiu a1, a1, -15780
+// 0x010311a8: 0x10311a8: addiu a1, a1, -15780
 	ldloc.2
 	ldc.i4 -15780
 	add
 	stloc.2
-// 0x0103119c: 0x103119c: addu  a0, s0, zero
+// 0x010311ac: 0x10311ac: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010311a0: 0x10311a0: jal   0x1000f64 sw    v0, 24(sp)
+// 0x010311b0: 0x10311b0: jal   0x1000f64 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5713,27 +5713,27 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010311a8: 0x10311a8: jal   0x104c544 sll   zero, zero, 0
+// 0x010311b8: 0x10311b8: jal   0x104c554 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_gps_104c544(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_gps_104c554(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010311b0: 0x10311b0: lui   a2, 0x0
+// 0x010311c0: 0x10311c0: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010311b4: 0x10311b4: addu  a0, v0, zero
+// 0x010311c4: 0x10311c4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010311b8: 0x10311b8: addu  a1, s0, zero
+// 0x010311c8: 0x10311c8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010311bc: 0x10311bc: jal   0x104dac8 addiu a2, a2, 28940
+// 0x010311cc: 0x10311cc: jal   0x104dad8 addiu a2, a2, 28940
 	ldloc.3
 	ldc.i4 28940
 	add
@@ -5743,46 +5743,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010311c4: 0x10311c4: lui   v1, 0x60000
+// 0x010311d4: 0x10311d4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010311c8: 0x10311c8: bne   v0, zero, 0x10311ec sw    v0, -23852(v1)
+// 0x010311d8: 0x10311d8: bne   v0, zero, 0x10311fc sw    v0, -23388(v1)
 	ldloc 6
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5963
+	ldc.i4 -5847
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_10311ec
+	brtrue L_10311fc
 // --- basic block ---
-// 0x010311d0: 0x10311d0: lui   a1, 0x10000
+// 0x010311e0: 0x10311e0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010311d4: 0x10311d4: lui   a3, 0x10000
+// 0x010311e4: 0x10311e4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010311d8: 0x10311d8: addiu a1, a1, -15752
+// 0x010311e8: 0x10311e8: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x010311dc: 0x10311dc: addiu a3, a3, -15728
+// 0x010311ec: 0x10311ec: addiu a3, a3, -15728
 	ldloc 4
 	ldc.i4 -15728
 	add
 	stloc 4
-// 0x010311e0: 0x10311e0: addiu a0, zero, 3
+// 0x010311f0: 0x10311f0: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010311e4: 0x10311e4: jal   0x100449c addiu a2, zero, 1690
+// 0x010311f4: 0x10311f4: jal   0x100449c addiu a2, zero, 1690
 	ldc.i4 1690
 	stloc.3
 	ldloc.0
@@ -5795,9 +5795,9 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10311ec:
-// 0x010311ec: 0x10311ec: lw    ra, 220(sp)
-// 0x010311f0: 0x10311f0: lw    s3, 216(sp)
+L_10311fc:
+// 0x010311fc: 0x10311fc: lw    ra, 220(sp)
+// 0x01031200: 0x1031200: lw    s3, 216(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5806,7 +5806,7 @@ L_10311ec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010311f4: 0x10311f4: lw    s2, 212(sp)
+// 0x01031204: 0x1031204: lw    s2, 212(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5815,7 +5815,7 @@ L_10311ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010311f8: 0x10311f8: lw    s1, 208(sp)
+// 0x01031208: 0x1031208: lw    s1, 208(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5824,7 +5824,7 @@ L_10311ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010311fc: 0x10311fc: lw    s0, 204(sp)
+// 0x0103120c: 0x103120c: lw    s0, 204(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5833,7 +5833,7 @@ L_10311ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01031200: 0x1031200: jr    ra addiu sp, sp, 224
+// 0x01031210: 0x1031210: jr    ra addiu sp, sp, 224
 	ldloc.0
 	ldc.i4 224
 	add
@@ -5845,7 +5845,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_update_status_1031208(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_update_status_1031218(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5883,21 +5883,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031208: 0x1031208: lui   v0, 0x0
+// 0x01031218: 0x1031218: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0103120c: 0x103120c: lb    v0, 12292(v0)
+// 0x0103121c: 0x103121c: lb    v0, 12292(v0)
 	ldloc 5
 	ldc.i4 12292
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01031210: 0x1031210: addiu sp, sp, -32
+// 0x01031220: 0x1031220: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01031214: 0x1031214: sw    s0, 24(sp)
+// 0x01031224: 0x1031224: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5906,47 +5906,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01031218: 0x1031218: sw    ra, 28(sp)
-// 0x0103121c: 0x103121c: beq   a0, v0, 0x1031258 addu  s0, a0, zero
+// 0x01031228: 0x1031228: sw    ra, 28(sp)
+// 0x0103122c: 0x103122c: beq   a0, v0, 0x1031268 addu  s0, a0, zero
 	ldloc.1
 	ldloc 5
 	ldloc.1
 	stloc 7
-	beq  L_1031258
+	beq  L_1031268
 // --- basic block ---
-// 0x01031224: 0x1031224: addiu v1, zero, 65
+// 0x01031234: 0x1031234: addiu v1, zero, 65
 	ldc.i4.s 65
 	stloc 8
-// 0x01031228: 0x1031228: bne   v0, v1, 0x1031254 lui   v0, 0x0
+// 0x01031238: 0x1031238: bne   v0, v1, 0x1031264 lui   v0, 0x0
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1031254
+	bne.un L_1031264
 // --- basic block ---
-// 0x01031230: 0x1031230: lui   a1, 0x10000
+// 0x01031240: 0x1031240: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031234: 0x1031234: lui   a3, 0x10000
+// 0x01031244: 0x1031244: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01031238: 0x1031238: addiu a1, a1, -15752
+// 0x01031248: 0x1031248: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x0103123c: 0x103123c: addiu a3, a3, -15692
+// 0x0103124c: 0x103124c: addiu a3, a3, -15692
 	ldloc 4
 	ldc.i4 -15692
 	add
 	stloc 4
-// 0x01031240: 0x1031240: addiu a0, zero, 4
+// 0x01031250: 0x1031250: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01031244: 0x1031244: addiu a2, zero, 305
+// 0x01031254: 0x1031254: addiu a2, zero, 305
 	ldc.i4 305
 	stloc.3
-// 0x01031248: 0x1031248: jal   0x100449c sw    s0, 16(sp)
+// 0x01031258: 0x1031258: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5965,19 +5965,19 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01031250: 0x1031250: lui   v0, 0x0
+// 0x01031260: 0x1031260: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1031254:
-// 0x01031254: 0x1031254: sb    s0, 12292(v0)
+L_1031264:
+// 0x01031264: 0x1031264: sb    s0, 12292(v0)
 	ldloc 5
 	ldc.i4 12292
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1031258:
-// 0x01031258: 0x1031258: lw    ra, 28(sp)
-// 0x0103125c: 0x103125c: lw    s0, 24(sp)
+L_1031268:
+// 0x01031268: 0x1031268: lw    ra, 28(sp)
+// 0x0103126c: 0x103126c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5986,7 +5986,7 @@ L_1031258:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01031260: 0x1031260: jr    ra addiu sp, sp, 32
+// 0x01031270: 0x1031270: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5998,7 +5998,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_csv_tracker_shutdown_1031268(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_csv_tracker_shutdown_1031278(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6033,28 +6033,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031268: 0x1031268: lui   v0, 0x60000
+// 0x01031278: 0x1031278: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103126c: 0x103126c: lw    a0, -23852(v0)
+// 0x0103127c: 0x103127c: lw    a0, -23388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5963
+	ldc.i4 -5847
 	add
 	ldelem.i4
 	stloc.1
-// 0x01031270: 0x1031270: addiu sp, sp, -24
+// 0x01031280: 0x1031280: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01031274: 0x1031274: beq   a0, zero, 0x1031284 sw    ra, 20(sp)
+// 0x01031284: 0x1031284: beq   a0, zero, 0x1031294 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1031284
+	brfalse L_1031294
 // --- basic block ---
-// 0x0103127c: 0x103127c: jal   0x10023b4 sll   zero, zero, 0
+// 0x0103128c: 0x103128c: jal   0x10023b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6065,21 +6065,21 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1031284:
-// 0x01031284: 0x1031284: lw    ra, 20(sp)
-// 0x01031288: 0x1031288: lui   v0, 0x60000
+L_1031294:
+// 0x01031294: 0x1031294: lw    ra, 20(sp)
+// 0x01031298: 0x1031298: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103128c: 0x103128c: sw    zero, -23852(v0)
+// 0x0103129c: 0x103129c: sw    zero, -23388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5963
+	ldc.i4 -5847
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01031290: 0x1031290: jr    ra addiu sp, sp, 24
+// 0x010312a0: 0x10312a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6091,7 +6091,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_csv_tracker_set_enable_1031298(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_csv_tracker_set_enable_10312a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -6126,28 +6126,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031298: 0x1031298: addu  v0, a0, zero
+// 0x010312a8: 0x10312a8: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0103129c: 0x103129c: sll   v1, a0, 2
+// 0x010312ac: 0x10312ac: sll   v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010312a0: 0x10312a0: lui   a0, 0x20000
+// 0x010312b0: 0x10312b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010312a4: 0x10312a4: addiu sp, sp, -32
+// 0x010312b4: 0x10312b4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010312a8: 0x10312a8: addiu a0, a0, 9464
+// 0x010312b8: 0x10312b8: addiu a0, a0, 9928
 	ldloc.1
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.1
-// 0x010312ac: 0x10312ac: sw    a0, 16(sp)
+// 0x010312bc: 0x10312bc: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6156,15 +6156,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010312b0: 0x10312b0: lui   a0, 0x0
+// 0x010312c0: 0x10312c0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010312b4: 0x10312b4: addiu a0, a0, 20820
+// 0x010312c4: 0x10312c4: addiu a0, a0, 20820
 	ldloc.1
 	ldc.i4 20820
 	add
 	stloc.1
-// 0x010312b8: 0x10312b8: sw    a0, 20(sp)
+// 0x010312c8: 0x10312c8: sw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6173,12 +6173,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010312bc: 0x10312bc: addu  v1, sp, v1
+// 0x010312cc: 0x10312cc: addu  v1, sp, v1
 	ldloc.0
 	ldloc 5
 	add
 	stloc 5
-// 0x010312c0: 0x10312c0: lw    a1, 16(v1)
+// 0x010312d0: 0x10312d0: lw    a1, 16(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6187,24 +6187,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010312c4: 0x10312c4: lui   a0, 0x0
+// 0x010312d4: 0x10312d4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010312c8: 0x10312c8: lui   v1, 0x60000
+// 0x010312d8: 0x10312d8: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010312cc: 0x10312cc: addiu a0, a0, 12128
+// 0x010312dc: 0x10312dc: addiu a0, a0, 12128
 	ldloc.1
 	ldc.i4 12128
 	add
 	stloc.1
-// 0x010312d0: 0x10312d0: sw    ra, 28(sp)
-// 0x010312d4: 0x10312d4: jal   0x100e5c0 sw    v0, -23848(v1)
+// 0x010312e0: 0x10312e0: sw    ra, 28(sp)
+// 0x010312e4: 0x10312e4: jal   0x100e5d0 sw    v0, -23384(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5962
+	ldc.i4 -5846
 	add
 	ldloc 7
 	stelem.i4
@@ -6213,14 +6213,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010312dc: 0x10312dc: lw    ra, 28(sp)
-// 0x010312e0: 0x10312e0: sll   zero, zero, 0
-// 0x010312e4: 0x10312e4: jr    ra addiu sp, sp, 32
+// 0x010312ec: 0x10312ec: lw    ra, 28(sp)
+// 0x010312f0: 0x10312f0: sll   zero, zero, 0
+// 0x010312f4: 0x10312f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6232,7 +6232,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_gps_shutdown_10312ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_shutdown_10312fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -6270,12 +6270,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010312ec: 0x10312ec: addiu sp, sp, -24
+// 0x010312fc: 0x10312fc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010312f0: 0x10312f0: sw    s0, 16(sp)
+// 0x01031300: 0x1031300: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6284,27 +6284,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010312f4: 0x10312f4: lui   s0, 0x60000
+// 0x01031304: 0x1031304: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010312f8: 0x10312f8: lw    v0, -18380(s0)
+// 0x01031308: 0x1031308: lw    v0, -17916(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4595
+	ldc.i4 -4479
 	add
 	ldelem.i4
 	stloc 5
-// 0x010312fc: 0x10312fc: sll   zero, zero, 0
-// 0x01031300: 0x1031300: beq   v0, zero, 0x1031340 sw    ra, 20(sp)
+// 0x0103130c: 0x103130c: sll   zero, zero, 0
+// 0x01031310: 0x1031310: beq   v0, zero, 0x1031350 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1031340
+	brfalse L_1031350
 // --- basic block ---
-// 0x01031308: 0x1031308: lui   v0, 0x0
+// 0x01031318: 0x1031318: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0103130c: 0x103130c: lw    v0, 12212(v0)
+// 0x0103131c: 0x103131c: lw    v0, 12212(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6313,13 +6313,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031310: 0x1031310: lui   a0, 0x1030000
+// 0x01031320: 0x1031320: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01031314: 0x1031314: jalr  v0 addiu a0, a0, 6276
+// 0x01031324: 0x1031324: jalr  v0 addiu a0, a0, 6292
 	ldloc 5
 	ldloc.1
-	ldc.i4 6276
+	ldc.i4 6292
 	add
 	stloc.1
 	ldloc.0
@@ -6332,10 +6332,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103131c: 0x103131c: lui   v0, 0x0
+// 0x0103132c: 0x103132c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01031320: 0x1031320: lw    v0, 12208(v0)
+// 0x01031330: 0x1031330: lw    v0, 12208(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6344,11 +6344,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031324: 0x1031324: sll   zero, zero, 0
-// 0x01031328: 0x1031328: jalr  v0 addiu a0, s0, -18380
+// 0x01031334: 0x1031334: sll   zero, zero, 0
+// 0x01031338: 0x1031338: jalr  v0 addiu a0, s0, -17916
 	ldloc 5
 	ldloc 7
-	ldc.i4 -18380
+	ldc.i4 -17916
 	add
 	stloc.1
 	ldloc.0
@@ -6361,9 +6361,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01031330: 0x1031330: jal   0x1037238 addiu a0, s0, -18380
+// 0x01031340: 0x1031340: jal   0x1037248 addiu a0, s0, -17916
 	ldloc 7
-	ldc.i4 -18380
+	ldc.i4 -17916
 	add
 	stloc.1
 	ldloc.0
@@ -6371,25 +6371,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_close_1037238(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_close_1037248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01031338: 0x1031338: jal   0x1031268 sll   zero, zero, 0
+// 0x01031348: 0x1031348: jal   0x1031278 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_csv_tracker_shutdown_1031268(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_csv_tracker_shutdown_1031278(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1031340:
-// 0x01031340: 0x1031340: lw    ra, 20(sp)
-// 0x01031344: 0x1031344: lw    s0, 16(sp)
+L_1031350:
+// 0x01031350: 0x1031350: lw    ra, 20(sp)
+// 0x01031354: 0x1031354: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6398,7 +6398,7 @@ L_1031340:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01031348: 0x1031348: jr    ra addiu sp, sp, 24
+// 0x01031358: 0x1031358: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6410,7 +6410,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_set_location_focus_1031350(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_set_location_focus_1031360(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6445,43 +6445,43 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031350: 0x1031350: lui   v0, 0x60000
+// 0x01031360: 0x1031360: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031354: 0x1031354: lw    v0, -18688(v0)
+// 0x01031364: 0x1031364: lw    v0, -18224(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4672
+	ldc.i4 -4556
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031358: 0x1031358: addiu sp, sp, -24
+// 0x01031368: 0x1031368: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103135c: 0x103135c: beq   v0, zero, 0x1031398 sw    ra, 20(sp)
+// 0x0103136c: 0x103136c: beq   v0, zero, 0x10313a8 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1031398
+	brfalse L_10313a8
 // --- basic block ---
-// 0x01031364: 0x1031364: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x01031374: 0x1031374: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103136c: 0x103136c: beq   v0, zero, 0x1031398 lui   a1, 0x10000
+// 0x0103137c: 0x103137c: beq   v0, zero, 0x10313a8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1031398
+	brfalse L_10313a8
 // --- basic block ---
-// 0x01031374: 0x1031374: addu  a0, v0, zero
+// 0x01031384: 0x1031384: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01031378: 0x1031378: jal   0x1001b14 addiu a1, a1, -31052
+// 0x01031388: 0x1031388: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -6491,15 +6491,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01031380: 0x1031380: bne   v0, zero, 0x1031398 lui   a0, 0x20000
+// 0x01031390: 0x1031390: bne   v0, zero, 0x10313a8 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1031398
+	brtrue L_10313a8
 // --- basic block ---
-// 0x01031388: 0x1031388: jal   0x101ece8 addiu a0, a0, 6792
+// 0x01031398: 0x1031398: jal   0x101ecf8 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -6507,26 +6507,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031390: 0x1031390: jal   0x102146c sll   zero, zero, 0
+// 0x010313a0: 0x10313a0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1031398:
-// 0x01031398: 0x1031398: lw    ra, 20(sp)
-// 0x0103139c: 0x103139c: sll   zero, zero, 0
-// 0x010313a0: 0x10313a0: jr    ra addiu sp, sp, 24
+L_10313a8:
+// 0x010313a8: 0x10313a8: lw    ra, 20(sp)
+// 0x010313ac: 0x10313ac: sll   zero, zero, 0
+// 0x010313b0: 0x10313b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6538,7 +6538,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_update_reception_10313a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_update_reception_10313b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6573,195 +6573,195 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010313a8: 0x10313a8: addiu sp, sp, -24
+// 0x010313b8: 0x10313b8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010313ac: 0x10313ac: sw    ra, 20(sp)
-// 0x010313b0: 0x10313b0: jal   0x1031084 sll   zero, zero, 0
+// 0x010313bc: 0x10313bc: sw    ra, 20(sp)
+// 0x010313c0: 0x10313c0: jal   0x1031094 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_active_1031084(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_active_1031094(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010313b8: 0x10313b8: beq   v0, zero, 0x1031418 addu  v1, zero, zero
+// 0x010313c8: 0x10313c8: beq   v0, zero, 0x1031428 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1031418
+	brfalse L_1031428
 // --- basic block ---
-// 0x010313c0: 0x10313c0: lui   v0, 0x0
+// 0x010313d0: 0x10313d0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010313c4: 0x10313c4: lb    a0, 12292(v0)
+// 0x010313d4: 0x10313d4: lb    a0, 12292(v0)
 	ldloc 5
 	ldc.i4 12292
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010313c8: 0x10313c8: addiu v0, zero, 65
+// 0x010313d8: 0x10313d8: addiu v0, zero, 65
 	ldc.i4.s 65
 	stloc 5
-// 0x010313cc: 0x10313cc: bne   a0, v0, 0x1031418 addiu v1, zero, 1
+// 0x010313dc: 0x10313dc: bne   a0, v0, 0x1031428 addiu v1, zero, 1
 	ldloc.1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	bne.un L_1031418
+	bne.un L_1031428
 // --- basic block ---
-// 0x010313d4: 0x10313d4: lui   v0, 0x60000
+// 0x010313e4: 0x10313e4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010313d8: 0x10313d8: lw    v0, -18304(v0)
+// 0x010313e8: 0x10313e8: lw    v0, -17840(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4576
+	ldc.i4 -4460
 	add
 	ldelem.i4
 	stloc 5
-// 0x010313dc: 0x10313dc: sll   zero, zero, 0
-// 0x010313e0: 0x10313e0: slti  v0, v0, 4
+// 0x010313ec: 0x10313ec: sll   zero, zero, 0
+// 0x010313f0: 0x10313f0: slti  v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	clt
 	stloc 5
-// 0x010313e4: 0x10313e4: bne   v0, zero, 0x1031418 addiu v1, zero, 2
+// 0x010313f4: 0x10313f4: bne   v0, zero, 0x1031428 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brtrue L_1031418
+	brtrue L_1031428
 // --- basic block ---
-// 0x010313ec: 0x10313ec: lui   v0, 0x60000
+// 0x010313fc: 0x10313fc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010313f0: 0x10313f0: lw    a1, -18132(v0)
+// 0x01031400: 0x1031400: lw    a1, -17668(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4533
+	ldc.i4 -4417
 	add
 	ldelem.i4
 	stloc.2
-// 0x010313f4: 0x10313f4: lw    a0, -18136(v0)
+// 0x01031404: 0x1031404: lw    a0, -17672(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4534
+	ldc.i4 -4418
 	add
 	ldelem.i4
 	stloc.1
-// 0x010313f8: 0x10313f8: lui   v0, 0x20000
+// 0x01031408: 0x1031408: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010313fc: 0x10313fc: lw    a3, 23860(v0)
+// 0x0103140c: 0x103140c: lw    a3, 24324(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5965
+	ldc.i4 6081
 	add
 	ldelem.i4
 	stloc 4
-// 0x01031400: 0x1031400: lw    a2, 23856(v0)
+// 0x01031410: 0x1031410: lw    a2, 24320(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5964
+	ldc.i4 6080
 	add
 	ldelem.i4
 	stloc.3
-// 0x01031404: 0x1031404: jal   0x10c17ac sll   zero, zero, 0
+// 0x01031414: 0x1031414: jal   0x10c1dec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103140c: 0x103140c: blez  v0, 0x1031418 addiu v1, zero, 3
+// 0x0103141c: 0x103141c: blez  v0, 0x1031428 addiu v1, zero, 3
 	ldloc 5
 	ldc.i4.3
 	stloc 6
 	ldc.i4.s 0
-	ble L_1031418
+	ble L_1031428
 // --- basic block ---
-// 0x01031414: 0x1031414: addiu v1, zero, 2
+// 0x01031424: 0x1031424: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-L_1031418:
-// 0x01031418: 0x1031418: lui   v0, 0x60000
+L_1031428:
+// 0x01031428: 0x1031428: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103141c: 0x103141c: lw    a0, -18616(v0)
+// 0x0103142c: 0x103142c: lw    a0, -18152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4654
+	ldc.i4 -4538
 	add
 	ldelem.i4
 	stloc.1
-// 0x01031420: 0x1031420: sll   zero, zero, 0
-// 0x01031424: 0x1031424: beq   a0, v1, 0x1031448 slti  a0, a0, 2
+// 0x01031430: 0x1031430: sll   zero, zero, 0
+// 0x01031434: 0x1031434: beq   a0, v1, 0x1031458 slti  a0, a0, 2
 	ldloc.1
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	clt
 	stloc.1
-	beq  L_1031448
+	beq  L_1031458
 // --- basic block ---
-// 0x0103142c: 0x103142c: bne   a0, zero, 0x1031440 sw    v1, -18616(v0)
+// 0x0103143c: 0x103143c: bne   a0, zero, 0x1031450 sw    v1, -18152(v0)
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4654
+	ldc.i4 -4538
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1031440
+	brtrue L_1031450
 // --- basic block ---
-// 0x01031434: 0x1031434: slti  v1, v1, 2
+// 0x01031444: 0x1031444: slti  v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	clt
 	stloc 6
-// 0x01031438: 0x1031438: beq   v1, zero, 0x1031448 sll   zero, zero, 0
+// 0x01031448: 0x1031448: beq   v1, zero, 0x1031458 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1031448
+	brfalse L_1031458
 // --- basic block ---
-L_1031440:
-// 0x01031440: 0x1031440: jal   0x100f35c sll   zero, zero, 0
+L_1031450:
+// 0x01031450: 0x1031450: jal   0x100f36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_refresh_100f35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_refresh_100f36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1031448:
-// 0x01031448: 0x1031448: lw    ra, 20(sp)
-// 0x0103144c: 0x103144c: sll   zero, zero, 0
-// 0x01031450: 0x1031450: jr    ra addiu sp, sp, 24
+L_1031458:
+// 0x01031458: 0x1031458: lw    ra, 20(sp)
+// 0x0103145c: 0x103145c: sll   zero, zero, 0
+// 0x01031460: 0x1031460: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6773,7 +6773,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_open_1031458(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_open_1031468(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -6814,13 +6814,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031458: 0x1031458: addiu sp, sp, -40
+// 0x01031468: 0x1031468: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103145c: 0x103145c: sw    ra, 36(sp)
-// 0x01031460: 0x1031460: sw    s1, 32(sp)
+// 0x0103146c: 0x103146c: sw    ra, 36(sp)
+// 0x01031470: 0x1031470: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6829,7 +6829,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01031464: 0x1031464: jal   0x10313a8 sw    s0, 28(sp)
+// 0x01031474: 0x1031474: jal   0x10313b8 sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6843,25 +6843,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_reception_10313a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_reception_10313b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103146c: 0x103146c: jal   0x1015c84 sll   zero, zero, 0
-	call int32 Cibyl16::roadmap_gps_source_1015c84()
+// 0x0103147c: 0x103147c: jal   0x1015c94 sll   zero, zero, 0
+	call int32 Cibyl16::roadmap_gps_source_1015c94()
 	stloc 5
 // --- basic block ---
-// 0x01031474: 0x1031474: bne   v0, zero, 0x103148c lui   a1, 0x60000
+// 0x01031484: 0x1031484: bne   v0, zero, 0x103149c lui   a1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.2
-	brtrue L_103148c
+	brtrue L_103149c
 // --- basic block ---
-// 0x0103147c: 0x103147c: lui   a0, 0x0
+// 0x0103148c: 0x103148c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01031480: 0x1031480: jal   0x100e348 addiu a0, a0, 12272
+// 0x01031490: 0x1031490: jal   0x100e358 addiu a0, a0, 12272
 	ldloc.1
 	ldc.i4 12272
 	add
@@ -6871,171 +6871,171 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031488: 0x1031488: lui   a1, 0x60000
+// 0x01031498: 0x1031498: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-L_103148c:
-// 0x0103148c: 0x103148c: lui   a2, 0x60000
+L_103149c:
+// 0x0103149c: 0x103149c: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01031490: 0x1031490: addiu v1, zero, 1
+// 0x010314a0: 0x10314a0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01031494: 0x1031494: sw    v1, -23864(a2)
+// 0x010314a4: 0x10314a4: sw    v1, -23400(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5966
+	ldc.i4 -5850
 	add
 	ldloc 6
 	stelem.i4
-// 0x01031498: 0x1031498: sw    zero, -18380(a1)
+// 0x010314a8: 0x10314a8: sw    zero, -17916(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4595
+	ldc.i4 -4479
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103149c: 0x103149c: cibyl_sysc 0x49c
+// 0x010314ac: 0x10314ac: cibyl_sysc 0x49c
 	call int32 [WazeWP7]Syscalls::NOPH_GpsManager_getInstance()
 	stloc 5
-// 0x010314a0: 0x10314a0: addu  a0, v0, zero
+// 0x010314b0: 0x10314b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010314a4: 0x10314a4: addiu v0, zero, 4
+// 0x010314b4: 0x10314b4: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010314a8: 0x10314a8: sw    v0, -23864(a2)
+// 0x010314b8: 0x10314b8: sw    v0, -23400(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5966
+	ldc.i4 -5850
 	add
 	ldloc 5
 	stelem.i4
-// 0x010314ac: 0x10314ac: lui   a2, 0x10000
+// 0x010314bc: 0x10314bc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010314b0: 0x10314b0: addiu a2, a2, -15644
+// 0x010314c0: 0x10314c0: addiu a2, a2, -15644
 	ldloc.3
 	ldc.i4 -15644
 	add
 	stloc.3
-// 0x010314b4: 0x10314b4: cibyl_sysc_arg 0x4
+// 0x010314c4: 0x10314c4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010314b8: 0x10314b8: cibyl_sysc_arg 0x6
+// 0x010314c8: 0x10314c8: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x010314bc: 0x10314bc: cibyl_sysc 0x4b8
+// 0x010314cc: 0x10314cc: cibyl_sysc 0x4b8
 	call int32 [WazeWP7]Syscalls::NOPH_GpsManager_connect(int32,int32)
 	stloc 5
-// 0x010314c0: 0x10314c0: addu  a2, v0, zero
+// 0x010314d0: 0x10314d0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010314c4: 0x10314c4: addiu v0, zero, -1
+// 0x010314d4: 0x10314d4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010314c8: 0x10314c8: beq   a2, v0, 0x10314ec addiu v0, zero, 5
+// 0x010314d8: 0x10314d8: beq   a2, v0, 0x10314fc addiu v0, zero, 5
 	ldloc.3
 	ldloc 5
 	ldc.i4.5
 	stloc 5
-	beq  L_10314ec
+	beq  L_10314fc
 // --- basic block ---
-// 0x010314d0: 0x10314d0: sw    v0, -18380(a1)
+// 0x010314e0: 0x10314e0: sw    v0, -17916(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4595
+	ldc.i4 -4479
 	add
 	ldloc 5
 	stelem.i4
-// 0x010314d4: 0x10314d4: cibyl_sysc_arg 0x4
+// 0x010314e4: 0x10314e4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010314d8: 0x10314d8: cibyl_sysc_arg 0x3
+// 0x010314e8: 0x10314e8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010314dc: 0x10314dc: cibyl_sysc_arg 0x3
+// 0x010314ec: 0x10314ec: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010314e0: 0x10314e0: cibyl_sysc_arg 0x3
+// 0x010314f0: 0x10314f0: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010314e4: 0x10314e4: cibyl_sysc 0x4d0
+// 0x010314f4: 0x10314f4: cibyl_sysc 0x4d0
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_start(int32,int32,int32,int32)
-// 0x010314e8: 0x10314e8: addu  v1, v0, zero
+// 0x010314f8: 0x10314f8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_10314ec:
-// 0x010314ec: 0x10314ec: lui   v0, 0x60000
+L_10314fc:
+// 0x010314fc: 0x10314fc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010314f0: 0x10314f0: lw    v0, -18380(v0)
+// 0x01031500: 0x1031500: lw    v0, -17916(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4595
+	ldc.i4 -4479
 	add
 	ldelem.i4
 	stloc 5
-// 0x010314f4: 0x10314f4: sll   zero, zero, 0
-// 0x010314f8: 0x10314f8: bne   v0, zero, 0x1031554 lui   s0, 0x60000
+// 0x01031504: 0x1031504: sll   zero, zero, 0
+// 0x01031508: 0x1031508: bne   v0, zero, 0x1031564 lui   s0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 8
-	brtrue L_1031554
+	brtrue L_1031564
 // --- basic block ---
-// 0x01031500: 0x1031500: lw    v0, -18620(s0)
+// 0x01031510: 0x1031510: lw    v0, -18156(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4655
+	ldc.i4 -4539
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031504: 0x1031504: sll   zero, zero, 0
-// 0x01031508: 0x1031508: bne   v0, zero, 0x1031740 lui   a1, 0x10000
+// 0x01031514: 0x1031514: sll   zero, zero, 0
+// 0x01031518: 0x1031518: bne   v0, zero, 0x1031750 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1031740
+	brtrue L_1031750
 // --- basic block ---
-// 0x01031510: 0x1031510: lui   a3, 0x10000
+// 0x01031520: 0x1031520: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01031514: 0x1031514: lui   v0, 0x10000
+// 0x01031524: 0x1031524: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01031518: 0x1031518: addiu v0, v0, -15644
+// 0x01031528: 0x1031528: addiu v0, v0, -15644
 	ldloc 5
 	ldc.i4 -15644
 	add
 	stloc 5
-// 0x0103151c: 0x103151c: addiu a1, a1, -15752
+// 0x0103152c: 0x103152c: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031520: 0x1031520: addiu a3, a3, -15628
+// 0x01031530: 0x1031530: addiu a3, a3, -15628
 	ldloc 4
 	ldc.i4 -15628
 	add
 	stloc 4
-// 0x01031524: 0x1031524: addiu a0, zero, 3
+// 0x01031534: 0x1031534: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01031528: 0x1031528: addiu a2, zero, 1426
+// 0x01031538: 0x1031538: addiu a2, zero, 1426
 	ldc.i4 1426
 	stloc.3
-// 0x0103152c: 0x103152c: jal   0x100449c sw    v0, 16(sp)
+// 0x0103153c: 0x103153c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7054,10 +7054,10 @@ L_10314ec:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031534: 0x1031534: lui   v0, 0x0
+// 0x01031544: 0x1031544: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01031538: 0x1031538: lw    v0, 12264(v0)
+// 0x01031548: 0x1031548: lw    v0, 12264(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7066,13 +7066,13 @@ L_10314ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103153c: 0x103153c: lui   a0, 0x1030000
+// 0x0103154c: 0x103154c: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01031540: 0x1031540: jalr  v0 addiu a0, a0, 5208
+// 0x01031550: 0x1031550: jalr  v0 addiu a0, a0, 5224
 	ldloc 5
 	ldloc.1
-	ldc.i4 5208
+	ldc.i4 5224
 	add
 	stloc.1
 	ldloc.0
@@ -7085,41 +7085,41 @@ L_10314ec:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031548: 0x1031548: addiu v0, zero, 1
+// 0x01031558: 0x1031558: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103154c: 0x103154c: j	 0x1031740 sw    v0, -18620(s0)
+// 0x0103155c: 0x103155c: j	 0x1031750 sw    v0, -18156(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4655
+	ldc.i4 -4539
 	add
 	ldloc 5
 	stelem.i4
-	br L_1031740
+	br L_1031750
 // --- basic block ---
-L_1031554:
-// 0x01031554: 0x1031554: lw    v0, -18620(s0)
+L_1031564:
+// 0x01031564: 0x1031564: lw    v0, -18156(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4655
+	ldc.i4 -4539
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031558: 0x1031558: sll   zero, zero, 0
-// 0x0103155c: 0x103155c: beq   v0, zero, 0x1031580 addu  v1, zero, zero
+// 0x01031568: 0x1031568: sll   zero, zero, 0
+// 0x0103156c: 0x103156c: beq   v0, zero, 0x1031590 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1031580
+	brfalse L_1031590
 // --- basic block ---
-// 0x01031564: 0x1031564: lui   v0, 0x0
+// 0x01031574: 0x1031574: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01031568: 0x1031568: lw    v0, 12212(v0)
+// 0x01031578: 0x1031578: lw    v0, 12212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7128,13 +7128,13 @@ L_1031554:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103156c: 0x103156c: lui   a0, 0x1030000
+// 0x0103157c: 0x103157c: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01031570: 0x1031570: jalr  v0 addiu a0, a0, 5208
+// 0x01031580: 0x1031580: jalr  v0 addiu a0, a0, 5224
 	ldloc 5
 	ldloc.1
-	ldc.i4 5208
+	ldc.i4 5224
 	add
 	stloc.1
 	ldloc.0
@@ -7147,31 +7147,31 @@ L_1031554:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031578: 0x1031578: sw    zero, -18620(s0)
+// 0x01031588: 0x1031588: sw    zero, -18156(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4655
+	ldc.i4 -4539
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103157c: 0x103157c: addu  v1, zero, zero
+// 0x0103158c: 0x103158c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1031580:
-// 0x01031580: 0x1031580: cibyl_sysc_arg 0x3
+L_1031590:
+// 0x01031590: 0x1031590: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01031584: 0x1031584: cibyl_sysc 0x4e6
+// 0x01031594: 0x1031594: cibyl_sysc 0x4e6
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01031588: 0x1031588: addu  a0, v0, zero
+// 0x01031598: 0x1031598: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103158c: 0x103158c: lui   v0, 0x0
+// 0x0103159c: 0x103159c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01031590: 0x1031590: sw    a0, 12288(v0)
+// 0x010315a0: 0x10315a0: sw    a0, 12288(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7180,30 +7180,30 @@ L_1031580:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01031594: 0x1031594: cibyl_sysc_arg 0x3
+// 0x010315a4: 0x10315a4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01031598: 0x1031598: cibyl_sysc 0x4eb
+// 0x010315a8: 0x10315a8: cibyl_sysc 0x4eb
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0103159c: 0x103159c: addu  v1, v0, zero
+// 0x010315ac: 0x10315ac: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010315a0: 0x10315a0: lui   a0, 0x60000
+// 0x010315b0: 0x10315b0: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x010315a4: 0x10315a4: lui   v0, 0x0
+// 0x010315b4: 0x10315b4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010315a8: 0x10315a8: sw    v1, -23856(a0)
+// 0x010315b8: 0x10315b8: sw    v1, -23392(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5964
+	ldc.i4 -5848
 	add
 	ldloc 6
 	stelem.i4
-// 0x010315ac: 0x10315ac: lw    v0, 12264(v0)
+// 0x010315bc: 0x10315bc: lw    v0, 12264(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7212,13 +7212,13 @@ L_1031580:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010315b0: 0x10315b0: lui   a0, 0x1030000
+// 0x010315c0: 0x10315c0: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x010315b4: 0x10315b4: jalr  v0 addiu a0, a0, 6276
+// 0x010315c4: 0x10315c4: jalr  v0 addiu a0, a0, 6292
 	ldloc 5
 	ldloc.1
-	ldc.i4 6276
+	ldc.i4 6292
 	add
 	stloc.1
 	ldloc.0
@@ -7231,29 +7231,29 @@ L_1031580:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010315bc: 0x10315bc: lui   a0, 0x60000
+// 0x010315cc: 0x10315cc: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x010315c0: 0x10315c0: lw    v1, -18380(a0)
+// 0x010315d0: 0x10315d0: lw    v1, -17916(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4595
+	ldc.i4 -4479
 	add
 	ldelem.i4
 	stloc 6
-// 0x010315c4: 0x10315c4: addiu v0, zero, 5
+// 0x010315d4: 0x10315d4: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010315c8: 0x10315c8: beq   v1, v0, 0x10315e0 lui   v0, 0x0
+// 0x010315d8: 0x10315d8: beq   v1, v0, 0x10315f0 lui   v0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_10315e0
+	beq  L_10315f0
 // --- basic block ---
-// 0x010315d0: 0x10315d0: lw    v0, 12268(v0)
+// 0x010315e0: 0x10315e0: lw    v0, 12268(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7262,11 +7262,11 @@ L_1031580:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010315d4: 0x10315d4: sll   zero, zero, 0
-// 0x010315d8: 0x10315d8: jalr  v0 addiu a0, a0, -18380
+// 0x010315e4: 0x10315e4: sll   zero, zero, 0
+// 0x010315e8: 0x10315e8: jalr  v0 addiu a0, a0, -17916
 	ldloc 5
 	ldloc.1
-	ldc.i4 -18380
+	ldc.i4 -17916
 	add
 	stloc.1
 	ldloc.0
@@ -7279,69 +7279,69 @@ L_1031580:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10315e0:
-// 0x010315e0: 0x10315e0: lui   v0, 0x60000
+L_10315f0:
+// 0x010315f0: 0x10315f0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010315e4: 0x10315e4: lw    v0, -23864(v0)
+// 0x010315f4: 0x10315f4: lw    v0, -23400(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5966
+	ldc.i4 -5850
 	add
 	ldelem.i4
 	stloc 5
-// 0x010315e8: 0x10315e8: addiu v1, zero, 1
+// 0x010315f8: 0x10315f8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010315ec: 0x10315ec: beq   v0, v1, 0x103160c addiu v1, zero, 3
+// 0x010315fc: 0x10315fc: beq   v0, v1, 0x103161c addiu v1, zero, 3
 	ldloc 5
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	beq  L_103160c
+	beq  L_103161c
 // --- basic block ---
-// 0x010315f4: 0x10315f4: beq   v0, v1, 0x1031740 addiu v1, zero, 4
+// 0x01031604: 0x1031604: beq   v0, v1, 0x1031750 addiu v1, zero, 4
 	ldloc 5
 	ldloc 6
 	ldc.i4.4
 	stloc 6
-	beq  L_1031740
+	beq  L_1031750
 // --- basic block ---
-// 0x010315fc: 0x10315fc: bne   v0, v1, 0x1031728 lui   a1, 0x10000
+// 0x0103160c: 0x103160c: bne   v0, v1, 0x1031738 lui   a1, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1031728
+	bne.un L_1031738
 // --- basic block ---
-// 0x01031604: 0x1031604: j	 0x1031718 lui   a0, 0x1030000
+// 0x01031614: 0x1031614: j	 0x1031728 lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-	br L_1031718
+	br L_1031728
 // --- basic block ---
-L_103160c:
-// 0x0103160c: 0x103160c: lui   s0, 0x60000
+L_103161c:
+// 0x0103161c: 0x103161c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01031610: 0x1031610: lw    v0, -18104(s0)
+// 0x01031620: 0x1031620: lw    v0, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031614: 0x1031614: sll   zero, zero, 0
-// 0x01031618: 0x1031618: bne   v0, zero, 0x1031740 lui   a0, 0x0
+// 0x01031624: 0x1031624: sll   zero, zero, 0
+// 0x01031628: 0x1031628: bne   v0, zero, 0x1031750 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1031740
+	brtrue L_1031750
 // --- basic block ---
-// 0x01031620: 0x1031620: jal   0x1036c4c addiu a0, a0, 12192
+// 0x01031630: 0x1031630: jal   0x1036c5c addiu a0, a0, 12192
 	ldloc.1
 	ldc.i4 12192
 	add
@@ -7351,39 +7351,39 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_nmea_create_1036c4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_nmea_create_1036c5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031628: 0x1031628: lui   a1, 0x10000
+// 0x01031638: 0x1031638: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103162c: 0x103162c: lui   a2, 0x1030000
+// 0x0103163c: 0x103163c: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x01031630: 0x1031630: addu  a3, v0, zero
+// 0x01031640: 0x1031640: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01031634: 0x1031634: addiu a1, a1, -15600
+// 0x01031644: 0x1031644: addiu a1, a1, -15600
 	ldloc.2
 	ldc.i4 -15600
 	add
 	stloc.2
-// 0x01031638: 0x1031638: addiu a2, a2, 10348
+// 0x01031648: 0x1031648: addiu a2, a2, 10364
 	ldloc.3
-	ldc.i4 10348
+	ldc.i4 10364
 	add
 	stloc.3
-// 0x0103163c: 0x103163c: addu  a0, zero, zero
+// 0x0103164c: 0x103164c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01031640: 0x1031640: jal   0x10358cc sw    v0, -18104(s0)
+// 0x01031650: 0x1031650: jal   0x10358dc sw    v0, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldloc 5
 	stelem.i4
@@ -7392,37 +7392,37 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031648: 0x1031648: lw    a3, -18104(s0)
+// 0x01031658: 0x1031658: lw    a3, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103164c: 0x103164c: lui   a1, 0x10000
+// 0x0103165c: 0x103165c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031650: 0x1031650: lui   a2, 0x1030000
+// 0x01031660: 0x1031660: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x01031654: 0x1031654: addiu a1, a1, -15596
+// 0x01031664: 0x1031664: addiu a1, a1, -15596
 	ldloc.2
 	ldc.i4 -15596
 	add
 	stloc.2
-// 0x01031658: 0x1031658: addiu a2, a2, 10100
+// 0x01031668: 0x1031668: addiu a2, a2, 10116
 	ldloc.3
-	ldc.i4 10100
+	ldc.i4 10116
 	add
 	stloc.3
-// 0x0103165c: 0x103165c: jal   0x10358cc addu  a0, zero, zero
+// 0x0103166c: 0x103166c: jal   0x10358dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7430,37 +7430,37 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031664: 0x1031664: lw    a3, -18104(s0)
+// 0x01031674: 0x1031674: lw    a3, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 4
-// 0x01031668: 0x1031668: lui   a1, 0x10000
+// 0x01031678: 0x1031678: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103166c: 0x103166c: lui   a2, 0x1030000
+// 0x0103167c: 0x103167c: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x01031670: 0x1031670: addiu a1, a1, -15592
+// 0x01031680: 0x1031680: addiu a1, a1, -15592
 	ldloc.2
 	ldc.i4 -15592
 	add
 	stloc.2
-// 0x01031674: 0x1031674: addiu a2, a2, 10016
+// 0x01031684: 0x1031684: addiu a2, a2, 10032
 	ldloc.3
-	ldc.i4 10016
+	ldc.i4 10032
 	add
 	stloc.3
-// 0x01031678: 0x1031678: jal   0x10358cc addu  a0, zero, zero
+// 0x01031688: 0x1031688: jal   0x10358dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7468,37 +7468,37 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031680: 0x1031680: lw    a3, -18104(s0)
+// 0x01031690: 0x1031690: lw    a3, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 4
-// 0x01031684: 0x1031684: lui   a1, 0x10000
+// 0x01031694: 0x1031694: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031688: 0x1031688: lui   a2, 0x1030000
+// 0x01031698: 0x1031698: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x0103168c: 0x103168c: addiu a1, a1, -15588
+// 0x0103169c: 0x103169c: addiu a1, a1, -15588
 	ldloc.2
 	ldc.i4 -15588
 	add
 	stloc.2
-// 0x01031690: 0x1031690: addiu a2, a2, 7004
+// 0x010316a0: 0x10316a0: addiu a2, a2, 7020
 	ldloc.3
-	ldc.i4 7004
+	ldc.i4 7020
 	add
 	stloc.3
-// 0x01031694: 0x1031694: jal   0x10358cc addu  a0, zero, zero
+// 0x010316a4: 0x10316a4: jal   0x10358dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7506,37 +7506,37 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103169c: 0x103169c: lw    a3, -18104(s0)
+// 0x010316ac: 0x10316ac: lw    a3, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 4
-// 0x010316a0: 0x10316a0: lui   a1, 0x10000
+// 0x010316b0: 0x10316b0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010316a4: 0x10316a4: lui   a2, 0x1030000
+// 0x010316b4: 0x10316b4: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x010316a8: 0x10316a8: addiu a1, a1, -15584
+// 0x010316b8: 0x10316b8: addiu a1, a1, -15584
 	ldloc.2
 	ldc.i4 -15584
 	add
 	stloc.2
-// 0x010316ac: 0x10316ac: addiu a2, a2, 4092
+// 0x010316bc: 0x10316bc: addiu a2, a2, 4108
 	ldloc.3
-	ldc.i4 4092
+	ldc.i4 4108
 	add
 	stloc.3
-// 0x010316b0: 0x10316b0: jal   0x10358cc addu  a0, zero, zero
+// 0x010316c0: 0x10316c0: jal   0x10358dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7544,42 +7544,42 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010316b8: 0x10316b8: lui   s1, 0x10000
+// 0x010316c8: 0x10316c8: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010316bc: 0x10316bc: lw    a3, -18104(s0)
+// 0x010316cc: 0x10316cc: lw    a3, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 4
-// 0x010316c0: 0x10316c0: lui   a1, 0x20000
+// 0x010316d0: 0x10316d0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010316c4: 0x10316c4: lui   a2, 0x1030000
+// 0x010316d4: 0x10316d4: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x010316c8: 0x10316c8: addiu a0, s1, -15580
+// 0x010316d8: 0x10316d8: addiu a0, s1, -15580
 	ldloc 9
 	ldc.i4 -15580
 	add
 	stloc.1
-// 0x010316cc: 0x10316cc: addiu a1, a1, -13944
+// 0x010316dc: 0x10316dc: addiu a1, a1, -13480
 	ldloc.2
-	ldc.i4 -13944
+	ldc.i4 -13480
 	add
 	stloc.2
-// 0x010316d0: 0x10316d0: jal   0x10358cc addiu a2, a2, 7380
+// 0x010316e0: 0x10316e0: jal   0x10358dc addiu a2, a2, 7396
 	ldloc.3
-	ldc.i4 7380
+	ldc.i4 7396
 	add
 	stloc.3
 	ldloc.0
@@ -7587,39 +7587,39 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010316d8: 0x10316d8: lw    a3, -18104(s0)
+// 0x010316e8: 0x10316e8: lw    a3, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 4
-// 0x010316dc: 0x10316dc: lui   a1, 0x10000
+// 0x010316ec: 0x10316ec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010316e0: 0x10316e0: lui   a2, 0x1030000
+// 0x010316f0: 0x10316f0: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x010316e4: 0x10316e4: addiu a0, s1, -15580
+// 0x010316f4: 0x10316f4: addiu a0, s1, -15580
 	ldloc 9
 	ldc.i4 -15580
 	add
 	stloc.1
-// 0x010316e8: 0x10316e8: addiu a1, a1, -22352
+// 0x010316f8: 0x10316f8: addiu a1, a1, -22352
 	ldloc.2
 	ldc.i4 -22352
 	add
 	stloc.2
-// 0x010316ec: 0x10316ec: jal   0x10358cc addiu a2, a2, 7276
+// 0x010316fc: 0x10316fc: jal   0x10358dc addiu a2, a2, 7292
 	ldloc.3
-	ldc.i4 7276
+	ldc.i4 7292
 	add
 	stloc.3
 	ldloc.0
@@ -7627,37 +7627,37 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010316f4: 0x10316f4: lw    a3, -18104(s0)
+// 0x01031704: 0x1031704: lw    a3, -17640(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 4
-// 0x010316f8: 0x10316f8: lui   a1, 0x10000
+// 0x01031708: 0x1031708: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010316fc: 0x10316fc: lui   a2, 0x1030000
+// 0x0103170c: 0x103170c: lui   a2, 0x1030000
 	ldc.i4 16973824
 	stloc.3
-// 0x01031700: 0x1031700: addiu a1, a1, -15576
+// 0x01031710: 0x1031710: addiu a1, a1, -15576
 	ldloc.2
 	ldc.i4 -15576
 	add
 	stloc.2
-// 0x01031704: 0x1031704: addiu a2, a2, 6528
+// 0x01031714: 0x1031714: addiu a2, a2, 6544
 	ldloc.3
-	ldc.i4 6528
+	ldc.i4 6544
 	add
 	stloc.3
-// 0x01031708: 0x1031708: jal   0x10358cc addu  a0, zero, zero
+// 0x01031718: 0x1031718: jal   0x10358dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7665,45 +7665,45 @@ L_103160c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031710: 0x1031710: j	 0x1031740 sll   zero, zero, 0
-	br L_1031740
+// 0x01031720: 0x1031720: j	 0x1031750 sll   zero, zero, 0
+	br L_1031750
 // --- basic block ---
-L_1031718:
-// 0x01031718: 0x1031718: jal   0x1036d04 addiu a0, a0, 10504
+L_1031728:
+// 0x01031728: 0x1031728: jal   0x1036d14 addiu a0, a0, 10520
 	ldloc.1
-	ldc.i4 10504
+	ldc.i4 10520
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl40::roadmap_gpsj2me_subscribe_to_navigation_1036d04(int32)
+	call int32 Cibyl40::roadmap_gpsj2me_subscribe_to_navigation_1036d14(int32)
 	stloc 5
 // --- basic block ---
-// 0x01031720: 0x1031720: j	 0x1031740 sll   zero, zero, 0
-	br L_1031740
+// 0x01031730: 0x1031730: j	 0x1031750 sll   zero, zero, 0
+	br L_1031750
 // --- basic block ---
-L_1031728:
-// 0x01031728: 0x1031728: lui   a3, 0x10000
+L_1031738:
+// 0x01031738: 0x1031738: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103172c: 0x103172c: addiu a1, a1, -15752
+// 0x0103173c: 0x103173c: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031730: 0x1031730: addiu a3, a3, -15572
+// 0x01031740: 0x1031740: addiu a3, a3, -15572
 	ldloc 4
 	ldc.i4 -15572
 	add
 	stloc 4
-// 0x01031734: 0x1031734: addiu a0, zero, 5
+// 0x01031744: 0x1031744: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01031738: 0x1031738: jal   0x100449c addiu a2, zero, 1504
+// 0x01031748: 0x1031748: jal   0x100449c addiu a2, zero, 1504
 	ldc.i4 1504
 	stloc.3
 	ldloc.0
@@ -7716,9 +7716,9 @@ L_1031728:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1031740:
-// 0x01031740: 0x1031740: lw    ra, 36(sp)
-// 0x01031744: 0x1031744: lw    s1, 32(sp)
+L_1031750:
+// 0x01031750: 0x1031750: lw    ra, 36(sp)
+// 0x01031754: 0x1031754: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7727,7 +7727,7 @@ L_1031740:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01031748: 0x1031748: lw    s0, 28(sp)
+// 0x01031758: 0x1031758: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7736,7 +7736,7 @@ L_1031740:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103174c: 0x103174c: jr    ra addiu sp, sp, 40
+// 0x0103175c: 0x103175c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl36.j b/converted/Cibyl36.j
index 10926c8..b459d18 100644
--- a/converted/Cibyl36.j
+++ b/converted/Cibyl36.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl36::.ctor
 
-.method public static int32 roadmap_gps_input_1031754(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_input_1031764(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -79,24 +79,24 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031754: 0x1031754: lui   v0, 0x60000
+// 0x01031764: 0x1031764: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031758: 0x1031758: lw    v1, -23844(v0)
+// 0x01031768: 0x1031768: lw    v1, -23380(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5961
+	ldc.i4 -5845
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103175c: 0x103175c: addiu sp, sp, -24
+// 0x0103176c: 0x103176c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01031760: 0x1031760: sw    s0, 16(sp)
+// 0x01031770: 0x1031770: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -105,27 +105,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031764: 0x1031764: sw    ra, 20(sp)
-// 0x01031768: 0x1031768: bne   v1, zero, 0x103178c addu  s0, a0, zero
+// 0x01031774: 0x1031774: sw    ra, 20(sp)
+// 0x01031778: 0x1031778: bne   v1, zero, 0x103179c addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 8
-	brtrue L_103178c
+	brtrue L_103179c
 // --- basic block ---
-// 0x01031770: 0x1031770: lui   a0, 0x1030000
+// 0x01031780: 0x1031780: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01031774: 0x1031774: addiu v1, v0, -23844
+// 0x01031784: 0x1031784: addiu v1, v0, -23380
 	ldloc 5
-	ldc.i4 -23844
+	ldc.i4 -23380
 	add
 	stloc 6
-// 0x01031778: 0x1031778: addiu a0, a0, 3272
+// 0x01031788: 0x1031788: addiu a0, a0, 3288
 	ldloc.1
-	ldc.i4 3272
+	ldc.i4 3288
 	add
 	stloc.1
-// 0x0103177c: 0x103177c: sw    a0, 20(v1)
+// 0x0103178c: 0x103178c: sw    a0, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -134,48 +134,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01031780: 0x1031780: lui   v1, 0x0
+// 0x01031790: 0x1031790: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01031784: 0x1031784: addiu v1, v1, 12192
+// 0x01031794: 0x1031794: addiu v1, v1, 12192
 	ldloc 6
 	ldc.i4 12192
 	add
 	stloc 6
-// 0x01031788: 0x1031788: sw    v1, -23844(v0)
+// 0x01031798: 0x1031798: sw    v1, -23380(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5961
+	ldc.i4 -5845
 	add
 	ldloc 6
 	stelem.i4
-L_103178c:
-// 0x0103178c: 0x103178c: lui   v0, 0x60000
+L_103179c:
+// 0x0103179c: 0x103179c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031790: 0x1031790: lw    v1, -23864(v0)
+// 0x010317a0: 0x10317a0: lw    v1, -23400(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5966
+	ldc.i4 -5850
 	add
 	ldelem.i4
 	stloc 6
-// 0x01031794: 0x1031794: lui   v0, 0x60000
+// 0x010317a4: 0x10317a4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031798: 0x1031798: addiu v0, v0, -23844
+// 0x010317a8: 0x10317a8: addiu v0, v0, -23380
 	ldloc 5
-	ldc.i4 -23844
+	ldc.i4 -23380
 	add
 	stloc 5
-// 0x0103179c: 0x103179c: addiu a0, zero, 1
+// 0x010317ac: 0x10317ac: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010317a0: 0x10317a0: beq   v1, a0, 0x10317c4 sw    s0, 4(v0)
+// 0x010317b0: 0x10317b0: beq   v1, a0, 0x10317d4 sw    s0, 4(v0)
 	ldloc 6
 	ldloc.1
 	ldloc 7
@@ -186,52 +186,52 @@ L_103178c:
 	add
 	ldloc 8
 	stelem.i4
-	beq  L_10317c4
+	beq  L_10317d4
 // --- basic block ---
-// 0x010317a8: 0x10317a8: addiu a1, zero, 3
+// 0x010317b8: 0x10317b8: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010317ac: 0x10317ac: beq   v1, a1, 0x1031874 addiu a1, zero, 4
+// 0x010317bc: 0x10317bc: beq   v1, a1, 0x1031884 addiu a1, zero, 4
 	ldloc 6
 	ldloc.2
 	ldc.i4.4
 	stloc.2
-	beq  L_1031874
+	beq  L_1031884
 // --- basic block ---
-// 0x010317b4: 0x10317b4: bne   v1, a1, 0x10317f8 lui   a1, 0x10000
+// 0x010317c4: 0x10317c4: bne   v1, a1, 0x1031808 lui   a1, 0x10000
 	ldloc 6
 	ldloc.2
 	ldc.i4 65536
 	stloc.2
-	bne.un L_10317f8
+	bne.un L_1031808
 // --- basic block ---
-// 0x010317bc: 0x10317bc: j	 0x10317e4 lui   v1, 0x1030000
+// 0x010317cc: 0x10317cc: j	 0x10317f4 lui   v1, 0x1030000
 	ldc.i4 16973824
 	stloc 6
-	br L_10317e4
+	br L_10317f4
 // --- basic block ---
-L_10317c4:
-// 0x010317c4: 0x10317c4: lui   v1, 0x60000
+L_10317d4:
+// 0x010317d4: 0x10317d4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010317c8: 0x10317c8: lw    v1, -18104(v1)
+// 0x010317d8: 0x10317d8: lw    v1, -17640(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4526
+	ldc.i4 -4410
 	add
 	ldelem.i4
 	stloc 6
-// 0x010317cc: 0x10317cc: lui   a0, 0x1030000
+// 0x010317dc: 0x10317dc: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x010317d0: 0x10317d0: addiu a0, a0, 27080
+// 0x010317e0: 0x10317e0: addiu a0, a0, 27096
 	ldloc.1
-	ldc.i4 27080
+	ldc.i4 27096
 	add
 	stloc.1
-// 0x010317d4: 0x10317d4: sw    a0, 24(v0)
+// 0x010317e4: 0x10317e4: sw    a0, 24(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -240,7 +240,7 @@ L_10317c4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010317d8: 0x10317d8: sw    v1, 12(v0)
+// 0x010317e8: 0x10317e8: sw    v1, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -249,7 +249,7 @@ L_10317c4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010317dc: 0x10317dc: j	 0x1031810 sw    zero, 16(v0)
+// 0x010317ec: 0x10317ec: j	 0x1031820 sw    zero, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -258,15 +258,15 @@ L_10317c4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1031810
+	br L_1031820
 // --- basic block ---
-L_10317e4:
-// 0x010317e4: 0x10317e4: addiu v1, v1, 28028
+L_10317f4:
+// 0x010317f4: 0x10317f4: addiu v1, v1, 28044
 	ldloc 6
-	ldc.i4 28028
+	ldc.i4 28044
 	add
 	stloc 6
-// 0x010317e8: 0x10317e8: sw    a0, 16(v0)
+// 0x010317f8: 0x10317f8: sw    a0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -275,7 +275,7 @@ L_10317e4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010317ec: 0x10317ec: sw    v1, 24(v0)
+// 0x010317fc: 0x10317fc: sw    v1, 24(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -284,7 +284,7 @@ L_10317e4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010317f0: 0x10317f0: j	 0x1031810 sw    zero, 12(v0)
+// 0x01031800: 0x1031800: j	 0x1031820 sw    zero, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -293,26 +293,26 @@ L_10317e4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1031810
+	br L_1031820
 // --- basic block ---
-L_10317f8:
-// 0x010317f8: 0x10317f8: lui   a3, 0x10000
+L_1031808:
+// 0x01031808: 0x1031808: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010317fc: 0x10317fc: addiu a1, a1, -15752
+// 0x0103180c: 0x103180c: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031800: 0x1031800: addiu a3, a3, -15572
+// 0x01031810: 0x1031810: addiu a3, a3, -15572
 	ldloc 4
 	ldc.i4 -15572
 	add
 	stloc 4
-// 0x01031804: 0x1031804: addiu a0, zero, 5
+// 0x01031814: 0x1031814: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01031808: 0x1031808: jal   0x100449c addiu a2, zero, 1592
+// 0x01031818: 0x1031818: jal   0x100449c addiu a2, zero, 1592
 	ldc.i4 1592
 	stloc.3
 	ldloc.0
@@ -325,13 +325,13 @@ L_10317f8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1031810:
-// 0x01031810: 0x1031810: lui   a0, 0x60000
+L_1031820:
+// 0x01031820: 0x1031820: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01031814: 0x1031814: jal   0x1036f04 addiu a0, a0, -23844
+// 0x01031824: 0x1031824: jal   0x1036f14 addiu a0, a0, -23380
 	ldloc.1
-	ldc.i4 -23844
+	ldc.i4 -23380
 	add
 	stloc.1
 	ldloc.0
@@ -339,22 +339,22 @@ L_1031810:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_input_1036f04(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_input_1036f14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103181c: 0x103181c: bgez  v0, 0x1031860 addu  v1, zero, zero
+// 0x0103182c: 0x103182c: bgez  v0, 0x1031870 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	bge L_1031860
+	bge L_1031870
 // --- basic block ---
-// 0x01031824: 0x1031824: lui   v0, 0x0
+// 0x01031834: 0x1031834: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01031828: 0x1031828: lw    v0, 12208(v0)
+// 0x01031838: 0x1031838: lw    v0, 12208(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -363,8 +363,8 @@ L_1031810:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103182c: 0x103182c: sll   zero, zero, 0
-// 0x01031830: 0x1031830: jalr  v0 addu  a0, s0, zero
+// 0x0103183c: 0x103183c: sll   zero, zero, 0
+// 0x01031840: 0x1031840: jalr  v0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
@@ -378,7 +378,7 @@ L_1031810:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031838: 0x1031838: jal   0x1037238 addu  a0, s0, zero
+// 0x01031848: 0x1031848: jal   0x1037248 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -386,15 +386,15 @@ L_1031810:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_close_1037238(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_close_1037248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031840: 0x1031840: lui   v0, 0x0
+// 0x01031850: 0x1031850: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01031844: 0x1031844: lw    v0, 12212(v0)
+// 0x01031854: 0x1031854: lw    v0, 12212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -403,13 +403,13 @@ L_1031810:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031848: 0x1031848: lui   a0, 0x1030000
+// 0x01031858: 0x1031858: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0103184c: 0x103184c: jalr  v0 addiu a0, a0, 6276
+// 0x0103185c: 0x103185c: jalr  v0 addiu a0, a0, 6292
 	ldloc 5
 	ldloc.1
-	ldc.i4 6276
+	ldc.i4 6292
 	add
 	stloc.1
 	ldloc.0
@@ -422,44 +422,44 @@ L_1031810:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031854: 0x1031854: jal   0x1031458 sll   zero, zero, 0
+// 0x01031864: 0x1031864: jal   0x1031468 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_open_1031458(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_open_1031468(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103185c: 0x103185c: addu  v1, zero, zero
+// 0x0103186c: 0x103186c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1031860:
-// 0x01031860: 0x1031860: cibyl_sysc_arg 0x3
+L_1031870:
+// 0x01031870: 0x1031870: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01031864: 0x1031864: cibyl_sysc 0x4f0
+// 0x01031874: 0x1031874: cibyl_sysc 0x4f0
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01031868: 0x1031868: addu  v1, v0, zero
+// 0x01031878: 0x1031878: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0103186c: 0x103186c: lui   v0, 0x60000
+// 0x0103187c: 0x103187c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031870: 0x1031870: sw    v1, -23856(v0)
+// 0x01031880: 0x1031880: sw    v1, -23392(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5964
+	ldc.i4 -5848
 	add
 	ldloc 6
 	stelem.i4
-L_1031874:
-// 0x01031874: 0x1031874: lw    ra, 20(sp)
-// 0x01031878: 0x1031878: lw    s0, 16(sp)
+L_1031884:
+// 0x01031884: 0x1031884: lw    ra, 20(sp)
+// 0x01031888: 0x1031888: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -468,7 +468,7 @@ L_1031874:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103187c: 0x103187c: jr    ra addiu sp, sp, 24
+// 0x0103188c: 0x103188c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -480,7 +480,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_keep_alive_1031884(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_keep_alive_1031894(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -515,16 +515,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031884: 0x1031884: lui   a0, 0x0
+// 0x01031894: 0x1031894: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01031888: 0x1031888: addiu sp, sp, -24
+// 0x01031898: 0x1031898: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103188c: 0x103188c: sw    ra, 20(sp)
-// 0x01031890: 0x1031890: jal   0x100e788 addiu a0, a0, 12216
+// 0x0103189c: 0x103189c: sw    ra, 20(sp)
+// 0x010318a0: 0x10318a0: jal   0x100e798 addiu a0, a0, 12216
 	ldloc.1
 	ldc.i4 12216
 	add
@@ -534,79 +534,79 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031898: 0x1031898: addu  v1, v0, zero
+// 0x010318a8: 0x10318a8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0103189c: 0x103189c: addu  a0, zero, zero
+// 0x010318ac: 0x10318ac: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010318a0: 0x10318a0: cibyl_sysc_arg 0x4
+// 0x010318b0: 0x10318b0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010318a4: 0x10318a4: cibyl_sysc 0x4f5
+// 0x010318b4: 0x10318b4: cibyl_sysc 0x4f5
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010318a8: 0x10318a8: addu  a0, v0, zero
+// 0x010318b8: 0x10318b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010318ac: 0x10318ac: lui   v0, 0x60000
+// 0x010318bc: 0x10318bc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010318b0: 0x10318b0: lw    v0, -18692(v0)
+// 0x010318c0: 0x10318c0: lw    v0, -18228(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4673
+	ldc.i4 -4557
 	add
 	ldelem.i4
 	stloc 5
-// 0x010318b4: 0x10318b4: sll   zero, zero, 0
-// 0x010318b8: 0x10318b8: subu  a0, a0, v0
+// 0x010318c4: 0x10318c4: sll   zero, zero, 0
+// 0x010318c8: 0x10318c8: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x010318bc: 0x10318bc: slt   v1, a0, v1
+// 0x010318cc: 0x10318cc: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x010318c0: 0x10318c0: bne   v1, zero, 0x10318e8 lui   v0, 0x60000
+// 0x010318d0: 0x10318d0: bne   v1, zero, 0x10318f8 lui   v0, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 5
-	brtrue L_10318e8
+	brtrue L_10318f8
 // --- basic block ---
-// 0x010318c8: 0x10318c8: lui   v0, 0x60000
+// 0x010318d8: 0x10318d8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010318cc: 0x10318cc: lw    v1, -18688(v0)
+// 0x010318dc: 0x10318dc: lw    v1, -18224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4672
+	ldc.i4 -4556
 	add
 	ldelem.i4
 	stloc 6
-// 0x010318d0: 0x10318d0: sll   zero, zero, 0
-// 0x010318d4: 0x10318d4: bne   v1, zero, 0x10318e4 addiu v1, zero, 1
+// 0x010318e0: 0x10318e0: sll   zero, zero, 0
+// 0x010318e4: 0x10318e4: bne   v1, zero, 0x10318f4 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 6
-	brtrue L_10318e4
+	brtrue L_10318f4
 // --- basic block ---
-// 0x010318dc: 0x10318dc: jal   0x1031350 sw    v1, -18688(v0)
+// 0x010318ec: 0x10318ec: jal   0x1031360 sw    v1, -18224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4672
+	ldc.i4 -4556
 	add
 	ldloc 6
 	stelem.i4
@@ -615,64 +615,64 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_set_location_focus_1031350(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_set_location_focus_1031360(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10318e4:
-// 0x010318e4: 0x10318e4: lui   v0, 0x60000
+L_10318f4:
+// 0x010318f4: 0x10318f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_10318e8:
-// 0x010318e8: 0x10318e8: lw    v0, -18380(v0)
+L_10318f8:
+// 0x010318f8: 0x10318f8: lw    v0, -17916(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4595
+	ldc.i4 -4479
 	add
 	ldelem.i4
 	stloc 5
-// 0x010318ec: 0x10318ec: sll   zero, zero, 0
-// 0x010318f0: 0x10318f0: beq   v0, zero, 0x1031970 sll   zero, zero, 0
+// 0x010318fc: 0x10318fc: sll   zero, zero, 0
+// 0x01031900: 0x1031900: beq   v0, zero, 0x1031980 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1031970
+	brfalse L_1031980
 // --- basic block ---
-// 0x010318f8: 0x10318f8: jal   0x1031084 sll   zero, zero, 0
+// 0x01031908: 0x1031908: jal   0x1031094 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_active_1031084(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_active_1031094(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031900: 0x1031900: bne   v0, zero, 0x1031970 lui   a1, 0x10000
+// 0x01031910: 0x1031910: bne   v0, zero, 0x1031980 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1031970
+	brtrue L_1031980
 // --- basic block ---
-// 0x01031908: 0x1031908: lui   a3, 0x10000
+// 0x01031918: 0x1031918: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103190c: 0x103190c: addiu a1, a1, -15752
+// 0x0103191c: 0x103191c: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031910: 0x1031910: addiu a3, a3, -15532
+// 0x01031920: 0x1031920: addiu a3, a3, -15532
 	ldloc 4
 	ldc.i4 -15532
 	add
 	stloc 4
-// 0x01031914: 0x1031914: addiu a0, zero, 4
+// 0x01031924: 0x1031924: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01031918: 0x1031918: jal   0x100449c addiu a2, zero, 526
+// 0x01031928: 0x1031928: jal   0x100449c addiu a2, zero, 526
 	ldc.i4 526
 	stloc.3
 	ldloc.0
@@ -685,32 +685,32 @@ L_10318e8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031920: 0x1031920: jal   0x10312ec sll   zero, zero, 0
+// 0x01031930: 0x1031930: jal   0x10312fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_shutdown_10312ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_shutdown_10312fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031928: 0x1031928: jal   0x1031458 sll   zero, zero, 0
+// 0x01031938: 0x1031938: jal   0x1031468 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_open_1031458(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_open_1031468(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031930: 0x1031930: lui   a0, 0x0
+// 0x01031940: 0x1031940: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01031934: 0x1031934: jal   0x100e348 addiu a0, a0, 12232
+// 0x01031944: 0x1031944: jal   0x100e358 addiu a0, a0, 12232
 	ldloc.1
 	ldc.i4 12232
 	add
@@ -720,18 +720,18 @@ L_10318e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103193c: 0x103193c: lui   a1, 0x0
+// 0x0103194c: 0x103194c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01031940: 0x1031940: addu  a0, v0, zero
+// 0x01031950: 0x1031950: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01031944: 0x1031944: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01031954: 0x1031954: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -741,14 +741,14 @@ L_10318e8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103194c: 0x103194c: bne   v0, zero, 0x1031970 sll   zero, zero, 0
+// 0x0103195c: 0x103195c: bne   v0, zero, 0x1031980 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1031970
+	brtrue L_1031980
 // --- basic block ---
-// 0x01031954: 0x1031954: lui   a0, 0x0
+// 0x01031964: 0x1031964: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01031958: 0x1031958: jal   0x100e348 addiu a0, a0, 12248
+// 0x01031968: 0x1031968: jal   0x100e358 addiu a0, a0, 12248
 	ldloc.1
 	ldc.i4 12248
 	add
@@ -758,25 +758,25 @@ L_10318e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031960: 0x1031960: addu  v1, v0, zero
+// 0x01031970: 0x1031970: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01031964: 0x1031964: cibyl_sysc_arg 0x3
+// 0x01031974: 0x1031974: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01031968: 0x1031968: cibyl_sysc 0x4fa
+// 0x01031978: 0x1031978: cibyl_sysc 0x4fa
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_getCoarseFix(int32)
-// 0x0103196c: 0x103196c: addu  v1, v0, zero
+// 0x0103197c: 0x103197c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_1031970:
-// 0x01031970: 0x1031970: lw    ra, 20(sp)
-// 0x01031974: 0x1031974: sll   zero, zero, 0
-// 0x01031978: 0x1031978: jr    ra addiu sp, sp, 24
+L_1031980:
+// 0x01031980: 0x1031980: lw    ra, 20(sp)
+// 0x01031984: 0x1031984: sll   zero, zero, 0
+// 0x01031988: 0x1031988: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -788,7 +788,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_gsv_1031980(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_gsv_1031990(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t4,int32 t1,int32 s0,int32 t0,int32 s2,int32 s3,int32 s4,int32 t2,int32 t3,int32 s1,int32 ra)
@@ -853,13 +853,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031980: 0x1031980: addiu sp, sp, -40
+// 0x01031990: 0x1031990: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01031984: 0x1031984: sw    ra, 36(sp)
-// 0x01031988: 0x1031988: sw    s4, 32(sp)
+// 0x01031994: 0x1031994: sw    ra, 36(sp)
+// 0x01031998: 0x1031998: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -868,7 +868,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103198c: 0x103198c: sw    s3, 28(sp)
+// 0x0103199c: 0x103199c: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -877,7 +877,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01031990: 0x1031990: sw    s2, 24(sp)
+// 0x010319a0: 0x10319a0: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -886,7 +886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01031994: 0x1031994: sw    s1, 20(sp)
+// 0x010319a4: 0x10319a4: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -895,7 +895,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01031998: 0x1031998: sw    s0, 16(sp)
+// 0x010319a8: 0x10319a8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -904,379 +904,379 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103199c: 0x103199c: lb    a3, 1(a1)
+// 0x010319ac: 0x10319ac: lb    a3, 1(a1)
 	ldloc.2
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x010319a0: 0x10319a0: sll   zero, zero, 0
-// 0x010319a4: 0x10319a4: blez  a3, 0x1031b3c addiu t1, a3, -1
+// 0x010319b0: 0x10319b0: sll   zero, zero, 0
+// 0x010319b4: 0x10319b4: blez  a3, 0x1031b4c addiu t1, a3, -1
 	ldloc 4
 	ldloc 4
 	ldc.i4.m1
 	add
 	stloc 9
 	ldc.i4.s 0
-	ble L_1031b3c
+	ble L_1031b4c
 // --- basic block ---
-// 0x010319ac: 0x10319ac: lui   v0, 0x60000
+// 0x010319bc: 0x10319bc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010319b0: 0x10319b0: sll   v1, t1, 5
+// 0x010319c0: 0x10319c0: sll   v1, t1, 5
 	ldloc 9
 	ldc.i4.5
 	shl
 	stloc 7
-// 0x010319b4: 0x10319b4: addiu v0, v0, -18284
+// 0x010319c4: 0x10319c4: addiu v0, v0, -17820
 	ldloc 6
-	ldc.i4 -18284
+	ldc.i4 -17820
 	add
 	stloc 6
-// 0x010319b8: 0x10319b8: addu  v0, v0, v1
+// 0x010319c8: 0x10319c8: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x010319bc: 0x10319bc: sll   t1, t1, 2
+// 0x010319cc: 0x10319cc: sll   t1, t1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x010319c0: 0x10319c0: lb    a2, 2(a1)
+// 0x010319d0: 0x10319d0: lb    a2, 2(a1)
 	ldloc.2
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x010319c4: 0x10319c4: addu  a0, a1, zero
+// 0x010319d4: 0x10319d4: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010319c8: 0x10319c8: addu  v1, a1, zero
+// 0x010319d8: 0x10319d8: addu  v1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010319cc: 0x10319cc: addu  t0, zero, zero
+// 0x010319dc: 0x10319dc: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010319d0: 0x10319d0: addiu t3, zero, 70
+// 0x010319e0: 0x10319e0: addiu t3, zero, 70
 	ldc.i4.s 70
 	stloc 16
-// 0x010319d4: 0x10319d4: j	 0x1031a18 addiu t2, zero, 4
+// 0x010319e4: 0x10319e4: j	 0x1031a28 addiu t2, zero, 4
 	ldc.i4.4
 	stloc 15
-	br L_1031a18
+	br L_1031a28
 // --- basic block ---
-L_10319dc:
-// 0x010319dc: 0x10319dc: lbu   t4, 4(a0)
+L_10319ec:
+// 0x010319ec: 0x10319ec: lbu   t4, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 8
-// 0x010319e0: 0x10319e0: addiu t1, t1, 1
+// 0x010319f0: 0x10319f0: addiu t1, t1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010319e4: 0x10319e4: sb    t4, 0(v0)
+// 0x010319f4: 0x10319f4: sb    t4, 0(v0)
 	ldloc 6
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010319e8: 0x10319e8: lbu   t4, 8(a0)
+// 0x010319f8: 0x10319f8: lbu   t4, 8(a0)
 	ldloc.1
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 8
-// 0x010319ec: 0x10319ec: addiu a0, a0, 1
+// 0x010319fc: 0x10319fc: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010319f0: 0x10319f0: sb    t4, 2(v0)
+// 0x01031a00: 0x1031a00: sb    t4, 2(v0)
 	ldloc 6
 	ldc.i4.2
 	add
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010319f4: 0x10319f4: lhu   t4, 12(v1)
+// 0x01031a04: 0x1031a04: lhu   t4, 12(v1)
 	ldloc 7
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 8
-// 0x010319f8: 0x10319f8: sll   zero, zero, 0
-// 0x010319fc: 0x10319fc: sh    t4, 4(v0)
+// 0x01031a08: 0x1031a08: sll   zero, zero, 0
+// 0x01031a0c: 0x1031a0c: sh    t4, 4(v0)
 	ldloc 6
 	ldc.i4.4
 	add
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01031a00: 0x1031a00: lhu   t4, 20(v1)
+// 0x01031a10: 0x1031a10: lhu   t4, 20(v1)
 	ldloc 7
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 8
-// 0x01031a04: 0x1031a04: sb    t3, 1(v0)
+// 0x01031a14: 0x1031a14: sb    t3, 1(v0)
 	ldloc 6
 	ldc.i4.1
 	add
 	ldloc 16
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01031a08: 0x1031a08: sh    t4, 6(v0)
+// 0x01031a18: 0x1031a18: sh    t4, 6(v0)
 	ldloc 6
 	ldc.i4.6
 	add
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01031a0c: 0x1031a0c: addiu v1, v1, 2
+// 0x01031a1c: 0x1031a1c: addiu v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x01031a10: 0x1031a10: beq   t0, t2, 0x1031a24 addiu v0, v0, 8
+// 0x01031a20: 0x1031a20: beq   t0, t2, 0x1031a34 addiu v0, v0, 8
 	ldloc 11
 	ldloc 15
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-	beq  L_1031a24
+	beq  L_1031a34
 // --- basic block ---
-L_1031a18:
-// 0x01031a18: 0x1031a18: slt   t4, t1, a2
+L_1031a28:
+// 0x01031a28: 0x1031a28: slt   t4, t1, a2
 	ldloc 9
 	ldloc.3
 	clt
 	stloc 8
-// 0x01031a1c: 0x1031a1c: bne   t4, zero, 0x10319dc addiu t0, t0, 1
+// 0x01031a2c: 0x1031a2c: bne   t4, zero, 0x10319ec addiu t0, t0, 1
 	ldloc 8
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	brtrue L_10319dc
+	brtrue L_10319ec
 // --- basic block ---
-L_1031a24:
-// 0x01031a24: 0x1031a24: lb    v0, 0(a1)
+L_1031a34:
+// 0x01031a34: 0x1031a34: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01031a28: 0x1031a28: sll   zero, zero, 0
-// 0x01031a2c: 0x1031a2c: bne   v0, a3, 0x1031b3c lui   v0, 0x60000
+// 0x01031a38: 0x1031a38: sll   zero, zero, 0
+// 0x01031a3c: 0x1031a3c: bne   v0, a3, 0x1031b4c lui   v0, 0x60000
 	ldloc 6
 	ldloc 4
 	ldc.i4 393216
 	stloc 6
-	bne.un L_1031b3c
+	bne.un L_1031b4c
 // --- basic block ---
-// 0x01031a34: 0x1031a34: slti  v1, a2, 17
+// 0x01031a44: 0x1031a44: slti  v1, a2, 17
 	ldloc.3
 	ldc.i4.s 17
 	clt
 	stloc 7
-// 0x01031a38: 0x1031a38: bne   v1, zero, 0x1031a4c sw    a2, -18308(v0)
+// 0x01031a48: 0x1031a48: bne   v1, zero, 0x1031a5c sw    a2, -17844(v0)
 	ldloc 7
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4577
+	ldc.i4 -4461
 	add
 	ldloc.3
 	stelem.i4
-	brtrue L_1031a4c
+	brtrue L_1031a5c
 // --- basic block ---
-// 0x01031a40: 0x1031a40: addiu v1, zero, 16
+// 0x01031a50: 0x1031a50: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 7
-// 0x01031a44: 0x1031a44: sw    v1, -18308(v0)
+// 0x01031a54: 0x1031a54: sw    v1, -17844(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4577
+	ldc.i4 -4461
 	add
 	ldloc 7
 	stelem.i4
-// 0x01031a48: 0x1031a48: lui   v0, 0x60000
+// 0x01031a58: 0x1031a58: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-L_1031a4c:
-// 0x01031a4c: 0x1031a4c: lw    t3, -18308(v0)
+L_1031a5c:
+// 0x01031a5c: 0x1031a5c: lw    t3, -17844(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4577
+	ldc.i4 -4461
 	add
 	ldelem.i4
 	stloc 16
-// 0x01031a50: 0x1031a50: lui   v1, 0x60000
+// 0x01031a60: 0x1031a60: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01031a54: 0x1031a54: lui   v0, 0x60000
+// 0x01031a64: 0x1031a64: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01031a58: 0x1031a58: lui   t1, 0x60000
+// 0x01031a68: 0x1031a68: lui   t1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01031a5c: 0x1031a5c: lui   t0, 0x60000
+// 0x01031a6c: 0x1031a6c: lui   t0, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01031a60: 0x1031a60: lw    t2, -18312(v0)
+// 0x01031a70: 0x1031a70: lw    t2, -17848(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4578
+	ldc.i4 -4462
 	add
 	ldelem.i4
 	stloc 15
-// 0x01031a64: 0x1031a64: addiu v1, v1, -18284
+// 0x01031a74: 0x1031a74: addiu v1, v1, -17820
 	ldloc 7
-	ldc.i4 -18284
+	ldc.i4 -17820
 	add
 	stloc 7
-// 0x01031a68: 0x1031a68: addiu t1, t1, -18300
+// 0x01031a78: 0x1031a78: addiu t1, t1, -17836
 	ldloc 9
-	ldc.i4 -18300
+	ldc.i4 -17836
 	add
 	stloc 9
-// 0x01031a6c: 0x1031a6c: addiu t0, t0, -18284
+// 0x01031a7c: 0x1031a7c: addiu t0, t0, -17820
 	ldloc 11
-	ldc.i4 -18284
+	ldc.i4 -17820
 	add
 	stloc 11
-// 0x01031a70: 0x1031a70: addu  v0, zero, zero
+// 0x01031a80: 0x1031a80: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01031a74: 0x1031a74: addu  a1, zero, zero
+// 0x01031a84: 0x1031a84: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01031a78: 0x1031a78: j	 0x1031ac4 addiu a3, zero, 65
+// 0x01031a88: 0x1031a88: j	 0x1031ad4 addiu a3, zero, 65
 	ldc.i4.s 65
 	stloc 4
-	br L_1031ac4
+	br L_1031ad4
 // --- basic block ---
-L_1031a80:
-// 0x01031a80: 0x1031a80: lb    a2, 0(v1)
+L_1031a90:
+// 0x01031a90: 0x1031a90: lb    a2, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x01031a84: 0x1031a84: sll   zero, zero, 0
-// 0x01031a88: 0x1031a88: srav  a0, a2, t2
+// 0x01031a94: 0x1031a94: sll   zero, zero, 0
+// 0x01031a98: 0x1031a98: srav  a0, a2, t2
 	ldloc 15
 	ldloc.3
 	shr
 	stloc.1
-// 0x01031a8c: 0x1031a8c: andi  a0, a0, 1
+// 0x01031a9c: 0x1031a9c: andi  a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	and
 	stloc.1
-// 0x01031a90: 0x1031a90: beq   a0, zero, 0x1031abc addu  a0, t1, zero
+// 0x01031aa0: 0x1031aa0: beq   a0, zero, 0x1031acc addu  a0, t1, zero
 	ldloc.1
 	ldloc 9
 	stloc.1
-	brfalse L_1031abc
+	brfalse L_1031acc
 // --- basic block ---
-L_1031a98:
-// 0x01031a98: 0x1031a98: lb    t4, 0(a0)
+L_1031aa8:
+// 0x01031aa8: 0x1031aa8: lb    t4, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x01031a9c: 0x1031a9c: sll   zero, zero, 0
-// 0x01031aa0: 0x1031aa0: bne   t4, a2, 0x1031ab4 addiu a0, a0, 1
+// 0x01031aac: 0x1031aac: sll   zero, zero, 0
+// 0x01031ab0: 0x1031ab0: bne   t4, a2, 0x1031ac4 addiu a0, a0, 1
 	ldloc 8
 	ldloc.3
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_1031ab4
+	bne.un L_1031ac4
 // --- basic block ---
-// 0x01031aa8: 0x1031aa8: sb    a3, 1(v1)
+// 0x01031ab8: 0x1031ab8: sb    a3, 1(v1)
 	ldloc 7
 	ldc.i4.1
 	add
 	ldloc 4
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01031aac: 0x1031aac: j	 0x1031abc addiu v0, v0, 1
+// 0x01031abc: 0x1031abc: j	 0x1031acc addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	br L_1031abc
+	br L_1031acc
 // --- basic block ---
-L_1031ab4:
-// 0x01031ab4: 0x1031ab4: bne   a0, t0, 0x1031a98 sll   zero, zero, 0
+L_1031ac4:
+// 0x01031ac4: 0x1031ac4: bne   a0, t0, 0x1031aa8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 11
-	bne.un L_1031a98
+	bne.un L_1031aa8
 // --- basic block ---
-L_1031abc:
-// 0x01031abc: 0x1031abc: addiu a1, a1, 1
+L_1031acc:
+// 0x01031acc: 0x1031acc: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01031ac0: 0x1031ac0: addiu v1, v1, 8
+// 0x01031ad0: 0x1031ad0: addiu v1, v1, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 7
-L_1031ac4:
-// 0x01031ac4: 0x1031ac4: slt   a0, a1, t3
+L_1031ad4:
+// 0x01031ad4: 0x1031ad4: slt   a0, a1, t3
 	ldloc.2
 	ldloc 16
 	clt
 	stloc.1
-// 0x01031ac8: 0x1031ac8: bne   a0, zero, 0x1031a80 addu  a2, v0, zero
+// 0x01031ad8: 0x1031ad8: bne   a0, zero, 0x1031a90 addu  a2, v0, zero
 	ldloc.1
 	ldloc 6
 	stloc.3
-	brtrue L_1031a80
+	brtrue L_1031a90
 // --- basic block ---
-// 0x01031ad0: 0x1031ad0: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x01031ae0: 0x1031ae0: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01031ad4: 0x1031ad4: lui   v1, 0x60000
+// 0x01031ae4: 0x1031ae4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01031ad8: 0x1031ad8: addiu a1, a1, -13884
+// 0x01031ae8: 0x1031ae8: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01031adc: 0x1031adc: addiu a0, zero, 99
+// 0x01031aec: 0x1031aec: addiu a0, zero, 99
 	ldc.i4.s 99
 	stloc.1
-// 0x01031ae0: 0x1031ae0: lui   s0, 0x60000
+// 0x01031af0: 0x1031af0: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01031ae4: 0x1031ae4: lui   s4, 0x60000
+// 0x01031af4: 0x1031af4: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 14
-// 0x01031ae8: 0x1031ae8: lui   s3, 0x60000
+// 0x01031af8: 0x1031af8: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x01031aec: 0x1031aec: lui   s2, 0x60000
+// 0x01031afc: 0x1031afc: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x01031af0: 0x1031af0: sw    v0, -18304(v1)
+// 0x01031b00: 0x1031b00: sw    v0, -17840(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4576
+	ldc.i4 -4460
 	add
 	ldloc 6
 	stelem.i4
-// 0x01031af4: 0x1031af4: jal   0x101aec4 addiu s0, s0, -18612
+// 0x01031b04: 0x1031b04: jal   0x101aed4 addiu s0, s0, -18148
 	ldloc 10
-	ldc.i4 -18612
+	ldc.i4 -18148
 	add
 	stloc 10
 	ldloc.0
@@ -1284,61 +1284,61 @@ L_1031ac4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01031afc: 0x1031afc: addiu s4, s4, -18548
+// 0x01031b0c: 0x1031b0c: addiu s4, s4, -18084
 	ldloc 14
-	ldc.i4 -18548
+	ldc.i4 -18084
 	add
 	stloc 14
-// 0x01031b00: 0x1031b00: addiu s3, s3, -18152
+// 0x01031b10: 0x1031b10: addiu s3, s3, -17688
 	ldloc 13
-	ldc.i4 -18152
+	ldc.i4 -17688
 	add
 	stloc 13
-// 0x01031b04: 0x1031b04: addiu s2, s2, -18284
+// 0x01031b14: 0x1031b14: addiu s2, s2, -17820
 	ldloc 12
-	ldc.i4 -18284
+	ldc.i4 -17820
 	add
 	stloc 12
-// 0x01031b08: 0x1031b08: lui   s1, 0x60000
+// 0x01031b18: 0x1031b18: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 17
-L_1031b0c:
-// 0x01031b0c: 0x1031b0c: lw    v0, 0(s0)
+L_1031b1c:
+// 0x01031b1c: 0x1031b1c: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01031b10: 0x1031b10: addu  a0, s3, zero
+// 0x01031b20: 0x1031b20: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x01031b14: 0x1031b14: addiu s0, s0, 4
+// 0x01031b24: 0x1031b24: addiu s0, s0, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-// 0x01031b18: 0x1031b18: beq   v0, zero, 0x1031b34 addu  a1, s2, zero
+// 0x01031b28: 0x1031b28: beq   v0, zero, 0x1031b44 addu  a1, s2, zero
 	ldloc 6
 	ldloc 12
 	stloc.2
-	brfalse L_1031b34
+	brfalse L_1031b44
 // --- basic block ---
-// 0x01031b20: 0x1031b20: lw    a2, -18308(s1)
+// 0x01031b30: 0x1031b30: lw    a2, -17844(s1)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4577
+	ldc.i4 -4461
 	add
 	ldelem.i4
 	stloc.3
-// 0x01031b24: 0x1031b24: jalr  v0 sll   zero, zero, 0
+// 0x01031b34: 0x1031b34: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -1350,26 +1350,26 @@ L_1031b0c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01031b2c: 0x1031b2c: bne   s0, s4, 0x1031b0c sll   zero, zero, 0
+// 0x01031b3c: 0x1031b3c: bne   s0, s4, 0x1031b1c sll   zero, zero, 0
 	ldloc 10
 	ldloc 14
-	bne.un L_1031b0c
+	bne.un L_1031b1c
 // --- basic block ---
-L_1031b34:
-// 0x01031b34: 0x1031b34: jal   0x10313a8 sll   zero, zero, 0
+L_1031b44:
+// 0x01031b44: 0x1031b44: jal   0x10313b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_reception_10313a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_reception_10313b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1031b3c:
-// 0x01031b3c: 0x1031b3c: lw    ra, 36(sp)
-// 0x01031b40: 0x1031b40: lw    s4, 32(sp)
+L_1031b4c:
+// 0x01031b4c: 0x1031b4c: lw    ra, 36(sp)
+// 0x01031b50: 0x1031b50: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1378,7 +1378,7 @@ L_1031b3c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01031b44: 0x1031b44: lw    s3, 28(sp)
+// 0x01031b54: 0x1031b54: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1387,7 +1387,7 @@ L_1031b3c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01031b48: 0x1031b48: lw    s2, 24(sp)
+// 0x01031b58: 0x1031b58: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1396,7 +1396,7 @@ L_1031b3c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01031b4c: 0x1031b4c: lw    s1, 20(sp)
+// 0x01031b5c: 0x1031b5c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1405,7 +1405,7 @@ L_1031b3c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01031b50: 0x1031b50: lw    s0, 16(sp)
+// 0x01031b60: 0x1031b60: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1414,7 +1414,7 @@ L_1031b3c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01031b54: 0x1031b54: jr    ra addiu sp, sp, 40
+// 0x01031b64: 0x1031b64: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1426,7 +1426,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_gsa_1031b5c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_gsa_1031b6c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s2,int32 s1,int32 s4,int32 s5,int32 ra,int32 t0,int32 t1)
@@ -1482,15 +1482,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031b5c: 0x1031b5c: addiu sp, sp, -40
+// 0x01031b6c: 0x1031b6c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01031b60: 0x1031b60: lui   a3, 0x60000
+// 0x01031b70: 0x1031b70: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01031b64: 0x1031b64: sw    s2, 24(sp)
+// 0x01031b74: 0x1031b74: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1499,11 +1499,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01031b68: 0x1031b68: sw    ra, 36(sp)
-// 0x01031b6c: 0x1031b6c: addu  s2, a1, zero
+// 0x01031b78: 0x1031b78: sw    ra, 36(sp)
+// 0x01031b7c: 0x1031b7c: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01031b70: 0x1031b70: sw    s5, 32(sp)
+// 0x01031b80: 0x1031b80: sw    s5, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1512,7 +1512,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01031b74: 0x1031b74: sw    s4, 28(sp)
+// 0x01031b84: 0x1031b84: sw    s4, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1521,7 +1521,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01031b78: 0x1031b78: sw    s1, 20(sp)
+// 0x01031b88: 0x1031b88: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1530,7 +1530,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01031b7c: 0x1031b7c: sw    s0, 16(sp)
+// 0x01031b8c: 0x1031b8c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1539,94 +1539,94 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01031b80: 0x1031b80: addiu a3, a3, -18300
+// 0x01031b90: 0x1031b90: addiu a3, a3, -17836
 	ldloc 4
-	ldc.i4 -18300
+	ldc.i4 -17836
 	add
 	stloc 4
-// 0x01031b84: 0x1031b84: addu  v1, zero, zero
+// 0x01031b94: 0x1031b94: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01031b88: 0x1031b88: addu  v0, zero, zero
+// 0x01031b98: 0x1031b98: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01031b8c: 0x1031b8c: addiu a2, zero, 1
+// 0x01031b9c: 0x1031b9c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01031b90: 0x1031b90: addiu a1, zero, 16
+// 0x01031ba0: 0x1031ba0: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-L_1031b94:
-// 0x01031b94: 0x1031b94: addu  a0, s2, v0
+L_1031ba4:
+// 0x01031ba4: 0x1031ba4: addu  a0, s2, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc.1
-// 0x01031b98: 0x1031b98: lb    a0, 4(a0)
+// 0x01031ba8: 0x1031ba8: lb    a0, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01031b9c: 0x1031b9c: addu  t1, a3, v0
+// 0x01031bac: 0x1031bac: addu  t1, a3, v0
 	ldloc 4
 	ldloc 6
 	add
 	stloc 15
-// 0x01031ba0: 0x1031ba0: sllv  t0, a0, a2
+// 0x01031bb0: 0x1031bb0: sllv  t0, a0, a2
 	ldloc.3
 	ldloc.1
 	shl
 	stloc 14
-// 0x01031ba4: 0x1031ba4: addiu v0, v0, 1
+// 0x01031bb4: 0x1031bb4: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01031ba8: 0x1031ba8: sb    a0, 0(t1)
+// 0x01031bb8: 0x1031bb8: sb    a0, 0(t1)
 	ldloc 15
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01031bac: 0x1031bac: bne   v0, a1, 0x1031b94 or    v1, v1, t0
+// 0x01031bbc: 0x1031bbc: bne   v0, a1, 0x1031ba4 or    v1, v1, t0
 	ldloc 6
 	ldloc.2
 	ldloc 8
 	ldloc 14
 	or
 	stloc 8
-	bne.un L_1031b94
+	bne.un L_1031ba4
 // --- basic block ---
-// 0x01031bb4: 0x1031bb4: lui   v0, 0x60000
+// 0x01031bc4: 0x1031bc4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01031bb8: 0x1031bb8: sw    v1, -18312(v0)
+// 0x01031bc8: 0x1031bc8: sw    v1, -17848(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4578
+	ldc.i4 -4462
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031bbc: 0x1031bbc: lb    v0, 1(s2)
+// 0x01031bcc: 0x1031bcc: lb    v0, 1(s2)
 	ldloc 9
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01031bc0: 0x1031bc0: lui   s0, 0x60000
+// 0x01031bd0: 0x1031bd0: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01031bc4: 0x1031bc4: sw    v0, -18152(s0)
+// 0x01031bd4: 0x1031bd4: sw    v0, -17688(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4538
+	ldc.i4 -4422
 	add
 	ldloc 6
 	stelem.i4
-// 0x01031bc8: 0x1031bc8: lw    a0, 20(s2)
+// 0x01031bd8: 0x1031bd8: lw    a0, 20(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1635,22 +1635,22 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01031bcc: 0x1031bcc: jal   0x10c0874 addiu s0, s0, -18152
+// 0x01031bdc: 0x1031bdc: jal   0x10c0eb4 addiu s0, s0, -17688
 	ldloc 7
-	ldc.i4 -18152
+	ldc.i4 -17688
 	add
 	stloc 7
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031bd4: 0x1031bd4: addu  s4, v0, zero
+// 0x01031be4: 0x1031be4: addu  s4, v0, zero
 	ldloc 6
 	stloc 11
-// 0x01031bd8: 0x1031bd8: sw    s4, 8(s0)
+// 0x01031be8: 0x1031be8: sw    s4, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1659,7 +1659,7 @@ L_1031b94:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01031bdc: 0x1031bdc: sw    v1, 12(s0)
+// 0x01031bec: 0x1031bec: sw    v1, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1668,7 +1668,7 @@ L_1031b94:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031be0: 0x1031be0: lw    a0, 24(s2)
+// 0x01031bf0: 0x1031bf0: lw    a0, 24(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1677,17 +1677,17 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01031be4: 0x1031be4: jal   0x10c0874 addu  s5, v1, zero
+// 0x01031bf4: 0x1031bf4: jal   0x10c0eb4 addu  s5, v1, zero
 	ldloc 8
 	stloc 12
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031bec: 0x1031bec: sw    v1, 20(s0)
+// 0x01031bfc: 0x1031bfc: sw    v1, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1696,7 +1696,7 @@ L_1031b94:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031bf0: 0x1031bf0: sw    v0, 16(s0)
+// 0x01031c00: 0x1031c00: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1705,7 +1705,7 @@ L_1031b94:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01031bf4: 0x1031bf4: lw    a0, 28(s2)
+// 0x01031c04: 0x1031c04: lw    a0, 28(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1714,31 +1714,31 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01031bf8: 0x1031bf8: jal   0x10c0874 lui   s1, 0x10000
+// 0x01031c08: 0x1031c08: jal   0x10c0eb4 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 10
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031c00: 0x1031c00: addu  a3, s5, zero
+// 0x01031c10: 0x1031c10: addu  a3, s5, zero
 	ldloc 12
 	stloc 4
-// 0x01031c04: 0x1031c04: addu  a2, s4, zero
+// 0x01031c14: 0x1031c14: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x01031c08: 0x1031c08: addiu a1, s1, -15508
+// 0x01031c18: 0x1031c18: addiu a1, s1, -15508
 	ldloc 10
 	ldc.i4 -15508
 	add
 	stloc.2
-// 0x01031c0c: 0x1031c0c: addiu a0, zero, 112
+// 0x01031c1c: 0x1031c1c: addiu a0, zero, 112
 	ldc.i4.s 112
 	stloc.1
-// 0x01031c10: 0x1031c10: sw    v1, 28(s0)
+// 0x01031c20: 0x1031c20: sw    v1, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1747,7 +1747,7 @@ L_1031b94:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031c14: 0x1031c14: jal   0x101aec4 sw    v0, 24(s0)
+// 0x01031c24: 0x1031c24: jal   0x101aed4 sw    v0, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1761,12 +1761,12 @@ L_1031b94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031c1c: 0x1031c1c: lw    a3, 20(s0)
+// 0x01031c2c: 0x1031c2c: lw    a3, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1775,7 +1775,7 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01031c20: 0x1031c20: lw    a2, 16(s0)
+// 0x01031c30: 0x1031c30: lw    a2, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1784,12 +1784,12 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01031c24: 0x1031c24: addiu a1, s1, -15508
+// 0x01031c34: 0x1031c34: addiu a1, s1, -15508
 	ldloc 10
 	ldc.i4 -15508
 	add
 	stloc.2
-// 0x01031c28: 0x1031c28: jal   0x101aec4 addiu a0, zero, 104
+// 0x01031c38: 0x1031c38: jal   0x101aed4 addiu a0, zero, 104
 	ldc.i4.s 104
 	stloc.1
 	ldloc.0
@@ -1797,12 +1797,12 @@ L_1031b94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031c30: 0x1031c30: lw    a3, 28(s0)
+// 0x01031c40: 0x1031c40: lw    a3, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1811,7 +1811,7 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01031c34: 0x1031c34: lw    a2, 24(s0)
+// 0x01031c44: 0x1031c44: lw    a2, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1820,12 +1820,12 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01031c38: 0x1031c38: addiu a1, s1, -15508
+// 0x01031c48: 0x1031c48: addiu a1, s1, -15508
 	ldloc 10
 	ldc.i4 -15508
 	add
 	stloc.2
-// 0x01031c3c: 0x1031c3c: jal   0x101aec4 addiu a0, zero, 118
+// 0x01031c4c: 0x1031c4c: jal   0x101aed4 addiu a0, zero, 118
 	ldc.i4.s 118
 	stloc.1
 	ldloc.0
@@ -1833,24 +1833,24 @@ L_1031b94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031c44: 0x1031c44: jal   0x10313a8 sll   zero, zero, 0
+// 0x01031c54: 0x1031c54: jal   0x10313b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_reception_10313a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_reception_10313b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031c4c: 0x1031c4c: lw    ra, 36(sp)
-// 0x01031c50: 0x1031c50: lw    s5, 32(sp)
+// 0x01031c5c: 0x1031c5c: lw    ra, 36(sp)
+// 0x01031c60: 0x1031c60: lw    s5, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1859,7 +1859,7 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01031c54: 0x1031c54: lw    s4, 28(sp)
+// 0x01031c64: 0x1031c64: lw    s4, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1868,7 +1868,7 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01031c58: 0x1031c58: lw    s2, 24(sp)
+// 0x01031c68: 0x1031c68: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1877,7 +1877,7 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01031c5c: 0x1031c5c: lw    s1, 20(sp)
+// 0x01031c6c: 0x1031c6c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1886,7 +1886,7 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01031c60: 0x1031c60: lw    s0, 16(sp)
+// 0x01031c70: 0x1031c70: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1895,7 +1895,7 @@ L_1031b94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01031c64: 0x1031c64: jr    ra addiu sp, sp, 40
+// 0x01031c74: 0x1031c74: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1907,7 +1907,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_pgrmm_1031c6c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_pgrmm_1031c7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1945,12 +1945,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031c6c: 0x1031c6c: addiu sp, sp, -32
+// 0x01031c7c: 0x1031c7c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01031c70: 0x1031c70: sw    s0, 24(sp)
+// 0x01031c80: 0x1031c80: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1959,19 +1959,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01031c74: 0x1031c74: addu  s0, a1, zero
+// 0x01031c84: 0x1031c84: addu  s0, a1, zero
 	ldloc.2
 	stloc 5
-// 0x01031c78: 0x1031c78: lui   a1, 0x10000
+// 0x01031c88: 0x1031c88: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031c7c: 0x1031c7c: addiu a1, a1, -15500
+// 0x01031c8c: 0x1031c8c: addiu a1, a1, -15500
 	ldloc.2
 	ldc.i4 -15500
 	add
 	stloc.2
-// 0x01031c80: 0x1031c80: sw    ra, 28(sp)
-// 0x01031c84: 0x1031c84: jal   0x1001c08 addu  a0, s0, zero
+// 0x01031c90: 0x1031c90: sw    ra, 28(sp)
+// 0x01031c94: 0x1031c94: jal   0x1001c08 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1984,18 +1984,18 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031c8c: 0x1031c8c: beq   v0, zero, 0x1031cc4 lui   a1, 0x10000
+// 0x01031c9c: 0x1031c9c: beq   v0, zero, 0x1031cd4 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1031cc4
+	brfalse L_1031cd4
 // --- basic block ---
-// 0x01031c94: 0x1031c94: addiu a1, a1, -15492
+// 0x01031ca4: 0x1031ca4: addiu a1, a1, -15492
 	ldloc.2
 	ldc.i4 -15492
 	add
 	stloc.2
-// 0x01031c98: 0x1031c98: jal   0x1001c08 addu  a0, s0, zero
+// 0x01031ca8: 0x1031ca8: jal   0x1001c08 addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2008,32 +2008,32 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01031ca0: 0x1031ca0: beq   v0, zero, 0x1031cc4 lui   a1, 0x10000
+// 0x01031cb0: 0x1031cb0: beq   v0, zero, 0x1031cd4 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1031cc4
+	brfalse L_1031cd4
 // --- basic block ---
-// 0x01031ca8: 0x1031ca8: lui   a3, 0x10000
+// 0x01031cb8: 0x1031cb8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01031cac: 0x1031cac: addiu a1, a1, -15752
+// 0x01031cbc: 0x1031cbc: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031cb0: 0x1031cb0: addiu a3, a3, -15484
+// 0x01031cc0: 0x1031cc0: addiu a3, a3, -15484
 	ldloc 4
 	ldc.i4 -15484
 	add
 	stloc 4
-// 0x01031cb4: 0x1031cb4: addiu a0, zero, 5
+// 0x01031cc4: 0x1031cc4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01031cb8: 0x1031cb8: addiu a2, zero, 625
+// 0x01031cc8: 0x1031cc8: addiu a2, zero, 625
 	ldc.i4 625
 	stloc.3
-// 0x01031cbc: 0x1031cbc: jal   0x100449c sw    s0, 16(sp)
+// 0x01031ccc: 0x1031ccc: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2052,9 +2052,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1031cc4:
-// 0x01031cc4: 0x1031cc4: lw    ra, 28(sp)
-// 0x01031cc8: 0x1031cc8: lw    s0, 24(sp)
+L_1031cd4:
+// 0x01031cd4: 0x1031cd4: lw    ra, 28(sp)
+// 0x01031cd8: 0x1031cd8: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2063,7 +2063,7 @@ L_1031cc4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031ccc: 0x1031ccc: jr    ra addiu sp, sp, 32
+// 0x01031cdc: 0x1031cdc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2075,7 +2075,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_pgrme_1031cd4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_pgrme_1031ce4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 ra,int32 v0)
@@ -2110,20 +2110,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031cd4: 0x1031cd4: addiu sp, sp, -24
+// 0x01031ce4: 0x1031ce4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01031cd8: 0x1031cd8: sw    ra, 20(sp)
-// 0x01031cdc: 0x1031cdc: lw    a0, 0(a1)
+// 0x01031ce8: 0x1031ce8: sw    ra, 20(sp)
+// 0x01031cec: 0x1031cec: lw    a0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01031ce0: 0x1031ce0: jal   0x1008c0c addiu a1, a1, 4
+// 0x01031cf0: 0x1031cf0: jal   0x1008c1c addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
@@ -2133,25 +2133,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_to_current_unit_1008c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_to_current_unit_1008c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x01031ce8: 0x1031ce8: lw    ra, 20(sp)
-// 0x01031cec: 0x1031cec: lui   v1, 0x60000
+// 0x01031cf8: 0x1031cf8: lw    ra, 20(sp)
+// 0x01031cfc: 0x1031cfc: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01031cf0: 0x1031cf0: sw    v0, -23860(v1)
+// 0x01031d00: 0x1031d00: sw    v0, -23396(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5965
+	ldc.i4 -5849
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031cf4: 0x1031cf4: jr    ra addiu sp, sp, 24
+// 0x01031d04: 0x1031d04: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2163,7 +2163,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_gps_unregister_fix_listener_1031cfc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_unregister_fix_listener_1031d0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -2198,96 +2198,96 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031cfc: 0x1031cfc: addiu sp, sp, -32
+// 0x01031d0c: 0x1031d0c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01031d00: 0x1031d00: addu  v0, a0, zero
+// 0x01031d10: 0x1031d10: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01031d04: 0x1031d04: lui   a0, 0x60000
+// 0x01031d14: 0x1031d14: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01031d08: 0x1031d08: sw    ra, 28(sp)
-// 0x01031d0c: 0x1031d0c: addiu a0, a0, -18452
+// 0x01031d18: 0x1031d18: sw    ra, 28(sp)
+// 0x01031d1c: 0x1031d1c: addiu a0, a0, -17988
 	ldloc.1
-	ldc.i4 -18452
+	ldc.i4 -17988
 	add
 	stloc.1
-// 0x01031d10: 0x1031d10: addu  v1, zero, zero
+// 0x01031d20: 0x1031d20: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01031d14: 0x1031d14: addiu a1, zero, 16
+// 0x01031d24: 0x1031d24: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-L_1031d18:
-// 0x01031d18: 0x1031d18: lw    a2, 0(a0)
+L_1031d28:
+// 0x01031d28: 0x1031d28: lw    a2, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01031d1c: 0x1031d1c: sll   zero, zero, 0
-// 0x01031d20: 0x1031d20: bne   a2, v0, 0x1031d68 addiu a0, a0, 4
+// 0x01031d2c: 0x1031d2c: sll   zero, zero, 0
+// 0x01031d30: 0x1031d30: bne   a2, v0, 0x1031d78 addiu a0, a0, 4
 	ldloc.3
 	ldloc 6
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-	bne.un L_1031d68
+	bne.un L_1031d78
 // --- basic block ---
-// 0x01031d28: 0x1031d28: addiu a2, zero, 15
+// 0x01031d38: 0x1031d38: addiu a2, zero, 15
 	ldc.i4.s 15
 	stloc.3
-// 0x01031d2c: 0x1031d2c: beq   v1, a2, 0x1031d60 lui   v0, 0x60000
+// 0x01031d3c: 0x1031d3c: beq   v1, a2, 0x1031d70 lui   v0, 0x60000
 	ldloc 5
 	ldloc.3
 	ldc.i4 393216
 	stloc 6
-	beq  L_1031d60
+	beq  L_1031d70
 // --- basic block ---
-// 0x01031d34: 0x1031d34: addiu a1, v1, 1
+// 0x01031d44: 0x1031d44: addiu a1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01031d38: 0x1031d38: lui   a0, 0x60000
+// 0x01031d48: 0x1031d48: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01031d3c: 0x1031d3c: subu  a2, a2, v1
+// 0x01031d4c: 0x1031d4c: subu  a2, a2, v1
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01031d40: 0x1031d40: addiu a0, a0, -18452
+// 0x01031d50: 0x1031d50: addiu a0, a0, -17988
 	ldloc.1
-	ldc.i4 -18452
+	ldc.i4 -17988
 	add
 	stloc.1
-// 0x01031d44: 0x1031d44: sll   a1, a1, 2
+// 0x01031d54: 0x1031d54: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01031d48: 0x1031d48: sll   v1, v1, 2
+// 0x01031d58: 0x1031d58: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01031d4c: 0x1031d4c: addu  a1, a0, a1
+// 0x01031d5c: 0x1031d5c: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x01031d50: 0x1031d50: sll   a2, a2, 2
+// 0x01031d60: 0x1031d60: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01031d54: 0x1031d54: jal   0x100186c addu  a0, a0, v1
+// 0x01031d64: 0x1031d64: jal   0x100186c addu  a0, a0, v1
 	ldloc.1
 	ldloc 5
 	add
@@ -2301,54 +2301,54 @@ L_1031d18:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01031d5c: 0x1031d5c: lui   v0, 0x60000
+// 0x01031d6c: 0x1031d6c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-L_1031d60:
-// 0x01031d60: 0x1031d60: j	 0x1031d90 sw    zero, -18392(v0)
+L_1031d70:
+// 0x01031d70: 0x1031d70: j	 0x1031da0 sw    zero, -17928(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4598
+	ldc.i4 -4482
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1031d90
+	br L_1031da0
 // --- basic block ---
-L_1031d68:
-// 0x01031d68: 0x1031d68: addiu v1, v1, 1
+L_1031d78:
+// 0x01031d78: 0x1031d78: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01031d6c: 0x1031d6c: bne   v1, a1, 0x1031d18 lui   a3, 0x10000
+// 0x01031d7c: 0x1031d7c: bne   v1, a1, 0x1031d28 lui   a3, 0x10000
 	ldloc 5
 	ldloc.2
 	ldc.i4 65536
 	stloc 4
-	bne.un L_1031d18
+	bne.un L_1031d28
 // --- basic block ---
-// 0x01031d74: 0x1031d74: lui   a1, 0x10000
+// 0x01031d84: 0x1031d84: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031d78: 0x1031d78: addiu a1, a1, -15752
+// 0x01031d88: 0x1031d88: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031d7c: 0x1031d7c: addiu a3, a3, -15436
+// 0x01031d8c: 0x1031d8c: addiu a3, a3, -15436
 	ldloc 4
 	ldc.i4 -15436
 	add
 	stloc 4
-// 0x01031d80: 0x1031d80: addiu a0, zero, 4
+// 0x01031d90: 0x1031d90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01031d84: 0x1031d84: addiu a2, zero, 1184
+// 0x01031d94: 0x1031d94: addiu a2, zero, 1184
 	ldc.i4 1184
 	stloc.3
-// 0x01031d88: 0x1031d88: jal   0x100449c sw    v0, 16(sp)
+// 0x01031d98: 0x1031d98: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2367,10 +2367,10 @@ L_1031d68:
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1031d90:
-// 0x01031d90: 0x1031d90: lw    ra, 28(sp)
-// 0x01031d94: 0x1031d94: sll   zero, zero, 0
-// 0x01031d98: 0x1031d98: jr    ra addiu sp, sp, 32
+L_1031da0:
+// 0x01031da0: 0x1031da0: lw    ra, 28(sp)
+// 0x01031da4: 0x1031da4: sll   zero, zero, 0
+// 0x01031da8: 0x1031da8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2382,7 +2382,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_unregister_listener_1031da0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_unregister_listener_1031db0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -2417,96 +2417,96 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031da0: 0x1031da0: addiu sp, sp, -32
+// 0x01031db0: 0x1031db0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01031da4: 0x1031da4: addu  v0, a0, zero
+// 0x01031db4: 0x1031db4: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01031da8: 0x1031da8: lui   a0, 0x60000
+// 0x01031db8: 0x1031db8: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01031dac: 0x1031dac: sw    ra, 28(sp)
-// 0x01031db0: 0x1031db0: addiu a0, a0, -18544
+// 0x01031dbc: 0x1031dbc: sw    ra, 28(sp)
+// 0x01031dc0: 0x1031dc0: addiu a0, a0, -18080
 	ldloc.1
-	ldc.i4 -18544
+	ldc.i4 -18080
 	add
 	stloc.1
-// 0x01031db4: 0x1031db4: addu  v1, zero, zero
+// 0x01031dc4: 0x1031dc4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01031db8: 0x1031db8: addiu a1, zero, 16
+// 0x01031dc8: 0x1031dc8: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-L_1031dbc:
-// 0x01031dbc: 0x1031dbc: lw    a2, 0(a0)
+L_1031dcc:
+// 0x01031dcc: 0x1031dcc: lw    a2, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01031dc0: 0x1031dc0: sll   zero, zero, 0
-// 0x01031dc4: 0x1031dc4: bne   a2, v0, 0x1031e0c addiu a0, a0, 4
+// 0x01031dd0: 0x1031dd0: sll   zero, zero, 0
+// 0x01031dd4: 0x1031dd4: bne   a2, v0, 0x1031e1c addiu a0, a0, 4
 	ldloc.3
 	ldloc 6
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-	bne.un L_1031e0c
+	bne.un L_1031e1c
 // --- basic block ---
-// 0x01031dcc: 0x1031dcc: addiu a2, zero, 15
+// 0x01031ddc: 0x1031ddc: addiu a2, zero, 15
 	ldc.i4.s 15
 	stloc.3
-// 0x01031dd0: 0x1031dd0: beq   v1, a2, 0x1031e04 lui   v0, 0x60000
+// 0x01031de0: 0x1031de0: beq   v1, a2, 0x1031e14 lui   v0, 0x60000
 	ldloc 5
 	ldloc.3
 	ldc.i4 393216
 	stloc 6
-	beq  L_1031e04
+	beq  L_1031e14
 // --- basic block ---
-// 0x01031dd8: 0x1031dd8: addiu a1, v1, 1
+// 0x01031de8: 0x1031de8: addiu a1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01031ddc: 0x1031ddc: lui   a0, 0x60000
+// 0x01031dec: 0x1031dec: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01031de0: 0x1031de0: subu  a2, a2, v1
+// 0x01031df0: 0x1031df0: subu  a2, a2, v1
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01031de4: 0x1031de4: addiu a0, a0, -18544
+// 0x01031df4: 0x1031df4: addiu a0, a0, -18080
 	ldloc.1
-	ldc.i4 -18544
+	ldc.i4 -18080
 	add
 	stloc.1
-// 0x01031de8: 0x1031de8: sll   a1, a1, 2
+// 0x01031df8: 0x1031df8: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01031dec: 0x1031dec: sll   v1, v1, 2
+// 0x01031dfc: 0x1031dfc: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01031df0: 0x1031df0: addu  a1, a0, a1
+// 0x01031e00: 0x1031e00: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x01031df4: 0x1031df4: sll   a2, a2, 2
+// 0x01031e04: 0x1031e04: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01031df8: 0x1031df8: jal   0x100186c addu  a0, a0, v1
+// 0x01031e08: 0x1031e08: jal   0x100186c addu  a0, a0, v1
 	ldloc.1
 	ldloc 5
 	add
@@ -2520,54 +2520,54 @@ L_1031dbc:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01031e00: 0x1031e00: lui   v0, 0x60000
+// 0x01031e10: 0x1031e10: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-L_1031e04:
-// 0x01031e04: 0x1031e04: j	 0x1031e34 sw    zero, -18484(v0)
+L_1031e14:
+// 0x01031e14: 0x1031e14: j	 0x1031e44 sw    zero, -18020(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4621
+	ldc.i4 -4505
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1031e34
+	br L_1031e44
 // --- basic block ---
-L_1031e0c:
-// 0x01031e0c: 0x1031e0c: addiu v1, v1, 1
+L_1031e1c:
+// 0x01031e1c: 0x1031e1c: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01031e10: 0x1031e10: bne   v1, a1, 0x1031dbc lui   a3, 0x10000
+// 0x01031e20: 0x1031e20: bne   v1, a1, 0x1031dcc lui   a3, 0x10000
 	ldloc 5
 	ldloc.2
 	ldc.i4 65536
 	stloc 4
-	bne.un L_1031dbc
+	bne.un L_1031dcc
 // --- basic block ---
-// 0x01031e18: 0x1031e18: lui   a1, 0x10000
+// 0x01031e28: 0x1031e28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031e1c: 0x1031e1c: addiu a1, a1, -15752
+// 0x01031e2c: 0x1031e2c: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031e20: 0x1031e20: addiu a3, a3, -15384
+// 0x01031e30: 0x1031e30: addiu a3, a3, -15384
 	ldloc 4
 	ldc.i4 -15384
 	add
 	stloc 4
-// 0x01031e24: 0x1031e24: addiu a0, zero, 4
+// 0x01031e34: 0x1031e34: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01031e28: 0x1031e28: addiu a2, zero, 1152
+// 0x01031e38: 0x1031e38: addiu a2, zero, 1152
 	ldc.i4 1152
 	stloc.3
-// 0x01031e2c: 0x1031e2c: jal   0x100449c sw    v0, 16(sp)
+// 0x01031e3c: 0x1031e3c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2586,10 +2586,10 @@ L_1031e0c:
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1031e34:
-// 0x01031e34: 0x1031e34: lw    ra, 28(sp)
-// 0x01031e38: 0x1031e38: sll   zero, zero, 0
-// 0x01031e3c: 0x1031e3c: jr    ra addiu sp, sp, 32
+L_1031e44:
+// 0x01031e44: 0x1031e44: lw    ra, 28(sp)
+// 0x01031e48: 0x1031e48: sll   zero, zero, 0
+// 0x01031e4c: 0x1031e4c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2601,7 +2601,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_coarse_fix_1031e44(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_coarse_fix_1031e54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 ra,int32 lo)
@@ -2645,24 +2645,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031e44: 0x1031e44: lui   v0, 0x60000
+// 0x01031e54: 0x1031e54: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031e48: 0x1031e48: lw    v0, -18692(v0)
+// 0x01031e58: 0x1031e58: lw    v0, -18228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4673
+	ldc.i4 -4557
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031e4c: 0x1031e4c: addiu sp, sp, -48
+// 0x01031e5c: 0x1031e5c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01031e50: 0x1031e50: sw    s1, 40(sp)
+// 0x01031e60: 0x1031e60: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2671,7 +2671,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031e54: 0x1031e54: sw    s0, 36(sp)
+// 0x01031e64: 0x1031e64: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2680,14 +2680,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01031e58: 0x1031e58: sw    ra, 44(sp)
-// 0x01031e5c: 0x1031e5c: addu  s1, a0, zero
+// 0x01031e68: 0x1031e68: sw    ra, 44(sp)
+// 0x01031e6c: 0x1031e6c: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01031e60: 0x1031e60: addu  s0, a1, zero
+// 0x01031e70: 0x1031e70: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01031e64: 0x1031e64: sw    a0, 28(sp)
+// 0x01031e74: 0x1031e74: sw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2696,7 +2696,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01031e68: 0x1031e68: bne   v0, zero, 0x1031ed0 sw    a1, 24(sp)
+// 0x01031e78: 0x1031e78: bne   v0, zero, 0x1031ee0 sw    a1, 24(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -2706,32 +2706,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	brtrue L_1031ed0
+	brtrue L_1031ee0
 // --- basic block ---
-// 0x01031e70: 0x1031e70: lui   v0, 0x60000
+// 0x01031e80: 0x1031e80: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031e74: 0x1031e74: lw    v0, -18384(v0)
+// 0x01031e84: 0x1031e84: lw    v0, -17920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4596
+	ldc.i4 -4480
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031e78: 0x1031e78: sll   zero, zero, 0
-// 0x01031e7c: 0x1031e7c: blez  v0, 0x1031e98 lui   a0, 0x0
+// 0x01031e88: 0x1031e88: sll   zero, zero, 0
+// 0x01031e8c: 0x1031e8c: blez  v0, 0x1031ea8 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	ble L_1031e98
+	ble L_1031ea8
 // --- basic block ---
-// 0x01031e84: 0x1031e84: addu  a0, a1, zero
+// 0x01031e94: 0x1031e94: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01031e88: 0x1031e88: jal   0x1030c18 addu  a1, s1, zero
+// 0x01031e98: 0x1031e98: jal   0x1030c28 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2739,18 +2739,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_set_fix_1030c18(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_set_fix_1030c28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01031e90: 0x1031e90: j	 0x1031ed4 addu  v1, zero, zero
+// 0x01031ea0: 0x1031ea0: j	 0x1031ee4 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1031ed4
+	br L_1031ee4
 // --- basic block ---
-L_1031e98:
-// 0x01031e98: 0x1031e98: jal   0x100e788 addiu a0, a0, 12296
+L_1031ea8:
+// 0x01031ea8: 0x1031ea8: jal   0x100e798 addiu a0, a0, 12296
 	ldloc.1
 	ldc.i4 12296
 	add
@@ -2760,20 +2760,20 @@ L_1031e98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01031ea0: 0x1031ea0: addiu a0, zero, 1000
+// 0x01031eb0: 0x1031eb0: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x01031ea4: 0x1031ea4: mult  v0, a0
+// 0x01031eb4: 0x1031eb4: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 11
-// 0x01031ea8: 0x1031ea8: lw    a2, 28(sp)
+// 0x01031eb8: 0x1031eb8: lw    a2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2782,18 +2782,18 @@ L_1031e98:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01031eac: 0x1031eac: lui   v0, 0x60000
+// 0x01031ebc: 0x1031ebc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031eb0: 0x1031eb0: addiu v1, v0, -18112
+// 0x01031ec0: 0x1031ec0: addiu v1, v0, -17648
 	ldloc 5
-	ldc.i4 -18112
+	ldc.i4 -17648
 	add
 	stloc 7
-// 0x01031eb4: 0x1031eb4: lui   a1, 0x1030000
+// 0x01031ec4: 0x1031ec4: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x01031eb8: 0x1031eb8: sw    a2, 4(v1)
+// 0x01031ec8: 0x1031ec8: sw    a2, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2802,7 +2802,7 @@ L_1031e98:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01031ebc: 0x1031ebc: lw    v1, 24(sp)
+// 0x01031ecc: 0x1031ecc: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2811,20 +2811,20 @@ L_1031e98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01031ec0: 0x1031ec0: addiu a1, a1, 8808
+// 0x01031ed0: 0x1031ed0: addiu a1, a1, 8824
 	ldloc.2
-	ldc.i4 8808
+	ldc.i4 8824
 	add
 	stloc.2
-// 0x01031ec4: 0x1031ec4: mflo  lo
+// 0x01031ed4: 0x1031ed4: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01031ec8: 0x1031ec8: jal   0x104fe98 sw    v1, -18112(v0)
+// 0x01031ed8: 0x1031ed8: jal   0x104fea8 sw    v1, -17648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4528
+	ldc.i4 -4412
 	add
 	ldloc 7
 	stelem.i4
@@ -2833,46 +2833,46 @@ L_1031e98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1031ed0:
-// 0x01031ed0: 0x1031ed0: addu  v1, zero, zero
+L_1031ee0:
+// 0x01031ee0: 0x1031ee0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1031ed4:
-// 0x01031ed4: 0x1031ed4: cibyl_sysc_arg 0x3
+L_1031ee4:
+// 0x01031ee4: 0x1031ee4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01031ed8: 0x1031ed8: cibyl_sysc 0x517
+// 0x01031ee8: 0x1031ee8: cibyl_sysc 0x517
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01031edc: 0x1031edc: addu  v1, v0, zero
+// 0x01031eec: 0x1031eec: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01031ee0: 0x1031ee0: lui   a0, 0x20000
+// 0x01031ef0: 0x1031ef0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01031ee4: 0x1031ee4: addiu a1, sp, 24
+// 0x01031ef4: 0x1031ef4: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01031ee8: 0x1031ee8: lui   v0, 0x60000
+// 0x01031ef8: 0x1031ef8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031eec: 0x1031eec: addiu a0, a0, 6792
+// 0x01031efc: 0x1031efc: addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
-// 0x01031ef0: 0x1031ef0: jal   0x101f76c sw    v1, -18384(v0)
+// 0x01031f00: 0x1031f00: jal   0x101f77c sw    v1, -17920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4596
+	ldc.i4 -4480
 	add
 	ldloc 7
 	stelem.i4
@@ -2881,45 +2881,45 @@ L_1031ed4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01031ef8: 0x1031ef8: jal   0x1031350 sll   zero, zero, 0
+// 0x01031f08: 0x1031f08: jal   0x1031360 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_set_location_focus_1031350(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_set_location_focus_1031360(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01031f00: 0x1031f00: lui   a1, 0x10000
+// 0x01031f10: 0x1031f10: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031f04: 0x1031f04: lui   a3, 0x10000
+// 0x01031f14: 0x1031f14: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01031f08: 0x1031f08: addiu a1, a1, -15752
+// 0x01031f18: 0x1031f18: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01031f0c: 0x1031f0c: addiu a3, a3, -15336
+// 0x01031f1c: 0x1031f1c: addiu a3, a3, -15336
 	ldloc 4
 	ldc.i4 -15336
 	add
 	stloc 4
-// 0x01031f10: 0x1031f10: addiu a0, zero, 1
+// 0x01031f20: 0x1031f20: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01031f14: 0x1031f14: addiu a2, zero, 579
+// 0x01031f24: 0x1031f24: addiu a2, zero, 579
 	ldc.i4 579
 	stloc.3
-// 0x01031f18: 0x1031f18: sw    s1, 16(sp)
+// 0x01031f28: 0x1031f28: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2928,7 +2928,7 @@ L_1031ed4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031f1c: 0x1031f1c: jal   0x100449c sw    s0, 20(sp)
+// 0x01031f2c: 0x1031f2c: jal   0x100449c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2947,8 +2947,8 @@ L_1031ed4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01031f24: 0x1031f24: lw    ra, 44(sp)
-// 0x01031f28: 0x1031f28: lw    s1, 40(sp)
+// 0x01031f34: 0x1031f34: lw    ra, 44(sp)
+// 0x01031f38: 0x1031f38: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2957,7 +2957,7 @@ L_1031ed4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01031f2c: 0x1031f2c: lw    s0, 36(sp)
+// 0x01031f3c: 0x1031f3c: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2966,7 +2966,7 @@ L_1031ed4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01031f30: 0x1031f30: jr    ra addiu sp, sp, 48
+// 0x01031f40: 0x1031f40: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2978,7 +2978,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_show_coordinats_1031f38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_show_coordinats_1031f48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3013,24 +3013,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031f38: 0x1031f38: lui   a0, 0x0
+// 0x01031f48: 0x1031f48: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01031f3c: 0x1031f3c: lui   a1, 0x0
+// 0x01031f4c: 0x1031f4c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01031f40: 0x1031f40: addiu sp, sp, -24
+// 0x01031f50: 0x1031f50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01031f44: 0x1031f44: addiu a0, a0, 12328
+// 0x01031f54: 0x1031f54: addiu a0, a0, 12328
 	ldloc.1
 	ldc.i4 12328
 	add
 	stloc.1
-// 0x01031f48: 0x1031f48: sw    ra, 20(sp)
-// 0x01031f4c: 0x1031f4c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01031f58: 0x1031f58: sw    ra, 20(sp)
+// 0x01031f5c: 0x1031f5c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3040,14 +3040,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01031f54: 0x1031f54: lw    ra, 20(sp)
-// 0x01031f58: 0x1031f58: sll   zero, zero, 0
-// 0x01031f5c: 0x1031f5c: jr    ra addiu sp, sp, 24
+// 0x01031f64: 0x1031f64: lw    ra, 20(sp)
+// 0x01031f68: 0x1031f68: sll   zero, zero, 0
+// 0x01031f6c: 0x1031f6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3059,7 +3059,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_gps_initialize_1031f64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_initialize_1031f74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3106,25 +3106,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01031f64: 0x1031f64: lui   v0, 0x60000
+// 0x01031f74: 0x1031f74: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01031f68: 0x1031f68: lw    v0, -18388(v0)
+// 0x01031f78: 0x1031f78: lw    v0, -17924(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4597
+	ldc.i4 -4481
 	add
 	ldelem.i4
 	stloc 5
-// 0x01031f6c: 0x1031f6c: addiu sp, sp, -48
+// 0x01031f7c: 0x1031f7c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01031f70: 0x1031f70: sw    ra, 44(sp)
-// 0x01031f74: 0x1031f74: sw    s3, 40(sp)
+// 0x01031f80: 0x1031f80: sw    ra, 44(sp)
+// 0x01031f84: 0x1031f84: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3133,7 +3133,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01031f78: 0x1031f78: sw    s2, 36(sp)
+// 0x01031f88: 0x1031f88: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3142,7 +3142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01031f7c: 0x1031f7c: sw    s1, 32(sp)
+// 0x01031f8c: 0x1031f8c: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3151,7 +3151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01031f80: 0x1031f80: bne   v0, zero, 0x10321a0 sw    s0, 28(sp)
+// 0x01031f90: 0x1031f90: bne   v0, zero, 0x10321b0 sw    s0, 28(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -3161,17 +3161,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_10321a0
+	brtrue L_10321b0
 // --- basic block ---
-// 0x01031f88: 0x1031f88: lui   a1, 0x1030000
+// 0x01031f98: 0x1031f98: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x01031f8c: 0x1031f8c: addiu a1, a1, 8768
+// 0x01031f9c: 0x1031f9c: addiu a1, a1, 8784
 	ldloc.2
-	ldc.i4 8768
+	ldc.i4 8784
 	add
 	stloc.2
-// 0x01031f90: 0x1031f90: jal   0x104fe98 addiu a0, zero, 30000
+// 0x01031fa0: 0x1031fa0: jal   0x104fea8 addiu a0, zero, 30000
 	ldc.i4 30000
 	stloc.1
 	ldloc.0
@@ -3179,23 +3179,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031f98: 0x1031f98: lui   a0, 0x1030000
+// 0x01031fa8: 0x1031fa8: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01031f9c: 0x1031f9c: lui   a1, 0x10000
+// 0x01031fac: 0x1031fac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01031fa0: 0x1031fa0: addiu a0, a0, 8636
+// 0x01031fb0: 0x1031fb0: addiu a0, a0, 8652
 	ldloc.1
-	ldc.i4 8636
+	ldc.i4 8652
 	add
 	stloc.1
-// 0x01031fa4: 0x1031fa4: jal   0x100de8c addiu a1, a1, -31052
+// 0x01031fb4: 0x1031fb4: jal   0x100de9c addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -3205,36 +3205,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_register_100de8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_register_100de9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031fac: 0x1031fac: lui   s0, 0x0
+// 0x01031fbc: 0x1031fbc: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01031fb0: 0x1031fb0: lui   a0, 0x10000
+// 0x01031fc0: 0x1031fc0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01031fb4: 0x1031fb4: lui   a2, 0x20000
+// 0x01031fc4: 0x1031fc4: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01031fb8: 0x1031fb8: addiu a0, a0, 12560
+// 0x01031fc8: 0x1031fc8: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01031fbc: 0x1031fbc: addiu a2, a2, 9464
+// 0x01031fcc: 0x1031fcc: addiu a2, a2, 9928
 	ldloc.3
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.3
-// 0x01031fc0: 0x1031fc0: addiu a1, s0, 12128
+// 0x01031fd0: 0x1031fd0: addiu a1, s0, 12128
 	ldloc 9
 	ldc.i4 12128
 	add
 	stloc.2
-// 0x01031fc4: 0x1031fc4: jal   0x100edb0 addu  a3, zero, zero
+// 0x01031fd4: 0x1031fd4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3242,20 +3242,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031fcc: 0x1031fcc: lui   a1, 0x0
+// 0x01031fdc: 0x1031fdc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01031fd0: 0x1031fd0: addiu a0, s0, 12128
+// 0x01031fe0: 0x1031fe0: addiu a0, s0, 12128
 	ldloc 9
 	ldc.i4 12128
 	add
 	stloc.1
-// 0x01031fd4: 0x1031fd4: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01031fe4: 0x1031fe4: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3265,63 +3265,63 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01031fdc: 0x1031fdc: lui   v1, 0x60000
+// 0x01031fec: 0x1031fec: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01031fe0: 0x1031fe0: beq   v0, zero, 0x1031ff0 sw    v0, -23848(v1)
+// 0x01031ff0: 0x1031ff0: beq   v0, zero, 0x1032000 sw    v0, -23384(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5962
+	ldc.i4 -5846
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1031ff0
+	brfalse L_1032000
 // --- basic block ---
-// 0x01031fe8: 0x1031fe8: jal   0x10310e0 sll   zero, zero, 0
+// 0x01031ff8: 0x1031ff8: jal   0x10310f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_csv_tracker_initialize_10310e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_csv_tracker_initialize_10310f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1031ff0:
-// 0x01031ff0: 0x1031ff0: lui   s3, 0x10000
+L_1032000:
+// 0x01032000: 0x1032000: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01031ff4: 0x1031ff4: lui   a1, 0x0
+// 0x01032004: 0x1032004: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01031ff8: 0x1031ff8: lui   a2, 0x10000
+// 0x01032008: 0x1032008: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01031ffc: 0x1031ffc: addiu a1, a1, 12144
+// 0x0103200c: 0x103200c: addiu a1, a1, 12144
 	ldloc.2
 	ldc.i4 12144
 	add
 	stloc.2
-// 0x01032000: 0x1032000: addiu a2, a2, -15292
+// 0x01032010: 0x1032010: addiu a2, a2, 19516
 	ldloc.3
-	ldc.i4 -15292
+	ldc.i4 19516
 	add
 	stloc.3
-// 0x01032004: 0x1032004: addiu a0, s3, 12560
+// 0x01032014: 0x1032014: addiu a0, s3, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032008: 0x1032008: jal   0x100edb0 addu  a3, zero, zero
+// 0x01032018: 0x1032018: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3329,33 +3329,33 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032010: 0x1032010: lui   a1, 0x0
+// 0x01032020: 0x1032020: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01032014: 0x1032014: lui   a2, 0x10000
+// 0x01032024: 0x1032024: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01032018: 0x1032018: addiu a1, a1, 12160
+// 0x01032028: 0x1032028: addiu a1, a1, 12160
 	ldloc.2
 	ldc.i4 12160
 	add
 	stloc.2
-// 0x0103201c: 0x103201c: addiu a2, a2, -15288
+// 0x0103202c: 0x103202c: addiu a2, a2, -15292
 	ldloc.3
-	ldc.i4 -15288
+	ldc.i4 -15292
 	add
 	stloc.3
-// 0x01032020: 0x1032020: addiu a0, s3, 12560
+// 0x01032030: 0x1032030: addiu a0, s3, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032024: 0x1032024: jal   0x100edb0 addu  a3, zero, zero
+// 0x01032034: 0x1032034: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3363,33 +3363,33 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103202c: 0x103202c: lui   a1, 0x0
+// 0x0103203c: 0x103203c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01032030: 0x1032030: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x01032040: 0x1032040: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x01032034: 0x1032034: addiu a1, a1, 12216
+// 0x01032044: 0x1032044: addiu a1, a1, 12216
 	ldloc.2
 	ldc.i4 12216
 	add
 	stloc.2
-// 0x01032038: 0x1032038: addiu a2, a2, -6904
+// 0x01032048: 0x1032048: addiu a2, a2, 19584
 	ldloc.3
-	ldc.i4 -6904
+	ldc.i4 19584
 	add
 	stloc.3
-// 0x0103203c: 0x103203c: addiu a0, s3, 12560
+// 0x0103204c: 0x103204c: addiu a0, s3, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032040: 0x1032040: jal   0x100edb0 addu  a3, zero, zero
+// 0x01032050: 0x1032050: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3397,33 +3397,33 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032048: 0x1032048: lui   a1, 0x0
+// 0x01032058: 0x1032058: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103204c: 0x103204c: lui   a2, 0x10000
+// 0x0103205c: 0x103205c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01032050: 0x1032050: addiu a1, a1, 12296
+// 0x01032060: 0x1032060: addiu a1, a1, 12296
 	ldloc.2
 	ldc.i4 12296
 	add
 	stloc.2
-// 0x01032054: 0x1032054: addiu a2, a2, -30004
+// 0x01032064: 0x1032064: addiu a2, a2, -30004
 	ldloc.3
 	ldc.i4 -30004
 	add
 	stloc.3
-// 0x01032058: 0x1032058: addiu a0, s3, 12560
+// 0x01032068: 0x1032068: addiu a0, s3, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103205c: 0x103205c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103206c: 0x103206c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3431,33 +3431,33 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032064: 0x1032064: lui   s0, 0x0
+// 0x01032074: 0x1032074: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01032068: 0x1032068: lui   a2, 0x10000
+// 0x01032078: 0x1032078: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103206c: 0x103206c: addiu a2, a2, -15284
+// 0x0103207c: 0x103207c: addiu a2, a2, -15288
 	ldloc.3
-	ldc.i4 -15284
+	ldc.i4 -15288
 	add
 	stloc.3
-// 0x01032070: 0x1032070: addiu a0, s3, 12560
+// 0x01032080: 0x1032080: addiu a0, s3, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032074: 0x1032074: addiu a1, s0, 12248
+// 0x01032084: 0x1032084: addiu a1, s0, 12248
 	ldloc 9
 	ldc.i4 12248
 	add
 	stloc.2
-// 0x01032078: 0x1032078: jal   0x100edb0 addu  a3, zero, zero
+// 0x01032088: 0x1032088: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3465,44 +3465,44 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032080: 0x1032080: lui   s2, 0x0
+// 0x01032090: 0x1032090: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01032084: 0x1032084: lui   s1, 0x0
+// 0x01032094: 0x1032094: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01032088: 0x1032088: lui   v0, 0x20000
+// 0x01032098: 0x1032098: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0103208c: 0x103208c: addiu a1, s2, 12232
+// 0x0103209c: 0x103209c: addiu a1, s2, 12232
 	ldloc 11
 	ldc.i4 12232
 	add
 	stloc.2
-// 0x01032090: 0x1032090: addiu a0, s3, 12560
+// 0x010320a0: 0x10320a0: addiu a0, s3, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032094: 0x1032094: addu  a2, zero, zero
+// 0x010320a4: 0x10320a4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01032098: 0x1032098: addiu a3, s1, 20820
+// 0x010320a8: 0x10320a8: addiu a3, s1, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0103209c: 0x103209c: addiu v0, v0, 9464
+// 0x010320ac: 0x10320ac: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x010320a0: 0x10320a0: sw    v0, 16(sp)
+// 0x010320b0: 0x10320b0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3511,7 +3511,7 @@ L_1031ff0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010320a4: 0x10320a4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010320b4: 0x10320b4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3525,12 +3525,12 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010320ac: 0x10320ac: jal   0x100e348 addiu a0, s2, 12232
+// 0x010320bc: 0x10320bc: jal   0x100e358 addiu a0, s2, 12232
 	ldloc 11
 	ldc.i4 12232
 	add
@@ -3540,15 +3540,15 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010320b4: 0x10320b4: addu  a0, v0, zero
+// 0x010320c4: 0x10320c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010320b8: 0x10320b8: jal   0x1001b14 addiu a1, s1, 20820
+// 0x010320c8: 0x10320c8: jal   0x1001b14 addiu a1, s1, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
@@ -3558,11 +3558,11 @@ L_1031ff0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010320c0: 0x10320c0: bne   v0, zero, 0x10320e0 sll   zero, zero, 0
+// 0x010320d0: 0x10320d0: bne   v0, zero, 0x10320f0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10320e0
+	brtrue L_10320f0
 // --- basic block ---
-// 0x010320c8: 0x10320c8: jal   0x100e348 addiu a0, s0, 12248
+// 0x010320d8: 0x10320d8: jal   0x100e358 addiu a0, s0, 12248
 	ldloc 9
 	ldc.i4 12248
 	add
@@ -3572,47 +3572,47 @@ L_1031ff0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010320d0: 0x10320d0: addu  v1, v0, zero
+// 0x010320e0: 0x10320e0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010320d4: 0x10320d4: cibyl_sysc_arg 0x3
+// 0x010320e4: 0x10320e4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010320d8: 0x10320d8: cibyl_sysc 0x51c
+// 0x010320e8: 0x10320e8: cibyl_sysc 0x51c
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_getCoarseFix(int32)
-// 0x010320dc: 0x10320dc: addu  v1, v0, zero
+// 0x010320ec: 0x10320ec: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_10320e0:
-// 0x010320e0: 0x10320e0: lui   s0, 0x10000
+L_10320f0:
+// 0x010320f0: 0x10320f0: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010320e4: 0x10320e4: lui   a1, 0x0
+// 0x010320f4: 0x10320f4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010320e8: 0x10320e8: lui   a2, 0x10000
+// 0x010320f8: 0x10320f8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010320ec: 0x10320ec: addiu a1, a1, 12272
+// 0x010320fc: 0x10320fc: addiu a1, a1, 12272
 	ldloc.2
 	ldc.i4 12272
 	add
 	stloc.2
-// 0x010320f0: 0x10320f0: addiu a2, a2, 18500
+// 0x01032100: 0x1032100: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x010320f4: 0x10320f4: addiu a0, s0, 12560
+// 0x01032104: 0x1032104: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010320f8: 0x10320f8: jal   0x100edb0 addu  a3, zero, zero
+// 0x01032108: 0x1032108: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3620,42 +3620,42 @@ L_10320e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032100: 0x1032100: lui   a1, 0x0
+// 0x01032110: 0x1032110: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01032104: 0x1032104: lui   a2, 0x10000
+// 0x01032114: 0x1032114: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01032108: 0x1032108: addiu a1, a1, 12176
+// 0x01032118: 0x1032118: addiu a1, a1, 12176
 	ldloc.2
 	ldc.i4 12176
 	add
 	stloc.2
-// 0x0103210c: 0x103210c: addiu a2, a2, -15496
+// 0x0103211c: 0x103211c: addiu a2, a2, 19432
 	ldloc.3
-	ldc.i4 -15496
+	ldc.i4 19432
 	add
 	stloc.3
-// 0x01032110: 0x1032110: addiu a0, s0, 12560
+// 0x01032120: 0x1032120: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032114: 0x1032114: addu  a3, zero, zero
+// 0x01032124: 0x1032124: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01032118: 0x1032118: lui   s2, 0x0
+// 0x01032128: 0x1032128: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0103211c: 0x103211c: lui   s3, 0x20000
+// 0x0103212c: 0x103212c: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01032120: 0x1032120: jal   0x100edb0 lui   s1, 0x0
+// 0x01032130: 0x1032130: jal   0x100edc0 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -3663,35 +3663,35 @@ L_10320e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032128: 0x1032128: addiu s1, s1, 20820
+// 0x01032138: 0x1032138: addiu s1, s1, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 10
-// 0x0103212c: 0x103212c: addiu a3, s3, 9464
+// 0x0103213c: 0x103213c: addiu a3, s3, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01032130: 0x1032130: addiu a0, s0, 12560
+// 0x01032140: 0x1032140: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032134: 0x1032134: addiu a1, s2, 12312
+// 0x01032144: 0x1032144: addiu a1, s2, 12312
 	ldloc 11
 	ldc.i4 12312
 	add
 	stloc.2
-// 0x01032138: 0x1032138: addu  a2, zero, zero
+// 0x01032148: 0x1032148: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103213c: 0x103213c: sw    s1, 16(sp)
+// 0x0103214c: 0x103214c: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3700,7 +3700,7 @@ L_10320e0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01032140: 0x1032140: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01032150: 0x1032150: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3714,36 +3714,36 @@ L_10320e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032148: 0x1032148: lui   a1, 0x0
+// 0x01032158: 0x1032158: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103214c: 0x103214c: addiu a0, s0, 12560
+// 0x0103215c: 0x103215c: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01032150: 0x1032150: addiu a1, a1, 12328
+// 0x01032160: 0x1032160: addiu a1, a1, 12328
 	ldloc.2
 	ldc.i4 12328
 	add
 	stloc.2
-// 0x01032154: 0x1032154: addu  a2, zero, zero
+// 0x01032164: 0x1032164: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01032158: 0x1032158: addu  a3, s1, zero
+// 0x01032168: 0x1032168: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x0103215c: 0x103215c: addiu s3, s3, 9464
+// 0x0103216c: 0x103216c: addiu s3, s3, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 8
-// 0x01032160: 0x1032160: sw    s3, 16(sp)
+// 0x01032170: 0x1032170: sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3752,7 +3752,7 @@ L_10320e0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01032164: 0x1032164: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01032174: 0x1032174: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3766,17 +3766,17 @@ L_10320e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103216c: 0x103216c: addiu a0, s2, 12312
+// 0x0103217c: 0x103217c: addiu a0, s2, 12312
 	ldloc 11
 	ldc.i4 12312
 	add
 	stloc.1
-// 0x01032170: 0x1032170: jal   0x100e7f4 addu  a1, s1, zero
+// 0x01032180: 0x1032180: jal   0x100e804 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3784,51 +3784,51 @@ L_10320e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032178: 0x1032178: lui   v1, 0x60000
+// 0x01032188: 0x1032188: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103217c: 0x103217c: lui   a0, 0x10000
+// 0x0103218c: 0x103218c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01032180: 0x1032180: lui   a1, 0x1030000
+// 0x01032190: 0x1032190: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x01032184: 0x1032184: sw    v0, -18336(v1)
+// 0x01032194: 0x1032194: sw    v0, -17872(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4584
+	ldc.i4 -4468
 	add
 	ldloc 5
 	stelem.i4
-// 0x01032188: 0x1032188: addiu a0, a0, -15252
+// 0x01032198: 0x1032198: addiu a0, a0, -15256
 	ldloc.1
-	ldc.i4 -15252
+	ldc.i4 -15256
 	add
 	stloc.1
-// 0x0103218c: 0x103218c: addiu v1, zero, 1
+// 0x0103219c: 0x103219c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01032190: 0x1032190: lui   v0, 0x60000
+// 0x010321a0: 0x10321a0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032194: 0x1032194: addiu a1, a1, 3080
+// 0x010321a4: 0x10321a4: addiu a1, a1, 3096
 	ldloc.2
-	ldc.i4 3080
+	ldc.i4 3096
 	add
 	stloc.2
-// 0x01032198: 0x1032198: jal   0x100f48c sw    v1, -18388(v0)
+// 0x010321a8: 0x10321a8: jal   0x100f49c sw    v1, -17924(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4597
+	ldc.i4 -4481
 	add
 	ldloc 6
 	stelem.i4
@@ -3837,14 +3837,14 @@ L_10320e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10321a0:
-// 0x010321a0: 0x10321a0: lw    ra, 44(sp)
-// 0x010321a4: 0x10321a4: lw    s3, 40(sp)
+L_10321b0:
+// 0x010321b0: 0x10321b0: lw    ra, 44(sp)
+// 0x010321b4: 0x10321b4: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3853,7 +3853,7 @@ L_10321a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010321a8: 0x10321a8: lw    s2, 36(sp)
+// 0x010321b8: 0x10321b8: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3862,7 +3862,7 @@ L_10321a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010321ac: 0x10321ac: lw    s1, 32(sp)
+// 0x010321bc: 0x10321bc: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3871,7 +3871,7 @@ L_10321a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010321b0: 0x10321b0: lw    s0, 28(sp)
+// 0x010321c0: 0x10321c0: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3880,7 +3880,7 @@ L_10321a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010321b4: 0x10321b4: jr    ra addiu sp, sp, 48
+// 0x010321c4: 0x10321c4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3892,7 +3892,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_warning_10321bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_warning_10321cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -3930,29 +3930,29 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010321bc: 0x10321bc: lui   v0, 0x60000
+// 0x010321cc: 0x10321cc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010321c0: 0x10321c0: lw    v0, -18616(v0)
+// 0x010321d0: 0x10321d0: lw    v0, -18152(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4654
+	ldc.i4 -4538
 	add
 	ldelem.i4
 	stloc 5
-// 0x010321c4: 0x10321c4: addiu sp, sp, -24
+// 0x010321d4: 0x10321d4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010321c8: 0x10321c8: sltiu v0, v0, 2
+// 0x010321d8: 0x10321d8: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x010321cc: 0x10321cc: sw    s0, 16(sp)
+// 0x010321dc: 0x10321dc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3961,24 +3961,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010321d0: 0x10321d0: sw    ra, 20(sp)
-// 0x010321d4: 0x10321d4: beq   v0, zero, 0x103222c addu  s0, a0, zero
+// 0x010321e0: 0x10321e0: sw    ra, 20(sp)
+// 0x010321e4: 0x10321e4: beq   v0, zero, 0x103223c addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_103222c
+	brfalse L_103223c
 // --- basic block ---
-// 0x010321dc: 0x10321dc: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x010321ec: 0x10321ec: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x010321e4: 0x10321e4: bne   v0, zero, 0x103222c lui   v0, 0x0
+// 0x010321f4: 0x10321f4: bne   v0, zero, 0x103223c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_103222c
+	brtrue L_103223c
 // --- basic block ---
-// 0x010321ec: 0x10321ec: lw    v0, 12344(v0)
+// 0x010321fc: 0x10321fc: lw    v0, 12344(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3987,48 +3987,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010321f0: 0x10321f0: sll   zero, zero, 0
-// 0x010321f4: 0x10321f4: beq   v0, zero, 0x1032204 lui   a0, 0x10000
+// 0x01032200: 0x1032200: sll   zero, zero, 0
+// 0x01032204: 0x1032204: beq   v0, zero, 0x1032214 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1032204
+	brfalse L_1032214
 // --- basic block ---
-// 0x010321fc: 0x10321fc: j	 0x103220c addiu a0, a0, -15236
+// 0x0103220c: 0x103220c: j	 0x103221c addiu a0, a0, -15240
 	ldloc.1
-	ldc.i4 -15236
+	ldc.i4 -15240
 	add
 	stloc.1
-	br L_103220c
+	br L_103221c
 // --- basic block ---
-L_1032204:
-// 0x01032204: 0x1032204: lui   a0, 0x10000
+L_1032214:
+// 0x01032214: 0x1032214: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01032208: 0x1032208: addiu a0, a0, -15200
+// 0x01032218: 0x1032218: addiu a0, a0, -15204
 	ldloc.1
-	ldc.i4 -15200
+	ldc.i4 -15204
 	add
 	stloc.1
-L_103220c:
-// 0x0103220c: 0x103220c: jal   0x101cd60 sll   zero, zero, 0
+L_103221c:
+// 0x0103221c: 0x103221c: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01032214: 0x1032214: addu  a1, v0, zero
+// 0x01032224: 0x1032224: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01032218: 0x1032218: addu  a0, s0, zero
+// 0x01032228: 0x1032228: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103221c: 0x103221c: jal   0x1001af8 addiu a2, zero, 128
+// 0x0103222c: 0x103222c: jal   0x1001af8 addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.1
@@ -4037,18 +4037,18 @@ L_103220c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01032224: 0x1032224: j	 0x1032230 addiu v0, zero, 1
+// 0x01032234: 0x1032234: j	 0x1032240 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1032230
+	br L_1032240
 // --- basic block ---
-L_103222c:
-// 0x0103222c: 0x103222c: addu  v0, zero, zero
+L_103223c:
+// 0x0103223c: 0x103223c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1032230:
-// 0x01032230: 0x1032230: lw    ra, 20(sp)
-// 0x01032234: 0x1032234: lw    s0, 16(sp)
+L_1032240:
+// 0x01032240: 0x1032240: lw    ra, 20(sp)
+// 0x01032244: 0x1032244: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4057,7 +4057,7 @@ L_1032230:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032238: 0x1032238: jr    ra addiu sp, sp, 24
+// 0x01032248: 0x1032248: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4069,7 +4069,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_warning_init_timeout_1032240(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_warning_init_timeout_1032250(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4104,18 +4104,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01032240: 0x1032240: lui   a0, 0x1030000
+// 0x01032250: 0x1032250: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x01032244: 0x1032244: addiu sp, sp, -24
+// 0x01032254: 0x1032254: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01032248: 0x1032248: sw    ra, 20(sp)
-// 0x0103224c: 0x103224c: jal   0x104fd00 addiu a0, a0, 8768
+// 0x01032258: 0x1032258: sw    ra, 20(sp)
+// 0x0103225c: 0x103225c: jal   0x104fd10 addiu a0, a0, 8784
 	ldloc.1
-	ldc.i4 8768
+	ldc.i4 8784
 	add
 	stloc.1
 	ldloc.0
@@ -4123,16 +4123,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01032254: 0x1032254: lw    ra, 20(sp)
-// 0x01032258: 0x1032258: lui   v0, 0x0
+// 0x01032264: 0x1032264: lw    ra, 20(sp)
+// 0x01032268: 0x1032268: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0103225c: 0x103225c: sw    zero, 12344(v0)
+// 0x0103226c: 0x103226c: sw    zero, 12344(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4141,7 +4141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01032260: 0x1032260: jr    ra addiu sp, sp, 24
+// 0x01032270: 0x1032270: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4153,7 +4153,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_accept_fix_1032268(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_accept_fix_1032278(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4188,18 +4188,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01032268: 0x1032268: lui   a0, 0x1030000
+// 0x01032278: 0x1032278: lui   a0, 0x1030000
 	ldc.i4 16973824
 	stloc.1
-// 0x0103226c: 0x103226c: addiu sp, sp, -24
+// 0x0103227c: 0x103227c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01032270: 0x1032270: sw    ra, 20(sp)
-// 0x01032274: 0x1032274: jal   0x104fd00 addiu a0, a0, 8808
+// 0x01032280: 0x1032280: sw    ra, 20(sp)
+// 0x01032284: 0x1032284: jal   0x104fd10 addiu a0, a0, 8824
 	ldloc.1
-	ldc.i4 8808
+	ldc.i4 8824
 	add
 	stloc.1
 	ldloc.0
@@ -4207,45 +4207,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103227c: 0x103227c: lui   v0, 0x60000
+// 0x0103228c: 0x103228c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032280: 0x1032280: lw    v0, -18456(v0)
+// 0x01032290: 0x1032290: lw    v0, -17992(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4614
+	ldc.i4 -4498
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032284: 0x1032284: sll   zero, zero, 0
-// 0x01032288: 0x1032288: bne   v0, zero, 0x10322a4 lui   v1, 0x60000
+// 0x01032294: 0x1032294: sll   zero, zero, 0
+// 0x01032298: 0x1032298: bne   v0, zero, 0x10322b4 lui   v1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 6
-	brtrue L_10322a4
+	brtrue L_10322b4
 // --- basic block ---
-// 0x01032290: 0x1032290: addiu v0, v1, -18112
+// 0x010322a0: 0x10322a0: addiu v0, v1, -17648
 	ldloc 6
-	ldc.i4 -18112
+	ldc.i4 -17648
 	add
 	stloc 5
-// 0x01032294: 0x1032294: lw    a0, -18112(v1)
+// 0x010322a4: 0x10322a4: lw    a0, -17648(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4528
+	ldc.i4 -4412
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032298: 0x1032298: lw    a1, 4(v0)
+// 0x010322a8: 0x10322a8: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4254,21 +4254,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103229c: 0x103229c: jal   0x1030c18 sll   zero, zero, 0
+// 0x010322ac: 0x10322ac: jal   0x1030c28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_set_fix_1030c18(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_set_fix_1030c28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10322a4:
-// 0x010322a4: 0x10322a4: lw    ra, 20(sp)
-// 0x010322a8: 0x10322a8: sll   zero, zero, 0
-// 0x010322ac: 0x10322ac: jr    ra addiu sp, sp, 24
+L_10322b4:
+// 0x010322b4: 0x10322b4: lw    ra, 20(sp)
+// 0x010322b8: 0x10322b8: sll   zero, zero, 0
+// 0x010322bc: 0x10322bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4280,7 +4280,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_set_show_coordinates_10322b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_set_show_coordinates_10322c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4315,20 +4315,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010322b4: 0x10322b4: lui   v0, 0x20000
+// 0x010322c4: 0x10322c4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010322b8: 0x10322b8: addiu sp, sp, -32
+// 0x010322c8: 0x10322c8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010322bc: 0x10322bc: addiu v0, v0, 9464
+// 0x010322cc: 0x10322cc: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x010322c0: 0x10322c0: sw    v0, 16(sp)
+// 0x010322d0: 0x10322d0: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4337,20 +4337,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010322c4: 0x10322c4: lui   v0, 0x0
+// 0x010322d4: 0x10322d4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010322c8: 0x10322c8: addiu v0, v0, 20820
+// 0x010322d8: 0x10322d8: addiu v0, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
 	stloc 5
-// 0x010322cc: 0x10322cc: sll   a0, a0, 2
+// 0x010322dc: 0x10322dc: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010322d0: 0x10322d0: sw    v0, 20(sp)
+// 0x010322e0: 0x10322e0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4359,12 +4359,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010322d4: 0x10322d4: addu  a0, sp, a0
+// 0x010322e4: 0x10322e4: addu  a0, sp, a0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.1
-// 0x010322d8: 0x10322d8: lw    a1, 16(a0)
+// 0x010322e8: 0x10322e8: lw    a1, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4373,11 +4373,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010322dc: 0x10322dc: lui   a0, 0x0
+// 0x010322ec: 0x10322ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010322e0: 0x10322e0: sw    ra, 28(sp)
-// 0x010322e4: 0x10322e4: jal   0x100e5c0 addiu a0, a0, 12328
+// 0x010322f0: 0x10322f0: sw    ra, 28(sp)
+// 0x010322f4: 0x10322f4: jal   0x100e5d0 addiu a0, a0, 12328
 	ldloc.1
 	ldc.i4 12328
 	add
@@ -4387,12 +4387,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010322ec: 0x10322ec: jal   0x100ea50 addu  a0, zero, zero
+// 0x010322fc: 0x10322fc: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4400,14 +4400,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010322f4: 0x10322f4: lw    ra, 28(sp)
-// 0x010322f8: 0x10322f8: sll   zero, zero, 0
-// 0x010322fc: 0x10322fc: jr    ra addiu sp, sp, 32
+// 0x01032304: 0x1032304: lw    ra, 28(sp)
+// 0x01032308: 0x1032308: sll   zero, zero, 0
+// 0x0103230c: 0x103230c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4419,7 +4419,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_reset_show_coordinates_1032304(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_reset_show_coordinates_1032314(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -4457,16 +4457,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01032304: 0x1032304: addiu sp, sp, -24
+// 0x01032314: 0x1032314: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01032308: 0x1032308: addu  a0, zero, zero
+// 0x01032318: 0x1032318: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103230c: 0x103230c: sw    ra, 20(sp)
-// 0x01032310: 0x1032310: jal   0x1094a94 sw    s0, 16(sp)
+// 0x0103231c: 0x103231c: sw    ra, 20(sp)
+// 0x01032320: 0x1032320: jal   0x10950dc sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4480,12 +4480,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032318: 0x1032318: jal   0x1031f38 lui   s0, 0x10000
+// 0x01032328: 0x1032328: jal   0x1031f48 lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
 	ldloc.0
@@ -4493,16 +4493,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_show_coordinats_1031f38(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_show_coordinats_1031f48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032320: 0x1032320: beq   v0, zero, 0x1032340 sll   zero, zero, 0
+// 0x01032330: 0x1032330: beq   v0, zero, 0x1032350 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1032340
+	brfalse L_1032350
 // --- basic block ---
-// 0x01032328: 0x1032328: jal   0x10322b4 addu  a0, zero, zero
+// 0x01032338: 0x1032338: jal   0x10322c4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4510,28 +4510,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_set_show_coordinates_10322b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_set_show_coordinates_10322c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032330: 0x1032330: lui   a1, 0x0
+// 0x01032340: 0x1032340: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01032334: 0x1032334: addiu a0, s0, -15160
+// 0x01032344: 0x1032344: addiu a0, s0, -15164
 	ldloc 7
-	ldc.i4 -15160
+	ldc.i4 -15164
 	add
 	stloc.1
-// 0x01032338: 0x1032338: j	 0x1032354 addiu a1, a1, 31272
+// 0x01032348: 0x1032348: j	 0x1032364 addiu a1, a1, 31272
 	ldloc.2
 	ldc.i4 31272
 	add
 	stloc.2
-	br L_1032354
+	br L_1032364
 // --- basic block ---
-L_1032340:
-// 0x01032340: 0x1032340: jal   0x10322b4 addiu a0, zero, 1
+L_1032350:
+// 0x01032350: 0x1032350: jal   0x10322c4 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -4539,38 +4539,38 @@ L_1032340:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_set_show_coordinates_10322b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_set_show_coordinates_10322c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01032348: 0x1032348: lui   a1, 0x0
+// 0x01032358: 0x1032358: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103234c: 0x103234c: addiu a0, s0, -15160
+// 0x0103235c: 0x103235c: addiu a0, s0, -15164
 	ldloc 7
-	ldc.i4 -15160
+	ldc.i4 -15164
 	add
 	stloc.1
-// 0x01032350: 0x1032350: addiu a1, a1, 21112
+// 0x01032360: 0x1032360: addiu a1, a1, 21112
 	ldloc.2
 	ldc.i4 21112
 	add
 	stloc.2
-L_1032354:
-// 0x01032354: 0x1032354: jal   0x104c148 sll   zero, zero, 0
+L_1032364:
+// 0x01032364: 0x1032364: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103235c: 0x103235c: lw    ra, 20(sp)
-// 0x01032360: 0x1032360: lw    s0, 16(sp)
+// 0x0103236c: 0x103236c: lw    ra, 20(sp)
+// 0x01032370: 0x1032370: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4579,7 +4579,7 @@ L_1032354:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032364: 0x1032364: jr    ra addiu sp, sp, 24
+// 0x01032374: 0x1032374: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4591,7 +4591,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_process_position_103236c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_process_position_103237c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 t0,int32 s3,int32 s4,int32 hi,int32 lo,int32 ra,int32 t1)
@@ -4653,25 +4653,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103236c: 0x103236c: lui   v0, 0x60000
+// 0x0103237c: 0x103237c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032370: 0x1032370: lw    v0, -18336(v0)
+// 0x01032380: 0x1032380: lw    v0, -17872(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4584
+	ldc.i4 -4468
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032374: 0x1032374: addiu sp, sp, -64
+// 0x01032384: 0x1032384: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01032378: 0x1032378: sw    ra, 60(sp)
-// 0x0103237c: 0x103237c: sw    s4, 56(sp)
+// 0x01032388: 0x1032388: sw    ra, 60(sp)
+// 0x0103238c: 0x103238c: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4680,7 +4680,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01032380: 0x1032380: sw    s3, 52(sp)
+// 0x01032390: 0x1032390: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4689,7 +4689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01032384: 0x1032384: sw    s2, 48(sp)
+// 0x01032394: 0x1032394: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4698,7 +4698,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01032388: 0x1032388: sw    s1, 44(sp)
+// 0x01032398: 0x1032398: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4707,7 +4707,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103238c: 0x103238c: beq   v0, zero, 0x10323bc sw    s0, 40(sp)
+// 0x0103239c: 0x103239c: beq   v0, zero, 0x10323cc sw    s0, 40(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4717,20 +4717,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_10323bc
+	brfalse L_10323cc
 // --- basic block ---
-// 0x01032394: 0x1032394: lui   v1, 0x60000
+// 0x010323a4: 0x10323a4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01032398: 0x1032398: addiu v0, v1, -18332
+// 0x010323a8: 0x10323a8: addiu v0, v1, -17868
 	ldloc 7
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 5
-// 0x0103239c: 0x103239c: lui   a0, 0x60000
+// 0x010323ac: 0x10323ac: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x010323a0: 0x10323a0: lw    a2, 4(v0)
+// 0x010323b0: 0x10323b0: lw    a2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4739,7 +4739,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010323a4: 0x10323a4: lw    a3, 16(v0)
+// 0x010323b4: 0x10323b4: lw    a3, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4748,16 +4748,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010323a8: 0x10323a8: lw    a0, -18548(a0)
+// 0x010323b8: 0x10323b8: lw    a0, -18084(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldelem.i4
 	stloc.1
-// 0x010323ac: 0x10323ac: lw    v0, 12(v0)
+// 0x010323bc: 0x10323bc: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4766,16 +4766,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010323b0: 0x10323b0: lw    a1, -18332(v1)
+// 0x010323c0: 0x10323c0: lw    a1, -17868(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldelem.i4
 	stloc.2
-// 0x010323b4: 0x10323b4: jal   0x1030f68 sw    v0, 16(sp)
+// 0x010323c4: 0x10323c4: jal   0x1030f78 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4789,67 +4789,67 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_raw_1030f68(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_raw_1030f78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10323bc:
-// 0x010323bc: 0x10323bc: lui   v0, 0x60000
+L_10323cc:
+// 0x010323cc: 0x10323cc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010323c0: 0x10323c0: lw    v0, -23848(v0)
+// 0x010323d0: 0x10323d0: lw    v0, -23384(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5962
+	ldc.i4 -5846
 	add
 	ldelem.i4
 	stloc 5
-// 0x010323c4: 0x10323c4: sll   zero, zero, 0
-// 0x010323c8: 0x10323c8: beq   v0, zero, 0x103242c lui   v0, 0x60000
+// 0x010323d4: 0x10323d4: sll   zero, zero, 0
+// 0x010323d8: 0x10323d8: beq   v0, zero, 0x103243c lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_103242c
+	brfalse L_103243c
 // --- basic block ---
-// 0x010323d0: 0x10323d0: lui   s0, 0x60000
+// 0x010323e0: 0x10323e0: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x010323d4: 0x10323d4: lw    a0, -23852(s0)
+// 0x010323e4: 0x10323e4: lw    a0, -23388(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5963
+	ldc.i4 -5847
 	add
 	ldelem.i4
 	stloc.1
-// 0x010323d8: 0x10323d8: lw    a2, -18548(v0)
+// 0x010323e8: 0x10323e8: lw    a2, -18084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldelem.i4
 	stloc.3
-// 0x010323dc: 0x10323dc: beq   a0, zero, 0x103242c lui   a1, 0x60000
+// 0x010323ec: 0x10323ec: beq   a0, zero, 0x103243c lui   a1, 0x60000
 	ldloc.1
 	ldc.i4 393216
 	stloc.2
-	brfalse L_103242c
+	brfalse L_103243c
 // --- basic block ---
-// 0x010323e4: 0x10323e4: addiu v1, a1, -18332
+// 0x010323f4: 0x10323f4: addiu v1, a1, -17868
 	ldloc.2
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 7
-// 0x010323e8: 0x10323e8: lui   v0, 0x0
+// 0x010323f8: 0x10323f8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010323ec: 0x10323ec: lw    t0, 4(v1)
+// 0x010323fc: 0x10323fc: lw    t0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4858,25 +4858,25 @@ L_10323bc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010323f0: 0x10323f0: lw    t1, -18332(a1)
+// 0x01032400: 0x1032400: lw    t1, -17868(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldelem.i4
 	stloc 17
-// 0x010323f4: 0x10323f4: lb    a3, 12292(v0)
+// 0x01032404: 0x1032404: lb    a3, 12292(v0)
 	ldloc 5
 	ldc.i4 12292
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x010323f8: 0x10323f8: lui   a1, 0x10000
+// 0x01032408: 0x1032408: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010323fc: 0x10323fc: lw    v0, 12(v1)
+// 0x0103240c: 0x103240c: lw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4885,7 +4885,7 @@ L_10323bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032400: 0x1032400: lw    v1, 16(v1)
+// 0x01032410: 0x1032410: lw    v1, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4894,12 +4894,12 @@ L_10323bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032404: 0x1032404: addiu a1, a1, -15140
+// 0x01032414: 0x1032414: addiu a1, a1, -15144
 	ldloc.2
-	ldc.i4 -15140
+	ldc.i4 -15144
 	add
 	stloc.2
-// 0x01032408: 0x1032408: sw    t1, 16(sp)
+// 0x01032418: 0x1032418: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4908,7 +4908,7 @@ L_10323bc:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0103240c: 0x103240c: sw    t0, 20(sp)
+// 0x0103241c: 0x103241c: sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4917,7 +4917,7 @@ L_10323bc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01032410: 0x1032410: sw    v1, 24(sp)
+// 0x01032420: 0x1032420: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4926,7 +4926,7 @@ L_10323bc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032414: 0x1032414: jal   0x1000ef4 sw    v0, 28(sp)
+// 0x01032424: 0x1032424: jal   0x1000ef4 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4945,16 +4945,16 @@ L_10323bc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103241c: 0x103241c: lw    a0, -23852(s0)
+// 0x0103242c: 0x103242c: lw    a0, -23388(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5963
+	ldc.i4 -5847
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032420: 0x1032420: jal   0x1001e3c sll   zero, zero, 0
+// 0x01032430: 0x1032430: jal   0x1001e3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4965,49 +4965,49 @@ L_10323bc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032428: 0x1032428: lui   v0, 0x60000
+// 0x01032438: 0x1032438: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_103242c:
-// 0x0103242c: 0x103242c: lui   v1, 0x60000
+L_103243c:
+// 0x0103243c: 0x103243c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01032430: 0x1032430: lw    s1, -18548(v0)
+// 0x01032440: 0x1032440: lw    s1, -18084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldelem.i4
 	stloc 9
-// 0x01032434: 0x1032434: lui   v0, 0x60000
+// 0x01032444: 0x1032444: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032438: 0x1032438: addiu a0, v1, -18332
+// 0x01032448: 0x1032448: addiu a0, v1, -17868
 	ldloc 7
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc.1
-// 0x0103243c: 0x103243c: lw    v0, -18464(v0)
+// 0x0103244c: 0x103244c: lw    v0, -18000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 -4500
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032440: 0x1032440: lw    a1, -18332(v1)
+// 0x01032450: 0x1032450: lw    a1, -17868(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032444: 0x1032444: lw    a0, 4(a0)
+// 0x01032454: 0x1032454: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5016,12 +5016,12 @@ L_103242c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032448: 0x1032448: slt   v1, s1, v0
+// 0x01032458: 0x1032458: slt   v1, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 7
-// 0x0103244c: 0x103244c: sw    a1, 32(sp)
+// 0x0103245c: 0x103245c: sw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5030,7 +5030,7 @@ L_103242c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01032450: 0x1032450: sw    a0, 36(sp)
+// 0x01032460: 0x1032460: sw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5039,35 +5039,35 @@ L_103242c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01032454: 0x1032454: beq   v1, zero, 0x1032484 addiu s0, zero, 1
+// 0x01032464: 0x1032464: beq   v1, zero, 0x1032494 addiu s0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 8
-	brfalse L_1032484
+	brfalse L_1032494
 // --- basic block ---
-// 0x0103245c: 0x103245c: lui   a1, 0x10000
+// 0x0103246c: 0x103246c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01032460: 0x1032460: lui   a3, 0x10000
+// 0x01032470: 0x1032470: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01032464: 0x1032464: addiu a1, a1, -15752
+// 0x01032474: 0x1032474: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01032468: 0x1032468: addiu a3, a3, -15112
+// 0x01032478: 0x1032478: addiu a3, a3, -15116
 	ldloc 4
-	ldc.i4 -15112
+	ldc.i4 -15116
 	add
 	stloc 4
-// 0x0103246c: 0x103246c: addiu a0, zero, 3
+// 0x0103247c: 0x103247c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01032470: 0x1032470: addiu a2, zero, 333
+// 0x01032480: 0x1032480: addiu a2, zero, 333
 	ldc.i4 333
 	stloc.3
-// 0x01032474: 0x1032474: sw    v0, 16(sp)
+// 0x01032484: 0x1032484: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5076,7 +5076,7 @@ L_103242c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01032478: 0x1032478: sw    s1, 20(sp)
+// 0x01032488: 0x1032488: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5085,7 +5085,7 @@ L_103242c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103247c: 0x103247c: jal   0x100449c addu  s0, zero, zero
+// 0x0103248c: 0x103248c: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -5098,54 +5098,54 @@ L_103242c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1032484:
-// 0x01032484: 0x1032484: lui   v0, 0x60000
+L_1032494:
+// 0x01032494: 0x1032494: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032488: 0x1032488: lw    v0, -18320(v0)
+// 0x01032498: 0x1032498: lw    v0, -17856(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4580
+	ldc.i4 -4464
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103248c: 0x103248c: lui   v1, 0x60000
+// 0x0103249c: 0x103249c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01032490: 0x1032490: bne   v0, zero, 0x1032518 sw    s1, -18464(v1)
+// 0x010324a0: 0x10324a0: bne   v0, zero, 0x1032528 sw    s1, -18000(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 -4500
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_1032518
+	brtrue L_1032528
 // --- basic block ---
-// 0x01032498: 0x1032498: beq   s0, zero, 0x103251c lui   s2, 0x60000
+// 0x010324a8: 0x10324a8: beq   s0, zero, 0x103252c lui   s2, 0x60000
 	ldloc 8
 	ldc.i4 393216
 	stloc 10
-	brfalse L_103251c
+	brfalse L_103252c
 // --- basic block ---
-// 0x010324a0: 0x10324a0: lui   s0, 0x60000
+// 0x010324b0: 0x10324b0: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x010324a4: 0x10324a4: addiu s2, sp, 32
+// 0x010324b4: 0x10324b4: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x010324a8: 0x10324a8: addiu a0, s0, -18472
+// 0x010324b8: 0x10324b8: addiu a0, s0, -18008
 	ldloc 8
-	ldc.i4 -18472
+	ldc.i4 -18008
 	add
 	stloc.1
-// 0x010324ac: 0x10324ac: jal   0x1008eb0 addu  a1, s2, zero
+// 0x010324bc: 0x10324bc: jal   0x1008ec0 addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5153,28 +5153,28 @@ L_1032484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010324b4: 0x10324b4: slti  v0, v0, 51
+// 0x010324c4: 0x10324c4: slti  v0, v0, 51
 	ldloc 5
 	ldc.i4.s 51
 	clt
 	stloc 5
-// 0x010324b8: 0x10324b8: bne   v0, zero, 0x1032514 lui   s1, 0x60000
+// 0x010324c8: 0x10324c8: bne   v0, zero, 0x1032524 lui   s1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 9
-	brtrue L_1032514
+	brtrue L_1032524
 // --- basic block ---
-// 0x010324c0: 0x10324c0: addu  a1, s2, zero
+// 0x010324d0: 0x10324d0: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010324c4: 0x10324c4: jal   0x1008eb0 addiu a0, s1, -18480
+// 0x010324d4: 0x10324d4: jal   0x1008ec0 addiu a0, s1, -18016
 	ldloc 9
-	ldc.i4 -18480
+	ldc.i4 -18016
 	add
 	stloc.1
 	ldloc.0
@@ -5182,42 +5182,42 @@ L_1032484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010324cc: 0x10324cc: slti  v1, v0, 51
+// 0x010324dc: 0x10324dc: slti  v1, v0, 51
 	ldloc 5
 	ldc.i4.s 51
 	clt
 	stloc 7
-// 0x010324d0: 0x10324d0: bne   v1, zero, 0x1032514 lui   a1, 0x10000
+// 0x010324e0: 0x10324e0: bne   v1, zero, 0x1032524 lui   a1, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1032514
+	brtrue L_1032524
 // --- basic block ---
-// 0x010324d8: 0x10324d8: lui   a3, 0x10000
+// 0x010324e8: 0x10324e8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010324dc: 0x10324dc: addiu a0, zero, 3
+// 0x010324ec: 0x10324ec: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010324e0: 0x10324e0: addiu a1, a1, -15752
+// 0x010324f0: 0x10324f0: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x010324e4: 0x10324e4: addiu a3, a3, -15064
+// 0x010324f4: 0x10324f4: addiu a3, a3, -15068
 	ldloc 4
-	ldc.i4 -15064
+	ldc.i4 -15068
 	add
 	stloc 4
-// 0x010324e8: 0x10324e8: addiu a2, zero, 356
+// 0x010324f8: 0x10324f8: addiu a2, zero, 356
 	ldc.i4 356
 	stloc.3
-// 0x010324ec: 0x10324ec: jal   0x100449c sw    v0, 16(sp)
+// 0x010324fc: 0x10324fc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5236,12 +5236,12 @@ L_1032484:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010324f4: 0x10324f4: addiu v0, s1, -18480
+// 0x01032504: 0x1032504: addiu v0, s1, -18016
 	ldloc 9
-	ldc.i4 -18480
+	ldc.i4 -18016
 	add
 	stloc 5
-// 0x010324f8: 0x10324f8: lw    a0, 4(v0)
+// 0x01032508: 0x1032508: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5250,30 +5250,30 @@ L_1032484:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010324fc: 0x10324fc: lw    v0, -18480(s1)
+// 0x0103250c: 0x103250c: lw    v0, -18016(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4620
+	ldc.i4 -4504
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032500: 0x1032500: addiu v1, s0, -18472
+// 0x01032510: 0x1032510: addiu v1, s0, -18008
 	ldloc 8
-	ldc.i4 -18472
+	ldc.i4 -18008
 	add
 	stloc 7
-// 0x01032504: 0x1032504: sw    v0, -18472(s0)
+// 0x01032514: 0x1032514: sw    v0, -18008(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4618
+	ldc.i4 -4502
 	add
 	ldloc 5
 	stelem.i4
-// 0x01032508: 0x1032508: sw    a0, 4(v1)
+// 0x01032518: 0x1032518: sw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5282,26 +5282,26 @@ L_1032484:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103250c: 0x103250c: j	 0x1032518 addu  s0, zero, zero
+// 0x0103251c: 0x103251c: j	 0x1032528 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1032518
+	br L_1032528
 // --- basic block ---
-L_1032514:
-// 0x01032514: 0x1032514: addiu s0, zero, 1
+L_1032524:
+// 0x01032524: 0x1032524: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_1032518:
-// 0x01032518: 0x1032518: lui   s2, 0x60000
+L_1032528:
+// 0x01032528: 0x1032528: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-L_103251c:
-// 0x0103251c: 0x103251c: addiu s2, s2, -18332
+L_103252c:
+// 0x0103252c: 0x103252c: addiu s2, s2, -17868
 	ldloc 10
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 10
-// 0x01032520: 0x1032520: lw    v0, 12(s2)
+// 0x01032530: 0x1032530: lw    v0, 12(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5310,50 +5310,50 @@ L_103251c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032524: 0x1032524: sll   zero, zero, 0
-// 0x01032528: 0x1032528: slti  v1, v0, 128
+// 0x01032534: 0x1032534: sll   zero, zero, 0
+// 0x01032538: 0x1032538: slti  v1, v0, 128
 	ldloc 5
 	ldc.i4 128
 	clt
 	stloc 7
-// 0x0103252c: 0x103252c: bne   v1, zero, 0x1032568 lui   s1, 0x60000
+// 0x0103253c: 0x103253c: bne   v1, zero, 0x1032578 lui   s1, 0x60000
 	ldloc 7
 	ldc.i4 393216
 	stloc 9
-	brtrue L_1032568
+	brtrue L_1032578
 // --- basic block ---
-// 0x01032534: 0x1032534: lw    v1, -18460(s1)
+// 0x01032544: 0x1032544: lw    v1, -17996(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4615
+	ldc.i4 -4499
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032538: 0x1032538: lui   a1, 0x10000
+// 0x01032548: 0x1032548: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103253c: 0x103253c: lui   a3, 0x10000
+// 0x0103254c: 0x103254c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01032540: 0x1032540: addiu a1, a1, -15752
+// 0x01032550: 0x1032550: addiu a1, a1, -15752
 	ldloc.2
 	ldc.i4 -15752
 	add
 	stloc.2
-// 0x01032544: 0x1032544: addiu a3, a3, -15008
+// 0x01032554: 0x1032554: addiu a3, a3, -15012
 	ldloc 4
-	ldc.i4 -15008
+	ldc.i4 -15012
 	add
 	stloc 4
-// 0x01032548: 0x1032548: addiu a0, zero, 3
+// 0x01032558: 0x1032558: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0103254c: 0x103254c: addiu a2, zero, 364
+// 0x0103255c: 0x103255c: addiu a2, zero, 364
 	ldc.i4 364
 	stloc.3
-// 0x01032550: 0x1032550: sw    v0, 16(sp)
+// 0x01032560: 0x1032560: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5362,7 +5362,7 @@ L_103251c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01032554: 0x1032554: jal   0x100449c sw    v1, 20(sp)
+// 0x01032564: 0x1032564: jal   0x100449c sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5381,16 +5381,16 @@ L_103251c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103255c: 0x103255c: lw    v0, -18460(s1)
+// 0x0103256c: 0x103256c: lw    v0, -17996(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4615
+	ldc.i4 -4499
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032560: 0x1032560: j	 0x103256c sw    v0, 12(s2)
+// 0x01032570: 0x1032570: j	 0x103257c sw    v0, 12(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5399,23 +5399,23 @@ L_103251c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_103256c
+	br L_103257c
 // --- basic block ---
-L_1032568:
-// 0x01032568: 0x1032568: sw    v0, -18460(s1)
+L_1032578:
+// 0x01032578: 0x1032578: sw    v0, -17996(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4615
+	ldc.i4 -4499
 	add
 	ldloc 5
 	stelem.i4
-L_103256c:
-// 0x0103256c: 0x103256c: lui   a0, 0x60000
+L_103257c:
+// 0x0103257c: 0x103257c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01032570: 0x1032570: lw    v0, 32(sp)
+// 0x01032580: 0x1032580: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5424,7 +5424,7 @@ L_103256c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032574: 0x1032574: lw    v1, 36(sp)
+// 0x01032584: 0x1032584: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5433,12 +5433,12 @@ L_103256c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032578: 0x1032578: addiu a1, a0, -18480
+// 0x01032588: 0x1032588: addiu a1, a0, -18016
 	ldloc.1
-	ldc.i4 -18480
+	ldc.i4 -18016
 	add
 	stloc.2
-// 0x0103257c: 0x103257c: sw    v1, 4(a1)
+// 0x0103258c: 0x103258c: sw    v1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5447,39 +5447,39 @@ L_103256c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032580: 0x1032580: beq   s0, zero, 0x1032700 sw    v0, -18480(a0)
+// 0x01032590: 0x1032590: beq   s0, zero, 0x1032710 sw    v0, -18016(a0)
 	ldloc 8
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4620
+	ldc.i4 -4504
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1032700
+	brfalse L_1032710
 // --- basic block ---
-// 0x01032588: 0x1032588: lui   a0, 0x60000
+// 0x01032598: 0x1032598: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103258c: 0x103258c: lw    a1, -18692(a0)
+// 0x0103259c: 0x103259c: lw    a1, -18228(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4673
+	ldc.i4 -4557
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032590: 0x1032590: lui   a0, 0x60000
+// 0x010325a0: 0x10325a0: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01032594: 0x1032594: addiu a2, a0, -18472
+// 0x010325a4: 0x10325a4: addiu a2, a0, -18008
 	ldloc.1
-	ldc.i4 -18472
+	ldc.i4 -18008
 	add
 	stloc.3
-// 0x01032598: 0x1032598: sw    v1, 4(a2)
+// 0x010325a8: 0x10325a8: sw    v1, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -5488,37 +5488,37 @@ L_103256c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103259c: 0x103259c: blez  a1, 0x10325bc sw    v0, -18472(a0)
+// 0x010325ac: 0x10325ac: blez  a1, 0x10325cc sw    v0, -18008(a0)
 	ldloc.2
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4618
+	ldc.i4 -4502
 	add
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	ble L_10325bc
+	ble L_10325cc
 // --- basic block ---
-// 0x010325a4: 0x10325a4: lui   v1, 0x60000
+// 0x010325b4: 0x10325b4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010325a8: 0x10325a8: addiu v0, v1, -18332
+// 0x010325b8: 0x10325b8: addiu v0, v1, -17868
 	ldloc 7
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 5
-// 0x010325ac: 0x10325ac: lw    a0, -18332(v1)
+// 0x010325bc: 0x10325bc: lw    a0, -17868(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldelem.i4
 	stloc.1
-// 0x010325b0: 0x10325b0: lw    a1, 4(v0)
+// 0x010325c0: 0x10325c0: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5527,70 +5527,70 @@ L_103256c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010325b4: 0x10325b4: jal   0x1030c18 sll   zero, zero, 0
+// 0x010325c4: 0x10325c4: jal   0x1030c28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_set_fix_1030c18(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_set_fix_1030c28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10325bc:
-// 0x010325bc: 0x10325bc: addu  v1, zero, zero
+L_10325cc:
+// 0x010325cc: 0x10325cc: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010325c0: 0x10325c0: cibyl_sysc_arg 0x3
+// 0x010325d0: 0x10325d0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010325c4: 0x10325c4: cibyl_sysc 0x539
+// 0x010325d4: 0x10325d4: cibyl_sysc 0x539
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010325c8: 0x10325c8: addu  v1, v0, zero
+// 0x010325d8: 0x10325d8: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010325cc: 0x10325cc: lui   v0, 0x60000
+// 0x010325dc: 0x10325dc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010325d0: 0x10325d0: sw    v1, -18692(v0)
+// 0x010325e0: 0x10325e0: sw    v1, -18228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4673
+	ldc.i4 -4557
 	add
 	ldloc 7
 	stelem.i4
-// 0x010325d4: 0x10325d4: lui   v0, 0x60000
+// 0x010325e4: 0x10325e4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010325d8: 0x10325d8: jal   0x101de10 sw    zero, -18688(v0)
+// 0x010325e8: 0x10325e8: jal   0x101de20 sw    zero, -18224(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4672
+	ldc.i4 -4556
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010325e0: 0x10325e0: beq   v0, zero, 0x1032608 lui   a1, 0x20000
+// 0x010325f0: 0x10325f0: beq   v0, zero, 0x1032618 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1032608
+	brfalse L_1032618
 // --- basic block ---
-// 0x010325e8: 0x10325e8: addu  a0, v0, zero
+// 0x010325f8: 0x10325f8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010325ec: 0x10325ec: jal   0x1001b14 addiu a1, a1, 6792
+// 0x010325fc: 0x10325fc: jal   0x1001b14 addiu a1, a1, 7256
 	ldloc.2
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.2
 	ldloc.1
@@ -5598,16 +5598,16 @@ L_10325bc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010325f4: 0x10325f4: bne   v0, zero, 0x103260c lui   s0, 0x60000
+// 0x01032604: 0x1032604: bne   v0, zero, 0x103261c lui   s0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 8
-	brtrue L_103260c
+	brtrue L_103261c
 // --- basic block ---
-// 0x010325fc: 0x10325fc: lui   a0, 0x10000
+// 0x0103260c: 0x103260c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01032600: 0x1032600: jal   0x101ece8 addiu a0, a0, -31052
+// 0x01032610: 0x1032610: jal   0x101ecf8 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -5617,80 +5617,80 @@ L_10325bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1032608:
-// 0x01032608: 0x1032608: lui   s0, 0x60000
+L_1032618:
+// 0x01032618: 0x1032618: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-L_103260c:
-// 0x0103260c: 0x103260c: lui   s4, 0x60000
+L_103261c:
+// 0x0103261c: 0x103261c: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x01032610: 0x1032610: lui   s3, 0x60000
+// 0x01032620: 0x1032620: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x01032614: 0x1032614: lui   s2, 0x60000
+// 0x01032624: 0x1032624: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01032618: 0x1032618: addiu s0, s0, -18544
+// 0x01032628: 0x1032628: addiu s0, s0, -18080
 	ldloc 8
-	ldc.i4 -18544
+	ldc.i4 -18080
 	add
 	stloc 8
-// 0x0103261c: 0x103261c: addiu s4, s4, -18480
+// 0x0103262c: 0x103262c: addiu s4, s4, -18016
 	ldloc 13
-	ldc.i4 -18480
+	ldc.i4 -18016
 	add
 	stloc 13
-// 0x01032620: 0x1032620: addiu s3, s3, -18152
+// 0x01032630: 0x1032630: addiu s3, s3, -17688
 	ldloc 12
-	ldc.i4 -18152
+	ldc.i4 -17688
 	add
 	stloc 12
-// 0x01032624: 0x1032624: addiu s2, s2, -18332
+// 0x01032634: 0x1032634: addiu s2, s2, -17868
 	ldloc 10
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 10
-// 0x01032628: 0x1032628: lui   s1, 0x60000
+// 0x01032638: 0x1032638: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-L_103262c:
-// 0x0103262c: 0x103262c: lw    v0, 0(s0)
+L_103263c:
+// 0x0103263c: 0x103263c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01032630: 0x1032630: addu  a1, s3, zero
+// 0x01032640: 0x1032640: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01032634: 0x1032634: addiu s0, s0, 4
+// 0x01032644: 0x1032644: addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x01032638: 0x1032638: beq   v0, zero, 0x1032654 addu  a2, s2, zero
+// 0x01032648: 0x1032648: beq   v0, zero, 0x1032664 addu  a2, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.3
-	brfalse L_1032654
+	brfalse L_1032664
 // --- basic block ---
-// 0x01032640: 0x1032640: lw    a0, -18548(s1)
+// 0x01032650: 0x1032650: lw    a0, -18084(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032644: 0x1032644: jalr  v0 sll   zero, zero, 0
+// 0x01032654: 0x1032654: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5702,79 +5702,79 @@ L_103262c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103264c: 0x103264c: bne   s0, s4, 0x103262c sll   zero, zero, 0
+// 0x0103265c: 0x103265c: bne   s0, s4, 0x103263c sll   zero, zero, 0
 	ldloc 8
 	ldloc 13
-	bne.un L_103262c
+	bne.un L_103263c
 // --- basic block ---
-L_1032654:
-// 0x01032654: 0x1032654: lui   v0, 0x60000
+L_1032664:
+// 0x01032664: 0x1032664: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032658: 0x1032658: lw    v0, -18616(v0)
+// 0x01032668: 0x1032668: lw    v0, -18152(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4654
+	ldc.i4 -4538
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103265c: 0x103265c: sll   zero, zero, 0
-// 0x01032660: 0x1032660: sltiu v0, v0, 2
+// 0x0103266c: 0x103266c: sll   zero, zero, 0
+// 0x01032670: 0x1032670: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x01032664: 0x1032664: bne   v0, zero, 0x10326f8 sll   zero, zero, 0
+// 0x01032674: 0x1032674: bne   v0, zero, 0x1032708 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10326f8
+	brtrue L_1032708
 // --- basic block ---
-// 0x0103266c: 0x103266c: jal   0x1015c94 sll   zero, zero, 0
-	call int32 Cibyl16::roadmap_verbosity_1015c94()
+// 0x0103267c: 0x103267c: jal   0x1015ca4 sll   zero, zero, 0
+	call int32 Cibyl16::roadmap_verbosity_1015ca4()
 	stloc 5
 // --- basic block ---
-// 0x01032674: 0x1032674: slti  v0, v0, 2
+// 0x01032684: 0x1032684: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01032678: 0x1032678: beq   v0, zero, 0x10326f8 sll   zero, zero, 0
+// 0x01032688: 0x1032688: beq   v0, zero, 0x1032708 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10326f8
+	brfalse L_1032708
 // --- basic block ---
-// 0x01032680: 0x1032680: jal   0x1031f38 sll   zero, zero, 0
+// 0x01032690: 0x1032690: jal   0x1031f48 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_show_coordinats_1031f38(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_show_coordinats_1031f48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032688: 0x1032688: beq   v0, zero, 0x10326f8 lui   v0, 0x60000
+// 0x01032698: 0x1032698: beq   v0, zero, 0x1032708 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_10326f8
+	brfalse L_1032708
 // --- basic block ---
-// 0x01032690: 0x1032690: lw    a3, -18332(v0)
+// 0x010326a0: 0x10326a0: lw    a3, -17868(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032694: 0x1032694: addiu v1, v0, -18332
+// 0x010326a4: 0x10326a4: addiu v1, v0, -17868
 	ldloc 5
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 7
-// 0x01032698: 0x1032698: lw    v0, 4(v1)
+// 0x010326a8: 0x10326a8: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5783,30 +5783,30 @@ L_1032654:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103269c: 0x103269c: sra   v1, a3, 31
+// 0x010326ac: 0x10326ac: sra   v1, a3, 31
 	ldloc 4
 	ldc.i4.s 31
 	shr
 	stloc 7
-// 0x010326a0: 0x10326a0: xor   a3, v1, a3
+// 0x010326b0: 0x10326b0: xor   a3, v1, a3
 	ldloc 7
 	ldloc 4
 	xor
 	stloc 4
-// 0x010326a4: 0x10326a4: lui   t0, 0xf0000
+// 0x010326b4: 0x10326b4: lui   t0, 0xf0000
 	ldc.i4 983040
 	stloc 11
-// 0x010326a8: 0x10326a8: subu  a3, a3, v1
+// 0x010326b8: 0x10326b8: subu  a3, a3, v1
 	ldloc 4
 	ldloc 7
 	sub
 	stloc 4
-// 0x010326ac: 0x10326ac: ori   t0, t0, 16960
+// 0x010326bc: 0x10326bc: ori   t0, t0, 16960
 	ldloc 11
 	ldc.i4 16960
 	or
 	stloc 11
-// 0x010326b0: 0x10326b0: div   a3, t0
+// 0x010326c0: 0x10326c0: div   a3, t0
 	ldloc 4
 	ldloc 11
 	ldloc 4
@@ -5815,46 +5815,46 @@ L_1032654:
 	stloc 15
 	rem
 	stloc 14
-// 0x010326b4: 0x10326b4: sra   a0, v0, 31
+// 0x010326c4: 0x10326c4: sra   a0, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x010326b8: 0x10326b8: xor   v0, a0, v0
+// 0x010326c8: 0x10326c8: xor   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	xor
 	stloc 5
-// 0x010326bc: 0x10326bc: subu  v0, v0, a0
+// 0x010326cc: 0x10326cc: subu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc 5
-// 0x010326c0: 0x10326c0: lui   a1, 0x10000
+// 0x010326d0: 0x10326d0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010326c4: 0x10326c4: lui   a0, 0x10000
+// 0x010326d4: 0x10326d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010326c8: 0x10326c8: addiu a0, a0, -31112
+// 0x010326d8: 0x10326d8: addiu a0, a0, -31112
 	ldloc.1
 	ldc.i4 -31112
 	add
 	stloc.1
-// 0x010326cc: 0x10326cc: addiu a1, a1, -14932
+// 0x010326dc: 0x10326dc: addiu a1, a1, -14936
 	ldloc.2
-	ldc.i4 -14932
+	ldc.i4 -14936
 	add
 	stloc.2
-// 0x010326d0: 0x10326d0: mfhi  hi
+// 0x010326e0: 0x10326e0: mfhi  hi
 	ldloc 14
 	stloc 4
-// 0x010326d4: 0x10326d4: mflo  lo
+// 0x010326e4: 0x10326e4: mflo  lo
 	ldloc 15
 	stloc.3
-// 0x010326d8: 0x10326d8: sll   zero, zero, 0
-// 0x010326dc: 0x10326dc: sll   zero, zero, 0
-// 0x010326e0: 0x10326e0: div   v0, t0
+// 0x010326e8: 0x10326e8: sll   zero, zero, 0
+// 0x010326ec: 0x10326ec: sll   zero, zero, 0
+// 0x010326f0: 0x10326f0: div   v0, t0
 	ldloc 5
 	ldloc 11
 	ldloc 5
@@ -5863,10 +5863,10 @@ L_1032654:
 	stloc 15
 	rem
 	stloc 14
-// 0x010326e4: 0x10326e4: mfhi  hi
+// 0x010326f4: 0x10326f4: mfhi  hi
 	ldloc 14
 	stloc 5
-// 0x010326e8: 0x10326e8: sw    v0, 20(sp)
+// 0x010326f8: 0x10326f8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5875,10 +5875,10 @@ L_1032654:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010326ec: 0x10326ec: mflo  lo
+// 0x010326fc: 0x10326fc: mflo  lo
 	ldloc 15
 	stloc 7
-// 0x010326f0: 0x10326f0: jal   0x1019ba8 sw    v1, 16(sp)
+// 0x01032700: 0x1032700: jal   0x1019bb8 sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5892,26 +5892,26 @@ L_1032654:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_text_1019ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_text_1019bb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10326f8:
-// 0x010326f8: 0x10326f8: jal   0x10313a8 sll   zero, zero, 0
+L_1032708:
+// 0x01032708: 0x1032708: jal   0x10313b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_reception_10313a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_reception_10313b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1032700:
-// 0x01032700: 0x1032700: lw    ra, 60(sp)
-// 0x01032704: 0x1032704: lw    s4, 56(sp)
+L_1032710:
+// 0x01032710: 0x1032710: lw    ra, 60(sp)
+// 0x01032714: 0x1032714: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5920,7 +5920,7 @@ L_1032700:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01032708: 0x1032708: lw    s3, 52(sp)
+// 0x01032718: 0x1032718: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5929,7 +5929,7 @@ L_1032700:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103270c: 0x103270c: lw    s2, 48(sp)
+// 0x0103271c: 0x103271c: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5938,7 +5938,7 @@ L_1032700:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01032710: 0x1032710: lw    s1, 44(sp)
+// 0x01032720: 0x1032720: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5947,7 +5947,7 @@ L_1032700:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01032714: 0x1032714: lw    s0, 40(sp)
+// 0x01032724: 0x1032724: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5956,7 +5956,7 @@ L_1032700:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01032718: 0x1032718: jr    ra addiu sp, sp, 64
+// 0x01032728: 0x1032728: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5968,7 +5968,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_gll_1032720(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_gll_1032730(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -6003,17 +6003,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01032720: 0x1032720: addiu sp, sp, -32
+// 0x01032730: 0x1032730: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01032724: 0x1032724: sw    ra, 28(sp)
-// 0x01032728: 0x1032728: lb    a0, 0(a1)
+// 0x01032734: 0x1032734: sw    ra, 28(sp)
+// 0x01032738: 0x1032738: lb    a0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0103272c: 0x103272c: jal   0x1031208 sw    a1, 16(sp)
+// 0x0103273c: 0x103273c: jal   0x1031218 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6027,12 +6027,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_status_1031208(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_status_1031218(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01032734: 0x1032734: lw    a1, 16(sp)
+// 0x01032744: 0x1032744: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6041,22 +6041,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032738: 0x1032738: addiu v0, zero, 65
+// 0x01032748: 0x1032748: addiu v0, zero, 65
 	ldc.i4.s 65
 	stloc 7
-// 0x0103273c: 0x103273c: lb    v1, 0(a1)
+// 0x0103274c: 0x103274c: lb    v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01032740: 0x1032740: sll   zero, zero, 0
-// 0x01032744: 0x1032744: bne   v1, v0, 0x1032764 lui   v0, 0x60000
+// 0x01032750: 0x1032750: sll   zero, zero, 0
+// 0x01032754: 0x1032754: bne   v1, v0, 0x1032774 lui   v0, 0x60000
 	ldloc 6
 	ldloc 7
 	ldc.i4 393216
 	stloc 7
-	bne.un L_1032764
+	bne.un L_1032774
 // --- basic block ---
-// 0x0103274c: 0x103274c: lw    a0, 8(a1)
+// 0x0103275c: 0x103275c: lw    a0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6065,12 +6065,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032750: 0x1032750: addiu v1, v0, -18332
+// 0x01032760: 0x1032760: addiu v1, v0, -17868
 	ldloc 7
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 6
-// 0x01032754: 0x1032754: sw    a0, 4(v1)
+// 0x01032764: 0x1032764: sw    a0, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6079,7 +6079,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01032758: 0x1032758: lw    v1, 12(a1)
+// 0x01032768: 0x1032768: lw    v1, 12(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6088,12 +6088,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103275c: 0x103275c: jal   0x103236c sw    v1, -18332(v0)
+// 0x0103276c: 0x103276c: jal   0x103237c sw    v1, -17868(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldloc 6
 	stelem.i4
@@ -6102,15 +6102,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_process_position_103236c(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_process_position_103237c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_1032764:
-// 0x01032764: 0x1032764: lw    ra, 28(sp)
-// 0x01032768: 0x1032768: sll   zero, zero, 0
-// 0x0103276c: 0x103276c: jr    ra addiu sp, sp, 32
+L_1032774:
+// 0x01032774: 0x1032774: lw    ra, 28(sp)
+// 0x01032778: 0x1032778: sll   zero, zero, 0
+// 0x0103277c: 0x103277c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6122,7 +6122,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_gps_gga_1032774(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_gga_1032784(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra,int32 t0)
@@ -6166,13 +6166,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01032774: 0x1032774: addiu sp, sp, -32
+// 0x01032784: 0x1032784: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01032778: 0x1032778: sw    ra, 28(sp)
-// 0x0103277c: 0x103277c: sw    s0, 20(sp)
+// 0x01032788: 0x1032788: sw    ra, 28(sp)
+// 0x0103278c: 0x103278c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6181,7 +6181,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01032780: 0x1032780: sw    s1, 24(sp)
+// 0x01032790: 0x1032790: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6190,7 +6190,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01032784: 0x1032784: lw    a0, 20(a1)
+// 0x01032794: 0x1032794: lw    a0, 20(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6199,41 +6199,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032788: 0x1032788: jal   0x10c09c0 addu  s0, a1, zero
+// 0x01032798: 0x1032798: jal   0x10c1000 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032790: 0x1032790: lui   a0, 0x20000
+// 0x010327a0: 0x10327a0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01032794: 0x1032794: lw    a3, 23868(a0)
+// 0x010327a4: 0x10327a4: lw    a3, 24332(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5967
+	ldc.i4 6083
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032798: 0x1032798: lw    a2, 23864(a0)
+// 0x010327a8: 0x10327a8: lw    a2, 24328(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5966
+	ldc.i4 6082
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103279c: 0x103279c: addu  a1, v1, zero
+// 0x010327ac: 0x10327ac: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010327a0: 0x10327a0: jal   0x10c0798 addu  a0, v0, zero
+// 0x010327b0: 0x10327b0: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6241,52 +6241,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010327a8: 0x10327a8: addu  a1, v0, zero
+// 0x010327b8: 0x10327b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010327ac: 0x10327ac: addu  a2, a1, zero
+// 0x010327bc: 0x10327bc: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010327b0: 0x10327b0: lui   a1, 0x10000
+// 0x010327c0: 0x10327c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010327b4: 0x10327b4: addu  t0, v0, zero
+// 0x010327c4: 0x10327c4: addu  t0, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010327b8: 0x10327b8: addu  a3, v1, zero
+// 0x010327c8: 0x10327c8: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010327bc: 0x10327bc: lui   v0, 0x60000
+// 0x010327cc: 0x10327cc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010327c0: 0x10327c0: addiu a1, a1, -15508
+// 0x010327d0: 0x10327d0: addiu a1, a1, -15508
 	ldloc.2
 	ldc.i4 -15508
 	add
 	stloc.2
-// 0x010327c4: 0x10327c4: addiu a0, zero, 104
+// 0x010327d4: 0x10327d4: addiu a0, zero, 104
 	ldc.i4.s 104
 	stloc.1
-// 0x010327c8: 0x10327c8: sw    v1, -18132(v0)
+// 0x010327d8: 0x10327d8: sw    v1, -17668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4533
+	ldc.i4 -4417
 	add
 	ldloc 7
 	stelem.i4
-// 0x010327cc: 0x10327cc: jal   0x101aec4 sw    t0, -18136(v0)
+// 0x010327dc: 0x10327dc: jal   0x101aed4 sw    t0, -17672(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4534
+	ldc.i4 -4418
 	add
 	ldloc 11
 	stelem.i4
@@ -6295,12 +6295,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010327d4: 0x10327d4: lw    v0, 16(s0)
+// 0x010327e4: 0x10327e4: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6309,29 +6309,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010327d8: 0x10327d8: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x010327e8: 0x10327e8: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x010327dc: 0x10327dc: addu  a2, v0, zero
+// 0x010327ec: 0x10327ec: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010327e0: 0x10327e0: lui   v1, 0x60000
+// 0x010327f0: 0x10327f0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010327e4: 0x10327e4: addiu a1, a1, -13884
+// 0x010327f4: 0x10327f4: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x010327e8: 0x10327e8: addiu a0, zero, 99
+// 0x010327f8: 0x10327f8: addiu a0, zero, 99
 	ldc.i4.s 99
 	stloc.1
-// 0x010327ec: 0x10327ec: jal   0x101aec4 sw    v0, -18304(v1)
+// 0x010327fc: 0x10327fc: jal   0x101aed4 sw    v0, -17840(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4576
+	ldc.i4 -4460
 	add
 	ldloc 5
 	stelem.i4
@@ -6340,12 +6340,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010327f4: 0x10327f4: lw    v0, 12(s0)
+// 0x01032804: 0x1032804: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6354,12 +6354,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010327f8: 0x10327f8: sll   zero, zero, 0
-// 0x010327fc: 0x10327fc: bne   v0, zero, 0x1032814 sll   zero, zero, 0
+// 0x01032808: 0x1032808: sll   zero, zero, 0
+// 0x0103280c: 0x103280c: bne   v0, zero, 0x1032824 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1032814
+	brtrue L_1032824
 // --- basic block ---
-// 0x01032804: 0x1032804: jal   0x1031208 addiu a0, zero, 86
+// 0x01032814: 0x1032814: jal   0x1031218 addiu a0, zero, 86
 	ldc.i4.s 86
 	stloc.1
 	ldloc.0
@@ -6367,16 +6367,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_status_1031208(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_status_1031218(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103280c: 0x103280c: j	 0x1032858 sll   zero, zero, 0
-	br L_1032858
+// 0x0103281c: 0x103281c: j	 0x1032868 sll   zero, zero, 0
+	br L_1032868
 // --- basic block ---
-L_1032814:
-// 0x01032814: 0x1032814: jal   0x1031208 addiu a0, zero, 65
+L_1032824:
+// 0x01032824: 0x1032824: jal   0x1031218 addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
 	ldloc.0
@@ -6384,31 +6384,31 @@ L_1032814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_status_1031208(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_status_1031218(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103281c: 0x103281c: lw    v1, 0(s0)
+// 0x0103282c: 0x103282c: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01032820: 0x1032820: lui   v0, 0x60000
+// 0x01032830: 0x1032830: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032824: 0x1032824: sw    v1, -18548(v0)
+// 0x01032834: 0x1032834: sw    v1, -18084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032828: 0x1032828: lw    v1, 4(s0)
+// 0x01032838: 0x1032838: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6417,15 +6417,15 @@ L_1032814:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103282c: 0x103282c: lui   v0, 0x60000
+// 0x0103283c: 0x103283c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032830: 0x1032830: addiu s1, v0, -18332
+// 0x01032840: 0x1032840: addiu s1, v0, -17868
 	ldloc 5
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 9
-// 0x01032834: 0x1032834: sw    v1, 4(s1)
+// 0x01032844: 0x1032844: sw    v1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6434,7 +6434,7 @@ L_1032814:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032838: 0x1032838: lw    v1, 8(s0)
+// 0x01032848: 0x1032848: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6443,17 +6443,17 @@ L_1032814:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103283c: 0x103283c: sll   zero, zero, 0
-// 0x01032840: 0x1032840: sw    v1, -18332(v0)
+// 0x0103284c: 0x103284c: sll   zero, zero, 0
+// 0x01032850: 0x1032850: sw    v1, -17868(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032844: 0x1032844: lw    a0, 24(s0)
+// 0x01032854: 0x1032854: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6462,7 +6462,7 @@ L_1032814:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032848: 0x1032848: jal   0x1008c0c addiu a1, s0, 28
+// 0x01032858: 0x1032858: jal   0x1008c1c addiu a1, s0, 28
 	ldloc 8
 	ldc.i4.s 28
 	add
@@ -6472,12 +6472,12 @@ L_1032814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_to_current_unit_1008c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_to_current_unit_1008c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032850: 0x1032850: jal   0x103236c sw    v0, 8(s1)
+// 0x01032860: 0x1032860: jal   0x103237c sw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6491,14 +6491,14 @@ L_1032814:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_process_position_103236c(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_process_position_103237c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1032858:
-// 0x01032858: 0x1032858: lw    ra, 28(sp)
-// 0x0103285c: 0x103285c: lw    s1, 24(sp)
+L_1032868:
+// 0x01032868: 0x1032868: lw    ra, 28(sp)
+// 0x0103286c: 0x103286c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6507,7 +6507,7 @@ L_1032858:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01032860: 0x1032860: lw    s0, 20(sp)
+// 0x01032870: 0x1032870: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6516,7 +6516,7 @@ L_1032858:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01032864: 0x1032864: jr    ra addiu sp, sp, 32
+// 0x01032874: 0x1032874: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6528,7 +6528,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_rmc_103286c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_rmc_103287c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -6572,18 +6572,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103286c: 0x103286c: addiu sp, sp, -32
+// 0x0103287c: 0x103287c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01032870: 0x1032870: lb    a0, 4(a1)
+// 0x01032880: 0x1032880: lb    a0, 4(a1)
 	ldloc.2
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01032874: 0x1032874: sw    s0, 16(sp)
+// 0x01032884: 0x1032884: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6592,11 +6592,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01032878: 0x1032878: addu  s0, a1, zero
+// 0x01032888: 0x1032888: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0103287c: 0x103287c: sw    ra, 28(sp)
-// 0x01032880: 0x1032880: sw    s2, 24(sp)
+// 0x0103288c: 0x103288c: sw    ra, 28(sp)
+// 0x01032890: 0x1032890: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6605,7 +6605,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01032884: 0x1032884: jal   0x1031208 sw    s1, 20(sp)
+// 0x01032894: 0x1032894: jal   0x1031218 sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6619,45 +6619,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_status_1031208(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_status_1031218(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103288c: 0x103288c: lb    v1, 4(s0)
+// 0x0103289c: 0x103289c: lb    v1, 4(s0)
 	ldloc 8
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01032890: 0x1032890: addiu v0, zero, 65
+// 0x010328a0: 0x10328a0: addiu v0, zero, 65
 	ldc.i4.s 65
 	stloc 6
-// 0x01032894: 0x1032894: bne   v1, v0, 0x10328f0 lui   v0, 0x60000
+// 0x010328a4: 0x10328a4: bne   v1, v0, 0x1032900 lui   v0, 0x60000
 	ldloc 7
 	ldloc 6
 	ldc.i4 393216
 	stloc 6
-	bne.un L_10328f0
+	bne.un L_1032900
 // --- basic block ---
-// 0x0103289c: 0x103289c: lw    v1, 0(s0)
+// 0x010328ac: 0x10328ac: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010328a0: 0x10328a0: sll   zero, zero, 0
-// 0x010328a4: 0x10328a4: sw    v1, -18548(v0)
+// 0x010328b0: 0x10328b0: sll   zero, zero, 0
+// 0x010328b4: 0x10328b4: sw    v1, -18084(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldloc 7
 	stelem.i4
-// 0x010328a8: 0x10328a8: lw    v1, 8(s0)
+// 0x010328b8: 0x10328b8: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6666,15 +6666,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010328ac: 0x10328ac: lui   v0, 0x60000
+// 0x010328bc: 0x10328bc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010328b0: 0x10328b0: addiu s1, v0, -18332
+// 0x010328c0: 0x10328c0: addiu s1, v0, -17868
 	ldloc 6
-	ldc.i4 -18332
+	ldc.i4 -17868
 	add
 	stloc 9
-// 0x010328b4: 0x10328b4: sw    v1, 4(s1)
+// 0x010328c4: 0x10328c4: sw    v1, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -6683,7 +6683,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010328b8: 0x10328b8: lw    v1, 12(s0)
+// 0x010328c8: 0x10328c8: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6692,17 +6692,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010328bc: 0x10328bc: sll   zero, zero, 0
-// 0x010328c0: 0x10328c0: sw    v1, -18332(v0)
+// 0x010328cc: 0x10328cc: sll   zero, zero, 0
+// 0x010328d0: 0x10328d0: sw    v1, -17868(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldloc 7
 	stelem.i4
-// 0x010328c4: 0x10328c4: lw    s2, 16(s0)
+// 0x010328d4: 0x10328d4: lw    s2, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6711,7 +6711,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010328c8: 0x10328c8: jal   0x1030fd8 sw    s2, 12(s1)
+// 0x010328d8: 0x10328d8: jal   0x1030fe8 sw    s2, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -6725,21 +6725,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010328d0: 0x10328d0: slt   v0, v0, s2
+// 0x010328e0: 0x10328e0: slt   v0, v0, s2
 	ldloc 6
 	ldloc 10
 	clt
 	stloc 6
-// 0x010328d4: 0x10328d4: beq   v0, zero, 0x10328e8 sll   zero, zero, 0
+// 0x010328e4: 0x10328e4: beq   v0, zero, 0x10328f8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10328e8
+	brfalse L_10328f8
 // --- basic block ---
-// 0x010328dc: 0x10328dc: lw    v0, 20(s0)
+// 0x010328ec: 0x10328ec: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6748,8 +6748,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010328e0: 0x10328e0: sll   zero, zero, 0
-// 0x010328e4: 0x10328e4: sw    v0, 16(s1)
+// 0x010328f0: 0x10328f0: sll   zero, zero, 0
+// 0x010328f4: 0x10328f4: sw    v0, 16(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -6758,21 +6758,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_10328e8:
-// 0x010328e8: 0x10328e8: jal   0x103236c sll   zero, zero, 0
+L_10328f8:
+// 0x010328f8: 0x10328f8: jal   0x103237c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_process_position_103236c(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_process_position_103237c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10328f0:
-// 0x010328f0: 0x10328f0: lw    ra, 28(sp)
-// 0x010328f4: 0x10328f4: lw    s2, 24(sp)
+L_1032900:
+// 0x01032900: 0x1032900: lw    ra, 28(sp)
+// 0x01032904: 0x1032904: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6781,7 +6781,7 @@ L_10328f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010328f8: 0x10328f8: lw    s1, 20(sp)
+// 0x01032908: 0x1032908: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6790,7 +6790,7 @@ L_10328f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010328fc: 0x10328fc: lw    s0, 16(sp)
+// 0x0103290c: 0x103290c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6799,7 +6799,7 @@ L_10328f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01032900: 0x1032900: jr    ra addiu sp, sp, 32
+// 0x01032910: 0x1032910: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6811,7 +6811,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_gps_navigation_1032908(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_navigation_1032918(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -6858,12 +6858,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01032908: 0x1032908: addiu sp, sp, -56
+// 0x01032918: 0x1032918: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0103290c: 0x103290c: sw    s0, 36(sp)
+// 0x0103291c: 0x103291c: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6872,17 +6872,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01032910: 0x1032910: sll   s0, a0, 24
+// 0x01032920: 0x1032920: sll   s0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 8
-// 0x01032914: 0x1032914: sra   s0, s0, 24
+// 0x01032924: 0x1032924: sra   s0, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	shr
 	stloc 8
-// 0x01032918: 0x1032918: sw    s3, 48(sp)
+// 0x01032928: 0x1032928: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6891,7 +6891,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103291c: 0x103291c: sw    s2, 44(sp)
+// 0x0103292c: 0x103292c: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6900,7 +6900,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01032920: 0x1032920: sw    s1, 40(sp)
+// 0x01032930: 0x1032930: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6909,7 +6909,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01032924: 0x1032924: sw    a1, 16(sp)
+// 0x01032934: 0x1032934: sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6918,7 +6918,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01032928: 0x1032928: sw    a2, 20(sp)
+// 0x01032938: 0x1032938: sw    a2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6927,7 +6927,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103292c: 0x103292c: sw    a3, 24(sp)
+// 0x0103293c: 0x103293c: sw    a3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6936,8 +6936,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01032930: 0x1032930: sw    ra, 52(sp)
-// 0x01032934: 0x1032934: lw    s3, 72(sp)
+// 0x01032940: 0x1032940: sw    ra, 52(sp)
+// 0x01032944: 0x1032944: lw    s3, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6946,7 +6946,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01032938: 0x1032938: lw    s1, 76(sp)
+// 0x01032948: 0x1032948: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6955,7 +6955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103293c: 0x103293c: lw    s2, 80(sp)
+// 0x0103294c: 0x103294c: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6964,7 +6964,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01032940: 0x1032940: jal   0x1031208 addu  a0, s0, zero
+// 0x01032950: 0x1032950: jal   0x1031218 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6972,15 +6972,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_status_1031208(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_status_1031218(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032948: 0x1032948: addiu v0, zero, 65
+// 0x01032958: 0x1032958: addiu v0, zero, 65
 	ldc.i4.s 65
 	stloc 5
-// 0x0103294c: 0x103294c: lw    a1, 16(sp)
+// 0x0103295c: 0x103295c: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6989,7 +6989,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032950: 0x1032950: lw    a2, 20(sp)
+// 0x01032960: 0x1032960: lw    a2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6998,7 +6998,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01032954: 0x1032954: lw    a3, 24(sp)
+// 0x01032964: 0x1032964: lw    a3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7007,211 +7007,211 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032958: 0x1032958: bne   s0, v0, 0x10329e8 lui   v0, 0x60000
+// 0x01032968: 0x1032968: bne   s0, v0, 0x10329f8 lui   v0, 0x60000
 	ldloc 8
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_10329e8
+	bne.un L_10329f8
 // --- basic block ---
-// 0x01032960: 0x1032960: sw    a1, -18548(v0)
+// 0x01032970: 0x1032970: sw    a1, -18084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4637
+	ldc.i4 -4521
 	add
 	ldloc.2
 	stelem.i4
-// 0x01032964: 0x1032964: lui   v0, 0xe17b0000
+// 0x01032974: 0x1032974: lui   v0, 0xe17b0000
 	ldc.i4 3782934528
 	stloc 5
-// 0x01032968: 0x1032968: ori   v0, v0, 32768
+// 0x01032978: 0x1032978: ori   v0, v0, 32768
 	ldloc 5
 	ldc.i4 32768
 	or
 	stloc 5
-// 0x0103296c: 0x103296c: beq   a2, v0, 0x1032978 lui   v0, 0x60000
+// 0x0103297c: 0x103297c: beq   a2, v0, 0x1032988 lui   v0, 0x60000
 	ldloc.3
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	beq  L_1032978
+	beq  L_1032988
 // --- basic block ---
-// 0x01032974: 0x1032974: sw    a2, -18328(v0)
+// 0x01032984: 0x1032984: sw    a2, -17864(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4582
+	ldc.i4 -4466
 	add
 	ldloc.3
 	stelem.i4
-L_1032978:
-// 0x01032978: 0x1032978: lui   v0, 0xe17b0000
+L_1032988:
+// 0x01032988: 0x1032988: lui   v0, 0xe17b0000
 	ldc.i4 3782934528
 	stloc 5
-// 0x0103297c: 0x103297c: ori   v0, v0, 32768
+// 0x0103298c: 0x103298c: ori   v0, v0, 32768
 	ldloc 5
 	ldc.i4 32768
 	or
 	stloc 5
-// 0x01032980: 0x1032980: beq   a3, v0, 0x103298c lui   v0, 0x60000
+// 0x01032990: 0x1032990: beq   a3, v0, 0x103299c lui   v0, 0x60000
 	ldloc 4
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	beq  L_103298c
+	beq  L_103299c
 // --- basic block ---
-// 0x01032988: 0x1032988: sw    a3, -18332(v0)
+// 0x01032998: 0x1032998: sw    a3, -17868(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4583
+	ldc.i4 -4467
 	add
 	ldloc 4
 	stelem.i4
-L_103298c:
-// 0x0103298c: 0x103298c: lui   v0, 0xe17b0000
+L_103299c:
+// 0x0103299c: 0x103299c: lui   v0, 0xe17b0000
 	ldc.i4 3782934528
 	stloc 5
-// 0x01032990: 0x1032990: ori   v0, v0, 32768
+// 0x010329a0: 0x10329a0: ori   v0, v0, 32768
 	ldloc 5
 	ldc.i4 32768
 	or
 	stloc 5
-// 0x01032994: 0x1032994: beq   s3, v0, 0x10329a0 lui   v0, 0x60000
+// 0x010329a4: 0x10329a4: beq   s3, v0, 0x10329b0 lui   v0, 0x60000
 	ldloc 11
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	beq  L_10329a0
+	beq  L_10329b0
 // --- basic block ---
-// 0x0103299c: 0x103299c: sw    s3, -18324(v0)
+// 0x010329ac: 0x10329ac: sw    s3, -17860(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4581
+	ldc.i4 -4465
 	add
 	ldloc 11
 	stelem.i4
-L_10329a0:
-// 0x010329a0: 0x10329a0: lui   v0, 0xe17b0000
+L_10329b0:
+// 0x010329b0: 0x10329b0: lui   v0, 0xe17b0000
 	ldc.i4 3782934528
 	stloc 5
-// 0x010329a4: 0x10329a4: ori   v0, v0, 32768
+// 0x010329b4: 0x10329b4: ori   v0, v0, 32768
 	ldloc 5
 	ldc.i4 32768
 	or
 	stloc 5
-// 0x010329a8: 0x10329a8: beq   s1, v0, 0x10329b4 lui   v0, 0x60000
+// 0x010329b8: 0x10329b8: beq   s1, v0, 0x10329c4 lui   v0, 0x60000
 	ldloc 9
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	beq  L_10329b4
+	beq  L_10329c4
 // --- basic block ---
-// 0x010329b0: 0x10329b0: sw    s1, -18320(v0)
+// 0x010329c0: 0x10329c0: sw    s1, -17856(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4580
+	ldc.i4 -4464
 	add
 	ldloc 9
 	stelem.i4
-L_10329b4:
-// 0x010329b4: 0x10329b4: jal   0x1030fd8 sll   zero, zero, 0
+L_10329c4:
+// 0x010329c4: 0x10329c4: jal   0x1030fe8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_speed_accuracy_1030fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010329bc: 0x10329bc: slt   v0, s1, v0
+// 0x010329cc: 0x10329cc: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x010329c0: 0x10329c0: bne   v0, zero, 0x10329d8 lui   v0, 0xe17b0000
+// 0x010329d0: 0x10329d0: bne   v0, zero, 0x10329e8 lui   v0, 0xe17b0000
 	ldloc 5
 	ldc.i4 3782934528
 	stloc 5
-	brtrue L_10329d8
+	brtrue L_10329e8
 // --- basic block ---
-// 0x010329c8: 0x10329c8: ori   v0, v0, 32768
+// 0x010329d8: 0x10329d8: ori   v0, v0, 32768
 	ldloc 5
 	ldc.i4 32768
 	or
 	stloc 5
-// 0x010329cc: 0x10329cc: beq   s2, v0, 0x10329d8 lui   v0, 0x60000
+// 0x010329dc: 0x10329dc: beq   s2, v0, 0x10329e8 lui   v0, 0x60000
 	ldloc 10
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	beq  L_10329d8
+	beq  L_10329e8
 // --- basic block ---
-// 0x010329d4: 0x10329d4: sw    s2, -18316(v0)
+// 0x010329e4: 0x10329e4: sw    s2, -17852(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4579
+	ldc.i4 -4463
 	add
 	ldloc 10
 	stelem.i4
-L_10329d8:
-// 0x010329d8: 0x10329d8: jal   0x103236c sll   zero, zero, 0
+L_10329e8:
+// 0x010329e8: 0x10329e8: jal   0x103237c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_process_position_103236c(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_process_position_103237c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010329e0: 0x10329e0: j	 0x10329f4 addu  v1, zero, zero
+// 0x010329f0: 0x10329f0: j	 0x1032a04 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10329f4
+	br L_1032a04
 // --- basic block ---
-L_10329e8:
-// 0x010329e8: 0x10329e8: jal   0x10313a8 sll   zero, zero, 0
+L_10329f8:
+// 0x010329f8: 0x10329f8: jal   0x10313b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl35::roadmap_gps_update_reception_10313a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_update_reception_10313b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010329f0: 0x10329f0: addu  v1, zero, zero
+// 0x01032a00: 0x1032a00: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10329f4:
-// 0x010329f4: 0x10329f4: cibyl_sysc_arg 0x3
+L_1032a04:
+// 0x01032a04: 0x1032a04: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010329f8: 0x10329f8: cibyl_sysc 0x53e
+// 0x01032a08: 0x1032a08: cibyl_sysc 0x53e
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010329fc: 0x10329fc: addu  v1, v0, zero
+// 0x01032a0c: 0x1032a0c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01032a00: 0x1032a00: lw    ra, 52(sp)
-// 0x01032a04: 0x1032a04: lui   v0, 0x60000
+// 0x01032a10: 0x1032a10: lw    ra, 52(sp)
+// 0x01032a14: 0x1032a14: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032a08: 0x1032a08: lw    s3, 48(sp)
+// 0x01032a18: 0x1032a18: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7220,7 +7220,7 @@ L_10329f4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01032a0c: 0x1032a0c: lw    s2, 44(sp)
+// 0x01032a1c: 0x1032a1c: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7229,7 +7229,7 @@ L_10329f4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01032a10: 0x1032a10: lw    s1, 40(sp)
+// 0x01032a20: 0x1032a20: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7238,7 +7238,7 @@ L_10329f4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01032a14: 0x1032a14: lw    s0, 36(sp)
+// 0x01032a24: 0x1032a24: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7247,16 +7247,16 @@ L_10329f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01032a18: 0x1032a18: sw    v1, -23856(v0)
+// 0x01032a28: 0x1032a28: sw    v1, -23392(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -5964
+	ldc.i4 -5848
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032a1c: 0x1032a1c: jr    ra addiu sp, sp, 56
+// 0x01032a2c: 0x1032a2c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl37.j b/converted/Cibyl37.j
index ffce450..3a1e579 100644
--- a/converted/Cibyl37.j
+++ b/converted/Cibyl37.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl37::.ctor
 
-.method public static int32 roadmap_alert_get_location_info_1032a24()
+.method public static int32 roadmap_alert_get_location_info_1032a34()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -55,8 +55,8 @@
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032a24:
-// 0x01032a24: 0x1032a24: jr    ra addu  v0, zero, zero
+L_1032a34:
+// 0x01032a34: 0x1032a34: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -64,7 +64,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alert_is_square_dependent_1032a44()
+.method public static int32 roadmap_alert_is_square_dependent_1032a54()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -78,8 +78,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032a44:
-// 0x01032a44: 0x1032a44: jr    ra addiu v0, zero, 1
+L_1032a54:
+// 0x01032a54: 0x1032a54: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -87,7 +87,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alert_is_cancelable_1032aa0()
+.method public static int32 roadmap_alert_is_cancelable_1032ab0()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -101,8 +101,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032aa0:
-// 0x01032aa0: 0x1032aa0: jr    ra addiu v0, zero, 1
+L_1032ab0:
+// 0x01032ab0: 0x1032ab0: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -110,7 +110,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alert_check_same_street_1032aa8()
+.method public static int32 roadmap_alert_check_same_street_1032ab8()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -124,8 +124,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032aa8:
-// 0x01032aa8: 0x1032aa8: jr    ra addiu v0, zero, 1
+L_1032ab8:
+// 0x01032ab8: 0x1032ab8: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -133,7 +133,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alert_handle_alert_1032ab0()
+.method public static int32 roadmap_alert_handle_alert_1032ac0()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -147,8 +147,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032ab0:
-// 0x01032ab0: 0x1032ab0: jr    ra addu  v0, zero, zero
+L_1032ac0:
+// 0x01032ac0: 0x1032ac0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -156,7 +156,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alert_count_1032ab8()
+.method public static int32 roadmap_alert_count_1032ac8()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -176,27 +176,27 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032ab8:
-// 0x01032ab8: 0x1032ab8: lui   v0, 0x60000
+L_1032ac8:
+// 0x01032ac8: 0x1032ac8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01032abc: 0x1032abc: lw    v1, -18088(v0)
+// 0x01032acc: 0x1032acc: lw    v1, -17624(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032ac0: 0x1032ac0: sll   zero, zero, 0
-// 0x01032ac4: 0x1032ac4: beq   v1, zero, 0x1032ad0 addu  v0, zero, zero
+// 0x01032ad0: 0x1032ad0: sll   zero, zero, 0
+// 0x01032ad4: 0x1032ad4: beq   v1, zero, 0x1032ae0 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_1032ad0
+	brfalse L_1032ae0
 // --- basic block ---
-// 0x01032acc: 0x1032acc: lw    v0, 8(v1)
+// 0x01032adc: 0x1032adc: lw    v0, 8(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -205,8 +205,8 @@ L_1032ab8:
 	add
 	ldelem.i4
 	stloc.0
-L_1032ad0:
-// 0x01032ad0: 0x1032ad0: jr    ra sll   zero, zero, 0
+L_1032ae0:
+// 0x01032ae0: 0x1032ae0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -214,7 +214,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alert_get_position_1032ad8(int32,int32,int32,int32)
+.method public static int32 roadmap_alert_get_position_1032ae8(int32,int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -246,25 +246,25 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032ad8:
-// 0x01032ad8: 0x1032ad8: lui   v0, 0x60000
+L_1032ae8:
+// 0x01032ae8: 0x1032ae8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01032adc: 0x1032adc: lw    v0, -18088(v0)
+// 0x01032aec: 0x1032aec: lw    v0, -17624(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032ae0: 0x1032ae0: sll   a0, a0, 4
+// 0x01032af0: 0x1032af0: sll   a0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	shl
 	stloc.0
-// 0x01032ae4: 0x1032ae4: lw    v0, 4(v0)
+// 0x01032af4: 0x1032af4: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -273,20 +273,20 @@ L_1032ad8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032ae8: 0x1032ae8: sll   zero, zero, 0
-// 0x01032aec: 0x1032aec: addu  a0, v0, a0
+// 0x01032af8: 0x1032af8: sll   zero, zero, 0
+// 0x01032afc: 0x1032afc: addu  a0, v0, a0
 	ldloc 4
 	ldloc.0
 	add
 	stloc.0
-// 0x01032af0: 0x1032af0: lw    a3, 0(a0)
+// 0x01032b00: 0x1032b00: lw    a3, 0(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01032af4: 0x1032af4: lw    v1, 4(a0)
+// 0x01032b04: 0x1032b04: lw    v1, 4(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -295,20 +295,20 @@ L_1032ad8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01032af8: 0x1032af8: lhu   v0, 8(a0)
+// 0x01032b08: 0x1032b08: lhu   v0, 8(a0)
 	ldloc.0
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x01032afc: 0x1032afc: sw    a3, 0(a1)
+// 0x01032b0c: 0x1032b0c: sw    a3, 0(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01032b00: 0x1032b00: sw    v1, 4(a1)
+// 0x01032b10: 0x1032b10: sw    v1, 4(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -317,7 +317,7 @@ L_1032ad8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01032b04: 0x1032b04: jr    ra sw    v0, 0(a2)
+// 0x01032b14: 0x1032b14: jr    ra sw    v0, 0(a2)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -331,7 +331,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_alert_get_speed_1032b0c(int32)
+.method public static int32 roadmap_alert_get_speed_1032b1c(int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -351,25 +351,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032b0c:
-// 0x01032b0c: 0x1032b0c: lui   v0, 0x60000
+L_1032b1c:
+// 0x01032b1c: 0x1032b1c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01032b10: 0x1032b10: lw    v0, -18088(v0)
+// 0x01032b20: 0x1032b20: lw    v0, -17624(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032b14: 0x1032b14: sll   a0, a0, 4
+// 0x01032b24: 0x1032b24: sll   a0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	shl
 	stloc.0
-// 0x01032b18: 0x1032b18: lw    v0, 4(v0)
+// 0x01032b28: 0x1032b28: lw    v0, 4(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -378,25 +378,25 @@ L_1032b0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032b1c: 0x1032b1c: sll   zero, zero, 0
-// 0x01032b20: 0x1032b20: addu  a0, v0, a0
+// 0x01032b2c: 0x1032b2c: sll   zero, zero, 0
+// 0x01032b30: 0x1032b30: addu  a0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x01032b24: 0x1032b24: lbu   v0, 11(a0)
+// 0x01032b34: 0x1032b34: lbu   v0, 11(a0)
 	ldloc.0
 	ldc.i4.s 11
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x01032b28: 0x1032b28: jr    ra sll   zero, zero, 0
+// 0x01032b38: 0x1032b38: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_alert_get_id_1032b54(int32)
+.method public static int32 roadmap_alert_get_id_1032b64(int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -416,25 +416,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032b54:
-// 0x01032b54: 0x1032b54: lui   v0, 0x60000
+L_1032b64:
+// 0x01032b64: 0x1032b64: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01032b58: 0x1032b58: lw    v0, -18088(v0)
+// 0x01032b68: 0x1032b68: lw    v0, -17624(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032b5c: 0x1032b5c: sll   a0, a0, 4
+// 0x01032b6c: 0x1032b6c: sll   a0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	shl
 	stloc.0
-// 0x01032b60: 0x1032b60: lw    v0, 4(v0)
+// 0x01032b70: 0x1032b70: lw    v0, 4(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -443,25 +443,25 @@ L_1032b54:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032b64: 0x1032b64: sll   zero, zero, 0
-// 0x01032b68: 0x1032b68: addu  a0, v0, a0
+// 0x01032b74: 0x1032b74: sll   zero, zero, 0
+// 0x01032b78: 0x1032b78: addu  a0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x01032b6c: 0x1032b6c: lhu   v0, 12(a0)
+// 0x01032b7c: 0x1032b7c: lhu   v0, 12(a0)
 	ldloc.0
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01032b70: 0x1032b70: jr    ra sll   zero, zero, 0
+// 0x01032b80: 0x1032b80: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_alert_alertable_1032b78(int32)
+.method public static int32 roadmap_alert_alertable_1032b88(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -484,25 +484,25 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032b78:
-// 0x01032b78: 0x1032b78: lui   v0, 0x60000
+L_1032b88:
+// 0x01032b88: 0x1032b88: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01032b7c: 0x1032b7c: lw    v0, -18088(v0)
+// 0x01032b8c: 0x1032b8c: lw    v0, -17624(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032b80: 0x1032b80: sll   a0, a0, 4
+// 0x01032b90: 0x1032b90: sll   a0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	shl
 	stloc.0
-// 0x01032b84: 0x1032b84: lw    v1, 4(v0)
+// 0x01032b94: 0x1032b94: lw    v1, 4(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -511,62 +511,62 @@ L_1032b78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032b88: 0x1032b88: sll   zero, zero, 0
-// 0x01032b8c: 0x1032b8c: addu  a0, v1, a0
+// 0x01032b98: 0x1032b98: sll   zero, zero, 0
+// 0x01032b9c: 0x1032b9c: addu  a0, v1, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x01032b90: 0x1032b90: lbu   v1, 10(a0)
+// 0x01032ba0: 0x1032ba0: lbu   v1, 10(a0)
 	ldloc.0
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x01032b94: 0x1032b94: sll   zero, zero, 0
-// 0x01032b98: 0x1032b98: addiu v1, v1, -2
+// 0x01032ba4: 0x1032ba4: sll   zero, zero, 0
+// 0x01032ba8: 0x1032ba8: addiu v1, v1, -2
 	ldloc.1
 	ldc.i4.s -2
 	add
 	stloc.1
-// 0x01032b9c: 0x1032b9c: sltiu a0, v1, 3
+// 0x01032bac: 0x1032bac: sltiu a0, v1, 3
 	ldloc.1
 	ldc.i4.3
 	clt.un
 	stloc.0
-// 0x01032ba0: 0x1032ba0: beq   a0, zero, 0x1032bbc addu  v0, zero, zero
+// 0x01032bb0: 0x1032bb0: beq   a0, zero, 0x1032bcc addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1032bbc
+	brfalse L_1032bcc
 // --- basic block ---
-// 0x01032ba8: 0x1032ba8: lui   v0, 0x20000
+// 0x01032bb8: 0x1032bb8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01032bac: 0x1032bac: addiu v0, v0, 25616
+// 0x01032bbc: 0x1032bbc: addiu v0, v0, 26080
 	ldloc.2
-	ldc.i4 25616
+	ldc.i4 26080
 	add
 	stloc.2
-// 0x01032bb0: 0x1032bb0: sll   v1, v1, 2
+// 0x01032bc0: 0x1032bc0: sll   v1, v1, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01032bb4: 0x1032bb4: addu  v1, v1, v0
+// 0x01032bc4: 0x1032bc4: addu  v1, v1, v0
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01032bb8: 0x1032bb8: lw    v0, 0(v1)
+// 0x01032bc8: 0x1032bc8: lw    v0, 0(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-L_1032bbc:
-// 0x01032bbc: 0x1032bbc: jr    ra sll   zero, zero, 0
+L_1032bcc:
+// 0x01032bcc: 0x1032bcc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -574,7 +574,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_alert_get_string_1032bc4(int32,int32,int32,int32)
+.method public static int32 roadmap_alert_get_string_1032bd4(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -606,27 +606,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032bc4:
-// 0x01032bc4: 0x1032bc4: lui   v0, 0x60000
+L_1032bd4:
+// 0x01032bd4: 0x1032bd4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01032bc8: 0x1032bc8: lw    v0, -18088(v0)
+// 0x01032bd8: 0x1032bd8: lw    v0, -17624(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032bcc: 0x1032bcc: sll   zero, zero, 0
-// 0x01032bd0: 0x1032bd0: beq   v0, zero, 0x1032c48 addu  v1, zero, zero
+// 0x01032bdc: 0x1032bdc: sll   zero, zero, 0
+// 0x01032be0: 0x1032be0: beq   v0, zero, 0x1032c58 addu  v1, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1032c48
+	brfalse L_1032c58
 // --- basic block ---
-// 0x01032bd8: 0x1032bd8: lw    a2, 8(v0)
+// 0x01032be8: 0x1032be8: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -635,15 +635,15 @@ L_1032bc4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032bdc: 0x1032bdc: j	 0x1032c04 slt   a3, v1, a2
+// 0x01032bec: 0x1032bec: j	 0x1032c14 slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-	br L_1032c04
+	br L_1032c14
 // --- basic block ---
-L_1032be4:
-// 0x01032be4: 0x1032be4: lw    a3, 4(v0)
+L_1032bf4:
+// 0x01032bf4: 0x1032bf4: lw    a3, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -652,106 +652,106 @@ L_1032be4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01032be8: 0x1032be8: sll   zero, zero, 0
-// 0x01032bec: 0x1032bec: addu  a1, a3, a1
+// 0x01032bf8: 0x1032bf8: sll   zero, zero, 0
+// 0x01032bfc: 0x1032bfc: addu  a1, a3, a1
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x01032bf0: 0x1032bf0: lhu   a3, 12(a1)
+// 0x01032c00: 0x1032c00: lhu   a3, 12(a1)
 	ldloc.1
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x01032bf4: 0x1032bf4: sll   zero, zero, 0
-// 0x01032bf8: 0x1032bf8: beq   a3, a0, 0x1032c14 addiu v1, v1, 1
+// 0x01032c04: 0x1032c04: sll   zero, zero, 0
+// 0x01032c08: 0x1032c08: beq   a3, a0, 0x1032c24 addiu v1, v1, 1
 	ldloc.3
 	ldloc.0
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_1032c14
+	beq  L_1032c24
 // --- basic block ---
-// 0x01032c00: 0x1032c00: slt   a3, v1, a2
+// 0x01032c10: 0x1032c10: slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-L_1032c04:
-// 0x01032c04: 0x1032c04: bne   a3, zero, 0x1032be4 sll   a1, v1, 4
+L_1032c14:
+// 0x01032c14: 0x1032c14: bne   a3, zero, 0x1032bf4 sll   a1, v1, 4
 	ldloc.3
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc.1
-	brtrue L_1032be4
+	brtrue L_1032bf4
 // --- basic block ---
-// 0x01032c0c: 0x1032c0c: jr    ra addu  v0, zero, zero
+// 0x01032c1c: 0x1032c1c: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032c14:
-// 0x01032c14: 0x1032c14: lbu   v0, 10(a1)
+L_1032c24:
+// 0x01032c24: 0x1032c24: lbu   v0, 10(a1)
 	ldloc.1
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 4
-// 0x01032c18: 0x1032c18: sll   zero, zero, 0
-// 0x01032c1c: 0x1032c1c: addiu v0, v0, -2
+// 0x01032c28: 0x1032c28: sll   zero, zero, 0
+// 0x01032c2c: 0x1032c2c: addiu v0, v0, -2
 	ldloc 4
 	ldc.i4.s -2
 	add
 	stloc 4
-// 0x01032c20: 0x1032c20: andi  v0, v0, 255
+// 0x01032c30: 0x1032c30: andi  v0, v0, 255
 	ldloc 4
 	ldc.i4 255
 	and
 	stloc 4
-// 0x01032c24: 0x1032c24: sltiu v1, v0, 3
+// 0x01032c34: 0x1032c34: sltiu v1, v0, 3
 	ldloc 4
 	ldc.i4.3
 	clt.un
 	stloc 5
-// 0x01032c28: 0x1032c28: beq   v1, zero, 0x1032c48 lui   v1, 0x20000
+// 0x01032c38: 0x1032c38: beq   v1, zero, 0x1032c58 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1032c48
+	brfalse L_1032c58
 // --- basic block ---
-// 0x01032c30: 0x1032c30: sll   v0, v0, 2
+// 0x01032c40: 0x1032c40: sll   v0, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01032c34: 0x1032c34: addiu v1, v1, 25628
+// 0x01032c44: 0x1032c44: addiu v1, v1, 26092
 	ldloc 5
-	ldc.i4 25628
+	ldc.i4 26092
 	add
 	stloc 5
-// 0x01032c38: 0x1032c38: addu  v0, v0, v1
+// 0x01032c48: 0x1032c48: addu  v0, v0, v1
 	ldloc 4
 	ldloc 5
 	add
 	stloc 4
-// 0x01032c3c: 0x1032c3c: lw    v0, 0(v0)
+// 0x01032c4c: 0x1032c4c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01032c40: 0x1032c40: jr    ra sll   zero, zero, 0
+// 0x01032c50: 0x1032c50: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032c48:
-// 0x01032c48: 0x1032c48: addu  v0, zero, zero
+L_1032c58:
+// 0x01032c58: 0x1032c58: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01032c4c: 0x1032c4c: jr    ra sll   zero, zero, 0
+// 0x01032c5c: 0x1032c5c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -759,7 +759,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_alert_get_map_icon_1032c54(int32,int32,int32,int32)
+.method public static int32 roadmap_alert_get_map_icon_1032c64(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -791,27 +791,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032c54:
-// 0x01032c54: 0x1032c54: lui   v0, 0x60000
+L_1032c64:
+// 0x01032c64: 0x1032c64: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01032c58: 0x1032c58: lw    v0, -18088(v0)
+// 0x01032c68: 0x1032c68: lw    v0, -17624(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032c5c: 0x1032c5c: sll   zero, zero, 0
-// 0x01032c60: 0x1032c60: beq   v0, zero, 0x1032cd8 addu  v1, zero, zero
+// 0x01032c6c: 0x1032c6c: sll   zero, zero, 0
+// 0x01032c70: 0x1032c70: beq   v0, zero, 0x1032ce8 addu  v1, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1032cd8
+	brfalse L_1032ce8
 // --- basic block ---
-// 0x01032c68: 0x1032c68: lw    a2, 8(v0)
+// 0x01032c78: 0x1032c78: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -820,15 +820,15 @@ L_1032c54:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032c6c: 0x1032c6c: j	 0x1032c94 slt   a3, v1, a2
+// 0x01032c7c: 0x1032c7c: j	 0x1032ca4 slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-	br L_1032c94
+	br L_1032ca4
 // --- basic block ---
-L_1032c74:
-// 0x01032c74: 0x1032c74: lw    a3, 4(v0)
+L_1032c84:
+// 0x01032c84: 0x1032c84: lw    a3, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -837,106 +837,106 @@ L_1032c74:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01032c78: 0x1032c78: sll   zero, zero, 0
-// 0x01032c7c: 0x1032c7c: addu  a1, a3, a1
+// 0x01032c88: 0x1032c88: sll   zero, zero, 0
+// 0x01032c8c: 0x1032c8c: addu  a1, a3, a1
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x01032c80: 0x1032c80: lhu   a3, 12(a1)
+// 0x01032c90: 0x1032c90: lhu   a3, 12(a1)
 	ldloc.1
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x01032c84: 0x1032c84: sll   zero, zero, 0
-// 0x01032c88: 0x1032c88: beq   a3, a0, 0x1032ca4 addiu v1, v1, 1
+// 0x01032c94: 0x1032c94: sll   zero, zero, 0
+// 0x01032c98: 0x1032c98: beq   a3, a0, 0x1032cb4 addiu v1, v1, 1
 	ldloc.3
 	ldloc.0
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_1032ca4
+	beq  L_1032cb4
 // --- basic block ---
-// 0x01032c90: 0x1032c90: slt   a3, v1, a2
+// 0x01032ca0: 0x1032ca0: slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-L_1032c94:
-// 0x01032c94: 0x1032c94: bne   a3, zero, 0x1032c74 sll   a1, v1, 4
+L_1032ca4:
+// 0x01032ca4: 0x1032ca4: bne   a3, zero, 0x1032c84 sll   a1, v1, 4
 	ldloc.3
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc.1
-	brtrue L_1032c74
+	brtrue L_1032c84
 // --- basic block ---
-// 0x01032c9c: 0x1032c9c: jr    ra addu  v0, zero, zero
+// 0x01032cac: 0x1032cac: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032ca4:
-// 0x01032ca4: 0x1032ca4: lbu   v0, 10(a1)
+L_1032cb4:
+// 0x01032cb4: 0x1032cb4: lbu   v0, 10(a1)
 	ldloc.1
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 4
-// 0x01032ca8: 0x1032ca8: sll   zero, zero, 0
-// 0x01032cac: 0x1032cac: addiu v0, v0, -2
+// 0x01032cb8: 0x1032cb8: sll   zero, zero, 0
+// 0x01032cbc: 0x1032cbc: addiu v0, v0, -2
 	ldloc 4
 	ldc.i4.s -2
 	add
 	stloc 4
-// 0x01032cb0: 0x1032cb0: andi  v0, v0, 255
+// 0x01032cc0: 0x1032cc0: andi  v0, v0, 255
 	ldloc 4
 	ldc.i4 255
 	and
 	stloc 4
-// 0x01032cb4: 0x1032cb4: sltiu v1, v0, 3
+// 0x01032cc4: 0x1032cc4: sltiu v1, v0, 3
 	ldloc 4
 	ldc.i4.3
 	clt.un
 	stloc 5
-// 0x01032cb8: 0x1032cb8: beq   v1, zero, 0x1032cd8 lui   v1, 0x20000
+// 0x01032cc8: 0x1032cc8: beq   v1, zero, 0x1032ce8 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1032cd8
+	brfalse L_1032ce8
 // --- basic block ---
-// 0x01032cc0: 0x1032cc0: sll   v0, v0, 2
+// 0x01032cd0: 0x1032cd0: sll   v0, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01032cc4: 0x1032cc4: addiu v1, v1, 25640
+// 0x01032cd4: 0x1032cd4: addiu v1, v1, 26104
 	ldloc 5
-	ldc.i4 25640
+	ldc.i4 26104
 	add
 	stloc 5
-// 0x01032cc8: 0x1032cc8: addu  v0, v0, v1
+// 0x01032cd8: 0x1032cd8: addu  v0, v0, v1
 	ldloc 4
 	ldloc 5
 	add
 	stloc 4
-// 0x01032ccc: 0x1032ccc: lw    v0, 0(v0)
+// 0x01032cdc: 0x1032cdc: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01032cd0: 0x1032cd0: jr    ra sll   zero, zero, 0
+// 0x01032ce0: 0x1032ce0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032cd8:
-// 0x01032cd8: 0x1032cd8: addu  v0, zero, zero
+L_1032ce8:
+// 0x01032ce8: 0x1032ce8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01032cdc: 0x1032cdc: jr    ra sll   zero, zero, 0
+// 0x01032cec: 0x1032cec: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -944,7 +944,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_alert_get_priority_1032ce4()
+.method public static int32 roadmap_alert_get_priority_1032cf4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -958,8 +958,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032ce4:
-// 0x01032ce4: 0x1032ce4: jr    ra addiu v0, zero, 2
+L_1032cf4:
+// 0x01032cf4: 0x1032cf4: jr    ra addiu v0, zero, 2
 	ldc.i4.2
 	stloc.0
 	br __CIBYL_function_return
@@ -967,7 +967,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alert_get_alert_icon_1032cec(int32,int32,int32,int32)
+.method public static int32 roadmap_alert_get_alert_icon_1032cfc(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -999,27 +999,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032cec:
-// 0x01032cec: 0x1032cec: lui   v0, 0x60000
+L_1032cfc:
+// 0x01032cfc: 0x1032cfc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01032cf0: 0x1032cf0: lw    v0, -18088(v0)
+// 0x01032d00: 0x1032d00: lw    v0, -17624(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032cf4: 0x1032cf4: sll   zero, zero, 0
-// 0x01032cf8: 0x1032cf8: beq   v0, zero, 0x1032d70 addu  v1, zero, zero
+// 0x01032d04: 0x1032d04: sll   zero, zero, 0
+// 0x01032d08: 0x1032d08: beq   v0, zero, 0x1032d80 addu  v1, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1032d70
+	brfalse L_1032d80
 // --- basic block ---
-// 0x01032d00: 0x1032d00: lw    a2, 8(v0)
+// 0x01032d10: 0x1032d10: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -1028,15 +1028,15 @@ L_1032cec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032d04: 0x1032d04: j	 0x1032d2c slt   a3, v1, a2
+// 0x01032d14: 0x1032d14: j	 0x1032d3c slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-	br L_1032d2c
+	br L_1032d3c
 // --- basic block ---
-L_1032d0c:
-// 0x01032d0c: 0x1032d0c: lw    a3, 4(v0)
+L_1032d1c:
+// 0x01032d1c: 0x1032d1c: lw    a3, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -1045,106 +1045,106 @@ L_1032d0c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01032d10: 0x1032d10: sll   zero, zero, 0
-// 0x01032d14: 0x1032d14: addu  a1, a3, a1
+// 0x01032d20: 0x1032d20: sll   zero, zero, 0
+// 0x01032d24: 0x1032d24: addu  a1, a3, a1
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x01032d18: 0x1032d18: lhu   a3, 12(a1)
+// 0x01032d28: 0x1032d28: lhu   a3, 12(a1)
 	ldloc.1
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x01032d1c: 0x1032d1c: sll   zero, zero, 0
-// 0x01032d20: 0x1032d20: beq   a3, a0, 0x1032d3c addiu v1, v1, 1
+// 0x01032d2c: 0x1032d2c: sll   zero, zero, 0
+// 0x01032d30: 0x1032d30: beq   a3, a0, 0x1032d4c addiu v1, v1, 1
 	ldloc.3
 	ldloc.0
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_1032d3c
+	beq  L_1032d4c
 // --- basic block ---
-// 0x01032d28: 0x1032d28: slt   a3, v1, a2
+// 0x01032d38: 0x1032d38: slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-L_1032d2c:
-// 0x01032d2c: 0x1032d2c: bne   a3, zero, 0x1032d0c sll   a1, v1, 4
+L_1032d3c:
+// 0x01032d3c: 0x1032d3c: bne   a3, zero, 0x1032d1c sll   a1, v1, 4
 	ldloc.3
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc.1
-	brtrue L_1032d0c
+	brtrue L_1032d1c
 // --- basic block ---
-// 0x01032d34: 0x1032d34: jr    ra addu  v0, zero, zero
+// 0x01032d44: 0x1032d44: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032d3c:
-// 0x01032d3c: 0x1032d3c: lbu   v0, 10(a1)
+L_1032d4c:
+// 0x01032d4c: 0x1032d4c: lbu   v0, 10(a1)
 	ldloc.1
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 4
-// 0x01032d40: 0x1032d40: sll   zero, zero, 0
-// 0x01032d44: 0x1032d44: addiu v0, v0, -2
+// 0x01032d50: 0x1032d50: sll   zero, zero, 0
+// 0x01032d54: 0x1032d54: addiu v0, v0, -2
 	ldloc 4
 	ldc.i4.s -2
 	add
 	stloc 4
-// 0x01032d48: 0x1032d48: andi  v0, v0, 255
+// 0x01032d58: 0x1032d58: andi  v0, v0, 255
 	ldloc 4
 	ldc.i4 255
 	and
 	stloc 4
-// 0x01032d4c: 0x1032d4c: sltiu v1, v0, 3
+// 0x01032d5c: 0x1032d5c: sltiu v1, v0, 3
 	ldloc 4
 	ldc.i4.3
 	clt.un
 	stloc 5
-// 0x01032d50: 0x1032d50: beq   v1, zero, 0x1032d70 lui   v1, 0x20000
+// 0x01032d60: 0x1032d60: beq   v1, zero, 0x1032d80 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1032d70
+	brfalse L_1032d80
 // --- basic block ---
-// 0x01032d58: 0x1032d58: sll   v0, v0, 2
+// 0x01032d68: 0x1032d68: sll   v0, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01032d5c: 0x1032d5c: addiu v1, v1, 25652
+// 0x01032d6c: 0x1032d6c: addiu v1, v1, 26116
 	ldloc 5
-	ldc.i4 25652
+	ldc.i4 26116
 	add
 	stloc 5
-// 0x01032d60: 0x1032d60: addu  v0, v0, v1
+// 0x01032d70: 0x1032d70: addu  v0, v0, v1
 	ldloc 4
 	ldloc 5
 	add
 	stloc 4
-// 0x01032d64: 0x1032d64: lw    v0, 0(v0)
+// 0x01032d74: 0x1032d74: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01032d68: 0x1032d68: jr    ra sll   zero, zero, 0
+// 0x01032d78: 0x1032d78: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032d70:
-// 0x01032d70: 0x1032d70: addu  v0, zero, zero
+L_1032d80:
+// 0x01032d80: 0x1032d80: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01032d74: 0x1032d74: jr    ra sll   zero, zero, 0
+// 0x01032d84: 0x1032d84: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -1152,7 +1152,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_alert_get_warning_icon_1032d7c(int32,int32,int32,int32)
+.method public static int32 roadmap_alert_get_warning_icon_1032d8c(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1184,27 +1184,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032d7c:
-// 0x01032d7c: 0x1032d7c: lui   v0, 0x60000
+L_1032d8c:
+// 0x01032d8c: 0x1032d8c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01032d80: 0x1032d80: lw    v0, -18088(v0)
+// 0x01032d90: 0x1032d90: lw    v0, -17624(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032d84: 0x1032d84: sll   zero, zero, 0
-// 0x01032d88: 0x1032d88: beq   v0, zero, 0x1032e00 addu  v1, zero, zero
+// 0x01032d94: 0x1032d94: sll   zero, zero, 0
+// 0x01032d98: 0x1032d98: beq   v0, zero, 0x1032e10 addu  v1, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1032e00
+	brfalse L_1032e10
 // --- basic block ---
-// 0x01032d90: 0x1032d90: lw    a2, 8(v0)
+// 0x01032da0: 0x1032da0: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -1213,15 +1213,15 @@ L_1032d7c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01032d94: 0x1032d94: j	 0x1032dbc slt   a3, v1, a2
+// 0x01032da4: 0x1032da4: j	 0x1032dcc slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-	br L_1032dbc
+	br L_1032dcc
 // --- basic block ---
-L_1032d9c:
-// 0x01032d9c: 0x1032d9c: lw    a3, 4(v0)
+L_1032dac:
+// 0x01032dac: 0x1032dac: lw    a3, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -1230,106 +1230,106 @@ L_1032d9c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01032da0: 0x1032da0: sll   zero, zero, 0
-// 0x01032da4: 0x1032da4: addu  a1, a3, a1
+// 0x01032db0: 0x1032db0: sll   zero, zero, 0
+// 0x01032db4: 0x1032db4: addu  a1, a3, a1
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x01032da8: 0x1032da8: lhu   a3, 12(a1)
+// 0x01032db8: 0x1032db8: lhu   a3, 12(a1)
 	ldloc.1
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x01032dac: 0x1032dac: sll   zero, zero, 0
-// 0x01032db0: 0x1032db0: beq   a3, a0, 0x1032dcc addiu v1, v1, 1
+// 0x01032dbc: 0x1032dbc: sll   zero, zero, 0
+// 0x01032dc0: 0x1032dc0: beq   a3, a0, 0x1032ddc addiu v1, v1, 1
 	ldloc.3
 	ldloc.0
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_1032dcc
+	beq  L_1032ddc
 // --- basic block ---
-// 0x01032db8: 0x1032db8: slt   a3, v1, a2
+// 0x01032dc8: 0x1032dc8: slt   a3, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-L_1032dbc:
-// 0x01032dbc: 0x1032dbc: bne   a3, zero, 0x1032d9c sll   a1, v1, 4
+L_1032dcc:
+// 0x01032dcc: 0x1032dcc: bne   a3, zero, 0x1032dac sll   a1, v1, 4
 	ldloc.3
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc.1
-	brtrue L_1032d9c
+	brtrue L_1032dac
 // --- basic block ---
-// 0x01032dc4: 0x1032dc4: jr    ra addu  v0, zero, zero
+// 0x01032dd4: 0x1032dd4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032dcc:
-// 0x01032dcc: 0x1032dcc: lbu   v0, 10(a1)
+L_1032ddc:
+// 0x01032ddc: 0x1032ddc: lbu   v0, 10(a1)
 	ldloc.1
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 4
-// 0x01032dd0: 0x1032dd0: sll   zero, zero, 0
-// 0x01032dd4: 0x1032dd4: addiu v0, v0, -2
+// 0x01032de0: 0x1032de0: sll   zero, zero, 0
+// 0x01032de4: 0x1032de4: addiu v0, v0, -2
 	ldloc 4
 	ldc.i4.s -2
 	add
 	stloc 4
-// 0x01032dd8: 0x1032dd8: andi  v0, v0, 255
+// 0x01032de8: 0x1032de8: andi  v0, v0, 255
 	ldloc 4
 	ldc.i4 255
 	and
 	stloc 4
-// 0x01032ddc: 0x1032ddc: sltiu v1, v0, 3
+// 0x01032dec: 0x1032dec: sltiu v1, v0, 3
 	ldloc 4
 	ldc.i4.3
 	clt.un
 	stloc 5
-// 0x01032de0: 0x1032de0: beq   v1, zero, 0x1032e00 lui   v1, 0x20000
+// 0x01032df0: 0x1032df0: beq   v1, zero, 0x1032e10 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1032e00
+	brfalse L_1032e10
 // --- basic block ---
-// 0x01032de8: 0x1032de8: sll   v0, v0, 2
+// 0x01032df8: 0x1032df8: sll   v0, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01032dec: 0x1032dec: addiu v1, v1, 25664
+// 0x01032dfc: 0x1032dfc: addiu v1, v1, 26128
 	ldloc 5
-	ldc.i4 25664
+	ldc.i4 26128
 	add
 	stloc 5
-// 0x01032df0: 0x1032df0: addu  v0, v0, v1
+// 0x01032e00: 0x1032e00: addu  v0, v0, v1
 	ldloc 4
 	ldloc 5
 	add
 	stloc 4
-// 0x01032df4: 0x1032df4: lw    v0, 0(v0)
+// 0x01032e04: 0x1032e04: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01032df8: 0x1032df8: jr    ra sll   zero, zero, 0
+// 0x01032e08: 0x1032e08: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1032e00:
-// 0x01032e00: 0x1032e00: addu  v0, zero, zero
+L_1032e10:
+// 0x01032e10: 0x1032e10: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01032e04: 0x1032e04: jr    ra sll   zero, zero, 0
+// 0x01032e14: 0x1032e14: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -1337,7 +1337,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_alert_distance_check_1032e0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alert_distance_check_1032e1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -1378,13 +1378,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032e0c:
-// 0x01032e0c: 0x1032e0c: addiu sp, sp, -32
+L_1032e1c:
+// 0x01032e1c: 0x1032e1c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01032e10: 0x1032e10: sw    s1, 24(sp)
+// 0x01032e20: 0x1032e20: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1393,10 +1393,10 @@ L_1032e0c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01032e14: 0x1032e14: lui   s1, 0x60000
+// 0x01032e24: 0x1032e24: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01032e18: 0x1032e18: sw    s0, 20(sp)
+// 0x01032e28: 0x1032e28: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1405,12 +1405,12 @@ L_1032e0c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032e1c: 0x1032e1c: addiu s0, s1, -18096
+// 0x01032e2c: 0x1032e2c: addiu s0, s1, -17632
 	ldloc 8
-	ldc.i4 -18096
+	ldc.i4 -17632
 	add
 	stloc 7
-// 0x01032e20: 0x1032e20: lw    v0, 4(s0)
+// 0x01032e30: 0x1032e30: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1419,8 +1419,8 @@ L_1032e0c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01032e24: 0x1032e24: sw    ra, 28(sp)
-// 0x01032e28: 0x1032e28: sw    a0, 32(sp)
+// 0x01032e34: 0x1032e34: sw    ra, 28(sp)
+// 0x01032e38: 0x1032e38: sw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1429,7 +1429,7 @@ L_1032e0c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01032e2c: 0x1032e2c: bne   v0, zero, 0x1032e40 sw    a1, 36(sp)
+// 0x01032e3c: 0x1032e3c: bne   v0, zero, 0x1032e50 sw    a1, 36(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1439,18 +1439,18 @@ L_1032e0c:
 	add
 	ldloc.2
 	stelem.i4
-	brtrue L_1032e40
+	brtrue L_1032e50
 // --- basic block ---
-// 0x01032e34: 0x1032e34: sw    a0, -18096(s1)
+// 0x01032e44: 0x1032e44: sw    a0, -17632(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4524
+	ldc.i4 -4408
 	add
 	ldloc.1
 	stelem.i4
-// 0x01032e38: 0x1032e38: j	 0x1032e70 sw    a1, 4(s0)
+// 0x01032e48: 0x1032e48: j	 0x1032e80 sw    a1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1459,15 +1459,15 @@ L_1032e0c:
 	add
 	ldloc.2
 	stelem.i4
-	br L_1032e70
+	br L_1032e80
 // --- basic block ---
-L_1032e40:
-// 0x01032e40: 0x1032e40: addiu a0, sp, 32
+L_1032e50:
+// 0x01032e50: 0x1032e50: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01032e44: 0x1032e44: jal   0x1008eb0 addu  a1, s0, zero
+// 0x01032e54: 0x1032e54: jal   0x1008ec0 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -1475,23 +1475,23 @@ L_1032e40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01032e4c: 0x1032e4c: slti  v1, v0, 80
+// 0x01032e5c: 0x1032e5c: slti  v1, v0, 80
 	ldloc 6
 	ldc.i4.s 80
 	clt
 	stloc 9
-// 0x01032e50: 0x1032e50: bne   v1, zero, 0x1032e74 addu  v0, zero, zero
+// 0x01032e60: 0x1032e60: bne   v1, zero, 0x1032e84 addu  v0, zero, zero
 	ldloc 9
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1032e74
+	brtrue L_1032e84
 // --- basic block ---
-// 0x01032e58: 0x1032e58: lw    v0, 32(sp)
+// 0x01032e68: 0x1032e68: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1500,17 +1500,17 @@ L_1032e40:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01032e5c: 0x1032e5c: sll   zero, zero, 0
-// 0x01032e60: 0x1032e60: sw    v0, -18096(s1)
+// 0x01032e6c: 0x1032e6c: sll   zero, zero, 0
+// 0x01032e70: 0x1032e70: sw    v0, -17632(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4524
+	ldc.i4 -4408
 	add
 	ldloc 6
 	stelem.i4
-// 0x01032e64: 0x1032e64: lw    v0, 36(sp)
+// 0x01032e74: 0x1032e74: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1519,8 +1519,8 @@ L_1032e40:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01032e68: 0x1032e68: sll   zero, zero, 0
-// 0x01032e6c: 0x1032e6c: sw    v0, 4(s0)
+// 0x01032e78: 0x1032e78: sll   zero, zero, 0
+// 0x01032e7c: 0x1032e7c: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1529,13 +1529,13 @@ L_1032e40:
 	add
 	ldloc 6
 	stelem.i4
-L_1032e70:
-// 0x01032e70: 0x1032e70: addiu v0, zero, 1
+L_1032e80:
+// 0x01032e80: 0x1032e80: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1032e74:
-// 0x01032e74: 0x1032e74: lw    ra, 28(sp)
-// 0x01032e78: 0x1032e78: lw    s1, 24(sp)
+L_1032e84:
+// 0x01032e84: 0x1032e84: lw    ra, 28(sp)
+// 0x01032e88: 0x1032e88: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1544,7 +1544,7 @@ L_1032e74:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01032e7c: 0x1032e7c: lw    s0, 20(sp)
+// 0x01032e8c: 0x1032e8c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1553,7 +1553,7 @@ L_1032e74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032e80: 0x1032e80: jr    ra addiu sp, sp, 32
+// 0x01032e90: 0x1032e90: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1565,7 +1565,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_alert_cancel_1032e88(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alert_cancel_1032e98(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1600,13 +1600,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032e88:
-// 0x01032e88: 0x1032e88: addiu sp, sp, -32
+L_1032e98:
+// 0x01032e98: 0x1032e98: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01032e8c: 0x1032e8c: sw    a0, 16(sp)
+// 0x01032e9c: 0x1032e9c: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1615,31 +1615,31 @@ L_1032e88:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01032e90: 0x1032e90: sw    ra, 28(sp)
-// 0x01032e94: 0x1032e94: jal   0x10ba358 sll   zero, zero, 0
+// 0x01032ea0: 0x1032ea0: sw    ra, 28(sp)
+// 0x01032ea4: 0x1032ea4: jal   0x10ba9a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl139::request_speed_cam_delete_10ba358(int32,int32,int32,int32,int32)
+	call int32 Cibyl139::request_speed_cam_delete_10ba9a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032e9c: 0x1032e9c: lui   v0, 0x60000
+// 0x01032eac: 0x1032eac: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032ea0: 0x1032ea0: lw    v1, -18088(v0)
+// 0x01032eb0: 0x1032eb0: lw    v1, -17624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032ea4: 0x1032ea4: lw    a0, 16(sp)
+// 0x01032eb4: 0x1032eb4: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1648,13 +1648,13 @@ L_1032e88:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01032ea8: 0x1032ea8: beq   v1, zero, 0x1032ef0 addu  v0, zero, zero
+// 0x01032eb8: 0x1032eb8: beq   v1, zero, 0x1032f00 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1032ef0
+	brfalse L_1032f00
 // --- basic block ---
-// 0x01032eb0: 0x1032eb0: lw    a2, 8(v1)
+// 0x01032ec0: 0x1032ec0: lw    a2, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1663,15 +1663,15 @@ L_1032e88:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01032eb4: 0x1032eb4: j	 0x1032edc slt   a3, v0, a2
+// 0x01032ec4: 0x1032ec4: j	 0x1032eec slt   a3, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 4
-	br L_1032edc
+	br L_1032eec
 // --- basic block ---
-L_1032ebc:
-// 0x01032ebc: 0x1032ebc: lw    a3, 4(v1)
+L_1032ecc:
+// 0x01032ecc: 0x1032ecc: lw    a3, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1680,58 +1680,58 @@ L_1032ebc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01032ec0: 0x1032ec0: sll   zero, zero, 0
-// 0x01032ec4: 0x1032ec4: addu  a1, a3, a1
+// 0x01032ed0: 0x1032ed0: sll   zero, zero, 0
+// 0x01032ed4: 0x1032ed4: addu  a1, a3, a1
 	ldloc 4
 	ldloc.2
 	add
 	stloc.2
-// 0x01032ec8: 0x1032ec8: lhu   a3, 12(a1)
+// 0x01032ed8: 0x1032ed8: lhu   a3, 12(a1)
 	ldloc.2
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x01032ecc: 0x1032ecc: sll   zero, zero, 0
-// 0x01032ed0: 0x1032ed0: beq   a3, a0, 0x1032eec addiu v0, v0, 1
+// 0x01032edc: 0x1032edc: sll   zero, zero, 0
+// 0x01032ee0: 0x1032ee0: beq   a3, a0, 0x1032efc addiu v0, v0, 1
 	ldloc 4
 	ldloc.1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_1032eec
+	beq  L_1032efc
 // --- basic block ---
-// 0x01032ed8: 0x1032ed8: slt   a3, v0, a2
+// 0x01032ee8: 0x1032ee8: slt   a3, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 4
-L_1032edc:
-// 0x01032edc: 0x1032edc: bne   a3, zero, 0x1032ebc sll   a1, v0, 4
+L_1032eec:
+// 0x01032eec: 0x1032eec: bne   a3, zero, 0x1032ecc sll   a1, v0, 4
 	ldloc 4
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc.2
-	brtrue L_1032ebc
+	brtrue L_1032ecc
 // --- basic block ---
-// 0x01032ee4: 0x1032ee4: j	 0x1032ef0 sll   zero, zero, 0
-	br L_1032ef0
+// 0x01032ef4: 0x1032ef4: j	 0x1032f00 sll   zero, zero, 0
+	br L_1032f00
 // --- basic block ---
-L_1032eec:
-// 0x01032eec: 0x1032eec: sb    zero, 10(a1)
+L_1032efc:
+// 0x01032efc: 0x1032efc: sb    zero, 10(a1)
 	ldloc.2
 	ldc.i4.s 10
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1032ef0:
-// 0x01032ef0: 0x1032ef0: lw    ra, 28(sp)
-// 0x01032ef4: 0x1032ef4: addiu v0, zero, 1
+L_1032f00:
+// 0x01032f00: 0x1032f00: lw    ra, 28(sp)
+// 0x01032f04: 0x1032f04: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01032ef8: 0x1032ef8: jr    ra addiu sp, sp, 32
+// 0x01032f08: 0x1032f08: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1743,7 +1743,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alert_activate_1032f00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alert_activate_1032f10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1781,13 +1781,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032f00:
-// 0x01032f00: 0x1032f00: addiu sp, sp, -24
+L_1032f10:
+// 0x01032f10: 0x1032f10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01032f04: 0x1032f04: sw    s0, 16(sp)
+// 0x01032f14: 0x1032f14: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1796,57 +1796,57 @@ L_1032f00:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032f08: 0x1032f08: sw    ra, 20(sp)
-// 0x01032f0c: 0x1032f0c: beq   a0, zero, 0x1032f44 addu  s0, a0, zero
+// 0x01032f18: 0x1032f18: sw    ra, 20(sp)
+// 0x01032f1c: 0x1032f1c: beq   a0, zero, 0x1032f54 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1032f44
+	brfalse L_1032f54
 // --- basic block ---
-// 0x01032f14: 0x1032f14: lui   v0, 0x20000
+// 0x01032f24: 0x1032f24: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01032f18: 0x1032f18: lw    v1, 0(a0)
+// 0x01032f28: 0x1032f28: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01032f1c: 0x1032f1c: lw    v0, 25612(v0)
+// 0x01032f2c: 0x1032f2c: lw    v0, 26076(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6403
+	ldc.i4 6519
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032f20: 0x1032f20: sll   zero, zero, 0
-// 0x01032f24: 0x1032f24: beq   v1, v0, 0x1032f44 lui   a1, 0x10000
+// 0x01032f30: 0x1032f30: sll   zero, zero, 0
+// 0x01032f34: 0x1032f34: beq   v1, v0, 0x1032f54 lui   a1, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_1032f44
+	beq  L_1032f54
 // --- basic block ---
-// 0x01032f2c: 0x1032f2c: lui   a3, 0x10000
+// 0x01032f3c: 0x1032f3c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01032f30: 0x1032f30: addiu a1, a1, -14752
+// 0x01032f40: 0x1032f40: addiu a1, a1, -14756
 	ldloc.2
-	ldc.i4 -14752
+	ldc.i4 -14756
 	add
 	stloc.2
-// 0x01032f34: 0x1032f34: addiu a3, a3, -14724
+// 0x01032f44: 0x1032f44: addiu a3, a3, -14728
 	ldloc 4
-	ldc.i4 -14724
+	ldc.i4 -14728
 	add
 	stloc 4
-// 0x01032f38: 0x1032f38: addiu a0, zero, 5
+// 0x01032f48: 0x1032f48: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01032f3c: 0x1032f3c: jal   0x100449c addiu a2, zero, 208
+// 0x01032f4c: 0x1032f4c: jal   0x100449c addiu a2, zero, 208
 	ldc.i4 208
 	stloc.3
 	ldloc.0
@@ -1859,21 +1859,21 @@ L_1032f00:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1032f44:
-// 0x01032f44: 0x1032f44: lw    ra, 20(sp)
-// 0x01032f48: 0x1032f48: lui   v0, 0x60000
+L_1032f54:
+// 0x01032f54: 0x1032f54: lw    ra, 20(sp)
+// 0x01032f58: 0x1032f58: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032f4c: 0x1032f4c: sw    s0, -18088(v0)
+// 0x01032f5c: 0x1032f5c: sw    s0, -17624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldloc 7
 	stelem.i4
-// 0x01032f50: 0x1032f50: lw    s0, 16(sp)
+// 0x01032f60: 0x1032f60: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1882,7 +1882,7 @@ L_1032f44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032f54: 0x1032f54: jr    ra addiu sp, sp, 24
+// 0x01032f64: 0x1032f64: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1894,7 +1894,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alert_unmap_1032f5c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alert_unmap_1032f6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1932,32 +1932,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032f5c:
-// 0x01032f5c: 0x1032f5c: lui   v0, 0x20000
+L_1032f6c:
+// 0x01032f6c: 0x1032f6c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01032f60: 0x1032f60: lw    v1, 0(a0)
+// 0x01032f70: 0x1032f70: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01032f64: 0x1032f64: lw    v0, 25612(v0)
+// 0x01032f74: 0x1032f74: lw    v0, 26076(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6403
+	ldc.i4 6519
 	add
 	ldelem.i4
 	stloc 5
-// 0x01032f68: 0x1032f68: addiu sp, sp, -24
+// 0x01032f78: 0x1032f78: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01032f6c: 0x1032f6c: sw    s0, 16(sp)
+// 0x01032f7c: 0x1032f7c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1966,34 +1966,34 @@ L_1032f5c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01032f70: 0x1032f70: sw    ra, 20(sp)
-// 0x01032f74: 0x1032f74: beq   v1, v0, 0x1032f98 addu  s0, a0, zero
+// 0x01032f80: 0x1032f80: sw    ra, 20(sp)
+// 0x01032f84: 0x1032f84: beq   v1, v0, 0x1032fa8 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_1032f98
+	beq  L_1032fa8
 // --- basic block ---
-// 0x01032f7c: 0x1032f7c: lui   a1, 0x10000
+// 0x01032f8c: 0x1032f8c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01032f80: 0x1032f80: lui   a3, 0x10000
+// 0x01032f90: 0x1032f90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01032f84: 0x1032f84: addiu a1, a1, -14752
+// 0x01032f94: 0x1032f94: addiu a1, a1, -14756
 	ldloc.2
-	ldc.i4 -14752
+	ldc.i4 -14756
 	add
 	stloc.2
-// 0x01032f88: 0x1032f88: addiu a3, a3, -14724
+// 0x01032f98: 0x1032f98: addiu a3, a3, -14728
 	ldloc 4
-	ldc.i4 -14724
+	ldc.i4 -14728
 	add
 	stloc 4
-// 0x01032f8c: 0x1032f8c: addiu a0, zero, 5
+// 0x01032f9c: 0x1032f9c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01032f90: 0x1032f90: jal   0x100449c addiu a2, zero, 220
+// 0x01032fa0: 0x1032fa0: jal   0x100449c addiu a2, zero, 220
 	ldc.i4 220
 	stloc.3
 	ldloc.0
@@ -2006,36 +2006,36 @@ L_1032f5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1032f98:
-// 0x01032f98: 0x1032f98: lui   v0, 0x60000
+L_1032fa8:
+// 0x01032fa8: 0x1032fa8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01032f9c: 0x1032f9c: lw    v1, -18088(v0)
+// 0x01032fac: 0x1032fac: lw    v1, -17624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 7
-// 0x01032fa0: 0x1032fa0: sll   zero, zero, 0
-// 0x01032fa4: 0x1032fa4: bne   v1, s0, 0x1032fb0 sll   zero, zero, 0
+// 0x01032fb0: 0x1032fb0: sll   zero, zero, 0
+// 0x01032fb4: 0x1032fb4: bne   v1, s0, 0x1032fc0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1032fb0
+	bne.un L_1032fc0
 // --- basic block ---
-// 0x01032fac: 0x1032fac: sw    zero, -18088(v0)
+// 0x01032fbc: 0x1032fbc: sw    zero, -17624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1032fb0:
-// 0x01032fb0: 0x1032fb0: jal   0x1000930 addu  a0, s0, zero
+L_1032fc0:
+// 0x01032fc0: 0x1032fc0: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2048,8 +2048,8 @@ L_1032fb0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032fb8: 0x1032fb8: lw    ra, 20(sp)
-// 0x01032fbc: 0x1032fbc: lw    s0, 16(sp)
+// 0x01032fc8: 0x1032fc8: lw    ra, 20(sp)
+// 0x01032fcc: 0x1032fcc: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2058,7 +2058,7 @@ L_1032fb0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01032fc0: 0x1032fc0: jr    ra addiu sp, sp, 24
+// 0x01032fd0: 0x1032fd0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2070,7 +2070,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alert_map_1032fc8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alert_map_1032fd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2114,13 +2114,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1032fc8:
-// 0x01032fc8: 0x1032fc8: addiu sp, sp, -40
+L_1032fd8:
+// 0x01032fd8: 0x1032fd8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01032fcc: 0x1032fcc: sw    s2, 32(sp)
+// 0x01032fdc: 0x1032fdc: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2129,14 +2129,14 @@ L_1032fc8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01032fd0: 0x1032fd0: addu  s2, a0, zero
+// 0x01032fe0: 0x1032fe0: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01032fd4: 0x1032fd4: addiu a0, zero, 12
+// 0x01032fe4: 0x1032fe4: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x01032fd8: 0x1032fd8: sw    ra, 36(sp)
-// 0x01032fdc: 0x1032fdc: sw    s1, 28(sp)
+// 0x01032fe8: 0x1032fe8: sw    ra, 36(sp)
+// 0x01032fec: 0x1032fec: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2145,7 +2145,7 @@ L_1032fc8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01032fe0: 0x1032fe0: sw    s0, 24(sp)
+// 0x01032ff0: 0x1032ff0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2154,7 +2154,7 @@ L_1032fc8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01032fe4: 0x1032fe4: jal   0x1000910 lui   s1, 0x10000
+// 0x01032ff4: 0x1032ff4: jal   0x1000910 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -2167,18 +2167,18 @@ L_1032fc8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01032fec: 0x1032fec: addu  a2, v0, zero
+// 0x01032ffc: 0x1032ffc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01032ff0: 0x1032ff0: addiu a0, s1, -14752
+// 0x01033000: 0x1033000: addiu a0, s1, -14756
 	ldloc 9
-	ldc.i4 -14752
+	ldc.i4 -14756
 	add
 	stloc.1
-// 0x01032ff4: 0x1032ff4: addiu a1, zero, 181
+// 0x01033004: 0x1033004: addiu a1, zero, 181
 	ldc.i4 181
 	stloc.2
-// 0x01032ff8: 0x1032ff8: jal   0x1004a38 addu  s0, v0, zero
+// 0x01033008: 0x1033008: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2186,50 +2186,50 @@ L_1032fc8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033000: 0x1033000: lui   v1, 0x20000
+// 0x01033010: 0x1033010: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01033004: 0x1033004: lw    v1, 25612(v1)
+// 0x01033014: 0x1033014: lw    v1, 26076(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6403
+	ldc.i4 6519
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033008: 0x1033008: addiu v0, s0, 8
+// 0x01033018: 0x1033018: addiu v0, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0103300c: 0x103300c: addu  a0, s2, zero
+// 0x0103301c: 0x103301c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01033010: 0x1033010: addiu a1, zero, 25
+// 0x01033020: 0x1033020: addiu a1, zero, 25
 	ldc.i4.s 25
 	stloc.2
-// 0x01033014: 0x1033014: addiu a2, zero, 16
+// 0x01033024: 0x1033024: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01033018: 0x1033018: addiu a3, s0, 4
+// 0x01033028: 0x1033028: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0103301c: 0x103301c: sw    v1, 0(s0)
+// 0x0103302c: 0x103302c: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01033020: 0x1033020: jal   0x10031b0 sw    v0, 16(sp)
+// 0x01033030: 0x1033030: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2248,29 +2248,29 @@ L_1032fc8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033028: 0x1033028: bne   v0, zero, 0x103304c lui   a0, 0x10000
+// 0x01033038: 0x1033038: bne   v0, zero, 0x103305c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103304c
+	brtrue L_103305c
 // --- basic block ---
-// 0x01033030: 0x1033030: lui   a3, 0x10000
+// 0x01033040: 0x1033040: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01033034: 0x1033034: addiu a1, s1, -14752
+// 0x01033044: 0x1033044: addiu a1, s1, -14756
 	ldloc 9
-	ldc.i4 -14752
+	ldc.i4 -14756
 	add
 	stloc.2
-// 0x01033038: 0x1033038: addiu a3, a3, -14688
+// 0x01033048: 0x1033048: addiu a3, a3, -14692
 	ldloc 4
-	ldc.i4 -14688
+	ldc.i4 -14692
 	add
 	stloc 4
-// 0x0103303c: 0x103303c: addiu a0, zero, 5
+// 0x0103304c: 0x103304c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01033040: 0x1033040: jal   0x100449c addiu a2, zero, 191
+// 0x01033050: 0x1033050: jal   0x100449c addiu a2, zero, 191
 	ldc.i4 191
 	stloc.3
 	ldloc.0
@@ -2283,32 +2283,32 @@ L_1032fc8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033048: 0x1033048: lui   a0, 0x10000
+// 0x01033058: 0x1033058: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_103304c:
-// 0x0103304c: 0x103304c: lui   a1, 0x0
+L_103305c:
+// 0x0103305c: 0x103305c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01033050: 0x1033050: lui   a2, 0x0
+// 0x01033060: 0x1033060: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01033054: 0x1033054: addiu a0, a0, 12560
+// 0x01033064: 0x1033064: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01033058: 0x1033058: addiu a1, a1, 12444
+// 0x01033068: 0x1033068: addiu a1, a1, 12444
 	ldloc.2
 	ldc.i4 12444
 	add
 	stloc.2
-// 0x0103305c: 0x103305c: addiu a2, a2, 21180
+// 0x0103306c: 0x103306c: addiu a2, a2, 21180
 	ldloc.3
 	ldc.i4 21180
 	add
 	stloc.3
-// 0x01033060: 0x1033060: jal   0x100edb0 addu  a3, zero, zero
+// 0x01033070: 0x1033070: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2316,16 +2316,16 @@ L_103304c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033068: 0x1033068: lw    ra, 36(sp)
-// 0x0103306c: 0x103306c: addu  v0, s0, zero
+// 0x01033078: 0x1033078: lw    ra, 36(sp)
+// 0x0103307c: 0x103307c: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01033070: 0x1033070: lw    s2, 32(sp)
+// 0x01033080: 0x1033080: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2334,7 +2334,7 @@ L_103304c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01033074: 0x1033074: lw    s1, 28(sp)
+// 0x01033084: 0x1033084: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2343,7 +2343,7 @@ L_103304c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033078: 0x1033078: lw    s0, 24(sp)
+// 0x01033088: 0x1033088: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2352,7 +2352,7 @@ L_103304c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103307c: 0x103307c: jr    ra addiu sp, sp, 40
+// 0x0103308c: 0x103308c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2364,7 +2364,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alert_get_alert_sound_1033084(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alert_get_alert_sound_1033094(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -2405,26 +2405,26 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1033084:
-// 0x01033084: 0x1033084: lui   v0, 0x60000
+L_1033094:
+// 0x01033094: 0x1033094: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01033088: 0x1033088: lw    v0, -18088(v0)
+// 0x01033098: 0x1033098: lw    v0, -17624(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4522
+	ldc.i4 -4406
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103308c: 0x103308c: addiu sp, sp, -32
+// 0x0103309c: 0x103309c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01033090: 0x1033090: sw    ra, 28(sp)
-// 0x01033094: 0x1033094: sw    s1, 24(sp)
+// 0x010330a0: 0x10330a0: sw    ra, 28(sp)
+// 0x010330a4: 0x10330a4: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2433,7 +2433,7 @@ L_1033084:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01033098: 0x1033098: beq   v0, zero, 0x1033120 sw    s0, 20(sp)
+// 0x010330a8: 0x10330a8: beq   v0, zero, 0x1033130 sw    s0, 20(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -2443,9 +2443,9 @@ L_1033084:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1033120
+	brfalse L_1033130
 // --- basic block ---
-// 0x010330a0: 0x10330a0: lw    a1, 8(v0)
+// 0x010330b0: 0x10330b0: lw    a1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2454,13 +2454,13 @@ L_1033084:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010330a4: 0x10330a4: j	 0x10330c8 addu  v1, zero, zero
+// 0x010330b4: 0x10330b4: j	 0x10330d8 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10330c8
+	br L_10330d8
 // --- basic block ---
-L_10330ac:
-// 0x010330ac: 0x10330ac: lw    s1, 4(v0)
+L_10330bc:
+// 0x010330bc: 0x10330bc: lw    s1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2469,123 +2469,123 @@ L_10330ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010330b0: 0x10330b0: sll   zero, zero, 0
-// 0x010330b4: 0x10330b4: addu  s1, s1, a3
+// 0x010330c0: 0x10330c0: sll   zero, zero, 0
+// 0x010330c4: 0x10330c4: addu  s1, s1, a3
 	ldloc 9
 	ldloc 4
 	add
 	stloc 9
-// 0x010330b8: 0x10330b8: lhu   a2, 12(s1)
+// 0x010330c8: 0x10330c8: lhu   a2, 12(s1)
 	ldloc 9
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x010330bc: 0x10330bc: sll   zero, zero, 0
-// 0x010330c0: 0x10330c0: beq   a2, a0, 0x10330dc addiu v1, v1, 1
+// 0x010330cc: 0x10330cc: sll   zero, zero, 0
+// 0x010330d0: 0x10330d0: beq   a2, a0, 0x10330ec addiu v1, v1, 1
 	ldloc.3
 	ldloc.1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	beq  L_10330dc
+	beq  L_10330ec
 // --- basic block ---
-L_10330c8:
-// 0x010330c8: 0x10330c8: slt   a2, v1, a1
+L_10330d8:
+// 0x010330d8: 0x10330d8: slt   a2, v1, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc.3
-// 0x010330cc: 0x10330cc: bne   a2, zero, 0x10330ac sll   a3, v1, 4
+// 0x010330dc: 0x10330dc: bne   a2, zero, 0x10330bc sll   a3, v1, 4
 	ldloc.3
 	ldloc 6
 	ldc.i4.4
 	shl
 	stloc 4
-	brtrue L_10330ac
+	brtrue L_10330bc
 // --- basic block ---
-// 0x010330d4: 0x10330d4: j	 0x1033124 addu  s0, zero, zero
+// 0x010330e4: 0x10330e4: j	 0x1033134 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1033124
+	br L_1033134
 // --- basic block ---
-L_10330dc:
-// 0x010330dc: 0x10330dc: jal   0x10518a8 addu  a0, zero, zero
+L_10330ec:
+// 0x010330ec: 0x10330ec: jal   0x10518b8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010330e4: 0x10330e4: addu  s0, v0, zero
+// 0x010330f4: 0x10330f4: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010330e8: 0x10330e8: lbu   v0, 10(s1)
+// 0x010330f8: 0x10330f8: lbu   v0, 10(s1)
 	ldloc 9
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010330ec: 0x10330ec: addiu v1, zero, 2
+// 0x010330fc: 0x10330fc: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x010330f0: 0x10330f0: beq   v0, v1, 0x1033108 addiu v1, zero, 4
+// 0x01033100: 0x1033100: beq   v0, v1, 0x1033118 addiu v1, zero, 4
 	ldloc 5
 	ldloc 6
 	ldc.i4.4
 	stloc 6
-	beq  L_1033108
+	beq  L_1033118
 // --- basic block ---
-// 0x010330f8: 0x10330f8: bne   v0, v1, 0x1033124 lui   a1, 0x10000
+// 0x01033108: 0x1033108: bne   v0, v1, 0x1033134 lui   a1, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1033124
+	bne.un L_1033134
 // --- basic block ---
-// 0x01033100: 0x1033100: j	 0x1033110 addiu a1, a1, -14636
+// 0x01033110: 0x1033110: j	 0x1033120 addiu a1, a1, -14640
 	ldloc.2
-	ldc.i4 -14636
+	ldc.i4 -14640
 	add
 	stloc.2
-	br L_1033110
+	br L_1033120
 // --- basic block ---
-L_1033108:
-// 0x01033108: 0x1033108: lui   a1, 0x10000
+L_1033118:
+// 0x01033118: 0x1033118: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103310c: 0x103310c: addiu a1, a1, -14656
+// 0x0103311c: 0x103311c: addiu a1, a1, -14660
 	ldloc.2
-	ldc.i4 -14656
+	ldc.i4 -14660
 	add
 	stloc.2
-L_1033110:
-// 0x01033110: 0x1033110: jal   0x10518cc addu  a0, s0, zero
+L_1033120:
+// 0x01033120: 0x1033120: jal   0x10518dc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033118: 0x1033118: j	 0x1033124 sll   zero, zero, 0
-	br L_1033124
+// 0x01033128: 0x1033128: j	 0x1033134 sll   zero, zero, 0
+	br L_1033134
 // --- basic block ---
-L_1033120:
-// 0x01033120: 0x1033120: addu  s0, zero, zero
+L_1033130:
+// 0x01033130: 0x1033130: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_1033124:
-// 0x01033124: 0x1033124: lw    ra, 28(sp)
-// 0x01033128: 0x1033128: addu  v0, s0, zero
+L_1033134:
+// 0x01033134: 0x1033134: lw    ra, 28(sp)
+// 0x01033138: 0x1033138: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0103312c: 0x103312c: lw    s1, 24(sp)
+// 0x0103313c: 0x103313c: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2594,7 +2594,7 @@ L_1033124:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033130: 0x1033130: lw    s0, 20(sp)
+// 0x01033140: 0x1033140: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2603,7 +2603,7 @@ L_1033124:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01033134: 0x1033134: jr    ra addiu sp, sp, 32
+// 0x01033144: 0x1033144: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2615,7 +2615,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alert_get_distance_103313c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alert_get_distance_103314c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2650,17 +2650,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103313c:
-// 0x0103313c: 0x103313c: lui   a0, 0x0
+L_103314c:
+// 0x0103314c: 0x103314c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01033140: 0x1033140: addiu sp, sp, -24
+// 0x01033150: 0x1033150: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01033144: 0x1033144: sw    ra, 20(sp)
-// 0x01033148: 0x1033148: jal   0x100e788 addiu a0, a0, 12444
+// 0x01033154: 0x1033154: sw    ra, 20(sp)
+// 0x01033158: 0x1033158: jal   0x100e798 addiu a0, a0, 12444
 	ldloc.1
 	ldc.i4 12444
 	add
@@ -2670,14 +2670,14 @@ L_103313c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01033150: 0x1033150: lw    ra, 20(sp)
-// 0x01033154: 0x1033154: sll   zero, zero, 0
-// 0x01033158: 0x1033158: jr    ra addiu sp, sp, 24
+// 0x01033160: 0x1033160: lw    ra, 20(sp)
+// 0x01033164: 0x1033164: sll   zero, zero, 0
+// 0x01033168: 0x1033168: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2689,7 +2689,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_alerter_register_1033160(int32,int32)
+.method public static int32 roadmap_alerter_register_1033170(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2715,15 +2715,15 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033160: 0x1033160: lui   v0, 0x60000
+// 0x01033170: 0x1033170: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01033164: 0x1033164: addiu v0, v0, -18068
+// 0x01033174: 0x1033174: addiu v0, v0, -17604
 	ldloc.2
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc.2
-// 0x01033168: 0x1033168: lw    v1, 80(v0)
+// 0x01033178: 0x1033178: lw    v1, 80(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -2732,30 +2732,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103316c: 0x103316c: sll   zero, zero, 0
-// 0x01033170: 0x1033170: sll   a1, v1, 2
+// 0x0103317c: 0x103317c: sll   zero, zero, 0
+// 0x01033180: 0x1033180: sll   a1, v1, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01033174: 0x1033174: addu  a1, a1, v0
+// 0x01033184: 0x1033184: addu  a1, a1, v0
 	ldloc.1
 	ldloc.2
 	add
 	stloc.1
-// 0x01033178: 0x1033178: addiu v1, v1, 1
+// 0x01033188: 0x1033188: addiu v1, v1, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0103317c: 0x103317c: sw    a0, 0(a1)
+// 0x0103318c: 0x103318c: sw    a0, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-// 0x01033180: 0x1033180: jr    ra sw    v1, 80(v0)
+// 0x01033190: 0x1033190: jr    ra sw    v1, 80(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -2771,7 +2771,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 hide_alert_dialog_1033198(int32,int32,int32,int32,int32)
+.method public static int32 hide_alert_dialog_10331a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32 v1,int32[] mem,int32 ra)
@@ -2809,13 +2809,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033198: 0x1033198: addiu sp, sp, -24
+// 0x010331a8: 0x10331a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103319c: 0x103319c: sw    ra, 20(sp)
-// 0x010331a0: 0x10331a0: jal   0x1093f90 sw    s0, 16(sp)
+// 0x010331ac: 0x10331ac: sw    ra, 20(sp)
+// 0x010331b0: 0x10331b0: jal   0x10945b4 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2824,27 +2824,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x010331a8: 0x10331a8: beq   v0, zero, 0x10331d4 sll   zero, zero, 0
+// 0x010331b8: 0x10331b8: beq   v0, zero, 0x10331e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10331d4
+	brfalse L_10331e4
 // --- basic block ---
-// 0x010331b0: 0x10331b0: jal   0x1093fc0 lui   s0, 0x10000
+// 0x010331c0: 0x10331c0: jal   0x10945e4 lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 6
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010331b8: 0x10331b8: addu  a0, v0, zero
+// 0x010331c8: 0x10331c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010331bc: 0x10331bc: jal   0x1001b14 addiu a1, s0, -14452
+// 0x010331cc: 0x10331cc: jal   0x1001b14 addiu a1, s0, -14456
 	ldloc 6
-	ldc.i4 -14452
+	ldc.i4 -14456
 	add
 	stloc.2
 	ldloc.1
@@ -2852,15 +2852,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010331c4: 0x10331c4: bne   v0, zero, 0x10331d4 addiu a0, s0, -14452
+// 0x010331d4: 0x10331d4: bne   v0, zero, 0x10331e4 addiu a0, s0, -14456
 	ldloc 5
 	ldloc 6
-	ldc.i4 -14452
+	ldc.i4 -14456
 	add
 	stloc.1
-	brtrue L_10331d4
+	brtrue L_10331e4
 // --- basic block ---
-// 0x010331cc: 0x10331cc: jal   0x1094884 addu  a1, zero, zero
+// 0x010331dc: 0x10331dc: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2868,14 +2868,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10331d4:
-// 0x010331d4: 0x10331d4: lw    ra, 20(sp)
-// 0x010331d8: 0x10331d8: lw    s0, 16(sp)
+L_10331e4:
+// 0x010331e4: 0x10331e4: lw    ra, 20(sp)
+// 0x010331e8: 0x10331e8: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2884,7 +2884,7 @@ L_10331d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010331dc: 0x10331dc: jr    ra addiu sp, sp, 24
+// 0x010331ec: 0x10331ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2896,7 +2896,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 hide_10331e4(int32,int32,int32,int32,int32)
+.method public static int32 hide_10331f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -2931,28 +2931,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010331e4: 0x10331e4: addiu sp, sp, -24
+// 0x010331f4: 0x10331f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010331e8: 0x10331e8: sw    ra, 20(sp)
-// 0x010331ec: 0x10331ec: jal   0x1033198 sll   zero, zero, 0
+// 0x010331f8: 0x10331f8: sw    ra, 20(sp)
+// 0x010331fc: 0x10331fc: jal   0x10331a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::hide_alert_dialog_1033198(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::hide_alert_dialog_10331a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010331f4: 0x10331f4: lw    ra, 20(sp)
-// 0x010331f8: 0x10331f8: addiu v0, zero, 1
+// 0x01033204: 0x1033204: lw    ra, 20(sp)
+// 0x01033208: 0x1033208: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010331fc: 0x10331fc: jr    ra addiu sp, sp, 24
+// 0x0103320c: 0x103320c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2964,7 +2964,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 hide_alert_timeout_1033204(int32,int32,int32,int32,int32)
+.method public static int32 hide_alert_timeout_1033214(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3008,12 +3008,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033204: 0x1033204: addiu sp, sp, -56
+// 0x01033214: 0x1033214: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01033208: 0x1033208: sw    s0, 40(sp)
+// 0x01033218: 0x1033218: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3022,25 +3022,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103320c: 0x103320c: lui   s0, 0x60000
+// 0x0103321c: 0x103321c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01033210: 0x1033210: lw    v0, -18080(s0)
+// 0x01033220: 0x1033220: lw    v0, -17616(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4520
+	ldc.i4 -4404
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033214: 0x1033214: sw    ra, 52(sp)
-// 0x01033218: 0x1033218: addiu v0, v0, -1
+// 0x01033224: 0x1033224: sw    ra, 52(sp)
+// 0x01033228: 0x1033228: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0103321c: 0x103321c: sw    s2, 48(sp)
+// 0x0103322c: 0x103322c: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3049,7 +3049,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01033220: 0x1033220: sw    s1, 44(sp)
+// 0x01033230: 0x1033230: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3058,37 +3058,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01033224: 0x1033224: blez  v0, 0x10332cc sw    v0, -18080(s0)
+// 0x01033234: 0x1033234: blez  v0, 0x10332dc sw    v0, -17616(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4520
+	ldc.i4 -4404
 	add
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	ble L_10332cc
+	ble L_10332dc
 // --- basic block ---
-// 0x0103322c: 0x103322c: lui   v0, 0x60000
+// 0x0103323c: 0x103323c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01033230: 0x1033230: lw    a0, -18076(v0)
+// 0x01033240: 0x1033240: lw    a0, -17612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033234: 0x1033234: lui   s1, 0x10000
+// 0x01033244: 0x1033244: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01033238: 0x1033238: jal   0x109b304 addiu a1, s1, -14440
+// 0x01033248: 0x1033248: jal   0x109b94c addiu a1, s1, -14444
 	ldloc 9
-	ldc.i4 -14440
+	ldc.i4 -14444
 	add
 	stloc.2
 	ldloc.0
@@ -3096,35 +3096,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033240: 0x1033240: lw    v1, -18080(s0)
+// 0x01033250: 0x1033250: lw    v1, -17616(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4520
+	ldc.i4 -4404
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033244: 0x1033244: addiu v0, zero, -1
+// 0x01033254: 0x1033254: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01033248: 0x1033248: beq   v1, v0, 0x1033278 addiu s2, sp, 16
+// 0x01033258: 0x1033258: beq   v1, v0, 0x1033288 addiu s2, sp, 16
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-	beq  L_1033278
+	beq  L_1033288
 // --- basic block ---
-// 0x01033250: 0x1033250: jal   0x101cd60 addiu a0, s1, -14440
+// 0x01033260: 0x1033260: jal   0x101cd70 addiu a0, s1, -14444
 	ldloc 9
-	ldc.i4 -14440
+	ldc.i4 -14444
 	add
 	stloc.1
 	ldloc.0
@@ -3132,32 +3132,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033258: 0x1033258: lw    a3, -18080(s0)
+// 0x01033268: 0x1033268: lw    a3, -17616(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4520
+	ldc.i4 -4404
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103325c: 0x103325c: lui   a1, 0x10000
+// 0x0103326c: 0x103326c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01033260: 0x1033260: addu  a0, s2, zero
+// 0x01033270: 0x1033270: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01033264: 0x1033264: addiu a1, a1, -14432
+// 0x01033274: 0x1033274: addiu a1, a1, -14436
 	ldloc.2
-	ldc.i4 -14432
+	ldc.i4 -14436
 	add
 	stloc.2
-// 0x01033268: 0x1033268: jal   0x1000f64 addu  a2, v0, zero
+// 0x01033278: 0x1033278: jal   0x1000f64 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3170,15 +3170,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033270: 0x1033270: j	 0x1033290 lui   v0, 0x60000
+// 0x01033280: 0x1033280: j	 0x10332a0 lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-	br L_1033290
+	br L_10332a0
 // --- basic block ---
-L_1033278:
-// 0x01033278: 0x1033278: jal   0x101cd60 addiu a0, s1, -14440
+L_1033288:
+// 0x01033288: 0x1033288: jal   0x101cd70 addiu a0, s1, -14444
 	ldloc 9
-	ldc.i4 -14440
+	ldc.i4 -14444
 	add
 	stloc.1
 	ldloc.0
@@ -3186,15 +3186,15 @@ L_1033278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033280: 0x1033280: addu  a1, v0, zero
+// 0x01033290: 0x1033290: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01033284: 0x1033284: jal   0x1001b68 addu  a0, s2, zero
+// 0x01033294: 0x1033294: jal   0x1001b68 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -3204,21 +3204,21 @@ L_1033278:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103328c: 0x103328c: lui   v0, 0x60000
+// 0x0103329c: 0x103329c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1033290:
-// 0x01033290: 0x1033290: lw    v0, -18076(v0)
+L_10332a0:
+// 0x010332a0: 0x10332a0: lw    v0, -17612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033294: 0x1033294: sll   zero, zero, 0
-// 0x01033298: 0x1033298: lw    a0, 4(v0)
+// 0x010332a4: 0x10332a4: sll   zero, zero, 0
+// 0x010332a8: 0x10332a8: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3227,7 +3227,7 @@ L_1033290:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103329c: 0x103329c: jal   0x109b50c addiu a1, sp, 16
+// 0x010332ac: 0x10332ac: jal   0x109bb54 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -3237,53 +3237,53 @@ L_1033290:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010332a4: 0x10332a4: jal   0x1095020 sll   zero, zero, 0
+// 0x010332b4: 0x10332b4: jal   0x1095668 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095020(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095668(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010332ac: 0x10332ac: jal   0x102146c sll   zero, zero, 0
+// 0x010332bc: 0x10332bc: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010332b4: 0x10332b4: bne   v0, zero, 0x10332fc sll   zero, zero, 0
+// 0x010332c4: 0x10332c4: bne   v0, zero, 0x103330c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10332fc
+	brtrue L_103330c
 // --- basic block ---
-// 0x010332bc: 0x10332bc: jal   0x1021900 sll   zero, zero, 0
+// 0x010332cc: 0x10332cc: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010332c4: 0x10332c4: j	 0x10332fc sll   zero, zero, 0
-	br L_10332fc
+// 0x010332d4: 0x10332d4: j	 0x103330c sll   zero, zero, 0
+	br L_103330c
 // --- basic block ---
-L_10332cc:
-// 0x010332cc: 0x10332cc: jal   0x1033198 lui   s0, 0x60000
+L_10332dc:
+// 0x010332dc: 0x10332dc: jal   0x10331a8 lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
 	ldloc.0
@@ -3291,73 +3291,73 @@ L_10332cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::hide_alert_dialog_1033198(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::hide_alert_dialog_10331a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010332d4: 0x10332d4: lui   v0, 0x60000
+// 0x010332e4: 0x10332e4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010332d8: 0x10332d8: addiu v1, zero, -1
+// 0x010332e8: 0x10332e8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010332dc: 0x10332dc: lw    a0, -18084(s0)
+// 0x010332ec: 0x10332ec: lw    a0, -17620(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4521
+	ldc.i4 -4405
 	add
 	ldelem.i4
 	stloc.1
-// 0x010332e0: 0x10332e0: sw    v1, -17984(v0)
+// 0x010332f0: 0x10332f0: sw    v1, -17520(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldloc 7
 	stelem.i4
-// 0x010332e4: 0x10332e4: lui   v0, 0x60000
+// 0x010332f4: 0x10332f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010332e8: 0x10332e8: beq   a0, zero, 0x10332fc sw    zero, -18072(v0)
+// 0x010332f8: 0x10332f8: beq   a0, zero, 0x103330c sw    zero, -17608(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4518
+	ldc.i4 -4402
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10332fc
+	brfalse L_103330c
 // --- basic block ---
-// 0x010332f0: 0x10332f0: jal   0x104fd00 sll   zero, zero, 0
+// 0x01033300: 0x1033300: jal   0x104fd10 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010332f8: 0x10332f8: sw    zero, -18084(s0)
+// 0x01033308: 0x1033308: sw    zero, -17620(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4521
+	ldc.i4 -4405
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10332fc:
-// 0x010332fc: 0x10332fc: lw    ra, 52(sp)
-// 0x01033300: 0x1033300: lw    s2, 48(sp)
+L_103330c:
+// 0x0103330c: 0x103330c: lw    ra, 52(sp)
+// 0x01033310: 0x1033310: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3366,7 +3366,7 @@ L_10332fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01033304: 0x1033304: lw    s1, 44(sp)
+// 0x01033314: 0x1033314: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3375,7 +3375,7 @@ L_10332fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033308: 0x1033308: lw    s0, 40(sp)
+// 0x01033318: 0x1033318: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3384,7 +3384,7 @@ L_10332fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103330c: 0x103330c: jr    ra addiu sp, sp, 56
+// 0x0103331c: 0x103331c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3396,7 +3396,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 update_alert_1033314(int32,int32,int32,int32,int32)
+.method public static int32 update_alert_1033324(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -3449,15 +3449,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033314: 0x1033314: lui   v0, 0x60000
+// 0x01033324: 0x1033324: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01033318: 0x1033318: addiu v1, v0, -17984
+// 0x01033328: 0x1033328: addiu v1, v0, -17520
 	ldloc 5
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 7
-// 0x0103331c: 0x103331c: lw    a0, 16(v1)
+// 0x0103332c: 0x103332c: lw    a0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3466,10 +3466,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033320: 0x1033320: lui   v1, 0x0
+// 0x01033330: 0x1033330: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01033324: 0x1033324: lw    v1, 576(v1)
+// 0x01033334: 0x1033334: lw    v1, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3478,12 +3478,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033328: 0x1033328: addiu sp, sp, -264
+// 0x01033338: 0x1033338: addiu sp, sp, -264
 	ldloc.0
 	ldc.i4 -264
 	add
 	stloc.0
-// 0x0103332c: 0x103332c: sw    s3, 248(sp)
+// 0x0103333c: 0x103333c: sw    s3, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3492,8 +3492,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01033330: 0x1033330: sw    ra, 260(sp)
-// 0x01033334: 0x1033334: sw    s5, 256(sp)
+// 0x01033340: 0x1033340: sw    ra, 260(sp)
+// 0x01033344: 0x1033344: sw    s5, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3502,7 +3502,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01033338: 0x1033338: sw    s4, 252(sp)
+// 0x01033348: 0x1033348: sw    s4, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3511,7 +3511,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103333c: 0x103333c: sw    s2, 244(sp)
+// 0x0103334c: 0x103334c: sw    s2, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3520,7 +3520,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01033340: 0x1033340: sw    s1, 240(sp)
+// 0x01033350: 0x1033350: sw    s1, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3529,7 +3529,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01033344: 0x1033344: sw    s0, 236(sp)
+// 0x01033354: 0x1033354: sw    s0, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3538,57 +3538,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01033348: 0x1033348: lw    s3, -17984(v0)
+// 0x01033358: 0x1033358: lw    s3, -17520(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103334c: 0x103334c: beq   a0, v1, 0x1033364 lui   s4, 0x60000
+// 0x0103335c: 0x103335c: beq   a0, v1, 0x1033374 lui   s4, 0x60000
 	ldloc.1
 	ldloc 7
 	ldc.i4 393216
 	stloc 12
-	beq  L_1033364
+	beq  L_1033374
 // --- basic block ---
-// 0x01033354: 0x1033354: bltz  a0, 0x1033364 sll   zero, zero, 0
+// 0x01033364: 0x1033364: bltz  a0, 0x1033374 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1033364
+	blt L_1033374
 // --- basic block ---
-// 0x0103335c: 0x103335c: jal   0x100b164 sll   zero, zero, 0
+// 0x0103336c: 0x103336c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1033364:
-// 0x01033364: 0x1033364: lw    a0, -18076(s4)
+L_1033374:
+// 0x01033374: 0x1033374: lw    a0, -17612(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033368: 0x1033368: lui   a1, 0x10000
+// 0x01033378: 0x1033378: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103336c: 0x103336c: addiu a1, a1, -14424
+// 0x0103337c: 0x103337c: addiu a1, a1, -14428
 	ldloc.2
-	ldc.i4 -14424
+	ldc.i4 -14428
 	add
 	stloc.2
-// 0x01033370: 0x1033370: jal   0x109b304 lui   s0, 0x60000
+// 0x01033380: 0x1033380: jal   0x109b94c lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 9
 	ldloc.0
@@ -3596,20 +3596,20 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033378: 0x1033378: addiu s0, s0, -17984
+// 0x01033388: 0x1033388: addiu s0, s0, -17520
 	ldloc 9
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 9
-// 0x0103337c: 0x103337c: addu  s5, v0, zero
+// 0x0103338c: 0x103338c: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x01033380: 0x1033380: lw    v0, 12(s0)
+// 0x01033390: 0x1033390: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3618,33 +3618,33 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033384: 0x1033384: lui   s2, 0x60000
+// 0x01033394: 0x1033394: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01033388: 0x1033388: sll   v0, v0, 2
+// 0x01033398: 0x1033398: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0103338c: 0x103338c: addiu s2, s2, -18068
+// 0x0103339c: 0x103339c: addiu s2, s2, -17604
 	ldloc 8
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 8
-// 0x01033390: 0x1033390: addu  v0, v0, s2
+// 0x010333a0: 0x10333a0: addu  v0, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x01033394: 0x1033394: lw    v0, 0(v0)
+// 0x010333a4: 0x10333a4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01033398: 0x1033398: sll   zero, zero, 0
-// 0x0103339c: 0x103339c: lw    v0, 44(v0)
+// 0x010333a8: 0x10333a8: sll   zero, zero, 0
+// 0x010333ac: 0x10333ac: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3653,8 +3653,8 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010333a0: 0x10333a0: sll   zero, zero, 0
-// 0x010333a4: 0x10333a4: jalr  v0 addu  a0, s3, zero
+// 0x010333b0: 0x10333b0: sll   zero, zero, 0
+// 0x010333b4: 0x10333b4: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
@@ -3668,11 +3668,11 @@ L_1033364:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010333ac: 0x10333ac: beq   v0, zero, 0x10334b4 sll   zero, zero, 0
+// 0x010333bc: 0x10333bc: beq   v0, zero, 0x10334c4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10334b4
+	brfalse L_10334c4
 // --- basic block ---
-// 0x010333b4: 0x10333b4: jal   0x101cd60 addu  a0, v0, zero
+// 0x010333c4: 0x10333c4: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3680,20 +3680,20 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010333bc: 0x10333bc: addiu s1, sp, 24
+// 0x010333cc: 0x10333cc: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x010333c0: 0x10333c0: addu  a0, s1, zero
+// 0x010333d0: 0x10333d0: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010333c4: 0x10333c4: jal   0x1001b68 addu  a1, v0, zero
+// 0x010333d4: 0x10333d4: jal   0x1001b68 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -3703,10 +3703,10 @@ L_1033364:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010333cc: 0x10333cc: addu  a0, s5, zero
+// 0x010333dc: 0x10333dc: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x010333d0: 0x10333d0: jal   0x1097e5c addu  a1, s1, zero
+// 0x010333e0: 0x10333e0: jal   0x10984a4 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3714,24 +3714,24 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010333d8: 0x10333d8: lw    a0, -18076(s4)
+// 0x010333e8: 0x10333e8: lw    a0, -17612(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc.1
-// 0x010333dc: 0x10333dc: lui   a1, 0x10000
+// 0x010333ec: 0x10333ec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010333e0: 0x10333e0: jal   0x109b304 addiu a1, a1, -25532
+// 0x010333f0: 0x10333f0: jal   0x109b94c addiu a1, a1, -25532
 	ldloc.2
 	ldc.i4 -25532
 	add
@@ -3741,20 +3741,20 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010333e8: 0x10333e8: lui   a0, 0x10000
+// 0x010333f8: 0x10333f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010333ec: 0x10333ec: addiu a0, a0, -14412
+// 0x010333fc: 0x10333fc: addiu a0, a0, -14416
 	ldloc.1
-	ldc.i4 -14412
+	ldc.i4 -14416
 	add
 	stloc.1
-// 0x010333f0: 0x10333f0: jal   0x101cd60 addu  s5, v0, zero
+// 0x01033400: 0x1033400: jal   0x101cd70 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -3762,12 +3762,12 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010333f8: 0x10333f8: lw    a3, 4(s0)
+// 0x01033408: 0x1033408: lw    a3, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3776,7 +3776,7 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010333fc: 0x10333fc: sw    v0, 228(sp)
+// 0x0103340c: 0x103340c: sw    v0, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3785,7 +3785,7 @@ L_1033364:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01033400: 0x1033400: jal   0x1007d6c sw    a3, 224(sp)
+// 0x01033410: 0x1033410: jal   0x1007d7c sw    a3, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3794,10 +3794,10 @@ L_1033364:
 	add
 	ldloc 4
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x01033408: 0x1033408: jal   0x101cd60 addu  a0, v0, zero
+// 0x01033418: 0x1033418: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3805,12 +3805,12 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033410: 0x1033410: lw    a2, 228(sp)
+// 0x01033420: 0x1033420: lw    a2, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3819,7 +3819,7 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01033414: 0x1033414: lw    a3, 224(sp)
+// 0x01033424: 0x1033424: lw    a3, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3828,18 +3828,18 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01033418: 0x1033418: lui   a1, 0x10000
+// 0x01033428: 0x1033428: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103341c: 0x103341c: addu  a0, s1, zero
+// 0x0103342c: 0x103342c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01033420: 0x1033420: addiu a1, a1, -14408
+// 0x01033430: 0x1033430: addiu a1, a1, -14412
 	ldloc.2
-	ldc.i4 -14408
+	ldc.i4 -14412
 	add
 	stloc.2
-// 0x01033424: 0x1033424: jal   0x1000f64 sw    v0, 16(sp)
+// 0x01033434: 0x1033434: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3858,10 +3858,10 @@ L_1033364:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103342c: 0x103342c: addu  a1, s1, zero
+// 0x0103343c: 0x103343c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01033430: 0x1033430: jal   0x1097e5c addu  a0, s5, zero
+// 0x01033440: 0x1033440: jal   0x10984a4 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -3869,26 +3869,26 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033438: 0x1033438: lw    a0, -18076(s4)
+// 0x01033448: 0x1033448: lw    a0, -17612(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103343c: 0x103343c: lui   a1, 0x10000
+// 0x0103344c: 0x103344c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01033440: 0x1033440: jal   0x109b304 addiu a1, a1, -14396
+// 0x01033450: 0x1033450: jal   0x109b94c addiu a1, a1, -14400
 	ldloc.2
-	ldc.i4 -14396
+	ldc.i4 -14400
 	add
 	stloc.2
 	ldloc.0
@@ -3896,12 +3896,12 @@ L_1033364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033448: 0x1033448: lw    v1, 8(s0)
+// 0x01033458: 0x1033458: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3910,18 +3910,18 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103344c: 0x103344c: addu  s1, v0, zero
+// 0x0103345c: 0x103345c: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01033450: 0x1033450: addiu v0, zero, 1
+// 0x01033460: 0x1033460: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01033454: 0x1033454: bne   v1, v0, 0x1033480 sll   zero, zero, 0
+// 0x01033464: 0x1033464: bne   v1, v0, 0x1033490 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1033480
+	bne.un L_1033490
 // --- basic block ---
-// 0x0103345c: 0x103345c: lw    v0, 12(s0)
+// 0x0103346c: 0x103346c: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3930,26 +3930,26 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033460: 0x1033460: sll   zero, zero, 0
-// 0x01033464: 0x1033464: sll   v0, v0, 2
+// 0x01033470: 0x1033470: sll   zero, zero, 0
+// 0x01033474: 0x1033474: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01033468: 0x1033468: addu  s2, v0, s2
+// 0x01033478: 0x1033478: addu  s2, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0103346c: 0x103346c: lw    v0, 0(s2)
+// 0x0103347c: 0x103347c: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01033470: 0x1033470: sll   zero, zero, 0
-// 0x01033474: 0x1033474: lw    v0, 24(v0)
+// 0x01033480: 0x1033480: sll   zero, zero, 0
+// 0x01033484: 0x1033484: lw    v0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3958,13 +3958,13 @@ L_1033364:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033478: 0x1033478: j	 0x10334a0 addu  a0, s3, zero
+// 0x01033488: 0x1033488: j	 0x10334b0 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-	br L_10334a0
+	br L_10334b0
 // --- basic block ---
-L_1033480:
-// 0x01033480: 0x1033480: lw    v0, 12(s0)
+L_1033490:
+// 0x01033490: 0x1033490: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3973,28 +3973,28 @@ L_1033480:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033484: 0x1033484: addu  a0, s3, zero
+// 0x01033494: 0x1033494: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01033488: 0x1033488: sll   v0, v0, 2
+// 0x01033498: 0x1033498: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0103348c: 0x103348c: addu  s2, v0, s2
+// 0x0103349c: 0x103349c: addu  s2, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x01033490: 0x1033490: lw    v0, 0(s2)
+// 0x010334a0: 0x10334a0: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01033494: 0x1033494: sll   zero, zero, 0
-// 0x01033498: 0x1033498: lw    v0, 28(v0)
+// 0x010334a4: 0x10334a4: sll   zero, zero, 0
+// 0x010334a8: 0x10334a8: lw    v0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4003,9 +4003,9 @@ L_1033480:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103349c: 0x103349c: sll   zero, zero, 0
-L_10334a0:
-// 0x010334a0: 0x10334a0: jalr  v0 sll   zero, zero, 0
+// 0x010334ac: 0x10334ac: sll   zero, zero, 0
+L_10334b0:
+// 0x010334b0: 0x10334b0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4017,10 +4017,10 @@ L_10334a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010334a8: 0x10334a8: addu  a1, v0, zero
+// 0x010334b8: 0x10334b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010334ac: 0x10334ac: jal   0x109df10 addu  a0, s1, zero
+// 0x010334bc: 0x10334bc: jal   0x109e558 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4028,14 +4028,14 @@ L_10334a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10334b4:
-// 0x010334b4: 0x10334b4: lw    ra, 260(sp)
-// 0x010334b8: 0x10334b8: lw    s5, 256(sp)
+L_10334c4:
+// 0x010334c4: 0x10334c4: lw    ra, 260(sp)
+// 0x010334c8: 0x10334c8: lw    s5, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4044,7 +4044,7 @@ L_10334b4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010334bc: 0x10334bc: lw    s4, 252(sp)
+// 0x010334cc: 0x10334cc: lw    s4, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4053,7 +4053,7 @@ L_10334b4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010334c0: 0x10334c0: lw    s3, 248(sp)
+// 0x010334d0: 0x10334d0: lw    s3, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4062,7 +4062,7 @@ L_10334b4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010334c4: 0x10334c4: lw    s2, 244(sp)
+// 0x010334d4: 0x10334d4: lw    s2, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4071,7 +4071,7 @@ L_10334b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010334c8: 0x10334c8: lw    s1, 240(sp)
+// 0x010334d8: 0x10334d8: lw    s1, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4080,7 +4080,7 @@ L_10334b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010334cc: 0x10334cc: lw    s0, 236(sp)
+// 0x010334dc: 0x10334dc: lw    s0, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4089,7 +4089,7 @@ L_10334b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010334d0: 0x10334d0: jr    ra addiu sp, sp, 264
+// 0x010334e0: 0x10334e0: jr    ra addiu sp, sp, 264
 	ldloc.0
 	ldc.i4 264
 	add
@@ -4101,7 +4101,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 show_alert_dialog_10334d8(int32,int32,int32,int32,int32)
+.method public static int32 show_alert_dialog_10334e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s4,int32 s2,int32 s3,int32 s5,int32 ra)
@@ -4154,15 +4154,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010334d8: 0x10334d8: lui   v0, 0x60000
+// 0x010334e8: 0x10334e8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010334dc: 0x10334dc: addiu v1, v0, -17984
+// 0x010334ec: 0x10334ec: addiu v1, v0, -17520
 	ldloc 5
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 7
-// 0x010334e0: 0x10334e0: lw    a0, 16(v1)
+// 0x010334f0: 0x10334f0: lw    a0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4171,10 +4171,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010334e4: 0x10334e4: lui   v1, 0x0
+// 0x010334f4: 0x10334f4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010334e8: 0x10334e8: lw    v1, 576(v1)
+// 0x010334f8: 0x10334f8: lw    v1, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4183,12 +4183,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010334ec: 0x10334ec: addiu sp, sp, -272
+// 0x010334fc: 0x10334fc: addiu sp, sp, -272
 	ldloc.0
 	ldc.i4 -272
 	add
 	stloc.0
-// 0x010334f0: 0x10334f0: sw    s2, 252(sp)
+// 0x01033500: 0x1033500: sw    s2, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4197,8 +4197,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010334f4: 0x10334f4: sw    ra, 268(sp)
-// 0x010334f8: 0x10334f8: sw    s5, 264(sp)
+// 0x01033504: 0x1033504: sw    ra, 268(sp)
+// 0x01033508: 0x1033508: sw    s5, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4207,7 +4207,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010334fc: 0x10334fc: sw    s4, 260(sp)
+// 0x0103350c: 0x103350c: sw    s4, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01033500: 0x1033500: sw    s3, 256(sp)
+// 0x01033510: 0x1033510: sw    s3, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4225,7 +4225,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01033504: 0x1033504: sw    s1, 248(sp)
+// 0x01033514: 0x1033514: sw    s1, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4234,7 +4234,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01033508: 0x1033508: sw    s0, 244(sp)
+// 0x01033518: 0x1033518: sw    s0, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4243,32 +4243,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103350c: 0x103350c: lw    s2, -17984(v0)
+// 0x0103351c: 0x103351c: lw    s2, -17520(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc 11
-// 0x01033510: 0x1033510: beq   a0, v1, 0x1033528 lui   s1, 0x60000
+// 0x01033520: 0x1033520: beq   a0, v1, 0x1033538 lui   s1, 0x60000
 	ldloc.1
 	ldloc 7
 	ldc.i4 393216
 	stloc 8
-	beq  L_1033528
+	beq  L_1033538
 // --- basic block ---
-// 0x01033518: 0x1033518: bltz  a0, 0x103352c addiu s1, s1, -17984
+// 0x01033528: 0x1033528: bltz  a0, 0x103353c addiu s1, s1, -17520
 	ldloc.1
 	ldloc 8
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 8
 	ldc.i4.s 0
-	blt L_103352c
+	blt L_103353c
 // --- basic block ---
-// 0x01033520: 0x1033520: jal   0x100b164 lui   s1, 0x60000
+// 0x01033530: 0x1033530: jal   0x100b174 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
 	ldloc.0
@@ -4276,19 +4276,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1033528:
-// 0x01033528: 0x1033528: addiu s1, s1, -17984
+L_1033538:
+// 0x01033538: 0x1033538: addiu s1, s1, -17520
 	ldloc 8
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 8
-L_103352c:
-// 0x0103352c: 0x103352c: lw    v0, 12(s1)
+L_103353c:
+// 0x0103353c: 0x103353c: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4297,35 +4297,35 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033530: 0x1033530: lui   s4, 0x60000
+// 0x01033540: 0x1033540: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01033534: 0x1033534: sll   v0, v0, 2
+// 0x01033544: 0x1033544: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01033538: 0x1033538: addiu s4, s4, -18068
+// 0x01033548: 0x1033548: addiu s4, s4, -17604
 	ldloc 10
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 10
-// 0x0103353c: 0x103353c: addu  v0, v0, s4
+// 0x0103354c: 0x103354c: addu  v0, v0, s4
 	ldloc 5
 	ldloc 10
 	add
 	stloc 5
-// 0x01033540: 0x1033540: lw    v0, 0(v0)
+// 0x01033550: 0x1033550: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01033544: 0x1033544: addu  a0, s2, zero
+// 0x01033554: 0x1033554: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01033548: 0x1033548: lw    v0, 44(v0)
+// 0x01033558: 0x1033558: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4334,8 +4334,8 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103354c: 0x103354c: sll   zero, zero, 0
-// 0x01033550: 0x1033550: jalr  v0 addiu s3, sp, 32
+// 0x0103355c: 0x103355c: sll   zero, zero, 0
+// 0x01033560: 0x1033560: jalr  v0 addiu s3, sp, 32
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
@@ -4351,7 +4351,7 @@ L_103352c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033558: 0x1033558: jal   0x101cd60 addu  a0, v0, zero
+// 0x01033568: 0x1033568: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4359,15 +4359,15 @@ L_103352c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033560: 0x1033560: addu  a1, v0, zero
+// 0x01033570: 0x1033570: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01033564: 0x1033564: jal   0x1001b68 addu  a0, s3, zero
+// 0x01033574: 0x1033574: jal   0x1001b68 addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
@@ -4377,10 +4377,10 @@ L_103352c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103356c: 0x103356c: addiu v0, zero, -1
+// 0x0103357c: 0x103357c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01033570: 0x1033570: sw    v0, 16(sp)
+// 0x01033580: 0x1033580: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4389,35 +4389,35 @@ L_103352c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01033574: 0x1033574: lui   a0, 0x10000
+// 0x01033584: 0x1033584: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01033578: 0x1033578: lui   v0, 0x18000000
+// 0x01033588: 0x1033588: lui   v0, 0x18000000
 	ldc.i4 402653184
 	stloc 5
-// 0x0103357c: 0x103357c: addiu a0, a0, -14452
+// 0x0103358c: 0x103358c: addiu a0, a0, -14456
 	ldloc.1
-	ldc.i4 -14452
+	ldc.i4 -14456
 	add
 	stloc.1
-// 0x01033580: 0x1033580: addu  a1, s3, zero
+// 0x01033590: 0x1033590: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01033584: 0x1033584: addu  a2, zero, zero
+// 0x01033594: 0x1033594: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01033588: 0x1033588: addiu a3, zero, -2
+// 0x01033598: 0x1033598: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x0103358c: 0x103358c: ori   v0, v0, 2048
+// 0x0103359c: 0x103359c: ori   v0, v0, 2048
 	ldloc 5
 	ldc.i4 2048
 	or
 	stloc 5
-// 0x01033590: 0x1033590: lui   s5, 0x60000
+// 0x010335a0: 0x10335a0: lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x01033594: 0x1033594: sw    v0, 24(sp)
+// 0x010335a4: 0x10335a4: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4426,7 +4426,7 @@ L_103352c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01033598: 0x1033598: jal   0x109e4f0 sw    zero, 20(sp)
+// 0x010335a8: 0x10335a8: jal   0x109eb38 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4440,41 +4440,41 @@ L_103352c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010335a0: 0x10335a0: lui   a0, 0x20000
+// 0x010335b0: 0x10335b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010335a4: 0x10335a4: addiu a3, zero, -1
+// 0x010335b4: 0x10335b4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010335a8: 0x10335a8: addiu a0, a0, -1100
+// 0x010335b8: 0x10335b8: addiu a0, a0, -636
 	ldloc.1
-	ldc.i4 -1100
+	ldc.i4 -636
 	add
 	stloc.1
-// 0x010335ac: 0x10335ac: addu  a1, zero, zero
+// 0x010335bc: 0x10335bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010335b0: 0x10335b0: addiu a2, zero, -1
+// 0x010335c0: 0x10335c0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010335b4: 0x10335b4: sw    v0, -18076(s5)
+// 0x010335c4: 0x10335c4: sw    v0, -17612(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldloc 5
 	stelem.i4
-// 0x010335b8: 0x10335b8: addiu v0, zero, 128
+// 0x010335c8: 0x10335c8: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x010335bc: 0x10335bc: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010335cc: 0x10335cc: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4488,49 +4488,49 @@ L_103352c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010335c4: 0x10335c4: addu  a0, v0, zero
+// 0x010335d4: 0x10335d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010335c8: 0x10335c8: addu  a1, zero, zero
+// 0x010335d8: 0x10335d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010335cc: 0x10335cc: addu  a2, zero, zero
+// 0x010335dc: 0x10335dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010335d0: 0x10335d0: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010335e0: 0x10335e0: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010335d8: 0x10335d8: lui   a0, 0x0
+// 0x010335e8: 0x10335e8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010335dc: 0x10335dc: addiu a3, zero, 1
+// 0x010335ec: 0x10335ec: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010335e0: 0x10335e0: addiu a0, a0, 32124
+// 0x010335f0: 0x10335f0: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x010335e4: 0x10335e4: addu  a1, zero, zero
+// 0x010335f4: 0x10335f4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010335e8: 0x10335e8: addiu a2, zero, -2
+// 0x010335f8: 0x10335f8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010335ec: 0x10335ec: addiu v0, zero, 136
+// 0x010335fc: 0x10335fc: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010335f0: 0x10335f0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01033600: 0x1033600: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4544,21 +4544,21 @@ L_103352c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010335f8: 0x10335f8: addu  a0, v0, zero
+// 0x01033608: 0x1033608: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010335fc: 0x10335fc: addu  a2, zero, zero
+// 0x0103360c: 0x103360c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01033600: 0x1033600: addu  a1, zero, zero
+// 0x01033610: 0x1033610: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01033604: 0x1033604: jal   0x1098fe0 sw    v0, 232(sp)
+// 0x01033614: 0x1033614: jal   0x1099628 sw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4570,9 +4570,9 @@ L_103352c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0103360c: 0x103360c: lw    v0, 232(sp)
+// 0x0103361c: 0x103361c: lw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4581,25 +4581,25 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033610: 0x1033610: addu  a0, s0, zero
+// 0x01033620: 0x1033620: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01033614: 0x1033614: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01033624: 0x1033624: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103361c: 0x103361c: lui   a0, 0x10000
+// 0x0103362c: 0x103362c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01033620: 0x1033620: jal   0x101cd60 addiu a0, a0, -14412
+// 0x01033630: 0x1033630: jal   0x101cd70 addiu a0, a0, -14416
 	ldloc.1
-	ldc.i4 -14412
+	ldc.i4 -14416
 	add
 	stloc.1
 	ldloc.0
@@ -4607,12 +4607,12 @@ L_103352c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033628: 0x1033628: lw    a3, 4(s1)
+// 0x01033638: 0x1033638: lw    a3, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4621,7 +4621,7 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103362c: 0x103362c: sw    v0, 236(sp)
+// 0x0103363c: 0x103363c: sw    v0, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4630,7 +4630,7 @@ L_103352c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01033630: 0x1033630: jal   0x1007d6c sw    a3, 232(sp)
+// 0x01033640: 0x1033640: jal   0x1007d7c sw    a3, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4639,10 +4639,10 @@ L_103352c:
 	add
 	ldloc 4
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x01033638: 0x1033638: jal   0x101cd60 addu  a0, v0, zero
+// 0x01033648: 0x1033648: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4650,12 +4650,12 @@ L_103352c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033640: 0x1033640: lw    a2, 236(sp)
+// 0x01033650: 0x1033650: lw    a2, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4664,7 +4664,7 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01033644: 0x1033644: lw    a3, 232(sp)
+// 0x01033654: 0x1033654: lw    a3, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4673,18 +4673,18 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01033648: 0x1033648: lui   a1, 0x10000
+// 0x01033658: 0x1033658: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103364c: 0x103364c: addiu a1, a1, -14408
+// 0x0103365c: 0x103365c: addiu a1, a1, -14412
 	ldloc.2
-	ldc.i4 -14408
+	ldc.i4 -14412
 	add
 	stloc.2
-// 0x01033650: 0x1033650: addu  a0, s3, zero
+// 0x01033660: 0x1033660: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x01033654: 0x1033654: jal   0x1000f64 sw    v0, 16(sp)
+// 0x01033664: 0x1033664: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4703,21 +4703,21 @@ L_103352c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103365c: 0x103365c: lui   a0, 0x10000
+// 0x0103366c: 0x103366c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01033660: 0x1033660: addu  a3, zero, zero
+// 0x01033670: 0x1033670: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01033664: 0x1033664: addu  a1, s3, zero
+// 0x01033674: 0x1033674: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01033668: 0x1033668: addiu a0, a0, -25532
+// 0x01033678: 0x1033678: addiu a0, a0, -25532
 	ldloc.1
 	ldc.i4 -25532
 	add
 	stloc.1
-// 0x0103366c: 0x103366c: jal   0x1098d10 addiu a2, zero, 14
+// 0x0103367c: 0x103367c: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -4725,26 +4725,26 @@ L_103352c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033674: 0x1033674: lui   a1, 0x0
+// 0x01033684: 0x1033684: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01033678: 0x1033678: addiu a1, a1, 23008
+// 0x01033688: 0x1033688: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0103367c: 0x103367c: addu  a2, a1, zero
+// 0x0103368c: 0x103368c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01033680: 0x1033680: addu  a0, v0, zero
+// 0x01033690: 0x1033690: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01033684: 0x1033684: jal   0x1098fe0 sw    v0, 232(sp)
+// 0x01033694: 0x1033694: jal   0x1099628 sw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4756,9 +4756,9 @@ L_103352c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0103368c: 0x103368c: lw    v0, 232(sp)
+// 0x0103369c: 0x103369c: lw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4767,39 +4767,39 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033690: 0x1033690: addu  a0, s0, zero
+// 0x010336a0: 0x10336a0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01033694: 0x1033694: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010336a4: 0x10336a4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103369c: 0x103369c: lw    a0, -18076(s5)
+// 0x010336ac: 0x10336ac: lw    a0, -17612(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc.1
-// 0x010336a0: 0x10336a0: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010336b0: 0x10336b0: jal   0x109950c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010336a8: 0x10336a8: lw    v1, 8(s1)
+// 0x010336b8: 0x10336b8: lw    v1, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4808,15 +4808,15 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010336ac: 0x10336ac: addiu v0, zero, 1
+// 0x010336bc: 0x10336bc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010336b0: 0x10336b0: bne   v1, v0, 0x10336dc sll   zero, zero, 0
+// 0x010336c0: 0x10336c0: bne   v1, v0, 0x10336ec sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10336dc
+	bne.un L_10336ec
 // --- basic block ---
-// 0x010336b8: 0x10336b8: lw    v0, 12(s1)
+// 0x010336c8: 0x10336c8: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4825,26 +4825,26 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010336bc: 0x10336bc: sll   zero, zero, 0
-// 0x010336c0: 0x10336c0: sll   v0, v0, 2
+// 0x010336cc: 0x10336cc: sll   zero, zero, 0
+// 0x010336d0: 0x10336d0: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010336c4: 0x10336c4: addu  s4, v0, s4
+// 0x010336d4: 0x10336d4: addu  s4, v0, s4
 	ldloc 5
 	ldloc 10
 	add
 	stloc 10
-// 0x010336c8: 0x10336c8: lw    v0, 0(s4)
+// 0x010336d8: 0x10336d8: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010336cc: 0x10336cc: sll   zero, zero, 0
-// 0x010336d0: 0x10336d0: lw    v0, 24(v0)
+// 0x010336dc: 0x10336dc: sll   zero, zero, 0
+// 0x010336e0: 0x10336e0: lw    v0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4853,13 +4853,13 @@ L_103352c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010336d4: 0x10336d4: j	 0x10336fc addu  a0, s2, zero
+// 0x010336e4: 0x10336e4: j	 0x103370c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-	br L_10336fc
+	br L_103370c
 // --- basic block ---
-L_10336dc:
-// 0x010336dc: 0x10336dc: lw    v0, 12(s1)
+L_10336ec:
+// 0x010336ec: 0x10336ec: lw    v0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4868,28 +4868,28 @@ L_10336dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010336e0: 0x10336e0: addu  a0, s2, zero
+// 0x010336f0: 0x10336f0: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010336e4: 0x10336e4: sll   v0, v0, 2
+// 0x010336f4: 0x10336f4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010336e8: 0x10336e8: addu  s4, v0, s4
+// 0x010336f8: 0x10336f8: addu  s4, v0, s4
 	ldloc 5
 	ldloc 10
 	add
 	stloc 10
-// 0x010336ec: 0x10336ec: lw    v0, 0(s4)
+// 0x010336fc: 0x10336fc: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010336f0: 0x10336f0: sll   zero, zero, 0
-// 0x010336f4: 0x10336f4: lw    v0, 28(v0)
+// 0x01033700: 0x1033700: sll   zero, zero, 0
+// 0x01033704: 0x1033704: lw    v0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4898,9 +4898,9 @@ L_10336dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010336f8: 0x10336f8: sll   zero, zero, 0
-L_10336fc:
-// 0x010336fc: 0x10336fc: jalr  v0 sll   zero, zero, 0
+// 0x01033708: 0x1033708: sll   zero, zero, 0
+L_103370c:
+// 0x0103370c: 0x103370c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4912,18 +4912,18 @@ L_10336fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033704: 0x1033704: lui   a0, 0x10000
+// 0x01033714: 0x1033714: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01033708: 0x1033708: addiu a0, a0, -14396
+// 0x01033718: 0x1033718: addiu a0, a0, -14400
 	ldloc.1
-	ldc.i4 -14396
+	ldc.i4 -14400
 	add
 	stloc.1
-// 0x0103370c: 0x103370c: addu  a1, v0, zero
+// 0x0103371c: 0x103371c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01033710: 0x1033710: jal   0x109e13c addiu a2, zero, 2
+// 0x01033720: 0x1033720: jal   0x109e784 addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -4931,63 +4931,63 @@ L_10336fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033718: 0x1033718: addu  a1, v0, zero
+// 0x01033728: 0x1033728: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103371c: 0x103371c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0103372c: 0x103372c: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033724: 0x1033724: lui   v0, 0x60000
+// 0x01033734: 0x1033734: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01033728: 0x1033728: lw    v1, -17972(v0)
+// 0x01033738: 0x1033738: lw    v1, -17508(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4493
+	ldc.i4 -4377
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103372c: 0x103372c: lui   v0, 0x60000
+// 0x0103373c: 0x103373c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01033730: 0x1033730: sll   v1, v1, 2
+// 0x01033740: 0x1033740: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01033734: 0x1033734: addiu v0, v0, -18068
+// 0x01033744: 0x1033744: addiu v0, v0, -17604
 	ldloc 5
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 5
-// 0x01033738: 0x1033738: addu  v0, v1, v0
+// 0x01033748: 0x1033748: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0103373c: 0x103373c: lw    v0, 0(v0)
+// 0x0103374c: 0x103374c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01033740: 0x1033740: sll   zero, zero, 0
-// 0x01033744: 0x1033744: lw    v0, 48(v0)
+// 0x01033750: 0x1033750: sll   zero, zero, 0
+// 0x01033754: 0x1033754: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4996,8 +4996,8 @@ L_10336fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033748: 0x1033748: sll   zero, zero, 0
-// 0x0103374c: 0x103374c: jalr  v0 addu  a0, s2, zero
+// 0x01033758: 0x1033758: sll   zero, zero, 0
+// 0x0103375c: 0x103375c: jalr  v0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
@@ -5011,25 +5011,25 @@ L_10336fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033754: 0x1033754: beq   v0, zero, 0x10337c4 lui   s0, 0x60000
+// 0x01033764: 0x1033764: beq   v0, zero, 0x10337d4 lui   s0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 9
-	brfalse L_10337c4
+	brfalse L_10337d4
 // --- basic block ---
-// 0x0103375c: 0x103375c: lw    v0, -18076(s0)
+// 0x0103376c: 0x103376c: lw    v0, -17612(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033760: 0x1033760: lui   a1, 0x1030000
+// 0x01033770: 0x1033770: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x01033764: 0x1033764: lw    a0, 4(v0)
+// 0x01033774: 0x1033774: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5038,28 +5038,28 @@ L_10336fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033768: 0x1033768: jal   0x1099174 addiu a1, a1, 14328
+// 0x01033778: 0x1033778: jal   0x10997bc addiu a1, a1, 14344
 	ldloc.2
-	ldc.i4 14328
+	ldc.i4 14344
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01033770: 0x1033770: lw    v0, -18076(s0)
+// 0x01033780: 0x1033780: lw    v0, -17612(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033774: 0x1033774: lui   a0, 0x10000
+// 0x01033784: 0x1033784: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01033778: 0x1033778: lw    s1, 4(v0)
+// 0x01033788: 0x1033788: lw    s1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5068,9 +5068,9 @@ L_10336fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103377c: 0x103377c: jal   0x101cd60 addiu a0, a0, -14384
+// 0x0103378c: 0x103378c: jal   0x101cd70 addiu a0, a0, -14388
 	ldloc.1
-	ldc.i4 -14384
+	ldc.i4 -14388
 	add
 	stloc.1
 	ldloc.0
@@ -5078,15 +5078,15 @@ L_10336fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033784: 0x1033784: addu  a1, v0, zero
+// 0x01033794: 0x1033794: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01033788: 0x1033788: jal   0x109b434 addu  a0, s1, zero
+// 0x01033798: 0x1033798: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5094,24 +5094,24 @@ L_10336fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033790: 0x1033790: lw    v0, -18076(s0)
+// 0x010337a0: 0x10337a0: lw    v0, -17612(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033794: 0x1033794: lui   a0, 0x10000
+// 0x010337a4: 0x10337a4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01033798: 0x1033798: lw    s1, 4(v0)
+// 0x010337a8: 0x10337a8: lw    s1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5120,9 +5120,9 @@ L_10336fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103379c: 0x103379c: jal   0x101cd60 addiu a0, a0, -14440
+// 0x010337ac: 0x10337ac: jal   0x101cd70 addiu a0, a0, -14444
 	ldloc.1
-	ldc.i4 -14440
+	ldc.i4 -14444
 	add
 	stloc.1
 	ldloc.0
@@ -5130,15 +5130,15 @@ L_10336fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010337a4: 0x10337a4: addu  a1, v0, zero
+// 0x010337b4: 0x10337b4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010337a8: 0x10337a8: jal   0x109b50c addu  a0, s1, zero
+// 0x010337b8: 0x10337b8: jal   0x109bb54 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5146,24 +5146,24 @@ L_10336fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010337b0: 0x10337b0: lw    v0, -18076(s0)
+// 0x010337c0: 0x10337c0: lw    v0, -17612(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc 5
-// 0x010337b4: 0x10337b4: lui   a1, 0x1030000
+// 0x010337c4: 0x10337c4: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x010337b8: 0x10337b8: lw    a0, 4(v0)
+// 0x010337c8: 0x10337c8: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5172,25 +5172,25 @@ L_10336fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010337bc: 0x10337bc: jal   0x109917c addiu a1, a1, 12772
+// 0x010337cc: 0x10337cc: jal   0x10997c4 addiu a1, a1, 12788
 	ldloc.2
-	ldc.i4 12772
+	ldc.i4 12788
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_right_softkey_callback_109917c(int32,int32)
+	call void Cibyl114::ssd_widget_set_right_softkey_callback_10997c4(int32,int32)
 // --- basic block ---
-L_10337c4:
-// 0x010337c4: 0x10337c4: lui   a0, 0x10000
+L_10337d4:
+// 0x010337d4: 0x10337d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010337c8: 0x10337c8: addiu a0, a0, -14452
+// 0x010337d8: 0x10337d8: addiu a0, a0, -14456
 	ldloc.1
-	ldc.i4 -14452
+	ldc.i4 -14456
 	add
 	stloc.1
-// 0x010337cc: 0x10337cc: jal   0x1095eec addu  a1, zero, zero
+// 0x010337dc: 0x10337dc: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5198,13 +5198,13 @@ L_10337c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010337d4: 0x10337d4: lw    ra, 268(sp)
-// 0x010337d8: 0x10337d8: lw    s5, 264(sp)
+// 0x010337e4: 0x10337e4: lw    ra, 268(sp)
+// 0x010337e8: 0x10337e8: lw    s5, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5213,7 +5213,7 @@ L_10337c4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010337dc: 0x10337dc: lw    s4, 260(sp)
+// 0x010337ec: 0x10337ec: lw    s4, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5222,7 +5222,7 @@ L_10337c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010337e0: 0x10337e0: lw    s3, 256(sp)
+// 0x010337f0: 0x10337f0: lw    s3, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ L_10337c4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010337e4: 0x10337e4: lw    s2, 252(sp)
+// 0x010337f4: 0x10337f4: lw    s2, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5240,7 +5240,7 @@ L_10337c4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010337e8: 0x10337e8: lw    s1, 248(sp)
+// 0x010337f8: 0x10337f8: lw    s1, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5249,7 +5249,7 @@ L_10337c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010337ec: 0x10337ec: lw    s0, 244(sp)
+// 0x010337fc: 0x10337fc: lw    s0, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5258,7 +5258,7 @@ L_10337c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010337f0: 0x10337f0: jr    ra addiu sp, sp, 272
+// 0x01033800: 0x1033800: jr    ra addiu sp, sp, 272
 	ldloc.0
 	ldc.i4 272
 	add
@@ -5270,7 +5270,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_irrelevant_10337f8(int32,int32,int32,int32,int32)
+.method public static int32 report_irrelevant_1033808(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5311,12 +5311,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010337f8: 0x10337f8: addiu sp, sp, -272
+// 0x01033808: 0x1033808: addiu sp, sp, -272
 	ldloc.0
 	ldc.i4 -272
 	add
 	stloc.0
-// 0x010337fc: 0x10337fc: sw    s0, 260(sp)
+// 0x0103380c: 0x103380c: sw    s0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5325,19 +5325,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01033800: 0x1033800: lui   s0, 0x60000
+// 0x01033810: 0x1033810: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01033804: 0x1033804: lw    v0, -17984(s0)
+// 0x01033814: 0x1033814: lw    v0, -17520(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033808: 0x1033808: sw    s1, 264(sp)
+// 0x01033818: 0x1033818: sw    s1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5346,15 +5346,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103380c: 0x103380c: addiu s1, zero, -1
+// 0x0103381c: 0x103381c: addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 9
-// 0x01033810: 0x1033810: beq   v0, s1, 0x10338fc sw    ra, 268(sp)
+// 0x01033820: 0x1033820: beq   v0, s1, 0x103390c sw    ra, 268(sp)
 	ldloc 5
 	ldloc 9
-	beq  L_10338fc
+	beq  L_103390c
 // --- basic block ---
-// 0x01033818: 0x1033818: jal   0x1000910 addiu a0, zero, 20
+// 0x01033828: 0x1033828: jal   0x1000910 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -5367,20 +5367,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033820: 0x1033820: addu  a0, v0, zero
+// 0x01033830: 0x1033830: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01033824: 0x1033824: addiu a1, sp, 28
+// 0x01033834: 0x1033834: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x01033828: 0x1033828: addiu a2, sp, 24
+// 0x01033838: 0x1033838: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0103382c: 0x103382c: jal   0x1029da8 sw    v0, 248(sp)
+// 0x0103383c: 0x103383c: jal   0x1029db8 sw    v0, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5394,12 +5394,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033834: 0x1033834: lw    a3, 248(sp)
+// 0x01033844: 0x1033844: lw    a3, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5408,27 +5408,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01033838: 0x1033838: bne   v0, s1, 0x103385c lui   a0, 0x10000
+// 0x01033848: 0x1033848: bne   v0, s1, 0x103386c lui   a0, 0x10000
 	ldloc 5
 	ldloc 9
 	ldc.i4 65536
 	stloc.1
-	bne.un L_103385c
+	bne.un L_103386c
 // --- basic block ---
-// 0x01033840: 0x1033840: lui   a0, 0x0
+// 0x01033850: 0x1033850: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01033844: 0x1033844: lui   a1, 0x10000
+// 0x01033854: 0x1033854: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01033848: 0x1033848: addiu a0, a0, 30152
+// 0x01033858: 0x1033858: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x0103384c: 0x103384c: jal   0x104c148 addiu a1, a1, -14372
+// 0x0103385c: 0x103385c: jal   0x104c158 addiu a1, a1, -14376
 	ldloc.2
-	ldc.i4 -14372
+	ldc.i4 -14376
 	add
 	stloc.2
 	ldloc.0
@@ -5436,31 +5436,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033854: 0x1033854: j	 0x1033900 addu  v0, zero, zero
+// 0x01033864: 0x1033864: j	 0x1033910 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1033900
+	br L_1033910
 // --- basic block ---
-L_103385c:
-// 0x0103385c: 0x103385c: lui   a1, 0x20000
+L_103386c:
+// 0x0103386c: 0x103386c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01033860: 0x1033860: addiu a0, a0, -23972
+// 0x01033870: 0x1033870: addiu a0, a0, -23972
 	ldloc.1
 	ldc.i4 -23972
 	add
 	stloc.1
-// 0x01033864: 0x1033864: addiu a1, a1, -28932
+// 0x01033874: 0x1033874: addiu a1, a1, -28468
 	ldloc.2
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.2
-// 0x01033868: 0x1033868: jal   0x101f638 addu  a2, zero, zero
+// 0x01033878: 0x1033878: jal   0x101f648 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5468,17 +5468,17 @@ L_103385c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_gps_position_101f638(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_gps_position_101f648(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033870: 0x1033870: addiu v0, s0, -17984
+// 0x01033880: 0x1033880: addiu v0, s0, -17520
 	ldloc 8
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 5
-// 0x01033874: 0x1033874: lw    v1, 12(v0)
+// 0x01033884: 0x1033884: lw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5487,41 +5487,41 @@ L_103385c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033878: 0x1033878: lui   v0, 0x60000
+// 0x01033888: 0x1033888: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103387c: 0x103387c: sll   v1, v1, 2
+// 0x0103388c: 0x103388c: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01033880: 0x1033880: addiu v0, v0, -18068
+// 0x01033890: 0x1033890: addiu v0, v0, -17604
 	ldloc 5
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 5
-// 0x01033884: 0x1033884: addu  v0, v1, v0
+// 0x01033894: 0x1033894: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01033888: 0x1033888: lw    v0, 0(v0)
+// 0x01033898: 0x1033898: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103388c: 0x103388c: lw    a0, -17984(s0)
+// 0x0103389c: 0x103389c: lw    a0, -17520(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033890: 0x1033890: lw    v0, 44(v0)
+// 0x010338a0: 0x10338a0: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5530,8 +5530,8 @@ L_103385c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033894: 0x1033894: sll   zero, zero, 0
-// 0x01033898: 0x1033898: jalr  v0 sll   zero, zero, 0
+// 0x010338a4: 0x10338a4: sll   zero, zero, 0
+// 0x010338a8: 0x10338a8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5543,11 +5543,11 @@ L_103385c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010338a0: 0x10338a0: beq   v0, zero, 0x10338fc sll   zero, zero, 0
+// 0x010338b0: 0x10338b0: beq   v0, zero, 0x103390c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10338fc
+	brfalse L_103390c
 // --- basic block ---
-// 0x010338a8: 0x10338a8: jal   0x101cd60 addu  a0, v0, zero
+// 0x010338b8: 0x10338b8: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5555,25 +5555,25 @@ L_103385c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010338b0: 0x10338b0: lui   a0, 0x10000
+// 0x010338c0: 0x10338c0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010338b4: 0x10338b4: addiu a0, a0, -14344
+// 0x010338c4: 0x10338c4: addiu a0, a0, -14348
 	ldloc.1
-	ldc.i4 -14344
+	ldc.i4 -14348
 	add
 	stloc.1
-// 0x010338b8: 0x10338b8: addiu s0, sp, 48
+// 0x010338c8: 0x10338c8: addiu s0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 8
-// 0x010338bc: 0x10338bc: jal   0x101cd60 sw    v0, 248(sp)
+// 0x010338cc: 0x10338cc: jal   0x101cd70 sw    v0, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5587,12 +5587,12 @@ L_103385c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010338c4: 0x10338c4: lw    a3, 248(sp)
+// 0x010338d4: 0x10338d4: lw    a3, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5601,18 +5601,18 @@ L_103385c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010338c8: 0x10338c8: lui   a1, 0x10000
+// 0x010338d8: 0x10338d8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010338cc: 0x10338cc: addiu a1, a1, -25344
+// 0x010338dc: 0x10338dc: addiu a1, a1, -25344
 	ldloc.2
 	ldc.i4 -25344
 	add
 	stloc.2
-// 0x010338d0: 0x10338d0: addu  a2, v0, zero
+// 0x010338e0: 0x10338e0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010338d4: 0x10338d4: jal   0x1000f64 addu  a0, s0, zero
+// 0x010338e4: 0x10338e4: jal   0x1000f64 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5625,29 +5625,29 @@ L_103385c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010338dc: 0x10338dc: lui   a0, 0x10000
+// 0x010338ec: 0x10338ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010338e0: 0x10338e0: lui   a3, 0x1030000
+// 0x010338f0: 0x10338f0: lui   a3, 0x1030000
 	ldc.i4 16973824
 	stloc 4
-// 0x010338e4: 0x10338e4: addiu a0, a0, -14284
+// 0x010338f4: 0x10338f4: addiu a0, a0, -14288
 	ldloc.1
-	ldc.i4 -14284
+	ldc.i4 -14288
 	add
 	stloc.1
-// 0x010338e8: 0x10338e8: addu  a1, s0, zero
+// 0x010338f8: 0x10338f8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010338ec: 0x10338ec: addiu a3, a3, 14612
+// 0x010338fc: 0x10338fc: addiu a3, a3, 14628
 	ldloc 4
-	ldc.i4 14612
+	ldc.i4 14628
 	add
 	stloc 4
-// 0x010338f0: 0x10338f0: addu  a2, zero, zero
+// 0x01033900: 0x1033900: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010338f4: 0x10338f4: jal   0x104c320 sw    zero, 16(sp)
+// 0x01033904: 0x1033904: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5661,18 +5661,18 @@ L_103385c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10338fc:
-// 0x010338fc: 0x10338fc: addiu v0, zero, 1
+L_103390c:
+// 0x0103390c: 0x103390c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1033900:
-// 0x01033900: 0x1033900: lw    ra, 268(sp)
-// 0x01033904: 0x1033904: lw    s1, 264(sp)
+L_1033910:
+// 0x01033910: 0x1033910: lw    ra, 268(sp)
+// 0x01033914: 0x1033914: lw    s1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5681,7 +5681,7 @@ L_1033900:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033908: 0x1033908: lw    s0, 260(sp)
+// 0x01033918: 0x1033918: lw    s0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5690,7 +5690,7 @@ L_1033900:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103390c: 0x103390c: jr    ra addiu sp, sp, 272
+// 0x0103391c: 0x103391c: jr    ra addiu sp, sp, 272
 	ldloc.0
 	ldc.i4 272
 	add
@@ -5702,7 +5702,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 delete_callback_1033914(int32,int32,int32,int32,int32)
+.method public static int32 delete_callback_1033924(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5740,16 +5740,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033914: 0x1033914: addiu sp, sp, -24
+// 0x01033924: 0x1033924: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01033918: 0x1033918: addiu v0, zero, 3
+// 0x01033928: 0x1033928: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0103391c: 0x103391c: sw    ra, 20(sp)
-// 0x01033920: 0x1033920: bne   a0, v0, 0x10339a0 sw    s0, 16(sp)
+// 0x0103392c: 0x103392c: sw    ra, 20(sp)
+// 0x01033930: 0x1033930: bne   a0, v0, 0x10339b0 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 7
@@ -5760,17 +5760,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_10339a0
+	bne.un L_10339b0
 // --- basic block ---
-// 0x01033928: 0x1033928: lui   s0, 0x60000
+// 0x01033938: 0x1033938: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103392c: 0x103392c: addiu v0, s0, -17984
+// 0x0103393c: 0x103393c: addiu v0, s0, -17520
 	ldloc 8
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 5
-// 0x01033930: 0x1033930: lw    v1, 12(v0)
+// 0x01033940: 0x1033940: lw    v1, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5779,41 +5779,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01033934: 0x1033934: lui   v0, 0x60000
+// 0x01033944: 0x1033944: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01033938: 0x1033938: sll   v1, v1, 2
+// 0x01033948: 0x1033948: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0103393c: 0x103393c: addiu v0, v0, -18068
+// 0x0103394c: 0x103394c: addiu v0, v0, -17604
 	ldloc 5
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 5
-// 0x01033940: 0x1033940: addu  v0, v1, v0
+// 0x01033950: 0x1033950: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01033944: 0x1033944: lw    v0, 0(v0)
+// 0x01033954: 0x1033954: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01033948: 0x1033948: lw    a0, -17984(s0)
+// 0x01033958: 0x1033958: lw    a0, -17520(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103394c: 0x103394c: lw    v0, 52(v0)
+// 0x0103395c: 0x103395c: lw    v0, 52(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5822,8 +5822,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033950: 0x1033950: sll   zero, zero, 0
-// 0x01033954: 0x1033954: jalr  v0 sll   zero, zero, 0
+// 0x01033960: 0x1033960: sll   zero, zero, 0
+// 0x01033964: 0x1033964: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5835,62 +5835,62 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103395c: 0x103395c: addiu v1, zero, -1
+// 0x0103396c: 0x103396c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01033960: 0x1033960: sw    v1, -17984(s0)
+// 0x01033970: 0x1033970: sw    v1, -17520(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldloc 6
 	stelem.i4
-// 0x01033964: 0x1033964: lui   v1, 0x60000
+// 0x01033974: 0x1033974: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01033968: 0x1033968: sw    zero, -18072(v1)
+// 0x01033978: 0x1033978: sw    zero, -17608(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4518
+	ldc.i4 -4402
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103396c: 0x103396c: lui   v1, 0x60000
+// 0x0103397c: 0x103397c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01033970: 0x1033970: beq   v0, zero, 0x1033990 sw    zero, -17944(v1)
+// 0x01033980: 0x1033980: beq   v0, zero, 0x10339a0 sw    zero, -17480(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4486
+	ldc.i4 -4370
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1033990
+	brfalse L_10339a0
 // --- basic block ---
-// 0x01033978: 0x1033978: lui   a0, 0x10000
+// 0x01033988: 0x1033988: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103397c: 0x103397c: lui   a1, 0x10000
+// 0x0103398c: 0x103398c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01033980: 0x1033980: addiu a0, a0, -14268
+// 0x01033990: 0x1033990: addiu a0, a0, -14272
 	ldloc.1
-	ldc.i4 -14268
+	ldc.i4 -14272
 	add
 	stloc.1
-// 0x01033984: 0x1033984: addiu a1, a1, -14252
+// 0x01033994: 0x1033994: addiu a1, a1, -14256
 	ldloc.2
-	ldc.i4 -14252
+	ldc.i4 -14256
 	add
 	stloc.2
-// 0x01033988: 0x1033988: jal   0x104bfe4 addiu a2, zero, 5
+// 0x01033998: 0x1033998: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -5898,21 +5898,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1033990:
-// 0x01033990: 0x1033990: lui   a0, 0x10000
+L_10339a0:
+// 0x010339a0: 0x10339a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01033994: 0x1033994: addiu a0, a0, -14452
+// 0x010339a4: 0x10339a4: addiu a0, a0, -14456
 	ldloc.1
-	ldc.i4 -14452
+	ldc.i4 -14456
 	add
 	stloc.1
-// 0x01033998: 0x1033998: jal   0x1094884 addu  a1, zero, zero
+// 0x010339a8: 0x10339a8: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5920,14 +5920,14 @@ L_1033990:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10339a0:
-// 0x010339a0: 0x10339a0: lw    ra, 20(sp)
-// 0x010339a4: 0x10339a4: lw    s0, 16(sp)
+L_10339b0:
+// 0x010339b0: 0x10339b0: lw    ra, 20(sp)
+// 0x010339b4: 0x10339b4: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5936,7 +5936,7 @@ L_10339a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010339a8: 0x10339a8: jr    ra addiu sp, sp, 24
+// 0x010339b8: 0x10339b8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5948,7 +5948,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_street_from_line_10339b0(int32,int32,int32,int32,int32)
+.method public static int32 get_street_from_line_10339c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5992,10 +5992,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010339b0: 0x10339b0: lui   v0, 0x0
+// 0x010339c0: 0x10339c0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010339b4: 0x10339b4: lw    v1, 576(v0)
+// 0x010339c4: 0x10339c4: lw    v1, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6004,12 +6004,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010339b8: 0x10339b8: addiu sp, sp, -56
+// 0x010339c8: 0x10339c8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010339bc: 0x10339bc: sw    s1, 44(sp)
+// 0x010339cc: 0x10339cc: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6018,7 +6018,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010339c0: 0x10339c0: sw    s0, 40(sp)
+// 0x010339d0: 0x10339d0: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6027,8 +6027,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010339c4: 0x10339c4: sw    ra, 52(sp)
-// 0x010339c8: 0x10339c8: sw    s2, 48(sp)
+// 0x010339d4: 0x10339d4: sw    ra, 52(sp)
+// 0x010339d8: 0x10339d8: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6037,47 +6037,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010339cc: 0x10339cc: addu  s1, a1, zero
+// 0x010339dc: 0x10339dc: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010339d0: 0x10339d0: beq   a0, v1, 0x10339e8 addu  s0, a2, zero
+// 0x010339e0: 0x10339e0: beq   a0, v1, 0x10339f8 addu  s0, a2, zero
 	ldloc.1
 	ldloc 8
 	ldloc.3
 	stloc 9
-	beq  L_10339e8
+	beq  L_10339f8
 // --- basic block ---
-// 0x010339d8: 0x10339d8: bltz  a0, 0x10339ec addiu s2, sp, 16
+// 0x010339e8: 0x10339e8: bltz  a0, 0x10339fc addiu s2, sp, 16
 	ldloc.1
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
 	ldc.i4.s 0
-	blt L_10339ec
+	blt L_10339fc
 // --- basic block ---
-// 0x010339e0: 0x10339e0: jal   0x100b164 sll   zero, zero, 0
+// 0x010339f0: 0x10339f0: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10339e8:
-// 0x010339e8: 0x10339e8: addiu s2, sp, 16
+L_10339f8:
+// 0x010339f8: 0x10339f8: addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-L_10339ec:
-// 0x010339ec: 0x10339ec: addu  a0, s1, zero
+L_10339fc:
+// 0x010339fc: 0x10339fc: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010339f0: 0x10339f0: jal   0x1011a4c addu  a1, s2, zero
+// 0x01033a00: 0x1033a00: jal   0x1011a5c addu  a1, s2, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -6085,12 +6085,12 @@ L_10339ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010339f8: 0x10339f8: jal   0x10111fc addu  a0, s2, zero
+// 0x01033a08: 0x1033a08: jal   0x101120c addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6098,20 +6098,20 @@ L_10339ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_fename_10111fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_fename_101120c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01033a00: 0x1033a00: lw    ra, 52(sp)
-// 0x01033a04: 0x1033a04: sw    v0, 0(s0)
+// 0x01033a10: 0x1033a10: lw    ra, 52(sp)
+// 0x01033a14: 0x1033a14: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01033a08: 0x1033a08: lw    s2, 48(sp)
+// 0x01033a18: 0x1033a18: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6120,7 +6120,7 @@ L_10339ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033a0c: 0x1033a0c: lw    s1, 44(sp)
+// 0x01033a1c: 0x1033a1c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6129,7 +6129,7 @@ L_10339ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01033a10: 0x1033a10: lw    s0, 40(sp)
+// 0x01033a20: 0x1033a20: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6138,7 +6138,7 @@ L_10339ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033a14: 0x1033a14: jr    ra addiu sp, sp, 56
+// 0x01033a24: 0x1033a24: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6150,7 +6150,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 get_alert_location_info_1033a1c(int32,int32,int32,int32,int32)
+.method public static int32 get_alert_location_info_1033a2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -6200,12 +6200,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033a1c: 0x1033a1c: addiu sp, sp, -640
+// 0x01033a2c: 0x1033a2c: addiu sp, sp, -640
 	ldloc.0
 	ldc.i4 -640
 	add
 	stloc.0
-// 0x01033a20: 0x1033a20: sw    s3, 628(sp)
+// 0x01033a30: 0x1033a30: sw    s3, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6214,7 +6214,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01033a24: 0x1033a24: sw    s1, 620(sp)
+// 0x01033a34: 0x1033a34: sw    s1, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6223,7 +6223,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01033a28: 0x1033a28: sw    s0, 616(sp)
+// 0x01033a38: 0x1033a38: sw    s0, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6232,8 +6232,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01033a2c: 0x1033a2c: sw    ra, 636(sp)
-// 0x01033a30: 0x1033a30: sw    s4, 632(sp)
+// 0x01033a3c: 0x1033a3c: sw    ra, 636(sp)
+// 0x01033a40: 0x1033a40: sw    s4, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6242,7 +6242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01033a34: 0x1033a34: sw    s2, 624(sp)
+// 0x01033a44: 0x1033a44: sw    s2, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6251,52 +6251,52 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01033a38: 0x1033a38: addu  s0, a2, zero
+// 0x01033a48: 0x1033a48: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01033a3c: 0x1033a3c: addu  s3, a0, zero
+// 0x01033a4c: 0x1033a4c: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01033a40: 0x1033a40: beq   a2, zero, 0x1033a90 addu  s1, a1, zero
+// 0x01033a50: 0x1033a50: beq   a2, zero, 0x1033aa0 addu  s1, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 9
-	brfalse L_1033a90
+	brfalse L_1033aa0
 // --- basic block ---
-// 0x01033a48: 0x1033a48: lw    a0, 0(a2)
+// 0x01033a58: 0x1033a58: lw    a0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01033a4c: 0x1033a4c: addiu v0, zero, -2
+// 0x01033a5c: 0x1033a5c: addiu v0, zero, -2
 	ldc.i4.s -2
 	stloc 5
-// 0x01033a50: 0x1033a50: beq   a0, v0, 0x1033ba8 addiu v0, zero, -1
+// 0x01033a60: 0x1033a60: beq   a0, v0, 0x1033bb8 addiu v0, zero, -1
 	ldloc.1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	beq  L_1033ba8
+	beq  L_1033bb8
 // --- basic block ---
-// 0x01033a58: 0x1033a58: beq   a0, v0, 0x1033a90 sll   zero, zero, 0
+// 0x01033a68: 0x1033a68: beq   a0, v0, 0x1033aa0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1033a90
+	beq  L_1033aa0
 // --- basic block ---
-// 0x01033a60: 0x1033a60: jal   0x100b484 sll   zero, zero, 0
+// 0x01033a70: 0x1033a70: jal   0x100b494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033a68: 0x1033a68: lw    v1, 4(s0)
+// 0x01033a78: 0x1033a78: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6305,24 +6305,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033a6c: 0x1033a6c: sll   zero, zero, 0
-// 0x01033a70: 0x1033a70: bne   v0, v1, 0x1033a94 addiu a0, sp, 92
+// 0x01033a7c: 0x1033a7c: sll   zero, zero, 0
+// 0x01033a80: 0x1033a80: bne   v0, v1, 0x1033aa4 addiu a0, sp, 92
 	ldloc 5
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.1
-	bne.un L_1033a94
+	bne.un L_1033aa4
 // --- basic block ---
-// 0x01033a78: 0x1033a78: lw    v1, 0(s0)
+// 0x01033a88: 0x1033a88: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01033a7c: 0x1033a7c: lw    a0, 8(s0)
+// 0x01033a8c: 0x1033a8c: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6331,7 +6331,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033a80: 0x1033a80: sw    v0, 4(s1)
+// 0x01033a90: 0x1033a90: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6340,7 +6340,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01033a84: 0x1033a84: sw    a0, 8(s1)
+// 0x01033a94: 0x1033a94: sw    a0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6349,45 +6349,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01033a88: 0x1033a88: j	 0x1033ba0 sw    v1, 0(s1)
+// 0x01033a98: 0x1033a98: j	 0x1033bb0 sw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1033ba0
+	br L_1033bb0
 // --- basic block ---
-L_1033a90:
-// 0x01033a90: 0x1033a90: addiu a0, sp, 92
+L_1033aa0:
+// 0x01033aa0: 0x1033aa0: addiu a0, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.1
-L_1033a94:
-// 0x01033a94: 0x1033a94: jal   0x1010058 addiu a1, zero, 128
+L_1033aa4:
+// 0x01033aa4: 0x1033aa4: jal   0x1010068 addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033a9c: 0x1033a9c: blez  v0, 0x1033b80 addu  s4, v0, zero
+// 0x01033aac: 0x1033aac: blez  v0, 0x1033b90 addu  s4, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
 	ldc.i4.s 0
-	ble L_1033b80
+	ble L_1033b90
 // --- basic block ---
-// 0x01033aa4: 0x1033aa4: addu  a0, zero, zero
+// 0x01033ab4: 0x1033ab4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01033aa8: 0x1033aa8: jal   0x100c63c addu  a1, s3, zero
+// 0x01033ab8: 0x1033ab8: jal   0x100c64c addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -6395,15 +6395,15 @@ L_1033a94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033ab0: 0x1033ab0: lui   v1, 0x0
+// 0x01033ac0: 0x1033ac0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01033ab4: 0x1033ab4: lw    v1, 576(v1)
+// 0x01033ac4: 0x1033ac4: lw    v1, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6412,22 +6412,22 @@ L_1033a94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033ab8: 0x1033ab8: sll   zero, zero, 0
-// 0x01033abc: 0x1033abc: beq   v0, v1, 0x1033ae0 addiu s2, sp, 36
+// 0x01033ac8: 0x1033ac8: sll   zero, zero, 0
+// 0x01033acc: 0x1033acc: beq   v0, v1, 0x1033af0 addiu s2, sp, 36
 	ldloc 5
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-	beq  L_1033ae0
+	beq  L_1033af0
 // --- basic block ---
-// 0x01033ac4: 0x1033ac4: bltz  v0, 0x1033ba8 sll   zero, zero, 0
+// 0x01033ad4: 0x1033ad4: bltz  v0, 0x1033bb8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	blt L_1033ba8
+	blt L_1033bb8
 // --- basic block ---
-// 0x01033acc: 0x1033acc: jal   0x100b164 addu  a0, v0, zero
+// 0x01033adc: 0x1033adc: jal   0x100b174 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6435,43 +6435,43 @@ L_1033a94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033ad4: 0x1033ad4: beq   v0, zero, 0x1033bac addu  v0, zero, zero
+// 0x01033ae4: 0x1033ae4: beq   v0, zero, 0x1033bbc addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1033bac
+	brfalse L_1033bbc
 // --- basic block ---
-// 0x01033adc: 0x1033adc: addiu s2, sp, 36
+// 0x01033aec: 0x1033aec: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-L_1033ae0:
-// 0x01033ae0: 0x1033ae0: addiu a1, sp, 32
+L_1033af0:
+// 0x01033af0: 0x1033af0: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01033ae4: 0x1033ae4: jal   0x100844c addu  a0, s2, zero
+// 0x01033af4: 0x1033af4: jal   0x100845c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033aec: 0x1033aec: addu  a0, s3, zero
+// 0x01033afc: 0x1033afc: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01033af0: 0x1033af0: jal   0x10086bc addiu a1, zero, 20
+// 0x01033b00: 0x1033b00: jal   0x10086cc addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -6479,34 +6479,34 @@ L_1033ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033af8: 0x1033af8: addiu v0, zero, 1
+// 0x01033b08: 0x1033b08: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01033afc: 0x1033afc: addiu v1, sp, 44
+// 0x01033b0c: 0x1033b0c: addiu v1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 7
-// 0x01033b00: 0x1033b00: addu  a0, s3, zero
+// 0x01033b10: 0x1033b10: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01033b04: 0x1033b04: addu  a3, s4, zero
+// 0x01033b14: 0x1033b14: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x01033b08: 0x1033b08: addu  a1, zero, zero
+// 0x01033b18: 0x1033b18: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01033b0c: 0x1033b0c: addiu a2, sp, 92
+// 0x01033b1c: 0x1033b1c: addiu a2, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc.3
-// 0x01033b10: 0x1033b10: sw    v1, 20(sp)
+// 0x01033b20: 0x1033b20: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6515,7 +6515,7 @@ L_1033ae0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01033b14: 0x1033b14: sw    v0, 24(sp)
+// 0x01033b24: 0x1033b24: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6524,7 +6524,7 @@ L_1033ae0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01033b18: 0x1033b18: jal   0x1013028 sw    v0, 16(sp)
+// 0x01033b28: 0x1033b28: jal   0x1013038 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6538,12 +6538,12 @@ L_1033ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033b20: 0x1033b20: lw    a1, 32(sp)
+// 0x01033b30: 0x1033b30: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6552,10 +6552,10 @@ L_1033ae0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01033b24: 0x1033b24: addu  a0, s2, zero
+// 0x01033b34: 0x1033b34: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01033b28: 0x1033b28: jal   0x10086bc sw    v0, 608(sp)
+// 0x01033b38: 0x1033b38: jal   0x10086cc sw    v0, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6569,12 +6569,12 @@ L_1033ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033b30: 0x1033b30: lw    v0, 608(sp)
+// 0x01033b40: 0x1033b40: lw    v0, 608(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6583,13 +6583,13 @@ L_1033ae0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033b34: 0x1033b34: sll   zero, zero, 0
-// 0x01033b38: 0x1033b38: blez  v0, 0x1033b70 sll   zero, zero, 0
+// 0x01033b44: 0x1033b44: sll   zero, zero, 0
+// 0x01033b48: 0x1033b48: blez  v0, 0x1033b80 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_1033b70
+	ble L_1033b80
 // --- basic block ---
-// 0x01033b40: 0x1033b40: lw    v0, 64(sp)
+// 0x01033b50: 0x1033b50: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6598,17 +6598,17 @@ L_1033ae0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033b44: 0x1033b44: sll   zero, zero, 0
-// 0x01033b48: 0x1033b48: slti  v0, v0, 51
+// 0x01033b54: 0x1033b54: sll   zero, zero, 0
+// 0x01033b58: 0x1033b58: slti  v0, v0, 51
 	ldloc 5
 	ldc.i4.s 51
 	clt
 	stloc 5
-// 0x01033b4c: 0x1033b4c: beq   v0, zero, 0x1033b70 sll   zero, zero, 0
+// 0x01033b5c: 0x1033b5c: beq   v0, zero, 0x1033b80 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1033b70
+	brfalse L_1033b80
 // --- basic block ---
-// 0x01033b54: 0x1033b54: lw    a0, 56(sp)
+// 0x01033b64: 0x1033b64: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6617,7 +6617,7 @@ L_1033ae0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033b58: 0x1033b58: lw    v0, 48(sp)
+// 0x01033b68: 0x1033b68: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6626,14 +6626,14 @@ L_1033ae0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033b5c: 0x1033b5c: sw    a0, 0(s1)
+// 0x01033b6c: 0x1033b6c: sw    a0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01033b60: 0x1033b60: jal   0x100b484 sw    v0, 8(s1)
+// 0x01033b70: 0x1033b70: jal   0x100b494 sw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6647,12 +6647,12 @@ L_1033ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01033b68: 0x1033b68: j	 0x1033b80 sw    v0, 4(s1)
+// 0x01033b78: 0x1033b78: j	 0x1033b90 sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6661,32 +6661,32 @@ L_1033ae0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1033b80
+	br L_1033b90
 // --- basic block ---
-L_1033b70:
-// 0x01033b70: 0x1033b70: beq   s0, zero, 0x1033ba8 addiu v0, zero, -2
+L_1033b80:
+// 0x01033b80: 0x1033b80: beq   s0, zero, 0x1033bb8 addiu v0, zero, -2
 	ldloc 8
 	ldc.i4.s -2
 	stloc 5
-	brfalse L_1033ba8
+	brfalse L_1033bb8
 // --- basic block ---
-// 0x01033b78: 0x1033b78: j	 0x1033ba8 sw    v0, 0(s0)
+// 0x01033b88: 0x1033b88: j	 0x1033bb8 sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1033ba8
+	br L_1033bb8
 // --- basic block ---
-L_1033b80:
-// 0x01033b80: 0x1033b80: beq   s0, zero, 0x1033bac addiu v0, zero, 1
+L_1033b90:
+// 0x01033b90: 0x1033b90: beq   s0, zero, 0x1033bbc addiu v0, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc 5
-	brfalse L_1033bac
+	brfalse L_1033bbc
 // --- basic block ---
-// 0x01033b88: 0x1033b88: lw    a0, 4(s1)
+// 0x01033b98: 0x1033b98: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6695,7 +6695,7 @@ L_1033b80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033b8c: 0x1033b8c: lw    v1, 8(s1)
+// 0x01033b9c: 0x1033b9c: lw    v1, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6704,14 +6704,14 @@ L_1033b80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033b90: 0x1033b90: lw    v0, 0(s1)
+// 0x01033ba0: 0x1033ba0: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01033b94: 0x1033b94: sw    a0, 4(s0)
+// 0x01033ba4: 0x1033ba4: sw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6720,7 +6720,7 @@ L_1033b80:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01033b98: 0x1033b98: sw    v1, 8(s0)
+// 0x01033ba8: 0x1033ba8: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6729,26 +6729,26 @@ L_1033b80:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01033b9c: 0x1033b9c: sw    v0, 0(s0)
+// 0x01033bac: 0x1033bac: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1033ba0:
-// 0x01033ba0: 0x1033ba0: j	 0x1033bac addiu v0, zero, 1
+L_1033bb0:
+// 0x01033bb0: 0x1033bb0: j	 0x1033bbc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1033bac
+	br L_1033bbc
 // --- basic block ---
-L_1033ba8:
-// 0x01033ba8: 0x1033ba8: addu  v0, zero, zero
+L_1033bb8:
+// 0x01033bb8: 0x1033bb8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1033bac:
-// 0x01033bac: 0x1033bac: lw    ra, 636(sp)
-// 0x01033bb0: 0x1033bb0: lw    s4, 632(sp)
+L_1033bbc:
+// 0x01033bbc: 0x1033bbc: lw    ra, 636(sp)
+// 0x01033bc0: 0x1033bc0: lw    s4, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6757,7 +6757,7 @@ L_1033bac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01033bb4: 0x1033bb4: lw    s3, 628(sp)
+// 0x01033bc4: 0x1033bc4: lw    s3, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6766,7 +6766,7 @@ L_1033bac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01033bb8: 0x1033bb8: lw    s2, 624(sp)
+// 0x01033bc8: 0x1033bc8: lw    s2, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6775,7 +6775,7 @@ L_1033bac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01033bbc: 0x1033bbc: lw    s1, 620(sp)
+// 0x01033bcc: 0x1033bcc: lw    s1, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6784,7 +6784,7 @@ L_1033bac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033bc0: 0x1033bc0: lw    s0, 616(sp)
+// 0x01033bd0: 0x1033bd0: lw    s0, 616(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6793,7 +6793,7 @@ L_1033bac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01033bc4: 0x1033bc4: jr    ra addiu sp, sp, 640
+// 0x01033bd4: 0x1033bd4: jr    ra addiu sp, sp, 640
 	ldloc.0
 	ldc.i4 640
 	add
@@ -6805,7 +6805,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 alert_is_on_route_1033bcc(int32,int32,int32,int32,int32)
+.method public static int32 alert_is_on_route_1033bdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -6846,15 +6846,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033bcc: 0x1033bcc: addiu sp, sp, -56
+// 0x01033bdc: 0x1033bdc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01033bd0: 0x1033bd0: lui   v0, 0x0
+// 0x01033be0: 0x1033be0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01033bd4: 0x1033bd4: sw    s0, 44(sp)
+// 0x01033be4: 0x1033be4: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6863,7 +6863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01033bd8: 0x1033bd8: lw    v0, 576(v0)
+// 0x01033be8: 0x1033be8: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6872,17 +6872,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033bdc: 0x1033bdc: addu  s0, a0, zero
+// 0x01033bec: 0x1033bec: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01033be0: 0x1033be0: lw    a0, 0(a0)
+// 0x01033bf0: 0x1033bf0: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01033be4: 0x1033be4: sw    s1, 48(sp)
+// 0x01033bf4: 0x1033bf4: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6891,32 +6891,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01033be8: 0x1033be8: sw    ra, 52(sp)
-// 0x01033bec: 0x1033bec: beq   a0, v0, 0x1033c04 addu  s1, a1, zero
+// 0x01033bf8: 0x1033bf8: sw    ra, 52(sp)
+// 0x01033bfc: 0x1033bfc: beq   a0, v0, 0x1033c14 addu  s1, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 7
-	beq  L_1033c04
+	beq  L_1033c14
 // --- basic block ---
-// 0x01033bf4: 0x1033bf4: bltz  a0, 0x1033c04 sll   zero, zero, 0
+// 0x01033c04: 0x1033c04: bltz  a0, 0x1033c14 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1033c04
+	blt L_1033c14
 // --- basic block ---
-// 0x01033bfc: 0x1033bfc: jal   0x100b164 sll   zero, zero, 0
+// 0x01033c0c: 0x1033c0c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1033c04:
-// 0x01033c04: 0x1033c04: lw    a0, 8(s0)
+L_1033c14:
+// 0x01033c14: 0x1033c14: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6925,12 +6925,12 @@ L_1033c04:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033c08: 0x1033c08: addiu a1, sp, 16
+// 0x01033c18: 0x1033c18: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01033c0c: 0x1033c0c: jal   0x1003adc addiu a2, sp, 20
+// 0x01033c1c: 0x1033c1c: jal   0x1003adc addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
@@ -6943,19 +6943,19 @@ L_1033c04:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01033c14: 0x1033c14: lui   v0, 0x20000
+// 0x01033c24: 0x1033c24: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01033c18: 0x1033c18: lw    v1, 31228(v0)
+// 0x01033c28: 0x1033c28: lw    v1, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 8
-// 0x01033c1c: 0x1033c1c: lw    v0, 16(sp)
+// 0x01033c2c: 0x1033c2c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6964,35 +6964,35 @@ L_1033c04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033c20: 0x1033c20: addiu a1, sp, 32
+// 0x01033c30: 0x1033c30: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01033c24: 0x1033c24: andi  v0, v0, 32767
+// 0x01033c34: 0x1033c34: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01033c28: 0x1033c28: sll   v0, v0, 3
+// 0x01033c38: 0x1033c38: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01033c2c: 0x1033c2c: addu  v0, v1, v0
+// 0x01033c3c: 0x1033c3c: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01033c30: 0x1033c30: lw    a0, 0(v0)
+// 0x01033c40: 0x1033c40: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01033c34: 0x1033c34: sll   zero, zero, 0
-// 0x01033c38: 0x1033c38: sw    a0, 24(sp)
+// 0x01033c44: 0x1033c44: sll   zero, zero, 0
+// 0x01033c48: 0x1033c48: sw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7001,7 +7001,7 @@ L_1033c04:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01033c3c: 0x1033c3c: lw    a0, 4(v0)
+// 0x01033c4c: 0x1033c4c: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7010,7 +7010,7 @@ L_1033c04:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033c40: 0x1033c40: lw    v0, 20(sp)
+// 0x01033c50: 0x1033c50: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7019,7 +7019,7 @@ L_1033c04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033c44: 0x1033c44: sw    a0, 28(sp)
+// 0x01033c54: 0x1033c54: sw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7028,34 +7028,34 @@ L_1033c04:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01033c48: 0x1033c48: andi  v0, v0, 32767
+// 0x01033c58: 0x1033c58: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01033c4c: 0x1033c4c: sll   v0, v0, 3
+// 0x01033c5c: 0x1033c5c: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01033c50: 0x1033c50: addu  v0, v1, v0
+// 0x01033c60: 0x1033c60: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01033c54: 0x1033c54: lw    v1, 0(v0)
+// 0x01033c64: 0x1033c64: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01033c58: 0x1033c58: addiu a0, sp, 24
+// 0x01033c68: 0x1033c68: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x01033c5c: 0x1033c5c: sw    v1, 32(sp)
+// 0x01033c6c: 0x1033c6c: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7064,7 +7064,7 @@ L_1033c04:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01033c60: 0x1033c60: lw    v0, 4(v0)
+// 0x01033c70: 0x1033c70: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7073,7 +7073,7 @@ L_1033c04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033c64: 0x1033c64: jal   0x1009824 sw    v0, 36(sp)
+// 0x01033c74: 0x1033c74: jal   0x1009834 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7087,68 +7087,68 @@ L_1033c04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01033c6c: 0x1033c6c: subu  s1, s1, v0
+// 0x01033c7c: 0x1033c7c: subu  s1, s1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 7
-L_1033c70:
-// 0x01033c70: 0x1033c70: slti  v0, s1, 181
+L_1033c80:
+// 0x01033c80: 0x1033c80: slti  v0, s1, 181
 	ldloc 7
 	ldc.i4 181
 	clt
 	stloc 5
-// 0x01033c74: 0x1033c74: beq   v0, zero, 0x1033c70 addiu s1, s1, -360
+// 0x01033c84: 0x1033c84: beq   v0, zero, 0x1033c80 addiu s1, s1, -360
 	ldloc 5
 	ldloc 7
 	ldc.i4 -360
 	add
 	stloc 7
-	brfalse L_1033c70
+	brfalse L_1033c80
 // --- basic block ---
-// 0x01033c7c: 0x1033c7c: addiu s1, s1, 360
+// 0x01033c8c: 0x1033c8c: addiu s1, s1, 360
 	ldloc 7
 	ldc.i4 360
 	add
 	stloc 7
-// 0x01033c80: 0x1033c80: j	 0x1033c8c slti  v0, s1, -180
+// 0x01033c90: 0x1033c90: j	 0x1033c9c slti  v0, s1, -180
 	ldloc 7
 	ldc.i4 -180
 	clt
 	stloc 5
-	br L_1033c8c
+	br L_1033c9c
 // --- basic block ---
-L_1033c88:
-// 0x01033c88: 0x1033c88: slti  v0, s1, -180
+L_1033c98:
+// 0x01033c98: 0x1033c98: slti  v0, s1, -180
 	ldloc 7
 	ldc.i4 -180
 	clt
 	stloc 5
-L_1033c8c:
-// 0x01033c8c: 0x1033c8c: bne   v0, zero, 0x1033c88 addiu s1, s1, 360
+L_1033c9c:
+// 0x01033c9c: 0x1033c9c: bne   v0, zero, 0x1033c98 addiu s1, s1, 360
 	ldloc 5
 	ldloc 7
 	ldc.i4 360
 	add
 	stloc 7
-	brtrue L_1033c88
+	brtrue L_1033c98
 // --- basic block ---
-// 0x01033c94: 0x1033c94: addiu s1, s1, -360
+// 0x01033ca4: 0x1033ca4: addiu s1, s1, -360
 	ldloc 7
 	ldc.i4 -360
 	add
 	stloc 7
-// 0x01033c98: 0x1033c98: addiu s1, s1, 90
+// 0x01033ca8: 0x1033ca8: addiu s1, s1, 90
 	ldloc 7
 	ldc.i4.s 90
 	add
 	stloc 7
-// 0x01033c9c: 0x1033c9c: lw    v0, 16(sp)
+// 0x01033cac: 0x1033cac: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7157,12 +7157,12 @@ L_1033c8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033ca0: 0x1033ca0: sltiu s1, s1, 180
+// 0x01033cb0: 0x1033cb0: sltiu s1, s1, 180
 	ldloc 7
 	ldc.i4 180
 	clt.un
 	stloc 7
-// 0x01033ca4: 0x1033ca4: lw    a1, 8(s0)
+// 0x01033cb4: 0x1033cb4: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7171,14 +7171,14 @@ L_1033c8c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01033ca8: 0x1033ca8: lw    a0, 0(s0)
+// 0x01033cb8: 0x1033cb8: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01033cac: 0x1033cac: lw    a3, 20(sp)
+// 0x01033cbc: 0x1033cbc: lw    a3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7187,32 +7187,32 @@ L_1033c8c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01033cb0: 0x1033cb0: bne   s1, zero, 0x1033cc0 addu  a2, v0, zero
+// 0x01033cc0: 0x1033cc0: bne   s1, zero, 0x1033cd0 addu  a2, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.3
-	brtrue L_1033cc0
+	brtrue L_1033cd0
 // --- basic block ---
-// 0x01033cb8: 0x1033cb8: addu  a2, a3, zero
+// 0x01033cc8: 0x1033cc8: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x01033cbc: 0x1033cbc: addu  a3, v0, zero
+// 0x01033ccc: 0x1033ccc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-L_1033cc0:
-// 0x01033cc0: 0x1033cc0: jal   0x1056eb4 sll   zero, zero, 0
+L_1033cd0:
+// 0x01033cd0: 0x1033cd0: jal   0x1056ec4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_is_line_on_route_1056eb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_is_line_on_route_1056ec4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01033cc8: 0x1033cc8: lw    ra, 52(sp)
-// 0x01033ccc: 0x1033ccc: lw    s1, 48(sp)
+// 0x01033cd8: 0x1033cd8: lw    ra, 52(sp)
+// 0x01033cdc: 0x1033cdc: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7221,7 +7221,7 @@ L_1033cc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033cd0: 0x1033cd0: lw    s0, 44(sp)
+// 0x01033ce0: 0x1033ce0: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7230,7 +7230,7 @@ L_1033cc0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033cd4: 0x1033cd4: jr    ra addiu sp, sp, 56
+// 0x01033ce4: 0x1033ce4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl38.j b/converted/Cibyl38.j
index 8432e2a..a2d1860 100644
--- a/converted/Cibyl38.j
+++ b/converted/Cibyl38.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl38::.ctor
 
-.method public static int32 is_alert_in_range_provider_1033cdc(int32,int32,int32,int32,int32)
+.method public static int32 is_alert_in_range_provider_1033cec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s3,int32 s0,int32 s4,int32 s7,int32 s5,int32 s6,int32 s1,int32 s8,int32 ra)
@@ -103,19 +103,19 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033cdc: 0x1033cdc: addiu sp, sp, -104
+// 0x01033cec: 0x1033cec: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x01033ce0: 0x1033ce0: lw    v1, 0(a1)
+// 0x01033cf0: 0x1033cf0: lw    v1, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01033ce4: 0x1033ce4: sw    s0, 64(sp)
+// 0x01033cf4: 0x1033cf4: sw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -124,10 +124,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01033ce8: 0x1033ce8: addu  s0, a0, zero
+// 0x01033cf8: 0x1033cf8: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01033cec: 0x1033cec: lw    a0, 4(a1)
+// 0x01033cfc: 0x1033cfc: lw    a0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -136,7 +136,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033cf0: 0x1033cf0: lw    v0, 4(s0)
+// 0x01033d00: 0x1033d00: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -145,7 +145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033cf4: 0x1033cf4: sw    s8, 96(sp)
+// 0x01033d04: 0x1033d04: sw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -154,7 +154,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01033cf8: 0x1033cf8: sw    s7, 92(sp)
+// 0x01033d08: 0x1033d08: sw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -163,7 +163,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01033cfc: 0x1033cfc: sw    s2, 72(sp)
+// 0x01033d0c: 0x1033d0c: sw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -172,7 +172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01033d00: 0x1033d00: sw    s1, 68(sp)
+// 0x01033d10: 0x1033d10: sw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -181,8 +181,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01033d04: 0x1033d04: sw    ra, 100(sp)
-// 0x01033d08: 0x1033d08: sw    s6, 88(sp)
+// 0x01033d14: 0x1033d14: sw    ra, 100(sp)
+// 0x01033d18: 0x1033d18: sw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -191,7 +191,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01033d0c: 0x1033d0c: sw    s5, 84(sp)
+// 0x01033d1c: 0x1033d1c: sw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -200,7 +200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01033d10: 0x1033d10: sw    s4, 80(sp)
+// 0x01033d20: 0x1033d20: sw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -209,7 +209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01033d14: 0x1033d14: sw    s3, 76(sp)
+// 0x01033d24: 0x1033d24: sw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -218,7 +218,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01033d18: 0x1033d18: sw    a0, 36(sp)
+// 0x01033d28: 0x1033d28: sw    a0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -227,7 +227,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01033d1c: 0x1033d1c: sw    v1, 32(sp)
+// 0x01033d2c: 0x1033d2c: sw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -236,10 +236,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01033d20: 0x1033d20: lui   s7, 0x0
+// 0x01033d30: 0x1033d30: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01033d24: 0x1033d24: sw    a3, 116(sp)
+// 0x01033d34: 0x1033d34: sw    a3, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -248,7 +248,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01033d28: 0x1033d28: lw    s2, 576(s7)
+// 0x01033d38: 0x1033d38: lw    s2, 576(s7)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -257,7 +257,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01033d2c: 0x1033d2c: jalr  v0 addu  s1, a1, zero
+// 0x01033d3c: 0x1033d3c: jalr  v0 addu  s1, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 15
@@ -271,34 +271,34 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033d34: 0x1033d34: beq   v0, zero, 0x1033f98 addu  s8, v0, zero
+// 0x01033d44: 0x1033d44: beq   v0, zero, 0x1033fa8 addu  s8, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 16
-	brfalse L_1033f98
+	brfalse L_1033fa8
 // --- basic block ---
-// 0x01033d3c: 0x1033d3c: addu  s3, zero, zero
+// 0x01033d4c: 0x1033d4c: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01033d40: 0x1033d40: addiu s4, sp, 24
+// 0x01033d50: 0x1033d50: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x01033d44: 0x1033d44: addiu s6, sp, 32
+// 0x01033d54: 0x1033d54: addiu s6, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 14
-// 0x01033d48: 0x1033d48: j	 0x1033f6c addiu s5, sp, 40
+// 0x01033d58: 0x1033d58: j	 0x1033f7c addiu s5, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 13
-	br L_1033f6c
+	br L_1033f7c
 // --- basic block ---
-L_1033d50:
-// 0x01033d50: 0x1033d50: lw    v0, 576(s7)
+L_1033d60:
+// 0x01033d60: 0x1033d60: lw    v0, 576(s7)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -307,18 +307,18 @@ L_1033d50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033d54: 0x1033d54: sll   zero, zero, 0
-// 0x01033d58: 0x1033d58: beq   s2, v0, 0x1033d70 sll   zero, zero, 0
+// 0x01033d64: 0x1033d64: sll   zero, zero, 0
+// 0x01033d68: 0x1033d68: beq   s2, v0, 0x1033d80 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	beq  L_1033d70
+	beq  L_1033d80
 // --- basic block ---
-// 0x01033d60: 0x1033d60: bltz  s2, 0x1033d70 sll   zero, zero, 0
+// 0x01033d70: 0x1033d70: bltz  s2, 0x1033d80 sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_1033d70
+	blt L_1033d80
 // --- basic block ---
-// 0x01033d68: 0x1033d68: jal   0x100b164 addu  a0, s2, zero
+// 0x01033d78: 0x1033d78: jal   0x100b174 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -326,13 +326,13 @@ L_1033d50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1033d70:
-// 0x01033d70: 0x1033d70: lw    v0, 40(s0)
+L_1033d80:
+// 0x01033d80: 0x1033d80: lw    v0, 40(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -341,8 +341,8 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033d74: 0x1033d74: sll   zero, zero, 0
-// 0x01033d78: 0x1033d78: jalr  v0 addu  a0, s3, zero
+// 0x01033d84: 0x1033d84: sll   zero, zero, 0
+// 0x01033d88: 0x1033d88: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -356,15 +356,15 @@ L_1033d70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033d80: 0x1033d80: beq   v0, zero, 0x1033f68 addiu a2, sp, 16
+// 0x01033d90: 0x1033d90: beq   v0, zero, 0x1033f78 addiu a2, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-	brfalse L_1033f68
+	brfalse L_1033f78
 // --- basic block ---
-// 0x01033d88: 0x1033d88: lw    v0, 12(s0)
+// 0x01033d98: 0x1033d98: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -373,10 +373,10 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033d8c: 0x1033d8c: addu  a0, s3, zero
+// 0x01033d9c: 0x1033d9c: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01033d90: 0x1033d90: jalr  v0 addu  a1, s4, zero
+// 0x01033da0: 0x1033da0: jalr  v0 addu  a1, s4, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
@@ -390,10 +390,10 @@ L_1033d70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033d98: 0x1033d98: addu  a0, s4, zero
+// 0x01033da8: 0x1033da8: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x01033d9c: 0x1033d9c: jal   0x1008eb0 addu  a1, s6, zero
+// 0x01033dac: 0x1033dac: jal   0x1008ec0 addu  a1, s6, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -401,12 +401,12 @@ L_1033d70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033da4: 0x1033da4: lw    a0, 120(sp)
+// 0x01033db4: 0x1033db4: lw    a0, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -415,10 +415,10 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033da8: 0x1033da8: addu  v1, v0, zero
+// 0x01033db8: 0x1033db8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01033dac: 0x1033dac: lw    v0, 32(s0)
+// 0x01033dbc: 0x1033dbc: lw    v0, 32(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -427,14 +427,14 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033db0: 0x1033db0: sw    v1, 0(a0)
+// 0x01033dc0: 0x1033dc0: sw    v1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01033db4: 0x1033db4: sw    v1, 56(sp)
+// 0x01033dc4: 0x1033dc4: sw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -443,7 +443,7 @@ L_1033d70:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01033db8: 0x1033db8: jalr  v0 addu  a0, s3, zero
+// 0x01033dc8: 0x1033dc8: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -457,7 +457,7 @@ L_1033d70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033dc0: 0x1033dc0: lw    v1, 56(sp)
+// 0x01033dd0: 0x1033dd0: lw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -466,19 +466,19 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01033dc4: 0x1033dc4: sll   zero, zero, 0
-// 0x01033dc8: 0x1033dc8: slt   v0, v0, v1
+// 0x01033dd4: 0x1033dd4: sll   zero, zero, 0
+// 0x01033dd8: 0x1033dd8: slt   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	clt
 	stloc 5
-// 0x01033dcc: 0x1033dcc: bne   v0, zero, 0x1033f68 addu  a0, s3, zero
+// 0x01033ddc: 0x1033ddc: bne   v0, zero, 0x1033f78 addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_1033f68
+	brtrue L_1033f78
 // --- basic block ---
-// 0x01033dd4: 0x1033dd4: lw    v1, 60(s0)
+// 0x01033de4: 0x1033de4: lw    v1, 60(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -487,7 +487,7 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01033dd8: 0x1033dd8: lw    v0, 8(s0)
+// 0x01033de8: 0x1033de8: lw    v0, 8(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -496,8 +496,8 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033ddc: 0x1033ddc: sll   zero, zero, 0
-// 0x01033de0: 0x1033de0: jalr  v0 sw    v1, 56(sp)
+// 0x01033dec: 0x1033dec: sll   zero, zero, 0
+// 0x01033df0: 0x1033df0: jalr  v0 sw    v1, 56(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -517,7 +517,7 @@ L_1033d70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033de8: 0x1033de8: lw    v1, 56(sp)
+// 0x01033df8: 0x1033df8: lw    v1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -526,8 +526,8 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01033dec: 0x1033dec: sll   zero, zero, 0
-// 0x01033df0: 0x1033df0: jalr  v1 addu  a0, v0, zero
+// 0x01033dfc: 0x1033dfc: sll   zero, zero, 0
+// 0x01033e00: 0x1033e00: jalr  v1 addu  a0, v0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
@@ -541,11 +541,11 @@ L_1033d70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033df8: 0x1033df8: bne   v0, zero, 0x1033f68 sll   zero, zero, 0
+// 0x01033e08: 0x1033e08: bne   v0, zero, 0x1033f78 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1033f68
+	brtrue L_1033f78
 // --- basic block ---
-// 0x01033e00: 0x1033e00: lw    v0, 68(s0)
+// 0x01033e10: 0x1033e10: lw    v0, 68(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -554,8 +554,8 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033e04: 0x1033e04: sll   zero, zero, 0
-// 0x01033e08: 0x1033e08: jalr  v0 addu  a0, s3, zero
+// 0x01033e14: 0x1033e14: sll   zero, zero, 0
+// 0x01033e18: 0x1033e18: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -569,13 +569,13 @@ L_1033d70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033e10: 0x1033e10: addu  a2, v0, zero
+// 0x01033e20: 0x1033e20: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01033e14: 0x1033e14: addu  a0, s4, zero
+// 0x01033e24: 0x1033e24: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x01033e18: 0x1033e18: jal   0x1033a1c addu  a1, s5, zero
+// 0x01033e28: 0x1033e28: jal   0x1033a2c addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -583,16 +583,16 @@ L_1033d70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::get_alert_location_info_1033a1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::get_alert_location_info_1033a2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033e20: 0x1033e20: beq   v0, zero, 0x1033f68 sll   zero, zero, 0
+// 0x01033e30: 0x1033e30: beq   v0, zero, 0x1033f78 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1033f68
+	brfalse L_1033f78
 // --- basic block ---
-// 0x01033e28: 0x1033e28: lw    a1, 16(sp)
+// 0x01033e38: 0x1033e38: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -601,7 +601,7 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01033e2c: 0x1033e2c: jal   0x1033bcc addu  a0, s5, zero
+// 0x01033e3c: 0x1033e3c: jal   0x1033bdc addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -609,16 +609,16 @@ L_1033d70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::alert_is_on_route_1033bcc(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::alert_is_on_route_1033bdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033e34: 0x1033e34: bne   v0, zero, 0x1033f30 sll   zero, zero, 0
+// 0x01033e44: 0x1033e44: bne   v0, zero, 0x1033f40 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1033f30
+	brtrue L_1033f40
 // --- basic block ---
-// 0x01033e3c: 0x1033e3c: lw    v0, 576(s7)
+// 0x01033e4c: 0x1033e4c: lw    v0, 576(s7)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -627,18 +627,18 @@ L_1033d70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033e40: 0x1033e40: sll   zero, zero, 0
-// 0x01033e44: 0x1033e44: beq   s2, v0, 0x1033e5c sll   zero, zero, 0
+// 0x01033e50: 0x1033e50: sll   zero, zero, 0
+// 0x01033e54: 0x1033e54: beq   s2, v0, 0x1033e6c sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	beq  L_1033e5c
+	beq  L_1033e6c
 // --- basic block ---
-// 0x01033e4c: 0x1033e4c: bltz  s2, 0x1033e5c sll   zero, zero, 0
+// 0x01033e5c: 0x1033e5c: bltz  s2, 0x1033e6c sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_1033e5c
+	blt L_1033e6c
 // --- basic block ---
-// 0x01033e54: 0x1033e54: jal   0x100b164 addu  a0, s2, zero
+// 0x01033e64: 0x1033e64: jal   0x100b174 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -646,13 +646,13 @@ L_1033d70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1033e5c:
-// 0x01033e5c: 0x1033e5c: lw    v0, 56(s0)
+L_1033e6c:
+// 0x01033e6c: 0x1033e6c: lw    v0, 56(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -661,8 +661,8 @@ L_1033e5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033e60: 0x1033e60: sll   zero, zero, 0
-// 0x01033e64: 0x1033e64: jalr  v0 addu  a0, s3, zero
+// 0x01033e70: 0x1033e70: sll   zero, zero, 0
+// 0x01033e74: 0x1033e74: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -676,11 +676,11 @@ L_1033e5c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033e6c: 0x1033e6c: beq   v0, zero, 0x1033f30 sll   zero, zero, 0
+// 0x01033e7c: 0x1033e7c: beq   v0, zero, 0x1033f40 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1033f30
+	brfalse L_1033f40
 // --- basic block ---
-// 0x01033e74: 0x1033e74: lw    v1, 16(s1)
+// 0x01033e84: 0x1033e84: lw    v1, 16(s1)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -689,7 +689,7 @@ L_1033e5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01033e78: 0x1033e78: lw    v0, 16(sp)
+// 0x01033e88: 0x1033e88: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -698,75 +698,75 @@ L_1033e5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033e7c: 0x1033e7c: sll   zero, zero, 0
-// 0x01033e80: 0x1033e80: subu  v0, v1, v0
+// 0x01033e8c: 0x1033e8c: sll   zero, zero, 0
+// 0x01033e90: 0x1033e90: subu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 5
-L_1033e84:
-// 0x01033e84: 0x1033e84: slti  v1, v0, 181
+L_1033e94:
+// 0x01033e94: 0x1033e94: slti  v1, v0, 181
 	ldloc 5
 	ldc.i4 181
 	clt
 	stloc 6
-// 0x01033e88: 0x1033e88: beq   v1, zero, 0x1033e84 addiu v0, v0, -360
+// 0x01033e98: 0x1033e98: beq   v1, zero, 0x1033e94 addiu v0, v0, -360
 	ldloc 6
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-	brfalse L_1033e84
+	brfalse L_1033e94
 // --- basic block ---
-// 0x01033e90: 0x1033e90: addiu v0, v0, 360
+// 0x01033ea0: 0x1033ea0: addiu v0, v0, 360
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-// 0x01033e94: 0x1033e94: j	 0x1033ea0 slti  v1, v0, -180
+// 0x01033ea4: 0x1033ea4: j	 0x1033eb0 slti  v1, v0, -180
 	ldloc 5
 	ldc.i4 -180
 	clt
 	stloc 6
-	br L_1033ea0
+	br L_1033eb0
 // --- basic block ---
-L_1033e9c:
-// 0x01033e9c: 0x1033e9c: slti  v1, v0, -180
+L_1033eac:
+// 0x01033eac: 0x1033eac: slti  v1, v0, -180
 	ldloc 5
 	ldc.i4 -180
 	clt
 	stloc 6
-L_1033ea0:
-// 0x01033ea0: 0x1033ea0: bne   v1, zero, 0x1033e9c addiu v0, v0, 360
+L_1033eb0:
+// 0x01033eb0: 0x1033eb0: bne   v1, zero, 0x1033eac addiu v0, v0, 360
 	ldloc 6
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-	brtrue L_1033e9c
+	brtrue L_1033eac
 // --- basic block ---
-// 0x01033ea8: 0x1033ea8: addiu v0, v0, -360
+// 0x01033eb8: 0x1033eb8: addiu v0, v0, -360
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-// 0x01033eac: 0x1033eac: addiu v0, v0, 45
+// 0x01033ebc: 0x1033ebc: addiu v0, v0, 45
 	ldloc 5
 	ldc.i4.s 45
 	add
 	stloc 5
-// 0x01033eb0: 0x1033eb0: sltiu v0, v0, 91
+// 0x01033ec0: 0x1033ec0: sltiu v0, v0, 91
 	ldloc 5
 	ldc.i4.s 91
 	clt.un
 	stloc 5
-// 0x01033eb4: 0x1033eb4: beq   v0, zero, 0x1033f68 addu  a0, s6, zero
+// 0x01033ec4: 0x1033ec4: beq   v0, zero, 0x1033f78 addu  a0, s6, zero
 	ldloc 5
 	ldloc 14
 	stloc.1
-	brfalse L_1033f68
+	brfalse L_1033f78
 // --- basic block ---
-// 0x01033ebc: 0x1033ebc: jal   0x1009824 addu  a1, s4, zero
+// 0x01033ecc: 0x1033ecc: jal   0x1009834 addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -774,12 +774,12 @@ L_1033ea0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033ec4: 0x1033ec4: lw    v1, 16(sp)
+// 0x01033ed4: 0x1033ed4: lw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -788,73 +788,73 @@ L_1033ea0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01033ec8: 0x1033ec8: sll   zero, zero, 0
-// 0x01033ecc: 0x1033ecc: subu  v1, v0, v1
+// 0x01033ed8: 0x1033ed8: sll   zero, zero, 0
+// 0x01033edc: 0x1033edc: subu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	sub
 	stloc 6
-L_1033ed0:
-// 0x01033ed0: 0x1033ed0: slti  v0, v1, 181
+L_1033ee0:
+// 0x01033ee0: 0x1033ee0: slti  v0, v1, 181
 	ldloc 6
 	ldc.i4 181
 	clt
 	stloc 5
-// 0x01033ed4: 0x1033ed4: beq   v0, zero, 0x1033ed0 addiu v1, v1, -360
+// 0x01033ee4: 0x1033ee4: beq   v0, zero, 0x1033ee0 addiu v1, v1, -360
 	ldloc 5
 	ldloc 6
 	ldc.i4 -360
 	add
 	stloc 6
-	brfalse L_1033ed0
+	brfalse L_1033ee0
 // --- basic block ---
-// 0x01033edc: 0x1033edc: addiu v1, v1, 360
+// 0x01033eec: 0x1033eec: addiu v1, v1, 360
 	ldloc 6
 	ldc.i4 360
 	add
 	stloc 6
-// 0x01033ee0: 0x1033ee0: j	 0x1033eec slti  v0, v1, -180
+// 0x01033ef0: 0x1033ef0: j	 0x1033efc slti  v0, v1, -180
 	ldloc 6
 	ldc.i4 -180
 	clt
 	stloc 5
-	br L_1033eec
+	br L_1033efc
 // --- basic block ---
-L_1033ee8:
-// 0x01033ee8: 0x1033ee8: slti  v0, v1, -180
+L_1033ef8:
+// 0x01033ef8: 0x1033ef8: slti  v0, v1, -180
 	ldloc 6
 	ldc.i4 -180
 	clt
 	stloc 5
-L_1033eec:
-// 0x01033eec: 0x1033eec: bne   v0, zero, 0x1033ee8 addiu v1, v1, 360
+L_1033efc:
+// 0x01033efc: 0x1033efc: bne   v0, zero, 0x1033ef8 addiu v1, v1, 360
 	ldloc 5
 	ldloc 6
 	ldc.i4 360
 	add
 	stloc 6
-	brtrue L_1033ee8
+	brtrue L_1033ef8
 // --- basic block ---
-// 0x01033ef4: 0x1033ef4: addiu v1, v1, -360
+// 0x01033f04: 0x1033f04: addiu v1, v1, -360
 	ldloc 6
 	ldc.i4 -360
 	add
 	stloc 6
-// 0x01033ef8: 0x1033ef8: addiu v1, v1, 90
+// 0x01033f08: 0x1033f08: addiu v1, v1, 90
 	ldloc 6
 	ldc.i4.s 90
 	add
 	stloc 6
-// 0x01033efc: 0x1033efc: sltiu v1, v1, 181
+// 0x01033f0c: 0x1033f0c: sltiu v1, v1, 181
 	ldloc 6
 	ldc.i4 181
 	clt.un
 	stloc 6
-// 0x01033f00: 0x1033f00: beq   v1, zero, 0x1033f68 sll   zero, zero, 0
+// 0x01033f10: 0x1033f10: beq   v1, zero, 0x1033f78 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1033f68
+	brfalse L_1033f78
 // --- basic block ---
-// 0x01033f08: 0x1033f08: lw    a0, 40(sp)
+// 0x01033f18: 0x1033f18: lw    a0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -863,7 +863,7 @@ L_1033eec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033f0c: 0x1033f0c: lw    a1, 48(sp)
+// 0x01033f1c: 0x1033f1c: lw    a1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -872,7 +872,7 @@ L_1033eec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01033f10: 0x1033f10: jal   0x10339b0 addiu a2, sp, 20
+// 0x01033f20: 0x1033f20: jal   0x10339c0 addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
@@ -882,12 +882,12 @@ L_1033eec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::get_street_from_line_10339b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::get_street_from_line_10339c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033f18: 0x1033f18: lw    a0, 20(sp)
+// 0x01033f28: 0x1033f28: lw    a0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -896,7 +896,7 @@ L_1033eec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01033f1c: 0x1033f1c: lw    a1, 124(sp)
+// 0x01033f2c: 0x1033f2c: lw    a1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -905,18 +905,18 @@ L_1033eec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01033f20: 0x1033f20: jal   0x1001b14 sll   zero, zero, 0
+// 0x01033f30: 0x1033f30: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01033f28: 0x1033f28: bne   v0, zero, 0x1033f68 sll   zero, zero, 0
+// 0x01033f38: 0x1033f38: bne   v0, zero, 0x1033f78 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1033f68
+	brtrue L_1033f78
 // --- basic block ---
-L_1033f30:
-// 0x01033f30: 0x1033f30: lw    v0, 116(sp)
+L_1033f40:
+// 0x01033f40: 0x1033f40: lw    v0, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -925,18 +925,18 @@ L_1033f30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033f34: 0x1033f34: sll   zero, zero, 0
-// 0x01033f38: 0x1033f38: sw    s3, 0(v0)
+// 0x01033f44: 0x1033f44: sll   zero, zero, 0
+// 0x01033f48: 0x1033f48: sw    s3, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x01033f3c: 0x1033f3c: lui   v0, 0x0
+// 0x01033f4c: 0x1033f4c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01033f40: 0x1033f40: lw    v0, 576(v0)
+// 0x01033f50: 0x1033f50: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -945,20 +945,20 @@ L_1033f30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033f44: 0x1033f44: sll   zero, zero, 0
-// 0x01033f48: 0x1033f48: beq   s2, v0, 0x1033f9c addiu v0, zero, 1
+// 0x01033f54: 0x1033f54: sll   zero, zero, 0
+// 0x01033f58: 0x1033f58: beq   s2, v0, 0x1033fac addiu v0, zero, 1
 	ldloc 8
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	beq  L_1033f9c
+	beq  L_1033fac
 // --- basic block ---
-// 0x01033f50: 0x1033f50: bltz  s2, 0x1033f9c sll   zero, zero, 0
+// 0x01033f60: 0x1033f60: bltz  s2, 0x1033fac sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_1033f9c
+	blt L_1033fac
 // --- basic block ---
-// 0x01033f58: 0x1033f58: jal   0x100b164 addu  a0, s2, zero
+// 0x01033f68: 0x1033f68: jal   0x100b174 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -966,35 +966,35 @@ L_1033f30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01033f60: 0x1033f60: j	 0x1033f9c addiu v0, zero, 1
+// 0x01033f70: 0x1033f70: j	 0x1033fac addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1033f9c
+	br L_1033fac
 // --- basic block ---
-L_1033f68:
-// 0x01033f68: 0x1033f68: addiu s3, s3, 1
+L_1033f78:
+// 0x01033f78: 0x1033f78: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1033f6c:
-// 0x01033f6c: 0x1033f6c: slt   v0, s3, s8
+L_1033f7c:
+// 0x01033f7c: 0x1033f7c: slt   v0, s3, s8
 	ldloc 9
 	ldloc 16
 	clt
 	stloc 5
-// 0x01033f70: 0x1033f70: bne   v0, zero, 0x1033d50 lui   v0, 0x0
+// 0x01033f80: 0x1033f80: bne   v0, zero, 0x1033d60 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1033d50
+	brtrue L_1033d60
 // --- basic block ---
-// 0x01033f78: 0x1033f78: lw    v0, 576(v0)
+// 0x01033f88: 0x1033f88: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1003,20 +1003,20 @@ L_1033f6c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01033f7c: 0x1033f7c: sll   zero, zero, 0
-// 0x01033f80: 0x1033f80: beq   s2, v0, 0x1033f9c addu  v0, zero, zero
+// 0x01033f8c: 0x1033f8c: sll   zero, zero, 0
+// 0x01033f90: 0x1033f90: beq   s2, v0, 0x1033fac addu  v0, zero, zero
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1033f9c
+	beq  L_1033fac
 // --- basic block ---
-// 0x01033f88: 0x1033f88: bltz  s2, 0x1033f9c sll   zero, zero, 0
+// 0x01033f98: 0x1033f98: bltz  s2, 0x1033fac sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_1033f9c
+	blt L_1033fac
 // --- basic block ---
-// 0x01033f90: 0x1033f90: jal   0x100b164 addu  a0, s2, zero
+// 0x01033fa0: 0x1033fa0: jal   0x100b174 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1024,18 +1024,18 @@ L_1033f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1033f98:
-// 0x01033f98: 0x1033f98: addu  v0, zero, zero
+L_1033fa8:
+// 0x01033fa8: 0x1033fa8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1033f9c:
-// 0x01033f9c: 0x1033f9c: lw    ra, 100(sp)
-// 0x01033fa0: 0x1033fa0: lw    s8, 96(sp)
+L_1033fac:
+// 0x01033fac: 0x1033fac: lw    ra, 100(sp)
+// 0x01033fb0: 0x1033fb0: lw    s8, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1044,7 +1044,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01033fa4: 0x1033fa4: lw    s7, 92(sp)
+// 0x01033fb4: 0x1033fb4: lw    s7, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1053,7 +1053,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01033fa8: 0x1033fa8: lw    s6, 88(sp)
+// 0x01033fb8: 0x1033fb8: lw    s6, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1062,7 +1062,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01033fac: 0x1033fac: lw    s5, 84(sp)
+// 0x01033fbc: 0x1033fbc: lw    s5, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1071,7 +1071,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01033fb0: 0x1033fb0: lw    s4, 80(sp)
+// 0x01033fc0: 0x1033fc0: lw    s4, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1080,7 +1080,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01033fb4: 0x1033fb4: lw    s3, 76(sp)
+// 0x01033fc4: 0x1033fc4: lw    s3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1089,7 +1089,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01033fb8: 0x1033fb8: lw    s2, 72(sp)
+// 0x01033fc8: 0x1033fc8: lw    s2, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1098,7 +1098,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01033fbc: 0x1033fbc: lw    s1, 68(sp)
+// 0x01033fcc: 0x1033fcc: lw    s1, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1107,7 +1107,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01033fc0: 0x1033fc0: lw    s0, 64(sp)
+// 0x01033fd0: 0x1033fd0: lw    s0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1116,7 +1116,7 @@ L_1033f9c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01033fc4: 0x1033fc4: jr    ra addiu sp, sp, 104
+// 0x01033fd4: 0x1033fd4: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -1128,7 +1128,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 is_alert_in_range_1033fcc(int32,int32,int32,int32,int32)
+.method public static int32 is_alert_in_range_1033fdc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 s6,int32 s7,int32 s5,int32 s8,int32 ra)
@@ -1190,15 +1190,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01033fcc: 0x1033fcc: addiu sp, sp, -672
+// 0x01033fdc: 0x1033fdc: addiu sp, sp, -672
 	ldloc.0
 	ldc.i4 -672
 	add
 	stloc.0
-// 0x01033fd0: 0x1033fd0: addiu a2, zero, 3
+// 0x01033fe0: 0x1033fe0: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x01033fd4: 0x1033fd4: lw    v1, 4(a0)
+// 0x01033fe4: 0x1033fe4: lw    v1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1207,14 +1207,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01033fd8: 0x1033fd8: lw    v0, 0(a0)
+// 0x01033fe8: 0x1033fe8: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01033fdc: 0x1033fdc: sw    a2, 56(sp)
+// 0x01033fec: 0x1033fec: sw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1223,10 +1223,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01033fe0: 0x1033fe0: addiu a2, zero, 2
+// 0x01033ff0: 0x1033ff0: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01033fe4: 0x1033fe4: sw    s7, 660(sp)
+// 0x01033ff4: 0x1033ff4: sw    s7, 660(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1235,7 +1235,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01033fe8: 0x1033fe8: sw    s2, 640(sp)
+// 0x01033ff8: 0x1033ff8: sw    s2, 640(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1244,10 +1244,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01033fec: 0x1033fec: addu  s7, a1, zero
+// 0x01033ffc: 0x1033ffc: addu  s7, a1, zero
 	ldloc.2
 	stloc 14
-// 0x01033ff0: 0x1033ff0: sw    s1, 636(sp)
+// 0x01034000: 0x1034000: sw    s1, 636(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1256,17 +1256,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01033ff4: 0x1033ff4: addiu a1, sp, 32
+// 0x01034004: 0x1034004: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01033ff8: 0x1033ff8: addiu s1, sp, 40
+// 0x01034008: 0x1034008: addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 9
-// 0x01033ffc: 0x1033ffc: sw    a2, 60(sp)
+// 0x0103400c: 0x103400c: sw    a2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1275,19 +1275,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01034000: 0x1034000: addu  s2, a0, zero
+// 0x01034010: 0x1034010: addu  s2, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01034004: 0x1034004: addiu a2, zero, 1
+// 0x01034014: 0x1034014: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01034008: 0x1034008: addiu a0, sp, 48
+// 0x01034018: 0x1034018: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x0103400c: 0x103400c: sw    ra, 668(sp)
-// 0x01034010: 0x1034010: sw    v1, 44(sp)
+// 0x0103401c: 0x103401c: sw    ra, 668(sp)
+// 0x01034020: 0x1034020: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1296,7 +1296,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01034014: 0x1034014: sw    a2, 64(sp)
+// 0x01034024: 0x1034024: sw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1305,7 +1305,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01034018: 0x1034018: sw    v0, 40(sp)
+// 0x01034028: 0x1034028: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1314,7 +1314,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103401c: 0x103401c: sw    s6, 656(sp)
+// 0x0103402c: 0x103402c: sw    s6, 656(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1323,7 +1323,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01034020: 0x1034020: sw    s0, 632(sp)
+// 0x01034030: 0x1034030: sw    s0, 632(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1332,7 +1332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01034024: 0x1034024: sw    s8, 664(sp)
+// 0x01034034: 0x1034034: sw    s8, 664(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1341,7 +1341,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01034028: 0x1034028: sw    s5, 652(sp)
+// 0x01034038: 0x1034038: sw    s5, 652(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1350,7 +1350,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0103402c: 0x103402c: sw    s4, 648(sp)
+// 0x0103403c: 0x103403c: sw    s4, 648(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1359,7 +1359,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01034030: 0x1034030: sw    s3, 644(sp)
+// 0x01034040: 0x1034040: sw    s3, 644(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1368,7 +1368,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01034034: 0x1034034: jal   0x100844c addiu s0, sp, 68
+// 0x01034044: 0x1034044: jal   0x100845c addiu s0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
@@ -1376,15 +1376,15 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103403c: 0x103403c: addu  a0, s1, zero
+// 0x0103404c: 0x103404c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01034040: 0x1034040: jal   0x10086bc addiu a1, zero, 20
+// 0x01034050: 0x1034050: jal   0x10086cc addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -1392,18 +1392,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034048: 0x1034048: addu  a0, s1, zero
+// 0x01034058: 0x1034058: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103404c: 0x103404c: addu  a1, zero, zero
+// 0x0103405c: 0x103405c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01034050: 0x1034050: jal   0x100b848 addu  a2, s0, zero
+// 0x01034060: 0x1034060: jal   0x100b858 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -1411,12 +1411,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_find_neighbours_100b848(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_find_neighbours_100b858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034058: 0x1034058: lw    a0, 12(s7)
+// 0x01034068: 0x1034068: lw    a0, 12(s7)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -1425,7 +1425,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103405c: 0x103405c: lw    a1, 4(s7)
+// 0x0103406c: 0x103406c: lw    a1, 4(s7)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -1434,12 +1434,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01034060: 0x1034060: addiu a2, sp, 28
+// 0x01034070: 0x1034070: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x01034064: 0x1034064: sw    v0, 620(sp)
+// 0x01034074: 0x1034074: sw    v0, 620(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1448,7 +1448,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01034068: 0x1034068: jal   0x10339b0 addiu s1, sp, 104
+// 0x01034078: 0x1034078: jal   0x10339c0 addiu s1, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -1458,12 +1458,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::get_street_from_line_10339b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::get_street_from_line_10339c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034070: 0x1034070: lw    a1, 28(sp)
+// 0x01034080: 0x1034080: lw    a1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1472,10 +1472,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01034074: 0x1034074: addu  a0, s1, zero
+// 0x01034084: 0x1034084: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01034078: 0x1034078: jal   0x1001af8 addiu a2, zero, 512
+// 0x01034088: 0x1034088: jal   0x1001af8 addiu a2, zero, 512
 	ldc.i4 512
 	stloc.3
 	ldloc.1
@@ -1484,23 +1484,23 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01034080: 0x1034080: addiu v0, sp, 64
+// 0x01034090: 0x1034090: addiu v0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 6
-// 0x01034084: 0x1034084: sb    zero, 615(sp)
+// 0x01034094: 0x1034094: sb    zero, 615(sp)
 	ldloc.0
 	ldc.i4 615
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01034088: 0x1034088: addiu s6, sp, 56
+// 0x01034098: 0x1034098: addiu s6, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 13
-// 0x0103408c: 0x103408c: j	 0x103409c sw    v0, 624(sp)
+// 0x0103409c: 0x103409c: j	 0x10340ac sw    v0, 624(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1509,44 +1509,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	br L_103409c
+	br L_10340ac
 // --- basic block ---
-L_1034094:
-// 0x01034094: 0x1034094: bne   s0, zero, 0x1034230 addiu s6, s6, 4
+L_10340a4:
+// 0x010340a4: 0x10340a4: bne   s0, zero, 0x1034240 addiu s6, s6, 4
 	ldloc 8
 	ldloc 13
 	ldc.i4.4
 	add
 	stloc 13
-	brtrue L_1034230
+	brtrue L_1034240
 // --- basic block ---
-L_103409c:
-// 0x0103409c: 0x103409c: lui   s1, 0x60000
+L_10340ac:
+// 0x010340ac: 0x10340ac: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x010340a0: 0x10340a0: addiu s1, s1, -18068
+// 0x010340b0: 0x10340b0: addiu s1, s1, -17604
 	ldloc 9
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 9
-// 0x010340a4: 0x10340a4: addu  s0, zero, zero
+// 0x010340b4: 0x10340b4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010340a8: 0x10340a8: j	 0x10341f4 addu  s4, zero, zero
+// 0x010340b8: 0x10340b8: j	 0x1034204 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_10341f4
+	br L_1034204
 // --- basic block ---
-L_10340b0:
-// 0x010340b0: 0x10340b0: lw    v0, 0(s1)
+L_10340c0:
+// 0x010340c0: 0x10340c0: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010340b4: 0x10340b4: sll   zero, zero, 0
-// 0x010340b8: 0x10340b8: lw    v0, 76(v0)
+// 0x010340c4: 0x10340c4: sll   zero, zero, 0
+// 0x010340c8: 0x10340c8: lw    v0, 76(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1555,8 +1555,8 @@ L_10340b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010340bc: 0x10340bc: sll   zero, zero, 0
-// 0x010340c0: 0x10340c0: jalr  v0 sll   zero, zero, 0
+// 0x010340cc: 0x10340cc: sll   zero, zero, 0
+// 0x010340d0: 0x10340d0: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -1568,43 +1568,43 @@ L_10340b0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010340c8: 0x10340c8: lw    v1, 0(s6)
+// 0x010340d8: 0x10340d8: lw    v1, 0(s6)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010340cc: 0x10340cc: sll   zero, zero, 0
-// 0x010340d0: 0x10340d0: bne   v0, v1, 0x10341ec lui   v1, 0x60000
+// 0x010340dc: 0x10340dc: sll   zero, zero, 0
+// 0x010340e0: 0x10340e0: bne   v0, v1, 0x10341fc lui   v1, 0x60000
 	ldloc 6
 	ldloc 7
 	ldc.i4 393216
 	stloc 7
-	bne.un L_10341ec
+	bne.un L_10341fc
 // --- basic block ---
-// 0x010340d8: 0x10340d8: lw    v0, -17944(v1)
+// 0x010340e8: 0x10340e8: lw    v0, -17480(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4486
+	ldc.i4 -4370
 	add
 	ldelem.i4
 	stloc 6
-// 0x010340dc: 0x10340dc: sll   zero, zero, 0
-// 0x010340e0: 0x10340e0: bne   v0, zero, 0x1034108 sll   zero, zero, 0
+// 0x010340ec: 0x10340ec: sll   zero, zero, 0
+// 0x010340f0: 0x10340f0: bne   v0, zero, 0x1034118 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1034108
+	brtrue L_1034118
 // --- basic block ---
-// 0x010340e8: 0x10340e8: lw    v0, 0(s1)
+// 0x010340f8: 0x10340f8: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010340ec: 0x10340ec: lw    a0, 40(sp)
+// 0x010340fc: 0x10340fc: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1613,7 +1613,7 @@ L_10340b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010340f0: 0x10340f0: lw    v0, 72(v0)
+// 0x01034100: 0x1034100: lw    v0, 72(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1622,7 +1622,7 @@ L_10340b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010340f4: 0x10340f4: lw    a1, 44(sp)
+// 0x01034104: 0x1034104: lw    a1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1631,7 +1631,7 @@ L_10340b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010340f8: 0x10340f8: jalr  v0 sll   zero, zero, 0
+// 0x01034108: 0x1034108: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -1643,20 +1643,20 @@ L_10340b0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034100: 0x1034100: beq   v0, zero, 0x10341ec sll   zero, zero, 0
+// 0x01034110: 0x1034110: beq   v0, zero, 0x10341fc sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10341ec
+	brfalse L_10341fc
 // --- basic block ---
-L_1034108:
-// 0x01034108: 0x1034108: lw    v0, 0(s1)
+L_1034118:
+// 0x01034118: 0x1034118: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0103410c: 0x103410c: sll   zero, zero, 0
-// 0x01034110: 0x1034110: lw    v0, 64(v0)
+// 0x0103411c: 0x103411c: sll   zero, zero, 0
+// 0x01034120: 0x1034120: lw    v0, 64(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1665,8 +1665,8 @@ L_1034108:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01034114: 0x1034114: sll   zero, zero, 0
-// 0x01034118: 0x1034118: jalr  v0 sll   zero, zero, 0
+// 0x01034124: 0x1034124: sll   zero, zero, 0
+// 0x01034128: 0x1034128: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -1678,28 +1678,28 @@ L_1034108:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034120: 0x1034120: beq   v0, zero, 0x10341b4 addiu s8, sp, 68
+// 0x01034130: 0x1034130: beq   v0, zero, 0x10341c4 addiu s8, sp, 68
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 16
-	brfalse L_10341b4
+	brfalse L_10341c4
 // --- basic block ---
-// 0x01034128: 0x1034128: j	 0x1034190 addu  s3, zero, zero
+// 0x01034138: 0x1034138: j	 0x10341a0 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1034190
+	br L_10341a0
 // --- basic block ---
-L_1034130:
-// 0x01034130: 0x1034130: lw    v0, 0(s8)
+L_1034140:
+// 0x01034140: 0x1034140: lw    v0, 0(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01034134: 0x1034134: lw    v1, 576(a0)
+// 0x01034144: 0x1034144: lw    v1, 576(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1708,64 +1708,64 @@ L_1034130:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034138: 0x1034138: sll   zero, zero, 0
-// 0x0103413c: 0x103413c: beq   v0, v1, 0x1034154 addiu s8, s8, 4
+// 0x01034148: 0x1034148: sll   zero, zero, 0
+// 0x0103414c: 0x103414c: beq   v0, v1, 0x1034164 addiu s8, s8, 4
 	ldloc 6
 	ldloc 7
 	ldloc 16
 	ldc.i4.4
 	add
 	stloc 16
-	beq  L_1034154
+	beq  L_1034164
 // --- basic block ---
-// 0x01034144: 0x1034144: bltz  v0, 0x1034154 addu  a0, v0, zero
+// 0x01034154: 0x1034154: bltz  v0, 0x1034164 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
 	ldc.i4.s 0
-	blt L_1034154
+	blt L_1034164
 // --- basic block ---
-// 0x0103414c: 0x103414c: jal   0x100b164 sll   zero, zero, 0
+// 0x0103415c: 0x103415c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1034154:
-// 0x01034154: 0x1034154: lw    a0, 0(s1)
+L_1034164:
+// 0x01034164: 0x1034164: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01034158: 0x1034158: addiu v0, sp, 24
+// 0x01034168: 0x1034168: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x0103415c: 0x103415c: addiu v1, sp, 104
+// 0x0103416c: 0x103416c: addiu v1, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
 	stloc 7
-// 0x01034160: 0x1034160: addu  a1, s2, zero
+// 0x01034170: 0x1034170: addu  a1, s2, zero
 	ldloc 12
 	stloc.2
-// 0x01034164: 0x1034164: addu  a2, s7, zero
+// 0x01034174: 0x1034174: addu  a2, s7, zero
 	ldloc 14
 	stloc.3
-// 0x01034168: 0x1034168: addiu a3, sp, 36
+// 0x01034178: 0x1034178: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x0103416c: 0x103416c: sw    v0, 16(sp)
+// 0x0103417c: 0x103417c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1774,7 +1774,7 @@ L_1034154:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01034170: 0x1034170: jal   0x1033cdc sw    v1, 20(sp)
+// 0x01034180: 0x1034180: jal   0x1033cec sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1788,16 +1788,16 @@ L_1034154:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::is_alert_in_range_provider_1033cdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::is_alert_in_range_provider_1033cec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034178: 0x1034178: beq   v0, zero, 0x103418c sll   zero, zero, 0
+// 0x01034188: 0x1034188: beq   v0, zero, 0x103419c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_103418c
+	brfalse L_103419c
 // --- basic block ---
-// 0x01034180: 0x1034180: sw    s3, 616(sp)
+// 0x01034190: 0x1034190: sw    s3, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1806,20 +1806,20 @@ L_1034154:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01034184: 0x1034184: addu  s5, s4, zero
+// 0x01034194: 0x1034194: addu  s5, s4, zero
 	ldloc 11
 	stloc 15
-// 0x01034188: 0x1034188: addiu s0, zero, 1
+// 0x01034198: 0x1034198: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_103418c:
-// 0x0103418c: 0x103418c: addiu s3, s3, 1
+L_103419c:
+// 0x0103419c: 0x103419c: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_1034190:
-// 0x01034190: 0x1034190: lw    a0, 620(sp)
+L_10341a0:
+// 0x010341a0: 0x10341a0: lw    a0, 620(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1828,57 +1828,57 @@ L_1034190:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01034194: 0x1034194: sll   zero, zero, 0
-// 0x01034198: 0x1034198: slt   v0, s3, a0
+// 0x010341a4: 0x10341a4: sll   zero, zero, 0
+// 0x010341a8: 0x10341a8: slt   v0, s3, a0
 	ldloc 10
 	ldloc.1
 	clt
 	stloc 6
-// 0x0103419c: 0x103419c: beq   v0, zero, 0x10341ec sll   zero, zero, 0
+// 0x010341ac: 0x10341ac: beq   v0, zero, 0x10341fc sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10341ec
+	brfalse L_10341fc
 // --- basic block ---
-// 0x010341a4: 0x10341a4: beq   s0, zero, 0x1034130 lui   a0, 0x0
+// 0x010341b4: 0x10341b4: beq   s0, zero, 0x1034140 lui   a0, 0x0
 	ldloc 8
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1034130
+	brfalse L_1034140
 // --- basic block ---
-// 0x010341ac: 0x10341ac: j	 0x10341ec addiu s0, zero, 1
+// 0x010341bc: 0x10341bc: j	 0x10341fc addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-	br L_10341ec
+	br L_10341fc
 // --- basic block ---
-L_10341b4:
-// 0x010341b4: 0x10341b4: lw    a0, 0(s1)
+L_10341c4:
+// 0x010341c4: 0x10341c4: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010341b8: 0x10341b8: addiu v0, sp, 24
+// 0x010341c8: 0x10341c8: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x010341bc: 0x10341bc: addiu v1, sp, 104
+// 0x010341cc: 0x10341cc: addiu v1, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
 	stloc 7
-// 0x010341c0: 0x10341c0: addu  a1, s2, zero
+// 0x010341d0: 0x10341d0: addu  a1, s2, zero
 	ldloc 12
 	stloc.2
-// 0x010341c4: 0x10341c4: addu  a2, s7, zero
+// 0x010341d4: 0x10341d4: addu  a2, s7, zero
 	ldloc 14
 	stloc.3
-// 0x010341c8: 0x10341c8: addiu a3, sp, 36
+// 0x010341d8: 0x10341d8: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x010341cc: 0x10341cc: sw    v0, 16(sp)
+// 0x010341dc: 0x10341dc: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1887,7 +1887,7 @@ L_10341b4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010341d0: 0x10341d0: jal   0x1033cdc sw    v1, 20(sp)
+// 0x010341e0: 0x10341e0: jal   0x1033cec sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1901,16 +1901,16 @@ L_10341b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::is_alert_in_range_provider_1033cdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::is_alert_in_range_provider_1033cec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010341d8: 0x10341d8: beq   v0, zero, 0x10341ec sll   zero, zero, 0
+// 0x010341e8: 0x10341e8: beq   v0, zero, 0x10341fc sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10341ec
+	brfalse L_10341fc
 // --- basic block ---
-// 0x010341e0: 0x10341e0: sw    s3, 616(sp)
+// 0x010341f0: 0x10341f0: sw    s3, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1919,33 +1919,33 @@ L_10341b4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010341e4: 0x10341e4: addu  s5, s4, zero
+// 0x010341f4: 0x10341f4: addu  s5, s4, zero
 	ldloc 11
 	stloc 15
-// 0x010341e8: 0x10341e8: addiu s0, zero, 1
+// 0x010341f8: 0x10341f8: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_10341ec:
-// 0x010341ec: 0x10341ec: addiu s4, s4, 1
+L_10341fc:
+// 0x010341fc: 0x10341fc: addiu s4, s4, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010341f0: 0x10341f0: addiu s1, s1, 4
+// 0x01034200: 0x1034200: addiu s1, s1, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_10341f4:
-// 0x010341f4: 0x10341f4: lui   a0, 0x60000
+L_1034204:
+// 0x01034204: 0x1034204: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x010341f8: 0x10341f8: addiu a0, a0, -18068
+// 0x01034208: 0x1034208: addiu a0, a0, -17604
 	ldloc.1
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc.1
-// 0x010341fc: 0x10341fc: lw    v0, 80(a0)
+// 0x0103420c: 0x103420c: lw    v0, 80(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1954,22 +1954,22 @@ L_10341f4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01034200: 0x1034200: sll   zero, zero, 0
-// 0x01034204: 0x1034204: slt   v0, s4, v0
+// 0x01034210: 0x1034210: sll   zero, zero, 0
+// 0x01034214: 0x1034214: slt   v0, s4, v0
 	ldloc 11
 	ldloc 6
 	clt
 	stloc 6
-// 0x01034208: 0x1034208: beq   v0, zero, 0x1034218 sll   zero, zero, 0
+// 0x01034218: 0x1034218: beq   v0, zero, 0x1034228 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1034218
+	brfalse L_1034228
 // --- basic block ---
-// 0x01034210: 0x1034210: beq   s0, zero, 0x10340b0 sll   zero, zero, 0
+// 0x01034220: 0x1034220: beq   s0, zero, 0x10340c0 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10340b0
+	brfalse L_10340c0
 // --- basic block ---
-L_1034218:
-// 0x01034218: 0x1034218: lw    v0, 624(sp)
+L_1034228:
+// 0x01034228: 0x1034228: lw    v0, 624(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1978,43 +1978,43 @@ L_1034218:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103421c: 0x103421c: sll   zero, zero, 0
-// 0x01034220: 0x1034220: bne   s6, v0, 0x1034094 sll   zero, zero, 0
+// 0x0103422c: 0x103422c: sll   zero, zero, 0
+// 0x01034230: 0x1034230: bne   s6, v0, 0x10340a4 sll   zero, zero, 0
 	ldloc 13
 	ldloc 6
-	bne.un L_1034094
+	bne.un L_10340a4
 // --- basic block ---
-// 0x01034228: 0x1034228: beq   s0, zero, 0x10342d4 sll   zero, zero, 0
+// 0x01034238: 0x1034238: beq   s0, zero, 0x10342e4 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10342d4
+	brfalse L_10342e4
 // --- basic block ---
-L_1034230:
-// 0x01034230: 0x1034230: lui   s0, 0x60000
+L_1034240:
+// 0x01034240: 0x1034240: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01034234: 0x1034234: sll   v0, s5, 2
+// 0x01034244: 0x1034244: sll   v0, s5, 2
 	ldloc 15
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01034238: 0x1034238: addiu s0, s0, -18068
+// 0x01034248: 0x1034248: addiu s0, s0, -17604
 	ldloc 8
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 8
-// 0x0103423c: 0x103423c: addu  s0, v0, s0
+// 0x0103424c: 0x103424c: addu  s0, v0, s0
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x01034240: 0x1034240: lw    v0, 0(s0)
+// 0x01034250: 0x1034250: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01034244: 0x1034244: lw    a0, 36(sp)
+// 0x01034254: 0x1034254: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2023,7 +2023,7 @@ L_1034230:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01034248: 0x1034248: lw    v0, 16(v0)
+// 0x01034258: 0x1034258: lw    v0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2032,8 +2032,8 @@ L_1034230:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103424c: 0x103424c: sll   zero, zero, 0
-// 0x01034250: 0x1034250: jalr  v0 lui   s1, 0x60000
+// 0x0103425c: 0x103425c: sll   zero, zero, 0
+// 0x01034260: 0x1034260: jalr  v0 lui   s1, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 9
@@ -2047,7 +2047,7 @@ L_1034230:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034258: 0x1034258: lw    a0, 12(s2)
+// 0x01034268: 0x1034268: lw    a0, 12(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2056,7 +2056,7 @@ L_1034230:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103425c: 0x103425c: lw    v1, 616(sp)
+// 0x0103426c: 0x103426c: lw    v1, 616(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2065,10 +2065,10 @@ L_1034230:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034260: 0x1034260: addu  s4, v0, zero
+// 0x01034270: 0x1034270: addu  s4, v0, zero
 	ldloc 6
 	stloc 11
-// 0x01034264: 0x1034264: jal   0x1007e4c sll   s3, v1, 2
+// 0x01034274: 0x1034274: jal   0x1007e5c sll   s3, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
@@ -2078,34 +2078,34 @@ L_1034230:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103426c: 0x103426c: sltu  v0, v0, s4
+// 0x0103427c: 0x103427c: sltu  v0, v0, s4
 	ldloc 6
 	ldloc 11
 	clt.un
 	stloc 6
-// 0x01034270: 0x1034270: lw    a1, 0(s0)
+// 0x01034280: 0x1034280: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01034274: 0x1034274: addiu s2, sp, 48
+// 0x01034284: 0x1034284: addiu s2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 12
-// 0x01034278: 0x1034278: addiu s4, sp, 24
+// 0x01034288: 0x1034288: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x0103427c: 0x103427c: lw    a0, 36(sp)
+// 0x0103428c: 0x103428c: lw    a0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2114,7 +2114,7 @@ L_1034230:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01034280: 0x1034280: lw    v1, 24(sp)
+// 0x01034290: 0x1034290: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2123,15 +2123,15 @@ L_1034230:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034284: 0x1034284: beq   v0, zero, 0x1034298 addiu s0, s1, -17984
+// 0x01034294: 0x1034294: beq   v0, zero, 0x10342a8 addiu s0, s1, -17520
 	ldloc 6
 	ldloc 9
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 8
-	brfalse L_1034298
+	brfalse L_10342a8
 // --- basic block ---
-// 0x0103428c: 0x103428c: lw    v0, 8(a1)
+// 0x0103429c: 0x103429c: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2140,13 +2140,13 @@ L_1034230:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01034290: 0x1034290: j	 0x10342a0 addiu a1, zero, 2
+// 0x010342a0: 0x10342a0: j	 0x10342b0 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-	br L_10342a0
+	br L_10342b0
 // --- basic block ---
-L_1034298:
-// 0x01034298: 0x1034298: lw    v0, 8(a1)
+L_10342a8:
+// 0x010342a8: 0x10342a8: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2155,11 +2155,11 @@ L_1034298:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103429c: 0x103429c: addiu a1, zero, 1
+// 0x010342ac: 0x10342ac: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-L_10342a0:
-// 0x010342a0: 0x10342a0: sw    a1, 8(s0)
+L_10342b0:
+// 0x010342b0: 0x10342b0: sw    a1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2168,7 +2168,7 @@ L_10342a0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010342a4: 0x10342a4: sw    v1, 4(s0)
+// 0x010342b4: 0x10342b4: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2177,7 +2177,7 @@ L_10342a0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010342a8: 0x10342a8: jalr  v0 addu  s3, s4, s3
+// 0x010342b8: 0x10342b8: jalr  v0 addu  s3, s4, s3
 	ldloc 6
 	ldloc 11
 	ldloc 10
@@ -2193,7 +2193,7 @@ L_10342a0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010342b0: 0x10342b0: lw    v1, 44(s3)
+// 0x010342c0: 0x10342c0: lw    v1, 44(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2202,7 +2202,7 @@ L_10342a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010342b4: 0x10342b4: lw    a1, 32(sp)
+// 0x010342c4: 0x10342c4: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2211,10 +2211,10 @@ L_10342a0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010342b8: 0x10342b8: addu  a0, s2, zero
+// 0x010342c8: 0x10342c8: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x010342bc: 0x10342bc: sw    v1, 16(s0)
+// 0x010342cc: 0x10342cc: sw    v1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2223,7 +2223,7 @@ L_10342a0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010342c0: 0x10342c0: sw    s5, 12(s0)
+// 0x010342d0: 0x10342d0: sw    s5, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2232,12 +2232,12 @@ L_10342a0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010342c4: 0x10342c4: jal   0x10086bc sw    v0, -17984(s1)
+// 0x010342d4: 0x10342d4: jal   0x10086cc sw    v0, -17520(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldloc 6
 	stelem.i4
@@ -2246,18 +2246,18 @@ L_10342a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010342cc: 0x10342cc: j	 0x10342e4 addiu v0, zero, 1
+// 0x010342dc: 0x10342dc: j	 0x10342f4 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10342e4
+	br L_10342f4
 // --- basic block ---
-L_10342d4:
-// 0x010342d4: 0x10342d4: lw    a1, 32(sp)
+L_10342e4:
+// 0x010342e4: 0x10342e4: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2266,7 +2266,7 @@ L_10342d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010342d8: 0x10342d8: jal   0x10086bc addiu a0, sp, 48
+// 0x010342e8: 0x10342e8: jal   0x10086cc addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2276,17 +2276,17 @@ L_10342d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010342e0: 0x10342e0: addu  v0, zero, zero
+// 0x010342f0: 0x10342f0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10342e4:
-// 0x010342e4: 0x10342e4: lw    ra, 668(sp)
-// 0x010342e8: 0x10342e8: lw    s8, 664(sp)
+L_10342f4:
+// 0x010342f4: 0x10342f4: lw    ra, 668(sp)
+// 0x010342f8: 0x10342f8: lw    s8, 664(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2295,7 +2295,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010342ec: 0x10342ec: lw    s7, 660(sp)
+// 0x010342fc: 0x10342fc: lw    s7, 660(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2304,7 +2304,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010342f0: 0x10342f0: lw    s6, 656(sp)
+// 0x01034300: 0x1034300: lw    s6, 656(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2313,7 +2313,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010342f4: 0x10342f4: lw    s5, 652(sp)
+// 0x01034304: 0x1034304: lw    s5, 652(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2322,7 +2322,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010342f8: 0x10342f8: lw    s4, 648(sp)
+// 0x01034308: 0x1034308: lw    s4, 648(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2331,7 +2331,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010342fc: 0x10342fc: lw    s3, 644(sp)
+// 0x0103430c: 0x103430c: lw    s3, 644(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2340,7 +2340,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01034300: 0x1034300: lw    s2, 640(sp)
+// 0x01034310: 0x1034310: lw    s2, 640(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2349,7 +2349,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01034304: 0x1034304: lw    s1, 636(sp)
+// 0x01034314: 0x1034314: lw    s1, 636(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2358,7 +2358,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01034308: 0x1034308: lw    s0, 632(sp)
+// 0x01034318: 0x1034318: lw    s0, 632(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2367,7 +2367,7 @@ L_10342e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103430c: 0x103430c: jr    ra addiu sp, sp, 672
+// 0x0103431c: 0x103431c: jr    ra addiu sp, sp, 672
 	ldloc.0
 	ldc.i4 672
 	add
@@ -2379,7 +2379,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_alerter_initialize_1034314(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alerter_initialize_1034324(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 v1,int32 s0,int32 s2,int32 ra)
@@ -2423,12 +2423,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034314: 0x1034314: addiu sp, sp, -40
+// 0x01034324: 0x1034324: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01034318: 0x1034318: sw    s0, 24(sp)
+// 0x01034328: 0x1034328: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2437,35 +2437,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103431c: 0x103431c: lui   a1, 0x0
+// 0x0103432c: 0x103432c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01034320: 0x1034320: lui   s0, 0x10000
+// 0x01034330: 0x1034330: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01034324: 0x1034324: lui   a2, 0x10000
+// 0x01034334: 0x1034334: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01034328: 0x1034328: addiu a0, s0, 12560
+// 0x01034338: 0x1034338: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103432c: 0x103432c: addiu a1, a1, 12460
+// 0x0103433c: 0x103433c: addiu a1, a1, 12460
 	ldloc.2
 	ldc.i4 12460
 	add
 	stloc.2
-// 0x01034330: 0x1034330: addiu a2, a2, -30004
+// 0x01034340: 0x1034340: addiu a2, a2, -30004
 	ldloc.3
 	ldc.i4 -30004
 	add
 	stloc.3
-// 0x01034334: 0x1034334: addu  a3, zero, zero
+// 0x01034344: 0x1034344: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01034338: 0x1034338: sw    ra, 36(sp)
-// 0x0103433c: 0x103433c: sw    s2, 32(sp)
+// 0x01034348: 0x1034348: sw    ra, 36(sp)
+// 0x0103434c: 0x103434c: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2474,7 +2474,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01034340: 0x1034340: sw    s1, 28(sp)
+// 0x01034350: 0x1034350: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2483,7 +2483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01034344: 0x1034344: jal   0x100edb0 lui   s2, 0x0
+// 0x01034354: 0x1034354: jal   0x100edc0 lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -2491,41 +2491,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0103434c: 0x103434c: lui   s1, 0x20000
+// 0x0103435c: 0x103435c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01034350: 0x1034350: lui   a1, 0x0
+// 0x01034360: 0x1034360: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01034354: 0x1034354: addiu s1, s1, 9464
+// 0x01034364: 0x1034364: addiu s1, s1, 9928
 	ldloc 6
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 6
-// 0x01034358: 0x1034358: addiu a0, s0, 12560
+// 0x01034368: 0x1034368: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103435c: 0x103435c: addiu a3, s2, 20820
+// 0x0103436c: 0x103436c: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01034360: 0x1034360: addiu a1, a1, 12476
+// 0x01034370: 0x1034370: addiu a1, a1, 12476
 	ldloc.2
 	ldc.i4 12476
 	add
 	stloc.2
-// 0x01034364: 0x1034364: addu  a2, zero, zero
+// 0x01034374: 0x1034374: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01034368: 0x1034368: sw    s1, 16(sp)
+// 0x01034378: 0x1034378: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2534,7 +2534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103436c: 0x103436c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0103437c: 0x103437c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2548,33 +2548,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01034374: 0x1034374: lui   a1, 0x0
+// 0x01034384: 0x1034384: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01034378: 0x1034378: addiu a0, s0, 12560
+// 0x01034388: 0x1034388: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103437c: 0x103437c: addiu a1, a1, 12492
+// 0x0103438c: 0x103438c: addiu a1, a1, 12492
 	ldloc.2
 	ldc.i4 12492
 	add
 	stloc.2
-// 0x01034380: 0x1034380: addiu a3, s2, 20820
+// 0x01034390: 0x1034390: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01034384: 0x1034384: addu  a2, zero, zero
+// 0x01034394: 0x1034394: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01034388: 0x1034388: sw    s1, 16(sp)
+// 0x01034398: 0x1034398: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2583,7 +2583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103438c: 0x103438c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0103439c: 0x103439c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2597,31 +2597,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01034394: 0x1034394: lui   v0, 0x60000
+// 0x010343a4: 0x10343a4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01034398: 0x1034398: lui   a0, 0x60000
+// 0x010343a8: 0x10343a8: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103439c: 0x103439c: addiu a2, v0, -17984
+// 0x010343ac: 0x10343ac: addiu a2, v0, -17520
 	ldloc 7
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc.3
-// 0x010343a0: 0x10343a0: addiu v1, zero, -1
+// 0x010343b0: 0x10343b0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x010343a4: 0x10343a4: addiu a1, a0, -18068
+// 0x010343b4: 0x10343b4: addiu a1, a0, -17604
 	ldloc.1
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc.2
-// 0x010343a8: 0x10343a8: sw    v1, 12(a2)
+// 0x010343b8: 0x10343b8: sw    v1, 12(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2630,10 +2630,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010343ac: 0x10343ac: addiu a2, zero, 1
+// 0x010343bc: 0x10343bc: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010343b0: 0x10343b0: sw    a2, 80(a1)
+// 0x010343c0: 0x10343c0: sw    a2, 80(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2642,40 +2642,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010343b4: 0x10343b4: lui   a1, 0x60000
+// 0x010343c4: 0x10343c4: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010343b8: 0x10343b8: sw    zero, -17944(a1)
+// 0x010343c8: 0x10343c8: sw    zero, -17480(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4486
+	ldc.i4 -4370
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010343bc: 0x10343bc: lui   a1, 0x60000
+// 0x010343cc: 0x10343cc: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010343c0: 0x10343c0: sw    zero, -18072(a1)
+// 0x010343d0: 0x10343d0: sw    zero, -17608(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4518
+	ldc.i4 -4402
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010343c4: 0x10343c4: lw    ra, 36(sp)
-// 0x010343c8: 0x10343c8: lui   a1, 0x0
+// 0x010343d4: 0x10343d4: lw    ra, 36(sp)
+// 0x010343d8: 0x10343d8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010343cc: 0x10343cc: addiu a1, a1, 12364
+// 0x010343dc: 0x10343dc: addiu a1, a1, 12364
 	ldloc.2
 	ldc.i4 12364
 	add
 	stloc.2
-// 0x010343d0: 0x10343d0: lw    s2, 32(sp)
+// 0x010343e0: 0x10343e0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2684,7 +2684,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010343d4: 0x10343d4: lw    s1, 28(sp)
+// 0x010343e4: 0x10343e4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2693,7 +2693,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010343d8: 0x10343d8: lw    s0, 24(sp)
+// 0x010343e8: 0x10343e8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2702,25 +2702,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010343dc: 0x10343dc: sw    a1, -18068(a0)
+// 0x010343ec: 0x10343ec: sw    a1, -17604(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4517
+	ldc.i4 -4401
 	add
 	ldloc.2
 	stelem.i4
-// 0x010343e0: 0x10343e0: sw    v1, -17984(v0)
+// 0x010343f0: 0x10343f0: sw    v1, -17520(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldloc 8
 	stelem.i4
-// 0x010343e4: 0x10343e4: jr    ra addiu sp, sp, 40
+// 0x010343f4: 0x10343f4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2732,7 +2732,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 config_audio_alerts_enabled_1034410(int32,int32,int32,int32,int32)
+.method public static int32 config_audio_alerts_enabled_1034420(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2767,24 +2767,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034410: 0x1034410: lui   a0, 0x0
+// 0x01034420: 0x1034420: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01034414: 0x1034414: lui   a1, 0x0
+// 0x01034424: 0x1034424: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01034418: 0x1034418: addiu sp, sp, -24
+// 0x01034428: 0x1034428: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103441c: 0x103441c: addiu a0, a0, 12476
+// 0x0103442c: 0x103442c: addiu a0, a0, 12476
 	ldloc.1
 	ldc.i4 12476
 	add
 	stloc.1
-// 0x01034420: 0x1034420: sw    ra, 20(sp)
-// 0x01034424: 0x1034424: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01034430: 0x1034430: sw    ra, 20(sp)
+// 0x01034434: 0x1034434: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2794,14 +2794,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0103442c: 0x103442c: lw    ra, 20(sp)
-// 0x01034430: 0x1034430: sll   zero, zero, 0
-// 0x01034434: 0x1034434: jr    ra addiu sp, sp, 24
+// 0x0103443c: 0x103443c: lw    ra, 20(sp)
+// 0x01034440: 0x1034440: sll   zero, zero, 0
+// 0x01034444: 0x1034444: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2813,7 +2813,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_alerter_audio_103443c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alerter_audio_103444c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2848,35 +2848,35 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103443c: 0x103443c: addiu sp, sp, -24
+// 0x0103444c: 0x103444c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01034440: 0x1034440: sw    ra, 20(sp)
-// 0x01034444: 0x1034444: jal   0x1034410 sll   zero, zero, 0
+// 0x01034450: 0x1034450: sw    ra, 20(sp)
+// 0x01034454: 0x1034454: jal   0x1034420 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::config_audio_alerts_enabled_1034410(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::config_audio_alerts_enabled_1034420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103444c: 0x103444c: beq   v0, zero, 0x103448c lui   v1, 0x60000
+// 0x0103445c: 0x103445c: beq   v0, zero, 0x103449c lui   v1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 6
-	brfalse L_103448c
+	brfalse L_103449c
 // --- basic block ---
-// 0x01034454: 0x1034454: addiu v0, v1, -17984
+// 0x01034464: 0x1034464: addiu v0, v1, -17520
 	ldloc 6
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 5
-// 0x01034458: 0x1034458: lw    a0, 12(v0)
+// 0x01034468: 0x1034468: lw    a0, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2885,41 +2885,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103445c: 0x103445c: lui   v0, 0x60000
+// 0x0103446c: 0x103446c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034460: 0x1034460: sll   a0, a0, 2
+// 0x01034470: 0x1034470: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01034464: 0x1034464: addiu v0, v0, -18068
+// 0x01034474: 0x1034474: addiu v0, v0, -17604
 	ldloc 5
-	ldc.i4 -18068
+	ldc.i4 -17604
 	add
 	stloc 5
-// 0x01034468: 0x1034468: addu  v0, a0, v0
+// 0x01034478: 0x1034478: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0103446c: 0x103446c: lw    v0, 0(v0)
+// 0x0103447c: 0x103447c: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01034470: 0x1034470: lw    a0, -17984(v1)
+// 0x01034480: 0x1034480: lw    a0, -17520(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc.1
-// 0x01034474: 0x1034474: lw    v0, 36(v0)
+// 0x01034484: 0x1034484: lw    v0, 36(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2928,8 +2928,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034478: 0x1034478: sll   zero, zero, 0
-// 0x0103447c: 0x103447c: jalr  v0 sll   zero, zero, 0
+// 0x01034488: 0x1034488: sll   zero, zero, 0
+// 0x0103448c: 0x103448c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2941,7 +2941,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034484: 0x1034484: jal   0x105195c addu  a0, v0, zero
+// 0x01034494: 0x1034494: jal   0x105196c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2949,15 +2949,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103448c:
-// 0x0103448c: 0x103448c: lw    ra, 20(sp)
-// 0x01034490: 0x1034490: sll   zero, zero, 0
-// 0x01034494: 0x1034494: jr    ra addiu sp, sp, 24
+L_103449c:
+// 0x0103449c: 0x103449c: lw    ra, 20(sp)
+// 0x010344a0: 0x10344a0: sll   zero, zero, 0
+// 0x010344a4: 0x10344a4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2969,7 +2969,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alerter_display_103449c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alerter_display_10344ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -3007,25 +3007,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103449c: 0x103449c: lui   v0, 0x60000
+// 0x010344ac: 0x10344ac: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010344a0: 0x10344a0: lw    v0, -17944(v0)
+// 0x010344b0: 0x10344b0: lw    v0, -17480(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4486
+	ldc.i4 -4370
 	add
 	ldelem.i4
 	stloc 5
-// 0x010344a4: 0x10344a4: addiu sp, sp, -24
+// 0x010344b4: 0x10344b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010344a8: 0x10344a8: sw    ra, 20(sp)
-// 0x010344ac: 0x10344ac: beq   v0, zero, 0x1034560 sw    s0, 16(sp)
+// 0x010344b8: 0x10344b8: sw    ra, 20(sp)
+// 0x010344bc: 0x10344bc: beq   v0, zero, 0x1034570 sw    s0, 16(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -3035,137 +3035,137 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1034560
+	brfalse L_1034570
 // --- basic block ---
-// 0x010344b4: 0x10344b4: lui   v0, 0x60000
+// 0x010344c4: 0x10344c4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010344b8: 0x10344b8: lw    v0, -17984(v0)
+// 0x010344c8: 0x10344c8: lw    v0, -17520(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc 5
-// 0x010344bc: 0x10344bc: addiu v1, zero, -1
+// 0x010344cc: 0x10344cc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010344c0: 0x10344c0: beq   v0, v1, 0x10345c8 lui   v1, 0x60000
+// 0x010344d0: 0x10344d0: beq   v0, v1, 0x10345d8 lui   v1, 0x60000
 	ldloc 5
 	ldloc 6
 	ldc.i4 393216
 	stloc 6
-	beq  L_10345c8
+	beq  L_10345d8
 // --- basic block ---
-// 0x010344c8: 0x10344c8: lw    v1, -18072(v1)
+// 0x010344d8: 0x10344d8: lw    v1, -17608(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4518
+	ldc.i4 -4402
 	add
 	ldelem.i4
 	stloc 6
-// 0x010344cc: 0x10344cc: sll   zero, zero, 0
-// 0x010344d0: 0x10344d0: beq   v1, zero, 0x10344f4 lui   s0, 0x60000
+// 0x010344dc: 0x10344dc: sll   zero, zero, 0
+// 0x010344e0: 0x10344e0: beq   v1, zero, 0x1034504 lui   s0, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 8
-	brfalse L_10344f4
+	brfalse L_1034504
 // --- basic block ---
-// 0x010344d8: 0x10344d8: lui   v1, 0x60000
+// 0x010344e8: 0x10344e8: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010344dc: 0x10344dc: lw    v1, -17964(v1)
+// 0x010344ec: 0x10344ec: lw    v1, -17500(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4491
+	ldc.i4 -4375
 	add
 	ldelem.i4
 	stloc 6
-// 0x010344e0: 0x10344e0: sll   zero, zero, 0
-// 0x010344e4: 0x10344e4: beq   v1, v0, 0x1034550 sll   zero, zero, 0
+// 0x010344f0: 0x10344f0: sll   zero, zero, 0
+// 0x010344f4: 0x10344f4: beq   v1, v0, 0x1034560 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_1034550
+	beq  L_1034560
 // --- basic block ---
-// 0x010344ec: 0x10344ec: jal   0x1033198 sll   zero, zero, 0
+// 0x010344fc: 0x10344fc: jal   0x10331a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::hide_alert_dialog_1033198(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::hide_alert_dialog_10331a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10344f4:
-// 0x010344f4: 0x10344f4: lw    a0, -18084(s0)
+L_1034504:
+// 0x01034504: 0x1034504: lw    a0, -17620(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4521
+	ldc.i4 -4405
 	add
 	ldelem.i4
 	stloc.1
-// 0x010344f8: 0x10344f8: sll   zero, zero, 0
-// 0x010344fc: 0x10344fc: beq   a0, zero, 0x1034510 sll   zero, zero, 0
+// 0x01034508: 0x1034508: sll   zero, zero, 0
+// 0x0103450c: 0x103450c: beq   a0, zero, 0x1034520 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1034510
+	brfalse L_1034520
 // --- basic block ---
-// 0x01034504: 0x1034504: jal   0x104fd00 sll   zero, zero, 0
+// 0x01034514: 0x1034514: jal   0x104fd10 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103450c: 0x103450c: sw    zero, -18084(s0)
+// 0x0103451c: 0x103451c: sw    zero, -17620(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4521
+	ldc.i4 -4405
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1034510:
-// 0x01034510: 0x1034510: lui   s0, 0x60000
+L_1034520:
+// 0x01034520: 0x1034520: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01034514: 0x1034514: lw    v1, -17984(s0)
+// 0x01034524: 0x1034524: lw    v1, -17520(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4496
+	ldc.i4 -4380
 	add
 	ldelem.i4
 	stloc 6
-// 0x01034518: 0x1034518: lui   v0, 0x60000
+// 0x01034528: 0x1034528: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103451c: 0x103451c: addiu s0, s0, -17984
+// 0x0103452c: 0x103452c: addiu s0, s0, -17520
 	ldloc 8
-	ldc.i4 -17984
+	ldc.i4 -17520
 	add
 	stloc 8
-// 0x01034520: 0x1034520: jal   0x10334d8 sw    v1, -17964(v0)
+// 0x01034530: 0x1034530: jal   0x10334e8 sw    v1, -17500(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4491
+	ldc.i4 -4375
 	add
 	ldloc 6
 	stelem.i4
@@ -3174,12 +3174,12 @@ L_1034510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::show_alert_dialog_10334d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::show_alert_dialog_10334e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034528: 0x1034528: lw    v1, 8(s0)
+// 0x01034538: 0x1034538: lw    v1, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3188,109 +3188,109 @@ L_1034510:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103452c: 0x103452c: addiu v0, zero, 1
+// 0x0103453c: 0x103453c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01034530: 0x1034530: bne   v1, v0, 0x1034544 addiu v1, zero, 1
+// 0x01034540: 0x1034540: bne   v1, v0, 0x1034554 addiu v1, zero, 1
 	ldloc 6
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	bne.un L_1034544
+	bne.un L_1034554
 // --- basic block ---
-// 0x01034538: 0x1034538: jal   0x103443c sll   zero, zero, 0
+// 0x01034548: 0x1034548: jal   0x103444c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_alerter_audio_103443c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_alerter_audio_103444c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034540: 0x1034540: addiu v1, zero, 1
+// 0x01034550: 0x1034550: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1034544:
-// 0x01034544: 0x1034544: lui   v0, 0x60000
+L_1034554:
+// 0x01034554: 0x1034554: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034548: 0x1034548: j	 0x10345c8 sw    v1, -18072(v0)
+// 0x01034558: 0x1034558: j	 0x10345d8 sw    v1, -17608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4518
+	ldc.i4 -4402
 	add
 	ldloc 6
 	stelem.i4
-	br L_10345c8
+	br L_10345d8
 // --- basic block ---
-L_1034550:
-// 0x01034550: 0x1034550: jal   0x1033314 sll   zero, zero, 0
+L_1034560:
+// 0x01034560: 0x1034560: jal   0x1033324 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl37::update_alert_1033314(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::update_alert_1033324(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034558: 0x1034558: j	 0x10345c8 sll   zero, zero, 0
-	br L_10345c8
+// 0x01034568: 0x1034568: j	 0x10345d8 sll   zero, zero, 0
+	br L_10345d8
 // --- basic block ---
-L_1034560:
-// 0x01034560: 0x1034560: lui   v0, 0x60000
+L_1034570:
+// 0x01034570: 0x1034570: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034564: 0x1034564: lw    v0, -18072(v0)
+// 0x01034574: 0x1034574: lw    v0, -17608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4518
+	ldc.i4 -4402
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034568: 0x1034568: sll   zero, zero, 0
-// 0x0103456c: 0x103456c: beq   v0, zero, 0x10345c8 lui   s0, 0x60000
+// 0x01034578: 0x1034578: sll   zero, zero, 0
+// 0x0103457c: 0x103457c: beq   v0, zero, 0x10345d8 lui   s0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 8
-	brfalse L_10345c8
+	brfalse L_10345d8
 // --- basic block ---
-// 0x01034574: 0x1034574: lw    v0, -18084(s0)
+// 0x01034584: 0x1034584: lw    v0, -17620(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4521
+	ldc.i4 -4405
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034578: 0x1034578: sll   zero, zero, 0
-// 0x0103457c: 0x103457c: bne   v0, zero, 0x10345c8 lui   v0, 0x60000
+// 0x01034588: 0x1034588: sll   zero, zero, 0
+// 0x0103458c: 0x103458c: bne   v0, zero, 0x10345d8 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_10345c8
+	brtrue L_10345d8
 // --- basic block ---
-// 0x01034584: 0x1034584: lw    a0, -18076(v0)
+// 0x01034594: 0x1034594: lw    a0, -17612(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4519
+	ldc.i4 -4403
 	add
 	ldelem.i4
 	stloc.1
-// 0x01034588: 0x1034588: lui   a1, 0x10000
+// 0x01034598: 0x1034598: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103458c: 0x103458c: jal   0x109b304 addiu a1, a1, -25532
+// 0x0103459c: 0x103459c: jal   0x109b94c addiu a1, a1, -25532
 	ldloc.2
 	ldc.i4 -25532
 	add
@@ -3300,20 +3300,20 @@ L_1034560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034594: 0x1034594: lui   a1, 0x20000
+// 0x010345a4: 0x10345a4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01034598: 0x1034598: addu  a0, v0, zero
+// 0x010345a8: 0x10345a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103459c: 0x103459c: jal   0x1097e5c addiu a1, a1, 48
+// 0x010345ac: 0x10345ac: jal   0x10984a4 addiu a1, a1, 512
 	ldloc.2
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
 	ldloc.0
@@ -3321,46 +3321,46 @@ L_1034560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010345a4: 0x10345a4: lui   v0, 0x1030000
+// 0x010345b4: 0x10345b4: lui   v0, 0x1030000
 	ldc.i4 16973824
 	stloc 5
-// 0x010345a8: 0x10345a8: addiu v0, v0, 12804
+// 0x010345b8: 0x10345b8: addiu v0, v0, 12820
 	ldloc 5
-	ldc.i4 12804
+	ldc.i4 12820
 	add
 	stloc 5
-// 0x010345ac: 0x10345ac: addiu a2, zero, 5
+// 0x010345bc: 0x10345bc: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x010345b0: 0x10345b0: lui   v1, 0x60000
+// 0x010345c0: 0x10345c0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010345b4: 0x10345b4: addu  a1, v0, zero
+// 0x010345c4: 0x10345c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010345b8: 0x10345b8: addiu a0, zero, 1000
+// 0x010345c8: 0x10345c8: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x010345bc: 0x10345bc: sw    a2, -18080(v1)
+// 0x010345cc: 0x10345cc: sw    a2, -17616(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4520
+	ldc.i4 -4404
 	add
 	ldloc.3
 	stelem.i4
-// 0x010345c0: 0x10345c0: jal   0x104fe98 sw    v0, -18084(s0)
+// 0x010345d0: 0x10345d0: jal   0x104fea8 sw    v0, -17620(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4521
+	ldc.i4 -4405
 	add
 	ldloc 5
 	stelem.i4
@@ -3369,14 +3369,14 @@ L_1034560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10345c8:
-// 0x010345c8: 0x10345c8: lw    ra, 20(sp)
-// 0x010345cc: 0x10345cc: lw    s0, 16(sp)
+L_10345d8:
+// 0x010345d8: 0x10345d8: lw    ra, 20(sp)
+// 0x010345dc: 0x10345dc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3385,7 +3385,7 @@ L_10345c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010345d0: 0x10345d0: jr    ra addiu sp, sp, 24
+// 0x010345e0: 0x10345e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3397,7 +3397,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 config_alerts_enabled_10345d8(int32,int32,int32,int32,int32)
+.method public static int32 config_alerts_enabled_10345e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3432,24 +3432,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010345d8: 0x10345d8: lui   a0, 0x0
+// 0x010345e8: 0x10345e8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010345dc: 0x10345dc: lui   a1, 0x0
+// 0x010345ec: 0x10345ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010345e0: 0x10345e0: addiu sp, sp, -24
+// 0x010345f0: 0x10345f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010345e4: 0x10345e4: addiu a0, a0, 12492
+// 0x010345f4: 0x10345f4: addiu a0, a0, 12492
 	ldloc.1
 	ldc.i4 12492
 	add
 	stloc.1
-// 0x010345e8: 0x10345e8: sw    ra, 20(sp)
-// 0x010345ec: 0x10345ec: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010345f8: 0x10345f8: sw    ra, 20(sp)
+// 0x010345fc: 0x10345fc: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3459,14 +3459,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010345f4: 0x10345f4: lw    ra, 20(sp)
-// 0x010345f8: 0x10345f8: sll   zero, zero, 0
-// 0x010345fc: 0x10345fc: jr    ra addiu sp, sp, 24
+// 0x01034604: 0x1034604: lw    ra, 20(sp)
+// 0x01034608: 0x1034608: sll   zero, zero, 0
+// 0x0103460c: 0x103460c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3478,7 +3478,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_alerter_check_1034604(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alerter_check_1034614(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -3513,16 +3513,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034604: 0x1034604: addiu sp, sp, -32
+// 0x01034614: 0x1034614: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01034608: 0x1034608: beq   a1, zero, 0x103465c sw    ra, 28(sp)
+// 0x01034618: 0x1034618: beq   a1, zero, 0x103466c sw    ra, 28(sp)
 	ldloc.2
-	brfalse L_103465c
+	brfalse L_103466c
 // --- basic block ---
-// 0x01034610: 0x1034610: lw    v1, 4(a1)
+// 0x01034620: 0x1034620: lw    v1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3531,15 +3531,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034614: 0x1034614: addiu v0, zero, -1
+// 0x01034624: 0x1034624: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01034618: 0x1034618: beq   v1, v0, 0x103465c sll   zero, zero, 0
+// 0x01034628: 0x1034628: beq   v1, v0, 0x103466c sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	beq  L_103465c
+	beq  L_103466c
 // --- basic block ---
-// 0x01034620: 0x1034620: sw    a0, 16(sp)
+// 0x01034630: 0x1034630: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3548,7 +3548,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01034624: 0x1034624: jal   0x10345d8 sw    a1, 20(sp)
+// 0x01034634: 0x1034634: jal   0x10345e8 sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3562,12 +3562,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::config_alerts_enabled_10345d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::config_alerts_enabled_10345e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103462c: 0x103462c: lw    a0, 16(sp)
+// 0x0103463c: 0x103463c: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3576,7 +3576,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01034630: 0x1034630: lw    a1, 20(sp)
+// 0x01034640: 0x1034640: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3585,56 +3585,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01034634: 0x1034634: beq   v0, zero, 0x103465c sll   zero, zero, 0
+// 0x01034644: 0x1034644: beq   v0, zero, 0x103466c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_103465c
+	brfalse L_103466c
 // --- basic block ---
-// 0x0103463c: 0x103463c: jal   0x1033fcc sll   zero, zero, 0
+// 0x0103464c: 0x103464c: jal   0x1033fdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::is_alert_in_range_1033fcc(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::is_alert_in_range_1033fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01034644: 0x1034644: blez  v0, 0x1034658 lui   v1, 0x60000
+// 0x01034654: 0x1034654: blez  v0, 0x1034668 lui   v1, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 7
 	ldc.i4.s 0
-	ble L_1034658
+	ble L_1034668
 // --- basic block ---
-// 0x0103464c: 0x103464c: addiu v0, zero, 1
+// 0x0103465c: 0x103465c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01034650: 0x1034650: j	 0x103465c sw    v0, -17944(v1)
+// 0x01034660: 0x1034660: j	 0x103466c sw    v0, -17480(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4486
+	ldc.i4 -4370
 	add
 	ldloc 6
 	stelem.i4
-	br L_103465c
+	br L_103466c
 // --- basic block ---
-L_1034658:
-// 0x01034658: 0x1034658: sw    zero, -17944(v1)
+L_1034668:
+// 0x01034668: 0x1034668: sw    zero, -17480(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4486
+	ldc.i4 -4370
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_103465c:
-// 0x0103465c: 0x103465c: lw    ra, 28(sp)
-// 0x01034660: 0x1034660: sll   zero, zero, 0
-// 0x01034664: 0x1034664: jr    ra addiu sp, sp, 32
+L_103466c:
+// 0x0103466c: 0x103466c: lw    ra, 28(sp)
+// 0x01034670: 0x1034670: sll   zero, zero, 0
+// 0x01034674: 0x1034674: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3646,7 +3646,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_mood_get_name_103467c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_get_name_103468c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -3684,12 +3684,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103467c: 0x103467c: addiu sp, sp, -24
+// 0x0103468c: 0x103468c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01034680: 0x1034680: sw    s0, 16(sp)
+// 0x01034690: 0x1034690: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3698,32 +3698,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01034684: 0x1034684: lui   a0, 0x20000
+// 0x01034694: 0x1034694: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01034688: 0x1034688: lui   s0, 0x0
+// 0x01034698: 0x1034698: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0103468c: 0x103468c: lui   a2, 0x10000
+// 0x0103469c: 0x103469c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01034690: 0x1034690: addiu a1, s0, 12520
+// 0x010346a0: 0x10346a0: addiu a1, s0, 12520
 	ldloc 5
 	ldc.i4 12520
 	add
 	stloc.2
-// 0x01034694: 0x1034694: addiu a0, a0, -26888
+// 0x010346a4: 0x10346a4: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01034698: 0x1034698: addiu a2, a2, -14156
+// 0x010346a8: 0x10346a8: addiu a2, a2, -14160
 	ldloc.3
-	ldc.i4 -14156
+	ldc.i4 -14160
 	add
 	stloc.3
-// 0x0103469c: 0x103469c: sw    ra, 20(sp)
-// 0x010346a0: 0x10346a0: jal   0x100edb0 addu  a3, zero, zero
+// 0x010346ac: 0x10346ac: sw    ra, 20(sp)
+// 0x010346b0: 0x10346b0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3731,12 +3731,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010346a8: 0x10346a8: jal   0x100e348 addiu a0, s0, 12520
+// 0x010346b8: 0x10346b8: jal   0x100e358 addiu a0, s0, 12520
 	ldloc 5
 	ldc.i4 12520
 	add
@@ -3746,13 +3746,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010346b0: 0x10346b0: lw    ra, 20(sp)
-// 0x010346b4: 0x10346b4: lw    s0, 16(sp)
+// 0x010346c0: 0x10346c0: lw    ra, 20(sp)
+// 0x010346c4: 0x10346c4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3761,7 +3761,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010346b8: 0x10346b8: jr    ra addiu sp, sp, 24
+// 0x010346c8: 0x10346c8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3773,7 +3773,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_mood_from_string_1034720(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_from_string_1034730(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -3811,12 +3811,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034720: 0x1034720: addiu sp, sp, -24
+// 0x01034730: 0x1034730: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01034724: 0x1034724: sw    s0, 16(sp)
+// 0x01034734: 0x1034734: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3825,8 +3825,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01034728: 0x1034728: sw    ra, 20(sp)
-// 0x0103472c: 0x103472c: jal   0x106b044 addu  s0, a0, zero
+// 0x01034738: 0x1034738: sw    ra, 20(sp)
+// 0x0103473c: 0x103473c: jal   0x106b668 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -3834,26 +3834,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_IsNewbie_106b044(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_IsNewbie_106b668(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034734: 0x1034734: bne   v0, zero, 0x1034a58 addiu v1, zero, 34
+// 0x01034744: 0x1034744: bne   v0, zero, 0x1034a68 addiu v1, zero, 34
 	ldloc 5
 	ldc.i4.s 34
 	stloc 6
-	brtrue L_1034a58
+	brtrue L_1034a68
 // --- basic block ---
-// 0x0103473c: 0x103473c: lui   a1, 0x10000
+// 0x0103474c: 0x103474c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034740: 0x1034740: addiu a1, a1, -14156
+// 0x01034750: 0x1034750: addiu a1, a1, -14160
 	ldloc.2
-	ldc.i4 -14156
+	ldc.i4 -14160
 	add
 	stloc.2
-// 0x01034744: 0x1034744: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034754: 0x1034754: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3861,19 +3861,19 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103474c: 0x103474c: beq   v0, zero, 0x1034a54 sll   zero, zero, 0
+// 0x0103475c: 0x103475c: beq   v0, zero, 0x1034a64 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1034a54
+	brfalse L_1034a64
 // --- basic block ---
-// 0x01034754: 0x1034754: lui   a1, 0x10000
+// 0x01034764: 0x1034764: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034758: 0x1034758: addiu a1, a1, -14136
+// 0x01034768: 0x1034768: addiu a1, a1, -14140
 	ldloc.2
-	ldc.i4 -14136
+	ldc.i4 -14140
 	add
 	stloc.2
-// 0x0103475c: 0x103475c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103476c: 0x103476c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3881,21 +3881,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034764: 0x1034764: beq   v0, zero, 0x1034a58 addiu v1, zero, 2
+// 0x01034774: 0x1034774: beq   v0, zero, 0x1034a68 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103476c: 0x103476c: lui   a1, 0x10000
+// 0x0103477c: 0x103477c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034770: 0x1034770: addiu a1, a1, -14132
+// 0x01034780: 0x1034780: addiu a1, a1, -14136
 	ldloc.2
-	ldc.i4 -14132
+	ldc.i4 -14136
 	add
 	stloc.2
-// 0x01034774: 0x1034774: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034784: 0x1034784: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3903,21 +3903,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103477c: 0x103477c: beq   v0, zero, 0x1034a58 addiu v1, zero, 3
+// 0x0103478c: 0x103478c: beq   v0, zero, 0x1034a68 addiu v1, zero, 3
 	ldloc 5
 	ldc.i4.3
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034784: 0x1034784: lui   a1, 0x10000
+// 0x01034794: 0x1034794: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034788: 0x1034788: addiu a1, a1, -14128
+// 0x01034798: 0x1034798: addiu a1, a1, -14132
 	ldloc.2
-	ldc.i4 -14128
+	ldc.i4 -14132
 	add
 	stloc.2
-// 0x0103478c: 0x103478c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103479c: 0x103479c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3925,21 +3925,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034794: 0x1034794: beq   v0, zero, 0x1034a58 addiu v1, zero, 4
+// 0x010347a4: 0x10347a4: beq   v0, zero, 0x1034a68 addiu v1, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103479c: 0x103479c: lui   a1, 0x10000
+// 0x010347ac: 0x10347ac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010347a0: 0x10347a0: addiu a1, a1, -14120
+// 0x010347b0: 0x10347b0: addiu a1, a1, -14124
 	ldloc.2
-	ldc.i4 -14120
+	ldc.i4 -14124
 	add
 	stloc.2
-// 0x010347a4: 0x10347a4: jal   0x1001b14 addu  a0, s0, zero
+// 0x010347b4: 0x10347b4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3947,21 +3947,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010347ac: 0x10347ac: beq   v0, zero, 0x1034a58 addiu v1, zero, 5
+// 0x010347bc: 0x10347bc: beq   v0, zero, 0x1034a68 addiu v1, zero, 5
 	ldloc 5
 	ldc.i4.5
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010347b4: 0x10347b4: lui   a1, 0x10000
+// 0x010347c4: 0x10347c4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010347b8: 0x10347b8: addiu a1, a1, -14112
+// 0x010347c8: 0x10347c8: addiu a1, a1, -14116
 	ldloc.2
-	ldc.i4 -14112
+	ldc.i4 -14116
 	add
 	stloc.2
-// 0x010347bc: 0x10347bc: jal   0x1001b14 addu  a0, s0, zero
+// 0x010347cc: 0x10347cc: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3969,21 +3969,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010347c4: 0x10347c4: beq   v0, zero, 0x1034a58 addiu v1, zero, 6
+// 0x010347d4: 0x10347d4: beq   v0, zero, 0x1034a68 addiu v1, zero, 6
 	ldloc 5
 	ldc.i4.6
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010347cc: 0x10347cc: lui   a1, 0x10000
+// 0x010347dc: 0x10347dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010347d0: 0x10347d0: addiu a1, a1, -14100
+// 0x010347e0: 0x10347e0: addiu a1, a1, -14104
 	ldloc.2
-	ldc.i4 -14100
+	ldc.i4 -14104
 	add
 	stloc.2
-// 0x010347d4: 0x10347d4: jal   0x1001b14 addu  a0, s0, zero
+// 0x010347e4: 0x10347e4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3991,21 +3991,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010347dc: 0x10347dc: beq   v0, zero, 0x1034a58 addiu v1, zero, 7
+// 0x010347ec: 0x10347ec: beq   v0, zero, 0x1034a68 addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010347e4: 0x10347e4: lui   a1, 0x10000
+// 0x010347f4: 0x10347f4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010347e8: 0x10347e8: addiu a1, a1, -14092
+// 0x010347f8: 0x10347f8: addiu a1, a1, -14096
 	ldloc.2
-	ldc.i4 -14092
+	ldc.i4 -14096
 	add
 	stloc.2
-// 0x010347ec: 0x10347ec: jal   0x1001b14 addu  a0, s0, zero
+// 0x010347fc: 0x10347fc: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4013,21 +4013,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010347f4: 0x10347f4: beq   v0, zero, 0x1034a58 addiu v1, zero, 8
+// 0x01034804: 0x1034804: beq   v0, zero, 0x1034a68 addiu v1, zero, 8
 	ldloc 5
 	ldc.i4.8
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010347fc: 0x10347fc: lui   a1, 0x10000
+// 0x0103480c: 0x103480c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034800: 0x1034800: addiu a1, a1, -14084
+// 0x01034810: 0x1034810: addiu a1, a1, -14088
 	ldloc.2
-	ldc.i4 -14084
+	ldc.i4 -14088
 	add
 	stloc.2
-// 0x01034804: 0x1034804: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034814: 0x1034814: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4035,21 +4035,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103480c: 0x103480c: beq   v0, zero, 0x1034a58 addiu v1, zero, 9
+// 0x0103481c: 0x103481c: beq   v0, zero, 0x1034a68 addiu v1, zero, 9
 	ldloc 5
 	ldc.i4.s 9
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034814: 0x1034814: lui   a1, 0x10000
+// 0x01034824: 0x1034824: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034818: 0x1034818: addiu a1, a1, -14076
+// 0x01034828: 0x1034828: addiu a1, a1, -14080
 	ldloc.2
-	ldc.i4 -14076
+	ldc.i4 -14080
 	add
 	stloc.2
-// 0x0103481c: 0x103481c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103482c: 0x103482c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4057,21 +4057,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034824: 0x1034824: beq   v0, zero, 0x1034a58 addiu v1, zero, 10
+// 0x01034834: 0x1034834: beq   v0, zero, 0x1034a68 addiu v1, zero, 10
 	ldloc 5
 	ldc.i4.s 10
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103482c: 0x103482c: lui   a1, 0x10000
+// 0x0103483c: 0x103483c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034830: 0x1034830: addiu a1, a1, -14072
+// 0x01034840: 0x1034840: addiu a1, a1, -14076
 	ldloc.2
-	ldc.i4 -14072
+	ldc.i4 -14076
 	add
 	stloc.2
-// 0x01034834: 0x1034834: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034844: 0x1034844: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4079,21 +4079,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103483c: 0x103483c: beq   v0, zero, 0x1034a58 addiu v1, zero, 11
+// 0x0103484c: 0x103484c: beq   v0, zero, 0x1034a68 addiu v1, zero, 11
 	ldloc 5
 	ldc.i4.s 11
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034844: 0x1034844: lui   a1, 0x10000
+// 0x01034854: 0x1034854: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034848: 0x1034848: addiu a1, a1, -14060
+// 0x01034858: 0x1034858: addiu a1, a1, -14064
 	ldloc.2
-	ldc.i4 -14060
+	ldc.i4 -14064
 	add
 	stloc.2
-// 0x0103484c: 0x103484c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103485c: 0x103485c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4101,21 +4101,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034854: 0x1034854: beq   v0, zero, 0x1034a58 addiu v1, zero, 12
+// 0x01034864: 0x1034864: beq   v0, zero, 0x1034a68 addiu v1, zero, 12
 	ldloc 5
 	ldc.i4.s 12
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103485c: 0x103485c: lui   a1, 0x10000
+// 0x0103486c: 0x103486c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034860: 0x1034860: addiu a1, a1, -14052
+// 0x01034870: 0x1034870: addiu a1, a1, -14056
 	ldloc.2
-	ldc.i4 -14052
+	ldc.i4 -14056
 	add
 	stloc.2
-// 0x01034864: 0x1034864: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034874: 0x1034874: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4123,21 +4123,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103486c: 0x103486c: beq   v0, zero, 0x1034a58 addiu v1, zero, 13
+// 0x0103487c: 0x103487c: beq   v0, zero, 0x1034a68 addiu v1, zero, 13
 	ldloc 5
 	ldc.i4.s 13
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034874: 0x1034874: lui   a1, 0x10000
+// 0x01034884: 0x1034884: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034878: 0x1034878: addiu a1, a1, -14040
+// 0x01034888: 0x1034888: addiu a1, a1, -14044
 	ldloc.2
-	ldc.i4 -14040
+	ldc.i4 -14044
 	add
 	stloc.2
-// 0x0103487c: 0x103487c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103488c: 0x103488c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4145,21 +4145,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034884: 0x1034884: beq   v0, zero, 0x1034a58 addiu v1, zero, 14
+// 0x01034894: 0x1034894: beq   v0, zero, 0x1034a68 addiu v1, zero, 14
 	ldloc 5
 	ldc.i4.s 14
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103488c: 0x103488c: lui   a1, 0x10000
+// 0x0103489c: 0x103489c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034890: 0x1034890: addiu a1, a1, -14024
+// 0x010348a0: 0x10348a0: addiu a1, a1, -14028
 	ldloc.2
-	ldc.i4 -14024
+	ldc.i4 -14028
 	add
 	stloc.2
-// 0x01034894: 0x1034894: jal   0x1001b14 addu  a0, s0, zero
+// 0x010348a4: 0x10348a4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4167,21 +4167,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103489c: 0x103489c: beq   v0, zero, 0x1034a58 addiu v1, zero, 15
+// 0x010348ac: 0x10348ac: beq   v0, zero, 0x1034a68 addiu v1, zero, 15
 	ldloc 5
 	ldc.i4.s 15
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010348a4: 0x10348a4: lui   a1, 0x10000
+// 0x010348b4: 0x10348b4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010348a8: 0x10348a8: addiu a1, a1, -14012
+// 0x010348b8: 0x10348b8: addiu a1, a1, -14016
 	ldloc.2
-	ldc.i4 -14012
+	ldc.i4 -14016
 	add
 	stloc.2
-// 0x010348ac: 0x10348ac: jal   0x1001b14 addu  a0, s0, zero
+// 0x010348bc: 0x10348bc: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4189,21 +4189,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010348b4: 0x10348b4: beq   v0, zero, 0x1034a58 addiu v1, zero, 16
+// 0x010348c4: 0x10348c4: beq   v0, zero, 0x1034a68 addiu v1, zero, 16
 	ldloc 5
 	ldc.i4.s 16
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010348bc: 0x10348bc: lui   a1, 0x10000
+// 0x010348cc: 0x10348cc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010348c0: 0x10348c0: addiu a1, a1, -14000
+// 0x010348d0: 0x10348d0: addiu a1, a1, -14004
 	ldloc.2
-	ldc.i4 -14000
+	ldc.i4 -14004
 	add
 	stloc.2
-// 0x010348c4: 0x10348c4: jal   0x1001b14 addu  a0, s0, zero
+// 0x010348d4: 0x10348d4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4211,21 +4211,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010348cc: 0x10348cc: beq   v0, zero, 0x1034a58 addiu v1, zero, 17
+// 0x010348dc: 0x10348dc: beq   v0, zero, 0x1034a68 addiu v1, zero, 17
 	ldloc 5
 	ldc.i4.s 17
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010348d4: 0x10348d4: lui   a1, 0x10000
+// 0x010348e4: 0x10348e4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010348d8: 0x10348d8: addiu a1, a1, -13984
+// 0x010348e8: 0x10348e8: addiu a1, a1, -13988
 	ldloc.2
-	ldc.i4 -13984
+	ldc.i4 -13988
 	add
 	stloc.2
-// 0x010348dc: 0x10348dc: jal   0x1001b14 addu  a0, s0, zero
+// 0x010348ec: 0x10348ec: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4233,21 +4233,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010348e4: 0x10348e4: beq   v0, zero, 0x1034a58 addiu v1, zero, 18
+// 0x010348f4: 0x10348f4: beq   v0, zero, 0x1034a68 addiu v1, zero, 18
 	ldloc 5
 	ldc.i4.s 18
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010348ec: 0x10348ec: lui   a1, 0x10000
+// 0x010348fc: 0x10348fc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010348f0: 0x10348f0: addiu a1, a1, -13968
+// 0x01034900: 0x1034900: addiu a1, a1, -13972
 	ldloc.2
-	ldc.i4 -13968
+	ldc.i4 -13972
 	add
 	stloc.2
-// 0x010348f4: 0x10348f4: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034904: 0x1034904: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4255,21 +4255,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010348fc: 0x10348fc: beq   v0, zero, 0x1034a58 addiu v1, zero, 19
+// 0x0103490c: 0x103490c: beq   v0, zero, 0x1034a68 addiu v1, zero, 19
 	ldloc 5
 	ldc.i4.s 19
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034904: 0x1034904: lui   a1, 0x10000
+// 0x01034914: 0x1034914: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034908: 0x1034908: addiu a1, a1, -13952
+// 0x01034918: 0x1034918: addiu a1, a1, -13956
 	ldloc.2
-	ldc.i4 -13952
+	ldc.i4 -13956
 	add
 	stloc.2
-// 0x0103490c: 0x103490c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103491c: 0x103491c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4277,21 +4277,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034914: 0x1034914: beq   v0, zero, 0x1034a58 addiu v1, zero, 20
+// 0x01034924: 0x1034924: beq   v0, zero, 0x1034a68 addiu v1, zero, 20
 	ldloc 5
 	ldc.i4.s 20
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103491c: 0x103491c: lui   a1, 0x10000
+// 0x0103492c: 0x103492c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034920: 0x1034920: addiu a1, a1, -13936
+// 0x01034930: 0x1034930: addiu a1, a1, -13940
 	ldloc.2
-	ldc.i4 -13936
+	ldc.i4 -13940
 	add
 	stloc.2
-// 0x01034924: 0x1034924: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034934: 0x1034934: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4299,21 +4299,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103492c: 0x103492c: beq   v0, zero, 0x1034a58 addiu v1, zero, 21
+// 0x0103493c: 0x103493c: beq   v0, zero, 0x1034a68 addiu v1, zero, 21
 	ldloc 5
 	ldc.i4.s 21
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034934: 0x1034934: lui   a1, 0x10000
+// 0x01034944: 0x1034944: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034938: 0x1034938: addiu a1, a1, -13924
+// 0x01034948: 0x1034948: addiu a1, a1, -13928
 	ldloc.2
-	ldc.i4 -13924
+	ldc.i4 -13928
 	add
 	stloc.2
-// 0x0103493c: 0x103493c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103494c: 0x103494c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4321,21 +4321,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034944: 0x1034944: beq   v0, zero, 0x1034a58 addiu v1, zero, 22
+// 0x01034954: 0x1034954: beq   v0, zero, 0x1034a68 addiu v1, zero, 22
 	ldloc 5
 	ldc.i4.s 22
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103494c: 0x103494c: lui   a1, 0x10000
+// 0x0103495c: 0x103495c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034950: 0x1034950: addiu a1, a1, -13908
+// 0x01034960: 0x1034960: addiu a1, a1, -13912
 	ldloc.2
-	ldc.i4 -13908
+	ldc.i4 -13912
 	add
 	stloc.2
-// 0x01034954: 0x1034954: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034964: 0x1034964: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4343,21 +4343,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103495c: 0x103495c: beq   v0, zero, 0x1034a58 addiu v1, zero, 23
+// 0x0103496c: 0x103496c: beq   v0, zero, 0x1034a68 addiu v1, zero, 23
 	ldloc 5
 	ldc.i4.s 23
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034964: 0x1034964: lui   a1, 0x10000
+// 0x01034974: 0x1034974: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034968: 0x1034968: addiu a1, a1, -13896
+// 0x01034978: 0x1034978: addiu a1, a1, -13900
 	ldloc.2
-	ldc.i4 -13896
+	ldc.i4 -13900
 	add
 	stloc.2
-// 0x0103496c: 0x103496c: jal   0x1001b14 addu  a0, s0, zero
+// 0x0103497c: 0x103497c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4365,21 +4365,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034974: 0x1034974: beq   v0, zero, 0x1034a58 addiu v1, zero, 24
+// 0x01034984: 0x1034984: beq   v0, zero, 0x1034a68 addiu v1, zero, 24
 	ldloc 5
 	ldc.i4.s 24
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x0103497c: 0x103497c: lui   a1, 0x10000
+// 0x0103498c: 0x103498c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034980: 0x1034980: addiu a1, a1, -13880
+// 0x01034990: 0x1034990: addiu a1, a1, -13884
 	ldloc.2
-	ldc.i4 -13880
+	ldc.i4 -13884
 	add
 	stloc.2
-// 0x01034984: 0x1034984: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034994: 0x1034994: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4387,21 +4387,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103498c: 0x103498c: beq   v0, zero, 0x1034a58 addiu v1, zero, 25
+// 0x0103499c: 0x103499c: beq   v0, zero, 0x1034a68 addiu v1, zero, 25
 	ldloc 5
 	ldc.i4.s 25
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034994: 0x1034994: lui   a1, 0x10000
+// 0x010349a4: 0x10349a4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034998: 0x1034998: addiu a1, a1, -13864
+// 0x010349a8: 0x10349a8: addiu a1, a1, -13868
 	ldloc.2
-	ldc.i4 -13864
+	ldc.i4 -13868
 	add
 	stloc.2
-// 0x0103499c: 0x103499c: jal   0x1001b14 addu  a0, s0, zero
+// 0x010349ac: 0x10349ac: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4409,21 +4409,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010349a4: 0x10349a4: beq   v0, zero, 0x1034a58 addiu v1, zero, 26
+// 0x010349b4: 0x10349b4: beq   v0, zero, 0x1034a68 addiu v1, zero, 26
 	ldloc 5
 	ldc.i4.s 26
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010349ac: 0x10349ac: lui   a1, 0x10000
+// 0x010349bc: 0x10349bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010349b0: 0x10349b0: addiu a1, a1, -13844
+// 0x010349c0: 0x10349c0: addiu a1, a1, -13848
 	ldloc.2
-	ldc.i4 -13844
+	ldc.i4 -13848
 	add
 	stloc.2
-// 0x010349b4: 0x10349b4: jal   0x1001b14 addu  a0, s0, zero
+// 0x010349c4: 0x10349c4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4431,21 +4431,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010349bc: 0x10349bc: beq   v0, zero, 0x1034a58 addiu v1, zero, 27
+// 0x010349cc: 0x10349cc: beq   v0, zero, 0x1034a68 addiu v1, zero, 27
 	ldloc 5
 	ldc.i4.s 27
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010349c4: 0x10349c4: lui   a1, 0x10000
+// 0x010349d4: 0x10349d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010349c8: 0x10349c8: addiu a1, a1, -13828
+// 0x010349d8: 0x10349d8: addiu a1, a1, -13832
 	ldloc.2
-	ldc.i4 -13828
+	ldc.i4 -13832
 	add
 	stloc.2
-// 0x010349cc: 0x10349cc: jal   0x1001b14 addu  a0, s0, zero
+// 0x010349dc: 0x10349dc: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4453,21 +4453,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010349d4: 0x10349d4: beq   v0, zero, 0x1034a58 addiu v1, zero, 28
+// 0x010349e4: 0x10349e4: beq   v0, zero, 0x1034a68 addiu v1, zero, 28
 	ldloc 5
 	ldc.i4.s 28
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010349dc: 0x10349dc: lui   a1, 0x10000
+// 0x010349ec: 0x10349ec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010349e0: 0x10349e0: addiu a1, a1, -13812
+// 0x010349f0: 0x10349f0: addiu a1, a1, -13816
 	ldloc.2
-	ldc.i4 -13812
+	ldc.i4 -13816
 	add
 	stloc.2
-// 0x010349e4: 0x10349e4: jal   0x1001b14 addu  a0, s0, zero
+// 0x010349f4: 0x10349f4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4475,21 +4475,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010349ec: 0x10349ec: beq   v0, zero, 0x1034a58 addiu v1, zero, 29
+// 0x010349fc: 0x10349fc: beq   v0, zero, 0x1034a68 addiu v1, zero, 29
 	ldloc 5
 	ldc.i4.s 29
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x010349f4: 0x10349f4: lui   a1, 0x10000
+// 0x01034a04: 0x1034a04: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010349f8: 0x10349f8: addiu a1, a1, -13800
+// 0x01034a08: 0x1034a08: addiu a1, a1, -13804
 	ldloc.2
-	ldc.i4 -13800
+	ldc.i4 -13804
 	add
 	stloc.2
-// 0x010349fc: 0x10349fc: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034a0c: 0x1034a0c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4497,21 +4497,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034a04: 0x1034a04: beq   v0, zero, 0x1034a58 addiu v1, zero, 30
+// 0x01034a14: 0x1034a14: beq   v0, zero, 0x1034a68 addiu v1, zero, 30
 	ldloc 5
 	ldc.i4.s 30
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034a0c: 0x1034a0c: lui   a1, 0x10000
+// 0x01034a1c: 0x1034a1c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034a10: 0x1034a10: addiu a1, a1, -13792
+// 0x01034a20: 0x1034a20: addiu a1, a1, -13796
 	ldloc.2
-	ldc.i4 -13792
+	ldc.i4 -13796
 	add
 	stloc.2
-// 0x01034a14: 0x1034a14: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034a24: 0x1034a24: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4519,21 +4519,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034a1c: 0x1034a1c: beq   v0, zero, 0x1034a58 addiu v1, zero, 31
+// 0x01034a2c: 0x1034a2c: beq   v0, zero, 0x1034a68 addiu v1, zero, 31
 	ldloc 5
 	ldc.i4.s 31
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034a24: 0x1034a24: lui   a1, 0x10000
+// 0x01034a34: 0x1034a34: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034a28: 0x1034a28: addiu a1, a1, -13780
+// 0x01034a38: 0x1034a38: addiu a1, a1, -13784
 	ldloc.2
-	ldc.i4 -13780
+	ldc.i4 -13784
 	add
 	stloc.2
-// 0x01034a2c: 0x1034a2c: jal   0x1001b14 addu  a0, s0, zero
+// 0x01034a3c: 0x1034a3c: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4541,21 +4541,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034a34: 0x1034a34: beq   v0, zero, 0x1034a58 addiu v1, zero, 32
+// 0x01034a44: 0x1034a44: beq   v0, zero, 0x1034a68 addiu v1, zero, 32
 	ldloc 5
 	ldc.i4.s 32
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-// 0x01034a3c: 0x1034a3c: lui   a1, 0x10000
+// 0x01034a4c: 0x1034a4c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01034a40: 0x1034a40: addu  a0, s0, zero
+// 0x01034a50: 0x1034a50: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01034a44: 0x1034a44: jal   0x1001b14 addiu a1, a1, -13768
+// 0x01034a54: 0x1034a54: jal   0x1001b14 addiu a1, a1, -13772
 	ldloc.2
-	ldc.i4 -13768
+	ldc.i4 -13772
 	add
 	stloc.2
 	ldloc.1
@@ -4563,22 +4563,22 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034a4c: 0x1034a4c: beq   v0, zero, 0x1034a58 addiu v1, zero, 33
+// 0x01034a5c: 0x1034a5c: beq   v0, zero, 0x1034a68 addiu v1, zero, 33
 	ldloc 5
 	ldc.i4.s 33
 	stloc 6
-	brfalse L_1034a58
+	brfalse L_1034a68
 // --- basic block ---
-L_1034a54:
-// 0x01034a54: 0x1034a54: addiu v1, zero, 1
+L_1034a64:
+// 0x01034a64: 0x1034a64: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1034a58:
-// 0x01034a58: 0x1034a58: lw    ra, 20(sp)
-// 0x01034a5c: 0x1034a5c: addu  v0, v1, zero
+L_1034a68:
+// 0x01034a68: 0x1034a68: lw    ra, 20(sp)
+// 0x01034a6c: 0x1034a6c: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01034a60: 0x1034a60: lw    s0, 16(sp)
+// 0x01034a70: 0x1034a70: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4587,7 +4587,7 @@ L_1034a58:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034a64: 0x1034a64: jr    ra addiu sp, sp, 24
+// 0x01034a74: 0x1034a74: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4599,7 +4599,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_mood_actual_state_1034a6c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_actual_state_1034a7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -4637,12 +4637,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034a6c: 0x1034a6c: addiu sp, sp, -24
+// 0x01034a7c: 0x1034a7c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01034a70: 0x1034a70: sw    s0, 16(sp)
+// 0x01034a80: 0x1034a80: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4651,10 +4651,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01034a74: 0x1034a74: lui   s0, 0x0
+// 0x01034a84: 0x1034a84: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01034a78: 0x1034a78: lw    v1, 12516(s0)
+// 0x01034a88: 0x1034a88: lw    v1, 12516(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4663,26 +4663,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01034a7c: 0x1034a7c: addiu v0, zero, -1
+// 0x01034a8c: 0x1034a8c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01034a80: 0x1034a80: bne   v1, v0, 0x1034a9c sw    ra, 20(sp)
+// 0x01034a90: 0x1034a90: bne   v1, v0, 0x1034aac sw    ra, 20(sp)
 	ldloc 8
 	ldloc 5
-	bne.un L_1034a9c
+	bne.un L_1034aac
 // --- basic block ---
-// 0x01034a88: 0x1034a88: jal   0x103467c sll   zero, zero, 0
+// 0x01034a98: 0x1034a98: jal   0x103468c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_get_name_103467c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_get_name_103468c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01034a90: 0x1034a90: jal   0x1034720 addu  a0, v0, zero
+// 0x01034aa0: 0x1034aa0: jal   0x1034730 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4690,12 +4690,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_from_string_1034720(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_from_string_1034730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01034a98: 0x1034a98: sw    v0, 12516(s0)
+// 0x01034aa8: 0x1034aa8: sw    v0, 12516(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4704,12 +4704,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_1034a9c:
-// 0x01034a9c: 0x1034a9c: lw    ra, 20(sp)
-// 0x01034aa0: 0x1034aa0: lui   v0, 0x0
+L_1034aac:
+// 0x01034aac: 0x1034aac: lw    ra, 20(sp)
+// 0x01034ab0: 0x1034ab0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01034aa4: 0x1034aa4: lw    v0, 12516(v0)
+// 0x01034ab4: 0x1034ab4: lw    v0, 12516(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4718,7 +4718,7 @@ L_1034a9c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034aa8: 0x1034aa8: lw    s0, 16(sp)
+// 0x01034ab8: 0x1034ab8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4727,7 +4727,7 @@ L_1034a9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034aac: 0x1034aac: jr    ra addiu sp, sp, 24
+// 0x01034abc: 0x1034abc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4739,7 +4739,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_mood_state_1034ab4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_state_1034ac4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4774,49 +4774,49 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034ab4: 0x1034ab4: addiu sp, sp, -24
+// 0x01034ac4: 0x1034ac4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01034ab8: 0x1034ab8: sw    ra, 20(sp)
-// 0x01034abc: 0x1034abc: jal   0x106c170 sll   zero, zero, 0
+// 0x01034ac8: 0x1034ac8: sw    ra, 20(sp)
+// 0x01034acc: 0x1034acc: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034ac4: 0x1034ac4: beq   v0, zero, 0x1034ad8 addu  v1, zero, zero
+// 0x01034ad4: 0x1034ad4: beq   v0, zero, 0x1034ae8 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1034ad8
+	brfalse L_1034ae8
 // --- basic block ---
-// 0x01034acc: 0x1034acc: jal   0x1034a6c sll   zero, zero, 0
+// 0x01034adc: 0x1034adc: jal   0x1034a7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_actual_state_1034a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_actual_state_1034a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034ad4: 0x1034ad4: addu  v1, v0, zero
+// 0x01034ae4: 0x1034ae4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_1034ad8:
-// 0x01034ad8: 0x1034ad8: lw    ra, 20(sp)
-// 0x01034adc: 0x1034adc: addu  v0, v1, zero
+L_1034ae8:
+// 0x01034ae8: 0x1034ae8: lw    ra, 20(sp)
+// 0x01034aec: 0x1034aec: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01034ae0: 0x1034ae0: jr    ra addiu sp, sp, 24
+// 0x01034af0: 0x1034af0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4828,7 +4828,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_mood_set_1034ae8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_set_1034af8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra)
@@ -4869,12 +4869,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034ae8: 0x1034ae8: addiu sp, sp, -32
+// 0x01034af8: 0x1034af8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01034aec: 0x1034aec: sw    s1, 24(sp)
+// 0x01034afc: 0x1034afc: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4883,7 +4883,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01034af0: 0x1034af0: sw    s0, 20(sp)
+// 0x01034b00: 0x1034b00: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4892,35 +4892,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01034af4: 0x1034af4: lui   s1, 0x0
+// 0x01034b04: 0x1034b04: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01034af8: 0x1034af8: addu  s0, a0, zero
+// 0x01034b08: 0x1034b08: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01034afc: 0x1034afc: lui   a2, 0x10000
+// 0x01034b0c: 0x1034b0c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01034b00: 0x1034b00: lui   a0, 0x20000
+// 0x01034b10: 0x1034b10: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01034b04: 0x1034b04: addiu a2, a2, -14156
+// 0x01034b14: 0x1034b14: addiu a2, a2, -14160
 	ldloc.3
-	ldc.i4 -14156
+	ldc.i4 -14160
 	add
 	stloc.3
-// 0x01034b08: 0x1034b08: addu  a3, zero, zero
+// 0x01034b18: 0x1034b18: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01034b0c: 0x1034b0c: addiu a1, s1, 12520
+// 0x01034b1c: 0x1034b1c: addiu a1, s1, 12520
 	ldloc 9
 	ldc.i4 12520
 	add
 	stloc.2
-// 0x01034b10: 0x1034b10: sw    ra, 28(sp)
-// 0x01034b14: 0x1034b14: jal   0x100edb0 addiu a0, a0, -26888
+// 0x01034b20: 0x1034b20: sw    ra, 28(sp)
+// 0x01034b24: 0x1034b24: jal   0x100edc0 addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
 	ldloc.0
@@ -4928,15 +4928,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01034b1c: 0x1034b1c: addu  a1, s0, zero
+// 0x01034b2c: 0x1034b2c: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01034b20: 0x1034b20: jal   0x100e5c0 addiu a0, s1, 12520
+// 0x01034b30: 0x1034b30: jal   0x100e5d0 addiu a0, s1, 12520
 	ldloc 9
 	ldc.i4 12520
 	add
@@ -4946,12 +4946,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01034b28: 0x1034b28: jal   0x100ea50 addu  a0, zero, zero
+// 0x01034b38: 0x1034b38: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4959,12 +4959,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01034b30: 0x1034b30: jal   0x1034720 addu  a0, s0, zero
+// 0x01034b40: 0x1034b40: jal   0x1034730 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4972,15 +4972,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_from_string_1034720(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_from_string_1034730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01034b38: 0x1034b38: lui   v1, 0x0
+// 0x01034b48: 0x1034b48: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01034b3c: 0x1034b3c: jal   0x106e03c sw    v0, 12516(v1)
+// 0x01034b4c: 0x1034b4c: jal   0x106e660 sw    v0, 12516(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4994,13 +4994,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnMoodChanged_106e03c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::OnMoodChanged_106e660(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01034b44: 0x1034b44: lw    ra, 28(sp)
-// 0x01034b48: 0x1034b48: lw    s1, 24(sp)
+// 0x01034b54: 0x1034b54: lw    ra, 28(sp)
+// 0x01034b58: 0x1034b58: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5009,7 +5009,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01034b4c: 0x1034b4c: lw    s0, 20(sp)
+// 0x01034b5c: 0x1034b5c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5018,7 +5018,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01034b50: 0x1034b50: jr    ra addiu sp, sp, 32
+// 0x01034b60: 0x1034b60: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5030,7 +5030,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_mood_call_back_1034b58(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_call_back_1034b68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5068,7 +5068,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034b58: 0x1034b58: lw    v0, 4(a0)
+// 0x01034b68: 0x1034b68: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5077,12 +5077,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034b5c: 0x1034b5c: addiu sp, sp, -24
+// 0x01034b6c: 0x1034b6c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01034b60: 0x1034b60: sw    s0, 16(sp)
+// 0x01034b70: 0x1034b70: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5091,8 +5091,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01034b64: 0x1034b64: sw    ra, 20(sp)
-// 0x01034b68: 0x1034b68: lw    s0, 116(v0)
+// 0x01034b74: 0x1034b74: sw    ra, 20(sp)
+// 0x01034b78: 0x1034b78: lw    s0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5101,7 +5101,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034b6c: 0x1034b6c: jal   0x1034ae8 addu  a0, a2, zero
+// 0x01034b7c: 0x1034b7c: jal   0x1034af8 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -5109,20 +5109,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_set_1034ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_set_1034af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01034b74: 0x1034b74: lui   a0, 0x10000
+// 0x01034b84: 0x1034b84: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034b78: 0x1034b78: addiu a0, a0, -13748
+// 0x01034b88: 0x1034b88: addiu a0, a0, -13752
 	ldloc.1
-	ldc.i4 -13748
+	ldc.i4 -13752
 	add
 	stloc.1
-// 0x01034b7c: 0x1034b7c: jal   0x1094884 addu  a1, zero, zero
+// 0x01034b8c: 0x1034b8c: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5130,16 +5130,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01034b84: 0x1034b84: beq   s0, zero, 0x1034b94 sll   zero, zero, 0
+// 0x01034b94: 0x1034b94: beq   s0, zero, 0x1034ba4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1034b94
+	brfalse L_1034ba4
 // --- basic block ---
-// 0x01034b8c: 0x1034b8c: jalr  s0 sll   zero, zero, 0
+// 0x01034b9c: 0x1034b9c: jalr  s0 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
 	ldloc.1
@@ -5151,12 +5151,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1034b94:
-// 0x01034b94: 0x1034b94: lw    ra, 20(sp)
-// 0x01034b98: 0x1034b98: addiu v0, zero, 1
+L_1034ba4:
+// 0x01034ba4: 0x1034ba4: lw    ra, 20(sp)
+// 0x01034ba8: 0x1034ba8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01034b9c: 0x1034b9c: lw    s0, 16(sp)
+// 0x01034bac: 0x1034bac: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5165,7 +5165,7 @@ L_1034b94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01034ba0: 0x1034ba0: jr    ra addiu sp, sp, 24
+// 0x01034bb0: 0x1034bb0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5177,7 +5177,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_exclusive_mood_call_back_1034ba8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_exclusive_mood_call_back_1034bb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 ra)
@@ -5215,7 +5215,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034ba8: 0x1034ba8: lw    v0, 4(a0)
+// 0x01034bb8: 0x1034bb8: lw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5224,12 +5224,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01034bac: 0x1034bac: addiu sp, sp, -32
+// 0x01034bbc: 0x1034bbc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01034bb0: 0x1034bb0: sw    s0, 24(sp)
+// 0x01034bc0: 0x1034bc0: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5238,7 +5238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01034bb4: 0x1034bb4: sw    a2, 16(sp)
+// 0x01034bc4: 0x1034bc4: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5247,8 +5247,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01034bb8: 0x1034bb8: sw    ra, 28(sp)
-// 0x01034bbc: 0x1034bbc: lw    s0, 116(v0)
+// 0x01034bc8: 0x1034bc8: sw    ra, 28(sp)
+// 0x01034bcc: 0x1034bcc: lw    s0, 116(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5257,7 +5257,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01034bc0: 0x1034bc0: jal   0x1034720 addu  a0, a2, zero
+// 0x01034bd0: 0x1034bd0: jal   0x1034730 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -5265,22 +5265,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_from_string_1034720(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_from_string_1034730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01034bc8: 0x1034bc8: addiu v1, v0, -27
+// 0x01034bd8: 0x1034bd8: addiu v1, v0, -27
 	ldloc 6
 	ldc.i4.s -27
 	add
 	stloc 5
-// 0x01034bcc: 0x1034bcc: sltiu v1, v1, 3
+// 0x01034bdc: 0x1034bdc: sltiu v1, v1, 3
 	ldloc 5
 	ldc.i4.3
 	clt.un
 	stloc 5
-// 0x01034bd0: 0x1034bd0: lw    a2, 16(sp)
+// 0x01034be0: 0x1034be0: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5289,37 +5289,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01034bd4: 0x1034bd4: beq   v1, zero, 0x1034c0c lui   v1, 0x60000
+// 0x01034be4: 0x1034be4: beq   v1, zero, 0x1034c1c lui   v1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_1034c0c
+	brfalse L_1034c1c
 // --- basic block ---
-// 0x01034bdc: 0x1034bdc: lw    v1, -17368(v1)
+// 0x01034bec: 0x1034bec: lw    v1, -16904(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4342
+	ldc.i4 -4226
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034be0: 0x1034be0: sll   zero, zero, 0
-// 0x01034be4: 0x1034be4: addiu v1, v1, 26
+// 0x01034bf0: 0x1034bf0: sll   zero, zero, 0
+// 0x01034bf4: 0x1034bf4: addiu v1, v1, 26
 	ldloc 5
 	ldc.i4.s 26
 	add
 	stloc 5
-// 0x01034be8: 0x1034be8: slt   v0, v1, v0
+// 0x01034bf8: 0x1034bf8: slt   v0, v1, v0
 	ldloc 5
 	ldloc 6
 	clt
 	stloc 6
-// 0x01034bec: 0x1034bec: beq   v0, zero, 0x1034c0c sll   zero, zero, 0
+// 0x01034bfc: 0x1034bfc: beq   v0, zero, 0x1034c1c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1034c0c
+	brfalse L_1034c1c
 // --- basic block ---
-// 0x01034bf4: 0x1034bf4: jal   0x109617c addu  a0, zero, zero
+// 0x01034c04: 0x1034c04: jal   0x10967c4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5327,29 +5327,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01034bfc: 0x1034bfc: jal   0x109483c sll   zero, zero, 0
+// 0x01034c0c: 0x1034c0c: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01034c04: 0x1034c04: j	 0x1034c38 addu  v0, zero, zero
+// 0x01034c14: 0x1034c14: j	 0x1034c48 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1034c38
+	br L_1034c48
 // --- basic block ---
-L_1034c0c:
-// 0x01034c0c: 0x1034c0c: jal   0x1034ae8 addu  a0, a2, zero
+L_1034c1c:
+// 0x01034c1c: 0x1034c1c: jal   0x1034af8 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -5357,20 +5357,20 @@ L_1034c0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_set_1034ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_set_1034af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01034c14: 0x1034c14: lui   a0, 0x10000
+// 0x01034c24: 0x1034c24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034c18: 0x1034c18: addiu a0, a0, -13748
+// 0x01034c28: 0x1034c28: addiu a0, a0, -13752
 	ldloc.1
-	ldc.i4 -13748
+	ldc.i4 -13752
 	add
 	stloc.1
-// 0x01034c1c: 0x1034c1c: jal   0x1094884 addu  a1, zero, zero
+// 0x01034c2c: 0x1034c2c: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5378,18 +5378,18 @@ L_1034c0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01034c24: 0x1034c24: beq   s0, zero, 0x1034c38 addiu v0, zero, 1
+// 0x01034c34: 0x1034c34: beq   s0, zero, 0x1034c48 addiu v0, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc 6
-	brfalse L_1034c38
+	brfalse L_1034c48
 // --- basic block ---
-// 0x01034c2c: 0x1034c2c: jalr  s0 sll   zero, zero, 0
+// 0x01034c3c: 0x1034c3c: jalr  s0 sll   zero, zero, 0
 	ldloc 8
 	ldloc.0
 	ldloc.1
@@ -5401,12 +5401,12 @@ L_1034c0c:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01034c34: 0x1034c34: addiu v0, zero, 1
+// 0x01034c44: 0x1034c44: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1034c38:
-// 0x01034c38: 0x1034c38: lw    ra, 28(sp)
-// 0x01034c3c: 0x1034c3c: lw    s0, 24(sp)
+L_1034c48:
+// 0x01034c48: 0x1034c48: lw    ra, 28(sp)
+// 0x01034c4c: 0x1034c4c: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5415,7 +5415,7 @@ L_1034c38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01034c40: 0x1034c40: jr    ra addiu sp, sp, 32
+// 0x01034c50: 0x1034c50: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5427,7 +5427,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_mood_set_exclusive_moods_1034c48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_set_exclusive_moods_1034c58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
@@ -5468,13 +5468,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034c48: 0x1034c48: addiu sp, sp, -32
+// 0x01034c58: 0x1034c58: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01034c4c: 0x1034c4c: sw    ra, 28(sp)
-// 0x01034c50: 0x1034c50: sw    s1, 24(sp)
+// 0x01034c5c: 0x1034c5c: sw    ra, 28(sp)
+// 0x01034c60: 0x1034c60: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5483,7 +5483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01034c54: 0x1034c54: sw    s0, 20(sp)
+// 0x01034c64: 0x1034c64: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5492,7 +5492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01034c58: 0x1034c58: jal   0x103467c addu  s0, a0, zero
+// 0x01034c68: 0x1034c68: jal   0x103468c addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.0
@@ -5500,12 +5500,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_get_name_103467c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_get_name_103468c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01034c60: 0x1034c60: jal   0x1034720 addu  a0, v0, zero
+// 0x01034c70: 0x1034c70: jal   0x1034730 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5513,143 +5513,143 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_from_string_1034720(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_from_string_1034730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01034c68: 0x1034c68: addu  s1, v0, zero
+// 0x01034c78: 0x1034c78: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01034c6c: 0x1034c6c: lui   v0, 0x60000
+// 0x01034c7c: 0x1034c7c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034c70: 0x1034c70: beq   s0, zero, 0x1034ca0 sw    s0, -17368(v0)
+// 0x01034c80: 0x1034c80: beq   s0, zero, 0x1034cb0 sw    s0, -16904(v0)
 	ldloc 6
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4342
+	ldc.i4 -4226
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_1034ca0
+	brfalse L_1034cb0
 // --- basic block ---
-// 0x01034c78: 0x1034c78: addiu s0, s0, -1
+// 0x01034c88: 0x1034c88: addiu s0, s0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x01034c7c: 0x1034c7c: sltiu v0, s0, 3
+// 0x01034c8c: 0x1034c8c: sltiu v0, s0, 3
 	ldloc 6
 	ldc.i4.3
 	clt.un
 	stloc 5
-// 0x01034c80: 0x1034c80: beq   v0, zero, 0x1034cd0 lui   v0, 0x20000
+// 0x01034c90: 0x1034c90: beq   v0, zero, 0x1034ce0 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1034cd0
+	brfalse L_1034ce0
 // --- basic block ---
-// 0x01034c88: 0x1034c88: sll   s0, s0, 2
+// 0x01034c98: 0x1034c98: sll   s0, s0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01034c8c: 0x1034c8c: addiu v0, v0, 25928
+// 0x01034c9c: 0x1034c9c: addiu v0, v0, 26392
 	ldloc 5
-	ldc.i4 25928
+	ldc.i4 26392
 	add
 	stloc 5
-// 0x01034c90: 0x1034c90: addu  s0, s0, v0
+// 0x01034ca0: 0x1034ca0: addu  s0, s0, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x01034c94: 0x1034c94: lw    a0, 0(s0)
+// 0x01034ca4: 0x1034ca4: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01034c98: 0x1034c98: j	 0x1034cd8 sll   zero, zero, 0
-	br L_1034cd8
+// 0x01034ca8: 0x1034ca8: j	 0x1034ce8 sll   zero, zero, 0
+	br L_1034ce8
 // --- basic block ---
-L_1034ca0:
-// 0x01034ca0: 0x1034ca0: jal   0x1034a6c sll   zero, zero, 0
+L_1034cb0:
+// 0x01034cb0: 0x1034cb0: jal   0x1034a7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_actual_state_1034a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_actual_state_1034a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01034ca8: 0x1034ca8: slti  v0, v0, 27
+// 0x01034cb8: 0x1034cb8: slti  v0, v0, 27
 	ldloc 5
 	ldc.i4.s 27
 	clt
 	stloc 5
-// 0x01034cac: 0x1034cac: bne   v0, zero, 0x1034ce0 sll   zero, zero, 0
+// 0x01034cbc: 0x1034cbc: bne   v0, zero, 0x1034cf0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1034ce0
+	brtrue L_1034cf0
 // --- basic block ---
-// 0x01034cb4: 0x1034cb4: jal   0x1034a6c sll   zero, zero, 0
+// 0x01034cc4: 0x1034cc4: jal   0x1034a7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_actual_state_1034a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_actual_state_1034a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01034cbc: 0x1034cbc: slti  v0, v0, 30
+// 0x01034ccc: 0x1034ccc: slti  v0, v0, 30
 	ldloc 5
 	ldc.i4.s 30
 	clt
 	stloc 5
-// 0x01034cc0: 0x1034cc0: beq   v0, zero, 0x1034ce0 slti  s1, s1, 27
+// 0x01034cd0: 0x1034cd0: beq   v0, zero, 0x1034cf0 slti  s1, s1, 27
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 27
 	clt
 	stloc 8
-	brfalse L_1034ce0
+	brfalse L_1034cf0
 // --- basic block ---
-// 0x01034cc8: 0x1034cc8: bne   s1, zero, 0x1034ce0 sll   zero, zero, 0
+// 0x01034cd8: 0x1034cd8: bne   s1, zero, 0x1034cf0 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1034ce0
+	brtrue L_1034cf0
 // --- basic block ---
-L_1034cd0:
-// 0x01034cd0: 0x1034cd0: lui   a0, 0x10000
+L_1034ce0:
+// 0x01034ce0: 0x1034ce0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034cd4: 0x1034cd4: addiu a0, a0, -14156
+// 0x01034ce4: 0x1034ce4: addiu a0, a0, -14160
 	ldloc.1
-	ldc.i4 -14156
+	ldc.i4 -14160
 	add
 	stloc.1
-L_1034cd8:
-// 0x01034cd8: 0x1034cd8: jal   0x1034ae8 sll   zero, zero, 0
+L_1034ce8:
+// 0x01034ce8: 0x1034ce8: jal   0x1034af8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_set_1034ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_set_1034af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1034ce0:
-// 0x01034ce0: 0x1034ce0: lw    ra, 28(sp)
-// 0x01034ce4: 0x1034ce4: lw    s1, 24(sp)
+L_1034cf0:
+// 0x01034cf0: 0x1034cf0: lw    ra, 28(sp)
+// 0x01034cf4: 0x1034cf4: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5658,7 +5658,7 @@ L_1034ce0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01034ce8: 0x1034ce8: lw    s0, 20(sp)
+// 0x01034cf8: 0x1034cf8: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5667,7 +5667,7 @@ L_1034ce0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01034cec: 0x1034cec: jr    ra addiu sp, sp, 32
+// 0x01034cfc: 0x1034cfc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5679,7 +5679,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_mood_init_1034cf4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_init_1034d04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -5720,25 +5720,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034cf4: 0x1034cf4: lui   v0, 0x60000
+// 0x01034d04: 0x1034d04: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034cf8: 0x1034cf8: lw    v0, -17372(v0)
+// 0x01034d08: 0x1034d08: lw    v0, -16908(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4343
+	ldc.i4 -4227
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034cfc: 0x1034cfc: addiu sp, sp, -32
+// 0x01034d0c: 0x1034d0c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01034d00: 0x1034d00: sw    ra, 28(sp)
-// 0x01034d04: 0x1034d04: sw    s1, 24(sp)
+// 0x01034d10: 0x1034d10: sw    ra, 28(sp)
+// 0x01034d14: 0x1034d14: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5747,7 +5747,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01034d08: 0x1034d08: bne   v0, zero, 0x1034d80 sw    s0, 20(sp)
+// 0x01034d18: 0x1034d18: bne   v0, zero, 0x1034d90 sw    s0, 20(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -5757,33 +5757,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1034d80
+	brtrue L_1034d90
 // --- basic block ---
-// 0x01034d10: 0x1034d10: lui   a0, 0x10000
+// 0x01034d20: 0x1034d20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034d14: 0x1034d14: lui   a1, 0x0
+// 0x01034d24: 0x1034d24: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01034d18: 0x1034d18: lui   a2, 0x10000
+// 0x01034d28: 0x1034d28: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01034d1c: 0x1034d1c: addiu a0, a0, 12560
+// 0x01034d2c: 0x1034d2c: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01034d20: 0x1034d20: addiu a1, a1, 12536
+// 0x01034d30: 0x1034d30: addiu a1, a1, 12536
 	ldloc.2
 	ldc.i4 12536
 	add
 	stloc.2
-// 0x01034d24: 0x1034d24: addiu a2, a2, -25516
+// 0x01034d34: 0x1034d34: addiu a2, a2, -25516
 	ldloc.3
 	ldc.i4 -25516
 	add
 	stloc.3
-// 0x01034d28: 0x1034d28: jal   0x100edb0 addu  a3, zero, zero
+// 0x01034d38: 0x1034d38: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5791,36 +5791,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034d30: 0x1034d30: lui   s1, 0x0
+// 0x01034d40: 0x1034d40: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01034d34: 0x1034d34: lui   s0, 0x10000
+// 0x01034d44: 0x1034d44: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01034d38: 0x1034d38: lui   a0, 0x20000
+// 0x01034d48: 0x1034d48: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01034d3c: 0x1034d3c: addiu a1, s1, 12520
+// 0x01034d4c: 0x1034d4c: addiu a1, s1, 12520
 	ldloc 9
 	ldc.i4 12520
 	add
 	stloc.2
-// 0x01034d40: 0x1034d40: addiu a0, a0, -26888
+// 0x01034d50: 0x1034d50: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01034d44: 0x1034d44: addiu a2, s0, -13740
+// 0x01034d54: 0x1034d54: addiu a2, s0, -13744
 	ldloc 8
-	ldc.i4 -13740
+	ldc.i4 -13744
 	add
 	stloc.3
-// 0x01034d48: 0x1034d48: jal   0x100edb0 addu  a3, zero, zero
+// 0x01034d58: 0x1034d58: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5828,12 +5828,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034d50: 0x1034d50: jal   0x100e348 addiu a0, s1, 12520
+// 0x01034d60: 0x1034d60: jal   0x100e358 addiu a0, s1, 12520
 	ldloc 9
 	ldc.i4 12520
 	add
@@ -5843,17 +5843,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034d58: 0x1034d58: addu  a0, v0, zero
+// 0x01034d68: 0x1034d68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01034d5c: 0x1034d5c: jal   0x1001b14 addiu a1, s0, -13740
+// 0x01034d6c: 0x1034d6c: jal   0x1001b14 addiu a1, s0, -13744
 	ldloc 8
-	ldc.i4 -13740
+	ldc.i4 -13744
 	add
 	stloc.2
 	ldloc.1
@@ -5861,13 +5861,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01034d64: 0x1034d64: beq   v0, zero, 0x1034d78 addiu v1, zero, 1
+// 0x01034d74: 0x1034d74: beq   v0, zero, 0x1034d88 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_1034d78
+	brfalse L_1034d88
 // --- basic block ---
-// 0x01034d6c: 0x1034d6c: jal   0x106af78 addu  a0, zero, zero
+// 0x01034d7c: 0x1034d7c: jal   0x106b59c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5875,30 +5875,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetIsNewbieConfig_106af78(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetIsNewbieConfig_106b59c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034d74: 0x1034d74: addiu v1, zero, 1
+// 0x01034d84: 0x1034d84: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1034d78:
-// 0x01034d78: 0x1034d78: lui   v0, 0x60000
+L_1034d88:
+// 0x01034d88: 0x1034d88: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034d7c: 0x1034d7c: sw    v1, -17372(v0)
+// 0x01034d8c: 0x1034d8c: sw    v1, -16908(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4343
+	ldc.i4 -4227
 	add
 	ldloc 6
 	stelem.i4
-L_1034d80:
-// 0x01034d80: 0x1034d80: lw    ra, 28(sp)
-// 0x01034d84: 0x1034d84: lw    s1, 24(sp)
+L_1034d90:
+// 0x01034d90: 0x1034d90: lw    ra, 28(sp)
+// 0x01034d94: 0x1034d94: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5907,7 +5907,7 @@ L_1034d80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01034d88: 0x1034d88: lw    s0, 20(sp)
+// 0x01034d98: 0x1034d98: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5916,7 +5916,7 @@ L_1034d80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01034d8c: 0x1034d8c: jr    ra addiu sp, sp, 32
+// 0x01034d9c: 0x1034d9c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5928,7 +5928,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_mood_get_1034d94(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_get_1034da4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5963,43 +5963,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034d94: 0x1034d94: lui   v0, 0x60000
+// 0x01034da4: 0x1034da4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034d98: 0x1034d98: lw    v0, -17372(v0)
+// 0x01034da8: 0x1034da8: lw    v0, -16908(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4343
+	ldc.i4 -4227
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034d9c: 0x1034d9c: addiu sp, sp, -24
+// 0x01034dac: 0x1034dac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01034da0: 0x1034da0: bne   v0, zero, 0x1034db0 sw    ra, 20(sp)
+// 0x01034db0: 0x1034db0: bne   v0, zero, 0x1034dc0 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1034db0
+	brtrue L_1034dc0
 // --- basic block ---
-// 0x01034da8: 0x1034da8: jal   0x1034cf4 sll   zero, zero, 0
+// 0x01034db8: 0x1034db8: jal   0x1034d04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_init_1034cf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_init_1034d04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1034db0:
-// 0x01034db0: 0x1034db0: lui   a0, 0x0
+L_1034dc0:
+// 0x01034dc0: 0x1034dc0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01034db4: 0x1034db4: jal   0x100e348 addiu a0, a0, 12520
+// 0x01034dc4: 0x1034dc4: jal   0x100e358 addiu a0, a0, 12520
 	ldloc.1
 	ldc.i4 12520
 	add
@@ -6009,14 +6009,14 @@ L_1034db0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01034dbc: 0x1034dbc: lw    ra, 20(sp)
-// 0x01034dc0: 0x1034dc0: sll   zero, zero, 0
-// 0x01034dc4: 0x1034dc4: jr    ra addiu sp, sp, 24
+// 0x01034dcc: 0x1034dcc: lw    ra, 20(sp)
+// 0x01034dd0: 0x1034dd0: sll   zero, zero, 0
+// 0x01034dd4: 0x1034dd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6028,7 +6028,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_mood_get_number_of_newbie_miles_1034dcc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_get_number_of_newbie_miles_1034ddc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6063,43 +6063,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034dcc: 0x1034dcc: lui   v0, 0x60000
+// 0x01034ddc: 0x1034ddc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01034dd0: 0x1034dd0: lw    v0, -17372(v0)
+// 0x01034de0: 0x1034de0: lw    v0, -16908(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4343
+	ldc.i4 -4227
 	add
 	ldelem.i4
 	stloc 5
-// 0x01034dd4: 0x1034dd4: addiu sp, sp, -32
+// 0x01034de4: 0x1034de4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01034dd8: 0x1034dd8: bne   v0, zero, 0x1034de8 sw    ra, 28(sp)
+// 0x01034de8: 0x1034de8: bne   v0, zero, 0x1034df8 sw    ra, 28(sp)
 	ldloc 5
-	brtrue L_1034de8
+	brtrue L_1034df8
 // --- basic block ---
-// 0x01034de0: 0x1034de0: jal   0x1034cf4 sll   zero, zero, 0
+// 0x01034df0: 0x1034df0: jal   0x1034d04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_init_1034cf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_init_1034d04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1034de8:
-// 0x01034de8: 0x1034de8: lui   a0, 0x0
+L_1034df8:
+// 0x01034df8: 0x1034df8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01034dec: 0x1034dec: jal   0x100e788 addiu a0, a0, 12536
+// 0x01034dfc: 0x1034dfc: jal   0x100e798 addiu a0, a0, 12536
 	ldloc.1
 	ldc.i4 12536
 	add
@@ -6109,12 +6109,12 @@ L_1034de8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034df4: 0x1034df4: jal   0x1008478 sw    v0, 16(sp)
+// 0x01034e04: 0x1034e04: jal   0x1008488 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6123,10 +6123,10 @@ L_1034de8:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_is_metric_1008478()
+	call int32 Cibyl5::roadmap_math_is_metric_1008488()
 	stloc 5
 // --- basic block ---
-// 0x01034dfc: 0x1034dfc: lw    a0, 16(sp)
+// 0x01034e0c: 0x1034e0c: lw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6135,43 +6135,43 @@ L_1034de8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01034e00: 0x1034e00: beq   v0, zero, 0x1034e38 sll   zero, zero, 0
+// 0x01034e10: 0x1034e10: beq   v0, zero, 0x1034e48 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1034e38
+	brfalse L_1034e48
 // --- basic block ---
-// 0x01034e08: 0x1034e08: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01034e18: 0x1034e18: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034e10: 0x1034e10: lui   a0, 0x20000
+// 0x01034e20: 0x1034e20: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01034e14: 0x1034e14: lw    a3, 23876(a0)
+// 0x01034e24: 0x1034e24: lw    a3, 24340(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5969
+	ldc.i4 6085
 	add
 	ldelem.i4
 	stloc 4
-// 0x01034e18: 0x1034e18: lw    a2, 23872(a0)
+// 0x01034e28: 0x1034e28: lw    a2, 24336(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5968
+	ldc.i4 6084
 	add
 	ldelem.i4
 	stloc.3
-// 0x01034e1c: 0x1034e1c: addu  a1, v1, zero
+// 0x01034e2c: 0x1034e2c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01034e20: 0x1034e20: jal   0x10c0798 addu  a0, v0, zero
+// 0x01034e30: 0x1034e30: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6179,34 +6179,34 @@ L_1034de8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034e28: 0x1034e28: addu  a0, v0, zero
+// 0x01034e38: 0x1034e38: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01034e2c: 0x1034e2c: jal   0x10c08d0 addu  a1, v1, zero
+// 0x01034e3c: 0x1034e3c: jal   0x10c0f10 addu  a1, v1, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034e34: 0x1034e34: addu  a0, v0, zero
+// 0x01034e44: 0x1034e44: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_1034e38:
-// 0x01034e38: 0x1034e38: lw    ra, 28(sp)
-// 0x01034e3c: 0x1034e3c: addu  v0, a0, zero
+L_1034e48:
+// 0x01034e48: 0x1034e48: lw    ra, 28(sp)
+// 0x01034e4c: 0x1034e4c: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01034e40: 0x1034e40: jr    ra addiu sp, sp, 32
+// 0x01034e50: 0x1034e50: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6218,7 +6218,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_mood_dialog_1034e48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_dialog_1034e58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s5,int32 s0,int32 s2,int32 s7,int32 s8,int32 s4,int32 s6,int32 s1,int32 s3,int32 t0,int32 t1,int32 t2,int32 ra,int32 t3)
@@ -6292,13 +6292,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01034e48: 0x1034e48: addiu sp, sp, -240
+// 0x01034e58: 0x1034e58: addiu sp, sp, -240
 	ldloc.0
 	ldc.i4 -240
 	add
 	stloc.0
-// 0x01034e4c: 0x1034e4c: sw    ra, 236(sp)
-// 0x01034e50: 0x1034e50: sw    s8, 232(sp)
+// 0x01034e5c: 0x1034e5c: sw    ra, 236(sp)
+// 0x01034e60: 0x1034e60: sw    s8, 232(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6307,7 +6307,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01034e54: 0x1034e54: sw    s7, 228(sp)
+// 0x01034e64: 0x1034e64: sw    s7, 228(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6316,7 +6316,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01034e58: 0x1034e58: sw    s6, 224(sp)
+// 0x01034e68: 0x1034e68: sw    s6, 224(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6325,7 +6325,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01034e5c: 0x1034e5c: sw    s5, 220(sp)
+// 0x01034e6c: 0x1034e6c: sw    s5, 220(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6334,7 +6334,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01034e60: 0x1034e60: sw    s4, 216(sp)
+// 0x01034e70: 0x1034e70: sw    s4, 216(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6343,7 +6343,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01034e64: 0x1034e64: sw    s3, 212(sp)
+// 0x01034e74: 0x1034e74: sw    s3, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6352,10 +6352,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01034e68: 0x1034e68: addu  s4, a0, zero
+// 0x01034e78: 0x1034e78: addu  s4, a0, zero
 	ldloc.1
 	stloc 13
-// 0x01034e6c: 0x1034e6c: sw    s2, 208(sp)
+// 0x01034e7c: 0x1034e7c: sw    s2, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6364,7 +6364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01034e70: 0x1034e70: sw    s1, 204(sp)
+// 0x01034e80: 0x1034e80: sw    s1, 204(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6373,7 +6373,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01034e74: 0x1034e74: jal   0x106b044 sw    s0, 200(sp)
+// 0x01034e84: 0x1034e84: jal   0x106b668 sw    s0, 200(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6387,20 +6387,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_IsNewbie_106b044(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_IsNewbie_106b668(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034e7c: 0x1034e7c: lui   a0, 0x10000
+// 0x01034e8c: 0x1034e8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034e80: 0x1034e80: addiu a0, a0, -13732
+// 0x01034e90: 0x1034e90: addiu a0, a0, -13736
 	ldloc.1
-	ldc.i4 -13732
+	ldc.i4 -13736
 	add
 	stloc.1
-// 0x01034e84: 0x1034e84: jal   0x101cd60 addu  s3, v0, zero
+// 0x01034e94: 0x1034e94: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -6408,26 +6408,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034e8c: 0x1034e8c: lui   a0, 0x10000
+// 0x01034e9c: 0x1034e9c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034e90: 0x1034e90: addiu a0, a0, -13748
+// 0x01034ea0: 0x1034ea0: addiu a0, a0, -13752
 	ldloc.1
-	ldc.i4 -13748
+	ldc.i4 -13752
 	add
 	stloc.1
-// 0x01034e94: 0x1034e94: addu  a1, v0, zero
+// 0x01034ea4: 0x1034ea4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01034e98: 0x1034e98: addu  a2, zero, zero
+// 0x01034ea8: 0x1034ea8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01034e9c: 0x1034e9c: jal   0x1095a08 addiu a3, zero, 8192
+// 0x01034eac: 0x1034eac: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -6435,15 +6435,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034ea4: 0x1034ea4: lui   a0, 0x10000
+// 0x01034eb4: 0x1034eb4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034ea8: 0x1034ea8: sw    s4, 116(v0)
+// 0x01034eb8: 0x1034eb8: sw    s4, 116(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6452,24 +6452,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01034eac: 0x1034eac: addiu a2, zero, -2
+// 0x01034ebc: 0x1034ebc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01034eb0: 0x1034eb0: addu  a3, zero, zero
+// 0x01034ec0: 0x1034ec0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01034eb4: 0x1034eb4: addiu a0, a0, -7504
+// 0x01034ec4: 0x1034ec4: addiu a0, a0, -7508
 	ldloc.1
-	ldc.i4 -7504
+	ldc.i4 -7508
 	add
 	stloc.1
-// 0x01034eb8: 0x1034eb8: addiu a1, zero, -2
+// 0x01034ec8: 0x1034ec8: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x01034ebc: 0x1034ebc: addu  s0, v0, zero
+// 0x01034ecc: 0x1034ecc: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01034ec0: 0x1034ec0: sw    zero, 16(sp)
+// 0x01034ed0: 0x1034ed0: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6478,7 +6478,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01034ec4: 0x1034ec4: jal   0x1092750 sw    zero, 20(sp)
+// 0x01034ed4: 0x1034ed4: jal   0x1092d74 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6492,18 +6492,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_new_1092750(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034ecc: 0x1034ecc: addu  a0, v0, zero
+// 0x01034edc: 0x1034edc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01034ed0: 0x1034ed0: addiu a1, zero, 40
+// 0x01034ee0: 0x1034ee0: addiu a1, zero, 40
 	ldc.i4.s 40
 	stloc.2
-// 0x01034ed4: 0x1034ed4: jal   0x1091748 addu  s1, v0, zero
+// 0x01034ee4: 0x1034ee4: jal   0x1091d6c addu  s1, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -6511,29 +6511,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034edc: 0x1034edc: lui   a0, 0x10000
+// 0x01034eec: 0x1034eec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034ee0: 0x1034ee0: addu  a3, zero, zero
+// 0x01034ef0: 0x1034ef0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01034ee4: 0x1034ee4: addiu a2, zero, -2
+// 0x01034ef4: 0x1034ef4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01034ee8: 0x1034ee8: addiu a0, a0, -13712
+// 0x01034ef8: 0x1034ef8: addiu a0, a0, -13716
 	ldloc.1
-	ldc.i4 -13712
+	ldc.i4 -13716
 	add
 	stloc.1
-// 0x01034eec: 0x1034eec: addiu a1, zero, -2
+// 0x01034efc: 0x1034efc: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x01034ef0: 0x1034ef0: sw    zero, 16(sp)
+// 0x01034f00: 0x1034f00: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6542,7 +6542,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01034ef4: 0x1034ef4: jal   0x1092750 sw    zero, 20(sp)
+// 0x01034f04: 0x1034f04: jal   0x1092d74 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6556,21 +6556,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_new_1092750(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034efc: 0x1034efc: addu  a0, v0, zero
+// 0x01034f0c: 0x1034f0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01034f00: 0x1034f00: addiu a1, zero, 40
+// 0x01034f10: 0x1034f10: addiu a1, zero, 40
 	ldc.i4.s 40
 	stloc.2
-// 0x01034f04: 0x1034f04: lui   s5, 0x10000
+// 0x01034f14: 0x1034f14: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01034f08: 0x1034f08: jal   0x1091748 addu  s2, v0, zero
+// 0x01034f18: 0x1034f18: jal   0x1091d6c addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -6578,14 +6578,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034f10: 0x1034f10: jal   0x101cd60 addiu a0, s5, -13812
+// 0x01034f20: 0x1034f20: jal   0x101cd70 addiu a0, s5, -13816
 	ldloc 8
-	ldc.i4 -13812
+	ldc.i4 -13816
 	add
 	stloc.1
 	ldloc.0
@@ -6593,62 +6593,62 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034f18: 0x1034f18: lui   a2, 0x10000
+// 0x01034f28: 0x1034f28: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01034f1c: 0x1034f1c: addiu a1, s5, -13812
+// 0x01034f2c: 0x1034f2c: addiu a1, s5, -13816
 	ldloc 8
-	ldc.i4 -13812
+	ldc.i4 -13816
 	add
 	stloc.2
-// 0x01034f20: 0x1034f20: lui   v1, 0x60000
+// 0x01034f30: 0x1034f30: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01034f24: 0x1034f24: addiu a0, a2, -13828
+// 0x01034f34: 0x1034f34: addiu a0, a2, -13832
 	ldloc.3
-	ldc.i4 -13828
+	ldc.i4 -13832
 	add
 	stloc.1
-// 0x01034f28: 0x1034f28: lui   s8, 0x60000
+// 0x01034f38: 0x1034f38: lui   s8, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x01034f2c: 0x1034f2c: lui   s7, 0x60000
+// 0x01034f3c: 0x1034f3c: lui   s7, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01034f30: 0x1034f30: addiu s6, v1, -17916
+// 0x01034f40: 0x1034f40: addiu s6, v1, -17452
 	ldloc 6
-	ldc.i4 -17916
+	ldc.i4 -17452
 	add
 	stloc 14
-// 0x01034f34: 0x1034f34: sw    a1, -17928(s7)
+// 0x01034f44: 0x1034f44: sw    a1, -17464(s7)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4482
+	ldc.i4 -4366
 	add
 	ldloc.2
 	stelem.i4
-// 0x01034f38: 0x1034f38: sw    a1, -17916(v1)
+// 0x01034f48: 0x1034f48: sw    a1, -17452(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4479
+	ldc.i4 -4363
 	add
 	ldloc.2
 	stelem.i4
-// 0x01034f3c: 0x1034f3c: jal   0x101cd60 sw    v0, -17904(s8)
+// 0x01034f4c: 0x1034f4c: jal   0x101cd70 sw    v0, -17440(s8)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4476
+	ldc.i4 -4360
 	add
 	ldloc 5
 	stelem.i4
@@ -6657,38 +6657,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034f44: 0x1034f44: lui   a0, 0x10000
+// 0x01034f54: 0x1034f54: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034f48: 0x1034f48: addiu v1, a0, -13828
+// 0x01034f58: 0x1034f58: addiu v1, a0, -13832
 	ldloc.1
-	ldc.i4 -13828
+	ldc.i4 -13832
 	add
 	stloc 6
-// 0x01034f4c: 0x1034f4c: lui   s5, 0x10000
+// 0x01034f5c: 0x1034f5c: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01034f50: 0x1034f50: addiu s8, s8, -17904
+// 0x01034f60: 0x1034f60: addiu s8, s8, -17440
 	ldloc 12
-	ldc.i4 -17904
+	ldc.i4 -17440
 	add
 	stloc 12
-// 0x01034f54: 0x1034f54: addiu s7, s7, -17928
+// 0x01034f64: 0x1034f64: addiu s7, s7, -17464
 	ldloc 11
-	ldc.i4 -17928
+	ldc.i4 -17464
 	add
 	stloc 11
-// 0x01034f58: 0x1034f58: addiu a0, s5, -13844
+// 0x01034f68: 0x1034f68: addiu a0, s5, -13848
 	ldloc 8
-	ldc.i4 -13844
+	ldc.i4 -13848
 	add
 	stloc.1
-// 0x01034f5c: 0x1034f5c: sw    v1, 4(s7)
+// 0x01034f6c: 0x1034f6c: sw    v1, 4(s7)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -6697,7 +6697,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01034f60: 0x1034f60: sw    v1, 4(s6)
+// 0x01034f70: 0x1034f70: sw    v1, 4(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -6706,7 +6706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01034f64: 0x1034f64: jal   0x101cd60 sw    v0, 4(s8)
+// 0x01034f74: 0x1034f74: jal   0x101cd70 sw    v0, 4(s8)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -6720,29 +6720,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034f6c: 0x1034f6c: lui   v1, 0x60000
+// 0x01034f7c: 0x1034f7c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01034f70: 0x1034f70: lw    v1, -17368(v1)
+// 0x01034f80: 0x1034f80: lw    v1, -16904(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4342
+	ldc.i4 -4226
 	add
 	ldelem.i4
 	stloc 6
-// 0x01034f74: 0x1034f74: addiu s5, s5, -13844
+// 0x01034f84: 0x1034f84: addiu s5, s5, -13848
 	ldloc 8
-	ldc.i4 -13844
+	ldc.i4 -13848
 	add
 	stloc 8
-// 0x01034f78: 0x1034f78: sw    v0, 8(s8)
+// 0x01034f88: 0x1034f88: sw    v0, 8(s8)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -6751,7 +6751,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01034f7c: 0x1034f7c: sw    s5, 8(s7)
+// 0x01034f8c: 0x1034f8c: sw    s5, 8(s7)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -6760,7 +6760,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01034f80: 0x1034f80: sw    s5, 8(s6)
+// 0x01034f90: 0x1034f90: sw    s5, 8(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -6769,53 +6769,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01034f84: 0x1034f84: blez  v1, 0x1034f94 addu  v0, zero, zero
+// 0x01034f94: 0x1034f94: blez  v1, 0x1034fa4 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	ble L_1034f94
+	ble L_1034fa4
 // --- basic block ---
-// 0x01034f8c: 0x1034f8c: lui   v0, 0x1030000
+// 0x01034f9c: 0x1034f9c: lui   v0, 0x1030000
 	ldc.i4 16973824
 	stloc 5
-// 0x01034f90: 0x1034f90: addiu v0, v0, 19368
+// 0x01034fa0: 0x1034fa0: addiu v0, v0, 19384
 	ldloc 5
-	ldc.i4 19368
+	ldc.i4 19384
 	add
 	stloc 5
-L_1034f94:
-// 0x01034f94: 0x1034f94: lui   a2, 0x60000
+L_1034fa4:
+// 0x01034fa4: 0x1034fa4: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01034f98: 0x1034f98: lui   a3, 0x60000
+// 0x01034fa8: 0x1034fa8: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01034f9c: 0x1034f9c: lui   v1, 0x60000
+// 0x01034fac: 0x1034fac: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01034fa0: 0x1034fa0: addiu v1, v1, -17928
+// 0x01034fb0: 0x1034fb0: addiu v1, v1, -17464
 	ldloc 6
-	ldc.i4 -17928
+	ldc.i4 -17464
 	add
 	stloc 6
-// 0x01034fa4: 0x1034fa4: addiu a2, a2, -17904
+// 0x01034fb4: 0x1034fb4: addiu a2, a2, -17440
 	ldloc.3
-	ldc.i4 -17904
+	ldc.i4 -17440
 	add
 	stloc.3
-// 0x01034fa8: 0x1034fa8: addiu a3, a3, -17916
+// 0x01034fb8: 0x1034fb8: addiu a3, a3, -17452
 	ldloc 4
-	ldc.i4 -17916
+	ldc.i4 -17452
 	add
 	stloc 4
-// 0x01034fac: 0x1034fac: addu  a0, s1, zero
+// 0x01034fbc: 0x1034fbc: addu  a0, s1, zero
 	ldloc 15
 	stloc.1
-// 0x01034fb0: 0x1034fb0: addiu a1, zero, 3
+// 0x01034fc0: 0x1034fc0: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01034fb4: 0x1034fb4: sw    v1, 16(sp)
+// 0x01034fc4: 0x1034fc4: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6824,7 +6824,7 @@ L_1034f94:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01034fb8: 0x1034fb8: sw    v0, 24(sp)
+// 0x01034fc8: 0x1034fc8: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6833,7 +6833,7 @@ L_1034f94:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01034fbc: 0x1034fbc: sw    zero, 20(sp)
+// 0x01034fcc: 0x1034fcc: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6842,7 +6842,7 @@ L_1034f94:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01034fc0: 0x1034fc0: sw    zero, 28(sp)
+// 0x01034fd0: 0x1034fd0: sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6851,7 +6851,7 @@ L_1034f94:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01034fc4: 0x1034fc4: jal   0x10924c8 sw    zero, 32(sp)
+// 0x01034fd4: 0x1034fd4: jal   0x1092aec sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6865,21 +6865,21 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_10924c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_1092aec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034fcc: 0x1034fcc: beq   s3, zero, 0x10350ec sll   zero, zero, 0
+// 0x01034fdc: 0x1034fdc: beq   s3, zero, 0x10350fc sll   zero, zero, 0
 	ldloc 16
-	brfalse L_10350ec
+	brfalse L_10350fc
 // --- basic block ---
-// 0x01034fd4: 0x1034fd4: lui   a0, 0x10000
+// 0x01034fe4: 0x1034fe4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01034fd8: 0x1034fd8: jal   0x101cd60 addiu a0, a0, -13700
+// 0x01034fe8: 0x1034fe8: jal   0x101cd70 addiu a0, a0, -13704
 	ldloc.1
-	ldc.i4 -13700
+	ldc.i4 -13704
 	add
 	stloc.1
 	ldloc.0
@@ -6887,68 +6887,68 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01034fe0: 0x1034fe0: lui   t2, 0x60000
+// 0x01034ff0: 0x1034ff0: lui   t2, 0x60000
 	ldc.i4 393216
 	stloc 19
-// 0x01034fe4: 0x1034fe4: lui   v1, 0x60000
+// 0x01034ff4: 0x1034ff4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01034fe8: 0x1034fe8: lui   t1, 0x60000
+// 0x01034ff8: 0x1034ff8: lui   t1, 0x60000
 	ldc.i4 393216
 	stloc 18
-// 0x01034fec: 0x1034fec: lui   t0, 0x10000
+// 0x01034ffc: 0x1034ffc: lui   t0, 0x10000
 	ldc.i4 65536
 	stloc 17
-// 0x01034ff0: 0x1034ff0: addiu t0, t0, -13692
+// 0x01035000: 0x1035000: addiu t0, t0, -13696
 	ldloc 17
-	ldc.i4 -13692
+	ldc.i4 -13696
 	add
 	stloc 17
-// 0x01034ff4: 0x1034ff4: addiu a3, v1, -17936
+// 0x01035004: 0x1035004: addiu a3, v1, -17472
 	ldloc 6
-	ldc.i4 -17936
+	ldc.i4 -17472
 	add
 	stloc 4
-// 0x01034ff8: 0x1034ff8: addiu t3, t1, -17940
+// 0x01035008: 0x1035008: addiu t3, t1, -17476
 	ldloc 18
-	ldc.i4 -17940
+	ldc.i4 -17476
 	add
 	stloc 21
-// 0x01034ffc: 0x1034ffc: addiu a2, t2, -17932
+// 0x0103500c: 0x103500c: addiu a2, t2, -17468
 	ldloc 19
-	ldc.i4 -17932
+	ldc.i4 -17468
 	add
 	stloc.3
-// 0x01035000: 0x1035000: addiu a1, zero, 1
+// 0x01035010: 0x1035010: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01035004: 0x1035004: addu  a0, s2, zero
+// 0x01035014: 0x1035014: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01035008: 0x1035008: sw    v0, -17932(t2)
+// 0x01035018: 0x1035018: sw    v0, -17468(t2)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4483
+	ldc.i4 -4367
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103500c: 0x103500c: sw    t0, -17940(t1)
+// 0x0103501c: 0x103501c: sw    t0, -17476(t1)
 	ldloc 7
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4485
+	ldc.i4 -4369
 	add
 	ldloc 17
 	stelem.i4
-// 0x01035010: 0x1035010: sw    t3, 16(sp)
+// 0x01035020: 0x1035020: sw    t3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6957,16 +6957,16 @@ L_1034f94:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01035014: 0x1035014: sw    t0, -17936(v1)
+// 0x01035024: 0x1035024: sw    t0, -17472(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4484
+	ldc.i4 -4368
 	add
 	ldloc 17
 	stelem.i4
-// 0x01035018: 0x1035018: sw    zero, 20(sp)
+// 0x01035028: 0x1035028: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6975,7 +6975,7 @@ L_1034f94:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103501c: 0x103501c: sw    zero, 24(sp)
+// 0x0103502c: 0x103502c: sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6984,7 +6984,7 @@ L_1034f94:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01035020: 0x1035020: sw    zero, 28(sp)
+// 0x01035030: 0x1035030: sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6993,7 +6993,7 @@ L_1034f94:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01035024: 0x1035024: jal   0x10924c8 sw    zero, 32(sp)
+// 0x01035034: 0x1035034: jal   0x1092aec sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7007,18 +7007,18 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_10924c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_1092aec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103502c: 0x103502c: addiu a1, zero, 20
+// 0x0103503c: 0x103503c: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01035030: 0x1035030: addu  a2, zero, zero
+// 0x01035040: 0x1035040: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01035034: 0x1035034: jal   0x109434c addu  a0, s0, zero
+// 0x01035044: 0x1035044: jal   0x1094970 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7026,17 +7026,17 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103503c: 0x103503c: lui   a0, 0x10000
+// 0x0103504c: 0x103504c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01035040: 0x1035040: jal   0x101cd60 addiu a0, a0, -13680
+// 0x01035050: 0x1035050: jal   0x101cd70 addiu a0, a0, -13684
 	ldloc.1
-	ldc.i4 -13680
+	ldc.i4 -13684
 	add
 	stloc.1
 	ldloc.0
@@ -7044,26 +7044,26 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035048: 0x1035048: lui   a0, 0x10000
+// 0x01035058: 0x1035058: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103504c: 0x103504c: addiu a3, zero, 8
+// 0x0103505c: 0x103505c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01035050: 0x1035050: addiu a2, zero, 14
+// 0x01035060: 0x1035060: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01035054: 0x1035054: addiu a0, a0, -13668
+// 0x01035064: 0x1035064: addiu a0, a0, -13672
 	ldloc.1
-	ldc.i4 -13668
+	ldc.i4 -13672
 	add
 	stloc.1
-// 0x01035058: 0x1035058: jal   0x1098d10 addu  a1, v0, zero
+// 0x01035068: 0x1035068: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7071,31 +7071,31 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035060: 0x1035060: addu  a1, v0, zero
+// 0x01035070: 0x1035070: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01035064: 0x1035064: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01035074: 0x1035074: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103506c: 0x103506c: addiu a1, zero, 20
+// 0x0103507c: 0x103507c: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01035070: 0x1035070: addu  a2, zero, zero
+// 0x01035080: 0x1035080: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01035074: 0x1035074: jal   0x109434c addu  a0, s0, zero
+// 0x01035084: 0x1035084: jal   0x1094970 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7103,17 +7103,17 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103507c: 0x103507c: lui   a0, 0x10000
+// 0x0103508c: 0x103508c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01035080: 0x1035080: jal   0x101cd60 addiu a0, a0, -13652
+// 0x01035090: 0x1035090: jal   0x101cd70 addiu a0, a0, -13656
 	ldloc.1
-	ldc.i4 -13652
+	ldc.i4 -13656
 	add
 	stloc.1
 	ldloc.0
@@ -7121,12 +7121,12 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035088: 0x1035088: jal   0x1034dcc sw    v0, 196(sp)
+// 0x01035098: 0x1035098: jal   0x1034ddc sw    v0, 196(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7140,12 +7140,12 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_get_number_of_newbie_miles_1034dcc(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_get_number_of_newbie_miles_1034ddc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035090: 0x1035090: jal   0x1007d84 sw    v0, 192(sp)
+// 0x010350a0: 0x10350a0: jal   0x1007d94 sw    v0, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7154,10 +7154,10 @@ L_1034f94:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x01035098: 0x1035098: jal   0x101cd60 addu  a0, v0, zero
+// 0x010350a8: 0x10350a8: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7165,17 +7165,17 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010350a0: 0x10350a0: addiu s5, sp, 40
+// 0x010350b0: 0x10350b0: addiu s5, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x010350a4: 0x10350a4: lw    a2, 196(sp)
+// 0x010350b4: 0x10350b4: lw    a2, 196(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7184,7 +7184,7 @@ L_1034f94:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010350a8: 0x10350a8: lw    a3, 192(sp)
+// 0x010350b8: 0x10350b8: lw    a3, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7193,13 +7193,13 @@ L_1034f94:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010350ac: 0x10350ac: addu  a0, s5, zero
+// 0x010350bc: 0x10350bc: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x010350b0: 0x10350b0: addiu a1, zero, 150
+// 0x010350c0: 0x10350c0: addiu a1, zero, 150
 	ldc.i4 150
 	stloc.2
-// 0x010350b4: 0x10350b4: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010350c4: 0x10350c4: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7218,21 +7218,21 @@ L_1034f94:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010350bc: 0x10350bc: lui   a0, 0x10000
+// 0x010350cc: 0x10350cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010350c0: 0x10350c0: addiu a0, a0, -13608
+// 0x010350d0: 0x10350d0: addiu a0, a0, -13612
 	ldloc.1
-	ldc.i4 -13608
+	ldc.i4 -13612
 	add
 	stloc.1
-// 0x010350c4: 0x10350c4: addu  a1, s5, zero
+// 0x010350d4: 0x10350d4: addu  a1, s5, zero
 	ldloc 8
 	stloc.2
-// 0x010350c8: 0x10350c8: addiu a2, zero, 12
+// 0x010350d8: 0x10350d8: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x010350cc: 0x10350cc: jal   0x1098d10 ori   a3, zero, 32776
+// 0x010350dc: 0x10350dc: jal   0x1099358 ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
@@ -7242,45 +7242,45 @@ L_1034f94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010350d4: 0x10350d4: addu  a1, v0, zero
+// 0x010350e4: 0x10350e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010350d8: 0x10350d8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010350e8: 0x10350e8: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010350e0: 0x10350e0: addu  a0, s0, zero
+// 0x010350f0: 0x10350f0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010350e4: 0x10350e4: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010350f4: 0x10350f4: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10350ec:
-// 0x010350ec: 0x10350ec: addiu a1, zero, 20
+L_10350fc:
+// 0x010350fc: 0x10350fc: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x010350f0: 0x10350f0: addu  a2, zero, zero
+// 0x01035100: 0x1035100: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010350f4: 0x10350f4: jal   0x109434c addu  a0, s0, zero
+// 0x01035104: 0x1035104: jal   0x1094970 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7288,17 +7288,17 @@ L_10350ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010350fc: 0x10350fc: lui   a0, 0x10000
+// 0x0103510c: 0x103510c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01035100: 0x1035100: jal   0x101cd60 addiu a0, a0, -13592
+// 0x01035110: 0x1035110: jal   0x101cd70 addiu a0, a0, -13596
 	ldloc.1
-	ldc.i4 -13592
+	ldc.i4 -13596
 	add
 	stloc.1
 	ldloc.0
@@ -7306,26 +7306,26 @@ L_10350ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035108: 0x1035108: lui   s2, 0x10000
+// 0x01035118: 0x1035118: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0103510c: 0x103510c: addiu a3, zero, 8
+// 0x0103511c: 0x103511c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01035110: 0x1035110: addiu a2, zero, 14
+// 0x01035120: 0x1035120: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01035114: 0x1035114: addiu a0, s2, -13608
+// 0x01035124: 0x1035124: addiu a0, s2, -13612
 	ldloc 10
-	ldc.i4 -13608
+	ldc.i4 -13612
 	add
 	stloc.1
-// 0x01035118: 0x1035118: jal   0x1098d10 addu  a1, v0, zero
+// 0x01035128: 0x1035128: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7333,31 +7333,31 @@ L_10350ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035120: 0x1035120: addu  a1, v0, zero
+// 0x01035130: 0x1035130: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01035124: 0x1035124: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01035134: 0x1035134: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103512c: 0x103512c: addiu a1, zero, 20
+// 0x0103513c: 0x103513c: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01035130: 0x1035130: addu  a2, zero, zero
+// 0x01035140: 0x1035140: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01035134: 0x1035134: jal   0x109434c addu  a0, s0, zero
+// 0x01035144: 0x1035144: jal   0x1094970 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7365,17 +7365,17 @@ L_10350ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103513c: 0x103513c: lui   a0, 0x10000
+// 0x0103514c: 0x103514c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01035140: 0x1035140: jal   0x101cd60 addiu a0, a0, -13576
+// 0x01035150: 0x1035150: jal   0x101cd70 addiu a0, a0, -13580
 	ldloc.1
-	ldc.i4 -13576
+	ldc.i4 -13580
 	add
 	stloc.1
 	ldloc.0
@@ -7383,23 +7383,23 @@ L_10350ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035148: 0x1035148: addu  a1, v0, zero
+// 0x01035158: 0x1035158: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103514c: 0x103514c: addiu a0, s2, -13608
+// 0x0103515c: 0x103515c: addiu a0, s2, -13612
 	ldloc 10
-	ldc.i4 -13608
+	ldc.i4 -13612
 	add
 	stloc.1
-// 0x01035150: 0x1035150: addiu a2, zero, 12
+// 0x01035160: 0x1035160: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x01035154: 0x1035154: jal   0x1098d10 ori   a3, zero, 32776
+// 0x01035164: 0x1035164: jal   0x1099358 ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
@@ -7409,158 +7409,158 @@ L_10350ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103515c: 0x103515c: addu  a1, v0, zero
+// 0x0103516c: 0x103516c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01035160: 0x1035160: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01035170: 0x1035170: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035168: 0x1035168: lui   s8, 0x10000
+// 0x01035178: 0x1035178: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0103516c: 0x103516c: addu  a0, s0, zero
+// 0x0103517c: 0x103517c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01035170: 0x1035170: addu  a1, s1, zero
+// 0x01035180: 0x1035180: addu  a1, s1, zero
 	ldloc 15
 	stloc.2
-// 0x01035174: 0x1035174: jal   0x1098ec4 lui   s7, 0x10000
+// 0x01035184: 0x1035184: jal   0x109950c lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 11
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103517c: 0x103517c: addiu s8, s8, -32516
+// 0x0103518c: 0x103518c: addiu s8, s8, -32516
 	ldloc 12
 	ldc.i4 -32516
 	add
 	stloc 12
-// 0x01035180: 0x1035180: addiu s7, s7, -13528
+// 0x01035190: 0x1035190: addiu s7, s7, -13532
 	ldloc 11
-	ldc.i4 -13528
+	ldc.i4 -13532
 	add
 	stloc 11
-// 0x01035184: 0x1035184: addu  s2, zero, zero
+// 0x01035194: 0x1035194: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01035188: 0x1035188: lui   s6, 0x60000
+// 0x01035198: 0x1035198: lui   s6, 0x60000
 	ldc.i4 393216
 	stloc 14
-// 0x0103518c: 0x103518c: j	 0x10351c8 addiu s5, zero, 3
+// 0x0103519c: 0x103519c: j	 0x10351d8 addiu s5, zero, 3
 	ldc.i4.3
 	stloc 8
-	br L_10351c8
+	br L_10351d8
 // --- basic block ---
-L_1035194:
-// 0x01035194: 0x1035194: jal   0x109152c sll   zero, zero, 0
+L_10351a4:
+// 0x010351a4: 0x10351a4: jal   0x1091b50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl108::ssd_list_get_row_109152c(int32,int32)
+	call int32 Cibyl108::ssd_list_get_row_1091b50(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103519c: 0x103519c: addu  a0, v0, zero
+// 0x010351ac: 0x10351ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010351a0: 0x10351a0: beq   v0, zero, 0x10351c4 addu  a1, s8, zero
+// 0x010351b0: 0x10351b0: beq   v0, zero, 0x10351d4 addu  a1, s8, zero
 	ldloc 5
 	ldloc 12
 	stloc.2
-	brfalse L_10351c4
+	brfalse L_10351d4
 // --- basic block ---
-// 0x010351a8: 0x10351a8: jal   0x109b304 sll   zero, zero, 0
+// 0x010351b8: 0x10351b8: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010351b0: 0x10351b0: addu  a0, v0, zero
+// 0x010351c0: 0x10351c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010351b4: 0x10351b4: beq   v0, zero, 0x10351c4 addu  a1, s7, zero
+// 0x010351c4: 0x10351c4: beq   v0, zero, 0x10351d4 addu  a1, s7, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brfalse L_10351c4
+	brfalse L_10351d4
 // --- basic block ---
-// 0x010351bc: 0x10351bc: jal   0x1097af8 sll   zero, zero, 0
+// 0x010351cc: 0x10351cc: jal   0x1098140 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-L_10351c4:
-// 0x010351c4: 0x10351c4: addiu s2, s2, 1
+L_10351d4:
+// 0x010351d4: 0x10351d4: addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10351c8:
-// 0x010351c8: 0x10351c8: lw    v0, -17368(s6)
+L_10351d8:
+// 0x010351d8: 0x10351d8: lw    v0, -16904(s6)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4342
+	ldc.i4 -4226
 	add
 	ldelem.i4
 	stloc 5
-// 0x010351cc: 0x10351cc: addu  a1, s2, zero
+// 0x010351dc: 0x10351dc: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010351d0: 0x10351d0: subu  v0, s5, v0
+// 0x010351e0: 0x10351e0: subu  v0, s5, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 5
-// 0x010351d4: 0x10351d4: slt   v0, s2, v0
+// 0x010351e4: 0x10351e4: slt   v0, s2, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x010351d8: 0x10351d8: bne   v0, zero, 0x1035194 addu  a0, s1, zero
+// 0x010351e8: 0x10351e8: bne   v0, zero, 0x10351a4 addu  a0, s1, zero
 	ldloc 5
 	ldloc 15
 	stloc.1
-	brtrue L_1035194
+	brtrue L_10351a4
 // --- basic block ---
-// 0x010351e0: 0x10351e0: lui   a0, 0x10000
+// 0x010351f0: 0x10351f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010351e4: 0x10351e4: addu  a3, zero, zero
+// 0x010351f4: 0x10351f4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010351e8: 0x10351e8: addiu a0, a0, -7504
+// 0x010351f8: 0x10351f8: addiu a0, a0, -7508
 	ldloc.1
-	ldc.i4 -7504
+	ldc.i4 -7508
 	add
 	stloc.1
-// 0x010351ec: 0x10351ec: addiu a1, zero, -2
+// 0x010351fc: 0x10351fc: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x010351f0: 0x10351f0: addiu a2, zero, -2
+// 0x01035200: 0x1035200: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010351f4: 0x10351f4: sw    zero, 16(sp)
+// 0x01035204: 0x1035204: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7569,7 +7569,7 @@ L_10351c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010351f8: 0x10351f8: jal   0x1092750 sw    zero, 20(sp)
+// 0x01035208: 0x1035208: jal   0x1092d74 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7583,21 +7583,21 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_new_1092750(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035200: 0x1035200: addiu a1, zero, 20
+// 0x01035210: 0x1035210: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01035204: 0x1035204: addu  a2, zero, zero
+// 0x01035214: 0x1035214: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01035208: 0x1035208: addu  a0, s0, zero
+// 0x01035218: 0x1035218: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0103520c: 0x103520c: sw    zero, 216(s1)
+// 0x0103521c: 0x103521c: sw    zero, 216(s1)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -7606,7 +7606,7 @@ L_10351c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01035210: 0x1035210: jal   0x109434c addu  s2, v0, zero
+// 0x01035220: 0x1035220: jal   0x1094970 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -7614,17 +7614,17 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035218: 0x1035218: lui   a0, 0x10000
+// 0x01035228: 0x1035228: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103521c: 0x103521c: jal   0x101cd60 addiu a0, a0, -13520
+// 0x0103522c: 0x103522c: jal   0x101cd70 addiu a0, a0, -13524
 	ldloc.1
-	ldc.i4 -13520
+	ldc.i4 -13524
 	add
 	stloc.1
 	ldloc.0
@@ -7632,26 +7632,26 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035224: 0x1035224: lui   s5, 0x10000
+// 0x01035234: 0x1035234: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01035228: 0x1035228: addiu a3, zero, 8
+// 0x01035238: 0x1035238: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0103522c: 0x103522c: addiu a2, zero, 14
+// 0x0103523c: 0x103523c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01035230: 0x1035230: addiu a0, s5, -13608
+// 0x01035240: 0x1035240: addiu a0, s5, -13612
 	ldloc 8
-	ldc.i4 -13608
+	ldc.i4 -13612
 	add
 	stloc.1
-// 0x01035234: 0x1035234: jal   0x1098d10 addu  a1, v0, zero
+// 0x01035244: 0x1035244: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7659,31 +7659,31 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103523c: 0x103523c: addu  a1, v0, zero
+// 0x0103524c: 0x103524c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01035240: 0x1035240: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01035250: 0x1035250: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035248: 0x1035248: addiu a1, zero, 20
+// 0x01035258: 0x1035258: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0103524c: 0x103524c: addu  a2, zero, zero
+// 0x0103525c: 0x103525c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01035250: 0x1035250: jal   0x109434c addu  a0, s0, zero
+// 0x01035260: 0x1035260: jal   0x1094970 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7691,17 +7691,17 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035258: 0x1035258: lui   a0, 0x10000
+// 0x01035268: 0x1035268: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103525c: 0x103525c: jal   0x101cd60 addiu a0, a0, -13504
+// 0x0103526c: 0x103526c: jal   0x101cd70 addiu a0, a0, -13508
 	ldloc.1
-	ldc.i4 -13504
+	ldc.i4 -13508
 	add
 	stloc.1
 	ldloc.0
@@ -7709,25 +7709,25 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035264: 0x1035264: addu  a1, v0, zero
+// 0x01035274: 0x1035274: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01035268: 0x1035268: addiu a2, zero, 12
+// 0x01035278: 0x1035278: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0103526c: 0x103526c: ori   a3, zero, 32776
+// 0x0103527c: 0x103527c: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x01035270: 0x1035270: jal   0x1098d10 addiu a0, s5, -13608
+// 0x01035280: 0x1035280: jal   0x1099358 addiu a0, s5, -13612
 	ldloc 8
-	ldc.i4 -13608
+	ldc.i4 -13612
 	add
 	stloc.1
 	ldloc.0
@@ -7735,41 +7735,41 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035278: 0x1035278: addu  a1, v0, zero
+// 0x01035288: 0x1035288: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103527c: 0x103527c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0103528c: 0x103528c: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035284: 0x1035284: addu  a0, s0, zero
+// 0x01035294: 0x1035294: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01035288: 0x1035288: jal   0x1098ec4 addu  a1, s2, zero
+// 0x01035298: 0x1035298: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035290: 0x1035290: addu  a0, s2, zero
+// 0x010352a0: 0x10352a0: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01035294: 0x1035294: jal   0x1091748 addiu a1, zero, 40
+// 0x010352a4: 0x10352a4: jal   0x1091d6c addiu a1, zero, 40
 	ldc.i4.s 40
 	stloc.2
 	ldloc.0
@@ -7777,23 +7777,23 @@ L_10351c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103529c: 0x103529c: lui   s5, 0x60000
+// 0x010352ac: 0x10352ac: lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x010352a0: 0x10352a0: lui   v0, 0x0
+// 0x010352b0: 0x10352b0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010352a4: 0x10352a4: addiu s5, s5, -17612
+// 0x010352b4: 0x10352b4: addiu s5, s5, -17148
 	ldloc 8
-	ldc.i4 -17612
+	ldc.i4 -17148
 	add
 	stloc 8
-// 0x010352a8: 0x10352a8: sw    s4, 12512(v0)
+// 0x010352b8: 0x10352b8: sw    s4, 12512(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7802,108 +7802,108 @@ L_10351c8:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010352ac: 0x10352ac: lui   a0, 0x20000
+// 0x010352bc: 0x10352bc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010352b0: 0x10352b0: lui   v0, 0x20000
+// 0x010352c0: 0x10352c0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010352b4: 0x10352b4: addiu v0, v0, 25808
+// 0x010352c4: 0x10352c4: addiu v0, v0, 26272
 	ldloc 5
-	ldc.i4 25808
+	ldc.i4 26272
 	add
 	stloc 5
-// 0x010352b8: 0x10352b8: addiu a0, a0, 25928
+// 0x010352c8: 0x10352c8: addiu a0, a0, 26392
 	ldloc.1
-	ldc.i4 25928
+	ldc.i4 26392
 	add
 	stloc.1
-// 0x010352bc: 0x10352bc: j	 0x10352d4 addu  v1, s5, zero
+// 0x010352cc: 0x10352cc: j	 0x10352e4 addu  v1, s5, zero
 	ldloc 8
 	stloc 6
-	br L_10352d4
+	br L_10352e4
 // --- basic block ---
-L_10352c4:
-// 0x010352c4: 0x10352c4: lw    a1, 0(v0)
+L_10352d4:
+// 0x010352d4: 0x10352d4: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010352c8: 0x10352c8: addiu v0, v0, 4
+// 0x010352d8: 0x10352d8: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x010352cc: 0x10352cc: sw    a1, 0(v1)
+// 0x010352dc: 0x10352dc: sw    a1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010352d0: 0x10352d0: addiu v1, v1, 4
+// 0x010352e0: 0x10352e0: addiu v1, v1, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-L_10352d4:
-// 0x010352d4: 0x10352d4: bne   v0, a0, 0x10352c4 lui   s7, 0x60000
+L_10352e4:
+// 0x010352e4: 0x10352e4: bne   v0, a0, 0x10352d4 lui   s7, 0x60000
 	ldloc 5
 	ldloc.1
 	ldc.i4 393216
 	stloc 11
-	bne.un L_10352c4
+	bne.un L_10352d4
 // --- basic block ---
-// 0x010352dc: 0x10352dc: lui   s6, 0x60000
+// 0x010352ec: 0x10352ec: lui   s6, 0x60000
 	ldc.i4 393216
 	stloc 14
-// 0x010352e0: 0x10352e0: addiu s7, s7, -17752
+// 0x010352f0: 0x10352f0: addiu s7, s7, -17288
 	ldloc 11
-	ldc.i4 -17752
+	ldc.i4 -17288
 	add
 	stloc 11
-// 0x010352e4: 0x10352e4: addiu s6, s6, -17892
+// 0x010352f4: 0x10352f4: addiu s6, s6, -17428
 	ldloc 14
-	ldc.i4 -17892
+	ldc.i4 -17428
 	add
 	stloc 14
-// 0x010352e8: 0x10352e8: addu  s0, zero, zero
+// 0x010352f8: 0x10352f8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010352ec: 0x10352ec: addiu s4, zero, 120
+// 0x010352fc: 0x10352fc: addiu s4, zero, 120
 	ldc.i4.s 120
 	stloc 13
-L_10352f0:
-// 0x010352f0: 0x10352f0: lw    v0, 0(s5)
+L_1035300:
+// 0x01035300: 0x1035300: lw    v0, 0(s5)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010352f4: 0x10352f4: addu  a1, s7, s0
+// 0x01035304: 0x1035304: addu  a1, s7, s0
 	ldloc 11
 	ldloc 9
 	add
 	stloc.2
-// 0x010352f8: 0x10352f8: addu  v1, s6, s0
+// 0x01035308: 0x1035308: addu  v1, s6, s0
 	ldloc 14
 	ldloc 9
 	add
 	stloc 6
-// 0x010352fc: 0x10352fc: addu  a0, v0, zero
+// 0x0103530c: 0x103530c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01035300: 0x1035300: sw    v0, 0(a1)
+// 0x01035310: 0x1035310: sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01035304: 0x1035304: jal   0x101cd60 sw    v0, 0(v1)
+// 0x01035314: 0x1035314: jal   0x101cd70 sw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7915,78 +7915,78 @@ L_10352f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103530c: 0x103530c: addiu s0, s0, 4
+// 0x0103531c: 0x103531c: addiu s0, s0, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-// 0x01035310: 0x1035310: sw    v0, 0(s5)
+// 0x01035320: 0x1035320: sw    v0, 0(s5)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01035314: 0x1035314: bne   s0, s4, 0x10352f0 addiu s5, s5, 4
+// 0x01035324: 0x1035324: bne   s0, s4, 0x1035300 addiu s5, s5, 4
 	ldloc 9
 	ldloc 13
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	bne.un L_10352f0
+	bne.un L_1035300
 // --- basic block ---
-// 0x0103531c: 0x103531c: bne   s3, zero, 0x103532c addu  v0, zero, zero
+// 0x0103532c: 0x103532c: bne   s3, zero, 0x103533c addu  v0, zero, zero
 	ldloc 16
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_103532c
+	brtrue L_103533c
 // --- basic block ---
-// 0x01035324: 0x1035324: lui   v0, 0x1030000
+// 0x01035334: 0x1035334: lui   v0, 0x1030000
 	ldc.i4 16973824
 	stloc 5
-// 0x01035328: 0x1035328: addiu v0, v0, 19288
+// 0x01035338: 0x1035338: addiu v0, v0, 19304
 	ldloc 5
-	ldc.i4 19288
+	ldc.i4 19304
 	add
 	stloc 5
-L_103532c:
-// 0x0103532c: 0x103532c: lui   a2, 0x60000
+L_103533c:
+// 0x0103533c: 0x103533c: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01035330: 0x1035330: lui   a3, 0x60000
+// 0x01035340: 0x1035340: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01035334: 0x1035334: lui   v1, 0x60000
+// 0x01035344: 0x1035344: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01035338: 0x1035338: addiu v1, v1, -17892
+// 0x01035348: 0x1035348: addiu v1, v1, -17428
 	ldloc 6
-	ldc.i4 -17892
+	ldc.i4 -17428
 	add
 	stloc 6
-// 0x0103533c: 0x103533c: addiu a2, a2, -17612
+// 0x0103534c: 0x103534c: addiu a2, a2, -17148
 	ldloc.3
-	ldc.i4 -17612
+	ldc.i4 -17148
 	add
 	stloc.3
-// 0x01035340: 0x1035340: addiu a3, a3, -17752
+// 0x01035350: 0x1035350: addiu a3, a3, -17288
 	ldloc 4
-	ldc.i4 -17752
+	ldc.i4 -17288
 	add
 	stloc 4
-// 0x01035344: 0x1035344: addu  a0, s2, zero
+// 0x01035354: 0x1035354: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01035348: 0x1035348: addiu a1, zero, 30
+// 0x01035358: 0x1035358: addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
-// 0x0103534c: 0x103534c: sw    v1, 16(sp)
+// 0x0103535c: 0x103535c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7995,7 +7995,7 @@ L_103532c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035350: 0x1035350: sw    v0, 24(sp)
+// 0x01035360: 0x1035360: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8004,7 +8004,7 @@ L_103532c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01035354: 0x1035354: sw    zero, 20(sp)
+// 0x01035364: 0x1035364: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8013,7 +8013,7 @@ L_103532c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01035358: 0x1035358: sw    zero, 28(sp)
+// 0x01035368: 0x1035368: sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8022,7 +8022,7 @@ L_103532c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103535c: 0x103535c: jal   0x10924c8 sw    zero, 32(sp)
+// 0x0103536c: 0x103536c: jal   0x1092aec sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8036,100 +8036,100 @@ L_103532c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_10924c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_1092aec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01035364: 0x1035364: beq   s3, zero, 0x10353c0 lui   s5, 0x10000
+// 0x01035374: 0x1035374: beq   s3, zero, 0x10353d0 lui   s5, 0x10000
 	ldloc 16
 	ldc.i4 65536
 	stloc 8
-	brfalse L_10353c0
+	brfalse L_10353d0
 // --- basic block ---
-// 0x0103536c: 0x103536c: lui   s4, 0x10000
+// 0x0103537c: 0x103537c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x01035370: 0x1035370: addiu s5, s5, -32516
+// 0x01035380: 0x1035380: addiu s5, s5, -32516
 	ldloc 8
 	ldc.i4 -32516
 	add
 	stloc 8
-// 0x01035374: 0x1035374: addiu s4, s4, -13528
+// 0x01035384: 0x1035384: addiu s4, s4, -13532
 	ldloc 13
-	ldc.i4 -13528
+	ldc.i4 -13532
 	add
 	stloc 13
-// 0x01035378: 0x1035378: addu  s0, zero, zero
+// 0x01035388: 0x1035388: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0103537c: 0x103537c: addiu s3, zero, 30
+// 0x0103538c: 0x103538c: addiu s3, zero, 30
 	ldc.i4.s 30
 	stloc 16
-// 0x01035380: 0x1035380: addu  a1, s0, zero
+// 0x01035390: 0x1035390: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-L_1035384:
-// 0x01035384: 0x1035384: jal   0x109152c addu  a0, s2, zero
+L_1035394:
+// 0x01035394: 0x1035394: jal   0x1091b50 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl108::ssd_list_get_row_109152c(int32,int32)
+	call int32 Cibyl108::ssd_list_get_row_1091b50(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103538c: 0x103538c: addu  a0, v0, zero
+// 0x0103539c: 0x103539c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01035390: 0x1035390: addu  a1, s5, zero
+// 0x010353a0: 0x10353a0: addu  a1, s5, zero
 	ldloc 8
 	stloc.2
-// 0x01035394: 0x1035394: beq   v0, zero, 0x10353b8 addiu s0, s0, 1
+// 0x010353a4: 0x10353a4: beq   v0, zero, 0x10353c8 addiu s0, s0, 1
 	ldloc 5
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brfalse L_10353b8
+	brfalse L_10353c8
 // --- basic block ---
-// 0x0103539c: 0x103539c: jal   0x109b304 sll   zero, zero, 0
+// 0x010353ac: 0x10353ac: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010353a4: 0x10353a4: addu  a0, v0, zero
+// 0x010353b4: 0x10353b4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010353a8: 0x10353a8: beq   v0, zero, 0x10353b8 addu  a1, s4, zero
+// 0x010353b8: 0x10353b8: beq   v0, zero, 0x10353c8 addu  a1, s4, zero
 	ldloc 5
 	ldloc 13
 	stloc.2
-	brfalse L_10353b8
+	brfalse L_10353c8
 // --- basic block ---
-// 0x010353b0: 0x10353b0: jal   0x1097af8 sll   zero, zero, 0
+// 0x010353c0: 0x10353c0: jal   0x1098140 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-L_10353b8:
-// 0x010353b8: 0x10353b8: bne   s0, s3, 0x1035384 addu  a1, s0, zero
+L_10353c8:
+// 0x010353c8: 0x10353c8: bne   s0, s3, 0x1035394 addu  a1, s0, zero
 	ldloc 9
 	ldloc 16
 	ldloc 9
 	stloc.2
-	bne.un L_1035384
+	bne.un L_1035394
 // --- basic block ---
-L_10353c0:
-// 0x010353c0: 0x10353c0: lui   a0, 0x10000
+L_10353d0:
+// 0x010353d0: 0x10353d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010353c4: 0x10353c4: sw    zero, 216(s1)
+// 0x010353d4: 0x10353d4: sw    zero, 216(s1)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
@@ -8138,12 +8138,12 @@ L_10353c0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010353c8: 0x10353c8: addiu a0, a0, -13748
+// 0x010353d8: 0x10353d8: addiu a0, a0, -13752
 	ldloc.1
-	ldc.i4 -13748
+	ldc.i4 -13752
 	add
 	stloc.1
-// 0x010353cc: 0x10353cc: jal   0x1095eec addu  a1, zero, zero
+// 0x010353dc: 0x10353dc: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -8151,24 +8151,24 @@ L_10353c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010353d4: 0x10353d4: jal   0x109483c sll   zero, zero, 0
+// 0x010353e4: 0x10353e4: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010353dc: 0x10353dc: lw    ra, 236(sp)
-// 0x010353e0: 0x10353e0: lw    s8, 232(sp)
+// 0x010353ec: 0x10353ec: lw    ra, 236(sp)
+// 0x010353f0: 0x10353f0: lw    s8, 232(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8177,7 +8177,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010353e4: 0x10353e4: lw    s7, 228(sp)
+// 0x010353f4: 0x10353f4: lw    s7, 228(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8186,7 +8186,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010353e8: 0x10353e8: lw    s6, 224(sp)
+// 0x010353f8: 0x10353f8: lw    s6, 224(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8195,7 +8195,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010353ec: 0x10353ec: lw    s5, 220(sp)
+// 0x010353fc: 0x10353fc: lw    s5, 220(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8204,7 +8204,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010353f0: 0x10353f0: lw    s4, 216(sp)
+// 0x01035400: 0x1035400: lw    s4, 216(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8213,7 +8213,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010353f4: 0x10353f4: lw    s3, 212(sp)
+// 0x01035404: 0x1035404: lw    s3, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8222,7 +8222,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010353f8: 0x10353f8: lw    s2, 208(sp)
+// 0x01035408: 0x1035408: lw    s2, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8231,7 +8231,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010353fc: 0x10353fc: lw    s1, 204(sp)
+// 0x0103540c: 0x103540c: lw    s1, 204(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8240,7 +8240,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01035400: 0x1035400: lw    s0, 200(sp)
+// 0x01035410: 0x1035410: lw    s0, 200(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8249,7 +8249,7 @@ L_10353c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035404: 0x1035404: jr    ra addiu sp, sp, 240
+// 0x01035414: 0x1035414: jr    ra addiu sp, sp, 240
 	ldloc.0
 	ldc.i4 240
 	add
diff --git a/converted/Cibyl39.j b/converted/Cibyl39.j
index 97dc708..7c0748d 100644
--- a/converted/Cibyl39.j
+++ b/converted/Cibyl39.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl39::.ctor
 
-.method public static int32 roadmap_mood_103540c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_103541c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -76,14 +76,14 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103540c:
-// 0x0103540c: 0x103540c: addiu sp, sp, -24
+L_103541c:
+// 0x0103541c: 0x103541c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01035410: 0x1035410: sw    ra, 20(sp)
-// 0x01035414: 0x1035414: jal   0x1034e48 addu  a0, zero, zero
+// 0x01035420: 0x1035420: sw    ra, 20(sp)
+// 0x01035424: 0x1035424: jal   0x1034e58 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -91,14 +91,14 @@ L_103540c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_dialog_1034e48(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_dialog_1034e58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0103541c: 0x103541c: lw    ra, 20(sp)
-// 0x01035420: 0x1035420: sll   zero, zero, 0
-// 0x01035424: 0x1035424: jr    ra addiu sp, sp, 24
+// 0x0103542c: 0x103542c: lw    ra, 20(sp)
+// 0x01035430: 0x1035430: sll   zero, zero, 0
+// 0x01035434: 0x1035434: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -110,7 +110,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_mood_to_string_103542c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_mood_to_string_103543c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -145,429 +145,429 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103542c: 0x103542c: addiu a0, a0, -2
+// 0x0103543c: 0x103543c: addiu a0, a0, -2
 	ldloc.1
 	ldc.i4.s -2
 	add
 	stloc.1
-// 0x01035430: 0x1035430: addiu sp, sp, -24
+// 0x01035440: 0x1035440: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01035434: 0x1035434: sltiu v0, a0, 33
+// 0x01035444: 0x1035444: sltiu v0, a0, 33
 	ldloc.1
 	ldc.i4.s 33
 	clt.un
 	stloc 5
-// 0x01035438: 0x1035438: beq   v0, zero, 0x103546c sw    ra, 20(sp)
+// 0x01035448: 0x1035448: beq   v0, zero, 0x103547c sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_103546c
+	brfalse L_103547c
 // --- basic block ---
-// 0x01035440: 0x1035440: lui   v0, 0x20000
+// 0x01035450: 0x1035450: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01035444: 0x1035444: addiu v0, v0, 25676
+// 0x01035454: 0x1035454: addiu v0, v0, 26140
 	ldloc 5
-	ldc.i4 25676
+	ldc.i4 26140
 	add
 	stloc 5
-// 0x01035448: 0x1035448: sll   a0, a0, 2
+// 0x01035458: 0x1035458: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0103544c: 0x103544c: addu  a0, v0, a0
+// 0x0103545c: 0x103545c: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x01035450: 0x1035450: lw    v0, 0(a0)
+// 0x01035460: 0x1035460: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01035454: 0x1035454: sll   zero, zero, 0
-// 0x01035458: 0x1035458: jr    v0 sll   zero, zero, 0
+// 0x01035464: 0x1035464: sll   zero, zero, 0
+// 0x01035468: 0x1035468: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1035460:
-// 0x01035460: 0x1035460: lui   v0, 0x10000
+L_1035470:
+// 0x01035470: 0x1035470: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035464: 0x1035464: j	 0x10355fc addiu v0, v0, -14136
+// 0x01035474: 0x1035474: j	 0x103560c addiu v0, v0, -14140
 	ldloc 5
-	ldc.i4 -14136
+	ldc.i4 -14140
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_103546c:
-// 0x0103546c: 0x103546c: lui   v0, 0x10000
+L_103547c:
+// 0x0103547c: 0x103547c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035470: 0x1035470: j	 0x10355fc addiu v0, v0, -14156
+// 0x01035480: 0x1035480: j	 0x103560c addiu v0, v0, -14160
 	ldloc 5
-	ldc.i4 -14156
+	ldc.i4 -14160
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035478:
-// 0x01035478: 0x1035478: lui   v0, 0x10000
+L_1035488:
+// 0x01035488: 0x1035488: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103547c: 0x103547c: j	 0x10355fc addiu v0, v0, -14132
+// 0x0103548c: 0x103548c: j	 0x103560c addiu v0, v0, -14136
 	ldloc 5
-	ldc.i4 -14132
+	ldc.i4 -14136
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035484:
-// 0x01035484: 0x1035484: lui   v0, 0x10000
+L_1035494:
+// 0x01035494: 0x1035494: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035488: 0x1035488: j	 0x10355fc addiu v0, v0, -14128
+// 0x01035498: 0x1035498: j	 0x103560c addiu v0, v0, -14132
 	ldloc 5
-	ldc.i4 -14128
+	ldc.i4 -14132
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035490:
-// 0x01035490: 0x1035490: lui   v0, 0x10000
+L_10354a0:
+// 0x010354a0: 0x10354a0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035494: 0x1035494: j	 0x10355fc addiu v0, v0, -14120
+// 0x010354a4: 0x10354a4: j	 0x103560c addiu v0, v0, -14124
 	ldloc 5
-	ldc.i4 -14120
+	ldc.i4 -14124
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_103549c:
-// 0x0103549c: 0x103549c: lui   v0, 0x10000
+L_10354ac:
+// 0x010354ac: 0x10354ac: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354a0: 0x10354a0: j	 0x10355fc addiu v0, v0, -14112
+// 0x010354b0: 0x10354b0: j	 0x103560c addiu v0, v0, -14116
 	ldloc 5
-	ldc.i4 -14112
+	ldc.i4 -14116
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354a8:
-// 0x010354a8: 0x10354a8: lui   v0, 0x10000
+L_10354b8:
+// 0x010354b8: 0x10354b8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354ac: 0x10354ac: j	 0x10355fc addiu v0, v0, -14100
+// 0x010354bc: 0x10354bc: j	 0x103560c addiu v0, v0, -14104
 	ldloc 5
-	ldc.i4 -14100
+	ldc.i4 -14104
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354b4:
-// 0x010354b4: 0x10354b4: lui   v0, 0x10000
+L_10354c4:
+// 0x010354c4: 0x10354c4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354b8: 0x10354b8: j	 0x10355fc addiu v0, v0, -14092
+// 0x010354c8: 0x10354c8: j	 0x103560c addiu v0, v0, -14096
 	ldloc 5
-	ldc.i4 -14092
+	ldc.i4 -14096
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354c0:
-// 0x010354c0: 0x10354c0: lui   v0, 0x10000
+L_10354d0:
+// 0x010354d0: 0x10354d0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354c4: 0x10354c4: j	 0x10355fc addiu v0, v0, -14084
+// 0x010354d4: 0x10354d4: j	 0x103560c addiu v0, v0, -14088
 	ldloc 5
-	ldc.i4 -14084
+	ldc.i4 -14088
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354cc:
-// 0x010354cc: 0x10354cc: lui   v0, 0x10000
+L_10354dc:
+// 0x010354dc: 0x10354dc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354d0: 0x10354d0: j	 0x10355fc addiu v0, v0, -14076
+// 0x010354e0: 0x10354e0: j	 0x103560c addiu v0, v0, -14080
 	ldloc 5
-	ldc.i4 -14076
+	ldc.i4 -14080
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354d8:
-// 0x010354d8: 0x10354d8: lui   v0, 0x10000
+L_10354e8:
+// 0x010354e8: 0x10354e8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354dc: 0x10354dc: j	 0x10355fc addiu v0, v0, -14072
+// 0x010354ec: 0x10354ec: j	 0x103560c addiu v0, v0, -14076
 	ldloc 5
-	ldc.i4 -14072
+	ldc.i4 -14076
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354e4:
-// 0x010354e4: 0x10354e4: lui   v0, 0x10000
+L_10354f4:
+// 0x010354f4: 0x10354f4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354e8: 0x10354e8: j	 0x10355fc addiu v0, v0, -14060
+// 0x010354f8: 0x10354f8: j	 0x103560c addiu v0, v0, -14064
 	ldloc 5
-	ldc.i4 -14060
+	ldc.i4 -14064
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354f0:
-// 0x010354f0: 0x10354f0: lui   v0, 0x10000
+L_1035500:
+// 0x01035500: 0x1035500: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010354f4: 0x10354f4: j	 0x10355fc addiu v0, v0, -14052
+// 0x01035504: 0x1035504: j	 0x103560c addiu v0, v0, -14056
 	ldloc 5
-	ldc.i4 -14052
+	ldc.i4 -14056
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10354fc:
-// 0x010354fc: 0x10354fc: lui   v0, 0x10000
+L_103550c:
+// 0x0103550c: 0x103550c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035500: 0x1035500: j	 0x10355fc addiu v0, v0, -14040
+// 0x01035510: 0x1035510: j	 0x103560c addiu v0, v0, -14044
 	ldloc 5
-	ldc.i4 -14040
+	ldc.i4 -14044
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035508:
-// 0x01035508: 0x1035508: lui   v0, 0x10000
+L_1035518:
+// 0x01035518: 0x1035518: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103550c: 0x103550c: j	 0x10355fc addiu v0, v0, -14024
+// 0x0103551c: 0x103551c: j	 0x103560c addiu v0, v0, -14028
 	ldloc 5
-	ldc.i4 -14024
+	ldc.i4 -14028
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035514:
-// 0x01035514: 0x1035514: lui   v0, 0x10000
+L_1035524:
+// 0x01035524: 0x1035524: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035518: 0x1035518: j	 0x10355fc addiu v0, v0, -14012
+// 0x01035528: 0x1035528: j	 0x103560c addiu v0, v0, -14016
 	ldloc 5
-	ldc.i4 -14012
+	ldc.i4 -14016
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035520:
-// 0x01035520: 0x1035520: lui   v0, 0x10000
+L_1035530:
+// 0x01035530: 0x1035530: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035524: 0x1035524: j	 0x10355fc addiu v0, v0, -14000
+// 0x01035534: 0x1035534: j	 0x103560c addiu v0, v0, -14004
 	ldloc 5
-	ldc.i4 -14000
+	ldc.i4 -14004
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_103552c:
-// 0x0103552c: 0x103552c: lui   v0, 0x10000
+L_103553c:
+// 0x0103553c: 0x103553c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035530: 0x1035530: j	 0x10355fc addiu v0, v0, -13984
+// 0x01035540: 0x1035540: j	 0x103560c addiu v0, v0, -13988
 	ldloc 5
-	ldc.i4 -13984
+	ldc.i4 -13988
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035538:
-// 0x01035538: 0x1035538: lui   v0, 0x10000
+L_1035548:
+// 0x01035548: 0x1035548: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103553c: 0x103553c: j	 0x10355fc addiu v0, v0, -13968
+// 0x0103554c: 0x103554c: j	 0x103560c addiu v0, v0, -13972
 	ldloc 5
-	ldc.i4 -13968
+	ldc.i4 -13972
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035544:
-// 0x01035544: 0x1035544: lui   v0, 0x10000
+L_1035554:
+// 0x01035554: 0x1035554: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035548: 0x1035548: j	 0x10355fc addiu v0, v0, -13952
+// 0x01035558: 0x1035558: j	 0x103560c addiu v0, v0, -13956
 	ldloc 5
-	ldc.i4 -13952
+	ldc.i4 -13956
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035550:
-// 0x01035550: 0x1035550: lui   v0, 0x10000
+L_1035560:
+// 0x01035560: 0x1035560: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035554: 0x1035554: j	 0x10355fc addiu v0, v0, -13936
+// 0x01035564: 0x1035564: j	 0x103560c addiu v0, v0, -13940
 	ldloc 5
-	ldc.i4 -13936
+	ldc.i4 -13940
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_103555c:
-// 0x0103555c: 0x103555c: lui   v0, 0x10000
+L_103556c:
+// 0x0103556c: 0x103556c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035560: 0x1035560: j	 0x10355fc addiu v0, v0, -13924
+// 0x01035570: 0x1035570: j	 0x103560c addiu v0, v0, -13928
 	ldloc 5
-	ldc.i4 -13924
+	ldc.i4 -13928
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035568:
-// 0x01035568: 0x1035568: lui   v0, 0x10000
+L_1035578:
+// 0x01035578: 0x1035578: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103556c: 0x103556c: j	 0x10355fc addiu v0, v0, -13908
+// 0x0103557c: 0x103557c: j	 0x103560c addiu v0, v0, -13912
 	ldloc 5
-	ldc.i4 -13908
+	ldc.i4 -13912
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035574:
-// 0x01035574: 0x1035574: lui   v0, 0x10000
+L_1035584:
+// 0x01035584: 0x1035584: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035578: 0x1035578: j	 0x10355fc addiu v0, v0, -13896
+// 0x01035588: 0x1035588: j	 0x103560c addiu v0, v0, -13900
 	ldloc 5
-	ldc.i4 -13896
+	ldc.i4 -13900
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035580:
-// 0x01035580: 0x1035580: lui   v0, 0x10000
+L_1035590:
+// 0x01035590: 0x1035590: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035584: 0x1035584: j	 0x10355fc addiu v0, v0, -13880
+// 0x01035594: 0x1035594: j	 0x103560c addiu v0, v0, -13884
 	ldloc 5
-	ldc.i4 -13880
+	ldc.i4 -13884
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_103558c:
-// 0x0103558c: 0x103558c: lui   v0, 0x10000
+L_103559c:
+// 0x0103559c: 0x103559c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01035590: 0x1035590: j	 0x10355fc addiu v0, v0, -13864
+// 0x010355a0: 0x10355a0: j	 0x103560c addiu v0, v0, -13868
 	ldloc 5
-	ldc.i4 -13864
+	ldc.i4 -13868
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_1035598:
-// 0x01035598: 0x1035598: lui   a0, 0x10000
+L_10355a8:
+// 0x010355a8: 0x10355a8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103559c: 0x103559c: j	 0x10355f4 addiu a0, a0, -13844
+// 0x010355ac: 0x10355ac: j	 0x1035604 addiu a0, a0, -13848
 	ldloc.1
-	ldc.i4 -13844
+	ldc.i4 -13848
 	add
 	stloc.1
-	br L_10355f4
+	br L_1035604
 // --- basic block ---
-L_10355a4:
-// 0x010355a4: 0x10355a4: lui   a0, 0x10000
+L_10355b4:
+// 0x010355b4: 0x10355b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010355a8: 0x10355a8: j	 0x10355f4 addiu a0, a0, -13828
+// 0x010355b8: 0x10355b8: j	 0x1035604 addiu a0, a0, -13832
 	ldloc.1
-	ldc.i4 -13828
+	ldc.i4 -13832
 	add
 	stloc.1
-	br L_10355f4
+	br L_1035604
 // --- basic block ---
-L_10355b0:
-// 0x010355b0: 0x10355b0: lui   a0, 0x10000
+L_10355c0:
+// 0x010355c0: 0x10355c0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010355b4: 0x10355b4: j	 0x10355f4 addiu a0, a0, -13812
+// 0x010355c4: 0x10355c4: j	 0x1035604 addiu a0, a0, -13816
 	ldloc.1
-	ldc.i4 -13812
+	ldc.i4 -13816
 	add
 	stloc.1
-	br L_10355f4
+	br L_1035604
 // --- basic block ---
-L_10355bc:
-// 0x010355bc: 0x10355bc: lui   v0, 0x10000
+L_10355cc:
+// 0x010355cc: 0x10355cc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010355c0: 0x10355c0: j	 0x10355fc addiu v0, v0, -13800
+// 0x010355d0: 0x10355d0: j	 0x103560c addiu v0, v0, -13804
 	ldloc 5
-	ldc.i4 -13800
+	ldc.i4 -13804
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10355c8:
-// 0x010355c8: 0x10355c8: lui   v0, 0x10000
+L_10355d8:
+// 0x010355d8: 0x10355d8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010355cc: 0x10355cc: j	 0x10355fc addiu v0, v0, -13792
+// 0x010355dc: 0x10355dc: j	 0x103560c addiu v0, v0, -13796
 	ldloc 5
-	ldc.i4 -13792
+	ldc.i4 -13796
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10355d4:
-// 0x010355d4: 0x10355d4: lui   v0, 0x10000
+L_10355e4:
+// 0x010355e4: 0x10355e4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010355d8: 0x10355d8: j	 0x10355fc addiu v0, v0, -13780
+// 0x010355e8: 0x10355e8: j	 0x103560c addiu v0, v0, -13784
 	ldloc 5
-	ldc.i4 -13780
+	ldc.i4 -13784
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10355e0:
-// 0x010355e0: 0x10355e0: lui   v0, 0x10000
+L_10355f0:
+// 0x010355f0: 0x10355f0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010355e4: 0x10355e4: j	 0x10355fc addiu v0, v0, -13768
+// 0x010355f4: 0x10355f4: j	 0x103560c addiu v0, v0, -13772
 	ldloc 5
-	ldc.i4 -13768
+	ldc.i4 -13772
 	add
 	stloc 5
-	br L_10355fc
+	br L_103560c
 // --- basic block ---
-L_10355ec:
-// 0x010355ec: 0x10355ec: lui   a0, 0x10000
+L_10355fc:
+// 0x010355fc: 0x10355fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010355f0: 0x10355f0: addiu a0, a0, -13692
+// 0x01035600: 0x1035600: addiu a0, a0, -13696
 	ldloc.1
-	ldc.i4 -13692
+	ldc.i4 -13696
 	add
 	stloc.1
-L_10355f4:
-// 0x010355f4: 0x10355f4: jal   0x1001ba8 sll   zero, zero, 0
+L_1035604:
+// 0x01035604: 0x1035604: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -578,10 +578,10 @@ L_10355f4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10355fc:
-// 0x010355fc: 0x10355fc: lw    ra, 20(sp)
-// 0x01035600: 0x1035600: sll   zero, zero, 0
-// 0x01035604: 0x1035604: jr    ra addiu sp, sp, 24
+L_103560c:
+// 0x0103560c: 0x103560c: lw    ra, 20(sp)
+// 0x01035610: 0x1035610: sll   zero, zero, 0
+// 0x01035614: 0x1035614: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -591,104 +591,104 @@ L_10355fc:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 16995424
-	beq  L_1035460
+	ldc.i4 16995440
+	beq  L_1035470
 	ldloc 5
-	ldc.i4 16995448
-	beq  L_1035478
+	ldc.i4 16995464
+	beq  L_1035488
 	ldloc 5
-	ldc.i4 16995460
-	beq  L_1035484
+	ldc.i4 16995476
+	beq  L_1035494
 	ldloc 5
-	ldc.i4 16995472
-	beq  L_1035490
+	ldc.i4 16995488
+	beq  L_10354a0
 	ldloc 5
-	ldc.i4 16995484
-	beq  L_103549c
+	ldc.i4 16995500
+	beq  L_10354ac
 	ldloc 5
-	ldc.i4 16995496
-	beq  L_10354a8
+	ldc.i4 16995512
+	beq  L_10354b8
 	ldloc 5
-	ldc.i4 16995508
-	beq  L_10354b4
+	ldc.i4 16995524
+	beq  L_10354c4
 	ldloc 5
-	ldc.i4 16995520
-	beq  L_10354c0
+	ldc.i4 16995536
+	beq  L_10354d0
 	ldloc 5
-	ldc.i4 16995532
-	beq  L_10354cc
+	ldc.i4 16995548
+	beq  L_10354dc
 	ldloc 5
-	ldc.i4 16995544
-	beq  L_10354d8
+	ldc.i4 16995560
+	beq  L_10354e8
 	ldloc 5
-	ldc.i4 16995556
-	beq  L_10354e4
+	ldc.i4 16995572
+	beq  L_10354f4
 	ldloc 5
-	ldc.i4 16995568
-	beq  L_10354f0
+	ldc.i4 16995584
+	beq  L_1035500
 	ldloc 5
-	ldc.i4 16995580
-	beq  L_10354fc
+	ldc.i4 16995596
+	beq  L_103550c
 	ldloc 5
-	ldc.i4 16995592
-	beq  L_1035508
+	ldc.i4 16995608
+	beq  L_1035518
 	ldloc 5
-	ldc.i4 16995604
-	beq  L_1035514
+	ldc.i4 16995620
+	beq  L_1035524
 	ldloc 5
-	ldc.i4 16995616
-	beq  L_1035520
+	ldc.i4 16995632
+	beq  L_1035530
 	ldloc 5
-	ldc.i4 16995628
-	beq  L_103552c
+	ldc.i4 16995644
+	beq  L_103553c
 	ldloc 5
-	ldc.i4 16995640
-	beq  L_1035538
+	ldc.i4 16995656
+	beq  L_1035548
 	ldloc 5
-	ldc.i4 16995652
-	beq  L_1035544
+	ldc.i4 16995668
+	beq  L_1035554
 	ldloc 5
-	ldc.i4 16995664
-	beq  L_1035550
+	ldc.i4 16995680
+	beq  L_1035560
 	ldloc 5
-	ldc.i4 16995676
-	beq  L_103555c
+	ldc.i4 16995692
+	beq  L_103556c
 	ldloc 5
-	ldc.i4 16995688
-	beq  L_1035568
+	ldc.i4 16995704
+	beq  L_1035578
 	ldloc 5
-	ldc.i4 16995700
-	beq  L_1035574
+	ldc.i4 16995716
+	beq  L_1035584
 	ldloc 5
-	ldc.i4 16995712
-	beq  L_1035580
+	ldc.i4 16995728
+	beq  L_1035590
 	ldloc 5
-	ldc.i4 16995724
-	beq  L_103558c
+	ldc.i4 16995740
+	beq  L_103559c
 	ldloc 5
-	ldc.i4 16995736
-	beq  L_1035598
+	ldc.i4 16995752
+	beq  L_10355a8
 	ldloc 5
-	ldc.i4 16995748
-	beq  L_10355a4
+	ldc.i4 16995764
+	beq  L_10355b4
 	ldloc 5
-	ldc.i4 16995760
-	beq  L_10355b0
+	ldc.i4 16995776
+	beq  L_10355c0
 	ldloc 5
-	ldc.i4 16995772
-	beq  L_10355bc
+	ldc.i4 16995788
+	beq  L_10355cc
 	ldloc 5
-	ldc.i4 16995784
-	beq  L_10355c8
+	ldc.i4 16995800
+	beq  L_10355d8
 	ldloc 5
-	ldc.i4 16995796
-	beq  L_10355d4
+	ldc.i4 16995812
+	beq  L_10355e4
 	ldloc 5
-	ldc.i4 16995808
-	beq  L_10355e0
+	ldc.i4 16995824
+	beq  L_10355f0
 	ldloc 5
-	ldc.i4 16995820
-	beq  L_10355ec
+	ldc.i4 16995836
+	beq  L_10355fc
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
@@ -696,7 +696,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_car_dialog_103560c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_car_dialog_103561c(int32,int32,int32,int32,int32)
 {
 .maxstack 12
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 s0,int32 v0,int32 s2,int32 s3,int32 s4,int32 s1,int32 s7,int32 s8,int32 s5,int32 s6,int32 ra)
@@ -758,12 +758,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103560c: 0x103560c: addiu sp, sp, -96
+// 0x0103561c: 0x103561c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01035610: 0x1035610: sw    s8, 88(sp)
+// 0x01035620: 0x1035620: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -772,7 +772,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01035614: 0x1035614: sw    s7, 84(sp)
+// 0x01035624: 0x1035624: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -781,7 +781,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01035618: 0x1035618: sw    s4, 72(sp)
+// 0x01035628: 0x1035628: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -790,7 +790,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103561c: 0x103561c: sw    s3, 68(sp)
+// 0x0103562c: 0x103562c: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -799,7 +799,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01035620: 0x1035620: sw    s2, 64(sp)
+// 0x01035630: 0x1035630: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -808,28 +808,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035624: 0x1035624: lui   v0, 0x0
+// 0x01035634: 0x1035634: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01035628: 0x1035628: lui   v1, 0x20000
+// 0x01035638: 0x1035638: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0103562c: 0x103562c: lui   s8, 0x20000
+// 0x0103563c: 0x103563c: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x01035630: 0x1035630: lui   s7, 0x10000
+// 0x01035640: 0x1035640: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x01035634: 0x1035634: lui   s2, 0x60000
+// 0x01035644: 0x1035644: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01035638: 0x1035638: lui   s3, 0x60000
+// 0x01035648: 0x1035648: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x0103563c: 0x103563c: lui   s4, 0x60000
+// 0x0103564c: 0x103564c: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01035640: 0x1035640: sw    s6, 80(sp)
+// 0x01035650: 0x1035650: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -838,7 +838,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01035644: 0x1035644: sw    s5, 76(sp)
+// 0x01035654: 0x1035654: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -847,7 +847,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01035648: 0x1035648: sw    s0, 56(sp)
+// 0x01035658: 0x1035658: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -856,8 +856,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103564c: 0x103564c: sw    ra, 92(sp)
-// 0x01035650: 0x1035650: sw    s1, 60(sp)
+// 0x0103565c: 0x103565c: sw    ra, 92(sp)
+// 0x01035660: 0x1035660: sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -866,7 +866,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01035654: 0x1035654: sw    a0, 12556(v0)
+// 0x01035664: 0x1035664: sw    a0, 12556(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -875,73 +875,73 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01035658: 0x1035658: addiu v1, v1, 25940
+// 0x01035668: 0x1035668: addiu v1, v1, 26404
 	ldloc 6
-	ldc.i4 25940
+	ldc.i4 26404
 	add
 	stloc 6
-// 0x0103565c: 0x103565c: addiu s8, s8, 21592
+// 0x0103566c: 0x103566c: addiu s8, s8, 22052
 	ldloc 14
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc 14
-// 0x01035660: 0x1035660: addiu s7, s7, 3076
+// 0x01035670: 0x1035670: addiu s7, s7, 3072
 	ldloc 13
-	ldc.i4 3076
+	ldc.i4 3072
 	add
 	stloc 13
-// 0x01035664: 0x1035664: addiu s2, s2, -17204
+// 0x01035674: 0x1035674: addiu s2, s2, -16740
 	ldloc 9
-	ldc.i4 -17204
+	ldc.i4 -16740
 	add
 	stloc 9
-// 0x01035668: 0x1035668: addiu s3, s3, -17284
+// 0x01035678: 0x1035678: addiu s3, s3, -16820
 	ldloc 10
-	ldc.i4 -17284
+	ldc.i4 -16820
 	add
 	stloc 10
-// 0x0103566c: 0x103566c: addiu s4, s4, -17364
+// 0x0103567c: 0x103567c: addiu s4, s4, -16900
 	ldloc 11
-	ldc.i4 -17364
+	ldc.i4 -16900
 	add
 	stloc 11
-// 0x01035670: 0x1035670: addu  s0, zero, zero
+// 0x01035680: 0x1035680: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01035674: 0x1035674: addiu s5, sp, 16
+// 0x01035684: 0x1035684: addiu s5, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 15
-// 0x01035678: 0x1035678: addiu s6, zero, 56
+// 0x01035688: 0x1035688: addiu s6, zero, 56
 	ldc.i4.s 56
 	stloc 16
-// 0x0103567c: 0x103567c: addu  v0, v1, s0
+// 0x0103568c: 0x103568c: addu  v0, v1, s0
 	ldloc 6
 	ldloc 7
 	add
 	stloc 8
-L_1035680:
-// 0x01035680: 0x1035680: lw    s1, 0(v0)
+L_1035690:
+// 0x01035690: 0x1035690: lw    s1, 0(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x01035684: 0x1035684: addu  a1, s8, zero
+// 0x01035694: 0x1035694: addu  a1, s8, zero
 	ldloc 14
 	stloc.2
-// 0x01035688: 0x1035688: addu  a2, s1, zero
+// 0x01035698: 0x1035698: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x0103568c: 0x103568c: addu  a3, s7, zero
+// 0x0103569c: 0x103569c: addu  a3, s7, zero
 	ldloc 13
 	stloc 4
-// 0x01035690: 0x1035690: addu  a0, s5, zero
+// 0x010356a0: 0x10356a0: addu  a0, s5, zero
 	ldloc 15
 	stloc.1
-// 0x01035694: 0x1035694: jal   0x1000f64 sw    v1, 48(sp)
+// 0x010356a4: 0x10356a4: jal   0x1000f64 sw    v1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -960,7 +960,7 @@ L_1035680:
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x0103569c: 0x103569c: jal   0x101cd60 addu  a0, s5, zero
+// 0x010356ac: 0x10356ac: jal   0x101cd70 addu  a0, s5, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -968,59 +968,59 @@ L_1035680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x010356a4: 0x10356a4: addu  a2, s2, s0
+// 0x010356b4: 0x10356b4: addu  a2, s2, s0
 	ldloc 9
 	ldloc 7
 	add
 	stloc.3
-// 0x010356a8: 0x10356a8: addu  a0, s3, s0
+// 0x010356b8: 0x10356b8: addu  a0, s3, s0
 	ldloc 10
 	ldloc 7
 	add
 	stloc.1
-// 0x010356ac: 0x10356ac: addu  a1, s4, s0
+// 0x010356bc: 0x10356bc: addu  a1, s4, s0
 	ldloc 11
 	ldloc 7
 	add
 	stloc.2
-// 0x010356b0: 0x10356b0: addiu s0, s0, 4
+// 0x010356c0: 0x10356c0: addiu s0, s0, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x010356b4: 0x10356b4: sw    v0, 0(a2)
+// 0x010356c4: 0x10356c4: sw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x010356b8: 0x10356b8: sw    s1, 0(a1)
+// 0x010356c8: 0x10356c8: sw    s1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x010356bc: 0x10356bc: sw    s1, 0(a0)
+// 0x010356cc: 0x10356cc: sw    s1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x010356c0: 0x10356c0: sb    zero, 16(sp)
+// 0x010356d0: 0x10356d0: sb    zero, 16(sp)
 	ldloc.0
 	ldc.i4.s 16
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010356c4: 0x10356c4: lw    v1, 48(sp)
+// 0x010356d4: 0x10356d4: lw    v1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1029,72 +1029,72 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010356c8: 0x10356c8: bne   s0, s6, 0x1035680 addu  v0, v1, s0
+// 0x010356d8: 0x10356d8: bne   s0, s6, 0x1035690 addu  v0, v1, s0
 	ldloc 7
 	ldloc 16
 	ldloc 6
 	ldloc 7
 	add
 	stloc 8
-	bne.un L_1035680
+	bne.un L_1035690
 // --- basic block ---
-// 0x010356d0: 0x10356d0: lui   a3, 0x0
+// 0x010356e0: 0x10356e0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010356d4: 0x10356d4: lui   a1, 0x1030000
+// 0x010356e4: 0x10356e4: lui   a1, 0x1030000
 	ldc.i4 16973824
 	stloc.2
-// 0x010356d8: 0x10356d8: lui   a0, 0x10000
+// 0x010356e8: 0x10356e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010356dc: 0x10356dc: addu  v1, zero, zero
+// 0x010356ec: 0x10356ec: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010356e0: 0x10356e0: addiu a3, a3, 12552
+// 0x010356f0: 0x10356f0: addiu a3, a3, 12552
 	ldloc 4
 	ldc.i4 12552
 	add
 	stloc 4
-// 0x010356e4: 0x10356e4: addiu a2, zero, 14
+// 0x010356f4: 0x10356f4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x010356e8: 0x10356e8: addiu a1, a1, 22384
+// 0x010356f8: 0x10356f8: addiu a1, a1, 22400
 	ldloc.2
-	ldc.i4 22384
+	ldc.i4 22400
 	add
 	stloc.2
-// 0x010356ec: 0x10356ec: addiu a0, a0, -18904
+// 0x010356fc: 0x10356fc: addiu a0, a0, -18904
 	ldloc.1
 	ldc.i4 -18904
 	add
 	stloc.1
-// 0x010356f0: 0x10356f0: cibyl_sysc_arg 0x4
+// 0x01035700: 0x1035700: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010356f4: 0x10356f4: cibyl_sysc_arg 0x5
+// 0x01035704: 0x1035704: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010356f8: 0x10356f8: cibyl_sysc_arg 0x6
+// 0x01035708: 0x1035708: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x010356fc: 0x10356fc: cibyl_sysc_arg 0x12
+// 0x0103570c: 0x103570c: cibyl_sysc_arg 0x12
 	ldloc 9
-// 0x01035700: 0x1035700: cibyl_sysc_arg 0x13
+// 0x01035710: 0x1035710: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x01035704: 0x1035704: cibyl_sysc_arg 0x14
+// 0x01035714: 0x1035714: cibyl_sysc_arg 0x14
 	ldloc 11
-// 0x01035708: 0x1035708: cibyl_sysc_arg 0x3
+// 0x01035718: 0x1035718: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0103570c: 0x103570c: cibyl_sysc_arg 0x3
+// 0x0103571c: 0x103571c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01035710: 0x1035710: cibyl_sysc_arg 0x3
+// 0x01035720: 0x1035720: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01035714: 0x1035714: cibyl_sysc_arg 0x7
+// 0x01035724: 0x1035724: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01035718: 0x1035718: cibyl_sysc 0x543
+// 0x01035728: 0x1035728: cibyl_sysc 0x543
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_showDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x0103571c: 0x103571c: addu  v1, v0, zero
+// 0x0103572c: 0x103572c: addu  v1, v0, zero
 	ldloc 8
 	stloc 6
-// 0x01035720: 0x1035720: lw    ra, 92(sp)
-// 0x01035724: 0x1035724: lw    s8, 88(sp)
+// 0x01035730: 0x1035730: lw    ra, 92(sp)
+// 0x01035734: 0x1035734: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1103,7 +1103,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01035728: 0x1035728: lw    s7, 84(sp)
+// 0x01035738: 0x1035738: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1112,7 +1112,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103572c: 0x103572c: lw    s6, 80(sp)
+// 0x0103573c: 0x103573c: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1121,7 +1121,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01035730: 0x1035730: lw    s5, 76(sp)
+// 0x01035740: 0x1035740: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1130,7 +1130,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01035734: 0x1035734: lw    s4, 72(sp)
+// 0x01035744: 0x1035744: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1139,7 +1139,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01035738: 0x1035738: lw    s3, 68(sp)
+// 0x01035748: 0x1035748: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1148,7 +1148,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103573c: 0x103573c: lw    s2, 64(sp)
+// 0x0103574c: 0x103574c: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1157,7 +1157,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035740: 0x1035740: lw    s1, 60(sp)
+// 0x01035750: 0x1035750: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1166,7 +1166,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01035744: 0x1035744: lw    s0, 56(sp)
+// 0x01035754: 0x1035754: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1175,7 +1175,7 @@ L_1035680:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035748: 0x1035748: jr    ra addiu sp, sp, 96
+// 0x01035758: 0x1035758: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -1187,7 +1187,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_car_1035750(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_car_1035760(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1222,14 +1222,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035750:
-// 0x01035750: 0x1035750: addiu sp, sp, -24
+L_1035760:
+// 0x01035760: 0x1035760: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01035754: 0x1035754: sw    ra, 20(sp)
-// 0x01035758: 0x1035758: jal   0x103560c addu  a0, zero, zero
+// 0x01035764: 0x1035764: sw    ra, 20(sp)
+// 0x01035768: 0x1035768: jal   0x103561c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1237,14 +1237,14 @@ L_1035750:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_car_dialog_103560c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_car_dialog_103561c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01035760: 0x1035760: lw    ra, 20(sp)
-// 0x01035764: 0x1035764: sll   zero, zero, 0
-// 0x01035768: 0x1035768: jr    ra addiu sp, sp, 24
+// 0x01035770: 0x1035770: lw    ra, 20(sp)
+// 0x01035774: 0x1035774: sll   zero, zero, 0
+// 0x01035778: 0x1035778: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1256,7 +1256,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_car_call_back_1035770(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_car_call_back_1035780(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1300,26 +1300,26 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01035770: 0x1035770: addiu sp, sp, -64
+// 0x01035780: 0x1035780: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01035774: 0x1035774: lw    v1, 0(a0)
+// 0x01035784: 0x1035784: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01035778: 0x1035778: lw    v0, 0(a1)
+// 0x01035788: 0x1035788: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0103577c: 0x103577c: sw    s2, 56(sp)
+// 0x0103578c: 0x103578c: sw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1328,7 +1328,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01035780: 0x1035780: sw    s1, 52(sp)
+// 0x01035790: 0x1035790: sw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1337,19 +1337,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035784: 0x1035784: addu  s2, a3, zero
+// 0x01035794: 0x1035794: addu  s2, a3, zero
 	ldloc 4
 	stloc 10
-// 0x01035788: 0x1035788: addu  s1, a1, zero
+// 0x01035798: 0x1035798: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0103578c: 0x103578c: lui   a3, 0x10000
+// 0x0103579c: 0x103579c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01035790: 0x1035790: lui   a1, 0x10000
+// 0x010357a0: 0x10357a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01035794: 0x1035794: sw    a2, 20(sp)
+// 0x010357a4: 0x10357a4: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1358,23 +1358,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01035798: 0x1035798: addiu a3, a3, -13412
+// 0x010357a8: 0x10357a8: addiu a3, a3, -13416
 	ldloc 4
-	ldc.i4 -13412
+	ldc.i4 -13416
 	add
 	stloc 4
-// 0x0103579c: 0x103579c: addiu a1, a1, -13436
+// 0x010357ac: 0x10357ac: addiu a1, a1, -13440
 	ldloc.2
-	ldc.i4 -13436
+	ldc.i4 -13440
 	add
 	stloc.2
-// 0x010357a0: 0x10357a0: addiu a0, zero, 2
+// 0x010357b0: 0x10357b0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010357a4: 0x10357a4: addiu a2, zero, 77
+// 0x010357b4: 0x10357b4: addiu a2, zero, 77
 	ldc.i4.s 77
 	stloc.3
-// 0x010357a8: 0x10357a8: sw    v1, 16(sp)
+// 0x010357b8: 0x10357b8: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1383,8 +1383,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010357ac: 0x10357ac: sw    ra, 60(sp)
-// 0x010357b0: 0x10357b0: sw    s0, 48(sp)
+// 0x010357bc: 0x10357bc: sw    ra, 60(sp)
+// 0x010357c0: 0x10357c0: sw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1393,7 +1393,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010357b4: 0x10357b4: sw    v0, 24(sp)
+// 0x010357c4: 0x10357c4: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1402,7 +1402,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010357b8: 0x10357b8: jal   0x100449c addiu s0, sp, 32
+// 0x010357c8: 0x10357c8: jal   0x100449c addiu s0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1417,18 +1417,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010357c0: 0x10357c0: lui   a1, 0x20000
+// 0x010357d0: 0x10357d0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010357c4: 0x10357c4: addu  a0, s0, zero
+// 0x010357d4: 0x10357d4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010357c8: 0x10357c8: addiu a1, a1, 25996
+// 0x010357d8: 0x10357d8: addiu a1, a1, 26460
 	ldloc.2
-	ldc.i4 25996
+	ldc.i4 26460
 	add
 	stloc.2
-// 0x010357cc: 0x10357cc: jal   0x1001800 addiu a2, zero, 16
+// 0x010357dc: 0x10357dc: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -1440,26 +1440,26 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010357d4: 0x10357d4: lui   a2, 0x10000
+// 0x010357e4: 0x10357e4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010357d8: 0x10357d8: lui   a0, 0x20000
+// 0x010357e8: 0x10357e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010357dc: 0x10357dc: addiu a2, a2, -30000
+// 0x010357ec: 0x10357ec: addiu a2, a2, -30000
 	ldloc.3
 	ldc.i4 -30000
 	add
 	stloc.3
-// 0x010357e0: 0x10357e0: addu  a1, s0, zero
+// 0x010357f0: 0x10357f0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010357e4: 0x10357e4: addu  a3, zero, zero
+// 0x010357f4: 0x10357f4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010357e8: 0x10357e8: jal   0x100edb0 addiu a0, a0, -26888
+// 0x010357f8: 0x10357f8: jal   0x100edc0 addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
 	ldloc.0
@@ -1467,19 +1467,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010357f0: 0x10357f0: lw    a1, 0(s1)
+// 0x01035800: 0x1035800: lw    a1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010357f4: 0x10357f4: jal   0x100e5c0 addu  a0, s0, zero
+// 0x01035804: 0x1035804: jal   0x100e5d0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1487,22 +1487,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010357fc: 0x10357fc: addu  v1, zero, zero
+// 0x0103580c: 0x103580c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01035800: 0x1035800: cibyl_sysc_arg 0x3
+// 0x01035810: 0x1035810: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01035804: 0x1035804: cibyl_sysc 0x566
+// 0x01035814: 0x1035814: cibyl_sysc 0x566
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_closeDialog(int32)
-// 0x01035808: 0x1035808: addu  v1, v0, zero
+// 0x01035818: 0x1035818: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0103580c: 0x103580c: lw    v0, 4(s2)
+// 0x0103581c: 0x103581c: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1511,12 +1511,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01035810: 0x1035810: sll   zero, zero, 0
-// 0x01035814: 0x1035814: beq   v0, zero, 0x1035824 sll   zero, zero, 0
+// 0x01035820: 0x1035820: sll   zero, zero, 0
+// 0x01035824: 0x1035824: beq   v0, zero, 0x1035834 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1035824
+	brfalse L_1035834
 // --- basic block ---
-// 0x0103581c: 0x103581c: jalr  v0 sll   zero, zero, 0
+// 0x0103582c: 0x103582c: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -1528,9 +1528,9 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1035824:
-// 0x01035824: 0x1035824: lw    ra, 60(sp)
-// 0x01035828: 0x1035828: lw    s2, 56(sp)
+L_1035834:
+// 0x01035834: 0x1035834: lw    ra, 60(sp)
+// 0x01035838: 0x1035838: lw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1539,7 +1539,7 @@ L_1035824:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103582c: 0x103582c: lw    s1, 52(sp)
+// 0x0103583c: 0x103583c: lw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1548,7 +1548,7 @@ L_1035824:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035830: 0x1035830: lw    s0, 48(sp)
+// 0x01035840: 0x1035840: lw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1557,7 +1557,7 @@ L_1035824:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01035834: 0x1035834: jr    ra addiu sp, sp, 64
+// 0x01035844: 0x1035844: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1569,7 +1569,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_pgrmz_103583c()
+.method public static int32 roadmap_nmea_pgrmz_103584c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1583,8 +1583,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103583c:
-// 0x0103583c: 0x103583c: jr    ra addu  v0, zero, zero
+L_103584c:
+// 0x0103584c: 0x103584c: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1592,7 +1592,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_nmea_null_decoder_1035844()
+.method public static int32 roadmap_nmea_null_decoder_1035854()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1606,8 +1606,8 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035844:
-// 0x01035844: 0x1035844: jr    ra addu  v0, zero, zero
+L_1035854:
+// 0x01035854: 0x1035854: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1615,7 +1615,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 hex2bin_103584c(int32,int32,int32,int32,int32)
+.method public static int32 hex2bin_103585c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -1650,112 +1650,112 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103584c: 0x103584c: addu  v1, a0, zero
+// 0x0103585c: 0x103585c: addu  v1, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01035850: 0x1035850: andi  a0, a0, 255
+// 0x01035860: 0x1035860: andi  a0, a0, 255
 	ldloc.1
 	ldc.i4 255
 	and
 	stloc.1
-// 0x01035854: 0x1035854: addiu a1, a0, -48
+// 0x01035864: 0x1035864: addiu a1, a0, -48
 	ldloc.1
 	ldc.i4.s -48
 	add
 	stloc.2
-// 0x01035858: 0x1035858: andi  a1, a1, 255
+// 0x01035868: 0x1035868: andi  a1, a1, 255
 	ldloc.2
 	ldc.i4 255
 	and
 	stloc.2
-// 0x0103585c: 0x103585c: addiu sp, sp, -32
+// 0x0103586c: 0x103586c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01035860: 0x1035860: sltiu a1, a1, 10
+// 0x01035870: 0x1035870: sltiu a1, a1, 10
 	ldloc.2
 	ldc.i4.s 10
 	clt.un
 	stloc.2
-// 0x01035864: 0x1035864: sw    ra, 28(sp)
-// 0x01035868: 0x1035868: bne   a1, zero, 0x10358bc addiu v0, v1, -48
+// 0x01035874: 0x1035874: sw    ra, 28(sp)
+// 0x01035878: 0x1035878: bne   a1, zero, 0x10358cc addiu v0, v1, -48
 	ldloc.2
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 6
-	brtrue L_10358bc
+	brtrue L_10358cc
 // --- basic block ---
-// 0x01035870: 0x1035870: addiu a1, a0, -65
+// 0x01035880: 0x1035880: addiu a1, a0, -65
 	ldloc.1
 	ldc.i4.s -65
 	add
 	stloc.2
-// 0x01035874: 0x1035874: andi  a1, a1, 255
+// 0x01035884: 0x1035884: andi  a1, a1, 255
 	ldloc.2
 	ldc.i4 255
 	and
 	stloc.2
-// 0x01035878: 0x1035878: sltiu a1, a1, 6
+// 0x01035888: 0x1035888: sltiu a1, a1, 6
 	ldloc.2
 	ldc.i4.6
 	clt.un
 	stloc.2
-// 0x0103587c: 0x103587c: bne   a1, zero, 0x10358bc addiu v0, v1, -55
+// 0x0103588c: 0x103588c: bne   a1, zero, 0x10358cc addiu v0, v1, -55
 	ldloc.2
 	ldloc 5
 	ldc.i4.s -55
 	add
 	stloc 6
-	brtrue L_10358bc
+	brtrue L_10358cc
 // --- basic block ---
-// 0x01035884: 0x1035884: addiu a0, a0, -97
+// 0x01035894: 0x1035894: addiu a0, a0, -97
 	ldloc.1
 	ldc.i4.s -97
 	add
 	stloc.1
-// 0x01035888: 0x1035888: andi  a0, a0, 255
+// 0x01035898: 0x1035898: andi  a0, a0, 255
 	ldloc.1
 	ldc.i4 255
 	and
 	stloc.1
-// 0x0103588c: 0x103588c: sltiu a0, a0, 6
+// 0x0103589c: 0x103589c: sltiu a0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	clt.un
 	stloc.1
-// 0x01035890: 0x1035890: bne   a0, zero, 0x10358bc addiu v0, v1, -87
+// 0x010358a0: 0x10358a0: bne   a0, zero, 0x10358cc addiu v0, v1, -87
 	ldloc.1
 	ldloc 5
 	ldc.i4.s -87
 	add
 	stloc 6
-	brtrue L_10358bc
+	brtrue L_10358cc
 // --- basic block ---
-// 0x01035898: 0x1035898: lui   a1, 0x10000
+// 0x010358a8: 0x10358a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103589c: 0x103589c: lui   a3, 0x10000
+// 0x010358ac: 0x10358ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010358a0: 0x10358a0: addiu a1, a1, -13152
+// 0x010358b0: 0x10358b0: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x010358a4: 0x10358a4: addiu a3, a3, -13124
+// 0x010358b4: 0x10358b4: addiu a3, a3, -13128
 	ldloc 4
-	ldc.i4 -13124
+	ldc.i4 -13128
 	add
 	stloc 4
-// 0x010358a8: 0x10358a8: addiu a0, zero, 4
+// 0x010358b8: 0x10358b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010358ac: 0x10358ac: addiu a2, zero, 73
+// 0x010358bc: 0x10358bc: addiu a2, zero, 73
 	ldc.i4.s 73
 	stloc.3
-// 0x010358b0: 0x10358b0: jal   0x100449c sw    v1, 16(sp)
+// 0x010358c0: 0x10358c0: jal   0x100449c sw    v1, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1774,13 +1774,13 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010358b8: 0x10358b8: addu  v0, zero, zero
+// 0x010358c8: 0x10358c8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10358bc:
-// 0x010358bc: 0x10358bc: lw    ra, 28(sp)
-// 0x010358c0: 0x10358c0: sll   zero, zero, 0
-// 0x010358c4: 0x10358c4: jr    ra addiu sp, sp, 32
+L_10358cc:
+// 0x010358cc: 0x10358cc: lw    ra, 28(sp)
+// 0x010358d0: 0x10358d0: sll   zero, zero, 0
+// 0x010358d4: 0x10358d4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1792,7 +1792,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_subscribe_10358cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_subscribe_10358dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s5,int32 s3,int32 s0,int32 s2,int32 v1,int32 s4,int32 ra)
@@ -1845,12 +1845,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010358cc: 0x10358cc: addiu sp, sp, -56
+// 0x010358dc: 0x10358dc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010358d0: 0x10358d0: sw    s5, 48(sp)
+// 0x010358e0: 0x10358e0: sw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1859,10 +1859,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010358d4: 0x10358d4: lui   s5, 0x20000
+// 0x010358e4: 0x10358e4: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x010358d8: 0x10358d8: sw    s4, 44(sp)
+// 0x010358e8: 0x10358e8: sw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1871,7 +1871,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010358dc: 0x10358dc: sw    s3, 40(sp)
+// 0x010358ec: 0x10358ec: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1880,7 +1880,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010358e0: 0x10358e0: sw    s2, 36(sp)
+// 0x010358f0: 0x10358f0: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1889,7 +1889,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010358e4: 0x10358e4: sw    s1, 32(sp)
+// 0x010358f4: 0x10358f4: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1898,7 +1898,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010358e8: 0x10358e8: sw    s0, 28(sp)
+// 0x010358f8: 0x10358f8: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1907,31 +1907,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010358ec: 0x10358ec: sw    ra, 52(sp)
-// 0x010358f0: 0x10358f0: addu  s0, a0, zero
+// 0x010358fc: 0x10358fc: sw    ra, 52(sp)
+// 0x01035900: 0x1035900: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010358f4: 0x10358f4: addu  s2, a1, zero
+// 0x01035904: 0x1035904: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010358f8: 0x10358f8: addu  s4, a2, zero
+// 0x01035908: 0x1035908: addu  s4, a2, zero
 	ldloc.3
 	stloc 13
-// 0x010358fc: 0x10358fc: addu  s3, a3, zero
+// 0x0103590c: 0x103590c: addu  s3, a3, zero
 	ldloc 4
 	stloc 9
-// 0x01035900: 0x1035900: addiu s5, s5, 26012
+// 0x01035910: 0x1035910: addiu s5, s5, 26476
 	ldloc 8
-	ldc.i4 26012
+	ldc.i4 26476
 	add
 	stloc 8
-// 0x01035904: 0x1035904: j	 0x1035994 addu  s1, zero, zero
+// 0x01035914: 0x1035914: j	 0x10359a4 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1035994
+	br L_10359a4
 // --- basic block ---
-L_103590c:
-// 0x0103590c: 0x103590c: lw    a1, 4(s5)
+L_103591c:
+// 0x0103591c: 0x103591c: lw    a1, 4(s5)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1940,47 +1940,47 @@ L_103590c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01035910: 0x1035910: jal   0x1001b14 sll   zero, zero, 0
+// 0x01035920: 0x1035920: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01035918: 0x1035918: bne   v0, zero, 0x103598c sll   zero, zero, 0
+// 0x01035928: 0x1035928: bne   v0, zero, 0x103599c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_103598c
+	brtrue L_103599c
 // --- basic block ---
-// 0x01035920: 0x1035920: lw    v0, 0(s5)
+// 0x01035930: 0x1035930: lw    v0, 0(s5)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01035924: 0x1035924: beq   s0, zero, 0x103593c addu  a0, s0, zero
+// 0x01035934: 0x1035934: beq   s0, zero, 0x103594c addu  a0, s0, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
-	brfalse L_103593c
+	brfalse L_103594c
 // --- basic block ---
-// 0x0103592c: 0x103592c: beq   v0, zero, 0x103598c addu  a1, v0, zero
+// 0x0103593c: 0x103593c: beq   v0, zero, 0x103599c addu  a1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.2
-	brfalse L_103598c
+	brfalse L_103599c
 // --- basic block ---
-// 0x01035934: 0x1035934: jal   0x1001b14 sll   zero, zero, 0
+// 0x01035944: 0x1035944: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-L_103593c:
-// 0x0103593c: 0x103593c: bne   v0, zero, 0x103598c sll   zero, zero, 0
+L_103594c:
+// 0x0103594c: 0x103594c: bne   v0, zero, 0x103599c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_103598c
+	brtrue L_103599c
 // --- basic block ---
-// 0x01035944: 0x1035944: lw    v0, 4(s3)
+// 0x01035954: 0x1035954: lw    v0, 4(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1989,45 +1989,45 @@ L_103593c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01035948: 0x1035948: sll   zero, zero, 0
-// 0x0103594c: 0x103594c: slt   v0, s1, v0
+// 0x01035958: 0x1035958: sll   zero, zero, 0
+// 0x0103595c: 0x103595c: slt   v0, s1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x01035950: 0x1035950: bne   v0, zero, 0x1035978 lui   a1, 0x10000
+// 0x01035960: 0x1035960: bne   v0, zero, 0x1035988 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1035978
+	brtrue L_1035988
 // --- basic block ---
-// 0x01035958: 0x1035958: lw    v0, 0(s3)
+// 0x01035968: 0x1035968: lw    v0, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0103595c: 0x103595c: lui   a3, 0x10000
+// 0x0103596c: 0x103596c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01035960: 0x1035960: addiu a1, a1, -13152
+// 0x01035970: 0x1035970: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x01035964: 0x1035964: addiu a3, a3, -13088
+// 0x01035974: 0x1035974: addiu a3, a3, -13092
 	ldloc 4
-	ldc.i4 -13088
+	ldc.i4 -13092
 	add
 	stloc 4
-// 0x01035968: 0x1035968: addiu a0, zero, 5
+// 0x01035978: 0x1035978: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0103596c: 0x103596c: addiu a2, zero, 695
+// 0x0103597c: 0x103597c: addiu a2, zero, 695
 	ldc.i4 695
 	stloc.3
-// 0x01035970: 0x1035970: jal   0x100449c sw    v0, 16(sp)
+// 0x01035980: 0x1035980: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2046,44 +2046,44 @@ L_103593c:
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_1035978:
-// 0x01035978: 0x1035978: addiu s1, s1, 2
+L_1035988:
+// 0x01035988: 0x1035988: addiu s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x0103597c: 0x103597c: sll   s1, s1, 2
+// 0x0103598c: 0x103598c: sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01035980: 0x1035980: addu  s3, s3, s1
+// 0x01035990: 0x1035990: addu  s3, s3, s1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 9
-// 0x01035984: 0x1035984: j	 0x10359ec sw    s4, 0(s3)
+// 0x01035994: 0x1035994: j	 0x10359fc sw    s4, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-	br L_10359ec
+	br L_10359fc
 // --- basic block ---
-L_103598c:
-// 0x0103598c: 0x103598c: addiu s1, s1, 1
+L_103599c:
+// 0x0103599c: 0x103599c: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01035990: 0x1035990: addiu s5, s5, 12
+// 0x010359a0: 0x10359a0: addiu s5, s5, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 8
-L_1035994:
-// 0x01035994: 0x1035994: lw    v0, 8(s5)
+L_10359a4:
+// 0x010359a4: 0x10359a4: lw    v0, 8(s5)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2092,39 +2092,39 @@ L_1035994:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01035998: 0x1035998: sll   zero, zero, 0
-// 0x0103599c: 0x103599c: bne   v0, zero, 0x103590c addu  a0, s2, zero
+// 0x010359a8: 0x10359a8: sll   zero, zero, 0
+// 0x010359ac: 0x10359ac: bne   v0, zero, 0x103591c addu  a0, s2, zero
 	ldloc 6
 	ldloc 11
 	stloc.1
-	brtrue L_103590c
+	brtrue L_103591c
 // --- basic block ---
-// 0x010359a4: 0x10359a4: bne   s0, zero, 0x10359c8 lui   a1, 0x10000
+// 0x010359b4: 0x10359b4: bne   s0, zero, 0x10359d8 lui   a1, 0x10000
 	ldloc 10
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10359c8
+	brtrue L_10359d8
 // --- basic block ---
-// 0x010359ac: 0x10359ac: lui   a3, 0x10000
+// 0x010359bc: 0x10359bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010359b0: 0x10359b0: addiu a1, a1, -13152
+// 0x010359c0: 0x10359c0: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x010359b4: 0x10359b4: addiu a3, a3, -13056
+// 0x010359c4: 0x10359c4: addiu a3, a3, -13060
 	ldloc 4
-	ldc.i4 -13056
+	ldc.i4 -13060
 	add
 	stloc 4
-// 0x010359b8: 0x10359b8: addiu a0, zero, 5
+// 0x010359c8: 0x10359c8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010359bc: 0x10359bc: addiu a2, zero, 707
+// 0x010359cc: 0x10359cc: addiu a2, zero, 707
 	ldc.i4 707
 	stloc.3
-// 0x010359c0: 0x10359c0: j	 0x10359e4 sw    s2, 16(sp)
+// 0x010359d0: 0x10359d0: j	 0x10359f4 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2133,29 +2133,29 @@ L_1035994:
 	add
 	ldloc 11
 	stelem.i4
-	br L_10359e4
+	br L_10359f4
 // --- basic block ---
-L_10359c8:
-// 0x010359c8: 0x10359c8: lui   a3, 0x10000
+L_10359d8:
+// 0x010359d8: 0x10359d8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010359cc: 0x10359cc: addiu a1, a1, -13152
+// 0x010359dc: 0x10359dc: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x010359d0: 0x10359d0: addiu a3, a3, -13016
+// 0x010359e0: 0x10359e0: addiu a3, a3, -13020
 	ldloc 4
-	ldc.i4 -13016
+	ldc.i4 -13020
 	add
 	stloc 4
-// 0x010359d4: 0x10359d4: addiu a0, zero, 5
+// 0x010359e4: 0x10359e4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010359d8: 0x10359d8: addiu a2, zero, 710
+// 0x010359e8: 0x10359e8: addiu a2, zero, 710
 	ldc.i4 710
 	stloc.3
-// 0x010359dc: 0x10359dc: sw    s2, 16(sp)
+// 0x010359ec: 0x10359ec: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2164,7 +2164,7 @@ L_10359c8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010359e0: 0x10359e0: sw    s0, 20(sp)
+// 0x010359f0: 0x10359f0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2173,8 +2173,8 @@ L_10359c8:
 	add
 	ldloc 10
 	stelem.i4
-L_10359e4:
-// 0x010359e4: 0x10359e4: jal   0x100449c sll   zero, zero, 0
+L_10359f4:
+// 0x010359f4: 0x10359f4: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2185,9 +2185,9 @@ L_10359e4:
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_10359ec:
-// 0x010359ec: 0x10359ec: lw    ra, 52(sp)
-// 0x010359f0: 0x10359f0: lw    s5, 48(sp)
+L_10359fc:
+// 0x010359fc: 0x10359fc: lw    ra, 52(sp)
+// 0x01035a00: 0x1035a00: lw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2196,7 +2196,7 @@ L_10359ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010359f4: 0x10359f4: lw    s4, 44(sp)
+// 0x01035a04: 0x1035a04: lw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2205,7 +2205,7 @@ L_10359ec:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010359f8: 0x10359f8: lw    s3, 40(sp)
+// 0x01035a08: 0x1035a08: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2214,7 +2214,7 @@ L_10359ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010359fc: 0x10359fc: lw    s2, 36(sp)
+// 0x01035a0c: 0x1035a0c: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2223,7 +2223,7 @@ L_10359ec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01035a00: 0x1035a00: lw    s1, 32(sp)
+// 0x01035a10: 0x1035a10: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2232,7 +2232,7 @@ L_10359ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035a04: 0x1035a04: lw    s0, 28(sp)
+// 0x01035a14: 0x1035a14: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2241,7 +2241,7 @@ L_10359ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01035a08: 0x1035a08: jr    ra addiu sp, sp, 56
+// 0x01035a18: 0x1035a18: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2253,7 +2253,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_pxrmcfg_1035a10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_pxrmcfg_1035a20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -2297,18 +2297,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035a10:
-// 0x01035a10: 0x1035a10: addiu sp, sp, -32
+L_1035a20:
+// 0x01035a20: 0x1035a20: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01035a14: 0x1035a14: slti  a0, a0, 4
+// 0x01035a24: 0x1035a24: slti  a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	clt
 	stloc.1
-// 0x01035a18: 0x1035a18: sw    s1, 20(sp)
+// 0x01035a28: 0x1035a28: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2317,8 +2317,8 @@ L_1035a10:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035a1c: 0x1035a1c: sw    ra, 28(sp)
-// 0x01035a20: 0x1035a20: sw    s2, 24(sp)
+// 0x01035a2c: 0x1035a2c: sw    ra, 28(sp)
+// 0x01035a30: 0x1035a30: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2327,7 +2327,7 @@ L_1035a10:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01035a24: 0x1035a24: sw    s0, 16(sp)
+// 0x01035a34: 0x1035a34: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2336,19 +2336,19 @@ L_1035a10:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01035a28: 0x1035a28: addu  s1, a1, zero
+// 0x01035a38: 0x1035a38: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01035a2c: 0x1035a2c: bne   a0, zero, 0x1035a74 addu  v0, zero, zero
+// 0x01035a3c: 0x1035a3c: bne   a0, zero, 0x1035a84 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1035a74
+	brtrue L_1035a84
 // --- basic block ---
-// 0x01035a34: 0x1035a34: lui   s0, 0x60000
+// 0x01035a44: 0x1035a44: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01035a38: 0x1035a38: lw    a0, 4(a1)
+// 0x01035a48: 0x1035a48: lw    a0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2357,9 +2357,9 @@ L_1035a10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035a3c: 0x1035a3c: jal   0x101cb5c addiu a1, s0, -16816
+// 0x01035a4c: 0x1035a4c: jal   0x101cb6c addiu a1, s0, -16352
 	ldloc 8
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -2367,24 +2367,24 @@ L_1035a10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01035a44: 0x1035a44: lui   s2, 0x60000
+// 0x01035a54: 0x1035a54: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01035a48: 0x1035a48: sw    v0, -17088(s2)
+// 0x01035a58: 0x1035a58: sw    v0, -16624(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035a4c: 0x1035a4c: lw    a0, 8(s1)
+// 0x01035a5c: 0x1035a5c: lw    a0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2393,9 +2393,9 @@ L_1035a10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035a50: 0x1035a50: jal   0x101cb5c addiu a1, s0, -16816
+// 0x01035a60: 0x1035a60: jal   0x101cb6c addiu a1, s0, -16352
 	ldloc 8
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -2403,17 +2403,17 @@ L_1035a10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01035a58: 0x1035a58: addiu s2, s2, -17088
+// 0x01035a68: 0x1035a68: addiu s2, s2, -16624
 	ldloc 7
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 7
-// 0x01035a5c: 0x1035a5c: sw    v0, 4(s2)
+// 0x01035a6c: 0x1035a6c: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2422,7 +2422,7 @@ L_1035a10:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035a60: 0x1035a60: lw    a0, 12(s1)
+// 0x01035a70: 0x1035a70: lw    a0, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2431,9 +2431,9 @@ L_1035a10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035a64: 0x1035a64: jal   0x101cb5c addiu a1, s0, -16816
+// 0x01035a74: 0x1035a74: jal   0x101cb6c addiu a1, s0, -16352
 	ldloc 8
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -2441,12 +2441,12 @@ L_1035a10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01035a6c: 0x1035a6c: sw    v0, 8(s2)
+// 0x01035a7c: 0x1035a7c: sw    v0, 8(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2455,12 +2455,12 @@ L_1035a10:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035a70: 0x1035a70: addiu v0, zero, 1
+// 0x01035a80: 0x1035a80: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1035a74:
-// 0x01035a74: 0x1035a74: lw    ra, 28(sp)
-// 0x01035a78: 0x1035a78: lw    s2, 24(sp)
+L_1035a84:
+// 0x01035a84: 0x1035a84: lw    ra, 28(sp)
+// 0x01035a88: 0x1035a88: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2469,7 +2469,7 @@ L_1035a74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035a7c: 0x1035a7c: lw    s1, 20(sp)
+// 0x01035a8c: 0x1035a8c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2478,7 +2478,7 @@ L_1035a74:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035a80: 0x1035a80: lw    s0, 16(sp)
+// 0x01035a90: 0x1035a90: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2487,7 +2487,7 @@ L_1035a74:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01035a84: 0x1035a84: jr    ra addiu sp, sp, 32
+// 0x01035a94: 0x1035a94: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2499,7 +2499,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_pxrmsub_1035a8c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_pxrmsub_1035a9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 s0,int32 v0,int32 s1,int32 s3,int32 s4,int32 v1,int32 ra)
@@ -2549,18 +2549,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035a8c:
-// 0x01035a8c: 0x1035a8c: addiu sp, sp, -40
+L_1035a9c:
+// 0x01035a9c: 0x1035a9c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01035a90: 0x1035a90: slti  v1, a0, 2
+// 0x01035aa0: 0x1035aa0: slti  v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	clt
 	stloc 12
-// 0x01035a94: 0x1035a94: sw    s0, 16(sp)
+// 0x01035aa4: 0x1035aa4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2569,8 +2569,8 @@ L_1035a8c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01035a98: 0x1035a98: sw    ra, 36(sp)
-// 0x01035a9c: 0x1035a9c: sw    s4, 32(sp)
+// 0x01035aa8: 0x1035aa8: sw    ra, 36(sp)
+// 0x01035aac: 0x1035aac: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2579,7 +2579,7 @@ L_1035a8c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01035aa0: 0x1035aa0: sw    s3, 28(sp)
+// 0x01035ab0: 0x1035ab0: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2588,7 +2588,7 @@ L_1035a8c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01035aa4: 0x1035aa4: sw    s2, 24(sp)
+// 0x01035ab4: 0x1035ab4: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2597,7 +2597,7 @@ L_1035a8c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035aa8: 0x1035aa8: sw    s1, 20(sp)
+// 0x01035ab8: 0x1035ab8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2606,39 +2606,39 @@ L_1035a8c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035aac: 0x1035aac: addu  s0, a0, zero
+// 0x01035abc: 0x1035abc: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01035ab0: 0x1035ab0: bne   v1, zero, 0x1035b04 addu  v0, zero, zero
+// 0x01035ac0: 0x1035ac0: bne   v1, zero, 0x1035b14 addu  v0, zero, zero
 	ldloc 12
 	ldc.i4.s 0
 	stloc 8
-	brtrue L_1035b04
+	brtrue L_1035b14
 // --- basic block ---
-// 0x01035ab8: 0x1035ab8: lui   s2, 0x60000
+// 0x01035ac8: 0x1035ac8: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01035abc: 0x1035abc: lui   s4, 0x60000
+// 0x01035acc: 0x1035acc: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01035ac0: 0x1035ac0: addu  s3, a1, zero
+// 0x01035ad0: 0x1035ad0: addu  s3, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01035ac4: 0x1035ac4: addiu s2, s2, -17084
+// 0x01035ad4: 0x1035ad4: addiu s2, s2, -16620
 	ldloc 6
-	ldc.i4 -17084
+	ldc.i4 -16620
 	add
 	stloc 6
-// 0x01035ac8: 0x1035ac8: addiu s4, s4, -16816
+// 0x01035ad8: 0x1035ad8: addiu s4, s4, -16352
 	ldloc 11
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc 11
-// 0x01035acc: 0x1035acc: addiu s1, zero, 1
+// 0x01035adc: 0x1035adc: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-L_1035ad0:
-// 0x01035ad0: 0x1035ad0: lw    a0, 4(s3)
+L_1035ae0:
+// 0x01035ae0: 0x1035ae0: lw    a0, 4(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2647,12 +2647,12 @@ L_1035ad0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035ad4: 0x1035ad4: addiu s1, s1, 1
+// 0x01035ae4: 0x1035ae4: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01035ad8: 0x1035ad8: jal   0x101cb5c addu  a1, s4, zero
+// 0x01035ae8: 0x1035ae8: jal   0x101cb6c addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -2660,59 +2660,59 @@ L_1035ad0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 8
 // --- basic block ---
-// 0x01035ae0: 0x1035ae0: slt   v1, s1, s0
+// 0x01035af0: 0x1035af0: slt   v1, s1, s0
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 12
-// 0x01035ae4: 0x1035ae4: sw    v0, 0(s2)
+// 0x01035af4: 0x1035af4: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01035ae8: 0x1035ae8: addiu s3, s3, 4
+// 0x01035af8: 0x1035af8: addiu s3, s3, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-// 0x01035aec: 0x1035aec: bne   v1, zero, 0x1035ad0 addiu s2, s2, 4
+// 0x01035afc: 0x1035afc: bne   v1, zero, 0x1035ae0 addiu s2, s2, 4
 	ldloc 12
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-	brtrue L_1035ad0
+	brtrue L_1035ae0
 // --- basic block ---
-// 0x01035af4: 0x1035af4: lui   v0, 0x60000
+// 0x01035b04: 0x1035b04: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01035af8: 0x1035af8: addiu s0, s0, -1
+// 0x01035b08: 0x1035b08: addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01035afc: 0x1035afc: sw    s0, -17088(v0)
+// 0x01035b0c: 0x1035b0c: sw    s0, -16624(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 7
 	stelem.i4
-// 0x01035b00: 0x1035b00: addiu v0, zero, 1
+// 0x01035b10: 0x1035b10: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 8
-L_1035b04:
-// 0x01035b04: 0x1035b04: lw    ra, 36(sp)
-// 0x01035b08: 0x1035b08: lw    s4, 32(sp)
+L_1035b14:
+// 0x01035b14: 0x1035b14: lw    ra, 36(sp)
+// 0x01035b18: 0x1035b18: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2721,7 +2721,7 @@ L_1035b04:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01035b0c: 0x1035b0c: lw    s3, 28(sp)
+// 0x01035b1c: 0x1035b1c: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2730,7 +2730,7 @@ L_1035b04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01035b10: 0x1035b10: lw    s2, 24(sp)
+// 0x01035b20: 0x1035b20: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2739,7 +2739,7 @@ L_1035b04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01035b14: 0x1035b14: lw    s1, 20(sp)
+// 0x01035b24: 0x1035b24: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2748,7 +2748,7 @@ L_1035b04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035b18: 0x1035b18: lw    s0, 16(sp)
+// 0x01035b28: 0x1035b28: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2757,7 +2757,7 @@ L_1035b04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035b1c: 0x1035b1c: jr    ra addiu sp, sp, 40
+// 0x01035b2c: 0x1035b2c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2769,7 +2769,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_nmea_pxrmdel_1035b24(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_pxrmdel_1035b34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2804,25 +2804,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035b24:
-// 0x01035b24: 0x1035b24: addiu sp, sp, -24
+L_1035b34:
+// 0x01035b34: 0x1035b34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01035b28: 0x1035b28: slti  a0, a0, 2
+// 0x01035b38: 0x1035b38: slti  a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	clt
 	stloc.1
-// 0x01035b2c: 0x1035b2c: sw    ra, 20(sp)
-// 0x01035b30: 0x1035b30: bne   a0, zero, 0x1035b54 addu  v0, zero, zero
+// 0x01035b3c: 0x1035b3c: sw    ra, 20(sp)
+// 0x01035b40: 0x1035b40: bne   a0, zero, 0x1035b64 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1035b54
+	brtrue L_1035b64
 // --- basic block ---
-// 0x01035b38: 0x1035b38: lw    a0, 4(a1)
+// 0x01035b48: 0x1035b48: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2831,12 +2831,12 @@ L_1035b24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035b3c: 0x1035b3c: lui   a1, 0x60000
+// 0x01035b4c: 0x1035b4c: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01035b40: 0x1035b40: jal   0x101cb5c addiu a1, a1, -16816
+// 0x01035b50: 0x1035b50: jal   0x101cb6c addiu a1, a1, -16352
 	ldloc.2
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -2844,30 +2844,30 @@ L_1035b24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01035b48: 0x1035b48: lui   v1, 0x60000
+// 0x01035b58: 0x1035b58: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01035b4c: 0x1035b4c: sw    v0, -17088(v1)
+// 0x01035b5c: 0x1035b5c: sw    v0, -16624(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 5
 	stelem.i4
-// 0x01035b50: 0x1035b50: addiu v0, zero, 1
+// 0x01035b60: 0x1035b60: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1035b54:
-// 0x01035b54: 0x1035b54: lw    ra, 20(sp)
-// 0x01035b58: 0x1035b58: sll   zero, zero, 0
-// 0x01035b5c: 0x1035b5c: jr    ra addiu sp, sp, 24
+L_1035b64:
+// 0x01035b64: 0x1035b64: lw    ra, 20(sp)
+// 0x01035b68: 0x1035b68: sll   zero, zero, 0
+// 0x01035b6c: 0x1035b6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2879,7 +2879,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_pxrmadd_1035b64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_pxrmadd_1035b74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -2923,18 +2923,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035b64:
-// 0x01035b64: 0x1035b64: addiu sp, sp, -32
+L_1035b74:
+// 0x01035b74: 0x1035b74: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01035b68: 0x1035b68: slti  a0, a0, 4
+// 0x01035b78: 0x1035b78: slti  a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	clt
 	stloc.1
-// 0x01035b6c: 0x1035b6c: sw    s1, 20(sp)
+// 0x01035b7c: 0x1035b7c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2943,8 +2943,8 @@ L_1035b64:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035b70: 0x1035b70: sw    ra, 28(sp)
-// 0x01035b74: 0x1035b74: sw    s2, 24(sp)
+// 0x01035b80: 0x1035b80: sw    ra, 28(sp)
+// 0x01035b84: 0x1035b84: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2953,7 +2953,7 @@ L_1035b64:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01035b78: 0x1035b78: sw    s0, 16(sp)
+// 0x01035b88: 0x1035b88: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2962,19 +2962,19 @@ L_1035b64:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01035b7c: 0x1035b7c: addu  s1, a1, zero
+// 0x01035b8c: 0x1035b8c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01035b80: 0x1035b80: bne   a0, zero, 0x1035bc8 addu  v0, zero, zero
+// 0x01035b90: 0x1035b90: bne   a0, zero, 0x1035bd8 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1035bc8
+	brtrue L_1035bd8
 // --- basic block ---
-// 0x01035b88: 0x1035b88: lui   s0, 0x60000
+// 0x01035b98: 0x1035b98: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01035b8c: 0x1035b8c: lw    a0, 4(a1)
+// 0x01035b9c: 0x1035b9c: lw    a0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2983,9 +2983,9 @@ L_1035b64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035b90: 0x1035b90: jal   0x101cb5c addiu a1, s0, -16816
+// 0x01035ba0: 0x1035ba0: jal   0x101cb6c addiu a1, s0, -16352
 	ldloc 8
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -2993,24 +2993,24 @@ L_1035b64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01035b98: 0x1035b98: lui   s2, 0x60000
+// 0x01035ba8: 0x1035ba8: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01035b9c: 0x1035b9c: sw    v0, -17088(s2)
+// 0x01035bac: 0x1035bac: sw    v0, -16624(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035ba0: 0x1035ba0: lw    a0, 8(s1)
+// 0x01035bb0: 0x1035bb0: lw    a0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3019,9 +3019,9 @@ L_1035b64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035ba4: 0x1035ba4: jal   0x101cb5c addiu a1, s0, -16816
+// 0x01035bb4: 0x1035bb4: jal   0x101cb6c addiu a1, s0, -16352
 	ldloc 8
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -3029,17 +3029,17 @@ L_1035b64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01035bac: 0x1035bac: addiu s2, s2, -17088
+// 0x01035bbc: 0x1035bbc: addiu s2, s2, -16624
 	ldloc 7
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 7
-// 0x01035bb0: 0x1035bb0: sw    v0, 4(s2)
+// 0x01035bc0: 0x1035bc0: sw    v0, 4(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3048,7 +3048,7 @@ L_1035b64:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035bb4: 0x1035bb4: lw    a0, 12(s1)
+// 0x01035bc4: 0x1035bc4: lw    a0, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3057,9 +3057,9 @@ L_1035b64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035bb8: 0x1035bb8: jal   0x101cb5c addiu a1, s0, -16816
+// 0x01035bc8: 0x1035bc8: jal   0x101cb6c addiu a1, s0, -16352
 	ldloc 8
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -3067,12 +3067,12 @@ L_1035b64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01035bc0: 0x1035bc0: sw    v0, 8(s2)
+// 0x01035bd0: 0x1035bd0: sw    v0, 8(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3081,12 +3081,12 @@ L_1035b64:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035bc4: 0x1035bc4: addiu v0, zero, 1
+// 0x01035bd4: 0x1035bd4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1035bc8:
-// 0x01035bc8: 0x1035bc8: lw    ra, 28(sp)
-// 0x01035bcc: 0x1035bcc: lw    s2, 24(sp)
+L_1035bd8:
+// 0x01035bd8: 0x1035bd8: lw    ra, 28(sp)
+// 0x01035bdc: 0x1035bdc: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3095,7 +3095,7 @@ L_1035bc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035bd0: 0x1035bd0: lw    s1, 20(sp)
+// 0x01035be0: 0x1035be0: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3104,7 +3104,7 @@ L_1035bc8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035bd4: 0x1035bd4: lw    s0, 16(sp)
+// 0x01035be4: 0x1035be4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3113,7 +3113,7 @@ L_1035bc8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01035bd8: 0x1035bd8: jr    ra addiu sp, sp, 32
+// 0x01035be8: 0x1035be8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3125,7 +3125,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32 v1,int32[] mem,int32 s0,int32 ra,int32 lo)
@@ -3169,12 +3169,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01035be0: 0x1035be0: addiu sp, sp, -32
+// 0x01035bf0: 0x1035bf0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01035be4: 0x1035be4: sw    s0, 20(sp)
+// 0x01035bf4: 0x1035bf4: sw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3183,13 +3183,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035be8: 0x1035be8: addu  s0, a1, zero
+// 0x01035bf8: 0x1035bf8: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01035bec: 0x1035bec: addiu a1, zero, 46
+// 0x01035bfc: 0x1035bfc: addiu a1, zero, 46
 	ldc.i4.s 46
 	stloc.2
-// 0x01035bf0: 0x1035bf0: sw    s1, 24(sp)
+// 0x01035c00: 0x1035c00: sw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3198,8 +3198,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035bf4: 0x1035bf4: sw    ra, 28(sp)
-// 0x01035bf8: 0x1035bf8: jal   0x1001a5c addu  s1, a0, zero
+// 0x01035c04: 0x1035c04: sw    ra, 28(sp)
+// 0x01035c08: 0x1035c08: jal   0x1001a5c addu  s1, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.1
@@ -3209,11 +3209,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01035c00: 0x1035c00: beq   v0, zero, 0x1035c38 sll   zero, zero, 0
+// 0x01035c10: 0x1035c10: beq   v0, zero, 0x1035c48 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1035c38
+	brfalse L_1035c48
 // --- basic block ---
-// 0x01035c08: 0x1035c08: jal   0x10c1c60 addu  a0, s1, zero
+// 0x01035c18: 0x1035c18: jal   0x10c22a0 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3221,15 +3221,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::atof_10c1c60(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::atof_10c22a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01035c10: 0x1035c10: addu  a0, s0, zero
+// 0x01035c20: 0x1035c20: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01035c14: 0x1035c14: jal   0x10c09ac addu  s1, v0, zero
+// 0x01035c24: 0x1035c24: jal   0x10c0fec addu  s1, v0, zero
 	ldloc 5
 	stloc 6
 	ldloc.1
@@ -3237,18 +3237,18 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01035c1c: 0x1035c1c: addu  a1, v0, zero
+// 0x01035c2c: 0x1035c2c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01035c20: 0x1035c20: jal   0x10c0780 addu  a0, s1, zero
+// 0x01035c30: 0x1035c30: jal   0x10c0dc0 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01035c28: 0x1035c28: jal   0x10c08bc addu  a0, v0, zero
+// 0x01035c38: 0x1035c38: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -3256,11 +3256,11 @@ __CIBYL_javamethod_begin:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01035c30: 0x1035c30: j	 0x1035c48 sll   zero, zero, 0
-	br L_1035c48
+// 0x01035c40: 0x1035c40: j	 0x1035c58 sll   zero, zero, 0
+	br L_1035c58
 // --- basic block ---
-L_1035c38:
-// 0x01035c38: 0x1035c38: jal   0x1000d8c addu  a0, s1, zero
+L_1035c48:
+// 0x01035c48: 0x1035c48: jal   0x1000d8c addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -3273,17 +3273,17 @@ L_1035c38:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01035c40: 0x1035c40: mult  v0, s0
+// 0x01035c50: 0x1035c50: mult  v0, s0
 	ldloc 5
 	ldloc 9
 	mul
 	stloc 11
-// 0x01035c44: 0x1035c44: mflo  lo
+// 0x01035c54: 0x1035c54: mflo  lo
 	ldloc 11
 	stloc 5
-L_1035c48:
-// 0x01035c48: 0x1035c48: lw    ra, 28(sp)
-// 0x01035c4c: 0x1035c4c: lw    s1, 24(sp)
+L_1035c58:
+// 0x01035c58: 0x1035c58: lw    ra, 28(sp)
+// 0x01035c5c: 0x1035c5c: lw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3292,7 +3292,7 @@ L_1035c48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01035c50: 0x1035c50: lw    s0, 20(sp)
+// 0x01035c60: 0x1035c60: lw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3301,7 +3301,7 @@ L_1035c48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035c54: 0x1035c54: jr    ra addiu sp, sp, 32
+// 0x01035c64: 0x1035c64: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3313,7 +3313,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s8,int32 s7,int32 lo,int32 s2,int32 s5,int32 s3,int32 s4,int32 s6,int32 ra)
@@ -3378,12 +3378,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01035c5c: 0x1035c5c: addiu sp, sp, -64
+// 0x01035c6c: 0x1035c6c: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01035c60: 0x1035c60: sw    s2, 32(sp)
+// 0x01035c70: 0x1035c70: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3392,13 +3392,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01035c64: 0x1035c64: addu  s2, a1, zero
+// 0x01035c74: 0x1035c74: addu  s2, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01035c68: 0x1035c68: addiu a1, zero, 46
+// 0x01035c78: 0x1035c78: addiu a1, zero, 46
 	ldc.i4.s 46
 	stloc.2
-// 0x01035c6c: 0x1035c6c: sw    s4, 40(sp)
+// 0x01035c7c: 0x1035c7c: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3407,7 +3407,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01035c70: 0x1035c70: sw    s3, 36(sp)
+// 0x01035c80: 0x1035c80: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3416,7 +3416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01035c74: 0x1035c74: sw    s0, 24(sp)
+// 0x01035c84: 0x1035c84: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3425,8 +3425,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01035c78: 0x1035c78: sw    ra, 60(sp)
-// 0x01035c7c: 0x1035c7c: sw    s8, 56(sp)
+// 0x01035c88: 0x1035c88: sw    ra, 60(sp)
+// 0x01035c8c: 0x1035c8c: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3435,7 +3435,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01035c80: 0x1035c80: sw    s7, 52(sp)
+// 0x01035c90: 0x1035c90: sw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3444,7 +3444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01035c84: 0x1035c84: sw    s6, 48(sp)
+// 0x01035c94: 0x1035c94: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3453,7 +3453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01035c88: 0x1035c88: sw    s5, 44(sp)
+// 0x01035c98: 0x1035c98: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3462,7 +3462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01035c8c: 0x1035c8c: sw    s1, 28(sp)
+// 0x01035c9c: 0x1035c9c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3471,13 +3471,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035c90: 0x1035c90: addu  s3, a2, zero
+// 0x01035ca0: 0x1035ca0: addu  s3, a2, zero
 	ldloc.3
 	stloc 15
-// 0x01035c94: 0x1035c94: addu  s4, a3, zero
+// 0x01035ca4: 0x1035ca4: addu  s4, a3, zero
 	ldloc 4
 	stloc 16
-// 0x01035c98: 0x1035c98: jal   0x1001a5c addu  s0, a0, zero
+// 0x01035ca8: 0x1035ca8: jal   0x1001a5c addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
@@ -3487,24 +3487,24 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01035ca0: 0x1035ca0: bne   v0, zero, 0x1035cc8 lui   s8, 0x10000
+// 0x01035cb0: 0x1035cb0: bne   v0, zero, 0x1035cd8 lui   s8, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 10
-	brtrue L_1035cc8
+	brtrue L_1035cd8
 // --- basic block ---
-// 0x01035ca8: 0x1035ca8: lb    v0, 0(s0)
+// 0x01035cb8: 0x1035cb8: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01035cac: 0x1035cac: sll   zero, zero, 0
-// 0x01035cb0: 0x1035cb0: beq   v0, zero, 0x1035d8c addu  v0, zero, zero
+// 0x01035cbc: 0x1035cbc: sll   zero, zero, 0
+// 0x01035cc0: 0x1035cc0: beq   v0, zero, 0x1035d9c addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1035d8c
+	brfalse L_1035d9c
 // --- basic block ---
-// 0x01035cb8: 0x1035cb8: jal   0x1001b48 addu  a0, s0, zero
+// 0x01035cc8: 0x1035cc8: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -3513,83 +3513,83 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01035cc0: 0x1035cc0: addu  v0, s0, v0
+// 0x01035cd0: 0x1035cd0: addu  v0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-// 0x01035cc4: 0x1035cc4: lui   s8, 0x10000
+// 0x01035cd4: 0x1035cd4: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 10
-L_1035cc8:
-// 0x01035cc8: 0x1035cc8: lui   s7, 0x10000
+L_1035cd8:
+// 0x01035cd8: 0x1035cd8: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01035ccc: 0x1035ccc: addiu s5, v0, -2
+// 0x01035cdc: 0x1035cdc: addiu s5, v0, -2
 	ldloc 6
 	ldc.i4.s -2
 	add
 	stloc 14
-// 0x01035cd0: 0x1035cd0: addiu s8, s8, -13152
+// 0x01035ce0: 0x1035ce0: addiu s8, s8, -13156
 	ldloc 10
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc 10
-// 0x01035cd4: 0x1035cd4: addiu s7, s7, -12968
+// 0x01035ce4: 0x1035ce4: addiu s7, s7, -12972
 	ldloc 11
-	ldc.i4 -12968
+	ldc.i4 -12972
 	add
 	stloc 11
-// 0x01035cd8: 0x1035cd8: addu  s1, zero, zero
+// 0x01035ce8: 0x1035ce8: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01035cdc: 0x1035cdc: j	 0x1035d28 addiu s6, zero, 10
+// 0x01035cec: 0x1035cec: j	 0x1035d38 addiu s6, zero, 10
 	ldc.i4.s 10
 	stloc 17
-	br L_1035d28
+	br L_1035d38
 // --- basic block ---
-L_1035ce4:
-// 0x01035ce4: 0x1035ce4: lb    v0, 0(s0)
+L_1035cf4:
+// 0x01035cf4: 0x1035cf4: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01035ce8: 0x1035ce8: sll   zero, zero, 0
-// 0x01035cec: 0x1035cec: addiu v1, v0, -48
+// 0x01035cf8: 0x1035cf8: sll   zero, zero, 0
+// 0x01035cfc: 0x1035cfc: addiu v1, v0, -48
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc 7
-// 0x01035cf0: 0x1035cf0: andi  a0, v1, 255
+// 0x01035d00: 0x1035d00: andi  a0, v1, 255
 	ldloc 7
 	ldc.i4 255
 	and
 	stloc.1
-// 0x01035cf4: 0x1035cf4: sltiu a0, a0, 10
+// 0x01035d04: 0x1035d04: sltiu a0, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	clt.un
 	stloc.1
-// 0x01035cf8: 0x1035cf8: bne   a0, zero, 0x1035d1c addiu s0, s0, 1
+// 0x01035d08: 0x1035d08: bne   a0, zero, 0x1035d2c addiu s0, s0, 1
 	ldloc.1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_1035d1c
+	brtrue L_1035d2c
 // --- basic block ---
-// 0x01035d00: 0x1035d00: addiu a0, zero, 4
+// 0x01035d10: 0x1035d10: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01035d04: 0x1035d04: addu  a1, s8, zero
+// 0x01035d14: 0x1035d14: addu  a1, s8, zero
 	ldloc 10
 	stloc.2
-// 0x01035d08: 0x1035d08: addiu a2, zero, 85
+// 0x01035d18: 0x1035d18: addiu a2, zero, 85
 	ldc.i4.s 85
 	stloc.3
-// 0x01035d0c: 0x1035d0c: addu  a3, s7, zero
+// 0x01035d1c: 0x1035d1c: addu  a3, s7, zero
 	ldloc 11
 	stloc 4
-// 0x01035d10: 0x1035d10: jal   0x100449c sw    v0, 16(sp)
+// 0x01035d20: 0x1035d20: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3608,39 +3608,39 @@ L_1035ce4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01035d18: 0x1035d18: addu  v1, zero, zero
+// 0x01035d28: 0x1035d28: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1035d1c:
-// 0x01035d1c: 0x1035d1c: mult  s1, s6
+L_1035d2c:
+// 0x01035d2c: 0x1035d2c: mult  s1, s6
 	ldloc 9
 	ldloc 17
 	mul
 	stloc 12
-// 0x01035d20: 0x1035d20: mflo  lo
+// 0x01035d30: 0x1035d30: mflo  lo
 	ldloc 12
 	stloc 9
-// 0x01035d24: 0x1035d24: addu  s1, v1, s1
+// 0x01035d34: 0x1035d34: addu  s1, v1, s1
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-L_1035d28:
-// 0x01035d28: 0x1035d28: sltu  v0, s0, s5
+L_1035d38:
+// 0x01035d38: 0x1035d38: sltu  v0, s0, s5
 	ldloc 8
 	ldloc 14
 	clt.un
 	stloc 6
-// 0x01035d2c: 0x1035d2c: bne   v0, zero, 0x1035ce4 addu  a0, s5, zero
+// 0x01035d3c: 0x1035d3c: bne   v0, zero, 0x1035cf4 addu  a0, s5, zero
 	ldloc 6
 	ldloc 14
 	stloc.1
-	brtrue L_1035ce4
+	brtrue L_1035cf4
 // --- basic block ---
-// 0x01035d34: 0x1035d34: lui   s0, 0xf0000
+// 0x01035d44: 0x1035d44: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 8
-// 0x01035d38: 0x1035d38: jal   0x1035be0 ori   a1, s0, 16960
+// 0x01035d48: 0x1035d48: jal   0x1035bf0 ori   a1, s0, 16960
 	ldloc 8
 	ldc.i4 16960
 	or
@@ -3650,79 +3650,79 @@ L_1035d28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01035d40: 0x1035d40: lb    v1, 1(s2)
+// 0x01035d50: 0x1035d50: lb    v1, 1(s2)
 	ldloc 13
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01035d44: 0x1035d44: sll   zero, zero, 0
-// 0x01035d48: 0x1035d48: bne   v1, zero, 0x1035d88 addiu v1, zero, 60
+// 0x01035d54: 0x1035d54: sll   zero, zero, 0
+// 0x01035d58: 0x1035d58: bne   v1, zero, 0x1035d98 addiu v1, zero, 60
 	ldloc 7
 	ldc.i4.s 60
 	stloc 7
-	brtrue L_1035d88
+	brtrue L_1035d98
 // --- basic block ---
-// 0x01035d50: 0x1035d50: div   v0, v1
+// 0x01035d60: 0x1035d60: div   v0, v1
 	ldloc 6
 	ldloc 7
 	div
 	stloc 12
-// 0x01035d54: 0x1035d54: ori   s0, s0, 16960
+// 0x01035d64: 0x1035d64: ori   s0, s0, 16960
 	ldloc 8
 	ldc.i4 16960
 	or
 	stloc 8
-// 0x01035d58: 0x1035d58: lb    v1, 0(s2)
+// 0x01035d68: 0x1035d68: lb    v1, 0(s2)
 	ldloc 13
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01035d5c: 0x1035d5c: mflo  lo
+// 0x01035d6c: 0x1035d6c: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x01035d60: 0x1035d60: sll   zero, zero, 0
-// 0x01035d64: 0x1035d64: sll   zero, zero, 0
-// 0x01035d68: 0x1035d68: mult  s1, s0
+// 0x01035d70: 0x1035d70: sll   zero, zero, 0
+// 0x01035d74: 0x1035d74: sll   zero, zero, 0
+// 0x01035d78: 0x1035d78: mult  s1, s0
 	ldloc 9
 	ldloc 8
 	mul
 	stloc 12
-// 0x01035d6c: 0x1035d6c: mflo  lo
+// 0x01035d7c: 0x1035d7c: mflo  lo
 	ldloc 12
 	stloc 9
-// 0x01035d70: 0x1035d70: bne   v1, s4, 0x1035d80 addu  v0, a0, s1
+// 0x01035d80: 0x1035d80: bne   v1, s4, 0x1035d90 addu  v0, a0, s1
 	ldloc 7
 	ldloc 16
 	ldloc.1
 	ldloc 9
 	add
 	stloc 6
-	bne.un L_1035d80
+	bne.un L_1035d90
 // --- basic block ---
-// 0x01035d78: 0x1035d78: j	 0x1035d8c subu  v0, zero, v0
+// 0x01035d88: 0x1035d88: j	 0x1035d9c subu  v0, zero, v0
 	ldloc 6
 	neg
 	stloc 6
-	br L_1035d8c
+	br L_1035d9c
 // --- basic block ---
-L_1035d80:
-// 0x01035d80: 0x1035d80: beq   v1, s3, 0x1035d8c sll   zero, zero, 0
+L_1035d90:
+// 0x01035d90: 0x1035d90: beq   v1, s3, 0x1035d9c sll   zero, zero, 0
 	ldloc 7
 	ldloc 15
-	beq  L_1035d8c
+	beq  L_1035d9c
 // --- basic block ---
-L_1035d88:
-// 0x01035d88: 0x1035d88: addu  v0, zero, zero
+L_1035d98:
+// 0x01035d98: 0x1035d98: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1035d8c:
-// 0x01035d8c: 0x1035d8c: lw    ra, 60(sp)
-// 0x01035d90: 0x1035d90: lw    s8, 56(sp)
+L_1035d9c:
+// 0x01035d9c: 0x1035d9c: lw    ra, 60(sp)
+// 0x01035da0: 0x1035da0: lw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3731,7 +3731,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01035d94: 0x1035d94: lw    s7, 52(sp)
+// 0x01035da4: 0x1035da4: lw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3740,7 +3740,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01035d98: 0x1035d98: lw    s6, 48(sp)
+// 0x01035da8: 0x1035da8: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3749,7 +3749,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01035d9c: 0x1035d9c: lw    s5, 44(sp)
+// 0x01035dac: 0x1035dac: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3758,7 +3758,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01035da0: 0x1035da0: lw    s4, 40(sp)
+// 0x01035db0: 0x1035db0: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3767,7 +3767,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01035da4: 0x1035da4: lw    s3, 36(sp)
+// 0x01035db4: 0x1035db4: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3776,7 +3776,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01035da8: 0x1035da8: lw    s2, 32(sp)
+// 0x01035db8: 0x1035db8: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3785,7 +3785,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01035dac: 0x1035dac: lw    s1, 28(sp)
+// 0x01035dbc: 0x1035dbc: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3794,7 +3794,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035db0: 0x1035db0: lw    s0, 24(sp)
+// 0x01035dc0: 0x1035dc0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3803,7 +3803,7 @@ L_1035d8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01035db4: 0x1035db4: jr    ra addiu sp, sp, 64
+// 0x01035dc4: 0x1035dc4: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3815,7 +3815,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_gll_1035dbc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_gll_1035dcc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -3862,18 +3862,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035dbc:
-// 0x01035dbc: 0x1035dbc: addiu sp, sp, -40
+L_1035dcc:
+// 0x01035dcc: 0x1035dcc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01035dc0: 0x1035dc0: slti  v1, a0, 7
+// 0x01035dd0: 0x1035dd0: slti  v1, a0, 7
 	ldloc.1
 	ldc.i4.7
 	clt
 	stloc 7
-// 0x01035dc4: 0x1035dc4: sw    s1, 24(sp)
+// 0x01035dd4: 0x1035dd4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3882,7 +3882,7 @@ L_1035dbc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035dc8: 0x1035dc8: sw    s0, 20(sp)
+// 0x01035dd8: 0x1035dd8: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3891,8 +3891,8 @@ L_1035dbc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01035dcc: 0x1035dcc: sw    ra, 36(sp)
-// 0x01035dd0: 0x1035dd0: sw    s3, 32(sp)
+// 0x01035ddc: 0x1035ddc: sw    ra, 36(sp)
+// 0x01035de0: 0x1035de0: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3901,7 +3901,7 @@ L_1035dbc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01035dd4: 0x1035dd4: sw    s2, 28(sp)
+// 0x01035de4: 0x1035de4: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3910,19 +3910,19 @@ L_1035dbc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01035dd8: 0x1035dd8: addu  s1, a0, zero
+// 0x01035de8: 0x1035de8: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01035ddc: 0x1035ddc: addu  s0, a1, zero
+// 0x01035dec: 0x1035dec: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01035de0: 0x1035de0: bne   v1, zero, 0x1035e90 addu  v0, zero, zero
+// 0x01035df0: 0x1035df0: bne   v1, zero, 0x1035ea0 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1035e90
+	brtrue L_1035ea0
 // --- basic block ---
-// 0x01035de8: 0x1035de8: lw    a0, 24(a1)
+// 0x01035df8: 0x1035df8: lw    a0, 24(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3931,12 +3931,12 @@ L_1035dbc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035dec: 0x1035dec: lui   a1, 0x10000
+// 0x01035dfc: 0x1035dfc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01035df0: 0x1035df0: jal   0x1001b14 addiu a1, a1, -12936
+// 0x01035e00: 0x1035e00: jal   0x1001b14 addiu a1, a1, -12940
 	ldloc.2
-	ldc.i4 -12936
+	ldc.i4 -12940
 	add
 	stloc.2
 	ldloc.1
@@ -3944,26 +3944,26 @@ L_1035dbc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01035df8: 0x1035df8: addiu v1, zero, 7
+// 0x01035e08: 0x1035e08: addiu v1, zero, 7
 	ldc.i4.7
 	stloc 7
-// 0x01035dfc: 0x1035dfc: sltiu v0, v0, 1
+// 0x01035e0c: 0x1035e0c: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x01035e00: 0x1035e00: beq   s1, v1, 0x1035e30 addiu s3, zero, 65
+// 0x01035e10: 0x1035e10: beq   s1, v1, 0x1035e40 addiu s3, zero, 65
 	ldloc 9
 	ldloc 7
 	ldc.i4.s 65
 	stloc 11
-	beq  L_1035e30
+	beq  L_1035e40
 // --- basic block ---
-// 0x01035e08: 0x1035e08: beq   v0, zero, 0x1035e24 sll   zero, zero, 0
+// 0x01035e18: 0x1035e18: beq   v0, zero, 0x1035e34 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1035e24
+	brfalse L_1035e34
 // --- basic block ---
-// 0x01035e10: 0x1035e10: lw    a0, 28(s0)
+// 0x01035e20: 0x1035e20: lw    a0, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3972,10 +3972,10 @@ L_1035dbc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035e14: 0x1035e14: lui   a1, 0x10000
+// 0x01035e24: 0x1035e24: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01035e18: 0x1035e18: jal   0x1001b14 addiu a1, a1, -31004
+// 0x01035e28: 0x1035e28: jal   0x1001b14 addiu a1, a1, -31004
 	ldloc.2
 	ldc.i4 -31004
 	add
@@ -3985,13 +3985,13 @@ L_1035dbc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01035e20: 0x1035e20: sltu  v0, zero, v0
+// 0x01035e30: 0x1035e30: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-L_1035e24:
-// 0x01035e24: 0x1035e24: lw    v1, 28(s0)
+L_1035e34:
+// 0x01035e34: 0x1035e34: lw    v1, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4000,24 +4000,24 @@ L_1035e24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035e28: 0x1035e28: sll   zero, zero, 0
-// 0x01035e2c: 0x1035e2c: lb    s3, 0(v1)
+// 0x01035e38: 0x1035e38: sll   zero, zero, 0
+// 0x01035e3c: 0x1035e3c: lb    s3, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 11
-L_1035e30:
-// 0x01035e30: 0x1035e30: lui   s2, 0x60000
+L_1035e40:
+// 0x01035e40: 0x1035e40: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01035e34: 0x1035e34: beq   v0, zero, 0x1035e7c addiu s1, s2, -17088
+// 0x01035e44: 0x1035e44: beq   v0, zero, 0x1035e8c addiu s1, s2, -16624
 	ldloc 6
 	ldloc 10
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 9
-	brfalse L_1035e7c
+	brfalse L_1035e8c
 // --- basic block ---
-// 0x01035e3c: 0x1035e3c: lw    a0, 4(s0)
+// 0x01035e4c: 0x1035e4c: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4026,7 +4026,7 @@ L_1035e30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035e40: 0x1035e40: lw    a1, 8(s0)
+// 0x01035e50: 0x1035e50: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4035,10 +4035,10 @@ L_1035e30:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01035e44: 0x1035e44: addiu a2, zero, 78
+// 0x01035e54: 0x1035e54: addiu a2, zero, 78
 	ldc.i4.s 78
 	stloc.3
-// 0x01035e48: 0x1035e48: jal   0x1035c5c addiu a3, zero, 83
+// 0x01035e58: 0x1035e58: jal   0x1035c6c addiu a3, zero, 83
 	ldc.i4.s 83
 	stloc 4
 	ldloc.0
@@ -4046,12 +4046,12 @@ L_1035e30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01035e50: 0x1035e50: sw    v0, 8(s1)
+// 0x01035e60: 0x1035e60: sw    v0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4060,7 +4060,7 @@ L_1035e30:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035e54: 0x1035e54: lw    a1, 16(s0)
+// 0x01035e64: 0x1035e64: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4069,7 +4069,7 @@ L_1035e30:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01035e58: 0x1035e58: lw    a0, 12(s0)
+// 0x01035e68: 0x1035e68: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4078,10 +4078,10 @@ L_1035e30:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035e5c: 0x1035e5c: addiu a2, zero, 69
+// 0x01035e6c: 0x1035e6c: addiu a2, zero, 69
 	ldc.i4.s 69
 	stloc.3
-// 0x01035e60: 0x1035e60: jal   0x1035c5c addiu a3, zero, 87
+// 0x01035e70: 0x1035e70: jal   0x1035c6c addiu a3, zero, 87
 	ldc.i4.s 87
 	stloc 4
 	ldloc.0
@@ -4089,21 +4089,21 @@ L_1035e30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01035e68: 0x1035e68: addiu v1, zero, 65
+// 0x01035e78: 0x1035e78: addiu v1, zero, 65
 	ldc.i4.s 65
 	stloc 7
-// 0x01035e6c: 0x1035e6c: sb    v1, -17088(s2)
+// 0x01035e7c: 0x1035e7c: sb    v1, -16624(s2)
 	ldloc 10
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01035e70: 0x1035e70: sw    s3, 4(s1)
+// 0x01035e80: 0x1035e80: sw    s3, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4112,7 +4112,7 @@ L_1035e30:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01035e74: 0x1035e74: j	 0x1035e8c sw    v0, 12(s1)
+// 0x01035e84: 0x1035e84: j	 0x1035e9c sw    v0, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4121,22 +4121,22 @@ L_1035e30:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1035e8c
+	br L_1035e9c
 // --- basic block ---
-L_1035e7c:
-// 0x01035e7c: 0x1035e7c: addiu v0, zero, 86
+L_1035e8c:
+// 0x01035e8c: 0x1035e8c: addiu v0, zero, 86
 	ldc.i4.s 86
 	stloc 6
-// 0x01035e80: 0x1035e80: sb    v0, -17088(s2)
+// 0x01035e90: 0x1035e90: sb    v0, -16624(s2)
 	ldloc 10
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01035e84: 0x1035e84: addiu v0, zero, 78
+// 0x01035e94: 0x1035e94: addiu v0, zero, 78
 	ldc.i4.s 78
 	stloc 6
-// 0x01035e88: 0x1035e88: sw    v0, 4(s1)
+// 0x01035e98: 0x1035e98: sw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4145,13 +4145,13 @@ L_1035e7c:
 	add
 	ldloc 6
 	stelem.i4
-L_1035e8c:
-// 0x01035e8c: 0x1035e8c: addiu v0, zero, 1
+L_1035e9c:
+// 0x01035e9c: 0x1035e9c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1035e90:
-// 0x01035e90: 0x1035e90: lw    ra, 36(sp)
-// 0x01035e94: 0x1035e94: lw    s3, 32(sp)
+L_1035ea0:
+// 0x01035ea0: 0x1035ea0: lw    ra, 36(sp)
+// 0x01035ea4: 0x1035ea4: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4160,7 +4160,7 @@ L_1035e90:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01035e98: 0x1035e98: lw    s2, 28(sp)
+// 0x01035ea8: 0x1035ea8: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4169,7 +4169,7 @@ L_1035e90:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01035e9c: 0x1035e9c: lw    s1, 24(sp)
+// 0x01035eac: 0x1035eac: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4178,7 +4178,7 @@ L_1035e90:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01035ea0: 0x1035ea0: lw    s0, 20(sp)
+// 0x01035eb0: 0x1035eb0: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4187,7 +4187,7 @@ L_1035e90:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01035ea4: 0x1035ea4: jr    ra addiu sp, sp, 40
+// 0x01035eb4: 0x1035eb4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4199,7 +4199,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_pxrmmov_1035eac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_pxrmmov_1035ebc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -4240,18 +4240,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035eac:
-// 0x01035eac: 0x1035eac: addiu sp, sp, -32
+L_1035ebc:
+// 0x01035ebc: 0x1035ebc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01035eb0: 0x1035eb0: slti  a0, a0, 8
+// 0x01035ec0: 0x1035ec0: slti  a0, a0, 8
 	ldloc.1
 	ldc.i4.8
 	clt
 	stloc.1
-// 0x01035eb4: 0x1035eb4: sw    s0, 20(sp)
+// 0x01035ec4: 0x1035ec4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4260,8 +4260,8 @@ L_1035eac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01035eb8: 0x1035eb8: sw    ra, 28(sp)
-// 0x01035ebc: 0x1035ebc: sw    s1, 24(sp)
+// 0x01035ec8: 0x1035ec8: sw    ra, 28(sp)
+// 0x01035ecc: 0x1035ecc: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4270,16 +4270,16 @@ L_1035eac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01035ec0: 0x1035ec0: addu  s0, a1, zero
+// 0x01035ed0: 0x1035ed0: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01035ec4: 0x1035ec4: bne   a0, zero, 0x1035f3c addu  v0, zero, zero
+// 0x01035ed4: 0x1035ed4: bne   a0, zero, 0x1035f4c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1035f3c
+	brtrue L_1035f4c
 // --- basic block ---
-// 0x01035ecc: 0x1035ecc: lw    a0, 4(a1)
+// 0x01035edc: 0x1035edc: lw    a0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4288,12 +4288,12 @@ L_1035eac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035ed0: 0x1035ed0: lui   a1, 0x60000
+// 0x01035ee0: 0x1035ee0: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01035ed4: 0x1035ed4: jal   0x101cb5c addiu a1, a1, -16816
+// 0x01035ee4: 0x1035ee4: jal   0x101cb6c addiu a1, a1, -16352
 	ldloc.2
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.2
 	ldloc.0
@@ -4301,24 +4301,24 @@ L_1035eac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_in_collection_101cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_in_collection_101cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01035edc: 0x1035edc: lui   s1, 0x60000
+// 0x01035eec: 0x1035eec: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01035ee0: 0x1035ee0: sw    v0, -17088(s1)
+// 0x01035ef0: 0x1035ef0: sw    v0, -16624(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035ee4: 0x1035ee4: lw    a0, 8(s0)
+// 0x01035ef4: 0x1035ef4: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4327,7 +4327,7 @@ L_1035eac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035ee8: 0x1035ee8: lw    a1, 12(s0)
+// 0x01035ef8: 0x1035ef8: lw    a1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4336,10 +4336,10 @@ L_1035eac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01035eec: 0x1035eec: addiu a2, zero, 78
+// 0x01035efc: 0x1035efc: addiu a2, zero, 78
 	ldc.i4.s 78
 	stloc.3
-// 0x01035ef0: 0x1035ef0: jal   0x1035c5c addiu a3, zero, 83
+// 0x01035f00: 0x1035f00: jal   0x1035c6c addiu a3, zero, 83
 	ldc.i4.s 83
 	stloc 4
 	ldloc.0
@@ -4347,17 +4347,17 @@ L_1035eac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01035ef8: 0x1035ef8: addiu s1, s1, -17088
+// 0x01035f08: 0x1035f08: addiu s1, s1, -16624
 	ldloc 7
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 7
-// 0x01035efc: 0x1035efc: sw    v0, 4(s1)
+// 0x01035f0c: 0x1035f0c: sw    v0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4366,7 +4366,7 @@ L_1035eac:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035f00: 0x1035f00: lw    a0, 16(s0)
+// 0x01035f10: 0x1035f10: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4375,7 +4375,7 @@ L_1035eac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035f04: 0x1035f04: lw    a1, 20(s0)
+// 0x01035f14: 0x1035f14: lw    a1, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4384,10 +4384,10 @@ L_1035eac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01035f08: 0x1035f08: addiu a2, zero, 69
+// 0x01035f18: 0x1035f18: addiu a2, zero, 69
 	ldc.i4.s 69
 	stloc.3
-// 0x01035f0c: 0x1035f0c: jal   0x1035c5c addiu a3, zero, 87
+// 0x01035f1c: 0x1035f1c: jal   0x1035c6c addiu a3, zero, 87
 	ldc.i4.s 87
 	stloc 4
 	ldloc.0
@@ -4395,12 +4395,12 @@ L_1035eac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01035f14: 0x1035f14: sw    v0, 8(s1)
+// 0x01035f24: 0x1035f24: sw    v0, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4409,7 +4409,7 @@ L_1035eac:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035f18: 0x1035f18: lw    a0, 24(s0)
+// 0x01035f28: 0x1035f28: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4418,7 +4418,7 @@ L_1035eac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035f1c: 0x1035f1c: jal   0x1035be0 addiu a1, zero, 1
+// 0x01035f2c: 0x1035f2c: jal   0x1035bf0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4426,12 +4426,12 @@ L_1035eac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01035f24: 0x1035f24: sw    v0, 12(s1)
+// 0x01035f34: 0x1035f34: sw    v0, 12(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4440,7 +4440,7 @@ L_1035eac:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035f28: 0x1035f28: lw    a0, 28(s0)
+// 0x01035f38: 0x1035f38: lw    a0, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4449,7 +4449,7 @@ L_1035eac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035f2c: 0x1035f2c: jal   0x1035be0 addiu a1, zero, 1
+// 0x01035f3c: 0x1035f3c: jal   0x1035bf0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4457,12 +4457,12 @@ L_1035eac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01035f34: 0x1035f34: sw    v0, 16(s1)
+// 0x01035f44: 0x1035f44: sw    v0, 16(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4471,12 +4471,12 @@ L_1035eac:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01035f38: 0x1035f38: addiu v0, zero, 1
+// 0x01035f48: 0x1035f48: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1035f3c:
-// 0x01035f3c: 0x1035f3c: lw    ra, 28(sp)
-// 0x01035f40: 0x1035f40: lw    s1, 24(sp)
+L_1035f4c:
+// 0x01035f4c: 0x1035f4c: lw    ra, 28(sp)
+// 0x01035f50: 0x1035f50: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4485,7 +4485,7 @@ L_1035f3c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035f44: 0x1035f44: lw    s0, 20(sp)
+// 0x01035f54: 0x1035f54: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4494,7 +4494,7 @@ L_1035f3c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01035f48: 0x1035f48: jr    ra addiu sp, sp, 32
+// 0x01035f58: 0x1035f58: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4506,7 +4506,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_vtg_1035f50(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_vtg_1035f60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 ra,int32 v1)
@@ -4547,18 +4547,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035f50:
-// 0x01035f50: 0x1035f50: addiu sp, sp, -32
+L_1035f60:
+// 0x01035f60: 0x1035f60: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01035f54: 0x1035f54: slti  a0, a0, 6
+// 0x01035f64: 0x1035f64: slti  a0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	clt
 	stloc.1
-// 0x01035f58: 0x1035f58: sw    s0, 20(sp)
+// 0x01035f68: 0x1035f68: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4567,8 +4567,8 @@ L_1035f50:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01035f5c: 0x1035f5c: sw    ra, 28(sp)
-// 0x01035f60: 0x1035f60: sw    s1, 24(sp)
+// 0x01035f6c: 0x1035f6c: sw    ra, 28(sp)
+// 0x01035f70: 0x1035f70: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4577,13 +4577,13 @@ L_1035f50:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01035f64: 0x1035f64: bne   a0, zero, 0x1035fc8 addu  s0, a1, zero
+// 0x01035f74: 0x1035f74: bne   a0, zero, 0x1035fd8 addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 8
-	brtrue L_1035fc8
+	brtrue L_1035fd8
 // --- basic block ---
-// 0x01035f6c: 0x1035f6c: lw    a0, 4(a1)
+// 0x01035f7c: 0x1035f7c: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -4592,19 +4592,19 @@ L_1035f50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035f70: 0x1035f70: sll   zero, zero, 0
-// 0x01035f74: 0x1035f74: lb    v0, 0(a0)
+// 0x01035f80: 0x1035f80: sll   zero, zero, 0
+// 0x01035f84: 0x1035f84: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01035f78: 0x1035f78: sll   zero, zero, 0
-// 0x01035f7c: 0x1035f7c: beq   v0, zero, 0x1035fcc addu  v0, zero, zero
+// 0x01035f88: 0x1035f88: sll   zero, zero, 0
+// 0x01035f8c: 0x1035f8c: beq   v0, zero, 0x1035fdc addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1035fcc
+	brfalse L_1035fdc
 // --- basic block ---
-// 0x01035f84: 0x1035f84: lw    v0, 20(a1)
+// 0x01035f94: 0x1035f94: lw    v0, 20(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -4613,17 +4613,17 @@ L_1035f50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01035f88: 0x1035f88: sll   zero, zero, 0
-// 0x01035f8c: 0x1035f8c: lb    v0, 0(v0)
+// 0x01035f98: 0x1035f98: sll   zero, zero, 0
+// 0x01035f9c: 0x1035f9c: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01035f90: 0x1035f90: sll   zero, zero, 0
-// 0x01035f94: 0x1035f94: beq   v0, zero, 0x1035fc8 sll   zero, zero, 0
+// 0x01035fa0: 0x1035fa0: sll   zero, zero, 0
+// 0x01035fa4: 0x1035fa4: beq   v0, zero, 0x1035fd8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1035fc8
+	brfalse L_1035fd8
 // --- basic block ---
-// 0x01035f9c: 0x1035f9c: jal   0x1035be0 addiu a1, zero, 1
+// 0x01035fac: 0x1035fac: jal   0x1035bf0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4631,24 +4631,24 @@ L_1035f50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01035fa4: 0x1035fa4: lui   s1, 0x60000
+// 0x01035fb4: 0x1035fb4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01035fa8: 0x1035fa8: sw    v0, -17088(s1)
+// 0x01035fb8: 0x1035fb8: sw    v0, -16624(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 5
 	stelem.i4
-// 0x01035fac: 0x1035fac: lw    a0, 20(s0)
+// 0x01035fbc: 0x1035fbc: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4657,7 +4657,7 @@ L_1035f50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01035fb0: 0x1035fb0: jal   0x1035be0 addiu a1, zero, 1
+// 0x01035fc0: 0x1035fc0: jal   0x1035bf0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4665,17 +4665,17 @@ L_1035f50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01035fb8: 0x1035fb8: addiu s1, s1, -17088
+// 0x01035fc8: 0x1035fc8: addiu s1, s1, -16624
 	ldloc 7
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 7
-// 0x01035fbc: 0x1035fbc: sw    v0, 4(s1)
+// 0x01035fcc: 0x1035fcc: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4684,18 +4684,18 @@ L_1035f50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01035fc0: 0x1035fc0: j	 0x1035fcc addiu v0, zero, 1
+// 0x01035fd0: 0x1035fd0: j	 0x1035fdc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1035fcc
+	br L_1035fdc
 // --- basic block ---
-L_1035fc8:
-// 0x01035fc8: 0x1035fc8: addu  v0, zero, zero
+L_1035fd8:
+// 0x01035fd8: 0x1035fd8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1035fcc:
-// 0x01035fcc: 0x1035fcc: lw    ra, 28(sp)
-// 0x01035fd0: 0x1035fd0: lw    s1, 24(sp)
+L_1035fdc:
+// 0x01035fdc: 0x1035fdc: lw    ra, 28(sp)
+// 0x01035fe0: 0x1035fe0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4704,7 +4704,7 @@ L_1035fcc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01035fd4: 0x1035fd4: lw    s0, 20(sp)
+// 0x01035fe4: 0x1035fe4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4713,7 +4713,7 @@ L_1035fcc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01035fd8: 0x1035fd8: jr    ra addiu sp, sp, 32
+// 0x01035fe8: 0x1035fe8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4725,7 +4725,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_gsv_1035fe0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_gsv_1035ff0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -4778,18 +4778,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1035fe0:
-// 0x01035fe0: 0x1035fe0: addiu sp, sp, -56
+L_1035ff0:
+// 0x01035ff0: 0x1035ff0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01035fe4: 0x1035fe4: slti  v0, a0, 4
+// 0x01035ff4: 0x1035ff4: slti  v0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	clt
 	stloc 5
-// 0x01035fe8: 0x1035fe8: sw    s2, 36(sp)
+// 0x01035ff8: 0x1035ff8: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4798,7 +4798,7 @@ L_1035fe0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01035fec: 0x1035fec: sw    s0, 28(sp)
+// 0x01035ffc: 0x1035ffc: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4807,8 +4807,8 @@ L_1035fe0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01035ff0: 0x1035ff0: sw    ra, 52(sp)
-// 0x01035ff4: 0x1035ff4: sw    s5, 48(sp)
+// 0x01036000: 0x1036000: sw    ra, 52(sp)
+// 0x01036004: 0x1036004: sw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4817,7 +4817,7 @@ L_1035fe0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01035ff8: 0x1035ff8: sw    s4, 44(sp)
+// 0x01036008: 0x1036008: sw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4826,7 +4826,7 @@ L_1035fe0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01035ffc: 0x1035ffc: sw    s3, 40(sp)
+// 0x0103600c: 0x103600c: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4835,7 +4835,7 @@ L_1035fe0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01036000: 0x1036000: sw    s1, 32(sp)
+// 0x01036010: 0x1036010: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4844,16 +4844,16 @@ L_1035fe0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01036004: 0x1036004: addu  s2, a0, zero
+// 0x01036014: 0x1036014: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01036008: 0x1036008: bne   v0, zero, 0x10361a0 addu  s0, a1, zero
+// 0x01036018: 0x1036018: bne   v0, zero, 0x10361b0 addu  s0, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 9
-	brtrue L_10361a0
+	brtrue L_10361b0
 // --- basic block ---
-// 0x01036010: 0x1036010: lw    a0, 4(a1)
+// 0x01036020: 0x1036020: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ L_1035fe0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036014: 0x1036014: jal   0x1000d8c lui   s1, 0x60000
+// 0x01036024: 0x1036024: jal   0x1000d8c lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 7
 	ldloc.0
@@ -4875,13 +4875,13 @@ L_1035fe0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103601c: 0x103601c: sb    v0, -17088(s1)
+// 0x0103602c: 0x103602c: sb    v0, -16624(s1)
 	ldloc 7
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036020: 0x1036020: lw    a0, 8(s0)
+// 0x01036030: 0x1036030: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4890,9 +4890,9 @@ L_1035fe0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036024: 0x1036024: jal   0x1000d8c addiu s1, s1, -17088
+// 0x01036034: 0x1036034: jal   0x1000d8c addiu s1, s1, -16624
 	ldloc 7
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 7
 	ldloc.0
@@ -4905,13 +4905,13 @@ L_1035fe0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103602c: 0x103602c: sb    v0, 1(s1)
+// 0x0103603c: 0x103603c: sb    v0, 1(s1)
 	ldloc 7
 	ldc.i4.1
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036030: 0x1036030: lw    a0, 12(s0)
+// 0x01036040: 0x1036040: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4920,7 +4920,7 @@ L_1035fe0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036034: 0x1036034: jal   0x1000d8c sll   zero, zero, 0
+// 0x01036044: 0x1036044: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4931,17 +4931,17 @@ L_1035fe0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103603c: 0x103603c: sll   v0, v0, 24
+// 0x0103604c: 0x103604c: sll   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shl
 	stloc 5
-// 0x01036040: 0x1036040: sra   v0, v0, 24
+// 0x01036050: 0x1036050: sra   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shr
 	stloc 5
-// 0x01036044: 0x1036044: bgez  v0, 0x1036074 sb    v0, 2(s1)
+// 0x01036054: 0x1036054: bgez  v0, 0x1036084 sb    v0, 2(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4949,31 +4949,31 @@ L_1035fe0:
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldc.i4.s 0
-	bge L_1036074
+	bge L_1036084
 // --- basic block ---
-// 0x0103604c: 0x103604c: lui   a1, 0x10000
+// 0x0103605c: 0x103605c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01036050: 0x1036050: lui   a3, 0x10000
+// 0x01036060: 0x1036060: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01036054: 0x1036054: addiu a1, a1, -13152
+// 0x01036064: 0x1036064: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x01036058: 0x1036058: addiu a3, a3, -12932
+// 0x01036068: 0x1036068: addiu a3, a3, -12936
 	ldloc 4
-	ldc.i4 -12932
+	ldc.i4 -12936
 	add
 	stloc 4
-// 0x0103605c: 0x103605c: addiu a0, zero, 4
+// 0x0103606c: 0x103606c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01036060: 0x1036060: addiu a2, zero, 430
+// 0x01036070: 0x1036070: addiu a2, zero, 430
 	ldc.i4 430
 	stloc.3
-// 0x01036064: 0x1036064: jal   0x100449c sw    v0, 16(sp)
+// 0x01036074: 0x1036074: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4992,46 +4992,46 @@ L_1035fe0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103606c: 0x103606c: j	 0x10361a4 addu  v0, zero, zero
+// 0x0103607c: 0x103607c: j	 0x10361b4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10361a4
+	br L_10361b4
 // --- basic block ---
-L_1036074:
-// 0x01036074: 0x1036074: slti  v1, v0, 17
+L_1036084:
+// 0x01036084: 0x1036084: slti  v1, v0, 17
 	ldloc 5
 	ldc.i4.s 17
 	clt
 	stloc 8
-// 0x01036078: 0x1036078: bne   v1, zero, 0x10360a8 lui   a1, 0x10000
+// 0x01036088: 0x1036088: bne   v1, zero, 0x10360b8 lui   a1, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10360a8
+	brtrue L_10360b8
 // --- basic block ---
-// 0x01036080: 0x1036080: lui   a3, 0x10000
+// 0x01036090: 0x1036090: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01036084: 0x1036084: addiu s3, zero, 16
+// 0x01036094: 0x1036094: addiu s3, zero, 16
 	ldc.i4.s 16
 	stloc 11
-// 0x01036088: 0x1036088: addiu a1, a1, -13152
+// 0x01036098: 0x1036098: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x0103608c: 0x103608c: addiu a3, a3, -12892
+// 0x0103609c: 0x103609c: addiu a3, a3, -12896
 	ldloc 4
-	ldc.i4 -12892
+	ldc.i4 -12896
 	add
 	stloc 4
-// 0x01036090: 0x1036090: addiu a0, zero, 4
+// 0x010360a0: 0x10360a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01036094: 0x1036094: addiu a2, zero, 437
+// 0x010360a4: 0x10360a4: addiu a2, zero, 437
 	ldc.i4 437
 	stloc.3
-// 0x01036098: 0x1036098: sw    v0, 16(sp)
+// 0x010360a8: 0x10360a8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5040,7 +5040,7 @@ L_1036074:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103609c: 0x103609c: jal   0x100449c sw    s3, 20(sp)
+// 0x010360ac: 0x10360ac: jal   0x100449c sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5059,114 +5059,114 @@ L_1036074:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010360a4: 0x10360a4: sb    s3, 2(s1)
+// 0x010360b4: 0x10360b4: sb    s3, 2(s1)
 	ldloc 7
 	ldc.i4.2
 	add
 	ldloc 11
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10360a8:
-// 0x010360a8: 0x10360a8: lui   v0, 0x60000
+L_10360b8:
+// 0x010360b8: 0x10360b8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010360ac: 0x10360ac: addiu v0, v0, -17088
+// 0x010360bc: 0x10360bc: addiu v0, v0, -16624
 	ldloc 5
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 5
-// 0x010360b0: 0x10360b0: lb    v1, 1(v0)
+// 0x010360c0: 0x10360c0: lb    v1, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010360b4: 0x10360b4: addiu s1, zero, 1
+// 0x010360c4: 0x10360c4: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010360b8: 0x10360b8: lb    v0, 2(v0)
+// 0x010360c8: 0x10360c8: lb    v0, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010360bc: 0x10360bc: subu  s1, s1, v1
+// 0x010360cc: 0x10360cc: subu  s1, s1, v1
 	ldloc 7
 	ldloc 8
 	sub
 	stloc 7
-// 0x010360c0: 0x10360c0: sll   s1, s1, 2
+// 0x010360d0: 0x10360d0: sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010360c4: 0x10360c4: addu  s1, s1, v0
+// 0x010360d4: 0x10360d4: addu  s1, s1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010360c8: 0x10360c8: slti  v0, s1, 5
+// 0x010360d8: 0x10360d8: slti  v0, s1, 5
 	ldloc 7
 	ldc.i4.5
 	clt
 	stloc 5
-// 0x010360cc: 0x10360cc: bne   v0, zero, 0x10360dc sll   v0, s1, 2
+// 0x010360dc: 0x10360dc: bne   v0, zero, 0x10360ec sll   v0, s1, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 5
-	brtrue L_10360dc
+	brtrue L_10360ec
 // --- basic block ---
-// 0x010360d4: 0x10360d4: addiu s1, zero, 4
+// 0x010360e4: 0x10360e4: addiu s1, zero, 4
 	ldc.i4.4
 	stloc 7
-// 0x010360d8: 0x10360d8: sll   v0, s1, 2
+// 0x010360e8: 0x10360e8: sll   v0, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 5
-L_10360dc:
-// 0x010360dc: 0x10360dc: addiu v0, v0, 3
+L_10360ec:
+// 0x010360ec: 0x10360ec: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x010360e0: 0x10360e0: slt   s2, v0, s2
+// 0x010360f0: 0x10360f0: slt   s2, v0, s2
 	ldloc 5
 	ldloc 10
 	clt
 	stloc 10
-// 0x010360e4: 0x10360e4: beq   s2, zero, 0x10361a0 lui   s4, 0x60000
+// 0x010360f4: 0x10360f4: beq   s2, zero, 0x10361b0 lui   s4, 0x60000
 	ldloc 10
 	ldc.i4 393216
 	stloc 12
-	brfalse L_10361a0
+	brfalse L_10361b0
 // --- basic block ---
-// 0x010360ec: 0x10360ec: addiu s4, s4, -17088
+// 0x010360fc: 0x10360fc: addiu s4, s4, -16624
 	ldloc 12
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 12
-// 0x010360f0: 0x10360f0: addu  s3, s4, zero
+// 0x01036100: 0x1036100: addu  s3, s4, zero
 	ldloc 12
 	stloc 11
-// 0x010360f4: 0x10360f4: addu  s2, s4, zero
+// 0x01036104: 0x1036104: addu  s2, s4, zero
 	ldloc 12
 	stloc 10
-// 0x010360f8: 0x10360f8: j	 0x1036140 addu  s5, zero, zero
+// 0x01036108: 0x1036108: j	 0x1036150 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_1036140
+	br L_1036150
 // --- basic block ---
-L_1036100:
-// 0x01036100: 0x1036100: lw    a0, 0(s0)
+L_1036110:
+// 0x01036110: 0x1036110: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01036104: 0x1036104: jal   0x1000d8c addiu s5, s5, 1
+// 0x01036114: 0x1036114: jal   0x1000d8c addiu s5, s5, 1
 	ldloc 13
 	ldc.i4.1
 	add
@@ -5181,13 +5181,13 @@ L_1036100:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103610c: 0x103610c: sb    v0, 4(s2)
+// 0x0103611c: 0x103611c: sb    v0, 4(s2)
 	ldloc 10
 	ldc.i4.4
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036110: 0x1036110: lw    a0, 4(s0)
+// 0x01036120: 0x1036120: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5196,7 +5196,7 @@ L_1036100:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036114: 0x1036114: jal   0x1000d8c sll   zero, zero, 0
+// 0x01036124: 0x1036124: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5207,13 +5207,13 @@ L_1036100:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103611c: 0x103611c: sb    v0, 8(s2)
+// 0x0103612c: 0x103612c: sb    v0, 8(s2)
 	ldloc 10
 	ldc.i4.8
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036120: 0x1036120: lw    a0, 8(s0)
+// 0x01036130: 0x1036130: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5222,7 +5222,7 @@ L_1036100:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036124: 0x1036124: jal   0x1000d8c addiu s2, s2, 1
+// 0x01036134: 0x1036134: jal   0x1000d8c addiu s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
@@ -5237,13 +5237,13 @@ L_1036100:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103612c: 0x103612c: sh    v0, 10(s3)
+// 0x0103613c: 0x103613c: sh    v0, 10(s3)
 	ldloc 11
 	ldc.i4.s 10
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01036130: 0x1036130: lw    a0, 12(s0)
+// 0x01036140: 0x1036140: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5252,7 +5252,7 @@ L_1036100:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036134: 0x1036134: jal   0x1000d8c sll   zero, zero, 0
+// 0x01036144: 0x1036144: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5263,125 +5263,125 @@ L_1036100:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103613c: 0x103613c: sh    v0, 18(s3)
+// 0x0103614c: 0x103614c: sh    v0, 18(s3)
 	ldloc 11
 	ldc.i4.s 18
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_1036140:
-// 0x01036140: 0x1036140: slt   v0, s5, s1
+L_1036150:
+// 0x01036150: 0x1036150: slt   v0, s5, s1
 	ldloc 13
 	ldloc 7
 	clt
 	stloc 5
-// 0x01036144: 0x1036144: addiu s0, s0, 16
+// 0x01036154: 0x1036154: addiu s0, s0, 16
 	ldloc 9
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x01036148: 0x1036148: bne   v0, zero, 0x1036100 addiu s3, s3, 2
+// 0x01036158: 0x1036158: bne   v0, zero, 0x1036110 addiu s3, s3, 2
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	add
 	stloc 11
-	brtrue L_1036100
+	brtrue L_1036110
 // --- basic block ---
-// 0x01036150: 0x1036150: addiu v0, s1, 4
+// 0x01036160: 0x1036160: addiu v0, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01036154: 0x1036154: lui   v1, 0x60000
+// 0x01036164: 0x1036164: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01036158: 0x1036158: addiu v1, v1, -17088
+// 0x01036168: 0x1036168: addiu v1, v1, -16624
 	ldloc 8
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 8
-// 0x0103615c: 0x103615c: sll   v0, v0, 1
+// 0x0103616c: 0x103616c: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x01036160: 0x1036160: addu  v0, v1, v0
+// 0x01036170: 0x1036170: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01036164: 0x1036164: addu  s1, v1, s1
+// 0x01036174: 0x1036174: addu  s1, v1, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x01036168: 0x1036168: addiu s1, s1, 4
+// 0x01036178: 0x1036178: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0103616c: 0x103616c: addiu v0, v0, 4
+// 0x0103617c: 0x103617c: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01036170: 0x1036170: j	 0x1036190 addiu s4, s4, 8
+// 0x01036180: 0x1036180: j	 0x10361a0 addiu s4, s4, 8
 	ldloc 12
 	ldc.i4.8
 	add
 	stloc 12
-	br L_1036190
+	br L_10361a0
 // --- basic block ---
-L_1036178:
-// 0x01036178: 0x1036178: sb    zero, 0(s1)
+L_1036188:
+// 0x01036188: 0x1036188: sb    zero, 0(s1)
 	ldloc 7
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0103617c: 0x103617c: sb    zero, 4(s1)
+// 0x0103618c: 0x103618c: sb    zero, 4(s1)
 	ldloc 7
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036180: 0x1036180: sh    zero, 0(v0)
+// 0x01036190: 0x1036190: sh    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01036184: 0x1036184: sh    zero, 8(v0)
+// 0x01036194: 0x1036194: sh    zero, 8(v0)
 	ldloc 5
 	ldc.i4.8
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01036188: 0x1036188: addiu s1, s1, 1
+// 0x01036198: 0x1036198: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0103618c: 0x103618c: addiu v0, v0, 2
+// 0x0103619c: 0x103619c: addiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 5
-L_1036190:
-// 0x01036190: 0x1036190: bne   s1, s4, 0x1036178 sll   zero, zero, 0
+L_10361a0:
+// 0x010361a0: 0x10361a0: bne   s1, s4, 0x1036188 sll   zero, zero, 0
 	ldloc 7
 	ldloc 12
-	bne.un L_1036178
+	bne.un L_1036188
 // --- basic block ---
-// 0x01036198: 0x1036198: j	 0x10361a4 addiu v0, zero, 1
+// 0x010361a8: 0x10361a8: j	 0x10361b4 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10361a4
+	br L_10361b4
 // --- basic block ---
-L_10361a0:
-// 0x010361a0: 0x10361a0: addu  v0, zero, zero
+L_10361b0:
+// 0x010361b0: 0x10361b0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10361a4:
-// 0x010361a4: 0x10361a4: lw    ra, 52(sp)
-// 0x010361a8: 0x10361a8: lw    s5, 48(sp)
+L_10361b4:
+// 0x010361b4: 0x10361b4: lw    ra, 52(sp)
+// 0x010361b8: 0x10361b8: lw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5390,7 +5390,7 @@ L_10361a4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010361ac: 0x10361ac: lw    s4, 44(sp)
+// 0x010361bc: 0x10361bc: lw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5399,7 +5399,7 @@ L_10361a4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010361b0: 0x10361b0: lw    s3, 40(sp)
+// 0x010361c0: 0x10361c0: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5408,7 +5408,7 @@ L_10361a4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010361b4: 0x10361b4: lw    s2, 36(sp)
+// 0x010361c4: 0x10361c4: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5417,7 +5417,7 @@ L_10361a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010361b8: 0x10361b8: lw    s1, 32(sp)
+// 0x010361c8: 0x10361c8: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5426,7 +5426,7 @@ L_10361a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010361bc: 0x10361bc: lw    s0, 28(sp)
+// 0x010361cc: 0x10361cc: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5435,7 +5435,7 @@ L_10361a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010361c0: 0x10361c0: jr    ra addiu sp, sp, 56
+// 0x010361d0: 0x10361d0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5447,7 +5447,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_gsa_10361c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_gsa_10361d8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s1,int32 s4,int32 s3,int32 s5,int32 ra)
@@ -5500,18 +5500,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10361c8:
-// 0x010361c8: 0x10361c8: addiu sp, sp, -48
+L_10361d8:
+// 0x010361d8: 0x10361d8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010361cc: 0x10361cc: slti  v1, a0, 3
+// 0x010361dc: 0x10361dc: slti  v1, a0, 3
 	ldloc.1
 	ldc.i4.3
 	clt
 	stloc 5
-// 0x010361d0: 0x10361d0: sw    s1, 24(sp)
+// 0x010361e0: 0x10361e0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5520,8 +5520,8 @@ L_10361c8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010361d4: 0x10361d4: sw    ra, 44(sp)
-// 0x010361d8: 0x10361d8: sw    s5, 40(sp)
+// 0x010361e4: 0x10361e4: sw    ra, 44(sp)
+// 0x010361e8: 0x10361e8: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5530,7 +5530,7 @@ L_10361c8:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010361dc: 0x10361dc: sw    s4, 36(sp)
+// 0x010361ec: 0x10361ec: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5539,7 +5539,7 @@ L_10361c8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010361e0: 0x10361e0: sw    s3, 32(sp)
+// 0x010361f0: 0x10361f0: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5548,7 +5548,7 @@ L_10361c8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010361e4: 0x10361e4: sw    s2, 28(sp)
+// 0x010361f4: 0x10361f4: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5557,7 +5557,7 @@ L_10361c8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010361e8: 0x10361e8: sw    s0, 20(sp)
+// 0x010361f8: 0x10361f8: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5566,16 +5566,16 @@ L_10361c8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010361ec: 0x10361ec: addu  s1, a1, zero
+// 0x010361fc: 0x10361fc: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010361f0: 0x10361f0: bne   v1, zero, 0x10362e0 addu  v0, zero, zero
+// 0x01036200: 0x1036200: bne   v1, zero, 0x10362f0 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10362e0
+	brtrue L_10362f0
 // --- basic block ---
-// 0x010361f8: 0x10361f8: lw    v0, 4(a1)
+// 0x01036208: 0x1036208: lw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5584,25 +5584,25 @@ L_10361c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010361fc: 0x10361fc: lui   s0, 0x60000
+// 0x0103620c: 0x103620c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01036200: 0x1036200: lbu   v0, 0(v0)
+// 0x01036210: 0x1036210: lbu   v0, 0(v0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x01036204: 0x1036204: addiu s5, a0, -4
+// 0x01036214: 0x1036214: addiu s5, a0, -4
 	ldloc.1
 	ldc.i4.s -4
 	add
 	stloc 13
-// 0x01036208: 0x1036208: sb    v0, -17088(s0)
+// 0x01036218: 0x1036218: sb    v0, -16624(s0)
 	ldloc 8
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0103620c: 0x103620c: lw    a0, 8(a1)
+// 0x0103621c: 0x103621c: lw    a0, 8(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5611,12 +5611,12 @@ L_10361c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036210: 0x1036210: addiu s4, s0, -17088
+// 0x01036220: 0x1036220: addiu s4, s0, -16624
 	ldloc 8
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 11
-// 0x01036214: 0x1036214: jal   0x1000d8c addu  s2, a1, zero
+// 0x01036224: 0x1036224: jal   0x1000d8c addu  s2, a1, zero
 	ldloc.2
 	stloc 9
 	ldloc.0
@@ -5629,22 +5629,22 @@ L_10361c8:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0103621c: 0x103621c: sb    v0, 1(s4)
+// 0x0103622c: 0x103622c: sb    v0, 1(s4)
 	ldloc 11
 	ldc.i4.1
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036220: 0x1036220: addiu s0, zero, 2
+// 0x01036230: 0x1036230: addiu s0, zero, 2
 	ldc.i4.2
 	stloc 8
-// 0x01036224: 0x1036224: j	 0x1036240 addiu s3, zero, 18
+// 0x01036234: 0x1036234: j	 0x1036250 addiu s3, zero, 18
 	ldc.i4.s 18
 	stloc 12
-	br L_1036240
+	br L_1036250
 // --- basic block ---
-L_103622c:
-// 0x0103622c: 0x103622c: lw    a0, 8(s2)
+L_103623c:
+// 0x0103623c: 0x103623c: lw    a0, 8(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5653,7 +5653,7 @@ L_103622c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036230: 0x1036230: jal   0x1000d8c addiu s0, s0, 1
+// 0x01036240: 0x1036240: jal   0x1000d8c addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -5668,119 +5668,119 @@ L_103622c:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01036238: 0x1036238: addu  v1, s4, s0
+// 0x01036248: 0x1036248: addu  v1, s4, s0
 	ldloc 11
 	ldloc 8
 	add
 	stloc 5
-// 0x0103623c: 0x103623c: sb    v0, 1(v1)
+// 0x0103624c: 0x103624c: sb    v0, 1(v1)
 	ldloc 5
 	ldc.i4.1
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1036240:
-// 0x01036240: 0x1036240: slt   v1, s0, s5
+L_1036250:
+// 0x01036250: 0x1036250: slt   v1, s0, s5
 	ldloc 8
 	ldloc 13
 	clt
 	stloc 5
-// 0x01036244: 0x1036244: addiu s2, s2, 4
+// 0x01036254: 0x1036254: addiu s2, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-// 0x01036248: 0x1036248: bne   v1, zero, 0x1036264 addiu v0, s0, -2
+// 0x01036258: 0x1036258: bne   v1, zero, 0x1036274 addiu v0, s0, -2
 	ldloc 5
 	ldloc 8
 	ldc.i4.s -2
 	add
 	stloc 7
-	brtrue L_1036264
+	brtrue L_1036274
 // --- basic block ---
-// 0x01036250: 0x1036250: lui   v1, 0x60000
+// 0x01036260: 0x1036260: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01036254: 0x1036254: addiu v1, v1, -17088
+// 0x01036264: 0x1036264: addiu v1, v1, -16624
 	ldloc 5
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 5
-L_1036258:
-// 0x01036258: 0x1036258: addu  v1, v1, v0
+L_1036268:
+// 0x01036268: 0x1036268: addu  v1, v1, v0
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0103625c: 0x103625c: j	 0x103627c addiu v1, v1, 4
+// 0x0103626c: 0x103626c: j	 0x103628c addiu v1, v1, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	br L_103627c
+	br L_103628c
 // --- basic block ---
-L_1036264:
-// 0x01036264: 0x1036264: bne   s0, s3, 0x103622c lui   v1, 0x60000
+L_1036274:
+// 0x01036274: 0x1036274: bne   s0, s3, 0x103623c lui   v1, 0x60000
 	ldloc 8
 	ldloc 12
 	ldc.i4 393216
 	stloc 5
-	bne.un L_103622c
+	bne.un L_103623c
 // --- basic block ---
-// 0x0103626c: 0x103626c: j	 0x1036258 addiu v1, v1, -17088
+// 0x0103627c: 0x103627c: j	 0x1036268 addiu v1, v1, -16624
 	ldloc 5
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 5
-	br L_1036258
+	br L_1036268
 // --- basic block ---
-L_1036274:
-// 0x01036274: 0x1036274: sb    zero, 0(v1)
+L_1036284:
+// 0x01036284: 0x1036284: sb    zero, 0(v1)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036278: 0x1036278: addiu v1, v1, 1
+// 0x01036288: 0x1036288: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_103627c:
-// 0x0103627c: 0x103627c: slti  a0, v0, 16
+L_103628c:
+// 0x0103628c: 0x103628c: slti  a0, v0, 16
 	ldloc 7
 	ldc.i4.s 16
 	clt
 	stloc.1
-// 0x01036280: 0x1036280: bne   a0, zero, 0x1036274 addiu v0, v0, 1
+// 0x01036290: 0x1036290: bne   a0, zero, 0x1036284 addiu v0, v0, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_1036274
+	brtrue L_1036284
 // --- basic block ---
-// 0x01036288: 0x1036288: addiu v0, s0, 1
+// 0x01036298: 0x1036298: addiu v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0103628c: 0x103628c: sll   v0, v0, 2
+// 0x0103629c: 0x103629c: sll   v0, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01036290: 0x1036290: addu  v0, s1, v0
+// 0x010362a0: 0x10362a0: addu  v0, s1, v0
 	ldloc 10
 	ldloc 7
 	add
 	stloc 7
-// 0x01036294: 0x1036294: lw    a0, 0(v0)
+// 0x010362a4: 0x10362a4: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01036298: 0x1036298: jal   0x10c1c60 lui   s2, 0x60000
+// 0x010362a8: 0x10362a8: jal   0x10c22a0 lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 9
 	ldloc.0
@@ -5788,32 +5788,32 @@ L_103627c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::atof_10c1c60(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::atof_10c22a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010362a0: 0x10362a0: addiu v1, s0, 2
+// 0x010362b0: 0x10362b0: addiu v1, s0, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 5
-// 0x010362a4: 0x10362a4: addiu s2, s2, -17088
+// 0x010362b4: 0x10362b4: addiu s2, s2, -16624
 	ldloc 9
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 9
-// 0x010362a8: 0x10362a8: sll   v1, v1, 2
+// 0x010362b8: 0x10362b8: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010362ac: 0x10362ac: addu  v1, s1, v1
+// 0x010362bc: 0x10362bc: addu  v1, s1, v1
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x010362b0: 0x10362b0: sw    v0, 20(s2)
+// 0x010362c0: 0x10362c0: sw    v0, 20(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5822,14 +5822,14 @@ L_103627c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010362b4: 0x10362b4: lw    a0, 0(v1)
+// 0x010362c4: 0x10362c4: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010362b8: 0x10362b8: jal   0x10c1c60 addiu s0, s0, 3
+// 0x010362c8: 0x10362c8: jal   0x10c22a0 addiu s0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	add
@@ -5839,17 +5839,17 @@ L_103627c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::atof_10c1c60(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::atof_10c22a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010362c0: 0x10362c0: sll   s0, s0, 2
+// 0x010362d0: 0x10362d0: sll   s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x010362c4: 0x10362c4: sw    v0, 24(s2)
+// 0x010362d4: 0x10362d4: sw    v0, 24(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5858,30 +5858,30 @@ L_103627c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010362c8: 0x10362c8: addu  s0, s1, s0
+// 0x010362d8: 0x10362d8: addu  s0, s1, s0
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x010362cc: 0x10362cc: lw    a0, 0(s0)
+// 0x010362dc: 0x10362dc: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010362d0: 0x10362d0: jal   0x10c1c60 sll   zero, zero, 0
+// 0x010362e0: 0x10362e0: jal   0x10c22a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::atof_10c1c60(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::atof_10c22a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010362d8: 0x10362d8: sw    v0, 28(s2)
+// 0x010362e8: 0x10362e8: sw    v0, 28(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5890,12 +5890,12 @@ L_103627c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010362dc: 0x10362dc: addiu v0, zero, 1
+// 0x010362ec: 0x10362ec: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_10362e0:
-// 0x010362e0: 0x10362e0: lw    ra, 44(sp)
-// 0x010362e4: 0x10362e4: lw    s5, 40(sp)
+L_10362f0:
+// 0x010362f0: 0x10362f0: lw    ra, 44(sp)
+// 0x010362f4: 0x10362f4: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5904,7 +5904,7 @@ L_10362e0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010362e8: 0x10362e8: lw    s4, 36(sp)
+// 0x010362f8: 0x10362f8: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5913,7 +5913,7 @@ L_10362e0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010362ec: 0x10362ec: lw    s3, 32(sp)
+// 0x010362fc: 0x10362fc: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5922,7 +5922,7 @@ L_10362e0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010362f0: 0x10362f0: lw    s2, 28(sp)
+// 0x01036300: 0x1036300: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5931,7 +5931,7 @@ L_10362e0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010362f4: 0x10362f4: lw    s1, 24(sp)
+// 0x01036304: 0x1036304: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5940,7 +5940,7 @@ L_10362e0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010362f8: 0x10362f8: lw    s0, 20(sp)
+// 0x01036308: 0x1036308: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5949,7 +5949,7 @@ L_10362e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010362fc: 0x10362fc: jr    ra addiu sp, sp, 48
+// 0x0103630c: 0x103630c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5961,7 +5961,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_nmea_pgrmm_1036304(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_pgrmm_1036314(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -5999,19 +5999,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1036304:
-// 0x01036304: 0x1036304: addiu sp, sp, -24
+L_1036314:
+// 0x01036314: 0x1036314: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01036308: 0x1036308: slti  a0, a0, 2
+// 0x01036318: 0x1036318: slti  a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	clt
 	stloc.1
-// 0x0103630c: 0x103630c: sw    ra, 20(sp)
-// 0x01036310: 0x1036310: sw    s0, 16(sp)
+// 0x0103631c: 0x103631c: sw    ra, 20(sp)
+// 0x01036320: 0x1036320: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6020,16 +6020,16 @@ L_1036304:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036314: 0x1036314: bne   a0, zero, 0x103633c addu  v0, zero, zero
+// 0x01036324: 0x1036324: bne   a0, zero, 0x103634c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_103633c
+	brtrue L_103634c
 // --- basic block ---
-// 0x0103631c: 0x103631c: lui   s0, 0x60000
+// 0x0103632c: 0x103632c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01036320: 0x1036320: lw    a1, 4(a1)
+// 0x01036330: 0x1036330: lw    a1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6038,17 +6038,17 @@ L_1036304:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01036324: 0x1036324: addiu a0, s0, -17088
+// 0x01036334: 0x1036334: addiu a0, s0, -16624
 	ldloc 5
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc.1
-// 0x01036328: 0x1036328: addiu a2, zero, 256
+// 0x01036338: 0x1036338: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0103632c: 0x103632c: jal   0x1001af8 addiu s0, s0, -17088
+// 0x0103633c: 0x103633c: jal   0x1001af8 addiu s0, s0, -16624
 	ldloc 5
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 5
 	ldloc.1
@@ -6057,18 +6057,18 @@ L_1036304:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01036334: 0x1036334: sb    zero, 255(s0)
+// 0x01036344: 0x1036344: sb    zero, 255(s0)
 	ldloc 5
 	ldc.i4 255
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036338: 0x1036338: addiu v0, zero, 1
+// 0x01036348: 0x1036348: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_103633c:
-// 0x0103633c: 0x103633c: lw    ra, 20(sp)
-// 0x01036340: 0x1036340: lw    s0, 16(sp)
+L_103634c:
+// 0x0103634c: 0x103634c: lw    ra, 20(sp)
+// 0x01036350: 0x1036350: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6077,7 +6077,7 @@ L_103633c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036344: 0x1036344: jr    ra addiu sp, sp, 24
+// 0x01036354: 0x1036354: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6089,7 +6089,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_nmea_decode_unit_103634c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_decode_unit_103635c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -6127,12 +6127,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103634c: 0x103634c: addiu sp, sp, -32
+// 0x0103635c: 0x103635c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01036350: 0x1036350: sw    s0, 24(sp)
+// 0x01036360: 0x1036360: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6141,25 +6141,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01036354: 0x1036354: sw    ra, 28(sp)
-// 0x01036358: 0x1036358: beq   a0, zero, 0x1036388 addu  s0, a0, zero
+// 0x01036364: 0x1036364: sw    ra, 28(sp)
+// 0x01036368: 0x1036368: beq   a0, zero, 0x1036398 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1036388
+	brfalse L_1036398
 // --- basic block ---
-// 0x01036360: 0x1036360: lb    v0, 0(a0)
+// 0x01036370: 0x1036370: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01036364: 0x1036364: sll   zero, zero, 0
-// 0x01036368: 0x1036368: beq   v0, zero, 0x1036388 lui   a1, 0x10000
+// 0x01036374: 0x1036374: sll   zero, zero, 0
+// 0x01036378: 0x1036378: beq   v0, zero, 0x1036398 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1036388
+	brfalse L_1036398
 // --- basic block ---
-// 0x01036370: 0x1036370: jal   0x1001c08 addiu a1, a1, -22352
+// 0x01036380: 0x1036380: jal   0x1001c08 addiu a1, a1, -22352
 	ldloc.2
 	ldc.i4 -22352
 	add
@@ -6174,43 +6174,43 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01036378: 0x1036378: bne   v0, zero, 0x1036388 lui   v0, 0x0
+// 0x01036388: 0x1036388: bne   v0, zero, 0x1036398 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1036388
+	brtrue L_1036398
 // --- basic block ---
-// 0x01036380: 0x1036380: j	 0x10363b0 addiu v0, v0, 24084
+// 0x01036390: 0x1036390: j	 0x10363c0 addiu v0, v0, 24084
 	ldloc 5
 	ldc.i4 24084
 	add
 	stloc 5
-	br L_10363b0
+	br L_10363c0
 // --- basic block ---
-L_1036388:
-// 0x01036388: 0x1036388: lui   a1, 0x10000
+L_1036398:
+// 0x01036398: 0x1036398: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103638c: 0x103638c: lui   a3, 0x10000
+// 0x0103639c: 0x103639c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01036390: 0x1036390: addiu a1, a1, -13152
+// 0x010363a0: 0x10363a0: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x01036394: 0x1036394: addiu a3, a3, -12848
+// 0x010363a4: 0x10363a4: addiu a3, a3, -12852
 	ldloc 4
-	ldc.i4 -12848
+	ldc.i4 -12852
 	add
 	stloc 4
-// 0x01036398: 0x1036398: addiu a0, zero, 3
+// 0x010363a8: 0x10363a8: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0103639c: 0x103639c: addiu a2, zero, 224
+// 0x010363ac: 0x10363ac: addiu a2, zero, 224
 	ldc.i4 224
 	stloc.3
-// 0x010363a0: 0x10363a0: jal   0x100449c sw    s0, 16(sp)
+// 0x010363b0: 0x10363b0: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6229,17 +6229,17 @@ L_1036388:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010363a8: 0x10363a8: lui   v0, 0x0
+// 0x010363b8: 0x10363b8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010363ac: 0x10363ac: addiu v0, v0, 23120
+// 0x010363bc: 0x10363bc: addiu v0, v0, 23120
 	ldloc 5
 	ldc.i4 23120
 	add
 	stloc 5
-L_10363b0:
-// 0x010363b0: 0x10363b0: lw    ra, 28(sp)
-// 0x010363b4: 0x10363b4: lw    s0, 24(sp)
+L_10363c0:
+// 0x010363c0: 0x10363c0: lw    ra, 28(sp)
+// 0x010363c4: 0x10363c4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6248,7 +6248,7 @@ L_10363b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010363b8: 0x10363b8: jr    ra addiu sp, sp, 32
+// 0x010363c8: 0x10363c8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6260,7 +6260,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_pgrme_10363c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_pgrme_10363d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -6301,18 +6301,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10363c0:
-// 0x010363c0: 0x10363c0: addiu sp, sp, -32
+L_10363d0:
+// 0x010363d0: 0x10363d0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010363c4: 0x10363c4: slti  a0, a0, 7
+// 0x010363d4: 0x10363d4: slti  a0, a0, 7
 	ldloc.1
 	ldc.i4.7
 	clt
 	stloc.1
-// 0x010363c8: 0x10363c8: sw    s0, 20(sp)
+// 0x010363d8: 0x10363d8: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6321,8 +6321,8 @@ L_10363c0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010363cc: 0x10363cc: sw    ra, 28(sp)
-// 0x010363d0: 0x10363d0: sw    s1, 24(sp)
+// 0x010363dc: 0x10363dc: sw    ra, 28(sp)
+// 0x010363e0: 0x10363e0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6331,16 +6331,16 @@ L_10363c0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010363d4: 0x10363d4: addu  s0, a1, zero
+// 0x010363e4: 0x10363e4: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010363d8: 0x10363d8: bne   a0, zero, 0x103646c addu  v0, zero, zero
+// 0x010363e8: 0x10363e8: bne   a0, zero, 0x103647c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_103646c
+	brtrue L_103647c
 // --- basic block ---
-// 0x010363e0: 0x10363e0: lw    a0, 4(a1)
+// 0x010363f0: 0x10363f0: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6349,7 +6349,7 @@ L_10363c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010363e4: 0x10363e4: jal   0x1035be0 addiu a1, zero, 100
+// 0x010363f4: 0x10363f4: jal   0x1035bf0 addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -6357,24 +6357,24 @@ L_10363c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010363ec: 0x10363ec: lui   s1, 0x60000
+// 0x010363fc: 0x10363fc: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x010363f0: 0x10363f0: sw    v0, -17088(s1)
+// 0x01036400: 0x1036400: sw    v0, -16624(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 5
 	stelem.i4
-// 0x010363f4: 0x10363f4: lw    a0, 8(s0)
+// 0x01036404: 0x1036404: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6383,9 +6383,9 @@ L_10363c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010363f8: 0x10363f8: jal   0x103634c addiu s1, s1, -17088
+// 0x01036408: 0x1036408: jal   0x103635c addiu s1, s1, -16624
 	ldloc 9
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 9
 	ldloc.0
@@ -6393,20 +6393,20 @@ L_10363c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_unit_103634c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_unit_103635c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036400: 0x1036400: lui   a0, 0x60000
+// 0x01036410: 0x1036410: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01036404: 0x1036404: addiu a0, a0, -17084
+// 0x01036414: 0x1036414: addiu a0, a0, -16620
 	ldloc.1
-	ldc.i4 -17084
+	ldc.i4 -16620
 	add
 	stloc.1
-// 0x01036408: 0x1036408: jal   0x1001b68 addu  a1, v0, zero
+// 0x01036418: 0x1036418: jal   0x1001b68 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6416,7 +6416,7 @@ L_10363c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036410: 0x1036410: lw    a0, 12(s0)
+// 0x01036420: 0x1036420: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6425,7 +6425,7 @@ L_10363c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036414: 0x1036414: jal   0x1035be0 addiu a1, zero, 100
+// 0x01036424: 0x1036424: jal   0x1035bf0 addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -6433,12 +6433,12 @@ L_10363c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103641c: 0x103641c: sw    v0, 8(s1)
+// 0x0103642c: 0x103642c: sw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6447,7 +6447,7 @@ L_10363c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036420: 0x1036420: lw    a0, 16(s0)
+// 0x01036430: 0x1036430: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6456,26 +6456,26 @@ L_10363c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036424: 0x1036424: jal   0x103634c sll   zero, zero, 0
+// 0x01036434: 0x1036434: jal   0x103635c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_unit_103634c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_unit_103635c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103642c: 0x103642c: lui   a0, 0x60000
+// 0x0103643c: 0x103643c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01036430: 0x1036430: addiu a0, a0, -17076
+// 0x01036440: 0x1036440: addiu a0, a0, -16612
 	ldloc.1
-	ldc.i4 -17076
+	ldc.i4 -16612
 	add
 	stloc.1
-// 0x01036434: 0x1036434: jal   0x1001b68 addu  a1, v0, zero
+// 0x01036444: 0x1036444: jal   0x1001b68 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6485,7 +6485,7 @@ L_10363c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103643c: 0x103643c: lw    a0, 20(s0)
+// 0x0103644c: 0x103644c: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6494,7 +6494,7 @@ L_10363c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036440: 0x1036440: jal   0x1035be0 addiu a1, zero, 100
+// 0x01036450: 0x1036450: jal   0x1035bf0 addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -6502,12 +6502,12 @@ L_10363c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036448: 0x1036448: sw    v0, 16(s1)
+// 0x01036458: 0x1036458: sw    v0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6516,7 +6516,7 @@ L_10363c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103644c: 0x103644c: lw    a0, 24(s0)
+// 0x0103645c: 0x103645c: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6525,26 +6525,26 @@ L_10363c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036450: 0x1036450: jal   0x103634c sll   zero, zero, 0
+// 0x01036460: 0x1036460: jal   0x103635c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_unit_103634c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_unit_103635c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036458: 0x1036458: lui   a0, 0x60000
+// 0x01036468: 0x1036468: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103645c: 0x103645c: addiu a0, a0, -17068
+// 0x0103646c: 0x103646c: addiu a0, a0, -16604
 	ldloc.1
-	ldc.i4 -17068
+	ldc.i4 -16604
 	add
 	stloc.1
-// 0x01036460: 0x1036460: jal   0x1001b68 addu  a1, v0, zero
+// 0x01036470: 0x1036470: jal   0x1001b68 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6554,12 +6554,12 @@ L_10363c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036468: 0x1036468: addiu v0, zero, 1
+// 0x01036478: 0x1036478: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_103646c:
-// 0x0103646c: 0x103646c: lw    ra, 28(sp)
-// 0x01036470: 0x1036470: lw    s1, 24(sp)
+L_103647c:
+// 0x0103647c: 0x103647c: lw    ra, 28(sp)
+// 0x01036480: 0x1036480: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6568,7 +6568,7 @@ L_103646c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01036474: 0x1036474: lw    s0, 20(sp)
+// 0x01036484: 0x1036484: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6577,7 +6577,7 @@ L_103646c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01036478: 0x1036478: jr    ra addiu sp, sp, 32
+// 0x01036488: 0x1036488: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6589,7 +6589,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_decode_time_1036480(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_decode_time_1036490(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 lo,int32 s3,int32 ra)
@@ -6639,12 +6639,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036480: 0x1036480: addiu sp, sp, -48
+// 0x01036490: 0x1036490: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01036484: 0x1036484: sw    s2, 36(sp)
+// 0x01036494: 0x1036494: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6653,7 +6653,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01036488: 0x1036488: sw    s0, 28(sp)
+// 0x01036498: 0x1036498: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6662,8 +6662,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103648c: 0x103648c: sw    ra, 44(sp)
-// 0x01036490: 0x1036490: sw    s3, 40(sp)
+// 0x0103649c: 0x103649c: sw    ra, 44(sp)
+// 0x010364a0: 0x10364a0: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6672,7 +6672,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01036494: 0x1036494: sw    s1, 32(sp)
+// 0x010364a4: 0x10364a4: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6681,10 +6681,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01036498: 0x1036498: addu  s0, a1, zero
+// 0x010364a8: 0x10364a8: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0103649c: 0x103649c: jal   0x1001b48 addu  s2, a0, zero
+// 0x010364ac: 0x10364ac: jal   0x1001b48 addu  s2, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
@@ -6693,57 +6693,57 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010364a4: 0x10364a4: sltiu v0, v0, 6
+// 0x010364b4: 0x10364b4: sltiu v0, v0, 6
 	ldloc 5
 	ldc.i4.6
 	clt.un
 	stloc 5
-// 0x010364a8: 0x10364a8: bne   v0, zero, 0x1036650 addiu v0, zero, -1
+// 0x010364b8: 0x10364b8: bne   v0, zero, 0x1036660 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1036650
+	brtrue L_1036660
 // --- basic block ---
-// 0x010364b0: 0x10364b0: lb    a0, 0(s2)
+// 0x010364c0: 0x10364c0: lb    a0, 0(s2)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010364b4: 0x10364b4: addiu s1, zero, 10
+// 0x010364c4: 0x10364c4: addiu s1, zero, 10
 	ldc.i4.s 10
 	stloc 10
-// 0x010364b8: 0x10364b8: mult  a0, s1
+// 0x010364c8: 0x10364c8: mult  a0, s1
 	ldloc.1
 	ldloc 10
 	mul
 	stloc 11
-// 0x010364bc: 0x10364bc: lb    v0, 1(s2)
+// 0x010364cc: 0x10364cc: lb    v0, 1(s2)
 	ldloc 8
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010364c0: 0x10364c0: lui   v1, 0x60000
+// 0x010364d0: 0x10364d0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010364c4: 0x10364c4: addiu s3, v1, -17124
+// 0x010364d4: 0x10364d4: addiu s3, v1, -16660
 	ldloc 7
-	ldc.i4 -17124
+	ldc.i4 -16660
 	add
 	stloc 12
-// 0x010364c8: 0x10364c8: mflo  lo
+// 0x010364d8: 0x10364d8: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x010364cc: 0x10364cc: addu  a0, a0, v0
+// 0x010364dc: 0x10364dc: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x010364d0: 0x10364d0: addiu a0, a0, -528
+// 0x010364e0: 0x10364e0: addiu a0, a0, -528
 	ldloc.1
 	ldc.i4 -528
 	add
 	stloc.1
-// 0x010364d4: 0x10364d4: sw    a0, 8(s3)
+// 0x010364e4: 0x10364e4: sw    a0, 8(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6752,42 +6752,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010364d8: 0x10364d8: lb    v0, 2(s2)
+// 0x010364e8: 0x10364e8: lb    v0, 2(s2)
 	ldloc 8
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010364dc: 0x10364dc: lb    a1, 3(s2)
+// 0x010364ec: 0x10364ec: lb    a1, 3(s2)
 	ldloc 8
 	ldc.i4.3
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x010364e0: 0x10364e0: mult  v0, s1
+// 0x010364f0: 0x10364f0: mult  v0, s1
 	ldloc 5
 	ldloc 10
 	mul
 	stloc 11
-// 0x010364e4: 0x10364e4: sltiu a0, a0, 24
+// 0x010364f4: 0x10364f4: sltiu a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	clt.un
 	stloc.1
-// 0x010364e8: 0x10364e8: addiu v0, a1, -528
+// 0x010364f8: 0x10364f8: addiu v0, a1, -528
 	ldloc.2
 	ldc.i4 -528
 	add
 	stloc 5
-// 0x010364ec: 0x10364ec: mflo  lo
+// 0x010364fc: 0x10364fc: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x010364f0: 0x10364f0: addu  v0, v0, a1
+// 0x01036500: 0x1036500: addu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-// 0x010364f4: 0x10364f4: sw    v0, 4(s3)
+// 0x01036504: 0x1036504: sw    v0, 4(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6796,79 +6796,79 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010364f8: 0x10364f8: lb    a2, 4(s2)
+// 0x01036508: 0x1036508: lb    a2, 4(s2)
 	ldloc 8
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x010364fc: 0x10364fc: lb    a1, 5(s2)
+// 0x0103650c: 0x103650c: lb    a1, 5(s2)
 	ldloc 8
 	ldc.i4.5
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01036500: 0x1036500: mult  a2, s1
+// 0x01036510: 0x1036510: mult  a2, s1
 	ldloc.3
 	ldloc 10
 	mul
 	stloc 11
-// 0x01036504: 0x1036504: addiu a1, a1, -528
+// 0x01036514: 0x1036514: addiu a1, a1, -528
 	ldloc.2
 	ldc.i4 -528
 	add
 	stloc.2
-// 0x01036508: 0x1036508: mflo  lo
+// 0x01036518: 0x1036518: mflo  lo
 	ldloc 11
 	stloc.3
-// 0x0103650c: 0x103650c: addu  a1, a1, a2
+// 0x0103651c: 0x103651c: addu  a1, a1, a2
 	ldloc.2
 	ldloc.3
 	add
 	stloc.2
-// 0x01036510: 0x1036510: beq   a0, zero, 0x103664c sw    a1, -17124(v1)
+// 0x01036520: 0x1036520: beq   a0, zero, 0x103665c sw    a1, -16660(v1)
 	ldloc.1
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4281
+	ldc.i4 -4165
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_103664c
+	brfalse L_103665c
 // --- basic block ---
-// 0x01036518: 0x1036518: sltiu v0, v0, 60
+// 0x01036528: 0x1036528: sltiu v0, v0, 60
 	ldloc 5
 	ldc.i4.s 60
 	clt.un
 	stloc 5
-// 0x0103651c: 0x103651c: beq   v0, zero, 0x103664c sltiu a1, a1, 60
+// 0x0103652c: 0x103652c: beq   v0, zero, 0x103665c sltiu a1, a1, 60
 	ldloc 5
 	ldloc.2
 	ldc.i4.s 60
 	clt.un
 	stloc.2
-	brfalse L_103664c
+	brfalse L_103665c
 // --- basic block ---
-// 0x01036524: 0x1036524: beq   a1, zero, 0x103664c sll   zero, zero, 0
+// 0x01036534: 0x1036534: beq   a1, zero, 0x103665c sll   zero, zero, 0
 	ldloc.2
-	brfalse L_103664c
+	brfalse L_103665c
 // --- basic block ---
-// 0x0103652c: 0x103652c: beq   s0, zero, 0x10365f0 sll   zero, zero, 0
+// 0x0103653c: 0x103653c: beq   s0, zero, 0x1036600 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10365f0
+	brfalse L_1036600
 // --- basic block ---
-// 0x01036534: 0x1036534: lb    s2, 0(s0)
+// 0x01036544: 0x1036544: lb    s2, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x01036538: 0x1036538: sll   zero, zero, 0
-// 0x0103653c: 0x103653c: beq   s2, zero, 0x10365f0 sll   zero, zero, 0
+// 0x01036548: 0x1036548: sll   zero, zero, 0
+// 0x0103654c: 0x103654c: beq   s2, zero, 0x1036600 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10365f0
+	brfalse L_1036600
 // --- basic block ---
-// 0x01036544: 0x1036544: jal   0x1001b48 addu  a0, s0, zero
+// 0x01036554: 0x1036554: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6877,42 +6877,42 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103654c: 0x103654c: sltiu v0, v0, 6
+// 0x0103655c: 0x103655c: sltiu v0, v0, 6
 	ldloc 5
 	ldc.i4.6
 	clt.un
 	stloc 5
-// 0x01036550: 0x1036550: bne   v0, zero, 0x1036650 addiu v0, zero, -1
+// 0x01036560: 0x1036560: bne   v0, zero, 0x1036660 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1036650
+	brtrue L_1036660
 // --- basic block ---
-// 0x01036558: 0x1036558: mult  s2, s1
+// 0x01036568: 0x1036568: mult  s2, s1
 	ldloc 8
 	ldloc 10
 	mul
 	stloc 11
-// 0x0103655c: 0x103655c: lb    v0, 1(s0)
+// 0x0103656c: 0x103656c: lb    v0, 1(s0)
 	ldloc 9
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01036560: 0x1036560: mflo  lo
+// 0x01036570: 0x1036570: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x01036564: 0x1036564: addu  s2, s2, v0
+// 0x01036574: 0x1036574: addu  s2, s2, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01036568: 0x1036568: addiu s2, s2, -528
+// 0x01036578: 0x1036578: addiu s2, s2, -528
 	ldloc 8
 	ldc.i4 -528
 	add
 	stloc 8
-// 0x0103656c: 0x103656c: sw    s2, 12(s3)
+// 0x0103657c: 0x103657c: sw    s2, 12(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6921,42 +6921,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01036570: 0x1036570: lb    v0, 2(s0)
+// 0x01036580: 0x1036580: lb    v0, 2(s0)
 	ldloc 9
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01036574: 0x1036574: lb    v1, 3(s0)
+// 0x01036584: 0x1036584: lb    v1, 3(s0)
 	ldloc 9
 	ldc.i4.3
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01036578: 0x1036578: mult  v0, s1
+// 0x01036588: 0x1036588: mult  v0, s1
 	ldloc 5
 	ldloc 10
 	mul
 	stloc 11
-// 0x0103657c: 0x103657c: sltiu s2, s2, 32
+// 0x0103658c: 0x103658c: sltiu s2, s2, 32
 	ldloc 8
 	ldc.i4.s 32
 	clt.un
 	stloc 8
-// 0x01036580: 0x1036580: addiu v0, v1, -528
+// 0x01036590: 0x1036590: addiu v0, v1, -528
 	ldloc 7
 	ldc.i4 -528
 	add
 	stloc 5
-// 0x01036584: 0x1036584: mflo  lo
+// 0x01036594: 0x1036594: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x01036588: 0x1036588: addu  v0, v0, v1
+// 0x01036598: 0x1036598: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0103658c: 0x103658c: sw    v0, 16(s3)
+// 0x0103659c: 0x103659c: sw    v0, 16(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6965,37 +6965,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036590: 0x1036590: lb    a0, 4(s0)
+// 0x010365a0: 0x10365a0: lb    a0, 4(s0)
 	ldloc 9
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01036594: 0x1036594: lb    v1, 5(s0)
+// 0x010365a4: 0x10365a4: lb    v1, 5(s0)
 	ldloc 9
 	ldc.i4.5
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01036598: 0x1036598: mult  a0, s1
+// 0x010365a8: 0x10365a8: mult  a0, s1
 	ldloc.1
 	ldloc 10
 	mul
 	stloc 11
-// 0x0103659c: 0x103659c: addiu v1, v1, -528
+// 0x010365ac: 0x10365ac: addiu v1, v1, -528
 	ldloc 7
 	ldc.i4 -528
 	add
 	stloc 7
-// 0x010365a0: 0x10365a0: mflo  lo
+// 0x010365b0: 0x10365b0: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x010365a4: 0x10365a4: addu  s1, v1, s1
+// 0x010365b4: 0x10365b4: addu  s1, v1, s1
 	ldloc 7
 	ldloc 10
 	add
 	stloc 10
-// 0x010365a8: 0x10365a8: beq   s2, zero, 0x103664c sw    s1, 20(s3)
+// 0x010365b8: 0x10365b8: beq   s2, zero, 0x103665c sw    s1, 20(s3)
 	ldloc 8
 	ldloc 6
 	ldloc 12
@@ -7005,58 +7005,58 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	brfalse L_103664c
+	brfalse L_103665c
 // --- basic block ---
-// 0x010365b0: 0x10365b0: sltiu v0, v0, 13
+// 0x010365c0: 0x10365c0: sltiu v0, v0, 13
 	ldloc 5
 	ldc.i4.s 13
 	clt.un
 	stloc 5
-// 0x010365b4: 0x10365b4: beq   v0, zero, 0x1036650 addiu v0, zero, -1
+// 0x010365c4: 0x10365c4: beq   v0, zero, 0x1036660 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1036650
+	brfalse L_1036660
 // --- basic block ---
-// 0x010365bc: 0x10365bc: bltz  s1, 0x103664c slti  v0, s1, 50
+// 0x010365cc: 0x10365cc: bltz  s1, 0x103665c slti  v0, s1, 50
 	ldloc 10
 	ldloc 10
 	ldc.i4.s 50
 	clt
 	stloc 5
 	ldc.i4.s 0
-	blt L_103664c
+	blt L_103665c
 // --- basic block ---
-// 0x010365c4: 0x10365c4: beq   v0, zero, 0x10365d4 addiu s1, s1, 100
+// 0x010365d4: 0x10365d4: beq   v0, zero, 0x10365e4 addiu s1, s1, 100
 	ldloc 5
 	ldloc 10
 	ldc.i4.s 100
 	add
 	stloc 10
-	brfalse L_10365d4
+	brfalse L_10365e4
 // --- basic block ---
-// 0x010365cc: 0x10365cc: lui   v0, 0x60000
+// 0x010365dc: 0x10365dc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010365d0: 0x10365d0: sw    s1, -17104(v0)
+// 0x010365e0: 0x10365e0: sw    s1, -16640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4276
+	ldc.i4 -4160
 	add
 	ldloc 10
 	stelem.i4
-L_10365d4:
-// 0x010365d4: 0x10365d4: lui   v0, 0x60000
+L_10365e4:
+// 0x010365e4: 0x10365e4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010365d8: 0x10365d8: addiu v0, v0, -17124
+// 0x010365e8: 0x10365e8: addiu v0, v0, -16660
 	ldloc 5
-	ldc.i4 -17124
+	ldc.i4 -16660
 	add
 	stloc 5
-// 0x010365dc: 0x10365dc: lw    v1, 16(v0)
+// 0x010365ec: 0x10365ec: lw    v1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7065,13 +7065,13 @@ L_10365d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010365e0: 0x10365e0: sll   zero, zero, 0
-// 0x010365e4: 0x10365e4: addiu v1, v1, -1
+// 0x010365f0: 0x10365f0: sll   zero, zero, 0
+// 0x010365f4: 0x10365f4: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x010365e8: 0x10365e8: j	 0x1036638 sw    v1, 16(v0)
+// 0x010365f8: 0x10365f8: j	 0x1036648 sw    v1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7080,18 +7080,18 @@ L_10365d4:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1036638
+	br L_1036648
 // --- basic block ---
-L_10365f0:
-// 0x010365f0: 0x10365f0: lui   s0, 0x60000
+L_1036600:
+// 0x01036600: 0x1036600: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x010365f4: 0x10365f4: addiu s0, s0, -17124
+// 0x01036604: 0x1036604: addiu s0, s0, -16660
 	ldloc 9
-	ldc.i4 -17124
+	ldc.i4 -16660
 	add
 	stloc 9
-// 0x010365f8: 0x10365f8: lw    v0, 20(s0)
+// 0x01036608: 0x1036608: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7100,24 +7100,24 @@ L_10365f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010365fc: 0x10365fc: sll   zero, zero, 0
-// 0x01036600: 0x1036600: bne   v0, zero, 0x103663c lui   a0, 0x60000
+// 0x0103660c: 0x103660c: sll   zero, zero, 0
+// 0x01036610: 0x1036610: bne   v0, zero, 0x103664c lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	brtrue L_103663c
+	brtrue L_103664c
 // --- basic block ---
-// 0x01036608: 0x1036608: addiu a0, sp, 16
+// 0x01036618: 0x1036618: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0103660c: 0x103660c: cibyl_sysc_arg 0x4
+// 0x0103661c: 0x103661c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01036610: 0x1036610: cibyl_sysc 0x58a
+// 0x01036620: 0x1036620: cibyl_sysc 0x58a
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01036614: 0x1036614: jal   0x10c34cc addu  v1, v0, zero
+// 0x01036624: 0x1036624: jal   0x10c3b0c addu  v1, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -7125,12 +7125,12 @@ L_10365f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::gmtime_10c34cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::gmtime_10c3b0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103661c: 0x103661c: lw    a0, 20(v0)
+// 0x0103662c: 0x103662c: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7139,7 +7139,7 @@ L_10365f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036620: 0x1036620: lw    v1, 12(v0)
+// 0x01036630: 0x1036630: lw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7148,7 +7148,7 @@ L_10365f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01036624: 0x1036624: lw    v0, 16(v0)
+// 0x01036634: 0x1036634: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7157,7 +7157,7 @@ L_10365f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036628: 0x1036628: sw    a0, 20(s0)
+// 0x01036638: 0x1036638: sw    a0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7166,7 +7166,7 @@ L_10365f0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103662c: 0x103662c: sw    v1, 12(s0)
+// 0x0103663c: 0x103663c: sw    v1, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7175,7 +7175,7 @@ L_10365f0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01036630: 0x1036630: j	 0x103664c sw    v0, 16(s0)
+// 0x01036640: 0x1036640: j	 0x103665c sw    v0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7184,37 +7184,37 @@ L_10365f0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_103664c
+	br L_103665c
 // --- basic block ---
-L_1036638:
-// 0x01036638: 0x1036638: lui   a0, 0x60000
+L_1036648:
+// 0x01036648: 0x1036648: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-L_103663c:
-// 0x0103663c: 0x103663c: jal   0x10c357c addiu a0, a0, -17124
+L_103664c:
+// 0x0103664c: 0x103664c: jal   0x10c3bbc addiu a0, a0, -16660
 	ldloc.1
-	ldc.i4 -17124
+	ldc.i4 -16660
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::timegm_10c357c(int32,int32,int32,int32)
+	call int32 Cibyl145::timegm_10c3bbc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036644: 0x1036644: j	 0x1036650 sll   zero, zero, 0
-	br L_1036650
+// 0x01036654: 0x1036654: j	 0x1036660 sll   zero, zero, 0
+	br L_1036660
 // --- basic block ---
-L_103664c:
-// 0x0103664c: 0x103664c: addiu v0, zero, -1
+L_103665c:
+// 0x0103665c: 0x103665c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_1036650:
-// 0x01036650: 0x1036650: lw    ra, 44(sp)
-// 0x01036654: 0x1036654: lw    s3, 40(sp)
+L_1036660:
+// 0x01036660: 0x1036660: lw    ra, 44(sp)
+// 0x01036664: 0x1036664: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7223,7 +7223,7 @@ L_1036650:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01036658: 0x1036658: lw    s2, 36(sp)
+// 0x01036668: 0x1036668: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7232,7 +7232,7 @@ L_1036650:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103665c: 0x103665c: lw    s1, 32(sp)
+// 0x0103666c: 0x103666c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7241,7 +7241,7 @@ L_1036650:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01036660: 0x1036660: lw    s0, 28(sp)
+// 0x01036670: 0x1036670: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7250,7 +7250,7 @@ L_1036650:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01036664: 0x1036664: jr    ra addiu sp, sp, 48
+// 0x01036674: 0x1036674: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
diff --git a/converted/Cibyl4.j b/converted/Cibyl4.j
index 0c58194..5e2272b 100644
--- a/converted/Cibyl4.j
+++ b/converted/Cibyl4.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl4::.ctor
 
-.method public static int32 T_73_10054b0(int32,int32,int32,int32,int32)
+.method public static int32 T_73_10054c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -91,24 +91,24 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010054b0: 0x10054b0: lui   v0, 0x20000
+// 0x010054c0: 0x10054c0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010054b4: 0x10054b4: lw    v0, 31188(v0)
+// 0x010054c4: 0x10054c4: lw    v0, 31652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc 5
-// 0x010054b8: 0x10054b8: addiu sp, sp, -40
+// 0x010054c8: 0x10054c8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010054bc: 0x10054bc: sw    s1, 24(sp)
+// 0x010054cc: 0x10054cc: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -117,8 +117,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010054c0: 0x10054c0: sw    ra, 36(sp)
-// 0x010054c4: 0x10054c4: sw    s3, 32(sp)
+// 0x010054d0: 0x10054d0: sw    ra, 36(sp)
+// 0x010054d4: 0x10054d4: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -127,7 +127,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010054c8: 0x10054c8: sw    s2, 28(sp)
+// 0x010054d8: 0x10054d8: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -136,7 +136,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010054cc: 0x10054cc: sw    s0, 20(sp)
+// 0x010054dc: 0x10054dc: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -145,13 +145,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010054d0: 0x10054d0: beq   v0, zero, 0x10055a0 addu  s1, a0, zero
+// 0x010054e0: 0x10054e0: beq   v0, zero, 0x10055b0 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
-	brfalse L_10055a0
+	brfalse L_10055b0
 // --- basic block ---
-// 0x010054d8: 0x10054d8: lw    v1, 16(v0)
+// 0x010054e8: 0x10054e8: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -160,17 +160,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010054dc: 0x10054dc: sll   zero, zero, 0
-// 0x010054e0: 0x10054e0: slt   v1, a0, v1
+// 0x010054ec: 0x10054ec: sll   zero, zero, 0
+// 0x010054f0: 0x10054f0: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x010054e4: 0x10054e4: beq   v1, zero, 0x10055a0 sll   zero, zero, 0
+// 0x010054f4: 0x10054f4: beq   v1, zero, 0x10055b0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10055a0
+	brfalse L_10055b0
 // --- basic block ---
-// 0x010054ec: 0x10054ec: lw    v1, 12(v0)
+// 0x010054fc: 0x10054fc: lw    v1, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -179,51 +179,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010054f0: 0x10054f0: sll   v0, a0, 2
+// 0x01005500: 0x1005500: sll   v0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010054f4: 0x10054f4: beq   a1, zero, 0x1005508 addu  v0, v1, v0
+// 0x01005504: 0x1005504: beq   a1, zero, 0x1005518 addu  v0, v1, v0
 	ldloc.2
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-	brfalse L_1005508
+	brfalse L_1005518
 // --- basic block ---
-// 0x010054fc: 0x10054fc: lhu   a0, 2(v0)
+// 0x0100550c: 0x100550c: lhu   a0, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01005500: 0x1005500: j	 0x1005510 ori   v0, zero, 65535
+// 0x01005510: 0x1005510: j	 0x1005520 ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-	br L_1005510
+	br L_1005520
 // --- basic block ---
-L_1005508:
-// 0x01005508: 0x1005508: lhu   a0, 0(v0)
+L_1005518:
+// 0x01005518: 0x1005518: lhu   a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x0100550c: 0x100550c: ori   v0, zero, 65535
+// 0x0100551c: 0x100551c: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-L_1005510:
-// 0x01005510: 0x1005510: beq   a0, v0, 0x10055a4 addu  v0, zero, zero
+L_1005520:
+// 0x01005520: 0x1005520: beq   a0, v0, 0x10055b4 addu  v0, zero, zero
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_10055a4
+	beq  L_10055b4
 // --- basic block ---
-// 0x01005518: 0x1005518: jal   0x1004e8c addiu a1, zero, 24
+// 0x01005528: 0x1005528: jal   0x1004e9c addiu a1, zero, 24
 	ldc.i4.s 24
 	stloc.2
 	ldloc.0
@@ -231,18 +231,18 @@ L_1005510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_1004e8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_1004e9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005520: 0x1005520: beq   v0, zero, 0x10055a0 addu  s0, v0, zero
+// 0x01005530: 0x1005530: beq   v0, zero, 0x10055b0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_10055a0
+	brfalse L_10055b0
 // --- basic block ---
-// 0x01005528: 0x1005528: jal   0x100405c addu  a0, s1, zero
+// 0x01005538: 0x1005538: jal   0x100405c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -255,7 +255,7 @@ L_1005510:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005530: 0x1005530: jal   0x1007eb8 addu  a0, v0, zero
+// 0x01005540: 0x1005540: jal   0x1007ec8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -263,55 +263,55 @@ L_1005510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_cm_1007eb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_cm_1007ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005538: 0x1005538: addiu a0, zero, 100
+// 0x01005548: 0x1005548: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x0100553c: 0x100553c: div   v0, a0
+// 0x0100554c: 0x100554c: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 13
-// 0x01005540: 0x1005540: mflo  lo
+// 0x01005550: 0x1005550: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x01005544: 0x1005544: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01005554: 0x1005554: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100554c: 0x100554c: lui   a0, 0x20000
+// 0x0100555c: 0x100555c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01005550: 0x1005550: lw    a3, 23700(a0)
+// 0x01005560: 0x1005560: lw    a3, 24164(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5925
+	ldc.i4 6041
 	add
 	ldelem.i4
 	stloc 4
-// 0x01005554: 0x1005554: lw    a2, 23696(a0)
+// 0x01005564: 0x1005564: lw    a2, 24160(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5924
+	ldc.i4 6040
 	add
 	ldelem.i4
 	stloc.3
-// 0x01005558: 0x1005558: addu  a1, v1, zero
+// 0x01005568: 0x1005568: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x0100555c: 0x100555c: jal   0x10c0798 addu  a0, v0, zero
+// 0x0100556c: 0x100556c: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -319,37 +319,37 @@ L_1005510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005564: 0x1005564: addu  a0, s0, zero
+// 0x01005574: 0x1005574: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01005568: 0x1005568: addu  s3, v1, zero
+// 0x01005578: 0x1005578: addu  s3, v1, zero
 	ldloc 6
 	stloc 11
-// 0x0100556c: 0x100556c: jal   0x10c09c0 addu  s2, v0, zero
+// 0x0100557c: 0x100557c: jal   0x10c1000 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005574: 0x1005574: addu  a3, v1, zero
+// 0x01005584: 0x1005584: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01005578: 0x1005578: addu  a1, s3, zero
+// 0x01005588: 0x1005588: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0100557c: 0x100557c: addu  a0, s2, zero
+// 0x0100558c: 0x100558c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01005580: 0x1005580: jal   0x10c07f0 addu  a2, v0, zero
+// 0x01005590: 0x1005590: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -357,44 +357,44 @@ L_1005510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005588: 0x1005588: addu  a1, v1, zero
+// 0x01005598: 0x1005598: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x0100558c: 0x100558c: jal   0x10c0948 addu  a0, v0, zero
+// 0x0100559c: 0x100559c: jal   0x10c0f88 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixunsdfsi_10c0948(int32,int32,int32)
+	call int32 Cibyl143::__fixunsdfsi_10c0f88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01005594: 0x1005594: addiu v0, v0, 1
+// 0x010055a4: 0x10055a4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01005598: 0x1005598: j	 0x10055a4 andi  v0, v0, 65535
+// 0x010055a8: 0x10055a8: j	 0x10055b4 andi  v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	and
 	stloc 5
-	br L_10055a4
+	br L_10055b4
 // --- basic block ---
-L_10055a0:
-// 0x010055a0: 0x10055a0: addu  v0, zero, zero
+L_10055b0:
+// 0x010055b0: 0x10055b0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10055a4:
-// 0x010055a4: 0x10055a4: lw    ra, 36(sp)
-// 0x010055a8: 0x10055a8: lw    s3, 32(sp)
+L_10055b4:
+// 0x010055b4: 0x10055b4: lw    ra, 36(sp)
+// 0x010055b8: 0x10055b8: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -403,7 +403,7 @@ L_10055a4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010055ac: 0x10055ac: lw    s2, 28(sp)
+// 0x010055bc: 0x10055bc: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -412,7 +412,7 @@ L_10055a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010055b0: 0x10055b0: lw    s1, 24(sp)
+// 0x010055c0: 0x10055c0: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -421,7 +421,7 @@ L_10055a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010055b4: 0x10055b4: lw    s0, 20(sp)
+// 0x010055c4: 0x10055c4: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -430,7 +430,7 @@ L_10055a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010055b8: 0x10055b8: jr    ra addiu sp, sp, 40
+// 0x010055c8: 0x10055c8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -442,7 +442,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_get_cross_times_10055c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_get_cross_times_10055d0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -483,24 +483,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010055c0: 0x10055c0: lui   v0, 0x20000
+// 0x010055d0: 0x10055d0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010055c4: 0x10055c4: lw    v0, 31188(v0)
+// 0x010055d4: 0x10055d4: lw    v0, 31652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7797
+	ldc.i4 7913
 	add
 	ldelem.i4
 	stloc 5
-// 0x010055c8: 0x10055c8: addiu sp, sp, -40
+// 0x010055d8: 0x10055d8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010055cc: 0x10055cc: sw    s1, 32(sp)
+// 0x010055dc: 0x10055dc: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -509,7 +509,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010055d0: 0x10055d0: sw    s0, 28(sp)
+// 0x010055e0: 0x10055e0: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -518,17 +518,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010055d4: 0x10055d4: sw    ra, 36(sp)
-// 0x010055d8: 0x10055d8: addu  s0, a1, zero
+// 0x010055e4: 0x10055e4: sw    ra, 36(sp)
+// 0x010055e8: 0x10055e8: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010055dc: 0x10055dc: beq   v0, zero, 0x1005634 addu  s1, a0, zero
+// 0x010055ec: 0x10055ec: beq   v0, zero, 0x1005644 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
-	brfalse L_1005634
+	brfalse L_1005644
 // --- basic block ---
-// 0x010055e4: 0x10055e4: lw    v0, 16(v0)
+// 0x010055f4: 0x10055f4: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -537,30 +537,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010055e8: 0x10055e8: sll   zero, zero, 0
-// 0x010055ec: 0x10055ec: slt   v0, a0, v0
+// 0x010055f8: 0x10055f8: sll   zero, zero, 0
+// 0x010055fc: 0x10055fc: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010055f0: 0x10055f0: beq   v0, zero, 0x1005634 addu  v1, zero, zero
+// 0x01005600: 0x1005600: beq   v0, zero, 0x1005644 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1005634
+	brfalse L_1005644
 // --- basic block ---
-// 0x010055f8: 0x10055f8: cibyl_sysc_arg 0x3
+// 0x01005608: 0x1005608: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010055fc: 0x10055fc: cibyl_sysc 0x223
+// 0x0100560c: 0x100560c: cibyl_sysc 0x223
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01005600: 0x1005600: addu  v1, v0, zero
+// 0x01005610: 0x1005610: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01005604: 0x1005604: addu  a1, zero, zero
+// 0x01005614: 0x1005614: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01005608: 0x1005608: jal   0x10054b0 sw    a2, 16(sp)
+// 0x01005618: 0x1005618: jal   0x10054c0 sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -574,19 +574,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::T_73_10054b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::T_73_10054c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005610: 0x1005610: sh    v0, 0(s0)
+// 0x01005620: 0x1005620: sh    v0, 0(s0)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01005614: 0x1005614: addu  a0, s1, zero
+// 0x01005624: 0x1005624: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01005618: 0x1005618: jal   0x10054b0 addiu a1, zero, 1
+// 0x01005628: 0x1005628: jal   0x10054c0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -594,12 +594,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::T_73_10054b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::T_73_10054c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005620: 0x1005620: lw    a2, 16(sp)
+// 0x01005630: 0x1005630: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -608,23 +608,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01005624: 0x1005624: sll   zero, zero, 0
-// 0x01005628: 0x1005628: sh    v0, 0(a2)
+// 0x01005634: 0x1005634: sll   zero, zero, 0
+// 0x01005638: 0x1005638: sh    v0, 0(a2)
 	ldloc.3
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0100562c: 0x100562c: j	 0x1005638 addu  v0, zero, zero
+// 0x0100563c: 0x100563c: j	 0x1005648 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1005638
+	br L_1005648
 // --- basic block ---
-L_1005634:
-// 0x01005634: 0x1005634: addiu v0, zero, -1
+L_1005644:
+// 0x01005644: 0x1005644: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_1005638:
-// 0x01005638: 0x1005638: lw    ra, 36(sp)
-// 0x0100563c: 0x100563c: lw    s1, 32(sp)
+L_1005648:
+// 0x01005648: 0x1005648: lw    ra, 36(sp)
+// 0x0100564c: 0x100564c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -633,7 +633,7 @@ L_1005638:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01005640: 0x1005640: lw    s0, 28(sp)
+// 0x01005650: 0x1005650: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -642,7 +642,7 @@ L_1005638:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01005644: 0x1005644: jr    ra addiu sp, sp, 40
+// 0x01005654: 0x1005654: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -654,7 +654,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_line_speed_get_cross_time_at_1005678(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_line_speed_get_cross_time_at_1005688(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -689,26 +689,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01005678: 0x1005678: addiu sp, sp, -24
+// 0x01005688: 0x1005688: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100567c: 0x100567c: sw    ra, 20(sp)
-// 0x01005680: 0x1005680: jal   0x10054b0 sll   zero, zero, 0
+// 0x0100568c: 0x100568c: sw    ra, 20(sp)
+// 0x01005690: 0x1005690: jal   0x10054c0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::T_73_10054b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::T_73_10054c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01005688: 0x1005688: lw    ra, 20(sp)
-// 0x0100568c: 0x100568c: sll   zero, zero, 0
-// 0x01005690: 0x1005690: jr    ra addiu sp, sp, 24
+// 0x01005698: 0x1005698: lw    ra, 20(sp)
+// 0x0100569c: 0x100569c: sll   zero, zero, 0
+// 0x010056a0: 0x10056a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -720,7 +720,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_turns_in_square_1005698()
+.method public static int32 roadmap_turns_in_square_10056a8()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -734,7 +734,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01005698: 0x1005698: jr    ra addu  v0, zero, zero
+// 0x010056a8: 0x10056a8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -742,7 +742,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_turns_of_node_10056a0()
+.method public static int32 roadmap_turns_of_node_10056b0()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -756,7 +756,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010056a0: 0x10056a0: jr    ra addu  v0, zero, zero
+// 0x010056b0: 0x10056b0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -764,7 +764,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_dictionary_activate_10057dc(int32)
+.method public static int32 roadmap_dictionary_activate_10057ec(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -784,16 +784,16 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10057dc:
-// 0x010057dc: 0x10057dc: lui   v0, 0x20000
+L_10057ec:
+// 0x010057ec: 0x10057ec: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010057e0: 0x10057e0: jr    ra sw    a0, 31192(v0)
+// 0x010057f0: 0x10057f0: jr    ra sw    a0, 31656(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7798
+	ldc.i4 7914
 	add
 	ldloc.0
 	stelem.i4
@@ -802,7 +802,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_dictionary_get_10057e8(int32,int32)
+.method public static int32 roadmap_dictionary_get_10057f8(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 ra,int32[] mem)
@@ -825,7 +825,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010057e8: 0x10057e8: lw    v0, 32(a0)
+// 0x010057f8: 0x10057f8: lw    v0, 32(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -834,12 +834,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010057ec: 0x10057ec: andi  a1, a1, 65535
+// 0x010057fc: 0x10057fc: andi  a1, a1, 65535
 	ldloc.1
 	ldc.i4 65535
 	and
 	stloc.1
-// 0x010057f0: 0x10057f0: jr    ra addu  v0, v0, a1
+// 0x01005800: 0x1005800: jr    ra addu  v0, v0, a1
 	ldloc.2
 	ldloc.1
 	add
@@ -849,7 +849,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_dictionary_unmap_1005948(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_unmap_1005958(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -890,25 +890,25 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1005948:
-// 0x01005948: 0x1005948: lui   v0, 0x20000
+L_1005958:
+// 0x01005958: 0x1005958: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100594c: 0x100594c: lw    v1, 31192(v0)
+// 0x0100595c: 0x100595c: lw    v1, 31656(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7798
+	ldc.i4 7914
 	add
 	ldelem.i4
 	stloc 8
-// 0x01005950: 0x1005950: addiu sp, sp, -32
+// 0x01005960: 0x1005960: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01005954: 0x1005954: sw    s0, 20(sp)
+// 0x01005964: 0x1005964: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -917,8 +917,8 @@ L_1005948:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01005958: 0x1005958: sw    ra, 28(sp)
-// 0x0100595c: 0x100595c: sw    s1, 24(sp)
+// 0x01005968: 0x1005968: sw    ra, 28(sp)
+// 0x0100596c: 0x100596c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -927,26 +927,26 @@ L_1005948:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01005960: 0x1005960: bne   a0, v1, 0x1005994 addu  s0, a0, zero
+// 0x01005970: 0x1005970: bne   a0, v1, 0x10059a4 addu  s0, a0, zero
 	ldloc.1
 	ldloc 8
 	ldloc.1
 	stloc 7
-	bne.un L_1005994
+	bne.un L_10059a4
 // --- basic block ---
-// 0x01005968: 0x1005968: j	 0x1005994 sw    zero, 31192(v0)
+// 0x01005978: 0x1005978: j	 0x10059a4 sw    zero, 31656(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7798
+	ldc.i4 7914
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1005994
+	br L_10059a4
 // --- basic block ---
-L_1005970:
-// 0x01005970: 0x1005970: lw    v0, 40(s0)
+L_1005980:
+// 0x01005980: 0x1005980: lw    v0, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -955,7 +955,7 @@ L_1005970:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01005974: 0x1005974: lw    s1, 4(s0)
+// 0x01005984: 0x1005984: lw    s1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -964,13 +964,13 @@ L_1005970:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01005978: 0x1005978: beq   v0, zero, 0x1005988 addu  a0, v0, zero
+// 0x01005988: 0x1005988: beq   v0, zero, 0x1005998 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_1005988
+	brfalse L_1005998
 // --- basic block ---
-// 0x01005980: 0x1005980: jal   0x1000930 sll   zero, zero, 0
+// 0x01005990: 0x1005990: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -981,8 +981,8 @@ L_1005970:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1005988:
-// 0x01005988: 0x1005988: jal   0x1000930 addu  a0, s0, zero
+L_1005998:
+// 0x01005998: 0x1005998: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -995,16 +995,16 @@ L_1005988:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01005990: 0x1005990: addu  s0, s1, zero
+// 0x010059a0: 0x10059a0: addu  s0, s1, zero
 	ldloc 9
 	stloc 7
-L_1005994:
-// 0x01005994: 0x1005994: bne   s0, zero, 0x1005970 sll   zero, zero, 0
+L_10059a4:
+// 0x010059a4: 0x10059a4: bne   s0, zero, 0x1005980 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1005970
+	brtrue L_1005980
 // --- basic block ---
-// 0x0100599c: 0x100599c: lw    ra, 28(sp)
-// 0x010059a0: 0x10059a0: lw    s1, 24(sp)
+// 0x010059ac: 0x10059ac: lw    ra, 28(sp)
+// 0x010059b0: 0x10059b0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1013,7 +1013,7 @@ L_1005994:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010059a4: 0x10059a4: lw    s0, 20(sp)
+// 0x010059b4: 0x10059b4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1022,7 +1022,7 @@ L_1005994:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010059a8: 0x10059a8: jr    ra addiu sp, sp, 32
+// 0x010059b8: 0x10059b8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1034,7 +1034,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_dictionary_find_words_10059f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_find_words_1005a00(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s3,int32 s1,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -1099,12 +1099,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010059f0: 0x10059f0: addiu sp, sp, -64
+// 0x01005a00: 0x1005a00: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010059f4: 0x10059f4: sw    s2, 32(sp)
+// 0x01005a04: 0x1005a04: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1113,15 +1113,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010059f8: 0x10059f8: addiu s2, zero, 6
+// 0x01005a08: 0x1005a08: addiu s2, zero, 6
 	ldc.i4.6
 	stloc 9
-// 0x010059fc: 0x10059fc: mult  a1, s2
+// 0x01005a0c: 0x1005a0c: mult  a1, s2
 	ldloc.2
 	ldloc 9
 	mul
 	stloc 18
-// 0x01005a00: 0x1005a00: lw    v0, 8(a0)
+// 0x01005a10: 0x1005a10: lw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1130,7 +1130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01005a04: 0x1005a04: sw    s4, 40(sp)
+// 0x01005a14: 0x1005a14: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1139,7 +1139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01005a08: 0x1005a08: sw    s8, 56(sp)
+// 0x01005a18: 0x1005a18: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1148,7 +1148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01005a0c: 0x1005a0c: sw    s7, 52(sp)
+// 0x01005a1c: 0x1005a1c: sw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1157,7 +1157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01005a10: 0x1005a10: sw    s6, 48(sp)
+// 0x01005a20: 0x1005a20: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1166,7 +1166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01005a14: 0x1005a14: sw    s5, 44(sp)
+// 0x01005a24: 0x1005a24: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1175,7 +1175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01005a18: 0x1005a18: sw    s3, 36(sp)
+// 0x01005a28: 0x1005a28: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1184,7 +1184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01005a1c: 0x1005a1c: sw    s1, 28(sp)
+// 0x01005a2c: 0x1005a2c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1193,7 +1193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01005a20: 0x1005a20: sw    s0, 24(sp)
+// 0x01005a30: 0x1005a30: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1202,46 +1202,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01005a24: 0x1005a24: sw    ra, 60(sp)
-// 0x01005a28: 0x1005a28: addu  s5, a1, zero
+// 0x01005a34: 0x1005a34: sw    ra, 60(sp)
+// 0x01005a38: 0x1005a38: addu  s5, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01005a2c: 0x1005a2c: addu  s0, a0, zero
+// 0x01005a3c: 0x1005a3c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01005a30: 0x1005a30: mflo  lo
+// 0x01005a40: 0x1005a40: mflo  lo
 	ldloc 18
 	stloc 9
-// 0x01005a34: 0x1005a34: addu  s3, zero, zero
+// 0x01005a44: 0x1005a44: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01005a38: 0x1005a38: addu  s2, v0, s2
+// 0x01005a48: 0x1005a48: addu  s2, v0, s2
 	ldloc 6
 	ldloc 9
 	add
 	stloc 9
-// 0x01005a3c: 0x1005a3c: lhu   s4, 0(s2)
+// 0x01005a4c: 0x1005a4c: lhu   s4, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 12
-// 0x01005a40: 0x1005a40: addiu s8, zero, 1
+// 0x01005a50: 0x1005a50: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x01005a44: 0x1005a44: addiu s7, zero, 32
+// 0x01005a54: 0x1005a54: addiu s7, zero, 32
 	ldc.i4.s 32
 	stloc 15
-// 0x01005a48: 0x1005a48: addiu s6, zero, 2
+// 0x01005a58: 0x1005a58: addiu s6, zero, 2
 	ldc.i4.2
 	stloc 14
-// 0x01005a4c: 0x1005a4c: j	 0x1005ae8 sll   s1, s4, 2
+// 0x01005a5c: 0x1005a5c: j	 0x1005af8 sll   s1, s4, 2
 	ldloc 12
 	ldc.i4.2
 	shl
 	stloc 11
-	br L_1005ae8
+	br L_1005af8
 // --- basic block ---
-L_1005a54:
-// 0x01005a54: 0x1005a54: lw    v1, 16(s0)
+L_1005a64:
+// 0x01005a64: 0x1005a64: lw    v1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1250,61 +1250,61 @@ L_1005a54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01005a58: 0x1005a58: sll   zero, zero, 0
-// 0x01005a5c: 0x1005a5c: addu  v1, v1, s1
+// 0x01005a68: 0x1005a68: sll   zero, zero, 0
+// 0x01005a6c: 0x1005a6c: addu  v1, v1, s1
 	ldloc 7
 	ldloc 11
 	add
 	stloc 7
-// 0x01005a60: 0x1005a60: lbu   v0, 1(v1)
+// 0x01005a70: 0x1005a70: lbu   v0, 1(v1)
 	ldloc 7
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x01005a64: 0x1005a64: sll   zero, zero, 0
-// 0x01005a68: 0x1005a68: andi  v0, v0, 15
+// 0x01005a74: 0x1005a74: sll   zero, zero, 0
+// 0x01005a78: 0x1005a78: andi  v0, v0, 15
 	ldloc 6
 	ldc.i4.s 15
 	and
 	stloc 6
-// 0x01005a6c: 0x1005a6c: beq   v0, s8, 0x1005a84 sll   zero, zero, 0
+// 0x01005a7c: 0x1005a7c: beq   v0, s8, 0x1005a94 sll   zero, zero, 0
 	ldloc 6
 	ldloc 16
-	beq  L_1005a84
+	beq  L_1005a94
 // --- basic block ---
-// 0x01005a74: 0x1005a74: bne   v0, s6, 0x1005ad8 sll   zero, zero, 0
+// 0x01005a84: 0x1005a84: bne   v0, s6, 0x1005ae8 sll   zero, zero, 0
 	ldloc 6
 	ldloc 14
-	bne.un L_1005ad8
+	bne.un L_1005ae8
 // --- basic block ---
-// 0x01005a7c: 0x1005a7c: j	 0x1005ae4 addiu s3, s3, 1
+// 0x01005a8c: 0x1005a8c: j	 0x1005af4 addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	br L_1005ae4
+	br L_1005af4
 // --- basic block ---
-L_1005a84:
-// 0x01005a84: 0x1005a84: lb    v0, 0(v1)
+L_1005a94:
+// 0x01005a94: 0x1005a94: lb    v0, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01005a88: 0x1005a88: sll   zero, zero, 0
-// 0x01005a8c: 0x1005a8c: bne   v0, s7, 0x1005ab8 addu  a0, s0, zero
+// 0x01005a98: 0x1005a98: sll   zero, zero, 0
+// 0x01005a9c: 0x1005a9c: bne   v0, s7, 0x1005ac8 addu  a0, s0, zero
 	ldloc 6
 	ldloc 15
 	ldloc 8
 	stloc.1
-	bne.un L_1005ab8
+	bne.un L_1005ac8
 // --- basic block ---
-// 0x01005a94: 0x1005a94: lhu   v0, 44(s0)
+// 0x01005aa4: 0x1005aa4: lhu   v0, 44(s0)
 	ldloc 8
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01005a98: 0x1005a98: lw    v1, 40(s0)
+// 0x01005aa8: 0x1005aa8: lw    v1, 40(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1313,40 +1313,40 @@ L_1005a84:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01005a9c: 0x1005a9c: sll   v0, v0, 1
+// 0x01005aac: 0x1005aac: sll   v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	shl
 	stloc 6
-// 0x01005aa0: 0x1005aa0: addu  v0, v1, v0
+// 0x01005ab0: 0x1005ab0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x01005aa4: 0x1005aa4: sh    s5, 0(v0)
+// 0x01005ab4: 0x1005ab4: sh    s5, 0(v0)
 	ldloc 6
 	ldloc 13
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01005aa8: 0x1005aa8: lhu   v0, 44(s0)
+// 0x01005ab8: 0x1005ab8: lhu   v0, 44(s0)
 	ldloc 8
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01005aac: 0x1005aac: sll   zero, zero, 0
-// 0x01005ab0: 0x1005ab0: addiu v0, v0, 1
+// 0x01005abc: 0x1005abc: sll   zero, zero, 0
+// 0x01005ac0: 0x1005ac0: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01005ab4: 0x1005ab4: sh    v0, 44(s0)
+// 0x01005ac4: 0x1005ac4: sh    v0, 44(s0)
 	ldloc 8
 	ldc.i4.s 44
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_1005ab8:
-// 0x01005ab8: 0x1005ab8: lw    v0, 16(s0)
+L_1005ac8:
+// 0x01005ac8: 0x1005ac8: lw    v0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1355,19 +1355,19 @@ L_1005ab8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01005abc: 0x1005abc: sll   zero, zero, 0
-// 0x01005ac0: 0x1005ac0: addu  v0, v0, s1
+// 0x01005acc: 0x1005acc: sll   zero, zero, 0
+// 0x01005ad0: 0x1005ad0: addu  v0, v0, s1
 	ldloc 6
 	ldloc 11
 	add
 	stloc 6
-// 0x01005ac4: 0x1005ac4: lhu   a1, 2(v0)
+// 0x01005ad4: 0x1005ad4: lhu   a1, 2(v0)
 	ldloc 6
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01005ac8: 0x1005ac8: jal   0x10059f0 addiu s3, s3, 1
+// 0x01005ad8: 0x1005ad8: jal   0x1005a00 addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
@@ -1377,20 +1377,20 @@ L_1005ab8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_find_words_10059f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_find_words_1005a00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01005ad0: 0x1005ad0: j	 0x1005ae8 addiu s1, s1, 4
+// 0x01005ae0: 0x1005ae0: j	 0x1005af8 addiu s1, s1, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-	br L_1005ae8
+	br L_1005af8
 // --- basic block ---
-L_1005ad8:
-// 0x01005ad8: 0x1005ad8: jal   0x100449c sw    v0, 16(sp)
+L_1005ae8:
+// 0x01005ae8: 0x1005ae8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1409,70 +1409,70 @@ L_1005ad8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01005ae0: 0x1005ae0: addiu s3, s3, 1
+// 0x01005af0: 0x1005af0: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_1005ae4:
-// 0x01005ae4: 0x1005ae4: addiu s1, s1, 4
+L_1005af4:
+// 0x01005af4: 0x1005af4: addiu s1, s1, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-L_1005ae8:
-// 0x01005ae8: 0x1005ae8: lbu   a0, 2(s2)
+L_1005af8:
+// 0x01005af8: 0x1005af8: lbu   a0, 2(s2)
 	ldloc 9
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x01005aec: 0x1005aec: lhu   v0, 0(s2)
+// 0x01005afc: 0x1005afc: lhu   v0, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01005af0: 0x1005af0: addu  v1, s3, s4
+// 0x01005b00: 0x1005b00: addu  v1, s3, s4
 	ldloc 10
 	ldloc 12
 	add
 	stloc 7
-// 0x01005af4: 0x1005af4: addu  v0, a0, v0
+// 0x01005b04: 0x1005b04: addu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01005af8: 0x1005af8: lui   a1, 0x0
+// 0x01005b08: 0x1005b08: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01005afc: 0x1005afc: lui   a3, 0x0
+// 0x01005b0c: 0x1005b0c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01005b00: 0x1005b00: slt   v0, v1, v0
+// 0x01005b10: 0x1005b10: slt   v0, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x01005b04: 0x1005b04: addiu a0, zero, 5
+// 0x01005b14: 0x1005b14: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01005b08: 0x1005b08: addiu a1, a1, 23644
+// 0x01005b18: 0x1005b18: addiu a1, a1, 23644
 	ldloc.2
 	ldc.i4 23644
 	add
 	stloc.2
-// 0x01005b0c: 0x1005b0c: addiu a2, zero, 409
+// 0x01005b1c: 0x1005b1c: addiu a2, zero, 409
 	ldc.i4 409
 	stloc.3
-// 0x01005b10: 0x1005b10: bne   v0, zero, 0x1005a54 addiu a3, a3, 23676
+// 0x01005b20: 0x1005b20: bne   v0, zero, 0x1005a64 addiu a3, a3, 23676
 	ldloc 6
 	ldloc 4
 	ldc.i4 23676
 	add
 	stloc 4
-	brtrue L_1005a54
+	brtrue L_1005a64
 // --- basic block ---
-// 0x01005b18: 0x1005b18: lw    ra, 60(sp)
-// 0x01005b1c: 0x1005b1c: lw    s8, 56(sp)
+// 0x01005b28: 0x1005b28: lw    ra, 60(sp)
+// 0x01005b2c: 0x1005b2c: lw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1481,7 +1481,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01005b20: 0x1005b20: lw    s7, 52(sp)
+// 0x01005b30: 0x1005b30: lw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1490,7 +1490,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01005b24: 0x1005b24: lw    s6, 48(sp)
+// 0x01005b34: 0x1005b34: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1499,7 +1499,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01005b28: 0x1005b28: lw    s5, 44(sp)
+// 0x01005b38: 0x1005b38: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1508,7 +1508,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01005b2c: 0x1005b2c: lw    s4, 40(sp)
+// 0x01005b3c: 0x1005b3c: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1517,7 +1517,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01005b30: 0x1005b30: lw    s3, 36(sp)
+// 0x01005b40: 0x1005b40: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1526,7 +1526,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01005b34: 0x1005b34: lw    s2, 32(sp)
+// 0x01005b44: 0x1005b44: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1535,7 +1535,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01005b38: 0x1005b38: lw    s1, 28(sp)
+// 0x01005b48: 0x1005b48: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1544,7 +1544,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01005b3c: 0x1005b3c: lw    s0, 24(sp)
+// 0x01005b4c: 0x1005b4c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1553,7 +1553,7 @@ L_1005ae8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01005b40: 0x1005b40: jr    ra addiu sp, sp, 64
+// 0x01005b50: 0x1005b50: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1565,7 +1565,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_dictionary_walk_1005b48(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_walk_1005b58(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s5,int32 s6,int32 s3,int32 s0,int32 s1,int32 s2,int32 s4,int32 s7,int32 s8,int32 t0,int32 ra,int32 lo)
@@ -1633,12 +1633,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01005b48: 0x1005b48: addiu sp, sp, -64
+// 0x01005b58: 0x1005b58: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01005b4c: 0x1005b4c: sw    s5, 44(sp)
+// 0x01005b5c: 0x1005b5c: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1647,15 +1647,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01005b50: 0x1005b50: addiu s5, zero, 6
+// 0x01005b60: 0x1005b60: addiu s5, zero, 6
 	ldc.i4.6
 	stloc 8
-// 0x01005b54: 0x1005b54: mult  a1, s5
+// 0x01005b64: 0x1005b64: mult  a1, s5
 	ldloc.2
 	ldloc 8
 	mul
 	stloc 19
-// 0x01005b58: 0x1005b58: lw    v0, 8(a0)
+// 0x01005b68: 0x1005b68: lw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1664,7 +1664,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01005b5c: 0x1005b5c: sw    s2, 32(sp)
+// 0x01005b6c: 0x1005b6c: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1673,7 +1673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01005b60: 0x1005b60: sw    s3, 36(sp)
+// 0x01005b70: 0x1005b70: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1682,7 +1682,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01005b64: 0x1005b64: sw    s8, 56(sp)
+// 0x01005b74: 0x1005b74: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1691,7 +1691,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01005b68: 0x1005b68: sw    s7, 52(sp)
+// 0x01005b78: 0x1005b78: sw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1700,7 +1700,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01005b6c: 0x1005b6c: sw    s6, 48(sp)
+// 0x01005b7c: 0x1005b7c: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1709,7 +1709,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01005b70: 0x1005b70: sw    s4, 40(sp)
+// 0x01005b80: 0x1005b80: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1718,7 +1718,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01005b74: 0x1005b74: sw    s1, 28(sp)
+// 0x01005b84: 0x1005b84: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1727,7 +1727,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01005b78: 0x1005b78: sw    s0, 24(sp)
+// 0x01005b88: 0x1005b88: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1736,29 +1736,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01005b7c: 0x1005b7c: sw    ra, 60(sp)
-// 0x01005b80: 0x1005b80: addu  s0, a0, zero
+// 0x01005b8c: 0x1005b8c: sw    ra, 60(sp)
+// 0x01005b90: 0x1005b90: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01005b84: 0x1005b84: addu  s4, a2, zero
+// 0x01005b94: 0x1005b94: addu  s4, a2, zero
 	ldloc.3
 	stloc 14
-// 0x01005b88: 0x1005b88: mflo  lo
+// 0x01005b98: 0x1005b98: mflo  lo
 	ldloc 19
 	stloc 8
-// 0x01005b8c: 0x1005b8c: addu  s8, a3, zero
+// 0x01005b9c: 0x1005b9c: addu  s8, a3, zero
 	ldloc 4
 	stloc 16
-// 0x01005b90: 0x1005b90: addu  s5, v0, s5
+// 0x01005ba0: 0x1005ba0: addu  s5, v0, s5
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x01005b94: 0x1005b94: lhu   s2, 0(s5)
+// 0x01005ba4: 0x1005ba4: lhu   s2, 0(s5)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 13
-// 0x01005b98: 0x1005b98: lw    s7, 80(sp)
+// 0x01005ba8: 0x1005ba8: lw    s7, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1767,42 +1767,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01005b9c: 0x1005b9c: addu  s3, a2, s2
+// 0x01005bac: 0x1005bac: addu  s3, a2, s2
 	ldloc.3
 	ldloc 13
 	add
 	stloc 10
-// 0x01005ba0: 0x1005ba0: addu  s6, zero, zero
+// 0x01005bb0: 0x1005bb0: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01005ba4: 0x1005ba4: addiu s3, s3, 4
+// 0x01005bb4: 0x1005bb4: addiu s3, s3, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-// 0x01005ba8: 0x1005ba8: j	 0x1005c5c sll   s1, s2, 2
+// 0x01005bb8: 0x1005bb8: j	 0x1005c6c sll   s1, s2, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc 12
-	br L_1005c5c
+	br L_1005c6c
 // --- basic block ---
-L_1005bb0:
-// 0x01005bb0: 0x1005bb0: beq   s4, zero, 0x1005bc8 sll   zero, zero, 0
+L_1005bc0:
+// 0x01005bc0: 0x1005bc0: beq   s4, zero, 0x1005bd8 sll   zero, zero, 0
 	ldloc 14
-	brfalse L_1005bc8
+	brfalse L_1005bd8
 // --- basic block ---
-// 0x01005bb8: 0x1005bb8: lbu   v0, 0(s3)
+// 0x01005bc8: 0x1005bc8: lbu   v0, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x01005bbc: 0x1005bbc: sll   zero, zero, 0
-// 0x01005bc0: 0x1005bc0: beq   v0, zero, 0x1005c50 sll   zero, zero, 0
+// 0x01005bcc: 0x1005bcc: sll   zero, zero, 0
+// 0x01005bd0: 0x1005bd0: beq   v0, zero, 0x1005c60 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1005c50
+	brfalse L_1005c60
 // --- basic block ---
-L_1005bc8:
-// 0x01005bc8: 0x1005bc8: lw    v1, 16(s0)
+L_1005bd8:
+// 0x01005bd8: 0x1005bd8: lw    v1, 16(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1811,66 +1811,66 @@ L_1005bc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01005bcc: 0x1005bcc: lui   a1, 0x0
+// 0x01005bdc: 0x1005bdc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01005bd0: 0x1005bd0: addu  v1, v1, s1
+// 0x01005be0: 0x1005be0: addu  v1, v1, s1
 	ldloc 7
 	ldloc 12
 	add
 	stloc 7
-// 0x01005bd4: 0x1005bd4: lbu   v0, 1(v1)
+// 0x01005be4: 0x1005be4: lbu   v0, 1(v1)
 	ldloc 7
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x01005bd8: 0x1005bd8: lui   a3, 0x0
+// 0x01005be8: 0x1005be8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01005bdc: 0x1005bdc: andi  v0, v0, 15
+// 0x01005bec: 0x1005bec: andi  v0, v0, 15
 	ldloc 6
 	ldc.i4.s 15
 	and
 	stloc 6
-// 0x01005be0: 0x1005be0: addiu t0, zero, 1
+// 0x01005bf0: 0x1005bf0: addiu t0, zero, 1
 	ldc.i4.1
 	stloc 17
-// 0x01005be4: 0x1005be4: addiu a0, zero, 5
+// 0x01005bf4: 0x1005bf4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01005be8: 0x1005be8: addiu a1, a1, 23644
+// 0x01005bf8: 0x1005bf8: addiu a1, a1, 23644
 	ldloc.2
 	ldc.i4 23644
 	add
 	stloc.2
-// 0x01005bec: 0x1005bec: addiu a2, zero, 191
+// 0x01005bfc: 0x1005bfc: addiu a2, zero, 191
 	ldc.i4 191
 	stloc.3
-// 0x01005bf0: 0x1005bf0: beq   v0, t0, 0x1005c28 addiu a3, a3, 23676
+// 0x01005c00: 0x1005c00: beq   v0, t0, 0x1005c38 addiu a3, a3, 23676
 	ldloc 6
 	ldloc 17
 	ldloc 4
 	ldc.i4 23676
 	add
 	stloc 4
-	beq  L_1005c28
+	beq  L_1005c38
 // --- basic block ---
-// 0x01005bf8: 0x1005bf8: addiu t0, zero, 2
+// 0x01005c08: 0x1005c08: addiu t0, zero, 2
 	ldc.i4.2
 	stloc 17
-// 0x01005bfc: 0x1005bfc: bne   v0, t0, 0x1005c48 sll   zero, zero, 0
+// 0x01005c0c: 0x1005c0c: bne   v0, t0, 0x1005c58 sll   zero, zero, 0
 	ldloc 6
 	ldloc 17
-	bne.un L_1005c48
+	bne.un L_1005c58
 // --- basic block ---
-// 0x01005c04: 0x1005c04: lhu   a0, 2(v1)
+// 0x01005c14: 0x1005c14: lhu   a0, 2(v1)
 	ldloc 7
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01005c08: 0x1005c08: lw    a1, 32(s0)
+// 0x01005c18: 0x1005c18: lw    a1, 32(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1879,10 +1879,10 @@ L_1005bc8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01005c0c: 0x1005c0c: addu  a2, s7, zero
+// 0x01005c1c: 0x1005c1c: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x01005c10: 0x1005c10: jalr  s8 addu  a1, a1, a0
+// 0x01005c20: 0x1005c20: jalr  s8 addu  a1, a1, a0
 	ldloc 16
 	ldloc.2
 	ldloc.1
@@ -1898,34 +1898,34 @@ L_1005bc8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01005c18: 0x1005c18: bne   v0, zero, 0x1005c54 addiu s6, s6, 1
+// 0x01005c28: 0x1005c28: bne   v0, zero, 0x1005c64 addiu s6, s6, 1
 	ldloc 6
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brtrue L_1005c54
+	brtrue L_1005c64
 // --- basic block ---
-// 0x01005c20: 0x1005c20: j	 0x1005c78 sll   zero, zero, 0
-	br L_1005c78
+// 0x01005c30: 0x1005c30: j	 0x1005c88 sll   zero, zero, 0
+	br L_1005c88
 // --- basic block ---
-L_1005c28:
-// 0x01005c28: 0x1005c28: lhu   a1, 2(v1)
+L_1005c38:
+// 0x01005c38: 0x1005c38: lhu   a1, 2(v1)
 	ldloc 7
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01005c2c: 0x1005c2c: addu  a0, s0, zero
+// 0x01005c3c: 0x1005c3c: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01005c30: 0x1005c30: addu  a2, s4, zero
+// 0x01005c40: 0x1005c40: addu  a2, s4, zero
 	ldloc 14
 	stloc.3
-// 0x01005c34: 0x1005c34: addu  a3, s8, zero
+// 0x01005c44: 0x1005c44: addu  a3, s8, zero
 	ldloc 16
 	stloc 4
-// 0x01005c38: 0x1005c38: jal   0x1005b48 sw    s7, 16(sp)
+// 0x01005c48: 0x1005c48: jal   0x1005b58 sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1939,20 +1939,20 @@ L_1005c28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_walk_1005b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_walk_1005b58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01005c40: 0x1005c40: j	 0x1005c54 addiu s6, s6, 1
+// 0x01005c50: 0x1005c50: j	 0x1005c64 addiu s6, s6, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_1005c54
+	br L_1005c64
 // --- basic block ---
-L_1005c48:
-// 0x01005c48: 0x1005c48: jal   0x100449c sw    v0, 16(sp)
+L_1005c58:
+// 0x01005c58: 0x1005c58: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1971,56 +1971,56 @@ L_1005c48:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1005c50:
-// 0x01005c50: 0x1005c50: addiu s6, s6, 1
+L_1005c60:
+// 0x01005c60: 0x1005c60: addiu s6, s6, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1005c54:
-// 0x01005c54: 0x1005c54: addiu s3, s3, 1
+L_1005c64:
+// 0x01005c64: 0x1005c64: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01005c58: 0x1005c58: addiu s1, s1, 4
+// 0x01005c68: 0x1005c68: addiu s1, s1, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-L_1005c5c:
-// 0x01005c5c: 0x1005c5c: lbu   a0, 2(s5)
+L_1005c6c:
+// 0x01005c6c: 0x1005c6c: lbu   a0, 2(s5)
 	ldloc 8
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x01005c60: 0x1005c60: lhu   v0, 0(s5)
+// 0x01005c70: 0x1005c70: lhu   v0, 0(s5)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01005c64: 0x1005c64: addu  v1, s6, s2
+// 0x01005c74: 0x1005c74: addu  v1, s6, s2
 	ldloc 9
 	ldloc 13
 	add
 	stloc 7
-// 0x01005c68: 0x1005c68: addu  v0, a0, v0
+// 0x01005c78: 0x1005c78: addu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01005c6c: 0x1005c6c: slt   v0, v1, v0
+// 0x01005c7c: 0x1005c7c: slt   v0, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x01005c70: 0x1005c70: bne   v0, zero, 0x1005bb0 sll   zero, zero, 0
+// 0x01005c80: 0x1005c80: bne   v0, zero, 0x1005bc0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1005bb0
+	brtrue L_1005bc0
 // --- basic block ---
-L_1005c78:
-// 0x01005c78: 0x1005c78: lw    ra, 60(sp)
-// 0x01005c7c: 0x1005c7c: lw    s8, 56(sp)
+L_1005c88:
+// 0x01005c88: 0x1005c88: lw    ra, 60(sp)
+// 0x01005c8c: 0x1005c8c: lw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2029,7 +2029,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01005c80: 0x1005c80: lw    s7, 52(sp)
+// 0x01005c90: 0x1005c90: lw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2038,7 +2038,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01005c84: 0x1005c84: lw    s6, 48(sp)
+// 0x01005c94: 0x1005c94: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2047,7 +2047,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01005c88: 0x1005c88: lw    s5, 44(sp)
+// 0x01005c98: 0x1005c98: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2056,7 +2056,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01005c8c: 0x1005c8c: lw    s4, 40(sp)
+// 0x01005c9c: 0x1005c9c: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2065,7 +2065,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01005c90: 0x1005c90: lw    s3, 36(sp)
+// 0x01005ca0: 0x1005ca0: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2074,7 +2074,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01005c94: 0x1005c94: lw    s2, 32(sp)
+// 0x01005ca4: 0x1005ca4: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2083,7 +2083,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01005c98: 0x1005c98: lw    s1, 28(sp)
+// 0x01005ca8: 0x1005ca8: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2092,7 +2092,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01005c9c: 0x1005c9c: lw    s0, 24(sp)
+// 0x01005cac: 0x1005cac: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2101,7 +2101,7 @@ L_1005c78:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01005ca0: 0x1005ca0: jr    ra addiu sp, sp, 64
+// 0x01005cb0: 0x1005cb0: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2113,7 +2113,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_dictionary_get_all_results_1005ca8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_get_all_results_1005cb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra,int32 t0,int32 t1)
@@ -2154,7 +2154,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01005ca8: 0x1005ca8: lw    t1, 8(a0)
+// 0x01005cb8: 0x1005cb8: lw    t1, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2163,32 +2163,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01005cac: 0x1005cac: addiu sp, sp, -32
+// 0x01005cbc: 0x1005cbc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01005cb0: 0x1005cb0: addu  v0, a2, zero
+// 0x01005cc0: 0x1005cc0: addu  v0, a2, zero
 	ldloc.3
 	stloc 6
-// 0x01005cb4: 0x1005cb4: sw    ra, 28(sp)
-// 0x01005cb8: 0x1005cb8: addu  t0, a1, zero
+// 0x01005cc4: 0x1005cc4: sw    ra, 28(sp)
+// 0x01005cc8: 0x1005cc8: addu  t0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01005cbc: 0x1005cbc: lw    a2, 0(a0)
+// 0x01005ccc: 0x1005ccc: lw    a2, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01005cc0: 0x1005cc0: beq   t1, zero, 0x1005cf4 addu  v1, a3, zero
+// 0x01005cd0: 0x1005cd0: beq   t1, zero, 0x1005d04 addu  v1, a3, zero
 	ldloc 10
 	ldloc 4
 	stloc 7
-	brfalse L_1005cf4
+	brfalse L_1005d04
 // --- basic block ---
-// 0x01005cc8: 0x1005cc8: lw    a0, 12(a0)
+// 0x01005cd8: 0x1005cd8: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2197,7 +2197,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01005ccc: 0x1005ccc: lw    a1, 16(a2)
+// 0x01005cdc: 0x1005cdc: lw    a1, 16(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2206,23 +2206,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01005cd0: 0x1005cd0: sll   a0, a0, 2
+// 0x01005ce0: 0x1005ce0: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01005cd4: 0x1005cd4: addu  a0, a1, a0
+// 0x01005ce4: 0x1005ce4: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01005cd8: 0x1005cd8: lhu   a0, 2(a0)
+// 0x01005ce8: 0x1005ce8: lhu   a0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01005cdc: 0x1005cdc: lw    a1, 32(a2)
+// 0x01005cec: 0x1005cec: lw    a1, 32(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2231,10 +2231,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01005ce0: 0x1005ce0: addu  a2, a3, zero
+// 0x01005cf0: 0x1005cf0: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x01005ce4: 0x1005ce4: jalr  v0 addu  a1, a1, a0
+// 0x01005cf4: 0x1005cf4: jalr  v0 addu  a1, a1, a0
 	ldloc 6
 	ldloc.2
 	ldloc.1
@@ -2250,11 +2250,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01005cec: 0x1005cec: j	 0x1005d0c sll   zero, zero, 0
-	br L_1005d0c
+// 0x01005cfc: 0x1005cfc: j	 0x1005d1c sll   zero, zero, 0
+	br L_1005d1c
 // --- basic block ---
-L_1005cf4:
-// 0x01005cf4: 0x1005cf4: lw    a1, 4(a0)
+L_1005d04:
+// 0x01005d04: 0x1005d04: lw    a1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2263,16 +2263,16 @@ L_1005cf4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01005cf8: 0x1005cf8: addu  a3, v0, zero
+// 0x01005d08: 0x1005d08: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x01005cfc: 0x1005cfc: addu  a0, a2, zero
+// 0x01005d0c: 0x1005d0c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01005d00: 0x1005d00: addu  a2, t0, zero
+// 0x01005d10: 0x1005d10: addu  a2, t0, zero
 	ldloc 9
 	stloc.3
-// 0x01005d04: 0x1005d04: jal   0x1005b48 sw    v1, 16(sp)
+// 0x01005d14: 0x1005d14: jal   0x1005b58 sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2286,15 +2286,15 @@ L_1005cf4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_walk_1005b48(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_walk_1005b58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1005d0c:
-// 0x01005d0c: 0x1005d0c: lw    ra, 28(sp)
-// 0x01005d10: 0x1005d10: sll   zero, zero, 0
-// 0x01005d14: 0x1005d14: jr    ra addiu sp, sp, 32
+L_1005d1c:
+// 0x01005d1c: 0x1005d1c: lw    ra, 28(sp)
+// 0x01005d20: 0x1005d20: sll   zero, zero, 0
+// 0x01005d24: 0x1005d24: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2306,7 +2306,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2347,12 +2347,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01005d60: 0x1005d60: addiu sp, sp, -56
+// 0x01005d70: 0x1005d70: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01005d64: 0x1005d64: sw    s1, 48(sp)
+// 0x01005d74: 0x1005d74: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2361,7 +2361,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01005d68: 0x1005d68: sw    s0, 44(sp)
+// 0x01005d78: 0x1005d78: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2370,27 +2370,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01005d6c: 0x1005d6c: addu  s1, a2, zero
+// 0x01005d7c: 0x1005d7c: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x01005d70: 0x1005d70: addu  s0, a3, zero
+// 0x01005d80: 0x1005d80: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x01005d74: 0x1005d74: addiu v0, sp, 28
+// 0x01005d84: 0x1005d84: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x01005d78: 0x1005d78: addiu a2, zero, 1
+// 0x01005d88: 0x1005d88: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01005d7c: 0x1005d7c: addiu a3, sp, 24
+// 0x01005d8c: 0x1005d8c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01005d80: 0x1005d80: sw    ra, 52(sp)
-// 0x01005d84: 0x1005d84: jal   0x10031b0 sw    v0, 16(sp)
+// 0x01005d90: 0x1005d90: sw    ra, 52(sp)
+// 0x01005d94: 0x1005d94: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2409,29 +2409,29 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005d8c: 0x1005d8c: bne   v0, zero, 0x1005db4 lui   a1, 0x0
+// 0x01005d9c: 0x1005d9c: bne   v0, zero, 0x1005dc4 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1005db4
+	brtrue L_1005dc4
 // --- basic block ---
-// 0x01005d94: 0x1005d94: lui   a3, 0x0
+// 0x01005da4: 0x1005da4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01005d98: 0x1005d98: addiu a1, a1, 23644
+// 0x01005da8: 0x1005da8: addiu a1, a1, 23644
 	ldloc.2
 	ldc.i4 23644
 	add
 	stloc.2
-// 0x01005d9c: 0x1005d9c: addiu a3, a3, 23700
+// 0x01005dac: 0x1005dac: addiu a3, a3, 23700
 	ldloc 4
 	ldc.i4 23700
 	add
 	stloc 4
-// 0x01005da0: 0x1005da0: addiu a0, zero, 4
+// 0x01005db0: 0x1005db0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01005da4: 0x1005da4: jal   0x100449c addiu a2, zero, 297
+// 0x01005db4: 0x1005db4: jal   0x100449c addiu a2, zero, 297
 	ldc.i4 297
 	stloc.3
 	ldloc.0
@@ -2444,11 +2444,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005dac: 0x1005dac: j	 0x1005e24 sll   zero, zero, 0
-	br L_1005e24
+// 0x01005dbc: 0x1005dbc: j	 0x1005e34 sll   zero, zero, 0
+	br L_1005e34
 // --- basic block ---
-L_1005db4:
-// 0x01005db4: 0x1005db4: lw    v0, 24(sp)
+L_1005dc4:
+// 0x01005dc4: 0x1005dc4: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2457,12 +2457,12 @@ L_1005db4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01005db8: 0x1005db8: sll   zero, zero, 0
-// 0x01005dbc: 0x1005dbc: beq   v0, zero, 0x1005e24 sll   zero, zero, 0
+// 0x01005dc8: 0x1005dc8: sll   zero, zero, 0
+// 0x01005dcc: 0x1005dcc: beq   v0, zero, 0x1005e34 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1005e24
+	brfalse L_1005e34
 // --- basic block ---
-// 0x01005dc4: 0x1005dc4: jal   0x1000910 addiu a0, zero, 48
+// 0x01005dd4: 0x1005dd4: jal   0x1000910 addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
 	ldloc.0
@@ -2475,21 +2475,21 @@ L_1005db4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005dcc: 0x1005dcc: lui   a0, 0x0
+// 0x01005ddc: 0x1005ddc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01005dd0: 0x1005dd0: addu  a2, v0, zero
+// 0x01005de0: 0x1005de0: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01005dd4: 0x1005dd4: addiu a0, a0, 23644
+// 0x01005de4: 0x1005de4: addiu a0, a0, 23644
 	ldloc.1
 	ldc.i4 23644
 	add
 	stloc.1
-// 0x01005dd8: 0x1005dd8: addiu a1, zero, 308
+// 0x01005de8: 0x1005de8: addiu a1, zero, 308
 	ldc.i4 308
 	stloc.2
-// 0x01005ddc: 0x1005ddc: jal   0x1004a38 sw    v0, 32(sp)
+// 0x01005dec: 0x1005dec: jal   0x1004a48 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2503,12 +2503,12 @@ L_1005db4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005de4: 0x1005de4: lw    v0, 32(sp)
+// 0x01005df4: 0x1005df4: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2517,7 +2517,7 @@ L_1005db4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01005de8: 0x1005de8: lw    v1, 24(sp)
+// 0x01005df8: 0x1005df8: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2526,7 +2526,7 @@ L_1005db4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01005dec: 0x1005dec: sw    s0, 4(v0)
+// 0x01005dfc: 0x1005dfc: sw    s0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2535,7 +2535,7 @@ L_1005db4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01005df0: 0x1005df0: sw    v1, 32(v0)
+// 0x01005e00: 0x1005e00: sw    v1, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2544,7 +2544,7 @@ L_1005db4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01005df4: 0x1005df4: lw    v1, 28(sp)
+// 0x01005e04: 0x1005e04: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2553,14 +2553,14 @@ L_1005db4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01005df8: 0x1005df8: sw    s1, 0(v0)
+// 0x01005e08: 0x1005e08: sw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x01005dfc: 0x1005dfc: sw    v1, 36(v0)
+// 0x01005e0c: 0x1005e0c: sw    v1, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2569,7 +2569,7 @@ L_1005db4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01005e00: 0x1005e00: sw    zero, 8(v0)
+// 0x01005e10: 0x1005e10: sw    zero, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2578,7 +2578,7 @@ L_1005db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01005e04: 0x1005e04: sw    zero, 12(v0)
+// 0x01005e14: 0x1005e14: sw    zero, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2587,7 +2587,7 @@ L_1005db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01005e08: 0x1005e08: sw    zero, 16(v0)
+// 0x01005e18: 0x1005e18: sw    zero, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2596,7 +2596,7 @@ L_1005db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01005e0c: 0x1005e0c: sw    zero, 20(v0)
+// 0x01005e1c: 0x1005e1c: sw    zero, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2605,7 +2605,7 @@ L_1005db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01005e10: 0x1005e10: sw    zero, 24(v0)
+// 0x01005e20: 0x1005e20: sw    zero, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2614,7 +2614,7 @@ L_1005db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01005e14: 0x1005e14: sw    zero, 28(v0)
+// 0x01005e24: 0x1005e24: sw    zero, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2623,7 +2623,7 @@ L_1005db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01005e18: 0x1005e18: sw    zero, 40(v0)
+// 0x01005e28: 0x1005e28: sw    zero, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2632,21 +2632,21 @@ L_1005db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01005e1c: 0x1005e1c: sh    zero, 44(v0)
+// 0x01005e2c: 0x1005e2c: sh    zero, 44(v0)
 	ldloc 5
 	ldc.i4.s 44
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01005e20: 0x1005e20: addu  s0, v0, zero
+// 0x01005e30: 0x1005e30: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_1005e24:
-// 0x01005e24: 0x1005e24: lw    ra, 52(sp)
-// 0x01005e28: 0x1005e28: addu  v0, s0, zero
+L_1005e34:
+// 0x01005e34: 0x1005e34: lw    ra, 52(sp)
+// 0x01005e38: 0x1005e38: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01005e2c: 0x1005e2c: lw    s1, 48(sp)
+// 0x01005e3c: 0x1005e3c: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2655,7 +2655,7 @@ L_1005e24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01005e30: 0x1005e30: lw    s0, 44(sp)
+// 0x01005e40: 0x1005e40: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2664,7 +2664,7 @@ L_1005e24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01005e34: 0x1005e34: jr    ra addiu sp, sp, 56
+// 0x01005e44: 0x1005e44: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2676,7 +2676,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_dictionary_map_1005e3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_map_1005e4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32 v1,int32[] mem,int32 ra)
@@ -2714,28 +2714,28 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1005e3c:
-// 0x01005e3c: 0x1005e3c: lui   a2, 0x10000
+L_1005e4c:
+// 0x01005e4c: 0x1005e4c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01005e40: 0x1005e40: addiu sp, sp, -24
+// 0x01005e50: 0x1005e50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01005e44: 0x1005e44: addiu a2, a2, 2844
+// 0x01005e54: 0x1005e54: addiu a2, a2, 2840
 	ldloc.3
-	ldc.i4 2844
+	ldc.i4 2840
 	add
 	stloc.3
-// 0x01005e48: 0x1005e48: addu  a1, zero, zero
+// 0x01005e58: 0x1005e58: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01005e4c: 0x1005e4c: addu  a3, zero, zero
+// 0x01005e5c: 0x1005e5c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01005e50: 0x1005e50: sw    ra, 20(sp)
-// 0x01005e54: 0x1005e54: sw    s0, 16(sp)
+// 0x01005e60: 0x1005e60: sw    ra, 20(sp)
+// 0x01005e64: 0x1005e64: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2744,7 +2744,7 @@ L_1005e3c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01005e58: 0x1005e58: jal   0x1005d60 addu  s0, a0, zero
+// 0x01005e68: 0x1005e68: jal   0x1005d70 addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.0
@@ -2752,26 +2752,26 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005e60: 0x1005e60: lui   a2, 0x10000
+// 0x01005e70: 0x1005e70: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01005e64: 0x1005e64: addu  a0, s0, zero
+// 0x01005e74: 0x1005e74: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01005e68: 0x1005e68: addiu a2, a2, 13528
+// 0x01005e78: 0x1005e78: addiu a2, a2, 13524
 	ldloc.3
-	ldc.i4 13528
+	ldc.i4 13524
 	add
 	stloc.3
-// 0x01005e6c: 0x1005e6c: addu  a3, v0, zero
+// 0x01005e7c: 0x1005e7c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01005e70: 0x1005e70: jal   0x1005d60 addiu a1, zero, 1
+// 0x01005e80: 0x1005e80: jal   0x1005d70 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2779,26 +2779,26 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005e78: 0x1005e78: lui   a2, 0x0
+// 0x01005e88: 0x1005e88: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01005e7c: 0x1005e7c: addu  a0, s0, zero
+// 0x01005e8c: 0x1005e8c: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01005e80: 0x1005e80: addiu a2, a2, 23732
+// 0x01005e90: 0x1005e90: addiu a2, a2, 23732
 	ldloc.3
 	ldc.i4 23732
 	add
 	stloc.3
-// 0x01005e84: 0x1005e84: addu  a3, v0, zero
+// 0x01005e94: 0x1005e94: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01005e88: 0x1005e88: jal   0x1005d60 addiu a1, zero, 2
+// 0x01005e98: 0x1005e98: jal   0x1005d70 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -2806,26 +2806,26 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005e90: 0x1005e90: lui   a2, 0x20000
+// 0x01005ea0: 0x1005ea0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01005e94: 0x1005e94: addu  a0, s0, zero
+// 0x01005ea4: 0x1005ea4: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01005e98: 0x1005e98: addiu a2, a2, -11180
+// 0x01005ea8: 0x1005ea8: addiu a2, a2, -10716
 	ldloc.3
-	ldc.i4 -11180
+	ldc.i4 -10716
 	add
 	stloc.3
-// 0x01005e9c: 0x1005e9c: addu  a3, v0, zero
+// 0x01005eac: 0x1005eac: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01005ea0: 0x1005ea0: jal   0x1005d60 addiu a1, zero, 3
+// 0x01005eb0: 0x1005eb0: jal   0x1005d70 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -2833,26 +2833,26 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005ea8: 0x1005ea8: lui   a2, 0x0
+// 0x01005eb8: 0x1005eb8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01005eac: 0x1005eac: addu  a0, s0, zero
+// 0x01005ebc: 0x1005ebc: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01005eb0: 0x1005eb0: addiu a2, a2, 23744
+// 0x01005ec0: 0x1005ec0: addiu a2, a2, 23744
 	ldloc.3
 	ldc.i4 23744
 	add
 	stloc.3
-// 0x01005eb4: 0x1005eb4: addu  a3, v0, zero
+// 0x01005ec4: 0x1005ec4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01005eb8: 0x1005eb8: jal   0x1005d60 addiu a1, zero, 4
+// 0x01005ec8: 0x1005ec8: jal   0x1005d70 addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
 	ldloc.0
@@ -2860,26 +2860,26 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005ec0: 0x1005ec0: lui   a2, 0x10000
+// 0x01005ed0: 0x1005ed0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01005ec4: 0x1005ec4: addu  a0, s0, zero
+// 0x01005ed4: 0x1005ed4: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01005ec8: 0x1005ec8: addiu a2, a2, -26948
+// 0x01005ed8: 0x1005ed8: addiu a2, a2, -26948
 	ldloc.3
 	ldc.i4 -26948
 	add
 	stloc.3
-// 0x01005ecc: 0x1005ecc: addu  a3, v0, zero
+// 0x01005edc: 0x1005edc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01005ed0: 0x1005ed0: jal   0x1005d60 addiu a1, zero, 5
+// 0x01005ee0: 0x1005ee0: jal   0x1005d70 addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
 	ldloc.0
@@ -2887,26 +2887,26 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005ed8: 0x1005ed8: lui   a2, 0x0
+// 0x01005ee8: 0x1005ee8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01005edc: 0x1005edc: addu  a0, s0, zero
+// 0x01005eec: 0x1005eec: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01005ee0: 0x1005ee0: addiu a2, a2, 23752
+// 0x01005ef0: 0x1005ef0: addiu a2, a2, 23752
 	ldloc.3
 	ldc.i4 23752
 	add
 	stloc.3
-// 0x01005ee4: 0x1005ee4: addu  a3, v0, zero
+// 0x01005ef4: 0x1005ef4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01005ee8: 0x1005ee8: jal   0x1005d60 addiu a1, zero, 7
+// 0x01005ef8: 0x1005ef8: jal   0x1005d70 addiu a1, zero, 7
 	ldc.i4.7
 	stloc.2
 	ldloc.0
@@ -2914,26 +2914,26 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005ef0: 0x1005ef0: lui   a2, 0x0
+// 0x01005f00: 0x1005f00: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01005ef4: 0x1005ef4: addu  a0, s0, zero
+// 0x01005f04: 0x1005f04: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01005ef8: 0x1005ef8: addiu a2, a2, 23764
+// 0x01005f08: 0x1005f08: addiu a2, a2, 23764
 	ldloc.3
 	ldc.i4 23764
 	add
 	stloc.3
-// 0x01005efc: 0x1005efc: addu  a3, v0, zero
+// 0x01005f0c: 0x1005f0c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01005f00: 0x1005f00: jal   0x1005d60 addiu a1, zero, 6
+// 0x01005f10: 0x1005f10: jal   0x1005d70 addiu a1, zero, 6
 	ldc.i4.6
 	stloc.2
 	ldloc.0
@@ -2941,13 +2941,13 @@ L_1005e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d60(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_initialize_one_1005d70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005f08: 0x1005f08: lw    ra, 20(sp)
-// 0x01005f0c: 0x1005f0c: lw    s0, 16(sp)
+// 0x01005f18: 0x1005f18: lw    ra, 20(sp)
+// 0x01005f1c: 0x1005f1c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2956,7 +2956,7 @@ L_1005e3c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01005f10: 0x1005f10: jr    ra addiu sp, sp, 24
+// 0x01005f20: 0x1005f20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2968,7 +2968,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_dictionary_set_mask_1005f18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_set_mask_1005f28(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s7,int32 s1,int32 s2,int32 s3,int32 s4,int32 s6,int32 s8,int32 ra,int32 lo)
@@ -3033,12 +3033,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01005f18: 0x1005f18: addiu sp, sp, -72
+// 0x01005f28: 0x1005f28: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01005f1c: 0x1005f1c: sw    s4, 48(sp)
+// 0x01005f2c: 0x1005f2c: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3047,7 +3047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01005f20: 0x1005f20: sw    s3, 44(sp)
+// 0x01005f30: 0x1005f30: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3056,7 +3056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01005f24: 0x1005f24: sw    s2, 40(sp)
+// 0x01005f34: 0x1005f34: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3065,7 +3065,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01005f28: 0x1005f28: sw    s1, 36(sp)
+// 0x01005f38: 0x1005f38: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3074,8 +3074,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01005f2c: 0x1005f2c: sw    ra, 68(sp)
-// 0x01005f30: 0x1005f30: sw    s8, 64(sp)
+// 0x01005f3c: 0x1005f3c: sw    ra, 68(sp)
+// 0x01005f40: 0x1005f40: sw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3084,7 +3084,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01005f34: 0x1005f34: sw    s7, 60(sp)
+// 0x01005f44: 0x1005f44: sw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3093,7 +3093,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01005f38: 0x1005f38: sw    s6, 56(sp)
+// 0x01005f48: 0x1005f48: sw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3102,7 +3102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01005f3c: 0x1005f3c: sw    s5, 52(sp)
+// 0x01005f4c: 0x1005f4c: sw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3111,7 +3111,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01005f40: 0x1005f40: sw    s0, 32(sp)
+// 0x01005f50: 0x1005f50: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3120,10 +3120,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01005f44: 0x1005f44: addu  s2, a0, zero
+// 0x01005f54: 0x1005f54: addu  s2, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01005f48: 0x1005f48: lw    s1, 88(sp)
+// 0x01005f58: 0x1005f58: lw    s1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3132,7 +3132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01005f4c: 0x1005f4c: lw    s4, 92(sp)
+// 0x01005f5c: 0x1005f5c: lw    s4, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3141,75 +3141,75 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01005f50: 0x1005f50: j	 0x1005f5c addu  s3, a2, zero
+// 0x01005f60: 0x1005f60: j	 0x1005f6c addu  s3, a2, zero
 	ldloc.3
 	stloc 13
-	br L_1005f5c
+	br L_1005f6c
 // --- basic block ---
-L_1005f58:
-// 0x01005f58: 0x1005f58: sw    v1, 0(s4)
+L_1005f68:
+// 0x01005f68: 0x1005f68: sw    v1, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_1005f5c:
-// 0x01005f5c: 0x1005f5c: lw    s5, 0(s4)
+L_1005f6c:
+// 0x01005f6c: 0x1005f6c: lw    s5, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01005f60: 0x1005f60: lbu   v0, 3(a1)
+// 0x01005f70: 0x1005f70: lbu   v0, 3(a1)
 	ldloc.2
 	ldc.i4.3
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x01005f64: 0x1005f64: sll   zero, zero, 0
-// 0x01005f68: 0x1005f68: slt   v0, s5, v0
+// 0x01005f74: 0x1005f74: sll   zero, zero, 0
+// 0x01005f78: 0x1005f78: slt   v0, s5, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01005f6c: 0x1005f6c: bne   v0, zero, 0x1005f58 addiu v1, s5, 1
+// 0x01005f7c: 0x1005f7c: bne   v0, zero, 0x1005f68 addiu v1, s5, 1
 	ldloc 5
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_1005f58
+	brtrue L_1005f68
 // --- basic block ---
-// 0x01005f74: 0x1005f74: slt   v0, a3, s5
+// 0x01005f84: 0x1005f84: slt   v0, a3, s5
 	ldloc 4
 	ldloc 9
 	clt
 	stloc 5
-// 0x01005f78: 0x1005f78: bne   v0, zero, 0x100613c addu  v0, s3, s5
+// 0x01005f88: 0x1005f88: bne   v0, zero, 0x100614c addu  v0, s3, s5
 	ldloc 5
 	ldloc 13
 	ldloc 9
 	add
 	stloc 5
-	brtrue L_100613c
+	brtrue L_100614c
 // --- basic block ---
-// 0x01005f80: 0x1005f80: lb    a0, 0(v0)
+// 0x01005f90: 0x1005f90: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01005f84: 0x1005f84: lhu   s6, 0(a1)
+// 0x01005f94: 0x1005f94: lhu   s6, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 15
-// 0x01005f88: 0x1005f88: lbu   s8, 2(a1)
+// 0x01005f98: 0x1005f98: lbu   s8, 2(a1)
 	ldloc.2
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 16
-// 0x01005f8c: 0x1005f8c: lw    s7, 16(s2)
+// 0x01005f9c: 0x1005f9c: lw    s7, 16(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3218,7 +3218,7 @@ L_1005f5c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01005f90: 0x1005f90: jal   0x1000364 sw    a3, 24(sp)
+// 0x01005fa0: 0x1005fa0: jal   0x1000364 sw    a3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3233,32 +3233,32 @@ L_1005f5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01005f98: 0x1005f98: sll   v0, v0, 24
+// 0x01005fa8: 0x1005fa8: sll   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shl
 	stloc 5
-// 0x01005f9c: 0x1005f9c: sll   v1, s6, 2
+// 0x01005fac: 0x1005fac: sll   v1, s6, 2
 	ldloc 15
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01005fa0: 0x1005fa0: addu  s8, s8, s6
+// 0x01005fb0: 0x1005fb0: addu  s8, s8, s6
 	ldloc 16
 	ldloc 15
 	add
 	stloc 16
-// 0x01005fa4: 0x1005fa4: sra   v0, v0, 24
+// 0x01005fb4: 0x1005fb4: sra   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shr
 	stloc 5
-// 0x01005fa8: 0x1005fa8: addu  v1, s7, v1
+// 0x01005fb8: 0x1005fb8: addu  v1, s7, v1
 	ldloc 10
 	ldloc 7
 	add
 	stloc 7
-// 0x01005fac: 0x1005fac: lw    a3, 24(sp)
+// 0x01005fbc: 0x1005fbc: lw    a3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3267,91 +3267,91 @@ L_1005f5c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01005fb0: 0x1005fb0: j	 0x1005fc8 addu  a0, zero, zero
+// 0x01005fc0: 0x1005fc0: j	 0x1005fd8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_1005fc8
+	br L_1005fd8
 // --- basic block ---
-L_1005fb8:
-// 0x01005fb8: 0x1005fb8: lb    a1, 0(v1)
+L_1005fc8:
+// 0x01005fc8: 0x1005fc8: lb    a1, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01005fbc: 0x1005fbc: addiu a0, a0, 1
+// 0x01005fcc: 0x1005fcc: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01005fc0: 0x1005fc0: beq   a1, v0, 0x1005fe0 addiu v1, v1, 4
+// 0x01005fd0: 0x1005fd0: beq   a1, v0, 0x1005ff0 addiu v1, v1, 4
 	ldloc.2
 	ldloc 5
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	beq  L_1005fe0
+	beq  L_1005ff0
 // --- basic block ---
-L_1005fc8:
-// 0x01005fc8: 0x1005fc8: addu  s0, a0, s6
+L_1005fd8:
+// 0x01005fd8: 0x1005fd8: addu  s0, a0, s6
 	ldloc.1
 	ldloc 15
 	add
 	stloc 8
-// 0x01005fcc: 0x1005fcc: slt   a1, s0, s8
+// 0x01005fdc: 0x1005fdc: slt   a1, s0, s8
 	ldloc 8
 	ldloc 16
 	clt
 	stloc.2
-// 0x01005fd0: 0x1005fd0: bne   a1, zero, 0x1005fb8 sll   zero, zero, 0
+// 0x01005fe0: 0x1005fe0: bne   a1, zero, 0x1005fc8 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1005fb8
+	brtrue L_1005fc8
 // --- basic block ---
-// 0x01005fd8: 0x1005fd8: j	 0x1006140 addu  v0, zero, zero
+// 0x01005fe8: 0x1005fe8: j	 0x1006150 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1006140
+	br L_1006150
 // --- basic block ---
-L_1005fe0:
-// 0x01005fe0: 0x1005fe0: sll   v0, s0, 2
+L_1005ff0:
+// 0x01005ff0: 0x1005ff0: sll   v0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01005fe4: 0x1005fe4: addu  s7, s7, v0
+// 0x01005ff4: 0x1005ff4: addu  s7, s7, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x01005fe8: 0x1005fe8: lbu   v0, 1(s7)
+// 0x01005ff8: 0x1005ff8: lbu   v0, 1(s7)
 	ldloc 10
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x01005fec: 0x1005fec: addiu v1, zero, 1
+// 0x01005ffc: 0x1005ffc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01005ff0: 0x1005ff0: beq   v0, v1, 0x1006094 addiu v1, zero, 2
+// 0x01006000: 0x1006000: beq   v0, v1, 0x10060a4 addiu v1, zero, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	beq  L_1006094
+	beq  L_10060a4
 // --- basic block ---
-// 0x01005ff8: 0x1005ff8: bne   v0, v1, 0x1006120 lui   a1, 0x0
+// 0x01006008: 0x1006008: bne   v0, v1, 0x1006130 lui   a1, 0x0
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_1006120
+	bne.un L_1006130
 // --- basic block ---
-// 0x01006000: 0x1006000: lhu   v0, 2(s7)
+// 0x01006010: 0x1006010: lhu   v0, 2(s7)
 	ldloc 10
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01006004: 0x1006004: lw    v1, 24(s2)
+// 0x01006014: 0x1006014: lw    v1, 24(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3360,24 +3360,24 @@ L_1005fe0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01006008: 0x1006008: sll   v0, v0, 2
+// 0x01006018: 0x1006018: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100600c: 0x100600c: addu  v0, v1, v0
+// 0x0100601c: 0x100601c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01006010: 0x1006010: lw    v0, 0(v0)
+// 0x01006020: 0x1006020: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01006014: 0x1006014: lw    a1, 32(s2)
+// 0x01006024: 0x1006024: lw    a1, 32(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3386,29 +3386,29 @@ L_1005fe0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01006018: 0x1006018: sll   zero, zero, 0
-// 0x0100601c: 0x100601c: addu  a1, a1, v0
+// 0x01006028: 0x1006028: sll   zero, zero, 0
+// 0x0100602c: 0x100602c: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x01006020: 0x1006020: addu  v0, a1, a3
+// 0x01006030: 0x1006030: addu  v0, a1, a3
 	ldloc.2
 	ldloc 4
 	add
 	stloc 5
-// 0x01006024: 0x1006024: lb    v0, 0(v0)
+// 0x01006034: 0x1006034: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01006028: 0x1006028: sll   zero, zero, 0
-// 0x0100602c: 0x100602c: bne   v0, zero, 0x100613c addu  a0, s3, zero
+// 0x01006038: 0x1006038: sll   zero, zero, 0
+// 0x0100603c: 0x100603c: bne   v0, zero, 0x100614c addu  a0, s3, zero
 	ldloc 5
 	ldloc 13
 	stloc.1
-	brtrue L_100613c
+	brtrue L_100614c
 // --- basic block ---
-// 0x01006034: 0x1006034: jal   0x100039c addu  a2, a3, zero
+// 0x01006044: 0x1006044: jal   0x100039c addu  a2, a3, zero
 	ldloc 4
 	stloc.3
 	ldloc.1
@@ -3420,51 +3420,51 @@ L_1005fe0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100603c: 0x100603c: bne   v0, zero, 0x1006140 addu  v0, zero, zero
+// 0x0100604c: 0x100604c: bne   v0, zero, 0x1006150 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1006140
+	brtrue L_1006150
 // --- basic block ---
-// 0x01006044: 0x1006044: lw    v0, 0(s1)
+// 0x01006054: 0x1006054: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01006048: 0x1006048: sll   zero, zero, 0
-// 0x0100604c: 0x100604c: slt   v0, s0, v0
+// 0x01006058: 0x1006058: sll   zero, zero, 0
+// 0x0100605c: 0x100605c: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01006050: 0x1006050: bne   v0, zero, 0x1006074 lui   a1, 0x0
+// 0x01006060: 0x1006060: bne   v0, zero, 0x1006084 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1006074
+	brtrue L_1006084
 // --- basic block ---
-// 0x01006058: 0x1006058: lui   a3, 0x0
+// 0x01006068: 0x1006068: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100605c: 0x100605c: addiu a1, a1, 23644
+// 0x0100606c: 0x100606c: addiu a1, a1, 23644
 	ldloc.2
 	ldc.i4 23644
 	add
 	stloc.2
-// 0x01006060: 0x1006060: addiu a3, a3, 23776
+// 0x01006070: 0x1006070: addiu a3, a3, 23776
 	ldloc 4
 	ldc.i4 23776
 	add
 	stloc 4
-// 0x01006064: 0x1006064: addiu a0, zero, 5
+// 0x01006074: 0x1006074: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01006068: 0x1006068: addiu a2, zero, 912
+// 0x01006078: 0x1006078: addiu a2, zero, 912
 	ldc.i4 912
 	stloc.3
-// 0x0100606c: 0x100606c: jal   0x100449c sw    s0, 16(sp)
+// 0x0100607c: 0x100607c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3483,52 +3483,52 @@ L_1005fe0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1006074:
-// 0x01006074: 0x1006074: addu  s0, s1, s0
+L_1006084:
+// 0x01006084: 0x1006084: addu  s0, s1, s0
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x01006078: 0x1006078: lbu   v0, 4(s0)
+// 0x01006088: 0x1006088: lbu   v0, 4(s0)
 	ldloc 8
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0100607c: 0x100607c: sll   zero, zero, 0
-// 0x01006080: 0x1006080: bne   v0, zero, 0x100613c addiu v0, zero, 1
+// 0x0100608c: 0x100608c: sll   zero, zero, 0
+// 0x01006090: 0x1006090: bne   v0, zero, 0x100614c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_100613c
+	brtrue L_100614c
 // --- basic block ---
-// 0x01006088: 0x1006088: sb    v0, 4(s0)
+// 0x01006098: 0x1006098: sb    v0, 4(s0)
 	ldloc 8
 	ldc.i4.4
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0100608c: 0x100608c: j	 0x1006140 addiu v0, zero, 1
+// 0x0100609c: 0x100609c: j	 0x1006150 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1006140
+	br L_1006150
 // --- basic block ---
-L_1006094:
-// 0x01006094: 0x1006094: lhu   v1, 2(s7)
+L_10060a4:
+// 0x010060a4: 0x10060a4: lhu   v1, 2(s7)
 	ldloc 10
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01006098: 0x1006098: addiu v0, zero, 6
+// 0x010060a8: 0x10060a8: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x0100609c: 0x100609c: mult  v1, v0
+// 0x010060ac: 0x10060ac: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 18
-// 0x010060a0: 0x10060a0: lw    a1, 8(s2)
+// 0x010060b0: 0x10060b0: lw    a1, 8(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3537,25 +3537,25 @@ L_1006094:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010060a4: 0x10060a4: addiu s5, s5, 1
+// 0x010060b4: 0x10060b4: addiu s5, s5, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010060a8: 0x10060a8: sw    s5, 0(s4)
+// 0x010060b8: 0x10060b8: sw    s5, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010060ac: 0x10060ac: addu  a0, s2, zero
+// 0x010060bc: 0x10060bc: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x010060b0: 0x10060b0: addu  a2, s3, zero
+// 0x010060c0: 0x10060c0: addu  a2, s3, zero
 	ldloc 13
 	stloc.3
-// 0x010060b4: 0x10060b4: sw    s4, 20(sp)
+// 0x010060c4: 0x10060c4: sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3564,7 +3564,7 @@ L_1006094:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010060b8: 0x10060b8: sw    s1, 16(sp)
+// 0x010060c8: 0x10060c8: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3573,10 +3573,10 @@ L_1006094:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010060bc: 0x10060bc: mflo  lo
+// 0x010060cc: 0x10060cc: mflo  lo
 	ldloc 18
 	stloc 5
-// 0x010060c0: 0x10060c0: jal   0x1005f18 addu  a1, a1, v0
+// 0x010060d0: 0x10060d0: jal   0x1005f28 addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
@@ -3586,56 +3586,56 @@ L_1006094:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_set_mask_1005f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_set_mask_1005f28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010060c8: 0x10060c8: beq   v0, zero, 0x1006140 addu  v0, zero, zero
+// 0x010060d8: 0x10060d8: beq   v0, zero, 0x1006150 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1006140
+	brfalse L_1006150
 // --- basic block ---
-// 0x010060d0: 0x10060d0: lw    v0, 0(s1)
+// 0x010060e0: 0x10060e0: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010060d4: 0x10060d4: sll   zero, zero, 0
-// 0x010060d8: 0x10060d8: slt   v0, s0, v0
+// 0x010060e4: 0x10060e4: sll   zero, zero, 0
+// 0x010060e8: 0x10060e8: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010060dc: 0x10060dc: bne   v0, zero, 0x1006100 lui   a1, 0x0
+// 0x010060ec: 0x10060ec: bne   v0, zero, 0x1006110 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1006100
+	brtrue L_1006110
 // --- basic block ---
-// 0x010060e4: 0x10060e4: lui   a3, 0x0
+// 0x010060f4: 0x10060f4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010060e8: 0x10060e8: addiu a1, a1, 23644
+// 0x010060f8: 0x10060f8: addiu a1, a1, 23644
 	ldloc.2
 	ldc.i4 23644
 	add
 	stloc.2
-// 0x010060ec: 0x10060ec: addiu a3, a3, 23776
+// 0x010060fc: 0x10060fc: addiu a3, a3, 23776
 	ldloc 4
 	ldc.i4 23776
 	add
 	stloc 4
-// 0x010060f0: 0x10060f0: addiu a0, zero, 5
+// 0x01006100: 0x1006100: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010060f4: 0x10060f4: addiu a2, zero, 929
+// 0x01006104: 0x1006104: addiu a2, zero, 929
 	ldc.i4 929
 	stloc.3
-// 0x010060f8: 0x10060f8: jal   0x100449c sw    s0, 16(sp)
+// 0x01006108: 0x1006108: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3654,62 +3654,62 @@ L_1006094:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1006100:
-// 0x01006100: 0x1006100: addu  s0, s1, s0
+L_1006110:
+// 0x01006110: 0x1006110: addu  s0, s1, s0
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x01006104: 0x1006104: lbu   v1, 4(s0)
+// 0x01006114: 0x1006114: lbu   v1, 4(s0)
 	ldloc 8
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x01006108: 0x1006108: addiu a0, zero, 255
+// 0x01006118: 0x1006118: addiu a0, zero, 255
 	ldc.i4 255
 	stloc.1
-// 0x0100610c: 0x100610c: beq   v1, a0, 0x1006140 addiu v0, zero, 1
+// 0x0100611c: 0x100611c: beq   v1, a0, 0x1006150 addiu v0, zero, 1
 	ldloc 7
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	beq  L_1006140
+	beq  L_1006150
 // --- basic block ---
-// 0x01006114: 0x1006114: addiu v1, v1, 1
+// 0x01006124: 0x1006124: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01006118: 0x1006118: j	 0x1006140 sb    v1, 4(s0)
+// 0x01006128: 0x1006128: j	 0x1006150 sb    v1, 4(s0)
 	ldloc 8
 	ldc.i4.4
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1006140
+	br L_1006150
 // --- basic block ---
-L_1006120:
-// 0x01006120: 0x1006120: lui   a3, 0x0
+L_1006130:
+// 0x01006130: 0x1006130: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01006124: 0x1006124: addiu a1, a1, 23644
+// 0x01006134: 0x1006134: addiu a1, a1, 23644
 	ldloc.2
 	ldc.i4 23644
 	add
 	stloc.2
-// 0x01006128: 0x1006128: addiu a3, a3, 23824
+// 0x01006138: 0x1006138: addiu a3, a3, 23824
 	ldloc 4
 	ldc.i4 23824
 	add
 	stloc 4
-// 0x0100612c: 0x100612c: addiu a0, zero, 5
+// 0x0100613c: 0x100613c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01006130: 0x1006130: addiu a2, zero, 938
+// 0x01006140: 0x1006140: addiu a2, zero, 938
 	ldc.i4 938
 	stloc.3
-// 0x01006134: 0x1006134: jal   0x100449c sw    s3, 16(sp)
+// 0x01006144: 0x1006144: jal   0x100449c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3728,13 +3728,13 @@ L_1006120:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100613c:
-// 0x0100613c: 0x100613c: addu  v0, zero, zero
+L_100614c:
+// 0x0100614c: 0x100614c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1006140:
-// 0x01006140: 0x1006140: lw    ra, 68(sp)
-// 0x01006144: 0x1006144: lw    s8, 64(sp)
+L_1006150:
+// 0x01006150: 0x1006150: lw    ra, 68(sp)
+// 0x01006154: 0x1006154: lw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3743,7 +3743,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01006148: 0x1006148: lw    s7, 60(sp)
+// 0x01006158: 0x1006158: lw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3752,7 +3752,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100614c: 0x100614c: lw    s6, 56(sp)
+// 0x0100615c: 0x100615c: lw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3761,7 +3761,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01006150: 0x1006150: lw    s5, 52(sp)
+// 0x01006160: 0x1006160: lw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3770,7 +3770,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01006154: 0x1006154: lw    s4, 48(sp)
+// 0x01006164: 0x1006164: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3779,7 +3779,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01006158: 0x1006158: lw    s3, 44(sp)
+// 0x01006168: 0x1006168: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3788,7 +3788,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100615c: 0x100615c: lw    s2, 40(sp)
+// 0x0100616c: 0x100616c: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3797,7 +3797,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01006160: 0x1006160: lw    s1, 36(sp)
+// 0x01006170: 0x1006170: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3806,7 +3806,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01006164: 0x1006164: lw    s0, 32(sp)
+// 0x01006174: 0x1006174: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3815,7 +3815,7 @@ L_1006140:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01006168: 0x1006168: jr    ra addiu sp, sp, 72
+// 0x01006178: 0x1006178: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3827,7 +3827,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_dictionary_move_cursor_100642c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_move_cursor_100643c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s3,int32 s1,int32 s4,int32 s2,int32 ra,int32 lo)
@@ -3880,12 +3880,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100642c: 0x100642c: addiu sp, sp, -56
+// 0x0100643c: 0x100643c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01006430: 0x1006430: lw    v0, 8(a0)
+// 0x01006440: 0x1006440: lw    v0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3894,7 +3894,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01006434: 0x1006434: sw    s0, 32(sp)
+// 0x01006444: 0x1006444: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3903,16 +3903,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01006438: 0x1006438: addu  s0, a0, zero
+// 0x01006448: 0x1006448: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0100643c: 0x100643c: sll   a0, a1, 24
+// 0x0100644c: 0x100644c: sll   a0, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	shl
 	stloc.1
-// 0x01006440: 0x1006440: sw    ra, 52(sp)
-// 0x01006444: 0x1006444: sw    s4, 48(sp)
+// 0x01006450: 0x1006450: sw    ra, 52(sp)
+// 0x01006454: 0x1006454: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3921,7 +3921,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01006448: 0x1006448: sw    s3, 44(sp)
+// 0x01006458: 0x1006458: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3930,7 +3930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100644c: 0x100644c: sw    s2, 40(sp)
+// 0x0100645c: 0x100645c: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3939,7 +3939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01006450: 0x1006450: sw    s1, 36(sp)
+// 0x01006460: 0x1006460: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3948,15 +3948,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01006454: 0x1006454: bne   v0, zero, 0x100657c sra   a0, a0, 24
+// 0x01006464: 0x1006464: bne   v0, zero, 0x100658c sra   a0, a0, 24
 	ldloc 6
 	ldloc.1
 	ldc.i4.s 24
 	shr
 	stloc.1
-	brtrue L_100657c
+	brtrue L_100658c
 // --- basic block ---
-// 0x0100645c: 0x100645c: lw    v1, 4(s0)
+// 0x0100646c: 0x100646c: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3965,22 +3965,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01006460: 0x1006460: addiu v0, zero, 6
+// 0x01006470: 0x1006470: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 6
-// 0x01006464: 0x1006464: mult  v1, v0
+// 0x01006474: 0x1006474: mult  v1, v0
 	ldloc 7
 	ldloc 6
 	mul
 	stloc 14
-// 0x01006468: 0x1006468: lw    a1, 0(s0)
+// 0x01006478: 0x1006478: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0100646c: 0x100646c: lw    v1, 16(s0)
+// 0x0100647c: 0x100647c: lw    v1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3989,7 +3989,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01006470: 0x1006470: lw    a3, 8(a1)
+// 0x01006480: 0x1006480: lw    a3, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3998,7 +3998,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01006474: 0x1006474: lw    s3, 16(a1)
+// 0x01006484: 0x1006484: lw    s3, 16(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4007,49 +4007,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01006478: 0x1006478: addiu s2, v1, 1
+// 0x01006488: 0x1006488: addiu s2, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 12
-// 0x0100647c: 0x100647c: mflo  lo
+// 0x0100648c: 0x100648c: mflo  lo
 	ldloc 14
 	stloc 6
-// 0x01006480: 0x1006480: addu  v0, a3, v0
+// 0x01006490: 0x1006490: addu  v0, a3, v0
 	ldloc 4
 	ldloc 6
 	add
 	stloc 6
-// 0x01006484: 0x1006484: lbu   a1, 3(v0)
+// 0x01006494: 0x1006494: lbu   a1, 3(v0)
 	ldloc 6
 	ldc.i4.3
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x01006488: 0x1006488: lhu   s1, 0(v0)
+// 0x01006498: 0x1006498: lhu   s1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 10
-// 0x0100648c: 0x100648c: lbu   s4, 2(v0)
+// 0x0100649c: 0x100649c: lbu   s4, 2(v0)
 	ldloc 6
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 11
-// 0x01006490: 0x1006490: slt   v1, v1, a1
+// 0x010064a0: 0x10064a0: slt   v1, v1, a1
 	ldloc 7
 	ldloc.2
 	clt
 	stloc 7
-// 0x01006494: 0x1006494: beq   v1, zero, 0x10064a4 addu  s4, s4, s1
+// 0x010064a4: 0x10064a4: beq   v1, zero, 0x10064b4 addu  s4, s4, s1
 	ldloc 7
 	ldloc 11
 	ldloc 10
 	add
 	stloc 11
-	brfalse L_10064a4
+	brfalse L_10064b4
 // --- basic block ---
-// 0x0100649c: 0x100649c: j	 0x1006534 sw    s2, 16(s0)
+// 0x010064ac: 0x10064ac: j	 0x1006544 sw    s2, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4058,10 +4058,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-	br L_1006534
+	br L_1006544
 // --- basic block ---
-L_10064a4:
-// 0x010064a4: 0x10064a4: jal   0x1000364 sw    a2, 24(sp)
+L_10064b4:
+// 0x010064b4: 0x10064b4: jal   0x1000364 sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4076,7 +4076,7 @@ L_10064a4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010064ac: 0x10064ac: lw    a2, 24(sp)
+// 0x010064bc: 0x10064bc: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4085,27 +4085,27 @@ L_10064a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010064b0: 0x10064b0: sll   a0, s1, 2
+// 0x010064c0: 0x10064c0: sll   a0, s1, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x010064b4: 0x10064b4: addu  v1, a2, s1
+// 0x010064c4: 0x10064c4: addu  v1, a2, s1
 	ldloc.3
 	ldloc 10
 	add
 	stloc 7
-// 0x010064b8: 0x10064b8: sll   v0, v0, 24
+// 0x010064c8: 0x10064c8: sll   v0, v0, 24
 	ldloc 6
 	ldc.i4.s 24
 	shl
 	stloc 6
-// 0x010064bc: 0x10064bc: addu  s3, s3, a0
+// 0x010064cc: 0x10064cc: addu  s3, s3, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc 9
-// 0x010064c0: 0x10064c0: sw    s2, 16(s0)
+// 0x010064d0: 0x10064d0: sw    s2, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4114,84 +4114,84 @@ L_10064a4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010064c4: 0x10064c4: sra   v0, v0, 24
+// 0x010064d4: 0x10064d4: sra   v0, v0, 24
 	ldloc 6
 	ldc.i4.s 24
 	shr
 	stloc 6
-// 0x010064c8: 0x10064c8: addiu v1, v1, 4
+// 0x010064d8: 0x10064d8: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x010064cc: 0x10064cc: j	 0x100656c addu  a0, zero, zero
+// 0x010064dc: 0x10064dc: j	 0x100657c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_100656c
+	br L_100657c
 // --- basic block ---
-L_10064d4:
-// 0x010064d4: 0x10064d4: beq   a2, zero, 0x10064ec sll   zero, zero, 0
+L_10064e4:
+// 0x010064e4: 0x10064e4: beq   a2, zero, 0x10064fc sll   zero, zero, 0
 	ldloc.3
-	brfalse L_10064ec
+	brfalse L_10064fc
 // --- basic block ---
-// 0x010064dc: 0x10064dc: lbu   a3, 0(v1)
+// 0x010064ec: 0x10064ec: lbu   a3, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 4
-// 0x010064e0: 0x10064e0: sll   zero, zero, 0
-// 0x010064e4: 0x10064e4: beq   a3, zero, 0x1006560 sll   zero, zero, 0
+// 0x010064f0: 0x10064f0: sll   zero, zero, 0
+// 0x010064f4: 0x10064f4: beq   a3, zero, 0x1006570 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1006560
+	brfalse L_1006570
 // --- basic block ---
-L_10064ec:
-// 0x010064ec: 0x10064ec: lb    a3, 0(s3)
+L_10064fc:
+// 0x010064fc: 0x10064fc: lb    a3, 0(s3)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x010064f0: 0x10064f0: sll   zero, zero, 0
-// 0x010064f4: 0x10064f4: bne   a3, v0, 0x1006564 addiu a0, a0, 1
+// 0x01006500: 0x1006500: sll   zero, zero, 0
+// 0x01006504: 0x1006504: bne   a3, v0, 0x1006574 addiu a0, a0, 1
 	ldloc 4
 	ldloc 6
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_1006564
+	bne.un L_1006574
 // --- basic block ---
-// 0x010064fc: 0x10064fc: lbu   v0, 1(s3)
+// 0x0100650c: 0x100650c: lbu   v0, 1(s3)
 	ldloc 9
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x01006500: 0x1006500: addiu v1, zero, 1
+// 0x01006510: 0x1006510: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01006504: 0x1006504: andi  v0, v0, 15
+// 0x01006514: 0x1006514: andi  v0, v0, 15
 	ldloc 6
 	ldc.i4.s 15
 	and
 	stloc 6
-// 0x01006508: 0x1006508: beq   v0, v1, 0x1006528 addiu a0, a0, -1
+// 0x01006518: 0x1006518: beq   v0, v1, 0x1006538 addiu a0, a0, -1
 	ldloc 6
 	ldloc 7
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-	beq  L_1006528
+	beq  L_1006538
 // --- basic block ---
-// 0x01006510: 0x1006510: addiu a0, zero, 2
+// 0x01006520: 0x1006520: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01006514: 0x1006514: bne   v0, a0, 0x100653c lui   a3, 0x0
+// 0x01006524: 0x1006524: bne   v0, a0, 0x100654c lui   a3, 0x0
 	ldloc 6
 	ldloc.1
 	ldc.i4.s 0
 	stloc 4
-	bne.un L_100653c
+	bne.un L_100654c
 // --- basic block ---
-// 0x0100651c: 0x100651c: sw    a1, 12(s0)
+// 0x0100652c: 0x100652c: sw    a1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4200,7 +4200,7 @@ L_10064ec:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01006520: 0x1006520: j	 0x1006534 sw    v1, 8(s0)
+// 0x01006530: 0x1006530: j	 0x1006544 sw    v1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4209,16 +4209,16 @@ L_10064ec:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1006534
+	br L_1006544
 // --- basic block ---
-L_1006528:
-// 0x01006528: 0x1006528: lhu   v0, 2(s3)
+L_1006538:
+// 0x01006538: 0x1006538: lhu   v0, 2(s3)
 	ldloc 9
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x0100652c: 0x100652c: sw    zero, 8(s0)
+// 0x0100653c: 0x100653c: sw    zero, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4227,7 +4227,7 @@ L_1006528:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01006530: 0x1006530: sw    v0, 4(s0)
+// 0x01006540: 0x1006540: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4236,33 +4236,33 @@ L_1006528:
 	add
 	ldloc 6
 	stelem.i4
-L_1006534:
-// 0x01006534: 0x1006534: j	 0x1006580 addiu v0, zero, 1
+L_1006544:
+// 0x01006544: 0x1006544: j	 0x1006590 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_1006580
+	br L_1006590
 // --- basic block ---
-L_100653c:
-// 0x0100653c: 0x100653c: lui   a1, 0x0
+L_100654c:
+// 0x0100654c: 0x100654c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01006540: 0x1006540: addiu a1, a1, 23644
+// 0x01006550: 0x1006550: addiu a1, a1, 23644
 	ldloc.2
 	ldc.i4 23644
 	add
 	stloc.2
-// 0x01006544: 0x1006544: addiu a3, a3, 23676
+// 0x01006554: 0x1006554: addiu a3, a3, 23676
 	ldloc 4
 	ldc.i4 23676
 	add
 	stloc 4
-// 0x01006548: 0x1006548: addiu a0, zero, 5
+// 0x01006558: 0x1006558: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100654c: 0x100654c: addiu a2, zero, 536
+// 0x0100655c: 0x100655c: addiu a2, zero, 536
 	ldc.i4 536
 	stloc.3
-// 0x01006550: 0x1006550: jal   0x100449c sw    v0, 16(sp)
+// 0x01006560: 0x1006560: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4281,50 +4281,50 @@ L_100653c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01006558: 0x1006558: j	 0x1006580 addiu v0, zero, 1
+// 0x01006568: 0x1006568: j	 0x1006590 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_1006580
+	br L_1006590
 // --- basic block ---
-L_1006560:
-// 0x01006560: 0x1006560: addiu a0, a0, 1
+L_1006570:
+// 0x01006570: 0x1006570: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-L_1006564:
-// 0x01006564: 0x1006564: addiu v1, v1, 1
+L_1006574:
+// 0x01006574: 0x1006574: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01006568: 0x1006568: addiu s3, s3, 4
+// 0x01006578: 0x1006578: addiu s3, s3, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_100656c:
-// 0x0100656c: 0x100656c: addu  a1, a0, s1
+L_100657c:
+// 0x0100657c: 0x100657c: addu  a1, a0, s1
 	ldloc.1
 	ldloc 10
 	add
 	stloc.2
-// 0x01006570: 0x1006570: slt   a3, a1, s4
+// 0x01006580: 0x1006580: slt   a3, a1, s4
 	ldloc.2
 	ldloc 11
 	clt
 	stloc 4
-// 0x01006574: 0x1006574: bne   a3, zero, 0x10064d4 sll   zero, zero, 0
+// 0x01006584: 0x1006584: bne   a3, zero, 0x10064e4 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_10064d4
+	brtrue L_10064e4
 // --- basic block ---
-L_100657c:
-// 0x0100657c: 0x100657c: addu  v0, zero, zero
+L_100658c:
+// 0x0100658c: 0x100658c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1006580:
-// 0x01006580: 0x1006580: lw    ra, 52(sp)
-// 0x01006584: 0x1006584: lw    s4, 48(sp)
+L_1006590:
+// 0x01006590: 0x1006590: lw    ra, 52(sp)
+// 0x01006594: 0x1006594: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4333,7 +4333,7 @@ L_1006580:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01006588: 0x1006588: lw    s3, 44(sp)
+// 0x01006598: 0x1006598: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4342,7 +4342,7 @@ L_1006580:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100658c: 0x100658c: lw    s2, 40(sp)
+// 0x0100659c: 0x100659c: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4351,7 +4351,7 @@ L_1006580:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01006590: 0x1006590: lw    s1, 36(sp)
+// 0x010065a0: 0x10065a0: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4360,7 +4360,7 @@ L_1006580:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01006594: 0x1006594: lw    s0, 32(sp)
+// 0x010065a4: 0x10065a4: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4369,7 +4369,7 @@ L_1006580:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01006598: 0x1006598: jr    ra addiu sp, sp, 56
+// 0x010065a8: 0x10065a8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4381,7 +4381,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 ra,int32 v1)
@@ -4422,15 +4422,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006ba0: 0x1006ba0: addiu sp, sp, -32
+// 0x01006bb0: 0x1006bb0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01006ba4: 0x1006ba4: lui   v0, 0x20000
+// 0x01006bb4: 0x1006bb4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01006ba8: 0x1006ba8: sw    s1, 24(sp)
+// 0x01006bb8: 0x1006bb8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4439,7 +4439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01006bac: 0x1006bac: sw    s0, 20(sp)
+// 0x01006bbc: 0x1006bbc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4448,40 +4448,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01006bb0: 0x1006bb0: sw    ra, 28(sp)
-// 0x01006bb4: 0x1006bb4: lw    s0, 31192(v0)
+// 0x01006bc0: 0x1006bc0: sw    ra, 28(sp)
+// 0x01006bc4: 0x1006bc4: lw    s0, 31656(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7798
+	ldc.i4 7914
 	add
 	ldelem.i4
 	stloc 6
-// 0x01006bb8: 0x1006bb8: j	 0x1006bdc addu  s1, a0, zero
+// 0x01006bc8: 0x1006bc8: j	 0x1006bec addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-	br L_1006bdc
+	br L_1006bec
 // --- basic block ---
-L_1006bc0:
-// 0x01006bc0: 0x1006bc0: lw    a0, 0(s0)
+L_1006bd0:
+// 0x01006bd0: 0x1006bd0: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01006bc4: 0x1006bc4: jal   0x1001b14 sll   zero, zero, 0
+// 0x01006bd4: 0x1006bd4: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01006bcc: 0x1006bcc: beq   v0, zero, 0x1006be4 sll   zero, zero, 0
+// 0x01006bdc: 0x1006bdc: beq   v0, zero, 0x1006bf4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1006be4
+	brfalse L_1006bf4
 // --- basic block ---
-// 0x01006bd4: 0x1006bd4: lw    s0, 4(s0)
+// 0x01006be4: 0x1006be4: lw    s0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4490,20 +4490,20 @@ L_1006bc0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01006bd8: 0x1006bd8: sll   zero, zero, 0
-L_1006bdc:
-// 0x01006bdc: 0x1006bdc: bne   s0, zero, 0x1006bc0 addu  a1, s1, zero
+// 0x01006be8: 0x1006be8: sll   zero, zero, 0
+L_1006bec:
+// 0x01006bec: 0x1006bec: bne   s0, zero, 0x1006bd0 addu  a1, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brtrue L_1006bc0
+	brtrue L_1006bd0
 // --- basic block ---
-L_1006be4:
-// 0x01006be4: 0x1006be4: lw    ra, 28(sp)
-// 0x01006be8: 0x1006be8: addu  v0, s0, zero
+L_1006bf4:
+// 0x01006bf4: 0x1006bf4: lw    ra, 28(sp)
+// 0x01006bf8: 0x1006bf8: addu  v0, s0, zero
 	ldloc 6
 	stloc 7
-// 0x01006bec: 0x1006bec: lw    s1, 24(sp)
+// 0x01006bfc: 0x1006bfc: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4512,7 +4512,7 @@ L_1006be4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01006bf0: 0x1006bf0: lw    s0, 20(sp)
+// 0x01006c00: 0x1006c00: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4521,7 +4521,7 @@ L_1006be4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01006bf4: 0x1006bf4: jr    ra addiu sp, sp, 32
+// 0x01006c04: 0x1006c04: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4533,7 +4533,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_math_set_min_zoom_1006bfc(int32)
+.method public static int32 roadmap_math_set_min_zoom_1006c0c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -4553,10 +4553,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006bfc: 0x1006bfc: lui   v0, 0x0
+// 0x01006c0c: 0x1006c0c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01006c00: 0x1006c00: jr    ra sw    a0, 508(v0)
+// 0x01006c10: 0x1006c10: jr    ra sw    a0, 508(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4570,7 +4570,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_math_trigonometry_1006c08(int32,int32,int32,int32)
+.method public static int32 roadmap_math_trigonometry_1006c18(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 hi,int32 lo,int32 ra)
@@ -4608,10 +4608,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006c08: 0x1006c08: addiu v0, zero, 90
+// 0x01006c18: 0x1006c18: addiu v0, zero, 90
 	ldc.i4.s 90
 	stloc 4
-// 0x01006c0c: 0x1006c0c: div   a0, v0
+// 0x01006c1c: 0x1006c1c: div   a0, v0
 	ldloc.0
 	ldloc 4
 	ldloc.0
@@ -4620,51 +4620,51 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	rem
 	stloc 7
-// 0x01006c10: 0x1006c10: mfhi  hi
+// 0x01006c20: 0x1006c20: mfhi  hi
 	ldloc 7
 	stloc 4
-L_1006c14:
-// 0x01006c14: 0x1006c14: bltz  v0, 0x1006c14 addiu v0, v0, 90
+L_1006c24:
+// 0x01006c24: 0x1006c24: bltz  v0, 0x1006c24 addiu v0, v0, 90
 	ldloc 4
 	ldloc 4
 	ldc.i4.s 90
 	add
 	stloc 4
 	ldc.i4.s 0
-	blt L_1006c14
+	blt L_1006c24
 // --- basic block ---
-// 0x01006c1c: 0x1006c1c: addiu v0, v0, -90
+// 0x01006c2c: 0x1006c2c: addiu v0, v0, -90
 	ldloc 4
 	ldc.i4.s -90
 	add
 	stloc 4
-// 0x01006c20: 0x1006c20: lui   v1, 0x20000
+// 0x01006c30: 0x1006c30: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01006c24: 0x1006c24: slti  a3, v0, 46
+// 0x01006c34: 0x1006c34: slti  a3, v0, 46
 	ldloc 4
 	ldc.i4.s 46
 	clt
 	stloc.3
-// 0x01006c28: 0x1006c28: beq   a3, zero, 0x1006c48 addiu v1, v1, 24376
+// 0x01006c38: 0x1006c38: beq   a3, zero, 0x1006c58 addiu v1, v1, 24840
 	ldloc.3
 	ldloc 5
-	ldc.i4 24376
+	ldc.i4 24840
 	add
 	stloc 5
-	brfalse L_1006c48
+	brfalse L_1006c58
 // --- basic block ---
-// 0x01006c30: 0x1006c30: sll   v0, v0, 3
+// 0x01006c40: 0x1006c40: sll   v0, v0, 3
 	ldloc 4
 	ldc.i4.3
 	shl
 	stloc 4
-// 0x01006c34: 0x1006c34: addu  v0, v1, v0
+// 0x01006c44: 0x1006c44: addu  v0, v1, v0
 	ldloc 5
 	ldloc 4
 	add
 	stloc 4
-// 0x01006c38: 0x1006c38: lw    v1, 4(v0)
+// 0x01006c48: 0x1006c48: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4673,43 +4673,43 @@ L_1006c14:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01006c3c: 0x1006c3c: lw    v0, 0(v0)
+// 0x01006c4c: 0x1006c4c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01006c40: 0x1006c40: j	 0x1006c60 sll   zero, zero, 0
-	br L_1006c60
+// 0x01006c50: 0x1006c50: j	 0x1006c70 sll   zero, zero, 0
+	br L_1006c70
 // --- basic block ---
-L_1006c48:
-// 0x01006c48: 0x1006c48: addiu a3, zero, 90
+L_1006c58:
+// 0x01006c58: 0x1006c58: addiu a3, zero, 90
 	ldc.i4.s 90
 	stloc.3
-// 0x01006c4c: 0x1006c4c: subu  v0, a3, v0
+// 0x01006c5c: 0x1006c5c: subu  v0, a3, v0
 	ldloc.3
 	ldloc 4
 	sub
 	stloc 4
-// 0x01006c50: 0x1006c50: sll   v0, v0, 3
+// 0x01006c60: 0x1006c60: sll   v0, v0, 3
 	ldloc 4
 	ldc.i4.3
 	shl
 	stloc 4
-// 0x01006c54: 0x1006c54: addu  v0, v1, v0
+// 0x01006c64: 0x1006c64: addu  v0, v1, v0
 	ldloc 5
 	ldloc 4
 	add
 	stloc 4
-// 0x01006c58: 0x1006c58: lw    v1, 0(v0)
+// 0x01006c68: 0x1006c68: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01006c5c: 0x1006c5c: lw    v0, 4(v0)
+// 0x01006c6c: 0x1006c6c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4718,25 +4718,25 @@ L_1006c48:
 	add
 	ldelem.i4
 	stloc 4
-L_1006c60:
-// 0x01006c60: 0x1006c60: bltz  a0, 0x1006c60 addiu a0, a0, 360
+L_1006c70:
+// 0x01006c70: 0x1006c70: bltz  a0, 0x1006c70 addiu a0, a0, 360
 	ldloc.0
 	ldloc.0
 	ldc.i4 360
 	add
 	stloc.0
 	ldc.i4.s 0
-	blt L_1006c60
+	blt L_1006c70
 // --- basic block ---
-// 0x01006c68: 0x1006c68: addiu a0, a0, -360
+// 0x01006c78: 0x1006c78: addiu a0, a0, -360
 	ldloc.0
 	ldc.i4 -360
 	add
 	stloc.0
-// 0x01006c6c: 0x1006c6c: addiu a3, zero, 90
+// 0x01006c7c: 0x1006c7c: addiu a3, zero, 90
 	ldc.i4.s 90
 	stloc.3
-// 0x01006c70: 0x1006c70: div   a0, a3
+// 0x01006c80: 0x1006c80: div   a0, a3
 	ldloc.0
 	ldloc.3
 	ldloc.0
@@ -4745,67 +4745,67 @@ L_1006c60:
 	stloc 8
 	rem
 	stloc 7
-// 0x01006c74: 0x1006c74: addiu a3, zero, 1
+// 0x01006c84: 0x1006c84: addiu a3, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01006c78: 0x1006c78: mflo  lo
+// 0x01006c88: 0x1006c88: mflo  lo
 	ldloc 8
 	stloc.0
-// 0x01006c7c: 0x1006c7c: andi  a0, a0, 3
+// 0x01006c8c: 0x1006c8c: andi  a0, a0, 3
 	ldloc.0
 	ldc.i4.3
 	and
 	stloc.0
-// 0x01006c80: 0x1006c80: beq   a0, a3, 0x1006ca0 addiu a3, zero, 2
+// 0x01006c90: 0x1006c90: beq   a0, a3, 0x1006cb0 addiu a3, zero, 2
 	ldloc.0
 	ldloc.3
 	ldc.i4.2
 	stloc.3
-	beq  L_1006ca0
+	beq  L_1006cb0
 // --- basic block ---
-// 0x01006c88: 0x1006c88: beq   a0, a3, 0x1006ca8 addiu a3, zero, 3
+// 0x01006c98: 0x1006c98: beq   a0, a3, 0x1006cb8 addiu a3, zero, 3
 	ldloc.0
 	ldloc.3
 	ldc.i4.3
 	stloc.3
-	beq  L_1006ca8
+	beq  L_1006cb8
 // --- basic block ---
-// 0x01006c90: 0x1006c90: bne   a0, a3, 0x1006cb0 sll   zero, zero, 0
+// 0x01006ca0: 0x1006ca0: bne   a0, a3, 0x1006cc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.3
-	bne.un L_1006cb0
+	bne.un L_1006cc0
 // --- basic block ---
-// 0x01006c98: 0x1006c98: j	 0x1006cbc subu  v1, zero, v1
+// 0x01006ca8: 0x1006ca8: j	 0x1006ccc subu  v1, zero, v1
 	ldloc 5
 	neg
 	stloc 5
-	br L_1006cbc
+	br L_1006ccc
 // --- basic block ---
-L_1006ca0:
-// 0x01006ca0: 0x1006ca0: j	 0x1006cbc subu  v0, zero, v0
+L_1006cb0:
+// 0x01006cb0: 0x1006cb0: j	 0x1006ccc subu  v0, zero, v0
 	ldloc 4
 	neg
 	stloc 4
-	br L_1006cbc
+	br L_1006ccc
 // --- basic block ---
-L_1006ca8:
-// 0x01006ca8: 0x1006ca8: subu  v0, zero, v0
+L_1006cb8:
+// 0x01006cb8: 0x1006cb8: subu  v0, zero, v0
 	ldloc 4
 	neg
 	stloc 4
-// 0x01006cac: 0x1006cac: subu  v1, zero, v1
+// 0x01006cbc: 0x1006cbc: subu  v1, zero, v1
 	ldloc 5
 	neg
 	stloc 5
-L_1006cb0:
-// 0x01006cb0: 0x1006cb0: sw    v0, 0(a1)
+L_1006cc0:
+// 0x01006cc0: 0x1006cc0: sw    v0, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-// 0x01006cb4: 0x1006cb4: jr    ra sw    v1, 0(a2)
+// 0x01006cc4: 0x1006cc4: jr    ra sw    v1, 0(a2)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -4814,15 +4814,15 @@ L_1006cb0:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1006cbc:
-// 0x01006cbc: 0x1006cbc: sw    v1, 0(a1)
+L_1006ccc:
+// 0x01006ccc: 0x1006ccc: sw    v1, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01006cc0: 0x1006cc0: jr    ra sw    v0, 0(a2)
+// 0x01006cd0: 0x1006cd0: jr    ra sw    v0, 0(a2)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -4836,7 +4836,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_math_check_point_in_segment_1006cc8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_check_point_in_segment_1006cd8(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 t0,int32 t1,int32 v0,int32 t2,int32 t3,int32 ra)
@@ -4883,15 +4883,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006cc8: 0x1006cc8: lui   t0, 0xe0000
+// 0x01006cd8: 0x1006cd8: lui   t0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01006ccc: 0x1006ccc: addiu t0, t0, 29604
+// 0x01006cdc: 0x1006cdc: addiu t0, t0, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x01006cd0: 0x1006cd0: lw    v0, 56(t0)
+// 0x01006ce0: 0x1006ce0: lw    v0, 56(t0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4900,26 +4900,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01006cd4: 0x1006cd4: lw    v1, 0(a2)
+// 0x01006ce4: 0x1006ce4: lw    v1, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01006cd8: 0x1006cd8: sll   zero, zero, 0
-// 0x01006cdc: 0x1006cdc: slt   t1, v0, v1
+// 0x01006ce8: 0x1006ce8: sll   zero, zero, 0
+// 0x01006cec: 0x1006cec: slt   t1, v0, v1
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 8
-// 0x01006ce0: 0x1006ce0: bne   t1, zero, 0x1006dd0 addu  v0, a3, zero
+// 0x01006cf0: 0x1006cf0: bne   t1, zero, 0x1006de0 addu  v0, a3, zero
 	ldloc 8
 	ldloc 4
 	stloc 9
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-// 0x01006ce8: 0x1006ce8: lw    a3, 64(t0)
+// 0x01006cf8: 0x1006cf8: lw    a3, 64(t0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4928,17 +4928,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01006cec: 0x1006cec: sll   zero, zero, 0
-// 0x01006cf0: 0x1006cf0: slt   a3, v1, a3
+// 0x01006cfc: 0x1006cfc: sll   zero, zero, 0
+// 0x01006d00: 0x1006d00: slt   a3, v1, a3
 	ldloc 5
 	ldloc 4
 	clt
 	stloc 4
-// 0x01006cf4: 0x1006cf4: bne   a3, zero, 0x1006dd0 sll   zero, zero, 0
+// 0x01006d04: 0x1006d04: bne   a3, zero, 0x1006de0 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-// 0x01006cfc: 0x1006cfc: lw    t1, 4(a2)
+// 0x01006d0c: 0x1006d0c: lw    t1, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4947,7 +4947,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01006d00: 0x1006d00: lw    a3, 60(t0)
+// 0x01006d10: 0x1006d10: lw    a3, 60(t0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4956,17 +4956,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01006d04: 0x1006d04: sll   zero, zero, 0
-// 0x01006d08: 0x1006d08: slt   a3, a3, t1
+// 0x01006d14: 0x1006d14: sll   zero, zero, 0
+// 0x01006d18: 0x1006d18: slt   a3, a3, t1
 	ldloc 4
 	ldloc 8
 	clt
 	stloc 4
-// 0x01006d0c: 0x1006d0c: bne   a3, zero, 0x1006dd0 sll   zero, zero, 0
+// 0x01006d1c: 0x1006d1c: bne   a3, zero, 0x1006de0 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-// 0x01006d14: 0x1006d14: lw    a3, 68(t0)
+// 0x01006d24: 0x1006d24: lw    a3, 68(t0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4975,74 +4975,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01006d18: 0x1006d18: sll   zero, zero, 0
-// 0x01006d1c: 0x1006d1c: slt   a3, t1, a3
+// 0x01006d28: 0x1006d28: sll   zero, zero, 0
+// 0x01006d2c: 0x1006d2c: slt   a3, t1, a3
 	ldloc 8
 	ldloc 4
 	clt
 	stloc 4
-// 0x01006d20: 0x1006d20: bne   a3, zero, 0x1006dd0 addiu a3, v1, -1
+// 0x01006d30: 0x1006d30: bne   a3, zero, 0x1006de0 addiu a3, v1, -1
 	ldloc 4
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 4
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-// 0x01006d28: 0x1006d28: j	 0x1006dd8 sll   zero, zero, 0
-	br L_1006dd8
+// 0x01006d38: 0x1006d38: j	 0x1006de8 sll   zero, zero, 0
+	br L_1006de8
 // --- basic block ---
-L_1006d30:
-// 0x01006d30: 0x1006d30: lw    t2, 0(a1)
+L_1006d40:
+// 0x01006d40: 0x1006d40: lw    t2, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01006d34: 0x1006d34: sll   zero, zero, 0
-// 0x01006d38: 0x1006d38: slt   t2, t3, t2
+// 0x01006d44: 0x1006d44: sll   zero, zero, 0
+// 0x01006d48: 0x1006d48: slt   t2, t3, t2
 	ldloc 11
 	ldloc 10
 	clt
 	stloc 10
-// 0x01006d3c: 0x1006d3c: beq   t2, zero, 0x1006d64 addiu v1, v1, 1
+// 0x01006d4c: 0x1006d4c: beq   t2, zero, 0x1006d74 addiu v1, v1, 1
 	ldloc 10
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brfalse L_1006d64
+	brfalse L_1006d74
 // --- basic block ---
-L_1006d44:
-// 0x01006d44: 0x1006d44: slt   t0, v1, t0
+L_1006d54:
+// 0x01006d54: 0x1006d54: slt   t0, v1, t0
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 7
-// 0x01006d48: 0x1006d48: bne   t0, zero, 0x1006dd0 sll   zero, zero, 0
+// 0x01006d58: 0x1006d58: bne   t0, zero, 0x1006de0 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-// 0x01006d50: 0x1006d50: lw    v1, 0(a1)
+// 0x01006d60: 0x1006d60: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01006d54: 0x1006d54: sll   zero, zero, 0
-// 0x01006d58: 0x1006d58: slt   a3, v1, a3
+// 0x01006d64: 0x1006d64: sll   zero, zero, 0
+// 0x01006d68: 0x1006d68: slt   a3, v1, a3
 	ldloc 5
 	ldloc 4
 	clt
 	stloc 4
-// 0x01006d5c: 0x1006d5c: bne   a3, zero, 0x1006dd0 sll   zero, zero, 0
+// 0x01006d6c: 0x1006d6c: bne   a3, zero, 0x1006de0 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-L_1006d64:
-// 0x01006d64: 0x1006d64: lw    a0, 4(a0)
+L_1006d74:
+// 0x01006d74: 0x1006d74: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5051,25 +5051,25 @@ L_1006d64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01006d68: 0x1006d68: addiu v1, t1, -1
+// 0x01006d78: 0x1006d78: addiu v1, t1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01006d6c: 0x1006d6c: slt   a3, a0, v1
+// 0x01006d7c: 0x1006d7c: slt   a3, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 4
-// 0x01006d70: 0x1006d70: bne   a3, zero, 0x1006d8c addiu t0, t1, 1
+// 0x01006d80: 0x1006d80: bne   a3, zero, 0x1006d9c addiu t0, t1, 1
 	ldloc 4
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_1006d8c
+	brtrue L_1006d9c
 // --- basic block ---
-// 0x01006d78: 0x1006d78: lw    a3, 4(a1)
+// 0x01006d88: 0x1006d88: lw    a3, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5078,32 +5078,32 @@ L_1006d64:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01006d7c: 0x1006d7c: sll   zero, zero, 0
-// 0x01006d80: 0x1006d80: slt   a3, t0, a3
+// 0x01006d8c: 0x1006d8c: sll   zero, zero, 0
+// 0x01006d90: 0x1006d90: slt   a3, t0, a3
 	ldloc 7
 	ldloc 4
 	clt
 	stloc 4
-// 0x01006d84: 0x1006d84: beq   a3, zero, 0x1006db0 sll   zero, zero, 0
+// 0x01006d94: 0x1006d94: beq   a3, zero, 0x1006dc0 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1006db0
+	brfalse L_1006dc0
 // --- basic block ---
-L_1006d8c:
-// 0x01006d8c: 0x1006d8c: addiu t1, t1, 1
+L_1006d9c:
+// 0x01006d9c: 0x1006d9c: addiu t1, t1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01006d90: 0x1006d90: slt   a0, t1, a0
+// 0x01006da0: 0x1006da0: slt   a0, t1, a0
 	ldloc 8
 	ldloc.1
 	clt
 	stloc.1
-// 0x01006d94: 0x1006d94: bne   a0, zero, 0x1006dd0 sll   zero, zero, 0
+// 0x01006da4: 0x1006da4: bne   a0, zero, 0x1006de0 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-// 0x01006d9c: 0x1006d9c: lw    a0, 4(a1)
+// 0x01006dac: 0x1006dac: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5112,18 +5112,18 @@ L_1006d8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01006da0: 0x1006da0: sll   zero, zero, 0
-// 0x01006da4: 0x1006da4: slt   v1, a0, v1
+// 0x01006db0: 0x1006db0: sll   zero, zero, 0
+// 0x01006db4: 0x1006db4: slt   v1, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x01006da8: 0x1006da8: bne   v1, zero, 0x1006dd0 sll   zero, zero, 0
+// 0x01006db8: 0x1006db8: bne   v1, zero, 0x1006de0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1006dd0
+	brtrue L_1006de0
 // --- basic block ---
-L_1006db0:
-// 0x01006db0: 0x1006db0: lw    a1, 16(sp)
+L_1006dc0:
+// 0x01006dc0: 0x1006dc0: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5132,31 +5132,31 @@ L_1006db0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01006db4: 0x1006db4: lw    a0, 0(a2)
+// 0x01006dc4: 0x1006dc4: lw    a0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01006db8: 0x1006db8: sll   v1, v0, 3
+// 0x01006dc8: 0x1006dc8: sll   v1, v0, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01006dbc: 0x1006dbc: addu  v1, a1, v1
+// 0x01006dcc: 0x1006dcc: addu  v1, a1, v1
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x01006dc0: 0x1006dc0: sw    a0, 0(v1)
+// 0x01006dd0: 0x1006dd0: sw    a0, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01006dc4: 0x1006dc4: lw    a0, 4(a2)
+// 0x01006dd4: 0x1006dd4: lw    a0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -5165,12 +5165,12 @@ L_1006db0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01006dc8: 0x1006dc8: addiu v0, v0, 1
+// 0x01006dd8: 0x1006dd8: addiu v0, v0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01006dcc: 0x1006dcc: sw    a0, 4(v1)
+// 0x01006ddc: 0x1006ddc: sw    a0, 4(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5179,45 +5179,45 @@ L_1006db0:
 	add
 	ldloc.1
 	stelem.i4
-L_1006dd0:
-// 0x01006dd0: 0x1006dd0: jr    ra sll   zero, zero, 0
+L_1006de0:
+// 0x01006de0: 0x1006de0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1006dd8:
-// 0x01006dd8: 0x1006dd8: lw    t0, 0(a0)
+L_1006de8:
+// 0x01006de8: 0x1006de8: lw    t0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01006ddc: 0x1006ddc: sll   zero, zero, 0
-// 0x01006de0: 0x1006de0: slt   t2, t0, a3
+// 0x01006dec: 0x1006dec: sll   zero, zero, 0
+// 0x01006df0: 0x1006df0: slt   t2, t0, a3
 	ldloc 7
 	ldloc 4
 	clt
 	stloc 10
-// 0x01006de4: 0x1006de4: beq   t2, zero, 0x1006d30 addiu t3, v1, 1
+// 0x01006df4: 0x1006df4: beq   t2, zero, 0x1006d40 addiu t3, v1, 1
 	ldloc 10
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 11
-	brfalse L_1006d30
+	brfalse L_1006d40
 // --- basic block ---
-// 0x01006dec: 0x1006dec: j	 0x1006d44 addiu v1, v1, 1
+// 0x01006dfc: 0x1006dfc: j	 0x1006d54 addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	br L_1006d44
+	br L_1006d54
 __CIBYL_function_return:
 	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_math_counter_rotate_coordinate_1006df4(int32,int32,int32,int32)
+.method public static int32 roadmap_math_counter_rotate_coordinate_1006e04(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 lo,int32[] mem,int32 v0,int32 v1,int32 t0,int32 t1,int32 t2,int32 t3,int32 ra)
@@ -5264,15 +5264,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006df4: 0x1006df4: lui   a3, 0xe0000
+// 0x01006e04: 0x1006e04: lui   a3, 0xe0000
 	ldc.i4 917504
 	stloc.3
-// 0x01006df8: 0x1006df8: addiu a3, a3, 29604
+// 0x01006e08: 0x1006e08: addiu a3, a3, 30068
 	ldloc.3
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.3
-// 0x01006dfc: 0x1006dfc: lw    v1, 16(a3)
+// 0x01006e0c: 0x1006e0c: lw    v1, 16(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5281,14 +5281,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01006e00: 0x1006e00: lw    a2, 0(a0)
+// 0x01006e10: 0x1006e10: lw    a2, 0(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01006e04: 0x1006e04: lw    t0, 108(a3)
+// 0x01006e14: 0x1006e14: lw    t0, 108(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5297,17 +5297,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01006e08: 0x1006e08: subu  a2, a2, v1
+// 0x01006e18: 0x1006e18: subu  a2, a2, v1
 	ldloc.2
 	ldloc 7
 	sub
 	stloc.2
-// 0x01006e0c: 0x1006e0c: mult  a2, t0
+// 0x01006e1c: 0x1006e1c: mult  a2, t0
 	ldloc.2
 	ldloc 8
 	mul
 	stloc 4
-// 0x01006e10: 0x1006e10: lw    a1, 20(a3)
+// 0x01006e20: 0x1006e20: lw    a1, 20(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5316,7 +5316,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01006e14: 0x1006e14: lw    t1, 4(a0)
+// 0x01006e24: 0x1006e24: lw    t1, 4(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5325,7 +5325,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01006e18: 0x1006e18: lw    t2, 112(a3)
+// 0x01006e28: 0x1006e28: lw    t2, 112(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5334,81 +5334,81 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01006e1c: 0x1006e1c: subu  t1, a1, t1
+// 0x01006e2c: 0x1006e2c: subu  t1, a1, t1
 	ldloc.1
 	ldloc 9
 	sub
 	stloc 9
-// 0x01006e20: 0x1006e20: ori   v0, zero, 32768
+// 0x01006e30: 0x1006e30: ori   v0, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 6
-// 0x01006e24: 0x1006e24: mflo  lo
+// 0x01006e34: 0x1006e34: mflo  lo
 	ldloc 4
 	stloc 11
-// 0x01006e28: 0x1006e28: sll   zero, zero, 0
-// 0x01006e2c: 0x1006e2c: sll   zero, zero, 0
-// 0x01006e30: 0x1006e30: mult  t1, t2
+// 0x01006e38: 0x1006e38: sll   zero, zero, 0
+// 0x01006e3c: 0x1006e3c: sll   zero, zero, 0
+// 0x01006e40: 0x1006e40: mult  t1, t2
 	ldloc 9
 	ldloc 10
 	mul
 	stloc 4
-// 0x01006e34: 0x1006e34: mflo  lo
+// 0x01006e44: 0x1006e44: mflo  lo
 	ldloc 4
 	stloc.3
-// 0x01006e38: 0x1006e38: addu  a3, t3, a3
+// 0x01006e48: 0x1006e48: addu  a3, t3, a3
 	ldloc 11
 	ldloc.3
 	add
 	stloc.3
-// 0x01006e3c: 0x1006e3c: addiu a3, a3, 16383
+// 0x01006e4c: 0x1006e4c: addiu a3, a3, 16383
 	ldloc.3
 	ldc.i4 16383
 	add
 	stloc.3
-// 0x01006e40: 0x1006e40: mult  a2, t2
+// 0x01006e50: 0x1006e50: mult  a2, t2
 	ldloc.2
 	ldloc 10
 	mul
 	stloc 4
-// 0x01006e44: 0x1006e44: mflo  lo
+// 0x01006e54: 0x1006e54: mflo  lo
 	ldloc 4
 	stloc 10
-// 0x01006e48: 0x1006e48: addiu a2, t2, 16383
+// 0x01006e58: 0x1006e58: addiu a2, t2, 16383
 	ldloc 10
 	ldc.i4 16383
 	add
 	stloc.2
-// 0x01006e4c: 0x1006e4c: sll   zero, zero, 0
-// 0x01006e50: 0x1006e50: mult  t1, t0
+// 0x01006e5c: 0x1006e5c: sll   zero, zero, 0
+// 0x01006e60: 0x1006e60: mult  t1, t0
 	ldloc 9
 	ldloc 8
 	mul
 	stloc 4
-// 0x01006e54: 0x1006e54: mflo  lo
+// 0x01006e64: 0x1006e64: mflo  lo
 	ldloc 4
 	stloc 8
-// 0x01006e58: 0x1006e58: subu  a2, a2, t0
+// 0x01006e68: 0x1006e68: subu  a2, a2, t0
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x01006e5c: 0x1006e5c: sll   zero, zero, 0
-// 0x01006e60: 0x1006e60: div   a3, v0
+// 0x01006e6c: 0x1006e6c: sll   zero, zero, 0
+// 0x01006e70: 0x1006e70: div   a3, v0
 	ldloc.3
 	ldloc 6
 	div
 	stloc 4
-// 0x01006e64: 0x1006e64: mflo  lo
+// 0x01006e74: 0x1006e74: mflo  lo
 	ldloc 4
 	stloc.3
-// 0x01006e68: 0x1006e68: subu  a3, a1, a3
+// 0x01006e78: 0x1006e78: subu  a3, a1, a3
 	ldloc.1
 	ldloc.3
 	sub
 	stloc.3
-// 0x01006e6c: 0x1006e6c: sw    a3, 4(a0)
+// 0x01006e7c: 0x1006e7c: sw    a3, 4(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5417,20 +5417,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01006e70: 0x1006e70: div   a2, v0
+// 0x01006e80: 0x1006e80: div   a2, v0
 	ldloc.2
 	ldloc 6
 	div
 	stloc 4
-// 0x01006e74: 0x1006e74: mflo  lo
+// 0x01006e84: 0x1006e84: mflo  lo
 	ldloc 4
 	stloc 6
-// 0x01006e78: 0x1006e78: addu  v1, v0, v1
+// 0x01006e88: 0x1006e88: addu  v1, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x01006e7c: 0x1006e7c: jr    ra sw    v1, 0(a0)
+// 0x01006e8c: 0x1006e8c: jr    ra sw    v1, 0(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5444,7 +5444,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_math_project_1006e84(int32,int32,int32,int32)
+.method public static int32 roadmap_math_project_1006e94(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 t0,int32 lo,int32 v1,int32[] mem,int32 t1,int32 v0,int32 t2,int32 ra)
@@ -5488,15 +5488,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006e84: 0x1006e84: lui   a1, 0xe0000
+// 0x01006e94: 0x1006e94: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x01006e88: 0x1006e88: addiu a1, a1, 29604
+// 0x01006e98: 0x1006e98: addiu a1, a1, 30068
 	ldloc.1
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.1
-// 0x01006e8c: 0x1006e8c: lw    a2, 28(a1)
+// 0x01006e9c: 0x1006e9c: lw    a2, 28(a1)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5505,7 +5505,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01006e90: 0x1006e90: lw    a3, 120(a1)
+// 0x01006ea0: 0x1006ea0: lw    a3, 120(a1)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5514,7 +5514,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01006e94: 0x1006e94: lw    v1, 4(a0)
+// 0x01006ea4: 0x1006ea4: lw    v1, 4(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5523,70 +5523,70 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01006e98: 0x1006e98: subu  v0, a2, a3
+// 0x01006ea8: 0x1006ea8: subu  v0, a2, a3
 	ldloc.2
 	ldloc.3
 	sub
 	stloc 9
-// 0x01006e9c: 0x1006e9c: subu  v1, a2, v1
+// 0x01006eac: 0x1006eac: subu  v1, a2, v1
 	ldloc.2
 	ldloc 6
 	sub
 	stloc 6
-// 0x01006ea0: 0x1006ea0: mult  v0, v1
+// 0x01006eb0: 0x1006eb0: mult  v0, v1
 	ldloc 9
 	ldloc 6
 	mul
 	stloc 5
-// 0x01006ea4: 0x1006ea4: sra   t0, v1, 31
+// 0x01006eb4: 0x1006eb4: sra   t0, v1, 31
 	ldloc 6
 	ldc.i4.s 31
 	shr
 	stloc 4
-// 0x01006ea8: 0x1006ea8: xor   v1, t0, v1
+// 0x01006eb8: 0x1006eb8: xor   v1, t0, v1
 	ldloc 4
 	ldloc 6
 	xor
 	stloc 6
-// 0x01006eac: 0x1006eac: subu  t0, v1, t0
+// 0x01006ebc: 0x1006ebc: subu  t0, v1, t0
 	ldloc 6
 	ldloc 4
 	sub
 	stloc 4
-// 0x01006eb0: 0x1006eb0: addu  t0, t0, v0
+// 0x01006ec0: 0x1006ec0: addu  t0, t0, v0
 	ldloc 4
 	ldloc 9
 	add
 	stloc 4
-// 0x01006eb4: 0x1006eb4: addiu v1, zero, 2
+// 0x01006ec4: 0x1006ec4: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01006eb8: 0x1006eb8: lw    t2, 0(a0)
+// 0x01006ec8: 0x1006ec8: lw    t2, 0(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01006ebc: 0x1006ebc: mflo  lo
+// 0x01006ecc: 0x1006ecc: mflo  lo
 	ldloc 5
 	stloc 8
-// 0x01006ec0: 0x1006ec0: sll   zero, zero, 0
-// 0x01006ec4: 0x1006ec4: sll   zero, zero, 0
-// 0x01006ec8: 0x1006ec8: div   t1, t0
+// 0x01006ed0: 0x1006ed0: sll   zero, zero, 0
+// 0x01006ed4: 0x1006ed4: sll   zero, zero, 0
+// 0x01006ed8: 0x1006ed8: div   t1, t0
 	ldloc 8
 	ldloc 4
 	div
 	stloc 5
-// 0x01006ecc: 0x1006ecc: mflo  lo
+// 0x01006edc: 0x1006edc: mflo  lo
 	ldloc 5
 	stloc 4
-// 0x01006ed0: 0x1006ed0: subu  a2, a2, t0
+// 0x01006ee0: 0x1006ee0: subu  a2, a2, t0
 	ldloc.2
 	ldloc 4
 	sub
 	stloc.2
-// 0x01006ed4: 0x1006ed4: sw    a2, 4(a0)
+// 0x01006ee4: 0x1006ee4: sw    a2, 4(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5595,7 +5595,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01006ed8: 0x1006ed8: lw    a1, 24(a1)
+// 0x01006ee8: 0x1006ee8: lw    a1, 24(a1)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5604,59 +5604,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01006edc: 0x1006edc: subu  a3, a2, a3
+// 0x01006eec: 0x1006eec: subu  a3, a2, a3
 	ldloc.2
 	ldloc.3
 	sub
 	stloc.3
-// 0x01006ee0: 0x1006ee0: div   a1, v1
+// 0x01006ef0: 0x1006ef0: div   a1, v1
 	ldloc.1
 	ldloc 6
 	div
 	stloc 5
-// 0x01006ee4: 0x1006ee4: mflo  lo
+// 0x01006ef4: 0x1006ef4: mflo  lo
 	ldloc 5
 	stloc 8
-// 0x01006ee8: 0x1006ee8: subu  t1, t2, t1
+// 0x01006ef8: 0x1006ef8: subu  t1, t2, t1
 	ldloc 10
 	ldloc 8
 	sub
 	stloc 8
-// 0x01006eec: 0x1006eec: sll   zero, zero, 0
-// 0x01006ef0: 0x1006ef0: div   a1, v1
+// 0x01006efc: 0x1006efc: sll   zero, zero, 0
+// 0x01006f00: 0x1006f00: div   a1, v1
 	ldloc.1
 	ldloc 6
 	div
 	stloc 5
-// 0x01006ef4: 0x1006ef4: mflo  lo
+// 0x01006f04: 0x1006f04: mflo  lo
 	ldloc 5
 	stloc 4
-// 0x01006ef8: 0x1006ef8: sll   zero, zero, 0
-// 0x01006efc: 0x1006efc: sll   zero, zero, 0
-// 0x01006f00: 0x1006f00: mult  a3, t1
+// 0x01006f08: 0x1006f08: sll   zero, zero, 0
+// 0x01006f0c: 0x1006f0c: sll   zero, zero, 0
+// 0x01006f10: 0x1006f10: mult  a3, t1
 	ldloc.3
 	ldloc 8
 	mul
 	stloc 5
-// 0x01006f04: 0x1006f04: mflo  lo
+// 0x01006f14: 0x1006f14: mflo  lo
 	ldloc 5
 	stloc.3
-// 0x01006f08: 0x1006f08: sll   zero, zero, 0
-// 0x01006f0c: 0x1006f0c: sll   zero, zero, 0
-// 0x01006f10: 0x1006f10: div   a3, v0
+// 0x01006f18: 0x1006f18: sll   zero, zero, 0
+// 0x01006f1c: 0x1006f1c: sll   zero, zero, 0
+// 0x01006f20: 0x1006f20: div   a3, v0
 	ldloc.3
 	ldloc 9
 	div
 	stloc 5
-// 0x01006f14: 0x1006f14: mflo  lo
+// 0x01006f24: 0x1006f24: mflo  lo
 	ldloc 5
 	stloc.3
-// 0x01006f18: 0x1006f18: addu  t0, a3, t0
+// 0x01006f28: 0x1006f28: addu  t0, a3, t0
 	ldloc.3
 	ldloc 4
 	add
 	stloc 4
-// 0x01006f1c: 0x1006f1c: jr    ra sw    t0, 0(a0)
+// 0x01006f2c: 0x1006f2c: jr    ra sw    t0, 0(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5670,7 +5670,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+.method public static int32 roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 lo,int32 v1,int32 v0,int32[] mem,int32 t0,int32 t1,int32 t2,int32 t3,int32 t4,int32 ra)
@@ -5720,15 +5720,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006f24: 0x1006f24: lui   v1, 0xe0000
+// 0x01006f34: 0x1006f34: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01006f28: 0x1006f28: addiu v1, v1, 29604
+// 0x01006f38: 0x1006f38: addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01006f2c: 0x1006f2c: lw    v0, 120(v1)
+// 0x01006f3c: 0x1006f3c: lw    v0, 120(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5737,7 +5737,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01006f30: 0x1006f30: lw    a2, 28(v1)
+// 0x01006f40: 0x1006f40: lw    a2, 28(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5746,14 +5746,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01006f34: 0x1006f34: lw    t3, 0(a0)
+// 0x01006f44: 0x1006f44: lw    t3, 0(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01006f38: 0x1006f38: lw    a1, 24(v1)
+// 0x01006f48: 0x1006f48: lw    a1, 24(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5762,7 +5762,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01006f3c: 0x1006f3c: lw    t2, 4(a0)
+// 0x01006f4c: 0x1006f4c: lw    t2, 4(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5771,80 +5771,80 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01006f40: 0x1006f40: beq   v0, zero, 0x1006fb8 addiu v1, zero, 2
+// 0x01006f50: 0x1006f50: beq   v0, zero, 0x1006fc8 addiu v1, zero, 2
 	ldloc 6
 	ldc.i4.2
 	stloc 5
-	brfalse L_1006fb8
+	brfalse L_1006fc8
 // --- basic block ---
-// 0x01006f48: 0x1006f48: div   a1, v1
+// 0x01006f58: 0x1006f58: div   a1, v1
 	ldloc.1
 	ldloc 5
 	div
 	stloc 4
-// 0x01006f4c: 0x1006f4c: subu  a3, a2, v0
+// 0x01006f5c: 0x1006f5c: subu  a3, a2, v0
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.3
-// 0x01006f50: 0x1006f50: subu  t1, a2, t2
+// 0x01006f60: 0x1006f60: subu  t1, a2, t2
 	ldloc.2
 	ldloc 10
 	sub
 	stloc 9
-// 0x01006f54: 0x1006f54: subu  v0, t2, v0
+// 0x01006f64: 0x1006f64: subu  v0, t2, v0
 	ldloc 10
 	ldloc 6
 	sub
 	stloc 6
-// 0x01006f58: 0x1006f58: subu  t0, a3, t1
+// 0x01006f68: 0x1006f68: subu  t0, a3, t1
 	ldloc.3
 	ldloc 9
 	sub
 	stloc 8
-// 0x01006f5c: 0x1006f5c: mflo  lo
+// 0x01006f6c: 0x1006f6c: mflo  lo
 	ldloc 4
 	stloc 12
-// 0x01006f60: 0x1006f60: subu  t2, t3, t4
+// 0x01006f70: 0x1006f70: subu  t2, t3, t4
 	ldloc 11
 	ldloc 12
 	sub
 	stloc 10
-// 0x01006f64: 0x1006f64: sll   zero, zero, 0
-// 0x01006f68: 0x1006f68: mult  t1, a3
+// 0x01006f74: 0x1006f74: sll   zero, zero, 0
+// 0x01006f78: 0x1006f78: mult  t1, a3
 	ldloc 9
 	ldloc.3
 	mul
 	stloc 4
-// 0x01006f6c: 0x1006f6c: mflo  lo
+// 0x01006f7c: 0x1006f7c: mflo  lo
 	ldloc 4
 	stloc 9
-// 0x01006f70: 0x1006f70: sll   zero, zero, 0
-// 0x01006f74: 0x1006f74: sll   zero, zero, 0
-// 0x01006f78: 0x1006f78: mult  t2, a3
+// 0x01006f80: 0x1006f80: sll   zero, zero, 0
+// 0x01006f84: 0x1006f84: sll   zero, zero, 0
+// 0x01006f88: 0x1006f88: mult  t2, a3
 	ldloc 10
 	ldloc.3
 	mul
 	stloc 4
-// 0x01006f7c: 0x1006f7c: mflo  lo
+// 0x01006f8c: 0x1006f8c: mflo  lo
 	ldloc 4
 	stloc.3
-// 0x01006f80: 0x1006f80: sll   zero, zero, 0
-// 0x01006f84: 0x1006f84: sll   zero, zero, 0
-// 0x01006f88: 0x1006f88: div   t1, t0
+// 0x01006f90: 0x1006f90: sll   zero, zero, 0
+// 0x01006f94: 0x1006f94: sll   zero, zero, 0
+// 0x01006f98: 0x1006f98: div   t1, t0
 	ldloc 9
 	ldloc 8
 	div
 	stloc 4
-// 0x01006f8c: 0x1006f8c: mflo  lo
+// 0x01006f9c: 0x1006f9c: mflo  lo
 	ldloc 4
 	stloc 8
-// 0x01006f90: 0x1006f90: subu  t0, a2, t0
+// 0x01006fa0: 0x1006fa0: subu  t0, a2, t0
 	ldloc.2
 	ldloc 8
 	sub
 	stloc 8
-// 0x01006f94: 0x1006f94: sw    t0, 4(a0)
+// 0x01006fa4: 0x1006fa4: sw    t0, 4(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5853,38 +5853,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01006f98: 0x1006f98: div   a3, v0
+// 0x01006fa8: 0x1006fa8: div   a3, v0
 	ldloc.3
 	ldloc 6
 	div
 	stloc 4
-// 0x01006f9c: 0x1006f9c: mflo  lo
+// 0x01006fac: 0x1006fac: mflo  lo
 	ldloc 4
 	stloc 6
-// 0x01006fa0: 0x1006fa0: sll   zero, zero, 0
-// 0x01006fa4: 0x1006fa4: sll   zero, zero, 0
-// 0x01006fa8: 0x1006fa8: div   a1, v1
+// 0x01006fb0: 0x1006fb0: sll   zero, zero, 0
+// 0x01006fb4: 0x1006fb4: sll   zero, zero, 0
+// 0x01006fb8: 0x1006fb8: div   a1, v1
 	ldloc.1
 	ldloc 5
 	div
 	stloc 4
-// 0x01006fac: 0x1006fac: mflo  lo
+// 0x01006fbc: 0x1006fbc: mflo  lo
 	ldloc 4
 	stloc 5
-// 0x01006fb0: 0x1006fb0: addu  v0, v0, v1
+// 0x01006fc0: 0x1006fc0: addu  v0, v0, v1
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x01006fb4: 0x1006fb4: sw    v0, 0(a0)
+// 0x01006fc4: 0x1006fc4: sw    v0, 0(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_1006fb8:
-// 0x01006fb8: 0x1006fb8: jr    ra sll   zero, zero, 0
+L_1006fc8:
+// 0x01006fc8: 0x1006fc8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -5892,7 +5892,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_math_get_scale_1006fc0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_get_scale_1006fd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s1,int32 s3,int32 s4,int32 s5,int32 ra,int32 lo)
@@ -5948,20 +5948,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01006fc0: 0x1006fc0: lui   v0, 0xe0000
+// 0x01006fd0: 0x1006fd0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01006fc4: 0x1006fc4: addiu sp, sp, -56
+// 0x01006fd4: 0x1006fd4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01006fc8: 0x1006fc8: addiu v0, v0, 29604
+// 0x01006fd8: 0x1006fd8: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01006fcc: 0x1006fcc: sw    s0, 28(sp)
+// 0x01006fdc: 0x1006fdc: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5970,7 +5970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01006fd0: 0x1006fd0: lw    s0, 32(v0)
+// 0x01006fe0: 0x1006fe0: lw    s0, 32(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5979,7 +5979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01006fd4: 0x1006fd4: lw    v0, 36(v0)
+// 0x01006fe4: 0x1006fe4: lw    v0, 36(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5988,7 +5988,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01006fd8: 0x1006fd8: sw    s3, 40(sp)
+// 0x01006fe8: 0x1006fe8: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5997,13 +5997,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01006fdc: 0x1006fdc: slt   v1, s0, v0
+// 0x01006fec: 0x1006fec: slt   v1, s0, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 6
-// 0x01006fe0: 0x1006fe0: sw    ra, 52(sp)
-// 0x01006fe4: 0x1006fe4: sw    s5, 48(sp)
+// 0x01006ff0: 0x1006ff0: sw    ra, 52(sp)
+// 0x01006ff4: 0x1006ff4: sw    s5, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6012,7 +6012,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01006fe8: 0x1006fe8: sw    s4, 44(sp)
+// 0x01006ff8: 0x1006ff8: sw    s4, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6021,7 +6021,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01006fec: 0x1006fec: sw    s2, 36(sp)
+// 0x01006ffc: 0x1006ffc: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6030,7 +6030,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01006ff0: 0x1006ff0: sw    s1, 32(sp)
+// 0x01007000: 0x1007000: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6039,10 +6039,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01006ff4: 0x1006ff4: addu  s3, a0, zero
+// 0x01007004: 0x1007004: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01006ff8: 0x1006ff8: beq   v1, zero, 0x1007004 sw    zero, 20(sp)
+// 0x01007008: 0x1007008: beq   v1, zero, 0x1007014 sw    zero, 20(sp)
 	ldloc 6
 	ldloc 7
 	ldloc.0
@@ -6052,21 +6052,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1007004
+	brfalse L_1007014
 // --- basic block ---
-// 0x01007000: 0x1007000: addu  s0, v0, zero
+// 0x01007010: 0x1007010: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_1007004:
-// 0x01007004: 0x1007004: lui   s2, 0xe0000
+L_1007014:
+// 0x01007014: 0x1007014: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x01007008: 0x1007008: addiu s2, s2, 29604
+// 0x01007018: 0x1007018: addiu s2, s2, 30068
 	ldloc 8
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x0100700c: 0x100700c: lw    a0, 12(s2)
+// 0x0100701c: 0x100701c: lw    a0, 12(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6075,45 +6075,45 @@ L_1007004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007010: 0x1007010: lui   v0, 0xf0000
+// 0x01007020: 0x1007020: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01007014: 0x1007014: ori   v0, v0, 16960
+// 0x01007024: 0x1007024: ori   v0, v0, 16960
 	ldloc 5
 	ldc.i4 16960
 	or
 	stloc 5
-// 0x01007018: 0x1007018: div   a0, v0
+// 0x01007028: 0x1007028: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 15
-// 0x0100701c: 0x100701c: addiu a1, sp, 16
+// 0x0100702c: 0x100702c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01007020: 0x1007020: addiu a2, sp, 20
+// 0x01007030: 0x1007030: addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.3
-// 0x01007024: 0x1007024: mflo  lo
+// 0x01007034: 0x1007034: mflo  lo
 	ldloc 15
 	stloc.1
-// 0x01007028: 0x1007028: jal   0x1006c08 lui   s1, 0x20000
+// 0x01007038: 0x1007038: jal   0x1006c18 lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_trigonometry_1006c08(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_trigonometry_1006c18(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007030: 0x1007030: lw    a0, 20(sp)
+// 0x01007040: 0x1007040: lw    a0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6122,39 +6122,39 @@ L_1007004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007034: 0x1007034: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01007044: 0x1007044: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100703c: 0x100703c: lui   a0, 0x20000
+// 0x0100704c: 0x100704c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01007040: 0x1007040: lw    a3, 23708(a0)
+// 0x01007050: 0x1007050: lw    a3, 24172(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5927
+	ldc.i4 6043
 	add
 	ldelem.i4
 	stloc 4
-// 0x01007044: 0x1007044: lw    a2, 23704(a0)
+// 0x01007054: 0x1007054: lw    a2, 24168(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5926
+	ldc.i4 6042
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007048: 0x1007048: addu  a1, v1, zero
+// 0x01007058: 0x1007058: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x0100704c: 0x100704c: jal   0x10c0798 addu  a0, v0, zero
+// 0x0100705c: 0x100705c: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6162,37 +6162,37 @@ L_1007004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007054: 0x1007054: addu  a0, s0, zero
+// 0x01007064: 0x1007064: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01007058: 0x1007058: addu  s5, v1, zero
+// 0x01007068: 0x1007068: addu  s5, v1, zero
 	ldloc 6
 	stloc 13
-// 0x0100705c: 0x100705c: jal   0x10c09c0 addu  s4, v0, zero
+// 0x0100706c: 0x100706c: jal   0x10c1000 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007064: 0x1007064: addu  a3, v1, zero
+// 0x01007074: 0x1007074: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01007068: 0x1007068: addu  a1, s5, zero
+// 0x01007078: 0x1007078: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x0100706c: 0x100706c: addu  a0, s4, zero
+// 0x0100707c: 0x100707c: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x01007070: 0x1007070: jal   0x10c0798 addu  a2, v0, zero
+// 0x01007080: 0x1007080: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -6200,33 +6200,33 @@ L_1007004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007078: 0x1007078: lw    a3, 23716(s1)
+// 0x01007088: 0x1007088: lw    a3, 24180(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5929
+	ldc.i4 6045
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100707c: 0x100707c: lw    a2, 23712(s1)
+// 0x0100708c: 0x100708c: lw    a2, 24176(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5928
+	ldc.i4 6044
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007080: 0x1007080: addu  a1, v1, zero
+// 0x01007090: 0x1007090: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01007084: 0x1007084: jal   0x10c06e8 addu  a0, v0, zero
+// 0x01007094: 0x1007094: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6234,32 +6234,32 @@ L_1007004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100708c: 0x100708c: addu  a0, v0, zero
+// 0x0100709c: 0x100709c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01007090: 0x1007090: jal   0x10c08d0 addu  a1, v1, zero
+// 0x010070a0: 0x10070a0: jal   0x10c0f10 addu  a1, v1, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007098: 0x1007098: beq   s3, zero, 0x10070f8 addu  s0, v0, zero
+// 0x010070a8: 0x10070a8: beq   s3, zero, 0x1007108 addu  s0, v0, zero
 	ldloc 11
 	ldloc 5
 	stloc 9
-	brfalse L_10070f8
+	brfalse L_1007108
 // --- basic block ---
-// 0x010070a0: 0x10070a0: jal   0x10c09ac addu  a0, s3, zero
+// 0x010070b0: 0x10070b0: jal   0x10c0fec addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -6267,7 +6267,7 @@ L_1007004:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010070a8: 0x10070a8: lw    v1, 116(s2)
+// 0x010070b8: 0x10070b8: lw    v1, 116(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6276,8 +6276,8 @@ L_1007004:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010070ac: 0x10070ac: sll   zero, zero, 0
-// 0x010070b0: 0x10070b0: lw    a1, 4(v1)
+// 0x010070bc: 0x10070bc: sll   zero, zero, 0
+// 0x010070c0: 0x10070c0: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6286,18 +6286,18 @@ L_1007004:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010070b4: 0x10070b4: jal   0x10c0780 addu  a0, v0, zero
+// 0x010070c4: 0x10070c4: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010070bc: 0x10070bc: addu  a0, s0, zero
+// 0x010070cc: 0x10070cc: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010070c0: 0x10070c0: jal   0x10c09ac addu  s2, v0, zero
+// 0x010070d0: 0x10070d0: jal   0x10c0fec addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -6305,49 +6305,49 @@ L_1007004:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010070c8: 0x10070c8: addu  a1, v0, zero
+// 0x010070d8: 0x10070d8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010070cc: 0x10070cc: jal   0x10c0780 addu  a0, s2, zero
+// 0x010070dc: 0x10070dc: jal   0x10c0dc0 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010070d4: 0x10070d4: jal   0x10c0874 addu  a0, v0, zero
+// 0x010070e4: 0x10070e4: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010070dc: 0x10070dc: lw    a3, 23716(s1)
+// 0x010070ec: 0x10070ec: lw    a3, 24180(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5929
+	ldc.i4 6045
 	add
 	ldelem.i4
 	stloc 4
-// 0x010070e0: 0x10070e0: lw    a2, 23712(s1)
+// 0x010070f0: 0x10070f0: lw    a2, 24176(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5928
+	ldc.i4 6044
 	add
 	ldelem.i4
 	stloc.3
-// 0x010070e4: 0x10070e4: addu  a1, v1, zero
+// 0x010070f4: 0x10070f4: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010070e8: 0x10070e8: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010070f8: 0x10070f8: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6355,52 +6355,52 @@ L_1007004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010070f0: 0x10070f0: j	 0x100711c addu  a1, v1, zero
+// 0x01007100: 0x1007100: j	 0x100712c addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-	br L_100711c
+	br L_100712c
 // --- basic block ---
-L_10070f8:
-// 0x010070f8: 0x10070f8: jal   0x10c09c0 addu  a0, v0, zero
+L_1007108:
+// 0x01007108: 0x1007108: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007100: 0x1007100: lui   a0, 0x20000
+// 0x01007110: 0x1007110: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01007104: 0x1007104: lw    a3, 23724(a0)
+// 0x01007114: 0x1007114: lw    a3, 24188(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5931
+	ldc.i4 6047
 	add
 	ldelem.i4
 	stloc 4
-// 0x01007108: 0x1007108: lw    a2, 23720(a0)
+// 0x01007118: 0x1007118: lw    a2, 24184(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5930
+	ldc.i4 6046
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100710c: 0x100710c: addu  a1, v1, zero
+// 0x0100711c: 0x100711c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01007110: 0x1007110: jal   0x10c0798 addu  a0, v0, zero
+// 0x01007120: 0x1007120: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6408,28 +6408,28 @@ L_10070f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007118: 0x1007118: addu  a1, v1, zero
+// 0x01007128: 0x1007128: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-L_100711c:
-// 0x0100711c: 0x100711c: jal   0x10c08d0 addu  a0, v0, zero
+L_100712c:
+// 0x0100712c: 0x100712c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007124: 0x1007124: lw    ra, 52(sp)
-// 0x01007128: 0x1007128: lw    s5, 48(sp)
+// 0x01007134: 0x1007134: lw    ra, 52(sp)
+// 0x01007138: 0x1007138: lw    s5, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6438,7 +6438,7 @@ L_100711c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100712c: 0x100712c: lw    s4, 44(sp)
+// 0x0100713c: 0x100713c: lw    s4, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6447,7 +6447,7 @@ L_100711c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01007130: 0x1007130: lw    s3, 40(sp)
+// 0x01007140: 0x1007140: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6456,7 +6456,7 @@ L_100711c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01007134: 0x1007134: lw    s2, 36(sp)
+// 0x01007144: 0x1007144: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6465,7 +6465,7 @@ L_100711c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007138: 0x1007138: lw    s1, 32(sp)
+// 0x01007148: 0x1007148: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6474,7 +6474,7 @@ L_100711c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100713c: 0x100713c: lw    s0, 28(sp)
+// 0x0100714c: 0x100714c: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6483,7 +6483,7 @@ L_100711c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01007140: 0x1007140: jr    ra addiu sp, sp, 56
+// 0x01007150: 0x1007150: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6495,7 +6495,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 lo,int32 t0,int32 v1,int32 s2,int32 s1,int32 ra,int32 t1)
@@ -6548,15 +6548,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010072a4: 0x10072a4: lui   v0, 0xe0000
+// 0x010072b4: 0x10072b4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010072a8: 0x10072a8: addiu v0, v0, 29604
+// 0x010072b8: 0x10072b8: addiu v0, v0, 30068
 	ldloc 6
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 6
-// 0x010072ac: 0x10072ac: lw    v1, 104(v0)
+// 0x010072bc: 0x10072bc: lw    v1, 104(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6565,13 +6565,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010072b0: 0x10072b0: addiu sp, sp, -40
+// 0x010072c0: 0x10072c0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010072b4: 0x10072b4: sw    ra, 36(sp)
-// 0x010072b8: 0x10072b8: sw    s2, 32(sp)
+// 0x010072c4: 0x10072c4: sw    ra, 36(sp)
+// 0x010072c8: 0x10072c8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6580,7 +6580,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010072bc: 0x10072bc: sw    s1, 28(sp)
+// 0x010072cc: 0x10072cc: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6589,7 +6589,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010072c0: 0x10072c0: bne   v1, zero, 0x1007394 sw    s0, 24(sp)
+// 0x010072d0: 0x10072d0: bne   v1, zero, 0x10073a4 sw    s0, 24(sp)
 	ldloc 10
 	ldloc 5
 	ldloc.0
@@ -6599,9 +6599,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1007394
+	brtrue L_10073a4
 // --- basic block ---
-// 0x010072c8: 0x10072c8: lw    v0, 120(v0)
+// 0x010072d8: 0x10072d8: lw    v0, 120(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6610,18 +6610,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010072cc: 0x10072cc: sll   zero, zero, 0
-// 0x010072d0: 0x10072d0: bne   v0, zero, 0x1007398 lui   s0, 0xe0000
+// 0x010072dc: 0x10072dc: sll   zero, zero, 0
+// 0x010072e0: 0x10072e0: bne   v0, zero, 0x10073a8 lui   s0, 0xe0000
 	ldloc 6
 	ldc.i4 917504
 	stloc 7
-	brtrue L_1007398
+	brtrue L_10073a8
 // --- basic block ---
-// 0x010072d8: 0x10072d8: j	 0x10073ac sll   zero, zero, 0
-	br L_10073ac
+// 0x010072e8: 0x10072e8: j	 0x10073bc sll   zero, zero, 0
+	br L_10073bc
 // --- basic block ---
-L_10072e0:
-// 0x010072e0: 0x10072e0: lw    v0, 104(s0)
+L_10072f0:
+// 0x010072f0: 0x10072f0: lw    v0, 104(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6630,16 +6630,16 @@ L_10072e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010072e4: 0x10072e4: sll   zero, zero, 0
-// 0x010072e8: 0x10072e8: beq   v0, zero, 0x1007370 addiu s2, s2, -1
+// 0x010072f4: 0x10072f4: sll   zero, zero, 0
+// 0x010072f8: 0x10072f8: beq   v0, zero, 0x1007380 addiu s2, s2, -1
 	ldloc 6
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-	brfalse L_1007370
+	brfalse L_1007380
 // --- basic block ---
-// 0x010072f0: 0x10072f0: lw    v1, 16(s0)
+// 0x01007300: 0x1007300: lw    v1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6648,14 +6648,14 @@ L_10072e0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010072f4: 0x10072f4: lw    a3, 0(a1)
+// 0x01007304: 0x1007304: lw    a3, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010072f8: 0x10072f8: lw    a0, 112(s0)
+// 0x01007308: 0x1007308: lw    a0, 112(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6664,17 +6664,17 @@ L_10072e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010072fc: 0x10072fc: subu  a3, a3, v1
+// 0x0100730c: 0x100730c: subu  a3, a3, v1
 	ldloc 4
 	ldloc 10
 	sub
 	stloc 4
-// 0x01007300: 0x1007300: mult  a3, a0
+// 0x01007310: 0x1007310: mult  a3, a0
 	ldloc 4
 	ldloc.1
 	mul
 	stloc 8
-// 0x01007304: 0x1007304: lw    v0, 20(s0)
+// 0x01007314: 0x1007314: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6683,7 +6683,7 @@ L_10072e0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01007308: 0x1007308: lw    t0, 4(a1)
+// 0x01007318: 0x1007318: lw    t0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6692,7 +6692,7 @@ L_10072e0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100730c: 0x100730c: lw    a2, 108(s0)
+// 0x0100731c: 0x100731c: lw    a2, 108(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6701,96 +6701,96 @@ L_10072e0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007310: 0x1007310: subu  t0, v0, t0
+// 0x01007320: 0x1007320: subu  t0, v0, t0
 	ldloc 6
 	ldloc 9
 	sub
 	stloc 9
-// 0x01007314: 0x1007314: mflo  lo
+// 0x01007324: 0x1007324: mflo  lo
 	ldloc 8
 	stloc 14
-// 0x01007318: 0x1007318: sll   zero, zero, 0
-// 0x0100731c: 0x100731c: sll   zero, zero, 0
-// 0x01007320: 0x1007320: mult  t0, a0
+// 0x01007328: 0x1007328: sll   zero, zero, 0
+// 0x0100732c: 0x100732c: sll   zero, zero, 0
+// 0x01007330: 0x1007330: mult  t0, a0
 	ldloc 9
 	ldloc.1
 	mul
 	stloc 8
-// 0x01007324: 0x1007324: mflo  lo
+// 0x01007334: 0x1007334: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01007328: 0x1007328: addiu a0, a0, 16383
+// 0x01007338: 0x1007338: addiu a0, a0, 16383
 	ldloc.1
 	ldc.i4 16383
 	add
 	stloc.1
-// 0x0100732c: 0x100732c: sll   zero, zero, 0
-// 0x01007330: 0x1007330: mult  t0, a2
+// 0x0100733c: 0x100733c: sll   zero, zero, 0
+// 0x01007340: 0x1007340: mult  t0, a2
 	ldloc 9
 	ldloc.3
 	mul
 	stloc 8
-// 0x01007334: 0x1007334: mflo  lo
+// 0x01007344: 0x1007344: mflo  lo
 	ldloc 8
 	stloc 9
-// 0x01007338: 0x1007338: addu  t0, t1, t0
+// 0x01007348: 0x1007348: addu  t0, t1, t0
 	ldloc 14
 	ldloc 9
 	add
 	stloc 9
-// 0x0100733c: 0x100733c: addiu t0, t0, 16383
+// 0x0100734c: 0x100734c: addiu t0, t0, 16383
 	ldloc 9
 	ldc.i4 16383
 	add
 	stloc 9
-// 0x01007340: 0x1007340: mult  a3, a2
+// 0x01007350: 0x1007350: mult  a3, a2
 	ldloc 4
 	ldloc.3
 	mul
 	stloc 8
-// 0x01007344: 0x1007344: mflo  lo
+// 0x01007354: 0x1007354: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x01007348: 0x1007348: subu  a0, a0, a3
+// 0x01007358: 0x1007358: subu  a0, a0, a3
 	ldloc.1
 	ldloc 4
 	sub
 	stloc.1
-// 0x0100734c: 0x100734c: sll   zero, zero, 0
-// 0x01007350: 0x1007350: div   t0, s1
+// 0x0100735c: 0x100735c: sll   zero, zero, 0
+// 0x01007360: 0x1007360: div   t0, s1
 	ldloc 9
 	ldloc 12
 	div
 	stloc 8
-// 0x01007354: 0x1007354: mflo  lo
+// 0x01007364: 0x1007364: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x01007358: 0x1007358: addu  v1, a2, v1
+// 0x01007368: 0x1007368: addu  v1, a2, v1
 	ldloc.3
 	ldloc 10
 	add
 	stloc 10
-// 0x0100735c: 0x100735c: sw    v1, 0(a1)
+// 0x0100736c: 0x100736c: sw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x01007360: 0x1007360: div   a0, s1
+// 0x01007370: 0x1007370: div   a0, s1
 	ldloc.1
 	ldloc 12
 	div
 	stloc 8
-// 0x01007364: 0x1007364: mflo  lo
+// 0x01007374: 0x1007374: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01007368: 0x1007368: subu  v0, v0, a0
+// 0x01007378: 0x1007378: subu  v0, v0, a0
 	ldloc 6
 	ldloc.1
 	sub
 	stloc 6
-// 0x0100736c: 0x100736c: sw    v0, 4(a1)
+// 0x0100737c: 0x100737c: sw    v0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6799,8 +6799,8 @@ L_10072e0:
 	add
 	ldloc 6
 	stelem.i4
-L_1007370:
-// 0x01007370: 0x1007370: lw    v0, 120(s0)
+L_1007380:
+// 0x01007380: 0x1007380: lw    v0, 120(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6809,14 +6809,14 @@ L_1007370:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01007374: 0x1007374: sll   zero, zero, 0
-// 0x01007378: 0x1007378: beq   v0, zero, 0x100738c addu  a0, a1, zero
+// 0x01007384: 0x1007384: sll   zero, zero, 0
+// 0x01007388: 0x1007388: beq   v0, zero, 0x100739c addu  a0, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc.1
-	brfalse L_100738c
+	brfalse L_100739c
 // --- basic block ---
-// 0x01007380: 0x1007380: jal   0x1006e84 sw    a1, 16(sp)
+// 0x01007390: 0x1007390: jal   0x1006e94 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6829,12 +6829,12 @@ L_1007370:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_project_1006e84(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_project_1006e94(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01007388: 0x1007388: lw    a1, 16(sp)
+// 0x01007398: 0x1007398: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6843,41 +6843,41 @@ L_1007370:
 	add
 	ldelem.i4
 	stloc.2
-L_100738c:
-// 0x0100738c: 0x100738c: j	 0x10073a4 addiu a1, a1, 8
+L_100739c:
+// 0x0100739c: 0x100739c: j	 0x10073b4 addiu a1, a1, 8
 	ldloc.2
 	ldc.i4.8
 	add
 	stloc.2
-	br L_10073a4
+	br L_10073b4
 // --- basic block ---
-L_1007394:
-// 0x01007394: 0x1007394: lui   s0, 0xe0000
+L_10073a4:
+// 0x010073a4: 0x10073a4: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-L_1007398:
-// 0x01007398: 0x1007398: addu  s2, a0, zero
+L_10073a8:
+// 0x010073a8: 0x10073a8: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0100739c: 0x100739c: addiu s0, s0, 29604
+// 0x010073ac: 0x10073ac: addiu s0, s0, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x010073a0: 0x10073a0: ori   s1, zero, 32768
+// 0x010073b0: 0x10073b0: ori   s1, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 12
-L_10073a4:
-// 0x010073a4: 0x10073a4: bgtz  s2, 0x10072e0 sll   zero, zero, 0
+L_10073b4:
+// 0x010073b4: 0x10073b4: bgtz  s2, 0x10072f0 sll   zero, zero, 0
 	ldloc 11
 	ldc.i4.s 0
-	bgt L_10072e0
+	bgt L_10072f0
 // --- basic block ---
-L_10073ac:
-// 0x010073ac: 0x10073ac: lw    ra, 36(sp)
-// 0x010073b0: 0x10073b0: lw    s2, 32(sp)
+L_10073bc:
+// 0x010073bc: 0x10073bc: lw    ra, 36(sp)
+// 0x010073c0: 0x10073c0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6886,7 +6886,7 @@ L_10073ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010073b4: 0x10073b4: lw    s1, 28(sp)
+// 0x010073c4: 0x10073c4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6895,7 +6895,7 @@ L_10073ac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010073b8: 0x10073b8: lw    s0, 24(sp)
+// 0x010073c8: 0x10073c8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6904,7 +6904,7 @@ L_10073ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010073bc: 0x10073bc: jr    ra addiu sp, sp, 40
+// 0x010073cc: 0x10073cc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl40.j b/converted/Cibyl40.j
index ed2e3fb..94c8d84 100644
--- a/converted/Cibyl40.j
+++ b/converted/Cibyl40.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl40::.ctor
 
-.method public static int32 roadmap_nmea_gga_103666c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_gga_103667c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -85,18 +85,18 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103666c:
-// 0x0103666c: 0x103666c: addiu sp, sp, -32
+L_103667c:
+// 0x0103667c: 0x103667c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01036670: 0x1036670: slti  a0, a0, 11
+// 0x01036680: 0x1036680: slti  a0, a0, 11
 	ldloc.1
 	ldc.i4.s 11
 	clt
 	stloc.1
-// 0x01036674: 0x1036674: sw    s0, 16(sp)
+// 0x01036684: 0x1036684: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -105,8 +105,8 @@ L_103666c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01036678: 0x1036678: sw    ra, 28(sp)
-// 0x0103667c: 0x103667c: sw    s2, 24(sp)
+// 0x01036688: 0x1036688: sw    ra, 28(sp)
+// 0x0103668c: 0x103668c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -115,7 +115,7 @@ L_103666c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01036680: 0x1036680: sw    s1, 20(sp)
+// 0x01036690: 0x1036690: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -124,13 +124,13 @@ L_103666c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01036684: 0x1036684: bne   a0, zero, 0x10367b4 addu  s0, a1, zero
+// 0x01036694: 0x1036694: bne   a0, zero, 0x10367c4 addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 8
-	brtrue L_10367b4
+	brtrue L_10367c4
 // --- basic block ---
-// 0x0103668c: 0x103668c: lw    v0, 24(a1)
+// 0x0103669c: 0x103669c: lw    v0, 24(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -139,95 +139,95 @@ L_103666c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036690: 0x1036690: sll   zero, zero, 0
-// 0x01036694: 0x1036694: lb    v0, 0(v0)
+// 0x010366a0: 0x10366a0: sll   zero, zero, 0
+// 0x010366a4: 0x10366a4: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01036698: 0x1036698: sll   zero, zero, 0
-// 0x0103669c: 0x103669c: beq   v0, zero, 0x10366d4 addiu v1, zero, 48
+// 0x010366a8: 0x10366a8: sll   zero, zero, 0
+// 0x010366ac: 0x10366ac: beq   v0, zero, 0x10366e4 addiu v1, zero, 48
 	ldloc 5
 	ldc.i4.s 48
 	stloc 7
-	brfalse L_10366d4
+	brfalse L_10366e4
 // --- basic block ---
-// 0x010366a4: 0x10366a4: beq   v0, v1, 0x10366d4 addiu v1, zero, 49
+// 0x010366b4: 0x10366b4: beq   v0, v1, 0x10366e4 addiu v1, zero, 49
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 49
 	stloc 7
-	beq  L_10366d4
+	beq  L_10366e4
 // --- basic block ---
-// 0x010366ac: 0x10366ac: beq   v0, v1, 0x10366e4 addiu v1, zero, 1
+// 0x010366bc: 0x10366bc: beq   v0, v1, 0x10366f4 addiu v1, zero, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	stloc 7
-	beq  L_10366e4
+	beq  L_10366f4
 // --- basic block ---
-// 0x010366b4: 0x10366b4: addiu v1, zero, 50
+// 0x010366c4: 0x10366c4: addiu v1, zero, 50
 	ldc.i4.s 50
 	stloc 7
-// 0x010366b8: 0x10366b8: beq   v0, v1, 0x10366e0 lui   v1, 0x60000
+// 0x010366c8: 0x10366c8: beq   v0, v1, 0x10366f0 lui   v1, 0x60000
 	ldloc 5
 	ldloc 7
 	ldc.i4 393216
 	stloc 7
-	beq  L_10366e0
+	beq  L_10366f0
 // --- basic block ---
-// 0x010366c0: 0x10366c0: addiu a0, zero, 51
+// 0x010366d0: 0x10366d0: addiu a0, zero, 51
 	ldc.i4.s 51
 	stloc.1
-// 0x010366c4: 0x10366c4: bne   v0, a0, 0x10366f8 addiu v1, v1, -17088
+// 0x010366d4: 0x10366d4: bne   v0, a0, 0x1036708 addiu v1, v1, -16624
 	ldloc 5
 	ldloc.1
 	ldloc 7
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 7
-	bne.un L_10366f8
+	bne.un L_1036708
 // --- basic block ---
-// 0x010366cc: 0x10366cc: j	 0x10366f0 addiu v0, zero, 3
+// 0x010366dc: 0x10366dc: j	 0x1036700 addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-	br L_10366f0
+	br L_1036700
 // --- basic block ---
-L_10366d4:
-// 0x010366d4: 0x10366d4: lui   v0, 0x60000
+L_10366e4:
+// 0x010366e4: 0x10366e4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010366d8: 0x10366d8: j	 0x1036700 sw    zero, -17076(v0)
+// 0x010366e8: 0x10366e8: j	 0x1036710 sw    zero, -16612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4269
+	ldc.i4 -4153
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1036700
+	br L_1036710
 // --- basic block ---
-L_10366e0:
-// 0x010366e0: 0x10366e0: addiu v1, zero, 2
+L_10366f0:
+// 0x010366f0: 0x10366f0: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-L_10366e4:
-// 0x010366e4: 0x10366e4: lui   v0, 0x60000
+L_10366f4:
+// 0x010366f4: 0x10366f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010366e8: 0x10366e8: j	 0x1036700 sw    v1, -17076(v0)
+// 0x010366f8: 0x10366f8: j	 0x1036710 sw    v1, -16612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4269
+	ldc.i4 -4153
 	add
 	ldloc 7
 	stelem.i4
-	br L_1036700
+	br L_1036710
 // --- basic block ---
-L_10366f0:
-// 0x010366f0: 0x10366f0: j	 0x1036700 sw    v0, 12(v1)
+L_1036700:
+// 0x01036700: 0x1036700: j	 0x1036710 sw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -236,13 +236,13 @@ L_10366f0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1036700
+	br L_1036710
 // --- basic block ---
-L_10366f8:
-// 0x010366f8: 0x10366f8: addiu v0, zero, 4
+L_1036708:
+// 0x01036708: 0x1036708: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010366fc: 0x10366fc: sw    v0, 12(v1)
+// 0x0103670c: 0x103670c: sw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -251,16 +251,16 @@ L_10366f8:
 	add
 	ldloc 5
 	stelem.i4
-L_1036700:
-// 0x01036700: 0x1036700: lui   s2, 0x60000
+L_1036710:
+// 0x01036710: 0x1036710: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01036704: 0x1036704: addiu s1, s2, -17088
+// 0x01036714: 0x1036714: addiu s1, s2, -16624
 	ldloc 10
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 9
-// 0x01036708: 0x1036708: lw    v1, 12(s1)
+// 0x01036718: 0x1036718: lw    v1, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -269,14 +269,14 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103670c: 0x103670c: sll   zero, zero, 0
-// 0x01036710: 0x1036710: beq   v1, zero, 0x10367b8 addiu v0, zero, 1
+// 0x0103671c: 0x103671c: sll   zero, zero, 0
+// 0x01036720: 0x1036720: beq   v1, zero, 0x10367c8 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brfalse L_10367b8
+	brfalse L_10367c8
 // --- basic block ---
-// 0x01036718: 0x1036718: lw    a0, 4(s0)
+// 0x01036728: 0x1036728: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -285,12 +285,12 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103671c: 0x103671c: lui   a1, 0x60000
+// 0x0103672c: 0x103672c: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01036720: 0x1036720: jal   0x1036480 addiu a1, a1, -16832
+// 0x01036730: 0x1036730: jal   0x1036490 addiu a1, a1, -16368
 	ldloc.2
-	ldc.i4 -16832
+	ldc.i4 -16368
 	add
 	stloc.2
 	ldloc.0
@@ -298,25 +298,25 @@ L_1036700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_time_1036480(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_time_1036490(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036728: 0x1036728: bltz  v0, 0x10367b4 sw    v0, -17088(s2)
+// 0x01036738: 0x1036738: bltz  v0, 0x10367c4 sw    v0, -16624(s2)
 	ldloc 5
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10367b4
+	blt L_10367c4
 // --- basic block ---
-// 0x01036730: 0x1036730: lw    a0, 8(s0)
+// 0x01036740: 0x1036740: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -325,7 +325,7 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036734: 0x1036734: lw    a1, 12(s0)
+// 0x01036744: 0x1036744: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -334,10 +334,10 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01036738: 0x1036738: addiu a2, zero, 78
+// 0x01036748: 0x1036748: addiu a2, zero, 78
 	ldc.i4.s 78
 	stloc.3
-// 0x0103673c: 0x103673c: jal   0x1035c5c addiu a3, zero, 83
+// 0x0103674c: 0x103674c: jal   0x1035c6c addiu a3, zero, 83
 	ldc.i4.s 83
 	stloc 4
 	ldloc.0
@@ -345,12 +345,12 @@ L_1036700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036744: 0x1036744: sw    v0, 4(s1)
+// 0x01036754: 0x1036754: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -359,7 +359,7 @@ L_1036700:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036748: 0x1036748: lw    a0, 16(s0)
+// 0x01036758: 0x1036758: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -368,7 +368,7 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103674c: 0x103674c: lw    a1, 20(s0)
+// 0x0103675c: 0x103675c: lw    a1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -377,10 +377,10 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01036750: 0x1036750: addiu a2, zero, 69
+// 0x01036760: 0x1036760: addiu a2, zero, 69
 	ldc.i4.s 69
 	stloc.3
-// 0x01036754: 0x1036754: jal   0x1035c5c addiu a3, zero, 87
+// 0x01036764: 0x1036764: jal   0x1035c6c addiu a3, zero, 87
 	ldc.i4.s 87
 	stloc 4
 	ldloc.0
@@ -388,12 +388,12 @@ L_1036700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103675c: 0x103675c: sw    v0, 8(s1)
+// 0x0103676c: 0x103676c: sw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -402,7 +402,7 @@ L_1036700:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036760: 0x1036760: lw    a0, 28(s0)
+// 0x01036770: 0x1036770: lw    a0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -411,7 +411,7 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036764: 0x1036764: jal   0x1035be0 addiu a1, zero, 1
+// 0x01036774: 0x1036774: jal   0x1035bf0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -419,12 +419,12 @@ L_1036700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103676c: 0x103676c: sw    v0, 16(s1)
+// 0x0103677c: 0x103677c: sw    v0, 16(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -433,7 +433,7 @@ L_1036700:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036770: 0x1036770: lw    a0, 32(s0)
+// 0x01036780: 0x1036780: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -442,7 +442,7 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036774: 0x1036774: jal   0x1035be0 addiu a1, zero, 100
+// 0x01036784: 0x1036784: jal   0x1035bf0 addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -450,12 +450,12 @@ L_1036700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103677c: 0x103677c: sw    v0, 20(s1)
+// 0x0103678c: 0x103678c: sw    v0, 20(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -464,7 +464,7 @@ L_1036700:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036780: 0x1036780: lw    a0, 36(s0)
+// 0x01036790: 0x1036790: lw    a0, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -473,7 +473,7 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036784: 0x1036784: jal   0x1035be0 addiu a1, zero, 100
+// 0x01036794: 0x1036794: jal   0x1035bf0 addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -481,12 +481,12 @@ L_1036700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103678c: 0x103678c: sw    v0, 24(s1)
+// 0x0103679c: 0x103679c: sw    v0, 24(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -495,7 +495,7 @@ L_1036700:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036790: 0x1036790: lw    a0, 40(s0)
+// 0x010367a0: 0x10367a0: lw    a0, 40(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -504,26 +504,26 @@ L_1036700:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036794: 0x1036794: jal   0x103634c sll   zero, zero, 0
+// 0x010367a4: 0x10367a4: jal   0x103635c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_unit_103634c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_unit_103635c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103679c: 0x103679c: lui   a0, 0x60000
+// 0x010367ac: 0x10367ac: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x010367a0: 0x10367a0: addiu a0, a0, -17060
+// 0x010367b0: 0x10367b0: addiu a0, a0, -16596
 	ldloc.1
-	ldc.i4 -17060
+	ldc.i4 -16596
 	add
 	stloc.1
-// 0x010367a4: 0x10367a4: jal   0x1001b68 addu  a1, v0, zero
+// 0x010367b4: 0x10367b4: jal   0x1001b68 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -533,18 +533,18 @@ L_1036700:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010367ac: 0x10367ac: j	 0x10367b8 addiu v0, zero, 1
+// 0x010367bc: 0x10367bc: j	 0x10367c8 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10367b8
+	br L_10367c8
 // --- basic block ---
-L_10367b4:
-// 0x010367b4: 0x10367b4: addu  v0, zero, zero
+L_10367c4:
+// 0x010367c4: 0x10367c4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10367b8:
-// 0x010367b8: 0x10367b8: lw    ra, 28(sp)
-// 0x010367bc: 0x10367bc: lw    s2, 24(sp)
+L_10367c8:
+// 0x010367c8: 0x10367c8: lw    ra, 28(sp)
+// 0x010367cc: 0x10367cc: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -553,7 +553,7 @@ L_10367b8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010367c0: 0x10367c0: lw    s1, 20(sp)
+// 0x010367d0: 0x10367d0: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -562,7 +562,7 @@ L_10367b8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010367c4: 0x10367c4: lw    s0, 16(sp)
+// 0x010367d4: 0x10367d4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -571,7 +571,7 @@ L_10367b8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010367c8: 0x10367c8: jr    ra addiu sp, sp, 32
+// 0x010367d8: 0x10367d8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -583,7 +583,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_rmc_10367d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_rmc_10367e0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s3,int32 s2,int32 ra)
@@ -630,18 +630,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10367d0:
-// 0x010367d0: 0x10367d0: addiu sp, sp, -40
+L_10367e0:
+// 0x010367e0: 0x10367e0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010367d4: 0x10367d4: slti  a0, a0, 10
+// 0x010367e4: 0x10367e4: slti  a0, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	clt
 	stloc.1
-// 0x010367d8: 0x10367d8: sw    s0, 20(sp)
+// 0x010367e8: 0x10367e8: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -650,8 +650,8 @@ L_10367d0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010367dc: 0x10367dc: sw    ra, 36(sp)
-// 0x010367e0: 0x10367e0: sw    s3, 32(sp)
+// 0x010367ec: 0x10367ec: sw    ra, 36(sp)
+// 0x010367f0: 0x10367f0: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -660,7 +660,7 @@ L_10367d0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010367e4: 0x10367e4: sw    s2, 28(sp)
+// 0x010367f4: 0x10367f4: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -669,7 +669,7 @@ L_10367d0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010367e8: 0x10367e8: sw    s1, 24(sp)
+// 0x010367f8: 0x10367f8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -678,13 +678,13 @@ L_10367d0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010367ec: 0x10367ec: bne   a0, zero, 0x10368a8 addu  s0, a1, zero
+// 0x010367fc: 0x10367fc: bne   a0, zero, 0x10368b8 addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 7
-	brtrue L_10368a8
+	brtrue L_10368b8
 // --- basic block ---
-// 0x010367f4: 0x10367f4: lw    v0, 8(a1)
+// 0x01036804: 0x1036804: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -693,35 +693,35 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010367f8: 0x10367f8: lui   s2, 0x60000
+// 0x01036808: 0x1036808: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x010367fc: 0x10367fc: lb    v1, 0(v0)
+// 0x0103680c: 0x103680c: lb    v1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x01036800: 0x1036800: addiu s1, s2, -17088
+// 0x01036810: 0x1036810: addiu s1, s2, -16624
 	ldloc 11
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc 9
-// 0x01036804: 0x1036804: addiu a0, zero, 86
+// 0x01036814: 0x1036814: addiu a0, zero, 86
 	ldc.i4.s 86
 	stloc.1
-// 0x01036808: 0x1036808: sb    v1, 4(s1)
+// 0x01036818: 0x1036818: sb    v1, 4(s1)
 	ldloc 9
 	ldc.i4.4
 	add
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0103680c: 0x103680c: beq   v1, a0, 0x10368ac addiu v0, zero, 1
+// 0x0103681c: 0x103681c: beq   v1, a0, 0x10368bc addiu v0, zero, 1
 	ldloc 8
 	ldloc.1
 	ldc.i4.1
 	stloc 6
-	beq  L_10368ac
+	beq  L_10368bc
 // --- basic block ---
-// 0x01036814: 0x1036814: lw    a0, 4(a1)
+// 0x01036824: 0x1036824: lw    a0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -730,7 +730,7 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036818: 0x1036818: lw    a1, 36(a1)
+// 0x01036828: 0x1036828: lw    a1, 36(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -739,7 +739,7 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103681c: 0x103681c: jal   0x1036480 lui   s3, 0x60000
+// 0x0103682c: 0x103682c: jal   0x1036490 lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 10
 	ldloc.0
@@ -747,21 +747,21 @@ L_10367d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_time_1036480(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_time_1036490(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01036824: 0x1036824: sw    v0, -17088(s2)
+// 0x01036834: 0x1036834: sw    v0, -16624(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldloc 6
 	stelem.i4
-// 0x01036828: 0x1036828: lw    a1, 36(s0)
+// 0x01036838: 0x1036838: lw    a1, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -770,12 +770,12 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103682c: 0x103682c: addiu a0, s3, -16832
+// 0x0103683c: 0x103683c: addiu a0, s3, -16368
 	ldloc 10
-	ldc.i4 -16832
+	ldc.i4 -16368
 	add
 	stloc.1
-// 0x01036830: 0x1036830: jal   0x1001af8 addiu a2, zero, 16
+// 0x01036840: 0x1036840: jal   0x1001af8 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -784,21 +784,21 @@ L_10367d0:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01036838: 0x1036838: lw    v0, -17088(s2)
+// 0x01036848: 0x1036848: lw    v0, -16624(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4272
+	ldc.i4 -4156
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103683c: 0x103683c: addiu s3, s3, -16832
+// 0x0103684c: 0x103684c: addiu s3, s3, -16368
 	ldloc 10
-	ldc.i4 -16832
+	ldc.i4 -16368
 	add
 	stloc 10
-// 0x01036840: 0x1036840: bltz  v0, 0x10368a8 sb    zero, 15(s3)
+// 0x01036850: 0x1036850: bltz  v0, 0x10368b8 sb    zero, 15(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.s 15
@@ -806,9 +806,9 @@ L_10367d0:
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldc.i4.s 0
-	blt L_10368a8
+	blt L_10368b8
 // --- basic block ---
-// 0x01036848: 0x1036848: lw    a0, 12(s0)
+// 0x01036858: 0x1036858: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -817,7 +817,7 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103684c: 0x103684c: lw    a1, 16(s0)
+// 0x0103685c: 0x103685c: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -826,10 +826,10 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01036850: 0x1036850: addiu a2, zero, 78
+// 0x01036860: 0x1036860: addiu a2, zero, 78
 	ldc.i4.s 78
 	stloc.3
-// 0x01036854: 0x1036854: jal   0x1035c5c addiu a3, zero, 83
+// 0x01036864: 0x1036864: jal   0x1035c6c addiu a3, zero, 83
 	ldc.i4.s 83
 	stloc 4
 	ldloc.0
@@ -837,12 +837,12 @@ L_10367d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103685c: 0x103685c: beq   v0, zero, 0x10368a8 sw    v0, 8(s1)
+// 0x0103686c: 0x103686c: beq   v0, zero, 0x10368b8 sw    v0, 8(s1)
 	ldloc 6
 	ldloc 5
 	ldloc 9
@@ -852,9 +852,9 @@ L_10367d0:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10368a8
+	brfalse L_10368b8
 // --- basic block ---
-// 0x01036864: 0x1036864: lw    a0, 20(s0)
+// 0x01036874: 0x1036874: lw    a0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -863,7 +863,7 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036868: 0x1036868: lw    a1, 24(s0)
+// 0x01036878: 0x1036878: lw    a1, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -872,10 +872,10 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103686c: 0x103686c: addiu a2, zero, 69
+// 0x0103687c: 0x103687c: addiu a2, zero, 69
 	ldc.i4.s 69
 	stloc.3
-// 0x01036870: 0x1036870: jal   0x1035c5c addiu a3, zero, 87
+// 0x01036880: 0x1036880: jal   0x1035c6c addiu a3, zero, 87
 	ldc.i4.s 87
 	stloc 4
 	ldloc.0
@@ -883,12 +883,12 @@ L_10367d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_coordinate_1035c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01036878: 0x1036878: beq   v0, zero, 0x10368a8 sw    v0, 12(s1)
+// 0x01036888: 0x1036888: beq   v0, zero, 0x10368b8 sw    v0, 12(s1)
 	ldloc 6
 	ldloc 5
 	ldloc 9
@@ -898,9 +898,9 @@ L_10367d0:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10368a8
+	brfalse L_10368b8
 // --- basic block ---
-// 0x01036880: 0x1036880: lw    a0, 28(s0)
+// 0x01036890: 0x1036890: lw    a0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -909,7 +909,7 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036884: 0x1036884: jal   0x1035be0 addiu a1, zero, 1
+// 0x01036894: 0x1036894: jal   0x1035bf0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -917,12 +917,12 @@ L_10367d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103688c: 0x103688c: sw    v0, 16(s1)
+// 0x0103689c: 0x103689c: sw    v0, 16(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -931,7 +931,7 @@ L_10367d0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01036890: 0x1036890: lw    a0, 32(s0)
+// 0x010368a0: 0x10368a0: lw    a0, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -940,7 +940,7 @@ L_10367d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036894: 0x1036894: jal   0x1035be0 addiu a1, zero, 1
+// 0x010368a4: 0x10368a4: jal   0x1035bf0 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -948,12 +948,12 @@ L_10367d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035be0(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_nmea_decode_numeric_1035bf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103689c: 0x103689c: sw    v0, 20(s1)
+// 0x010368ac: 0x10368ac: sw    v0, 20(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -962,18 +962,18 @@ L_10367d0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010368a0: 0x10368a0: j	 0x10368ac addiu v0, zero, 1
+// 0x010368b0: 0x10368b0: j	 0x10368bc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10368ac
+	br L_10368bc
 // --- basic block ---
-L_10368a8:
-// 0x010368a8: 0x10368a8: addu  v0, zero, zero
+L_10368b8:
+// 0x010368b8: 0x10368b8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10368ac:
-// 0x010368ac: 0x10368ac: lw    ra, 36(sp)
-// 0x010368b0: 0x10368b0: lw    s3, 32(sp)
+L_10368bc:
+// 0x010368bc: 0x10368bc: lw    ra, 36(sp)
+// 0x010368c0: 0x10368c0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -982,7 +982,7 @@ L_10368ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010368b4: 0x10368b4: lw    s2, 28(sp)
+// 0x010368c4: 0x10368c4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -991,7 +991,7 @@ L_10368ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010368b8: 0x10368b8: lw    s1, 24(sp)
+// 0x010368c8: 0x10368c8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1000,7 +1000,7 @@ L_10368ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010368bc: 0x10368bc: lw    s0, 20(sp)
+// 0x010368cc: 0x10368cc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1009,7 +1009,7 @@ L_10368ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010368c0: 0x10368c0: jr    ra addiu sp, sp, 40
+// 0x010368d0: 0x10368d0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1021,7 +1021,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_call_10368c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_call_10368d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s1,int32 v1,int32 s0,int32 s3,int32 ra,int32 lo)
@@ -1071,12 +1071,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010368c8: 0x10368c8: addiu sp, sp, -48
+// 0x010368d8: 0x10368d8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010368cc: 0x10368cc: sw    s3, 40(sp)
+// 0x010368dc: 0x10368dc: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1085,7 +1085,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010368d0: 0x10368d0: sw    s2, 36(sp)
+// 0x010368e0: 0x10368e0: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1094,7 +1094,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010368d4: 0x10368d4: sw    s1, 32(sp)
+// 0x010368e4: 0x10368e4: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1103,7 +1103,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010368d8: 0x10368d8: sw    s0, 28(sp)
+// 0x010368e8: 0x10368e8: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1112,34 +1112,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010368dc: 0x10368dc: sw    ra, 44(sp)
-// 0x010368e0: 0x10368e0: addu  s1, a1, zero
+// 0x010368ec: 0x10368ec: sw    ra, 44(sp)
+// 0x010368f0: 0x10368f0: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010368e4: 0x10368e4: addu  s0, a0, zero
+// 0x010368f4: 0x10368f4: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010368e8: 0x10368e8: addu  s2, a2, zero
+// 0x010368f8: 0x10368f8: addu  s2, a2, zero
 	ldloc.3
 	stloc 7
-// 0x010368ec: 0x10368ec: bne   a1, zero, 0x1036900 addu  s3, a3, zero
+// 0x010368fc: 0x10368fc: bne   a1, zero, 0x1036910 addu  s3, a3, zero
 	ldloc.2
 	ldloc 4
 	stloc 11
-	brtrue L_1036900
+	brtrue L_1036910
 // --- basic block ---
-// 0x010368f4: 0x10368f4: lui   v0, 0x0
+// 0x01036904: 0x1036904: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010368f8: 0x10368f8: j	 0x1036918 addiu v0, v0, 20680
+// 0x01036908: 0x1036908: j	 0x1036928 addiu v0, v0, 20680
 	ldloc 5
 	ldc.i4 20680
 	add
 	stloc 5
-	br L_1036918
+	br L_1036928
 // --- basic block ---
-L_1036900:
-// 0x01036900: 0x1036900: lw    v0, 4(a1)
+L_1036910:
+// 0x01036910: 0x1036910: lw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1148,51 +1148,51 @@ L_1036900:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036904: 0x1036904: sll   zero, zero, 0
-// 0x01036908: 0x1036908: slt   v0, a2, v0
+// 0x01036914: 0x1036914: sll   zero, zero, 0
+// 0x01036918: 0x1036918: slt   v0, a2, v0
 	ldloc.3
 	ldloc 5
 	clt
 	stloc 5
-// 0x0103690c: 0x103690c: bne   v0, zero, 0x103693c addiu v0, s2, 2
+// 0x0103691c: 0x103691c: bne   v0, zero, 0x103694c addiu v0, s2, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 5
-	brtrue L_103693c
+	brtrue L_103694c
 // --- basic block ---
-// 0x01036914: 0x1036914: lw    v0, 0(a1)
+// 0x01036924: 0x1036924: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-L_1036918:
-// 0x01036918: 0x1036918: lui   a1, 0x10000
+L_1036928:
+// 0x01036928: 0x1036928: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103691c: 0x103691c: lui   a3, 0x10000
+// 0x0103692c: 0x103692c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01036920: 0x1036920: addiu a1, a1, -13152
+// 0x01036930: 0x1036930: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x01036924: 0x1036924: addiu a3, a3, -12820
+// 0x01036934: 0x1036934: addiu a3, a3, -12824
 	ldloc 4
-	ldc.i4 -12820
+	ldc.i4 -12824
 	add
 	stloc 4
-// 0x01036928: 0x1036928: addiu a0, zero, 5
+// 0x01036938: 0x1036938: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0103692c: 0x103692c: addiu a2, zero, 722
+// 0x0103693c: 0x103693c: addiu a2, zero, 722
 	ldc.i4 722
 	stloc.3
-// 0x01036930: 0x1036930: jal   0x100449c sw    v0, 16(sp)
+// 0x01036940: 0x1036940: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1211,50 +1211,50 @@ L_1036918:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01036938: 0x1036938: addiu v0, s2, 2
+// 0x01036948: 0x1036948: addiu v0, s2, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 5
-L_103693c:
-// 0x0103693c: 0x103693c: sll   v0, v0, 2
+L_103694c:
+// 0x0103694c: 0x103694c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01036940: 0x1036940: addu  s1, s1, v0
+// 0x01036950: 0x1036950: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01036944: 0x1036944: lw    v0, 0(s1)
+// 0x01036954: 0x1036954: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01036948: 0x1036948: sll   zero, zero, 0
-// 0x0103694c: 0x103694c: beq   v0, zero, 0x10369a8 addiu v0, zero, 12
+// 0x01036958: 0x1036958: sll   zero, zero, 0
+// 0x0103695c: 0x103695c: beq   v0, zero, 0x10369b8 addiu v0, zero, 12
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	brfalse L_10369a8
+	brfalse L_10369b8
 // --- basic block ---
-// 0x01036954: 0x1036954: mult  s2, v0
+// 0x01036964: 0x1036964: mult  s2, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 13
-// 0x01036958: 0x1036958: lui   v0, 0x20000
+// 0x01036968: 0x1036968: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0103695c: 0x103695c: addiu v0, v0, 26012
+// 0x0103696c: 0x103696c: addiu v0, v0, 26476
 	ldloc 5
-	ldc.i4 26012
+	ldc.i4 26476
 	add
 	stloc 5
-// 0x01036960: 0x1036960: lw    a1, 64(sp)
+// 0x01036970: 0x1036970: lw    a1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1263,15 +1263,15 @@ L_103693c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01036964: 0x1036964: mflo  lo
+// 0x01036974: 0x1036974: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x01036968: 0x1036968: addu  s2, s2, v0
+// 0x01036978: 0x1036978: addu  s2, s2, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0103696c: 0x103696c: lw    v0, 8(s2)
+// 0x0103697c: 0x103697c: lw    v0, 8(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1280,8 +1280,8 @@ L_103693c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036970: 0x1036970: sll   zero, zero, 0
-// 0x01036974: 0x1036974: jalr  v0 addu  a0, s3, zero
+// 0x01036980: 0x1036980: sll   zero, zero, 0
+// 0x01036984: 0x1036984: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
@@ -1295,26 +1295,26 @@ L_103693c:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0103697c: 0x103697c: beq   v0, zero, 0x10369a8 lui   a1, 0x60000
+// 0x0103698c: 0x103698c: beq   v0, zero, 0x10369b8 lui   a1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.2
-	brfalse L_10369a8
+	brfalse L_10369b8
 // --- basic block ---
-// 0x01036984: 0x1036984: lw    v0, 0(s1)
+// 0x01036994: 0x1036994: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01036988: 0x1036988: addu  a0, s0, zero
+// 0x01036998: 0x1036998: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0103698c: 0x103698c: jalr  v0 addiu a1, a1, -17088
+// 0x0103699c: 0x103699c: jalr  v0 addiu a1, a1, -16624
 	ldloc 5
 	ldloc.2
-	ldc.i4 -17088
+	ldc.i4 -16624
 	add
 	stloc.2
 	ldloc.0
@@ -1327,12 +1327,12 @@ L_103693c:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01036994: 0x1036994: lui   a0, 0x60000
+// 0x010369a4: 0x10369a4: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01036998: 0x1036998: jal   0x101c97c addiu a0, a0, -16816
+// 0x010369a8: 0x10369a8: jal   0x101c98c addiu a0, a0, -16352
 	ldloc.1
-	ldc.i4 -16816
+	ldc.i4 -16352
 	add
 	stloc.1
 	ldloc.0
@@ -1340,23 +1340,23 @@ L_103693c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_all_101c97c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_all_101c98c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010369a0: 0x10369a0: j	 0x10369ac addiu v0, zero, 1
+// 0x010369b0: 0x10369b0: j	 0x10369bc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10369ac
+	br L_10369bc
 // --- basic block ---
-L_10369a8:
-// 0x010369a8: 0x10369a8: addu  v0, zero, zero
+L_10369b8:
+// 0x010369b8: 0x10369b8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10369ac:
-// 0x010369ac: 0x10369ac: lw    ra, 44(sp)
-// 0x010369b0: 0x10369b0: lw    s3, 40(sp)
+L_10369bc:
+// 0x010369bc: 0x10369bc: lw    ra, 44(sp)
+// 0x010369c0: 0x10369c0: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1365,7 +1365,7 @@ L_10369ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010369b4: 0x10369b4: lw    s2, 36(sp)
+// 0x010369c4: 0x10369c4: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1374,7 +1374,7 @@ L_10369ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010369b8: 0x10369b8: lw    s1, 32(sp)
+// 0x010369c8: 0x10369c8: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1383,7 +1383,7 @@ L_10369ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010369bc: 0x10369bc: lw    s0, 28(sp)
+// 0x010369cc: 0x10369cc: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1392,7 +1392,7 @@ L_10369ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010369c0: 0x10369c0: jr    ra addiu sp, sp, 48
+// 0x010369d0: 0x10369d0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1404,7 +1404,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_nmea_decode_10369c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_decode_10369d8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s3,int32 s0,int32 v1,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -1463,12 +1463,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010369c8: 0x10369c8: addiu sp, sp, -400
+// 0x010369d8: 0x10369d8: addiu sp, sp, -400
 	ldloc.0
 	ldc.i4 -400
 	add
 	stloc.0
-// 0x010369cc: 0x10369cc: sw    s5, 384(sp)
+// 0x010369dc: 0x10369dc: sw    s5, 384(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1477,7 +1477,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010369d0: 0x10369d0: sw    s4, 380(sp)
+// 0x010369e0: 0x10369e0: sw    s4, 380(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1486,7 +1486,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010369d4: 0x10369d4: sw    s0, 364(sp)
+// 0x010369e4: 0x10369e4: sw    s0, 364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1495,8 +1495,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010369d8: 0x10369d8: sw    ra, 396(sp)
-// 0x010369dc: 0x10369dc: sw    s7, 392(sp)
+// 0x010369e8: 0x10369e8: sw    ra, 396(sp)
+// 0x010369ec: 0x10369ec: sw    s7, 392(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1505,7 +1505,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010369e0: 0x10369e0: sw    s6, 388(sp)
+// 0x010369f0: 0x10369f0: sw    s6, 388(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1514,7 +1514,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010369e4: 0x10369e4: sw    s3, 376(sp)
+// 0x010369f4: 0x10369f4: sw    s3, 376(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1523,7 +1523,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010369e8: 0x10369e8: sw    s2, 372(sp)
+// 0x010369f8: 0x10369f8: sw    s2, 372(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1532,7 +1532,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010369ec: 0x10369ec: sw    s1, 368(sp)
+// 0x010369fc: 0x10369fc: sw    s1, 368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1541,118 +1541,118 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010369f0: 0x10369f0: addu  s5, a0, zero
+// 0x01036a00: 0x1036a00: addu  s5, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010369f4: 0x10369f4: addu  s4, a1, zero
+// 0x01036a04: 0x1036a04: addu  s4, a1, zero
 	ldloc.2
 	stloc 12
-// 0x010369f8: 0x10369f8: addu  s0, a2, zero
+// 0x01036a08: 0x1036a08: addu  s0, a2, zero
 	ldloc.3
 	stloc 9
-// 0x010369fc: 0x10369fc: addiu v1, zero, 36
+// 0x01036a0c: 0x1036a0c: addiu v1, zero, 36
 	ldc.i4.s 36
 	stloc 10
-L_1036a00:
-// 0x01036a00: 0x1036a00: lb    v0, 0(s0)
+L_1036a10:
+// 0x01036a10: 0x1036a10: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01036a04: 0x1036a04: sll   zero, zero, 0
-// 0x01036a08: 0x1036a08: bne   v0, v1, 0x1036a20 slti  a0, v0, 32
+// 0x01036a14: 0x1036a14: sll   zero, zero, 0
+// 0x01036a18: 0x1036a18: bne   v0, v1, 0x1036a30 slti  a0, v0, 32
 	ldloc 6
 	ldloc 10
 	ldloc 6
 	ldc.i4.s 32
 	clt
 	stloc.1
-	bne.un L_1036a20
+	bne.un L_1036a30
 // --- basic block ---
-// 0x01036a10: 0x1036a10: addiu s2, s0, 1
+// 0x01036a20: 0x1036a20: addiu s2, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 11
-// 0x01036a14: 0x1036a14: addu  s1, zero, zero
+// 0x01036a24: 0x1036a24: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01036a18: 0x1036a18: j	 0x1036a38 addiu v1, zero, 42
+// 0x01036a28: 0x1036a28: j	 0x1036a48 addiu v1, zero, 42
 	ldc.i4.s 42
 	stloc 10
-	br L_1036a38
+	br L_1036a48
 // --- basic block ---
-L_1036a20:
-// 0x01036a20: 0x1036a20: beq   a0, zero, 0x1036a00 addiu s0, s0, 1
+L_1036a30:
+// 0x01036a30: 0x1036a30: beq   a0, zero, 0x1036a10 addiu s0, s0, 1
 	ldloc.1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brfalse L_1036a00
+	brfalse L_1036a10
 // --- basic block ---
-// 0x01036a28: 0x1036a28: j	 0x1036c20 addu  v0, zero, zero
+// 0x01036a38: 0x1036a38: j	 0x1036c30 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1036c20
+	br L_1036c30
 // --- basic block ---
-L_1036a30:
-// 0x01036a30: 0x1036a30: andi  s1, a1, 255
+L_1036a40:
+// 0x01036a40: 0x1036a40: andi  s1, a1, 255
 	ldloc.2
 	ldc.i4 255
 	and
 	stloc 7
-// 0x01036a34: 0x1036a34: addiu s2, s2, 1
+// 0x01036a44: 0x1036a44: addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1036a38:
-// 0x01036a38: 0x1036a38: lb    v0, 0(s2)
+L_1036a48:
+// 0x01036a48: 0x1036a48: lb    v0, 0(s2)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01036a3c: 0x1036a3c: sll   zero, zero, 0
-// 0x01036a40: 0x1036a40: xor   a1, v0, s1
+// 0x01036a4c: 0x1036a4c: sll   zero, zero, 0
+// 0x01036a50: 0x1036a50: xor   a1, v0, s1
 	ldloc 6
 	ldloc 7
 	xor
 	stloc.2
-// 0x01036a44: 0x1036a44: bne   v0, v1, 0x1036a80 slti  a0, v0, 32
+// 0x01036a54: 0x1036a54: bne   v0, v1, 0x1036a90 slti  a0, v0, 32
 	ldloc 6
 	ldloc 10
 	ldloc 6
 	ldc.i4.s 32
 	clt
 	stloc.1
-	bne.un L_1036a80
+	bne.un L_1036a90
 // --- basic block ---
-// 0x01036a4c: 0x1036a4c: lb    a0, 1(s2)
+// 0x01036a5c: 0x1036a5c: lb    a0, 1(s2)
 	ldloc 11
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01036a50: 0x1036a50: jal   0x103584c sll   zero, zero, 0
+// 0x01036a60: 0x1036a60: jal   0x103585c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::hex2bin_103584c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::hex2bin_103585c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01036a58: 0x1036a58: lb    a0, 2(s2)
+// 0x01036a68: 0x1036a68: lb    a0, 2(s2)
 	ldloc 11
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01036a5c: 0x1036a5c: addu  s3, v0, zero
+// 0x01036a6c: 0x1036a6c: addu  s3, v0, zero
 	ldloc 6
 	stloc 8
-// 0x01036a60: 0x1036a60: jal   0x103584c sll   s3, s3, 4
+// 0x01036a70: 0x1036a70: jal   0x103585c sll   s3, s3, 4
 	ldloc 8
 	ldc.i4.4
 	shl
@@ -1662,62 +1662,62 @@ L_1036a38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::hex2bin_103584c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::hex2bin_103585c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01036a68: 0x1036a68: addu  s3, s3, v0
+// 0x01036a78: 0x1036a78: addu  s3, s3, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x01036a6c: 0x1036a6c: andi  s3, s3, 255
+// 0x01036a7c: 0x1036a7c: andi  s3, s3, 255
 	ldloc 8
 	ldc.i4 255
 	and
 	stloc 8
-// 0x01036a70: 0x1036a70: beq   s3, s1, 0x1036ab8 lui   a1, 0x10000
+// 0x01036a80: 0x1036a80: beq   s3, s1, 0x1036ac8 lui   a1, 0x10000
 	ldloc 8
 	ldloc 7
 	ldc.i4 65536
 	stloc.2
-	beq  L_1036ab8
+	beq  L_1036ac8
 // --- basic block ---
-// 0x01036a78: 0x1036a78: j	 0x1036a90 lui   a3, 0x10000
+// 0x01036a88: 0x1036a88: j	 0x1036aa0 lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-	br L_1036a90
+	br L_1036aa0
 // --- basic block ---
-L_1036a80:
-// 0x01036a80: 0x1036a80: beq   a0, zero, 0x1036a30 sll   zero, zero, 0
+L_1036a90:
+// 0x01036a90: 0x1036a90: beq   a0, zero, 0x1036a40 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1036a30
+	brfalse L_1036a40
 // --- basic block ---
-// 0x01036a88: 0x1036a88: j	 0x1036abc sb    zero, 0(s2)
+// 0x01036a98: 0x1036a98: j	 0x1036acc sb    zero, 0(s2)
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1036abc
+	br L_1036acc
 // --- basic block ---
-L_1036a90:
-// 0x01036a90: 0x1036a90: addiu a1, a1, -13152
+L_1036aa0:
+// 0x01036aa0: 0x1036aa0: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x01036a94: 0x1036a94: addiu a3, a3, -12796
+// 0x01036aa4: 0x1036aa4: addiu a3, a3, -12800
 	ldloc 4
-	ldc.i4 -12796
+	ldc.i4 -12800
 	add
 	stloc 4
-// 0x01036a98: 0x1036a98: addiu a0, zero, 4
+// 0x01036aa8: 0x1036aa8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01036a9c: 0x1036a9c: addiu a2, zero, 776
+// 0x01036aac: 0x1036aac: addiu a2, zero, 776
 	ldc.i4 776
 	stloc.3
-// 0x01036aa0: 0x1036aa0: sw    s0, 16(sp)
+// 0x01036ab0: 0x1036ab0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1726,7 +1726,7 @@ L_1036a90:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01036aa4: 0x1036aa4: sw    s3, 20(sp)
+// 0x01036ab4: 0x1036ab4: sw    s3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1735,7 +1735,7 @@ L_1036a90:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01036aa8: 0x1036aa8: jal   0x100449c sw    s1, 24(sp)
+// 0x01036ab8: 0x1036ab8: jal   0x100449c sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1754,33 +1754,33 @@ L_1036a90:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01036ab0: 0x1036ab0: j	 0x1036c20 addu  v0, zero, zero
+// 0x01036ac0: 0x1036ac0: j	 0x1036c30 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1036c20
+	br L_1036c30
 // --- basic block ---
-L_1036ab8:
-// 0x01036ab8: 0x1036ab8: sb    zero, 0(s2)
+L_1036ac8:
+// 0x01036ac8: 0x1036ac8: sb    zero, 0(s2)
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1036abc:
-// 0x01036abc: 0x1036abc: addiu s1, sp, 32
+L_1036acc:
+// 0x01036acc: 0x1036acc: addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 7
-// 0x01036ac0: 0x1036ac0: j	 0x1036ae0 addu  s2, zero, zero
+// 0x01036ad0: 0x1036ad0: j	 0x1036af0 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_1036ae0
+	br L_1036af0
 // --- basic block ---
-L_1036ac8:
-// 0x01036ac8: 0x1036ac8: sb    zero, 0(s0)
+L_1036ad8:
+// 0x01036ad8: 0x1036ad8: sb    zero, 0(s0)
 	ldloc 9
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01036acc: 0x1036acc: jal   0x1001a5c sw    v0, 0(s1)
+// 0x01036adc: 0x1036adc: jal   0x1001a5c sw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1794,45 +1794,45 @@ L_1036ac8:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01036ad4: 0x1036ad4: addiu s2, s2, 1
+// 0x01036ae4: 0x1036ae4: addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x01036ad8: 0x1036ad8: addu  s0, v0, zero
+// 0x01036ae8: 0x1036ae8: addu  s0, v0, zero
 	ldloc 6
 	stloc 9
-// 0x01036adc: 0x1036adc: addiu s1, s1, 4
+// 0x01036aec: 0x1036aec: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_1036ae0:
-// 0x01036ae0: 0x1036ae0: addiu v0, s0, 1
+L_1036af0:
+// 0x01036af0: 0x1036af0: addiu v0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01036ae4: 0x1036ae4: addu  a0, v0, zero
+// 0x01036af4: 0x1036af4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01036ae8: 0x1036ae8: beq   s0, zero, 0x1036b00 addiu a1, zero, 44
+// 0x01036af8: 0x1036af8: beq   s0, zero, 0x1036b10 addiu a1, zero, 44
 	ldloc 9
 	ldc.i4.s 44
 	stloc.2
-	brfalse L_1036b00
+	brfalse L_1036b10
 // --- basic block ---
-// 0x01036af0: 0x1036af0: lb    v1, 0(s0)
+// 0x01036b00: 0x1036b00: lb    v1, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x01036af4: 0x1036af4: sll   zero, zero, 0
-// 0x01036af8: 0x1036af8: bne   v1, zero, 0x1036ac8 sll   zero, zero, 0
+// 0x01036b04: 0x1036b04: sll   zero, zero, 0
+// 0x01036b08: 0x1036b08: bne   v1, zero, 0x1036ad8 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_1036ac8
+	brtrue L_1036ad8
 // --- basic block ---
-L_1036b00:
-// 0x01036b00: 0x1036b00: lw    s0, 32(sp)
+L_1036b10:
+// 0x01036b10: 0x1036b10: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1841,80 +1841,80 @@ L_1036b00:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01036b04: 0x1036b04: lui   s1, 0x20000
+// 0x01036b14: 0x1036b14: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01036b08: 0x1036b08: lb    v1, 0(s0)
+// 0x01036b18: 0x1036b18: lb    v1, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x01036b0c: 0x1036b0c: addiu v0, zero, 80
+// 0x01036b1c: 0x1036b1c: addiu v0, zero, 80
 	ldc.i4.s 80
 	stloc 6
-// 0x01036b10: 0x1036b10: beq   v1, v0, 0x1036b24 addiu s1, s1, 26012
+// 0x01036b20: 0x1036b20: beq   v1, v0, 0x1036b34 addiu s1, s1, 26476
 	ldloc 10
 	ldloc 6
 	ldloc 7
-	ldc.i4 26012
+	ldc.i4 26476
 	add
 	stloc 7
-	beq  L_1036b24
+	beq  L_1036b34
 // --- basic block ---
-// 0x01036b18: 0x1036b18: addu  a2, zero, zero
+// 0x01036b28: 0x1036b28: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01036b1c: 0x1036b1c: j	 0x1036bf0 addiu s3, s0, 2
+// 0x01036b2c: 0x1036b2c: j	 0x1036c00 addiu s3, s0, 2
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 8
-	br L_1036bf0
+	br L_1036c00
 // --- basic block ---
-L_1036b24:
-// 0x01036b24: 0x1036b24: addu  s3, zero, zero
+L_1036b34:
+// 0x01036b34: 0x1036b34: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01036b28: 0x1036b28: addiu s7, s0, 1
+// 0x01036b38: 0x1036b38: addiu s7, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 15
-// 0x01036b2c: 0x1036b2c: j	 0x1036b84 addiu s6, s0, 4
+// 0x01036b3c: 0x1036b3c: j	 0x1036b94 addiu s6, s0, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 14
-	br L_1036b84
+	br L_1036b94
 // --- basic block ---
-L_1036b34:
-// 0x01036b34: 0x1036b34: lw    v0, 0(s1)
+L_1036b44:
+// 0x01036b44: 0x1036b44: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01036b38: 0x1036b38: sll   zero, zero, 0
-// 0x01036b3c: 0x1036b3c: beq   v0, zero, 0x1036b7c addu  a0, v0, zero
+// 0x01036b48: 0x1036b48: sll   zero, zero, 0
+// 0x01036b4c: 0x1036b4c: beq   v0, zero, 0x1036b8c addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_1036b7c
+	brfalse L_1036b8c
 // --- basic block ---
-// 0x01036b44: 0x1036b44: jal   0x1001b2c sll   zero, zero, 0
+// 0x01036b54: 0x1036b54: jal   0x1001b2c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01036b4c: 0x1036b4c: bne   v0, zero, 0x1036b7c addu  a1, s6, zero
+// 0x01036b5c: 0x1036b5c: bne   v0, zero, 0x1036b8c addu  a1, s6, zero
 	ldloc 6
 	ldloc 14
 	stloc.2
-	brtrue L_1036b7c
+	brtrue L_1036b8c
 // --- basic block ---
-// 0x01036b54: 0x1036b54: lw    a0, 4(s1)
+// 0x01036b64: 0x1036b64: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1923,50 +1923,50 @@ L_1036b34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036b58: 0x1036b58: jal   0x1001b14 sll   zero, zero, 0
+// 0x01036b68: 0x1036b68: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01036b60: 0x1036b60: bne   v0, zero, 0x1036b80 addiu s3, s3, 1
+// 0x01036b70: 0x1036b70: bne   v0, zero, 0x1036b90 addiu s3, s3, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_1036b80
+	brtrue L_1036b90
 // --- basic block ---
-// 0x01036b68: 0x1036b68: addiu s3, s3, -1
+// 0x01036b78: 0x1036b78: addiu s3, s3, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01036b6c: 0x1036b6c: addu  a0, s5, zero
+// 0x01036b7c: 0x1036b7c: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01036b70: 0x1036b70: addu  a1, s4, zero
+// 0x01036b80: 0x1036b80: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01036b74: 0x1036b74: j	 0x1036bd0 addu  a2, s3, zero
+// 0x01036b84: 0x1036b84: j	 0x1036be0 addu  a2, s3, zero
 	ldloc 8
 	stloc.3
-	br L_1036bd0
+	br L_1036be0
 // --- basic block ---
-L_1036b7c:
-// 0x01036b7c: 0x1036b7c: addiu s3, s3, 1
+L_1036b8c:
+// 0x01036b8c: 0x1036b8c: addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1036b80:
-// 0x01036b80: 0x1036b80: addiu s1, s1, 12
+L_1036b90:
+// 0x01036b90: 0x1036b90: addiu s1, s1, 12
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 7
-L_1036b84:
-// 0x01036b84: 0x1036b84: lw    v0, 8(s1)
+L_1036b94:
+// 0x01036b94: 0x1036b94: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1975,36 +1975,36 @@ L_1036b84:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01036b88: 0x1036b88: addu  a1, s7, zero
+// 0x01036b98: 0x1036b98: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x01036b8c: 0x1036b8c: bne   v0, zero, 0x1036b34 addiu a2, zero, 3
+// 0x01036b9c: 0x1036b9c: bne   v0, zero, 0x1036b44 addiu a2, zero, 3
 	ldloc 6
 	ldc.i4.3
 	stloc.3
-	brtrue L_1036b34
+	brtrue L_1036b44
 // --- basic block ---
-// 0x01036b94: 0x1036b94: j	 0x1036c00 lui   a1, 0x10000
+// 0x01036ba4: 0x1036ba4: j	 0x1036c10 lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-	br L_1036c00
+	br L_1036c10
 // --- basic block ---
-L_1036b9c:
-// 0x01036b9c: 0x1036b9c: lw    v0, 0(s1)
+L_1036bac:
+// 0x01036bac: 0x1036bac: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01036ba0: 0x1036ba0: sll   zero, zero, 0
-// 0x01036ba4: 0x1036ba4: bne   v0, zero, 0x1036be8 addu  a1, s3, zero
+// 0x01036bb0: 0x1036bb0: sll   zero, zero, 0
+// 0x01036bb4: 0x1036bb4: bne   v0, zero, 0x1036bf8 addu  a1, s3, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brtrue L_1036be8
+	brtrue L_1036bf8
 // --- basic block ---
-// 0x01036bac: 0x1036bac: lw    a0, 4(s1)
+// 0x01036bbc: 0x1036bbc: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2013,7 +2013,7 @@ L_1036b9c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036bb0: 0x1036bb0: jal   0x1001b14 sw    a2, 352(sp)
+// 0x01036bc0: 0x1036bc0: jal   0x1001b14 sw    a2, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2027,7 +2027,7 @@ L_1036b9c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01036bb8: 0x1036bb8: lw    a2, 352(sp)
+// 0x01036bc8: 0x1036bc8: lw    a2, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2036,35 +2036,35 @@ L_1036b9c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01036bbc: 0x1036bbc: bne   v0, zero, 0x1036bec addiu a2, a2, 1
+// 0x01036bcc: 0x1036bcc: bne   v0, zero, 0x1036bfc addiu a2, a2, 1
 	ldloc 6
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-	brtrue L_1036bec
+	brtrue L_1036bfc
 // --- basic block ---
-// 0x01036bc4: 0x1036bc4: addiu a2, a2, -1
+// 0x01036bd4: 0x1036bd4: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01036bc8: 0x1036bc8: addu  a0, s5, zero
+// 0x01036bd8: 0x1036bd8: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01036bcc: 0x1036bcc: addu  a1, s4, zero
+// 0x01036bdc: 0x1036bdc: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-L_1036bd0:
-// 0x01036bd0: 0x1036bd0: addiu v0, sp, 32
+L_1036be0:
+// 0x01036be0: 0x1036be0: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-// 0x01036bd4: 0x1036bd4: addu  a3, s2, zero
+// 0x01036be4: 0x1036be4: addu  a3, s2, zero
 	ldloc 11
 	stloc 4
-// 0x01036bd8: 0x1036bd8: jal   0x10368c8 sw    v0, 16(sp)
+// 0x01036be8: 0x1036be8: jal   0x10368d8 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2078,28 +2078,28 @@ L_1036bd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_nmea_call_10368c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_nmea_call_10368d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01036be0: 0x1036be0: j	 0x1036c20 sll   zero, zero, 0
-	br L_1036c20
+// 0x01036bf0: 0x1036bf0: j	 0x1036c30 sll   zero, zero, 0
+	br L_1036c30
 // --- basic block ---
-L_1036be8:
-// 0x01036be8: 0x1036be8: addiu a2, a2, 1
+L_1036bf8:
+// 0x01036bf8: 0x1036bf8: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-L_1036bec:
-// 0x01036bec: 0x1036bec: addiu s1, s1, 12
+L_1036bfc:
+// 0x01036bfc: 0x1036bfc: addiu s1, s1, 12
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 7
-L_1036bf0:
-// 0x01036bf0: 0x1036bf0: lw    v0, 8(s1)
+L_1036c00:
+// 0x01036c00: 0x1036c00: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2108,34 +2108,34 @@ L_1036bf0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01036bf4: 0x1036bf4: sll   zero, zero, 0
-// 0x01036bf8: 0x1036bf8: bne   v0, zero, 0x1036b9c lui   a1, 0x10000
+// 0x01036c04: 0x1036c04: sll   zero, zero, 0
+// 0x01036c08: 0x1036c08: bne   v0, zero, 0x1036bac lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1036b9c
+	brtrue L_1036bac
 // --- basic block ---
-L_1036c00:
-// 0x01036c00: 0x1036c00: lui   a3, 0x10000
+L_1036c10:
+// 0x01036c10: 0x1036c10: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01036c04: 0x1036c04: addiu a1, a1, -13152
+// 0x01036c14: 0x1036c14: addiu a1, a1, -13156
 	ldloc.2
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.2
-// 0x01036c08: 0x1036c08: addiu a3, a3, -12736
+// 0x01036c18: 0x1036c18: addiu a3, a3, -12740
 	ldloc 4
-	ldc.i4 -12736
+	ldc.i4 -12740
 	add
 	stloc 4
-// 0x01036c0c: 0x1036c0c: addiu a0, zero, 1
+// 0x01036c1c: 0x1036c1c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01036c10: 0x1036c10: addiu a2, zero, 828
+// 0x01036c20: 0x1036c20: addiu a2, zero, 828
 	ldc.i4 828
 	stloc.3
-// 0x01036c14: 0x1036c14: jal   0x100449c sw    s0, 16(sp)
+// 0x01036c24: 0x1036c24: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2154,12 +2154,12 @@ L_1036c00:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01036c1c: 0x1036c1c: addu  v0, zero, zero
+// 0x01036c2c: 0x1036c2c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1036c20:
-// 0x01036c20: 0x1036c20: lw    ra, 396(sp)
-// 0x01036c24: 0x1036c24: lw    s7, 392(sp)
+L_1036c30:
+// 0x01036c30: 0x1036c30: lw    ra, 396(sp)
+// 0x01036c34: 0x1036c34: lw    s7, 392(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2168,7 +2168,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01036c28: 0x1036c28: lw    s6, 388(sp)
+// 0x01036c38: 0x1036c38: lw    s6, 388(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2177,7 +2177,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01036c2c: 0x1036c2c: lw    s5, 384(sp)
+// 0x01036c3c: 0x1036c3c: lw    s5, 384(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2186,7 +2186,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01036c30: 0x1036c30: lw    s4, 380(sp)
+// 0x01036c40: 0x1036c40: lw    s4, 380(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2195,7 +2195,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01036c34: 0x1036c34: lw    s3, 376(sp)
+// 0x01036c44: 0x1036c44: lw    s3, 376(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2204,7 +2204,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01036c38: 0x1036c38: lw    s2, 372(sp)
+// 0x01036c48: 0x1036c48: lw    s2, 372(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2213,7 +2213,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01036c3c: 0x1036c3c: lw    s1, 368(sp)
+// 0x01036c4c: 0x1036c4c: lw    s1, 368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2222,7 +2222,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01036c40: 0x1036c40: lw    s0, 364(sp)
+// 0x01036c50: 0x1036c50: lw    s0, 364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2231,7 +2231,7 @@ L_1036c20:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01036c44: 0x1036c44: jr    ra addiu sp, sp, 400
+// 0x01036c54: 0x1036c54: jr    ra addiu sp, sp, 400
 	ldloc.0
 	ldc.i4 400
 	add
@@ -2243,7 +2243,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_nmea_create_1036c4c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_nmea_create_1036c5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s0,int32 s1,int32 v1,int32 s3,int32 ra)
@@ -2290,15 +2290,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036c4c: 0x1036c4c: addiu sp, sp, -40
+// 0x01036c5c: 0x1036c5c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01036c50: 0x1036c50: lui   v0, 0x20000
+// 0x01036c60: 0x1036c60: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01036c54: 0x1036c54: sw    s3, 32(sp)
+// 0x01036c64: 0x1036c64: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2307,7 +2307,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01036c58: 0x1036c58: sw    s0, 20(sp)
+// 0x01036c68: 0x1036c68: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2316,8 +2316,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01036c5c: 0x1036c5c: sw    ra, 36(sp)
-// 0x01036c60: 0x1036c60: sw    s2, 28(sp)
+// 0x01036c6c: 0x1036c6c: sw    ra, 36(sp)
+// 0x01036c70: 0x1036c70: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2326,7 +2326,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01036c64: 0x1036c64: sw    s1, 24(sp)
+// 0x01036c74: 0x1036c74: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2335,50 +2335,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01036c68: 0x1036c68: addu  s3, a0, zero
+// 0x01036c78: 0x1036c78: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01036c6c: 0x1036c6c: addiu v0, v0, 26020
+// 0x01036c7c: 0x1036c7c: addiu v0, v0, 26484
 	ldloc 5
-	ldc.i4 26020
+	ldc.i4 26484
 	add
 	stloc 5
-// 0x01036c70: 0x1036c70: j	 0x1036c7c addu  s0, zero, zero
+// 0x01036c80: 0x1036c80: j	 0x1036c8c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1036c7c
+	br L_1036c8c
 // --- basic block ---
-L_1036c78:
-// 0x01036c78: 0x1036c78: addu  s0, s2, zero
+L_1036c88:
+// 0x01036c88: 0x1036c88: addu  s0, s2, zero
 	ldloc 7
 	stloc 8
-L_1036c7c:
-// 0x01036c7c: 0x1036c7c: lw    v1, 0(v0)
+L_1036c8c:
+// 0x01036c8c: 0x1036c8c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01036c80: 0x1036c80: addiu s2, s0, 1
+// 0x01036c90: 0x1036c90: addiu s2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01036c84: 0x1036c84: bne   v1, zero, 0x1036c78 addiu v0, v0, 12
+// 0x01036c94: 0x1036c94: bne   v1, zero, 0x1036c88 addiu v0, v0, 12
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 12
 	add
 	stloc 5
-	brtrue L_1036c78
+	brtrue L_1036c88
 // --- basic block ---
-// 0x01036c8c: 0x1036c8c: addiu a0, s0, 3
+// 0x01036c9c: 0x1036c9c: addiu a0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	add
 	stloc.1
-// 0x01036c90: 0x1036c90: jal   0x1000910 sll   a0, a0, 2
+// 0x01036ca0: 0x1036ca0: jal   0x1000910 sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
@@ -2393,21 +2393,21 @@ L_1036c7c:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01036c98: 0x1036c98: lui   a0, 0x10000
+// 0x01036ca8: 0x1036ca8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01036c9c: 0x1036c9c: addiu a0, a0, -13152
+// 0x01036cac: 0x1036cac: addiu a0, a0, -13156
 	ldloc.1
-	ldc.i4 -13152
+	ldc.i4 -13156
 	add
 	stloc.1
-// 0x01036ca0: 0x1036ca0: addiu a1, zero, 655
+// 0x01036cb0: 0x1036cb0: addiu a1, zero, 655
 	ldc.i4 655
 	stloc.2
-// 0x01036ca4: 0x1036ca4: addu  a2, v0, zero
+// 0x01036cb4: 0x1036cb4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01036ca8: 0x1036ca8: jal   0x1004a38 addu  s1, v0, zero
+// 0x01036cb8: 0x1036cb8: jal   0x1004a48 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2415,12 +2415,12 @@ L_1036c7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01036cb0: 0x1036cb0: jal   0x1001ba8 addu  a0, s3, zero
+// 0x01036cc0: 0x1036cc0: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2433,19 +2433,19 @@ L_1036c7c:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01036cb8: 0x1036cb8: sll   s2, s2, 2
+// 0x01036cc8: 0x1036cc8: sll   s2, s2, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01036cbc: 0x1036cbc: sw    v0, 0(s1)
+// 0x01036ccc: 0x1036ccc: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01036cc0: 0x1036cc0: sw    s0, 4(s1)
+// 0x01036cd0: 0x1036cd0: sw    s0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2454,45 +2454,45 @@ L_1036c7c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01036cc4: 0x1036cc4: addu  s2, s1, s2
+// 0x01036cd4: 0x1036cd4: addu  s2, s1, s2
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x01036cc8: 0x1036cc8: j	 0x1036cd8 addiu v0, zero, -1
+// 0x01036cd8: 0x1036cd8: j	 0x1036ce8 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_1036cd8
+	br L_1036ce8
 // --- basic block ---
-L_1036cd0:
-// 0x01036cd0: 0x1036cd0: sw    zero, 0(s2)
+L_1036ce0:
+// 0x01036ce0: 0x1036ce0: sw    zero, 0(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01036cd4: 0x1036cd4: addiu s2, s2, -4
+// 0x01036ce4: 0x1036ce4: addiu s2, s2, -4
 	ldloc 7
 	ldc.i4.s -4
 	add
 	stloc 7
-L_1036cd8:
-// 0x01036cd8: 0x1036cd8: addiu s0, s0, -1
+L_1036ce8:
+// 0x01036ce8: 0x1036ce8: addiu s0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01036cdc: 0x1036cdc: bne   s0, v0, 0x1036cd0 sll   zero, zero, 0
+// 0x01036cec: 0x1036cec: bne   s0, v0, 0x1036ce0 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_1036cd0
+	bne.un L_1036ce0
 // --- basic block ---
-// 0x01036ce4: 0x1036ce4: lw    ra, 36(sp)
-// 0x01036ce8: 0x1036ce8: addu  v0, s1, zero
+// 0x01036cf4: 0x1036cf4: lw    ra, 36(sp)
+// 0x01036cf8: 0x1036cf8: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-// 0x01036cec: 0x1036cec: lw    s3, 32(sp)
+// 0x01036cfc: 0x1036cfc: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2501,7 +2501,7 @@ L_1036cd8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01036cf0: 0x1036cf0: lw    s2, 28(sp)
+// 0x01036d00: 0x1036d00: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2510,7 +2510,7 @@ L_1036cd8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01036cf4: 0x1036cf4: lw    s1, 24(sp)
+// 0x01036d04: 0x1036d04: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2519,7 +2519,7 @@ L_1036cd8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01036cf8: 0x1036cf8: lw    s0, 20(sp)
+// 0x01036d08: 0x1036d08: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2528,7 +2528,7 @@ L_1036cd8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01036cfc: 0x1036cfc: jr    ra addiu sp, sp, 40
+// 0x01036d0c: 0x1036d0c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2540,7 +2540,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gpsj2me_subscribe_to_navigation_1036d04(int32)
+.method public static int32 roadmap_gpsj2me_subscribe_to_navigation_1036d14(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2560,15 +2560,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036d04: 0x1036d04: lui   v0, 0x60000
+// 0x01036d14: 0x1036d14: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01036d08: 0x1036d08: jr    ra sw    a0, -16744(v0)
+// 0x01036d18: 0x1036d18: jr    ra sw    a0, -16280(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4186
+	ldc.i4 -4070
 	add
 	ldloc.0
 	stelem.i4
@@ -2577,7 +2577,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_gpsj2me_pos2_1036d10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gpsj2me_pos2_1036d20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
@@ -2615,20 +2615,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036d10: 0x1036d10: lui   v0, 0x60000
+// 0x01036d20: 0x1036d20: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01036d14: 0x1036d14: addiu sp, sp, -40
+// 0x01036d24: 0x1036d24: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01036d18: 0x1036d18: addiu v0, v0, -16740
+// 0x01036d28: 0x1036d28: addiu v0, v0, -16276
 	ldloc 5
-	ldc.i4 -16740
+	ldc.i4 -16276
 	add
 	stloc 5
-// 0x01036d1c: 0x1036d1c: lw    v1, 4(v0)
+// 0x01036d2c: 0x1036d2c: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2637,7 +2637,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01036d20: 0x1036d20: lw    t0, 8(v0)
+// 0x01036d30: 0x1036d30: lw    t0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2646,7 +2646,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01036d24: 0x1036d24: sw    a2, 20(sp)
+// 0x01036d34: 0x1036d34: sw    a2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2655,33 +2655,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01036d28: 0x1036d28: lui   v0, 0x60000
+// 0x01036d38: 0x1036d38: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01036d2c: 0x1036d2c: lui   a2, 0xe17b0000
+// 0x01036d3c: 0x1036d3c: lui   a2, 0xe17b0000
 	ldc.i4 3782934528
 	stloc.3
-// 0x01036d30: 0x1036d30: ori   a2, a2, 32768
+// 0x01036d40: 0x1036d40: ori   a2, a2, 32768
 	ldloc.3
 	ldc.i4 32768
 	or
 	stloc.3
-// 0x01036d34: 0x1036d34: lw    v0, -16744(v0)
+// 0x01036d44: 0x1036d44: lw    v0, -16280(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4186
+	ldc.i4 -4070
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036d38: 0x1036d38: sll   a0, a0, 24
+// 0x01036d48: 0x1036d48: sll   a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc.1
-// 0x01036d3c: 0x1036d3c: sw    ra, 36(sp)
-// 0x01036d40: 0x1036d40: sw    a3, 24(sp)
+// 0x01036d4c: 0x1036d4c: sw    ra, 36(sp)
+// 0x01036d50: 0x1036d50: sw    a3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2690,7 +2690,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01036d44: 0x1036d44: sw    a2, 16(sp)
+// 0x01036d54: 0x1036d54: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2699,15 +2699,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01036d48: 0x1036d48: sra   a0, a0, 24
+// 0x01036d58: 0x1036d58: sra   a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shr
 	stloc.1
-// 0x01036d4c: 0x1036d4c: addu  a2, t0, zero
+// 0x01036d5c: 0x1036d5c: addu  a2, t0, zero
 	ldloc 9
 	stloc.3
-// 0x01036d50: 0x1036d50: jalr  v0 addu  a3, v1, zero
+// 0x01036d60: 0x1036d60: jalr  v0 addu  a3, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc 4
@@ -2721,9 +2721,9 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01036d58: 0x1036d58: lw    ra, 36(sp)
-// 0x01036d5c: 0x1036d5c: sll   zero, zero, 0
-// 0x01036d60: 0x1036d60: jr    ra addiu sp, sp, 40
+// 0x01036d68: 0x1036d68: lw    ra, 36(sp)
+// 0x01036d6c: 0x1036d6c: sll   zero, zero, 0
+// 0x01036d70: 0x1036d70: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2735,7 +2735,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gpsj2me_pos1_1036d68(int32,int32)
+.method public static int32 roadmap_gpsj2me_pos1_1036d78(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -2758,15 +2758,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036d68: 0x1036d68: lui   v0, 0x60000
+// 0x01036d78: 0x1036d78: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01036d6c: 0x1036d6c: addiu v0, v0, -16740
+// 0x01036d7c: 0x1036d7c: addiu v0, v0, -16276
 	ldloc.2
-	ldc.i4 -16740
+	ldc.i4 -16276
 	add
 	stloc.2
-// 0x01036d70: 0x1036d70: sw    a1, 4(v0)
+// 0x01036d80: 0x1036d80: sw    a1, 4(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -2775,7 +2775,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01036d74: 0x1036d74: jr    ra sw    a0, 8(v0)
+// 0x01036d84: 0x1036d84: jr    ra sw    a0, 8(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -2789,7 +2789,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_gpsj2me_decode_1036d7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gpsj2me_decode_1036d8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t2,int32 ra,int32 t0,int32 t1)
@@ -2833,10 +2833,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036d7c: 0x1036d7c: addu  v0, a2, zero
+// 0x01036d8c: 0x1036d8c: addu  v0, a2, zero
 	ldloc.3
 	stloc 6
-// 0x01036d80: 0x1036d80: lw    t0, 4(v0)
+// 0x01036d90: 0x1036d90: lw    t0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2845,7 +2845,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01036d84: 0x1036d84: lw    v0, 12(v0)
+// 0x01036d94: 0x1036d94: lw    v0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2854,12 +2854,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01036d88: 0x1036d88: addiu sp, sp, -48
+// 0x01036d98: 0x1036d98: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01036d8c: 0x1036d8c: lw    t1, 16(a2)
+// 0x01036d9c: 0x1036d9c: lw    t1, 16(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2868,31 +2868,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01036d90: 0x1036d90: lui   v1, 0x60000
+// 0x01036da0: 0x1036da0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01036d94: 0x1036d94: lui   t2, 0xe17b0000
+// 0x01036da4: 0x1036da4: lui   t2, 0xe17b0000
 	ldc.i4 3782934528
 	stloc 8
-// 0x01036d98: 0x1036d98: lb    a0, 31(a2)
+// 0x01036da8: 0x1036da8: lb    a0, 31(a2)
 	ldloc.3
 	ldc.i4.s 31
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01036d9c: 0x1036d9c: lw    a1, 0(a2)
+// 0x01036dac: 0x1036dac: lw    a1, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01036da0: 0x1036da0: ori   t2, t2, 32768
+// 0x01036db0: 0x1036db0: ori   t2, t2, 32768
 	ldloc 8
 	ldc.i4 32768
 	or
 	stloc 8
-// 0x01036da4: 0x1036da4: lw    a2, 8(a2)
+// 0x01036db4: 0x1036db4: lw    a2, 8(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2901,16 +2901,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01036da8: 0x1036da8: lw    v1, -16744(v1)
+// 0x01036db8: 0x1036db8: lw    v1, -16280(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4186
+	ldc.i4 -4070
 	add
 	ldelem.i4
 	stloc 7
-// 0x01036dac: 0x1036dac: sw    v0, 20(sp)
+// 0x01036dbc: 0x1036dbc: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2919,11 +2919,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01036db0: 0x1036db0: addu  v0, a3, zero
+// 0x01036dc0: 0x1036dc0: addu  v0, a3, zero
 	ldloc 4
 	stloc 6
-// 0x01036db4: 0x1036db4: sw    ra, 44(sp)
-// 0x01036db8: 0x1036db8: sw    v0, 32(sp)
+// 0x01036dc4: 0x1036dc4: sw    ra, 44(sp)
+// 0x01036dc8: 0x1036dc8: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2932,7 +2932,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01036dbc: 0x1036dbc: sw    t2, 16(sp)
+// 0x01036dcc: 0x1036dcc: sw    t2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2941,7 +2941,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01036dc0: 0x1036dc0: sw    t1, 24(sp)
+// 0x01036dd0: 0x1036dd0: sw    t1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2950,7 +2950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01036dc4: 0x1036dc4: jalr  v1 addu  a3, t0, zero
+// 0x01036dd4: 0x1036dd4: jalr  v1 addu  a3, t0, zero
 	ldloc 7
 	ldloc 10
 	stloc 4
@@ -2964,8 +2964,8 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01036dcc: 0x1036dcc: lw    ra, 44(sp)
-// 0x01036dd0: 0x1036dd0: lw    v0, 32(sp)
+// 0x01036ddc: 0x1036ddc: lw    ra, 44(sp)
+// 0x01036de0: 0x1036de0: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2974,7 +2974,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01036dd4: 0x1036dd4: jr    ra addiu sp, sp, 48
+// 0x01036de4: 0x1036de4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2986,7 +2986,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_input_shift_to_next_line_1036e7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_input_shift_to_next_line_1036e8c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -3024,7 +3024,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036e7c: 0x1036e7c: lw    a2, 5148(a0)
+// 0x01036e8c: 0x1036e8c: lw    a2, 5148(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3033,17 +3033,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01036e80: 0x1036e80: addiu sp, sp, -24
+// 0x01036e90: 0x1036e90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01036e84: 0x1036e84: addu  v0, a0, a2
+// 0x01036e94: 0x1036e94: addu  v0, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc 7
-// 0x01036e88: 0x1036e88: sw    s0, 16(sp)
+// 0x01036e98: 0x1036e98: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3052,72 +3052,72 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036e8c: 0x1036e8c: sw    ra, 20(sp)
-// 0x01036e90: 0x1036e90: addu  s0, a0, zero
+// 0x01036e9c: 0x1036e9c: sw    ra, 20(sp)
+// 0x01036ea0: 0x1036ea0: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01036e94: 0x1036e94: addiu v0, v0, 28
+// 0x01036ea4: 0x1036ea4: addiu v0, v0, 28
 	ldloc 7
 	ldc.i4.s 28
 	add
 	stloc 7
-L_1036e98:
-// 0x01036e98: 0x1036e98: lb    a0, 0(a1)
+L_1036ea8:
+// 0x01036ea8: 0x1036ea8: lb    a0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01036e9c: 0x1036e9c: sll   zero, zero, 0
-// 0x01036ea0: 0x1036ea0: slti  a0, a0, 32
+// 0x01036eac: 0x1036eac: sll   zero, zero, 0
+// 0x01036eb0: 0x1036eb0: slti  a0, a0, 32
 	ldloc.1
 	ldc.i4.s 32
 	clt
 	stloc.1
-// 0x01036ea4: 0x1036ea4: beq   a0, zero, 0x1036eb8 sltu  v1, a1, v0
+// 0x01036eb4: 0x1036eb4: beq   a0, zero, 0x1036ec8 sltu  v1, a1, v0
 	ldloc.1
 	ldloc.2
 	ldloc 7
 	clt.un
 	stloc 8
-	brfalse L_1036eb8
+	brfalse L_1036ec8
 // --- basic block ---
-// 0x01036eac: 0x1036eac: bne   v1, zero, 0x1036e98 addiu a1, a1, 1
+// 0x01036ebc: 0x1036ebc: bne   v1, zero, 0x1036ea8 addiu a1, a1, 1
 	ldloc 8
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	brtrue L_1036e98
+	brtrue L_1036ea8
 // --- basic block ---
-// 0x01036eb4: 0x1036eb4: addiu a1, a1, -1
+// 0x01036ec4: 0x1036ec4: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-L_1036eb8:
-// 0x01036eb8: 0x1036eb8: addiu a0, s0, 28
+L_1036ec8:
+// 0x01036ec8: 0x1036ec8: addiu a0, s0, 28
 	ldloc 5
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x01036ebc: 0x1036ebc: sltu  v0, a0, a1
+// 0x01036ecc: 0x1036ecc: sltu  v0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt.un
 	stloc 7
-// 0x01036ec0: 0x1036ec0: beq   v0, zero, 0x1036ef4 addu  a2, a0, a2
+// 0x01036ed0: 0x1036ed0: beq   v0, zero, 0x1036f04 addu  a2, a0, a2
 	ldloc 7
 	ldloc.1
 	ldloc.3
 	add
 	stloc.3
-	brfalse L_1036ef4
+	brfalse L_1036f04
 // --- basic block ---
-// 0x01036ec8: 0x1036ec8: subu  a2, a2, a1
+// 0x01036ed8: 0x1036ed8: subu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.3
-// 0x01036ecc: 0x1036ecc: bgtz  a2, 0x1036edc sw    a2, 5148(s0)
+// 0x01036edc: 0x1036edc: bgtz  a2, 0x1036eec sw    a2, 5148(s0)
 	ldloc.3
 	ldloc 6
 	ldloc 5
@@ -3128,9 +3128,9 @@ L_1036eb8:
 	ldloc.3
 	stelem.i4
 	ldc.i4.s 0
-	bgt L_1036edc
+	bgt L_1036eec
 // --- basic block ---
-// 0x01036ed4: 0x1036ed4: j	 0x1036ef4 sw    zero, 5148(s0)
+// 0x01036ee4: 0x1036ee4: j	 0x1036f04 sw    zero, 5148(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3139,10 +3139,10 @@ L_1036eb8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1036ef4
+	br L_1036f04
 // --- basic block ---
-L_1036edc:
-// 0x01036edc: 0x1036edc: jal   0x100186c sll   zero, zero, 0
+L_1036eec:
+// 0x01036eec: 0x1036eec: jal   0x100186c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -3152,7 +3152,7 @@ L_1036edc:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01036ee4: 0x1036ee4: lw    v0, 5148(s0)
+// 0x01036ef4: 0x1036ef4: lw    v0, 5148(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3161,21 +3161,21 @@ L_1036edc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01036ee8: 0x1036ee8: sll   zero, zero, 0
-// 0x01036eec: 0x1036eec: addu  s0, s0, v0
+// 0x01036ef8: 0x1036ef8: sll   zero, zero, 0
+// 0x01036efc: 0x1036efc: addu  s0, s0, v0
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01036ef0: 0x1036ef0: sb    zero, 28(s0)
+// 0x01036f00: 0x1036f00: sb    zero, 28(s0)
 	ldloc 5
 	ldc.i4.s 28
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1036ef4:
-// 0x01036ef4: 0x1036ef4: lw    ra, 20(sp)
-// 0x01036ef8: 0x1036ef8: lw    s0, 16(sp)
+L_1036f04:
+// 0x01036f04: 0x1036f04: lw    ra, 20(sp)
+// 0x01036f08: 0x1036f08: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3184,7 +3184,7 @@ L_1036ef4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036efc: 0x1036efc: jr    ra addiu sp, sp, 24
+// 0x01036f0c: 0x1036f0c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3196,7 +3196,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_input_1036f04(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_input_1036f14(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 s8,int32 s7,int32 s6,int32 ra)
@@ -3258,7 +3258,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01036f04: 0x1036f04: lw    v0, 5148(a0)
+// 0x01036f14: 0x1036f14: lw    v0, 5148(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3267,17 +3267,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036f08: 0x1036f08: addiu sp, sp, -72
+// 0x01036f18: 0x1036f18: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01036f0c: 0x1036f0c: slti  v1, v0, 5119
+// 0x01036f1c: 0x1036f1c: slti  v1, v0, 5119
 	ldloc 5
 	ldc.i4 5119
 	clt
 	stloc 8
-// 0x01036f10: 0x1036f10: sw    s5, 52(sp)
+// 0x01036f20: 0x1036f20: sw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3286,7 +3286,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01036f14: 0x1036f14: sw    s1, 36(sp)
+// 0x01036f24: 0x1036f24: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3295,8 +3295,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01036f18: 0x1036f18: sw    ra, 68(sp)
-// 0x01036f1c: 0x1036f1c: sw    s8, 64(sp)
+// 0x01036f28: 0x1036f28: sw    ra, 68(sp)
+// 0x01036f2c: 0x1036f2c: sw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3305,7 +3305,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01036f20: 0x1036f20: sw    s7, 60(sp)
+// 0x01036f30: 0x1036f30: sw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3314,7 +3314,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01036f24: 0x1036f24: sw    s6, 56(sp)
+// 0x01036f34: 0x1036f34: sw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3323,7 +3323,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01036f28: 0x1036f28: sw    s4, 48(sp)
+// 0x01036f38: 0x1036f38: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3332,7 +3332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01036f2c: 0x1036f2c: sw    s3, 44(sp)
+// 0x01036f3c: 0x1036f3c: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3341,7 +3341,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01036f30: 0x1036f30: sw    s2, 40(sp)
+// 0x01036f40: 0x1036f40: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3350,7 +3350,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01036f34: 0x1036f34: sw    s0, 32(sp)
+// 0x01036f44: 0x1036f44: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3359,7 +3359,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01036f38: 0x1036f38: lw    s5, 16(a0)
+// 0x01036f48: 0x1036f48: lw    s5, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3368,21 +3368,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01036f3c: 0x1036f3c: beq   v1, zero, 0x1036fa0 addu  s1, a0, zero
+// 0x01036f4c: 0x1036f4c: beq   v1, zero, 0x1036fb0 addu  s1, a0, zero
 	ldloc 8
 	ldloc.1
 	stloc 9
-	brfalse L_1036fa0
+	brfalse L_1036fb0
 // --- basic block ---
-// 0x01036f44: 0x1036f44: addiu a1, a0, 28
+// 0x01036f54: 0x1036f54: addiu a1, a0, 28
 	ldloc.1
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x01036f48: 0x1036f48: addiu a2, zero, 5119
+// 0x01036f58: 0x1036f58: addiu a2, zero, 5119
 	ldc.i4 5119
 	stloc.3
-// 0x01036f4c: 0x1036f4c: lw    a0, 4(a0)
+// 0x01036f5c: 0x1036f5c: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3391,12 +3391,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01036f50: 0x1036f50: subu  a2, a2, v0
+// 0x01036f60: 0x1036f60: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01036f54: 0x1036f54: jal   0x1037370 addu  a1, a1, v0
+// 0x01036f64: 0x1036f64: jal   0x1037380 addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
@@ -3406,45 +3406,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_read_1037370(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_read_1037380(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01036f5c: 0x1036f5c: bgtz  v0, 0x1036f90 lui   a1, 0x10000
+// 0x01036f6c: 0x1036f6c: bgtz  v0, 0x1036fa0 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
 	ldc.i4.s 0
-	bgt L_1036f90
+	bgt L_1036fa0
 // --- basic block ---
-// 0x01036f64: 0x1036f64: lw    v0, 0(s1)
+// 0x01036f74: 0x1036f74: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01036f68: 0x1036f68: lui   a3, 0x10000
+// 0x01036f78: 0x1036f78: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01036f6c: 0x1036f6c: addiu a1, a1, -12672
+// 0x01036f7c: 0x1036f7c: addiu a1, a1, -12676
 	ldloc.2
-	ldc.i4 -12672
+	ldc.i4 -12676
 	add
 	stloc.2
-// 0x01036f70: 0x1036f70: addiu a3, a3, -12644
+// 0x01036f80: 0x1036f80: addiu a3, a3, -12648
 	ldloc 4
-	ldc.i4 -12644
+	ldc.i4 -12648
 	add
 	stloc 4
-// 0x01036f74: 0x1036f74: addiu a0, zero, 2
+// 0x01036f84: 0x1036f84: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01036f78: 0x1036f78: addiu a2, zero, 106
+// 0x01036f88: 0x1036f88: addiu a2, zero, 106
 	ldc.i4.s 106
 	stloc.3
-// 0x01036f7c: 0x1036f7c: sw    v0, 16(sp)
+// 0x01036f8c: 0x1036f8c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3453,7 +3453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01036f80: 0x1036f80: jal   0x100449c addiu s4, zero, -1
+// 0x01036f90: 0x1036f90: jal   0x100449c addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 12
 	ldloc.0
@@ -3466,11 +3466,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01036f88: 0x1036f88: j	 0x1037188 sll   zero, zero, 0
-	br L_1037188
+// 0x01036f98: 0x1036f98: j	 0x1037198 sll   zero, zero, 0
+	br L_1037198
 // --- basic block ---
-L_1036f90:
-// 0x01036f90: 0x1036f90: lw    v1, 5148(s1)
+L_1036fa0:
+// 0x01036fa0: 0x1036fa0: lw    v1, 5148(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3479,13 +3479,13 @@ L_1036f90:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01036f94: 0x1036f94: sll   zero, zero, 0
-// 0x01036f98: 0x1036f98: addu  v0, v1, v0
+// 0x01036fa4: 0x1036fa4: sll   zero, zero, 0
+// 0x01036fa8: 0x1036fa8: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01036f9c: 0x1036f9c: sw    v0, 5148(s1)
+// 0x01036fac: 0x1036fac: sw    v0, 5148(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3494,12 +3494,12 @@ L_1036f90:
 	add
 	ldloc 5
 	stelem.i4
-L_1036fa0:
-// 0x01036fa0: 0x1036fa0: bne   s5, zero, 0x1036fb8 sll   zero, zero, 0
+L_1036fb0:
+// 0x01036fb0: 0x1036fb0: bne   s5, zero, 0x1036fc8 sll   zero, zero, 0
 	ldloc 13
-	brtrue L_1036fb8
+	brtrue L_1036fc8
 // --- basic block ---
-// 0x01036fa8: 0x1036fa8: lw    v0, 5148(s1)
+// 0x01036fb8: 0x1036fb8: lw    v0, 5148(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3508,20 +3508,20 @@ L_1036fa0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01036fac: 0x1036fac: sll   zero, zero, 0
-// 0x01036fb0: 0x1036fb0: addu  v0, s1, v0
+// 0x01036fbc: 0x1036fbc: sll   zero, zero, 0
+// 0x01036fc0: 0x1036fc0: addu  v0, s1, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x01036fb4: 0x1036fb4: sb    zero, 28(v0)
+// 0x01036fc4: 0x1036fc4: sb    zero, 28(v0)
 	ldloc 5
 	ldc.i4.s 28
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1036fb8:
-// 0x01036fb8: 0x1036fb8: lw    s3, 5148(s1)
+L_1036fc8:
+// 0x01036fc8: 0x1036fc8: lw    s3, 5148(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3530,97 +3530,97 @@ L_1036fb8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01036fbc: 0x1036fbc: addiu s6, s1, 28
+// 0x01036fcc: 0x1036fcc: addiu s6, s1, 28
 	ldloc 9
 	ldc.i4.s 28
 	add
 	stloc 16
-// 0x01036fc0: 0x1036fc0: addu  s3, s1, s3
+// 0x01036fd0: 0x1036fd0: addu  s3, s1, s3
 	ldloc 9
 	ldloc 10
 	add
 	stloc 10
-// 0x01036fc4: 0x1036fc4: addiu s3, s3, 28
+// 0x01036fd4: 0x1036fd4: addiu s3, s3, 28
 	ldloc 10
 	ldc.i4.s 28
 	add
 	stloc 10
-// 0x01036fc8: 0x1036fc8: beq   s5, zero, 0x1036fe8 addu  s0, s6, zero
+// 0x01036fd8: 0x1036fd8: beq   s5, zero, 0x1036ff8 addu  s0, s6, zero
 	ldloc 13
 	ldloc 16
 	stloc 7
-	brfalse L_1036fe8
+	brfalse L_1036ff8
 // --- basic block ---
-// 0x01036fd0: 0x1036fd0: lui   s8, 0x10000
+// 0x01036fe0: 0x1036fe0: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 14
-L_1036fd4:
-// 0x01036fd4: 0x1036fd4: lui   s7, 0x10000
+L_1036fe4:
+// 0x01036fe4: 0x1036fe4: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 15
-// 0x01036fd8: 0x1036fd8: addiu s8, s8, -12672
+// 0x01036fe8: 0x1036fe8: addiu s8, s8, -12676
 	ldloc 14
-	ldc.i4 -12672
+	ldc.i4 -12676
 	add
 	stloc 14
-// 0x01036fdc: 0x1036fdc: addiu s7, s7, -12636
+// 0x01036fec: 0x1036fec: addiu s7, s7, -12640
 	ldloc 15
-	ldc.i4 -12636
+	ldc.i4 -12640
 	add
 	stloc 15
-// 0x01036fe0: 0x1036fe0: j	 0x1037178 addu  s4, zero, zero
+// 0x01036ff0: 0x1036ff0: j	 0x1037188 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-	br L_1037178
+	br L_1037188
 // --- basic block ---
-L_1036fe8:
-// 0x01036fe8: 0x1036fe8: sltu  v0, s0, s3
+L_1036ff8:
+// 0x01036ff8: 0x1036ff8: sltu  v0, s0, s3
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc 5
-// 0x01036fec: 0x1036fec: beq   v0, zero, 0x1036fd4 lui   s8, 0x10000
+// 0x01036ffc: 0x1036ffc: beq   v0, zero, 0x1036fe4 lui   s8, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 14
-	brfalse L_1036fd4
+	brfalse L_1036fe4
 // --- basic block ---
-// 0x01036ff4: 0x1036ff4: lb    v0, 0(s0)
+// 0x01037004: 0x1037004: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01036ff8: 0x1036ff8: sll   zero, zero, 0
-// 0x01036ffc: 0x1036ffc: slti  v0, v0, 32
+// 0x01037008: 0x1037008: sll   zero, zero, 0
+// 0x0103700c: 0x103700c: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x01037000: 0x1037000: bne   v0, zero, 0x1036fe8 addiu s0, s0, 1
+// 0x01037010: 0x1037010: bne   v0, zero, 0x1036ff8 addiu s0, s0, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_1036fe8
+	brtrue L_1036ff8
 // --- basic block ---
-// 0x01037008: 0x1037008: j	 0x1036fd4 addiu s0, s0, -1
+// 0x01037018: 0x1037018: j	 0x1036fe4 addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-	br L_1036fd4
+	br L_1036fe4
 // --- basic block ---
-L_1037010:
-// 0x01037010: 0x1037010: bne   s5, zero, 0x10370f4 addu  s2, s3, zero
+L_1037020:
+// 0x01037020: 0x1037020: bne   s5, zero, 0x1037104 addu  s2, s3, zero
 	ldloc 13
 	ldloc 10
 	stloc 11
-	brtrue L_10370f4
+	brtrue L_1037104
 // --- basic block ---
-// 0x01037018: 0x1037018: addiu a1, zero, 10
+// 0x01037028: 0x1037028: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0103701c: 0x103701c: jal   0x1001a5c addu  a0, s0, zero
+// 0x0103702c: 0x103702c: jal   0x1001a5c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3630,13 +3630,13 @@ L_1037010:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01037024: 0x1037024: addu  a0, s0, zero
+// 0x01037034: 0x1037034: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01037028: 0x1037028: addiu a1, zero, 13
+// 0x01037038: 0x1037038: addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
-// 0x0103702c: 0x103702c: jal   0x1001a5c sw    v0, 24(sp)
+// 0x0103703c: 0x103703c: jal   0x1001a5c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3652,7 +3652,7 @@ L_1037010:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01037034: 0x1037034: lw    v1, 24(sp)
+// 0x01037044: 0x1037044: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3661,37 +3661,37 @@ L_1037010:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037038: 0x1037038: sll   zero, zero, 0
-// 0x0103703c: 0x103703c: beq   v1, zero, 0x103705c addu  s2, v0, zero
+// 0x01037048: 0x1037048: sll   zero, zero, 0
+// 0x0103704c: 0x103704c: beq   v1, zero, 0x103706c addu  s2, v0, zero
 	ldloc 8
 	ldloc 5
 	stloc 11
-	brfalse L_103705c
+	brfalse L_103706c
 // --- basic block ---
-// 0x01037044: 0x1037044: beq   v0, zero, 0x10370f0 addu  s2, v1, zero
+// 0x01037054: 0x1037054: beq   v0, zero, 0x1037100 addu  s2, v1, zero
 	ldloc 5
 	ldloc 8
 	stloc 11
-	brfalse L_10370f0
+	brfalse L_1037100
 // --- basic block ---
-// 0x0103704c: 0x103704c: sltu  v1, v0, v1
+// 0x0103705c: 0x103705c: sltu  v1, v0, v1
 	ldloc 5
 	ldloc 8
 	clt.un
 	stloc 8
-// 0x01037050: 0x1037050: beq   v1, zero, 0x103705c sll   zero, zero, 0
+// 0x01037060: 0x1037060: beq   v1, zero, 0x103706c sll   zero, zero, 0
 	ldloc 8
-	brfalse L_103705c
+	brfalse L_103706c
 // --- basic block ---
-// 0x01037058: 0x1037058: addu  s2, v0, zero
+// 0x01037068: 0x1037068: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-L_103705c:
-// 0x0103705c: 0x103705c: bne   s2, zero, 0x10370f0 sll   zero, zero, 0
+L_103706c:
+// 0x0103706c: 0x103706c: bne   s2, zero, 0x1037100 sll   zero, zero, 0
 	ldloc 11
-	brtrue L_10370f0
+	brtrue L_1037100
 // --- basic block ---
-// 0x01037064: 0x1037064: jal   0x1001b48 addu  a0, s0, zero
+// 0x01037074: 0x1037074: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3700,25 +3700,25 @@ L_103705c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103706c: 0x103706c: addu  v0, s0, v0
+// 0x0103707c: 0x103707c: addu  v0, s0, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01037070: 0x1037070: beq   s3, v0, 0x10370dc addu  a1, s8, zero
+// 0x01037080: 0x1037080: beq   s3, v0, 0x10370ec addu  a1, s8, zero
 	ldloc 10
 	ldloc 5
 	ldloc 14
 	stloc.2
-	beq  L_10370dc
+	beq  L_10370ec
 // --- basic block ---
-// 0x01037078: 0x1037078: addiu a2, zero, 164
+// 0x01037088: 0x1037088: addiu a2, zero, 164
 	ldc.i4 164
 	stloc.3
-// 0x0103707c: 0x103707c: addu  a3, s7, zero
+// 0x0103708c: 0x103708c: addu  a3, s7, zero
 	ldloc 15
 	stloc 4
-// 0x01037080: 0x1037080: jal   0x100449c addiu a0, zero, 3
+// 0x01037090: 0x1037090: jal   0x100449c addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.0
@@ -3731,7 +3731,7 @@ L_103705c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01037088: 0x1037088: jal   0x1001b48 addu  a0, s0, zero
+// 0x01037098: 0x1037098: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -3740,17 +3740,17 @@ L_103705c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01037090: 0x1037090: addiu v0, v0, 1
+// 0x010370a0: 0x10370a0: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01037094: 0x1037094: addu  a1, s0, v0
+// 0x010370a4: 0x10370a4: addu  a1, s0, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc.2
-// 0x01037098: 0x1037098: jal   0x1036e7c addu  a0, s1, zero
+// 0x010370a8: 0x10370a8: jal   0x1036e8c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3758,12 +3758,12 @@ L_103705c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_input_shift_to_next_line_1036e7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_input_shift_to_next_line_1036e8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010370a0: 0x10370a0: lw    s3, 5148(s1)
+// 0x010370b0: 0x10370b0: lw    s3, 5148(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3772,64 +3772,64 @@ L_103705c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010370a4: 0x10370a4: addu  s0, s6, zero
+// 0x010370b4: 0x10370b4: addu  s0, s6, zero
 	ldloc 16
 	stloc 7
-// 0x010370a8: 0x10370a8: addu  s3, s1, s3
+// 0x010370b8: 0x10370b8: addu  s3, s1, s3
 	ldloc 9
 	ldloc 10
 	add
 	stloc 10
-// 0x010370ac: 0x10370ac: addiu s3, s3, 28
+// 0x010370bc: 0x10370bc: addiu s3, s3, 28
 	ldloc 10
 	ldc.i4.s 28
 	add
 	stloc 10
-L_10370b0:
-// 0x010370b0: 0x10370b0: sltu  v0, s0, s3
+L_10370c0:
+// 0x010370c0: 0x10370c0: sltu  v0, s0, s3
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc 5
-// 0x010370b4: 0x10370b4: beq   v0, zero, 0x103717c sll   zero, zero, 0
+// 0x010370c4: 0x10370c4: beq   v0, zero, 0x103718c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103717c
+	brfalse L_103718c
 // --- basic block ---
-// 0x010370bc: 0x10370bc: lb    v0, 0(s0)
+// 0x010370cc: 0x10370cc: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010370c0: 0x10370c0: sll   zero, zero, 0
-// 0x010370c4: 0x10370c4: slti  v0, v0, 32
+// 0x010370d0: 0x10370d0: sll   zero, zero, 0
+// 0x010370d4: 0x10370d4: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x010370c8: 0x10370c8: bne   v0, zero, 0x10370b0 addiu s0, s0, 1
+// 0x010370d8: 0x10370d8: bne   v0, zero, 0x10370c0 addiu s0, s0, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_10370b0
+	brtrue L_10370c0
 // --- basic block ---
-// 0x010370d0: 0x10370d0: addiu s0, s0, -1
+// 0x010370e0: 0x10370e0: addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x010370d4: 0x10370d4: j	 0x103717c sltu  v0, s0, s3
+// 0x010370e4: 0x10370e4: j	 0x103718c sltu  v0, s0, s3
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc 5
-	br L_103717c
+	br L_103718c
 // --- basic block ---
-L_10370dc:
-// 0x010370dc: 0x10370dc: addu  a0, s1, zero
+L_10370ec:
+// 0x010370ec: 0x10370ec: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010370e0: 0x10370e0: jal   0x1036e7c addu  a1, s0, zero
+// 0x010370f0: 0x10370f0: jal   0x1036e8c addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -3837,21 +3837,21 @@ L_10370dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_input_shift_to_next_line_1036e7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_input_shift_to_next_line_1036e8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010370e8: 0x10370e8: j	 0x1037188 sll   zero, zero, 0
-	br L_1037188
+// 0x010370f8: 0x10370f8: j	 0x1037198 sll   zero, zero, 0
+	br L_1037198
 // --- basic block ---
-L_10370f0:
-// 0x010370f0: 0x10370f0: sb    zero, 0(s2)
+L_1037100:
+// 0x01037100: 0x1037100: sb    zero, 0(s2)
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10370f4:
-// 0x010370f4: 0x10370f4: lw    v0, 20(s1)
+L_1037104:
+// 0x01037104: 0x1037104: lw    v0, 20(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3860,12 +3860,12 @@ L_10370f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010370f8: 0x10370f8: sll   zero, zero, 0
-// 0x010370fc: 0x10370fc: beq   v0, zero, 0x103710c sll   zero, zero, 0
+// 0x01037108: 0x1037108: sll   zero, zero, 0
+// 0x0103710c: 0x103710c: beq   v0, zero, 0x103711c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103710c
+	brfalse L_103711c
 // --- basic block ---
-// 0x01037104: 0x1037104: jalr  v0 addu  a0, s0, zero
+// 0x01037114: 0x1037114: jalr  v0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
@@ -3879,8 +3879,8 @@ L_10370f4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_103710c:
-// 0x0103710c: 0x103710c: lw    v0, 24(s1)
+L_103711c:
+// 0x0103711c: 0x103711c: lw    v0, 24(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3889,7 +3889,7 @@ L_103710c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01037110: 0x1037110: lw    a0, 8(s1)
+// 0x01037120: 0x1037120: lw    a0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3898,7 +3898,7 @@ L_103710c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037114: 0x1037114: lw    a1, 12(s1)
+// 0x01037124: 0x1037124: lw    a1, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3907,10 +3907,10 @@ L_103710c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037118: 0x1037118: addu  a2, s0, zero
+// 0x01037128: 0x1037128: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x0103711c: 0x103711c: jalr  v0 subu  a3, s2, s0
+// 0x0103712c: 0x103712c: jalr  v0 subu  a3, s2, s0
 	ldloc 5
 	ldloc 11
 	ldloc 7
@@ -3926,15 +3926,15 @@ L_103710c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01037124: 0x1037124: beq   s5, zero, 0x1037154 or    s4, s4, v0
+// 0x01037134: 0x1037134: beq   s5, zero, 0x1037164 or    s4, s4, v0
 	ldloc 13
 	ldloc 12
 	ldloc 5
 	or
 	stloc 12
-	brfalse L_1037154
+	brfalse L_1037164
 // --- basic block ---
-// 0x0103712c: 0x103712c: lw    a2, 5148(s1)
+// 0x0103713c: 0x103713c: lw    a2, 5148(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3943,15 +3943,15 @@ L_103710c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01037130: 0x1037130: addu  s4, zero, zero
+// 0x01037140: 0x1037140: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x01037134: 0x1037134: subu  a2, a2, v0
+// 0x01037144: 0x1037144: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01037138: 0x1037138: beq   a2, zero, 0x1037188 sw    a2, 5148(s1)
+// 0x01037148: 0x1037148: beq   a2, zero, 0x1037198 sw    a2, 5148(s1)
 	ldloc.3
 	ldloc 6
 	ldloc 9
@@ -3961,14 +3961,14 @@ L_103710c:
 	add
 	ldloc.3
 	stelem.i4
-	brfalse L_1037188
+	brfalse L_1037198
 // --- basic block ---
-// 0x01037140: 0x1037140: addu  a1, s0, v0
+// 0x01037150: 0x1037150: addu  a1, s0, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc.2
-// 0x01037144: 0x1037144: jal   0x100186c addiu a0, s1, 28
+// 0x01037154: 0x1037154: jal   0x100186c addiu a0, s1, 28
 	ldloc 9
 	ldc.i4.s 28
 	add
@@ -3982,59 +3982,59 @@ L_103710c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103714c: 0x103714c: j	 0x1037188 sll   zero, zero, 0
-	br L_1037188
+// 0x0103715c: 0x103715c: j	 0x1037198 sll   zero, zero, 0
+	br L_1037198
 // --- basic block ---
-L_1037154:
-// 0x01037154: 0x1037154: addiu s0, s2, 1
+L_1037164:
+// 0x01037164: 0x1037164: addiu s0, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 7
-L_1037158:
-// 0x01037158: 0x1037158: lb    v1, 0(s0)
+L_1037168:
+// 0x01037168: 0x1037168: lb    v1, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103715c: 0x103715c: sll   zero, zero, 0
-// 0x01037160: 0x1037160: slti  v1, v1, 32
+// 0x0103716c: 0x103716c: sll   zero, zero, 0
+// 0x01037170: 0x1037170: slti  v1, v1, 32
 	ldloc 8
 	ldc.i4.s 32
 	clt
 	stloc 8
-// 0x01037164: 0x1037164: beq   v1, zero, 0x1037178 sltu  v0, s0, s3
+// 0x01037174: 0x1037174: beq   v1, zero, 0x1037188 sltu  v0, s0, s3
 	ldloc 8
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc 5
-	brfalse L_1037178
+	brfalse L_1037188
 // --- basic block ---
-// 0x0103716c: 0x103716c: bne   v0, zero, 0x1037158 addiu s0, s0, 1
+// 0x0103717c: 0x103717c: bne   v0, zero, 0x1037168 addiu s0, s0, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_1037158
+	brtrue L_1037168
 // --- basic block ---
-// 0x01037174: 0x1037174: addiu s0, s0, -1
+// 0x01037184: 0x1037184: addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-L_1037178:
-// 0x01037178: 0x1037178: sltu  v0, s0, s3
+L_1037188:
+// 0x01037188: 0x1037188: sltu  v0, s0, s3
 	ldloc 7
 	ldloc 10
 	clt.un
 	stloc 5
-L_103717c:
-// 0x0103717c: 0x103717c: bne   v0, zero, 0x1037010 sll   zero, zero, 0
+L_103718c:
+// 0x0103718c: 0x103718c: bne   v0, zero, 0x1037020 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1037010
+	brtrue L_1037020
 // --- basic block ---
-// 0x01037184: 0x1037184: sw    zero, 5148(s1)
+// 0x01037194: 0x1037194: sw    zero, 5148(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4043,12 +4043,12 @@ L_103717c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1037188:
-// 0x01037188: 0x1037188: lw    ra, 68(sp)
-// 0x0103718c: 0x103718c: addu  v0, s4, zero
+L_1037198:
+// 0x01037198: 0x1037198: lw    ra, 68(sp)
+// 0x0103719c: 0x103719c: addu  v0, s4, zero
 	ldloc 12
 	stloc 5
-// 0x01037190: 0x1037190: lw    s8, 64(sp)
+// 0x010371a0: 0x10371a0: lw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4057,7 +4057,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01037194: 0x1037194: lw    s7, 60(sp)
+// 0x010371a4: 0x10371a4: lw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4066,7 +4066,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01037198: 0x1037198: lw    s6, 56(sp)
+// 0x010371a8: 0x10371a8: lw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4075,7 +4075,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0103719c: 0x103719c: lw    s5, 52(sp)
+// 0x010371ac: 0x10371ac: lw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4084,7 +4084,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010371a0: 0x10371a0: lw    s4, 48(sp)
+// 0x010371b0: 0x10371b0: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4093,7 +4093,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010371a4: 0x10371a4: lw    s3, 44(sp)
+// 0x010371b4: 0x10371b4: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4102,7 +4102,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010371a8: 0x10371a8: lw    s2, 40(sp)
+// 0x010371b8: 0x10371b8: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4111,7 +4111,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010371ac: 0x10371ac: lw    s1, 36(sp)
+// 0x010371bc: 0x10371bc: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4120,7 +4120,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010371b0: 0x10371b0: lw    s0, 32(sp)
+// 0x010371c0: 0x10371c0: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4129,7 +4129,7 @@ L_1037188:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010371b4: 0x10371b4: jr    ra addiu sp, sp, 72
+// 0x010371c4: 0x10371c4: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -4141,7 +4141,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_io_same_10371bc(int32,int32,int32)
+.method public static int32 roadmap_io_same_10371cc(int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4170,66 +4170,66 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010371bc: 0x10371bc: lw    v1, 0(a0)
+// 0x010371cc: 0x10371cc: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010371c0: 0x10371c0: lw    a2, 0(a1)
+// 0x010371d0: 0x10371d0: lw    a2, 0(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010371c4: 0x10371c4: sll   zero, zero, 0
-// 0x010371c8: 0x10371c8: bne   v1, a2, 0x1037230 addu  v0, zero, zero
+// 0x010371d4: 0x10371d4: sll   zero, zero, 0
+// 0x010371d8: 0x10371d8: bne   v1, a2, 0x1037240 addu  v0, zero, zero
 	ldloc 4
 	ldloc.2
 	ldc.i4.s 0
 	stloc.3
-	bne.un L_1037230
+	bne.un L_1037240
 // --- basic block ---
-// 0x010371d0: 0x10371d0: addiu v0, zero, 1
+// 0x010371e0: 0x10371e0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010371d4: 0x10371d4: beq   v1, v0, 0x1037204 sll   zero, zero, 0
+// 0x010371e4: 0x10371e4: beq   v1, v0, 0x1037214 sll   zero, zero, 0
 	ldloc 4
 	ldloc.3
-	beq  L_1037204
+	beq  L_1037214
 // --- basic block ---
-// 0x010371dc: 0x10371dc: addiu v0, zero, 2
+// 0x010371ec: 0x10371ec: addiu v0, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x010371e0: 0x10371e0: beq   v1, v0, 0x1037204 sll   zero, zero, 0
+// 0x010371f0: 0x10371f0: beq   v1, v0, 0x1037214 sll   zero, zero, 0
 	ldloc 4
 	ldloc.3
-	beq  L_1037204
+	beq  L_1037214
 // --- basic block ---
-// 0x010371e8: 0x10371e8: addiu v0, zero, 3
+// 0x010371f8: 0x10371f8: addiu v0, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x010371ec: 0x10371ec: beq   v1, v0, 0x1037204 addiu a2, zero, 4
+// 0x010371fc: 0x10371fc: beq   v1, v0, 0x1037214 addiu a2, zero, 4
 	ldloc 4
 	ldloc.3
 	ldc.i4.4
 	stloc.2
-	beq  L_1037204
+	beq  L_1037214
 // --- basic block ---
-// 0x010371f4: 0x10371f4: bne   v1, a2, 0x1037230 addiu v0, zero, 1
+// 0x01037204: 0x1037204: bne   v1, a2, 0x1037240 addiu v0, zero, 1
 	ldloc 4
 	ldloc.2
 	ldc.i4.1
 	stloc.3
-	bne.un L_1037230
+	bne.un L_1037240
 // --- basic block ---
-// 0x010371fc: 0x10371fc: j	 0x103721c sll   zero, zero, 0
-	br L_103721c
+// 0x0103720c: 0x103720c: j	 0x103722c sll   zero, zero, 0
+	br L_103722c
 // --- basic block ---
-L_1037204:
-// 0x01037204: 0x1037204: lw    v1, 8(a0)
+L_1037214:
+// 0x01037214: 0x1037214: lw    v1, 8(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4238,7 +4238,7 @@ L_1037204:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01037208: 0x1037208: lw    v0, 8(a1)
+// 0x01037218: 0x1037218: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4247,21 +4247,21 @@ L_1037204:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103720c: 0x103720c: sll   zero, zero, 0
-// 0x01037210: 0x1037210: xor   v0, v1, v0
+// 0x0103721c: 0x103721c: sll   zero, zero, 0
+// 0x01037220: 0x1037220: xor   v0, v1, v0
 	ldloc 4
 	ldloc.3
 	xor
 	stloc.3
-// 0x01037214: 0x1037214: jr    ra sltiu v0, v0, 1
+// 0x01037224: 0x1037224: jr    ra sltiu v0, v0, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
 	br __CIBYL_function_return
 // --- basic block ---
-L_103721c:
-// 0x0103721c: 0x103721c: lw    v1, 8(a0)
+L_103722c:
+// 0x0103722c: 0x103722c: lw    v1, 8(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4270,7 +4270,7 @@ L_103721c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01037220: 0x1037220: lw    v0, 8(a1)
+// 0x01037230: 0x1037230: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4279,19 +4279,19 @@ L_103721c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01037224: 0x1037224: sll   zero, zero, 0
-// 0x01037228: 0x1037228: xor   v0, v1, v0
+// 0x01037234: 0x1037234: sll   zero, zero, 0
+// 0x01037238: 0x1037238: xor   v0, v1, v0
 	ldloc 4
 	ldloc.3
 	xor
 	stloc.3
-// 0x0103722c: 0x103722c: sltiu v0, v0, 1
+// 0x0103723c: 0x103723c: sltiu v0, v0, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-L_1037230:
-// 0x01037230: 0x1037230: jr    ra sll   zero, zero, 0
+L_1037240:
+// 0x01037240: 0x1037240: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -4299,7 +4299,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_io_close_1037238(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_io_close_1037248(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s0,int32 ra)
@@ -4337,22 +4337,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037238: 0x1037238: lw    v0, 0(a0)
+// 0x01037248: 0x1037248: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0103723c: 0x103723c: addiu sp, sp, -24
+// 0x0103724c: 0x103724c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01037240: 0x1037240: addiu v1, zero, 1
+// 0x01037250: 0x1037250: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01037244: 0x1037244: sw    s0, 16(sp)
+// 0x01037254: 0x1037254: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4361,41 +4361,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037248: 0x1037248: sw    ra, 20(sp)
-// 0x0103724c: 0x103724c: beq   v0, v1, 0x1037278 addu  s0, a0, zero
+// 0x01037258: 0x1037258: sw    ra, 20(sp)
+// 0x0103725c: 0x103725c: beq   v0, v1, 0x1037288 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_1037278
+	beq  L_1037288
 // --- basic block ---
-// 0x01037254: 0x1037254: addiu v1, zero, 2
+// 0x01037264: 0x1037264: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01037258: 0x1037258: beq   v0, v1, 0x103728c addiu v1, zero, 3
+// 0x01037268: 0x1037268: beq   v0, v1, 0x103729c addiu v1, zero, 3
 	ldloc 7
 	ldloc 5
 	ldc.i4.3
 	stloc 5
-	beq  L_103728c
+	beq  L_103729c
 // --- basic block ---
-// 0x01037260: 0x1037260: beq   v0, v1, 0x10372a0 addiu v1, zero, 4
+// 0x01037270: 0x1037270: beq   v0, v1, 0x10372b0 addiu v1, zero, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	beq  L_10372a0
+	beq  L_10372b0
 // --- basic block ---
-// 0x01037268: 0x1037268: bne   v0, v1, 0x10372c0 sll   zero, zero, 0
+// 0x01037278: 0x1037278: bne   v0, v1, 0x10372d0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_10372c0
+	bne.un L_10372d0
 // --- basic block ---
-// 0x01037270: 0x1037270: j	 0x10372b4 sll   zero, zero, 0
-	br L_10372b4
+// 0x01037280: 0x1037280: j	 0x10372c4 sll   zero, zero, 0
+	br L_10372c4
 // --- basic block ---
-L_1037278:
-// 0x01037278: 0x1037278: lw    a0, 8(a0)
+L_1037288:
+// 0x01037288: 0x1037288: lw    a0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4404,22 +4404,22 @@ L_1037278:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103727c: 0x103727c: jal   0x104d44c sll   zero, zero, 0
+// 0x0103728c: 0x103728c: jal   0x104d45c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01037284: 0x1037284: j	 0x10372c0 sll   zero, zero, 0
-	br L_10372c0
+// 0x01037294: 0x1037294: j	 0x10372d0 sll   zero, zero, 0
+	br L_10372d0
 // --- basic block ---
-L_103728c:
-// 0x0103728c: 0x103728c: lw    a0, 8(a0)
+L_103729c:
+// 0x0103729c: 0x103729c: lw    a0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4428,22 +4428,22 @@ L_103728c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037290: 0x1037290: jal   0x1051af0 sll   zero, zero, 0
+// 0x010372a0: 0x10372a0: jal   0x1051b00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_net_close_1051af0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_net_close_1051b00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01037298: 0x1037298: j	 0x10372c0 sll   zero, zero, 0
-	br L_10372c0
+// 0x010372a8: 0x10372a8: j	 0x10372d0 sll   zero, zero, 0
+	br L_10372d0
 // --- basic block ---
-L_10372a0:
-// 0x010372a0: 0x10372a0: lw    a0, 8(a0)
+L_10372b0:
+// 0x010372b0: 0x10372b0: lw    a0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4452,17 +4452,17 @@ L_10372a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010372a4: 0x10372a4: jal   0x104fa10 sll   zero, zero, 0
-	call int32 Cibyl59::roadmap_serial_close_104fa10()
+// 0x010372b4: 0x10372b4: jal   0x104fa20 sll   zero, zero, 0
+	call int32 Cibyl59::roadmap_serial_close_104fa20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010372ac: 0x10372ac: j	 0x10372c0 sll   zero, zero, 0
-	br L_10372c0
+// 0x010372bc: 0x10372bc: j	 0x10372d0 sll   zero, zero, 0
+	br L_10372d0
 // --- basic block ---
-L_10372b4:
-// 0x010372b4: 0x10372b4: lw    a0, 8(a0)
+L_10372c4:
+// 0x010372c4: 0x10372c4: lw    a0, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4471,19 +4471,19 @@ L_10372b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010372b8: 0x10372b8: jal   0x10ac514 sll   zero, zero, 0
-	call void Cibyl129::roadmap_spawn_close_pipe_10ac514()
+// 0x010372c8: 0x10372c8: jal   0x10acb5c sll   zero, zero, 0
+	call void Cibyl129::roadmap_spawn_close_pipe_10acb5c()
 // --- basic block ---
-L_10372c0:
-// 0x010372c0: 0x10372c0: lw    ra, 20(sp)
-// 0x010372c4: 0x10372c4: sw    zero, 0(s0)
+L_10372d0:
+// 0x010372d0: 0x10372d0: lw    ra, 20(sp)
+// 0x010372d4: 0x10372d4: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010372c8: 0x10372c8: lw    s0, 16(sp)
+// 0x010372d8: 0x10372d8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4492,7 +4492,7 @@ L_10372c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010372cc: 0x10372cc: jr    ra addiu sp, sp, 24
+// 0x010372dc: 0x10372dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4504,7 +4504,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_io_write_10372d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_io_write_10372e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 t0)
@@ -4542,73 +4542,73 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010372d4: 0x10372d4: lw    v0, 0(a0)
+// 0x010372e4: 0x10372e4: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010372d8: 0x10372d8: addiu sp, sp, -24
+// 0x010372e8: 0x10372e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010372dc: 0x10372dc: addiu v1, v0, -1
+// 0x010372ec: 0x10372ec: addiu v1, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010372e0: 0x10372e0: sltiu t0, v1, 5
+// 0x010372f0: 0x10372f0: sltiu t0, v1, 5
 	ldloc 5
 	ldc.i4.5
 	clt.un
 	stloc 9
-// 0x010372e4: 0x10372e4: sw    ra, 20(sp)
-// 0x010372e8: 0x10372e8: beq   t0, zero, 0x1037310 addu  v0, a2, zero
+// 0x010372f4: 0x10372f4: sw    ra, 20(sp)
+// 0x010372f8: 0x10372f8: beq   t0, zero, 0x1037320 addu  v0, a2, zero
 	ldloc 9
 	ldloc.3
 	stloc 6
-	brfalse L_1037310
+	brfalse L_1037320
 // --- basic block ---
-// 0x010372f0: 0x10372f0: lui   a2, 0x20000
+// 0x01037300: 0x1037300: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010372f4: 0x10372f4: sll   v1, v1, 2
+// 0x01037304: 0x1037304: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010372f8: 0x10372f8: addiu a2, a2, 26228
+// 0x01037308: 0x1037308: addiu a2, a2, 26692
 	ldloc.3
-	ldc.i4 26228
+	ldc.i4 26692
 	add
 	stloc.3
-// 0x010372fc: 0x10372fc: addu  v1, a2, v1
+// 0x0103730c: 0x103730c: addu  v1, a2, v1
 	ldloc.3
 	ldloc 5
 	add
 	stloc 5
-// 0x01037300: 0x1037300: lw    v1, 0(v1)
+// 0x01037310: 0x1037310: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01037304: 0x1037304: sll   zero, zero, 0
-// 0x01037308: 0x1037308: jr    v1 sll   zero, zero, 0
+// 0x01037314: 0x1037314: sll   zero, zero, 0
+// 0x01037318: 0x1037318: jr    v1 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1037310:
-// 0x01037310: 0x1037310: j	 0x1037360 addiu v0, zero, -1
+L_1037320:
+// 0x01037320: 0x1037320: j	 0x1037370 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-	br L_1037360
+	br L_1037370
 // --- basic block ---
-L_1037318:
-// 0x01037318: 0x1037318: lw    a0, 8(a0)
+L_1037328:
+// 0x01037328: 0x1037328: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4617,7 +4617,7 @@ L_1037318:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103731c: 0x103731c: jal   0x104d46c addu  a2, v0, zero
+// 0x0103732c: 0x103732c: jal   0x104d47c addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -4625,16 +4625,16 @@ L_1037318:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01037324: 0x1037324: j	 0x1037360 sll   zero, zero, 0
-	br L_1037360
+// 0x01037334: 0x1037334: j	 0x1037370 sll   zero, zero, 0
+	br L_1037370
 // --- basic block ---
-L_103732c:
-// 0x0103732c: 0x103732c: lw    a0, 8(a0)
+L_103733c:
+// 0x0103733c: 0x103733c: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4643,7 +4643,7 @@ L_103732c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037330: 0x1037330: jal   0x1052018 addu  a2, v0, zero
+// 0x01037340: 0x1037340: jal   0x1052028 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -4651,16 +4651,16 @@ L_103732c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_send_1052018(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_send_1052028(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01037338: 0x1037338: j	 0x1037360 sll   zero, zero, 0
-	br L_1037360
+// 0x01037348: 0x1037348: j	 0x1037370 sll   zero, zero, 0
+	br L_1037370
 // --- basic block ---
-L_1037340:
-// 0x01037340: 0x1037340: lw    a0, 8(a0)
+L_1037350:
+// 0x01037350: 0x1037350: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4669,17 +4669,17 @@ L_1037340:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037344: 0x1037344: jal   0x104fa08 addu  a2, v0, zero
+// 0x01037354: 0x1037354: jal   0x104fa18 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-	call int32 Cibyl59::roadmap_serial_write_104fa08()
+	call int32 Cibyl59::roadmap_serial_write_104fa18()
 	stloc 6
 // --- basic block ---
-// 0x0103734c: 0x103734c: j	 0x1037360 sll   zero, zero, 0
-	br L_1037360
+// 0x0103735c: 0x103735c: j	 0x1037370 sll   zero, zero, 0
+	br L_1037370
 // --- basic block ---
-L_1037354:
-// 0x01037354: 0x1037354: lw    a0, 8(a0)
+L_1037364:
+// 0x01037364: 0x1037364: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4688,16 +4688,16 @@ L_1037354:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037358: 0x1037358: jal   0x10ac504 addu  a2, v0, zero
+// 0x01037368: 0x1037368: jal   0x10acb4c addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-	call int32 Cibyl129::roadmap_spawn_write_pipe_10ac504()
+	call int32 Cibyl129::roadmap_spawn_write_pipe_10acb4c()
 	stloc 6
 // --- basic block ---
-L_1037360:
-// 0x01037360: 0x1037360: lw    ra, 20(sp)
-// 0x01037364: 0x1037364: sll   zero, zero, 0
-// 0x01037368: 0x1037368: jr    ra addiu sp, sp, 24
+L_1037370:
+// 0x01037370: 0x1037370: lw    ra, 20(sp)
+// 0x01037374: 0x1037374: sll   zero, zero, 0
+// 0x01037378: 0x1037378: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4707,20 +4707,20 @@ L_1037360:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17003288
-	beq  L_1037318
+	ldc.i4 17003304
+	beq  L_1037328
 	ldloc 5
-	ldc.i4 17003308
-	beq  L_103732c
+	ldc.i4 17003324
+	beq  L_103733c
 	ldloc 5
-	ldc.i4 17003328
-	beq  L_1037340
+	ldc.i4 17003344
+	beq  L_1037350
 	ldloc 5
-	ldc.i4 17003348
-	beq  L_1037354
+	ldc.i4 17003364
+	beq  L_1037364
 	ldloc 5
-	ldc.i4 17003360
-	beq  L_1037360
+	ldc.i4 17003376
+	beq  L_1037370
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -4728,7 +4728,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_io_read_1037370(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_io_read_1037380(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4763,73 +4763,73 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037370: 0x1037370: lw    v0, 0(a0)
+// 0x01037380: 0x1037380: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01037374: 0x1037374: addiu sp, sp, -24
+// 0x01037384: 0x1037384: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01037378: 0x1037378: addiu v1, v0, -1
+// 0x01037388: 0x1037388: addiu v1, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0103737c: 0x103737c: sltiu a3, v1, 5
+// 0x0103738c: 0x103738c: sltiu a3, v1, 5
 	ldloc 6
 	ldc.i4.5
 	clt.un
 	stloc 4
-// 0x01037380: 0x1037380: sw    ra, 20(sp)
-// 0x01037384: 0x1037384: beq   a3, zero, 0x10373fc addiu v0, zero, -1
+// 0x01037390: 0x1037390: sw    ra, 20(sp)
+// 0x01037394: 0x1037394: beq   a3, zero, 0x103740c addiu v0, zero, -1
 	ldloc 4
 	ldc.i4.m1
 	stloc 5
-	brfalse L_10373fc
+	brfalse L_103740c
 // --- basic block ---
-// 0x0103738c: 0x103738c: lui   v0, 0x20000
+// 0x0103739c: 0x103739c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01037390: 0x1037390: addiu v0, v0, 26248
+// 0x010373a0: 0x10373a0: addiu v0, v0, 26712
 	ldloc 5
-	ldc.i4 26248
+	ldc.i4 26712
 	add
 	stloc 5
-// 0x01037394: 0x1037394: sll   v1, v1, 2
+// 0x010373a4: 0x10373a4: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01037398: 0x1037398: addu  v1, v0, v1
+// 0x010373a8: 0x10373a8: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x0103739c: 0x103739c: lw    v0, 0(v1)
+// 0x010373ac: 0x10373ac: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010373a0: 0x10373a0: sll   zero, zero, 0
-// 0x010373a4: 0x10373a4: jr    v0 sll   zero, zero, 0
+// 0x010373b0: 0x10373b0: sll   zero, zero, 0
+// 0x010373b4: 0x10373b4: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_10373ac:
-// 0x010373ac: 0x10373ac: j	 0x10373fc addu  v0, zero, zero
+L_10373bc:
+// 0x010373bc: 0x10373bc: j	 0x103740c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10373fc
+	br L_103740c
 // --- basic block ---
-L_10373b4:
-// 0x010373b4: 0x10373b4: lw    a0, 8(a0)
+L_10373c4:
+// 0x010373c4: 0x10373c4: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4838,22 +4838,22 @@ L_10373b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010373b8: 0x10373b8: jal   0x104d494 sll   zero, zero, 0
+// 0x010373c8: 0x10373c8: jal   0x104d4a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_read_104d494(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_read_104d4a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010373c0: 0x10373c0: j	 0x10373fc sll   zero, zero, 0
-	br L_10373fc
+// 0x010373d0: 0x10373d0: j	 0x103740c sll   zero, zero, 0
+	br L_103740c
 // --- basic block ---
-L_10373c8:
-// 0x010373c8: 0x10373c8: lw    a0, 8(a0)
+L_10373d8:
+// 0x010373d8: 0x10373d8: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4862,22 +4862,22 @@ L_10373c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010373cc: 0x10373cc: jal   0x1051e64 sll   zero, zero, 0
+// 0x010373dc: 0x10373dc: jal   0x1051e74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_receive_1051e64(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_receive_1051e74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010373d4: 0x10373d4: j	 0x10373fc sll   zero, zero, 0
-	br L_10373fc
+// 0x010373e4: 0x10373e4: j	 0x103740c sll   zero, zero, 0
+	br L_103740c
 // --- basic block ---
-L_10373dc:
-// 0x010373dc: 0x10373dc: lw    a0, 8(a0)
+L_10373ec:
+// 0x010373ec: 0x10373ec: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4886,20 +4886,20 @@ L_10373dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010373e0: 0x10373e0: jal   0x104f9d8 sll   zero, zero, 0
+// 0x010373f0: 0x10373f0: jal   0x104f9e8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl59::roadmap_serial_read_104f9d8(int32,int32,int32)
+	call int32 Cibyl59::roadmap_serial_read_104f9e8(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010373e8: 0x10373e8: j	 0x10373fc sll   zero, zero, 0
-	br L_10373fc
+// 0x010373f8: 0x10373f8: j	 0x103740c sll   zero, zero, 0
+	br L_103740c
 // --- basic block ---
-L_10373f0:
-// 0x010373f0: 0x10373f0: lw    a0, 8(a0)
+L_1037400:
+// 0x01037400: 0x1037400: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4908,14 +4908,14 @@ L_10373f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010373f4: 0x10373f4: jal   0x10ac50c sll   zero, zero, 0
-	call int32 Cibyl129::roadmap_spawn_read_pipe_10ac50c()
+// 0x01037404: 0x1037404: jal   0x10acb54 sll   zero, zero, 0
+	call int32 Cibyl129::roadmap_spawn_read_pipe_10acb54()
 	stloc 5
 // --- basic block ---
-L_10373fc:
-// 0x010373fc: 0x10373fc: lw    ra, 20(sp)
-// 0x01037400: 0x1037400: sll   zero, zero, 0
-// 0x01037404: 0x1037404: jr    ra addiu sp, sp, 24
+L_103740c:
+// 0x0103740c: 0x103740c: lw    ra, 20(sp)
+// 0x01037410: 0x1037410: sll   zero, zero, 0
+// 0x01037414: 0x1037414: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4925,20 +4925,20 @@ L_10373fc:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17003436
-	beq  L_10373ac
+	ldc.i4 17003452
+	beq  L_10373bc
 	ldloc 5
-	ldc.i4 17003444
-	beq  L_10373b4
+	ldc.i4 17003460
+	beq  L_10373c4
 	ldloc 5
-	ldc.i4 17003464
-	beq  L_10373c8
+	ldc.i4 17003480
+	beq  L_10373d8
 	ldloc 5
-	ldc.i4 17003484
-	beq  L_10373dc
+	ldc.i4 17003500
+	beq  L_10373ec
 	ldloc 5
-	ldc.i4 17003504
-	beq  L_10373f0
+	ldc.i4 17003520
+	beq  L_1037400
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
@@ -4946,7 +4946,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_geocode_address_103742c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_geocode_address_103743c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s4,int32 s2,int32 s5,int32 s6,int32 s7,int32 s8,int32 lo,int32 s3,int32 ra)
@@ -5011,12 +5011,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103742c: 0x103742c: addiu sp, sp, -8288
+// 0x0103743c: 0x103743c: addiu sp, sp, -8288
 	ldloc.0
 	ldc.i4 -8288
 	add
 	stloc.0
-// 0x01037430: 0x1037430: sw    s2, 8256(sp)
+// 0x01037440: 0x1037440: sw    s2, 8256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5025,13 +5025,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01037434: 0x1037434: lui   v0, 0x10000
+// 0x01037444: 0x1037444: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01037438: 0x1037438: addu  s2, a1, zero
+// 0x01037448: 0x1037448: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0103743c: 0x103743c: lw    a1, 8304(sp)
+// 0x0103744c: 0x103744c: lw    a1, 8304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5040,7 +5040,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037440: 0x1037440: sw    s3, 8260(sp)
+// 0x01037450: 0x1037450: sw    s3, 8260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5049,7 +5049,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01037444: 0x1037444: sw    s1, 8252(sp)
+// 0x01037454: 0x1037454: sw    s1, 8252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5058,7 +5058,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037448: 0x1037448: sw    s0, 8248(sp)
+// 0x01037458: 0x1037458: sw    s0, 8248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5067,31 +5067,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103744c: 0x103744c: sw    zero, 0(a0)
+// 0x0103745c: 0x103745c: sw    zero, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01037450: 0x1037450: addiu v0, v0, -12604
+// 0x01037460: 0x1037460: addiu v0, v0, -12608
 	ldloc 5
-	ldc.i4 -12604
+	ldc.i4 -12608
 	add
 	stloc 5
-// 0x01037454: 0x1037454: addu  s3, a0, zero
+// 0x01037464: 0x1037464: addu  s3, a0, zero
 	ldloc.1
 	stloc 17
-// 0x01037458: 0x1037458: lui   s1, 0x60000
+// 0x01037468: 0x1037468: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103745c: 0x103745c: addu  a0, a3, zero
+// 0x0103746c: 0x103746c: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x01037460: 0x1037460: lui   s0, 0x60000
+// 0x01037470: 0x1037470: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01037464: 0x1037464: sw    s5, 8268(sp)
+// 0x01037474: 0x1037474: sw    s5, 8268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5100,7 +5100,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01037468: 0x1037468: sw    a2, 8244(sp)
+// 0x01037478: 0x1037478: sw    a2, 8244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5109,7 +5109,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103746c: 0x103746c: sw    a3, 8240(sp)
+// 0x0103747c: 0x103747c: sw    a3, 8240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5118,8 +5118,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01037470: 0x1037470: sw    ra, 8284(sp)
-// 0x01037474: 0x1037474: sw    s8, 8280(sp)
+// 0x01037480: 0x1037480: sw    ra, 8284(sp)
+// 0x01037484: 0x1037484: sw    s8, 8280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5128,7 +5128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01037478: 0x1037478: sw    s7, 8276(sp)
+// 0x01037488: 0x1037488: sw    s7, 8276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5137,7 +5137,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103747c: 0x103747c: sw    s6, 8272(sp)
+// 0x0103748c: 0x103748c: sw    s6, 8272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5146,7 +5146,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01037480: 0x1037480: sw    s4, 8264(sp)
+// 0x01037490: 0x1037490: sw    s4, 8264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5155,25 +5155,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01037484: 0x1037484: sw    v0, -16704(s1)
+// 0x01037494: 0x1037494: sw    v0, -16240(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x01037488: 0x1037488: sw    zero, -16708(s0)
+// 0x01037498: 0x1037498: sw    zero, -16244(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4177
+	ldc.i4 -4061
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103748c: 0x103748c: jal   0x1013c80 addiu s5, zero, -2
+// 0x0103749c: 0x103749c: jal   0x1013c90 addiu s5, zero, -2
 	ldc.i4.s -2
 	stloc 12
 	ldloc.0
@@ -5181,12 +5181,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_by_city_1013c80(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_by_city_1013c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037494: 0x1037494: lw    a2, 8244(sp)
+// 0x010374a4: 0x10374a4: lw    a2, 8244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5195,7 +5195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01037498: 0x1037498: lw    a3, 8240(sp)
+// 0x010374a8: 0x10374a8: lw    a3, 8240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5204,38 +5204,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103749c: 0x103749c: beq   v0, s5, 0x10374ec addiu s4, zero, -1
+// 0x010374ac: 0x10374ac: beq   v0, s5, 0x10374fc addiu s4, zero, -1
 	ldloc 5
 	ldloc 12
 	ldc.i4.m1
 	stloc 10
-	beq  L_10374ec
+	beq  L_10374fc
 // --- basic block ---
-// 0x010374a4: 0x10374a4: beq   v0, s4, 0x10374d8 lui   a0, 0x10000
+// 0x010374b4: 0x10374b4: beq   v0, s4, 0x10374e8 lui   a0, 0x10000
 	ldloc 5
 	ldloc 10
 	ldc.i4 65536
 	stloc.1
-	beq  L_10374d8
+	beq  L_10374e8
 // --- basic block ---
-// 0x010374ac: 0x10374ac: bne   v0, zero, 0x1037508 lui   a0, 0x10000
+// 0x010374bc: 0x10374bc: bne   v0, zero, 0x1037518 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_1037508
+	brtrue L_1037518
 // --- basic block ---
-// 0x010374b4: 0x10374b4: addu  a0, a2, zero
+// 0x010374c4: 0x10374c4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010374b8: 0x10374b8: addu  a1, a3, zero
+// 0x010374c8: 0x10374c8: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010374bc: 0x10374bc: addiu a2, sp, 40
+// 0x010374cc: 0x10374cc: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x010374c0: 0x10374c0: jal   0x10121a4 addiu a3, zero, 256
+// 0x010374d0: 0x10374d0: jal   0x10121b4 addiu a3, zero, 256
 	ldc.i4 256
 	stloc 4
 	ldloc.0
@@ -5243,25 +5243,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_blocks_by_city_10121a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_blocks_by_city_10121b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010374c8: 0x10374c8: bgtz  v0, 0x1037588 addu  s6, v0, zero
+// 0x010374d8: 0x10374d8: bgtz  v0, 0x1037598 addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 13
 	ldc.i4.s 0
-	bgt L_1037588
+	bgt L_1037598
 // --- basic block ---
-// 0x010374d0: 0x10374d0: j	 0x103751c sll   zero, zero, 0
-	br L_103751c
+// 0x010374e0: 0x10374e0: j	 0x103752c sll   zero, zero, 0
+	br L_103752c
 // --- basic block ---
-L_10374d8:
-// 0x010374d8: 0x10374d8: jal   0x101cd60 addiu a0, a0, -12592
+L_10374e8:
+// 0x010374e8: 0x10374e8: jal   0x101cd70 addiu a0, a0, -12596
 	ldloc.1
-	ldc.i4 -12592
+	ldc.i4 -12596
 	add
 	stloc.1
 	ldloc.0
@@ -5269,33 +5269,33 @@ L_10374d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010374e0: 0x10374e0: sw    v0, -16704(s1)
+// 0x010374f0: 0x10374f0: sw    v0, -16240(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x010374e4: 0x10374e4: j	 0x1037500 addiu v0, zero, 4
+// 0x010374f4: 0x10374f4: j	 0x1037510 addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-	br L_1037500
+	br L_1037510
 // --- basic block ---
-L_10374ec:
-// 0x010374ec: 0x10374ec: lui   a0, 0x10000
+L_10374fc:
+// 0x010374fc: 0x10374fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10374f0:
-// 0x010374f0: 0x10374f0: jal   0x101cd60 addiu a0, a0, -12552
+L_1037500:
+// 0x01037500: 0x1037500: jal   0x101cd70 addiu a0, a0, -12556
 	ldloc.1
-	ldc.i4 -12552
+	ldc.i4 -12556
 	add
 	stloc.1
 	ldloc.0
@@ -5303,39 +5303,39 @@ L_10374f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010374f8: 0x10374f8: sw    v0, -16704(s1)
+// 0x01037508: 0x1037508: sw    v0, -16240(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x010374fc: 0x10374fc: addiu v0, zero, 5
+// 0x0103750c: 0x103750c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-L_1037500:
-// 0x01037500: 0x1037500: j	 0x1037580 sw    v0, -16708(s0)
+L_1037510:
+// 0x01037510: 0x1037510: j	 0x1037590 sw    v0, -16244(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4177
+	ldc.i4 -4061
 	add
 	ldloc 5
 	stelem.i4
-	br L_1037580
+	br L_1037590
 // --- basic block ---
-L_1037508:
-// 0x01037508: 0x1037508: jal   0x101cd60 addiu a0, a0, -12512
+L_1037518:
+// 0x01037518: 0x1037518: jal   0x101cd70 addiu a0, a0, -12516
 	ldloc.1
-	ldc.i4 -12512
+	ldc.i4 -12516
 	add
 	stloc.1
 	ldloc.0
@@ -5343,50 +5343,50 @@ L_1037508:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037510: 0x1037510: sw    v0, -16704(s1)
+// 0x01037520: 0x1037520: sw    v0, -16240(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x01037514: 0x1037514: j	 0x1037500 addiu v0, zero, 2
+// 0x01037524: 0x1037524: j	 0x1037510 addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-	br L_1037500
+	br L_1037510
 // --- basic block ---
-L_103751c:
-// 0x0103751c: 0x103751c: beq   v0, s5, 0x103754c lui   a0, 0x10000
+L_103752c:
+// 0x0103752c: 0x103752c: beq   v0, s5, 0x103755c lui   a0, 0x10000
 	ldloc 5
 	ldloc 12
 	ldc.i4 65536
 	stloc.1
-	beq  L_103754c
+	beq  L_103755c
 // --- basic block ---
-// 0x01037524: 0x1037524: beq   v0, s4, 0x10374f0 lui   a0, 0x10000
+// 0x01037534: 0x1037534: beq   v0, s4, 0x1037500 lui   a0, 0x10000
 	ldloc 5
 	ldloc 10
 	ldc.i4 65536
 	stloc.1
-	beq  L_10374f0
+	beq  L_1037500
 // --- basic block ---
-// 0x0103752c: 0x103752c: bne   v0, zero, 0x1037560 sll   zero, zero, 0
+// 0x0103753c: 0x103753c: bne   v0, zero, 0x1037570 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1037560
+	brtrue L_1037570
 // --- basic block ---
-// 0x01037534: 0x1037534: lui   a0, 0x10000
+// 0x01037544: 0x1037544: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01037538: 0x1037538: jal   0x101cd60 addiu a0, a0, -12480
+// 0x01037548: 0x1037548: jal   0x101cd70 addiu a0, a0, -12484
 	ldloc.1
-	ldc.i4 -12480
+	ldc.i4 -12484
 	add
 	stloc.1
 	ldloc.0
@@ -5394,29 +5394,29 @@ L_103751c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037540: 0x1037540: sw    v0, -16704(s1)
+// 0x01037550: 0x1037550: sw    v0, -16240(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x01037544: 0x1037544: j	 0x1037500 addiu v0, zero, 3
+// 0x01037554: 0x1037554: j	 0x1037510 addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-	br L_1037500
+	br L_1037510
 // --- basic block ---
-L_103754c:
-// 0x0103754c: 0x103754c: jal   0x101cd60 addiu a0, a0, -12452
+L_103755c:
+// 0x0103755c: 0x103755c: jal   0x101cd70 addiu a0, a0, -12456
 	ldloc.1
-	ldc.i4 -12452
+	ldc.i4 -12456
 	add
 	stloc.1
 	ldloc.0
@@ -5424,39 +5424,39 @@ L_103754c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037554: 0x1037554: sw    v0, -16704(s1)
+// 0x01037564: 0x1037564: sw    v0, -16240(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x01037558: 0x1037558: addiu v0, zero, 6
+// 0x01037568: 0x1037568: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x0103755c: 0x103755c: sw    v0, -16708(s0)
+// 0x0103756c: 0x103756c: sw    v0, -16244(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4177
+	ldc.i4 -4061
 	add
 	ldloc 5
 	stelem.i4
-L_1037560:
-// 0x01037560: 0x1037560: lui   a0, 0x10000
+L_1037570:
+// 0x01037570: 0x1037570: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01037564: 0x1037564: jal   0x101cd60 addiu a0, a0, -12412
+// 0x01037574: 0x1037574: jal   0x101cd70 addiu a0, a0, -12416
 	ldloc.1
-	ldc.i4 -12412
+	ldc.i4 -12416
 	add
 	stloc.1
 	ldloc.0
@@ -5464,73 +5464,73 @@ L_1037560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103756c: 0x103756c: lui   v1, 0x60000
+// 0x0103757c: 0x103757c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01037570: 0x1037570: sw    v0, -16704(v1)
+// 0x01037580: 0x1037580: sw    v0, -16240(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x01037574: 0x1037574: addiu v1, zero, 3
+// 0x01037584: 0x1037584: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x01037578: 0x1037578: lui   v0, 0x60000
+// 0x01037588: 0x1037588: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103757c: 0x103757c: sw    v1, -16708(v0)
+// 0x0103758c: 0x103758c: sw    v1, -16244(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4177
+	ldc.i4 -4061
 	add
 	ldloc 7
 	stelem.i4
-L_1037580:
-// 0x01037580: 0x1037580: j	 0x10376f8 addu  s0, zero, zero
+L_1037590:
+// 0x01037590: 0x1037590: j	 0x1037708 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10376f8
+	br L_1037708
 // --- basic block ---
-L_1037588:
-// 0x01037588: 0x1037588: slti  v0, v0, 257
+L_1037598:
+// 0x01037598: 0x1037598: slti  v0, v0, 257
 	ldloc 5
 	ldc.i4 257
 	clt
 	stloc 5
-// 0x0103758c: 0x103758c: bne   v0, zero, 0x10375b8 lui   a1, 0x10000
+// 0x0103759c: 0x103759c: bne   v0, zero, 0x10375c8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10375b8
+	brtrue L_10375c8
 // --- basic block ---
-// 0x01037594: 0x1037594: lui   a3, 0x10000
+// 0x010375a4: 0x10375a4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01037598: 0x1037598: addiu a1, a1, -12380
+// 0x010375a8: 0x10375a8: addiu a1, a1, -12384
 	ldloc.2
-	ldc.i4 -12380
+	ldc.i4 -12384
 	add
 	stloc.2
-// 0x0103759c: 0x103759c: addiu a3, a3, -12352
+// 0x010375ac: 0x10375ac: addiu a3, a3, -12356
 	ldloc 4
-	ldc.i4 -12352
+	ldc.i4 -12356
 	add
 	stloc 4
-// 0x010375a0: 0x10375a0: addiu a0, zero, 4
+// 0x010375b0: 0x10375b0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010375a4: 0x10375a4: jal   0x100449c addiu a2, zero, 129
+// 0x010375b4: 0x10375b4: jal   0x100449c addiu a2, zero, 129
 	ldc.i4 129
 	stloc.3
 	ldloc.0
@@ -5543,30 +5543,30 @@ L_1037588:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010375ac: 0x10375ac: addiu v0, zero, 1
+// 0x010375bc: 0x10375bc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010375b0: 0x10375b0: sw    v0, -16708(s0)
+// 0x010375c0: 0x10375c0: sw    v0, -16244(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4177
+	ldc.i4 -4061
 	add
 	ldloc 5
 	stelem.i4
-// 0x010375b4: 0x10375b4: addiu s6, zero, 256
+// 0x010375c4: 0x10375c4: addiu s6, zero, 256
 	ldc.i4 256
 	stloc 13
-L_10375b8:
-// 0x010375b8: 0x10375b8: lb    v0, 0(s2)
+L_10375c8:
+// 0x010375c8: 0x10375c8: lb    v0, 0(s2)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010375bc: 0x10375bc: addiu v1, zero, -1
+// 0x010375cc: 0x10375cc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010375c0: 0x10375c0: beq   v0, zero, 0x10375e0 sw    v1, 8232(sp)
+// 0x010375d0: 0x10375d0: beq   v0, zero, 0x10375f0 sw    v1, 8232(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5576,9 +5576,9 @@ L_10375b8:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_10375e0
+	brfalse L_10375f0
 // --- basic block ---
-// 0x010375c8: 0x10375c8: jal   0x1001b48 addu  a0, s2, zero
+// 0x010375d8: 0x10375d8: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -5587,10 +5587,10 @@ L_10375b8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010375d0: 0x10375d0: addu  a1, v0, zero
+// 0x010375e0: 0x10375e0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010375d4: 0x10375d4: jal   0x10087a8 addu  a0, s2, zero
+// 0x010375e4: 0x10375e4: jal   0x10087b8 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -5598,12 +5598,12 @@ L_10375b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_street_address_10087a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_street_address_10087b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010375dc: 0x10375dc: sw    v0, 8232(sp)
+// 0x010375ec: 0x10375ec: sw    v0, 8232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5612,38 +5612,38 @@ L_10375b8:
 	add
 	ldloc 5
 	stelem.i4
-L_10375e0:
-// 0x010375e0: 0x10375e0: addiu a2, zero, 24
+L_10375f0:
+// 0x010375f0: 0x10375f0: addiu a2, zero, 24
 	ldc.i4.s 24
 	stloc.3
-// 0x010375e4: 0x10375e4: mult  s6, a2
+// 0x010375f4: 0x10375f4: mult  s6, a2
 	ldloc 13
 	ldloc.3
 	mul
 	stloc 16
-// 0x010375e8: 0x10375e8: addiu s1, sp, 40
+// 0x010375f8: 0x10375f8: addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x010375ec: 0x10375ec: addu  s0, zero, zero
+// 0x010375fc: 0x10375fc: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010375f0: 0x10375f0: addu  s7, zero, zero
+// 0x01037600: 0x1037600: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x010375f4: 0x10375f4: addiu s8, sp, 16
+// 0x01037604: 0x1037604: addiu s8, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 15
-// 0x010375f8: 0x10375f8: mflo  lo
+// 0x01037608: 0x1037608: mflo  lo
 	ldloc 16
 	stloc.3
-// 0x010375fc: 0x10375fc: mflo  lo
+// 0x0103760c: 0x103760c: mflo  lo
 	ldloc 16
 	stloc.1
-// 0x01037600: 0x1037600: jal   0x1000910 sw    a2, 8244(sp)
+// 0x01037610: 0x1037610: jal   0x1000910 sw    a2, 8244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5662,7 +5662,7 @@ L_10375e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037608: 0x1037608: lw    a2, 8244(sp)
+// 0x01037618: 0x1037618: lw    a2, 8244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5671,13 +5671,13 @@ L_10375e0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103760c: 0x103760c: addu  a0, v0, zero
+// 0x0103761c: 0x103761c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01037610: 0x1037610: addu  a1, zero, zero
+// 0x01037620: 0x1037620: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01037614: 0x1037614: jal   0x100177c addu  s5, v0, zero
+// 0x01037624: 0x1037624: jal   0x100177c addu  s5, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
@@ -5689,10 +5689,10 @@ L_10375e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103761c: 0x103761c: lui   v0, 0x0
+// 0x0103762c: 0x103762c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01037620: 0x1037620: lw    v0, 1816(v0)
+// 0x01037630: 0x1037630: lw    v0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5701,8 +5701,8 @@ L_10375e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01037624: 0x1037624: sll   zero, zero, 0
-// 0x01037628: 0x1037628: sw    v0, 8236(sp)
+// 0x01037634: 0x1037634: sll   zero, zero, 0
+// 0x01037638: 0x1037638: sw    v0, 8236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5711,16 +5711,16 @@ L_10375e0:
 	add
 	ldloc 5
 	stelem.i4
-L_103762c:
-// 0x0103762c: 0x103762c: addiu v0, zero, 24
+L_103763c:
+// 0x0103763c: 0x103763c: addiu v0, zero, 24
 	ldc.i4.s 24
 	stloc 5
-// 0x01037630: 0x1037630: mult  s0, v0
+// 0x01037640: 0x1037640: mult  s0, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 16
-// 0x01037634: 0x1037634: lw    a1, 8232(sp)
+// 0x01037644: 0x1037644: lw    a1, 8232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5729,23 +5729,23 @@ L_103762c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037638: 0x1037638: addu  a0, s1, zero
+// 0x01037648: 0x1037648: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103763c: 0x103763c: addiu s7, s7, 1
+// 0x0103764c: 0x103764c: addiu s7, s7, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x01037640: 0x1037640: mflo  lo
+// 0x01037650: 0x1037650: mflo  lo
 	ldloc 16
 	stloc 10
-// 0x01037644: 0x1037644: addu  s4, s5, s4
+// 0x01037654: 0x1037654: addu  s4, s5, s4
 	ldloc 12
 	ldloc 10
 	add
 	stloc 10
-// 0x01037648: 0x1037648: jal   0x1011fe0 addiu a2, s4, 16
+// 0x01037658: 0x1037658: jal   0x1011ff0 addiu a2, s4, 16
 	ldloc 10
 	ldc.i4.s 16
 	add
@@ -5755,20 +5755,20 @@ L_103762c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_position_1011fe0(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_position_1011ff0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037650: 0x1037650: beq   v0, zero, 0x1037698 slt   v0, s7, s6
+// 0x01037660: 0x1037660: beq   v0, zero, 0x10376a8 slt   v0, s7, s6
 	ldloc 5
 	ldloc 14
 	ldloc 13
 	clt
 	stloc 5
-	brfalse L_1037698
+	brfalse L_10376a8
 // --- basic block ---
-// 0x01037658: 0x1037658: lw    a0, 4(s1)
+// 0x01037668: 0x1037668: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5777,7 +5777,7 @@ L_103762c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103765c: 0x103765c: jal   0x1011a4c addu  a1, s8, zero
+// 0x0103766c: 0x103766c: jal   0x1011a5c addu  a1, s8, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -5785,19 +5785,19 @@ L_103762c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037664: 0x1037664: lw    v1, 0(s1)
+// 0x01037674: 0x1037674: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01037668: 0x1037668: lw    v0, 4(s1)
+// 0x01037678: 0x1037678: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5806,7 +5806,7 @@ L_103762c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103766c: 0x103766c: sw    v1, 4(s4)
+// 0x0103767c: 0x103767c: sw    v1, 4(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5815,7 +5815,7 @@ L_103762c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01037670: 0x1037670: lw    v1, 8236(sp)
+// 0x01037680: 0x1037680: lw    v1, 8236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5824,17 +5824,17 @@ L_103762c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037674: 0x1037674: addu  a0, s8, zero
+// 0x01037684: 0x1037684: addu  a0, s8, zero
 	ldloc 15
 	stloc.1
-// 0x01037678: 0x1037678: sw    v1, 0(s4)
+// 0x01037688: 0x1037688: sw    v1, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0103767c: 0x103767c: jal   0x1011920 sw    v0, 8(s4)
+// 0x0103768c: 0x103768c: jal   0x1011930 sw    v0, 8(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5848,12 +5848,12 @@ L_103762c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_full_name_1011920(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_full_name_1011930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01037684: 0x1037684: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01037694: 0x1037694: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5866,7 +5866,7 @@ L_103762c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103768c: 0x103768c: sw    v0, 12(s4)
+// 0x0103769c: 0x103769c: sw    v0, 12(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5875,30 +5875,30 @@ L_103762c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01037690: 0x1037690: addiu s0, s0, 1
+// 0x010376a0: 0x10376a0: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01037694: 0x1037694: slt   v0, s7, s6
+// 0x010376a4: 0x10376a4: slt   v0, s7, s6
 	ldloc 14
 	ldloc 13
 	clt
 	stloc 5
-L_1037698:
-// 0x01037698: 0x1037698: bne   v0, zero, 0x103762c addiu s1, s1, 32
+L_10376a8:
+// 0x010376a8: 0x10376a8: bne   v0, zero, 0x103763c addiu s1, s1, 32
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 32
 	add
 	stloc 8
-	brtrue L_103762c
+	brtrue L_103763c
 // --- basic block ---
-// 0x010376a0: 0x10376a0: bne   s0, zero, 0x10376f4 sll   zero, zero, 0
+// 0x010376b0: 0x10376b0: bne   s0, zero, 0x1037704 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10376f4
+	brtrue L_1037704
 // --- basic block ---
-// 0x010376a8: 0x10376a8: jal   0x1000930 addu  a0, s5, zero
+// 0x010376b8: 0x10376b8: jal   0x1000930 addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -5911,25 +5911,25 @@ L_1037698:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010376b0: 0x10376b0: lb    v0, 0(s2)
+// 0x010376c0: 0x10376c0: lb    v0, 0(s2)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010376b4: 0x10376b4: lui   s1, 0x60000
+// 0x010376c4: 0x10376c4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x010376b8: 0x10376b8: beq   v0, zero, 0x10376d8 lui   s2, 0x60000
+// 0x010376c8: 0x10376c8: beq   v0, zero, 0x10376e8 lui   s2, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 11
-	brfalse L_10376d8
+	brfalse L_10376e8
 // --- basic block ---
-// 0x010376c0: 0x10376c0: lui   a0, 0x10000
+// 0x010376d0: 0x10376d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010376c4: 0x10376c4: jal   0x101cd60 addiu a0, a0, -12336
+// 0x010376d4: 0x10376d4: jal   0x101cd70 addiu a0, a0, -12340
 	ldloc.1
-	ldc.i4 -12336
+	ldc.i4 -12340
 	add
 	stloc.1
 	ldloc.0
@@ -5937,32 +5937,32 @@ L_1037698:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010376cc: 0x10376cc: sw    v0, -16704(s2)
+// 0x010376dc: 0x10376dc: sw    v0, -16240(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x010376d0: 0x10376d0: j	 0x10376ec addiu v0, zero, 7
+// 0x010376e0: 0x10376e0: j	 0x10376fc addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-	br L_10376ec
+	br L_10376fc
 // --- basic block ---
-L_10376d8:
-// 0x010376d8: 0x10376d8: lui   a0, 0x10000
+L_10376e8:
+// 0x010376e8: 0x10376e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010376dc: 0x10376dc: jal   0x101cd60 addiu a0, a0, -12224
+// 0x010376ec: 0x10376ec: jal   0x101cd70 addiu a0, a0, -12228
 	ldloc.1
-	ldc.i4 -12224
+	ldc.i4 -12228
 	add
 	stloc.1
 	ldloc.0
@@ -5970,49 +5970,49 @@ L_10376d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010376e4: 0x10376e4: sw    v0, -16704(s2)
+// 0x010376f4: 0x10376f4: sw    v0, -16240(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4176
+	ldc.i4 -4060
 	add
 	ldloc 5
 	stelem.i4
-// 0x010376e8: 0x10376e8: addiu v0, zero, 6
+// 0x010376f8: 0x10376f8: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-L_10376ec:
-// 0x010376ec: 0x10376ec: j	 0x10376f8 sw    v0, -16708(s1)
+L_10376fc:
+// 0x010376fc: 0x10376fc: j	 0x1037708 sw    v0, -16244(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4177
+	ldc.i4 -4061
 	add
 	ldloc 5
 	stelem.i4
-	br L_10376f8
+	br L_1037708
 // --- basic block ---
-L_10376f4:
-// 0x010376f4: 0x10376f4: sw    s5, 0(s3)
+L_1037704:
+// 0x01037704: 0x1037704: sw    s5, 0(s3)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-L_10376f8:
-// 0x010376f8: 0x10376f8: lw    ra, 8284(sp)
-// 0x010376fc: 0x10376fc: addu  v0, s0, zero
+L_1037708:
+// 0x01037708: 0x1037708: lw    ra, 8284(sp)
+// 0x0103770c: 0x103770c: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x01037700: 0x1037700: lw    s8, 8280(sp)
+// 0x01037710: 0x1037710: lw    s8, 8280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6021,7 +6021,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01037704: 0x1037704: lw    s7, 8276(sp)
+// 0x01037714: 0x1037714: lw    s7, 8276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6030,7 +6030,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01037708: 0x1037708: lw    s6, 8272(sp)
+// 0x01037718: 0x1037718: lw    s6, 8272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6039,7 +6039,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103770c: 0x103770c: lw    s5, 8268(sp)
+// 0x0103771c: 0x103771c: lw    s5, 8268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6048,7 +6048,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01037710: 0x1037710: lw    s4, 8264(sp)
+// 0x01037720: 0x1037720: lw    s4, 8264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6057,7 +6057,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01037714: 0x1037714: lw    s3, 8260(sp)
+// 0x01037724: 0x1037724: lw    s3, 8260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6066,7 +6066,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01037718: 0x1037718: lw    s2, 8256(sp)
+// 0x01037728: 0x1037728: lw    s2, 8256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6075,7 +6075,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103771c: 0x103771c: lw    s1, 8252(sp)
+// 0x0103772c: 0x103772c: lw    s1, 8252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6084,7 +6084,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037720: 0x1037720: lw    s0, 8248(sp)
+// 0x01037730: 0x1037730: lw    s0, 8248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6093,7 +6093,7 @@ L_10376f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01037724: 0x1037724: jr    ra addiu sp, sp, 8288
+// 0x01037734: 0x1037734: jr    ra addiu sp, sp, 8288
 	ldloc.0
 	ldc.i4 8288
 	add
@@ -6105,7 +6105,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_history_latest_103772c(int32,int32)
+.method public static int32 roadmap_history_latest_103773c(int32,int32)
 {
 .maxstack 7
 .locals init (int32 sp,int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6131,89 +6131,89 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103772c: 0x103772c: lui   v0, 0x60000
+// 0x0103773c: 0x103773c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01037730: 0x1037730: lw    v0, -16700(v0)
+// 0x01037740: 0x1037740: lw    v0, -16236(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037734: 0x1037734: addiu sp, sp, -16
+// 0x01037744: 0x1037744: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x01037738: 0x1037738: sll   a0, a0, 24
+// 0x01037748: 0x1037748: sll   a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc.1
-// 0x0103773c: 0x103773c: sra   a0, a0, 24
+// 0x0103774c: 0x103774c: sra   a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shr
 	stloc.1
-// 0x01037740: 0x1037740: sw    v0, 0(sp)
+// 0x01037750: 0x1037750: sw    v0, 0(sp)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01037744: 0x1037744: j	 0x103775c addu  v1, sp, zero
+// 0x01037754: 0x1037754: j	 0x103776c addu  v1, sp, zero
 	ldloc.0
 	stloc.3
-	br L_103775c
+	br L_103776c
 // --- basic block ---
-L_103774c:
-// 0x0103774c: 0x103774c: lb    v0, 8(v1)
+L_103775c:
+// 0x0103775c: 0x103775c: lb    v0, 8(v1)
 	ldloc.3
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01037750: 0x1037750: sll   zero, zero, 0
-// 0x01037754: 0x1037754: beq   v0, a0, 0x1037774 sll   zero, zero, 0
+// 0x01037760: 0x1037760: sll   zero, zero, 0
+// 0x01037764: 0x1037764: beq   v0, a0, 0x1037784 sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	beq  L_1037774
+	beq  L_1037784
 // --- basic block ---
-L_103775c:
-// 0x0103775c: 0x103775c: lw    v1, 0(v1)
+L_103776c:
+// 0x0103776c: 0x103776c: lw    v1, 0(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01037760: 0x1037760: sll   zero, zero, 0
-// 0x01037764: 0x1037764: bne   v1, zero, 0x103774c addu  v0, zero, zero
+// 0x01037770: 0x1037770: sll   zero, zero, 0
+// 0x01037774: 0x1037774: bne   v1, zero, 0x103775c addu  v0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_103774c
+	brtrue L_103775c
 // --- basic block ---
-// 0x0103776c: 0x103776c: j	 0x1037780 sll   zero, zero, 0
-	br L_1037780
+// 0x0103777c: 0x103777c: j	 0x1037790 sll   zero, zero, 0
+	br L_1037790
 // --- basic block ---
-L_1037774:
-// 0x01037774: 0x1037774: bne   v1, sp, 0x1037780 addu  v0, v1, zero
+L_1037784:
+// 0x01037784: 0x1037784: bne   v1, sp, 0x1037790 addu  v0, v1, zero
 	ldloc.3
 	ldloc.0
 	ldloc.3
 	stloc.2
-	bne.un L_1037780
+	bne.un L_1037790
 // --- basic block ---
-// 0x0103777c: 0x103777c: addu  v0, zero, zero
+// 0x0103778c: 0x103778c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_1037780:
-// 0x01037780: 0x1037780: jr    ra addiu sp, sp, 16
+L_1037790:
+// 0x01037790: 0x1037790: jr    ra addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6225,7 +6225,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_history_before_1037788(int32,int32,int32)
+.method public static int32 roadmap_history_before_1037798(int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -6254,114 +6254,114 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037788: 0x1037788: sll   a0, a0, 24
+// 0x01037798: 0x1037798: sll   a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc.1
-// 0x0103778c: 0x103778c: addiu sp, sp, -16
+// 0x0103779c: 0x103779c: addiu sp, sp, -16
 	ldloc.0
 	ldc.i4.s -16
 	add
 	stloc.0
-// 0x01037790: 0x1037790: addu  v0, a1, zero
+// 0x010377a0: 0x10377a0: addu  v0, a1, zero
 	ldloc.2
 	stloc 4
-// 0x01037794: 0x1037794: sra   a0, a0, 24
+// 0x010377a4: 0x10377a4: sra   a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shr
 	stloc.1
-// 0x01037798: 0x1037798: bne   a1, zero, 0x10377c4 addu  v1, a1, zero
+// 0x010377a8: 0x10377a8: bne   a1, zero, 0x10377d4 addu  v1, a1, zero
 	ldloc.2
 	ldloc.2
 	stloc.3
-	brtrue L_10377c4
+	brtrue L_10377d4
 // --- basic block ---
-// 0x010377a0: 0x10377a0: lui   v1, 0x60000
+// 0x010377b0: 0x10377b0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x010377a4: 0x10377a4: lw    a1, -16700(v1)
+// 0x010377b4: 0x10377b4: lw    a1, -16236(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc.2
-// 0x010377a8: 0x10377a8: addu  v1, sp, zero
+// 0x010377b8: 0x10377b8: addu  v1, sp, zero
 	ldloc.0
 	stloc.3
-// 0x010377ac: 0x10377ac: j	 0x10377c4 sw    a1, 0(sp)
+// 0x010377bc: 0x10377bc: j	 0x10377d4 sw    a1, 0(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-	br L_10377c4
+	br L_10377d4
 // --- basic block ---
-L_10377b4:
-// 0x010377b4: 0x10377b4: lb    a1, 8(v1)
+L_10377c4:
+// 0x010377c4: 0x10377c4: lb    a1, 8(v1)
 	ldloc.3
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x010377b8: 0x10377b8: sll   zero, zero, 0
-// 0x010377bc: 0x10377bc: beq   a1, a0, 0x10377dc sll   zero, zero, 0
+// 0x010377c8: 0x10377c8: sll   zero, zero, 0
+// 0x010377cc: 0x10377cc: beq   a1, a0, 0x10377ec sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	beq  L_10377dc
+	beq  L_10377ec
 // --- basic block ---
-L_10377c4:
-// 0x010377c4: 0x10377c4: lw    v1, 0(v1)
+L_10377d4:
+// 0x010377d4: 0x10377d4: lw    v1, 0(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010377c8: 0x10377c8: sll   zero, zero, 0
-// 0x010377cc: 0x10377cc: bne   v1, zero, 0x10377b4 sll   zero, zero, 0
+// 0x010377d8: 0x10377d8: sll   zero, zero, 0
+// 0x010377dc: 0x10377dc: bne   v1, zero, 0x10377c4 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10377b4
+	brtrue L_10377c4
 // --- basic block ---
-// 0x010377d4: 0x10377d4: j	 0x10377f0 addiu sp, sp, 16
+// 0x010377e4: 0x10377e4: j	 0x1037800 addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.0
-	br L_10377f0
+	br L_1037800
 // --- basic block ---
-L_10377dc:
-// 0x010377dc: 0x10377dc: xor   v0, v1, sp
+L_10377ec:
+// 0x010377ec: 0x10377ec: xor   v0, v1, sp
 	ldloc.3
 	ldloc.0
 	xor
 	stloc 4
-// 0x010377e0: 0x10377e0: sltu  v0, zero, v0
+// 0x010377f0: 0x10377f0: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 4
 	clt.un
 	stloc 4
-// 0x010377e4: 0x10377e4: subu  v0, zero, v0
+// 0x010377f4: 0x10377f4: subu  v0, zero, v0
 	ldloc 4
 	neg
 	stloc 4
-// 0x010377e8: 0x10377e8: and   v0, v1, v0
+// 0x010377f8: 0x10377f8: and   v0, v1, v0
 	ldloc.3
 	ldloc 4
 	and
 	stloc 4
-// 0x010377ec: 0x10377ec: addiu sp, sp, 16
+// 0x010377fc: 0x10377fc: addiu sp, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.0
-L_10377f0:
-// 0x010377f0: 0x10377f0: jr    ra sll   zero, zero, 0
+L_1037800:
+// 0x01037800: 0x1037800: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -6369,7 +6369,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_history_save_entries_1037838(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_save_entries_1037848(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -6410,12 +6410,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037838: 0x1037838: addiu sp, sp, -32
+// 0x01037848: 0x1037848: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103783c: 0x103783c: sw    s0, 20(sp)
+// 0x0103784c: 0x103784c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6424,17 +6424,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01037840: 0x1037840: addu  s0, a1, zero
+// 0x01037850: 0x1037850: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x01037844: 0x1037844: lw    a1, 0(a1)
+// 0x01037854: 0x1037854: lw    a1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01037848: 0x1037848: sw    s1, 24(sp)
+// 0x01037858: 0x1037858: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6443,45 +6443,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103784c: 0x103784c: sw    ra, 28(sp)
-// 0x01037850: 0x1037850: beq   a1, zero, 0x1037860 addu  s1, a0, zero
+// 0x0103785c: 0x103785c: sw    ra, 28(sp)
+// 0x01037860: 0x1037860: beq   a1, zero, 0x1037870 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 7
-	brfalse L_1037860
+	brfalse L_1037870
 // --- basic block ---
-// 0x01037858: 0x1037858: jal   0x1037838 sll   zero, zero, 0
+// 0x01037868: 0x1037868: jal   0x1037848 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_entries_1037838(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_entries_1037848(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-L_1037860:
-// 0x01037860: 0x1037860: lb    a2, 8(s0)
+L_1037870:
+// 0x01037870: 0x1037870: lb    a2, 8(s0)
 	ldloc 6
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x01037864: 0x1037864: lui   a1, 0x10000
+// 0x01037874: 0x1037874: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01037868: 0x1037868: addu  a0, s1, zero
+// 0x01037878: 0x1037878: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0103786c: 0x103786c: addiu a3, s0, 9
+// 0x0103787c: 0x103787c: addiu a3, s0, 9
 	ldloc 6
 	ldc.i4.s 9
 	add
 	stloc 4
-// 0x01037870: 0x1037870: jal   0x1000ef4 addiu a1, a1, -12196
+// 0x01037880: 0x1037880: jal   0x1000ef4 addiu a1, a1, -12200
 	ldloc.2
-	ldc.i4 -12196
+	ldc.i4 -12200
 	add
 	stloc.2
 	ldloc.0
@@ -6494,8 +6494,8 @@ L_1037860:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01037878: 0x1037878: lw    ra, 28(sp)
-// 0x0103787c: 0x103787c: lw    s1, 24(sp)
+// 0x01037888: 0x1037888: lw    ra, 28(sp)
+// 0x0103788c: 0x103788c: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6504,7 +6504,7 @@ L_1037860:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037880: 0x1037880: lw    s0, 20(sp)
+// 0x01037890: 0x1037890: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6513,7 +6513,7 @@ L_1037860:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01037884: 0x1037884: jr    ra addiu sp, sp, 32
+// 0x01037894: 0x1037894: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6525,7 +6525,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -6563,12 +6563,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103788c: 0x103788c: addiu sp, sp, -32
+// 0x0103789c: 0x103789c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01037890: 0x1037890: sw    s0, 24(sp)
+// 0x010378a0: 0x10378a0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6577,66 +6577,66 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01037894: 0x1037894: lui   s0, 0x60000
+// 0x010378a4: 0x10378a4: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01037898: 0x1037898: lw    v0, -16700(s0)
+// 0x010378a8: 0x10378a8: lw    v0, -16236(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103789c: 0x103789c: sll   zero, zero, 0
-// 0x010378a0: 0x10378a0: beq   v0, zero, 0x1037908 sw    ra, 28(sp)
+// 0x010378ac: 0x10378ac: sll   zero, zero, 0
+// 0x010378b0: 0x10378b0: beq   v0, zero, 0x1037918 sw    ra, 28(sp)
 	ldloc 5
-	brfalse L_1037908
+	brfalse L_1037918
 // --- basic block ---
-// 0x010378a8: 0x10378a8: lui   v0, 0x60000
+// 0x010378b8: 0x10378b8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010378ac: 0x10378ac: lw    v0, -16696(v0)
+// 0x010378bc: 0x10378bc: lw    v0, -16232(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4174
+	ldc.i4 -4058
 	add
 	ldelem.i4
 	stloc 5
-// 0x010378b0: 0x10378b0: sll   zero, zero, 0
-// 0x010378b4: 0x10378b4: beq   v0, zero, 0x1037908 sll   zero, zero, 0
+// 0x010378c0: 0x10378c0: sll   zero, zero, 0
+// 0x010378c4: 0x10378c4: beq   v0, zero, 0x1037918 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1037908
+	brfalse L_1037918
 // --- basic block ---
-// 0x010378bc: 0x10378bc: jal   0x104c564 sll   zero, zero, 0
+// 0x010378cc: 0x10378cc: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010378c4: 0x10378c4: lui   a1, 0x10000
+// 0x010378d4: 0x10378d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010378c8: 0x10378c8: lui   a2, 0x0
+// 0x010378d8: 0x10378d8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010378cc: 0x10378cc: addu  a0, v0, zero
+// 0x010378dc: 0x10378dc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010378d0: 0x10378d0: addiu a1, a1, -12188
+// 0x010378e0: 0x10378e0: addiu a1, a1, -12192
 	ldloc.2
-	ldc.i4 -12188
+	ldc.i4 -12192
 	add
 	stloc.2
-// 0x010378d4: 0x10378d4: jal   0x104dac8 addiu a2, a2, 28940
+// 0x010378e4: 0x10378e4: jal   0x104dad8 addiu a2, a2, 28940
 	ldloc.3
 	ldc.i4 28940
 	add
@@ -6646,28 +6646,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010378dc: 0x10378dc: beq   v0, zero, 0x1037900 sll   zero, zero, 0
+// 0x010378ec: 0x10378ec: beq   v0, zero, 0x1037910 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1037900
+	brfalse L_1037910
 // --- basic block ---
-// 0x010378e4: 0x10378e4: lw    a1, -16700(s0)
+// 0x010378f4: 0x10378f4: lw    a1, -16236(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc.2
-// 0x010378e8: 0x10378e8: addu  a0, v0, zero
+// 0x010378f8: 0x10378f8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010378ec: 0x10378ec: jal   0x1037838 sw    v0, 16(sp)
+// 0x010378fc: 0x10378fc: jal   0x1037848 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6681,12 +6681,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_entries_1037838(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_entries_1037848(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010378f4: 0x10378f4: lw    v0, 16(sp)
+// 0x01037904: 0x1037904: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6695,7 +6695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010378f8: 0x10378f8: jal   0x10023b4 addu  a0, v0, zero
+// 0x01037908: 0x1037908: jal   0x10023b4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6708,22 +6708,22 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1037900:
-// 0x01037900: 0x1037900: lui   v0, 0x60000
+L_1037910:
+// 0x01037910: 0x1037910: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037904: 0x1037904: sw    zero, -16696(v0)
+// 0x01037914: 0x1037914: sw    zero, -16232(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4174
+	ldc.i4 -4058
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1037908:
-// 0x01037908: 0x1037908: lw    ra, 28(sp)
-// 0x0103790c: 0x103790c: lw    s0, 24(sp)
+L_1037918:
+// 0x01037918: 0x1037918: lw    ra, 28(sp)
+// 0x0103791c: 0x103791c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6732,7 +6732,7 @@ L_1037908:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037910: 0x1037910: jr    ra addiu sp, sp, 32
+// 0x01037920: 0x1037920: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl41.j b/converted/Cibyl41.j
index c87be10..c44288f 100644
--- a/converted/Cibyl41.j
+++ b/converted/Cibyl41.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl41::.ctor
 
-.method public static int32 roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 ra,int32 v1)
@@ -82,12 +82,12 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037918: 0x1037918: addiu sp, sp, -40
+// 0x01037928: 0x1037928: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103791c: 0x103791c: sw    s0, 28(sp)
+// 0x0103792c: 0x103792c: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -96,32 +96,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01037920: 0x1037920: sll   s0, a0, 24
+// 0x01037930: 0x1037930: sll   s0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 6
-// 0x01037924: 0x1037924: sra   s0, s0, 24
+// 0x01037934: 0x1037934: sra   s0, s0, 24
 	ldloc 6
 	ldc.i4.s 24
 	shr
 	stloc 6
-// 0x01037928: 0x1037928: addiu v0, s0, -65
+// 0x01037938: 0x1037938: addiu v0, s0, -65
 	ldloc 6
 	ldc.i4.s -65
 	add
 	stloc 5
-// 0x0103792c: 0x103792c: andi  v0, v0, 255
+// 0x0103793c: 0x103793c: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x01037930: 0x1037930: sltiu v0, v0, 26
+// 0x01037940: 0x1037940: sltiu v0, v0, 26
 	ldloc 5
 	ldc.i4.s 26
 	clt.un
 	stloc 5
-// 0x01037934: 0x1037934: sw    s1, 32(sp)
+// 0x01037944: 0x1037944: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -130,36 +130,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037938: 0x1037938: sw    ra, 36(sp)
-// 0x0103793c: 0x103793c: bne   v0, zero, 0x1037964 addu  s1, a1, zero
+// 0x01037948: 0x1037948: sw    ra, 36(sp)
+// 0x0103794c: 0x103794c: bne   v0, zero, 0x1037974 addu  s1, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 8
-	brtrue L_1037964
+	brtrue L_1037974
 // --- basic block ---
-// 0x01037944: 0x1037944: lui   a1, 0x10000
+// 0x01037954: 0x1037954: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01037948: 0x1037948: lui   a3, 0x10000
+// 0x01037958: 0x1037958: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103794c: 0x103794c: addiu a1, a1, -12180
+// 0x0103795c: 0x103795c: addiu a1, a1, -12184
 	ldloc.2
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.2
-// 0x01037950: 0x1037950: addiu a3, a3, -12152
+// 0x01037960: 0x1037960: addiu a3, a3, -12156
 	ldloc 4
-	ldc.i4 -12152
+	ldc.i4 -12156
 	add
 	stloc 4
-// 0x01037954: 0x1037954: addiu a0, zero, 5
+// 0x01037964: 0x1037964: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01037958: 0x1037958: addiu a2, zero, 310
+// 0x01037968: 0x1037968: addiu a2, zero, 310
 	ldc.i4 310
 	stloc.3
-// 0x0103795c: 0x103795c: jal   0x100449c sw    s0, 16(sp)
+// 0x0103796c: 0x103796c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -178,37 +178,37 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_1037964:
-// 0x01037964: 0x1037964: bgtz  s1, 0x1037990 lui   v0, 0x60000
+L_1037974:
+// 0x01037974: 0x1037974: bgtz  s1, 0x10379a0 lui   v0, 0x60000
 	ldloc 8
 	ldc.i4 393216
 	stloc 5
 	ldc.i4.s 0
-	bgt L_1037990
+	bgt L_10379a0
 // --- basic block ---
-// 0x0103796c: 0x103796c: lui   a1, 0x10000
+// 0x0103797c: 0x103797c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01037970: 0x1037970: lui   a3, 0x10000
+// 0x01037980: 0x1037980: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01037974: 0x1037974: addiu a1, a1, -12180
+// 0x01037984: 0x1037984: addiu a1, a1, -12184
 	ldloc.2
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.2
-// 0x01037978: 0x1037978: addiu a3, a3, -12128
+// 0x01037988: 0x1037988: addiu a3, a3, -12132
 	ldloc 4
-	ldc.i4 -12128
+	ldc.i4 -12132
 	add
 	stloc 4
-// 0x0103797c: 0x103797c: addiu a0, zero, 5
+// 0x0103798c: 0x103798c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01037980: 0x1037980: addiu a2, zero, 313
+// 0x01037990: 0x1037990: addiu a2, zero, 313
 	ldc.i4 313
 	stloc.3
-// 0x01037984: 0x1037984: jal   0x100449c sw    s0, 16(sp)
+// 0x01037994: 0x1037994: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -227,34 +227,34 @@ L_1037964:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0103798c: 0x103798c: lui   v0, 0x60000
+// 0x0103799c: 0x103799c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1037990:
-// 0x01037990: 0x1037990: sll   s0, s0, 2
+L_10379a0:
+// 0x010379a0: 0x10379a0: sll   s0, s0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01037994: 0x1037994: addiu v0, v0, -15656
+// 0x010379a4: 0x10379a4: addiu v0, v0, -15192
 	ldloc 5
-	ldc.i4 -15656
+	ldc.i4 -15192
 	add
 	stloc 5
-// 0x01037998: 0x1037998: lw    ra, 36(sp)
-// 0x0103799c: 0x103799c: addu  s0, s0, v0
+// 0x010379a8: 0x10379a8: lw    ra, 36(sp)
+// 0x010379ac: 0x10379ac: addu  s0, s0, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x010379a0: 0x10379a0: sw    s1, 0(s0)
+// 0x010379b0: 0x10379b0: sw    s1, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x010379a4: 0x10379a4: lw    s1, 32(sp)
+// 0x010379b4: 0x10379b4: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -263,7 +263,7 @@ L_1037990:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010379a8: 0x10379a8: lw    s0, 28(sp)
+// 0x010379b8: 0x10379b8: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -272,7 +272,7 @@ L_1037990:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010379ac: 0x10379ac: jr    ra addiu sp, sp, 40
+// 0x010379bc: 0x10379bc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -284,7 +284,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_history_remove_entry_10379b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_remove_entry_10379c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -322,7 +322,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010379b4: 0x10379b4: lw    v0, 4(a0)
+// 0x010379c4: 0x10379c4: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -331,12 +331,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010379b8: 0x10379b8: addiu sp, sp, -24
+// 0x010379c8: 0x10379c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010379bc: 0x10379bc: sw    s0, 16(sp)
+// 0x010379cc: 0x10379cc: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -345,67 +345,67 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010379c0: 0x10379c0: sw    ra, 20(sp)
-// 0x010379c4: 0x10379c4: beq   v0, zero, 0x10379d8 addu  s0, a0, zero
+// 0x010379d0: 0x10379d0: sw    ra, 20(sp)
+// 0x010379d4: 0x10379d4: beq   v0, zero, 0x10379e8 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_10379d8
+	brfalse L_10379e8
 // --- basic block ---
-// 0x010379cc: 0x10379cc: lw    v1, 0(a0)
+// 0x010379dc: 0x10379dc: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010379d0: 0x10379d0: j	 0x1037a10 sw    v1, 0(v0)
+// 0x010379e0: 0x10379e0: j	 0x1037a20 sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1037a10
+	br L_1037a20
 // --- basic block ---
-L_10379d8:
-// 0x010379d8: 0x10379d8: lui   v0, 0x60000
+L_10379e8:
+// 0x010379e8: 0x10379e8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010379dc: 0x10379dc: lw    v0, -16700(v0)
+// 0x010379ec: 0x10379ec: lw    v0, -16236(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc 5
-// 0x010379e0: 0x10379e0: sll   zero, zero, 0
-// 0x010379e4: 0x10379e4: beq   a0, v0, 0x1037a04 lui   a1, 0x10000
+// 0x010379f0: 0x10379f0: sll   zero, zero, 0
+// 0x010379f4: 0x10379f4: beq   a0, v0, 0x1037a14 lui   a1, 0x10000
 	ldloc.1
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_1037a04
+	beq  L_1037a14
 // --- basic block ---
-// 0x010379ec: 0x10379ec: lui   a3, 0x10000
+// 0x010379fc: 0x10379fc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010379f0: 0x10379f0: addiu a1, a1, -12180
+// 0x01037a00: 0x1037a00: addiu a1, a1, -12184
 	ldloc.2
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.2
-// 0x010379f4: 0x10379f4: addiu a3, a3, -12096
+// 0x01037a04: 0x1037a04: addiu a3, a3, -12100
 	ldloc 4
-	ldc.i4 -12096
+	ldc.i4 -12100
 	add
 	stloc 4
-// 0x010379f8: 0x10379f8: addiu a0, zero, 5
+// 0x01037a08: 0x1037a08: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010379fc: 0x10379fc: jal   0x100449c addiu a2, zero, 70
+// 0x01037a0c: 0x1037a0c: jal   0x100449c addiu a2, zero, 70
 	ldc.i4.s 70
 	stloc.3
 	ldloc.0
@@ -418,40 +418,40 @@ L_10379d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1037a04:
-// 0x01037a04: 0x1037a04: lw    v1, 0(s0)
+L_1037a14:
+// 0x01037a14: 0x1037a14: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01037a08: 0x1037a08: lui   v0, 0x60000
+// 0x01037a18: 0x1037a18: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037a0c: 0x1037a0c: sw    v1, -16700(v0)
+// 0x01037a1c: 0x1037a1c: sw    v1, -16236(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldloc 7
 	stelem.i4
-L_1037a10:
-// 0x01037a10: 0x1037a10: lw    v0, 0(s0)
+L_1037a20:
+// 0x01037a20: 0x1037a20: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01037a14: 0x1037a14: sll   zero, zero, 0
-// 0x01037a18: 0x1037a18: beq   v0, zero, 0x1037a2c sll   zero, zero, 0
+// 0x01037a24: 0x1037a24: sll   zero, zero, 0
+// 0x01037a28: 0x1037a28: beq   v0, zero, 0x1037a3c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1037a2c
+	brfalse L_1037a3c
 // --- basic block ---
-// 0x01037a20: 0x1037a20: lw    v1, 4(s0)
+// 0x01037a30: 0x1037a30: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -460,7 +460,7 @@ L_1037a10:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037a24: 0x1037a24: j	 0x1037a64 sw    v1, 4(v0)
+// 0x01037a34: 0x1037a34: j	 0x1037a74 sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -469,46 +469,46 @@ L_1037a10:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1037a64
+	br L_1037a74
 // --- basic block ---
-L_1037a2c:
-// 0x01037a2c: 0x1037a2c: lui   v0, 0x60000
+L_1037a3c:
+// 0x01037a3c: 0x1037a3c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037a30: 0x1037a30: lw    v0, -16692(v0)
+// 0x01037a40: 0x1037a40: lw    v0, -16228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4173
+	ldc.i4 -4057
 	add
 	ldelem.i4
 	stloc 5
-// 0x01037a34: 0x1037a34: sll   zero, zero, 0
-// 0x01037a38: 0x1037a38: beq   s0, v0, 0x1037a58 lui   a1, 0x10000
+// 0x01037a44: 0x1037a44: sll   zero, zero, 0
+// 0x01037a48: 0x1037a48: beq   s0, v0, 0x1037a68 lui   a1, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_1037a58
+	beq  L_1037a68
 // --- basic block ---
-// 0x01037a40: 0x1037a40: lui   a3, 0x10000
+// 0x01037a50: 0x1037a50: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01037a44: 0x1037a44: addiu a1, a1, -12180
+// 0x01037a54: 0x1037a54: addiu a1, a1, -12184
 	ldloc.2
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.2
-// 0x01037a48: 0x1037a48: addiu a3, a3, -12072
+// 0x01037a58: 0x1037a58: addiu a3, a3, -12076
 	ldloc 4
-	ldc.i4 -12072
+	ldc.i4 -12076
 	add
 	stloc 4
-// 0x01037a4c: 0x1037a4c: addiu a0, zero, 5
+// 0x01037a5c: 0x1037a5c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01037a50: 0x1037a50: jal   0x100449c addiu a2, zero, 79
+// 0x01037a60: 0x1037a60: jal   0x100449c addiu a2, zero, 79
 	ldc.i4.s 79
 	stloc.3
 	ldloc.0
@@ -521,8 +521,8 @@ L_1037a2c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1037a58:
-// 0x01037a58: 0x1037a58: lw    v1, 4(s0)
+L_1037a68:
+// 0x01037a68: 0x1037a68: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -531,53 +531,53 @@ L_1037a58:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037a5c: 0x1037a5c: lui   v0, 0x60000
+// 0x01037a6c: 0x1037a6c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037a60: 0x1037a60: sw    v1, -16692(v0)
+// 0x01037a70: 0x1037a70: sw    v1, -16228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4173
+	ldc.i4 -4057
 	add
 	ldloc 7
 	stelem.i4
-L_1037a64:
-// 0x01037a64: 0x1037a64: lui   v0, 0x60000
+L_1037a74:
+// 0x01037a74: 0x1037a74: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037a68: 0x1037a68: lw    v1, -16688(v0)
+// 0x01037a78: 0x1037a78: lw    v1, -16224(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4172
+	ldc.i4 -4056
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037a6c: 0x1037a6c: lw    ra, 20(sp)
-// 0x01037a70: 0x1037a70: addiu v1, v1, -1
+// 0x01037a7c: 0x1037a7c: lw    ra, 20(sp)
+// 0x01037a80: 0x1037a80: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01037a74: 0x1037a74: sw    v1, -16688(v0)
+// 0x01037a84: 0x1037a84: sw    v1, -16224(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4172
+	ldc.i4 -4056
 	add
 	ldloc 7
 	stelem.i4
-// 0x01037a78: 0x1037a78: addiu v1, zero, 1
+// 0x01037a88: 0x1037a88: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01037a7c: 0x1037a7c: lui   v0, 0x60000
+// 0x01037a8c: 0x1037a8c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037a80: 0x1037a80: lw    s0, 16(sp)
+// 0x01037a90: 0x1037a90: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -586,16 +586,16 @@ L_1037a64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037a84: 0x1037a84: sw    v1, -16696(v0)
+// 0x01037a94: 0x1037a94: sw    v1, -16232(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4174
+	ldc.i4 -4058
 	add
 	ldloc 7
 	stelem.i4
-// 0x01037a88: 0x1037a88: jr    ra addiu sp, sp, 24
+// 0x01037a98: 0x1037a98: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -607,7 +607,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_history_delete_entry_1037a90(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_delete_entry_1037aa0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -642,26 +642,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037a90: 0x1037a90: addiu sp, sp, -24
+// 0x01037aa0: 0x1037aa0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01037a94: 0x1037a94: sw    ra, 20(sp)
-// 0x01037a98: 0x1037a98: jal   0x10379b4 sll   zero, zero, 0
+// 0x01037aa4: 0x1037aa4: sw    ra, 20(sp)
+// 0x01037aa8: 0x1037aa8: jal   0x10379c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_remove_entry_10379b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_remove_entry_10379c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01037aa0: 0x1037aa0: lw    ra, 20(sp)
-// 0x01037aa4: 0x1037aa4: sll   zero, zero, 0
-// 0x01037aa8: 0x1037aa8: jr    ra addiu sp, sp, 24
+// 0x01037ab0: 0x1037ab0: lw    ra, 20(sp)
+// 0x01037ab4: 0x1037ab4: sll   zero, zero, 0
+// 0x01037ab8: 0x1037ab8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -673,7 +673,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_history_purge_1037ab0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_purge_1037ac0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 v1)
@@ -726,12 +726,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037ab0: 0x1037ab0: addiu sp, sp, -48
+// 0x01037ac0: 0x1037ac0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01037ab4: 0x1037ab4: sw    s5, 40(sp)
+// 0x01037ac4: 0x1037ac4: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -740,7 +740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01037ab8: 0x1037ab8: sw    s4, 36(sp)
+// 0x01037ac8: 0x1037ac8: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -749,7 +749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01037abc: 0x1037abc: sw    s3, 32(sp)
+// 0x01037acc: 0x1037acc: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -758,7 +758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01037ac0: 0x1037ac0: sw    s2, 28(sp)
+// 0x01037ad0: 0x1037ad0: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -767,7 +767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01037ac4: 0x1037ac4: sw    s1, 24(sp)
+// 0x01037ad4: 0x1037ad4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -776,8 +776,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037ac8: 0x1037ac8: sw    ra, 44(sp)
-// 0x01037acc: 0x1037acc: sw    s0, 20(sp)
+// 0x01037ad8: 0x1037ad8: sw    ra, 44(sp)
+// 0x01037adc: 0x1037adc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -786,34 +786,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01037ad0: 0x1037ad0: addu  s5, a0, zero
+// 0x01037ae0: 0x1037ae0: addu  s5, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01037ad4: 0x1037ad4: lui   s4, 0x60000
+// 0x01037ae4: 0x1037ae4: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01037ad8: 0x1037ad8: lui   s3, 0x60000
+// 0x01037ae8: 0x1037ae8: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01037adc: 0x1037adc: lui   s2, 0x60000
+// 0x01037aec: 0x1037aec: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01037ae0: 0x1037ae0: j	 0x1037b00 addiu s1, zero, 1
+// 0x01037af0: 0x1037af0: j	 0x1037b10 addiu s1, zero, 1
 	ldc.i4.1
 	stloc 8
-	br L_1037b00
+	br L_1037b10
 // --- basic block ---
-L_1037ae8:
-// 0x01037ae8: 0x1037ae8: lw    s0, -16692(s3)
+L_1037af8:
+// 0x01037af8: 0x1037af8: lw    s0, -16228(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4173
+	ldc.i4 -4057
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037aec: 0x1037aec: jal   0x10379b4 addu  a0, s0, zero
+// 0x01037afc: 0x1037afc: jal   0x10379c4 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -821,12 +821,12 @@ L_1037ae8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_remove_entry_10379b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_remove_entry_10379c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x01037af4: 0x1037af4: jal   0x1000930 addu  a0, s0, zero
+// 0x01037b04: 0x1037b04: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -839,37 +839,37 @@ L_1037ae8:
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x01037afc: 0x1037afc: sw    s1, -16696(s2)
+// 0x01037b0c: 0x1037b0c: sw    s1, -16232(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4174
+	ldc.i4 -4058
 	add
 	ldloc 8
 	stelem.i4
-L_1037b00:
-// 0x01037b00: 0x1037b00: lw    v0, -16688(s4)
+L_1037b10:
+// 0x01037b10: 0x1037b10: lw    v0, -16224(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4172
+	ldc.i4 -4056
 	add
 	ldelem.i4
 	stloc 6
-// 0x01037b04: 0x1037b04: sll   zero, zero, 0
-// 0x01037b08: 0x1037b08: slt   v0, s5, v0
+// 0x01037b14: 0x1037b14: sll   zero, zero, 0
+// 0x01037b18: 0x1037b18: slt   v0, s5, v0
 	ldloc 12
 	ldloc 6
 	clt
 	stloc 6
-// 0x01037b0c: 0x1037b0c: bne   v0, zero, 0x1037ae8 sll   zero, zero, 0
+// 0x01037b1c: 0x1037b1c: bne   v0, zero, 0x1037af8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1037ae8
+	brtrue L_1037af8
 // --- basic block ---
-// 0x01037b14: 0x1037b14: lw    ra, 44(sp)
-// 0x01037b18: 0x1037b18: lw    s5, 40(sp)
+// 0x01037b24: 0x1037b24: lw    ra, 44(sp)
+// 0x01037b28: 0x1037b28: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -878,7 +878,7 @@ L_1037b00:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01037b1c: 0x1037b1c: lw    s4, 36(sp)
+// 0x01037b2c: 0x1037b2c: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -887,7 +887,7 @@ L_1037b00:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01037b20: 0x1037b20: lw    s3, 32(sp)
+// 0x01037b30: 0x1037b30: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -896,7 +896,7 @@ L_1037b00:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01037b24: 0x1037b24: lw    s2, 28(sp)
+// 0x01037b34: 0x1037b34: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -905,7 +905,7 @@ L_1037b00:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01037b28: 0x1037b28: lw    s1, 24(sp)
+// 0x01037b38: 0x1037b38: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -914,7 +914,7 @@ L_1037b00:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037b2c: 0x1037b2c: lw    s0, 20(sp)
+// 0x01037b3c: 0x1037b3c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -923,7 +923,7 @@ L_1037b00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037b30: 0x1037b30: jr    ra addiu sp, sp, 48
+// 0x01037b40: 0x1037b40: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -935,7 +935,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_history_get_from_entry_1037b38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_get_from_entry_1037b48(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s2,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s3,int32 s1,int32 ra)
@@ -982,12 +982,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037b38: 0x1037b38: addiu sp, sp, -40
+// 0x01037b48: 0x1037b48: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01037b3c: 0x1037b3c: sw    s2, 28(sp)
+// 0x01037b4c: 0x1037b4c: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -996,7 +996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01037b40: 0x1037b40: sw    s1, 24(sp)
+// 0x01037b50: 0x1037b50: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1005,7 +1005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01037b44: 0x1037b44: sw    s0, 20(sp)
+// 0x01037b54: 0x1037b54: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1014,8 +1014,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037b48: 0x1037b48: sw    ra, 36(sp)
-// 0x01037b4c: 0x1037b4c: sw    s3, 32(sp)
+// 0x01037b58: 0x1037b58: sw    ra, 36(sp)
+// 0x01037b5c: 0x1037b5c: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1024,37 +1024,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01037b50: 0x1037b50: addu  s1, a1, zero
+// 0x01037b60: 0x1037b60: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01037b54: 0x1037b54: addu  s0, a2, zero
+// 0x01037b64: 0x1037b64: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01037b58: 0x1037b58: beq   a0, zero, 0x1037bbc addu  s2, zero, zero
+// 0x01037b68: 0x1037b68: beq   a0, zero, 0x1037bcc addu  s2, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1037bbc
+	brfalse L_1037bcc
 // --- basic block ---
-// 0x01037b60: 0x1037b60: lui   s2, 0x60000
+// 0x01037b70: 0x1037b70: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037b64: 0x1037b64: addiu a1, a0, 9
+// 0x01037b74: 0x1037b74: addiu a1, a0, 9
 	ldloc.1
 	ldc.i4.s 9
 	add
 	stloc.2
-// 0x01037b68: 0x1037b68: addiu a2, zero, 1024
+// 0x01037b78: 0x1037b78: addiu a2, zero, 1024
 	ldc.i4 1024
 	stloc.3
-// 0x01037b6c: 0x1037b6c: addiu a0, s2, -16684
+// 0x01037b7c: 0x1037b7c: addiu a0, s2, -16220
 	ldloc 5
-	ldc.i4 -16684
+	ldc.i4 -16220
 	add
 	stloc.1
-// 0x01037b70: 0x1037b70: jal   0x1001af8 addiu s2, s2, -16684
+// 0x01037b80: 0x1037b80: jal   0x1001af8 addiu s2, s2, -16220
 	ldloc 5
-	ldc.i4 -16684
+	ldc.i4 -16220
 	add
 	stloc 5
 	ldloc.1
@@ -1063,23 +1063,23 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01037b78: 0x1037b78: sb    zero, 1023(s2)
+// 0x01037b88: 0x1037b88: sb    zero, 1023(s2)
 	ldloc 5
 	ldc.i4 1023
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01037b7c: 0x1037b7c: addu  a0, s2, zero
+// 0x01037b8c: 0x1037b8c: addu  a0, s2, zero
 	ldloc 5
 	stloc.1
-// 0x01037b80: 0x1037b80: sw    s2, 0(s0)
+// 0x01037b90: 0x1037b90: sw    s2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01037b84: 0x1037b84: jal   0x1001a5c addiu a1, zero, 44
+// 0x01037b94: 0x1037b94: jal   0x1001a5c addiu a1, zero, 44
 	ldc.i4.s 44
 	stloc.2
 	ldloc.1
@@ -1089,20 +1089,20 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01037b8c: 0x1037b8c: addu  s3, s0, zero
+// 0x01037b9c: 0x1037b9c: addu  s3, s0, zero
 	ldloc 8
 	stloc 10
-// 0x01037b90: 0x1037b90: j	 0x1037ba8 addiu s2, zero, 1
+// 0x01037ba0: 0x1037ba0: j	 0x1037bb8 addiu s2, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1037ba8
+	br L_1037bb8
 // --- basic block ---
-L_1037b98:
-// 0x01037b98: 0x1037b98: sb    zero, 0(v0)
+L_1037ba8:
+// 0x01037ba8: 0x1037ba8: sb    zero, 0(v0)
 	ldloc 7
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01037b9c: 0x1037b9c: jal   0x1001a5c sw    v1, 0(s3)
+// 0x01037bac: 0x1037bac: jal   0x1001a5c sw    v1, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1116,98 +1116,98 @@ L_1037b98:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01037ba4: 0x1037ba4: addiu s2, s2, 1
+// 0x01037bb4: 0x1037bb4: addiu s2, s2, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_1037ba8:
-// 0x01037ba8: 0x1037ba8: addiu v1, v0, 1
+L_1037bb8:
+// 0x01037bb8: 0x1037bb8: addiu v1, v0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01037bac: 0x1037bac: slt   a2, s2, s1
+// 0x01037bbc: 0x1037bbc: slt   a2, s2, s1
 	ldloc 5
 	ldloc 11
 	clt
 	stloc.3
-// 0x01037bb0: 0x1037bb0: addu  a0, v1, zero
+// 0x01037bc0: 0x1037bc0: addu  a0, v1, zero
 	ldloc 9
 	stloc.1
-// 0x01037bb4: 0x1037bb4: bne   a2, zero, 0x1037bd0 addiu a1, zero, 44
+// 0x01037bc4: 0x1037bc4: bne   a2, zero, 0x1037be0 addiu a1, zero, 44
 	ldloc.3
 	ldc.i4.s 44
 	stloc.2
-	brtrue L_1037bd0
+	brtrue L_1037be0
 // --- basic block ---
-L_1037bbc:
-// 0x01037bbc: 0x1037bbc: sll   v0, s2, 2
+L_1037bcc:
+// 0x01037bcc: 0x1037bcc: sll   v0, s2, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 7
-L_1037bc0:
-// 0x01037bc0: 0x1037bc0: addu  s0, s0, v0
+L_1037bd0:
+// 0x01037bd0: 0x1037bd0: addu  s0, s0, v0
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x01037bc4: 0x1037bc4: lui   v0, 0x10000
+// 0x01037bd4: 0x1037bd4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01037bc8: 0x1037bc8: j	 0x1037be8 addiu v0, v0, 18500
+// 0x01037bd8: 0x1037bd8: j	 0x1037bf8 addiu v0, v0, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-	br L_1037be8
+	br L_1037bf8
 // --- basic block ---
-L_1037bd0:
-// 0x01037bd0: 0x1037bd0: bne   v0, zero, 0x1037b98 addiu s3, s3, 4
+L_1037be0:
+// 0x01037be0: 0x1037be0: bne   v0, zero, 0x1037ba8 addiu s3, s3, 4
 	ldloc 7
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-	brtrue L_1037b98
+	brtrue L_1037ba8
 // --- basic block ---
-// 0x01037bd8: 0x1037bd8: j	 0x1037bc0 sll   v0, s2, 2
+// 0x01037be8: 0x1037be8: j	 0x1037bd0 sll   v0, s2, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 7
-	br L_1037bc0
+	br L_1037bd0
 // --- basic block ---
-L_1037be0:
-// 0x01037be0: 0x1037be0: sw    v0, 0(s0)
+L_1037bf0:
+// 0x01037bf0: 0x1037bf0: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01037be4: 0x1037be4: addiu s0, s0, 4
+// 0x01037bf4: 0x1037bf4: addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_1037be8:
-// 0x01037be8: 0x1037be8: slt   v1, s2, s1
+L_1037bf8:
+// 0x01037bf8: 0x1037bf8: slt   v1, s2, s1
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 9
-// 0x01037bec: 0x1037bec: bne   v1, zero, 0x1037be0 addiu s2, s2, 1
+// 0x01037bfc: 0x1037bfc: bne   v1, zero, 0x1037bf0 addiu s2, s2, 1
 	ldloc 9
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_1037be0
+	brtrue L_1037bf0
 // --- basic block ---
-// 0x01037bf4: 0x1037bf4: lw    ra, 36(sp)
-// 0x01037bf8: 0x1037bf8: lw    s3, 32(sp)
+// 0x01037c04: 0x1037c04: lw    ra, 36(sp)
+// 0x01037c08: 0x1037c08: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1216,7 +1216,7 @@ L_1037be8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01037bfc: 0x1037bfc: lw    s2, 28(sp)
+// 0x01037c0c: 0x1037c0c: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1225,7 +1225,7 @@ L_1037be8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01037c00: 0x1037c00: lw    s1, 24(sp)
+// 0x01037c10: 0x1037c10: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1234,7 +1234,7 @@ L_1037be8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01037c04: 0x1037c04: lw    s0, 20(sp)
+// 0x01037c14: 0x1037c14: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1243,7 +1243,7 @@ L_1037be8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037c08: 0x1037c08: jr    ra addiu sp, sp, 40
+// 0x01037c18: 0x1037c18: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1255,7 +1255,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1299,40 +1299,40 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037c10: 0x1037c10: sll   v0, a0, 24
+// 0x01037c20: 0x1037c20: sll   v0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 7
-// 0x01037c14: 0x1037c14: sra   v0, v0, 24
+// 0x01037c24: 0x1037c24: sra   v0, v0, 24
 	ldloc 7
 	ldc.i4.s 24
 	shr
 	stloc 7
-// 0x01037c18: 0x1037c18: lui   v1, 0x60000
+// 0x01037c28: 0x1037c28: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01037c1c: 0x1037c1c: sll   a0, v0, 2
+// 0x01037c2c: 0x1037c2c: sll   a0, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01037c20: 0x1037c20: addiu v1, v1, -15656
+// 0x01037c30: 0x1037c30: addiu v1, v1, -15192
 	ldloc 6
-	ldc.i4 -15656
+	ldc.i4 -15192
 	add
 	stloc 6
-// 0x01037c24: 0x1037c24: addiu sp, sp, -40
+// 0x01037c34: 0x1037c34: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01037c28: 0x1037c28: addu  v1, a0, v1
+// 0x01037c38: 0x1037c38: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01037c2c: 0x1037c2c: sw    s0, 24(sp)
+// 0x01037c3c: 0x1037c3c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1341,14 +1341,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037c30: 0x1037c30: lw    s0, 0(v1)
+// 0x01037c40: 0x1037c40: lw    s0, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01037c34: 0x1037c34: sw    s2, 32(sp)
+// 0x01037c44: 0x1037c44: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1357,7 +1357,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01037c38: 0x1037c38: sw    s1, 28(sp)
+// 0x01037c48: 0x1037c48: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1366,40 +1366,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01037c3c: 0x1037c3c: sw    ra, 36(sp)
-// 0x01037c40: 0x1037c40: addu  s2, a1, zero
+// 0x01037c4c: 0x1037c4c: sw    ra, 36(sp)
+// 0x01037c50: 0x1037c50: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01037c44: 0x1037c44: bgtz  s0, 0x1037c6c addu  s1, a2, zero
+// 0x01037c54: 0x1037c54: bgtz  s0, 0x1037c7c addu  s1, a2, zero
 	ldloc 8
 	ldloc.3
 	stloc 9
 	ldc.i4.s 0
-	bgt L_1037c6c
+	bgt L_1037c7c
 // --- basic block ---
-// 0x01037c4c: 0x1037c4c: lui   a1, 0x10000
+// 0x01037c5c: 0x1037c5c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01037c50: 0x1037c50: lui   a3, 0x10000
+// 0x01037c60: 0x1037c60: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01037c54: 0x1037c54: addiu a1, a1, -12180
+// 0x01037c64: 0x1037c64: addiu a1, a1, -12184
 	ldloc.2
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.2
-// 0x01037c58: 0x1037c58: addiu a3, a3, -12048
+// 0x01037c68: 0x1037c68: addiu a3, a3, -12052
 	ldloc 4
-	ldc.i4 -12048
+	ldc.i4 -12052
 	add
 	stloc 4
-// 0x01037c5c: 0x1037c5c: addiu a0, zero, 5
+// 0x01037c6c: 0x1037c6c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01037c60: 0x1037c60: addiu a2, zero, 456
+// 0x01037c70: 0x1037c70: addiu a2, zero, 456
 	ldc.i4 456
 	stloc.3
-// 0x01037c64: 0x1037c64: jal   0x100449c sw    v0, 16(sp)
+// 0x01037c74: 0x1037c74: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1418,14 +1418,14 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_1037c6c:
-// 0x01037c6c: 0x1037c6c: addu  a0, s2, zero
+L_1037c7c:
+// 0x01037c7c: 0x1037c7c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01037c70: 0x1037c70: addu  a1, s0, zero
+// 0x01037c80: 0x1037c80: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01037c74: 0x1037c74: jal   0x1037b38 addu  a2, s1, zero
+// 0x01037c84: 0x1037c84: jal   0x1037b48 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -1433,13 +1433,13 @@ L_1037c6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_from_entry_1037b38(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_from_entry_1037b48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01037c7c: 0x1037c7c: lw    ra, 36(sp)
-// 0x01037c80: 0x1037c80: lw    s2, 32(sp)
+// 0x01037c8c: 0x1037c8c: lw    ra, 36(sp)
+// 0x01037c90: 0x1037c90: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1448,7 +1448,7 @@ L_1037c6c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01037c84: 0x1037c84: lw    s1, 28(sp)
+// 0x01037c94: 0x1037c94: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1457,7 +1457,7 @@ L_1037c6c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01037c88: 0x1037c88: lw    s0, 24(sp)
+// 0x01037c98: 0x1037c98: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1466,7 +1466,7 @@ L_1037c6c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037c8c: 0x1037c8c: jr    ra addiu sp, sp, 40
+// 0x01037c9c: 0x1037c9c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1478,7 +1478,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 remove_commas_1037c94(int32,int32,int32,int32,int32)
+.method public static int32 remove_commas_1037ca4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -1516,13 +1516,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037c94: 0x1037c94: addiu sp, sp, -24
+// 0x01037ca4: 0x1037ca4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01037c98: 0x1037c98: sw    ra, 20(sp)
-// 0x01037c9c: 0x1037c9c: beq   a0, zero, 0x1037cc8 sw    s0, 16(sp)
+// 0x01037ca8: 0x1037ca8: sw    ra, 20(sp)
+// 0x01037cac: 0x1037cac: beq   a0, zero, 0x1037cd8 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -1532,9 +1532,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1037cc8
+	brfalse L_1037cd8
 // --- basic block ---
-// 0x01037ca4: 0x1037ca4: jal   0x1001a5c addiu a1, zero, 44
+// 0x01037cb4: 0x1037cb4: jal   0x1001a5c addiu a1, zero, 44
 	ldc.i4.s 44
 	stloc.2
 	ldloc.1
@@ -1544,13 +1544,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01037cac: 0x1037cac: j	 0x1037cbc addiu s0, zero, 46
+// 0x01037cbc: 0x1037cbc: j	 0x1037ccc addiu s0, zero, 46
 	ldc.i4.s 46
 	stloc 7
-	br L_1037cbc
+	br L_1037ccc
 // --- basic block ---
-L_1037cb4:
-// 0x01037cb4: 0x1037cb4: jal   0x1001a5c sb    s0, 0(v0)
+L_1037cc4:
+// 0x01037cc4: 0x1037cc4: jal   0x1001a5c sb    s0, 0(v0)
 	ldloc 5
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -1561,21 +1561,21 @@ L_1037cb4:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1037cbc:
-// 0x01037cbc: 0x1037cbc: addiu a0, v0, 1
+L_1037ccc:
+// 0x01037ccc: 0x1037ccc: addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01037cc0: 0x1037cc0: bne   v0, zero, 0x1037cb4 addiu a1, zero, 44
+// 0x01037cd0: 0x1037cd0: bne   v0, zero, 0x1037cc4 addiu a1, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc.2
-	brtrue L_1037cb4
+	brtrue L_1037cc4
 // --- basic block ---
-L_1037cc8:
-// 0x01037cc8: 0x1037cc8: lw    ra, 20(sp)
-// 0x01037ccc: 0x1037ccc: lw    s0, 16(sp)
+L_1037cd8:
+// 0x01037cd8: 0x1037cd8: lw    ra, 20(sp)
+// 0x01037cdc: 0x1037cdc: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1584,7 +1584,7 @@ L_1037cc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01037cd0: 0x1037cd0: jr    ra addiu sp, sp, 24
+// 0x01037ce0: 0x1037ce0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1596,7 +1596,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_history_update_1037cd8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_update_1037ce8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s6,int32 s1,int32 s2,int32 s7,int32 s8,int32 s4,int32 s5,int32 s3,int32 ra)
@@ -1658,17 +1658,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037cd8: 0x1037cd8: addiu sp, sp, -1088
+// 0x01037ce8: 0x1037ce8: addiu sp, sp, -1088
 	ldloc.0
 	ldc.i4 -1088
 	add
 	stloc.0
-// 0x01037cdc: 0x1037cdc: sll   v0, a1, 24
+// 0x01037cec: 0x1037cec: sll   v0, a1, 24
 	ldloc.2
 	ldc.i4.s 24
 	shl
 	stloc 6
-// 0x01037ce0: 0x1037ce0: sw    s3, 1060(sp)
+// 0x01037cf0: 0x1037cf0: sw    s3, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1677,7 +1677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01037ce4: 0x1037ce4: sw    s0, 1048(sp)
+// 0x01037cf4: 0x1037cf4: sw    s0, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1686,8 +1686,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037ce8: 0x1037ce8: sw    ra, 1084(sp)
-// 0x01037cec: 0x1037cec: sw    s8, 1080(sp)
+// 0x01037cf8: 0x1037cf8: sw    ra, 1084(sp)
+// 0x01037cfc: 0x1037cfc: sw    s8, 1080(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1696,7 +1696,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01037cf0: 0x1037cf0: sw    s7, 1076(sp)
+// 0x01037d00: 0x1037d00: sw    s7, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1705,7 +1705,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01037cf4: 0x1037cf4: sw    s6, 1072(sp)
+// 0x01037d04: 0x1037d04: sw    s6, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1714,7 +1714,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01037cf8: 0x1037cf8: sw    s5, 1068(sp)
+// 0x01037d08: 0x1037d08: sw    s5, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1723,7 +1723,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01037cfc: 0x1037cfc: sw    s4, 1064(sp)
+// 0x01037d0c: 0x1037d0c: sw    s4, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1732,7 +1732,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01037d00: 0x1037d00: sw    s2, 1056(sp)
+// 0x01037d10: 0x1037d10: sw    s2, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1741,7 +1741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01037d04: 0x1037d04: sw    s1, 1052(sp)
+// 0x01037d14: 0x1037d14: sw    s1, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1750,73 +1750,73 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01037d08: 0x1037d08: addu  s3, a0, zero
+// 0x01037d18: 0x1037d18: addu  s3, a0, zero
 	ldloc.1
 	stloc 16
-// 0x01037d0c: 0x1037d0c: addu  s0, a2, zero
+// 0x01037d1c: 0x1037d1c: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01037d10: 0x1037d10: beq   a0, zero, 0x1037dfc sra   v0, v0, 24
+// 0x01037d20: 0x1037d20: beq   a0, zero, 0x1037e0c sra   v0, v0, 24
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 24
 	shr
 	stloc 6
-	brfalse L_1037dfc
+	brfalse L_1037e0c
 // --- basic block ---
-// 0x01037d18: 0x1037d18: lui   v1, 0x60000
+// 0x01037d28: 0x1037d28: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01037d1c: 0x1037d1c: sll   a0, v0, 2
+// 0x01037d2c: 0x1037d2c: sll   a0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01037d20: 0x1037d20: addiu v1, v1, -15656
+// 0x01037d30: 0x1037d30: addiu v1, v1, -15192
 	ldloc 7
-	ldc.i4 -15656
+	ldc.i4 -15192
 	add
 	stloc 7
-// 0x01037d24: 0x1037d24: addu  v1, a0, v1
+// 0x01037d34: 0x1037d34: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01037d28: 0x1037d28: lw    s5, 0(v1)
+// 0x01037d38: 0x1037d38: lw    s5, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x01037d2c: 0x1037d2c: sll   zero, zero, 0
-// 0x01037d30: 0x1037d30: bgtz  s5, 0x1037d54 lui   a1, 0x10000
+// 0x01037d3c: 0x1037d3c: sll   zero, zero, 0
+// 0x01037d40: 0x1037d40: bgtz  s5, 0x1037d64 lui   a1, 0x10000
 	ldloc 15
 	ldc.i4 65536
 	stloc.2
 	ldc.i4.s 0
-	bgt L_1037d54
+	bgt L_1037d64
 // --- basic block ---
-// 0x01037d38: 0x1037d38: lui   a3, 0x10000
+// 0x01037d48: 0x1037d48: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01037d3c: 0x1037d3c: addiu a1, a1, -12180
+// 0x01037d4c: 0x1037d4c: addiu a1, a1, -12184
 	ldloc.2
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.2
-// 0x01037d40: 0x1037d40: addiu a3, a3, -12048
+// 0x01037d50: 0x1037d50: addiu a3, a3, -12052
 	ldloc 4
-	ldc.i4 -12048
+	ldc.i4 -12052
 	add
 	stloc 4
-// 0x01037d44: 0x1037d44: addiu a0, zero, 5
+// 0x01037d54: 0x1037d54: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01037d48: 0x1037d48: addiu a2, zero, 376
+// 0x01037d58: 0x1037d58: addiu a2, zero, 376
 	ldc.i4 376
 	stloc.3
-// 0x01037d4c: 0x1037d4c: jal   0x100449c sw    v0, 16(sp)
+// 0x01037d5c: 0x1037d5c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1835,59 +1835,59 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1037d54:
-// 0x01037d54: 0x1037d54: lui   s8, 0x10000
+L_1037d64:
+// 0x01037d64: 0x1037d64: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x01037d58: 0x1037d58: lui   s7, 0x10000
+// 0x01037d68: 0x1037d68: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x01037d5c: 0x1037d5c: lui   s6, 0x0
+// 0x01037d6c: 0x1037d6c: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01037d60: 0x1037d60: sb    zero, 24(sp)
+// 0x01037d70: 0x1037d70: sb    zero, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01037d64: 0x1037d64: addiu s8, s8, -12180
+// 0x01037d74: 0x1037d74: addiu s8, s8, -12184
 	ldloc 13
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc 13
-// 0x01037d68: 0x1037d68: addiu s7, s7, -12016
+// 0x01037d78: 0x1037d78: addiu s7, s7, -12020
 	ldloc 12
-	ldc.i4 -12016
+	ldc.i4 -12020
 	add
 	stloc 12
-// 0x01037d6c: 0x1037d6c: addiu s6, s6, 28076
+// 0x01037d7c: 0x1037d7c: addiu s6, s6, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 9
-// 0x01037d70: 0x1037d70: addiu s2, zero, 1
+// 0x01037d80: 0x1037d80: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x01037d74: 0x1037d74: addu  s1, zero, zero
+// 0x01037d84: 0x1037d84: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01037d78: 0x1037d78: j	 0x1037ddc addiu s4, sp, 24
+// 0x01037d88: 0x1037d88: j	 0x1037dec addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-	br L_1037ddc
+	br L_1037dec
 // --- basic block ---
-L_1037d80:
-// 0x01037d80: 0x1037d80: lw    a0, 0(s0)
+L_1037d90:
+// 0x01037d90: 0x1037d90: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01037d84: 0x1037d84: jal   0x1001b48 addiu s1, s1, 1
+// 0x01037d94: 0x1037d94: jal   0x1001b48 addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
@@ -1898,37 +1898,37 @@ L_1037d80:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01037d8c: 0x1037d8c: addiu v0, v0, 1
+// 0x01037d9c: 0x1037d9c: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01037d90: 0x1037d90: addu  s2, s2, v0
+// 0x01037da0: 0x1037da0: addu  s2, s2, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 11
-// 0x01037d94: 0x1037d94: sltiu v0, s2, 1024
+// 0x01037da4: 0x1037da4: sltiu v0, s2, 1024
 	ldloc 11
 	ldc.i4 1024
 	clt.un
 	stloc 6
-// 0x01037d98: 0x1037d98: bne   v0, zero, 0x1037db8 addu  a1, s6, zero
+// 0x01037da8: 0x1037da8: bne   v0, zero, 0x1037dc8 addu  a1, s6, zero
 	ldloc 6
 	ldloc 9
 	stloc.2
-	brtrue L_1037db8
+	brtrue L_1037dc8
 // --- basic block ---
-// 0x01037da0: 0x1037da0: addiu a2, zero, 386
+// 0x01037db0: 0x1037db0: addiu a2, zero, 386
 	ldc.i4 386
 	stloc.3
-// 0x01037da4: 0x1037da4: addu  a3, s7, zero
+// 0x01037db4: 0x1037db4: addu  a3, s7, zero
 	ldloc 12
 	stloc 4
-// 0x01037da8: 0x1037da8: addiu a0, zero, 5
+// 0x01037db8: 0x1037db8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01037dac: 0x1037dac: jal   0x100449c addu  a1, s8, zero
+// 0x01037dbc: 0x1037dbc: jal   0x100449c addu  a1, s8, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -1941,11 +1941,11 @@ L_1037d80:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01037db4: 0x1037db4: addu  a1, s6, zero
+// 0x01037dc4: 0x1037dc4: addu  a1, s6, zero
 	ldloc 9
 	stloc.2
-L_1037db8:
-// 0x01037db8: 0x1037db8: jal   0x1001ac4 addu  a0, s4, zero
+L_1037dc8:
+// 0x01037dc8: 0x1037dc8: jal   0x1001ac4 addu  a0, s4, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
@@ -1953,35 +1953,35 @@ L_1037db8:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01037dc0: 0x1037dc0: lw    a0, 0(s0)
+// 0x01037dd0: 0x1037dd0: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01037dc4: 0x1037dc4: jal   0x1037c94 sll   zero, zero, 0
+// 0x01037dd4: 0x1037dd4: jal   0x1037ca4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::remove_commas_1037c94(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::remove_commas_1037ca4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01037dcc: 0x1037dcc: lw    a1, 0(s0)
+// 0x01037ddc: 0x1037ddc: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01037dd0: 0x1037dd0: addu  a0, s4, zero
+// 0x01037de0: 0x1037de0: addu  a0, s4, zero
 	ldloc 14
 	stloc.1
-// 0x01037dd4: 0x1037dd4: jal   0x1001ac4 addiu s0, s0, 4
+// 0x01037de4: 0x1037de4: jal   0x1001ac4 addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
@@ -1991,21 +1991,21 @@ L_1037db8:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-L_1037ddc:
-// 0x01037ddc: 0x1037ddc: slt   v0, s1, s5
+L_1037dec:
+// 0x01037dec: 0x1037dec: slt   v0, s1, s5
 	ldloc 10
 	ldloc 15
 	clt
 	stloc 6
-// 0x01037de0: 0x1037de0: bne   v0, zero, 0x1037d80 addiu a0, s3, 9
+// 0x01037df0: 0x1037df0: bne   v0, zero, 0x1037d90 addiu a0, s3, 9
 	ldloc 6
 	ldloc 16
 	ldc.i4.s 9
 	add
 	stloc.1
-	brtrue L_1037d80
+	brtrue L_1037d90
 // --- basic block ---
-// 0x01037de8: 0x1037de8: jal   0x1001b68 addiu a1, sp, 25
+// 0x01037df8: 0x1037df8: jal   0x1001b68 addiu a1, sp, 25
 	ldloc.0
 	ldc.i4.s 25
 	add
@@ -2017,24 +2017,24 @@ L_1037ddc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01037df0: 0x1037df0: addiu v1, zero, 1
+// 0x01037e00: 0x1037e00: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01037df4: 0x1037df4: lui   v0, 0x60000
+// 0x01037e04: 0x1037e04: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01037df8: 0x1037df8: sw    v1, -16696(v0)
+// 0x01037e08: 0x1037e08: sw    v1, -16232(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4174
+	ldc.i4 -4058
 	add
 	ldloc 7
 	stelem.i4
-L_1037dfc:
-// 0x01037dfc: 0x1037dfc: lw    ra, 1084(sp)
-// 0x01037e00: 0x1037e00: lw    s8, 1080(sp)
+L_1037e0c:
+// 0x01037e0c: 0x1037e0c: lw    ra, 1084(sp)
+// 0x01037e10: 0x1037e10: lw    s8, 1080(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2043,7 +2043,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01037e04: 0x1037e04: lw    s7, 1076(sp)
+// 0x01037e14: 0x1037e14: lw    s7, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2052,7 +2052,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01037e08: 0x1037e08: lw    s6, 1072(sp)
+// 0x01037e18: 0x1037e18: lw    s6, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2061,7 +2061,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01037e0c: 0x1037e0c: lw    s5, 1068(sp)
+// 0x01037e1c: 0x1037e1c: lw    s5, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2070,7 +2070,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01037e10: 0x1037e10: lw    s4, 1064(sp)
+// 0x01037e20: 0x1037e20: lw    s4, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2079,7 +2079,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01037e14: 0x1037e14: lw    s3, 1060(sp)
+// 0x01037e24: 0x1037e24: lw    s3, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2088,7 +2088,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01037e18: 0x1037e18: lw    s2, 1056(sp)
+// 0x01037e28: 0x1037e28: lw    s2, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2097,7 +2097,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01037e1c: 0x1037e1c: lw    s1, 1052(sp)
+// 0x01037e2c: 0x1037e2c: lw    s1, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2106,7 +2106,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01037e20: 0x1037e20: lw    s0, 1048(sp)
+// 0x01037e30: 0x1037e30: lw    s0, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2115,7 +2115,7 @@ L_1037dfc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037e24: 0x1037e24: jr    ra addiu sp, sp, 1088
+// 0x01037e34: 0x1037e34: jr    ra addiu sp, sp, 1088
 	ldloc.0
 	ldc.i4 1088
 	add
@@ -2127,7 +2127,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_history_add_entry_1037e2c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_add_entry_1037e3c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -2189,15 +2189,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01037e2c: 0x1037e2c: addiu sp, sp, -128
+// 0x01037e3c: 0x1037e3c: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x01037e30: 0x1037e30: lui   v0, 0x60000
+// 0x01037e40: 0x1037e40: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037e34: 0x1037e34: sw    s0, 88(sp)
+// 0x01037e44: 0x1037e44: sw    s0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2206,16 +2206,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01037e38: 0x1037e38: lw    s0, -16700(v0)
+// 0x01037e48: 0x1037e48: lw    s0, -16236(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc 8
-// 0x01037e3c: 0x1037e3c: sw    s3, 100(sp)
+// 0x01037e4c: 0x1037e4c: sw    s3, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2224,7 +2224,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01037e40: 0x1037e40: sw    s1, 92(sp)
+// 0x01037e50: 0x1037e50: sw    s1, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2233,8 +2233,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01037e44: 0x1037e44: sw    ra, 124(sp)
-// 0x01037e48: 0x1037e48: sw    s8, 120(sp)
+// 0x01037e54: 0x1037e54: sw    ra, 124(sp)
+// 0x01037e58: 0x1037e58: sw    s8, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2243,7 +2243,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01037e4c: 0x1037e4c: sw    s7, 116(sp)
+// 0x01037e5c: 0x1037e5c: sw    s7, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2252,7 +2252,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01037e50: 0x1037e50: sw    s6, 112(sp)
+// 0x01037e60: 0x1037e60: sw    s6, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2261,7 +2261,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01037e54: 0x1037e54: sw    s5, 108(sp)
+// 0x01037e64: 0x1037e64: sw    s5, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2270,7 +2270,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01037e58: 0x1037e58: sw    s4, 104(sp)
+// 0x01037e68: 0x1037e68: sw    s4, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2279,7 +2279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01037e5c: 0x1037e5c: sw    s2, 96(sp)
+// 0x01037e6c: 0x1037e6c: sw    s2, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2288,30 +2288,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01037e60: 0x1037e60: addu  s1, a1, zero
+// 0x01037e70: 0x1037e70: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01037e64: 0x1037e64: beq   s0, zero, 0x1037ed4 addu  s3, a0, zero
+// 0x01037e74: 0x1037e74: beq   s0, zero, 0x1037ee4 addu  s3, a0, zero
 	ldloc 8
 	ldloc.1
 	stloc 10
-	brfalse L_1037ed4
+	brfalse L_1037ee4
 // --- basic block ---
-// 0x01037e6c: 0x1037e6c: lb    v0, 8(s0)
+// 0x01037e7c: 0x1037e7c: lb    v0, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01037e70: 0x1037e70: sll   zero, zero, 0
-// 0x01037e74: 0x1037e74: bne   v0, a0, 0x1037ec4 addu  a0, a1, zero
+// 0x01037e80: 0x1037e80: sll   zero, zero, 0
+// 0x01037e84: 0x1037e84: bne   v0, a0, 0x1037ed4 addu  a0, a1, zero
 	ldloc 5
 	ldloc.1
 	ldloc.2
 	stloc.1
-	bne.un L_1037ec4
+	bne.un L_1037ed4
 // --- basic block ---
-// 0x01037e7c: 0x1037e7c: jal   0x1001c08 addiu a1, s0, 9
+// 0x01037e8c: 0x1037e8c: jal   0x1001c08 addiu a1, s0, 9
 	ldloc 8
 	ldc.i4.s 9
 	add
@@ -2326,31 +2326,31 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037e84: 0x1037e84: bne   v0, zero, 0x1037ec4 sll   zero, zero, 0
+// 0x01037e94: 0x1037e94: bne   v0, zero, 0x1037ed4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1037ec4
+	brtrue L_1037ed4
 // --- basic block ---
-// 0x01037e8c: 0x1037e8c: j	 0x10381fc sll   zero, zero, 0
-	br L_10381fc
+// 0x01037e9c: 0x1037e9c: j	 0x103820c sll   zero, zero, 0
+	br L_103820c
 // --- basic block ---
-L_1037e94:
-// 0x01037e94: 0x1037e94: lb    v0, 8(s0)
+L_1037ea4:
+// 0x01037ea4: 0x1037ea4: lb    v0, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01037e98: 0x1037e98: sll   zero, zero, 0
-// 0x01037e9c: 0x1037e9c: bne   v0, s3, 0x1037ec4 addiu a1, s0, 9
+// 0x01037ea8: 0x1037ea8: sll   zero, zero, 0
+// 0x01037eac: 0x1037eac: bne   v0, s3, 0x1037ed4 addiu a1, s0, 9
 	ldloc 5
 	ldloc 10
 	ldloc 8
 	ldc.i4.s 9
 	add
 	stloc.2
-	bne.un L_1037ec4
+	bne.un L_1037ed4
 // --- basic block ---
-// 0x01037ea4: 0x1037ea4: jal   0x1001c08 addu  a0, s1, zero
+// 0x01037eb4: 0x1037eb4: jal   0x1001c08 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2363,11 +2363,11 @@ L_1037e94:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037eac: 0x1037eac: bne   v0, zero, 0x1037ec4 sll   zero, zero, 0
+// 0x01037ebc: 0x1037ebc: bne   v0, zero, 0x1037ed4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1037ec4
+	brtrue L_1037ed4
 // --- basic block ---
-// 0x01037eb4: 0x1037eb4: jal   0x10379b4 addu  a0, s0, zero
+// 0x01037ec4: 0x1037ec4: jal   0x10379c4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2375,31 +2375,31 @@ L_1037e94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_remove_entry_10379b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_remove_entry_10379c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037ebc: 0x1037ebc: j	 0x1037f10 addiu a1, zero, 7
+// 0x01037ecc: 0x1037ecc: j	 0x1037f20 addiu a1, zero, 7
 	ldc.i4.7
 	stloc.2
-	br L_1037f10
+	br L_1037f20
 // --- basic block ---
-L_1037ec4:
-// 0x01037ec4: 0x1037ec4: lw    s0, 0(s0)
+L_1037ed4:
+// 0x01037ed4: 0x1037ed4: lw    s0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01037ec8: 0x1037ec8: sll   zero, zero, 0
-// 0x01037ecc: 0x1037ecc: bne   s0, zero, 0x1037e94 sll   zero, zero, 0
+// 0x01037ed8: 0x1037ed8: sll   zero, zero, 0
+// 0x01037edc: 0x1037edc: bne   s0, zero, 0x1037ea4 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1037e94
+	brtrue L_1037ea4
 // --- basic block ---
-L_1037ed4:
-// 0x01037ed4: 0x1037ed4: jal   0x1001b48 addu  a0, s1, zero
+L_1037ee4:
+// 0x01037ee4: 0x1037ee4: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -2408,7 +2408,7 @@ L_1037ed4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037edc: 0x1037edc: jal   0x1000910 addiu a0, v0, 12
+// 0x01037eec: 0x1037eec: jal   0x1000910 addiu a0, v0, 12
 	ldloc 5
 	ldc.i4.s 12
 	add
@@ -2423,21 +2423,21 @@ L_1037ed4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037ee4: 0x1037ee4: lui   a0, 0x10000
+// 0x01037ef4: 0x1037ef4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01037ee8: 0x1037ee8: addu  s0, v0, zero
+// 0x01037ef8: 0x1037ef8: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01037eec: 0x1037eec: addiu a0, a0, -12180
+// 0x01037efc: 0x1037efc: addiu a0, a0, -12184
 	ldloc.1
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.1
-// 0x01037ef0: 0x1037ef0: addiu a1, zero, 128
+// 0x01037f00: 0x1037f00: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x01037ef4: 0x1037ef4: jal   0x1004a38 addu  a2, v0, zero
+// 0x01037f04: 0x1037f04: jal   0x1004a48 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -2445,21 +2445,21 @@ L_1037ed4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037efc: 0x1037efc: sb    s3, 8(s0)
+// 0x01037f0c: 0x1037f0c: sb    s3, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	ldloc 10
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01037f00: 0x1037f00: addu  a1, s1, zero
+// 0x01037f10: 0x1037f10: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01037f04: 0x1037f04: jal   0x1001b68 addiu a0, s0, 9
+// 0x01037f14: 0x1037f14: jal   0x1001b68 addiu a0, s0, 9
 	ldloc 8
 	ldc.i4.s 9
 	add
@@ -2471,16 +2471,16 @@ L_1037ed4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f0c: 0x1037f0c: addiu a1, zero, 7
+// 0x01037f1c: 0x1037f1c: addiu a1, zero, 7
 	ldc.i4.7
 	stloc.2
-L_1037f10:
-// 0x01037f10: 0x1037f10: addiu a2, sp, 16
+L_1037f20:
+// 0x01037f20: 0x1037f20: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x01037f14: 0x1037f14: jal   0x1037b38 addu  a0, s0, zero
+// 0x01037f24: 0x1037f24: jal   0x1037b48 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2488,12 +2488,12 @@ L_1037f10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_from_entry_1037b38(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_from_entry_1037b48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f1c: 0x1037f1c: lw    a0, 16(sp)
+// 0x01037f2c: 0x1037f2c: lw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2502,7 +2502,7 @@ L_1037f10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037f20: 0x1037f20: jal   0x1001ba8 sll   zero, zero, 0
+// 0x01037f30: 0x1037f30: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2513,7 +2513,7 @@ L_1037f10:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f28: 0x1037f28: lw    a0, 20(sp)
+// 0x01037f38: 0x1037f38: lw    a0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2522,7 +2522,7 @@ L_1037f10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037f2c: 0x1037f2c: jal   0x1001ba8 addu  s8, v0, zero
+// 0x01037f3c: 0x1037f3c: jal   0x1001ba8 addu  s8, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -2535,7 +2535,7 @@ L_1037f10:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f34: 0x1037f34: lw    a0, 24(sp)
+// 0x01037f44: 0x1037f44: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2544,7 +2544,7 @@ L_1037f10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037f38: 0x1037f38: jal   0x1001ba8 addu  s7, v0, zero
+// 0x01037f48: 0x1037f48: jal   0x1001ba8 addu  s7, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -2557,7 +2557,7 @@ L_1037f10:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f40: 0x1037f40: lw    a0, 28(sp)
+// 0x01037f50: 0x1037f50: lw    a0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2566,7 +2566,7 @@ L_1037f10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037f44: 0x1037f44: jal   0x1001ba8 addu  s6, v0, zero
+// 0x01037f54: 0x1037f54: jal   0x1001ba8 addu  s6, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -2579,7 +2579,7 @@ L_1037f10:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f4c: 0x1037f4c: lw    a0, 32(sp)
+// 0x01037f5c: 0x1037f5c: lw    a0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2588,7 +2588,7 @@ L_1037f10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037f50: 0x1037f50: jal   0x1001ba8 addu  s5, v0, zero
+// 0x01037f60: 0x1037f60: jal   0x1001ba8 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -2601,7 +2601,7 @@ L_1037f10:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f58: 0x1037f58: lw    a0, 36(sp)
+// 0x01037f68: 0x1037f68: lw    a0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2610,7 +2610,7 @@ L_1037f10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037f5c: 0x1037f5c: jal   0x1001ba8 sw    v0, 72(sp)
+// 0x01037f6c: 0x1037f6c: jal   0x1001ba8 sw    v0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2629,7 +2629,7 @@ L_1037f10:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f64: 0x1037f64: lw    a0, 40(sp)
+// 0x01037f74: 0x1037f74: lw    a0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2638,7 +2638,7 @@ L_1037f10:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01037f68: 0x1037f68: jal   0x1001ba8 addu  s2, v0, zero
+// 0x01037f78: 0x1037f78: jal   0x1001ba8 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2651,29 +2651,29 @@ L_1037f10:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f70: 0x1037f70: addu  s4, v0, zero
+// 0x01037f80: 0x1037f80: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x01037f74: 0x1037f74: lui   v0, 0x60000
+// 0x01037f84: 0x1037f84: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01037f78: 0x1037f78: lw    s1, -16700(v0)
+// 0x01037f88: 0x1037f88: lw    s1, -16236(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc 9
-// 0x01037f7c: 0x1037f7c: j	 0x1038120 sll   zero, zero, 0
-	br L_1038120
+// 0x01037f8c: 0x1037f8c: j	 0x1038130 sll   zero, zero, 0
+	br L_1038130
 // --- basic block ---
-L_1037f84:
-// 0x01037f84: 0x1037f84: addu  a0, s1, zero
+L_1037f94:
+// 0x01037f94: 0x1037f94: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01037f88: 0x1037f88: jal   0x1037b38 addiu a2, sp, 44
+// 0x01037f98: 0x1037f98: jal   0x1037b48 addiu a2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -2683,12 +2683,12 @@ L_1037f84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_from_entry_1037b38(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_from_entry_1037b48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f90: 0x1037f90: lw    a1, 44(sp)
+// 0x01037fa0: 0x1037fa0: lw    a1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2697,7 +2697,7 @@ L_1037f84:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037f94: 0x1037f94: jal   0x1001c08 addu  a0, s8, zero
+// 0x01037fa4: 0x1037fa4: jal   0x1001c08 addu  a0, s8, zero
 	ldloc 16
 	stloc.1
 	ldloc.0
@@ -2710,11 +2710,11 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037f9c: 0x1037f9c: bne   v0, zero, 0x1038118 sll   zero, zero, 0
+// 0x01037fac: 0x1037fac: bne   v0, zero, 0x1038128 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1038118
+	brtrue L_1038128
 // --- basic block ---
-// 0x01037fa4: 0x1037fa4: lw    a1, 48(sp)
+// 0x01037fb4: 0x1037fb4: lw    a1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2723,7 +2723,7 @@ L_1037f84:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037fa8: 0x1037fa8: jal   0x1001c08 addu  a0, s7, zero
+// 0x01037fb8: 0x1037fb8: jal   0x1001c08 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -2736,11 +2736,11 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037fb0: 0x1037fb0: bne   v0, zero, 0x1038118 sll   zero, zero, 0
+// 0x01037fc0: 0x1037fc0: bne   v0, zero, 0x1038128 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1038118
+	brtrue L_1038128
 // --- basic block ---
-// 0x01037fb8: 0x1037fb8: lw    a1, 52(sp)
+// 0x01037fc8: 0x1037fc8: lw    a1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2749,7 +2749,7 @@ L_1037f84:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037fbc: 0x1037fbc: jal   0x1001c08 addu  a0, s6, zero
+// 0x01037fcc: 0x1037fcc: jal   0x1001c08 addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -2762,11 +2762,11 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037fc4: 0x1037fc4: bne   v0, zero, 0x1038118 sll   zero, zero, 0
+// 0x01037fd4: 0x1037fd4: bne   v0, zero, 0x1038128 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1038118
+	brtrue L_1038128
 // --- basic block ---
-// 0x01037fcc: 0x1037fcc: lw    a1, 56(sp)
+// 0x01037fdc: 0x1037fdc: lw    a1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2775,7 +2775,7 @@ L_1037f84:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01037fd0: 0x1037fd0: jal   0x1001c08 addu  a0, s5, zero
+// 0x01037fe0: 0x1037fe0: jal   0x1001c08 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -2788,25 +2788,25 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01037fd8: 0x1037fd8: bne   v0, zero, 0x1038118 addiu v1, zero, 70
+// 0x01037fe8: 0x1037fe8: bne   v0, zero, 0x1038128 addiu v1, zero, 70
 	ldloc 5
 	ldc.i4.s 70
 	stloc 6
-	brtrue L_1038118
+	brtrue L_1038128
 // --- basic block ---
-// 0x01037fe0: 0x1037fe0: lb    v0, 8(s1)
+// 0x01037ff0: 0x1037ff0: lb    v0, 8(s1)
 	ldloc 9
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01037fe4: 0x1037fe4: sll   zero, zero, 0
-// 0x01037fe8: 0x1037fe8: bne   v0, v1, 0x10380c8 sll   zero, zero, 0
+// 0x01037ff4: 0x1037ff4: sll   zero, zero, 0
+// 0x01037ff8: 0x1037ff8: bne   v0, v1, 0x10380d8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_10380c8
+	bne.un L_10380d8
 // --- basic block ---
-// 0x01037ff0: 0x1037ff0: lw    v0, 64(sp)
+// 0x01038000: 0x1038000: lw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2815,33 +2815,33 @@ L_1037f84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01037ff4: 0x1037ff4: sll   zero, zero, 0
-// 0x01037ff8: 0x1037ff8: lbu   v0, 0(v0)
+// 0x01038004: 0x1038004: sll   zero, zero, 0
+// 0x01038008: 0x1038008: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x01037ffc: 0x1037ffc: sll   zero, zero, 0
-// 0x01038000: 0x1038000: bne   v0, zero, 0x1038118 sll   zero, zero, 0
+// 0x0103800c: 0x103800c: sll   zero, zero, 0
+// 0x01038010: 0x1038010: bne   v0, zero, 0x1038128 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1038118
+	brtrue L_1038128
 // --- basic block ---
-// 0x01038008: 0x1038008: lbu   v0, 0(s2)
+// 0x01038018: 0x1038018: lbu   v0, 0(s2)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0103800c: 0x103800c: sll   zero, zero, 0
-// 0x01038010: 0x1038010: beq   v0, zero, 0x1038118 addiu a1, s1, 9
+// 0x0103801c: 0x103801c: sll   zero, zero, 0
+// 0x01038020: 0x1038020: beq   v0, zero, 0x1038128 addiu a1, s1, 9
 	ldloc 5
 	ldloc 9
 	ldc.i4.s 9
 	add
 	stloc.2
-	brfalse L_1038118
+	brfalse L_1038128
 // --- basic block ---
-// 0x01038018: 0x1038018: addu  a0, a1, zero
+// 0x01038028: 0x1038028: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0103801c: 0x103801c: jal   0x1001b48 sw    a1, 80(sp)
+// 0x0103802c: 0x103802c: jal   0x1001b48 sw    a1, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2856,10 +2856,10 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038024: 0x1038024: addu  a0, s2, zero
+// 0x01038034: 0x1038034: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01038028: 0x1038028: jal   0x1001b48 sw    v0, 76(sp)
+// 0x01038038: 0x1038038: jal   0x1001b48 sw    v0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2874,10 +2874,10 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038030: 0x1038030: addu  a0, s4, zero
+// 0x01038040: 0x1038040: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x01038034: 0x1038034: jal   0x1001b48 addu  s3, v0, zero
+// 0x01038044: 0x1038044: jal   0x1001b48 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
@@ -2886,7 +2886,7 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103803c: 0x103803c: lw    v1, 76(sp)
+// 0x0103804c: 0x103804c: lw    v1, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2895,18 +2895,18 @@ L_1037f84:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01038040: 0x1038040: sll   zero, zero, 0
-// 0x01038044: 0x1038044: addu  s3, v1, s3
+// 0x01038050: 0x1038050: sll   zero, zero, 0
+// 0x01038054: 0x1038054: addu  s3, v1, s3
 	ldloc 6
 	ldloc 10
 	add
 	stloc 10
-// 0x01038048: 0x1038048: addiu a0, s3, 2
+// 0x01038058: 0x1038058: addiu a0, s3, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc.1
-// 0x0103804c: 0x103804c: jal   0x1000910 addu  a0, a0, v0
+// 0x0103805c: 0x103805c: jal   0x1000910 addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
@@ -2921,7 +2921,7 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038054: 0x1038054: lw    a1, 80(sp)
+// 0x01038064: 0x1038064: lw    a1, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2930,10 +2930,10 @@ L_1037f84:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01038058: 0x1038058: addu  a0, v0, zero
+// 0x01038068: 0x1038068: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103805c: 0x103805c: jal   0x1001b68 addu  s3, v0, zero
+// 0x0103806c: 0x103806c: jal   0x1001b68 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
@@ -2943,13 +2943,13 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038064: 0x1038064: lui   v0, 0x0
+// 0x01038074: 0x1038074: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01038068: 0x1038068: addu  a0, s3, zero
+// 0x01038078: 0x1038078: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0103806c: 0x103806c: jal   0x1001ac4 addiu a1, v0, 28076
+// 0x0103807c: 0x103807c: jal   0x1001ac4 addiu a1, v0, 28076
 	ldloc 5
 	ldc.i4 28076
 	add
@@ -2959,10 +2959,10 @@ L_1037f84:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01038074: 0x1038074: addu  a0, s3, zero
+// 0x01038084: 0x1038084: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01038078: 0x1038078: jal   0x1001ac4 addu  a1, s2, zero
+// 0x01038088: 0x1038088: jal   0x1001ac4 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -2970,15 +2970,15 @@ L_1037f84:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01038080: 0x1038080: lui   v1, 0x0
+// 0x01038090: 0x1038090: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01038084: 0x1038084: addiu a1, v1, 28076
+// 0x01038094: 0x1038094: addiu a1, v1, 28076
 	ldloc 6
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01038088: 0x1038088: jal   0x1001ac4 addu  a0, s3, zero
+// 0x01038098: 0x1038098: jal   0x1001ac4 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -2986,10 +2986,10 @@ L_1037f84:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01038090: 0x1038090: addu  a1, s4, zero
+// 0x010380a0: 0x10380a0: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01038094: 0x1038094: jal   0x1001ac4 addu  a0, s3, zero
+// 0x010380a4: 0x10380a4: jal   0x1001ac4 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -2997,7 +2997,7 @@ L_1037f84:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103809c: 0x103809c: jal   0x10379b4 addu  a0, s1, zero
+// 0x010380ac: 0x10380ac: jal   0x10379c4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3005,12 +3005,12 @@ L_1037f84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_remove_entry_10379b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_remove_entry_10379c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010380a4: 0x10380a4: jal   0x1000930 addu  a0, s1, zero
+// 0x010380b4: 0x10380b4: jal   0x1000930 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3023,10 +3023,10 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010380ac: 0x10380ac: addu  a1, s3, zero
+// 0x010380bc: 0x10380bc: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x010380b0: 0x10380b0: jal   0x1037e2c addiu a0, zero, 70
+// 0x010380c0: 0x10380c0: jal   0x1037e3c addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
@@ -3034,12 +3034,12 @@ L_1037f84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_entry_1037e2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_entry_1037e3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010380b8: 0x10380b8: jal   0x1000930 addu  a0, s3, zero
+// 0x010380c8: 0x10380c8: jal   0x1000930 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -3052,21 +3052,21 @@ L_1037f84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010380c0: 0x10380c0: j	 0x1038128 addu  s1, zero, zero
+// 0x010380d0: 0x10380d0: j	 0x1038138 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_1038128
+	br L_1038138
 // --- basic block ---
-L_10380c8:
-// 0x010380c8: 0x10380c8: addiu v1, zero, 65
+L_10380d8:
+// 0x010380d8: 0x10380d8: addiu v1, zero, 65
 	ldc.i4.s 65
 	stloc 6
-// 0x010380cc: 0x10380cc: bne   v0, v1, 0x1038118 sll   zero, zero, 0
+// 0x010380dc: 0x10380dc: bne   v0, v1, 0x1038128 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1038118
+	bne.un L_1038128
 // --- basic block ---
-// 0x010380d4: 0x10380d4: lw    v0, 60(sp)
+// 0x010380e4: 0x10380e4: lw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3075,22 +3075,22 @@ L_10380c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010380d8: 0x10380d8: sll   zero, zero, 0
-// 0x010380dc: 0x10380dc: lbu   v0, 0(v0)
+// 0x010380e8: 0x10380e8: sll   zero, zero, 0
+// 0x010380ec: 0x10380ec: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010380e0: 0x10380e0: sll   zero, zero, 0
-// 0x010380e4: 0x10380e4: beq   v0, zero, 0x1038118 sll   zero, zero, 0
+// 0x010380f0: 0x10380f0: sll   zero, zero, 0
+// 0x010380f4: 0x10380f4: beq   v0, zero, 0x1038128 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1038118
+	brfalse L_1038128
 // --- basic block ---
-// 0x010380ec: 0x10380ec: bne   s3, v1, 0x1038118 sll   zero, zero, 0
+// 0x010380fc: 0x10380fc: bne   s3, v1, 0x1038128 sll   zero, zero, 0
 	ldloc 10
 	ldloc 6
-	bne.un L_1038118
+	bne.un L_1038128
 // --- basic block ---
-// 0x010380f4: 0x10380f4: jal   0x10379b4 addu  a0, s1, zero
+// 0x01038104: 0x1038104: jal   0x10379c4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3098,17 +3098,17 @@ L_10380c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_remove_entry_10379b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_remove_entry_10379c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010380fc: 0x10380fc: addiu a1, s1, 9
+// 0x0103810c: 0x103810c: addiu a1, s1, 9
 	ldloc 9
 	ldc.i4.s 9
 	add
 	stloc.2
-// 0x01038100: 0x1038100: jal   0x1037e2c addiu a0, zero, 65
+// 0x01038110: 0x1038110: jal   0x1037e3c addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
 	ldloc.0
@@ -3116,12 +3116,12 @@ L_10380c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_entry_1037e2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_entry_1037e3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038108: 0x1038108: jal   0x1000930 addu  a0, s1, zero
+// 0x01038118: 0x1038118: jal   0x1000930 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3134,29 +3134,29 @@ L_10380c8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038110: 0x1038110: j	 0x1038128 addiu s1, zero, 1
+// 0x01038120: 0x1038120: j	 0x1038138 addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-	br L_1038128
+	br L_1038138
 // --- basic block ---
-L_1038118:
-// 0x01038118: 0x1038118: lw    s1, 0(s1)
+L_1038128:
+// 0x01038128: 0x1038128: lw    s1, 0(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0103811c: 0x103811c: sll   zero, zero, 0
-L_1038120:
-// 0x01038120: 0x1038120: bne   s1, zero, 0x1037f84 addiu a1, zero, 7
+// 0x0103812c: 0x103812c: sll   zero, zero, 0
+L_1038130:
+// 0x01038130: 0x1038130: bne   s1, zero, 0x1037f94 addiu a1, zero, 7
 	ldloc 9
 	ldc.i4.7
 	stloc.2
-	brtrue L_1037f84
+	brtrue L_1037f94
 // --- basic block ---
-L_1038128:
-// 0x01038128: 0x1038128: jal   0x1000930 addu  a0, s8, zero
+L_1038138:
+// 0x01038138: 0x1038138: jal   0x1000930 addu  a0, s8, zero
 	ldloc 16
 	stloc.1
 	ldloc.0
@@ -3169,7 +3169,7 @@ L_1038128:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038130: 0x1038130: jal   0x1000930 addu  a0, s7, zero
+// 0x01038140: 0x1038140: jal   0x1000930 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -3182,7 +3182,7 @@ L_1038128:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038138: 0x1038138: jal   0x1000930 addu  a0, s6, zero
+// 0x01038148: 0x1038148: jal   0x1000930 addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -3195,7 +3195,7 @@ L_1038128:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038140: 0x1038140: jal   0x1000930 addu  a0, s5, zero
+// 0x01038150: 0x1038150: jal   0x1000930 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -3208,7 +3208,7 @@ L_1038128:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038148: 0x1038148: lw    a0, 72(sp)
+// 0x01038158: 0x1038158: lw    a0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3217,7 +3217,7 @@ L_1038128:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103814c: 0x103814c: jal   0x1000930 sll   zero, zero, 0
+// 0x0103815c: 0x103815c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3228,7 +3228,7 @@ L_1038128:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038154: 0x1038154: jal   0x1000930 addu  a0, s2, zero
+// 0x01038164: 0x1038164: jal   0x1000930 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -3241,7 +3241,7 @@ L_1038128:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103815c: 0x103815c: jal   0x1000930 addu  a0, s4, zero
+// 0x0103816c: 0x103816c: jal   0x1000930 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -3254,19 +3254,19 @@ L_1038128:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038164: 0x1038164: lui   v0, 0x60000
+// 0x01038174: 0x1038174: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01038168: 0x1038168: lw    v0, -16700(v0)
+// 0x01038178: 0x1038178: lw    v0, -16236(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103816c: 0x103816c: sw    zero, 4(s0)
+// 0x0103817c: 0x103817c: sw    zero, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3275,7 +3275,7 @@ L_1038128:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01038170: 0x1038170: beq   v0, zero, 0x1038180 sw    v0, 0(s0)
+// 0x01038180: 0x1038180: beq   v0, zero, 0x1038190 sw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldloc 8
@@ -3283,9 +3283,9 @@ L_1038128:
 	shr.un
 	ldloc 5
 	stelem.i4
-	brfalse L_1038180
+	brfalse L_1038190
 // --- basic block ---
-// 0x01038178: 0x1038178: j	 0x1038188 sw    s0, 4(v0)
+// 0x01038188: 0x1038188: j	 0x1038198 sw    s0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3294,65 +3294,65 @@ L_1038128:
 	add
 	ldloc 8
 	stelem.i4
-	br L_1038188
+	br L_1038198
 // --- basic block ---
-L_1038180:
-// 0x01038180: 0x1038180: lui   v0, 0x60000
+L_1038190:
+// 0x01038190: 0x1038190: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01038184: 0x1038184: sw    s0, -16692(v0)
+// 0x01038194: 0x1038194: sw    s0, -16228(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4173
+	ldc.i4 -4057
 	add
 	ldloc 8
 	stelem.i4
-L_1038188:
-// 0x01038188: 0x1038188: lui   v0, 0x60000
+L_1038198:
+// 0x01038198: 0x1038198: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103818c: 0x103818c: lw    s2, -16688(v0)
+// 0x0103819c: 0x103819c: lw    s2, -16224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4172
+	ldc.i4 -4056
 	add
 	ldelem.i4
 	stloc 11
-// 0x01038190: 0x1038190: lui   a0, 0x0
+// 0x010381a0: 0x10381a0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01038194: 0x1038194: addiu s2, s2, 1
+// 0x010381a4: 0x10381a4: addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x01038198: 0x1038198: lui   v1, 0x60000
+// 0x010381a8: 0x10381a8: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103819c: 0x103819c: addiu a0, a0, 12560
+// 0x010381ac: 0x10381ac: addiu a0, a0, 12560
 	ldloc.1
 	ldc.i4 12560
 	add
 	stloc.1
-// 0x010381a0: 0x10381a0: sw    s0, -16700(v1)
+// 0x010381b0: 0x10381b0: sw    s0, -16236(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4175
+	ldc.i4 -4059
 	add
 	ldloc 8
 	stelem.i4
-// 0x010381a4: 0x10381a4: jal   0x100e788 sw    s2, -16688(v0)
+// 0x010381b4: 0x10381b4: jal   0x100e798 sw    s2, -16224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4172
+	ldc.i4 -4056
 	add
 	ldloc 11
 	stelem.i4
@@ -3361,60 +3361,60 @@ L_1038188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010381ac: 0x10381ac: slt   v0, v0, s2
+// 0x010381bc: 0x10381bc: slt   v0, v0, s2
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 5
-// 0x010381b0: 0x10381b0: beq   v0, zero, 0x10381d8 lui   v0, 0x60000
+// 0x010381c0: 0x10381c0: beq   v0, zero, 0x10381e8 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_10381d8
+	brfalse L_10381e8
 // --- basic block ---
-// 0x010381b8: 0x10381b8: lw    s0, -16692(v0)
+// 0x010381c8: 0x10381c8: lw    s0, -16228(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4173
+	ldc.i4 -4057
 	add
 	ldelem.i4
 	stloc 8
-// 0x010381bc: 0x10381bc: addiu v0, zero, 65
+// 0x010381cc: 0x10381cc: addiu v0, zero, 65
 	ldc.i4.s 65
 	stloc 5
-// 0x010381c0: 0x10381c0: lb    v1, 8(s0)
+// 0x010381d0: 0x10381d0: lb    v1, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010381c4: 0x10381c4: sll   zero, zero, 0
-// 0x010381c8: 0x10381c8: bne   v1, v0, 0x10381f4 addiu v1, zero, 1
+// 0x010381d4: 0x10381d4: sll   zero, zero, 0
+// 0x010381d8: 0x10381d8: bne   v1, v0, 0x1038204 addiu v1, zero, 1
 	ldloc 6
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	bne.un L_10381f4
+	bne.un L_1038204
 // --- basic block ---
-// 0x010381d0: 0x10381d0: j	 0x10381e0 sll   zero, zero, 0
-	br L_10381e0
+// 0x010381e0: 0x10381e0: j	 0x10381f0 sll   zero, zero, 0
+	br L_10381f0
 // --- basic block ---
-L_10381d8:
-// 0x010381d8: 0x10381d8: beq   s1, zero, 0x10381f4 addiu v1, zero, 1
+L_10381e8:
+// 0x010381e8: 0x10381e8: beq   s1, zero, 0x1038204 addiu v1, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 6
-	brfalse L_10381f4
+	brfalse L_1038204
 // --- basic block ---
-L_10381e0:
-// 0x010381e0: 0x10381e0: jal   0x10379b4 addu  a0, s0, zero
+L_10381f0:
+// 0x010381f0: 0x10381f0: jal   0x10379c4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3422,12 +3422,12 @@ L_10381e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_remove_entry_10379b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_remove_entry_10379c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010381e8: 0x10381e8: jal   0x1000930 addu  a0, s0, zero
+// 0x010381f8: 0x10381f8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3440,25 +3440,25 @@ L_10381e0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010381f0: 0x10381f0: addiu v1, zero, 1
+// 0x01038200: 0x1038200: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_10381f4:
-// 0x010381f4: 0x10381f4: lui   v0, 0x60000
+L_1038204:
+// 0x01038204: 0x1038204: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010381f8: 0x10381f8: sw    v1, -16696(v0)
+// 0x01038208: 0x1038208: sw    v1, -16232(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4174
+	ldc.i4 -4058
 	add
 	ldloc 6
 	stelem.i4
-L_10381fc:
-// 0x010381fc: 0x10381fc: lw    ra, 124(sp)
-// 0x01038200: 0x1038200: lw    s8, 120(sp)
+L_103820c:
+// 0x0103820c: 0x103820c: lw    ra, 124(sp)
+// 0x01038210: 0x1038210: lw    s8, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3467,7 +3467,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01038204: 0x1038204: lw    s7, 116(sp)
+// 0x01038214: 0x1038214: lw    s7, 116(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3476,7 +3476,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01038208: 0x1038208: lw    s6, 112(sp)
+// 0x01038218: 0x1038218: lw    s6, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3485,7 +3485,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103820c: 0x103820c: lw    s5, 108(sp)
+// 0x0103821c: 0x103821c: lw    s5, 108(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3494,7 +3494,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01038210: 0x1038210: lw    s4, 104(sp)
+// 0x01038220: 0x1038220: lw    s4, 104(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3503,7 +3503,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01038214: 0x1038214: lw    s3, 100(sp)
+// 0x01038224: 0x1038224: lw    s3, 100(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3512,7 +3512,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01038218: 0x1038218: lw    s2, 96(sp)
+// 0x01038228: 0x1038228: lw    s2, 96(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3521,7 +3521,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103821c: 0x103821c: lw    s1, 92(sp)
+// 0x0103822c: 0x103822c: lw    s1, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3530,7 +3530,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01038220: 0x1038220: lw    s0, 88(sp)
+// 0x01038230: 0x1038230: lw    s0, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3539,7 +3539,7 @@ L_10381fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038224: 0x1038224: jr    ra addiu sp, sp, 128
+// 0x01038234: 0x1038234: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -3551,7 +3551,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s6,int32 s2,int32 s3,int32 s7,int32 s8,int32 s4,int32 s5,int32 ra)
@@ -3613,12 +3613,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103822c: 0x103822c: addiu sp, sp, -1088
+// 0x0103823c: 0x103823c: addiu sp, sp, -1088
 	ldloc.0
 	ldc.i4 -1088
 	add
 	stloc.0
-// 0x01038230: 0x1038230: sw    s1, 1052(sp)
+// 0x01038240: 0x1038240: sw    s1, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3627,35 +3627,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01038234: 0x1038234: sll   s1, a0, 24
+// 0x01038244: 0x1038244: sll   s1, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 9
-// 0x01038238: 0x1038238: sra   s1, s1, 24
+// 0x01038248: 0x1038248: sra   s1, s1, 24
 	ldloc 9
 	ldc.i4.s 24
 	shr
 	stloc 9
-// 0x0103823c: 0x103823c: lui   v0, 0x60000
+// 0x0103824c: 0x103824c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01038240: 0x1038240: sll   v1, s1, 2
+// 0x01038250: 0x1038250: sll   v1, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01038244: 0x1038244: addiu v0, v0, -15656
+// 0x01038254: 0x1038254: addiu v0, v0, -15192
 	ldloc 6
-	ldc.i4 -15656
+	ldc.i4 -15192
 	add
 	stloc 6
-// 0x01038248: 0x1038248: addu  v0, v1, v0
+// 0x01038258: 0x1038258: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x0103824c: 0x103824c: sw    s5, 1068(sp)
+// 0x0103825c: 0x103825c: sw    s5, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3664,14 +3664,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01038250: 0x1038250: lw    s5, 0(v0)
+// 0x01038260: 0x1038260: lw    s5, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 16
-// 0x01038254: 0x1038254: sw    s0, 1048(sp)
+// 0x01038264: 0x1038264: sw    s0, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3680,8 +3680,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01038258: 0x1038258: sw    ra, 1084(sp)
-// 0x0103825c: 0x103825c: sw    s8, 1080(sp)
+// 0x01038268: 0x1038268: sw    ra, 1084(sp)
+// 0x0103826c: 0x103826c: sw    s8, 1080(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3690,7 +3690,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01038260: 0x1038260: sw    s7, 1076(sp)
+// 0x01038270: 0x1038270: sw    s7, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3699,7 +3699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01038264: 0x1038264: sw    s6, 1072(sp)
+// 0x01038274: 0x1038274: sw    s6, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3708,7 +3708,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01038268: 0x1038268: sw    s4, 1064(sp)
+// 0x01038278: 0x1038278: sw    s4, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3717,7 +3717,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0103826c: 0x103826c: sw    s3, 1060(sp)
+// 0x0103827c: 0x103827c: sw    s3, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3726,7 +3726,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01038270: 0x1038270: sw    s2, 1056(sp)
+// 0x01038280: 0x1038280: sw    s2, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3735,36 +3735,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01038274: 0x1038274: bgtz  s5, 0x103829c addu  s0, a1, zero
+// 0x01038284: 0x1038284: bgtz  s5, 0x10382ac addu  s0, a1, zero
 	ldloc 16
 	ldloc.2
 	stloc 8
 	ldc.i4.s 0
-	bgt L_103829c
+	bgt L_10382ac
 // --- basic block ---
-// 0x0103827c: 0x103827c: lui   a1, 0x10000
+// 0x0103828c: 0x103828c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01038280: 0x1038280: lui   a3, 0x10000
+// 0x01038290: 0x1038290: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01038284: 0x1038284: addiu a1, a1, -12180
+// 0x01038294: 0x1038294: addiu a1, a1, -12184
 	ldloc.2
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc.2
-// 0x01038288: 0x1038288: addiu a3, a3, -12048
+// 0x01038298: 0x1038298: addiu a3, a3, -12052
 	ldloc 4
-	ldc.i4 -12048
+	ldc.i4 -12052
 	add
 	stloc 4
-// 0x0103828c: 0x103828c: addiu a0, zero, 5
+// 0x0103829c: 0x103829c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01038290: 0x1038290: addiu a2, zero, 343
+// 0x010382a0: 0x10382a0: addiu a2, zero, 343
 	ldc.i4 343
 	stloc.3
-// 0x01038294: 0x1038294: jal   0x100449c sw    s1, 16(sp)
+// 0x010382a4: 0x10382a4: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3783,59 +3783,59 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_103829c:
-// 0x0103829c: 0x103829c: lui   s8, 0x10000
+L_10382ac:
+// 0x010382ac: 0x10382ac: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010382a0: 0x10382a0: lui   s7, 0x10000
+// 0x010382b0: 0x10382b0: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x010382a4: 0x10382a4: lui   s6, 0x0
+// 0x010382b4: 0x10382b4: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010382a8: 0x10382a8: sb    zero, 24(sp)
+// 0x010382b8: 0x10382b8: sb    zero, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010382ac: 0x10382ac: addiu s8, s8, -12180
+// 0x010382bc: 0x10382bc: addiu s8, s8, -12184
 	ldloc 14
-	ldc.i4 -12180
+	ldc.i4 -12184
 	add
 	stloc 14
-// 0x010382b0: 0x10382b0: addiu s7, s7, -12016
+// 0x010382c0: 0x10382c0: addiu s7, s7, -12020
 	ldloc 13
-	ldc.i4 -12016
+	ldc.i4 -12020
 	add
 	stloc 13
-// 0x010382b4: 0x10382b4: addiu s6, s6, 28076
+// 0x010382c4: 0x10382c4: addiu s6, s6, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 10
-// 0x010382b8: 0x10382b8: addiu s3, zero, 1
+// 0x010382c8: 0x10382c8: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x010382bc: 0x10382bc: addu  s2, zero, zero
+// 0x010382cc: 0x10382cc: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010382c0: 0x10382c0: j	 0x1038324 addiu s4, sp, 24
+// 0x010382d0: 0x10382d0: j	 0x1038334 addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-	br L_1038324
+	br L_1038334
 // --- basic block ---
-L_10382c8:
-// 0x010382c8: 0x10382c8: lw    a0, 0(s0)
+L_10382d8:
+// 0x010382d8: 0x10382d8: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010382cc: 0x10382cc: jal   0x1001b48 addiu s2, s2, 1
+// 0x010382dc: 0x10382dc: jal   0x1001b48 addiu s2, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
@@ -3846,37 +3846,37 @@ L_10382c8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010382d4: 0x10382d4: addiu v0, v0, 1
+// 0x010382e4: 0x10382e4: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010382d8: 0x10382d8: addu  s3, s3, v0
+// 0x010382e8: 0x10382e8: addu  s3, s3, v0
 	ldloc 12
 	ldloc 6
 	add
 	stloc 12
-// 0x010382dc: 0x10382dc: sltiu v0, s3, 1024
+// 0x010382ec: 0x10382ec: sltiu v0, s3, 1024
 	ldloc 12
 	ldc.i4 1024
 	clt.un
 	stloc 6
-// 0x010382e0: 0x10382e0: bne   v0, zero, 0x1038300 addu  a1, s6, zero
+// 0x010382f0: 0x10382f0: bne   v0, zero, 0x1038310 addu  a1, s6, zero
 	ldloc 6
 	ldloc 10
 	stloc.2
-	brtrue L_1038300
+	brtrue L_1038310
 // --- basic block ---
-// 0x010382e8: 0x10382e8: addiu a2, zero, 353
+// 0x010382f8: 0x10382f8: addiu a2, zero, 353
 	ldc.i4 353
 	stloc.3
-// 0x010382ec: 0x10382ec: addu  a3, s7, zero
+// 0x010382fc: 0x10382fc: addu  a3, s7, zero
 	ldloc 13
 	stloc 4
-// 0x010382f0: 0x10382f0: addiu a0, zero, 5
+// 0x01038300: 0x1038300: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010382f4: 0x10382f4: jal   0x100449c addu  a1, s8, zero
+// 0x01038304: 0x1038304: jal   0x100449c addu  a1, s8, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -3889,11 +3889,11 @@ L_10382c8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010382fc: 0x10382fc: addu  a1, s6, zero
+// 0x0103830c: 0x103830c: addu  a1, s6, zero
 	ldloc 10
 	stloc.2
-L_1038300:
-// 0x01038300: 0x1038300: jal   0x1001ac4 addu  a0, s4, zero
+L_1038310:
+// 0x01038310: 0x1038310: jal   0x1001ac4 addu  a0, s4, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
@@ -3901,35 +3901,35 @@ L_1038300:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01038308: 0x1038308: lw    a0, 0(s0)
+// 0x01038318: 0x1038318: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103830c: 0x103830c: jal   0x1037c94 sll   zero, zero, 0
+// 0x0103831c: 0x103831c: jal   0x1037ca4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::remove_commas_1037c94(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::remove_commas_1037ca4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01038314: 0x1038314: lw    a1, 0(s0)
+// 0x01038324: 0x1038324: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01038318: 0x1038318: addu  a0, s4, zero
+// 0x01038328: 0x1038328: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x0103831c: 0x103831c: jal   0x1001ac4 addiu s0, s0, 4
+// 0x0103832c: 0x103832c: jal   0x1001ac4 addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
@@ -3939,19 +3939,19 @@ L_1038300:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-L_1038324:
-// 0x01038324: 0x1038324: slt   v0, s2, s5
+L_1038334:
+// 0x01038334: 0x1038334: slt   v0, s2, s5
 	ldloc 11
 	ldloc 16
 	clt
 	stloc 6
-// 0x01038328: 0x1038328: bne   v0, zero, 0x10382c8 addu  a0, s1, zero
+// 0x01038338: 0x1038338: bne   v0, zero, 0x10382d8 addu  a0, s1, zero
 	ldloc 6
 	ldloc 9
 	stloc.1
-	brtrue L_10382c8
+	brtrue L_10382d8
 // --- basic block ---
-// 0x01038330: 0x1038330: jal   0x1037e2c addiu a1, sp, 25
+// 0x01038340: 0x1038340: jal   0x1037e3c addiu a1, sp, 25
 	ldloc.0
 	ldc.i4.s 25
 	add
@@ -3961,13 +3961,13 @@ L_1038324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_entry_1037e2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_entry_1037e3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01038338: 0x1038338: lw    ra, 1084(sp)
-// 0x0103833c: 0x103833c: lw    s8, 1080(sp)
+// 0x01038348: 0x1038348: lw    ra, 1084(sp)
+// 0x0103834c: 0x103834c: lw    s8, 1080(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3976,7 +3976,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01038340: 0x1038340: lw    s7, 1076(sp)
+// 0x01038350: 0x1038350: lw    s7, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3985,7 +3985,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01038344: 0x1038344: lw    s6, 1072(sp)
+// 0x01038354: 0x1038354: lw    s6, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3994,7 +3994,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01038348: 0x1038348: lw    s5, 1068(sp)
+// 0x01038358: 0x1038358: lw    s5, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4003,7 +4003,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0103834c: 0x103834c: lw    s4, 1064(sp)
+// 0x0103835c: 0x103835c: lw    s4, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4012,7 +4012,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01038350: 0x1038350: lw    s3, 1060(sp)
+// 0x01038360: 0x1038360: lw    s3, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4021,7 +4021,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01038354: 0x1038354: lw    s2, 1056(sp)
+// 0x01038364: 0x1038364: lw    s2, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4030,7 +4030,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01038358: 0x1038358: lw    s1, 1052(sp)
+// 0x01038368: 0x1038368: lw    s1, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4039,7 +4039,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103835c: 0x103835c: lw    s0, 1048(sp)
+// 0x0103836c: 0x103836c: lw    s0, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4048,7 +4048,7 @@ L_1038324:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038360: 0x1038360: jr    ra addiu sp, sp, 1088
+// 0x01038370: 0x1038370: jr    ra addiu sp, sp, 1088
 	ldloc.0
 	ldc.i4 1088
 	add
@@ -4060,7 +4060,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_history_load_1038368(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_load_1038378(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4104,25 +4104,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038368: 0x1038368: lui   v0, 0x60000
+// 0x01038378: 0x1038378: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103836c: 0x103836c: lw    v0, -15660(v0)
+// 0x0103837c: 0x103837c: lw    v0, -15196(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3915
+	ldc.i4 -3799
 	add
 	ldelem.i4
 	stloc 5
-// 0x01038370: 0x1038370: addiu sp, sp, -1056
+// 0x01038380: 0x1038380: addiu sp, sp, -1056
 	ldloc.0
 	ldc.i4 -1056
 	add
 	stloc.0
-// 0x01038374: 0x1038374: sw    ra, 1052(sp)
-// 0x01038378: 0x1038378: sw    s2, 1048(sp)
+// 0x01038384: 0x1038384: sw    ra, 1052(sp)
+// 0x01038388: 0x1038388: sw    s2, 1048(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4131,7 +4131,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103837c: 0x103837c: sw    s1, 1044(sp)
+// 0x0103838c: 0x103838c: sw    s1, 1044(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4140,7 +4140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01038380: 0x1038380: bne   v0, zero, 0x1038460 sw    s0, 1040(sp)
+// 0x01038390: 0x1038390: bne   v0, zero, 0x1038470 sw    s0, 1040(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -4150,34 +4150,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1038460
+	brtrue L_1038470
 // --- basic block ---
-// 0x01038388: 0x1038388: jal   0x104c564 sll   zero, zero, 0
+// 0x01038398: 0x1038398: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038390: 0x1038390: lui   a1, 0x10000
+// 0x010383a0: 0x10383a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01038394: 0x1038394: lui   a2, 0x0
+// 0x010383a4: 0x10383a4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01038398: 0x1038398: addu  a0, v0, zero
+// 0x010383a8: 0x10383a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103839c: 0x103839c: addiu a1, a1, -12188
+// 0x010383ac: 0x10383ac: addiu a1, a1, -12192
 	ldloc.2
-	ldc.i4 -12188
+	ldc.i4 -12192
 	add
 	stloc.2
-// 0x010383a0: 0x10383a0: jal   0x104dac8 addiu a2, a2, 26128
+// 0x010383b0: 0x10383b0: jal   0x104dad8 addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
@@ -4187,24 +4187,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010383a8: 0x10383a8: bne   v0, zero, 0x1038424 addu  s0, v0, zero
+// 0x010383b8: 0x10383b8: bne   v0, zero, 0x1038434 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1038424
+	brtrue L_1038434
 // --- basic block ---
-// 0x010383b0: 0x10383b0: j	 0x1038450 lui   v0, 0x60000
+// 0x010383c0: 0x10383c0: j	 0x1038460 lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-	br L_1038450
+	br L_1038460
 // --- basic block ---
-L_10383b8:
-// 0x010383b8: 0x10383b8: jal   0x1001e98 sll   zero, zero, 0
+L_10383c8:
+// 0x010383c8: 0x10383c8: jal   0x1001e98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4215,121 +4215,121 @@ L_10383b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010383c0: 0x10383c0: addu  a0, s1, zero
+// 0x010383d0: 0x10383d0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010383c4: 0x10383c4: beq   v0, zero, 0x1038444 addiu a1, zero, 1024
+// 0x010383d4: 0x10383d4: beq   v0, zero, 0x1038454 addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_1038444
+	brfalse L_1038454
 // --- basic block ---
-// 0x010383cc: 0x10383cc: jal   0x100e038 sll   zero, zero, 0
+// 0x010383dc: 0x10383dc: jal   0x100e048 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl10::roadmap_config_extract_data_100e038(int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_extract_data_100e048(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010383d4: 0x10383d4: addu  a1, v0, zero
+// 0x010383e4: 0x10383e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010383d8: 0x10383d8: beq   v0, zero, 0x103842c addiu a0, zero, 65
+// 0x010383e8: 0x10383e8: beq   v0, zero, 0x103843c addiu a0, zero, 65
 	ldloc 5
 	ldc.i4.s 65
 	stloc.1
-	brfalse L_103842c
+	brfalse L_103843c
 // --- basic block ---
-// 0x010383e0: 0x10383e0: lb    v1, 1(v0)
+// 0x010383f0: 0x10383f0: lb    v1, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010383e4: 0x10383e4: sll   zero, zero, 0
-// 0x010383e8: 0x10383e8: bne   v1, s2, 0x1038414 sll   zero, zero, 0
+// 0x010383f4: 0x10383f4: sll   zero, zero, 0
+// 0x010383f8: 0x10383f8: bne   v1, s2, 0x1038424 sll   zero, zero, 0
 	ldloc 6
 	ldloc 10
-	bne.un L_1038414
+	bne.un L_1038424
 // --- basic block ---
-// 0x010383f0: 0x10383f0: lb    v1, 0(v0)
+// 0x01038400: 0x1038400: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010383f4: 0x10383f4: sll   zero, zero, 0
-// 0x010383f8: 0x10383f8: slti  a3, v1, 65
+// 0x01038404: 0x1038404: sll   zero, zero, 0
+// 0x01038408: 0x1038408: slti  a3, v1, 65
 	ldloc 6
 	ldc.i4.s 65
 	clt
 	stloc 4
-// 0x010383fc: 0x10383fc: bne   a3, zero, 0x1038414 slti  a2, v1, 91
+// 0x0103840c: 0x103840c: bne   a3, zero, 0x1038424 slti  a2, v1, 91
 	ldloc 4
 	ldloc 6
 	ldc.i4.s 91
 	clt
 	stloc.3
-	brtrue L_1038414
+	brtrue L_1038424
 // --- basic block ---
-// 0x01038404: 0x1038404: beq   a2, zero, 0x1038414 sll   zero, zero, 0
+// 0x01038414: 0x1038414: beq   a2, zero, 0x1038424 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1038414
+	brfalse L_1038424
 // --- basic block ---
-// 0x0103840c: 0x103840c: addu  a0, v1, zero
+// 0x0103841c: 0x103841c: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01038410: 0x1038410: addiu a1, v0, 2
+// 0x01038420: 0x1038420: addiu a1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc.2
-L_1038414:
-// 0x01038414: 0x1038414: jal   0x1037e2c sll   zero, zero, 0
+L_1038424:
+// 0x01038424: 0x1038424: jal   0x1037e3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_entry_1037e2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_entry_1037e3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103841c: 0x103841c: j	 0x103842c sll   zero, zero, 0
-	br L_103842c
+// 0x0103842c: 0x103842c: j	 0x103843c sll   zero, zero, 0
+	br L_103843c
 // --- basic block ---
-L_1038424:
-// 0x01038424: 0x1038424: addiu s1, sp, 16
+L_1038434:
+// 0x01038434: 0x1038434: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x01038428: 0x1038428: addiu s2, zero, 44
+// 0x01038438: 0x1038438: addiu s2, zero, 44
 	ldc.i4.s 44
 	stloc 10
-L_103842c:
-// 0x0103842c: 0x103842c: jal   0x1001e30 addu  a0, s0, zero
+L_103843c:
+// 0x0103843c: 0x103843c: jal   0x1001e30 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x01038434: 0x1038434: addu  a2, s0, zero
+// 0x01038444: 0x1038444: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x01038438: 0x1038438: addu  a0, s1, zero
+// 0x01038448: 0x1038448: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103843c: 0x103843c: beq   v0, zero, 0x10383b8 addiu a1, zero, 1024
+// 0x0103844c: 0x103844c: beq   v0, zero, 0x10383c8 addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_10383b8
+	brfalse L_10383c8
 // --- basic block ---
-L_1038444:
-// 0x01038444: 0x1038444: jal   0x10023b4 addu  a0, s0, zero
+L_1038454:
+// 0x01038454: 0x1038454: jal   0x10023b4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4342,37 +4342,37 @@ L_1038444:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103844c: 0x103844c: lui   v0, 0x60000
+// 0x0103845c: 0x103845c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1038450:
-// 0x01038450: 0x1038450: addiu v1, zero, 1
+L_1038460:
+// 0x01038460: 0x1038460: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01038454: 0x1038454: sw    v1, -15660(v0)
+// 0x01038464: 0x1038464: sw    v1, -15196(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3915
+	ldc.i4 -3799
 	add
 	ldloc 6
 	stelem.i4
-// 0x01038458: 0x1038458: lui   v0, 0x60000
+// 0x01038468: 0x1038468: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103845c: 0x103845c: sw    zero, -16696(v0)
+// 0x0103846c: 0x103846c: sw    zero, -16232(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4174
+	ldc.i4 -4058
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1038460:
-// 0x01038460: 0x1038460: lw    ra, 1052(sp)
-// 0x01038464: 0x1038464: lw    s2, 1048(sp)
+L_1038470:
+// 0x01038470: 0x1038470: lw    ra, 1052(sp)
+// 0x01038474: 0x1038474: lw    s2, 1048(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4381,7 +4381,7 @@ L_1038460:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01038468: 0x1038468: lw    s1, 1044(sp)
+// 0x01038478: 0x1038478: lw    s1, 1044(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4390,7 +4390,7 @@ L_1038460:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103846c: 0x103846c: lw    s0, 1040(sp)
+// 0x0103847c: 0x103847c: lw    s0, 1040(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4399,7 +4399,7 @@ L_1038460:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038470: 0x1038470: jr    ra addiu sp, sp, 1056
+// 0x01038480: 0x1038480: jr    ra addiu sp, sp, 1056
 	ldloc.0
 	ldc.i4 1056
 	add
@@ -4411,7 +4411,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_history_initialize_1038478(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_history_initialize_1038488(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4446,37 +4446,37 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038478: 0x1038478: lui   a0, 0x10000
+// 0x01038488: 0x1038488: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103847c: 0x103847c: lui   a1, 0x0
+// 0x0103848c: 0x103848c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01038480: 0x1038480: lui   a2, 0x10000
+// 0x01038490: 0x1038490: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01038484: 0x1038484: addiu sp, sp, -24
+// 0x01038494: 0x1038494: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01038488: 0x1038488: addiu a0, a0, 12560
+// 0x01038498: 0x1038498: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103848c: 0x103848c: addiu a1, a1, 12560
+// 0x0103849c: 0x103849c: addiu a1, a1, 12560
 	ldloc.2
 	ldc.i4 12560
 	add
 	stloc.2
-// 0x01038490: 0x1038490: addiu a2, a2, -15288
+// 0x010384a0: 0x10384a0: addiu a2, a2, -15292
 	ldloc.3
-	ldc.i4 -15288
+	ldc.i4 -15292
 	add
 	stloc.3
-// 0x01038494: 0x1038494: sw    ra, 20(sp)
-// 0x01038498: 0x1038498: jal   0x100edb0 addu  a3, zero, zero
+// 0x010384a4: 0x10384a4: sw    ra, 20(sp)
+// 0x010384a8: 0x10384a8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4484,14 +4484,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010384a0: 0x10384a0: lw    ra, 20(sp)
-// 0x010384a4: 0x10384a4: sll   zero, zero, 0
-// 0x010384a8: 0x10384a8: jr    ra addiu sp, sp, 24
+// 0x010384b0: 0x10384b0: lw    ra, 20(sp)
+// 0x010384b4: 0x10384b4: sll   zero, zero, 0
+// 0x010384b8: 0x10384b8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4503,7 +4503,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 utf8_strlen_10384b0(int32,int32,int32)
+.method public static int32 utf8_strlen_10384c0(int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -4532,74 +4532,74 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010384b0: 0x10384b0: bne   a0, zero, 0x10384e8 addu  v0, zero, zero
+// 0x010384c0: 0x10384c0: bne   a0, zero, 0x10384f8 addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_10384e8
-// 0x010384b8: 0x10384b8: jr    ra sll   zero, zero, 0
+	brtrue L_10384f8
+// 0x010384c8: 0x10384c8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10384c0:
-// 0x010384c0: 0x10384c0: bgez  a1, 0x10384e0 andi  a1, a1, 255
+L_10384d0:
+// 0x010384d0: 0x10384d0: bgez  a1, 0x10384f0 andi  a1, a1, 255
 	ldloc.1
 	ldloc.1
 	ldc.i4 255
 	and
 	stloc.1
 	ldc.i4.s 0
-	bge L_10384e0
+	bge L_10384f0
 // --- basic block ---
-// 0x010384c8: 0x10384c8: andi  a2, a1, 16
+// 0x010384d8: 0x10384d8: andi  a2, a1, 16
 	ldloc.1
 	ldc.i4.s 16
 	and
 	stloc.2
-// 0x010384cc: 0x10384cc: andi  a1, a1, 32
+// 0x010384dc: 0x10384dc: andi  a1, a1, 32
 	ldloc.1
 	ldc.i4.s 32
 	and
 	stloc.1
-// 0x010384d0: 0x10384d0: beq   a1, zero, 0x10384e0 addiu v1, zero, 2
+// 0x010384e0: 0x10384e0: beq   a1, zero, 0x10384f0 addiu v1, zero, 2
 	ldloc.1
 	ldc.i4.2
 	stloc.3
-	brfalse L_10384e0
+	brfalse L_10384f0
 // --- basic block ---
-// 0x010384d8: 0x10384d8: sltu  v1, zero, a2
+// 0x010384e8: 0x10384e8: sltu  v1, zero, a2
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.3
-// 0x010384dc: 0x10384dc: addiu v1, v1, 3
+// 0x010384ec: 0x10384ec: addiu v1, v1, 3
 	ldloc.3
 	ldc.i4.3
 	add
 	stloc.3
-L_10384e0:
-// 0x010384e0: 0x10384e0: addu  a0, a0, v1
+L_10384f0:
+// 0x010384f0: 0x10384f0: addu  a0, a0, v1
 	ldloc.0
 	ldloc.3
 	add
 	stloc.0
-// 0x010384e4: 0x10384e4: addiu v0, v0, 1
+// 0x010384f4: 0x10384f4: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-L_10384e8:
-// 0x010384e8: 0x10384e8: lb    a1, 0(a0)
+L_10384f8:
+// 0x010384f8: 0x10384f8: lb    a1, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010384ec: 0x10384ec: sll   zero, zero, 0
-// 0x010384f0: 0x10384f0: bne   a1, zero, 0x10384c0 addiu v1, zero, 1
+// 0x010384fc: 0x10384fc: sll   zero, zero, 0
+// 0x01038500: 0x1038500: bne   a1, zero, 0x10384d0 addiu v1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc.3
-	brtrue L_10384c0
+	brtrue L_10384d0
 // --- basic block ---
-// 0x010384f8: 0x10384f8: jr    ra sll   zero, zero, 0
+// 0x01038508: 0x1038508: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -4607,7 +4607,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 utf8_to_char_array_1038500(int32,int32,int32,int32,int32)
+.method public static int32 utf8_to_char_array_1038510(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s2,int32 s3,int32 v1,int32 s1,int32 ra)
@@ -4654,12 +4654,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038500: 0x1038500: addiu sp, sp, -40
+// 0x01038510: 0x1038510: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01038504: 0x1038504: sw    s3, 32(sp)
+// 0x01038514: 0x1038514: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4668,7 +4668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01038508: 0x1038508: sw    s1, 24(sp)
+// 0x01038518: 0x1038518: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4677,7 +4677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103850c: 0x103850c: sw    s0, 20(sp)
+// 0x0103851c: 0x103851c: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4686,11 +4686,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01038510: 0x1038510: sw    ra, 36(sp)
-// 0x01038514: 0x1038514: addu  s0, a1, zero
+// 0x01038520: 0x1038520: sw    ra, 36(sp)
+// 0x01038524: 0x1038524: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x01038518: 0x1038518: sw    s2, 28(sp)
+// 0x01038528: 0x1038528: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4699,31 +4699,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103851c: 0x103851c: jal   0x10384b0 addu  s3, a0, zero
+// 0x0103852c: 0x103852c: jal   0x10384c0 addu  s3, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl41::utf8_strlen_10384b0(int32,int32,int32)
+	call int32 Cibyl41::utf8_strlen_10384c0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01038524: 0x1038524: sw    v0, 0(s0)
+// 0x01038534: 0x1038534: sw    v0, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01038528: 0x1038528: beq   v0, zero, 0x10385ac addu  s1, zero, zero
+// 0x01038538: 0x1038538: beq   v0, zero, 0x10385bc addu  s1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	brfalse L_10385ac
+	brfalse L_10385bc
 // --- basic block ---
-// 0x01038530: 0x1038530: jal   0x1000910 sll   a0, v0, 2
+// 0x01038540: 0x1038540: jal   0x1000910 sll   a0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
@@ -4738,62 +4738,62 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01038538: 0x1038538: addu  s1, v0, zero
+// 0x01038548: 0x1038548: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0103853c: 0x103853c: bne   v0, zero, 0x103859c addu  s2, v0, zero
+// 0x0103854c: 0x103854c: bne   v0, zero, 0x10385ac addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_103859c
+	brtrue L_10385ac
 // --- basic block ---
-// 0x01038544: 0x1038544: j	 0x10385ac sw    zero, 0(s0)
+// 0x01038554: 0x1038554: j	 0x10385bc sw    zero, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_10385ac
+	br L_10385bc
 // --- basic block ---
-L_103854c:
-// 0x0103854c: 0x103854c: bgez  v0, 0x103856c andi  v0, v0, 255
+L_103855c:
+// 0x0103855c: 0x103855c: bgez  v0, 0x103857c andi  v0, v0, 255
 	ldloc 5
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
 	ldc.i4.s 0
-	bge L_103856c
+	bge L_103857c
 // --- basic block ---
-// 0x01038554: 0x1038554: andi  v1, v0, 16
+// 0x01038564: 0x1038564: andi  v1, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	and
 	stloc 10
-// 0x01038558: 0x1038558: andi  v0, v0, 32
+// 0x01038568: 0x1038568: andi  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	and
 	stloc 5
-// 0x0103855c: 0x103855c: beq   v0, zero, 0x103856c addiu s0, zero, 2
+// 0x0103856c: 0x103856c: beq   v0, zero, 0x103857c addiu s0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_103856c
+	brfalse L_103857c
 // --- basic block ---
-// 0x01038564: 0x1038564: sltu  s0, zero, v1
+// 0x01038574: 0x1038574: sltu  s0, zero, v1
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 6
-// 0x01038568: 0x1038568: addiu s0, s0, 3
+// 0x01038578: 0x1038578: addiu s0, s0, 3
 	ldloc 6
 	ldc.i4.3
 	add
 	stloc 6
-L_103856c:
-// 0x0103856c: 0x103856c: jal   0x1000910 addiu a0, s0, 1
+L_103857c:
+// 0x0103857c: 0x103857c: jal   0x1000910 addiu a0, s0, 1
 	ldloc 6
 	ldc.i4.1
 	add
@@ -4808,20 +4808,20 @@ L_103856c:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01038574: 0x1038574: sw    v0, 0(s2)
+// 0x01038584: 0x1038584: sw    v0, 0(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01038578: 0x1038578: addu  a1, s3, zero
+// 0x01038588: 0x1038588: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0103857c: 0x103857c: addu  a2, s0, zero
+// 0x0103858c: 0x103858c: addu  a2, s0, zero
 	ldloc 6
 	stloc.3
-// 0x01038580: 0x1038580: jal   0x1001af8 addu  a0, v0, zero
+// 0x01038590: 0x1038590: jal   0x1001af8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -4830,50 +4830,50 @@ L_103856c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01038588: 0x1038588: lw    v0, 0(s2)
+// 0x01038598: 0x1038598: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103858c: 0x103858c: addu  s3, s3, s0
+// 0x0103859c: 0x103859c: addu  s3, s3, s0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01038590: 0x1038590: addu  s0, v0, s0
+// 0x010385a0: 0x10385a0: addu  s0, v0, s0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01038594: 0x1038594: sb    zero, 0(s0)
+// 0x010385a4: 0x10385a4: sb    zero, 0(s0)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01038598: 0x1038598: addiu s2, s2, 4
+// 0x010385a8: 0x10385a8: addiu s2, s2, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_103859c:
-// 0x0103859c: 0x103859c: lb    v0, 0(s3)
+L_10385ac:
+// 0x010385ac: 0x10385ac: lb    v0, 0(s3)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010385a0: 0x10385a0: sll   zero, zero, 0
-// 0x010385a4: 0x10385a4: bne   v0, zero, 0x103854c addiu s0, zero, 1
+// 0x010385b0: 0x10385b0: sll   zero, zero, 0
+// 0x010385b4: 0x10385b4: bne   v0, zero, 0x103855c addiu s0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_103854c
+	brtrue L_103855c
 // --- basic block ---
-L_10385ac:
-// 0x010385ac: 0x10385ac: lw    ra, 36(sp)
-// 0x010385b0: 0x10385b0: addu  v0, s1, zero
+L_10385bc:
+// 0x010385bc: 0x10385bc: lw    ra, 36(sp)
+// 0x010385c0: 0x10385c0: addu  v0, s1, zero
 	ldloc 11
 	stloc 5
-// 0x010385b4: 0x10385b4: lw    s3, 32(sp)
+// 0x010385c4: 0x10385c4: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4882,7 +4882,7 @@ L_10385ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010385b8: 0x10385b8: lw    s2, 28(sp)
+// 0x010385c8: 0x10385c8: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4891,7 +4891,7 @@ L_10385ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010385bc: 0x10385bc: lw    s1, 24(sp)
+// 0x010385cc: 0x10385cc: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4900,7 +4900,7 @@ L_10385ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010385c0: 0x10385c0: lw    s0, 20(sp)
+// 0x010385d0: 0x10385d0: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4909,7 +4909,7 @@ L_10385ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010385c4: 0x10385c4: jr    ra addiu sp, sp, 40
+// 0x010385d4: 0x10385d4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4921,7 +4921,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 utf8_free_char_array_10385cc(int32,int32,int32,int32,int32)
+.method public static int32 utf8_free_char_array_10385dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s2,int32 s0,int32 ra,int32 v1)
@@ -4965,12 +4965,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010385cc: 0x10385cc: addiu sp, sp, -40
+// 0x010385dc: 0x10385dc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010385d0: 0x10385d0: sw    s2, 32(sp)
+// 0x010385e0: 0x10385e0: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4979,7 +4979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010385d4: 0x10385d4: sw    s1, 28(sp)
+// 0x010385e4: 0x10385e4: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4988,7 +4988,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010385d8: 0x10385d8: sw    s0, 24(sp)
+// 0x010385e8: 0x10385e8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4997,34 +4997,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010385dc: 0x10385dc: sw    ra, 36(sp)
-// 0x010385e0: 0x10385e0: addu  s0, a0, zero
+// 0x010385ec: 0x10385ec: sw    ra, 36(sp)
+// 0x010385f0: 0x10385f0: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010385e4: 0x10385e4: addu  s1, a0, zero
+// 0x010385f4: 0x10385f4: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010385e8: 0x10385e8: j	 0x1038614 addu  s2, zero, zero
+// 0x010385f8: 0x10385f8: j	 0x1038624 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1038614
+	br L_1038624
 // --- basic block ---
-L_10385f0:
-// 0x010385f0: 0x10385f0: lw    v0, 0(s1)
+L_1038600:
+// 0x01038600: 0x1038600: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010385f4: 0x10385f4: sll   zero, zero, 0
-// 0x010385f8: 0x10385f8: beq   v0, zero, 0x1038610 addu  a0, v0, zero
+// 0x01038604: 0x1038604: sll   zero, zero, 0
+// 0x01038608: 0x1038608: beq   v0, zero, 0x1038620 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_1038610
+	brfalse L_1038620
 // --- basic block ---
-// 0x01038600: 0x1038600: jal   0x1000930 sw    a1, 16(sp)
+// 0x01038610: 0x1038610: jal   0x1000930 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5043,7 +5043,7 @@ L_10385f0:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01038608: 0x1038608: lw    a1, 16(sp)
+// 0x01038618: 0x1038618: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5052,38 +5052,38 @@ L_10385f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103860c: 0x103860c: sw    zero, 0(s1)
+// 0x0103861c: 0x103861c: sw    zero, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1038610:
-// 0x01038610: 0x1038610: addiu s1, s1, 4
+L_1038620:
+// 0x01038620: 0x1038620: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_1038614:
-// 0x01038614: 0x1038614: slt   v0, s2, a1
+L_1038624:
+// 0x01038624: 0x1038624: slt   v0, s2, a1
 	ldloc 8
 	ldloc.2
 	clt
 	stloc 6
-// 0x01038618: 0x1038618: bne   v0, zero, 0x10385f0 addiu s2, s2, 1
+// 0x01038628: 0x1038628: bne   v0, zero, 0x1038600 addiu s2, s2, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_10385f0
+	brtrue L_1038600
 // --- basic block ---
-// 0x01038620: 0x1038620: beq   s0, zero, 0x1038630 sll   zero, zero, 0
+// 0x01038630: 0x1038630: beq   s0, zero, 0x1038640 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_1038630
+	brfalse L_1038640
 // --- basic block ---
-// 0x01038628: 0x1038628: jal   0x1000930 addu  a0, s0, zero
+// 0x01038638: 0x1038638: jal   0x1000930 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5096,9 +5096,9 @@ L_1038614:
 	stloc 11
 	stloc 6
 // --- basic block ---
-L_1038630:
-// 0x01038630: 0x1038630: lw    ra, 36(sp)
-// 0x01038634: 0x1038634: lw    s2, 32(sp)
+L_1038640:
+// 0x01038640: 0x1038640: lw    ra, 36(sp)
+// 0x01038644: 0x1038644: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5107,7 +5107,7 @@ L_1038630:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038638: 0x1038638: lw    s1, 28(sp)
+// 0x01038648: 0x1038648: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5116,7 +5116,7 @@ L_1038630:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103863c: 0x103863c: lw    s0, 24(sp)
+// 0x0103864c: 0x103864c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5125,7 +5125,7 @@ L_1038630:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01038640: 0x1038640: jr    ra addiu sp, sp, 40
+// 0x01038650: 0x1038650: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5137,7 +5137,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 utf8_get_next_char_1038648(int32,int32,int32,int32,int32)
+.method public static int32 utf8_get_next_char_1038658(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 t0,int32 ra)
@@ -5178,12 +5178,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038648: 0x1038648: addiu sp, sp, -32
+// 0x01038658: 0x1038658: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103864c: 0x103864c: sw    s0, 24(sp)
+// 0x0103865c: 0x103865c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5192,7 +5192,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01038650: 0x1038650: sw    a1, 16(sp)
+// 0x01038660: 0x1038660: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5201,7 +5201,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01038654: 0x1038654: sw    a2, 20(sp)
+// 0x01038664: 0x1038664: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5210,8 +5210,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01038658: 0x1038658: sw    ra, 28(sp)
-// 0x0103865c: 0x103865c: jal   0x1001b48 addu  s0, a0, zero
+// 0x01038668: 0x1038668: sw    ra, 28(sp)
+// 0x0103866c: 0x103866c: jal   0x1001b48 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.1
@@ -5220,7 +5220,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01038664: 0x1038664: lw    a1, 16(sp)
+// 0x01038674: 0x1038674: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5229,7 +5229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01038668: 0x1038668: lw    a2, 20(sp)
+// 0x01038678: 0x1038678: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5238,145 +5238,145 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103866c: 0x103866c: beq   v0, zero, 0x10386fc sll   zero, zero, 0
+// 0x0103867c: 0x103867c: beq   v0, zero, 0x103870c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10386fc
+	brfalse L_103870c
 // --- basic block ---
-// 0x01038674: 0x1038674: lb    a0, 0(s0)
+// 0x01038684: 0x1038684: lb    a0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01038678: 0x1038678: sll   zero, zero, 0
-// 0x0103867c: 0x103867c: bgez  a0, 0x10386b4 andi  a0, a0, 255
+// 0x01038688: 0x1038688: sll   zero, zero, 0
+// 0x0103868c: 0x103868c: bgez  a0, 0x10386c4 andi  a0, a0, 255
 	ldloc.1
 	ldloc.1
 	ldc.i4 255
 	and
 	stloc.1
 	ldc.i4.s 0
-	bge L_10386b4
+	bge L_10386c4
 // --- basic block ---
-// 0x01038684: 0x1038684: andi  t0, a0, 224
+// 0x01038694: 0x1038694: andi  t0, a0, 224
 	ldloc.1
 	ldc.i4 224
 	and
 	stloc 9
-// 0x01038688: 0x1038688: addiu a3, zero, 192
+// 0x01038698: 0x1038698: addiu a3, zero, 192
 	ldc.i4 192
 	stloc 4
-// 0x0103868c: 0x103868c: beq   t0, a3, 0x10386b8 addiu v1, zero, 2
+// 0x0103869c: 0x103869c: beq   t0, a3, 0x10386c8 addiu v1, zero, 2
 	ldloc 9
 	ldloc 4
 	ldc.i4.2
 	stloc 8
-	beq  L_10386b8
+	beq  L_10386c8
 // --- basic block ---
-// 0x01038694: 0x1038694: andi  t0, a0, 240
+// 0x010386a4: 0x10386a4: andi  t0, a0, 240
 	ldloc.1
 	ldc.i4 240
 	and
 	stloc 9
-// 0x01038698: 0x1038698: addiu a3, zero, 224
+// 0x010386a8: 0x10386a8: addiu a3, zero, 224
 	ldc.i4 224
 	stloc 4
-// 0x0103869c: 0x103869c: beq   t0, a3, 0x10386b8 addiu v1, zero, 3
+// 0x010386ac: 0x10386ac: beq   t0, a3, 0x10386c8 addiu v1, zero, 3
 	ldloc 9
 	ldloc 4
 	ldc.i4.3
 	stloc 8
-	beq  L_10386b8
+	beq  L_10386c8
 // --- basic block ---
-// 0x010386a4: 0x10386a4: andi  a0, a0, 248
+// 0x010386b4: 0x10386b4: andi  a0, a0, 248
 	ldloc.1
 	ldc.i4 248
 	and
 	stloc.1
-// 0x010386a8: 0x10386a8: addiu a3, zero, 240
+// 0x010386b8: 0x10386b8: addiu a3, zero, 240
 	ldc.i4 240
 	stloc 4
-// 0x010386ac: 0x10386ac: beq   a0, a3, 0x10386b8 addiu v1, zero, 4
+// 0x010386bc: 0x10386bc: beq   a0, a3, 0x10386c8 addiu v1, zero, 4
 	ldloc.1
 	ldloc 4
 	ldc.i4.4
 	stloc 8
-	beq  L_10386b8
+	beq  L_10386c8
 // --- basic block ---
-L_10386b4:
-// 0x010386b4: 0x10386b4: addiu v1, zero, 1
+L_10386c4:
+// 0x010386c4: 0x10386c4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-L_10386b8:
-// 0x010386b8: 0x10386b8: slt   a0, v0, v1
+L_10386c8:
+// 0x010386c8: 0x10386c8: slt   a0, v0, v1
 	ldloc 6
 	ldloc 8
 	clt
 	stloc.1
-// 0x010386bc: 0x10386bc: beq   a0, zero, 0x10386c8 sll   zero, zero, 0
+// 0x010386cc: 0x10386cc: beq   a0, zero, 0x10386d8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10386c8
+	brfalse L_10386d8
 // --- basic block ---
-// 0x010386c4: 0x10386c4: addu  v1, v0, zero
+// 0x010386d4: 0x10386d4: addu  v1, v0, zero
 	ldloc 6
 	stloc 8
-L_10386c8:
-// 0x010386c8: 0x10386c8: bne   a1, zero, 0x10386e8 addu  v0, zero, zero
+L_10386d8:
+// 0x010386d8: 0x10386d8: bne   a1, zero, 0x10386f8 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_10386e8
+	brtrue L_10386f8
 // --- basic block ---
-// 0x010386d0: 0x10386d0: j	 0x10386fc addu  s0, s0, v1
+// 0x010386e0: 0x10386e0: j	 0x103870c addu  s0, s0, v1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 7
-	br L_10386fc
+	br L_103870c
 // --- basic block ---
-L_10386d8:
-// 0x010386d8: 0x10386d8: lbu   a0, 0(s0)
+L_10386e8:
+// 0x010386e8: 0x10386e8: lbu   a0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x010386dc: 0x10386dc: addiu s0, s0, 1
+// 0x010386ec: 0x10386ec: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010386e0: 0x10386e0: sb    a0, 0(a1)
+// 0x010386f0: 0x10386f0: sb    a0, 0(a1)
 	ldloc.2
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010386e4: 0x10386e4: addiu a1, a1, 1
+// 0x010386f4: 0x10386f4: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-L_10386e8:
-// 0x010386e8: 0x10386e8: beq   v1, v0, 0x10386f8 addiu v0, v0, 1
+L_10386f8:
+// 0x010386f8: 0x10386f8: beq   v1, v0, 0x1038708 addiu v0, v0, 1
 	ldloc 8
 	ldloc 6
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	beq  L_10386f8
+	beq  L_1038708
 // --- basic block ---
-// 0x010386f0: 0x10386f0: bne   a2, v0, 0x10386d8 sll   zero, zero, 0
+// 0x01038700: 0x1038700: bne   a2, v0, 0x10386e8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 6
-	bne.un L_10386d8
+	bne.un L_10386e8
 // --- basic block ---
-L_10386f8:
-// 0x010386f8: 0x10386f8: sb    zero, 0(a1)
+L_1038708:
+// 0x01038708: 0x1038708: sb    zero, 0(a1)
 	ldloc.2
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10386fc:
-// 0x010386fc: 0x10386fc: lw    ra, 28(sp)
-// 0x01038700: 0x1038700: addu  v0, s0, zero
+L_103870c:
+// 0x0103870c: 0x103870c: lw    ra, 28(sp)
+// 0x01038710: 0x1038710: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01038704: 0x1038704: lw    s0, 24(sp)
+// 0x01038714: 0x1038714: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5385,7 +5385,7 @@ L_10386fc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01038708: 0x1038708: jr    ra addiu sp, sp, 32
+// 0x01038718: 0x1038718: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5397,7 +5397,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 utf8_remove_last_char_1038848(int32,int32,int32,int32,int32)
+.method public static int32 utf8_remove_last_char_1038858(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5435,12 +5435,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038848: 0x1038848: addiu sp, sp, -24
+// 0x01038858: 0x1038858: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103884c: 0x103884c: sw    s0, 16(sp)
+// 0x0103885c: 0x103885c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5449,78 +5449,78 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01038850: 0x1038850: sw    ra, 20(sp)
-// 0x01038854: 0x1038854: beq   a0, zero, 0x10388a4 addu  s0, a0, zero
+// 0x01038860: 0x1038860: sw    ra, 20(sp)
+// 0x01038864: 0x1038864: beq   a0, zero, 0x10388b4 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_10388a4
+	brfalse L_10388b4
 // --- basic block ---
-// 0x0103885c: 0x103885c: lb    v0, 0(a0)
+// 0x0103886c: 0x103886c: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01038860: 0x1038860: sll   zero, zero, 0
-// 0x01038864: 0x1038864: beq   v0, zero, 0x10388a4 sll   zero, zero, 0
+// 0x01038870: 0x1038870: sll   zero, zero, 0
+// 0x01038874: 0x1038874: beq   v0, zero, 0x10388b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10388a4
+	brfalse L_10388b4
 // --- basic block ---
-// 0x0103886c: 0x103886c: jal   0x1001b48 sll   zero, zero, 0
+// 0x0103887c: 0x103887c: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01038874: 0x1038874: addiu v0, v0, -1
+// 0x01038884: 0x1038884: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01038878: 0x1038878: addu  v0, s0, v0
+// 0x01038888: 0x1038888: addu  v0, s0, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-L_103887c:
-// 0x0103887c: 0x103887c: lb    v1, 0(v0)
+L_103888c:
+// 0x0103888c: 0x103888c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x01038880: 0x1038880: sb    zero, 0(v0)
+// 0x01038890: 0x1038890: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01038884: 0x1038884: andi  a1, v1, 64
+// 0x01038894: 0x1038894: andi  a1, v1, 64
 	ldloc 8
 	ldc.i4.s 64
 	and
 	stloc.2
-// 0x01038888: 0x1038888: addiu v0, v0, -1
+// 0x01038898: 0x1038898: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0103888c: 0x103888c: bne   a1, zero, 0x10388a4 sltu  a0, v0, s0
+// 0x0103889c: 0x103889c: bne   a1, zero, 0x10388b4 sltu  a0, v0, s0
 	ldloc.2
 	ldloc 5
 	ldloc 7
 	clt.un
 	stloc.1
-	brtrue L_10388a4
+	brtrue L_10388b4
 // --- basic block ---
-// 0x01038894: 0x1038894: bgez  v1, 0x10388a4 sll   zero, zero, 0
+// 0x010388a4: 0x10388a4: bgez  v1, 0x10388b4 sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	bge L_10388a4
+	bge L_10388b4
 // --- basic block ---
-// 0x0103889c: 0x103889c: beq   a0, zero, 0x103887c sll   zero, zero, 0
+// 0x010388ac: 0x10388ac: beq   a0, zero, 0x103888c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_103887c
+	brfalse L_103888c
 // --- basic block ---
-L_10388a4:
-// 0x010388a4: 0x10388a4: lw    ra, 20(sp)
-// 0x010388a8: 0x10388a8: lw    s0, 16(sp)
+L_10388b4:
+// 0x010388b4: 0x10388b4: lw    ra, 20(sp)
+// 0x010388b8: 0x10388b8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5529,7 +5529,7 @@ L_10388a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010388ac: 0x10388ac: jr    ra addiu sp, sp, 24
+// 0x010388bc: 0x10388bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5541,7 +5541,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_keyboard_handler__key_pressed_10388b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_keyboard_handler__key_pressed_10388c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra,int32 v1)
@@ -5591,12 +5591,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010388b4: 0x10388b4: addiu sp, sp, -40
+// 0x010388c4: 0x10388c4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010388b8: 0x10388b8: sw    s1, 20(sp)
+// 0x010388c8: 0x10388c8: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5605,10 +5605,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010388bc: 0x10388bc: lui   s1, 0x60000
+// 0x010388cc: 0x10388cc: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010388c0: 0x10388c0: sw    s4, 32(sp)
+// 0x010388d0: 0x10388d0: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5617,7 +5617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010388c4: 0x10388c4: sw    s3, 28(sp)
+// 0x010388d4: 0x10388d4: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5626,7 +5626,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010388c8: 0x10388c8: sw    s2, 24(sp)
+// 0x010388d8: 0x10388d8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5635,7 +5635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010388cc: 0x10388cc: sw    s0, 16(sp)
+// 0x010388dc: 0x10388dc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5644,36 +5644,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010388d0: 0x10388d0: sw    ra, 36(sp)
-// 0x010388d4: 0x10388d4: addu  s4, a0, zero
+// 0x010388e0: 0x10388e0: sw    ra, 36(sp)
+// 0x010388e4: 0x10388e4: addu  s4, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010388d8: 0x10388d8: addu  s3, a1, zero
+// 0x010388e8: 0x10388e8: addu  s3, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010388dc: 0x10388dc: addiu s1, s1, -15132
+// 0x010388ec: 0x10388ec: addiu s1, s1, -14668
 	ldloc 7
-	ldc.i4 -15132
+	ldc.i4 -14668
 	add
 	stloc 7
-// 0x010388e0: 0x10388e0: addu  s0, zero, zero
+// 0x010388f0: 0x10388f0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010388e4: 0x10388e4: j	 0x103890c lui   s2, 0x60000
+// 0x010388f4: 0x10388f4: j	 0x103891c lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 9
-	br L_103890c
+	br L_103891c
 // --- basic block ---
-L_10388ec:
-// 0x010388ec: 0x10388ec: lw    v0, 0(s1)
+L_10388fc:
+// 0x010388fc: 0x10388fc: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010388f0: 0x10388f0: sll   zero, zero, 0
-// 0x010388f4: 0x10388f4: jalr  v0 addiu s1, s1, 4
+// 0x01038900: 0x1038900: sll   zero, zero, 0
+// 0x01038904: 0x1038904: jalr  v0 addiu s1, s1, 4
 	ldloc 6
 	ldloc 7
 	ldc.i4.4
@@ -5689,46 +5689,46 @@ L_10388ec:
 	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x010388fc: 0x10388fc: beq   v0, zero, 0x103890c addiu s0, s0, 1
+// 0x0103890c: 0x103890c: beq   v0, zero, 0x103891c addiu s0, s0, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_103890c
+	brfalse L_103891c
 // --- basic block ---
-// 0x01038904: 0x1038904: j	 0x1038920 addiu v0, zero, 1
+// 0x01038914: 0x1038914: j	 0x1038930 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_1038920
+	br L_1038930
 // --- basic block ---
-L_103890c:
-// 0x0103890c: 0x103890c: lw    v0, -15136(s2)
+L_103891c:
+// 0x0103891c: 0x103891c: lw    v0, -14672(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3784
+	ldc.i4 -3668
 	add
 	ldelem.i4
 	stloc 6
-// 0x01038910: 0x1038910: addu  a0, s4, zero
+// 0x01038920: 0x1038920: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x01038914: 0x1038914: slt   v0, s0, v0
+// 0x01038924: 0x1038924: slt   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x01038918: 0x1038918: bne   v0, zero, 0x10388ec addu  a1, s3, zero
+// 0x01038928: 0x1038928: bne   v0, zero, 0x10388fc addu  a1, s3, zero
 	ldloc 6
 	ldloc 10
 	stloc.2
-	brtrue L_10388ec
+	brtrue L_10388fc
 // --- basic block ---
-L_1038920:
-// 0x01038920: 0x1038920: lw    ra, 36(sp)
-// 0x01038924: 0x1038924: lw    s4, 32(sp)
+L_1038930:
+// 0x01038930: 0x1038930: lw    ra, 36(sp)
+// 0x01038934: 0x1038934: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5737,7 +5737,7 @@ L_1038920:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01038928: 0x1038928: lw    s3, 28(sp)
+// 0x01038938: 0x1038938: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5746,7 +5746,7 @@ L_1038920:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103892c: 0x103892c: lw    s2, 24(sp)
+// 0x0103893c: 0x103893c: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5755,7 +5755,7 @@ L_1038920:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01038930: 0x1038930: lw    s1, 20(sp)
+// 0x01038940: 0x1038940: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5764,7 +5764,7 @@ L_1038920:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01038934: 0x1038934: lw    s0, 16(sp)
+// 0x01038944: 0x1038944: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5773,7 +5773,7 @@ L_1038920:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038938: 0x1038938: jr    ra addiu sp, sp, 40
+// 0x01038948: 0x1038948: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5785,7 +5785,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_keyboard_register_to_event__general_1038940(int32,int32,int32,int32)
+.method public static int32 roadmap_keyboard_register_to_event__general_1038950(int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 t0,int32[] mem,int32 ra)
@@ -5820,115 +5820,115 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038940: 0x1038940: beq   a0, zero, 0x10389b8 sll   zero, zero, 0
+// 0x01038950: 0x1038950: beq   a0, zero, 0x10389c8 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_10389b8
-// 0x01038948: 0x1038948: beq   a1, zero, 0x10389b8 sll   zero, zero, 0
+	brfalse L_10389c8
+// 0x01038958: 0x1038958: beq   a1, zero, 0x10389c8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10389b8
+	brfalse L_10389c8
 // --- basic block ---
-// 0x01038950: 0x1038950: beq   a2, zero, 0x10389b8 sll   zero, zero, 0
+// 0x01038960: 0x1038960: beq   a2, zero, 0x10389c8 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10389b8
+	brfalse L_10389c8
 // --- basic block ---
-// 0x01038958: 0x1038958: lw    v0, 0(a1)
+// 0x01038968: 0x1038968: lw    v0, 0(a1)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0103895c: 0x103895c: sll   zero, zero, 0
-// 0x01038960: 0x1038960: beq   v0, zero, 0x103899c addu  v1, zero, zero
+// 0x0103896c: 0x103896c: sll   zero, zero, 0
+// 0x01038970: 0x1038970: beq   v0, zero, 0x10389ac addu  v1, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_103899c
+	brfalse L_10389ac
 // --- basic block ---
-// 0x01038968: 0x1038968: j	 0x1038984 addu  a3, a0, zero
+// 0x01038978: 0x1038978: j	 0x1038994 addu  a3, a0, zero
 	ldloc.0
 	stloc.3
-	br L_1038984
+	br L_1038994
 // --- basic block ---
-L_1038970:
-// 0x01038970: 0x1038970: lw    t0, 0(a3)
+L_1038980:
+// 0x01038980: 0x1038980: lw    t0, 0(a3)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01038974: 0x1038974: sll   zero, zero, 0
-// 0x01038978: 0x1038978: beq   t0, a2, 0x10389b8 addiu a3, a3, 4
+// 0x01038984: 0x1038984: sll   zero, zero, 0
+// 0x01038988: 0x1038988: beq   t0, a2, 0x10389c8 addiu a3, a3, 4
 	ldloc 6
 	ldloc.2
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-	beq  L_10389b8
+	beq  L_10389c8
 // --- basic block ---
-// 0x01038980: 0x1038980: addiu v1, v1, 1
+// 0x01038990: 0x1038990: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_1038984:
-// 0x01038984: 0x1038984: slt   t0, v1, v0
+L_1038994:
+// 0x01038994: 0x1038994: slt   t0, v1, v0
 	ldloc 5
 	ldloc 4
 	clt
 	stloc 6
-// 0x01038988: 0x1038988: bne   t0, zero, 0x1038970 sll   zero, zero, 0
+// 0x01038998: 0x1038998: bne   t0, zero, 0x1038980 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1038970
+	brtrue L_1038980
 // --- basic block ---
-// 0x01038990: 0x1038990: slti  v1, v0, 20
+// 0x010389a0: 0x10389a0: slti  v1, v0, 20
 	ldloc 4
 	ldc.i4.s 20
 	clt
 	stloc 5
-// 0x01038994: 0x1038994: beq   v1, zero, 0x10389b8 sll   zero, zero, 0
+// 0x010389a4: 0x10389a4: beq   v1, zero, 0x10389c8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10389b8
+	brfalse L_10389c8
 // --- basic block ---
-L_103899c:
-// 0x0103899c: 0x103899c: sll   v1, v0, 2
+L_10389ac:
+// 0x010389ac: 0x10389ac: sll   v1, v0, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010389a0: 0x10389a0: addu  a0, a0, v1
+// 0x010389b0: 0x10389b0: addu  a0, a0, v1
 	ldloc.0
 	ldloc 5
 	add
 	stloc.0
-// 0x010389a4: 0x10389a4: addiu v0, v0, 1
+// 0x010389b4: 0x10389b4: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010389a8: 0x10389a8: sw    v0, 0(a1)
+// 0x010389b8: 0x10389b8: sw    v0, 0(a1)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-// 0x010389ac: 0x10389ac: sw    a2, 0(a0)
+// 0x010389bc: 0x10389bc: sw    a2, 0(a0)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010389b0: 0x10389b0: jr    ra addiu v0, zero, 1
+// 0x010389c0: 0x10389c0: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_10389b8:
-// 0x010389b8: 0x10389b8: jr    ra addu  v0, zero, zero
+L_10389c8:
+// 0x010389c8: 0x10389c8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
@@ -5938,7 +5938,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_keyboard_unregister_from_event__general_10389c0(int32,int32,int32,int32)
+.method public static int32 roadmap_keyboard_unregister_from_event__general_10389d0(int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 t0,int32 t1,int32 ra)
@@ -5976,88 +5976,88 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010389c0: 0x10389c0: beq   a0, zero, 0x1038a68 addu  v0, zero, zero
+// 0x010389d0: 0x10389d0: beq   a0, zero, 0x1038a78 addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_1038a68
-// 0x010389c8: 0x10389c8: beq   a1, zero, 0x1038a68 sll   zero, zero, 0
+	brfalse L_1038a78
+// 0x010389d8: 0x10389d8: beq   a1, zero, 0x1038a78 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1038a68
+	brfalse L_1038a78
 // --- basic block ---
-// 0x010389d0: 0x10389d0: lw    t0, 0(a1)
+// 0x010389e0: 0x10389e0: lw    t0, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010389d4: 0x10389d4: sll   zero, zero, 0
-// 0x010389d8: 0x10389d8: beq   t0, zero, 0x1038a68 sll   zero, zero, 0
+// 0x010389e4: 0x10389e4: sll   zero, zero, 0
+// 0x010389e8: 0x10389e8: beq   t0, zero, 0x1038a78 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1038a68
+	brfalse L_1038a78
 // --- basic block ---
-// 0x010389e0: 0x10389e0: beq   a2, zero, 0x1038a68 addiu t0, t0, -1
+// 0x010389f0: 0x10389f0: beq   a2, zero, 0x1038a78 addiu t0, t0, -1
 	ldloc.2
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-	brfalse L_1038a68
+	brfalse L_1038a78
 // --- basic block ---
-// 0x010389e8: 0x10389e8: sll   v0, t0, 2
+// 0x010389f8: 0x10389f8: sll   v0, t0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x010389ec: 0x10389ec: addu  v0, a0, v0
+// 0x010389fc: 0x10389fc: addu  v0, a0, v0
 	ldloc.0
 	ldloc 4
 	add
 	stloc 4
-// 0x010389f0: 0x10389f0: lw    v0, 0(v0)
+// 0x01038a00: 0x1038a00: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010389f4: 0x10389f4: sll   zero, zero, 0
-// 0x010389f8: 0x10389f8: beq   v0, a2, 0x1038a4c addu  v1, a0, zero
+// 0x01038a04: 0x1038a04: sll   zero, zero, 0
+// 0x01038a08: 0x1038a08: beq   v0, a2, 0x1038a5c addu  v1, a0, zero
 	ldloc 4
 	ldloc.2
 	ldloc.0
 	stloc 5
-	beq  L_1038a4c
+	beq  L_1038a5c
 // --- basic block ---
-// 0x01038a00: 0x1038a00: addu  a3, zero, zero
+// 0x01038a10: 0x1038a10: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01038a04: 0x1038a04: j	 0x1038a38 addu  v0, zero, zero
+// 0x01038a14: 0x1038a14: j	 0x1038a48 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_1038a38
+	br L_1038a48
 // --- basic block ---
-L_1038a0c:
-// 0x01038a0c: 0x1038a0c: bne   v0, zero, 0x1038a24 sll   zero, zero, 0
+L_1038a1c:
+// 0x01038a1c: 0x1038a1c: bne   v0, zero, 0x1038a34 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_1038a24
+	brtrue L_1038a34
 // --- basic block ---
-// 0x01038a14: 0x1038a14: lw    t1, 0(v1)
+// 0x01038a24: 0x1038a24: lw    t1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01038a18: 0x1038a18: sll   zero, zero, 0
-// 0x01038a1c: 0x1038a1c: bne   t1, a2, 0x1038a30 sll   zero, zero, 0
+// 0x01038a28: 0x1038a28: sll   zero, zero, 0
+// 0x01038a2c: 0x1038a2c: bne   t1, a2, 0x1038a40 sll   zero, zero, 0
 	ldloc 8
 	ldloc.2
-	bne.un L_1038a30
+	bne.un L_1038a40
 // --- basic block ---
-L_1038a24:
-// 0x01038a24: 0x1038a24: lw    t1, 4(v1)
+L_1038a34:
+// 0x01038a34: 0x1038a34: lw    t1, 4(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6066,83 +6066,83 @@ L_1038a24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038a28: 0x1038a28: addiu v0, zero, 1
+// 0x01038a38: 0x1038a38: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01038a2c: 0x1038a2c: sw    t1, 0(v1)
+// 0x01038a3c: 0x1038a3c: sw    t1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_1038a30:
-// 0x01038a30: 0x1038a30: addiu a3, a3, 1
+L_1038a40:
+// 0x01038a40: 0x1038a40: addiu a3, a3, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01038a34: 0x1038a34: addiu v1, v1, 4
+// 0x01038a44: 0x1038a44: addiu v1, v1, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-L_1038a38:
-// 0x01038a38: 0x1038a38: slt   t1, a3, t0
+L_1038a48:
+// 0x01038a48: 0x1038a48: slt   t1, a3, t0
 	ldloc.3
 	ldloc 7
 	clt
 	stloc 8
-// 0x01038a3c: 0x1038a3c: bne   t1, zero, 0x1038a0c sll   zero, zero, 0
+// 0x01038a4c: 0x1038a4c: bne   t1, zero, 0x1038a1c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1038a0c
+	brtrue L_1038a1c
 // --- basic block ---
-// 0x01038a44: 0x1038a44: beq   v0, zero, 0x1038a68 sll   zero, zero, 0
+// 0x01038a54: 0x1038a54: beq   v0, zero, 0x1038a78 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1038a68
+	brfalse L_1038a78
 // --- basic block ---
-L_1038a4c:
-// 0x01038a4c: 0x1038a4c: lw    v1, 0(a1)
+L_1038a5c:
+// 0x01038a5c: 0x1038a5c: lw    v1, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01038a50: 0x1038a50: addiu v0, zero, 1
+// 0x01038a60: 0x1038a60: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01038a54: 0x1038a54: addiu v1, v1, -1
+// 0x01038a64: 0x1038a64: addiu v1, v1, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01038a58: 0x1038a58: sll   a2, v1, 2
+// 0x01038a68: 0x1038a68: sll   a2, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01038a5c: 0x1038a5c: addu  a0, a0, a2
+// 0x01038a6c: 0x1038a6c: addu  a0, a0, a2
 	ldloc.0
 	ldloc.2
 	add
 	stloc.0
-// 0x01038a60: 0x1038a60: sw    v1, 0(a1)
+// 0x01038a70: 0x1038a70: sw    v1, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01038a64: 0x1038a64: sw    zero, 0(a0)
+// 0x01038a74: 0x1038a74: sw    zero, 0(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1038a68:
-// 0x01038a68: 0x1038a68: jr    ra sll   zero, zero, 0
+L_1038a78:
+// 0x01038a78: 0x1038a78: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -6150,7 +6150,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_keyboard_register_to_event__key_pressed_1038a70(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_keyboard_register_to_event__key_pressed_1038a80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6185,43 +6185,43 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038a70: 0x1038a70: addu  a2, a0, zero
+// 0x01038a80: 0x1038a80: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x01038a74: 0x1038a74: lui   a1, 0x60000
+// 0x01038a84: 0x1038a84: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01038a78: 0x1038a78: lui   a0, 0x60000
+// 0x01038a88: 0x1038a88: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01038a7c: 0x1038a7c: addiu sp, sp, -24
+// 0x01038a8c: 0x1038a8c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01038a80: 0x1038a80: addiu a0, a0, -15132
+// 0x01038a90: 0x1038a90: addiu a0, a0, -14668
 	ldloc.1
-	ldc.i4 -15132
+	ldc.i4 -14668
 	add
 	stloc.1
-// 0x01038a84: 0x1038a84: sw    ra, 20(sp)
-// 0x01038a88: 0x1038a88: jal   0x1038940 addiu a1, a1, -15136
+// 0x01038a94: 0x1038a94: sw    ra, 20(sp)
+// 0x01038a98: 0x1038a98: jal   0x1038950 addiu a1, a1, -14672
 	ldloc.2
-	ldc.i4 -15136
+	ldc.i4 -14672
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_register_to_event__general_1038940(int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_register_to_event__general_1038950(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01038a90: 0x1038a90: lw    ra, 20(sp)
-// 0x01038a94: 0x1038a94: sll   zero, zero, 0
-// 0x01038a98: 0x1038a98: jr    ra addiu sp, sp, 24
+// 0x01038aa0: 0x1038aa0: lw    ra, 20(sp)
+// 0x01038aa4: 0x1038aa4: sll   zero, zero, 0
+// 0x01038aa8: 0x1038aa8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6233,7 +6233,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_keyboard_unregister_from_event__key_pressed_1038aa0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_keyboard_unregister_from_event__key_pressed_1038ab0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6268,43 +6268,43 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038aa0: 0x1038aa0: addu  a2, a0, zero
+// 0x01038ab0: 0x1038ab0: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x01038aa4: 0x1038aa4: lui   a1, 0x60000
+// 0x01038ab4: 0x1038ab4: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01038aa8: 0x1038aa8: lui   a0, 0x60000
+// 0x01038ab8: 0x1038ab8: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01038aac: 0x1038aac: addiu sp, sp, -24
+// 0x01038abc: 0x1038abc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01038ab0: 0x1038ab0: addiu a0, a0, -15132
+// 0x01038ac0: 0x1038ac0: addiu a0, a0, -14668
 	ldloc.1
-	ldc.i4 -15132
+	ldc.i4 -14668
 	add
 	stloc.1
-// 0x01038ab4: 0x1038ab4: sw    ra, 20(sp)
-// 0x01038ab8: 0x1038ab8: jal   0x10389c0 addiu a1, a1, -15136
+// 0x01038ac4: 0x1038ac4: sw    ra, 20(sp)
+// 0x01038ac8: 0x1038ac8: jal   0x10389d0 addiu a1, a1, -14672
 	ldloc.2
-	ldc.i4 -15136
+	ldc.i4 -14672
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_unregister_from_event__general_10389c0(int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_unregister_from_event__general_10389d0(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01038ac0: 0x1038ac0: lw    ra, 20(sp)
-// 0x01038ac4: 0x1038ac4: sll   zero, zero, 0
-// 0x01038ac8: 0x1038ac8: jr    ra addiu sp, sp, 24
+// 0x01038ad0: 0x1038ad0: lw    ra, 20(sp)
+// 0x01038ad4: 0x1038ad4: sll   zero, zero, 0
+// 0x01038ad8: 0x1038ad8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6316,7 +6316,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_disabling_driving_lock_1038b08(int32)
+.method public static int32 on_disabling_driving_lock_1038b18(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -6336,33 +6336,33 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038b08: 0x1038b08: addiu v0, zero, 4
+// 0x01038b18: 0x1038b18: addiu v0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01038b0c: 0x1038b0c: bne   a0, v0, 0x1038b18 lui   v0, 0x60000
+// 0x01038b1c: 0x1038b1c: bne   a0, v0, 0x1038b28 lui   v0, 0x60000
 	ldloc.0
 	ldloc.1
 	ldc.i4 393216
 	stloc.1
-	bne.un L_1038b18
+	bne.un L_1038b28
 // --- basic block ---
-// 0x01038b14: 0x1038b14: sw    zero, -15144(v0)
+// 0x01038b24: 0x1038b24: sw    zero, -14680(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3786
+	ldc.i4 -3670
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1038b18:
-// 0x01038b18: 0x1038b18: jr    ra sll   zero, zero, 0
+L_1038b28:
+// 0x01038b28: 0x1038b28: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_keyboard_set_typing_lock_enable_1038b20(int32)
+.method public static int32 roadmap_keyboard_set_typing_lock_enable_1038b30(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -6382,15 +6382,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038b20: 0x1038b20: lui   v0, 0x60000
+// 0x01038b30: 0x1038b30: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01038b24: 0x1038b24: jr    ra sw    a0, -15144(v0)
+// 0x01038b34: 0x1038b34: jr    ra sw    a0, -14680(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3786
+	ldc.i4 -3670
 	add
 	ldloc.0
 	stelem.i4
@@ -6399,7 +6399,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_keyboard_typing_locked_1038b3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_keyboard_typing_locked_1038b4c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -6443,24 +6443,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038b3c: 0x1038b3c: lui   v0, 0x60000
+// 0x01038b4c: 0x1038b4c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01038b40: 0x1038b40: lw    v1, -15144(v0)
+// 0x01038b50: 0x1038b50: lw    v1, -14680(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3786
+	ldc.i4 -3670
 	add
 	ldelem.i4
 	stloc 7
-// 0x01038b44: 0x1038b44: addiu sp, sp, -328
+// 0x01038b54: 0x1038b54: addiu sp, sp, -328
 	ldloc.0
 	ldc.i4 -328
 	add
 	stloc.0
-// 0x01038b48: 0x1038b48: sw    s1, 316(sp)
+// 0x01038b58: 0x1038b58: sw    s1, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6469,8 +6469,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01038b4c: 0x1038b4c: sw    ra, 324(sp)
-// 0x01038b50: 0x1038b50: sw    s2, 320(sp)
+// 0x01038b5c: 0x1038b5c: sw    ra, 324(sp)
+// 0x01038b60: 0x1038b60: sw    s2, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6479,7 +6479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01038b54: 0x1038b54: sw    s0, 312(sp)
+// 0x01038b64: 0x1038b64: sw    s0, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6488,56 +6488,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01038b58: 0x1038b58: addu  s1, a0, zero
+// 0x01038b68: 0x1038b68: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01038b5c: 0x1038b5c: beq   v1, zero, 0x1038c54 addu  v0, zero, zero
+// 0x01038b6c: 0x1038b6c: beq   v1, zero, 0x1038c64 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1038c54
+	brfalse L_1038c64
 // --- basic block ---
-// 0x01038b64: 0x1038b64: lui   s0, 0x60000
+// 0x01038b74: 0x1038b74: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01038b68: 0x1038b68: lw    v0, -15140(s0)
+// 0x01038b78: 0x1038b78: lw    v0, -14676(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3785
+	ldc.i4 -3669
 	add
 	ldelem.i4
 	stloc 5
-// 0x01038b6c: 0x1038b6c: sll   zero, zero, 0
-// 0x01038b70: 0x1038b70: bne   v0, zero, 0x1038bac lui   a0, 0x10000
+// 0x01038b7c: 0x1038b7c: sll   zero, zero, 0
+// 0x01038b80: 0x1038b80: bne   v0, zero, 0x1038bbc lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_1038bac
+	brtrue L_1038bbc
 // --- basic block ---
-// 0x01038b78: 0x1038b78: lui   s2, 0x0
+// 0x01038b88: 0x1038b88: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01038b7c: 0x1038b7c: lui   a2, 0x10000
+// 0x01038b8c: 0x1038b8c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01038b80: 0x1038b80: addiu a0, a0, 12560
+// 0x01038b90: 0x1038b90: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01038b84: 0x1038b84: addiu a2, a2, -30004
+// 0x01038b94: 0x1038b94: addiu a2, a2, -30004
 	ldloc.3
 	ldc.i4 -30004
 	add
 	stloc.3
-// 0x01038b88: 0x1038b88: addiu a1, s2, 12580
+// 0x01038b98: 0x1038b98: addiu a1, s2, 12580
 	ldloc 10
 	ldc.i4 12580
 	add
 	stloc.2
-// 0x01038b8c: 0x1038b8c: jal   0x100edb0 addu  a3, zero, zero
+// 0x01038b9c: 0x1038b9c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6545,12 +6545,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01038b94: 0x1038b94: jal   0x100e788 addiu a0, s2, 12580
+// 0x01038ba4: 0x1038ba4: jal   0x100e798 addiu a0, s2, 12580
 	ldloc 10
 	ldc.i4 12580
 	add
@@ -6560,15 +6560,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01038b9c: 0x1038b9c: lui   v1, 0x0
+// 0x01038bac: 0x1038bac: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01038ba0: 0x1038ba0: sw    v0, 12576(v1)
+// 0x01038bb0: 0x1038bb0: sw    v0, 12576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6577,28 +6577,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01038ba4: 0x1038ba4: addiu v0, zero, 1
+// 0x01038bb4: 0x1038bb4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01038ba8: 0x1038ba8: sw    v0, -15140(s0)
+// 0x01038bb8: 0x1038bb8: sw    v0, -14676(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3785
+	ldc.i4 -3669
 	add
 	ldloc 5
 	stelem.i4
-L_1038bac:
-// 0x01038bac: 0x1038bac: addiu a0, sp, 32
+L_1038bbc:
+// 0x01038bbc: 0x1038bbc: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01038bb0: 0x1038bb0: addu  a1, zero, zero
+// 0x01038bc0: 0x1038bc0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01038bb4: 0x1038bb4: jal   0x1029da8 addu  a2, zero, zero
+// 0x01038bc4: 0x1038bc4: jal   0x1029db8 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6606,15 +6606,15 @@ L_1038bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01038bbc: 0x1038bbc: lui   v0, 0x0
+// 0x01038bcc: 0x1038bcc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01038bc0: 0x1038bc0: lw    v1, 12576(v0)
+// 0x01038bd0: 0x1038bd0: lw    v1, 12576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6623,7 +6623,7 @@ L_1038bac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01038bc4: 0x1038bc4: lw    a0, 44(sp)
+// 0x01038bd4: 0x1038bd4: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6632,30 +6632,30 @@ L_1038bac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01038bc8: 0x1038bc8: sll   zero, zero, 0
-// 0x01038bcc: 0x1038bcc: slt   v1, v1, a0
+// 0x01038bd8: 0x1038bd8: sll   zero, zero, 0
+// 0x01038bdc: 0x1038bdc: slt   v1, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x01038bd0: 0x1038bd0: beq   v1, zero, 0x1038c54 addu  v0, zero, zero
+// 0x01038be0: 0x1038be0: beq   v1, zero, 0x1038c64 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1038c54
+	brfalse L_1038c64
 // --- basic block ---
-// 0x01038bd8: 0x1038bd8: beq   s1, zero, 0x1038c54 addiu v0, zero, 1
+// 0x01038be8: 0x1038be8: beq   s1, zero, 0x1038c64 addiu v0, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 5
-	brfalse L_1038c54
+	brfalse L_1038c64
 // --- basic block ---
-// 0x01038be0: 0x1038be0: lui   a0, 0x10000
+// 0x01038bf0: 0x1038bf0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01038be4: 0x1038be4: jal   0x101cd60 addiu a0, a0, -11960
+// 0x01038bf4: 0x1038bf4: jal   0x101cd70 addiu a0, a0, -11964
 	ldloc.1
-	ldc.i4 -11960
+	ldc.i4 -11964
 	add
 	stloc.1
 	ldloc.0
@@ -6663,23 +6663,23 @@ L_1038bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01038bec: 0x1038bec: addiu s1, sp, 52
+// 0x01038bfc: 0x1038bfc: addiu s1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 9
-// 0x01038bf0: 0x1038bf0: addu  a1, v0, zero
+// 0x01038c00: 0x1038c00: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01038bf4: 0x1038bf4: addiu a2, zero, 256
+// 0x01038c04: 0x1038c04: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x01038bf8: 0x1038bf8: jal   0x1001af8 addu  a0, s1, zero
+// 0x01038c08: 0x1038c08: jal   0x1001af8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6688,15 +6688,15 @@ L_1038bac:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01038c00: 0x1038c00: lui   a0, 0x10000
+// 0x01038c10: 0x1038c10: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01038c04: 0x1038c04: addiu a0, a0, -11924
+// 0x01038c14: 0x1038c14: addiu a0, a0, -11928
 	ldloc.1
-	ldc.i4 -11924
+	ldc.i4 -11928
 	add
 	stloc.1
-// 0x01038c08: 0x1038c08: jal   0x101cd60 sb    zero, 307(sp)
+// 0x01038c18: 0x1038c18: jal   0x101cd70 sb    zero, 307(sp)
 	ldloc.0
 	ldc.i4 307
 	add
@@ -6707,20 +6707,20 @@ L_1038bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01038c10: 0x1038c10: lui   a0, 0x10000
+// 0x01038c20: 0x1038c20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01038c14: 0x1038c14: addiu a0, a0, -11912
+// 0x01038c24: 0x1038c24: addiu a0, a0, -11916
 	ldloc.1
-	ldc.i4 -11912
+	ldc.i4 -11916
 	add
 	stloc.1
-// 0x01038c18: 0x1038c18: jal   0x101cd60 addu  s0, v0, zero
+// 0x01038c28: 0x1038c28: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6728,18 +6728,18 @@ L_1038bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01038c20: 0x1038c20: lui   a0, 0x10000
+// 0x01038c30: 0x1038c30: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01038c24: 0x1038c24: lui   a3, 0x1040000
+// 0x01038c34: 0x1038c34: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x01038c28: 0x1038c28: sw    v0, 24(sp)
+// 0x01038c38: 0x1038c38: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6748,26 +6748,26 @@ L_1038bac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01038c2c: 0x1038c2c: addiu a0, a0, 18500
+// 0x01038c3c: 0x1038c3c: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x01038c30: 0x1038c30: addiu v0, zero, 7
+// 0x01038c40: 0x1038c40: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x01038c34: 0x1038c34: addu  a1, s1, zero
+// 0x01038c44: 0x1038c44: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01038c38: 0x1038c38: addiu a3, a3, -29944
+// 0x01038c48: 0x1038c48: addiu a3, a3, -29928
 	ldloc 4
-	ldc.i4 -29944
+	ldc.i4 -29928
 	add
 	stloc 4
-// 0x01038c3c: 0x1038c3c: addu  a2, zero, zero
+// 0x01038c4c: 0x1038c4c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01038c40: 0x1038c40: sw    v0, 28(sp)
+// 0x01038c50: 0x1038c50: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6776,7 +6776,7 @@ L_1038bac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01038c44: 0x1038c44: sw    s0, 20(sp)
+// 0x01038c54: 0x1038c54: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6785,7 +6785,7 @@ L_1038bac:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01038c48: 0x1038c48: jal   0x104c1b8 sw    zero, 16(sp)
+// 0x01038c58: 0x1038c58: jal   0x104c1c8 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6799,17 +6799,17 @@ L_1038bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01038c50: 0x1038c50: addiu v0, zero, 1
+// 0x01038c60: 0x1038c60: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1038c54:
-// 0x01038c54: 0x1038c54: lw    ra, 324(sp)
-// 0x01038c58: 0x1038c58: lw    s2, 320(sp)
+L_1038c64:
+// 0x01038c64: 0x1038c64: lw    ra, 324(sp)
+// 0x01038c68: 0x1038c68: lw    s2, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6818,7 +6818,7 @@ L_1038c54:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01038c5c: 0x1038c5c: lw    s1, 316(sp)
+// 0x01038c6c: 0x1038c6c: lw    s1, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6827,7 +6827,7 @@ L_1038c54:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01038c60: 0x1038c60: lw    s0, 312(sp)
+// 0x01038c70: 0x1038c70: lw    s0, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6836,7 +6836,7 @@ L_1038c54:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038c64: 0x1038c64: jr    ra addiu sp, sp, 328
+// 0x01038c74: 0x1038c74: jr    ra addiu sp, sp, 328
 	ldloc.0
 	ldc.i4 328
 	add
diff --git a/converted/Cibyl42.j b/converted/Cibyl42.j
index 03edf64..f8e5921 100644
--- a/converted/Cibyl42.j
+++ b/converted/Cibyl42.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl42::.ctor
 
-.method public static int32 is_valid_nonalphabetic_char_1038d10(int32,int32)
+.method public static int32 is_valid_nonalphabetic_char_1038d20(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -67,198 +67,198 @@
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038d10: 0x1038d10: andi  a1, a1, 65535
+// 0x01038d20: 0x1038d20: andi  a1, a1, 65535
 	ldloc.1
 	ldc.i4 65535
 	and
 	stloc.1
-// 0x01038d14: 0x1038d14: sll   a0, a0, 24
+// 0x01038d24: 0x1038d24: sll   a0, a0, 24
 	ldloc.0
 	ldc.i4.s 24
 	shl
 	stloc.0
-// 0x01038d18: 0x1038d18: andi  v0, a1, 2
+// 0x01038d28: 0x1038d28: andi  v0, a1, 2
 	ldloc.1
 	ldc.i4.2
 	and
 	stloc.2
-// 0x01038d1c: 0x1038d1c: beq   v0, zero, 0x1038d38 sra   a0, a0, 24
+// 0x01038d2c: 0x1038d2c: beq   v0, zero, 0x1038d48 sra   a0, a0, 24
 	ldloc.2
 	ldloc.0
 	ldc.i4.s 24
 	shr
 	stloc.0
-	brfalse L_1038d38
+	brfalse L_1038d48
 // --- basic block ---
-// 0x01038d24: 0x1038d24: addiu v0, a0, -48
+// 0x01038d34: 0x1038d34: addiu v0, a0, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.2
-// 0x01038d28: 0x1038d28: andi  v0, v0, 255
+// 0x01038d38: 0x1038d38: andi  v0, v0, 255
 	ldloc.2
 	ldc.i4 255
 	and
 	stloc.2
-// 0x01038d2c: 0x1038d2c: sltiu v0, v0, 10
+// 0x01038d3c: 0x1038d3c: sltiu v0, v0, 10
 	ldloc.2
 	ldc.i4.s 10
 	clt.un
 	stloc.2
-// 0x01038d30: 0x1038d30: bne   v0, zero, 0x1038dc8 addiu v0, zero, 1
+// 0x01038d40: 0x1038d40: bne   v0, zero, 0x1038dd8 addiu v0, zero, 1
 	ldloc.2
 	ldc.i4.1
 	stloc.2
-	brtrue L_1038dc8
+	brtrue L_1038dd8
 // --- basic block ---
-L_1038d38:
-// 0x01038d38: 0x1038d38: andi  v0, a1, 4
+L_1038d48:
+// 0x01038d48: 0x1038d48: andi  v0, a1, 4
 	ldloc.1
 	ldc.i4.4
 	and
 	stloc.2
-// 0x01038d3c: 0x1038d3c: beq   v0, zero, 0x1038d78 andi  v0, a1, 8
+// 0x01038d4c: 0x1038d4c: beq   v0, zero, 0x1038d88 andi  v0, a1, 8
 	ldloc.2
 	ldloc.1
 	ldc.i4.8
 	and
 	stloc.2
-	brfalse L_1038d78
+	brfalse L_1038d88
 // --- basic block ---
-// 0x01038d44: 0x1038d44: addiu v0, a0, -9
+// 0x01038d54: 0x1038d54: addiu v0, a0, -9
 	ldloc.0
 	ldc.i4.s -9
 	add
 	stloc.2
-// 0x01038d48: 0x1038d48: andi  v0, v0, 255
+// 0x01038d58: 0x1038d58: andi  v0, v0, 255
 	ldloc.2
 	ldc.i4 255
 	and
 	stloc.2
-// 0x01038d4c: 0x1038d4c: sltiu v1, v0, 24
+// 0x01038d5c: 0x1038d5c: sltiu v1, v0, 24
 	ldloc.2
 	ldc.i4.s 24
 	clt.un
 	stloc.3
-// 0x01038d50: 0x1038d50: beq   v1, zero, 0x1038d74 lui   v1, 0x20000
+// 0x01038d60: 0x1038d60: beq   v1, zero, 0x1038d84 lui   v1, 0x20000
 	ldloc.3
 	ldc.i4 131072
 	stloc.3
-	brfalse L_1038d74
+	brfalse L_1038d84
 // --- basic block ---
-// 0x01038d58: 0x1038d58: sll   v0, v0, 2
+// 0x01038d68: 0x1038d68: sll   v0, v0, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01038d5c: 0x1038d5c: addiu v1, v1, 27112
+// 0x01038d6c: 0x1038d6c: addiu v1, v1, 27576
 	ldloc.3
-	ldc.i4 27112
+	ldc.i4 27576
 	add
 	stloc.3
-// 0x01038d60: 0x1038d60: addu  v0, v0, v1
+// 0x01038d70: 0x1038d70: addu  v0, v0, v1
 	ldloc.2
 	ldloc.3
 	add
 	stloc.2
-// 0x01038d64: 0x1038d64: lw    v0, 0(v0)
+// 0x01038d74: 0x1038d74: lw    v0, 0(v0)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01038d68: 0x1038d68: sll   zero, zero, 0
-// 0x01038d6c: 0x1038d6c: bne   v0, zero, 0x1038dc8 addiu v0, zero, 1
+// 0x01038d78: 0x1038d78: sll   zero, zero, 0
+// 0x01038d7c: 0x1038d7c: bne   v0, zero, 0x1038dd8 addiu v0, zero, 1
 	ldloc.2
 	ldc.i4.1
 	stloc.2
-	brtrue L_1038dc8
+	brtrue L_1038dd8
 // --- basic block ---
-L_1038d74:
-// 0x01038d74: 0x1038d74: andi  v0, a1, 8
+L_1038d84:
+// 0x01038d84: 0x1038d84: andi  v0, a1, 8
 	ldloc.1
 	ldc.i4.8
 	and
 	stloc.2
-L_1038d78:
-// 0x01038d78: 0x1038d78: beq   v0, zero, 0x1038d9c andi  v1, a0, 255
+L_1038d88:
+// 0x01038d88: 0x1038d88: beq   v0, zero, 0x1038dac andi  v1, a0, 255
 	ldloc.2
 	ldloc.0
 	ldc.i4 255
 	and
 	stloc.3
-	brfalse L_1038d9c
+	brfalse L_1038dac
 // --- basic block ---
-// 0x01038d80: 0x1038d80: lui   v0, 0x20000
+// 0x01038d90: 0x1038d90: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01038d84: 0x1038d84: addiu v0, v0, 26856
+// 0x01038d94: 0x1038d94: addiu v0, v0, 27320
 	ldloc.2
-	ldc.i4 26856
+	ldc.i4 27320
 	add
 	stloc.2
-// 0x01038d88: 0x1038d88: addu  v0, v1, v0
+// 0x01038d98: 0x1038d98: addu  v0, v1, v0
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x01038d8c: 0x1038d8c: lbu   v0, 0(v0)
+// 0x01038d9c: 0x1038d9c: lbu   v0, 0(v0)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x01038d90: 0x1038d90: sll   zero, zero, 0
-// 0x01038d94: 0x1038d94: bne   v0, zero, 0x1038dc4 sll   zero, zero, 0
+// 0x01038da0: 0x1038da0: sll   zero, zero, 0
+// 0x01038da4: 0x1038da4: bne   v0, zero, 0x1038dd4 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1038dc4
+	brtrue L_1038dd4
 // --- basic block ---
-L_1038d9c:
-// 0x01038d9c: 0x1038d9c: andi  a1, a1, 16
+L_1038dac:
+// 0x01038dac: 0x1038dac: andi  a1, a1, 16
 	ldloc.1
 	ldc.i4.s 16
 	and
 	stloc.1
-// 0x01038da0: 0x1038da0: beq   a1, zero, 0x1038dc8 addu  v0, zero, zero
+// 0x01038db0: 0x1038db0: beq   a1, zero, 0x1038dd8 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1038dc8
+	brfalse L_1038dd8
 // --- basic block ---
-// 0x01038da8: 0x1038da8: lui   v0, 0x20000
+// 0x01038db8: 0x1038db8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01038dac: 0x1038dac: addiu v0, v0, 26344
+// 0x01038dbc: 0x1038dbc: addiu v0, v0, 26808
 	ldloc.2
-	ldc.i4 26344
+	ldc.i4 26808
 	add
 	stloc.2
-// 0x01038db0: 0x1038db0: andi  a0, a0, 255
+// 0x01038dc0: 0x1038dc0: andi  a0, a0, 255
 	ldloc.0
 	ldc.i4 255
 	and
 	stloc.0
-// 0x01038db4: 0x1038db4: addu  a0, a0, v0
+// 0x01038dc4: 0x1038dc4: addu  a0, a0, v0
 	ldloc.0
 	ldloc.2
 	add
 	stloc.0
-// 0x01038db8: 0x1038db8: lbu   v0, 0(a0)
+// 0x01038dc8: 0x1038dc8: lbu   v0, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x01038dbc: 0x1038dbc: jr    ra sltu  v0, zero, v0
+// 0x01038dcc: 0x1038dcc: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
 	br __CIBYL_function_return
 // --- basic block ---
-L_1038dc4:
-// 0x01038dc4: 0x1038dc4: addiu v0, zero, 1
+L_1038dd4:
+// 0x01038dd4: 0x1038dd4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.2
-L_1038dc8:
-// 0x01038dc8: 0x1038dc8: jr    ra sll   zero, zero, 0
+L_1038dd8:
+// 0x01038dd8: 0x1038dd8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -266,7 +266,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 is_valid_key_1038dd0(int32,int32,int32,int32,int32)
+.method public static int32 is_valid_key_1038de0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -301,136 +301,136 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038dd0: 0x1038dd0: addiu sp, sp, -24
+// 0x01038de0: 0x1038de0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01038dd4: 0x1038dd4: sw    ra, 20(sp)
-// 0x01038dd8: 0x1038dd8: addu  v0, a0, zero
+// 0x01038de4: 0x1038de4: sw    ra, 20(sp)
+// 0x01038de8: 0x1038de8: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01038ddc: 0x1038ddc: beq   a0, zero, 0x1038e54 andi  a1, a1, 65535
+// 0x01038dec: 0x1038dec: beq   a0, zero, 0x1038e64 andi  a1, a1, 65535
 	ldloc.1
 	ldloc.2
 	ldc.i4 65535
 	and
 	stloc.2
-	brfalse L_1038e54
+	brfalse L_1038e64
 // --- basic block ---
-// 0x01038de4: 0x1038de4: lb    a0, 0(a0)
+// 0x01038df4: 0x1038df4: lb    a0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01038de8: 0x1038de8: sll   zero, zero, 0
-// 0x01038dec: 0x1038dec: beq   a0, zero, 0x1038e54 addiu v1, zero, 255
+// 0x01038df8: 0x1038df8: sll   zero, zero, 0
+// 0x01038dfc: 0x1038dfc: beq   a0, zero, 0x1038e64 addiu v1, zero, 255
 	ldloc.1
 	ldc.i4 255
 	stloc 6
-	brfalse L_1038e54
+	brfalse L_1038e64
 // --- basic block ---
-// 0x01038df4: 0x1038df4: lb    v0, 1(v0)
+// 0x01038e04: 0x1038e04: lb    v0, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01038df8: 0x1038df8: beq   a1, v1, 0x1038e5c andi  v1, a1, 1
+// 0x01038e08: 0x1038e08: beq   a1, v1, 0x1038e6c andi  v1, a1, 1
 	ldloc.2
 	ldloc 6
 	ldloc.2
 	ldc.i4.1
 	and
 	stloc 6
-	beq  L_1038e5c
+	beq  L_1038e6c
 // --- basic block ---
-// 0x01038e00: 0x1038e00: beq   v1, zero, 0x1038e3c sltu  v0, zero, v0
+// 0x01038e10: 0x1038e10: beq   v1, zero, 0x1038e4c sltu  v0, zero, v0
 	ldloc 6
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	brfalse L_1038e3c
+	brfalse L_1038e4c
 // --- basic block ---
-// 0x01038e08: 0x1038e08: bne   v0, zero, 0x1038e5c andi  v0, a0, 255
+// 0x01038e18: 0x1038e18: bne   v0, zero, 0x1038e6c andi  v0, a0, 255
 	ldloc 5
 	ldloc.1
 	ldc.i4 255
 	and
 	stloc 5
-	brtrue L_1038e5c
+	brtrue L_1038e6c
 // --- basic block ---
-// 0x01038e10: 0x1038e10: addiu v1, v0, -97
+// 0x01038e20: 0x1038e20: addiu v1, v0, -97
 	ldloc 5
 	ldc.i4.s -97
 	add
 	stloc 6
-// 0x01038e14: 0x1038e14: andi  v1, v1, 255
+// 0x01038e24: 0x1038e24: andi  v1, v1, 255
 	ldloc 6
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01038e18: 0x1038e18: sltiu v1, v1, 26
+// 0x01038e28: 0x1038e28: sltiu v1, v1, 26
 	ldloc 6
 	ldc.i4.s 26
 	clt.un
 	stloc 6
-// 0x01038e1c: 0x1038e1c: bne   v1, zero, 0x1038e5c addiu v0, v0, -65
+// 0x01038e2c: 0x1038e2c: bne   v1, zero, 0x1038e6c addiu v0, v0, -65
 	ldloc 6
 	ldloc 5
 	ldc.i4.s -65
 	add
 	stloc 5
-	brtrue L_1038e5c
+	brtrue L_1038e6c
 // --- basic block ---
-// 0x01038e24: 0x1038e24: andi  v0, v0, 255
+// 0x01038e34: 0x1038e34: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x01038e28: 0x1038e28: sltiu v0, v0, 26
+// 0x01038e38: 0x1038e38: sltiu v0, v0, 26
 	ldloc 5
 	ldc.i4.s 26
 	clt.un
 	stloc 5
-// 0x01038e2c: 0x1038e2c: bne   v0, zero, 0x1038e5c sll   zero, zero, 0
+// 0x01038e3c: 0x1038e3c: bne   v0, zero, 0x1038e6c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1038e5c
+	brtrue L_1038e6c
 // --- basic block ---
-// 0x01038e34: 0x1038e34: j	 0x1038e44 sll   zero, zero, 0
-	br L_1038e44
+// 0x01038e44: 0x1038e44: j	 0x1038e54 sll   zero, zero, 0
+	br L_1038e54
 // --- basic block ---
-L_1038e3c:
-// 0x01038e3c: 0x1038e3c: bne   v0, zero, 0x1038e54 sll   zero, zero, 0
+L_1038e4c:
+// 0x01038e4c: 0x1038e4c: bne   v0, zero, 0x1038e64 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1038e54
+	brtrue L_1038e64
 // --- basic block ---
-L_1038e44:
-// 0x01038e44: 0x1038e44: jal   0x1038d10 sll   zero, zero, 0
+L_1038e54:
+// 0x01038e54: 0x1038e54: jal   0x1038d20 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl42::is_valid_nonalphabetic_char_1038d10(int32,int32)
+	call int32 Cibyl42::is_valid_nonalphabetic_char_1038d20(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01038e4c: 0x1038e4c: j	 0x1038e60 sll   zero, zero, 0
-	br L_1038e60
+// 0x01038e5c: 0x1038e5c: j	 0x1038e70 sll   zero, zero, 0
+	br L_1038e70
 // --- basic block ---
-L_1038e54:
-// 0x01038e54: 0x1038e54: j	 0x1038e60 addu  v0, zero, zero
+L_1038e64:
+// 0x01038e64: 0x1038e64: j	 0x1038e70 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1038e60
+	br L_1038e70
 // --- basic block ---
-L_1038e5c:
-// 0x01038e5c: 0x1038e5c: addiu v0, zero, 1
+L_1038e6c:
+// 0x01038e6c: 0x1038e6c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1038e60:
-// 0x01038e60: 0x1038e60: lw    ra, 20(sp)
-// 0x01038e64: 0x1038e64: sll   zero, zero, 0
-// 0x01038e68: 0x1038e68: jr    ra addiu sp, sp, 24
+L_1038e70:
+// 0x01038e70: 0x1038e70: lw    ra, 20(sp)
+// 0x01038e74: 0x1038e74: sll   zero, zero, 0
+// 0x01038e78: 0x1038e78: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -442,7 +442,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 phone_keyboard_state_init_1038efc(int32)
+.method public static int32 phone_keyboard_state_init_1038f0c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 v0,int32 ra)
@@ -462,17 +462,17 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038efc: 0x1038efc: addiu v0, zero, 13
+// 0x01038f0c: 0x1038f0c: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc.2
-// 0x01038f00: 0x1038f00: sw    v0, 0(a0)
+// 0x01038f10: 0x1038f10: sw    v0, 0(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01038f04: 0x1038f04: sw    zero, 4(a0)
+// 0x01038f14: 0x1038f14: sw    zero, 4(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -481,7 +481,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01038f08: 0x1038f08: jr    ra sw    zero, 8(a0)
+// 0x01038f18: 0x1038f18: jr    ra sw    zero, 8(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -495,7 +495,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static void multiple_key_info_init_1038f10(int32)
+.method public static void multiple_key_info_init_1038f20(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 ra)
@@ -512,7 +512,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038f10: 0x1038f10: sw    zero, 4(a0)
+// 0x01038f20: 0x1038f20: sw    zero, 4(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -521,7 +521,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01038f14: 0x1038f14: jr    ra sw    zero, 0(a0)
+// 0x01038f24: 0x1038f24: jr    ra sw    zero, 0(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -532,7 +532,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 phone_keyboard_init_1038f1c(int32,int32,int32,int32,int32)
+.method public static int32 phone_keyboard_init_1038f2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 s2,int32 v0,int32 ra,int32 v1)
@@ -576,12 +576,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038f1c: 0x1038f1c: addiu sp, sp, -32
+// 0x01038f2c: 0x1038f2c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01038f20: 0x1038f20: sw    s2, 24(sp)
+// 0x01038f30: 0x1038f30: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -590,7 +590,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01038f24: 0x1038f24: sw    s1, 20(sp)
+// 0x01038f34: 0x1038f34: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -599,7 +599,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01038f28: 0x1038f28: sw    s0, 16(sp)
+// 0x01038f38: 0x1038f38: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -608,49 +608,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01038f2c: 0x1038f2c: sw    ra, 28(sp)
-// 0x01038f30: 0x1038f30: addu  s0, a0, zero
+// 0x01038f3c: 0x1038f3c: sw    ra, 28(sp)
+// 0x01038f40: 0x1038f40: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01038f34: 0x1038f34: addu  s1, zero, zero
+// 0x01038f44: 0x1038f44: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01038f38: 0x1038f38: addiu s2, zero, 12
+// 0x01038f48: 0x1038f48: addiu s2, zero, 12
 	ldc.i4.s 12
 	stloc 8
-// 0x01038f3c: 0x1038f3c: sll   a0, s1, 3
+// 0x01038f4c: 0x1038f4c: sll   a0, s1, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc.1
-L_1038f40:
-// 0x01038f40: 0x1038f40: addu  a0, s0, a0
+L_1038f50:
+// 0x01038f50: 0x1038f50: addu  a0, s0, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x01038f44: 0x1038f44: jal   0x1038f10 addiu s1, s1, 1
+// 0x01038f54: 0x1038f54: jal   0x1038f20 addiu s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
 	ldloc.1
-	call void Cibyl42::multiple_key_info_init_1038f10(int32)
+	call void Cibyl42::multiple_key_info_init_1038f20(int32)
 // --- basic block ---
-// 0x01038f4c: 0x1038f4c: bne   s1, s2, 0x1038f40 sll   a0, s1, 3
+// 0x01038f5c: 0x1038f5c: bne   s1, s2, 0x1038f50 sll   a0, s1, 3
 	ldloc 6
 	ldloc 8
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc.1
-	bne.un L_1038f40
+	bne.un L_1038f50
 // --- basic block ---
-// 0x01038f54: 0x1038f54: lw    ra, 28(sp)
-// 0x01038f58: 0x1038f58: addiu v0, zero, 13
+// 0x01038f64: 0x1038f64: lw    ra, 28(sp)
+// 0x01038f68: 0x1038f68: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 9
-// 0x01038f5c: 0x1038f5c: sw    v0, 96(s0)
+// 0x01038f6c: 0x1038f6c: sw    v0, 96(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -659,7 +659,7 @@ L_1038f40:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01038f60: 0x1038f60: sw    zero, 104(s0)
+// 0x01038f70: 0x1038f70: sw    zero, 104(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -668,7 +668,7 @@ L_1038f40:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01038f64: 0x1038f64: sw    zero, 100(s0)
+// 0x01038f74: 0x1038f74: sw    zero, 100(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -677,7 +677,7 @@ L_1038f40:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01038f68: 0x1038f68: lw    s2, 24(sp)
+// 0x01038f78: 0x1038f78: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -686,7 +686,7 @@ L_1038f40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01038f6c: 0x1038f6c: lw    s1, 20(sp)
+// 0x01038f7c: 0x1038f7c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -695,7 +695,7 @@ L_1038f40:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01038f70: 0x1038f70: lw    s0, 16(sp)
+// 0x01038f80: 0x1038f80: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -704,7 +704,7 @@ L_1038f40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01038f74: 0x1038f74: jr    ra addiu sp, sp, 32
+// 0x01038f84: 0x1038f84: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -716,7 +716,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 phone_keyboard_load_1038f7c(int32,int32,int32,int32,int32)
+.method public static int32 phone_keyboard_load_1038f8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 s0,int32 s1,int32 v0,int32 s3,int32 s4,int32 ra,int32 v1)
@@ -766,12 +766,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01038f7c: 0x1038f7c: addiu sp, sp, -40
+// 0x01038f8c: 0x1038f8c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01038f80: 0x1038f80: sw    s2, 24(sp)
+// 0x01038f90: 0x1038f90: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -780,10 +780,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01038f84: 0x1038f84: lui   s2, 0x20000
+// 0x01038f94: 0x1038f94: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01038f88: 0x1038f88: sw    s4, 32(sp)
+// 0x01038f98: 0x1038f98: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -792,7 +792,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01038f8c: 0x1038f8c: sw    s3, 28(sp)
+// 0x01038f9c: 0x1038f9c: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -801,7 +801,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01038f90: 0x1038f90: sw    s1, 20(sp)
+// 0x01038fa0: 0x1038fa0: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -810,7 +810,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01038f94: 0x1038f94: sw    s0, 16(sp)
+// 0x01038fa4: 0x1038fa4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -819,33 +819,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01038f98: 0x1038f98: sw    ra, 36(sp)
-// 0x01038f9c: 0x1038f9c: addu  s3, a0, zero
+// 0x01038fa8: 0x1038fa8: sw    ra, 36(sp)
+// 0x01038fac: 0x1038fac: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01038fa0: 0x1038fa0: addiu s2, s2, 27300
+// 0x01038fb0: 0x1038fb0: addiu s2, s2, 27764
 	ldloc 6
-	ldc.i4 27300
+	ldc.i4 27764
 	add
 	stloc 6
-// 0x01038fa4: 0x1038fa4: addu  s1, a0, zero
+// 0x01038fb4: 0x1038fb4: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01038fa8: 0x1038fa8: addu  s0, zero, zero
+// 0x01038fb8: 0x1038fb8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01038fac: 0x1038fac: addiu s4, zero, 12
+// 0x01038fbc: 0x1038fbc: addiu s4, zero, 12
 	ldc.i4.s 12
 	stloc 11
-L_1038fb0:
-// 0x01038fb0: 0x1038fb0: lw    a0, 0(s2)
+L_1038fc0:
+// 0x01038fc0: 0x1038fc0: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01038fb4: 0x1038fb4: jal   0x101cd60 addiu s2, s2, 4
+// 0x01038fc4: 0x1038fc4: jal   0x101cd70 addiu s2, s2, 4
 	ldloc 6
 	ldc.i4.4
 	add
@@ -855,41 +855,41 @@ L_1038fb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 9
 // --- basic block ---
-// 0x01038fbc: 0x1038fbc: lb    a0, 0(v0)
+// 0x01038fcc: 0x1038fcc: lb    a0, 0(v0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01038fc0: 0x1038fc0: sll   a1, s0, 3
+// 0x01038fd0: 0x1038fd0: sll   a1, s0, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x01038fc4: 0x1038fc4: xori  a0, a0, 94
+// 0x01038fd4: 0x1038fd4: xori  a0, a0, 94
 	ldloc.1
 	ldc.i4.s 94
 	xor
 	stloc.1
-// 0x01038fc8: 0x1038fc8: sltiu a0, a0, 1
+// 0x01038fd8: 0x1038fd8: sltiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
 	stloc.1
-// 0x01038fcc: 0x1038fcc: addu  a1, s3, a1
+// 0x01038fdc: 0x1038fdc: addu  a1, s3, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc.2
-// 0x01038fd0: 0x1038fd0: addu  a0, v0, a0
+// 0x01038fe0: 0x1038fe0: addu  a0, v0, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc.1
-// 0x01038fd4: 0x1038fd4: jal   0x1038500 addiu a1, a1, 4
+// 0x01038fe4: 0x1038fe4: jal   0x1038510 addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
@@ -899,34 +899,34 @@ L_1038fb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::utf8_to_char_array_1038500(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::utf8_to_char_array_1038510(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 9
 // --- basic block ---
-// 0x01038fdc: 0x1038fdc: addiu s0, s0, 1
+// 0x01038fec: 0x1038fec: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01038fe0: 0x1038fe0: sw    v0, 0(s1)
+// 0x01038ff0: 0x1038ff0: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x01038fe4: 0x1038fe4: bne   s0, s4, 0x1038fb0 addiu s1, s1, 8
+// 0x01038ff4: 0x1038ff4: bne   s0, s4, 0x1038fc0 addiu s1, s1, 8
 	ldloc 7
 	ldloc 11
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 8
-	bne.un L_1038fb0
+	bne.un L_1038fc0
 // --- basic block ---
-// 0x01038fec: 0x1038fec: lw    ra, 36(sp)
-// 0x01038ff0: 0x1038ff0: lw    s4, 32(sp)
+// 0x01038ffc: 0x1038ffc: lw    ra, 36(sp)
+// 0x01039000: 0x1039000: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -935,7 +935,7 @@ L_1038fb0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01038ff4: 0x1038ff4: lw    s3, 28(sp)
+// 0x01039004: 0x1039004: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -944,7 +944,7 @@ L_1038fb0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01038ff8: 0x1038ff8: lw    s2, 24(sp)
+// 0x01039008: 0x1039008: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -953,7 +953,7 @@ L_1038fb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01038ffc: 0x1038ffc: lw    s1, 20(sp)
+// 0x0103900c: 0x103900c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -962,7 +962,7 @@ L_1038fb0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01039000: 0x1039000: lw    s0, 16(sp)
+// 0x01039010: 0x1039010: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -971,7 +971,7 @@ L_1038fb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039004: 0x1039004: jr    ra addiu sp, sp, 40
+// 0x01039014: 0x1039014: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -983,7 +983,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_phone_keyboard_init_103900c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_phone_keyboard_init_103901c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1021,12 +1021,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103900c: 0x103900c: addiu sp, sp, -32
+// 0x0103901c: 0x103901c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01039010: 0x1039010: sw    s0, 24(sp)
+// 0x01039020: 0x1039020: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1035,13 +1035,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01039014: 0x1039014: lui   s0, 0x60000
+// 0x01039024: 0x1039024: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01039018: 0x1039018: sw    ra, 28(sp)
-// 0x0103901c: 0x103901c: jal   0x1038f1c addiu a0, s0, -15052
+// 0x01039028: 0x1039028: sw    ra, 28(sp)
+// 0x0103902c: 0x103902c: jal   0x1038f2c addiu a0, s0, -14588
 	ldloc 7
-	ldc.i4 -15052
+	ldc.i4 -14588
 	add
 	stloc.1
 	ldloc.0
@@ -1049,14 +1049,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::phone_keyboard_init_1038f1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::phone_keyboard_init_1038f2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039024: 0x1039024: jal   0x1038f7c addiu a0, s0, -15052
+// 0x01039034: 0x1039034: jal   0x1038f8c addiu a0, s0, -14588
 	ldloc 7
-	ldc.i4 -15052
+	ldc.i4 -14588
 	add
 	stloc.1
 	ldloc.0
@@ -1064,47 +1064,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::phone_keyboard_load_1038f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::phone_keyboard_load_1038f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103902c: 0x103902c: lui   a0, 0x20000
+// 0x0103903c: 0x103903c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01039030: 0x1039030: lui   a1, 0x0
+// 0x01039040: 0x1039040: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01039034: 0x1039034: lui   a3, 0x0
+// 0x01039044: 0x1039044: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01039038: 0x1039038: lui   v0, 0x20000
+// 0x01039048: 0x1039048: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0103903c: 0x103903c: addiu v0, v0, 9464
+// 0x0103904c: 0x103904c: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x01039040: 0x1039040: addiu a0, a0, -26888
+// 0x01039050: 0x1039050: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01039044: 0x1039044: addiu a1, a1, 18240
+// 0x01039054: 0x1039054: addiu a1, a1, 18240
 	ldloc.2
 	ldc.i4 18240
 	add
 	stloc.2
-// 0x01039048: 0x1039048: addiu a3, a3, 20820
+// 0x01039058: 0x1039058: addiu a3, a3, 20820
 	ldloc 4
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x0103904c: 0x103904c: addu  a2, zero, zero
+// 0x0103905c: 0x103905c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01039050: 0x1039050: sw    v0, 16(sp)
+// 0x01039060: 0x1039060: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1113,7 +1113,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01039054: 0x1039054: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01039064: 0x1039064: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1127,13 +1127,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103905c: 0x103905c: lw    ra, 28(sp)
-// 0x01039060: 0x1039060: lw    s0, 24(sp)
+// 0x0103906c: 0x103906c: lw    ra, 28(sp)
+// 0x01039070: 0x1039070: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1142,7 +1142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039064: 0x1039064: jr    ra addiu sp, sp, 32
+// 0x01039074: 0x1039074: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1154,7 +1154,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 multiple_key_info_get_next_valid_key_103906c(int32,int32,int32,int32,int32)
+.method public static int32 multiple_key_info_get_next_valid_key_103907c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s1,int32 s0,int32 s3,int32 s4,int32 ra)
@@ -1204,12 +1204,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103906c: 0x103906c: addiu sp, sp, -48
+// 0x0103907c: 0x103907c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01039070: 0x1039070: sw    s4, 40(sp)
+// 0x01039080: 0x1039080: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1218,7 +1218,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01039074: 0x1039074: sw    s3, 36(sp)
+// 0x01039084: 0x1039084: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1227,7 +1227,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01039078: 0x1039078: sw    s2, 32(sp)
+// 0x01039088: 0x1039088: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1236,7 +1236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103907c: 0x103907c: sw    s1, 28(sp)
+// 0x0103908c: 0x103908c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1245,7 +1245,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01039080: 0x1039080: sw    s0, 24(sp)
+// 0x01039090: 0x1039090: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1254,68 +1254,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01039084: 0x1039084: sw    ra, 44(sp)
-// 0x01039088: 0x1039088: addu  s0, a1, zero
+// 0x01039094: 0x1039094: sw    ra, 44(sp)
+// 0x01039098: 0x1039098: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0103908c: 0x103908c: addu  s1, a0, zero
+// 0x0103909c: 0x103909c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01039090: 0x1039090: andi  s4, a2, 65535
+// 0x010390a0: 0x10390a0: andi  s4, a2, 65535
 	ldloc.3
 	ldc.i4 65535
 	and
 	stloc 12
-// 0x01039094: 0x1039094: sw    zero, 0(a3)
+// 0x010390a4: 0x10390a4: sw    zero, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01039098: 0x1039098: addu  s2, a1, zero
+// 0x010390a8: 0x10390a8: addu  s2, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0103909c: 0x103909c: j	 0x10390ac addiu s3, zero, -1
+// 0x010390ac: 0x10390ac: j	 0x10390bc addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 11
-	br L_10390ac
+	br L_10390bc
 // --- basic block ---
-L_10390a4:
-// 0x010390a4: 0x10390a4: bne   v1, s3, 0x10390fc sll   zero, zero, 0
+L_10390b4:
+// 0x010390b4: 0x10390b4: bne   v1, s3, 0x103910c sll   zero, zero, 0
 	ldloc 8
 	ldloc 11
-	bne.un L_10390fc
+	bne.un L_103910c
 // --- basic block ---
-L_10390ac:
-// 0x010390ac: 0x10390ac: lw    v1, 0(s1)
+L_10390bc:
+// 0x010390bc: 0x10390bc: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010390b0: 0x10390b0: sll   v0, s2, 2
+// 0x010390c0: 0x10390c0: sll   v0, s2, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010390b4: 0x10390b4: addu  v0, v1, v0
+// 0x010390c4: 0x10390c4: addu  v0, v1, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-// 0x010390b8: 0x10390b8: lw    a0, 0(v0)
+// 0x010390c8: 0x10390c8: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010390bc: 0x10390bc: addu  a1, s4, zero
+// 0x010390cc: 0x10390cc: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010390c0: 0x10390c0: jal   0x1038dd0 sw    a3, 16(sp)
+// 0x010390d0: 0x10390d0: jal   0x1038de0 sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1329,12 +1329,12 @@ L_10390ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::is_valid_key_1038dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::is_valid_key_1038de0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010390c8: 0x10390c8: lw    a3, 16(sp)
+// 0x010390d8: 0x10390d8: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1343,17 +1343,17 @@ L_10390ac:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010390cc: 0x10390cc: beq   v0, zero, 0x10390d8 addiu v1, zero, -1
+// 0x010390dc: 0x10390dc: beq   v0, zero, 0x10390e8 addiu v1, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 8
-	brfalse L_10390d8
+	brfalse L_10390e8
 // --- basic block ---
-// 0x010390d4: 0x10390d4: addu  v1, s2, zero
+// 0x010390e4: 0x10390e4: addu  v1, s2, zero
 	ldloc 7
 	stloc 8
-L_10390d8:
-// 0x010390d8: 0x10390d8: lw    v0, 4(s1)
+L_10390e8:
+// 0x010390e8: 0x10390e8: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1362,50 +1362,50 @@ L_10390d8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010390dc: 0x10390dc: addiu s2, s2, 1
+// 0x010390ec: 0x10390ec: addiu s2, s2, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010390e0: 0x10390e0: xor   v0, s2, v0
+// 0x010390f0: 0x10390f0: xor   v0, s2, v0
 	ldloc 7
 	ldloc 6
 	xor
 	stloc 6
-// 0x010390e4: 0x10390e4: sltu  v0, zero, v0
+// 0x010390f4: 0x10390f4: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x010390e8: 0x10390e8: subu  v0, zero, v0
+// 0x010390f8: 0x10390f8: subu  v0, zero, v0
 	ldloc 6
 	neg
 	stloc 6
-// 0x010390ec: 0x10390ec: and   s2, s2, v0
+// 0x010390fc: 0x10390fc: and   s2, s2, v0
 	ldloc 7
 	ldloc 6
 	and
 	stloc 7
-// 0x010390f0: 0x10390f0: bne   s2, s0, 0x10390a4 addiu v0, zero, 1
+// 0x01039100: 0x1039100: bne   s2, s0, 0x10390b4 addiu v0, zero, 1
 	ldloc 7
 	ldloc 10
 	ldc.i4.1
 	stloc 6
-	bne.un L_10390a4
+	bne.un L_10390b4
 // --- basic block ---
-// 0x010390f8: 0x10390f8: sw    v0, 0(a3)
+// 0x01039108: 0x1039108: sw    v0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_10390fc:
-// 0x010390fc: 0x10390fc: lw    ra, 44(sp)
-// 0x01039100: 0x1039100: addu  v0, v1, zero
+L_103910c:
+// 0x0103910c: 0x103910c: lw    ra, 44(sp)
+// 0x01039110: 0x1039110: addu  v0, v1, zero
 	ldloc 8
 	stloc 6
-// 0x01039104: 0x1039104: lw    s4, 40(sp)
+// 0x01039114: 0x1039114: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1414,7 +1414,7 @@ L_10390fc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01039108: 0x1039108: lw    s3, 36(sp)
+// 0x01039118: 0x1039118: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1423,7 +1423,7 @@ L_10390fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103910c: 0x103910c: lw    s2, 32(sp)
+// 0x0103911c: 0x103911c: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1432,7 +1432,7 @@ L_10390fc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039110: 0x1039110: lw    s1, 28(sp)
+// 0x01039120: 0x1039120: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1441,7 +1441,7 @@ L_10390fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01039114: 0x1039114: lw    s0, 24(sp)
+// 0x01039124: 0x1039124: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1450,7 +1450,7 @@ L_10390fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01039118: 0x1039118: jr    ra addiu sp, sp, 48
+// 0x01039128: 0x1039128: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1462,7 +1462,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 multiple_key_info_free_10392dc(int32,int32,int32,int32,int32)
+.method public static int32 multiple_key_info_free_10392ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -1497,7 +1497,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010392dc: 0x10392dc: lw    a1, 4(a0)
+// 0x010392ec: 0x10392ec: lw    a1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1506,33 +1506,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010392e0: 0x10392e0: lw    a0, 0(a0)
+// 0x010392f0: 0x10392f0: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010392e4: 0x10392e4: addiu sp, sp, -24
+// 0x010392f4: 0x10392f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010392e8: 0x10392e8: sw    ra, 20(sp)
-// 0x010392ec: 0x10392ec: jal   0x10385cc sll   zero, zero, 0
+// 0x010392f8: 0x10392f8: sw    ra, 20(sp)
+// 0x010392fc: 0x10392fc: jal   0x10385dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::utf8_free_char_array_10385cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::utf8_free_char_array_10385dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010392f4: 0x10392f4: lw    ra, 20(sp)
-// 0x010392f8: 0x10392f8: sll   zero, zero, 0
-// 0x010392fc: 0x10392fc: jr    ra addiu sp, sp, 24
+// 0x01039304: 0x1039304: lw    ra, 20(sp)
+// 0x01039308: 0x1039308: sll   zero, zero, 0
+// 0x0103930c: 0x103930c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1544,7 +1544,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 phone_keyboard_free_1039304(int32,int32,int32,int32,int32)
+.method public static int32 phone_keyboard_free_1039314(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 s2,int32 v0,int32 ra,int32 v1)
@@ -1588,12 +1588,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01039304: 0x1039304: addiu sp, sp, -32
+// 0x01039314: 0x1039314: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01039308: 0x1039308: sw    s2, 24(sp)
+// 0x01039318: 0x1039318: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1602,7 +1602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103930c: 0x103930c: sw    s1, 20(sp)
+// 0x0103931c: 0x103931c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1611,7 +1611,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01039310: 0x1039310: sw    s0, 16(sp)
+// 0x01039320: 0x1039320: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1620,28 +1620,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01039314: 0x1039314: sw    ra, 28(sp)
-// 0x01039318: 0x1039318: addu  s0, a0, zero
+// 0x01039324: 0x1039324: sw    ra, 28(sp)
+// 0x01039328: 0x1039328: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0103931c: 0x103931c: addu  s1, zero, zero
+// 0x0103932c: 0x103932c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01039320: 0x1039320: addiu s2, zero, 12
+// 0x01039330: 0x1039330: addiu s2, zero, 12
 	ldc.i4.s 12
 	stloc 8
-// 0x01039324: 0x1039324: sll   a0, s1, 3
+// 0x01039334: 0x1039334: sll   a0, s1, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc.1
-L_1039328:
-// 0x01039328: 0x1039328: addu  a0, s0, a0
+L_1039338:
+// 0x01039338: 0x1039338: addu  a0, s0, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x0103932c: 0x103932c: jal   0x10392dc addiu s1, s1, 1
+// 0x0103933c: 0x103933c: jal   0x10392ec addiu s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	add
@@ -1651,25 +1651,25 @@ L_1039328:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::multiple_key_info_free_10392dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::multiple_key_info_free_10392ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 9
 // --- basic block ---
-// 0x01039334: 0x1039334: bne   s1, s2, 0x1039328 sll   a0, s1, 3
+// 0x01039344: 0x1039344: bne   s1, s2, 0x1039338 sll   a0, s1, 3
 	ldloc 6
 	ldloc 8
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc.1
-	bne.un L_1039328
+	bne.un L_1039338
 // --- basic block ---
-// 0x0103933c: 0x103933c: lw    ra, 28(sp)
-// 0x01039340: 0x1039340: addiu v0, zero, 13
+// 0x0103934c: 0x103934c: lw    ra, 28(sp)
+// 0x01039350: 0x1039350: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 9
-// 0x01039344: 0x1039344: sw    v0, 96(s0)
+// 0x01039354: 0x1039354: sw    v0, 96(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1678,7 +1678,7 @@ L_1039328:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01039348: 0x1039348: sw    zero, 104(s0)
+// 0x01039358: 0x1039358: sw    zero, 104(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1687,7 +1687,7 @@ L_1039328:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103934c: 0x103934c: sw    zero, 100(s0)
+// 0x0103935c: 0x103935c: sw    zero, 100(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1696,7 +1696,7 @@ L_1039328:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01039350: 0x1039350: lw    s2, 24(sp)
+// 0x01039360: 0x1039360: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1705,7 +1705,7 @@ L_1039328:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01039354: 0x1039354: lw    s1, 20(sp)
+// 0x01039364: 0x1039364: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1714,7 +1714,7 @@ L_1039328:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01039358: 0x1039358: lw    s0, 16(sp)
+// 0x01039368: 0x1039368: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1723,7 +1723,7 @@ L_1039328:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103935c: 0x103935c: jr    ra addiu sp, sp, 32
+// 0x0103936c: 0x103936c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1735,7 +1735,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static void roadmap_search_menu_10393e8()
+.method public static void roadmap_search_menu_10393f8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1746,13 +1746,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10393e8:
-// 0x010393e8: 0x10393e8: jr    ra sll   zero, zero, 0
+L_10393f8:
+// 0x010393f8: 0x10393f8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 search_menu_set_local_search_attrs_10393f0(int32,int32,int32,int32,int32)
+.method public static int32 search_menu_set_local_search_attrs_1039400(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1790,25 +1790,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010393f0: 0x10393f0: lui   v0, 0x60000
+// 0x01039400: 0x1039400: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010393f4: 0x10393f4: lw    a2, -24392(v0)
+// 0x01039404: 0x1039404: lw    a2, -23928(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -6098
+	ldc.i4 -5982
 	add
 	ldelem.i4
 	stloc.3
-// 0x010393f8: 0x10393f8: addiu sp, sp, -24
+// 0x01039408: 0x1039408: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010393fc: 0x10393fc: sw    ra, 20(sp)
-// 0x01039400: 0x1039400: beq   a2, zero, 0x1039440 sw    s0, 16(sp)
+// 0x0103940c: 0x103940c: sw    ra, 20(sp)
+// 0x01039410: 0x1039410: beq   a2, zero, 0x1039450 sw    s0, 16(sp)
 	ldloc.3
 	ldloc 6
 	ldloc.0
@@ -1818,20 +1818,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1039440
+	brfalse L_1039450
 // --- basic block ---
-// 0x01039408: 0x1039408: lui   a0, 0x10000
+// 0x01039418: 0x1039418: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103940c: 0x103940c: lui   a1, 0x10000
+// 0x0103941c: 0x103941c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039410: 0x1039410: addiu a0, a0, -18740
+// 0x01039420: 0x1039420: addiu a0, a0, -18740
 	ldloc.1
 	ldc.i4 -18740
 	add
 	stloc.1
-// 0x01039414: 0x1039414: jal   0x102c780 addiu a1, a1, -18368
+// 0x01039424: 0x1039424: jal   0x102c790 addiu a1, a1, -18368
 	ldloc.2
 	ldc.i4 -18368
 	add
@@ -1841,29 +1841,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_get_menu_item_102c780(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_get_menu_item_102c790(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103941c: 0x103941c: beq   v0, zero, 0x1039440 addu  s0, v0, zero
+// 0x0103942c: 0x103942c: beq   v0, zero, 0x1039450 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_1039440
+	brfalse L_1039450
 // --- basic block ---
-// 0x01039424: 0x1039424: jal   0x103aaf4 sll   zero, zero, 0
+// 0x01039434: 0x1039434: jal   0x103ab04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_icon_name_103aaf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_icon_name_103ab04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103942c: 0x103942c: jal   0x103abbc sw    v0, 4(s0)
+// 0x0103943c: 0x103943c: jal   0x103abcc sw    v0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1877,12 +1877,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_provider_label_103abbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_provider_label_103abcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039434: 0x1039434: jal   0x101cd60 addu  a0, v0, zero
+// 0x01039444: 0x1039444: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1890,21 +1890,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103943c: 0x103943c: sw    v0, 0(s0)
+// 0x0103944c: 0x103944c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1039440:
-// 0x01039440: 0x1039440: lw    ra, 20(sp)
-// 0x01039444: 0x1039444: lw    s0, 16(sp)
+L_1039450:
+// 0x01039450: 0x1039450: lw    ra, 20(sp)
+// 0x01039454: 0x1039454: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1913,7 +1913,7 @@ L_1039440:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039448: 0x1039448: jr    ra addiu sp, sp, 24
+// 0x01039458: 0x1039458: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1925,7 +1925,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 search_menu_search_local_1039450(int32,int32,int32,int32,int32)
+.method public static int32 search_menu_search_local_1039460(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -1963,25 +1963,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1039450:
-// 0x01039450: 0x1039450: lui   v0, 0x20000
+L_1039460:
+// 0x01039460: 0x1039460: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01039454: 0x1039454: addiu sp, sp, -24
+// 0x01039464: 0x1039464: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01039458: 0x1039458: lw    a0, 27384(v0)
+// 0x01039468: 0x1039468: lw    a0, 27848(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6846
+	ldc.i4 6962
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103945c: 0x103945c: sw    s0, 16(sp)
+// 0x0103946c: 0x103946c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1990,40 +1990,40 @@ L_1039450:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01039460: 0x1039460: addu  a1, zero, zero
+// 0x01039470: 0x1039470: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01039464: 0x1039464: addu  a2, zero, zero
+// 0x01039474: 0x1039474: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01039468: 0x1039468: sw    ra, 20(sp)
-// 0x0103946c: 0x103946c: jal   0x104bfdc lui   s0, 0x60000
+// 0x01039478: 0x1039478: sw    ra, 20(sp)
+// 0x0103947c: 0x103947c: jal   0x104bfec lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01039474: 0x1039474: lw    v0, -14940(s0)
+// 0x01039484: 0x1039484: lw    v0, -14476(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3735
+	ldc.i4 -3619
 	add
 	ldelem.i4
 	stloc 5
-// 0x01039478: 0x1039478: sll   zero, zero, 0
-// 0x0103947c: 0x103947c: bne   v0, zero, 0x1039498 lui   a0, 0x1040000
+// 0x01039488: 0x1039488: sll   zero, zero, 0
+// 0x0103948c: 0x103948c: bne   v0, zero, 0x10394a8 lui   a0, 0x1040000
 	ldloc 5
 	ldc.i4 17039360
 	stloc.1
-	brtrue L_1039498
+	brtrue L_10394a8
 // --- basic block ---
-// 0x01039484: 0x1039484: addiu a0, a0, -27480
+// 0x01039494: 0x1039494: addiu a0, a0, -27464
 	ldloc.1
-	ldc.i4 -27480
+	ldc.i4 -27464
 	add
 	stloc.1
-// 0x01039488: 0x1039488: jal   0x103b6d4 addu  a1, zero, zero
+// 0x01039498: 0x1039498: jal   0x103b6e4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2031,26 +2031,26 @@ L_1039450:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_dlg_show_103b6d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_dlg_show_103b6e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01039490: 0x1039490: addiu v0, zero, 1
+// 0x010394a0: 0x10394a0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01039494: 0x1039494: sw    v0, -14940(s0)
+// 0x010394a4: 0x10394a4: sw    v0, -14476(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3735
+	ldc.i4 -3619
 	add
 	ldloc 5
 	stelem.i4
-L_1039498:
-// 0x01039498: 0x1039498: lw    ra, 20(sp)
-// 0x0103949c: 0x103949c: lw    s0, 16(sp)
+L_10394a8:
+// 0x010394a8: 0x10394a8: lw    ra, 20(sp)
+// 0x010394ac: 0x10394ac: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2059,7 +2059,7 @@ L_1039498:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010394a0: 0x10394a0: jr    ra addiu sp, sp, 24
+// 0x010394b0: 0x10394b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2071,7 +2071,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_dlg_closed_local_10394a8(int32,int32,int32,int32,int32)
+.method public static int32 on_dlg_closed_local_10394b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2106,43 +2106,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010394a8: 0x10394a8: lui   v0, 0x60000
+// 0x010394b8: 0x10394b8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010394ac: 0x10394ac: addiu sp, sp, -24
+// 0x010394bc: 0x10394bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010394b0: 0x10394b0: sw    zero, -14940(v0)
+// 0x010394c0: 0x10394c0: sw    zero, -14476(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3735
+	ldc.i4 -3619
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010394b4: 0x10394b4: addiu v0, zero, 2
+// 0x010394c4: 0x10394c4: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010394b8: 0x10394b8: beq   a0, v0, 0x10394d8 sw    ra, 20(sp)
+// 0x010394c8: 0x10394c8: beq   a0, v0, 0x10394e8 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_10394d8
+	beq  L_10394e8
 // --- basic block ---
-// 0x010394c0: 0x10394c0: beq   a0, zero, 0x10394d8 addiu v0, zero, 1
+// 0x010394d0: 0x10394d0: beq   a0, zero, 0x10394e8 addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	brfalse L_10394d8
+	brfalse L_10394e8
 // --- basic block ---
-// 0x010394c8: 0x10394c8: beq   a0, v0, 0x10394d8 sll   zero, zero, 0
+// 0x010394d8: 0x10394d8: beq   a0, v0, 0x10394e8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10394d8
+	beq  L_10394e8
 // --- basic block ---
-// 0x010394d0: 0x10394d0: jal   0x1094a94 addu  a0, zero, zero
+// 0x010394e0: 0x10394e0: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2150,15 +2150,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10394d8:
-// 0x010394d8: 0x10394d8: lw    ra, 20(sp)
-// 0x010394dc: 0x10394dc: sll   zero, zero, 0
-// 0x010394e0: 0x10394e0: jr    ra addiu sp, sp, 24
+L_10394e8:
+// 0x010394e8: 0x10394e8: lw    ra, 20(sp)
+// 0x010394ec: 0x10394ec: sll   zero, zero, 0
+// 0x010394f0: 0x10394f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2170,7 +2170,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_dlg_closed_address_10394e8(int32,int32,int32,int32,int32)
+.method public static int32 on_dlg_closed_address_10394f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2205,31 +2205,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010394e8: 0x10394e8: addiu sp, sp, -24
+// 0x010394f8: 0x10394f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010394ec: 0x10394ec: addiu v0, zero, 2
+// 0x010394fc: 0x10394fc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010394f0: 0x10394f0: beq   a0, v0, 0x1039510 sw    ra, 20(sp)
+// 0x01039500: 0x1039500: beq   a0, v0, 0x1039520 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_1039510
+	beq  L_1039520
 // --- basic block ---
-// 0x010394f8: 0x10394f8: beq   a0, zero, 0x1039510 addiu v0, zero, 1
+// 0x01039508: 0x1039508: beq   a0, zero, 0x1039520 addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	brfalse L_1039510
+	brfalse L_1039520
 // --- basic block ---
-// 0x01039500: 0x1039500: beq   a0, v0, 0x1039510 sll   zero, zero, 0
+// 0x01039510: 0x1039510: beq   a0, v0, 0x1039520 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1039510
+	beq  L_1039520
 // --- basic block ---
-// 0x01039508: 0x1039508: jal   0x1094a94 addu  a0, zero, zero
+// 0x01039518: 0x1039518: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2237,15 +2237,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1039510:
-// 0x01039510: 0x1039510: lw    ra, 20(sp)
-// 0x01039514: 0x1039514: sll   zero, zero, 0
-// 0x01039518: 0x1039518: jr    ra addiu sp, sp, 24
+L_1039520:
+// 0x01039520: 0x1039520: lw    ra, 20(sp)
+// 0x01039524: 0x1039524: sll   zero, zero, 0
+// 0x01039528: 0x1039528: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2257,7 +2257,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 search_menu_single_search_1039520(int32,int32,int32,int32,int32)
+.method public static int32 search_menu_single_search_1039530(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2292,42 +2292,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1039520:
-// 0x01039520: 0x1039520: lui   v0, 0x20000
+L_1039530:
+// 0x01039530: 0x1039530: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01039524: 0x1039524: lw    a0, 27388(v0)
+// 0x01039534: 0x1039534: lw    a0, 27852(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6847
+	ldc.i4 6963
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039528: 0x1039528: addiu sp, sp, -24
+// 0x01039538: 0x1039538: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103952c: 0x103952c: addu  a1, zero, zero
+// 0x0103953c: 0x103953c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01039530: 0x1039530: sw    ra, 20(sp)
-// 0x01039534: 0x1039534: jal   0x104bfdc addu  a2, zero, zero
+// 0x01039540: 0x1039540: sw    ra, 20(sp)
+// 0x01039544: 0x1039544: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x0103953c: 0x103953c: lui   a0, 0x1040000
+// 0x0103954c: 0x103954c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01039540: 0x1039540: addiu a0, a0, -27416
+// 0x01039550: 0x1039550: addiu a0, a0, -27400
 	ldloc.1
-	ldc.i4 -27416
+	ldc.i4 -27400
 	add
 	stloc.1
-// 0x01039544: 0x1039544: jal   0x103ed8c addu  a1, zero, zero
+// 0x01039554: 0x1039554: jal   0x103ed9c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2335,14 +2335,14 @@ L_1039520:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::single_search_dlg_show_103ed8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::single_search_dlg_show_103ed9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103954c: 0x103954c: lw    ra, 20(sp)
-// 0x01039550: 0x1039550: sll   zero, zero, 0
-// 0x01039554: 0x1039554: jr    ra addiu sp, sp, 24
+// 0x0103955c: 0x103955c: lw    ra, 20(sp)
+// 0x01039560: 0x1039560: sll   zero, zero, 0
+// 0x01039564: 0x1039564: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2354,7 +2354,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 search_menu_search_address_103955c(int32,int32,int32,int32,int32)
+.method public static int32 search_menu_search_address_103956c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2389,42 +2389,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103955c:
-// 0x0103955c: 0x103955c: lui   v0, 0x20000
+L_103956c:
+// 0x0103956c: 0x103956c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01039560: 0x1039560: lw    a0, 27388(v0)
+// 0x01039570: 0x1039570: lw    a0, 27852(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6847
+	ldc.i4 6963
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039564: 0x1039564: addiu sp, sp, -24
+// 0x01039574: 0x1039574: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01039568: 0x1039568: addu  a1, zero, zero
+// 0x01039578: 0x1039578: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103956c: 0x103956c: sw    ra, 20(sp)
-// 0x01039570: 0x1039570: jal   0x104bfdc addu  a2, zero, zero
+// 0x0103957c: 0x103957c: sw    ra, 20(sp)
+// 0x01039580: 0x1039580: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01039578: 0x1039578: lui   a0, 0x1040000
+// 0x01039588: 0x1039588: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0103957c: 0x103957c: addiu a0, a0, -27416
+// 0x0103958c: 0x103958c: addiu a0, a0, -27400
 	ldloc.1
-	ldc.i4 -27416
+	ldc.i4 -27400
 	add
 	stloc.1
-// 0x01039580: 0x1039580: jal   0x103c91c addu  a1, zero, zero
+// 0x01039590: 0x1039590: jal   0x103c92c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2432,14 +2432,14 @@ L_103955c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::address_search_dlg_show_103c91c(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::address_search_dlg_show_103c92c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039588: 0x1039588: lw    ra, 20(sp)
-// 0x0103958c: 0x103958c: sll   zero, zero, 0
-// 0x01039590: 0x1039590: jr    ra addiu sp, sp, 24
+// 0x01039598: 0x1039598: lw    ra, 20(sp)
+// 0x0103959c: 0x103959c: sll   zero, zero, 0
+// 0x010395a0: 0x10395a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2451,7 +2451,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_search_history_1039598(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_search_history_10395a8(int32,int32,int32,int32,int32)
 {
 .maxstack 12
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s3,int32 t0,int32 t1,int32 t2,int32 s0,int32 s4,int32 s5,int32 s8,int32 s6,int32 s7,int32 t3,int32 t4,int32 ra,int32 t5)
@@ -2531,12 +2531,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01039598: 0x1039598: addiu sp, sp, -1240
+// 0x010395a8: 0x10395a8: addiu sp, sp, -1240
 	ldloc.0
 	ldc.i4 -1240
 	add
 	stloc.0
-// 0x0103959c: 0x103959c: sw    s0, 1200(sp)
+// 0x010395ac: 0x10395ac: sw    s0, 1200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2545,12 +2545,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010395a0: 0x10395a0: sll   s0, a0, 24
+// 0x010395b0: 0x10395b0: sll   s0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 14
-// 0x010395a4: 0x10395a4: sw    s1, 1204(sp)
+// 0x010395b4: 0x10395b4: sw    s1, 1204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2559,18 +2559,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010395a8: 0x10395a8: sra   s0, s0, 24
+// 0x010395b8: 0x10395b8: sra   s0, s0, 24
 	ldloc 14
 	ldc.i4.s 24
 	shr
 	stloc 14
-// 0x010395ac: 0x10395ac: lui   s1, 0x60000
+// 0x010395bc: 0x10395bc: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x010395b0: 0x10395b0: addu  a0, a1, zero
+// 0x010395c0: 0x10395c0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x010395b4: 0x10395b4: sw    s6, 1224(sp)
+// 0x010395c4: 0x10395c4: sw    s6, 1224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2579,14 +2579,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010395b8: 0x10395b8: sb    s0, -13736(s1)
+// 0x010395c8: 0x10395c8: sb    s0, -13272(s1)
 	ldloc 9
-	ldc.i4 -13736
+	ldc.i4 -13272
 	add
 	ldloc 14
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010395bc: 0x10395bc: sw    ra, 1236(sp)
-// 0x010395c0: 0x10395c0: sw    s8, 1232(sp)
+// 0x010395cc: 0x10395cc: sw    ra, 1236(sp)
+// 0x010395d0: 0x10395d0: sw    s8, 1232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2595,7 +2595,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010395c4: 0x10395c4: sw    s7, 1228(sp)
+// 0x010395d4: 0x10395d4: sw    s7, 1228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2604,7 +2604,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010395c8: 0x10395c8: sw    s5, 1220(sp)
+// 0x010395d8: 0x10395d8: sw    s5, 1220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2613,7 +2613,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010395cc: 0x10395cc: sw    s4, 1216(sp)
+// 0x010395dc: 0x10395dc: sw    s4, 1216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2622,7 +2622,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010395d0: 0x10395d0: sw    s3, 1212(sp)
+// 0x010395e0: 0x10395e0: sw    s3, 1212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2631,7 +2631,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010395d4: 0x10395d4: sw    s2, 1208(sp)
+// 0x010395e4: 0x10395e4: sw    s2, 1208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2640,7 +2640,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010395d8: 0x10395d8: jal   0x1001ba8 addu  s6, a1, zero
+// 0x010395e8: 0x10395e8: jal   0x1001ba8 addu  s6, a1, zero
 	ldloc.2
 	stloc 18
 	ldloc.0
@@ -2653,15 +2653,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010395e0: 0x10395e0: lui   v1, 0x0
+// 0x010395f0: 0x10395f0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010395e4: 0x10395e4: addiu s1, s1, -13736
+// 0x010395f4: 0x10395f4: addiu s1, s1, -13272
 	ldloc 9
-	ldc.i4 -13736
+	ldc.i4 -13272
 	add
 	stloc 9
-// 0x010395e8: 0x10395e8: lw    v1, 12668(v1)
+// 0x010395f8: 0x10395f8: lw    v1, 12668(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2670,7 +2670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010395ec: 0x10395ec: sw    v0, 4(s1)
+// 0x010395fc: 0x10395fc: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2679,20 +2679,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010395f0: 0x10395f0: addiu v0, zero, -1
+// 0x01039600: 0x1039600: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010395f4: 0x10395f4: bne   v1, v0, 0x1039624 lui   v0, 0x0
+// 0x01039604: 0x1039604: bne   v1, v0, 0x1039634 lui   v0, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1039624
+	bne.un L_1039634
 // --- basic block ---
-// 0x010395fc: 0x10395fc: addiu a0, zero, 65
+// 0x0103960c: 0x103960c: addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
-// 0x01039600: 0x1039600: jal   0x1037918 addiu a1, zero, 8
+// 0x01039610: 0x1039610: jal   0x1037928 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -2700,15 +2700,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039608: 0x1039608: addiu a0, zero, 70
+// 0x01039618: 0x1039618: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x0103960c: 0x103960c: jal   0x1037918 addiu a1, zero, 8
+// 0x0103961c: 0x103961c: jal   0x1037928 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -2716,15 +2716,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039614: 0x1039614: addiu a0, zero, 83
+// 0x01039624: 0x1039624: addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
-// 0x01039618: 0x1039618: jal   0x1037918 addiu a1, zero, 11
+// 0x01039628: 0x1039628: jal   0x1037928 addiu a1, zero, 11
 	ldc.i4.s 11
 	stloc.2
 	ldloc.0
@@ -2732,19 +2732,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039620: 0x1039620: lui   v0, 0x0
+// 0x01039630: 0x1039630: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1039624:
-// 0x01039624: 0x1039624: addu  a0, s0, zero
+L_1039634:
+// 0x01039634: 0x1039634: addu  a0, s0, zero
 	ldloc 14
 	stloc.1
-// 0x01039628: 0x1039628: sw    zero, 12668(v0)
+// 0x01039638: 0x1039638: sw    zero, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2753,53 +2753,53 @@ L_1039624:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103962c: 0x103962c: jal   0x103772c lui   s7, 0x0
+// 0x0103963c: 0x103963c: jal   0x103773c lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 19
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl40::roadmap_history_latest_103772c(int32,int32)
+	call int32 Cibyl40::roadmap_history_latest_103773c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039634: 0x1039634: lui   s1, 0x60000
+// 0x01039644: 0x1039644: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01039638: 0x1039638: lui   s8, 0x0
+// 0x01039648: 0x1039648: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 17
-// 0x0103963c: 0x103963c: addu  s5, v0, zero
+// 0x0103964c: 0x103964c: addu  s5, v0, zero
 	ldloc 5
 	stloc 16
-// 0x01039640: 0x1039640: addiu s7, s7, 12620
+// 0x01039650: 0x1039650: addiu s7, s7, 12620
 	ldloc 19
 	ldc.i4 12620
 	add
 	stloc 19
-// 0x01039644: 0x1039644: addiu s1, s1, -14936
+// 0x01039654: 0x1039654: addiu s1, s1, -14472
 	ldloc 9
-	ldc.i4 -14936
+	ldc.i4 -14472
 	add
 	stloc 9
-// 0x01039648: 0x1039648: addiu s8, s8, 12644
+// 0x01039658: 0x1039658: addiu s8, s8, 12644
 	ldloc 17
 	ldc.i4 12644
 	add
 	stloc 17
-// 0x0103964c: 0x103964c: addiu s3, zero, -1
+// 0x0103965c: 0x103965c: addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x01039650: 0x1039650: j	 0x1039bc0 addiu s4, zero, -1
+// 0x01039660: 0x1039660: j	 0x1039bd0 addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 15
-	br L_1039bc0
+	br L_1039bd0
 // --- basic block ---
-L_1039658:
-// 0x01039658: 0x1039658: addu  a1, s5, zero
+L_1039668:
+// 0x01039668: 0x1039668: addu  a1, s5, zero
 	ldloc 16
 	stloc.2
-// 0x0103965c: 0x103965c: jal   0x1037c10 addiu a2, sp, 40
+// 0x0103966c: 0x103966c: jal   0x1037c20 addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2809,25 +2809,25 @@ L_1039658:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039664: 0x1039664: addiu v0, zero, 83
+// 0x01039674: 0x1039674: addiu v0, zero, 83
 	ldc.i4.s 83
 	stloc 5
-// 0x01039668: 0x1039668: bne   s0, v0, 0x1039884 addiu v0, zero, 65
+// 0x01039678: 0x1039678: bne   s0, v0, 0x1039894 addiu v0, zero, 65
 	ldloc 14
 	ldloc 5
 	ldc.i4.s 65
 	stloc 5
-	bne.un L_1039884
+	bne.un L_1039894
 // --- basic block ---
-// 0x01039670: 0x1039670: lui   a1, 0x10000
+// 0x01039680: 0x1039680: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039674: 0x1039674: lw    a0, 68(sp)
+// 0x01039684: 0x1039684: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2836,9 +2836,9 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039678: 0x1039678: jal   0x1001b14 addiu a1, a1, -16892
+// 0x01039688: 0x1039688: jal   0x1001b14 addiu a1, a1, 19396
 	ldloc.2
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc.2
 	ldloc.1
@@ -2846,11 +2846,11 @@ L_1039658:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039680: 0x1039680: bne   v0, zero, 0x1039808 sll   zero, zero, 0
+// 0x01039690: 0x1039690: bne   v0, zero, 0x1039818 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1039808
+	brtrue L_1039818
 // --- basic block ---
-// 0x01039688: 0x1039688: lw    v0, 44(sp)
+// 0x01039698: 0x1039698: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2859,19 +2859,19 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103968c: 0x103968c: sll   zero, zero, 0
-// 0x01039690: 0x1039690: lb    v1, 1(v0)
+// 0x0103969c: 0x103969c: sll   zero, zero, 0
+// 0x010396a0: 0x10396a0: lb    v1, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01039694: 0x1039694: sll   zero, zero, 0
-// 0x01039698: 0x1039698: beq   v1, zero, 0x103971c sll   zero, zero, 0
+// 0x010396a4: 0x10396a4: sll   zero, zero, 0
+// 0x010396a8: 0x10396a8: beq   v1, zero, 0x103972c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_103971c
+	brfalse L_103972c
 // --- basic block ---
-// 0x010396a0: 0x10396a0: lw    v1, 48(sp)
+// 0x010396b0: 0x10396b0: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2880,21 +2880,21 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010396a4: 0x10396a4: sll   zero, zero, 0
-// 0x010396a8: 0x10396a8: lb    v1, 0(v1)
+// 0x010396b4: 0x10396b4: sll   zero, zero, 0
+// 0x010396b8: 0x10396b8: lb    v1, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010396ac: 0x10396ac: sll   zero, zero, 0
-// 0x010396b0: 0x10396b0: beq   v1, zero, 0x103971c lui   a0, 0x10000
+// 0x010396bc: 0x10396bc: sll   zero, zero, 0
+// 0x010396c0: 0x10396c0: beq   v1, zero, 0x103972c lui   a0, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc.1
-	brfalse L_103971c
+	brfalse L_103972c
 // --- basic block ---
-// 0x010396b8: 0x10396b8: jal   0x101cd60 addiu a0, a0, -10576
+// 0x010396c8: 0x10396c8: jal   0x101cd70 addiu a0, a0, -10580
 	ldloc.1
-	ldc.i4 -10576
+	ldc.i4 -10580
 	add
 	stloc.1
 	ldloc.0
@@ -2902,12 +2902,12 @@ L_1039658:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010396c0: 0x10396c0: lw    v1, 76(sp)
+// 0x010396d0: 0x10396d0: lw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2916,15 +2916,15 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010396c4: 0x10396c4: lui   a0, 0x10000
+// 0x010396d4: 0x10396d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010396c8: 0x10396c8: addiu a0, a0, -11444
+// 0x010396d8: 0x10396d8: addiu a0, a0, -11448
 	ldloc.1
-	ldc.i4 -11444
+	ldc.i4 -11448
 	add
 	stloc.1
-// 0x010396cc: 0x10396cc: lw    s2, 56(sp)
+// 0x010396dc: 0x10396dc: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2933,7 +2933,7 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010396d0: 0x10396d0: sw    v1, 1196(sp)
+// 0x010396e0: 0x10396e0: sw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2942,7 +2942,7 @@ L_1039658:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010396d4: 0x10396d4: jal   0x101cd60 sw    v0, 1192(sp)
+// 0x010396e4: 0x10396e4: jal   0x101cd70 sw    v0, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2956,12 +2956,12 @@ L_1039658:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010396dc: 0x10396dc: sw    v0, 24(sp)
+// 0x010396ec: 0x10396ec: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2970,7 +2970,7 @@ L_1039658:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010396e0: 0x10396e0: lw    v0, 44(sp)
+// 0x010396f0: 0x10396f0: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2979,7 +2979,7 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010396e4: 0x10396e4: lw    v1, 1196(sp)
+// 0x010396f4: 0x10396f4: lw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2988,7 +2988,7 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010396e8: 0x10396e8: sw    v0, 28(sp)
+// 0x010396f8: 0x10396f8: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2997,10 +2997,10 @@ L_1039658:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010396ec: 0x10396ec: lui   a2, 0x10000
+// 0x010396fc: 0x10396fc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010396f0: 0x10396f0: lw    v0, 48(sp)
+// 0x01039700: 0x1039700: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3009,7 +3009,7 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010396f4: 0x10396f4: lw    a3, 1192(sp)
+// 0x01039704: 0x1039704: lw    a3, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3018,20 +3018,20 @@ L_1039658:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010396f8: 0x10396f8: addiu a2, a2, -11436
+// 0x01039708: 0x1039708: addiu a2, a2, -11440
 	ldloc.3
-	ldc.i4 -11436
+	ldc.i4 -11440
 	add
 	stloc.3
-// 0x010396fc: 0x10396fc: addiu a0, sp, 840
+// 0x0103970c: 0x103970c: addiu a0, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
 	stloc.1
-// 0x01039700: 0x1039700: addiu a1, zero, 350
+// 0x01039710: 0x1039710: addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
-// 0x01039704: 0x1039704: sw    s2, 16(sp)
+// 0x01039714: 0x1039714: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3040,7 +3040,7 @@ L_1039658:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01039708: 0x1039708: sw    v1, 20(sp)
+// 0x01039718: 0x1039718: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3049,7 +3049,7 @@ L_1039658:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103970c: 0x103970c: jal   0x1000f9c sw    v0, 32(sp)
+// 0x0103971c: 0x103971c: jal   0x1000f9c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3068,13 +3068,13 @@ L_1039658:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039714: 0x1039714: j	 0x10397ec lui   v0, 0x0
+// 0x01039724: 0x1039724: j	 0x10397fc lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-	br L_10397ec
+	br L_10397fc
 // --- basic block ---
-L_103971c:
-// 0x0103971c: 0x103971c: lw    v1, 48(sp)
+L_103972c:
+// 0x0103972c: 0x103972c: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3083,21 +3083,21 @@ L_103971c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039720: 0x1039720: sll   zero, zero, 0
-// 0x01039724: 0x1039724: lb    v1, 0(v1)
+// 0x01039730: 0x1039730: sll   zero, zero, 0
+// 0x01039734: 0x1039734: lb    v1, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01039728: 0x1039728: sll   zero, zero, 0
-// 0x0103972c: 0x103972c: beq   v1, zero, 0x1039784 lui   a0, 0x10000
+// 0x01039738: 0x1039738: sll   zero, zero, 0
+// 0x0103973c: 0x103973c: beq   v1, zero, 0x1039794 lui   a0, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1039784
+	brfalse L_1039794
 // --- basic block ---
-// 0x01039734: 0x1039734: jal   0x101cd60 addiu a0, a0, -10576
+// 0x01039744: 0x1039744: jal   0x101cd70 addiu a0, a0, -10580
 	ldloc.1
-	ldc.i4 -10576
+	ldc.i4 -10580
 	add
 	stloc.1
 	ldloc.0
@@ -3105,12 +3105,12 @@ L_103971c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103973c: 0x103973c: lw    v1, 76(sp)
+// 0x0103974c: 0x103974c: lw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3119,15 +3119,15 @@ L_103971c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039740: 0x1039740: lui   a0, 0x10000
+// 0x01039750: 0x1039750: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01039744: 0x1039744: addiu a0, a0, -11444
+// 0x01039754: 0x1039754: addiu a0, a0, -11448
 	ldloc.1
-	ldc.i4 -11444
+	ldc.i4 -11448
 	add
 	stloc.1
-// 0x01039748: 0x1039748: lw    s2, 56(sp)
+// 0x01039758: 0x1039758: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3136,7 +3136,7 @@ L_103971c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103974c: 0x103974c: sw    v1, 1196(sp)
+// 0x0103975c: 0x103975c: sw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3145,7 +3145,7 @@ L_103971c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01039750: 0x1039750: jal   0x101cd60 sw    v0, 1192(sp)
+// 0x01039760: 0x1039760: jal   0x101cd70 sw    v0, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3159,12 +3159,12 @@ L_103971c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039758: 0x1039758: lw    v1, 1196(sp)
+// 0x01039768: 0x1039768: lw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3173,10 +3173,10 @@ L_103971c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103975c: 0x103975c: lui   a2, 0x10000
+// 0x0103976c: 0x103976c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01039760: 0x1039760: sw    v0, 24(sp)
+// 0x01039770: 0x1039770: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3185,12 +3185,12 @@ L_103971c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01039764: 0x1039764: addiu a2, a2, -11412
+// 0x01039774: 0x1039774: addiu a2, a2, -11416
 	ldloc.3
-	ldc.i4 -11412
+	ldc.i4 -11416
 	add
 	stloc.3
-// 0x01039768: 0x1039768: lw    a3, 1192(sp)
+// 0x01039778: 0x1039778: lw    a3, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3199,12 +3199,12 @@ L_103971c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103976c: 0x103976c: addiu a0, sp, 840
+// 0x0103977c: 0x103977c: addiu a0, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
 	stloc.1
-// 0x01039770: 0x1039770: sw    s2, 16(sp)
+// 0x01039780: 0x1039780: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3213,7 +3213,7 @@ L_103971c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01039774: 0x1039774: sw    v1, 20(sp)
+// 0x01039784: 0x1039784: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3222,7 +3222,7 @@ L_103971c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01039778: 0x1039778: lw    v0, 48(sp)
+// 0x01039788: 0x1039788: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3231,24 +3231,24 @@ L_103971c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103977c: 0x103977c: j	 0x10397e0 addiu a1, zero, 350
+// 0x0103978c: 0x103978c: j	 0x10397f0 addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
-	br L_10397e0
+	br L_10397f0
 // --- basic block ---
-L_1039784:
-// 0x01039784: 0x1039784: lb    v0, 0(v0)
+L_1039794:
+// 0x01039794: 0x1039794: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01039788: 0x1039788: sll   zero, zero, 0
-// 0x0103978c: 0x103978c: beq   v0, zero, 0x10397e8 sll   zero, zero, 0
+// 0x01039798: 0x1039798: sll   zero, zero, 0
+// 0x0103979c: 0x103979c: beq   v0, zero, 0x10397f8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10397e8
+	brfalse L_10397f8
 // --- basic block ---
-// 0x01039794: 0x1039794: jal   0x101cd60 addiu a0, a0, -10576
+// 0x010397a4: 0x10397a4: jal   0x101cd70 addiu a0, a0, -10580
 	ldloc.1
-	ldc.i4 -10576
+	ldc.i4 -10580
 	add
 	stloc.1
 	ldloc.0
@@ -3256,12 +3256,12 @@ L_1039784:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103979c: 0x103979c: lw    v1, 76(sp)
+// 0x010397ac: 0x10397ac: lw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3270,15 +3270,15 @@ L_1039784:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010397a0: 0x10397a0: lui   a0, 0x10000
+// 0x010397b0: 0x10397b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010397a4: 0x10397a4: addiu a0, a0, -11444
+// 0x010397b4: 0x10397b4: addiu a0, a0, -11448
 	ldloc.1
-	ldc.i4 -11444
+	ldc.i4 -11448
 	add
 	stloc.1
-// 0x010397a8: 0x10397a8: lw    s2, 56(sp)
+// 0x010397b8: 0x10397b8: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3287,7 +3287,7 @@ L_1039784:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010397ac: 0x10397ac: sw    v1, 1196(sp)
+// 0x010397bc: 0x10397bc: sw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3296,7 +3296,7 @@ L_1039784:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010397b0: 0x10397b0: jal   0x101cd60 sw    v0, 1192(sp)
+// 0x010397c0: 0x10397c0: jal   0x101cd70 sw    v0, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3310,12 +3310,12 @@ L_1039784:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010397b8: 0x10397b8: lw    v1, 1196(sp)
+// 0x010397c8: 0x10397c8: lw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3324,10 +3324,10 @@ L_1039784:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010397bc: 0x10397bc: lui   a2, 0x10000
+// 0x010397cc: 0x10397cc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010397c0: 0x10397c0: sw    v0, 24(sp)
+// 0x010397d0: 0x10397d0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3336,7 +3336,7 @@ L_1039784:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010397c4: 0x10397c4: lw    a3, 1192(sp)
+// 0x010397d4: 0x10397d4: lw    a3, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3345,7 +3345,7 @@ L_1039784:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010397c8: 0x10397c8: lw    v0, 44(sp)
+// 0x010397d8: 0x10397d8: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3354,20 +3354,20 @@ L_1039784:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010397cc: 0x10397cc: addiu a2, a2, -11412
+// 0x010397dc: 0x10397dc: addiu a2, a2, -11416
 	ldloc.3
-	ldc.i4 -11412
+	ldc.i4 -11416
 	add
 	stloc.3
-// 0x010397d0: 0x10397d0: addiu a0, sp, 840
+// 0x010397e0: 0x10397e0: addiu a0, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
 	stloc.1
-// 0x010397d4: 0x10397d4: addiu a1, zero, 350
+// 0x010397e4: 0x10397e4: addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
-// 0x010397d8: 0x10397d8: sw    s2, 16(sp)
+// 0x010397e8: 0x10397e8: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3376,7 +3376,7 @@ L_1039784:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010397dc: 0x10397dc: sw    v1, 20(sp)
+// 0x010397ec: 0x10397ec: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3385,8 +3385,8 @@ L_1039784:
 	add
 	ldloc 7
 	stelem.i4
-L_10397e0:
-// 0x010397e0: 0x10397e0: jal   0x1000f9c sw    v0, 28(sp)
+L_10397f0:
+// 0x010397f0: 0x10397f0: jal   0x1000f9c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3405,12 +3405,12 @@ L_10397e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10397e8:
-// 0x010397e8: 0x10397e8: lui   v0, 0x0
+L_10397f8:
+// 0x010397f8: 0x10397f8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_10397ec:
-// 0x010397ec: 0x10397ec: lw    v0, 12668(v0)
+L_10397fc:
+// 0x010397fc: 0x10397fc: lw    v0, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3419,31 +3419,31 @@ L_10397ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010397f0: 0x10397f0: lui   v1, 0x10000
+// 0x01039800: 0x1039800: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010397f4: 0x10397f4: sll   v0, v0, 2
+// 0x01039804: 0x1039804: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010397f8: 0x10397f8: addu  s2, s7, zero
+// 0x01039808: 0x1039808: addu  s2, s7, zero
 	ldloc 19
 	stloc 8
-// 0x010397fc: 0x10397fc: addu  v0, v0, s1
+// 0x0103980c: 0x103980c: addu  v0, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x01039800: 0x1039800: j	 0x10399f0 addiu v1, v1, -11392
+// 0x01039810: 0x1039810: j	 0x1039a00 addiu v1, v1, -11396
 	ldloc 7
-	ldc.i4 -11392
+	ldc.i4 -11396
 	add
 	stloc 7
-	br L_10399f0
+	br L_1039a00
 // --- basic block ---
-L_1039808:
-// 0x01039808: 0x1039808: lw    a3, 56(sp)
+L_1039818:
+// 0x01039818: 0x1039818: lw    a3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3452,7 +3452,7 @@ L_1039808:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103980c: 0x103980c: lw    t1, 44(sp)
+// 0x0103981c: 0x103981c: lw    t1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3461,11 +3461,11 @@ L_1039808:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01039810: 0x1039810: lb    v0, 0(a3)
+// 0x01039820: 0x1039820: lb    v0, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01039814: 0x1039814: lw    t0, 48(sp)
+// 0x01039824: 0x1039824: lw    t0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3474,7 +3474,7 @@ L_1039808:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01039818: 0x1039818: lw    t2, 40(sp)
+// 0x01039828: 0x1039828: lw    t2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3483,26 +3483,26 @@ L_1039808:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103981c: 0x103981c: beq   v0, zero, 0x1039848 addiu a0, sp, 840
+// 0x0103982c: 0x103982c: beq   v0, zero, 0x1039858 addiu a0, sp, 840
 	ldloc 5
 	ldloc.0
 	ldc.i4 840
 	add
 	stloc.1
-	brfalse L_1039848
+	brfalse L_1039858
 // --- basic block ---
-// 0x01039824: 0x1039824: lui   a2, 0x10000
+// 0x01039834: 0x1039834: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01039828: 0x1039828: addiu a2, a2, -11376
+// 0x01039838: 0x1039838: addiu a2, a2, -11380
 	ldloc.3
-	ldc.i4 -11376
+	ldc.i4 -11380
 	add
 	stloc.3
-// 0x0103982c: 0x103982c: addiu a1, zero, 350
+// 0x0103983c: 0x103983c: addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
-// 0x01039830: 0x1039830: sw    t1, 16(sp)
+// 0x01039840: 0x1039840: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3511,7 +3511,7 @@ L_1039808:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01039834: 0x1039834: sw    t2, 20(sp)
+// 0x01039844: 0x1039844: sw    t2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3520,7 +3520,7 @@ L_1039808:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01039838: 0x1039838: jal   0x1000f9c sw    t0, 24(sp)
+// 0x01039848: 0x1039848: jal   0x1000f9c sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3539,27 +3539,27 @@ L_1039808:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039840: 0x1039840: j	 0x1039868 lui   v0, 0x0
+// 0x01039850: 0x1039850: j	 0x1039878 lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-	br L_1039868
+	br L_1039878
 // --- basic block ---
-L_1039848:
-// 0x01039848: 0x1039848: lui   a2, 0x10000
+L_1039858:
+// 0x01039858: 0x1039858: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103984c: 0x103984c: addiu a2, a2, -11372
+// 0x0103985c: 0x103985c: addiu a2, a2, -11376
 	ldloc.3
-	ldc.i4 -11372
+	ldc.i4 -11376
 	add
 	stloc.3
-// 0x01039850: 0x1039850: addu  a3, t1, zero
+// 0x01039860: 0x1039860: addu  a3, t1, zero
 	ldloc 12
 	stloc 4
-// 0x01039854: 0x1039854: addiu a1, zero, 350
+// 0x01039864: 0x1039864: addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
-// 0x01039858: 0x1039858: sw    t2, 16(sp)
+// 0x01039868: 0x1039868: sw    t2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3568,7 +3568,7 @@ L_1039848:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103985c: 0x103985c: jal   0x1000f9c sw    t0, 20(sp)
+// 0x0103986c: 0x103986c: jal   0x1000f9c sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3587,11 +3587,11 @@ L_1039848:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039864: 0x1039864: lui   v0, 0x0
+// 0x01039874: 0x1039874: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1039868:
-// 0x01039868: 0x1039868: lw    v0, 12668(v0)
+L_1039878:
+// 0x01039878: 0x1039878: lw    v0, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3600,38 +3600,38 @@ L_1039868:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103986c: 0x103986c: lui   a0, 0x10000
+// 0x0103987c: 0x103987c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01039870: 0x1039870: sll   v0, v0, 2
+// 0x01039880: 0x1039880: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01039874: 0x1039874: addu  s2, s7, zero
+// 0x01039884: 0x1039884: addu  s2, s7, zero
 	ldloc 19
 	stloc 8
-// 0x01039878: 0x1039878: addu  v0, v0, s1
+// 0x01039888: 0x1039888: addu  v0, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x0103987c: 0x103987c: j	 0x1039b20 addiu a0, a0, -11360
+// 0x0103988c: 0x103988c: j	 0x1039b30 addiu a0, a0, -11364
 	ldloc.1
-	ldc.i4 -11360
+	ldc.i4 -11364
 	add
 	stloc.1
-	br L_1039b20
+	br L_1039b30
 // --- basic block ---
-L_1039884:
-// 0x01039884: 0x1039884: bne   s0, v0, 0x10399f8 lui   v1, 0x10000
+L_1039894:
+// 0x01039894: 0x1039894: bne   s0, v0, 0x1039a08 lui   v1, 0x10000
 	ldloc 14
 	ldloc 5
 	ldc.i4 65536
 	stloc 7
-	bne.un L_10399f8
+	bne.un L_1039a08
 // --- basic block ---
-// 0x0103988c: 0x103988c: lw    v0, 40(sp)
+// 0x0103989c: 0x103989c: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3640,7 +3640,7 @@ L_1039884:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01039890: 0x1039890: lw    a3, 44(sp)
+// 0x010398a0: 0x10398a0: lw    a3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3649,7 +3649,7 @@ L_1039884:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01039894: 0x1039894: sw    v0, 16(sp)
+// 0x010398a4: 0x10398a4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3658,10 +3658,10 @@ L_1039884:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01039898: 0x1039898: lui   a2, 0x0
+// 0x010398a8: 0x10398a8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0103989c: 0x103989c: lw    v0, 48(sp)
+// 0x010398ac: 0x10398ac: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3670,20 +3670,20 @@ L_1039884:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010398a0: 0x10398a0: addiu a2, a2, 27816
+// 0x010398b0: 0x10398b0: addiu a2, a2, 27816
 	ldloc.3
 	ldc.i4 27816
 	add
 	stloc.3
-// 0x010398a4: 0x10398a4: addiu a0, sp, 84
+// 0x010398b4: 0x10398b4: addiu a0, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc.1
-// 0x010398a8: 0x10398a8: addiu a1, zero, 250
+// 0x010398b8: 0x10398b8: addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
-// 0x010398ac: 0x10398ac: sw    v1, 1196(sp)
+// 0x010398bc: 0x10398bc: sw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3692,7 +3692,7 @@ L_1039884:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010398b0: 0x10398b0: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010398c0: 0x10398c0: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3711,7 +3711,7 @@ L_1039884:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010398b8: 0x10398b8: lw    v1, 1196(sp)
+// 0x010398c8: 0x10398c8: lw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3720,7 +3720,7 @@ L_1039884:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010398bc: 0x10398bc: lw    a3, 44(sp)
+// 0x010398cc: 0x10398cc: lw    a3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3729,17 +3729,17 @@ L_1039884:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010398c0: 0x10398c0: addiu a2, v1, 19912
+// 0x010398d0: 0x10398d0: addiu a2, v1, 20332
 	ldloc 7
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010398c4: 0x10398c4: addiu a0, sp, 336
+// 0x010398d4: 0x10398d4: addiu a0, sp, 336
 	ldloc.0
 	ldc.i4 336
 	add
 	stloc.1
-// 0x010398c8: 0x10398c8: jal   0x1000f9c addiu a1, zero, 250
+// 0x010398d8: 0x10398d8: jal   0x1000f9c addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
 	ldloc.0
@@ -3752,13 +3752,13 @@ L_1039884:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010398d0: 0x10398d0: lb    v0, 84(sp)
+// 0x010398e0: 0x10398e0: lb    v0, 84(sp)
 	ldloc.0
 	ldc.i4.s 84
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010398d4: 0x10398d4: lw    v1, 1196(sp)
+// 0x010398e4: 0x10398e4: lw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3767,23 +3767,23 @@ L_1039884:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010398d8: 0x10398d8: bne   v0, zero, 0x10398f8 lui   a2, 0x10000
+// 0x010398e8: 0x10398e8: bne   v0, zero, 0x1039908 lui   a2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	brtrue L_10398f8
+	brtrue L_1039908
 // --- basic block ---
-// 0x010398e0: 0x10398e0: addiu a2, a2, -22604
+// 0x010398f0: 0x10398f0: addiu a2, a2, -22604
 	ldloc.3
 	ldc.i4 -22604
 	add
 	stloc.3
-// 0x010398e4: 0x10398e4: addiu a0, sp, 588
+// 0x010398f4: 0x10398f4: addiu a0, sp, 588
 	ldloc.0
 	ldc.i4 588
 	add
 	stloc.1
-// 0x010398e8: 0x10398e8: jal   0x1000f9c addiu a1, zero, 250
+// 0x010398f8: 0x10398f8: jal   0x1000f9c addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
 	ldloc.0
@@ -3796,26 +3796,26 @@ L_1039884:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010398f0: 0x10398f0: j	 0x1039974 sll   zero, zero, 0
-	br L_1039974
+// 0x01039900: 0x1039900: j	 0x1039984 sll   zero, zero, 0
+	br L_1039984
 // --- basic block ---
-L_10398f8:
-// 0x010398f8: 0x10398f8: lb    v0, 336(sp)
+L_1039908:
+// 0x01039908: 0x1039908: lb    v0, 336(sp)
 	ldloc.0
 	ldc.i4 336
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010398fc: 0x10398fc: sll   zero, zero, 0
-// 0x01039900: 0x1039900: bne   v0, zero, 0x1039920 addiu a2, v1, 19912
+// 0x0103990c: 0x103990c: sll   zero, zero, 0
+// 0x01039910: 0x1039910: bne   v0, zero, 0x1039930 addiu a2, v1, 20332
 	ldloc 5
 	ldloc 7
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-	brtrue L_1039920
+	brtrue L_1039930
 // --- basic block ---
-// 0x01039908: 0x1039908: lw    a3, 48(sp)
+// 0x01039918: 0x1039918: lw    a3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3824,12 +3824,12 @@ L_10398f8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103990c: 0x103990c: addiu a0, sp, 588
+// 0x0103991c: 0x103991c: addiu a0, sp, 588
 	ldloc.0
 	ldc.i4 588
 	add
 	stloc.1
-// 0x01039910: 0x1039910: jal   0x1000f9c addiu a1, zero, 250
+// 0x01039920: 0x1039920: jal   0x1000f9c addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
 	ldloc.0
@@ -3842,11 +3842,11 @@ L_10398f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039918: 0x1039918: j	 0x1039974 sll   zero, zero, 0
-	br L_1039974
+// 0x01039928: 0x1039928: j	 0x1039984 sll   zero, zero, 0
+	br L_1039984
 // --- basic block ---
-L_1039920:
-// 0x01039920: 0x1039920: jal   0x109a424 addu  a0, zero, zero
+L_1039930:
+// 0x01039930: 0x1039930: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3854,12 +3854,12 @@ L_1039920:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039928: 0x1039928: lw    t1, 44(sp)
+// 0x01039938: 0x1039938: lw    t1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3868,7 +3868,7 @@ L_1039920:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103992c: 0x103992c: lw    t0, 48(sp)
+// 0x0103993c: 0x103993c: lw    t0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3877,7 +3877,7 @@ L_1039920:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01039930: 0x1039930: lw    t2, 40(sp)
+// 0x01039940: 0x1039940: lw    t2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3886,32 +3886,32 @@ L_1039920:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01039934: 0x1039934: lui   a2, 0x10000
+// 0x01039944: 0x1039944: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01039938: 0x1039938: beq   v0, zero, 0x1039958 addiu v1, sp, 588
+// 0x01039948: 0x1039948: beq   v0, zero, 0x1039968 addiu v1, sp, 588
 	ldloc 5
 	ldloc.0
 	ldc.i4 588
 	add
 	stloc 7
-	brfalse L_1039958
+	brfalse L_1039968
 // --- basic block ---
-// 0x01039940: 0x1039940: addu  a0, v1, zero
+// 0x01039950: 0x1039950: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01039944: 0x1039944: addiu a2, a2, -11372
+// 0x01039954: 0x1039954: addiu a2, a2, -11376
 	ldloc.3
-	ldc.i4 -11372
+	ldc.i4 -11376
 	add
 	stloc.3
-// 0x01039948: 0x1039948: addu  a3, t1, zero
+// 0x01039958: 0x1039958: addu  a3, t1, zero
 	ldloc 12
 	stloc 4
-// 0x0103994c: 0x103994c: addiu a1, zero, 250
+// 0x0103995c: 0x103995c: addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
-// 0x01039950: 0x1039950: j	 0x103996c sw    t2, 16(sp)
+// 0x01039960: 0x1039960: j	 0x103997c sw    t2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3920,24 +3920,24 @@ L_1039920:
 	add
 	ldloc 13
 	stelem.i4
-	br L_103996c
+	br L_103997c
 // --- basic block ---
-L_1039958:
-// 0x01039958: 0x1039958: addu  a0, v1, zero
+L_1039968:
+// 0x01039968: 0x1039968: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0103995c: 0x103995c: addiu a2, a2, -11372
+// 0x0103996c: 0x103996c: addiu a2, a2, -11376
 	ldloc.3
-	ldc.i4 -11372
+	ldc.i4 -11376
 	add
 	stloc.3
-// 0x01039960: 0x1039960: addu  a3, t2, zero
+// 0x01039970: 0x1039970: addu  a3, t2, zero
 	ldloc 13
 	stloc 4
-// 0x01039964: 0x1039964: addiu a1, zero, 250
+// 0x01039974: 0x1039974: addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
-// 0x01039968: 0x1039968: sw    t1, 16(sp)
+// 0x01039978: 0x1039978: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3946,8 +3946,8 @@ L_1039958:
 	add
 	ldloc 12
 	stelem.i4
-L_103996c:
-// 0x0103996c: 0x103996c: jal   0x1000f9c sw    t0, 20(sp)
+L_103997c:
+// 0x0103997c: 0x103997c: jal   0x1000f9c sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3966,8 +3966,8 @@ L_103996c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1039974:
-// 0x01039974: 0x1039974: lw    a3, 56(sp)
+L_1039984:
+// 0x01039984: 0x1039984: lw    a3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3976,38 +3976,38 @@ L_1039974:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01039978: 0x1039978: lui   s2, 0x0
+// 0x01039988: 0x1039988: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0103997c: 0x103997c: lb    v0, 0(a3)
+// 0x0103998c: 0x103998c: lb    v0, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01039980: 0x1039980: addiu a0, sp, 840
+// 0x01039990: 0x1039990: addiu a0, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
 	stloc.1
-// 0x01039984: 0x1039984: beq   v0, zero, 0x10399c0 addiu v1, sp, 588
+// 0x01039994: 0x1039994: beq   v0, zero, 0x10399d0 addiu v1, sp, 588
 	ldloc 5
 	ldloc.0
 	ldc.i4 588
 	add
 	stloc 7
-	brfalse L_10399c0
+	brfalse L_10399d0
 // --- basic block ---
-// 0x0103998c: 0x103998c: lui   a2, 0x10000
+// 0x0103999c: 0x103999c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01039990: 0x1039990: addiu a2, a2, -11344
+// 0x010399a0: 0x10399a0: addiu a2, a2, -11348
 	ldloc.3
-	ldc.i4 -11344
+	ldc.i4 -11348
 	add
 	stloc.3
-// 0x01039994: 0x1039994: addiu a1, zero, 350
+// 0x010399a4: 0x10399a4: addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
-// 0x01039998: 0x1039998: jal   0x1000f9c sw    v1, 16(sp)
+// 0x010399a8: 0x10399a8: jal   0x1000f9c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4026,7 +4026,7 @@ L_1039974:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010399a0: 0x10399a0: lw    s2, 12668(s2)
+// 0x010399b0: 0x10399b0: lw    s2, 12668(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4035,7 +4035,7 @@ L_1039974:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010399a4: 0x10399a4: jal   0x103aaf4 sll   s2, s2, 2
+// 0x010399b4: 0x10399b4: jal   0x103ab04 sll   s2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
@@ -4045,46 +4045,46 @@ L_1039974:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_icon_name_103aaf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_icon_name_103ab04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010399ac: 0x10399ac: addu  s2, s1, s2
+// 0x010399bc: 0x10399bc: addu  s2, s1, s2
 	ldloc 9
 	ldloc 8
 	add
 	stloc 8
-// 0x010399b0: 0x10399b0: sw    v0, 0(s2)
+// 0x010399c0: 0x10399c0: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010399b4: 0x10399b4: lui   s2, 0x0
+// 0x010399c4: 0x10399c4: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010399b8: 0x10399b8: j	 0x1039b24 addiu s2, s2, 12620
+// 0x010399c8: 0x10399c8: j	 0x1039b34 addiu s2, s2, 12620
 	ldloc 8
 	ldc.i4 12620
 	add
 	stloc 8
-	br L_1039b24
+	br L_1039b34
 // --- basic block ---
-L_10399c0:
-// 0x010399c0: 0x10399c0: lui   a2, 0x10000
+L_10399d0:
+// 0x010399d0: 0x10399d0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010399c4: 0x10399c4: addu  a3, v1, zero
+// 0x010399d4: 0x10399d4: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x010399c8: 0x10399c8: addiu a2, a2, 19912
+// 0x010399d8: 0x10399d8: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010399cc: 0x10399cc: jal   0x1000f9c addiu a1, zero, 350
+// 0x010399dc: 0x10399dc: jal   0x1000f9c addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
 	ldloc.0
@@ -4097,7 +4097,7 @@ L_10399c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010399d4: 0x10399d4: lw    v0, 12668(s2)
+// 0x010399e4: 0x10399e4: lw    v0, 12668(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4106,49 +4106,49 @@ L_10399c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010399d8: 0x10399d8: lui   v1, 0x10000
+// 0x010399e8: 0x10399e8: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010399dc: 0x10399dc: lui   s2, 0x0
+// 0x010399ec: 0x10399ec: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010399e0: 0x10399e0: sll   v0, v0, 2
+// 0x010399f0: 0x10399f0: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010399e4: 0x10399e4: addiu s2, s2, 12620
+// 0x010399f4: 0x10399f4: addiu s2, s2, 12620
 	ldloc 8
 	ldc.i4 12620
 	add
 	stloc 8
-// 0x010399e8: 0x10399e8: addu  v0, s1, v0
+// 0x010399f8: 0x10399f8: addu  v0, s1, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x010399ec: 0x10399ec: addiu v1, v1, -12188
+// 0x010399fc: 0x10399fc: addiu v1, v1, -12192
 	ldloc 7
-	ldc.i4 -12188
+	ldc.i4 -12192
 	add
 	stloc 7
-L_10399f0:
-// 0x010399f0: 0x10399f0: j	 0x1039b24 sw    v1, 0(v0)
+L_1039a00:
+// 0x01039a00: 0x1039a00: j	 0x1039b34 sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_1039b24
+	br L_1039b34
 // --- basic block ---
-L_10399f8:
-// 0x010399f8: 0x10399f8: addiu s2, sp, 840
+L_1039a08:
+// 0x01039a08: 0x1039a08: addiu s2, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
 	stloc 8
-// 0x010399fc: 0x10399fc: lw    a3, 56(sp)
+// 0x01039a0c: 0x1039a0c: lw    a3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4157,15 +4157,15 @@ L_10399f8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01039a00: 0x1039a00: addiu a1, zero, 350
+// 0x01039a10: 0x1039a10: addiu a1, zero, 350
 	ldc.i4 350
 	stloc.2
-// 0x01039a04: 0x1039a04: addiu a2, v1, 19912
+// 0x01039a14: 0x1039a14: addiu a2, v1, 20332
 	ldloc 7
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01039a08: 0x1039a08: jal   0x1000f9c addu  a0, s2, zero
+// 0x01039a18: 0x1039a18: jal   0x1000f9c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4178,12 +4178,12 @@ L_10399f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039a10: 0x1039a10: lui   v0, 0x10000
+// 0x01039a20: 0x1039a20: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01039a14: 0x1039a14: jal   0x101cd60 addiu a0, v0, -11336
+// 0x01039a24: 0x1039a24: jal   0x101cd70 addiu a0, v0, -11340
 	ldloc 5
-	ldc.i4 -11336
+	ldc.i4 -11340
 	add
 	stloc.1
 	ldloc.0
@@ -4191,15 +4191,15 @@ L_10399f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039a1c: 0x1039a1c: addu  a1, v0, zero
+// 0x01039a2c: 0x1039a2c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01039a20: 0x1039a20: jal   0x1001b14 addu  a0, s2, zero
+// 0x01039a30: 0x1039a30: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4207,21 +4207,21 @@ L_10399f8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039a28: 0x1039a28: beq   v0, zero, 0x1039a60 lui   v0, 0x0
+// 0x01039a38: 0x1039a38: beq   v0, zero, 0x1039a70 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1039a60
+	brfalse L_1039a70
 // --- basic block ---
-// 0x01039a30: 0x1039a30: lui   a1, 0x10000
+// 0x01039a40: 0x1039a40: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039a34: 0x1039a34: addu  a0, s2, zero
+// 0x01039a44: 0x1039a44: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01039a38: 0x1039a38: jal   0x1001b14 addiu a1, a1, -11328
+// 0x01039a48: 0x1039a48: jal   0x1001b14 addiu a1, a1, -11332
 	ldloc.2
-	ldc.i4 -11328
+	ldc.i4 -11332
 	add
 	stloc.2
 	ldloc.1
@@ -4229,21 +4229,21 @@ L_10399f8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039a40: 0x1039a40: beq   v0, zero, 0x1039a60 lui   v0, 0x0
+// 0x01039a50: 0x1039a50: beq   v0, zero, 0x1039a70 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1039a60
+	brfalse L_1039a70
 // --- basic block ---
-// 0x01039a48: 0x1039a48: lui   v1, 0x10000
+// 0x01039a58: 0x1039a58: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01039a4c: 0x1039a4c: addiu a1, v1, -11336
+// 0x01039a5c: 0x1039a5c: addiu a1, v1, -11340
 	ldloc 7
-	ldc.i4 -11336
+	ldc.i4 -11340
 	add
 	stloc.2
-// 0x01039a50: 0x1039a50: jal   0x1001b14 addu  a0, s2, zero
+// 0x01039a60: 0x1039a60: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4251,14 +4251,14 @@ L_10399f8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039a58: 0x1039a58: bne   v0, zero, 0x1039a7c lui   v0, 0x0
+// 0x01039a68: 0x1039a68: bne   v0, zero, 0x1039a8c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1039a7c
+	brtrue L_1039a8c
 // --- basic block ---
-L_1039a60:
-// 0x01039a60: 0x1039a60: lw    s4, 12668(v0)
+L_1039a70:
+// 0x01039a70: 0x1039a70: lw    s4, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4267,36 +4267,36 @@ L_1039a60:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01039a64: 0x1039a64: lui   a0, 0x10000
+// 0x01039a74: 0x1039a74: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01039a68: 0x1039a68: sll   v0, s4, 2
+// 0x01039a78: 0x1039a78: sll   v0, s4, 2
 	ldloc 15
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01039a6c: 0x1039a6c: addu  s2, s8, zero
+// 0x01039a7c: 0x1039a7c: addu  s2, s8, zero
 	ldloc 17
 	stloc 8
-// 0x01039a70: 0x1039a70: addu  v0, v0, s1
+// 0x01039a80: 0x1039a80: addu  v0, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x01039a74: 0x1039a74: j	 0x1039b20 addiu a0, a0, -11328
+// 0x01039a84: 0x1039a84: j	 0x1039b30 addiu a0, a0, -11332
 	ldloc.1
-	ldc.i4 -11328
+	ldc.i4 -11332
 	add
 	stloc.1
-	br L_1039b20
+	br L_1039b30
 // --- basic block ---
-L_1039a7c:
-// 0x01039a7c: 0x1039a7c: lui   a0, 0x10000
+L_1039a8c:
+// 0x01039a8c: 0x1039a8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01039a80: 0x1039a80: jal   0x101cd60 addiu a0, a0, -11320
+// 0x01039a90: 0x1039a90: jal   0x101cd70 addiu a0, a0, -11324
 	ldloc.1
-	ldc.i4 -11320
+	ldc.i4 -11324
 	add
 	stloc.1
 	ldloc.0
@@ -4304,15 +4304,15 @@ L_1039a7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039a88: 0x1039a88: addu  a1, v0, zero
+// 0x01039a98: 0x1039a98: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01039a8c: 0x1039a8c: jal   0x1001b14 addu  a0, s2, zero
+// 0x01039a9c: 0x1039a9c: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4320,21 +4320,21 @@ L_1039a7c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039a94: 0x1039a94: beq   v0, zero, 0x1039ae8 lui   v0, 0x0
+// 0x01039aa4: 0x1039aa4: beq   v0, zero, 0x1039af8 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1039ae8
+	brfalse L_1039af8
 // --- basic block ---
-// 0x01039a9c: 0x1039a9c: lui   a1, 0x10000
+// 0x01039aac: 0x1039aac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039aa0: 0x1039aa0: addiu a1, a1, -11312
+// 0x01039ab0: 0x1039ab0: addiu a1, a1, -11316
 	ldloc.2
-	ldc.i4 -11312
+	ldc.i4 -11316
 	add
 	stloc.2
-// 0x01039aa4: 0x1039aa4: jal   0x1001b14 addu  a0, s2, zero
+// 0x01039ab4: 0x1039ab4: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4342,21 +4342,21 @@ L_1039a7c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039aac: 0x1039aac: beq   v0, zero, 0x1039ae8 lui   v0, 0x0
+// 0x01039abc: 0x1039abc: beq   v0, zero, 0x1039af8 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1039ae8
+	brfalse L_1039af8
 // --- basic block ---
-// 0x01039ab4: 0x1039ab4: lui   a1, 0x10000
+// 0x01039ac4: 0x1039ac4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039ab8: 0x1039ab8: addu  a0, s2, zero
+// 0x01039ac8: 0x1039ac8: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01039abc: 0x1039abc: jal   0x1001b14 addiu a1, a1, -11304
+// 0x01039acc: 0x1039acc: jal   0x1001b14 addiu a1, a1, -11308
 	ldloc.2
-	ldc.i4 -11304
+	ldc.i4 -11308
 	add
 	stloc.2
 	ldloc.1
@@ -4364,21 +4364,21 @@ L_1039a7c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039ac4: 0x1039ac4: beq   v0, zero, 0x1039ae8 lui   v0, 0x0
+// 0x01039ad4: 0x1039ad4: beq   v0, zero, 0x1039af8 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1039ae8
+	brfalse L_1039af8
 // --- basic block ---
-// 0x01039acc: 0x1039acc: lui   a1, 0x10000
+// 0x01039adc: 0x1039adc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039ad0: 0x1039ad0: addiu a1, a1, -11320
+// 0x01039ae0: 0x1039ae0: addiu a1, a1, -11324
 	ldloc.2
-	ldc.i4 -11320
+	ldc.i4 -11324
 	add
 	stloc.2
-// 0x01039ad4: 0x1039ad4: jal   0x1001b14 addiu a0, sp, 840
+// 0x01039ae4: 0x1039ae4: jal   0x1001b14 addiu a0, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
@@ -4388,17 +4388,17 @@ L_1039a7c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01039adc: 0x1039adc: bne   v0, zero, 0x1039b04 lui   a0, 0x10000
+// 0x01039aec: 0x1039aec: bne   v0, zero, 0x1039b14 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_1039b04
+	brtrue L_1039b14
 // --- basic block ---
-// 0x01039ae4: 0x1039ae4: lui   v0, 0x0
+// 0x01039af4: 0x1039af4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1039ae8:
-// 0x01039ae8: 0x1039ae8: lw    s3, 12668(v0)
+L_1039af8:
+// 0x01039af8: 0x1039af8: lw    s3, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4407,34 +4407,34 @@ L_1039ae8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01039aec: 0x1039aec: lui   v1, 0x10000
+// 0x01039afc: 0x1039afc: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01039af0: 0x1039af0: sll   v0, s3, 2
+// 0x01039b00: 0x1039b00: sll   v0, s3, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01039af4: 0x1039af4: addu  s2, s8, zero
+// 0x01039b04: 0x1039b04: addu  s2, s8, zero
 	ldloc 17
 	stloc 8
-// 0x01039af8: 0x1039af8: addu  v0, v0, s1
+// 0x01039b08: 0x1039b08: addu  v0, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x01039afc: 0x1039afc: j	 0x10399f0 addiu v1, v1, -11304
+// 0x01039b0c: 0x1039b0c: j	 0x1039a00 addiu v1, v1, -11308
 	ldloc 7
-	ldc.i4 -11304
+	ldc.i4 -11308
 	add
 	stloc 7
-	br L_10399f0
+	br L_1039a00
 // --- basic block ---
-L_1039b04:
-// 0x01039b04: 0x1039b04: lui   v0, 0x0
+L_1039b14:
+// 0x01039b14: 0x1039b14: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01039b08: 0x1039b08: lw    v0, 12668(v0)
+// 0x01039b18: 0x1039b18: lw    v0, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4443,38 +4443,38 @@ L_1039b04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01039b0c: 0x1039b0c: sll   zero, zero, 0
-// 0x01039b10: 0x1039b10: sll   v0, v0, 2
+// 0x01039b1c: 0x1039b1c: sll   zero, zero, 0
+// 0x01039b20: 0x1039b20: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01039b14: 0x1039b14: addu  s2, s8, zero
+// 0x01039b24: 0x1039b24: addu  s2, s8, zero
 	ldloc 17
 	stloc 8
-// 0x01039b18: 0x1039b18: addu  v0, v0, s1
+// 0x01039b28: 0x1039b28: addu  v0, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x01039b1c: 0x1039b1c: addiu a0, a0, -11296
+// 0x01039b2c: 0x1039b2c: addiu a0, a0, -11300
 	ldloc.1
-	ldc.i4 -11296
+	ldc.i4 -11300
 	add
 	stloc.1
-L_1039b20:
-// 0x01039b20: 0x1039b20: sw    a0, 0(v0)
+L_1039b30:
+// 0x01039b30: 0x1039b30: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-L_1039b24:
-// 0x01039b24: 0x1039b24: lui   v0, 0x0
+L_1039b34:
+// 0x01039b34: 0x1039b34: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01039b28: 0x1039b28: lw    v0, 12668(v0)
+// 0x01039b38: 0x1039b38: lw    v0, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4483,39 +4483,39 @@ L_1039b24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01039b2c: 0x1039b2c: lui   v1, 0x60000
+// 0x01039b3c: 0x1039b3c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01039b30: 0x1039b30: sll   v0, v0, 2
+// 0x01039b40: 0x1039b40: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01039b34: 0x1039b34: addiu v1, v1, -14136
+// 0x01039b44: 0x1039b44: addiu v1, v1, -13672
 	ldloc 7
-	ldc.i4 -14136
+	ldc.i4 -13672
 	add
 	stloc 7
-// 0x01039b38: 0x1039b38: addu  v0, v0, v1
+// 0x01039b48: 0x1039b48: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01039b3c: 0x1039b3c: lw    a0, 0(v0)
+// 0x01039b4c: 0x1039b4c: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01039b40: 0x1039b40: sll   zero, zero, 0
-// 0x01039b44: 0x1039b44: beq   a0, zero, 0x1039b58 lui   v1, 0x0
+// 0x01039b50: 0x1039b50: sll   zero, zero, 0
+// 0x01039b54: 0x1039b54: beq   a0, zero, 0x1039b68 lui   v1, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1039b58
+	brfalse L_1039b68
 // --- basic block ---
-// 0x01039b4c: 0x1039b4c: jal   0x1000930 sll   zero, zero, 0
+// 0x01039b5c: 0x1039b5c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4526,11 +4526,11 @@ L_1039b24:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039b54: 0x1039b54: lui   v1, 0x0
+// 0x01039b64: 0x1039b64: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-L_1039b58:
-// 0x01039b58: 0x1039b58: lw    a1, 12668(v1)
+L_1039b68:
+// 0x01039b68: 0x1039b68: lw    a1, 12668(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4539,12 +4539,12 @@ L_1039b58:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01039b5c: 0x1039b5c: addiu a0, sp, 840
+// 0x01039b6c: 0x1039b6c: addiu a0, sp, 840
 	ldloc.0
 	ldc.i4 840
 	add
 	stloc.1
-// 0x01039b60: 0x1039b60: sw    v1, 1196(sp)
+// 0x01039b70: 0x1039b70: sw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4553,7 +4553,7 @@ L_1039b58:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01039b64: 0x1039b64: jal   0x1001ba8 sw    a1, 1192(sp)
+// 0x01039b74: 0x1039b74: jal   0x1001ba8 sw    a1, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4572,7 +4572,7 @@ L_1039b58:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039b6c: 0x1039b6c: lw    v1, 1196(sp)
+// 0x01039b7c: 0x1039b7c: lw    v1, 1196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4581,10 +4581,10 @@ L_1039b58:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039b70: 0x1039b70: lui   a2, 0x60000
+// 0x01039b80: 0x1039b80: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01039b74: 0x1039b74: lw    a3, 12668(v1)
+// 0x01039b84: 0x1039b84: lw    a3, 12668(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4593,7 +4593,7 @@ L_1039b58:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01039b78: 0x1039b78: lw    a1, 1192(sp)
+// 0x01039b88: 0x1039b88: lw    a1, 1192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4602,65 +4602,65 @@ L_1039b58:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01039b7c: 0x1039b7c: sll   a0, a3, 2
+// 0x01039b8c: 0x1039b8c: sll   a0, a3, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01039b80: 0x1039b80: addiu a2, a2, -14536
+// 0x01039b90: 0x1039b90: addiu a2, a2, -14072
 	ldloc.3
-	ldc.i4 -14536
+	ldc.i4 -14072
 	add
 	stloc.3
-// 0x01039b84: 0x1039b84: addu  a2, a0, a2
+// 0x01039b94: 0x1039b94: addu  a2, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc.3
-// 0x01039b88: 0x1039b88: lui   a0, 0x60000
+// 0x01039b98: 0x1039b98: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01039b8c: 0x1039b8c: sll   a1, a1, 2
+// 0x01039b9c: 0x1039b9c: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01039b90: 0x1039b90: addiu a0, a0, -14136
+// 0x01039ba0: 0x1039ba0: addiu a0, a0, -13672
 	ldloc.1
-	ldc.i4 -14136
+	ldc.i4 -13672
 	add
 	stloc.1
-// 0x01039b94: 0x1039b94: addu  t0, a1, a0
+// 0x01039ba4: 0x1039ba4: addu  t0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc 11
-// 0x01039b98: 0x1039b98: addiu a3, a3, 1
+// 0x01039ba8: 0x1039ba8: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01039b9c: 0x1039b9c: addu  a0, s0, zero
+// 0x01039bac: 0x1039bac: addu  a0, s0, zero
 	ldloc 14
 	stloc.1
-// 0x01039ba0: 0x1039ba0: addu  a1, s5, zero
+// 0x01039bb0: 0x1039bb0: addu  a1, s5, zero
 	ldloc 16
 	stloc.2
-// 0x01039ba4: 0x1039ba4: sw    v0, 0(t0)
+// 0x01039bb4: 0x1039bb4: sw    v0, 0(t0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01039ba8: 0x1039ba8: sw    s5, 0(a2)
+// 0x01039bb8: 0x1039bb8: sw    s5, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 16
 	stelem.i4
-// 0x01039bac: 0x1039bac: jal   0x1037788 sw    a3, 12668(v1)
+// 0x01039bbc: 0x1039bbc: jal   0x1037798 sw    a3, 12668(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4672,27 +4672,27 @@ L_1039b58:
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl40::roadmap_history_before_1037788(int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_before_1037798(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039bb4: 0x1039bb4: beq   v0, s5, 0x1039bdc sll   zero, zero, 0
+// 0x01039bc4: 0x1039bc4: beq   v0, s5, 0x1039bec sll   zero, zero, 0
 	ldloc 5
 	ldloc 16
-	beq  L_1039bdc
+	beq  L_1039bec
 // --- basic block ---
-// 0x01039bbc: 0x1039bbc: addu  s5, v0, zero
+// 0x01039bcc: 0x1039bcc: addu  s5, v0, zero
 	ldloc 5
 	stloc 16
-L_1039bc0:
-// 0x01039bc0: 0x1039bc0: beq   s5, zero, 0x1039bdc lui   v0, 0x0
+L_1039bd0:
+// 0x01039bd0: 0x1039bd0: beq   s5, zero, 0x1039bec lui   v0, 0x0
 	ldloc 16
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1039bdc
+	brfalse L_1039bec
 // --- basic block ---
-// 0x01039bc8: 0x1039bc8: lw    v0, 12668(v0)
+// 0x01039bd8: 0x1039bd8: lw    v0, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4701,356 +4701,356 @@ L_1039bc0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01039bcc: 0x1039bcc: sll   zero, zero, 0
-// 0x01039bd0: 0x1039bd0: slti  v0, v0, 100
+// 0x01039bdc: 0x1039bdc: sll   zero, zero, 0
+// 0x01039be0: 0x1039be0: slti  v0, v0, 100
 	ldloc 5
 	ldc.i4.s 100
 	clt
 	stloc 5
-// 0x01039bd4: 0x1039bd4: bne   v0, zero, 0x1039658 addu  a0, s0, zero
+// 0x01039be4: 0x1039be4: bne   v0, zero, 0x1039668 addu  a0, s0, zero
 	ldloc 5
 	ldloc 14
 	stloc.1
-	brtrue L_1039658
+	brtrue L_1039668
 // --- basic block ---
-L_1039bdc:
-// 0x01039bdc: 0x1039bdc: addiu v0, zero, 70
+L_1039bec:
+// 0x01039bec: 0x1039bec: addiu v0, zero, 70
 	ldc.i4.s 70
 	stloc 5
-// 0x01039be0: 0x1039be0: bne   s0, v0, 0x1039cd4 lui   v0, 0x0
+// 0x01039bf0: 0x1039bf0: bne   s0, v0, 0x1039ce4 lui   v0, 0x0
 	ldloc 14
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1039cd4
+	bne.un L_1039ce4
 // --- basic block ---
-// 0x01039be8: 0x1039be8: addiu v0, zero, -1
+// 0x01039bf8: 0x1039bf8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01039bec: 0x1039bec: beq   s4, v0, 0x1039c48 lui   a0, 0x60000
+// 0x01039bfc: 0x1039bfc: beq   s4, v0, 0x1039c58 lui   a0, 0x60000
 	ldloc 15
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	beq  L_1039c48
+	beq  L_1039c58
 // --- basic block ---
-// 0x01039bf4: 0x1039bf4: lui   v1, 0x60000
+// 0x01039c04: 0x1039c04: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01039bf8: 0x1039bf8: lui   v0, 0x60000
+// 0x01039c08: 0x1039c08: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01039bfc: 0x1039bfc: sll   a1, s4, 2
+// 0x01039c0c: 0x1039c0c: sll   a1, s4, 2
 	ldloc 15
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01039c00: 0x1039c00: addiu t0, v1, -14136
+// 0x01039c10: 0x1039c10: addiu t0, v1, -13672
 	ldloc 7
-	ldc.i4 -14136
+	ldc.i4 -13672
 	add
 	stloc 11
-// 0x01039c04: 0x1039c04: addiu a3, a0, -14536
+// 0x01039c14: 0x1039c14: addiu a3, a0, -14072
 	ldloc.1
-	ldc.i4 -14536
+	ldc.i4 -14072
 	add
 	stloc 4
-// 0x01039c08: 0x1039c08: addiu a2, v0, -14936
+// 0x01039c18: 0x1039c18: addiu a2, v0, -14472
 	ldloc 5
-	ldc.i4 -14936
+	ldc.i4 -14472
 	add
 	stloc.3
-// 0x01039c0c: 0x1039c0c: addu  a2, a2, a1
+// 0x01039c1c: 0x1039c1c: addu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.3
-// 0x01039c10: 0x1039c10: addu  a3, a3, a1
+// 0x01039c20: 0x1039c20: addu  a3, a3, a1
 	ldloc 4
 	ldloc.2
 	add
 	stloc 4
-// 0x01039c14: 0x1039c14: addu  a1, t0, a1
+// 0x01039c24: 0x1039c24: addu  a1, t0, a1
 	ldloc 11
 	ldloc.2
 	add
 	stloc.2
-// 0x01039c18: 0x1039c18: lw    t2, 0(a3)
+// 0x01039c28: 0x1039c28: lw    t2, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x01039c1c: 0x1039c1c: lw    t1, 0(a1)
+// 0x01039c2c: 0x1039c2c: lw    t1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x01039c20: 0x1039c20: lw    t0, 0(a2)
+// 0x01039c30: 0x1039c30: lw    t0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01039c24: 0x1039c24: lw    t5, -14536(a0)
+// 0x01039c34: 0x1039c34: lw    t5, -14072(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3634
+	ldc.i4 -3518
 	add
 	ldelem.i4
 	stloc 23
-// 0x01039c28: 0x1039c28: lw    t4, -14136(v1)
+// 0x01039c38: 0x1039c38: lw    t4, -13672(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3534
+	ldc.i4 -3418
 	add
 	ldelem.i4
 	stloc 21
-// 0x01039c2c: 0x1039c2c: lw    t3, -14936(v0)
+// 0x01039c3c: 0x1039c3c: lw    t3, -14472(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3734
+	ldc.i4 -3618
 	add
 	ldelem.i4
 	stloc 20
-// 0x01039c30: 0x1039c30: sw    t5, 0(a3)
+// 0x01039c40: 0x1039c40: sw    t5, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 23
 	stelem.i4
-// 0x01039c34: 0x1039c34: sw    t4, 0(a1)
+// 0x01039c44: 0x1039c44: sw    t4, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 21
 	stelem.i4
-// 0x01039c38: 0x1039c38: sw    t3, 0(a2)
+// 0x01039c48: 0x1039c48: sw    t3, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 20
 	stelem.i4
-// 0x01039c3c: 0x1039c3c: sw    t2, -14536(a0)
+// 0x01039c4c: 0x1039c4c: sw    t2, -14072(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3634
+	ldc.i4 -3518
 	add
 	ldloc 13
 	stelem.i4
-// 0x01039c40: 0x1039c40: sw    t1, -14136(v1)
+// 0x01039c50: 0x1039c50: sw    t1, -13672(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3534
+	ldc.i4 -3418
 	add
 	ldloc 12
 	stelem.i4
-// 0x01039c44: 0x1039c44: sw    t0, -14936(v0)
+// 0x01039c54: 0x1039c54: sw    t0, -14472(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3734
+	ldc.i4 -3618
 	add
 	ldloc 11
 	stelem.i4
-L_1039c48:
-// 0x01039c48: 0x1039c48: addiu v1, zero, -1
+L_1039c58:
+// 0x01039c58: 0x1039c58: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01039c4c: 0x1039c4c: beq   s3, v1, 0x1039cd0 sll   zero, zero, 0
+// 0x01039c5c: 0x1039c5c: beq   s3, v1, 0x1039ce0 sll   zero, zero, 0
 	ldloc 10
 	ldloc 7
-	beq  L_1039cd0
+	beq  L_1039ce0
 // --- basic block ---
-// 0x01039c54: 0x1039c54: beq   s4, v1, 0x1039c68 addu  v0, zero, zero
+// 0x01039c64: 0x1039c64: beq   s4, v1, 0x1039c78 addu  v0, zero, zero
 	ldloc 15
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1039c68
+	beq  L_1039c78
 // --- basic block ---
-// 0x01039c5c: 0x1039c5c: bne   s3, zero, 0x1039c68 addiu v0, zero, 1
+// 0x01039c6c: 0x1039c6c: bne   s3, zero, 0x1039c78 addiu v0, zero, 1
 	ldloc 10
 	ldc.i4.1
 	stloc 5
-	brtrue L_1039c68
+	brtrue L_1039c78
 // --- basic block ---
-// 0x01039c64: 0x1039c64: addu  s3, s4, zero
+// 0x01039c74: 0x1039c74: addu  s3, s4, zero
 	ldloc 15
 	stloc 10
-L_1039c68:
-// 0x01039c68: 0x1039c68: lui   a2, 0x60000
+L_1039c78:
+// 0x01039c78: 0x1039c78: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01039c6c: 0x1039c6c: lui   a3, 0x60000
+// 0x01039c7c: 0x1039c7c: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01039c70: 0x1039c70: lui   a1, 0x60000
+// 0x01039c80: 0x1039c80: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01039c74: 0x1039c74: sll   s3, s3, 2
+// 0x01039c84: 0x1039c84: sll   s3, s3, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x01039c78: 0x1039c78: sll   v0, v0, 2
+// 0x01039c88: 0x1039c88: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01039c7c: 0x1039c7c: addiu a3, a3, -14136
+// 0x01039c8c: 0x1039c8c: addiu a3, a3, -13672
 	ldloc 4
-	ldc.i4 -14136
+	ldc.i4 -13672
 	add
 	stloc 4
-// 0x01039c80: 0x1039c80: addiu a2, a2, -14536
+// 0x01039c90: 0x1039c90: addiu a2, a2, -14072
 	ldloc.3
-	ldc.i4 -14536
+	ldc.i4 -14072
 	add
 	stloc.3
-// 0x01039c84: 0x1039c84: addiu a1, a1, -14936
+// 0x01039c94: 0x1039c94: addiu a1, a1, -14472
 	ldloc.2
-	ldc.i4 -14936
+	ldc.i4 -14472
 	add
 	stloc.2
-// 0x01039c88: 0x1039c88: addu  v1, a1, v0
+// 0x01039c98: 0x1039c98: addu  v1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 7
-// 0x01039c8c: 0x1039c8c: addu  a0, a2, v0
+// 0x01039c9c: 0x1039c9c: addu  a0, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc.1
-// 0x01039c90: 0x1039c90: addu  a1, a1, s3
+// 0x01039ca0: 0x1039ca0: addu  a1, a1, s3
 	ldloc.2
 	ldloc 10
 	add
 	stloc.2
-// 0x01039c94: 0x1039c94: addu  v0, a3, v0
+// 0x01039ca4: 0x1039ca4: addu  v0, a3, v0
 	ldloc 4
 	ldloc 5
 	add
 	stloc 5
-// 0x01039c98: 0x1039c98: addu  a2, a2, s3
+// 0x01039ca8: 0x1039ca8: addu  a2, a2, s3
 	ldloc.3
 	ldloc 10
 	add
 	stloc.3
-// 0x01039c9c: 0x1039c9c: addu  s3, a3, s3
+// 0x01039cac: 0x1039cac: addu  s3, a3, s3
 	ldloc 4
 	ldloc 10
 	add
 	stloc 10
-// 0x01039ca0: 0x1039ca0: lw    t1, 0(a2)
+// 0x01039cb0: 0x1039cb0: lw    t1, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x01039ca4: 0x1039ca4: lw    t4, 0(a0)
+// 0x01039cb4: 0x1039cb4: lw    t4, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 21
-// 0x01039ca8: 0x1039ca8: lw    t0, 0(s3)
+// 0x01039cb8: 0x1039cb8: lw    t0, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01039cac: 0x1039cac: lw    t3, 0(v0)
+// 0x01039cbc: 0x1039cbc: lw    t3, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 20
-// 0x01039cb0: 0x1039cb0: lw    a3, 0(a1)
+// 0x01039cc0: 0x1039cc0: lw    a3, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01039cb4: 0x1039cb4: lw    t2, 0(v1)
+// 0x01039cc4: 0x1039cc4: lw    t2, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x01039cb8: 0x1039cb8: sw    t4, 0(a2)
+// 0x01039cc8: 0x1039cc8: sw    t4, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 21
 	stelem.i4
-// 0x01039cbc: 0x1039cbc: sw    t3, 0(s3)
+// 0x01039ccc: 0x1039ccc: sw    t3, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 20
 	stelem.i4
-// 0x01039cc0: 0x1039cc0: sw    t2, 0(a1)
+// 0x01039cd0: 0x1039cd0: sw    t2, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-// 0x01039cc4: 0x1039cc4: sw    t1, 0(a0)
+// 0x01039cd4: 0x1039cd4: sw    t1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x01039cc8: 0x1039cc8: sw    t0, 0(v0)
+// 0x01039cd8: 0x1039cd8: sw    t0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x01039ccc: 0x1039ccc: sw    a3, 0(v1)
+// 0x01039cdc: 0x1039cdc: sw    a3, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-L_1039cd0:
-// 0x01039cd0: 0x1039cd0: lui   v0, 0x0
+L_1039ce0:
+// 0x01039ce0: 0x1039ce0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1039cd4:
-// 0x01039cd4: 0x1039cd4: lw    v1, 12668(v0)
+L_1039ce4:
+// 0x01039ce4: 0x1039ce4: lw    v1, 12668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5059,109 +5059,109 @@ L_1039cd4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01039cd8: 0x1039cd8: sll   zero, zero, 0
-// 0x01039cdc: 0x1039cdc: bne   v1, zero, 0x1039d00 lui   t2, 0x60000
+// 0x01039ce8: 0x1039ce8: sll   zero, zero, 0
+// 0x01039cec: 0x1039cec: bne   v1, zero, 0x1039d10 lui   t2, 0x60000
 	ldloc 7
 	ldc.i4 393216
 	stloc 13
-	brtrue L_1039d00
+	brtrue L_1039d10
 // --- basic block ---
-// 0x01039ce4: 0x1039ce4: lui   v1, 0x10000
+// 0x01039cf4: 0x1039cf4: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01039ce8: 0x1039ce8: addiu v1, v1, -11284
+// 0x01039cf8: 0x1039cf8: addiu v1, v1, -11288
 	ldloc 7
-	ldc.i4 -11284
+	ldc.i4 -11288
 	add
 	stloc 7
-// 0x01039cec: 0x1039cec: cibyl_sysc_arg 0x16
+// 0x01039cfc: 0x1039cfc: cibyl_sysc_arg 0x16
 	ldloc 18
-// 0x01039cf0: 0x1039cf0: cibyl_sysc_arg 0x3
+// 0x01039d00: 0x1039d00: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01039cf4: 0x1039cf4: cibyl_sysc 0x5b9
+// 0x01039d04: 0x1039d04: cibyl_sysc 0x5b9
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_showDialogNoItems(int32,int32)
-// 0x01039cf8: 0x1039cf8: j	 0x1039d60 addu  s6, v0, zero
+// 0x01039d08: 0x1039d08: j	 0x1039d70 addu  s6, v0, zero
 	ldloc 5
 	stloc 18
-	br L_1039d60
+	br L_1039d70
 // --- basic block ---
-L_1039d00:
-// 0x01039d00: 0x1039d00: lui   t1, 0x0
+L_1039d10:
+// 0x01039d10: 0x1039d10: lui   t1, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01039d04: 0x1039d04: lui   a3, 0x60000
+// 0x01039d14: 0x1039d14: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x01039d08: 0x1039d08: lui   a2, 0x60000
+// 0x01039d18: 0x1039d18: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01039d0c: 0x1039d0c: lui   a1, 0x60000
+// 0x01039d1c: 0x1039d1c: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01039d10: 0x1039d10: lui   a0, 0x1040000
+// 0x01039d20: 0x1039d20: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01039d14: 0x1039d14: addiu t2, t2, -13736
+// 0x01039d24: 0x1039d24: addiu t2, t2, -13272
 	ldloc 13
-	ldc.i4 -13736
+	ldc.i4 -13272
 	add
 	stloc 13
-// 0x01039d18: 0x1039d18: addiu t1, t1, 12596
+// 0x01039d28: 0x1039d28: addiu t1, t1, 12596
 	ldloc 12
 	ldc.i4 12596
 	add
 	stloc 12
-// 0x01039d1c: 0x1039d1c: addiu t0, zero, 6
+// 0x01039d2c: 0x1039d2c: addiu t0, zero, 6
 	ldc.i4.6
 	stloc 11
-// 0x01039d20: 0x1039d20: addiu a3, a3, -14936
+// 0x01039d30: 0x1039d30: addiu a3, a3, -14472
 	ldloc 4
-	ldc.i4 -14936
+	ldc.i4 -14472
 	add
 	stloc 4
-// 0x01039d24: 0x1039d24: addiu a2, a2, -14536
+// 0x01039d34: 0x1039d34: addiu a2, a2, -14072
 	ldloc.3
-	ldc.i4 -14536
+	ldc.i4 -14072
 	add
 	stloc.3
-// 0x01039d28: 0x1039d28: addiu a1, a1, -14136
+// 0x01039d38: 0x1039d38: addiu a1, a1, -13672
 	ldloc.2
-	ldc.i4 -14136
+	ldc.i4 -13672
 	add
 	stloc.2
-// 0x01039d2c: 0x1039d2c: addiu a0, a0, -22896
+// 0x01039d3c: 0x1039d3c: addiu a0, a0, -22880
 	ldloc.1
-	ldc.i4 -22896
+	ldc.i4 -22880
 	add
 	stloc.1
-// 0x01039d30: 0x1039d30: cibyl_sysc_arg 0x16
+// 0x01039d40: 0x1039d40: cibyl_sysc_arg 0x16
 	ldloc 18
-// 0x01039d34: 0x1039d34: cibyl_sysc_arg 0x4
+// 0x01039d44: 0x1039d44: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01039d38: 0x1039d38: cibyl_sysc_arg 0x3
+// 0x01039d48: 0x1039d48: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01039d3c: 0x1039d3c: cibyl_sysc_arg 0x5
+// 0x01039d4c: 0x1039d4c: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01039d40: 0x1039d40: cibyl_sysc_arg 0x6
+// 0x01039d50: 0x1039d50: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01039d44: 0x1039d44: cibyl_sysc_arg 0x7
+// 0x01039d54: 0x1039d54: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01039d48: 0x1039d48: cibyl_sysc_arg 0x8
+// 0x01039d58: 0x1039d58: cibyl_sysc_arg 0x8
 	ldloc 11
-// 0x01039d4c: 0x1039d4c: cibyl_sysc_arg 0x12
+// 0x01039d5c: 0x1039d5c: cibyl_sysc_arg 0x12
 	ldloc 8
-// 0x01039d50: 0x1039d50: cibyl_sysc_arg 0x9
+// 0x01039d60: 0x1039d60: cibyl_sysc_arg 0x9
 	ldloc 12
-// 0x01039d54: 0x1039d54: cibyl_sysc_arg 0xa
+// 0x01039d64: 0x1039d64: cibyl_sysc_arg 0xa
 	ldloc 13
-// 0x01039d58: 0x1039d58: cibyl_sysc 0x5e3
+// 0x01039d68: 0x1039d68: cibyl_sysc 0x5e3
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_showDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x01039d5c: 0x1039d5c: addu  s6, v0, zero
+// 0x01039d6c: 0x1039d6c: addu  s6, v0, zero
 	ldloc 5
 	stloc 18
-L_1039d60:
-// 0x01039d60: 0x1039d60: lw    ra, 1236(sp)
-// 0x01039d64: 0x1039d64: lw    s8, 1232(sp)
+L_1039d70:
+// 0x01039d70: 0x1039d70: lw    ra, 1236(sp)
+// 0x01039d74: 0x1039d74: lw    s8, 1232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5170,7 +5170,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01039d68: 0x1039d68: lw    s7, 1228(sp)
+// 0x01039d78: 0x1039d78: lw    s7, 1228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5179,7 +5179,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01039d6c: 0x1039d6c: lw    s6, 1224(sp)
+// 0x01039d7c: 0x1039d7c: lw    s6, 1224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5188,7 +5188,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01039d70: 0x1039d70: lw    s5, 1220(sp)
+// 0x01039d80: 0x1039d80: lw    s5, 1220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5197,7 +5197,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01039d74: 0x1039d74: lw    s4, 1216(sp)
+// 0x01039d84: 0x1039d84: lw    s4, 1216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5206,7 +5206,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01039d78: 0x1039d78: lw    s3, 1212(sp)
+// 0x01039d88: 0x1039d88: lw    s3, 1212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5215,7 +5215,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01039d7c: 0x1039d7c: lw    s2, 1208(sp)
+// 0x01039d8c: 0x1039d8c: lw    s2, 1208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5224,7 +5224,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01039d80: 0x1039d80: lw    s1, 1204(sp)
+// 0x01039d90: 0x1039d90: lw    s1, 1204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5233,7 +5233,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01039d84: 0x1039d84: lw    s0, 1200(sp)
+// 0x01039d94: 0x1039d94: lw    s0, 1200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5242,7 +5242,7 @@ L_1039d60:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01039d88: 0x1039d88: jr    ra addiu sp, sp, 1240
+// 0x01039d98: 0x1039d98: jr    ra addiu sp, sp, 1240
 	ldloc.0
 	ldc.i4 1240
 	add
@@ -5254,7 +5254,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 search_menu_my_saved_places_1039db8(int32,int32,int32,int32,int32)
+.method public static int32 search_menu_my_saved_places_1039dc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5289,42 +5289,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1039db8:
-// 0x01039db8: 0x1039db8: lui   v0, 0x20000
+L_1039dc8:
+// 0x01039dc8: 0x1039dc8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01039dbc: 0x1039dbc: lw    a0, 27392(v0)
+// 0x01039dcc: 0x1039dcc: lw    a0, 27856(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6848
+	ldc.i4 6964
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039dc0: 0x1039dc0: addiu sp, sp, -24
+// 0x01039dd0: 0x1039dd0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01039dc4: 0x1039dc4: addu  a1, zero, zero
+// 0x01039dd4: 0x1039dd4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01039dc8: 0x1039dc8: sw    ra, 20(sp)
-// 0x01039dcc: 0x1039dcc: jal   0x104bfdc addu  a2, zero, zero
+// 0x01039dd8: 0x1039dd8: sw    ra, 20(sp)
+// 0x01039ddc: 0x1039ddc: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01039dd4: 0x1039dd4: lui   a1, 0x10000
+// 0x01039de4: 0x1039de4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039dd8: 0x1039dd8: addiu a1, a1, -18204
+// 0x01039de8: 0x1039de8: addiu a1, a1, -18204
 	ldloc.2
 	ldc.i4 -18204
 	add
 	stloc.2
-// 0x01039ddc: 0x1039ddc: jal   0x1039598 addiu a0, zero, 83
+// 0x01039dec: 0x1039dec: jal   0x10395a8 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -5332,14 +5332,14 @@ L_1039db8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::roadmap_search_history_1039598(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::roadmap_search_history_10395a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039de4: 0x1039de4: lw    ra, 20(sp)
-// 0x01039de8: 0x1039de8: sll   zero, zero, 0
-// 0x01039dec: 0x1039dec: jr    ra addiu sp, sp, 24
+// 0x01039df4: 0x1039df4: lw    ra, 20(sp)
+// 0x01039df8: 0x1039df8: sll   zero, zero, 0
+// 0x01039dfc: 0x1039dfc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5351,7 +5351,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 search_menu_search_favorites_1039df4(int32,int32,int32,int32,int32)
+.method public static int32 search_menu_search_favorites_1039e04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5386,42 +5386,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1039df4:
-// 0x01039df4: 0x1039df4: lui   v0, 0x20000
+L_1039e04:
+// 0x01039e04: 0x1039e04: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01039df8: 0x1039df8: lw    a0, 27396(v0)
+// 0x01039e08: 0x1039e08: lw    a0, 27860(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6849
+	ldc.i4 6965
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039dfc: 0x1039dfc: addiu sp, sp, -24
+// 0x01039e0c: 0x1039e0c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01039e00: 0x1039e00: addu  a1, zero, zero
+// 0x01039e10: 0x1039e10: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01039e04: 0x1039e04: sw    ra, 20(sp)
-// 0x01039e08: 0x1039e08: jal   0x104bfdc addu  a2, zero, zero
+// 0x01039e14: 0x1039e14: sw    ra, 20(sp)
+// 0x01039e18: 0x1039e18: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01039e10: 0x1039e10: lui   a1, 0x10000
+// 0x01039e20: 0x1039e20: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039e14: 0x1039e14: addiu a1, a1, -18412
+// 0x01039e24: 0x1039e24: addiu a1, a1, -18412
 	ldloc.2
 	ldc.i4 -18412
 	add
 	stloc.2
-// 0x01039e18: 0x1039e18: jal   0x1039598 addiu a0, zero, 70
+// 0x01039e28: 0x1039e28: jal   0x10395a8 addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
@@ -5429,14 +5429,14 @@ L_1039df4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::roadmap_search_history_1039598(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::roadmap_search_history_10395a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039e20: 0x1039e20: lw    ra, 20(sp)
-// 0x01039e24: 0x1039e24: sll   zero, zero, 0
-// 0x01039e28: 0x1039e28: jr    ra addiu sp, sp, 24
+// 0x01039e30: 0x1039e30: lw    ra, 20(sp)
+// 0x01039e34: 0x1039e34: sll   zero, zero, 0
+// 0x01039e38: 0x1039e38: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5448,7 +5448,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 search_menu_search_history_1039e30(int32,int32,int32,int32,int32)
+.method public static int32 search_menu_search_history_1039e40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5483,42 +5483,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1039e30:
-// 0x01039e30: 0x1039e30: lui   v0, 0x20000
+L_1039e40:
+// 0x01039e40: 0x1039e40: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01039e34: 0x1039e34: lw    a0, 27400(v0)
+// 0x01039e44: 0x1039e44: lw    a0, 27864(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6850
+	ldc.i4 6966
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039e38: 0x1039e38: addiu sp, sp, -24
+// 0x01039e48: 0x1039e48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01039e3c: 0x1039e3c: addu  a1, zero, zero
+// 0x01039e4c: 0x1039e4c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01039e40: 0x1039e40: sw    ra, 20(sp)
-// 0x01039e44: 0x1039e44: jal   0x104bfdc addu  a2, zero, zero
+// 0x01039e50: 0x1039e50: sw    ra, 20(sp)
+// 0x01039e54: 0x1039e54: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x01039e4c: 0x1039e4c: lui   a1, 0x10000
+// 0x01039e5c: 0x1039e5c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01039e50: 0x1039e50: addiu a1, a1, -18428
+// 0x01039e60: 0x1039e60: addiu a1, a1, -18428
 	ldloc.2
 	ldc.i4 -18428
 	add
 	stloc.2
-// 0x01039e54: 0x1039e54: jal   0x1039598 addiu a0, zero, 65
+// 0x01039e64: 0x1039e64: jal   0x10395a8 addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
 	ldloc.0
@@ -5526,14 +5526,14 @@ L_1039e30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::roadmap_search_history_1039598(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::roadmap_search_history_10395a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039e5c: 0x1039e5c: lw    ra, 20(sp)
-// 0x01039e60: 0x1039e60: sll   zero, zero, 0
-// 0x01039e64: 0x1039e64: jr    ra addiu sp, sp, 24
+// 0x01039e6c: 0x1039e6c: lw    ra, 20(sp)
+// 0x01039e70: 0x1039e70: sll   zero, zero, 0
+// 0x01039e74: 0x1039e74: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5545,7 +5545,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 hide_our_dialogs_1039e6c(int32,int32,int32,int32,int32)
+.method public static int32 hide_our_dialogs_1039e7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -5580,23 +5580,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01039e6c: 0x1039e6c: addiu sp, sp, -32
+// 0x01039e7c: 0x1039e7c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01039e70: 0x1039e70: sw    ra, 28(sp)
-// 0x01039e74: 0x1039e74: addiu v1, zero, 1
+// 0x01039e80: 0x1039e80: sw    ra, 28(sp)
+// 0x01039e84: 0x1039e84: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01039e78: 0x1039e78: cibyl_sysc_arg 0x3
+// 0x01039e88: 0x1039e88: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01039e7c: 0x1039e7c: cibyl_sysc 0x606
+// 0x01039e8c: 0x1039e8c: cibyl_sysc 0x606
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_closeDialog(int32)
-// 0x01039e80: 0x1039e80: addu  v1, v0, zero
+// 0x01039e90: 0x1039e90: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x01039e84: 0x1039e84: jal   0x102146c sw    a0, 16(sp)
+// 0x01039e94: 0x1039e94: jal   0x102147c sw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5610,15 +5610,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01039e8c: 0x1039e8c: lui   a0, 0x10000
+// 0x01039e9c: 0x1039e9c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01039e90: 0x1039e90: jal   0x1096d98 addiu a0, a0, -18728
+// 0x01039ea0: 0x1039ea0: jal   0x10973e0 addiu a0, a0, -18728
 	ldloc.1
 	ldc.i4 -18728
 	add
@@ -5628,12 +5628,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_hide_1096d98(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_hide_10973e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01039e98: 0x1039e98: lw    a1, 16(sp)
+// 0x01039ea8: 0x1039ea8: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5642,12 +5642,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01039e9c: 0x1039e9c: lui   a0, 0x10000
+// 0x01039eac: 0x1039eac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01039ea0: 0x1039ea0: jal   0x1094884 addiu a0, a0, -11236
+// 0x01039eb0: 0x1039eb0: jal   0x1094ff4 addiu a0, a0, -11240
 	ldloc.1
-	ldc.i4 -11236
+	ldc.i4 -11240
 	add
 	stloc.1
 	ldloc.0
@@ -5655,14 +5655,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01039ea8: 0x1039ea8: lw    ra, 28(sp)
-// 0x01039eac: 0x1039eac: sll   zero, zero, 0
-// 0x01039eb0: 0x1039eb0: jr    ra addiu sp, sp, 32
+// 0x01039eb8: 0x1039eb8: lw    ra, 28(sp)
+// 0x01039ebc: 0x1039ebc: sll   zero, zero, 0
+// 0x01039ec0: 0x1039ec0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5674,7 +5674,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_erase_history_item_1039eb8(int32,int32,int32,int32,int32)
+.method public static int32 on_erase_history_item_1039ec8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -5712,15 +5712,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01039eb8: 0x1039eb8: addiu sp, sp, -72
+// 0x01039ec8: 0x1039ec8: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01039ebc: 0x1039ebc: addiu v0, zero, 3
+// 0x01039ecc: 0x1039ecc: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01039ec0: 0x1039ec0: sw    s0, 64(sp)
+// 0x01039ed0: 0x1039ed0: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5729,37 +5729,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01039ec4: 0x1039ec4: sw    ra, 68(sp)
-// 0x01039ec8: 0x1039ec8: bne   a0, v0, 0x1039f48 addu  s0, a1, zero
+// 0x01039ed4: 0x1039ed4: sw    ra, 68(sp)
+// 0x01039ed8: 0x1039ed8: bne   a0, v0, 0x1039f58 addu  s0, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 8
-	bne.un L_1039f48
+	bne.un L_1039f58
 // --- basic block ---
-// 0x01039ed0: 0x1039ed0: lw    v0, 0(a1)
+// 0x01039ee0: 0x1039ee0: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01039ed4: 0x1039ed4: addiu v1, zero, 70
+// 0x01039ee4: 0x1039ee4: addiu v1, zero, 70
 	ldc.i4.s 70
 	stloc 7
-// 0x01039ed8: 0x1039ed8: lb    v0, 0(v0)
+// 0x01039ee8: 0x1039ee8: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01039edc: 0x1039edc: sll   zero, zero, 0
-// 0x01039ee0: 0x1039ee0: bne   v0, v1, 0x1039efc addiu v1, zero, 83
+// 0x01039eec: 0x1039eec: sll   zero, zero, 0
+// 0x01039ef0: 0x1039ef0: bne   v0, v1, 0x1039f0c addiu v1, zero, 83
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 83
 	stloc 7
-	bne.un L_1039efc
+	bne.un L_1039f0c
 // --- basic block ---
-// 0x01039ee8: 0x1039ee8: lw    a0, 4(a1)
+// 0x01039ef8: 0x1039ef8: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5768,27 +5768,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039eec: 0x1039eec: jal   0x106cb40 sll   zero, zero, 0
+// 0x01039efc: 0x1039efc: jal   0x106d164 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_TripServer_DeletePOI_106cb40(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TripServer_DeletePOI_106d164(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039ef4: 0x1039ef4: j	 0x1039f14 sll   zero, zero, 0
-	br L_1039f14
+// 0x01039f04: 0x1039f04: j	 0x1039f24 sll   zero, zero, 0
+	br L_1039f24
 // --- basic block ---
-L_1039efc:
-// 0x01039efc: 0x1039efc: bne   v0, v1, 0x1039f14 sll   zero, zero, 0
+L_1039f0c:
+// 0x01039f0c: 0x1039f0c: bne   v0, v1, 0x1039f24 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1039f14
+	bne.un L_1039f24
 // --- basic block ---
-// 0x01039f04: 0x1039f04: lw    a1, 8(a1)
+// 0x01039f14: 0x1039f14: lw    a1, 8(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5797,10 +5797,10 @@ L_1039efc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01039f08: 0x1039f08: addiu a0, zero, 83
+// 0x01039f18: 0x1039f18: addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
-// 0x01039f0c: 0x1039f0c: jal   0x1037c10 addiu a2, sp, 16
+// 0x01039f1c: 0x1039f1c: jal   0x1037c20 addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5810,13 +5810,13 @@ L_1039efc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1039f14:
-// 0x01039f14: 0x1039f14: lw    a0, 8(s0)
+L_1039f24:
+// 0x01039f24: 0x1039f24: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5825,29 +5825,29 @@ L_1039f14:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039f18: 0x1039f18: jal   0x1037a90 sll   zero, zero, 0
+// 0x01039f28: 0x1039f28: jal   0x1037aa0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_delete_entry_1037a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_delete_entry_1037aa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039f20: 0x1039f20: jal   0x103788c sll   zero, zero, 0
+// 0x01039f30: 0x1039f30: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039f28: 0x1039f28: jal   0x1039e6c addiu a0, zero, 1
+// 0x01039f38: 0x1039f38: jal   0x1039e7c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -5855,20 +5855,20 @@ L_1039f14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::hide_our_dialogs_1039e6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::hide_our_dialogs_1039e7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01039f30: 0x1039f30: lw    v0, 0(s0)
+// 0x01039f40: 0x1039f40: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01039f34: 0x1039f34: sll   zero, zero, 0
-// 0x01039f38: 0x1039f38: lw    a1, 4(v0)
+// 0x01039f44: 0x1039f44: sll   zero, zero, 0
+// 0x01039f48: 0x1039f48: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5877,24 +5877,24 @@ L_1039f14:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01039f3c: 0x1039f3c: lb    a0, 0(v0)
+// 0x01039f4c: 0x1039f4c: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01039f40: 0x1039f40: jal   0x1039598 sll   zero, zero, 0
+// 0x01039f50: 0x1039f50: jal   0x10395a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::roadmap_search_history_1039598(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::roadmap_search_history_10395a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1039f48:
-// 0x01039f48: 0x1039f48: lw    ra, 68(sp)
-// 0x01039f4c: 0x1039f4c: lw    s0, 64(sp)
+L_1039f58:
+// 0x01039f58: 0x1039f58: lw    ra, 68(sp)
+// 0x01039f5c: 0x1039f5c: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5903,7 +5903,7 @@ L_1039f48:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01039f50: 0x1039f50: jr    ra addiu sp, sp, 72
+// 0x01039f60: 0x1039f60: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -5915,7 +5915,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 keyboard_callback_1039f58(int32,int32,int32,int32,int32)
+.method public static int32 keyboard_callback_1039f68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5953,15 +5953,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01039f58: 0x1039f58: addiu sp, sp, -336
+// 0x01039f68: 0x1039f68: addiu sp, sp, -336
 	ldloc.0
 	ldc.i4 -336
 	add
 	stloc.0
-// 0x01039f5c: 0x1039f5c: addiu v0, zero, 1
+// 0x01039f6c: 0x1039f6c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01039f60: 0x1039f60: sw    s0, 328(sp)
+// 0x01039f70: 0x1039f70: sw    s0, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5970,22 +5970,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01039f64: 0x1039f64: sw    ra, 332(sp)
-// 0x01039f68: 0x1039f68: bne   a0, v0, 0x103a018 addu  s0, a1, zero
+// 0x01039f74: 0x1039f74: sw    ra, 332(sp)
+// 0x01039f78: 0x1039f78: bne   a0, v0, 0x103a028 addu  s0, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 7
-	bne.un L_103a018
+	bne.un L_103a028
 // --- basic block ---
-// 0x01039f70: 0x1039f70: lw    v0, 0(a2)
+// 0x01039f80: 0x1039f80: lw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01039f74: 0x1039f74: lw    a1, 8(a2)
+// 0x01039f84: 0x1039f84: lw    a1, 8(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -5994,11 +5994,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01039f78: 0x1039f78: lb    a0, 0(v0)
+// 0x01039f88: 0x1039f88: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01039f7c: 0x1039f7c: jal   0x1037c10 addiu a2, sp, 32
+// 0x01039f8c: 0x1039f8c: jal   0x1037c20 addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6008,28 +6008,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039f84: 0x1039f84: lb    v0, 0(s0)
+// 0x01039f94: 0x1039f94: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01039f88: 0x1039f88: sll   zero, zero, 0
-// 0x01039f8c: 0x1039f8c: bne   v0, zero, 0x1039fbc lui   a1, 0x10000
+// 0x01039f98: 0x1039f98: sll   zero, zero, 0
+// 0x01039f9c: 0x1039f9c: bne   v0, zero, 0x1039fcc lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1039fbc
+	brtrue L_1039fcc
 // --- basic block ---
-// 0x01039f94: 0x1039f94: addiu s0, sp, 76
+// 0x01039fa4: 0x1039fa4: addiu s0, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 7
-// 0x01039f98: 0x1039f98: lw    v0, 40(sp)
+// 0x01039fa8: 0x1039fa8: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6038,7 +6038,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01039f9c: 0x1039f9c: lw    a2, 36(sp)
+// 0x01039fac: 0x1039fac: lw    a2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6047,7 +6047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01039fa0: 0x1039fa0: lw    a3, 32(sp)
+// 0x01039fb0: 0x1039fb0: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6056,15 +6056,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01039fa4: 0x1039fa4: addiu a1, a1, 9028
+// 0x01039fb4: 0x1039fb4: addiu a1, a1, 9024
 	ldloc.2
-	ldc.i4 9028
+	ldc.i4 9024
 	add
 	stloc.2
-// 0x01039fa8: 0x1039fa8: addu  a0, s0, zero
+// 0x01039fb8: 0x1039fb8: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01039fac: 0x1039fac: jal   0x1000f64 sw    v0, 16(sp)
+// 0x01039fbc: 0x1039fbc: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6083,13 +6083,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039fb4: 0x1039fb4: j	 0x1039fdc lui   v0, 0x10000
+// 0x01039fc4: 0x1039fc4: j	 0x1039fec lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-	br L_1039fdc
+	br L_1039fec
 // --- basic block ---
-L_1039fbc:
-// 0x01039fbc: 0x1039fbc: lw    a0, 52(sp)
+L_1039fcc:
+// 0x01039fcc: 0x1039fcc: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6098,7 +6098,7 @@ L_1039fbc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039fc0: 0x1039fc0: jal   0x1000d8c sll   zero, zero, 0
+// 0x01039fd0: 0x1039fd0: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6109,7 +6109,7 @@ L_1039fbc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039fc8: 0x1039fc8: lw    a0, 56(sp)
+// 0x01039fd8: 0x1039fd8: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6118,7 +6118,7 @@ L_1039fbc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01039fcc: 0x1039fcc: jal   0x1000d8c sw    v0, 28(sp)
+// 0x01039fdc: 0x1039fdc: jal   0x1000d8c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6137,7 +6137,7 @@ L_1039fbc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039fd4: 0x1039fd4: sw    v0, 24(sp)
+// 0x01039fe4: 0x1039fe4: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6146,24 +6146,24 @@ L_1039fbc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01039fd8: 0x1039fd8: lui   v0, 0x10000
+// 0x01039fe8: 0x1039fe8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-L_1039fdc:
-// 0x01039fdc: 0x1039fdc: addiu v0, v0, -25260
+L_1039fec:
+// 0x01039fec: 0x1039fec: addiu v0, v0, -25260
 	ldloc 5
 	ldc.i4 -25260
 	add
 	stloc 5
-// 0x01039fe0: 0x1039fe0: addiu a0, zero, 70
+// 0x01039ff0: 0x1039ff0: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x01039fe4: 0x1039fe4: addiu a1, sp, 32
+// 0x01039ff4: 0x1039ff4: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01039fe8: 0x1039fe8: sw    v0, 60(sp)
+// 0x01039ff8: 0x1039ff8: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6172,7 +6172,7 @@ L_1039fdc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01039fec: 0x1039fec: jal   0x103822c sw    s0, 48(sp)
+// 0x01039ffc: 0x1039ffc: jal   0x103823c sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6186,39 +6186,39 @@ L_1039fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039ff4: 0x1039ff4: jal   0x103788c sll   zero, zero, 0
+// 0x0103a004: 0x103a004: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01039ffc: 0x1039ffc: lb    v0, 0(s0)
+// 0x0103a00c: 0x103a00c: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a000: 0x103a000: sll   zero, zero, 0
-// 0x0103a004: 0x103a004: beq   v0, zero, 0x103a018 addu  a0, s0, zero
+// 0x0103a010: 0x103a010: sll   zero, zero, 0
+// 0x0103a014: 0x103a014: beq   v0, zero, 0x103a028 addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_103a018
+	brfalse L_103a028
 // --- basic block ---
-// 0x0103a00c: 0x103a00c: addiu a1, sp, 24
+// 0x0103a01c: 0x103a01c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0103a010: 0x103a010: jal   0x10a9eec addiu a2, zero, 1
+// 0x0103a020: 0x103a020: jal   0x10aa534 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -6226,17 +6226,17 @@ L_1039fdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_trip_server_create_poi_10a9eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_trip_server_create_poi_10aa534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_103a018:
-// 0x0103a018: 0x103a018: lw    ra, 332(sp)
-// 0x0103a01c: 0x103a01c: addiu v0, zero, 1
+L_103a028:
+// 0x0103a028: 0x103a028: lw    ra, 332(sp)
+// 0x0103a02c: 0x103a02c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103a020: 0x103a020: lw    s0, 328(sp)
+// 0x0103a030: 0x103a030: lw    s0, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6245,7 +6245,7 @@ L_103a018:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103a024: 0x103a024: jr    ra addiu sp, sp, 336
+// 0x0103a034: 0x103a034: jr    ra addiu sp, sp, 336
 	ldloc.0
 	ldc.i4 336
 	add
@@ -6257,7 +6257,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_97_103a02c(int32,int32,int32,int32,int32)
+.method public static int32 T_97_103a03c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -6295,13 +6295,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103a02c: 0x103a02c: addiu sp, sp, -32
+// 0x0103a03c: 0x103a03c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103a030: 0x103a030: sw    ra, 28(sp)
-// 0x0103a034: 0x103a034: sw    s0, 24(sp)
+// 0x0103a040: 0x103a040: sw    ra, 28(sp)
+// 0x0103a044: 0x103a044: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6310,7 +6310,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a038: 0x103a038: jal   0x1000910 sw    a0, 16(sp)
+// 0x0103a048: 0x103a048: jal   0x1000910 sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6329,7 +6329,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103a040: 0x103a040: lw    a2, 16(sp)
+// 0x0103a050: 0x103a050: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6338,13 +6338,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103a044: 0x103a044: addu  a0, v0, zero
+// 0x0103a054: 0x103a054: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0103a048: 0x103a048: addu  a1, zero, zero
+// 0x0103a058: 0x103a058: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103a04c: 0x103a04c: jal   0x100177c addu  s0, v0, zero
+// 0x0103a05c: 0x103a05c: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -6356,11 +6356,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103a054: 0x103a054: lw    ra, 28(sp)
-// 0x0103a058: 0x103a058: addu  v0, s0, zero
+// 0x0103a064: 0x103a064: lw    ra, 28(sp)
+// 0x0103a068: 0x103a068: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0103a05c: 0x103a05c: lw    s0, 24(sp)
+// 0x0103a06c: 0x103a06c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6369,7 +6369,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103a060: 0x103a060: jr    ra addiu sp, sp, 32
+// 0x0103a070: 0x103a070: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6381,7 +6381,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_address_show_103a068(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_address_show_103a078(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 s3,int32 s5,int32 s7,int32 t2,int32 s6,int32 hi,int32 lo,int32 t0,int32 t1,int32 ra,int32 t3)
@@ -6458,12 +6458,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103a068: 0x103a068: addiu sp, sp, -832
+// 0x0103a078: 0x103a078: addiu sp, sp, -832
 	ldloc.0
 	ldc.i4 -832
 	add
 	stloc.0
-// 0x0103a06c: 0x103a06c: sw    s0, 796(sp)
+// 0x0103a07c: 0x103a07c: sw    s0, 796(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6472,7 +6472,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103a070: 0x103a070: lw    s0, 848(sp)
+// 0x0103a080: 0x103a080: lw    s0, 848(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6481,7 +6481,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103a074: 0x103a074: sw    s6, 820(sp)
+// 0x0103a084: 0x103a084: sw    s6, 820(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6490,7 +6490,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0103a078: 0x103a078: sw    s5, 816(sp)
+// 0x0103a088: 0x103a088: sw    s5, 816(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6499,7 +6499,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103a07c: 0x103a07c: sw    s3, 808(sp)
+// 0x0103a08c: 0x103a08c: sw    s3, 808(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6508,7 +6508,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103a080: 0x103a080: sw    s2, 804(sp)
+// 0x0103a090: 0x103a090: sw    s2, 804(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6517,7 +6517,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103a084: 0x103a084: sw    s1, 800(sp)
+// 0x0103a094: 0x103a094: sw    s1, 800(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6526,8 +6526,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103a088: 0x103a088: sw    ra, 828(sp)
-// 0x0103a08c: 0x103a08c: sw    s7, 824(sp)
+// 0x0103a098: 0x103a098: sw    ra, 828(sp)
+// 0x0103a09c: 0x103a09c: sw    s7, 824(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6536,7 +6536,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103a090: 0x103a090: sw    s4, 812(sp)
+// 0x0103a0a0: 0x103a0a0: sw    s4, 812(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6545,16 +6545,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103a094: 0x103a094: addu  s1, a0, zero
+// 0x0103a0a4: 0x103a0a4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103a098: 0x103a098: addu  s2, a1, zero
+// 0x0103a0a8: 0x103a0a8: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0103a09c: 0x103a09c: addu  s3, a2, zero
+// 0x0103a0ac: 0x103a0ac: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x0103a0a0: 0x103a0a0: sw    zero, 40(sp)
+// 0x0103a0b0: 0x103a0b0: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6563,7 +6563,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103a0a4: 0x103a0a4: sw    a3, 60(sp)
+// 0x0103a0b4: 0x103a0b4: sw    a3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6572,7 +6572,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0103a0a8: 0x103a0a8: sw    zero, 64(sp)
+// 0x0103a0b8: 0x103a0b8: sw    zero, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6581,7 +6581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103a0ac: 0x103a0ac: sw    a0, 68(sp)
+// 0x0103a0bc: 0x103a0bc: sw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6590,7 +6590,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103a0b0: 0x103a0b0: sw    a1, 72(sp)
+// 0x0103a0c0: 0x103a0c0: sw    a1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6599,7 +6599,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103a0b4: 0x103a0b4: sw    a2, 76(sp)
+// 0x0103a0c4: 0x103a0c4: sw    a2, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6608,7 +6608,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103a0b8: 0x103a0b8: lw    s6, 852(sp)
+// 0x0103a0c8: 0x103a0c8: lw    s6, 852(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6617,13 +6617,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0103a0bc: 0x103a0bc: beq   s0, zero, 0x103a0e4 addu  s5, a3, zero
+// 0x0103a0cc: 0x103a0cc: beq   s0, zero, 0x103a0f4 addu  s5, a3, zero
 	ldloc 8
 	ldloc 4
 	stloc 13
-	brfalse L_103a0e4
+	brfalse L_103a0f4
 // --- basic block ---
-// 0x0103a0c4: 0x103a0c4: lw    v0, 4(s0)
+// 0x0103a0d4: 0x103a0d4: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6632,44 +6632,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a0c8: 0x103a0c8: sll   zero, zero, 0
-// 0x0103a0cc: 0x103a0cc: beq   v0, zero, 0x103a0e8 addiu a0, sp, 40
+// 0x0103a0d8: 0x103a0d8: sll   zero, zero, 0
+// 0x0103a0dc: 0x103a0dc: beq   v0, zero, 0x103a0f8 addiu a0, sp, 40
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	brfalse L_103a0e8
+	brfalse L_103a0f8
 // --- basic block ---
-// 0x0103a0d4: 0x103a0d4: lw    v0, 0(s0)
+// 0x0103a0e4: 0x103a0e4: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103a0d8: 0x103a0d8: sll   zero, zero, 0
-// 0x0103a0dc: 0x103a0dc: bne   v0, zero, 0x103a10c sll   zero, zero, 0
+// 0x0103a0e8: 0x103a0e8: sll   zero, zero, 0
+// 0x0103a0ec: 0x103a0ec: bne   v0, zero, 0x103a11c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103a10c
+	brtrue L_103a11c
 // --- basic block ---
-L_103a0e4:
-// 0x0103a0e4: 0x103a0e4: addiu a0, sp, 40
+L_103a0f4:
+// 0x0103a0f4: 0x103a0f4: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-L_103a0e8:
-// 0x0103a0e8: 0x103a0e8: addu  a1, s3, zero
+L_103a0f8:
+// 0x0103a0f8: 0x103a0f8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x0103a0ec: 0x103a0ec: addu  a2, s2, zero
+// 0x0103a0fc: 0x103a0fc: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x0103a0f0: 0x103a0f0: addu  a3, s1, zero
+// 0x0103a100: 0x103a100: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0103a0f4: 0x103a0f4: jal   0x103742c sw    s5, 16(sp)
+// 0x0103a104: 0x103a104: jal   0x103743c sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6683,26 +6683,26 @@ L_103a0e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_geocode_address_103742c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_geocode_address_103743c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a0fc: 0x103a0fc: bgtz  v0, 0x103a39c addu  s4, v0, zero
+// 0x0103a10c: 0x103a10c: bgtz  v0, 0x103a3ac addu  s4, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
 	ldc.i4.s 0
-	bgt L_103a39c
+	bgt L_103a3ac
 // --- basic block ---
-// 0x0103a104: 0x103a104: beq   s0, zero, 0x103a238 lui   a0, 0x60000
+// 0x0103a114: 0x103a114: beq   s0, zero, 0x103a248 lui   a0, 0x60000
 	ldloc 8
 	ldc.i4 393216
 	stloc.1
-	brfalse L_103a238
+	brfalse L_103a248
 // --- basic block ---
-L_103a10c:
-// 0x0103a10c: 0x103a10c: lw    v0, 4(s0)
+L_103a11c:
+// 0x0103a11c: 0x103a11c: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6711,30 +6711,30 @@ L_103a10c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a110: 0x103a110: sll   zero, zero, 0
-// 0x0103a114: 0x103a114: beq   v0, zero, 0x103a238 lui   a0, 0x60000
+// 0x0103a120: 0x103a120: sll   zero, zero, 0
+// 0x0103a124: 0x103a124: beq   v0, zero, 0x103a248 lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	brfalse L_103a238
+	brfalse L_103a248
 // --- basic block ---
-// 0x0103a11c: 0x103a11c: lw    v0, 0(s0)
+// 0x0103a12c: 0x103a12c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103a120: 0x103a120: sll   zero, zero, 0
-// 0x0103a124: 0x103a124: beq   v0, zero, 0x103a238 addiu s4, sp, 272
+// 0x0103a130: 0x103a130: sll   zero, zero, 0
+// 0x0103a134: 0x103a134: beq   v0, zero, 0x103a248 addiu s4, sp, 272
 	ldloc 5
 	ldloc.0
 	ldc.i4 272
 	add
 	stloc 11
-	brfalse L_103a238
+	brfalse L_103a248
 // --- basic block ---
-// 0x0103a12c: 0x103a12c: jal   0x103a02c addiu a0, zero, 24
+// 0x0103a13c: 0x103a13c: jal   0x103a03c addiu a0, zero, 24
 	ldc.i4.s 24
 	stloc.1
 	ldloc.0
@@ -6742,18 +6742,18 @@ L_103a10c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::T_97_103a02c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::T_97_103a03c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a134: 0x103a134: addu  a0, s4, zero
+// 0x0103a144: 0x103a144: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x0103a138: 0x103a138: addiu a1, zero, 128
+// 0x0103a148: 0x103a148: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0103a13c: 0x103a13c: jal   0x1010058 sw    v0, 40(sp)
+// 0x0103a14c: 0x103a14c: jal   0x1010068 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6766,18 +6766,18 @@ L_103a10c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a144: 0x103a144: addu  a0, s0, zero
+// 0x0103a154: 0x103a154: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103a148: 0x103a148: addiu a1, zero, 20
+// 0x0103a158: 0x103a158: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0103a14c: 0x103a14c: jal   0x10086bc sw    v0, 784(sp)
+// 0x0103a15c: 0x103a15c: jal   0x10086cc sw    v0, 784(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6791,12 +6791,12 @@ L_103a10c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a154: 0x103a154: lw    v0, 784(sp)
+// 0x0103a164: 0x103a164: lw    v0, 784(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6805,27 +6805,27 @@ L_103a10c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a158: 0x103a158: addiu v1, sp, 176
+// 0x0103a168: 0x103a168: addiu v1, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc 7
-// 0x0103a15c: 0x103a15c: addu  a2, s4, zero
+// 0x0103a16c: 0x103a16c: addu  a2, s4, zero
 	ldloc 11
 	stloc.3
-// 0x0103a160: 0x103a160: addu  a3, v0, zero
+// 0x0103a170: 0x103a170: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0103a164: 0x103a164: addu  a0, s0, zero
+// 0x0103a174: 0x103a174: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103a168: 0x103a168: addiu v0, zero, 1
+// 0x0103a178: 0x103a178: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103a16c: 0x103a16c: addu  a1, zero, zero
+// 0x0103a17c: 0x103a17c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103a170: 0x103a170: sw    v1, 20(sp)
+// 0x0103a180: 0x103a180: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6834,7 +6834,7 @@ L_103a10c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a174: 0x103a174: sw    v0, 24(sp)
+// 0x0103a184: 0x103a184: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6843,7 +6843,7 @@ L_103a10c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a178: 0x103a178: jal   0x1013028 sw    v0, 16(sp)
+// 0x0103a188: 0x103a188: jal   0x1013038 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6857,12 +6857,12 @@ L_103a10c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a180: 0x103a180: lw    a0, 4(s0)
+// 0x0103a190: 0x103a190: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6871,14 +6871,14 @@ L_103a10c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a184: 0x103a184: lw    v1, 0(s0)
+// 0x0103a194: 0x103a194: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0103a188: 0x103a188: lw    s4, 40(sp)
+// 0x0103a198: 0x103a198: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6887,14 +6887,14 @@ L_103a10c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103a18c: 0x103a18c: blez  v0, 0x103a20c lui   v0, 0x0
+// 0x0103a19c: 0x103a19c: blez  v0, 0x103a21c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	ble L_103a20c
+	ble L_103a21c
 // --- basic block ---
-// 0x0103a194: 0x103a194: sw    v1, 16(s4)
+// 0x0103a1a4: 0x103a1a4: sw    v1, 16(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6903,7 +6903,7 @@ L_103a10c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a198: 0x103a198: sw    a0, 20(s4)
+// 0x0103a1a8: 0x103a1a8: sw    a0, 20(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6912,7 +6912,7 @@ L_103a10c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103a19c: 0x103a19c: lw    v0, 576(v0)
+// 0x0103a1ac: 0x103a1ac: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6921,7 +6921,7 @@ L_103a10c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a1a0: 0x103a1a0: lw    a0, 188(sp)
+// 0x0103a1b0: 0x103a1b0: lw    a0, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6930,34 +6930,34 @@ L_103a10c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a1a4: 0x103a1a4: sll   zero, zero, 0
-// 0x0103a1a8: 0x103a1a8: beq   a0, v0, 0x103a1c0 addiu s4, sp, 120
+// 0x0103a1b4: 0x103a1b4: sll   zero, zero, 0
+// 0x0103a1b8: 0x103a1b8: beq   a0, v0, 0x103a1d0 addiu s4, sp, 120
 	ldloc.1
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 120
 	add
 	stloc 11
-	beq  L_103a1c0
+	beq  L_103a1d0
 // --- basic block ---
-// 0x0103a1b0: 0x103a1b0: bltz  a0, 0x103a1c0 sll   zero, zero, 0
+// 0x0103a1c0: 0x103a1c0: bltz  a0, 0x103a1d0 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_103a1c0
+	blt L_103a1d0
 // --- basic block ---
-// 0x0103a1b8: 0x103a1b8: jal   0x100b164 sll   zero, zero, 0
+// 0x0103a1c8: 0x103a1c8: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a1c0:
-// 0x0103a1c0: 0x103a1c0: lw    a0, 180(sp)
+L_103a1d0:
+// 0x0103a1d0: 0x103a1d0: lw    a0, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6966,7 +6966,7 @@ L_103a1c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a1c4: 0x103a1c4: jal   0x1011a4c addu  a1, s4, zero
+// 0x0103a1d4: 0x103a1d4: jal   0x1011a5c addu  a1, s4, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -6974,12 +6974,12 @@ L_103a1c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a1cc: 0x103a1cc: lw    s7, 40(sp)
+// 0x0103a1dc: 0x103a1dc: lw    s7, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6988,7 +6988,7 @@ L_103a1c0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103a1d0: 0x103a1d0: lw    v0, 192(sp)
+// 0x0103a1e0: 0x103a1e0: lw    v0, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6997,17 +6997,17 @@ L_103a1c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a1d4: 0x103a1d4: addu  a0, s4, zero
+// 0x0103a1e4: 0x103a1e4: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x0103a1d8: 0x103a1d8: sw    v0, 0(s7)
+// 0x0103a1e8: 0x103a1e8: sw    v0, 0(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103a1dc: 0x103a1dc: lw    v0, 188(sp)
+// 0x0103a1ec: 0x103a1ec: lw    v0, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7016,10 +7016,10 @@ L_103a1c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a1e0: 0x103a1e0: addiu s4, zero, 1
+// 0x0103a1f0: 0x103a1f0: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x0103a1e4: 0x103a1e4: sw    v0, 4(s7)
+// 0x0103a1f4: 0x103a1f4: sw    v0, 4(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7028,7 +7028,7 @@ L_103a1c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a1e8: 0x103a1e8: lw    v0, 180(sp)
+// 0x0103a1f8: 0x103a1f8: lw    v0, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7037,7 +7037,7 @@ L_103a1c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a1ec: 0x103a1ec: jal   0x1011920 sw    v0, 8(s7)
+// 0x0103a1fc: 0x103a1fc: jal   0x1011930 sw    v0, 8(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7051,12 +7051,12 @@ L_103a1c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_full_name_1011920(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_full_name_1011930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a1f4: 0x103a1f4: jal   0x1001ba8 addu  a0, v0, zero
+// 0x0103a204: 0x103a204: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7069,7 +7069,7 @@ L_103a1c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a1fc: 0x103a1fc: jal   0x1010a4c sw    v0, 12(s7)
+// 0x0103a20c: 0x103a20c: jal   0x1010a5c sw    v0, 12(s7)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7083,19 +7083,19 @@ L_103a1c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a204: 0x103a204: j	 0x103a39c sll   zero, zero, 0
-	br L_103a39c
+// 0x0103a214: 0x103a214: j	 0x103a3ac sll   zero, zero, 0
+	br L_103a3ac
 // --- basic block ---
-L_103a20c:
-// 0x0103a20c: 0x103a20c: addiu v0, zero, -1
+L_103a21c:
+// 0x0103a21c: 0x103a21c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103a210: 0x103a210: sw    a0, 20(s4)
+// 0x0103a220: 0x103a220: sw    a0, 20(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7104,7 +7104,7 @@ L_103a20c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103a214: 0x103a214: sw    v1, 16(s4)
+// 0x0103a224: 0x103a224: sw    v1, 16(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7113,7 +7113,7 @@ L_103a20c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a218: 0x103a218: sw    v0, 8(s4)
+// 0x0103a228: 0x103a228: sw    v0, 8(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7122,14 +7122,14 @@ L_103a20c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a21c: 0x103a21c: sw    v0, 0(s4)
+// 0x0103a22c: 0x103a22c: sw    v0, 0(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103a220: 0x103a220: sw    v0, 4(s4)
+// 0x0103a230: 0x103a230: sw    v0, 4(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7138,7 +7138,7 @@ L_103a20c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a224: 0x103a224: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0103a234: 0x103a234: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7151,7 +7151,7 @@ L_103a20c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a22c: 0x103a22c: sw    v0, 12(s4)
+// 0x0103a23c: 0x103a23c: sw    v0, 12(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -7160,75 +7160,75 @@ L_103a20c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a230: 0x103a230: j	 0x103a39c addiu s4, zero, 1
+// 0x0103a240: 0x103a240: j	 0x103a3ac addiu s4, zero, 1
 	ldc.i4.1
 	stloc 11
-	br L_103a39c
+	br L_103a3ac
 // --- basic block ---
-L_103a238:
-// 0x0103a238: 0x103a238: beq   s2, zero, 0x103a2ec sb    zero, -13716(a0)
+L_103a248:
+// 0x0103a248: 0x103a248: beq   s2, zero, 0x103a2fc sb    zero, -13252(a0)
 	ldloc 10
 	ldloc.1
-	ldc.i4 -13716
+	ldc.i4 -13252
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brfalse L_103a2ec
+	brfalse L_103a2fc
 // --- basic block ---
-// 0x0103a240: 0x103a240: beq   s3, zero, 0x103a29c sll   zero, zero, 0
+// 0x0103a250: 0x103a250: beq   s3, zero, 0x103a2ac sll   zero, zero, 0
 	ldloc 12
-	brfalse L_103a29c
+	brfalse L_103a2ac
 // --- basic block ---
-// 0x0103a248: 0x103a248: beq   s1, zero, 0x103a320 sll   zero, zero, 0
+// 0x0103a258: 0x103a258: beq   s1, zero, 0x103a330 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_103a320
+	brfalse L_103a330
 // --- basic block ---
-// 0x0103a250: 0x103a250: lb    v0, 0(s2)
+// 0x0103a260: 0x103a260: lb    v0, 0(s2)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a254: 0x103a254: sll   zero, zero, 0
-// 0x0103a258: 0x103a258: beq   v0, zero, 0x103a2ac sll   zero, zero, 0
+// 0x0103a264: 0x103a264: sll   zero, zero, 0
+// 0x0103a268: 0x103a268: beq   v0, zero, 0x103a2bc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103a2ac
+	brfalse L_103a2bc
 // --- basic block ---
-// 0x0103a260: 0x103a260: lb    v0, 0(s3)
+// 0x0103a270: 0x103a270: lb    v0, 0(s3)
 	ldloc 12
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a264: 0x103a264: sll   zero, zero, 0
-// 0x0103a268: 0x103a268: beq   v0, zero, 0x103a2a4 sll   zero, zero, 0
+// 0x0103a274: 0x103a274: sll   zero, zero, 0
+// 0x0103a278: 0x103a278: beq   v0, zero, 0x103a2b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103a2a4
+	brfalse L_103a2b4
 // --- basic block ---
-// 0x0103a270: 0x103a270: lb    v0, 0(s1)
+// 0x0103a280: 0x103a280: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a274: 0x103a274: sll   zero, zero, 0
-// 0x0103a278: 0x103a278: beq   v0, zero, 0x103a2a4 lui   a2, 0x10000
+// 0x0103a284: 0x103a284: sll   zero, zero, 0
+// 0x0103a288: 0x103a288: beq   v0, zero, 0x103a2b4 lui   a2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	brfalse L_103a2a4
+	brfalse L_103a2b4
 // --- basic block ---
-// 0x0103a280: 0x103a280: addiu a0, a0, -13716
+// 0x0103a290: 0x103a290: addiu a0, a0, -13252
 	ldloc.1
-	ldc.i4 -13716
+	ldc.i4 -13252
 	add
 	stloc.1
-// 0x0103a284: 0x103a284: addiu a2, a2, -11372
+// 0x0103a294: 0x103a294: addiu a2, a2, -11376
 	ldloc.3
-	ldc.i4 -11372
+	ldc.i4 -11376
 	add
 	stloc.3
-// 0x0103a288: 0x103a288: addu  a3, s2, zero
+// 0x0103a298: 0x103a298: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x0103a28c: 0x103a28c: addiu a1, zero, 112
+// 0x0103a29c: 0x103a29c: addiu a1, zero, 112
 	ldc.i4.s 112
 	stloc.2
-// 0x0103a290: 0x103a290: sw    s3, 16(sp)
+// 0x0103a2a0: 0x103a2a0: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7237,7 +7237,7 @@ L_103a238:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103a294: 0x103a294: j	 0x103a2dc sw    s1, 20(sp)
+// 0x0103a2a4: 0x103a2a4: j	 0x103a2ec sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7246,55 +7246,55 @@ L_103a238:
 	add
 	ldloc 9
 	stelem.i4
-	br L_103a2dc
+	br L_103a2ec
 // --- basic block ---
-L_103a29c:
-// 0x0103a29c: 0x103a29c: beq   s1, zero, 0x103a320 sll   zero, zero, 0
+L_103a2ac:
+// 0x0103a2ac: 0x103a2ac: beq   s1, zero, 0x103a330 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_103a320
+	brfalse L_103a330
 // --- basic block ---
-L_103a2a4:
-// 0x0103a2a4: 0x103a2a4: lb    v0, 0(s2)
+L_103a2b4:
+// 0x0103a2b4: 0x103a2b4: lb    v0, 0(s2)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a2a8: 0x103a2a8: sll   zero, zero, 0
-L_103a2ac:
-// 0x0103a2ac: 0x103a2ac: beq   v0, zero, 0x103a2f4 sll   zero, zero, 0
+// 0x0103a2b8: 0x103a2b8: sll   zero, zero, 0
+L_103a2bc:
+// 0x0103a2bc: 0x103a2bc: beq   v0, zero, 0x103a304 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103a2f4
+	brfalse L_103a304
 // --- basic block ---
-// 0x0103a2b4: 0x103a2b4: lb    v0, 0(s1)
+// 0x0103a2c4: 0x103a2c4: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a2b8: 0x103a2b8: sll   zero, zero, 0
-// 0x0103a2bc: 0x103a2bc: beq   v0, zero, 0x103a2fc lui   a0, 0x60000
+// 0x0103a2c8: 0x103a2c8: sll   zero, zero, 0
+// 0x0103a2cc: 0x103a2cc: beq   v0, zero, 0x103a30c lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	brfalse L_103a2fc
+	brfalse L_103a30c
 // --- basic block ---
-// 0x0103a2c4: 0x103a2c4: lui   a2, 0x10000
+// 0x0103a2d4: 0x103a2d4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103a2c8: 0x103a2c8: addiu a0, a0, -13716
+// 0x0103a2d8: 0x103a2d8: addiu a0, a0, -13252
 	ldloc.1
-	ldc.i4 -13716
+	ldc.i4 -13252
 	add
 	stloc.1
-// 0x0103a2cc: 0x103a2cc: addiu a2, a2, -10228
+// 0x0103a2dc: 0x103a2dc: addiu a2, a2, -10232
 	ldloc.3
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.3
-// 0x0103a2d0: 0x103a2d0: addu  a3, s2, zero
+// 0x0103a2e0: 0x103a2e0: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x0103a2d4: 0x103a2d4: addiu a1, zero, 112
+// 0x0103a2e4: 0x103a2e4: addiu a1, zero, 112
 	ldc.i4.s 112
 	stloc.2
-// 0x0103a2d8: 0x103a2d8: sw    s1, 16(sp)
+// 0x0103a2e8: 0x103a2e8: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7303,8 +7303,8 @@ L_103a2ac:
 	add
 	ldloc 9
 	stelem.i4
-L_103a2dc:
-// 0x0103a2dc: 0x103a2dc: jal   0x1000f9c sll   zero, zero, 0
+L_103a2ec:
+// 0x0103a2ec: 0x103a2ec: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7315,89 +7315,89 @@ L_103a2dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a2e4: 0x103a2e4: j	 0x103a350 lui   a0, 0x60000
+// 0x0103a2f4: 0x103a2f4: j	 0x103a360 lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-	br L_103a350
+	br L_103a360
 // --- basic block ---
-L_103a2ec:
-// 0x0103a2ec: 0x103a2ec: beq   s1, zero, 0x103a678 lui   a1, 0x10000
+L_103a2fc:
+// 0x0103a2fc: 0x103a2fc: beq   s1, zero, 0x103a688 lui   a1, 0x10000
 	ldloc 9
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103a678
+	brfalse L_103a688
 // --- basic block ---
-L_103a2f4:
-// 0x0103a2f4: 0x103a2f4: lb    v0, 0(s1)
+L_103a304:
+// 0x0103a304: 0x103a304: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a2f8: 0x103a2f8: sll   zero, zero, 0
-L_103a2fc:
-// 0x0103a2fc: 0x103a2fc: beq   v0, zero, 0x103a318 lui   a0, 0x60000
+// 0x0103a308: 0x103a308: sll   zero, zero, 0
+L_103a30c:
+// 0x0103a30c: 0x103a30c: beq   v0, zero, 0x103a328 lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	brfalse L_103a318
+	brfalse L_103a328
 // --- basic block ---
-// 0x0103a304: 0x103a304: lui   a2, 0x10000
+// 0x0103a314: 0x103a314: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103a308: 0x103a308: addiu a0, a0, -13716
+// 0x0103a318: 0x103a318: addiu a0, a0, -13252
 	ldloc.1
-	ldc.i4 -13716
+	ldc.i4 -13252
 	add
 	stloc.1
-// 0x0103a30c: 0x103a30c: addiu a2, a2, 19912
+// 0x0103a31c: 0x103a31c: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0103a310: 0x103a310: j	 0x103a344 addu  a3, s1, zero
+// 0x0103a320: 0x103a320: j	 0x103a354 addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-	br L_103a344
+	br L_103a354
 // --- basic block ---
-L_103a318:
-// 0x0103a318: 0x103a318: beq   s2, zero, 0x103a678 lui   a1, 0x10000
+L_103a328:
+// 0x0103a328: 0x103a328: beq   s2, zero, 0x103a688 lui   a1, 0x10000
 	ldloc 10
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103a678
+	brfalse L_103a688
 // --- basic block ---
-L_103a320:
-// 0x0103a320: 0x103a320: lb    v0, 0(s2)
+L_103a330:
+// 0x0103a330: 0x103a330: lb    v0, 0(s2)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a324: 0x103a324: sll   zero, zero, 0
-// 0x0103a328: 0x103a328: beq   v0, zero, 0x103a678 lui   a1, 0x10000
+// 0x0103a334: 0x103a334: sll   zero, zero, 0
+// 0x0103a338: 0x103a338: beq   v0, zero, 0x103a688 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103a678
+	brfalse L_103a688
 // --- basic block ---
-// 0x0103a330: 0x103a330: lui   a0, 0x60000
+// 0x0103a340: 0x103a340: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103a334: 0x103a334: lui   a2, 0x10000
+// 0x0103a344: 0x103a344: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103a338: 0x103a338: addiu a0, a0, -13716
+// 0x0103a348: 0x103a348: addiu a0, a0, -13252
 	ldloc.1
-	ldc.i4 -13716
+	ldc.i4 -13252
 	add
 	stloc.1
-// 0x0103a33c: 0x103a33c: addiu a2, a2, -11224
+// 0x0103a34c: 0x103a34c: addiu a2, a2, -11228
 	ldloc.3
-	ldc.i4 -11224
+	ldc.i4 -11228
 	add
 	stloc.3
-// 0x0103a340: 0x103a340: addu  a3, s2, zero
+// 0x0103a350: 0x103a350: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-L_103a344:
-// 0x0103a344: 0x103a344: jal   0x1000f9c addiu a1, zero, 112
+L_103a354:
+// 0x0103a354: 0x103a354: jal   0x1000f9c addiu a1, zero, 112
 	ldc.i4.s 112
 	stloc.2
 	ldloc.0
@@ -7410,13 +7410,13 @@ L_103a344:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a34c: 0x103a34c: lui   a0, 0x60000
+// 0x0103a35c: 0x103a35c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-L_103a350:
-// 0x0103a350: 0x103a350: jal   0x103d44c addiu a0, a0, -13716
+L_103a360:
+// 0x0103a360: 0x103a360: jal   0x103d45c addiu a0, a0, -13252
 	ldloc.1
-	ldc.i4 -13716
+	ldc.i4 -13252
 	add
 	stloc.1
 	ldloc.0
@@ -7424,38 +7424,38 @@ L_103a350:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::address_search_auto_search_103d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::address_search_auto_search_103d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a358: 0x103a358: bne   v0, zero, 0x103a37c lui   a1, 0x10000
+// 0x0103a368: 0x103a368: bne   v0, zero, 0x103a38c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_103a37c
+	brtrue L_103a38c
 // --- basic block ---
-// 0x0103a360: 0x103a360: lui   a3, 0x10000
+// 0x0103a370: 0x103a370: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103a364: 0x103a364: addiu a1, a1, -11216
+// 0x0103a374: 0x103a374: addiu a1, a1, -11220
 	ldloc.2
-	ldc.i4 -11216
+	ldc.i4 -11220
 	add
 	stloc.2
-// 0x0103a368: 0x103a368: addiu a3, a3, -11188
+// 0x0103a378: 0x103a378: addiu a3, a3, -11192
 	ldloc 4
-	ldc.i4 -11188
+	ldc.i4 -11192
 	add
 	stloc 4
-// 0x0103a36c: 0x103a36c: addiu a0, zero, 4
+// 0x0103a37c: 0x103a37c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103a370: 0x103a370: addiu a2, zero, 279
+// 0x0103a380: 0x103a380: addiu a2, zero, 279
 	ldc.i4 279
 	stloc.3
-L_103a374:
-// 0x0103a374: 0x103a374: jal   0x100449c sll   zero, zero, 0
+L_103a384:
+// 0x0103a384: 0x103a384: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7466,8 +7466,8 @@ L_103a374:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a37c:
-// 0x0103a37c: 0x103a37c: lw    a0, 40(sp)
+L_103a38c:
+// 0x0103a38c: 0x103a38c: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7476,14 +7476,14 @@ L_103a37c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a380: 0x103a380: sll   zero, zero, 0
-// 0x0103a384: 0x103a384: beq   a0, zero, 0x103a64c addu  v0, zero, zero
+// 0x0103a390: 0x103a390: sll   zero, zero, 0
+// 0x0103a394: 0x103a394: beq   a0, zero, 0x103a65c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_103a64c
+	brfalse L_103a65c
 // --- basic block ---
-// 0x0103a38c: 0x103a38c: jal   0x1000930 sll   zero, zero, 0
+// 0x0103a39c: 0x103a39c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7494,32 +7494,32 @@ L_103a37c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a394: 0x103a394: j	 0x103a64c addu  v0, zero, zero
+// 0x0103a3a4: 0x103a3a4: j	 0x103a65c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_103a64c
+	br L_103a65c
 // --- basic block ---
-L_103a39c:
-// 0x0103a39c: 0x103a39c: lb    v1, 0(s6)
+L_103a3ac:
+// 0x0103a3ac: 0x103a3ac: lb    v1, 0(s6)
 	ldloc 16
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0103a3a0: 0x103a3a0: addiu v0, zero, 65
+// 0x0103a3b0: 0x103a3b0: addiu v0, zero, 65
 	ldc.i4.s 65
 	stloc 5
-// 0x0103a3a4: 0x103a3a4: bne   v1, v0, 0x103a438 lui   v0, 0x10000
+// 0x0103a3b4: 0x103a3b4: bne   v1, v0, 0x103a448 lui   v0, 0x10000
 	ldloc 7
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	bne.un L_103a438
+	bne.un L_103a448
 // --- basic block ---
-// 0x0103a3ac: 0x103a3ac: addiu v0, v0, 18500
+// 0x0103a3bc: 0x103a3bc: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x0103a3b0: 0x103a3b0: sw    s3, 144(sp)
+// 0x0103a3c0: 0x103a3c0: sw    s3, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7528,7 +7528,7 @@ L_103a39c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103a3b4: 0x103a3b4: sw    s2, 148(sp)
+// 0x0103a3c4: 0x103a3c4: sw    s2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7537,7 +7537,7 @@ L_103a39c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103a3b8: 0x103a3b8: sw    s1, 152(sp)
+// 0x0103a3c8: 0x103a3c8: sw    s1, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7546,7 +7546,7 @@ L_103a39c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103a3bc: 0x103a3bc: sw    s5, 156(sp)
+// 0x0103a3cc: 0x103a3cc: sw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7555,7 +7555,7 @@ L_103a39c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103a3c0: 0x103a3c0: beq   s0, zero, 0x103a408 sw    v0, 160(sp)
+// 0x0103a3d0: 0x103a3d0: beq   s0, zero, 0x103a418 sw    v0, 160(sp)
 	ldloc 8
 	ldloc 6
 	ldloc.0
@@ -7565,14 +7565,14 @@ L_103a39c:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_103a408
+	brfalse L_103a418
 // --- basic block ---
-// 0x0103a3c8: 0x103a3c8: addiu s1, sp, 80
+// 0x0103a3d8: 0x103a3d8: addiu s1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 9
-// 0x0103a3cc: 0x103a3cc: lw    a2, 4(s0)
+// 0x0103a3dc: 0x103a3dc: lw    a2, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7581,15 +7581,15 @@ L_103a39c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103a3d0: 0x103a3d0: lui   s2, 0x20000
-	ldc.i4 131072
+// 0x0103a3e0: 0x103a3e0: lui   s2, 0x10000
+	ldc.i4 65536
 	stloc 10
-// 0x0103a3d4: 0x103a3d4: addiu a1, s2, -13884
+// 0x0103a3e4: 0x103a3e4: addiu a1, s2, 19088
 	ldloc 10
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0103a3d8: 0x103a3d8: jal   0x1000f64 addu  a0, s1, zero
+// 0x0103a3e8: 0x103a3e8: jal   0x1000f64 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7602,7 +7602,7 @@ L_103a39c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a3e0: 0x103a3e0: jal   0x1001ba8 addu  a0, s1, zero
+// 0x0103a3f0: 0x103a3f0: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7615,22 +7615,22 @@ L_103a39c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a3e8: 0x103a3e8: lw    a2, 0(s0)
+// 0x0103a3f8: 0x103a3f8: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0103a3ec: 0x103a3ec: addiu a1, s2, -13884
+// 0x0103a3fc: 0x103a3fc: addiu a1, s2, 19088
 	ldloc 10
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0103a3f0: 0x103a3f0: addu  a0, s1, zero
+// 0x0103a400: 0x103a400: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103a3f4: 0x103a3f4: jal   0x1000f64 sw    v0, 164(sp)
+// 0x0103a404: 0x103a404: jal   0x1000f64 sw    v0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7649,7 +7649,7 @@ L_103a39c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a3fc: 0x103a3fc: jal   0x1001ba8 addu  a0, s1, zero
+// 0x0103a40c: 0x103a40c: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7662,7 +7662,7 @@ L_103a39c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a404: 0x103a404: sw    v0, 168(sp)
+// 0x0103a414: 0x103a414: sw    v0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7671,24 +7671,24 @@ L_103a39c:
 	add
 	ldloc 5
 	stelem.i4
-L_103a408:
-// 0x0103a408: 0x103a408: lui   v0, 0x10000
+L_103a418:
+// 0x0103a418: 0x103a418: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103a40c: 0x103a40c: addiu v0, v0, -25260
+// 0x0103a41c: 0x103a41c: addiu v0, v0, -25260
 	ldloc 5
 	ldc.i4 -25260
 	add
 	stloc 5
-// 0x0103a410: 0x103a410: addiu a0, zero, 65
+// 0x0103a420: 0x103a420: addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
-// 0x0103a414: 0x103a414: addiu a1, sp, 144
+// 0x0103a424: 0x103a424: addiu a1, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
 	stloc.2
-// 0x0103a418: 0x103a418: jal   0x103822c sw    v0, 172(sp)
+// 0x0103a428: 0x103a428: jal   0x103823c sw    v0, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7702,12 +7702,12 @@ L_103a408:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a420: 0x103a420: lw    a0, 164(sp)
+// 0x0103a430: 0x103a430: lw    a0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7716,7 +7716,7 @@ L_103a408:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a424: 0x103a424: jal   0x1000930 sll   zero, zero, 0
+// 0x0103a434: 0x103a434: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7727,7 +7727,7 @@ L_103a408:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a42c: 0x103a42c: lw    a0, 168(sp)
+// 0x0103a43c: 0x103a43c: lw    a0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7736,7 +7736,7 @@ L_103a408:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a430: 0x103a430: jal   0x1000930 sll   zero, zero, 0
+// 0x0103a440: 0x103a440: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7747,8 +7747,8 @@ L_103a408:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a438:
-// 0x0103a438: 0x103a438: lw    s0, 40(sp)
+L_103a448:
+// 0x0103a448: 0x103a448: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7757,38 +7757,38 @@ L_103a438:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103a43c: 0x103a43c: addiu v0, zero, -1
+// 0x0103a44c: 0x103a44c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103a440: 0x103a440: lw    a0, 0(s0)
+// 0x0103a450: 0x103a450: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103a444: 0x103a444: lb    s1, 0(s6)
+// 0x0103a454: 0x103a454: lb    s1, 0(s6)
 	ldloc 16
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x0103a448: 0x103a448: beq   a0, v0, 0x103a458 sll   zero, zero, 0
+// 0x0103a458: 0x103a458: beq   a0, v0, 0x103a468 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_103a458
+	beq  L_103a468
 // --- basic block ---
-// 0x0103a450: 0x103a450: jal   0x1013c44 sll   zero, zero, 0
+// 0x0103a460: 0x103a460: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a458:
-// 0x0103a458: 0x103a458: lw    v0, 16(s0)
+L_103a468:
+// 0x0103a468: 0x103a468: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7797,33 +7797,33 @@ L_103a458:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a45c: 0x103a45c: addiu t1, zero, 69
+// 0x0103a46c: 0x103a46c: addiu t1, zero, 69
 	ldc.i4.s 69
 	stloc 20
-// 0x0103a460: 0x103a460: sra   a0, v0, 31
+// 0x0103a470: 0x103a470: sra   a0, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x0103a464: 0x103a464: xor   v1, a0, v0
+// 0x0103a474: 0x103a474: xor   v1, a0, v0
 	ldloc.1
 	ldloc 5
 	xor
 	stloc 7
-// 0x0103a468: 0x103a468: bgez  v0, 0x103a474 subu  v1, v1, a0
+// 0x0103a478: 0x103a478: bgez  v0, 0x103a484 subu  v1, v1, a0
 	ldloc 5
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 7
 	ldc.i4.s 0
-	bge L_103a474
+	bge L_103a484
 // --- basic block ---
-// 0x0103a470: 0x103a470: addiu t1, zero, 87
+// 0x0103a480: 0x103a480: addiu t1, zero, 87
 	ldc.i4.s 87
 	stloc 20
-L_103a474:
-// 0x0103a474: 0x103a474: lw    v0, 20(s0)
+L_103a484:
+// 0x0103a484: 0x103a484: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7832,41 +7832,41 @@ L_103a474:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a478: 0x103a478: addiu t0, zero, 78
+// 0x0103a488: 0x103a488: addiu t0, zero, 78
 	ldc.i4.s 78
 	stloc 19
-// 0x0103a47c: 0x103a47c: sra   a0, v0, 31
+// 0x0103a48c: 0x103a48c: sra   a0, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x0103a480: 0x103a480: xor   t2, a0, v0
+// 0x0103a490: 0x103a490: xor   t2, a0, v0
 	ldloc.1
 	ldloc 5
 	xor
 	stloc 15
-// 0x0103a484: 0x103a484: bgez  v0, 0x103a490 subu  t2, t2, a0
+// 0x0103a494: 0x103a494: bgez  v0, 0x103a4a0 subu  t2, t2, a0
 	ldloc 5
 	ldloc 15
 	ldloc.1
 	sub
 	stloc 15
 	ldc.i4.s 0
-	bge L_103a490
+	bge L_103a4a0
 // --- basic block ---
-// 0x0103a48c: 0x103a48c: addiu t0, zero, 83
+// 0x0103a49c: 0x103a49c: addiu t0, zero, 83
 	ldc.i4.s 83
 	stloc 19
-L_103a490:
-// 0x0103a490: 0x103a490: lui   v0, 0xf0000
+L_103a4a0:
+// 0x0103a4a0: 0x103a4a0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0103a494: 0x103a494: ori   v0, v0, 16960
+// 0x0103a4a4: 0x103a4a4: ori   v0, v0, 16960
 	ldloc 5
 	ldc.i4 16960
 	or
 	stloc 5
-// 0x0103a498: 0x103a498: div   t2, v0
+// 0x0103a4a8: 0x103a4a8: div   t2, v0
 	ldloc 15
 	ldloc 5
 	ldloc 15
@@ -7875,29 +7875,29 @@ L_103a490:
 	stloc 18
 	rem
 	stloc 17
-// 0x0103a49c: 0x103a49c: lui   a1, 0x10000
+// 0x0103a4ac: 0x103a4ac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103a4a0: 0x103a4a0: lui   a3, 0x10000
+// 0x0103a4b0: 0x103a4b0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103a4a4: 0x103a4a4: addiu a0, zero, 1
+// 0x0103a4b4: 0x103a4b4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103a4a8: 0x103a4a8: addiu a1, a1, -11216
+// 0x0103a4b8: 0x103a4b8: addiu a1, a1, -11220
 	ldloc.2
-	ldc.i4 -11216
+	ldc.i4 -11220
 	add
 	stloc.2
-// 0x0103a4ac: 0x103a4ac: addiu a3, a3, -11116
+// 0x0103a4bc: 0x103a4bc: addiu a3, a3, -11120
 	ldloc 4
-	ldc.i4 -11116
+	ldc.i4 -11120
 	add
 	stloc 4
-// 0x0103a4b0: 0x103a4b0: addiu a2, zero, 130
+// 0x0103a4c0: 0x103a4c0: addiu a2, zero, 130
 	ldc.i4 130
 	stloc.3
-// 0x0103a4b4: 0x103a4b4: sw    t1, 24(sp)
+// 0x0103a4c4: 0x103a4c4: sw    t1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7906,7 +7906,7 @@ L_103a490:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0103a4b8: 0x103a4b8: sw    t0, 36(sp)
+// 0x0103a4c8: 0x103a4c8: sw    t0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7915,10 +7915,10 @@ L_103a490:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0103a4bc: 0x103a4bc: mfhi  hi
+// 0x0103a4cc: 0x103a4cc: mfhi  hi
 	ldloc 17
 	stloc 15
-// 0x0103a4c0: 0x103a4c0: sw    t2, 32(sp)
+// 0x0103a4d0: 0x103a4d0: sw    t2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7927,10 +7927,10 @@ L_103a490:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0103a4c4: 0x103a4c4: mflo  lo
+// 0x0103a4d4: 0x103a4d4: mflo  lo
 	ldloc 18
 	stloc 22
-// 0x0103a4c8: 0x103a4c8: sw    t3, 28(sp)
+// 0x0103a4d8: 0x103a4d8: sw    t3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7939,8 +7939,8 @@ L_103a490:
 	add
 	ldloc 22
 	stelem.i4
-// 0x0103a4cc: 0x103a4cc: sll   zero, zero, 0
-// 0x0103a4d0: 0x103a4d0: div   v1, v0
+// 0x0103a4dc: 0x103a4dc: sll   zero, zero, 0
+// 0x0103a4e0: 0x103a4e0: div   v1, v0
 	ldloc 7
 	ldloc 5
 	ldloc 7
@@ -7949,10 +7949,10 @@ L_103a490:
 	stloc 18
 	rem
 	stloc 17
-// 0x0103a4d4: 0x103a4d4: mfhi  hi
+// 0x0103a4e4: 0x103a4e4: mfhi  hi
 	ldloc 17
 	stloc 5
-// 0x0103a4d8: 0x103a4d8: sw    v0, 20(sp)
+// 0x0103a4e8: 0x103a4e8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7961,10 +7961,10 @@ L_103a490:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a4dc: 0x103a4dc: mflo  lo
+// 0x0103a4ec: 0x103a4ec: mflo  lo
 	ldloc 18
 	stloc 7
-// 0x0103a4e0: 0x103a4e0: jal   0x100449c sw    v1, 16(sp)
+// 0x0103a4f0: 0x103a4f0: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7983,7 +7983,7 @@ L_103a490:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a4e8: 0x103a4e8: lw    a0, 4(s0)
+// 0x0103a4f8: 0x103a4f8: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7992,30 +7992,30 @@ L_103a490:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a4ec: 0x103a4ec: addiu v0, zero, -1
+// 0x0103a4fc: 0x103a4fc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103a4f0: 0x103a4f0: beq   a0, v0, 0x103a508 sll   zero, zero, 0
+// 0x0103a500: 0x103a500: beq   a0, v0, 0x103a518 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_103a508
+	beq  L_103a518
 // --- basic block ---
-// 0x0103a4f8: 0x103a4f8: jal   0x1009cd0 sll   zero, zero, 0
+// 0x0103a508: 0x103a508: jal   0x1009ce0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_adjust_zoom_1009cd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_adjust_zoom_1009ce0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a500: 0x103a500: j	 0x103a510 sll   zero, zero, 0
-	br L_103a510
+// 0x0103a510: 0x103a510: j	 0x103a520 sll   zero, zero, 0
+	br L_103a520
 // --- basic block ---
-L_103a508:
-// 0x0103a508: 0x103a508: jal   0x1009a6c addiu a0, zero, 90
+L_103a518:
+// 0x0103a518: 0x103a518: jal   0x1009a7c addiu a0, zero, 90
 	ldc.i4.s 90
 	stloc.1
 	ldloc.0
@@ -8023,24 +8023,24 @@ L_103a508:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_zoom_set_1009a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_zoom_set_1009a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a510:
-// 0x0103a510: 0x103a510: jal   0x1010a4c sll   zero, zero, 0
+L_103a520:
+// 0x0103a520: 0x103a520: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a518: 0x103a518: lw    v1, 4(s0)
+// 0x0103a528: 0x103a528: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8049,19 +8049,19 @@ L_103a510:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103a51c: 0x103a51c: addiu v0, zero, -1
+// 0x0103a52c: 0x103a52c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103a520: 0x103a520: beq   v1, v0, 0x103a554 addiu s5, s0, 16
+// 0x0103a530: 0x103a530: beq   v1, v0, 0x103a564 addiu s5, s0, 16
 	ldloc 7
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 13
-	beq  L_103a554
+	beq  L_103a564
 // --- basic block ---
-// 0x0103a528: 0x103a528: lw    a0, 8(s0)
+// 0x0103a538: 0x103a538: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8070,22 +8070,22 @@ L_103a510:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a52c: 0x103a52c: sll   zero, zero, 0
-// 0x0103a530: 0x103a530: beq   a0, v0, 0x103a558 lui   s2, 0x0
+// 0x0103a53c: 0x103a53c: sll   zero, zero, 0
+// 0x0103a540: 0x103a540: beq   a0, v0, 0x103a568 lui   s2, 0x0
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	beq  L_103a558
+	beq  L_103a568
 // --- basic block ---
-// 0x0103a538: 0x103a538: lw    a1, 0(s0)
+// 0x0103a548: 0x103a548: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103a53c: 0x103a53c: sw    a0, 104(sp)
+// 0x0103a54c: 0x103a54c: sw    a0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8094,7 +8094,7 @@ L_103a510:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103a540: 0x103a540: sw    v0, 108(sp)
+// 0x0103a550: 0x103a550: sw    v0, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8103,7 +8103,7 @@ L_103a510:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a544: 0x103a544: sw    v1, 112(sp)
+// 0x0103a554: 0x103a554: sw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8112,7 +8112,7 @@ L_103a510:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a548: 0x103a548: sw    a1, 116(sp)
+// 0x0103a558: 0x103a558: sw    a1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8121,7 +8121,7 @@ L_103a510:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103a54c: 0x103a54c: sw    zero, 100(sp)
+// 0x0103a55c: 0x103a55c: sw    zero, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8130,22 +8130,22 @@ L_103a510:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103a550: 0x103a550: addiu s5, s0, 16
+// 0x0103a560: 0x103a560: addiu s5, s0, 16
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 13
-L_103a554:
-// 0x0103a554: 0x103a554: lui   s2, 0x0
+L_103a564:
+// 0x0103a564: 0x103a564: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-L_103a558:
-// 0x0103a558: 0x103a558: addiu a0, s2, 27208
+L_103a568:
+// 0x0103a568: 0x103a568: addiu a0, s2, 27208
 	ldloc 10
 	ldc.i4 27208
 	add
 	stloc.1
-// 0x0103a55c: 0x103a55c: jal   0x101f76c addu  a1, s5, zero
+// 0x0103a56c: 0x103a56c: jal   0x101f77c addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -8153,12 +8153,12 @@ L_103a558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a564: 0x103a564: lw    v0, 856(sp)
+// 0x0103a574: 0x103a574: lw    v0, 856(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8167,12 +8167,12 @@ L_103a558:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a568: 0x103a568: sll   zero, zero, 0
-// 0x0103a56c: 0x103a56c: bne   v0, zero, 0x103a5f8 sll   zero, zero, 0
+// 0x0103a578: 0x103a578: sll   zero, zero, 0
+// 0x0103a57c: 0x103a57c: bne   v0, zero, 0x103a608 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103a5f8
+	brtrue L_103a608
 // --- basic block ---
-// 0x0103a574: 0x103a574: jal   0x101ece8 addiu a0, s2, 27208
+// 0x0103a584: 0x103a584: jal   0x101ecf8 addiu a0, s2, 27208
 	ldloc 10
 	ldc.i4 27208
 	add
@@ -8182,12 +8182,12 @@ L_103a558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a57c: 0x103a57c: lw    v1, 8(s0)
+// 0x0103a58c: 0x103a58c: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8196,50 +8196,50 @@ L_103a558:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103a580: 0x103a580: addiu v0, zero, -1
+// 0x0103a590: 0x103a590: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103a584: 0x103a584: beq   v1, v0, 0x103a5e0 addiu v0, zero, 83
+// 0x0103a594: 0x103a594: beq   v1, v0, 0x103a5f0 addiu v0, zero, 83
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 83
 	stloc 5
-	beq  L_103a5e0
+	beq  L_103a5f0
 // --- basic block ---
-// 0x0103a58c: 0x103a58c: beq   s1, v0, 0x103a5e0 addiu s3, sp, 100
+// 0x0103a59c: 0x103a59c: beq   s1, v0, 0x103a5f0 addiu s3, sp, 100
 	ldloc 9
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc 12
-	beq  L_103a5e0
+	beq  L_103a5f0
 // --- basic block ---
-// 0x0103a594: 0x103a594: lui   s2, 0x10000
+// 0x0103a5a4: 0x103a5a4: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0103a598: 0x103a598: addu  a2, s5, zero
+// 0x0103a5a8: 0x103a5a8: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x0103a59c: 0x103a59c: addiu a0, s2, -30992
+// 0x0103a5ac: 0x103a5ac: addiu a0, s2, -30992
 	ldloc 10
 	ldc.i4 -30992
 	add
 	stloc.1
-// 0x0103a5a0: 0x103a5a0: addu  a1, s3, zero
+// 0x0103a5b0: 0x103a5b0: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x0103a5a4: 0x103a5a4: addiu a3, sp, 80
+// 0x0103a5b4: 0x103a5b4: addiu a3, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 4
-// 0x0103a5a8: 0x103a5a8: addiu s1, sp, 44
+// 0x0103a5b8: 0x103a5b8: addiu s1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 9
-// 0x0103a5ac: 0x103a5ac: jal   0x1019e40 addiu s0, sp, 52
+// 0x0103a5bc: 0x103a5bc: jal   0x1019e50 addiu s0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
@@ -8249,24 +8249,24 @@ L_103a558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_activate_1019e40(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_activate_1019e50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a5b4: 0x103a5b4: addu  a0, s3, zero
+// 0x0103a5c4: 0x103a5c4: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x0103a5b8: 0x103a5b8: addu  a1, s1, zero
+// 0x0103a5c8: 0x103a5c8: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0103a5bc: 0x103a5bc: addu  a2, s0, zero
+// 0x0103a5cc: 0x103a5cc: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x0103a5c0: 0x103a5c0: addiu a3, zero, 3
+// 0x0103a5d0: 0x103a5d0: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x0103a5c4: 0x103a5c4: sw    zero, 16(sp)
+// 0x0103a5d4: 0x103a5d4: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8275,7 +8275,7 @@ L_103a558:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103a5c8: 0x103a5c8: jal   0x1012790 sw    zero, 20(sp)
+// 0x0103a5d8: 0x103a5d8: jal   0x10127a0 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8289,20 +8289,20 @@ L_103a558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a5d0: 0x103a5d0: addiu a0, s2, -30992
+// 0x0103a5e0: 0x103a5e0: addiu a0, s2, -30992
 	ldloc 10
 	ldc.i4 -30992
 	add
 	stloc.1
-// 0x0103a5d4: 0x103a5d4: addu  a1, s1, zero
+// 0x0103a5e4: 0x103a5e4: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0103a5d8: 0x103a5d8: jal   0x1019590 addu  a2, s0, zero
+// 0x0103a5e8: 0x103a5e8: jal   0x10195a0 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -8310,13 +8310,13 @@ L_103a558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_update_points_1019590(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_update_points_10195a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a5e0:
-// 0x0103a5e0: 0x103a5e0: jal   0x1021340 addu  s0, zero, zero
+L_103a5f0:
+// 0x0103a5f0: 0x103a5f0: jal   0x1021350 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -8324,29 +8324,29 @@ L_103a5e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_add_focus_on_me_softkey_1021340(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_add_focus_on_me_softkey_1021350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a5e8: 0x103a5e8: jal   0x102146c sll   zero, zero, 0
+// 0x0103a5f8: 0x103a5f8: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a5f0: 0x103a5f0: j	 0x103a610 addu  s1, zero, zero
+// 0x0103a600: 0x103a600: j	 0x103a620 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_103a610
+	br L_103a620
 // --- basic block ---
-L_103a5f8:
-// 0x0103a5f8: 0x103a5f8: jal   0x105944c addu  s0, zero, zero
+L_103a608:
+// 0x0103a608: 0x103a608: jal   0x105945c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -8354,15 +8354,15 @@ L_103a5f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a600: 0x103a600: addu  a0, s5, zero
+// 0x0103a610: 0x103a610: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x0103a604: 0x103a604: jal   0x105ca84 addiu a1, sp, 60
+// 0x0103a614: 0x103a614: jal   0x105ca94 addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
@@ -8372,16 +8372,16 @@ L_103a5f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::main_navigator_105ca84(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::main_navigator_105ca94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a60c: 0x103a60c: addu  s1, zero, zero
+// 0x0103a61c: 0x103a61c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_103a610:
-// 0x0103a610: 0x103a610: lw    v0, 40(sp)
+L_103a620:
+// 0x0103a620: 0x103a620: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8390,13 +8390,13 @@ L_103a610:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103a614: 0x103a614: sll   zero, zero, 0
-// 0x0103a618: 0x103a618: addu  v0, v0, s0
+// 0x0103a624: 0x103a624: sll   zero, zero, 0
+// 0x0103a628: 0x103a628: addu  v0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0103a61c: 0x103a61c: lw    a0, 12(v0)
+// 0x0103a62c: 0x103a62c: lw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8405,7 +8405,7 @@ L_103a610:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a620: 0x103a620: jal   0x1000930 addiu s1, s1, 1
+// 0x0103a630: 0x103a630: jal   0x1000930 addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -8420,7 +8420,7 @@ L_103a610:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a628: 0x103a628: lw    a0, 40(sp)
+// 0x0103a638: 0x103a638: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8429,17 +8429,17 @@ L_103a610:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a62c: 0x103a62c: slt   v0, s1, s4
+// 0x0103a63c: 0x103a63c: slt   v0, s1, s4
 	ldloc 9
 	ldloc 11
 	clt
 	stloc 5
-// 0x0103a630: 0x103a630: addu  v1, a0, s0
+// 0x0103a640: 0x103a640: addu  v1, a0, s0
 	ldloc.1
 	ldloc 8
 	add
 	stloc 7
-// 0x0103a634: 0x103a634: sw    zero, 12(v1)
+// 0x0103a644: 0x103a644: sw    zero, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -8448,15 +8448,15 @@ L_103a610:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103a638: 0x103a638: bne   v0, zero, 0x103a610 addiu s0, s0, 24
+// 0x0103a648: 0x103a648: bne   v0, zero, 0x103a620 addiu s0, s0, 24
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 8
-	brtrue L_103a610
+	brtrue L_103a620
 // --- basic block ---
-// 0x0103a640: 0x103a640: jal   0x1000930 sll   zero, zero, 0
+// 0x0103a650: 0x103a650: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -8467,12 +8467,12 @@ L_103a610:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a648: 0x103a648: addiu v0, zero, 1
+// 0x0103a658: 0x103a658: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_103a64c:
-// 0x0103a64c: 0x103a64c: lw    ra, 828(sp)
-// 0x0103a650: 0x103a650: lw    s7, 824(sp)
+L_103a65c:
+// 0x0103a65c: 0x103a65c: lw    ra, 828(sp)
+// 0x0103a660: 0x103a660: lw    s7, 824(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8481,7 +8481,7 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103a654: 0x103a654: lw    s6, 820(sp)
+// 0x0103a664: 0x103a664: lw    s6, 820(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8490,7 +8490,7 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0103a658: 0x103a658: lw    s5, 816(sp)
+// 0x0103a668: 0x103a668: lw    s5, 816(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8499,7 +8499,7 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103a65c: 0x103a65c: lw    s4, 812(sp)
+// 0x0103a66c: 0x103a66c: lw    s4, 812(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8508,7 +8508,7 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103a660: 0x103a660: lw    s3, 808(sp)
+// 0x0103a670: 0x103a670: lw    s3, 808(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8517,7 +8517,7 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103a664: 0x103a664: lw    s2, 804(sp)
+// 0x0103a674: 0x103a674: lw    s2, 804(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8526,7 +8526,7 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103a668: 0x103a668: lw    s1, 800(sp)
+// 0x0103a678: 0x103a678: lw    s1, 800(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8535,7 +8535,7 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103a66c: 0x103a66c: lw    s0, 796(sp)
+// 0x0103a67c: 0x103a67c: lw    s0, 796(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8544,34 +8544,34 @@ L_103a64c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103a670: 0x103a670: jr    ra addiu sp, sp, 832
+// 0x0103a680: 0x103a680: jr    ra addiu sp, sp, 832
 	ldloc.0
 	ldc.i4 832
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_103a678:
-// 0x0103a678: 0x103a678: lui   a3, 0x10000
+L_103a688:
+// 0x0103a688: 0x103a688: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103a67c: 0x103a67c: addiu a1, a1, -11216
+// 0x0103a68c: 0x103a68c: addiu a1, a1, -11220
 	ldloc.2
-	ldc.i4 -11216
+	ldc.i4 -11220
 	add
 	stloc.2
-// 0x0103a680: 0x103a680: addiu a3, a3, -11072
+// 0x0103a690: 0x103a690: addiu a3, a3, -11076
 	ldloc 4
-	ldc.i4 -11072
+	ldc.i4 -11076
 	add
 	stloc 4
-// 0x0103a684: 0x103a684: addiu a0, zero, 4
+// 0x0103a694: 0x103a694: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103a688: 0x103a688: j	 0x103a374 addiu a2, zero, 285
+// 0x0103a698: 0x103a698: j	 0x103a384 addiu a2, zero, 285
 	ldc.i4 285
 	stloc.3
-	br L_103a374
+	br L_103a384
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
diff --git a/converted/Cibyl43.j b/converted/Cibyl43.j
index 0325a26..42a8364 100644
--- a/converted/Cibyl43.j
+++ b/converted/Cibyl43.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl43::.ctor
 
-.method public static int32 on_option_selected_103a690(int32,int32,int32,int32,int32)
+.method public static int32 on_option_selected_103a6a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra,int32 t0,int32 t1)
@@ -97,12 +97,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103a690: 0x103a690: addiu sp, sp, -168
+// 0x0103a6a0: 0x103a6a0: addiu sp, sp, -168
 	ldloc.0
 	ldc.i4 -168
 	add
 	stloc.0
-// 0x0103a694: 0x103a694: sw    s3, 156(sp)
+// 0x0103a6a4: 0x103a6a4: sw    s3, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -111,7 +111,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103a698: 0x103a698: sw    s2, 152(sp)
+// 0x0103a6a8: 0x103a6a8: sw    s2, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -120,7 +120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103a69c: 0x103a69c: sw    s1, 148(sp)
+// 0x0103a6ac: 0x103a6ac: sw    s1, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -129,7 +129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103a6a0: 0x103a6a0: sw    s0, 144(sp)
+// 0x0103a6b0: 0x103a6b0: sw    s0, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -138,8 +138,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103a6a4: 0x103a6a4: sw    ra, 164(sp)
-// 0x0103a6a8: 0x103a6a8: sw    s4, 160(sp)
+// 0x0103a6b4: 0x103a6b4: sw    ra, 164(sp)
+// 0x0103a6b8: 0x103a6b8: sw    s4, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -148,25 +148,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103a6ac: 0x103a6ac: lw    v1, 0(a0)
+// 0x0103a6bc: 0x103a6bc: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0103a6b0: 0x103a6b0: lw    v0, 0(a2)
+// 0x0103a6c0: 0x103a6c0: lw    v0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103a6b4: 0x103a6b4: lb    t1, 0(a3)
+// 0x0103a6c4: 0x103a6c4: lb    t1, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 15
-// 0x0103a6b8: 0x103a6b8: lw    t0, 4(a3)
+// 0x0103a6c8: 0x103a6c8: lw    t0, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -175,41 +175,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103a6bc: 0x103a6bc: addu  s0, a3, zero
+// 0x0103a6cc: 0x103a6cc: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x0103a6c0: 0x103a6c0: addu  s3, a1, zero
+// 0x0103a6d0: 0x103a6d0: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0103a6c4: 0x103a6c4: lui   a3, 0x10000
+// 0x0103a6d4: 0x103a6d4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103a6c8: 0x103a6c8: lui   a1, 0x10000
+// 0x0103a6d8: 0x103a6d8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103a6cc: 0x103a6cc: addu  s1, a0, zero
+// 0x0103a6dc: 0x103a6dc: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103a6d0: 0x103a6d0: addu  s2, a2, zero
+// 0x0103a6e0: 0x103a6e0: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0103a6d4: 0x103a6d4: addiu a3, a3, -10984
+// 0x0103a6e4: 0x103a6e4: addiu a3, a3, -10988
 	ldloc 4
-	ldc.i4 -10984
+	ldc.i4 -10988
 	add
 	stloc 4
-// 0x0103a6d8: 0x103a6d8: addiu a1, a1, -11216
+// 0x0103a6e8: 0x103a6e8: addiu a1, a1, -11220
 	ldloc.2
-	ldc.i4 -11216
+	ldc.i4 -11220
 	add
 	stloc.2
-// 0x0103a6dc: 0x103a6dc: addiu a0, zero, 2
+// 0x0103a6ec: 0x103a6ec: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103a6e0: 0x103a6e0: addiu a2, zero, 518
+// 0x0103a6f0: 0x103a6f0: addiu a2, zero, 518
 	ldc.i4 518
 	stloc.3
-// 0x0103a6e4: 0x103a6e4: sw    v1, 24(sp)
+// 0x0103a6f4: 0x103a6f4: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -218,7 +218,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a6e8: 0x103a6e8: sw    v0, 28(sp)
+// 0x0103a6f8: 0x103a6f8: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -227,7 +227,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a6ec: 0x103a6ec: sw    t1, 16(sp)
+// 0x0103a6fc: 0x103a6fc: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -236,7 +236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0103a6f0: 0x103a6f0: jal   0x100449c sw    t0, 20(sp)
+// 0x0103a700: 0x103a700: jal   0x100449c sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -255,41 +255,41 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a6f8: 0x103a6f8: lw    v0, 0(s2)
+// 0x0103a708: 0x103a708: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103a6fc: 0x103a6fc: lui   a0, 0x60000
+// 0x0103a70c: 0x103a70c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103a700: 0x103a700: lw    a1, 0(s3)
+// 0x0103a710: 0x103a710: lw    a1, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103a704: 0x103a704: lw    a3, 0(s1)
+// 0x0103a714: 0x103a714: lw    a3, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0103a708: 0x103a708: addiu v1, a0, -13728
+// 0x0103a718: 0x103a718: addiu v1, a0, -13264
 	ldloc.1
-	ldc.i4 -13728
+	ldc.i4 -13264
 	add
 	stloc 7
-// 0x0103a70c: 0x103a70c: sltiu a2, v0, 9
+// 0x0103a71c: 0x103a71c: sltiu a2, v0, 9
 	ldloc 5
 	ldc.i4.s 9
 	clt.un
 	stloc.3
-// 0x0103a710: 0x103a710: sw    a3, 4(v1)
+// 0x0103a720: 0x103a720: sw    a3, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -298,16 +298,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0103a714: 0x103a714: sw    s0, -13728(a0)
+// 0x0103a724: 0x103a724: sw    s0, -13264(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3432
+	ldc.i4 -3316
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103a718: 0x103a718: beq   a2, zero, 0x103a984 sw    a1, 8(v1)
+// 0x0103a728: 0x103a728: beq   a2, zero, 0x103a994 sw    a1, 8(v1)
 	ldloc.3
 	ldloc 6
 	ldloc 7
@@ -317,44 +317,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_103a984
+	brfalse L_103a994
 // --- basic block ---
-// 0x0103a720: 0x103a720: lui   v1, 0x20000
+// 0x0103a730: 0x103a730: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0103a724: 0x103a724: sll   v0, v0, 2
+// 0x0103a734: 0x103a734: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0103a728: 0x103a728: addiu v1, v1, 27348
+// 0x0103a738: 0x103a738: addiu v1, v1, 27812
 	ldloc 7
-	ldc.i4 27348
+	ldc.i4 27812
 	add
 	stloc 7
-// 0x0103a72c: 0x103a72c: addu  v0, v1, v0
+// 0x0103a73c: 0x103a73c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0103a730: 0x103a730: lw    v0, 0(v0)
+// 0x0103a740: 0x103a740: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103a734: 0x103a734: sll   zero, zero, 0
-// 0x0103a738: 0x103a738: jr    v0 sll   zero, zero, 0
+// 0x0103a744: 0x103a744: sll   zero, zero, 0
+// 0x0103a748: 0x103a748: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_103a740:
-// 0x0103a740: 0x103a740: lb    a0, 0(s0)
+L_103a750:
+// 0x0103a750: 0x103a750: lb    a0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0103a744: 0x103a744: jal   0x1037c10 addiu a2, sp, 40
+// 0x0103a754: 0x103a754: jal   0x1037c20 addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -364,12 +364,12 @@ L_103a740:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a74c: 0x103a74c: lw    a0, 48(sp)
+// 0x0103a75c: 0x103a75c: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -378,7 +378,7 @@ L_103a740:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a750: 0x103a750: jal   0x1001ba8 sll   zero, zero, 0
+// 0x0103a760: 0x103a760: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -389,7 +389,7 @@ L_103a740:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a758: 0x103a758: lw    a0, 44(sp)
+// 0x0103a768: 0x103a768: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -398,7 +398,7 @@ L_103a740:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a75c: 0x103a75c: jal   0x1001ba8 addu  s4, v0, zero
+// 0x0103a76c: 0x103a76c: jal   0x1001ba8 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -411,7 +411,7 @@ L_103a740:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a764: 0x103a764: lw    a0, 40(sp)
+// 0x0103a774: 0x103a774: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -420,7 +420,7 @@ L_103a740:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a768: 0x103a768: jal   0x1001ba8 addu  s3, v0, zero
+// 0x0103a778: 0x103a778: jal   0x1001ba8 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -433,7 +433,7 @@ L_103a740:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a770: 0x103a770: lw    a0, 52(sp)
+// 0x0103a780: 0x103a780: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -442,7 +442,7 @@ L_103a740:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a774: 0x103a774: jal   0x1001ba8 addu  s2, v0, zero
+// 0x0103a784: 0x103a784: jal   0x1001ba8 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -455,10 +455,10 @@ L_103a740:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a77c: 0x103a77c: addiu a0, zero, 8
+// 0x0103a78c: 0x103a78c: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x0103a780: 0x103a780: jal   0x103a02c addu  s1, v0, zero
+// 0x0103a790: 0x103a790: jal   0x103a03c addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -466,12 +466,12 @@ L_103a740:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::T_97_103a02c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::T_97_103a03c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a788: 0x103a788: lw    a0, 60(sp)
+// 0x0103a798: 0x103a798: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -480,7 +480,7 @@ L_103a740:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a78c: 0x103a78c: jal   0x1000d8c addu  s0, v0, zero
+// 0x0103a79c: 0x103a79c: jal   0x1000d8c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -493,7 +493,7 @@ L_103a740:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a794: 0x103a794: lw    a0, 64(sp)
+// 0x0103a7a4: 0x103a7a4: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -502,7 +502,7 @@ L_103a740:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a798: 0x103a798: jal   0x1000d8c sw    v0, 4(s0)
+// 0x0103a7a8: 0x103a7a8: jal   0x1000d8c sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -521,41 +521,41 @@ L_103a740:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a7a0: 0x103a7a0: lui   v1, 0x60000
+// 0x0103a7b0: 0x103a7b0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103a7a4: 0x103a7a4: lw    v1, -13728(v1)
+// 0x0103a7b4: 0x103a7b4: lw    v1, -13264(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3432
+	ldc.i4 -3316
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103a7a8: 0x103a7a8: sw    v0, 0(s0)
+// 0x0103a7b8: 0x103a7b8: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103a7ac: 0x103a7ac: addiu v0, zero, 1
+// 0x0103a7bc: 0x103a7bc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103a7b0: 0x103a7b0: addu  a0, s4, zero
+// 0x0103a7c0: 0x103a7c0: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0103a7b4: 0x103a7b4: addu  a1, s3, zero
+// 0x0103a7c4: 0x103a7c4: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0103a7b8: 0x103a7b8: addu  a2, s2, zero
+// 0x0103a7c8: 0x103a7c8: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x0103a7bc: 0x103a7bc: addu  a3, s1, zero
+// 0x0103a7cc: 0x103a7cc: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0103a7c0: 0x103a7c0: sw    v1, 20(sp)
+// 0x0103a7d0: 0x103a7d0: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -564,7 +564,7 @@ L_103a740:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a7c4: 0x103a7c4: sw    v0, 24(sp)
+// 0x0103a7d4: 0x103a7d4: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -573,7 +573,7 @@ L_103a740:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103a7c8: 0x103a7c8: j	 0x103a858 sw    s0, 16(sp)
+// 0x0103a7d8: 0x103a7d8: j	 0x103a868 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -582,14 +582,14 @@ L_103a740:
 	add
 	ldloc 8
 	stelem.i4
-	br L_103a858
+	br L_103a868
 // --- basic block ---
-L_103a7d0:
-// 0x0103a7d0: 0x103a7d0: lb    a0, 0(s0)
+L_103a7e0:
+// 0x0103a7e0: 0x103a7e0: lb    a0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0103a7d4: 0x103a7d4: jal   0x1037c10 addiu a2, sp, 40
+// 0x0103a7e4: 0x103a7e4: jal   0x1037c20 addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -599,12 +599,12 @@ L_103a7d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a7dc: 0x103a7dc: lw    a0, 48(sp)
+// 0x0103a7ec: 0x103a7ec: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -613,7 +613,7 @@ L_103a7d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a7e0: 0x103a7e0: jal   0x1001ba8 sll   zero, zero, 0
+// 0x0103a7f0: 0x103a7f0: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -624,7 +624,7 @@ L_103a7d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a7e8: 0x103a7e8: lw    a0, 44(sp)
+// 0x0103a7f8: 0x103a7f8: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -633,7 +633,7 @@ L_103a7d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a7ec: 0x103a7ec: jal   0x1001ba8 addu  s4, v0, zero
+// 0x0103a7fc: 0x103a7fc: jal   0x1001ba8 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -646,7 +646,7 @@ L_103a7d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a7f4: 0x103a7f4: lw    a0, 40(sp)
+// 0x0103a804: 0x103a804: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -655,7 +655,7 @@ L_103a7d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a7f8: 0x103a7f8: jal   0x1001ba8 addu  s3, v0, zero
+// 0x0103a808: 0x103a808: jal   0x1001ba8 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -668,7 +668,7 @@ L_103a7d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a800: 0x103a800: lw    a0, 52(sp)
+// 0x0103a810: 0x103a810: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -677,7 +677,7 @@ L_103a7d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a804: 0x103a804: jal   0x1001ba8 addu  s2, v0, zero
+// 0x0103a814: 0x103a814: jal   0x1001ba8 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -690,10 +690,10 @@ L_103a7d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a80c: 0x103a80c: addiu a0, zero, 8
+// 0x0103a81c: 0x103a81c: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x0103a810: 0x103a810: jal   0x103a02c addu  s1, v0, zero
+// 0x0103a820: 0x103a820: jal   0x103a03c addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -701,12 +701,12 @@ L_103a7d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::T_97_103a02c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::T_97_103a03c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a818: 0x103a818: lw    a0, 60(sp)
+// 0x0103a828: 0x103a828: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -715,7 +715,7 @@ L_103a7d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a81c: 0x103a81c: jal   0x1000d8c addu  s0, v0, zero
+// 0x0103a82c: 0x103a82c: jal   0x1000d8c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -728,7 +728,7 @@ L_103a7d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a824: 0x103a824: lw    a0, 64(sp)
+// 0x0103a834: 0x103a834: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -737,7 +737,7 @@ L_103a7d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a828: 0x103a828: jal   0x1000d8c sw    v0, 4(s0)
+// 0x0103a838: 0x103a838: jal   0x1000d8c sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -756,38 +756,38 @@ L_103a7d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a830: 0x103a830: lui   v1, 0x60000
+// 0x0103a840: 0x103a840: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103a834: 0x103a834: lw    v1, -13728(v1)
+// 0x0103a844: 0x103a844: lw    v1, -13264(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3432
+	ldc.i4 -3316
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103a838: 0x103a838: sw    v0, 0(s0)
+// 0x0103a848: 0x103a848: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103a83c: 0x103a83c: addu  a0, s4, zero
+// 0x0103a84c: 0x103a84c: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0103a840: 0x103a840: addu  a1, s3, zero
+// 0x0103a850: 0x103a850: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0103a844: 0x103a844: addu  a2, s2, zero
+// 0x0103a854: 0x103a854: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x0103a848: 0x103a848: addu  a3, s1, zero
+// 0x0103a858: 0x103a858: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0103a84c: 0x103a84c: sw    v1, 20(sp)
+// 0x0103a85c: 0x103a85c: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -796,7 +796,7 @@ L_103a7d0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a850: 0x103a850: sw    s0, 16(sp)
+// 0x0103a860: 0x103a860: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -805,7 +805,7 @@ L_103a7d0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103a854: 0x103a854: sw    zero, 24(sp)
+// 0x0103a864: 0x103a864: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -814,23 +814,23 @@ L_103a7d0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_103a858:
-// 0x0103a858: 0x103a858: jal   0x103a068 sll   zero, zero, 0
+L_103a868:
+// 0x0103a868: 0x103a868: jal   0x103a078 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::roadmap_address_show_103a068(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::roadmap_address_show_103a078(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a860: 0x103a860: beq   v0, zero, 0x103a870 sll   zero, zero, 0
+// 0x0103a870: 0x103a870: beq   v0, zero, 0x103a880 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103a870
+	brfalse L_103a880
 // --- basic block ---
-// 0x0103a868: 0x103a868: jal   0x1039e6c addu  a0, zero, zero
+// 0x0103a878: 0x103a878: jal   0x1039e7c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -838,13 +838,13 @@ L_103a858:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::hide_our_dialogs_1039e6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::hide_our_dialogs_1039e7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a870:
-// 0x0103a870: 0x103a870: jal   0x1000930 addu  a0, s0, zero
+L_103a880:
+// 0x0103a880: 0x103a880: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -857,7 +857,7 @@ L_103a870:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a878: 0x103a878: jal   0x1000930 addu  a0, s4, zero
+// 0x0103a888: 0x103a888: jal   0x1000930 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -870,7 +870,7 @@ L_103a870:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a880: 0x103a880: jal   0x1000930 addu  a0, s3, zero
+// 0x0103a890: 0x103a890: jal   0x1000930 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -883,7 +883,7 @@ L_103a870:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a888: 0x103a888: jal   0x1000930 addu  a0, s2, zero
+// 0x0103a898: 0x103a898: jal   0x1000930 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -896,7 +896,7 @@ L_103a870:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a890: 0x103a890: jal   0x1000930 addu  a0, s1, zero
+// 0x0103a8a0: 0x103a8a0: jal   0x1000930 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -909,70 +909,70 @@ L_103a870:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a898: 0x103a898: j	 0x103a984 sll   zero, zero, 0
-	br L_103a984
+// 0x0103a8a8: 0x103a8a8: j	 0x103a994 sll   zero, zero, 0
+	br L_103a994
 // --- basic block ---
-L_103a8a0:
-// 0x0103a8a0: 0x103a8a0: lb    v0, 0(s0)
+L_103a8b0:
+// 0x0103a8b0: 0x103a8b0: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103a8a4: 0x103a8a4: addiu v1, zero, 83
+// 0x0103a8b4: 0x103a8b4: addiu v1, zero, 83
 	ldc.i4.s 83
 	stloc 7
-// 0x0103a8a8: 0x103a8a8: bne   v0, v1, 0x103a8c0 addiu v1, zero, 65
+// 0x0103a8b8: 0x103a8b8: bne   v0, v1, 0x103a8d0 addiu v1, zero, 65
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 65
 	stloc 7
-	bne.un L_103a8c0
+	bne.un L_103a8d0
 // --- basic block ---
-// 0x0103a8b0: 0x103a8b0: lui   a1, 0x10000
+// 0x0103a8c0: 0x103a8c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103a8b4: 0x103a8b4: addiu a1, a1, -10856
+// 0x0103a8c4: 0x103a8c4: addiu a1, a1, -10860
 	ldloc.2
-	ldc.i4 -10856
+	ldc.i4 -10860
 	add
 	stloc.2
-// 0x0103a8b8: 0x103a8b8: j	 0x103a8dc addiu a0, sp, 40
+// 0x0103a8c8: 0x103a8c8: j	 0x103a8ec addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	br L_103a8dc
+	br L_103a8ec
 // --- basic block ---
-L_103a8c0:
-// 0x0103a8c0: 0x103a8c0: bne   v0, v1, 0x103a8d4 addiu a0, sp, 40
+L_103a8d0:
+// 0x0103a8d0: 0x103a8d0: bne   v0, v1, 0x103a8e4 addiu a0, sp, 40
 	ldloc 5
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-	bne.un L_103a8d4
+	bne.un L_103a8e4
 // --- basic block ---
-// 0x0103a8c8: 0x103a8c8: lui   a1, 0x10000
+// 0x0103a8d8: 0x103a8d8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103a8cc: 0x103a8cc: j	 0x103a8dc addiu a1, a1, -10808
+// 0x0103a8dc: 0x103a8dc: j	 0x103a8ec addiu a1, a1, -10812
 	ldloc.2
-	ldc.i4 -10808
+	ldc.i4 -10812
 	add
 	stloc.2
-	br L_103a8dc
+	br L_103a8ec
 // --- basic block ---
-L_103a8d4:
-// 0x0103a8d4: 0x103a8d4: lui   a1, 0x10000
+L_103a8e4:
+// 0x0103a8e4: 0x103a8e4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103a8d8: 0x103a8d8: addiu a1, a1, -10756
+// 0x0103a8e8: 0x103a8e8: addiu a1, a1, -10760
 	ldloc.2
-	ldc.i4 -10756
+	ldc.i4 -10760
 	add
 	stloc.2
-L_103a8dc:
-// 0x0103a8dc: 0x103a8dc: jal   0x1001b68 sll   zero, zero, 0
+L_103a8ec:
+// 0x0103a8ec: 0x103a8ec: jal   0x1001b68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcpy_1001b68(int32,int32)
@@ -980,15 +980,15 @@ L_103a8dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a8e4: 0x103a8e4: lui   v0, 0x60000
+// 0x0103a8f4: 0x103a8f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103a8e8: 0x103a8e8: addiu v0, v0, -13728
+// 0x0103a8f8: 0x103a8f8: addiu v0, v0, -13264
 	ldloc 5
-	ldc.i4 -13728
+	ldc.i4 -13264
 	add
 	stloc 5
-// 0x0103a8ec: 0x103a8ec: lw    a0, 4(v0)
+// 0x0103a8fc: 0x103a8fc: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -997,23 +997,23 @@ L_103a8dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a8f0: 0x103a8f0: lui   a3, 0x1040000
+// 0x0103a900: 0x103a900: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x0103a8f4: 0x103a8f4: addiu a3, a3, -24904
+// 0x0103a904: 0x103a904: addiu a3, a3, -24888
 	ldloc 4
-	ldc.i4 -24904
+	ldc.i4 -24888
 	add
 	stloc 4
-// 0x0103a8f8: 0x103a8f8: addiu a1, sp, 40
+// 0x0103a908: 0x103a908: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x0103a8fc: 0x103a8fc: addu  a2, zero, zero
+// 0x0103a90c: 0x103a90c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103a900: 0x103a900: jal   0x104c320 sw    v0, 16(sp)
+// 0x0103a910: 0x103a910: jal   0x104c330 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1027,21 +1027,21 @@ L_103a8dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a908: 0x103a908: j	 0x103a984 sll   zero, zero, 0
-	br L_103a984
+// 0x0103a918: 0x103a918: j	 0x103a994 sll   zero, zero, 0
+	br L_103a994
 // --- basic block ---
-L_103a910:
-// 0x0103a910: 0x103a910: lui   a0, 0x20000
+L_103a920:
+// 0x0103a920: 0x103a920: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0103a914: 0x103a914: jal   0x101cd60 addiu a0, a0, -18240
+// 0x0103a924: 0x103a924: jal   0x101cd70 addiu a0, a0, -17776
 	ldloc.1
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
 	ldloc.0
@@ -1049,42 +1049,42 @@ L_103a910:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a91c: 0x103a91c: lui   a1, 0x10000
+// 0x0103a92c: 0x103a92c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103a920: 0x103a920: lui   a2, 0x1040000
+// 0x0103a930: 0x103a930: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103a924: 0x103a924: lui   a3, 0x60000
+// 0x0103a934: 0x103a934: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0103a928: 0x103a928: addu  a0, v0, zero
+// 0x0103a938: 0x103a938: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103a92c: 0x103a92c: addiu a1, a1, 18500
+// 0x0103a93c: 0x103a93c: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0103a930: 0x103a930: addiu v0, zero, 1
+// 0x0103a940: 0x103a940: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103a934: 0x103a934: addiu a2, a2, -24744
+// 0x0103a944: 0x103a944: addiu a2, a2, -24728
 	ldloc.3
-	ldc.i4 -24744
+	ldc.i4 -24728
 	add
 	stloc.3
-// 0x0103a938: 0x103a938: addiu a3, a3, -13728
+// 0x0103a948: 0x103a948: addiu a3, a3, -13264
 	ldloc 4
-	ldc.i4 -13728
+	ldc.i4 -13264
 	add
 	stloc 4
-// 0x0103a93c: 0x103a93c: jal   0x1052e08 sw    v0, 16(sp)
+// 0x0103a94c: 0x103a94c: jal   0x1052e18 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1098,20 +1098,20 @@ L_103a910:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a944: 0x103a944: j	 0x103a984 sll   zero, zero, 0
-	br L_103a984
+// 0x0103a954: 0x103a954: j	 0x103a994 sll   zero, zero, 0
+	br L_103a994
 // --- basic block ---
-L_103a94c:
-// 0x0103a94c: 0x103a94c: lb    a0, 0(s0)
+L_103a95c:
+// 0x0103a95c: 0x103a95c: lb    a0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0103a950: 0x103a950: jal   0x1037c10 addiu a2, sp, 40
+// 0x0103a960: 0x103a960: jal   0x1037c20 addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1121,12 +1121,12 @@ L_103a94c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a958: 0x103a958: lw    a0, 60(sp)
+// 0x0103a968: 0x103a968: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1135,7 +1135,7 @@ L_103a94c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a95c: 0x103a95c: jal   0x1000d8c sll   zero, zero, 0
+// 0x0103a96c: 0x103a96c: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1146,7 +1146,7 @@ L_103a94c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a964: 0x103a964: lw    a0, 64(sp)
+// 0x0103a974: 0x103a974: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1155,7 +1155,7 @@ L_103a94c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103a968: 0x103a968: jal   0x1000d8c sw    v0, 36(sp)
+// 0x0103a978: 0x103a978: jal   0x1000d8c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1174,18 +1174,18 @@ L_103a94c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103a970: 0x103a970: addiu a0, sp, 32
+// 0x0103a980: 0x103a980: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0103a974: 0x103a974: addiu a1, zero, 1
+// 0x0103a984: 0x103a984: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0103a978: 0x103a978: addiu a2, zero, 1
+// 0x0103a988: 0x103a988: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0103a97c: 0x103a97c: jal   0x104a6bc sw    v0, 32(sp)
+// 0x0103a98c: 0x103a98c: jal   0x104a6cc sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1199,14 +1199,14 @@ L_103a94c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_reminder_add_at_position_104a6bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_reminder_add_at_position_104a6cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103a984:
-// 0x0103a984: 0x103a984: lw    ra, 164(sp)
-// 0x0103a988: 0x103a988: lw    s4, 160(sp)
+L_103a994:
+// 0x0103a994: 0x103a994: lw    ra, 164(sp)
+// 0x0103a998: 0x103a998: lw    s4, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1215,7 +1215,7 @@ L_103a984:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103a98c: 0x103a98c: lw    s3, 156(sp)
+// 0x0103a99c: 0x103a99c: lw    s3, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1224,7 +1224,7 @@ L_103a984:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103a990: 0x103a990: lw    s2, 152(sp)
+// 0x0103a9a0: 0x103a9a0: lw    s2, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1233,7 +1233,7 @@ L_103a984:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103a994: 0x103a994: lw    s1, 148(sp)
+// 0x0103a9a4: 0x103a9a4: lw    s1, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1242,7 +1242,7 @@ L_103a984:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103a998: 0x103a998: lw    s0, 144(sp)
+// 0x0103a9a8: 0x103a9a8: lw    s0, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1251,7 +1251,7 @@ L_103a984:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103a99c: 0x103a99c: jr    ra addiu sp, sp, 168
+// 0x0103a9ac: 0x103a9ac: jr    ra addiu sp, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
@@ -1261,23 +1261,23 @@ L_103a984:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17016640
-	beq  L_103a740
+	ldc.i4 17016656
+	beq  L_103a750
 	ldloc 5
-	ldc.i4 17016784
-	beq  L_103a7d0
+	ldc.i4 17016800
+	beq  L_103a7e0
 	ldloc 5
-	ldc.i4 17016992
-	beq  L_103a8a0
+	ldc.i4 17017008
+	beq  L_103a8b0
 	ldloc 5
-	ldc.i4 17017104
-	beq  L_103a910
+	ldc.i4 17017120
+	beq  L_103a920
 	ldloc 5
-	ldc.i4 17017164
-	beq  L_103a94c
+	ldc.i4 17017180
+	beq  L_103a95c
 	ldloc 5
-	ldc.i4 17017220
-	beq  L_103a984
+	ldc.i4 17017236
+	beq  L_103a994
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -1285,7 +1285,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 local_search_get_provider_103a9a4(int32,int32,int32,int32,int32)
+.method public static int32 local_search_get_provider_103a9b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1320,16 +1320,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103a9a4: 0x103a9a4: lui   a0, 0x0
+// 0x0103a9b4: 0x103a9b4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103a9a8: 0x103a9a8: addiu sp, sp, -24
+// 0x0103a9b8: 0x103a9b8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103a9ac: 0x103a9ac: sw    ra, 20(sp)
-// 0x0103a9b0: 0x103a9b0: jal   0x100e348 addiu a0, a0, 12736
+// 0x0103a9bc: 0x103a9bc: sw    ra, 20(sp)
+// 0x0103a9c0: 0x103a9c0: jal   0x100e358 addiu a0, a0, 12736
 	ldloc.1
 	ldc.i4 12736
 	add
@@ -1339,14 +1339,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0103a9b8: 0x103a9b8: lw    ra, 20(sp)
-// 0x0103a9bc: 0x103a9bc: sll   zero, zero, 0
-// 0x0103a9c0: 0x103a9c0: jr    ra addiu sp, sp, 24
+// 0x0103a9c8: 0x103a9c8: lw    ra, 20(sp)
+// 0x0103a9cc: 0x103a9cc: sll   zero, zero, 0
+// 0x0103a9d0: 0x103a9d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1358,7 +1358,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 local_search_resolve_address_103a9c8(int32,int32,int32,int32,int32)
+.method public static int32 local_search_resolve_address_103a9d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 v1,int32 ra)
@@ -1405,13 +1405,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103a9c8: 0x103a9c8: addiu sp, sp, -568
+// 0x0103a9d8: 0x103a9d8: addiu sp, sp, -568
 	ldloc.0
 	ldc.i4 -568
 	add
 	stloc.0
-// 0x0103a9cc: 0x103a9cc: sw    ra, 564(sp)
-// 0x0103a9d0: 0x103a9d0: sw    s3, 560(sp)
+// 0x0103a9dc: 0x103a9dc: sw    ra, 564(sp)
+// 0x0103a9e0: 0x103a9e0: sw    s3, 560(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1420,7 +1420,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103a9d4: 0x103a9d4: sw    s2, 556(sp)
+// 0x0103a9e4: 0x103a9e4: sw    s2, 556(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1429,13 +1429,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103a9d8: 0x103a9d8: addu  s3, a0, zero
+// 0x0103a9e8: 0x103a9e8: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0103a9dc: 0x103a9dc: addu  s2, a1, zero
+// 0x0103a9ec: 0x103a9ec: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0103a9e0: 0x103a9e0: sw    s1, 552(sp)
+// 0x0103a9f0: 0x103a9f0: sw    s1, 552(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1444,7 +1444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103a9e4: 0x103a9e4: sw    s0, 548(sp)
+// 0x0103a9f4: 0x103a9f4: sw    s0, 548(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1453,10 +1453,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103a9e8: 0x103a9e8: addu  s1, a2, zero
+// 0x0103a9f8: 0x103a9f8: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0103a9ec: 0x103a9ec: jal   0x103a9a4 addiu s0, sp, 32
+// 0x0103a9fc: 0x103a9fc: jal   0x103a9b4 addiu s0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1466,26 +1466,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_provider_103a9a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_provider_103a9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0103a9f4: 0x103a9f4: lui   a2, 0x10000
+// 0x0103aa04: 0x103aa04: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103a9f8: 0x103a9f8: addu  a0, s0, zero
+// 0x0103aa08: 0x103aa08: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103a9fc: 0x103a9fc: addiu a2, a2, -10564
+// 0x0103aa0c: 0x103aa0c: addiu a2, a2, -10568
 	ldloc.3
-	ldc.i4 -10564
+	ldc.i4 -10568
 	add
 	stloc.3
-// 0x0103aa00: 0x103aa00: addu  a3, v0, zero
+// 0x0103aa10: 0x103aa10: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0103aa04: 0x103aa04: jal   0x1000f9c addiu a1, zero, 512
+// 0x0103aa14: 0x103aa14: jal   0x1000f9c addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -1498,38 +1498,38 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0103aa0c: 0x103aa0c: lui   v0, 0x60000
+// 0x0103aa1c: 0x103aa1c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103aa10: 0x103aa10: lw    a0, -13600(v0)
+// 0x0103aa20: 0x103aa20: lw    a0, -13136(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3400
+	ldc.i4 -3284
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103aa14: 0x103aa14: lui   a1, 0x0
+// 0x0103aa24: 0x103aa24: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103aa18: 0x103aa18: lui   a3, 0x10000
+// 0x0103aa28: 0x103aa28: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103aa1c: 0x103aa1c: addiu a1, a1, 12672
+// 0x0103aa2c: 0x103aa2c: addiu a1, a1, 12672
 	ldloc.2
 	ldc.i4 12672
 	add
 	stloc.2
-// 0x0103aa20: 0x103aa20: addiu a3, a3, -10552
+// 0x0103aa30: 0x103aa30: addiu a3, a3, -10556
 	ldloc 4
-	ldc.i4 -10552
+	ldc.i4 -10556
 	add
 	stloc 4
-// 0x0103aa24: 0x103aa24: addiu a2, zero, 2
+// 0x0103aa34: 0x103aa34: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0103aa28: 0x103aa28: sw    s3, 16(sp)
+// 0x0103aa38: 0x103aa38: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1538,7 +1538,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103aa2c: 0x103aa2c: sw    s2, 20(sp)
+// 0x0103aa3c: 0x103aa3c: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1547,7 +1547,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103aa30: 0x103aa30: sw    s1, 24(sp)
+// 0x0103aa40: 0x103aa40: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1556,7 +1556,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103aa34: 0x103aa34: jal   0x103e744 sw    s0, 28(sp)
+// 0x0103aa44: 0x103aa44: jal   0x103e754 sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1570,13 +1570,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_resolve_address_103e744(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_resolve_address_103e754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0103aa3c: 0x103aa3c: lw    ra, 564(sp)
-// 0x0103aa40: 0x103aa40: lw    s3, 560(sp)
+// 0x0103aa4c: 0x103aa4c: lw    ra, 564(sp)
+// 0x0103aa50: 0x103aa50: lw    s3, 560(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1585,7 +1585,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103aa44: 0x103aa44: lw    s2, 556(sp)
+// 0x0103aa54: 0x103aa54: lw    s2, 556(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1594,7 +1594,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103aa48: 0x103aa48: lw    s1, 552(sp)
+// 0x0103aa58: 0x103aa58: lw    s1, 552(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1603,7 +1603,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103aa4c: 0x103aa4c: lw    s0, 548(sp)
+// 0x0103aa5c: 0x103aa5c: lw    s0, 548(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1612,7 +1612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103aa50: 0x103aa50: jr    ra addiu sp, sp, 568
+// 0x0103aa60: 0x103aa60: jr    ra addiu sp, sp, 568
 	ldloc.0
 	ldc.i4 568
 	add
@@ -1624,7 +1624,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 local_search_get_logo_name_103aa58(int32,int32,int32,int32,int32)
+.method public static int32 local_search_get_logo_name_103aa68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -1668,20 +1668,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103aa58: 0x103aa58: lui   a0, 0x0
+// 0x0103aa68: 0x103aa68: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103aa5c: 0x103aa5c: addiu sp, sp, -48
+// 0x0103aa6c: 0x103aa6c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103aa60: 0x103aa60: addiu a0, a0, 12688
+// 0x0103aa70: 0x103aa70: addiu a0, a0, 12688
 	ldloc.1
 	ldc.i4 12688
 	add
 	stloc.1
-// 0x0103aa64: 0x103aa64: sw    s0, 32(sp)
+// 0x0103aa74: 0x103aa74: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1690,8 +1690,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103aa68: 0x103aa68: sw    ra, 44(sp)
-// 0x0103aa6c: 0x103aa6c: sw    s2, 40(sp)
+// 0x0103aa78: 0x103aa78: sw    ra, 44(sp)
+// 0x0103aa7c: 0x103aa7c: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1700,7 +1700,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103aa70: 0x103aa70: jal   0x100e348 sw    s1, 36(sp)
+// 0x0103aa80: 0x103aa80: jal   0x100e358 sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1714,21 +1714,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0103aa78: 0x103aa78: addu  a2, v0, zero
+// 0x0103aa88: 0x103aa88: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0103aa7c: 0x103aa7c: addu  a0, zero, zero
+// 0x0103aa8c: 0x103aa8c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103aa80: 0x103aa80: addiu a1, zero, 1
+// 0x0103aa90: 0x103aa90: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0103aa84: 0x103aa84: jal   0x10a1918 addu  s0, v0, zero
+// 0x0103aa94: 0x103aa94: jal   0x10a1f60 addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.0
@@ -1736,58 +1736,58 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0103aa8c: 0x103aa8c: bne   v0, zero, 0x103aad8 lui   s2, 0x60000
+// 0x0103aa9c: 0x103aa9c: bne   v0, zero, 0x103aae8 lui   s2, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 9
-	brtrue L_103aad8
+	brtrue L_103aae8
 // --- basic block ---
-// 0x0103aa94: 0x103aa94: lw    v0, -13596(s2)
+// 0x0103aaa4: 0x103aaa4: lw    v0, -13132(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3399
+	ldc.i4 -3283
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103aa98: 0x103aa98: lui   s1, 0x10000
+// 0x0103aaa8: 0x103aaa8: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0103aa9c: 0x103aa9c: bne   v0, zero, 0x103aad4 addiu s1, s1, -10536
+// 0x0103aaac: 0x103aaac: bne   v0, zero, 0x103aae4 addiu s1, s1, -10540
 	ldloc 6
 	ldloc 8
-	ldc.i4 -10536
+	ldc.i4 -10540
 	add
 	stloc 8
-	brtrue L_103aad4
+	brtrue L_103aae4
 // --- basic block ---
-// 0x0103aaa4: 0x103aaa4: lui   a3, 0x10000
+// 0x0103aab4: 0x103aab4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103aaa8: 0x103aaa8: addu  a1, s0, zero
+// 0x0103aab8: 0x103aab8: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0103aaac: 0x103aaac: addiu a3, a3, 18500
+// 0x0103aabc: 0x103aabc: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0103aab0: 0x103aab0: addiu s0, zero, 1
+// 0x0103aac0: 0x103aac0: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0103aab4: 0x103aab4: addu  a0, zero, zero
+// 0x0103aac4: 0x103aac4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103aab8: 0x103aab8: addu  a2, zero, zero
+// 0x0103aac8: 0x103aac8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103aabc: 0x103aabc: sw    s0, 16(sp)
+// 0x0103aacc: 0x103aacc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1796,7 +1796,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103aac0: 0x103aac0: sw    zero, 20(sp)
+// 0x0103aad0: 0x103aad0: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1805,7 +1805,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103aac4: 0x103aac4: sw    zero, 24(sp)
+// 0x0103aad4: 0x103aad4: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1814,7 +1814,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103aac8: 0x103aac8: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0103aad8: 0x103aad8: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1828,30 +1828,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0103aad0: 0x103aad0: sw    s0, -13596(s2)
+// 0x0103aae0: 0x103aae0: sw    s0, -13132(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3399
+	ldc.i4 -3283
 	add
 	ldloc 7
 	stelem.i4
-L_103aad4:
-// 0x0103aad4: 0x103aad4: addu  s0, s1, zero
+L_103aae4:
+// 0x0103aae4: 0x103aae4: addu  s0, s1, zero
 	ldloc 8
 	stloc 7
-L_103aad8:
-// 0x0103aad8: 0x103aad8: lw    ra, 44(sp)
-// 0x0103aadc: 0x103aadc: addu  v0, s0, zero
+L_103aae8:
+// 0x0103aae8: 0x103aae8: lw    ra, 44(sp)
+// 0x0103aaec: 0x103aaec: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0103aae0: 0x103aae0: lw    s2, 40(sp)
+// 0x0103aaf0: 0x103aaf0: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1860,7 +1860,7 @@ L_103aad8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103aae4: 0x103aae4: lw    s1, 36(sp)
+// 0x0103aaf4: 0x103aaf4: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1869,7 +1869,7 @@ L_103aad8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103aae8: 0x103aae8: lw    s0, 32(sp)
+// 0x0103aaf8: 0x103aaf8: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1878,7 +1878,7 @@ L_103aad8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103aaec: 0x103aaec: jr    ra addiu sp, sp, 48
+// 0x0103aafc: 0x103aafc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1890,7 +1890,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 local_search_get_icon_name_103aaf4(int32,int32,int32,int32,int32)
+.method public static int32 local_search_get_icon_name_103ab04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 v1,int32 s1,int32 ra)
@@ -1934,20 +1934,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103aaf4: 0x103aaf4: lui   a0, 0x0
+// 0x0103ab04: 0x103ab04: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103aaf8: 0x103aaf8: addiu sp, sp, -48
+// 0x0103ab08: 0x103ab08: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103aafc: 0x103aafc: addiu a0, a0, 12704
+// 0x0103ab0c: 0x103ab0c: addiu a0, a0, 12704
 	ldloc.1
 	ldc.i4 12704
 	add
 	stloc.1
-// 0x0103ab00: 0x103ab00: sw    s0, 32(sp)
+// 0x0103ab10: 0x103ab10: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1956,8 +1956,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103ab04: 0x103ab04: sw    ra, 44(sp)
-// 0x0103ab08: 0x103ab08: sw    s2, 40(sp)
+// 0x0103ab14: 0x103ab14: sw    ra, 44(sp)
+// 0x0103ab18: 0x103ab18: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1966,7 +1966,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ab0c: 0x103ab0c: jal   0x100e348 sw    s1, 36(sp)
+// 0x0103ab1c: 0x103ab1c: jal   0x100e358 sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1980,21 +1980,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103ab14: 0x103ab14: addu  a2, v0, zero
+// 0x0103ab24: 0x103ab24: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0103ab18: 0x103ab18: addu  a0, zero, zero
+// 0x0103ab28: 0x103ab28: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103ab1c: 0x103ab1c: addiu a1, zero, 1
+// 0x0103ab2c: 0x103ab2c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0103ab20: 0x103ab20: jal   0x10a1918 addu  s0, v0, zero
+// 0x0103ab30: 0x103ab30: jal   0x10a1f60 addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.0
@@ -2002,16 +2002,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103ab28: 0x103ab28: bne   v0, zero, 0x103aba0 sll   zero, zero, 0
+// 0x0103ab38: 0x103ab38: bne   v0, zero, 0x103abb0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_103aba0
+	brtrue L_103abb0
 // --- basic block ---
-// 0x0103ab30: 0x103ab30: jal   0x103a9a4 lui   s1, 0x60000
+// 0x0103ab40: 0x103ab40: jal   0x103a9b4 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 10
 	ldloc.0
@@ -2019,34 +2019,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_provider_103a9a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_provider_103a9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103ab38: 0x103ab38: lui   a1, 0x10000
+// 0x0103ab48: 0x103ab48: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ab3c: 0x103ab3c: lui   a3, 0x10000
+// 0x0103ab4c: 0x103ab4c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ab40: 0x103ab40: addiu a1, a1, -10520
+// 0x0103ab50: 0x103ab50: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103ab44: 0x103ab44: addiu a3, a3, -10480
+// 0x0103ab54: 0x103ab54: addiu a3, a3, -10484
 	ldloc 4
-	ldc.i4 -10480
+	ldc.i4 -10484
 	add
 	stloc 4
-// 0x0103ab48: 0x103ab48: addiu a0, zero, 1
+// 0x0103ab58: 0x103ab58: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103ab4c: 0x103ab4c: addiu a2, zero, 323
+// 0x0103ab5c: 0x103ab5c: addiu a2, zero, 323
 	ldc.i4 323
 	stloc.3
-// 0x0103ab50: 0x103ab50: sw    v0, 20(sp)
+// 0x0103ab60: 0x103ab60: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2055,7 +2055,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103ab54: 0x103ab54: jal   0x100449c sw    s0, 16(sp)
+// 0x0103ab64: 0x103ab64: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2074,47 +2074,47 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103ab5c: 0x103ab5c: lw    v0, -13592(s1)
+// 0x0103ab6c: 0x103ab6c: lw    v0, -13128(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3398
+	ldc.i4 -3282
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103ab60: 0x103ab60: lui   s2, 0x10000
+// 0x0103ab70: 0x103ab70: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0103ab64: 0x103ab64: bne   v0, zero, 0x103ab9c addiu s2, s2, -10424
+// 0x0103ab74: 0x103ab74: bne   v0, zero, 0x103abac addiu s2, s2, -10428
 	ldloc 6
 	ldloc 8
-	ldc.i4 -10424
+	ldc.i4 -10428
 	add
 	stloc 8
-	brtrue L_103ab9c
+	brtrue L_103abac
 // --- basic block ---
-// 0x0103ab6c: 0x103ab6c: lui   a3, 0x10000
+// 0x0103ab7c: 0x103ab7c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ab70: 0x103ab70: addu  a1, s0, zero
+// 0x0103ab80: 0x103ab80: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0103ab74: 0x103ab74: addiu a3, a3, 18500
+// 0x0103ab84: 0x103ab84: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0103ab78: 0x103ab78: addiu s0, zero, 1
+// 0x0103ab88: 0x103ab88: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0103ab7c: 0x103ab7c: addu  a0, zero, zero
+// 0x0103ab8c: 0x103ab8c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103ab80: 0x103ab80: addu  a2, zero, zero
+// 0x0103ab90: 0x103ab90: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103ab84: 0x103ab84: sw    s0, 16(sp)
+// 0x0103ab94: 0x103ab94: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2123,7 +2123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103ab88: 0x103ab88: sw    zero, 20(sp)
+// 0x0103ab98: 0x103ab98: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2132,7 +2132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103ab8c: 0x103ab8c: sw    zero, 24(sp)
+// 0x0103ab9c: 0x103ab9c: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2141,7 +2141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103ab90: 0x103ab90: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0103aba0: 0x103aba0: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2155,30 +2155,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103ab98: 0x103ab98: sw    s0, -13592(s1)
+// 0x0103aba8: 0x103aba8: sw    s0, -13128(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3398
+	ldc.i4 -3282
 	add
 	ldloc 7
 	stelem.i4
-L_103ab9c:
-// 0x0103ab9c: 0x103ab9c: addu  s0, s2, zero
+L_103abac:
+// 0x0103abac: 0x103abac: addu  s0, s2, zero
 	ldloc 8
 	stloc 7
-L_103aba0:
-// 0x0103aba0: 0x103aba0: lw    ra, 44(sp)
-// 0x0103aba4: 0x103aba4: addu  v0, s0, zero
+L_103abb0:
+// 0x0103abb0: 0x103abb0: lw    ra, 44(sp)
+// 0x0103abb4: 0x103abb4: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0103aba8: 0x103aba8: lw    s2, 40(sp)
+// 0x0103abb8: 0x103abb8: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2187,7 +2187,7 @@ L_103aba0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103abac: 0x103abac: lw    s1, 36(sp)
+// 0x0103abbc: 0x103abbc: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2196,7 +2196,7 @@ L_103aba0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103abb0: 0x103abb0: lw    s0, 32(sp)
+// 0x0103abc0: 0x103abc0: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2205,7 +2205,7 @@ L_103aba0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103abb4: 0x103abb4: jr    ra addiu sp, sp, 48
+// 0x0103abc4: 0x103abc4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2217,7 +2217,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 local_search_get_provider_label_103abbc(int32,int32,int32,int32,int32)
+.method public static int32 local_search_get_provider_label_103abcc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -2255,21 +2255,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103abbc: 0x103abbc: lui   a0, 0x0
+// 0x0103abcc: 0x103abcc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103abc0: 0x103abc0: addiu sp, sp, -24
+// 0x0103abd0: 0x103abd0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103abc4: 0x103abc4: addiu a0, a0, 12720
+// 0x0103abd4: 0x103abd4: addiu a0, a0, 12720
 	ldloc.1
 	ldc.i4 12720
 	add
 	stloc.1
-// 0x0103abc8: 0x103abc8: sw    ra, 20(sp)
-// 0x0103abcc: 0x103abcc: jal   0x100e348 sw    s0, 16(sp)
+// 0x0103abd8: 0x103abd8: sw    ra, 20(sp)
+// 0x0103abdc: 0x103abdc: jal   0x100e358 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2283,23 +2283,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103abd4: 0x103abd4: lui   s0, 0x60000
+// 0x0103abe4: 0x103abe4: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103abd8: 0x103abd8: addiu a0, s0, -13588
+// 0x0103abe8: 0x103abe8: addiu a0, s0, -13124
 	ldloc 7
-	ldc.i4 -13588
+	ldc.i4 -13124
 	add
 	stloc.1
-// 0x0103abdc: 0x103abdc: addu  a1, v0, zero
+// 0x0103abec: 0x103abec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103abe0: 0x103abe0: jal   0x1001af8 addiu a2, zero, 128
+// 0x0103abf0: 0x103abf0: jal   0x1001af8 addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.1
@@ -2308,63 +2308,63 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103abe8: 0x103abe8: lbu   v0, -13588(s0)
+// 0x0103abf8: 0x103abf8: lbu   v0, -13124(s0)
 	ldloc 7
-	ldc.i4 -13588
+	ldc.i4 -13124
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0103abec: 0x103abec: addiu a0, s0, -13588
+// 0x0103abfc: 0x103abfc: addiu a0, s0, -13124
 	ldloc 7
-	ldc.i4 -13588
+	ldc.i4 -13124
 	add
 	stloc.1
-// 0x0103abf0: 0x103abf0: addiu v1, v0, -97
+// 0x0103ac00: 0x103ac00: addiu v1, v0, -97
 	ldloc 5
 	ldc.i4.s -97
 	add
 	stloc 6
-// 0x0103abf4: 0x103abf4: andi  v1, v1, 255
+// 0x0103ac04: 0x103ac04: andi  v1, v1, 255
 	ldloc 6
 	ldc.i4 255
 	and
 	stloc 6
-// 0x0103abf8: 0x103abf8: sltiu v1, v1, 26
+// 0x0103ac08: 0x103ac08: sltiu v1, v1, 26
 	ldloc 6
 	ldc.i4.s 26
 	clt.un
 	stloc 6
-// 0x0103abfc: 0x103abfc: beq   v1, zero, 0x103ac0c sb    zero, 127(a0)
+// 0x0103ac0c: 0x103ac0c: beq   v1, zero, 0x103ac1c sb    zero, 127(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.s 127
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brfalse L_103ac0c
+	brfalse L_103ac1c
 // --- basic block ---
-// 0x0103ac04: 0x103ac04: addiu v0, v0, -32
+// 0x0103ac14: 0x103ac14: addiu v0, v0, -32
 	ldloc 5
 	ldc.i4.s -32
 	add
 	stloc 5
-// 0x0103ac08: 0x103ac08: sb    v0, -13588(s0)
+// 0x0103ac18: 0x103ac18: sb    v0, -13124(s0)
 	ldloc 7
-	ldc.i4 -13588
+	ldc.i4 -13124
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_103ac0c:
-// 0x0103ac0c: 0x103ac0c: lw    ra, 20(sp)
-// 0x0103ac10: 0x103ac10: lui   v0, 0x60000
+L_103ac1c:
+// 0x0103ac1c: 0x103ac1c: lw    ra, 20(sp)
+// 0x0103ac20: 0x103ac20: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ac14: 0x103ac14: addiu v0, v0, -13588
+// 0x0103ac24: 0x103ac24: addiu v0, v0, -13124
 	ldloc 5
-	ldc.i4 -13588
+	ldc.i4 -13124
 	add
 	stloc 5
-// 0x0103ac18: 0x103ac18: lw    s0, 16(sp)
+// 0x0103ac28: 0x103ac28: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2373,7 +2373,7 @@ L_103ac0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103ac1c: 0x103ac1c: jr    ra addiu sp, sp, 24
+// 0x0103ac2c: 0x103ac2c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2385,7 +2385,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 local_search_term_103ac24(int32,int32,int32,int32,int32)
+.method public static int32 local_search_term_103ac34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -2423,12 +2423,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ac24: 0x103ac24: addiu sp, sp, -24
+// 0x0103ac34: 0x103ac34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103ac28: 0x103ac28: sw    s0, 16(sp)
+// 0x0103ac38: 0x103ac38: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2437,43 +2437,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103ac2c: 0x103ac2c: lui   s0, 0x60000
+// 0x0103ac3c: 0x103ac3c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103ac30: 0x103ac30: lw    v0, -13600(s0)
+// 0x0103ac40: 0x103ac40: lw    v0, -13136(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3400
+	ldc.i4 -3284
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103ac34: 0x103ac34: sll   zero, zero, 0
-// 0x0103ac38: 0x103ac38: beq   v0, zero, 0x103ac6c sw    ra, 20(sp)
+// 0x0103ac44: 0x103ac44: sll   zero, zero, 0
+// 0x0103ac48: 0x103ac48: beq   v0, zero, 0x103ac7c sw    ra, 20(sp)
 	ldloc 7
-	brfalse L_103ac6c
+	brfalse L_103ac7c
 // --- basic block ---
-// 0x0103ac40: 0x103ac40: lui   a1, 0x10000
+// 0x0103ac50: 0x103ac50: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ac44: 0x103ac44: lui   a3, 0x10000
+// 0x0103ac54: 0x103ac54: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ac48: 0x103ac48: addiu a1, a1, -10520
+// 0x0103ac58: 0x103ac58: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103ac4c: 0x103ac4c: addiu a3, a3, -10408
+// 0x0103ac5c: 0x103ac5c: addiu a3, a3, -10412
 	ldloc 4
-	ldc.i4 -10408
+	ldc.i4 -10412
 	add
 	stloc 4
-// 0x0103ac50: 0x103ac50: addiu a0, zero, 1
+// 0x0103ac60: 0x103ac60: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103ac54: 0x103ac54: jal   0x100449c addiu a2, zero, 282
+// 0x0103ac64: 0x103ac64: jal   0x100449c addiu a2, zero, 282
 	ldc.i4 282
 	stloc.3
 	ldloc.0
@@ -2486,38 +2486,38 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0103ac5c: 0x103ac5c: lw    a0, -13600(s0)
+// 0x0103ac6c: 0x103ac6c: lw    a0, -13136(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3400
+	ldc.i4 -3284
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103ac60: 0x103ac60: jal   0x106a494 sll   zero, zero, 0
+// 0x0103ac70: 0x103ac70: jal   0x106aa9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_term_106a494(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_term_106aa9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0103ac68: 0x103ac68: sw    zero, -13600(s0)
+// 0x0103ac78: 0x103ac78: sw    zero, -13136(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3400
+	ldc.i4 -3284
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_103ac6c:
-// 0x0103ac6c: 0x103ac6c: lw    ra, 20(sp)
-// 0x0103ac70: 0x103ac70: lw    s0, 16(sp)
+L_103ac7c:
+// 0x0103ac7c: 0x103ac7c: lw    ra, 20(sp)
+// 0x0103ac80: 0x103ac80: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2526,7 +2526,7 @@ L_103ac6c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103ac74: 0x103ac74: jr    ra addiu sp, sp, 24
+// 0x0103ac84: 0x103ac84: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2538,7 +2538,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 local_search_init_103ac7c(int32,int32,int32,int32,int32)
+.method public static int32 local_search_init_103ac8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -2579,25 +2579,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ac7c: 0x103ac7c: lui   v0, 0x60000
+// 0x0103ac8c: 0x103ac8c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ac80: 0x103ac80: lw    v1, -13600(v0)
+// 0x0103ac90: 0x103ac90: lw    v1, -13136(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3400
+	ldc.i4 -3284
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103ac84: 0x103ac84: addiu sp, sp, -40
+// 0x0103ac94: 0x103ac94: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103ac88: 0x103ac88: sw    ra, 36(sp)
-// 0x0103ac8c: 0x103ac8c: sw    s1, 32(sp)
+// 0x0103ac98: 0x103ac98: sw    ra, 36(sp)
+// 0x0103ac9c: 0x103ac9c: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2606,7 +2606,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103ac90: 0x103ac90: sw    s0, 28(sp)
+// 0x0103aca0: 0x103aca0: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2615,53 +2615,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ac94: 0x103ac94: bne   v1, zero, 0x103adbc addiu v0, zero, 1
+// 0x0103aca4: 0x103aca4: bne   v1, zero, 0x103adcc addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brtrue L_103adbc
+	brtrue L_103adcc
 // --- basic block ---
-// 0x0103ac9c: 0x103ac9c: lui   s1, 0x60000
+// 0x0103acac: 0x103acac: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0103aca0: 0x103aca0: lw    v0, -13460(s1)
+// 0x0103acb0: 0x103acb0: lw    v0, -12996(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3365
+	ldc.i4 -3249
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103aca4: 0x103aca4: sll   zero, zero, 0
-// 0x0103aca8: 0x103aca8: bne   v0, zero, 0x103ad44 lui   s0, 0x10000
+// 0x0103acb4: 0x103acb4: sll   zero, zero, 0
+// 0x0103acb8: 0x103acb8: bne   v0, zero, 0x103ad54 lui   s0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brtrue L_103ad44
+	brtrue L_103ad54
 // --- basic block ---
-// 0x0103acb0: 0x103acb0: lui   a1, 0x0
+// 0x0103acc0: 0x103acc0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103acb4: 0x103acb4: lui   a2, 0x10000
+// 0x0103acc4: 0x103acc4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103acb8: 0x103acb8: addiu a1, a1, 12752
+// 0x0103acc8: 0x103acc8: addiu a1, a1, 12752
 	ldloc.2
 	ldc.i4 12752
 	add
 	stloc.2
-// 0x0103acbc: 0x103acbc: addiu a2, a2, 18500
+// 0x0103accc: 0x103accc: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0103acc0: 0x103acc0: addiu a0, s0, 12560
+// 0x0103acd0: 0x103acd0: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103acc4: 0x103acc4: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103acd4: 0x103acd4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2669,33 +2669,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103accc: 0x103accc: lui   a1, 0x0
+// 0x0103acdc: 0x103acdc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103acd0: 0x103acd0: lui   a2, 0x10000
+// 0x0103ace0: 0x103ace0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103acd4: 0x103acd4: addiu a1, a1, 12736
+// 0x0103ace4: 0x103ace4: addiu a1, a1, 12736
 	ldloc.2
 	ldc.i4 12736
 	add
 	stloc.2
-// 0x0103acd8: 0x103acd8: addiu a2, a2, -10364
+// 0x0103ace8: 0x103ace8: addiu a2, a2, -10368
 	ldloc.3
-	ldc.i4 -10364
+	ldc.i4 -10368
 	add
 	stloc.3
-// 0x0103acdc: 0x103acdc: addiu a0, s0, 12560
+// 0x0103acec: 0x103acec: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103ace0: 0x103ace0: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103acf0: 0x103acf0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2703,33 +2703,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ace8: 0x103ace8: lui   a1, 0x0
+// 0x0103acf8: 0x103acf8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103acec: 0x103acec: lui   a2, 0x10000
+// 0x0103acfc: 0x103acfc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103acf0: 0x103acf0: addiu a1, a1, 12720
+// 0x0103ad00: 0x103ad00: addiu a1, a1, 12720
 	ldloc.2
 	ldc.i4 12720
 	add
 	stloc.2
-// 0x0103acf4: 0x103acf4: addiu a2, a2, -10380
+// 0x0103ad04: 0x103ad04: addiu a2, a2, -10384
 	ldloc.3
-	ldc.i4 -10380
+	ldc.i4 -10384
 	add
 	stloc.3
-// 0x0103acf8: 0x103acf8: addiu a0, s0, 12560
+// 0x0103ad08: 0x103ad08: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103acfc: 0x103acfc: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103ad0c: 0x103ad0c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2737,33 +2737,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ad04: 0x103ad04: lui   a1, 0x0
+// 0x0103ad14: 0x103ad14: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103ad08: 0x103ad08: lui   a2, 0x10000
+// 0x0103ad18: 0x103ad18: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103ad0c: 0x103ad0c: addiu a1, a1, 12704
+// 0x0103ad1c: 0x103ad1c: addiu a1, a1, 12704
 	ldloc.2
 	ldc.i4 12704
 	add
 	stloc.2
-// 0x0103ad10: 0x103ad10: addiu a2, a2, -10372
+// 0x0103ad20: 0x103ad20: addiu a2, a2, -10376
 	ldloc.3
-	ldc.i4 -10372
+	ldc.i4 -10376
 	add
 	stloc.3
-// 0x0103ad14: 0x103ad14: addiu a0, s0, 12560
+// 0x0103ad24: 0x103ad24: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103ad18: 0x103ad18: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103ad28: 0x103ad28: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2771,33 +2771,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ad20: 0x103ad20: lui   a1, 0x0
+// 0x0103ad30: 0x103ad30: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103ad24: 0x103ad24: lui   a2, 0x10000
+// 0x0103ad34: 0x103ad34: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103ad28: 0x103ad28: addiu a0, s0, 12560
+// 0x0103ad38: 0x103ad38: addiu a0, s0, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103ad2c: 0x103ad2c: addiu a1, a1, 12688
+// 0x0103ad3c: 0x103ad3c: addiu a1, a1, 12688
 	ldloc.2
 	ldc.i4 12688
 	add
 	stloc.2
-// 0x0103ad30: 0x103ad30: addiu a2, a2, -10356
+// 0x0103ad40: 0x103ad40: addiu a2, a2, -10360
 	ldloc.3
-	ldc.i4 -10356
+	ldc.i4 -10360
 	add
 	stloc.3
-// 0x0103ad34: 0x103ad34: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103ad44: 0x103ad44: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2805,28 +2805,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ad3c: 0x103ad3c: addiu v0, zero, 1
+// 0x0103ad4c: 0x103ad4c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103ad40: 0x103ad40: sw    v0, -13460(s1)
+// 0x0103ad50: 0x103ad50: sw    v0, -12996(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3365
+	ldc.i4 -3249
 	add
 	ldloc 5
 	stelem.i4
-L_103ad44:
-// 0x0103ad44: 0x103ad44: lui   s1, 0x0
+L_103ad54:
+// 0x0103ad54: 0x103ad54: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0103ad48: 0x103ad48: jal   0x100e348 addiu a0, s1, 12752
+// 0x0103ad58: 0x103ad58: jal   0x100e358 addiu a0, s1, 12752
 	ldloc 9
 	ldc.i4 12752
 	add
@@ -2836,17 +2836,17 @@ L_103ad44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ad50: 0x103ad50: addiu a0, s1, 12752
+// 0x0103ad60: 0x103ad60: addiu a0, s1, 12752
 	ldloc 9
 	ldc.i4 12752
 	add
 	stloc.1
-// 0x0103ad54: 0x103ad54: jal   0x100e348 addu  s0, v0, zero
+// 0x0103ad64: 0x103ad64: jal   0x100e358 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2854,20 +2854,20 @@ L_103ad44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ad5c: 0x103ad5c: lui   a1, 0x10000
+// 0x0103ad6c: 0x103ad6c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ad60: 0x103ad60: addiu a1, a1, -28184
+// 0x0103ad70: 0x103ad70: addiu a1, a1, -28184
 	ldloc.2
 	ldc.i4 -28184
 	add
 	stloc.2
-// 0x0103ad64: 0x103ad64: jal   0x106a1ac addu  a0, v0, zero
+// 0x0103ad74: 0x103ad74: jal   0x106a798 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2875,49 +2875,49 @@ L_103ad44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_init_106a1ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_init_106a798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ad6c: 0x103ad6c: lui   v1, 0x60000
+// 0x0103ad7c: 0x103ad7c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103ad70: 0x103ad70: sw    v0, -13600(v1)
+// 0x0103ad80: 0x103ad80: sw    v0, -13136(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3400
+	ldc.i4 -3284
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103ad74: 0x103ad74: beq   v0, zero, 0x103ada0 lui   a1, 0x10000
+// 0x0103ad84: 0x103ad84: beq   v0, zero, 0x103adb0 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103ada0
+	brfalse L_103adb0
 // --- basic block ---
-// 0x0103ad7c: 0x103ad7c: lui   a3, 0x10000
+// 0x0103ad8c: 0x103ad8c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ad80: 0x103ad80: addiu a1, a1, -10520
+// 0x0103ad90: 0x103ad90: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103ad84: 0x103ad84: addiu a3, a3, -10340
+// 0x0103ad94: 0x103ad94: addiu a3, a3, -10344
 	ldloc 4
-	ldc.i4 -10340
+	ldc.i4 -10344
 	add
 	stloc 4
-// 0x0103ad88: 0x103ad88: addiu a0, zero, 1
+// 0x0103ad98: 0x103ad98: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103ad8c: 0x103ad8c: addiu a2, zero, 267
+// 0x0103ad9c: 0x103ad9c: addiu a2, zero, 267
 	ldc.i4 267
 	stloc.3
-// 0x0103ad90: 0x103ad90: jal   0x100449c sw    s0, 16(sp)
+// 0x0103ada0: 0x103ada0: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2936,29 +2936,29 @@ L_103ad44:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ad98: 0x103ad98: j	 0x103adbc addiu v0, zero, 1
+// 0x0103ada8: 0x103ada8: j	 0x103adcc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_103adbc
+	br L_103adcc
 // --- basic block ---
-L_103ada0:
-// 0x0103ada0: 0x103ada0: lui   a3, 0x10000
+L_103adb0:
+// 0x0103adb0: 0x103adb0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ada4: 0x103ada4: addiu a1, a1, -10520
+// 0x0103adb4: 0x103adb4: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103ada8: 0x103ada8: addiu a3, a3, -10292
+// 0x0103adb8: 0x103adb8: addiu a3, a3, -10296
 	ldloc 4
-	ldc.i4 -10292
+	ldc.i4 -10296
 	add
 	stloc 4
-// 0x0103adac: 0x103adac: addiu a0, zero, 4
+// 0x0103adbc: 0x103adbc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103adb0: 0x103adb0: jal   0x100449c addiu a2, zero, 273
+// 0x0103adc0: 0x103adc0: jal   0x100449c addiu a2, zero, 273
 	ldc.i4 273
 	stloc.3
 	ldloc.0
@@ -2971,12 +2971,12 @@ L_103ada0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103adb8: 0x103adb8: addu  v0, zero, zero
+// 0x0103adc8: 0x103adc8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_103adbc:
-// 0x0103adbc: 0x103adbc: lw    ra, 36(sp)
-// 0x0103adc0: 0x103adc0: lw    s1, 32(sp)
+L_103adcc:
+// 0x0103adcc: 0x103adcc: lw    ra, 36(sp)
+// 0x0103add0: 0x103add0: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2985,7 +2985,7 @@ L_103adbc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103adc4: 0x103adc4: lw    s0, 28(sp)
+// 0x0103add4: 0x103add4: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2994,7 +2994,7 @@ L_103adbc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103adc8: 0x103adc8: jr    ra addiu sp, sp, 40
+// 0x0103add8: 0x103add8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3006,7 +3006,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 local_candidate_build_address_string_103add0(int32,int32,int32,int32,int32)
+.method public static int32 local_candidate_build_address_string_103ade0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 hi,int32 lo)
@@ -3065,12 +3065,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103add0: 0x103add0: addiu sp, sp, -256
+// 0x0103ade0: 0x103ade0: addiu sp, sp, -256
 	ldloc.0
 	ldc.i4 -256
 	add
 	stloc.0
-// 0x0103add4: 0x103add4: sw    s4, 244(sp)
+// 0x0103ade4: 0x103ade4: sw    s4, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3079,7 +3079,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103add8: 0x103add8: sw    s0, 228(sp)
+// 0x0103ade8: 0x103ade8: sw    s0, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3088,8 +3088,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103addc: 0x103addc: sw    ra, 252(sp)
-// 0x0103ade0: 0x103ade0: sw    s5, 248(sp)
+// 0x0103adec: 0x103adec: sw    ra, 252(sp)
+// 0x0103adf0: 0x103adf0: sw    s5, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3098,7 +3098,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103ade4: 0x103ade4: sw    s3, 240(sp)
+// 0x0103adf4: 0x103adf4: sw    s3, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3107,7 +3107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103ade8: 0x103ade8: sw    s2, 236(sp)
+// 0x0103adf8: 0x103adf8: sw    s2, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3116,7 +3116,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103adec: 0x103adec: sw    s1, 232(sp)
+// 0x0103adfc: 0x103adfc: sw    s1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3125,7 +3125,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103adf0: 0x103adf0: lw    s4, 284(a0)
+// 0x0103ae00: 0x103ae00: lw    s4, 284(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3134,85 +3134,85 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103adf4: 0x103adf4: lb    s2, 90(a0)
+// 0x0103ae04: 0x103ae04: lb    s2, 90(a0)
 	ldloc.1
 	ldc.i4.s 90
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x0103adf8: 0x103adf8: lb    s1, 154(a0)
+// 0x0103ae08: 0x103ae08: lb    s1, 154(a0)
 	ldloc.1
 	ldc.i4 154
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x0103adfc: 0x103adfc: lb    v0, 288(a0)
+// 0x0103ae0c: 0x103ae0c: lb    v0, 288(a0)
 	ldloc.1
 	ldc.i4 288
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103ae00: 0x103ae00: addiu s4, s4, 1
+// 0x0103ae10: 0x103ae10: addiu s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x0103ae04: 0x103ae04: addu  s0, a0, zero
+// 0x0103ae14: 0x103ae14: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0103ae08: 0x103ae08: sltu  s2, zero, s2
+// 0x0103ae18: 0x103ae18: sltu  s2, zero, s2
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 10
-// 0x0103ae0c: 0x103ae0c: sltu  s1, zero, s1
+// 0x0103ae1c: 0x103ae1c: sltu  s1, zero, s1
 	ldc.i4.s 0
 	ldloc 9
 	clt.un
 	stloc 9
-// 0x0103ae10: 0x103ae10: sb    zero, 823(a0)
+// 0x0103ae20: 0x103ae20: sb    zero, 823(a0)
 	ldloc.1
 	ldc.i4 823
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0103ae14: 0x103ae14: lb    s5, 539(a0)
+// 0x0103ae24: 0x103ae24: lb    s5, 539(a0)
 	ldloc.1
 	ldc.i4 539
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 13
-// 0x0103ae18: 0x103ae18: lb    s3, 24(a0)
+// 0x0103ae28: 0x103ae28: lb    s3, 24(a0)
 	ldloc.1
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 11
-// 0x0103ae1c: 0x103ae1c: beq   v0, zero, 0x103ae3c sltu  s4, zero, s4
+// 0x0103ae2c: 0x103ae2c: beq   v0, zero, 0x103ae4c sltu  s4, zero, s4
 	ldloc 5
 	ldc.i4.s 0
 	ldloc 12
 	clt.un
 	stloc 12
-	brfalse L_103ae3c
+	brfalse L_103ae4c
 // --- basic block ---
-// 0x0103ae24: 0x103ae24: lui   a2, 0x20000
+// 0x0103ae34: 0x103ae34: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0103ae28: 0x103ae28: addiu a2, a2, -29620
+// 0x0103ae38: 0x103ae38: addiu a2, a2, -29156
 	ldloc.3
-	ldc.i4 -29620
+	ldc.i4 -29156
 	add
 	stloc.3
-// 0x0103ae2c: 0x103ae2c: addiu a0, a0, 823
+// 0x0103ae3c: 0x103ae3c: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103ae30: 0x103ae30: addiu a1, zero, 267
+// 0x0103ae40: 0x103ae40: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103ae34: 0x103ae34: jal   0x1000f9c addiu a3, s0, 288
+// 0x0103ae44: 0x103ae44: jal   0x1000f9c addiu a3, s0, 288
 	ldloc 8
 	ldc.i4 288
 	add
@@ -3227,54 +3227,54 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103ae3c:
-// 0x0103ae3c: 0x103ae3c: beq   s3, zero, 0x103af6c sll   zero, zero, 0
+L_103ae4c:
+// 0x0103ae4c: 0x103ae4c: beq   s3, zero, 0x103af7c sll   zero, zero, 0
 	ldloc 11
-	brfalse L_103af6c
+	brfalse L_103af7c
 // --- basic block ---
-// 0x0103ae44: 0x103ae44: beq   s2, zero, 0x103aefc sll   zero, zero, 0
+// 0x0103ae54: 0x103ae54: beq   s2, zero, 0x103af0c sll   zero, zero, 0
 	ldloc 10
-	brfalse L_103aefc
+	brfalse L_103af0c
 // --- basic block ---
-// 0x0103ae4c: 0x103ae4c: beq   s1, zero, 0x103aecc addiu s1, s0, 154
+// 0x0103ae5c: 0x103ae5c: beq   s1, zero, 0x103aedc addiu s1, s0, 154
 	ldloc 9
 	ldloc 8
 	ldc.i4 154
 	add
 	stloc 9
-	brfalse L_103aecc
+	brfalse L_103aedc
 // --- basic block ---
-// 0x0103ae54: 0x103ae54: addiu a0, s0, 823
+// 0x0103ae64: 0x103ae64: addiu a0, s0, 823
 	ldloc 8
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103ae58: 0x103ae58: addiu s2, s0, 90
+// 0x0103ae68: 0x103ae68: addiu s2, s0, 90
 	ldloc 8
 	ldc.i4.s 90
 	add
 	stloc 10
-// 0x0103ae5c: 0x103ae5c: beq   s4, zero, 0x103aea0 addiu s3, s0, 24
+// 0x0103ae6c: 0x103ae6c: beq   s4, zero, 0x103aeb0 addiu s3, s0, 24
 	ldloc 12
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 11
-	brfalse L_103aea0
+	brfalse L_103aeb0
 // --- basic block ---
-// 0x0103ae64: 0x103ae64: jal   0x1001b48 sll   zero, zero, 0
+// 0x0103ae74: 0x103ae74: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ae6c: 0x103ae6c: addu  a0, s0, v0
+// 0x0103ae7c: 0x103ae7c: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103ae70: 0x103ae70: lw    a3, 284(s0)
+// 0x0103ae80: 0x103ae80: lw    a3, 284(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3283,28 +3283,28 @@ L_103ae3c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103ae74: 0x103ae74: addiu a1, zero, 267
+// 0x0103ae84: 0x103ae84: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103ae78: 0x103ae78: lui   a2, 0x10000
+// 0x0103ae88: 0x103ae88: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103ae7c: 0x103ae7c: subu  a1, a1, v0
+// 0x0103ae8c: 0x103ae8c: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103ae80: 0x103ae80: addiu a0, a0, 823
+// 0x0103ae90: 0x103ae90: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103ae84: 0x103ae84: addiu a2, a2, -10248
+// 0x0103ae94: 0x103ae94: addiu a2, a2, -10252
 	ldloc.3
-	ldc.i4 -10248
+	ldc.i4 -10252
 	add
 	stloc.3
-// 0x0103ae88: 0x103ae88: sw    s1, 16(sp)
+// 0x0103ae98: 0x103ae98: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3313,7 +3313,7 @@ L_103ae3c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103ae8c: 0x103ae8c: sw    s2, 20(sp)
+// 0x0103ae9c: 0x103ae9c: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3322,7 +3322,7 @@ L_103ae3c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103ae90: 0x103ae90: jal   0x1000f9c sw    s3, 24(sp)
+// 0x0103aea0: 0x103aea0: jal   0x1000f9c sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3341,47 +3341,47 @@ L_103ae3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ae98: 0x103ae98: j	 0x103b0ac sll   zero, zero, 0
-	br L_103b0ac
+// 0x0103aea8: 0x103aea8: j	 0x103b0bc sll   zero, zero, 0
+	br L_103b0bc
 // --- basic block ---
-L_103aea0:
-// 0x0103aea0: 0x103aea0: jal   0x1001b48 sll   zero, zero, 0
+L_103aeb0:
+// 0x0103aeb0: 0x103aeb0: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103aea8: 0x103aea8: addu  a0, s0, v0
+// 0x0103aeb8: 0x103aeb8: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103aeac: 0x103aeac: addiu a1, zero, 267
+// 0x0103aebc: 0x103aebc: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103aeb0: 0x103aeb0: lui   a2, 0x10000
+// 0x0103aec0: 0x103aec0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103aeb4: 0x103aeb4: subu  a1, a1, v0
+// 0x0103aec4: 0x103aec4: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103aeb8: 0x103aeb8: addiu a0, a0, 823
+// 0x0103aec8: 0x103aec8: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103aebc: 0x103aebc: addiu a2, a2, -10232
+// 0x0103aecc: 0x103aecc: addiu a2, a2, -10236
 	ldloc.3
-	ldc.i4 -10232
+	ldc.i4 -10236
 	add
 	stloc.3
-// 0x0103aec0: 0x103aec0: addu  a3, s1, zero
+// 0x0103aed0: 0x103aed0: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0103aec4: 0x103aec4: j	 0x103af38 sw    s2, 16(sp)
+// 0x0103aed4: 0x103aed4: j	 0x103af48 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3390,10 +3390,10 @@ L_103aea0:
 	add
 	ldloc 10
 	stelem.i4
-	br L_103af38
+	br L_103af48
 // --- basic block ---
-L_103aecc:
-// 0x0103aecc: 0x103aecc: jal   0x1001b48 addiu a0, s0, 823
+L_103aedc:
+// 0x0103aedc: 0x103aedc: jal   0x1001b48 addiu a0, s0, 823
 	ldloc 8
 	ldc.i4 823
 	add
@@ -3404,43 +3404,43 @@ L_103aecc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103aed4: 0x103aed4: addiu a1, zero, 267
+// 0x0103aee4: 0x103aee4: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103aed8: 0x103aed8: addu  a0, s0, v0
+// 0x0103aee8: 0x103aee8: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103aedc: 0x103aedc: subu  a1, a1, v0
+// 0x0103aeec: 0x103aeec: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103aee0: 0x103aee0: lui   a2, 0x10000
+// 0x0103aef0: 0x103aef0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103aee4: 0x103aee4: addiu v0, s0, 24
+// 0x0103aef4: 0x103aef4: addiu v0, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x0103aee8: 0x103aee8: addiu a0, a0, 823
+// 0x0103aef8: 0x103aef8: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103aeec: 0x103aeec: addiu a2, a2, -10228
+// 0x0103aefc: 0x103aefc: addiu a2, a2, -10232
 	ldloc.3
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.3
-// 0x0103aef0: 0x103aef0: addiu a3, s0, 90
+// 0x0103af00: 0x103af00: addiu a3, s0, 90
 	ldloc 8
 	ldc.i4.s 90
 	add
 	stloc 4
-// 0x0103aef4: 0x103aef4: j	 0x103afe0 sw    v0, 16(sp)
+// 0x0103af04: 0x103af04: j	 0x103aff0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3449,49 +3449,49 @@ L_103aecc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_103afe0
+	br L_103aff0
 // --- basic block ---
-L_103aefc:
-// 0x0103aefc: 0x103aefc: beq   s1, zero, 0x103b088 addiu a0, s0, 823
+L_103af0c:
+// 0x0103af0c: 0x103af0c: beq   s1, zero, 0x103b098 addiu a0, s0, 823
 	ldloc 9
 	ldloc 8
 	ldc.i4 823
 	add
 	stloc.1
-	brfalse L_103b088
+	brfalse L_103b098
 // --- basic block ---
-// 0x0103af04: 0x103af04: addiu s1, s0, 154
+// 0x0103af14: 0x103af14: addiu s1, s0, 154
 	ldloc 8
 	ldc.i4 154
 	add
 	stloc 9
-// 0x0103af08: 0x103af08: beq   s4, zero, 0x103af40 addiu s3, s0, 24
+// 0x0103af18: 0x103af18: beq   s4, zero, 0x103af50 addiu s3, s0, 24
 	ldloc 12
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 11
-	brfalse L_103af40
+	brfalse L_103af50
 // --- basic block ---
-// 0x0103af10: 0x103af10: jal   0x1001b48 sll   zero, zero, 0
+// 0x0103af20: 0x103af20: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103af18: 0x103af18: addu  a0, s0, v0
+// 0x0103af28: 0x103af28: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103af1c: 0x103af1c: addiu a1, zero, 267
+// 0x0103af2c: 0x103af2c: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103af20: 0x103af20: lui   a2, 0x10000
+// 0x0103af30: 0x103af30: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103af24: 0x103af24: lw    a3, 284(s0)
+// 0x0103af34: 0x103af34: lw    a3, 284(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3500,22 +3500,22 @@ L_103aefc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103af28: 0x103af28: subu  a1, a1, v0
+// 0x0103af38: 0x103af38: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103af2c: 0x103af2c: addiu a0, a0, 823
+// 0x0103af3c: 0x103af3c: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103af30: 0x103af30: addiu a2, a2, -10220
+// 0x0103af40: 0x103af40: addiu a2, a2, -10224
 	ldloc.3
-	ldc.i4 -10220
+	ldc.i4 -10224
 	add
 	stloc.3
-// 0x0103af34: 0x103af34: sw    s1, 16(sp)
+// 0x0103af44: 0x103af44: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3524,8 +3524,8 @@ L_103aefc:
 	add
 	ldloc 9
 	stelem.i4
-L_103af38:
-// 0x0103af38: 0x103af38: j	 0x103afe0 sw    s3, 20(sp)
+L_103af48:
+// 0x0103af48: 0x103af48: j	 0x103aff0 sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3534,46 +3534,46 @@ L_103af38:
 	add
 	ldloc 11
 	stelem.i4
-	br L_103afe0
+	br L_103aff0
 // --- basic block ---
-L_103af40:
-// 0x0103af40: 0x103af40: jal   0x1001b48 sll   zero, zero, 0
+L_103af50:
+// 0x0103af50: 0x103af50: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103af48: 0x103af48: addu  a0, s0, v0
+// 0x0103af58: 0x103af58: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103af4c: 0x103af4c: addiu a1, zero, 267
+// 0x0103af5c: 0x103af5c: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103af50: 0x103af50: lui   a2, 0x10000
+// 0x0103af60: 0x103af60: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103af54: 0x103af54: subu  a1, a1, v0
+// 0x0103af64: 0x103af64: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103af58: 0x103af58: addiu a0, a0, 823
+// 0x0103af68: 0x103af68: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103af5c: 0x103af5c: addiu a2, a2, -10208
+// 0x0103af6c: 0x103af6c: addiu a2, a2, -10212
 	ldloc.3
-	ldc.i4 -10208
+	ldc.i4 -10212
 	add
 	stloc.3
-// 0x0103af60: 0x103af60: addu  a3, s1, zero
+// 0x0103af70: 0x103af70: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0103af64: 0x103af64: j	 0x103afe0 sw    s3, 16(sp)
+// 0x0103af74: 0x103af74: j	 0x103aff0 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3582,53 +3582,53 @@ L_103af40:
 	add
 	ldloc 11
 	stelem.i4
-	br L_103afe0
+	br L_103aff0
 // --- basic block ---
-L_103af6c:
-// 0x0103af6c: 0x103af6c: beq   s2, zero, 0x103b018 sll   zero, zero, 0
+L_103af7c:
+// 0x0103af7c: 0x103af7c: beq   s2, zero, 0x103b028 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_103b018
+	brfalse L_103b028
 // --- basic block ---
-// 0x0103af74: 0x103af74: beq   s1, zero, 0x103aff0 addiu s1, s0, 154
+// 0x0103af84: 0x103af84: beq   s1, zero, 0x103b000 addiu s1, s0, 154
 	ldloc 9
 	ldloc 8
 	ldc.i4 154
 	add
 	stloc 9
-	brfalse L_103aff0
+	brfalse L_103b000
 // --- basic block ---
-// 0x0103af7c: 0x103af7c: addiu a0, s0, 823
+// 0x0103af8c: 0x103af8c: addiu a0, s0, 823
 	ldloc 8
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103af80: 0x103af80: beq   s4, zero, 0x103afb8 addiu s2, s0, 90
+// 0x0103af90: 0x103af90: beq   s4, zero, 0x103afc8 addiu s2, s0, 90
 	ldloc 12
 	ldloc 8
 	ldc.i4.s 90
 	add
 	stloc 10
-	brfalse L_103afb8
+	brfalse L_103afc8
 // --- basic block ---
-// 0x0103af88: 0x103af88: jal   0x1001b48 sll   zero, zero, 0
+// 0x0103af98: 0x103af98: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103af90: 0x103af90: addu  a0, s0, v0
+// 0x0103afa0: 0x103afa0: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103af94: 0x103af94: addiu a1, zero, 267
+// 0x0103afa4: 0x103afa4: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103af98: 0x103af98: lui   a2, 0x10000
+// 0x0103afa8: 0x103afa8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103af9c: 0x103af9c: lw    a3, 284(s0)
+// 0x0103afac: 0x103afac: lw    a3, 284(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3637,22 +3637,22 @@ L_103af6c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103afa0: 0x103afa0: subu  a1, a1, v0
+// 0x0103afb0: 0x103afb0: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103afa4: 0x103afa4: addiu a0, a0, 823
+// 0x0103afb4: 0x103afb4: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103afa8: 0x103afa8: addiu a2, a2, -10196
+// 0x0103afb8: 0x103afb8: addiu a2, a2, -10200
 	ldloc.3
-	ldc.i4 -10196
+	ldc.i4 -10200
 	add
 	stloc.3
-// 0x0103afac: 0x103afac: sw    s1, 16(sp)
+// 0x0103afbc: 0x103afbc: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3661,7 +3661,7 @@ L_103af6c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103afb0: 0x103afb0: j	 0x103afe0 sw    s2, 20(sp)
+// 0x0103afc0: 0x103afc0: j	 0x103aff0 sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3670,46 +3670,46 @@ L_103af6c:
 	add
 	ldloc 10
 	stelem.i4
-	br L_103afe0
+	br L_103aff0
 // --- basic block ---
-L_103afb8:
-// 0x0103afb8: 0x103afb8: jal   0x1001b48 sll   zero, zero, 0
+L_103afc8:
+// 0x0103afc8: 0x103afc8: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103afc0: 0x103afc0: addu  a0, s0, v0
+// 0x0103afd0: 0x103afd0: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103afc4: 0x103afc4: addiu a1, zero, 267
+// 0x0103afd4: 0x103afd4: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103afc8: 0x103afc8: lui   a2, 0x10000
+// 0x0103afd8: 0x103afd8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103afcc: 0x103afcc: subu  a1, a1, v0
+// 0x0103afdc: 0x103afdc: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103afd0: 0x103afd0: addiu a0, a0, 823
+// 0x0103afe0: 0x103afe0: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103afd4: 0x103afd4: addiu a2, a2, -10228
+// 0x0103afe4: 0x103afe4: addiu a2, a2, -10232
 	ldloc.3
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.3
-// 0x0103afd8: 0x103afd8: addu  a3, s1, zero
+// 0x0103afe8: 0x103afe8: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0103afdc: 0x103afdc: sw    s2, 16(sp)
+// 0x0103afec: 0x103afec: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3718,8 +3718,8 @@ L_103afb8:
 	add
 	ldloc 10
 	stelem.i4
-L_103afe0:
-// 0x0103afe0: 0x103afe0: jal   0x1000f9c sll   zero, zero, 0
+L_103aff0:
+// 0x0103aff0: 0x103aff0: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3730,11 +3730,11 @@ L_103afe0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103afe8: 0x103afe8: j	 0x103b0ac sll   zero, zero, 0
-	br L_103b0ac
+// 0x0103aff8: 0x103aff8: j	 0x103b0bc sll   zero, zero, 0
+	br L_103b0bc
 // --- basic block ---
-L_103aff0:
-// 0x0103aff0: 0x103aff0: jal   0x1001b48 addiu a0, s0, 823
+L_103b000:
+// 0x0103b000: 0x103b000: jal   0x1001b48 addiu a0, s0, 823
 	ldloc 8
 	ldc.i4 823
 	add
@@ -3745,75 +3745,75 @@ L_103aff0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103aff8: 0x103aff8: addu  a0, s0, v0
+// 0x0103b008: 0x103b008: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103affc: 0x103affc: addiu a1, zero, 267
+// 0x0103b00c: 0x103b00c: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103b000: 0x103b000: lui   a2, 0x10000
+// 0x0103b010: 0x103b010: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103b004: 0x103b004: subu  a1, a1, v0
+// 0x0103b014: 0x103b014: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103b008: 0x103b008: addiu a0, a0, 823
+// 0x0103b018: 0x103b018: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103b00c: 0x103b00c: addiu a2, a2, 19912
+// 0x0103b01c: 0x103b01c: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0103b010: 0x103b010: j	 0x103b078 addiu a3, s0, 90
+// 0x0103b020: 0x103b020: j	 0x103b088 addiu a3, s0, 90
 	ldloc 8
 	ldc.i4.s 90
 	add
 	stloc 4
-	br L_103b078
+	br L_103b088
 // --- basic block ---
-L_103b018:
-// 0x0103b018: 0x103b018: beq   s1, zero, 0x103b088 addiu a0, s0, 823
+L_103b028:
+// 0x0103b028: 0x103b028: beq   s1, zero, 0x103b098 addiu a0, s0, 823
 	ldloc 9
 	ldloc 8
 	ldc.i4 823
 	add
 	stloc.1
-	brfalse L_103b088
+	brfalse L_103b098
 // --- basic block ---
-// 0x0103b020: 0x103b020: beq   s4, zero, 0x103b054 addiu s1, s0, 154
+// 0x0103b030: 0x103b030: beq   s4, zero, 0x103b064 addiu s1, s0, 154
 	ldloc 12
 	ldloc 8
 	ldc.i4 154
 	add
 	stloc 9
-	brfalse L_103b054
+	brfalse L_103b064
 // --- basic block ---
-// 0x0103b028: 0x103b028: jal   0x1001b48 sll   zero, zero, 0
+// 0x0103b038: 0x103b038: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b030: 0x103b030: addu  a0, s0, v0
+// 0x0103b040: 0x103b040: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103b034: 0x103b034: addiu a1, zero, 267
+// 0x0103b044: 0x103b044: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103b038: 0x103b038: lui   a2, 0x10000
+// 0x0103b048: 0x103b048: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103b03c: 0x103b03c: lw    a3, 284(s0)
+// 0x0103b04c: 0x103b04c: lw    a3, 284(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3822,22 +3822,22 @@ L_103b018:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103b040: 0x103b040: subu  a1, a1, v0
+// 0x0103b050: 0x103b050: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103b044: 0x103b044: addiu a0, a0, 823
+// 0x0103b054: 0x103b054: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103b048: 0x103b048: addiu a2, a2, -10184
+// 0x0103b058: 0x103b058: addiu a2, a2, -10188
 	ldloc.3
-	ldc.i4 -10184
+	ldc.i4 -10188
 	add
 	stloc.3
-// 0x0103b04c: 0x103b04c: j	 0x103afe0 sw    s1, 16(sp)
+// 0x0103b05c: 0x103b05c: j	 0x103aff0 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3846,47 +3846,47 @@ L_103b018:
 	add
 	ldloc 9
 	stelem.i4
-	br L_103afe0
+	br L_103aff0
 // --- basic block ---
-L_103b054:
-// 0x0103b054: 0x103b054: jal   0x1001b48 sll   zero, zero, 0
+L_103b064:
+// 0x0103b064: 0x103b064: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b05c: 0x103b05c: addu  a0, s0, v0
+// 0x0103b06c: 0x103b06c: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103b060: 0x103b060: addiu a1, zero, 267
+// 0x0103b070: 0x103b070: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103b064: 0x103b064: lui   a2, 0x10000
+// 0x0103b074: 0x103b074: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103b068: 0x103b068: subu  a1, a1, v0
+// 0x0103b078: 0x103b078: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103b06c: 0x103b06c: addiu a0, a0, 823
+// 0x0103b07c: 0x103b07c: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103b070: 0x103b070: addiu a2, a2, -11224
+// 0x0103b080: 0x103b080: addiu a2, a2, -11228
 	ldloc.3
-	ldc.i4 -11224
+	ldc.i4 -11228
 	add
 	stloc.3
-// 0x0103b074: 0x103b074: addu  a3, s1, zero
+// 0x0103b084: 0x103b084: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-L_103b078:
-// 0x0103b078: 0x103b078: jal   0x1000f9c sll   zero, zero, 0
+L_103b088:
+// 0x0103b088: 0x103b088: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3897,11 +3897,11 @@ L_103b078:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b080: 0x103b080: j	 0x103b0ac sll   zero, zero, 0
-	br L_103b0ac
+// 0x0103b090: 0x103b090: j	 0x103b0bc sll   zero, zero, 0
+	br L_103b0bc
 // --- basic block ---
-L_103b088:
-// 0x0103b088: 0x103b088: jal   0x1001b48 addiu a0, s0, 823
+L_103b098:
+// 0x0103b098: 0x103b098: jal   0x1001b48 addiu a0, s0, 823
 	ldloc 8
 	ldc.i4 823
 	add
@@ -3912,30 +3912,30 @@ L_103b088:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b090: 0x103b090: addu  a0, s0, v0
+// 0x0103b0a0: 0x103b0a0: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103b094: 0x103b094: addiu a1, zero, 267
+// 0x0103b0a4: 0x103b0a4: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103b098: 0x103b098: lui   a2, 0x20000
+// 0x0103b0a8: 0x103b0a8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0103b09c: 0x103b09c: subu  a1, a1, v0
+// 0x0103b0ac: 0x103b0ac: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103b0a0: 0x103b0a0: addiu a0, a0, 823
+// 0x0103b0b0: 0x103b0b0: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103b0a4: 0x103b0a4: jal   0x1000f9c addiu a2, a2, 48
+// 0x0103b0b4: 0x103b0b4: jal   0x1000f9c addiu a2, a2, 512
 	ldloc.3
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.3
 	ldloc.0
@@ -3948,14 +3948,14 @@ L_103b088:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103b0ac:
-// 0x0103b0ac: 0x103b0ac: beq   s5, zero, 0x103b0e0 lui   s1, 0x20000
+L_103b0bc:
+// 0x0103b0bc: 0x103b0bc: beq   s5, zero, 0x103b0f0 lui   s1, 0x20000
 	ldloc 13
 	ldc.i4 131072
 	stloc 9
-	brfalse L_103b0e0
+	brfalse L_103b0f0
 // --- basic block ---
-// 0x0103b0b4: 0x103b0b4: jal   0x1001b48 addiu a0, s0, 823
+// 0x0103b0c4: 0x103b0c4: jal   0x1001b48 addiu a0, s0, 823
 	ldloc 8
 	ldc.i4 823
 	add
@@ -3966,33 +3966,33 @@ L_103b0ac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b0bc: 0x103b0bc: addu  a0, s0, v0
+// 0x0103b0cc: 0x103b0cc: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0103b0c0: 0x103b0c0: addiu a1, zero, 267
+// 0x0103b0d0: 0x103b0d0: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103b0c4: 0x103b0c4: lui   a2, 0x10000
+// 0x0103b0d4: 0x103b0d4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103b0c8: 0x103b0c8: subu  a1, a1, v0
+// 0x0103b0d8: 0x103b0d8: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0103b0cc: 0x103b0cc: addiu a0, a0, 823
+// 0x0103b0dc: 0x103b0dc: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103b0d0: 0x103b0d0: addiu a2, a2, -10176
+// 0x0103b0e0: 0x103b0e0: addiu a2, a2, -10180
 	ldloc.3
-	ldc.i4 -10176
+	ldc.i4 -10180
 	add
 	stloc.3
-// 0x0103b0d4: 0x103b0d4: jal   0x1000f9c addiu a3, s0, 539
+// 0x0103b0e4: 0x103b0e4: jal   0x1000f9c addiu a3, s0, 539
 	ldloc 8
 	ldc.i4 539
 	add
@@ -4007,29 +4007,29 @@ L_103b0ac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b0dc: 0x103b0dc: lui   s1, 0x20000
+// 0x0103b0ec: 0x103b0ec: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-L_103b0e0:
-// 0x0103b0e0: 0x103b0e0: lw    a3, 23796(s1)
+L_103b0f0:
+// 0x0103b0f0: 0x103b0f0: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103b0e4: 0x103b0e4: lw    a2, 23792(s1)
+// 0x0103b0f4: 0x103b0f4: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103b0e8: 0x103b0e8: lw    a1, 20(s0)
+// 0x0103b0f8: 0x103b0f8: lw    a1, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4038,7 +4038,7 @@ L_103b0e0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103b0ec: 0x103b0ec: lw    a0, 16(s0)
+// 0x0103b0fc: 0x103b0fc: lw    a0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4047,50 +4047,50 @@ L_103b0e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103b0f0: 0x103b0f0: jal   0x10c0798 sll   zero, zero, 0
+// 0x0103b100: 0x103b100: jal   0x10c0dd8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b0f8: 0x103b0f8: addu  a1, v1, zero
+// 0x0103b108: 0x103b108: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103b0fc: 0x103b0fc: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103b10c: 0x103b10c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b104: 0x103b104: lw    a2, 23792(s1)
+// 0x0103b114: 0x103b114: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103b108: 0x103b108: lw    a3, 23796(s1)
+// 0x0103b118: 0x103b118: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103b10c: 0x103b10c: lw    a1, 12(s0)
+// 0x0103b11c: 0x103b11c: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4099,7 +4099,7 @@ L_103b0e0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103b110: 0x103b110: lw    a0, 8(s0)
+// 0x0103b120: 0x103b120: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4108,7 +4108,7 @@ L_103b0e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103b114: 0x103b114: jal   0x10c0798 sw    v0, 40(sp)
+// 0x0103b124: 0x103b124: jal   0x10c0dd8 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4122,41 +4122,41 @@ L_103b0e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b11c: 0x103b11c: addu  a1, v1, zero
+// 0x0103b12c: 0x103b12c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103b120: 0x103b120: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103b130: 0x103b130: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b128: 0x103b128: addiu a0, sp, 52
+// 0x0103b138: 0x103b138: addiu a0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.1
-// 0x0103b12c: 0x103b12c: addiu a1, sp, 72
+// 0x0103b13c: 0x103b13c: addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x0103b130: 0x103b130: addiu a2, sp, 32
+// 0x0103b140: 0x103b140: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0103b134: 0x103b134: jal   0x1029da8 sw    v0, 36(sp)
+// 0x0103b144: 0x103b144: jal   0x1029db8 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4170,24 +4170,24 @@ L_103b0e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b13c: 0x103b13c: addiu v1, zero, -1
+// 0x0103b14c: 0x103b14c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0103b140: 0x103b140: bne   v0, v1, 0x103b1ac lui   a0, 0x20000
+// 0x0103b150: 0x103b150: bne   v0, v1, 0x103b1bc lui   a0, 0x20000
 	ldloc 5
 	ldloc 7
 	ldc.i4 131072
 	stloc.1
-	bne.un L_103b1ac
+	bne.un L_103b1bc
 // --- basic block ---
-// 0x0103b148: 0x103b148: jal   0x101df50 addiu a0, a0, 6792
+// 0x0103b158: 0x103b158: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -4195,37 +4195,37 @@ L_103b0e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b150: 0x103b150: beq   v0, zero, 0x103b178 lui   v1, 0x2120000
+// 0x0103b160: 0x103b160: beq   v0, zero, 0x103b188 lui   v1, 0x2120000
 	ldloc 5
 	ldc.i4 34734080
 	stloc 7
-	brfalse L_103b178
+	brfalse L_103b188
 // --- basic block ---
-// 0x0103b158: 0x103b158: lw    a0, 0(v0)
+// 0x0103b168: 0x103b168: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103b15c: 0x103b15c: ori   v1, v1, 60730
+// 0x0103b16c: 0x103b16c: ori   v1, v1, 60730
 	ldloc 7
 	ldc.i4 60730
 	or
 	stloc 7
-// 0x0103b160: 0x103b160: bne   a0, v1, 0x103b18c lui   v1, 0x1e90000
+// 0x0103b170: 0x103b170: bne   a0, v1, 0x103b19c lui   v1, 0x1e90000
 	ldloc.1
 	ldloc 7
 	ldc.i4 32047104
 	stloc 7
-	bne.un L_103b18c
+	bne.un L_103b19c
 // --- basic block ---
-// 0x0103b168: 0x103b168: lw    a0, 4(v0)
+// 0x0103b178: 0x103b178: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4234,21 +4234,21 @@ L_103b0e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103b16c: 0x103b16c: ori   v1, v1, 58906
+// 0x0103b17c: 0x103b17c: ori   v1, v1, 58906
 	ldloc 7
 	ldc.i4 58906
 	or
 	stloc 7
-// 0x0103b170: 0x103b170: bne   a0, v1, 0x103b18c sll   zero, zero, 0
+// 0x0103b180: 0x103b180: bne   a0, v1, 0x103b19c sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_103b18c
+	bne.un L_103b19c
 // --- basic block ---
-L_103b178:
-// 0x0103b178: 0x103b178: lui   a0, 0x10000
+L_103b188:
+// 0x0103b188: 0x103b188: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b17c: 0x103b17c: jal   0x101df50 addiu a0, a0, -31052
+// 0x0103b18c: 0x103b18c: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -4258,24 +4258,24 @@ L_103b178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b184: 0x103b184: beq   v0, zero, 0x103b19c sll   zero, zero, 0
+// 0x0103b194: 0x103b194: beq   v0, zero, 0x103b1ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103b19c
+	brfalse L_103b1ac
 // --- basic block ---
-L_103b18c:
-// 0x0103b18c: 0x103b18c: lw    v1, 0(v0)
+L_103b19c:
+// 0x0103b19c: 0x103b19c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0103b190: 0x103b190: lw    v0, 4(v0)
+// 0x0103b1a0: 0x103b1a0: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4284,7 +4284,7 @@ L_103b18c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103b194: 0x103b194: j	 0x103b1a4 sw    v1, 44(sp)
+// 0x0103b1a4: 0x103b1a4: j	 0x103b1b4 sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4293,13 +4293,13 @@ L_103b18c:
 	add
 	ldloc 7
 	stelem.i4
-	br L_103b1a4
+	br L_103b1b4
 // --- basic block ---
-L_103b19c:
-// 0x0103b19c: 0x103b19c: addiu v0, zero, -1
+L_103b1ac:
+// 0x0103b1ac: 0x103b1ac: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103b1a0: 0x103b1a0: sw    v0, 44(sp)
+// 0x0103b1b0: 0x103b1b0: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4308,8 +4308,8 @@ L_103b19c:
 	add
 	ldloc 5
 	stelem.i4
-L_103b1a4:
-// 0x0103b1a4: 0x103b1a4: j	 0x103b1c4 sw    v0, 48(sp)
+L_103b1b4:
+// 0x0103b1b4: 0x103b1b4: j	 0x103b1d4 sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4318,10 +4318,10 @@ L_103b1a4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_103b1c4
+	br L_103b1d4
 // --- basic block ---
-L_103b1ac:
-// 0x0103b1ac: 0x103b1ac: lw    v0, 56(sp)
+L_103b1bc:
+// 0x0103b1bc: 0x103b1bc: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4330,8 +4330,8 @@ L_103b1ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103b1b0: 0x103b1b0: sll   zero, zero, 0
-// 0x0103b1b4: 0x103b1b4: sw    v0, 48(sp)
+// 0x0103b1c0: 0x103b1c0: sll   zero, zero, 0
+// 0x0103b1c4: 0x103b1c4: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4340,7 +4340,7 @@ L_103b1ac:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b1b8: 0x103b1b8: lw    v0, 52(sp)
+// 0x0103b1c8: 0x103b1c8: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4349,8 +4349,8 @@ L_103b1ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103b1bc: 0x103b1bc: sll   zero, zero, 0
-// 0x0103b1c0: 0x103b1c0: sw    v0, 44(sp)
+// 0x0103b1cc: 0x103b1cc: sll   zero, zero, 0
+// 0x0103b1d0: 0x103b1d0: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4359,8 +4359,8 @@ L_103b1ac:
 	add
 	ldloc 5
 	stelem.i4
-L_103b1c4:
-// 0x0103b1c4: 0x103b1c4: lw    v1, 48(sp)
+L_103b1d4:
+// 0x0103b1d4: 0x103b1d4: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4369,15 +4369,15 @@ L_103b1c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103b1c8: 0x103b1c8: addiu v0, zero, -1
+// 0x0103b1d8: 0x103b1d8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103b1cc: 0x103b1cc: beq   v1, v0, 0x103b298 sll   zero, zero, 0
+// 0x0103b1dc: 0x103b1dc: beq   v1, v0, 0x103b2a8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_103b298
+	beq  L_103b2a8
 // --- basic block ---
-// 0x0103b1d4: 0x103b1d4: lw    v1, 44(sp)
+// 0x0103b1e4: 0x103b1e4: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4386,17 +4386,17 @@ L_103b1c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103b1d8: 0x103b1d8: sll   zero, zero, 0
-// 0x0103b1dc: 0x103b1dc: beq   v1, v0, 0x103b298 addiu a1, sp, 36
+// 0x0103b1e8: 0x103b1e8: sll   zero, zero, 0
+// 0x0103b1ec: 0x103b1ec: beq   v1, v0, 0x103b2a8 addiu a1, sp, 36
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-	beq  L_103b298
+	beq  L_103b2a8
 // --- basic block ---
-// 0x0103b1e4: 0x103b1e4: jal   0x1008eb0 addiu a0, sp, 44
+// 0x0103b1f4: 0x103b1f4: jal   0x1008ec0 addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -4406,25 +4406,25 @@ L_103b1c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b1ec: 0x103b1ec: addu  s1, v0, zero
+// 0x0103b1fc: 0x103b1fc: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0103b1f0: 0x103b1f0: jal   0x1007df4 addu  a0, v0, zero
+// 0x0103b200: 0x103b200: jal   0x1007e04 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103b1f8: 0x103b1f8: addu  a0, s1, zero
+// 0x0103b208: 0x103b208: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103b1fc: 0x103b1fc: jal   0x1007e18 sw    v0, 216(sp)
+// 0x0103b20c: 0x103b20c: jal   0x1007e28 sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4434,15 +4434,15 @@ L_103b1c4:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b204: 0x103b204: addiu v1, zero, 10
+// 0x0103b214: 0x103b214: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 7
-// 0x0103b208: 0x103b208: div   v0, v1
+// 0x0103b218: 0x103b218: div   v0, v1
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -4451,7 +4451,7 @@ L_103b1c4:
 	stloc 16
 	rem
 	stloc 15
-// 0x0103b20c: 0x103b20c: lw    a3, 216(sp)
+// 0x0103b21c: 0x103b21c: lw    a3, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4460,34 +4460,34 @@ L_103b1c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103b210: 0x103b210: addiu s1, sp, 112
+// 0x0103b220: 0x103b220: addiu s1, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
 	stloc 9
-// 0x0103b214: 0x103b214: lui   a2, 0x10000
+// 0x0103b224: 0x103b224: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103b218: 0x103b218: addiu a2, a2, -10172
+// 0x0103b228: 0x103b228: addiu a2, a2, -10176
 	ldloc.3
-	ldc.i4 -10172
+	ldc.i4 -10176
 	add
 	stloc.3
-// 0x0103b21c: 0x103b21c: addu  a0, s1, zero
+// 0x0103b22c: 0x103b22c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103b220: 0x103b220: addiu a1, zero, 100
+// 0x0103b230: 0x103b230: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0103b224: 0x103b224: addiu s2, sp, 92
+// 0x0103b234: 0x103b234: addiu s2, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc 10
-// 0x0103b228: 0x103b228: mfhi  hi
+// 0x0103b238: 0x103b238: mfhi  hi
 	ldloc 15
 	stloc 5
-// 0x0103b22c: 0x103b22c: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0103b23c: 0x103b23c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4506,25 +4506,25 @@ L_103b1c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b234: 0x103b234: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x0103b244: 0x103b244: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0103b23c: 0x103b23c: lui   a2, 0x10000
+// 0x0103b24c: 0x103b24c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103b240: 0x103b240: addiu a2, a2, 19912
+// 0x0103b250: 0x103b250: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0103b244: 0x103b244: addu  a3, v0, zero
+// 0x0103b254: 0x103b254: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0103b248: 0x103b248: addiu a1, zero, 20
+// 0x0103b258: 0x103b258: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0103b24c: 0x103b24c: jal   0x1000f9c addu  a0, s2, zero
+// 0x0103b25c: 0x103b25c: jal   0x1000f9c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4537,7 +4537,7 @@ L_103b1c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b254: 0x103b254: jal   0x1001b48 addiu a0, s0, 823
+// 0x0103b264: 0x103b264: jal   0x1001b48 addiu a0, s0, 823
 	ldloc 8
 	ldc.i4 823
 	add
@@ -4548,15 +4548,15 @@ L_103b1c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b25c: 0x103b25c: lui   a0, 0x10000
+// 0x0103b26c: 0x103b26c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b260: 0x103b260: addiu a0, a0, -10164
+// 0x0103b270: 0x103b270: addiu a0, a0, -10168
 	ldloc.1
-	ldc.i4 -10164
+	ldc.i4 -10168
 	add
 	stloc.1
-// 0x0103b264: 0x103b264: jal   0x101cd60 addu  s3, v0, zero
+// 0x0103b274: 0x103b274: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -4564,15 +4564,15 @@ L_103b1c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b26c: 0x103b26c: addu  a0, s2, zero
+// 0x0103b27c: 0x103b27c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0103b270: 0x103b270: jal   0x101cd60 sw    v0, 216(sp)
+// 0x0103b280: 0x103b280: jal   0x101cd70 sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4586,20 +4586,20 @@ L_103b1c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b278: 0x103b278: addu  a0, s0, s3
+// 0x0103b288: 0x103b288: addu  a0, s0, s3
 	ldloc 8
 	ldloc 11
 	add
 	stloc.1
-// 0x0103b27c: 0x103b27c: addiu a1, zero, 267
+// 0x0103b28c: 0x103b28c: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103b280: 0x103b280: lw    a2, 216(sp)
+// 0x0103b290: 0x103b290: lw    a2, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4608,20 +4608,20 @@ L_103b1c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103b284: 0x103b284: subu  a1, a1, s3
+// 0x0103b294: 0x103b294: subu  a1, a1, s3
 	ldloc.2
 	ldloc 11
 	sub
 	stloc.2
-// 0x0103b288: 0x103b288: addiu a0, a0, 823
+// 0x0103b298: 0x103b298: addiu a0, a0, 823
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103b28c: 0x103b28c: addu  a3, s1, zero
+// 0x0103b29c: 0x103b29c: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0103b290: 0x103b290: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0103b2a0: 0x103b2a0: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4640,12 +4640,12 @@ L_103b1c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103b298:
-// 0x0103b298: 0x103b298: lw    ra, 252(sp)
-// 0x0103b29c: 0x103b29c: addiu v0, zero, 1
+L_103b2a8:
+// 0x0103b2a8: 0x103b2a8: lw    ra, 252(sp)
+// 0x0103b2ac: 0x103b2ac: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103b2a0: 0x103b2a0: lw    s5, 248(sp)
+// 0x0103b2b0: 0x103b2b0: lw    s5, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4654,7 +4654,7 @@ L_103b298:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103b2a4: 0x103b2a4: lw    s4, 244(sp)
+// 0x0103b2b4: 0x103b2b4: lw    s4, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4663,7 +4663,7 @@ L_103b298:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103b2a8: 0x103b2a8: lw    s3, 240(sp)
+// 0x0103b2b8: 0x103b2b8: lw    s3, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4672,7 +4672,7 @@ L_103b298:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103b2ac: 0x103b2ac: lw    s2, 236(sp)
+// 0x0103b2bc: 0x103b2bc: lw    s2, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4681,7 +4681,7 @@ L_103b298:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103b2b0: 0x103b2b0: lw    s1, 232(sp)
+// 0x0103b2c0: 0x103b2c0: lw    s1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4690,7 +4690,7 @@ L_103b298:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103b2b4: 0x103b2b4: lw    s0, 228(sp)
+// 0x0103b2c4: 0x103b2c4: lw    s0, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4699,7 +4699,7 @@ L_103b298:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103b2b8: 0x103b2b8: jr    ra addiu sp, sp, 256
+// 0x0103b2c8: 0x103b2c8: jr    ra addiu sp, sp, 256
 	ldloc.0
 	ldc.i4 256
 	add
@@ -4711,7 +4711,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_local_option_103b2c0(int32,int32,int32,int32,int32)
+.method public static int32 on_local_option_103b2d0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4761,13 +4761,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103b2c0:
-// 0x0103b2c0: 0x103b2c0: addiu sp, sp, -2224
+L_103b2d0:
+// 0x0103b2d0: 0x103b2d0: addiu sp, sp, -2224
 	ldloc.0
 	ldc.i4 -2224
 	add
 	stloc.0
-// 0x0103b2c4: 0x103b2c4: sw    s0, 2200(sp)
+// 0x0103b2d4: 0x103b2d4: sw    s0, 2200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4776,16 +4776,16 @@ L_103b2c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103b2c8: 0x103b2c8: addu  s0, a0, zero
+// 0x0103b2d8: 0x103b2d8: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0103b2cc: 0x103b2cc: addiu a0, sp, 1104
+// 0x0103b2dc: 0x103b2dc: addiu a0, sp, 1104
 	ldloc.0
 	ldc.i4 1104
 	add
 	stloc.1
-// 0x0103b2d0: 0x103b2d0: sw    ra, 2220(sp)
-// 0x0103b2d4: 0x103b2d4: sw    s3, 2212(sp)
+// 0x0103b2e0: 0x103b2e0: sw    ra, 2220(sp)
+// 0x0103b2e4: 0x103b2e4: sw    s3, 2212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4794,7 +4794,7 @@ L_103b2c0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103b2d8: 0x103b2d8: sw    s2, 2208(sp)
+// 0x0103b2e8: 0x103b2e8: sw    s2, 2208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4803,10 +4803,10 @@ L_103b2c0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103b2dc: 0x103b2dc: addu  s3, a3, zero
+// 0x0103b2ec: 0x103b2ec: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x0103b2e0: 0x103b2e0: sw    s1, 2204(sp)
+// 0x0103b2f0: 0x103b2f0: sw    s1, 2204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4815,7 +4815,7 @@ L_103b2c0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103b2e4: 0x103b2e4: sw    s4, 2216(sp)
+// 0x0103b2f4: 0x103b2f4: sw    s4, 2216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4824,7 +4824,7 @@ L_103b2c0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103b2e8: 0x103b2e8: jal   0x103ea8c lui   s2, 0x0
+// 0x0103b2f8: 0x103b2f8: jal   0x103ea9c lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -4832,44 +4832,44 @@ L_103b2c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::address_candidate_init_103ea8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::address_candidate_init_103ea9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b2f0: 0x103b2f0: addiu v0, zero, 18
+// 0x0103b300: 0x103b300: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0103b2f4: 0x103b2f4: sw    v0, 0(s3)
+// 0x0103b304: 0x103b304: sw    v0, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103b2f8: 0x103b2f8: addu  a0, s0, zero
+// 0x0103b308: 0x103b308: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103b2fc: 0x103b2fc: addiu v0, zero, 2
+// 0x0103b30c: 0x103b30c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0103b300: 0x103b300: addiu s1, zero, 1
+// 0x0103b310: 0x103b310: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0103b304: 0x103b304: addiu a1, s2, 28076
+// 0x0103b314: 0x103b314: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0103b308: 0x103b308: addu  a2, zero, zero
+// 0x0103b318: 0x103b318: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103b30c: 0x103b30c: addiu a3, sp, 1112
+// 0x0103b31c: 0x103b31c: addiu a3, sp, 1112
 	ldloc.0
 	ldc.i4 1112
 	add
 	stloc 4
-// 0x0103b310: 0x103b310: sw    v0, 1104(sp)
+// 0x0103b320: 0x103b320: sw    v0, 1104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4878,7 +4878,7 @@ L_103b2c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b314: 0x103b314: jal   0x106885c sw    s1, 16(sp)
+// 0x0103b324: 0x103b324: jal   0x106886c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4892,59 +4892,59 @@ L_103b2c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadDoubleFromString_106885c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadDoubleFromString_106886c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b31c: 0x103b31c: bne   v0, zero, 0x103b340 addu  s0, v0, zero
+// 0x0103b32c: 0x103b32c: bne   v0, zero, 0x103b350 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b340
+	brtrue L_103b350
 // --- basic block ---
-// 0x0103b324: 0x103b324: lui   a1, 0x10000
+// 0x0103b334: 0x103b334: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b328: 0x103b328: lui   a3, 0x10000
+// 0x0103b338: 0x103b338: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b32c: 0x103b32c: addiu a1, a1, -10520
+// 0x0103b33c: 0x103b33c: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b330: 0x103b330: addiu a3, a3, -10152
+// 0x0103b340: 0x103b340: addiu a3, a3, -10156
 	ldloc 4
-	ldc.i4 -10152
+	ldc.i4 -10156
 	add
 	stloc 4
-// 0x0103b334: 0x103b334: addiu a0, zero, 4
+// 0x0103b344: 0x103b344: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b338: 0x103b338: j	 0x103b378 addiu a2, zero, 423
+// 0x0103b348: 0x103b348: j	 0x103b388 addiu a2, zero, 423
 	ldc.i4 423
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b340:
-// 0x0103b340: 0x103b340: addu  a0, v0, zero
+L_103b350:
+// 0x0103b350: 0x103b350: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103b344: 0x103b344: addiu a1, s2, 28076
+// 0x0103b354: 0x103b354: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0103b348: 0x103b348: addu  a2, zero, zero
+// 0x0103b358: 0x103b358: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103b34c: 0x103b34c: addiu a3, sp, 1120
+// 0x0103b35c: 0x103b35c: addiu a3, sp, 1120
 	ldloc.0
 	ldc.i4 1120
 	add
 	stloc 4
-// 0x0103b350: 0x103b350: jal   0x106885c sw    s1, 16(sp)
+// 0x0103b360: 0x103b360: jal   0x106886c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4958,41 +4958,41 @@ L_103b340:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadDoubleFromString_106885c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadDoubleFromString_106886c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b358: 0x103b358: bne   v0, zero, 0x103b388 addu  s0, v0, zero
+// 0x0103b368: 0x103b368: bne   v0, zero, 0x103b398 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b388
+	brtrue L_103b398
 // --- basic block ---
-// 0x0103b360: 0x103b360: lui   a1, 0x10000
+// 0x0103b370: 0x103b370: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b364: 0x103b364: lui   a3, 0x10000
+// 0x0103b374: 0x103b374: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b368: 0x103b368: addiu a1, a1, -10520
+// 0x0103b378: 0x103b378: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b36c: 0x103b36c: addiu a3, a3, -10088
+// 0x0103b37c: 0x103b37c: addiu a3, a3, -10092
 	ldloc 4
-	ldc.i4 -10088
+	ldc.i4 -10092
 	add
 	stloc 4
-// 0x0103b370: 0x103b370: addiu a0, zero, 4
+// 0x0103b380: 0x103b380: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b374: 0x103b374: addiu a2, zero, 439
+// 0x0103b384: 0x103b384: addiu a2, zero, 439
 	ldc.i4 439
 	stloc.3
-L_103b378:
-// 0x0103b378: 0x103b378: jal   0x100449c sll   zero, zero, 0
+L_103b388:
+// 0x0103b388: 0x103b388: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5003,51 +5003,51 @@ L_103b378:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b380: 0x103b380: j	 0x103b6b0 sll   zero, zero, 0
-	br L_103b6b0
+// 0x0103b390: 0x103b390: j	 0x103b6c0 sll   zero, zero, 0
+	br L_103b6c0
 // --- basic block ---
-L_103b388:
-// 0x0103b388: 0x103b388: lb    v1, 0(v0)
+L_103b398:
+// 0x0103b398: 0x103b398: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103b38c: 0x103b38c: addiu v0, zero, 44
+// 0x0103b39c: 0x103b39c: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103b390: 0x103b390: bne   v1, v0, 0x103b3a0 addu  a0, s0, zero
+// 0x0103b3a0: 0x103b3a0: bne   v1, v0, 0x103b3b0 addu  a0, s0, zero
 	ldloc 8
 	ldloc 5
 	ldloc 7
 	stloc.1
-	bne.un L_103b3a0
+	bne.un L_103b3b0
 // --- basic block ---
-// 0x0103b398: 0x103b398: j	 0x103b3e0 addiu s0, s0, 1
+// 0x0103b3a8: 0x103b3a8: j	 0x103b3f0 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103b3e0
+	br L_103b3f0
 // --- basic block ---
-L_103b3a0:
-// 0x0103b3a0: 0x103b3a0: addiu v0, zero, 32
+L_103b3b0:
+// 0x0103b3b0: 0x103b3b0: addiu v0, zero, 32
 	ldc.i4.s 32
 	stloc 5
-// 0x0103b3a4: 0x103b3a4: addiu a3, s2, 28076
+// 0x0103b3b4: 0x103b3b4: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103b3a8: 0x103b3a8: addiu a1, sp, 1128
+// 0x0103b3b8: 0x103b3b8: addiu a1, sp, 1128
 	ldloc.0
 	ldc.i4 1128
 	add
 	stloc.2
-// 0x0103b3ac: 0x103b3ac: addiu a2, sp, 1096
+// 0x0103b3bc: 0x103b3bc: addiu a2, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc.3
-// 0x0103b3b0: 0x103b3b0: sw    v0, 1096(sp)
+// 0x0103b3c0: 0x103b3c0: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5056,7 +5056,7 @@ L_103b3a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b3b4: 0x103b3b4: jal   0x1068250 sw    s1, 16(sp)
+// 0x0103b3c4: 0x103b3c4: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5070,71 +5070,71 @@ L_103b3a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b3bc: 0x103b3bc: bne   v0, zero, 0x103b3e0 addu  s0, v0, zero
+// 0x0103b3cc: 0x103b3cc: bne   v0, zero, 0x103b3f0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b3e0
+	brtrue L_103b3f0
 // --- basic block ---
-// 0x0103b3c4: 0x103b3c4: lui   a1, 0x10000
+// 0x0103b3d4: 0x103b3d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b3c8: 0x103b3c8: lui   a3, 0x10000
+// 0x0103b3d8: 0x103b3d8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b3cc: 0x103b3cc: addiu a1, a1, -10520
+// 0x0103b3dc: 0x103b3dc: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b3d0: 0x103b3d0: addiu a3, a3, -10028
+// 0x0103b3e0: 0x103b3e0: addiu a3, a3, -10032
 	ldloc 4
-	ldc.i4 -10028
+	ldc.i4 -10032
 	add
 	stloc 4
-// 0x0103b3d4: 0x103b3d4: addiu a0, zero, 4
+// 0x0103b3e4: 0x103b3e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b3d8: 0x103b3d8: j	 0x103b378 addiu a2, zero, 461
+// 0x0103b3e8: 0x103b3e8: j	 0x103b388 addiu a2, zero, 461
 	ldc.i4 461
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b3e0:
-// 0x0103b3e0: 0x103b3e0: lb    v1, 0(s0)
+L_103b3f0:
+// 0x0103b3f0: 0x103b3f0: lb    v1, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103b3e4: 0x103b3e4: addiu v0, zero, 44
+// 0x0103b3f4: 0x103b3f4: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103b3e8: 0x103b3e8: bne   v1, v0, 0x103b3f8 addiu v0, zero, 32
+// 0x0103b3f8: 0x103b3f8: bne   v1, v0, 0x103b408 addiu v0, zero, 32
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 32
 	stloc 5
-	bne.un L_103b3f8
+	bne.un L_103b408
 // --- basic block ---
-// 0x0103b3f0: 0x103b3f0: j	 0x103b440 addiu s0, s0, 1
+// 0x0103b400: 0x103b400: j	 0x103b450 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103b440
+	br L_103b450
 // --- basic block ---
-L_103b3f8:
-// 0x0103b3f8: 0x103b3f8: lui   a3, 0x0
+L_103b408:
+// 0x0103b408: 0x103b408: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0103b3fc: 0x103b3fc: addu  a0, s0, zero
+// 0x0103b40c: 0x103b40c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103b400: 0x103b400: sw    v0, 1096(sp)
+// 0x0103b410: 0x103b410: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5143,25 +5143,25 @@ L_103b3f8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b404: 0x103b404: addiu a3, a3, 28076
+// 0x0103b414: 0x103b414: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103b408: 0x103b408: addiu v0, zero, 1
+// 0x0103b418: 0x103b418: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103b40c: 0x103b40c: addiu a1, sp, 1161
+// 0x0103b41c: 0x103b41c: addiu a1, sp, 1161
 	ldloc.0
 	ldc.i4 1161
 	add
 	stloc.2
-// 0x0103b410: 0x103b410: addiu a2, sp, 1096
+// 0x0103b420: 0x103b420: addiu a2, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc.3
-// 0x0103b414: 0x103b414: jal   0x1068250 sw    v0, 16(sp)
+// 0x0103b424: 0x103b424: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5175,73 +5175,73 @@ L_103b3f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b41c: 0x103b41c: bne   v0, zero, 0x103b440 addu  s0, v0, zero
+// 0x0103b42c: 0x103b42c: bne   v0, zero, 0x103b450 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b440
+	brtrue L_103b450
 // --- basic block ---
-// 0x0103b424: 0x103b424: lui   a1, 0x10000
+// 0x0103b434: 0x103b434: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b428: 0x103b428: lui   a3, 0x10000
+// 0x0103b438: 0x103b438: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b42c: 0x103b42c: addiu a1, a1, -10520
+// 0x0103b43c: 0x103b43c: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b430: 0x103b430: addiu a3, a3, -9968
+// 0x0103b440: 0x103b440: addiu a3, a3, -9972
 	ldloc 4
-	ldc.i4 -9968
+	ldc.i4 -9972
 	add
 	stloc 4
-// 0x0103b434: 0x103b434: addiu a0, zero, 4
+// 0x0103b444: 0x103b444: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b438: 0x103b438: j	 0x103b378 addiu a2, zero, 484
+// 0x0103b448: 0x103b448: j	 0x103b388 addiu a2, zero, 484
 	ldc.i4 484
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b440:
-// 0x0103b440: 0x103b440: addiu s4, sp, 1096
+L_103b450:
+// 0x0103b450: 0x103b450: addiu s4, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc 12
-// 0x0103b444: 0x103b444: lui   s2, 0x0
+// 0x0103b454: 0x103b454: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0103b448: 0x103b448: addu  a0, s0, zero
+// 0x0103b458: 0x103b458: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103b44c: 0x103b44c: addiu v0, zero, 63
+// 0x0103b45c: 0x103b45c: addiu v0, zero, 63
 	ldc.i4.s 63
 	stloc 5
-// 0x0103b450: 0x103b450: addiu s1, zero, 1
+// 0x0103b460: 0x103b460: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0103b454: 0x103b454: addiu a1, sp, 1194
+// 0x0103b464: 0x103b464: addiu a1, sp, 1194
 	ldloc.0
 	ldc.i4 1194
 	add
 	stloc.2
-// 0x0103b458: 0x103b458: addu  a2, s4, zero
+// 0x0103b468: 0x103b468: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x0103b45c: 0x103b45c: addiu a3, s2, 28076
+// 0x0103b46c: 0x103b46c: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103b460: 0x103b460: sw    v0, 1096(sp)
+// 0x0103b470: 0x103b470: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5250,7 +5250,7 @@ L_103b440:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b464: 0x103b464: jal   0x1068250 sw    s1, 16(sp)
+// 0x0103b474: 0x103b474: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5264,81 +5264,81 @@ L_103b440:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b46c: 0x103b46c: bne   v0, zero, 0x103b490 addu  s0, v0, zero
+// 0x0103b47c: 0x103b47c: bne   v0, zero, 0x103b4a0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b490
+	brtrue L_103b4a0
 // --- basic block ---
-// 0x0103b474: 0x103b474: lui   a1, 0x10000
+// 0x0103b484: 0x103b484: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b478: 0x103b478: lui   a3, 0x10000
+// 0x0103b488: 0x103b488: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b47c: 0x103b47c: addiu a1, a1, -10520
+// 0x0103b48c: 0x103b48c: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b480: 0x103b480: addiu a3, a3, -9908
+// 0x0103b490: 0x103b490: addiu a3, a3, -9912
 	ldloc 4
-	ldc.i4 -9908
+	ldc.i4 -9912
 	add
 	stloc 4
-// 0x0103b484: 0x103b484: addiu a0, zero, 4
+// 0x0103b494: 0x103b494: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b488: 0x103b488: j	 0x103b378 addiu a2, zero, 504
+// 0x0103b498: 0x103b498: j	 0x103b388 addiu a2, zero, 504
 	ldc.i4 504
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b490:
-// 0x0103b490: 0x103b490: lb    v1, 0(v0)
+L_103b4a0:
+// 0x0103b4a0: 0x103b4a0: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103b494: 0x103b494: addiu v0, zero, 44
+// 0x0103b4a4: 0x103b4a4: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103b498: 0x103b498: bne   v1, v0, 0x103b4a8 addu  a0, s0, zero
+// 0x0103b4a8: 0x103b4a8: bne   v1, v0, 0x103b4b8 addu  a0, s0, zero
 	ldloc 8
 	ldloc 5
 	ldloc 7
 	stloc.1
-	bne.un L_103b4a8
+	bne.un L_103b4b8
 // --- basic block ---
-// 0x0103b4a0: 0x103b4a0: j	 0x103b4e8 addiu s0, s0, 1
+// 0x0103b4b0: 0x103b4b0: j	 0x103b4f8 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103b4e8
+	br L_103b4f8
 // --- basic block ---
-L_103b4a8:
-// 0x0103b4a8: 0x103b4a8: addiu v0, zero, 128
+L_103b4b8:
+// 0x0103b4b8: 0x103b4b8: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x0103b4ac: 0x103b4ac: addu  a2, s4, zero
+// 0x0103b4bc: 0x103b4bc: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x0103b4b0: 0x103b4b0: addiu a3, s2, 28076
+// 0x0103b4c0: 0x103b4c0: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103b4b4: 0x103b4b4: addiu a1, sp, 1258
+// 0x0103b4c4: 0x103b4c4: addiu a1, sp, 1258
 	ldloc.0
 	ldc.i4 1258
 	add
 	stloc.2
-// 0x0103b4b8: 0x103b4b8: sw    v0, 1096(sp)
+// 0x0103b4c8: 0x103b4c8: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5347,7 +5347,7 @@ L_103b4a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b4bc: 0x103b4bc: jal   0x1068250 sw    s1, 16(sp)
+// 0x0103b4cc: 0x103b4cc: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5361,84 +5361,84 @@ L_103b4a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b4c4: 0x103b4c4: bne   v0, zero, 0x103b4e8 addu  s0, v0, zero
+// 0x0103b4d4: 0x103b4d4: bne   v0, zero, 0x103b4f8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b4e8
+	brtrue L_103b4f8
 // --- basic block ---
-// 0x0103b4cc: 0x103b4cc: lui   a1, 0x10000
+// 0x0103b4dc: 0x103b4dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b4d0: 0x103b4d0: lui   a3, 0x10000
+// 0x0103b4e0: 0x103b4e0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b4d4: 0x103b4d4: addiu a1, a1, -10520
+// 0x0103b4e4: 0x103b4e4: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b4d8: 0x103b4d8: addiu a3, a3, -9852
+// 0x0103b4e8: 0x103b4e8: addiu a3, a3, -9856
 	ldloc 4
-	ldc.i4 -9852
+	ldc.i4 -9856
 	add
 	stloc 4
-// 0x0103b4dc: 0x103b4dc: addiu a0, zero, 4
+// 0x0103b4ec: 0x103b4ec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b4e0: 0x103b4e0: j	 0x103b378 addiu a2, zero, 526
+// 0x0103b4f0: 0x103b4f0: j	 0x103b388 addiu a2, zero, 526
 	ldc.i4 526
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b4e8:
-// 0x0103b4e8: 0x103b4e8: lb    v1, 0(s0)
+L_103b4f8:
+// 0x0103b4f8: 0x103b4f8: lb    v1, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103b4ec: 0x103b4ec: addiu v0, zero, 44
+// 0x0103b4fc: 0x103b4fc: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103b4f0: 0x103b4f0: bne   v1, v0, 0x103b500 lui   a1, 0x0
+// 0x0103b500: 0x103b500: bne   v1, v0, 0x103b510 lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_103b500
+	bne.un L_103b510
 // --- basic block ---
-// 0x0103b4f8: 0x103b4f8: j	 0x103b540 addiu s0, s0, 1
+// 0x0103b508: 0x103b508: j	 0x103b550 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103b540
+	br L_103b550
 // --- basic block ---
-L_103b500:
-// 0x0103b500: 0x103b500: addu  a0, s0, zero
+L_103b510:
+// 0x0103b510: 0x103b510: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103b504: 0x103b504: addiu v0, zero, 1
+// 0x0103b514: 0x103b514: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103b508: 0x103b508: addiu a1, a1, 28076
+// 0x0103b518: 0x103b518: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0103b50c: 0x103b50c: addu  a2, zero, zero
+// 0x0103b51c: 0x103b51c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103b510: 0x103b510: addiu a3, sp, 1388
+// 0x0103b520: 0x103b520: addiu a3, sp, 1388
 	ldloc.0
 	ldc.i4 1388
 	add
 	stloc 4
-// 0x0103b514: 0x103b514: jal   0x106855c sw    v0, 16(sp)
+// 0x0103b524: 0x103b524: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5452,71 +5452,71 @@ L_103b500:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b51c: 0x103b51c: bne   v0, zero, 0x103b540 addu  s0, v0, zero
+// 0x0103b52c: 0x103b52c: bne   v0, zero, 0x103b550 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b540
+	brtrue L_103b550
 // --- basic block ---
-// 0x0103b524: 0x103b524: lui   a1, 0x10000
+// 0x0103b534: 0x103b534: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b528: 0x103b528: lui   a3, 0x10000
+// 0x0103b538: 0x103b538: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b52c: 0x103b52c: addiu a1, a1, -10520
+// 0x0103b53c: 0x103b53c: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b530: 0x103b530: addiu a3, a3, -9792
+// 0x0103b540: 0x103b540: addiu a3, a3, -9796
 	ldloc 4
-	ldc.i4 -9792
+	ldc.i4 -9796
 	add
 	stloc 4
-// 0x0103b534: 0x103b534: addiu a0, zero, 4
+// 0x0103b544: 0x103b544: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b538: 0x103b538: j	 0x103b378 addiu a2, zero, 549
+// 0x0103b548: 0x103b548: j	 0x103b388 addiu a2, zero, 549
 	ldc.i4 549
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b540:
-// 0x0103b540: 0x103b540: lb    v1, 0(s0)
+L_103b550:
+// 0x0103b550: 0x103b550: lb    v1, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103b544: 0x103b544: addiu v0, zero, 44
+// 0x0103b554: 0x103b554: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103b548: 0x103b548: bne   v1, v0, 0x103b558 addiu v0, zero, 250
+// 0x0103b558: 0x103b558: bne   v1, v0, 0x103b568 addiu v0, zero, 250
 	ldloc 8
 	ldloc 5
 	ldc.i4 250
 	stloc 5
-	bne.un L_103b558
+	bne.un L_103b568
 // --- basic block ---
-// 0x0103b550: 0x103b550: j	 0x103b5a0 addiu s0, s0, 1
+// 0x0103b560: 0x103b560: j	 0x103b5b0 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103b5a0
+	br L_103b5b0
 // --- basic block ---
-L_103b558:
-// 0x0103b558: 0x103b558: lui   a3, 0x0
+L_103b568:
+// 0x0103b568: 0x103b568: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0103b55c: 0x103b55c: addu  a0, s0, zero
+// 0x0103b56c: 0x103b56c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103b560: 0x103b560: sw    v0, 1096(sp)
+// 0x0103b570: 0x103b570: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5525,25 +5525,25 @@ L_103b558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b564: 0x103b564: addiu a3, a3, 28076
+// 0x0103b574: 0x103b574: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103b568: 0x103b568: addiu v0, zero, 1
+// 0x0103b578: 0x103b578: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103b56c: 0x103b56c: addiu a1, sp, 1392
+// 0x0103b57c: 0x103b57c: addiu a1, sp, 1392
 	ldloc.0
 	ldc.i4 1392
 	add
 	stloc.2
-// 0x0103b570: 0x103b570: addiu a2, sp, 1096
+// 0x0103b580: 0x103b580: addiu a2, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc.3
-// 0x0103b574: 0x103b574: jal   0x1068250 sw    v0, 16(sp)
+// 0x0103b584: 0x103b584: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5557,71 +5557,71 @@ L_103b558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b57c: 0x103b57c: bne   v0, zero, 0x103b5a0 addu  s0, v0, zero
+// 0x0103b58c: 0x103b58c: bne   v0, zero, 0x103b5b0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b5a0
+	brtrue L_103b5b0
 // --- basic block ---
-// 0x0103b584: 0x103b584: lui   a1, 0x10000
+// 0x0103b594: 0x103b594: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b588: 0x103b588: lui   a3, 0x10000
+// 0x0103b598: 0x103b598: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b58c: 0x103b58c: addiu a1, a1, -10520
+// 0x0103b59c: 0x103b59c: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b590: 0x103b590: addiu a3, a3, -9724
+// 0x0103b5a0: 0x103b5a0: addiu a3, a3, -9728
 	ldloc 4
-	ldc.i4 -9724
+	ldc.i4 -9728
 	add
 	stloc 4
-// 0x0103b594: 0x103b594: addiu a0, zero, 4
+// 0x0103b5a4: 0x103b5a4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b598: 0x103b598: j	 0x103b378 addiu a2, zero, 569
+// 0x0103b5a8: 0x103b5a8: j	 0x103b388 addiu a2, zero, 569
 	ldc.i4 569
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b5a0:
-// 0x0103b5a0: 0x103b5a0: lb    v1, 0(s0)
+L_103b5b0:
+// 0x0103b5b0: 0x103b5b0: lb    v1, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103b5a4: 0x103b5a4: addiu v0, zero, 44
+// 0x0103b5b4: 0x103b5b4: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103b5a8: 0x103b5a8: bne   v1, v0, 0x103b5b8 addiu v0, zero, 32
+// 0x0103b5b8: 0x103b5b8: bne   v1, v0, 0x103b5c8 addiu v0, zero, 32
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 32
 	stloc 5
-	bne.un L_103b5b8
+	bne.un L_103b5c8
 // --- basic block ---
-// 0x0103b5b0: 0x103b5b0: j	 0x103b600 addiu s0, s0, 1
+// 0x0103b5c0: 0x103b5c0: j	 0x103b610 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103b600
+	br L_103b610
 // --- basic block ---
-L_103b5b8:
-// 0x0103b5b8: 0x103b5b8: lui   a3, 0x0
+L_103b5c8:
+// 0x0103b5c8: 0x103b5c8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0103b5bc: 0x103b5bc: addu  a0, s0, zero
+// 0x0103b5cc: 0x103b5cc: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103b5c0: 0x103b5c0: sw    v0, 1096(sp)
+// 0x0103b5d0: 0x103b5d0: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5630,25 +5630,25 @@ L_103b5b8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b5c4: 0x103b5c4: addiu a3, a3, 28076
+// 0x0103b5d4: 0x103b5d4: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103b5c8: 0x103b5c8: addiu v0, zero, 1
+// 0x0103b5d8: 0x103b5d8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103b5cc: 0x103b5cc: addiu a1, sp, 1643
+// 0x0103b5dc: 0x103b5dc: addiu a1, sp, 1643
 	ldloc.0
 	ldc.i4 1643
 	add
 	stloc.2
-// 0x0103b5d0: 0x103b5d0: addiu a2, sp, 1096
+// 0x0103b5e0: 0x103b5e0: addiu a2, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc.3
-// 0x0103b5d4: 0x103b5d4: jal   0x1068250 sw    v0, 16(sp)
+// 0x0103b5e4: 0x103b5e4: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5662,71 +5662,71 @@ L_103b5b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b5dc: 0x103b5dc: bne   v0, zero, 0x103b600 addu  s0, v0, zero
+// 0x0103b5ec: 0x103b5ec: bne   v0, zero, 0x103b610 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b600
+	brtrue L_103b610
 // --- basic block ---
-// 0x0103b5e4: 0x103b5e4: lui   a1, 0x10000
+// 0x0103b5f4: 0x103b5f4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b5e8: 0x103b5e8: lui   a3, 0x10000
+// 0x0103b5f8: 0x103b5f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b5ec: 0x103b5ec: addiu a1, a1, -10520
+// 0x0103b5fc: 0x103b5fc: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b5f0: 0x103b5f0: addiu a3, a3, -9664
+// 0x0103b600: 0x103b600: addiu a3, a3, -9668
 	ldloc 4
-	ldc.i4 -9664
+	ldc.i4 -9668
 	add
 	stloc 4
-// 0x0103b5f4: 0x103b5f4: addiu a0, zero, 4
+// 0x0103b604: 0x103b604: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b5f8: 0x103b5f8: j	 0x103b378 addiu a2, zero, 589
+// 0x0103b608: 0x103b608: j	 0x103b388 addiu a2, zero, 589
 	ldc.i4 589
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b600:
-// 0x0103b600: 0x103b600: lb    v1, 0(s0)
+L_103b610:
+// 0x0103b610: 0x103b610: lb    v1, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103b604: 0x103b604: addiu v0, zero, 10
+// 0x0103b614: 0x103b614: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x0103b608: 0x103b608: bne   v1, v0, 0x103b618 lui   a3, 0x10000
+// 0x0103b618: 0x103b618: bne   v1, v0, 0x103b628 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	bne.un L_103b618
+	bne.un L_103b628
 // --- basic block ---
-// 0x0103b610: 0x103b610: j	 0x103b660 addiu s0, s0, 1
+// 0x0103b620: 0x103b620: j	 0x103b670 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103b660
+	br L_103b670
 // --- basic block ---
-L_103b618:
-// 0x0103b618: 0x103b618: addiu v0, zero, 250
+L_103b628:
+// 0x0103b628: 0x103b628: addiu v0, zero, 250
 	ldc.i4 250
 	stloc 5
-// 0x0103b61c: 0x103b61c: addu  a0, s0, zero
+// 0x0103b62c: 0x103b62c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103b620: 0x103b620: sw    v0, 1096(sp)
+// 0x0103b630: 0x103b630: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5735,25 +5735,25 @@ L_103b618:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b624: 0x103b624: addiu a3, a3, 19160
+// 0x0103b634: 0x103b634: addiu a3, a3, 18632
 	ldloc 4
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 4
-// 0x0103b628: 0x103b628: addiu v0, zero, -1
+// 0x0103b638: 0x103b638: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103b62c: 0x103b62c: addiu a1, sp, 1676
+// 0x0103b63c: 0x103b63c: addiu a1, sp, 1676
 	ldloc.0
 	ldc.i4 1676
 	add
 	stloc.2
-// 0x0103b630: 0x103b630: addiu a2, sp, 1096
+// 0x0103b640: 0x103b640: addiu a2, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc.3
-// 0x0103b634: 0x103b634: jal   0x1068250 sw    v0, 16(sp)
+// 0x0103b644: 0x103b644: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5767,43 +5767,43 @@ L_103b618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b63c: 0x103b63c: bne   v0, zero, 0x103b660 addu  s0, v0, zero
+// 0x0103b64c: 0x103b64c: bne   v0, zero, 0x103b670 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103b660
+	brtrue L_103b670
 // --- basic block ---
-// 0x0103b644: 0x103b644: lui   a1, 0x10000
+// 0x0103b654: 0x103b654: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b648: 0x103b648: lui   a3, 0x10000
+// 0x0103b658: 0x103b658: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b64c: 0x103b64c: addiu a1, a1, -10520
+// 0x0103b65c: 0x103b65c: addiu a1, a1, -10524
 	ldloc.2
-	ldc.i4 -10520
+	ldc.i4 -10524
 	add
 	stloc.2
-// 0x0103b650: 0x103b650: addiu a3, a3, -9604
+// 0x0103b660: 0x103b660: addiu a3, a3, -9608
 	ldloc 4
-	ldc.i4 -9604
+	ldc.i4 -9608
 	add
 	stloc 4
-// 0x0103b654: 0x103b654: addiu a0, zero, 4
+// 0x0103b664: 0x103b664: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b658: 0x103b658: j	 0x103b378 addiu a2, zero, 609
+// 0x0103b668: 0x103b668: j	 0x103b388 addiu a2, zero, 609
 	ldc.i4 609
 	stloc.3
-	br L_103b378
+	br L_103b388
 // --- basic block ---
-L_103b660:
-// 0x0103b660: 0x103b660: jal   0x103add0 addiu a0, sp, 1104
+L_103b670:
+// 0x0103b670: 0x103b670: jal   0x103ade0 addiu a0, sp, 1104
 	ldloc.0
 	ldc.i4 1104
 	add
@@ -5813,60 +5813,60 @@ L_103b660:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_candidate_build_address_string_103add0(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_candidate_build_address_string_103ade0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b668: 0x103b668: addu  v0, zero, zero
+// 0x0103b678: 0x103b678: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103b66c: 0x103b66c: addiu a0, sp, 16
+// 0x0103b67c: 0x103b67c: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0103b670: 0x103b670: j	 0x103b684 addiu v1, sp, 1120
+// 0x0103b680: 0x103b680: j	 0x103b694 addiu v1, sp, 1120
 	ldloc.0
 	ldc.i4 1120
 	add
 	stloc 8
-	br L_103b684
+	br L_103b694
 // --- basic block ---
-L_103b678:
-// 0x0103b678: 0x103b678: lbu   a1, 0(a3)
+L_103b688:
+// 0x0103b688: 0x103b688: lbu   a1, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x0103b67c: 0x103b67c: addiu v0, v0, 1
+// 0x0103b68c: 0x103b68c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0103b680: 0x103b680: sb    a1, 0(a2)
+// 0x0103b690: 0x103b690: sb    a1, 0(a2)
 	ldloc.3
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_103b684:
-// 0x0103b684: 0x103b684: sltiu a1, v0, 1080
+L_103b694:
+// 0x0103b694: 0x103b694: sltiu a1, v0, 1080
 	ldloc 5
 	ldc.i4 1080
 	clt.un
 	stloc.2
-// 0x0103b688: 0x103b688: addu  a3, v1, v0
+// 0x0103b698: 0x103b698: addu  a3, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 4
-// 0x0103b68c: 0x103b68c: bne   a1, zero, 0x103b678 addu  a2, a0, v0
+// 0x0103b69c: 0x103b69c: bne   a1, zero, 0x103b688 addu  a2, a0, v0
 	ldloc.2
 	ldloc.1
 	ldloc 5
 	add
 	stloc.3
-	brtrue L_103b678
+	brtrue L_103b688
 // --- basic block ---
-// 0x0103b694: 0x103b694: lw    a0, 1104(sp)
+// 0x0103b6a4: 0x103b6a4: lw    a0, 1104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5875,7 +5875,7 @@ L_103b684:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103b698: 0x103b698: lw    a1, 1108(sp)
+// 0x0103b6a8: 0x103b6a8: lw    a1, 1108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5884,7 +5884,7 @@ L_103b684:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103b69c: 0x103b69c: lw    a2, 1112(sp)
+// 0x0103b6ac: 0x103b6ac: lw    a2, 1112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5893,7 +5893,7 @@ L_103b684:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103b6a0: 0x103b6a0: lw    a3, 1116(sp)
+// 0x0103b6b0: 0x103b6b0: lw    a3, 1116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5902,30 +5902,30 @@ L_103b684:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103b6a4: 0x103b6a4: jal   0x103e1d4 sll   zero, zero, 0
+// 0x0103b6b4: 0x103b6b4: jal   0x103e1e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_address_add_103e1d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_address_add_103e1e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103b6ac: 0x103b6ac: sw    zero, 0(s3)
+// 0x0103b6bc: 0x103b6bc: sw    zero, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_103b6b0:
-// 0x0103b6b0: 0x103b6b0: lw    ra, 2220(sp)
-// 0x0103b6b4: 0x103b6b4: addu  v0, s0, zero
+L_103b6c0:
+// 0x0103b6c0: 0x103b6c0: lw    ra, 2220(sp)
+// 0x0103b6c4: 0x103b6c4: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0103b6b8: 0x103b6b8: lw    s4, 2216(sp)
+// 0x0103b6c8: 0x103b6c8: lw    s4, 2216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5934,7 +5934,7 @@ L_103b6b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103b6bc: 0x103b6bc: lw    s3, 2212(sp)
+// 0x0103b6cc: 0x103b6cc: lw    s3, 2212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5943,7 +5943,7 @@ L_103b6b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103b6c0: 0x103b6c0: lw    s2, 2208(sp)
+// 0x0103b6d0: 0x103b6d0: lw    s2, 2208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5952,7 +5952,7 @@ L_103b6b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103b6c4: 0x103b6c4: lw    s1, 2204(sp)
+// 0x0103b6d4: 0x103b6d4: lw    s1, 2204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5961,7 +5961,7 @@ L_103b6b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103b6c8: 0x103b6c8: lw    s0, 2200(sp)
+// 0x0103b6d8: 0x103b6d8: lw    s0, 2200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5970,7 +5970,7 @@ L_103b6b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103b6cc: 0x103b6cc: jr    ra addiu sp, sp, 2224
+// 0x0103b6dc: 0x103b6dc: jr    ra addiu sp, sp, 2224
 	ldloc.0
 	ldc.i4 2224
 	add
@@ -5982,7 +5982,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 local_search_dlg_show_103b6d4(int32,int32,int32,int32,int32)
+.method public static int32 local_search_dlg_show_103b6e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 s6,int32 s4,int32 s5,int32 ra)
@@ -6038,12 +6038,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103b6d4: 0x103b6d4: addiu sp, sp, -88
+// 0x0103b6e4: 0x103b6e4: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x0103b6d8: 0x103b6d8: sw    s2, 64(sp)
+// 0x0103b6e8: 0x103b6e8: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6052,19 +6052,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103b6dc: 0x103b6dc: lui   s2, 0x60000
+// 0x0103b6ec: 0x103b6ec: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x0103b6e0: 0x103b6e0: lw    v0, -13452(s2)
+// 0x0103b6f0: 0x103b6f0: lw    v0, -12988(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3363
+	ldc.i4 -3247
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103b6e4: 0x103b6e4: sw    s5, 76(sp)
+// 0x0103b6f4: 0x103b6f4: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6073,7 +6073,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103b6e8: 0x103b6e8: sw    s4, 72(sp)
+// 0x0103b6f8: 0x103b6f8: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6082,8 +6082,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103b6ec: 0x103b6ec: sw    ra, 84(sp)
-// 0x0103b6f0: 0x103b6f0: sw    s6, 80(sp)
+// 0x0103b6fc: 0x103b6fc: sw    ra, 84(sp)
+// 0x0103b700: 0x103b700: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6092,7 +6092,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103b6f4: 0x103b6f4: sw    s3, 68(sp)
+// 0x0103b704: 0x103b704: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6101,7 +6101,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103b6f8: 0x103b6f8: sw    s1, 60(sp)
+// 0x0103b708: 0x103b708: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6110,7 +6110,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103b6fc: 0x103b6fc: sw    s0, 56(sp)
+// 0x0103b70c: 0x103b70c: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6119,33 +6119,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103b700: 0x103b700: addu  s5, a0, zero
+// 0x0103b710: 0x103b710: addu  s5, a0, zero
 	ldloc.1
 	stloc 14
-// 0x0103b704: 0x103b704: bne   v0, zero, 0x103b864 addu  s4, a1, zero
+// 0x0103b714: 0x103b714: bne   v0, zero, 0x103b874 addu  s4, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 13
-	brtrue L_103b864
+	brtrue L_103b874
 // --- basic block ---
-// 0x0103b70c: 0x103b70c: lui   a0, 0x10000
+// 0x0103b71c: 0x103b71c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b710: 0x103b710: addiu a3, zero, -1
+// 0x0103b720: 0x103b720: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0103b714: 0x103b714: addiu a0, a0, -9448
+// 0x0103b724: 0x103b724: addiu a0, a0, -9452
 	ldloc.1
-	ldc.i4 -9448
+	ldc.i4 -9452
 	add
 	stloc.1
-// 0x0103b718: 0x103b718: addu  a1, zero, zero
+// 0x0103b728: 0x103b728: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103b71c: 0x103b71c: addiu a2, zero, -1
+// 0x0103b72c: 0x103b72c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0103b720: 0x103b720: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0103b730: 0x103b730: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6159,68 +6159,68 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b728: 0x103b728: addu  a0, v0, zero
+// 0x0103b738: 0x103b738: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103b72c: 0x103b72c: addu  a1, zero, zero
+// 0x0103b73c: 0x103b73c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103b730: 0x103b730: addu  a2, zero, zero
+// 0x0103b740: 0x103b740: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103b734: 0x103b734: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0103b744: 0x103b744: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0103b73c: 0x103b73c: lui   v0, 0xf0000
+// 0x0103b74c: 0x103b74c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0103b740: 0x103b740: lw    a2, -30068(v0)
+// 0x0103b750: 0x103b750: lw    a2, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103b744: 0x103b744: lui   s3, 0x40000000
+// 0x0103b754: 0x103b754: lui   s3, 0x40000000
 	ldc.i4 1073741824
 	stloc 9
-// 0x0103b748: 0x103b748: lui   a0, 0x10000
+// 0x0103b758: 0x103b758: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b74c: 0x103b74c: addiu a3, zero, -1
+// 0x0103b75c: 0x103b75c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0103b750: 0x103b750: ori   v0, s3, 20481
+// 0x0103b760: 0x103b760: ori   v0, s3, 20481
 	ldloc 9
 	ldc.i4 20481
 	or
 	stloc 5
-// 0x0103b754: 0x103b754: addiu a2, a2, -8
+// 0x0103b764: 0x103b764: addiu a2, a2, -8
 	ldloc.3
 	ldc.i4.s -8
 	add
 	stloc.3
-// 0x0103b758: 0x103b758: addiu a0, a0, -9408
+// 0x0103b768: 0x103b768: addiu a0, a0, -9412
 	ldloc.1
-	ldc.i4 -9408
+	ldc.i4 -9412
 	add
 	stloc.1
-// 0x0103b75c: 0x103b75c: addu  a1, zero, zero
+// 0x0103b76c: 0x103b76c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103b760: 0x103b760: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0103b770: 0x103b770: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6234,21 +6234,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b768: 0x103b768: addu  a0, s0, zero
+// 0x0103b778: 0x103b778: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103b76c: 0x103b76c: addiu a1, zero, 2
+// 0x0103b77c: 0x103b77c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0103b770: 0x103b770: addu  a2, zero, zero
+// 0x0103b780: 0x103b780: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103b774: 0x103b774: jal   0x10942e8 addu  s1, v0, zero
+// 0x0103b784: 0x103b784: jal   0x109490c addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -6256,32 +6256,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b77c: 0x103b77c: lui   a0, 0x10000
+// 0x0103b78c: 0x103b78c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b780: 0x103b780: addiu a3, zero, -1
+// 0x0103b790: 0x103b790: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0103b784: 0x103b784: addiu a0, a0, -9396
+// 0x0103b794: 0x103b794: addiu a0, a0, -9400
 	ldloc.1
-	ldc.i4 -9396
+	ldc.i4 -9400
 	add
 	stloc.1
-// 0x0103b788: 0x103b788: addu  a1, zero, zero
+// 0x0103b798: 0x103b798: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103b78c: 0x103b78c: addiu a2, zero, 80
+// 0x0103b79c: 0x103b79c: addiu a2, zero, 80
 	ldc.i4.s 80
 	stloc.3
-// 0x0103b790: 0x103b790: addiu v0, zero, 16
+// 0x0103b7a0: 0x103b7a0: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0103b794: 0x103b794: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0103b7a4: 0x103b7a4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6295,12 +6295,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b79c: 0x103b79c: jal   0x103aa58 addu  s6, v0, zero
+// 0x0103b7ac: 0x103b7ac: jal   0x103aa68 addu  s6, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -6308,23 +6308,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_logo_name_103aa58(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_logo_name_103aa68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b7a4: 0x103b7a4: lui   a0, 0x10000
+// 0x0103b7b4: 0x103b7b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b7a8: 0x103b7a8: addiu a2, zero, 17
+// 0x0103b7b8: 0x103b7b8: addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
-// 0x0103b7ac: 0x103b7ac: addiu a0, a0, -9380
+// 0x0103b7bc: 0x103b7bc: addiu a0, a0, -9384
 	ldloc.1
-	ldc.i4 -9380
+	ldc.i4 -9384
 	add
 	stloc.1
-// 0x0103b7b0: 0x103b7b0: jal   0x109e13c addu  a1, v0, zero
+// 0x0103b7c0: 0x103b7c0: jal   0x109e784 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6332,43 +6332,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b7b8: 0x103b7b8: addu  a1, v0, zero
+// 0x0103b7c8: 0x103b7c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103b7bc: 0x103b7bc: jal   0x1098ec4 addu  a0, s6, zero
+// 0x0103b7cc: 0x103b7cc: jal   0x109950c addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b7c4: 0x103b7c4: addu  a1, s6, zero
+// 0x0103b7d4: 0x103b7d4: addu  a1, s6, zero
 	ldloc 12
 	stloc.2
-// 0x0103b7c8: 0x103b7c8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0103b7d8: 0x103b7d8: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b7d0: 0x103b7d0: lui   a0, 0x10000
+// 0x0103b7e0: 0x103b7e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b7d4: 0x103b7d4: jal   0x101cd60 addiu a0, a0, -9360
+// 0x0103b7e4: 0x103b7e4: jal   0x101cd70 addiu a0, a0, -9364
 	ldloc.1
-	ldc.i4 -9360
+	ldc.i4 -9364
 	add
 	stloc.1
 	ldloc.0
@@ -6376,26 +6376,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b7dc: 0x103b7dc: lui   a0, 0x10000
+// 0x0103b7ec: 0x103b7ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b7e0: 0x103b7e0: addiu a3, zero, 16
+// 0x0103b7f0: 0x103b7f0: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x0103b7e4: 0x103b7e4: addiu a2, zero, 14
+// 0x0103b7f4: 0x103b7f4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x0103b7e8: 0x103b7e8: addiu a0, a0, -9336
+// 0x0103b7f8: 0x103b7f8: addiu a0, a0, -9340
 	ldloc.1
-	ldc.i4 -9336
+	ldc.i4 -9340
 	add
 	stloc.1
-// 0x0103b7ec: 0x103b7ec: jal   0x1098d10 addu  a1, v0, zero
+// 0x0103b7fc: 0x103b7fc: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6403,44 +6403,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b7f4: 0x103b7f4: addu  a1, v0, zero
+// 0x0103b804: 0x103b804: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103b7f8: 0x103b7f8: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0103b808: 0x103b808: jal   0x109950c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b800: 0x103b800: addu  a0, s0, zero
+// 0x0103b810: 0x103b810: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103b804: 0x103b804: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0103b814: 0x103b814: jal   0x109950c addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b80c: 0x103b80c: addu  a0, s0, zero
+// 0x0103b81c: 0x103b81c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103b810: 0x103b810: addiu a1, zero, 5
+// 0x0103b820: 0x103b820: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0103b814: 0x103b814: jal   0x10942e8 addu  a2, zero, zero
+// 0x0103b824: 0x103b824: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6448,34 +6448,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b81c: 0x103b81c: lui   a0, 0x10000
+// 0x0103b82c: 0x103b82c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b820: 0x103b820: addiu a2, zero, -2
+// 0x0103b830: 0x103b830: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0103b824: 0x103b824: addiu a3, zero, 31
+// 0x0103b834: 0x103b834: addiu a3, zero, 31
 	ldc.i4.s 31
 	stloc 4
-// 0x0103b828: 0x103b828: addiu a0, a0, -9316
+// 0x0103b838: 0x103b838: addiu a0, a0, -9320
 	ldloc.1
-	ldc.i4 -9316
+	ldc.i4 -9320
 	add
 	stloc.1
-// 0x0103b82c: 0x103b82c: addiu a1, zero, -2
+// 0x0103b83c: 0x103b83c: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x0103b830: 0x103b830: ori   s3, s3, 20480
+// 0x0103b840: 0x103b840: ori   s3, s3, 20480
 	ldloc 9
 	ldc.i4 20480
 	or
 	stloc 9
-// 0x0103b834: 0x103b834: sw    s3, 16(sp)
+// 0x0103b844: 0x103b844: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6484,7 +6484,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103b838: 0x103b838: jal   0x1092750 sw    zero, 20(sp)
+// 0x0103b848: 0x103b848: jal   0x1092d74 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6498,18 +6498,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_new_1092750(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b840: 0x103b840: addu  a0, v0, zero
+// 0x0103b850: 0x103b850: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103b844: 0x103b844: addiu a1, zero, 80
+// 0x0103b854: 0x103b854: addiu a1, zero, 80
 	ldc.i4.s 80
 	stloc.2
-// 0x0103b848: 0x103b848: jal   0x1091748 sw    v0, 48(sp)
+// 0x0103b858: 0x103b858: jal   0x1091d6c sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6523,12 +6523,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b850: 0x103b850: lw    v0, 48(sp)
+// 0x0103b860: 0x103b860: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6537,45 +6537,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103b854: 0x103b854: addu  a0, s0, zero
+// 0x0103b864: 0x103b864: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103b858: 0x103b858: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0103b868: 0x103b868: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b860: 0x103b860: sw    s0, -13452(s2)
+// 0x0103b870: 0x103b870: sw    s0, -12988(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3363
+	ldc.i4 -3247
 	add
 	ldloc 8
 	stelem.i4
-L_103b864:
-// 0x0103b864: 0x103b864: lui   v0, 0x60000
+L_103b874:
+// 0x0103b874: 0x103b874: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103b868: 0x103b868: lw    v0, -13452(v0)
+// 0x0103b878: 0x103b878: lw    v0, -12988(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3363
+	ldc.i4 -3247
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103b86c: 0x103b86c: lui   a1, 0x10000
+// 0x0103b87c: 0x103b87c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103b870: 0x103b870: sw    v0, 20(sp)
+// 0x0103b880: 0x103b880: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6584,15 +6584,15 @@ L_103b864:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b874: 0x103b874: lui   v0, 0x1040000
+// 0x0103b884: 0x103b884: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103b878: 0x103b878: addiu v0, v0, -18200
+// 0x0103b888: 0x103b888: addiu v0, v0, -18184
 	ldloc 5
-	ldc.i4 -18200
+	ldc.i4 -18184
 	add
 	stloc 5
-// 0x0103b87c: 0x103b87c: sw    v0, 28(sp)
+// 0x0103b88c: 0x103b88c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6601,47 +6601,47 @@ L_103b864:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b880: 0x103b880: lui   a2, 0x10000
+// 0x0103b890: 0x103b890: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103b884: 0x103b884: lui   a3, 0x1040000
+// 0x0103b894: 0x103b894: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x0103b888: 0x103b888: lui   v1, 0x1040000
+// 0x0103b898: 0x103b898: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 7
-// 0x0103b88c: 0x103b88c: lui   v0, 0x1040000
+// 0x0103b89c: 0x103b89c: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103b890: 0x103b890: addiu v1, v1, -16988
+// 0x0103b8a0: 0x103b8a0: addiu v1, v1, -16972
 	ldloc 7
-	ldc.i4 -16988
+	ldc.i4 -16972
 	add
 	stloc 7
-// 0x0103b894: 0x103b894: addiu v0, v0, -18732
+// 0x0103b8a4: 0x103b8a4: addiu v0, v0, -18716
 	ldloc 5
-	ldc.i4 -18732
+	ldc.i4 -18716
 	add
 	stloc 5
-// 0x0103b898: 0x103b898: addiu a1, a1, -9272
+// 0x0103b8a8: 0x103b8a8: addiu a1, a1, -9276
 	ldloc.2
-	ldc.i4 -9272
+	ldc.i4 -9276
 	add
 	stloc.2
-// 0x0103b89c: 0x103b89c: addiu a2, a2, -18352
+// 0x0103b8ac: 0x103b8ac: addiu a2, a2, -18352
 	ldloc.3
 	ldc.i4 -18352
 	add
 	stloc.3
-// 0x0103b8a0: 0x103b8a0: addiu a3, a3, -16924
+// 0x0103b8b0: 0x103b8b0: addiu a3, a3, -16908
 	ldloc 4
-	ldc.i4 -16924
+	ldc.i4 -16908
 	add
 	stloc 4
-// 0x0103b8a4: 0x103b8a4: addiu a0, zero, 1
+// 0x0103b8b4: 0x103b8b4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103b8a8: 0x103b8a8: sw    s5, 24(sp)
+// 0x0103b8b8: 0x103b8b8: sw    s5, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6650,7 +6650,7 @@ L_103b864:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103b8ac: 0x103b8ac: sw    s4, 36(sp)
+// 0x0103b8bc: 0x103b8bc: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6659,7 +6659,7 @@ L_103b864:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103b8b0: 0x103b8b0: sw    v1, 16(sp)
+// 0x0103b8c0: 0x103b8c0: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6668,7 +6668,7 @@ L_103b864:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103b8b4: 0x103b8b4: sw    v0, 32(sp)
+// 0x0103b8c4: 0x103b8c4: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6677,7 +6677,7 @@ L_103b864:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103b8b8: 0x103b8b8: jal   0x103de44 sw    zero, 40(sp)
+// 0x0103b8c8: 0x103b8c8: jal   0x103de54 sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6691,13 +6691,13 @@ L_103b864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_show_103de44(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_show_103de54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103b8c0: 0x103b8c0: lw    ra, 84(sp)
-// 0x0103b8c4: 0x103b8c4: lw    s6, 80(sp)
+// 0x0103b8d0: 0x103b8d0: lw    ra, 84(sp)
+// 0x0103b8d4: 0x103b8d4: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6706,7 +6706,7 @@ L_103b864:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103b8c8: 0x103b8c8: lw    s5, 76(sp)
+// 0x0103b8d8: 0x103b8d8: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6715,7 +6715,7 @@ L_103b864:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103b8cc: 0x103b8cc: lw    s4, 72(sp)
+// 0x0103b8dc: 0x103b8dc: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6724,7 +6724,7 @@ L_103b864:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103b8d0: 0x103b8d0: lw    s3, 68(sp)
+// 0x0103b8e0: 0x103b8e0: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6733,7 +6733,7 @@ L_103b864:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103b8d4: 0x103b8d4: lw    s2, 64(sp)
+// 0x0103b8e4: 0x103b8e4: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6742,7 +6742,7 @@ L_103b864:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103b8d8: 0x103b8d8: lw    s1, 60(sp)
+// 0x0103b8e8: 0x103b8e8: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6751,7 +6751,7 @@ L_103b864:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103b8dc: 0x103b8dc: lw    s0, 56(sp)
+// 0x0103b8ec: 0x103b8ec: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6760,7 +6760,7 @@ L_103b864:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103b8e0: 0x103b8e0: jr    ra addiu sp, sp, 88
+// 0x0103b8f0: 0x103b8f0: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
diff --git a/converted/Cibyl44.j b/converted/Cibyl44.j
index db0f42a..f31f60c 100644
--- a/converted/Cibyl44.j
+++ b/converted/Cibyl44.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl44::.ctor
 
-.method public static int32 on_search_103b8e8(int32,int32,int32,int32,int32)
+.method public static int32 on_search_103b8f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -85,15 +85,15 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103b8e8: 0x103b8e8: addiu sp, sp, -32
+// 0x0103b8f8: 0x103b8f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103b8ec: 0x103b8ec: addiu a0, zero, 1
+// 0x0103b8fc: 0x103b8fc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103b8f0: 0x103b8f0: sw    s1, 20(sp)
+// 0x0103b900: 0x103b900: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -102,8 +102,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103b8f4: 0x103b8f4: sw    ra, 28(sp)
-// 0x0103b8f8: 0x103b8f8: sw    s2, 24(sp)
+// 0x0103b904: 0x103b904: sw    ra, 28(sp)
+// 0x0103b908: 0x103b908: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -112,7 +112,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103b8fc: 0x103b8fc: jal   0x103da30 sw    s0, 16(sp)
+// 0x0103b90c: 0x103b90c: jal   0x103da40 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -126,12 +126,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da30(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b904: 0x103b904: jal   0x106c170 addu  s1, v0, zero
+// 0x0103b914: 0x103b914: jal   0x106c794 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -139,20 +139,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b90c: 0x103b90c: bne   v0, zero, 0x103b940 lui   a0, 0x10000
+// 0x0103b91c: 0x103b91c: bne   v0, zero, 0x103b950 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103b940
+	brtrue L_103b950
 // --- basic block ---
-// 0x0103b914: 0x103b914: jal   0x101cd60 addiu a0, a0, -9252
+// 0x0103b924: 0x103b924: jal   0x101cd70 addiu a0, a0, -9256
 	ldloc.1
-	ldc.i4 -9252
+	ldc.i4 -9256
 	add
 	stloc.1
 	ldloc.0
@@ -160,20 +160,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b91c: 0x103b91c: lui   a0, 0x10000
+// 0x0103b92c: 0x103b92c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b920: 0x103b920: addiu a0, a0, -9236
+// 0x0103b930: 0x103b930: addiu a0, a0, -9240
 	ldloc.1
-	ldc.i4 -9236
+	ldc.i4 -9240
 	add
 	stloc.1
-// 0x0103b924: 0x103b924: jal   0x101cd60 addu  s0, v0, zero
+// 0x0103b934: 0x103b934: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -181,15 +181,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b92c: 0x103b92c: addu  a1, v0, zero
+// 0x0103b93c: 0x103b93c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103b930: 0x103b930: jal   0x104c148 addu  a0, s0, zero
+// 0x0103b940: 0x103b940: jal   0x104c158 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -197,16 +197,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b938: 0x103b938: j	 0x103b9fc sll   zero, zero, 0
-	br L_103b9fc
+// 0x0103b948: 0x103b948: j	 0x103ba0c sll   zero, zero, 0
+	br L_103ba0c
 // --- basic block ---
-L_103b940:
-// 0x0103b940: 0x103b940: jal   0x103db24 addiu a0, zero, 1
+L_103b950:
+// 0x0103b950: 0x103b950: jal   0x103db34 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -214,26 +214,26 @@ L_103b940:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db24(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b948: 0x103b948: addu  a0, v0, zero
+// 0x0103b958: 0x103b958: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103b94c: 0x103b94c: lui   s0, 0x60000
+// 0x0103b95c: 0x103b95c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103b950: 0x103b950: addiu v0, zero, 1
+// 0x0103b960: 0x103b960: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103b954: 0x103b954: jal   0x1097c00 sw    v0, -13448(s0)
+// 0x0103b964: 0x103b964: jal   0x1098248 sw    v0, -12984(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3362
+	ldc.i4 -3246
 	add
 	ldloc 5
 	stelem.i4
@@ -242,12 +242,12 @@ L_103b940:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b95c: 0x103b95c: lw    a0, 116(s1)
+// 0x0103b96c: 0x103b96c: lw    a0, 116(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -256,15 +256,15 @@ L_103b940:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103b960: 0x103b960: lui   a1, 0x1040000
+// 0x0103b970: 0x103b970: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x0103b964: 0x103b964: addiu a1, a1, -17868
+// 0x0103b974: 0x103b974: addiu a1, a1, -17852
 	ldloc.2
-	ldc.i4 -17868
+	ldc.i4 -17852
 	add
 	stloc.2
-// 0x0103b968: 0x103b968: jal   0x103a9c8 addu  a2, v0, zero
+// 0x0103b978: 0x103b978: jal   0x103a9d8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -272,18 +272,18 @@ L_103b940:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_resolve_address_103a9c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_resolve_address_103a9d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b970: 0x103b970: bne   v0, zero, 0x103b9a0 lui   s2, 0x10000
+// 0x0103b980: 0x103b980: bne   v0, zero, 0x103b9b0 lui   s2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 10
-	brtrue L_103b9a0
+	brtrue L_103b9b0
 // --- basic block ---
-// 0x0103b978: 0x103b978: jal   0x1050ad4 addiu a0, zero, 2
+// 0x0103b988: 0x103b988: jal   0x1050ae4 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -291,28 +291,28 @@ L_103b940:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b980: 0x103b980: lui   a3, 0x10000
+// 0x0103b990: 0x103b990: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b984: 0x103b984: addiu a1, s2, -9164
+// 0x0103b994: 0x103b994: addiu a1, s2, -9168
 	ldloc 10
-	ldc.i4 -9164
+	ldc.i4 -9168
 	add
 	stloc.2
-// 0x0103b988: 0x103b988: addiu a3, a3, -9120
+// 0x0103b998: 0x103b998: addiu a3, a3, -9124
 	ldloc 4
-	ldc.i4 -9120
+	ldc.i4 -9124
 	add
 	stloc 4
-// 0x0103b98c: 0x103b98c: addiu a0, zero, 1
+// 0x0103b99c: 0x103b99c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103b990: 0x103b990: jal   0x100449c addiu a2, zero, 248
+// 0x0103b9a0: 0x103b9a0: jal   0x100449c addiu a2, zero, 248
 	ldc.i4 248
 	stloc.3
 	ldloc.0
@@ -325,11 +325,11 @@ L_103b940:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b998: 0x103b998: j	 0x103b9fc sll   zero, zero, 0
-	br L_103b9fc
+// 0x0103b9a8: 0x103b9a8: j	 0x103ba0c sll   zero, zero, 0
+	br L_103ba0c
 // --- basic block ---
-L_103b9a0:
-// 0x0103b9a0: 0x103b9a0: jal   0x10ac36c addu  a0, v0, zero
+L_103b9b0:
+// 0x0103b9b0: 0x103b9b0: jal   0x10ac9b4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -337,39 +337,39 @@ L_103b9a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b9a8: 0x103b9a8: lui   a3, 0x10000
+// 0x0103b9b8: 0x103b9b8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103b9ac: 0x103b9ac: addiu a1, s2, -9164
+// 0x0103b9bc: 0x103b9bc: addiu a1, s2, -9168
 	ldloc 10
-	ldc.i4 -9164
+	ldc.i4 -9168
 	add
 	stloc.2
-// 0x0103b9b0: 0x103b9b0: addiu a2, zero, 255
+// 0x0103b9c0: 0x103b9c0: addiu a2, zero, 255
 	ldc.i4 255
 	stloc.3
-// 0x0103b9b4: 0x103b9b4: addiu a3, a3, -9036
+// 0x0103b9c4: 0x103b9c4: addiu a3, a3, -9040
 	ldloc 4
-	ldc.i4 -9036
+	ldc.i4 -9040
 	add
 	stloc 4
-// 0x0103b9b8: 0x103b9b8: addiu a0, zero, 4
+// 0x0103b9c8: 0x103b9c8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103b9bc: 0x103b9bc: addu  s1, v0, zero
+// 0x0103b9cc: 0x103b9cc: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0103b9c0: 0x103b9c0: jal   0x100449c sw    zero, -13448(s0)
+// 0x0103b9d0: 0x103b9d0: jal   0x100449c sw    zero, -12984(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3362
+	ldc.i4 -3246
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -383,18 +383,18 @@ L_103b9a0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b9c8: 0x103b9c8: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x0103b9d8: 0x103b9d8: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b9d0: 0x103b9d0: lui   a0, 0x10000
+// 0x0103b9e0: 0x103b9e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103b9d4: 0x103b9d4: jal   0x101cd60 addiu a0, a0, -9252
+// 0x0103b9e4: 0x103b9e4: jal   0x101cd70 addiu a0, a0, -9256
 	ldloc.1
-	ldc.i4 -9252
+	ldc.i4 -9256
 	add
 	stloc.1
 	ldloc.0
@@ -402,15 +402,15 @@ L_103b9a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b9dc: 0x103b9dc: addu  a0, s1, zero
+// 0x0103b9ec: 0x103b9ec: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103b9e0: 0x103b9e0: jal   0x101cd60 addu  s0, v0, zero
+// 0x0103b9f0: 0x103b9f0: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -418,23 +418,23 @@ L_103b9a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103b9e8: 0x103b9e8: lui   a2, 0x1040000
+// 0x0103b9f8: 0x103b9f8: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103b9ec: 0x103b9ec: addu  a0, s0, zero
+// 0x0103b9fc: 0x103b9fc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103b9f0: 0x103b9f0: addu  a1, v0, zero
+// 0x0103ba00: 0x103ba00: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103b9f4: 0x103b9f4: jal   0x104c058 addiu a2, a2, -17900
+// 0x0103ba04: 0x103ba04: jal   0x104c068 addiu a2, a2, -17884
 	ldloc.3
-	ldc.i4 -17900
+	ldc.i4 -17884
 	add
 	stloc.3
 	ldloc.0
@@ -442,14 +442,14 @@ L_103b9a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103b9fc:
-// 0x0103b9fc: 0x103b9fc: lw    ra, 28(sp)
-// 0x0103ba00: 0x103ba00: lw    s2, 24(sp)
+L_103ba0c:
+// 0x0103ba0c: 0x103ba0c: lw    ra, 28(sp)
+// 0x0103ba10: 0x103ba10: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -458,7 +458,7 @@ L_103b9fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103ba04: 0x103ba04: lw    s1, 20(sp)
+// 0x0103ba14: 0x103ba14: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -467,7 +467,7 @@ L_103b9fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103ba08: 0x103ba08: lw    s0, 16(sp)
+// 0x0103ba18: 0x103ba18: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -476,7 +476,7 @@ L_103b9fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103ba0c: 0x103ba0c: jr    ra addiu sp, sp, 32
+// 0x0103ba1c: 0x103ba1c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -488,7 +488,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_search_error_message_103ba14(int32,int32,int32,int32,int32)
+.method public static int32 on_search_error_message_103ba24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -523,26 +523,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ba14: 0x103ba14: addiu sp, sp, -24
+// 0x0103ba24: 0x103ba24: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103ba18: 0x103ba18: sw    ra, 20(sp)
-// 0x0103ba1c: 0x103ba1c: jal   0x103d584 sll   zero, zero, 0
+// 0x0103ba28: 0x103ba28: sw    ra, 20(sp)
+// 0x0103ba2c: 0x103ba2c: jal   0x103d594 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_reopen_native_keyboard_103d584(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_reopen_native_keyboard_103d594(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0103ba24: 0x103ba24: lw    ra, 20(sp)
-// 0x0103ba28: 0x103ba28: sll   zero, zero, 0
-// 0x0103ba2c: 0x103ba2c: jr    ra addiu sp, sp, 24
+// 0x0103ba34: 0x103ba34: lw    ra, 20(sp)
+// 0x0103ba38: 0x103ba38: sll   zero, zero, 0
+// 0x0103ba3c: 0x103ba3c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -554,7 +554,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_address_resolved_103ba34(int32,int32,int32,int32,int32)
+.method public static int32 on_address_resolved_103ba44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra,int32 t0,int32 t1,int32 t2,int32 t3,int32 t4)
@@ -616,25 +616,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ba34: 0x103ba34: addiu sp, sp, -176
+// 0x0103ba44: 0x103ba44: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x0103ba38: 0x103ba38: lui   v0, 0x60000
+// 0x0103ba48: 0x103ba48: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ba3c: 0x103ba3c: sw    ra, 172(sp)
-// 0x0103ba40: 0x103ba40: sw    zero, -13448(v0)
+// 0x0103ba4c: 0x103ba4c: sw    ra, 172(sp)
+// 0x0103ba50: 0x103ba50: sw    zero, -12984(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3362
+	ldc.i4 -3246
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103ba44: 0x103ba44: sw    s3, 168(sp)
+// 0x0103ba54: 0x103ba54: sw    s3, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -643,7 +643,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103ba48: 0x103ba48: sw    s2, 164(sp)
+// 0x0103ba58: 0x103ba58: sw    s2, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -652,13 +652,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103ba4c: 0x103ba4c: addu  s3, a0, zero
+// 0x0103ba5c: 0x103ba5c: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0103ba50: 0x103ba50: addu  s2, a2, zero
+// 0x0103ba60: 0x103ba60: addu  s2, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0103ba54: 0x103ba54: sw    s1, 160(sp)
+// 0x0103ba64: 0x103ba64: sw    s1, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -667,7 +667,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ba58: 0x103ba58: sw    s0, 156(sp)
+// 0x0103ba68: 0x103ba68: sw    s0, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -676,18 +676,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103ba5c: 0x103ba5c: addu  s1, a1, zero
+// 0x0103ba6c: 0x103ba6c: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0103ba60: 0x103ba60: jal   0x104c3f0 addu  s0, a3, zero
+// 0x0103ba70: 0x103ba70: jal   0x104c400 addu  s0, a3, zero
 	ldloc 4
 	stloc 10
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ba68: 0x103ba68: jal   0x1050ad4 addiu a0, zero, 1
+// 0x0103ba78: 0x103ba78: jal   0x1050ae4 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -695,20 +695,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ba70: 0x103ba70: lui   a1, 0x10000
+// 0x0103ba80: 0x103ba80: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ba74: 0x103ba74: addu  a0, s3, zero
+// 0x0103ba84: 0x103ba84: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0103ba78: 0x103ba78: jal   0x109b304 addiu a1, a1, -9316
+// 0x0103ba88: 0x103ba88: jal   0x109b94c addiu a1, a1, -9320
 	ldloc.2
-	ldc.i4 -9316
+	ldc.i4 -9320
 	add
 	stloc.2
 	ldloc.0
@@ -716,39 +716,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ba80: 0x103ba80: beq   s0, zero, 0x103bbb4 addu  s3, v0, zero
+// 0x0103ba90: 0x103ba90: beq   s0, zero, 0x103bbc4 addu  s3, v0, zero
 	ldloc 10
 	ldloc 5
 	stloc 11
-	brfalse L_103bbb4
+	brfalse L_103bbc4
 // --- basic block ---
-// 0x0103ba88: 0x103ba88: addiu v0, s0, -11
+// 0x0103ba98: 0x103ba98: addiu v0, s0, -11
 	ldloc 10
 	ldc.i4.s -11
 	add
 	stloc 5
-// 0x0103ba8c: 0x103ba8c: sltiu v0, v0, 5
+// 0x0103ba9c: 0x103ba9c: sltiu v0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	clt.un
 	stloc 5
-// 0x0103ba90: 0x103ba90: beq   v0, zero, 0x103baf4 addiu v0, zero, 38
+// 0x0103baa0: 0x103baa0: beq   v0, zero, 0x103bb04 addiu v0, zero, 38
 	ldloc 5
 	ldc.i4.s 38
 	stloc 5
-	brfalse L_103baf4
+	brfalse L_103bb04
 // --- basic block ---
-// 0x0103ba98: 0x103ba98: lui   a0, 0x10000
+// 0x0103baa8: 0x103baa8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ba9c: 0x103ba9c: jal   0x101cd60 addiu a0, a0, -8960
+// 0x0103baac: 0x103baac: jal   0x101cd70 addiu a0, a0, -8964
 	ldloc.1
-	ldc.i4 -8960
+	ldc.i4 -8964
 	add
 	stloc.1
 	ldloc.0
@@ -756,25 +756,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103baa4: 0x103baa4: lui   a0, 0x10000
+// 0x0103bab4: 0x103bab4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103baa8: 0x103baa8: addiu a0, a0, -9200
+// 0x0103bab8: 0x103bab8: addiu a0, a0, -9204
 	ldloc.1
-	ldc.i4 -9200
+	ldc.i4 -9204
 	add
 	stloc.1
-// 0x0103baac: 0x103baac: addiu s1, sp, 40
+// 0x0103babc: 0x103babc: addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x0103bab0: 0x103bab0: jal   0x101cd60 sw    v0, 144(sp)
+// 0x0103bac0: 0x103bac0: jal   0x101cd70 sw    v0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -788,12 +788,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bab8: 0x103bab8: lw    a3, 144(sp)
+// 0x0103bac8: 0x103bac8: lw    a3, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -802,21 +802,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103babc: 0x103babc: lui   a2, 0x10000
+// 0x0103bacc: 0x103bacc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103bac0: 0x103bac0: addiu a2, a2, -8920
+// 0x0103bad0: 0x103bad0: addiu a2, a2, -8924
 	ldloc.3
-	ldc.i4 -8920
+	ldc.i4 -8924
 	add
 	stloc.3
-// 0x0103bac4: 0x103bac4: addiu a1, zero, 100
+// 0x0103bad4: 0x103bad4: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0103bac8: 0x103bac8: addu  a0, s1, zero
+// 0x0103bad8: 0x103bad8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103bacc: 0x103bacc: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0103badc: 0x103badc: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -835,12 +835,12 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bad4: 0x103bad4: lui   a0, 0x10000
+// 0x0103bae4: 0x103bae4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103bad8: 0x103bad8: jal   0x101cd60 addiu a0, a0, -9252
+// 0x0103bae8: 0x103bae8: jal   0x101cd70 addiu a0, a0, -9256
 	ldloc.1
-	ldc.i4 -9252
+	ldc.i4 -9256
 	add
 	stloc.1
 	ldloc.0
@@ -848,39 +848,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bae0: 0x103bae0: lui   a2, 0x1040000
+// 0x0103baf0: 0x103baf0: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103bae4: 0x103bae4: addu  a0, v0, zero
+// 0x0103baf4: 0x103baf4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103bae8: 0x103bae8: addu  a1, s1, zero
+// 0x0103baf8: 0x103baf8: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0103baec: 0x103baec: j	 0x103bb78 addiu a2, a2, -17900
+// 0x0103bafc: 0x103bafc: j	 0x103bb88 addiu a2, a2, -17884
 	ldloc.3
-	ldc.i4 -17900
+	ldc.i4 -17884
 	add
 	stloc.3
-	br L_103bb78
+	br L_103bb88
 // --- basic block ---
-L_103baf4:
-// 0x0103baf4: 0x103baf4: bne   s0, v0, 0x103bb24 lui   s1, 0x1040000
+L_103bb04:
+// 0x0103bb04: 0x103bb04: bne   s0, v0, 0x103bb34 lui   s1, 0x1040000
 	ldloc 10
 	ldloc 5
 	ldc.i4 17039360
 	stloc 8
-	bne.un L_103bb24
+	bne.un L_103bb34
 // --- basic block ---
-// 0x0103bafc: 0x103bafc: lui   a0, 0x0
+// 0x0103bb0c: 0x103bb0c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103bb00: 0x103bb00: jal   0x101cd60 addiu a0, a0, 30092
+// 0x0103bb10: 0x103bb10: jal   0x101cd70 addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
@@ -890,20 +890,20 @@ L_103baf4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb08: 0x103bb08: lui   a0, 0x10000
+// 0x0103bb18: 0x103bb18: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103bb0c: 0x103bb0c: addiu a0, a0, -8912
+// 0x0103bb1c: 0x103bb1c: addiu a0, a0, -8916
 	ldloc.1
-	ldc.i4 -8912
+	ldc.i4 -8916
 	add
 	stloc.1
-// 0x0103bb10: 0x103bb10: jal   0x101cd60 addu  s2, v0, zero
+// 0x0103bb20: 0x103bb20: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -911,26 +911,26 @@ L_103baf4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb18: 0x103bb18: addu  a1, v0, zero
+// 0x0103bb28: 0x103bb28: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103bb1c: 0x103bb1c: j	 0x103bb74 addu  a0, s2, zero
+// 0x0103bb2c: 0x103bb2c: j	 0x103bb84 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-	br L_103bb74
+	br L_103bb84
 // --- basic block ---
-L_103bb24:
-// 0x0103bb24: 0x103bb24: lui   a0, 0x10000
+L_103bb34:
+// 0x0103bb34: 0x103bb34: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103bb28: 0x103bb28: jal   0x101cd60 addiu a0, a0, -8864
+// 0x0103bb38: 0x103bb38: jal   0x101cd70 addiu a0, a0, -8868
 	ldloc.1
-	ldc.i4 -8864
+	ldc.i4 -8868
 	add
 	stloc.1
 	ldloc.0
@@ -938,25 +938,25 @@ L_103bb24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb30: 0x103bb30: lui   a0, 0x10000
+// 0x0103bb40: 0x103bb40: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103bb34: 0x103bb34: addiu a0, a0, -2068
+// 0x0103bb44: 0x103bb44: addiu a0, a0, -2072
 	ldloc.1
-	ldc.i4 -2068
+	ldc.i4 -2072
 	add
 	stloc.1
-// 0x0103bb38: 0x103bb38: addiu s2, sp, 40
+// 0x0103bb48: 0x103bb48: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 9
-// 0x0103bb3c: 0x103bb3c: jal   0x101cd60 sw    v0, 144(sp)
+// 0x0103bb4c: 0x103bb4c: jal   0x101cd70 sw    v0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -970,12 +970,12 @@ L_103bb24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb44: 0x103bb44: lw    a3, 144(sp)
+// 0x0103bb54: 0x103bb54: lw    a3, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -984,21 +984,21 @@ L_103bb24:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103bb48: 0x103bb48: lui   a2, 0x10000
+// 0x0103bb58: 0x103bb58: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103bb4c: 0x103bb4c: addiu a1, zero, 100
+// 0x0103bb5c: 0x103bb5c: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0103bb50: 0x103bb50: addiu a2, a2, -8920
+// 0x0103bb60: 0x103bb60: addiu a2, a2, -8924
 	ldloc.3
-	ldc.i4 -8920
+	ldc.i4 -8924
 	add
 	stloc.3
-// 0x0103bb54: 0x103bb54: addu  a0, s2, zero
+// 0x0103bb64: 0x103bb64: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0103bb58: 0x103bb58: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0103bb68: 0x103bb68: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1017,12 +1017,12 @@ L_103bb24:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb60: 0x103bb60: lui   a0, 0x10000
+// 0x0103bb70: 0x103bb70: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103bb64: 0x103bb64: jal   0x101cd60 addiu a0, a0, -9252
+// 0x0103bb74: 0x103bb74: jal   0x101cd70 addiu a0, a0, -9256
 	ldloc.1
-	ldc.i4 -9252
+	ldc.i4 -9256
 	add
 	stloc.1
 	ldloc.0
@@ -1030,36 +1030,36 @@ L_103bb24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb6c: 0x103bb6c: addu  a0, v0, zero
+// 0x0103bb7c: 0x103bb7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103bb70: 0x103bb70: addu  a1, s2, zero
+// 0x0103bb80: 0x103bb80: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-L_103bb74:
-// 0x0103bb74: 0x103bb74: addiu a2, s1, -17900
+L_103bb84:
+// 0x0103bb84: 0x103bb84: addiu a2, s1, -17884
 	ldloc 8
-	ldc.i4 -17900
+	ldc.i4 -17884
 	add
 	stloc.3
-L_103bb78:
-// 0x0103bb78: 0x103bb78: jal   0x104c058 sll   zero, zero, 0
+L_103bb88:
+// 0x0103bb88: 0x103bb88: jal   0x104c068 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb80: 0x103bb80: jal   0x10ac36c addu  a0, s0, zero
+// 0x0103bb90: 0x103bb90: jal   0x10ac9b4 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1067,34 +1067,34 @@ L_103bb78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bb88: 0x103bb88: lui   a1, 0x10000
+// 0x0103bb98: 0x103bb98: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103bb8c: 0x103bb8c: lui   a3, 0x10000
+// 0x0103bb9c: 0x103bb9c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103bb90: 0x103bb90: addiu a1, a1, -9164
+// 0x0103bba0: 0x103bba0: addiu a1, a1, -9168
 	ldloc.2
-	ldc.i4 -9164
+	ldc.i4 -9168
 	add
 	stloc.2
-// 0x0103bb94: 0x103bb94: addiu a3, a3, -8848
+// 0x0103bba4: 0x103bba4: addiu a3, a3, -8852
 	ldloc 4
-	ldc.i4 -8848
+	ldc.i4 -8852
 	add
 	stloc 4
-// 0x0103bb98: 0x103bb98: addiu a0, zero, 4
+// 0x0103bba8: 0x103bba8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103bb9c: 0x103bb9c: addiu a2, zero, 170
+// 0x0103bbac: 0x103bbac: addiu a2, zero, 170
 	ldc.i4 170
 	stloc.3
-// 0x0103bba0: 0x103bba0: sw    v0, 16(sp)
+// 0x0103bbb0: 0x103bbb0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1103,7 +1103,7 @@ L_103bb78:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103bba4: 0x103bba4: jal   0x100449c sw    s0, 20(sp)
+// 0x0103bbb4: 0x103bbb4: jal   0x100449c sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1122,34 +1122,34 @@ L_103bb78:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bbac: 0x103bbac: j	 0x103bcc4 sll   zero, zero, 0
-	br L_103bcc4
+// 0x0103bbbc: 0x103bbbc: j	 0x103bcd4 sll   zero, zero, 0
+	br L_103bcd4
 // --- basic block ---
-L_103bbb4:
-// 0x0103bbb4: 0x103bbb4: bne   s2, zero, 0x103bbe0 sll   zero, zero, 0
+L_103bbc4:
+// 0x0103bbc4: 0x103bbc4: bne   s2, zero, 0x103bbf0 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_103bbe0
+	brtrue L_103bbf0
 // --- basic block ---
-// 0x0103bbbc: 0x103bbbc: lui   a1, 0x10000
+// 0x0103bbcc: 0x103bbcc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103bbc0: 0x103bbc0: lui   a3, 0x10000
+// 0x0103bbd0: 0x103bbd0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103bbc4: 0x103bbc4: addiu a1, a1, -9164
+// 0x0103bbd4: 0x103bbd4: addiu a1, a1, -9168
 	ldloc.2
-	ldc.i4 -9164
+	ldc.i4 -9168
 	add
 	stloc.2
-// 0x0103bbc8: 0x103bbc8: addiu a3, a3, -8760
+// 0x0103bbd8: 0x103bbd8: addiu a3, a3, -8764
 	ldloc 4
-	ldc.i4 -8760
+	ldc.i4 -8764
 	add
 	stloc 4
-// 0x0103bbcc: 0x103bbcc: addiu a0, zero, 1
+// 0x0103bbdc: 0x103bbdc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103bbd0: 0x103bbd0: jal   0x100449c addiu a2, zero, 178
+// 0x0103bbe0: 0x103bbe0: jal   0x100449c addiu a2, zero, 178
 	ldc.i4 178
 	stloc.3
 	ldloc.0
@@ -1162,151 +1162,151 @@ L_103bbb4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bbd8: 0x103bbd8: j	 0x103bcc4 sll   zero, zero, 0
-	br L_103bcc4
+// 0x0103bbe8: 0x103bbe8: j	 0x103bcd4 sll   zero, zero, 0
+	br L_103bcd4
 // --- basic block ---
-L_103bbe0:
-// 0x0103bbe0: 0x103bbe0: jal   0x103aaf4 sll   zero, zero, 0
+L_103bbf0:
+// 0x0103bbf0: 0x103bbf0: jal   0x103ab04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_icon_name_103aaf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_icon_name_103ab04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bbe8: 0x103bbe8: lui   a3, 0x60000
+// 0x0103bbf8: 0x103bbf8: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0103bbec: 0x103bbec: lui   a2, 0x60000
+// 0x0103bbfc: 0x103bbfc: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0103bbf0: 0x103bbf0: lui   a1, 0x60000
+// 0x0103bc00: 0x103bc00: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0103bbf4: 0x103bbf4: addiu a3, a3, -13276
+// 0x0103bc04: 0x103bc04: addiu a3, a3, -12812
 	ldloc 4
-	ldc.i4 -13276
+	ldc.i4 -12812
 	add
 	stloc 4
-// 0x0103bbf8: 0x103bbf8: addiu a2, a2, -13360
+// 0x0103bc08: 0x103bc08: addiu a2, a2, -12896
 	ldloc.3
-	ldc.i4 -13360
+	ldc.i4 -12896
 	add
 	stloc.3
-// 0x0103bbfc: 0x103bbfc: addiu a1, a1, -13444
+// 0x0103bc0c: 0x103bc0c: addiu a1, a1, -12980
 	ldloc.2
-	ldc.i4 -13444
+	ldc.i4 -12980
 	add
 	stloc.2
-// 0x0103bc00: 0x103bc00: addu  v1, zero, zero
+// 0x0103bc10: 0x103bc10: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0103bc04: 0x103bc04: j	 0x103bc24 addu  a0, zero, zero
+// 0x0103bc14: 0x103bc14: j	 0x103bc34 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_103bc24
+	br L_103bc34
 // --- basic block ---
-L_103bc0c:
-// 0x0103bc0c: 0x103bc0c: sw    a0, 0(t2)
+L_103bc1c:
+// 0x0103bc1c: 0x103bc1c: sw    a0, 0(t2)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0103bc10: 0x103bc10: sw    t3, 0(t4)
+// 0x0103bc20: 0x103bc20: sw    t3, 0(t4)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldloc 16
 	stelem.i4
-// 0x0103bc14: 0x103bc14: sw    v0, 0(t1)
+// 0x0103bc24: 0x103bc24: sw    v0, 0(t1)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103bc18: 0x103bc18: addiu a0, a0, 1
+// 0x0103bc28: 0x103bc28: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0103bc1c: 0x103bc1c: addiu s1, s1, 1096
+// 0x0103bc2c: 0x103bc2c: addiu s1, s1, 1096
 	ldloc 8
 	ldc.i4 1096
 	add
 	stloc 8
-// 0x0103bc20: 0x103bc20: addiu v1, v1, 4
+// 0x0103bc30: 0x103bc30: addiu v1, v1, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-L_103bc24:
-// 0x0103bc24: 0x103bc24: slt   t0, a0, s2
+L_103bc34:
+// 0x0103bc34: 0x103bc34: slt   t0, a0, s2
 	ldloc.1
 	ldloc 9
 	clt
 	stloc 13
-// 0x0103bc28: 0x103bc28: addu  t4, a3, v1
+// 0x0103bc38: 0x103bc38: addu  t4, a3, v1
 	ldloc 4
 	ldloc 6
 	add
 	stloc 17
-// 0x0103bc2c: 0x103bc2c: addiu t3, s1, 823
+// 0x0103bc3c: 0x103bc3c: addiu t3, s1, 823
 	ldloc 8
 	ldc.i4 823
 	add
 	stloc 16
-// 0x0103bc30: 0x103bc30: addu  t2, a2, v1
+// 0x0103bc40: 0x103bc40: addu  t2, a2, v1
 	ldloc.3
 	ldloc 6
 	add
 	stloc 15
-// 0x0103bc34: 0x103bc34: bne   t0, zero, 0x103bc0c addu  t1, a1, v1
+// 0x0103bc44: 0x103bc44: bne   t0, zero, 0x103bc1c addu  t1, a1, v1
 	ldloc 13
 	ldloc.2
 	ldloc 6
 	add
 	stloc 14
-	brtrue L_103bc0c
+	brtrue L_103bc1c
 // --- basic block ---
-// 0x0103bc3c: 0x103bc3c: jal   0x1052d34 sll   zero, zero, 0
-	call int32 Cibyl61::roadmap_native_keyboard_enabled_1052d34()
+// 0x0103bc4c: 0x103bc4c: jal   0x1052d44 sll   zero, zero, 0
+	call int32 Cibyl61::roadmap_native_keyboard_enabled_1052d44()
 	stloc 5
 // --- basic block ---
-// 0x0103bc44: 0x103bc44: beq   v0, zero, 0x103bc58 lui   v0, 0x60000
+// 0x0103bc54: 0x103bc54: beq   v0, zero, 0x103bc68 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_103bc58
+	brfalse L_103bc68
 // --- basic block ---
-// 0x0103bc4c: 0x103bc4c: jal   0x1052d44 sll   zero, zero, 0
-	call void Cibyl61::roadmap_native_keyboard_hide_1052d44()
+// 0x0103bc5c: 0x103bc5c: jal   0x1052d54 sll   zero, zero, 0
+	call void Cibyl61::roadmap_native_keyboard_hide_1052d54()
 // --- basic block ---
-// 0x0103bc54: 0x103bc54: lui   v0, 0x60000
+// 0x0103bc64: 0x103bc64: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_103bc58:
-// 0x0103bc58: 0x103bc58: lw    a0, -13452(v0)
+L_103bc68:
+// 0x0103bc68: 0x103bc68: lw    a0, -12988(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3363
+	ldc.i4 -3247
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103bc5c: 0x103bc5c: lui   a1, 0x10000
+// 0x0103bc6c: 0x103bc6c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103bc60: 0x103bc60: jal   0x109b304 addiu a1, a1, -9380
+// 0x0103bc70: 0x103bc70: jal   0x109b94c addiu a1, a1, -9384
 	ldloc.2
-	ldc.i4 -9380
+	ldc.i4 -9384
 	add
 	stloc.2
 	ldloc.0
@@ -1314,12 +1314,12 @@ L_103bc58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bc68: 0x103bc68: jal   0x103aa58 sw    v0, 144(sp)
+// 0x0103bc78: 0x103bc78: jal   0x103aa68 sw    v0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1333,12 +1333,12 @@ L_103bc58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_logo_name_103aa58(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_logo_name_103aa68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bc70: 0x103bc70: lw    a0, 144(sp)
+// 0x0103bc80: 0x103bc80: lw    a0, 144(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1347,7 +1347,7 @@ L_103bc58:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103bc74: 0x103bc74: jal   0x109df10 addu  a1, v0, zero
+// 0x0103bc84: 0x103bc84: jal   0x109e558 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1355,26 +1355,26 @@ L_103bc58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bc7c: 0x103bc7c: lui   v0, 0x60000
+// 0x0103bc8c: 0x103bc8c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103bc80: 0x103bc80: addiu v0, v0, -13444
+// 0x0103bc90: 0x103bc90: addiu v0, v0, -12980
 	ldloc 5
-	ldc.i4 -13444
+	ldc.i4 -12980
 	add
 	stloc 5
-// 0x0103bc84: 0x103bc84: lui   a2, 0x60000
+// 0x0103bc94: 0x103bc94: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0103bc88: 0x103bc88: lui   a3, 0x60000
+// 0x0103bc98: 0x103bc98: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0103bc8c: 0x103bc8c: sw    v0, 16(sp)
+// 0x0103bc9c: 0x103bc9c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1383,31 +1383,31 @@ L_103bc58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103bc90: 0x103bc90: lui   v0, 0x1040000
+// 0x0103bca0: 0x103bca0: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103bc94: 0x103bc94: addiu v0, v0, -17060
+// 0x0103bca4: 0x103bca4: addiu v0, v0, -17044
 	ldloc 5
-	ldc.i4 -17060
+	ldc.i4 -17044
 	add
 	stloc 5
-// 0x0103bc98: 0x103bc98: addu  a0, s3, zero
+// 0x0103bca8: 0x103bca8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0103bc9c: 0x103bc9c: addu  a1, s2, zero
+// 0x0103bcac: 0x103bcac: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x0103bca0: 0x103bca0: addiu a2, a2, -13276
+// 0x0103bcb0: 0x103bcb0: addiu a2, a2, -12812
 	ldloc.3
-	ldc.i4 -13276
+	ldc.i4 -12812
 	add
 	stloc.3
-// 0x0103bca4: 0x103bca4: addiu a3, a3, -13360
+// 0x0103bcb4: 0x103bcb4: addiu a3, a3, -12896
 	ldloc 4
-	ldc.i4 -13360
+	ldc.i4 -12896
 	add
 	stloc 4
-// 0x0103bca8: 0x103bca8: sw    v0, 24(sp)
+// 0x0103bcb8: 0x103bcb8: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1416,7 +1416,7 @@ L_103bc58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103bcac: 0x103bcac: sw    zero, 20(sp)
+// 0x0103bcbc: 0x103bcbc: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1425,7 +1425,7 @@ L_103bc58:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103bcb0: 0x103bcb0: sw    zero, 28(sp)
+// 0x0103bcc0: 0x103bcc0: sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1434,7 +1434,7 @@ L_103bc58:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103bcb4: 0x103bcb4: jal   0x10924c8 sw    zero, 32(sp)
+// 0x0103bcc4: 0x103bcc4: jal   0x1092aec sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1448,25 +1448,25 @@ L_103bc58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_10924c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_1092aec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bcbc: 0x103bcbc: jal   0x103dd5c sll   zero, zero, 0
+// 0x0103bccc: 0x103bccc: jal   0x103dd6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103bcc4:
-// 0x0103bcc4: 0x103bcc4: lw    ra, 172(sp)
-// 0x0103bcc8: 0x103bcc8: lw    s3, 168(sp)
+L_103bcd4:
+// 0x0103bcd4: 0x103bcd4: lw    ra, 172(sp)
+// 0x0103bcd8: 0x103bcd8: lw    s3, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1475,7 +1475,7 @@ L_103bcc4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103bccc: 0x103bccc: lw    s2, 164(sp)
+// 0x0103bcdc: 0x103bcdc: lw    s2, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1484,7 +1484,7 @@ L_103bcc4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103bcd0: 0x103bcd0: lw    s1, 160(sp)
+// 0x0103bce0: 0x103bce0: lw    s1, 160(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1493,7 +1493,7 @@ L_103bcc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103bcd4: 0x103bcd4: lw    s0, 156(sp)
+// 0x0103bce4: 0x103bce4: lw    s0, 156(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1502,7 +1502,7 @@ L_103bcc4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103bcd8: 0x103bcd8: jr    ra addiu sp, sp, 176
+// 0x0103bce8: 0x103bce8: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -1514,7 +1514,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_selected_list_item_103bce0(int32,int32,int32,int32,int32)
+.method public static int32 get_selected_list_item_103bcf0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1549,26 +1549,26 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103bce0: 0x103bce0: addiu sp, sp, -24
+// 0x0103bcf0: 0x103bcf0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103bce4: 0x103bce4: sw    ra, 20(sp)
-// 0x0103bce8: 0x103bce8: jal   0x103d560 addiu a0, zero, 1
+// 0x0103bcf4: 0x103bcf4: sw    ra, 20(sp)
+// 0x0103bcf8: 0x103bcf8: jal   0x103d570 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103bcf0: 0x103bcf0: bne   v0, zero, 0x103bd1c addiu v1, zero, -1
+// 0x0103bd00: 0x103bd00: bne   v0, zero, 0x103bd2c addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
-	brtrue L_103bd1c
+	brtrue L_103bd2c
 // --- basic block ---
-// 0x0103bcf8: 0x103bcf8: jal   0x103da30 addiu a0, zero, 1
+// 0x0103bd08: 0x103bd08: jal   0x103da40 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -1576,20 +1576,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da30(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bd00: 0x103bd00: lui   a1, 0x10000
+// 0x0103bd10: 0x103bd10: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103bd04: 0x103bd04: addu  a0, v0, zero
+// 0x0103bd14: 0x103bd14: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103bd08: 0x103bd08: jal   0x109b304 addiu a1, a1, -9316
+// 0x0103bd18: 0x103bd18: jal   0x109b94c addiu a1, a1, -9320
 	ldloc.2
-	ldc.i4 -9316
+	ldc.i4 -9320
 	add
 	stloc.2
 	ldloc.0
@@ -1597,31 +1597,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bd10: 0x103bd10: jal   0x109162c addu  a0, v0, zero
+// 0x0103bd20: 0x103bd20: jal   0x1091c50 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bd18: 0x103bd18: addu  v1, v0, zero
+// 0x0103bd28: 0x103bd28: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_103bd1c:
-// 0x0103bd1c: 0x103bd1c: lw    ra, 20(sp)
-// 0x0103bd20: 0x103bd20: addu  v0, v1, zero
+L_103bd2c:
+// 0x0103bd2c: 0x103bd2c: lw    ra, 20(sp)
+// 0x0103bd30: 0x103bd30: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0103bd24: 0x103bd24: jr    ra addiu sp, sp, 24
+// 0x0103bd34: 0x103bd34: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1633,7 +1633,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_103bd2c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_103bd3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -1668,13 +1668,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103bd2c: 0x103bd2c: addiu sp, sp, -32
+// 0x0103bd3c: 0x103bd3c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103bd30: 0x103bd30: sw    ra, 28(sp)
-// 0x0103bd34: 0x103bd34: jal   0x103bce0 sw    a0, 16(sp)
+// 0x0103bd40: 0x103bd40: sw    ra, 28(sp)
+// 0x0103bd44: 0x103bd44: jal   0x103bcf0 sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1688,12 +1688,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::get_selected_list_item_103bce0(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::get_selected_list_item_103bcf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103bd3c: 0x103bd3c: lw    a0, 16(sp)
+// 0x0103bd4c: 0x103bd4c: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1702,10 +1702,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103bd40: 0x103bd40: addu  a2, v0, zero
+// 0x0103bd50: 0x103bd50: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0103bd44: 0x103bd44: jal   0x103e598 addiu a1, zero, 1
+// 0x0103bd54: 0x103bd54: jal   0x103e5a8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1713,14 +1713,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::navigate_with_coordinates_103e598(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::navigate_with_coordinates_103e5a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103bd4c: 0x103bd4c: lw    ra, 28(sp)
-// 0x0103bd50: 0x103bd50: sll   zero, zero, 0
-// 0x0103bd54: 0x103bd54: jr    ra addiu sp, sp, 32
+// 0x0103bd5c: 0x103bd5c: lw    ra, 28(sp)
+// 0x0103bd60: 0x103bd60: sll   zero, zero, 0
+// 0x0103bd64: 0x103bd64: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1732,7 +1732,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_list_item_selected_103bd5c(int32,int32,int32,int32,int32)
+.method public static int32 on_list_item_selected_103bd6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1767,13 +1767,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103bd5c: 0x103bd5c: addiu sp, sp, -24
+// 0x0103bd6c: 0x103bd6c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103bd60: 0x103bd60: sw    ra, 20(sp)
-// 0x0103bd64: 0x103bd64: jal   0x103bd2c addiu a0, zero, 1
+// 0x0103bd70: 0x103bd70: sw    ra, 20(sp)
+// 0x0103bd74: 0x103bd74: jal   0x103bd3c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -1781,16 +1781,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::navigate_103bd2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::navigate_103bd3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bd6c: 0x103bd6c: beq   v0, zero, 0x103bd94 sll   zero, zero, 0
+// 0x0103bd7c: 0x103bd7c: beq   v0, zero, 0x103bda4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103bd94
+	brfalse L_103bda4
 // --- basic block ---
-// 0x0103bd74: 0x103bd74: jal   0x1094a94 addu  a0, zero, zero
+// 0x0103bd84: 0x103bd84: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1798,43 +1798,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bd7c: 0x103bd7c: jal   0x102146c sll   zero, zero, 0
+// 0x0103bd8c: 0x103bd8c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bd84: 0x103bd84: bne   v0, zero, 0x103bd94 sll   zero, zero, 0
+// 0x0103bd94: 0x103bd94: bne   v0, zero, 0x103bda4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103bd94
+	brtrue L_103bda4
 // --- basic block ---
-// 0x0103bd8c: 0x103bd8c: jal   0x1021900 sll   zero, zero, 0
+// 0x0103bd9c: 0x103bd9c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103bd94:
-// 0x0103bd94: 0x103bd94: lw    ra, 20(sp)
-// 0x0103bd98: 0x103bd98: addu  v0, zero, zero
+L_103bda4:
+// 0x0103bda4: 0x103bda4: lw    ra, 20(sp)
+// 0x0103bda8: 0x103bda8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103bd9c: 0x103bd9c: jr    ra addiu sp, sp, 24
+// 0x0103bdac: 0x103bdac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1846,7 +1846,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_back_103bda4(int32,int32,int32,int32,int32)
+.method public static int32 on_back_103bdb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1881,24 +1881,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103bda4: 0x103bda4: addiu sp, sp, -24
+// 0x0103bdb4: 0x103bdb4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103bda8: 0x103bda8: sw    ra, 20(sp)
-// 0x0103bdac: 0x103bdac: jal   0x103d560 addiu a0, zero, 1
+// 0x0103bdb8: 0x103bdb8: sw    ra, 20(sp)
+// 0x0103bdbc: 0x103bdbc: jal   0x103d570 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103bdb4: 0x103bdb4: beq   v0, zero, 0x103bdcc sll   zero, zero, 0
+// 0x0103bdc4: 0x103bdc4: beq   v0, zero, 0x103bddc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103bdcc
+	brfalse L_103bddc
 // --- basic block ---
-// 0x0103bdbc: 0x103bdbc: jal   0x1094b64 addiu a0, zero, 2
+// 0x0103bdcc: 0x103bdcc: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1906,32 +1906,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bdc4: 0x103bdc4: j	 0x103bdd4 sll   zero, zero, 0
-	br L_103bdd4
+// 0x0103bdd4: 0x103bdd4: j	 0x103bde4 sll   zero, zero, 0
+	br L_103bde4
 // --- basic block ---
-L_103bdcc:
-// 0x0103bdcc: 0x103bdcc: jal   0x103dd5c sll   zero, zero, 0
+L_103bddc:
+// 0x0103bddc: 0x103bddc: jal   0x103dd6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103bdd4:
-// 0x0103bdd4: 0x103bdd4: lw    ra, 20(sp)
-// 0x0103bdd8: 0x103bdd8: addu  v0, zero, zero
+L_103bde4:
+// 0x0103bde4: 0x103bde4: lw    ra, 20(sp)
+// 0x0103bde8: 0x103bde8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103bddc: 0x103bddc: jr    ra addiu sp, sp, 24
+// 0x0103bdec: 0x103bdec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1943,7 +1943,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_options_103bde4(int32,int32,int32,int32,int32)
+.method public static int32 on_options_103bdf4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -1984,16 +1984,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103bde4: 0x103bde4: addiu sp, sp, -48
+// 0x0103bdf4: 0x103bdf4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103bde8: 0x103bde8: addu  a0, zero, zero
+// 0x0103bdf8: 0x103bdf8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103bdec: 0x103bdec: sw    ra, 44(sp)
-// 0x0103bdf0: 0x103bdf0: sw    s1, 40(sp)
+// 0x0103bdfc: 0x103bdfc: sw    ra, 44(sp)
+// 0x0103be00: 0x103be00: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2002,7 +2002,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103bdf4: 0x103bdf4: jal   0x109a424 sw    s0, 36(sp)
+// 0x0103be04: 0x103be04: jal   0x109aa6c sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2016,38 +2016,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bdfc: 0x103bdfc: addiu a0, zero, 1
+// 0x0103be0c: 0x103be0c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103be00: 0x103be00: lui   s0, 0x0
+// 0x0103be10: 0x103be10: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0103be04: 0x103be04: jal   0x103d560 sltu  s1, zero, v0
+// 0x0103be14: 0x103be14: jal   0x103d570 sltu  s1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 9
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103be0c: 0x103be0c: sltiu a2, v0, 1
+// 0x0103be1c: 0x103be1c: sltiu a2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x0103be10: 0x103be10: addu  a1, zero, zero
+// 0x0103be20: 0x103be20: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103be14: 0x103be14: addu  a3, zero, zero
+// 0x0103be24: 0x103be24: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103be18: 0x103be18: jal   0x109c504 addiu a0, s0, 12768
+// 0x0103be28: 0x103be28: jal   0x109cb4c addiu a0, s0, 12768
 	ldloc 8
 	ldc.i4 12768
 	add
@@ -2057,30 +2057,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103be20: 0x103be20: jal   0x103d560 addiu a0, zero, 1
+// 0x0103be30: 0x103be30: jal   0x103d570 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103be28: 0x103be28: sltiu a2, v0, 1
+// 0x0103be38: 0x103be38: sltiu a2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x0103be2c: 0x103be2c: addiu a1, zero, 1
+// 0x0103be3c: 0x103be3c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0103be30: 0x103be30: addu  a3, zero, zero
+// 0x0103be40: 0x103be40: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103be34: 0x103be34: jal   0x109c504 addiu a0, s0, 12768
+// 0x0103be44: 0x103be44: jal   0x109cb4c addiu a0, s0, 12768
 	ldloc 8
 	ldc.i4 12768
 	add
@@ -2090,32 +2090,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103be3c: 0x103be3c: jal   0x103d560 addiu a0, zero, 1
+// 0x0103be4c: 0x103be4c: jal   0x103d570 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103be44: 0x103be44: sltiu a2, v0, 1
+// 0x0103be54: 0x103be54: sltiu a2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x0103be48: 0x103be48: addiu a0, s0, 12768
+// 0x0103be58: 0x103be58: addiu a0, s0, 12768
 	ldloc 8
 	ldc.i4 12768
 	add
 	stloc.1
-// 0x0103be4c: 0x103be4c: addiu a1, zero, 2
+// 0x0103be5c: 0x103be5c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0103be50: 0x103be50: jal   0x109c504 addu  a3, zero, zero
+// 0x0103be60: 0x103be60: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2123,23 +2123,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103be58: 0x103be58: addiu a0, s0, 12768
+// 0x0103be68: 0x103be68: addiu a0, s0, 12768
 	ldloc 8
 	ldc.i4 12768
 	add
 	stloc.1
-// 0x0103be5c: 0x103be5c: addiu a1, zero, 3
+// 0x0103be6c: 0x103be6c: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0103be60: 0x103be60: addiu a2, zero, 1
+// 0x0103be70: 0x103be70: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0103be64: 0x103be64: jal   0x109c504 addu  a3, zero, zero
+// 0x0103be74: 0x103be74: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2147,23 +2147,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103be6c: 0x103be6c: nor   s1, zero, s1
+// 0x0103be7c: 0x103be7c: nor   s1, zero, s1
 	ldloc 9
 	ldc.i4.m1
 	xor
 	stloc 9
-// 0x0103be70: 0x103be70: addiu v0, zero, 2
+// 0x0103be80: 0x103be80: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0103be74: 0x103be74: lui   a3, 0x1040000
+// 0x0103be84: 0x103be84: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x0103be78: 0x103be78: sw    v0, 20(sp)
+// 0x0103be88: 0x103be88: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2172,26 +2172,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103be7c: 0x103be7c: addu  a0, s1, zero
+// 0x0103be8c: 0x103be8c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103be80: 0x103be80: addiu a2, s0, 12768
+// 0x0103be90: 0x103be90: addiu a2, s0, 12768
 	ldloc 8
 	ldc.i4 12768
 	add
 	stloc.3
-// 0x0103be84: 0x103be84: addiu v0, zero, 1
+// 0x0103be94: 0x103be94: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103be88: 0x103be88: addiu a3, a3, -16704
+// 0x0103be98: 0x103be98: addiu a3, a3, -16688
 	ldloc 4
-	ldc.i4 -16704
+	ldc.i4 -16688
 	add
 	stloc 4
-// 0x0103be8c: 0x103be8c: addiu a1, zero, -2
+// 0x0103be9c: 0x103be9c: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x0103be90: 0x103be90: sw    v0, 28(sp)
+// 0x0103bea0: 0x103bea0: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2200,7 +2200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103be94: 0x103be94: sw    zero, 16(sp)
+// 0x0103bea4: 0x103bea4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2209,7 +2209,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103be98: 0x103be98: jal   0x109c7f0 sw    zero, 24(sp)
+// 0x0103bea8: 0x103bea8: jal   0x109ce38 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2223,25 +2223,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103bea0: 0x103bea0: lw    ra, 44(sp)
-// 0x0103bea4: 0x103bea4: lui   v1, 0x60000
+// 0x0103beb0: 0x103beb0: lw    ra, 44(sp)
+// 0x0103beb4: 0x103beb4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103bea8: 0x103bea8: sw    v0, -13192(v1)
+// 0x0103beb8: 0x103beb8: sw    v0, -12728(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3298
+	ldc.i4 -3182
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103beac: 0x103beac: lw    s1, 40(sp)
+// 0x0103bebc: 0x103bebc: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2250,10 +2250,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103beb0: 0x103beb0: addu  v0, zero, zero
+// 0x0103bec0: 0x103bec0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103beb4: 0x103beb4: lw    s0, 36(sp)
+// 0x0103bec4: 0x103bec4: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2262,7 +2262,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103beb8: 0x103beb8: jr    ra addiu sp, sp, 48
+// 0x0103bec8: 0x103bec8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2274,7 +2274,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_option_selected_103bec0(int32,int32,int32,int32,int32)
+.method public static int32 on_option_selected_103bed0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2315,16 +2315,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103bec0: 0x103bec0: addiu sp, sp, -56
+// 0x0103bed0: 0x103bed0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0103bec4: 0x103bec4: lui   v0, 0x60000
+// 0x0103bed4: 0x103bed4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103bec8: 0x103bec8: sw    ra, 52(sp)
-// 0x0103becc: 0x103becc: sw    s1, 48(sp)
+// 0x0103bed8: 0x103bed8: sw    ra, 52(sp)
+// 0x0103bedc: 0x103bedc: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2333,7 +2333,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103bed0: 0x103bed0: sw    s0, 44(sp)
+// 0x0103bee0: 0x103bee0: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2342,19 +2342,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103bed4: 0x103bed4: beq   a0, zero, 0x103bfdc sw    zero, -13192(v0)
+// 0x0103bee4: 0x103bee4: beq   a0, zero, 0x103bfec sw    zero, -12728(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3298
+	ldc.i4 -3182
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_103bfdc
+	brfalse L_103bfec
 // --- basic block ---
-// 0x0103bedc: 0x103bedc: lw    v0, 20(a1)
+// 0x0103beec: 0x103beec: lw    v0, 20(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2363,53 +2363,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103bee0: 0x103bee0: sll   zero, zero, 0
-// 0x0103bee4: 0x103bee4: beq   v0, zero, 0x103bf08 addiu a0, zero, 1
+// 0x0103bef0: 0x103bef0: sll   zero, zero, 0
+// 0x0103bef4: 0x103bef4: beq   v0, zero, 0x103bf18 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brfalse L_103bf08
+	brfalse L_103bf18
 // --- basic block ---
-// 0x0103beec: 0x103beec: beq   v0, a0, 0x103bf04 addiu v1, zero, 2
+// 0x0103befc: 0x103befc: beq   v0, a0, 0x103bf14 addiu v1, zero, 2
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	stloc 7
-	beq  L_103bf04
+	beq  L_103bf14
 // --- basic block ---
-// 0x0103bef4: 0x103bef4: bne   v0, v1, 0x103bfdc sll   zero, zero, 0
+// 0x0103bf04: 0x103bf04: bne   v0, v1, 0x103bfec sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_103bfdc
+	bne.un L_103bfec
 // --- basic block ---
-// 0x0103befc: 0x103befc: j	 0x103bf20 sll   zero, zero, 0
-	br L_103bf20
+// 0x0103bf0c: 0x103bf0c: j	 0x103bf30 sll   zero, zero, 0
+	br L_103bf30
 // --- basic block ---
-L_103bf04:
-// 0x0103bf04: 0x103bf04: addu  a0, zero, zero
+L_103bf14:
+// 0x0103bf14: 0x103bf14: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_103bf08:
-// 0x0103bf08: 0x103bf08: jal   0x103bd2c sll   zero, zero, 0
+L_103bf18:
+// 0x0103bf18: 0x103bf18: jal   0x103bd3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::navigate_103bd2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::navigate_103bd3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bf10: 0x103bf10: bne   v0, zero, 0x103bfbc sll   zero, zero, 0
+// 0x0103bf20: 0x103bf20: bne   v0, zero, 0x103bfcc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103bfbc
+	brtrue L_103bfcc
 // --- basic block ---
-// 0x0103bf18: 0x103bf18: j	 0x103bfdc sll   zero, zero, 0
-	br L_103bfdc
+// 0x0103bf28: 0x103bf28: j	 0x103bfec sll   zero, zero, 0
+	br L_103bfec
 // --- basic block ---
-L_103bf20:
-// 0x0103bf20: 0x103bf20: jal   0x103bce0 lui   s1, 0x20000
+L_103bf30:
+// 0x0103bf30: 0x103bf30: jal   0x103bcf0 lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.0
@@ -2417,37 +2417,37 @@ L_103bf20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::get_selected_list_item_103bce0(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::get_selected_list_item_103bcf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bf28: 0x103bf28: jal   0x103e180 addu  a0, v0, zero
+// 0x0103bf38: 0x103bf38: jal   0x103e190 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl46::generic_search_result_103e180(int32)
+	call int32 Cibyl46::generic_search_result_103e190(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103bf30: 0x103bf30: lw    a3, 23796(s1)
+// 0x0103bf40: 0x103bf40: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103bf34: 0x103bf34: lw    a2, 23792(s1)
+// 0x0103bf44: 0x103bf44: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103bf38: 0x103bf38: lw    a1, 20(v0)
+// 0x0103bf48: 0x103bf48: lw    a1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2456,7 +2456,7 @@ L_103bf20:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103bf3c: 0x103bf3c: lw    a0, 16(v0)
+// 0x0103bf4c: 0x103bf4c: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2465,7 +2465,7 @@ L_103bf20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103bf40: 0x103bf40: jal   0x10c0798 addu  s0, v0, zero
+// 0x0103bf50: 0x103bf50: jal   0x10c0dd8 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2473,44 +2473,44 @@ L_103bf20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bf48: 0x103bf48: addu  a1, v1, zero
+// 0x0103bf58: 0x103bf58: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103bf4c: 0x103bf4c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103bf5c: 0x103bf5c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bf54: 0x103bf54: lw    a3, 23796(s1)
+// 0x0103bf64: 0x103bf64: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103bf58: 0x103bf58: lw    a2, 23792(s1)
+// 0x0103bf68: 0x103bf68: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103bf5c: 0x103bf5c: lw    a1, 12(s0)
+// 0x0103bf6c: 0x103bf6c: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2519,7 +2519,7 @@ L_103bf20:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103bf60: 0x103bf60: lw    a0, 8(s0)
+// 0x0103bf70: 0x103bf70: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2528,7 +2528,7 @@ L_103bf20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103bf64: 0x103bf64: jal   0x10c0798 sw    v0, 36(sp)
+// 0x0103bf74: 0x103bf74: jal   0x10c0dd8 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2542,26 +2542,26 @@ L_103bf20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bf6c: 0x103bf6c: addu  a1, v1, zero
+// 0x0103bf7c: 0x103bf7c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103bf70: 0x103bf70: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103bf80: 0x103bf80: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bf78: 0x103bf78: sw    v0, 32(sp)
+// 0x0103bf88: 0x103bf88: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2570,7 +2570,7 @@ L_103bf20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103bf7c: 0x103bf7c: lw    a0, 284(s0)
+// 0x0103bf8c: 0x103bf8c: lw    a0, 284(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2579,31 +2579,31 @@ L_103bf20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103bf80: 0x103bf80: jal   0x103e28c sll   zero, zero, 0
+// 0x0103bf90: 0x103bf90: jal   0x103e29c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::get_house_number__str_103e28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::get_house_number__str_103e29c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bf88: 0x103bf88: addu  a3, v0, zero
+// 0x0103bf98: 0x103bf98: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0103bf8c: 0x103bf8c: addiu v0, s0, 288
+// 0x0103bf9c: 0x103bf9c: addiu v0, s0, 288
 	ldloc 8
 	ldc.i4 288
 	add
 	stloc 5
-// 0x0103bf90: 0x103bf90: addiu v1, s0, 24
+// 0x0103bfa0: 0x103bfa0: addiu v1, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x0103bf94: 0x103bf94: sw    v0, 20(sp)
+// 0x0103bfa4: 0x103bfa4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2612,25 +2612,25 @@ L_103bf20:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103bf98: 0x103bf98: addiu a2, s0, 154
+// 0x0103bfa8: 0x103bfa8: addiu a2, s0, 154
 	ldloc 8
 	ldc.i4 154
 	add
 	stloc.3
-// 0x0103bf9c: 0x103bf9c: addiu v0, sp, 32
+// 0x0103bfac: 0x103bfac: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0103bfa0: 0x103bfa0: addiu a0, zero, 70
+// 0x0103bfb0: 0x103bfb0: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x0103bfa4: 0x103bfa4: addiu a1, s0, 90
+// 0x0103bfb4: 0x103bfb4: addiu a1, s0, 90
 	ldloc 8
 	ldc.i4.s 90
 	add
 	stloc.2
-// 0x0103bfa8: 0x103bfa8: sw    v1, 16(sp)
+// 0x0103bfb8: 0x103bfb8: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2639,7 +2639,7 @@ L_103bf20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103bfac: 0x103bfac: jal   0x103e464 sw    v0, 24(sp)
+// 0x0103bfbc: 0x103bfbc: jal   0x103e474 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2653,16 +2653,16 @@ L_103bf20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_add_address_to_history_103e464(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_add_address_to_history_103e474(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bfb4: 0x103bfb4: j	 0x103bfdc sll   zero, zero, 0
-	br L_103bfdc
+// 0x0103bfc4: 0x103bfc4: j	 0x103bfec sll   zero, zero, 0
+	br L_103bfec
 // --- basic block ---
-L_103bfbc:
-// 0x0103bfbc: 0x103bfbc: jal   0x1094a94 addu  a0, zero, zero
+L_103bfcc:
+// 0x0103bfcc: 0x103bfcc: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2670,40 +2670,40 @@ L_103bfbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bfc4: 0x103bfc4: jal   0x102146c sll   zero, zero, 0
+// 0x0103bfd4: 0x103bfd4: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103bfcc: 0x103bfcc: bne   v0, zero, 0x103bfdc sll   zero, zero, 0
+// 0x0103bfdc: 0x103bfdc: bne   v0, zero, 0x103bfec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103bfdc
+	brtrue L_103bfec
 // --- basic block ---
-// 0x0103bfd4: 0x103bfd4: jal   0x1021900 sll   zero, zero, 0
+// 0x0103bfe4: 0x103bfe4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103bfdc:
-// 0x0103bfdc: 0x103bfdc: lw    ra, 52(sp)
-// 0x0103bfe0: 0x103bfe0: lw    s1, 48(sp)
+L_103bfec:
+// 0x0103bfec: 0x103bfec: lw    ra, 52(sp)
+// 0x0103bff0: 0x103bff0: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2712,7 +2712,7 @@ L_103bfdc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103bfe4: 0x103bfe4: lw    s0, 44(sp)
+// 0x0103bff4: 0x103bff4: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2721,7 +2721,7 @@ L_103bfdc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103bfe8: 0x103bfe8: jr    ra addiu sp, sp, 56
+// 0x0103bff8: 0x103bff8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2733,7 +2733,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 address_search_report_wrong_address_103bff0(int32,int32,int32,int32,int32)
+.method public static int32 address_search_report_wrong_address_103c000(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2777,12 +2777,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103bff0: 0x103bff0: addiu sp, sp, -48
+// 0x0103c000: 0x103c000: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103bff4: 0x103bff4: sw    s0, 32(sp)
+// 0x0103c004: 0x103c004: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2791,19 +2791,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103bff8: 0x103bff8: lui   s0, 0x60000
+// 0x0103c008: 0x103c008: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103bffc: 0x103bffc: lw    v0, -13188(s0)
+// 0x0103c00c: 0x103c00c: lw    v0, -12724(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103c000: 0x103c000: sw    s2, 40(sp)
+// 0x0103c010: 0x103c010: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2812,8 +2812,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103c004: 0x103c004: sw    ra, 44(sp)
-// 0x0103c008: 0x103c008: sw    s1, 36(sp)
+// 0x0103c014: 0x103c014: sw    ra, 44(sp)
+// 0x0103c018: 0x103c018: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2822,32 +2822,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c00c: 0x103c00c: bne   v0, zero, 0x103c038 addu  s2, a0, zero
+// 0x0103c01c: 0x103c01c: bne   v0, zero, 0x103c048 addu  s2, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 10
-	brtrue L_103c038
+	brtrue L_103c048
 // --- basic block ---
-// 0x0103c014: 0x103c014: lui   a1, 0x10000
+// 0x0103c024: 0x103c024: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c018: 0x103c018: lui   a3, 0x10000
+// 0x0103c028: 0x103c028: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c01c: 0x103c01c: addiu a1, a1, -8672
+// 0x0103c02c: 0x103c02c: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c020: 0x103c020: addiu a3, a3, -8628
+// 0x0103c030: 0x103c030: addiu a3, a3, -8632
 	ldloc 4
-	ldc.i4 -8628
+	ldc.i4 -8632
 	add
 	stloc 4
-// 0x0103c024: 0x103c024: addiu a0, zero, 4
+// 0x0103c034: 0x103c034: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c028: 0x103c028: jal   0x100449c addiu a2, zero, 414
+// 0x0103c038: 0x103c038: jal   0x100449c addiu a2, zero, 414
 	ldc.i4 414
 	stloc.3
 	ldloc.0
@@ -2860,42 +2860,42 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c030: 0x103c030: j	 0x103c0f4 addiu v1, zero, 8
+// 0x0103c040: 0x103c040: j	 0x103c104 addiu v1, zero, 8
 	ldc.i4.8
 	stloc 7
-	br L_103c0f4
+	br L_103c104
 // --- basic block ---
-L_103c038:
-// 0x0103c038: 0x103c038: jal   0x1068f8c addu  a0, v0, zero
+L_103c048:
+// 0x0103c048: 0x103c048: jal   0x1068f9c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl78::wst_get_trans_state_1068f8c(int32)
+	call int32 Cibyl78::wst_get_trans_state_1068f9c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103c040: 0x103c040: beq   v0, zero, 0x103c074 lui   a1, 0x10000
+// 0x0103c050: 0x103c050: beq   v0, zero, 0x103c084 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103c074
+	brfalse L_103c084
 // --- basic block ---
-// 0x0103c048: 0x103c048: lui   a3, 0x10000
+// 0x0103c058: 0x103c058: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c04c: 0x103c04c: addiu a1, a1, -8672
+// 0x0103c05c: 0x103c05c: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c050: 0x103c050: addiu a3, a3, -8564
+// 0x0103c060: 0x103c060: addiu a3, a3, -8568
 	ldloc 4
-	ldc.i4 -8564
+	ldc.i4 -8568
 	add
 	stloc 4
-// 0x0103c054: 0x103c054: addiu a0, zero, 1
+// 0x0103c064: 0x103c064: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103c058: 0x103c058: jal   0x100449c addiu a2, zero, 422
+// 0x0103c068: 0x103c068: jal   0x100449c addiu a2, zero, 422
 	ldc.i4 422
 	stloc.3
 	ldloc.0
@@ -2908,55 +2908,55 @@ L_103c038:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c060: 0x103c060: lw    a0, -13188(s0)
+// 0x0103c070: 0x103c070: lw    a0, -12724(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103c064: 0x103c064: jal   0x106a420 sll   zero, zero, 0
+// 0x0103c074: 0x103c074: jal   0x106aa28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_watchdog_106a420(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_watchdog_106aa28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c06c: 0x103c06c: j	 0x103c0f4 addiu v1, zero, 40
+// 0x0103c07c: 0x103c07c: j	 0x103c104 addiu v1, zero, 40
 	ldc.i4.s 40
 	stloc 7
-	br L_103c0f4
+	br L_103c104
 // --- basic block ---
-L_103c074:
-// 0x0103c074: 0x103c074: jal   0x106ab10 lui   s1, 0x60000
+L_103c084:
+// 0x0103c084: 0x103c084: jal   0x106b134 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 5
 // --- basic block ---
-// 0x0103c07c: 0x103c07c: lui   a1, 0x10000
+// 0x0103c08c: 0x103c08c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c080: 0x103c080: addiu a1, a1, -8468
+// 0x0103c090: 0x103c090: addiu a1, a1, -8472
 	ldloc.2
-	ldc.i4 -8468
+	ldc.i4 -8472
 	add
 	stloc.2
-// 0x0103c084: 0x103c084: addu  a2, s2, zero
+// 0x0103c094: 0x103c094: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x0103c088: 0x103c088: addu  a3, v0, zero
+// 0x0103c098: 0x103c098: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0103c08c: 0x103c08c: jal   0x1000f64 addiu a0, s1, -13184
+// 0x0103c09c: 0x103c09c: jal   0x1000f64 addiu a0, s1, -12720
 	ldloc 9
-	ldc.i4 -13184
+	ldc.i4 -12720
 	add
 	stloc.1
 	ldloc.0
@@ -2969,48 +2969,48 @@ L_103c074:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c094: 0x103c094: lw    a0, -13188(s0)
+// 0x0103c0a4: 0x103c0a4: lw    a0, -12724(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103c098: 0x103c098: lui   a1, 0x10000
+// 0x0103c0a8: 0x103c0a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c09c: 0x103c09c: lui   a2, 0x0
+// 0x0103c0ac: 0x103c0ac: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0103c0a0: 0x103c0a0: lui   v0, 0x1040000
+// 0x0103c0b0: 0x103c0b0: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103c0a4: 0x103c0a4: addiu v0, v0, -16112
+// 0x0103c0b4: 0x103c0b4: addiu v0, v0, -16096
 	ldloc 5
-	ldc.i4 -16112
+	ldc.i4 -16096
 	add
 	stloc 5
-// 0x0103c0a8: 0x103c0a8: addiu s0, s1, -13184
+// 0x0103c0b8: 0x103c0b8: addiu s0, s1, -12720
 	ldloc 9
-	ldc.i4 -13184
+	ldc.i4 -12720
 	add
 	stloc 8
-// 0x0103c0ac: 0x103c0ac: addiu a1, a1, -8436
+// 0x0103c0bc: 0x103c0bc: addiu a1, a1, -8440
 	ldloc.2
-	ldc.i4 -8436
+	ldc.i4 -8440
 	add
 	stloc.2
-// 0x0103c0b0: 0x103c0b0: addiu a2, a2, 12896
+// 0x0103c0c0: 0x103c0c0: addiu a2, a2, 12896
 	ldloc.3
 	ldc.i4 12896
 	add
 	stloc.3
-// 0x0103c0b4: 0x103c0b4: addiu a3, zero, 2
+// 0x0103c0c4: 0x103c0c4: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x0103c0b8: 0x103c0b8: sw    v0, 16(sp)
+// 0x0103c0c8: 0x103c0c8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3019,7 +3019,7 @@ L_103c074:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c0bc: 0x103c0bc: sw    zero, 20(sp)
+// 0x0103c0cc: 0x103c0cc: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3028,7 +3028,7 @@ L_103c074:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103c0c0: 0x103c0c0: jal   0x1069ec8 sw    s0, 24(sp)
+// 0x0103c0d0: 0x103c0d0: jal   0x106a4b4 sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3042,40 +3042,40 @@ L_103c074:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c0c8: 0x103c0c8: bne   v0, zero, 0x103c0f4 addu  v1, zero, zero
+// 0x0103c0d8: 0x103c0d8: bne   v0, zero, 0x103c104 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_103c0f4
+	brtrue L_103c104
 // --- basic block ---
-// 0x0103c0d0: 0x103c0d0: lui   a1, 0x10000
+// 0x0103c0e0: 0x103c0e0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c0d4: 0x103c0d4: lui   a3, 0x10000
+// 0x0103c0e4: 0x103c0e4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c0d8: 0x103c0d8: addiu a1, a1, -8672
+// 0x0103c0e8: 0x103c0e8: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c0dc: 0x103c0dc: addiu a3, a3, -8424
+// 0x0103c0ec: 0x103c0ec: addiu a3, a3, -8428
 	ldloc 4
-	ldc.i4 -8424
+	ldc.i4 -8428
 	add
 	stloc 4
-// 0x0103c0e0: 0x103c0e0: addiu a0, zero, 4
+// 0x0103c0f0: 0x103c0f0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c0e4: 0x103c0e4: addiu a2, zero, 436
+// 0x0103c0f4: 0x103c0f4: addiu a2, zero, 436
 	ldc.i4 436
 	stloc.3
-// 0x0103c0e8: 0x103c0e8: jal   0x100449c sw    s0, 16(sp)
+// 0x0103c0f8: 0x103c0f8: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3094,15 +3094,15 @@ L_103c074:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c0f0: 0x103c0f0: addiu v1, zero, 2
+// 0x0103c100: 0x103c100: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-L_103c0f4:
-// 0x0103c0f4: 0x103c0f4: lw    ra, 44(sp)
-// 0x0103c0f8: 0x103c0f8: addu  v0, v1, zero
+L_103c104:
+// 0x0103c104: 0x103c104: lw    ra, 44(sp)
+// 0x0103c108: 0x103c108: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x0103c0fc: 0x103c0fc: lw    s2, 40(sp)
+// 0x0103c10c: 0x103c10c: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3111,7 +3111,7 @@ L_103c0f4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103c100: 0x103c100: lw    s1, 36(sp)
+// 0x0103c110: 0x103c110: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3120,7 +3120,7 @@ L_103c0f4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c104: 0x103c104: lw    s0, 32(sp)
+// 0x0103c114: 0x103c114: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3129,7 +3129,7 @@ L_103c0f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103c108: 0x103c108: jr    ra addiu sp, sp, 48
+// 0x0103c118: 0x103c118: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3141,7 +3141,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_completed_reporting_bad_address_103c110(int32,int32,int32,int32,int32)
+.method public static int32 on_completed_reporting_bad_address_103c120(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -3176,18 +3176,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c110: 0x103c110: lui   a0, 0x10000
+// 0x0103c120: 0x103c120: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103c114: 0x103c114: addiu sp, sp, -24
+// 0x0103c124: 0x103c124: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103c118: 0x103c118: sw    ra, 20(sp)
-// 0x0103c11c: 0x103c11c: jal   0x101cd60 addiu a0, a0, -8364
+// 0x0103c128: 0x103c128: sw    ra, 20(sp)
+// 0x0103c12c: 0x103c12c: jal   0x101cd70 addiu a0, a0, -8368
 	ldloc.1
-	ldc.i4 -8364
+	ldc.i4 -8368
 	add
 	stloc.1
 	ldloc.0
@@ -3195,15 +3195,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c124: 0x103c124: addu  a0, v0, zero
+// 0x0103c134: 0x103c134: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103c128: 0x103c128: jal   0x104c3fc addiu a1, zero, 2
+// 0x0103c138: 0x103c138: jal   0x104c40c addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -3211,14 +3211,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_timed_104c3fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_timed_104c40c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c130: 0x103c130: lw    ra, 20(sp)
-// 0x0103c134: 0x103c134: sll   zero, zero, 0
-// 0x0103c138: 0x103c138: jr    ra addiu sp, sp, 24
+// 0x0103c140: 0x103c140: lw    ra, 20(sp)
+// 0x0103c144: 0x103c144: sll   zero, zero, 0
+// 0x0103c148: 0x103c148: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3230,7 +3230,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 address_search_resolve_address_103c140(int32,int32,int32,int32,int32)
+.method public static int32 address_search_resolve_address_103c150(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -3265,24 +3265,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c140: 0x103c140: lui   v0, 0x60000
+// 0x0103c150: 0x103c150: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103c144: 0x103c144: addiu sp, sp, -40
+// 0x0103c154: 0x103c154: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103c148: 0x103c148: lw    v0, -13188(v0)
+// 0x0103c158: 0x103c158: lw    v0, -12724(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103c14c: 0x103c14c: sw    a1, 20(sp)
+// 0x0103c15c: 0x103c15c: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3291,13 +3291,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103c150: 0x103c150: lui   a3, 0x10000
+// 0x0103c160: 0x103c160: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c154: 0x103c154: lui   a1, 0x0
+// 0x0103c164: 0x103c164: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103c158: 0x103c158: sw    a0, 16(sp)
+// 0x0103c168: 0x103c168: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3306,7 +3306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103c15c: 0x103c15c: sw    a2, 24(sp)
+// 0x0103c16c: 0x103c16c: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3315,24 +3315,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103c160: 0x103c160: addu  a0, v0, zero
+// 0x0103c170: 0x103c170: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0103c164: 0x103c164: addiu a1, a1, 12896
+// 0x0103c174: 0x103c174: addiu a1, a1, 12896
 	ldloc.2
 	ldc.i4 12896
 	add
 	stloc.2
-// 0x0103c168: 0x103c168: addiu a3, a3, -8332
+// 0x0103c178: 0x103c178: addiu a3, a3, -8336
 	ldloc 4
-	ldc.i4 -8332
+	ldc.i4 -8336
 	add
 	stloc 4
-// 0x0103c16c: 0x103c16c: addiu a2, zero, 2
+// 0x0103c17c: 0x103c17c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0103c170: 0x103c170: sw    ra, 36(sp)
-// 0x0103c174: 0x103c174: jal   0x103e744 sw    zero, 28(sp)
+// 0x0103c180: 0x103c180: sw    ra, 36(sp)
+// 0x0103c184: 0x103c184: jal   0x103e754 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3346,14 +3346,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_resolve_address_103e744(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_resolve_address_103e754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c17c: 0x103c17c: lw    ra, 36(sp)
-// 0x0103c180: 0x103c180: sll   zero, zero, 0
-// 0x0103c184: 0x103c184: jr    ra addiu sp, sp, 40
+// 0x0103c18c: 0x103c18c: lw    ra, 36(sp)
+// 0x0103c190: 0x103c190: sll   zero, zero, 0
+// 0x0103c194: 0x103c194: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3365,7 +3365,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 address_search_term_103c18c(int32,int32,int32,int32,int32)
+.method public static int32 address_search_term_103c19c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -3403,12 +3403,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c18c: 0x103c18c: addiu sp, sp, -24
+// 0x0103c19c: 0x103c19c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103c190: 0x103c190: sw    s0, 16(sp)
+// 0x0103c1a0: 0x103c1a0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3417,43 +3417,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103c194: 0x103c194: lui   s0, 0x60000
+// 0x0103c1a4: 0x103c1a4: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103c198: 0x103c198: lw    v0, -13188(s0)
+// 0x0103c1a8: 0x103c1a8: lw    v0, -12724(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103c19c: 0x103c19c: sll   zero, zero, 0
-// 0x0103c1a0: 0x103c1a0: beq   v0, zero, 0x103c1d4 sw    ra, 20(sp)
+// 0x0103c1ac: 0x103c1ac: sll   zero, zero, 0
+// 0x0103c1b0: 0x103c1b0: beq   v0, zero, 0x103c1e4 sw    ra, 20(sp)
 	ldloc 7
-	brfalse L_103c1d4
+	brfalse L_103c1e4
 // --- basic block ---
-// 0x0103c1a8: 0x103c1a8: lui   a1, 0x10000
+// 0x0103c1b8: 0x103c1b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c1ac: 0x103c1ac: lui   a3, 0x10000
+// 0x0103c1bc: 0x103c1bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c1b0: 0x103c1b0: addiu a1, a1, -8672
+// 0x0103c1c0: 0x103c1c0: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c1b4: 0x103c1b4: addiu a3, a3, -8324
+// 0x0103c1c4: 0x103c1c4: addiu a3, a3, -8328
 	ldloc 4
-	ldc.i4 -8324
+	ldc.i4 -8328
 	add
 	stloc 4
-// 0x0103c1b8: 0x103c1b8: addiu a0, zero, 1
+// 0x0103c1c8: 0x103c1c8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103c1bc: 0x103c1bc: jal   0x100449c addiu a2, zero, 188
+// 0x0103c1cc: 0x103c1cc: jal   0x100449c addiu a2, zero, 188
 	ldc.i4 188
 	stloc.3
 	ldloc.0
@@ -3466,38 +3466,38 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0103c1c4: 0x103c1c4: lw    a0, -13188(s0)
+// 0x0103c1d4: 0x103c1d4: lw    a0, -12724(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103c1c8: 0x103c1c8: jal   0x106a494 sll   zero, zero, 0
+// 0x0103c1d8: 0x103c1d8: jal   0x106aa9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_term_106a494(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_term_106aa9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0103c1d0: 0x103c1d0: sw    zero, -13188(s0)
+// 0x0103c1e0: 0x103c1e0: sw    zero, -12724(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_103c1d4:
-// 0x0103c1d4: 0x103c1d4: lw    ra, 20(sp)
-// 0x0103c1d8: 0x103c1d8: lw    s0, 16(sp)
+L_103c1e4:
+// 0x0103c1e4: 0x103c1e4: lw    ra, 20(sp)
+// 0x0103c1e8: 0x103c1e8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3506,7 +3506,7 @@ L_103c1d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103c1dc: 0x103c1dc: jr    ra addiu sp, sp, 24
+// 0x0103c1ec: 0x103c1ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3518,7 +3518,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 address_search_init_103c1e4(int32,int32,int32,int32,int32)
+.method public static int32 address_search_init_103c1f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3559,25 +3559,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c1e4: 0x103c1e4: lui   v0, 0x60000
+// 0x0103c1f4: 0x103c1f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103c1e8: 0x103c1e8: lw    v1, -13188(v0)
+// 0x0103c1f8: 0x103c1f8: lw    v1, -12724(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103c1ec: 0x103c1ec: addiu sp, sp, -40
+// 0x0103c1fc: 0x103c1fc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103c1f0: 0x103c1f0: sw    ra, 36(sp)
-// 0x0103c1f4: 0x103c1f4: sw    s1, 32(sp)
+// 0x0103c200: 0x103c200: sw    ra, 36(sp)
+// 0x0103c204: 0x103c204: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3586,7 +3586,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c1f8: 0x103c1f8: sw    s0, 28(sp)
+// 0x0103c208: 0x103c208: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3595,56 +3595,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103c1fc: 0x103c1fc: bne   v1, zero, 0x103c2b8 addiu v0, zero, 1
+// 0x0103c20c: 0x103c20c: bne   v1, zero, 0x103c2c8 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brtrue L_103c2b8
+	brtrue L_103c2c8
 // --- basic block ---
-// 0x0103c204: 0x103c204: lui   s0, 0x60000
+// 0x0103c214: 0x103c214: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103c208: 0x103c208: lw    v0, -12160(s0)
+// 0x0103c218: 0x103c218: lw    v0, -11696(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3040
+	ldc.i4 -2924
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103c20c: 0x103c20c: sll   zero, zero, 0
-// 0x0103c210: 0x103c210: bne   v0, zero, 0x103c244 lui   s1, 0x0
+// 0x0103c21c: 0x103c21c: sll   zero, zero, 0
+// 0x0103c220: 0x103c220: bne   v0, zero, 0x103c254 lui   s1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brtrue L_103c244
+	brtrue L_103c254
 // --- basic block ---
-// 0x0103c218: 0x103c218: lui   a0, 0x10000
+// 0x0103c228: 0x103c228: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103c21c: 0x103c21c: lui   a1, 0x0
+// 0x0103c22c: 0x103c22c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103c220: 0x103c220: lui   a2, 0x10000
+// 0x0103c230: 0x103c230: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c224: 0x103c224: addiu a0, a0, 12560
+// 0x0103c234: 0x103c234: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103c228: 0x103c228: addiu a1, a1, 12912
+// 0x0103c238: 0x103c238: addiu a1, a1, 12912
 	ldloc.2
 	ldc.i4 12912
 	add
 	stloc.2
-// 0x0103c22c: 0x103c22c: addiu a2, a2, 18500
+// 0x0103c23c: 0x103c23c: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0103c230: 0x103c230: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103c240: 0x103c240: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3652,28 +3652,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c238: 0x103c238: addiu v0, zero, 1
+// 0x0103c248: 0x103c248: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103c23c: 0x103c23c: sw    v0, -12160(s0)
+// 0x0103c24c: 0x103c24c: sw    v0, -11696(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3040
+	ldc.i4 -2924
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c240: 0x103c240: lui   s1, 0x0
+// 0x0103c250: 0x103c250: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-L_103c244:
-// 0x0103c244: 0x103c244: jal   0x100e348 addiu a0, s1, 12912
+L_103c254:
+// 0x0103c254: 0x103c254: jal   0x100e358 addiu a0, s1, 12912
 	ldloc 9
 	ldc.i4 12912
 	add
@@ -3683,17 +3683,17 @@ L_103c244:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c24c: 0x103c24c: addiu a0, s1, 12912
+// 0x0103c25c: 0x103c25c: addiu a0, s1, 12912
 	ldloc 9
 	ldc.i4 12912
 	add
 	stloc.1
-// 0x0103c250: 0x103c250: jal   0x100e348 addu  s0, v0, zero
+// 0x0103c260: 0x103c260: jal   0x100e358 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -3701,20 +3701,20 @@ L_103c244:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c258: 0x103c258: lui   a1, 0x10000
+// 0x0103c268: 0x103c268: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c25c: 0x103c25c: addiu a1, a1, -28184
+// 0x0103c26c: 0x103c26c: addiu a1, a1, -28184
 	ldloc.2
 	ldc.i4 -28184
 	add
 	stloc.2
-// 0x0103c260: 0x103c260: jal   0x106a1ac addu  a0, v0, zero
+// 0x0103c270: 0x103c270: jal   0x106a798 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3722,49 +3722,49 @@ L_103c244:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_init_106a1ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_init_106a798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c268: 0x103c268: lui   v1, 0x60000
+// 0x0103c278: 0x103c278: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103c26c: 0x103c26c: sw    v0, -13188(v1)
+// 0x0103c27c: 0x103c27c: sw    v0, -12724(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3297
+	ldc.i4 -3181
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c270: 0x103c270: beq   v0, zero, 0x103c29c lui   a1, 0x10000
+// 0x0103c280: 0x103c280: beq   v0, zero, 0x103c2ac lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103c29c
+	brfalse L_103c2ac
 // --- basic block ---
-// 0x0103c278: 0x103c278: lui   a3, 0x10000
+// 0x0103c288: 0x103c288: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c27c: 0x103c27c: addiu a1, a1, -8672
+// 0x0103c28c: 0x103c28c: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c280: 0x103c280: addiu a3, a3, -8292
+// 0x0103c290: 0x103c290: addiu a3, a3, -8296
 	ldloc 4
-	ldc.i4 -8292
+	ldc.i4 -8296
 	add
 	stloc 4
-// 0x0103c284: 0x103c284: addiu a0, zero, 1
+// 0x0103c294: 0x103c294: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103c288: 0x103c288: addiu a2, zero, 173
+// 0x0103c298: 0x103c298: addiu a2, zero, 173
 	ldc.i4 173
 	stloc.3
-// 0x0103c28c: 0x103c28c: jal   0x100449c sw    s0, 16(sp)
+// 0x0103c29c: 0x103c29c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3783,29 +3783,29 @@ L_103c244:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c294: 0x103c294: j	 0x103c2b8 addiu v0, zero, 1
+// 0x0103c2a4: 0x103c2a4: j	 0x103c2c8 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_103c2b8
+	br L_103c2c8
 // --- basic block ---
-L_103c29c:
-// 0x0103c29c: 0x103c29c: lui   a3, 0x10000
+L_103c2ac:
+// 0x0103c2ac: 0x103c2ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c2a0: 0x103c2a0: addiu a1, a1, -8672
+// 0x0103c2b0: 0x103c2b0: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c2a4: 0x103c2a4: addiu a3, a3, -8240
+// 0x0103c2b4: 0x103c2b4: addiu a3, a3, -8244
 	ldloc 4
-	ldc.i4 -8240
+	ldc.i4 -8244
 	add
 	stloc 4
-// 0x0103c2a8: 0x103c2a8: addiu a0, zero, 4
+// 0x0103c2b8: 0x103c2b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c2ac: 0x103c2ac: jal   0x100449c addiu a2, zero, 179
+// 0x0103c2bc: 0x103c2bc: jal   0x100449c addiu a2, zero, 179
 	ldc.i4 179
 	stloc.3
 	ldloc.0
@@ -3818,12 +3818,12 @@ L_103c29c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c2b4: 0x103c2b4: addu  v0, zero, zero
+// 0x0103c2c4: 0x103c2c4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_103c2b8:
-// 0x0103c2b8: 0x103c2b8: lw    ra, 36(sp)
-// 0x0103c2bc: 0x103c2bc: lw    s1, 32(sp)
+L_103c2c8:
+// 0x0103c2c8: 0x103c2c8: lw    ra, 36(sp)
+// 0x0103c2cc: 0x103c2cc: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3832,7 +3832,7 @@ L_103c2b8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c2c0: 0x103c2c0: lw    s0, 28(sp)
+// 0x0103c2d0: 0x103c2d0: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3841,7 +3841,7 @@ L_103c2b8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103c2c4: 0x103c2c4: jr    ra addiu sp, sp, 40
+// 0x0103c2d4: 0x103c2d4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3853,7 +3853,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 address_candidate_build_address_string_103c2cc(int32,int32,int32,int32,int32)
+.method public static int32 address_candidate_build_address_string_103c2dc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 v1,int32 t0,int32 t1,int32 t2,int32 ra)
@@ -3900,12 +3900,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c2cc: 0x103c2cc: addiu sp, sp, -40
+// 0x0103c2dc: 0x103c2dc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103c2d0: 0x103c2d0: sw    s0, 32(sp)
+// 0x0103c2e0: 0x103c2e0: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3914,8 +3914,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c2d4: 0x103c2d4: sw    ra, 36(sp)
-// 0x0103c2d8: 0x103c2d8: lw    v0, 284(a0)
+// 0x0103c2e4: 0x103c2e4: sw    ra, 36(sp)
+// 0x0103c2e8: 0x103c2e8: lw    v0, 284(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -3924,63 +3924,63 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103c2dc: 0x103c2dc: lb    a1, 24(a0)
+// 0x0103c2ec: 0x103c2ec: lb    a1, 24(a0)
 	ldloc.1
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0103c2e0: 0x103c2e0: addu  s0, a0, zero
+// 0x0103c2f0: 0x103c2f0: addu  s0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0103c2e4: 0x103c2e4: addiu v0, v0, 1
+// 0x0103c2f4: 0x103c2f4: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0103c2e8: 0x103c2e8: sb    zero, 823(a0)
+// 0x0103c2f8: 0x103c2f8: sb    zero, 823(a0)
 	ldloc.1
 	ldc.i4 823
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0103c2ec: 0x103c2ec: lb    a0, 90(a0)
+// 0x0103c2fc: 0x103c2fc: lb    a0, 90(a0)
 	ldloc.1
 	ldc.i4.s 90
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0103c2f0: 0x103c2f0: lb    v1, 154(s0)
+// 0x0103c300: 0x103c300: lb    v1, 154(s0)
 	ldloc 5
 	ldc.i4 154
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103c2f4: 0x103c2f4: beq   a1, zero, 0x103c414 sltu  v0, zero, v0
+// 0x0103c304: 0x103c304: beq   a1, zero, 0x103c424 sltu  v0, zero, v0
 	ldloc.2
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-	brfalse L_103c414
+	brfalse L_103c424
 // --- basic block ---
-// 0x0103c2fc: 0x103c2fc: beq   a0, zero, 0x103c3a4 sll   zero, zero, 0
+// 0x0103c30c: 0x103c30c: beq   a0, zero, 0x103c3b4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_103c3a4
+	brfalse L_103c3b4
 // --- basic block ---
-// 0x0103c304: 0x103c304: beq   v1, zero, 0x103c398 lui   a2, 0x10000
+// 0x0103c314: 0x103c314: beq   v1, zero, 0x103c3a8 lui   a2, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc.3
-	brfalse L_103c398
+	brfalse L_103c3a8
 // --- basic block ---
-// 0x0103c30c: 0x103c30c: beq   v0, zero, 0x103c374 lui   a2, 0x10000
+// 0x0103c31c: 0x103c31c: beq   v0, zero, 0x103c384 lui   a2, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.3
-	brfalse L_103c374
+	brfalse L_103c384
 // --- basic block ---
-// 0x0103c314: 0x103c314: jal   0x109a424 addu  a0, zero, zero
+// 0x0103c324: 0x103c324: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3988,17 +3988,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c31c: 0x103c31c: addiu t2, s0, 24
+// 0x0103c32c: 0x103c32c: addiu t2, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x0103c320: 0x103c320: lw    t0, 284(s0)
+// 0x0103c330: 0x103c330: lw    t0, 284(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4007,39 +4007,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c324: 0x103c324: addiu a0, s0, 823
+// 0x0103c334: 0x103c334: addiu a0, s0, 823
 	ldloc 5
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103c328: 0x103c328: addiu v1, s0, 154
+// 0x0103c338: 0x103c338: addiu v1, s0, 154
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 8
-// 0x0103c32c: 0x103c32c: beq   v0, zero, 0x103c34c addiu t1, s0, 90
+// 0x0103c33c: 0x103c33c: beq   v0, zero, 0x103c35c addiu t1, s0, 90
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 90
 	add
 	stloc 10
-	brfalse L_103c34c
+	brfalse L_103c35c
 // --- basic block ---
-// 0x0103c334: 0x103c334: lui   a2, 0x10000
+// 0x0103c344: 0x103c344: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c338: 0x103c338: addiu a2, a2, -8196
+// 0x0103c348: 0x103c348: addiu a2, a2, -8200
 	ldloc.3
-	ldc.i4 -8196
+	ldc.i4 -8200
 	add
 	stloc.3
-// 0x0103c33c: 0x103c33c: addu  a3, v1, zero
+// 0x0103c34c: 0x103c34c: addu  a3, v1, zero
 	ldloc 8
 	stloc 4
-// 0x0103c340: 0x103c340: addiu a1, zero, 267
+// 0x0103c350: 0x103c350: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c344: 0x103c344: j	 0x103c360 sw    t0, 16(sp)
+// 0x0103c354: 0x103c354: j	 0x103c370 sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4048,24 +4048,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	br L_103c360
+	br L_103c370
 // --- basic block ---
-L_103c34c:
-// 0x0103c34c: 0x103c34c: lui   a2, 0x10000
+L_103c35c:
+// 0x0103c35c: 0x103c35c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c350: 0x103c350: addiu a2, a2, -10248
+// 0x0103c360: 0x103c360: addiu a2, a2, -10252
 	ldloc.3
-	ldc.i4 -10248
+	ldc.i4 -10252
 	add
 	stloc.3
-// 0x0103c354: 0x103c354: addu  a3, t0, zero
+// 0x0103c364: 0x103c364: addu  a3, t0, zero
 	ldloc 9
 	stloc 4
-// 0x0103c358: 0x103c358: addiu a1, zero, 267
+// 0x0103c368: 0x103c368: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c35c: 0x103c35c: sw    v1, 16(sp)
+// 0x0103c36c: 0x103c36c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4074,8 +4074,8 @@ L_103c34c:
 	add
 	ldloc 8
 	stelem.i4
-L_103c360:
-// 0x0103c360: 0x103c360: sw    t1, 20(sp)
+L_103c370:
+// 0x0103c370: 0x103c370: sw    t1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4084,7 +4084,7 @@ L_103c360:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103c364: 0x103c364: jal   0x1000f9c sw    t2, 24(sp)
+// 0x0103c374: 0x103c374: jal   0x1000f9c sw    t2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4103,41 +4103,41 @@ L_103c360:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c36c: 0x103c36c: j	 0x103c528 addiu v0, zero, 1
+// 0x0103c37c: 0x103c37c: j	 0x103c538 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_103c528
+	br L_103c538
 // --- basic block ---
-L_103c374:
-// 0x0103c374: 0x103c374: addiu v1, s0, 90
+L_103c384:
+// 0x0103c384: 0x103c384: addiu v1, s0, 90
 	ldloc 5
 	ldc.i4.s 90
 	add
 	stloc 8
-// 0x0103c378: 0x103c378: addiu v0, s0, 24
+// 0x0103c388: 0x103c388: addiu v0, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x0103c37c: 0x103c37c: addiu a2, a2, -10232
+// 0x0103c38c: 0x103c38c: addiu a2, a2, -10236
 	ldloc.3
-	ldc.i4 -10232
+	ldc.i4 -10236
 	add
 	stloc.3
-// 0x0103c380: 0x103c380: addiu a3, s0, 154
+// 0x0103c390: 0x103c390: addiu a3, s0, 154
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 4
-// 0x0103c384: 0x103c384: addiu a0, s0, 823
+// 0x0103c394: 0x103c394: addiu a0, s0, 823
 	ldloc 5
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103c388: 0x103c388: addiu a1, zero, 267
+// 0x0103c398: 0x103c398: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c38c: 0x103c38c: sw    v1, 16(sp)
+// 0x0103c39c: 0x103c39c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4146,7 +4146,7 @@ L_103c374:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103c390: 0x103c390: j	 0x103c4f8 sw    v0, 20(sp)
+// 0x0103c3a0: 0x103c3a0: j	 0x103c508 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4155,33 +4155,33 @@ L_103c374:
 	add
 	ldloc 6
 	stelem.i4
-	br L_103c4f8
+	br L_103c508
 // --- basic block ---
-L_103c398:
-// 0x0103c398: 0x103c398: addiu a2, a2, -10228
+L_103c3a8:
+// 0x0103c3a8: 0x103c3a8: addiu a2, a2, -10232
 	ldloc.3
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.3
-// 0x0103c39c: 0x103c39c: j	 0x103c40c addiu a3, s0, 90
+// 0x0103c3ac: 0x103c3ac: j	 0x103c41c addiu a3, s0, 90
 	ldloc 5
 	ldc.i4.s 90
 	add
 	stloc 4
-	br L_103c40c
+	br L_103c41c
 // --- basic block ---
-L_103c3a4:
-// 0x0103c3a4: 0x103c3a4: beq   v1, zero, 0x103c524 sll   zero, zero, 0
+L_103c3b4:
+// 0x0103c3b4: 0x103c3b4: beq   v1, zero, 0x103c534 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_103c524
+	brfalse L_103c534
 // --- basic block ---
-// 0x0103c3ac: 0x103c3ac: beq   v0, zero, 0x103c404 lui   a2, 0x10000
+// 0x0103c3bc: 0x103c3bc: beq   v0, zero, 0x103c414 lui   a2, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.3
-	brfalse L_103c404
+	brfalse L_103c414
 // --- basic block ---
-// 0x0103c3b4: 0x103c3b4: jal   0x109a424 addu  a0, zero, zero
+// 0x0103c3c4: 0x103c3c4: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4189,17 +4189,17 @@ L_103c3a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c3bc: 0x103c3bc: addiu t2, s0, 24
+// 0x0103c3cc: 0x103c3cc: addiu t2, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x0103c3c0: 0x103c3c0: lw    t0, 284(s0)
+// 0x0103c3d0: 0x103c3d0: lw    t0, 284(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4208,34 +4208,34 @@ L_103c3a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c3c4: 0x103c3c4: addiu a0, s0, 823
+// 0x0103c3d4: 0x103c3d4: addiu a0, s0, 823
 	ldloc 5
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103c3c8: 0x103c3c8: beq   v0, zero, 0x103c3e8 addiu v1, s0, 154
+// 0x0103c3d8: 0x103c3d8: beq   v0, zero, 0x103c3f8 addiu v1, s0, 154
 	ldloc 6
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 8
-	brfalse L_103c3e8
+	brfalse L_103c3f8
 // --- basic block ---
-// 0x0103c3d0: 0x103c3d0: lui   a2, 0x10000
+// 0x0103c3e0: 0x103c3e0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c3d4: 0x103c3d4: addiu a2, a2, -8180
+// 0x0103c3e4: 0x103c3e4: addiu a2, a2, -8184
 	ldloc.3
-	ldc.i4 -8180
+	ldc.i4 -8184
 	add
 	stloc.3
-// 0x0103c3d8: 0x103c3d8: addu  a3, v1, zero
+// 0x0103c3e8: 0x103c3e8: addu  a3, v1, zero
 	ldloc 8
 	stloc 4
-// 0x0103c3dc: 0x103c3dc: addiu a1, zero, 267
+// 0x0103c3ec: 0x103c3ec: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c3e0: 0x103c3e0: j	 0x103c3fc sw    t0, 16(sp)
+// 0x0103c3f0: 0x103c3f0: j	 0x103c40c sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4244,24 +4244,24 @@ L_103c3a4:
 	add
 	ldloc 9
 	stelem.i4
-	br L_103c3fc
+	br L_103c40c
 // --- basic block ---
-L_103c3e8:
-// 0x0103c3e8: 0x103c3e8: lui   a2, 0x10000
+L_103c3f8:
+// 0x0103c3f8: 0x103c3f8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c3ec: 0x103c3ec: addiu a2, a2, -10220
+// 0x0103c3fc: 0x103c3fc: addiu a2, a2, -10224
 	ldloc.3
-	ldc.i4 -10220
+	ldc.i4 -10224
 	add
 	stloc.3
-// 0x0103c3f0: 0x103c3f0: addu  a3, t0, zero
+// 0x0103c400: 0x103c400: addu  a3, t0, zero
 	ldloc 9
 	stloc 4
-// 0x0103c3f4: 0x103c3f4: addiu a1, zero, 267
+// 0x0103c404: 0x103c404: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c3f8: 0x103c3f8: sw    v1, 16(sp)
+// 0x0103c408: 0x103c408: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4270,8 +4270,8 @@ L_103c3e8:
 	add
 	ldloc 8
 	stelem.i4
-L_103c3fc:
-// 0x0103c3fc: 0x103c3fc: j	 0x103c4f8 sw    t2, 20(sp)
+L_103c40c:
+// 0x0103c40c: 0x103c40c: j	 0x103c508 sw    t2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4280,45 +4280,45 @@ L_103c3fc:
 	add
 	ldloc 11
 	stelem.i4
-	br L_103c4f8
+	br L_103c508
 // --- basic block ---
-L_103c404:
-// 0x0103c404: 0x103c404: addiu a2, a2, -10208
+L_103c414:
+// 0x0103c414: 0x103c414: addiu a2, a2, -10212
 	ldloc.3
-	ldc.i4 -10208
+	ldc.i4 -10212
 	add
 	stloc.3
-// 0x0103c408: 0x103c408: addiu a3, s0, 154
+// 0x0103c418: 0x103c418: addiu a3, s0, 154
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 4
-L_103c40c:
-// 0x0103c40c: 0x103c40c: j	 0x103c488 addiu v0, s0, 24
+L_103c41c:
+// 0x0103c41c: 0x103c41c: j	 0x103c498 addiu v0, s0, 24
 	ldloc 5
 	ldc.i4.s 24
 	add
 	stloc 6
-	br L_103c488
+	br L_103c498
 // --- basic block ---
-L_103c414:
-// 0x0103c414: 0x103c414: beq   a0, zero, 0x103c4a4 sll   zero, zero, 0
+L_103c424:
+// 0x0103c424: 0x103c424: beq   a0, zero, 0x103c4b4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_103c4a4
+	brfalse L_103c4b4
 // --- basic block ---
-// 0x0103c41c: 0x103c41c: beq   v1, zero, 0x103c498 lui   a2, 0x10000
+// 0x0103c42c: 0x103c42c: beq   v1, zero, 0x103c4a8 lui   a2, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc.3
-	brfalse L_103c498
+	brfalse L_103c4a8
 // --- basic block ---
-// 0x0103c424: 0x103c424: beq   v0, zero, 0x103c47c lui   a2, 0x10000
+// 0x0103c434: 0x103c434: beq   v0, zero, 0x103c48c lui   a2, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.3
-	brfalse L_103c47c
+	brfalse L_103c48c
 // --- basic block ---
-// 0x0103c42c: 0x103c42c: jal   0x109a424 addu  a0, zero, zero
+// 0x0103c43c: 0x103c43c: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4326,17 +4326,17 @@ L_103c414:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c434: 0x103c434: addiu t1, s0, 90
+// 0x0103c444: 0x103c444: addiu t1, s0, 90
 	ldloc 5
 	ldc.i4.s 90
 	add
 	stloc 10
-// 0x0103c438: 0x103c438: lw    t0, 284(s0)
+// 0x0103c448: 0x103c448: lw    t0, 284(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4345,34 +4345,34 @@ L_103c414:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c43c: 0x103c43c: addiu a0, s0, 823
+// 0x0103c44c: 0x103c44c: addiu a0, s0, 823
 	ldloc 5
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103c440: 0x103c440: beq   v0, zero, 0x103c460 addiu v1, s0, 154
+// 0x0103c450: 0x103c450: beq   v0, zero, 0x103c470 addiu v1, s0, 154
 	ldloc 6
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 8
-	brfalse L_103c460
+	brfalse L_103c470
 // --- basic block ---
-// 0x0103c448: 0x103c448: lui   a2, 0x10000
+// 0x0103c458: 0x103c458: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c44c: 0x103c44c: addiu a2, a2, -8168
+// 0x0103c45c: 0x103c45c: addiu a2, a2, -8172
 	ldloc.3
-	ldc.i4 -8168
+	ldc.i4 -8172
 	add
 	stloc.3
-// 0x0103c450: 0x103c450: addu  a3, v1, zero
+// 0x0103c460: 0x103c460: addu  a3, v1, zero
 	ldloc 8
 	stloc 4
-// 0x0103c454: 0x103c454: addiu a1, zero, 267
+// 0x0103c464: 0x103c464: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c458: 0x103c458: j	 0x103c474 sw    t0, 16(sp)
+// 0x0103c468: 0x103c468: j	 0x103c484 sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4381,24 +4381,24 @@ L_103c414:
 	add
 	ldloc 9
 	stelem.i4
-	br L_103c474
+	br L_103c484
 // --- basic block ---
-L_103c460:
-// 0x0103c460: 0x103c460: lui   a2, 0x10000
+L_103c470:
+// 0x0103c470: 0x103c470: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c464: 0x103c464: addiu a2, a2, -10196
+// 0x0103c474: 0x103c474: addiu a2, a2, -10200
 	ldloc.3
-	ldc.i4 -10196
+	ldc.i4 -10200
 	add
 	stloc.3
-// 0x0103c468: 0x103c468: addu  a3, t0, zero
+// 0x0103c478: 0x103c478: addu  a3, t0, zero
 	ldloc 9
 	stloc 4
-// 0x0103c46c: 0x103c46c: addiu a1, zero, 267
+// 0x0103c47c: 0x103c47c: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c470: 0x103c470: sw    v1, 16(sp)
+// 0x0103c480: 0x103c480: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4407,8 +4407,8 @@ L_103c460:
 	add
 	ldloc 8
 	stelem.i4
-L_103c474:
-// 0x0103c474: 0x103c474: j	 0x103c4f8 sw    t1, 20(sp)
+L_103c484:
+// 0x0103c484: 0x103c484: j	 0x103c508 sw    t1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4417,34 +4417,34 @@ L_103c474:
 	add
 	ldloc 10
 	stelem.i4
-	br L_103c4f8
+	br L_103c508
 // --- basic block ---
-L_103c47c:
-// 0x0103c47c: 0x103c47c: addiu a2, a2, -10228
+L_103c48c:
+// 0x0103c48c: 0x103c48c: addiu a2, a2, -10232
 	ldloc.3
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.3
-// 0x0103c480: 0x103c480: addiu a3, s0, 154
+// 0x0103c490: 0x103c490: addiu a3, s0, 154
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 4
-// 0x0103c484: 0x103c484: addiu v0, s0, 90
+// 0x0103c494: 0x103c494: addiu v0, s0, 90
 	ldloc 5
 	ldc.i4.s 90
 	add
 	stloc 6
-L_103c488:
-// 0x0103c488: 0x103c488: addiu a0, s0, 823
+L_103c498:
+// 0x0103c498: 0x103c498: addiu a0, s0, 823
 	ldloc 5
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103c48c: 0x103c48c: addiu a1, zero, 267
+// 0x0103c49c: 0x103c49c: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c490: 0x103c490: j	 0x103c4f8 sw    v0, 16(sp)
+// 0x0103c4a0: 0x103c4a0: j	 0x103c508 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4453,33 +4453,33 @@ L_103c488:
 	add
 	ldloc 6
 	stelem.i4
-	br L_103c4f8
+	br L_103c508
 // --- basic block ---
-L_103c498:
-// 0x0103c498: 0x103c498: addiu a2, a2, 19912
+L_103c4a8:
+// 0x0103c4a8: 0x103c4a8: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0103c49c: 0x103c49c: j	 0x103c510 addiu a3, s0, 90
+// 0x0103c4ac: 0x103c4ac: j	 0x103c520 addiu a3, s0, 90
 	ldloc 5
 	ldc.i4.s 90
 	add
 	stloc 4
-	br L_103c510
+	br L_103c520
 // --- basic block ---
-L_103c4a4:
-// 0x0103c4a4: 0x103c4a4: beq   v1, zero, 0x103c524 sll   zero, zero, 0
+L_103c4b4:
+// 0x0103c4b4: 0x103c4b4: beq   v1, zero, 0x103c534 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_103c524
+	brfalse L_103c534
 // --- basic block ---
-// 0x0103c4ac: 0x103c4ac: beq   v0, zero, 0x103c508 lui   a2, 0x10000
+// 0x0103c4bc: 0x103c4bc: beq   v0, zero, 0x103c518 lui   a2, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.3
-	brfalse L_103c508
+	brfalse L_103c518
 // --- basic block ---
-// 0x0103c4b4: 0x103c4b4: jal   0x109a424 addu  a0, zero, zero
+// 0x0103c4c4: 0x103c4c4: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4487,17 +4487,17 @@ L_103c4a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c4bc: 0x103c4bc: addiu v1, s0, 154
+// 0x0103c4cc: 0x103c4cc: addiu v1, s0, 154
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 8
-// 0x0103c4c0: 0x103c4c0: lw    t0, 284(s0)
+// 0x0103c4d0: 0x103c4d0: lw    t0, 284(s0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4506,29 +4506,29 @@ L_103c4a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c4c4: 0x103c4c4: beq   v0, zero, 0x103c4e4 addiu a0, s0, 823
+// 0x0103c4d4: 0x103c4d4: beq   v0, zero, 0x103c4f4 addiu a0, s0, 823
 	ldloc 6
 	ldloc 5
 	ldc.i4 823
 	add
 	stloc.1
-	brfalse L_103c4e4
+	brfalse L_103c4f4
 // --- basic block ---
-// 0x0103c4cc: 0x103c4cc: lui   a2, 0x10000
+// 0x0103c4dc: 0x103c4dc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c4d0: 0x103c4d0: addiu a2, a2, -8156
+// 0x0103c4e0: 0x103c4e0: addiu a2, a2, -8160
 	ldloc.3
-	ldc.i4 -8156
+	ldc.i4 -8160
 	add
 	stloc.3
-// 0x0103c4d4: 0x103c4d4: addu  a3, v1, zero
+// 0x0103c4e4: 0x103c4e4: addu  a3, v1, zero
 	ldloc 8
 	stloc 4
-// 0x0103c4d8: 0x103c4d8: addiu a1, zero, 267
+// 0x0103c4e8: 0x103c4e8: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c4dc: 0x103c4dc: j	 0x103c4f8 sw    t0, 16(sp)
+// 0x0103c4ec: 0x103c4ec: j	 0x103c508 sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4537,24 +4537,24 @@ L_103c4a4:
 	add
 	ldloc 9
 	stelem.i4
-	br L_103c4f8
+	br L_103c508
 // --- basic block ---
-L_103c4e4:
-// 0x0103c4e4: 0x103c4e4: lui   a2, 0x10000
+L_103c4f4:
+// 0x0103c4f4: 0x103c4f4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c4e8: 0x103c4e8: addiu a2, a2, -10184
+// 0x0103c4f8: 0x103c4f8: addiu a2, a2, -10188
 	ldloc.3
-	ldc.i4 -10184
+	ldc.i4 -10188
 	add
 	stloc.3
-// 0x0103c4ec: 0x103c4ec: addu  a3, t0, zero
+// 0x0103c4fc: 0x103c4fc: addu  a3, t0, zero
 	ldloc 9
 	stloc 4
-// 0x0103c4f0: 0x103c4f0: addiu a1, zero, 267
+// 0x0103c500: 0x103c500: addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
-// 0x0103c4f4: 0x103c4f4: sw    v1, 16(sp)
+// 0x0103c504: 0x103c504: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4563,8 +4563,8 @@ L_103c4e4:
 	add
 	ldloc 8
 	stelem.i4
-L_103c4f8:
-// 0x0103c4f8: 0x103c4f8: jal   0x1000f9c sll   zero, zero, 0
+L_103c508:
+// 0x0103c508: 0x103c508: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4575,29 +4575,29 @@ L_103c4f8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c500: 0x103c500: j	 0x103c528 addiu v0, zero, 1
+// 0x0103c510: 0x103c510: j	 0x103c538 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_103c528
+	br L_103c538
 // --- basic block ---
-L_103c508:
-// 0x0103c508: 0x103c508: addiu a2, a2, -11224
+L_103c518:
+// 0x0103c518: 0x103c518: addiu a2, a2, -11228
 	ldloc.3
-	ldc.i4 -11224
+	ldc.i4 -11228
 	add
 	stloc.3
-// 0x0103c50c: 0x103c50c: addiu a3, s0, 154
+// 0x0103c51c: 0x103c51c: addiu a3, s0, 154
 	ldloc 5
 	ldc.i4 154
 	add
 	stloc 4
-L_103c510:
-// 0x0103c510: 0x103c510: addiu a0, s0, 823
+L_103c520:
+// 0x0103c520: 0x103c520: addiu a0, s0, 823
 	ldloc 5
 	ldc.i4 823
 	add
 	stloc.1
-// 0x0103c514: 0x103c514: jal   0x1000f9c addiu a1, zero, 267
+// 0x0103c524: 0x103c524: jal   0x1000f9c addiu a1, zero, 267
 	ldc.i4 267
 	stloc.2
 	ldloc.0
@@ -4610,18 +4610,18 @@ L_103c510:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103c51c: 0x103c51c: j	 0x103c528 addiu v0, zero, 1
+// 0x0103c52c: 0x103c52c: j	 0x103c538 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_103c528
+	br L_103c538
 // --- basic block ---
-L_103c524:
-// 0x0103c524: 0x103c524: addu  v0, zero, zero
+L_103c534:
+// 0x0103c534: 0x103c534: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_103c528:
-// 0x0103c528: 0x103c528: lw    ra, 36(sp)
-// 0x0103c52c: 0x103c52c: lw    s0, 32(sp)
+L_103c538:
+// 0x0103c538: 0x103c538: lw    ra, 36(sp)
+// 0x0103c53c: 0x103c53c: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4630,7 +4630,7 @@ L_103c528:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103c530: 0x103c530: jr    ra addiu sp, sp, 40
+// 0x0103c540: 0x103c540: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4642,7 +4642,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_address_option_103c538(int32,int32,int32,int32,int32)
+.method public static int32 on_address_option_103c548(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4692,13 +4692,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103c538:
-// 0x0103c538: 0x103c538: addiu sp, sp, -2224
+L_103c548:
+// 0x0103c548: 0x103c548: addiu sp, sp, -2224
 	ldloc.0
 	ldc.i4 -2224
 	add
 	stloc.0
-// 0x0103c53c: 0x103c53c: sw    s0, 2200(sp)
+// 0x0103c54c: 0x103c54c: sw    s0, 2200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4707,16 +4707,16 @@ L_103c538:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103c540: 0x103c540: addu  s0, a0, zero
+// 0x0103c550: 0x103c550: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0103c544: 0x103c544: addiu a0, sp, 1104
+// 0x0103c554: 0x103c554: addiu a0, sp, 1104
 	ldloc.0
 	ldc.i4 1104
 	add
 	stloc.1
-// 0x0103c548: 0x103c548: sw    ra, 2220(sp)
-// 0x0103c54c: 0x103c54c: sw    s3, 2212(sp)
+// 0x0103c558: 0x103c558: sw    ra, 2220(sp)
+// 0x0103c55c: 0x103c55c: sw    s3, 2212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4725,7 +4725,7 @@ L_103c538:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103c550: 0x103c550: sw    s2, 2208(sp)
+// 0x0103c560: 0x103c560: sw    s2, 2208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4734,10 +4734,10 @@ L_103c538:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103c554: 0x103c554: addu  s3, a3, zero
+// 0x0103c564: 0x103c564: addu  s3, a3, zero
 	ldloc 4
 	stloc 11
-// 0x0103c558: 0x103c558: sw    s1, 2204(sp)
+// 0x0103c568: 0x103c568: sw    s1, 2204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4746,7 +4746,7 @@ L_103c538:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c55c: 0x103c55c: sw    s4, 2216(sp)
+// 0x0103c56c: 0x103c56c: sw    s4, 2216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4755,7 +4755,7 @@ L_103c538:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103c560: 0x103c560: jal   0x103ea8c lui   s2, 0x0
+// 0x0103c570: 0x103c570: jal   0x103ea9c lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -4763,41 +4763,41 @@ L_103c538:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::address_candidate_init_103ea8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::address_candidate_init_103ea9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c568: 0x103c568: addiu v0, zero, 18
+// 0x0103c578: 0x103c578: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0103c56c: 0x103c56c: sw    v0, 0(s3)
+// 0x0103c57c: 0x103c57c: sw    v0, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103c570: 0x103c570: addu  a0, s0, zero
+// 0x0103c580: 0x103c580: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103c574: 0x103c574: addiu s1, zero, 1
+// 0x0103c584: 0x103c584: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0103c578: 0x103c578: addiu a1, s2, 28076
+// 0x0103c588: 0x103c588: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0103c57c: 0x103c57c: addu  a2, zero, zero
+// 0x0103c58c: 0x103c58c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103c580: 0x103c580: addiu a3, sp, 1112
+// 0x0103c590: 0x103c590: addiu a3, sp, 1112
 	ldloc.0
 	ldc.i4 1112
 	add
 	stloc 4
-// 0x0103c584: 0x103c584: sw    s1, 1104(sp)
+// 0x0103c594: 0x103c594: sw    s1, 1104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4806,7 +4806,7 @@ L_103c538:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c588: 0x103c588: jal   0x106885c sw    s1, 16(sp)
+// 0x0103c598: 0x103c598: jal   0x106886c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4820,59 +4820,59 @@ L_103c538:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadDoubleFromString_106885c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadDoubleFromString_106886c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c590: 0x103c590: bne   v0, zero, 0x103c5b4 addu  s0, v0, zero
+// 0x0103c5a0: 0x103c5a0: bne   v0, zero, 0x103c5c4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103c5b4
+	brtrue L_103c5c4
 // --- basic block ---
-// 0x0103c598: 0x103c598: lui   a1, 0x10000
+// 0x0103c5a8: 0x103c5a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c59c: 0x103c59c: lui   a3, 0x10000
+// 0x0103c5ac: 0x103c5ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c5a0: 0x103c5a0: addiu a1, a1, -8672
+// 0x0103c5b0: 0x103c5b0: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c5a4: 0x103c5a4: addiu a3, a3, -8148
+// 0x0103c5b4: 0x103c5b4: addiu a3, a3, -8152
 	ldloc 4
-	ldc.i4 -8148
+	ldc.i4 -8152
 	add
 	stloc 4
-// 0x0103c5a8: 0x103c5a8: addiu a0, zero, 4
+// 0x0103c5b8: 0x103c5b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c5ac: 0x103c5ac: j	 0x103c5ec addiu a2, zero, 247
+// 0x0103c5bc: 0x103c5bc: j	 0x103c5fc addiu a2, zero, 247
 	ldc.i4 247
 	stloc.3
-	br L_103c5ec
+	br L_103c5fc
 // --- basic block ---
-L_103c5b4:
-// 0x0103c5b4: 0x103c5b4: addu  a0, v0, zero
+L_103c5c4:
+// 0x0103c5c4: 0x103c5c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103c5b8: 0x103c5b8: addiu a1, s2, 28076
+// 0x0103c5c8: 0x103c5c8: addiu a1, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0103c5bc: 0x103c5bc: addu  a2, zero, zero
+// 0x0103c5cc: 0x103c5cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103c5c0: 0x103c5c0: addiu a3, sp, 1120
+// 0x0103c5d0: 0x103c5d0: addiu a3, sp, 1120
 	ldloc.0
 	ldc.i4 1120
 	add
 	stloc 4
-// 0x0103c5c4: 0x103c5c4: jal   0x106885c sw    s1, 16(sp)
+// 0x0103c5d4: 0x103c5d4: jal   0x106886c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4886,41 +4886,41 @@ L_103c5b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadDoubleFromString_106885c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadDoubleFromString_106886c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c5cc: 0x103c5cc: bne   v0, zero, 0x103c5fc addu  s0, v0, zero
+// 0x0103c5dc: 0x103c5dc: bne   v0, zero, 0x103c60c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103c5fc
+	brtrue L_103c60c
 // --- basic block ---
-// 0x0103c5d4: 0x103c5d4: lui   a1, 0x10000
+// 0x0103c5e4: 0x103c5e4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c5d8: 0x103c5d8: lui   a3, 0x10000
+// 0x0103c5e8: 0x103c5e8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c5dc: 0x103c5dc: addiu a1, a1, -8672
+// 0x0103c5ec: 0x103c5ec: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c5e0: 0x103c5e0: addiu a3, a3, -8080
+// 0x0103c5f0: 0x103c5f0: addiu a3, a3, -8084
 	ldloc 4
-	ldc.i4 -8080
+	ldc.i4 -8084
 	add
 	stloc 4
-// 0x0103c5e4: 0x103c5e4: addiu a0, zero, 4
+// 0x0103c5f4: 0x103c5f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c5e8: 0x103c5e8: addiu a2, zero, 263
+// 0x0103c5f8: 0x103c5f8: addiu a2, zero, 263
 	ldc.i4 263
 	stloc.3
-L_103c5ec:
-// 0x0103c5ec: 0x103c5ec: jal   0x100449c sll   zero, zero, 0
+L_103c5fc:
+// 0x0103c5fc: 0x103c5fc: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4931,51 +4931,51 @@ L_103c5ec:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c5f4: 0x103c5f4: j	 0x103c84c sll   zero, zero, 0
-	br L_103c84c
+// 0x0103c604: 0x103c604: j	 0x103c85c sll   zero, zero, 0
+	br L_103c85c
 // --- basic block ---
-L_103c5fc:
-// 0x0103c5fc: 0x103c5fc: lb    v1, 0(v0)
+L_103c60c:
+// 0x0103c60c: 0x103c60c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103c600: 0x103c600: addiu v0, zero, 44
+// 0x0103c610: 0x103c610: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103c604: 0x103c604: bne   v1, v0, 0x103c614 addu  a0, s0, zero
+// 0x0103c614: 0x103c614: bne   v1, v0, 0x103c624 addu  a0, s0, zero
 	ldloc 8
 	ldloc 5
 	ldloc 7
 	stloc.1
-	bne.un L_103c614
+	bne.un L_103c624
 // --- basic block ---
-// 0x0103c60c: 0x103c60c: j	 0x103c654 addiu s0, s0, 1
+// 0x0103c61c: 0x103c61c: j	 0x103c664 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103c654
+	br L_103c664
 // --- basic block ---
-L_103c614:
-// 0x0103c614: 0x103c614: addiu v0, zero, 32
+L_103c624:
+// 0x0103c624: 0x103c624: addiu v0, zero, 32
 	ldc.i4.s 32
 	stloc 5
-// 0x0103c618: 0x103c618: addiu a3, s2, 28076
+// 0x0103c628: 0x103c628: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103c61c: 0x103c61c: addiu a1, sp, 1128
+// 0x0103c62c: 0x103c62c: addiu a1, sp, 1128
 	ldloc.0
 	ldc.i4 1128
 	add
 	stloc.2
-// 0x0103c620: 0x103c620: addiu a2, sp, 1096
+// 0x0103c630: 0x103c630: addiu a2, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc.3
-// 0x0103c624: 0x103c624: sw    v0, 1096(sp)
+// 0x0103c634: 0x103c634: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4984,7 +4984,7 @@ L_103c614:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c628: 0x103c628: jal   0x1068250 sw    s1, 16(sp)
+// 0x0103c638: 0x103c638: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4998,71 +4998,71 @@ L_103c614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c630: 0x103c630: bne   v0, zero, 0x103c654 addu  s0, v0, zero
+// 0x0103c640: 0x103c640: bne   v0, zero, 0x103c664 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103c654
+	brtrue L_103c664
 // --- basic block ---
-// 0x0103c638: 0x103c638: lui   a1, 0x10000
+// 0x0103c648: 0x103c648: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c63c: 0x103c63c: lui   a3, 0x10000
+// 0x0103c64c: 0x103c64c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c640: 0x103c640: addiu a1, a1, -8672
+// 0x0103c650: 0x103c650: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c644: 0x103c644: addiu a3, a3, -8016
+// 0x0103c654: 0x103c654: addiu a3, a3, -8020
 	ldloc 4
-	ldc.i4 -8016
+	ldc.i4 -8020
 	add
 	stloc 4
-// 0x0103c648: 0x103c648: addiu a0, zero, 4
+// 0x0103c658: 0x103c658: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c64c: 0x103c64c: j	 0x103c5ec addiu a2, zero, 285
+// 0x0103c65c: 0x103c65c: j	 0x103c5fc addiu a2, zero, 285
 	ldc.i4 285
 	stloc.3
-	br L_103c5ec
+	br L_103c5fc
 // --- basic block ---
-L_103c654:
-// 0x0103c654: 0x103c654: lb    v1, 0(s0)
+L_103c664:
+// 0x0103c664: 0x103c664: lb    v1, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x0103c658: 0x103c658: addiu v0, zero, 44
+// 0x0103c668: 0x103c668: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0103c65c: 0x103c65c: bne   v1, v0, 0x103c66c addiu v0, zero, 32
+// 0x0103c66c: 0x103c66c: bne   v1, v0, 0x103c67c addiu v0, zero, 32
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 32
 	stloc 5
-	bne.un L_103c66c
+	bne.un L_103c67c
 // --- basic block ---
-// 0x0103c664: 0x103c664: j	 0x103c6b4 addiu s0, s0, 1
+// 0x0103c674: 0x103c674: j	 0x103c6c4 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_103c6b4
+	br L_103c6c4
 // --- basic block ---
-L_103c66c:
-// 0x0103c66c: 0x103c66c: lui   a3, 0x0
+L_103c67c:
+// 0x0103c67c: 0x103c67c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0103c670: 0x103c670: addu  a0, s0, zero
+// 0x0103c680: 0x103c680: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103c674: 0x103c674: sw    v0, 1096(sp)
+// 0x0103c684: 0x103c684: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5071,25 +5071,25 @@ L_103c66c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c678: 0x103c678: addiu a3, a3, 28076
+// 0x0103c688: 0x103c688: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103c67c: 0x103c67c: addiu v0, zero, 1
+// 0x0103c68c: 0x103c68c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103c680: 0x103c680: addiu a1, sp, 1161
+// 0x0103c690: 0x103c690: addiu a1, sp, 1161
 	ldloc.0
 	ldc.i4 1161
 	add
 	stloc.2
-// 0x0103c684: 0x103c684: addiu a2, sp, 1096
+// 0x0103c694: 0x103c694: addiu a2, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc.3
-// 0x0103c688: 0x103c688: jal   0x1068250 sw    v0, 16(sp)
+// 0x0103c698: 0x103c698: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5103,73 +5103,73 @@ L_103c66c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c690: 0x103c690: bne   v0, zero, 0x103c6b4 addu  s0, v0, zero
+// 0x0103c6a0: 0x103c6a0: bne   v0, zero, 0x103c6c4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103c6b4
+	brtrue L_103c6c4
 // --- basic block ---
-// 0x0103c698: 0x103c698: lui   a1, 0x10000
+// 0x0103c6a8: 0x103c6a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c69c: 0x103c69c: lui   a3, 0x10000
+// 0x0103c6ac: 0x103c6ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c6a0: 0x103c6a0: addiu a1, a1, -8672
+// 0x0103c6b0: 0x103c6b0: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c6a4: 0x103c6a4: addiu a3, a3, -7952
+// 0x0103c6b4: 0x103c6b4: addiu a3, a3, -7956
 	ldloc 4
-	ldc.i4 -7952
+	ldc.i4 -7956
 	add
 	stloc 4
-// 0x0103c6a8: 0x103c6a8: addiu a0, zero, 4
+// 0x0103c6b8: 0x103c6b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c6ac: 0x103c6ac: j	 0x103c5ec addiu a2, zero, 308
+// 0x0103c6bc: 0x103c6bc: j	 0x103c5fc addiu a2, zero, 308
 	ldc.i4 308
 	stloc.3
-	br L_103c5ec
+	br L_103c5fc
 // --- basic block ---
-L_103c6b4:
-// 0x0103c6b4: 0x103c6b4: addiu s4, sp, 1096
+L_103c6c4:
+// 0x0103c6c4: 0x103c6c4: addiu s4, sp, 1096
 	ldloc.0
 	ldc.i4 1096
 	add
 	stloc 12
-// 0x0103c6b8: 0x103c6b8: lui   s2, 0x0
+// 0x0103c6c8: 0x103c6c8: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0103c6bc: 0x103c6bc: addu  a0, s0, zero
+// 0x0103c6cc: 0x103c6cc: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103c6c0: 0x103c6c0: addiu v0, zero, 63
+// 0x0103c6d0: 0x103c6d0: addiu v0, zero, 63
 	ldc.i4.s 63
 	stloc 5
-// 0x0103c6c4: 0x103c6c4: addiu s1, zero, 1
+// 0x0103c6d4: 0x103c6d4: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0103c6c8: 0x103c6c8: addiu a1, sp, 1194
+// 0x0103c6d8: 0x103c6d8: addiu a1, sp, 1194
 	ldloc.0
 	ldc.i4 1194
 	add
 	stloc.2
-// 0x0103c6cc: 0x103c6cc: addu  a2, s4, zero
+// 0x0103c6dc: 0x103c6dc: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x0103c6d0: 0x103c6d0: addiu a3, s2, 28076
+// 0x0103c6e0: 0x103c6e0: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103c6d4: 0x103c6d4: sw    v0, 1096(sp)
+// 0x0103c6e4: 0x103c6e4: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5178,7 +5178,7 @@ L_103c6b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c6d8: 0x103c6d8: jal   0x1068250 sw    s1, 16(sp)
+// 0x0103c6e8: 0x103c6e8: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5192,62 +5192,62 @@ L_103c6b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c6e0: 0x103c6e0: bne   v0, zero, 0x103c704 addu  s0, v0, zero
+// 0x0103c6f0: 0x103c6f0: bne   v0, zero, 0x103c714 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103c704
+	brtrue L_103c714
 // --- basic block ---
-// 0x0103c6e8: 0x103c6e8: lui   a1, 0x10000
+// 0x0103c6f8: 0x103c6f8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c6ec: 0x103c6ec: lui   a3, 0x10000
+// 0x0103c6fc: 0x103c6fc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c6f0: 0x103c6f0: addiu a1, a1, -8672
+// 0x0103c700: 0x103c700: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c6f4: 0x103c6f4: addiu a3, a3, -7888
+// 0x0103c704: 0x103c704: addiu a3, a3, -7892
 	ldloc 4
-	ldc.i4 -7888
+	ldc.i4 -7892
 	add
 	stloc 4
-// 0x0103c6f8: 0x103c6f8: addiu a0, zero, 4
+// 0x0103c708: 0x103c708: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c6fc: 0x103c6fc: j	 0x103c5ec addiu a2, zero, 328
+// 0x0103c70c: 0x103c70c: j	 0x103c5fc addiu a2, zero, 328
 	ldc.i4 328
 	stloc.3
-	br L_103c5ec
+	br L_103c5fc
 // --- basic block ---
-L_103c704:
-// 0x0103c704: 0x103c704: addu  a0, v0, zero
+L_103c714:
+// 0x0103c714: 0x103c714: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103c708: 0x103c708: addu  a2, s4, zero
+// 0x0103c718: 0x103c718: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x0103c70c: 0x103c70c: addiu v0, zero, 128
+// 0x0103c71c: 0x103c71c: addiu v0, zero, 128
 	ldc.i4 128
 	stloc 5
-// 0x0103c710: 0x103c710: addiu a3, s2, 28076
+// 0x0103c720: 0x103c720: addiu a3, s2, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103c714: 0x103c714: addiu a1, sp, 1258
+// 0x0103c724: 0x103c724: addiu a1, sp, 1258
 	ldloc.0
 	ldc.i4 1258
 	add
 	stloc.2
-// 0x0103c718: 0x103c718: sw    v0, 1096(sp)
+// 0x0103c728: 0x103c728: sw    v0, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5256,7 +5256,7 @@ L_103c704:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c71c: 0x103c71c: jal   0x1068250 sw    s1, 16(sp)
+// 0x0103c72c: 0x103c72c: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5270,91 +5270,91 @@ L_103c704:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c724: 0x103c724: bne   v0, zero, 0x103c748 addu  s0, v0, zero
+// 0x0103c734: 0x103c734: bne   v0, zero, 0x103c758 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103c748
+	brtrue L_103c758
 // --- basic block ---
-// 0x0103c72c: 0x103c72c: lui   a1, 0x10000
+// 0x0103c73c: 0x103c73c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c730: 0x103c730: lui   a3, 0x10000
+// 0x0103c740: 0x103c740: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c734: 0x103c734: addiu a1, a1, -8672
+// 0x0103c744: 0x103c744: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c738: 0x103c738: addiu a3, a3, -7828
+// 0x0103c748: 0x103c748: addiu a3, a3, -7832
 	ldloc 4
-	ldc.i4 -7828
+	ldc.i4 -7832
 	add
 	stloc 4
-// 0x0103c73c: 0x103c73c: addiu a0, zero, 4
+// 0x0103c74c: 0x103c74c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c740: 0x103c740: j	 0x103c5ec addiu a2, zero, 346
+// 0x0103c750: 0x103c750: j	 0x103c5fc addiu a2, zero, 346
 	ldc.i4 346
 	stloc.3
-	br L_103c5ec
+	br L_103c5fc
 // --- basic block ---
-L_103c748:
-// 0x0103c748: 0x103c748: lbu   v0, 0(v0)
+L_103c758:
+// 0x0103c758: 0x103c758: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0103c74c: 0x103c74c: sll   zero, zero, 0
-// 0x0103c750: 0x103c750: addiu v0, v0, -48
+// 0x0103c75c: 0x103c75c: sll   zero, zero, 0
+// 0x0103c760: 0x103c760: addiu v0, v0, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 5
-// 0x0103c754: 0x103c754: andi  v0, v0, 255
+// 0x0103c764: 0x103c764: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x0103c758: 0x103c758: sltiu v0, v0, 10
+// 0x0103c768: 0x103c768: sltiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt.un
 	stloc 5
-// 0x0103c75c: 0x103c75c: beq   v0, zero, 0x103c7a8 lui   a1, 0x10000
+// 0x0103c76c: 0x103c76c: beq   v0, zero, 0x103c7b8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103c7a8
+	brfalse L_103c7b8
 // --- basic block ---
-// 0x0103c764: 0x103c764: lui   a1, 0x10000
+// 0x0103c774: 0x103c774: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c768: 0x103c768: addu  a0, s0, zero
+// 0x0103c778: 0x103c778: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103c76c: 0x103c76c: addiu v0, zero, -1
+// 0x0103c77c: 0x103c77c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0103c770: 0x103c770: addiu a1, a1, 19160
+// 0x0103c780: 0x103c780: addiu a1, a1, 18632
 	ldloc.2
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc.2
-// 0x0103c774: 0x103c774: addu  a2, zero, zero
+// 0x0103c784: 0x103c784: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103c778: 0x103c778: addiu a3, sp, 1388
+// 0x0103c788: 0x103c788: addiu a3, sp, 1388
 	ldloc.0
 	ldc.i4 1388
 	add
 	stloc 4
-// 0x0103c77c: 0x103c77c: jal   0x106855c sw    v0, 16(sp)
+// 0x0103c78c: 0x103c78c: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5368,51 +5368,51 @@ L_103c748:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c784: 0x103c784: bne   v0, zero, 0x103c7bc addu  s0, v0, zero
+// 0x0103c794: 0x103c794: bne   v0, zero, 0x103c7cc addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brtrue L_103c7bc
+	brtrue L_103c7cc
 // --- basic block ---
-// 0x0103c78c: 0x103c78c: lui   a1, 0x10000
+// 0x0103c79c: 0x103c79c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c790: 0x103c790: lui   a3, 0x10000
+// 0x0103c7a0: 0x103c7a0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c794: 0x103c794: addiu a1, a1, -8672
+// 0x0103c7a4: 0x103c7a4: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c798: 0x103c798: addiu a3, a3, -7764
+// 0x0103c7a8: 0x103c7a8: addiu a3, a3, -7768
 	ldloc 4
-	ldc.i4 -7764
+	ldc.i4 -7768
 	add
 	stloc 4
-// 0x0103c79c: 0x103c79c: addiu a0, zero, 4
+// 0x0103c7ac: 0x103c7ac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c7a0: 0x103c7a0: j	 0x103c5ec addiu a2, zero, 365
+// 0x0103c7b0: 0x103c7b0: j	 0x103c5fc addiu a2, zero, 365
 	ldc.i4 365
 	stloc.3
-	br L_103c5ec
+	br L_103c5fc
 // --- basic block ---
-L_103c7a8:
-// 0x0103c7a8: 0x103c7a8: addu  a0, s0, zero
+L_103c7b8:
+// 0x0103c7b8: 0x103c7b8: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103c7ac: 0x103c7ac: addiu a1, a1, -7696
+// 0x0103c7bc: 0x103c7bc: addiu a1, a1, -7700
 	ldloc.2
-	ldc.i4 -7696
+	ldc.i4 -7700
 	add
 	stloc.2
-// 0x0103c7b0: 0x103c7b0: jal   0x10681a8 addiu a2, zero, -1
+// 0x0103c7c0: 0x103c7c0: jal   0x10681b8 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -5420,56 +5420,56 @@ L_103c7a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c7b8: 0x103c7b8: addu  s0, v0, zero
+// 0x0103c7c8: 0x103c7c8: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-L_103c7bc:
-// 0x0103c7bc: 0x103c7bc: lb    v0, 1194(sp)
+L_103c7cc:
+// 0x0103c7cc: 0x103c7cc: lb    v0, 1194(sp)
 	ldloc.0
 	ldc.i4 1194
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103c7c0: 0x103c7c0: sll   zero, zero, 0
-// 0x0103c7c4: 0x103c7c4: bne   v0, zero, 0x103c7fc sll   zero, zero, 0
+// 0x0103c7d0: 0x103c7d0: sll   zero, zero, 0
+// 0x0103c7d4: 0x103c7d4: bne   v0, zero, 0x103c80c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103c7fc
+	brtrue L_103c80c
 // --- basic block ---
-// 0x0103c7cc: 0x103c7cc: lb    v0, 1258(sp)
+// 0x0103c7dc: 0x103c7dc: lb    v0, 1258(sp)
 	ldloc.0
 	ldc.i4 1258
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103c7d0: 0x103c7d0: sll   zero, zero, 0
-// 0x0103c7d4: 0x103c7d4: bne   v0, zero, 0x103c7fc lui   a1, 0x10000
+// 0x0103c7e0: 0x103c7e0: sll   zero, zero, 0
+// 0x0103c7e4: 0x103c7e4: bne   v0, zero, 0x103c80c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_103c7fc
+	brtrue L_103c80c
 // --- basic block ---
-// 0x0103c7dc: 0x103c7dc: lui   a3, 0x10000
+// 0x0103c7ec: 0x103c7ec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103c7e0: 0x103c7e0: addiu a1, a1, -8672
+// 0x0103c7f0: 0x103c7f0: addiu a1, a1, -8676
 	ldloc.2
-	ldc.i4 -8672
+	ldc.i4 -8676
 	add
 	stloc.2
-// 0x0103c7e4: 0x103c7e4: addiu a3, a3, -7692
+// 0x0103c7f4: 0x103c7f4: addiu a3, a3, -7696
 	ldloc 4
-	ldc.i4 -7692
+	ldc.i4 -7696
 	add
 	stloc 4
-// 0x0103c7e8: 0x103c7e8: addiu a0, zero, 4
+// 0x0103c7f8: 0x103c7f8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103c7ec: 0x103c7ec: jal   0x100449c addiu a2, zero, 374
+// 0x0103c7fc: 0x103c7fc: jal   0x100449c addiu a2, zero, 374
 	ldc.i4 374
 	stloc.3
 	ldloc.0
@@ -5482,13 +5482,13 @@ L_103c7bc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c7f4: 0x103c7f4: j	 0x103c84c addu  s0, zero, zero
+// 0x0103c804: 0x103c804: j	 0x103c85c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_103c84c
+	br L_103c85c
 // --- basic block ---
-L_103c7fc:
-// 0x0103c7fc: 0x103c7fc: jal   0x103c2cc addiu a0, sp, 1104
+L_103c80c:
+// 0x0103c80c: 0x103c80c: jal   0x103c2dc addiu a0, sp, 1104
 	ldloc.0
 	ldc.i4 1104
 	add
@@ -5498,60 +5498,60 @@ L_103c7fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::address_candidate_build_address_string_103c2cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::address_candidate_build_address_string_103c2dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c804: 0x103c804: addu  v0, zero, zero
+// 0x0103c814: 0x103c814: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103c808: 0x103c808: addiu a0, sp, 16
+// 0x0103c818: 0x103c818: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0103c80c: 0x103c80c: j	 0x103c820 addiu v1, sp, 1120
+// 0x0103c81c: 0x103c81c: j	 0x103c830 addiu v1, sp, 1120
 	ldloc.0
 	ldc.i4 1120
 	add
 	stloc 8
-	br L_103c820
+	br L_103c830
 // --- basic block ---
-L_103c814:
-// 0x0103c814: 0x103c814: lbu   a1, 0(a3)
+L_103c824:
+// 0x0103c824: 0x103c824: lbu   a1, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x0103c818: 0x103c818: addiu v0, v0, 1
+// 0x0103c828: 0x103c828: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0103c81c: 0x103c81c: sb    a1, 0(a2)
+// 0x0103c82c: 0x103c82c: sb    a1, 0(a2)
 	ldloc.3
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_103c820:
-// 0x0103c820: 0x103c820: sltiu a1, v0, 1080
+L_103c830:
+// 0x0103c830: 0x103c830: sltiu a1, v0, 1080
 	ldloc 5
 	ldc.i4 1080
 	clt.un
 	stloc.2
-// 0x0103c824: 0x103c824: addu  a3, v1, v0
+// 0x0103c834: 0x103c834: addu  a3, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 4
-// 0x0103c828: 0x103c828: bne   a1, zero, 0x103c814 addu  a2, a0, v0
+// 0x0103c838: 0x103c838: bne   a1, zero, 0x103c824 addu  a2, a0, v0
 	ldloc.2
 	ldloc.1
 	ldloc 5
 	add
 	stloc.3
-	brtrue L_103c814
+	brtrue L_103c824
 // --- basic block ---
-// 0x0103c830: 0x103c830: lw    a0, 1104(sp)
+// 0x0103c840: 0x103c840: lw    a0, 1104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5560,7 +5560,7 @@ L_103c820:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103c834: 0x103c834: lw    a1, 1108(sp)
+// 0x0103c844: 0x103c844: lw    a1, 1108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5569,7 +5569,7 @@ L_103c820:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103c838: 0x103c838: lw    a2, 1112(sp)
+// 0x0103c848: 0x103c848: lw    a2, 1112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5578,7 +5578,7 @@ L_103c820:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103c83c: 0x103c83c: lw    a3, 1116(sp)
+// 0x0103c84c: 0x103c84c: lw    a3, 1116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5587,30 +5587,30 @@ L_103c820:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103c840: 0x103c840: jal   0x103e1d4 sll   zero, zero, 0
+// 0x0103c850: 0x103c850: jal   0x103e1e4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_address_add_103e1d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_address_add_103e1e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103c848: 0x103c848: sw    zero, 0(s3)
+// 0x0103c858: 0x103c858: sw    zero, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_103c84c:
-// 0x0103c84c: 0x103c84c: lw    ra, 2220(sp)
-// 0x0103c850: 0x103c850: addu  v0, s0, zero
+L_103c85c:
+// 0x0103c85c: 0x103c85c: lw    ra, 2220(sp)
+// 0x0103c860: 0x103c860: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0103c854: 0x103c854: lw    s4, 2216(sp)
+// 0x0103c864: 0x103c864: lw    s4, 2216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5619,7 +5619,7 @@ L_103c84c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103c858: 0x103c858: lw    s3, 2212(sp)
+// 0x0103c868: 0x103c868: lw    s3, 2212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5628,7 +5628,7 @@ L_103c84c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103c85c: 0x103c85c: lw    s2, 2208(sp)
+// 0x0103c86c: 0x103c86c: lw    s2, 2208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5637,7 +5637,7 @@ L_103c84c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103c860: 0x103c860: lw    s1, 2204(sp)
+// 0x0103c870: 0x103c870: lw    s1, 2204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5646,7 +5646,7 @@ L_103c84c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c864: 0x103c864: lw    s0, 2200(sp)
+// 0x0103c874: 0x103c874: lw    s0, 2200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5655,7 +5655,7 @@ L_103c84c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103c868: 0x103c868: jr    ra addiu sp, sp, 2224
+// 0x0103c878: 0x103c878: jr    ra addiu sp, sp, 2224
 	ldloc.0
 	ldc.i4 2224
 	add
@@ -5667,7 +5667,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_result_container_103c870(int32,int32,int32,int32,int32)
+.method public static int32 get_result_container_103c880(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5708,12 +5708,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c870: 0x103c870: addiu sp, sp, -48
+// 0x0103c880: 0x103c880: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103c874: 0x103c874: sw    s1, 40(sp)
+// 0x0103c884: 0x103c884: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5722,20 +5722,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c878: 0x103c878: lui   s1, 0x60000
+// 0x0103c888: 0x103c888: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0103c87c: 0x103c87c: lw    v0, -12156(s1)
+// 0x0103c88c: 0x103c88c: lw    v0, -11692(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3039
+	ldc.i4 -2923
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103c880: 0x103c880: sw    ra, 44(sp)
-// 0x0103c884: 0x103c884: bne   v0, zero, 0x103c900 sw    s0, 36(sp)
+// 0x0103c890: 0x103c890: sw    ra, 44(sp)
+// 0x0103c894: 0x103c894: bne   v0, zero, 0x103c910 sw    s0, 36(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5745,26 +5745,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_103c900
+	brtrue L_103c910
 // --- basic block ---
-// 0x0103c88c: 0x103c88c: lui   a0, 0x10000
+// 0x0103c89c: 0x103c89c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103c890: 0x103c890: addiu a3, zero, -1
+// 0x0103c8a0: 0x103c8a0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0103c894: 0x103c894: addiu a0, a0, -7584
+// 0x0103c8a4: 0x103c8a4: addiu a0, a0, -7588
 	ldloc.1
-	ldc.i4 -7584
+	ldc.i4 -7588
 	add
 	stloc.1
-// 0x0103c898: 0x103c898: addu  a1, zero, zero
+// 0x0103c8a8: 0x103c8a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103c89c: 0x103c89c: addiu a2, zero, -1
+// 0x0103c8ac: 0x103c8ac: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0103c8a0: 0x103c8a0: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0103c8b0: 0x103c8b0: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5778,46 +5778,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c8a8: 0x103c8a8: addu  a0, v0, zero
+// 0x0103c8b8: 0x103c8b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103c8ac: 0x103c8ac: addu  a1, zero, zero
+// 0x0103c8bc: 0x103c8bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103c8b0: 0x103c8b0: addu  a2, zero, zero
+// 0x0103c8c0: 0x103c8c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103c8b4: 0x103c8b4: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0103c8c4: 0x103c8c4: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0103c8bc: 0x103c8bc: lui   a0, 0x10000
+// 0x0103c8cc: 0x103c8cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103c8c0: 0x103c8c0: addiu a2, zero, -2
+// 0x0103c8d0: 0x103c8d0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0103c8c4: 0x103c8c4: addiu a3, zero, 31
+// 0x0103c8d4: 0x103c8d4: addiu a3, zero, 31
 	ldc.i4.s 31
 	stloc 4
-// 0x0103c8c8: 0x103c8c8: addiu a0, a0, -7544
+// 0x0103c8d8: 0x103c8d8: addiu a0, a0, -7548
 	ldloc.1
-	ldc.i4 -7544
+	ldc.i4 -7548
 	add
 	stloc.1
-// 0x0103c8cc: 0x103c8cc: addiu a1, zero, -2
+// 0x0103c8dc: 0x103c8dc: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x0103c8d0: 0x103c8d0: sw    zero, 16(sp)
+// 0x0103c8e0: 0x103c8e0: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5826,7 +5826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103c8d4: 0x103c8d4: jal   0x1092750 sw    zero, 20(sp)
+// 0x0103c8e4: 0x103c8e4: jal   0x1092d74 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5840,18 +5840,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_new_1092750(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c8dc: 0x103c8dc: addu  a0, v0, zero
+// 0x0103c8ec: 0x103c8ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103c8e0: 0x103c8e0: addiu a1, zero, 50
+// 0x0103c8f0: 0x103c8f0: addiu a1, zero, 50
 	ldc.i4.s 50
 	stloc.2
-// 0x0103c8e4: 0x103c8e4: jal   0x1091748 sw    v0, 24(sp)
+// 0x0103c8f4: 0x103c8f4: jal   0x1091d6c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5865,12 +5865,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c8ec: 0x103c8ec: lw    v0, 24(sp)
+// 0x0103c8fc: 0x103c8fc: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5879,43 +5879,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103c8f0: 0x103c8f0: addu  a0, s0, zero
+// 0x0103c900: 0x103c900: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103c8f4: 0x103c8f4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0103c904: 0x103c904: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c8fc: 0x103c8fc: sw    s0, -12156(s1)
+// 0x0103c90c: 0x103c90c: sw    s0, -11692(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3039
+	ldc.i4 -2923
 	add
 	ldloc 8
 	stelem.i4
-L_103c900:
-// 0x0103c900: 0x103c900: lw    ra, 44(sp)
-// 0x0103c904: 0x103c904: lui   v0, 0x60000
+L_103c910:
+// 0x0103c910: 0x103c910: lw    ra, 44(sp)
+// 0x0103c914: 0x103c914: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103c908: 0x103c908: lw    v0, -12156(v0)
+// 0x0103c918: 0x103c918: lw    v0, -11692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3039
+	ldc.i4 -2923
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103c90c: 0x103c90c: lw    s1, 40(sp)
+// 0x0103c91c: 0x103c91c: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5924,7 +5924,7 @@ L_103c900:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c910: 0x103c910: lw    s0, 36(sp)
+// 0x0103c920: 0x103c920: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5933,7 +5933,7 @@ L_103c900:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103c914: 0x103c914: jr    ra addiu sp, sp, 48
+// 0x0103c924: 0x103c924: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5945,7 +5945,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 address_search_dlg_show_103c91c(int32,int32,int32,int32,int32)
+.method public static int32 address_search_dlg_show_103c92c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5986,13 +5986,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c91c: 0x103c91c: addiu sp, sp, -64
+// 0x0103c92c: 0x103c92c: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0103c920: 0x103c920: sw    ra, 60(sp)
-// 0x0103c924: 0x103c924: sw    s1, 56(sp)
+// 0x0103c930: 0x103c930: sw    ra, 60(sp)
+// 0x0103c934: 0x103c934: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6001,7 +6001,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c928: 0x103c928: sw    s0, 52(sp)
+// 0x0103c938: 0x103c938: sw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6010,10 +6010,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103c92c: 0x103c92c: addu  s1, a0, zero
+// 0x0103c93c: 0x103c93c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103c930: 0x103c930: jal   0x103c870 addu  s0, a1, zero
+// 0x0103c940: 0x103c940: jal   0x103c880 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -6021,12 +6021,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::get_result_container_103c870(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::get_result_container_103c880(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103c938: 0x103c938: sw    v0, 20(sp)
+// 0x0103c948: 0x103c948: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6035,15 +6035,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103c93c: 0x103c93c: lui   v0, 0x1040000
+// 0x0103c94c: 0x103c94c: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 6
-// 0x0103c940: 0x103c940: addiu v0, v0, -13784
+// 0x0103c950: 0x103c950: addiu v0, v0, -13768
 	ldloc 6
-	ldc.i4 -13784
+	ldc.i4 -13768
 	add
 	stloc 6
-// 0x0103c944: 0x103c944: sw    v0, 28(sp)
+// 0x0103c954: 0x103c954: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6052,50 +6052,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103c948: 0x103c948: lui   a1, 0x10000
+// 0x0103c958: 0x103c958: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c94c: 0x103c94c: lui   a2, 0x10000
+// 0x0103c95c: 0x103c95c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c950: 0x103c950: lui   a3, 0x1040000
+// 0x0103c960: 0x103c960: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x0103c954: 0x103c954: lui   v1, 0x1040000
+// 0x0103c964: 0x103c964: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 7
-// 0x0103c958: 0x103c958: lui   v0, 0x1040000
+// 0x0103c968: 0x103c968: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 6
-// 0x0103c95c: 0x103c95c: addiu v1, v1, -11908
+// 0x0103c96c: 0x103c96c: addiu v1, v1, -11892
 	ldloc 7
-	ldc.i4 -11908
+	ldc.i4 -11892
 	add
 	stloc 7
-// 0x0103c960: 0x103c960: addiu v0, v0, -14052
+// 0x0103c970: 0x103c970: addiu v0, v0, -14036
 	ldloc 6
-	ldc.i4 -14052
+	ldc.i4 -14036
 	add
 	stloc 6
-// 0x0103c964: 0x103c964: addiu a1, a1, -7496
+// 0x0103c974: 0x103c974: addiu a1, a1, -7500
 	ldloc.2
-	ldc.i4 -7496
+	ldc.i4 -7500
 	add
 	stloc.2
-// 0x0103c968: 0x103c968: addiu a2, a2, -18380
+// 0x0103c978: 0x103c978: addiu a2, a2, -18380
 	ldloc.3
 	ldc.i4 -18380
 	add
 	stloc.3
-// 0x0103c96c: 0x103c96c: addiu a3, a3, -11844
+// 0x0103c97c: 0x103c97c: addiu a3, a3, -11828
 	ldloc 4
-	ldc.i4 -11844
+	ldc.i4 -11828
 	add
 	stloc 4
-// 0x0103c970: 0x103c970: addu  a0, zero, zero
+// 0x0103c980: 0x103c980: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103c974: 0x103c974: sw    s1, 24(sp)
+// 0x0103c984: 0x103c984: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6104,7 +6104,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c978: 0x103c978: sw    s0, 36(sp)
+// 0x0103c988: 0x103c988: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6113,7 +6113,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103c97c: 0x103c97c: sw    v1, 16(sp)
+// 0x0103c98c: 0x103c98c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6122,7 +6122,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103c980: 0x103c980: sw    v0, 32(sp)
+// 0x0103c990: 0x103c990: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6131,7 +6131,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103c984: 0x103c984: jal   0x103de44 sw    zero, 40(sp)
+// 0x0103c994: 0x103c994: jal   0x103de54 sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6145,13 +6145,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_show_103de44(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_show_103de54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103c98c: 0x103c98c: lw    ra, 60(sp)
-// 0x0103c990: 0x103c990: lw    s1, 56(sp)
+// 0x0103c99c: 0x103c99c: lw    ra, 60(sp)
+// 0x0103c9a0: 0x103c9a0: lw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6160,7 +6160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103c994: 0x103c994: lw    s0, 52(sp)
+// 0x0103c9a4: 0x103c9a4: lw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6169,7 +6169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103c998: 0x103c998: jr    ra addiu sp, sp, 64
+// 0x0103c9a8: 0x103c9a8: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -6181,7 +6181,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 address_search_dlg_show_auto_103c9a0(int32,int32,int32,int32,int32)
+.method public static int32 address_search_dlg_show_auto_103c9b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -6222,13 +6222,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103c9a0: 0x103c9a0: addiu sp, sp, -64
+// 0x0103c9b0: 0x103c9b0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0103c9a4: 0x103c9a4: sw    ra, 60(sp)
-// 0x0103c9a8: 0x103c9a8: sw    s1, 56(sp)
+// 0x0103c9b4: 0x103c9b4: sw    ra, 60(sp)
+// 0x0103c9b8: 0x103c9b8: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6237,7 +6237,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103c9ac: 0x103c9ac: sw    s0, 52(sp)
+// 0x0103c9bc: 0x103c9bc: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6246,10 +6246,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103c9b0: 0x103c9b0: addu  s1, a0, zero
+// 0x0103c9c0: 0x103c9c0: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103c9b4: 0x103c9b4: jal   0x103c870 addu  s0, a1, zero
+// 0x0103c9c4: 0x103c9c4: jal   0x103c880 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.0
@@ -6257,12 +6257,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::get_result_container_103c870(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::get_result_container_103c880(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103c9bc: 0x103c9bc: sw    v0, 20(sp)
+// 0x0103c9cc: 0x103c9cc: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6271,15 +6271,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c9c0: 0x103c9c0: lui   v0, 0x1040000
+// 0x0103c9d0: 0x103c9d0: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103c9c4: 0x103c9c4: addiu v0, v0, -13784
+// 0x0103c9d4: 0x103c9d4: addiu v0, v0, -13768
 	ldloc 5
-	ldc.i4 -13784
+	ldc.i4 -13768
 	add
 	stloc 5
-// 0x0103c9c8: 0x103c9c8: sw    v0, 28(sp)
+// 0x0103c9d8: 0x103c9d8: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6288,27 +6288,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c9cc: 0x103c9cc: lui   v0, 0x1040000
+// 0x0103c9dc: 0x103c9dc: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103c9d0: 0x103c9d0: addiu v0, v0, -14052
+// 0x0103c9e0: 0x103c9e0: addiu v0, v0, -14036
 	ldloc 5
-	ldc.i4 -14052
+	ldc.i4 -14036
 	add
 	stloc 5
-// 0x0103c9d4: 0x103c9d4: lui   a1, 0x10000
+// 0x0103c9e4: 0x103c9e4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103c9d8: 0x103c9d8: lui   a2, 0x10000
+// 0x0103c9e8: 0x103c9e8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103c9dc: 0x103c9dc: lui   a3, 0x1040000
+// 0x0103c9ec: 0x103c9ec: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x0103c9e0: 0x103c9e0: lui   v1, 0x1040000
+// 0x0103c9f0: 0x103c9f0: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 7
-// 0x0103c9e4: 0x103c9e4: sw    v0, 32(sp)
+// 0x0103c9f4: 0x103c9f4: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6317,33 +6317,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103c9e8: 0x103c9e8: addiu v1, v1, -11908
+// 0x0103c9f8: 0x103c9f8: addiu v1, v1, -11892
 	ldloc 7
-	ldc.i4 -11908
+	ldc.i4 -11892
 	add
 	stloc 7
-// 0x0103c9ec: 0x103c9ec: addiu v0, zero, 1
+// 0x0103c9fc: 0x103c9fc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103c9f0: 0x103c9f0: addiu a1, a1, -7496
+// 0x0103ca00: 0x103ca00: addiu a1, a1, -7500
 	ldloc.2
-	ldc.i4 -7496
+	ldc.i4 -7500
 	add
 	stloc.2
-// 0x0103c9f4: 0x103c9f4: addiu a2, a2, -18380
+// 0x0103ca04: 0x103ca04: addiu a2, a2, -18380
 	ldloc.3
 	ldc.i4 -18380
 	add
 	stloc.3
-// 0x0103c9f8: 0x103c9f8: addiu a3, a3, -11844
+// 0x0103ca08: 0x103ca08: addiu a3, a3, -11828
 	ldloc 4
-	ldc.i4 -11844
+	ldc.i4 -11828
 	add
 	stloc 4
-// 0x0103c9fc: 0x103c9fc: addu  a0, zero, zero
+// 0x0103ca0c: 0x103ca0c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103ca00: 0x103ca00: sw    s1, 24(sp)
+// 0x0103ca10: 0x103ca10: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6352,7 +6352,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103ca04: 0x103ca04: sw    s0, 36(sp)
+// 0x0103ca14: 0x103ca14: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6361,7 +6361,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ca08: 0x103ca08: sw    v1, 16(sp)
+// 0x0103ca18: 0x103ca18: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6370,7 +6370,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103ca0c: 0x103ca0c: jal   0x103de44 sw    v0, 40(sp)
+// 0x0103ca1c: 0x103ca1c: jal   0x103de54 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6384,13 +6384,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_show_103de44(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_show_103de54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ca14: 0x103ca14: lw    ra, 60(sp)
-// 0x0103ca18: 0x103ca18: lw    s1, 56(sp)
+// 0x0103ca24: 0x103ca24: lw    ra, 60(sp)
+// 0x0103ca28: 0x103ca28: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6399,7 +6399,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103ca1c: 0x103ca1c: lw    s0, 52(sp)
+// 0x0103ca2c: 0x103ca2c: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6408,7 +6408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103ca20: 0x103ca20: jr    ra addiu sp, sp, 64
+// 0x0103ca30: 0x103ca30: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -6420,7 +6420,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_search_103ca28(int32,int32,int32,int32,int32)
+.method public static int32 on_search_103ca38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32 s1,int32[] mem,int32 ra)
@@ -6461,21 +6461,21 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ca28: 0x103ca28: lui   a0, 0x10000
+// 0x0103ca38: 0x103ca38: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ca2c: 0x103ca2c: addiu sp, sp, -32
+// 0x0103ca3c: 0x103ca3c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103ca30: 0x103ca30: addiu a0, a0, -7472
+// 0x0103ca40: 0x103ca40: addiu a0, a0, -7476
 	ldloc.1
-	ldc.i4 -7472
+	ldc.i4 -7476
 	add
 	stloc.1
-// 0x0103ca34: 0x103ca34: sw    ra, 28(sp)
-// 0x0103ca38: 0x103ca38: sw    s1, 24(sp)
+// 0x0103ca44: 0x103ca44: sw    ra, 28(sp)
+// 0x0103ca48: 0x103ca48: sw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6484,7 +6484,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ca3c: 0x103ca3c: jal   0x101cd60 sw    s0, 20(sp)
+// 0x0103ca4c: 0x103ca4c: jal   0x101cd70 sw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6498,12 +6498,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ca44: 0x103ca44: jal   0x103da30 addu  a0, zero, zero
+// 0x0103ca54: 0x103ca54: jal   0x103da40 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6511,15 +6511,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da30(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ca4c: 0x103ca4c: addu  a0, zero, zero
+// 0x0103ca5c: 0x103ca5c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103ca50: 0x103ca50: jal   0x103db24 addu  s1, v0, zero
+// 0x0103ca60: 0x103ca60: jal   0x103db34 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6527,15 +6527,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db24(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ca58: 0x103ca58: addu  a0, v0, zero
+// 0x0103ca68: 0x103ca68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103ca5c: 0x103ca5c: jal   0x1097c00 addu  s0, v0, zero
+// 0x0103ca6c: 0x103ca6c: jal   0x1098248 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -6543,20 +6543,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ca64: 0x103ca64: lui   a0, 0x10000
+// 0x0103ca74: 0x103ca74: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ca68: 0x103ca68: addiu a0, a0, -7464
+// 0x0103ca78: 0x103ca78: addiu a0, a0, -7468
 	ldloc.1
-	ldc.i4 -7464
+	ldc.i4 -7468
 	add
 	stloc.1
-// 0x0103ca6c: 0x103ca6c: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103ca7c: 0x103ca7c: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6564,26 +6564,26 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103ca74: 0x103ca74: bne   v0, zero, 0x103ca8c sll   zero, zero, 0
+// 0x0103ca84: 0x103ca84: bne   v0, zero, 0x103ca9c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103ca8c
+	brtrue L_103ca9c
 // --- basic block ---
-// 0x0103ca7c: 0x103ca7c: jal   0x102d19c sll   zero, zero, 0
+// 0x0103ca8c: 0x103ca8c: jal   0x102d1ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_reset_debug_mode_102d19c(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_reset_debug_mode_102d1ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ca84: 0x103ca84: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103ca94: 0x103ca94: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103ca8c:
-// 0x0103ca8c: 0x103ca8c: jal   0x1097c00 addu  a0, s0, zero
+L_103ca9c:
+// 0x0103ca9c: 0x103ca9c: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6591,20 +6591,20 @@ L_103ca8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ca94: 0x103ca94: lui   a0, 0x10000
+// 0x0103caa4: 0x103caa4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ca98: 0x103ca98: addiu a0, a0, -7456
+// 0x0103caa8: 0x103caa8: addiu a0, a0, -7460
 	ldloc.1
-	ldc.i4 -7456
+	ldc.i4 -7460
 	add
 	stloc.1
-// 0x0103ca9c: 0x103ca9c: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103caac: 0x103caac: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6612,26 +6612,26 @@ L_103ca8c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103caa4: 0x103caa4: bne   v0, zero, 0x103cabc sll   zero, zero, 0
+// 0x0103cab4: 0x103cab4: bne   v0, zero, 0x103cacc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103cabc
+	brtrue L_103cacc
 // --- basic block ---
-// 0x0103caac: 0x103caac: jal   0x1032304 sll   zero, zero, 0
+// 0x0103cabc: 0x103cabc: jal   0x1032314 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_reset_show_coordinates_1032304(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_reset_show_coordinates_1032314(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cab4: 0x103cab4: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103cac4: 0x103cac4: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103cabc:
-// 0x0103cabc: 0x103cabc: jal   0x1097c00 addu  a0, s0, zero
+L_103cacc:
+// 0x0103cacc: 0x103cacc: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6639,20 +6639,20 @@ L_103cabc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cac4: 0x103cac4: lui   a0, 0x10000
+// 0x0103cad4: 0x103cad4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cac8: 0x103cac8: addiu a0, a0, -7444
+// 0x0103cad8: 0x103cad8: addiu a0, a0, -7448
 	ldloc.1
-	ldc.i4 -7444
+	ldc.i4 -7448
 	add
 	stloc.1
-// 0x0103cacc: 0x103cacc: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103cadc: 0x103cadc: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6660,11 +6660,11 @@ L_103cabc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103cad4: 0x103cad4: bne   v0, zero, 0x103caec sll   zero, zero, 0
+// 0x0103cae4: 0x103cae4: bne   v0, zero, 0x103cafc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103caec
+	brtrue L_103cafc
 // --- basic block ---
-// 0x0103cadc: 0x103cadc: jal   0x10aad48 addu  a0, zero, zero
+// 0x0103caec: 0x103caec: jal   0x10ab390 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6672,16 +6672,16 @@ L_103cabc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::roadmap_geo_config_il_10aad48(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::roadmap_geo_config_il_10ab390(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cae4: 0x103cae4: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103caf4: 0x103caf4: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103caec:
-// 0x0103caec: 0x103caec: jal   0x1097c00 addu  a0, s0, zero
+L_103cafc:
+// 0x0103cafc: 0x103cafc: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6689,20 +6689,20 @@ L_103caec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103caf4: 0x103caf4: lui   a0, 0x10000
+// 0x0103cb04: 0x103cb04: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103caf8: 0x103caf8: addiu a0, a0, -7436
+// 0x0103cb08: 0x103cb08: addiu a0, a0, -7440
 	ldloc.1
-	ldc.i4 -7436
+	ldc.i4 -7440
 	add
 	stloc.1
-// 0x0103cafc: 0x103cafc: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103cb0c: 0x103cb0c: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6710,11 +6710,11 @@ L_103caec:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103cb04: 0x103cb04: bne   v0, zero, 0x103cb1c sll   zero, zero, 0
+// 0x0103cb14: 0x103cb14: bne   v0, zero, 0x103cb2c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103cb1c
+	brtrue L_103cb2c
 // --- basic block ---
-// 0x0103cb0c: 0x103cb0c: jal   0x10aacd8 addu  a0, zero, zero
+// 0x0103cb1c: 0x103cb1c: jal   0x10ab320 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6722,16 +6722,16 @@ L_103caec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_usa_10aacd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_usa_10ab320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cb14: 0x103cb14: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103cb24: 0x103cb24: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103cb1c:
-// 0x0103cb1c: 0x103cb1c: jal   0x1097c00 addu  a0, s0, zero
+L_103cb2c:
+// 0x0103cb2c: 0x103cb2c: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6739,20 +6739,20 @@ L_103cb1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cb24: 0x103cb24: lui   a0, 0x10000
+// 0x0103cb34: 0x103cb34: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cb28: 0x103cb28: addiu a0, a0, -7428
+// 0x0103cb38: 0x103cb38: addiu a0, a0, -7432
 	ldloc.1
-	ldc.i4 -7428
+	ldc.i4 -7432
 	add
 	stloc.1
-// 0x0103cb2c: 0x103cb2c: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103cb3c: 0x103cb3c: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6760,11 +6760,11 @@ L_103cb1c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103cb34: 0x103cb34: bne   v0, zero, 0x103cb4c sll   zero, zero, 0
+// 0x0103cb44: 0x103cb44: bne   v0, zero, 0x103cb5c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103cb4c
+	brtrue L_103cb5c
 // --- basic block ---
-// 0x0103cb3c: 0x103cb3c: jal   0x10aac18 addu  a0, zero, zero
+// 0x0103cb4c: 0x103cb4c: jal   0x10ab260 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6772,16 +6772,16 @@ L_103cb1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_other_10aac18(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_other_10ab260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cb44: 0x103cb44: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103cb54: 0x103cb54: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103cb4c:
-// 0x0103cb4c: 0x103cb4c: jal   0x1097c00 addu  a0, s0, zero
+L_103cb5c:
+// 0x0103cb5c: 0x103cb5c: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6789,20 +6789,20 @@ L_103cb4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cb54: 0x103cb54: lui   a0, 0x10000
+// 0x0103cb64: 0x103cb64: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cb58: 0x103cb58: addiu a0, a0, -7416
+// 0x0103cb68: 0x103cb68: addiu a0, a0, -7420
 	ldloc.1
-	ldc.i4 -7416
+	ldc.i4 -7420
 	add
 	stloc.1
-// 0x0103cb5c: 0x103cb5c: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103cb6c: 0x103cb6c: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6810,11 +6810,11 @@ L_103cb4c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103cb64: 0x103cb64: bne   v0, zero, 0x103cb7c sll   zero, zero, 0
+// 0x0103cb74: 0x103cb74: bne   v0, zero, 0x103cb8c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103cb7c
+	brtrue L_103cb8c
 // --- basic block ---
-// 0x0103cb6c: 0x103cb6c: jal   0x10aac78 addu  a0, zero, zero
+// 0x0103cb7c: 0x103cb7c: jal   0x10ab2c0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6822,16 +6822,16 @@ L_103cb4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_stg_10aac78(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_stg_10ab2c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cb74: 0x103cb74: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103cb84: 0x103cb84: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103cb7c:
-// 0x0103cb7c: 0x103cb7c: jal   0x1097c00 addu  a0, s0, zero
+L_103cb8c:
+// 0x0103cb8c: 0x103cb8c: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6839,20 +6839,20 @@ L_103cb7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cb84: 0x103cb84: lui   a0, 0x10000
+// 0x0103cb94: 0x103cb94: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cb88: 0x103cb88: addiu a0, a0, -7408
+// 0x0103cb98: 0x103cb98: addiu a0, a0, -7412
 	ldloc.1
-	ldc.i4 -7408
+	ldc.i4 -7412
 	add
 	stloc.1
-// 0x0103cb8c: 0x103cb8c: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103cb9c: 0x103cb9c: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6860,18 +6860,18 @@ L_103cb7c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103cb94: 0x103cb94: bne   v0, zero, 0x103cbbc lui   a0, 0x10000
+// 0x0103cba4: 0x103cba4: bne   v0, zero, 0x103cbcc lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103cbbc
+	brtrue L_103cbcc
 // --- basic block ---
-// 0x0103cb9c: 0x103cb9c: addiu a0, a0, -7400
+// 0x0103cbac: 0x103cbac: addiu a0, a0, -7404
 	ldloc.1
-	ldc.i4 -7400
+	ldc.i4 -7404
 	add
 	stloc.1
-// 0x0103cba0: 0x103cba0: jal   0x101da7c addu  a1, zero, zero
+// 0x0103cbb0: 0x103cbb0: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6879,31 +6879,31 @@ L_103cb7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cba8: 0x103cba8: lui   a0, 0x10000
+// 0x0103cbb8: 0x103cbb8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cbac: 0x103cbac: lui   a1, 0x10000
+// 0x0103cbbc: 0x103cbbc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103cbb0: 0x103cbb0: addiu a0, a0, 18500
+// 0x0103cbc0: 0x103cbc0: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0103cbb4: 0x103cbb4: j	 0x103cc3c addiu a1, a1, -7396
+// 0x0103cbc4: 0x103cbc4: j	 0x103cc4c addiu a1, a1, -7400
 	ldloc.2
-	ldc.i4 -7396
+	ldc.i4 -7400
 	add
 	stloc.2
-	br L_103cc3c
+	br L_103cc4c
 // --- basic block ---
-L_103cbbc:
-// 0x0103cbbc: 0x103cbbc: jal   0x1097c00 addu  a0, s0, zero
+L_103cbcc:
+// 0x0103cbcc: 0x103cbcc: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6911,20 +6911,20 @@ L_103cbbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cbc4: 0x103cbc4: lui   a0, 0x10000
+// 0x0103cbd4: 0x103cbd4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cbc8: 0x103cbc8: addiu a0, a0, -7348
+// 0x0103cbd8: 0x103cbd8: addiu a0, a0, -7352
 	ldloc.1
-	ldc.i4 -7348
+	ldc.i4 -7352
 	add
 	stloc.1
-// 0x0103cbcc: 0x103cbcc: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103cbdc: 0x103cbdc: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -6932,18 +6932,18 @@ L_103cbbc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103cbd4: 0x103cbd4: bne   v0, zero, 0x103cbfc lui   a0, 0x10000
+// 0x0103cbe4: 0x103cbe4: bne   v0, zero, 0x103cc0c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103cbfc
+	brtrue L_103cc0c
 // --- basic block ---
-// 0x0103cbdc: 0x103cbdc: addiu a0, a0, -30220
+// 0x0103cbec: 0x103cbec: addiu a0, a0, -30220
 	ldloc.1
 	ldc.i4 -30220
 	add
 	stloc.1
-// 0x0103cbe0: 0x103cbe0: jal   0x101da7c addu  a1, zero, zero
+// 0x0103cbf0: 0x103cbf0: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6951,31 +6951,31 @@ L_103cbbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cbe8: 0x103cbe8: lui   a0, 0x10000
+// 0x0103cbf8: 0x103cbf8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cbec: 0x103cbec: lui   a1, 0x10000
+// 0x0103cbfc: 0x103cbfc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103cbf0: 0x103cbf0: addiu a0, a0, 18500
+// 0x0103cc00: 0x103cc00: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0103cbf4: 0x103cbf4: j	 0x103cc3c addiu a1, a1, -7340
+// 0x0103cc04: 0x103cc04: j	 0x103cc4c addiu a1, a1, -7344
 	ldloc.2
-	ldc.i4 -7340
+	ldc.i4 -7344
 	add
 	stloc.2
-	br L_103cc3c
+	br L_103cc4c
 // --- basic block ---
-L_103cbfc:
-// 0x0103cbfc: 0x103cbfc: jal   0x1097c00 addu  a0, s0, zero
+L_103cc0c:
+// 0x0103cc0c: 0x103cc0c: jal   0x1098248 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -6983,20 +6983,20 @@ L_103cbfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cc04: 0x103cc04: lui   a0, 0x10000
+// 0x0103cc14: 0x103cc14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cc08: 0x103cc08: addiu a0, a0, -7288
+// 0x0103cc18: 0x103cc18: addiu a0, a0, -7292
 	ldloc.1
-	ldc.i4 -7288
+	ldc.i4 -7292
 	add
 	stloc.1
-// 0x0103cc0c: 0x103cc0c: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103cc1c: 0x103cc1c: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -7004,21 +7004,21 @@ L_103cbfc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103cc14: 0x103cc14: bne   v0, zero, 0x103cc4c addiu v1, zero, 1
+// 0x0103cc24: 0x103cc24: bne   v0, zero, 0x103cc5c addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_103cc4c
+	brtrue L_103cc5c
 // --- basic block ---
-// 0x0103cc1c: 0x103cc1c: lui   a0, 0x10000
+// 0x0103cc2c: 0x103cc2c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cc20: 0x103cc20: addiu a0, a0, -7280
+// 0x0103cc30: 0x103cc30: addiu a0, a0, -7284
 	ldloc.1
-	ldc.i4 -7280
+	ldc.i4 -7284
 	add
 	stloc.1
-// 0x0103cc24: 0x103cc24: jal   0x101da7c addu  a1, zero, zero
+// 0x0103cc34: 0x103cc34: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7026,55 +7026,55 @@ L_103cbfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cc2c: 0x103cc2c: lui   a0, 0x10000
+// 0x0103cc3c: 0x103cc3c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cc30: 0x103cc30: lui   a1, 0x10000
+// 0x0103cc40: 0x103cc40: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103cc34: 0x103cc34: addiu a0, a0, 18500
+// 0x0103cc44: 0x103cc44: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0103cc38: 0x103cc38: addiu a1, a1, -7272
+// 0x0103cc48: 0x103cc48: addiu a1, a1, -7276
 	ldloc.2
-	ldc.i4 -7272
+	ldc.i4 -7276
 	add
 	stloc.2
-L_103cc3c:
-// 0x0103cc3c: 0x103cc3c: jal   0x104c148 sll   zero, zero, 0
+L_103cc4c:
+// 0x0103cc4c: 0x103cc4c: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cc44: 0x103cc44: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103cc54: 0x103cc54: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103cc4c:
-// 0x0103cc4c: 0x103cc4c: addu  a0, s0, zero
+L_103cc5c:
+// 0x0103cc5c: 0x103cc5c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103cc50: 0x103cc50: lui   v0, 0x60000
+// 0x0103cc60: 0x103cc60: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103cc54: 0x103cc54: jal   0x1097c00 sw    v1, -12152(v0)
+// 0x0103cc64: 0x103cc64: jal   0x1098248 sw    v1, -11688(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3038
+	ldc.i4 -2922
 	add
 	ldloc 6
 	stelem.i4
@@ -7083,12 +7083,12 @@ L_103cc4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cc5c: 0x103cc5c: lw    a0, 116(s1)
+// 0x0103cc6c: 0x103cc6c: lw    a0, 116(s1)
 	ldloc 9
 	ldloc 8
 	ldc.i4.2
@@ -7097,15 +7097,15 @@ L_103cc4c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103cc60: 0x103cc60: lui   a1, 0x1040000
+// 0x0103cc70: 0x103cc70: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x0103cc64: 0x103cc64: addiu a1, a1, -13004
+// 0x0103cc74: 0x103cc74: addiu a1, a1, -12988
 	ldloc.2
-	ldc.i4 -13004
+	ldc.i4 -12988
 	add
 	stloc.2
-// 0x0103cc68: 0x103cc68: jal   0x103c140 addu  a2, v0, zero
+// 0x0103cc78: 0x103cc78: jal   0x103c150 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -7113,18 +7113,18 @@ L_103cc4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::address_search_resolve_address_103c140(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::address_search_resolve_address_103c150(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cc70: 0x103cc70: bne   v0, zero, 0x103cca0 lui   s1, 0x10000
+// 0x0103cc80: 0x103cc80: bne   v0, zero, 0x103ccb0 lui   s1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brtrue L_103cca0
+	brtrue L_103ccb0
 // --- basic block ---
-// 0x0103cc78: 0x103cc78: jal   0x1050ad4 addiu a0, zero, 2
+// 0x0103cc88: 0x103cc88: jal   0x1050ae4 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -7132,28 +7132,28 @@ L_103cc4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cc80: 0x103cc80: lui   a3, 0x10000
+// 0x0103cc90: 0x103cc90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103cc84: 0x103cc84: addiu a1, s1, -7220
+// 0x0103cc94: 0x103cc94: addiu a1, s1, -7224
 	ldloc 8
-	ldc.i4 -7220
+	ldc.i4 -7224
 	add
 	stloc.2
-// 0x0103cc88: 0x103cc88: addiu a3, a3, -7172
+// 0x0103cc98: 0x103cc98: addiu a3, a3, -7176
 	ldloc 4
-	ldc.i4 -7172
+	ldc.i4 -7176
 	add
 	stloc 4
-// 0x0103cc8c: 0x103cc8c: addiu a0, zero, 1
+// 0x0103cc9c: 0x103cc9c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103cc90: 0x103cc90: jal   0x100449c addiu a2, zero, 343
+// 0x0103cca0: 0x103cca0: jal   0x100449c addiu a2, zero, 343
 	ldc.i4 343
 	stloc.3
 	ldloc.0
@@ -7166,11 +7166,11 @@ L_103cc4c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cc98: 0x103cc98: j	 0x103cd00 sll   zero, zero, 0
-	br L_103cd00
+// 0x0103cca8: 0x103cca8: j	 0x103cd10 sll   zero, zero, 0
+	br L_103cd10
 // --- basic block ---
-L_103cca0:
-// 0x0103cca0: 0x103cca0: jal   0x10ac36c addu  a0, v0, zero
+L_103ccb0:
+// 0x0103ccb0: 0x103ccb0: jal   0x10ac9b4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7178,42 +7178,42 @@ L_103cca0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cca8: 0x103cca8: lui   a3, 0x10000
+// 0x0103ccb8: 0x103ccb8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ccac: 0x103ccac: addiu a1, s1, -7220
+// 0x0103ccbc: 0x103ccbc: addiu a1, s1, -7224
 	ldloc 8
-	ldc.i4 -7220
+	ldc.i4 -7224
 	add
 	stloc.2
-// 0x0103ccb0: 0x103ccb0: addiu a2, zero, 350
+// 0x0103ccc0: 0x103ccc0: addiu a2, zero, 350
 	ldc.i4 350
 	stloc.3
-// 0x0103ccb4: 0x103ccb4: addiu a3, a3, -7088
+// 0x0103ccc4: 0x103ccc4: addiu a3, a3, -7092
 	ldloc 4
-	ldc.i4 -7088
+	ldc.i4 -7092
 	add
 	stloc 4
-// 0x0103ccb8: 0x103ccb8: addiu a0, zero, 4
+// 0x0103ccc8: 0x103ccc8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103ccbc: 0x103ccbc: addu  s0, v0, zero
+// 0x0103cccc: 0x103cccc: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0103ccc0: 0x103ccc0: lui   v0, 0x60000
+// 0x0103ccd0: 0x103ccd0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ccc4: 0x103ccc4: jal   0x100449c sw    zero, -12152(v0)
+// 0x0103ccd4: 0x103ccd4: jal   0x100449c sw    zero, -11688(v0)
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3038
+	ldc.i4 -2922
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -7227,18 +7227,18 @@ L_103cca0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cccc: 0x103cccc: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x0103ccdc: 0x103ccdc: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ccd4: 0x103ccd4: lui   a0, 0x10000
+// 0x0103cce4: 0x103cce4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ccd8: 0x103ccd8: jal   0x101cd60 addiu a0, a0, -7008
+// 0x0103cce8: 0x103cce8: jal   0x101cd70 addiu a0, a0, -7012
 	ldloc.1
-	ldc.i4 -7008
+	ldc.i4 -7012
 	add
 	stloc.1
 	ldloc.0
@@ -7246,15 +7246,15 @@ L_103cca0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103cce0: 0x103cce0: addu  a0, s0, zero
+// 0x0103ccf0: 0x103ccf0: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103cce4: 0x103cce4: jal   0x101cd60 addu  s1, v0, zero
+// 0x0103ccf4: 0x103ccf4: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -7262,23 +7262,23 @@ L_103cca0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ccec: 0x103ccec: lui   a2, 0x1040000
+// 0x0103ccfc: 0x103ccfc: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103ccf0: 0x103ccf0: addu  a0, s1, zero
+// 0x0103cd00: 0x103cd00: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103ccf4: 0x103ccf4: addu  a1, v0, zero
+// 0x0103cd04: 0x103cd04: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103ccf8: 0x103ccf8: jal   0x104c058 addiu a2, a2, -13036
+// 0x0103cd08: 0x103cd08: jal   0x104c068 addiu a2, a2, -13020
 	ldloc.3
-	ldc.i4 -13036
+	ldc.i4 -13020
 	add
 	stloc.3
 	ldloc.0
@@ -7286,14 +7286,14 @@ L_103cca0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103cd00:
-// 0x0103cd00: 0x103cd00: lw    ra, 28(sp)
-// 0x0103cd04: 0x103cd04: lw    s1, 24(sp)
+L_103cd10:
+// 0x0103cd10: 0x103cd10: lw    ra, 28(sp)
+// 0x0103cd14: 0x103cd14: lw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -7302,7 +7302,7 @@ L_103cd00:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103cd08: 0x103cd08: lw    s0, 20(sp)
+// 0x0103cd18: 0x103cd18: lw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -7311,7 +7311,7 @@ L_103cd00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103cd0c: 0x103cd0c: jr    ra addiu sp, sp, 32
+// 0x0103cd1c: 0x103cd1c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl45.j b/converted/Cibyl45.j
index 24b5cca..0baa3ad 100644
--- a/converted/Cibyl45.j
+++ b/converted/Cibyl45.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl45::.ctor
 
-.method public static int32 on_search_error_message_103cd14(int32,int32,int32,int32,int32)
+.method public static int32 on_search_error_message_103cd24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -76,26 +76,26 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103cd14: 0x103cd14: addiu sp, sp, -24
+// 0x0103cd24: 0x103cd24: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103cd18: 0x103cd18: sw    ra, 20(sp)
-// 0x0103cd1c: 0x103cd1c: jal   0x103d584 sll   zero, zero, 0
+// 0x0103cd28: 0x103cd28: sw    ra, 20(sp)
+// 0x0103cd2c: 0x103cd2c: jal   0x103d594 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_reopen_native_keyboard_103d584(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_reopen_native_keyboard_103d594(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0103cd24: 0x103cd24: lw    ra, 20(sp)
-// 0x0103cd28: 0x103cd28: sll   zero, zero, 0
-// 0x0103cd2c: 0x103cd2c: jr    ra addiu sp, sp, 24
+// 0x0103cd34: 0x103cd34: lw    ra, 20(sp)
+// 0x0103cd38: 0x103cd38: sll   zero, zero, 0
+// 0x0103cd3c: 0x103cd3c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -107,7 +107,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_address_resolved_103cd34(int32,int32,int32,int32,int32)
+.method public static int32 on_address_resolved_103cd44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s2,int32 s1,int32 s4,int32 s5,int32 s6,int32 ra,int32 t0)
@@ -166,25 +166,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103cd34: 0x103cd34: addiu sp, sp, -208
+// 0x0103cd44: 0x103cd44: addiu sp, sp, -208
 	ldloc.0
 	ldc.i4 -208
 	add
 	stloc.0
-// 0x0103cd38: 0x103cd38: lui   v0, 0x60000
+// 0x0103cd48: 0x103cd48: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103cd3c: 0x103cd3c: sw    ra, 204(sp)
-// 0x0103cd40: 0x103cd40: sw    zero, -12152(v0)
+// 0x0103cd4c: 0x103cd4c: sw    ra, 204(sp)
+// 0x0103cd50: 0x103cd50: sw    zero, -11688(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3038
+	ldc.i4 -2922
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103cd44: 0x103cd44: sw    s6, 200(sp)
+// 0x0103cd54: 0x103cd54: sw    s6, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -193,7 +193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103cd48: 0x103cd48: sw    s3, 188(sp)
+// 0x0103cd58: 0x103cd58: sw    s3, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -202,7 +202,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103cd4c: 0x103cd4c: sw    s2, 184(sp)
+// 0x0103cd5c: 0x103cd5c: sw    s2, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -211,13 +211,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103cd50: 0x103cd50: addu  s3, a0, zero
+// 0x0103cd60: 0x103cd60: addu  s3, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103cd54: 0x103cd54: addu  s2, a2, zero
+// 0x0103cd64: 0x103cd64: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0103cd58: 0x103cd58: sw    s1, 180(sp)
+// 0x0103cd68: 0x103cd68: sw    s1, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -226,7 +226,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103cd5c: 0x103cd5c: sw    s0, 176(sp)
+// 0x0103cd6c: 0x103cd6c: sw    s0, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -235,13 +235,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103cd60: 0x103cd60: addu  s1, a1, zero
+// 0x0103cd70: 0x103cd70: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0103cd64: 0x103cd64: addu  s0, a3, zero
+// 0x0103cd74: 0x103cd74: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x0103cd68: 0x103cd68: sw    s5, 196(sp)
+// 0x0103cd78: 0x103cd78: sw    s5, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -250,7 +250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103cd6c: 0x103cd6c: jal   0x104c3f0 sw    s4, 192(sp)
+// 0x0103cd7c: 0x103cd7c: jal   0x104c400 sw    s4, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -259,12 +259,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cd74: 0x103cd74: jal   0x1050ad4 addiu a0, zero, 1
+// 0x0103cd84: 0x103cd84: jal   0x1050ae4 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -272,20 +272,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cd7c: 0x103cd7c: lui   a1, 0x10000
+// 0x0103cd8c: 0x103cd8c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103cd80: 0x103cd80: addu  a0, s3, zero
+// 0x0103cd90: 0x103cd90: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0103cd84: 0x103cd84: jal   0x109b304 addiu a1, a1, -7544
+// 0x0103cd94: 0x103cd94: jal   0x109b94c addiu a1, a1, -7548
 	ldloc.2
-	ldc.i4 -7544
+	ldc.i4 -7548
 	add
 	stloc.2
 	ldloc.0
@@ -293,37 +293,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cd8c: 0x103cd8c: beq   s0, zero, 0x103ce90 addu  s6, v0, zero
+// 0x0103cd9c: 0x103cd9c: beq   s0, zero, 0x103cea0 addu  s6, v0, zero
 	ldloc 8
 	ldloc 5
 	stloc 14
-	brfalse L_103ce90
+	brfalse L_103cea0
 // --- basic block ---
-// 0x0103cd94: 0x103cd94: addiu v0, s0, -11
+// 0x0103cda4: 0x103cda4: addiu v0, s0, -11
 	ldloc 8
 	ldc.i4.s -11
 	add
 	stloc 5
-// 0x0103cd98: 0x103cd98: sltiu v0, v0, 5
+// 0x0103cda8: 0x103cda8: sltiu v0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	clt.un
 	stloc 5
-// 0x0103cd9c: 0x103cd9c: beq   v0, zero, 0x103cdd4 addiu v0, zero, 38
+// 0x0103cdac: 0x103cdac: beq   v0, zero, 0x103cde4 addiu v0, zero, 38
 	ldloc 5
 	ldc.i4.s 38
 	stloc 5
-	brfalse L_103cdd4
+	brfalse L_103cde4
 // --- basic block ---
-// 0x0103cda4: 0x103cda4: lui   a0, 0x0
+// 0x0103cdb4: 0x103cdb4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103cda8: 0x103cda8: jal   0x101cd60 addiu a0, a0, 30092
+// 0x0103cdb8: 0x103cdb8: jal   0x101cd70 addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
@@ -333,20 +333,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cdb0: 0x103cdb0: lui   a0, 0x10000
+// 0x0103cdc0: 0x103cdc0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cdb4: 0x103cdb4: addiu a0, a0, -6992
+// 0x0103cdc4: 0x103cdc4: addiu a0, a0, -6996
 	ldloc.1
-	ldc.i4 -6992
+	ldc.i4 -6996
 	add
 	stloc.1
-// 0x0103cdb8: 0x103cdb8: jal   0x101cd60 addu  s1, v0, zero
+// 0x0103cdc8: 0x103cdc8: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -354,39 +354,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cdc0: 0x103cdc0: lui   a2, 0x1040000
+// 0x0103cdd0: 0x103cdd0: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103cdc4: 0x103cdc4: addu  a0, s1, zero
+// 0x0103cdd4: 0x103cdd4: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0103cdc8: 0x103cdc8: addu  a1, v0, zero
+// 0x0103cdd8: 0x103cdd8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103cdcc: 0x103cdcc: j	 0x103ce54 addiu a2, a2, -13036
+// 0x0103cddc: 0x103cddc: j	 0x103ce64 addiu a2, a2, -13020
 	ldloc.3
-	ldc.i4 -13036
+	ldc.i4 -13020
 	add
 	stloc.3
-	br L_103ce54
+	br L_103ce64
 // --- basic block ---
-L_103cdd4:
-// 0x0103cdd4: 0x103cdd4: lui   s3, 0x0
+L_103cde4:
+// 0x0103cde4: 0x103cde4: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0103cdd8: 0x103cdd8: bne   s0, v0, 0x103ce04 lui   s1, 0x1040000
+// 0x0103cde8: 0x103cde8: bne   s0, v0, 0x103ce14 lui   s1, 0x1040000
 	ldloc 8
 	ldloc 5
 	ldc.i4 17039360
 	stloc 11
-	bne.un L_103ce04
+	bne.un L_103ce14
 // --- basic block ---
-// 0x0103cde0: 0x103cde0: jal   0x101cd60 addiu a0, s3, 30092
+// 0x0103cdf0: 0x103cdf0: jal   0x101cd70 addiu a0, s3, 30092
 	ldloc 9
 	ldc.i4 30092
 	add
@@ -396,20 +396,20 @@ L_103cdd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cde8: 0x103cde8: lui   a0, 0x10000
+// 0x0103cdf8: 0x103cdf8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cdec: 0x103cdec: addiu a0, a0, -8912
+// 0x0103cdfc: 0x103cdfc: addiu a0, a0, -8916
 	ldloc.1
-	ldc.i4 -8912
+	ldc.i4 -8916
 	add
 	stloc.1
-// 0x0103cdf0: 0x103cdf0: jal   0x101cd60 addu  s2, v0, zero
+// 0x0103ce00: 0x103ce00: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -417,26 +417,26 @@ L_103cdd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cdf8: 0x103cdf8: addu  a1, v0, zero
+// 0x0103ce08: 0x103ce08: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103cdfc: 0x103cdfc: j	 0x103ce50 addu  a0, s2, zero
+// 0x0103ce0c: 0x103ce0c: j	 0x103ce60 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-	br L_103ce50
+	br L_103ce60
 // --- basic block ---
-L_103ce04:
-// 0x0103ce04: 0x103ce04: lui   a0, 0x10000
+L_103ce14:
+// 0x0103ce14: 0x103ce14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ce08: 0x103ce08: jal   0x101cd60 addiu a0, a0, -6916
+// 0x0103ce18: 0x103ce18: jal   0x101cd70 addiu a0, a0, -6920
 	ldloc.1
-	ldc.i4 -6916
+	ldc.i4 -6920
 	add
 	stloc.1
 	ldloc.0
@@ -444,25 +444,25 @@ L_103ce04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ce10: 0x103ce10: lui   a0, 0x10000
+// 0x0103ce20: 0x103ce20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ce14: 0x103ce14: addiu a0, a0, -2068
+// 0x0103ce24: 0x103ce24: addiu a0, a0, -2072
 	ldloc.1
-	ldc.i4 -2068
+	ldc.i4 -2072
 	add
 	stloc.1
-// 0x0103ce18: 0x103ce18: addiu s2, sp, 40
+// 0x0103ce28: 0x103ce28: addiu s2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 10
-// 0x0103ce1c: 0x103ce1c: jal   0x101cd60 sw    v0, 168(sp)
+// 0x0103ce2c: 0x103ce2c: jal   0x101cd70 sw    v0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -476,12 +476,12 @@ L_103ce04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ce24: 0x103ce24: lw    a3, 168(sp)
+// 0x0103ce34: 0x103ce34: lw    a3, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -490,21 +490,21 @@ L_103ce04:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103ce28: 0x103ce28: lui   a2, 0x10000
+// 0x0103ce38: 0x103ce38: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103ce2c: 0x103ce2c: addiu a1, zero, 128
+// 0x0103ce3c: 0x103ce3c: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0103ce30: 0x103ce30: addiu a2, a2, -25344
+// 0x0103ce40: 0x103ce40: addiu a2, a2, -25344
 	ldloc.3
 	ldc.i4 -25344
 	add
 	stloc.3
-// 0x0103ce34: 0x103ce34: addu  a0, s2, zero
+// 0x0103ce44: 0x103ce44: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0103ce38: 0x103ce38: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0103ce48: 0x103ce48: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -523,7 +523,7 @@ L_103ce04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ce40: 0x103ce40: jal   0x101cd60 addiu a0, s3, 30092
+// 0x0103ce50: 0x103ce50: jal   0x101cd70 addiu a0, s3, 30092
 	ldloc 9
 	ldc.i4 30092
 	add
@@ -533,36 +533,36 @@ L_103ce04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ce48: 0x103ce48: addu  a0, v0, zero
+// 0x0103ce58: 0x103ce58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103ce4c: 0x103ce4c: addu  a1, s2, zero
+// 0x0103ce5c: 0x103ce5c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-L_103ce50:
-// 0x0103ce50: 0x103ce50: addiu a2, s1, -13036
+L_103ce60:
+// 0x0103ce60: 0x103ce60: addiu a2, s1, -13020
 	ldloc 11
-	ldc.i4 -13036
+	ldc.i4 -13020
 	add
 	stloc.3
-L_103ce54:
-// 0x0103ce54: 0x103ce54: jal   0x104c058 sll   zero, zero, 0
+L_103ce64:
+// 0x0103ce64: 0x103ce64: jal   0x104c068 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ce5c: 0x103ce5c: jal   0x10ac36c addu  a0, s0, zero
+// 0x0103ce6c: 0x103ce6c: jal   0x10ac9b4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -570,34 +570,34 @@ L_103ce54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ce64: 0x103ce64: lui   a1, 0x10000
+// 0x0103ce74: 0x103ce74: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ce68: 0x103ce68: lui   a3, 0x10000
+// 0x0103ce78: 0x103ce78: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ce6c: 0x103ce6c: addiu a1, a1, -7220
+// 0x0103ce7c: 0x103ce7c: addiu a1, a1, -7224
 	ldloc.2
-	ldc.i4 -7220
+	ldc.i4 -7224
 	add
 	stloc.2
-// 0x0103ce70: 0x103ce70: addiu a3, a3, -6872
+// 0x0103ce80: 0x103ce80: addiu a3, a3, -6876
 	ldloc 4
-	ldc.i4 -6872
+	ldc.i4 -6876
 	add
 	stloc 4
-// 0x0103ce74: 0x103ce74: addiu a0, zero, 4
+// 0x0103ce84: 0x103ce84: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103ce78: 0x103ce78: addiu a2, zero, 208
+// 0x0103ce88: 0x103ce88: addiu a2, zero, 208
 	ldc.i4 208
 	stloc.3
-// 0x0103ce7c: 0x103ce7c: sw    v0, 16(sp)
+// 0x0103ce8c: 0x103ce8c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -606,7 +606,7 @@ L_103ce54:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103ce80: 0x103ce80: jal   0x100449c sw    s0, 20(sp)
+// 0x0103ce90: 0x103ce90: jal   0x100449c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -625,74 +625,74 @@ L_103ce54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ce88: 0x103ce88: j	 0x103cfa4 sll   zero, zero, 0
-	br L_103cfa4
+// 0x0103ce98: 0x103ce98: j	 0x103cfb4 sll   zero, zero, 0
+	br L_103cfb4
 // --- basic block ---
-L_103ce90:
-// 0x0103ce90: 0x103ce90: beq   s2, zero, 0x103cec0 lui   s4, 0x60000
+L_103cea0:
+// 0x0103cea0: 0x103cea0: beq   s2, zero, 0x103ced0 lui   s4, 0x60000
 	ldloc 10
 	ldc.i4 393216
 	stloc 12
-	brfalse L_103cec0
+	brfalse L_103ced0
 // --- basic block ---
-// 0x0103ce98: 0x103ce98: lui   s3, 0x60000
+// 0x0103cea8: 0x103cea8: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0103ce9c: 0x103ce9c: lui   s5, 0x60000
+// 0x0103ceac: 0x103ceac: lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x0103cea0: 0x103cea0: lui   v1, 0x10000
+// 0x0103ceb0: 0x103ceb0: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0103cea4: 0x103cea4: addiu s4, s4, -11980
+// 0x0103ceb4: 0x103ceb4: addiu s4, s4, -11516
 	ldloc 12
-	ldc.i4 -11980
+	ldc.i4 -11516
 	add
 	stloc 12
-// 0x0103cea8: 0x103cea8: addiu s3, s3, -12064
+// 0x0103ceb8: 0x103ceb8: addiu s3, s3, -11600
 	ldloc 9
-	ldc.i4 -12064
+	ldc.i4 -11600
 	add
 	stloc 9
-// 0x0103ceac: 0x103ceac: addiu s5, s5, -12148
+// 0x0103cebc: 0x103cebc: addiu s5, s5, -11684
 	ldloc 13
-	ldc.i4 -12148
+	ldc.i4 -11684
 	add
 	stloc 13
-// 0x0103ceb0: 0x103ceb0: addiu v1, v1, -18396
+// 0x0103cec0: 0x103cec0: addiu v1, v1, -18396
 	ldloc 7
 	ldc.i4 -18396
 	add
 	stloc 7
-// 0x0103ceb4: 0x103ceb4: addu  v0, zero, zero
+// 0x0103cec4: 0x103cec4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103ceb8: 0x103ceb8: j	 0x103cefc addu  s0, zero, zero
+// 0x0103cec8: 0x103cec8: j	 0x103cf0c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_103cefc
+	br L_103cf0c
 // --- basic block ---
-L_103cec0:
-// 0x0103cec0: 0x103cec0: lui   a1, 0x10000
+L_103ced0:
+// 0x0103ced0: 0x103ced0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103cec4: 0x103cec4: lui   a3, 0x10000
+// 0x0103ced4: 0x103ced4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103cec8: 0x103cec8: addiu a1, a1, -7220
+// 0x0103ced8: 0x103ced8: addiu a1, a1, -7224
 	ldloc.2
-	ldc.i4 -7220
+	ldc.i4 -7224
 	add
 	stloc.2
-// 0x0103cecc: 0x103cecc: addiu a3, a3, -6784
+// 0x0103cedc: 0x103cedc: addiu a3, a3, -6788
 	ldloc 4
-	ldc.i4 -6784
+	ldc.i4 -6788
 	add
 	stloc 4
-// 0x0103ced0: 0x103ced0: addiu a0, zero, 1
+// 0x0103cee0: 0x103cee0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103ced4: 0x103ced4: jal   0x100449c addiu a2, zero, 216
+// 0x0103cee4: 0x103cee4: jal   0x100449c addiu a2, zero, 216
 	ldc.i4 216
 	stloc.3
 	ldloc.0
@@ -705,86 +705,86 @@ L_103cec0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cedc: 0x103cedc: j	 0x103cfa4 sll   zero, zero, 0
-	br L_103cfa4
+// 0x0103ceec: 0x103ceec: j	 0x103cfb4 sll   zero, zero, 0
+	br L_103cfb4
 // --- basic block ---
-L_103cee4:
-// 0x0103cee4: 0x103cee4: sw    s0, 0(a2)
+L_103cef4:
+// 0x0103cef4: 0x103cef4: sw    s0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0103cee8: 0x103cee8: sw    a3, 0(t0)
+// 0x0103cef8: 0x103cef8: sw    a3, 0(t0)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-// 0x0103ceec: 0x103ceec: sw    v1, 0(a1)
+// 0x0103cefc: 0x103cefc: sw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0103cef0: 0x103cef0: addiu s0, s0, 1
+// 0x0103cf00: 0x103cf00: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0103cef4: 0x103cef4: addiu s1, s1, 1096
+// 0x0103cf04: 0x103cf04: addiu s1, s1, 1096
 	ldloc 11
 	ldc.i4 1096
 	add
 	stloc 11
-// 0x0103cef8: 0x103cef8: addiu v0, v0, 4
+// 0x0103cf08: 0x103cf08: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-L_103cefc:
-// 0x0103cefc: 0x103cefc: slt   a0, s0, s2
+L_103cf0c:
+// 0x0103cf0c: 0x103cf0c: slt   a0, s0, s2
 	ldloc 8
 	ldloc 10
 	clt
 	stloc.1
-// 0x0103cf00: 0x103cf00: addu  t0, s4, v0
+// 0x0103cf10: 0x103cf10: addu  t0, s4, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 16
-// 0x0103cf04: 0x103cf04: addiu a3, s1, 823
+// 0x0103cf14: 0x103cf14: addiu a3, s1, 823
 	ldloc 11
 	ldc.i4 823
 	add
 	stloc 4
-// 0x0103cf08: 0x103cf08: addu  a2, s3, v0
+// 0x0103cf18: 0x103cf18: addu  a2, s3, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc.3
-// 0x0103cf0c: 0x103cf0c: bne   a0, zero, 0x103cee4 addu  a1, s5, v0
+// 0x0103cf1c: 0x103cf1c: bne   a0, zero, 0x103cef4 addu  a1, s5, v0
 	ldloc.1
 	ldloc 13
 	ldloc 5
 	add
 	stloc.2
-	brtrue L_103cee4
+	brtrue L_103cef4
 // --- basic block ---
-// 0x0103cf14: 0x103cf14: lui   a0, 0x10000
+// 0x0103cf24: 0x103cf24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103cf18: 0x103cf18: sll   s0, s0, 2
+// 0x0103cf28: 0x103cf28: sll   s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x0103cf1c: 0x103cf1c: jal   0x101cd60 addiu a0, a0, -6696
+// 0x0103cf2c: 0x103cf2c: jal   0x101cd70 addiu a0, a0, -6700
 	ldloc.1
-	ldc.i4 -6696
+	ldc.i4 -6700
 	add
 	stloc.1
 	ldloc.0
@@ -792,86 +792,86 @@ L_103cefc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cf24: 0x103cf24: addu  s4, s4, s0
+// 0x0103cf34: 0x103cf34: addu  s4, s4, s0
 	ldloc 12
 	ldloc 8
 	add
 	stloc 12
-// 0x0103cf28: 0x103cf28: addu  s5, s5, s0
+// 0x0103cf38: 0x103cf38: addu  s5, s5, s0
 	ldloc 13
 	ldloc 8
 	add
 	stloc 13
-// 0x0103cf2c: 0x103cf2c: sw    v0, 0(s4)
+// 0x0103cf3c: 0x103cf3c: sw    v0, 0(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103cf30: 0x103cf30: addu  s0, s3, s0
+// 0x0103cf40: 0x103cf40: addu  s0, s3, s0
 	ldloc 9
 	ldloc 8
 	add
 	stloc 8
-// 0x0103cf34: 0x103cf34: addiu v0, zero, 1000
+// 0x0103cf44: 0x103cf44: addiu v0, zero, 1000
 	ldc.i4 1000
 	stloc 5
-// 0x0103cf38: 0x103cf38: sw    v0, 0(s0)
+// 0x0103cf48: 0x103cf48: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103cf3c: 0x103cf3c: lui   v0, 0x10000
+// 0x0103cf4c: 0x103cf4c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103cf40: 0x103cf40: addiu v0, v0, -17388
+// 0x0103cf50: 0x103cf50: addiu v0, v0, -17388
 	ldloc 5
 	ldc.i4 -17388
 	add
 	stloc 5
-// 0x0103cf44: 0x103cf44: jal   0x1052d34 sw    v0, 0(s5)
+// 0x0103cf54: 0x103cf54: jal   0x1052d44 sw    v0, 0(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl61::roadmap_native_keyboard_enabled_1052d34()
+	call int32 Cibyl61::roadmap_native_keyboard_enabled_1052d44()
 	stloc 5
 // --- basic block ---
-// 0x0103cf4c: 0x103cf4c: beq   v0, zero, 0x103cf60 lui   v0, 0x60000
+// 0x0103cf5c: 0x103cf5c: beq   v0, zero, 0x103cf70 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brfalse L_103cf60
+	brfalse L_103cf70
 // --- basic block ---
-// 0x0103cf54: 0x103cf54: jal   0x1052d44 sll   zero, zero, 0
-	call void Cibyl61::roadmap_native_keyboard_hide_1052d44()
+// 0x0103cf64: 0x103cf64: jal   0x1052d54 sll   zero, zero, 0
+	call void Cibyl61::roadmap_native_keyboard_hide_1052d54()
 // --- basic block ---
-// 0x0103cf5c: 0x103cf5c: lui   v0, 0x60000
+// 0x0103cf6c: 0x103cf6c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_103cf60:
-// 0x0103cf60: 0x103cf60: addiu v0, v0, -12148
+L_103cf70:
+// 0x0103cf70: 0x103cf70: addiu v0, v0, -11684
 	ldloc 5
-	ldc.i4 -12148
+	ldc.i4 -11684
 	add
 	stloc 5
-// 0x0103cf64: 0x103cf64: lui   a2, 0x60000
+// 0x0103cf74: 0x103cf74: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0103cf68: 0x103cf68: lui   a3, 0x60000
+// 0x0103cf78: 0x103cf78: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0103cf6c: 0x103cf6c: sw    v0, 16(sp)
+// 0x0103cf7c: 0x103cf7c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -880,33 +880,33 @@ L_103cf60:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103cf70: 0x103cf70: lui   v0, 0x1040000
+// 0x0103cf80: 0x103cf80: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103cf74: 0x103cf74: addiu v0, v0, -12052
+// 0x0103cf84: 0x103cf84: addiu v0, v0, -12036
 	ldloc 5
-	ldc.i4 -12052
+	ldc.i4 -12036
 	add
 	stloc 5
-// 0x0103cf78: 0x103cf78: addu  a0, s6, zero
+// 0x0103cf88: 0x103cf88: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x0103cf7c: 0x103cf7c: addiu a1, s2, 1
+// 0x0103cf8c: 0x103cf8c: addiu a1, s2, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0103cf80: 0x103cf80: addiu a2, a2, -11980
+// 0x0103cf90: 0x103cf90: addiu a2, a2, -11516
 	ldloc.3
-	ldc.i4 -11980
+	ldc.i4 -11516
 	add
 	stloc.3
-// 0x0103cf84: 0x103cf84: addiu a3, a3, -12064
+// 0x0103cf94: 0x103cf94: addiu a3, a3, -11600
 	ldloc 4
-	ldc.i4 -12064
+	ldc.i4 -11600
 	add
 	stloc 4
-// 0x0103cf88: 0x103cf88: sw    v0, 24(sp)
+// 0x0103cf98: 0x103cf98: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -915,7 +915,7 @@ L_103cf60:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103cf8c: 0x103cf8c: sw    zero, 20(sp)
+// 0x0103cf9c: 0x103cf9c: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -924,7 +924,7 @@ L_103cf60:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103cf90: 0x103cf90: sw    zero, 28(sp)
+// 0x0103cfa0: 0x103cfa0: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -933,7 +933,7 @@ L_103cf60:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103cf94: 0x103cf94: jal   0x10924c8 sw    zero, 32(sp)
+// 0x0103cfa4: 0x103cfa4: jal   0x1092aec sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -947,25 +947,25 @@ L_103cf60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_10924c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_1092aec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103cf9c: 0x103cf9c: jal   0x103dd5c sll   zero, zero, 0
+// 0x0103cfac: 0x103cfac: jal   0x103dd6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103cfa4:
-// 0x0103cfa4: 0x103cfa4: lw    ra, 204(sp)
-// 0x0103cfa8: 0x103cfa8: lw    s6, 200(sp)
+L_103cfb4:
+// 0x0103cfb4: 0x103cfb4: lw    ra, 204(sp)
+// 0x0103cfb8: 0x103cfb8: lw    s6, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -974,7 +974,7 @@ L_103cfa4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103cfac: 0x103cfac: lw    s5, 196(sp)
+// 0x0103cfbc: 0x103cfbc: lw    s5, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -983,7 +983,7 @@ L_103cfa4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103cfb0: 0x103cfb0: lw    s4, 192(sp)
+// 0x0103cfc0: 0x103cfc0: lw    s4, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -992,7 +992,7 @@ L_103cfa4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103cfb4: 0x103cfb4: lw    s3, 188(sp)
+// 0x0103cfc4: 0x103cfc4: lw    s3, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1001,7 +1001,7 @@ L_103cfa4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103cfb8: 0x103cfb8: lw    s2, 184(sp)
+// 0x0103cfc8: 0x103cfc8: lw    s2, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1010,7 +1010,7 @@ L_103cfa4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103cfbc: 0x103cfbc: lw    s1, 180(sp)
+// 0x0103cfcc: 0x103cfcc: lw    s1, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1019,7 +1019,7 @@ L_103cfa4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103cfc0: 0x103cfc0: lw    s0, 176(sp)
+// 0x0103cfd0: 0x103cfd0: lw    s0, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1028,7 +1028,7 @@ L_103cfa4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103cfc4: 0x103cfc4: jr    ra addiu sp, sp, 208
+// 0x0103cfd4: 0x103cfd4: jr    ra addiu sp, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
@@ -1040,7 +1040,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_auto_search_completed_103cfcc(int32,int32,int32,int32,int32)
+.method public static int32 on_auto_search_completed_103cfdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1075,13 +1075,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103cfcc: 0x103cfcc: addiu sp, sp, -24
+// 0x0103cfdc: 0x103cfdc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103cfd0: 0x103cfd0: sw    ra, 20(sp)
-// 0x0103cfd4: 0x103cfd4: jal   0x1094a94 addu  a0, zero, zero
+// 0x0103cfe0: 0x103cfe0: sw    ra, 20(sp)
+// 0x0103cfe4: 0x103cfe4: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1089,14 +1089,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0103cfdc: 0x103cfdc: lw    ra, 20(sp)
-// 0x0103cfe0: 0x103cfe0: sll   zero, zero, 0
-// 0x0103cfe4: 0x103cfe4: jr    ra addiu sp, sp, 24
+// 0x0103cfec: 0x103cfec: lw    ra, 20(sp)
+// 0x0103cff0: 0x103cff0: sll   zero, zero, 0
+// 0x0103cff4: 0x103cff4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1108,7 +1108,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 send_error_report_103cfec(int32,int32,int32,int32,int32)
+.method public static int32 send_error_report_103cffc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -1146,16 +1146,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103cfec: 0x103cfec: addiu sp, sp, -32
+// 0x0103cffc: 0x103cffc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103cff0: 0x103cff0: addu  a0, zero, zero
+// 0x0103d000: 0x103d000: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103cff4: 0x103cff4: sw    ra, 28(sp)
-// 0x0103cff8: 0x103cff8: jal   0x103db24 sw    s0, 24(sp)
+// 0x0103d004: 0x103d004: sw    ra, 28(sp)
+// 0x0103d008: 0x103d008: jal   0x103db34 sw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1169,12 +1169,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db24(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d000: 0x103d000: jal   0x1097c00 addu  a0, v0, zero
+// 0x0103d010: 0x103d010: jal   0x1098248 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1182,12 +1182,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d008: 0x103d008: jal   0x103bff0 addu  a0, v0, zero
+// 0x0103d018: 0x103d018: jal   0x103c000 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1195,34 +1195,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::address_search_report_wrong_address_103bff0(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::address_search_report_wrong_address_103c000(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d010: 0x103d010: bne   v0, zero, 0x103d038 lui   s0, 0x10000
+// 0x0103d020: 0x103d020: bne   v0, zero, 0x103d048 lui   s0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 7
-	brtrue L_103d038
+	brtrue L_103d048
 // --- basic block ---
-// 0x0103d018: 0x103d018: lui   a3, 0x10000
+// 0x0103d028: 0x103d028: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103d01c: 0x103d01c: addiu a1, s0, -7220
+// 0x0103d02c: 0x103d02c: addiu a1, s0, -7224
 	ldloc 7
-	ldc.i4 -7220
+	ldc.i4 -7224
 	add
 	stloc.2
-// 0x0103d020: 0x103d020: addiu a3, a3, -6644
+// 0x0103d030: 0x103d030: addiu a3, a3, -6648
 	ldloc 4
-	ldc.i4 -6644
+	ldc.i4 -6648
 	add
 	stloc 4
-// 0x0103d024: 0x103d024: addiu a0, zero, 1
+// 0x0103d034: 0x103d034: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103d028: 0x103d028: jal   0x100449c addiu a2, zero, 119
+// 0x0103d038: 0x103d038: jal   0x100449c addiu a2, zero, 119
 	ldc.i4.s 119
 	stloc.3
 	ldloc.0
@@ -1235,11 +1235,11 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d030: 0x103d030: j	 0x103d05c sll   zero, zero, 0
-	br L_103d05c
+// 0x0103d040: 0x103d040: j	 0x103d06c sll   zero, zero, 0
+	br L_103d06c
 // --- basic block ---
-L_103d038:
-// 0x0103d038: 0x103d038: jal   0x10ac36c addu  a0, v0, zero
+L_103d048:
+// 0x0103d048: 0x103d048: jal   0x10ac9b4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1247,31 +1247,31 @@ L_103d038:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d040: 0x103d040: lui   a3, 0x10000
+// 0x0103d050: 0x103d050: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103d044: 0x103d044: addiu a1, s0, -7220
+// 0x0103d054: 0x103d054: addiu a1, s0, -7224
 	ldloc 7
-	ldc.i4 -7220
+	ldc.i4 -7224
 	add
 	stloc.2
-// 0x0103d048: 0x103d048: addiu a3, a3, -6564
+// 0x0103d058: 0x103d058: addiu a3, a3, -6568
 	ldloc 4
-	ldc.i4 -6564
+	ldc.i4 -6568
 	add
 	stloc 4
-// 0x0103d04c: 0x103d04c: addiu a0, zero, 4
+// 0x0103d05c: 0x103d05c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103d050: 0x103d050: addiu a2, zero, 125
+// 0x0103d060: 0x103d060: addiu a2, zero, 125
 	ldc.i4.s 125
 	stloc.3
-// 0x0103d054: 0x103d054: jal   0x100449c sw    v0, 16(sp)
+// 0x0103d064: 0x103d064: jal   0x100449c sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1290,12 +1290,12 @@ L_103d038:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103d05c:
-// 0x0103d05c: 0x103d05c: lw    ra, 28(sp)
-// 0x0103d060: 0x103d060: addiu v0, zero, 1
+L_103d06c:
+// 0x0103d06c: 0x103d06c: lw    ra, 28(sp)
+// 0x0103d070: 0x103d070: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103d064: 0x103d064: lw    s0, 24(sp)
+// 0x0103d074: 0x103d074: lw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1304,7 +1304,7 @@ L_103d05c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103d068: 0x103d068: jr    ra addiu sp, sp, 32
+// 0x0103d078: 0x103d078: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1316,7 +1316,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_selected_list_item_103d070(int32,int32,int32,int32,int32)
+.method public static int32 get_selected_list_item_103d080(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1351,26 +1351,26 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d070: 0x103d070: addiu sp, sp, -24
+// 0x0103d080: 0x103d080: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103d074: 0x103d074: sw    ra, 20(sp)
-// 0x0103d078: 0x103d078: jal   0x103d560 addu  a0, zero, zero
+// 0x0103d084: 0x103d084: sw    ra, 20(sp)
+// 0x0103d088: 0x103d088: jal   0x103d570 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d080: 0x103d080: bne   v0, zero, 0x103d0ac addiu v1, zero, -1
+// 0x0103d090: 0x103d090: bne   v0, zero, 0x103d0bc addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
-	brtrue L_103d0ac
+	brtrue L_103d0bc
 // --- basic block ---
-// 0x0103d088: 0x103d088: jal   0x103da30 addu  a0, zero, zero
+// 0x0103d098: 0x103d098: jal   0x103da40 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1378,20 +1378,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da30(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d090: 0x103d090: lui   a1, 0x10000
+// 0x0103d0a0: 0x103d0a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103d094: 0x103d094: addu  a0, v0, zero
+// 0x0103d0a4: 0x103d0a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103d098: 0x103d098: jal   0x109b304 addiu a1, a1, -7544
+// 0x0103d0a8: 0x103d0a8: jal   0x109b94c addiu a1, a1, -7548
 	ldloc.2
-	ldc.i4 -7544
+	ldc.i4 -7548
 	add
 	stloc.2
 	ldloc.0
@@ -1399,31 +1399,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d0a0: 0x103d0a0: jal   0x109162c addu  a0, v0, zero
+// 0x0103d0b0: 0x103d0b0: jal   0x1091c50 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d0a8: 0x103d0a8: addu  v1, v0, zero
+// 0x0103d0b8: 0x103d0b8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_103d0ac:
-// 0x0103d0ac: 0x103d0ac: lw    ra, 20(sp)
-// 0x0103d0b0: 0x103d0b0: addu  v0, v1, zero
+L_103d0bc:
+// 0x0103d0bc: 0x103d0bc: lw    ra, 20(sp)
+// 0x0103d0c0: 0x103d0c0: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0103d0b4: 0x103d0b4: jr    ra addiu sp, sp, 24
+// 0x0103d0c4: 0x103d0c4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1435,7 +1435,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_103d0bc(int32,int32,int32,int32,int32)
+.method public static int32 navigate_103d0cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -1470,13 +1470,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d0bc: 0x103d0bc: addiu sp, sp, -32
+// 0x0103d0cc: 0x103d0cc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103d0c0: 0x103d0c0: sw    ra, 28(sp)
-// 0x0103d0c4: 0x103d0c4: jal   0x103d070 sw    a0, 16(sp)
+// 0x0103d0d0: 0x103d0d0: sw    ra, 28(sp)
+// 0x0103d0d4: 0x103d0d4: jal   0x103d080 sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1490,12 +1490,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::get_selected_list_item_103d070(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::get_selected_list_item_103d080(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103d0cc: 0x103d0cc: lw    a0, 16(sp)
+// 0x0103d0dc: 0x103d0dc: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1504,10 +1504,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103d0d0: 0x103d0d0: addu  a2, v0, zero
+// 0x0103d0e0: 0x103d0e0: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0103d0d4: 0x103d0d4: jal   0x103e598 addu  a1, zero, zero
+// 0x0103d0e4: 0x103d0e4: jal   0x103e5a8 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1515,14 +1515,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::navigate_with_coordinates_103e598(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::navigate_with_coordinates_103e5a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103d0dc: 0x103d0dc: lw    ra, 28(sp)
-// 0x0103d0e0: 0x103d0e0: sll   zero, zero, 0
-// 0x0103d0e4: 0x103d0e4: jr    ra addiu sp, sp, 32
+// 0x0103d0ec: 0x103d0ec: lw    ra, 28(sp)
+// 0x0103d0f0: 0x103d0f0: sll   zero, zero, 0
+// 0x0103d0f4: 0x103d0f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1534,7 +1534,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_list_item_selected_103d0ec(int32,int32,int32,int32,int32)
+.method public static int32 on_list_item_selected_103d0fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1569,24 +1569,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d0ec: 0x103d0ec: addiu sp, sp, -32
+// 0x0103d0fc: 0x103d0fc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103d0f0: 0x103d0f0: beq   a1, zero, 0x103d13c sw    ra, 28(sp)
+// 0x0103d100: 0x103d100: beq   a1, zero, 0x103d14c sw    ra, 28(sp)
 	ldloc.2
-	brfalse L_103d13c
+	brfalse L_103d14c
 // --- basic block ---
-// 0x0103d0f8: 0x103d0f8: lui   a0, 0x10000
+// 0x0103d108: 0x103d108: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d0fc: 0x103d0fc: addiu a0, a0, -6696
+// 0x0103d10c: 0x103d10c: addiu a0, a0, -6700
 	ldloc.1
-	ldc.i4 -6696
+	ldc.i4 -6700
 	add
 	stloc.1
-// 0x0103d100: 0x103d100: jal   0x101cd60 sw    a1, 16(sp)
+// 0x0103d110: 0x103d110: jal   0x101cd70 sw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1600,12 +1600,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d108: 0x103d108: lw    a1, 16(sp)
+// 0x0103d118: 0x103d118: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1614,11 +1614,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103d10c: 0x103d10c: sll   zero, zero, 0
-// 0x0103d110: 0x103d110: addu  a0, a1, zero
+// 0x0103d11c: 0x103d11c: sll   zero, zero, 0
+// 0x0103d120: 0x103d120: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0103d114: 0x103d114: jal   0x1001b14 addu  a1, v0, zero
+// 0x0103d124: 0x103d124: jal   0x1001b14 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -1626,37 +1626,37 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d11c: 0x103d11c: bne   v0, zero, 0x103d13c sll   zero, zero, 0
+// 0x0103d12c: 0x103d12c: bne   v0, zero, 0x103d14c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103d13c
+	brtrue L_103d14c
 // --- basic block ---
-// 0x0103d124: 0x103d124: jal   0x103cfec sll   zero, zero, 0
+// 0x0103d134: 0x103d134: jal   0x103cffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::send_error_report_103cfec(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::send_error_report_103cffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d12c: 0x103d12c: jal   0x103dd5c sll   zero, zero, 0
+// 0x0103d13c: 0x103d13c: jal   0x103dd6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d134: 0x103d134: j	 0x103d16c sll   zero, zero, 0
-	br L_103d16c
+// 0x0103d144: 0x103d144: j	 0x103d17c sll   zero, zero, 0
+	br L_103d17c
 // --- basic block ---
-L_103d13c:
-// 0x0103d13c: 0x103d13c: jal   0x103d0bc addiu a0, zero, 1
+L_103d14c:
+// 0x0103d14c: 0x103d14c: jal   0x103d0cc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -1664,16 +1664,16 @@ L_103d13c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::navigate_103d0bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::navigate_103d0cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d144: 0x103d144: beq   v0, zero, 0x103d16c sll   zero, zero, 0
+// 0x0103d154: 0x103d154: beq   v0, zero, 0x103d17c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103d16c
+	brfalse L_103d17c
 // --- basic block ---
-// 0x0103d14c: 0x103d14c: jal   0x1094a94 addu  a0, zero, zero
+// 0x0103d15c: 0x103d15c: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1681,43 +1681,43 @@ L_103d13c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d154: 0x103d154: jal   0x102146c sll   zero, zero, 0
+// 0x0103d164: 0x103d164: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d15c: 0x103d15c: bne   v0, zero, 0x103d16c sll   zero, zero, 0
+// 0x0103d16c: 0x103d16c: bne   v0, zero, 0x103d17c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103d16c
+	brtrue L_103d17c
 // --- basic block ---
-// 0x0103d164: 0x103d164: jal   0x1021900 sll   zero, zero, 0
+// 0x0103d174: 0x103d174: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103d16c:
-// 0x0103d16c: 0x103d16c: lw    ra, 28(sp)
-// 0x0103d170: 0x103d170: addu  v0, zero, zero
+L_103d17c:
+// 0x0103d17c: 0x103d17c: lw    ra, 28(sp)
+// 0x0103d180: 0x103d180: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103d174: 0x103d174: jr    ra addiu sp, sp, 32
+// 0x0103d184: 0x103d184: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1729,7 +1729,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_back_103d17c(int32,int32,int32,int32,int32)
+.method public static int32 on_back_103d18c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1764,24 +1764,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d17c: 0x103d17c: addiu sp, sp, -24
+// 0x0103d18c: 0x103d18c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103d180: 0x103d180: sw    ra, 20(sp)
-// 0x0103d184: 0x103d184: jal   0x103d560 addu  a0, zero, zero
+// 0x0103d190: 0x103d190: sw    ra, 20(sp)
+// 0x0103d194: 0x103d194: jal   0x103d570 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d18c: 0x103d18c: beq   v0, zero, 0x103d1a4 sll   zero, zero, 0
+// 0x0103d19c: 0x103d19c: beq   v0, zero, 0x103d1b4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103d1a4
+	brfalse L_103d1b4
 // --- basic block ---
-// 0x0103d194: 0x103d194: jal   0x1094b64 addiu a0, zero, 2
+// 0x0103d1a4: 0x103d1a4: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1789,32 +1789,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d19c: 0x103d19c: j	 0x103d1ac sll   zero, zero, 0
-	br L_103d1ac
+// 0x0103d1ac: 0x103d1ac: j	 0x103d1bc sll   zero, zero, 0
+	br L_103d1bc
 // --- basic block ---
-L_103d1a4:
-// 0x0103d1a4: 0x103d1a4: jal   0x103dd5c sll   zero, zero, 0
+L_103d1b4:
+// 0x0103d1b4: 0x103d1b4: jal   0x103dd6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103d1ac:
-// 0x0103d1ac: 0x103d1ac: lw    ra, 20(sp)
-// 0x0103d1b0: 0x103d1b0: addu  v0, zero, zero
+L_103d1bc:
+// 0x0103d1bc: 0x103d1bc: lw    ra, 20(sp)
+// 0x0103d1c0: 0x103d1c0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103d1b4: 0x103d1b4: jr    ra addiu sp, sp, 24
+// 0x0103d1c4: 0x103d1c4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1826,7 +1826,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_options_103d1bc(int32,int32,int32,int32,int32)
+.method public static int32 on_options_103d1cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1870,13 +1870,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d1bc: 0x103d1bc: addiu sp, sp, -48
+// 0x0103d1cc: 0x103d1cc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103d1c0: 0x103d1c0: sw    ra, 44(sp)
-// 0x0103d1c4: 0x103d1c4: sw    s2, 40(sp)
+// 0x0103d1d0: 0x103d1d0: sw    ra, 44(sp)
+// 0x0103d1d4: 0x103d1d4: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1885,7 +1885,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103d1c8: 0x103d1c8: sw    s1, 36(sp)
+// 0x0103d1d8: 0x103d1d8: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1894,7 +1894,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103d1cc: 0x103d1cc: jal   0x103d070 sw    s0, 32(sp)
+// 0x0103d1dc: 0x103d1dc: jal   0x103d080 sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1908,20 +1908,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::get_selected_list_item_103d070(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::get_selected_list_item_103d080(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d1d4: 0x103d1d4: xori  v0, v0, 1000
+// 0x0103d1e4: 0x103d1e4: xori  v0, v0, 1000
 	ldloc 5
 	ldc.i4 1000
 	xor
 	stloc 5
-// 0x0103d1d8: 0x103d1d8: addu  a0, zero, zero
+// 0x0103d1e8: 0x103d1e8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103d1dc: 0x103d1dc: jal   0x109a424 sltiu s0, v0, 1
+// 0x0103d1ec: 0x103d1ec: jal   0x109aa6c sltiu s0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
@@ -1931,52 +1931,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d1e4: 0x103d1e4: addu  a0, zero, zero
+// 0x0103d1f4: 0x103d1f4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0103d1e8: 0x103d1e8: jal   0x103d560 sltu  s1, zero, v0
+// 0x0103d1f8: 0x103d1f8: jal   0x103d570 sltu  s1, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 9
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d1f0: 0x103d1f0: sltiu v0, v0, 1
+// 0x0103d200: 0x103d200: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0103d1f4: 0x103d1f4: subu  v0, zero, v0
+// 0x0103d204: 0x103d204: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x0103d1f8: 0x103d1f8: lui   s2, 0x0
+// 0x0103d208: 0x103d208: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0103d1fc: 0x103d1fc: xori  a2, s0, 1
+// 0x0103d20c: 0x103d20c: xori  a2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x0103d200: 0x103d200: and   a2, a2, v0
+// 0x0103d210: 0x103d210: and   a2, a2, v0
 	ldloc.3
 	ldloc 5
 	and
 	stloc.3
-// 0x0103d204: 0x103d204: addu  a1, zero, zero
+// 0x0103d214: 0x103d214: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d208: 0x103d208: addu  a3, zero, zero
+// 0x0103d218: 0x103d218: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103d20c: 0x103d20c: jal   0x109c504 addiu a0, s2, 12928
+// 0x0103d21c: 0x103d21c: jal   0x109cb4c addiu a0, s2, 12928
 	ldloc 10
 	ldc.i4 12928
 	add
@@ -1986,44 +1986,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d214: 0x103d214: jal   0x103d560 addu  a0, zero, zero
+// 0x0103d224: 0x103d224: jal   0x103d570 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d21c: 0x103d21c: sltiu v0, v0, 1
+// 0x0103d22c: 0x103d22c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0103d220: 0x103d220: subu  v0, zero, v0
+// 0x0103d230: 0x103d230: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x0103d224: 0x103d224: xori  a2, s0, 1
+// 0x0103d234: 0x103d234: xori  a2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x0103d228: 0x103d228: and   a2, a2, v0
+// 0x0103d238: 0x103d238: and   a2, a2, v0
 	ldloc.3
 	ldloc 5
 	and
 	stloc.3
-// 0x0103d22c: 0x103d22c: addiu a1, zero, 1
+// 0x0103d23c: 0x103d23c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0103d230: 0x103d230: addu  a3, zero, zero
+// 0x0103d240: 0x103d240: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103d234: 0x103d234: jal   0x109c504 addiu a0, s2, 12928
+// 0x0103d244: 0x103d244: jal   0x109cb4c addiu a0, s2, 12928
 	ldloc 10
 	ldc.i4 12928
 	add
@@ -2033,49 +2033,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d23c: 0x103d23c: jal   0x103d560 addu  a0, zero, zero
+// 0x0103d24c: 0x103d24c: jal   0x103d570 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d244: 0x103d244: sltiu v0, v0, 1
+// 0x0103d254: 0x103d254: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0103d248: 0x103d248: subu  v0, zero, v0
+// 0x0103d258: 0x103d258: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x0103d24c: 0x103d24c: xori  a2, s0, 1
+// 0x0103d25c: 0x103d25c: xori  a2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x0103d250: 0x103d250: and   a2, a2, v0
+// 0x0103d260: 0x103d260: and   a2, a2, v0
 	ldloc.3
 	ldloc 5
 	and
 	stloc.3
-// 0x0103d254: 0x103d254: addiu a0, s2, 12928
+// 0x0103d264: 0x103d264: addiu a0, s2, 12928
 	ldloc 10
 	ldc.i4 12928
 	add
 	stloc.1
-// 0x0103d258: 0x103d258: addiu a1, zero, 2
+// 0x0103d268: 0x103d268: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0103d25c: 0x103d25c: addu  a3, zero, zero
+// 0x0103d26c: 0x103d26c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103d260: 0x103d260: jal   0x109c504 nor   s1, zero, s1
+// 0x0103d270: 0x103d270: jal   0x109cb4c nor   s1, zero, s1
 	ldloc 9
 	ldc.i4.m1
 	xor
@@ -2085,46 +2085,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d268: 0x103d268: beq   s0, zero, 0x103d284 addu  a2, zero, zero
+// 0x0103d278: 0x103d278: beq   s0, zero, 0x103d294 addu  a2, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_103d284
+	brfalse L_103d294
 // --- basic block ---
-// 0x0103d270: 0x103d270: jal   0x103d560 addu  a0, zero, zero
+// 0x0103d280: 0x103d280: jal   0x103d570 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl45::generic_search_dlg_is_1st_103d560(int32)
+	call int32 Cibyl45::generic_search_dlg_is_1st_103d570(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d278: 0x103d278: beq   v0, zero, 0x103d284 addiu a2, zero, 1
+// 0x0103d288: 0x103d288: beq   v0, zero, 0x103d294 addiu a2, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.3
-	brfalse L_103d284
+	brfalse L_103d294
 // --- basic block ---
-// 0x0103d280: 0x103d280: addu  a2, zero, zero
+// 0x0103d290: 0x103d290: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_103d284:
-// 0x0103d284: 0x103d284: lui   s0, 0x0
+L_103d294:
+// 0x0103d294: 0x103d294: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0103d288: 0x103d288: addiu a0, s0, 12928
+// 0x0103d298: 0x103d298: addiu a0, s0, 12928
 	ldloc 8
 	ldc.i4 12928
 	add
 	stloc.1
-// 0x0103d28c: 0x103d28c: addiu a1, zero, 7
+// 0x0103d29c: 0x103d29c: addiu a1, zero, 7
 	ldc.i4.7
 	stloc.2
-// 0x0103d290: 0x103d290: jal   0x109c504 addu  a3, zero, zero
+// 0x0103d2a0: 0x103d2a0: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2132,23 +2132,23 @@ L_103d284:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d298: 0x103d298: addiu a0, s0, 12928
+// 0x0103d2a8: 0x103d2a8: addiu a0, s0, 12928
 	ldloc 8
 	ldc.i4 12928
 	add
 	stloc.1
-// 0x0103d29c: 0x103d29c: addiu a1, zero, 3
+// 0x0103d2ac: 0x103d2ac: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0103d2a0: 0x103d2a0: addiu a2, zero, 1
+// 0x0103d2b0: 0x103d2b0: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0103d2a4: 0x103d2a4: jal   0x109c504 addu  a3, zero, zero
+// 0x0103d2b4: 0x103d2b4: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2156,18 +2156,18 @@ L_103d284:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d2ac: 0x103d2ac: addiu v0, zero, 2
+// 0x0103d2bc: 0x103d2bc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0103d2b0: 0x103d2b0: lui   a3, 0x1040000
+// 0x0103d2c0: 0x103d2c0: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x0103d2b4: 0x103d2b4: sw    v0, 20(sp)
+// 0x0103d2c4: 0x103d2c4: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2176,26 +2176,26 @@ L_103d284:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d2b8: 0x103d2b8: addu  a0, s1, zero
+// 0x0103d2c8: 0x103d2c8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103d2bc: 0x103d2bc: addiu a2, s0, 12928
+// 0x0103d2cc: 0x103d2cc: addiu a2, s0, 12928
 	ldloc 8
 	ldc.i4 12928
 	add
 	stloc.3
-// 0x0103d2c0: 0x103d2c0: addiu v0, zero, 1
+// 0x0103d2d0: 0x103d2d0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103d2c4: 0x103d2c4: addiu a3, a3, -11520
+// 0x0103d2d4: 0x103d2d4: addiu a3, a3, -11504
 	ldloc 4
-	ldc.i4 -11520
+	ldc.i4 -11504
 	add
 	stloc 4
-// 0x0103d2c8: 0x103d2c8: addiu a1, zero, -2
+// 0x0103d2d8: 0x103d2d8: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x0103d2cc: 0x103d2cc: sw    v0, 28(sp)
+// 0x0103d2dc: 0x103d2dc: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2204,7 +2204,7 @@ L_103d284:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d2d0: 0x103d2d0: sw    zero, 16(sp)
+// 0x0103d2e0: 0x103d2e0: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2213,7 +2213,7 @@ L_103d284:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103d2d4: 0x103d2d4: jal   0x109c7f0 sw    zero, 24(sp)
+// 0x0103d2e4: 0x103d2e4: jal   0x109ce38 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2227,25 +2227,25 @@ L_103d284:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d2dc: 0x103d2dc: lw    ra, 44(sp)
-// 0x0103d2e0: 0x103d2e0: lui   v1, 0x60000
+// 0x0103d2ec: 0x103d2ec: lw    ra, 44(sp)
+// 0x0103d2f0: 0x103d2f0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103d2e4: 0x103d2e4: sw    v0, -11896(v1)
+// 0x0103d2f4: 0x103d2f4: sw    v0, -11432(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2974
+	ldc.i4 -2858
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d2e8: 0x103d2e8: lw    s2, 40(sp)
+// 0x0103d2f8: 0x103d2f8: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2254,10 +2254,10 @@ L_103d284:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103d2ec: 0x103d2ec: addu  v0, zero, zero
+// 0x0103d2fc: 0x103d2fc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103d2f0: 0x103d2f0: lw    s1, 36(sp)
+// 0x0103d300: 0x103d300: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2266,7 +2266,7 @@ L_103d284:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103d2f4: 0x103d2f4: lw    s0, 32(sp)
+// 0x0103d304: 0x103d304: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2275,7 +2275,7 @@ L_103d284:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103d2f8: 0x103d2f8: jr    ra addiu sp, sp, 48
+// 0x0103d308: 0x103d308: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2287,7 +2287,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_option_selected_103d300(int32,int32,int32,int32,int32)
+.method public static int32 on_option_selected_103d310(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2328,16 +2328,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d300: 0x103d300: addiu sp, sp, -56
+// 0x0103d310: 0x103d310: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0103d304: 0x103d304: lui   v0, 0x60000
+// 0x0103d314: 0x103d314: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103d308: 0x103d308: sw    ra, 52(sp)
-// 0x0103d30c: 0x103d30c: sw    s1, 48(sp)
+// 0x0103d318: 0x103d318: sw    ra, 52(sp)
+// 0x0103d31c: 0x103d31c: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2346,7 +2346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103d310: 0x103d310: sw    s0, 44(sp)
+// 0x0103d320: 0x103d320: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2355,19 +2355,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103d314: 0x103d314: beq   a0, zero, 0x103d438 sw    zero, -11896(v0)
+// 0x0103d324: 0x103d324: beq   a0, zero, 0x103d448 sw    zero, -11432(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2974
+	ldc.i4 -2858
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_103d438
+	brfalse L_103d448
 // --- basic block ---
-// 0x0103d31c: 0x103d31c: lw    v0, 20(a1)
+// 0x0103d32c: 0x103d32c: lw    v0, 20(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2376,60 +2376,60 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d320: 0x103d320: sll   zero, zero, 0
-// 0x0103d324: 0x103d324: beq   v0, zero, 0x103d350 addiu a0, zero, 1
+// 0x0103d330: 0x103d330: sll   zero, zero, 0
+// 0x0103d334: 0x103d334: beq   v0, zero, 0x103d360 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brfalse L_103d350
+	brfalse L_103d360
 // --- basic block ---
-// 0x0103d32c: 0x103d32c: beq   v0, a0, 0x103d34c addiu v1, zero, 2
+// 0x0103d33c: 0x103d33c: beq   v0, a0, 0x103d35c addiu v1, zero, 2
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	stloc 7
-	beq  L_103d34c
+	beq  L_103d35c
 // --- basic block ---
-// 0x0103d334: 0x103d334: beq   v0, v1, 0x103d368 addiu v1, zero, 7
+// 0x0103d344: 0x103d344: beq   v0, v1, 0x103d378 addiu v1, zero, 7
 	ldloc 5
 	ldloc 7
 	ldc.i4.7
 	stloc 7
-	beq  L_103d368
+	beq  L_103d378
 // --- basic block ---
-// 0x0103d33c: 0x103d33c: bne   v0, v1, 0x103d438 sll   zero, zero, 0
+// 0x0103d34c: 0x103d34c: bne   v0, v1, 0x103d448 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_103d438
+	bne.un L_103d448
 // --- basic block ---
-// 0x0103d344: 0x103d344: j	 0x103d400 sll   zero, zero, 0
-	br L_103d400
+// 0x0103d354: 0x103d354: j	 0x103d410 sll   zero, zero, 0
+	br L_103d410
 // --- basic block ---
-L_103d34c:
-// 0x0103d34c: 0x103d34c: addu  a0, zero, zero
+L_103d35c:
+// 0x0103d35c: 0x103d35c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_103d350:
-// 0x0103d350: 0x103d350: jal   0x103d0bc sll   zero, zero, 0
+L_103d360:
+// 0x0103d360: 0x103d360: jal   0x103d0cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::navigate_103d0bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::navigate_103d0cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d358: 0x103d358: bne   v0, zero, 0x103d418 sll   zero, zero, 0
+// 0x0103d368: 0x103d368: bne   v0, zero, 0x103d428 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103d418
+	brtrue L_103d428
 // --- basic block ---
-// 0x0103d360: 0x103d360: j	 0x103d438 sll   zero, zero, 0
-	br L_103d438
+// 0x0103d370: 0x103d370: j	 0x103d448 sll   zero, zero, 0
+	br L_103d448
 // --- basic block ---
-L_103d368:
-// 0x0103d368: 0x103d368: jal   0x103d070 lui   s1, 0x20000
+L_103d378:
+// 0x0103d378: 0x103d378: jal   0x103d080 lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.0
@@ -2437,37 +2437,37 @@ L_103d368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::get_selected_list_item_103d070(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::get_selected_list_item_103d080(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d370: 0x103d370: jal   0x103e180 addu  a0, v0, zero
+// 0x0103d380: 0x103d380: jal   0x103e190 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl46::generic_search_result_103e180(int32)
+	call int32 Cibyl46::generic_search_result_103e190(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103d378: 0x103d378: lw    a3, 23796(s1)
+// 0x0103d388: 0x103d388: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103d37c: 0x103d37c: lw    a2, 23792(s1)
+// 0x0103d38c: 0x103d38c: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103d380: 0x103d380: lw    a1, 20(v0)
+// 0x0103d390: 0x103d390: lw    a1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2476,7 +2476,7 @@ L_103d368:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103d384: 0x103d384: lw    a0, 16(v0)
+// 0x0103d394: 0x103d394: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2485,7 +2485,7 @@ L_103d368:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103d388: 0x103d388: jal   0x10c0798 addu  s0, v0, zero
+// 0x0103d398: 0x103d398: jal   0x10c0dd8 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2493,44 +2493,44 @@ L_103d368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d390: 0x103d390: addu  a1, v1, zero
+// 0x0103d3a0: 0x103d3a0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103d394: 0x103d394: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103d3a4: 0x103d3a4: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d39c: 0x103d39c: lw    a3, 23796(s1)
+// 0x0103d3ac: 0x103d3ac: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103d3a0: 0x103d3a0: lw    a2, 23792(s1)
+// 0x0103d3b0: 0x103d3b0: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103d3a4: 0x103d3a4: lw    a1, 12(s0)
+// 0x0103d3b4: 0x103d3b4: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2539,7 +2539,7 @@ L_103d368:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103d3a8: 0x103d3a8: lw    a0, 8(s0)
+// 0x0103d3b8: 0x103d3b8: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2548,7 +2548,7 @@ L_103d368:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103d3ac: 0x103d3ac: jal   0x10c0798 sw    v0, 36(sp)
+// 0x0103d3bc: 0x103d3bc: jal   0x10c0dd8 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2562,26 +2562,26 @@ L_103d368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d3b4: 0x103d3b4: addu  a1, v1, zero
+// 0x0103d3c4: 0x103d3c4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103d3b8: 0x103d3b8: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103d3c8: 0x103d3c8: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d3c0: 0x103d3c0: sw    v0, 32(sp)
+// 0x0103d3d0: 0x103d3d0: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2590,7 +2590,7 @@ L_103d368:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d3c4: 0x103d3c4: lw    a0, 284(s0)
+// 0x0103d3d4: 0x103d3d4: lw    a0, 284(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2599,26 +2599,26 @@ L_103d368:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103d3c8: 0x103d3c8: jal   0x103e28c sll   zero, zero, 0
+// 0x0103d3d8: 0x103d3d8: jal   0x103e29c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::get_house_number__str_103e28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::get_house_number__str_103e29c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d3d0: 0x103d3d0: addu  a3, v0, zero
+// 0x0103d3e0: 0x103d3e0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0103d3d4: 0x103d3d4: addiu v0, s0, 24
+// 0x0103d3e4: 0x103d3e4: addiu v0, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x0103d3d8: 0x103d3d8: sw    v0, 16(sp)
+// 0x0103d3e8: 0x103d3e8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2627,25 +2627,25 @@ L_103d368:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d3dc: 0x103d3dc: addiu a2, s0, 154
+// 0x0103d3ec: 0x103d3ec: addiu a2, s0, 154
 	ldloc 8
 	ldc.i4 154
 	add
 	stloc.3
-// 0x0103d3e0: 0x103d3e0: addiu v0, sp, 32
+// 0x0103d3f0: 0x103d3f0: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0103d3e4: 0x103d3e4: addiu a0, zero, 70
+// 0x0103d3f4: 0x103d3f4: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x0103d3e8: 0x103d3e8: addiu a1, s0, 90
+// 0x0103d3f8: 0x103d3f8: addiu a1, s0, 90
 	ldloc 8
 	ldc.i4.s 90
 	add
 	stloc.2
-// 0x0103d3ec: 0x103d3ec: sw    v0, 24(sp)
+// 0x0103d3fc: 0x103d3fc: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2654,7 +2654,7 @@ L_103d368:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d3f0: 0x103d3f0: jal   0x103e464 sw    zero, 20(sp)
+// 0x0103d400: 0x103d400: jal   0x103e474 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2668,42 +2668,42 @@ L_103d368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_add_address_to_history_103e464(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_add_address_to_history_103e474(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d3f8: 0x103d3f8: j	 0x103d438 sll   zero, zero, 0
-	br L_103d438
+// 0x0103d408: 0x103d408: j	 0x103d448 sll   zero, zero, 0
+	br L_103d448
 // --- basic block ---
-L_103d400:
-// 0x0103d400: 0x103d400: jal   0x103cfec sll   zero, zero, 0
+L_103d410:
+// 0x0103d410: 0x103d410: jal   0x103cffc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::send_error_report_103cfec(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::send_error_report_103cffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d408: 0x103d408: jal   0x103dd5c sll   zero, zero, 0
+// 0x0103d418: 0x103d418: jal   0x103dd6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d410: 0x103d410: j	 0x103d438 sll   zero, zero, 0
-	br L_103d438
+// 0x0103d420: 0x103d420: j	 0x103d448 sll   zero, zero, 0
+	br L_103d448
 // --- basic block ---
-L_103d418:
-// 0x0103d418: 0x103d418: jal   0x1094a94 addu  a0, zero, zero
+L_103d428:
+// 0x0103d428: 0x103d428: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2711,40 +2711,40 @@ L_103d418:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d420: 0x103d420: jal   0x102146c sll   zero, zero, 0
+// 0x0103d430: 0x103d430: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d428: 0x103d428: bne   v0, zero, 0x103d438 sll   zero, zero, 0
+// 0x0103d438: 0x103d438: bne   v0, zero, 0x103d448 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103d438
+	brtrue L_103d448
 // --- basic block ---
-// 0x0103d430: 0x103d430: jal   0x1021900 sll   zero, zero, 0
+// 0x0103d440: 0x103d440: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103d438:
-// 0x0103d438: 0x103d438: lw    ra, 52(sp)
-// 0x0103d43c: 0x103d43c: lw    s1, 48(sp)
+L_103d448:
+// 0x0103d448: 0x103d448: lw    ra, 52(sp)
+// 0x0103d44c: 0x103d44c: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2753,7 +2753,7 @@ L_103d438:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103d440: 0x103d440: lw    s0, 44(sp)
+// 0x0103d450: 0x103d450: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2762,7 +2762,7 @@ L_103d438:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103d444: 0x103d444: jr    ra addiu sp, sp, 56
+// 0x0103d454: 0x103d454: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2774,7 +2774,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 address_search_auto_search_103d44c(int32,int32,int32,int32,int32)
+.method public static int32 address_search_auto_search_103d45c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32 v1,int32[] mem,int32 ra)
@@ -2812,12 +2812,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d44c: 0x103d44c: addiu sp, sp, -24
+// 0x0103d45c: 0x103d45c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103d450: 0x103d450: sw    s0, 16(sp)
+// 0x0103d460: 0x103d460: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2826,19 +2826,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103d454: 0x103d454: addu  s0, a0, zero
+// 0x0103d464: 0x103d464: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0103d458: 0x103d458: lui   a0, 0x1040000
+// 0x0103d468: 0x103d468: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0103d45c: 0x103d45c: addu  a1, s0, zero
+// 0x0103d46c: 0x103d46c: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x0103d460: 0x103d460: sw    ra, 20(sp)
-// 0x0103d464: 0x103d464: jal   0x103c9a0 addiu a0, a0, -12340
+// 0x0103d470: 0x103d470: sw    ra, 20(sp)
+// 0x0103d474: 0x103d474: jal   0x103c9b0 addiu a0, a0, -12324
 	ldloc.1
-	ldc.i4 -12340
+	ldc.i4 -12324
 	add
 	stloc.1
 	ldloc.0
@@ -2846,12 +2846,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::address_search_dlg_show_auto_103c9a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::address_search_dlg_show_auto_103c9b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d46c: 0x103d46c: jal   0x103db24 addu  a0, zero, zero
+// 0x0103d47c: 0x103d47c: jal   0x103db34 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2859,15 +2859,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db24(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_edit_box_103db34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d474: 0x103d474: addu  a0, v0, zero
+// 0x0103d484: 0x103d484: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103d478: 0x103d478: jal   0x1097e5c addu  a1, s0, zero
+// 0x0103d488: 0x103d488: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -2875,27 +2875,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d480: 0x103d480: jal   0x103ca28 sll   zero, zero, 0
+// 0x0103d490: 0x103d490: jal   0x103ca38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::on_search_103ca28(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::on_search_103ca38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d488: 0x103d488: lw    ra, 20(sp)
-// 0x0103d48c: 0x103d48c: addiu v0, zero, 1
+// 0x0103d498: 0x103d498: lw    ra, 20(sp)
+// 0x0103d49c: 0x103d49c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103d490: 0x103d490: lw    s0, 16(sp)
+// 0x0103d4a0: 0x103d4a0: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2904,7 +2904,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103d494: 0x103d494: jr    ra addiu sp, sp, 24
+// 0x0103d4a4: 0x103d4a4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2916,7 +2916,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_key_pressed__delegate_to_editbox_103d49c(int32,int32,int32,int32,int32)
+.method public static int32 on_key_pressed__delegate_to_editbox_103d4ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -2954,68 +2954,68 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d49c: 0x103d49c: addiu sp, sp, -24
+// 0x0103d4ac: 0x103d4ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103d4a0: 0x103d4a0: andi  v0, a2, 2
+// 0x0103d4b0: 0x103d4b0: andi  v0, a2, 2
 	ldloc.3
 	ldc.i4.2
 	and
 	stloc 5
-// 0x0103d4a4: 0x103d4a4: beq   v0, zero, 0x103d4f0 sw    ra, 20(sp)
+// 0x0103d4b4: 0x103d4b4: beq   v0, zero, 0x103d500 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_103d4f0
+	brfalse L_103d500
 // --- basic block ---
-// 0x0103d4ac: 0x103d4ac: lb    v1, 0(a1)
+// 0x0103d4bc: 0x103d4bc: lb    v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0103d4b0: 0x103d4b0: addiu v0, zero, 13
+// 0x0103d4c0: 0x103d4c0: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x0103d4b4: 0x103d4b4: bne   v1, v0, 0x103d4f0 lui   v0, 0x60000
+// 0x0103d4c4: 0x103d4c4: bne   v1, v0, 0x103d500 lui   v0, 0x60000
 	ldloc 6
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_103d4f0
+	bne.un L_103d500
 // --- basic block ---
-// 0x0103d4bc: 0x103d4bc: lw    v1, -11888(v0)
+// 0x0103d4cc: 0x103d4cc: lw    v1, -11424(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103d4c0: 0x103d4c0: addiu v0, zero, 300
+// 0x0103d4d0: 0x103d4d0: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103d4c4: 0x103d4c4: mult  v1, v0
+// 0x0103d4d4: 0x103d4d4: mult  v1, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 9
-// 0x0103d4c8: 0x103d4c8: lui   v0, 0xe0000
+// 0x0103d4d8: 0x103d4d8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0103d4cc: 0x103d4cc: addiu v0, v0, 30532
+// 0x0103d4dc: 0x103d4dc: addiu v0, v0, 30996
 	ldloc 5
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 5
-// 0x0103d4d0: 0x103d4d0: mflo  lo
+// 0x0103d4e0: 0x103d4e0: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0103d4d4: 0x103d4d4: addu  v0, v0, v1
+// 0x0103d4e4: 0x103d4e4: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0103d4d8: 0x103d4d8: lw    v0, 20(v0)
+// 0x0103d4e8: 0x103d4e8: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3024,8 +3024,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d4dc: 0x103d4dc: sll   zero, zero, 0
-// 0x0103d4e0: 0x103d4e0: jalr  v0 sll   zero, zero, 0
+// 0x0103d4ec: 0x103d4ec: sll   zero, zero, 0
+// 0x0103d4f0: 0x103d4f0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3037,13 +3037,13 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d4e8: 0x103d4e8: j	 0x103d508 addiu v0, zero, 1
+// 0x0103d4f8: 0x103d4f8: j	 0x103d518 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_103d508
+	br L_103d518
 // --- basic block ---
-L_103d4f0:
-// 0x0103d4f0: 0x103d4f0: lw    a0, 12(a0)
+L_103d500:
+// 0x0103d500: 0x103d500: lw    a0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -3052,8 +3052,8 @@ L_103d4f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103d4f4: 0x103d4f4: sll   zero, zero, 0
-// 0x0103d4f8: 0x103d4f8: lw    v0, 216(a0)
+// 0x0103d504: 0x103d504: sll   zero, zero, 0
+// 0x0103d508: 0x103d508: lw    v0, 216(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -3062,8 +3062,8 @@ L_103d4f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d4fc: 0x103d4fc: sll   zero, zero, 0
-// 0x0103d500: 0x103d500: jalr  v0 sll   zero, zero, 0
+// 0x0103d50c: 0x103d50c: sll   zero, zero, 0
+// 0x0103d510: 0x103d510: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3075,10 +3075,10 @@ L_103d4f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103d508:
-// 0x0103d508: 0x103d508: lw    ra, 20(sp)
-// 0x0103d50c: 0x103d50c: sll   zero, zero, 0
-// 0x0103d510: 0x103d510: jr    ra addiu sp, sp, 24
+L_103d518:
+// 0x0103d518: 0x103d518: lw    ra, 20(sp)
+// 0x0103d51c: 0x103d51c: sll   zero, zero, 0
+// 0x0103d520: 0x103d520: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3090,7 +3090,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_btn_search_103d518(int32,int32,int32,int32,int32)
+.method public static int32 on_btn_search_103d528(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -3128,49 +3128,49 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d518: 0x103d518: lui   v0, 0x60000
+// 0x0103d528: 0x103d528: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103d51c: 0x103d51c: lw    v1, -11888(v0)
+// 0x0103d52c: 0x103d52c: lw    v1, -11424(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103d520: 0x103d520: addiu v0, zero, 300
+// 0x0103d530: 0x103d530: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103d524: 0x103d524: mult  v1, v0
+// 0x0103d534: 0x103d534: mult  v1, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 9
-// 0x0103d528: 0x103d528: lui   v0, 0xe0000
+// 0x0103d538: 0x103d538: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0103d52c: 0x103d52c: addiu v0, v0, 30532
+// 0x0103d53c: 0x103d53c: addiu v0, v0, 30996
 	ldloc 5
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 5
-// 0x0103d530: 0x103d530: addiu sp, sp, -24
+// 0x0103d540: 0x103d540: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103d534: 0x103d534: sw    ra, 20(sp)
-// 0x0103d538: 0x103d538: mflo  lo
+// 0x0103d544: 0x103d544: sw    ra, 20(sp)
+// 0x0103d548: 0x103d548: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0103d53c: 0x103d53c: addu  v0, v0, v1
+// 0x0103d54c: 0x103d54c: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0103d540: 0x103d540: lw    v0, 20(v0)
+// 0x0103d550: 0x103d550: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3179,8 +3179,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d544: 0x103d544: sll   zero, zero, 0
-// 0x0103d548: 0x103d548: jalr  v0 sll   zero, zero, 0
+// 0x0103d554: 0x103d554: sll   zero, zero, 0
+// 0x0103d558: 0x103d558: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3192,11 +3192,11 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d550: 0x103d550: lw    ra, 20(sp)
-// 0x0103d554: 0x103d554: addu  v0, zero, zero
+// 0x0103d560: 0x103d560: lw    ra, 20(sp)
+// 0x0103d564: 0x103d564: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103d558: 0x103d558: jr    ra addiu sp, sp, 24
+// 0x0103d568: 0x103d568: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3208,7 +3208,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 generic_search_dlg_is_1st_103d560(int32)
+.method public static int32 generic_search_dlg_is_1st_103d570(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 lo,int32 ra,int32[] mem)
@@ -3231,31 +3231,31 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d560: 0x103d560: addiu v0, zero, 300
+// 0x0103d570: 0x103d570: addiu v0, zero, 300
 	ldc.i4 300
 	stloc.1
-// 0x0103d564: 0x103d564: mult  a0, v0
+// 0x0103d574: 0x103d574: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc.2
-// 0x0103d568: 0x103d568: lui   v0, 0xe0000
+// 0x0103d578: 0x103d578: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x0103d56c: 0x103d56c: addiu v0, v0, 30532
+// 0x0103d57c: 0x103d57c: addiu v0, v0, 30996
 	ldloc.1
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc.1
-// 0x0103d570: 0x103d570: mflo  lo
+// 0x0103d580: 0x103d580: mflo  lo
 	ldloc.2
 	stloc.0
-// 0x0103d574: 0x103d574: addu  v0, v0, a0
+// 0x0103d584: 0x103d584: addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.1
-// 0x0103d578: 0x103d578: lw    v0, 36(v0)
+// 0x0103d588: 0x103d588: lw    v0, 36(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -3264,13 +3264,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103d57c: 0x103d57c: jr    ra sll   zero, zero, 0
+// 0x0103d58c: 0x103d58c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 generic_search_dlg_reopen_native_keyboard_103d584(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_dlg_reopen_native_keyboard_103d594(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 s2,int32 v1,int32 lo,int32 ra)
@@ -3317,12 +3317,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d584: 0x103d584: addiu sp, sp, -40
+// 0x0103d594: 0x103d594: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103d588: 0x103d588: sw    s2, 32(sp)
+// 0x0103d598: 0x103d598: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3331,19 +3331,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103d58c: 0x103d58c: lui   s2, 0x60000
+// 0x0103d59c: 0x103d59c: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0103d590: 0x103d590: lw    v0, -11888(s2)
+// 0x0103d5a0: 0x103d5a0: lw    v0, -11424(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d594: 0x103d594: sw    s1, 28(sp)
+// 0x0103d5a4: 0x103d5a4: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3352,15 +3352,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103d598: 0x103d598: addiu s1, zero, 300
+// 0x0103d5a8: 0x103d5a8: addiu s1, zero, 300
 	ldc.i4 300
 	stloc 7
-// 0x0103d59c: 0x103d59c: mult  v0, s1
+// 0x0103d5ac: 0x103d5ac: mult  v0, s1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 11
-// 0x0103d5a0: 0x103d5a0: sw    s0, 24(sp)
+// 0x0103d5b0: 0x103d5b0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3369,24 +3369,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103d5a4: 0x103d5a4: lui   s0, 0xe0000
+// 0x0103d5b4: 0x103d5b4: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x0103d5a8: 0x103d5a8: addiu s0, s0, 30532
+// 0x0103d5b8: 0x103d5b8: addiu s0, s0, 30996
 	ldloc 8
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 8
-// 0x0103d5ac: 0x103d5ac: sw    ra, 36(sp)
-// 0x0103d5b0: 0x103d5b0: mflo  lo
+// 0x0103d5bc: 0x103d5bc: sw    ra, 36(sp)
+// 0x0103d5c0: 0x103d5c0: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0103d5b4: 0x103d5b4: addu  v0, v0, s0
+// 0x0103d5c4: 0x103d5c4: addu  v0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0103d5b8: 0x103d5b8: lw    a0, 16(v0)
+// 0x0103d5c8: 0x103d5c8: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3395,54 +3395,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103d5bc: 0x103d5bc: jal   0x101cd60 sll   zero, zero, 0
+// 0x0103d5cc: 0x103d5cc: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0103d5c4: 0x103d5c4: lw    v1, -11888(s2)
+// 0x0103d5d4: 0x103d5d4: lw    v1, -11424(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103d5c8: 0x103d5c8: addu  a0, v0, zero
+// 0x0103d5d8: 0x103d5d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103d5cc: 0x103d5cc: mult  v1, s1
+// 0x0103d5dc: 0x103d5dc: mult  v1, s1
 	ldloc 10
 	ldloc 7
 	mul
 	stloc 11
-// 0x0103d5d0: 0x103d5d0: lui   a2, 0x1040000
+// 0x0103d5e0: 0x103d5e0: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103d5d4: 0x103d5d4: lui   v0, 0x40000
+// 0x0103d5e4: 0x103d5e4: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x0103d5d8: 0x103d5d8: ori   v0, v0, 1025
+// 0x0103d5e8: 0x103d5e8: ori   v0, v0, 1025
 	ldloc 5
 	ldc.i4 1025
 	or
 	stloc 5
-// 0x0103d5dc: 0x103d5dc: addiu a2, a2, -10736
+// 0x0103d5ec: 0x103d5ec: addiu a2, a2, -10720
 	ldloc.3
-	ldc.i4 -10736
+	ldc.i4 -10720
 	add
 	stloc.3
-// 0x0103d5e0: 0x103d5e0: addu  a3, zero, zero
+// 0x0103d5f0: 0x103d5f0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103d5e4: 0x103d5e4: sw    v0, 16(sp)
+// 0x0103d5f4: 0x103d5f4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3451,15 +3451,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d5e8: 0x103d5e8: mflo  lo
+// 0x0103d5f8: 0x103d5f8: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0103d5ec: 0x103d5ec: addu  s1, s0, s1
+// 0x0103d5fc: 0x103d5fc: addu  s1, s0, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x0103d5f0: 0x103d5f0: jal   0x1052e08 addiu a1, s1, 44
+// 0x0103d600: 0x103d600: jal   0x1052e18 addiu a1, s1, 44
 	ldloc 7
 	ldc.i4.s 44
 	add
@@ -3469,13 +3469,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0103d5f8: 0x103d5f8: lw    ra, 36(sp)
-// 0x0103d5fc: 0x103d5fc: lw    s2, 32(sp)
+// 0x0103d608: 0x103d608: lw    ra, 36(sp)
+// 0x0103d60c: 0x103d60c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3484,7 +3484,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103d600: 0x103d600: lw    s1, 28(sp)
+// 0x0103d610: 0x103d610: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3493,7 +3493,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103d604: 0x103d604: lw    s0, 24(sp)
+// 0x0103d614: 0x103d614: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3502,7 +3502,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103d608: 0x103d608: jr    ra addiu sp, sp, 40
+// 0x0103d618: 0x103d618: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3514,7 +3514,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_keyboard_closed_103d610(int32,int32,int32,int32,int32)
+.method public static int32 on_keyboard_closed_103d620(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 lo,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -3570,12 +3570,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d610: 0x103d610: addiu sp, sp, -48
+// 0x0103d620: 0x103d620: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103d614: 0x103d614: sw    s3, 32(sp)
+// 0x0103d624: 0x103d624: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3584,19 +3584,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103d618: 0x103d618: lui   s3, 0x60000
+// 0x0103d628: 0x103d628: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x0103d61c: 0x103d61c: lw    v0, -11888(s3)
+// 0x0103d62c: 0x103d62c: lw    v0, -11424(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d620: 0x103d620: sw    s2, 28(sp)
+// 0x0103d630: 0x103d630: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3605,15 +3605,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103d624: 0x103d624: addiu s2, zero, 300
+// 0x0103d634: 0x103d634: addiu s2, zero, 300
 	ldc.i4 300
 	stloc 10
-// 0x0103d628: 0x103d628: mult  v0, s2
+// 0x0103d638: 0x103d638: mult  v0, s2
 	ldloc 5
 	ldloc 10
 	mul
 	stloc 11
-// 0x0103d62c: 0x103d62c: sw    s1, 24(sp)
+// 0x0103d63c: 0x103d63c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3622,15 +3622,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103d630: 0x103d630: lui   s1, 0xe0000
+// 0x0103d640: 0x103d640: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x0103d634: 0x103d634: addiu s1, s1, 30532
+// 0x0103d644: 0x103d644: addiu s1, s1, 30996
 	ldloc 8
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 8
-// 0x0103d638: 0x103d638: sw    s5, 40(sp)
+// 0x0103d648: 0x103d648: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3639,7 +3639,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103d63c: 0x103d63c: sw    s0, 20(sp)
+// 0x0103d64c: 0x103d64c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3648,17 +3648,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103d640: 0x103d640: addu  s5, a0, zero
+// 0x0103d650: 0x103d650: addu  s5, a0, zero
 	ldloc.1
 	stloc 14
-// 0x0103d644: 0x103d644: addu  s0, a1, zero
+// 0x0103d654: 0x103d654: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0103d648: 0x103d648: lui   a1, 0x10000
+// 0x0103d658: 0x103d658: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103d64c: 0x103d64c: sw    ra, 44(sp)
-// 0x0103d650: 0x103d650: sw    s4, 36(sp)
+// 0x0103d65c: 0x103d65c: sw    ra, 44(sp)
+// 0x0103d660: 0x103d660: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3667,24 +3667,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103d654: 0x103d654: mflo  lo
+// 0x0103d664: 0x103d664: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0103d658: 0x103d658: addu  v0, v1, s1
+// 0x0103d668: 0x103d668: addu  v0, v1, s1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 5
-// 0x0103d65c: 0x103d65c: lw    a0, 0(v0)
+// 0x0103d66c: 0x103d66c: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103d660: 0x103d660: jal   0x109b304 addiu a1, a1, -6456
+// 0x0103d670: 0x103d670: jal   0x109b94c addiu a1, a1, -6460
 	ldloc.2
-	ldc.i4 -6456
+	ldc.i4 -6460
 	add
 	stloc.2
 	ldloc.0
@@ -3692,20 +3692,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d668: 0x103d668: lui   a1, 0x10000
+// 0x0103d678: 0x103d678: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103d66c: 0x103d66c: addu  a0, v0, zero
+// 0x0103d67c: 0x103d67c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103d670: 0x103d670: jal   0x109b304 addiu a1, a1, -6400
+// 0x0103d680: 0x103d680: jal   0x109b94c addiu a1, a1, -6404
 	ldloc.2
-	ldc.i4 -6400
+	ldc.i4 -6404
 	add
 	stloc.2
 	ldloc.0
@@ -3713,23 +3713,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d678: 0x103d678: addu  s4, v0, zero
+// 0x0103d688: 0x103d688: addu  s4, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0103d67c: 0x103d67c: addiu v0, zero, 1
+// 0x0103d68c: 0x103d68c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103d680: 0x103d680: beq   s5, v0, 0x103d6a0 sll   zero, zero, 0
+// 0x0103d690: 0x103d690: beq   s5, v0, 0x103d6b0 sll   zero, zero, 0
 	ldloc 14
 	ldloc 5
-	beq  L_103d6a0
+	beq  L_103d6b0
 // --- basic block ---
-// 0x0103d688: 0x103d688: jal   0x1094b64 addu  a0, zero, zero
+// 0x0103d698: 0x103d698: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3737,67 +3737,67 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d690: 0x103d690: jal   0x102146c sll   zero, zero, 0
+// 0x0103d6a0: 0x103d6a0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d698: 0x103d698: j	 0x103d710 sll   zero, zero, 0
-	br L_103d710
+// 0x0103d6a8: 0x103d6a8: j	 0x103d720 sll   zero, zero, 0
+	br L_103d720
 // --- basic block ---
-L_103d6a0:
-// 0x0103d6a0: 0x103d6a0: beq   s0, zero, 0x103d6d8 addu  a0, s4, zero
+L_103d6b0:
+// 0x0103d6b0: 0x103d6b0: beq   s0, zero, 0x103d6e8 addu  a0, s4, zero
 	ldloc 9
 	ldloc 13
 	stloc.1
-	brfalse L_103d6d8
+	brfalse L_103d6e8
 // --- basic block ---
-// 0x0103d6a8: 0x103d6a8: lb    v0, 0(s0)
+// 0x0103d6b8: 0x103d6b8: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103d6ac: 0x103d6ac: sll   zero, zero, 0
-// 0x0103d6b0: 0x103d6b0: beq   v0, zero, 0x103d6d8 addu  a1, s0, zero
+// 0x0103d6bc: 0x103d6bc: sll   zero, zero, 0
+// 0x0103d6c0: 0x103d6c0: beq   v0, zero, 0x103d6e8 addu  a1, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brfalse L_103d6d8
+	brfalse L_103d6e8
 // --- basic block ---
-// 0x0103d6b8: 0x103d6b8: lw    v0, -11888(s3)
+// 0x0103d6c8: 0x103d6c8: lw    v0, -11424(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d6bc: 0x103d6bc: sll   zero, zero, 0
-// 0x0103d6c0: 0x103d6c0: mult  v0, s2
+// 0x0103d6cc: 0x103d6cc: sll   zero, zero, 0
+// 0x0103d6d0: 0x103d6d0: mult  v0, s2
 	ldloc 5
 	ldloc 10
 	mul
 	stloc 11
-// 0x0103d6c4: 0x103d6c4: mflo  lo
+// 0x0103d6d4: 0x103d6d4: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x0103d6c8: 0x103d6c8: addu  s1, s1, s2
+// 0x0103d6d8: 0x103d6d8: addu  s1, s1, s2
 	ldloc 8
 	ldloc 10
 	add
 	stloc 8
-// 0x0103d6cc: 0x103d6cc: jal   0x1001b68 addiu a0, s1, 44
+// 0x0103d6dc: 0x103d6dc: jal   0x1001b68 addiu a0, s1, 44
 	ldloc 8
 	ldc.i4.s 44
 	add
@@ -3809,11 +3809,11 @@ L_103d6a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d6d4: 0x103d6d4: addu  a0, s4, zero
+// 0x0103d6e4: 0x103d6e4: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-L_103d6d8:
-// 0x0103d6d8: 0x103d6d8: jal   0x1097e5c addu  a1, s0, zero
+L_103d6e8:
+// 0x0103d6e8: 0x103d6e8: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -3821,48 +3821,48 @@ L_103d6d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d6e0: 0x103d6e0: lui   v0, 0x60000
+// 0x0103d6f0: 0x103d6f0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103d6e4: 0x103d6e4: lw    v1, -11888(v0)
+// 0x0103d6f4: 0x103d6f4: lw    v1, -11424(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103d6e8: 0x103d6e8: addiu v0, zero, 300
+// 0x0103d6f8: 0x103d6f8: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103d6ec: 0x103d6ec: mult  v1, v0
+// 0x0103d6fc: 0x103d6fc: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 11
-// 0x0103d6f0: 0x103d6f0: lui   v0, 0xe0000
+// 0x0103d700: 0x103d700: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0103d6f4: 0x103d6f4: addiu v0, v0, 30532
+// 0x0103d704: 0x103d704: addiu v0, v0, 30996
 	ldloc 5
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 5
-// 0x0103d6f8: 0x103d6f8: mflo  lo
+// 0x0103d708: 0x103d708: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0103d6fc: 0x103d6fc: addu  v0, v0, v1
+// 0x0103d70c: 0x103d70c: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0103d700: 0x103d700: lw    v0, 20(v0)
+// 0x0103d710: 0x103d710: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3871,8 +3871,8 @@ L_103d6d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d704: 0x103d704: sll   zero, zero, 0
-// 0x0103d708: 0x103d708: jalr  v0 sll   zero, zero, 0
+// 0x0103d714: 0x103d714: sll   zero, zero, 0
+// 0x0103d718: 0x103d718: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3884,12 +3884,12 @@ L_103d6d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103d710:
-// 0x0103d710: 0x103d710: lw    ra, 44(sp)
-// 0x0103d714: 0x103d714: addiu v0, zero, 1
+L_103d720:
+// 0x0103d720: 0x103d720: lw    ra, 44(sp)
+// 0x0103d724: 0x103d724: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103d718: 0x103d718: lw    s5, 40(sp)
+// 0x0103d728: 0x103d728: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3898,7 +3898,7 @@ L_103d710:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103d71c: 0x103d71c: lw    s4, 36(sp)
+// 0x0103d72c: 0x103d72c: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3907,7 +3907,7 @@ L_103d710:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103d720: 0x103d720: lw    s3, 32(sp)
+// 0x0103d730: 0x103d730: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3916,7 +3916,7 @@ L_103d710:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103d724: 0x103d724: lw    s2, 28(sp)
+// 0x0103d734: 0x103d734: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3925,7 +3925,7 @@ L_103d710:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103d728: 0x103d728: lw    s1, 24(sp)
+// 0x0103d738: 0x103d738: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3934,7 +3934,7 @@ L_103d710:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103d72c: 0x103d72c: lw    s0, 20(sp)
+// 0x0103d73c: 0x103d73c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3943,7 +3943,7 @@ L_103d710:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103d730: 0x103d730: jr    ra addiu sp, sp, 48
+// 0x0103d740: 0x103d740: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3955,7 +3955,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_input_container_103d78c(int32,int32,int32,int32,int32)
+.method public static int32 create_input_container_103d79c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4005,12 +4005,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d78c: 0x103d78c: addiu sp, sp, -56
+// 0x0103d79c: 0x103d79c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0103d790: 0x103d790: sw    s1, 36(sp)
+// 0x0103d7a0: 0x103d7a0: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4019,8 +4019,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103d794: 0x103d794: sw    ra, 52(sp)
-// 0x0103d798: 0x103d798: sw    s4, 48(sp)
+// 0x0103d7a4: 0x103d7a4: sw    ra, 52(sp)
+// 0x0103d7a8: 0x103d7a8: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4029,7 +4029,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103d79c: 0x103d79c: sw    s3, 44(sp)
+// 0x0103d7ac: 0x103d7ac: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4038,7 +4038,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103d7a0: 0x103d7a0: sw    s2, 40(sp)
+// 0x0103d7b0: 0x103d7b0: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4047,7 +4047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103d7a4: 0x103d7a4: jal   0x10939c0 sw    s0, 32(sp)
+// 0x0103d7b4: 0x103d7b4: jal   0x1093fe4 sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4061,43 +4061,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_get_txtbox_height_10939c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_get_txtbox_height_1093fe4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d7ac: 0x103d7ac: jal   0x101fa28 addu  s1, v0, zero
+// 0x0103d7bc: 0x103d7bc: jal   0x101fa38 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0103d7b4: 0x103d7b4: beq   v0, zero, 0x103d7c0 sll   zero, zero, 0
+// 0x0103d7c4: 0x103d7c4: beq   v0, zero, 0x103d7d0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103d7c0
+	brfalse L_103d7d0
 // --- basic block ---
-// 0x0103d7bc: 0x103d7bc: addiu s1, zero, 52
+// 0x0103d7cc: 0x103d7cc: addiu s1, zero, 52
 	ldc.i4.s 52
 	stloc 8
-L_103d7c0:
-// 0x0103d7c0: 0x103d7c0: lui   a0, 0x10000
+L_103d7d0:
+// 0x0103d7d0: 0x103d7d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d7c4: 0x103d7c4: addiu a3, zero, -2
+// 0x0103d7d4: 0x103d7d4: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x0103d7c8: 0x103d7c8: addiu a0, a0, -6352
+// 0x0103d7d8: 0x103d7d8: addiu a0, a0, -6356
 	ldloc.1
-	ldc.i4 -6352
+	ldc.i4 -6356
 	add
 	stloc.1
-// 0x0103d7cc: 0x103d7cc: addu  a1, zero, zero
+// 0x0103d7dc: 0x103d7dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d7d0: 0x103d7d0: addiu a2, zero, -2
+// 0x0103d7e0: 0x103d7e0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0103d7d4: 0x103d7d4: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0103d7e4: 0x103d7e4: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4111,54 +4111,54 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d7dc: 0x103d7dc: addu  a0, v0, zero
+// 0x0103d7ec: 0x103d7ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103d7e0: 0x103d7e0: addu  a1, zero, zero
+// 0x0103d7f0: 0x103d7f0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d7e4: 0x103d7e4: addu  a2, zero, zero
+// 0x0103d7f4: 0x103d7f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103d7e8: 0x103d7e8: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0103d7f8: 0x103d7f8: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0103d7f0: 0x103d7f0: lui   a0, 0x10000
+// 0x0103d800: 0x103d800: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d7f4: 0x103d7f4: lui   v0, 0x80100000
+// 0x0103d804: 0x103d804: lui   v0, 0x80100000
 	ldc.i4 2148532224
 	stloc 5
-// 0x0103d7f8: 0x103d7f8: addu  a3, s1, zero
+// 0x0103d808: 0x103d808: addu  a3, s1, zero
 	ldloc 8
 	stloc 4
-// 0x0103d7fc: 0x103d7fc: addiu a0, a0, -6456
+// 0x0103d80c: 0x103d80c: addiu a0, a0, -6460
 	ldloc.1
-	ldc.i4 -6456
+	ldc.i4 -6460
 	add
 	stloc.1
-// 0x0103d800: 0x103d800: addu  a1, zero, zero
+// 0x0103d810: 0x103d810: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d804: 0x103d804: addiu a2, zero, -2
+// 0x0103d814: 0x103d814: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0103d808: 0x103d808: ori   v0, v0, 9
+// 0x0103d818: 0x103d818: ori   v0, v0, 9
 	ldloc 5
 	ldc.i4.s 9
 	or
 	stloc 5
-// 0x0103d80c: 0x103d80c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0103d81c: 0x103d81c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4172,31 +4172,31 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d814: 0x103d814: lui   a0, 0x10000
+// 0x0103d824: 0x103d824: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d818: 0x103d818: lui   a1, 0x10000
+// 0x0103d828: 0x103d828: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103d81c: 0x103d81c: addiu a2, zero, 16
+// 0x0103d82c: 0x103d82c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0103d820: 0x103d820: addiu a0, a0, -6312
+// 0x0103d830: 0x103d830: addiu a0, a0, -6316
 	ldloc.1
-	ldc.i4 -6312
+	ldc.i4 -6316
 	add
 	stloc.1
-// 0x0103d824: 0x103d824: addiu a1, a1, -6304
+// 0x0103d834: 0x103d834: addiu a1, a1, -6308
 	ldloc.2
-	ldc.i4 -6304
+	ldc.i4 -6308
 	add
 	stloc.2
-// 0x0103d828: 0x103d828: jal   0x109e13c addu  s1, v0, zero
+// 0x0103d838: 0x103d838: jal   0x109e784 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4204,55 +4204,55 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d830: 0x103d830: addu  a1, v0, zero
+// 0x0103d840: 0x103d840: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103d834: 0x103d834: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0103d844: 0x103d844: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d83c: 0x103d83c: jal   0x101fa28 addiu s3, zero, 136
+// 0x0103d84c: 0x103d84c: jal   0x101fa38 addiu s3, zero, 136
 	ldc.i4 136
 	stloc 11
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0103d844: 0x103d844: lui   a1, 0x10000
+// 0x0103d854: 0x103d854: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103d848: 0x103d848: lui   a3, 0x10000
+// 0x0103d858: 0x103d858: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103d84c: 0x103d84c: lui   a0, 0x10000
+// 0x0103d85c: 0x103d85c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d850: 0x103d850: addiu a1, a1, 18500
+// 0x0103d860: 0x103d860: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0103d854: 0x103d854: ori   a3, a3, 16
+// 0x0103d864: 0x103d864: ori   a3, a3, 16
 	ldloc 4
 	ldc.i4.s 16
 	or
 	stloc 4
-// 0x0103d858: 0x103d858: addiu a2, zero, 18
+// 0x0103d868: 0x103d868: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0103d85c: 0x103d85c: jal   0x1098d10 addiu a0, a0, -6400
+// 0x0103d86c: 0x103d86c: jal   0x1099358 addiu a0, a0, -6404
 	ldloc.1
-	ldc.i4 -6400
+	ldc.i4 -6404
 	add
 	stloc.1
 	ldloc.0
@@ -4260,20 +4260,20 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d864: 0x103d864: lui   a0, 0x10000
+// 0x0103d874: 0x103d874: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d868: 0x103d868: addiu a0, a0, -7592
+// 0x0103d878: 0x103d878: addiu a0, a0, -7596
 	ldloc.1
-	ldc.i4 -7592
+	ldc.i4 -7596
 	add
 	stloc.1
-// 0x0103d86c: 0x103d86c: jal   0x101cd60 addu  s2, v0, zero
+// 0x0103d87c: 0x103d87c: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -4281,36 +4281,36 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d874: 0x103d874: lui   a2, 0x100000
+// 0x0103d884: 0x103d884: lui   a2, 0x100000
 	ldc.i4 1048576
 	stloc.3
-// 0x0103d878: 0x103d878: lui   a3, 0x1040000
+// 0x0103d888: 0x103d888: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x0103d87c: 0x103d87c: lui   a0, 0x10000
+// 0x0103d88c: 0x103d88c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d880: 0x103d880: ori   a2, a2, 137
+// 0x0103d890: 0x103d890: ori   a2, a2, 137
 	ldloc.3
 	ldc.i4 137
 	or
 	stloc.3
-// 0x0103d884: 0x103d884: addiu a3, a3, -10984
+// 0x0103d894: 0x103d894: addiu a3, a3, -10968
 	ldloc 4
-	ldc.i4 -10984
+	ldc.i4 -10968
 	add
 	stloc 4
-// 0x0103d888: 0x103d888: addiu a0, a0, -6292
+// 0x0103d898: 0x103d898: addiu a0, a0, -6296
 	ldloc.1
-	ldc.i4 -6292
+	ldc.i4 -6296
 	add
 	stloc.1
-// 0x0103d88c: 0x103d88c: jal   0x1091088 addu  a1, v0, zero
+// 0x0103d89c: 0x103d89c: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4318,23 +4318,23 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d894: 0x103d894: addu  s4, v0, zero
+// 0x0103d8a4: 0x103d8a4: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x0103d898: 0x103d898: lui   v0, 0x1040000
+// 0x0103d8a8: 0x103d8a8: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103d89c: 0x103d89c: addiu v0, v0, -11108
+// 0x0103d8ac: 0x103d8ac: addiu v0, v0, -11092
 	ldloc 5
-	ldc.i4 -11108
+	ldc.i4 -11092
 	add
 	stloc 5
-// 0x0103d8a0: 0x103d8a0: sw    v0, 216(s1)
+// 0x0103d8b0: 0x103d8b0: sw    v0, 216(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4343,51 +4343,51 @@ L_103d7c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103d8a4: 0x103d8a4: addu  a0, s2, zero
+// 0x0103d8b4: 0x103d8b4: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0103d8a8: 0x103d8a8: jal   0x1097b00 addiu a1, zero, 31
+// 0x0103d8b8: 0x103d8b8: jal   0x1098148 addiu a1, zero, 31
 	ldc.i4.s 31
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl113::ssd_text_set_input_type_1097b00(int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_input_type_1098148(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d8b0: 0x103d8b0: addu  a0, s2, zero
+// 0x0103d8c0: 0x103d8c0: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0103d8b4: 0x103d8b4: jal   0x1097c48 addu  a1, zero, zero
+// 0x0103d8c4: 0x103d8c4: jal   0x1098290 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl113::ssd_text_set_readonly_1097c48(int32,int32)
+	call int32 Cibyl113::ssd_text_set_readonly_1098290(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d8bc: 0x103d8bc: lui   a0, 0x10000
+// 0x0103d8cc: 0x103d8cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103d8c0: 0x103d8c0: addu  a3, zero, zero
+// 0x0103d8d0: 0x103d8d0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103d8c4: 0x103d8c4: addiu a0, a0, -6244
+// 0x0103d8d4: 0x103d8d4: addiu a0, a0, -6248
 	ldloc.1
-	ldc.i4 -6244
+	ldc.i4 -6248
 	add
 	stloc.1
-// 0x0103d8c8: 0x103d8c8: addu  a1, zero, zero
+// 0x0103d8d8: 0x103d8d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d8cc: 0x103d8cc: addiu a2, zero, -2
+// 0x0103d8dc: 0x103d8dc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0103d8d0: 0x103d8d0: jal   0x1093a24 sw    s3, 16(sp)
+// 0x0103d8e0: 0x103d8e0: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4401,21 +4401,21 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d8d8: 0x103d8d8: addu  a0, v0, zero
+// 0x0103d8e8: 0x103d8e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103d8dc: 0x103d8dc: addu  a2, zero, zero
+// 0x0103d8ec: 0x103d8ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103d8e0: 0x103d8e0: addu  a1, zero, zero
+// 0x0103d8f0: 0x103d8f0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d8e4: 0x103d8e4: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x0103d8f4: 0x103d8f4: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4427,9 +4427,9 @@ L_103d7c0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0103d8ec: 0x103d8ec: lw    v0, 24(sp)
+// 0x0103d8fc: 0x103d8fc: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4438,63 +4438,63 @@ L_103d7c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d8f0: 0x103d8f0: addu  a0, s0, zero
+// 0x0103d900: 0x103d900: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0103d8f4: 0x103d8f4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0103d904: 0x103d904: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d8fc: 0x103d8fc: addu  a0, s1, zero
+// 0x0103d90c: 0x103d90c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103d900: 0x103d900: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0103d910: 0x103d910: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d908: 0x103d908: addu  a0, s0, zero
+// 0x0103d918: 0x103d918: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0103d90c: 0x103d90c: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0103d91c: 0x103d91c: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d914: 0x103d914: lui   a0, 0x0
+// 0x0103d924: 0x103d924: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103d918: 0x103d918: addiu a3, zero, 5
+// 0x0103d928: 0x103d928: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x0103d91c: 0x103d91c: addiu a0, a0, 32124
+// 0x0103d92c: 0x103d92c: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x0103d920: 0x103d920: addu  a1, zero, zero
+// 0x0103d930: 0x103d930: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d924: 0x103d924: addiu a2, zero, -2
+// 0x0103d934: 0x103d934: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0103d928: 0x103d928: jal   0x1093a24 sw    s3, 16(sp)
+// 0x0103d938: 0x103d938: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4508,21 +4508,21 @@ L_103d7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d930: 0x103d930: addu  a0, v0, zero
+// 0x0103d940: 0x103d940: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103d934: 0x103d934: addu  a2, zero, zero
+// 0x0103d944: 0x103d944: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0103d938: 0x103d938: addu  a1, zero, zero
+// 0x0103d948: 0x103d948: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103d93c: 0x103d93c: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x0103d94c: 0x103d94c: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4534,9 +4534,9 @@ L_103d7c0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0103d944: 0x103d944: lw    v0, 24(sp)
+// 0x0103d954: 0x103d954: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4545,37 +4545,37 @@ L_103d7c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103d948: 0x103d948: addu  a0, s0, zero
+// 0x0103d958: 0x103d958: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0103d94c: 0x103d94c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0103d95c: 0x103d95c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d954: 0x103d954: addu  a0, s0, zero
+// 0x0103d964: 0x103d964: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0103d958: 0x103d958: jal   0x1098ec4 addu  a1, s4, zero
+// 0x0103d968: 0x103d968: jal   0x109950c addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103d960: 0x103d960: lw    ra, 52(sp)
-// 0x0103d964: 0x103d964: addu  v0, s0, zero
+// 0x0103d970: 0x103d970: lw    ra, 52(sp)
+// 0x0103d974: 0x103d974: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x0103d968: 0x103d968: lw    s4, 48(sp)
+// 0x0103d978: 0x103d978: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4584,7 +4584,7 @@ L_103d7c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103d96c: 0x103d96c: lw    s3, 44(sp)
+// 0x0103d97c: 0x103d97c: lw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4593,7 +4593,7 @@ L_103d7c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103d970: 0x103d970: lw    s2, 40(sp)
+// 0x0103d980: 0x103d980: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4602,7 +4602,7 @@ L_103d7c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103d974: 0x103d974: lw    s1, 36(sp)
+// 0x0103d984: 0x103d984: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4611,7 +4611,7 @@ L_103d7c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103d978: 0x103d978: lw    s0, 32(sp)
+// 0x0103d988: 0x103d988: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4620,7 +4620,7 @@ L_103d7c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103d97c: 0x103d97c: jr    ra addiu sp, sp, 56
+// 0x0103d98c: 0x103d98c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4632,7 +4632,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_dlg_103d984(int32,int32,int32,int32,int32)
+.method public static int32 create_dlg_103d994(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra,int32 lo)
@@ -4679,13 +4679,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103d984: 0x103d984: addiu sp, sp, -40
+// 0x0103d994: 0x103d994: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103d988: 0x103d988: sw    ra, 36(sp)
-// 0x0103d98c: 0x103d98c: sw    s2, 32(sp)
+// 0x0103d998: 0x103d998: sw    ra, 36(sp)
+// 0x0103d99c: 0x103d99c: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4694,7 +4694,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103d990: 0x103d990: sw    s1, 28(sp)
+// 0x0103d9a0: 0x103d9a0: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4703,10 +4703,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103d994: 0x103d994: addu  s2, a0, zero
+// 0x0103d9a4: 0x103d9a4: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103d998: 0x103d998: sw    s0, 24(sp)
+// 0x0103d9a8: 0x103d9a8: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4715,7 +4715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103d99c: 0x103d99c: sw    a1, 16(sp)
+// 0x0103d9ac: 0x103d9ac: sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4724,7 +4724,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103d9a0: 0x103d9a0: jal   0x103d78c addu  s0, a2, zero
+// 0x0103d9b0: 0x103d9b0: jal   0x103d79c addu  s0, a2, zero
 	ldloc.3
 	stloc 8
 	ldloc.0
@@ -4732,38 +4732,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::create_input_container_103d78c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::create_input_container_103d79c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d9a8: 0x103d9a8: addu  s1, v0, zero
+// 0x0103d9b8: 0x103d9b8: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0103d9ac: 0x103d9ac: lui   v0, 0x60000
+// 0x0103d9bc: 0x103d9bc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103d9b0: 0x103d9b0: lw    v1, -11888(v0)
+// 0x0103d9c0: 0x103d9c0: lw    v1, -11424(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103d9b4: 0x103d9b4: addiu v0, zero, 300
+// 0x0103d9c4: 0x103d9c4: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103d9b8: 0x103d9b8: mult  v1, v0
+// 0x0103d9c8: 0x103d9c8: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 12
-// 0x0103d9bc: 0x103d9bc: lui   v0, 0xe0000
+// 0x0103d9cc: 0x103d9cc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0103d9c0: 0x103d9c0: lw    a1, 16(sp)
+// 0x0103d9d0: 0x103d9d0: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4772,23 +4772,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103d9c4: 0x103d9c4: addiu v0, v0, 30532
+// 0x0103d9d4: 0x103d9d4: addiu v0, v0, 30996
 	ldloc 5
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 5
-// 0x0103d9c8: 0x103d9c8: addu  a0, a1, zero
+// 0x0103d9d8: 0x103d9d8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0103d9cc: 0x103d9cc: mflo  lo
+// 0x0103d9dc: 0x103d9dc: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x0103d9d0: 0x103d9d0: addu  v0, v0, v1
+// 0x0103d9e0: 0x103d9e0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0103d9d4: 0x103d9d4: sw    s0, 32(v0)
+// 0x0103d9e4: 0x103d9e4: sw    s0, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4797,7 +4797,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103d9d8: 0x103d9d8: sw    s2, 12(v0)
+// 0x0103d9e8: 0x103d9e8: sw    s2, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4806,7 +4806,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103d9dc: 0x103d9dc: jal   0x101cd60 sw    a1, 16(v0)
+// 0x0103d9ec: 0x103d9ec: jal   0x101cd70 sw    a1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4820,29 +4820,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103d9e4: 0x103d9e4: lui   a2, 0x1040000
+// 0x0103d9f4: 0x103d9f4: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103d9e8: 0x103d9e8: lui   a3, 0x140000
+// 0x0103d9f8: 0x103d9f8: lui   a3, 0x140000
 	ldc.i4 1310720
 	stloc 4
-// 0x0103d9ec: 0x103d9ec: addu  a0, s2, zero
+// 0x0103d9fc: 0x103d9fc: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0103d9f0: 0x103d9f0: addu  a1, v0, zero
+// 0x0103da00: 0x103da00: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103d9f4: 0x103d9f4: addiu a2, a2, -9388
+// 0x0103da04: 0x103da04: addiu a2, a2, -9372
 	ldloc.3
-	ldc.i4 -9388
+	ldc.i4 -9372
 	add
 	stloc.3
-// 0x0103d9f8: 0x103d9f8: jal   0x1095a08 ori   a3, a3, 10240
+// 0x0103da08: 0x103da08: jal   0x1096050 ori   a3, a3, 10240
 	ldloc 4
 	ldc.i4 10240
 	or
@@ -4852,18 +4852,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103da00: 0x103da00: addu  a0, v0, zero
+// 0x0103da10: 0x103da10: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103da04: 0x103da04: addu  a1, s1, zero
+// 0x0103da14: 0x103da14: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0103da08: 0x103da08: jal   0x1098ec4 sw    v0, 16(sp)
+// 0x0103da18: 0x103da18: jal   0x109950c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4874,12 +4874,12 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103da10: 0x103da10: lw    v0, 16(sp)
+// 0x0103da20: 0x103da20: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4888,8 +4888,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103da14: 0x103da14: lw    ra, 36(sp)
-// 0x0103da18: 0x103da18: sw    s0, 116(v0)
+// 0x0103da24: 0x103da24: lw    ra, 36(sp)
+// 0x0103da28: 0x103da28: sw    s0, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4898,7 +4898,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103da1c: 0x103da1c: lw    s2, 32(sp)
+// 0x0103da2c: 0x103da2c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4907,7 +4907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103da20: 0x103da20: lw    s1, 28(sp)
+// 0x0103da30: 0x103da30: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4916,7 +4916,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103da24: 0x103da24: lw    s0, 24(sp)
+// 0x0103da34: 0x103da34: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4925,7 +4925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103da28: 0x103da28: jr    ra addiu sp, sp, 40
+// 0x0103da38: 0x103da38: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4937,7 +4937,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 generic_search_dlg_get_search_dlg_103da30(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_dlg_get_search_dlg_103da40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 lo,int32 ra,int32 v1)
@@ -4981,12 +4981,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103da30: 0x103da30: addiu sp, sp, -32
+// 0x0103da40: 0x103da40: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103da34: 0x103da34: sw    s0, 20(sp)
+// 0x0103da44: 0x103da44: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4995,23 +4995,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103da38: 0x103da38: addiu s0, zero, 300
+// 0x0103da48: 0x103da48: addiu s0, zero, 300
 	ldc.i4 300
 	stloc 6
-// 0x0103da3c: 0x103da3c: mult  a0, s0
+// 0x0103da4c: 0x103da4c: mult  a0, s0
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 9
-// 0x0103da40: 0x103da40: lui   v0, 0xe0000
+// 0x0103da50: 0x103da50: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0103da44: 0x103da44: addiu v0, v0, 30532
+// 0x0103da54: 0x103da54: addiu v0, v0, 30996
 	ldloc 5
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 5
-// 0x0103da48: 0x103da48: sw    s1, 24(sp)
+// 0x0103da58: 0x103da58: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5020,30 +5020,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103da4c: 0x103da4c: sw    ra, 28(sp)
-// 0x0103da50: 0x103da50: mflo  lo
+// 0x0103da5c: 0x103da5c: sw    ra, 28(sp)
+// 0x0103da60: 0x103da60: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0103da54: 0x103da54: addu  s0, s0, v0
+// 0x0103da64: 0x103da64: addu  s0, s0, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x0103da58: 0x103da58: lw    v0, 0(s0)
+// 0x0103da68: 0x103da68: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103da5c: 0x103da5c: sll   zero, zero, 0
-// 0x0103da60: 0x103da60: bne   v0, zero, 0x103da90 addu  s1, a0, zero
+// 0x0103da6c: 0x103da6c: sll   zero, zero, 0
+// 0x0103da70: 0x103da70: bne   v0, zero, 0x103daa0 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brtrue L_103da90
+	brtrue L_103daa0
 // --- basic block ---
-// 0x0103da68: 0x103da68: lw    a0, 12(s0)
+// 0x0103da78: 0x103da78: lw    a0, 12(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5052,7 +5052,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103da6c: 0x103da6c: lw    a1, 16(s0)
+// 0x0103da7c: 0x103da7c: lw    a1, 16(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5061,7 +5061,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103da70: 0x103da70: lw    a2, 32(s0)
+// 0x0103da80: 0x103da80: lw    a2, 32(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5070,29 +5070,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103da74: 0x103da74: jal   0x103d984 sll   zero, zero, 0
+// 0x0103da84: 0x103da84: jal   0x103d994 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::create_dlg_103d984(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::create_dlg_103d994(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x0103da7c: 0x103da7c: lui   a0, 0x1040000
+// 0x0103da8c: 0x103da8c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0103da80: 0x103da80: addiu a0, a0, -9536
+// 0x0103da90: 0x103da90: addiu a0, a0, -9520
 	ldloc.1
-	ldc.i4 -9536
+	ldc.i4 -9520
 	add
 	stloc.1
-// 0x0103da84: 0x103da84: addu  a1, zero, zero
+// 0x0103da94: 0x103da94: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103da88: 0x103da88: jal   0x10400d8 sw    v0, 0(s0)
+// 0x0103da98: 0x103da98: jal   0x10400e8 sw    v0, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5104,30 +5104,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_events_register_10400d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_events_register_10400e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 5
 // --- basic block ---
-L_103da90:
-// 0x0103da90: 0x103da90: addiu v0, zero, 300
+L_103daa0:
+// 0x0103daa0: 0x103daa0: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103da94: 0x103da94: mult  s1, v0
+// 0x0103daa4: 0x103daa4: mult  s1, v0
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 9
-// 0x0103da98: 0x103da98: lui   v0, 0xe0000
+// 0x0103daa8: 0x103daa8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0103da9c: 0x103da9c: addiu v0, v0, 30532
+// 0x0103daac: 0x103daac: addiu v0, v0, 30996
 	ldloc 5
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 5
-// 0x0103daa0: 0x103daa0: lw    ra, 28(sp)
-// 0x0103daa4: 0x103daa4: lw    s0, 20(sp)
+// 0x0103dab0: 0x103dab0: lw    ra, 28(sp)
+// 0x0103dab4: 0x103dab4: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5136,22 +5136,22 @@ L_103da90:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103daa8: 0x103daa8: mflo  lo
+// 0x0103dab8: 0x103dab8: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x0103daac: 0x103daac: addu  s1, s1, v0
+// 0x0103dabc: 0x103dabc: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0103dab0: 0x103dab0: lw    v0, 0(s1)
+// 0x0103dac0: 0x103dac0: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103dab4: 0x103dab4: lw    s1, 24(sp)
+// 0x0103dac4: 0x103dac4: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5160,7 +5160,7 @@ L_103da90:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103dab8: 0x103dab8: jr    ra addiu sp, sp, 32
+// 0x0103dac8: 0x103dac8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5172,7 +5172,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_device_event_103dac0(int32,int32,int32,int32,int32)
+.method public static int32 on_device_event_103dad0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5210,16 +5210,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103dac0: 0x103dac0: addiu sp, sp, -24
+// 0x0103dad0: 0x103dad0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103dac4: 0x103dac4: addiu v0, zero, 10
+// 0x0103dad4: 0x103dad4: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x0103dac8: 0x103dac8: sw    ra, 20(sp)
-// 0x0103dacc: 0x103dacc: bne   a0, v0, 0x103db14 sw    s0, 16(sp)
+// 0x0103dad8: 0x103dad8: sw    ra, 20(sp)
+// 0x0103dadc: 0x103dadc: bne   a0, v0, 0x103db24 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -5230,43 +5230,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_103db14
+	bne.un L_103db24
 // --- basic block ---
-// 0x0103dad4: 0x103dad4: lui   v0, 0x60000
+// 0x0103dae4: 0x103dae4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103dad8: 0x103dad8: lw    a0, -11888(v0)
+// 0x0103dae8: 0x103dae8: lw    a0, -11424(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103dadc: 0x103dadc: jal   0x103da30 sll   zero, zero, 0
+// 0x0103daec: 0x103daec: jal   0x103da40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da30(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103dae4: 0x103dae4: lui   a1, 0x10000
+// 0x0103daf4: 0x103daf4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103dae8: 0x103dae8: addu  s0, v0, zero
+// 0x0103daf8: 0x103daf8: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0103daec: 0x103daec: addu  a0, v0, zero
+// 0x0103dafc: 0x103dafc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103daf0: 0x103daf0: jal   0x109b304 addiu a1, a1, -6244
+// 0x0103db00: 0x103db00: jal   0x109b94c addiu a1, a1, -6248
 	ldloc.2
-	ldc.i4 -6244
+	ldc.i4 -6248
 	add
 	stloc.2
 	ldloc.0
@@ -5274,35 +5274,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103daf8: 0x103daf8: beq   s0, zero, 0x103db14 sll   zero, zero, 0
+// 0x0103db08: 0x103db08: beq   s0, zero, 0x103db24 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_103db14
+	brfalse L_103db24
 // --- basic block ---
-// 0x0103db00: 0x103db00: beq   v0, zero, 0x103db14 addu  a0, v0, zero
+// 0x0103db10: 0x103db10: beq   v0, zero, 0x103db24 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_103db14
+	brfalse L_103db24
 // --- basic block ---
-// 0x0103db08: 0x103db08: addiu a1, zero, -2
+// 0x0103db18: 0x103db18: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x0103db0c: 0x103db0c: jal   0x1098ef8 addu  a2, zero, zero
+// 0x0103db1c: 0x103db1c: jal   0x1099540 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_size_1098ef8(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_size_1099540(int32,int32,int32)
 // --- basic block ---
-L_103db14:
-// 0x0103db14: 0x103db14: lw    ra, 20(sp)
-// 0x0103db18: 0x103db18: lw    s0, 16(sp)
+L_103db24:
+// 0x0103db24: 0x103db24: lw    ra, 20(sp)
+// 0x0103db28: 0x103db28: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5311,7 +5311,7 @@ L_103db14:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103db1c: 0x103db1c: jr    ra addiu sp, sp, 24
+// 0x0103db2c: 0x103db2c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5323,7 +5323,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 generic_search_dlg_get_search_edit_box_103db24(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_dlg_get_search_edit_box_103db34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -5358,32 +5358,32 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103db24: 0x103db24: addiu sp, sp, -24
+// 0x0103db34: 0x103db34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103db28: 0x103db28: sw    ra, 20(sp)
-// 0x0103db2c: 0x103db2c: jal   0x103da30 sll   zero, zero, 0
+// 0x0103db38: 0x103db38: sw    ra, 20(sp)
+// 0x0103db3c: 0x103db3c: jal   0x103da40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da30(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_get_search_dlg_103da40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103db34: 0x103db34: lui   a1, 0x10000
+// 0x0103db44: 0x103db44: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103db38: 0x103db38: addu  a0, v0, zero
+// 0x0103db48: 0x103db48: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103db3c: 0x103db3c: jal   0x109b304 addiu a1, a1, -6400
+// 0x0103db4c: 0x103db4c: jal   0x109b94c addiu a1, a1, -6404
 	ldloc.2
-	ldc.i4 -6400
+	ldc.i4 -6404
 	add
 	stloc.2
 	ldloc.0
@@ -5391,14 +5391,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103db44: 0x103db44: lw    ra, 20(sp)
-// 0x0103db48: 0x103db48: sll   zero, zero, 0
-// 0x0103db4c: 0x103db4c: jr    ra addiu sp, sp, 24
+// 0x0103db54: 0x103db54: lw    ra, 20(sp)
+// 0x0103db58: 0x103db58: sll   zero, zero, 0
+// 0x0103db5c: 0x103db5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5410,7 +5410,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_dlg_closed_103db54(int32,int32,int32,int32,int32)
+.method public static int32 on_dlg_closed_103db64(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 lo,int32 s2,int32 ra)
@@ -5457,12 +5457,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103db54: 0x103db54: addiu sp, sp, -32
+// 0x0103db64: 0x103db64: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103db58: 0x103db58: sw    s2, 24(sp)
+// 0x0103db68: 0x103db68: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5471,19 +5471,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103db5c: 0x103db5c: lui   s2, 0x60000
+// 0x0103db6c: 0x103db6c: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x0103db60: 0x103db60: lw    v0, -11888(s2)
+// 0x0103db70: 0x103db70: lw    v0, -11424(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103db64: 0x103db64: sw    s1, 20(sp)
+// 0x0103db74: 0x103db74: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5492,15 +5492,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103db68: 0x103db68: addiu s1, zero, 300
+// 0x0103db78: 0x103db78: addiu s1, zero, 300
 	ldc.i4 300
 	stloc 9
-// 0x0103db6c: 0x103db6c: mult  v0, s1
+// 0x0103db7c: 0x103db7c: mult  v0, s1
 	ldloc 5
 	ldloc 9
 	mul
 	stloc 10
-// 0x0103db70: 0x103db70: sw    s0, 16(sp)
+// 0x0103db80: 0x103db80: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5509,27 +5509,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103db74: 0x103db74: lui   s0, 0xe0000
+// 0x0103db84: 0x103db84: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x0103db78: 0x103db78: addiu s0, s0, 30532
+// 0x0103db88: 0x103db88: addiu s0, s0, 30996
 	ldloc 8
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 8
-// 0x0103db7c: 0x103db7c: addiu a2, zero, 1
+// 0x0103db8c: 0x103db8c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0103db80: 0x103db80: sw    ra, 28(sp)
-// 0x0103db84: 0x103db84: mflo  lo
+// 0x0103db90: 0x103db90: sw    ra, 28(sp)
+// 0x0103db94: 0x103db94: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0103db88: 0x103db88: addu  v1, s0, v0
+// 0x0103db98: 0x103db98: addu  v1, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 6
-// 0x0103db8c: 0x103db8c: lw    v0, 4(v1)
+// 0x0103db9c: 0x103db9c: lw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5538,7 +5538,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103db90: 0x103db90: lw    a1, 8(v1)
+// 0x0103dba0: 0x103dba0: lw    a1, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5547,7 +5547,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103db94: 0x103db94: sw    zero, 4(v1)
+// 0x0103dba4: 0x103dba4: sw    zero, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5556,7 +5556,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103db98: 0x103db98: sw    v0, 40(v1)
+// 0x0103dba8: 0x103dba8: sw    v0, 40(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5565,7 +5565,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103db9c: 0x103db9c: bne   a0, a2, 0x103dc2c sw    zero, 8(v1)
+// 0x0103dbac: 0x103dbac: bne   a0, a2, 0x103dc3c sw    zero, 8(v1)
 	ldloc.1
 	ldloc.3
 	ldloc 7
@@ -5576,9 +5576,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_103dc2c
+	bne.un L_103dc3c
 // --- basic block ---
-// 0x0103dba4: 0x103dba4: lw    a2, 36(v1)
+// 0x0103dbb4: 0x103dbb4: lw    a2, 36(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5587,22 +5587,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103dba8: 0x103dba8: sll   zero, zero, 0
-// 0x0103dbac: 0x103dbac: bne   a2, zero, 0x103dc2c sll   zero, zero, 0
+// 0x0103dbb8: 0x103dbb8: sll   zero, zero, 0
+// 0x0103dbbc: 0x103dbbc: bne   a2, zero, 0x103dc3c sll   zero, zero, 0
 	ldloc.3
-	brtrue L_103dc2c
+	brtrue L_103dc3c
 // --- basic block ---
-// 0x0103dbb4: 0x103dbb4: lw    v0, 0(v1)
+// 0x0103dbc4: 0x103dbc4: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103dbb8: 0x103dbb8: lui   a1, 0x10000
+// 0x0103dbc8: 0x103dbc8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103dbbc: 0x103dbbc: lw    a0, 116(v0)
+// 0x0103dbcc: 0x103dbcc: lw    a0, 116(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5611,9 +5611,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103dbc0: 0x103dbc0: jal   0x109b304 addiu a1, a1, -6456
+// 0x0103dbd0: 0x103dbd0: jal   0x109b94c addiu a1, a1, -6460
 	ldloc.2
-	ldc.i4 -6456
+	ldc.i4 -6460
 	add
 	stloc.2
 	ldloc.0
@@ -5621,20 +5621,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103dbc8: 0x103dbc8: lui   a1, 0x10000
+// 0x0103dbd8: 0x103dbd8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103dbcc: 0x103dbcc: addu  a0, v0, zero
+// 0x0103dbdc: 0x103dbdc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103dbd0: 0x103dbd0: jal   0x109b304 addiu a1, a1, -6400
+// 0x0103dbe0: 0x103dbe0: jal   0x109b94c addiu a1, a1, -6404
 	ldloc.2
-	ldc.i4 -6400
+	ldc.i4 -6404
 	add
 	stloc.2
 	ldloc.0
@@ -5642,12 +5642,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103dbd8: 0x103dbd8: jal   0x1097c00 addu  a0, v0, zero
+// 0x0103dbe8: 0x103dbe8: jal   0x1098248 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5655,56 +5655,56 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_get_text_1097c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_get_text_1098248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103dbe0: 0x103dbe0: beq   v0, zero, 0x103dc18 lui   a1, 0x1040000
+// 0x0103dbf0: 0x103dbf0: beq   v0, zero, 0x103dc28 lui   a1, 0x1040000
 	ldloc 5
 	ldc.i4 17039360
 	stloc.2
-	brfalse L_103dc18
+	brfalse L_103dc28
 // --- basic block ---
-// 0x0103dbe8: 0x103dbe8: lb    v1, 0(v0)
+// 0x0103dbf8: 0x103dbf8: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0103dbec: 0x103dbec: sll   zero, zero, 0
-// 0x0103dbf0: 0x103dbf0: beq   v1, zero, 0x103dc1c addiu a1, a1, -9088
+// 0x0103dbfc: 0x103dbfc: sll   zero, zero, 0
+// 0x0103dc00: 0x103dc00: beq   v1, zero, 0x103dc2c addiu a1, a1, -9072
 	ldloc 6
 	ldloc.2
-	ldc.i4 -9088
+	ldc.i4 -9072
 	add
 	stloc.2
-	brfalse L_103dc1c
+	brfalse L_103dc2c
 // --- basic block ---
-// 0x0103dbf8: 0x103dbf8: lw    v1, -11888(s2)
+// 0x0103dc08: 0x103dc08: lw    v1, -11424(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103dbfc: 0x103dbfc: addu  a1, v0, zero
+// 0x0103dc0c: 0x103dc0c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103dc00: 0x103dc00: mult  v1, s1
+// 0x0103dc10: 0x103dc10: mult  v1, s1
 	ldloc 6
 	ldloc 9
 	mul
 	stloc 10
-// 0x0103dc04: 0x103dc04: mflo  lo
+// 0x0103dc14: 0x103dc14: mflo  lo
 	ldloc 10
 	stloc 9
-// 0x0103dc08: 0x103dc08: addu  s0, s0, s1
+// 0x0103dc18: 0x103dc18: addu  s0, s0, s1
 	ldloc 8
 	ldloc 9
 	add
 	stloc 8
-// 0x0103dc0c: 0x103dc0c: jal   0x1001b68 addiu a0, s0, 44
+// 0x0103dc1c: 0x103dc1c: jal   0x1001b68 addiu a0, s0, 44
 	ldloc 8
 	ldc.i4.s 44
 	add
@@ -5716,17 +5716,17 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103dc14: 0x103dc14: lui   a1, 0x1040000
+// 0x0103dc24: 0x103dc24: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-L_103dc18:
-// 0x0103dc18: 0x103dc18: addiu a1, a1, -9088
+L_103dc28:
+// 0x0103dc28: 0x103dc28: addiu a1, a1, -9072
 	ldloc.2
-	ldc.i4 -9088
+	ldc.i4 -9072
 	add
 	stloc.2
-L_103dc1c:
-// 0x0103dc1c: 0x103dc1c: jal   0x104fe98 addiu a0, zero, 50
+L_103dc2c:
+// 0x0103dc2c: 0x103dc2c: jal   0x104fea8 addiu a0, zero, 50
 	ldc.i4.s 50
 	stloc.1
 	ldloc.0
@@ -5734,20 +5734,20 @@ L_103dc1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103dc24: 0x103dc24: j	 0x103dc68 sll   zero, zero, 0
-	br L_103dc68
+// 0x0103dc34: 0x103dc34: j	 0x103dc78 sll   zero, zero, 0
+	br L_103dc78
 // --- basic block ---
-L_103dc2c:
-// 0x0103dc2c: 0x103dc2c: beq   v0, zero, 0x103dc3c sll   zero, zero, 0
+L_103dc3c:
+// 0x0103dc3c: 0x103dc3c: beq   v0, zero, 0x103dc4c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103dc3c
+	brfalse L_103dc4c
 // --- basic block ---
-// 0x0103dc34: 0x103dc34: jalr  v0 sll   zero, zero, 0
+// 0x0103dc44: 0x103dc44: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5759,50 +5759,50 @@ L_103dc2c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103dc3c:
-// 0x0103dc3c: 0x103dc3c: lui   v0, 0x60000
+L_103dc4c:
+// 0x0103dc4c: 0x103dc4c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103dc40: 0x103dc40: lw    v1, -11888(v0)
+// 0x0103dc50: 0x103dc50: lw    v1, -11424(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103dc44: 0x103dc44: addiu v0, zero, 300
+// 0x0103dc54: 0x103dc54: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103dc48: 0x103dc48: mult  v1, v0
+// 0x0103dc58: 0x103dc58: mult  v1, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 10
-// 0x0103dc4c: 0x103dc4c: lui   v1, 0xe0000
+// 0x0103dc5c: 0x103dc5c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x0103dc50: 0x103dc50: addiu v1, v1, 30532
+// 0x0103dc60: 0x103dc60: addiu v1, v1, 30996
 	ldloc 6
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 6
-// 0x0103dc54: 0x103dc54: mflo  lo
+// 0x0103dc64: 0x103dc64: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0103dc58: 0x103dc58: addu  v0, v0, v1
+// 0x0103dc68: 0x103dc68: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0103dc5c: 0x103dc5c: sb    zero, 44(v0)
+// 0x0103dc6c: 0x103dc6c: sb    zero, 44(v0)
 	ldloc 5
 	ldc.i4.s 44
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0103dc60: 0x103dc60: jal   0x10424a4 sw    zero, 40(v0)
+// 0x0103dc70: 0x103dc70: jal   0x10424b4 sw    zero, 40(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5811,12 +5811,12 @@ L_103dc3c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl48::roadmap_top_bar_show_10424a4()
+	call int32 Cibyl48::roadmap_top_bar_show_10424b4()
 	stloc 5
 // --- basic block ---
-L_103dc68:
-// 0x0103dc68: 0x103dc68: lw    ra, 28(sp)
-// 0x0103dc6c: 0x103dc6c: lw    s2, 24(sp)
+L_103dc78:
+// 0x0103dc78: 0x103dc78: lw    ra, 28(sp)
+// 0x0103dc7c: 0x103dc7c: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5825,7 +5825,7 @@ L_103dc68:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103dc70: 0x103dc70: lw    s1, 20(sp)
+// 0x0103dc80: 0x103dc80: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5834,7 +5834,7 @@ L_103dc68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103dc74: 0x103dc74: lw    s0, 16(sp)
+// 0x0103dc84: 0x103dc84: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5843,7 +5843,7 @@ L_103dc68:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103dc78: 0x103dc78: jr    ra addiu sp, sp, 32
+// 0x0103dc88: 0x103dc88: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5855,7 +5855,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 reopen_keyboard_103dc80(int32,int32,int32,int32,int32)
+.method public static int32 reopen_keyboard_103dc90(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 lo,int32 ra)
@@ -5902,41 +5902,41 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103dc80: 0x103dc80: lui   v0, 0x60000
+// 0x0103dc90: 0x103dc90: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103dc84: 0x103dc84: lw    v1, -11888(v0)
+// 0x0103dc94: 0x103dc94: lw    v1, -11424(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103dc88: 0x103dc88: addiu v0, zero, 300
+// 0x0103dc98: 0x103dc98: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103dc8c: 0x103dc8c: mult  v1, v0
+// 0x0103dc9c: 0x103dc9c: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 11
-// 0x0103dc90: 0x103dc90: lui   v1, 0xe0000
+// 0x0103dca0: 0x103dca0: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x0103dc94: 0x103dc94: addiu v1, v1, 30532
+// 0x0103dca4: 0x103dca4: addiu v1, v1, 30996
 	ldloc 7
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 7
-// 0x0103dc98: 0x103dc98: addiu sp, sp, -40
+// 0x0103dca8: 0x103dca8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103dc9c: 0x103dc9c: sw    ra, 36(sp)
-// 0x0103dca0: 0x103dca0: sw    s2, 32(sp)
+// 0x0103dcac: 0x103dcac: sw    ra, 36(sp)
+// 0x0103dcb0: 0x103dcb0: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5945,7 +5945,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103dca4: 0x103dca4: sw    s1, 28(sp)
+// 0x0103dcb4: 0x103dcb4: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5954,7 +5954,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103dca8: 0x103dca8: sw    s0, 24(sp)
+// 0x0103dcb8: 0x103dcb8: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5963,15 +5963,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103dcac: 0x103dcac: mflo  lo
+// 0x0103dcbc: 0x103dcbc: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0103dcb0: 0x103dcb0: addu  v0, v0, v1
+// 0x0103dcc0: 0x103dcc0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0103dcb4: 0x103dcb4: lw    a0, 40(v0)
+// 0x0103dcc4: 0x103dcc4: lw    a0, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5980,14 +5980,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103dcb8: 0x103dcb8: sll   zero, zero, 0
-// 0x0103dcbc: 0x103dcbc: beq   a0, zero, 0x103dcd8 lui   s2, 0x60000
+// 0x0103dcc8: 0x103dcc8: sll   zero, zero, 0
+// 0x0103dccc: 0x103dccc: beq   a0, zero, 0x103dce8 lui   s2, 0x60000
 	ldloc.1
 	ldc.i4 393216
 	stloc 10
-	brfalse L_103dcd8
+	brfalse L_103dce8
 // --- basic block ---
-// 0x0103dcc4: 0x103dcc4: lw    v0, 24(v0)
+// 0x0103dcd4: 0x103dcd4: lw    v0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5996,8 +5996,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103dcc8: 0x103dcc8: sll   zero, zero, 0
-// 0x0103dccc: 0x103dccc: jalr  v0 addu  a1, zero, zero
+// 0x0103dcd8: 0x103dcd8: sll   zero, zero, 0
+// 0x0103dcdc: 0x103dcdc: jalr  v0 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
@@ -6011,44 +6011,44 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dcd4: 0x103dcd4: lui   s2, 0x60000
+// 0x0103dce4: 0x103dce4: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-L_103dcd8:
-// 0x0103dcd8: 0x103dcd8: lw    v0, -11888(s2)
+L_103dce8:
+// 0x0103dce8: 0x103dce8: lw    v0, -11424(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103dcdc: 0x103dcdc: addiu s1, zero, 300
+// 0x0103dcec: 0x103dcec: addiu s1, zero, 300
 	ldc.i4 300
 	stloc 8
-// 0x0103dce0: 0x103dce0: mult  v0, s1
+// 0x0103dcf0: 0x103dcf0: mult  v0, s1
 	ldloc 5
 	ldloc 8
 	mul
 	stloc 11
-// 0x0103dce4: 0x103dce4: lui   s0, 0xe0000
+// 0x0103dcf4: 0x103dcf4: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x0103dce8: 0x103dce8: addiu s0, s0, 30532
+// 0x0103dcf8: 0x103dcf8: addiu s0, s0, 30996
 	ldloc 9
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 9
-// 0x0103dcec: 0x103dcec: mflo  lo
+// 0x0103dcfc: 0x103dcfc: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0103dcf0: 0x103dcf0: addu  v0, v0, s0
+// 0x0103dd00: 0x103dd00: addu  v0, v0, s0
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x0103dcf4: 0x103dcf4: lw    a0, 16(v0)
+// 0x0103dd04: 0x103dd04: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6057,7 +6057,7 @@ L_103dcd8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103dcf8: 0x103dcf8: sw    zero, 40(v0)
+// 0x0103dd08: 0x103dd08: sw    zero, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6066,7 +6066,7 @@ L_103dcd8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103dcfc: 0x103dcfc: jal   0x101cd60 sb    zero, 44(v0)
+// 0x0103dd0c: 0x103dd0c: jal   0x101cd70 sb    zero, 44(v0)
 	ldloc 5
 	ldc.i4.s 44
 	add
@@ -6077,48 +6077,48 @@ L_103dcd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dd04: 0x103dd04: lw    v1, -11888(s2)
+// 0x0103dd14: 0x103dd14: lw    v1, -11424(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103dd08: 0x103dd08: addu  a0, v0, zero
+// 0x0103dd18: 0x103dd18: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103dd0c: 0x103dd0c: mult  v1, s1
+// 0x0103dd1c: 0x103dd1c: mult  v1, s1
 	ldloc 7
 	ldloc 8
 	mul
 	stloc 11
-// 0x0103dd10: 0x103dd10: lui   a2, 0x1040000
+// 0x0103dd20: 0x103dd20: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103dd14: 0x103dd14: lui   v0, 0x40000
+// 0x0103dd24: 0x103dd24: lui   v0, 0x40000
 	ldc.i4 262144
 	stloc 5
-// 0x0103dd18: 0x103dd18: ori   v0, v0, 1025
+// 0x0103dd28: 0x103dd28: ori   v0, v0, 1025
 	ldloc 5
 	ldc.i4 1025
 	or
 	stloc 5
-// 0x0103dd1c: 0x103dd1c: addiu a2, a2, -10736
+// 0x0103dd2c: 0x103dd2c: addiu a2, a2, -10720
 	ldloc.3
-	ldc.i4 -10736
+	ldc.i4 -10720
 	add
 	stloc.3
-// 0x0103dd20: 0x103dd20: addu  a3, zero, zero
+// 0x0103dd30: 0x103dd30: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103dd24: 0x103dd24: sw    v0, 16(sp)
+// 0x0103dd34: 0x103dd34: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6127,15 +6127,15 @@ L_103dcd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103dd28: 0x103dd28: mflo  lo
+// 0x0103dd38: 0x103dd38: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x0103dd2c: 0x103dd2c: addu  s1, s0, s1
+// 0x0103dd3c: 0x103dd3c: addu  s1, s0, s1
 	ldloc 9
 	ldloc 8
 	add
 	stloc 8
-// 0x0103dd30: 0x103dd30: jal   0x1052e08 addiu a1, s1, 44
+// 0x0103dd40: 0x103dd40: jal   0x1052e18 addiu a1, s1, 44
 	ldloc 8
 	ldc.i4.s 44
 	add
@@ -6145,17 +6145,17 @@ L_103dcd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dd38: 0x103dd38: lui   a0, 0x1040000
+// 0x0103dd48: 0x103dd48: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0103dd3c: 0x103dd3c: jal   0x104fd00 addiu a0, a0, -9088
+// 0x0103dd4c: 0x103dd4c: jal   0x104fd10 addiu a0, a0, -9072
 	ldloc.1
-	ldc.i4 -9088
+	ldc.i4 -9072
 	add
 	stloc.1
 	ldloc.0
@@ -6163,13 +6163,13 @@ L_103dcd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dd44: 0x103dd44: lw    ra, 36(sp)
-// 0x0103dd48: 0x103dd48: lw    s2, 32(sp)
+// 0x0103dd54: 0x103dd54: lw    ra, 36(sp)
+// 0x0103dd58: 0x103dd58: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6178,7 +6178,7 @@ L_103dcd8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103dd4c: 0x103dd4c: lw    s1, 28(sp)
+// 0x0103dd5c: 0x103dd5c: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6187,7 +6187,7 @@ L_103dcd8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103dd50: 0x103dd50: lw    s0, 24(sp)
+// 0x0103dd60: 0x103dd60: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6196,7 +6196,7 @@ L_103dcd8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103dd54: 0x103dd54: jr    ra addiu sp, sp, 40
+// 0x0103dd64: 0x103dd64: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6208,7 +6208,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s2,int32 s0,int32 s3,int32 s4,int32 lo,int32 ra)
@@ -6261,12 +6261,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103dd5c: 0x103dd5c: addiu sp, sp, -40
+// 0x0103dd6c: 0x103dd6c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103dd60: 0x103dd60: sw    s4, 32(sp)
+// 0x0103dd70: 0x103dd70: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6275,19 +6275,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103dd64: 0x103dd64: lui   s4, 0x60000
+// 0x0103dd74: 0x103dd74: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x0103dd68: 0x103dd68: lw    v0, -11888(s4)
+// 0x0103dd78: 0x103dd78: lw    v0, -11424(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103dd6c: 0x103dd6c: sw    s2, 24(sp)
+// 0x0103dd7c: 0x103dd7c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6296,15 +6296,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103dd70: 0x103dd70: addiu s2, zero, 300
+// 0x0103dd80: 0x103dd80: addiu s2, zero, 300
 	ldc.i4 300
 	stloc 9
-// 0x0103dd74: 0x103dd74: mult  v0, s2
+// 0x0103dd84: 0x103dd84: mult  v0, s2
 	ldloc 6
 	ldloc 9
 	mul
 	stloc 13
-// 0x0103dd78: 0x103dd78: sw    s1, 20(sp)
+// 0x0103dd88: 0x103dd88: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6313,15 +6313,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103dd7c: 0x103dd7c: lui   s1, 0xe0000
+// 0x0103dd8c: 0x103dd8c: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x0103dd80: 0x103dd80: addiu s1, s1, 30532
+// 0x0103dd90: 0x103dd90: addiu s1, s1, 30996
 	ldloc 7
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 7
-// 0x0103dd84: 0x103dd84: sw    s3, 28(sp)
+// 0x0103dd94: 0x103dd94: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6330,7 +6330,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103dd88: 0x103dd88: sw    s0, 16(sp)
+// 0x0103dd98: 0x103dd98: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6339,24 +6339,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103dd8c: 0x103dd8c: sw    ra, 36(sp)
-// 0x0103dd90: 0x103dd90: mflo  lo
+// 0x0103dd9c: 0x103dd9c: sw    ra, 36(sp)
+// 0x0103dda0: 0x103dda0: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x0103dd94: 0x103dd94: addu  v0, v0, s1
+// 0x0103dda4: 0x103dda4: addu  v0, v0, s1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0103dd98: 0x103dd98: lw    a0, 0(v0)
+// 0x0103dda8: 0x103dda8: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103dd9c: 0x103dd9c: sll   zero, zero, 0
-// 0x0103dda0: 0x103dda0: lw    s0, 12(a0)
+// 0x0103ddac: 0x103ddac: sll   zero, zero, 0
+// 0x0103ddb0: 0x103ddb0: lw    s0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6365,7 +6365,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103dda4: 0x103dda4: lw    s3, 116(a0)
+// 0x0103ddb4: 0x103ddb4: lw    s3, 116(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6374,10 +6374,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103dda8: 0x103dda8: addu  a1, s0, zero
+// 0x0103ddb8: 0x103ddb8: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0103ddac: 0x103ddac: jal   0x109a320 addu  a2, s3, zero
+// 0x0103ddbc: 0x103ddbc: jal   0x109a968 addu  a2, s3, zero
 	ldloc 11
 	stloc.3
 	ldloc.0
@@ -6385,21 +6385,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_replace_109a320(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_replace_109a968(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103ddb4: 0x103ddb4: lw    v0, -11888(s4)
+// 0x0103ddc4: 0x103ddc4: lw    v0, -11424(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103ddb8: 0x103ddb8: lw    a0, 16(s3)
+// 0x0103ddc8: 0x103ddc8: lw    a0, 16(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6408,20 +6408,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103ddbc: 0x103ddbc: mult  v0, s2
+// 0x0103ddcc: 0x103ddcc: mult  v0, s2
 	ldloc 6
 	ldloc 9
 	mul
 	stloc 13
-// 0x0103ddc0: 0x103ddc0: mflo  lo
+// 0x0103ddd0: 0x103ddd0: mflo  lo
 	ldloc 13
 	stloc 9
-// 0x0103ddc4: 0x103ddc4: addu  s1, s2, s1
+// 0x0103ddd4: 0x103ddd4: addu  s1, s2, s1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x0103ddc8: 0x103ddc8: lw    v0, 36(s1)
+// 0x0103ddd8: 0x103ddd8: lw    v0, 36(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6430,19 +6430,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103ddcc: 0x103ddcc: lw    v1, 0(s1)
+// 0x0103dddc: 0x103dddc: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0103ddd0: 0x103ddd0: sltiu v0, v0, 1
+// 0x0103dde0: 0x103dde0: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x0103ddd4: 0x103ddd4: lw    a1, 28(s1)
+// 0x0103dde4: 0x103dde4: lw    a1, 28(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6451,7 +6451,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103ddd8: 0x103ddd8: sw    s0, 116(v1)
+// 0x0103dde8: 0x103dde8: sw    s0, 116(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6460,7 +6460,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103dddc: 0x103dddc: jal   0x1001b14 sw    v0, 36(s1)
+// 0x0103ddec: 0x103ddec: jal   0x1001b14 sw    v0, 36(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6474,41 +6474,41 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0103dde4: 0x103dde4: bne   v0, zero, 0x103ddfc sll   zero, zero, 0
+// 0x0103ddf4: 0x103ddf4: bne   v0, zero, 0x103de0c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_103ddfc
+	brtrue L_103de0c
 // --- basic block ---
-// 0x0103ddec: 0x103ddec: jal   0x10940b8 addiu a0, zero, 1
+// 0x0103ddfc: 0x103ddfc: jal   0x10946dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl110::ssd_dialog_set_current_scroll_flag_10940b8(int32)
+	call int32 Cibyl110::ssd_dialog_set_current_scroll_flag_10946dc(int32)
 	stloc 6
 // --- basic block ---
-// 0x0103ddf4: 0x103ddf4: j	 0x103de14 sll   zero, zero, 0
-	br L_103de14
+// 0x0103de04: 0x103de04: j	 0x103de24 sll   zero, zero, 0
+	br L_103de24
 // --- basic block ---
-L_103ddfc:
-// 0x0103ddfc: 0x103ddfc: jal   0x109483c sll   zero, zero, 0
+L_103de0c:
+// 0x0103de0c: 0x103de0c: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103de04: 0x103de04: lui   a1, 0x1040000
+// 0x0103de14: 0x103de14: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x0103de08: 0x103de08: addiu a1, a1, -9088
+// 0x0103de18: 0x103de18: addiu a1, a1, -9072
 	ldloc.2
-	ldc.i4 -9088
+	ldc.i4 -9072
 	add
 	stloc.2
-// 0x0103de0c: 0x103de0c: jal   0x104fe98 addiu a0, zero, 50
+// 0x0103de1c: 0x103de1c: jal   0x104fea8 addiu a0, zero, 50
 	ldc.i4.s 50
 	stloc.1
 	ldloc.0
@@ -6516,36 +6516,36 @@ L_103ddfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_103de14:
-// 0x0103de14: 0x103de14: jal   0x109449c sll   zero, zero, 0
+L_103de24:
+// 0x0103de24: 0x103de24: jal   0x1094ac0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_reset_offset_109449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_reset_offset_1094ac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103de1c: 0x103de1c: jal   0x1021900 sll   zero, zero, 0
+// 0x0103de2c: 0x103de2c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103de24: 0x103de24: lw    ra, 36(sp)
-// 0x0103de28: 0x103de28: lw    s4, 32(sp)
+// 0x0103de34: 0x103de34: lw    ra, 36(sp)
+// 0x0103de38: 0x103de38: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6554,7 +6554,7 @@ L_103de14:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103de2c: 0x103de2c: lw    s3, 28(sp)
+// 0x0103de3c: 0x103de3c: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6563,7 +6563,7 @@ L_103de14:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103de30: 0x103de30: lw    s2, 24(sp)
+// 0x0103de40: 0x103de40: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6572,7 +6572,7 @@ L_103de14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103de34: 0x103de34: lw    s1, 20(sp)
+// 0x0103de44: 0x103de44: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6581,7 +6581,7 @@ L_103de14:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103de38: 0x103de38: lw    s0, 16(sp)
+// 0x0103de48: 0x103de48: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6590,7 +6590,7 @@ L_103de14:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103de3c: 0x103de3c: jr    ra addiu sp, sp, 40
+// 0x0103de4c: 0x103de4c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6602,7 +6602,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 generic_search_dlg_show_103de44(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_dlg_show_103de54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s3,int32 lo,int32 s0,int32 s4,int32 s5,int32 s2,int32 s6,int32 s7,int32 ra)
@@ -6664,28 +6664,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103de44: 0x103de44: addiu v0, zero, 300
+// 0x0103de54: 0x103de54: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103de48: 0x103de48: mult  a0, v0
+// 0x0103de58: 0x103de58: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 10
-// 0x0103de4c: 0x103de4c: lui   v0, 0xe0000
+// 0x0103de5c: 0x103de5c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0103de50: 0x103de50: addiu v0, v0, 30532
+// 0x0103de60: 0x103de60: addiu v0, v0, 30996
 	ldloc 5
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 5
-// 0x0103de54: 0x103de54: addiu sp, sp, -56
+// 0x0103de64: 0x103de64: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0103de58: 0x103de58: sw    s5, 40(sp)
+// 0x0103de68: 0x103de68: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6694,7 +6694,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103de5c: 0x103de5c: sw    s4, 36(sp)
+// 0x0103de6c: 0x103de6c: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6703,7 +6703,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103de60: 0x103de60: sw    s2, 28(sp)
+// 0x0103de70: 0x103de70: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6712,7 +6712,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103de64: 0x103de64: sw    s1, 24(sp)
+// 0x0103de74: 0x103de74: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6721,7 +6721,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103de68: 0x103de68: sw    s0, 20(sp)
+// 0x0103de78: 0x103de78: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6730,8 +6730,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103de6c: 0x103de6c: sw    ra, 52(sp)
-// 0x0103de70: 0x103de70: sw    s7, 48(sp)
+// 0x0103de7c: 0x103de7c: sw    ra, 52(sp)
+// 0x0103de80: 0x103de80: sw    s7, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6740,7 +6740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0103de74: 0x103de74: sw    s6, 44(sp)
+// 0x0103de84: 0x103de84: sw    s6, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6749,7 +6749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0103de78: 0x103de78: sw    s3, 32(sp)
+// 0x0103de88: 0x103de88: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6758,18 +6758,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103de7c: 0x103de7c: mflo  lo
+// 0x0103de8c: 0x103de8c: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x0103de80: 0x103de80: addu  s1, a0, zero
+// 0x0103de90: 0x103de90: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0103de84: 0x103de84: addu  v0, v0, v1
+// 0x0103de94: 0x103de94: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0103de88: 0x103de88: lw    v1, 4(v0)
+// 0x0103de98: 0x103de98: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6778,13 +6778,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103de8c: 0x103de8c: addu  s0, a1, zero
+// 0x0103de9c: 0x103de9c: addu  s0, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0103de90: 0x103de90: addu  s4, a2, zero
+// 0x0103dea0: 0x103dea0: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-// 0x0103de94: 0x103de94: lw    s5, 76(sp)
+// 0x0103dea4: 0x103dea4: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6793,13 +6793,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103de98: 0x103de98: bne   v1, zero, 0x103e130 addu  s2, a3, zero
+// 0x0103dea8: 0x103dea8: bne   v1, zero, 0x103e140 addu  s2, a3, zero
 	ldloc 7
 	ldloc 4
 	stloc 14
-	brtrue L_103e130
+	brtrue L_103e140
 // --- basic block ---
-// 0x0103dea0: 0x103dea0: lw    v0, 8(v0)
+// 0x0103deb0: 0x103deb0: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6808,33 +6808,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103dea4: 0x103dea4: sll   zero, zero, 0
-// 0x0103dea8: 0x103dea8: bne   v0, zero, 0x103e130 lui   s3, 0x60000
+// 0x0103deb4: 0x103deb4: sll   zero, zero, 0
+// 0x0103deb8: 0x103deb8: bne   v0, zero, 0x103e140 lui   s3, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 9
-	brtrue L_103e130
+	brtrue L_103e140
 // --- basic block ---
-// 0x0103deb0: 0x103deb0: lw    v0, -11892(s3)
+// 0x0103dec0: 0x103dec0: lw    v0, -11428(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2973
+	ldc.i4 -2857
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103deb4: 0x103deb4: sll   zero, zero, 0
-// 0x0103deb8: 0x103deb8: bne   v0, zero, 0x103dee4 addiu s6, zero, 300
+// 0x0103dec4: 0x103dec4: sll   zero, zero, 0
+// 0x0103dec8: 0x103dec8: bne   v0, zero, 0x103def4 addiu s6, zero, 300
 	ldloc 5
 	ldc.i4 300
 	stloc 15
-	brtrue L_103dee4
+	brtrue L_103def4
 // --- basic block ---
-// 0x0103dec0: 0x103dec0: addiu a0, zero, 65
+// 0x0103ded0: 0x103ded0: addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
-// 0x0103dec4: 0x103dec4: jal   0x1037918 addiu a1, zero, 8
+// 0x0103ded4: 0x103ded4: jal   0x1037928 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -6842,15 +6842,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103decc: 0x103decc: addiu a0, zero, 70
+// 0x0103dedc: 0x103dedc: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x0103ded0: 0x103ded0: jal   0x1037918 addiu a1, zero, 8
+// 0x0103dee0: 0x103dee0: jal   0x1037928 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -6858,41 +6858,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ded8: 0x103ded8: addiu v0, zero, 1
+// 0x0103dee8: 0x103dee8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103dedc: 0x103dedc: sw    v0, -11892(s3)
+// 0x0103deec: 0x103deec: sw    v0, -11428(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2973
+	ldc.i4 -2857
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103dee0: 0x103dee0: addiu s6, zero, 300
+// 0x0103def0: 0x103def0: addiu s6, zero, 300
 	ldc.i4 300
 	stloc 15
-L_103dee4:
-// 0x0103dee4: 0x103dee4: mult  s1, s6
+L_103def4:
+// 0x0103def4: 0x103def4: mult  s1, s6
 	ldloc 8
 	ldloc 15
 	mul
 	stloc 10
-// 0x0103dee8: 0x103dee8: lui   s3, 0xe0000
+// 0x0103def8: 0x103def8: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x0103deec: 0x103deec: addiu s3, s3, 30532
+// 0x0103defc: 0x103defc: addiu s3, s3, 30996
 	ldloc 9
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 9
-// 0x0103def0: 0x103def0: lw    a1, 80(sp)
+// 0x0103df00: 0x103df00: lw    a1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6901,30 +6901,30 @@ L_103dee4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103def4: 0x103def4: lui   s7, 0x60000
+// 0x0103df04: 0x103df04: lui   s7, 0x60000
 	ldc.i4 393216
 	stloc 16
-// 0x0103def8: 0x103def8: addu  a0, s0, zero
+// 0x0103df08: 0x103df08: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x0103defc: 0x103defc: sw    s1, -11888(s7)
+// 0x0103df0c: 0x103df0c: sw    s1, -11424(s7)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103df00: 0x103df00: mflo  lo
+// 0x0103df10: 0x103df10: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0103df04: 0x103df04: addu  v0, s3, v0
+// 0x0103df14: 0x103df14: addu  v0, s3, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x0103df08: 0x103df08: sw    s0, 12(v0)
+// 0x0103df18: 0x103df18: sw    s0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6933,7 +6933,7 @@ L_103dee4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103df0c: 0x103df0c: sw    s4, 16(v0)
+// 0x0103df1c: 0x103df1c: sw    s4, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6942,7 +6942,7 @@ L_103dee4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103df10: 0x103df10: lw    v1, 16(s5)
+// 0x0103df20: 0x103df20: lw    v1, 16(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -6951,7 +6951,7 @@ L_103dee4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103df14: 0x103df14: sw    a1, 4(v0)
+// 0x0103df24: 0x103df24: sw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6960,7 +6960,7 @@ L_103dee4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103df18: 0x103df18: sw    v1, 28(v0)
+// 0x0103df28: 0x103df28: sw    v1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6969,7 +6969,7 @@ L_103dee4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103df1c: 0x103df1c: lw    v1, 92(sp)
+// 0x0103df2c: 0x103df2c: lw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6978,8 +6978,8 @@ L_103dee4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103df20: 0x103df20: sll   zero, zero, 0
-// 0x0103df24: 0x103df24: sw    v1, 8(v0)
+// 0x0103df30: 0x103df30: sll   zero, zero, 0
+// 0x0103df34: 0x103df34: sw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6988,7 +6988,7 @@ L_103dee4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103df28: 0x103df28: lw    v1, 84(sp)
+// 0x0103df38: 0x103df38: lw    v1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6997,8 +6997,8 @@ L_103dee4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103df2c: 0x103df2c: sll   zero, zero, 0
-// 0x0103df30: 0x103df30: sw    v1, 20(v0)
+// 0x0103df3c: 0x103df3c: sll   zero, zero, 0
+// 0x0103df40: 0x103df40: sw    v1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7007,7 +7007,7 @@ L_103dee4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103df34: 0x103df34: lw    v1, 88(sp)
+// 0x0103df44: 0x103df44: lw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7016,7 +7016,7 @@ L_103dee4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103df38: 0x103df38: jal   0x10941a4 sw    v1, 24(v0)
+// 0x0103df48: 0x103df48: jal   0x10947c8 sw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7030,50 +7030,50 @@ L_103dee4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_exists_10941a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_exists_10947c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103df40: 0x103df40: bne   v0, zero, 0x103df84 addiu v0, zero, 1
+// 0x0103df50: 0x103df50: bne   v0, zero, 0x103df94 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_103df84
+	brtrue L_103df94
 // --- basic block ---
-// 0x0103df48: 0x103df48: lw    s1, -11888(s7)
+// 0x0103df58: 0x103df58: lw    s1, -11424(s7)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103df4c: 0x103df4c: sll   zero, zero, 0
-// 0x0103df50: 0x103df50: mult  s1, s6
+// 0x0103df5c: 0x103df5c: sll   zero, zero, 0
+// 0x0103df60: 0x103df60: mult  s1, s6
 	ldloc 8
 	ldloc 15
 	mul
 	stloc 10
-// 0x0103df54: 0x103df54: addu  a1, s4, zero
+// 0x0103df64: 0x103df64: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x0103df58: 0x103df58: addu  a0, s0, zero
+// 0x0103df68: 0x103df68: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x0103df5c: 0x103df5c: addu  a2, s5, zero
+// 0x0103df6c: 0x103df6c: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x0103df60: 0x103df60: mflo  lo
+// 0x0103df70: 0x103df70: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x0103df64: 0x103df64: addu  s1, s3, s1
+// 0x0103df74: 0x103df74: addu  s1, s3, s1
 	ldloc 9
 	ldloc 8
 	add
 	stloc 8
-// 0x0103df68: 0x103df68: jal   0x103d984 sw    v0, 36(s1)
+// 0x0103df78: 0x103df78: jal   0x103d994 sw    v0, 36(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7087,23 +7087,23 @@ L_103dee4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::create_dlg_103d984(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::create_dlg_103d994(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103df70: 0x103df70: lui   a0, 0x1040000
+// 0x0103df80: 0x103df80: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0103df74: 0x103df74: addiu a0, a0, -9536
+// 0x0103df84: 0x103df84: addiu a0, a0, -9520
 	ldloc.1
-	ldc.i4 -9536
+	ldc.i4 -9520
 	add
 	stloc.1
-// 0x0103df78: 0x103df78: addu  a1, zero, zero
+// 0x0103df88: 0x103df88: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103df7c: 0x103df7c: jal   0x10400d8 sw    v0, 0(s1)
+// 0x0103df8c: 0x103df8c: jal   0x10400e8 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7115,61 +7115,61 @@ L_103dee4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_events_register_10400d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_events_register_10400e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103df84:
-// 0x0103df84: 0x103df84: lui   s5, 0x60000
+L_103df94:
+// 0x0103df94: 0x103df94: lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x0103df88: 0x103df88: lw    v0, -11888(s5)
+// 0x0103df98: 0x103df98: lw    v0, -11424(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103df8c: 0x103df8c: addiu s4, zero, 300
+// 0x0103df9c: 0x103df9c: addiu s4, zero, 300
 	ldc.i4 300
 	stloc 12
-// 0x0103df90: 0x103df90: mult  v0, s4
+// 0x0103dfa0: 0x103dfa0: mult  v0, s4
 	ldloc 5
 	ldloc 12
 	mul
 	stloc 10
-// 0x0103df94: 0x103df94: lui   s3, 0xe0000
+// 0x0103dfa4: 0x103dfa4: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x0103df98: 0x103df98: addiu s3, s3, 30532
+// 0x0103dfa8: 0x103dfa8: addiu s3, s3, 30996
 	ldloc 9
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc 9
-// 0x0103df9c: 0x103df9c: lui   a0, 0x10000
+// 0x0103dfac: 0x103dfac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103dfa0: 0x103dfa0: mflo  lo
+// 0x0103dfb0: 0x103dfb0: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0103dfa4: 0x103dfa4: addu  v0, v0, s3
+// 0x0103dfb4: 0x103dfb4: addu  v0, v0, s3
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x0103dfa8: 0x103dfa8: lw    s1, 0(v0)
+// 0x0103dfb8: 0x103dfb8: lw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0103dfac: 0x103dfac: jal   0x101cd60 addiu a0, a0, -6188
+// 0x0103dfbc: 0x103dfbc: jal   0x101cd70 addiu a0, a0, -6192
 	ldloc.1
-	ldc.i4 -6188
+	ldc.i4 -6192
 	add
 	stloc.1
 	ldloc.0
@@ -7177,15 +7177,15 @@ L_103df84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dfb4: 0x103dfb4: addu  a1, v0, zero
+// 0x0103dfc4: 0x103dfc4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103dfb8: 0x103dfb8: jal   0x109b434 addu  a0, s1, zero
+// 0x0103dfc8: 0x103dfc8: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7193,27 +7193,27 @@ L_103df84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dfc0: 0x103dfc0: addu  a1, s2, zero
+// 0x0103dfd0: 0x103dfd0: addu  a1, s2, zero
 	ldloc 14
 	stloc.2
-// 0x0103dfc4: 0x103dfc4: jal   0x1099174 addu  a0, s1, zero
+// 0x0103dfd4: 0x103dfd4: jal   0x10997bc addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x0103dfcc: 0x103dfcc: lui   a0, 0x10000
+// 0x0103dfdc: 0x103dfdc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103dfd0: 0x103dfd0: jal   0x101cd60 addiu a0, a0, -11868
+// 0x0103dfe0: 0x103dfe0: jal   0x101cd70 addiu a0, a0, -11872
 	ldloc.1
-	ldc.i4 -11868
+	ldc.i4 -11872
 	add
 	stloc.1
 	ldloc.0
@@ -7221,15 +7221,15 @@ L_103df84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dfd8: 0x103dfd8: addu  a1, v0, zero
+// 0x0103dfe8: 0x103dfe8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103dfdc: 0x103dfdc: jal   0x109b50c addu  a0, s1, zero
+// 0x0103dfec: 0x103dfec: jal   0x109bb54 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7237,12 +7237,12 @@ L_103df84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dfe4: 0x103dfe4: lw    a1, 72(sp)
+// 0x0103dff4: 0x103dff4: lw    a1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7251,19 +7251,19 @@ L_103df84:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103dfe8: 0x103dfe8: jal   0x109917c addu  a0, s1, zero
+// 0x0103dff8: 0x103dff8: jal   0x10997c4 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_right_softkey_callback_109917c(int32,int32)
+	call void Cibyl114::ssd_widget_set_right_softkey_callback_10997c4(int32,int32)
 // --- basic block ---
-// 0x0103dff0: 0x103dff0: lui   a0, 0x10000
+// 0x0103e000: 0x103e000: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103dff4: 0x103dff4: jal   0x10945a4 addiu a0, a0, -7496
+// 0x0103e004: 0x103e004: jal   0x1094bc8 addiu a0, a0, -7500
 	ldloc.1
-	ldc.i4 -7496
+	ldc.i4 -7500
 	add
 	stloc.1
 	ldloc.0
@@ -7271,12 +7271,12 @@ L_103df84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_by_name_10945a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_by_name_1094bc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103dffc: 0x103dffc: jal   0x10945a4 addu  a0, s0, zero
+// 0x0103e00c: 0x103e00c: jal   0x1094bc8 addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -7284,15 +7284,15 @@ L_103df84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_by_name_10945a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_invalidate_tab_order_by_name_1094bc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e004: 0x103e004: addu  a0, s0, zero
+// 0x0103e014: 0x103e014: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x0103e008: 0x103e008: jal   0x1095eec addu  a1, zero, zero
+// 0x0103e018: 0x103e018: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7300,35 +7300,35 @@ L_103df84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e010: 0x103e010: lw    v0, -11888(s5)
+// 0x0103e020: 0x103e020: lw    v0, -11424(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103e014: 0x103e014: sll   zero, zero, 0
-// 0x0103e018: 0x103e018: mult  v0, s4
+// 0x0103e024: 0x103e024: sll   zero, zero, 0
+// 0x0103e028: 0x103e028: mult  v0, s4
 	ldloc 5
 	ldloc 12
 	mul
 	stloc 10
-// 0x0103e01c: 0x103e01c: mflo  lo
+// 0x0103e02c: 0x103e02c: mflo  lo
 	ldloc 10
 	stloc 12
-// 0x0103e020: 0x103e020: addu  s3, s3, s4
+// 0x0103e030: 0x103e030: addu  s3, s3, s4
 	ldloc 9
 	ldloc 12
 	add
 	stloc 9
-// 0x0103e024: 0x103e024: lw    v0, 36(s3)
+// 0x0103e034: 0x103e034: lw    v0, 36(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7337,34 +7337,34 @@ L_103df84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103e028: 0x103e028: sll   zero, zero, 0
-// 0x0103e02c: 0x103e02c: bne   v0, zero, 0x103e040 lui   a1, 0x10000
+// 0x0103e038: 0x103e038: sll   zero, zero, 0
+// 0x0103e03c: 0x103e03c: bne   v0, zero, 0x103e050 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_103e040
+	brtrue L_103e050
 // --- basic block ---
-// 0x0103e034: 0x103e034: jal   0x103dd5c sll   zero, zero, 0
+// 0x0103e044: 0x103e044: jal   0x103dd6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl45::generic_search_dlg_switch_gui_103dd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e03c: 0x103e03c: lui   a1, 0x10000
+// 0x0103e04c: 0x103e04c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_103e040:
-// 0x0103e040: 0x103e040: addiu a1, a1, -6456
+L_103e050:
+// 0x0103e050: 0x103e050: addiu a1, a1, -6460
 	ldloc.2
-	ldc.i4 -6456
+	ldc.i4 -6460
 	add
 	stloc.2
-// 0x0103e044: 0x103e044: jal   0x109b304 addu  a0, s1, zero
+// 0x0103e054: 0x103e054: jal   0x109b94c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7372,23 +7372,23 @@ L_103e040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e04c: 0x103e04c: lui   a1, 0x10000
+// 0x0103e05c: 0x103e05c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e050: 0x103e050: addu  a0, v0, zero
+// 0x0103e060: 0x103e060: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103e054: 0x103e054: addiu a1, a1, -6400
+// 0x0103e064: 0x103e064: addiu a1, a1, -6404
 	ldloc.2
-	ldc.i4 -6400
+	ldc.i4 -6404
 	add
 	stloc.2
-// 0x0103e058: 0x103e058: jal   0x109b304 addu  s3, v0, zero
+// 0x0103e068: 0x103e068: jal   0x109b94c addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -7396,51 +7396,51 @@ L_103e040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e060: 0x103e060: addu  a0, v0, zero
+// 0x0103e070: 0x103e070: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103e064: 0x103e064: lui   v0, 0x60000
+// 0x0103e074: 0x103e074: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e068: 0x103e068: lw    a1, -11888(v0)
+// 0x0103e078: 0x103e078: lw    a1, -11424(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2972
+	ldc.i4 -2856
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103e06c: 0x103e06c: addiu v0, zero, 300
+// 0x0103e07c: 0x103e07c: addiu v0, zero, 300
 	ldc.i4 300
 	stloc 5
-// 0x0103e070: 0x103e070: mult  a1, v0
+// 0x0103e080: 0x103e080: mult  a1, v0
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 10
-// 0x0103e074: 0x103e074: lui   a1, 0xe0000
+// 0x0103e084: 0x103e084: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x0103e078: 0x103e078: addiu a1, a1, 30532
+// 0x0103e088: 0x103e088: addiu a1, a1, 30996
 	ldloc.2
-	ldc.i4 30532
+	ldc.i4 30996
 	add
 	stloc.2
-// 0x0103e07c: 0x103e07c: mflo  lo
+// 0x0103e08c: 0x103e08c: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0103e080: 0x103e080: addu  v1, v0, a1
+// 0x0103e090: 0x103e090: addu  v1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 7
-// 0x0103e084: 0x103e084: lw    a2, 40(v1)
+// 0x0103e094: 0x103e094: lw    a2, 40(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7449,28 +7449,28 @@ L_103e040:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e088: 0x103e088: sll   zero, zero, 0
-// 0x0103e08c: 0x103e08c: beq   a2, zero, 0x103e0b8 sll   zero, zero, 0
+// 0x0103e098: 0x103e098: sll   zero, zero, 0
+// 0x0103e09c: 0x103e09c: beq   a2, zero, 0x103e0c8 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_103e0b8
+	brfalse L_103e0c8
 // --- basic block ---
-// 0x0103e094: 0x103e094: lb    v1, 44(v1)
+// 0x0103e0a4: 0x103e0a4: lb    v1, 44(v1)
 	ldloc 7
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0103e098: 0x103e098: sll   zero, zero, 0
-// 0x0103e09c: 0x103e09c: beq   v1, zero, 0x103e0b8 sll   zero, zero, 0
+// 0x0103e0a8: 0x103e0a8: sll   zero, zero, 0
+// 0x0103e0ac: 0x103e0ac: beq   v1, zero, 0x103e0c8 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_103e0b8
+	brfalse L_103e0c8
 // --- basic block ---
-// 0x0103e0a4: 0x103e0a4: addu  a1, a1, v0
+// 0x0103e0b4: 0x103e0b4: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x0103e0a8: 0x103e0a8: jal   0x1097e5c addiu a1, a1, 44
+// 0x0103e0b8: 0x103e0b8: jal   0x10984a4 addiu a1, a1, 44
 	ldloc.2
 	ldc.i4.s 44
 	add
@@ -7480,43 +7480,43 @@ L_103e040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e0b0: 0x103e0b0: j	 0x103e0c0 sll   zero, zero, 0
-	br L_103e0c0
+// 0x0103e0c0: 0x103e0c0: j	 0x103e0d0 sll   zero, zero, 0
+	br L_103e0d0
 // --- basic block ---
-L_103e0b8:
-// 0x0103e0b8: 0x103e0b8: jal   0x1097ef4 sll   zero, zero, 0
+L_103e0c8:
+// 0x0103e0c8: 0x103e0c8: jal   0x109853c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_reset_text_1097ef4(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_reset_text_109853c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103e0c0:
-// 0x0103e0c0: 0x103e0c0: jal   0x10940b8 addu  a0, zero, zero
+L_103e0d0:
+// 0x0103e0d0: 0x103e0d0: jal   0x10946dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl110::ssd_dialog_set_current_scroll_flag_10940b8(int32)
+	call int32 Cibyl110::ssd_dialog_set_current_scroll_flag_10946dc(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103e0c8: 0x103e0c8: lui   a1, 0x10000
+// 0x0103e0d8: 0x103e0d8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e0cc: 0x103e0cc: addu  a0, s1, zero
+// 0x0103e0dc: 0x103e0dc: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103e0d0: 0x103e0d0: jal   0x109b304 addiu a1, a1, -6292
+// 0x0103e0e0: 0x103e0e0: jal   0x109b94c addiu a1, a1, -6296
 	ldloc.2
-	ldc.i4 -6292
+	ldc.i4 -6296
 	add
 	stloc.2
 	ldloc.0
@@ -7524,34 +7524,34 @@ L_103e0c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e0d8: 0x103e0d8: beq   v0, zero, 0x103e0e8 sll   zero, zero, 0
+// 0x0103e0e8: 0x103e0e8: beq   v0, zero, 0x103e0f8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103e0e8
+	brfalse L_103e0f8
 // --- basic block ---
-// 0x0103e0e0: 0x103e0e0: jal   0x1099098 addu  a0, v0, zero
+// 0x0103e0f0: 0x103e0f0: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_103e0e8:
-// 0x0103e0e8: 0x103e0e8: jal   0x1099098 addu  a0, s3, zero
+L_103e0f8:
+// 0x0103e0f8: 0x103e0f8: jal   0x10996e0 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103e0f0: 0x103e0f0: addu  a0, s0, zero
+// 0x0103e100: 0x103e100: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x0103e0f4: 0x103e0f4: jal   0x1095eec addu  a1, zero, zero
+// 0x0103e104: 0x103e104: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7559,23 +7559,23 @@ L_103e0e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e0fc: 0x103e0fc: jal   0x109483c sll   zero, zero, 0
+// 0x0103e10c: 0x103e10c: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e104: 0x103e104: lw    v0, 96(sp)
+// 0x0103e114: 0x103e114: lw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7584,22 +7584,22 @@ L_103e0e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103e108: 0x103e108: sll   zero, zero, 0
-// 0x0103e10c: 0x103e10c: bne   v0, zero, 0x103e128 addu  a0, s2, zero
+// 0x0103e118: 0x103e118: sll   zero, zero, 0
+// 0x0103e11c: 0x103e11c: bne   v0, zero, 0x103e138 addu  a0, s2, zero
 	ldloc 5
 	ldloc 14
 	stloc.1
-	brtrue L_103e128
+	brtrue L_103e138
 // --- basic block ---
-// 0x0103e114: 0x103e114: lui   a1, 0x1040000
+// 0x0103e124: 0x103e124: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x0103e118: 0x103e118: addiu a1, a1, -9088
+// 0x0103e128: 0x103e128: addiu a1, a1, -9072
 	ldloc.2
-	ldc.i4 -9088
+	ldc.i4 -9072
 	add
 	stloc.2
-// 0x0103e11c: 0x103e11c: jal   0x104fe98 addiu a0, zero, 50
+// 0x0103e12c: 0x103e12c: jal   0x104fea8 addiu a0, zero, 50
 	ldc.i4.s 50
 	stloc.1
 	ldloc.0
@@ -7607,16 +7607,16 @@ L_103e0e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e124: 0x103e124: addu  a0, s2, zero
+// 0x0103e134: 0x103e134: addu  a0, s2, zero
 	ldloc 14
 	stloc.1
-L_103e128:
-// 0x0103e128: 0x103e128: jal   0x109c5ec addu  a1, s0, zero
+L_103e138:
+// 0x0103e138: 0x103e138: jal   0x109cc34 addu  a1, s0, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -7624,14 +7624,14 @@ L_103e128:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103e130:
-// 0x0103e130: 0x103e130: lw    ra, 52(sp)
-// 0x0103e134: 0x103e134: lw    s7, 48(sp)
+L_103e140:
+// 0x0103e140: 0x103e140: lw    ra, 52(sp)
+// 0x0103e144: 0x103e144: lw    s7, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7640,7 +7640,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0103e138: 0x103e138: lw    s6, 44(sp)
+// 0x0103e148: 0x103e148: lw    s6, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7649,7 +7649,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0103e13c: 0x103e13c: lw    s5, 40(sp)
+// 0x0103e14c: 0x103e14c: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7658,7 +7658,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103e140: 0x103e140: lw    s4, 36(sp)
+// 0x0103e150: 0x103e150: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7667,7 +7667,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103e144: 0x103e144: lw    s3, 32(sp)
+// 0x0103e154: 0x103e154: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7676,7 +7676,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103e148: 0x103e148: lw    s2, 28(sp)
+// 0x0103e158: 0x103e158: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7685,7 +7685,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103e14c: 0x103e14c: lw    s1, 24(sp)
+// 0x0103e15c: 0x103e15c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7694,7 +7694,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103e150: 0x103e150: lw    s0, 20(sp)
+// 0x0103e160: 0x103e160: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7703,7 +7703,7 @@ L_103e130:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103e154: 0x103e154: jr    ra addiu sp, sp, 56
+// 0x0103e164: 0x103e164: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl46.j b/converted/Cibyl46.j
index 77b9ae6..4a7ab75 100644
--- a/converted/Cibyl46.j
+++ b/converted/Cibyl46.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl46::.ctor
 
-.method public static int32 generic_search_result_103e180(int32)
+.method public static int32 generic_search_result_103e190(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 ra,int32 lo,int32[] mem)
@@ -64,60 +64,60 @@
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e180: 0x103e180: bltz  a0, 0x103e1bc sll   zero, zero, 0
+// 0x0103e190: 0x103e190: bltz  a0, 0x103e1cc sll   zero, zero, 0
 	ldloc.0
 	ldc.i4.s 0
-	blt L_103e1bc
-// 0x0103e188: 0x103e188: lui   v0, 0x60000
+	blt L_103e1cc
+// 0x0103e198: 0x103e198: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103e18c: 0x103e18c: lw    v0, -11860(v0)
+// 0x0103e19c: 0x103e19c: lw    v0, -11396(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2965
+	ldc.i4 -2849
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e190: 0x103e190: sll   zero, zero, 0
-// 0x0103e194: 0x103e194: slt   v0, a0, v0
+// 0x0103e1a0: 0x103e1a0: sll   zero, zero, 0
+// 0x0103e1a4: 0x103e1a4: slt   v0, a0, v0
 	ldloc.0
 	ldloc.1
 	clt
 	stloc.1
-// 0x0103e198: 0x103e198: beq   v0, zero, 0x103e1bc sll   zero, zero, 0
+// 0x0103e1a8: 0x103e1a8: beq   v0, zero, 0x103e1cc sll   zero, zero, 0
 	ldloc.1
-	brfalse L_103e1bc
+	brfalse L_103e1cc
 // --- basic block ---
-// 0x0103e1a0: 0x103e1a0: addiu v0, zero, 1096
+// 0x0103e1b0: 0x103e1b0: addiu v0, zero, 1096
 	ldc.i4 1096
 	stloc.1
-// 0x0103e1a4: 0x103e1a4: mult  a0, v0
+// 0x0103e1b4: 0x103e1b4: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc.3
-// 0x0103e1a8: 0x103e1a8: lui   v0, 0x60000
+// 0x0103e1b8: 0x103e1b8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103e1ac: 0x103e1ac: addiu v0, v0, -10832
+// 0x0103e1bc: 0x103e1bc: addiu v0, v0, -10368
 	ldloc.1
-	ldc.i4 -10832
+	ldc.i4 -10368
 	add
 	stloc.1
-// 0x0103e1b0: 0x103e1b0: mflo  lo
+// 0x0103e1c0: 0x103e1c0: mflo  lo
 	ldloc.3
 	stloc.0
-// 0x0103e1b4: 0x103e1b4: jr    ra addu  v0, v0, a0
+// 0x0103e1c4: 0x103e1c4: jr    ra addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_103e1bc:
-// 0x0103e1bc: 0x103e1bc: jr    ra addu  v0, zero, zero
+L_103e1cc:
+// 0x0103e1cc: 0x103e1cc: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	br __CIBYL_function_return
@@ -125,7 +125,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 generic_address_add_103e1d4(int32,int32,int32,int32,int32)
+.method public static int32 generic_address_add_103e1e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 ra,int32 lo,int32 v1)
@@ -169,12 +169,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e1d4: 0x103e1d4: addiu sp, sp, -32
+// 0x0103e1e4: 0x103e1e4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103e1d8: 0x103e1d8: sw    s1, 24(sp)
+// 0x0103e1e8: 0x103e1e8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -183,10 +183,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103e1dc: 0x103e1dc: lui   s1, 0x60000
+// 0x0103e1ec: 0x103e1ec: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103e1e0: 0x103e1e0: sw    s0, 20(sp)
+// 0x0103e1f0: 0x103e1f0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -195,20 +195,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103e1e4: 0x103e1e4: lw    s0, -11860(s1)
+// 0x0103e1f4: 0x103e1f4: lw    s0, -11396(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2965
+	ldc.i4 -2849
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103e1e8: 0x103e1e8: addiu v0, zero, 20
+// 0x0103e1f8: 0x103e1f8: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 7
-// 0x0103e1ec: 0x103e1ec: sw    ra, 28(sp)
-// 0x0103e1f0: 0x103e1f0: sw    a0, 32(sp)
+// 0x0103e1fc: 0x103e1fc: sw    ra, 28(sp)
+// 0x0103e200: 0x103e200: sw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -217,7 +217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0103e1f4: 0x103e1f4: sw    a1, 36(sp)
+// 0x0103e204: 0x103e204: sw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -226,7 +226,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103e1f8: 0x103e1f8: sw    a2, 40(sp)
+// 0x0103e208: 0x103e208: sw    a2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -235,7 +235,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103e1fc: 0x103e1fc: beq   s0, v0, 0x103e230 sw    a3, 44(sp)
+// 0x0103e20c: 0x103e20c: beq   s0, v0, 0x103e240 sw    a3, 44(sp)
 	ldloc 6
 	ldloc 7
 	ldloc 5
@@ -246,41 +246,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-	beq  L_103e230
+	beq  L_103e240
 // --- basic block ---
-// 0x0103e204: 0x103e204: addiu v0, zero, 1096
+// 0x0103e214: 0x103e214: addiu v0, zero, 1096
 	ldc.i4 1096
 	stloc 7
-// 0x0103e208: 0x103e208: mult  s0, v0
+// 0x0103e218: 0x103e218: mult  s0, v0
 	ldloc 6
 	ldloc 7
 	mul
 	stloc 10
-// 0x0103e20c: 0x103e20c: lui   a0, 0x60000
+// 0x0103e21c: 0x103e21c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103e210: 0x103e210: addiu a0, a0, -10832
+// 0x0103e220: 0x103e220: addiu a0, a0, -10368
 	ldloc.1
-	ldc.i4 -10832
+	ldc.i4 -10368
 	add
 	stloc.1
-// 0x0103e214: 0x103e214: addiu a1, sp, 32
+// 0x0103e224: 0x103e224: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0103e218: 0x103e218: addiu a2, zero, 1096
+// 0x0103e228: 0x103e228: addiu a2, zero, 1096
 	ldc.i4 1096
 	stloc.3
-// 0x0103e21c: 0x103e21c: addiu s0, s0, 1
+// 0x0103e22c: 0x103e22c: addiu s0, s0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0103e220: 0x103e220: mflo  lo
+// 0x0103e230: 0x103e230: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x0103e224: 0x103e224: jal   0x1001800 addu  a0, a0, v0
+// 0x0103e234: 0x103e234: jal   0x1001800 addu  a0, a0, v0
 	ldloc.1
 	ldloc 7
 	add
@@ -294,18 +294,18 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x0103e22c: 0x103e22c: sw    s0, -11860(s1)
+// 0x0103e23c: 0x103e23c: sw    s0, -11396(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2965
+	ldc.i4 -2849
 	add
 	ldloc 6
 	stelem.i4
-L_103e230:
-// 0x0103e230: 0x103e230: lw    ra, 28(sp)
-// 0x0103e234: 0x103e234: lw    s1, 24(sp)
+L_103e240:
+// 0x0103e240: 0x103e240: lw    ra, 28(sp)
+// 0x0103e244: 0x103e244: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -314,7 +314,7 @@ L_103e230:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103e238: 0x103e238: lw    s0, 20(sp)
+// 0x0103e248: 0x103e248: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -323,7 +323,7 @@ L_103e230:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103e23c: 0x103e23c: jr    ra addiu sp, sp, 32
+// 0x0103e24c: 0x103e24c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -335,7 +335,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_completed_103e244(int32,int32,int32,int32,int32)
+.method public static int32 on_completed_103e254(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -370,49 +370,49 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e244: 0x103e244: lui   v0, 0x60000
+// 0x0103e254: 0x103e254: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e248: 0x103e248: lw    v0, -11868(v0)
+// 0x0103e258: 0x103e258: lw    v0, -11404(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2967
+	ldc.i4 -2851
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103e24c: 0x103e24c: addiu sp, sp, -24
+// 0x0103e25c: 0x103e25c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103e250: 0x103e250: sw    ra, 20(sp)
-// 0x0103e254: 0x103e254: beq   v0, zero, 0x103e270 addu  a3, a1, zero
+// 0x0103e260: 0x103e260: sw    ra, 20(sp)
+// 0x0103e264: 0x103e264: beq   v0, zero, 0x103e280 addu  a3, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 4
-	brfalse L_103e270
+	brfalse L_103e280
 // --- basic block ---
-// 0x0103e25c: 0x103e25c: lui   v1, 0x60000
+// 0x0103e26c: 0x103e26c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103e260: 0x103e260: lui   a1, 0x60000
+// 0x0103e270: 0x103e270: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0103e264: 0x103e264: lw    a2, -11860(v1)
+// 0x0103e274: 0x103e274: lw    a2, -11396(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2965
+	ldc.i4 -2849
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e268: 0x103e268: jalr  v0 addiu a1, a1, -10832
+// 0x0103e278: 0x103e278: jalr  v0 addiu a1, a1, -10368
 	ldloc 5
 	ldloc.2
-	ldc.i4 -10832
+	ldc.i4 -10368
 	add
 	stloc.2
 	ldloc.0
@@ -425,33 +425,33 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103e270:
-// 0x0103e270: 0x103e270: lui   v0, 0x60000
+L_103e280:
+// 0x0103e280: 0x103e280: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e274: 0x103e274: lw    ra, 20(sp)
-// 0x0103e278: 0x103e278: sw    zero, -11868(v0)
+// 0x0103e284: 0x103e284: lw    ra, 20(sp)
+// 0x0103e288: 0x103e288: sw    zero, -11404(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2967
+	ldc.i4 -2851
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103e27c: 0x103e27c: lui   v0, 0x60000
+// 0x0103e28c: 0x103e28c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e280: 0x103e280: sw    zero, -11864(v0)
+// 0x0103e290: 0x103e290: sw    zero, -11400(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2966
+	ldc.i4 -2850
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103e284: 0x103e284: jr    ra addiu sp, sp, 24
+// 0x0103e294: 0x103e294: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -463,7 +463,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_house_number__str_103e28c(int32,int32,int32,int32,int32)
+.method public static int32 get_house_number__str_103e29c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -501,12 +501,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e28c: 0x103e28c: addiu sp, sp, -24
+// 0x0103e29c: 0x103e29c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103e290: 0x103e290: sw    s0, 16(sp)
+// 0x0103e2a0: 0x103e2a0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -515,30 +515,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103e294: 0x103e294: sw    ra, 20(sp)
-// 0x0103e298: 0x103e298: bgez  a0, 0x103e2ac addu  s0, a0, zero
+// 0x0103e2a4: 0x103e2a4: sw    ra, 20(sp)
+// 0x0103e2a8: 0x103e2a8: bgez  a0, 0x103e2bc addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
 	ldc.i4.s 0
-	bge L_103e2ac
+	bge L_103e2bc
 // --- basic block ---
-// 0x0103e2a0: 0x103e2a0: lui   v0, 0x60000
+// 0x0103e2b0: 0x103e2b0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e2a4: 0x103e2a4: j	 0x103e2d4 sb    zero, -11880(v0)
+// 0x0103e2b4: 0x103e2b4: j	 0x103e2e4 sb    zero, -11416(v0)
 	ldloc 5
-	ldc.i4 -11880
+	ldc.i4 -11416
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_103e2d4
+	br L_103e2e4
 // --- basic block ---
-L_103e2ac:
-// 0x0103e2ac: 0x103e2ac: lui   v0, 0x0
+L_103e2bc:
+// 0x0103e2bc: 0x103e2bc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0103e2b0: 0x103e2b0: lw    v0, 13084(v0)
+// 0x0103e2c0: 0x103e2c0: lw    v0, 13084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -547,28 +547,28 @@ L_103e2ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103e2b4: 0x103e2b4: sll   zero, zero, 0
-// 0x0103e2b8: 0x103e2b8: beq   v0, a0, 0x103e2d4 lui   a0, 0x60000
+// 0x0103e2c4: 0x103e2c4: sll   zero, zero, 0
+// 0x0103e2c8: 0x103e2c8: beq   v0, a0, 0x103e2e4 lui   a0, 0x60000
 	ldloc 5
 	ldloc.1
 	ldc.i4 393216
 	stloc.1
-	beq  L_103e2d4
+	beq  L_103e2e4
 // --- basic block ---
-// 0x0103e2c0: 0x103e2c0: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x0103e2d0: 0x103e2d0: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0103e2c4: 0x103e2c4: addiu a0, a0, -11880
+// 0x0103e2d4: 0x103e2d4: addiu a0, a0, -11416
 	ldloc.1
-	ldc.i4 -11880
+	ldc.i4 -11416
 	add
 	stloc.1
-// 0x0103e2c8: 0x103e2c8: addiu a1, a1, -13884
+// 0x0103e2d8: 0x103e2d8: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0103e2cc: 0x103e2cc: jal   0x1000f64 addu  a2, s0, zero
+// 0x0103e2dc: 0x103e2dc: jal   0x1000f64 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -581,12 +581,12 @@ L_103e2ac:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_103e2d4:
-// 0x0103e2d4: 0x103e2d4: lui   v0, 0x0
+L_103e2e4:
+// 0x0103e2e4: 0x103e2e4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0103e2d8: 0x103e2d8: lw    ra, 20(sp)
-// 0x0103e2dc: 0x103e2dc: sw    s0, 13084(v0)
+// 0x0103e2e8: 0x103e2e8: lw    ra, 20(sp)
+// 0x0103e2ec: 0x103e2ec: sw    s0, 13084(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -595,15 +595,15 @@ L_103e2d4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103e2e0: 0x103e2e0: lui   v0, 0x60000
+// 0x0103e2f0: 0x103e2f0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e2e4: 0x103e2e4: addiu v0, v0, -11880
+// 0x0103e2f4: 0x103e2f4: addiu v0, v0, -11416
 	ldloc 5
-	ldc.i4 -11880
+	ldc.i4 -11416
 	add
 	stloc 5
-// 0x0103e2e8: 0x103e2e8: lw    s0, 16(sp)
+// 0x0103e2f8: 0x103e2f8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -612,7 +612,7 @@ L_103e2d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103e2ec: 0x103e2ec: jr    ra addiu sp, sp, 24
+// 0x0103e2fc: 0x103e2fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -624,7 +624,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 generic_search_add_to_favorites_103e2f4(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_add_to_favorites_103e304(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -659,18 +659,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e2f4: 0x103e2f4: lui   a0, 0x20000
+// 0x0103e304: 0x103e304: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0103e2f8: 0x103e2f8: addiu sp, sp, -32
+// 0x0103e308: 0x103e308: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103e2fc: 0x103e2fc: sw    ra, 28(sp)
-// 0x0103e300: 0x103e300: jal   0x101cd60 addiu a0, a0, -18240
+// 0x0103e30c: 0x103e30c: sw    ra, 28(sp)
+// 0x0103e310: 0x103e310: jal   0x101cd70 addiu a0, a0, -17776
 	ldloc.1
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
 	ldloc.0
@@ -678,37 +678,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e308: 0x103e308: lui   a1, 0x10000
+// 0x0103e318: 0x103e318: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e30c: 0x103e30c: lui   a2, 0x1040000
+// 0x0103e31c: 0x103e31c: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103e310: 0x103e310: addu  a0, v0, zero
+// 0x0103e320: 0x103e320: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103e314: 0x103e314: addiu a1, a1, 18500
+// 0x0103e324: 0x103e324: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0103e318: 0x103e318: addiu v0, zero, 1
+// 0x0103e328: 0x103e328: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103e31c: 0x103e31c: addiu a2, a2, -7364
+// 0x0103e32c: 0x103e32c: addiu a2, a2, -7348
 	ldloc.3
-	ldc.i4 -7364
+	ldc.i4 -7348
 	add
 	stloc.3
-// 0x0103e320: 0x103e320: addu  a3, zero, zero
+// 0x0103e330: 0x103e330: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0103e324: 0x103e324: jal   0x1052e08 sw    v0, 16(sp)
+// 0x0103e334: 0x103e334: jal   0x1052e18 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -722,14 +722,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e32c: 0x103e32c: lw    ra, 28(sp)
-// 0x0103e330: 0x103e330: sll   zero, zero, 0
-// 0x0103e334: 0x103e334: jr    ra addiu sp, sp, 32
+// 0x0103e33c: 0x103e33c: lw    ra, 28(sp)
+// 0x0103e340: 0x103e340: sll   zero, zero, 0
+// 0x0103e344: 0x103e344: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -741,7 +741,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_favorites_name_103e33c(int32,int32,int32,int32,int32)
+.method public static int32 on_favorites_name_103e34c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 s1,int32 ra)
@@ -782,15 +782,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e33c: 0x103e33c: addiu sp, sp, -40
+// 0x0103e34c: 0x103e34c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103e340: 0x103e340: addiu v0, zero, 1
+// 0x0103e350: 0x103e350: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103e344: 0x103e344: sw    s1, 32(sp)
+// 0x0103e354: 0x103e354: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -799,8 +799,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103e348: 0x103e348: sw    ra, 36(sp)
-// 0x0103e34c: 0x103e34c: sw    s0, 28(sp)
+// 0x0103e358: 0x103e358: sw    ra, 36(sp)
+// 0x0103e35c: 0x103e35c: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -809,35 +809,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103e350: 0x103e350: bne   a0, v0, 0x103e418 addu  s1, a1, zero
+// 0x0103e360: 0x103e360: bne   a0, v0, 0x103e428 addu  s1, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc 9
-	bne.un L_103e418
+	bne.un L_103e428
 // --- basic block ---
-// 0x0103e358: 0x103e358: beq   a1, zero, 0x103e370 sll   zero, zero, 0
+// 0x0103e368: 0x103e368: beq   a1, zero, 0x103e380 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_103e370
+	brfalse L_103e380
 // --- basic block ---
-// 0x0103e360: 0x103e360: lb    v0, 0(a1)
+// 0x0103e370: 0x103e370: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0103e364: 0x103e364: sll   zero, zero, 0
-// 0x0103e368: 0x103e368: bne   v0, zero, 0x103e3a0 lui   s0, 0xe0000
+// 0x0103e374: 0x103e374: sll   zero, zero, 0
+// 0x0103e378: 0x103e378: bne   v0, zero, 0x103e3b0 lui   s0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 6
-	brtrue L_103e3a0
+	brtrue L_103e3b0
 // --- basic block ---
-L_103e370:
-// 0x0103e370: 0x103e370: lui   a0, 0x10000
+L_103e380:
+// 0x0103e380: 0x103e380: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103e374: 0x103e374: jal   0x101cd60 addiu a0, a0, -10604
+// 0x0103e384: 0x103e384: jal   0x101cd70 addiu a0, a0, -10608
 	ldloc.1
-	ldc.i4 -10604
+	ldc.i4 -10608
 	add
 	stloc.1
 	ldloc.0
@@ -845,20 +845,20 @@ L_103e370:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e37c: 0x103e37c: lui   a0, 0x10000
+// 0x0103e38c: 0x103e38c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103e380: 0x103e380: addiu a0, a0, -6180
+// 0x0103e390: 0x103e390: addiu a0, a0, -6184
 	ldloc.1
-	ldc.i4 -6180
+	ldc.i4 -6184
 	add
 	stloc.1
-// 0x0103e384: 0x103e384: jal   0x101cd60 addu  s0, v0, zero
+// 0x0103e394: 0x103e394: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 6
 	ldloc.0
@@ -866,15 +866,15 @@ L_103e370:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e38c: 0x103e38c: addu  a1, v0, zero
+// 0x0103e39c: 0x103e39c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103e390: 0x103e390: jal   0x104c148 addu  a0, s0, zero
+// 0x0103e3a0: 0x103e3a0: jal   0x104c158 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -882,23 +882,23 @@ L_103e370:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e398: 0x103e398: j	 0x103e450 addu  v0, zero, zero
+// 0x0103e3a8: 0x103e3a8: j	 0x103e460 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_103e450
+	br L_103e460
 // --- basic block ---
-L_103e3a0:
-// 0x0103e3a0: 0x103e3a0: addiu s0, s0, 31432
+L_103e3b0:
+// 0x0103e3b0: 0x103e3b0: addiu s0, s0, 31896
 	ldloc 6
-	ldc.i4 31432
+	ldc.i4 31896
 	add
 	stloc 6
-// 0x0103e3a4: 0x103e3a4: lw    a0, 20(s0)
+// 0x0103e3b4: 0x103e3b4: lw    a0, 20(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -907,7 +907,7 @@ L_103e3a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e3a8: 0x103e3a8: jal   0x1000d8c sll   zero, zero, 0
+// 0x0103e3b8: 0x103e3b8: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -918,7 +918,7 @@ L_103e3a0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e3b0: 0x103e3b0: lw    a0, 24(s0)
+// 0x0103e3c0: 0x103e3c0: lw    a0, 24(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -927,7 +927,7 @@ L_103e3a0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e3b4: 0x103e3b4: jal   0x1000d8c sw    v0, 20(sp)
+// 0x0103e3c4: 0x103e3c4: jal   0x1000d8c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -946,10 +946,10 @@ L_103e3a0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e3bc: 0x103e3bc: addu  a0, s1, zero
+// 0x0103e3cc: 0x103e3cc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103e3c0: 0x103e3c0: jal   0x1001ba8 sw    v0, 16(sp)
+// 0x0103e3d0: 0x103e3d0: jal   0x1001ba8 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -968,15 +968,15 @@ L_103e3a0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e3c8: 0x103e3c8: lui   a0, 0x10000
+// 0x0103e3d8: 0x103e3d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103e3cc: 0x103e3cc: addiu a0, a0, -25260
+// 0x0103e3dc: 0x103e3dc: addiu a0, a0, -25260
 	ldloc.1
 	ldc.i4 -25260
 	add
 	stloc.1
-// 0x0103e3d0: 0x103e3d0: jal   0x1001ba8 sw    v0, 16(s0)
+// 0x0103e3e0: 0x103e3e0: jal   0x1001ba8 sw    v0, 16(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -995,7 +995,7 @@ L_103e3a0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e3d8: 0x103e3d8: sw    v0, 28(s0)
+// 0x0103e3e8: 0x103e3e8: sw    v0, 28(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1004,10 +1004,10 @@ L_103e3a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103e3dc: 0x103e3dc: addu  a1, s0, zero
+// 0x0103e3ec: 0x103e3ec: addu  a1, s0, zero
 	ldloc 6
 	stloc.2
-// 0x0103e3e0: 0x103e3e0: jal   0x103822c addiu a0, zero, 70
+// 0x0103e3f0: 0x103e3f0: jal   0x103823c addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
 	ldloc.0
@@ -1015,20 +1015,20 @@ L_103e3a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e3e8: 0x103e3e8: addu  a0, s1, zero
+// 0x0103e3f8: 0x103e3f8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0103e3ec: 0x103e3ec: addiu a1, sp, 16
+// 0x0103e3fc: 0x103e3fc: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0103e3f0: 0x103e3f0: jal   0x10a9eec addiu a2, zero, 1
+// 0x0103e400: 0x103e400: jal   0x10aa534 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -1036,12 +1036,12 @@ L_103e3a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_trip_server_create_poi_10a9eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_trip_server_create_poi_10aa534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e3f8: 0x103e3f8: jal   0x1094a94 addu  a0, zero, zero
+// 0x0103e408: 0x103e408: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1049,73 +1049,73 @@ L_103e3a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e400: 0x103e400: jal   0x102146c sll   zero, zero, 0
+// 0x0103e410: 0x103e410: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e408: 0x103e408: bne   v0, zero, 0x103e41c lui   s0, 0xe0000
+// 0x0103e418: 0x103e418: bne   v0, zero, 0x103e42c lui   s0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 6
-	brtrue L_103e41c
+	brtrue L_103e42c
 // --- basic block ---
-// 0x0103e410: 0x103e410: jal   0x1021900 sll   zero, zero, 0
+// 0x0103e420: 0x103e420: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_103e418:
-// 0x0103e418: 0x103e418: lui   s0, 0xe0000
+L_103e428:
+// 0x0103e428: 0x103e428: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-L_103e41c:
-// 0x0103e41c: 0x103e41c: lui   s1, 0xe0000
+L_103e42c:
+// 0x0103e42c: 0x103e42c: lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x0103e420: 0x103e420: addiu s0, s0, 31432
+// 0x0103e430: 0x103e430: addiu s0, s0, 31896
 	ldloc 6
-	ldc.i4 31432
+	ldc.i4 31896
 	add
 	stloc 6
-// 0x0103e424: 0x103e424: addiu s1, s1, 31464
+// 0x0103e434: 0x103e434: addiu s1, s1, 31928
 	ldloc 9
-	ldc.i4 31464
+	ldc.i4 31928
 	add
 	stloc 9
-L_103e428:
-// 0x0103e428: 0x103e428: lw    v0, 0(s0)
+L_103e438:
+// 0x0103e438: 0x103e438: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103e42c: 0x103e42c: sll   zero, zero, 0
-// 0x0103e430: 0x103e430: beq   v0, zero, 0x103e444 addu  a0, v0, zero
+// 0x0103e43c: 0x103e43c: sll   zero, zero, 0
+// 0x0103e440: 0x103e440: beq   v0, zero, 0x103e454 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_103e444
+	brfalse L_103e454
 // --- basic block ---
-// 0x0103e438: 0x103e438: jal   0x1000930 sll   zero, zero, 0
+// 0x0103e448: 0x103e448: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1126,29 +1126,29 @@ L_103e428:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103e440: 0x103e440: sw    zero, 0(s0)
+// 0x0103e450: 0x103e450: sw    zero, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_103e444:
-// 0x0103e444: 0x103e444: addiu s0, s0, 4
+L_103e454:
+// 0x0103e454: 0x103e454: addiu s0, s0, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-// 0x0103e448: 0x103e448: bne   s0, s1, 0x103e428 addiu v0, zero, 1
+// 0x0103e458: 0x103e458: bne   s0, s1, 0x103e438 addiu v0, zero, 1
 	ldloc 6
 	ldloc 9
 	ldc.i4.1
 	stloc 5
-	bne.un L_103e428
+	bne.un L_103e438
 // --- basic block ---
-L_103e450:
-// 0x0103e450: 0x103e450: lw    ra, 36(sp)
-// 0x0103e454: 0x103e454: lw    s1, 32(sp)
+L_103e460:
+// 0x0103e460: 0x103e460: lw    ra, 36(sp)
+// 0x0103e464: 0x103e464: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1157,7 +1157,7 @@ L_103e450:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103e458: 0x103e458: lw    s0, 28(sp)
+// 0x0103e468: 0x103e468: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1166,7 +1166,7 @@ L_103e450:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103e45c: 0x103e45c: jr    ra addiu sp, sp, 40
+// 0x0103e46c: 0x103e46c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1178,7 +1178,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 generic_search_add_address_to_history_103e464(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_add_address_to_history_103e474(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s2,int32 v1,int32 s4,int32 s0,int32 s3,int32 ra)
@@ -1228,12 +1228,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e464: 0x103e464: addiu sp, sp, -136
+// 0x0103e474: 0x103e474: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x0103e468: 0x103e468: sw    s0, 112(sp)
+// 0x0103e478: 0x103e478: sw    s0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1242,7 +1242,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103e46c: 0x103e46c: lw    v0, 152(sp)
+// 0x0103e47c: 0x103e47c: lw    v0, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1251,7 +1251,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103e470: 0x103e470: lw    s0, 156(sp)
+// 0x0103e480: 0x103e480: lw    s0, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1260,7 +1260,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103e474: 0x103e474: sw    s2, 120(sp)
+// 0x0103e484: 0x103e484: sw    s2, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1269,7 +1269,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103e478: 0x103e478: sw    s1, 116(sp)
+// 0x0103e488: 0x103e488: sw    s1, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1278,8 +1278,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103e47c: 0x103e47c: sw    ra, 132(sp)
-// 0x0103e480: 0x103e480: sw    s4, 128(sp)
+// 0x0103e48c: 0x103e48c: sw    ra, 132(sp)
+// 0x0103e490: 0x103e490: sw    s4, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1288,7 +1288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103e484: 0x103e484: sw    s3, 124(sp)
+// 0x0103e494: 0x103e494: sw    s3, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1297,7 +1297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103e488: 0x103e488: sw    a1, 24(sp)
+// 0x0103e498: 0x103e498: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1306,7 +1306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103e48c: 0x103e48c: sw    a2, 20(sp)
+// 0x0103e49c: 0x103e49c: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1315,7 +1315,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103e490: 0x103e490: sw    a3, 16(sp)
+// 0x0103e4a0: 0x103e4a0: sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1324,7 +1324,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0103e494: 0x103e494: sw    v0, 28(sp)
+// 0x0103e4a4: 0x103e4a4: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1333,7 +1333,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103e498: 0x103e498: lw    s2, 160(sp)
+// 0x0103e4a8: 0x103e4a8: lw    s2, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1342,13 +1342,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103e49c: 0x103e49c: beq   s0, zero, 0x103e4ac addu  s1, a0, zero
+// 0x0103e4ac: 0x103e4ac: beq   s0, zero, 0x103e4bc addu  s1, a0, zero
 	ldloc 11
 	ldloc.1
 	stloc 7
-	brfalse L_103e4ac
+	brfalse L_103e4bc
 // --- basic block ---
-// 0x0103e4a4: 0x103e4a4: j	 0x103e4b8 sw    s0, 32(sp)
+// 0x0103e4b4: 0x103e4b4: j	 0x103e4c8 sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1357,18 +1357,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-	br L_103e4b8
+	br L_103e4c8
 // --- basic block ---
-L_103e4ac:
-// 0x0103e4ac: 0x103e4ac: lui   v0, 0x10000
+L_103e4bc:
+// 0x0103e4bc: 0x103e4bc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0103e4b0: 0x103e4b0: addiu v0, v0, 18500
+// 0x0103e4c0: 0x103e4c0: addiu v0, v0, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-// 0x0103e4b4: 0x103e4b4: sw    v0, 32(sp)
+// 0x0103e4c4: 0x103e4c4: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1377,8 +1377,8 @@ L_103e4ac:
 	add
 	ldloc 6
 	stelem.i4
-L_103e4b8:
-// 0x0103e4b8: 0x103e4b8: lw    a2, 4(s2)
+L_103e4c8:
+// 0x0103e4c8: 0x103e4c8: lw    a2, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1387,20 +1387,20 @@ L_103e4b8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e4bc: 0x103e4bc: addiu s3, sp, 48
+// 0x0103e4cc: 0x103e4cc: addiu s3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 12
-// 0x0103e4c0: 0x103e4c0: lui   s4, 0x20000
-	ldc.i4 131072
+// 0x0103e4d0: 0x103e4d0: lui   s4, 0x10000
+	ldc.i4 65536
 	stloc 10
-// 0x0103e4c4: 0x103e4c4: addu  a0, s3, zero
+// 0x0103e4d4: 0x103e4d4: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x0103e4c8: 0x103e4c8: jal   0x1000f64 addiu a1, s4, -13884
+// 0x0103e4d8: 0x103e4d8: jal   0x1000f64 addiu a1, s4, 19088
 	ldloc 10
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
 	ldloc.0
@@ -1413,24 +1413,24 @@ L_103e4b8:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103e4d0: 0x103e4d0: lw    a2, 0(s2)
+// 0x0103e4e0: 0x103e4e0: lw    a2, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0103e4d4: 0x103e4d4: addiu s2, sp, 80
+// 0x0103e4e4: 0x103e4e4: addiu s2, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 8
-// 0x0103e4d8: 0x103e4d8: addiu a1, s4, -13884
+// 0x0103e4e8: 0x103e4e8: addiu a1, s4, 19088
 	ldloc 10
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0103e4dc: 0x103e4dc: jal   0x1000f64 addu  a0, s2, zero
+// 0x0103e4ec: 0x103e4ec: jal   0x1000f64 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1443,15 +1443,15 @@ L_103e4b8:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103e4e4: 0x103e4e4: lui   v0, 0x10000
+// 0x0103e4f4: 0x103e4f4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0103e4e8: 0x103e4e8: addiu v0, v0, -25260
+// 0x0103e4f8: 0x103e4f8: addiu v0, v0, -25260
 	ldloc 6
 	ldc.i4 -25260
 	add
 	stloc 6
-// 0x0103e4ec: 0x103e4ec: sw    v0, 44(sp)
+// 0x0103e4fc: 0x103e4fc: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1460,10 +1460,10 @@ L_103e4b8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103e4f0: 0x103e4f0: addiu v0, zero, 70
+// 0x0103e500: 0x103e500: addiu v0, zero, 70
 	ldc.i4.s 70
 	stloc 6
-// 0x0103e4f4: 0x103e4f4: sw    s3, 36(sp)
+// 0x0103e504: 0x103e504: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1472,7 +1472,7 @@ L_103e4b8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103e4f8: 0x103e4f8: bne   s1, v0, 0x103e560 sw    s2, 40(sp)
+// 0x0103e508: 0x103e508: bne   s1, v0, 0x103e570 sw    s2, 40(sp)
 	ldloc 7
 	ldloc 6
 	ldloc 5
@@ -1483,41 +1483,41 @@ L_103e4b8:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_103e560
+	bne.un L_103e570
 // --- basic block ---
-// 0x0103e500: 0x103e500: lui   s4, 0xe0000
+// 0x0103e510: 0x103e510: lui   s4, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x0103e504: 0x103e504: addiu s4, s4, 31432
+// 0x0103e514: 0x103e514: addiu s4, s4, 31896
 	ldloc 10
-	ldc.i4 31432
+	ldc.i4 31896
 	add
 	stloc 10
-// 0x0103e508: 0x103e508: addu  s1, zero, zero
+// 0x0103e518: 0x103e518: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0103e50c: 0x103e50c: addiu s3, sp, 16
+// 0x0103e51c: 0x103e51c: addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-// 0x0103e510: 0x103e510: addiu s2, zero, 32
+// 0x0103e520: 0x103e520: addiu s2, zero, 32
 	ldc.i4.s 32
 	stloc 8
-L_103e514:
-// 0x0103e514: 0x103e514: addu  v0, s3, s1
+L_103e524:
+// 0x0103e524: 0x103e524: addu  v0, s3, s1
 	ldloc 12
 	ldloc 7
 	add
 	stloc 6
-// 0x0103e518: 0x103e518: lw    a0, 0(v0)
+// 0x0103e528: 0x103e528: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103e51c: 0x103e51c: jal   0x1001ba8 sll   zero, zero, 0
+// 0x0103e52c: 0x103e52c: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1528,17 +1528,17 @@ L_103e514:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103e524: 0x103e524: addu  v1, s4, s1
+// 0x0103e534: 0x103e534: addu  v1, s4, s1
 	ldloc 10
 	ldloc 7
 	add
 	stloc 9
-// 0x0103e528: 0x103e528: addiu s1, s1, 4
+// 0x0103e538: 0x103e538: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0103e52c: 0x103e52c: bne   s1, s2, 0x103e514 sw    v0, 0(v1)
+// 0x0103e53c: 0x103e53c: bne   s1, s2, 0x103e524 sw    v0, 0(v1)
 	ldloc 7
 	ldloc 8
 	ldloc 5
@@ -1547,18 +1547,18 @@ L_103e514:
 	shr.un
 	ldloc 6
 	stelem.i4
-	bne.un L_103e514
+	bne.un L_103e524
 // --- basic block ---
-// 0x0103e534: 0x103e534: beq   s0, zero, 0x103e550 addu  a1, s0, zero
+// 0x0103e544: 0x103e544: beq   s0, zero, 0x103e560 addu  a1, s0, zero
 	ldloc 11
 	ldloc 11
 	stloc.2
-	brfalse L_103e550
+	brfalse L_103e560
 // --- basic block ---
-// 0x0103e53c: 0x103e53c: addiu a0, zero, 1
+// 0x0103e54c: 0x103e54c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103e540: 0x103e540: jal   0x103e33c addu  a2, zero, zero
+// 0x0103e550: 0x103e550: jal   0x103e34c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1566,41 +1566,41 @@ L_103e514:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::on_favorites_name_103e33c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::on_favorites_name_103e34c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103e548: 0x103e548: j	 0x103e578 sll   zero, zero, 0
-	br L_103e578
+// 0x0103e558: 0x103e558: j	 0x103e588 sll   zero, zero, 0
+	br L_103e588
 // --- basic block ---
-L_103e550:
-// 0x0103e550: 0x103e550: jal   0x103e2f4 sll   zero, zero, 0
+L_103e560:
+// 0x0103e560: 0x103e560: jal   0x103e304 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_add_to_favorites_103e2f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_add_to_favorites_103e304(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103e558: 0x103e558: j	 0x103e578 sll   zero, zero, 0
-	br L_103e578
+// 0x0103e568: 0x103e568: j	 0x103e588 sll   zero, zero, 0
+	br L_103e588
 // --- basic block ---
-L_103e560:
-// 0x0103e560: 0x103e560: sll   a0, s1, 24
+L_103e570:
+// 0x0103e570: 0x103e570: sll   a0, s1, 24
 	ldloc 7
 	ldc.i4.s 24
 	shl
 	stloc.1
-// 0x0103e564: 0x103e564: sra   a0, a0, 24
+// 0x0103e574: 0x103e574: sra   a0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shr
 	stloc.1
-// 0x0103e568: 0x103e568: jal   0x103822c addiu a1, sp, 16
+// 0x0103e578: 0x103e578: jal   0x103823c addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1610,25 +1610,25 @@ L_103e560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0103e570: 0x103e570: jal   0x103788c sll   zero, zero, 0
+// 0x0103e580: 0x103e580: jal   0x103789c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_history_save_103788c(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_save_103789c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_103e578:
-// 0x0103e578: 0x103e578: lw    ra, 132(sp)
-// 0x0103e57c: 0x103e57c: lw    s4, 128(sp)
+L_103e588:
+// 0x0103e588: 0x103e588: lw    ra, 132(sp)
+// 0x0103e58c: 0x103e58c: lw    s4, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1637,7 +1637,7 @@ L_103e578:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103e580: 0x103e580: lw    s3, 124(sp)
+// 0x0103e590: 0x103e590: lw    s3, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1646,7 +1646,7 @@ L_103e578:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103e584: 0x103e584: lw    s2, 120(sp)
+// 0x0103e594: 0x103e594: lw    s2, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1655,7 +1655,7 @@ L_103e578:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103e588: 0x103e588: lw    s1, 116(sp)
+// 0x0103e598: 0x103e598: lw    s1, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1664,7 +1664,7 @@ L_103e578:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103e58c: 0x103e58c: lw    s0, 112(sp)
+// 0x0103e59c: 0x103e59c: lw    s0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1673,7 +1673,7 @@ L_103e578:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103e590: 0x103e590: jr    ra addiu sp, sp, 136
+// 0x0103e5a0: 0x103e5a0: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -1685,7 +1685,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_with_coordinates_103e598(int32,int32,int32,int32,int32)
+.method public static int32 navigate_with_coordinates_103e5a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s2,int32 s1,int32 s4,int32 s3,int32 ra,int32 lo)
@@ -1738,12 +1738,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e598: 0x103e598: addiu sp, sp, -96
+// 0x0103e5a8: 0x103e5a8: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0103e59c: 0x103e59c: sw    s3, 84(sp)
+// 0x0103e5ac: 0x103e5ac: sw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1752,8 +1752,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103e5a0: 0x103e5a0: sw    ra, 92(sp)
-// 0x0103e5a4: 0x103e5a4: sw    s4, 88(sp)
+// 0x0103e5b0: 0x103e5b0: sw    ra, 92(sp)
+// 0x0103e5b4: 0x103e5b4: sw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1762,7 +1762,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103e5a8: 0x103e5a8: sw    s2, 80(sp)
+// 0x0103e5b8: 0x103e5b8: sw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1771,7 +1771,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103e5ac: 0x103e5ac: sw    s1, 76(sp)
+// 0x0103e5bc: 0x103e5bc: sw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1780,7 +1780,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103e5b0: 0x103e5b0: sw    s0, 72(sp)
+// 0x0103e5c0: 0x103e5c0: sw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1789,86 +1789,86 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103e5b4: 0x103e5b4: bltz  a2, 0x103e720 addu  s3, a0, zero
+// 0x0103e5c4: 0x103e5c4: bltz  a2, 0x103e730 addu  s3, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 12
 	ldc.i4.s 0
-	blt L_103e720
+	blt L_103e730
 // --- basic block ---
-// 0x0103e5bc: 0x103e5bc: lui   v0, 0x60000
+// 0x0103e5cc: 0x103e5cc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103e5c0: 0x103e5c0: lw    v0, -11860(v0)
+// 0x0103e5d0: 0x103e5d0: lw    v0, -11396(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2965
+	ldc.i4 -2849
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103e5c4: 0x103e5c4: sll   zero, zero, 0
-// 0x0103e5c8: 0x103e5c8: slt   v0, a2, v0
+// 0x0103e5d4: 0x103e5d4: sll   zero, zero, 0
+// 0x0103e5d8: 0x103e5d8: slt   v0, a2, v0
 	ldloc.3
 	ldloc 6
 	clt
 	stloc 6
-// 0x0103e5cc: 0x103e5cc: beq   v0, zero, 0x103e724 addu  v0, zero, zero
+// 0x0103e5dc: 0x103e5dc: beq   v0, zero, 0x103e734 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_103e724
+	brfalse L_103e734
 // --- basic block ---
-// 0x0103e5d4: 0x103e5d4: addiu s0, zero, 1096
+// 0x0103e5e4: 0x103e5e4: addiu s0, zero, 1096
 	ldc.i4 1096
 	stloc 7
-// 0x0103e5d8: 0x103e5d8: mult  a2, s0
+// 0x0103e5e8: 0x103e5e8: mult  a2, s0
 	ldloc.3
 	ldloc 7
 	mul
 	stloc 14
-// 0x0103e5dc: 0x103e5dc: lui   s0, 0x60000
+// 0x0103e5ec: 0x103e5ec: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103e5e0: 0x103e5e0: addiu s0, s0, -10832
+// 0x0103e5f0: 0x103e5f0: addiu s0, s0, -10368
 	ldloc 7
-	ldc.i4 -10832
+	ldc.i4 -10368
 	add
 	stloc 7
-// 0x0103e5e4: 0x103e5e4: mflo  lo
+// 0x0103e5f4: 0x103e5f4: mflo  lo
 	ldloc 14
 	stloc.3
-// 0x0103e5e8: 0x103e5e8: addu  s0, s0, a2
+// 0x0103e5f8: 0x103e5f8: addu  s0, s0, a2
 	ldloc 7
 	ldloc.3
 	add
 	stloc 7
-// 0x0103e5ec: 0x103e5ec: beq   s0, zero, 0x103e724 lui   s2, 0x20000
+// 0x0103e5fc: 0x103e5fc: beq   s0, zero, 0x103e734 lui   s2, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 9
-	brfalse L_103e724
+	brfalse L_103e734
 // --- basic block ---
-// 0x0103e5f4: 0x103e5f4: lw    a3, 23796(s2)
+// 0x0103e604: 0x103e604: lw    a3, 24260(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103e5f8: 0x103e5f8: lw    a2, 23792(s2)
+// 0x0103e608: 0x103e608: lw    a2, 24256(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e5fc: 0x103e5fc: lw    a1, 12(s0)
+// 0x0103e60c: 0x103e60c: lw    a1, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1877,7 +1877,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103e600: 0x103e600: lw    a0, 8(s0)
+// 0x0103e610: 0x103e610: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1886,7 +1886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e604: 0x103e604: jal   0x10c0798 addiu s1, sp, 32
+// 0x0103e614: 0x103e614: jal   0x10c0dd8 addiu s1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1896,44 +1896,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e60c: 0x103e60c: addu  a1, v1, zero
+// 0x0103e61c: 0x103e61c: addu  a1, v1, zero
 	ldloc 8
 	stloc.2
-// 0x0103e610: 0x103e610: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103e620: 0x103e620: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e618: 0x103e618: lw    a3, 23796(s2)
+// 0x0103e628: 0x103e628: lw    a3, 24260(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103e61c: 0x103e61c: lw    a2, 23792(s2)
+// 0x0103e62c: 0x103e62c: lw    a2, 24256(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e620: 0x103e620: lw    a1, 20(s0)
+// 0x0103e630: 0x103e630: lw    a1, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1942,7 +1942,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103e624: 0x103e624: lw    a0, 16(s0)
+// 0x0103e634: 0x103e634: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1951,7 +1951,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e628: 0x103e628: jal   0x10c0798 sw    v0, 32(sp)
+// 0x0103e638: 0x103e638: jal   0x10c0dd8 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1965,40 +1965,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e630: 0x103e630: addu  a1, v1, zero
+// 0x0103e640: 0x103e640: addu  a1, v1, zero
 	ldloc 8
 	stloc.2
-// 0x0103e634: 0x103e634: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103e644: 0x103e644: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e63c: 0x103e63c: lui   a0, 0x20000
+// 0x0103e64c: 0x103e64c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0103e640: 0x103e640: addiu a0, a0, -28932
+// 0x0103e650: 0x103e650: addiu a0, a0, -28468
 	ldloc.1
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.1
-// 0x0103e644: 0x103e644: addu  a1, s1, zero
+// 0x0103e654: 0x103e654: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0103e648: 0x103e648: lui   s2, 0x0
+// 0x0103e658: 0x103e658: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0103e64c: 0x103e64c: jal   0x101f76c sw    v0, 36(sp)
+// 0x0103e65c: 0x103e65c: jal   0x101f77c sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2012,15 +2012,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e654: 0x103e654: addu  a1, s1, zero
+// 0x0103e664: 0x103e664: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0103e658: 0x103e658: jal   0x101f76c addiu a0, s2, 27208
+// 0x0103e668: 0x103e668: jal   0x101f77c addiu a0, s2, 27208
 	ldloc 9
 	ldc.i4 27208
 	add
@@ -2030,12 +2030,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e660: 0x103e660: lw    a0, 284(s0)
+// 0x0103e670: 0x103e670: lw    a0, 284(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2044,22 +2044,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e664: 0x103e664: addiu a1, s0, 90
+// 0x0103e674: 0x103e674: addiu a1, s0, 90
 	ldloc 7
 	ldc.i4.s 90
 	add
 	stloc.2
-// 0x0103e668: 0x103e668: addiu a2, s0, 154
+// 0x0103e678: 0x103e678: addiu a2, s0, 154
 	ldloc 7
 	ldc.i4 154
 	add
 	stloc.3
-// 0x0103e66c: 0x103e66c: addiu s4, s0, 24
+// 0x0103e67c: 0x103e67c: addiu s4, s0, 24
 	ldloc 7
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x0103e670: 0x103e670: sw    a1, 48(sp)
+// 0x0103e680: 0x103e680: sw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2068,7 +2068,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103e674: 0x103e674: sw    a2, 52(sp)
+// 0x0103e684: 0x103e684: sw    a2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2077,7 +2077,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103e678: 0x103e678: sw    a1, 68(sp)
+// 0x0103e688: 0x103e688: sw    a1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2086,7 +2086,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103e67c: 0x103e67c: sw    a2, 64(sp)
+// 0x0103e68c: 0x103e68c: sw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2095,7 +2095,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103e680: 0x103e680: sw    s4, 40(sp)
+// 0x0103e690: 0x103e690: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2104,7 +2104,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103e684: 0x103e684: jal   0x103e28c sw    zero, 44(sp)
+// 0x0103e694: 0x103e694: jal   0x103e29c sw    zero, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2118,12 +2118,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::get_house_number__str_103e28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::get_house_number__str_103e29c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e68c: 0x103e68c: lw    a0, 284(s0)
+// 0x0103e69c: 0x103e69c: lw    a0, 284(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2132,7 +2132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e690: 0x103e690: jal   0x103e28c sw    v0, 56(sp)
+// 0x0103e6a0: 0x103e6a0: jal   0x103e29c sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2146,12 +2146,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::get_house_number__str_103e28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::get_house_number__str_103e29c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e698: 0x103e698: lw    a1, 68(sp)
+// 0x0103e6a8: 0x103e6a8: lw    a1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2160,7 +2160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103e69c: 0x103e69c: lw    a2, 64(sp)
+// 0x0103e6ac: 0x103e6ac: lw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2169,18 +2169,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e6a0: 0x103e6a0: addiu s0, s0, 288
+// 0x0103e6b0: 0x103e6b0: addiu s0, s0, 288
 	ldloc 7
 	ldc.i4 288
 	add
 	stloc 7
-// 0x0103e6a4: 0x103e6a4: addu  a3, v0, zero
+// 0x0103e6b4: 0x103e6b4: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0103e6a8: 0x103e6a8: addiu a0, zero, 65
+// 0x0103e6b8: 0x103e6b8: addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
-// 0x0103e6ac: 0x103e6ac: sw    s4, 16(sp)
+// 0x0103e6bc: 0x103e6bc: sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2189,7 +2189,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103e6b0: 0x103e6b0: sw    s0, 20(sp)
+// 0x0103e6c0: 0x103e6c0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2198,7 +2198,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103e6b4: 0x103e6b4: jal   0x103e464 sw    s1, 24(sp)
+// 0x0103e6c4: 0x103e6c4: jal   0x103e474 sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2212,32 +2212,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_add_address_to_history_103e464(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_add_address_to_history_103e474(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e6bc: 0x103e6bc: beq   s3, zero, 0x103e6e4 addu  a1, s1, zero
+// 0x0103e6cc: 0x103e6cc: beq   s3, zero, 0x103e6f4 addu  a1, s1, zero
 	ldloc 12
 	ldloc 10
 	stloc.2
-	brfalse L_103e6e4
+	brfalse L_103e6f4
 // --- basic block ---
-// 0x0103e6c4: 0x103e6c4: jal   0x105944c sll   zero, zero, 0
+// 0x0103e6d4: 0x103e6d4: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e6cc: 0x103e6cc: addu  a0, s1, zero
+// 0x0103e6dc: 0x103e6dc: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0103e6d0: 0x103e6d0: jal   0x105ca84 addiu a1, sp, 40
+// 0x0103e6e0: 0x103e6e0: jal   0x105ca94 addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2247,25 +2247,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::main_navigator_105ca84(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::main_navigator_105ca94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e6d8: 0x103e6d8: addiu v0, v0, 1
+// 0x0103e6e8: 0x103e6e8: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0103e6dc: 0x103e6dc: j	 0x103e724 sltu  v0, zero, v0
+// 0x0103e6ec: 0x103e6ec: j	 0x103e734 sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-	br L_103e724
+	br L_103e734
 // --- basic block ---
-L_103e6e4:
-// 0x0103e6e4: 0x103e6e4: jal   0x100c63c addu  a0, zero, zero
+L_103e6f4:
+// 0x0103e6f4: 0x103e6f4: jal   0x100c64c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2273,21 +2273,21 @@ L_103e6e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e6ec: 0x103e6ec: addu  a0, v0, zero
+// 0x0103e6fc: 0x103e6fc: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0103e6f0: 0x103e6f0: lui   a1, 0x100000
+// 0x0103e700: 0x103e700: lui   a1, 0x100000
 	ldc.i4 1048576
 	stloc.2
-// 0x0103e6f4: 0x103e6f4: addiu a2, zero, 1
+// 0x0103e704: 0x103e704: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0103e6f8: 0x103e6f8: jal   0x100d384 addu  a3, zero, zero
+// 0x0103e708: 0x103e708: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2295,12 +2295,12 @@ L_103e6e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e700: 0x103e700: jal   0x101ece8 addiu a0, s2, 27208
+// 0x0103e710: 0x103e710: jal   0x101ecf8 addiu a0, s2, 27208
 	ldloc 9
 	ldc.i4 27208
 	add
@@ -2310,40 +2310,40 @@ L_103e6e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e708: 0x103e708: jal   0x100a71c sll   zero, zero, 0
-	call int32 Cibyl7::roadmap_square_force_next_update_100a71c()
+// 0x0103e718: 0x103e718: jal   0x100a72c sll   zero, zero, 0
+	call int32 Cibyl7::roadmap_square_force_next_update_100a72c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e710: 0x103e710: jal   0x1021900 sll   zero, zero, 0
+// 0x0103e720: 0x103e720: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103e718: 0x103e718: j	 0x103e724 addiu v0, zero, 1
+// 0x0103e728: 0x103e728: j	 0x103e734 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_103e724
+	br L_103e734
 // --- basic block ---
-L_103e720:
-// 0x0103e720: 0x103e720: addu  v0, zero, zero
+L_103e730:
+// 0x0103e730: 0x103e730: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_103e724:
-// 0x0103e724: 0x103e724: lw    ra, 92(sp)
-// 0x0103e728: 0x103e728: lw    s4, 88(sp)
+L_103e734:
+// 0x0103e734: 0x103e734: lw    ra, 92(sp)
+// 0x0103e738: 0x103e738: lw    s4, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2352,7 +2352,7 @@ L_103e724:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103e72c: 0x103e72c: lw    s3, 84(sp)
+// 0x0103e73c: 0x103e73c: lw    s3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2361,7 +2361,7 @@ L_103e724:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103e730: 0x103e730: lw    s2, 80(sp)
+// 0x0103e740: 0x103e740: lw    s2, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2370,7 +2370,7 @@ L_103e724:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103e734: 0x103e734: lw    s1, 76(sp)
+// 0x0103e744: 0x103e744: lw    s1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2379,7 +2379,7 @@ L_103e724:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103e738: 0x103e738: lw    s0, 72(sp)
+// 0x0103e748: 0x103e748: lw    s0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2388,7 +2388,7 @@ L_103e724:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103e73c: 0x103e73c: jr    ra addiu sp, sp, 96
+// 0x0103e74c: 0x103e74c: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -2400,7 +2400,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 generic_search_resolve_address_103e744(int32,int32,int32,int32,int32)
+.method public static int32 generic_search_resolve_address_103e754(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s3,int32 s0,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -2462,12 +2462,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103e744: 0x103e744: addiu sp, sp, -192
+// 0x0103e754: 0x103e754: addiu sp, sp, -192
 	ldloc.0
 	ldc.i4 -192
 	add
 	stloc.0
-// 0x0103e748: 0x103e748: sw    s6, 176(sp)
+// 0x0103e758: 0x103e758: sw    s6, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2476,7 +2476,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103e74c: 0x103e74c: sw    s5, 172(sp)
+// 0x0103e75c: 0x103e75c: sw    s5, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2485,7 +2485,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0103e750: 0x103e750: sw    s4, 168(sp)
+// 0x0103e760: 0x103e760: sw    s4, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2494,7 +2494,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103e754: 0x103e754: sw    s3, 164(sp)
+// 0x0103e764: 0x103e764: sw    s3, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2503,7 +2503,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103e758: 0x103e758: sw    s2, 160(sp)
+// 0x0103e768: 0x103e768: sw    s2, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2512,7 +2512,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103e75c: 0x103e75c: sw    s0, 152(sp)
+// 0x0103e76c: 0x103e76c: sw    s0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2521,11 +2521,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103e760: 0x103e760: addu  s4, a2, zero
+// 0x0103e770: 0x103e770: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-// 0x0103e764: 0x103e764: sw    ra, 188(sp)
-// 0x0103e768: 0x103e768: sw    s8, 184(sp)
+// 0x0103e774: 0x103e774: sw    ra, 188(sp)
+// 0x0103e778: 0x103e778: sw    s8, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2534,7 +2534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0103e76c: 0x103e76c: sw    s7, 180(sp)
+// 0x0103e77c: 0x103e77c: sw    s7, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2543,7 +2543,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0103e770: 0x103e770: sw    s1, 156(sp)
+// 0x0103e780: 0x103e780: sw    s1, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2552,13 +2552,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103e774: 0x103e774: addu  s0, a0, zero
+// 0x0103e784: 0x103e784: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0103e778: 0x103e778: addu  s5, a1, zero
+// 0x0103e788: 0x103e788: addu  s5, a1, zero
 	ldloc.2
 	stloc 13
-// 0x0103e77c: 0x103e77c: lw    s2, 208(sp)
+// 0x0103e78c: 0x103e78c: lw    s2, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2567,7 +2567,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103e780: 0x103e780: lw    a2, 216(sp)
+// 0x0103e790: 0x103e790: lw    a2, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2576,7 +2576,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e784: 0x103e784: lw    s3, 220(sp)
+// 0x0103e794: 0x103e794: lw    s3, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2585,32 +2585,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103e788: 0x103e788: bne   a0, zero, 0x103e7b4 addu  s6, a3, zero
+// 0x0103e798: 0x103e798: bne   a0, zero, 0x103e7c4 addu  s6, a3, zero
 	ldloc.1
 	ldloc 4
 	stloc 14
-	brtrue L_103e7b4
+	brtrue L_103e7c4
 // --- basic block ---
-// 0x0103e790: 0x103e790: lui   a1, 0x10000
+// 0x0103e7a0: 0x103e7a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e794: 0x103e794: lui   a3, 0x10000
+// 0x0103e7a4: 0x103e7a4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103e798: 0x103e798: addiu a1, a1, -6148
+// 0x0103e7a8: 0x103e7a8: addiu a1, a1, -6152
 	ldloc.2
-	ldc.i4 -6148
+	ldc.i4 -6152
 	add
 	stloc.2
-// 0x0103e79c: 0x103e79c: addiu a3, a3, -6104
+// 0x0103e7ac: 0x103e7ac: addiu a3, a3, -6108
 	ldloc 4
-	ldc.i4 -6104
+	ldc.i4 -6108
 	add
 	stloc 4
-// 0x0103e7a0: 0x103e7a0: addiu a0, zero, 4
+// 0x0103e7b0: 0x103e7b0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103e7a4: 0x103e7a4: jal   0x100449c addiu a2, zero, 173
+// 0x0103e7b4: 0x103e7b4: jal   0x100449c addiu a2, zero, 173
 	ldc.i4 173
 	stloc.3
 	ldloc.0
@@ -2623,19 +2623,19 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e7ac: 0x103e7ac: j	 0x103ea58 addiu v1, zero, 8
+// 0x0103e7bc: 0x103e7bc: j	 0x103ea68 addiu v1, zero, 8
 	ldc.i4.8
 	stloc 7
-	br L_103ea58
+	br L_103ea68
 // --- basic block ---
-L_103e7b4:
-// 0x0103e7b4: 0x103e7b4: beq   a2, zero, 0x103e7ec addu  a0, a2, zero
+L_103e7c4:
+// 0x0103e7c4: 0x103e7c4: beq   a2, zero, 0x103e7fc addu  a0, a2, zero
 	ldloc.3
 	ldloc.3
 	stloc.1
-	brfalse L_103e7ec
+	brfalse L_103e7fc
 // --- basic block ---
-// 0x0103e7bc: 0x103e7bc: jal   0x10384b0 sw    a2, 148(sp)
+// 0x0103e7cc: 0x103e7cc: jal   0x10384c0 sw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2647,17 +2647,17 @@ L_103e7b4:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl41::utf8_strlen_10384b0(int32,int32,int32)
+	call int32 Cibyl41::utf8_strlen_10384c0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e7c4: 0x103e7c4: slti  v0, v0, 2
+// 0x0103e7d4: 0x103e7d4: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0103e7c8: 0x103e7c8: lw    a2, 148(sp)
+// 0x0103e7d8: 0x103e7d8: lw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2666,27 +2666,27 @@ L_103e7b4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e7cc: 0x103e7cc: bne   v0, zero, 0x103e7ec sll   zero, zero, 0
+// 0x0103e7dc: 0x103e7dc: bne   v0, zero, 0x103e7fc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_103e7ec
+	brtrue L_103e7fc
 // --- basic block ---
-// 0x0103e7d4: 0x103e7d4: jal   0x10384b0 addu  a0, a2, zero
+// 0x0103e7e4: 0x103e7e4: jal   0x10384c0 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl41::utf8_strlen_10384b0(int32,int32,int32)
+	call int32 Cibyl41::utf8_strlen_10384c0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e7dc: 0x103e7dc: slti  v0, v0, 268
+// 0x0103e7ec: 0x103e7ec: slti  v0, v0, 268
 	ldloc 5
 	ldc.i4 268
 	clt
 	stloc 5
-// 0x0103e7e0: 0x103e7e0: lw    a2, 148(sp)
+// 0x0103e7f0: 0x103e7f0: lw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2695,47 +2695,47 @@ L_103e7b4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e7e4: 0x103e7e4: bne   v0, zero, 0x103e81c addu  a0, s0, zero
+// 0x0103e7f4: 0x103e7f4: bne   v0, zero, 0x103e82c addu  a0, s0, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_103e81c
+	brtrue L_103e82c
 // --- basic block ---
-L_103e7ec:
-// 0x0103e7ec: 0x103e7ec: jal   0x10384b0 addu  a0, a2, zero
+L_103e7fc:
+// 0x0103e7fc: 0x103e7fc: jal   0x10384c0 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl41::utf8_strlen_10384b0(int32,int32,int32)
+	call int32 Cibyl41::utf8_strlen_10384c0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e7f4: 0x103e7f4: lui   a1, 0x10000
+// 0x0103e804: 0x103e804: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e7f8: 0x103e7f8: lui   a3, 0x10000
+// 0x0103e808: 0x103e808: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103e7fc: 0x103e7fc: addiu a1, a1, -6148
+// 0x0103e80c: 0x103e80c: addiu a1, a1, -6152
 	ldloc.2
-	ldc.i4 -6148
+	ldc.i4 -6152
 	add
 	stloc.2
-// 0x0103e800: 0x103e800: addiu a3, a3, -6044
+// 0x0103e810: 0x103e810: addiu a3, a3, -6048
 	ldloc 4
-	ldc.i4 -6044
+	ldc.i4 -6048
 	add
 	stloc 4
-// 0x0103e804: 0x103e804: addiu a0, zero, 4
+// 0x0103e814: 0x103e814: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103e808: 0x103e808: addiu a2, zero, 180
+// 0x0103e818: 0x103e818: addiu a2, zero, 180
 	ldc.i4 180
 	stloc.3
-// 0x0103e80c: 0x103e80c: jal   0x100449c sw    v0, 16(sp)
+// 0x0103e81c: 0x103e81c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2754,13 +2754,13 @@ L_103e7ec:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e814: 0x103e814: j	 0x103ea58 addiu v1, zero, 39
+// 0x0103e824: 0x103e824: j	 0x103ea68 addiu v1, zero, 39
 	ldc.i4.s 39
 	stloc 7
-	br L_103ea58
+	br L_103ea68
 // --- basic block ---
-L_103e81c:
-// 0x0103e81c: 0x103e81c: jal   0x1068f8c sw    a2, 148(sp)
+L_103e82c:
+// 0x0103e82c: 0x103e82c: jal   0x1068f9c sw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2770,10 +2770,10 @@ L_103e81c:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl78::wst_get_trans_state_1068f8c(int32)
+	call int32 Cibyl78::wst_get_trans_state_1068f9c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103e824: 0x103e824: lw    a2, 148(sp)
+// 0x0103e834: 0x103e834: lw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2782,29 +2782,29 @@ L_103e81c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e828: 0x103e828: beq   v0, zero, 0x103e858 lui   a1, 0x10000
+// 0x0103e838: 0x103e838: beq   v0, zero, 0x103e868 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103e858
+	brfalse L_103e868
 // --- basic block ---
-// 0x0103e830: 0x103e830: lui   a3, 0x10000
+// 0x0103e840: 0x103e840: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103e834: 0x103e834: addiu a1, a1, -6148
+// 0x0103e844: 0x103e844: addiu a1, a1, -6152
 	ldloc.2
-	ldc.i4 -6148
+	ldc.i4 -6152
 	add
 	stloc.2
-// 0x0103e838: 0x103e838: addiu a3, a3, -5964
+// 0x0103e848: 0x103e848: addiu a3, a3, -5968
 	ldloc 4
-	ldc.i4 -5964
+	ldc.i4 -5968
 	add
 	stloc 4
-// 0x0103e83c: 0x103e83c: addiu a2, zero, 190
+// 0x0103e84c: 0x103e84c: addiu a2, zero, 190
 	ldc.i4 190
 	stloc.3
-// 0x0103e840: 0x103e840: jal   0x100449c addiu a0, zero, 1
+// 0x0103e850: 0x103e850: jal   0x100449c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -2817,7 +2817,7 @@ L_103e81c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e848: 0x103e848: jal   0x106a420 addu  a0, s0, zero
+// 0x0103e858: 0x103e858: jal   0x106aa28 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2825,18 +2825,18 @@ L_103e81c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_watchdog_106a420(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_watchdog_106aa28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e850: 0x103e850: j	 0x103ea58 addiu v1, zero, 40
+// 0x0103e860: 0x103e860: j	 0x103ea68 addiu v1, zero, 40
 	ldc.i4.s 40
 	stloc 7
-	br L_103ea58
+	br L_103ea68
 // --- basic block ---
-L_103e858:
-// 0x0103e858: 0x103e858: lw    v1, 212(sp)
+L_103e868:
+// 0x0103e868: 0x103e868: lw    v1, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2845,22 +2845,22 @@ L_103e858:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103e85c: 0x103e85c: lui   v0, 0x60000
+// 0x0103e86c: 0x103e86c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e860: 0x103e860: sw    v1, -11868(v0)
+// 0x0103e870: 0x103e870: sw    v1, -11404(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2967
+	ldc.i4 -2851
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103e864: 0x103e864: lui   v0, 0x60000
+// 0x0103e874: 0x103e874: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e868: 0x103e868: sw    a2, 148(sp)
+// 0x0103e878: 0x103e878: sw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2869,19 +2869,19 @@ L_103e858:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0103e86c: 0x103e86c: jal   0x106ab10 sw    s2, -11864(v0)
+// 0x0103e87c: 0x103e87c: jal   0x106b134 sw    s2, -11400(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2966
+	ldc.i4 -2850
 	add
 	ldloc 11
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 5
 // --- basic block ---
-// 0x0103e874: 0x103e874: jal   0x102c3f0 addu  s8, v0, zero
+// 0x0103e884: 0x103e884: jal   0x102c400 addu  s8, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -2889,15 +2889,15 @@ L_103e858:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e87c: 0x103e87c: addu  s7, v0, zero
+// 0x0103e88c: 0x103e88c: addu  s7, v0, zero
 	ldloc 5
 	stloc 15
-// 0x0103e880: 0x103e880: jal   0x101d484 lui   s1, 0x60000
+// 0x0103e890: 0x103e890: jal   0x101d494 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
 	ldloc.0
@@ -2905,15 +2905,15 @@ L_103e858:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e888: 0x103e888: lui   a1, 0x10000
+// 0x0103e898: 0x103e898: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e88c: 0x103e88c: lw    a2, 148(sp)
+// 0x0103e89c: 0x103e89c: lw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2922,20 +2922,20 @@ L_103e858:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e890: 0x103e890: addiu a1, a1, -5872
+// 0x0103e8a0: 0x103e8a0: addiu a1, a1, -5876
 	ldloc.2
-	ldc.i4 -5872
+	ldc.i4 -5876
 	add
 	stloc.2
-// 0x0103e894: 0x103e894: addiu a0, s1, -11856
+// 0x0103e8a4: 0x103e8a4: addiu a0, s1, -11392
 	ldloc 8
-	ldc.i4 -11856
+	ldc.i4 -11392
 	add
 	stloc.1
-// 0x0103e898: 0x103e898: addiu a3, zero, 20
+// 0x0103e8a8: 0x103e8a8: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0103e89c: 0x103e89c: sw    s8, 16(sp)
+// 0x0103e8ac: 0x103e8ac: sw    s8, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2944,7 +2944,7 @@ L_103e858:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0103e8a0: 0x103e8a0: sw    s7, 20(sp)
+// 0x0103e8b0: 0x103e8b0: sw    s7, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2953,7 +2953,7 @@ L_103e858:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0103e8a4: 0x103e8a4: jal   0x1000f64 sw    v0, 24(sp)
+// 0x0103e8b4: 0x103e8b4: jal   0x1000f64 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2972,13 +2972,13 @@ L_103e858:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e8ac: 0x103e8ac: beq   s3, zero, 0x103e8d4 sll   zero, zero, 0
+// 0x0103e8bc: 0x103e8bc: beq   s3, zero, 0x103e8e4 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_103e8d4
+	brfalse L_103e8e4
 // --- basic block ---
-// 0x0103e8b4: 0x103e8b4: jal   0x1001b48 addiu a0, s1, -11856
+// 0x0103e8c4: 0x103e8c4: jal   0x1001b48 addiu a0, s1, -11392
 	ldloc 8
-	ldc.i4 -11856
+	ldc.i4 -11392
 	add
 	stloc.1
 	ldloc.1
@@ -2987,25 +2987,25 @@ L_103e858:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e8bc: 0x103e8bc: addiu a0, s1, -11856
+// 0x0103e8cc: 0x103e8cc: addiu a0, s1, -11392
 	ldloc 8
-	ldc.i4 -11856
+	ldc.i4 -11392
 	add
 	stloc.1
-// 0x0103e8c0: 0x103e8c0: lui   a1, 0x10000
+// 0x0103e8d0: 0x103e8d0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e8c4: 0x103e8c4: addu  a0, a0, v0
+// 0x0103e8d4: 0x103e8d4: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x0103e8c8: 0x103e8c8: addiu a1, a1, -5804
+// 0x0103e8d8: 0x103e8d8: addiu a1, a1, -5808
 	ldloc.2
-	ldc.i4 -5804
+	ldc.i4 -5808
 	add
 	stloc.2
-// 0x0103e8cc: 0x103e8cc: jal   0x1000f64 addu  a2, s3, zero
+// 0x0103e8dc: 0x103e8dc: jal   0x1000f64 addu  a2, s3, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -3018,13 +3018,13 @@ L_103e858:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103e8d4:
-// 0x0103e8d4: 0x103e8d4: lui   s1, 0x60000
+L_103e8e4:
+// 0x0103e8e4: 0x103e8e4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103e8d8: 0x103e8d8: jal   0x1001b48 addiu a0, s1, -11856
+// 0x0103e8e8: 0x103e8e8: jal   0x1001b48 addiu a0, s1, -11392
 	ldloc 8
-	ldc.i4 -11856
+	ldc.i4 -11392
 	add
 	stloc.1
 	ldloc.1
@@ -3033,27 +3033,27 @@ L_103e8d4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e8e0: 0x103e8e0: addiu s1, s1, -11856
+// 0x0103e8f0: 0x103e8f0: addiu s1, s1, -11392
 	ldloc 8
-	ldc.i4 -11856
+	ldc.i4 -11392
 	add
 	stloc 8
-// 0x0103e8e4: 0x103e8e4: addiu a0, sp, 56
+// 0x0103e8f4: 0x103e8f4: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x0103e8e8: 0x103e8e8: addiu a1, sp, 36
+// 0x0103e8f8: 0x103e8f8: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0103e8ec: 0x103e8ec: addiu a2, sp, 32
+// 0x0103e8fc: 0x103e8fc: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0103e8f0: 0x103e8f0: jal   0x1029da8 addu  s1, s1, v0
+// 0x0103e900: 0x103e900: jal   0x1029db8 addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
@@ -3063,24 +3063,24 @@ L_103e8d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e8f8: 0x103e8f8: addiu v1, zero, -1
+// 0x0103e908: 0x103e908: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0103e8fc: 0x103e8fc: beq   v0, v1, 0x103e920 addiu a2, sp, 76
+// 0x0103e90c: 0x103e90c: beq   v0, v1, 0x103e930 addiu a2, sp, 76
 	ldloc 5
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.3
-	beq  L_103e920
+	beq  L_103e930
 // --- basic block ---
-// 0x0103e904: 0x103e904: lw    a1, 56(sp)
+// 0x0103e914: 0x103e914: lw    a1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3089,10 +3089,10 @@ L_103e8d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103e908: 0x103e908: addu  a0, a2, zero
+// 0x0103e918: 0x103e918: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0103e90c: 0x103e90c: jal   0x1072468 sw    a2, 148(sp)
+// 0x0103e91c: 0x103e91c: jal   0x1072a8c sw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3106,12 +3106,12 @@ L_103e8d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e914: 0x103e914: lw    a1, 60(sp)
+// 0x0103e924: 0x103e924: lw    a1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3120,20 +3120,20 @@ L_103e8d4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103e918: 0x103e918: j	 0x103e974 addiu a3, sp, 108
+// 0x0103e928: 0x103e928: j	 0x103e984 addiu a3, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc 4
-	br L_103e974
+	br L_103e984
 // --- basic block ---
-L_103e920:
-// 0x0103e920: 0x103e920: lui   a0, 0x20000
+L_103e930:
+// 0x0103e930: 0x103e930: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0103e924: 0x103e924: jal   0x101df50 addiu a0, a0, 6792
+// 0x0103e934: 0x103e934: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -3141,37 +3141,37 @@ L_103e920:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e92c: 0x103e92c: beq   v0, zero, 0x103e9a0 lui   v1, 0x2120000
+// 0x0103e93c: 0x103e93c: beq   v0, zero, 0x103e9b0 lui   v1, 0x2120000
 	ldloc 5
 	ldc.i4 34734080
 	stloc 7
-	brfalse L_103e9a0
+	brfalse L_103e9b0
 // --- basic block ---
-// 0x0103e934: 0x103e934: lw    a1, 0(v0)
+// 0x0103e944: 0x103e944: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103e938: 0x103e938: ori   v1, v1, 60730
+// 0x0103e948: 0x103e948: ori   v1, v1, 60730
 	ldloc 7
 	ldc.i4 60730
 	or
 	stloc 7
-// 0x0103e93c: 0x103e93c: bne   a1, v1, 0x103e954 lui   v1, 0x1e90000
+// 0x0103e94c: 0x103e94c: bne   a1, v1, 0x103e964 lui   v1, 0x1e90000
 	ldloc.2
 	ldloc 7
 	ldc.i4 32047104
 	stloc 7
-	bne.un L_103e954
+	bne.un L_103e964
 // --- basic block ---
-// 0x0103e944: 0x103e944: lw    a0, 4(v0)
+// 0x0103e954: 0x103e954: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3180,26 +3180,26 @@ L_103e920:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103e948: 0x103e948: ori   v1, v1, 58906
+// 0x0103e958: 0x103e958: ori   v1, v1, 58906
 	ldloc 7
 	ldc.i4 58906
 	or
 	stloc 7
-// 0x0103e94c: 0x103e94c: beq   a0, v1, 0x103e9a0 sll   zero, zero, 0
+// 0x0103e95c: 0x103e95c: beq   a0, v1, 0x103e9b0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_103e9a0
+	beq  L_103e9b0
 // --- basic block ---
-L_103e954:
-// 0x0103e954: 0x103e954: addiu a2, sp, 76
+L_103e964:
+// 0x0103e964: 0x103e964: addiu a2, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.3
-// 0x0103e958: 0x103e958: addu  a0, a2, zero
+// 0x0103e968: 0x103e968: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0103e95c: 0x103e95c: sw    v0, 144(sp)
+// 0x0103e96c: 0x103e96c: sw    v0, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3208,7 +3208,7 @@ L_103e954:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103e960: 0x103e960: jal   0x1072468 sw    a2, 148(sp)
+// 0x0103e970: 0x103e970: jal   0x1072a8c sw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3222,12 +3222,12 @@ L_103e954:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e968: 0x103e968: lw    v0, 144(sp)
+// 0x0103e978: 0x103e978: lw    v0, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3236,12 +3236,12 @@ L_103e954:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103e96c: 0x103e96c: addiu a3, sp, 108
+// 0x0103e97c: 0x103e97c: addiu a3, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc 4
-// 0x0103e970: 0x103e970: lw    a1, 4(v0)
+// 0x0103e980: 0x103e980: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3250,11 +3250,11 @@ L_103e954:
 	add
 	ldelem.i4
 	stloc.2
-L_103e974:
-// 0x0103e974: 0x103e974: addu  a0, a3, zero
+L_103e984:
+// 0x0103e984: 0x103e984: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x0103e978: 0x103e978: jal   0x1072468 sw    a3, 144(sp)
+// 0x0103e988: 0x103e988: jal   0x1072a8c sw    a3, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3268,15 +3268,15 @@ L_103e974:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e980: 0x103e980: lui   a1, 0x10000
+// 0x0103e990: 0x103e990: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e984: 0x103e984: lw    a2, 148(sp)
+// 0x0103e994: 0x103e994: lw    a2, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3285,7 +3285,7 @@ L_103e974:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103e988: 0x103e988: lw    a3, 144(sp)
+// 0x0103e998: 0x103e998: lw    a3, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3294,12 +3294,12 @@ L_103e974:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103e98c: 0x103e98c: addu  a0, s1, zero
+// 0x0103e99c: 0x103e99c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103e990: 0x103e990: jal   0x1000f64 addiu a1, a1, -5800
+// 0x0103e9a0: 0x103e9a0: jal   0x1000f64 addiu a1, a1, -5804
 	ldloc.2
-	ldc.i4 -5800
+	ldc.i4 -5804
 	add
 	stloc.2
 	ldloc.0
@@ -3312,32 +3312,32 @@ L_103e974:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e998: 0x103e998: j	 0x103e9d0 lui   s1, 0x10000
+// 0x0103e9a8: 0x103e9a8: j	 0x103e9e0 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-	br L_103e9d0
+	br L_103e9e0
 // --- basic block ---
-L_103e9a0:
-// 0x0103e9a0: 0x103e9a0: lui   a1, 0x10000
+L_103e9b0:
+// 0x0103e9b0: 0x103e9b0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e9a4: 0x103e9a4: lui   a3, 0x10000
+// 0x0103e9b4: 0x103e9b4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103e9a8: 0x103e9a8: addiu a1, a1, -6148
+// 0x0103e9b8: 0x103e9b8: addiu a1, a1, -6152
 	ldloc.2
-	ldc.i4 -6148
+	ldc.i4 -6152
 	add
 	stloc.2
-// 0x0103e9ac: 0x103e9ac: addiu a0, zero, 1
+// 0x0103e9bc: 0x103e9bc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103e9b0: 0x103e9b0: addiu a3, a3, -5772
+// 0x0103e9c0: 0x103e9c0: addiu a3, a3, -5776
 	ldloc 4
-	ldc.i4 -5772
+	ldc.i4 -5776
 	add
 	stloc 4
-// 0x0103e9b4: 0x103e9b4: jal   0x100449c addiu a2, zero, 114
+// 0x0103e9c4: 0x103e9c4: jal   0x100449c addiu a2, zero, 114
 	ldc.i4.s 114
 	stloc.3
 	ldloc.0
@@ -3350,15 +3350,15 @@ L_103e9a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e9bc: 0x103e9bc: lui   a1, 0x10000
+// 0x0103e9cc: 0x103e9cc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103e9c0: 0x103e9c0: addu  a0, s1, zero
+// 0x0103e9d0: 0x103e9d0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103e9c4: 0x103e9c4: jal   0x1001b68 addiu a1, a1, -5736
+// 0x0103e9d4: 0x103e9d4: jal   0x1001b68 addiu a1, a1, -5740
 	ldloc.2
-	ldc.i4 -5736
+	ldc.i4 -5740
 	add
 	stloc.2
 	ldloc.1
@@ -3368,50 +3368,50 @@ L_103e9a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e9cc: 0x103e9cc: lui   s1, 0x10000
+// 0x0103e9dc: 0x103e9dc: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-L_103e9d0:
-// 0x0103e9d0: 0x103e9d0: lui   s3, 0x60000
+L_103e9e0:
+// 0x0103e9e0: 0x103e9e0: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0103e9d4: 0x103e9d4: lui   a3, 0x10000
+// 0x0103e9e4: 0x103e9e4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103e9d8: 0x103e9d8: lui   v0, 0x60000
+// 0x0103e9e8: 0x103e9e8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103e9dc: 0x103e9dc: addiu s3, s3, -11856
+// 0x0103e9ec: 0x103e9ec: addiu s3, s3, -11392
 	ldloc 9
-	ldc.i4 -11856
+	ldc.i4 -11392
 	add
 	stloc 9
-// 0x0103e9e0: 0x103e9e0: addiu a3, a3, -5708
+// 0x0103e9f0: 0x103e9f0: addiu a3, a3, -5712
 	ldloc 4
-	ldc.i4 -5708
+	ldc.i4 -5712
 	add
 	stloc 4
-// 0x0103e9e4: 0x103e9e4: addiu a0, zero, 2
+// 0x0103e9f4: 0x103e9f4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103e9e8: 0x103e9e8: addiu a1, s1, -6148
+// 0x0103e9f8: 0x103e9f8: addiu a1, s1, -6152
 	ldloc 8
-	ldc.i4 -6148
+	ldc.i4 -6152
 	add
 	stloc.2
-// 0x0103e9ec: 0x103e9ec: addiu a2, zero, 201
+// 0x0103e9fc: 0x103e9fc: addiu a2, zero, 201
 	ldc.i4 201
 	stloc.3
-// 0x0103e9f0: 0x103e9f0: sw    zero, -11860(v0)
+// 0x0103ea00: 0x103ea00: sw    zero, -11396(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2965
+	ldc.i4 -2849
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103e9f4: 0x103e9f4: jal   0x100449c sw    s3, 16(sp)
+// 0x0103ea04: 0x103ea04: jal   0x100449c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3430,27 +3430,27 @@ L_103e9d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103e9fc: 0x103e9fc: lui   v0, 0x1040000
+// 0x0103ea0c: 0x103ea0c: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0103ea00: 0x103ea00: addiu v0, v0, -7612
+// 0x0103ea10: 0x103ea10: addiu v0, v0, -7596
 	ldloc 5
-	ldc.i4 -7612
+	ldc.i4 -7596
 	add
 	stloc 5
-// 0x0103ea04: 0x103ea04: addu  a0, s0, zero
+// 0x0103ea14: 0x103ea14: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0103ea08: 0x103ea08: addu  a1, s6, zero
+// 0x0103ea18: 0x103ea18: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x0103ea0c: 0x103ea0c: addu  a2, s5, zero
+// 0x0103ea1c: 0x103ea1c: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x0103ea10: 0x103ea10: addu  a3, s4, zero
+// 0x0103ea20: 0x103ea20: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x0103ea14: 0x103ea14: sw    v0, 16(sp)
+// 0x0103ea24: 0x103ea24: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3459,7 +3459,7 @@ L_103e9d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103ea18: 0x103ea18: sw    s2, 20(sp)
+// 0x0103ea28: 0x103ea28: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3468,7 +3468,7 @@ L_103e9d0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103ea1c: 0x103ea1c: jal   0x1069ec8 sw    s3, 24(sp)
+// 0x0103ea2c: 0x103ea2c: jal   0x106a4b4 sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3482,57 +3482,57 @@ L_103e9d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ea24: 0x103ea24: bne   v0, zero, 0x103ea58 addu  v1, zero, zero
+// 0x0103ea34: 0x103ea34: bne   v0, zero, 0x103ea68 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_103ea58
+	brtrue L_103ea68
 // --- basic block ---
-// 0x0103ea2c: 0x103ea2c: lui   v0, 0x60000
+// 0x0103ea3c: 0x103ea3c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ea30: 0x103ea30: lui   a3, 0x10000
+// 0x0103ea40: 0x103ea40: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ea34: 0x103ea34: sw    zero, -11868(v0)
+// 0x0103ea44: 0x103ea44: sw    zero, -11404(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2967
+	ldc.i4 -2851
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103ea38: 0x103ea38: addiu a1, s1, -6148
+// 0x0103ea48: 0x103ea48: addiu a1, s1, -6152
 	ldloc 8
-	ldc.i4 -6148
+	ldc.i4 -6152
 	add
 	stloc.2
-// 0x0103ea3c: 0x103ea3c: lui   v0, 0x60000
+// 0x0103ea4c: 0x103ea4c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ea40: 0x103ea40: addiu a3, a3, -5684
+// 0x0103ea50: 0x103ea50: addiu a3, a3, -5688
 	ldloc 4
-	ldc.i4 -5684
+	ldc.i4 -5688
 	add
 	stloc 4
-// 0x0103ea44: 0x103ea44: addiu a0, zero, 1
+// 0x0103ea54: 0x103ea54: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103ea48: 0x103ea48: addiu a2, zero, 216
+// 0x0103ea58: 0x103ea58: addiu a2, zero, 216
 	ldc.i4 216
 	stloc.3
-// 0x0103ea4c: 0x103ea4c: jal   0x100449c sw    zero, -11864(v0)
+// 0x0103ea5c: 0x103ea5c: jal   0x100449c sw    zero, -11400(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2966
+	ldc.i4 -2850
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3546,15 +3546,15 @@ L_103e9d0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ea54: 0x103ea54: addiu v1, zero, 2
+// 0x0103ea64: 0x103ea64: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-L_103ea58:
-// 0x0103ea58: 0x103ea58: lw    ra, 188(sp)
-// 0x0103ea5c: 0x103ea5c: addu  v0, v1, zero
+L_103ea68:
+// 0x0103ea68: 0x103ea68: lw    ra, 188(sp)
+// 0x0103ea6c: 0x103ea6c: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x0103ea60: 0x103ea60: lw    s8, 184(sp)
+// 0x0103ea70: 0x103ea70: lw    s8, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3563,7 +3563,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0103ea64: 0x103ea64: lw    s7, 180(sp)
+// 0x0103ea74: 0x103ea74: lw    s7, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3572,7 +3572,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0103ea68: 0x103ea68: lw    s6, 176(sp)
+// 0x0103ea78: 0x103ea78: lw    s6, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3581,7 +3581,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103ea6c: 0x103ea6c: lw    s5, 172(sp)
+// 0x0103ea7c: 0x103ea7c: lw    s5, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3590,7 +3590,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0103ea70: 0x103ea70: lw    s4, 168(sp)
+// 0x0103ea80: 0x103ea80: lw    s4, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3599,7 +3599,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103ea74: 0x103ea74: lw    s3, 164(sp)
+// 0x0103ea84: 0x103ea84: lw    s3, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3608,7 +3608,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103ea78: 0x103ea78: lw    s2, 160(sp)
+// 0x0103ea88: 0x103ea88: lw    s2, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3617,7 +3617,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103ea7c: 0x103ea7c: lw    s1, 156(sp)
+// 0x0103ea8c: 0x103ea8c: lw    s1, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3626,7 +3626,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103ea80: 0x103ea80: lw    s0, 152(sp)
+// 0x0103ea90: 0x103ea90: lw    s0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3635,7 +3635,7 @@ L_103ea58:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103ea84: 0x103ea84: jr    ra addiu sp, sp, 192
+// 0x0103ea94: 0x103ea94: jr    ra addiu sp, sp, 192
 	ldloc.0
 	ldc.i4 192
 	add
@@ -3647,7 +3647,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 address_candidate_init_103ea8c(int32,int32,int32,int32,int32)
+.method public static int32 address_candidate_init_103ea9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -3685,19 +3685,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ea8c: 0x103ea8c: addiu sp, sp, -24
+// 0x0103ea9c: 0x103ea9c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103ea90: 0x103ea90: addu  a1, zero, zero
+// 0x0103eaa0: 0x103eaa0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0103ea94: 0x103ea94: addiu a2, zero, 1096
+// 0x0103eaa4: 0x103eaa4: addiu a2, zero, 1096
 	ldc.i4 1096
 	stloc.3
-// 0x0103ea98: 0x103ea98: sw    ra, 20(sp)
-// 0x0103ea9c: 0x103ea9c: sw    s0, 16(sp)
+// 0x0103eaa8: 0x103eaa8: sw    ra, 20(sp)
+// 0x0103eaac: 0x103eaac: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3706,7 +3706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103eaa0: 0x103eaa0: jal   0x100177c addu  s0, a0, zero
+// 0x0103eab0: 0x103eab0: jal   0x100177c addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.1
@@ -3718,11 +3718,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0103eaa8: 0x103eaa8: lw    ra, 20(sp)
-// 0x0103eaac: 0x103eaac: addiu v0, zero, -1
+// 0x0103eab8: 0x103eab8: lw    ra, 20(sp)
+// 0x0103eabc: 0x103eabc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0103eab0: 0x103eab0: sw    v0, 284(s0)
+// 0x0103eac0: 0x103eac0: sw    v0, 284(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3731,7 +3731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103eab4: 0x103eab4: lw    s0, 16(sp)
+// 0x0103eac4: 0x103eac4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3740,7 +3740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103eab8: 0x103eab8: jr    ra addiu sp, sp, 24
+// 0x0103eac8: 0x103eac8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3752,7 +3752,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 single_search_resolve_address_103eac0(int32,int32,int32,int32,int32)
+.method public static int32 single_search_resolve_address_103ead0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 v1,int32 ra)
@@ -3799,13 +3799,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103eac0: 0x103eac0: addiu sp, sp, -568
+// 0x0103ead0: 0x103ead0: addiu sp, sp, -568
 	ldloc.0
 	ldc.i4 -568
 	add
 	stloc.0
-// 0x0103eac4: 0x103eac4: sw    ra, 564(sp)
-// 0x0103eac8: 0x103eac8: sw    s3, 560(sp)
+// 0x0103ead4: 0x103ead4: sw    ra, 564(sp)
+// 0x0103ead8: 0x103ead8: sw    s3, 560(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3814,7 +3814,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103eacc: 0x103eacc: sw    s2, 556(sp)
+// 0x0103eadc: 0x103eadc: sw    s2, 556(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3823,13 +3823,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103ead0: 0x103ead0: addu  s3, a0, zero
+// 0x0103eae0: 0x103eae0: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0103ead4: 0x103ead4: addu  s2, a1, zero
+// 0x0103eae4: 0x103eae4: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0103ead8: 0x103ead8: sw    s1, 552(sp)
+// 0x0103eae8: 0x103eae8: sw    s1, 552(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3838,7 +3838,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103eadc: 0x103eadc: sw    s0, 548(sp)
+// 0x0103eaec: 0x103eaec: sw    s0, 548(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3847,10 +3847,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103eae0: 0x103eae0: addu  s1, a2, zero
+// 0x0103eaf0: 0x103eaf0: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0103eae4: 0x103eae4: jal   0x103a9a4 addiu s0, sp, 32
+// 0x0103eaf4: 0x103eaf4: jal   0x103a9b4 addiu s0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3860,26 +3860,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_provider_103a9a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_provider_103a9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0103eaec: 0x103eaec: lui   a2, 0x10000
+// 0x0103eafc: 0x103eafc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103eaf0: 0x103eaf0: addu  a0, s0, zero
+// 0x0103eb00: 0x103eb00: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0103eaf4: 0x103eaf4: addiu a2, a2, -5624
+// 0x0103eb04: 0x103eb04: addiu a2, a2, -5628
 	ldloc.3
-	ldc.i4 -5624
+	ldc.i4 -5628
 	add
 	stloc.3
-// 0x0103eaf8: 0x103eaf8: addu  a3, v0, zero
+// 0x0103eb08: 0x103eb08: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0103eafc: 0x103eafc: jal   0x1000f9c addiu a1, zero, 512
+// 0x0103eb0c: 0x103eb0c: jal   0x1000f9c addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3892,38 +3892,38 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0103eb04: 0x103eb04: lui   v0, 0x60000
+// 0x0103eb14: 0x103eb14: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103eb08: 0x103eb08: lw    a0, 11088(v0)
+// 0x0103eb18: 0x103eb18: lw    a0, 11552(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2772
+	ldc.i4 2888
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103eb0c: 0x103eb0c: lui   a1, 0x0
+// 0x0103eb1c: 0x103eb1c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103eb10: 0x103eb10: lui   a3, 0x10000
+// 0x0103eb20: 0x103eb20: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103eb14: 0x103eb14: addiu a1, a1, 13088
+// 0x0103eb24: 0x103eb24: addiu a1, a1, 13088
 	ldloc.2
 	ldc.i4 13088
 	add
 	stloc.2
-// 0x0103eb18: 0x103eb18: addiu a3, a3, -5588
+// 0x0103eb28: 0x103eb28: addiu a3, a3, -5592
 	ldloc 4
-	ldc.i4 -5588
+	ldc.i4 -5592
 	add
 	stloc 4
-// 0x0103eb1c: 0x103eb1c: addiu a2, zero, 2
+// 0x0103eb2c: 0x103eb2c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0103eb20: 0x103eb20: sw    s3, 16(sp)
+// 0x0103eb30: 0x103eb30: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3932,7 +3932,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103eb24: 0x103eb24: sw    s2, 20(sp)
+// 0x0103eb34: 0x103eb34: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3941,7 +3941,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103eb28: 0x103eb28: sw    s1, 24(sp)
+// 0x0103eb38: 0x103eb38: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3950,7 +3950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103eb2c: 0x103eb2c: jal   0x103e744 sw    s0, 28(sp)
+// 0x0103eb3c: 0x103eb3c: jal   0x103e754 sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3964,13 +3964,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_resolve_address_103e744(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_resolve_address_103e754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0103eb34: 0x103eb34: lw    ra, 564(sp)
-// 0x0103eb38: 0x103eb38: lw    s3, 560(sp)
+// 0x0103eb44: 0x103eb44: lw    ra, 564(sp)
+// 0x0103eb48: 0x103eb48: lw    s3, 560(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3979,7 +3979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103eb3c: 0x103eb3c: lw    s2, 556(sp)
+// 0x0103eb4c: 0x103eb4c: lw    s2, 556(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3988,7 +3988,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103eb40: 0x103eb40: lw    s1, 552(sp)
+// 0x0103eb50: 0x103eb50: lw    s1, 552(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3997,7 +3997,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103eb44: 0x103eb44: lw    s0, 548(sp)
+// 0x0103eb54: 0x103eb54: lw    s0, 548(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4006,7 +4006,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103eb48: 0x103eb48: jr    ra addiu sp, sp, 568
+// 0x0103eb58: 0x103eb58: jr    ra addiu sp, sp, 568
 	ldloc.0
 	ldc.i4 568
 	add
@@ -4018,7 +4018,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_single_search_address_candidate_103eb50(int32,int32,int32,int32,int32)
+.method public static int32 on_single_search_address_candidate_103eb60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s4,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -4068,13 +4068,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103eb50:
-// 0x0103eb50: 0x103eb50: addiu sp, sp, -1248
+L_103eb60:
+// 0x0103eb60: 0x103eb60: addiu sp, sp, -1248
 	ldloc.0
 	ldc.i4 -1248
 	add
 	stloc.0
-// 0x0103eb54: 0x103eb54: sw    s4, 1240(sp)
+// 0x0103eb64: 0x103eb64: sw    s4, 1240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4083,16 +4083,16 @@ L_103eb50:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103eb58: 0x103eb58: addu  s4, a0, zero
+// 0x0103eb68: 0x103eb68: addu  s4, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103eb5c: 0x103eb5c: addiu a0, sp, 128
+// 0x0103eb6c: 0x103eb6c: addiu a0, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
 	stloc.1
-// 0x0103eb60: 0x103eb60: sw    ra, 1244(sp)
-// 0x0103eb64: 0x103eb64: sw    s3, 1236(sp)
+// 0x0103eb70: 0x103eb70: sw    ra, 1244(sp)
+// 0x0103eb74: 0x103eb74: sw    s3, 1236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4101,7 +4101,7 @@ L_103eb50:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103eb68: 0x103eb68: sw    s2, 1232(sp)
+// 0x0103eb78: 0x103eb78: sw    s2, 1232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4110,7 +4110,7 @@ L_103eb50:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103eb6c: 0x103eb6c: sw    s1, 1228(sp)
+// 0x0103eb7c: 0x103eb7c: sw    s1, 1228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4119,7 +4119,7 @@ L_103eb50:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103eb70: 0x103eb70: sw    s0, 1224(sp)
+// 0x0103eb80: 0x103eb80: sw    s0, 1224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4128,13 +4128,13 @@ L_103eb50:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103eb74: 0x103eb74: addu  s2, a1, zero
+// 0x0103eb84: 0x103eb84: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0103eb78: 0x103eb78: addu  s0, a3, zero
+// 0x0103eb88: 0x103eb88: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x0103eb7c: 0x103eb7c: jal   0x103ea8c addu  s1, a2, zero
+// 0x0103eb8c: 0x103eb8c: jal   0x103ea9c addu  s1, a2, zero
 	ldloc.3
 	stloc 10
 	ldloc.0
@@ -4142,36 +4142,36 @@ L_103eb50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::address_candidate_init_103ea8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::address_candidate_init_103ea9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103eb84: 0x103eb84: addiu v0, zero, 18
+// 0x0103eb94: 0x103eb94: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0103eb88: 0x103eb88: sw    v0, 0(s0)
+// 0x0103eb98: 0x103eb98: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103eb8c: 0x103eb8c: addiu s3, sp, 28
+// 0x0103eb9c: 0x103eb9c: addiu s3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 12
-// 0x0103eb90: 0x103eb90: addiu v0, zero, 100
+// 0x0103eba0: 0x103eba0: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x0103eb94: 0x103eb94: lui   a3, 0x0
+// 0x0103eba4: 0x103eba4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0103eb98: 0x103eb98: addu  a0, s4, zero
+// 0x0103eba8: 0x103eba8: addu  a0, s4, zero
 	ldloc 9
 	stloc.1
-// 0x0103eb9c: 0x103eb9c: sw    v0, 24(sp)
+// 0x0103ebac: 0x103ebac: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4180,23 +4180,23 @@ L_103eb50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103eba0: 0x103eba0: addiu a3, a3, 28076
+// 0x0103ebb0: 0x103ebb0: addiu a3, a3, 28076
 	ldloc 4
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x0103eba4: 0x103eba4: addiu v0, zero, 1
+// 0x0103ebb4: 0x103ebb4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103eba8: 0x103eba8: addu  a1, s3, zero
+// 0x0103ebb8: 0x103ebb8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x0103ebac: 0x103ebac: addiu a2, sp, 24
+// 0x0103ebbc: 0x103ebbc: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0103ebb0: 0x103ebb0: jal   0x1068250 sw    v0, 16(sp)
+// 0x0103ebc0: 0x103ebc0: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4210,37 +4210,37 @@ L_103eb50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ebb8: 0x103ebb8: bne   v0, zero, 0x103ebe4 addu  s4, v0, zero
+// 0x0103ebc8: 0x103ebc8: bne   v0, zero, 0x103ebf4 addu  s4, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_103ebe4
+	brtrue L_103ebf4
 // --- basic block ---
-// 0x0103ebc0: 0x103ebc0: lui   a1, 0x10000
+// 0x0103ebd0: 0x103ebd0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ebc4: 0x103ebc4: lui   a3, 0x10000
+// 0x0103ebd4: 0x103ebd4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ebc8: 0x103ebc8: addiu a1, a1, -5576
+// 0x0103ebd8: 0x103ebd8: addiu a1, a1, -5580
 	ldloc.2
-	ldc.i4 -5576
+	ldc.i4 -5580
 	add
 	stloc.2
-// 0x0103ebcc: 0x103ebcc: addiu a3, a3, -5532
+// 0x0103ebdc: 0x103ebdc: addiu a3, a3, -5536
 	ldloc 4
-	ldc.i4 -5532
+	ldc.i4 -5536
 	add
 	stloc 4
-// 0x0103ebd0: 0x103ebd0: addiu a0, zero, 4
+// 0x0103ebe0: 0x103ebe0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103ebd4: 0x103ebd4: jal   0x100449c addiu a2, zero, 132
+// 0x0103ebe4: 0x103ebe4: jal   0x100449c addiu a2, zero, 132
 	ldc.i4 132
 	stloc.3
 	ldloc.0
@@ -4253,21 +4253,21 @@ L_103eb50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ebdc: 0x103ebdc: j	 0x103ec24 addu  v0, zero, zero
+// 0x0103ebec: 0x103ebec: j	 0x103ec34 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_103ec24
+	br L_103ec34
 // --- basic block ---
-L_103ebe4:
-// 0x0103ebe4: 0x103ebe4: lui   a0, 0x10000
+L_103ebf4:
+// 0x0103ebf4: 0x103ebf4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ebe8: 0x103ebe8: addiu a0, a0, -7296
+// 0x0103ebf8: 0x103ebf8: addiu a0, a0, -7300
 	ldloc.1
-	ldc.i4 -7296
+	ldc.i4 -7300
 	add
 	stloc.1
-// 0x0103ebec: 0x103ebec: jal   0x1001b14 addu  a1, s3, zero
+// 0x0103ebfc: 0x103ebfc: jal   0x1001b14 addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
@@ -4275,19 +4275,19 @@ L_103ebe4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103ebf4: 0x103ebf4: bne   v0, zero, 0x103ec14 addu  a0, s4, zero
+// 0x0103ec04: 0x103ec04: bne   v0, zero, 0x103ec24 addu  a0, s4, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_103ec14
+	brtrue L_103ec24
 // --- basic block ---
-// 0x0103ebfc: 0x103ebfc: addu  a1, s2, zero
+// 0x0103ec0c: 0x103ec0c: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x0103ec00: 0x103ec00: addu  a2, s1, zero
+// 0x0103ec10: 0x103ec10: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x0103ec04: 0x103ec04: jal   0x103c538 addu  a3, s0, zero
+// 0x0103ec14: 0x103ec14: jal   0x103c548 addu  a3, s0, zero
 	ldloc 8
 	stloc 4
 	ldloc.0
@@ -4295,22 +4295,22 @@ L_103ebe4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::on_address_option_103c538(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::on_address_option_103c548(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ec0c: 0x103ec0c: j	 0x103ec24 sll   zero, zero, 0
-	br L_103ec24
+// 0x0103ec1c: 0x103ec1c: j	 0x103ec34 sll   zero, zero, 0
+	br L_103ec34
 // --- basic block ---
-L_103ec14:
-// 0x0103ec14: 0x103ec14: addu  a1, s2, zero
+L_103ec24:
+// 0x0103ec24: 0x103ec24: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x0103ec18: 0x103ec18: addu  a2, s1, zero
+// 0x0103ec28: 0x103ec28: addu  a2, s1, zero
 	ldloc 10
 	stloc.3
-// 0x0103ec1c: 0x103ec1c: jal   0x103b2c0 addu  a3, s0, zero
+// 0x0103ec2c: 0x103ec2c: jal   0x103b2d0 addu  a3, s0, zero
 	ldloc 8
 	stloc 4
 	ldloc.0
@@ -4318,14 +4318,14 @@ L_103ec14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::on_local_option_103b2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::on_local_option_103b2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103ec24:
-// 0x0103ec24: 0x103ec24: lw    ra, 1244(sp)
-// 0x0103ec28: 0x103ec28: lw    s4, 1240(sp)
+L_103ec34:
+// 0x0103ec34: 0x103ec34: lw    ra, 1244(sp)
+// 0x0103ec38: 0x103ec38: lw    s4, 1240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4334,7 +4334,7 @@ L_103ec24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103ec2c: 0x103ec2c: lw    s3, 1236(sp)
+// 0x0103ec3c: 0x103ec3c: lw    s3, 1236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4343,7 +4343,7 @@ L_103ec24:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103ec30: 0x103ec30: lw    s2, 1232(sp)
+// 0x0103ec40: 0x103ec40: lw    s2, 1232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4352,7 +4352,7 @@ L_103ec24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103ec34: 0x103ec34: lw    s1, 1228(sp)
+// 0x0103ec44: 0x103ec44: lw    s1, 1228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4361,7 +4361,7 @@ L_103ec24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103ec38: 0x103ec38: lw    s0, 1224(sp)
+// 0x0103ec48: 0x103ec48: lw    s0, 1224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4370,7 +4370,7 @@ L_103ec24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103ec3c: 0x103ec3c: jr    ra addiu sp, sp, 1248
+// 0x0103ec4c: 0x103ec4c: jr    ra addiu sp, sp, 1248
 	ldloc.0
 	ldc.i4 1248
 	add
@@ -4382,7 +4382,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 single_search_term_103ec44(int32,int32,int32,int32,int32)
+.method public static int32 single_search_term_103ec54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -4420,12 +4420,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ec44: 0x103ec44: addiu sp, sp, -24
+// 0x0103ec54: 0x103ec54: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103ec48: 0x103ec48: sw    s0, 16(sp)
+// 0x0103ec58: 0x103ec58: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4434,43 +4434,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103ec4c: 0x103ec4c: lui   s0, 0x60000
+// 0x0103ec5c: 0x103ec5c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103ec50: 0x103ec50: lw    v0, 11088(s0)
+// 0x0103ec60: 0x103ec60: lw    v0, 11552(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2772
+	ldc.i4 2888
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103ec54: 0x103ec54: sll   zero, zero, 0
-// 0x0103ec58: 0x103ec58: beq   v0, zero, 0x103ec98 sw    ra, 20(sp)
+// 0x0103ec64: 0x103ec64: sll   zero, zero, 0
+// 0x0103ec68: 0x103ec68: beq   v0, zero, 0x103eca8 sw    ra, 20(sp)
 	ldloc 6
-	brfalse L_103ec98
+	brfalse L_103eca8
 // --- basic block ---
-// 0x0103ec60: 0x103ec60: lui   a1, 0x10000
+// 0x0103ec70: 0x103ec70: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ec64: 0x103ec64: lui   a3, 0x10000
+// 0x0103ec74: 0x103ec74: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ec68: 0x103ec68: addiu a1, a1, -5576
+// 0x0103ec78: 0x103ec78: addiu a1, a1, -5580
 	ldloc.2
-	ldc.i4 -5576
+	ldc.i4 -5580
 	add
 	stloc.2
-// 0x0103ec6c: 0x103ec6c: addiu a3, a3, -5460
+// 0x0103ec7c: 0x103ec7c: addiu a3, a3, -5464
 	ldloc 4
-	ldc.i4 -5460
+	ldc.i4 -5464
 	add
 	stloc 4
-// 0x0103ec70: 0x103ec70: addiu a2, zero, 151
+// 0x0103ec80: 0x103ec80: addiu a2, zero, 151
 	ldc.i4 151
 	stloc.3
-// 0x0103ec74: 0x103ec74: jal   0x100449c addiu a0, zero, 1
+// 0x0103ec84: 0x103ec84: jal   0x100449c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -4483,32 +4483,32 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103ec7c: 0x103ec7c: lw    a0, 11088(s0)
+// 0x0103ec8c: 0x103ec8c: lw    a0, 11552(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2772
+	ldc.i4 2888
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103ec80: 0x103ec80: jal   0x106a494 sll   zero, zero, 0
+// 0x0103ec90: 0x103ec90: jal   0x106aa9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_term_106a494(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_term_106aa9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103ec88: 0x103ec88: jal   0x103c18c sw    zero, 11088(s0)
+// 0x0103ec98: 0x103ec98: jal   0x103c19c sw    zero, 11552(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2772
+	ldc.i4 2888
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4517,25 +4517,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::address_search_term_103c18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::address_search_term_103c19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0103ec90: 0x103ec90: jal   0x103ac24 sll   zero, zero, 0
+// 0x0103eca0: 0x103eca0: jal   0x103ac34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_term_103ac24(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_term_103ac34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_103ec98:
-// 0x0103ec98: 0x103ec98: lw    ra, 20(sp)
-// 0x0103ec9c: 0x103ec9c: lw    s0, 16(sp)
+L_103eca8:
+// 0x0103eca8: 0x103eca8: lw    ra, 20(sp)
+// 0x0103ecac: 0x103ecac: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4544,7 +4544,7 @@ L_103ec98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103eca0: 0x103eca0: jr    ra addiu sp, sp, 24
+// 0x0103ecb0: 0x103ecb0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4556,7 +4556,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 single_search_init_103eca8(int32,int32,int32,int32,int32)
+.method public static int32 single_search_init_103ecb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -4594,25 +4594,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103eca8: 0x103eca8: lui   v0, 0x60000
+// 0x0103ecb8: 0x103ecb8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ecac: 0x103ecac: lw    v1, 11088(v0)
+// 0x0103ecbc: 0x103ecbc: lw    v1, 11552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2772
+	ldc.i4 2888
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103ecb0: 0x103ecb0: addiu sp, sp, -32
+// 0x0103ecc0: 0x103ecc0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103ecb4: 0x103ecb4: sw    ra, 28(sp)
-// 0x0103ecb8: 0x103ecb8: sw    s0, 24(sp)
+// 0x0103ecc4: 0x103ecc4: sw    ra, 28(sp)
+// 0x0103ecc8: 0x103ecc8: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4621,53 +4621,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ecbc: 0x103ecbc: bne   v1, zero, 0x103ed7c addiu v0, zero, 1
+// 0x0103eccc: 0x103eccc: bne   v1, zero, 0x103ed8c addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brtrue L_103ed7c
+	brtrue L_103ed8c
 // --- basic block ---
-// 0x0103ecc4: 0x103ecc4: lui   s0, 0x60000
+// 0x0103ecd4: 0x103ecd4: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103ecc8: 0x103ecc8: lw    v0, 11092(s0)
+// 0x0103ecd8: 0x103ecd8: lw    v0, 11556(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2773
+	ldc.i4 2889
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103eccc: 0x103eccc: sll   zero, zero, 0
-// 0x0103ecd0: 0x103ecd0: bne   v0, zero, 0x103ecfc lui   a2, 0x10000
+// 0x0103ecdc: 0x103ecdc: sll   zero, zero, 0
+// 0x0103ece0: 0x103ece0: bne   v0, zero, 0x103ed0c lui   a2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	brtrue L_103ecfc
+	brtrue L_103ed0c
 // --- basic block ---
-// 0x0103ecd8: 0x103ecd8: lui   a0, 0x10000
+// 0x0103ece8: 0x103ece8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ecdc: 0x103ecdc: lui   a1, 0x0
+// 0x0103ecec: 0x103ecec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103ece0: 0x103ece0: addiu a0, a0, 12560
+// 0x0103ecf0: 0x103ecf0: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0103ece4: 0x103ece4: addiu a1, a1, 13104
+// 0x0103ecf4: 0x103ecf4: addiu a1, a1, 13104
 	ldloc.2
 	ldc.i4 13104
 	add
 	stloc.2
-// 0x0103ece8: 0x103ece8: addiu a2, a2, 18500
+// 0x0103ecf8: 0x103ecf8: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0103ecec: 0x103ecec: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103ecfc: 0x103ecfc: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4675,28 +4675,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ecf4: 0x103ecf4: addiu v0, zero, 1
+// 0x0103ed04: 0x103ed04: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103ecf8: 0x103ecf8: sw    v0, 11092(s0)
+// 0x0103ed08: 0x103ed08: sw    v0, 11556(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2773
+	ldc.i4 2889
 	add
 	ldloc 5
 	stelem.i4
-L_103ecfc:
-// 0x0103ecfc: 0x103ecfc: lui   a0, 0x0
+L_103ed0c:
+// 0x0103ed0c: 0x103ed0c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103ed00: 0x103ed00: jal   0x100e348 addiu a0, a0, 13104
+// 0x0103ed10: 0x103ed10: jal   0x100e358 addiu a0, a0, 13104
 	ldloc.1
 	ldc.i4 13104
 	add
@@ -4706,23 +4706,23 @@ L_103ecfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ed08: 0x103ed08: lui   a1, 0x10000
+// 0x0103ed18: 0x103ed18: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ed0c: 0x103ed0c: addiu a1, a1, -28184
+// 0x0103ed1c: 0x103ed1c: addiu a1, a1, -28184
 	ldloc.2
 	ldc.i4 -28184
 	add
 	stloc.2
-// 0x0103ed10: 0x103ed10: addu  a0, v0, zero
+// 0x0103ed20: 0x103ed20: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103ed14: 0x103ed14: jal   0x106a1ac addu  s0, v0, zero
+// 0x0103ed24: 0x103ed24: jal   0x106a798 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4730,49 +4730,49 @@ L_103ecfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_init_106a1ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_init_106a798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ed1c: 0x103ed1c: lui   v1, 0x60000
+// 0x0103ed2c: 0x103ed2c: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103ed20: 0x103ed20: sw    v0, 11088(v1)
+// 0x0103ed30: 0x103ed30: sw    v0, 11552(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2772
+	ldc.i4 2888
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103ed24: 0x103ed24: beq   v0, zero, 0x103ed60 lui   a1, 0x10000
+// 0x0103ed34: 0x103ed34: beq   v0, zero, 0x103ed70 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103ed60
+	brfalse L_103ed70
 // --- basic block ---
-// 0x0103ed2c: 0x103ed2c: lui   a3, 0x10000
+// 0x0103ed3c: 0x103ed3c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ed30: 0x103ed30: addiu a1, a1, -5576
+// 0x0103ed40: 0x103ed40: addiu a1, a1, -5580
 	ldloc.2
-	ldc.i4 -5576
+	ldc.i4 -5580
 	add
 	stloc.2
-// 0x0103ed34: 0x103ed34: addiu a3, a3, -5432
+// 0x0103ed44: 0x103ed44: addiu a3, a3, -5436
 	ldloc 4
-	ldc.i4 -5432
+	ldc.i4 -5436
 	add
 	stloc 4
-// 0x0103ed38: 0x103ed38: addiu a0, zero, 1
+// 0x0103ed48: 0x103ed48: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103ed3c: 0x103ed3c: addiu a2, zero, 93
+// 0x0103ed4c: 0x103ed4c: addiu a2, zero, 93
 	ldc.i4.s 93
 	stloc.3
-// 0x0103ed40: 0x103ed40: jal   0x100449c sw    s0, 16(sp)
+// 0x0103ed50: 0x103ed50: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4791,51 +4791,51 @@ L_103ecfc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ed48: 0x103ed48: jal   0x103c1e4 sll   zero, zero, 0
+// 0x0103ed58: 0x103ed58: jal   0x103c1f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl44::address_search_init_103c1e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl44::address_search_init_103c1f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ed50: 0x103ed50: jal   0x103ac7c sll   zero, zero, 0
+// 0x0103ed60: 0x103ed60: jal   0x103ac8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_init_103ac7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_init_103ac8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ed58: 0x103ed58: j	 0x103ed7c addiu v0, zero, 1
+// 0x0103ed68: 0x103ed68: j	 0x103ed8c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_103ed7c
+	br L_103ed8c
 // --- basic block ---
-L_103ed60:
-// 0x0103ed60: 0x103ed60: lui   a3, 0x10000
+L_103ed70:
+// 0x0103ed70: 0x103ed70: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ed64: 0x103ed64: addiu a1, a1, -5576
+// 0x0103ed74: 0x103ed74: addiu a1, a1, -5580
 	ldloc.2
-	ldc.i4 -5576
+	ldc.i4 -5580
 	add
 	stloc.2
-// 0x0103ed68: 0x103ed68: addiu a3, a3, -5380
+// 0x0103ed78: 0x103ed78: addiu a3, a3, -5384
 	ldloc 4
-	ldc.i4 -5380
+	ldc.i4 -5384
 	add
 	stloc 4
-// 0x0103ed6c: 0x103ed6c: addiu a0, zero, 4
+// 0x0103ed7c: 0x103ed7c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103ed70: 0x103ed70: jal   0x100449c addiu a2, zero, 101
+// 0x0103ed80: 0x103ed80: jal   0x100449c addiu a2, zero, 101
 	ldc.i4.s 101
 	stloc.3
 	ldloc.0
@@ -4848,12 +4848,12 @@ L_103ed60:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ed78: 0x103ed78: addu  v0, zero, zero
+// 0x0103ed88: 0x103ed88: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_103ed7c:
-// 0x0103ed7c: 0x103ed7c: lw    ra, 28(sp)
-// 0x0103ed80: 0x103ed80: lw    s0, 24(sp)
+L_103ed8c:
+// 0x0103ed8c: 0x103ed8c: lw    ra, 28(sp)
+// 0x0103ed90: 0x103ed90: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ L_103ed7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103ed84: 0x103ed84: jr    ra addiu sp, sp, 32
+// 0x0103ed94: 0x103ed94: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4874,7 +4874,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 single_search_dlg_show_103ed8c(int32,int32,int32,int32,int32)
+.method public static int32 single_search_dlg_show_103ed9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -4915,12 +4915,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ed8c: 0x103ed8c: addiu sp, sp, -40
+// 0x0103ed9c: 0x103ed9c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0103ed90: 0x103ed90: sw    s1, 32(sp)
+// 0x0103eda0: 0x103eda0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4929,34 +4929,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ed94: 0x103ed94: lui   s1, 0x60000
+// 0x0103eda4: 0x103eda4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103ed98: 0x103ed98: lui   v1, 0x60000
+// 0x0103eda8: 0x103eda8: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103ed9c: 0x103ed9c: lw    v0, 11096(s1)
+// 0x0103edac: 0x103edac: lw    v0, 11560(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2774
+	ldc.i4 2890
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103eda0: 0x103eda0: sw    a1, 11608(v1)
+// 0x0103edb0: 0x103edb0: sw    a1, 12072(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2902
+	ldc.i4 3018
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103eda4: 0x103eda4: lui   v1, 0x60000
+// 0x0103edb4: 0x103edb4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103eda8: 0x103eda8: sw    s0, 28(sp)
+// 0x0103edb8: 0x103edb8: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4965,26 +4965,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103edac: 0x103edac: sw    ra, 36(sp)
-// 0x0103edb0: 0x103edb0: addu  s0, a0, zero
+// 0x0103edbc: 0x103edbc: sw    ra, 36(sp)
+// 0x0103edc0: 0x103edc0: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103edb4: 0x103edb4: bne   v0, zero, 0x103eddc sw    a0, 11604(v1)
+// 0x0103edc4: 0x103edc4: bne   v0, zero, 0x103edec sw    a0, 12068(v1)
 	ldloc 6
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2901
+	ldc.i4 3017
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_103eddc
+	brtrue L_103edec
 // --- basic block ---
-// 0x0103edbc: 0x103edbc: addiu a0, zero, 65
+// 0x0103edcc: 0x103edcc: addiu a0, zero, 65
 	ldc.i4.s 65
 	stloc.1
-// 0x0103edc0: 0x103edc0: jal   0x1037918 addiu a1, zero, 8
+// 0x0103edd0: 0x103edd0: jal   0x1037928 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -4992,15 +4992,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103edc8: 0x103edc8: addiu a0, zero, 70
+// 0x0103edd8: 0x103edd8: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x0103edcc: 0x103edcc: jal   0x1037918 addiu a1, zero, 8
+// 0x0103eddc: 0x103eddc: jal   0x1037928 addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
 	ldloc.0
@@ -5008,47 +5008,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103edd4: 0x103edd4: addiu v0, zero, 1
+// 0x0103ede4: 0x103ede4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0103edd8: 0x103edd8: sw    v0, 11096(s1)
+// 0x0103ede8: 0x103ede8: sw    v0, 11560(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2774
+	ldc.i4 2890
 	add
 	ldloc 6
 	stelem.i4
-L_103eddc:
-// 0x0103eddc: 0x103eddc: lui   a1, 0x10000
+L_103edec:
+// 0x0103edec: 0x103edec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103ede0: 0x103ede0: lui   a3, 0x10000
+// 0x0103edf0: 0x103edf0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ede4: 0x103ede4: addiu a1, a1, -5320
+// 0x0103edf4: 0x103edf4: addiu a1, a1, -5324
 	ldloc.2
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103ede8: 0x103ede8: addiu a3, a3, -5272
+// 0x0103edf8: 0x103edf8: addiu a3, a3, -5276
 	ldloc 4
-	ldc.i4 -5272
+	ldc.i4 -5276
 	add
 	stloc 4
-// 0x0103edec: 0x103edec: addiu a0, zero, 2
+// 0x0103edfc: 0x103edfc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103edf0: 0x103edf0: addiu a2, zero, 362
+// 0x0103ee00: 0x103ee00: addiu a2, zero, 362
 	ldc.i4 362
 	stloc.3
-// 0x0103edf4: 0x103edf4: jal   0x100449c sw    s0, 16(sp)
+// 0x0103ee04: 0x103ee04: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5067,23 +5067,23 @@ L_103eddc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103edfc: 0x103edfc: lui   a0, 0x1040000
+// 0x0103ee0c: 0x103ee0c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0103ee00: 0x103ee00: jal   0x1052d5c addiu a0, a0, -4400
+// 0x0103ee10: 0x103ee10: jal   0x1052d6c addiu a0, a0, -4384
 	ldloc.1
-	ldc.i4 -4400
+	ldc.i4 -4384
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl61::ShowSearchEditbox_1052d5c(int32,int32)
+	call int32 Cibyl61::ShowSearchEditbox_1052d6c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0103ee08: 0x103ee08: lw    ra, 36(sp)
-// 0x0103ee0c: 0x103ee0c: lw    s1, 32(sp)
+// 0x0103ee18: 0x103ee18: lw    ra, 36(sp)
+// 0x0103ee1c: 0x103ee1c: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5092,7 +5092,7 @@ L_103eddc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103ee10: 0x103ee10: lw    s0, 28(sp)
+// 0x0103ee20: 0x103ee20: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5101,7 +5101,7 @@ L_103eddc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103ee14: 0x103ee14: jr    ra addiu sp, sp, 40
+// 0x0103ee24: 0x103ee24: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5113,7 +5113,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 close_dialog_103ee1c(int32,int32,int32,int32,int32)
+.method public static int32 close_dialog_103ee2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -5151,24 +5151,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ee1c: 0x103ee1c: addiu sp, sp, -32
+// 0x0103ee2c: 0x103ee2c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0103ee20: 0x103ee20: lui   v0, 0x60000
+// 0x0103ee30: 0x103ee30: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103ee24: 0x103ee24: lw    v0, 11604(v0)
+// 0x0103ee34: 0x103ee34: lw    v0, 12068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2901
+	ldc.i4 3017
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103ee28: 0x103ee28: sw    s0, 24(sp)
+// 0x0103ee38: 0x103ee38: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5177,30 +5177,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103ee2c: 0x103ee2c: lui   a3, 0x10000
+// 0x0103ee3c: 0x103ee3c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ee30: 0x103ee30: lui   s0, 0x10000
+// 0x0103ee40: 0x103ee40: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0103ee34: 0x103ee34: addiu a3, a3, -5224
+// 0x0103ee44: 0x103ee44: addiu a3, a3, -5228
 	ldloc 4
-	ldc.i4 -5224
+	ldc.i4 -5228
 	add
 	stloc 4
-// 0x0103ee38: 0x103ee38: addiu a0, zero, 2
+// 0x0103ee48: 0x103ee48: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103ee3c: 0x103ee3c: addiu a1, s0, -5320
+// 0x0103ee4c: 0x103ee4c: addiu a1, s0, -5324
 	ldloc 8
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103ee40: 0x103ee40: addiu a2, zero, 94
+// 0x0103ee50: 0x103ee50: addiu a2, zero, 94
 	ldc.i4.s 94
 	stloc.3
-// 0x0103ee44: 0x103ee44: sw    ra, 28(sp)
-// 0x0103ee48: 0x103ee48: jal   0x100449c sw    v0, 16(sp)
+// 0x0103ee54: 0x103ee54: sw    ra, 28(sp)
+// 0x0103ee58: 0x103ee58: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5219,37 +5219,37 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ee50: 0x103ee50: jal   0x102146c sll   zero, zero, 0
+// 0x0103ee60: 0x103ee60: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ee58: 0x103ee58: bne   v0, zero, 0x103ee7c lui   a3, 0x10000
+// 0x0103ee68: 0x103ee68: bne   v0, zero, 0x103ee8c lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_103ee7c
+	brtrue L_103ee8c
 // --- basic block ---
-// 0x0103ee60: 0x103ee60: addiu a1, s0, -5320
+// 0x0103ee70: 0x103ee70: addiu a1, s0, -5324
 	ldloc 8
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103ee64: 0x103ee64: addiu a3, a3, -5176
+// 0x0103ee74: 0x103ee74: addiu a3, a3, -5180
 	ldloc 4
-	ldc.i4 -5176
+	ldc.i4 -5180
 	add
 	stloc 4
-// 0x0103ee68: 0x103ee68: addiu a0, zero, 2
+// 0x0103ee78: 0x103ee78: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103ee6c: 0x103ee6c: jal   0x100449c addiu a2, zero, 97
+// 0x0103ee7c: 0x103ee7c: jal   0x100449c addiu a2, zero, 97
 	ldc.i4.s 97
 	stloc.3
 	ldloc.0
@@ -5262,57 +5262,57 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103ee74: 0x103ee74: jal   0x1021900 sll   zero, zero, 0
+// 0x0103ee84: 0x103ee84: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103ee7c:
-// 0x0103ee7c: 0x103ee7c: lui   s0, 0x60000
+L_103ee8c:
+// 0x0103ee8c: 0x103ee8c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0103ee80: 0x103ee80: lw    v0, 11604(s0)
+// 0x0103ee90: 0x103ee90: lw    v0, 12068(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2901
+	ldc.i4 3017
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103ee84: 0x103ee84: sll   zero, zero, 0
-// 0x0103ee88: 0x103ee88: beq   v0, zero, 0x103eec0 lui   a1, 0x10000
+// 0x0103ee94: 0x103ee94: sll   zero, zero, 0
+// 0x0103ee98: 0x103ee98: beq   v0, zero, 0x103eed0 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_103eec0
+	brfalse L_103eed0
 // --- basic block ---
-// 0x0103ee90: 0x103ee90: lui   a3, 0x10000
+// 0x0103eea0: 0x103eea0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ee94: 0x103ee94: addiu a1, a1, -5320
+// 0x0103eea4: 0x103eea4: addiu a1, a1, -5324
 	ldloc.2
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103ee98: 0x103ee98: addiu a0, zero, 2
+// 0x0103eea8: 0x103eea8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103ee9c: 0x103ee9c: addiu a3, a3, -5128
+// 0x0103eeac: 0x103eeac: addiu a3, a3, -5132
 	ldloc 4
-	ldc.i4 -5128
+	ldc.i4 -5132
 	add
 	stloc 4
-// 0x0103eea0: 0x103eea0: addiu a2, zero, 103
+// 0x0103eeb0: 0x103eeb0: addiu a2, zero, 103
 	ldc.i4.s 103
 	stloc.3
-// 0x0103eea4: 0x103eea4: jal   0x100449c sw    v0, 16(sp)
+// 0x0103eeb4: 0x103eeb4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5331,28 +5331,28 @@ L_103ee7c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103eeac: 0x103eeac: lui   v1, 0x60000
+// 0x0103eebc: 0x103eebc: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103eeb0: 0x103eeb0: lw    v0, 11604(s0)
+// 0x0103eec0: 0x103eec0: lw    v0, 12068(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2901
+	ldc.i4 3017
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103eeb4: 0x103eeb4: lw    a1, 11608(v1)
+// 0x0103eec4: 0x103eec4: lw    a1, 12072(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2902
+	ldc.i4 3018
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103eeb8: 0x103eeb8: jalr  v0 addiu a0, zero, 1
+// 0x0103eec8: 0x103eec8: jalr  v0 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
@@ -5366,9 +5366,9 @@ L_103ee7c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103eec0:
-// 0x0103eec0: 0x103eec0: lw    ra, 28(sp)
-// 0x0103eec4: 0x103eec4: lw    s0, 24(sp)
+L_103eed0:
+// 0x0103eed0: 0x103eed0: lw    ra, 28(sp)
+// 0x0103eed4: 0x103eed4: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5377,7 +5377,7 @@ L_103eec0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103eec8: 0x103eec8: jr    ra addiu sp, sp, 32
+// 0x0103eed8: 0x103eed8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5389,7 +5389,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_search_action_103eed0(int32,int32,int32,int32,int32)
+.method public static int32 on_search_action_103eee0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s1,int32 s0,int32[] mem,int32 ra)
@@ -5430,12 +5430,12 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103eed0: 0x103eed0: addiu sp, sp, -48
+// 0x0103eee0: 0x103eee0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103eed4: 0x103eed4: sw    s1, 40(sp)
+// 0x0103eee4: 0x103eee4: sw    s1, 40(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5444,7 +5444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103eed8: 0x103eed8: sw    s0, 36(sp)
+// 0x0103eee8: 0x103eee8: sw    s0, 36(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5453,19 +5453,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103eedc: 0x103eedc: addu  s1, a0, zero
+// 0x0103eeec: 0x103eeec: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0103eee0: 0x103eee0: addu  s0, a1, zero
+// 0x0103eef0: 0x103eef0: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0103eee4: 0x103eee4: lui   a3, 0x10000
+// 0x0103eef4: 0x103eef4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103eee8: 0x103eee8: lui   a1, 0x10000
+// 0x0103eef8: 0x103eef8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103eeec: 0x103eeec: sw    s1, 16(sp)
+// 0x0103eefc: 0x103eefc: sw    s1, 16(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5474,24 +5474,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103eef0: 0x103eef0: addiu a3, a3, -5080
+// 0x0103ef00: 0x103ef00: addiu a3, a3, -5084
 	ldloc 4
-	ldc.i4 -5080
+	ldc.i4 -5084
 	add
 	stloc 4
-// 0x0103eef4: 0x103eef4: addiu a1, a1, -5320
+// 0x0103ef04: 0x103ef04: addiu a1, a1, -5324
 	ldloc.2
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103eef8: 0x103eef8: addiu a0, zero, 2
+// 0x0103ef08: 0x103ef08: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103eefc: 0x103eefc: addiu a2, zero, 325
+// 0x0103ef0c: 0x103ef0c: addiu a2, zero, 325
 	ldc.i4 325
 	stloc.3
-// 0x0103ef00: 0x103ef00: sw    ra, 44(sp)
-// 0x0103ef04: 0x103ef04: jal   0x100449c addiu s1, s1, -2
+// 0x0103ef10: 0x103ef10: sw    ra, 44(sp)
+// 0x0103ef14: 0x103ef14: jal   0x100449c addiu s1, s1, -2
 	ldloc 7
 	ldc.i4.s -2
 	add
@@ -5506,80 +5506,80 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ef0c: 0x103ef0c: sltiu v0, s1, 5
+// 0x0103ef1c: 0x103ef1c: sltiu v0, s1, 5
 	ldloc 7
 	ldc.i4.5
 	clt.un
 	stloc 5
-// 0x0103ef10: 0x103ef10: beq   v0, zero, 0x103f1ac lui   v0, 0x20000
+// 0x0103ef20: 0x103ef20: beq   v0, zero, 0x103f1bc lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_103f1ac
+	brfalse L_103f1bc
 // --- basic block ---
-// 0x0103ef18: 0x103ef18: addiu v0, v0, 27404
+// 0x0103ef28: 0x103ef28: addiu v0, v0, 27868
 	ldloc 5
-	ldc.i4 27404
+	ldc.i4 27868
 	add
 	stloc 5
-// 0x0103ef1c: 0x103ef1c: sll   s1, s1, 2
+// 0x0103ef2c: 0x103ef2c: sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0103ef20: 0x103ef20: addu  s1, v0, s1
+// 0x0103ef30: 0x103ef30: addu  s1, v0, s1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x0103ef24: 0x103ef24: lw    v0, 0(s1)
+// 0x0103ef34: 0x103ef34: lw    v0, 0(s1)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0103ef28: 0x103ef28: sll   zero, zero, 0
-// 0x0103ef2c: 0x103ef2c: jr    v0 sll   zero, zero, 0
+// 0x0103ef38: 0x103ef38: sll   zero, zero, 0
+// 0x0103ef3c: 0x103ef3c: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_103ef34:
-// 0x0103ef34: 0x103ef34: jal   0x103ee1c sll   zero, zero, 0
+L_103ef44:
+// 0x0103ef44: 0x103ef44: jal   0x103ee2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::close_dialog_103ee1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::close_dialog_103ee2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ef3c: 0x103ef3c: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103ef4c: 0x103ef4c: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103ef44:
-// 0x0103ef44: 0x103ef44: lui   s1, 0x10000
+L_103ef54:
+// 0x0103ef54: 0x103ef54: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0103ef48: 0x103ef48: lui   a3, 0x10000
+// 0x0103ef58: 0x103ef58: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103ef4c: 0x103ef4c: addiu a0, zero, 2
+// 0x0103ef5c: 0x103ef5c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103ef50: 0x103ef50: addiu a1, s1, -5320
+// 0x0103ef60: 0x103ef60: addiu a1, s1, -5324
 	ldloc 7
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103ef54: 0x103ef54: addiu a3, a3, -5016
+// 0x0103ef64: 0x103ef64: addiu a3, a3, -5020
 	ldloc 4
-	ldc.i4 -5016
+	ldc.i4 -5020
 	add
 	stloc 4
-// 0x0103ef58: 0x103ef58: jal   0x100449c addiu a2, zero, 241
+// 0x0103ef68: 0x103ef68: jal   0x100449c addiu a2, zero, 241
 	ldc.i4 241
 	stloc.3
 	ldloc.0
@@ -5592,15 +5592,15 @@ L_103ef44:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ef60: 0x103ef60: lui   a0, 0x10000
+// 0x0103ef70: 0x103ef70: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103ef64: 0x103ef64: addiu a0, a0, -7464
+// 0x0103ef74: 0x103ef74: addiu a0, a0, -7468
 	ldloc.1
-	ldc.i4 -7464
+	ldc.i4 -7468
 	add
 	stloc.1
-// 0x0103ef68: 0x103ef68: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103ef78: 0x103ef78: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5608,33 +5608,33 @@ L_103ef44:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103ef70: 0x103ef70: bne   v0, zero, 0x103ef88 lui   a0, 0x10000
+// 0x0103ef80: 0x103ef80: bne   v0, zero, 0x103ef98 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103ef88
+	brtrue L_103ef98
 // --- basic block ---
-// 0x0103ef78: 0x103ef78: jal   0x102d19c sll   zero, zero, 0
+// 0x0103ef88: 0x103ef88: jal   0x102d1ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_reset_debug_mode_102d19c(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_reset_debug_mode_102d1ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ef80: 0x103ef80: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103ef90: 0x103ef90: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103ef88:
-// 0x0103ef88: 0x103ef88: addiu a0, a0, -7456
+L_103ef98:
+// 0x0103ef98: 0x103ef98: addiu a0, a0, -7460
 	ldloc.1
-	ldc.i4 -7456
+	ldc.i4 -7460
 	add
 	stloc.1
-// 0x0103ef8c: 0x103ef8c: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103ef9c: 0x103ef9c: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5642,33 +5642,33 @@ L_103ef88:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103ef94: 0x103ef94: bne   v0, zero, 0x103efac lui   a0, 0x10000
+// 0x0103efa4: 0x103efa4: bne   v0, zero, 0x103efbc lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103efac
+	brtrue L_103efbc
 // --- basic block ---
-// 0x0103ef9c: 0x103ef9c: jal   0x1032304 sll   zero, zero, 0
+// 0x0103efac: 0x103efac: jal   0x1032314 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_reset_show_coordinates_1032304(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_reset_show_coordinates_1032314(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103efa4: 0x103efa4: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103efb4: 0x103efb4: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103efac:
-// 0x0103efac: 0x103efac: addiu a0, a0, -7444
+L_103efbc:
+// 0x0103efbc: 0x103efbc: addiu a0, a0, -7448
 	ldloc.1
-	ldc.i4 -7444
+	ldc.i4 -7448
 	add
 	stloc.1
-// 0x0103efb0: 0x103efb0: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103efc0: 0x103efc0: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5676,13 +5676,13 @@ L_103efac:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103efb8: 0x103efb8: bne   v0, zero, 0x103efd0 lui   a0, 0x10000
+// 0x0103efc8: 0x103efc8: bne   v0, zero, 0x103efe0 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103efd0
+	brtrue L_103efe0
 // --- basic block ---
-// 0x0103efc0: 0x103efc0: jal   0x10aad48 addu  a0, zero, zero
+// 0x0103efd0: 0x103efd0: jal   0x10ab390 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5690,21 +5690,21 @@ L_103efac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl128::roadmap_geo_config_il_10aad48(int32,int32,int32,int32,int32)
+	call int32 Cibyl128::roadmap_geo_config_il_10ab390(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103efc8: 0x103efc8: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103efd8: 0x103efd8: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103efd0:
-// 0x0103efd0: 0x103efd0: addiu a0, a0, -7436
+L_103efe0:
+// 0x0103efe0: 0x103efe0: addiu a0, a0, -7440
 	ldloc.1
-	ldc.i4 -7436
+	ldc.i4 -7440
 	add
 	stloc.1
-// 0x0103efd4: 0x103efd4: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103efe4: 0x103efe4: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5712,13 +5712,13 @@ L_103efd0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103efdc: 0x103efdc: bne   v0, zero, 0x103eff4 lui   a0, 0x10000
+// 0x0103efec: 0x103efec: bne   v0, zero, 0x103f004 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103eff4
+	brtrue L_103f004
 // --- basic block ---
-// 0x0103efe4: 0x103efe4: jal   0x10aacd8 addu  a0, zero, zero
+// 0x0103eff4: 0x103eff4: jal   0x10ab320 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5726,21 +5726,21 @@ L_103efd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_usa_10aacd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_usa_10ab320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103efec: 0x103efec: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103effc: 0x103effc: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103eff4:
-// 0x0103eff4: 0x103eff4: addiu a0, a0, -7428
+L_103f004:
+// 0x0103f004: 0x103f004: addiu a0, a0, -7432
 	ldloc.1
-	ldc.i4 -7428
+	ldc.i4 -7432
 	add
 	stloc.1
-// 0x0103eff8: 0x103eff8: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103f008: 0x103f008: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5748,13 +5748,13 @@ L_103eff4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103f000: 0x103f000: bne   v0, zero, 0x103f018 lui   a0, 0x10000
+// 0x0103f010: 0x103f010: bne   v0, zero, 0x103f028 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103f018
+	brtrue L_103f028
 // --- basic block ---
-// 0x0103f008: 0x103f008: jal   0x10aac18 addu  a0, zero, zero
+// 0x0103f018: 0x103f018: jal   0x10ab260 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5762,21 +5762,21 @@ L_103eff4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_other_10aac18(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_other_10ab260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f010: 0x103f010: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103f020: 0x103f020: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103f018:
-// 0x0103f018: 0x103f018: addiu a0, a0, -7416
+L_103f028:
+// 0x0103f028: 0x103f028: addiu a0, a0, -7420
 	ldloc.1
-	ldc.i4 -7416
+	ldc.i4 -7420
 	add
 	stloc.1
-// 0x0103f01c: 0x103f01c: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103f02c: 0x103f02c: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5784,13 +5784,13 @@ L_103f018:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103f024: 0x103f024: bne   v0, zero, 0x103f03c lui   a0, 0x10000
+// 0x0103f034: 0x103f034: bne   v0, zero, 0x103f04c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103f03c
+	brtrue L_103f04c
 // --- basic block ---
-// 0x0103f02c: 0x103f02c: jal   0x10aac78 addu  a0, zero, zero
+// 0x0103f03c: 0x103f03c: jal   0x10ab2c0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5798,21 +5798,21 @@ L_103f018:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_stg_10aac78(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_stg_10ab2c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f034: 0x103f034: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103f044: 0x103f044: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103f03c:
-// 0x0103f03c: 0x103f03c: addiu a0, a0, -7408
+L_103f04c:
+// 0x0103f04c: 0x103f04c: addiu a0, a0, -7412
 	ldloc.1
-	ldc.i4 -7408
+	ldc.i4 -7412
 	add
 	stloc.1
-// 0x0103f040: 0x103f040: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103f050: 0x103f050: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5820,18 +5820,18 @@ L_103f03c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103f048: 0x103f048: bne   v0, zero, 0x103f070 lui   a0, 0x10000
+// 0x0103f058: 0x103f058: bne   v0, zero, 0x103f080 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_103f070
+	brtrue L_103f080
 // --- basic block ---
-// 0x0103f050: 0x103f050: addiu a0, a0, -7400
+// 0x0103f060: 0x103f060: addiu a0, a0, -7404
 	ldloc.1
-	ldc.i4 -7400
+	ldc.i4 -7404
 	add
 	stloc.1
-// 0x0103f054: 0x103f054: jal   0x101da7c addu  a1, zero, zero
+// 0x0103f064: 0x103f064: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5839,39 +5839,39 @@ L_103f03c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f05c: 0x103f05c: lui   a0, 0x10000
+// 0x0103f06c: 0x103f06c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f060: 0x103f060: lui   a1, 0x10000
+// 0x0103f070: 0x103f070: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103f064: 0x103f064: addiu a0, a0, 18500
+// 0x0103f074: 0x103f074: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0103f068: 0x103f068: j	 0x103f0a8 addiu a1, a1, -7396
+// 0x0103f078: 0x103f078: j	 0x103f0b8 addiu a1, a1, -7400
 	ldloc.2
-	ldc.i4 -7396
+	ldc.i4 -7400
 	add
 	stloc.2
-	br L_103f0a8
+	br L_103f0b8
 // --- basic block ---
-L_103f070:
-// 0x0103f070: 0x103f070: lui   a0, 0x10000
+L_103f080:
+// 0x0103f080: 0x103f080: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f074: 0x103f074: addiu a0, a0, -7348
+// 0x0103f084: 0x103f084: addiu a0, a0, -7352
 	ldloc.1
-	ldc.i4 -7348
+	ldc.i4 -7352
 	add
 	stloc.1
-// 0x0103f078: 0x103f078: jal   0x1001b14 addu  a1, s0, zero
+// 0x0103f088: 0x103f088: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5879,21 +5879,21 @@ L_103f070:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103f080: 0x103f080: bne   v0, zero, 0x103f0b8 lui   a3, 0x10000
+// 0x0103f090: 0x103f090: bne   v0, zero, 0x103f0c8 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_103f0b8
+	brtrue L_103f0c8
 // --- basic block ---
-// 0x0103f088: 0x103f088: lui   a0, 0x10000
+// 0x0103f098: 0x103f098: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f08c: 0x103f08c: addiu a0, a0, -30220
+// 0x0103f09c: 0x103f09c: addiu a0, a0, -30220
 	ldloc.1
 	ldc.i4 -30220
 	add
 	stloc.1
-// 0x0103f090: 0x103f090: jal   0x101da7c addu  a1, zero, zero
+// 0x0103f0a0: 0x103f0a0: jal   0x101da8c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5901,60 +5901,60 @@ L_103f070:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_set_system_lang_101da7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_set_system_lang_101da8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f098: 0x103f098: lui   a0, 0x10000
+// 0x0103f0a8: 0x103f0a8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f09c: 0x103f09c: lui   a1, 0x10000
+// 0x0103f0ac: 0x103f0ac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103f0a0: 0x103f0a0: addiu a0, a0, 18500
+// 0x0103f0b0: 0x103f0b0: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0103f0a4: 0x103f0a4: addiu a1, a1, -7340
+// 0x0103f0b4: 0x103f0b4: addiu a1, a1, -7344
 	ldloc.2
-	ldc.i4 -7340
+	ldc.i4 -7344
 	add
 	stloc.2
-L_103f0a8:
-// 0x0103f0a8: 0x103f0a8: jal   0x104c148 sll   zero, zero, 0
+L_103f0b8:
+// 0x0103f0b8: 0x103f0b8: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f0b0: 0x103f0b0: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103f0c0: 0x103f0c0: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103f0b8:
-// 0x0103f0b8: 0x103f0b8: addiu a3, a3, -4972
+L_103f0c8:
+// 0x0103f0c8: 0x103f0c8: addiu a3, a3, -4976
 	ldloc 4
-	ldc.i4 -4972
+	ldc.i4 -4976
 	add
 	stloc 4
-// 0x0103f0bc: 0x103f0bc: addiu a0, zero, 2
+// 0x0103f0cc: 0x103f0cc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f0c0: 0x103f0c0: addiu a1, s1, -5320
+// 0x0103f0d0: 0x103f0d0: addiu a1, s1, -5324
 	ldloc 7
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f0c4: 0x103f0c4: addiu a2, zero, 299
+// 0x0103f0d4: 0x103f0d4: addiu a2, zero, 299
 	ldc.i4 299
 	stloc.3
-// 0x0103f0c8: 0x103f0c8: jal   0x100449c sw    s0, 16(sp)
+// 0x0103f0d8: 0x103f0d8: jal   0x100449c sw    s0, 16(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -5973,18 +5973,18 @@ L_103f0b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f0d0: 0x103f0d0: lui   a1, 0x1040000
+// 0x0103f0e0: 0x103f0e0: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x0103f0d4: 0x103f0d4: addiu a1, a1, -3644
+// 0x0103f0e4: 0x103f0e4: addiu a1, a1, -3628
 	ldloc.2
-	ldc.i4 -3644
+	ldc.i4 -3628
 	add
 	stloc.2
-// 0x0103f0d8: 0x103f0d8: addu  a2, s0, zero
+// 0x0103f0e8: 0x103f0e8: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x0103f0dc: 0x103f0dc: jal   0x103eac0 addu  a0, zero, zero
+// 0x0103f0ec: 0x103f0ec: jal   0x103ead0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5992,31 +5992,31 @@ L_103f0b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::single_search_resolve_address_103eac0(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::single_search_resolve_address_103ead0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f0e4: 0x103f0e4: lui   a3, 0x10000
+// 0x0103f0f4: 0x103f0f4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103f0e8: 0x103f0e8: addiu a3, a3, -4888
+// 0x0103f0f8: 0x103f0f8: addiu a3, a3, -4892
 	ldloc 4
-	ldc.i4 -4888
+	ldc.i4 -4892
 	add
 	stloc 4
-// 0x0103f0ec: 0x103f0ec: addiu a0, zero, 2
+// 0x0103f0fc: 0x103f0fc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f0f0: 0x103f0f0: addiu a1, s1, -5320
+// 0x0103f100: 0x103f100: addiu a1, s1, -5324
 	ldloc 7
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f0f4: 0x103f0f4: addiu a2, zero, 301
+// 0x0103f104: 0x103f104: addiu a2, zero, 301
 	ldc.i4 301
 	stloc.3
-// 0x0103f0f8: 0x103f0f8: sw    v0, 16(sp)
+// 0x0103f108: 0x103f108: sw    v0, 16(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6025,7 +6025,7 @@ L_103f0b8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103f0fc: 0x103f0fc: jal   0x100449c sw    v0, 24(sp)
+// 0x0103f10c: 0x103f10c: jal   0x100449c sw    v0, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6044,7 +6044,7 @@ L_103f0b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f104: 0x103f104: lw    v0, 24(sp)
+// 0x0103f114: 0x103f114: lw    v0, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6053,27 +6053,27 @@ L_103f0b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f108: 0x103f108: sll   zero, zero, 0
-// 0x0103f10c: 0x103f10c: bne   v0, zero, 0x103f130 lui   a3, 0x10000
+// 0x0103f118: 0x103f118: sll   zero, zero, 0
+// 0x0103f11c: 0x103f11c: bne   v0, zero, 0x103f140 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_103f130
+	brtrue L_103f140
 // --- basic block ---
-// 0x0103f114: 0x103f114: addiu a1, s1, -5320
+// 0x0103f124: 0x103f124: addiu a1, s1, -5324
 	ldloc 7
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f118: 0x103f118: addiu a3, a3, -4824
+// 0x0103f128: 0x103f128: addiu a3, a3, -4828
 	ldloc 4
-	ldc.i4 -4824
+	ldc.i4 -4828
 	add
 	stloc 4
-// 0x0103f11c: 0x103f11c: addiu a0, zero, 2
+// 0x0103f12c: 0x103f12c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f120: 0x103f120: jal   0x100449c addiu a2, zero, 305
+// 0x0103f130: 0x103f130: jal   0x100449c addiu a2, zero, 305
 	ldc.i4 305
 	stloc.3
 	ldloc.0
@@ -6086,11 +6086,11 @@ L_103f0b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f128: 0x103f128: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103f138: 0x103f138: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103f130:
-// 0x0103f130: 0x103f130: jal   0x10ac36c addu  a0, v0, zero
+L_103f140:
+// 0x0103f140: 0x103f140: jal   0x10ac9b4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6098,31 +6098,31 @@ L_103f130:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f138: 0x103f138: lui   a3, 0x10000
+// 0x0103f148: 0x103f148: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103f13c: 0x103f13c: addiu a1, s1, -5320
+// 0x0103f14c: 0x103f14c: addiu a1, s1, -5324
 	ldloc 7
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f140: 0x103f140: addiu a3, a3, -4740
+// 0x0103f150: 0x103f150: addiu a3, a3, -4744
 	ldloc 4
-	ldc.i4 -4740
+	ldc.i4 -4744
 	add
 	stloc 4
-// 0x0103f144: 0x103f144: addiu a2, zero, 311
+// 0x0103f154: 0x103f154: addiu a2, zero, 311
 	ldc.i4 311
 	stloc.3
-// 0x0103f148: 0x103f148: addiu a0, zero, 4
+// 0x0103f158: 0x103f158: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103f14c: 0x103f14c: jal   0x100449c addu  s0, v0, zero
+// 0x0103f15c: 0x103f15c: jal   0x100449c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6135,12 +6135,12 @@ L_103f130:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f154: 0x103f154: lui   a0, 0x10000
+// 0x0103f164: 0x103f164: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f158: 0x103f158: jal   0x101cd60 addiu a0, a0, -7008
+// 0x0103f168: 0x103f168: jal   0x101cd70 addiu a0, a0, -7012
 	ldloc.1
-	ldc.i4 -7008
+	ldc.i4 -7012
 	add
 	stloc.1
 	ldloc.0
@@ -6148,15 +6148,15 @@ L_103f130:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f160: 0x103f160: addu  a0, s0, zero
+// 0x0103f170: 0x103f170: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0103f164: 0x103f164: jal   0x101cd60 addu  s1, v0, zero
+// 0x0103f174: 0x103f174: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -6164,73 +6164,73 @@ L_103f130:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f16c: 0x103f16c: addu  v1, v0, zero
+// 0x0103f17c: 0x103f17c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0103f170: 0x103f170: cibyl_sysc_arg 0x11
+// 0x0103f180: 0x103f180: cibyl_sysc_arg 0x11
 	ldloc 7
-// 0x0103f174: 0x103f174: cibyl_sysc_arg 0x3
+// 0x0103f184: 0x103f184: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0103f178: 0x103f178: cibyl_sysc 0x62a
+// 0x0103f188: 0x103f188: cibyl_sysc 0x62a
 	call void [WazeWP7]Syscalls::NOPH_SearchDialog_showError(int32,int32)
-// 0x0103f17c: 0x103f17c: j	 0x103f1ac addu  s1, v0, zero
+// 0x0103f18c: 0x103f18c: j	 0x103f1bc addu  s1, v0, zero
 	ldloc 5
 	stloc 7
-	br L_103f1ac
+	br L_103f1bc
 // --- basic block ---
-L_103f184:
-// 0x0103f184: 0x103f184: jal   0x1039df4 sll   zero, zero, 0
+L_103f194:
+// 0x0103f194: 0x103f194: jal   0x1039e04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::search_menu_search_favorites_1039df4(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::search_menu_search_favorites_1039e04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f18c: 0x103f18c: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103f19c: 0x103f19c: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103f194:
-// 0x0103f194: 0x103f194: jal   0x1039e30 sll   zero, zero, 0
+L_103f1a4:
+// 0x0103f1a4: 0x103f1a4: jal   0x1039e40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::search_menu_search_history_1039e30(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::search_menu_search_history_1039e40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f19c: 0x103f19c: j	 0x103f1ac sll   zero, zero, 0
-	br L_103f1ac
+// 0x0103f1ac: 0x103f1ac: j	 0x103f1bc sll   zero, zero, 0
+	br L_103f1bc
 // --- basic block ---
-L_103f1a4:
-// 0x0103f1a4: 0x103f1a4: jal   0x1039db8 sll   zero, zero, 0
+L_103f1b4:
+// 0x0103f1b4: 0x103f1b4: jal   0x1039dc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl42::search_menu_my_saved_places_1039db8(int32,int32,int32,int32,int32)
+	call int32 Cibyl42::search_menu_my_saved_places_1039dc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103f1ac:
-// 0x0103f1ac: 0x103f1ac: lw    ra, 44(sp)
-// 0x0103f1b0: 0x103f1b0: addiu v0, zero, 1
+L_103f1bc:
+// 0x0103f1bc: 0x103f1bc: lw    ra, 44(sp)
+// 0x0103f1c0: 0x103f1c0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103f1b4: 0x103f1b4: lw    s1, 40(sp)
+// 0x0103f1c4: 0x103f1c4: lw    s1, 40(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6239,7 +6239,7 @@ L_103f1ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103f1b8: 0x103f1b8: lw    s0, 36(sp)
+// 0x0103f1c8: 0x103f1c8: lw    s0, 36(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -6248,7 +6248,7 @@ L_103f1ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103f1bc: 0x103f1bc: jr    ra addiu sp, sp, 48
+// 0x0103f1cc: 0x103f1cc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6258,20 +6258,20 @@ L_103f1ac:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17035060
-	beq  L_103ef34
-	ldloc 5
 	ldc.i4 17035076
 	beq  L_103ef44
 	ldloc 5
-	ldc.i4 17035652
-	beq  L_103f184
+	ldc.i4 17035092
+	beq  L_103ef54
 	ldloc 5
 	ldc.i4 17035668
 	beq  L_103f194
 	ldloc 5
 	ldc.i4 17035684
 	beq  L_103f1a4
+	ldloc 5
+	ldc.i4 17035700
+	beq  L_103f1b4
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
@@ -6279,7 +6279,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_address_resolved_103f1c4(int32,int32,int32,int32,int32)
+.method public static int32 on_address_resolved_103f1d4(int32,int32,int32,int32,int32)
 {
 .maxstack 12
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 t0,int32 t1,int32 t2,int32 s3,int32 t3,int32 t4,int32 t5,int32 t6,int32 t7,int32 t8,int32 ra,int32 t9)
@@ -6356,12 +6356,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f1c4: 0x103f1c4: addiu sp, sp, -184
+// 0x0103f1d4: 0x103f1d4: addiu sp, sp, -184
 	ldloc.0
 	ldc.i4 -184
 	add
 	stloc.0
-// 0x0103f1c8: 0x103f1c8: sw    s3, 176(sp)
+// 0x0103f1d8: 0x103f1d8: sw    s3, 176(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6370,7 +6370,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0103f1cc: 0x103f1cc: sw    s0, 164(sp)
+// 0x0103f1dc: 0x103f1dc: sw    s0, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6379,16 +6379,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103f1d0: 0x103f1d0: lui   s3, 0x10000
+// 0x0103f1e0: 0x103f1e0: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x0103f1d4: 0x103f1d4: addu  s0, a3, zero
+// 0x0103f1e4: 0x103f1e4: addu  s0, a3, zero
 	ldloc 4
 	stloc 9
-// 0x0103f1d8: 0x103f1d8: lui   a3, 0x10000
+// 0x0103f1e8: 0x103f1e8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103f1dc: 0x103f1dc: sw    s2, 172(sp)
+// 0x0103f1ec: 0x103f1ec: sw    s2, 172(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6397,7 +6397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103f1e0: 0x103f1e0: sw    s1, 168(sp)
+// 0x0103f1f0: 0x103f1f0: sw    s1, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6406,30 +6406,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103f1e4: 0x103f1e4: addu  s2, a2, zero
+// 0x0103f1f4: 0x103f1f4: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0103f1e8: 0x103f1e8: addu  s1, a1, zero
+// 0x0103f1f8: 0x103f1f8: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0103f1ec: 0x103f1ec: addiu a3, a3, -4660
+// 0x0103f1fc: 0x103f1fc: addiu a3, a3, -4664
 	ldloc 4
-	ldc.i4 -4660
+	ldc.i4 -4664
 	add
 	stloc 4
-// 0x0103f1f0: 0x103f1f0: addiu a0, zero, 2
+// 0x0103f200: 0x103f200: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f1f4: 0x103f1f4: addiu a1, s3, -5320
+// 0x0103f204: 0x103f204: addiu a1, s3, -5324
 	ldloc 14
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f1f8: 0x103f1f8: addiu a2, zero, 179
+// 0x0103f208: 0x103f208: addiu a2, zero, 179
 	ldc.i4 179
 	stloc.3
-// 0x0103f1fc: 0x103f1fc: sw    ra, 180(sp)
-// 0x0103f200: 0x103f200: sw    s0, 16(sp)
+// 0x0103f20c: 0x103f20c: sw    ra, 180(sp)
+// 0x0103f210: 0x103f210: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6438,7 +6438,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103f204: 0x103f204: jal   0x100449c sw    s2, 20(sp)
+// 0x0103f214: 0x103f214: jal   0x100449c sw    s2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6457,29 +6457,29 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f20c: 0x103f20c: beq   s0, zero, 0x103f304 addiu v0, s0, -11
+// 0x0103f21c: 0x103f21c: beq   s0, zero, 0x103f314 addiu v0, s0, -11
 	ldloc 9
 	ldloc 9
 	ldc.i4.s -11
 	add
 	stloc 5
-	brfalse L_103f304
+	brfalse L_103f314
 // --- basic block ---
-// 0x0103f214: 0x103f214: sltiu v0, v0, 5
+// 0x0103f224: 0x103f224: sltiu v0, v0, 5
 	ldloc 5
 	ldc.i4.5
 	clt.un
 	stloc 5
-// 0x0103f218: 0x103f218: beq   v0, zero, 0x103f23c addiu v0, zero, 38
+// 0x0103f228: 0x103f228: beq   v0, zero, 0x103f24c addiu v0, zero, 38
 	ldloc 5
 	ldc.i4.s 38
 	stloc 5
-	brfalse L_103f23c
+	brfalse L_103f24c
 // --- basic block ---
-// 0x0103f220: 0x103f220: lui   a0, 0x0
+// 0x0103f230: 0x103f230: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103f224: 0x103f224: jal   0x101cd60 addiu a0, a0, 30092
+// 0x0103f234: 0x103f234: jal   0x101cd70 addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
@@ -6489,33 +6489,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f22c: 0x103f22c: lui   a0, 0x10000
+// 0x0103f23c: 0x103f23c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f230: 0x103f230: addu  s1, v0, zero
+// 0x0103f240: 0x103f240: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0103f234: 0x103f234: j	 0x103f258 addiu a0, a0, -4572
+// 0x0103f244: 0x103f244: j	 0x103f268 addiu a0, a0, -4576
 	ldloc.1
-	ldc.i4 -4572
+	ldc.i4 -4576
 	add
 	stloc.1
-	br L_103f258
+	br L_103f268
 // --- basic block ---
-L_103f23c:
-// 0x0103f23c: 0x103f23c: bne   s0, v0, 0x103f278 lui   s2, 0x0
+L_103f24c:
+// 0x0103f24c: 0x103f24c: bne   s0, v0, 0x103f288 lui   s2, 0x0
 	ldloc 9
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	bne.un L_103f278
+	bne.un L_103f288
 // --- basic block ---
-// 0x0103f244: 0x103f244: jal   0x101cd60 addiu a0, s2, 30092
+// 0x0103f254: 0x103f254: jal   0x101cd70 addiu a0, s2, 30092
 	ldloc 10
 	ldc.i4 30092
 	add
@@ -6525,55 +6525,55 @@ L_103f23c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f24c: 0x103f24c: lui   a0, 0x10000
+// 0x0103f25c: 0x103f25c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f250: 0x103f250: addu  s1, v0, zero
+// 0x0103f260: 0x103f260: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0103f254: 0x103f254: addiu a0, a0, -8912
+// 0x0103f264: 0x103f264: addiu a0, a0, -8916
 	ldloc.1
-	ldc.i4 -8912
+	ldc.i4 -8916
 	add
 	stloc.1
-L_103f258:
-// 0x0103f258: 0x103f258: jal   0x101cd60 sll   zero, zero, 0
+L_103f268:
+// 0x0103f268: 0x103f268: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f260: 0x103f260: addu  v1, v0, zero
+// 0x0103f270: 0x103f270: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0103f264: 0x103f264: cibyl_sysc_arg 0x11
+// 0x0103f274: 0x103f274: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x0103f268: 0x103f268: cibyl_sysc_arg 0x3
+// 0x0103f278: 0x103f278: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0103f26c: 0x103f26c: cibyl_sysc 0x646
+// 0x0103f27c: 0x103f27c: cibyl_sysc 0x646
 	call void [WazeWP7]Syscalls::NOPH_SearchDialog_showError(int32,int32)
-// 0x0103f270: 0x103f270: j	 0x103f2d0 addu  s1, v0, zero
+// 0x0103f280: 0x103f280: j	 0x103f2e0 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-	br L_103f2d0
+	br L_103f2e0
 // --- basic block ---
-L_103f278:
-// 0x0103f278: 0x103f278: lui   a0, 0x10000
+L_103f288:
+// 0x0103f288: 0x103f288: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f27c: 0x103f27c: jal   0x101cd60 addiu a0, a0, -6916
+// 0x0103f28c: 0x103f28c: jal   0x101cd70 addiu a0, a0, -6920
 	ldloc.1
-	ldc.i4 -6916
+	ldc.i4 -6920
 	add
 	stloc.1
 	ldloc.0
@@ -6581,20 +6581,20 @@ L_103f278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f284: 0x103f284: lui   a0, 0x10000
+// 0x0103f294: 0x103f294: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f288: 0x103f288: addiu a0, a0, -2068
+// 0x0103f298: 0x103f298: addiu a0, a0, -2072
 	ldloc.1
-	ldc.i4 -2068
+	ldc.i4 -2072
 	add
 	stloc.1
-// 0x0103f28c: 0x103f28c: sw    v0, 152(sp)
+// 0x0103f29c: 0x103f29c: sw    v0, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6603,7 +6603,7 @@ L_103f278:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103f290: 0x103f290: jal   0x101cd60 addiu s1, sp, 24
+// 0x0103f2a0: 0x103f2a0: jal   0x101cd70 addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6613,12 +6613,12 @@ L_103f278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f298: 0x103f298: lw    a3, 152(sp)
+// 0x0103f2a8: 0x103f2a8: lw    a3, 152(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6627,21 +6627,21 @@ L_103f278:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103f29c: 0x103f29c: lui   a2, 0x10000
+// 0x0103f2ac: 0x103f2ac: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0103f2a0: 0x103f2a0: addiu a2, a2, -25344
+// 0x0103f2b0: 0x103f2b0: addiu a2, a2, -25344
 	ldloc.3
 	ldc.i4 -25344
 	add
 	stloc.3
-// 0x0103f2a4: 0x103f2a4: addu  a0, s1, zero
+// 0x0103f2b4: 0x103f2b4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103f2a8: 0x103f2a8: addiu a1, zero, 128
+// 0x0103f2b8: 0x103f2b8: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0103f2ac: 0x103f2ac: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0103f2bc: 0x103f2bc: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6660,7 +6660,7 @@ L_103f278:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f2b4: 0x103f2b4: jal   0x101cd60 addiu a0, s2, 30092
+// 0x0103f2c4: 0x103f2c4: jal   0x101cd70 addiu a0, s2, 30092
 	ldloc 10
 	ldc.i4 30092
 	add
@@ -6670,25 +6670,25 @@ L_103f278:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f2bc: 0x103f2bc: addu  v1, v0, zero
+// 0x0103f2cc: 0x103f2cc: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0103f2c0: 0x103f2c0: cibyl_sysc_arg 0x3
+// 0x0103f2d0: 0x103f2d0: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0103f2c4: 0x103f2c4: cibyl_sysc_arg 0x11
+// 0x0103f2d4: 0x103f2d4: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x0103f2c8: 0x103f2c8: cibyl_sysc 0x662
+// 0x0103f2d8: 0x103f2d8: cibyl_sysc 0x662
 	call void [WazeWP7]Syscalls::NOPH_SearchDialog_showError(int32,int32)
-// 0x0103f2cc: 0x103f2cc: addu  s1, v0, zero
+// 0x0103f2dc: 0x103f2dc: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-L_103f2d0:
-// 0x0103f2d0: 0x103f2d0: jal   0x10ac36c addu  a0, s0, zero
+L_103f2e0:
+// 0x0103f2e0: 0x103f2e0: jal   0x10ac9b4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6696,34 +6696,34 @@ L_103f2d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f2d8: 0x103f2d8: lui   a1, 0x10000
+// 0x0103f2e8: 0x103f2e8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103f2dc: 0x103f2dc: lui   a3, 0x10000
+// 0x0103f2ec: 0x103f2ec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103f2e0: 0x103f2e0: addiu a1, a1, -5320
+// 0x0103f2f0: 0x103f2f0: addiu a1, a1, -5324
 	ldloc.2
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f2e4: 0x103f2e4: addiu a3, a3, -4496
+// 0x0103f2f4: 0x103f2f4: addiu a3, a3, -4500
 	ldloc 4
-	ldc.i4 -4496
+	ldc.i4 -4500
 	add
 	stloc 4
-// 0x0103f2e8: 0x103f2e8: addiu a0, zero, 4
+// 0x0103f2f8: 0x103f2f8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103f2ec: 0x103f2ec: addiu a2, zero, 202
+// 0x0103f2fc: 0x103f2fc: addiu a2, zero, 202
 	ldc.i4 202
 	stloc.3
-// 0x0103f2f0: 0x103f2f0: sw    v0, 16(sp)
+// 0x0103f300: 0x103f300: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6732,7 +6732,7 @@ L_103f2d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103f2f4: 0x103f2f4: jal   0x100449c sw    s0, 20(sp)
+// 0x0103f304: 0x103f304: jal   0x100449c sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6751,31 +6751,31 @@ L_103f2d0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f2fc: 0x103f2fc: j	 0x103f47c sll   zero, zero, 0
-	br L_103f47c
+// 0x0103f30c: 0x103f30c: j	 0x103f48c sll   zero, zero, 0
+	br L_103f48c
 // --- basic block ---
-L_103f304:
-// 0x0103f304: 0x103f304: bne   s2, zero, 0x103f32c sll   zero, zero, 0
+L_103f314:
+// 0x0103f314: 0x103f314: bne   s2, zero, 0x103f33c sll   zero, zero, 0
 	ldloc 10
-	brtrue L_103f32c
+	brtrue L_103f33c
 // --- basic block ---
-// 0x0103f30c: 0x103f30c: lui   a3, 0x10000
+// 0x0103f31c: 0x103f31c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103f310: 0x103f310: addiu a1, s3, -5320
+// 0x0103f320: 0x103f320: addiu a1, s3, -5324
 	ldloc 14
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f314: 0x103f314: addiu a3, a3, -4408
+// 0x0103f324: 0x103f324: addiu a3, a3, -4412
 	ldloc 4
-	ldc.i4 -4408
+	ldc.i4 -4412
 	add
 	stloc 4
-// 0x0103f318: 0x103f318: addiu a0, zero, 2
+// 0x0103f328: 0x103f328: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f31c: 0x103f31c: jal   0x100449c addiu a2, zero, 210
+// 0x0103f32c: 0x103f32c: jal   0x100449c addiu a2, zero, 210
 	ldc.i4 210
 	stloc.3
 	ldloc.0
@@ -6788,11 +6788,11 @@ L_103f304:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f324: 0x103f324: j	 0x103f47c sll   zero, zero, 0
-	br L_103f47c
+// 0x0103f334: 0x103f334: j	 0x103f48c sll   zero, zero, 0
+	br L_103f48c
 // --- basic block ---
-L_103f32c:
-// 0x0103f32c: 0x103f32c: jal   0x103aaf4 addu  s0, zero, zero
+L_103f33c:
+// 0x0103f33c: 0x103f33c: jal   0x103ab04 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -6800,237 +6800,237 @@ L_103f32c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_icon_name_103aaf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_icon_name_103ab04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f334: 0x103f334: lui   t6, 0x60000
+// 0x0103f344: 0x103f344: lui   t6, 0x60000
 	ldc.i4 393216
 	stloc 18
-// 0x0103f338: 0x103f338: lui   t5, 0x60000
+// 0x0103f348: 0x103f348: lui   t5, 0x60000
 	ldc.i4 393216
 	stloc 17
-// 0x0103f33c: 0x103f33c: lui   t4, 0x60000
+// 0x0103f34c: 0x103f34c: lui   t4, 0x60000
 	ldc.i4 393216
 	stloc 16
-// 0x0103f340: 0x103f340: lui   t3, 0x60000
+// 0x0103f350: 0x103f350: lui   t3, 0x60000
 	ldc.i4 393216
 	stloc 15
-// 0x0103f344: 0x103f344: lui   t2, 0x60000
+// 0x0103f354: 0x103f354: lui   t2, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x0103f348: 0x103f348: lui   t1, 0x60000
+// 0x0103f358: 0x103f358: lui   t1, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x0103f34c: 0x103f34c: lui   t0, 0x10000
+// 0x0103f35c: 0x103f35c: lui   t0, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0103f350: 0x103f350: addu  a0, s1, zero
+// 0x0103f360: 0x103f360: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0103f354: 0x103f354: addiu t6, t6, 11268
+// 0x0103f364: 0x103f364: addiu t6, t6, 11732
 	ldloc 18
-	ldc.i4 11268
+	ldc.i4 11732
 	add
 	stloc 18
-// 0x0103f358: 0x103f358: addiu t5, t5, 11184
+// 0x0103f368: 0x103f368: addiu t5, t5, 11648
 	ldloc 17
-	ldc.i4 11184
+	ldc.i4 11648
 	add
 	stloc 17
-// 0x0103f35c: 0x103f35c: addiu t4, t4, 11100
+// 0x0103f36c: 0x103f36c: addiu t4, t4, 11564
 	ldloc 16
-	ldc.i4 11100
+	ldc.i4 11564
 	add
 	stloc 16
-// 0x0103f360: 0x103f360: addiu t3, t3, 11520
+// 0x0103f370: 0x103f370: addiu t3, t3, 11984
 	ldloc 15
-	ldc.i4 11520
+	ldc.i4 11984
 	add
 	stloc 15
-// 0x0103f364: 0x103f364: addiu t2, t2, 11436
+// 0x0103f374: 0x103f374: addiu t2, t2, 11900
 	ldloc 13
-	ldc.i4 11436
+	ldc.i4 11900
 	add
 	stloc 13
-// 0x0103f368: 0x103f368: addiu t1, t1, 11352
+// 0x0103f378: 0x103f378: addiu t1, t1, 11816
 	ldloc 12
-	ldc.i4 11352
+	ldc.i4 11816
 	add
 	stloc 12
-// 0x0103f36c: 0x103f36c: addiu t0, t0, -18396
+// 0x0103f37c: 0x103f37c: addiu t0, t0, -18396
 	ldloc 11
 	ldc.i4 -18396
 	add
 	stloc 11
-// 0x0103f370: 0x103f370: addu  v1, zero, zero
+// 0x0103f380: 0x103f380: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0103f374: 0x103f374: addu  s1, zero, zero
+// 0x0103f384: 0x103f384: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0103f378: 0x103f378: j	 0x103f3cc addiu a3, zero, 1
+// 0x0103f388: 0x103f388: j	 0x103f3dc addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-	br L_103f3cc
+	br L_103f3dc
 // --- basic block ---
-L_103f380:
-// 0x0103f380: 0x103f380: lw    t9, 0(a0)
+L_103f390:
+// 0x0103f390: 0x103f390: lw    t9, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 22
-// 0x0103f384: 0x103f384: sll   zero, zero, 0
-// 0x0103f388: 0x103f388: bne   t9, a3, 0x103f3b4 addiu a2, a0, 823
+// 0x0103f394: 0x103f394: sll   zero, zero, 0
+// 0x0103f398: 0x103f398: bne   t9, a3, 0x103f3c4 addiu a2, a0, 823
 	ldloc 22
 	ldloc 4
 	ldloc.1
 	ldc.i4 823
 	add
 	stloc.3
-	bne.un L_103f3b4
+	bne.un L_103f3c4
 // --- basic block ---
-// 0x0103f390: 0x103f390: sll   a1, s0, 2
+// 0x0103f3a0: 0x103f3a0: sll   a1, s0, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0103f394: 0x103f394: addu  t7, a1, t1
+// 0x0103f3a4: 0x103f3a4: addu  t7, a1, t1
 	ldloc.2
 	ldloc 12
 	add
 	stloc 19
-// 0x0103f398: 0x103f398: addu  t8, a1, t3
+// 0x0103f3a8: 0x103f3a8: addu  t8, a1, t3
 	ldloc.2
 	ldloc 15
 	add
 	stloc 20
-// 0x0103f39c: 0x103f39c: addu  a1, a1, t2
+// 0x0103f3ac: 0x103f3ac: addu  a1, a1, t2
 	ldloc.2
 	ldloc 13
 	add
 	stloc.2
-// 0x0103f3a0: 0x103f3a0: sw    a2, 0(t8)
+// 0x0103f3b0: 0x103f3b0: sw    a2, 0(t8)
 	ldloc 7
 	ldloc 20
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x0103f3a4: 0x103f3a4: sw    v1, 0(a1)
+// 0x0103f3b4: 0x103f3b4: sw    v1, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0103f3a8: 0x103f3a8: sw    t0, 0(t7)
+// 0x0103f3b8: 0x103f3b8: sw    t0, 0(t7)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x0103f3ac: 0x103f3ac: j	 0x103f3c4 addiu s0, s0, 1
+// 0x0103f3bc: 0x103f3bc: j	 0x103f3d4 addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_103f3c4
+	br L_103f3d4
 // --- basic block ---
-L_103f3b4:
-// 0x0103f3b4: 0x103f3b4: sw    a2, 0(t7)
+L_103f3c4:
+// 0x0103f3c4: 0x103f3c4: sw    a2, 0(t7)
 	ldloc 7
 	ldloc 19
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x0103f3b8: 0x103f3b8: sw    v1, 0(a1)
+// 0x0103f3c8: 0x103f3c8: sw    v1, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0103f3bc: 0x103f3bc: sw    v0, 0(t8)
+// 0x0103f3cc: 0x103f3cc: sw    v0, 0(t8)
 	ldloc 7
 	ldloc 20
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0103f3c0: 0x103f3c0: addiu s1, s1, 1
+// 0x0103f3d0: 0x103f3d0: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_103f3c4:
-// 0x0103f3c4: 0x103f3c4: addiu v1, v1, 1
+L_103f3d4:
+// 0x0103f3d4: 0x103f3d4: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0103f3c8: 0x103f3c8: addiu a0, a0, 1096
+// 0x0103f3d8: 0x103f3d8: addiu a0, a0, 1096
 	ldloc.1
 	ldc.i4 1096
 	add
 	stloc.1
-L_103f3cc:
-// 0x0103f3cc: 0x103f3cc: sll   a1, s1, 2
+L_103f3dc:
+// 0x0103f3dc: 0x103f3dc: sll   a1, s1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0103f3d0: 0x103f3d0: slt   a2, v1, s2
+// 0x0103f3e0: 0x103f3e0: slt   a2, v1, s2
 	ldloc 6
 	ldloc 10
 	clt
 	stloc.3
-// 0x0103f3d4: 0x103f3d4: addu  t8, a1, t4
+// 0x0103f3e4: 0x103f3e4: addu  t8, a1, t4
 	ldloc.2
 	ldloc 16
 	add
 	stloc 20
-// 0x0103f3d8: 0x103f3d8: addu  t7, a1, t6
+// 0x0103f3e8: 0x103f3e8: addu  t7, a1, t6
 	ldloc.2
 	ldloc 18
 	add
 	stloc 19
-// 0x0103f3dc: 0x103f3dc: bne   a2, zero, 0x103f380 addu  a1, a1, t5
+// 0x0103f3ec: 0x103f3ec: bne   a2, zero, 0x103f390 addu  a1, a1, t5
 	ldloc.3
 	ldloc.2
 	ldloc 17
 	add
 	stloc.2
-	brtrue L_103f380
+	brtrue L_103f390
 // --- basic block ---
-// 0x0103f3e4: 0x103f3e4: lui   a1, 0x10000
+// 0x0103f3f4: 0x103f3f4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103f3e8: 0x103f3e8: lui   a3, 0x10000
+// 0x0103f3f8: 0x103f3f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103f3ec: 0x103f3ec: addiu a1, a1, -5320
+// 0x0103f3fc: 0x103f3fc: addiu a1, a1, -5324
 	ldloc.2
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f3f0: 0x103f3f0: addiu a3, a3, -4320
+// 0x0103f400: 0x103f400: addiu a3, a3, -4324
 	ldloc 4
-	ldc.i4 -4320
+	ldc.i4 -4324
 	add
 	stloc 4
-// 0x0103f3f4: 0x103f3f4: addiu a0, zero, 2
+// 0x0103f404: 0x103f404: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f3f8: 0x103f3f8: addiu a2, zero, 233
+// 0x0103f408: 0x103f408: addiu a2, zero, 233
 	ldc.i4 233
 	stloc.3
-// 0x0103f3fc: 0x103f3fc: sw    s0, 16(sp)
+// 0x0103f40c: 0x103f40c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7039,7 +7039,7 @@ L_103f3cc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103f400: 0x103f400: jal   0x100449c sw    s1, 20(sp)
+// 0x0103f410: 0x103f410: jal   0x100449c sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7058,104 +7058,104 @@ L_103f3cc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f408: 0x103f408: jal   0x103abbc sll   zero, zero, 0
+// 0x0103f418: 0x103f418: jal   0x103abcc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl43::local_search_get_provider_label_103abbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl43::local_search_get_provider_label_103abcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f410: 0x103f410: lui   t2, 0x60000
+// 0x0103f420: 0x103f420: lui   t2, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x0103f414: 0x103f414: lui   t1, 0x60000
+// 0x0103f424: 0x103f424: lui   t1, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x0103f418: 0x103f418: lui   t0, 0x60000
+// 0x0103f428: 0x103f428: lui   t0, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x0103f41c: 0x103f41c: lui   a3, 0x60000
+// 0x0103f42c: 0x103f42c: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0103f420: 0x103f420: lui   a2, 0x60000
+// 0x0103f430: 0x103f430: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0103f424: 0x103f424: lui   a1, 0x60000
+// 0x0103f434: 0x103f434: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0103f428: 0x103f428: lui   v1, 0x1040000
+// 0x0103f438: 0x103f438: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 6
-// 0x0103f42c: 0x103f42c: addu  a0, v0, zero
+// 0x0103f43c: 0x103f43c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103f430: 0x103f430: addiu t2, t2, 11100
+// 0x0103f440: 0x103f440: addiu t2, t2, 11564
 	ldloc 13
-	ldc.i4 11100
+	ldc.i4 11564
 	add
 	stloc 13
-// 0x0103f434: 0x103f434: addiu t1, t1, 11184
+// 0x0103f444: 0x103f444: addiu t1, t1, 11648
 	ldloc 12
-	ldc.i4 11184
+	ldc.i4 11648
 	add
 	stloc 12
-// 0x0103f438: 0x103f438: addiu t0, t0, 11268
+// 0x0103f448: 0x103f448: addiu t0, t0, 11732
 	ldloc 11
-	ldc.i4 11268
+	ldc.i4 11732
 	add
 	stloc 11
-// 0x0103f43c: 0x103f43c: addiu a3, a3, 11352
+// 0x0103f44c: 0x103f44c: addiu a3, a3, 11816
 	ldloc 4
-	ldc.i4 11352
+	ldc.i4 11816
 	add
 	stloc 4
-// 0x0103f440: 0x103f440: addiu a2, a2, 11436
+// 0x0103f450: 0x103f450: addiu a2, a2, 11900
 	ldloc.3
-	ldc.i4 11436
+	ldc.i4 11900
 	add
 	stloc.3
-// 0x0103f444: 0x103f444: addiu a1, a1, 11520
+// 0x0103f454: 0x103f454: addiu a1, a1, 11984
 	ldloc.2
-	ldc.i4 11520
+	ldc.i4 11984
 	add
 	stloc.2
-// 0x0103f448: 0x103f448: addiu v1, v1, -2920
+// 0x0103f458: 0x103f458: addiu v1, v1, -2904
 	ldloc 6
-	ldc.i4 -2920
+	ldc.i4 -2904
 	add
 	stloc 6
-// 0x0103f44c: 0x103f44c: cibyl_sysc_arg 0x3
+// 0x0103f45c: 0x103f45c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0103f450: 0x103f450: cibyl_sysc_arg 0x4
+// 0x0103f460: 0x103f460: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0103f454: 0x103f454: cibyl_sysc_arg 0x10
+// 0x0103f464: 0x103f464: cibyl_sysc_arg 0x10
 	ldloc 9
-// 0x0103f458: 0x103f458: cibyl_sysc_arg 0x5
+// 0x0103f468: 0x103f468: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0103f45c: 0x103f45c: cibyl_sysc_arg 0x6
+// 0x0103f46c: 0x103f46c: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0103f460: 0x103f460: cibyl_sysc_arg 0x7
+// 0x0103f470: 0x103f470: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0103f464: 0x103f464: cibyl_sysc_arg 0x11
+// 0x0103f474: 0x103f474: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x0103f468: 0x103f468: cibyl_sysc_arg 0x8
+// 0x0103f478: 0x103f478: cibyl_sysc_arg 0x8
 	ldloc 11
-// 0x0103f46c: 0x103f46c: cibyl_sysc_arg 0x9
+// 0x0103f47c: 0x103f47c: cibyl_sysc_arg 0x9
 	ldloc 12
-// 0x0103f470: 0x103f470: cibyl_sysc_arg 0xa
+// 0x0103f480: 0x103f480: cibyl_sysc_arg 0xa
 	ldloc 13
-// 0x0103f474: 0x103f474: cibyl_sysc 0x67e
+// 0x0103f484: 0x103f484: cibyl_sysc 0x67e
 	call void [WazeWP7]Syscalls::NOPH_SearchDialog_addressResolved(int32,int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x0103f478: 0x103f478: addu  s0, v0, zero
+// 0x0103f488: 0x103f488: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-L_103f47c:
-// 0x0103f47c: 0x103f47c: lw    ra, 180(sp)
-// 0x0103f480: 0x103f480: lw    s3, 176(sp)
+L_103f48c:
+// 0x0103f48c: 0x103f48c: lw    ra, 180(sp)
+// 0x0103f490: 0x103f490: lw    s3, 176(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7164,7 +7164,7 @@ L_103f47c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0103f484: 0x103f484: lw    s2, 172(sp)
+// 0x0103f494: 0x103f494: lw    s2, 172(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7173,7 +7173,7 @@ L_103f47c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103f488: 0x103f488: lw    s1, 168(sp)
+// 0x0103f498: 0x103f498: lw    s1, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7182,7 +7182,7 @@ L_103f47c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103f48c: 0x103f48c: lw    s0, 164(sp)
+// 0x0103f49c: 0x103f49c: lw    s0, 164(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7191,7 +7191,7 @@ L_103f47c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103f490: 0x103f490: jr    ra addiu sp, sp, 184
+// 0x0103f4a0: 0x103f4a0: jr    ra addiu sp, sp, 184
 	ldloc.0
 	ldc.i4 184
 	add
diff --git a/converted/Cibyl47.j b/converted/Cibyl47.j
index 5538ab8..5a83c07 100644
--- a/converted/Cibyl47.j
+++ b/converted/Cibyl47.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl47::.ctor
 
-.method public static int32 on_option_selected_103f498(int32,int32,int32,int32,int32)
+.method public static int32 on_option_selected_103f4a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f498: 0x103f498: addiu sp, sp, -64
+// 0x0103f4a8: 0x103f4a8: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0103f49c: 0x103f49c: sw    s0, 52(sp)
+// 0x0103f4ac: 0x103f4ac: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -96,16 +96,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103f4a0: 0x103f4a0: lui   a3, 0x10000
+// 0x0103f4b0: 0x103f4b0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103f4a4: 0x103f4a4: addu  s0, a1, zero
+// 0x0103f4b4: 0x103f4b4: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0103f4a8: 0x103f4a8: lui   a1, 0x10000
+// 0x0103f4b8: 0x103f4b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103f4ac: 0x103f4ac: sw    s1, 56(sp)
+// 0x0103f4bc: 0x103f4bc: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -114,27 +114,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103f4b0: 0x103f4b0: addiu a3, a3, -4216
+// 0x0103f4c0: 0x103f4c0: addiu a3, a3, -4220
 	ldloc 4
-	ldc.i4 -4216
+	ldc.i4 -4220
 	add
 	stloc 4
-// 0x0103f4b4: 0x103f4b4: addu  s1, a0, zero
+// 0x0103f4c4: 0x103f4c4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103f4b8: 0x103f4b8: addiu a1, a1, -5320
+// 0x0103f4c8: 0x103f4c8: addiu a1, a1, -5324
 	ldloc.2
-	ldc.i4 -5320
+	ldc.i4 -5324
 	add
 	stloc.2
-// 0x0103f4bc: 0x103f4bc: addiu a0, zero, 2
+// 0x0103f4cc: 0x103f4cc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f4c0: 0x103f4c0: addiu a2, zero, 114
+// 0x0103f4d0: 0x103f4d0: addiu a2, zero, 114
 	ldc.i4.s 114
 	stloc.3
-// 0x0103f4c4: 0x103f4c4: sw    ra, 60(sp)
-// 0x0103f4c8: 0x103f4c8: sw    s1, 16(sp)
+// 0x0103f4d4: 0x103f4d4: sw    ra, 60(sp)
+// 0x0103f4d8: 0x103f4d8: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -143,7 +143,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103f4cc: 0x103f4cc: jal   0x100449c sw    s0, 20(sp)
+// 0x0103f4dc: 0x103f4dc: jal   0x100449c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -162,43 +162,43 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f4d4: 0x103f4d4: beq   s0, zero, 0x103f500 addiu a0, zero, 1
+// 0x0103f4e4: 0x103f4e4: beq   s0, zero, 0x103f510 addiu a0, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc.1
-	brfalse L_103f500
+	brfalse L_103f510
 // --- basic block ---
-// 0x0103f4dc: 0x103f4dc: beq   s0, a0, 0x103f4fc addiu v0, zero, 2
+// 0x0103f4ec: 0x103f4ec: beq   s0, a0, 0x103f50c addiu v0, zero, 2
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
 	stloc 5
-	beq  L_103f4fc
+	beq  L_103f50c
 // --- basic block ---
-// 0x0103f4e4: 0x103f4e4: beq   s0, v0, 0x103f514 addiu v0, zero, 4
+// 0x0103f4f4: 0x103f4f4: beq   s0, v0, 0x103f524 addiu v0, zero, 4
 	ldloc 8
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	beq  L_103f514
+	beq  L_103f524
 // --- basic block ---
-// 0x0103f4ec: 0x103f4ec: bne   s0, v0, 0x103f618 sll   zero, zero, 0
+// 0x0103f4fc: 0x103f4fc: bne   s0, v0, 0x103f628 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_103f618
+	bne.un L_103f628
 // --- basic block ---
-// 0x0103f4f4: 0x103f4f4: j	 0x103f5b0 sll   zero, zero, 0
-	br L_103f5b0
+// 0x0103f504: 0x103f504: j	 0x103f5c0 sll   zero, zero, 0
+	br L_103f5c0
 // --- basic block ---
-L_103f4fc:
-// 0x0103f4fc: 0x103f4fc: addu  a0, zero, zero
+L_103f50c:
+// 0x0103f50c: 0x103f50c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_103f500:
-// 0x0103f500: 0x103f500: addu  a2, s1, zero
+L_103f510:
+// 0x0103f510: 0x103f510: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0103f504: 0x103f504: jal   0x103e598 addiu a1, zero, 2
+// 0x0103f514: 0x103f514: jal   0x103e5a8 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -206,44 +206,44 @@ L_103f500:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::navigate_with_coordinates_103e598(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::navigate_with_coordinates_103e5a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f50c: 0x103f50c: j	 0x103f618 sll   zero, zero, 0
-	br L_103f618
+// 0x0103f51c: 0x103f51c: j	 0x103f628 sll   zero, zero, 0
+	br L_103f628
 // --- basic block ---
-L_103f514:
-// 0x0103f514: 0x103f514: jal   0x103e180 addu  a0, s1, zero
+L_103f524:
+// 0x0103f524: 0x103f524: jal   0x103e190 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl46::generic_search_result_103e180(int32)
+	call int32 Cibyl46::generic_search_result_103e190(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103f51c: 0x103f51c: lui   s1, 0x20000
+// 0x0103f52c: 0x103f52c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x0103f520: 0x103f520: lw    a3, 23796(s1)
+// 0x0103f530: 0x103f530: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103f524: 0x103f524: lw    a2, 23792(s1)
+// 0x0103f534: 0x103f534: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103f528: 0x103f528: lw    a1, 20(v0)
+// 0x0103f538: 0x103f538: lw    a1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -252,7 +252,7 @@ L_103f514:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103f52c: 0x103f52c: lw    a0, 16(v0)
+// 0x0103f53c: 0x103f53c: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -261,7 +261,7 @@ L_103f514:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f530: 0x103f530: jal   0x10c0798 addu  s0, v0, zero
+// 0x0103f540: 0x103f540: jal   0x10c0dd8 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -269,44 +269,44 @@ L_103f514:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f538: 0x103f538: addu  a1, v1, zero
+// 0x0103f548: 0x103f548: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103f53c: 0x103f53c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103f54c: 0x103f54c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f544: 0x103f544: lw    a3, 23796(s1)
+// 0x0103f554: 0x103f554: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103f548: 0x103f548: lw    a2, 23792(s1)
+// 0x0103f558: 0x103f558: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103f54c: 0x103f54c: lw    a1, 12(s0)
+// 0x0103f55c: 0x103f55c: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -315,7 +315,7 @@ L_103f514:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103f550: 0x103f550: lw    a0, 8(s0)
+// 0x0103f560: 0x103f560: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -324,7 +324,7 @@ L_103f514:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f554: 0x103f554: jal   0x10c0798 sw    v0, 36(sp)
+// 0x0103f564: 0x103f564: jal   0x10c0dd8 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -338,26 +338,26 @@ L_103f514:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f55c: 0x103f55c: addu  a1, v1, zero
+// 0x0103f56c: 0x103f56c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103f560: 0x103f560: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103f570: 0x103f570: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f568: 0x103f568: sw    v0, 32(sp)
+// 0x0103f578: 0x103f578: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -366,7 +366,7 @@ L_103f514:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103f56c: 0x103f56c: lw    a0, 284(s0)
+// 0x0103f57c: 0x103f57c: lw    a0, 284(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -375,18 +375,18 @@ L_103f514:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f570: 0x103f570: jal   0x103e28c sll   zero, zero, 0
+// 0x0103f580: 0x103f580: jal   0x103e29c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::get_house_number__str_103e28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::get_house_number__str_103e29c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f578: 0x103f578: jal   0x1052d98 sw    v0, 40(sp)
+// 0x0103f588: 0x103f588: jal   0x1052da8 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -395,10 +395,10 @@ L_103f514:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl61::GetEditboxText_1052d98()
+	call int32 Cibyl61::GetEditboxText_1052da8()
 	stloc 5
 // --- basic block ---
-// 0x0103f580: 0x103f580: lw    a3, 40(sp)
+// 0x0103f590: 0x103f590: lw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -407,12 +407,12 @@ L_103f514:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103f584: 0x103f584: addiu v1, s0, 24
+// 0x0103f594: 0x103f594: addiu v1, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x0103f588: 0x103f588: sw    v0, 20(sp)
+// 0x0103f598: 0x103f598: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -421,25 +421,25 @@ L_103f514:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103f58c: 0x103f58c: addiu a2, s0, 154
+// 0x0103f59c: 0x103f59c: addiu a2, s0, 154
 	ldloc 8
 	ldc.i4 154
 	add
 	stloc.3
-// 0x0103f590: 0x103f590: addiu v0, sp, 32
+// 0x0103f5a0: 0x103f5a0: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0103f594: 0x103f594: addiu a0, zero, 70
+// 0x0103f5a4: 0x103f5a4: addiu a0, zero, 70
 	ldc.i4.s 70
 	stloc.1
-// 0x0103f598: 0x103f598: addiu a1, s0, 90
+// 0x0103f5a8: 0x103f5a8: addiu a1, s0, 90
 	ldloc 8
 	ldc.i4.s 90
 	add
 	stloc.2
-// 0x0103f59c: 0x103f59c: sw    v1, 16(sp)
+// 0x0103f5ac: 0x103f5ac: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -448,7 +448,7 @@ L_103f514:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103f5a0: 0x103f5a0: jal   0x103e464 sw    v0, 24(sp)
+// 0x0103f5b0: 0x103f5b0: jal   0x103e474 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -462,44 +462,44 @@ L_103f514:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::generic_search_add_address_to_history_103e464(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::generic_search_add_address_to_history_103e474(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f5a8: 0x103f5a8: j	 0x103f618 sll   zero, zero, 0
-	br L_103f618
+// 0x0103f5b8: 0x103f5b8: j	 0x103f628 sll   zero, zero, 0
+	br L_103f628
 // --- basic block ---
-L_103f5b0:
-// 0x0103f5b0: 0x103f5b0: jal   0x103e180 addu  a0, s1, zero
+L_103f5c0:
+// 0x0103f5c0: 0x103f5c0: jal   0x103e190 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl46::generic_search_result_103e180(int32)
+	call int32 Cibyl46::generic_search_result_103e190(int32)
 	stloc 5
 // --- basic block ---
-// 0x0103f5b8: 0x103f5b8: lui   s1, 0x20000
+// 0x0103f5c8: 0x103f5c8: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x0103f5bc: 0x103f5bc: lw    a3, 23796(s1)
+// 0x0103f5cc: 0x103f5cc: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103f5c0: 0x103f5c0: lw    a2, 23792(s1)
+// 0x0103f5d0: 0x103f5d0: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103f5c4: 0x103f5c4: lw    a1, 20(v0)
+// 0x0103f5d4: 0x103f5d4: lw    a1, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -508,7 +508,7 @@ L_103f5b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103f5c8: 0x103f5c8: lw    a0, 16(v0)
+// 0x0103f5d8: 0x103f5d8: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -517,7 +517,7 @@ L_103f5b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f5cc: 0x103f5cc: jal   0x10c0798 addu  s0, v0, zero
+// 0x0103f5dc: 0x103f5dc: jal   0x10c0dd8 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -525,44 +525,44 @@ L_103f5b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f5d4: 0x103f5d4: addu  a1, v1, zero
+// 0x0103f5e4: 0x103f5e4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103f5d8: 0x103f5d8: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103f5e8: 0x103f5e8: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f5e0: 0x103f5e0: lw    a2, 23792(s1)
+// 0x0103f5f0: 0x103f5f0: lw    a2, 24256(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5948
+	ldc.i4 6064
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103f5e4: 0x103f5e4: lw    a3, 23796(s1)
+// 0x0103f5f4: 0x103f5f4: lw    a3, 24260(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5949
+	ldc.i4 6065
 	add
 	ldelem.i4
 	stloc 4
-// 0x0103f5e8: 0x103f5e8: lw    a1, 12(s0)
+// 0x0103f5f8: 0x103f5f8: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -571,7 +571,7 @@ L_103f5b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103f5ec: 0x103f5ec: lw    a0, 8(s0)
+// 0x0103f5fc: 0x103f5fc: lw    a0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -580,7 +580,7 @@ L_103f5b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f5f0: 0x103f5f0: jal   0x10c0798 sw    v0, 36(sp)
+// 0x0103f600: 0x103f600: jal   0x10c0dd8 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -594,37 +594,37 @@ L_103f5b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f5f8: 0x103f5f8: addu  a1, v1, zero
+// 0x0103f608: 0x103f608: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0103f5fc: 0x103f5fc: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0103f60c: 0x103f60c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f604: 0x103f604: addiu a0, sp, 32
+// 0x0103f614: 0x103f614: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0103f608: 0x103f608: addiu a1, zero, 1
+// 0x0103f618: 0x103f618: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0103f60c: 0x103f60c: addiu a2, zero, 1
+// 0x0103f61c: 0x103f61c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0103f610: 0x103f610: jal   0x104a6bc sw    v0, 32(sp)
+// 0x0103f620: 0x103f620: jal   0x104a6cc sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -638,25 +638,25 @@ L_103f5b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_reminder_add_at_position_104a6bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_reminder_add_at_position_104a6cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103f618:
-// 0x0103f618: 0x103f618: jal   0x103ee1c sll   zero, zero, 0
+L_103f628:
+// 0x0103f628: 0x103f628: jal   0x103ee2c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl46::close_dialog_103ee1c(int32,int32,int32,int32,int32)
+	call int32 Cibyl46::close_dialog_103ee2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f620: 0x103f620: lw    ra, 60(sp)
-// 0x0103f624: 0x103f624: lw    s1, 56(sp)
+// 0x0103f630: 0x103f630: lw    ra, 60(sp)
+// 0x0103f634: 0x103f634: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -665,7 +665,7 @@ L_103f618:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103f628: 0x103f628: lw    s0, 52(sp)
+// 0x0103f638: 0x103f638: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -674,7 +674,7 @@ L_103f618:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103f62c: 0x103f62c: jr    ra addiu sp, sp, 64
+// 0x0103f63c: 0x103f63c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -686,7 +686,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_mon_set_enabled_103f634(int32)
+.method public static int32 roadmap_net_mon_set_enabled_103f644(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -706,15 +706,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f634: 0x103f634: lui   v0, 0x60000
+// 0x0103f644: 0x103f644: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103f638: 0x103f638: jr    ra sw    a0, 11616(v0)
+// 0x0103f648: 0x103f648: jr    ra sw    a0, 12080(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldloc.0
 	stelem.i4
@@ -723,7 +723,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_net_mon_get_enabled_103f640()
+.method public static int32 roadmap_net_mon_get_enabled_103f650()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -740,25 +740,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f640: 0x103f640: lui   v0, 0x60000
+// 0x0103f650: 0x103f650: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x0103f644: 0x103f644: lw    v0, 11616(v0)
+// 0x0103f654: 0x103f654: lw    v0, 12080(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldelem.i4
 	stloc.0
-// 0x0103f648: 0x103f648: jr    ra sll   zero, zero, 0
+// 0x0103f658: 0x103f658: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_net_mon_disconnect_103f650(int32)
+.method public static int32 roadmap_net_mon_disconnect_103f660(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -781,71 +781,71 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f650: 0x103f650: lui   v0, 0x60000
+// 0x0103f660: 0x103f660: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x0103f654: 0x103f654: lw    v1, 11612(v0)
+// 0x0103f664: 0x103f664: lw    v1, 12076(v0)
 	ldloc 2
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f658: 0x103f658: sll   zero, zero, 0
-// 0x0103f65c: 0x103f65c: sltiu v1, v1, 2
+// 0x0103f668: 0x103f668: sll   zero, zero, 0
+// 0x0103f66c: 0x103f66c: sltiu v1, v1, 2
 	ldloc.1
 	ldc.i4.2
 	clt.un
 	stloc.1
-// 0x0103f660: 0x103f660: bne   v1, zero, 0x103f684 lui   a0, 0x60000
+// 0x0103f670: 0x103f670: bne   v1, zero, 0x103f694 lui   a0, 0x60000
 	ldloc.1
 	ldc.i4 393216
 	stloc.0
-	brtrue L_103f684
+	brtrue L_103f694
 // --- basic block ---
-// 0x0103f668: 0x103f668: lw    v1, 11632(a0)
+// 0x0103f678: 0x103f678: lw    v1, 12096(a0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2908
+	ldc.i4 3024
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f66c: 0x103f66c: sll   zero, zero, 0
-// 0x0103f670: 0x103f670: addiu v1, v1, -1
+// 0x0103f67c: 0x103f67c: sll   zero, zero, 0
+// 0x0103f680: 0x103f680: addiu v1, v1, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x0103f674: 0x103f674: bne   v1, zero, 0x103f684 sw    v1, 11632(a0)
+// 0x0103f684: 0x103f684: bne   v1, zero, 0x103f694 sw    v1, 12096(a0)
 	ldloc.1
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2908
+	ldc.i4 3024
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_103f684
+	brtrue L_103f694
 // --- basic block ---
-// 0x0103f67c: 0x103f67c: addiu v1, zero, 3
+// 0x0103f68c: 0x103f68c: addiu v1, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0103f680: 0x103f680: sw    v1, 11612(v0)
+// 0x0103f690: 0x103f690: sw    v1, 12076(v0)
 	ldloc 2
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldloc.1
 	stelem.i4
-L_103f684:
-// 0x0103f684: 0x103f684: jr    ra sll   zero, zero, 0
+L_103f694:
+// 0x0103f694: 0x103f694: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -853,7 +853,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 update_activity_103f6fc(int32,int32,int32,int32,int32)
+.method public static int32 update_activity_103f70c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -888,55 +888,55 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f6fc: 0x103f6fc: lui   v0, 0x60000
+// 0x0103f70c: 0x103f70c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f700: 0x103f700: lw    v0, 11616(v0)
+// 0x0103f710: 0x103f710: lw    v0, 12080(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f704: 0x103f704: addiu sp, sp, -24
+// 0x0103f714: 0x103f714: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f708: 0x103f708: beq   v0, zero, 0x103f74c sw    ra, 20(sp)
+// 0x0103f718: 0x103f718: beq   v0, zero, 0x103f75c sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_103f74c
+	brfalse L_103f75c
 // --- basic block ---
-// 0x0103f710: 0x103f710: lui   v0, 0x60000
+// 0x0103f720: 0x103f720: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f714: 0x103f714: lw    v0, 11620(v0)
+// 0x0103f724: 0x103f724: lw    v0, 12084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2905
+	ldc.i4 3021
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f718: 0x103f718: sll   zero, zero, 0
-// 0x0103f71c: 0x103f71c: bne   v0, zero, 0x103f738 addu  v1, zero, zero
+// 0x0103f728: 0x103f728: sll   zero, zero, 0
+// 0x0103f72c: 0x103f72c: bne   v0, zero, 0x103f748 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_103f738
+	brtrue L_103f748
 // --- basic block ---
-// 0x0103f724: 0x103f724: lui   a1, 0x1040000
+// 0x0103f734: 0x103f734: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x0103f728: 0x103f728: addiu a1, a1, -1828
+// 0x0103f738: 0x103f738: addiu a1, a1, -1812
 	ldloc.2
-	ldc.i4 -1828
+	ldc.i4 -1812
 	add
 	stloc.2
-// 0x0103f72c: 0x103f72c: jal   0x104fe98 addiu a0, zero, 1000
+// 0x0103f73c: 0x103f73c: jal   0x104fea8 addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
 	ldloc.0
@@ -944,39 +944,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f734: 0x103f734: addu  v1, zero, zero
+// 0x0103f744: 0x103f744: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_103f738:
-// 0x0103f738: 0x103f738: cibyl_sysc_arg 0x3
+L_103f748:
+// 0x0103f748: 0x103f748: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0103f73c: 0x103f73c: cibyl_sysc 0x6a0
+// 0x0103f74c: 0x103f74c: cibyl_sysc 0x6a0
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0103f740: 0x103f740: addu  v1, v0, zero
+// 0x0103f750: 0x103f750: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0103f744: 0x103f744: lui   v0, 0x60000
+// 0x0103f754: 0x103f754: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f748: 0x103f748: sw    v1, 11620(v0)
+// 0x0103f758: 0x103f758: sw    v1, 12084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2905
+	ldc.i4 3021
 	add
 	ldloc 6
 	stelem.i4
-L_103f74c:
-// 0x0103f74c: 0x103f74c: lw    ra, 20(sp)
-// 0x0103f750: 0x103f750: sll   zero, zero, 0
-// 0x0103f754: 0x103f754: jr    ra addiu sp, sp, 24
+L_103f75c:
+// 0x0103f75c: 0x103f75c: lw    ra, 20(sp)
+// 0x0103f760: 0x103f760: sll   zero, zero, 0
+// 0x0103f764: 0x103f764: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -988,7 +988,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_mon_error_103f75c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_mon_error_103f76c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1023,43 +1023,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f75c: 0x103f75c: lui   v0, 0x60000
+// 0x0103f76c: 0x103f76c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f760: 0x103f760: lui   v1, 0x60000
+// 0x0103f770: 0x103f770: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103f764: 0x103f764: addiu a1, zero, 6
+// 0x0103f774: 0x103f774: addiu a1, zero, 6
 	ldc.i4.6
 	stloc.2
-// 0x0103f768: 0x103f768: lw    v0, 11616(v0)
+// 0x0103f778: 0x103f778: lw    v0, 12080(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f76c: 0x103f76c: addiu sp, sp, -24
+// 0x0103f77c: 0x103f77c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f770: 0x103f770: sw    a1, 11612(v1)
+// 0x0103f780: 0x103f780: sw    a1, 12076(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103f774: 0x103f774: lui   v1, 0x0
+// 0x0103f784: 0x103f784: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0103f778: 0x103f778: sw    ra, 20(sp)
-// 0x0103f77c: 0x103f77c: beq   v0, zero, 0x103f790 sw    a0, 13120(v1)
+// 0x0103f788: 0x103f788: sw    ra, 20(sp)
+// 0x0103f78c: 0x103f78c: beq   v0, zero, 0x103f7a0 sw    a0, 13120(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
@@ -1069,12 +1069,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_103f790
+	brfalse L_103f7a0
 // --- basic block ---
-// 0x0103f784: 0x103f784: addu  a1, a0, zero
+// 0x0103f794: 0x103f794: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0103f788: 0x103f788: jal   0x101aec4 addiu a0, zero, 33
+// 0x0103f798: 0x103f798: jal   0x101aed4 addiu a0, zero, 33
 	ldc.i4.s 33
 	stloc.1
 	ldloc.0
@@ -1082,26 +1082,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103f790:
-// 0x0103f790: 0x103f790: jal   0x103f6fc sll   zero, zero, 0
+L_103f7a0:
+// 0x0103f7a0: 0x103f7a0: jal   0x103f70c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::update_activity_103f6fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::update_activity_103f70c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f798: 0x103f798: lw    ra, 20(sp)
-// 0x0103f79c: 0x103f79c: sll   zero, zero, 0
-// 0x0103f7a0: 0x103f7a0: jr    ra addiu sp, sp, 24
+// 0x0103f7a8: 0x103f7a8: lw    ra, 20(sp)
+// 0x0103f7ac: 0x103f7ac: sll   zero, zero, 0
+// 0x0103f7b0: 0x103f7b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1113,7 +1113,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_mon_recv_103f7a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_mon_recv_103f7b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1148,99 +1148,99 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f7a8: 0x103f7a8: lui   v0, 0x60000
+// 0x0103f7b8: 0x103f7b8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f7ac: 0x103f7ac: lw    a2, 11624(v0)
+// 0x0103f7bc: 0x103f7bc: lw    a2, 12088(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2906
+	ldc.i4 3022
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103f7b0: 0x103f7b0: lui   v1, 0x60000
+// 0x0103f7c0: 0x103f7c0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103f7b4: 0x103f7b4: lw    v1, 11616(v1)
+// 0x0103f7c4: 0x103f7c4: lw    v1, 12080(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103f7b8: 0x103f7b8: addu  a2, a0, a2
+// 0x0103f7c8: 0x103f7c8: addu  a2, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc.3
-// 0x0103f7bc: 0x103f7bc: addiu sp, sp, -24
+// 0x0103f7cc: 0x103f7cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f7c0: 0x103f7c0: addiu a1, zero, 5
+// 0x0103f7d0: 0x103f7d0: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0103f7c4: 0x103f7c4: lui   a0, 0x60000
+// 0x0103f7d4: 0x103f7d4: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103f7c8: 0x103f7c8: sw    ra, 20(sp)
-// 0x0103f7cc: 0x103f7cc: sw    a1, 11612(a0)
+// 0x0103f7d8: 0x103f7d8: sw    ra, 20(sp)
+// 0x0103f7dc: 0x103f7dc: sw    a1, 12076(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103f7d0: 0x103f7d0: beq   v1, zero, 0x103f7f8 sw    a2, 11624(v0)
+// 0x0103f7e0: 0x103f7e0: beq   v1, zero, 0x103f808 sw    a2, 12088(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2906
+	ldc.i4 3022
 	add
 	ldloc.3
 	stelem.i4
-	brfalse L_103f7f8
+	brfalse L_103f808
 // --- basic block ---
-// 0x0103f7d8: 0x103f7d8: lui   v0, 0x60000
+// 0x0103f7e8: 0x103f7e8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f7dc: 0x103f7dc: lw    v0, 11628(v0)
+// 0x0103f7ec: 0x103f7ec: lw    v0, 12092(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2907
+	ldc.i4 3023
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f7e0: 0x103f7e0: lui   a1, 0x10000
+// 0x0103f7f0: 0x103f7f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0103f7e4: 0x103f7e4: addu  a2, a2, v0
+// 0x0103f7f4: 0x103f7f4: addu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc.3
-// 0x0103f7e8: 0x103f7e8: addiu a1, a1, -4112
+// 0x0103f7f8: 0x103f7f8: addiu a1, a1, -4116
 	ldloc.2
-	ldc.i4 -4112
+	ldc.i4 -4116
 	add
 	stloc.2
-// 0x0103f7ec: 0x103f7ec: srl   a2, a2, 10
+// 0x0103f7fc: 0x103f7fc: srl   a2, a2, 10
 	ldloc.3
 	ldc.i4.s 10
 	shr.un
 	stloc.3
-// 0x0103f7f0: 0x103f7f0: jal   0x101aec4 addiu a0, zero, 33
+// 0x0103f800: 0x103f800: jal   0x101aed4 addiu a0, zero, 33
 	ldc.i4.s 33
 	stloc.1
 	ldloc.0
@@ -1248,26 +1248,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_103f7f8:
-// 0x0103f7f8: 0x103f7f8: jal   0x103f6fc sll   zero, zero, 0
+L_103f808:
+// 0x0103f808: 0x103f808: jal   0x103f70c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::update_activity_103f6fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::update_activity_103f70c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0103f800: 0x103f800: lw    ra, 20(sp)
-// 0x0103f804: 0x103f804: sll   zero, zero, 0
-// 0x0103f808: 0x103f808: jr    ra addiu sp, sp, 24
+// 0x0103f810: 0x103f810: lw    ra, 20(sp)
+// 0x0103f814: 0x103f814: sll   zero, zero, 0
+// 0x0103f818: 0x103f818: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1279,7 +1279,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_mon_send_103f810(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_mon_send_103f820(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -1314,50 +1314,50 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f810: 0x103f810: lui   v0, 0x60000
+// 0x0103f820: 0x103f820: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103f814: 0x103f814: lw    v1, 11628(v0)
+// 0x0103f824: 0x103f824: lw    v1, 12092(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2907
+	ldc.i4 3023
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f818: 0x103f818: addiu sp, sp, -24
+// 0x0103f828: 0x103f828: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f81c: 0x103f81c: addu  v1, a0, v1
+// 0x0103f82c: 0x103f82c: addu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0103f820: 0x103f820: addiu a1, zero, 5
+// 0x0103f830: 0x103f830: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0103f824: 0x103f824: lui   a0, 0x60000
+// 0x0103f834: 0x103f834: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0103f828: 0x103f828: sw    ra, 20(sp)
-// 0x0103f82c: 0x103f82c: sw    a1, 11612(a0)
+// 0x0103f838: 0x103f838: sw    ra, 20(sp)
+// 0x0103f83c: 0x103f83c: sw    a1, 12076(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103f830: 0x103f830: jal   0x103f6fc sw    v1, 11628(v0)
+// 0x0103f840: 0x103f840: jal   0x103f70c sw    v1, 12092(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2907
+	ldc.i4 3023
 	add
 	ldloc 5
 	stelem.i4
@@ -1366,14 +1366,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::update_activity_103f6fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::update_activity_103f70c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0103f838: 0x103f838: lw    ra, 20(sp)
-// 0x0103f83c: 0x103f83c: sll   zero, zero, 0
-// 0x0103f840: 0x103f840: jr    ra addiu sp, sp, 24
+// 0x0103f848: 0x103f848: lw    ra, 20(sp)
+// 0x0103f84c: 0x103f84c: sll   zero, zero, 0
+// 0x0103f850: 0x103f850: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1385,7 +1385,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_net_mon_connect_103f848(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_mon_connect_103f858(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -1420,66 +1420,66 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f848: 0x103f848: lui   v0, 0x60000
+// 0x0103f858: 0x103f858: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0103f84c: 0x103f84c: lw    a0, 11612(v0)
+// 0x0103f85c: 0x103f85c: lw    a0, 12076(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f850: 0x103f850: addiu sp, sp, -24
+// 0x0103f860: 0x103f860: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f854: 0x103f854: addiu v1, zero, 1
+// 0x0103f864: 0x103f864: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0103f858: 0x103f858: beq   a0, v1, 0x103f87c sw    ra, 20(sp)
+// 0x0103f868: 0x103f868: beq   a0, v1, 0x103f88c sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_103f87c
+	beq  L_103f88c
 // --- basic block ---
-// 0x0103f860: 0x103f860: lui   v1, 0x60000
+// 0x0103f870: 0x103f870: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f864: 0x103f864: lw    a0, 11632(v1)
+// 0x0103f874: 0x103f874: lw    a0, 12096(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2908
+	ldc.i4 3024
 	add
 	ldelem.i4
 	stloc.1
-// 0x0103f868: 0x103f868: addiu a1, zero, 4
+// 0x0103f878: 0x103f878: addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
-// 0x0103f86c: 0x103f86c: addiu a0, a0, 1
+// 0x0103f87c: 0x103f87c: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0103f870: 0x103f870: sw    a1, 11612(v0)
+// 0x0103f880: 0x103f880: sw    a1, 12076(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldloc.2
 	stelem.i4
-// 0x0103f874: 0x103f874: jal   0x103f6fc sw    a0, 11632(v1)
+// 0x0103f884: 0x103f884: jal   0x103f70c sw    a0, 12096(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2908
+	ldc.i4 3024
 	add
 	ldloc.1
 	stelem.i4
@@ -1488,15 +1488,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::update_activity_103f6fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::update_activity_103f70c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-L_103f87c:
-// 0x0103f87c: 0x103f87c: lw    ra, 20(sp)
-// 0x0103f880: 0x103f880: sll   zero, zero, 0
-// 0x0103f884: 0x103f884: jr    ra addiu sp, sp, 24
+L_103f88c:
+// 0x0103f88c: 0x103f88c: lw    ra, 20(sp)
+// 0x0103f890: 0x103f890: sll   zero, zero, 0
+// 0x0103f894: 0x103f894: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1508,7 +1508,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_net_mon_start_103f88c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_mon_start_103f89c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1543,48 +1543,48 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f88c: 0x103f88c: lui   v0, 0x60000
+// 0x0103f89c: 0x103f89c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f890: 0x103f890: lw    v0, 11616(v0)
+// 0x0103f8a0: 0x103f8a0: lw    v0, 12080(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f894: 0x103f894: addiu sp, sp, -24
+// 0x0103f8a4: 0x103f8a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f898: 0x103f898: addiu a0, zero, 2
+// 0x0103f8a8: 0x103f8a8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0103f89c: 0x103f89c: lui   v1, 0x60000
+// 0x0103f8ac: 0x103f8ac: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103f8a0: 0x103f8a0: sw    ra, 20(sp)
-// 0x0103f8a4: 0x103f8a4: beq   v0, zero, 0x103f8c4 sw    a0, 11612(v1)
+// 0x0103f8b0: 0x103f8b0: sw    ra, 20(sp)
+// 0x0103f8b4: 0x103f8b4: beq   v0, zero, 0x103f8d4 sw    a0, 12076(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_103f8c4
+	brfalse L_103f8d4
 // --- basic block ---
-// 0x0103f8ac: 0x103f8ac: lui   a0, 0x10000
+// 0x0103f8bc: 0x103f8bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0103f8b0: 0x103f8b0: jal   0x101cd60 addiu a0, a0, -4104
+// 0x0103f8c0: 0x103f8c0: jal   0x101cd70 addiu a0, a0, -4108
 	ldloc.1
-	ldc.i4 -4104
+	ldc.i4 -4108
 	add
 	stloc.1
 	ldloc.0
@@ -1592,15 +1592,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f8b8: 0x103f8b8: addu  a1, v0, zero
+// 0x0103f8c8: 0x103f8c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103f8bc: 0x103f8bc: jal   0x101aec4 addiu a0, zero, 33
+// 0x0103f8cc: 0x103f8cc: jal   0x101aed4 addiu a0, zero, 33
 	ldc.i4.s 33
 	stloc.1
 	ldloc.0
@@ -1608,26 +1608,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103f8c4:
-// 0x0103f8c4: 0x103f8c4: jal   0x103f6fc sll   zero, zero, 0
+L_103f8d4:
+// 0x0103f8d4: 0x103f8d4: jal   0x103f70c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::update_activity_103f6fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::update_activity_103f70c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f8cc: 0x103f8cc: lw    ra, 20(sp)
-// 0x0103f8d0: 0x103f8d0: sll   zero, zero, 0
-// 0x0103f8d4: 0x103f8d4: jr    ra addiu sp, sp, 24
+// 0x0103f8dc: 0x103f8dc: lw    ra, 20(sp)
+// 0x0103f8e0: 0x103f8e0: sll   zero, zero, 0
+// 0x0103f8e4: 0x103f8e4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1639,7 +1639,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 periodic_callack_103f8dc(int32,int32,int32,int32,int32)
+.method public static int32 periodic_callack_103f8ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1674,86 +1674,86 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f8dc: 0x103f8dc: lui   v0, 0x60000
+// 0x0103f8ec: 0x103f8ec: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f8e0: 0x103f8e0: lw    v0, 11616(v0)
+// 0x0103f8f0: 0x103f8f0: lw    v0, 12080(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f8e4: 0x103f8e4: addiu sp, sp, -24
+// 0x0103f8f4: 0x103f8f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f8e8: 0x103f8e8: beq   v0, zero, 0x103f92c sw    ra, 20(sp)
+// 0x0103f8f8: 0x103f8f8: beq   v0, zero, 0x103f93c sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_103f92c
+	brfalse L_103f93c
 // --- basic block ---
-// 0x0103f8f0: 0x103f8f0: lui   v0, 0x60000
+// 0x0103f900: 0x103f900: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f8f4: 0x103f8f4: lw    v1, 11612(v0)
+// 0x0103f904: 0x103f904: lw    v1, 12076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103f8f8: 0x103f8f8: addiu v0, zero, 3
+// 0x0103f908: 0x103f908: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0103f8fc: 0x103f8fc: bne   v1, v0, 0x103f950 addu  v1, zero, zero
+// 0x0103f90c: 0x103f90c: bne   v1, v0, 0x103f960 addu  v1, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	bne.un L_103f950
+	bne.un L_103f960
 // --- basic block ---
-// 0x0103f904: 0x103f904: cibyl_sysc_arg 0x3
+// 0x0103f914: 0x103f914: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0103f908: 0x103f908: cibyl_sysc 0x6a5
+// 0x0103f918: 0x103f918: cibyl_sysc 0x6a5
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0103f90c: 0x103f90c: addu  v1, v0, zero
+// 0x0103f91c: 0x103f91c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0103f910: 0x103f910: lui   v0, 0x60000
+// 0x0103f920: 0x103f920: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f914: 0x103f914: lw    v0, 11620(v0)
+// 0x0103f924: 0x103f924: lw    v0, 12084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2905
+	ldc.i4 3021
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f918: 0x103f918: sll   zero, zero, 0
-// 0x0103f91c: 0x103f91c: subu  v1, v1, v0
+// 0x0103f928: 0x103f928: sll   zero, zero, 0
+// 0x0103f92c: 0x103f92c: subu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 6
-// 0x0103f920: 0x103f920: slti  v1, v1, 4
+// 0x0103f930: 0x103f930: slti  v1, v1, 4
 	ldloc 6
 	ldc.i4.4
 	clt
 	stloc 6
-// 0x0103f924: 0x103f924: bne   v1, zero, 0x103f950 sll   zero, zero, 0
+// 0x0103f934: 0x103f934: bne   v1, zero, 0x103f960 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_103f950
+	brtrue L_103f960
 // --- basic block ---
-L_103f92c:
-// 0x0103f92c: 0x103f92c: jal   0x101ae54 addiu a0, zero, 33
+L_103f93c:
+// 0x0103f93c: 0x103f93c: jal   0x101ae64 addiu a0, zero, 33
 	ldc.i4.s 33
 	stloc.1
 	ldloc.0
@@ -1761,28 +1761,28 @@ L_103f92c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f934: 0x103f934: lui   a0, 0x1040000
+// 0x0103f944: 0x103f944: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0103f938: 0x103f938: lui   v0, 0x60000
+// 0x0103f948: 0x103f948: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f93c: 0x103f93c: addiu a0, a0, -1828
+// 0x0103f94c: 0x103f94c: addiu a0, a0, -1812
 	ldloc.1
-	ldc.i4 -1828
+	ldc.i4 -1812
 	add
 	stloc.1
-// 0x0103f940: 0x103f940: jal   0x104fd00 sw    zero, 11620(v0)
+// 0x0103f950: 0x103f950: jal   0x104fd10 sw    zero, 12084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2905
+	ldc.i4 3021
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1791,26 +1791,26 @@ L_103f92c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f948: 0x103f948: jal   0x1021900 sll   zero, zero, 0
+// 0x0103f958: 0x103f958: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103f950:
-// 0x0103f950: 0x103f950: lw    ra, 20(sp)
-// 0x0103f954: 0x103f954: sll   zero, zero, 0
-// 0x0103f958: 0x103f958: jr    ra addiu sp, sp, 24
+L_103f960:
+// 0x0103f960: 0x103f960: lw    ra, 20(sp)
+// 0x0103f964: 0x103f964: sll   zero, zero, 0
+// 0x0103f968: 0x103f968: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1822,7 +1822,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_mon_destroy_103f960(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_mon_destroy_103f970(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1857,64 +1857,64 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f960: 0x103f960: lui   v0, 0x60000
+// 0x0103f970: 0x103f970: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f964: 0x103f964: lw    v0, 11616(v0)
+// 0x0103f974: 0x103f974: lw    v0, 12080(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103f968: 0x103f968: addiu sp, sp, -24
+// 0x0103f978: 0x103f978: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f96c: 0x103f96c: bne   v0, zero, 0x103f980 sw    ra, 20(sp)
+// 0x0103f97c: 0x103f97c: bne   v0, zero, 0x103f990 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_103f980
+	brtrue L_103f990
 // --- basic block ---
-// 0x0103f974: 0x103f974: lui   a1, 0x20000
+// 0x0103f984: 0x103f984: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0103f978: 0x103f978: j	 0x103f988 addiu a1, a1, 9464
+// 0x0103f988: 0x103f988: j	 0x103f998 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-	br L_103f988
+	br L_103f998
 // --- basic block ---
-L_103f980:
-// 0x0103f980: 0x103f980: lui   a1, 0x0
+L_103f990:
+// 0x0103f990: 0x103f990: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103f984: 0x103f984: addiu a1, a1, 20820
+// 0x0103f994: 0x103f994: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-L_103f988:
-// 0x0103f988: 0x103f988: lui   a0, 0x0
+L_103f998:
+// 0x0103f998: 0x103f998: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0103f98c: 0x103f98c: lui   v0, 0x60000
+// 0x0103f99c: 0x103f99c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0103f990: 0x103f990: addiu a0, a0, 13124
+// 0x0103f9a0: 0x103f9a0: addiu a0, a0, 13124
 	ldloc.1
 	ldc.i4 13124
 	add
 	stloc.1
-// 0x0103f994: 0x103f994: jal   0x100e5c0 sw    zero, 11612(v0)
+// 0x0103f9a4: 0x103f9a4: jal   0x100e5d0 sw    zero, 12076(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2903
+	ldc.i4 3019
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1923,14 +1923,14 @@ L_103f988:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103f99c: 0x103f99c: lw    ra, 20(sp)
-// 0x0103f9a0: 0x103f9a0: sll   zero, zero, 0
-// 0x0103f9a4: 0x103f9a4: jr    ra addiu sp, sp, 24
+// 0x0103f9ac: 0x103f9ac: lw    ra, 20(sp)
+// 0x0103f9b0: 0x103f9b0: sll   zero, zero, 0
+// 0x0103f9b4: 0x103f9b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1942,7 +1942,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_mon_initialize_103f9ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_mon_initialize_103f9bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -1980,13 +1980,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103f9ac: 0x103f9ac: addiu sp, sp, -24
+// 0x0103f9bc: 0x103f9bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103f9b0: 0x103f9b0: sw    ra, 20(sp)
-// 0x0103f9b4: 0x103f9b4: jal   0x101cc04 sw    s0, 16(sp)
+// 0x0103f9c0: 0x103f9c0: sw    ra, 20(sp)
+// 0x0103f9c4: 0x103f9c4: jal   0x101cc14 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1995,49 +1995,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl21::roadmap_lang_rtl_101cc04()
+	call int32 Cibyl21::roadmap_lang_rtl_101cc14()
 	stloc 5
 // --- basic block ---
-// 0x0103f9bc: 0x103f9bc: bne   v0, zero, 0x103f9cc lui   a2, 0x20000
+// 0x0103f9cc: 0x103f9cc: bne   v0, zero, 0x103f9dc lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brtrue L_103f9cc
+	brtrue L_103f9dc
 // --- basic block ---
-// 0x0103f9c4: 0x103f9c4: j	 0x103f9d4 addiu a2, a2, 9464
+// 0x0103f9d4: 0x103f9d4: j	 0x103f9e4 addiu a2, a2, 9928
 	ldloc.3
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.3
-	br L_103f9d4
+	br L_103f9e4
 // --- basic block ---
-L_103f9cc:
-// 0x0103f9cc: 0x103f9cc: lui   a2, 0x0
+L_103f9dc:
+// 0x0103f9dc: 0x103f9dc: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0103f9d0: 0x103f9d0: addiu a2, a2, 20820
+// 0x0103f9e0: 0x103f9e0: addiu a2, a2, 20820
 	ldloc.3
 	ldc.i4 20820
 	add
 	stloc.3
-L_103f9d4:
-// 0x0103f9d4: 0x103f9d4: lui   s0, 0x0
+L_103f9e4:
+// 0x0103f9e4: 0x103f9e4: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0103f9d8: 0x103f9d8: lui   a0, 0x20000
+// 0x0103f9e8: 0x103f9e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0103f9dc: 0x103f9dc: addiu a1, s0, 13124
+// 0x0103f9ec: 0x103f9ec: addiu a1, s0, 13124
 	ldloc 7
 	ldc.i4 13124
 	add
 	stloc.2
-// 0x0103f9e0: 0x103f9e0: addiu a0, a0, -26888
+// 0x0103f9f0: 0x103f9f0: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0103f9e4: 0x103f9e4: jal   0x100edb0 addu  a3, zero, zero
+// 0x0103f9f4: 0x103f9f4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2045,20 +2045,20 @@ L_103f9d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f9ec: 0x103f9ec: lui   a1, 0x0
+// 0x0103f9fc: 0x103f9fc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0103f9f0: 0x103f9f0: addiu a0, s0, 13124
+// 0x0103fa00: 0x103fa00: addiu a0, s0, 13124
 	ldloc 7
 	ldc.i4 13124
 	add
 	stloc.1
-// 0x0103f9f4: 0x103f9f4: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x0103fa04: 0x103fa04: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2068,16 +2068,16 @@ L_103f9d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103f9fc: 0x103f9fc: lw    ra, 20(sp)
-// 0x0103fa00: 0x103fa00: lui   v1, 0x60000
+// 0x0103fa0c: 0x103fa0c: lw    ra, 20(sp)
+// 0x0103fa10: 0x103fa10: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x0103fa04: 0x103fa04: lw    s0, 16(sp)
+// 0x0103fa14: 0x103fa14: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -2086,16 +2086,16 @@ L_103f9d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103fa08: 0x103fa08: sw    v0, 11616(v1)
+// 0x0103fa18: 0x103fa18: sw    v0, 12080(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2904
+	ldc.i4 3020
 	add
 	ldloc 5
 	stelem.i4
-// 0x0103fa0c: 0x103fa0c: jr    ra addiu sp, sp, 24
+// 0x0103fa1c: 0x103fa1c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2107,7 +2107,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_softkeys_orientation_103fa14()
+.method public static int32 roadmap_softkeys_orientation_103fa24()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -2121,7 +2121,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103fa14: 0x103fa14: jr    ra addu  v0, zero, zero
+// 0x0103fa24: 0x103fa24: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -2129,7 +2129,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_softkeys_left_softkey_callback_103fa1c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_left_softkey_callback_103fa2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2164,43 +2164,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103fa1c:
-// 0x0103fa1c: 0x103fa1c: addiu sp, sp, -24
+L_103fa2c:
+// 0x0103fa2c: 0x103fa2c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103fa20: 0x103fa20: lui   v0, 0xf0000
+// 0x0103fa30: 0x103fa30: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0103fa24: 0x103fa24: lui   a0, 0xe0000
+// 0x0103fa34: 0x103fa34: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x0103fa28: 0x103fa28: sw    ra, 20(sp)
-// 0x0103fa2c: 0x103fa2c: addiu v0, v0, -32332
+// 0x0103fa38: 0x103fa38: sw    ra, 20(sp)
+// 0x0103fa3c: 0x103fa3c: addiu v0, v0, -31868
 	ldloc 5
-	ldc.i4 -32332
+	ldc.i4 -31868
 	add
 	stloc 5
-// 0x0103fa30: 0x103fa30: addiu a0, a0, 31404
+// 0x0103fa40: 0x103fa40: addiu a0, a0, 31868
 	ldloc.1
-	ldc.i4 31404
+	ldc.i4 31868
 	add
 	stloc.1
-L_103fa34:
-// 0x0103fa34: 0x103fa34: lw    v1, 0(v0)
+L_103fa44:
+// 0x0103fa44: 0x103fa44: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0103fa38: 0x103fa38: sll   zero, zero, 0
-// 0x0103fa3c: 0x103fa3c: beq   v1, zero, 0x103fa54 sll   zero, zero, 0
+// 0x0103fa48: 0x103fa48: sll   zero, zero, 0
+// 0x0103fa4c: 0x103fa4c: beq   v1, zero, 0x103fa64 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_103fa54
+	brfalse L_103fa64
 // --- basic block ---
-// 0x0103fa44: 0x103fa44: lw    v1, 56(v0)
+// 0x0103fa54: 0x103fa54: lw    v1, 56(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2209,27 +2209,27 @@ L_103fa34:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103fa48: 0x103fa48: sll   zero, zero, 0
-// 0x0103fa4c: 0x103fa4c: bne   v1, zero, 0x103fa68 sll   zero, zero, 0
+// 0x0103fa58: 0x103fa58: sll   zero, zero, 0
+// 0x0103fa5c: 0x103fa5c: bne   v1, zero, 0x103fa78 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_103fa68
+	brtrue L_103fa78
 // --- basic block ---
-L_103fa54:
-// 0x0103fa54: 0x103fa54: addiu v0, v0, -60
+L_103fa64:
+// 0x0103fa64: 0x103fa64: addiu v0, v0, -60
 	ldloc 5
 	ldc.i4.s -60
 	add
 	stloc 5
-// 0x0103fa58: 0x103fa58: bne   v0, a0, 0x103fa34 sll   zero, zero, 0
+// 0x0103fa68: 0x103fa68: bne   v0, a0, 0x103fa44 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_103fa34
+	bne.un L_103fa44
 // --- basic block ---
-// 0x0103fa60: 0x103fa60: j	 0x103fa70 sll   zero, zero, 0
-	br L_103fa70
+// 0x0103fa70: 0x103fa70: j	 0x103fa80 sll   zero, zero, 0
+	br L_103fa80
 // --- basic block ---
-L_103fa68:
-// 0x0103fa68: 0x103fa68: jalr  v1 sll   zero, zero, 0
+L_103fa78:
+// 0x0103fa78: 0x103fa78: jalr  v1 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -2241,10 +2241,10 @@ L_103fa68:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103fa70:
-// 0x0103fa70: 0x103fa70: lw    ra, 20(sp)
-// 0x0103fa74: 0x103fa74: sll   zero, zero, 0
-// 0x0103fa78: 0x103fa78: jr    ra addiu sp, sp, 24
+L_103fa80:
+// 0x0103fa80: 0x103fa80: lw    ra, 20(sp)
+// 0x0103fa84: 0x103fa84: sll   zero, zero, 0
+// 0x0103fa88: 0x103fa88: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2256,7 +2256,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_softkeys_right_softkey_callback_103fa80(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_right_softkey_callback_103fa90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2291,43 +2291,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103fa80:
-// 0x0103fa80: 0x103fa80: addiu sp, sp, -24
+L_103fa90:
+// 0x0103fa90: 0x103fa90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103fa84: 0x103fa84: lui   v0, 0xf0000
+// 0x0103fa94: 0x103fa94: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0103fa88: 0x103fa88: lui   a0, 0xf0000
+// 0x0103fa98: 0x103fa98: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0103fa8c: 0x103fa8c: sw    ra, 20(sp)
-// 0x0103fa90: 0x103fa90: addiu v0, v0, -30532
+// 0x0103fa9c: 0x103fa9c: sw    ra, 20(sp)
+// 0x0103faa0: 0x103faa0: addiu v0, v0, -30068
 	ldloc 5
-	ldc.i4 -30532
+	ldc.i4 -30068
 	add
 	stloc 5
-// 0x0103fa94: 0x103fa94: addiu a0, a0, -32332
+// 0x0103faa4: 0x103faa4: addiu a0, a0, -31868
 	ldloc.1
-	ldc.i4 -32332
+	ldc.i4 -31868
 	add
 	stloc.1
-L_103fa98:
-// 0x0103fa98: 0x103fa98: lw    v1, 0(v0)
+L_103faa8:
+// 0x0103faa8: 0x103faa8: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0103fa9c: 0x103fa9c: sll   zero, zero, 0
-// 0x0103faa0: 0x103faa0: beq   v1, zero, 0x103fab8 sll   zero, zero, 0
+// 0x0103faac: 0x103faac: sll   zero, zero, 0
+// 0x0103fab0: 0x103fab0: beq   v1, zero, 0x103fac8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_103fab8
+	brfalse L_103fac8
 // --- basic block ---
-// 0x0103faa8: 0x103faa8: lw    v1, 56(v0)
+// 0x0103fab8: 0x103fab8: lw    v1, 56(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2336,27 +2336,27 @@ L_103fa98:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103faac: 0x103faac: sll   zero, zero, 0
-// 0x0103fab0: 0x103fab0: bne   v1, zero, 0x103facc sll   zero, zero, 0
+// 0x0103fabc: 0x103fabc: sll   zero, zero, 0
+// 0x0103fac0: 0x103fac0: bne   v1, zero, 0x103fadc sll   zero, zero, 0
 	ldloc 6
-	brtrue L_103facc
+	brtrue L_103fadc
 // --- basic block ---
-L_103fab8:
-// 0x0103fab8: 0x103fab8: addiu v0, v0, -60
+L_103fac8:
+// 0x0103fac8: 0x103fac8: addiu v0, v0, -60
 	ldloc 5
 	ldc.i4.s -60
 	add
 	stloc 5
-// 0x0103fabc: 0x103fabc: bne   v0, a0, 0x103fa98 sll   zero, zero, 0
+// 0x0103facc: 0x103facc: bne   v0, a0, 0x103faa8 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_103fa98
+	bne.un L_103faa8
 // --- basic block ---
-// 0x0103fac4: 0x103fac4: j	 0x103fad4 sll   zero, zero, 0
-	br L_103fad4
+// 0x0103fad4: 0x103fad4: j	 0x103fae4 sll   zero, zero, 0
+	br L_103fae4
 // --- basic block ---
-L_103facc:
-// 0x0103facc: 0x103facc: jalr  v1 sll   zero, zero, 0
+L_103fadc:
+// 0x0103fadc: 0x103fadc: jalr  v1 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -2368,10 +2368,10 @@ L_103facc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_103fad4:
-// 0x0103fad4: 0x103fad4: lw    ra, 20(sp)
-// 0x0103fad8: 0x103fad8: sll   zero, zero, 0
-// 0x0103fadc: 0x103fadc: jr    ra addiu sp, sp, 24
+L_103fae4:
+// 0x0103fae4: 0x103fae4: lw    ra, 20(sp)
+// 0x0103fae8: 0x103fae8: sll   zero, zero, 0
+// 0x0103faec: 0x103faec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2383,7 +2383,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_softkeys_get_right_soft_key_text_103fae4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_get_right_soft_key_text_103faf4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem,int32 lo)
@@ -2421,69 +2421,69 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103fae4:
-// 0x0103fae4: 0x103fae4: addiu sp, sp, -24
+L_103faf4:
+// 0x0103faf4: 0x103faf4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103fae8: 0x103fae8: lui   v1, 0xf0000
+// 0x0103faf8: 0x103faf8: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0103faec: 0x103faec: sw    ra, 20(sp)
-// 0x0103faf0: 0x103faf0: addiu v1, v1, -30532
+// 0x0103fafc: 0x103fafc: sw    ra, 20(sp)
+// 0x0103fb00: 0x103fb00: addiu v1, v1, -30068
 	ldloc 6
-	ldc.i4 -30532
+	ldc.i4 -30068
 	add
 	stloc 6
-// 0x0103faf4: 0x103faf4: addiu v0, zero, 29
+// 0x0103fb04: 0x103fb04: addiu v0, zero, 29
 	ldc.i4.s 29
 	stloc 5
-// 0x0103faf8: 0x103faf8: addiu a0, zero, -1
+// 0x0103fb08: 0x103fb08: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-L_103fafc:
-// 0x0103fafc: 0x103fafc: lw    a1, 0(v1)
+L_103fb0c:
+// 0x0103fb0c: 0x103fb0c: lw    a1, 0(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103fb00: 0x103fb00: sll   zero, zero, 0
-// 0x0103fb04: 0x103fb04: beq   a1, zero, 0x103fb34 addiu v1, v1, -60
+// 0x0103fb10: 0x103fb10: sll   zero, zero, 0
+// 0x0103fb14: 0x103fb14: beq   a1, zero, 0x103fb44 addiu v1, v1, -60
 	ldloc.2
 	ldloc 6
 	ldc.i4.s -60
 	add
 	stloc 6
-	brfalse L_103fb34
+	brfalse L_103fb44
 // --- basic block ---
-// 0x0103fb0c: 0x103fb0c: addiu a0, zero, 60
+// 0x0103fb1c: 0x103fb1c: addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
-// 0x0103fb10: 0x103fb10: mult  v0, a0
+// 0x0103fb20: 0x103fb20: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 9
-// 0x0103fb14: 0x103fb14: lui   a0, 0xf0000
+// 0x0103fb24: 0x103fb24: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0103fb18: 0x103fb18: addiu a0, a0, -32272
+// 0x0103fb28: 0x103fb28: addiu a0, a0, -31808
 	ldloc.1
-	ldc.i4 -32272
+	ldc.i4 -31808
 	add
 	stloc.1
-// 0x0103fb1c: 0x103fb1c: mflo  lo
+// 0x0103fb2c: 0x103fb2c: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x0103fb20: 0x103fb20: addu  a0, a0, v0
+// 0x0103fb30: 0x103fb30: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x0103fb24: 0x103fb24: jal   0x101cd60 addiu a0, a0, 4
+// 0x0103fb34: 0x103fb34: jal   0x101cd70 addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
@@ -2493,37 +2493,37 @@ L_103fafc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fb2c: 0x103fb2c: j	 0x103fb48 sll   zero, zero, 0
-	br L_103fb48
+// 0x0103fb3c: 0x103fb3c: j	 0x103fb58 sll   zero, zero, 0
+	br L_103fb58
 // --- basic block ---
-L_103fb34:
-// 0x0103fb34: 0x103fb34: addiu v0, v0, -1
+L_103fb44:
+// 0x0103fb44: 0x103fb44: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0103fb38: 0x103fb38: bne   v0, a0, 0x103fafc sll   zero, zero, 0
+// 0x0103fb48: 0x103fb48: bne   v0, a0, 0x103fb0c sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_103fafc
+	bne.un L_103fb0c
 // --- basic block ---
-// 0x0103fb40: 0x103fb40: lui   v0, 0x10000
+// 0x0103fb50: 0x103fb50: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103fb44: 0x103fb44: addiu v0, v0, 18500
+// 0x0103fb54: 0x103fb54: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-L_103fb48:
-// 0x0103fb48: 0x103fb48: lw    ra, 20(sp)
-// 0x0103fb4c: 0x103fb4c: sll   zero, zero, 0
-// 0x0103fb50: 0x103fb50: jr    ra addiu sp, sp, 24
+L_103fb58:
+// 0x0103fb58: 0x103fb58: lw    ra, 20(sp)
+// 0x0103fb5c: 0x103fb5c: sll   zero, zero, 0
+// 0x0103fb60: 0x103fb60: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2535,7 +2535,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_softkeys_get_left_soft_key_text_103fb58(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_get_left_soft_key_text_103fb68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem,int32 lo)
@@ -2573,69 +2573,69 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_103fb58:
-// 0x0103fb58: 0x103fb58: addiu sp, sp, -24
+L_103fb68:
+// 0x0103fb68: 0x103fb68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103fb5c: 0x103fb5c: lui   v1, 0xf0000
+// 0x0103fb6c: 0x103fb6c: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0103fb60: 0x103fb60: sw    ra, 20(sp)
-// 0x0103fb64: 0x103fb64: addiu v1, v1, -32332
+// 0x0103fb70: 0x103fb70: sw    ra, 20(sp)
+// 0x0103fb74: 0x103fb74: addiu v1, v1, -31868
 	ldloc 6
-	ldc.i4 -32332
+	ldc.i4 -31868
 	add
 	stloc 6
-// 0x0103fb68: 0x103fb68: addiu v0, zero, 29
+// 0x0103fb78: 0x103fb78: addiu v0, zero, 29
 	ldc.i4.s 29
 	stloc 5
-// 0x0103fb6c: 0x103fb6c: addiu a0, zero, -1
+// 0x0103fb7c: 0x103fb7c: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-L_103fb70:
-// 0x0103fb70: 0x103fb70: lw    a1, 0(v1)
+L_103fb80:
+// 0x0103fb80: 0x103fb80: lw    a1, 0(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103fb74: 0x103fb74: sll   zero, zero, 0
-// 0x0103fb78: 0x103fb78: beq   a1, zero, 0x103fba8 addiu v1, v1, -60
+// 0x0103fb84: 0x103fb84: sll   zero, zero, 0
+// 0x0103fb88: 0x103fb88: beq   a1, zero, 0x103fbb8 addiu v1, v1, -60
 	ldloc.2
 	ldloc 6
 	ldc.i4.s -60
 	add
 	stloc 6
-	brfalse L_103fba8
+	brfalse L_103fbb8
 // --- basic block ---
-// 0x0103fb80: 0x103fb80: addiu a0, zero, 60
+// 0x0103fb90: 0x103fb90: addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
-// 0x0103fb84: 0x103fb84: mult  v0, a0
+// 0x0103fb94: 0x103fb94: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 9
-// 0x0103fb88: 0x103fb88: lui   a0, 0xe0000
+// 0x0103fb98: 0x103fb98: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x0103fb8c: 0x103fb8c: addiu a0, a0, 31464
+// 0x0103fb9c: 0x103fb9c: addiu a0, a0, 31928
 	ldloc.1
-	ldc.i4 31464
+	ldc.i4 31928
 	add
 	stloc.1
-// 0x0103fb90: 0x103fb90: mflo  lo
+// 0x0103fba0: 0x103fba0: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x0103fb94: 0x103fb94: addu  a0, a0, v0
+// 0x0103fba4: 0x103fba4: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x0103fb98: 0x103fb98: jal   0x101cd60 addiu a0, a0, 4
+// 0x0103fba8: 0x103fba8: jal   0x101cd70 addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
@@ -2645,37 +2645,37 @@ L_103fb70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fba0: 0x103fba0: j	 0x103fbbc sll   zero, zero, 0
-	br L_103fbbc
+// 0x0103fbb0: 0x103fbb0: j	 0x103fbcc sll   zero, zero, 0
+	br L_103fbcc
 // --- basic block ---
-L_103fba8:
-// 0x0103fba8: 0x103fba8: addiu v0, v0, -1
+L_103fbb8:
+// 0x0103fbb8: 0x103fbb8: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0103fbac: 0x103fbac: bne   v0, a0, 0x103fb70 sll   zero, zero, 0
+// 0x0103fbbc: 0x103fbbc: bne   v0, a0, 0x103fb80 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_103fb70
+	bne.un L_103fb80
 // --- basic block ---
-// 0x0103fbb4: 0x103fbb4: lui   v0, 0x10000
+// 0x0103fbc4: 0x103fbc4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0103fbb8: 0x103fbb8: addiu v0, v0, 18500
+// 0x0103fbc8: 0x103fbc8: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-L_103fbbc:
-// 0x0103fbbc: 0x103fbbc: lw    ra, 20(sp)
-// 0x0103fbc0: 0x103fbc0: sll   zero, zero, 0
-// 0x0103fbc4: 0x103fbc4: jr    ra addiu sp, sp, 24
+L_103fbcc:
+// 0x0103fbcc: 0x103fbcc: lw    ra, 20(sp)
+// 0x0103fbd0: 0x103fbd0: sll   zero, zero, 0
+// 0x0103fbd4: 0x103fbd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2687,7 +2687,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 remove_softkey_103fc90(int32,int32,int32,int32,int32)
+.method public static int32 remove_softkey_103fca0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 s0,int32 s3,int32 v1,int32 s2,int32 s4,int32 lo,int32 ra)
@@ -2740,12 +2740,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103fc90: 0x103fc90: addiu sp, sp, -48
+// 0x0103fca0: 0x103fca0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103fc94: 0x103fc94: sw    s4, 40(sp)
+// 0x0103fca4: 0x103fca4: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2754,7 +2754,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0103fc98: 0x103fc98: sw    s3, 36(sp)
+// 0x0103fca8: 0x103fca8: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2763,7 +2763,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103fc9c: 0x103fc9c: sw    s2, 32(sp)
+// 0x0103fcac: 0x103fcac: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2772,7 +2772,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103fca0: 0x103fca0: sw    s1, 28(sp)
+// 0x0103fcb0: 0x103fcb0: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2781,7 +2781,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0103fca4: 0x103fca4: sw    s0, 24(sp)
+// 0x0103fcb4: 0x103fcb4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2790,24 +2790,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0103fca8: 0x103fca8: sw    ra, 44(sp)
-// 0x0103fcac: 0x103fcac: addu  s2, a1, zero
+// 0x0103fcb8: 0x103fcb8: sw    ra, 44(sp)
+// 0x0103fcbc: 0x103fcbc: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0103fcb0: 0x103fcb0: addu  s0, a0, zero
+// 0x0103fcc0: 0x103fcc0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0103fcb4: 0x103fcb4: addu  s3, a1, zero
+// 0x0103fcc4: 0x103fcc4: addu  s3, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0103fcb8: 0x103fcb8: addiu s1, zero, 29
+// 0x0103fcc8: 0x103fcc8: addiu s1, zero, 29
 	ldc.i4.s 29
 	stloc 6
-// 0x0103fcbc: 0x103fcbc: addiu s4, zero, -1
+// 0x0103fccc: 0x103fccc: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 12
-L_103fcc0:
-// 0x0103fcc0: 0x103fcc0: lw    v0, 1740(s3)
+L_103fcd0:
+// 0x0103fcd0: 0x103fcd0: lw    v0, 1740(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -2816,70 +2816,70 @@ L_103fcc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103fcc4: 0x103fcc4: addu  a1, s0, zero
+// 0x0103fcd4: 0x103fcd4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0103fcc8: 0x103fcc8: beq   v0, zero, 0x103fce0 addu  a0, v0, zero
+// 0x0103fcd8: 0x103fcd8: beq   v0, zero, 0x103fcf0 addu  a0, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brfalse L_103fce0
+	brfalse L_103fcf0
 // --- basic block ---
-// 0x0103fcd0: 0x103fcd0: jal   0x1001b14 sll   zero, zero, 0
+// 0x0103fce0: 0x103fce0: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0103fcd8: 0x103fcd8: beq   v0, zero, 0x103fcf4 sll   zero, zero, 0
+// 0x0103fce8: 0x103fce8: beq   v0, zero, 0x103fd04 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_103fcf4
+	brfalse L_103fd04
 // --- basic block ---
-L_103fce0:
-// 0x0103fce0: 0x103fce0: addiu s1, s1, -1
+L_103fcf0:
+// 0x0103fcf0: 0x103fcf0: addiu s1, s1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0103fce4: 0x103fce4: bne   s1, s4, 0x103fcc0 addiu s3, s3, -60
+// 0x0103fcf4: 0x103fcf4: bne   s1, s4, 0x103fcd0 addiu s3, s3, -60
 	ldloc 6
 	ldloc 12
 	ldloc 9
 	ldc.i4.s -60
 	add
 	stloc 9
-	bne.un L_103fcc0
+	bne.un L_103fcd0
 // --- basic block ---
-// 0x0103fcec: 0x103fcec: j	 0x103fd80 lui   a1, 0x10000
+// 0x0103fcfc: 0x103fcfc: j	 0x103fd90 lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-	br L_103fd80
+	br L_103fd90
 // --- basic block ---
-L_103fcf4:
-// 0x0103fcf4: 0x103fcf4: addiu s0, zero, 60
+L_103fd04:
+// 0x0103fd04: 0x103fd04: addiu s0, zero, 60
 	ldc.i4.s 60
 	stloc 8
-// 0x0103fcf8: 0x103fcf8: mult  s1, s0
+// 0x0103fd08: 0x103fd08: mult  s1, s0
 	ldloc 6
 	ldloc 8
 	mul
 	stloc 13
-// 0x0103fcfc: 0x103fcfc: mflo  lo
+// 0x0103fd0c: 0x103fd0c: mflo  lo
 	ldloc 13
 	stloc 8
-// 0x0103fd00: 0x103fd00: addu  s0, s2, s0
+// 0x0103fd10: 0x103fd10: addu  s0, s2, s0
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x0103fd04: 0x103fd04: lw    a0, 0(s0)
+// 0x0103fd14: 0x103fd14: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103fd08: 0x103fd08: sw    zero, 56(s0)
+// 0x0103fd18: 0x103fd18: sw    zero, 56(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2888,16 +2888,16 @@ L_103fcf4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0103fd0c: 0x103fd0c: beq   a0, zero, 0x103fd1c sb    zero, 4(s0)
+// 0x0103fd1c: 0x103fd1c: beq   a0, zero, 0x103fd2c sb    zero, 4(s0)
 	ldloc.1
 	ldloc 8
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brfalse L_103fd1c
+	brfalse L_103fd2c
 // --- basic block ---
-// 0x0103fd14: 0x103fd14: jal   0x1000930 sll   zero, zero, 0
+// 0x0103fd24: 0x103fd24: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2908,11 +2908,11 @@ L_103fcf4:
 	stloc 10
 	stloc 7
 // --- basic block ---
-L_103fd1c:
-// 0x0103fd1c: 0x103fd1c: addiu v0, zero, 29
+L_103fd2c:
+// 0x0103fd2c: 0x103fd2c: addiu v0, zero, 29
 	ldc.i4.s 29
 	stloc 7
-// 0x0103fd20: 0x103fd20: beq   s1, v0, 0x103fd9c sw    zero, 0(s0)
+// 0x0103fd30: 0x103fd30: beq   s1, v0, 0x103fdac sw    zero, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldloc 5
@@ -2921,46 +2921,46 @@ L_103fd1c:
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	beq  L_103fd9c
+	beq  L_103fdac
 // --- basic block ---
-// 0x0103fd28: 0x103fd28: addiu s1, s1, 1
+// 0x0103fd38: 0x103fd38: addiu s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0103fd2c: 0x103fd2c: addiu v0, zero, 60
+// 0x0103fd3c: 0x103fd3c: addiu v0, zero, 60
 	ldc.i4.s 60
 	stloc 7
-// 0x0103fd30: 0x103fd30: mult  s1, v0
+// 0x0103fd40: 0x103fd40: mult  s1, v0
 	ldloc 6
 	ldloc 7
 	mul
 	stloc 13
-// 0x0103fd34: 0x103fd34: mflo  lo
+// 0x0103fd44: 0x103fd44: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x0103fd38: 0x103fd38: addu  s1, s2, s1
+// 0x0103fd48: 0x103fd48: addu  s1, s2, s1
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x0103fd3c: 0x103fd3c: lw    s3, 0(s1)
+// 0x0103fd4c: 0x103fd4c: lw    s3, 0(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0103fd40: 0x103fd40: sll   zero, zero, 0
-// 0x0103fd44: 0x103fd44: beq   s3, zero, 0x103fd9c addiu a1, s1, 4
+// 0x0103fd50: 0x103fd50: sll   zero, zero, 0
+// 0x0103fd54: 0x103fd54: beq   s3, zero, 0x103fdac addiu a1, s1, 4
 	ldloc 9
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc.2
-	brfalse L_103fd9c
+	brfalse L_103fdac
 // --- basic block ---
-// 0x0103fd4c: 0x103fd4c: lw    v0, 56(s1)
+// 0x0103fd5c: 0x103fd5c: lw    v0, 56(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2969,12 +2969,12 @@ L_103fd1c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103fd50: 0x103fd50: addiu a0, s0, 4
+// 0x0103fd60: 0x103fd60: addiu a0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc.1
-// 0x0103fd54: 0x103fd54: jal   0x1001b68 sw    v0, 56(s0)
+// 0x0103fd64: 0x103fd64: jal   0x1001b68 sw    v0, 56(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2990,14 +2990,14 @@ L_103fd1c:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0103fd5c: 0x103fd5c: lw    a0, 0(s1)
+// 0x0103fd6c: 0x103fd6c: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0103fd60: 0x103fd60: jal   0x1001ba8 sll   zero, zero, 0
+// 0x0103fd70: 0x103fd70: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3008,17 +3008,17 @@ L_103fd1c:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0103fd68: 0x103fd68: sw    v0, 0(s0)
+// 0x0103fd78: 0x103fd78: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0103fd6c: 0x103fd6c: addu  a0, s3, zero
+// 0x0103fd7c: 0x103fd7c: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0103fd70: 0x103fd70: jal   0x103fc90 addu  a1, s2, zero
+// 0x0103fd80: 0x103fd80: jal   0x103fca0 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -3026,35 +3026,35 @@ L_103fd1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::remove_softkey_103fc90(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::remove_softkey_103fca0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0103fd78: 0x103fd78: j	 0x103fd9c sll   zero, zero, 0
-	br L_103fd9c
+// 0x0103fd88: 0x103fd88: j	 0x103fdac sll   zero, zero, 0
+	br L_103fdac
 // --- basic block ---
-L_103fd80:
-// 0x0103fd80: 0x103fd80: lui   a3, 0x10000
+L_103fd90:
+// 0x0103fd90: 0x103fd90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103fd84: 0x103fd84: addiu a1, a1, -4056
+// 0x0103fd94: 0x103fd94: addiu a1, a1, -4060
 	ldloc.2
-	ldc.i4 -4056
+	ldc.i4 -4060
 	add
 	stloc.2
-// 0x0103fd88: 0x103fd88: addiu a3, a3, -4024
+// 0x0103fd98: 0x103fd98: addiu a3, a3, -4028
 	ldloc 4
-	ldc.i4 -4024
+	ldc.i4 -4028
 	add
 	stloc 4
-// 0x0103fd8c: 0x103fd8c: addiu a0, zero, 1
+// 0x0103fd9c: 0x103fd9c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0103fd90: 0x103fd90: addiu a2, zero, 98
+// 0x0103fda0: 0x103fda0: addiu a2, zero, 98
 	ldc.i4.s 98
 	stloc.3
-// 0x0103fd94: 0x103fd94: jal   0x100449c sw    s0, 16(sp)
+// 0x0103fda4: 0x103fda4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3073,9 +3073,9 @@ L_103fd80:
 	stloc 10
 	stloc 7
 // --- basic block ---
-L_103fd9c:
-// 0x0103fd9c: 0x103fd9c: lw    ra, 44(sp)
-// 0x0103fda0: 0x103fda0: lw    s4, 40(sp)
+L_103fdac:
+// 0x0103fdac: 0x103fdac: lw    ra, 44(sp)
+// 0x0103fdb0: 0x103fdb0: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3084,7 +3084,7 @@ L_103fd9c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0103fda4: 0x103fda4: lw    s3, 36(sp)
+// 0x0103fdb4: 0x103fdb4: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3093,7 +3093,7 @@ L_103fd9c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103fda8: 0x103fda8: lw    s2, 32(sp)
+// 0x0103fdb8: 0x103fdb8: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3102,7 +3102,7 @@ L_103fd9c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103fdac: 0x103fdac: lw    s1, 28(sp)
+// 0x0103fdbc: 0x103fdbc: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3111,7 +3111,7 @@ L_103fd9c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0103fdb0: 0x103fdb0: lw    s0, 24(sp)
+// 0x0103fdc0: 0x103fdc0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3120,7 +3120,7 @@ L_103fd9c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0103fdb4: 0x103fdb4: jr    ra addiu sp, sp, 48
+// 0x0103fdc4: 0x103fdc4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3132,7 +3132,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3167,18 +3167,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103fdbc: 0x103fdbc: lui   a1, 0xf0000
+// 0x0103fdcc: 0x103fdcc: lui   a1, 0xf0000
 	ldc.i4 983040
 	stloc.2
-// 0x0103fdc0: 0x103fdc0: addiu sp, sp, -24
+// 0x0103fdd0: 0x103fdd0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103fdc4: 0x103fdc4: sw    ra, 20(sp)
-// 0x0103fdc8: 0x103fdc8: jal   0x103fc90 addiu a1, a1, -32272
+// 0x0103fdd4: 0x103fdd4: sw    ra, 20(sp)
+// 0x0103fdd8: 0x103fdd8: jal   0x103fca0 addiu a1, a1, -31808
 	ldloc.2
-	ldc.i4 -32272
+	ldc.i4 -31808
 	add
 	stloc.2
 	ldloc.0
@@ -3186,43 +3186,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::remove_softkey_103fc90(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::remove_softkey_103fca0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fdd0: 0x103fdd0: jal   0x104fb08 addiu a0, zero, 1
+// 0x0103fde0: 0x103fde0: jal   0x104fb18 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb08(int32)
+	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb18(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fdd8: 0x103fdd8: jal   0x103fae4 sll   zero, zero, 0
+// 0x0103fde8: 0x103fde8: jal   0x103faf4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_get_right_soft_key_text_103fae4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_get_right_soft_key_text_103faf4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fde0: 0x103fde0: lui   a2, 0x1040000
+// 0x0103fdf0: 0x103fdf0: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103fde4: 0x103fde4: addu  a1, v0, zero
+// 0x0103fdf4: 0x103fdf4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103fde8: 0x103fde8: addiu a2, a2, -1408
+// 0x0103fdf8: 0x103fdf8: addiu a2, a2, -1392
 	ldloc.3
-	ldc.i4 -1408
+	ldc.i4 -1392
 	add
 	stloc.3
-// 0x0103fdec: 0x103fdec: jal   0x1050764 addiu a0, zero, 2
+// 0x0103fdfc: 0x103fdfc: jal   0x1050774 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -3230,14 +3230,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_context_menu_set_1050764(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_context_menu_set_1050774(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fdf4: 0x103fdf4: lw    ra, 20(sp)
-// 0x0103fdf8: 0x103fdf8: sll   zero, zero, 0
-// 0x0103fdfc: 0x103fdfc: jr    ra addiu sp, sp, 24
+// 0x0103fe04: 0x103fe04: lw    ra, 20(sp)
+// 0x0103fe08: 0x103fe08: sll   zero, zero, 0
+// 0x0103fe0c: 0x103fe0c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3249,7 +3249,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_softkeys_remove_left_soft_key_103fe04(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_remove_left_soft_key_103fe14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3284,18 +3284,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103fe04: 0x103fe04: lui   a1, 0xe0000
+// 0x0103fe14: 0x103fe14: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x0103fe08: 0x103fe08: addiu sp, sp, -24
+// 0x0103fe18: 0x103fe18: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103fe0c: 0x103fe0c: sw    ra, 20(sp)
-// 0x0103fe10: 0x103fe10: jal   0x103fc90 addiu a1, a1, 31464
+// 0x0103fe1c: 0x103fe1c: sw    ra, 20(sp)
+// 0x0103fe20: 0x103fe20: jal   0x103fca0 addiu a1, a1, 31928
 	ldloc.2
-	ldc.i4 31464
+	ldc.i4 31928
 	add
 	stloc.2
 	ldloc.0
@@ -3303,43 +3303,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::remove_softkey_103fc90(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::remove_softkey_103fca0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fe18: 0x103fe18: jal   0x104fb08 addiu a0, zero, 1
+// 0x0103fe28: 0x103fe28: jal   0x104fb18 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb08(int32)
+	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb18(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fe20: 0x103fe20: jal   0x103fb58 sll   zero, zero, 0
+// 0x0103fe30: 0x103fe30: jal   0x103fb68 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_get_left_soft_key_text_103fb58(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_get_left_soft_key_text_103fb68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fe28: 0x103fe28: lui   a2, 0x1040000
+// 0x0103fe38: 0x103fe38: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103fe2c: 0x103fe2c: addu  a1, v0, zero
+// 0x0103fe3c: 0x103fe3c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103fe30: 0x103fe30: addiu a2, a2, -1508
+// 0x0103fe40: 0x103fe40: addiu a2, a2, -1492
 	ldloc.3
-	ldc.i4 -1508
+	ldc.i4 -1492
 	add
 	stloc.3
-// 0x0103fe34: 0x103fe34: jal   0x1050764 addiu a0, zero, 1
+// 0x0103fe44: 0x103fe44: jal   0x1050774 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3347,14 +3347,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_context_menu_set_1050764(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_context_menu_set_1050774(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103fe3c: 0x103fe3c: lw    ra, 20(sp)
-// 0x0103fe40: 0x103fe40: sll   zero, zero, 0
-// 0x0103fe44: 0x103fe44: jr    ra addiu sp, sp, 24
+// 0x0103fe4c: 0x103fe4c: lw    ra, 20(sp)
+// 0x0103fe50: 0x103fe50: sll   zero, zero, 0
+// 0x0103fe54: 0x103fe54: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3366,7 +3366,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 queue_softkey_103fe4c(int32,int32,int32,int32,int32)
+.method public static int32 queue_softkey_103fe5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 v1,int32 s0,int32 s1,int32 s3,int32 ra,int32 lo)
@@ -3416,12 +3416,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103fe4c: 0x103fe4c: addiu sp, sp, -48
+// 0x0103fe5c: 0x103fe5c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0103fe50: 0x103fe50: sw    s3, 40(sp)
+// 0x0103fe60: 0x103fe60: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3430,7 +3430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0103fe54: 0x103fe54: sw    s2, 36(sp)
+// 0x0103fe64: 0x103fe64: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3439,7 +3439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0103fe58: 0x103fe58: sw    s1, 32(sp)
+// 0x0103fe68: 0x103fe68: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3448,7 +3448,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0103fe5c: 0x103fe5c: sw    s0, 28(sp)
+// 0x0103fe6c: 0x103fe6c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3457,26 +3457,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0103fe60: 0x103fe60: sw    ra, 44(sp)
-// 0x0103fe64: 0x103fe64: addu  s0, a0, zero
+// 0x0103fe70: 0x103fe70: sw    ra, 44(sp)
+// 0x0103fe74: 0x103fe74: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0103fe68: 0x103fe68: addu  s1, a1, zero
+// 0x0103fe78: 0x103fe78: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0103fe6c: 0x103fe6c: addu  s2, zero, zero
+// 0x0103fe7c: 0x103fe7c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0103fe70: 0x103fe70: addiu s3, zero, -1800
+// 0x0103fe80: 0x103fe80: addiu s3, zero, -1800
 	ldc.i4 -1800
 	stloc 11
-// 0x0103fe74: 0x103fe74: addu  v0, a2, s2
+// 0x0103fe84: 0x103fe84: addu  v0, a2, s2
 	ldloc.3
 	ldloc 7
 	add
 	stloc 5
-L_103fe78:
-// 0x0103fe78: 0x103fe78: lw    v0, 1740(v0)
+L_103fe88:
+// 0x0103fe88: 0x103fe88: lw    v0, 1740(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3485,21 +3485,21 @@ L_103fe78:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103fe7c: 0x103fe7c: addu  a1, s0, zero
+// 0x0103fe8c: 0x103fe8c: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0103fe80: 0x103fe80: addu  a0, v0, zero
+// 0x0103fe90: 0x103fe90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0103fe84: 0x103fe84: beq   v0, zero, 0x103fea0 addiu s2, s2, -60
+// 0x0103fe94: 0x103fe94: beq   v0, zero, 0x103feb0 addiu s2, s2, -60
 	ldloc 5
 	ldloc 7
 	ldc.i4.s -60
 	add
 	stloc 7
-	brfalse L_103fea0
+	brfalse L_103feb0
 // --- basic block ---
-// 0x0103fe8c: 0x103fe8c: jal   0x1001b14 sw    a2, 16(sp)
+// 0x0103fe9c: 0x103fe9c: jal   0x1001b14 sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3513,7 +3513,7 @@ L_103fe78:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0103fe94: 0x103fe94: lw    a2, 16(sp)
+// 0x0103fea4: 0x103fea4: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3522,75 +3522,75 @@ L_103fe78:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0103fe98: 0x103fe98: beq   v0, zero, 0x103ff20 sll   zero, zero, 0
+// 0x0103fea8: 0x103fea8: beq   v0, zero, 0x103ff30 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_103ff20
+	brfalse L_103ff30
 // --- basic block ---
-L_103fea0:
-// 0x0103fea0: 0x103fea0: bne   s2, s3, 0x103fe78 addu  v0, a2, s2
+L_103feb0:
+// 0x0103feb0: 0x103feb0: bne   s2, s3, 0x103fe88 addu  v0, a2, s2
 	ldloc 7
 	ldloc 11
 	ldloc.3
 	ldloc 7
 	add
 	stloc 5
-	bne.un L_103fe78
+	bne.un L_103fe88
 // --- basic block ---
-// 0x0103fea8: 0x103fea8: addu  v1, a2, zero
+// 0x0103feb8: 0x103feb8: addu  v1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0103feac: 0x103feac: addu  v0, zero, zero
+// 0x0103febc: 0x103febc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0103feb0: 0x103feb0: addiu a0, zero, 30
+// 0x0103fec0: 0x103fec0: addiu a0, zero, 30
 	ldc.i4.s 30
 	stloc.1
-L_103feb4:
-// 0x0103feb4: 0x103feb4: lw    a1, 0(v1)
+L_103fec4:
+// 0x0103fec4: 0x103fec4: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103feb8: 0x103feb8: sll   zero, zero, 0
-// 0x0103febc: 0x103febc: beq   a1, zero, 0x103fef0 addiu v1, v1, 60
+// 0x0103fec8: 0x103fec8: sll   zero, zero, 0
+// 0x0103fecc: 0x103fecc: beq   a1, zero, 0x103ff00 addiu v1, v1, 60
 	ldloc.2
 	ldloc 8
 	ldc.i4.s 60
 	add
 	stloc 8
-	brfalse L_103fef0
+	brfalse L_103ff00
 // --- basic block ---
-// 0x0103fec4: 0x103fec4: addiu v0, v0, 1
+// 0x0103fed4: 0x103fed4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0103fec8: 0x103fec8: bne   v0, a0, 0x103feb4 lui   a1, 0x10000
+// 0x0103fed8: 0x103fed8: bne   v0, a0, 0x103fec4 lui   a1, 0x10000
 	ldloc 5
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	bne.un L_103feb4
+	bne.un L_103fec4
 // --- basic block ---
-// 0x0103fed0: 0x103fed0: lui   a3, 0x10000
+// 0x0103fee0: 0x103fee0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0103fed4: 0x103fed4: addiu a1, a1, -4056
+// 0x0103fee4: 0x103fee4: addiu a1, a1, -4060
 	ldloc.2
-	ldc.i4 -4056
+	ldc.i4 -4060
 	add
 	stloc.2
-// 0x0103fed8: 0x103fed8: addiu a3, a3, -3980
+// 0x0103fee8: 0x103fee8: addiu a3, a3, -3984
 	ldloc 4
-	ldc.i4 -3980
+	ldc.i4 -3984
 	add
 	stloc 4
-// 0x0103fedc: 0x103fedc: addiu a0, zero, 4
+// 0x0103feec: 0x103feec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0103fee0: 0x103fee0: jal   0x100449c addiu a2, zero, 74
+// 0x0103fef0: 0x103fef0: jal   0x100449c addiu a2, zero, 74
 	ldc.i4.s 74
 	stloc.3
 	ldloc.0
@@ -3603,30 +3603,30 @@ L_103feb4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103fee8: 0x103fee8: j	 0x103ff20 sll   zero, zero, 0
-	br L_103ff20
+// 0x0103fef8: 0x103fef8: j	 0x103ff30 sll   zero, zero, 0
+	br L_103ff30
 // --- basic block ---
-L_103fef0:
-// 0x0103fef0: 0x103fef0: addiu s2, zero, 60
+L_103ff00:
+// 0x0103ff00: 0x103ff00: addiu s2, zero, 60
 	ldc.i4.s 60
 	stloc 7
-// 0x0103fef4: 0x103fef4: mult  v0, s2
+// 0x0103ff04: 0x103ff04: mult  v0, s2
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 13
-// 0x0103fef8: 0x103fef8: addu  a1, s1, zero
+// 0x0103ff08: 0x103ff08: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0103fefc: 0x103fefc: mflo  lo
+// 0x0103ff0c: 0x103ff0c: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x0103ff00: 0x103ff00: addu  s2, a2, s2
+// 0x0103ff10: 0x103ff10: addu  s2, a2, s2
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x0103ff04: 0x103ff04: jal   0x1001b68 addiu a0, s2, 4
+// 0x0103ff14: 0x103ff14: jal   0x1001b68 addiu a0, s2, 4
 	ldloc 7
 	ldc.i4.4
 	add
@@ -3638,7 +3638,7 @@ L_103fef0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103ff0c: 0x103ff0c: lw    v0, 52(s1)
+// 0x0103ff1c: 0x103ff1c: lw    v0, 52(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3647,10 +3647,10 @@ L_103fef0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0103ff10: 0x103ff10: addu  a0, s0, zero
+// 0x0103ff20: 0x103ff20: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0103ff14: 0x103ff14: jal   0x1001ba8 sw    v0, 56(s2)
+// 0x0103ff24: 0x103ff24: jal   0x1001ba8 sw    v0, 56(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3669,16 +3669,16 @@ L_103fef0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0103ff1c: 0x103ff1c: sw    v0, 0(s2)
+// 0x0103ff2c: 0x103ff2c: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_103ff20:
-// 0x0103ff20: 0x103ff20: lw    ra, 44(sp)
-// 0x0103ff24: 0x103ff24: lw    s3, 40(sp)
+L_103ff30:
+// 0x0103ff30: 0x103ff30: lw    ra, 44(sp)
+// 0x0103ff34: 0x103ff34: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3687,7 +3687,7 @@ L_103ff20:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0103ff28: 0x103ff28: lw    s2, 36(sp)
+// 0x0103ff38: 0x103ff38: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3696,7 +3696,7 @@ L_103ff20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0103ff2c: 0x103ff2c: lw    s1, 32(sp)
+// 0x0103ff3c: 0x103ff3c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3705,7 +3705,7 @@ L_103ff20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0103ff30: 0x103ff30: lw    s0, 28(sp)
+// 0x0103ff40: 0x103ff40: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3714,7 +3714,7 @@ L_103ff20:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0103ff34: 0x103ff34: jr    ra addiu sp, sp, 48
+// 0x0103ff44: 0x103ff44: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3726,7 +3726,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_softkeys_set_right_soft_key_103ff3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_set_right_soft_key_103ff4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3761,18 +3761,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ff3c: 0x103ff3c: lui   a2, 0xf0000
+// 0x0103ff4c: 0x103ff4c: lui   a2, 0xf0000
 	ldc.i4 983040
 	stloc.3
-// 0x0103ff40: 0x103ff40: addiu sp, sp, -24
+// 0x0103ff50: 0x103ff50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103ff44: 0x103ff44: sw    ra, 20(sp)
-// 0x0103ff48: 0x103ff48: jal   0x103fe4c addiu a2, a2, -32272
+// 0x0103ff54: 0x103ff54: sw    ra, 20(sp)
+// 0x0103ff58: 0x103ff58: jal   0x103fe5c addiu a2, a2, -31808
 	ldloc.3
-	ldc.i4 -32272
+	ldc.i4 -31808
 	add
 	stloc.3
 	ldloc.0
@@ -3780,43 +3780,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::queue_softkey_103fe4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::queue_softkey_103fe5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ff50: 0x103ff50: jal   0x104fb08 addiu a0, zero, 1
+// 0x0103ff60: 0x103ff60: jal   0x104fb18 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb08(int32)
+	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb18(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ff58: 0x103ff58: jal   0x103fae4 sll   zero, zero, 0
+// 0x0103ff68: 0x103ff68: jal   0x103faf4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_get_right_soft_key_text_103fae4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_get_right_soft_key_text_103faf4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ff60: 0x103ff60: lui   a2, 0x1040000
+// 0x0103ff70: 0x103ff70: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103ff64: 0x103ff64: addu  a1, v0, zero
+// 0x0103ff74: 0x103ff74: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103ff68: 0x103ff68: addiu a2, a2, -1408
+// 0x0103ff78: 0x103ff78: addiu a2, a2, -1392
 	ldloc.3
-	ldc.i4 -1408
+	ldc.i4 -1392
 	add
 	stloc.3
-// 0x0103ff6c: 0x103ff6c: jal   0x1050764 addiu a0, zero, 2
+// 0x0103ff7c: 0x103ff7c: jal   0x1050774 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -3824,14 +3824,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_context_menu_set_1050764(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_context_menu_set_1050774(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ff74: 0x103ff74: lw    ra, 20(sp)
-// 0x0103ff78: 0x103ff78: sll   zero, zero, 0
-// 0x0103ff7c: 0x103ff7c: jr    ra addiu sp, sp, 24
+// 0x0103ff84: 0x103ff84: lw    ra, 20(sp)
+// 0x0103ff88: 0x103ff88: sll   zero, zero, 0
+// 0x0103ff8c: 0x103ff8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3843,7 +3843,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_softkeys_set_left_soft_key_103ff84(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_softkeys_set_left_soft_key_103ff94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3878,18 +3878,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ff84: 0x103ff84: lui   a2, 0xe0000
+// 0x0103ff94: 0x103ff94: lui   a2, 0xe0000
 	ldc.i4 917504
 	stloc.3
-// 0x0103ff88: 0x103ff88: addiu sp, sp, -24
+// 0x0103ff98: 0x103ff98: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0103ff8c: 0x103ff8c: sw    ra, 20(sp)
-// 0x0103ff90: 0x103ff90: jal   0x103fe4c addiu a2, a2, 31464
+// 0x0103ff9c: 0x103ff9c: sw    ra, 20(sp)
+// 0x0103ffa0: 0x103ffa0: jal   0x103fe5c addiu a2, a2, 31928
 	ldloc.3
-	ldc.i4 31464
+	ldc.i4 31928
 	add
 	stloc.3
 	ldloc.0
@@ -3897,43 +3897,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::queue_softkey_103fe4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::queue_softkey_103fe5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ff98: 0x103ff98: jal   0x104fb08 addiu a0, zero, 1
+// 0x0103ffa8: 0x103ffa8: jal   0x104fb18 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb08(int32)
+	call int32 Cibyl59::roadmap_main_context_menu_reset_104fb18(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ffa0: 0x103ffa0: jal   0x103fb58 sll   zero, zero, 0
+// 0x0103ffb0: 0x103ffb0: jal   0x103fb68 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_get_left_soft_key_text_103fb58(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_get_left_soft_key_text_103fb68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ffa8: 0x103ffa8: lui   a2, 0x1040000
+// 0x0103ffb8: 0x103ffb8: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x0103ffac: 0x103ffac: addu  a1, v0, zero
+// 0x0103ffbc: 0x103ffbc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0103ffb0: 0x103ffb0: addiu a2, a2, -1508
+// 0x0103ffc0: 0x103ffc0: addiu a2, a2, -1492
 	ldloc.3
-	ldc.i4 -1508
+	ldc.i4 -1492
 	add
 	stloc.3
-// 0x0103ffb4: 0x103ffb4: jal   0x1050764 addiu a0, zero, 1
+// 0x0103ffc4: 0x103ffc4: jal   0x1050774 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -3941,14 +3941,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_context_menu_set_1050764(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_context_menu_set_1050774(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0103ffbc: 0x103ffbc: lw    ra, 20(sp)
-// 0x0103ffc0: 0x103ffc0: sll   zero, zero, 0
-// 0x0103ffc4: 0x103ffc4: jr    ra addiu sp, sp, 24
+// 0x0103ffcc: 0x103ffcc: lw    ra, 20(sp)
+// 0x0103ffd0: 0x103ffd0: sll   zero, zero, 0
+// 0x0103ffd4: 0x103ffd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3960,7 +3960,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 device_event_info_copy_103ffcc(int32,int32)
+.method public static int32 device_event_info_copy_103ffdc(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 ra)
@@ -3983,22 +3983,22 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ffcc: 0x103ffcc: lw    v0, 0(a1)
+// 0x0103ffdc: 0x103ffdc: lw    v0, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103ffd0: 0x103ffd0: sll   zero, zero, 0
-// 0x0103ffd4: 0x103ffd4: sw    v0, 0(a0)
+// 0x0103ffe0: 0x103ffe0: sll   zero, zero, 0
+// 0x0103ffe4: 0x103ffe4: sw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0103ffd8: 0x103ffd8: lw    v0, 4(a1)
+// 0x0103ffe8: 0x103ffe8: lw    v0, 4(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4007,7 +4007,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0103ffdc: 0x103ffdc: jr    ra sw    v0, 4(a0)
+// 0x0103ffec: 0x103ffec: jr    ra sw    v0, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -4021,7 +4021,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 device_event_info_are_identical_103ffe4(int32,int32)
+.method public static int32 device_event_info_are_identical_103fff4(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4047,27 +4047,27 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103ffe4: 0x103ffe4: lw    v0, 0(a0)
+// 0x0103fff4: 0x103fff4: lw    v0, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0103ffe8: 0x103ffe8: lw    v1, 0(a1)
+// 0x0103fff8: 0x103fff8: lw    v1, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0103ffec: 0x103ffec: sll   zero, zero, 0
-// 0x0103fff0: 0x103fff0: xor   v0, v0, v1
+// 0x0103fffc: 0x103fffc: sll   zero, zero, 0
+// 0x01040000: 0x1040000: xor   v0, v0, v1
 	ldloc.2
 	ldloc.3
 	xor
 	stloc.2
-// 0x0103fff4: 0x103fff4: jr    ra sltiu v0, v0, 1
+// 0x01040004: 0x1040004: jr    ra sltiu v0, v0, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
@@ -4079,7 +4079,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 get_device_event_name_103fffc(int32)
+.method public static int32 get_device_event_name_104000c(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -4099,58 +4099,58 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0103fffc: 0x103fffc: sltiu v0, a0, 12
+// 0x0104000c: 0x104000c: sltiu v0, a0, 12
 	ldloc.0
 	ldc.i4.s 12
 	clt.un
 	stloc.1
-// 0x01040000: 0x1040000: bne   v0, zero, 0x1040014 sll   zero, zero, 0
+// 0x01040010: 0x1040010: bne   v0, zero, 0x1040024 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1040014
+	brtrue L_1040024
 // --- basic block ---
-// 0x01040008: 0x1040008: lui   v0, 0x10000
+// 0x01040018: 0x1040018: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104000c: 0x104000c: jr    ra addiu v0, v0, -11972
+// 0x0104001c: 0x104001c: jr    ra addiu v0, v0, -11976
 	ldloc.1
-	ldc.i4 -11972
+	ldc.i4 -11976
 	add
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_1040014:
-// 0x01040014: 0x1040014: lui   v0, 0x20000
+L_1040024:
+// 0x01040024: 0x1040024: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01040018: 0x1040018: addiu v0, v0, 27424
+// 0x01040028: 0x1040028: addiu v0, v0, 27888
 	ldloc.1
-	ldc.i4 27424
+	ldc.i4 27888
 	add
 	stloc.1
-// 0x0104001c: 0x104001c: sll   a0, a0, 2
+// 0x0104002c: 0x104002c: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-// 0x01040020: 0x1040020: addu  a0, a0, v0
+// 0x01040030: 0x1040030: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x01040024: 0x1040024: lw    v0, 0(a0)
+// 0x01040034: 0x1040034: lw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01040028: 0x1040028: jr    ra sll   zero, zero, 0
+// 0x01040038: 0x1040038: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_device_event_notification_1040030(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_device_event_notification_1040040(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -4194,12 +4194,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040030: 0x1040030: addiu sp, sp, -32
+// 0x01040040: 0x1040040: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01040034: 0x1040034: sw    s1, 20(sp)
+// 0x01040044: 0x1040044: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4208,10 +4208,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01040038: 0x1040038: lui   s1, 0x60000
+// 0x01040048: 0x1040048: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x0104003c: 0x104003c: sw    s2, 24(sp)
+// 0x0104004c: 0x104004c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4220,7 +4220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01040040: 0x1040040: sw    s0, 16(sp)
+// 0x01040050: 0x1040050: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4229,36 +4229,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01040044: 0x1040044: sw    ra, 28(sp)
-// 0x01040048: 0x1040048: addu  s2, a0, zero
+// 0x01040054: 0x1040054: sw    ra, 28(sp)
+// 0x01040058: 0x1040058: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0104004c: 0x104004c: addiu s1, s1, 11796
+// 0x0104005c: 0x104005c: addiu s1, s1, 12260
 	ldloc 8
-	ldc.i4 11796
+	ldc.i4 12260
 	add
 	stloc 8
-// 0x01040050: 0x1040050: j	 0x104007c addu  s0, zero, zero
+// 0x01040060: 0x1040060: j	 0x104008c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_104007c
+	br L_104008c
 // --- basic block ---
-L_1040058:
-// 0x01040058: 0x1040058: jal   0x10403a8 sll   zero, zero, 0
+L_1040068:
+// 0x01040068: 0x1040068: jal   0x10403b8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl47::cyclic_array_get_item_10403a8(int32,int32)
+	call int32 Cibyl47::cyclic_array_get_item_10403b8(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01040060: 0x1040060: beq   v0, zero, 0x1040094 addu  a0, s2, zero
+// 0x01040070: 0x1040070: beq   v0, zero, 0x10400a4 addu  a0, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_1040094
+	brfalse L_10400a4
 // --- basic block ---
-// 0x01040068: 0x1040068: lw    a1, 4(v0)
+// 0x01040078: 0x1040078: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4267,15 +4267,15 @@ L_1040058:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104006c: 0x104006c: lw    v0, 0(v0)
+// 0x0104007c: 0x104007c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01040070: 0x1040070: sll   zero, zero, 0
-// 0x01040074: 0x1040074: jalr  v0 addiu s0, s0, 1
+// 0x01040080: 0x1040080: sll   zero, zero, 0
+// 0x01040084: 0x1040084: jalr  v0 addiu s0, s0, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
@@ -4291,31 +4291,31 @@ L_1040058:
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_104007c:
-// 0x0104007c: 0x104007c: jal   0x1040358 addu  a0, s1, zero
+L_104008c:
+// 0x0104008c: 0x104008c: jal   0x1040368 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl47::cyclic_array_size_1040358(int32)
+	call int32 Cibyl47::cyclic_array_size_1040368(int32)
 	stloc 5
 // --- basic block ---
-// 0x01040084: 0x1040084: slt   v0, s0, v0
+// 0x01040094: 0x1040094: slt   v0, s0, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040088: 0x1040088: addu  a1, s0, zero
+// 0x01040098: 0x1040098: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0104008c: 0x104008c: bne   v0, zero, 0x1040058 addu  a0, s1, zero
+// 0x0104009c: 0x104009c: bne   v0, zero, 0x1040068 addu  a0, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_1040058
+	brtrue L_1040068
 // --- basic block ---
-L_1040094:
-// 0x01040094: 0x1040094: lw    ra, 28(sp)
-// 0x01040098: 0x1040098: lw    s2, 24(sp)
+L_10400a4:
+// 0x010400a4: 0x10400a4: lw    ra, 28(sp)
+// 0x010400a8: 0x10400a8: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4324,7 +4324,7 @@ L_1040094:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104009c: 0x104009c: lw    s1, 20(sp)
+// 0x010400ac: 0x10400ac: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4333,7 +4333,7 @@ L_1040094:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010400a0: 0x10400a0: lw    s0, 16(sp)
+// 0x010400b0: 0x10400b0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4342,7 +4342,7 @@ L_1040094:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010400a4: 0x10400a4: jr    ra addiu sp, sp, 32
+// 0x010400b4: 0x10400b4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4354,7 +4354,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_device_events_unregister_10400ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_device_events_unregister_10400bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4389,12 +4389,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010400ac: 0x10400ac: addiu sp, sp, -32
+// 0x010400bc: 0x10400bc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010400b0: 0x10400b0: sw    a0, 16(sp)
+// 0x010400c0: 0x10400c0: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4403,18 +4403,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010400b4: 0x10400b4: lui   a0, 0x60000
+// 0x010400c4: 0x10400c4: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x010400b8: 0x10400b8: addiu a1, sp, 16
+// 0x010400c8: 0x10400c8: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x010400bc: 0x10400bc: sw    ra, 28(sp)
-// 0x010400c0: 0x10400c0: jal   0x10406ec addiu a0, a0, 11796
+// 0x010400cc: 0x10400cc: sw    ra, 28(sp)
+// 0x010400d0: 0x10400d0: jal   0x10406fc addiu a0, a0, 12260
 	ldloc.1
-	ldc.i4 11796
+	ldc.i4 12260
 	add
 	stloc.1
 	ldloc.0
@@ -4422,14 +4422,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::cyclic_array_remove_same_item_10406ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::cyclic_array_remove_same_item_10406fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010400c8: 0x10400c8: lw    ra, 28(sp)
-// 0x010400cc: 0x10400cc: sll   zero, zero, 0
-// 0x010400d0: 0x10400d0: jr    ra addiu sp, sp, 32
+// 0x010400d8: 0x10400d8: lw    ra, 28(sp)
+// 0x010400dc: 0x10400dc: sll   zero, zero, 0
+// 0x010400e0: 0x10400e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4441,7 +4441,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_device_events_register_10400d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_device_events_register_10400e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -4476,12 +4476,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010400d8: 0x10400d8: addiu sp, sp, -32
+// 0x010400e8: 0x10400e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010400dc: 0x10400dc: sw    a0, 16(sp)
+// 0x010400ec: 0x10400ec: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4490,10 +4490,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010400e0: 0x10400e0: lui   a0, 0x60000
+// 0x010400f0: 0x10400f0: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x010400e4: 0x10400e4: sw    a1, 20(sp)
+// 0x010400f4: 0x10400f4: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4502,13 +4502,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010400e8: 0x10400e8: addiu a0, a0, 11796
+// 0x010400f8: 0x10400f8: addiu a0, a0, 12260
 	ldloc.1
-	ldc.i4 11796
+	ldc.i4 12260
 	add
 	stloc.1
-// 0x010400ec: 0x10400ec: sw    ra, 28(sp)
-// 0x010400f0: 0x10400f0: jal   0x1040940 addiu a1, sp, 16
+// 0x010400fc: 0x10400fc: sw    ra, 28(sp)
+// 0x01040100: 0x1040100: jal   0x1040950 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4518,14 +4518,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::cyclic_array_push_last_1040940(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::cyclic_array_push_last_1040950(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010400f8: 0x10400f8: lw    ra, 28(sp)
-// 0x010400fc: 0x10400fc: sll   zero, zero, 0
-// 0x01040100: 0x1040100: jr    ra addiu sp, sp, 32
+// 0x01040108: 0x1040108: lw    ra, 28(sp)
+// 0x0104010c: 0x104010c: sll   zero, zero, 0
+// 0x01040110: 0x1040110: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4537,7 +4537,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_device_events_term_1040108(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_device_events_term_1040118(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4572,18 +4572,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040108: 0x1040108: lui   a0, 0x60000
+// 0x01040118: 0x1040118: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0104010c: 0x104010c: addiu sp, sp, -24
+// 0x0104011c: 0x104011c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01040110: 0x1040110: sw    ra, 20(sp)
-// 0x01040114: 0x1040114: jal   0x10402a4 addiu a0, a0, 11796
+// 0x01040120: 0x1040120: sw    ra, 20(sp)
+// 0x01040124: 0x1040124: jal   0x10402b4 addiu a0, a0, 12260
 	ldloc.1
-	ldc.i4 11796
+	ldc.i4 12260
 	add
 	stloc.1
 	ldloc.0
@@ -4591,17 +4591,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::cyclic_array_free_10402a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::cyclic_array_free_10402b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104011c: 0x104011c: jal   0x10ac524 sll   zero, zero, 0
-	call void Cibyl129::roadmap_device_events_os_term_10ac524()
+// 0x0104012c: 0x104012c: jal   0x10acb6c sll   zero, zero, 0
+	call void Cibyl129::roadmap_device_events_os_term_10acb6c()
 // --- basic block ---
-// 0x01040124: 0x1040124: lw    ra, 20(sp)
-// 0x01040128: 0x1040128: sll   zero, zero, 0
-// 0x0104012c: 0x104012c: jr    ra addiu sp, sp, 24
+// 0x01040134: 0x1040134: lw    ra, 20(sp)
+// 0x01040138: 0x1040138: sll   zero, zero, 0
+// 0x0104013c: 0x104013c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4613,7 +4613,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_device_events_init_1040134(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_device_events_init_1040144(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -4651,20 +4651,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040134: 0x1040134: lui   v0, 0x10000
+// 0x01040144: 0x1040144: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01040138: 0x1040138: addiu sp, sp, -48
+// 0x01040148: 0x1040148: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104013c: 0x104013c: addiu v0, v0, -3960
+// 0x0104014c: 0x104014c: addiu v0, v0, -3964
 	ldloc 5
-	ldc.i4 -3960
+	ldc.i4 -3964
 	add
 	stloc 5
-// 0x01040140: 0x1040140: sw    v0, 16(sp)
+// 0x01040150: 0x1040150: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4673,15 +4673,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01040144: 0x1040144: lui   v0, 0x1040000
+// 0x01040154: 0x1040154: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01040148: 0x1040148: addiu v0, v0, 456
+// 0x01040158: 0x1040158: addiu v0, v0, 472
 	ldloc 5
-	ldc.i4 456
+	ldc.i4 472
 	add
 	stloc 5
-// 0x0104014c: 0x104014c: sw    v0, 20(sp)
+// 0x0104015c: 0x104015c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4690,15 +4690,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01040150: 0x1040150: lui   v0, 0x1040000
+// 0x01040160: 0x1040160: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01040154: 0x1040154: addiu v0, v0, 468
+// 0x01040164: 0x1040164: addiu v0, v0, 484
 	ldloc 5
-	ldc.i4 468
+	ldc.i4 484
 	add
 	stloc 5
-// 0x01040158: 0x1040158: sw    v0, 24(sp)
+// 0x01040168: 0x1040168: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4707,15 +4707,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104015c: 0x104015c: lui   v0, 0x1040000
+// 0x0104016c: 0x104016c: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01040160: 0x1040160: addiu v0, v0, -52
+// 0x01040170: 0x1040170: addiu v0, v0, -36
 	ldloc 5
-	ldc.i4.s -52
+	ldc.i4.s -36
 	add
 	stloc 5
-// 0x01040164: 0x1040164: sw    s0, 40(sp)
+// 0x01040174: 0x1040174: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4724,7 +4724,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01040168: 0x1040168: sw    v0, 28(sp)
+// 0x01040178: 0x1040178: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4733,38 +4733,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104016c: 0x104016c: lui   s0, 0x60000
+// 0x0104017c: 0x104017c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01040170: 0x1040170: lui   a1, 0x60000
+// 0x01040180: 0x1040180: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01040174: 0x1040174: lui   v0, 0x1040000
+// 0x01040184: 0x1040184: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01040178: 0x1040178: addiu v0, v0, -28
+// 0x01040188: 0x1040188: addiu v0, v0, -12
 	ldloc 5
-	ldc.i4.s -28
+	ldc.i4.s -12
 	add
 	stloc 5
-// 0x0104017c: 0x104017c: addiu a1, a1, 11636
+// 0x0104018c: 0x104018c: addiu a1, a1, 12100
 	ldloc.2
-	ldc.i4 11636
+	ldc.i4 12100
 	add
 	stloc.2
-// 0x01040180: 0x1040180: addiu a0, s0, 11796
+// 0x01040190: 0x1040190: addiu a0, s0, 12260
 	ldloc 8
-	ldc.i4 11796
+	ldc.i4 12260
 	add
 	stloc.1
-// 0x01040184: 0x1040184: addiu a2, zero, 8
+// 0x01040194: 0x1040194: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x01040188: 0x1040188: addiu a3, zero, 20
+// 0x01040198: 0x1040198: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0104018c: 0x104018c: sw    ra, 44(sp)
-// 0x01040190: 0x1040190: jal   0x1040254 sw    v0, 32(sp)
+// 0x0104019c: 0x104019c: sw    ra, 44(sp)
+// 0x010401a0: 0x10401a0: jal   0x1040264 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4778,24 +4778,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::cyclic_array_init_1040254(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::cyclic_array_init_1040264(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040198: 0x1040198: jal   0x10ac51c sll   zero, zero, 0
-	call int32 Cibyl129::roadmap_device_events_os_init_10ac51c()
+// 0x010401a8: 0x10401a8: jal   0x10acb64 sll   zero, zero, 0
+	call int32 Cibyl129::roadmap_device_events_os_init_10acb64()
 	stloc 5
 // --- basic block ---
-// 0x010401a0: 0x10401a0: bne   v0, zero, 0x10401b4 addiu v1, zero, 1
+// 0x010401b0: 0x10401b0: bne   v0, zero, 0x10401c4 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brtrue L_10401b4
+	brtrue L_10401c4
 // --- basic block ---
-// 0x010401a8: 0x10401a8: jal   0x10402a4 addiu a0, s0, 11796
+// 0x010401b8: 0x10401b8: jal   0x10402b4 addiu a0, s0, 12260
 	ldloc 8
-	ldc.i4 11796
+	ldc.i4 12260
 	add
 	stloc.1
 	ldloc.0
@@ -4803,20 +4803,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::cyclic_array_free_10402a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::cyclic_array_free_10402b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010401b0: 0x10401b0: addu  v1, zero, zero
+// 0x010401c0: 0x10401c0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10401b4:
-// 0x010401b4: 0x10401b4: lw    ra, 44(sp)
-// 0x010401b8: 0x10401b8: addu  v0, v1, zero
+L_10401c4:
+// 0x010401c4: 0x10401c4: lw    ra, 44(sp)
+// 0x010401c8: 0x10401c8: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x010401bc: 0x10401bc: lw    s0, 40(sp)
+// 0x010401cc: 0x10401cc: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4825,7 +4825,7 @@ L_10401b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010401c0: 0x10401c0: jr    ra addiu sp, sp, 48
+// 0x010401d0: 0x10401d0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4837,7 +4837,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void device_event_info_init_10401c8(int32)
+.method public static void device_event_info_init_10401d8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 ra)
@@ -4854,7 +4854,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010401c8: 0x10401c8: sw    zero, 4(a0)
+// 0x010401d8: 0x10401d8: sw    zero, 4(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -4863,7 +4863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010401cc: 0x10401cc: jr    ra sw    zero, 0(a0)
+// 0x010401dc: 0x10401dc: jr    ra sw    zero, 0(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -4874,7 +4874,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 device_event_info_free_10401d4(int32,int32,int32,int32,int32)
+.method public static int32 device_event_info_free_10401e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4909,19 +4909,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010401d4: 0x10401d4: addiu sp, sp, -24
+// 0x010401e4: 0x10401e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010401d8: 0x10401d8: sw    ra, 20(sp)
-// 0x010401dc: 0x10401dc: jal   0x10401c8 sll   zero, zero, 0
+// 0x010401e8: 0x10401e8: sw    ra, 20(sp)
+// 0x010401ec: 0x10401ec: jal   0x10401d8 sll   zero, zero, 0
 	ldloc.1
-	call void Cibyl47::device_event_info_init_10401c8(int32)
+	call void Cibyl47::device_event_info_init_10401d8(int32)
 // --- basic block ---
-// 0x010401e4: 0x10401e4: lw    ra, 20(sp)
-// 0x010401e8: 0x10401e8: sll   zero, zero, 0
-// 0x010401ec: 0x10401ec: jr    ra addiu sp, sp, 24
+// 0x010401f4: 0x10401f4: lw    ra, 20(sp)
+// 0x010401f8: 0x10401f8: sll   zero, zero, 0
+// 0x010401fc: 0x10401fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4933,7 +4933,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 insert_first_item_10401f4(int32,int32,int32,int32,int32)
+.method public static int32 insert_first_item_1040204(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -4971,7 +4971,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010401f4: 0x10401f4: lw    v1, 12(a0)
+// 0x01040204: 0x1040204: lw    v1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4980,12 +4980,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010401f8: 0x10401f8: addiu sp, sp, -32
+// 0x01040208: 0x1040208: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010401fc: 0x10401fc: sw    s0, 24(sp)
+// 0x0104020c: 0x104020c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4994,20 +4994,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01040200: 0x1040200: sw    ra, 28(sp)
-// 0x01040204: 0x1040204: addu  s0, a0, zero
+// 0x01040210: 0x1040210: sw    ra, 28(sp)
+// 0x01040214: 0x1040214: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01040208: 0x1040208: bne   v1, zero, 0x1040244 addu  v0, zero, zero
+// 0x01040218: 0x1040218: bne   v1, zero, 0x1040254 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1040244
+	brtrue L_1040254
 // --- basic block ---
-// 0x01040210: 0x1040210: addiu v1, zero, 1
+// 0x01040220: 0x1040220: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01040214: 0x1040214: lw    a0, 36(a0)
+// 0x01040224: 0x1040224: lw    a0, 36(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5016,7 +5016,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040218: 0x1040218: lw    v0, 20(s0)
+// 0x01040228: 0x1040228: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5025,7 +5025,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104021c: 0x104021c: sw    v1, 12(s0)
+// 0x0104022c: 0x104022c: sw    v1, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5034,7 +5034,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01040220: 0x1040220: sw    a1, 16(sp)
+// 0x01040230: 0x1040230: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5043,7 +5043,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01040224: 0x1040224: jalr  v0 sw    zero, 8(s0)
+// 0x01040234: 0x1040234: jalr  v0 sw    zero, 8(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -5063,7 +5063,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104022c: 0x104022c: lw    v0, 28(s0)
+// 0x0104023c: 0x104023c: lw    v0, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5072,7 +5072,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040230: 0x1040230: lw    a0, 36(s0)
+// 0x01040240: 0x1040240: lw    a0, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5081,7 +5081,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040234: 0x1040234: lw    a1, 16(sp)
+// 0x01040244: 0x1040244: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5090,7 +5090,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01040238: 0x1040238: jalr  v0 sll   zero, zero, 0
+// 0x01040248: 0x1040248: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -5102,12 +5102,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01040240: 0x1040240: addiu v0, zero, 1
+// 0x01040250: 0x1040250: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1040244:
-// 0x01040244: 0x1040244: lw    ra, 28(sp)
-// 0x01040248: 0x1040248: lw    s0, 24(sp)
+L_1040254:
+// 0x01040254: 0x1040254: lw    ra, 28(sp)
+// 0x01040258: 0x1040258: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5116,7 +5116,7 @@ L_1040244:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104024c: 0x104024c: jr    ra addiu sp, sp, 32
+// 0x0104025c: 0x104025c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5128,7 +5128,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 cyclic_array_init_1040254(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_array_init_1040264(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -5163,10 +5163,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040254: 0x1040254: addiu v1, zero, -1
+// 0x01040264: 0x1040264: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01040258: 0x1040258: sw    v1, 8(a0)
+// 0x01040268: 0x1040268: sw    v1, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5175,7 +5175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104025c: 0x104025c: lw    v1, 20(sp)
+// 0x0104026c: 0x104026c: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5184,7 +5184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040260: 0x1040260: lw    v0, 16(sp)
+// 0x01040270: 0x1040270: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5193,7 +5193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01040264: 0x1040264: sw    v1, 20(a0)
+// 0x01040274: 0x1040274: sw    v1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5202,7 +5202,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01040268: 0x1040268: lw    v1, 24(sp)
+// 0x01040278: 0x1040278: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5211,14 +5211,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104026c: 0x104026c: sw    a2, 0(a0)
+// 0x0104027c: 0x104027c: sw    a2, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01040270: 0x1040270: sw    v1, 24(a0)
+// 0x01040280: 0x1040280: sw    v1, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5227,7 +5227,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01040274: 0x1040274: lw    v1, 28(sp)
+// 0x01040284: 0x1040284: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5236,7 +5236,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040278: 0x1040278: sw    a3, 4(a0)
+// 0x01040288: 0x1040288: sw    a3, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5245,7 +5245,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0104027c: 0x104027c: sw    v1, 28(a0)
+// 0x0104028c: 0x104028c: sw    v1, 28(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5254,7 +5254,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01040280: 0x1040280: lw    v1, 32(sp)
+// 0x01040290: 0x1040290: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5263,7 +5263,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040284: 0x1040284: sw    a1, 36(a0)
+// 0x01040294: 0x1040294: sw    a1, 36(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5272,7 +5272,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01040288: 0x1040288: sw    v1, 32(a0)
+// 0x01040298: 0x1040298: sw    v1, 32(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5281,7 +5281,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104028c: 0x104028c: bne   v0, zero, 0x104029c sw    zero, 12(a0)
+// 0x0104029c: 0x104029c: bne   v0, zero, 0x10402ac sw    zero, 12(a0)
 	ldloc 7
 	ldloc 5
 	ldloc.1
@@ -5291,18 +5291,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_104029c
+	brtrue L_10402ac
 // --- basic block ---
-// 0x01040294: 0x1040294: lui   v0, 0x10000
+// 0x010402a4: 0x10402a4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01040298: 0x1040298: addiu v0, v0, 18500
+// 0x010402a8: 0x10402a8: addiu v0, v0, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-L_104029c:
-// 0x0104029c: 0x104029c: jr    ra sw    v0, 16(a0)
+L_10402ac:
+// 0x010402ac: 0x10402ac: jr    ra sw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5318,7 +5318,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 cyclic_array_free_10402a4(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_array_free_10402b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s2,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra,int32 lo)
@@ -5365,12 +5365,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010402a4: 0x10402a4: addiu sp, sp, -32
+// 0x010402b4: 0x10402b4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010402a8: 0x10402a8: sw    s1, 20(sp)
+// 0x010402b8: 0x10402b8: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5379,7 +5379,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010402ac: 0x10402ac: sw    s0, 16(sp)
+// 0x010402bc: 0x10402bc: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5388,8 +5388,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010402b0: 0x10402b0: sw    ra, 28(sp)
-// 0x010402b4: 0x10402b4: sw    s2, 24(sp)
+// 0x010402c0: 0x10402c0: sw    ra, 28(sp)
+// 0x010402c4: 0x10402c4: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5398,16 +5398,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010402b8: 0x10402b8: addu  s0, a0, zero
+// 0x010402c8: 0x10402c8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010402bc: 0x10402bc: j	 0x1040324 addu  s1, zero, zero
+// 0x010402cc: 0x10402cc: j	 0x1040334 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1040324
+	br L_1040334
 // --- basic block ---
-L_10402c4:
-// 0x010402c4: 0x10402c4: lw    s2, 8(s0)
+L_10402d4:
+// 0x010402d4: 0x10402d4: lw    s2, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5416,7 +5416,7 @@ L_10402c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010402c8: 0x10402c8: lw    v0, 4(s0)
+// 0x010402d8: 0x10402d8: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5425,34 +5425,34 @@ L_10402c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010402cc: 0x10402cc: addu  s2, s1, s2
+// 0x010402dc: 0x10402dc: addu  s2, s1, s2
 	ldloc 10
 	ldloc 6
 	add
 	stloc 6
-// 0x010402d0: 0x10402d0: slt   v1, s2, v0
+// 0x010402e0: 0x10402e0: slt   v1, s2, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 9
-// 0x010402d4: 0x10402d4: bne   v1, zero, 0x10402e0 sll   zero, zero, 0
+// 0x010402e4: 0x10402e4: bne   v1, zero, 0x10402f0 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10402e0
+	brtrue L_10402f0
 // --- basic block ---
-// 0x010402dc: 0x10402dc: subu  s2, s2, v0
+// 0x010402ec: 0x10402ec: subu  s2, s2, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 6
-L_10402e0:
-// 0x010402e0: 0x10402e0: lw    v1, 0(s0)
+L_10402f0:
+// 0x010402f0: 0x10402f0: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010402e4: 0x10402e4: lw    a0, 36(s0)
+// 0x010402f4: 0x10402f4: lw    a0, 36(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5461,26 +5461,26 @@ L_10402e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010402e8: 0x10402e8: mult  s2, v1
+// 0x010402f8: 0x10402f8: mult  s2, v1
 	ldloc 6
 	ldloc 9
 	mul
 	stloc 12
-// 0x010402ec: 0x10402ec: nor   v0, zero, s2
+// 0x010402fc: 0x10402fc: nor   v0, zero, s2
 	ldloc 6
 	ldc.i4.m1
 	xor
 	stloc 5
-// 0x010402f0: 0x10402f0: sltu  v0, zero, v0
+// 0x01040300: 0x1040300: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010402f4: 0x10402f4: subu  v1, zero, v0
+// 0x01040304: 0x1040304: subu  v1, zero, v0
 	ldloc 5
 	neg
 	stloc 9
-// 0x010402f8: 0x10402f8: lw    v0, 24(s0)
+// 0x01040308: 0x1040308: lw    v0, 24(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5489,25 +5489,25 @@ L_10402e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010402fc: 0x10402fc: addiu s1, s1, 1
+// 0x0104030c: 0x104030c: addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01040300: 0x1040300: mflo  lo
+// 0x01040310: 0x1040310: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x01040304: 0x1040304: addu  s2, a0, s2
+// 0x01040314: 0x1040314: addu  s2, a0, s2
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01040308: 0x1040308: and   s2, s2, v1
+// 0x01040318: 0x1040318: and   s2, s2, v1
 	ldloc 6
 	ldloc 9
 	and
 	stloc 6
-// 0x0104030c: 0x104030c: jalr  v0 addu  a0, s2, zero
+// 0x0104031c: 0x104031c: jalr  v0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
@@ -5521,7 +5521,7 @@ L_10402e0:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01040314: 0x1040314: lw    v0, 20(s0)
+// 0x01040324: 0x1040324: lw    v0, 20(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5530,8 +5530,8 @@ L_10402e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040318: 0x1040318: sll   zero, zero, 0
-// 0x0104031c: 0x104031c: jalr  v0 addu  a0, s2, zero
+// 0x01040328: 0x1040328: sll   zero, zero, 0
+// 0x0104032c: 0x104032c: jalr  v0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
@@ -5545,8 +5545,8 @@ L_10402e0:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1040324:
-// 0x01040324: 0x1040324: lw    v0, 12(s0)
+L_1040334:
+// 0x01040334: 0x1040334: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5555,20 +5555,20 @@ L_1040324:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040328: 0x1040328: sll   zero, zero, 0
-// 0x0104032c: 0x104032c: slt   v0, s1, v0
+// 0x01040338: 0x1040338: sll   zero, zero, 0
+// 0x0104033c: 0x104033c: slt   v0, s1, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040330: 0x1040330: bne   v0, zero, 0x10402c4 addiu v0, zero, -1
+// 0x01040340: 0x1040340: bne   v0, zero, 0x10402d4 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_10402c4
+	brtrue L_10402d4
 // --- basic block ---
-// 0x01040338: 0x1040338: lw    ra, 28(sp)
-// 0x0104033c: 0x104033c: sw    v0, 8(s0)
+// 0x01040348: 0x1040348: lw    ra, 28(sp)
+// 0x0104034c: 0x104034c: sw    v0, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5577,7 +5577,7 @@ L_1040324:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01040340: 0x1040340: sw    zero, 12(s0)
+// 0x01040350: 0x1040350: sw    zero, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5586,7 +5586,7 @@ L_1040324:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01040344: 0x1040344: lw    s2, 24(sp)
+// 0x01040354: 0x1040354: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5595,7 +5595,7 @@ L_1040324:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040348: 0x1040348: lw    s1, 20(sp)
+// 0x01040358: 0x1040358: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5604,7 +5604,7 @@ L_1040324:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104034c: 0x104034c: lw    s0, 16(sp)
+// 0x0104035c: 0x104035c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5613,7 +5613,7 @@ L_1040324:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01040350: 0x1040350: jr    ra addiu sp, sp, 32
+// 0x01040360: 0x1040360: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5625,7 +5625,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 cyclic_array_size_1040358(int32)
+.method public static int32 cyclic_array_size_1040368(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5645,7 +5645,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040358: 0x1040358: lw    v0, 12(a0)
+// 0x01040368: 0x1040368: lw    v0, 12(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -5654,13 +5654,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104035c: 0x104035c: jr    ra sll   zero, zero, 0
+// 0x0104036c: 0x104036c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 cyclic_array_get_item_10403a8(int32,int32)
+.method public static int32 cyclic_array_get_item_10403b8(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 lo,int32 ra)
@@ -5689,11 +5689,11 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010403a8: 0x10403a8: bltz  a1, 0x10403e4 sll   zero, zero, 0
+// 0x010403b8: 0x10403b8: bltz  a1, 0x10403f4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10403e4
-// 0x010403b0: 0x10403b0: lw    v0, 12(a0)
+	blt L_10403f4
+// 0x010403c0: 0x10403c0: lw    v0, 12(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -5702,17 +5702,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010403b4: 0x10403b4: sll   zero, zero, 0
-// 0x010403b8: 0x10403b8: slt   v0, a1, v0
+// 0x010403c4: 0x10403c4: sll   zero, zero, 0
+// 0x010403c8: 0x10403c8: slt   v0, a1, v0
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.2
-// 0x010403bc: 0x10403bc: beq   v0, zero, 0x10403e4 sll   zero, zero, 0
+// 0x010403cc: 0x10403cc: beq   v0, zero, 0x10403f4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10403e4
+	brfalse L_10403f4
 // --- basic block ---
-// 0x010403c4: 0x10403c4: lw    v1, 8(a0)
+// 0x010403d4: 0x10403d4: lw    v1, 8(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -5721,7 +5721,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010403c8: 0x10403c8: lw    v0, 4(a0)
+// 0x010403d8: 0x10403d8: lw    v0, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -5730,50 +5730,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010403cc: 0x10403cc: addu  a1, a1, v1
+// 0x010403dc: 0x10403dc: addu  a1, a1, v1
 	ldloc.1
 	ldloc.3
 	add
 	stloc.1
-// 0x010403d0: 0x10403d0: slt   v1, a1, v0
+// 0x010403e0: 0x10403e0: slt   v1, a1, v0
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.3
-// 0x010403d4: 0x10403d4: bne   v1, zero, 0x10403e8 sll   zero, zero, 0
+// 0x010403e4: 0x10403e4: bne   v1, zero, 0x10403f8 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10403e8
+	brtrue L_10403f8
 // --- basic block ---
-// 0x010403dc: 0x10403dc: j	 0x10403e8 subu  a1, a1, v0
+// 0x010403ec: 0x10403ec: j	 0x10403f8 subu  a1, a1, v0
 	ldloc.1
 	ldloc.2
 	sub
 	stloc.1
-	br L_10403e8
+	br L_10403f8
 // --- basic block ---
-L_10403e4:
-// 0x010403e4: 0x10403e4: addiu a1, zero, -1
+L_10403f4:
+// 0x010403f4: 0x10403f4: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.1
-L_10403e8:
-// 0x010403e8: 0x10403e8: lw    v0, 0(a0)
+L_10403f8:
+// 0x010403f8: 0x10403f8: lw    v0, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010403ec: 0x10403ec: nor   v1, zero, a1
+// 0x010403fc: 0x10403fc: nor   v1, zero, a1
 	ldloc.1
 	ldc.i4.m1
 	xor
 	stloc.3
-// 0x010403f0: 0x10403f0: mult  a1, v0
+// 0x01040400: 0x1040400: mult  a1, v0
 	ldloc.1
 	ldloc.2
 	mul
 	stloc 5
-// 0x010403f4: 0x10403f4: lw    v0, 36(a0)
+// 0x01040404: 0x1040404: lw    v0, 36(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -5782,24 +5782,24 @@ L_10403e8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010403f8: 0x10403f8: sltu  v1, zero, v1
+// 0x01040408: 0x1040408: sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x010403fc: 0x10403fc: subu  v1, zero, v1
+// 0x0104040c: 0x104040c: subu  v1, zero, v1
 	ldloc.3
 	neg
 	stloc.3
-// 0x01040400: 0x1040400: mflo  lo
+// 0x01040410: 0x1040410: mflo  lo
 	ldloc 5
 	stloc.1
-// 0x01040404: 0x1040404: addu  v0, v0, a1
+// 0x01040414: 0x1040414: addu  v0, v0, a1
 	ldloc.2
 	ldloc.1
 	add
 	stloc.2
-// 0x01040408: 0x1040408: jr    ra and   v0, v0, v1
+// 0x01040418: 0x1040418: jr    ra and   v0, v0, v1
 	ldloc.2
 	ldloc.3
 	and
@@ -5811,7 +5811,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 cyclic_array_remove_item_1040510(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_array_remove_item_1040520(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s1,int32 s3,int32 lo,int32 ra)
@@ -5861,7 +5861,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040510: 0x1040510: lw    v0, 12(a0)
+// 0x01040520: 0x1040520: lw    v0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5870,12 +5870,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040514: 0x1040514: addiu sp, sp, -40
+// 0x01040524: 0x1040524: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01040518: 0x1040518: sw    s1, 24(sp)
+// 0x01040528: 0x1040528: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5884,8 +5884,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104051c: 0x104051c: sw    ra, 36(sp)
-// 0x01040520: 0x1040520: sw    s3, 32(sp)
+// 0x0104052c: 0x104052c: sw    ra, 36(sp)
+// 0x01040530: 0x1040530: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5894,7 +5894,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01040524: 0x1040524: sw    s2, 28(sp)
+// 0x01040534: 0x1040534: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5903,7 +5903,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01040528: 0x1040528: sw    s0, 20(sp)
+// 0x01040538: 0x1040538: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5912,30 +5912,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104052c: 0x104052c: beq   v0, zero, 0x10406cc addu  s1, a0, zero
+// 0x0104053c: 0x104053c: beq   v0, zero, 0x10406dc addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 10
-	brfalse L_10406cc
+	brfalse L_10406dc
 // --- basic block ---
-// 0x01040534: 0x1040534: bltz  a1, 0x10406cc slt   v1, a1, v0
+// 0x01040544: 0x1040544: bltz  a1, 0x10406dc slt   v1, a1, v0
 	ldloc.2
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 6
 	ldc.i4.s 0
-	blt L_10406cc
+	blt L_10406dc
 // --- basic block ---
-// 0x0104053c: 0x104053c: beq   v1, zero, 0x10406cc addiu v0, v0, -1
+// 0x0104054c: 0x104054c: beq   v1, zero, 0x10406dc addiu v0, v0, -1
 	ldloc 6
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-	brfalse L_10406cc
+	brfalse L_10406dc
 // --- basic block ---
-// 0x01040544: 0x1040544: lw    s3, 8(a0)
+// 0x01040554: 0x1040554: lw    s3, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5944,14 +5944,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01040548: 0x1040548: bltz  v0, 0x1040568 addiu s2, zero, -1
+// 0x01040558: 0x1040558: bltz  v0, 0x1040578 addiu s2, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 9
 	ldc.i4.s 0
-	blt L_1040568
+	blt L_1040578
 // --- basic block ---
-// 0x01040550: 0x1040550: lw    v1, 4(a0)
+// 0x01040560: 0x1040560: lw    v1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5960,27 +5960,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040554: 0x1040554: addu  s2, v0, s3
+// 0x01040564: 0x1040564: addu  s2, v0, s3
 	ldloc 5
 	ldloc 11
 	add
 	stloc 9
-// 0x01040558: 0x1040558: slt   v0, s2, v1
+// 0x01040568: 0x1040568: slt   v0, s2, v1
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 5
-// 0x0104055c: 0x104055c: bne   v0, zero, 0x1040568 sll   zero, zero, 0
+// 0x0104056c: 0x104056c: bne   v0, zero, 0x1040578 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1040568
+	brtrue L_1040578
 // --- basic block ---
-// 0x01040564: 0x1040564: subu  s2, s2, v1
+// 0x01040574: 0x1040574: subu  s2, s2, v1
 	ldloc 9
 	ldloc 6
 	sub
 	stloc 9
-L_1040568:
-// 0x01040568: 0x1040568: lw    v0, 4(s1)
+L_1040578:
+// 0x01040578: 0x1040578: lw    v0, 4(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5989,34 +5989,34 @@ L_1040568:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104056c: 0x104056c: addu  s0, a1, s3
+// 0x0104057c: 0x104057c: addu  s0, a1, s3
 	ldloc.2
 	ldloc 11
 	add
 	stloc 8
-// 0x01040570: 0x1040570: slt   v1, s0, v0
+// 0x01040580: 0x1040580: slt   v1, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 6
-// 0x01040574: 0x1040574: bne   v1, zero, 0x1040580 sll   zero, zero, 0
+// 0x01040584: 0x1040584: bne   v1, zero, 0x1040590 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1040580
+	brtrue L_1040590
 // --- basic block ---
-// 0x0104057c: 0x104057c: subu  s0, s0, v0
+// 0x0104058c: 0x104058c: subu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-L_1040580:
-// 0x01040580: 0x1040580: lw    v0, 0(s1)
+L_1040590:
+// 0x01040590: 0x1040590: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01040584: 0x1040584: lw    v1, 36(s1)
+// 0x01040594: 0x1040594: lw    v1, 36(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6025,26 +6025,26 @@ L_1040580:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040588: 0x1040588: mult  s0, v0
+// 0x01040598: 0x1040598: mult  s0, v0
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 12
-// 0x0104058c: 0x104058c: nor   a1, zero, s0
+// 0x0104059c: 0x104059c: nor   a1, zero, s0
 	ldloc 8
 	ldc.i4.m1
 	xor
 	stloc.2
-// 0x01040590: 0x1040590: sltu  a1, zero, a1
+// 0x010405a0: 0x10405a0: sltu  a1, zero, a1
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
-// 0x01040594: 0x1040594: subu  a1, zero, a1
+// 0x010405a4: 0x10405a4: subu  a1, zero, a1
 	ldloc.2
 	neg
 	stloc.2
-// 0x01040598: 0x1040598: lw    v0, 24(s1)
+// 0x010405a8: 0x10405a8: lw    v0, 24(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6053,15 +6053,15 @@ L_1040580:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104059c: 0x104059c: mflo  lo
+// 0x010405ac: 0x10405ac: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x010405a0: 0x10405a0: addu  v1, v1, a0
+// 0x010405b0: 0x10405b0: addu  v1, v1, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-// 0x010405a4: 0x10405a4: jalr  v0 and   a0, v1, a1
+// 0x010405b4: 0x10405b4: jalr  v0 and   a0, v1, a1
 	ldloc 5
 	ldloc 6
 	ldloc.2
@@ -6077,44 +6077,44 @@ L_1040580:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010405ac: 0x10405ac: slt   v0, s3, s2
+// 0x010405bc: 0x10405bc: slt   v0, s3, s2
 	ldloc 11
 	ldloc 9
 	clt
 	stloc 5
-// 0x010405b0: 0x10405b0: bne   v0, zero, 0x1040624 nor   v1, zero, s0
+// 0x010405c0: 0x10405c0: bne   v0, zero, 0x1040634 nor   v1, zero, s0
 	ldloc 5
 	ldloc 8
 	ldc.i4.m1
 	xor
 	stloc 6
-	brtrue L_1040624
+	brtrue L_1040634
 // --- basic block ---
-// 0x010405b8: 0x10405b8: slt   v0, s0, s3
+// 0x010405c8: 0x10405c8: slt   v0, s0, s3
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-// 0x010405bc: 0x10405bc: beq   v0, zero, 0x1040624 sll   zero, zero, 0
+// 0x010405cc: 0x10405cc: beq   v0, zero, 0x1040634 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1040624
+	brfalse L_1040634
 // --- basic block ---
-// 0x010405c4: 0x10405c4: j	 0x10406ac sltu  v1, zero, v1
+// 0x010405d4: 0x10405d4: j	 0x10406bc sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-	br L_10406ac
+	br L_10406bc
 // --- basic block ---
-L_10405cc:
-// 0x010405cc: 0x10405cc: lw    s2, 0(s1)
+L_10405dc:
+// 0x010405dc: 0x10405dc: lw    s2, 0(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010405d0: 0x10405d0: lw    v0, 36(s1)
+// 0x010405e0: 0x10405e0: lw    v0, 36(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6123,65 +6123,65 @@ L_10405cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010405d4: 0x10405d4: mult  s0, s2
+// 0x010405e4: 0x10405e4: mult  s0, s2
 	ldloc 8
 	ldloc 9
 	mul
 	stloc 12
-// 0x010405d8: 0x10405d8: addiu s0, s0, -1
+// 0x010405e8: 0x10405e8: addiu s0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x010405dc: 0x10405dc: nor   a1, zero, s0
+// 0x010405ec: 0x10405ec: nor   a1, zero, s0
 	ldloc 8
 	ldc.i4.m1
 	xor
 	stloc.2
-// 0x010405e0: 0x10405e0: addu  a2, s2, zero
+// 0x010405f0: 0x10405f0: addu  a2, s2, zero
 	ldloc 9
 	stloc.3
-// 0x010405e4: 0x10405e4: sltu  a1, zero, a1
+// 0x010405f4: 0x10405f4: sltu  a1, zero, a1
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
-// 0x010405e8: 0x10405e8: subu  a1, zero, a1
+// 0x010405f8: 0x10405f8: subu  a1, zero, a1
 	ldloc.2
 	neg
 	stloc.2
-// 0x010405ec: 0x10405ec: mflo  lo
+// 0x010405fc: 0x10405fc: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x010405f0: 0x10405f0: addu  a0, a0, v0
+// 0x01040600: 0x1040600: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x010405f4: 0x10405f4: and   a0, a0, v1
+// 0x01040604: 0x1040604: and   a0, a0, v1
 	ldloc.1
 	ldloc 6
 	and
 	stloc.1
-// 0x010405f8: 0x10405f8: mult  s0, s2
+// 0x01040608: 0x1040608: mult  s0, s2
 	ldloc 8
 	ldloc 9
 	mul
 	stloc 12
-// 0x010405fc: 0x10405fc: mflo  lo
+// 0x0104060c: 0x104060c: mflo  lo
 	ldloc 12
 	stloc 9
-// 0x01040600: 0x1040600: addu  s2, s2, v0
+// 0x01040610: 0x1040610: addu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x01040604: 0x1040604: and   s2, s2, a1
+// 0x01040614: 0x1040614: and   s2, s2, a1
 	ldloc 9
 	ldloc.2
 	and
 	stloc 9
-// 0x01040608: 0x1040608: jal   0x1001800 addu  a1, s2, zero
+// 0x01040618: 0x1040618: jal   0x1001800 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -6193,7 +6193,7 @@ L_10405cc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01040610: 0x1040610: lw    v0, 20(s1)
+// 0x01040620: 0x1040620: lw    v0, 20(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6202,8 +6202,8 @@ L_10405cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040614: 0x1040614: sll   zero, zero, 0
-// 0x01040618: 0x1040618: jalr  v0 addu  a0, s2, zero
+// 0x01040624: 0x1040624: sll   zero, zero, 0
+// 0x01040628: 0x1040628: jalr  v0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -6217,30 +6217,30 @@ L_10405cc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01040620: 0x1040620: nor   v1, zero, s0
+// 0x01040630: 0x1040630: nor   v1, zero, s0
 	ldloc 8
 	ldc.i4.m1
 	xor
 	stloc 6
-L_1040624:
-// 0x01040624: 0x1040624: sltu  v1, zero, v1
+L_1040634:
+// 0x01040634: 0x1040634: sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x01040628: 0x1040628: slt   v0, s3, s0
+// 0x01040638: 0x1040638: slt   v0, s3, s0
 	ldloc 11
 	ldloc 8
 	clt
 	stloc 5
-// 0x0104062c: 0x104062c: bne   v0, zero, 0x10405cc subu  v1, zero, v1
+// 0x0104063c: 0x104063c: bne   v0, zero, 0x10405dc subu  v1, zero, v1
 	ldloc 5
 	ldloc 6
 	neg
 	stloc 6
-	brtrue L_10405cc
+	brtrue L_10405dc
 // --- basic block ---
-// 0x01040634: 0x1040634: lw    v0, 8(s1)
+// 0x01040644: 0x1040644: lw    v0, 8(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6249,7 +6249,7 @@ L_1040624:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040638: 0x1040638: lw    v1, 4(s1)
+// 0x01040648: 0x1040648: lw    v1, 4(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6258,12 +6258,12 @@ L_1040624:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104063c: 0x104063c: addiu v0, v0, 1
+// 0x0104064c: 0x104064c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01040640: 0x1040640: bne   v1, v0, 0x10406b8 sw    v0, 8(s1)
+// 0x01040650: 0x1040650: bne   v1, v0, 0x10406c8 sw    v0, 8(s1)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -6274,9 +6274,9 @@ L_1040624:
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_10406b8
+	bne.un L_10406c8
 // --- basic block ---
-// 0x01040648: 0x1040648: j	 0x10406b8 sw    zero, 8(s1)
+// 0x01040658: 0x1040658: j	 0x10406c8 sw    zero, 8(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6285,17 +6285,17 @@ L_1040624:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10406b8
+	br L_10406c8
 // --- basic block ---
-L_1040650:
-// 0x01040650: 0x1040650: lw    s3, 0(s1)
+L_1040660:
+// 0x01040660: 0x1040660: lw    s3, 0(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01040654: 0x1040654: lw    v0, 36(s1)
+// 0x01040664: 0x1040664: lw    v0, 36(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6304,65 +6304,65 @@ L_1040650:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040658: 0x1040658: mult  s0, s3
+// 0x01040668: 0x1040668: mult  s0, s3
 	ldloc 8
 	ldloc 11
 	mul
 	stloc 12
-// 0x0104065c: 0x104065c: addiu s0, s0, 1
+// 0x0104066c: 0x104066c: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01040660: 0x1040660: nor   a1, zero, s0
+// 0x01040670: 0x1040670: nor   a1, zero, s0
 	ldloc 8
 	ldc.i4.m1
 	xor
 	stloc.2
-// 0x01040664: 0x1040664: addu  a2, s3, zero
+// 0x01040674: 0x1040674: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01040668: 0x1040668: sltu  a1, zero, a1
+// 0x01040678: 0x1040678: sltu  a1, zero, a1
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
-// 0x0104066c: 0x104066c: subu  a1, zero, a1
+// 0x0104067c: 0x104067c: subu  a1, zero, a1
 	ldloc.2
 	neg
 	stloc.2
-// 0x01040670: 0x1040670: mflo  lo
+// 0x01040680: 0x1040680: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x01040674: 0x1040674: addu  a0, a0, v0
+// 0x01040684: 0x1040684: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x01040678: 0x1040678: and   a0, a0, v1
+// 0x01040688: 0x1040688: and   a0, a0, v1
 	ldloc.1
 	ldloc 6
 	and
 	stloc.1
-// 0x0104067c: 0x104067c: mult  s0, s3
+// 0x0104068c: 0x104068c: mult  s0, s3
 	ldloc 8
 	ldloc 11
 	mul
 	stloc 12
-// 0x01040680: 0x1040680: mflo  lo
+// 0x01040690: 0x1040690: mflo  lo
 	ldloc 12
 	stloc 11
-// 0x01040684: 0x1040684: addu  s3, s3, v0
+// 0x01040694: 0x1040694: addu  s3, s3, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x01040688: 0x1040688: and   s3, s3, a1
+// 0x01040698: 0x1040698: and   s3, s3, a1
 	ldloc 11
 	ldloc.2
 	and
 	stloc 11
-// 0x0104068c: 0x104068c: jal   0x1001800 addu  a1, s3, zero
+// 0x0104069c: 0x104069c: jal   0x1001800 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -6374,7 +6374,7 @@ L_1040650:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01040694: 0x1040694: lw    v0, 20(s1)
+// 0x010406a4: 0x10406a4: lw    v0, 20(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6383,8 +6383,8 @@ L_1040650:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040698: 0x1040698: sll   zero, zero, 0
-// 0x0104069c: 0x104069c: jalr  v0 addu  a0, s3, zero
+// 0x010406a8: 0x10406a8: sll   zero, zero, 0
+// 0x010406ac: 0x10406ac: jalr  v0 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
@@ -6398,31 +6398,31 @@ L_1040650:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010406a4: 0x10406a4: nor   v1, zero, s0
+// 0x010406b4: 0x10406b4: nor   v1, zero, s0
 	ldloc 8
 	ldc.i4.m1
 	xor
 	stloc 6
-// 0x010406a8: 0x10406a8: sltu  v1, zero, v1
+// 0x010406b8: 0x10406b8: sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-L_10406ac:
-// 0x010406ac: 0x10406ac: slt   v0, s0, s2
+L_10406bc:
+// 0x010406bc: 0x10406bc: slt   v0, s0, s2
 	ldloc 8
 	ldloc 9
 	clt
 	stloc 5
-// 0x010406b0: 0x10406b0: bne   v0, zero, 0x1040650 subu  v1, zero, v1
+// 0x010406c0: 0x10406c0: bne   v0, zero, 0x1040660 subu  v1, zero, v1
 	ldloc 5
 	ldloc 6
 	neg
 	stloc 6
-	brtrue L_1040650
+	brtrue L_1040660
 // --- basic block ---
-L_10406b8:
-// 0x010406b8: 0x10406b8: lw    v1, 12(s1)
+L_10406c8:
+// 0x010406c8: 0x10406c8: lw    v1, 12(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6431,15 +6431,15 @@ L_10406b8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010406bc: 0x10406bc: addiu v0, zero, 1
+// 0x010406cc: 0x10406cc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010406c0: 0x10406c0: addiu v1, v1, -1
+// 0x010406d0: 0x10406d0: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010406c4: 0x10406c4: j	 0x10406d0 sw    v1, 12(s1)
+// 0x010406d4: 0x10406d4: j	 0x10406e0 sw    v1, 12(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6448,15 +6448,15 @@ L_10406b8:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10406d0
+	br L_10406e0
 // --- basic block ---
-L_10406cc:
-// 0x010406cc: 0x10406cc: addu  v0, zero, zero
+L_10406dc:
+// 0x010406dc: 0x10406dc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10406d0:
-// 0x010406d0: 0x10406d0: lw    ra, 36(sp)
-// 0x010406d4: 0x10406d4: lw    s3, 32(sp)
+L_10406e0:
+// 0x010406e0: 0x10406e0: lw    ra, 36(sp)
+// 0x010406e4: 0x10406e4: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6465,7 +6465,7 @@ L_10406d0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010406d8: 0x10406d8: lw    s2, 28(sp)
+// 0x010406e8: 0x10406e8: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6474,7 +6474,7 @@ L_10406d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010406dc: 0x10406dc: lw    s1, 24(sp)
+// 0x010406ec: 0x10406ec: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6483,7 +6483,7 @@ L_10406d0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010406e0: 0x10406e0: lw    s0, 20(sp)
+// 0x010406f0: 0x10406f0: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6492,7 +6492,7 @@ L_10406d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010406e4: 0x10406e4: jr    ra addiu sp, sp, 40
+// 0x010406f4: 0x10406f4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6504,7 +6504,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 cyclic_array_remove_same_item_10406ec(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_array_remove_same_item_10406fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra,int32 lo)
@@ -6551,12 +6551,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010406ec: 0x10406ec: addiu sp, sp, -32
+// 0x010406fc: 0x10406fc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010406f0: 0x10406f0: sw    s2, 24(sp)
+// 0x01040700: 0x1040700: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6565,7 +6565,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010406f4: 0x10406f4: sw    s1, 20(sp)
+// 0x01040704: 0x1040704: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6574,7 +6574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010406f8: 0x10406f8: sw    s0, 16(sp)
+// 0x01040708: 0x1040708: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6583,20 +6583,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010406fc: 0x10406fc: sw    ra, 28(sp)
-// 0x01040700: 0x1040700: addu  s0, a0, zero
+// 0x0104070c: 0x104070c: sw    ra, 28(sp)
+// 0x01040710: 0x1040710: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01040704: 0x1040704: addu  s2, a1, zero
+// 0x01040714: 0x1040714: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01040708: 0x1040708: j	 0x1040778 addu  s1, zero, zero
+// 0x01040718: 0x1040718: j	 0x1040788 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_1040778
+	br L_1040788
 // --- basic block ---
-L_1040710:
-// 0x01040710: 0x1040710: lw    v1, 8(s0)
+L_1040720:
+// 0x01040720: 0x1040720: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6605,7 +6605,7 @@ L_1040710:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01040714: 0x1040714: lw    v0, 4(s0)
+// 0x01040724: 0x1040724: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6614,44 +6614,44 @@ L_1040710:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040718: 0x1040718: addu  v1, s1, v1
+// 0x01040728: 0x1040728: addu  v1, s1, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x0104071c: 0x104071c: slt   a1, v1, v0
+// 0x0104072c: 0x104072c: slt   a1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc.2
-// 0x01040720: 0x1040720: bne   a1, zero, 0x104072c sll   zero, zero, 0
+// 0x01040730: 0x1040730: bne   a1, zero, 0x104073c sll   zero, zero, 0
 	ldloc.2
-	brtrue L_104072c
+	brtrue L_104073c
 // --- basic block ---
-// 0x01040728: 0x1040728: subu  v1, v1, v0
+// 0x01040738: 0x1040738: subu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 7
-L_104072c:
-// 0x0104072c: 0x104072c: lw    a1, 0(s0)
+L_104073c:
+// 0x0104073c: 0x104073c: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01040730: 0x1040730: nor   v0, zero, v1
+// 0x01040740: 0x1040740: nor   v0, zero, v1
 	ldloc 7
 	ldc.i4.m1
 	xor
 	stloc 5
-// 0x01040734: 0x1040734: mult  v1, a1
+// 0x01040744: 0x1040744: mult  v1, a1
 	ldloc 7
 	ldloc.2
 	mul
 	stloc 12
-// 0x01040738: 0x1040738: lw    a1, 36(s0)
+// 0x01040748: 0x1040748: lw    a1, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6660,16 +6660,16 @@ L_104072c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104073c: 0x104073c: sltu  v0, zero, v0
+// 0x0104074c: 0x104074c: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01040740: 0x1040740: subu  a2, zero, v0
+// 0x01040750: 0x1040750: subu  a2, zero, v0
 	ldloc 5
 	neg
 	stloc.3
-// 0x01040744: 0x1040744: lw    v0, 32(s0)
+// 0x01040754: 0x1040754: lw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6678,15 +6678,15 @@ L_104072c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040748: 0x1040748: mflo  lo
+// 0x01040758: 0x1040758: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x0104074c: 0x104074c: addu  a1, a1, v1
+// 0x0104075c: 0x104075c: addu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc.2
-// 0x01040750: 0x1040750: jalr  v0 and   a1, a1, a2
+// 0x01040760: 0x1040760: jalr  v0 and   a1, a1, a2
 	ldloc 5
 	ldloc.2
 	ldloc.3
@@ -6702,23 +6702,23 @@ L_104072c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040758: 0x1040758: beq   v0, zero, 0x1040778 addiu s1, s1, 1
+// 0x01040768: 0x1040768: beq   v0, zero, 0x1040788 addiu s1, s1, 1
 	ldloc 5
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brfalse L_1040778
+	brfalse L_1040788
 // --- basic block ---
-// 0x01040760: 0x1040760: addiu s1, s1, -1
+// 0x01040770: 0x1040770: addiu s1, s1, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x01040764: 0x1040764: addu  a0, s0, zero
+// 0x01040774: 0x1040774: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01040768: 0x1040768: jal   0x1040510 addu  a1, s1, zero
+// 0x01040778: 0x1040778: jal   0x1040520 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6726,16 +6726,16 @@ L_104072c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::cyclic_array_remove_item_1040510(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::cyclic_array_remove_item_1040520(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040770: 0x1040770: j	 0x104078c sll   zero, zero, 0
-	br L_104078c
+// 0x01040780: 0x1040780: j	 0x104079c sll   zero, zero, 0
+	br L_104079c
 // --- basic block ---
-L_1040778:
-// 0x01040778: 0x1040778: lw    v0, 12(s0)
+L_1040788:
+// 0x01040788: 0x1040788: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6744,21 +6744,21 @@ L_1040778:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104077c: 0x104077c: sll   zero, zero, 0
-// 0x01040780: 0x1040780: slt   v0, s1, v0
+// 0x0104078c: 0x104078c: sll   zero, zero, 0
+// 0x01040790: 0x1040790: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040784: 0x1040784: bne   v0, zero, 0x1040710 addu  a0, s2, zero
+// 0x01040794: 0x1040794: bne   v0, zero, 0x1040720 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_1040710
+	brtrue L_1040720
 // --- basic block ---
-L_104078c:
-// 0x0104078c: 0x104078c: lw    ra, 28(sp)
-// 0x01040790: 0x1040790: lw    s2, 24(sp)
+L_104079c:
+// 0x0104079c: 0x104079c: lw    ra, 28(sp)
+// 0x010407a0: 0x10407a0: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6767,7 +6767,7 @@ L_104078c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01040794: 0x1040794: lw    s1, 20(sp)
+// 0x010407a4: 0x10407a4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6776,7 +6776,7 @@ L_104078c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01040798: 0x1040798: lw    s0, 16(sp)
+// 0x010407a8: 0x10407a8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6785,7 +6785,7 @@ L_104078c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104079c: 0x104079c: jr    ra addiu sp, sp, 32
+// 0x010407ac: 0x10407ac: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6797,7 +6797,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 cyclic_array_push_last_1040940(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_array_push_last_1040950(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s2,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra,int32 lo)
@@ -6844,7 +6844,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040940: 0x1040940: lw    v0, 12(a0)
+// 0x01040950: 0x1040950: lw    v0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6853,7 +6853,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040944: 0x1040944: lw    v1, 4(a0)
+// 0x01040954: 0x1040954: lw    v1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6862,12 +6862,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01040948: 0x1040948: addiu sp, sp, -40
+// 0x01040958: 0x1040958: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104094c: 0x104094c: sw    s1, 28(sp)
+// 0x0104095c: 0x104095c: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6876,7 +6876,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01040950: 0x1040950: sw    s0, 24(sp)
+// 0x01040960: 0x1040960: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6885,8 +6885,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01040954: 0x1040954: sw    ra, 36(sp)
-// 0x01040958: 0x1040958: sw    s2, 32(sp)
+// 0x01040964: 0x1040964: sw    ra, 36(sp)
+// 0x01040968: 0x1040968: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6895,17 +6895,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104095c: 0x104095c: addu  s0, a0, zero
+// 0x0104096c: 0x104096c: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01040960: 0x1040960: bne   v1, v0, 0x1040994 addu  s1, a1, zero
+// 0x01040970: 0x1040970: bne   v1, v0, 0x10409a4 addu  s1, a1, zero
 	ldloc 8
 	ldloc 5
 	ldloc.2
 	stloc 10
-	bne.un L_1040994
+	bne.un L_10409a4
 // --- basic block ---
-// 0x01040968: 0x1040968: lw    v0, 16(a0)
+// 0x01040978: 0x1040978: lw    v0, 16(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6914,29 +6914,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104096c: 0x104096c: lui   a1, 0x10000
+// 0x0104097c: 0x104097c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01040970: 0x1040970: lui   a3, 0x10000
+// 0x01040980: 0x1040980: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01040974: 0x1040974: addiu a1, a1, -3688
+// 0x01040984: 0x1040984: addiu a1, a1, -3692
 	ldloc.2
-	ldc.i4 -3688
+	ldc.i4 -3692
 	add
 	stloc.2
-// 0x01040978: 0x1040978: addiu a3, a3, -3652
+// 0x01040988: 0x1040988: addiu a3, a3, -3656
 	ldloc 4
-	ldc.i4 -3652
+	ldc.i4 -3656
 	add
 	stloc 4
-// 0x0104097c: 0x104097c: addiu a0, zero, 3
+// 0x0104098c: 0x104098c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01040980: 0x1040980: addiu a2, zero, 232
+// 0x01040990: 0x1040990: addiu a2, zero, 232
 	ldc.i4 232
 	stloc.3
-// 0x01040984: 0x1040984: jal   0x100449c sw    v0, 16(sp)
+// 0x01040994: 0x1040994: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6955,37 +6955,37 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104098c: 0x104098c: j	 0x1040a1c addu  v0, zero, zero
+// 0x0104099c: 0x104099c: j	 0x1040a2c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1040a1c
+	br L_1040a2c
 // --- basic block ---
-L_1040994:
-// 0x01040994: 0x1040994: bne   v0, zero, 0x10409ac sll   zero, zero, 0
+L_10409a4:
+// 0x010409a4: 0x10409a4: bne   v0, zero, 0x10409bc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10409ac
+	brtrue L_10409bc
 // --- basic block ---
-// 0x0104099c: 0x104099c: jal   0x10401f4 sll   zero, zero, 0
+// 0x010409ac: 0x10409ac: jal   0x1040204 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::insert_first_item_10401f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::insert_first_item_1040204(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010409a4: 0x10409a4: j	 0x1040a1c sll   zero, zero, 0
-	br L_1040a1c
+// 0x010409b4: 0x10409b4: j	 0x1040a2c sll   zero, zero, 0
+	br L_1040a2c
 // --- basic block ---
-L_10409ac:
-// 0x010409ac: 0x10409ac: addiu a0, v0, 1
+L_10409bc:
+// 0x010409bc: 0x10409bc: addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010409b0: 0x10409b0: sw    a0, 12(s0)
+// 0x010409c0: 0x10409c0: sw    a0, 12(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6994,14 +6994,14 @@ L_10409ac:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010409b4: 0x10409b4: bltz  v0, 0x10409d8 addiu s2, zero, -1
+// 0x010409c4: 0x10409c4: bltz  v0, 0x10409e8 addiu s2, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
 	ldc.i4.s 0
-	blt L_10409d8
+	blt L_10409e8
 // --- basic block ---
-// 0x010409bc: 0x10409bc: lw    s2, 8(s0)
+// 0x010409cc: 0x10409cc: lw    s2, 8(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7010,35 +7010,35 @@ L_10409ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010409c0: 0x10409c0: sll   zero, zero, 0
-// 0x010409c4: 0x10409c4: addu  s2, v0, s2
+// 0x010409d0: 0x10409d0: sll   zero, zero, 0
+// 0x010409d4: 0x10409d4: addu  s2, v0, s2
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x010409c8: 0x10409c8: slt   v0, s2, v1
+// 0x010409d8: 0x10409d8: slt   v0, s2, v1
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 5
-// 0x010409cc: 0x10409cc: bne   v0, zero, 0x10409d8 sll   zero, zero, 0
+// 0x010409dc: 0x10409dc: bne   v0, zero, 0x10409e8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10409d8
+	brtrue L_10409e8
 // --- basic block ---
-// 0x010409d4: 0x10409d4: subu  s2, s2, v1
+// 0x010409e4: 0x10409e4: subu  s2, s2, v1
 	ldloc 6
 	ldloc 8
 	sub
 	stloc 6
-L_10409d8:
-// 0x010409d8: 0x10409d8: lw    v1, 0(s0)
+L_10409e8:
+// 0x010409e8: 0x10409e8: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010409dc: 0x10409dc: lw    a0, 36(s0)
+// 0x010409ec: 0x10409ec: lw    a0, 36(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7047,26 +7047,26 @@ L_10409d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010409e0: 0x10409e0: mult  s2, v1
+// 0x010409f0: 0x10409f0: mult  s2, v1
 	ldloc 6
 	ldloc 8
 	mul
 	stloc 12
-// 0x010409e4: 0x10409e4: nor   v0, zero, s2
+// 0x010409f4: 0x10409f4: nor   v0, zero, s2
 	ldloc 6
 	ldc.i4.m1
 	xor
 	stloc 5
-// 0x010409e8: 0x10409e8: sltu  v0, zero, v0
+// 0x010409f8: 0x10409f8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010409ec: 0x10409ec: subu  v1, zero, v0
+// 0x010409fc: 0x10409fc: subu  v1, zero, v0
 	ldloc 5
 	neg
 	stloc 8
-// 0x010409f0: 0x10409f0: lw    v0, 20(s0)
+// 0x01040a00: 0x1040a00: lw    v0, 20(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7075,20 +7075,20 @@ L_10409d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010409f4: 0x10409f4: mflo  lo
+// 0x01040a04: 0x1040a04: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x010409f8: 0x10409f8: addu  s2, a0, s2
+// 0x01040a08: 0x1040a08: addu  s2, a0, s2
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x010409fc: 0x10409fc: and   s2, s2, v1
+// 0x01040a0c: 0x1040a0c: and   s2, s2, v1
 	ldloc 6
 	ldloc 8
 	and
 	stloc 6
-// 0x01040a00: 0x1040a00: jalr  v0 addu  a0, s2, zero
+// 0x01040a10: 0x1040a10: jalr  v0 addu  a0, s2, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
@@ -7102,7 +7102,7 @@ L_10409d8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01040a08: 0x1040a08: lw    v0, 28(s0)
+// 0x01040a18: 0x1040a18: lw    v0, 28(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7111,10 +7111,10 @@ L_10409d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040a0c: 0x1040a0c: addu  a0, s2, zero
+// 0x01040a1c: 0x1040a1c: addu  a0, s2, zero
 	ldloc 6
 	stloc.1
-// 0x01040a10: 0x1040a10: jalr  v0 addu  a1, s1, zero
+// 0x01040a20: 0x1040a20: jalr  v0 addu  a1, s1, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
@@ -7128,12 +7128,12 @@ L_10409d8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01040a18: 0x1040a18: addiu v0, zero, 1
+// 0x01040a28: 0x1040a28: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1040a1c:
-// 0x01040a1c: 0x1040a1c: lw    ra, 36(sp)
-// 0x01040a20: 0x1040a20: lw    s2, 32(sp)
+L_1040a2c:
+// 0x01040a2c: 0x1040a2c: lw    ra, 36(sp)
+// 0x01040a30: 0x1040a30: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7142,7 +7142,7 @@ L_1040a1c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01040a24: 0x1040a24: lw    s1, 28(sp)
+// 0x01040a34: 0x1040a34: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7151,7 +7151,7 @@ L_1040a1c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01040a28: 0x1040a28: lw    s0, 24(sp)
+// 0x01040a38: 0x1040a38: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7160,7 +7160,7 @@ L_1040a1c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01040a2c: 0x1040a2c: jr    ra addiu sp, sp, 40
+// 0x01040a3c: 0x1040a3c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -7172,7 +7172,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_city_write_int_1040b3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_write_int_1040b4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -7207,13 +7207,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040b3c: 0x1040b3c: addiu sp, sp, -24
+// 0x01040b4c: 0x1040b4c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01040b40: 0x1040b40: sw    ra, 20(sp)
-// 0x01040b44: 0x1040b44: beq   a2, zero, 0x1040b7c sw    a1, 28(sp)
+// 0x01040b50: 0x1040b50: sw    ra, 20(sp)
+// 0x01040b54: 0x1040b54: beq   a2, zero, 0x1040b8c sw    a1, 28(sp)
 	ldloc.3
 	ldloc 6
 	ldloc.0
@@ -7223,68 +7223,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_1040b7c
+	brfalse L_1040b8c
 // --- basic block ---
-// 0x01040b4c: 0x1040b4c: addiu v0, sp, 28
+// 0x01040b5c: 0x1040b5c: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x01040b50: 0x1040b50: lbu   a3, 28(sp)
+// 0x01040b60: 0x1040b60: lbu   a3, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 4
-// 0x01040b54: 0x1040b54: lbu   a2, 3(v0)
+// 0x01040b64: 0x1040b64: lbu   a2, 3(v0)
 	ldloc 5
 	ldc.i4.3
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x01040b58: 0x1040b58: lbu   a1, 1(v0)
+// 0x01040b68: 0x1040b68: lbu   a1, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.2
-// 0x01040b5c: 0x1040b5c: lbu   v1, 2(v0)
+// 0x01040b6c: 0x1040b6c: lbu   v1, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x01040b60: 0x1040b60: sll   v0, a3, 24
+// 0x01040b70: 0x1040b70: sll   v0, a3, 24
 	ldloc 4
 	ldc.i4.s 24
 	shl
 	stloc 5
-// 0x01040b64: 0x1040b64: or    v0, a2, v0
+// 0x01040b74: 0x1040b74: or    v0, a2, v0
 	ldloc.3
 	ldloc 5
 	or
 	stloc 5
-// 0x01040b68: 0x1040b68: sll   a1, a1, 16
+// 0x01040b78: 0x1040b78: sll   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x01040b6c: 0x1040b6c: or    v0, v0, a1
+// 0x01040b7c: 0x1040b7c: or    v0, v0, a1
 	ldloc 5
 	ldloc.2
 	or
 	stloc 5
-// 0x01040b70: 0x1040b70: sll   v1, v1, 8
+// 0x01040b80: 0x1040b80: sll   v1, v1, 8
 	ldloc 7
 	ldc.i4.8
 	shl
 	stloc 7
-// 0x01040b74: 0x1040b74: or    v0, v0, v1
+// 0x01040b84: 0x1040b84: or    v0, v0, v1
 	ldloc 5
 	ldloc 7
 	or
 	stloc 5
-// 0x01040b78: 0x1040b78: sw    v0, 28(sp)
+// 0x01040b88: 0x1040b88: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7293,13 +7293,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_1040b7c:
-// 0x01040b7c: 0x1040b7c: addiu a1, sp, 28
+L_1040b8c:
+// 0x01040b8c: 0x1040b8c: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x01040b80: 0x1040b80: jal   0x104d46c addiu a2, zero, 4
+// 0x01040b90: 0x1040b90: jal   0x104d47c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -7307,14 +7307,14 @@ L_1040b7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040b88: 0x1040b88: lw    ra, 20(sp)
-// 0x01040b8c: 0x1040b8c: sll   zero, zero, 0
-// 0x01040b90: 0x1040b90: jr    ra addiu sp, sp, 24
+// 0x01040b98: 0x1040b98: lw    ra, 20(sp)
+// 0x01040b9c: 0x1040b9c: sll   zero, zero, 0
+// 0x01040ba0: 0x1040ba0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7326,7 +7326,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_city_next_1040bc4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_next_1040bd4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 ra)
@@ -7373,19 +7373,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040bc4: 0x1040bc4: lw    v0, 0(a1)
+// 0x01040bd4: 0x1040bd4: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01040bc8: 0x1040bc8: addiu sp, sp, -40
+// 0x01040bd8: 0x1040bd8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01040bcc: 0x1040bcc: sw    s3, 32(sp)
+// 0x01040bdc: 0x1040bdc: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7394,7 +7394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01040bd0: 0x1040bd0: sw    s1, 24(sp)
+// 0x01040be0: 0x1040be0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7403,8 +7403,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01040bd4: 0x1040bd4: sw    ra, 36(sp)
-// 0x01040bd8: 0x1040bd8: sw    s2, 28(sp)
+// 0x01040be4: 0x1040be4: sw    ra, 36(sp)
+// 0x01040be8: 0x1040be8: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7413,7 +7413,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01040bdc: 0x1040bdc: sw    s0, 20(sp)
+// 0x01040bec: 0x1040bec: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7422,16 +7422,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01040be0: 0x1040be0: addu  s1, a1, zero
+// 0x01040bf0: 0x1040bf0: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01040be4: 0x1040be4: beq   v0, zero, 0x1040ca0 addu  s3, a0, zero
+// 0x01040bf4: 0x1040bf4: beq   v0, zero, 0x1040cb0 addu  s3, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 10
-	brfalse L_1040ca0
+	brfalse L_1040cb0
 // --- basic block ---
-// 0x01040bec: 0x1040bec: lw    s0, 16(v0)
+// 0x01040bfc: 0x1040bfc: lw    s0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7440,19 +7440,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01040bf0: 0x1040bf0: lui   s2, 0x60000
+// 0x01040c00: 0x1040c00: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01040bf4: 0x1040bf4: lw    a0, 11844(s2)
+// 0x01040c04: 0x1040c04: lw    a0, 12308(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040bf8: 0x1040bf8: jal   0x10155e0 addu  a1, s0, zero
+// 0x01040c08: 0x1040c08: jal   0x10155f0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -7460,28 +7460,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040c00: 0x1040c00: lw    v1, 0(s1)
+// 0x01040c10: 0x1040c10: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01040c04: 0x1040c04: sll   zero, zero, 0
-// 0x01040c08: 0x1040c08: lw    v1, 0(v1)
+// 0x01040c14: 0x1040c14: sll   zero, zero, 0
+// 0x01040c18: 0x1040c18: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01040c0c: 0x1040c0c: sll   zero, zero, 0
-// 0x01040c10: 0x1040c10: bne   v1, v0, 0x1040c94 sw    v1, 0(s1)
+// 0x01040c1c: 0x1040c1c: sll   zero, zero, 0
+// 0x01040c20: 0x1040c20: bne   v1, v0, 0x1040ca4 sw    v1, 0(s1)
 	ldloc 7
 	ldloc 5
 	ldloc 6
@@ -7490,123 +7490,123 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldloc 7
 	stelem.i4
-	bne.un L_1040c94
+	bne.un L_1040ca4
 // --- basic block ---
-// 0x01040c18: 0x1040c18: bgez  s3, 0x1040ca0 addiu v0, zero, -1
+// 0x01040c28: 0x1040c28: bgez  s3, 0x1040cb0 addiu v0, zero, -1
 	ldloc 10
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	bge L_1040ca0
+	bge L_1040cb0
 // --- basic block ---
-// 0x01040c20: 0x1040c20: j	 0x1040c4c sll   zero, zero, 0
-	br L_1040c4c
+// 0x01040c30: 0x1040c30: j	 0x1040c5c sll   zero, zero, 0
+	br L_1040c5c
 // --- basic block ---
-L_1040c28:
-// 0x01040c28: 0x1040c28: lw    a0, 11844(s2)
+L_1040c38:
+// 0x01040c38: 0x1040c38: lw    a0, 12308(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040c2c: 0x1040c2c: jal   0x10155e0 sll   zero, zero, 0
+// 0x01040c3c: 0x1040c3c: jal   0x10155f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040c34: 0x1040c34: lw    v1, 0(v0)
+// 0x01040c44: 0x1040c44: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01040c38: 0x1040c38: sll   zero, zero, 0
-// 0x01040c3c: 0x1040c3c: beq   v1, v0, 0x1040c54 lui   v0, 0x60000
+// 0x01040c48: 0x1040c48: sll   zero, zero, 0
+// 0x01040c4c: 0x1040c4c: beq   v1, v0, 0x1040c64 lui   v0, 0x60000
 	ldloc 7
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	beq  L_1040c54
+	beq  L_1040c64
 // --- basic block ---
-// 0x01040c44: 0x1040c44: j	 0x1040c6c sll   zero, zero, 0
-	br L_1040c6c
+// 0x01040c54: 0x1040c54: j	 0x1040c7c sll   zero, zero, 0
+	br L_1040c7c
 // --- basic block ---
-L_1040c4c:
-// 0x01040c4c: 0x1040c4c: bne   s3, v0, 0x1040c68 lui   s3, 0x60000
+L_1040c5c:
+// 0x01040c5c: 0x1040c5c: bne   s3, v0, 0x1040c78 lui   s3, 0x60000
 	ldloc 10
 	ldloc 5
 	ldc.i4 393216
 	stloc 10
-	bne.un L_1040c68
+	bne.un L_1040c78
 // --- basic block ---
-L_1040c54:
-// 0x01040c54: 0x1040c54: lw    v0, 11840(s3)
+L_1040c64:
+// 0x01040c64: 0x1040c64: lw    v0, 12304(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040c58: 0x1040c58: addiu s0, s0, 1
+// 0x01040c68: 0x1040c68: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01040c5c: 0x1040c5c: slt   v0, s0, v0
+// 0x01040c6c: 0x1040c6c: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040c60: 0x1040c60: bne   v0, zero, 0x1040c28 addu  a1, s0, zero
+// 0x01040c70: 0x1040c70: bne   v0, zero, 0x1040c38 addu  a1, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.2
-	brtrue L_1040c28
+	brtrue L_1040c38
 // --- basic block ---
-L_1040c68:
-// 0x01040c68: 0x1040c68: lui   v0, 0x60000
+L_1040c78:
+// 0x01040c78: 0x1040c78: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1040c6c:
-// 0x01040c6c: 0x1040c6c: lw    v0, 11840(v0)
+L_1040c7c:
+// 0x01040c7c: 0x1040c7c: lw    v0, 12304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040c70: 0x1040c70: sll   zero, zero, 0
-// 0x01040c74: 0x1040c74: beq   s0, v0, 0x1040ca0 lui   v0, 0x60000
+// 0x01040c80: 0x1040c80: sll   zero, zero, 0
+// 0x01040c84: 0x1040c84: beq   s0, v0, 0x1040cb0 lui   v0, 0x60000
 	ldloc 8
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	beq  L_1040ca0
+	beq  L_1040cb0
 // --- basic block ---
-// 0x01040c7c: 0x1040c7c: lw    a0, 11844(v0)
+// 0x01040c8c: 0x1040c8c: lw    a0, 12308(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040c80: 0x1040c80: jal   0x10155e0 addu  a1, s0, zero
+// 0x01040c90: 0x1040c90: jal   0x10155f0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -7614,48 +7614,48 @@ L_1040c6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040c88: 0x1040c88: lw    v0, 0(v0)
+// 0x01040c98: 0x1040c98: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01040c8c: 0x1040c8c: sll   zero, zero, 0
-// 0x01040c90: 0x1040c90: sw    v0, 0(s1)
+// 0x01040c9c: 0x1040c9c: sll   zero, zero, 0
+// 0x01040ca0: 0x1040ca0: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1040c94:
-// 0x01040c94: 0x1040c94: lw    v0, 0(s1)
+L_1040ca4:
+// 0x01040ca4: 0x1040ca4: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01040c98: 0x1040c98: j	 0x1040ca4 addiu v0, v0, 8
+// 0x01040ca8: 0x1040ca8: j	 0x1040cb4 addiu v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-	br L_1040ca4
+	br L_1040cb4
 // --- basic block ---
-L_1040ca0:
-// 0x01040ca0: 0x1040ca0: addu  v0, zero, zero
+L_1040cb0:
+// 0x01040cb0: 0x1040cb0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1040ca4:
-// 0x01040ca4: 0x1040ca4: lw    ra, 36(sp)
-// 0x01040ca8: 0x1040ca8: lw    s3, 32(sp)
+L_1040cb4:
+// 0x01040cb4: 0x1040cb4: lw    ra, 36(sp)
+// 0x01040cb8: 0x1040cb8: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7664,7 +7664,7 @@ L_1040ca4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01040cac: 0x1040cac: lw    s2, 28(sp)
+// 0x01040cbc: 0x1040cbc: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7673,7 +7673,7 @@ L_1040ca4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01040cb0: 0x1040cb0: lw    s1, 24(sp)
+// 0x01040cc0: 0x1040cc0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7682,7 +7682,7 @@ L_1040ca4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01040cb4: 0x1040cb4: lw    s0, 20(sp)
+// 0x01040cc4: 0x1040cc4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7691,7 +7691,7 @@ L_1040ca4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01040cb8: 0x1040cb8: jr    ra addiu sp, sp, 40
+// 0x01040cc8: 0x1040cc8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl48.j b/converted/Cibyl48.j
index 4a0a4c2..b96b067 100644
--- a/converted/Cibyl48.j
+++ b/converted/Cibyl48.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl48::.ctor
 
-.method public static int32 roadmap_city_first_1040cc0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_first_1040cd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s3,int32 s1,int32 s2,int32 ra)
@@ -88,15 +88,15 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040cc0: 0x1040cc0: addiu sp, sp, -40
+// 0x01040cd0: 0x1040cd0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01040cc4: 0x1040cc4: addiu v0, zero, -1
+// 0x01040cd4: 0x1040cd4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01040cc8: 0x1040cc8: sw    s1, 24(sp)
+// 0x01040cd8: 0x1040cd8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -105,7 +105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01040ccc: 0x1040ccc: sw    s0, 20(sp)
+// 0x01040cdc: 0x1040cdc: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -114,8 +114,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01040cd0: 0x1040cd0: sw    ra, 36(sp)
-// 0x01040cd4: 0x1040cd4: sw    s3, 32(sp)
+// 0x01040ce0: 0x1040ce0: sw    ra, 36(sp)
+// 0x01040ce4: 0x1040ce4: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -124,7 +124,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01040cd8: 0x1040cd8: sw    s2, 28(sp)
+// 0x01040ce8: 0x1040ce8: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -133,168 +133,168 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01040cdc: 0x1040cdc: addu  s1, a1, zero
+// 0x01040cec: 0x1040cec: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01040ce0: 0x1040ce0: beq   a0, v0, 0x1040cf4 addu  s0, zero, zero
+// 0x01040cf0: 0x1040cf0: beq   a0, v0, 0x1040d04 addu  s0, zero, zero
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	beq  L_1040cf4
+	beq  L_1040d04
 // --- basic block ---
-// 0x01040ce8: 0x1040ce8: bltz  a0, 0x1040da0 addu  v0, zero, zero
+// 0x01040cf8: 0x1040cf8: bltz  a0, 0x1040db0 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_1040da0
+	blt L_1040db0
 // --- basic block ---
-// 0x01040cf0: 0x1040cf0: addu  s0, a0, zero
+// 0x01040d00: 0x1040d00: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-L_1040cf4:
-// 0x01040cf4: 0x1040cf4: lui   s3, 0x60000
+L_1040d04:
+// 0x01040d04: 0x1040d04: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01040cf8: 0x1040cf8: lw    v0, 11840(s3)
+// 0x01040d08: 0x1040d08: lw    v0, 12304(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040cfc: 0x1040cfc: sll   zero, zero, 0
-// 0x01040d00: 0x1040d00: slt   v0, s0, v0
+// 0x01040d0c: 0x1040d0c: sll   zero, zero, 0
+// 0x01040d10: 0x1040d10: slt   v0, s0, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040d04: 0x1040d04: beq   v0, zero, 0x1040d9c addiu v0, zero, -1
+// 0x01040d14: 0x1040d14: beq   v0, zero, 0x1040dac addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1040d9c
+	brfalse L_1040dac
 // --- basic block ---
-// 0x01040d0c: 0x1040d0c: j	 0x1040d38 sll   zero, zero, 0
-	br L_1040d38
+// 0x01040d1c: 0x1040d1c: j	 0x1040d48 sll   zero, zero, 0
+	br L_1040d48
 // --- basic block ---
-L_1040d14:
-// 0x01040d14: 0x1040d14: lw    a0, 11844(s2)
+L_1040d24:
+// 0x01040d24: 0x1040d24: lw    a0, 12308(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040d18: 0x1040d18: jal   0x10155e0 sll   zero, zero, 0
+// 0x01040d28: 0x1040d28: jal   0x10155f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01040d20: 0x1040d20: lw    v1, 0(v0)
+// 0x01040d30: 0x1040d30: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01040d24: 0x1040d24: sll   zero, zero, 0
-// 0x01040d28: 0x1040d28: bne   v1, v0, 0x1040d5c lui   v0, 0x60000
+// 0x01040d34: 0x1040d34: sll   zero, zero, 0
+// 0x01040d38: 0x1040d38: bne   v1, v0, 0x1040d6c lui   v0, 0x60000
 	ldloc 8
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_1040d5c
+	bne.un L_1040d6c
 // --- basic block ---
-// 0x01040d30: 0x1040d30: j	 0x1040d44 addiu s0, s0, 1
+// 0x01040d40: 0x1040d40: j	 0x1040d54 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	br L_1040d44
+	br L_1040d54
 // --- basic block ---
-L_1040d38:
-// 0x01040d38: 0x1040d38: bne   a0, v0, 0x1040d5c lui   v0, 0x60000
+L_1040d48:
+// 0x01040d48: 0x1040d48: bne   a0, v0, 0x1040d6c lui   v0, 0x60000
 	ldloc.1
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_1040d5c
+	bne.un L_1040d6c
 // --- basic block ---
-// 0x01040d40: 0x1040d40: lui   s2, 0x60000
+// 0x01040d50: 0x1040d50: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-L_1040d44:
-// 0x01040d44: 0x1040d44: lw    v0, 11840(s3)
+L_1040d54:
+// 0x01040d54: 0x1040d54: lw    v0, 12304(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040d48: 0x1040d48: sll   zero, zero, 0
-// 0x01040d4c: 0x1040d4c: slt   v0, s0, v0
+// 0x01040d58: 0x1040d58: sll   zero, zero, 0
+// 0x01040d5c: 0x1040d5c: slt   v0, s0, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040d50: 0x1040d50: bne   v0, zero, 0x1040d14 addu  a1, s0, zero
+// 0x01040d60: 0x1040d60: bne   v0, zero, 0x1040d24 addu  a1, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.2
-	brtrue L_1040d14
+	brtrue L_1040d24
 // --- basic block ---
-// 0x01040d58: 0x1040d58: lui   v0, 0x60000
+// 0x01040d68: 0x1040d68: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1040d5c:
-// 0x01040d5c: 0x1040d5c: lw    v0, 11840(v0)
+L_1040d6c:
+// 0x01040d6c: 0x1040d6c: lw    v0, 12304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040d60: 0x1040d60: sll   zero, zero, 0
-// 0x01040d64: 0x1040d64: slt   v0, s0, v0
+// 0x01040d70: 0x1040d70: sll   zero, zero, 0
+// 0x01040d74: 0x1040d74: slt   v0, s0, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040d68: 0x1040d68: beq   v0, zero, 0x1040da0 addu  v0, zero, zero
+// 0x01040d78: 0x1040d78: beq   v0, zero, 0x1040db0 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1040da0
+	brfalse L_1040db0
 // --- basic block ---
-// 0x01040d70: 0x1040d70: lui   v0, 0x60000
+// 0x01040d80: 0x1040d80: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01040d74: 0x1040d74: lw    a0, 11844(v0)
+// 0x01040d84: 0x1040d84: lw    a0, 12308(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040d78: 0x1040d78: jal   0x10155e0 addu  a1, s0, zero
+// 0x01040d88: 0x1040d88: jal   0x10155f0 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -302,48 +302,48 @@ L_1040d5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01040d80: 0x1040d80: lw    v1, 0(v0)
+// 0x01040d90: 0x1040d90: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01040d84: 0x1040d84: sll   zero, zero, 0
-// 0x01040d88: 0x1040d88: beq   v1, v0, 0x1040da0 addu  v0, zero, zero
+// 0x01040d94: 0x1040d94: sll   zero, zero, 0
+// 0x01040d98: 0x1040d98: beq   v1, v0, 0x1040db0 addu  v0, zero, zero
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1040da0
+	beq  L_1040db0
 // --- basic block ---
-// 0x01040d90: 0x1040d90: sw    v1, 0(s1)
+// 0x01040da0: 0x1040da0: sw    v1, 0(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01040d94: 0x1040d94: bne   v1, zero, 0x1040da0 addiu v0, v1, 8
+// 0x01040da4: 0x1040da4: bne   v1, zero, 0x1040db0 addiu v0, v1, 8
 	ldloc 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 5
-	brtrue L_1040da0
+	brtrue L_1040db0
 // --- basic block ---
-L_1040d9c:
-// 0x01040d9c: 0x1040d9c: addu  v0, zero, zero
+L_1040dac:
+// 0x01040dac: 0x1040dac: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1040da0:
-// 0x01040da0: 0x1040da0: lw    ra, 36(sp)
-// 0x01040da4: 0x1040da4: lw    s3, 32(sp)
+L_1040db0:
+// 0x01040db0: 0x1040db0: lw    ra, 36(sp)
+// 0x01040db4: 0x1040db4: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -352,7 +352,7 @@ L_1040da0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01040da8: 0x1040da8: lw    s2, 28(sp)
+// 0x01040db8: 0x1040db8: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -361,7 +361,7 @@ L_1040da0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01040dac: 0x1040dac: lw    s1, 24(sp)
+// 0x01040dbc: 0x1040dbc: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -370,7 +370,7 @@ L_1040da0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01040db0: 0x1040db0: lw    s0, 20(sp)
+// 0x01040dc0: 0x1040dc0: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -379,7 +379,7 @@ L_1040da0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01040db4: 0x1040db4: jr    ra addiu sp, sp, 40
+// 0x01040dc4: 0x1040dc4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -391,7 +391,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_city_write_file_1040dbc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_write_file_1040dcc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s4,int32 s2,int32 s3,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -453,24 +453,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040dbc: 0x1040dbc: lui   v0, 0x60000
+// 0x01040dcc: 0x1040dcc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01040dc0: 0x1040dc0: lw    v1, 11836(v0)
+// 0x01040dd0: 0x1040dd0: lw    v1, 12300(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldelem.i4
 	stloc 7
-// 0x01040dc4: 0x1040dc4: addiu sp, sp, -72
+// 0x01040dd4: 0x1040dd4: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01040dc8: 0x1040dc8: sw    s3, 44(sp)
+// 0x01040dd8: 0x1040dd8: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -479,7 +479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01040dcc: 0x1040dcc: sw    s0, 32(sp)
+// 0x01040ddc: 0x1040ddc: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -488,8 +488,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01040dd0: 0x1040dd0: sw    ra, 68(sp)
-// 0x01040dd4: 0x1040dd4: sw    s8, 64(sp)
+// 0x01040de0: 0x1040de0: sw    ra, 68(sp)
+// 0x01040de4: 0x1040de4: sw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -498,7 +498,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01040dd8: 0x1040dd8: sw    s7, 60(sp)
+// 0x01040de8: 0x1040de8: sw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -507,7 +507,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01040ddc: 0x1040ddc: sw    s6, 56(sp)
+// 0x01040dec: 0x1040dec: sw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -516,7 +516,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01040de0: 0x1040de0: sw    s5, 52(sp)
+// 0x01040df0: 0x1040df0: sw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -525,7 +525,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01040de4: 0x1040de4: sw    s4, 48(sp)
+// 0x01040df4: 0x1040df4: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -534,7 +534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01040de8: 0x1040de8: sw    s2, 40(sp)
+// 0x01040df8: 0x1040df8: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -543,7 +543,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01040dec: 0x1040dec: sw    s1, 36(sp)
+// 0x01040dfc: 0x1040dfc: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -552,23 +552,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01040df0: 0x1040df0: addu  s3, a2, zero
+// 0x01040e00: 0x1040e00: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01040df4: 0x1040df4: addu  s0, a1, zero
+// 0x01040e04: 0x1040e04: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01040df8: 0x1040df8: beq   v1, zero, 0x1040fac addu  v0, zero, zero
+// 0x01040e08: 0x1040e08: beq   v1, zero, 0x1040fbc addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1040fac
+	brfalse L_1040fbc
 // --- basic block ---
-// 0x01040e00: 0x1040e00: bne   a0, zero, 0x1040e18 sll   zero, zero, 0
+// 0x01040e10: 0x1040e10: bne   a0, zero, 0x1040e28 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1040e18
+	brtrue L_1040e28
 // --- basic block ---
-// 0x01040e08: 0x1040e08: jal   0x1002f74 sll   zero, zero, 0
+// 0x01040e18: 0x1040e18: jal   0x1002f74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -579,36 +579,36 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040e10: 0x1040e10: addu  a0, v0, zero
+// 0x01040e20: 0x1040e20: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01040e14: 0x1040e14: addu  a1, s0, zero
+// 0x01040e24: 0x1040e24: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-L_1040e18:
-// 0x01040e18: 0x1040e18: jal   0x104cb30 sll   zero, zero, 0
+L_1040e28:
+// 0x01040e28: 0x1040e28: jal   0x104cb40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040e20: 0x1040e20: lui   a1, 0x0
+// 0x01040e30: 0x1040e30: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01040e24: 0x1040e24: addiu a1, a1, 28940
+// 0x01040e34: 0x1040e34: addiu a1, a1, 28940
 	ldloc.2
 	ldc.i4 28940
 	add
 	stloc.2
-// 0x01040e28: 0x1040e28: addu  a0, v0, zero
+// 0x01040e38: 0x1040e38: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01040e2c: 0x1040e2c: jal   0x104dd10 addu  s1, v0, zero
+// 0x01040e3c: 0x1040e3c: jal   0x104dd20 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -616,15 +616,15 @@ L_1040e18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040e34: 0x1040e34: addu  s0, v0, zero
+// 0x01040e44: 0x1040e44: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01040e38: 0x1040e38: jal   0x104c670 addu  a0, s1, zero
+// 0x01040e48: 0x1040e48: jal   0x104c680 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -632,32 +632,32 @@ L_1040e18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040e40: 0x1040e40: beq   s0, zero, 0x1040fac addiu v0, zero, -1
+// 0x01040e50: 0x1040e50: beq   s0, zero, 0x1040fbc addiu v0, zero, -1
 	ldloc 9
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1040fac
+	brfalse L_1040fbc
 // --- basic block ---
-// 0x01040e48: 0x1040e48: lui   s1, 0x60000
+// 0x01040e58: 0x1040e58: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01040e4c: 0x1040e4c: addiu a1, s1, 11840
+// 0x01040e5c: 0x1040e5c: addiu a1, s1, 12304
 	ldloc 8
-	ldc.i4 11840
+	ldc.i4 12304
 	add
 	stloc.2
-// 0x01040e50: 0x1040e50: addu  a0, s0, zero
+// 0x01040e60: 0x1040e60: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01040e54: 0x1040e54: addiu a2, zero, 4
+// 0x01040e64: 0x1040e64: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x01040e58: 0x1040e58: jal   0x104d46c addu  s8, s1, zero
+// 0x01040e68: 0x1040e68: jal   0x104d47c addu  s8, s1, zero
 	ldloc 8
 	stloc 16
 	ldloc.0
@@ -665,45 +665,45 @@ L_1040e18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040e60: 0x1040e60: addu  s1, zero, zero
+// 0x01040e70: 0x1040e70: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01040e64: 0x1040e64: lui   s7, 0x60000
+// 0x01040e74: 0x1040e74: lui   s7, 0x60000
 	ldc.i4 393216
 	stloc 15
-// 0x01040e68: 0x1040e68: addiu s6, sp, 20
+// 0x01040e78: 0x1040e78: addiu s6, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 14
-// 0x01040e6c: 0x1040e6c: addiu s5, sp, 24
+// 0x01040e7c: 0x1040e7c: addiu s5, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 13
-// 0x01040e70: 0x1040e70: j	 0x1040f84 addiu s2, sp, 16
+// 0x01040e80: 0x1040e80: j	 0x1040f94 addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 11
-	br L_1040f84
+	br L_1040f94
 // --- basic block ---
-L_1040e78:
-// 0x01040e78: 0x1040e78: lw    a0, 11844(s7)
+L_1040e88:
+// 0x01040e88: 0x1040e88: lw    a0, 12308(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040e7c: 0x1040e7c: jal   0x10155e0 addu  a1, s1, zero
+// 0x01040e8c: 0x1040e8c: jal   0x10155f0 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -711,12 +711,12 @@ L_1040e78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040e84: 0x1040e84: lw    a0, 8(v0)
+// 0x01040e94: 0x1040e94: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -725,30 +725,30 @@ L_1040e78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01040e88: 0x1040e88: sll   zero, zero, 0
-// 0x01040e8c: 0x1040e8c: beq   a0, zero, 0x1040f58 addu  s4, v0, zero
+// 0x01040e98: 0x1040e98: sll   zero, zero, 0
+// 0x01040e9c: 0x1040e9c: beq   a0, zero, 0x1040f68 addu  s4, v0, zero
 	ldloc.1
 	ldloc 5
 	stloc 10
-	brfalse L_1040f58
+	brfalse L_1040f68
 // --- basic block ---
-// 0x01040e94: 0x1040e94: jal   0x1001b48 sll   zero, zero, 0
+// 0x01040ea4: 0x1040ea4: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040e9c: 0x1040e9c: addu  a1, v0, zero
+// 0x01040eac: 0x1040eac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01040ea0: 0x1040ea0: addu  a2, s3, zero
+// 0x01040eb0: 0x1040eb0: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x01040ea4: 0x1040ea4: addu  a0, s0, zero
+// 0x01040eb4: 0x1040eb4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01040ea8: 0x1040ea8: jal   0x1040b3c sw    v0, 20(sp)
+// 0x01040eb8: 0x1040eb8: jal   0x1040b4c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -762,12 +762,12 @@ L_1040e78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_city_write_int_1040b3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_city_write_int_1040b4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040eb0: 0x1040eb0: lw    a1, 8(s4)
+// 0x01040ec0: 0x1040ec0: lw    a1, 8(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -776,7 +776,7 @@ L_1040e78:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01040eb4: 0x1040eb4: lw    a2, 20(sp)
+// 0x01040ec4: 0x1040ec4: lw    a2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -785,7 +785,7 @@ L_1040e78:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01040eb8: 0x1040eb8: jal   0x104d46c addu  a0, s0, zero
+// 0x01040ec8: 0x1040ec8: jal   0x104d47c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -793,18 +793,18 @@ L_1040e78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040ec0: 0x1040ec0: addu  a0, s1, zero
+// 0x01040ed0: 0x1040ed0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01040ec4: 0x1040ec4: addu  a1, s2, zero
+// 0x01040ed4: 0x1040ed4: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x01040ec8: 0x1040ec8: jal   0x1040cc0 sw    zero, 24(sp)
+// 0x01040ed8: 0x1040ed8: jal   0x1040cd0 sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -818,23 +818,23 @@ L_1040e78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_first_1040cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_first_1040cd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040ed0: 0x1040ed0: j	 0x1040ee8 addu  a0, s1, zero
+// 0x01040ee0: 0x1040ee0: j	 0x1040ef8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-	br L_1040ee8
+	br L_1040ef8
 // --- basic block ---
-L_1040ed8:
-// 0x01040ed8: 0x1040ed8: addiu v1, v1, 1
+L_1040ee8:
+// 0x01040ee8: 0x1040ee8: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01040edc: 0x1040edc: jal   0x1040bc4 sw    v1, 24(sp)
+// 0x01040eec: 0x1040eec: jal   0x1040bd4 sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -848,16 +848,16 @@ L_1040ed8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_city_next_1040bc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_city_next_1040bd4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040ee4: 0x1040ee4: addu  a0, s1, zero
+// 0x01040ef4: 0x1040ef4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-L_1040ee8:
-// 0x01040ee8: 0x1040ee8: lw    v1, 24(sp)
+L_1040ef8:
+// 0x01040ef8: 0x1040ef8: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -866,19 +866,19 @@ L_1040ee8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01040eec: 0x1040eec: bne   v0, zero, 0x1040ed8 addu  a1, s2, zero
+// 0x01040efc: 0x1040efc: bne   v0, zero, 0x1040ee8 addu  a1, s2, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brtrue L_1040ed8
+	brtrue L_1040ee8
 // --- basic block ---
-// 0x01040ef4: 0x1040ef4: addu  a1, v1, zero
+// 0x01040f04: 0x1040f04: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01040ef8: 0x1040ef8: addu  a0, s0, zero
+// 0x01040f08: 0x1040f08: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01040efc: 0x1040efc: jal   0x1040b3c addu  a2, s3, zero
+// 0x01040f0c: 0x1040f0c: jal   0x1040b4c addu  a2, s3, zero
 	ldloc 12
 	stloc.3
 	ldloc.0
@@ -886,15 +886,15 @@ L_1040ee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_city_write_int_1040b3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_city_write_int_1040b4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040f04: 0x1040f04: addu  a0, s1, zero
+// 0x01040f14: 0x1040f14: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01040f08: 0x1040f08: jal   0x1040cc0 addu  a1, s2, zero
+// 0x01040f18: 0x1040f18: jal   0x1040cd0 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -902,36 +902,36 @@ L_1040ee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_first_1040cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_first_1040cd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040f10: 0x1040f10: j	 0x1040f44 addu  s4, v0, zero
+// 0x01040f20: 0x1040f20: j	 0x1040f54 addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-	br L_1040f44
+	br L_1040f54
 // --- basic block ---
-L_1040f18:
-// 0x01040f18: 0x1040f18: lw    a1, 0(s4)
+L_1040f28:
+// 0x01040f28: 0x1040f28: lw    a1, 0(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01040f1c: 0x1040f1c: jal   0x1040b3c sll   zero, zero, 0
+// 0x01040f2c: 0x1040f2c: jal   0x1040b4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_city_write_int_1040b3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_city_write_int_1040b4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040f24: 0x1040f24: lw    a1, 4(s4)
+// 0x01040f34: 0x1040f34: lw    a1, 4(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -940,10 +940,10 @@ L_1040f18:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01040f28: 0x1040f28: addu  a0, s0, zero
+// 0x01040f38: 0x1040f38: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01040f2c: 0x1040f2c: jal   0x1040b3c addu  a2, s3, zero
+// 0x01040f3c: 0x1040f3c: jal   0x1040b4c addu  a2, s3, zero
 	ldloc 12
 	stloc.3
 	ldloc.0
@@ -951,15 +951,15 @@ L_1040f18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_city_write_int_1040b3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_city_write_int_1040b4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040f34: 0x1040f34: addu  a0, s1, zero
+// 0x01040f44: 0x1040f44: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01040f38: 0x1040f38: jal   0x1040bc4 addu  a1, s2, zero
+// 0x01040f48: 0x1040f48: jal   0x1040bd4 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -967,42 +967,42 @@ L_1040f18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_city_next_1040bc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_city_next_1040bd4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040f40: 0x1040f40: addu  s4, v0, zero
+// 0x01040f50: 0x1040f50: addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-L_1040f44:
-// 0x01040f44: 0x1040f44: addu  a2, s3, zero
+L_1040f54:
+// 0x01040f54: 0x1040f54: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x01040f48: 0x1040f48: bne   v0, zero, 0x1040f18 addu  a0, s0, zero
+// 0x01040f58: 0x1040f58: bne   v0, zero, 0x1040f28 addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_1040f18
+	brtrue L_1040f28
 // --- basic block ---
-// 0x01040f50: 0x1040f50: j	 0x1040f84 addiu s1, s1, 1
+// 0x01040f60: 0x1040f60: j	 0x1040f94 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_1040f84
+	br L_1040f94
 // --- basic block ---
-L_1040f58:
-// 0x01040f58: 0x1040f58: addiu a2, zero, 4
+L_1040f68:
+// 0x01040f68: 0x1040f68: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x01040f5c: 0x1040f5c: addu  a0, s0, zero
+// 0x01040f6c: 0x1040f6c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01040f60: 0x1040f60: addu  a1, s6, zero
+// 0x01040f70: 0x1040f70: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x01040f64: 0x1040f64: sw    zero, 20(sp)
+// 0x01040f74: 0x1040f74: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1011,7 +1011,7 @@ L_1040f58:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01040f68: 0x1040f68: jal   0x104d46c sw    zero, 24(sp)
+// 0x01040f78: 0x1040f78: jal   0x104d47c sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1025,18 +1025,18 @@ L_1040f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040f70: 0x1040f70: addu  a0, s0, zero
+// 0x01040f80: 0x1040f80: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01040f74: 0x1040f74: addu  a1, s5, zero
+// 0x01040f84: 0x1040f84: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x01040f78: 0x1040f78: jal   0x104d46c addiu a2, zero, 4
+// 0x01040f88: 0x1040f88: jal   0x104d47c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -1044,37 +1044,37 @@ L_1040f58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040f80: 0x1040f80: addiu s1, s1, 1
+// 0x01040f90: 0x1040f90: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1040f84:
-// 0x01040f84: 0x1040f84: lw    v0, 11840(s8)
+L_1040f94:
+// 0x01040f94: 0x1040f94: lw    v0, 12304(s8)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 5
-// 0x01040f88: 0x1040f88: sll   zero, zero, 0
-// 0x01040f8c: 0x1040f8c: slt   v0, s1, v0
+// 0x01040f98: 0x1040f98: sll   zero, zero, 0
+// 0x01040f9c: 0x1040f9c: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01040f90: 0x1040f90: bne   v0, zero, 0x1040e78 sll   zero, zero, 0
+// 0x01040fa0: 0x1040fa0: bne   v0, zero, 0x1040e88 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1040e78
+	brtrue L_1040e88
 // --- basic block ---
-// 0x01040f98: 0x1040f98: jal   0x104d44c addu  a0, s0, zero
+// 0x01040fa8: 0x1040fa8: jal   0x104d45c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1082,29 +1082,29 @@ L_1040f84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01040fa0: 0x1040fa0: lui   v0, 0x60000
+// 0x01040fb0: 0x1040fb0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01040fa4: 0x1040fa4: sw    zero, 11836(v0)
+// 0x01040fb4: 0x1040fb4: sw    zero, 12300(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01040fa8: 0x1040fa8: addu  v0, zero, zero
+// 0x01040fb8: 0x1040fb8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1040fac:
-// 0x01040fac: 0x1040fac: lw    ra, 68(sp)
-// 0x01040fb0: 0x1040fb0: lw    s8, 64(sp)
+L_1040fbc:
+// 0x01040fbc: 0x1040fbc: lw    ra, 68(sp)
+// 0x01040fc0: 0x1040fc0: lw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1113,7 +1113,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01040fb4: 0x1040fb4: lw    s7, 60(sp)
+// 0x01040fc4: 0x1040fc4: lw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1122,7 +1122,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01040fb8: 0x1040fb8: lw    s6, 56(sp)
+// 0x01040fc8: 0x1040fc8: lw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1131,7 +1131,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01040fbc: 0x1040fbc: lw    s5, 52(sp)
+// 0x01040fcc: 0x1040fcc: lw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1140,7 +1140,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01040fc0: 0x1040fc0: lw    s4, 48(sp)
+// 0x01040fd0: 0x1040fd0: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1149,7 +1149,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01040fc4: 0x1040fc4: lw    s3, 44(sp)
+// 0x01040fd4: 0x1040fd4: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1158,7 +1158,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01040fc8: 0x1040fc8: lw    s2, 40(sp)
+// 0x01040fd8: 0x1040fd8: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01040fcc: 0x1040fcc: lw    s1, 36(sp)
+// 0x01040fdc: 0x1040fdc: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1176,7 +1176,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01040fd0: 0x1040fd0: lw    s0, 32(sp)
+// 0x01040fe0: 0x1040fe0: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1185,7 +1185,7 @@ L_1040fac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01040fd4: 0x1040fd4: jr    ra addiu sp, sp, 72
+// 0x01040fe4: 0x1040fe4: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1197,7 +1197,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_city_search_1040fdc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_search_1040fec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 v1,int32 ra)
@@ -1256,12 +1256,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01040fdc: 0x1040fdc: addiu sp, sp, -56
+// 0x01040fec: 0x1040fec: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01040fe0: 0x1040fe0: sw    s7, 48(sp)
+// 0x01040ff0: 0x1040ff0: sw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1270,7 +1270,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01040fe4: 0x1040fe4: sw    s6, 44(sp)
+// 0x01040ff4: 0x1040ff4: sw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1279,7 +1279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01040fe8: 0x1040fe8: sw    s5, 40(sp)
+// 0x01040ff8: 0x1040ff8: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1288,7 +1288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01040fec: 0x1040fec: sw    s3, 32(sp)
+// 0x01040ffc: 0x1040ffc: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1297,7 +1297,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01040ff0: 0x1040ff0: sw    s2, 28(sp)
+// 0x01041000: 0x1041000: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1306,7 +1306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01040ff4: 0x1040ff4: sw    s1, 24(sp)
+// 0x01041004: 0x1041004: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1315,7 +1315,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01040ff8: 0x1040ff8: sw    s0, 20(sp)
+// 0x01041008: 0x1041008: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1324,8 +1324,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01040ffc: 0x1040ffc: sw    ra, 52(sp)
-// 0x01041000: 0x1041000: sw    s4, 36(sp)
+// 0x0104100c: 0x104100c: sw    ra, 52(sp)
+// 0x01041010: 0x1041010: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1334,54 +1334,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01041004: 0x1041004: addu  s3, a0, zero
+// 0x01041014: 0x1041014: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01041008: 0x1041008: addu  s2, a1, zero
+// 0x01041018: 0x1041018: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0104100c: 0x104100c: addu  s7, a2, zero
+// 0x0104101c: 0x104101c: addu  s7, a2, zero
 	ldloc.3
 	stloc 14
-// 0x01041010: 0x1041010: addu  s1, zero, zero
+// 0x01041020: 0x1041020: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01041014: 0x1041014: addu  s0, zero, zero
+// 0x01041024: 0x1041024: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01041018: 0x1041018: lui   s6, 0x60000
+// 0x01041028: 0x1041028: lui   s6, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x0104101c: 0x104101c: j	 0x1041084 lui   s5, 0x60000
+// 0x0104102c: 0x104102c: j	 0x1041094 lui   s5, 0x60000
 	ldc.i4 393216
 	stloc 12
-	br L_1041084
+	br L_1041094
 // --- basic block ---
-L_1041024:
-// 0x01041024: 0x1041024: lw    a0, 11844(s5)
+L_1041034:
+// 0x01041034: 0x1041034: lw    a0, 12308(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041028: 0x1041028: jal   0x10155e0 sll   zero, zero, 0
+// 0x01041038: 0x1041038: jal   0x10155f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x01041030: 0x1041030: addu  s4, v0, zero
+// 0x01041040: 0x1041040: addu  s4, v0, zero
 	ldloc 6
 	stloc 11
-// 0x01041034: 0x1041034: lw    v0, 8(v0)
+// 0x01041044: 0x1041044: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1390,52 +1390,52 @@ L_1041024:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01041038: 0x1041038: addu  a1, s3, zero
+// 0x01041048: 0x1041048: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x0104103c: 0x104103c: beq   v0, zero, 0x1041080 addu  a0, v0, zero
+// 0x0104104c: 0x104104c: beq   v0, zero, 0x1041090 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_1041080
+	brfalse L_1041090
 // --- basic block ---
-// 0x01041044: 0x1041044: beq   s3, zero, 0x104105c sll   zero, zero, 0
+// 0x01041054: 0x1041054: beq   s3, zero, 0x104106c sll   zero, zero, 0
 	ldloc 10
-	brfalse L_104105c
+	brfalse L_104106c
 // --- basic block ---
-// 0x0104104c: 0x104104c: jal   0x101c818 sll   zero, zero, 0
+// 0x0104105c: 0x104105c: jal   0x101c828 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_is_sub_ignore_case_101c818(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_is_sub_ignore_case_101c828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x01041054: 0x1041054: beq   v0, zero, 0x1041080 sll   zero, zero, 0
+// 0x01041064: 0x1041064: beq   v0, zero, 0x1041090 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1041080
+	brfalse L_1041090
 // --- basic block ---
-L_104105c:
-// 0x0104105c: 0x104105c: andi  a0, s0, 65535
+L_104106c:
+// 0x0104106c: 0x104106c: andi  a0, s0, 65535
 	ldloc 7
 	ldc.i4 65535
 	and
 	stloc.1
-// 0x01041060: 0x1041060: addu  a2, s7, zero
+// 0x01041070: 0x1041070: addu  a2, s7, zero
 	ldloc 14
 	stloc.3
-// 0x01041064: 0x1041064: beq   s2, zero, 0x1041080 addiu s1, s1, 1
+// 0x01041074: 0x1041074: beq   s2, zero, 0x1041090 addiu s1, s1, 1
 	ldloc 9
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brfalse L_1041080
+	brfalse L_1041090
 // --- basic block ---
-// 0x0104106c: 0x104106c: lw    a1, 8(s4)
+// 0x0104107c: 0x104107c: lw    a1, 8(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1444,7 +1444,7 @@ L_104105c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01041070: 0x1041070: jalr  s2 sll   zero, zero, 0
+// 0x01041080: 0x1041080: jalr  s2 sll   zero, zero, 0
 	ldloc 9
 	ldloc.0
 	ldloc.1
@@ -1456,44 +1456,44 @@ L_104105c:
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x01041078: 0x1041078: beq   v0, zero, 0x1041098 sll   zero, zero, 0
+// 0x01041088: 0x1041088: beq   v0, zero, 0x10410a8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1041098
+	brfalse L_10410a8
 // --- basic block ---
-L_1041080:
-// 0x01041080: 0x1041080: addiu s0, s0, 1
+L_1041090:
+// 0x01041090: 0x1041090: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_1041084:
-// 0x01041084: 0x1041084: lw    v0, 11840(s6)
+L_1041094:
+// 0x01041094: 0x1041094: lw    v0, 12304(s6)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 6
-// 0x01041088: 0x1041088: sll   zero, zero, 0
-// 0x0104108c: 0x104108c: slt   v0, s0, v0
+// 0x01041098: 0x1041098: sll   zero, zero, 0
+// 0x0104109c: 0x104109c: slt   v0, s0, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x01041090: 0x1041090: bne   v0, zero, 0x1041024 addu  a1, s0, zero
+// 0x010410a0: 0x10410a0: bne   v0, zero, 0x1041034 addu  a1, s0, zero
 	ldloc 6
 	ldloc 7
 	stloc.2
-	brtrue L_1041024
+	brtrue L_1041034
 // --- basic block ---
-L_1041098:
-// 0x01041098: 0x1041098: lw    ra, 52(sp)
-// 0x0104109c: 0x104109c: addu  v0, s1, zero
+L_10410a8:
+// 0x010410a8: 0x10410a8: lw    ra, 52(sp)
+// 0x010410ac: 0x10410ac: addu  v0, s1, zero
 	ldloc 8
 	stloc 6
-// 0x010410a0: 0x10410a0: lw    s7, 48(sp)
+// 0x010410b0: 0x10410b0: lw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1502,7 +1502,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010410a4: 0x10410a4: lw    s6, 44(sp)
+// 0x010410b4: 0x10410b4: lw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1511,7 +1511,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010410a8: 0x10410a8: lw    s5, 40(sp)
+// 0x010410b8: 0x10410b8: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1520,7 +1520,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010410ac: 0x10410ac: lw    s4, 36(sp)
+// 0x010410bc: 0x10410bc: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1529,7 +1529,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010410b0: 0x10410b0: lw    s3, 32(sp)
+// 0x010410c0: 0x10410c0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1538,7 +1538,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010410b4: 0x10410b4: lw    s2, 28(sp)
+// 0x010410c4: 0x10410c4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1547,7 +1547,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010410b8: 0x10410b8: lw    s1, 24(sp)
+// 0x010410c8: 0x10410c8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1556,7 +1556,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010410bc: 0x10410bc: lw    s0, 20(sp)
+// 0x010410cc: 0x10410cc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1565,7 +1565,7 @@ L_1041098:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010410c0: 0x10410c0: jr    ra addiu sp, sp, 56
+// 0x010410d0: 0x10410d0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1577,7 +1577,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_city_unload_10410c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_unload_10410d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s5,int32 s0,int32 s1,int32 s6,int32 s2,int32 s3,int32 s4,int32 s7,int32 v1,int32 ra)
@@ -1636,12 +1636,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010410c8: 0x10410c8: addiu sp, sp, -56
+// 0x010410d8: 0x10410d8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010410cc: 0x10410cc: sw    s4, 36(sp)
+// 0x010410dc: 0x10410dc: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1650,7 +1650,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010410d0: 0x10410d0: sw    s3, 32(sp)
+// 0x010410e0: 0x10410e0: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1659,7 +1659,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010410d4: 0x10410d4: sw    s2, 28(sp)
+// 0x010410e4: 0x10410e4: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1668,7 +1668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010410d8: 0x10410d8: sw    s1, 24(sp)
+// 0x010410e8: 0x10410e8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1677,7 +1677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010410dc: 0x10410dc: sw    s0, 20(sp)
+// 0x010410ec: 0x10410ec: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1686,8 +1686,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010410e0: 0x10410e0: sw    ra, 52(sp)
-// 0x010410e4: 0x10410e4: sw    s7, 48(sp)
+// 0x010410f0: 0x10410f0: sw    ra, 52(sp)
+// 0x010410f4: 0x10410f4: sw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1696,7 +1696,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010410e8: 0x10410e8: sw    s6, 44(sp)
+// 0x010410f8: 0x10410f8: sw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1705,7 +1705,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010410ec: 0x10410ec: sw    s5, 40(sp)
+// 0x010410fc: 0x10410fc: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1714,34 +1714,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010410f0: 0x10410f0: addu  s4, a0, zero
+// 0x01041100: 0x1041100: addu  s4, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010410f4: 0x10410f4: addu  s0, zero, zero
+// 0x01041104: 0x1041104: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010410f8: 0x10410f8: lui   s3, 0x60000
+// 0x01041108: 0x1041108: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x010410fc: 0x10410fc: lui   s2, 0x60000
+// 0x0104110c: 0x104110c: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01041100: 0x1041100: j	 0x1041178 lui   s1, 0x60000
+// 0x01041110: 0x1041110: j	 0x1041188 lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 9
-	br L_1041178
+	br L_1041188
 // --- basic block ---
-L_1041108:
-// 0x01041108: 0x1041108: lw    a0, 11844(s2)
+L_1041118:
+// 0x01041118: 0x1041118: lw    a0, 12308(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104110c: 0x104110c: jal   0x10155e0 addu  a1, s0, zero
+// 0x0104111c: 0x104111c: jal   0x10155f0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -1749,15 +1749,15 @@ L_1041108:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x01041114: 0x1041114: addu  s6, v0, zero
+// 0x01041124: 0x1041124: addu  s6, v0, zero
 	ldloc 6
 	stloc 10
-// 0x01041118: 0x1041118: lw    v0, 8(v0)
+// 0x01041128: 0x1041128: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1766,23 +1766,23 @@ L_1041108:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104111c: 0x104111c: sll   zero, zero, 0
-// 0x01041120: 0x1041120: beq   v0, zero, 0x1041174 sll   zero, zero, 0
+// 0x0104112c: 0x104112c: sll   zero, zero, 0
+// 0x01041130: 0x1041130: beq   v0, zero, 0x1041184 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1041174
+	brfalse L_1041184
 // --- basic block ---
-// 0x01041128: 0x1041128: lw    s5, 0(s6)
+// 0x01041138: 0x1041138: lw    s5, 0(s6)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104112c: 0x104112c: j	 0x1041168 sll   zero, zero, 0
-	br L_1041168
+// 0x0104113c: 0x104113c: j	 0x1041178 sll   zero, zero, 0
+	br L_1041178
 // --- basic block ---
-L_1041134:
-// 0x01041134: 0x1041134: lw    v0, 8(s5)
+L_1041144:
+// 0x01041144: 0x1041144: lw    v0, 8(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1791,23 +1791,23 @@ L_1041134:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01041138: 0x1041138: sll   zero, zero, 0
-// 0x0104113c: 0x104113c: bne   v0, s4, 0x1041164 sll   zero, zero, 0
+// 0x01041148: 0x1041148: sll   zero, zero, 0
+// 0x0104114c: 0x104114c: bne   v0, s4, 0x1041174 sll   zero, zero, 0
 	ldloc 6
 	ldloc 13
-	bne.un L_1041164
+	bne.un L_1041174
 // --- basic block ---
-// 0x01041144: 0x1041144: jal   0x1015bf8 addu  a0, s5, zero
+// 0x01041154: 0x1041154: jal   0x1015c08 addu  a0, s5, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl16::roadmap_list_remove_1015bf8(int32,int32)
+	call int32 Cibyl16::roadmap_list_remove_1015c08(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x0104114c: 0x104114c: jal   0x1000930 addu  a0, s5, zero
+// 0x0104115c: 0x104115c: jal   0x1000930 addu  a0, s5, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1820,75 +1820,75 @@ L_1041134:
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x01041154: 0x1041154: lw    v0, 11836(s1)
+// 0x01041164: 0x1041164: lw    v0, 12300(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldelem.i4
 	stloc 6
-// 0x01041158: 0x1041158: sll   zero, zero, 0
-// 0x0104115c: 0x104115c: addiu v0, v0, 1
+// 0x01041168: 0x1041168: sll   zero, zero, 0
+// 0x0104116c: 0x104116c: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01041160: 0x1041160: sw    v0, 11836(s1)
+// 0x01041170: 0x1041170: sw    v0, 12300(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldloc 6
 	stelem.i4
-L_1041164:
-// 0x01041164: 0x1041164: addu  s5, s7, zero
+L_1041174:
+// 0x01041174: 0x1041174: addu  s5, s7, zero
 	ldloc 14
 	stloc 7
-L_1041168:
-// 0x01041168: 0x1041168: lw    s7, 0(s5)
+L_1041178:
+// 0x01041178: 0x1041178: lw    s7, 0(s5)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x0104116c: 0x104116c: bne   s5, s6, 0x1041134 sll   zero, zero, 0
+// 0x0104117c: 0x104117c: bne   s5, s6, 0x1041144 sll   zero, zero, 0
 	ldloc 7
 	ldloc 10
-	bne.un L_1041134
+	bne.un L_1041144
 // --- basic block ---
-L_1041174:
-// 0x01041174: 0x1041174: addiu s0, s0, 1
+L_1041184:
+// 0x01041184: 0x1041184: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1041178:
-// 0x01041178: 0x1041178: lw    v0, 11840(s3)
+L_1041188:
+// 0x01041188: 0x1041188: lw    v0, 12304(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104117c: 0x104117c: sll   zero, zero, 0
-// 0x01041180: 0x1041180: slt   v0, s0, v0
+// 0x0104118c: 0x104118c: sll   zero, zero, 0
+// 0x01041190: 0x1041190: slt   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x01041184: 0x1041184: bne   v0, zero, 0x1041108 sll   zero, zero, 0
+// 0x01041194: 0x1041194: bne   v0, zero, 0x1041118 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1041108
+	brtrue L_1041118
 // --- basic block ---
-// 0x0104118c: 0x104118c: lw    ra, 52(sp)
-// 0x01041190: 0x1041190: lw    s7, 48(sp)
+// 0x0104119c: 0x104119c: lw    ra, 52(sp)
+// 0x010411a0: 0x10411a0: lw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1897,7 +1897,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01041194: 0x1041194: lw    s6, 44(sp)
+// 0x010411a4: 0x10411a4: lw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1906,7 +1906,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01041198: 0x1041198: lw    s5, 40(sp)
+// 0x010411a8: 0x10411a8: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1915,7 +1915,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104119c: 0x104119c: lw    s4, 36(sp)
+// 0x010411ac: 0x10411ac: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1924,7 +1924,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010411a0: 0x10411a0: lw    s3, 32(sp)
+// 0x010411b0: 0x10411b0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1933,7 +1933,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010411a4: 0x10411a4: lw    s2, 28(sp)
+// 0x010411b4: 0x10411b4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1942,7 +1942,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010411a8: 0x10411a8: lw    s1, 24(sp)
+// 0x010411b8: 0x10411b8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1951,7 +1951,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010411ac: 0x10411ac: lw    s0, 20(sp)
+// 0x010411bc: 0x10411bc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1960,7 +1960,7 @@ L_1041178:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010411b0: 0x10411b0: jr    ra addiu sp, sp, 56
+// 0x010411c0: 0x10411c0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1972,7 +1972,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_city_find_10412b8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_find_10412c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s2,int32 s1,int32 s3,int32 ra)
@@ -2019,12 +2019,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010412b8: 0x10412b8: addiu sp, sp, -40
+// 0x010412c8: 0x10412c8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010412bc: 0x10412bc: sw    s1, 24(sp)
+// 0x010412cc: 0x10412cc: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2033,8 +2033,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010412c0: 0x10412c0: sw    ra, 36(sp)
-// 0x010412c4: 0x10412c4: sw    s3, 32(sp)
+// 0x010412d0: 0x10412d0: sw    ra, 36(sp)
+// 0x010412d4: 0x10412d4: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2043,7 +2043,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010412c8: 0x10412c8: sw    s2, 28(sp)
+// 0x010412d8: 0x10412d8: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2052,7 +2052,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010412cc: 0x10412cc: sw    s0, 20(sp)
+// 0x010412dc: 0x10412dc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2061,100 +2061,100 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010412d0: 0x10412d0: beq   a0, zero, 0x1041360 addu  s1, a0, zero
+// 0x010412e0: 0x10412e0: beq   a0, zero, 0x1041370 addu  s1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 10
-	brfalse L_1041360
+	brfalse L_1041370
 // --- basic block ---
-// 0x010412d8: 0x10412d8: lb    v0, 0(a0)
+// 0x010412e8: 0x10412e8: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010412dc: 0x10412dc: sll   zero, zero, 0
-// 0x010412e0: 0x10412e0: beq   v0, zero, 0x1041360 addu  v0, a0, zero
+// 0x010412ec: 0x10412ec: sll   zero, zero, 0
+// 0x010412f0: 0x10412f0: beq   v0, zero, 0x1041370 addu  v0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 6
-	brfalse L_1041360
+	brfalse L_1041370
 // --- basic block ---
-// 0x010412e8: 0x10412e8: j	 0x10412f8 addu  a1, zero, zero
+// 0x010412f8: 0x10412f8: j	 0x1041308 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_10412f8
+	br L_1041308
 // --- basic block ---
-L_10412f0:
-// 0x010412f0: 0x10412f0: addu  a1, a0, v1
+L_1041300:
+// 0x01041300: 0x1041300: addu  a1, a0, v1
 	ldloc.1
 	ldloc 8
 	add
 	stloc.2
-// 0x010412f4: 0x10412f4: addiu v0, v0, 1
+// 0x01041304: 0x1041304: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_10412f8:
-// 0x010412f8: 0x10412f8: lb    v1, 0(v0)
+L_1041308:
+// 0x01041308: 0x1041308: lb    v1, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010412fc: 0x10412fc: sll   zero, zero, 0
-// 0x01041300: 0x1041300: bne   v1, zero, 0x10412f0 sll   a0, a1, 8
+// 0x0104130c: 0x104130c: sll   zero, zero, 0
+// 0x01041310: 0x1041310: bne   v1, zero, 0x1041300 sll   a0, a1, 8
 	ldloc 8
 	ldloc.2
 	ldc.i4.8
 	shl
 	stloc.1
-	brtrue L_10412f0
+	brtrue L_1041300
 // --- basic block ---
-// 0x01041308: 0x1041308: lui   s2, 0x60000
+// 0x01041318: 0x1041318: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x0104130c: 0x104130c: lw    a0, 11844(s2)
+// 0x0104131c: 0x104131c: lw    a0, 12308(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041310: 0x1041310: jal   0x1015518 addiu s3, zero, -1
+// 0x01041320: 0x1041320: jal   0x1015528 addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 11
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_get_first_1015518(int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_first_1015528(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01041318: 0x1041318: j	 0x1041350 addu  s0, v0, zero
+// 0x01041328: 0x1041328: j	 0x1041360 addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-	br L_1041350
+	br L_1041360
 // --- basic block ---
-L_1041320:
-// 0x01041320: 0x1041320: lw    a0, 11844(s2)
+L_1041330:
+// 0x01041330: 0x1041330: lw    a0, 12308(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041324: 0x1041324: jal   0x10155e0 sll   zero, zero, 0
+// 0x01041334: 0x1041334: jal   0x10155f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104132c: 0x104132c: lw    a0, 8(v0)
+// 0x0104133c: 0x104133c: lw    a0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2163,7 +2163,7 @@ L_1041320:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041330: 0x1041330: jal   0x1001b14 addu  a1, s1, zero
+// 0x01041340: 0x1041340: jal   0x1001b14 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
@@ -2171,56 +2171,56 @@ L_1041320:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01041338: 0x1041338: beq   v0, zero, 0x1041364 addu  a1, s0, zero
+// 0x01041348: 0x1041348: beq   v0, zero, 0x1041374 addu  a1, s0, zero
 	ldloc 6
 	ldloc 7
 	stloc.2
-	brfalse L_1041364
+	brfalse L_1041374
 // --- basic block ---
-// 0x01041340: 0x1041340: lw    a0, 11844(s2)
+// 0x01041350: 0x1041350: lw    a0, 12308(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041344: 0x1041344: jal   0x1015744 sll   zero, zero, 0
+// 0x01041354: 0x1041354: jal   0x1015754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104134c: 0x104134c: addu  s0, v0, zero
+// 0x0104135c: 0x104135c: addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-L_1041350:
-// 0x01041350: 0x1041350: bne   s0, s3, 0x1041320 addu  a1, s0, zero
+L_1041360:
+// 0x01041360: 0x1041360: bne   s0, s3, 0x1041330 addu  a1, s0, zero
 	ldloc 7
 	ldloc 11
 	ldloc 7
 	stloc.2
-	bne.un L_1041320
+	bne.un L_1041330
 // --- basic block ---
-// 0x01041358: 0x1041358: j	 0x1041364 sll   zero, zero, 0
-	br L_1041364
+// 0x01041368: 0x1041368: j	 0x1041374 sll   zero, zero, 0
+	br L_1041374
 // --- basic block ---
-L_1041360:
-// 0x01041360: 0x1041360: addiu s0, zero, -1
+L_1041370:
+// 0x01041370: 0x1041370: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 7
-L_1041364:
-// 0x01041364: 0x1041364: lw    ra, 36(sp)
-// 0x01041368: 0x1041368: addu  v0, s0, zero
+L_1041374:
+// 0x01041374: 0x1041374: lw    ra, 36(sp)
+// 0x01041378: 0x1041378: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0104136c: 0x104136c: lw    s3, 32(sp)
+// 0x0104137c: 0x104137c: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2229,7 +2229,7 @@ L_1041364:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01041370: 0x1041370: lw    s2, 28(sp)
+// 0x01041380: 0x1041380: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2238,7 +2238,7 @@ L_1041364:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01041374: 0x1041374: lw    s1, 24(sp)
+// 0x01041384: 0x1041384: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2247,7 +2247,7 @@ L_1041364:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01041378: 0x1041378: lw    s0, 20(sp)
+// 0x01041388: 0x1041388: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2256,7 +2256,7 @@ L_1041364:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104137c: 0x104137c: jr    ra addiu sp, sp, 40
+// 0x0104138c: 0x104138c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2268,7 +2268,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_city_add_1041420(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_add_1041430(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s5,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -2321,12 +2321,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01041420: 0x1041420: addiu sp, sp, -48
+// 0x01041430: 0x1041430: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01041424: 0x1041424: sw    s5, 40(sp)
+// 0x01041434: 0x1041434: sw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2335,7 +2335,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01041428: 0x1041428: sw    s4, 36(sp)
+// 0x01041438: 0x1041438: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2344,7 +2344,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104142c: 0x104142c: sw    s3, 32(sp)
+// 0x0104143c: 0x104143c: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2353,7 +2353,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01041430: 0x1041430: sw    s0, 20(sp)
+// 0x01041440: 0x1041440: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2362,8 +2362,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01041434: 0x1041434: sw    ra, 44(sp)
-// 0x01041438: 0x1041438: sw    s2, 28(sp)
+// 0x01041444: 0x1041444: sw    ra, 44(sp)
+// 0x01041448: 0x1041448: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2372,7 +2372,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104143c: 0x104143c: sw    s1, 24(sp)
+// 0x0104144c: 0x104144c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2381,13 +2381,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01041440: 0x1041440: addu  s4, a1, zero
+// 0x01041450: 0x1041450: addu  s4, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01041444: 0x1041444: addu  s3, a2, zero
+// 0x01041454: 0x1041454: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01041448: 0x1041448: jal   0x10412b8 addu  s5, a0, zero
+// 0x01041458: 0x1041458: jal   0x10412c8 addu  s5, a0, zero
 	ldloc.1
 	stloc 10
 	ldloc.0
@@ -2395,65 +2395,65 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_find_10412b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_find_10412c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01041450: 0x1041450: addu  s0, v0, zero
+// 0x01041460: 0x1041460: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01041454: 0x1041454: addiu v0, zero, -1
+// 0x01041464: 0x1041464: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01041458: 0x1041458: bne   s0, v0, 0x1041520 lui   v0, 0x60000
+// 0x01041468: 0x1041468: bne   s0, v0, 0x1041530 lui   v0, 0x60000
 	ldloc 8
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	bne.un L_1041520
+	bne.un L_1041530
 // --- basic block ---
-// 0x01041460: 0x1041460: lui   v0, 0x60000
+// 0x01041470: 0x1041470: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01041464: 0x1041464: lw    a1, 11840(v0)
+// 0x01041474: 0x1041474: lw    a1, 12304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc.2
-// 0x01041468: 0x1041468: sll   zero, zero, 0
-// 0x0104146c: 0x104146c: beq   a1, zero, 0x1041494 sll   zero, zero, 0
+// 0x01041478: 0x1041478: sll   zero, zero, 0
+// 0x0104147c: 0x104147c: beq   a1, zero, 0x10414a4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1041494
+	brfalse L_10414a4
 // --- basic block ---
-// 0x01041474: 0x1041474: andi  v0, a1, 4095
+// 0x01041484: 0x1041484: andi  v0, a1, 4095
 	ldloc.2
 	ldc.i4 4095
 	and
 	stloc 5
-// 0x01041478: 0x1041478: bne   v0, zero, 0x1041494 lui   v0, 0x60000
+// 0x01041488: 0x1041488: bne   v0, zero, 0x10414a4 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_1041494
+	brtrue L_10414a4
 // --- basic block ---
-// 0x01041480: 0x1041480: lui   v0, 0x60000
+// 0x01041490: 0x1041490: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01041484: 0x1041484: lw    a0, 11844(v0)
+// 0x01041494: 0x1041494: lw    a0, 12308(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041488: 0x1041488: jal   0x1015b18 addiu a1, a1, 4096
+// 0x01041498: 0x1041498: jal   0x1015b28 addiu a1, a1, 4096
 	ldloc.2
 	ldc.i4 4096
 	add
@@ -2463,38 +2463,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_resize_1015b18(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_resize_1015b28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01041490: 0x1041490: lui   v0, 0x60000
+// 0x010414a0: 0x10414a0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1041494:
-// 0x01041494: 0x1041494: lw    s0, 11840(v0)
+L_10414a4:
+// 0x010414a4: 0x10414a4: lw    s0, 12304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 8
-// 0x01041498: 0x1041498: addiu a0, zero, 12
+// 0x010414a8: 0x10414a8: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0104149c: 0x104149c: addiu v1, s0, 1
+// 0x010414ac: 0x10414ac: addiu v1, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010414a0: 0x10414a0: jal   0x1000910 sw    v1, 11840(v0)
+// 0x010414b0: 0x10414b0: jal   0x1000910 sw    v1, 12304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldloc 7
 	stelem.i4
@@ -2508,10 +2508,10 @@ L_1041494:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010414a8: 0x10414a8: addu  a0, s5, zero
+// 0x010414b8: 0x10414b8: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-// 0x010414ac: 0x10414ac: jal   0x1001ba8 addu  s1, v0, zero
+// 0x010414bc: 0x10414bc: jal   0x1001ba8 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -2524,7 +2524,7 @@ L_1041494:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010414b4: 0x10414b4: sw    v0, 8(s1)
+// 0x010414c4: 0x10414c4: sw    v0, 8(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2533,10 +2533,10 @@ L_1041494:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010414b8: 0x10414b8: lui   v0, 0x60000
+// 0x010414c8: 0x10414c8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010414bc: 0x10414bc: sw    s1, 4(s1)
+// 0x010414cc: 0x10414cc: sw    s1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2545,56 +2545,56 @@ L_1041494:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010414c0: 0x10414c0: sw    s1, 0(s1)
+// 0x010414d0: 0x10414d0: sw    s1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010414c4: 0x10414c4: lw    a0, 11844(v0)
+// 0x010414d4: 0x10414d4: lw    a0, 12308(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x010414c8: 0x10414c8: addu  s2, s1, zero
+// 0x010414d8: 0x10414d8: addu  s2, s1, zero
 	ldloc 9
 	stloc 11
-// 0x010414cc: 0x10414cc: j	 0x10414dc addu  a1, zero, zero
+// 0x010414dc: 0x10414dc: j	 0x10414ec addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_10414dc
+	br L_10414ec
 // --- basic block ---
-L_10414d4:
-// 0x010414d4: 0x10414d4: addu  a1, v1, v0
+L_10414e4:
+// 0x010414e4: 0x10414e4: addu  a1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc.2
-// 0x010414d8: 0x10414d8: addiu s5, s5, 1
+// 0x010414e8: 0x10414e8: addiu s5, s5, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10414dc:
-// 0x010414dc: 0x10414dc: lb    v0, 0(s5)
+L_10414ec:
+// 0x010414ec: 0x10414ec: lb    v0, 0(s5)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010414e0: 0x10414e0: sll   zero, zero, 0
-// 0x010414e4: 0x10414e4: bne   v0, zero, 0x10414d4 sll   v1, a1, 8
+// 0x010414f0: 0x10414f0: sll   zero, zero, 0
+// 0x010414f4: 0x10414f4: bne   v0, zero, 0x10414e4 sll   v1, a1, 8
 	ldloc 5
 	ldloc.2
 	ldc.i4.8
 	shl
 	stloc 7
-	brtrue L_10414d4
+	brtrue L_10414e4
 // --- basic block ---
-// 0x010414ec: 0x10414ec: jal   0x10157cc addu  a2, s0, zero
+// 0x010414fc: 0x10414fc: jal   0x10157dc addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -2602,27 +2602,27 @@ L_10414dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010414f4: 0x10414f4: lui   v0, 0x60000
+// 0x01041504: 0x1041504: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010414f8: 0x10414f8: lw    a0, 11844(v0)
+// 0x01041508: 0x1041508: lw    a0, 12308(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x010414fc: 0x10414fc: addu  a2, s1, zero
+// 0x0104150c: 0x104150c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x01041500: 0x1041500: jal   0x10159ac addu  a1, s0, zero
+// 0x01041510: 0x1041510: jal   0x10159bc addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2630,51 +2630,51 @@ L_10414dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_set_value_10159ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_set_value_10159bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01041508: 0x1041508: lui   v0, 0x60000
+// 0x01041518: 0x1041518: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104150c: 0x104150c: lw    v1, 11836(v0)
+// 0x0104151c: 0x104151c: lw    v1, 12300(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldelem.i4
 	stloc 7
-// 0x01041510: 0x1041510: sll   zero, zero, 0
-// 0x01041514: 0x1041514: addiu v1, v1, 1
+// 0x01041520: 0x1041520: sll   zero, zero, 0
+// 0x01041524: 0x1041524: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01041518: 0x1041518: j	 0x104157c sw    v1, 11836(v0)
+// 0x01041528: 0x1041528: j	 0x104158c sw    v1, 12300(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldloc 7
 	stelem.i4
-	br L_104157c
+	br L_104158c
 // --- basic block ---
-L_1041520:
-// 0x01041520: 0x1041520: lw    a0, 11844(v0)
+L_1041530:
+// 0x01041530: 0x1041530: lw    a0, 12308(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041524: 0x1041524: jal   0x10155e0 addu  a1, s0, zero
+// 0x01041534: 0x1041534: jal   0x10155f0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2682,28 +2682,28 @@ L_1041520:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104152c: 0x104152c: addu  s2, v0, zero
+// 0x0104153c: 0x104153c: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01041530: 0x1041530: lw    v0, 0(v0)
+// 0x01041540: 0x1041540: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01041534: 0x1041534: j	 0x1041570 addu  v1, v0, zero
+// 0x01041544: 0x1041544: j	 0x1041580 addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-	br L_1041570
+	br L_1041580
 // --- basic block ---
-L_104153c:
-// 0x0104153c: 0x104153c: lw    a1, 8(v1)
+L_104154c:
+// 0x0104154c: 0x104154c: lw    a1, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2712,15 +2712,15 @@ L_104153c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01041540: 0x1041540: sll   zero, zero, 0
-// 0x01041544: 0x1041544: bne   a1, s4, 0x104156c addu  v0, a0, zero
+// 0x01041550: 0x1041550: sll   zero, zero, 0
+// 0x01041554: 0x1041554: bne   a1, s4, 0x104157c addu  v0, a0, zero
 	ldloc.2
 	ldloc 13
 	ldloc.1
 	stloc 5
-	bne.un L_104156c
+	bne.un L_104157c
 // --- basic block ---
-// 0x0104154c: 0x104154c: lw    v0, 12(v1)
+// 0x0104155c: 0x104155c: lw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2729,24 +2729,24 @@ L_104153c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01041550: 0x1041550: sll   zero, zero, 0
-// 0x01041554: 0x1041554: beq   v0, s3, 0x10415b0 lui   v0, 0x60000
+// 0x01041560: 0x1041560: sll   zero, zero, 0
+// 0x01041564: 0x1041564: beq   v0, s3, 0x10415c0 lui   v0, 0x60000
 	ldloc 5
 	ldloc 12
 	ldc.i4 393216
 	stloc 5
-	beq  L_10415b0
+	beq  L_10415c0
 // --- basic block ---
-// 0x0104155c: 0x104155c: lw    a0, 11836(v0)
+// 0x0104156c: 0x104156c: lw    a0, 12300(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041560: 0x1041560: sw    s3, 12(v1)
+// 0x01041570: 0x1041570: sw    s3, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2755,32 +2755,32 @@ L_104153c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01041564: 0x1041564: j	 0x10415ac addiu v1, a0, 1
+// 0x01041574: 0x1041574: j	 0x10415bc addiu v1, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc 7
-	br L_10415ac
+	br L_10415bc
 // --- basic block ---
-L_104156c:
-// 0x0104156c: 0x104156c: addu  v1, v0, zero
+L_104157c:
+// 0x0104157c: 0x104157c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_1041570:
-// 0x01041570: 0x1041570: lw    a0, 0(v0)
+L_1041580:
+// 0x01041580: 0x1041580: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01041574: 0x1041574: bne   v0, s2, 0x104153c sll   zero, zero, 0
+// 0x01041584: 0x1041584: bne   v0, s2, 0x104154c sll   zero, zero, 0
 	ldloc 5
 	ldloc 11
-	bne.un L_104153c
+	bne.un L_104154c
 // --- basic block ---
-L_104157c:
-// 0x0104157c: 0x104157c: jal   0x1000910 addiu a0, zero, 20
+L_104158c:
+// 0x0104158c: 0x104158c: jal   0x1000910 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -2793,7 +2793,7 @@ L_104157c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01041584: 0x1041584: lw    a1, 4(s2)
+// 0x01041594: 0x1041594: lw    a1, 4(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2802,10 +2802,10 @@ L_104157c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01041588: 0x1041588: addu  a0, v0, zero
+// 0x01041598: 0x1041598: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104158c: 0x104158c: sw    s4, 8(v0)
+// 0x0104159c: 0x104159c: sw    s4, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2814,7 +2814,7 @@ L_104157c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01041590: 0x1041590: sw    s3, 12(v0)
+// 0x010415a0: 0x10415a0: sw    s3, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2823,7 +2823,7 @@ L_104157c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01041594: 0x1041594: jal   0x1015bdc sw    s0, 16(v0)
+// 0x010415a4: 0x10415a4: jal   0x1015bec sw    s0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2834,43 +2834,43 @@ L_104157c:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl16::roadmap_list_enqueue_1015bdc(int32,int32)
+	call int32 Cibyl16::roadmap_list_enqueue_1015bec(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104159c: 0x104159c: lui   v0, 0x60000
+// 0x010415ac: 0x10415ac: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010415a0: 0x10415a0: lw    v1, 11836(v0)
+// 0x010415b0: 0x10415b0: lw    v1, 12300(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldelem.i4
 	stloc 7
-// 0x010415a4: 0x10415a4: sll   zero, zero, 0
-// 0x010415a8: 0x10415a8: addiu v1, v1, 1
+// 0x010415b4: 0x10415b4: sll   zero, zero, 0
+// 0x010415b8: 0x10415b8: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_10415ac:
-// 0x010415ac: 0x10415ac: sw    v1, 11836(v0)
+L_10415bc:
+// 0x010415bc: 0x10415bc: sw    v1, 12300(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldloc 7
 	stelem.i4
-L_10415b0:
-// 0x010415b0: 0x10415b0: lw    ra, 44(sp)
-// 0x010415b4: 0x10415b4: addu  v0, s0, zero
+L_10415c0:
+// 0x010415c0: 0x10415c0: lw    ra, 44(sp)
+// 0x010415c4: 0x10415c4: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x010415b8: 0x10415b8: lw    s5, 40(sp)
+// 0x010415c8: 0x10415c8: lw    s5, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2879,7 +2879,7 @@ L_10415b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010415bc: 0x10415bc: lw    s4, 36(sp)
+// 0x010415cc: 0x10415cc: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2888,7 +2888,7 @@ L_10415b0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010415c0: 0x10415c0: lw    s3, 32(sp)
+// 0x010415d0: 0x10415d0: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2897,7 +2897,7 @@ L_10415b0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010415c4: 0x10415c4: lw    s2, 28(sp)
+// 0x010415d4: 0x10415d4: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2906,7 +2906,7 @@ L_10415b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010415c8: 0x10415c8: lw    s1, 24(sp)
+// 0x010415d8: 0x10415d8: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2915,7 +2915,7 @@ L_10415b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010415cc: 0x10415cc: lw    s0, 20(sp)
+// 0x010415dc: 0x10415dc: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2924,7 +2924,7 @@ L_10415b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010415d0: 0x10415d0: jr    ra addiu sp, sp, 48
+// 0x010415e0: 0x10415e0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2936,7 +2936,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_city_free_10415d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_free_10415e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s3,int32 s0,int32 v1,int32 s2,int32 s1,int32 s4,int32 s5,int32 ra)
@@ -2989,12 +2989,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010415d8: 0x10415d8: addiu sp, sp, -48
+// 0x010415e8: 0x10415e8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010415dc: 0x10415dc: sw    s2, 28(sp)
+// 0x010415ec: 0x10415ec: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3003,20 +3003,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010415e0: 0x10415e0: lui   s2, 0x60000
+// 0x010415f0: 0x10415f0: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x010415e4: 0x10415e4: lw    v0, 11844(s2)
+// 0x010415f4: 0x10415f4: lw    v0, 12308(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc 6
-// 0x010415e8: 0x10415e8: sw    ra, 44(sp)
-// 0x010415ec: 0x10415ec: sw    s5, 40(sp)
+// 0x010415f8: 0x10415f8: sw    ra, 44(sp)
+// 0x010415fc: 0x10415fc: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3025,7 +3025,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010415f0: 0x10415f0: sw    s4, 36(sp)
+// 0x01041600: 0x1041600: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3034,7 +3034,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010415f4: 0x10415f4: sw    s3, 32(sp)
+// 0x01041604: 0x1041604: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3043,7 +3043,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010415f8: 0x10415f8: sw    s1, 24(sp)
+// 0x01041608: 0x1041608: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3052,7 +3052,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010415fc: 0x10415fc: beq   v0, zero, 0x1041690 sw    s0, 20(sp)
+// 0x0104160c: 0x104160c: beq   v0, zero, 0x10416a0 sw    s0, 20(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -3062,27 +3062,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1041690
+	brfalse L_10416a0
 // --- basic block ---
-// 0x01041604: 0x1041604: addu  s0, zero, zero
+// 0x01041614: 0x1041614: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01041608: 0x1041608: j	 0x104166c lui   s1, 0x60000
+// 0x01041618: 0x1041618: j	 0x104167c lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 11
-	br L_104166c
+	br L_104167c
 // --- basic block ---
-L_1041610:
-// 0x01041610: 0x1041610: lw    a0, 11844(s2)
+L_1041620:
+// 0x01041620: 0x1041620: lw    a0, 12308(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041614: 0x1041614: jal   0x10155e0 addu  a1, s0, zero
+// 0x01041624: 0x1041624: jal   0x10155f0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3090,39 +3090,39 @@ L_1041610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_value_10155e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_value_10155f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104161c: 0x104161c: beq   v0, zero, 0x1041668 addu  s4, v0, zero
+// 0x0104162c: 0x104162c: beq   v0, zero, 0x1041678 addu  s4, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 12
-	brfalse L_1041668
+	brfalse L_1041678
 // --- basic block ---
-// 0x01041624: 0x1041624: lw    s3, 0(v0)
+// 0x01041634: 0x1041634: lw    s3, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01041628: 0x1041628: j	 0x1041648 addu  a0, s3, zero
+// 0x01041638: 0x1041638: j	 0x1041658 addu  a0, s3, zero
 	ldloc 7
 	stloc.1
-	br L_1041648
+	br L_1041658
 // --- basic block ---
-L_1041630:
-// 0x01041630: 0x1041630: jal   0x1015bf8 sll   zero, zero, 0
+L_1041640:
+// 0x01041640: 0x1041640: jal   0x1015c08 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl16::roadmap_list_remove_1015bf8(int32,int32)
+	call int32 Cibyl16::roadmap_list_remove_1015c08(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01041638: 0x1041638: jal   0x1000930 addu  a0, s3, zero
+// 0x01041648: 0x1041648: jal   0x1000930 addu  a0, s3, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3135,26 +3135,26 @@ L_1041630:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01041640: 0x1041640: addu  s3, s5, zero
+// 0x01041650: 0x1041650: addu  s3, s5, zero
 	ldloc 13
 	stloc 7
-// 0x01041644: 0x1041644: addu  a0, s3, zero
+// 0x01041654: 0x1041654: addu  a0, s3, zero
 	ldloc 7
 	stloc.1
-L_1041648:
-// 0x01041648: 0x1041648: lw    s5, 0(s3)
+L_1041658:
+// 0x01041658: 0x1041658: lw    s5, 0(s3)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0104164c: 0x104164c: bne   s3, s4, 0x1041630 sll   zero, zero, 0
+// 0x0104165c: 0x104165c: bne   s3, s4, 0x1041640 sll   zero, zero, 0
 	ldloc 7
 	ldloc 12
-	bne.un L_1041630
+	bne.un L_1041640
 // --- basic block ---
-// 0x01041654: 0x1041654: lw    a0, 8(s3)
+// 0x01041664: 0x1041664: lw    a0, 8(s3)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3163,7 +3163,7 @@ L_1041648:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041658: 0x1041658: jal   0x1000930 sll   zero, zero, 0
+// 0x01041668: 0x1041668: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3174,7 +3174,7 @@ L_1041648:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01041660: 0x1041660: jal   0x1000930 addu  a0, s3, zero
+// 0x01041670: 0x1041670: jal   0x1000930 addu  a0, s3, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3187,69 +3187,69 @@ L_1041648:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_1041668:
-// 0x01041668: 0x1041668: addiu s0, s0, 1
+L_1041678:
+// 0x01041678: 0x1041678: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_104166c:
-// 0x0104166c: 0x104166c: lw    v0, 11840(s1)
+L_104167c:
+// 0x0104167c: 0x104167c: lw    v0, 12304(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldelem.i4
 	stloc 6
-// 0x01041670: 0x1041670: sll   zero, zero, 0
-// 0x01041674: 0x1041674: slt   v0, s0, v0
+// 0x01041680: 0x1041680: sll   zero, zero, 0
+// 0x01041684: 0x1041684: slt   v0, s0, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x01041678: 0x1041678: bne   v0, zero, 0x1041610 lui   s3, 0x60000
+// 0x01041688: 0x1041688: bne   v0, zero, 0x1041620 lui   s3, 0x60000
 	ldloc 6
 	ldc.i4 393216
 	stloc 7
-	brtrue L_1041610
+	brtrue L_1041620
 // --- basic block ---
-// 0x01041680: 0x1041680: lw    a0, 11844(s3)
+// 0x01041690: 0x1041690: lw    a0, 12308(s3)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041684: 0x1041684: jal   0x1015a90 sll   zero, zero, 0
+// 0x01041694: 0x1041694: jal   0x1015aa0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_free_1015a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_free_1015aa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104168c: 0x104168c: sw    zero, 11844(s3)
+// 0x0104169c: 0x104169c: sw    zero, 12308(s3)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1041690:
-// 0x01041690: 0x1041690: lw    ra, 44(sp)
-// 0x01041694: 0x1041694: lui   v0, 0x60000
+L_10416a0:
+// 0x010416a0: 0x10416a0: lw    ra, 44(sp)
+// 0x010416a4: 0x10416a4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01041698: 0x1041698: lw    s5, 40(sp)
+// 0x010416a8: 0x10416a8: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3258,7 +3258,7 @@ L_1041690:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104169c: 0x104169c: lw    s4, 36(sp)
+// 0x010416ac: 0x10416ac: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3267,7 +3267,7 @@ L_1041690:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010416a0: 0x10416a0: lw    s3, 32(sp)
+// 0x010416b0: 0x10416b0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3276,7 +3276,7 @@ L_1041690:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010416a4: 0x10416a4: lw    s2, 28(sp)
+// 0x010416b4: 0x10416b4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3285,7 +3285,7 @@ L_1041690:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010416a8: 0x10416a8: lw    s1, 24(sp)
+// 0x010416b8: 0x10416b8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3294,7 +3294,7 @@ L_1041690:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010416ac: 0x10416ac: lw    s0, 20(sp)
+// 0x010416bc: 0x10416bc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3303,16 +3303,16 @@ L_1041690:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010416b0: 0x10416b0: sw    zero, 11840(v0)
+// 0x010416c0: 0x10416c0: sw    zero, 12304(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010416b4: 0x10416b4: jr    ra addiu sp, sp, 48
+// 0x010416c4: 0x10416c4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3324,7 +3324,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_city_init_10416bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_city_init_10416cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3359,43 +3359,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010416bc: 0x10416bc: addiu sp, sp, -24
+// 0x010416cc: 0x10416cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010416c0: 0x10416c0: sw    ra, 20(sp)
-// 0x010416c4: 0x10416c4: jal   0x10415d8 sll   zero, zero, 0
+// 0x010416d0: 0x10416d0: sw    ra, 20(sp)
+// 0x010416d4: 0x10416d4: jal   0x10415e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_free_10415d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_free_10415e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010416cc: 0x10416cc: lui   a0, 0x10000
+// 0x010416dc: 0x10416dc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010416d0: 0x10416d0: lui   v0, 0x60000
+// 0x010416e0: 0x10416e0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010416d4: 0x10416d4: addiu a0, a0, -3504
+// 0x010416e4: 0x10416e4: addiu a0, a0, -3508
 	ldloc.1
-	ldc.i4 -3504
+	ldc.i4 -3508
 	add
 	stloc.1
-// 0x010416d8: 0x10416d8: addiu a1, zero, 4096
+// 0x010416e8: 0x10416e8: addiu a1, zero, 4096
 	ldc.i4 4096
 	stloc.2
-// 0x010416dc: 0x10416dc: jal   0x10158bc sw    zero, 11840(v0)
+// 0x010416ec: 0x10416ec: jal   0x10158cc sw    zero, 12304(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2960
+	ldc.i4 3076
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3404,40 +3404,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_new_10158bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_new_10158cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010416e4: 0x10416e4: lui   v1, 0x60000
+// 0x010416f4: 0x10416f4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010416e8: 0x10416e8: lw    ra, 20(sp)
-// 0x010416ec: 0x10416ec: sw    v0, 11844(v1)
+// 0x010416f8: 0x10416f8: lw    ra, 20(sp)
+// 0x010416fc: 0x10416fc: sw    v0, 12308(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2961
+	ldc.i4 3077
 	add
 	ldloc 5
 	stelem.i4
-// 0x010416f0: 0x10416f0: addiu v1, zero, 1
+// 0x01041700: 0x1041700: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010416f4: 0x10416f4: lui   v0, 0x60000
+// 0x01041704: 0x1041704: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010416f8: 0x10416f8: sw    v1, 11836(v0)
+// 0x01041708: 0x1041708: sw    v1, 12300(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2959
+	ldc.i4 3075
 	add
 	ldloc 6
 	stelem.i4
-// 0x010416fc: 0x10416fc: jr    ra addiu sp, sp, 24
+// 0x0104170c: 0x104170c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3449,7 +3449,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_range_get_street_1041920(int32)
+.method public static int32 roadmap_range_get_street_1041930(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -3475,61 +3475,61 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01041920: 0x1041920: addiu v0, zero, -1
+// 0x01041930: 0x1041930: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01041924: 0x1041924: beq   a0, v0, 0x1041994 sll   zero, zero, 0
+// 0x01041934: 0x1041934: beq   a0, v0, 0x10419a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	beq  L_1041994
+	beq  L_10419a4
 // --- basic block ---
-// 0x0104192c: 0x104192c: andi  v0, a0, 32768
+// 0x0104193c: 0x104193c: andi  v0, a0, 32768
 	ldloc.0
 	ldc.i4 32768
 	and
 	stloc.1
-// 0x01041930: 0x1041930: beq   v0, zero, 0x1041944 lui   v0, 0xffff0000
+// 0x01041940: 0x1041940: beq   v0, zero, 0x1041954 lui   v0, 0xffff0000
 	ldloc.1
 	ldc.i4 4294901760
 	stloc.1
-	brfalse L_1041944
+	brfalse L_1041954
 // --- basic block ---
-// 0x01041938: 0x1041938: ori   v0, v0, 32767
+// 0x01041948: 0x1041948: ori   v0, v0, 32767
 	ldloc.1
 	ldc.i4 32767
 	or
 	stloc.1
-// 0x0104193c: 0x104193c: jr    ra and   v0, a0, v0
+// 0x0104194c: 0x104194c: jr    ra and   v0, a0, v0
 	ldloc.0
 	ldloc.1
 	and
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_1041944:
-// 0x01041944: 0x1041944: lui   v0, 0x60000
+L_1041954:
+// 0x01041954: 0x1041954: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01041948: 0x1041948: lw    v1, 11848(v0)
+// 0x01041958: 0x1041958: lw    v1, 12312(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2962
+	ldc.i4 3078
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104194c: 0x104194c: sll   zero, zero, 0
-// 0x01041950: 0x1041950: beq   v1, zero, 0x1041994 sll   zero, zero, 0
+// 0x0104195c: 0x104195c: sll   zero, zero, 0
+// 0x01041960: 0x1041960: beq   v1, zero, 0x10419a4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1041994
+	brfalse L_10419a4
 // --- basic block ---
-// 0x01041958: 0x1041958: bltz  a0, 0x1041994 sll   zero, zero, 0
+// 0x01041968: 0x1041968: bltz  a0, 0x10419a4 sll   zero, zero, 0
 	ldloc.0
 	ldc.i4.s 0
-	blt L_1041994
+	blt L_10419a4
 // --- basic block ---
-// 0x01041960: 0x1041960: lw    v0, 8(v1)
+// 0x01041970: 0x1041970: lw    v0, 8(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -3538,25 +3538,25 @@ L_1041944:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041964: 0x1041964: sll   zero, zero, 0
-// 0x01041968: 0x1041968: slt   v0, a0, v0
+// 0x01041974: 0x1041974: sll   zero, zero, 0
+// 0x01041978: 0x1041978: slt   v0, a0, v0
 	ldloc.0
 	ldloc.1
 	clt
 	stloc.1
-// 0x0104196c: 0x104196c: beq   v0, zero, 0x1041994 sll   zero, zero, 0
+// 0x0104197c: 0x104197c: beq   v0, zero, 0x10419a4 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1041994
+	brfalse L_10419a4
 // --- basic block ---
-// 0x01041974: 0x1041974: addiu v0, zero, 6
+// 0x01041984: 0x1041984: addiu v0, zero, 6
 	ldc.i4.6
 	stloc.1
-// 0x01041978: 0x1041978: mult  a0, v0
+// 0x01041988: 0x1041988: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc 5
-// 0x0104197c: 0x104197c: lw    v0, 4(v1)
+// 0x0104198c: 0x104198c: lw    v0, 4(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -3565,27 +3565,27 @@ L_1041944:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01041980: 0x1041980: mflo  lo
+// 0x01041990: 0x1041990: mflo  lo
 	ldloc 5
 	stloc.0
-// 0x01041984: 0x1041984: addu  a0, v0, a0
+// 0x01041994: 0x1041994: addu  a0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x01041988: 0x1041988: lhu   v0, 0(a0)
+// 0x01041998: 0x1041998: lhu   v0, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x0104198c: 0x104198c: jr    ra andi  v0, v0, 16383
+// 0x0104199c: 0x104199c: jr    ra andi  v0, v0, 16383
 	ldloc.1
 	ldc.i4 16383
 	and
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_1041994:
-// 0x01041994: 0x1041994: jr    ra addiu v0, zero, -1
+L_10419a4:
+// 0x010419a4: 0x10419a4: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	br __CIBYL_function_return
@@ -3595,7 +3595,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_range_activate_104199c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_range_activate_10419ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -3633,13 +3633,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104199c:
-// 0x0104199c: 0x104199c: addiu sp, sp, -24
+L_10419ac:
+// 0x010419ac: 0x10419ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010419a0: 0x10419a0: sw    s0, 16(sp)
+// 0x010419b0: 0x10419b0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3648,57 +3648,57 @@ L_104199c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010419a4: 0x10419a4: sw    ra, 20(sp)
-// 0x010419a8: 0x10419a8: beq   a0, zero, 0x10419e0 addu  s0, a0, zero
+// 0x010419b4: 0x10419b4: sw    ra, 20(sp)
+// 0x010419b8: 0x10419b8: beq   a0, zero, 0x10419f0 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_10419e0
+	brfalse L_10419f0
 // --- basic block ---
-// 0x010419b0: 0x10419b0: lui   v0, 0x20000
+// 0x010419c0: 0x10419c0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010419b4: 0x10419b4: lw    v1, 0(a0)
+// 0x010419c4: 0x10419c4: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010419b8: 0x10419b8: lw    v0, 27472(v0)
+// 0x010419c8: 0x10419c8: lw    v0, 27936(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6868
+	ldc.i4 6984
 	add
 	ldelem.i4
 	stloc 5
-// 0x010419bc: 0x10419bc: sll   zero, zero, 0
-// 0x010419c0: 0x10419c0: beq   v1, v0, 0x10419e0 lui   a1, 0x10000
+// 0x010419cc: 0x10419cc: sll   zero, zero, 0
+// 0x010419d0: 0x10419d0: beq   v1, v0, 0x10419f0 lui   a1, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_10419e0
+	beq  L_10419f0
 // --- basic block ---
-// 0x010419c8: 0x10419c8: lui   a3, 0x0
+// 0x010419d8: 0x10419d8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x010419cc: 0x10419cc: addiu a1, a1, -3428
+// 0x010419dc: 0x10419dc: addiu a1, a1, -3432
 	ldloc.2
-	ldc.i4 -3428
+	ldc.i4 -3432
 	add
 	stloc.2
-// 0x010419d0: 0x10419d0: addiu a3, a3, 27676
+// 0x010419e0: 0x10419e0: addiu a3, a3, 27676
 	ldloc 4
 	ldc.i4 27676
 	add
 	stloc 4
-// 0x010419d4: 0x10419d4: addiu a0, zero, 5
+// 0x010419e4: 0x10419e4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010419d8: 0x10419d8: jal   0x100449c addiu a2, zero, 73
+// 0x010419e8: 0x10419e8: jal   0x100449c addiu a2, zero, 73
 	ldc.i4.s 73
 	stloc.3
 	ldloc.0
@@ -3711,21 +3711,21 @@ L_104199c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10419e0:
-// 0x010419e0: 0x10419e0: lw    ra, 20(sp)
-// 0x010419e4: 0x10419e4: lui   v0, 0x60000
+L_10419f0:
+// 0x010419f0: 0x10419f0: lw    ra, 20(sp)
+// 0x010419f4: 0x10419f4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010419e8: 0x10419e8: sw    s0, 11848(v0)
+// 0x010419f8: 0x10419f8: sw    s0, 12312(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2962
+	ldc.i4 3078
 	add
 	ldloc 7
 	stelem.i4
-// 0x010419ec: 0x10419ec: lw    s0, 16(sp)
+// 0x010419fc: 0x10419fc: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3734,7 +3734,7 @@ L_10419e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010419f0: 0x10419f0: jr    ra addiu sp, sp, 24
+// 0x01041a00: 0x1041a00: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3746,7 +3746,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_range_get_address_10419f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_range_get_address_1041a08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0,int32 lo)
@@ -3787,42 +3787,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010419f8: 0x10419f8: lui   v0, 0x60000
+// 0x01041a08: 0x1041a08: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010419fc: 0x10419fc: lw    v0, 11848(v0)
+// 0x01041a0c: 0x1041a0c: lw    v0, 12312(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2962
+	ldc.i4 3078
 	add
 	ldelem.i4
 	stloc 5
-// 0x01041a00: 0x1041a00: addiu sp, sp, -24
+// 0x01041a10: 0x1041a10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01041a04: 0x1041a04: beq   v0, zero, 0x1041a34 sw    ra, 20(sp)
+// 0x01041a14: 0x1041a14: beq   v0, zero, 0x1041a44 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1041a34
+	brfalse L_1041a44
 // --- basic block ---
-// 0x01041a0c: 0x1041a0c: andi  v1, a0, 32768
+// 0x01041a1c: 0x1041a1c: andi  v1, a0, 32768
 	ldloc.1
 	ldc.i4 32768
 	and
 	stloc 6
-// 0x01041a10: 0x1041a10: bne   v1, zero, 0x1041a34 sll   zero, zero, 0
+// 0x01041a20: 0x1041a20: bne   v1, zero, 0x1041a44 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1041a34
+	brtrue L_1041a44
 // --- basic block ---
-// 0x01041a18: 0x1041a18: bltz  a0, 0x1041a34 sll   zero, zero, 0
+// 0x01041a28: 0x1041a28: bltz  a0, 0x1041a44 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1041a34
+	blt L_1041a44
 // --- basic block ---
-// 0x01041a20: 0x1041a20: lw    v1, 8(v0)
+// 0x01041a30: 0x1041a30: lw    v1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3831,23 +3831,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01041a24: 0x1041a24: sll   zero, zero, 0
-// 0x01041a28: 0x1041a28: slt   v1, a0, v1
+// 0x01041a34: 0x1041a34: sll   zero, zero, 0
+// 0x01041a38: 0x1041a38: slt   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 6
-// 0x01041a2c: 0x1041a2c: bne   v1, zero, 0x1041a48 addiu v1, zero, 6
+// 0x01041a3c: 0x1041a3c: bne   v1, zero, 0x1041a58 addiu v1, zero, 6
 	ldloc 6
 	ldc.i4.6
 	stloc 6
-	brtrue L_1041a48
+	brtrue L_1041a58
 // --- basic block ---
-L_1041a34:
-// 0x01041a34: 0x1041a34: addiu v0, zero, -1
+L_1041a44:
+// 0x01041a44: 0x1041a44: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01041a38: 0x1041a38: sw    v0, 4(a1)
+// 0x01041a48: 0x1041a48: sw    v0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3856,14 +3856,14 @@ L_1041a34:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01041a3c: 0x1041a3c: sw    v0, 0(a1)
+// 0x01041a4c: 0x1041a4c: sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01041a40: 0x1041a40: j	 0x1041c88 sw    v0, 4(a2)
+// 0x01041a50: 0x1041a50: j	 0x1041c98 sw    v0, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -3872,15 +3872,15 @@ L_1041a34:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1041c88
+	br L_1041c98
 // --- basic block ---
-L_1041a48:
-// 0x01041a48: 0x1041a48: mult  a0, v1
+L_1041a58:
+// 0x01041a58: 0x1041a58: mult  a0, v1
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 10
-// 0x01041a4c: 0x1041a4c: lw    v0, 4(v0)
+// 0x01041a5c: 0x1041a5c: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3889,79 +3889,79 @@ L_1041a48:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01041a50: 0x1041a50: mflo  lo
+// 0x01041a60: 0x1041a60: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x01041a54: 0x1041a54: addu  a0, v0, a0
+// 0x01041a64: 0x1041a64: addu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x01041a58: 0x1041a58: lhu   v0, 0(a0)
+// 0x01041a68: 0x1041a68: lhu   v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041a5c: 0x1041a5c: sll   zero, zero, 0
-// 0x01041a60: 0x1041a60: andi  v0, v0, 49152
+// 0x01041a6c: 0x1041a6c: sll   zero, zero, 0
+// 0x01041a70: 0x1041a70: andi  v0, v0, 49152
 	ldloc 5
 	ldc.i4 49152
 	and
 	stloc 5
-// 0x01041a64: 0x1041a64: beq   v0, zero, 0x1041a90 addiu a3, zero, 255
+// 0x01041a74: 0x1041a74: beq   v0, zero, 0x1041aa0 addiu a3, zero, 255
 	ldloc 5
 	ldc.i4 255
 	stloc 4
-	brfalse L_1041a90
+	brfalse L_1041aa0
 // --- basic block ---
-// 0x01041a6c: 0x1041a6c: addiu v1, zero, 16384
+// 0x01041a7c: 0x1041a7c: addiu v1, zero, 16384
 	ldc.i4 16384
 	stloc 6
-// 0x01041a70: 0x1041a70: beq   v0, v1, 0x1041afc ori   v1, zero, 32768
+// 0x01041a80: 0x1041a80: beq   v0, v1, 0x1041b0c ori   v1, zero, 32768
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 6
-	beq  L_1041afc
+	beq  L_1041b0c
 // --- basic block ---
-// 0x01041a78: 0x1041a78: beq   v0, v1, 0x1041b68 ori   v1, zero, 49152
+// 0x01041a88: 0x1041a88: beq   v0, v1, 0x1041b78 ori   v1, zero, 49152
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4 49152
 	or
 	stloc 6
-	beq  L_1041b68
+	beq  L_1041b78
 // --- basic block ---
-// 0x01041a80: 0x1041a80: bne   v0, v1, 0x1041ca0 lui   a3, 0x10000
+// 0x01041a90: 0x1041a90: bne   v0, v1, 0x1041cb0 lui   a3, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc 4
-	bne.un L_1041ca0
+	bne.un L_1041cb0
 // --- basic block ---
-// 0x01041a88: 0x1041a88: j	 0x1041bd8 ori   v1, zero, 65535
+// 0x01041a98: 0x1041a98: j	 0x1041be8 ori   v1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-	br L_1041bd8
+	br L_1041be8
 // --- basic block ---
-L_1041a90:
-// 0x01041a90: 0x1041a90: lhu   v1, 2(a0)
+L_1041aa0:
+// 0x01041aa0: 0x1041aa0: lhu   v1, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01041a94: 0x1041a94: sll   zero, zero, 0
-// 0x01041a98: 0x1041a98: srl   v0, v1, 8
+// 0x01041aa4: 0x1041aa4: sll   zero, zero, 0
+// 0x01041aa8: 0x1041aa8: srl   v0, v1, 8
 	ldloc 6
 	ldc.i4.8
 	shr.un
 	stloc 5
-// 0x01041a9c: 0x1041a9c: bne   v0, a3, 0x1041aac sw    v0, 0(a1)
+// 0x01041aac: 0x1041aac: bne   v0, a3, 0x1041abc sw    v0, 0(a1)
 	ldloc 5
 	ldloc 4
 	ldloc 7
@@ -3970,34 +3970,34 @@ L_1041a90:
 	shr.un
 	ldloc 5
 	stelem.i4
-	bne.un L_1041aac
+	bne.un L_1041abc
 // --- basic block ---
-// 0x01041aa4: 0x1041aa4: addiu v0, zero, -1
+// 0x01041ab4: 0x1041ab4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01041aa8: 0x1041aa8: sw    v0, 0(a1)
+// 0x01041ab8: 0x1041ab8: sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1041aac:
-// 0x01041aac: 0x1041aac: lhu   v0, 4(a0)
+L_1041abc:
+// 0x01041abc: 0x1041abc: lhu   v0, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041ab0: 0x1041ab0: addiu a3, zero, 255
+// 0x01041ac0: 0x1041ac0: addiu a3, zero, 255
 	ldc.i4 255
 	stloc 4
-// 0x01041ab4: 0x1041ab4: srl   a0, v0, 8
+// 0x01041ac4: 0x1041ac4: srl   a0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	shr.un
 	stloc.1
-// 0x01041ab8: 0x1041ab8: bne   a0, a3, 0x1041ac8 sw    a0, 4(a1)
+// 0x01041ac8: 0x1041ac8: bne   a0, a3, 0x1041ad8 sw    a0, 4(a1)
 	ldloc.1
 	ldloc 4
 	ldloc 7
@@ -4008,12 +4008,12 @@ L_1041aac:
 	add
 	ldloc.1
 	stelem.i4
-	bne.un L_1041ac8
+	bne.un L_1041ad8
 // --- basic block ---
-// 0x01041ac0: 0x1041ac0: addiu a0, zero, -1
+// 0x01041ad0: 0x1041ad0: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01041ac4: 0x1041ac4: sw    a0, 4(a1)
+// 0x01041ad4: 0x1041ad4: sw    a0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -4022,16 +4022,16 @@ L_1041aac:
 	add
 	ldloc.1
 	stelem.i4
-L_1041ac8:
-// 0x01041ac8: 0x1041ac8: andi  v1, v1, 255
+L_1041ad8:
+// 0x01041ad8: 0x1041ad8: andi  v1, v1, 255
 	ldloc 6
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01041acc: 0x1041acc: addiu a0, zero, 255
+// 0x01041adc: 0x1041adc: addiu a0, zero, 255
 	ldc.i4 255
 	stloc.1
-// 0x01041ad0: 0x1041ad0: bne   v1, a0, 0x1041ae0 sw    v1, 0(a2)
+// 0x01041ae0: 0x1041ae0: bne   v1, a0, 0x1041af0 sw    v1, 0(a2)
 	ldloc 6
 	ldloc.1
 	ldloc 7
@@ -4040,28 +4040,28 @@ L_1041ac8:
 	shr.un
 	ldloc 6
 	stelem.i4
-	bne.un L_1041ae0
+	bne.un L_1041af0
 // --- basic block ---
-// 0x01041ad8: 0x1041ad8: addiu v1, zero, -1
+// 0x01041ae8: 0x1041ae8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01041adc: 0x1041adc: sw    v1, 0(a2)
+// 0x01041aec: 0x1041aec: sw    v1, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_1041ae0:
-// 0x01041ae0: 0x1041ae0: andi  v0, v0, 255
+L_1041af0:
+// 0x01041af0: 0x1041af0: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x01041ae4: 0x1041ae4: addiu v1, zero, 255
+// 0x01041af4: 0x1041af4: addiu v1, zero, 255
 	ldc.i4 255
 	stloc 6
-// 0x01041ae8: 0x1041ae8: bne   v0, v1, 0x1041cb8 sw    v0, 4(a2)
+// 0x01041af8: 0x1041af8: bne   v0, v1, 0x1041cc8 sw    v0, 4(a2)
 	ldloc 5
 	ldloc 6
 	ldloc 7
@@ -4072,12 +4072,12 @@ L_1041ae0:
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_1041cb8
+	bne.un L_1041cc8
 // --- basic block ---
-// 0x01041af0: 0x1041af0: addiu v0, zero, -1
+// 0x01041b00: 0x1041b00: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01041af4: 0x1041af4: j	 0x1041cb8 sw    v0, 4(a2)
+// 0x01041b04: 0x1041b04: j	 0x1041cc8 sw    v0, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -4086,91 +4086,91 @@ L_1041ae0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1041cb8
+	br L_1041cc8
 // --- basic block ---
-L_1041afc:
-// 0x01041afc: 0x1041afc: lhu   v0, 2(a0)
+L_1041b0c:
+// 0x01041b0c: 0x1041b0c: lhu   v0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041b00: 0x1041b00: ori   v1, zero, 65535
+// 0x01041b10: 0x1041b10: ori   v1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-// 0x01041b04: 0x1041b04: bne   v0, v1, 0x1041b50 sll   zero, zero, 0
+// 0x01041b14: 0x1041b14: bne   v0, v1, 0x1041b60 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1041b50
+	bne.un L_1041b60
 // --- basic block ---
-// 0x01041b0c: 0x1041b0c: lhu   v1, 4(a0)
+// 0x01041b1c: 0x1041b1c: lhu   v1, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01041b10: 0x1041b10: sll   zero, zero, 0
-// 0x01041b14: 0x1041b14: bne   v1, v0, 0x1041b54 sll   zero, zero, 0
+// 0x01041b20: 0x1041b20: sll   zero, zero, 0
+// 0x01041b24: 0x1041b24: bne   v1, v0, 0x1041b64 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_1041b54
+	bne.un L_1041b64
 // --- basic block ---
-// 0x01041b1c: 0x1041b1c: lhu   v0, 6(a0)
+// 0x01041b2c: 0x1041b2c: lhu   v0, 6(a0)
 	ldloc.1
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041b20: 0x1041b20: addiu a0, a0, 6
+// 0x01041b30: 0x1041b30: addiu a0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	add
 	stloc.1
-// 0x01041b24: 0x1041b24: andi  v1, v0, 255
+// 0x01041b34: 0x1041b34: andi  v1, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01041b28: 0x1041b28: lhu   a3, 4(a0)
+// 0x01041b38: 0x1041b38: lhu   a3, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x01041b2c: 0x1041b2c: andi  v0, v0, 65280
+// 0x01041b3c: 0x1041b3c: andi  v0, v0, 65280
 	ldloc 5
 	ldc.i4 65280
 	and
 	stloc 5
-// 0x01041b30: 0x1041b30: lhu   a0, 2(a0)
+// 0x01041b40: 0x1041b40: lhu   a0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01041b34: 0x1041b34: sll   v0, v0, 8
+// 0x01041b44: 0x1041b44: sll   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	shl
 	stloc 5
-// 0x01041b38: 0x1041b38: sll   v1, v1, 16
+// 0x01041b48: 0x1041b48: sll   v1, v1, 16
 	ldloc 6
 	ldc.i4.s 16
 	shl
 	stloc 6
-// 0x01041b3c: 0x1041b3c: addu  v0, v0, a0
+// 0x01041b4c: 0x1041b4c: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01041b40: 0x1041b40: addu  v1, v1, a3
+// 0x01041b50: 0x1041b50: addu  v1, v1, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 6
-// 0x01041b44: 0x1041b44: sw    v1, 4(a1)
+// 0x01041b54: 0x1041b54: sw    v1, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -4179,31 +4179,31 @@ L_1041afc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01041b48: 0x1041b48: j	 0x1041b5c sw    v0, 0(a1)
+// 0x01041b58: 0x1041b58: j	 0x1041b6c sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1041b5c
+	br L_1041b6c
 // --- basic block ---
-L_1041b50:
-// 0x01041b50: 0x1041b50: lhu   v1, 4(a0)
+L_1041b60:
+// 0x01041b60: 0x1041b60: lhu   v1, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-L_1041b54:
-// 0x01041b54: 0x1041b54: sw    v0, 0(a1)
+L_1041b64:
+// 0x01041b64: 0x1041b64: sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01041b58: 0x1041b58: sw    v1, 4(a1)
+// 0x01041b68: 0x1041b68: sw    v1, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -4212,11 +4212,11 @@ L_1041b54:
 	add
 	ldloc 6
 	stelem.i4
-L_1041b5c:
-// 0x01041b5c: 0x1041b5c: addiu v0, zero, -1
+L_1041b6c:
+// 0x01041b6c: 0x1041b6c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01041b60: 0x1041b60: j	 0x1041c88 sw    v0, 4(a2)
+// 0x01041b70: 0x1041b70: j	 0x1041c98 sw    v0, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -4225,91 +4225,91 @@ L_1041b5c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1041c88
+	br L_1041c98
 // --- basic block ---
-L_1041b68:
-// 0x01041b68: 0x1041b68: lhu   v0, 2(a0)
+L_1041b78:
+// 0x01041b78: 0x1041b78: lhu   v0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041b6c: 0x1041b6c: ori   v1, zero, 65535
+// 0x01041b7c: 0x1041b7c: ori   v1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 6
-// 0x01041b70: 0x1041b70: bne   v0, v1, 0x1041bbc sll   zero, zero, 0
+// 0x01041b80: 0x1041b80: bne   v0, v1, 0x1041bcc sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1041bbc
+	bne.un L_1041bcc
 // --- basic block ---
-// 0x01041b78: 0x1041b78: lhu   v1, 4(a0)
+// 0x01041b88: 0x1041b88: lhu   v1, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01041b7c: 0x1041b7c: sll   zero, zero, 0
-// 0x01041b80: 0x1041b80: bne   v1, v0, 0x1041bc0 sll   zero, zero, 0
+// 0x01041b8c: 0x1041b8c: sll   zero, zero, 0
+// 0x01041b90: 0x1041b90: bne   v1, v0, 0x1041bd0 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_1041bc0
+	bne.un L_1041bd0
 // --- basic block ---
-// 0x01041b88: 0x1041b88: lhu   v0, 6(a0)
+// 0x01041b98: 0x1041b98: lhu   v0, 6(a0)
 	ldloc.1
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041b8c: 0x1041b8c: addiu a0, a0, 6
+// 0x01041b9c: 0x1041b9c: addiu a0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	add
 	stloc.1
-// 0x01041b90: 0x1041b90: andi  v1, v0, 255
+// 0x01041ba0: 0x1041ba0: andi  v1, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01041b94: 0x1041b94: lhu   a3, 4(a0)
+// 0x01041ba4: 0x1041ba4: lhu   a3, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x01041b98: 0x1041b98: andi  v0, v0, 65280
+// 0x01041ba8: 0x1041ba8: andi  v0, v0, 65280
 	ldloc 5
 	ldc.i4 65280
 	and
 	stloc 5
-// 0x01041b9c: 0x1041b9c: lhu   a0, 2(a0)
+// 0x01041bac: 0x1041bac: lhu   a0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01041ba0: 0x1041ba0: sll   v0, v0, 8
+// 0x01041bb0: 0x1041bb0: sll   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	shl
 	stloc 5
-// 0x01041ba4: 0x1041ba4: sll   v1, v1, 16
+// 0x01041bb4: 0x1041bb4: sll   v1, v1, 16
 	ldloc 6
 	ldc.i4.s 16
 	shl
 	stloc 6
-// 0x01041ba8: 0x1041ba8: addu  v0, v0, a0
+// 0x01041bb8: 0x1041bb8: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01041bac: 0x1041bac: addu  v1, v1, a3
+// 0x01041bbc: 0x1041bbc: addu  v1, v1, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 6
-// 0x01041bb0: 0x1041bb0: sw    v1, 4(a2)
+// 0x01041bc0: 0x1041bc0: sw    v1, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -4318,31 +4318,31 @@ L_1041b68:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01041bb4: 0x1041bb4: j	 0x1041bc8 sw    v0, 0(a2)
+// 0x01041bc4: 0x1041bc4: j	 0x1041bd8 sw    v0, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1041bc8
+	br L_1041bd8
 // --- basic block ---
-L_1041bbc:
-// 0x01041bbc: 0x1041bbc: lhu   v1, 4(a0)
+L_1041bcc:
+// 0x01041bcc: 0x1041bcc: lhu   v1, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-L_1041bc0:
-// 0x01041bc0: 0x1041bc0: sw    v0, 0(a2)
+L_1041bd0:
+// 0x01041bd0: 0x1041bd0: sw    v0, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01041bc4: 0x1041bc4: sw    v1, 4(a2)
+// 0x01041bd4: 0x1041bd4: sw    v1, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -4351,11 +4351,11 @@ L_1041bc0:
 	add
 	ldloc 6
 	stelem.i4
-L_1041bc8:
-// 0x01041bc8: 0x1041bc8: addiu v0, zero, -1
+L_1041bd8:
+// 0x01041bd8: 0x1041bd8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01041bcc: 0x1041bcc: sw    v0, 4(a1)
+// 0x01041bdc: 0x1041bdc: sw    v0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -4364,92 +4364,92 @@ L_1041bc8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01041bd0: 0x1041bd0: j	 0x1041cb8 sw    v0, 0(a1)
+// 0x01041be0: 0x1041be0: j	 0x1041cc8 sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1041cb8
+	br L_1041cc8
 // --- basic block ---
-L_1041bd8:
-// 0x01041bd8: 0x1041bd8: lhu   v0, 2(a0)
+L_1041be8:
+// 0x01041be8: 0x1041be8: lhu   v0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041bdc: 0x1041bdc: sll   zero, zero, 0
-// 0x01041be0: 0x1041be0: bne   v0, v1, 0x1041c2c sll   zero, zero, 0
+// 0x01041bec: 0x1041bec: sll   zero, zero, 0
+// 0x01041bf0: 0x1041bf0: bne   v0, v1, 0x1041c3c sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1041c2c
+	bne.un L_1041c3c
 // --- basic block ---
-// 0x01041be8: 0x1041be8: lhu   v1, 4(a0)
+// 0x01041bf8: 0x1041bf8: lhu   v1, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01041bec: 0x1041bec: sll   zero, zero, 0
-// 0x01041bf0: 0x1041bf0: bne   v1, v0, 0x1041c30 sll   zero, zero, 0
+// 0x01041bfc: 0x1041bfc: sll   zero, zero, 0
+// 0x01041c00: 0x1041c00: bne   v1, v0, 0x1041c40 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_1041c30
+	bne.un L_1041c40
 // --- basic block ---
-// 0x01041bf8: 0x1041bf8: addiu a0, a0, 6
+// 0x01041c08: 0x1041c08: addiu a0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	add
 	stloc.1
-// 0x01041bfc: 0x1041bfc: lhu   v0, 0(a0)
+// 0x01041c0c: 0x1041c0c: lhu   v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041c00: 0x1041c00: lhu   t0, 2(a0)
+// 0x01041c10: 0x1041c10: lhu   t0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 9
-// 0x01041c04: 0x1041c04: andi  v1, v0, 255
+// 0x01041c14: 0x1041c14: andi  v1, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01041c08: 0x1041c08: lhu   a3, 4(a0)
+// 0x01041c18: 0x1041c18: lhu   a3, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x01041c0c: 0x1041c0c: andi  v0, v0, 65280
+// 0x01041c1c: 0x1041c1c: andi  v0, v0, 65280
 	ldloc 5
 	ldc.i4 65280
 	and
 	stloc 5
-// 0x01041c10: 0x1041c10: sll   v0, v0, 8
+// 0x01041c20: 0x1041c20: sll   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	shl
 	stloc 5
-// 0x01041c14: 0x1041c14: sll   v1, v1, 16
+// 0x01041c24: 0x1041c24: sll   v1, v1, 16
 	ldloc 6
 	ldc.i4.s 16
 	shl
 	stloc 6
-// 0x01041c18: 0x1041c18: addu  v0, v0, t0
+// 0x01041c28: 0x1041c28: addu  v0, v0, t0
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x01041c1c: 0x1041c1c: addu  v1, v1, a3
+// 0x01041c2c: 0x1041c2c: addu  v1, v1, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 6
-// 0x01041c20: 0x1041c20: sw    v1, 4(a1)
+// 0x01041c30: 0x1041c30: sw    v1, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -4458,31 +4458,31 @@ L_1041bd8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01041c24: 0x1041c24: j	 0x1041c38 sw    v0, 0(a1)
+// 0x01041c34: 0x1041c34: j	 0x1041c48 sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1041c38
+	br L_1041c48
 // --- basic block ---
-L_1041c2c:
-// 0x01041c2c: 0x1041c2c: lhu   v1, 4(a0)
+L_1041c3c:
+// 0x01041c3c: 0x1041c3c: lhu   v1, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-L_1041c30:
-// 0x01041c30: 0x1041c30: sw    v0, 0(a1)
+L_1041c40:
+// 0x01041c40: 0x1041c40: sw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01041c34: 0x1041c34: sw    v1, 4(a1)
+// 0x01041c44: 0x1041c44: sw    v1, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -4491,94 +4491,94 @@ L_1041c30:
 	add
 	ldloc 6
 	stelem.i4
-L_1041c38:
-// 0x01041c38: 0x1041c38: addiu v1, a0, 6
+L_1041c48:
+// 0x01041c48: 0x1041c48: addiu v1, a0, 6
 	ldloc.1
 	ldc.i4.6
 	add
 	stloc 6
-// 0x01041c3c: 0x1041c3c: lhu   v0, 2(v1)
+// 0x01041c4c: 0x1041c4c: lhu   v0, 2(v1)
 	ldloc 6
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041c40: 0x1041c40: ori   a1, zero, 65535
+// 0x01041c50: 0x1041c50: ori   a1, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc.2
-// 0x01041c44: 0x1041c44: bne   v0, a1, 0x1041c90 sll   zero, zero, 0
+// 0x01041c54: 0x1041c54: bne   v0, a1, 0x1041ca0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	bne.un L_1041c90
+	bne.un L_1041ca0
 // --- basic block ---
-// 0x01041c4c: 0x1041c4c: lhu   a1, 4(v1)
+// 0x01041c5c: 0x1041c5c: lhu   a1, 4(v1)
 	ldloc 6
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01041c50: 0x1041c50: sll   zero, zero, 0
-// 0x01041c54: 0x1041c54: bne   a1, v0, 0x1041c90 sll   zero, zero, 0
+// 0x01041c60: 0x1041c60: sll   zero, zero, 0
+// 0x01041c64: 0x1041c64: bne   a1, v0, 0x1041ca0 sll   zero, zero, 0
 	ldloc.2
 	ldloc 5
-	bne.un L_1041c90
+	bne.un L_1041ca0
 // --- basic block ---
-// 0x01041c5c: 0x1041c5c: lhu   v0, 12(a0)
+// 0x01041c6c: 0x1041c6c: lhu   v0, 12(a0)
 	ldloc.1
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01041c60: 0x1041c60: addiu a0, a0, 12
+// 0x01041c70: 0x1041c70: addiu a0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	add
 	stloc.1
-// 0x01041c64: 0x1041c64: andi  v1, v0, 255
+// 0x01041c74: 0x1041c74: andi  v1, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01041c68: 0x1041c68: lhu   a1, 4(a0)
+// 0x01041c78: 0x1041c78: lhu   a1, 4(a0)
 	ldloc.1
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01041c6c: 0x1041c6c: andi  v0, v0, 65280
+// 0x01041c7c: 0x1041c7c: andi  v0, v0, 65280
 	ldloc 5
 	ldc.i4 65280
 	and
 	stloc 5
-// 0x01041c70: 0x1041c70: lhu   a0, 2(a0)
+// 0x01041c80: 0x1041c80: lhu   a0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01041c74: 0x1041c74: sll   v1, v1, 16
+// 0x01041c84: 0x1041c84: sll   v1, v1, 16
 	ldloc 6
 	ldc.i4.s 16
 	shl
 	stloc 6
-// 0x01041c78: 0x1041c78: sll   v0, v0, 8
+// 0x01041c88: 0x1041c88: sll   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	shl
 	stloc 5
-// 0x01041c7c: 0x1041c7c: addu  v1, v1, a1
+// 0x01041c8c: 0x1041c8c: addu  v1, v1, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x01041c80: 0x1041c80: addu  v0, v0, a0
+// 0x01041c90: 0x1041c90: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01041c84: 0x1041c84: sw    v1, 4(a2)
+// 0x01041c94: 0x1041c94: sw    v1, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -4587,31 +4587,31 @@ L_1041c38:
 	add
 	ldloc 6
 	stelem.i4
-L_1041c88:
-// 0x01041c88: 0x1041c88: j	 0x1041cb8 sw    v0, 0(a2)
+L_1041c98:
+// 0x01041c98: 0x1041c98: j	 0x1041cc8 sw    v0, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_1041cb8
+	br L_1041cc8
 // --- basic block ---
-L_1041c90:
-// 0x01041c90: 0x1041c90: lhu   v1, 4(v1)
+L_1041ca0:
+// 0x01041ca0: 0x1041ca0: lhu   v1, 4(v1)
 	ldloc 6
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01041c94: 0x1041c94: sw    v0, 0(a2)
+// 0x01041ca4: 0x1041ca4: sw    v0, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01041c98: 0x1041c98: j	 0x1041cb8 sw    v1, 4(a2)
+// 0x01041ca8: 0x1041ca8: j	 0x1041cc8 sw    v1, 4(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
@@ -4620,26 +4620,26 @@ L_1041c90:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1041cb8
+	br L_1041cc8
 // --- basic block ---
-L_1041ca0:
-// 0x01041ca0: 0x1041ca0: lui   a1, 0x10000
+L_1041cb0:
+// 0x01041cb0: 0x1041cb0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01041ca4: 0x1041ca4: addiu a1, a1, -3428
+// 0x01041cb4: 0x1041cb4: addiu a1, a1, -3432
 	ldloc.2
-	ldc.i4 -3428
+	ldc.i4 -3432
 	add
 	stloc.2
-// 0x01041ca8: 0x1041ca8: addiu a3, a3, -3400
+// 0x01041cb8: 0x1041cb8: addiu a3, a3, -3404
 	ldloc 4
-	ldc.i4 -3400
+	ldc.i4 -3404
 	add
 	stloc 4
-// 0x01041cac: 0x1041cac: addiu a0, zero, 5
+// 0x01041cbc: 0x1041cbc: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01041cb0: 0x1041cb0: jal   0x100449c addiu a2, zero, 202
+// 0x01041cc0: 0x1041cc0: jal   0x100449c addiu a2, zero, 202
 	ldc.i4 202
 	stloc.3
 	ldloc.0
@@ -4652,10 +4652,10 @@ L_1041ca0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1041cb8:
-// 0x01041cb8: 0x1041cb8: lw    ra, 20(sp)
-// 0x01041cbc: 0x1041cbc: sll   zero, zero, 0
-// 0x01041cc0: 0x1041cc0: jr    ra addiu sp, sp, 24
+L_1041cc8:
+// 0x01041cc8: 0x1041cc8: lw    ra, 20(sp)
+// 0x01041ccc: 0x1041ccc: sll   zero, zero, 0
+// 0x01041cd0: 0x1041cd0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4667,7 +4667,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_range_unmap_1041cc8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_range_unmap_1041cd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -4705,32 +4705,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1041cc8:
-// 0x01041cc8: 0x1041cc8: lui   v0, 0x20000
+L_1041cd8:
+// 0x01041cd8: 0x1041cd8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01041ccc: 0x1041ccc: lw    v1, 0(a0)
+// 0x01041cdc: 0x1041cdc: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01041cd0: 0x1041cd0: lw    v0, 27472(v0)
+// 0x01041ce0: 0x1041ce0: lw    v0, 27936(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6868
+	ldc.i4 6984
 	add
 	ldelem.i4
 	stloc 5
-// 0x01041cd4: 0x1041cd4: addiu sp, sp, -24
+// 0x01041ce4: 0x1041ce4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01041cd8: 0x1041cd8: sw    s0, 16(sp)
+// 0x01041ce8: 0x1041ce8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4739,34 +4739,34 @@ L_1041cc8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01041cdc: 0x1041cdc: sw    ra, 20(sp)
-// 0x01041ce0: 0x1041ce0: beq   v1, v0, 0x1041d04 addu  s0, a0, zero
+// 0x01041cec: 0x1041cec: sw    ra, 20(sp)
+// 0x01041cf0: 0x1041cf0: beq   v1, v0, 0x1041d14 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_1041d04
+	beq  L_1041d14
 // --- basic block ---
-// 0x01041ce8: 0x1041ce8: lui   a1, 0x10000
+// 0x01041cf8: 0x1041cf8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01041cec: 0x1041cec: lui   a3, 0x0
+// 0x01041cfc: 0x1041cfc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01041cf0: 0x1041cf0: addiu a1, a1, -3428
+// 0x01041d00: 0x1041d00: addiu a1, a1, -3432
 	ldloc.2
-	ldc.i4 -3428
+	ldc.i4 -3432
 	add
 	stloc.2
-// 0x01041cf4: 0x1041cf4: addiu a3, a3, 24632
+// 0x01041d04: 0x1041d04: addiu a3, a3, 24632
 	ldloc 4
 	ldc.i4 24632
 	add
 	stloc 4
-// 0x01041cf8: 0x1041cf8: addiu a0, zero, 5
+// 0x01041d08: 0x1041d08: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01041cfc: 0x1041cfc: jal   0x100449c addiu a2, zero, 83
+// 0x01041d0c: 0x1041d0c: jal   0x100449c addiu a2, zero, 83
 	ldc.i4.s 83
 	stloc.3
 	ldloc.0
@@ -4779,36 +4779,36 @@ L_1041cc8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1041d04:
-// 0x01041d04: 0x1041d04: lui   v0, 0x60000
+L_1041d14:
+// 0x01041d14: 0x1041d14: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01041d08: 0x1041d08: lw    v1, 11848(v0)
+// 0x01041d18: 0x1041d18: lw    v1, 12312(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2962
+	ldc.i4 3078
 	add
 	ldelem.i4
 	stloc 7
-// 0x01041d0c: 0x1041d0c: sll   zero, zero, 0
-// 0x01041d10: 0x1041d10: bne   v1, s0, 0x1041d1c sll   zero, zero, 0
+// 0x01041d1c: 0x1041d1c: sll   zero, zero, 0
+// 0x01041d20: 0x1041d20: bne   v1, s0, 0x1041d2c sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1041d1c
+	bne.un L_1041d2c
 // --- basic block ---
-// 0x01041d18: 0x1041d18: sw    zero, 11848(v0)
+// 0x01041d28: 0x1041d28: sw    zero, 12312(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2962
+	ldc.i4 3078
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1041d1c:
-// 0x01041d1c: 0x1041d1c: jal   0x1000930 addu  a0, s0, zero
+L_1041d2c:
+// 0x01041d2c: 0x1041d2c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4821,8 +4821,8 @@ L_1041d1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01041d24: 0x1041d24: lw    ra, 20(sp)
-// 0x01041d28: 0x1041d28: lw    s0, 16(sp)
+// 0x01041d34: 0x1041d34: lw    ra, 20(sp)
+// 0x01041d38: 0x1041d38: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4831,7 +4831,7 @@ L_1041d1c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01041d2c: 0x1041d2c: jr    ra addiu sp, sp, 24
+// 0x01041d3c: 0x1041d3c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4843,7 +4843,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_range_map_1041d34(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_range_map_1041d44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4887,13 +4887,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1041d34:
-// 0x01041d34: 0x1041d34: addiu sp, sp, -40
+L_1041d44:
+// 0x01041d44: 0x1041d44: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01041d38: 0x1041d38: sw    s2, 32(sp)
+// 0x01041d48: 0x1041d48: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4902,14 +4902,14 @@ L_1041d34:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01041d3c: 0x1041d3c: addu  s2, a0, zero
+// 0x01041d4c: 0x1041d4c: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01041d40: 0x1041d40: addiu a0, zero, 12
+// 0x01041d50: 0x1041d50: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x01041d44: 0x1041d44: sw    ra, 36(sp)
-// 0x01041d48: 0x1041d48: sw    s1, 28(sp)
+// 0x01041d54: 0x1041d54: sw    ra, 36(sp)
+// 0x01041d58: 0x1041d58: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4918,7 +4918,7 @@ L_1041d34:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01041d4c: 0x1041d4c: sw    s0, 24(sp)
+// 0x01041d5c: 0x1041d5c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4927,7 +4927,7 @@ L_1041d34:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01041d50: 0x1041d50: jal   0x1000910 lui   s1, 0x10000
+// 0x01041d60: 0x1041d60: jal   0x1000910 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -4940,18 +4940,18 @@ L_1041d34:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01041d58: 0x1041d58: addu  a2, v0, zero
+// 0x01041d68: 0x1041d68: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x01041d5c: 0x1041d5c: addiu a0, s1, -3428
+// 0x01041d6c: 0x1041d6c: addiu a0, s1, -3432
 	ldloc 9
-	ldc.i4 -3428
+	ldc.i4 -3432
 	add
 	stloc.1
-// 0x01041d60: 0x1041d60: addiu a1, zero, 51
+// 0x01041d70: 0x1041d70: addiu a1, zero, 51
 	ldc.i4.s 51
 	stloc.2
-// 0x01041d64: 0x1041d64: jal   0x1004a38 addu  s0, v0, zero
+// 0x01041d74: 0x1041d74: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -4959,50 +4959,50 @@ L_1041d34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01041d6c: 0x1041d6c: lui   v1, 0x20000
+// 0x01041d7c: 0x1041d7c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01041d70: 0x1041d70: lw    v1, 27472(v1)
+// 0x01041d80: 0x1041d80: lw    v1, 27936(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6868
+	ldc.i4 6984
 	add
 	ldelem.i4
 	stloc 7
-// 0x01041d74: 0x1041d74: addiu v0, s0, 8
+// 0x01041d84: 0x1041d84: addiu v0, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 6
-// 0x01041d78: 0x1041d78: addu  a0, s2, zero
+// 0x01041d88: 0x1041d88: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01041d7c: 0x1041d7c: addiu a1, zero, 24
+// 0x01041d8c: 0x1041d8c: addiu a1, zero, 24
 	ldc.i4.s 24
 	stloc.2
-// 0x01041d80: 0x1041d80: addiu a2, zero, 6
+// 0x01041d90: 0x1041d90: addiu a2, zero, 6
 	ldc.i4.6
 	stloc.3
-// 0x01041d84: 0x1041d84: addiu a3, s0, 4
+// 0x01041d94: 0x1041d94: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x01041d88: 0x1041d88: sw    v1, 0(s0)
+// 0x01041d98: 0x1041d98: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01041d8c: 0x1041d8c: sw    v0, 16(sp)
+// 0x01041d9c: 0x1041d9c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5011,7 +5011,7 @@ L_1041d34:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01041d90: 0x1041d90: jal   0x10031b0 sw    zero, 4(s0)
+// 0x01041da0: 0x1041da0: jal   0x10031b0 sw    zero, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5030,26 +5030,26 @@ L_1041d34:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01041d98: 0x1041d98: bne   v0, zero, 0x1041db4 lui   a3, 0x10000
+// 0x01041da8: 0x1041da8: bne   v0, zero, 0x1041dc4 lui   a3, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1041db4
+	brtrue L_1041dc4
 // --- basic block ---
-// 0x01041da0: 0x1041da0: addiu a1, s1, -3428
+// 0x01041db0: 0x1041db0: addiu a1, s1, -3432
 	ldloc 9
-	ldc.i4 -3428
+	ldc.i4 -3432
 	add
 	stloc.2
-// 0x01041da4: 0x1041da4: addiu a3, a3, -3368
+// 0x01041db4: 0x1041db4: addiu a3, a3, -3372
 	ldloc 4
-	ldc.i4 -3368
+	ldc.i4 -3372
 	add
 	stloc 4
-// 0x01041da8: 0x1041da8: addiu a0, zero, 5
+// 0x01041db8: 0x1041db8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01041dac: 0x1041dac: jal   0x100449c addiu a2, zero, 61
+// 0x01041dbc: 0x1041dbc: jal   0x100449c addiu a2, zero, 61
 	ldc.i4.s 61
 	stloc.3
 	ldloc.0
@@ -5062,12 +5062,12 @@ L_1041d34:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1041db4:
-// 0x01041db4: 0x1041db4: lw    ra, 36(sp)
-// 0x01041db8: 0x1041db8: addu  v0, s0, zero
+L_1041dc4:
+// 0x01041dc4: 0x1041dc4: lw    ra, 36(sp)
+// 0x01041dc8: 0x1041dc8: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x01041dbc: 0x1041dbc: lw    s2, 32(sp)
+// 0x01041dcc: 0x1041dcc: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5076,7 +5076,7 @@ L_1041db4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01041dc0: 0x1041dc0: lw    s1, 28(sp)
+// 0x01041dd0: 0x1041dd0: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5085,7 +5085,7 @@ L_1041db4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01041dc4: 0x1041dc4: lw    s0, 24(sp)
+// 0x01041dd4: 0x1041dd4: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5094,7 +5094,7 @@ L_1041db4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01041dc8: 0x1041dc8: jr    ra addiu sp, sp, 40
+// 0x01041dd8: 0x1041dd8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5106,7 +5106,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static void sttstr_reset_1041dd0(int32)
+.method public static void sttstr_reset_1041de0(int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32 ra,int32[] mem)
@@ -5123,20 +5123,20 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01041dd0: 0x1041dd0: beq   a0, zero, 0x1041ddc sll   zero, zero, 0
+// 0x01041de0: 0x1041de0: beq   a0, zero, 0x1041dec sll   zero, zero, 0
 	ldloc.0
-	brfalse L_1041ddc
-// 0x01041dd8: 0x1041dd8: sb    zero, 0(a0)
+	brfalse L_1041dec
+// 0x01041de8: 0x1041de8: sb    zero, 0(a0)
 	ldloc.0
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1041ddc:
-// 0x01041ddc: 0x1041ddc: jr    ra sll   zero, zero, 0
+L_1041dec:
+// 0x01041dec: 0x1041dec: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 sttstr_trim_last_char_1041de4(int32,int32,int32,int32,int32)
+.method public static int32 sttstr_trim_last_char_1041df4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5171,26 +5171,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01041de4: 0x1041de4: addiu sp, sp, -24
+// 0x01041df4: 0x1041df4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01041de8: 0x1041de8: sw    ra, 20(sp)
-// 0x01041dec: 0x1041dec: jal   0x1038848 sll   zero, zero, 0
+// 0x01041df8: 0x1041df8: sw    ra, 20(sp)
+// 0x01041dfc: 0x1041dfc: jal   0x1038858 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::utf8_remove_last_char_1038848(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::utf8_remove_last_char_1038858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01041df4: 0x1041df4: lw    ra, 20(sp)
-// 0x01041df8: 0x1041df8: sll   zero, zero, 0
-// 0x01041dfc: 0x1041dfc: jr    ra addiu sp, sp, 24
+// 0x01041e04: 0x1041e04: lw    ra, 20(sp)
+// 0x01041e08: 0x1041e08: sll   zero, zero, 0
+// 0x01041e0c: 0x1041e0c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5202,7 +5202,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 sttstr_copy_1041ea4(int32,int32,int32,int32,int32)
+.method public static int32 sttstr_copy_1041eb4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -5240,12 +5240,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01041ea4: 0x1041ea4: addiu sp, sp, -32
+// 0x01041eb4: 0x1041eb4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01041ea8: 0x1041ea8: sw    s0, 24(sp)
+// 0x01041eb8: 0x1041eb8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5254,33 +5254,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01041eac: 0x1041eac: sw    ra, 28(sp)
-// 0x01041eb0: 0x1041eb0: beq   a0, zero, 0x1041efc addu  s0, a0, zero
+// 0x01041ebc: 0x1041ebc: sw    ra, 28(sp)
+// 0x01041ec0: 0x1041ec0: beq   a0, zero, 0x1041f0c addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1041efc
+	brfalse L_1041f0c
 // --- basic block ---
-// 0x01041eb8: 0x1041eb8: beq   a1, zero, 0x1041efc sb    zero, 0(a0)
+// 0x01041ec8: 0x1041ec8: beq   a1, zero, 0x1041f0c sb    zero, 0(a0)
 	ldloc.2
 	ldloc.1
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brfalse L_1041efc
+	brfalse L_1041f0c
 // --- basic block ---
-// 0x01041ec0: 0x1041ec0: lb    v0, 0(a1)
+// 0x01041ed0: 0x1041ed0: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01041ec4: 0x1041ec4: sll   zero, zero, 0
-// 0x01041ec8: 0x1041ec8: beq   v0, zero, 0x1041efc sll   zero, zero, 0
+// 0x01041ed4: 0x1041ed4: sll   zero, zero, 0
+// 0x01041ed8: 0x1041ed8: beq   v0, zero, 0x1041f0c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1041efc
+	brfalse L_1041f0c
 // --- basic block ---
-// 0x01041ed0: 0x1041ed0: addu  a0, a1, zero
+// 0x01041ee0: 0x1041ee0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01041ed4: 0x1041ed4: sw    a1, 16(sp)
+// 0x01041ee4: 0x1041ee4: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5289,7 +5289,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01041ed8: 0x1041ed8: jal   0x1001b48 sw    a2, 20(sp)
+// 0x01041ee8: 0x1041ee8: jal   0x1001b48 sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5304,7 +5304,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01041ee0: 0x1041ee0: lw    a2, 20(sp)
+// 0x01041ef0: 0x1041ef0: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5313,7 +5313,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01041ee4: 0x1041ee4: lw    a1, 16(sp)
+// 0x01041ef4: 0x1041ef4: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5322,16 +5322,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01041ee8: 0x1041ee8: sltu  v0, a2, v0
+// 0x01041ef8: 0x1041ef8: sltu  v0, a2, v0
 	ldloc.3
 	ldloc 6
 	clt.un
 	stloc 6
-// 0x01041eec: 0x1041eec: bne   v0, zero, 0x1041efc sll   zero, zero, 0
+// 0x01041efc: 0x1041efc: bne   v0, zero, 0x1041f0c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1041efc
+	brtrue L_1041f0c
 // --- basic block ---
-// 0x01041ef4: 0x1041ef4: jal   0x1001b68 addu  a0, s0, zero
+// 0x01041f04: 0x1041f04: jal   0x1001b68 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -5341,9 +5341,9 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_1041efc:
-// 0x01041efc: 0x1041efc: lw    ra, 28(sp)
-// 0x01041f00: 0x1041f00: lw    s0, 24(sp)
+L_1041f0c:
+// 0x01041f0c: 0x1041f0c: lw    ra, 28(sp)
+// 0x01041f10: 0x1041f10: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5352,7 +5352,7 @@ L_1041efc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01041f04: 0x1041f04: jr    ra addiu sp, sp, 32
+// 0x01041f14: 0x1041f14: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5364,7 +5364,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 dynstr_reset_1041fb4(int32,int32,int32,int32,int32)
+.method public static int32 dynstr_reset_1041fc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -5402,12 +5402,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01041fb4: 0x1041fb4: addiu sp, sp, -24
+// 0x01041fc4: 0x1041fc4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01041fb8: 0x1041fb8: sw    s0, 16(sp)
+// 0x01041fc8: 0x1041fc8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5416,22 +5416,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01041fbc: 0x1041fbc: addu  s0, a0, zero
+// 0x01041fcc: 0x1041fcc: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01041fc0: 0x1041fc0: lw    a0, 0(a0)
+// 0x01041fd0: 0x1041fd0: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01041fc4: 0x1041fc4: sll   zero, zero, 0
-// 0x01041fc8: 0x1041fc8: beq   a0, zero, 0x1041fdc sw    ra, 20(sp)
+// 0x01041fd4: 0x1041fd4: sll   zero, zero, 0
+// 0x01041fd8: 0x1041fd8: beq   a0, zero, 0x1041fec sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1041fdc
+	brfalse L_1041fec
 // --- basic block ---
-// 0x01041fd0: 0x1041fd0: jal   0x1000930 sll   zero, zero, 0
+// 0x01041fe0: 0x1041fe0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5442,16 +5442,16 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01041fd8: 0x1041fd8: sw    zero, 0(s0)
+// 0x01041fe8: 0x1041fe8: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1041fdc:
-// 0x01041fdc: 0x1041fdc: lw    ra, 20(sp)
-// 0x01041fe0: 0x1041fe0: lw    s0, 16(sp)
+L_1041fec:
+// 0x01041fec: 0x1041fec: lw    ra, 20(sp)
+// 0x01041ff0: 0x1041ff0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5460,7 +5460,7 @@ L_1041fdc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01041fe4: 0x1041fe4: jr    ra addiu sp, sp, 24
+// 0x01041ff4: 0x1041ff4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5472,7 +5472,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 T_1_1041fec(int32,int32,int32,int32,int32)
+.method public static int32 T_1_1041ffc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -5510,13 +5510,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01041fec: 0x1041fec: addiu sp, sp, -32
+// 0x01041ffc: 0x1041ffc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01041ff0: 0x1041ff0: sw    ra, 28(sp)
-// 0x01041ff4: 0x1041ff4: sw    s0, 24(sp)
+// 0x01042000: 0x1042000: sw    ra, 28(sp)
+// 0x01042004: 0x1042004: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5525,7 +5525,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01041ff8: 0x1041ff8: jal   0x1000910 sw    a0, 16(sp)
+// 0x01042008: 0x1042008: jal   0x1000910 sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5544,7 +5544,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01042000: 0x1042000: lw    a2, 16(sp)
+// 0x01042010: 0x1042010: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5553,13 +5553,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01042004: 0x1042004: addu  a0, v0, zero
+// 0x01042014: 0x1042014: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01042008: 0x1042008: addu  a1, zero, zero
+// 0x01042018: 0x1042018: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104200c: 0x104200c: jal   0x100177c addu  s0, v0, zero
+// 0x0104201c: 0x104201c: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -5571,11 +5571,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01042014: 0x1042014: lw    ra, 28(sp)
-// 0x01042018: 0x1042018: addu  v0, s0, zero
+// 0x01042024: 0x1042024: lw    ra, 28(sp)
+// 0x01042028: 0x1042028: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0104201c: 0x104201c: lw    s0, 24(sp)
+// 0x0104202c: 0x104202c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5584,7 +5584,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042020: 0x1042020: jr    ra addiu sp, sp, 32
+// 0x01042030: 0x1042030: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5596,7 +5596,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 dynstr_copy_1042028(int32,int32,int32,int32,int32)
+.method public static int32 dynstr_copy_1042038(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -5637,12 +5637,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042028: 0x1042028: addiu sp, sp, -40
+// 0x01042038: 0x1042038: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104202c: 0x104202c: sw    s1, 32(sp)
+// 0x0104203c: 0x104203c: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5651,7 +5651,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01042030: 0x1042030: sw    s0, 28(sp)
+// 0x01042040: 0x1042040: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5660,7 +5660,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01042034: 0x1042034: sw    a1, 16(sp)
+// 0x01042044: 0x1042044: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5669,11 +5669,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01042038: 0x1042038: sw    ra, 36(sp)
-// 0x0104203c: 0x104203c: addu  s1, a2, zero
+// 0x01042048: 0x1042048: sw    ra, 36(sp)
+// 0x0104204c: 0x104204c: addu  s1, a2, zero
 	ldloc.3
 	stloc 7
-// 0x01042040: 0x1042040: jal   0x1041fb4 addu  s0, a0, zero
+// 0x01042050: 0x1042050: jal   0x1041fc4 addu  s0, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -5681,12 +5681,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::dynstr_reset_1041fb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::dynstr_reset_1041fc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01042048: 0x1042048: lw    a1, 16(sp)
+// 0x01042058: 0x1042058: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5695,21 +5695,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104204c: 0x104204c: sll   zero, zero, 0
-// 0x01042050: 0x1042050: beq   a1, zero, 0x1042094 sll   zero, zero, 0
+// 0x0104205c: 0x104205c: sll   zero, zero, 0
+// 0x01042060: 0x1042060: beq   a1, zero, 0x10420a4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1042094
+	brfalse L_10420a4
 // --- basic block ---
-// 0x01042058: 0x1042058: lb    v0, 0(a1)
+// 0x01042068: 0x1042068: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0104205c: 0x104205c: sll   zero, zero, 0
-// 0x01042060: 0x1042060: beq   v0, zero, 0x1042094 sll   zero, zero, 0
+// 0x0104206c: 0x104206c: sll   zero, zero, 0
+// 0x01042070: 0x1042070: beq   v0, zero, 0x10420a4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1042094
+	brfalse L_10420a4
 // --- basic block ---
-// 0x01042068: 0x1042068: jal   0x1001b48 addu  a0, a1, zero
+// 0x01042078: 0x1042078: jal   0x1001b48 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.1
@@ -5718,16 +5718,16 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01042070: 0x1042070: sltu  s1, s1, v0
+// 0x01042080: 0x1042080: sltu  s1, s1, v0
 	ldloc 7
 	ldloc 6
 	clt.un
 	stloc 7
-// 0x01042074: 0x1042074: bne   s1, zero, 0x1042094 sll   zero, zero, 0
+// 0x01042084: 0x1042084: bne   s1, zero, 0x10420a4 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1042094
+	brtrue L_10420a4
 // --- basic block ---
-// 0x0104207c: 0x104207c: jal   0x1041fec addiu a0, v0, 1
+// 0x0104208c: 0x104208c: jal   0x1041ffc addiu a0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
@@ -5737,12 +5737,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::T_1_1041fec(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::T_1_1041ffc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01042084: 0x1042084: lw    a1, 16(sp)
+// 0x01042094: 0x1042094: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5751,14 +5751,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042088: 0x1042088: sw    v0, 0(s0)
+// 0x01042098: 0x1042098: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0104208c: 0x104208c: jal   0x1001b68 addu  a0, v0, zero
+// 0x0104209c: 0x104209c: jal   0x1001b68 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
@@ -5768,9 +5768,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1042094:
-// 0x01042094: 0x1042094: lw    ra, 36(sp)
-// 0x01042098: 0x1042098: lw    s1, 32(sp)
+L_10420a4:
+// 0x010420a4: 0x10420a4: lw    ra, 36(sp)
+// 0x010420a8: 0x10420a8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5779,7 +5779,7 @@ L_1042094:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104209c: 0x104209c: lw    s0, 28(sp)
+// 0x010420ac: 0x10420ac: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5788,7 +5788,7 @@ L_1042094:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010420a0: 0x10420a0: jr    ra addiu sp, sp, 40
+// 0x010420b0: 0x10420b0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5800,7 +5800,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_bar_by_pos_1042228(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_by_pos_1042238(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s2,int32 t0,int32 s0,int32 s1,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -5856,12 +5856,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042228: 0x1042228: addiu sp, sp, -56
+// 0x01042238: 0x1042238: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0104222c: 0x104222c: sw    s5, 48(sp)
+// 0x0104223c: 0x104223c: sw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5870,7 +5870,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01042230: 0x1042230: sw    s4, 44(sp)
+// 0x01042240: 0x1042240: sw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5879,7 +5879,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01042234: 0x1042234: sw    s2, 36(sp)
+// 0x01042244: 0x1042244: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5888,7 +5888,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01042238: 0x1042238: sw    s0, 28(sp)
+// 0x01042248: 0x1042248: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5897,8 +5897,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104223c: 0x104223c: sw    ra, 52(sp)
-// 0x01042240: 0x1042240: sw    s3, 40(sp)
+// 0x0104224c: 0x104224c: sw    ra, 52(sp)
+// 0x01042250: 0x1042250: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5907,7 +5907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01042244: 0x1042244: sw    s1, 32(sp)
+// 0x01042254: 0x1042254: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5916,30 +5916,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01042248: 0x1042248: addu  s0, a1, zero
+// 0x01042258: 0x1042258: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0104224c: 0x104224c: addu  s2, zero, zero
+// 0x0104225c: 0x104225c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01042250: 0x1042250: lui   s5, 0xf0000
+// 0x01042260: 0x1042260: lui   s5, 0xf0000
 	ldc.i4 983040
 	stloc 14
-// 0x01042254: 0x1042254: j	 0x1042394 lui   s4, 0xf0000
+// 0x01042264: 0x1042264: j	 0x10423a4 lui   s4, 0xf0000
 	ldc.i4 983040
 	stloc 13
-	br L_1042394
+	br L_10423a4
 // --- basic block ---
-L_104225c:
-// 0x0104225c: 0x104225c: lw    v0, 0(s0)
+L_104226c:
+// 0x0104226c: 0x104226c: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042260: 0x1042260: sll   zero, zero, 0
-// 0x01042264: 0x1042264: lw    a2, 164(v0)
+// 0x01042270: 0x1042270: sll   zero, zero, 0
+// 0x01042274: 0x1042274: lw    a2, 164(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5948,7 +5948,7 @@ L_104225c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01042268: 0x1042268: lw    v1, 168(v0)
+// 0x01042278: 0x1042278: lw    v1, 168(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5957,49 +5957,49 @@ L_104225c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104226c: 0x104226c: bgez  a2, 0x1042280 sll   zero, zero, 0
+// 0x0104227c: 0x104227c: bgez  a2, 0x1042290 sll   zero, zero, 0
 	ldloc.3
 	ldc.i4.s 0
-	bge L_1042280
+	bge L_1042290
 // --- basic block ---
-// 0x01042274: 0x1042274: lw    a3, -30068(s5)
+// 0x01042284: 0x1042284: lw    a3, -29604(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 4
-// 0x01042278: 0x1042278: sll   zero, zero, 0
-// 0x0104227c: 0x104227c: addu  a2, a2, a3
+// 0x01042288: 0x1042288: sll   zero, zero, 0
+// 0x0104228c: 0x104228c: addu  a2, a2, a3
 	ldloc.3
 	ldloc 4
 	add
 	stloc.3
-L_1042280:
-// 0x01042280: 0x1042280: bgez  v1, 0x1042294 sll   zero, zero, 0
+L_1042290:
+// 0x01042290: 0x1042290: bgez  v1, 0x10422a4 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_1042294
+	bge L_10422a4
 // --- basic block ---
-// 0x01042288: 0x1042288: lw    a3, -30072(s4)
+// 0x01042298: 0x1042298: lw    a3, -29608(s4)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104228c: 0x104228c: sll   zero, zero, 0
-// 0x01042290: 0x1042290: addu  v1, v1, a3
+// 0x0104229c: 0x104229c: sll   zero, zero, 0
+// 0x010422a0: 0x10422a0: addu  v1, v1, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 6
-L_1042294:
-// 0x01042294: 0x1042294: lw    t0, 524(v0)
+L_10422a4:
+// 0x010422a4: 0x10422a4: lw    t0, 524(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6008,28 +6008,28 @@ L_1042294:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01042298: 0x1042298: lw    a3, 0(a0)
+// 0x010422a8: 0x10422a8: lw    a3, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0104229c: 0x104229c: addu  t0, a2, t0
+// 0x010422ac: 0x10422ac: addu  t0, a2, t0
 	ldloc.3
 	ldloc 9
 	add
 	stloc 9
-// 0x010422a0: 0x10422a0: slt   t0, a3, t0
+// 0x010422b0: 0x10422b0: slt   t0, a3, t0
 	ldloc 4
 	ldloc 9
 	clt
 	stloc 9
-// 0x010422a4: 0x10422a4: bne   t0, zero, 0x104238c sll   zero, zero, 0
+// 0x010422b4: 0x10422b4: bne   t0, zero, 0x104239c sll   zero, zero, 0
 	ldloc 9
-	brtrue L_104238c
+	brtrue L_104239c
 // --- basic block ---
-// 0x010422ac: 0x10422ac: lw    t0, 532(v0)
+// 0x010422bc: 0x10422bc: lw    t0, 532(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6038,22 +6038,22 @@ L_1042294:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010422b0: 0x10422b0: sll   zero, zero, 0
-// 0x010422b4: 0x10422b4: addu  a2, a2, t0
+// 0x010422c0: 0x10422c0: sll   zero, zero, 0
+// 0x010422c4: 0x10422c4: addu  a2, a2, t0
 	ldloc.3
 	ldloc 9
 	add
 	stloc.3
-// 0x010422b8: 0x10422b8: slt   a3, a2, a3
+// 0x010422c8: 0x10422c8: slt   a3, a2, a3
 	ldloc.3
 	ldloc 4
 	clt
 	stloc 4
-// 0x010422bc: 0x10422bc: bne   a3, zero, 0x104238c sll   zero, zero, 0
+// 0x010422cc: 0x10422cc: bne   a3, zero, 0x104239c sll   zero, zero, 0
 	ldloc 4
-	brtrue L_104238c
+	brtrue L_104239c
 // --- basic block ---
-// 0x010422c4: 0x10422c4: lw    a3, 528(v0)
+// 0x010422d4: 0x10422d4: lw    a3, 528(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6062,7 +6062,7 @@ L_1042294:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010422c8: 0x10422c8: lw    a2, 4(a0)
+// 0x010422d8: 0x10422d8: lw    a2, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6071,21 +6071,21 @@ L_1042294:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010422cc: 0x10422cc: addu  a3, v1, a3
+// 0x010422dc: 0x10422dc: addu  a3, v1, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 4
-// 0x010422d0: 0x10422d0: slt   a3, a2, a3
+// 0x010422e0: 0x10422e0: slt   a3, a2, a3
 	ldloc.3
 	ldloc 4
 	clt
 	stloc 4
-// 0x010422d4: 0x10422d4: bne   a3, zero, 0x104238c sll   zero, zero, 0
+// 0x010422e4: 0x10422e4: bne   a3, zero, 0x104239c sll   zero, zero, 0
 	ldloc 4
-	brtrue L_104238c
+	brtrue L_104239c
 // --- basic block ---
-// 0x010422dc: 0x10422dc: lw    a3, 536(v0)
+// 0x010422ec: 0x10422ec: lw    a3, 536(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6094,22 +6094,22 @@ L_1042294:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010422e0: 0x10422e0: sll   zero, zero, 0
-// 0x010422e4: 0x10422e4: addu  v1, v1, a3
+// 0x010422f0: 0x10422f0: sll   zero, zero, 0
+// 0x010422f4: 0x10422f4: addu  v1, v1, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 6
-// 0x010422e8: 0x10422e8: slt   a2, v1, a2
+// 0x010422f8: 0x10422f8: slt   a2, v1, a2
 	ldloc 6
 	ldloc.3
 	clt
 	stloc.3
-// 0x010422ec: 0x10422ec: bne   a2, zero, 0x104238c sll   zero, zero, 0
+// 0x010422fc: 0x10422fc: bne   a2, zero, 0x104239c sll   zero, zero, 0
 	ldloc.3
-	brtrue L_104238c
+	brtrue L_104239c
 // --- basic block ---
-// 0x010422f4: 0x10422f4: lw    v0, 544(v0)
+// 0x01042304: 0x1042304: lw    v0, 544(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6118,27 +6118,27 @@ L_1042294:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010422f8: 0x10422f8: sll   zero, zero, 0
-// 0x010422fc: 0x10422fc: beq   v0, zero, 0x1042378 addiu s3, zero, 1
+// 0x01042308: 0x1042308: sll   zero, zero, 0
+// 0x0104230c: 0x104230c: beq   v0, zero, 0x1042388 addiu s3, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 12
-	brfalse L_1042378
+	brfalse L_1042388
 // --- basic block ---
-// 0x01042304: 0x1042304: j	 0x104234c addu  s1, zero, zero
+// 0x01042314: 0x1042314: j	 0x104235c addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_104234c
+	br L_104235c
 // --- basic block ---
-L_104230c:
-// 0x0104230c: 0x104230c: lw    v0, 0(v1)
+L_104231c:
+// 0x0104231c: 0x104231c: lw    v0, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042310: 0x1042310: sw    a0, 16(sp)
+// 0x01042320: 0x1042320: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6147,7 +6147,7 @@ L_104230c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01042314: 0x1042314: jalr  v0 sw    a1, 20(sp)
+// 0x01042324: 0x1042324: jalr  v0 sw    a1, 20(sp)
 	ldloc 7
 	ldloc 5
 	ldloc.0
@@ -6167,29 +6167,29 @@ L_104230c:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0104231c: 0x104231c: addiu v1, s1, 144
+// 0x0104232c: 0x104232c: addiu v1, s1, 144
 	ldloc 11
 	ldc.i4 144
 	add
 	stloc 6
-// 0x01042320: 0x1042320: lw    a2, 0(s0)
+// 0x01042330: 0x1042330: lw    a2, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01042324: 0x1042324: sll   v1, v1, 2
+// 0x01042334: 0x1042334: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01042328: 0x1042328: addu  v1, a2, v1
+// 0x01042338: 0x1042338: addu  v1, a2, v1
 	ldloc.3
 	ldloc 6
 	add
 	stloc 6
-// 0x0104232c: 0x104232c: lw    v1, 4(v1)
+// 0x0104233c: 0x104233c: lw    v1, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6198,7 +6198,7 @@ L_104230c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01042330: 0x1042330: lw    a1, 20(sp)
+// 0x01042340: 0x1042340: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6207,21 +6207,21 @@ L_104230c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042334: 0x1042334: xor   v1, v0, v1
+// 0x01042344: 0x1042344: xor   v1, v0, v1
 	ldloc 7
 	ldloc 6
 	xor
 	stloc 6
-// 0x01042338: 0x1042338: sltiu v1, v1, 1
+// 0x01042348: 0x1042348: sltiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x0104233c: 0x104233c: subu  v1, zero, v1
+// 0x0104234c: 0x104234c: subu  v1, zero, v1
 	ldloc 6
 	neg
 	stloc 6
-// 0x01042340: 0x1042340: lw    a0, 16(sp)
+// 0x01042350: 0x1042350: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6230,40 +6230,40 @@ L_104230c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042344: 0x1042344: addiu s1, s1, 1
+// 0x01042354: 0x1042354: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x01042348: 0x1042348: and   s3, s3, v1
+// 0x01042358: 0x1042358: and   s3, s3, v1
 	ldloc 12
 	ldloc 6
 	and
 	stloc 12
-L_104234c:
-// 0x0104234c: 0x104234c: lw    v0, 0(s0)
+L_104235c:
+// 0x0104235c: 0x104235c: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042350: 0x1042350: addiu v1, s1, 136
+// 0x01042360: 0x1042360: addiu v1, s1, 136
 	ldloc 11
 	ldc.i4 136
 	add
 	stloc 6
-// 0x01042354: 0x1042354: sll   v1, v1, 2
+// 0x01042364: 0x1042364: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01042358: 0x1042358: addu  v1, v0, v1
+// 0x01042368: 0x1042368: addu  v1, v0, v1
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x0104235c: 0x104235c: lw    v0, 616(v0)
+// 0x0104236c: 0x104236c: lw    v0, 616(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6272,54 +6272,54 @@ L_104234c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042360: 0x1042360: sll   zero, zero, 0
-// 0x01042364: 0x1042364: slt   v0, s1, v0
+// 0x01042370: 0x1042370: sll   zero, zero, 0
+// 0x01042374: 0x1042374: slt   v0, s1, v0
 	ldloc 11
 	ldloc 7
 	clt
 	stloc 7
-// 0x01042368: 0x1042368: bne   v0, zero, 0x104230c sll   zero, zero, 0
+// 0x01042378: 0x1042378: bne   v0, zero, 0x104231c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_104230c
+	brtrue L_104231c
 // --- basic block ---
-// 0x01042370: 0x1042370: beq   s3, zero, 0x104238c sll   zero, zero, 0
+// 0x01042380: 0x1042380: beq   s3, zero, 0x104239c sll   zero, zero, 0
 	ldloc 12
-	brfalse L_104238c
+	brfalse L_104239c
 // --- basic block ---
-L_1042378:
-// 0x01042378: 0x1042378: sll   s2, s2, 2
+L_1042388:
+// 0x01042388: 0x1042388: sll   s2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x0104237c: 0x104237c: addu  a1, a1, s2
+// 0x0104238c: 0x104238c: addu  a1, a1, s2
 	ldloc.2
 	ldloc 8
 	add
 	stloc.2
-// 0x01042380: 0x1042380: lw    v0, 0(a1)
+// 0x01042390: 0x1042390: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042384: 0x1042384: j	 0x10423a8 sll   zero, zero, 0
-	br L_10423a8
+// 0x01042394: 0x1042394: j	 0x10423b8 sll   zero, zero, 0
+	br L_10423b8
 // --- basic block ---
-L_104238c:
-// 0x0104238c: 0x104238c: addiu s2, s2, 1
+L_104239c:
+// 0x0104239c: 0x104239c: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01042390: 0x1042390: addiu s0, s0, 4
+// 0x010423a0: 0x10423a0: addiu s0, s0, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-L_1042394:
-// 0x01042394: 0x1042394: lw    v0, 84(a1)
+L_10423a4:
+// 0x010423a4: 0x10423a4: lw    v0, 84(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6328,19 +6328,19 @@ L_1042394:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042398: 0x1042398: sll   zero, zero, 0
-// 0x0104239c: 0x104239c: slt   v0, s2, v0
+// 0x010423a8: 0x10423a8: sll   zero, zero, 0
+// 0x010423ac: 0x10423ac: slt   v0, s2, v0
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 7
-// 0x010423a0: 0x10423a0: bne   v0, zero, 0x104225c sll   zero, zero, 0
+// 0x010423b0: 0x10423b0: bne   v0, zero, 0x104226c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_104225c
+	brtrue L_104226c
 // --- basic block ---
-L_10423a8:
-// 0x010423a8: 0x10423a8: lw    ra, 52(sp)
-// 0x010423ac: 0x10423ac: lw    s5, 48(sp)
+L_10423b8:
+// 0x010423b8: 0x10423b8: lw    ra, 52(sp)
+// 0x010423bc: 0x10423bc: lw    s5, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6349,7 +6349,7 @@ L_10423a8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010423b0: 0x10423b0: lw    s4, 44(sp)
+// 0x010423c0: 0x10423c0: lw    s4, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6358,7 +6358,7 @@ L_10423a8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010423b4: 0x10423b4: lw    s3, 40(sp)
+// 0x010423c4: 0x10423c4: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6367,7 +6367,7 @@ L_10423a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010423b8: 0x10423b8: lw    s2, 36(sp)
+// 0x010423c8: 0x10423c8: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6376,7 +6376,7 @@ L_10423a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010423bc: 0x10423bc: lw    s1, 32(sp)
+// 0x010423cc: 0x10423cc: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6385,7 +6385,7 @@ L_10423a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010423c0: 0x10423c0: lw    s0, 28(sp)
+// 0x010423d0: 0x10423d0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6394,7 +6394,7 @@ L_10423a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010423c4: 0x10423c4: jr    ra addiu sp, sp, 56
+// 0x010423d4: 0x10423d4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6406,7 +6406,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_bar_short_click_10423cc()
+.method public static int32 roadmap_bar_short_click_10423dc()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6423,19 +6423,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010423cc: 0x10423cc: lui   v0, 0x60000
+// 0x010423dc: 0x10423dc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x010423d0: 0x10423d0: lw    v0, 12656(v0)
+// 0x010423e0: 0x10423e0: lw    v0, 13120(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc.0
-// 0x010423d4: 0x10423d4: jr    ra sltu  v0, zero, v0
+// 0x010423e4: 0x10423e4: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
@@ -6445,7 +6445,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_bar_long_click_10423dc()
+.method public static int32 roadmap_bar_long_click_10423ec()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6462,19 +6462,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010423dc: 0x10423dc: lui   v0, 0x60000
+// 0x010423ec: 0x10423ec: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x010423e0: 0x10423e0: lw    v0, 12656(v0)
+// 0x010423f0: 0x10423f0: lw    v0, 13120(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc.0
-// 0x010423e4: 0x10423e4: jr    ra sltu  v0, zero, v0
+// 0x010423f4: 0x10423f4: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
@@ -6484,7 +6484,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_bar_drag_start_10423ec()
+.method public static int32 roadmap_bar_drag_start_10423fc()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6501,19 +6501,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010423ec: 0x10423ec: lui   v0, 0x60000
+// 0x010423fc: 0x10423fc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x010423f0: 0x10423f0: lw    v0, 12656(v0)
+// 0x01042400: 0x1042400: lw    v0, 13120(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc.0
-// 0x010423f4: 0x10423f4: jr    ra sltu  v0, zero, v0
+// 0x01042404: 0x1042404: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
@@ -6523,7 +6523,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_bar_top_height_10423fc()
+.method public static int32 roadmap_bar_top_height_104240c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6543,29 +6543,29 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010423fc: 0x10423fc: lui   v0, 0x60000
+// 0x0104240c: 0x104240c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01042400: 0x1042400: lw    v1, 12640(v0)
+// 0x01042410: 0x1042410: lw    v1, 13104(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042404: 0x1042404: sll   zero, zero, 0
-// 0x01042408: 0x1042408: bne   v1, zero, 0x1042428 addu  v0, zero, zero
+// 0x01042414: 0x1042414: sll   zero, zero, 0
+// 0x01042418: 0x1042418: bne   v1, zero, 0x1042438 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brtrue L_1042428
+	brtrue L_1042438
 // --- basic block ---
-// 0x01042410: 0x1042410: lui   v0, 0x0
+// 0x01042420: 0x1042420: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01042414: 0x1042414: lw    v0, 13348(v0)
+// 0x01042424: 0x1042424: lw    v0, 13348(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -6574,24 +6574,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01042418: 0x1042418: sll   zero, zero, 0
-// 0x0104241c: 0x104241c: nor   v1, zero, v0
+// 0x01042428: 0x1042428: sll   zero, zero, 0
+// 0x0104242c: 0x104242c: nor   v1, zero, v0
 	ldloc.0
 	ldc.i4.m1
 	xor
 	stloc.1
-// 0x01042420: 0x1042420: sra   v1, v1, 31
+// 0x01042430: 0x1042430: sra   v1, v1, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x01042424: 0x1042424: and   v0, v0, v1
+// 0x01042434: 0x1042434: and   v0, v0, v1
 	ldloc.0
 	ldloc.1
 	and
 	stloc.0
-L_1042428:
-// 0x01042428: 0x1042428: jr    ra sll   zero, zero, 0
+L_1042438:
+// 0x01042438: 0x1042438: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -6599,7 +6599,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_bar_bottom_height_1042430()
+.method public static int32 roadmap_bar_bottom_height_1042440()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6619,10 +6619,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042430: 0x1042430: lui   v0, 0x0
+// 0x01042440: 0x1042440: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01042434: 0x1042434: lw    v1, 13332(v0)
+// 0x01042444: 0x1042444: lw    v1, 13332(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -6631,17 +6631,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042438: 0x1042438: sll   zero, zero, 0
-// 0x0104243c: 0x104243c: bne   v1, zero, 0x104245c addu  v0, zero, zero
+// 0x01042448: 0x1042448: sll   zero, zero, 0
+// 0x0104244c: 0x104244c: bne   v1, zero, 0x104246c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brtrue L_104245c
+	brtrue L_104246c
 // --- basic block ---
-// 0x01042444: 0x1042444: lui   v0, 0x0
+// 0x01042454: 0x1042454: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01042448: 0x1042448: lw    v0, 13340(v0)
+// 0x01042458: 0x1042458: lw    v0, 13340(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -6650,24 +6650,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104244c: 0x104244c: sll   zero, zero, 0
-// 0x01042450: 0x1042450: nor   v1, zero, v0
+// 0x0104245c: 0x104245c: sll   zero, zero, 0
+// 0x01042460: 0x1042460: nor   v1, zero, v0
 	ldloc.0
 	ldc.i4.m1
 	xor
 	stloc.1
-// 0x01042454: 0x1042454: sra   v1, v1, 31
+// 0x01042464: 0x1042464: sra   v1, v1, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x01042458: 0x1042458: and   v0, v0, v1
+// 0x01042468: 0x1042468: and   v0, v0, v1
 	ldloc.0
 	ldloc.1
 	and
 	stloc.0
-L_104245c:
-// 0x0104245c: 0x104245c: jr    ra sll   zero, zero, 0
+L_104246c:
+// 0x0104246c: 0x104246c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -6675,7 +6675,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_bar_switch_skins_1042464()
+.method public static void roadmap_bar_switch_skins_1042474()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -6686,12 +6686,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042464: 0x1042464: jr    ra sll   zero, zero, 0
+// 0x01042474: 0x1042474: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_bottom_bar_hide_104246c()
+.method public static int32 roadmap_bottom_bar_hide_104247c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6711,13 +6711,13 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104246c: 0x104246c: addiu v1, zero, 1
+// 0x0104247c: 0x104247c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01042470: 0x1042470: lui   v0, 0x0
+// 0x01042480: 0x1042480: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01042474: 0x1042474: jr    ra sw    v1, 13332(v0)
+// 0x01042484: 0x1042484: jr    ra sw    v1, 13332(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -6733,7 +6733,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_bottom_bar_show_104247c()
+.method public static void roadmap_bottom_bar_show_104248c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -6744,12 +6744,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104247c: 0x104247c: jr    ra sll   zero, zero, 0
+// 0x0104248c: 0x104248c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_top_bar_show_10424a4()
+.method public static int32 roadmap_top_bar_show_10424b4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6766,15 +6766,15 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010424a4: 0x10424a4: lui   v0, 0x60000
+// 0x010424b4: 0x10424b4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x010424a8: 0x10424a8: jr    ra sw    zero, 12640(v0)
+// 0x010424b8: 0x10424b8: jr    ra sw    zero, 13104(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6783,7 +6783,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 get_current_num_comments_10424c8(int32,int32,int32,int32,int32)
+.method public static int32 get_current_num_comments_10424d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32 v1,int32[] mem,int32 ra)
@@ -6821,14 +6821,14 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10424c8:
-// 0x010424c8: 0x10424c8: addiu sp, sp, -24
+L_10424d8:
+// 0x010424d8: 0x10424d8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010424cc: 0x10424cc: sw    ra, 20(sp)
-// 0x010424d0: 0x10424d0: jal   0x1078a64 sw    s0, 16(sp)
+// 0x010424dc: 0x10424dc: sw    ra, 20(sp)
+// 0x010424e0: 0x10424e0: jal   0x1079088 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6842,57 +6842,57 @@ L_10424c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_CurrentAlert_Has_Comments_1078a64(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_CurrentAlert_Has_Comments_1079088(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010424d8: 0x10424d8: bne   v0, zero, 0x10424e8 lui   v0, 0x10000
+// 0x010424e8: 0x10424e8: bne   v0, zero, 0x10424f8 lui   v0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	brtrue L_10424e8
+	brtrue L_10424f8
 // --- basic block ---
-// 0x010424e0: 0x10424e0: j	 0x1042510 addiu v0, v0, 18500
+// 0x010424f0: 0x10424f0: j	 0x1042520 addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-	br L_1042510
+	br L_1042520
 // --- basic block ---
-L_10424e8:
-// 0x010424e8: 0x10424e8: jal   0x1077b0c lui   s0, 0x60000
+L_10424f8:
+// 0x010424f8: 0x10424f8: jal   0x1078130 lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 6
-	call int32 Cibyl89::RTAlerts_Get_Current_Alert_Id_1077b0c()
+	call int32 Cibyl90::RTAlerts_Get_Current_Alert_Id_1078130()
 	stloc 5
 // --- basic block ---
-// 0x010424f0: 0x10424f0: jal   0x10771d8 addu  a0, v0, zero
+// 0x01042500: 0x1042500: jal   0x10777fc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10771d8(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10777fc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010424f8: 0x10424f8: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x01042508: 0x1042508: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x010424fc: 0x10424fc: addiu a1, a1, -13884
+// 0x0104250c: 0x104250c: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01042500: 0x1042500: addu  a2, v0, zero
+// 0x01042510: 0x1042510: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01042504: 0x1042504: jal   0x1000f64 addiu a0, s0, 11852
+// 0x01042514: 0x1042514: jal   0x1000f64 addiu a0, s0, 12316
 	ldloc 6
-	ldc.i4 11852
+	ldc.i4 12316
 	add
 	stloc.1
 	ldloc.0
@@ -6905,14 +6905,14 @@ L_10424e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104250c: 0x104250c: addiu v0, s0, 11852
+// 0x0104251c: 0x104251c: addiu v0, s0, 12316
 	ldloc 6
-	ldc.i4 11852
+	ldc.i4 12316
 	add
 	stloc 5
-L_1042510:
-// 0x01042510: 0x1042510: lw    ra, 20(sp)
-// 0x01042514: 0x1042514: lw    s0, 16(sp)
+L_1042520:
+// 0x01042520: 0x1042520: lw    ra, 20(sp)
+// 0x01042524: 0x1042524: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6921,7 +6921,7 @@ L_1042510:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01042518: 0x1042518: jr    ra addiu sp, sp, 24
+// 0x01042528: 0x1042528: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl49.j b/converted/Cibyl49.j
index 2052248..71090b1 100644
--- a/converted/Cibyl49.j
+++ b/converted/Cibyl49.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl49::.ctor
 
-.method public static int32 get_dist_to_destination_1042520(int32,int32,int32,int32,int32)
+.method public static int32 get_dist_to_destination_1042530(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -79,13 +79,13 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1042520:
-// 0x01042520: 0x1042520: addiu sp, sp, -24
+L_1042530:
+// 0x01042530: 0x1042530: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01042524: 0x1042524: sw    s0, 16(sp)
+// 0x01042534: 0x1042534: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -94,24 +94,24 @@ L_1042520:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01042528: 0x1042528: lui   a2, 0x10000
+// 0x01042538: 0x1042538: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104252c: 0x104252c: lui   s0, 0x60000
+// 0x0104253c: 0x104253c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01042530: 0x1042530: addiu a0, s0, 11872
+// 0x01042540: 0x1042540: addiu a0, s0, 12336
 	ldloc 5
-	ldc.i4 11872
+	ldc.i4 12336
 	add
 	stloc.1
-// 0x01042534: 0x1042534: addiu a2, a2, -31404
+// 0x01042544: 0x1042544: addiu a2, a2, -31404
 	ldloc.3
 	ldc.i4 -31404
 	add
 	stloc.3
-// 0x01042538: 0x1042538: sw    ra, 20(sp)
-// 0x0104253c: 0x104253c: jal   0x101afb8 addiu a1, zero, 256
+// 0x01042548: 0x1042548: sw    ra, 20(sp)
+// 0x0104254c: 0x104254c: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -119,33 +119,33 @@ L_1042520:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01042544: 0x1042544: bne   v0, zero, 0x1042554 addiu s0, s0, 11872
+// 0x01042554: 0x1042554: bne   v0, zero, 0x1042564 addiu s0, s0, 12336
 	ldloc 7
 	ldloc 5
-	ldc.i4 11872
+	ldc.i4 12336
 	add
 	stloc 5
-	brtrue L_1042554
+	brtrue L_1042564
 // --- basic block ---
-// 0x0104254c: 0x104254c: lui   s0, 0x10000
+// 0x0104255c: 0x104255c: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01042550: 0x1042550: addiu s0, s0, 18500
+// 0x01042560: 0x1042560: addiu s0, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-L_1042554:
-// 0x01042554: 0x1042554: lw    ra, 20(sp)
-// 0x01042558: 0x1042558: addu  v0, s0, zero
+L_1042564:
+// 0x01042564: 0x1042564: lw    ra, 20(sp)
+// 0x01042568: 0x1042568: addu  v0, s0, zero
 	ldloc 5
 	stloc 7
-// 0x0104255c: 0x104255c: lw    s0, 16(sp)
+// 0x0104256c: 0x104256c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -154,7 +154,7 @@ L_1042554:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042560: 0x1042560: jr    ra addiu sp, sp, 24
+// 0x01042570: 0x1042570: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -166,7 +166,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 get_time_to_destination_1042568(int32,int32,int32,int32,int32)
+.method public static int32 get_time_to_destination_1042578(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -204,13 +204,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1042568:
-// 0x01042568: 0x1042568: addiu sp, sp, -24
+L_1042578:
+// 0x01042578: 0x1042578: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104256c: 0x104256c: sw    s0, 16(sp)
+// 0x0104257c: 0x104257c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -219,24 +219,24 @@ L_1042568:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01042570: 0x1042570: lui   a2, 0x10000
+// 0x01042580: 0x1042580: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01042574: 0x1042574: lui   s0, 0x60000
+// 0x01042584: 0x1042584: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01042578: 0x1042578: addiu a0, s0, 12128
+// 0x01042588: 0x1042588: addiu a0, s0, 12592
 	ldloc 5
-	ldc.i4 12128
+	ldc.i4 12592
 	add
 	stloc.1
-// 0x0104257c: 0x104257c: addiu a2, a2, -3308
+// 0x0104258c: 0x104258c: addiu a2, a2, -3312
 	ldloc.3
-	ldc.i4 -3308
+	ldc.i4 -3312
 	add
 	stloc.3
-// 0x01042580: 0x1042580: sw    ra, 20(sp)
-// 0x01042584: 0x1042584: jal   0x101afb8 addiu a1, zero, 256
+// 0x01042590: 0x1042590: sw    ra, 20(sp)
+// 0x01042594: 0x1042594: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -244,33 +244,33 @@ L_1042568:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0104258c: 0x104258c: bne   v0, zero, 0x104259c addiu s0, s0, 12128
+// 0x0104259c: 0x104259c: bne   v0, zero, 0x10425ac addiu s0, s0, 12592
 	ldloc 7
 	ldloc 5
-	ldc.i4 12128
+	ldc.i4 12592
 	add
 	stloc 5
-	brtrue L_104259c
+	brtrue L_10425ac
 // --- basic block ---
-// 0x01042594: 0x1042594: lui   s0, 0x10000
+// 0x010425a4: 0x10425a4: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01042598: 0x1042598: addiu s0, s0, 18500
+// 0x010425a8: 0x10425a8: addiu s0, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-L_104259c:
-// 0x0104259c: 0x104259c: lw    ra, 20(sp)
-// 0x010425a0: 0x10425a0: addu  v0, s0, zero
+L_10425ac:
+// 0x010425ac: 0x10425ac: lw    ra, 20(sp)
+// 0x010425b0: 0x10425b0: addu  v0, s0, zero
 	ldloc 5
 	stloc 7
-// 0x010425a4: 0x10425a4: lw    s0, 16(sp)
+// 0x010425b4: 0x10425b4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -279,7 +279,7 @@ L_104259c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010425a8: 0x10425a8: jr    ra addiu sp, sp, 24
+// 0x010425b8: 0x10425b8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -291,7 +291,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 get_current_street_10425b0(int32,int32,int32,int32,int32)
+.method public static int32 get_current_street_10425c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -329,13 +329,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10425b0:
-// 0x010425b0: 0x10425b0: addiu sp, sp, -24
+L_10425c0:
+// 0x010425c0: 0x10425c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010425b4: 0x10425b4: sw    s0, 16(sp)
+// 0x010425c4: 0x10425c4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -344,24 +344,24 @@ L_10425b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010425b8: 0x10425b8: lui   a2, 0x10000
+// 0x010425c8: 0x10425c8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010425bc: 0x10425bc: lui   s0, 0x60000
+// 0x010425cc: 0x10425cc: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010425c0: 0x10425c0: addiu a0, s0, 12384
+// 0x010425d0: 0x10425d0: addiu a0, s0, 12848
 	ldloc 5
-	ldc.i4 12384
+	ldc.i4 12848
 	add
 	stloc.1
-// 0x010425c4: 0x10425c4: addiu a2, a2, -3300
+// 0x010425d4: 0x10425d4: addiu a2, a2, -3304
 	ldloc.3
-	ldc.i4 -3300
+	ldc.i4 -3304
 	add
 	stloc.3
-// 0x010425c8: 0x10425c8: sw    ra, 20(sp)
-// 0x010425cc: 0x10425cc: jal   0x101afb8 addiu a1, zero, 256
+// 0x010425d8: 0x10425d8: sw    ra, 20(sp)
+// 0x010425dc: 0x10425dc: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -369,18 +369,18 @@ L_10425b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010425d4: 0x10425d4: lw    ra, 20(sp)
-// 0x010425d8: 0x10425d8: addiu v0, s0, 12384
+// 0x010425e4: 0x10425e4: lw    ra, 20(sp)
+// 0x010425e8: 0x10425e8: addiu v0, s0, 12848
 	ldloc 5
-	ldc.i4 12384
+	ldc.i4 12848
 	add
 	stloc 8
-// 0x010425dc: 0x10425dc: lw    s0, 16(sp)
+// 0x010425ec: 0x10425ec: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -389,7 +389,7 @@ L_10425b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010425e0: 0x10425e0: jr    ra addiu sp, sp, 24
+// 0x010425f0: 0x10425f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -401,7 +401,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 get_time_str_10425e8(int32,int32,int32,int32,int32)
+.method public static int32 get_time_str_10425f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -436,22 +436,22 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10425e8:
-// 0x010425e8: 0x10425e8: addiu sp, sp, -24
+L_10425f8:
+// 0x010425f8: 0x10425f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010425ec: 0x10425ec: sw    ra, 20(sp)
-// 0x010425f0: 0x10425f0: addu  a0, zero, zero
+// 0x010425fc: 0x10425fc: sw    ra, 20(sp)
+// 0x01042600: 0x1042600: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010425f4: 0x10425f4: cibyl_sysc_arg 0x4
+// 0x01042604: 0x1042604: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010425f8: 0x10425f8: cibyl_sysc 0x6aa
+// 0x01042608: 0x1042608: cibyl_sysc 0x6aa
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010425fc: 0x10425fc: jal   0x104f8d8 addu  a0, v0, zero
+// 0x0104260c: 0x104260c: jal   0x104f8e8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -459,14 +459,14 @@ L_10425e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_time_get_hours_minutes_104f8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01042604: 0x1042604: lw    ra, 20(sp)
-// 0x01042608: 0x1042608: sll   zero, zero, 0
-// 0x0104260c: 0x104260c: jr    ra addiu sp, sp, 24
+// 0x01042614: 0x1042614: lw    ra, 20(sp)
+// 0x01042618: 0x1042618: sll   zero, zero, 0
+// 0x0104261c: 0x104261c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -478,7 +478,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_bar_load_image_1042614(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_load_image_1042624(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -519,12 +519,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042614: 0x1042614: addiu sp, sp, -48
+// 0x01042624: 0x1042624: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01042618: 0x1042618: sw    s1, 40(sp)
+// 0x01042628: 0x1042628: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -533,7 +533,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104261c: 0x104261c: sw    s0, 36(sp)
+// 0x0104262c: 0x104262c: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -542,26 +542,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01042620: 0x1042620: sw    ra, 44(sp)
-// 0x01042624: 0x1042624: addu  s0, a1, zero
+// 0x01042630: 0x1042630: sw    ra, 44(sp)
+// 0x01042634: 0x1042634: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01042628: 0x1042628: addu  s1, a0, zero
+// 0x01042638: 0x1042638: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104262c: 0x104262c: beq   a1, zero, 0x1042674 addu  v0, zero, zero
+// 0x0104263c: 0x104263c: beq   a1, zero, 0x1042684 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1042674
+	brfalse L_1042684
 // --- basic block ---
-// 0x01042634: 0x1042634: addu  a0, zero, zero
+// 0x01042644: 0x1042644: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01042638: 0x1042638: addiu a1, zero, 1
+// 0x01042648: 0x1042648: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0104263c: 0x104263c: jal   0x10a1918 addu  a2, s0, zero
+// 0x0104264c: 0x104264c: jal   0x10a1f60 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -569,37 +569,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01042644: 0x1042644: bne   v0, zero, 0x1042674 lui   a1, 0x10000
+// 0x01042654: 0x1042654: bne   v0, zero, 0x1042684 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1042674
+	brtrue L_1042684
 // --- basic block ---
-// 0x0104264c: 0x104264c: lui   a3, 0x10000
+// 0x0104265c: 0x104265c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01042650: 0x1042650: addiu a1, a1, -3296
+// 0x01042660: 0x1042660: addiu a1, a1, -3300
 	ldloc.2
-	ldc.i4 -3296
+	ldc.i4 -3300
 	add
 	stloc.2
-// 0x01042654: 0x1042654: addiu a3, a3, -3272
+// 0x01042664: 0x1042664: addiu a3, a3, -3276
 	ldloc 4
-	ldc.i4 -3272
+	ldc.i4 -3276
 	add
 	stloc 4
-// 0x01042658: 0x1042658: addiu a0, zero, 4
+// 0x01042668: 0x1042668: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104265c: 0x104265c: addiu a2, zero, 1410
+// 0x0104266c: 0x104266c: addiu a2, zero, 1410
 	ldc.i4 1410
 	stloc.3
-// 0x01042660: 0x1042660: sw    v0, 24(sp)
+// 0x01042670: 0x1042670: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -608,7 +608,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01042664: 0x1042664: sw    s1, 16(sp)
+// 0x01042674: 0x1042674: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -617,7 +617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01042668: 0x1042668: jal   0x100449c sw    s0, 20(sp)
+// 0x01042678: 0x1042678: jal   0x100449c sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -636,7 +636,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x01042670: 0x1042670: lw    v0, 24(sp)
+// 0x01042680: 0x1042680: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -645,9 +645,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-L_1042674:
-// 0x01042674: 0x1042674: lw    ra, 44(sp)
-// 0x01042678: 0x1042678: lw    s1, 40(sp)
+L_1042684:
+// 0x01042684: 0x1042684: lw    ra, 44(sp)
+// 0x01042688: 0x1042688: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -656,7 +656,7 @@ L_1042674:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104267c: 0x104267c: lw    s0, 36(sp)
+// 0x0104268c: 0x104268c: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -665,7 +665,7 @@ L_1042674:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042680: 0x1042680: jr    ra addiu sp, sp, 48
+// 0x01042690: 0x1042690: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -677,7 +677,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 createBGImage_1042688(int32,int32,int32,int32,int32)
+.method public static int32 createBGImage_1042698(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s0,int32 s3,int32 ra,int32 lo)
@@ -727,15 +727,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042688: 0x1042688: addiu sp, sp, -56
+// 0x01042698: 0x1042698: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0104268c: 0x104268c: lui   v0, 0xf0000
+// 0x0104269c: 0x104269c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01042690: 0x1042690: sw    s2, 44(sp)
+// 0x010426a0: 0x10426a0: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -744,28 +744,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01042694: 0x1042694: lw    s2, -30068(v0)
+// 0x010426a4: 0x10426a4: lw    s2, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 8
-// 0x01042698: 0x1042698: lui   v0, 0xf0000
+// 0x010426a8: 0x10426a8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0104269c: 0x104269c: lw    v0, -30072(v0)
+// 0x010426ac: 0x10426ac: lw    v0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x010426a0: 0x10426a0: sw    s1, 40(sp)
+// 0x010426b0: 0x10426b0: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -774,13 +774,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010426a4: 0x10426a4: slt   v0, s2, v0
+// 0x010426b4: 0x10426b4: slt   v0, s2, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010426a8: 0x10426a8: sw    ra, 52(sp)
-// 0x010426ac: 0x10426ac: sw    s3, 48(sp)
+// 0x010426b8: 0x10426b8: sw    ra, 52(sp)
+// 0x010426bc: 0x10426bc: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -789,7 +789,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010426b0: 0x10426b0: sw    s0, 36(sp)
+// 0x010426c0: 0x10426c0: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -798,31 +798,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010426b4: 0x10426b4: beq   v0, zero, 0x10426c0 addu  s1, a0, zero
+// 0x010426c4: 0x10426c4: beq   v0, zero, 0x10426d0 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
-	brfalse L_10426c0
+	brfalse L_10426d0
 // --- basic block ---
-// 0x010426bc: 0x10426bc: sll   s2, s2, 1
+// 0x010426cc: 0x10426cc: sll   s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	shl
 	stloc 8
-L_10426c0:
-// 0x010426c0: 0x10426c0: jal   0x104e020 addu  a0, s1, zero
+L_10426d0:
+// 0x010426d0: 0x10426d0: jal   0x104e030 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010426c8: 0x10426c8: addu  a1, v0, zero
+// 0x010426d8: 0x10426d8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010426cc: 0x10426cc: jal   0x104e170 addu  a0, s2, zero
+// 0x010426dc: 0x10426dc: jal   0x104e180 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -830,27 +830,27 @@ L_10426c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010426d4: 0x10426d4: addu  a0, s1, zero
+// 0x010426e4: 0x10426e4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010426d8: 0x10426d8: jal   0x104dffc addu  s0, v0, zero
+// 0x010426e8: 0x10426e8: jal   0x104e00c addu  s0, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010426e0: 0x10426e0: addu  s3, v0, zero
+// 0x010426f0: 0x10426f0: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010426e4: 0x10426e4: jal   0x1000910 addiu a0, zero, 16
+// 0x010426f4: 0x10426f4: jal   0x1000910 addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
 	ldloc.0
@@ -863,21 +863,21 @@ L_10426c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010426ec: 0x10426ec: div   s2, s3
+// 0x010426fc: 0x10426fc: div   s2, s3
 	ldloc 8
 	ldloc 11
 	div
 	stloc 13
-// 0x010426f0: 0x10426f0: addu  v1, v0, zero
+// 0x01042700: 0x1042700: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010426f4: 0x10426f4: addu  a2, v0, zero
+// 0x01042704: 0x1042704: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010426f8: 0x10426f8: addiu v0, zero, 1
+// 0x01042708: 0x1042708: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010426fc: 0x10426fc: sw    v0, 16(sp)
+// 0x0104270c: 0x104270c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -886,18 +886,18 @@ L_10426c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01042700: 0x1042700: addu  a3, s1, zero
+// 0x01042710: 0x1042710: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x01042704: 0x1042704: addu  a0, s0, zero
+// 0x01042714: 0x1042714: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x01042708: 0x1042708: addiu a1, sp, 24
+// 0x01042718: 0x1042718: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0104270c: 0x104270c: sw    zero, 28(sp)
+// 0x0104271c: 0x104271c: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -906,7 +906,7 @@ L_10426c0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01042710: 0x1042710: sw    zero, 24(sp)
+// 0x01042720: 0x1042720: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -915,7 +915,7 @@ L_10426c0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01042714: 0x1042714: sw    zero, 4(v1)
+// 0x01042724: 0x1042724: sw    zero, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -924,10 +924,10 @@ L_10426c0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01042718: 0x1042718: mflo  lo
+// 0x01042728: 0x1042728: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0104271c: 0x104271c: jal   0x104def0 sw    v0, 0(v1)
+// 0x0104272c: 0x104272c: jal   0x104df00 sw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -938,16 +938,16 @@ L_10426c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042724: 0x1042724: lw    ra, 52(sp)
-// 0x01042728: 0x1042728: addu  v0, s0, zero
+// 0x01042734: 0x1042734: lw    ra, 52(sp)
+// 0x01042738: 0x1042738: addu  v0, s0, zero
 	ldloc 10
 	stloc 5
-// 0x0104272c: 0x104272c: lw    s3, 48(sp)
+// 0x0104273c: 0x104273c: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -956,7 +956,7 @@ L_10426c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01042730: 0x1042730: lw    s2, 44(sp)
+// 0x01042740: 0x1042740: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -965,7 +965,7 @@ L_10426c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01042734: 0x1042734: lw    s1, 40(sp)
+// 0x01042744: 0x1042744: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -974,7 +974,7 @@ L_10426c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01042738: 0x1042738: lw    s0, 36(sp)
+// 0x01042748: 0x1042748: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -983,7 +983,7 @@ L_10426c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104273c: 0x104273c: jr    ra addiu sp, sp, 56
+// 0x0104274c: 0x104274c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -995,7 +995,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -1033,22 +1033,22 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042744: 0x1042744: addiu v0, a1, -1
+// 0x01042754: 0x1042754: addiu v0, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01042748: 0x1042748: addiu sp, sp, -32
+// 0x01042758: 0x1042758: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104274c: 0x104274c: slt   v1, v0, a3
+// 0x0104275c: 0x104275c: slt   v1, v0, a3
 	ldloc 7
 	ldloc 4
 	clt
 	stloc 8
-// 0x01042750: 0x1042750: sw    s0, 24(sp)
+// 0x01042760: 0x1042760: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1057,27 +1057,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01042754: 0x1042754: sw    ra, 28(sp)
-// 0x01042758: 0x1042758: addu  s0, a0, zero
+// 0x01042764: 0x1042764: sw    ra, 28(sp)
+// 0x01042768: 0x1042768: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0104275c: 0x104275c: beq   v1, zero, 0x1042768 addu  a1, a2, zero
+// 0x0104276c: 0x104276c: beq   v1, zero, 0x1042778 addu  a1, a2, zero
 	ldloc 8
 	ldloc.3
 	stloc.2
-	brfalse L_1042768
+	brfalse L_1042778
 // --- basic block ---
-// 0x01042764: 0x1042764: addu  a3, v0, zero
+// 0x01042774: 0x1042774: addu  a3, v0, zero
 	ldloc 7
 	stloc 4
-L_1042768:
-// 0x01042768: 0x1042768: addu  a0, s0, zero
+L_1042778:
+// 0x01042778: 0x1042778: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x0104276c: 0x104276c: addu  a2, a3, zero
+// 0x0104277c: 0x104277c: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x01042770: 0x1042770: jal   0x1001af8 sw    a3, 16(sp)
+// 0x01042780: 0x1042780: jal   0x1001af8 sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1092,7 +1092,7 @@ L_1042768:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01042778: 0x1042778: lw    a3, 16(sp)
+// 0x01042788: 0x1042788: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1101,18 +1101,18 @@ L_1042768:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104277c: 0x104277c: sll   zero, zero, 0
-// 0x01042780: 0x1042780: addu  a3, s0, a3
+// 0x0104278c: 0x104278c: sll   zero, zero, 0
+// 0x01042790: 0x1042790: addu  a3, s0, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 4
-// 0x01042784: 0x1042784: sb    zero, 0(a3)
+// 0x01042794: 0x1042794: sb    zero, 0(a3)
 	ldloc 4
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01042788: 0x1042788: lw    ra, 28(sp)
-// 0x0104278c: 0x104278c: lw    s0, 24(sp)
+// 0x01042798: 0x1042798: lw    ra, 28(sp)
+// 0x0104279c: 0x104279c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1121,7 +1121,7 @@ L_1042768:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01042790: 0x1042790: jr    ra addiu sp, sp, 32
+// 0x010427a0: 0x10427a0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1133,7 +1133,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_bar_decode_integer_1042798(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_decode_integer_10427a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -1174,15 +1174,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042798: 0x1042798: addiu sp, sp, -296
+// 0x010427a8: 0x10427a8: addiu sp, sp, -296
 	ldloc.0
 	ldc.i4 -296
 	add
 	stloc.0
-// 0x0104279c: 0x104279c: addiu v0, zero, 2
+// 0x010427ac: 0x10427ac: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x010427a0: 0x10427a0: sw    s0, 284(sp)
+// 0x010427b0: 0x10427b0: sw    s0, 284(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1191,8 +1191,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010427a4: 0x10427a4: sw    ra, 292(sp)
-// 0x010427a8: 0x10427a8: sw    s1, 288(sp)
+// 0x010427b4: 0x10427b4: sw    ra, 292(sp)
+// 0x010427b8: 0x10427b8: sw    s1, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1201,43 +1201,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010427ac: 0x10427ac: beq   a1, v0, 0x10427e0 addu  s0, a0, zero
+// 0x010427bc: 0x10427bc: beq   a1, v0, 0x10427f0 addu  s0, a0, zero
 	ldloc.2
 	ldloc 6
 	ldloc.1
 	stloc 8
-	beq  L_10427e0
+	beq  L_10427f0
 // --- basic block ---
-// 0x010427b4: 0x10427b4: lw    v0, 0(a2)
+// 0x010427c4: 0x10427c4: lw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010427b8: 0x10427b8: lui   a1, 0x10000
+// 0x010427c8: 0x10427c8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010427bc: 0x10427bc: lui   a3, 0x10000
+// 0x010427cc: 0x10427cc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010427c0: 0x10427c0: addiu a1, a1, -3296
+// 0x010427d0: 0x10427d0: addiu a1, a1, -3300
 	ldloc.2
-	ldc.i4 -3296
+	ldc.i4 -3300
 	add
 	stloc.2
-// 0x010427c4: 0x10427c4: addiu a3, a3, -3232
+// 0x010427d4: 0x10427d4: addiu a3, a3, -3236
 	ldloc 4
-	ldc.i4 -3232
+	ldc.i4 -3236
 	add
 	stloc 4
-// 0x010427c8: 0x10427c8: addiu a0, zero, 4
+// 0x010427d8: 0x10427d8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010427cc: 0x10427cc: addiu a2, zero, 247
+// 0x010427dc: 0x10427dc: addiu a2, zero, 247
 	ldc.i4 247
 	stloc.3
-// 0x010427d0: 0x10427d0: jal   0x100449c sw    v0, 16(sp)
+// 0x010427e0: 0x10427e0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1256,11 +1256,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010427d8: 0x10427d8: j	 0x1042804 sll   zero, zero, 0
-	br L_1042804
+// 0x010427e8: 0x10427e8: j	 0x1042814 sll   zero, zero, 0
+	br L_1042814
 // --- basic block ---
-L_10427e0:
-// 0x010427e0: 0x10427e0: lw    a2, 4(a2)
+L_10427f0:
+// 0x010427f0: 0x10427f0: lw    a2, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -1269,7 +1269,7 @@ L_10427e0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010427e4: 0x10427e4: lw    a3, 4(a3)
+// 0x010427f4: 0x10427f4: lw    a3, 4(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -1278,15 +1278,15 @@ L_10427e0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010427e8: 0x10427e8: addiu s1, sp, 24
+// 0x010427f8: 0x10427f8: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x010427ec: 0x10427ec: addiu a1, zero, 255
+// 0x010427fc: 0x10427fc: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x010427f0: 0x10427f0: jal   0x1042744 addu  a0, s1, zero
+// 0x01042800: 0x1042800: jal   0x1042754 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1294,12 +1294,12 @@ L_10427e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010427f8: 0x10427f8: jal   0x1000d8c addu  a0, s1, zero
+// 0x01042808: 0x1042808: jal   0x1000d8c addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1312,16 +1312,16 @@ L_10427e0:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01042800: 0x1042800: sw    v0, 0(s0)
+// 0x01042810: 0x1042810: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_1042804:
-// 0x01042804: 0x1042804: lw    ra, 292(sp)
-// 0x01042808: 0x1042808: lw    s1, 288(sp)
+L_1042814:
+// 0x01042814: 0x1042814: lw    ra, 292(sp)
+// 0x01042818: 0x1042818: lw    s1, 288(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1330,7 +1330,7 @@ L_1042804:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104280c: 0x104280c: lw    s0, 284(sp)
+// 0x0104281c: 0x104281c: lw    s0, 284(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1339,7 +1339,7 @@ L_1042804:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01042810: 0x1042810: jr    ra addiu sp, sp, 296
+// 0x01042820: 0x1042820: jr    ra addiu sp, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
@@ -1351,7 +1351,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_bar_object_string_1042818(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_object_string_1042828(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 s0,int32 s2,int32 v1,int32 ra)
@@ -1395,12 +1395,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042818: 0x1042818: addiu sp, sp, -32
+// 0x01042828: 0x1042828: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104281c: 0x104281c: sw    s2, 24(sp)
+// 0x0104282c: 0x104282c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1409,16 +1409,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01042820: 0x1042820: addu  s2, a0, zero
+// 0x01042830: 0x1042830: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01042824: 0x1042824: addiu a0, a1, 1
+// 0x01042834: 0x1042834: addiu a0, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01042828: 0x1042828: sw    ra, 28(sp)
-// 0x0104282c: 0x104282c: sw    s1, 20(sp)
+// 0x01042838: 0x1042838: sw    ra, 28(sp)
+// 0x0104283c: 0x104283c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1427,7 +1427,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01042830: 0x1042830: sw    s0, 16(sp)
+// 0x01042840: 0x1042840: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1436,7 +1436,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01042834: 0x1042834: jal   0x1000910 addu  s1, a1, zero
+// 0x01042844: 0x1042844: jal   0x1000910 addu  s1, a1, zero
 	ldloc.2
 	stloc 6
 	ldloc.0
@@ -1449,21 +1449,21 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0104283c: 0x104283c: lui   a0, 0x10000
+// 0x0104284c: 0x104284c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01042840: 0x1042840: addu  s0, v0, zero
+// 0x01042850: 0x1042850: addu  s0, v0, zero
 	ldloc 7
 	stloc 8
-// 0x01042844: 0x1042844: addu  a2, v0, zero
+// 0x01042854: 0x1042854: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x01042848: 0x1042848: addiu a0, a0, -3296
+// 0x01042858: 0x1042858: addiu a0, a0, -3300
 	ldloc.1
-	ldc.i4 -3296
+	ldc.i4 -3300
 	add
 	stloc.1
-// 0x0104284c: 0x104284c: jal   0x1004a38 addiu a1, zero, 217
+// 0x0104285c: 0x104285c: jal   0x1004a48 addiu a1, zero, 217
 	ldc.i4 217
 	stloc.2
 	ldloc.0
@@ -1471,21 +1471,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01042854: 0x1042854: addu  a0, s0, zero
+// 0x01042864: 0x1042864: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01042858: 0x1042858: addu  a1, s2, zero
+// 0x01042868: 0x1042868: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x0104285c: 0x104285c: addu  a2, s1, zero
+// 0x0104286c: 0x104286c: addu  a2, s1, zero
 	ldloc 6
 	stloc.3
-// 0x01042860: 0x1042860: jal   0x1001af8 addu  s1, s0, s1
+// 0x01042870: 0x1042870: jal   0x1001af8 addu  s1, s0, s1
 	ldloc 8
 	ldloc 6
 	add
@@ -1496,15 +1496,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01042868: 0x1042868: sb    zero, 0(s1)
+// 0x01042878: 0x1042878: sb    zero, 0(s1)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104286c: 0x104286c: lw    ra, 28(sp)
-// 0x01042870: 0x1042870: addu  v0, s0, zero
+// 0x0104287c: 0x104287c: lw    ra, 28(sp)
+// 0x01042880: 0x1042880: addu  v0, s0, zero
 	ldloc 8
 	stloc 7
-// 0x01042874: 0x1042874: lw    s2, 24(sp)
+// 0x01042884: 0x1042884: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1513,7 +1513,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01042878: 0x1042878: lw    s1, 20(sp)
+// 0x01042888: 0x1042888: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1522,7 +1522,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104287c: 0x104287c: lw    s0, 16(sp)
+// 0x0104288c: 0x104288c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1531,7 +1531,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01042880: 0x1042880: jr    ra addiu sp, sp, 32
+// 0x01042890: 0x1042890: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1543,7 +1543,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_bar_obj_pressed_1042888(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_obj_pressed_1042898(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -1581,24 +1581,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042888: 0x1042888: lui   v0, 0x60000
+// 0x01042898: 0x1042898: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104288c: 0x104288c: lw    v0, 12640(v0)
+// 0x0104289c: 0x104289c: lw    v0, 13104(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042890: 0x1042890: addiu sp, sp, -24
+// 0x010428a0: 0x10428a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01042894: 0x1042894: sw    s0, 16(sp)
+// 0x010428a4: 0x10428a4: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1607,19 +1607,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01042898: 0x1042898: sw    ra, 20(sp)
-// 0x0104289c: 0x104289c: bne   v0, zero, 0x10428b8 addu  s0, a0, zero
+// 0x010428a8: 0x10428a8: sw    ra, 20(sp)
+// 0x010428ac: 0x10428ac: bne   v0, zero, 0x10428c8 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brtrue L_10428b8
+	brtrue L_10428c8
 // --- basic block ---
-// 0x010428a4: 0x10428a4: lui   a1, 0x60000
+// 0x010428b4: 0x10428b4: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010428a8: 0x10428a8: jal   0x1042228 addiu a1, a1, 12660
+// 0x010428b8: 0x10428b8: jal   0x1042238 addiu a1, a1, 13124
 	ldloc.2
-	ldc.i4 12660
+	ldc.i4 13124
 	add
 	stloc.2
 	ldloc.0
@@ -1627,22 +1627,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_bar_by_pos_1042228(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_bar_by_pos_1042238(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010428b0: 0x10428b0: bne   v0, zero, 0x10428e4 addiu v1, zero, 1
+// 0x010428c0: 0x10428c0: bne   v0, zero, 0x10428f4 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_10428e4
+	brtrue L_10428f4
 // --- basic block ---
-L_10428b8:
-// 0x010428b8: 0x10428b8: lui   v0, 0x0
+L_10428c8:
+// 0x010428c8: 0x10428c8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010428bc: 0x10428bc: lw    v0, 13332(v0)
+// 0x010428cc: 0x10428cc: lw    v0, 13332(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1651,22 +1651,22 @@ L_10428b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010428c0: 0x10428c0: sll   zero, zero, 0
-// 0x010428c4: 0x10428c4: bne   v0, zero, 0x1042914 addu  v0, zero, zero
+// 0x010428d0: 0x10428d0: sll   zero, zero, 0
+// 0x010428d4: 0x10428d4: bne   v0, zero, 0x1042924 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1042914
+	brtrue L_1042924
 // --- basic block ---
-// 0x010428cc: 0x10428cc: lui   a1, 0x60000
+// 0x010428dc: 0x10428dc: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010428d0: 0x10428d0: addu  a0, s0, zero
+// 0x010428e0: 0x10428e0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010428d4: 0x10428d4: jal   0x1042228 addiu a1, a1, 12748
+// 0x010428e4: 0x10428e4: jal   0x1042238 addiu a1, a1, 13212
 	ldloc.2
-	ldc.i4 12748
+	ldc.i4 13212
 	add
 	stloc.2
 	ldloc.0
@@ -1674,22 +1674,22 @@ L_10428b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_bar_by_pos_1042228(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_bar_by_pos_1042238(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010428dc: 0x10428dc: beq   v0, zero, 0x1042910 addiu v1, zero, 1
+// 0x010428ec: 0x10428ec: beq   v0, zero, 0x1042920 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_1042910
+	brfalse L_1042920
 // --- basic block ---
-L_10428e4:
-// 0x010428e4: 0x10428e4: lui   a0, 0x1040000
+L_10428f4:
+// 0x010428f4: 0x10428f4: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x010428e8: 0x10428e8: sw    v1, 620(v0)
+// 0x010428f8: 0x10428f8: sw    v1, 620(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1698,23 +1698,23 @@ L_10428e4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010428ec: 0x10428ec: addiu a0, a0, 10532
+// 0x010428fc: 0x10428fc: addiu a0, a0, 10548
 	ldloc.1
-	ldc.i4 10532
+	ldc.i4 10548
 	add
 	stloc.1
-// 0x010428f0: 0x10428f0: lui   v1, 0x60000
+// 0x01042900: 0x1042900: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x010428f4: 0x10428f4: addiu a1, zero, 3
+// 0x01042904: 0x1042904: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010428f8: 0x10428f8: jal   0x104b9c0 sw    v0, 12656(v1)
+// 0x01042908: 0x1042908: jal   0x104b9d0 sw    v0, 13120(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldloc 5
 	stelem.i4
@@ -1723,34 +1723,34 @@ L_10428e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_drag_motion_104b9c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_drag_motion_104b9d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01042900: 0x1042900: jal   0x1021900 sll   zero, zero, 0
+// 0x01042910: 0x1042910: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01042908: 0x1042908: j	 0x1042914 addiu v0, zero, 1
+// 0x01042918: 0x1042918: j	 0x1042924 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1042914
+	br L_1042924
 // --- basic block ---
-L_1042910:
-// 0x01042910: 0x1042910: addu  v0, zero, zero
+L_1042920:
+// 0x01042920: 0x1042920: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1042914:
-// 0x01042914: 0x1042914: lw    ra, 20(sp)
-// 0x01042918: 0x1042918: lw    s0, 16(sp)
+L_1042924:
+// 0x01042924: 0x1042924: lw    ra, 20(sp)
+// 0x01042928: 0x1042928: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1759,7 +1759,7 @@ L_1042914:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104291c: 0x104291c: jr    ra addiu sp, sp, 24
+// 0x0104292c: 0x104292c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1771,7 +1771,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_bar_drag_motion_1042924(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_drag_motion_1042934(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1809,24 +1809,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01042924: 0x1042924: lui   v0, 0x60000
+// 0x01042934: 0x1042934: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01042928: 0x1042928: lw    v0, 12656(v0)
+// 0x01042938: 0x1042938: lw    v0, 13120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104292c: 0x104292c: addiu sp, sp, -24
+// 0x0104293c: 0x104293c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01042930: 0x1042930: sw    s0, 16(sp)
+// 0x01042940: 0x1042940: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1835,41 +1835,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01042934: 0x1042934: sw    ra, 20(sp)
-// 0x01042938: 0x1042938: addu  s0, a0, zero
+// 0x01042944: 0x1042944: sw    ra, 20(sp)
+// 0x01042948: 0x1042948: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104293c: 0x104293c: beq   v0, zero, 0x10429d0 addu  v1, zero, zero
+// 0x0104294c: 0x104294c: beq   v0, zero, 0x10429e0 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10429d0
+	brfalse L_10429e0
 // --- basic block ---
-// 0x01042944: 0x1042944: lui   v0, 0x60000
+// 0x01042954: 0x1042954: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01042948: 0x1042948: lw    v0, 12640(v0)
+// 0x01042958: 0x1042958: lw    v0, 13104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104294c: 0x104294c: sll   zero, zero, 0
-// 0x01042950: 0x1042950: bne   v0, zero, 0x1042970 lui   v0, 0x0
+// 0x0104295c: 0x104295c: sll   zero, zero, 0
+// 0x01042960: 0x1042960: bne   v0, zero, 0x1042980 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1042970
+	brtrue L_1042980
 // --- basic block ---
-// 0x01042958: 0x1042958: lui   a1, 0x60000
+// 0x01042968: 0x1042968: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x0104295c: 0x104295c: jal   0x1042228 addiu a1, a1, 12660
+// 0x0104296c: 0x104296c: jal   0x1042238 addiu a1, a1, 13124
 	ldloc.2
-	ldc.i4 12660
+	ldc.i4 13124
 	add
 	stloc.2
 	ldloc.0
@@ -1877,22 +1877,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_bar_by_pos_1042228(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_bar_by_pos_1042238(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042964: 0x1042964: bne   v0, zero, 0x10429a8 lui   a0, 0x60000
+// 0x01042974: 0x1042974: bne   v0, zero, 0x10429b8 lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	brtrue L_10429a8
+	brtrue L_10429b8
 // --- basic block ---
-// 0x0104296c: 0x104296c: lui   v0, 0x0
+// 0x0104297c: 0x104297c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1042970:
-// 0x01042970: 0x1042970: lw    v0, 13332(v0)
+L_1042980:
+// 0x01042980: 0x1042980: lw    v0, 13332(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1901,22 +1901,22 @@ L_1042970:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042974: 0x1042974: sll   zero, zero, 0
-// 0x01042978: 0x1042978: bne   v0, zero, 0x104299c lui   v0, 0x60000
+// 0x01042984: 0x1042984: sll   zero, zero, 0
+// 0x01042988: 0x1042988: bne   v0, zero, 0x10429ac lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_104299c
+	brtrue L_10429ac
 // --- basic block ---
-// 0x01042980: 0x1042980: lui   a1, 0x60000
+// 0x01042990: 0x1042990: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01042984: 0x1042984: addu  a0, s0, zero
+// 0x01042994: 0x1042994: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01042988: 0x1042988: jal   0x1042228 addiu a1, a1, 12748
+// 0x01042998: 0x1042998: jal   0x1042238 addiu a1, a1, 13212
 	ldloc.2
-	ldc.i4 12748
+	ldc.i4 13212
 	add
 	stloc.2
 	ldloc.0
@@ -1924,31 +1924,31 @@ L_1042970:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_bar_by_pos_1042228(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_bar_by_pos_1042238(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042990: 0x1042990: bne   v0, zero, 0x10429a8 lui   a0, 0x60000
+// 0x010429a0: 0x10429a0: bne   v0, zero, 0x10429b8 lui   a0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc.1
-	brtrue L_10429a8
+	brtrue L_10429b8
 // --- basic block ---
-// 0x01042998: 0x1042998: lui   v0, 0x60000
+// 0x010429a8: 0x10429a8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_104299c:
-// 0x0104299c: 0x104299c: lw    v0, 12656(v0)
+L_10429ac:
+// 0x010429ac: 0x10429ac: lw    v0, 13120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc 5
-// 0x010429a0: 0x10429a0: j	 0x10429c4 sw    zero, 620(v0)
+// 0x010429b0: 0x10429b0: j	 0x10429d4 sw    zero, 620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1957,27 +1957,27 @@ L_104299c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10429c4
+	br L_10429d4
 // --- basic block ---
-L_10429a8:
-// 0x010429a8: 0x10429a8: lw    a1, 12656(a0)
+L_10429b8:
+// 0x010429b8: 0x10429b8: lw    a1, 13120(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc.2
-// 0x010429ac: 0x10429ac: sll   zero, zero, 0
-// 0x010429b0: 0x10429b0: beq   v0, a1, 0x10429d0 addiu v1, zero, 1
+// 0x010429bc: 0x10429bc: sll   zero, zero, 0
+// 0x010429c0: 0x10429c0: beq   v0, a1, 0x10429e0 addiu v1, zero, 1
 	ldloc 5
 	ldloc.2
 	ldc.i4.1
 	stloc 7
-	beq  L_10429d0
+	beq  L_10429e0
 // --- basic block ---
-// 0x010429b8: 0x10429b8: sw    zero, 620(a1)
+// 0x010429c8: 0x10429c8: sw    zero, 620(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1986,16 +1986,16 @@ L_10429a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010429bc: 0x10429bc: sw    v0, 12656(a0)
+// 0x010429cc: 0x10429cc: sw    v0, 13120(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldloc 5
 	stelem.i4
-// 0x010429c0: 0x10429c0: sw    v1, 620(v0)
+// 0x010429d0: 0x10429d0: sw    v1, 620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2004,27 +2004,27 @@ L_10429a8:
 	add
 	ldloc 7
 	stelem.i4
-L_10429c4:
-// 0x010429c4: 0x10429c4: jal   0x1021900 sll   zero, zero, 0
+L_10429d4:
+// 0x010429d4: 0x10429d4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010429cc: 0x10429cc: addiu v1, zero, 1
+// 0x010429dc: 0x10429dc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-L_10429d0:
-// 0x010429d0: 0x10429d0: lw    ra, 20(sp)
-// 0x010429d4: 0x10429d4: addu  v0, v1, zero
+L_10429e0:
+// 0x010429e0: 0x10429e0: lw    ra, 20(sp)
+// 0x010429e4: 0x10429e4: addu  v0, v1, zero
 	ldloc 7
 	stloc 5
-// 0x010429d8: 0x10429d8: lw    s0, 16(sp)
+// 0x010429e8: 0x10429e8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2033,7 +2033,7 @@ L_10429d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010429dc: 0x10429dc: jr    ra addiu sp, sp, 24
+// 0x010429ec: 0x10429ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2045,7 +2045,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 draw_objects_10429e4(int32,int32,int32,int32,int32)
+.method public static int32 draw_objects_10429f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 lo,int32 s1,int32 s4,int32 s5,int32 s7,int32 s3,int32 s6,int32 s8,int32 ra)
@@ -2110,12 +2110,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010429e4: 0x10429e4: addiu sp, sp, -88
+// 0x010429f4: 0x10429f4: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010429e8: 0x10429e8: sw    s8, 80(sp)
+// 0x010429f8: 0x10429f8: sw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2124,7 +2124,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010429ec: 0x10429ec: sw    s7, 76(sp)
+// 0x010429fc: 0x10429fc: sw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2133,7 +2133,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010429f0: 0x10429f0: sw    s6, 72(sp)
+// 0x01042a00: 0x1042a00: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2142,7 +2142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010429f4: 0x10429f4: sw    s5, 68(sp)
+// 0x01042a04: 0x1042a04: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2151,7 +2151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010429f8: 0x10429f8: sw    s4, 64(sp)
+// 0x01042a08: 0x1042a08: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2160,7 +2160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010429fc: 0x10429fc: sw    s3, 60(sp)
+// 0x01042a0c: 0x1042a0c: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2169,7 +2169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01042a00: 0x1042a00: sw    s2, 56(sp)
+// 0x01042a10: 0x1042a10: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2178,7 +2178,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01042a04: 0x1042a04: sw    s1, 52(sp)
+// 0x01042a14: 0x1042a14: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2187,7 +2187,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01042a08: 0x1042a08: sw    s0, 48(sp)
+// 0x01042a18: 0x1042a18: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2196,8 +2196,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01042a0c: 0x1042a0c: sw    ra, 84(sp)
-// 0x01042a10: 0x1042a10: sw    a0, 88(sp)
+// 0x01042a1c: 0x1042a1c: sw    ra, 84(sp)
+// 0x01042a20: 0x1042a20: sw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2206,53 +2206,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01042a14: 0x1042a14: addu  s0, a0, zero
+// 0x01042a24: 0x1042a24: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01042a18: 0x1042a18: addu  s2, zero, zero
+// 0x01042a28: 0x1042a28: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01042a1c: 0x1042a1c: addu  s7, zero, zero
+// 0x01042a2c: 0x1042a2c: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x01042a20: 0x1042a20: addiu s6, sp, 16
+// 0x01042a30: 0x1042a30: addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 16
-// 0x01042a24: 0x1042a24: lui   s5, 0xf0000
+// 0x01042a34: 0x1042a34: lui   s5, 0xf0000
 	ldc.i4 983040
 	stloc 13
-// 0x01042a28: 0x1042a28: lui   s4, 0xf0000
+// 0x01042a38: 0x1042a38: lui   s4, 0xf0000
 	ldc.i4 983040
 	stloc 12
-// 0x01042a2c: 0x1042a2c: addiu s8, zero, 1
+// 0x01042a3c: 0x1042a3c: addiu s8, zero, 1
 	ldc.i4.1
 	stloc 17
-// 0x01042a30: 0x1042a30: addiu s1, zero, 2
+// 0x01042a40: 0x1042a40: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 11
-// 0x01042a34: 0x1042a34: j	 0x104307c addiu s3, sp, 24
+// 0x01042a44: 0x1042a44: j	 0x104308c addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-	br L_104307c
+	br L_104308c
 // --- basic block ---
-L_1042a3c:
-// 0x01042a3c: 0x1042a3c: lw    v0, 0(s0)
+L_1042a4c:
+// 0x01042a4c: 0x1042a4c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042a40: 0x1042a40: sll   zero, zero, 0
-// 0x01042a44: 0x1042a44: beq   v0, zero, 0x1043074 sll   zero, zero, 0
+// 0x01042a50: 0x1042a50: sll   zero, zero, 0
+// 0x01042a54: 0x1042a54: beq   v0, zero, 0x1043084 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1043074
+	brfalse L_1043084
 // --- basic block ---
-// 0x01042a4c: 0x1042a4c: lw    v0, 544(v0)
+// 0x01042a5c: 0x1042a5c: lw    v0, 544(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2261,27 +2261,27 @@ L_1042a3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042a50: 0x1042a50: sll   zero, zero, 0
-// 0x01042a54: 0x1042a54: beq   v0, zero, 0x1042ad0 addiu a0, zero, 1
+// 0x01042a60: 0x1042a60: sll   zero, zero, 0
+// 0x01042a64: 0x1042a64: beq   v0, zero, 0x1042ae0 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brfalse L_1042ad0
+	brfalse L_1042ae0
 // --- basic block ---
-// 0x01042a5c: 0x1042a5c: j	 0x1042aa4 addu  v1, zero, zero
+// 0x01042a6c: 0x1042a6c: j	 0x1042ab4 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1042aa4
+	br L_1042ab4
 // --- basic block ---
-L_1042a64:
-// 0x01042a64: 0x1042a64: lw    v0, 0(a1)
+L_1042a74:
+// 0x01042a74: 0x1042a74: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042a68: 0x1042a68: sw    v1, 40(sp)
+// 0x01042a78: 0x1042a78: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2290,7 +2290,7 @@ L_1042a64:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01042a6c: 0x1042a6c: jalr  v0 sw    a0, 36(sp)
+// 0x01042a7c: 0x1042a7c: jalr  v0 sw    a0, 36(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -2310,7 +2310,7 @@ L_1042a64:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042a74: 0x1042a74: lw    v1, 40(sp)
+// 0x01042a84: 0x1042a84: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2319,29 +2319,29 @@ L_1042a64:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042a78: 0x1042a78: lw    a2, 0(s0)
+// 0x01042a88: 0x1042a88: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01042a7c: 0x1042a7c: addiu a1, v1, 144
+// 0x01042a8c: 0x1042a8c: addiu a1, v1, 144
 	ldloc 7
 	ldc.i4 144
 	add
 	stloc.2
-// 0x01042a80: 0x1042a80: sll   a1, a1, 2
+// 0x01042a90: 0x1042a90: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01042a84: 0x1042a84: addu  a1, a2, a1
+// 0x01042a94: 0x1042a94: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x01042a88: 0x1042a88: lw    a1, 4(a1)
+// 0x01042a98: 0x1042a98: lw    a1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2350,7 +2350,7 @@ L_1042a64:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042a8c: 0x1042a8c: lw    a0, 36(sp)
+// 0x01042a9c: 0x1042a9c: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2359,54 +2359,54 @@ L_1042a64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042a90: 0x1042a90: xor   a1, v0, a1
+// 0x01042aa0: 0x1042aa0: xor   a1, v0, a1
 	ldloc 5
 	ldloc.2
 	xor
 	stloc.2
-// 0x01042a94: 0x1042a94: sltiu a1, a1, 1
+// 0x01042aa4: 0x1042aa4: sltiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.2
-// 0x01042a98: 0x1042a98: subu  a1, zero, a1
+// 0x01042aa8: 0x1042aa8: subu  a1, zero, a1
 	ldloc.2
 	neg
 	stloc.2
-// 0x01042a9c: 0x1042a9c: addiu v1, v1, 1
+// 0x01042aac: 0x1042aac: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01042aa0: 0x1042aa0: and   a0, a0, a1
+// 0x01042ab0: 0x1042ab0: and   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	and
 	stloc.1
-L_1042aa4:
-// 0x01042aa4: 0x1042aa4: lw    v0, 0(s0)
+L_1042ab4:
+// 0x01042ab4: 0x1042ab4: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042aa8: 0x1042aa8: addiu a1, v1, 136
+// 0x01042ab8: 0x1042ab8: addiu a1, v1, 136
 	ldloc 7
 	ldc.i4 136
 	add
 	stloc.2
-// 0x01042aac: 0x1042aac: sll   a1, a1, 2
+// 0x01042abc: 0x1042abc: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01042ab0: 0x1042ab0: addu  a1, v0, a1
+// 0x01042ac0: 0x1042ac0: addu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc.2
-// 0x01042ab4: 0x1042ab4: lw    v0, 616(v0)
+// 0x01042ac4: 0x1042ac4: lw    v0, 616(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2415,30 +2415,30 @@ L_1042aa4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042ab8: 0x1042ab8: sll   zero, zero, 0
-// 0x01042abc: 0x1042abc: slt   v0, v1, v0
+// 0x01042ac8: 0x1042ac8: sll   zero, zero, 0
+// 0x01042acc: 0x1042acc: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01042ac0: 0x1042ac0: bne   v0, zero, 0x1042a64 sll   zero, zero, 0
+// 0x01042ad0: 0x1042ad0: bne   v0, zero, 0x1042a74 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1042a64
+	brtrue L_1042a74
 // --- basic block ---
-// 0x01042ac8: 0x1042ac8: beq   a0, zero, 0x1043074 sll   zero, zero, 0
+// 0x01042ad8: 0x1042ad8: beq   a0, zero, 0x1043084 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1043074
+	brfalse L_1043084
 // --- basic block ---
-L_1042ad0:
-// 0x01042ad0: 0x1042ad0: lw    v0, 0(s0)
+L_1042ae0:
+// 0x01042ae0: 0x1042ae0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042ad4: 0x1042ad4: sll   zero, zero, 0
-// 0x01042ad8: 0x1042ad8: lw    v1, 164(v0)
+// 0x01042ae4: 0x1042ae4: sll   zero, zero, 0
+// 0x01042ae8: 0x1042ae8: lw    v1, 164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2447,8 +2447,8 @@ L_1042ad0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042adc: 0x1042adc: sll   zero, zero, 0
-// 0x01042ae0: 0x1042ae0: sw    v1, 24(sp)
+// 0x01042aec: 0x1042aec: sll   zero, zero, 0
+// 0x01042af0: 0x1042af0: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2457,7 +2457,7 @@ L_1042ad0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01042ae4: 0x1042ae4: lw    a0, 168(v0)
+// 0x01042af4: 0x1042af4: lw    a0, 168(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2466,7 +2466,7 @@ L_1042ad0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042ae8: 0x1042ae8: bgez  v1, 0x1042b00 sw    a0, 28(sp)
+// 0x01042af8: 0x1042af8: bgez  v1, 0x1042b10 sw    a0, 28(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -2477,24 +2477,24 @@ L_1042ad0:
 	ldloc.1
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1042b00
+	bge L_1042b10
 // --- basic block ---
-// 0x01042af0: 0x1042af0: lw    a0, -30068(s4)
+// 0x01042b00: 0x1042b00: lw    a0, -29604(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042af4: 0x1042af4: sll   zero, zero, 0
-// 0x01042af8: 0x1042af8: addu  v1, a0, v1
+// 0x01042b04: 0x1042b04: sll   zero, zero, 0
+// 0x01042b08: 0x1042b08: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01042afc: 0x1042afc: sw    v1, 24(sp)
+// 0x01042b0c: 0x1042b0c: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2503,8 +2503,8 @@ L_1042ad0:
 	add
 	ldloc 7
 	stelem.i4
-L_1042b00:
-// 0x01042b00: 0x1042b00: lw    v1, 28(sp)
+L_1042b10:
+// 0x01042b10: 0x1042b10: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2513,28 +2513,28 @@ L_1042b00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042b04: 0x1042b04: sll   zero, zero, 0
-// 0x01042b08: 0x1042b08: bgez  v1, 0x1042b20 sll   zero, zero, 0
+// 0x01042b14: 0x1042b14: sll   zero, zero, 0
+// 0x01042b18: 0x1042b18: bgez  v1, 0x1042b30 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bge L_1042b20
+	bge L_1042b30
 // --- basic block ---
-// 0x01042b10: 0x1042b10: lw    a0, -30072(s5)
+// 0x01042b20: 0x1042b20: lw    a0, -29608(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042b14: 0x1042b14: sll   zero, zero, 0
-// 0x01042b18: 0x1042b18: addu  v1, a0, v1
+// 0x01042b24: 0x1042b24: sll   zero, zero, 0
+// 0x01042b28: 0x1042b28: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01042b1c: 0x1042b1c: sw    v1, 28(sp)
+// 0x01042b2c: 0x1042b2c: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2543,8 +2543,8 @@ L_1042b00:
 	add
 	ldloc 7
 	stelem.i4
-L_1042b20:
-// 0x01042b20: 0x1042b20: lw    v1, 500(v0)
+L_1042b30:
+// 0x01042b30: 0x1042b30: lw    v1, 500(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2553,12 +2553,12 @@ L_1042b20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042b24: 0x1042b24: sll   zero, zero, 0
-// 0x01042b28: 0x1042b28: beq   v1, zero, 0x1042b9c sll   zero, zero, 0
+// 0x01042b34: 0x1042b34: sll   zero, zero, 0
+// 0x01042b38: 0x1042b38: beq   v1, zero, 0x1042bac sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1042b9c
+	brfalse L_1042bac
 // --- basic block ---
-// 0x01042b30: 0x1042b30: jalr  v1 sll   zero, zero, 0
+// 0x01042b40: 0x1042b40: jalr  v1 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
 	ldloc.1
@@ -2570,37 +2570,37 @@ L_1042b20:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042b38: 0x1042b38: sltiu v1, v0, 40
+// 0x01042b48: 0x1042b48: sltiu v1, v0, 40
 	ldloc 5
 	ldc.i4.s 40
 	clt.un
 	stloc 7
-// 0x01042b3c: 0x1042b3c: beq   v1, zero, 0x1042bf8 addiu a0, v0, 42
+// 0x01042b4c: 0x1042b4c: beq   v1, zero, 0x1042c08 addiu a0, v0, 42
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 42
 	add
 	stloc.1
-	brfalse L_1042bf8
+	brfalse L_1042c08
 // --- basic block ---
-// 0x01042b44: 0x1042b44: lw    v1, 0(s0)
+// 0x01042b54: 0x1042b54: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042b48: 0x1042b48: sll   a0, a0, 2
+// 0x01042b58: 0x1042b58: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01042b4c: 0x1042b4c: addu  a0, v1, a0
+// 0x01042b5c: 0x1042b5c: addu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x01042b50: 0x1042b50: lw    a1, 4(a0)
+// 0x01042b60: 0x1042b60: lw    a1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2609,12 +2609,12 @@ L_1042b20:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042b54: 0x1042b54: sll   zero, zero, 0
-// 0x01042b58: 0x1042b58: beq   a1, zero, 0x1042bf8 sll   zero, zero, 0
+// 0x01042b64: 0x1042b64: sll   zero, zero, 0
+// 0x01042b68: 0x1042b68: beq   a1, zero, 0x1042c08 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1042bf8
+	brfalse L_1042c08
 // --- basic block ---
-// 0x01042b60: 0x1042b60: lw    a0, 620(v1)
+// 0x01042b70: 0x1042b70: lw    a0, 620(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2623,27 +2623,27 @@ L_1042b20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042b64: 0x1042b64: sll   zero, zero, 0
-// 0x01042b68: 0x1042b68: bne   a0, s8, 0x1042b90 addiu v0, v0, 82
+// 0x01042b74: 0x1042b74: sll   zero, zero, 0
+// 0x01042b78: 0x1042b78: bne   a0, s8, 0x1042ba0 addiu v0, v0, 82
 	ldloc.1
 	ldloc 17
 	ldloc 5
 	ldc.i4.s 82
 	add
 	stloc 5
-	bne.un L_1042b90
+	bne.un L_1042ba0
 // --- basic block ---
-// 0x01042b70: 0x1042b70: sll   v0, v0, 2
+// 0x01042b80: 0x1042b80: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01042b74: 0x1042b74: addu  v0, v1, v0
+// 0x01042b84: 0x1042b84: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01042b78: 0x1042b78: lw    v0, 4(v0)
+// 0x01042b88: 0x1042b88: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2652,35 +2652,35 @@ L_1042b20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042b7c: 0x1042b7c: lw    a0, 0(v1)
+// 0x01042b8c: 0x1042b8c: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042b80: 0x1042b80: beq   v0, zero, 0x1042bdc sll   zero, zero, 0
+// 0x01042b90: 0x1042b90: beq   v0, zero, 0x1042bec sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1042bdc
+	brfalse L_1042bec
 // --- basic block ---
-// 0x01042b88: 0x1042b88: j	 0x1042bdc addu  a1, v0, zero
+// 0x01042b98: 0x1042b98: j	 0x1042bec addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-	br L_1042bdc
+	br L_1042bec
 // --- basic block ---
-L_1042b90:
-// 0x01042b90: 0x1042b90: lw    a0, 0(v1)
+L_1042ba0:
+// 0x01042ba0: 0x1042ba0: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042b94: 0x1042b94: j	 0x1042bdc sll   zero, zero, 0
-	br L_1042bdc
+// 0x01042ba4: 0x1042ba4: j	 0x1042bec sll   zero, zero, 0
+	br L_1042bec
 // --- basic block ---
-L_1042b9c:
-// 0x01042b9c: 0x1042b9c: lw    v1, 620(v0)
+L_1042bac:
+// 0x01042bac: 0x1042bac: lw    v1, 620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2689,13 +2689,13 @@ L_1042b9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042ba0: 0x1042ba0: sll   zero, zero, 0
-// 0x01042ba4: 0x1042ba4: bne   v1, s8, 0x1042bc8 sll   zero, zero, 0
+// 0x01042bb0: 0x1042bb0: sll   zero, zero, 0
+// 0x01042bb4: 0x1042bb4: bne   v1, s8, 0x1042bd8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 17
-	bne.un L_1042bc8
+	bne.un L_1042bd8
 // --- basic block ---
-// 0x01042bac: 0x1042bac: lw    a1, 332(v0)
+// 0x01042bbc: 0x1042bbc: lw    a1, 332(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2704,18 +2704,18 @@ L_1042b9c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042bb0: 0x1042bb0: lw    a0, 0(v0)
+// 0x01042bc0: 0x1042bc0: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042bb4: 0x1042bb4: bne   a1, zero, 0x1042bdc sll   zero, zero, 0
+// 0x01042bc4: 0x1042bc4: bne   a1, zero, 0x1042bec sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1042bdc
+	brtrue L_1042bec
 // --- basic block ---
-// 0x01042bbc: 0x1042bbc: lw    a1, 172(v0)
+// 0x01042bcc: 0x1042bcc: lw    a1, 172(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2724,11 +2724,11 @@ L_1042b9c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042bc0: 0x1042bc0: j	 0x1042bdc sll   zero, zero, 0
-	br L_1042bdc
+// 0x01042bd0: 0x1042bd0: j	 0x1042bec sll   zero, zero, 0
+	br L_1042bec
 // --- basic block ---
-L_1042bc8:
-// 0x01042bc8: 0x1042bc8: lw    a1, 172(v0)
+L_1042bd8:
+// 0x01042bd8: 0x1042bd8: lw    a1, 172(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2737,40 +2737,40 @@ L_1042bc8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042bcc: 0x1042bcc: sll   zero, zero, 0
-// 0x01042bd0: 0x1042bd0: beq   a1, zero, 0x1042bf8 sll   zero, zero, 0
+// 0x01042bdc: 0x1042bdc: sll   zero, zero, 0
+// 0x01042be0: 0x1042be0: beq   a1, zero, 0x1042c08 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1042bf8
+	brfalse L_1042c08
 // --- basic block ---
-// 0x01042bd8: 0x1042bd8: lw    a0, 0(v0)
+// 0x01042be8: 0x1042be8: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-L_1042bdc:
-// 0x01042bdc: 0x1042bdc: jal   0x1042614 sll   zero, zero, 0
+L_1042bec:
+// 0x01042bec: 0x1042bec: jal   0x1042624 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_load_image_1042614(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_load_image_1042624(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042be4: 0x1042be4: addu  a0, v0, zero
+// 0x01042bf4: 0x1042bf4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01042be8: 0x1042be8: addu  a1, s3, zero
+// 0x01042bf8: 0x1042bf8: addu  a1, s3, zero
 	ldloc 15
 	stloc.2
-// 0x01042bec: 0x1042bec: addu  a2, zero, zero
+// 0x01042bfc: 0x1042bfc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01042bf0: 0x1042bf0: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01042c00: 0x1042c00: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2778,21 +2778,21 @@ L_1042bdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1042bf8:
-// 0x01042bf8: 0x1042bf8: lw    v0, 0(s0)
+L_1042c08:
+// 0x01042c08: 0x1042c08: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042bfc: 0x1042bfc: sll   zero, zero, 0
-// 0x01042c00: 0x1042c00: lw    v0, 624(v0)
+// 0x01042c0c: 0x1042c0c: sll   zero, zero, 0
+// 0x01042c10: 0x1042c10: lw    v0, 624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2801,12 +2801,12 @@ L_1042bf8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042c04: 0x1042c04: sll   zero, zero, 0
-// 0x01042c08: 0x1042c08: beq   v0, zero, 0x1042c5c sll   zero, zero, 0
+// 0x01042c14: 0x1042c14: sll   zero, zero, 0
+// 0x01042c18: 0x1042c18: beq   v0, zero, 0x1042c6c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1042c5c
+	brfalse L_1042c6c
 // --- basic block ---
-// 0x01042c10: 0x1042c10: lw    v0, 4(v0)
+// 0x01042c20: 0x1042c20: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2815,8 +2815,8 @@ L_1042bf8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042c14: 0x1042c14: sll   zero, zero, 0
-// 0x01042c18: 0x1042c18: jalr  v0 sll   zero, zero, 0
+// 0x01042c24: 0x1042c24: sll   zero, zero, 0
+// 0x01042c28: 0x1042c28: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2828,25 +2828,25 @@ L_1042bf8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042c20: 0x1042c20: beq   v0, zero, 0x1042c5c sll   zero, zero, 0
+// 0x01042c30: 0x1042c30: beq   v0, zero, 0x1042c6c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1042c5c
+	brfalse L_1042c6c
 // --- basic block ---
-// 0x01042c28: 0x1042c28: lb    v1, 0(v0)
+// 0x01042c38: 0x1042c38: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01042c2c: 0x1042c2c: sll   zero, zero, 0
-// 0x01042c30: 0x1042c30: beq   v1, zero, 0x1042c5c addu  a2, v0, zero
+// 0x01042c3c: 0x1042c3c: sll   zero, zero, 0
+// 0x01042c40: 0x1042c40: beq   v1, zero, 0x1042c6c addu  a2, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc.3
-	brfalse L_1042c5c
+	brfalse L_1042c6c
 // --- basic block ---
-// 0x01042c38: 0x1042c38: addu  a0, zero, zero
+// 0x01042c48: 0x1042c48: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01042c3c: 0x1042c3c: jal   0x10a1918 addiu a1, zero, 1
+// 0x01042c4c: 0x1042c4c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2854,24 +2854,24 @@ L_1042bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042c44: 0x1042c44: beq   v0, zero, 0x1042c5c addu  a0, v0, zero
+// 0x01042c54: 0x1042c54: beq   v0, zero, 0x1042c6c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1042c5c
+	brfalse L_1042c6c
 // --- basic block ---
-// 0x01042c4c: 0x1042c4c: addu  a1, s3, zero
+// 0x01042c5c: 0x1042c5c: addu  a1, s3, zero
 	ldloc 15
 	stloc.2
-// 0x01042c50: 0x1042c50: addu  a2, zero, zero
+// 0x01042c60: 0x1042c60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01042c54: 0x1042c54: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01042c64: 0x1042c64: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2879,21 +2879,21 @@ L_1042bf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1042c5c:
-// 0x01042c5c: 0x1042c5c: lw    v0, 0(s0)
+L_1042c6c:
+// 0x01042c6c: 0x1042c6c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042c60: 0x1042c60: sll   zero, zero, 0
-// 0x01042c64: 0x1042c64: lw    v1, 504(v0)
+// 0x01042c70: 0x1042c70: sll   zero, zero, 0
+// 0x01042c74: 0x1042c74: lw    v1, 504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2902,12 +2902,12 @@ L_1042c5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042c68: 0x1042c68: sll   zero, zero, 0
-// 0x01042c6c: 0x1042c6c: beq   v1, zero, 0x1042ef4 sll   zero, zero, 0
+// 0x01042c78: 0x1042c78: sll   zero, zero, 0
+// 0x01042c7c: 0x1042c7c: beq   v1, zero, 0x1042f04 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1042ef4
+	brfalse L_1042f04
 // --- basic block ---
-// 0x01042c74: 0x1042c74: lw    a0, 508(v0)
+// 0x01042c84: 0x1042c84: lw    a0, 508(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2916,8 +2916,8 @@ L_1042c5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042c78: 0x1042c78: sll   zero, zero, 0
-// 0x01042c7c: 0x1042c7c: bne   a0, zero, 0x1042c8c sw    a0, 32(sp)
+// 0x01042c88: 0x1042c88: sll   zero, zero, 0
+// 0x01042c8c: 0x1042c8c: bne   a0, zero, 0x1042c9c sw    a0, 32(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -2927,12 +2927,12 @@ L_1042c5c:
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_1042c8c
+	brtrue L_1042c9c
 // --- basic block ---
-// 0x01042c84: 0x1042c84: addiu a1, zero, 10
+// 0x01042c94: 0x1042c94: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x01042c88: 0x1042c88: sw    a1, 32(sp)
+// 0x01042c98: 0x1042c98: sw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2941,8 +2941,8 @@ L_1042c5c:
 	add
 	ldloc.2
 	stelem.i4
-L_1042c8c:
-// 0x01042c8c: 0x1042c8c: lw    a0, 512(v0)
+L_1042c9c:
+// 0x01042c9c: 0x1042c9c: lw    a0, 512(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2951,21 +2951,21 @@ L_1042c8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042c90: 0x1042c90: addiu a1, zero, -1
+// 0x01042ca0: 0x1042ca0: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x01042c94: 0x1042c94: beq   a0, a1, 0x1042ca4 sll   zero, zero, 0
+// 0x01042ca4: 0x1042ca4: beq   a0, a1, 0x1042cb4 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	beq  L_1042ca4
+	beq  L_1042cb4
 // --- basic block ---
-// 0x01042c9c: 0x1042c9c: j	 0x1042cb8 addu  s2, a0, zero
+// 0x01042cac: 0x1042cac: j	 0x1042cc8 addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-	br L_1042cb8
+	br L_1042cc8
 // --- basic block ---
-L_1042ca4:
-// 0x01042ca4: 0x1042ca4: lw    v0, 164(v0)
+L_1042cb4:
+// 0x01042cb4: 0x1042cb4: lw    v0, 164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2974,17 +2974,17 @@ L_1042ca4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042ca8: 0x1042ca8: sll   zero, zero, 0
-// 0x01042cac: 0x1042cac: bgez  v0, 0x1042cb8 sll   zero, zero, 0
+// 0x01042cb8: 0x1042cb8: sll   zero, zero, 0
+// 0x01042cbc: 0x1042cbc: bgez  v0, 0x1042cc8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1042cb8
+	bge L_1042cc8
 // --- basic block ---
-// 0x01042cb4: 0x1042cb4: addiu s2, zero, 1
+// 0x01042cc4: 0x1042cc4: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-L_1042cb8:
-// 0x01042cb8: 0x1042cb8: lw    a0, 4(v1)
+L_1042cc8:
+// 0x01042cc8: 0x1042cc8: lw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2993,21 +2993,21 @@ L_1042cb8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042cbc: 0x1042cbc: sll   zero, zero, 0
-// 0x01042cc0: 0x1042cc0: bne   a0, zero, 0x1042cfc addu  a1, zero, zero
+// 0x01042ccc: 0x1042ccc: sll   zero, zero, 0
+// 0x01042cd0: 0x1042cd0: bne   a0, zero, 0x1042d0c addu  a1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1042cfc
+	brtrue L_1042d0c
 // --- basic block ---
-// 0x01042cc8: 0x1042cc8: lw    a0, 0(v1)
+// 0x01042cd8: 0x1042cd8: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042ccc: 0x1042ccc: jal   0x104ef00 sw    v1, 40(sp)
+// 0x01042cdc: 0x1042cdc: jal   0x104ef10 sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3021,19 +3021,19 @@ L_1042cb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042cd4: 0x1042cd4: lw    a0, 0(s0)
+// 0x01042ce4: 0x1042ce4: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042cd8: 0x1042cd8: lw    v1, 40(sp)
+// 0x01042ce8: 0x1042ce8: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3042,7 +3042,7 @@ L_1042cb8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042cdc: 0x1042cdc: lw    a0, 516(a0)
+// 0x01042cec: 0x1042cec: lw    a0, 516(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3051,8 +3051,8 @@ L_1042cb8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042ce0: 0x1042ce0: sll   zero, zero, 0
-// 0x01042ce4: 0x1042ce4: beq   a0, zero, 0x1042d04 sw    v0, 4(v1)
+// 0x01042cf0: 0x1042cf0: sll   zero, zero, 0
+// 0x01042cf4: 0x1042cf4: beq   a0, zero, 0x1042d14 sw    v0, 4(v1)
 	ldloc.1
 	ldloc 6
 	ldloc 7
@@ -3062,44 +3062,44 @@ L_1042cb8:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1042d04
+	brfalse L_1042d14
 // --- basic block ---
-// 0x01042cec: 0x1042cec: jal   0x104edb0 sll   zero, zero, 0
+// 0x01042cfc: 0x1042cfc: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042cf4: 0x1042cf4: j	 0x1042d04 sll   zero, zero, 0
-	br L_1042d04
+// 0x01042d04: 0x1042d04: j	 0x1042d14 sll   zero, zero, 0
+	br L_1042d14
 // --- basic block ---
-L_1042cfc:
-// 0x01042cfc: 0x1042cfc: jal   0x104e35c sll   zero, zero, 0
+L_1042d0c:
+// 0x01042d0c: 0x1042d0c: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1042d04:
-// 0x01042d04: 0x1042d04: lw    v0, 0(s0)
+L_1042d14:
+// 0x01042d14: 0x1042d14: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042d08: 0x1042d08: sll   zero, zero, 0
-// 0x01042d0c: 0x1042d0c: lw    v0, 516(v0)
+// 0x01042d18: 0x1042d18: sll   zero, zero, 0
+// 0x01042d1c: 0x1042d1c: lw    v0, 516(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3108,45 +3108,45 @@ L_1042d04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042d10: 0x1042d10: sll   zero, zero, 0
-// 0x01042d14: 0x1042d14: bne   v0, zero, 0x1042d50 sll   zero, zero, 0
+// 0x01042d20: 0x1042d20: sll   zero, zero, 0
+// 0x01042d24: 0x1042d24: bne   v0, zero, 0x1042d60 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1042d50
+	brtrue L_1042d60
 // --- basic block ---
-// 0x01042d1c: 0x1042d1c: jal   0x1014194 sll   zero, zero, 0
+// 0x01042d2c: 0x1042d2c: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042d24: 0x1042d24: beq   v0, zero, 0x1042d34 lui   a0, 0x0
+// 0x01042d34: 0x1042d34: beq   v0, zero, 0x1042d44 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1042d34
+	brfalse L_1042d44
 // --- basic block ---
-// 0x01042d2c: 0x1042d2c: j	 0x1042d48 addiu a0, a0, 23008
+// 0x01042d3c: 0x1042d3c: j	 0x1042d58 addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
 	stloc.1
-	br L_1042d48
+	br L_1042d58
 // --- basic block ---
-L_1042d34:
-// 0x01042d34: 0x1042d34: lw    v0, 0(s0)
+L_1042d44:
+// 0x01042d44: 0x1042d44: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042d38: 0x1042d38: sll   zero, zero, 0
-// 0x01042d3c: 0x1042d3c: lw    v0, 504(v0)
+// 0x01042d48: 0x1042d48: sll   zero, zero, 0
+// 0x01042d4c: 0x1042d4c: lw    v0, 504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3155,8 +3155,8 @@ L_1042d34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042d40: 0x1042d40: sll   zero, zero, 0
-// 0x01042d44: 0x1042d44: lw    a0, 8(v0)
+// 0x01042d50: 0x1042d50: sll   zero, zero, 0
+// 0x01042d54: 0x1042d54: lw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3165,28 +3165,28 @@ L_1042d34:
 	add
 	ldelem.i4
 	stloc.1
-L_1042d48:
-// 0x01042d48: 0x1042d48: jal   0x104edb0 sll   zero, zero, 0
+L_1042d58:
+// 0x01042d58: 0x1042d58: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1042d50:
-// 0x01042d50: 0x1042d50: lw    v1, 0(s0)
+L_1042d60:
+// 0x01042d60: 0x1042d60: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042d54: 0x1042d54: sll   zero, zero, 0
-// 0x01042d58: 0x1042d58: lw    v0, 500(v1)
+// 0x01042d64: 0x1042d64: sll   zero, zero, 0
+// 0x01042d68: 0x1042d68: lw    v0, 500(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3195,12 +3195,12 @@ L_1042d50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042d5c: 0x1042d5c: sll   zero, zero, 0
-// 0x01042d60: 0x1042d60: beq   v0, zero, 0x1042df4 sll   zero, zero, 0
+// 0x01042d6c: 0x1042d6c: sll   zero, zero, 0
+// 0x01042d70: 0x1042d70: beq   v0, zero, 0x1042e04 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1042df4
+	brfalse L_1042e04
 // --- basic block ---
-// 0x01042d68: 0x1042d68: jalr  v0 sll   zero, zero, 0
+// 0x01042d78: 0x1042d78: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3212,33 +3212,33 @@ L_1042d50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042d70: 0x1042d70: blez  v0, 0x1042eec addiu v0, v0, 42
+// 0x01042d80: 0x1042d80: blez  v0, 0x1042efc addiu v0, v0, 42
 	ldloc 5
 	ldloc 5
 	ldc.i4.s 42
 	add
 	stloc 5
 	ldc.i4.s 0
-	ble L_1042eec
+	ble L_1042efc
 // --- basic block ---
-// 0x01042d78: 0x1042d78: lw    v1, 0(s0)
+// 0x01042d88: 0x1042d88: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042d7c: 0x1042d7c: sll   v0, v0, 2
+// 0x01042d8c: 0x1042d8c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01042d80: 0x1042d80: addu  v0, v1, v0
+// 0x01042d90: 0x1042d90: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01042d84: 0x1042d84: lw    a1, 4(v0)
+// 0x01042d94: 0x1042d94: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3247,30 +3247,30 @@ L_1042d50:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042d88: 0x1042d88: sll   zero, zero, 0
-// 0x01042d8c: 0x1042d8c: beq   a1, zero, 0x1042e70 sll   zero, zero, 0
+// 0x01042d98: 0x1042d98: sll   zero, zero, 0
+// 0x01042d9c: 0x1042d9c: beq   a1, zero, 0x1042e80 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1042e70
+	brfalse L_1042e80
 // --- basic block ---
-// 0x01042d94: 0x1042d94: lw    a0, 0(v1)
+// 0x01042da4: 0x1042da4: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042d98: 0x1042d98: jal   0x1042614 sll   zero, zero, 0
+// 0x01042da8: 0x1042da8: jal   0x1042624 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_load_image_1042614(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_load_image_1042624(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042da0: 0x1042da0: lw    a1, 24(sp)
+// 0x01042db0: 0x1042db0: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3279,10 +3279,10 @@ L_1042d50:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042da4: 0x1042da4: addu  a0, v0, zero
+// 0x01042db4: 0x1042db4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01042da8: 0x1042da8: sw    a1, 36(sp)
+// 0x01042db8: 0x1042db8: sw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3291,7 +3291,7 @@ L_1042d50:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01042dac: 0x1042dac: jal   0x104dffc sw    v0, 40(sp)
+// 0x01042dbc: 0x1042dbc: jal   0x104e00c sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3301,17 +3301,17 @@ L_1042d50:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042db4: 0x1042db4: div   v0, s1
+// 0x01042dc4: 0x1042dc4: div   v0, s1
 	ldloc 5
 	ldloc 11
 	div
 	stloc 10
-// 0x01042db8: 0x1042db8: lw    v1, 40(sp)
+// 0x01042dc8: 0x1042dc8: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3320,7 +3320,7 @@ L_1042d50:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042dbc: 0x1042dbc: lw    a1, 36(sp)
+// 0x01042dcc: 0x1042dcc: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3329,10 +3329,10 @@ L_1042d50:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042dc0: 0x1042dc0: addu  a0, v1, zero
+// 0x01042dd0: 0x1042dd0: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01042dc4: 0x1042dc4: lw    v1, 28(sp)
+// 0x01042dd4: 0x1042dd4: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3341,8 +3341,8 @@ L_1042d50:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042dc8: 0x1042dc8: sll   zero, zero, 0
-// 0x01042dcc: 0x1042dcc: sw    v1, 40(sp)
+// 0x01042dd8: 0x1042dd8: sll   zero, zero, 0
+// 0x01042ddc: 0x1042ddc: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3351,15 +3351,15 @@ L_1042d50:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01042dd0: 0x1042dd0: mflo  lo
+// 0x01042de0: 0x1042de0: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x01042dd4: 0x1042dd4: addu  a1, v0, a1
+// 0x01042de4: 0x1042de4: addu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc.2
-// 0x01042dd8: 0x1042dd8: jal   0x104e020 sw    a1, 16(sp)
+// 0x01042de8: 0x1042de8: jal   0x104e030 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3369,17 +3369,17 @@ L_1042d50:
 	ldloc.2
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042de0: 0x1042de0: div   v0, s1
+// 0x01042df0: 0x1042df0: div   v0, s1
 	ldloc 5
 	ldloc 11
 	div
 	stloc 10
-// 0x01042de4: 0x1042de4: lw    v1, 40(sp)
+// 0x01042df4: 0x1042df4: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3388,18 +3388,18 @@ L_1042d50:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042de8: 0x1042de8: mflo  lo
+// 0x01042df8: 0x1042df8: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x01042dec: 0x1042dec: j	 0x1042e68 addu  v1, v1, v0
+// 0x01042dfc: 0x1042dfc: j	 0x1042e78 addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-	br L_1042e68
+	br L_1042e78
 // --- basic block ---
-L_1042df4:
-// 0x01042df4: 0x1042df4: lw    a1, 172(v1)
+L_1042e04:
+// 0x01042e04: 0x1042e04: lw    a1, 172(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3408,30 +3408,30 @@ L_1042df4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042df8: 0x1042df8: sll   zero, zero, 0
-// 0x01042dfc: 0x1042dfc: beq   a1, zero, 0x1042e70 sll   zero, zero, 0
+// 0x01042e08: 0x1042e08: sll   zero, zero, 0
+// 0x01042e0c: 0x1042e0c: beq   a1, zero, 0x1042e80 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1042e70
+	brfalse L_1042e80
 // --- basic block ---
-// 0x01042e04: 0x1042e04: lw    a0, 0(v1)
+// 0x01042e14: 0x1042e14: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042e08: 0x1042e08: jal   0x1042614 sll   zero, zero, 0
+// 0x01042e18: 0x1042e18: jal   0x1042624 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_load_image_1042614(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_load_image_1042624(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042e10: 0x1042e10: lw    a1, 24(sp)
+// 0x01042e20: 0x1042e20: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3440,10 +3440,10 @@ L_1042df4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042e14: 0x1042e14: addu  a0, v0, zero
+// 0x01042e24: 0x1042e24: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01042e18: 0x1042e18: sw    a1, 36(sp)
+// 0x01042e28: 0x1042e28: sw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3452,7 +3452,7 @@ L_1042df4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01042e1c: 0x1042e1c: jal   0x104dffc sw    v0, 40(sp)
+// 0x01042e2c: 0x1042e2c: jal   0x104e00c sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3462,17 +3462,17 @@ L_1042df4:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042e24: 0x1042e24: div   v0, s1
+// 0x01042e34: 0x1042e34: div   v0, s1
 	ldloc 5
 	ldloc 11
 	div
 	stloc 10
-// 0x01042e28: 0x1042e28: lw    v1, 40(sp)
+// 0x01042e38: 0x1042e38: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3481,7 +3481,7 @@ L_1042df4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042e2c: 0x1042e2c: lw    a1, 36(sp)
+// 0x01042e3c: 0x1042e3c: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3490,10 +3490,10 @@ L_1042df4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01042e30: 0x1042e30: addu  a0, v1, zero
+// 0x01042e40: 0x1042e40: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01042e34: 0x1042e34: lw    v1, 28(sp)
+// 0x01042e44: 0x1042e44: lw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3502,8 +3502,8 @@ L_1042df4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042e38: 0x1042e38: sll   zero, zero, 0
-// 0x01042e3c: 0x1042e3c: sw    v1, 40(sp)
+// 0x01042e48: 0x1042e48: sll   zero, zero, 0
+// 0x01042e4c: 0x1042e4c: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3512,15 +3512,15 @@ L_1042df4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01042e40: 0x1042e40: mflo  lo
+// 0x01042e50: 0x1042e50: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x01042e44: 0x1042e44: addu  a1, v0, a1
+// 0x01042e54: 0x1042e54: addu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc.2
-// 0x01042e48: 0x1042e48: jal   0x104e020 sw    a1, 16(sp)
+// 0x01042e58: 0x1042e58: jal   0x104e030 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3530,17 +3530,17 @@ L_1042df4:
 	ldloc.2
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042e50: 0x1042e50: div   v0, s1
+// 0x01042e60: 0x1042e60: div   v0, s1
 	ldloc 5
 	ldloc 11
 	div
 	stloc 10
-// 0x01042e54: 0x1042e54: lw    v1, 40(sp)
+// 0x01042e64: 0x1042e64: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3549,22 +3549,22 @@ L_1042df4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042e58: 0x1042e58: sll   zero, zero, 0
-// 0x01042e5c: 0x1042e5c: addiu v1, v1, -2
+// 0x01042e68: 0x1042e68: sll   zero, zero, 0
+// 0x01042e6c: 0x1042e6c: addiu v1, v1, -2
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc 7
-// 0x01042e60: 0x1042e60: mflo  lo
+// 0x01042e70: 0x1042e70: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x01042e64: 0x1042e64: addu  v1, v1, v0
+// 0x01042e74: 0x1042e74: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-L_1042e68:
-// 0x01042e68: 0x1042e68: j	 0x1042eb8 sw    v1, 20(sp)
+L_1042e78:
+// 0x01042e78: 0x1042e78: j	 0x1042ec8 sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3573,10 +3573,10 @@ L_1042e68:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1042eb8
+	br L_1042ec8
 // --- basic block ---
-L_1042e70:
-// 0x01042e70: 0x1042e70: lw    v0, 164(v1)
+L_1042e80:
+// 0x01042e80: 0x1042e80: lw    v0, 164(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3585,8 +3585,8 @@ L_1042e70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042e74: 0x1042e74: sll   zero, zero, 0
-// 0x01042e78: 0x1042e78: sw    v0, 16(sp)
+// 0x01042e84: 0x1042e84: sll   zero, zero, 0
+// 0x01042e88: 0x1042e88: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3595,7 +3595,7 @@ L_1042e70:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01042e7c: 0x1042e7c: lw    v1, 168(v1)
+// 0x01042e8c: 0x1042e8c: lw    v1, 168(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3604,7 +3604,7 @@ L_1042e70:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042e80: 0x1042e80: bgez  v0, 0x1042e98 sw    v1, 20(sp)
+// 0x01042e90: 0x1042e90: bgez  v0, 0x1042ea8 sw    v1, 20(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3615,24 +3615,24 @@ L_1042e70:
 	ldloc 7
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1042e98
+	bge L_1042ea8
 // --- basic block ---
-// 0x01042e88: 0x1042e88: lw    v1, -30068(s4)
+// 0x01042e98: 0x1042e98: lw    v1, -29604(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042e8c: 0x1042e8c: sll   zero, zero, 0
-// 0x01042e90: 0x1042e90: addu  v0, v1, v0
+// 0x01042e9c: 0x1042e9c: sll   zero, zero, 0
+// 0x01042ea0: 0x1042ea0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01042e94: 0x1042e94: sw    v0, 16(sp)
+// 0x01042ea4: 0x1042ea4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3641,8 +3641,8 @@ L_1042e70:
 	add
 	ldloc 5
 	stelem.i4
-L_1042e98:
-// 0x01042e98: 0x1042e98: lw    v0, 20(sp)
+L_1042ea8:
+// 0x01042ea8: 0x1042ea8: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3651,28 +3651,28 @@ L_1042e98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042e9c: 0x1042e9c: sll   zero, zero, 0
-// 0x01042ea0: 0x1042ea0: bgez  v0, 0x1042eb8 sll   zero, zero, 0
+// 0x01042eac: 0x1042eac: sll   zero, zero, 0
+// 0x01042eb0: 0x1042eb0: bgez  v0, 0x1042ec8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1042eb8
+	bge L_1042ec8
 // --- basic block ---
-// 0x01042ea8: 0x1042ea8: lw    v1, -30072(s5)
+// 0x01042eb8: 0x1042eb8: lw    v1, -29608(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042eac: 0x1042eac: sll   zero, zero, 0
-// 0x01042eb0: 0x1042eb0: addu  v0, v1, v0
+// 0x01042ebc: 0x1042ebc: sll   zero, zero, 0
+// 0x01042ec0: 0x1042ec0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01042eb4: 0x1042eb4: sw    v0, 20(sp)
+// 0x01042ec4: 0x1042ec4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3681,16 +3681,16 @@ L_1042e98:
 	add
 	ldloc 5
 	stelem.i4
-L_1042eb8:
-// 0x01042eb8: 0x1042eb8: lw    v0, 0(s0)
+L_1042ec8:
+// 0x01042ec8: 0x1042ec8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042ebc: 0x1042ebc: sll   zero, zero, 0
-// 0x01042ec0: 0x1042ec0: lw    v0, 504(v0)
+// 0x01042ecc: 0x1042ecc: sll   zero, zero, 0
+// 0x01042ed0: 0x1042ed0: lw    v0, 504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3699,8 +3699,8 @@ L_1042eb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042ec4: 0x1042ec4: sll   zero, zero, 0
-// 0x01042ec8: 0x1042ec8: lw    v0, 12(v0)
+// 0x01042ed4: 0x1042ed4: sll   zero, zero, 0
+// 0x01042ed8: 0x1042ed8: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3709,8 +3709,8 @@ L_1042eb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042ecc: 0x1042ecc: sll   zero, zero, 0
-// 0x01042ed0: 0x1042ed0: jalr  v0 sll   zero, zero, 0
+// 0x01042edc: 0x1042edc: sll   zero, zero, 0
+// 0x01042ee0: 0x1042ee0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3722,7 +3722,7 @@ L_1042eb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042ed8: 0x1042ed8: lw    a2, 32(sp)
+// 0x01042ee8: 0x1042ee8: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3731,13 +3731,13 @@ L_1042eb8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01042edc: 0x1042edc: addu  a0, s6, zero
+// 0x01042eec: 0x1042eec: addu  a0, s6, zero
 	ldloc 16
 	stloc.1
-// 0x01042ee0: 0x1042ee0: addu  a1, s2, zero
+// 0x01042ef0: 0x1042ef0: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x01042ee4: 0x1042ee4: jal   0x104ea60 addu  a3, v0, zero
+// 0x01042ef4: 0x1042ef4: jal   0x104ea70 addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -3745,22 +3745,22 @@ L_1042eb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1042eec:
-// 0x01042eec: 0x1042eec: lw    v0, 0(s0)
+L_1042efc:
+// 0x01042efc: 0x1042efc: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042ef0: 0x1042ef0: sll   zero, zero, 0
-L_1042ef4:
-// 0x01042ef4: 0x1042ef4: lw    v1, 520(v0)
+// 0x01042f00: 0x1042f00: sll   zero, zero, 0
+L_1042f04:
+// 0x01042f04: 0x1042f04: lw    v1, 520(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3769,12 +3769,12 @@ L_1042ef4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042ef8: 0x1042ef8: sll   zero, zero, 0
-// 0x01042efc: 0x1042efc: beq   v1, zero, 0x1043074 sll   zero, zero, 0
+// 0x01042f08: 0x1042f08: sll   zero, zero, 0
+// 0x01042f0c: 0x1042f0c: beq   v1, zero, 0x1043084 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1043074
+	brfalse L_1043084
 // --- basic block ---
-// 0x01042f04: 0x1042f04: lw    v1, 508(v0)
+// 0x01042f14: 0x1042f14: lw    v1, 508(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3783,8 +3783,8 @@ L_1042ef4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042f08: 0x1042f08: sll   zero, zero, 0
-// 0x01042f0c: 0x1042f0c: bne   v1, zero, 0x1042f1c sw    v1, 32(sp)
+// 0x01042f18: 0x1042f18: sll   zero, zero, 0
+// 0x01042f1c: 0x1042f1c: bne   v1, zero, 0x1042f2c sw    v1, 32(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -3794,12 +3794,12 @@ L_1042ef4:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1042f1c
+	brtrue L_1042f2c
 // --- basic block ---
-// 0x01042f14: 0x1042f14: addiu a0, zero, 10
+// 0x01042f24: 0x1042f24: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x01042f18: 0x1042f18: sw    a0, 32(sp)
+// 0x01042f28: 0x1042f28: sw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3808,8 +3808,8 @@ L_1042ef4:
 	add
 	ldloc.1
 	stelem.i4
-L_1042f1c:
-// 0x01042f1c: 0x1042f1c: lw    v1, 512(v0)
+L_1042f2c:
+// 0x01042f2c: 0x1042f2c: lw    v1, 512(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3818,21 +3818,21 @@ L_1042f1c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042f20: 0x1042f20: addiu a1, zero, -1
+// 0x01042f30: 0x1042f30: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x01042f24: 0x1042f24: beq   v1, a1, 0x1042f34 sll   zero, zero, 0
+// 0x01042f34: 0x1042f34: beq   v1, a1, 0x1042f44 sll   zero, zero, 0
 	ldloc 7
 	ldloc.2
-	beq  L_1042f34
+	beq  L_1042f44
 // --- basic block ---
-// 0x01042f2c: 0x1042f2c: j	 0x1042f48 addu  s2, v1, zero
+// 0x01042f3c: 0x1042f3c: j	 0x1042f58 addu  s2, v1, zero
 	ldloc 7
 	stloc 9
-	br L_1042f48
+	br L_1042f58
 // --- basic block ---
-L_1042f34:
-// 0x01042f34: 0x1042f34: lw    v1, 164(v0)
+L_1042f44:
+// 0x01042f44: 0x1042f44: lw    v1, 164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3841,24 +3841,24 @@ L_1042f34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042f38: 0x1042f38: sll   zero, zero, 0
-// 0x01042f3c: 0x1042f3c: bgez  v1, 0x1042f48 sll   zero, zero, 0
+// 0x01042f48: 0x1042f48: sll   zero, zero, 0
+// 0x01042f4c: 0x1042f4c: bgez  v1, 0x1042f58 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bge L_1042f48
+	bge L_1042f58
 // --- basic block ---
-// 0x01042f44: 0x1042f44: addiu s2, zero, 1
+// 0x01042f54: 0x1042f54: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-L_1042f48:
-// 0x01042f48: 0x1042f48: lw    a0, 0(v0)
+L_1042f58:
+// 0x01042f58: 0x1042f58: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01042f4c: 0x1042f4c: jal   0x104ef00 addu  a1, zero, zero
+// 0x01042f5c: 0x1042f5c: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3866,20 +3866,20 @@ L_1042f48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042f54: 0x1042f54: lw    v0, 0(s0)
+// 0x01042f64: 0x1042f64: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042f58: 0x1042f58: sll   zero, zero, 0
-// 0x01042f5c: 0x1042f5c: lw    a0, 516(v0)
+// 0x01042f68: 0x1042f68: sll   zero, zero, 0
+// 0x01042f6c: 0x1042f6c: lw    a0, 516(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3888,65 +3888,65 @@ L_1042f48:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042f60: 0x1042f60: sll   zero, zero, 0
-// 0x01042f64: 0x1042f64: bne   a0, zero, 0x1042f8c sll   zero, zero, 0
+// 0x01042f70: 0x1042f70: sll   zero, zero, 0
+// 0x01042f74: 0x1042f74: bne   a0, zero, 0x1042f9c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1042f8c
+	brtrue L_1042f9c
 // --- basic block ---
-// 0x01042f6c: 0x1042f6c: jal   0x1014194 sll   zero, zero, 0
+// 0x01042f7c: 0x1042f7c: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042f74: 0x1042f74: beq   v0, zero, 0x1042f84 lui   a0, 0x0
+// 0x01042f84: 0x1042f84: beq   v0, zero, 0x1042f94 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1042f84
+	brfalse L_1042f94
 // --- basic block ---
-// 0x01042f7c: 0x1042f7c: j	 0x1042f8c addiu a0, a0, 23008
+// 0x01042f8c: 0x1042f8c: j	 0x1042f9c addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
 	stloc.1
-	br L_1042f8c
+	br L_1042f9c
 // --- basic block ---
-L_1042f84:
-// 0x01042f84: 0x1042f84: lui   a0, 0x0
+L_1042f94:
+// 0x01042f94: 0x1042f94: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01042f88: 0x1042f88: addiu a0, a0, 31980
+// 0x01042f98: 0x1042f98: addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
 	stloc.1
-L_1042f8c:
-// 0x01042f8c: 0x1042f8c: jal   0x104edb0 sll   zero, zero, 0
+L_1042f9c:
+// 0x01042f9c: 0x1042f9c: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042f94: 0x1042f94: lw    v1, 0(s0)
+// 0x01042fa4: 0x1042fa4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01042f98: 0x1042f98: sll   zero, zero, 0
-// 0x01042f9c: 0x1042f9c: lw    v0, 500(v1)
+// 0x01042fa8: 0x1042fa8: sll   zero, zero, 0
+// 0x01042fac: 0x1042fac: lw    v0, 500(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3955,12 +3955,12 @@ L_1042f8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01042fa0: 0x1042fa0: sll   zero, zero, 0
-// 0x01042fa4: 0x1042fa4: beq   v0, zero, 0x1043018 sll   zero, zero, 0
+// 0x01042fb0: 0x1042fb0: sll   zero, zero, 0
+// 0x01042fb4: 0x1042fb4: beq   v0, zero, 0x1043028 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1043018
+	brfalse L_1043028
 // --- basic block ---
-// 0x01042fac: 0x1042fac: jalr  v0 sll   zero, zero, 0
+// 0x01042fbc: 0x1042fbc: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3972,20 +3972,20 @@ L_1042f8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01042fb4: 0x1042fb4: blez  v0, 0x1043074 sll   zero, zero, 0
+// 0x01042fc4: 0x1042fc4: blez  v0, 0x1043084 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_1043074
+	ble L_1043084
 // --- basic block ---
-// 0x01042fbc: 0x1042fbc: lw    v0, 0(s0)
+// 0x01042fcc: 0x1042fcc: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01042fc0: 0x1042fc0: sll   zero, zero, 0
-// 0x01042fc4: 0x1042fc4: lw    v1, 164(v0)
+// 0x01042fd0: 0x1042fd0: sll   zero, zero, 0
+// 0x01042fd4: 0x1042fd4: lw    v1, 164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3994,8 +3994,8 @@ L_1042f8c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042fc8: 0x1042fc8: sll   zero, zero, 0
-// 0x01042fcc: 0x1042fcc: sw    v1, 16(sp)
+// 0x01042fd8: 0x1042fd8: sll   zero, zero, 0
+// 0x01042fdc: 0x1042fdc: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4004,7 +4004,7 @@ L_1042f8c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01042fd0: 0x1042fd0: lw    a0, 168(v0)
+// 0x01042fe0: 0x1042fe0: lw    a0, 168(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4013,7 +4013,7 @@ L_1042f8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042fd4: 0x1042fd4: bgez  v1, 0x1042fec sw    a0, 20(sp)
+// 0x01042fe4: 0x1042fe4: bgez  v1, 0x1042ffc sw    a0, 20(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -4024,24 +4024,24 @@ L_1042f8c:
 	ldloc.1
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1042fec
+	bge L_1042ffc
 // --- basic block ---
-// 0x01042fdc: 0x1042fdc: lw    a0, -30068(s4)
+// 0x01042fec: 0x1042fec: lw    a0, -29604(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x01042fe0: 0x1042fe0: sll   zero, zero, 0
-// 0x01042fe4: 0x1042fe4: addu  v1, a0, v1
+// 0x01042ff0: 0x1042ff0: sll   zero, zero, 0
+// 0x01042ff4: 0x1042ff4: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01042fe8: 0x1042fe8: sw    v1, 16(sp)
+// 0x01042ff8: 0x1042ff8: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4050,8 +4050,8 @@ L_1042f8c:
 	add
 	ldloc 7
 	stelem.i4
-L_1042fec:
-// 0x01042fec: 0x1042fec: lw    v1, 20(sp)
+L_1042ffc:
+// 0x01042ffc: 0x1042ffc: lw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4060,28 +4060,28 @@ L_1042fec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01042ff0: 0x1042ff0: sll   zero, zero, 0
-// 0x01042ff4: 0x1042ff4: bgez  v1, 0x104300c sll   zero, zero, 0
+// 0x01043000: 0x1043000: sll   zero, zero, 0
+// 0x01043004: 0x1043004: bgez  v1, 0x104301c sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bge L_104300c
+	bge L_104301c
 // --- basic block ---
-// 0x01042ffc: 0x1042ffc: lw    a0, -30072(s5)
+// 0x0104300c: 0x104300c: lw    a0, -29608(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043000: 0x1043000: sll   zero, zero, 0
-// 0x01043004: 0x1043004: addu  v1, a0, v1
+// 0x01043010: 0x1043010: sll   zero, zero, 0
+// 0x01043014: 0x1043014: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01043008: 0x1043008: sw    v1, 20(sp)
+// 0x01043018: 0x1043018: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4090,8 +4090,8 @@ L_1042fec:
 	add
 	ldloc 7
 	stelem.i4
-L_104300c:
-// 0x0104300c: 0x104300c: lw    a3, 520(v0)
+L_104301c:
+// 0x0104301c: 0x104301c: lw    a3, 520(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4100,11 +4100,11 @@ L_104300c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043010: 0x1043010: j	 0x1043064 sll   zero, zero, 0
-	br L_1043064
+// 0x01043020: 0x1043020: j	 0x1043074 sll   zero, zero, 0
+	br L_1043074
 // --- basic block ---
-L_1043018:
-// 0x01043018: 0x1043018: lw    v0, 164(v1)
+L_1043028:
+// 0x01043028: 0x1043028: lw    v0, 164(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4113,8 +4113,8 @@ L_1043018:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104301c: 0x104301c: sll   zero, zero, 0
-// 0x01043020: 0x1043020: sw    v0, 16(sp)
+// 0x0104302c: 0x104302c: sll   zero, zero, 0
+// 0x01043030: 0x1043030: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4123,7 +4123,7 @@ L_1043018:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01043024: 0x1043024: lw    a0, 168(v1)
+// 0x01043034: 0x1043034: lw    a0, 168(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4132,7 +4132,7 @@ L_1043018:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043028: 0x1043028: bgez  v0, 0x1043040 sw    a0, 20(sp)
+// 0x01043038: 0x1043038: bgez  v0, 0x1043050 sw    a0, 20(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4143,24 +4143,24 @@ L_1043018:
 	ldloc.1
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1043040
+	bge L_1043050
 // --- basic block ---
-// 0x01043030: 0x1043030: lw    a0, -30068(s4)
+// 0x01043040: 0x1043040: lw    a0, -29604(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043034: 0x1043034: sll   zero, zero, 0
-// 0x01043038: 0x1043038: addu  v0, a0, v0
+// 0x01043044: 0x1043044: sll   zero, zero, 0
+// 0x01043048: 0x1043048: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0104303c: 0x104303c: sw    v0, 16(sp)
+// 0x0104304c: 0x104304c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4169,8 +4169,8 @@ L_1043018:
 	add
 	ldloc 5
 	stelem.i4
-L_1043040:
-// 0x01043040: 0x1043040: lw    v0, 20(sp)
+L_1043050:
+// 0x01043050: 0x1043050: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4179,28 +4179,28 @@ L_1043040:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043044: 0x1043044: sll   zero, zero, 0
-// 0x01043048: 0x1043048: bgez  v0, 0x1043060 sll   zero, zero, 0
+// 0x01043054: 0x1043054: sll   zero, zero, 0
+// 0x01043058: 0x1043058: bgez  v0, 0x1043070 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1043060
+	bge L_1043070
 // --- basic block ---
-// 0x01043050: 0x1043050: lw    a0, -30072(s5)
+// 0x01043060: 0x1043060: lw    a0, -29608(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043054: 0x1043054: sll   zero, zero, 0
-// 0x01043058: 0x1043058: addu  v0, a0, v0
+// 0x01043064: 0x1043064: sll   zero, zero, 0
+// 0x01043068: 0x1043068: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0104305c: 0x104305c: sw    v0, 20(sp)
+// 0x0104306c: 0x104306c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4209,8 +4209,8 @@ L_1043040:
 	add
 	ldloc 5
 	stelem.i4
-L_1043060:
-// 0x01043060: 0x1043060: lw    a3, 520(v1)
+L_1043070:
+// 0x01043070: 0x1043070: lw    a3, 520(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4219,8 +4219,8 @@ L_1043060:
 	add
 	ldelem.i4
 	stloc 4
-L_1043064:
-// 0x01043064: 0x1043064: lw    a2, 32(sp)
+L_1043074:
+// 0x01043074: 0x1043074: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4229,10 +4229,10 @@ L_1043064:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043068: 0x1043068: addu  a0, s6, zero
+// 0x01043078: 0x1043078: addu  a0, s6, zero
 	ldloc 16
 	stloc.1
-// 0x0104306c: 0x104306c: jal   0x104ea60 addu  a1, s2, zero
+// 0x0104307c: 0x104307c: jal   0x104ea70 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -4240,24 +4240,24 @@ L_1043064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1043074:
-// 0x01043074: 0x1043074: addiu s7, s7, 1
+L_1043084:
+// 0x01043084: 0x1043084: addiu s7, s7, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x01043078: 0x1043078: addiu s0, s0, 4
+// 0x01043088: 0x1043088: addiu s0, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_104307c:
-// 0x0104307c: 0x104307c: lw    v1, 88(sp)
+L_104308c:
+// 0x0104308c: 0x104308c: lw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4266,8 +4266,8 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01043080: 0x1043080: sll   zero, zero, 0
-// 0x01043084: 0x1043084: lw    v0, 84(v1)
+// 0x01043090: 0x1043090: sll   zero, zero, 0
+// 0x01043094: 0x1043094: lw    v0, 84(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4276,18 +4276,18 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043088: 0x1043088: sll   zero, zero, 0
-// 0x0104308c: 0x104308c: slt   v0, s7, v0
+// 0x01043098: 0x1043098: sll   zero, zero, 0
+// 0x0104309c: 0x104309c: slt   v0, s7, v0
 	ldloc 14
 	ldloc 5
 	clt
 	stloc 5
-// 0x01043090: 0x1043090: bne   v0, zero, 0x1042a3c sll   zero, zero, 0
+// 0x010430a0: 0x10430a0: bne   v0, zero, 0x1042a4c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1042a3c
+	brtrue L_1042a4c
 // --- basic block ---
-// 0x01043098: 0x1043098: lw    ra, 84(sp)
-// 0x0104309c: 0x104309c: lw    s8, 80(sp)
+// 0x010430a8: 0x10430a8: lw    ra, 84(sp)
+// 0x010430ac: 0x10430ac: lw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4296,7 +4296,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010430a0: 0x10430a0: lw    s7, 76(sp)
+// 0x010430b0: 0x10430b0: lw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4305,7 +4305,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010430a4: 0x10430a4: lw    s6, 72(sp)
+// 0x010430b4: 0x10430b4: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4314,7 +4314,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010430a8: 0x10430a8: lw    s5, 68(sp)
+// 0x010430b8: 0x10430b8: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4323,7 +4323,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010430ac: 0x10430ac: lw    s4, 64(sp)
+// 0x010430bc: 0x10430bc: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4332,7 +4332,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010430b0: 0x10430b0: lw    s3, 60(sp)
+// 0x010430c0: 0x10430c0: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4341,7 +4341,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010430b4: 0x10430b4: lw    s2, 56(sp)
+// 0x010430c4: 0x10430c4: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4350,7 +4350,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010430b8: 0x10430b8: lw    s1, 52(sp)
+// 0x010430c8: 0x10430c8: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4359,7 +4359,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010430bc: 0x10430bc: lw    s0, 48(sp)
+// 0x010430cc: 0x10430cc: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4368,7 +4368,7 @@ L_104307c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010430c0: 0x10430c0: jr    ra addiu sp, sp, 88
+// 0x010430d0: 0x10430d0: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -4380,7 +4380,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_bar_draw_bottom_bar_10430c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_draw_bottom_bar_10430d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 s1,int32 s4,int32 s5,int32 ra,int32 lo)
@@ -4436,25 +4436,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010430c8: 0x10430c8: lui   v0, 0x60000
+// 0x010430d8: 0x10430d8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010430cc: 0x10430cc: lw    v0, 12652(v0)
+// 0x010430dc: 0x10430dc: lw    v0, 13116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3163
+	ldc.i4 3279
 	add
 	ldelem.i4
 	stloc 5
-// 0x010430d0: 0x10430d0: addiu sp, sp, -64
+// 0x010430e0: 0x10430e0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010430d4: 0x10430d4: sw    ra, 60(sp)
-// 0x010430d8: 0x10430d8: sw    s5, 56(sp)
+// 0x010430e4: 0x10430e4: sw    ra, 60(sp)
+// 0x010430e8: 0x10430e8: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4463,7 +4463,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010430dc: 0x10430dc: sw    s4, 52(sp)
+// 0x010430ec: 0x10430ec: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4472,7 +4472,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010430e0: 0x10430e0: sw    s3, 48(sp)
+// 0x010430f0: 0x10430f0: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4481,7 +4481,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010430e4: 0x10430e4: sw    s2, 44(sp)
+// 0x010430f4: 0x10430f4: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4490,7 +4490,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010430e8: 0x10430e8: sw    s1, 40(sp)
+// 0x010430f8: 0x10430f8: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4499,7 +4499,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010430ec: 0x10430ec: beq   v0, zero, 0x10431f0 sw    s0, 36(sp)
+// 0x010430fc: 0x10430fc: beq   v0, zero, 0x1043200 sw    s0, 36(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4509,12 +4509,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_10431f0
+	brfalse L_1043200
 // --- basic block ---
-// 0x010430f4: 0x10430f4: lui   v0, 0x0
+// 0x01043104: 0x1043104: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010430f8: 0x10430f8: lw    v0, 13332(v0)
+// 0x01043108: 0x1043108: lw    v0, 13332(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4523,38 +4523,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010430fc: 0x10430fc: sll   zero, zero, 0
-// 0x01043100: 0x1043100: bne   v0, zero, 0x10431f0 lui   v0, 0x60000
+// 0x0104310c: 0x104310c: sll   zero, zero, 0
+// 0x01043110: 0x1043110: bne   v0, zero, 0x1043200 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_10431f0
+	brtrue L_1043200
 // --- basic block ---
-// 0x01043108: 0x1043108: lw    a1, 12828(v0)
+// 0x01043118: 0x1043118: lw    a1, 13292(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3207
+	ldc.i4 3323
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104310c: 0x104310c: lui   v0, 0xf0000
+// 0x0104311c: 0x104311c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01043110: 0x1043110: lw    v1, -30072(v0)
+// 0x01043120: 0x1043120: lw    v1, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x01043114: 0x1043114: lui   v0, 0x0
+// 0x01043124: 0x1043124: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01043118: 0x1043118: lw    v0, 13340(v0)
+// 0x01043128: 0x1043128: lw    v0, 13340(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4563,34 +4563,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104311c: 0x104311c: beq   a1, zero, 0x10431e4 sll   zero, zero, 0
+// 0x0104312c: 0x104312c: beq   a1, zero, 0x10431f4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10431e4
+	brfalse L_10431f4
 // --- basic block ---
-// 0x01043124: 0x1043124: beq   a0, zero, 0x10431e8 lui   a0, 0x60000
+// 0x01043134: 0x1043134: beq   a0, zero, 0x10431f8 lui   a0, 0x60000
 	ldloc.1
 	ldc.i4 393216
 	stloc.1
-	brfalse L_10431e8
+	brfalse L_10431f8
 // --- basic block ---
-// 0x0104312c: 0x104312c: lui   a0, 0x60000
+// 0x0104313c: 0x104313c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01043130: 0x1043130: lw    a0, 12648(a0)
+// 0x01043140: 0x1043140: lw    a0, 13112(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3162
+	ldc.i4 3278
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043134: 0x1043134: subu  v0, v1, v0
+// 0x01043144: 0x1043144: subu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-// 0x01043138: 0x1043138: sw    v0, 20(sp)
+// 0x01043148: 0x1043148: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4599,7 +4599,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104313c: 0x104313c: beq   a0, zero, 0x104315c sw    zero, 16(sp)
+// 0x0104314c: 0x104314c: beq   a0, zero, 0x104316c sw    zero, 16(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -4609,17 +4609,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_104315c
+	brfalse L_104316c
 // --- basic block ---
-// 0x01043144: 0x1043144: addiu a1, sp, 16
+// 0x01043154: 0x1043154: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01043148: 0x1043148: addu  a2, zero, zero
+// 0x01043158: 0x1043158: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104314c: 0x104314c: jal   0x104f4a8 addu  a3, zero, zero
+// 0x0104315c: 0x104315c: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4627,41 +4627,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043154: 0x1043154: j	 0x10431e8 lui   a0, 0x60000
+// 0x01043164: 0x1043164: j	 0x10431f8 lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-	br L_10431e8
+	br L_10431f8
 // --- basic block ---
-L_104315c:
-// 0x0104315c: 0x104315c: lui   a2, 0x10000
+L_104316c:
+// 0x0104316c: 0x104316c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01043160: 0x1043160: addiu a2, a2, -3192
+// 0x01043170: 0x1043170: addiu a2, a2, -3196
 	ldloc.3
-	ldc.i4 -3192
+	ldc.i4 -3196
 	add
 	stloc.3
-// 0x01043164: 0x1043164: addiu a1, zero, 1
+// 0x01043174: 0x1043174: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01043168: 0x1043168: lui   v0, 0xf0000
+// 0x01043178: 0x1043178: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0104316c: 0x104316c: lw    s2, -30068(v0)
+// 0x0104317c: 0x104317c: lw    s2, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 8
-// 0x01043170: 0x1043170: jal   0x10a1918 addu  a0, zero, zero
+// 0x01043180: 0x1043180: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4669,41 +4669,41 @@ L_104315c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043178: 0x1043178: addu  a0, v0, zero
+// 0x01043188: 0x1043188: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104317c: 0x104317c: jal   0x104dffc addu  s1, v0, zero
+// 0x0104318c: 0x104318c: jal   0x104e00c addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043184: 0x1043184: addu  s0, v0, zero
+// 0x01043194: 0x1043194: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01043188: 0x1043188: jal   0x104e020 addu  a0, s1, zero
+// 0x01043198: 0x1043198: jal   0x104e030 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043190: 0x1043190: div   s2, s0
+// 0x010431a0: 0x10431a0: div   s2, s0
 	ldloc 8
 	ldloc 9
 	div
 	stloc 15
-// 0x01043194: 0x1043194: lw    v0, 20(sp)
+// 0x010431a4: 0x10431a4: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4712,10 +4712,10 @@ L_104315c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043198: 0x1043198: addu  s3, zero, zero
+// 0x010431a8: 0x10431a8: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0104319c: 0x104319c: sw    v0, 28(sp)
+// 0x010431ac: 0x10431ac: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4724,21 +4724,21 @@ L_104315c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010431a0: 0x10431a0: addu  s2, zero, zero
+// 0x010431b0: 0x10431b0: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010431a4: 0x10431a4: mflo  lo
+// 0x010431b4: 0x10431b4: mflo  lo
 	ldloc 15
 	stloc 13
-// 0x010431a8: 0x10431a8: j	 0x10431c4 addiu s4, sp, 24
+// 0x010431b8: 0x10431b8: j	 0x10431d4 addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 12
-	br L_10431c4
+	br L_10431d4
 // --- basic block ---
-L_10431b0:
-// 0x010431b0: 0x10431b0: lw    v0, 16(sp)
+L_10431c0:
+// 0x010431c0: 0x10431c0: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4747,17 +4747,17 @@ L_10431b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010431b4: 0x10431b4: addiu s2, s2, 1
+// 0x010431c4: 0x10431c4: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010431b8: 0x10431b8: addu  v1, v1, v0
+// 0x010431c8: 0x10431c8: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010431bc: 0x10431bc: jal   0x104f4a8 sw    v1, 24(sp)
+// 0x010431cc: 0x10431cc: jal   0x104f4b8 sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4771,50 +4771,50 @@ L_10431b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10431c4:
-// 0x010431c4: 0x10431c4: addu  s3, s3, s0
+L_10431d4:
+// 0x010431d4: 0x10431d4: addu  s3, s3, s0
 	ldloc 10
 	ldloc 9
 	add
 	stloc 10
-// 0x010431c8: 0x10431c8: slt   v0, s2, s5
+// 0x010431d8: 0x10431d8: slt   v0, s2, s5
 	ldloc 8
 	ldloc 13
 	clt
 	stloc 5
-// 0x010431cc: 0x10431cc: addu  a0, s1, zero
+// 0x010431dc: 0x10431dc: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010431d0: 0x10431d0: addu  a1, s4, zero
+// 0x010431e0: 0x10431e0: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x010431d4: 0x10431d4: addu  a2, zero, zero
+// 0x010431e4: 0x10431e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010431d8: 0x10431d8: addu  a3, zero, zero
+// 0x010431e8: 0x10431e8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010431dc: 0x10431dc: bne   v0, zero, 0x10431b0 subu  v1, s3, s0
+// 0x010431ec: 0x10431ec: bne   v0, zero, 0x10431c0 subu  v1, s3, s0
 	ldloc 5
 	ldloc 10
 	ldloc 9
 	sub
 	stloc 7
-	brtrue L_10431b0
+	brtrue L_10431c0
 // --- basic block ---
-L_10431e4:
-// 0x010431e4: 0x10431e4: lui   a0, 0x60000
+L_10431f4:
+// 0x010431f4: 0x10431f4: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-L_10431e8:
-// 0x010431e8: 0x10431e8: jal   0x10429e4 addiu a0, a0, 12748
+L_10431f8:
+// 0x010431f8: 0x10431f8: jal   0x10429f4 addiu a0, a0, 13212
 	ldloc.1
-	ldc.i4 12748
+	ldc.i4 13212
 	add
 	stloc.1
 	ldloc.0
@@ -4822,14 +4822,14 @@ L_10431e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::draw_objects_10429e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::draw_objects_10429f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10431f0:
-// 0x010431f0: 0x10431f0: lw    ra, 60(sp)
-// 0x010431f4: 0x10431f4: lw    s5, 56(sp)
+L_1043200:
+// 0x01043200: 0x1043200: lw    ra, 60(sp)
+// 0x01043204: 0x1043204: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4838,7 +4838,7 @@ L_10431f0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010431f8: 0x10431f8: lw    s4, 52(sp)
+// 0x01043208: 0x1043208: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4847,7 +4847,7 @@ L_10431f0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010431fc: 0x10431fc: lw    s3, 48(sp)
+// 0x0104320c: 0x104320c: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4856,7 +4856,7 @@ L_10431f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01043200: 0x1043200: lw    s2, 44(sp)
+// 0x01043210: 0x1043210: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4865,7 +4865,7 @@ L_10431f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01043204: 0x1043204: lw    s1, 40(sp)
+// 0x01043214: 0x1043214: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4874,7 +4874,7 @@ L_10431f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01043208: 0x1043208: lw    s0, 36(sp)
+// 0x01043218: 0x1043218: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4883,7 +4883,7 @@ L_10431f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104320c: 0x104320c: jr    ra addiu sp, sp, 64
+// 0x0104321c: 0x104321c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4895,7 +4895,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_bar_draw_top_bar_1043240(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_draw_top_bar_1043250(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4930,50 +4930,50 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043240: 0x1043240: lui   v0, 0x60000
+// 0x01043250: 0x1043250: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01043244: 0x1043244: lw    v0, 12652(v0)
+// 0x01043254: 0x1043254: lw    v0, 13116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3163
+	ldc.i4 3279
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043248: 0x1043248: addiu sp, sp, -24
+// 0x01043258: 0x1043258: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104324c: 0x104324c: beq   v0, zero, 0x1043274 sw    ra, 20(sp)
+// 0x0104325c: 0x104325c: beq   v0, zero, 0x1043284 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1043274
+	brfalse L_1043284
 // --- basic block ---
-// 0x01043254: 0x1043254: lui   v0, 0x60000
+// 0x01043264: 0x1043264: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01043258: 0x1043258: lw    v0, 12640(v0)
+// 0x01043268: 0x1043268: lw    v0, 13104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104325c: 0x104325c: sll   zero, zero, 0
-// 0x01043260: 0x1043260: bne   v0, zero, 0x1043274 sll   zero, zero, 0
+// 0x0104326c: 0x104326c: sll   zero, zero, 0
+// 0x01043270: 0x1043270: bne   v0, zero, 0x1043284 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1043274
+	brtrue L_1043284
 // --- basic block ---
-// 0x01043268: 0x1043268: lui   a0, 0x60000
+// 0x01043278: 0x1043278: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x0104326c: 0x104326c: jal   0x10429e4 addiu a0, a0, 12660
+// 0x0104327c: 0x104327c: jal   0x10429f4 addiu a0, a0, 13124
 	ldloc.1
-	ldc.i4 12660
+	ldc.i4 13124
 	add
 	stloc.1
 	ldloc.0
@@ -4981,15 +4981,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::draw_objects_10429e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::draw_objects_10429f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1043274:
-// 0x01043274: 0x1043274: lw    ra, 20(sp)
-// 0x01043278: 0x1043278: sll   zero, zero, 0
-// 0x0104327c: 0x104327c: jr    ra addiu sp, sp, 24
+L_1043284:
+// 0x01043284: 0x1043284: lw    ra, 20(sp)
+// 0x01043288: 0x1043288: sll   zero, zero, 0
+// 0x0104328c: 0x104328c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5001,7 +5001,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_bar_draw_1043284(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_draw_1043294(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5036,70 +5036,70 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043284: 0x1043284: lui   v0, 0x60000
+// 0x01043294: 0x1043294: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01043288: 0x1043288: lw    v0, 12652(v0)
+// 0x01043298: 0x1043298: lw    v0, 13116(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3163
+	ldc.i4 3279
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104328c: 0x104328c: addiu sp, sp, -24
+// 0x0104329c: 0x104329c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01043290: 0x1043290: beq   v0, zero, 0x10432c0 sw    ra, 20(sp)
+// 0x010432a0: 0x10432a0: beq   v0, zero, 0x10432d0 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_10432c0
+	brfalse L_10432d0
 // --- basic block ---
-// 0x01043298: 0x1043298: jal   0x101fd28 sll   zero, zero, 0
+// 0x010432a8: 0x10432a8: jal   0x101fd38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_show_top_bar_101fd28(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_show_top_bar_101fd38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010432a0: 0x10432a0: beq   v0, zero, 0x10432b0 lui   v1, 0x60000
+// 0x010432b0: 0x10432b0: beq   v0, zero, 0x10432c0 lui   v1, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 6
-	brfalse L_10432b0
+	brfalse L_10432c0
 // --- basic block ---
-// 0x010432a8: 0x10432a8: j	 0x10432b8 sw    zero, 12640(v1)
+// 0x010432b8: 0x10432b8: j	 0x10432c8 sw    zero, 13104(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10432b8
+	br L_10432c8
 // --- basic block ---
-L_10432b0:
-// 0x010432b0: 0x10432b0: addiu v0, zero, 1
+L_10432c0:
+// 0x010432c0: 0x10432c0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010432b4: 0x10432b4: sw    v0, 12640(v1)
+// 0x010432c4: 0x10432c4: sw    v0, 13104(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldloc 5
 	stelem.i4
-L_10432b8:
-// 0x010432b8: 0x10432b8: jal   0x1043240 addiu a0, zero, 1
+L_10432c8:
+// 0x010432c8: 0x10432c8: jal   0x1043250 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -5107,15 +5107,15 @@ L_10432b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_draw_top_bar_1043240(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_draw_top_bar_1043250(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10432c0:
-// 0x010432c0: 0x10432c0: lw    ra, 20(sp)
-// 0x010432c4: 0x10432c4: sll   zero, zero, 0
-// 0x010432c8: 0x10432c8: jr    ra addiu sp, sp, 24
+L_10432d0:
+// 0x010432d0: 0x10432d0: lw    ra, 20(sp)
+// 0x010432d4: 0x10432d4: sll   zero, zero, 0
+// 0x010432d8: 0x10432d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5127,7 +5127,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_bar_obj_released_10432d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_obj_released_10432e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -5165,24 +5165,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010432d0: 0x10432d0: lui   v0, 0x60000
+// 0x010432e0: 0x10432e0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010432d4: 0x10432d4: lw    v0, 12656(v0)
+// 0x010432e4: 0x10432e4: lw    v0, 13120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc 5
-// 0x010432d8: 0x10432d8: addiu sp, sp, -24
+// 0x010432e8: 0x10432e8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010432dc: 0x10432dc: sw    s0, 16(sp)
+// 0x010432ec: 0x10432ec: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5191,17 +5191,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010432e0: 0x10432e0: sw    ra, 20(sp)
-// 0x010432e4: 0x10432e4: beq   v0, zero, 0x10433d8 addu  s0, a0, zero
+// 0x010432f0: 0x10432f0: sw    ra, 20(sp)
+// 0x010432f4: 0x10432f4: beq   v0, zero, 0x10433e8 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_10433d8
+	brfalse L_10433e8
 // --- basic block ---
-// 0x010432ec: 0x10432ec: lui   a0, 0x1040000
+// 0x010432fc: 0x10432fc: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x010432f0: 0x10432f0: sw    zero, 620(v0)
+// 0x01043300: 0x1043300: sw    zero, 620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5210,9 +5210,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010432f4: 0x10432f4: jal   0x104b78c addiu a0, a0, 10532
+// 0x01043304: 0x1043304: jal   0x104b79c addiu a0, a0, 10548
 	ldloc.1
-	ldc.i4 10532
+	ldc.i4 10548
 	add
 	stloc.1
 	ldloc.0
@@ -5220,39 +5220,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_drag_motion_104b78c(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_drag_motion_104b79c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010432fc: 0x10432fc: lui   v0, 0x60000
+// 0x0104330c: 0x104330c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01043300: 0x1043300: lw    v0, 12640(v0)
+// 0x01043310: 0x1043310: lw    v0, 13104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3160
+	ldc.i4 3276
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043304: 0x1043304: sll   zero, zero, 0
-// 0x01043308: 0x1043308: bne   v0, zero, 0x104332c lui   v0, 0x0
+// 0x01043314: 0x1043314: sll   zero, zero, 0
+// 0x01043318: 0x1043318: bne   v0, zero, 0x104333c lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_104332c
+	brtrue L_104333c
 // --- basic block ---
-// 0x01043310: 0x1043310: lui   a1, 0x60000
+// 0x01043320: 0x1043320: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01043314: 0x1043314: addiu a1, a1, 12660
+// 0x01043324: 0x1043324: addiu a1, a1, 13124
 	ldloc.2
-	ldc.i4 12660
+	ldc.i4 13124
 	add
 	stloc.2
-// 0x01043318: 0x1043318: jal   0x1042228 addu  a0, s0, zero
+// 0x01043328: 0x1043328: jal   0x1042238 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5260,20 +5260,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_bar_by_pos_1042228(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_bar_by_pos_1042238(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043320: 0x1043320: bne   v0, zero, 0x1043368 sll   zero, zero, 0
+// 0x01043330: 0x1043330: bne   v0, zero, 0x1043378 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1043368
+	brtrue L_1043378
 // --- basic block ---
-// 0x01043328: 0x1043328: lui   v0, 0x0
+// 0x01043338: 0x1043338: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_104332c:
-// 0x0104332c: 0x104332c: lw    v0, 13332(v0)
+L_104333c:
+// 0x0104333c: 0x104333c: lw    v0, 13332(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5282,22 +5282,22 @@ L_104332c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043330: 0x1043330: sll   zero, zero, 0
-// 0x01043334: 0x1043334: bne   v0, zero, 0x1043358 lui   v0, 0x60000
+// 0x01043340: 0x1043340: sll   zero, zero, 0
+// 0x01043344: 0x1043344: bne   v0, zero, 0x1043368 lui   v0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 5
-	brtrue L_1043358
+	brtrue L_1043368
 // --- basic block ---
-// 0x0104333c: 0x104333c: lui   a1, 0x60000
+// 0x0104334c: 0x104334c: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01043340: 0x1043340: addu  a0, s0, zero
+// 0x01043350: 0x1043350: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01043344: 0x1043344: jal   0x1042228 addiu a1, a1, 12748
+// 0x01043354: 0x1043354: jal   0x1042238 addiu a1, a1, 13212
 	ldloc.2
-	ldc.i4 12748
+	ldc.i4 13212
 	add
 	stloc.2
 	ldloc.0
@@ -5305,27 +5305,27 @@ L_104332c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_bar_by_pos_1042228(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_bar_by_pos_1042238(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104334c: 0x104334c: bne   v0, zero, 0x104336c lui   s0, 0x60000
+// 0x0104335c: 0x104335c: bne   v0, zero, 0x104337c lui   s0, 0x60000
 	ldloc 5
 	ldc.i4 393216
 	stloc 8
-	brtrue L_104336c
+	brtrue L_104337c
 // --- basic block ---
-// 0x01043354: 0x1043354: lui   v0, 0x60000
+// 0x01043364: 0x1043364: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1043358:
-// 0x01043358: 0x1043358: jal   0x1021900 sw    zero, 12656(v0)
+L_1043368:
+// 0x01043368: 0x1043368: jal   0x1021910 sw    zero, 13120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5334,49 +5334,49 @@ L_1043358:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043360: 0x1043360: j	 0x10433ec addu  v0, zero, zero
+// 0x01043370: 0x1043370: j	 0x10433fc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10433ec
+	br L_10433fc
 // --- basic block ---
-L_1043368:
-// 0x01043368: 0x1043368: lui   s0, 0x60000
+L_1043378:
+// 0x01043378: 0x1043378: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-L_104336c:
-// 0x0104336c: 0x104336c: lw    v1, 12656(s0)
+L_104337c:
+// 0x0104337c: 0x104337c: lw    v1, 13120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc 7
-// 0x01043370: 0x1043370: sll   zero, zero, 0
-// 0x01043374: 0x1043374: beq   v0, v1, 0x1043384 sll   zero, zero, 0
+// 0x01043380: 0x1043380: sll   zero, zero, 0
+// 0x01043384: 0x1043384: beq   v0, v1, 0x1043394 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_1043384
+	beq  L_1043394
 // --- basic block ---
-// 0x0104337c: 0x104337c: j	 0x10433e0 sw    zero, 12656(s0)
+// 0x0104338c: 0x104338c: j	 0x10433f0 sw    zero, 13120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10433e0
+	br L_10433f0
 // --- basic block ---
-L_1043384:
-// 0x01043384: 0x1043384: lw    v1, 540(v0)
+L_1043394:
+// 0x01043394: 0x1043394: lw    v1, 540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5385,14 +5385,14 @@ L_1043384:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01043388: 0x1043388: sll   zero, zero, 0
-// 0x0104338c: 0x104338c: beq   v1, zero, 0x10433d8 addiu v1, zero, 1
+// 0x01043398: 0x1043398: sll   zero, zero, 0
+// 0x0104339c: 0x104339c: beq   v1, zero, 0x10433e8 addiu v1, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 7
-	brfalse L_10433d8
+	brfalse L_10433e8
 // --- basic block ---
-// 0x01043394: 0x1043394: jal   0x1021900 sw    v1, 620(v0)
+// 0x010433a4: 0x10433a4: jal   0x1021910 sw    v1, 620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5406,33 +5406,33 @@ L_1043384:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104339c: 0x104339c: jal   0x1021900 sll   zero, zero, 0
+// 0x010433ac: 0x10433ac: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010433a4: 0x10433a4: lw    v0, 12656(s0)
+// 0x010433b4: 0x10433b4: lw    v0, 13120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc 5
-// 0x010433a8: 0x10433a8: sll   zero, zero, 0
-// 0x010433ac: 0x10433ac: lw    v0, 540(v0)
+// 0x010433b8: 0x10433b8: sll   zero, zero, 0
+// 0x010433bc: 0x10433bc: lw    v0, 540(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5441,8 +5441,8 @@ L_1043384:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010433b0: 0x10433b0: sll   zero, zero, 0
-// 0x010433b4: 0x10433b4: lw    v0, 20(v0)
+// 0x010433c0: 0x10433c0: sll   zero, zero, 0
+// 0x010433c4: 0x10433c4: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5451,8 +5451,8 @@ L_1043384:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010433b8: 0x10433b8: sll   zero, zero, 0
-// 0x010433bc: 0x10433bc: jalr  v0 sll   zero, zero, 0
+// 0x010433c8: 0x10433c8: sll   zero, zero, 0
+// 0x010433cc: 0x10433cc: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5464,28 +5464,28 @@ L_1043384:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010433c4: 0x10433c4: jal   0x1021900 sll   zero, zero, 0
+// 0x010433d4: 0x10433d4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010433cc: 0x10433cc: lw    v0, 12656(s0)
+// 0x010433dc: 0x10433dc: lw    v0, 13120(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldelem.i4
 	stloc 5
-// 0x010433d0: 0x10433d0: sll   zero, zero, 0
-// 0x010433d4: 0x10433d4: sw    zero, 620(v0)
+// 0x010433e0: 0x10433e0: sll   zero, zero, 0
+// 0x010433e4: 0x10433e4: sw    zero, 620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5494,37 +5494,37 @@ L_1043384:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10433d8:
-// 0x010433d8: 0x10433d8: lui   v0, 0x60000
+L_10433e8:
+// 0x010433e8: 0x10433e8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010433dc: 0x10433dc: sw    zero, 12656(v0)
+// 0x010433ec: 0x10433ec: sw    zero, 13120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3164
+	ldc.i4 3280
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10433e0:
-// 0x010433e0: 0x10433e0: jal   0x1021900 sll   zero, zero, 0
+L_10433f0:
+// 0x010433f0: 0x10433f0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010433e8: 0x10433e8: addiu v0, zero, 1
+// 0x010433f8: 0x10433f8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10433ec:
-// 0x010433ec: 0x10433ec: lw    ra, 20(sp)
-// 0x010433f0: 0x10433f0: lw    s0, 16(sp)
+L_10433fc:
+// 0x010433fc: 0x10433fc: lw    ra, 20(sp)
+// 0x01043400: 0x1043400: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5533,7 +5533,7 @@ L_10433ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010433f4: 0x10433f4: jr    ra addiu sp, sp, 24
+// 0x01043404: 0x1043404: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5545,7 +5545,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_92_10433fc(int32,int32,int32,int32,int32)
+.method public static int32 T_92_104340c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s5,int32 s1,int32 s3,int32 s4,int32 s6,int32 s7,int32 s8,int32 t0,int32 ra)
@@ -5610,12 +5610,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010433fc: 0x10433fc: addiu sp, sp, -2376
+// 0x0104340c: 0x104340c: addiu sp, sp, -2376
 	ldloc.0
 	ldc.i4 -2376
 	add
 	stloc.0
-// 0x01043400: 0x1043400: sw    s6, 2360(sp)
+// 0x01043410: 0x1043410: sw    s6, 2360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5624,7 +5624,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01043404: 0x1043404: sw    s3, 2348(sp)
+// 0x01043414: 0x1043414: sw    s3, 2348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5633,13 +5633,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01043408: 0x1043408: lui   s6, 0x60000
+// 0x01043418: 0x1043418: lui   s6, 0x60000
 	ldc.i4 393216
 	stloc 14
-// 0x0104340c: 0x104340c: lui   s3, 0x10000
+// 0x0104341c: 0x104341c: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x01043410: 0x1043410: sw    s4, 2352(sp)
+// 0x01043420: 0x1043420: sw    s4, 2352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5648,7 +5648,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01043414: 0x1043414: sw    s1, 2340(sp)
+// 0x01043424: 0x1043424: sw    s1, 2340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01043418: 0x1043418: sw    s0, 2336(sp)
+// 0x01043428: 0x1043428: sw    s0, 2336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5666,8 +5666,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104341c: 0x104341c: sw    ra, 2372(sp)
-// 0x01043420: 0x1043420: sw    s8, 2368(sp)
+// 0x0104342c: 0x104342c: sw    ra, 2372(sp)
+// 0x01043430: 0x1043430: sw    s8, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5676,7 +5676,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01043424: 0x1043424: sw    s7, 2364(sp)
+// 0x01043434: 0x1043434: sw    s7, 2364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5685,7 +5685,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01043428: 0x1043428: sw    s5, 2356(sp)
+// 0x01043438: 0x1043438: sw    s5, 2356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5694,7 +5694,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104342c: 0x104342c: sw    s2, 2344(sp)
+// 0x0104343c: 0x104343c: sw    s2, 2344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5703,123 +5703,123 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01043430: 0x1043430: addu  s1, a0, zero
+// 0x01043440: 0x1043440: addu  s1, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01043434: 0x1043434: addu  s4, a0, a1
+// 0x01043444: 0x1043444: addu  s4, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc 13
-// 0x01043438: 0x1043438: addiu s3, s3, -3296
+// 0x01043448: 0x1043448: addiu s3, s3, -3300
 	ldloc 12
-	ldc.i4 -3296
+	ldc.i4 -3300
 	add
 	stloc 12
-// 0x0104343c: 0x104343c: addiu s6, s6, 12660
+// 0x0104344c: 0x104344c: addiu s6, s6, 13124
 	ldloc 14
-	ldc.i4 12660
+	ldc.i4 13124
 	add
 	stloc 14
-// 0x01043440: 0x1043440: j	 0x1043bdc addu  s0, zero, zero
+// 0x01043450: 0x1043450: j	 0x1043bec addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_1043bdc
+	br L_1043bec
 // --- basic block ---
-L_1043448:
-// 0x01043448: 0x1043448: beq   v0, v1, 0x104345c addiu s1, s1, 1
+L_1043458:
+// 0x01043458: 0x1043458: beq   v0, v1, 0x104346c addiu s1, s1, 1
 	ldloc 5
 	ldloc 7
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	beq  L_104345c
+	beq  L_104346c
 // --- basic block ---
-// 0x01043450: 0x1043450: j	 0x1043484 sll   zero, zero, 0
-	br L_1043484
+// 0x01043460: 0x1043460: j	 0x1043494 sll   zero, zero, 0
+	br L_1043494
 // --- basic block ---
-L_1043458:
-// 0x01043458: 0x1043458: addiu s1, s1, 1
+L_1043468:
+// 0x01043468: 0x1043468: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_104345c:
-// 0x0104345c: 0x104345c: beq   s1, s4, 0x10434a8 sll   zero, zero, 0
+L_104346c:
+// 0x0104346c: 0x104346c: beq   s1, s4, 0x10434b8 sll   zero, zero, 0
 	ldloc 11
 	ldloc 13
-	beq  L_10434a8
+	beq  L_10434b8
 // --- basic block ---
-// 0x01043464: 0x1043464: lb    v0, 0(s1)
+// 0x01043474: 0x1043474: lb    v0, 0(s1)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01043468: 0x1043468: sll   zero, zero, 0
-// 0x0104346c: 0x104346c: slti  v0, v0, 32
+// 0x01043478: 0x1043478: sll   zero, zero, 0
+// 0x0104347c: 0x104347c: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x01043470: 0x1043470: beq   v0, zero, 0x1043458 sll   zero, zero, 0
+// 0x01043480: 0x1043480: beq   v0, zero, 0x1043468 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1043458
+	brfalse L_1043468
 // --- basic block ---
-// 0x01043478: 0x1043478: j	 0x1043484 sll   zero, zero, 0
-	br L_1043484
+// 0x01043488: 0x1043488: j	 0x1043494 sll   zero, zero, 0
+	br L_1043494
 // --- basic block ---
-L_1043480:
-// 0x01043480: 0x1043480: addiu s1, s1, 1
+L_1043490:
+// 0x01043490: 0x1043490: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1043484:
-// 0x01043484: 0x1043484: beq   s1, s4, 0x10434a8 sll   zero, zero, 0
+L_1043494:
+// 0x01043494: 0x1043494: beq   s1, s4, 0x10434b8 sll   zero, zero, 0
 	ldloc 11
 	ldloc 13
-	beq  L_10434a8
+	beq  L_10434b8
 // --- basic block ---
-// 0x0104348c: 0x104348c: lb    v0, 0(s1)
+// 0x0104349c: 0x104349c: lb    v0, 0(s1)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01043490: 0x1043490: sll   zero, zero, 0
-// 0x01043494: 0x1043494: beq   v0, a0, 0x1043480 sll   zero, zero, 0
+// 0x010434a0: 0x10434a0: sll   zero, zero, 0
+// 0x010434a4: 0x10434a4: beq   v0, a0, 0x1043490 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	beq  L_1043480
+	beq  L_1043490
 // --- basic block ---
-// 0x0104349c: 0x104349c: j	 0x10434b0 sll   zero, zero, 0
-	br L_10434b0
+// 0x010434ac: 0x10434ac: j	 0x10434c0 sll   zero, zero, 0
+	br L_10434c0
 // --- basic block ---
-L_10434a4:
-// 0x010434a4: 0x10434a4: addiu a0, zero, 10
+L_10434b4:
+// 0x010434b4: 0x10434b4: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-L_10434a8:
-// 0x010434a8: 0x10434a8: lb    v0, 0(s1)
+L_10434b8:
+// 0x010434b8: 0x10434b8: lb    v0, 0(s1)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010434ac: 0x10434ac: sll   zero, zero, 0
-L_10434b0:
-// 0x010434b0: 0x10434b0: beq   v0, v1, 0x1043448 slti  a1, v0, 32
+// 0x010434bc: 0x10434bc: sll   zero, zero, 0
+L_10434c0:
+// 0x010434c0: 0x10434c0: beq   v0, v1, 0x1043458 slti  a1, v0, 32
 	ldloc 5
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc.2
-	beq  L_1043448
+	beq  L_1043458
 // --- basic block ---
-// 0x010434b8: 0x10434b8: bne   a1, zero, 0x1043448 addiu s2, zero, 1
+// 0x010434c8: 0x10434c8: bne   a1, zero, 0x1043458 addiu s2, zero, 1
 	ldloc.2
 	ldc.i4.1
 	stloc 8
-	brtrue L_1043448
+	brtrue L_1043458
 // --- basic block ---
-// 0x010434c0: 0x10434c0: sw    s1, 1304(sp)
+// 0x010434d0: 0x10434d0: sw    s1, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5828,45 +5828,45 @@ L_10434b0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010434c4: 0x10434c4: addiu a1, zero, 32
+// 0x010434d4: 0x10434d4: addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.2
-// 0x010434c8: 0x10434c8: addiu v0, sp, 24
+// 0x010434d8: 0x10434d8: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010434cc: 0x10434cc: j	 0x1043528 addiu a0, zero, 255
+// 0x010434dc: 0x10434dc: j	 0x1043538 addiu a0, zero, 255
 	ldc.i4 255
 	stloc.1
-	br L_1043528
+	br L_1043538
 // --- basic block ---
-L_10434d4:
-// 0x010434d4: 0x10434d4: lb    v1, 0(s1)
+L_10434e4:
+// 0x010434e4: 0x10434e4: lb    v1, 0(s1)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010434d8: 0x10434d8: sll   zero, zero, 0
-// 0x010434dc: 0x10434dc: bne   v1, a1, 0x1043510 addiu v1, s2, -1
+// 0x010434e8: 0x10434e8: sll   zero, zero, 0
+// 0x010434ec: 0x10434ec: bne   v1, a1, 0x1043520 addiu v1, s2, -1
 	ldloc 7
 	ldloc.2
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 7
-	bne.un L_1043510
+	bne.un L_1043520
 // --- basic block ---
-// 0x010434e4: 0x10434e4: sll   v1, v1, 2
+// 0x010434f4: 0x10434f4: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010434e8: 0x10434e8: addu  v1, v0, v1
+// 0x010434f8: 0x10434f8: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x010434ec: 0x10434ec: lw    t0, 1280(v1)
+// 0x010434fc: 0x10434fc: lw    t0, 1280(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5875,32 +5875,32 @@ L_10434d4:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010434f0: 0x10434f0: sll   a2, s2, 2
+// 0x01043500: 0x1043500: sll   a2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x010434f4: 0x10434f4: subu  t0, s1, t0
+// 0x01043504: 0x1043504: subu  t0, s1, t0
 	ldloc 11
 	ldloc 17
 	sub
 	stloc 17
-// 0x010434f8: 0x10434f8: addu  a2, v0, a2
+// 0x01043508: 0x1043508: addu  a2, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc.3
-// 0x010434fc: 0x10434fc: addiu a3, s1, 1
+// 0x0104350c: 0x104350c: addiu a3, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01043500: 0x1043500: addiu s2, s2, 1
+// 0x01043510: 0x1043510: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01043504: 0x1043504: sw    t0, 256(v1)
+// 0x01043514: 0x1043514: sw    t0, 256(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5909,7 +5909,7 @@ L_10434d4:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01043508: 0x1043508: beq   s2, a0, 0x1043530 sw    a3, 1280(a2)
+// 0x01043518: 0x1043518: beq   s2, a0, 0x1043540 sw    a3, 1280(a2)
 	ldloc 8
 	ldloc.1
 	ldloc 6
@@ -5920,56 +5920,56 @@ L_10434d4:
 	add
 	ldloc 4
 	stelem.i4
-	beq  L_1043530
+	beq  L_1043540
 // --- basic block ---
-L_1043510:
-// 0x01043510: 0x1043510: lb    v1, 0(s1)
+L_1043520:
+// 0x01043520: 0x1043520: lb    v1, 0(s1)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01043514: 0x1043514: sll   zero, zero, 0
-// 0x01043518: 0x1043518: slti  v1, v1, 32
+// 0x01043524: 0x1043524: sll   zero, zero, 0
+// 0x01043528: 0x1043528: slti  v1, v1, 32
 	ldloc 7
 	ldc.i4.s 32
 	clt
 	stloc 7
-// 0x0104351c: 0x104351c: bne   v1, zero, 0x1043530 sll   zero, zero, 0
+// 0x0104352c: 0x104352c: bne   v1, zero, 0x1043540 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1043530
+	brtrue L_1043540
 // --- basic block ---
-// 0x01043524: 0x1043524: addiu s1, s1, 1
+// 0x01043534: 0x1043534: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1043528:
-// 0x01043528: 0x1043528: bne   s1, s4, 0x10434d4 sll   zero, zero, 0
+L_1043538:
+// 0x01043538: 0x1043538: bne   s1, s4, 0x10434e4 sll   zero, zero, 0
 	ldloc 11
 	ldloc 13
-	bne.un L_10434d4
+	bne.un L_10434e4
 // --- basic block ---
-L_1043530:
-// 0x01043530: 0x1043530: addiu v0, s2, -1
+L_1043540:
+// 0x01043540: 0x1043540: addiu v0, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01043534: 0x1043534: addiu v1, sp, 24
+// 0x01043544: 0x1043544: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x01043538: 0x1043538: sll   v0, v0, 2
+// 0x01043548: 0x1043548: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0104353c: 0x104353c: addu  v0, v1, v0
+// 0x0104354c: 0x104354c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01043540: 0x1043540: lw    v1, 1280(v0)
+// 0x01043550: 0x1043550: lw    v1, 1280(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5978,13 +5978,13 @@ L_1043530:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01043544: 0x1043544: sll   zero, zero, 0
-// 0x01043548: 0x1043548: subu  v1, s1, v1
+// 0x01043554: 0x1043554: sll   zero, zero, 0
+// 0x01043558: 0x1043558: subu  v1, s1, v1
 	ldloc 11
 	ldloc 7
 	sub
 	stloc 7
-// 0x0104354c: 0x104354c: j	 0x1043558 sw    v1, 256(v0)
+// 0x0104355c: 0x104355c: j	 0x1043568 sw    v1, 256(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5993,45 +5993,45 @@ L_1043530:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1043558
+	br L_1043568
 // --- basic block ---
-L_1043554:
-// 0x01043554: 0x1043554: addiu s1, s1, 1
+L_1043564:
+// 0x01043564: 0x1043564: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1043558:
-// 0x01043558: 0x1043558: beq   s1, s4, 0x104357c sll   zero, zero, 0
+L_1043568:
+// 0x01043568: 0x1043568: beq   s1, s4, 0x104358c sll   zero, zero, 0
 	ldloc 11
 	ldloc 13
-	beq  L_104357c
+	beq  L_104358c
 // --- basic block ---
-// 0x01043560: 0x1043560: lb    v0, 0(s1)
+// 0x01043570: 0x1043570: lb    v0, 0(s1)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01043564: 0x1043564: sll   zero, zero, 0
-// 0x01043568: 0x1043568: slti  v1, v0, 32
+// 0x01043574: 0x1043574: sll   zero, zero, 0
+// 0x01043578: 0x1043578: slti  v1, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 7
-// 0x0104356c: 0x104356c: beq   v1, zero, 0x104357c sll   zero, zero, 0
+// 0x0104357c: 0x104357c: beq   v1, zero, 0x104358c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_104357c
+	brfalse L_104358c
 // --- basic block ---
-// 0x01043574: 0x1043574: bgtz  v0, 0x1043554 sll   zero, zero, 0
+// 0x01043584: 0x1043584: bgtz  v0, 0x1043564 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_1043554
+	bgt L_1043564
 // --- basic block ---
-L_104357c:
-// 0x0104357c: 0x104357c: bne   s0, zero, 0x10435bc sll   zero, zero, 0
+L_104358c:
+// 0x0104358c: 0x104358c: bne   s0, zero, 0x10435cc sll   zero, zero, 0
 	ldloc 9
-	brtrue L_10435bc
+	brtrue L_10435cc
 // --- basic block ---
-// 0x01043584: 0x1043584: lw    v0, 1304(sp)
+// 0x01043594: 0x1043594: lw    v0, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6040,38 +6040,38 @@ L_104357c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043588: 0x1043588: sll   zero, zero, 0
-// 0x0104358c: 0x104358c: lb    v1, 0(v0)
+// 0x01043598: 0x1043598: sll   zero, zero, 0
+// 0x0104359c: 0x104359c: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01043590: 0x1043590: addiu v0, zero, 78
+// 0x010435a0: 0x10435a0: addiu v0, zero, 78
 	ldc.i4.s 78
 	stloc 5
-// 0x01043594: 0x1043594: beq   v1, v0, 0x10435bc lui   a1, 0x10000
+// 0x010435a4: 0x10435a4: beq   v1, v0, 0x10435cc lui   a1, 0x10000
 	ldloc 7
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_10435bc
+	beq  L_10435cc
 // --- basic block ---
-// 0x0104359c: 0x104359c: lui   a3, 0x10000
+// 0x010435ac: 0x10435ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010435a0: 0x10435a0: addiu a1, a1, -3296
+// 0x010435b0: 0x10435b0: addiu a1, a1, -3300
 	ldloc.2
-	ldc.i4 -3296
+	ldc.i4 -3300
 	add
 	stloc.2
-// 0x010435a4: 0x10435a4: addiu a3, a3, -3168
+// 0x010435b4: 0x10435b4: addiu a3, a3, -3172
 	ldloc 4
-	ldc.i4 -3168
+	ldc.i4 -3172
 	add
 	stloc 4
-// 0x010435a8: 0x10435a8: addiu a0, zero, 4
+// 0x010435b8: 0x10435b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010435ac: 0x10435ac: jal   0x100449c addiu a2, zero, 578
+// 0x010435bc: 0x10435bc: jal   0x100449c addiu a2, zero, 578
 	ldc.i4 578
 	stloc.3
 	ldloc.0
@@ -6084,11 +6084,11 @@ L_104357c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010435b4: 0x10435b4: j	 0x1043be4 sll   zero, zero, 0
-	br L_1043be4
+// 0x010435c4: 0x10435c4: j	 0x1043bf4 sll   zero, zero, 0
+	br L_1043bf4
 // --- basic block ---
-L_10435bc:
-// 0x010435bc: 0x10435bc: lw    v0, 1304(sp)
+L_10435cc:
+// 0x010435cc: 0x10435cc: lw    v0, 1304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6097,101 +6097,101 @@ L_10435bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010435c0: 0x10435c0: sll   zero, zero, 0
-// 0x010435c4: 0x10435c4: lbu   v0, 0(v0)
+// 0x010435d0: 0x10435d0: sll   zero, zero, 0
+// 0x010435d4: 0x10435d4: lbu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x010435c8: 0x10435c8: sll   zero, zero, 0
-// 0x010435cc: 0x10435cc: addiu v0, v0, -65
+// 0x010435d8: 0x10435d8: sll   zero, zero, 0
+// 0x010435dc: 0x10435dc: addiu v0, v0, -65
 	ldloc 5
 	ldc.i4.s -65
 	add
 	stloc 5
-// 0x010435d0: 0x10435d0: andi  v0, v0, 255
+// 0x010435e0: 0x10435e0: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x010435d4: 0x10435d4: sltiu v1, v0, 25
+// 0x010435e4: 0x10435e4: sltiu v1, v0, 25
 	ldloc 5
 	ldc.i4.s 25
 	clt.un
 	stloc 7
-// 0x010435d8: 0x10435d8: beq   v1, zero, 0x1043bc0 lui   v1, 0x20000
+// 0x010435e8: 0x10435e8: beq   v1, zero, 0x1043bd0 lui   v1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 7
-	brfalse L_1043bc0
+	brfalse L_1043bd0
 // --- basic block ---
-// 0x010435e0: 0x10435e0: sll   v0, v0, 2
+// 0x010435f0: 0x10435f0: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010435e4: 0x10435e4: addiu v1, v1, 27476
+// 0x010435f4: 0x10435f4: addiu v1, v1, 27940
 	ldloc 7
-	ldc.i4 27476
+	ldc.i4 27940
 	add
 	stloc 7
-// 0x010435e8: 0x10435e8: addu  v0, v1, v0
+// 0x010435f8: 0x10435f8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010435ec: 0x10435ec: lw    v0, 0(v0)
+// 0x010435fc: 0x10435fc: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010435f0: 0x10435f0: sll   zero, zero, 0
-// 0x010435f4: 0x10435f4: jr    v0 sll   zero, zero, 0
+// 0x01043600: 0x1043600: sll   zero, zero, 0
+// 0x01043604: 0x1043604: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_10435fc:
-// 0x010435fc: 0x10435fc: addiu v0, zero, 3
+L_104360c:
+// 0x0104360c: 0x104360c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01043600: 0x1043600: beq   s2, v0, 0x1043620 lui   a3, 0x10000
+// 0x01043610: 0x1043610: beq   s2, v0, 0x1043630 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_1043620
+	beq  L_1043630
 // --- basic block ---
-// 0x01043608: 0x1043608: lw    v0, 0(s0)
+// 0x01043618: 0x1043618: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104360c: 0x104360c: addiu a3, a3, -3140
+// 0x0104361c: 0x104361c: addiu a3, a3, -3144
 	ldloc 4
-	ldc.i4 -3140
+	ldc.i4 -3144
 	add
 	stloc 4
-// 0x01043610: 0x1043610: addiu a0, zero, 4
+// 0x01043620: 0x1043620: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043614: 0x1043614: addu  a1, s3, zero
+// 0x01043624: 0x1043624: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043618: 0x1043618: j	 0x1043b60 addiu a2, zero, 265
+// 0x01043628: 0x1043628: j	 0x1043b70 addiu a2, zero, 265
 	ldc.i4 265
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_1043620:
-// 0x01043620: 0x1043620: addiu s2, sp, 24
+L_1043630:
+// 0x01043630: 0x1043630: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01043624: 0x1043624: lw    a2, 1308(sp)
+// 0x01043634: 0x1043634: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6200,7 +6200,7 @@ L_1043620:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043628: 0x1043628: lw    a3, 284(sp)
+// 0x01043638: 0x1043638: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6209,10 +6209,10 @@ L_1043620:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104362c: 0x104362c: addiu a1, zero, 255
+// 0x0104363c: 0x104363c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043630: 0x1043630: jal   0x1042744 addu  a0, s2, zero
+// 0x01043640: 0x1043640: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6220,12 +6220,12 @@ L_1043620:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043638: 0x1043638: jal   0x1000d8c addu  a0, s2, zero
+// 0x01043648: 0x1043648: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6238,7 +6238,7 @@ L_1043620:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043640: 0x1043640: sw    v0, 164(s0)
+// 0x01043650: 0x1043650: sw    v0, 164(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6247,7 +6247,7 @@ L_1043620:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01043644: 0x1043644: lw    a2, 1312(sp)
+// 0x01043654: 0x1043654: lw    a2, 1312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6256,7 +6256,7 @@ L_1043620:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043648: 0x1043648: lw    a3, 288(sp)
+// 0x01043658: 0x1043658: lw    a3, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6265,10 +6265,10 @@ L_1043620:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104364c: 0x104364c: addiu a1, zero, 255
+// 0x0104365c: 0x104365c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043650: 0x1043650: jal   0x1042744 addu  a0, s2, zero
+// 0x01043660: 0x1043660: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6276,12 +6276,12 @@ L_1043620:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043658: 0x1043658: jal   0x1000d8c addu  a0, s2, zero
+// 0x01043668: 0x1043668: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6294,7 +6294,7 @@ L_1043620:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043660: 0x1043660: j	 0x1043bc0 sw    v0, 168(s0)
+// 0x01043670: 0x1043670: j	 0x1043bd0 sw    v0, 168(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6303,10 +6303,10 @@ L_1043620:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_1043668:
-// 0x01043668: 0x1043668: lw    v0, 496(s0)
+L_1043678:
+// 0x01043678: 0x1043678: lw    v0, 496(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6315,26 +6315,26 @@ L_1043668:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104366c: 0x104366c: sll   zero, zero, 0
-// 0x01043670: 0x1043670: slti  v0, v0, 41
+// 0x0104367c: 0x104367c: sll   zero, zero, 0
+// 0x01043680: 0x1043680: slti  v0, v0, 41
 	ldloc 5
 	ldc.i4.s 41
 	clt
 	stloc 5
-// 0x01043674: 0x1043674: beq   v0, zero, 0x1043690 addiu s8, sp, 280
+// 0x01043684: 0x1043684: beq   v0, zero, 0x10436a0 addiu s8, sp, 280
 	ldloc 5
 	ldloc.0
 	ldc.i4 280
 	add
 	stloc 16
-	brfalse L_1043690
+	brfalse L_10436a0
 // --- basic block ---
-// 0x0104367c: 0x104367c: addiu a0, sp, 1304
+// 0x0104368c: 0x104368c: addiu a0, sp, 1304
 	ldloc.0
 	ldc.i4 1304
 	add
 	stloc.1
-// 0x01043680: 0x1043680: sw    a0, 2328(sp)
+// 0x01043690: 0x1043690: sw    a0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6343,45 +6343,45 @@ L_1043668:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01043684: 0x1043684: addiu s5, zero, 1
+// 0x01043694: 0x1043694: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x01043688: 0x1043688: j	 0x1043718 addiu s7, sp, 24
+// 0x01043698: 0x1043698: j	 0x1043728 addiu s7, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-	br L_1043718
+	br L_1043728
 // --- basic block ---
-L_1043690:
-// 0x01043690: 0x1043690: lui   a3, 0x10000
+L_10436a0:
+// 0x010436a0: 0x10436a0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01043694: 0x1043694: lw    v0, 0(s0)
+// 0x010436a4: 0x10436a4: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01043698: 0x1043698: addiu a3, a3, -3104
+// 0x010436a8: 0x10436a8: addiu a3, a3, -3108
 	ldloc 4
-	ldc.i4 -3104
+	ldc.i4 -3108
 	add
 	stloc 4
-// 0x0104369c: 0x104369c: addiu a0, zero, 4
+// 0x010436ac: 0x10436ac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010436a0: 0x10436a0: addu  a1, s3, zero
+// 0x010436b0: 0x10436b0: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010436a4: 0x10436a4: j	 0x1043b60 addiu a2, zero, 288
+// 0x010436b4: 0x10436b4: j	 0x1043b70 addiu a2, zero, 288
 	ldc.i4 288
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_10436ac:
-// 0x010436ac: 0x10436ac: lw    v0, 2328(sp)
+L_10436bc:
+// 0x010436bc: 0x10436bc: lw    v0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6390,7 +6390,7 @@ L_10436ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010436b0: 0x10436b0: lw    a3, 4(s8)
+// 0x010436c0: 0x10436c0: lw    a3, 4(s8)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -6399,7 +6399,7 @@ L_10436ac:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010436b4: 0x10436b4: lw    a2, 4(v0)
+// 0x010436c4: 0x10436c4: lw    a2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6408,7 +6408,7 @@ L_10436ac:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010436b8: 0x10436b8: jal   0x1042744 addiu a1, zero, 256
+// 0x010436c8: 0x10436c8: jal   0x1042754 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -6416,12 +6416,12 @@ L_10436ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010436c0: 0x10436c0: lw    v1, 496(s0)
+// 0x010436d0: 0x10436d0: lw    v1, 496(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6430,10 +6430,10 @@ L_10436ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010436c4: 0x10436c4: addiu a0, zero, 1
+// 0x010436d4: 0x10436d4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010436c8: 0x10436c8: bne   s5, a0, 0x10436e4 sw    v1, 2332(sp)
+// 0x010436d8: 0x10436d8: bne   s5, a0, 0x10436f4 sw    v1, 2332(sp)
 	ldloc 10
 	ldloc.1
 	ldloc 6
@@ -6444,9 +6444,9 @@ L_10436ac:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_10436e4
+	bne.un L_10436f4
 // --- basic block ---
-// 0x010436d0: 0x10436d0: jal   0x1001ba8 addu  a0, s7, zero
+// 0x010436e0: 0x10436e0: jal   0x1001ba8 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -6459,7 +6459,7 @@ L_10436ac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010436d8: 0x10436d8: lw    a0, 2332(sp)
+// 0x010436e8: 0x10436e8: lw    a0, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6468,15 +6468,15 @@ L_10436ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010436dc: 0x10436dc: j	 0x10436f8 addiu v1, a0, 42
+// 0x010436ec: 0x10436ec: j	 0x1043708 addiu v1, a0, 42
 	ldloc.1
 	ldc.i4.s 42
 	add
 	stloc 7
-	br L_10436f8
+	br L_1043708
 // --- basic block ---
-L_10436e4:
-// 0x010436e4: 0x10436e4: jal   0x1001ba8 addu  a0, s7, zero
+L_10436f4:
+// 0x010436f4: 0x10436f4: jal   0x1001ba8 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.0
@@ -6489,7 +6489,7 @@ L_10436e4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010436ec: 0x10436ec: lw    a0, 2332(sp)
+// 0x010436fc: 0x10436fc: lw    a0, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6498,24 +6498,24 @@ L_10436e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010436f0: 0x10436f0: sll   zero, zero, 0
-// 0x010436f4: 0x10436f4: addiu v1, a0, 82
+// 0x01043700: 0x1043700: sll   zero, zero, 0
+// 0x01043704: 0x1043704: addiu v1, a0, 82
 	ldloc.1
 	ldc.i4.s 82
 	add
 	stloc 7
-L_10436f8:
-// 0x010436f8: 0x10436f8: sll   v1, v1, 2
+L_1043708:
+// 0x01043708: 0x1043708: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010436fc: 0x10436fc: addu  v1, s0, v1
+// 0x0104370c: 0x104370c: addu  v1, s0, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x01043700: 0x1043700: sw    v0, 4(v1)
+// 0x01043710: 0x1043710: sw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6524,7 +6524,7 @@ L_10436f8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01043704: 0x1043704: lw    v0, 2328(sp)
+// 0x01043714: 0x1043714: lw    v0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6533,17 +6533,17 @@ L_10436f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043708: 0x1043708: addiu s5, s5, 1
+// 0x01043718: 0x1043718: addiu s5, s5, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0104370c: 0x104370c: addiu v0, v0, 4
+// 0x0104371c: 0x104371c: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01043710: 0x1043710: sw    v0, 2328(sp)
+// 0x01043720: 0x1043720: sw    v0, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6552,24 +6552,24 @@ L_10436f8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01043714: 0x1043714: addiu s8, s8, 4
+// 0x01043724: 0x1043724: addiu s8, s8, 4
 	ldloc 16
 	ldc.i4.4
 	add
 	stloc 16
-L_1043718:
-// 0x01043718: 0x1043718: slt   v0, s5, s2
+L_1043728:
+// 0x01043728: 0x1043728: slt   v0, s5, s2
 	ldloc 10
 	ldloc 8
 	clt
 	stloc 5
-// 0x0104371c: 0x104371c: bne   v0, zero, 0x10436ac addu  a0, s7, zero
+// 0x0104372c: 0x104372c: bne   v0, zero, 0x10436bc addu  a0, s7, zero
 	ldloc 5
 	ldloc 15
 	stloc.1
-	brtrue L_10436ac
+	brtrue L_10436bc
 // --- basic block ---
-// 0x01043724: 0x1043724: lw    v0, 496(s0)
+// 0x01043734: 0x1043734: lw    v0, 496(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6578,7 +6578,7 @@ L_1043718:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043728: 0x1043728: sw    zero, 620(s0)
+// 0x01043738: 0x1043738: sw    zero, 620(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6587,12 +6587,12 @@ L_1043718:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104372c: 0x104372c: addiu v0, v0, 1
+// 0x0104373c: 0x104373c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01043730: 0x1043730: j	 0x1043bc0 sw    v0, 496(s0)
+// 0x01043740: 0x1043740: j	 0x1043bd0 sw    v0, 496(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6601,49 +6601,49 @@ L_1043718:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_1043738:
-// 0x01043738: 0x1043738: addiu v0, zero, 1
+L_1043748:
+// 0x01043748: 0x1043748: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0104373c: 0x104373c: bne   s2, v0, 0x104375c lui   a3, 0x10000
+// 0x0104374c: 0x104374c: bne   s2, v0, 0x104376c lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	bne.un L_104375c
+	bne.un L_104376c
 // --- basic block ---
-// 0x01043744: 0x1043744: lw    v0, 0(s0)
+// 0x01043754: 0x1043754: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01043748: 0x1043748: addiu a3, a3, -3064
+// 0x01043758: 0x1043758: addiu a3, a3, -3068
 	ldloc 4
-	ldc.i4 -3064
+	ldc.i4 -3068
 	add
 	stloc 4
-// 0x0104374c: 0x104374c: addiu a0, zero, 4
+// 0x0104375c: 0x104375c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043750: 0x1043750: addu  a1, s3, zero
+// 0x01043760: 0x1043760: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043754: 0x1043754: j	 0x1043b60 addiu a2, zero, 483
+// 0x01043764: 0x1043764: j	 0x1043b70 addiu a2, zero, 483
 	ldc.i4 483
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_104375c:
-// 0x0104375c: 0x104375c: addiu s2, sp, 24
+L_104376c:
+// 0x0104376c: 0x104376c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01043760: 0x1043760: lw    a2, 1308(sp)
+// 0x01043770: 0x1043770: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6652,7 +6652,7 @@ L_104375c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043764: 0x1043764: lw    a3, 284(sp)
+// 0x01043774: 0x1043774: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6661,10 +6661,10 @@ L_104375c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043768: 0x1043768: addiu a1, zero, 255
+// 0x01043778: 0x1043778: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x0104376c: 0x104376c: jal   0x1042744 addu  a0, s2, zero
+// 0x0104377c: 0x104377c: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6672,12 +6672,12 @@ L_104375c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043774: 0x1043774: jal   0x102c720 addu  a0, s2, zero
+// 0x01043784: 0x1043784: jal   0x102c730 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6685,12 +6685,12 @@ L_104375c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104377c: 0x104377c: bne   v0, zero, 0x1043bc0 sw    v0, 540(s0)
+// 0x0104378c: 0x104378c: bne   v0, zero, 0x1043bd0 sw    v0, 540(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -6700,75 +6700,75 @@ L_104375c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1043bc0
+	brtrue L_1043bd0
 // --- basic block ---
-// 0x01043784: 0x1043784: lui   a3, 0x10000
+// 0x01043794: 0x1043794: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01043788: 0x1043788: lw    v0, 0(s0)
+// 0x01043798: 0x1043798: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104378c: 0x104378c: addiu a3, a3, -3028
+// 0x0104379c: 0x104379c: addiu a3, a3, -3032
 	ldloc 4
-	ldc.i4 -3028
+	ldc.i4 -3032
 	add
 	stloc 4
-// 0x01043790: 0x1043790: addiu a0, zero, 4
+// 0x010437a0: 0x10437a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043794: 0x1043794: addu  a1, s3, zero
+// 0x010437a4: 0x10437a4: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043798: 0x1043798: j	 0x1043b60 addiu a2, zero, 493
+// 0x010437a8: 0x10437a8: j	 0x1043b70 addiu a2, zero, 493
 	ldc.i4 493
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_10437a0:
-// 0x010437a0: 0x10437a0: addiu v0, zero, 5
+L_10437b0:
+// 0x010437b0: 0x10437b0: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010437a4: 0x10437a4: beq   s2, v0, 0x10437c4 lui   a3, 0x10000
+// 0x010437b4: 0x10437b4: beq   s2, v0, 0x10437d4 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_10437c4
+	beq  L_10437d4
 // --- basic block ---
-// 0x010437ac: 0x10437ac: lw    v0, 0(s0)
+// 0x010437bc: 0x10437bc: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010437b0: 0x10437b0: addiu a3, a3, -2992
+// 0x010437c0: 0x10437c0: addiu a3, a3, -2996
 	ldloc 4
-	ldc.i4 -2992
+	ldc.i4 -2996
 	add
 	stloc 4
-// 0x010437b4: 0x10437b4: addiu a0, zero, 4
+// 0x010437c4: 0x10437c4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010437b8: 0x10437b8: addu  a1, s3, zero
+// 0x010437c8: 0x10437c8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010437bc: 0x10437bc: j	 0x1043b60 addiu a2, zero, 460
+// 0x010437cc: 0x10437cc: j	 0x1043b70 addiu a2, zero, 460
 	ldc.i4 460
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_10437c4:
-// 0x010437c4: 0x10437c4: addiu s2, sp, 24
+L_10437d4:
+// 0x010437d4: 0x10437d4: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x010437c8: 0x10437c8: lw    a2, 1308(sp)
+// 0x010437d8: 0x10437d8: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6777,7 +6777,7 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010437cc: 0x10437cc: lw    a3, 284(sp)
+// 0x010437dc: 0x10437dc: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6786,10 +6786,10 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010437d0: 0x10437d0: addiu a1, zero, 255
+// 0x010437e0: 0x10437e0: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x010437d4: 0x10437d4: jal   0x1042744 addu  a0, s2, zero
+// 0x010437e4: 0x10437e4: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6797,12 +6797,12 @@ L_10437c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010437dc: 0x10437dc: jal   0x1000d8c addu  a0, s2, zero
+// 0x010437ec: 0x10437ec: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6815,7 +6815,7 @@ L_10437c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010437e4: 0x10437e4: sw    v0, 524(s0)
+// 0x010437f4: 0x10437f4: sw    v0, 524(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6824,7 +6824,7 @@ L_10437c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010437e8: 0x10437e8: lw    a2, 1312(sp)
+// 0x010437f8: 0x10437f8: lw    a2, 1312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6833,7 +6833,7 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010437ec: 0x10437ec: lw    a3, 288(sp)
+// 0x010437fc: 0x10437fc: lw    a3, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6842,10 +6842,10 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010437f0: 0x10437f0: addiu a1, zero, 255
+// 0x01043800: 0x1043800: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x010437f4: 0x10437f4: jal   0x1042744 addu  a0, s2, zero
+// 0x01043804: 0x1043804: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6853,12 +6853,12 @@ L_10437c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010437fc: 0x10437fc: jal   0x1000d8c addu  a0, s2, zero
+// 0x0104380c: 0x104380c: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6871,7 +6871,7 @@ L_10437c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043804: 0x1043804: sw    v0, 528(s0)
+// 0x01043814: 0x1043814: sw    v0, 528(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6880,7 +6880,7 @@ L_10437c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01043808: 0x1043808: lw    a2, 1316(sp)
+// 0x01043818: 0x1043818: lw    a2, 1316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6889,7 +6889,7 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104380c: 0x104380c: lw    a3, 292(sp)
+// 0x0104381c: 0x104381c: lw    a3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6898,10 +6898,10 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043810: 0x1043810: addiu a1, zero, 255
+// 0x01043820: 0x1043820: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043814: 0x1043814: jal   0x1042744 addu  a0, s2, zero
+// 0x01043824: 0x1043824: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6909,12 +6909,12 @@ L_10437c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104381c: 0x104381c: jal   0x1000d8c addu  a0, s2, zero
+// 0x0104382c: 0x104382c: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6927,7 +6927,7 @@ L_10437c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043824: 0x1043824: sw    v0, 532(s0)
+// 0x01043834: 0x1043834: sw    v0, 532(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6936,7 +6936,7 @@ L_10437c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01043828: 0x1043828: lw    a2, 1320(sp)
+// 0x01043838: 0x1043838: lw    a2, 1320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6945,7 +6945,7 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104382c: 0x104382c: lw    a3, 296(sp)
+// 0x0104383c: 0x104383c: lw    a3, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6954,10 +6954,10 @@ L_10437c4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043830: 0x1043830: addiu a1, zero, 255
+// 0x01043840: 0x1043840: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043834: 0x1043834: jal   0x1042744 addu  a0, s2, zero
+// 0x01043844: 0x1043844: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6965,12 +6965,12 @@ L_10437c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104383c: 0x104383c: jal   0x1000d8c addu  a0, s2, zero
+// 0x0104384c: 0x104384c: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6983,7 +6983,7 @@ L_10437c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043844: 0x1043844: j	 0x1043bc0 sw    v0, 536(s0)
+// 0x01043854: 0x1043854: j	 0x1043bd0 sw    v0, 536(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6992,49 +6992,49 @@ L_10437c4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_104384c:
-// 0x0104384c: 0x104384c: addiu v0, zero, 2
+L_104385c:
+// 0x0104385c: 0x104385c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01043850: 0x1043850: beq   s2, v0, 0x1043870 lui   a3, 0x10000
+// 0x01043860: 0x1043860: beq   s2, v0, 0x1043880 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_1043870
+	beq  L_1043880
 // --- basic block ---
-// 0x01043858: 0x1043858: lw    v0, 0(s0)
+// 0x01043868: 0x1043868: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104385c: 0x104385c: addiu a3, a3, -2960
+// 0x0104386c: 0x104386c: addiu a3, a3, -2964
 	ldloc 4
-	ldc.i4 -2960
+	ldc.i4 -2964
 	add
 	stloc 4
-// 0x01043860: 0x1043860: addiu a0, zero, 4
+// 0x01043870: 0x1043870: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043864: 0x1043864: addu  a1, s3, zero
+// 0x01043874: 0x1043874: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043868: 0x1043868: j	 0x1043b60 addiu a2, zero, 317
+// 0x01043878: 0x1043878: j	 0x1043b70 addiu a2, zero, 317
 	ldc.i4 317
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_1043870:
-// 0x01043870: 0x1043870: addiu s2, sp, 24
+L_1043880:
+// 0x01043880: 0x1043880: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01043874: 0x1043874: lw    a2, 1308(sp)
+// 0x01043884: 0x1043884: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7043,7 +7043,7 @@ L_1043870:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043878: 0x1043878: lw    a3, 284(sp)
+// 0x01043888: 0x1043888: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7052,10 +7052,10 @@ L_1043870:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104387c: 0x104387c: addiu a1, zero, 255
+// 0x0104388c: 0x104388c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043880: 0x1043880: jal   0x1042744 addu  a0, s2, zero
+// 0x01043890: 0x1043890: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7063,12 +7063,12 @@ L_1043870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043888: 0x1043888: jal   0x100f424 addu  a0, s2, zero
+// 0x01043898: 0x1043898: jal   0x100f434 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7076,12 +7076,12 @@ L_1043870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_find_100f424(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_find_100f434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043890: 0x1043890: bne   v0, zero, 0x1043bc0 sw    v0, 500(s0)
+// 0x010438a0: 0x10438a0: bne   v0, zero, 0x1043bd0 sw    v0, 500(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -7091,36 +7091,36 @@ L_1043870:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1043bc0
+	brtrue L_1043bd0
 // --- basic block ---
-// 0x01043898: 0x1043898: lui   a3, 0x10000
+// 0x010438a8: 0x10438a8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104389c: 0x104389c: lw    v0, 0(s0)
+// 0x010438ac: 0x10438ac: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010438a0: 0x10438a0: addiu a3, a3, -2916
+// 0x010438b0: 0x10438b0: addiu a3, a3, -2920
 	ldloc 4
-	ldc.i4 -2916
+	ldc.i4 -2920
 	add
 	stloc 4
-// 0x010438a4: 0x10438a4: addiu a0, zero, 4
+// 0x010438b4: 0x10438b4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010438a8: 0x10438a8: addu  a1, s3, zero
+// 0x010438b8: 0x10438b8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010438ac: 0x10438ac: j	 0x1043b60 addiu a2, zero, 327
+// 0x010438bc: 0x10438bc: j	 0x1043b70 addiu a2, zero, 327
 	ldc.i4 327
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_10438b4:
-// 0x010438b4: 0x10438b4: jal   0x1000910 addiu a0, zero, 628
+L_10438c4:
+// 0x010438c4: 0x10438c4: jal   0x1000910 addiu a0, zero, 628
 	ldc.i4 628
 	stloc.1
 	ldloc.0
@@ -7133,16 +7133,16 @@ L_10438b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010438bc: 0x10438bc: addu  s0, v0, zero
+// 0x010438cc: 0x10438cc: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010438c0: 0x10438c0: addu  a0, v0, zero
+// 0x010438d0: 0x10438d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010438c4: 0x10438c4: addu  a1, zero, zero
+// 0x010438d4: 0x10438d4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010438c8: 0x10438c8: jal   0x100177c addiu a2, zero, 628
+// 0x010438d8: 0x10438d8: jal   0x100177c addiu a2, zero, 628
 	ldc.i4 628
 	stloc.3
 	ldloc.1
@@ -7154,13 +7154,13 @@ L_10438b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010438d0: 0x10438d0: addu  a0, s3, zero
+// 0x010438e0: 0x10438e0: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010438d4: 0x10438d4: addiu a1, zero, 442
+// 0x010438e4: 0x10438e4: addiu a1, zero, 442
 	ldc.i4 442
 	stloc.2
-// 0x010438d8: 0x10438d8: jal   0x1004a38 addu  a2, s0, zero
+// 0x010438e8: 0x10438e8: jal   0x1004a48 addu  a2, s0, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -7168,12 +7168,12 @@ L_10438b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010438e0: 0x10438e0: lw    a0, 1308(sp)
+// 0x010438f0: 0x10438f0: lw    a0, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7182,7 +7182,7 @@ L_10438b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010438e4: 0x10438e4: lw    a1, 284(sp)
+// 0x010438f4: 0x10438f4: lw    a1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7191,21 +7191,21 @@ L_10438b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010438e8: 0x10438e8: jal   0x1042818 sll   zero, zero, 0
+// 0x010438f8: 0x10438f8: jal   0x1042828 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_object_string_1042818(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_object_string_1042828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010438f0: 0x10438f0: addiu v1, zero, -1
+// 0x01043900: 0x1043900: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010438f4: 0x10438f4: sw    v1, 512(s0)
+// 0x01043904: 0x1043904: sw    v1, 512(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7214,7 +7214,7 @@ L_10438b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010438f8: 0x10438f8: lw    v1, 84(s6)
+// 0x01043908: 0x1043908: lw    v1, 84(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7223,36 +7223,36 @@ L_10438b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010438fc: 0x10438fc: sw    v0, 0(s0)
+// 0x0104390c: 0x104390c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01043900: 0x1043900: sll   v0, v1, 2
+// 0x01043910: 0x1043910: sll   v0, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01043904: 0x1043904: addu  v0, v0, s6
+// 0x01043914: 0x1043914: addu  v0, v0, s6
 	ldloc 5
 	ldloc 14
 	add
 	stloc 5
-// 0x01043908: 0x1043908: addiu v1, v1, 1
+// 0x01043918: 0x1043918: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0104390c: 0x104390c: sw    s0, 0(v0)
+// 0x0104391c: 0x104391c: sw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x01043910: 0x1043910: sw    v1, 84(s6)
+// 0x01043920: 0x1043920: sw    v1, 84(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7261,7 +7261,7 @@ L_10438b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01043914: 0x1043914: j	 0x1043bc0 sw    zero, 516(s0)
+// 0x01043924: 0x1043924: j	 0x1043bd0 sw    zero, 516(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7270,36 +7270,36 @@ L_10438b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_104391c:
-// 0x0104391c: 0x104391c: addiu v0, zero, 3
+L_104392c:
+// 0x0104392c: 0x104392c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01043920: 0x1043920: beq   s2, v0, 0x1043938 addiu a0, zero, 4
+// 0x01043930: 0x1043930: beq   s2, v0, 0x1043948 addiu a0, zero, 4
 	ldloc 8
 	ldloc 5
 	ldc.i4.4
 	stloc.1
-	beq  L_1043938
+	beq  L_1043948
 // --- basic block ---
-// 0x01043928: 0x1043928: lw    v0, 0(s0)
+// 0x01043938: 0x1043938: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104392c: 0x104392c: addu  a1, s3, zero
+// 0x0104393c: 0x104393c: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043930: 0x1043930: j	 0x10439f0 addiu a2, zero, 359
+// 0x01043940: 0x1043940: j	 0x1043a00 addiu a2, zero, 359
 	ldc.i4 359
 	stloc.3
-	br L_10439f0
+	br L_1043a00
 // --- basic block ---
-L_1043938:
-// 0x01043938: 0x1043938: lw    v0, 616(s0)
+L_1043948:
+// 0x01043948: 0x1043948: lw    v0, 616(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7308,48 +7308,48 @@ L_1043938:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104393c: 0x104393c: sll   zero, zero, 0
-// 0x01043940: 0x1043940: slti  v0, v0, 9
+// 0x0104394c: 0x104394c: sll   zero, zero, 0
+// 0x01043950: 0x1043950: slti  v0, v0, 9
 	ldloc 5
 	ldc.i4.s 9
 	clt
 	stloc 5
-// 0x01043944: 0x1043944: bne   v0, zero, 0x1043964 lui   a3, 0x10000
+// 0x01043954: 0x1043954: bne   v0, zero, 0x1043974 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1043964
+	brtrue L_1043974
 // --- basic block ---
-// 0x0104394c: 0x104394c: lw    v0, 0(s0)
+// 0x0104395c: 0x104395c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01043950: 0x1043950: addiu a3, a3, -2820
+// 0x01043960: 0x1043960: addiu a3, a3, -2824
 	ldloc 4
-	ldc.i4 -2820
+	ldc.i4 -2824
 	add
 	stloc 4
-// 0x01043954: 0x1043954: addiu a0, zero, 4
+// 0x01043964: 0x1043964: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043958: 0x1043958: addu  a1, s3, zero
+// 0x01043968: 0x1043968: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x0104395c: 0x104395c: j	 0x1043b60 addiu a2, zero, 365
+// 0x0104396c: 0x104396c: j	 0x1043b70 addiu a2, zero, 365
 	ldc.i4 365
 	stloc.3
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_1043964:
-// 0x01043964: 0x1043964: addiu s2, sp, 24
+L_1043974:
+// 0x01043974: 0x1043974: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01043968: 0x1043968: lw    a2, 1308(sp)
+// 0x01043978: 0x1043978: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7358,7 +7358,7 @@ L_1043964:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104396c: 0x104396c: lw    a3, 284(sp)
+// 0x0104397c: 0x104397c: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7367,10 +7367,10 @@ L_1043964:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043970: 0x1043970: addiu a1, zero, 255
+// 0x01043980: 0x1043980: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043974: 0x1043974: jal   0x1042744 addu  a0, s2, zero
+// 0x01043984: 0x1043984: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7378,12 +7378,12 @@ L_1043964:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104397c: 0x104397c: lw    s5, 616(s0)
+// 0x0104398c: 0x104398c: lw    s5, 616(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7392,15 +7392,15 @@ L_1043964:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01043980: 0x1043980: addu  a0, s2, zero
+// 0x01043990: 0x1043990: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01043984: 0x1043984: addiu s5, s5, 136
+// 0x01043994: 0x1043994: addiu s5, s5, 136
 	ldloc 10
 	ldc.i4 136
 	add
 	stloc 10
-// 0x01043988: 0x1043988: jal   0x100f424 sll   s5, s5, 2
+// 0x01043998: 0x1043998: jal   0x100f434 sll   s5, s5, 2
 	ldloc 10
 	ldc.i4.2
 	shl
@@ -7410,17 +7410,17 @@ L_1043964:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_find_100f424(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_find_100f434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043990: 0x1043990: addu  s5, s0, s5
+// 0x010439a0: 0x10439a0: addu  s5, s0, s5
 	ldloc 9
 	ldloc 10
 	add
 	stloc 10
-// 0x01043994: 0x1043994: lw    a2, 1312(sp)
+// 0x010439a4: 0x10439a4: lw    a2, 1312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7429,7 +7429,7 @@ L_1043964:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043998: 0x1043998: lw    a3, 288(sp)
+// 0x010439a8: 0x10439a8: lw    a3, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7438,17 +7438,17 @@ L_1043964:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104399c: 0x104399c: sw    v0, 0(s5)
+// 0x010439ac: 0x10439ac: sw    v0, 0(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010439a0: 0x10439a0: addu  a0, s2, zero
+// 0x010439b0: 0x10439b0: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010439a4: 0x10439a4: jal   0x1042744 addiu a1, zero, 255
+// 0x010439b4: 0x10439b4: jal   0x1042754 addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
 	ldloc.0
@@ -7456,12 +7456,12 @@ L_1043964:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010439ac: 0x10439ac: lw    s5, 616(s0)
+// 0x010439bc: 0x10439bc: lw    s5, 616(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7470,7 +7470,7 @@ L_1043964:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010439b0: 0x10439b0: jal   0x1000d8c addu  a0, s2, zero
+// 0x010439c0: 0x10439c0: jal   0x1000d8c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7483,12 +7483,12 @@ L_1043964:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010439b8: 0x10439b8: addiu s5, s5, 144
+// 0x010439c8: 0x10439c8: addiu s5, s5, 144
 	ldloc 10
 	ldc.i4 144
 	add
 	stloc 10
-// 0x010439bc: 0x10439bc: lw    v1, 616(s0)
+// 0x010439cc: 0x10439cc: lw    v1, 616(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7497,22 +7497,22 @@ L_1043964:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010439c0: 0x10439c0: sll   s5, s5, 2
+// 0x010439d0: 0x10439d0: sll   s5, s5, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x010439c4: 0x10439c4: addu  s5, s0, s5
+// 0x010439d4: 0x10439d4: addu  s5, s0, s5
 	ldloc 9
 	ldloc 10
 	add
 	stloc 10
-// 0x010439c8: 0x10439c8: addiu v1, v1, 1
+// 0x010439d8: 0x10439d8: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010439cc: 0x10439cc: sw    v0, 4(s5)
+// 0x010439dc: 0x10439dc: sw    v0, 4(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7521,7 +7521,7 @@ L_1043964:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010439d0: 0x10439d0: j	 0x1043bc0 sw    v1, 616(s0)
+// 0x010439e0: 0x10439e0: j	 0x1043bd0 sw    v1, 616(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7530,50 +7530,50 @@ L_1043964:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_10439d8:
-// 0x010439d8: 0x10439d8: addiu v0, zero, 2
+L_10439e8:
+// 0x010439e8: 0x10439e8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010439dc: 0x10439dc: beq   s2, v0, 0x10439fc addiu a0, zero, 4
+// 0x010439ec: 0x10439ec: beq   s2, v0, 0x1043a0c addiu a0, zero, 4
 	ldloc 8
 	ldloc 5
 	ldc.i4.4
 	stloc.1
-	beq  L_10439fc
+	beq  L_1043a0c
 // --- basic block ---
-// 0x010439e4: 0x10439e4: lw    v0, 0(s0)
+// 0x010439f4: 0x10439f4: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010439e8: 0x10439e8: addu  a1, s3, zero
+// 0x010439f8: 0x10439f8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x010439ec: 0x10439ec: addiu a2, zero, 394
+// 0x010439fc: 0x10439fc: addiu a2, zero, 394
 	ldc.i4 394
 	stloc.3
-L_10439f0:
-// 0x010439f0: 0x10439f0: lui   v1, 0x10000
+L_1043a00:
+// 0x01043a00: 0x1043a00: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010439f4: 0x10439f4: j	 0x1043b60 addiu a3, v1, -2868
+// 0x01043a04: 0x1043a04: j	 0x1043b70 addiu a3, v1, -2872
 	ldloc 7
-	ldc.i4 -2868
+	ldc.i4 -2872
 	add
 	stloc 4
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_10439fc:
-// 0x010439fc: 0x10439fc: addiu s2, sp, 24
+L_1043a0c:
+// 0x01043a0c: 0x1043a0c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01043a00: 0x1043a00: lw    a2, 1308(sp)
+// 0x01043a10: 0x1043a10: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7582,7 +7582,7 @@ L_10439fc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043a04: 0x1043a04: lw    a3, 284(sp)
+// 0x01043a14: 0x1043a14: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7591,13 +7591,13 @@ L_10439fc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043a08: 0x1043a08: addu  a0, s2, zero
+// 0x01043a18: 0x1043a18: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01043a0c: 0x1043a0c: addiu a1, zero, 255
+// 0x01043a1c: 0x1043a1c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043a10: 0x1043a10: jal   0x1042744 lui   s5, 0x0
+// 0x01043a20: 0x1043a20: jal   0x1042754 lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -7605,20 +7605,20 @@ L_10439fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043a18: 0x1043a18: j	 0x1043a34 addiu s5, s5, 13156
+// 0x01043a28: 0x1043a28: j	 0x1043a44 addiu s5, s5, 13156
 	ldloc 10
 	ldc.i4 13156
 	add
 	stloc 10
-	br L_1043a34
+	br L_1043a44
 // --- basic block ---
-L_1043a20:
-// 0x01043a20: 0x1043a20: jal   0x1001b14 addu  a1, s2, zero
+L_1043a30:
+// 0x01043a30: 0x1043a30: jal   0x1001b14 addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -7626,45 +7626,45 @@ L_1043a20:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01043a28: 0x1043a28: beq   v0, zero, 0x1043a60 sll   zero, zero, 0
+// 0x01043a38: 0x1043a38: beq   v0, zero, 0x1043a70 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1043a60
+	brfalse L_1043a70
 // --- basic block ---
-// 0x01043a30: 0x1043a30: addiu s5, s5, 16
+// 0x01043a40: 0x1043a40: addiu s5, s5, 16
 	ldloc 10
 	ldc.i4.s 16
 	add
 	stloc 10
-L_1043a34:
-// 0x01043a34: 0x1043a34: lw    a0, 0(s5)
+L_1043a44:
+// 0x01043a44: 0x1043a44: lw    a0, 0(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01043a38: 0x1043a38: sll   zero, zero, 0
-// 0x01043a3c: 0x1043a3c: bne   a0, zero, 0x1043a20 lui   a3, 0x10000
+// 0x01043a48: 0x1043a48: sll   zero, zero, 0
+// 0x01043a4c: 0x1043a4c: bne   a0, zero, 0x1043a30 lui   a3, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1043a20
+	brtrue L_1043a30
 // --- basic block ---
-// 0x01043a44: 0x1043a44: addiu a0, zero, 4
+// 0x01043a54: 0x1043a54: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043a48: 0x1043a48: addu  a1, s3, zero
+// 0x01043a58: 0x1043a58: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043a4c: 0x1043a4c: addiu a2, zero, 184
+// 0x01043a5c: 0x1043a5c: addiu a2, zero, 184
 	ldc.i4 184
 	stloc.3
-// 0x01043a50: 0x1043a50: addiu a3, a3, -2780
+// 0x01043a60: 0x1043a60: addiu a3, a3, -2784
 	ldloc 4
-	ldc.i4 -2780
+	ldc.i4 -2784
 	add
 	stloc 4
-// 0x01043a54: 0x1043a54: sw    s2, 16(sp)
+// 0x01043a64: 0x1043a64: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7673,7 +7673,7 @@ L_1043a34:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01043a58: 0x1043a58: jal   0x100449c addu  s5, zero, zero
+// 0x01043a68: 0x1043a68: jal   0x100449c addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -7686,8 +7686,8 @@ L_1043a34:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1043a60:
-// 0x01043a60: 0x1043a60: j	 0x1043bc0 sw    s5, 504(s0)
+L_1043a70:
+// 0x01043a70: 0x1043a70: j	 0x1043bd0 sw    s5, 504(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7696,49 +7696,49 @@ L_1043a60:
 	add
 	ldloc 10
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_1043a68:
-// 0x01043a68: 0x1043a68: addiu v0, zero, 2
+L_1043a78:
+// 0x01043a78: 0x1043a78: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01043a6c: 0x1043a6c: beq   s2, v0, 0x1043a8c lui   a3, 0x10000
+// 0x01043a7c: 0x1043a7c: beq   s2, v0, 0x1043a9c lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_1043a8c
+	beq  L_1043a9c
 // --- basic block ---
-// 0x01043a74: 0x1043a74: lw    v0, 0(s0)
+// 0x01043a84: 0x1043a84: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01043a78: 0x1043a78: addiu a0, zero, 4
+// 0x01043a88: 0x1043a88: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043a7c: 0x1043a7c: addu  a1, s3, zero
+// 0x01043a8c: 0x1043a8c: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043a80: 0x1043a80: addiu a2, zero, 413
+// 0x01043a90: 0x1043a90: addiu a2, zero, 413
 	ldc.i4 413
 	stloc.3
-// 0x01043a84: 0x1043a84: j	 0x1043b60 addiu a3, a3, -2756
+// 0x01043a94: 0x1043a94: j	 0x1043b70 addiu a3, a3, -2760
 	ldloc 4
-	ldc.i4 -2756
+	ldc.i4 -2760
 	add
 	stloc 4
-	br L_1043b60
+	br L_1043b70
 // --- basic block ---
-L_1043a8c:
-// 0x01043a8c: 0x1043a8c: addiu s2, sp, 24
+L_1043a9c:
+// 0x01043a9c: 0x1043a9c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01043a90: 0x1043a90: lw    a2, 1308(sp)
+// 0x01043aa0: 0x1043aa0: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7747,7 +7747,7 @@ L_1043a8c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043a94: 0x1043a94: lw    a3, 284(sp)
+// 0x01043aa4: 0x1043aa4: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7756,13 +7756,13 @@ L_1043a8c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043a98: 0x1043a98: addu  a0, s2, zero
+// 0x01043aa8: 0x1043aa8: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01043a9c: 0x1043a9c: addiu a1, zero, 255
+// 0x01043aac: 0x1043aac: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043aa0: 0x1043aa0: jal   0x1042744 lui   s5, 0x0
+// 0x01043ab0: 0x1043ab0: jal   0x1042754 lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -7770,20 +7770,20 @@ L_1043a8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043aa8: 0x1043aa8: j	 0x1043ac4 addiu s5, s5, 13316
+// 0x01043ab8: 0x1043ab8: j	 0x1043ad4 addiu s5, s5, 13316
 	ldloc 10
 	ldc.i4 13316
 	add
 	stloc 10
-	br L_1043ac4
+	br L_1043ad4
 // --- basic block ---
-L_1043ab0:
-// 0x01043ab0: 0x1043ab0: jal   0x1001b14 addu  a1, s2, zero
+L_1043ac0:
+// 0x01043ac0: 0x1043ac0: jal   0x1001b14 addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -7791,45 +7791,45 @@ L_1043ab0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01043ab8: 0x1043ab8: beq   v0, zero, 0x1043af0 sll   zero, zero, 0
+// 0x01043ac8: 0x1043ac8: beq   v0, zero, 0x1043b00 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1043af0
+	brfalse L_1043b00
 // --- basic block ---
-// 0x01043ac0: 0x1043ac0: addiu s5, s5, 8
+// 0x01043ad0: 0x1043ad0: addiu s5, s5, 8
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc 10
-L_1043ac4:
-// 0x01043ac4: 0x1043ac4: lw    a0, 0(s5)
+L_1043ad4:
+// 0x01043ad4: 0x1043ad4: lw    a0, 0(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01043ac8: 0x1043ac8: sll   zero, zero, 0
-// 0x01043acc: 0x1043acc: bne   a0, zero, 0x1043ab0 lui   a3, 0x10000
+// 0x01043ad8: 0x1043ad8: sll   zero, zero, 0
+// 0x01043adc: 0x1043adc: bne   a0, zero, 0x1043ac0 lui   a3, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1043ab0
+	brtrue L_1043ac0
 // --- basic block ---
-// 0x01043ad4: 0x1043ad4: addiu a0, zero, 4
+// 0x01043ae4: 0x1043ae4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043ad8: 0x1043ad8: addu  a1, s3, zero
+// 0x01043ae8: 0x1043ae8: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043adc: 0x1043adc: addiu a2, zero, 197
+// 0x01043aec: 0x1043aec: addiu a2, zero, 197
 	ldc.i4 197
 	stloc.3
-// 0x01043ae0: 0x1043ae0: addiu a3, a3, -2704
+// 0x01043af0: 0x1043af0: addiu a3, a3, -2708
 	ldloc 4
-	ldc.i4 -2704
+	ldc.i4 -2708
 	add
 	stloc 4
-// 0x01043ae4: 0x1043ae4: sw    s2, 16(sp)
+// 0x01043af4: 0x1043af4: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7838,7 +7838,7 @@ L_1043ac4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01043ae8: 0x1043ae8: jal   0x100449c addu  s5, zero, zero
+// 0x01043af8: 0x1043af8: jal   0x100449c addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -7851,8 +7851,8 @@ L_1043ac4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1043af0:
-// 0x01043af0: 0x1043af0: j	 0x1043bc0 sw    s5, 624(s0)
+L_1043b00:
+// 0x01043b00: 0x1043b00: j	 0x1043bd0 sw    s5, 624(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7861,21 +7861,21 @@ L_1043af0:
 	add
 	ldloc 10
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_1043af8:
-// 0x01043af8: 0x1043af8: addu  a1, s2, zero
+L_1043b08:
+// 0x01043b08: 0x1043b08: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x01043afc: 0x1043afc: j	 0x1043ba8 addiu a0, s0, 508
+// 0x01043b0c: 0x1043b0c: j	 0x1043bb8 addiu a0, s0, 508
 	ldloc 9
 	ldc.i4 508
 	add
 	stloc.1
-	br L_1043ba8
+	br L_1043bb8
 // --- basic block ---
-L_1043b04:
-// 0x01043b04: 0x1043b04: lw    a2, 1308(sp)
+L_1043b14:
+// 0x01043b14: 0x1043b14: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7884,7 +7884,7 @@ L_1043b04:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043b08: 0x1043b08: lw    a3, 284(sp)
+// 0x01043b18: 0x1043b18: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7893,15 +7893,15 @@ L_1043b04:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043b0c: 0x1043b0c: addiu s2, sp, 24
+// 0x01043b1c: 0x1043b1c: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01043b10: 0x1043b10: addiu a1, zero, 255
+// 0x01043b20: 0x1043b20: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01043b14: 0x1043b14: jal   0x1042744 addu  a0, s2, zero
+// 0x01043b24: 0x1043b24: jal   0x1042754 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7909,12 +7909,12 @@ L_1043b04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043b1c: 0x1043b1c: jal   0x101cd60 addu  a0, s2, zero
+// 0x01043b2c: 0x1043b2c: jal   0x101cd70 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7922,12 +7922,12 @@ L_1043b04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043b24: 0x1043b24: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01043b34: 0x1043b34: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7940,7 +7940,7 @@ L_1043b04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043b2c: 0x1043b2c: j	 0x1043bc0 sw    v0, 520(s0)
+// 0x01043b3c: 0x1043b3c: j	 0x1043bd0 sw    v0, 520(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7949,53 +7949,53 @@ L_1043b04:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_1043b34:
-// 0x01043b34: 0x1043b34: addu  a1, s2, zero
+L_1043b44:
+// 0x01043b44: 0x1043b44: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x01043b38: 0x1043b38: j	 0x1043ba8 addiu a0, s0, 512
+// 0x01043b48: 0x1043b48: j	 0x1043bb8 addiu a0, s0, 512
 	ldloc 9
 	ldc.i4 512
 	add
 	stloc.1
-	br L_1043ba8
+	br L_1043bb8
 // --- basic block ---
-L_1043b40:
-// 0x01043b40: 0x1043b40: addiu v0, zero, 2
+L_1043b50:
+// 0x01043b50: 0x1043b50: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01043b44: 0x1043b44: beq   s2, v0, 0x1043b70 lui   a3, 0x10000
+// 0x01043b54: 0x1043b54: beq   s2, v0, 0x1043b80 lui   a3, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_1043b70
+	beq  L_1043b80
 // --- basic block ---
-// 0x01043b4c: 0x1043b4c: lw    v0, 0(s0)
+// 0x01043b5c: 0x1043b5c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01043b50: 0x1043b50: addiu a0, zero, 4
+// 0x01043b60: 0x1043b60: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043b54: 0x1043b54: addu  a1, s3, zero
+// 0x01043b64: 0x1043b64: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-// 0x01043b58: 0x1043b58: addiu a2, zero, 342
+// 0x01043b68: 0x1043b68: addiu a2, zero, 342
 	ldc.i4 342
 	stloc.3
-// 0x01043b5c: 0x1043b5c: addiu a3, a3, -2672
+// 0x01043b6c: 0x1043b6c: addiu a3, a3, -2676
 	ldloc 4
-	ldc.i4 -2672
+	ldc.i4 -2676
 	add
 	stloc 4
-L_1043b60:
-// 0x01043b60: 0x1043b60: jal   0x100449c sw    v0, 16(sp)
+L_1043b70:
+// 0x01043b70: 0x1043b70: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8014,11 +8014,11 @@ L_1043b60:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043b68: 0x1043b68: j	 0x1043bc0 sll   zero, zero, 0
-	br L_1043bc0
+// 0x01043b78: 0x1043b78: j	 0x1043bd0 sll   zero, zero, 0
+	br L_1043bd0
 // --- basic block ---
-L_1043b70:
-// 0x01043b70: 0x1043b70: lw    a2, 1308(sp)
+L_1043b80:
+// 0x01043b80: 0x1043b80: lw    a2, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8027,7 +8027,7 @@ L_1043b70:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01043b74: 0x1043b74: lw    a3, 284(sp)
+// 0x01043b84: 0x1043b84: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8036,12 +8036,12 @@ L_1043b70:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01043b78: 0x1043b78: addiu a0, sp, 24
+// 0x01043b88: 0x1043b88: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x01043b7c: 0x1043b7c: jal   0x1042744 addiu a1, zero, 255
+// 0x01043b8c: 0x1043b8c: jal   0x1042754 addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
 	ldloc.0
@@ -8049,12 +8049,12 @@ L_1043b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_arg_1042744(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_arg_1042754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043b84: 0x1043b84: lw    a0, 1308(sp)
+// 0x01043b94: 0x1043b94: lw    a0, 1308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8063,7 +8063,7 @@ L_1043b70:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043b88: 0x1043b88: lw    a1, 284(sp)
+// 0x01043b98: 0x1043b98: lw    a1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8072,18 +8072,18 @@ L_1043b70:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01043b8c: 0x1043b8c: jal   0x1042818 sll   zero, zero, 0
+// 0x01043b9c: 0x1043b9c: jal   0x1042828 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_object_string_1042818(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_object_string_1042828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043b94: 0x1043b94: j	 0x1043bc0 sw    v0, 516(s0)
+// 0x01043ba4: 0x1043ba4: j	 0x1043bd0 sw    v0, 516(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8092,27 +8092,27 @@ L_1043b70:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1043bc0
+	br L_1043bd0
 // --- basic block ---
-L_1043b9c:
-// 0x01043b9c: 0x1043b9c: lui   a0, 0x60000
+L_1043bac:
+// 0x01043bac: 0x1043bac: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01043ba0: 0x1043ba0: addu  a1, s2, zero
+// 0x01043bb0: 0x1043bb0: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x01043ba4: 0x1043ba4: addiu a0, a0, 12740
+// 0x01043bb4: 0x1043bb4: addiu a0, a0, 13204
 	ldloc.1
-	ldc.i4 12740
+	ldc.i4 13204
 	add
 	stloc.1
-L_1043ba8:
-// 0x01043ba8: 0x1043ba8: addiu a2, sp, 1304
+L_1043bb8:
+// 0x01043bb8: 0x1043bb8: addiu a2, sp, 1304
 	ldloc.0
 	ldc.i4 1304
 	add
 	stloc.3
-// 0x01043bac: 0x1043bac: jal   0x1042798 addiu a3, sp, 280
+// 0x01043bbc: 0x1043bbc: jal   0x10427a8 addiu a3, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
@@ -8122,51 +8122,51 @@ L_1043ba8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::roadmap_bar_decode_integer_1042798(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::roadmap_bar_decode_integer_10427a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043bb4: 0x1043bb4: j	 0x1043bc0 sll   zero, zero, 0
-	br L_1043bc0
+// 0x01043bc4: 0x1043bc4: j	 0x1043bd0 sll   zero, zero, 0
+	br L_1043bd0
 // --- basic block ---
-L_1043bbc:
-// 0x01043bbc: 0x1043bbc: addiu s1, s1, 1
+L_1043bcc:
+// 0x01043bcc: 0x1043bcc: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1043bc0:
-// 0x01043bc0: 0x1043bc0: beq   s1, s4, 0x1043be4 sll   zero, zero, 0
+L_1043bd0:
+// 0x01043bd0: 0x1043bd0: beq   s1, s4, 0x1043bf4 sll   zero, zero, 0
 	ldloc 11
 	ldloc 13
-	beq  L_1043be4
+	beq  L_1043bf4
 // --- basic block ---
-// 0x01043bc8: 0x1043bc8: lb    v0, 0(s1)
+// 0x01043bd8: 0x1043bd8: lb    v0, 0(s1)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01043bcc: 0x1043bcc: sll   zero, zero, 0
-// 0x01043bd0: 0x1043bd0: slti  v0, v0, 32
+// 0x01043bdc: 0x1043bdc: sll   zero, zero, 0
+// 0x01043be0: 0x1043be0: slti  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	clt
 	stloc 5
-// 0x01043bd4: 0x1043bd4: bne   v0, zero, 0x1043bbc sll   zero, zero, 0
+// 0x01043be4: 0x1043be4: bne   v0, zero, 0x1043bcc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1043bbc
+	brtrue L_1043bcc
 // --- basic block ---
-L_1043bdc:
-// 0x01043bdc: 0x1043bdc: bne   s1, s4, 0x10434a4 addiu v1, zero, 35
+L_1043bec:
+// 0x01043bec: 0x1043bec: bne   s1, s4, 0x10434b4 addiu v1, zero, 35
 	ldloc 11
 	ldloc 13
 	ldc.i4.s 35
 	stloc 7
-	bne.un L_10434a4
+	bne.un L_10434b4
 // --- basic block ---
-L_1043be4:
-// 0x01043be4: 0x1043be4: lw    ra, 2372(sp)
-// 0x01043be8: 0x1043be8: lw    s8, 2368(sp)
+L_1043bf4:
+// 0x01043bf4: 0x1043bf4: lw    ra, 2372(sp)
+// 0x01043bf8: 0x1043bf8: lw    s8, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8175,7 +8175,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01043bec: 0x1043bec: lw    s7, 2364(sp)
+// 0x01043bfc: 0x1043bfc: lw    s7, 2364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8184,7 +8184,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01043bf0: 0x1043bf0: lw    s6, 2360(sp)
+// 0x01043c00: 0x1043c00: lw    s6, 2360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8193,7 +8193,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01043bf4: 0x1043bf4: lw    s5, 2356(sp)
+// 0x01043c04: 0x1043c04: lw    s5, 2356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8202,7 +8202,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01043bf8: 0x1043bf8: lw    s4, 2352(sp)
+// 0x01043c08: 0x1043c08: lw    s4, 2352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8211,7 +8211,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01043bfc: 0x1043bfc: lw    s3, 2348(sp)
+// 0x01043c0c: 0x1043c0c: lw    s3, 2348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8220,7 +8220,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01043c00: 0x1043c00: lw    s2, 2344(sp)
+// 0x01043c10: 0x1043c10: lw    s2, 2344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8229,7 +8229,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01043c04: 0x1043c04: lw    s1, 2340(sp)
+// 0x01043c14: 0x1043c14: lw    s1, 2340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8238,7 +8238,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01043c08: 0x1043c08: lw    s0, 2336(sp)
+// 0x01043c18: 0x1043c18: lw    s0, 2336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8247,7 +8247,7 @@ L_1043be4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01043c0c: 0x1043c0c: jr    ra addiu sp, sp, 2376
+// 0x01043c1c: 0x1043c1c: jr    ra addiu sp, sp, 2376
 	ldloc.0
 	ldc.i4 2376
 	add
@@ -8257,50 +8257,50 @@ L_1043be4:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17053180
-	beq  L_10435fc
+	ldc.i4 17053196
+	beq  L_104360c
 	ldloc 5
-	ldc.i4 17053288
-	beq  L_1043668
+	ldc.i4 17053304
+	beq  L_1043678
 	ldloc 5
-	ldc.i4 17053496
-	beq  L_1043738
+	ldc.i4 17053512
+	beq  L_1043748
 	ldloc 5
-	ldc.i4 17053600
-	beq  L_10437a0
+	ldc.i4 17053616
+	beq  L_10437b0
 	ldloc 5
-	ldc.i4 17053772
-	beq  L_104384c
+	ldc.i4 17053788
+	beq  L_104385c
 	ldloc 5
-	ldc.i4 17053876
-	beq  L_10438b4
+	ldc.i4 17053892
+	beq  L_10438c4
 	ldloc 5
-	ldc.i4 17053980
-	beq  L_104391c
+	ldc.i4 17053996
+	beq  L_104392c
 	ldloc 5
-	ldc.i4 17054168
-	beq  L_10439d8
+	ldc.i4 17054184
+	beq  L_10439e8
 	ldloc 5
-	ldc.i4 17054312
-	beq  L_1043a68
+	ldc.i4 17054328
+	beq  L_1043a78
 	ldloc 5
-	ldc.i4 17054456
-	beq  L_1043af8
+	ldc.i4 17054472
+	beq  L_1043b08
 	ldloc 5
-	ldc.i4 17054468
-	beq  L_1043b04
+	ldc.i4 17054484
+	beq  L_1043b14
 	ldloc 5
-	ldc.i4 17054516
-	beq  L_1043b34
+	ldc.i4 17054532
+	beq  L_1043b44
 	ldloc 5
-	ldc.i4 17054528
-	beq  L_1043b40
+	ldc.i4 17054544
+	beq  L_1043b50
 	ldloc 5
-	ldc.i4 17054620
-	beq  L_1043b9c
+	ldc.i4 17054636
+	beq  L_1043bac
 	ldloc 5
-	ldc.i4 17054656
-	beq  L_1043bc0
+	ldc.i4 17054672
+	beq  L_1043bd0
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
diff --git a/converted/Cibyl5.j b/converted/Cibyl5.j
index 334ef7a..1399548 100644
--- a/converted/Cibyl5.j
+++ b/converted/Cibyl5.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl5::.ctor
 
-.method public static int32 roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -76,16 +76,16 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010073c4: 0x10073c4: addiu sp, sp, -24
+// 0x010073d4: 0x10073d4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010073c8: 0x10073c8: addu  a1, a0, zero
+// 0x010073d8: 0x10073d8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010073cc: 0x10073cc: sw    ra, 20(sp)
-// 0x010073d0: 0x10073d0: jal   0x10072a4 addiu a0, zero, 1
+// 0x010073dc: 0x10073dc: sw    ra, 20(sp)
+// 0x010073e0: 0x10073e0: jal   0x10072b4 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -93,14 +93,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010073d8: 0x10073d8: lw    ra, 20(sp)
-// 0x010073dc: 0x10073dc: sll   zero, zero, 0
-// 0x010073e0: 0x10073e0: jr    ra addiu sp, sp, 24
+// 0x010073e8: 0x10073e8: lw    ra, 20(sp)
+// 0x010073ec: 0x10073ec: sll   zero, zero, 0
+// 0x010073f0: 0x10073f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -112,7 +112,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_math_rotate_point_10073e8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_rotate_point_10073f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 lo,int32 s0,int32 s1,int32 s2,int32 t0,int32 ra,int32 t1)
@@ -165,10 +165,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010073e8: 0x10073e8: lui   v0, 0x0
+// 0x010073f8: 0x10073f8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010073ec: 0x10073ec: lw    v1, 512(v0)
+// 0x010073fc: 0x10073fc: lw    v1, 512(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -177,12 +177,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010073f0: 0x10073f0: addiu sp, sp, -32
+// 0x01007400: 0x1007400: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010073f4: 0x10073f4: sw    s2, 24(sp)
+// 0x01007404: 0x1007404: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -191,7 +191,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010073f8: 0x10073f8: sw    s1, 20(sp)
+// 0x01007408: 0x1007408: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -200,7 +200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010073fc: 0x10073fc: sw    s0, 16(sp)
+// 0x0100740c: 0x100740c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -209,40 +209,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01007400: 0x1007400: sw    ra, 28(sp)
-// 0x01007404: 0x1007404: addu  s1, a2, zero
+// 0x01007410: 0x1007410: sw    ra, 28(sp)
+// 0x01007414: 0x1007414: addu  s1, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01007408: 0x1007408: addu  s0, a0, zero
+// 0x01007418: 0x1007418: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100740c: 0x100740c: beq   a2, v1, 0x1007430 addu  s2, a1, zero
+// 0x0100741c: 0x100741c: beq   a2, v1, 0x1007440 addu  s2, a1, zero
 	ldloc.3
 	ldloc 7
 	ldloc.2
 	stloc 11
-	beq  L_1007430
+	beq  L_1007440
 // --- basic block ---
-// 0x01007414: 0x1007414: lui   a1, 0x20000
+// 0x01007424: 0x1007424: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01007418: 0x1007418: lui   a2, 0x20000
+// 0x01007428: 0x1007428: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0100741c: 0x100741c: addiu a1, a1, 31220
+// 0x0100742c: 0x100742c: addiu a1, a1, 31684
 	ldloc.2
-	ldc.i4 31220
+	ldc.i4 31684
 	add
 	stloc.2
-// 0x01007420: 0x1007420: addiu a2, a2, 31216
+// 0x01007430: 0x1007430: addiu a2, a2, 31680
 	ldloc.3
-	ldc.i4 31216
+	ldc.i4 31680
 	add
 	stloc.3
-// 0x01007424: 0x1007424: addu  a0, s1, zero
+// 0x01007434: 0x1007434: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01007428: 0x1007428: jal   0x1006c08 sw    s1, 512(v0)
+// 0x01007438: 0x1007438: jal   0x1006c18 sw    s1, 512(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -255,32 +255,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_trigonometry_1006c08(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_trigonometry_1006c18(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1007430:
-// 0x01007430: 0x1007430: lui   v0, 0x20000
+L_1007440:
+// 0x01007440: 0x1007440: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01007434: 0x1007434: lw    v1, 31216(v0)
+// 0x01007444: 0x1007444: lw    v1, 31680(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7804
+	ldc.i4 7920
 	add
 	ldelem.i4
 	stloc 7
-// 0x01007438: 0x1007438: lw    a0, 0(s0)
+// 0x01007448: 0x1007448: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100743c: 0x100743c: lw    a2, 4(s0)
+// 0x0100744c: 0x100744c: lw    a2, 4(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -289,29 +289,29 @@ L_1007430:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007440: 0x1007440: mult  v1, a0
+// 0x01007450: 0x1007450: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 8
-// 0x01007444: 0x1007444: lui   v0, 0x20000
+// 0x01007454: 0x1007454: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01007448: 0x1007448: lw    a1, 31220(v0)
+// 0x01007458: 0x1007458: lw    a1, 31684(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7805
+	ldc.i4 7921
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100744c: 0x100744c: ori   v0, zero, 32768
+// 0x0100745c: 0x100745c: ori   v0, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 6
-// 0x01007450: 0x1007450: lw    a3, 4(s2)
+// 0x01007460: 0x1007460: lw    a3, 4(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -320,98 +320,98 @@ L_1007430:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01007454: 0x1007454: lw    t0, 0(s2)
+// 0x01007464: 0x1007464: lw    t0, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x01007458: 0x1007458: mflo  lo
+// 0x01007468: 0x1007468: mflo  lo
 	ldloc 8
 	stloc 14
-// 0x0100745c: 0x100745c: sll   zero, zero, 0
-// 0x01007460: 0x1007460: sll   zero, zero, 0
-// 0x01007464: 0x1007464: mult  v1, a2
+// 0x0100746c: 0x100746c: sll   zero, zero, 0
+// 0x01007470: 0x1007470: sll   zero, zero, 0
+// 0x01007474: 0x1007474: mult  v1, a2
 	ldloc 7
 	ldloc.3
 	mul
 	stloc 8
-// 0x01007468: 0x1007468: mflo  lo
+// 0x01007478: 0x1007478: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0100746c: 0x100746c: addiu v1, v1, 16383
+// 0x0100747c: 0x100747c: addiu v1, v1, 16383
 	ldloc 7
 	ldc.i4 16383
 	add
 	stloc 7
-// 0x01007470: 0x1007470: sll   zero, zero, 0
-// 0x01007474: 0x1007474: mult  a1, a2
+// 0x01007480: 0x1007480: sll   zero, zero, 0
+// 0x01007484: 0x1007484: mult  a1, a2
 	ldloc.2
 	ldloc.3
 	mul
 	stloc 8
-// 0x01007478: 0x1007478: mflo  lo
+// 0x01007488: 0x1007488: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x0100747c: 0x100747c: addu  a2, t1, a2
+// 0x0100748c: 0x100748c: addu  a2, t1, a2
 	ldloc 14
 	ldloc.3
 	add
 	stloc.3
-// 0x01007480: 0x1007480: addiu a2, a2, 16383
+// 0x01007490: 0x1007490: addiu a2, a2, 16383
 	ldloc.3
 	ldc.i4 16383
 	add
 	stloc.3
-// 0x01007484: 0x1007484: mult  a1, a0
+// 0x01007494: 0x1007494: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 8
-// 0x01007488: 0x1007488: mflo  lo
+// 0x01007498: 0x1007498: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x0100748c: 0x100748c: subu  v1, v1, a1
+// 0x0100749c: 0x100749c: subu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	sub
 	stloc 7
-// 0x01007490: 0x1007490: sll   zero, zero, 0
-// 0x01007494: 0x1007494: div   a2, v0
+// 0x010074a0: 0x10074a0: sll   zero, zero, 0
+// 0x010074a4: 0x10074a4: div   a2, v0
 	ldloc.3
 	ldloc 6
 	div
 	stloc 8
-// 0x01007498: 0x1007498: mflo  lo
+// 0x010074a8: 0x10074a8: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x0100749c: 0x100749c: addu  t0, a0, t0
+// 0x010074ac: 0x10074ac: addu  t0, a0, t0
 	ldloc.1
 	ldloc 12
 	add
 	stloc 12
-// 0x010074a0: 0x10074a0: sw    t0, 0(s0)
+// 0x010074b0: 0x10074b0: sw    t0, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x010074a4: 0x10074a4: div   v1, v0
+// 0x010074b4: 0x10074b4: div   v1, v0
 	ldloc 7
 	ldloc 6
 	div
 	stloc 8
-// 0x010074a8: 0x10074a8: mflo  lo
+// 0x010074b8: 0x10074b8: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x010074ac: 0x10074ac: subu  a3, a3, v0
+// 0x010074bc: 0x10074bc: subu  a3, a3, v0
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 4
-// 0x010074b0: 0x10074b0: beq   s1, zero, 0x10074d4 sw    a3, 4(s0)
+// 0x010074c0: 0x10074c0: beq   s1, zero, 0x10074e4 sw    a3, 4(s0)
 	ldloc 10
 	ldloc 5
 	ldloc 9
@@ -421,40 +421,40 @@ L_1007430:
 	add
 	ldloc 4
 	stelem.i4
-	brfalse L_10074d4
+	brfalse L_10074e4
 // --- basic block ---
-// 0x010074b8: 0x10074b8: lui   v0, 0xe0000
+// 0x010074c8: 0x10074c8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010074bc: 0x10074bc: lw    v0, 29724(v0)
+// 0x010074cc: 0x10074cc: lw    v0, 30188(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7431
+	ldc.i4 7547
 	add
 	ldelem.i4
 	stloc 6
-// 0x010074c0: 0x10074c0: sll   zero, zero, 0
-// 0x010074c4: 0x10074c4: beq   v0, zero, 0x10074d4 sll   zero, zero, 0
+// 0x010074d0: 0x10074d0: sll   zero, zero, 0
+// 0x010074d4: 0x10074d4: beq   v0, zero, 0x10074e4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10074d4
+	brfalse L_10074e4
 // --- basic block ---
-// 0x010074cc: 0x10074cc: jal   0x1006e84 addu  a0, s0, zero
+// 0x010074dc: 0x10074dc: jal   0x1006e94 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_project_1006e84(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_project_1006e94(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10074d4:
-// 0x010074d4: 0x10074d4: lw    ra, 28(sp)
-// 0x010074d8: 0x10074d8: lw    s2, 24(sp)
+L_10074e4:
+// 0x010074e4: 0x10074e4: lw    ra, 28(sp)
+// 0x010074e8: 0x10074e8: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -463,7 +463,7 @@ L_10074d4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010074dc: 0x10074dc: lw    s1, 20(sp)
+// 0x010074ec: 0x10074ec: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -472,7 +472,7 @@ L_10074d4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010074e0: 0x10074e0: lw    s0, 16(sp)
+// 0x010074f0: 0x10074f0: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -481,7 +481,7 @@ L_10074d4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010074e4: 0x10074e4: jr    ra addiu sp, sp, 32
+// 0x010074f4: 0x10074f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -493,7 +493,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_math_rotate_object_10074ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_rotate_object_10074fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 lo,int32 v0,int32 t1,int32 s1,int32 t0,int32 s0,int32 hi,int32 v1,int32 s3,int32 s2,int32 ra,int32 t2)
@@ -555,20 +555,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010074ec: 0x10074ec: lui   v0, 0xe0000
+// 0x010074fc: 0x10074fc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010074f0: 0x10074f0: addiu sp, sp, -48
+// 0x01007500: 0x1007500: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010074f4: 0x10074f4: addiu v0, v0, 29604
+// 0x01007504: 0x1007504: addiu v0, v0, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x010074f8: 0x10074f8: sw    s1, 32(sp)
+// 0x01007508: 0x1007508: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -577,7 +577,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010074fc: 0x10074fc: lw    s1, 104(v0)
+// 0x0100750c: 0x100750c: lw    s1, 104(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -586,15 +586,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01007500: 0x1007500: addiu v1, zero, 360
+// 0x01007510: 0x1007510: addiu v1, zero, 360
 	ldc.i4 360
 	stloc 13
-// 0x01007504: 0x1007504: addu  s1, a3, s1
+// 0x01007514: 0x1007514: addu  s1, a3, s1
 	ldloc 4
 	ldloc 9
 	add
 	stloc 9
-// 0x01007508: 0x1007508: div   s1, v1
+// 0x01007518: 0x1007518: div   s1, v1
 	ldloc 9
 	ldloc 13
 	ldloc 9
@@ -603,7 +603,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	rem
 	stloc 12
-// 0x0100750c: 0x100750c: sw    s3, 40(sp)
+// 0x0100751c: 0x100751c: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -612,7 +612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01007510: 0x1007510: sw    s2, 36(sp)
+// 0x01007520: 0x1007520: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -621,7 +621,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01007514: 0x1007514: sw    s0, 28(sp)
+// 0x01007524: 0x1007524: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -630,17 +630,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01007518: 0x1007518: sw    ra, 44(sp)
-// 0x0100751c: 0x100751c: addu  s3, a0, zero
+// 0x01007528: 0x1007528: sw    ra, 44(sp)
+// 0x0100752c: 0x100752c: addu  s3, a0, zero
 	ldloc.1
 	stloc 14
-// 0x01007520: 0x1007520: addu  s0, a1, zero
+// 0x01007530: 0x1007530: addu  s0, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01007524: 0x1007524: addu  s2, a2, zero
+// 0x01007534: 0x1007534: addu  s2, a2, zero
 	ldloc.3
 	stloc 15
-// 0x01007528: 0x1007528: sw    zero, 16(sp)
+// 0x01007538: 0x1007538: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -649,10 +649,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100752c: 0x100752c: mfhi  hi
+// 0x0100753c: 0x100753c: mfhi  hi
 	ldloc 12
 	stloc 9
-// 0x01007530: 0x1007530: bne   s1, zero, 0x1007550 sw    zero, 20(sp)
+// 0x01007540: 0x1007540: bne   s1, zero, 0x1007560 sw    zero, 20(sp)
 	ldloc 9
 	ldloc 5
 	ldloc.0
@@ -662,9 +662,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_1007550
+	brtrue L_1007560
 // --- basic block ---
-// 0x01007538: 0x1007538: lw    v0, 120(v0)
+// 0x01007548: 0x1007548: lw    v0, 120(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -673,24 +673,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100753c: 0x100753c: sll   zero, zero, 0
-// 0x01007540: 0x1007540: bne   v0, zero, 0x1007560 sll   zero, zero, 0
+// 0x0100754c: 0x100754c: sll   zero, zero, 0
+// 0x01007550: 0x1007550: bne   v0, zero, 0x1007570 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1007560
+	brtrue L_1007570
 // --- basic block ---
-// 0x01007548: 0x1007548: j	 0x1007604 sll   zero, zero, 0
-	br L_1007604
+// 0x01007558: 0x1007558: j	 0x1007614 sll   zero, zero, 0
+	br L_1007614
 // --- basic block ---
-L_1007550:
-// 0x01007550: 0x1007550: addu  a0, s1, zero
+L_1007560:
+// 0x01007560: 0x1007560: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01007554: 0x1007554: addiu a1, sp, 16
+// 0x01007564: 0x1007564: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01007558: 0x1007558: jal   0x1006c08 addiu a2, sp, 20
+// 0x01007568: 0x1007568: jal   0x1006c18 addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
@@ -699,13 +699,13 @@ L_1007550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_trigonometry_1006c08(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_trigonometry_1006c18(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 7
 // --- basic block ---
-L_1007560:
-// 0x01007560: 0x1007560: lw    a0, 20(sp)
+L_1007570:
+// 0x01007570: 0x1007570: lw    a0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -714,7 +714,7 @@ L_1007560:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007564: 0x1007564: lw    v1, 16(sp)
+// 0x01007574: 0x1007574: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -723,33 +723,33 @@ L_1007560:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01007568: 0x1007568: j	 0x10075fc ori   v0, zero, 32768
+// 0x01007578: 0x1007578: j	 0x100760c ori   v0, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 7
-	br L_10075fc
+	br L_100760c
 // --- basic block ---
-L_1007570:
-// 0x01007570: 0x1007570: beq   s1, zero, 0x10075f4 sll   zero, zero, 0
+L_1007580:
+// 0x01007580: 0x1007580: beq   s1, zero, 0x1007604 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10075f4
+	brfalse L_1007604
 // --- basic block ---
-// 0x01007578: 0x1007578: lw    a2, 0(s2)
+// 0x01007588: 0x1007588: lw    a2, 0(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100757c: 0x100757c: lw    t0, 0(s0)
+// 0x0100758c: 0x100758c: lw    t0, 0(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01007580: 0x1007580: lw    a1, 4(s2)
+// 0x01007590: 0x1007590: lw    a1, 4(s2)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -758,17 +758,17 @@ L_1007570:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007584: 0x1007584: subu  t0, t0, a2
+// 0x01007594: 0x1007594: subu  t0, t0, a2
 	ldloc 10
 	ldloc.3
 	sub
 	stloc 10
-// 0x01007588: 0x1007588: mult  t0, a0
+// 0x01007598: 0x1007598: mult  t0, a0
 	ldloc 10
 	ldloc.1
 	mul
 	stloc 6
-// 0x0100758c: 0x100758c: lw    t1, 4(s0)
+// 0x0100759c: 0x100759c: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -777,64 +777,64 @@ L_1007570:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007590: 0x1007590: sll   zero, zero, 0
-// 0x01007594: 0x1007594: subu  t1, a1, t1
+// 0x010075a0: 0x10075a0: sll   zero, zero, 0
+// 0x010075a4: 0x10075a4: subu  t1, a1, t1
 	ldloc.2
 	ldloc 8
 	sub
 	stloc 8
-// 0x01007598: 0x1007598: mflo  lo
+// 0x010075a8: 0x10075a8: mflo  lo
 	ldloc 6
 	stloc 17
-// 0x0100759c: 0x100759c: sll   zero, zero, 0
-// 0x010075a0: 0x10075a0: sll   zero, zero, 0
-// 0x010075a4: 0x10075a4: mult  t1, a0
+// 0x010075ac: 0x10075ac: sll   zero, zero, 0
+// 0x010075b0: 0x10075b0: sll   zero, zero, 0
+// 0x010075b4: 0x10075b4: mult  t1, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 6
-// 0x010075a8: 0x10075a8: mflo  lo
+// 0x010075b8: 0x10075b8: mflo  lo
 	ldloc 6
 	stloc 4
-// 0x010075ac: 0x10075ac: addiu a3, a3, 16383
+// 0x010075bc: 0x10075bc: addiu a3, a3, 16383
 	ldloc 4
 	ldc.i4 16383
 	add
 	stloc 4
-// 0x010075b0: 0x10075b0: sll   zero, zero, 0
-// 0x010075b4: 0x10075b4: mult  t1, v1
+// 0x010075c0: 0x10075c0: sll   zero, zero, 0
+// 0x010075c4: 0x10075c4: mult  t1, v1
 	ldloc 8
 	ldloc 13
 	mul
 	stloc 6
-// 0x010075b8: 0x10075b8: mflo  lo
+// 0x010075c8: 0x10075c8: mflo  lo
 	ldloc 6
 	stloc 8
-// 0x010075bc: 0x10075bc: addu  t1, t2, t1
+// 0x010075cc: 0x10075cc: addu  t1, t2, t1
 	ldloc 17
 	ldloc 8
 	add
 	stloc 8
-// 0x010075c0: 0x10075c0: addiu t1, t1, 16383
+// 0x010075d0: 0x10075d0: addiu t1, t1, 16383
 	ldloc 8
 	ldc.i4 16383
 	add
 	stloc 8
-// 0x010075c4: 0x10075c4: mult  t0, v1
+// 0x010075d4: 0x10075d4: mult  t0, v1
 	ldloc 10
 	ldloc 13
 	mul
 	stloc 6
-// 0x010075c8: 0x10075c8: mflo  lo
+// 0x010075d8: 0x10075d8: mflo  lo
 	ldloc 6
 	stloc 10
-// 0x010075cc: 0x10075cc: subu  a3, a3, t0
+// 0x010075dc: 0x10075dc: subu  a3, a3, t0
 	ldloc 4
 	ldloc 10
 	sub
 	stloc 4
-// 0x010075d0: 0x10075d0: sll   zero, zero, 0
-// 0x010075d4: 0x10075d4: div   t1, v0
+// 0x010075e0: 0x10075e0: sll   zero, zero, 0
+// 0x010075e4: 0x10075e4: div   t1, v0
 	ldloc 8
 	ldloc 7
 	ldloc 8
@@ -843,22 +843,22 @@ L_1007570:
 	stloc 6
 	rem
 	stloc 12
-// 0x010075d8: 0x10075d8: mflo  lo
+// 0x010075e8: 0x10075e8: mflo  lo
 	ldloc 6
 	stloc 10
-// 0x010075dc: 0x10075dc: addu  a2, t0, a2
+// 0x010075ec: 0x10075ec: addu  a2, t0, a2
 	ldloc 10
 	ldloc.3
 	add
 	stloc.3
-// 0x010075e0: 0x10075e0: sw    a2, 0(s0)
+// 0x010075f0: 0x10075f0: sw    a2, 0(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x010075e4: 0x10075e4: div   a3, v0
+// 0x010075f4: 0x10075f4: div   a3, v0
 	ldloc 4
 	ldloc 7
 	ldloc 4
@@ -867,15 +867,15 @@ L_1007570:
 	stloc 6
 	rem
 	stloc 12
-// 0x010075e8: 0x10075e8: mflo  lo
+// 0x010075f8: 0x10075f8: mflo  lo
 	ldloc 6
 	stloc 4
-// 0x010075ec: 0x10075ec: subu  a1, a1, a3
+// 0x010075fc: 0x10075fc: subu  a1, a1, a3
 	ldloc.2
 	ldloc 4
 	sub
 	stloc.2
-// 0x010075f0: 0x10075f0: sw    a1, 4(s0)
+// 0x01007600: 0x1007600: sw    a1, 4(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -884,26 +884,26 @@ L_1007570:
 	add
 	ldloc.2
 	stelem.i4
-L_10075f4:
-// 0x010075f4: 0x10075f4: addiu s0, s0, 8
+L_1007604:
+// 0x01007604: 0x1007604: addiu s0, s0, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 11
-// 0x010075f8: 0x10075f8: addiu s3, s3, -1
+// 0x01007608: 0x1007608: addiu s3, s3, -1
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 14
-L_10075fc:
-// 0x010075fc: 0x10075fc: bgtz  s3, 0x1007570 sll   zero, zero, 0
+L_100760c:
+// 0x0100760c: 0x100760c: bgtz  s3, 0x1007580 sll   zero, zero, 0
 	ldloc 14
 	ldc.i4.s 0
-	bgt L_1007570
+	bgt L_1007580
 // --- basic block ---
-L_1007604:
-// 0x01007604: 0x1007604: lw    ra, 44(sp)
-// 0x01007608: 0x1007608: lw    s3, 40(sp)
+L_1007614:
+// 0x01007614: 0x1007614: lw    ra, 44(sp)
+// 0x01007618: 0x1007618: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -912,7 +912,7 @@ L_1007604:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100760c: 0x100760c: lw    s2, 36(sp)
+// 0x0100761c: 0x100761c: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -921,7 +921,7 @@ L_1007604:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01007610: 0x1007610: lw    s1, 32(sp)
+// 0x01007620: 0x1007620: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -930,7 +930,7 @@ L_1007604:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01007614: 0x1007614: lw    s0, 28(sp)
+// 0x01007624: 0x1007624: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -939,7 +939,7 @@ L_1007604:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01007618: 0x1007618: jr    ra addiu sp, sp, 48
+// 0x01007628: 0x1007628: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -951,7 +951,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_math_register_unit_change_callback_1007620(int32)
+.method public static int32 roadmap_math_register_unit_change_callback_1007630(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -974,24 +974,24 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007620: 0x1007620: lui   v1, 0x20000
+// 0x01007630: 0x1007630: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01007624: 0x1007624: lw    v0, 31212(v1)
+// 0x01007634: 0x1007634: lw    v0, 31676(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7803
+	ldc.i4 7919
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007628: 0x1007628: jr    ra sw    a0, 31212(v1)
+// 0x01007638: 0x1007638: jr    ra sw    a0, 31676(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7803
+	ldc.i4 7919
 	add
 	ldloc.0
 	stelem.i4
@@ -1002,7 +1002,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_math_use_metric_1007630(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_use_metric_1007640(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1037,48 +1037,48 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007630: 0x1007630: lui   v0, 0x20000
+// 0x01007640: 0x1007640: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01007634: 0x1007634: lui   a0, 0x0
+// 0x01007644: 0x1007644: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01007638: 0x1007638: lw    v0, 31212(v0)
+// 0x01007648: 0x1007648: lw    v0, 31676(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7803
+	ldc.i4 7919
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100763c: 0x100763c: addiu sp, sp, -24
+// 0x0100764c: 0x100764c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01007640: 0x1007640: addiu a0, a0, 388
+// 0x01007650: 0x1007650: addiu a0, a0, 388
 	ldloc.1
 	ldc.i4 388
 	add
 	stloc.1
-// 0x01007644: 0x1007644: lui   v1, 0xe0000
+// 0x01007654: 0x1007654: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01007648: 0x1007648: sw    ra, 20(sp)
-// 0x0100764c: 0x100764c: beq   v0, zero, 0x100765c sw    a0, 29720(v1)
+// 0x01007658: 0x1007658: sw    ra, 20(sp)
+// 0x0100765c: 0x100765c: beq   v0, zero, 0x100766c sw    a0, 30184(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_100765c
+	brfalse L_100766c
 // --- basic block ---
-// 0x01007654: 0x1007654: jalr  v0 sll   zero, zero, 0
+// 0x01007664: 0x1007664: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1090,10 +1090,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100765c:
-// 0x0100765c: 0x100765c: lw    ra, 20(sp)
-// 0x01007660: 0x1007660: sll   zero, zero, 0
-// 0x01007664: 0x1007664: jr    ra addiu sp, sp, 24
+L_100766c:
+// 0x0100766c: 0x100766c: lw    ra, 20(sp)
+// 0x01007670: 0x1007670: sll   zero, zero, 0
+// 0x01007674: 0x1007674: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1105,7 +1105,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_use_imperial_100766c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_use_imperial_100767c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1140,48 +1140,48 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100766c: 0x100766c: lui   v0, 0x20000
+// 0x0100767c: 0x100767c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01007670: 0x1007670: lui   a0, 0x0
+// 0x01007680: 0x1007680: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01007674: 0x1007674: lw    v0, 31212(v0)
+// 0x01007684: 0x1007684: lw    v0, 31676(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7803
+	ldc.i4 7919
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007678: 0x1007678: addiu sp, sp, -24
+// 0x01007688: 0x1007688: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100767c: 0x100767c: addiu a0, a0, 432
+// 0x0100768c: 0x100768c: addiu a0, a0, 432
 	ldloc.1
 	ldc.i4 432
 	add
 	stloc.1
-// 0x01007680: 0x1007680: lui   v1, 0xe0000
+// 0x01007690: 0x1007690: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01007684: 0x1007684: sw    ra, 20(sp)
-// 0x01007688: 0x1007688: beq   v0, zero, 0x1007698 sw    a0, 29720(v1)
+// 0x01007694: 0x1007694: sw    ra, 20(sp)
+// 0x01007698: 0x1007698: beq   v0, zero, 0x10076a8 sw    a0, 30184(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_1007698
+	brfalse L_10076a8
 // --- basic block ---
-// 0x01007690: 0x1007690: jalr  v0 sll   zero, zero, 0
+// 0x010076a0: 0x10076a0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1193,10 +1193,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1007698:
-// 0x01007698: 0x1007698: lw    ra, 20(sp)
-// 0x0100769c: 0x100769c: sll   zero, zero, 0
-// 0x010076a0: 0x10076a0: jr    ra addiu sp, sp, 24
+L_10076a8:
+// 0x010076a8: 0x10076a8: lw    ra, 20(sp)
+// 0x010076ac: 0x10076ac: sll   zero, zero, 0
+// 0x010076b0: 0x10076b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1208,7 +1208,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_set_focus_10076a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_set_focus_10076b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
@@ -1249,12 +1249,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010076a8: 0x10076a8: addiu sp, sp, -32
+// 0x010076b8: 0x10076b8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010076ac: 0x10076ac: sw    s0, 20(sp)
+// 0x010076bc: 0x10076bc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1263,15 +1263,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010076b0: 0x10076b0: lui   s0, 0xe0000
+// 0x010076c0: 0x10076c0: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x010076b4: 0x10076b4: addiu s0, s0, 29604
+// 0x010076c4: 0x10076c4: addiu s0, s0, 30068
 	ldloc 6
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 6
-// 0x010076b8: 0x10076b8: sw    s1, 24(sp)
+// 0x010076c8: 0x10076c8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1280,19 +1280,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010076bc: 0x10076bc: addu  s1, a0, zero
+// 0x010076cc: 0x10076cc: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010076c0: 0x10076c0: addu  a1, s1, zero
+// 0x010076d0: 0x10076d0: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x010076c4: 0x10076c4: addiu a0, s0, 40
+// 0x010076d4: 0x10076d4: addiu a0, s0, 40
 	ldloc 6
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010076c8: 0x10076c8: sw    ra, 28(sp)
-// 0x010076cc: 0x10076cc: jal   0x1001800 addiu a2, zero, 16
+// 0x010076d8: 0x10076d8: sw    ra, 28(sp)
+// 0x010076dc: 0x10076dc: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -1304,7 +1304,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010076d4: 0x10076d4: lw    a1, 12(s1)
+// 0x010076e4: 0x10076e4: lw    a1, 12(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1313,14 +1313,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010076d8: 0x10076d8: lw    a0, 0(s1)
+// 0x010076e8: 0x10076e8: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010076dc: 0x10076dc: lw    v1, 8(s1)
+// 0x010076ec: 0x10076ec: lw    v1, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1329,7 +1329,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010076e0: 0x10076e0: lw    v0, 4(s1)
+// 0x010076f0: 0x10076f0: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1338,28 +1338,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010076e4: 0x10076e4: lw    ra, 28(sp)
-// 0x010076e8: 0x10076e8: addiu a0, a0, 80
+// 0x010076f4: 0x10076f4: lw    ra, 28(sp)
+// 0x010076f8: 0x10076f8: addiu a0, a0, 80
 	ldloc.1
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x010076ec: 0x10076ec: addiu v1, v1, -80
+// 0x010076fc: 0x10076fc: addiu v1, v1, -80
 	ldloc 9
 	ldc.i4.s -80
 	add
 	stloc 9
-// 0x010076f0: 0x10076f0: addiu v0, v0, 80
+// 0x01007700: 0x1007700: addiu v0, v0, 80
 	ldloc 8
 	ldc.i4.s 80
 	add
 	stloc 8
-// 0x010076f4: 0x10076f4: addiu a1, a1, -80
+// 0x01007704: 0x1007704: addiu a1, a1, -80
 	ldloc.2
 	ldc.i4.s -80
 	add
 	stloc.2
-// 0x010076f8: 0x10076f8: sw    a1, 68(s0)
+// 0x01007708: 0x1007708: sw    a1, 68(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1368,7 +1368,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010076fc: 0x10076fc: sw    a0, 56(s0)
+// 0x0100770c: 0x100770c: sw    a0, 56(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1377,7 +1377,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01007700: 0x1007700: sw    v1, 64(s0)
+// 0x01007710: 0x1007710: sw    v1, 64(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1386,7 +1386,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01007704: 0x1007704: sw    v0, 60(s0)
+// 0x01007714: 0x1007714: sw    v0, 60(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1395,7 +1395,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01007708: 0x1007708: lw    s1, 24(sp)
+// 0x01007718: 0x1007718: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1404,7 +1404,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100770c: 0x100770c: lw    s0, 20(sp)
+// 0x0100771c: 0x100771c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1413,7 +1413,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01007710: 0x1007710: jr    ra addiu sp, sp, 32
+// 0x01007720: 0x1007720: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1425,7 +1425,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_math_release_focus_1007718(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_release_focus_1007728(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -1463,12 +1463,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007718: 0x1007718: addiu sp, sp, -24
+// 0x01007728: 0x1007728: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100771c: 0x100771c: sw    s0, 16(sp)
+// 0x0100772c: 0x100772c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1477,26 +1477,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01007720: 0x1007720: lui   s0, 0xe0000
+// 0x01007730: 0x1007730: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01007724: 0x1007724: addiu s0, s0, 29604
+// 0x01007734: 0x1007734: addiu s0, s0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01007728: 0x1007728: addiu a0, s0, 40
+// 0x01007738: 0x1007738: addiu a0, s0, 40
 	ldloc 5
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0100772c: 0x100772c: addiu a1, s0, 88
+// 0x0100773c: 0x100773c: addiu a1, s0, 88
 	ldloc 5
 	ldc.i4.s 88
 	add
 	stloc.2
-// 0x01007730: 0x1007730: sw    ra, 20(sp)
-// 0x01007734: 0x1007734: jal   0x1001800 addiu a2, zero, 16
+// 0x01007740: 0x1007740: sw    ra, 20(sp)
+// 0x01007744: 0x1007744: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -1508,7 +1508,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0100773c: 0x100773c: lw    a0, 40(s0)
+// 0x0100774c: 0x100774c: lw    a0, 40(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1517,7 +1517,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007740: 0x1007740: lw    v1, 48(s0)
+// 0x01007750: 0x1007750: lw    v1, 48(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1526,7 +1526,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007744: 0x1007744: lw    v0, 44(s0)
+// 0x01007754: 0x1007754: lw    v0, 44(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1535,7 +1535,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01007748: 0x1007748: lw    a1, 52(s0)
+// 0x01007758: 0x1007758: lw    a1, 52(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1544,28 +1544,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100774c: 0x100774c: lw    ra, 20(sp)
-// 0x01007750: 0x1007750: addiu a0, a0, 80
+// 0x0100775c: 0x100775c: lw    ra, 20(sp)
+// 0x01007760: 0x1007760: addiu a0, a0, 80
 	ldloc.1
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x01007754: 0x1007754: addiu v1, v1, -80
+// 0x01007764: 0x1007764: addiu v1, v1, -80
 	ldloc 8
 	ldc.i4.s -80
 	add
 	stloc 8
-// 0x01007758: 0x1007758: addiu v0, v0, 80
+// 0x01007768: 0x1007768: addiu v0, v0, 80
 	ldloc 7
 	ldc.i4.s 80
 	add
 	stloc 7
-// 0x0100775c: 0x100775c: addiu a1, a1, -80
+// 0x0100776c: 0x100776c: addiu a1, a1, -80
 	ldloc.2
 	ldc.i4.s -80
 	add
 	stloc.2
-// 0x01007760: 0x1007760: sw    a1, 68(s0)
+// 0x01007770: 0x1007770: sw    a1, 68(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1574,7 +1574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01007764: 0x1007764: sw    a0, 56(s0)
+// 0x01007774: 0x1007774: sw    a0, 56(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1583,7 +1583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01007768: 0x1007768: sw    v1, 64(s0)
+// 0x01007778: 0x1007778: sw    v1, 64(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1592,7 +1592,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100776c: 0x100776c: sw    v0, 60(s0)
+// 0x0100777c: 0x100777c: sw    v0, 60(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1601,7 +1601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01007770: 0x1007770: lw    s0, 16(sp)
+// 0x01007780: 0x1007780: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1610,7 +1610,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007774: 0x1007774: jr    ra addiu sp, sp, 24
+// 0x01007784: 0x1007784: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1622,7 +1622,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_math_thickness_100777c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_thickness_100778c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s4,int32 s2,int32 s3,int32 s6,int32 s7,int32 s5,int32 s8,int32 ra,int32 lo)
@@ -1687,15 +1687,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100777c: 0x100777c: addiu sp, sp, -56
+// 0x0100778c: 0x100778c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01007780: 0x1007780: lui   v0, 0xe0000
+// 0x01007790: 0x1007790: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01007784: 0x1007784: sw    s1, 20(sp)
+// 0x01007794: 0x1007794: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1704,16 +1704,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01007788: 0x1007788: lw    s1, 29604(v0)
+// 0x01007798: 0x1007798: lw    s1, 30068(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100778c: 0x100778c: sw    s8, 48(sp)
+// 0x0100779c: 0x100779c: sw    s8, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1722,12 +1722,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01007790: 0x1007790: slti  v1, s1, 51
+// 0x010077a0: 0x10077a0: slti  v1, s1, 51
 	ldloc 9
 	ldc.i4.s 51
 	clt
 	stloc 6
-// 0x01007794: 0x1007794: sw    s4, 32(sp)
+// 0x010077a4: 0x10077a4: sw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1736,7 +1736,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01007798: 0x1007798: sw    s3, 28(sp)
+// 0x010077a8: 0x10077a8: sw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1745,8 +1745,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100779c: 0x100779c: sw    ra, 52(sp)
-// 0x010077a0: 0x10077a0: sw    s7, 44(sp)
+// 0x010077ac: 0x10077ac: sw    ra, 52(sp)
+// 0x010077b0: 0x10077b0: sw    s7, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1755,7 +1755,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010077a4: 0x10077a4: sw    s6, 40(sp)
+// 0x010077b4: 0x10077b4: sw    s6, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1764,7 +1764,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010077a8: 0x10077a8: sw    s5, 36(sp)
+// 0x010077b8: 0x10077b8: sw    s5, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1773,7 +1773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010077ac: 0x10077ac: sw    s2, 24(sp)
+// 0x010077bc: 0x10077bc: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1782,7 +1782,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010077b0: 0x10077b0: sw    s0, 16(sp)
+// 0x010077c0: 0x10077c0: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1791,10 +1791,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010077b4: 0x10077b4: addu  s4, a0, zero
+// 0x010077c4: 0x10077c4: addu  s4, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010077b8: 0x10077b8: sw    a1, 60(sp)
+// 0x010077c8: 0x10077c8: sw    a1, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1803,21 +1803,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010077bc: 0x10077bc: addu  s3, a2, zero
+// 0x010077cc: 0x10077cc: addu  s3, a2, zero
 	ldloc.3
 	stloc 12
-// 0x010077c0: 0x10077c0: bne   v1, zero, 0x100780c addu  s8, a3, zero
+// 0x010077d0: 0x10077d0: bne   v1, zero, 0x100781c addu  s8, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 16
-	brtrue L_100780c
+	brtrue L_100781c
 // --- basic block ---
-// 0x010077c8: 0x10077c8: addiu v0, v0, 29604
+// 0x010077d8: 0x10077d8: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x010077cc: 0x10077cc: lw    v0, 120(v0)
+// 0x010077dc: 0x10077dc: lw    v0, 120(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1826,103 +1826,103 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010077d0: 0x10077d0: sll   zero, zero, 0
-// 0x010077d4: 0x10077d4: beq   v0, zero, 0x1007824 addiu v0, zero, 1
+// 0x010077e0: 0x10077e0: sll   zero, zero, 0
+// 0x010077e4: 0x10077e4: beq   v0, zero, 0x1007834 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brfalse L_1007824
+	brfalse L_1007834
 // --- basic block ---
-// 0x010077dc: 0x10077dc: j	 0x10077f0 addiu v1, zero, 3
+// 0x010077ec: 0x10077ec: j	 0x1007800 addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-	br L_10077f0
+	br L_1007800
 // --- basic block ---
-L_10077e4:
-// 0x010077e4: 0x10077e4: div   a0, v1
+L_10077f4:
+// 0x010077f4: 0x10077f4: div   a0, v1
 	ldloc.1
 	ldloc 6
 	div
 	stloc 18
-// 0x010077e8: 0x10077e8: addiu v0, v0, 1
+// 0x010077f8: 0x10077f8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010077ec: 0x10077ec: mflo  lo
+// 0x010077fc: 0x10077fc: mflo  lo
 	ldloc 18
 	stloc 9
-L_10077f0:
-// 0x010077f0: 0x10077f0: slt   a1, v0, s3
+L_1007800:
+// 0x01007800: 0x1007800: slt   a1, v0, s3
 	ldloc 5
 	ldloc 12
 	clt
 	stloc.2
-// 0x010077f4: 0x10077f4: bne   a1, zero, 0x10077e4 sll   a0, s1, 2
+// 0x01007804: 0x1007804: bne   a1, zero, 0x10077f4 sll   a0, s1, 2
 	ldloc.2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.1
-	brtrue L_10077e4
+	brtrue L_10077f4
 // --- basic block ---
-// 0x010077fc: 0x10077fc: addiu v1, zero, 6
+// 0x0100780c: 0x100780c: addiu v1, zero, 6
 	ldc.i4.6
 	stloc 6
-// 0x01007800: 0x1007800: bne   v0, v1, 0x1007810 slti  v0, s1, 15
+// 0x01007810: 0x1007810: bne   v0, v1, 0x1007820 slti  v0, s1, 15
 	ldloc 5
 	ldloc 6
 	ldloc 9
 	ldc.i4.s 15
 	clt
 	stloc 5
-	bne.un L_1007810
+	bne.un L_1007820
 // --- basic block ---
-// 0x01007808: 0x1007808: sll   s1, s1, 1
+// 0x01007818: 0x1007818: sll   s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	shl
 	stloc 9
-L_100780c:
-// 0x0100780c: 0x100780c: slti  v0, s1, 15
+L_100781c:
+// 0x0100781c: 0x100781c: slti  v0, s1, 15
 	ldloc 9
 	ldc.i4.s 15
 	clt
 	stloc 5
-L_1007810:
-// 0x01007810: 0x1007810: beq   v0, zero, 0x1007824 lui   v0, 0x20000
+L_1007820:
+// 0x01007820: 0x1007820: beq   v0, zero, 0x1007834 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_1007824
+	brfalse L_1007834
 // --- basic block ---
-// 0x01007818: 0x1007818: lw    s0, 23612(v0)
+// 0x01007828: 0x1007828: lw    s0, 24072(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5903
+	ldc.i4 6018
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100781c: 0x100781c: j	 0x100782c sll   zero, zero, 0
-	br L_100782c
+// 0x0100782c: 0x100782c: j	 0x100783c sll   zero, zero, 0
+	br L_100783c
 // --- basic block ---
-L_1007824:
-// 0x01007824: 0x1007824: lui   v0, 0x20000
+L_1007834:
+// 0x01007834: 0x1007834: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01007828: 0x1007828: lw    s0, 23616(v0)
+// 0x01007838: 0x1007838: lw    s0, 24076(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5904
+	ldc.i4 6019
 	add
 	ldelem.i4
 	stloc 8
-L_100782c:
-// 0x0100782c: 0x100782c: jal   0x10c09ac addu  a0, s4, zero
+L_100783c:
+// 0x0100783c: 0x100783c: jal   0x10c0fec addu  a0, s4, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -1930,44 +1930,44 @@ L_100782c:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01007834: 0x1007834: addu  s2, v0, zero
+// 0x01007844: 0x1007844: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01007838: 0x1007838: lui   v0, 0x20000
+// 0x01007848: 0x1007848: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100783c: 0x100783c: lw    a1, 23620(v0)
+// 0x0100784c: 0x100784c: lw    a1, 24080(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5905
+	ldc.i4 6020
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007840: 0x1007840: jal   0x10c0780 addu  a0, s2, zero
+// 0x01007850: 0x1007850: jal   0x10c0dc0 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01007848: 0x1007848: addu  a0, v0, zero
+// 0x01007858: 0x1007858: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100784c: 0x100784c: jal   0x10c0780 addu  a1, s0, zero
+// 0x0100785c: 0x100785c: jal   0x10c0dc0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01007854: 0x1007854: addu  a0, s1, zero
+// 0x01007864: 0x1007864: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01007858: 0x1007858: jal   0x10c09ac addu  s0, v0, zero
+// 0x01007868: 0x1007868: jal   0x10c0fec addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -1975,77 +1975,77 @@ L_100782c:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01007860: 0x1007860: addu  a1, v0, zero
+// 0x01007870: 0x1007870: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01007864: 0x1007864: jal   0x10c07d8 addu  a0, s0, zero
+// 0x01007874: 0x1007874: jal   0x10c0e18 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100786c: 0x100786c: addu  a0, v0, zero
+// 0x0100787c: 0x100787c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01007870: 0x1007870: jal   0x10c0874 addu  s0, v0, zero
+// 0x01007880: 0x1007880: jal   0x10c0eb4 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007878: 0x1007878: addu  a0, s4, zero
+// 0x01007888: 0x1007888: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x0100787c: 0x100787c: addu  s7, v1, zero
+// 0x0100788c: 0x100788c: addu  s7, v1, zero
 	ldloc 6
 	stloc 14
-// 0x01007880: 0x1007880: jal   0x10c09c0 addu  s6, v0, zero
+// 0x01007890: 0x1007890: jal   0x10c1000 addu  s6, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007888: 0x1007888: addu  s4, v0, zero
+// 0x01007898: 0x1007898: addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0100788c: 0x100788c: lui   v0, 0x20000
+// 0x0100789c: 0x100789c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01007890: 0x1007890: lw    a1, 23740(v0)
+// 0x010078a0: 0x10078a0: lw    a1, 24204(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5935
+	ldc.i4 6051
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007894: 0x1007894: lw    a0, 23736(v0)
+// 0x010078a4: 0x10078a4: lw    a0, 24200(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5934
+	ldc.i4 6050
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007898: 0x1007898: addu  a3, v1, zero
+// 0x010078a8: 0x10078a8: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x0100789c: 0x100789c: addu  a2, s4, zero
+// 0x010078ac: 0x10078ac: addu  a2, s4, zero
 	ldloc 10
 	stloc.3
-// 0x010078a0: 0x10078a0: jal   0x10c07f0 addu  s5, v1, zero
+// 0x010078b0: 0x10078b0: jal   0x10c0e30 addu  s5, v1, zero
 	ldloc 6
 	stloc 15
 	ldloc.0
@@ -2053,21 +2053,21 @@ L_100782c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010078a8: 0x10078a8: addu  a3, v1, zero
+// 0x010078b8: 0x10078b8: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x010078ac: 0x10078ac: addu  a1, s7, zero
+// 0x010078bc: 0x10078bc: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x010078b0: 0x10078b0: addu  a0, s6, zero
+// 0x010078c0: 0x10078c0: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010078b4: 0x10078b4: jal   0x10c188c addu  a2, v0, zero
+// 0x010078c4: 0x10078c4: jal   0x10c1ecc addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -2075,28 +2075,28 @@ L_100782c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010078bc: 0x10078bc: bltz  v0, 0x10079e4 addiu v1, zero, 1
+// 0x010078cc: 0x10078cc: bltz  v0, 0x10079f4 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
 	ldc.i4.s 0
-	blt L_10079e4
+	blt L_10079f4
 // --- basic block ---
-// 0x010078c4: 0x10078c4: addu  a1, s7, zero
+// 0x010078d4: 0x10078d4: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x010078c8: 0x10078c8: addu  a0, s6, zero
+// 0x010078d8: 0x10078d8: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010078cc: 0x10078cc: addu  a3, s5, zero
+// 0x010078dc: 0x10078dc: addu  a3, s5, zero
 	ldloc 15
 	stloc 4
-// 0x010078d0: 0x10078d0: jal   0x10c188c addu  a2, s4, zero
+// 0x010078e0: 0x10078e0: jal   0x10c1ecc addu  a2, s4, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -2104,42 +2104,42 @@ L_100782c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010078d8: 0x10078d8: bgez  v0, 0x1007998 slti  v0, s3, 2
+// 0x010078e8: 0x10078e8: bgez  v0, 0x10079a8 slti  v0, s3, 2
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	clt
 	stloc 5
 	ldc.i4.s 0
-	bge L_1007998
+	bge L_10079a8
 // --- basic block ---
-// 0x010078e0: 0x10078e0: addu  a1, s0, zero
+// 0x010078f0: 0x10078f0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010078e4: 0x10078e4: jal   0x10c0728 addu  a0, s2, zero
+// 0x010078f4: 0x10078f4: jal   0x10c0d68 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__subsf3_10c0728(int32,int32)
+	call int32 Cibyl143::__subsf3_10c0d68(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010078ec: 0x10078ec: jal   0x10c0874 addu  a0, v0, zero
+// 0x010078fc: 0x10078fc: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010078f4: 0x10078f4: lw    a0, 60(sp)
+// 0x01007904: 0x1007904: lw    a0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2148,57 +2148,57 @@ L_100782c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010078f8: 0x10078f8: addu  s4, v0, zero
+// 0x01007908: 0x1007908: addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010078fc: 0x10078fc: slti  v0, a0, 2001
+// 0x0100790c: 0x100790c: slti  v0, a0, 2001
 	ldloc.1
 	ldc.i4 2001
 	clt
 	stloc 5
-// 0x01007900: 0x1007900: bne   v0, zero, 0x100790c addu  s5, v1, zero
+// 0x01007910: 0x1007910: bne   v0, zero, 0x100791c addu  s5, v1, zero
 	ldloc 5
 	ldloc 6
 	stloc 15
-	brtrue L_100790c
+	brtrue L_100791c
 // --- basic block ---
-// 0x01007908: 0x1007908: addiu a0, zero, 2000
+// 0x01007918: 0x1007918: addiu a0, zero, 2000
 	ldc.i4 2000
 	stloc.1
-L_100790c:
-// 0x0100790c: 0x100790c: jal   0x10c09c0 sll   zero, zero, 0
+L_100791c:
+// 0x0100791c: 0x100791c: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007914: 0x1007914: lui   a0, 0x20000
+// 0x01007924: 0x1007924: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01007918: 0x1007918: lw    a3, 23748(a0)
+// 0x01007928: 0x1007928: lw    a3, 24212(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5937
+	ldc.i4 6053
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100791c: 0x100791c: lw    a2, 23744(a0)
+// 0x0100792c: 0x100792c: lw    a2, 24208(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5936
+	ldc.i4 6052
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007920: 0x1007920: addu  a1, v1, zero
+// 0x01007930: 0x1007930: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01007924: 0x1007924: jal   0x10c0798 addu  a0, v0, zero
+// 0x01007934: 0x1007934: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2206,37 +2206,37 @@ L_100790c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100792c: 0x100792c: addu  a0, s1, zero
+// 0x0100793c: 0x100793c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01007930: 0x1007930: addu  s7, v1, zero
+// 0x01007940: 0x1007940: addu  s7, v1, zero
 	ldloc 6
 	stloc 14
-// 0x01007934: 0x1007934: jal   0x10c09c0 addu  s6, v0, zero
+// 0x01007944: 0x1007944: jal   0x10c1000 addu  s6, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100793c: 0x100793c: addu  a3, v1, zero
+// 0x0100794c: 0x100794c: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01007940: 0x1007940: addu  a1, s7, zero
+// 0x01007950: 0x1007950: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x01007944: 0x1007944: addu  a0, s6, zero
+// 0x01007954: 0x1007954: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x01007948: 0x1007948: jal   0x10c07f0 addu  a2, v0, zero
+// 0x01007958: 0x1007958: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -2244,21 +2244,21 @@ L_100790c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007950: 0x1007950: addu  a3, v1, zero
+// 0x01007960: 0x1007960: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01007954: 0x1007954: addu  a2, v0, zero
+// 0x01007964: 0x1007964: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01007958: 0x1007958: addu  a1, s5, zero
+// 0x01007968: 0x1007968: addu  a1, s5, zero
 	ldloc 15
 	stloc.2
-// 0x0100795c: 0x100795c: jal   0x10c0798 addu  a0, s4, zero
+// 0x0100796c: 0x100796c: jal   0x10c0dd8 addu  a0, s4, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2266,43 +2266,43 @@ L_100790c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007964: 0x1007964: addu  a1, v1, zero
+// 0x01007974: 0x1007974: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01007968: 0x1007968: jal   0x10c0898 addu  a0, v0, zero
+// 0x01007978: 0x1007978: jal   0x10c0ed8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__truncdfsf2_10c0898(int32,int32,int32)
+	call int32 Cibyl143::__truncdfsf2_10c0ed8(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01007970: 0x1007970: addu  a0, v0, zero
+// 0x01007980: 0x1007980: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01007974: 0x1007974: jal   0x10c06d0 addu  a1, s0, zero
+// 0x01007984: 0x1007984: jal   0x10c0d10 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100797c: 0x100797c: addu  a0, v0, zero
+// 0x0100798c: 0x100798c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01007980: 0x1007980: addu  a1, s2, zero
+// 0x01007990: 0x1007990: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x01007984: 0x1007984: jal   0x10c1ad0 addu  s0, v0, zero
+// 0x01007994: 0x1007994: jal   0x10c2110 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2310,33 +2310,33 @@ L_100790c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__lesf2_10c1ad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__lesf2_10c2110(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100798c: 0x100798c: blez  v0, 0x1007998 slti  v0, s3, 2
+// 0x0100799c: 0x100799c: blez  v0, 0x10079a8 slti  v0, s3, 2
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	clt
 	stloc 5
 	ldc.i4.s 0
-	ble L_1007998
+	ble L_10079a8
 // --- basic block ---
-// 0x01007994: 0x1007994: addu  s0, s2, zero
+// 0x010079a4: 0x10079a4: addu  s0, s2, zero
 	ldloc 11
 	stloc 8
-L_1007998:
-// 0x01007998: 0x1007998: bne   v0, zero, 0x10079b8 addiu a0, s3, -1
+L_10079a8:
+// 0x010079a8: 0x10079a8: bne   v0, zero, 0x10079c8 addiu a0, s3, -1
 	ldloc 5
 	ldloc 12
 	ldc.i4.m1
 	add
 	stloc.1
-	brtrue L_10079b8
+	brtrue L_10079c8
 // --- basic block ---
-// 0x010079a0: 0x10079a0: jal   0x10c09ac sll   a0, a0, 1
+// 0x010079b0: 0x10079b0: jal   0x10c0fec sll   a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
@@ -2346,37 +2346,37 @@ L_1007998:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010079a8: 0x10079a8: addu  a1, v0, zero
+// 0x010079b8: 0x10079b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010079ac: 0x10079ac: jal   0x10c0728 addu  a0, s0, zero
+// 0x010079bc: 0x10079bc: jal   0x10c0d68 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__subsf3_10c0728(int32,int32)
+	call int32 Cibyl143::__subsf3_10c0d68(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010079b4: 0x10079b4: addu  s0, v0, zero
+// 0x010079c4: 0x10079c4: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_10079b8:
-// 0x010079b8: 0x10079b8: beq   s8, zero, 0x10079d8 lui   v0, 0x20000
+L_10079c8:
+// 0x010079c8: 0x10079c8: beq   s8, zero, 0x10079e8 lui   v0, 0x20000
 	ldloc 16
 	ldc.i4 131072
 	stloc 5
-	brfalse L_10079d8
+	brfalse L_10079e8
 // --- basic block ---
-// 0x010079c0: 0x10079c0: lw    a1, 23624(v0)
+// 0x010079d0: 0x10079d0: lw    a1, 24084(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5906
+	ldc.i4 6021
 	add
 	ldelem.i4
 	stloc.2
-// 0x010079c4: 0x10079c4: jal   0x10c1b20 addu  a0, s0, zero
+// 0x010079d4: 0x10079d4: jal   0x10c2160 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2384,29 +2384,29 @@ L_10079b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltsf2_10c1b20(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltsf2_10c2160(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010079cc: 0x10079cc: bgez  v0, 0x10079d8 lui   v0, 0x20000
+// 0x010079dc: 0x10079dc: bgez  v0, 0x10079e8 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	bge L_10079d8
+	bge L_10079e8
 // --- basic block ---
-// 0x010079d4: 0x10079d4: lw    s0, 23628(v0)
+// 0x010079e4: 0x10079e4: lw    s0, 24088(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5907
+	ldc.i4 6022
 	add
 	ldelem.i4
 	stloc 8
-L_10079d8:
-// 0x010079d8: 0x10079d8: jal   0x10c08bc addu  a0, s0, zero
+L_10079e8:
+// 0x010079e8: 0x10079e8: jal   0x10c0efc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2414,15 +2414,15 @@ L_10079d8:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x010079e0: 0x10079e0: addu  v1, v0, zero
+// 0x010079f0: 0x10079f0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_10079e4:
-// 0x010079e4: 0x10079e4: lw    ra, 52(sp)
-// 0x010079e8: 0x10079e8: addu  v0, v1, zero
+L_10079f4:
+// 0x010079f4: 0x10079f4: lw    ra, 52(sp)
+// 0x010079f8: 0x10079f8: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010079ec: 0x10079ec: lw    s8, 48(sp)
+// 0x010079fc: 0x10079fc: lw    s8, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2431,7 +2431,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010079f0: 0x10079f0: lw    s7, 44(sp)
+// 0x01007a00: 0x1007a00: lw    s7, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2440,7 +2440,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010079f4: 0x10079f4: lw    s6, 40(sp)
+// 0x01007a04: 0x1007a04: lw    s6, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2449,7 +2449,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010079f8: 0x10079f8: lw    s5, 36(sp)
+// 0x01007a08: 0x1007a08: lw    s5, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2458,7 +2458,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010079fc: 0x10079fc: lw    s4, 32(sp)
+// 0x01007a0c: 0x1007a0c: lw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2467,7 +2467,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01007a00: 0x1007a00: lw    s3, 28(sp)
+// 0x01007a10: 0x1007a10: lw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2476,7 +2476,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01007a04: 0x1007a04: lw    s2, 24(sp)
+// 0x01007a14: 0x1007a14: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2485,7 +2485,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01007a08: 0x1007a08: lw    s1, 20(sp)
+// 0x01007a18: 0x1007a18: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2494,7 +2494,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01007a0c: 0x1007a0c: lw    s0, 16(sp)
+// 0x01007a1c: 0x1007a1c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2503,7 +2503,7 @@ L_10079e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007a10: 0x1007a10: jr    ra addiu sp, sp, 56
+// 0x01007a20: 0x1007a20: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2515,7 +2515,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_normalize_orientation_1007a18(int32)
+.method public static int32 roadmap_math_normalize_orientation_1007a28(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 hi,int32 ra,int32 lo)
@@ -2544,17 +2544,17 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007a18: 0x1007a18: lw    v1, 0(a0)
+// 0x01007a28: 0x1007a28: lw    v1, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01007a1c: 0x1007a1c: addiu v0, zero, 360
+// 0x01007a2c: 0x1007a2c: addiu v0, zero, 360
 	ldc.i4 360
 	stloc.1
-// 0x01007a20: 0x1007a20: div   v1, v0
+// 0x01007a30: 0x1007a30: div   v1, v0
 	ldloc.2
 	ldloc.1
 	ldloc.2
@@ -2563,45 +2563,45 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	rem
 	stloc 4
-// 0x01007a24: 0x1007a24: mfhi  hi
+// 0x01007a34: 0x1007a34: mfhi  hi
 	ldloc 4
 	stloc.1
-// 0x01007a28: 0x1007a28: j	 0x1007a34 sw    v0, 0(a0)
+// 0x01007a38: 0x1007a38: j	 0x1007a44 sw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-	br L_1007a34
+	br L_1007a44
 // --- basic block ---
-L_1007a30:
-// 0x01007a30: 0x1007a30: sw    v1, 0(a0)
+L_1007a40:
+// 0x01007a40: 0x1007a40: sw    v1, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-L_1007a34:
-// 0x01007a34: 0x1007a34: lw    v0, 0(a0)
+L_1007a44:
+// 0x01007a44: 0x1007a44: lw    v0, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01007a38: 0x1007a38: sll   zero, zero, 0
-// 0x01007a3c: 0x1007a3c: bltz  v0, 0x1007a30 addiu v1, v0, 360
+// 0x01007a48: 0x1007a48: sll   zero, zero, 0
+// 0x01007a4c: 0x1007a4c: bltz  v0, 0x1007a40 addiu v1, v0, 360
 	ldloc.1
 	ldloc.1
 	ldc.i4 360
 	add
 	stloc.2
 	ldc.i4.s 0
-	blt L_1007a30
+	blt L_1007a40
 // --- basic block ---
-// 0x01007a44: 0x1007a44: jr    ra sll   zero, zero, 0
+// 0x01007a54: 0x1007a54: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -2609,7 +2609,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_math_get_orientation_1007a4c()
+.method public static int32 roadmap_math_get_orientation_1007a5c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2626,25 +2626,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007a4c: 0x1007a4c: lui   v0, 0xe0000
+// 0x01007a5c: 0x1007a5c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x01007a50: 0x1007a50: lw    v0, 29708(v0)
+// 0x01007a60: 0x1007a60: lw    v0, 30172(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7427
+	ldc.i4 7543
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007a54: 0x1007a54: jr    ra sll   zero, zero, 0
+// 0x01007a64: 0x1007a64: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_math_get_zoom_1007a5c()
+.method public static int32 roadmap_math_get_zoom_1007a6c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2661,25 +2661,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007a5c: 0x1007a5c: lui   v0, 0xe0000
+// 0x01007a6c: 0x1007a6c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x01007a60: 0x1007a60: lw    v0, 29604(v0)
+// 0x01007a70: 0x1007a70: lw    v0, 30068(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007a64: 0x1007a64: jr    ra sll   zero, zero, 0
+// 0x01007a74: 0x1007a74: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 lo,int32 ra)
@@ -2726,12 +2726,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007a6c: 0x1007a6c: addiu sp, sp, -48
+// 0x01007a7c: 0x1007a7c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01007a70: 0x1007a70: sw    s0, 32(sp)
+// 0x01007a80: 0x1007a80: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2740,8 +2740,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01007a74: 0x1007a74: sw    ra, 44(sp)
-// 0x01007a78: 0x1007a78: sw    s2, 40(sp)
+// 0x01007a84: 0x1007a84: sw    ra, 44(sp)
+// 0x01007a88: 0x1007a88: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2750,7 +2750,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01007a7c: 0x1007a7c: sw    s1, 36(sp)
+// 0x01007a8c: 0x1007a8c: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2759,44 +2759,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01007a80: 0x1007a80: beq   a2, zero, 0x1007ac4 addu  s0, a1, zero
+// 0x01007a90: 0x1007a90: beq   a2, zero, 0x1007ad4 addu  s0, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 9
-	brfalse L_1007ac4
+	brfalse L_1007ad4
 // --- basic block ---
-// 0x01007a88: 0x1007a88: lui   v0, 0xe0000
+// 0x01007a98: 0x1007a98: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01007a8c: 0x1007a8c: lw    v0, 29724(v0)
+// 0x01007a9c: 0x1007a9c: lw    v0, 30188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7431
+	ldc.i4 7547
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007a90: 0x1007a90: sll   zero, zero, 0
-// 0x01007a94: 0x1007a94: beq   v0, zero, 0x1007ac8 lui   v0, 0xe0000
+// 0x01007aa0: 0x1007aa0: sll   zero, zero, 0
+// 0x01007aa4: 0x1007aa4: beq   v0, zero, 0x1007ad8 lui   v0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brfalse L_1007ac8
+	brfalse L_1007ad8
 // --- basic block ---
-// 0x01007a9c: 0x1007a9c: lw    v0, 0(a0)
+// 0x01007aac: 0x1007aac: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01007aa0: 0x1007aa0: addiu s2, sp, 16
+// 0x01007ab0: 0x1007ab0: addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-// 0x01007aa4: 0x1007aa4: sw    v0, 16(sp)
+// 0x01007ab4: 0x1007ab4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2805,7 +2805,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01007aa8: 0x1007aa8: lw    v0, 4(a0)
+// 0x01007ab8: 0x1007ab8: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2814,10 +2814,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007aac: 0x1007aac: addu  a0, s2, zero
+// 0x01007abc: 0x1007abc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01007ab0: 0x1007ab0: sw    a2, 24(sp)
+// 0x01007ac0: 0x1007ac0: sw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2826,7 +2826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01007ab4: 0x1007ab4: jal   0x1006f24 sw    v0, 20(sp)
+// 0x01007ac4: 0x1007ac4: jal   0x1006f34 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2839,12 +2839,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_unproject_1006f24(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_unproject_1006f34(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01007abc: 0x1007abc: lw    a2, 24(sp)
+// 0x01007acc: 0x1007acc: lw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2853,20 +2853,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007ac0: 0x1007ac0: addu  a0, s2, zero
+// 0x01007ad0: 0x1007ad0: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-L_1007ac4:
-// 0x01007ac4: 0x1007ac4: lui   v0, 0xe0000
+L_1007ad4:
+// 0x01007ad4: 0x1007ad4: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_1007ac8:
-// 0x01007ac8: 0x1007ac8: addiu v0, v0, 29604
+L_1007ad8:
+// 0x01007ad8: 0x1007ad8: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01007acc: 0x1007acc: lw    v1, 104(v0)
+// 0x01007adc: 0x1007adc: lw    v1, 104(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2875,16 +2875,16 @@ L_1007ac8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01007ad0: 0x1007ad0: sll   zero, zero, 0
-// 0x01007ad4: 0x1007ad4: beq   v1, zero, 0x1007b1c sll   zero, zero, 0
+// 0x01007ae0: 0x1007ae0: sll   zero, zero, 0
+// 0x01007ae4: 0x1007ae4: beq   v1, zero, 0x1007b2c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1007b1c
+	brfalse L_1007b2c
 // --- basic block ---
-// 0x01007adc: 0x1007adc: beq   a2, zero, 0x1007af4 sll   zero, zero, 0
+// 0x01007aec: 0x1007aec: beq   a2, zero, 0x1007b04 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1007af4
+	brfalse L_1007b04
 // --- basic block ---
-// 0x01007ae4: 0x1007ae4: lw    v0, 120(v0)
+// 0x01007af4: 0x1007af4: lw    v0, 120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2893,25 +2893,25 @@ L_1007ac8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007ae8: 0x1007ae8: sll   zero, zero, 0
-// 0x01007aec: 0x1007aec: bne   v0, zero, 0x1007b10 addiu s1, sp, 16
+// 0x01007af8: 0x1007af8: sll   zero, zero, 0
+// 0x01007afc: 0x1007afc: bne   v0, zero, 0x1007b20 addiu s1, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-	brtrue L_1007b10
+	brtrue L_1007b20
 // --- basic block ---
-L_1007af4:
-// 0x01007af4: 0x1007af4: lw    v0, 0(a0)
+L_1007b04:
+// 0x01007b04: 0x1007b04: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01007af8: 0x1007af8: sll   zero, zero, 0
-// 0x01007afc: 0x1007afc: sw    v0, 16(sp)
+// 0x01007b08: 0x1007b08: sll   zero, zero, 0
+// 0x01007b0c: 0x1007b0c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2920,7 +2920,7 @@ L_1007af4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01007b00: 0x1007b00: lw    v0, 4(a0)
+// 0x01007b10: 0x1007b10: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2929,8 +2929,8 @@ L_1007af4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007b04: 0x1007b04: sll   zero, zero, 0
-// 0x01007b08: 0x1007b08: sw    v0, 20(sp)
+// 0x01007b14: 0x1007b14: sll   zero, zero, 0
+// 0x01007b18: 0x1007b18: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2939,44 +2939,44 @@ L_1007af4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01007b0c: 0x1007b0c: addiu s1, sp, 16
+// 0x01007b1c: 0x1007b1c: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-L_1007b10:
-// 0x01007b10: 0x1007b10: jal   0x1006df4 addu  a0, s1, zero
+L_1007b20:
+// 0x01007b20: 0x1007b20: jal   0x1006e04 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_counter_rotate_coordinate_1006df4(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_counter_rotate_coordinate_1006e04(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01007b18: 0x1007b18: addu  a0, s1, zero
+// 0x01007b28: 0x1007b28: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-L_1007b1c:
-// 0x01007b1c: 0x1007b1c: lui   v0, 0xe0000
+L_1007b2c:
+// 0x01007b2c: 0x1007b2c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01007b20: 0x1007b20: addiu v0, v0, 29604
+// 0x01007b30: 0x1007b30: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01007b24: 0x1007b24: lw    a1, 0(a0)
+// 0x01007b34: 0x1007b34: lw    a1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01007b28: 0x1007b28: lw    a2, 32(v0)
+// 0x01007b38: 0x1007b38: lw    a2, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2985,7 +2985,7 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007b2c: 0x1007b2c: lw    v1, 80(v0)
+// 0x01007b3c: 0x1007b3c: lw    v1, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2994,13 +2994,13 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01007b30: 0x1007b30: mult  a2, a1
+// 0x01007b40: 0x1007b40: mult  a2, a1
 	ldloc.3
 	ldloc.2
 	mul
 	stloc 11
-// 0x01007b34: 0x1007b34: lw    ra, 44(sp)
-// 0x01007b38: 0x1007b38: lw    s2, 40(sp)
+// 0x01007b44: 0x1007b44: lw    ra, 44(sp)
+// 0x01007b48: 0x1007b48: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3009,7 +3009,7 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01007b3c: 0x1007b3c: lw    s1, 36(sp)
+// 0x01007b4c: 0x1007b4c: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3018,22 +3018,22 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007b40: 0x1007b40: mflo  lo
+// 0x01007b50: 0x1007b50: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x01007b44: 0x1007b44: addu  v1, a1, v1
+// 0x01007b54: 0x1007b54: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x01007b48: 0x1007b48: sw    v1, 0(s0)
+// 0x01007b58: 0x1007b58: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01007b4c: 0x1007b4c: lw    v1, 4(a0)
+// 0x01007b5c: 0x1007b5c: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3042,7 +3042,7 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01007b50: 0x1007b50: lw    a0, 36(v0)
+// 0x01007b60: 0x1007b60: lw    a0, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3051,7 +3051,7 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007b54: 0x1007b54: lw    v0, 76(v0)
+// 0x01007b64: 0x1007b64: lw    v0, 76(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3060,20 +3060,20 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007b58: 0x1007b58: mult  a0, v1
+// 0x01007b68: 0x1007b68: mult  a0, v1
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 11
-// 0x01007b5c: 0x1007b5c: mflo  lo
+// 0x01007b6c: 0x1007b6c: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x01007b60: 0x1007b60: subu  v0, v0, v1
+// 0x01007b70: 0x1007b70: subu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 5
-// 0x01007b64: 0x1007b64: sw    v0, 4(s0)
+// 0x01007b74: 0x1007b74: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3082,7 +3082,7 @@ L_1007b1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01007b68: 0x1007b68: lw    s0, 32(sp)
+// 0x01007b78: 0x1007b78: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3091,7 +3091,7 @@ L_1007b1c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01007b6c: 0x1007b6c: jr    ra addiu sp, sp, 48
+// 0x01007b7c: 0x1007b7c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3103,7 +3103,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s3,int32 s2,int32 t0,int32 t1,int32 ra)
@@ -3156,12 +3156,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007b74: 0x1007b74: addiu sp, sp, -80
+// 0x01007b84: 0x1007b84: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01007b78: 0x1007b78: sw    a0, 80(sp)
+// 0x01007b88: 0x1007b88: sw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3170,12 +3170,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01007b7c: 0x1007b7c: addiu a0, sp, 80
+// 0x01007b8c: 0x1007b8c: addiu a0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x01007b80: 0x1007b80: sw    s1, 64(sp)
+// 0x01007b90: 0x1007b90: sw    s1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3184,8 +3184,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01007b84: 0x1007b84: sw    ra, 76(sp)
-// 0x01007b88: 0x1007b88: sw    s3, 72(sp)
+// 0x01007b94: 0x1007b94: sw    ra, 76(sp)
+// 0x01007b98: 0x1007b98: sw    s3, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3194,7 +3194,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01007b8c: 0x1007b8c: sw    s2, 68(sp)
+// 0x01007b9c: 0x1007b9c: sw    s2, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3203,7 +3203,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01007b90: 0x1007b90: jal   0x1007a18 sw    s0, 60(sp)
+// 0x01007ba0: 0x1007ba0: jal   0x1007a28 sw    s0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3213,24 +3213,24 @@ __CIBYL_javamethod_begin:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_normalize_orientation_1007a18(int32)
+	call int32 Cibyl5::roadmap_math_normalize_orientation_1007a28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007b98: 0x1007b98: lui   v0, 0xe0000
+// 0x01007ba8: 0x1007ba8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01007b9c: 0x1007b9c: lw    v1, 29708(v0)
+// 0x01007bac: 0x1007bac: lw    v1, 30172(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7427
+	ldc.i4 7543
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007ba0: 0x1007ba0: lw    v0, 80(sp)
+// 0x01007bb0: 0x1007bb0: lw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3239,79 +3239,79 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007ba4: 0x1007ba4: sll   zero, zero, 0
-// 0x01007ba8: 0x1007ba8: beq   v0, v1, 0x1007bd0 addu  s1, zero, zero
+// 0x01007bb4: 0x1007bb4: sll   zero, zero, 0
+// 0x01007bb8: 0x1007bb8: beq   v0, v1, 0x1007be0 addu  s1, zero, zero
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 0
 	stloc 9
-	beq  L_1007bd0
+	beq  L_1007be0
 // --- basic block ---
-// 0x01007bb0: 0x1007bb0: beq   v0, zero, 0x1007bd0 addiu s1, zero, 1
+// 0x01007bc0: 0x1007bc0: beq   v0, zero, 0x1007be0 addiu s1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 9
-	brfalse L_1007bd0
+	brfalse L_1007be0
 // --- basic block ---
-// 0x01007bb8: 0x1007bb8: subu  s1, v0, v1
+// 0x01007bc8: 0x1007bc8: subu  s1, v0, v1
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 9
-// 0x01007bbc: 0x1007bbc: sra   v1, s1, 31
+// 0x01007bcc: 0x1007bcc: sra   v1, s1, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr
 	stloc 8
-// 0x01007bc0: 0x1007bc0: xor   s1, v1, s1
+// 0x01007bd0: 0x1007bd0: xor   s1, v1, s1
 	ldloc 8
 	ldloc 9
 	xor
 	stloc 9
-// 0x01007bc4: 0x1007bc4: subu  s1, s1, v1
+// 0x01007bd4: 0x1007bd4: subu  s1, s1, v1
 	ldloc 9
 	ldloc 8
 	sub
 	stloc 9
-// 0x01007bc8: 0x1007bc8: slti  s1, s1, 3
+// 0x01007bd8: 0x1007bd8: slti  s1, s1, 3
 	ldloc 9
 	ldc.i4.3
 	clt
 	stloc 9
-// 0x01007bcc: 0x1007bcc: xori  s1, s1, 1
+// 0x01007bdc: 0x1007bdc: xori  s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	xor
 	stloc 9
-L_1007bd0:
-// 0x01007bd0: 0x1007bd0: lui   s0, 0xe0000
+L_1007be0:
+// 0x01007be0: 0x1007be0: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01007bd4: 0x1007bd4: lui   a1, 0xe0000
+// 0x01007be4: 0x1007be4: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x01007bd8: 0x1007bd8: lui   a2, 0xe0000
+// 0x01007be8: 0x1007be8: lui   a2, 0xe0000
 	ldc.i4 917504
 	stloc.3
-// 0x01007bdc: 0x1007bdc: addiu s0, s0, 29604
+// 0x01007bec: 0x1007bec: addiu s0, s0, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x01007be0: 0x1007be0: addu  a0, v0, zero
+// 0x01007bf0: 0x1007bf0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01007be4: 0x1007be4: addiu a1, a1, 29712
+// 0x01007bf4: 0x1007bf4: addiu a1, a1, 30176
 	ldloc.2
-	ldc.i4 29712
+	ldc.i4 30176
 	add
 	stloc.2
-// 0x01007be8: 0x1007be8: addiu a2, a2, 29716
+// 0x01007bf8: 0x1007bf8: addiu a2, a2, 30180
 	ldloc.3
-	ldc.i4 29716
+	ldc.i4 30180
 	add
 	stloc.3
-// 0x01007bec: 0x1007bec: jal   0x1006c08 sw    v0, 104(s0)
+// 0x01007bfc: 0x1007bfc: jal   0x1006c18 sw    v0, 104(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3324,22 +3324,22 @@ L_1007bd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_trigonometry_1006c08(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_trigonometry_1006c18(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007bf4: 0x1007bf4: addiu a0, s0, 88
+// 0x01007c04: 0x1007c04: addiu a0, s0, 88
 	ldloc 7
 	ldc.i4.s 88
 	add
 	stloc.1
-// 0x01007bf8: 0x1007bf8: addiu a1, s0, 72
+// 0x01007c08: 0x1007c08: addiu a1, s0, 72
 	ldloc 7
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x01007bfc: 0x1007bfc: jal   0x1001800 addiu a2, zero, 16
+// 0x01007c0c: 0x1007c0c: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -3351,7 +3351,7 @@ L_1007bd0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007c04: 0x1007c04: lw    v0, 104(s0)
+// 0x01007c14: 0x1007c14: lw    v0, 104(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3360,16 +3360,16 @@ L_1007bd0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007c08: 0x1007c08: sll   zero, zero, 0
-// 0x01007c0c: 0x1007c0c: bne   v0, zero, 0x1007c24 addiu s2, sp, 16
+// 0x01007c18: 0x1007c18: sll   zero, zero, 0
+// 0x01007c1c: 0x1007c1c: bne   v0, zero, 0x1007c34 addiu s2, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 11
-	brtrue L_1007c24
+	brtrue L_1007c34
 // --- basic block ---
-// 0x01007c14: 0x1007c14: lw    v0, 120(s0)
+// 0x01007c24: 0x1007c24: lw    v0, 120(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3378,37 +3378,37 @@ L_1007bd0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007c18: 0x1007c18: sll   zero, zero, 0
-// 0x01007c1c: 0x1007c1c: beq   v0, zero, 0x1007d08 lui   s0, 0xe0000
+// 0x01007c28: 0x1007c28: sll   zero, zero, 0
+// 0x01007c2c: 0x1007c2c: beq   v0, zero, 0x1007d18 lui   s0, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 7
-	brfalse L_1007d08
+	brfalse L_1007d18
 // --- basic block ---
-L_1007c24:
-// 0x01007c24: 0x1007c24: addiu s3, sp, 24
+L_1007c34:
+// 0x01007c34: 0x1007c34: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01007c28: 0x1007c28: lui   s0, 0xe0000
+// 0x01007c38: 0x1007c38: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01007c2c: 0x1007c2c: addiu s0, s0, 29604
+// 0x01007c3c: 0x1007c3c: addiu s0, s0, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x01007c30: 0x1007c30: addu  a0, s2, zero
+// 0x01007c40: 0x1007c40: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01007c34: 0x1007c34: addu  a1, s3, zero
+// 0x01007c44: 0x1007c44: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x01007c38: 0x1007c38: addiu a2, zero, 1
+// 0x01007c48: 0x1007c48: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01007c3c: 0x1007c3c: sw    zero, 16(sp)
+// 0x01007c4c: 0x1007c4c: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3417,7 +3417,7 @@ L_1007c24:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01007c40: 0x1007c40: jal   0x1007a6c sw    zero, 20(sp)
+// 0x01007c50: 0x1007c50: jal   0x1007a7c sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3431,12 +3431,12 @@ L_1007c24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007c48: 0x1007c48: lw    v0, 24(s0)
+// 0x01007c58: 0x1007c58: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3445,18 +3445,18 @@ L_1007c24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007c4c: 0x1007c4c: addu  a0, s2, zero
+// 0x01007c5c: 0x1007c5c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01007c50: 0x1007c50: addiu a1, sp, 32
+// 0x01007c60: 0x1007c60: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01007c54: 0x1007c54: addiu a2, zero, 1
+// 0x01007c64: 0x1007c64: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01007c58: 0x1007c58: jal   0x1007a6c sw    v0, 16(sp)
+// 0x01007c68: 0x1007c68: jal   0x1007a7c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3470,12 +3470,12 @@ L_1007c24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007c60: 0x1007c60: lw    v0, 28(s0)
+// 0x01007c70: 0x1007c70: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3484,18 +3484,18 @@ L_1007c24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007c64: 0x1007c64: addu  a0, s2, zero
+// 0x01007c74: 0x1007c74: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01007c68: 0x1007c68: addiu a1, sp, 40
+// 0x01007c78: 0x1007c78: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x01007c6c: 0x1007c6c: addiu a2, zero, 1
+// 0x01007c7c: 0x1007c7c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01007c70: 0x1007c70: jal   0x1007a6c sw    v0, 20(sp)
+// 0x01007c80: 0x1007c80: jal   0x1007a7c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3509,23 +3509,23 @@ L_1007c24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007c78: 0x1007c78: addu  a0, s2, zero
+// 0x01007c88: 0x1007c88: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01007c7c: 0x1007c7c: addiu a1, sp, 48
+// 0x01007c8c: 0x1007c8c: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x01007c80: 0x1007c80: addiu a2, zero, 1
+// 0x01007c90: 0x1007c90: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01007c84: 0x1007c84: jal   0x1007a6c sw    zero, 16(sp)
+// 0x01007c94: 0x1007c94: jal   0x1007a7c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3539,12 +3539,12 @@ L_1007c24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007c8c: 0x1007c8c: lw    a2, 92(s0)
+// 0x01007c9c: 0x1007c9c: lw    a2, 92(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3553,7 +3553,7 @@ L_1007c24:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007c90: 0x1007c90: lw    a1, 88(s0)
+// 0x01007ca0: 0x1007ca0: lw    a1, 88(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3562,7 +3562,7 @@ L_1007c24:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007c94: 0x1007c94: lw    a0, 96(s0)
+// 0x01007ca4: 0x1007ca4: lw    a0, 96(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3571,7 +3571,7 @@ L_1007c24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007c98: 0x1007c98: lw    v1, 100(s0)
+// 0x01007ca8: 0x1007ca8: lw    v1, 100(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3580,46 +3580,46 @@ L_1007c24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007c9c: 0x1007c9c: addiu a3, sp, 56
+// 0x01007cac: 0x1007cac: addiu a3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 4
-L_1007ca0:
-// 0x01007ca0: 0x1007ca0: lw    v0, 0(s3)
+L_1007cb0:
+// 0x01007cb0: 0x1007cb0: lw    v0, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01007ca4: 0x1007ca4: sll   zero, zero, 0
-// 0x01007ca8: 0x1007ca8: slt   t1, a1, v0
+// 0x01007cb4: 0x1007cb4: sll   zero, zero, 0
+// 0x01007cb8: 0x1007cb8: slt   t1, a1, v0
 	ldloc.2
 	ldloc 5
 	clt
 	stloc 13
-// 0x01007cac: 0x1007cac: beq   t1, zero, 0x1007cb8 slt   t0, v0, a0
+// 0x01007cbc: 0x1007cbc: beq   t1, zero, 0x1007cc8 slt   t0, v0, a0
 	ldloc 13
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 12
-	brfalse L_1007cb8
+	brfalse L_1007cc8
 // --- basic block ---
-// 0x01007cb4: 0x1007cb4: addu  a1, v0, zero
+// 0x01007cc4: 0x1007cc4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-L_1007cb8:
-// 0x01007cb8: 0x1007cb8: beq   t0, zero, 0x1007cc4 sll   zero, zero, 0
+L_1007cc8:
+// 0x01007cc8: 0x1007cc8: beq   t0, zero, 0x1007cd4 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_1007cc4
+	brfalse L_1007cd4
 // --- basic block ---
-// 0x01007cc0: 0x1007cc0: addu  a0, v0, zero
+// 0x01007cd0: 0x1007cd0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_1007cc4:
-// 0x01007cc4: 0x1007cc4: lw    v0, 4(s3)
+L_1007cd4:
+// 0x01007cd4: 0x1007cd4: lw    v0, 4(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3628,49 +3628,49 @@ L_1007cc4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007cc8: 0x1007cc8: addiu s3, s3, 8
+// 0x01007cd8: 0x1007cd8: addiu s3, s3, 8
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc 10
-// 0x01007ccc: 0x1007ccc: slt   t1, v0, v1
+// 0x01007cdc: 0x1007cdc: slt   t1, v0, v1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 13
-// 0x01007cd0: 0x1007cd0: beq   t1, zero, 0x1007cdc slt   t0, a2, v0
+// 0x01007ce0: 0x1007ce0: beq   t1, zero, 0x1007cec slt   t0, a2, v0
 	ldloc 13
 	ldloc.3
 	ldloc 5
 	clt
 	stloc 12
-	brfalse L_1007cdc
+	brfalse L_1007cec
 // --- basic block ---
-// 0x01007cd8: 0x1007cd8: addu  v1, v0, zero
+// 0x01007ce8: 0x1007ce8: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-L_1007cdc:
-// 0x01007cdc: 0x1007cdc: beq   t0, zero, 0x1007ce8 sll   zero, zero, 0
+L_1007cec:
+// 0x01007cec: 0x1007cec: beq   t0, zero, 0x1007cf8 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_1007ce8
+	brfalse L_1007cf8
 // --- basic block ---
-// 0x01007ce4: 0x1007ce4: addu  a2, v0, zero
+// 0x01007cf4: 0x1007cf4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_1007ce8:
-// 0x01007ce8: 0x1007ce8: bne   s3, a3, 0x1007ca0 lui   v0, 0xe0000
+L_1007cf8:
+// 0x01007cf8: 0x1007cf8: bne   s3, a3, 0x1007cb0 lui   v0, 0xe0000
 	ldloc 10
 	ldloc 4
 	ldc.i4 917504
 	stloc 5
-	bne.un L_1007ca0
+	bne.un L_1007cb0
 // --- basic block ---
-// 0x01007cf0: 0x1007cf0: addiu v0, v0, 29604
+// 0x01007d00: 0x1007d00: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01007cf4: 0x1007cf4: sw    a2, 92(v0)
+// 0x01007d04: 0x1007d04: sw    a2, 92(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3679,7 +3679,7 @@ L_1007ce8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01007cf8: 0x1007cf8: sw    a1, 88(v0)
+// 0x01007d08: 0x1007d08: sw    a1, 88(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3688,7 +3688,7 @@ L_1007ce8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01007cfc: 0x1007cfc: sw    a0, 96(v0)
+// 0x01007d0c: 0x1007d0c: sw    a0, 96(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3697,7 +3697,7 @@ L_1007ce8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01007d00: 0x1007d00: sw    v1, 100(v0)
+// 0x01007d10: 0x1007d10: sw    v1, 100(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3706,26 +3706,26 @@ L_1007ce8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01007d04: 0x1007d04: lui   s0, 0xe0000
+// 0x01007d14: 0x1007d14: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-L_1007d08:
-// 0x01007d08: 0x1007d08: addiu s0, s0, 29604
+L_1007d18:
+// 0x01007d18: 0x1007d18: addiu s0, s0, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-// 0x01007d0c: 0x1007d0c: addiu a0, s0, 40
+// 0x01007d1c: 0x1007d1c: addiu a0, s0, 40
 	ldloc 7
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x01007d10: 0x1007d10: addiu a1, s0, 88
+// 0x01007d20: 0x1007d20: addiu a1, s0, 88
 	ldloc 7
 	ldc.i4.s 88
 	add
 	stloc.2
-// 0x01007d14: 0x1007d14: jal   0x1001800 addiu a2, zero, 16
+// 0x01007d24: 0x1007d24: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -3737,7 +3737,7 @@ L_1007d08:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01007d1c: 0x1007d1c: lw    a0, 40(s0)
+// 0x01007d2c: 0x1007d2c: lw    a0, 40(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3746,7 +3746,7 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007d20: 0x1007d20: lw    v1, 48(s0)
+// 0x01007d30: 0x1007d30: lw    v1, 48(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3755,7 +3755,7 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007d24: 0x1007d24: lw    v0, 44(s0)
+// 0x01007d34: 0x1007d34: lw    v0, 44(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3764,7 +3764,7 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007d28: 0x1007d28: lw    a1, 52(s0)
+// 0x01007d38: 0x1007d38: lw    a1, 52(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3773,28 +3773,28 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007d2c: 0x1007d2c: lw    ra, 76(sp)
-// 0x01007d30: 0x1007d30: addiu v0, v0, 80
+// 0x01007d3c: 0x1007d3c: lw    ra, 76(sp)
+// 0x01007d40: 0x1007d40: addiu v0, v0, 80
 	ldloc 5
 	ldc.i4.s 80
 	add
 	stloc 5
-// 0x01007d34: 0x1007d34: addiu a0, a0, 80
+// 0x01007d44: 0x1007d44: addiu a0, a0, 80
 	ldloc.1
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x01007d38: 0x1007d38: addiu v1, v1, -80
+// 0x01007d48: 0x1007d48: addiu v1, v1, -80
 	ldloc 8
 	ldc.i4.s -80
 	add
 	stloc 8
-// 0x01007d3c: 0x1007d3c: addiu a1, a1, -80
+// 0x01007d4c: 0x1007d4c: addiu a1, a1, -80
 	ldloc.2
 	ldc.i4.s -80
 	add
 	stloc.2
-// 0x01007d40: 0x1007d40: sw    v0, 60(s0)
+// 0x01007d50: 0x1007d50: sw    v0, 60(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3803,7 +3803,7 @@ L_1007d08:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01007d44: 0x1007d44: sw    a1, 68(s0)
+// 0x01007d54: 0x1007d54: sw    a1, 68(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3812,10 +3812,10 @@ L_1007d08:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01007d48: 0x1007d48: addu  v0, s1, zero
+// 0x01007d58: 0x1007d58: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-// 0x01007d4c: 0x1007d4c: sw    a0, 56(s0)
+// 0x01007d5c: 0x1007d5c: sw    a0, 56(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3824,7 +3824,7 @@ L_1007d08:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01007d50: 0x1007d50: sw    v1, 64(s0)
+// 0x01007d60: 0x1007d60: sw    v1, 64(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3833,7 +3833,7 @@ L_1007d08:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01007d54: 0x1007d54: lw    s3, 72(sp)
+// 0x01007d64: 0x1007d64: lw    s3, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3842,7 +3842,7 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01007d58: 0x1007d58: lw    s2, 68(sp)
+// 0x01007d68: 0x1007d68: lw    s2, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3851,7 +3851,7 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01007d5c: 0x1007d5c: lw    s1, 64(sp)
+// 0x01007d6c: 0x1007d6c: lw    s1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3860,7 +3860,7 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01007d60: 0x1007d60: lw    s0, 60(sp)
+// 0x01007d70: 0x1007d70: lw    s0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3869,7 +3869,7 @@ L_1007d08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01007d64: 0x1007d64: jr    ra addiu sp, sp, 80
+// 0x01007d74: 0x1007d74: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -3881,7 +3881,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_distance_unit_1007d6c()
+.method public static int32 roadmap_math_distance_unit_1007d7c()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 ra)
@@ -3898,20 +3898,20 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007d6c: 0x1007d6c: lui   v0, 0xe0000
+// 0x01007d7c: 0x1007d7c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x01007d70: 0x1007d70: lw    v0, 29720(v0)
+// 0x01007d80: 0x1007d80: lw    v0, 30184(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007d74: 0x1007d74: sll   zero, zero, 0
-// 0x01007d78: 0x1007d78: lw    v0, 32(v0)
+// 0x01007d84: 0x1007d84: sll   zero, zero, 0
+// 0x01007d88: 0x1007d88: lw    v0, 32(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -3920,13 +3920,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007d7c: 0x1007d7c: jr    ra sll   zero, zero, 0
+// 0x01007d8c: 0x1007d8c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_math_trip_unit_1007d84()
+.method public static int32 roadmap_math_trip_unit_1007d94()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 ra)
@@ -3943,20 +3943,20 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007d84: 0x1007d84: lui   v0, 0xe0000
+// 0x01007d94: 0x1007d94: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x01007d88: 0x1007d88: lw    v0, 29720(v0)
+// 0x01007d98: 0x1007d98: lw    v0, 30184(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007d8c: 0x1007d8c: sll   zero, zero, 0
-// 0x01007d90: 0x1007d90: lw    v0, 36(v0)
+// 0x01007d9c: 0x1007d9c: sll   zero, zero, 0
+// 0x01007da0: 0x1007da0: lw    v0, 36(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -3965,13 +3965,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007d94: 0x1007d94: jr    ra sll   zero, zero, 0
+// 0x01007da4: 0x1007da4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_math_speed_unit_1007d9c()
+.method public static int32 roadmap_math_speed_unit_1007dac()
 {
 .maxstack 5
 .locals init (int32 v0,int32[] mem,int32 ra)
@@ -3988,20 +3988,20 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007d9c: 0x1007d9c: lui   v0, 0xe0000
+// 0x01007dac: 0x1007dac: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x01007da0: 0x1007da0: lw    v0, 29720(v0)
+// 0x01007db0: 0x1007db0: lw    v0, 30184(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007da4: 0x1007da4: sll   zero, zero, 0
-// 0x01007da8: 0x1007da8: lw    v0, 40(v0)
+// 0x01007db4: 0x1007db4: sll   zero, zero, 0
+// 0x01007db8: 0x1007db8: lw    v0, 40(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -4010,13 +4010,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01007dac: 0x1007dac: jr    ra sll   zero, zero, 0
+// 0x01007dbc: 0x1007dbc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4051,32 +4051,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007db4: 0x1007db4: addiu sp, sp, -24
+// 0x01007dc4: 0x1007dc4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01007db8: 0x1007db8: sw    ra, 20(sp)
-// 0x01007dbc: 0x1007dbc: jal   0x10c09ac sll   zero, zero, 0
+// 0x01007dc8: 0x1007dc8: sw    ra, 20(sp)
+// 0x01007dcc: 0x1007dcc: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01007dc4: 0x1007dc4: lui   v1, 0xe0000
+// 0x01007dd4: 0x1007dd4: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x01007dc8: 0x1007dc8: lw    v1, 29720(v1)
+// 0x01007dd8: 0x1007dd8: lw    v1, 30184(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 6
-// 0x01007dcc: 0x1007dcc: sll   zero, zero, 0
-// 0x01007dd0: 0x1007dd0: lw    a1, 28(v1)
+// 0x01007ddc: 0x1007ddc: sll   zero, zero, 0
+// 0x01007de0: 0x1007de0: lw    a1, 28(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4085,15 +4085,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007dd4: 0x1007dd4: jal   0x10c07d8 addu  a0, v0, zero
+// 0x01007de4: 0x1007de4: jal   0x10c0e18 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01007ddc: 0x1007ddc: jal   0x10c08bc addu  a0, v0, zero
+// 0x01007dec: 0x1007dec: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -4101,9 +4101,9 @@ __CIBYL_javamethod_begin:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01007de4: 0x1007de4: lw    ra, 20(sp)
-// 0x01007de8: 0x1007de8: sll   zero, zero, 0
-// 0x01007dec: 0x1007dec: jr    ra addiu sp, sp, 24
+// 0x01007df4: 0x1007df4: lw    ra, 20(sp)
+// 0x01007df8: 0x1007df8: sll   zero, zero, 0
+// 0x01007dfc: 0x1007dfc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4115,7 +4115,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_to_trip_distance_1007df4(int32)
+.method public static int32 roadmap_math_to_trip_distance_1007e04(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 lo,int32[] mem,int32 ra)
@@ -4138,20 +4138,20 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007df4: 0x1007df4: lui   v0, 0xe0000
+// 0x01007e04: 0x1007e04: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x01007df8: 0x1007df8: lw    v0, 29720(v0)
+// 0x01007e08: 0x1007e08: lw    v0, 30184(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007dfc: 0x1007dfc: sll   zero, zero, 0
-// 0x01007e00: 0x1007e00: lw    v0, 24(v0)
+// 0x01007e0c: 0x1007e0c: sll   zero, zero, 0
+// 0x01007e10: 0x1007e10: lw    v0, 24(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -4160,22 +4160,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007e04: 0x1007e04: sll   zero, zero, 0
-// 0x01007e08: 0x1007e08: div   a0, v0
+// 0x01007e14: 0x1007e14: sll   zero, zero, 0
+// 0x01007e18: 0x1007e18: div   a0, v0
 	ldloc.0
 	ldloc.1
 	div
 	stloc.2
-// 0x01007e0c: 0x1007e0c: mflo  lo
+// 0x01007e1c: 0x1007e1c: mflo  lo
 	ldloc.2
 	stloc.1
-// 0x01007e10: 0x1007e10: jr    ra sll   zero, zero, 0
+// 0x01007e20: 0x1007e20: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_math_to_trip_distance_tenths_1007e18(int32)
+.method public static int32 roadmap_math_to_trip_distance_tenths_1007e28(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 lo,int32 v1,int32[] mem,int32 ra)
@@ -4201,28 +4201,28 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007e18: 0x1007e18: addiu v0, zero, 10
+// 0x01007e28: 0x1007e28: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x01007e1c: 0x1007e1c: mult  a0, v0
+// 0x01007e2c: 0x1007e2c: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc.2
-// 0x01007e20: 0x1007e20: lui   v0, 0xe0000
+// 0x01007e30: 0x1007e30: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-// 0x01007e24: 0x1007e24: lw    v0, 29720(v0)
+// 0x01007e34: 0x1007e34: lw    v0, 30184(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc.1
-// 0x01007e28: 0x1007e28: sll   zero, zero, 0
-// 0x01007e2c: 0x1007e2c: lw    v1, 24(v0)
+// 0x01007e38: 0x1007e38: sll   zero, zero, 0
+// 0x01007e3c: 0x1007e3c: lw    v1, 24(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -4231,20 +4231,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007e30: 0x1007e30: mflo  lo
+// 0x01007e40: 0x1007e40: mflo  lo
 	ldloc.2
 	stloc.0
-// 0x01007e34: 0x1007e34: sll   zero, zero, 0
-// 0x01007e38: 0x1007e38: sll   zero, zero, 0
-// 0x01007e3c: 0x1007e3c: div   a0, v1
+// 0x01007e44: 0x1007e44: sll   zero, zero, 0
+// 0x01007e48: 0x1007e48: sll   zero, zero, 0
+// 0x01007e4c: 0x1007e4c: div   a0, v1
 	ldloc.0
 	ldloc.3
 	div
 	stloc.2
-// 0x01007e40: 0x1007e40: mflo  lo
+// 0x01007e50: 0x1007e50: mflo  lo
 	ldloc.2
 	stloc.1
-// 0x01007e44: 0x1007e44: jr    ra sll   zero, zero, 0
+// 0x01007e54: 0x1007e54: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -4252,7 +4252,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4287,32 +4287,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007e4c: 0x1007e4c: addiu sp, sp, -24
+// 0x01007e5c: 0x1007e5c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01007e50: 0x1007e50: sw    ra, 20(sp)
-// 0x01007e54: 0x1007e54: jal   0x10c09ac sll   zero, zero, 0
+// 0x01007e60: 0x1007e60: sw    ra, 20(sp)
+// 0x01007e64: 0x1007e64: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01007e5c: 0x1007e5c: lui   v1, 0xe0000
+// 0x01007e6c: 0x1007e6c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x01007e60: 0x1007e60: lw    v1, 29720(v1)
+// 0x01007e70: 0x1007e70: lw    v1, 30184(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 6
-// 0x01007e64: 0x1007e64: sll   zero, zero, 0
-// 0x01007e68: 0x1007e68: lw    a1, 12(v1)
+// 0x01007e74: 0x1007e74: sll   zero, zero, 0
+// 0x01007e78: 0x1007e78: lw    a1, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4321,15 +4321,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007e6c: 0x1007e6c: jal   0x10c0780 addu  a0, v0, zero
+// 0x01007e7c: 0x1007e7c: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01007e74: 0x1007e74: jal   0x10c08bc addu  a0, v0, zero
+// 0x01007e84: 0x1007e84: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -4337,9 +4337,9 @@ __CIBYL_javamethod_begin:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01007e7c: 0x1007e7c: lw    ra, 20(sp)
-// 0x01007e80: 0x1007e80: sll   zero, zero, 0
-// 0x01007e84: 0x1007e84: jr    ra addiu sp, sp, 24
+// 0x01007e8c: 0x1007e8c: lw    ra, 20(sp)
+// 0x01007e90: 0x1007e90: sll   zero, zero, 0
+// 0x01007e94: 0x1007e94: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4351,7 +4351,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_meters_p_second_to_speed_unit_1007e8c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_meters_p_second_to_speed_unit_1007e9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4386,24 +4386,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007e8c: 0x1007e8c: lui   v0, 0xe0000
+// 0x01007e9c: 0x1007e9c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01007e90: 0x1007e90: lw    v0, 29720(v0)
+// 0x01007ea0: 0x1007ea0: lw    v0, 30184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007e94: 0x1007e94: addiu sp, sp, -24
+// 0x01007ea4: 0x1007ea4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01007e98: 0x1007e98: lw    a1, 16(v0)
+// 0x01007ea8: 0x1007ea8: lw    a1, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4412,16 +4412,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007e9c: 0x1007e9c: sw    ra, 20(sp)
-// 0x01007ea0: 0x1007ea0: jal   0x10c0780 sll   zero, zero, 0
+// 0x01007eac: 0x1007eac: sw    ra, 20(sp)
+// 0x01007eb0: 0x1007eb0: jal   0x10c0dc0 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01007ea8: 0x1007ea8: lw    ra, 20(sp)
-// 0x01007eac: 0x1007eac: sll   zero, zero, 0
-// 0x01007eb0: 0x1007eb0: jr    ra addiu sp, sp, 24
+// 0x01007eb8: 0x1007eb8: lw    ra, 20(sp)
+// 0x01007ebc: 0x1007ebc: sll   zero, zero, 0
+// 0x01007ec0: 0x1007ec0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4433,7 +4433,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_to_cm_1007eb8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_to_cm_1007ec8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4474,12 +4474,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007eb8: 0x1007eb8: addiu sp, sp, -32
+// 0x01007ec8: 0x1007ec8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01007ebc: 0x1007ebc: sw    s0, 20(sp)
+// 0x01007ecc: 0x1007ecc: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4488,19 +4488,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01007ec0: 0x1007ec0: lui   s0, 0x20000
+// 0x01007ed0: 0x1007ed0: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01007ec4: 0x1007ec4: lw    v0, 31200(s0)
+// 0x01007ed4: 0x1007ed4: lw    v0, 31664(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7800
+	ldc.i4 7916
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007ec8: 0x1007ec8: sw    s1, 24(sp)
+// 0x01007ed8: 0x1007ed8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4509,34 +4509,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01007ecc: 0x1007ecc: sw    ra, 28(sp)
-// 0x01007ed0: 0x1007ed0: beq   a0, v0, 0x1007f0c addu  s1, a0, zero
+// 0x01007edc: 0x1007edc: sw    ra, 28(sp)
+// 0x01007ee0: 0x1007ee0: beq   a0, v0, 0x1007f1c addu  s1, a0, zero
 	ldloc.1
 	ldloc 5
 	ldloc.1
 	stloc 9
-	beq  L_1007f0c
+	beq  L_1007f1c
 // --- basic block ---
-// 0x01007ed8: 0x1007ed8: jal   0x10c09ac sll   zero, zero, 0
+// 0x01007ee8: 0x1007ee8: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01007ee0: 0x1007ee0: lui   v1, 0xe0000
+// 0x01007ef0: 0x1007ef0: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01007ee4: 0x1007ee4: lw    v1, 29720(v1)
+// 0x01007ef4: 0x1007ef4: lw    v1, 30184(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 7
-// 0x01007ee8: 0x1007ee8: sll   zero, zero, 0
-// 0x01007eec: 0x1007eec: lw    a1, 20(v1)
+// 0x01007ef8: 0x1007ef8: sll   zero, zero, 0
+// 0x01007efc: 0x1007efc: lw    a1, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4545,15 +4545,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007ef0: 0x1007ef0: jal   0x10c07d8 addu  a0, v0, zero
+// 0x01007f00: 0x1007f00: jal   0x10c0e18 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01007ef8: 0x1007ef8: jal   0x10c08bc addu  a0, v0, zero
+// 0x01007f08: 0x1007f08: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -4561,42 +4561,42 @@ __CIBYL_javamethod_begin:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01007f00: 0x1007f00: lui   v1, 0x20000
+// 0x01007f10: 0x1007f10: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01007f04: 0x1007f04: sw    v0, 31196(v1)
+// 0x01007f14: 0x1007f14: sw    v0, 31660(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7799
+	ldc.i4 7915
 	add
 	ldloc 5
 	stelem.i4
-// 0x01007f08: 0x1007f08: sw    s1, 31200(s0)
+// 0x01007f18: 0x1007f18: sw    s1, 31664(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7800
+	ldc.i4 7916
 	add
 	ldloc 9
 	stelem.i4
-L_1007f0c:
-// 0x01007f0c: 0x1007f0c: lw    ra, 28(sp)
-// 0x01007f10: 0x1007f10: lui   v0, 0x20000
+L_1007f1c:
+// 0x01007f1c: 0x1007f1c: lw    ra, 28(sp)
+// 0x01007f20: 0x1007f20: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01007f14: 0x1007f14: lw    v0, 31196(v0)
+// 0x01007f24: 0x1007f24: lw    v0, 31660(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7799
+	ldc.i4 7915
 	add
 	ldelem.i4
 	stloc 5
-// 0x01007f18: 0x1007f18: lw    s1, 24(sp)
+// 0x01007f28: 0x1007f28: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4605,7 +4605,7 @@ L_1007f0c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01007f1c: 0x1007f1c: lw    s0, 20(sp)
+// 0x01007f2c: 0x1007f2c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4614,7 +4614,7 @@ L_1007f0c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01007f20: 0x1007f20: jr    ra addiu sp, sp, 32
+// 0x01007f30: 0x1007f30: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4626,7 +4626,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_screen_edges_1007f28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_screen_edges_1007f38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4661,21 +4661,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007f28: 0x1007f28: lui   a1, 0xe0000
+// 0x01007f38: 0x1007f38: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x01007f2c: 0x1007f2c: addiu sp, sp, -24
+// 0x01007f3c: 0x1007f3c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01007f30: 0x1007f30: addiu a1, a1, 29692
+// 0x01007f40: 0x1007f40: addiu a1, a1, 30156
 	ldloc.2
-	ldc.i4 29692
+	ldc.i4 30156
 	add
 	stloc.2
-// 0x01007f34: 0x1007f34: sw    ra, 20(sp)
-// 0x01007f38: 0x1007f38: jal   0x1001800 addiu a2, zero, 16
+// 0x01007f44: 0x1007f44: sw    ra, 20(sp)
+// 0x01007f48: 0x1007f48: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -4687,9 +4687,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01007f40: 0x1007f40: lw    ra, 20(sp)
-// 0x01007f44: 0x1007f44: sll   zero, zero, 0
-// 0x01007f48: 0x1007f48: jr    ra addiu sp, sp, 24
+// 0x01007f50: 0x1007f50: lw    ra, 20(sp)
+// 0x01007f54: 0x1007f54: sll   zero, zero, 0
+// 0x01007f58: 0x1007f58: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4701,7 +4701,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_math_displayed_screen_edges_1007f50(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_displayed_screen_edges_1007f60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4736,21 +4736,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007f50: 0x1007f50: lui   a1, 0xe0000
+// 0x01007f60: 0x1007f60: lui   a1, 0xe0000
 	ldc.i4 917504
 	stloc.2
-// 0x01007f54: 0x1007f54: addiu sp, sp, -24
+// 0x01007f64: 0x1007f64: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01007f58: 0x1007f58: addiu a1, a1, 29692
+// 0x01007f68: 0x1007f68: addiu a1, a1, 30156
 	ldloc.2
-	ldc.i4 29692
+	ldc.i4 30156
 	add
 	stloc.2
-// 0x01007f5c: 0x1007f5c: sw    ra, 20(sp)
-// 0x01007f60: 0x1007f60: jal   0x1001800 addiu a2, zero, 16
+// 0x01007f6c: 0x1007f6c: sw    ra, 20(sp)
+// 0x01007f70: 0x1007f70: jal   0x1001800 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.1
@@ -4762,9 +4762,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01007f68: 0x1007f68: lw    ra, 20(sp)
-// 0x01007f6c: 0x1007f6c: sll   zero, zero, 0
-// 0x01007f70: 0x1007f70: jr    ra addiu sp, sp, 24
+// 0x01007f78: 0x1007f78: lw    ra, 20(sp)
+// 0x01007f7c: 0x1007f7c: sll   zero, zero, 0
+// 0x01007f80: 0x1007f80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4776,7 +4776,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_math_area_contains_1007f78(int32,int32)
+.method public static int32 roadmap_math_area_contains_1007f88(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4802,7 +4802,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01007f78: 0x1007f78: lw    v1, 8(a1)
+// 0x01007f88: 0x1007f88: lw    v1, 8(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -4811,7 +4811,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007f7c: 0x1007f7c: lw    v0, 8(a0)
+// 0x01007f8c: 0x1007f8c: lw    v0, 8(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -4820,41 +4820,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007f80: 0x1007f80: sll   zero, zero, 0
-// 0x01007f84: 0x1007f84: slt   v0, v1, v0
+// 0x01007f90: 0x1007f90: sll   zero, zero, 0
+// 0x01007f94: 0x1007f94: slt   v0, v1, v0
 	ldloc.3
 	ldloc.2
 	clt
 	stloc.2
-// 0x01007f88: 0x1007f88: bne   v0, zero, 0x1007fd8 sll   zero, zero, 0
+// 0x01007f98: 0x1007f98: bne   v0, zero, 0x1007fe8 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1007fd8
+	brtrue L_1007fe8
 // --- basic block ---
-// 0x01007f90: 0x1007f90: lw    v1, 0(a1)
+// 0x01007fa0: 0x1007fa0: lw    v1, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01007f94: 0x1007f94: lw    v0, 0(a0)
+// 0x01007fa4: 0x1007fa4: lw    v0, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01007f98: 0x1007f98: sll   zero, zero, 0
-// 0x01007f9c: 0x1007f9c: slt   v0, v0, v1
+// 0x01007fa8: 0x1007fa8: sll   zero, zero, 0
+// 0x01007fac: 0x1007fac: slt   v0, v0, v1
 	ldloc.2
 	ldloc.3
 	clt
 	stloc.2
-// 0x01007fa0: 0x1007fa0: bne   v0, zero, 0x1007fd8 sll   zero, zero, 0
+// 0x01007fb0: 0x1007fb0: bne   v0, zero, 0x1007fe8 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1007fd8
+	brtrue L_1007fe8
 // --- basic block ---
-// 0x01007fa8: 0x1007fa8: lw    v1, 12(a1)
+// 0x01007fb8: 0x1007fb8: lw    v1, 12(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -4863,7 +4863,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007fac: 0x1007fac: lw    v0, 12(a0)
+// 0x01007fbc: 0x1007fbc: lw    v0, 12(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -4872,17 +4872,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007fb0: 0x1007fb0: sll   zero, zero, 0
-// 0x01007fb4: 0x1007fb4: slt   v0, v1, v0
+// 0x01007fc0: 0x1007fc0: sll   zero, zero, 0
+// 0x01007fc4: 0x1007fc4: slt   v0, v1, v0
 	ldloc.3
 	ldloc.2
 	clt
 	stloc.2
-// 0x01007fb8: 0x1007fb8: bne   v0, zero, 0x1007fd8 sll   zero, zero, 0
+// 0x01007fc8: 0x1007fc8: bne   v0, zero, 0x1007fe8 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1007fd8
+	brtrue L_1007fe8
 // --- basic block ---
-// 0x01007fc0: 0x1007fc0: lw    v1, 4(a1)
+// 0x01007fd0: 0x1007fd0: lw    v1, 4(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -4891,7 +4891,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01007fc4: 0x1007fc4: lw    v0, 4(a0)
+// 0x01007fd4: 0x1007fd4: lw    v0, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -4900,21 +4900,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01007fc8: 0x1007fc8: sll   zero, zero, 0
-// 0x01007fcc: 0x1007fcc: slt   v0, v0, v1
+// 0x01007fd8: 0x1007fd8: sll   zero, zero, 0
+// 0x01007fdc: 0x1007fdc: slt   v0, v0, v1
 	ldloc.2
 	ldloc.3
 	clt
 	stloc.2
-// 0x01007fd0: 0x1007fd0: jr    ra xori  v0, v0, 1
+// 0x01007fe0: 0x1007fe0: jr    ra xori  v0, v0, 1
 	ldloc.2
 	ldc.i4.1
 	xor
 	stloc.2
 	br __CIBYL_function_return
 // --- basic block ---
-L_1007fd8:
-// 0x01007fd8: 0x1007fd8: jr    ra addu  v0, zero, zero
+L_1007fe8:
+// 0x01007fe8: 0x1007fe8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	br __CIBYL_function_return
@@ -4924,7 +4924,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_math_compare_points_10083b4(int32,int32,int32)
+.method public static int32 roadmap_math_compare_points_10083c4(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4953,31 +4953,31 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010083b4: 0x10083b4: lw    v1, 0(a0)
+// 0x010083c4: 0x10083c4: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010083b8: 0x10083b8: lw    v0, 0(a1)
+// 0x010083c8: 0x10083c8: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010083bc: 0x10083bc: sll   zero, zero, 0
-// 0x010083c0: 0x10083c0: bne   v1, v0, 0x10083e4 slt   v0, v1, v0
+// 0x010083cc: 0x10083cc: sll   zero, zero, 0
+// 0x010083d0: 0x10083d0: bne   v1, v0, 0x10083f4 slt   v0, v1, v0
 	ldloc 4
 	ldloc.3
 	ldloc 4
 	ldloc.3
 	clt
 	stloc.3
-	bne.un L_10083e4
+	bne.un L_10083f4
 // --- basic block ---
-// 0x010083c8: 0x10083c8: lw    a2, 4(a0)
+// 0x010083d8: 0x10083d8: lw    a2, 4(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4986,7 +4986,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010083cc: 0x10083cc: lw    v1, 4(a1)
+// 0x010083dc: 0x10083dc: lw    v1, 4(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4995,26 +4995,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010083d0: 0x10083d0: sll   zero, zero, 0
-// 0x010083d4: 0x10083d4: beq   a2, v1, 0x1008408 addu  v0, zero, zero
+// 0x010083e0: 0x10083e0: sll   zero, zero, 0
+// 0x010083e4: 0x10083e4: beq   a2, v1, 0x1008418 addu  v0, zero, zero
 	ldloc.2
 	ldloc 4
 	ldc.i4.s 0
 	stloc.3
-	beq  L_1008408
+	beq  L_1008418
 // --- basic block ---
-// 0x010083dc: 0x10083dc: j	 0x10083ec sll   zero, zero, 0
-	br L_10083ec
+// 0x010083ec: 0x10083ec: j	 0x10083fc sll   zero, zero, 0
+	br L_10083fc
 // --- basic block ---
-L_10083e4:
-// 0x010083e4: 0x10083e4: bne   v0, zero, 0x1008408 addiu v0, zero, -1
+L_10083f4:
+// 0x010083f4: 0x10083f4: bne   v0, zero, 0x1008418 addiu v0, zero, -1
 	ldloc.3
 	ldc.i4.m1
 	stloc.3
-	brtrue L_1008408
+	brtrue L_1008418
 // --- basic block ---
-L_10083ec:
-// 0x010083ec: 0x10083ec: lw    a0, 4(a0)
+L_10083fc:
+// 0x010083fc: 0x10083fc: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5023,7 +5023,7 @@ L_10083ec:
 	add
 	ldelem.i4
 	stloc.0
-// 0x010083f0: 0x10083f0: lw    v1, 4(a1)
+// 0x01008400: 0x1008400: lw    v1, 4(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5032,23 +5032,23 @@ L_10083ec:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010083f4: 0x10083f4: sll   zero, zero, 0
-// 0x010083f8: 0x10083f8: slt   v1, a0, v1
+// 0x01008404: 0x1008404: sll   zero, zero, 0
+// 0x01008408: 0x1008408: slt   v1, a0, v1
 	ldloc.0
 	ldloc 4
 	clt
 	stloc 4
-// 0x010083fc: 0x10083fc: beq   v1, zero, 0x1008408 addiu v0, zero, 1
+// 0x0100840c: 0x100840c: beq   v1, zero, 0x1008418 addiu v0, zero, 1
 	ldloc 4
 	ldc.i4.1
 	stloc.3
-	brfalse L_1008408
+	brfalse L_1008418
 // --- basic block ---
-// 0x01008404: 0x1008404: addiu v0, zero, -1
+// 0x01008414: 0x1008414: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.3
-L_1008408:
-// 0x01008408: 0x1008408: jr    ra sll   zero, zero, 0
+L_1008418:
+// 0x01008418: 0x1008418: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -5056,7 +5056,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_math_delta_direction_1008410(int32,int32)
+.method public static int32 roadmap_math_delta_direction_1008420(int32,int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 a1,int32 v0,int32 ra)
@@ -5076,68 +5076,68 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008410: 0x1008410: subu  a0, a1, a0
+// 0x01008420: 0x1008420: subu  a0, a1, a0
 	ldloc.1
 	ldloc.0
 	sub
 	stloc.0
-L_1008414:
-// 0x01008414: 0x1008414: slti  v0, a0, 181
+L_1008424:
+// 0x01008424: 0x1008424: slti  v0, a0, 181
 	ldloc.0
 	ldc.i4 181
 	clt
 	stloc.2
-// 0x01008418: 0x1008418: beq   v0, zero, 0x1008414 addiu a0, a0, -360
+// 0x01008428: 0x1008428: beq   v0, zero, 0x1008424 addiu a0, a0, -360
 	ldloc.2
 	ldloc.0
 	ldc.i4 -360
 	add
 	stloc.0
-	brfalse L_1008414
+	brfalse L_1008424
 // --- basic block ---
-// 0x01008420: 0x1008420: addiu a0, a0, 360
+// 0x01008430: 0x1008430: addiu a0, a0, 360
 	ldloc.0
 	ldc.i4 360
 	add
 	stloc.0
-// 0x01008424: 0x1008424: j	 0x1008430 slti  v0, a0, -180
+// 0x01008434: 0x1008434: j	 0x1008440 slti  v0, a0, -180
 	ldloc.0
 	ldc.i4 -180
 	clt
 	stloc.2
-	br L_1008430
+	br L_1008440
 // --- basic block ---
-L_100842c:
-// 0x0100842c: 0x100842c: slti  v0, a0, -180
+L_100843c:
+// 0x0100843c: 0x100843c: slti  v0, a0, -180
 	ldloc.0
 	ldc.i4 -180
 	clt
 	stloc.2
-L_1008430:
-// 0x01008430: 0x1008430: bne   v0, zero, 0x100842c addiu a0, a0, 360
+L_1008440:
+// 0x01008440: 0x1008440: bne   v0, zero, 0x100843c addiu a0, a0, 360
 	ldloc.2
 	ldloc.0
 	ldc.i4 360
 	add
 	stloc.0
-	brtrue L_100842c
+	brtrue L_100843c
 // --- basic block ---
-// 0x01008438: 0x1008438: addiu a0, a0, -360
+// 0x01008448: 0x1008448: addiu a0, a0, -360
 	ldloc.0
 	ldc.i4 -360
 	add
 	stloc.0
-// 0x0100843c: 0x100843c: sra   v0, a0, 31
+// 0x0100844c: 0x100844c: sra   v0, a0, 31
 	ldloc.0
 	ldc.i4.s 31
 	shr
 	stloc.2
-// 0x01008440: 0x1008440: xor   a0, v0, a0
+// 0x01008450: 0x1008450: xor   a0, v0, a0
 	ldloc.2
 	ldloc.0
 	xor
 	stloc.0
-// 0x01008444: 0x1008444: jr    ra subu  v0, a0, v0
+// 0x01008454: 0x1008454: jr    ra subu  v0, a0, v0
 	ldloc.0
 	ldloc.2
 	sub
@@ -5147,7 +5147,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_math_get_context_100844c(int32,int32,int32)
+.method public static int32 roadmap_math_get_context_100845c(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -5176,15 +5176,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100844c: 0x100844c: lui   v0, 0xe0000
+// 0x0100845c: 0x100845c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 4
-// 0x01008450: 0x1008450: addiu v1, v0, 29604
+// 0x01008460: 0x1008460: addiu v1, v0, 30068
 	ldloc 4
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01008454: 0x1008454: lw    a2, 8(v1)
+// 0x01008464: 0x1008464: lw    a2, 8(v1)
 	ldloc 3
 	ldloc 5
 	ldc.i4.2
@@ -5193,15 +5193,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008458: 0x1008458: sll   zero, zero, 0
-// 0x0100845c: 0x100845c: sw    a2, 0(a0)
+// 0x01008468: 0x1008468: sll   zero, zero, 0
+// 0x0100846c: 0x100846c: sw    a2, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01008460: 0x1008460: lw    v1, 12(v1)
+// 0x01008470: 0x1008470: lw    v1, 12(v1)
 	ldloc 3
 	ldloc 5
 	ldc.i4.2
@@ -5210,8 +5210,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008464: 0x1008464: sll   zero, zero, 0
-// 0x01008468: 0x1008468: sw    v1, 4(a0)
+// 0x01008474: 0x1008474: sll   zero, zero, 0
+// 0x01008478: 0x1008478: sw    v1, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -5220,16 +5220,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100846c: 0x100846c: lw    v0, 29604(v0)
+// 0x0100847c: 0x100847c: lw    v0, 30068(v0)
 	ldloc 3
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 4
-// 0x01008470: 0x1008470: jr    ra sw    v0, 0(a1)
+// 0x01008480: 0x1008480: jr    ra sw    v0, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -5243,7 +5243,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_math_is_metric_1008478()
+.method public static int32 roadmap_math_is_metric_1008488()
 {
 .maxstack 8
 .locals init (int32 v0,int32[] mem,int32 ra)
@@ -5260,33 +5260,33 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008478: 0x1008478: lui   v0, 0xe0000
+// 0x01008488: 0x1008488: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc.0
-// 0x0100847c: 0x100847c: lw    v0, 29720(v0)
+// 0x0100848c: 0x100848c: lw    v0, 30184(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc.0
-// 0x01008480: 0x1008480: sll   zero, zero, 0
-// 0x01008484: 0x1008484: lw    v0, 0(v0)
+// 0x01008490: 0x1008490: sll   zero, zero, 0
+// 0x01008494: 0x1008494: lw    v0, 0(v0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x01008488: 0x1008488: sll   zero, zero, 0
-// 0x0100848c: 0x100848c: xori  v0, v0, 1
+// 0x01008498: 0x1008498: sll   zero, zero, 0
+// 0x0100849c: 0x100849c: xori  v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	xor
 	stloc.0
-// 0x01008490: 0x1008490: jr    ra sltiu v0, v0, 1
+// 0x010084a0: 0x10084a0: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -5296,7 +5296,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 lo,int32 s1,int32 s3,int32 s4,int32 t0,int32 ra)
@@ -5352,25 +5352,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008498: 0x1008498: lui   v0, 0xe0000
+// 0x010084a8: 0x10084a8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0100849c: 0x100849c: lw    v1, 29604(v0)
+// 0x010084ac: 0x10084ac: lw    v1, 30068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 7
-// 0x010084a0: 0x10084a0: addiu sp, sp, -64
+// 0x010084b0: 0x10084b0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x010084a4: 0x10084a4: sw    ra, 60(sp)
-// 0x010084a8: 0x10084a8: sw    s4, 56(sp)
+// 0x010084b4: 0x10084b4: sw    ra, 60(sp)
+// 0x010084b8: 0x10084b8: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5379,7 +5379,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010084ac: 0x10084ac: sw    s3, 52(sp)
+// 0x010084bc: 0x10084bc: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5388,7 +5388,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010084b0: 0x10084b0: sw    s2, 48(sp)
+// 0x010084c0: 0x10084c0: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5397,7 +5397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010084b4: 0x10084b4: sw    s1, 44(sp)
+// 0x010084c4: 0x10084c4: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5406,7 +5406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010084b8: 0x10084b8: bne   v1, zero, 0x10084c8 sw    s0, 40(sp)
+// 0x010084c8: 0x10084c8: bne   v1, zero, 0x10084d8 sw    s0, 40(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -5416,47 +5416,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_10084c8
+	brtrue L_10084d8
 // --- basic block ---
-// 0x010084c0: 0x10084c0: addiu v1, zero, 20
+// 0x010084d0: 0x10084d0: addiu v1, zero, 20
 	ldc.i4.s 20
 	stloc 7
-// 0x010084c4: 0x10084c4: sw    v1, 29604(v0)
+// 0x010084d4: 0x10084d4: sw    v1, 30068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 7
 	stelem.i4
-L_10084c8:
-// 0x010084c8: 0x10084c8: lui   s2, 0xe0000
+L_10084d8:
+// 0x010084d8: 0x10084d8: lui   s2, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x010084cc: 0x10084cc: lw    v1, 29604(s2)
+// 0x010084dc: 0x10084dc: lw    v1, 30068(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 7
-// 0x010084d0: 0x10084d0: addiu v0, zero, 14
+// 0x010084e0: 0x10084e0: addiu v0, zero, 14
 	ldc.i4.s 14
 	stloc 5
-// 0x010084d4: 0x10084d4: div   v1, v0
+// 0x010084e4: 0x10084e4: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 10
-// 0x010084d8: 0x10084d8: addiu s0, s2, 29604
+// 0x010084e8: 0x10084e8: addiu s0, s2, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x010084dc: 0x10084dc: sw    zero, 20(sp)
+// 0x010084ec: 0x10084ec: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5465,24 +5465,24 @@ L_10084c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010084e0: 0x10084e0: lui   s3, 0x0
+// 0x010084f0: 0x10084f0: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010084e4: 0x10084e4: addiu s3, s3, 388
+// 0x010084f4: 0x10084f4: addiu s3, s3, 388
 	ldloc 12
 	ldc.i4 388
 	add
 	stloc 12
-// 0x010084e8: 0x10084e8: lui   s1, 0x20000
+// 0x010084f8: 0x10084f8: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x010084ec: 0x10084ec: mflo  lo
+// 0x010084fc: 0x10084fc: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010084f0: 0x10084f0: mflo  lo
+// 0x01008500: 0x1008500: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010084f4: 0x10084f4: jal   0x100b074 sw    v0, 4(s0)
+// 0x01008504: 0x1008504: jal   0x100b084 sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5496,12 +5496,12 @@ L_10084c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_adjust_scale_100b074(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_adjust_scale_100b084(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010084fc: 0x10084fc: lw    a0, 12(s0)
+// 0x0100850c: 0x100850c: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5510,20 +5510,20 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01008500: 0x1008500: lui   v0, 0xf0000
+// 0x01008510: 0x1008510: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01008504: 0x1008504: ori   v0, v0, 16960
+// 0x01008514: 0x1008514: ori   v0, v0, 16960
 	ldloc 5
 	ldc.i4 16960
 	or
 	stloc 5
-// 0x01008508: 0x1008508: div   a0, v0
+// 0x01008518: 0x1008518: div   a0, v0
 	ldloc.1
 	ldloc 5
 	div
 	stloc 10
-// 0x0100850c: 0x100850c: lw    a3, 28(s0)
+// 0x0100851c: 0x100851c: lw    a3, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5532,10 +5532,10 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01008510: 0x1008510: addiu v0, zero, 2
+// 0x01008520: 0x1008520: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01008514: 0x1008514: lw    v1, 24(s0)
+// 0x01008524: 0x1008524: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5544,26 +5544,26 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01008518: 0x1008518: lw    t0, 29604(s2)
+// 0x01008528: 0x1008528: lw    t0, 30068(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100851c: 0x100851c: addiu a2, sp, 20
+// 0x0100852c: 0x100852c: addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.3
-// 0x01008520: 0x1008520: addiu a1, sp, 16
+// 0x01008530: 0x1008530: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01008524: 0x1008524: sw    t0, 36(s0)
+// 0x01008534: 0x1008534: sw    t0, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5572,7 +5572,7 @@ L_10084c8:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01008528: 0x1008528: sw    t0, 32(s0)
+// 0x01008538: 0x1008538: sw    t0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5581,20 +5581,20 @@ L_10084c8:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100852c: 0x100852c: mflo  lo
+// 0x0100853c: 0x100853c: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x01008530: 0x1008530: sll   zero, zero, 0
-// 0x01008534: 0x1008534: sll   zero, zero, 0
-// 0x01008538: 0x1008538: div   a3, v0
+// 0x01008540: 0x1008540: sll   zero, zero, 0
+// 0x01008544: 0x1008544: sll   zero, zero, 0
+// 0x01008548: 0x1008548: div   a3, v0
 	ldloc 4
 	ldloc 5
 	div
 	stloc 10
-// 0x0100853c: 0x100853c: mflo  lo
+// 0x0100854c: 0x100854c: mflo  lo
 	ldloc 10
 	stloc 4
-// 0x01008540: 0x1008540: sw    a3, 20(s0)
+// 0x01008550: 0x1008550: sw    a3, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5603,16 +5603,16 @@ L_10084c8:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01008544: 0x1008544: sll   zero, zero, 0
-// 0x01008548: 0x1008548: div   v1, v0
+// 0x01008554: 0x1008554: sll   zero, zero, 0
+// 0x01008558: 0x1008558: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 10
-// 0x0100854c: 0x100854c: mflo  lo
+// 0x0100855c: 0x100855c: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x01008550: 0x1008550: jal   0x1006c08 sw    v1, 16(s0)
+// 0x01008560: 0x1008560: jal   0x1006c18 sw    v1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5625,21 +5625,21 @@ L_10084c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_trigonometry_1006c08(int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_trigonometry_1006c18(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008558: 0x1008558: lw    a1, 23632(s1)
+// 0x01008568: 0x1008568: lw    a1, 24092(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 5908
+	ldc.i4 6023
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100855c: 0x100855c: lw    a0, 4(s3)
+// 0x0100856c: 0x100856c: lw    a0, 4(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -5648,7 +5648,7 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01008560: 0x1008560: lw    s2, 20(sp)
+// 0x01008570: 0x1008570: lw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5657,16 +5657,16 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01008564: 0x1008564: jal   0x10c0780 sll   zero, zero, 0
+// 0x01008574: 0x1008574: jal   0x10c0dc0 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100856c: 0x100856c: addu  a0, s2, zero
+// 0x0100857c: 0x100857c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01008570: 0x1008570: jal   0x10c09ac addu  s4, v0, zero
+// 0x01008580: 0x1008580: jal   0x10c0fec addu  s4, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
@@ -5674,18 +5674,18 @@ L_10084c8:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01008578: 0x1008578: addu  a1, v0, zero
+// 0x01008588: 0x1008588: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0100857c: 0x100857c: jal   0x10c0780 addu  a0, s4, zero
+// 0x0100858c: 0x100858c: jal   0x10c0dc0 addu  a0, s4, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008584: 0x1008584: sw    v0, 8(s3)
+// 0x01008594: 0x1008594: sw    v0, 8(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -5694,31 +5694,31 @@ L_10084c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01008588: 0x1008588: cibyl_sysc_arg 0x12
+// 0x01008598: 0x1008598: cibyl_sysc_arg 0x12
 	ldloc 9
-// 0x0100858c: 0x100858c: cibyl_sysc 0x22d
+// 0x0100859c: 0x100859c: cibyl_sysc 0x22d
 	call void [WazeWP7]Syscalls::NOPH_RoadMapMath_setLonUnits(int32)
-// 0x01008590: 0x1008590: addu  s2, v0, zero
+// 0x010085a0: 0x10085a0: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01008594: 0x1008594: lui   s2, 0x0
+// 0x010085a4: 0x10085a4: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01008598: 0x1008598: addiu s2, s2, 432
+// 0x010085a8: 0x10085a8: addiu s2, s2, 432
 	ldloc 9
 	ldc.i4 432
 	add
 	stloc 9
-// 0x0100859c: 0x100859c: lw    a1, 23632(s1)
+// 0x010085ac: 0x10085ac: lw    a1, 24092(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 5908
+	ldc.i4 6023
 	add
 	ldelem.i4
 	stloc.2
-// 0x010085a0: 0x10085a0: lw    a0, 4(s2)
+// 0x010085b0: 0x10085b0: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5727,7 +5727,7 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010085a4: 0x10085a4: lw    s1, 20(sp)
+// 0x010085b4: 0x10085b4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5736,16 +5736,16 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010085a8: 0x10085a8: jal   0x10c0780 sll   zero, zero, 0
+// 0x010085b8: 0x10085b8: jal   0x10c0dc0 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010085b0: 0x10085b0: addu  a0, s1, zero
+// 0x010085c0: 0x10085c0: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010085b4: 0x10085b4: jal   0x10c09ac addu  s3, v0, zero
+// 0x010085c4: 0x10085c4: jal   0x10c0fec addu  s3, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
@@ -5753,18 +5753,18 @@ L_10084c8:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010085bc: 0x10085bc: addu  a1, v0, zero
+// 0x010085cc: 0x10085cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010085c0: 0x10085c0: jal   0x10c0780 addu  a0, s3, zero
+// 0x010085d0: 0x10085d0: jal   0x10c0dc0 addu  a0, s3, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010085c8: 0x10085c8: lw    a0, 32(s0)
+// 0x010085d8: 0x10085d8: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5773,21 +5773,21 @@ L_10084c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010085cc: 0x10085cc: sll   zero, zero, 0
-// 0x010085d0: 0x10085d0: sll   a0, a0, 15
+// 0x010085dc: 0x10085dc: sll   zero, zero, 0
+// 0x010085e0: 0x10085e0: sll   a0, a0, 15
 	ldloc.1
 	ldc.i4.s 15
 	shl
 	stloc.1
-// 0x010085d4: 0x10085d4: div   a0, s1
+// 0x010085e4: 0x10085e4: div   a0, s1
 	ldloc.1
 	ldloc 11
 	div
 	stloc 10
-// 0x010085d8: 0x10085d8: mflo  lo
+// 0x010085e8: 0x10085e8: mflo  lo
 	ldloc 10
 	stloc.1
-// 0x010085dc: 0x10085dc: jal   0x10c09c0 sw    v0, 8(s2)
+// 0x010085ec: 0x10085ec: jal   0x10c1000 sw    v0, 8(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5798,36 +5798,36 @@ L_10084c8:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010085e4: 0x10085e4: lui   a0, 0x20000
+// 0x010085f4: 0x10085f4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010085e8: 0x10085e8: lw    a3, 23716(a0)
+// 0x010085f8: 0x10085f8: lw    a3, 24180(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5929
+	ldc.i4 6045
 	add
 	ldelem.i4
 	stloc 4
-// 0x010085ec: 0x10085ec: lw    a2, 23712(a0)
+// 0x010085fc: 0x10085fc: lw    a2, 24176(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5928
+	ldc.i4 6044
 	add
 	ldelem.i4
 	stloc.3
-// 0x010085f0: 0x10085f0: addu  a1, v1, zero
+// 0x01008600: 0x1008600: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010085f4: 0x10085f4: jal   0x10c06e8 addu  a0, v0, zero
+// 0x01008604: 0x1008604: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5835,26 +5835,26 @@ L_10084c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010085fc: 0x10085fc: addu  a1, v1, zero
+// 0x0100860c: 0x100860c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01008600: 0x1008600: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01008610: 0x1008610: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008608: 0x1008608: bne   v0, zero, 0x1008618 sw    v0, 32(s0)
+// 0x01008618: 0x1008618: bne   v0, zero, 0x1008628 sw    v0, 32(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -5864,12 +5864,12 @@ L_10084c8:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1008618
+	brtrue L_1008628
 // --- basic block ---
-// 0x01008610: 0x1008610: addiu v0, zero, 1
+// 0x01008620: 0x1008620: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01008614: 0x1008614: sw    v0, 32(s0)
+// 0x01008624: 0x1008624: sw    v0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5878,16 +5878,16 @@ L_10084c8:
 	add
 	ldloc 5
 	stelem.i4
-L_1008618:
-// 0x01008618: 0x1008618: lui   s0, 0xe0000
+L_1008628:
+// 0x01008628: 0x1008628: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 8
-// 0x0100861c: 0x100861c: addiu s0, s0, 29604
+// 0x0100862c: 0x100862c: addiu s0, s0, 30068
 	ldloc 8
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 8
-// 0x01008620: 0x1008620: lw    v1, 32(s0)
+// 0x01008630: 0x1008630: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5896,7 +5896,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01008624: 0x1008624: lw    v0, 16(s0)
+// 0x01008634: 0x1008634: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5905,7 +5905,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008628: 0x1008628: lw    a3, 36(s0)
+// 0x01008638: 0x1008638: lw    a3, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5914,12 +5914,12 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100862c: 0x100862c: mult  v1, v0
+// 0x0100863c: 0x100863c: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 10
-// 0x01008630: 0x1008630: lw    a2, 20(s0)
+// 0x01008640: 0x1008640: lw    a2, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5928,7 +5928,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01008634: 0x1008634: lw    a1, 8(s0)
+// 0x01008644: 0x1008644: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5937,7 +5937,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008638: 0x1008638: lw    v0, 12(s0)
+// 0x01008648: 0x1008648: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5946,10 +5946,10 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100863c: 0x100863c: addu  a0, zero, zero
+// 0x0100864c: 0x100864c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01008640: 0x1008640: lw    s1, 104(s0)
+// 0x01008650: 0x1008650: lw    s1, 104(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5958,15 +5958,15 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01008644: 0x1008644: mflo  lo
+// 0x01008654: 0x1008654: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x01008648: 0x1008648: subu  v1, a1, v1
+// 0x01008658: 0x1008658: subu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	sub
 	stloc 7
-// 0x0100864c: 0x100864c: sw    v1, 80(s0)
+// 0x0100865c: 0x100865c: sw    v1, 80(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5975,20 +5975,20 @@ L_1008618:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01008650: 0x1008650: mult  a3, a2
+// 0x01008660: 0x1008660: mult  a3, a2
 	ldloc 4
 	ldloc.3
 	mul
 	stloc 10
-// 0x01008654: 0x1008654: mflo  lo
+// 0x01008664: 0x1008664: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x01008658: 0x1008658: addu  v0, a2, v0
+// 0x01008668: 0x1008668: addu  v0, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc 5
-// 0x0100865c: 0x100865c: jal   0x1007b74 sw    v0, 76(s0)
+// 0x0100866c: 0x100866c: jal   0x1007b84 sw    v0, 76(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6002,12 +6002,12 @@ L_1008618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008664: 0x1008664: lw    v1, 24(s0)
+// 0x01008674: 0x1008674: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6016,7 +6016,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01008668: 0x1008668: lw    v0, 28(s0)
+// 0x01008678: 0x1008678: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6025,20 +6025,20 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100866c: 0x100866c: addiu a0, sp, 24
+// 0x0100867c: 0x100867c: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x01008670: 0x1008670: addiu a1, sp, 32
+// 0x01008680: 0x1008680: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01008674: 0x1008674: addiu a2, zero, 1
+// 0x01008684: 0x1008684: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01008678: 0x1008678: sw    v1, 24(sp)
+// 0x01008688: 0x1008688: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6047,7 +6047,7 @@ L_1008618:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100867c: 0x100867c: jal   0x1007a6c sw    v0, 28(sp)
+// 0x0100868c: 0x100868c: jal   0x1007a7c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6061,12 +6061,12 @@ L_1008618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_position_1007a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_position_1007a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008684: 0x1008684: lw    v0, 32(sp)
+// 0x01008694: 0x1008694: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6075,10 +6075,10 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008688: 0x1008688: addu  a0, s1, zero
+// 0x01008698: 0x1008698: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0100868c: 0x100868c: sw    v0, 72(s0)
+// 0x0100869c: 0x100869c: sw    v0, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6087,7 +6087,7 @@ L_1008618:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01008690: 0x1008690: lw    v0, 36(sp)
+// 0x010086a0: 0x10086a0: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6096,7 +6096,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008694: 0x1008694: jal   0x1007b74 sw    v0, 84(s0)
+// 0x010086a4: 0x10086a4: jal   0x1007b84 sw    v0, 84(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6110,13 +6110,13 @@ L_1008618:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_orientation_1007b74(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_orientation_1007b84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100869c: 0x100869c: lw    ra, 60(sp)
-// 0x010086a0: 0x10086a0: lw    s4, 56(sp)
+// 0x010086ac: 0x10086ac: lw    ra, 60(sp)
+// 0x010086b0: 0x10086b0: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6125,7 +6125,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010086a4: 0x10086a4: lw    s3, 52(sp)
+// 0x010086b4: 0x10086b4: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6134,7 +6134,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010086a8: 0x10086a8: lw    s2, 48(sp)
+// 0x010086b8: 0x10086b8: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6143,7 +6143,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010086ac: 0x10086ac: lw    s1, 44(sp)
+// 0x010086bc: 0x10086bc: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6152,7 +6152,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010086b0: 0x10086b0: lw    s0, 40(sp)
+// 0x010086c0: 0x10086c0: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6161,7 +6161,7 @@ L_1008618:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010086b4: 0x10086b4: jr    ra addiu sp, sp, 64
+// 0x010086c4: 0x10086c4: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -6173,7 +6173,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -6208,22 +6208,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010086bc: 0x10086bc: lw    a2, 0(a0)
+// 0x010086cc: 0x10086cc: lw    a2, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010086c0: 0x10086c0: lui   v0, 0xe0000
+// 0x010086d0: 0x10086d0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010086c4: 0x10086c4: addiu v1, v0, 29604
+// 0x010086d4: 0x10086d4: addiu v1, v0, 30068
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x010086c8: 0x10086c8: sw    a2, 8(v1)
+// 0x010086d8: 0x10086d8: sw    a2, 8(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6232,7 +6232,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010086cc: 0x10086cc: lw    a2, 4(a0)
+// 0x010086dc: 0x10086dc: lw    a2, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6241,21 +6241,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010086d0: 0x10086d0: lui   a0, 0x10000
+// 0x010086e0: 0x10086e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010086d4: 0x10086d4: addiu sp, sp, -24
+// 0x010086e4: 0x10086e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010086d8: 0x10086d8: slt   a0, a1, a0
+// 0x010086e8: 0x10086e8: slt   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.1
-// 0x010086dc: 0x10086dc: sw    ra, 20(sp)
-// 0x010086e0: 0x10086e0: beq   a0, zero, 0x10086f4 sw    a2, 12(v1)
+// 0x010086ec: 0x10086ec: sw    ra, 20(sp)
+// 0x010086f0: 0x10086f0: beq   a0, zero, 0x1008704 sw    a2, 12(v1)
 	ldloc.1
 	ldloc 6
 	ldloc 5
@@ -6265,71 +6265,71 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-	brfalse L_10086f4
+	brfalse L_1008704
 // --- basic block ---
-// 0x010086e8: 0x10086e8: andi  a1, a1, 65535
+// 0x010086f8: 0x10086f8: andi  a1, a1, 65535
 	ldloc.2
 	ldc.i4 65535
 	and
 	stloc.2
-// 0x010086ec: 0x10086ec: sw    a1, 29604(v0)
+// 0x010086fc: 0x10086fc: sw    a1, 30068(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc.2
 	stelem.i4
-// 0x010086f0: 0x10086f0: lui   v0, 0xe0000
+// 0x01008700: 0x1008700: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 7
-L_10086f4:
-// 0x010086f4: 0x10086f4: lw    v1, 29604(v0)
+L_1008704:
+// 0x01008704: 0x1008704: lw    v1, 30068(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 5
-// 0x010086f8: 0x10086f8: sll   zero, zero, 0
-// 0x010086fc: 0x10086fc: slti  v1, v1, 2
+// 0x01008708: 0x1008708: sll   zero, zero, 0
+// 0x0100870c: 0x100870c: slti  v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01008700: 0x1008700: beq   v1, zero, 0x100870c addiu v1, zero, 2
+// 0x01008710: 0x1008710: beq   v1, zero, 0x100871c addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brfalse L_100870c
+	brfalse L_100871c
 // --- basic block ---
-// 0x01008708: 0x1008708: sw    v1, 29604(v0)
+// 0x01008718: 0x1008718: sw    v1, 30068(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 5
 	stelem.i4
-L_100870c:
-// 0x0100870c: 0x100870c: jal   0x1008498 sll   zero, zero, 0
+L_100871c:
+// 0x0100871c: 0x100871c: jal   0x10084a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01008714: 0x1008714: lw    ra, 20(sp)
-// 0x01008718: 0x1008718: sll   zero, zero, 0
-// 0x0100871c: 0x100871c: jr    ra addiu sp, sp, 24
+// 0x01008724: 0x1008724: lw    ra, 20(sp)
+// 0x01008728: 0x1008728: sll   zero, zero, 0
+// 0x0100872c: 0x100872c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6341,7 +6341,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_math_set_horizon_1008724(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_set_horizon_1008734(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -6376,21 +6376,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008724: 0x1008724: addiu sp, sp, -24
+// 0x01008734: 0x1008734: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01008728: 0x1008728: lui   v0, 0xe0000
+// 0x01008738: 0x1008738: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0100872c: 0x100872c: sw    ra, 20(sp)
-// 0x01008730: 0x1008730: jal   0x1008498 sw    a0, 29724(v0)
+// 0x0100873c: 0x100873c: sw    ra, 20(sp)
+// 0x01008740: 0x1008740: jal   0x10084a8 sw    a0, 30188(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7431
+	ldc.i4 7547
 	add
 	ldloc.1
 	stelem.i4
@@ -6399,14 +6399,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01008738: 0x1008738: lw    ra, 20(sp)
-// 0x0100873c: 0x100873c: sll   zero, zero, 0
-// 0x01008740: 0x1008740: jr    ra addiu sp, sp, 24
+// 0x01008748: 0x1008748: lw    ra, 20(sp)
+// 0x0100874c: 0x100874c: sll   zero, zero, 0
+// 0x01008750: 0x1008750: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6418,7 +6418,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_set_center_1008748(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_set_center_1008758(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6453,22 +6453,22 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008748: 0x1008748: lw    v1, 0(a0)
+// 0x01008758: 0x1008758: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100874c: 0x100874c: lui   v0, 0xe0000
+// 0x0100875c: 0x100875c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01008750: 0x1008750: addiu v0, v0, 29604
+// 0x01008760: 0x1008760: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01008754: 0x1008754: sw    v1, 8(v0)
+// 0x01008764: 0x1008764: sw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6477,7 +6477,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01008758: 0x1008758: lw    v1, 4(a0)
+// 0x01008768: 0x1008768: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6486,13 +6486,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100875c: 0x100875c: addiu sp, sp, -24
+// 0x0100876c: 0x100876c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01008760: 0x1008760: sw    ra, 20(sp)
-// 0x01008764: 0x1008764: jal   0x1008498 sw    v1, 12(v0)
+// 0x01008770: 0x1008770: sw    ra, 20(sp)
+// 0x01008774: 0x1008774: jal   0x10084a8 sw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6506,14 +6506,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100876c: 0x100876c: lw    ra, 20(sp)
-// 0x01008770: 0x1008770: sll   zero, zero, 0
-// 0x01008774: 0x1008774: jr    ra addiu sp, sp, 24
+// 0x0100877c: 0x100877c: lw    ra, 20(sp)
+// 0x01008780: 0x1008780: sll   zero, zero, 0
+// 0x01008784: 0x1008784: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6525,7 +6525,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_set_size_100877c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_set_size_100878c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6560,21 +6560,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100877c: 0x100877c: lui   v0, 0xe0000
+// 0x0100878c: 0x100878c: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01008780: 0x1008780: addiu sp, sp, -24
+// 0x01008790: 0x1008790: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01008784: 0x1008784: addiu v0, v0, 29604
+// 0x01008794: 0x1008794: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01008788: 0x1008788: sw    ra, 20(sp)
-// 0x0100878c: 0x100878c: sw    a1, 28(v0)
+// 0x01008798: 0x1008798: sw    ra, 20(sp)
+// 0x0100879c: 0x100879c: sw    a1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6583,7 +6583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01008790: 0x1008790: jal   0x1008498 sw    a0, 24(v0)
+// 0x010087a0: 0x10087a0: jal   0x10084a8 sw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6597,14 +6597,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01008798: 0x1008798: lw    ra, 20(sp)
-// 0x0100879c: 0x100879c: sll   zero, zero, 0
-// 0x010087a0: 0x10087a0: jr    ra addiu sp, sp, 24
+// 0x010087a8: 0x10087a8: lw    ra, 20(sp)
+// 0x010087ac: 0x10087ac: sll   zero, zero, 0
+// 0x010087b0: 0x10087b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6616,7 +6616,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_street_address_10087a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_street_address_10087b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s3,int32 s8,int32 s7,int32 s1,int32 s5,int32 lo,int32 s4,int32 s6,int32 s0,int32 ra,int32 t0,int32 t1)
@@ -6687,17 +6687,17 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010087a8: 0x10087a8: addiu sp, sp, -72
+// 0x010087b8: 0x10087b8: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010087ac: 0x10087ac: slti  v0, a1, 9
+// 0x010087bc: 0x10087bc: slti  v0, a1, 9
 	ldloc.2
 	ldc.i4.s 9
 	clt
 	stloc 5
-// 0x010087b0: 0x10087b0: sw    s1, 36(sp)
+// 0x010087c0: 0x10087c0: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6706,7 +6706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010087b4: 0x10087b4: sw    s0, 32(sp)
+// 0x010087c4: 0x10087c4: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6715,8 +6715,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010087b8: 0x10087b8: sw    ra, 68(sp)
-// 0x010087bc: 0x10087bc: sw    s8, 64(sp)
+// 0x010087c8: 0x10087c8: sw    ra, 68(sp)
+// 0x010087cc: 0x10087cc: sw    s8, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6725,7 +6725,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010087c0: 0x10087c0: sw    s7, 60(sp)
+// 0x010087d0: 0x10087d0: sw    s7, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6734,7 +6734,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010087c4: 0x10087c4: sw    s6, 56(sp)
+// 0x010087d4: 0x10087d4: sw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6743,7 +6743,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010087c8: 0x10087c8: sw    s5, 52(sp)
+// 0x010087d8: 0x10087d8: sw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6752,7 +6752,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010087cc: 0x10087cc: sw    s4, 48(sp)
+// 0x010087dc: 0x10087dc: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6761,7 +6761,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010087d0: 0x10087d0: sw    s3, 44(sp)
+// 0x010087e0: 0x10087e0: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6770,7 +6770,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010087d4: 0x10087d4: sw    s2, 40(sp)
+// 0x010087e4: 0x10087e4: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6779,203 +6779,203 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010087d8: 0x10087d8: addu  s0, a1, zero
+// 0x010087e8: 0x10087e8: addu  s0, a1, zero
 	ldloc.2
 	stloc 17
-// 0x010087dc: 0x10087dc: bne   v0, zero, 0x1008a0c addu  s1, a0, zero
+// 0x010087ec: 0x10087ec: bne   v0, zero, 0x1008a1c addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 12
-	brtrue L_1008a0c
+	brtrue L_1008a1c
 // --- basic block ---
-// 0x010087e4: 0x10087e4: lb    v0, 0(a0)
+// 0x010087f4: 0x10087f4: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010087e8: 0x10087e8: addiu v1, zero, 87
+// 0x010087f8: 0x10087f8: addiu v1, zero, 87
 	ldc.i4.s 87
 	stloc 6
-// 0x010087ec: 0x10087ec: beq   v0, v1, 0x100880c addiu v1, zero, 69
+// 0x010087fc: 0x10087fc: beq   v0, v1, 0x100881c addiu v1, zero, 69
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 69
 	stloc 6
-	beq  L_100880c
+	beq  L_100881c
 // --- basic block ---
-// 0x010087f4: 0x10087f4: beq   v0, v1, 0x100880c addiu v1, zero, 83
+// 0x01008804: 0x1008804: beq   v0, v1, 0x100881c addiu v1, zero, 83
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 83
 	stloc 6
-	beq  L_100880c
+	beq  L_100881c
 // --- basic block ---
-// 0x010087fc: 0x10087fc: beq   v0, v1, 0x100880c addiu v1, zero, 78
+// 0x0100880c: 0x100880c: beq   v0, v1, 0x100881c addiu v1, zero, 78
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 78
 	stloc 6
-	beq  L_100880c
+	beq  L_100881c
 // --- basic block ---
-// 0x01008804: 0x1008804: bne   v0, v1, 0x1008a10 lui   s8, 0x0
+// 0x01008814: 0x1008814: bne   v0, v1, 0x1008a20 lui   s8, 0x0
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 0
 	stloc 10
-	bne.un L_1008a10
+	bne.un L_1008a20
 // --- basic block ---
-L_100880c:
-// 0x0100880c: 0x100880c: addiu v1, s0, -1
+L_100881c:
+// 0x0100881c: 0x100881c: addiu v1, s0, -1
 	ldloc 17
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x01008810: 0x1008810: addu  a0, s1, s0
+// 0x01008820: 0x1008820: addu  a0, s1, s0
 	ldloc 12
 	ldloc 17
 	add
 	stloc.1
-// 0x01008814: 0x1008814: addu  s2, zero, zero
+// 0x01008824: 0x1008824: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01008818: 0x1008818: addiu t1, zero, 87
+// 0x01008828: 0x1008828: addiu t1, zero, 87
 	ldc.i4.s 87
 	stloc 20
-// 0x0100881c: 0x100881c: addiu t0, zero, 69
+// 0x0100882c: 0x100882c: addiu t0, zero, 69
 	ldc.i4.s 69
 	stloc 19
-// 0x01008820: 0x1008820: addiu a3, zero, 83
+// 0x01008830: 0x1008830: addiu a3, zero, 83
 	ldc.i4.s 83
 	stloc 4
-// 0x01008824: 0x1008824: addiu a2, zero, 78
+// 0x01008834: 0x1008834: addiu a2, zero, 78
 	ldc.i4.s 78
 	stloc.3
-// 0x01008828: 0x1008828: addiu a1, zero, 45
+// 0x01008838: 0x1008838: addiu a1, zero, 45
 	ldc.i4.s 45
 	stloc.2
-L_100882c:
-// 0x0100882c: 0x100882c: lb    v0, -1(a0)
+L_100883c:
+// 0x0100883c: 0x100883c: lb    v0, -1(a0)
 	ldloc.1
 	ldc.i4.m1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01008830: 0x1008830: sll   zero, zero, 0
-// 0x01008834: 0x1008834: beq   v0, t1, 0x100885c addiu a0, a0, -1
+// 0x01008840: 0x1008840: sll   zero, zero, 0
+// 0x01008844: 0x1008844: beq   v0, t1, 0x100886c addiu a0, a0, -1
 	ldloc 5
 	ldloc 20
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-	beq  L_100885c
+	beq  L_100886c
 // --- basic block ---
-// 0x0100883c: 0x100883c: beq   v0, t0, 0x100885c sll   zero, zero, 0
+// 0x0100884c: 0x100884c: beq   v0, t0, 0x100886c sll   zero, zero, 0
 	ldloc 5
 	ldloc 19
-	beq  L_100885c
+	beq  L_100886c
 // --- basic block ---
-// 0x01008844: 0x1008844: beq   v0, a3, 0x100885c sll   zero, zero, 0
+// 0x01008854: 0x1008854: beq   v0, a3, 0x100886c sll   zero, zero, 0
 	ldloc 5
 	ldloc 4
-	beq  L_100885c
+	beq  L_100886c
 // --- basic block ---
-// 0x0100884c: 0x100884c: beq   v0, a2, 0x100885c sll   zero, zero, 0
+// 0x0100885c: 0x100885c: beq   v0, a2, 0x100886c sll   zero, zero, 0
 	ldloc 5
 	ldloc.3
-	beq  L_100885c
+	beq  L_100886c
 // --- basic block ---
-// 0x01008854: 0x1008854: bne   v0, a1, 0x1008860 sll   zero, zero, 0
+// 0x01008864: 0x1008864: bne   v0, a1, 0x1008870 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	bne.un L_1008860
+	bne.un L_1008870
 // --- basic block ---
-L_100885c:
-// 0x0100885c: 0x100885c: addu  s2, v1, zero
+L_100886c:
+// 0x0100886c: 0x100886c: addu  s2, v1, zero
 	ldloc 6
 	stloc 8
-L_1008860:
-// 0x01008860: 0x1008860: addiu v1, v1, -1
+L_1008870:
+// 0x01008870: 0x1008870: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x01008864: 0x1008864: bne   v1, zero, 0x100882c lui   s8, 0x0
+// 0x01008874: 0x1008874: bne   v1, zero, 0x100883c lui   s8, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 10
-	brtrue L_100882c
+	brtrue L_100883c
 // --- basic block ---
-// 0x0100886c: 0x100886c: lui   s7, 0x0
+// 0x0100887c: 0x100887c: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01008870: 0x1008870: addiu s8, s8, 24004
+// 0x01008880: 0x1008880: addiu s8, s8, 24004
 	ldloc 10
 	ldc.i4 24004
 	add
 	stloc 10
-// 0x01008874: 0x1008874: addiu s7, s7, 24032
+// 0x01008884: 0x1008884: addiu s7, s7, 24032
 	ldloc 11
 	ldc.i4 24032
 	add
 	stloc 11
-// 0x01008878: 0x1008878: addu  s3, s1, zero
+// 0x01008888: 0x1008888: addu  s3, s1, zero
 	ldloc 12
 	stloc 9
-// 0x0100887c: 0x100887c: addu  s4, zero, zero
+// 0x0100888c: 0x100888c: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01008880: 0x1008880: addiu s5, zero, 1
+// 0x01008890: 0x1008890: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x01008884: 0x1008884: j	 0x10088d8 addiu s6, zero, 10
+// 0x01008894: 0x1008894: j	 0x10088e8 addiu s6, zero, 10
 	ldc.i4.s 10
 	stloc 16
-	br L_10088d8
+	br L_10088e8
 // --- basic block ---
-L_100888c:
-// 0x0100888c: 0x100888c: lb    v0, 1(s3)
+L_100889c:
+// 0x0100889c: 0x100889c: lb    v0, 1(s3)
 	ldloc 9
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01008890: 0x1008890: sll   zero, zero, 0
-// 0x01008894: 0x1008894: addiu v1, v0, -48
+// 0x010088a0: 0x10088a0: sll   zero, zero, 0
+// 0x010088a4: 0x10088a4: addiu v1, v0, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 6
-// 0x01008898: 0x1008898: andi  v1, v1, 255
+// 0x010088a8: 0x10088a8: andi  v1, v1, 255
 	ldloc 6
 	ldc.i4 255
 	and
 	stloc 6
-// 0x0100889c: 0x100889c: sltiu v1, v1, 10
+// 0x010088ac: 0x10088ac: sltiu v1, v1, 10
 	ldloc 6
 	ldc.i4.s 10
 	clt.un
 	stloc 6
-// 0x010088a0: 0x10088a0: bne   v1, zero, 0x10088c0 addiu s5, s5, 1
+// 0x010088b0: 0x10088b0: bne   v1, zero, 0x10088d0 addiu s5, s5, 1
 	ldloc 6
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	brtrue L_10088c0
+	brtrue L_10088d0
 // --- basic block ---
-// 0x010088a8: 0x10088a8: addiu a0, zero, 3
+// 0x010088b8: 0x10088b8: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010088ac: 0x10088ac: addu  a1, s8, zero
+// 0x010088bc: 0x10088bc: addu  a1, s8, zero
 	ldloc 10
 	stloc.2
-// 0x010088b0: 0x10088b0: addiu a2, zero, 1730
+// 0x010088c0: 0x10088c0: addiu a2, zero, 1730
 	ldc.i4 1730
 	stloc.3
-// 0x010088b4: 0x10088b4: addu  a3, s7, zero
+// 0x010088c4: 0x10088c4: addu  a3, s7, zero
 	ldloc 11
 	stloc 4
-// 0x010088b8: 0x10088b8: jal   0x100449c sw    v0, 16(sp)
+// 0x010088c8: 0x10088c8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6994,130 +6994,130 @@ L_100888c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10088c0:
-// 0x010088c0: 0x10088c0: mult  s4, s6
+L_10088d0:
+// 0x010088d0: 0x10088d0: mult  s4, s6
 	ldloc 15
 	ldloc 16
 	mul
 	stloc 14
-// 0x010088c4: 0x10088c4: lb    v0, 1(s3)
+// 0x010088d4: 0x10088d4: lb    v0, 1(s3)
 	ldloc 9
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010088c8: 0x10088c8: addiu s3, s3, 1
+// 0x010088d8: 0x10088d8: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010088cc: 0x10088cc: addiu v0, v0, -48
+// 0x010088dc: 0x10088dc: addiu v0, v0, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 5
-// 0x010088d0: 0x10088d0: mflo  lo
+// 0x010088e0: 0x10088e0: mflo  lo
 	ldloc 14
 	stloc 15
-// 0x010088d4: 0x10088d4: addu  s4, v0, s4
+// 0x010088e4: 0x10088e4: addu  s4, v0, s4
 	ldloc 5
 	ldloc 15
 	add
 	stloc 15
-L_10088d8:
-// 0x010088d8: 0x10088d8: slt   v0, s5, s2
+L_10088e8:
+// 0x010088e8: 0x10088e8: slt   v0, s5, s2
 	ldloc 13
 	ldloc 8
 	clt
 	stloc 5
-// 0x010088dc: 0x10088dc: bne   v0, zero, 0x100888c sll   zero, zero, 0
+// 0x010088ec: 0x10088ec: bne   v0, zero, 0x100889c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100888c
+	brtrue L_100889c
 // --- basic block ---
-// 0x010088e4: 0x10088e4: lui   s8, 0x0
+// 0x010088f4: 0x10088f4: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010088e8: 0x10088e8: lui   s7, 0x0
+// 0x010088f8: 0x10088f8: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010088ec: 0x10088ec: addu  s1, s1, s2
+// 0x010088fc: 0x10088fc: addu  s1, s1, s2
 	ldloc 12
 	ldloc 8
 	add
 	stloc 12
-// 0x010088f0: 0x10088f0: addiu s8, s8, 24004
+// 0x01008900: 0x1008900: addiu s8, s8, 24004
 	ldloc 10
 	ldc.i4 24004
 	add
 	stloc 10
-// 0x010088f4: 0x10088f4: addiu s7, s7, 24032
+// 0x01008904: 0x1008904: addiu s7, s7, 24032
 	ldloc 11
 	ldc.i4 24032
 	add
 	stloc 11
-// 0x010088f8: 0x10088f8: addiu s2, s2, 1
+// 0x01008908: 0x1008908: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010088fc: 0x10088fc: addiu s5, zero, 10
+// 0x0100890c: 0x100890c: addiu s5, zero, 10
 	ldc.i4.s 10
 	stloc 13
-// 0x01008900: 0x1008900: addu  s3, zero, zero
+// 0x01008910: 0x1008910: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01008904: 0x1008904: j	 0x100895c addiu s6, zero, 10
+// 0x01008914: 0x1008914: j	 0x100896c addiu s6, zero, 10
 	ldc.i4.s 10
 	stloc 16
-	br L_100895c
+	br L_100896c
 // --- basic block ---
-L_100890c:
-// 0x0100890c: 0x100890c: lb    v0, 1(s1)
+L_100891c:
+// 0x0100891c: 0x100891c: lb    v0, 1(s1)
 	ldloc 12
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01008910: 0x1008910: sll   zero, zero, 0
-// 0x01008914: 0x1008914: addiu v1, v0, -48
+// 0x01008920: 0x1008920: sll   zero, zero, 0
+// 0x01008924: 0x1008924: addiu v1, v0, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 6
-// 0x01008918: 0x1008918: andi  v1, v1, 255
+// 0x01008928: 0x1008928: andi  v1, v1, 255
 	ldloc 6
 	ldc.i4 255
 	and
 	stloc 6
-// 0x0100891c: 0x100891c: sltiu v1, v1, 10
+// 0x0100892c: 0x100892c: sltiu v1, v1, 10
 	ldloc 6
 	ldc.i4.s 10
 	clt.un
 	stloc 6
-// 0x01008920: 0x1008920: mflo  lo
+// 0x01008930: 0x1008930: mflo  lo
 	ldloc 14
 	stloc 13
-// 0x01008924: 0x1008924: bne   v1, zero, 0x1008944 addiu s2, s2, 1
+// 0x01008934: 0x1008934: bne   v1, zero, 0x1008954 addiu s2, s2, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_1008944
+	brtrue L_1008954
 // --- basic block ---
-// 0x0100892c: 0x100892c: addiu a0, zero, 4
+// 0x0100893c: 0x100893c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01008930: 0x1008930: addu  a1, s8, zero
+// 0x01008940: 0x1008940: addu  a1, s8, zero
 	ldloc 10
 	stloc.2
-// 0x01008934: 0x1008934: addiu a2, zero, 1738
+// 0x01008944: 0x1008944: addiu a2, zero, 1738
 	ldc.i4 1738
 	stloc.3
-// 0x01008938: 0x1008938: addu  a3, s7, zero
+// 0x01008948: 0x1008948: addu  a3, s7, zero
 	ldloc 11
 	stloc 4
-// 0x0100893c: 0x100893c: jal   0x100449c sw    v0, 16(sp)
+// 0x0100894c: 0x100894c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7136,155 +7136,155 @@ L_100890c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1008944:
-// 0x01008944: 0x1008944: mult  s3, s6
+L_1008954:
+// 0x01008954: 0x1008954: mult  s3, s6
 	ldloc 9
 	ldloc 16
 	mul
 	stloc 14
-// 0x01008948: 0x1008948: lb    v0, 1(s1)
+// 0x01008958: 0x1008958: lb    v0, 1(s1)
 	ldloc 12
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0100894c: 0x100894c: addiu s1, s1, 1
+// 0x0100895c: 0x100895c: addiu s1, s1, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x01008950: 0x1008950: addiu v0, v0, -48
+// 0x01008960: 0x1008960: addiu v0, v0, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 5
-// 0x01008954: 0x1008954: mflo  lo
+// 0x01008964: 0x1008964: mflo  lo
 	ldloc 14
 	stloc 9
-// 0x01008958: 0x1008958: addu  s3, v0, s3
+// 0x01008968: 0x1008968: addu  s3, v0, s3
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-L_100895c:
-// 0x0100895c: 0x100895c: slt   v0, s2, s0
+L_100896c:
+// 0x0100896c: 0x100896c: slt   v0, s2, s0
 	ldloc 8
 	ldloc 17
 	clt
 	stloc 5
-// 0x01008960: 0x1008960: bne   v0, zero, 0x100890c mult  s5, s6
+// 0x01008970: 0x1008970: bne   v0, zero, 0x100891c mult  s5, s6
 	ldloc 5
 	ldloc 13
 	ldloc 16
 	mul
 	stloc 14
-	brtrue L_100890c
+	brtrue L_100891c
 // --- basic block ---
-// 0x01008968: 0x1008968: mult  s5, s4
+// 0x01008978: 0x1008978: mult  s5, s4
 	ldloc 13
 	ldloc 15
 	mul
 	stloc 14
-// 0x0100896c: 0x100896c: mflo  lo
+// 0x0100897c: 0x100897c: mflo  lo
 	ldloc 14
 	stloc 5
-// 0x01008970: 0x1008970: j	 0x1008a40 addu  v0, v0, s3
+// 0x01008980: 0x1008980: j	 0x1008a50 addu  v0, v0, s3
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-	br L_1008a40
+	br L_1008a50
 // --- basic block ---
-L_1008978:
-// 0x01008978: 0x1008978: lb    v1, 0(v1)
+L_1008988:
+// 0x01008988: 0x1008988: lb    v1, 0(v1)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0100897c: 0x100897c: sll   zero, zero, 0
-// 0x01008980: 0x1008980: addiu a0, v1, -48
+// 0x0100898c: 0x100898c: sll   zero, zero, 0
+// 0x01008990: 0x1008990: addiu a0, v1, -48
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc.1
-// 0x01008984: 0x1008984: sltiu a1, a0, 10
+// 0x01008994: 0x1008994: sltiu a1, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	clt.un
 	stloc.2
-// 0x01008988: 0x1008988: bne   a1, zero, 0x10089f8 mult  v0, s6
+// 0x01008998: 0x1008998: bne   a1, zero, 0x1008a08 mult  v0, s6
 	ldloc.2
 	ldloc 5
 	ldloc 16
 	mul
 	stloc 14
-	brtrue L_10089f8
+	brtrue L_1008a08
 // --- basic block ---
-// 0x01008990: 0x1008990: beq   s5, zero, 0x1008a04 sll   zero, zero, 0
+// 0x010089a0: 0x10089a0: beq   s5, zero, 0x1008a14 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1008a04
+	brfalse L_1008a14
 // --- basic block ---
-// 0x01008998: 0x1008998: beq   v1, s4, 0x1008a04 sll   zero, zero, 0
+// 0x010089a8: 0x10089a8: beq   v1, s4, 0x1008a14 sll   zero, zero, 0
 	ldloc 6
 	ldloc 15
-	beq  L_1008a04
+	beq  L_1008a14
 // --- basic block ---
-// 0x010089a0: 0x10089a0: beq   v1, s3, 0x1008a04 addiu a1, v1, -65
+// 0x010089b0: 0x10089b0: beq   v1, s3, 0x1008a14 addiu a1, v1, -65
 	ldloc 6
 	ldloc 9
 	ldloc 6
 	ldc.i4.s -65
 	add
 	stloc.2
-	beq  L_1008a04
+	beq  L_1008a14
 // --- basic block ---
-// 0x010089a8: 0x10089a8: sltiu a1, a1, 26
+// 0x010089b8: 0x10089b8: sltiu a1, a1, 26
 	ldloc.2
 	ldc.i4.s 26
 	clt.un
 	stloc.2
-// 0x010089ac: 0x10089ac: beq   a1, zero, 0x10089bc addiu a1, v1, -97
+// 0x010089bc: 0x10089bc: beq   a1, zero, 0x10089cc addiu a1, v1, -97
 	ldloc.2
 	ldloc 6
 	ldc.i4.s -97
 	add
 	stloc.2
-	brfalse L_10089bc
+	brfalse L_10089cc
 // --- basic block ---
-// 0x010089b4: 0x10089b4: j	 0x10089f8 addiu v1, v1, -16
+// 0x010089c4: 0x10089c4: j	 0x1008a08 addiu v1, v1, -16
 	ldloc 6
 	ldc.i4.s -16
 	add
 	stloc 6
-	br L_10089f8
+	br L_1008a08
 // --- basic block ---
-L_10089bc:
-// 0x010089bc: 0x10089bc: sltiu a1, a1, 26
+L_10089cc:
+// 0x010089cc: 0x10089cc: sltiu a1, a1, 26
 	ldloc.2
 	ldc.i4.s 26
 	clt.un
 	stloc.2
-// 0x010089c0: 0x10089c0: beq   a1, zero, 0x10089d0 addu  a1, s8, zero
+// 0x010089d0: 0x10089d0: beq   a1, zero, 0x10089e0 addu  a1, s8, zero
 	ldloc.2
 	ldloc 10
 	stloc.2
-	brfalse L_10089d0
+	brfalse L_10089e0
 // --- basic block ---
-// 0x010089c8: 0x10089c8: j	 0x10089f4 addu  v1, a0, zero
+// 0x010089d8: 0x10089d8: j	 0x1008a04 addu  v1, a0, zero
 	ldloc.1
 	stloc 6
-	br L_10089f4
+	br L_1008a04
 // --- basic block ---
-L_10089d0:
-// 0x010089d0: 0x10089d0: addiu a0, zero, 4
+L_10089e0:
+// 0x010089e0: 0x10089e0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010089d4: 0x10089d4: addiu a2, zero, 1762
+// 0x010089e4: 0x10089e4: addiu a2, zero, 1762
 	ldc.i4 1762
 	stloc.3
-// 0x010089d8: 0x10089d8: addu  a3, s7, zero
+// 0x010089e8: 0x10089e8: addu  a3, s7, zero
 	ldloc 11
 	stloc 4
-// 0x010089dc: 0x10089dc: sw    v0, 24(sp)
+// 0x010089ec: 0x10089ec: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7293,7 +7293,7 @@ L_10089d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010089e0: 0x10089e0: jal   0x100449c sw    v1, 16(sp)
+// 0x010089f0: 0x10089f0: jal   0x100449c sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7312,7 +7312,7 @@ L_10089d0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010089e8: 0x10089e8: lw    v0, 24(sp)
+// 0x010089f8: 0x10089f8: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7321,96 +7321,96 @@ L_10089d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010089ec: 0x10089ec: j	 0x1008a34 addiu s2, s2, 1
+// 0x010089fc: 0x10089fc: j	 0x1008a44 addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_1008a34
+	br L_1008a44
 // --- basic block ---
-L_10089f4:
-// 0x010089f4: 0x10089f4: mult  v0, s6
+L_1008a04:
+// 0x01008a04: 0x1008a04: mult  v0, s6
 	ldloc 5
 	ldloc 16
 	mul
 	stloc 14
-L_10089f8:
-// 0x010089f8: 0x10089f8: mflo  lo
+L_1008a08:
+// 0x01008a08: 0x1008a08: mflo  lo
 	ldloc 14
 	stloc 5
-// 0x010089fc: 0x10089fc: addiu v0, v0, -48
+// 0x01008a0c: 0x1008a0c: addiu v0, v0, -48
 	ldloc 5
 	ldc.i4.s -48
 	add
 	stloc 5
-// 0x01008a00: 0x1008a00: addu  v0, v0, v1
+// 0x01008a10: 0x1008a10: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-L_1008a04:
-// 0x01008a04: 0x1008a04: j	 0x1008a34 addiu s2, s2, 1
+L_1008a14:
+// 0x01008a14: 0x1008a14: j	 0x1008a44 addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_1008a34
+	br L_1008a44
 // --- basic block ---
-L_1008a0c:
-// 0x01008a0c: 0x1008a0c: lui   s8, 0x0
+L_1008a1c:
+// 0x01008a1c: 0x1008a1c: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 10
-L_1008a10:
-// 0x01008a10: 0x1008a10: lui   s7, 0x0
+L_1008a20:
+// 0x01008a20: 0x1008a20: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01008a14: 0x1008a14: addiu s8, s8, 24004
+// 0x01008a24: 0x1008a24: addiu s8, s8, 24004
 	ldloc 10
 	ldc.i4 24004
 	add
 	stloc 10
-// 0x01008a18: 0x1008a18: addiu s7, s7, 24032
+// 0x01008a28: 0x1008a28: addiu s7, s7, 24032
 	ldloc 11
 	ldc.i4 24032
 	add
 	stloc 11
-// 0x01008a1c: 0x1008a1c: addu  v0, zero, zero
+// 0x01008a2c: 0x1008a2c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01008a20: 0x1008a20: addu  s2, zero, zero
+// 0x01008a30: 0x1008a30: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01008a24: 0x1008a24: addiu s6, zero, 10
+// 0x01008a34: 0x1008a34: addiu s6, zero, 10
 	ldc.i4.s 10
 	stloc 16
-// 0x01008a28: 0x1008a28: slti  s5, s0, 9
+// 0x01008a38: 0x1008a38: slti  s5, s0, 9
 	ldloc 17
 	ldc.i4.s 9
 	clt
 	stloc 13
-// 0x01008a2c: 0x1008a2c: addiu s4, zero, 45
+// 0x01008a3c: 0x1008a3c: addiu s4, zero, 45
 	ldc.i4.s 45
 	stloc 15
-// 0x01008a30: 0x1008a30: addiu s3, zero, 32
+// 0x01008a40: 0x1008a40: addiu s3, zero, 32
 	ldc.i4.s 32
 	stloc 9
-L_1008a34:
-// 0x01008a34: 0x1008a34: slt   v1, s2, s0
+L_1008a44:
+// 0x01008a44: 0x1008a44: slt   v1, s2, s0
 	ldloc 8
 	ldloc 17
 	clt
 	stloc 6
-// 0x01008a38: 0x1008a38: bne   v1, zero, 0x1008978 addu  v1, s1, s2
+// 0x01008a48: 0x1008a48: bne   v1, zero, 0x1008988 addu  v1, s1, s2
 	ldloc 6
 	ldloc 12
 	ldloc 8
 	add
 	stloc 6
-	brtrue L_1008978
+	brtrue L_1008988
 // --- basic block ---
-L_1008a40:
-// 0x01008a40: 0x1008a40: lw    ra, 68(sp)
-// 0x01008a44: 0x1008a44: lw    s8, 64(sp)
+L_1008a50:
+// 0x01008a50: 0x1008a50: lw    ra, 68(sp)
+// 0x01008a54: 0x1008a54: lw    s8, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7419,7 +7419,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01008a48: 0x1008a48: lw    s7, 60(sp)
+// 0x01008a58: 0x1008a58: lw    s7, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7428,7 +7428,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01008a4c: 0x1008a4c: lw    s6, 56(sp)
+// 0x01008a5c: 0x1008a5c: lw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7437,7 +7437,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01008a50: 0x1008a50: lw    s5, 52(sp)
+// 0x01008a60: 0x1008a60: lw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7446,7 +7446,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01008a54: 0x1008a54: lw    s4, 48(sp)
+// 0x01008a64: 0x1008a64: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7455,7 +7455,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01008a58: 0x1008a58: lw    s3, 44(sp)
+// 0x01008a68: 0x1008a68: lw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7464,7 +7464,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01008a5c: 0x1008a5c: lw    s2, 40(sp)
+// 0x01008a6c: 0x1008a6c: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7473,7 +7473,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01008a60: 0x1008a60: lw    s1, 36(sp)
+// 0x01008a70: 0x1008a70: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7482,7 +7482,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01008a64: 0x1008a64: lw    s0, 32(sp)
+// 0x01008a74: 0x1008a74: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7491,7 +7491,7 @@ L_1008a40:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01008a68: 0x1008a68: jr    ra addiu sp, sp, 72
+// 0x01008a78: 0x1008a78: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
diff --git a/converted/Cibyl50.j b/converted/Cibyl50.j
index 65e646e..a24d8da 100644
--- a/converted/Cibyl50.j
+++ b/converted/Cibyl50.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl50::.ctor
 
-.method public static int32 roadmap_bar_initialize_1043c14(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_bar_initialize_1043c24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s2,int32 s3,int32 s4,int32 s0,int32 ra,int32 lo)
@@ -94,24 +94,24 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043c14: 0x1043c14: lui   v1, 0x60000
+// 0x01043c24: 0x1043c24: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01043c18: 0x1043c18: addiu sp, sp, -56
+// 0x01043c28: 0x1043c28: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01043c1c: 0x1043c1c: addiu v1, v1, 12660
+// 0x01043c2c: 0x1043c2c: addiu v1, v1, 13124
 	ldloc 6
-	ldc.i4 12660
+	ldc.i4 13124
 	add
 	stloc 6
-// 0x01043c20: 0x1043c20: lui   v0, 0x60000
+// 0x01043c30: 0x1043c30: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01043c24: 0x1043c24: sw    ra, 52(sp)
-// 0x01043c28: 0x1043c28: sw    s4, 48(sp)
+// 0x01043c34: 0x1043c34: sw    ra, 52(sp)
+// 0x01043c38: 0x1043c38: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -120,7 +120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01043c2c: 0x1043c2c: sw    s3, 44(sp)
+// 0x01043c3c: 0x1043c3c: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -129,7 +129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01043c30: 0x1043c30: sw    s2, 40(sp)
+// 0x01043c40: 0x1043c40: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -138,7 +138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01043c34: 0x1043c34: sw    s1, 36(sp)
+// 0x01043c44: 0x1043c44: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -147,7 +147,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01043c38: 0x1043c38: sw    s0, 32(sp)
+// 0x01043c48: 0x1043c48: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -156,7 +156,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01043c3c: 0x1043c3c: sw    zero, 84(v1)
+// 0x01043c4c: 0x1043c4c: sw    zero, 84(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -165,41 +165,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01043c40: 0x1043c40: addiu v0, v0, 12748
+// 0x01043c50: 0x1043c50: addiu v0, v0, 13212
 	ldloc 5
-	ldc.i4 12748
+	ldc.i4 13212
 	add
 	stloc 5
-// 0x01043c44: 0x1043c44: addu  a0, zero, zero
+// 0x01043c54: 0x1043c54: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01043c48: 0x1043c48: addiu a1, zero, 80
+// 0x01043c58: 0x1043c58: addiu a1, zero, 80
 	ldc.i4.s 80
 	stloc.2
-L_1043c4c:
-// 0x01043c4c: 0x1043c4c: addu  a3, v1, a0
+L_1043c5c:
+// 0x01043c5c: 0x1043c5c: addu  a3, v1, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 4
-// 0x01043c50: 0x1043c50: addu  a2, v0, a0
+// 0x01043c60: 0x1043c60: addu  a2, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.3
-// 0x01043c54: 0x1043c54: addiu a0, a0, 4
+// 0x01043c64: 0x1043c64: addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x01043c58: 0x1043c58: sw    zero, 0(a3)
+// 0x01043c68: 0x1043c68: sw    zero, 0(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01043c5c: 0x1043c5c: bne   a0, a1, 0x1043c4c sw    zero, 0(a2)
+// 0x01043c6c: 0x1043c6c: bne   a0, a1, 0x1043c5c sw    zero, 0(a2)
 	ldloc.1
 	ldloc.2
 	ldloc 7
@@ -208,26 +208,26 @@ L_1043c4c:
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_1043c4c
+	bne.un L_1043c5c
 // --- basic block ---
-// 0x01043c64: 0x1043c64: addiu s0, zero, 1
+// 0x01043c74: 0x1043c74: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x01043c68: 0x1043c68: lui   a2, 0x10000
+// 0x01043c78: 0x1043c78: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01043c6c: 0x1043c6c: addiu a2, a2, -2632
+// 0x01043c7c: 0x1043c7c: addiu a2, a2, -2636
 	ldloc.3
-	ldc.i4 -2632
+	ldc.i4 -2636
 	add
 	stloc.3
-// 0x01043c70: 0x1043c70: addu  a0, zero, zero
+// 0x01043c80: 0x1043c80: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01043c74: 0x1043c74: addiu a1, zero, 3
+// 0x01043c84: 0x1043c84: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01043c78: 0x1043c78: sw    s0, 80(v1)
+// 0x01043c88: 0x1043c88: sw    s0, 80(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -236,7 +236,7 @@ L_1043c4c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01043c7c: 0x1043c7c: jal   0x10a1918 sw    s0, 80(v0)
+// 0x01043c8c: 0x1043c8c: jal   0x10a1f60 sw    s0, 80(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -250,33 +250,33 @@ L_1043c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043c84: 0x1043c84: beq   v0, zero, 0x1043e20 addu  s2, v0, zero
+// 0x01043c94: 0x1043c94: beq   v0, zero, 0x1043e30 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_1043e20
+	brfalse L_1043e30
 // --- basic block ---
-// 0x01043c8c: 0x1043c8c: jal   0x104dffc addu  a0, v0, zero
+// 0x01043c9c: 0x1043c9c: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043c94: 0x1043c94: lui   s1, 0x0
+// 0x01043ca4: 0x1043ca4: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01043c98: 0x1043c98: addu  a0, s2, zero
+// 0x01043ca8: 0x1043ca8: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01043c9c: 0x1043c9c: jal   0x104e020 sw    v0, 13344(s1)
+// 0x01043cac: 0x1043cac: jal   0x104e030 sw    v0, 13344(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -286,31 +286,31 @@ L_1043c4c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043ca4: 0x1043ca4: addiu s1, s1, 13344
+// 0x01043cb4: 0x1043cb4: addiu s1, s1, 13344
 	ldloc 8
 	ldc.i4 13344
 	add
 	stloc 8
-// 0x01043ca8: 0x1043ca8: lui   a2, 0x10000
+// 0x01043cb8: 0x1043cb8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01043cac: 0x1043cac: addiu a2, a2, -3192
+// 0x01043cbc: 0x1043cbc: addiu a2, a2, -3196
 	ldloc.3
-	ldc.i4 -3192
+	ldc.i4 -3196
 	add
 	stloc.3
-// 0x01043cb0: 0x1043cb0: addu  a0, zero, zero
+// 0x01043cc0: 0x1043cc0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01043cb4: 0x1043cb4: addiu a1, zero, 3
+// 0x01043cc4: 0x1043cc4: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01043cb8: 0x1043cb8: jal   0x10a1918 sw    v0, 4(s1)
+// 0x01043cc8: 0x1043cc8: jal   0x10a1f60 sw    v0, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -324,33 +324,33 @@ L_1043c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043cc0: 0x1043cc0: beq   v0, zero, 0x1043e20 addu  s3, v0, zero
+// 0x01043cd0: 0x1043cd0: beq   v0, zero, 0x1043e30 addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_1043e20
+	brfalse L_1043e30
 // --- basic block ---
-// 0x01043cc8: 0x1043cc8: jal   0x104dffc addu  a0, v0, zero
+// 0x01043cd8: 0x1043cd8: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043cd0: 0x1043cd0: lui   s4, 0x0
+// 0x01043ce0: 0x1043ce0: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01043cd4: 0x1043cd4: addu  a0, s3, zero
+// 0x01043ce4: 0x1043ce4: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01043cd8: 0x1043cd8: jal   0x104e020 sw    v0, 13336(s4)
+// 0x01043ce8: 0x1043ce8: jal   0x104e030 sw    v0, 13336(s4)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -360,20 +360,20 @@ L_1043c4c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043ce0: 0x1043ce0: addiu s4, s4, 13336
+// 0x01043cf0: 0x1043cf0: addiu s4, s4, 13336
 	ldloc 11
 	ldc.i4 13336
 	add
 	stloc 11
-// 0x01043ce4: 0x1043ce4: addu  a0, s2, zero
+// 0x01043cf4: 0x1043cf4: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01043ce8: 0x1043ce8: jal   0x1042688 sw    v0, 4(s4)
+// 0x01043cf8: 0x1043cf8: jal   0x1042698 sw    v0, 4(s4)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -387,23 +387,23 @@ L_1043c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::createBGImage_1042688(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::createBGImage_1042698(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043cf0: 0x1043cf0: lui   v1, 0x60000
+// 0x01043d00: 0x1043d00: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01043cf4: 0x1043cf4: addu  a0, s3, zero
+// 0x01043d04: 0x1043d04: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01043cf8: 0x1043cf8: jal   0x1042688 sw    v0, 12644(v1)
+// 0x01043d08: 0x1043d08: jal   0x1042698 sw    v0, 13108(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3161
+	ldc.i4 3277
 	add
 	ldloc 5
 	stelem.i4
@@ -412,23 +412,23 @@ L_1043c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::createBGImage_1042688(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::createBGImage_1042698(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043d00: 0x1043d00: addu  a0, s2, zero
+// 0x01043d10: 0x1043d10: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01043d04: 0x1043d04: lui   v1, 0x60000
+// 0x01043d14: 0x1043d14: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01043d08: 0x1043d08: jal   0x104ec70 sw    v0, 12648(v1)
+// 0x01043d18: 0x1043d18: jal   0x104ec80 sw    v0, 13112(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3162
+	ldc.i4 3278
 	add
 	ldloc 5
 	stelem.i4
@@ -437,12 +437,12 @@ L_1043c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043d10: 0x1043d10: jal   0x104ec70 addu  a0, s3, zero
+// 0x01043d20: 0x1043d20: jal   0x104ec80 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -450,44 +450,44 @@ L_1043c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043d18: 0x1043d18: lui   a0, 0x0
+// 0x01043d28: 0x1043d28: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01043d1c: 0x1043d1c: lui   a1, 0x10000
+// 0x01043d2c: 0x1043d2c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01043d20: 0x1043d20: lui   a3, 0x10000
+// 0x01043d30: 0x1043d30: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01043d24: 0x1043d24: addiu s2, sp, 24
+// 0x01043d34: 0x1043d34: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x01043d28: 0x1043d28: addiu a0, a0, 26244
+// 0x01043d38: 0x1043d38: addiu a0, a0, 26244
 	ldloc.1
 	ldc.i4 26244
 	add
 	stloc.1
-// 0x01043d2c: 0x1043d2c: addiu a1, a1, -2612
+// 0x01043d3c: 0x1043d3c: addiu a1, a1, -2616
 	ldloc.2
-	ldc.i4 -2612
+	ldc.i4 -2616
 	add
 	stloc.2
-// 0x01043d30: 0x1043d30: addiu a3, a3, 6924
+// 0x01043d40: 0x1043d40: addiu a3, a3, 6920
 	ldloc 4
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc 4
-// 0x01043d34: 0x1043d34: addu  a2, zero, zero
+// 0x01043d44: 0x1043d44: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01043d38: 0x1043d38: jal   0x104d770 sw    s2, 16(sp)
+// 0x01043d48: 0x1043d48: jal   0x104d780 sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -501,34 +501,34 @@ L_1043c4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_map_104d770(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_map_104d780(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043d40: 0x1043d40: bne   v0, zero, 0x1043d68 lui   a3, 0x10000
+// 0x01043d50: 0x1043d50: bne   v0, zero, 0x1043d78 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1043d68
+	brtrue L_1043d78
 // --- basic block ---
-// 0x01043d48: 0x1043d48: lui   a1, 0x10000
+// 0x01043d58: 0x1043d58: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01043d4c: 0x1043d4c: addiu a1, a1, -3296
+// 0x01043d5c: 0x1043d5c: addiu a1, a1, -3300
 	ldloc.2
-	ldc.i4 -3296
+	ldc.i4 -3300
 	add
 	stloc.2
-// 0x01043d50: 0x1043d50: addiu a3, a3, -2604
+// 0x01043d60: 0x1043d60: addiu a3, a3, -2608
 	ldloc 4
-	ldc.i4 -2604
+	ldc.i4 -2608
 	add
 	stloc 4
-// 0x01043d54: 0x1043d54: addiu a0, zero, 4
+// 0x01043d64: 0x1043d64: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043d58: 0x1043d58: jal   0x100449c addiu a2, zero, 1273
+// 0x01043d68: 0x1043d68: jal   0x100449c addiu a2, zero, 1273
 	ldc.i4 1273
 	stloc.3
 	ldloc.0
@@ -541,11 +541,11 @@ L_1043c4c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043d60: 0x1043d60: j	 0x1043e20 sll   zero, zero, 0
-	br L_1043e20
+// 0x01043d70: 0x1043d70: j	 0x1043e30 sll   zero, zero, 0
+	br L_1043e30
 // --- basic block ---
-L_1043d68:
-// 0x01043d68: 0x1043d68: lw    a0, 24(sp)
+L_1043d78:
+// 0x01043d78: 0x1043d78: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -554,12 +554,12 @@ L_1043d68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043d6c: 0x1043d6c: jal   0x104d414 sll   zero, zero, 0
+// 0x01043d7c: 0x1043d7c: jal   0x104d424 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_base_104d414(int32)
+	call int32 Cibyl57::roadmap_file_base_104d424(int32)
 	stloc 5
 // --- basic block ---
-// 0x01043d74: 0x1043d74: lw    a0, 24(sp)
+// 0x01043d84: 0x1043d84: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -568,17 +568,17 @@ L_1043d68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01043d78: 0x1043d78: jal   0x104d428 addu  s3, v0, zero
+// 0x01043d88: 0x1043d88: jal   0x104d438 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_file_size_104d428(int32)
+	call int32 Cibyl57::roadmap_file_size_104d438(int32)
 	stloc 5
 // --- basic block ---
-// 0x01043d80: 0x1043d80: addu  a1, v0, zero
+// 0x01043d90: 0x1043d90: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01043d84: 0x1043d84: jal   0x10433fc addu  a0, s3, zero
+// 0x01043d94: 0x1043d94: jal   0x104340c addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -586,12 +586,12 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl49::T_92_10433fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl49::T_92_104340c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043d8c: 0x1043d8c: jal   0x104d628 addu  a0, s2, zero
+// 0x01043d9c: 0x1043d9c: jal   0x104d638 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -599,12 +599,12 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_unmap_104d628(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_unmap_104d638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043d94: 0x1043d94: lw    s1, 4(s1)
+// 0x01043da4: 0x1043da4: lw    s1, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -613,37 +613,37 @@ L_1043d68:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01043d98: 0x1043d98: addu  a0, zero, zero
+// 0x01043da8: 0x1043da8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01043d9c: 0x1043d9c: jal   0x102f90c addu  a1, s1, zero
+// 0x01043dac: 0x1043dac: jal   0x102f91c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f90c(int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f91c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043da4: 0x1043da4: addiu v0, zero, 2
+// 0x01043db4: 0x1043db4: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01043da8: 0x1043da8: div   s1, v0
+// 0x01043db8: 0x1043db8: div   s1, v0
 	ldloc 8
 	ldloc 5
 	div
 	stloc 14
-// 0x01043dac: 0x1043dac: mflo  lo
+// 0x01043dbc: 0x1043dbc: mflo  lo
 	ldloc 14
 	stloc 8
-// 0x01043db0: 0x1043db0: subu  s1, zero, s1
+// 0x01043dc0: 0x1043dc0: subu  s1, zero, s1
 	ldloc 8
 	neg
 	stloc 8
-// 0x01043db4: 0x1043db4: jal   0x1020f7c addiu a0, s1, 15
+// 0x01043dc4: 0x1043dc4: jal   0x1020f8c addiu a0, s1, 15
 	ldloc 8
 	ldc.i4.s 15
 	add
@@ -653,20 +653,20 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_center_1020f7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_center_1020f8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043dbc: 0x1043dbc: lui   a0, 0x1040000
+// 0x01043dcc: 0x1043dcc: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01043dc0: 0x1043dc0: addiu a0, a0, 9164
+// 0x01043dd0: 0x1043dd0: addiu a0, a0, 9180
 	ldloc.1
-	ldc.i4 9164
+	ldc.i4 9180
 	add
 	stloc.1
-// 0x01043dc4: 0x1043dc4: jal   0x104bad8 addiu a1, zero, 2
+// 0x01043dd4: 0x1043dd4: jal   0x104bae8 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -674,20 +674,20 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043dcc: 0x1043dcc: lui   a0, 0x1040000
+// 0x01043ddc: 0x1043ddc: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01043dd0: 0x1043dd0: addiu a0, a0, 9180
+// 0x01043de0: 0x1043de0: addiu a0, a0, 9196
 	ldloc.1
-	ldc.i4 9180
+	ldc.i4 9196
 	add
 	stloc.1
-// 0x01043dd4: 0x1043dd4: jal   0x104bab0 addiu a1, zero, 2
+// 0x01043de4: 0x1043de4: jal   0x104bac0 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -695,20 +695,20 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043ddc: 0x1043ddc: lui   a0, 0x1040000
+// 0x01043dec: 0x1043dec: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01043de0: 0x1043de0: addiu a0, a0, 10376
+// 0x01043df0: 0x1043df0: addiu a0, a0, 10392
 	ldloc.1
-	ldc.i4 10376
+	ldc.i4 10392
 	add
 	stloc.1
-// 0x01043de4: 0x1043de4: jal   0x104ba38 addiu a1, zero, 2
+// 0x01043df4: 0x1043df4: jal   0x104ba48 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -716,20 +716,20 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba38(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043dec: 0x1043dec: lui   a0, 0x1040000
+// 0x01043dfc: 0x1043dfc: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01043df0: 0x1043df0: addiu a0, a0, 9196
+// 0x01043e00: 0x1043e00: addiu a0, a0, 9212
 	ldloc.1
-	ldc.i4 9196
+	ldc.i4 9212
 	add
 	stloc.1
-// 0x01043df4: 0x1043df4: jal   0x104b9e8 addiu a1, zero, 3
+// 0x01043e04: 0x1043e04: jal   0x104b9f8 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -737,20 +737,20 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_drag_start_104b9e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_drag_start_104b9f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043dfc: 0x1043dfc: lui   a0, 0x1040000
+// 0x01043e0c: 0x1043e0c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01043e00: 0x1043e00: addiu a0, a0, 13008
+// 0x01043e10: 0x1043e10: addiu a0, a0, 13024
 	ldloc.1
-	ldc.i4 13008
+	ldc.i4 13024
 	add
 	stloc.1
-// 0x01043e04: 0x1043e04: jal   0x104ba10 addiu a1, zero, 2
+// 0x01043e14: 0x1043e14: jal   0x104ba20 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -758,42 +758,42 @@ L_1043d68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_released_104ba10(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_released_104ba20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043e0c: 0x1043e0c: lui   a0, 0x1040000
+// 0x01043e1c: 0x1043e1c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01043e10: 0x1043e10: jal   0x1014064 addiu a0, a0, 9316
+// 0x01043e20: 0x1043e20: jal   0x1014074 addiu a0, a0, 9332
 	ldloc.1
-	ldc.i4 9316
+	ldc.i4 9332
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01043e18: 0x1043e18: lui   v0, 0x60000
+// 0x01043e28: 0x1043e28: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01043e1c: 0x1043e1c: sw    s0, 12652(v0)
+// 0x01043e2c: 0x1043e2c: sw    s0, 13116(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3163
+	ldc.i4 3279
 	add
 	ldloc 12
 	stelem.i4
-L_1043e20:
-// 0x01043e20: 0x1043e20: lw    ra, 52(sp)
-// 0x01043e24: 0x1043e24: lw    s4, 48(sp)
+L_1043e30:
+// 0x01043e30: 0x1043e30: lw    ra, 52(sp)
+// 0x01043e34: 0x1043e34: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -802,7 +802,7 @@ L_1043e20:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01043e28: 0x1043e28: lw    s3, 44(sp)
+// 0x01043e38: 0x1043e38: lw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -811,7 +811,7 @@ L_1043e20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01043e2c: 0x1043e2c: lw    s2, 40(sp)
+// 0x01043e3c: 0x1043e3c: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -820,7 +820,7 @@ L_1043e20:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01043e30: 0x1043e30: lw    s1, 36(sp)
+// 0x01043e40: 0x1043e40: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -829,7 +829,7 @@ L_1043e20:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01043e34: 0x1043e34: lw    s0, 32(sp)
+// 0x01043e44: 0x1043e44: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -838,7 +838,7 @@ L_1043e20:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01043e38: 0x1043e38: jr    ra addiu sp, sp, 56
+// 0x01043e48: 0x1043e48: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -850,7 +850,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_get_count_1043e40()
+.method public static int32 roadmap_prompts_get_count_1043e50()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -867,25 +867,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043e40: 0x1043e40: lui   v0, 0x60000
+// 0x01043e50: 0x1043e50: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01043e44: 0x1043e44: lw    v0, 12844(v0)
+// 0x01043e54: 0x1043e54: lw    v0, 13308(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc.0
-// 0x01043e48: 0x1043e48: jr    ra sll   zero, zero, 0
+// 0x01043e58: 0x1043e58: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_prompts_get_values_1043e50()
+.method public static int32 roadmap_prompts_get_values_1043e60()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -899,12 +899,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043e50: 0x1043e50: lui   v0, 0x60000
+// 0x01043e60: 0x1043e60: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01043e54: 0x1043e54: jr    ra addiu v0, v0, 13172
+// 0x01043e64: 0x1043e64: jr    ra addiu v0, v0, 13636
 	ldloc.0
-	ldc.i4 13172
+	ldc.i4 13636
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -912,7 +912,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_prompts_get_labels_1043e5c()
+.method public static int32 roadmap_prompts_get_labels_1043e6c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -926,12 +926,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043e5c: 0x1043e5c: lui   v0, 0x60000
+// 0x01043e6c: 0x1043e6c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc.0
-// 0x01043e60: 0x1043e60: jr    ra addiu v0, v0, 13052
+// 0x01043e70: 0x1043e70: jr    ra addiu v0, v0, 13516
 	ldloc.0
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -939,7 +939,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_prompts_exist_1043e68()
+.method public static int32 roadmap_prompts_exist_1043e78()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -953,7 +953,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043e68: 0x1043e68: jr    ra addiu v0, zero, 1
+// 0x01043e78: 0x1043e78: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -961,7 +961,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 s1,int32 ra)
@@ -1002,12 +1002,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043e70: 0x1043e70: addiu sp, sp, -32
+// 0x01043e80: 0x1043e80: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01043e74: 0x1043e74: sw    s0, 20(sp)
+// 0x01043e84: 0x1043e84: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1016,35 +1016,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01043e78: 0x1043e78: lui   a0, 0x20000
+// 0x01043e88: 0x1043e88: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01043e7c: 0x1043e7c: lui   s0, 0x10000
+// 0x01043e8c: 0x1043e8c: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01043e80: 0x1043e80: lui   a1, 0x0
+// 0x01043e90: 0x1043e90: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01043e84: 0x1043e84: addiu a2, s0, 18500
+// 0x01043e94: 0x1043e94: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01043e88: 0x1043e88: addiu a0, a0, -26888
+// 0x01043e98: 0x1043e98: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01043e8c: 0x1043e8c: addiu a1, a1, 13352
+// 0x01043e9c: 0x1043e9c: addiu a1, a1, 13352
 	ldloc.2
 	ldc.i4 13352
 	add
 	stloc.2
-// 0x01043e90: 0x1043e90: addu  a3, zero, zero
+// 0x01043ea0: 0x1043ea0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01043e94: 0x1043e94: sw    ra, 28(sp)
-// 0x01043e98: 0x1043e98: jal   0x100edb0 sw    s1, 24(sp)
+// 0x01043ea4: 0x1043ea4: sw    ra, 28(sp)
+// 0x01043ea8: 0x1043ea8: jal   0x100edc0 sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1058,33 +1058,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01043ea0: 0x1043ea0: lui   s1, 0x10000
+// 0x01043eb0: 0x1043eb0: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01043ea4: 0x1043ea4: lui   a1, 0x0
+// 0x01043eb4: 0x1043eb4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01043ea8: 0x1043ea8: addiu a0, s1, 18248
+// 0x01043eb8: 0x1043eb8: addiu a0, s1, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01043eac: 0x1043eac: addiu a2, s0, 18500
+// 0x01043ebc: 0x1043ebc: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01043eb0: 0x1043eb0: addiu a1, a1, 13368
+// 0x01043ec0: 0x1043ec0: addiu a1, a1, 13368
 	ldloc.2
 	ldc.i4 13368
 	add
 	stloc.2
-// 0x01043eb4: 0x1043eb4: jal   0x100edb0 addu  a3, zero, zero
+// 0x01043ec4: 0x1043ec4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1092,30 +1092,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01043ebc: 0x1043ebc: lui   a1, 0x0
+// 0x01043ecc: 0x1043ecc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01043ec0: 0x1043ec0: addiu a0, s1, 18248
+// 0x01043ed0: 0x1043ed0: addiu a0, s1, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01043ec4: 0x1043ec4: addiu a2, s0, 18500
+// 0x01043ed4: 0x1043ed4: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01043ec8: 0x1043ec8: addiu a1, a1, 13384
+// 0x01043ed8: 0x1043ed8: addiu a1, a1, 13384
 	ldloc.2
 	ldc.i4 13384
 	add
 	stloc.2
-// 0x01043ecc: 0x1043ecc: jal   0x100edb0 addu  a3, zero, zero
+// 0x01043edc: 0x1043edc: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1123,30 +1123,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01043ed4: 0x1043ed4: lui   a1, 0x0
+// 0x01043ee4: 0x1043ee4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01043ed8: 0x1043ed8: addiu a0, s1, 18248
+// 0x01043ee8: 0x1043ee8: addiu a0, s1, 19712
 	ldloc 9
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01043edc: 0x1043edc: addiu a2, s0, 18500
+// 0x01043eec: 0x1043eec: addiu a2, s0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01043ee0: 0x1043ee0: addiu a1, a1, 13400
+// 0x01043ef0: 0x1043ef0: addiu a1, a1, 13400
 	ldloc.2
 	ldc.i4 13400
 	add
 	stloc.2
-// 0x01043ee4: 0x1043ee4: jal   0x100edb0 addu  a3, zero, zero
+// 0x01043ef4: 0x1043ef4: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1154,19 +1154,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01043eec: 0x1043eec: lw    ra, 28(sp)
-// 0x01043ef0: 0x1043ef0: addiu v1, zero, 1
+// 0x01043efc: 0x1043efc: lw    ra, 28(sp)
+// 0x01043f00: 0x1043f00: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01043ef4: 0x1043ef4: lui   v0, 0x60000
+// 0x01043f04: 0x1043f04: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01043ef8: 0x1043ef8: lw    s1, 24(sp)
+// 0x01043f08: 0x1043f08: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1175,7 +1175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01043efc: 0x1043efc: lw    s0, 20(sp)
+// 0x01043f0c: 0x1043f0c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1184,16 +1184,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01043f00: 0x1043f00: sw    v1, 12840(v0)
+// 0x01043f10: 0x1043f10: sw    v1, 13304(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldloc 8
 	stelem.i4
-// 0x01043f04: 0x1043f04: jr    ra addiu sp, sp, 32
+// 0x01043f14: 0x1043f14: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1205,7 +1205,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_prompts_conf_load_1043f0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_conf_load_1043f1c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s5,int32 s0,int32 s1,int32 s7,int32 s2,int32 s3,int32 s4,int32 s6,int32 ra)
@@ -1264,12 +1264,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01043f0c: 0x1043f0c: addiu sp, sp, -1104
+// 0x01043f1c: 0x1043f1c: addiu sp, sp, -1104
 	ldloc.0
 	ldc.i4 -1104
 	add
 	stloc.0
-// 0x01043f10: 0x1043f10: sw    s0, 1068(sp)
+// 0x01043f20: 0x1043f20: sw    s0, 1068(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1278,15 +1278,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01043f14: 0x1043f14: lui   a1, 0x10000
+// 0x01043f24: 0x1043f24: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01043f18: 0x1043f18: addiu s0, sp, 16
+// 0x01043f28: 0x1043f28: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x01043f1c: 0x1043f1c: sw    s2, 1076(sp)
+// 0x01043f2c: 0x1043f2c: sw    s2, 1076(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1295,7 +1295,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01043f20: 0x1043f20: sw    s1, 1072(sp)
+// 0x01043f30: 0x1043f30: sw    s1, 1072(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1304,22 +1304,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01043f24: 0x1043f24: addu  s2, a0, zero
+// 0x01043f34: 0x1043f34: addu  s2, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01043f28: 0x1043f28: addiu a1, a1, -2468
+// 0x01043f38: 0x1043f38: addiu a1, a1, -2472
 	ldloc.2
-	ldc.i4 -2468
+	ldc.i4 -2472
 	add
 	stloc.2
-// 0x01043f2c: 0x1043f2c: addu  a0, s0, zero
+// 0x01043f3c: 0x1043f3c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01043f30: 0x1043f30: lui   s1, 0x60000
+// 0x01043f40: 0x1043f40: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01043f34: 0x1043f34: sw    ra, 1100(sp)
-// 0x01043f38: 0x1043f38: sw    s7, 1096(sp)
+// 0x01043f44: 0x1043f44: sw    ra, 1100(sp)
+// 0x01043f48: 0x1043f48: sw    s7, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1328,7 +1328,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01043f3c: 0x1043f3c: sw    s6, 1092(sp)
+// 0x01043f4c: 0x1043f4c: sw    s6, 1092(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1337,7 +1337,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01043f40: 0x1043f40: sw    s5, 1088(sp)
+// 0x01043f50: 0x1043f50: sw    s5, 1088(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1346,7 +1346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01043f44: 0x1043f44: sw    s4, 1084(sp)
+// 0x01043f54: 0x1043f54: sw    s4, 1084(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1355,7 +1355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01043f48: 0x1043f48: sw    s3, 1080(sp)
+// 0x01043f58: 0x1043f58: sw    s3, 1080(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1364,12 +1364,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01043f4c: 0x1043f4c: jal   0x1001b68 sw    zero, 12844(s1)
+// 0x01043f5c: 0x1043f5c: jal   0x1001b68 sw    zero, 13308(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1380,16 +1380,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043f54: 0x1043f54: lui   a2, 0x0
+// 0x01043f64: 0x1043f64: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01043f58: 0x1043f58: addu  a1, s0, zero
+// 0x01043f68: 0x1043f68: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x01043f5c: 0x1043f5c: addu  a0, s2, zero
+// 0x01043f6c: 0x1043f6c: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x01043f60: 0x1043f60: jal   0x104dac8 addiu a2, a2, 26128
+// 0x01043f70: 0x1043f70: jal   0x104dad8 addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
@@ -1399,37 +1399,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043f68: 0x1043f68: bne   v0, zero, 0x1044034 addu  s0, v0, zero
+// 0x01043f78: 0x1043f78: bne   v0, zero, 0x1044044 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1044034
+	brtrue L_1044044
 // --- basic block ---
-// 0x01043f70: 0x1043f70: lui   a1, 0x10000
+// 0x01043f80: 0x1043f80: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01043f74: 0x1043f74: lui   a3, 0x10000
+// 0x01043f84: 0x1043f84: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01043f78: 0x1043f78: addiu a1, a1, -2452
+// 0x01043f88: 0x1043f88: addiu a1, a1, -2456
 	ldloc.2
-	ldc.i4 -2452
+	ldc.i4 -2456
 	add
 	stloc.2
-// 0x01043f7c: 0x1043f7c: addiu a3, a3, -2424
+// 0x01043f8c: 0x1043f8c: addiu a3, a3, -2428
 	ldloc 4
-	ldc.i4 -2424
+	ldc.i4 -2428
 	add
 	stloc 4
-// 0x01043f80: 0x1043f80: addiu a0, zero, 4
+// 0x01043f90: 0x1043f90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01043f84: 0x1043f84: jal   0x100449c addiu a2, zero, 320
+// 0x01043f94: 0x1043f94: jal   0x100449c addiu a2, zero, 320
 	ldc.i4 320
 	stloc.3
 	ldloc.0
@@ -1442,13 +1442,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043f8c: 0x1043f8c: j	 0x1044098 addu  v0, zero, zero
+// 0x01043f9c: 0x1043f9c: j	 0x10440a8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1044098
+	br L_10440a8
 // --- basic block ---
-L_1043f94:
-// 0x01043f94: 0x1043f94: jal   0x1001e98 sll   zero, zero, 0
+L_1043fa4:
+// 0x01043fa4: 0x1043fa4: jal   0x1001e98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1459,104 +1459,104 @@ L_1043f94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043f9c: 0x1043f9c: addu  a0, s2, zero
+// 0x01043fac: 0x1043fac: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x01043fa0: 0x1043fa0: beq   v0, zero, 0x1044060 addiu a1, zero, 1024
+// 0x01043fb0: 0x1043fb0: beq   v0, zero, 0x1044070 addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_1044060
+	brfalse L_1044070
 // --- basic block ---
-// 0x01043fa8: 0x1043fa8: jal   0x100e038 sll   zero, zero, 0
+// 0x01043fb8: 0x1043fb8: jal   0x100e048 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl10::roadmap_config_extract_data_100e038(int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_extract_data_100e048(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043fb0: 0x1043fb0: addu  s5, v0, zero
+// 0x01043fc0: 0x1043fc0: addu  s5, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01043fb4: 0x1043fb4: addu  a0, v0, zero
+// 0x01043fc4: 0x1043fc4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01043fb8: 0x1043fb8: beq   v0, zero, 0x1044048 addiu a1, zero, 44
+// 0x01043fc8: 0x1043fc8: beq   v0, zero, 0x1044058 addiu a1, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc.2
-	brfalse L_1044048
+	brfalse L_1044058
 // --- basic block ---
-// 0x01043fc0: 0x1043fc0: jal   0x100dfc8 sll   zero, zero, 0
+// 0x01043fd0: 0x1043fd0: jal   0x100dfd8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_until_100dfc8(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_until_100dfd8(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043fc8: 0x1043fc8: lb    a0, 0(v0)
+// 0x01043fd8: 0x1043fd8: lb    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01043fcc: 0x1043fcc: addiu v1, zero, 44
+// 0x01043fdc: 0x1043fdc: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 7
-// 0x01043fd0: 0x1043fd0: bne   a0, v1, 0x1044048 addiu a0, v0, 1
+// 0x01043fe0: 0x1043fe0: bne   a0, v1, 0x1044058 addiu a0, v0, 1
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_1044048
+	bne.un L_1044058
 // --- basic block ---
-// 0x01043fd8: 0x1043fd8: jal   0x100e004 sb    zero, 0(v0)
+// 0x01043fe8: 0x1043fe8: jal   0x100e014 sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_spaces_100e004(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_spaces_100e014(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043fe0: 0x1043fe0: addu  a0, v0, zero
+// 0x01043ff0: 0x1043ff0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01043fe4: 0x1043fe4: addu  a1, zero, zero
+// 0x01043ff4: 0x1043ff4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01043fe8: 0x1043fe8: jal   0x100dfc8 addu  s6, v0, zero
+// 0x01043ff8: 0x1043ff8: jal   0x100dfd8 addu  s6, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_until_100dfc8(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_until_100dfd8(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01043ff0: 0x1043ff0: sb    zero, 0(v0)
+// 0x01044000: 0x1044000: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01043ff4: 0x1043ff4: lw    s7, 12844(s1)
+// 0x01044004: 0x1044004: lw    s7, 13308(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc 11
-// 0x01043ff8: 0x1043ff8: addu  a0, s6, zero
+// 0x01044008: 0x1044008: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x01043ffc: 0x1043ffc: jal   0x1001ba8 sll   s7, s7, 2
+// 0x0104400c: 0x104400c: jal   0x1001ba8 sll   s7, s7, 2
 	ldloc 11
 	ldc.i4.2
 	shl
@@ -1571,31 +1571,31 @@ L_1043f94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044004: 0x1044004: addu  s7, s7, s4
+// 0x01044014: 0x1044014: addu  s7, s7, s4
 	ldloc 11
 	ldloc 14
 	add
 	stloc 11
-// 0x01044008: 0x1044008: addu  a0, s5, zero
+// 0x01044018: 0x1044018: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0104400c: 0x104400c: sw    v0, 0(s7)
+// 0x0104401c: 0x104401c: sw    v0, 0(s7)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01044010: 0x1044010: lw    s5, 12844(s1)
+// 0x01044020: 0x1044020: lw    s5, 13308(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044014: 0x1044014: jal   0x1001ba8 sll   s5, s5, 2
+// 0x01044024: 0x1044024: jal   0x1001ba8 sll   s5, s5, 2
 	ldloc 8
 	ldc.i4.2
 	shl
@@ -1610,87 +1610,87 @@ L_1043f94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104401c: 0x104401c: lw    v1, 12844(s1)
+// 0x0104402c: 0x104402c: lw    v1, 13308(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044020: 0x1044020: addu  s5, s5, s3
+// 0x01044030: 0x1044030: addu  s5, s5, s3
 	ldloc 8
 	ldloc 13
 	add
 	stloc 8
-// 0x01044024: 0x1044024: addiu v1, v1, 1
+// 0x01044034: 0x1044034: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01044028: 0x1044028: sw    v0, 0(s5)
+// 0x01044038: 0x1044038: sw    v0, 0(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104402c: 0x104402c: j	 0x1044048 sw    v1, 12844(s1)
+// 0x0104403c: 0x104403c: j	 0x1044058 sw    v1, 13308(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldloc 7
 	stelem.i4
-	br L_1044048
+	br L_1044058
 // --- basic block ---
-L_1044034:
-// 0x01044034: 0x1044034: lui   s4, 0x60000
+L_1044044:
+// 0x01044044: 0x1044044: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 14
-// 0x01044038: 0x1044038: lui   s3, 0x60000
+// 0x01044048: 0x1044048: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x0104403c: 0x104403c: addiu s4, s4, 13052
+// 0x0104404c: 0x104404c: addiu s4, s4, 13516
 	ldloc 14
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc 14
-// 0x01044040: 0x1044040: addiu s3, s3, 13172
+// 0x01044050: 0x1044050: addiu s3, s3, 13636
 	ldloc 13
-	ldc.i4 13172
+	ldc.i4 13636
 	add
 	stloc 13
-// 0x01044044: 0x1044044: addiu s2, sp, 36
+// 0x01044054: 0x1044054: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 12
-L_1044048:
-// 0x01044048: 0x1044048: jal   0x1001e30 addu  a0, s0, zero
+L_1044058:
+// 0x01044058: 0x1044058: jal   0x1001e30 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x01044050: 0x1044050: addu  a2, s0, zero
+// 0x01044060: 0x1044060: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x01044054: 0x1044054: addu  a0, s2, zero
+// 0x01044064: 0x1044064: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x01044058: 0x1044058: beq   v0, zero, 0x1043f94 addiu a1, zero, 1024
+// 0x01044068: 0x1044068: beq   v0, zero, 0x1043fa4 addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_1043f94
+	brfalse L_1043fa4
 // --- basic block ---
-L_1044060:
-// 0x01044060: 0x1044060: jal   0x10023b4 addu  a0, s0, zero
+L_1044070:
+// 0x01044070: 0x1044070: jal   0x10023b4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1703,51 +1703,51 @@ L_1044060:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044068: 0x1044068: lui   v0, 0x60000
+// 0x01044078: 0x1044078: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104406c: 0x104406c: lui   a0, 0x60000
+// 0x0104407c: 0x104407c: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01044070: 0x1044070: lui   v1, 0x60000
+// 0x01044080: 0x1044080: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01044074: 0x1044074: lw    a1, 12844(v0)
+// 0x01044084: 0x1044084: lw    a1, 13308(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc.2
-// 0x01044078: 0x1044078: addiu a0, a0, 13172
+// 0x01044088: 0x1044088: addiu a0, a0, 13636
 	ldloc.1
-	ldc.i4 13172
+	ldc.i4 13636
 	add
 	stloc.1
-// 0x0104407c: 0x104407c: addiu v1, v1, 13052
+// 0x0104408c: 0x104408c: addiu v1, v1, 13516
 	ldloc 7
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc 7
-// 0x01044080: 0x1044080: cibyl_sysc_arg 0x3
+// 0x01044090: 0x1044090: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01044084: 0x1044084: cibyl_sysc_arg 0x4
+// 0x01044094: 0x1044094: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01044088: 0x1044088: cibyl_sysc_arg 0x5
+// 0x01044098: 0x1044098: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104408c: 0x104408c: cibyl_sysc 0x6af
+// 0x0104409c: 0x104409c: cibyl_sysc 0x6af
 	call void [WazeWP7]Syscalls::NOPH_PromptsLoaded(int32,int32,int32)
-// 0x01044090: 0x1044090: addu  v1, v0, zero
+// 0x010440a0: 0x10440a0: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01044094: 0x1044094: addiu v0, zero, 1
+// 0x010440a4: 0x10440a4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1044098:
-// 0x01044098: 0x1044098: lw    ra, 1100(sp)
-// 0x0104409c: 0x104409c: lw    s7, 1096(sp)
+L_10440a8:
+// 0x010440a8: 0x10440a8: lw    ra, 1100(sp)
+// 0x010440ac: 0x10440ac: lw    s7, 1096(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1756,7 +1756,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010440a0: 0x10440a0: lw    s6, 1092(sp)
+// 0x010440b0: 0x10440b0: lw    s6, 1092(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1765,7 +1765,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010440a4: 0x10440a4: lw    s5, 1088(sp)
+// 0x010440b4: 0x10440b4: lw    s5, 1088(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1774,7 +1774,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010440a8: 0x10440a8: lw    s4, 1084(sp)
+// 0x010440b8: 0x10440b8: lw    s4, 1084(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1783,7 +1783,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010440ac: 0x10440ac: lw    s3, 1080(sp)
+// 0x010440bc: 0x10440bc: lw    s3, 1080(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1792,7 +1792,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010440b0: 0x10440b0: lw    s2, 1076(sp)
+// 0x010440c0: 0x10440c0: lw    s2, 1076(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1801,7 +1801,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010440b4: 0x10440b4: lw    s1, 1072(sp)
+// 0x010440c4: 0x10440c4: lw    s1, 1072(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1810,7 +1810,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010440b8: 0x10440b8: lw    s0, 1068(sp)
+// 0x010440c8: 0x10440c8: lw    s0, 1068(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1819,7 +1819,7 @@ L_1044098:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010440bc: 0x10440bc: jr    ra addiu sp, sp, 1104
+// 0x010440cc: 0x10440cc: jr    ra addiu sp, sp, 1104
 	ldloc.0
 	ldc.i4 1104
 	add
@@ -1831,7 +1831,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_get_downloading_lang_name_10440c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_get_downloading_lang_name_10440d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1866,43 +1866,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010440c4: 0x10440c4: lui   v0, 0x60000
+// 0x010440d4: 0x10440d4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010440c8: 0x10440c8: lw    v0, 12840(v0)
+// 0x010440d8: 0x10440d8: lw    v0, 13304(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x010440cc: 0x10440cc: addiu sp, sp, -24
+// 0x010440dc: 0x10440dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010440d0: 0x10440d0: bne   v0, zero, 0x10440e0 sw    ra, 20(sp)
+// 0x010440e0: 0x10440e0: bne   v0, zero, 0x10440f0 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_10440e0
+	brtrue L_10440f0
 // --- basic block ---
-// 0x010440d8: 0x10440d8: jal   0x1043e70 sll   zero, zero, 0
+// 0x010440e8: 0x10440e8: jal   0x1043e80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10440e0:
-// 0x010440e0: 0x10440e0: lui   a0, 0x0
+L_10440f0:
+// 0x010440f0: 0x10440f0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010440e4: 0x10440e4: jal   0x100e348 addiu a0, a0, 13384
+// 0x010440f4: 0x10440f4: jal   0x100e358 addiu a0, a0, 13384
 	ldloc.1
 	ldc.i4 13384
 	add
@@ -1912,14 +1912,14 @@ L_10440e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010440ec: 0x10440ec: lw    ra, 20(sp)
-// 0x010440f0: 0x10440f0: sll   zero, zero, 0
-// 0x010440f4: 0x10440f4: jr    ra addiu sp, sp, 24
+// 0x010440fc: 0x10440fc: lw    ra, 20(sp)
+// 0x01044100: 0x1044100: sll   zero, zero, 0
+// 0x01044104: 0x1044104: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1931,7 +1931,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_get_queued_lang_10440fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_get_queued_lang_104410c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1966,43 +1966,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010440fc: 0x10440fc: lui   v0, 0x60000
+// 0x0104410c: 0x104410c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044100: 0x1044100: lw    v0, 12840(v0)
+// 0x01044110: 0x1044110: lw    v0, 13304(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044104: 0x1044104: addiu sp, sp, -24
+// 0x01044114: 0x1044114: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01044108: 0x1044108: bne   v0, zero, 0x1044118 sw    ra, 20(sp)
+// 0x01044118: 0x1044118: bne   v0, zero, 0x1044128 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1044118
+	brtrue L_1044128
 // --- basic block ---
-// 0x01044110: 0x1044110: jal   0x1043e70 sll   zero, zero, 0
+// 0x01044120: 0x1044120: jal   0x1043e80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1044118:
-// 0x01044118: 0x1044118: lui   a0, 0x0
+L_1044128:
+// 0x01044128: 0x1044128: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104411c: 0x104411c: jal   0x100e348 addiu a0, a0, 13400
+// 0x0104412c: 0x104412c: jal   0x100e358 addiu a0, a0, 13400
 	ldloc.1
 	ldc.i4 13400
 	add
@@ -2012,14 +2012,14 @@ L_1044118:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01044124: 0x1044124: lw    ra, 20(sp)
-// 0x01044128: 0x1044128: sll   zero, zero, 0
-// 0x0104412c: 0x104412c: jr    ra addiu sp, sp, 24
+// 0x01044134: 0x1044134: lw    ra, 20(sp)
+// 0x01044138: 0x1044138: sll   zero, zero, 0
+// 0x0104413c: 0x104413c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2031,7 +2031,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2066,43 +2066,43 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044134: 0x1044134: lui   v0, 0x60000
+// 0x01044144: 0x1044144: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044138: 0x1044138: lw    v0, 12840(v0)
+// 0x01044148: 0x1044148: lw    v0, 13304(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104413c: 0x104413c: addiu sp, sp, -24
+// 0x0104414c: 0x104414c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01044140: 0x1044140: bne   v0, zero, 0x1044150 sw    ra, 20(sp)
+// 0x01044150: 0x1044150: bne   v0, zero, 0x1044160 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1044150
+	brtrue L_1044160
 // --- basic block ---
-// 0x01044148: 0x1044148: jal   0x1043e70 sll   zero, zero, 0
+// 0x01044158: 0x1044158: jal   0x1043e80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1044150:
-// 0x01044150: 0x1044150: lui   a0, 0x0
+L_1044160:
+// 0x01044160: 0x1044160: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01044154: 0x1044154: jal   0x100e348 addiu a0, a0, 13352
+// 0x01044164: 0x1044164: jal   0x100e358 addiu a0, a0, 13352
 	ldloc.1
 	ldc.i4 13352
 	add
@@ -2112,14 +2112,14 @@ L_1044150:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104415c: 0x104415c: lw    ra, 20(sp)
-// 0x01044160: 0x1044160: sll   zero, zero, 0
-// 0x01044164: 0x1044164: jr    ra addiu sp, sp, 24
+// 0x0104416c: 0x104416c: lw    ra, 20(sp)
+// 0x01044170: 0x1044170: sll   zero, zero, 0
+// 0x01044174: 0x1044174: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2131,7 +2131,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 prompts_downloads_warning_fn_104416c(int32,int32,int32,int32,int32)
+.method public static int32 prompts_downloads_warning_fn_104417c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 lo,int32 ra,int32 t0)
@@ -2178,12 +2178,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104416c: 0x104416c: addiu sp, sp, -40
+// 0x0104417c: 0x104417c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01044170: 0x1044170: sw    s0, 28(sp)
+// 0x01044180: 0x1044180: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2192,19 +2192,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01044174: 0x1044174: lui   s0, 0x60000
+// 0x01044184: 0x1044184: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01044178: 0x1044178: lw    v0, 12848(s0)
+// 0x01044188: 0x1044188: lw    v0, 13312(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104417c: 0x104417c: sw    s1, 32(sp)
+// 0x0104418c: 0x104418c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2213,22 +2213,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044180: 0x1044180: sw    ra, 36(sp)
-// 0x01044184: 0x1044184: bne   v0, zero, 0x10441a4 addu  s1, a0, zero
+// 0x01044190: 0x1044190: sw    ra, 36(sp)
+// 0x01044194: 0x1044194: bne   v0, zero, 0x10441b4 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
-	brtrue L_10441a4
+	brtrue L_10441b4
 // --- basic block ---
-// 0x0104418c: 0x104418c: lui   a2, 0x20000
+// 0x0104419c: 0x104419c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01044190: 0x1044190: addiu a2, a2, 48
+// 0x010441a0: 0x10441a0: addiu a2, a2, 512
 	ldloc.3
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.3
-// 0x01044194: 0x1044194: jal   0x1000f9c addiu a1, zero, 128
+// 0x010441a4: 0x10441a4: jal   0x1000f9c addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
 	ldloc.0
@@ -2241,18 +2241,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104419c: 0x104419c: j	 0x10441f8 addu  v0, zero, zero
+// 0x010441ac: 0x10441ac: j	 0x1044208 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10441f8
+	br L_1044208
 // --- basic block ---
-L_10441a4:
-// 0x010441a4: 0x10441a4: lui   a0, 0x10000
+L_10441b4:
+// 0x010441b4: 0x10441b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010441a8: 0x10441a8: jal   0x101cd60 addiu a0, a0, -2400
+// 0x010441b8: 0x10441b8: jal   0x101cd70 addiu a0, a0, -2404
 	ldloc.1
-	ldc.i4 -2400
+	ldc.i4 -2404
 	add
 	stloc.1
 	ldloc.0
@@ -2260,71 +2260,71 @@ L_10441a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010441b0: 0x10441b0: lui   v1, 0x60000
+// 0x010441c0: 0x10441c0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010441b4: 0x10441b4: lw    a0, 13292(v1)
+// 0x010441c4: 0x10441c4: lw    a0, 13756(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3323
+	ldc.i4 3439
 	add
 	ldelem.i4
 	stloc.1
-// 0x010441b8: 0x10441b8: addiu v1, zero, 100
+// 0x010441c8: 0x10441c8: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x010441bc: 0x10441bc: mult  a0, v1
+// 0x010441cc: 0x10441cc: mult  a0, v1
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 10
-// 0x010441c0: 0x10441c0: lw    v1, 12848(s0)
+// 0x010441d0: 0x10441d0: lw    v1, 13312(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc 7
-// 0x010441c4: 0x10441c4: lui   a2, 0x0
+// 0x010441d4: 0x10441d4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010441c8: 0x10441c8: addu  a3, v0, zero
+// 0x010441d8: 0x10441d8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010441cc: 0x10441cc: addu  a0, s1, zero
+// 0x010441dc: 0x10441dc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010441d0: 0x10441d0: addiu a2, a2, 25160
+// 0x010441e0: 0x10441e0: addiu a2, a2, 25160
 	ldloc.3
 	ldc.i4 25160
 	add
 	stloc.3
-// 0x010441d4: 0x10441d4: addiu a1, zero, 128
+// 0x010441e4: 0x10441e4: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x010441d8: 0x10441d8: mflo  lo
+// 0x010441e8: 0x10441e8: mflo  lo
 	ldloc 10
 	stloc 12
-// 0x010441dc: 0x10441dc: sll   zero, zero, 0
-// 0x010441e0: 0x10441e0: sll   zero, zero, 0
-// 0x010441e4: 0x10441e4: div   t0, v1
+// 0x010441ec: 0x10441ec: sll   zero, zero, 0
+// 0x010441f0: 0x10441f0: sll   zero, zero, 0
+// 0x010441f4: 0x10441f4: div   t0, v1
 	ldloc 12
 	ldloc 7
 	div
 	stloc 10
-// 0x010441e8: 0x10441e8: mflo  lo
+// 0x010441f8: 0x10441f8: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x010441ec: 0x10441ec: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010441fc: 0x10441fc: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2343,12 +2343,12 @@ L_10441a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010441f4: 0x10441f4: addiu v0, zero, 1
+// 0x01044204: 0x1044204: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10441f8:
-// 0x010441f8: 0x10441f8: lw    ra, 36(sp)
-// 0x010441fc: 0x10441fc: lw    s1, 32(sp)
+L_1044208:
+// 0x01044208: 0x1044208: lw    ra, 36(sp)
+// 0x0104420c: 0x104420c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2357,7 +2357,7 @@ L_10441f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01044200: 0x1044200: lw    s0, 28(sp)
+// 0x01044210: 0x1044210: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2366,7 +2366,7 @@ L_10441f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044204: 0x1044204: jr    ra addiu sp, sp, 40
+// 0x01044214: 0x1044214: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2378,7 +2378,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_get_prompt_value_from_name_10442b8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_get_prompt_value_from_name_10442c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s2,int32 s1,int32 s3,int32 ra,int32 v1)
@@ -2425,12 +2425,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010442b8: 0x10442b8: addiu sp, sp, -40
+// 0x010442c8: 0x10442c8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010442bc: 0x10442bc: sw    s1, 24(sp)
+// 0x010442cc: 0x10442cc: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2439,8 +2439,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010442c0: 0x10442c0: sw    ra, 36(sp)
-// 0x010442c4: 0x10442c4: sw    s3, 32(sp)
+// 0x010442d0: 0x10442d0: sw    ra, 36(sp)
+// 0x010442d4: 0x10442d4: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2449,7 +2449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010442c8: 0x10442c8: sw    s2, 28(sp)
+// 0x010442d8: 0x10442d8: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2458,7 +2458,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010442cc: 0x10442cc: sw    s0, 20(sp)
+// 0x010442dc: 0x10442dc: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2467,131 +2467,131 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010442d0: 0x10442d0: addu  s1, a0, zero
+// 0x010442e0: 0x10442e0: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010442d4: 0x10442d4: beq   a0, zero, 0x104434c addu  v0, zero, zero
+// 0x010442e4: 0x10442e4: beq   a0, zero, 0x104435c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_104434c
+	brfalse L_104435c
 // --- basic block ---
-// 0x010442dc: 0x10442dc: lui   s2, 0x60000
+// 0x010442ec: 0x10442ec: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x010442e0: 0x10442e0: addiu s2, s2, 13052
+// 0x010442f0: 0x10442f0: addiu s2, s2, 13516
 	ldloc 8
-	ldc.i4 13052
+	ldc.i4 13516
 	add
 	stloc 8
-// 0x010442e4: 0x10442e4: addu  s0, zero, zero
+// 0x010442f4: 0x10442f4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010442e8: 0x10442e8: j	 0x1044334 lui   s3, 0x60000
+// 0x010442f8: 0x10442f8: j	 0x1044344 lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 10
-	br L_1044334
+	br L_1044344
 // --- basic block ---
-L_10442f0:
-// 0x010442f0: 0x10442f0: lw    v0, 0(s2)
+L_1044300:
+// 0x01044300: 0x1044300: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010442f4: 0x10442f4: addiu s2, s2, 4
+// 0x01044304: 0x1044304: addiu s2, s2, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x010442f8: 0x10442f8: beq   v0, zero, 0x1044330 addu  a0, v0, zero
+// 0x01044308: 0x1044308: beq   v0, zero, 0x1044340 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1044330
+	brfalse L_1044340
 // --- basic block ---
-// 0x01044300: 0x1044300: jal   0x1001b14 sll   zero, zero, 0
+// 0x01044310: 0x1044310: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01044308: 0x1044308: bne   v0, zero, 0x1044334 addiu s0, s0, 1
+// 0x01044318: 0x1044318: bne   v0, zero, 0x1044344 addiu s0, s0, 1
 	ldloc 5
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_1044334
+	brtrue L_1044344
 // --- basic block ---
-// 0x01044310: 0x1044310: addiu s0, s0, -1
+// 0x01044320: 0x1044320: addiu s0, s0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x01044314: 0x1044314: lui   v0, 0x60000
+// 0x01044324: 0x1044324: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044318: 0x1044318: addiu v0, v0, 13172
+// 0x01044328: 0x1044328: addiu v0, v0, 13636
 	ldloc 5
-	ldc.i4 13172
+	ldc.i4 13636
 	add
 	stloc 5
-// 0x0104431c: 0x104431c: sll   s0, s0, 2
+// 0x0104432c: 0x104432c: sll   s0, s0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01044320: 0x1044320: addu  s0, s0, v0
+// 0x01044330: 0x1044330: addu  s0, s0, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x01044324: 0x1044324: lw    v0, 0(s0)
+// 0x01044334: 0x1044334: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01044328: 0x1044328: j	 0x104434c sll   zero, zero, 0
-	br L_104434c
+// 0x01044338: 0x1044338: j	 0x104435c sll   zero, zero, 0
+	br L_104435c
 // --- basic block ---
-L_1044330:
-// 0x01044330: 0x1044330: addiu s0, s0, 1
+L_1044340:
+// 0x01044340: 0x1044340: addiu s0, s0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_1044334:
-// 0x01044334: 0x1044334: lw    v0, 12844(s3)
+L_1044344:
+// 0x01044344: 0x1044344: lw    v0, 13308(s3)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044338: 0x1044338: sll   zero, zero, 0
-// 0x0104433c: 0x104433c: slt   v0, s0, v0
+// 0x01044348: 0x1044348: sll   zero, zero, 0
+// 0x0104434c: 0x104434c: slt   v0, s0, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x01044340: 0x1044340: bne   v0, zero, 0x10442f0 addu  a1, s1, zero
+// 0x01044350: 0x1044350: bne   v0, zero, 0x1044300 addu  a1, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brtrue L_10442f0
+	brtrue L_1044300
 // --- basic block ---
-// 0x01044348: 0x1044348: addu  v0, s1, zero
+// 0x01044358: 0x1044358: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-L_104434c:
-// 0x0104434c: 0x104434c: lw    ra, 36(sp)
-// 0x01044350: 0x1044350: lw    s3, 32(sp)
+L_104435c:
+// 0x0104435c: 0x104435c: lw    ra, 36(sp)
+// 0x01044360: 0x1044360: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2600,7 +2600,7 @@ L_104434c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01044354: 0x1044354: lw    s2, 28(sp)
+// 0x01044364: 0x1044364: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2609,7 +2609,7 @@ L_104434c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044358: 0x1044358: lw    s1, 24(sp)
+// 0x01044368: 0x1044368: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2618,7 +2618,7 @@ L_104434c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104435c: 0x104435c: lw    s0, 20(sp)
+// 0x0104436c: 0x104436c: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2627,7 +2627,7 @@ L_104434c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01044360: 0x1044360: jr    ra addiu sp, sp, 40
+// 0x01044370: 0x1044370: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2639,7 +2639,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_get_prompt_value_1044368(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_get_prompt_value_1044378(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s3,int32 v0,int32 s1,int32 s2,int32 s0,int32 s4,int32 ra,int32 v1)
@@ -2689,12 +2689,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044368: 0x1044368: addiu sp, sp, -40
+// 0x01044378: 0x1044378: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104436c: 0x104436c: sw    s0, 16(sp)
+// 0x0104437c: 0x104437c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2703,8 +2703,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01044370: 0x1044370: sw    ra, 36(sp)
-// 0x01044374: 0x1044374: sw    s4, 32(sp)
+// 0x01044380: 0x1044380: sw    ra, 36(sp)
+// 0x01044384: 0x1044384: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2713,7 +2713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01044378: 0x1044378: sw    s3, 28(sp)
+// 0x01044388: 0x1044388: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2722,7 +2722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104437c: 0x104437c: sw    s2, 24(sp)
+// 0x0104438c: 0x104438c: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2731,7 +2731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044380: 0x1044380: sw    s1, 20(sp)
+// 0x01044390: 0x1044390: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2740,103 +2740,103 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01044384: 0x1044384: addu  s0, a0, zero
+// 0x01044394: 0x1044394: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01044388: 0x1044388: beq   a0, zero, 0x10443e8 addu  v0, zero, zero
+// 0x01044398: 0x1044398: beq   a0, zero, 0x10443f8 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10443e8
+	brfalse L_10443f8
 // --- basic block ---
-// 0x01044390: 0x1044390: lui   s3, 0x60000
+// 0x010443a0: 0x10443a0: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01044394: 0x1044394: addiu s3, s3, 13172
+// 0x010443a4: 0x10443a4: addiu s3, s3, 13636
 	ldloc 6
-	ldc.i4 13172
+	ldc.i4 13636
 	add
 	stloc 6
-// 0x01044398: 0x1044398: addu  s2, zero, zero
+// 0x010443a8: 0x10443a8: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0104439c: 0x104439c: j	 0x10443d0 lui   s4, 0x60000
+// 0x010443ac: 0x10443ac: j	 0x10443e0 lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 11
-	br L_10443d0
+	br L_10443e0
 // --- basic block ---
-L_10443a4:
-// 0x010443a4: 0x10443a4: lw    s1, 0(s3)
+L_10443b4:
+// 0x010443b4: 0x10443b4: lw    s1, 0(s3)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010443a8: 0x10443a8: addiu s2, s2, 1
+// 0x010443b8: 0x10443b8: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010443ac: 0x10443ac: beq   s1, zero, 0x10443cc addu  a0, s1, zero
+// 0x010443bc: 0x10443bc: beq   s1, zero, 0x10443dc addu  a0, s1, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
-	brfalse L_10443cc
+	brfalse L_10443dc
 // --- basic block ---
-// 0x010443b4: 0x10443b4: jal   0x1001b14 sll   zero, zero, 0
+// 0x010443c4: 0x10443c4: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x010443bc: 0x10443bc: bne   v0, zero, 0x10443d0 addiu s3, s3, 4
+// 0x010443cc: 0x10443cc: bne   v0, zero, 0x10443e0 addiu s3, s3, 4
 	ldloc 7
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-	brtrue L_10443d0
+	brtrue L_10443e0
 // --- basic block ---
-// 0x010443c4: 0x10443c4: j	 0x10443e8 addu  v0, s1, zero
+// 0x010443d4: 0x10443d4: j	 0x10443f8 addu  v0, s1, zero
 	ldloc 8
 	stloc 7
-	br L_10443e8
+	br L_10443f8
 // --- basic block ---
-L_10443cc:
-// 0x010443cc: 0x10443cc: addiu s3, s3, 4
+L_10443dc:
+// 0x010443dc: 0x10443dc: addiu s3, s3, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-L_10443d0:
-// 0x010443d0: 0x10443d0: lw    v0, 12844(s4)
+L_10443e0:
+// 0x010443e0: 0x10443e0: lw    v0, 13308(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc 7
-// 0x010443d4: 0x10443d4: sll   zero, zero, 0
-// 0x010443d8: 0x10443d8: slt   v0, s2, v0
+// 0x010443e4: 0x10443e4: sll   zero, zero, 0
+// 0x010443e8: 0x10443e8: slt   v0, s2, v0
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 7
-// 0x010443dc: 0x10443dc: bne   v0, zero, 0x10443a4 addu  a1, s0, zero
+// 0x010443ec: 0x10443ec: bne   v0, zero, 0x10443b4 addu  a1, s0, zero
 	ldloc 7
 	ldloc 10
 	stloc.2
-	brtrue L_10443a4
+	brtrue L_10443b4
 // --- basic block ---
-// 0x010443e4: 0x10443e4: addu  v0, s0, zero
+// 0x010443f4: 0x10443f4: addu  v0, s0, zero
 	ldloc 10
 	stloc 7
-L_10443e8:
-// 0x010443e8: 0x10443e8: lw    ra, 36(sp)
-// 0x010443ec: 0x10443ec: lw    s4, 32(sp)
+L_10443f8:
+// 0x010443f8: 0x10443f8: lw    ra, 36(sp)
+// 0x010443fc: 0x10443fc: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2845,7 +2845,7 @@ L_10443e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010443f0: 0x10443f0: lw    s3, 28(sp)
+// 0x01044400: 0x1044400: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2854,7 +2854,7 @@ L_10443e8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010443f4: 0x10443f4: lw    s2, 24(sp)
+// 0x01044404: 0x1044404: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2863,7 +2863,7 @@ L_10443e8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010443f8: 0x10443f8: lw    s1, 20(sp)
+// 0x01044408: 0x1044408: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2872,7 +2872,7 @@ L_10443e8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010443fc: 0x10443fc: lw    s0, 16(sp)
+// 0x0104440c: 0x104440c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2881,7 +2881,7 @@ L_10443e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01044400: 0x1044400: jr    ra addiu sp, sp, 40
+// 0x01044410: 0x1044410: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2893,7 +2893,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_prompts_set_downloading_lang_name_1044408(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_set_downloading_lang_name_1044418(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -2928,31 +2928,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044408: 0x1044408: lui   v0, 0x60000
+// 0x01044418: 0x1044418: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104440c: 0x104440c: lw    v0, 12840(v0)
+// 0x0104441c: 0x104441c: lw    v0, 13304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044410: 0x1044410: addiu sp, sp, -32
+// 0x01044420: 0x1044420: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01044414: 0x1044414: sw    ra, 28(sp)
-// 0x01044418: 0x1044418: bne   v0, zero, 0x104442c addu  a1, a0, zero
+// 0x01044424: 0x1044424: sw    ra, 28(sp)
+// 0x01044428: 0x1044428: bne   v0, zero, 0x104443c addu  a1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc.2
-	brtrue L_104442c
+	brtrue L_104443c
 // --- basic block ---
-// 0x01044420: 0x1044420: jal   0x1043e70 sw    a0, 16(sp)
+// 0x01044430: 0x1044430: jal   0x1043e80 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2966,12 +2966,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01044428: 0x1044428: lw    a1, 16(sp)
+// 0x01044438: 0x1044438: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2980,11 +2980,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_104442c:
-// 0x0104442c: 0x104442c: lui   a0, 0x0
+L_104443c:
+// 0x0104443c: 0x104443c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01044430: 0x1044430: jal   0x100e5c0 addiu a0, a0, 13384
+// 0x01044440: 0x1044440: jal   0x100e5d0 addiu a0, a0, 13384
 	ldloc.1
 	ldc.i4 13384
 	add
@@ -2994,14 +2994,14 @@ L_104442c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01044438: 0x1044438: lw    ra, 28(sp)
-// 0x0104443c: 0x104443c: sll   zero, zero, 0
-// 0x01044440: 0x1044440: jr    ra addiu sp, sp, 32
+// 0x01044448: 0x1044448: lw    ra, 28(sp)
+// 0x0104444c: 0x104444c: sll   zero, zero, 0
+// 0x01044450: 0x1044450: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3013,7 +3013,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_set_queued_lang_1044448(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_set_queued_lang_1044458(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3048,31 +3048,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044448: 0x1044448: lui   v0, 0x60000
+// 0x01044458: 0x1044458: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104444c: 0x104444c: lw    v0, 12840(v0)
+// 0x0104445c: 0x104445c: lw    v0, 13304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044450: 0x1044450: addiu sp, sp, -32
+// 0x01044460: 0x1044460: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01044454: 0x1044454: sw    ra, 28(sp)
-// 0x01044458: 0x1044458: bne   v0, zero, 0x104446c addu  a1, a0, zero
+// 0x01044464: 0x1044464: sw    ra, 28(sp)
+// 0x01044468: 0x1044468: bne   v0, zero, 0x104447c addu  a1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc.2
-	brtrue L_104446c
+	brtrue L_104447c
 // --- basic block ---
-// 0x01044460: 0x1044460: jal   0x1043e70 sw    a0, 16(sp)
+// 0x01044470: 0x1044470: jal   0x1043e80 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3086,12 +3086,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01044468: 0x1044468: lw    a1, 16(sp)
+// 0x01044478: 0x1044478: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3100,11 +3100,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_104446c:
-// 0x0104446c: 0x104446c: lui   a0, 0x0
+L_104447c:
+// 0x0104447c: 0x104447c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01044470: 0x1044470: jal   0x100e5c0 addiu a0, a0, 13400
+// 0x01044480: 0x1044480: jal   0x100e5d0 addiu a0, a0, 13400
 	ldloc.1
 	ldc.i4 13400
 	add
@@ -3114,14 +3114,14 @@ L_104446c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01044478: 0x1044478: lw    ra, 28(sp)
-// 0x0104447c: 0x104447c: sll   zero, zero, 0
-// 0x01044480: 0x1044480: jr    ra addiu sp, sp, 32
+// 0x01044488: 0x1044488: lw    ra, 28(sp)
+// 0x0104448c: 0x104448c: sll   zero, zero, 0
+// 0x01044490: 0x1044490: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3133,7 +3133,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_set_update_time_1044488(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_set_update_time_1044498(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3168,31 +3168,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044488: 0x1044488: lui   v0, 0x60000
+// 0x01044498: 0x1044498: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104448c: 0x104448c: lw    v0, 12840(v0)
+// 0x0104449c: 0x104449c: lw    v0, 13304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044490: 0x1044490: addiu sp, sp, -32
+// 0x010444a0: 0x10444a0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01044494: 0x1044494: sw    ra, 28(sp)
-// 0x01044498: 0x1044498: bne   v0, zero, 0x10444ac addu  a1, a0, zero
+// 0x010444a4: 0x10444a4: sw    ra, 28(sp)
+// 0x010444a8: 0x10444a8: bne   v0, zero, 0x10444bc addu  a1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc.2
-	brtrue L_10444ac
+	brtrue L_10444bc
 // --- basic block ---
-// 0x010444a0: 0x10444a0: jal   0x1043e70 sw    a0, 16(sp)
+// 0x010444b0: 0x10444b0: jal   0x1043e80 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3206,12 +3206,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010444a8: 0x10444a8: lw    a1, 16(sp)
+// 0x010444b8: 0x10444b8: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3220,11 +3220,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_10444ac:
-// 0x010444ac: 0x10444ac: lui   a0, 0x0
+L_10444bc:
+// 0x010444bc: 0x10444bc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010444b0: 0x10444b0: jal   0x100e5c0 addiu a0, a0, 13368
+// 0x010444c0: 0x10444c0: jal   0x100e5d0 addiu a0, a0, 13368
 	ldloc.1
 	ldc.i4 13368
 	add
@@ -3234,14 +3234,14 @@ L_10444ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010444b8: 0x10444b8: lw    ra, 28(sp)
-// 0x010444bc: 0x10444bc: sll   zero, zero, 0
-// 0x010444c0: 0x10444c0: jr    ra addiu sp, sp, 32
+// 0x010444c8: 0x10444c8: lw    ra, 28(sp)
+// 0x010444cc: 0x10444cc: sll   zero, zero, 0
+// 0x010444d0: 0x10444d0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3253,7 +3253,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_set_name_10444c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_set_name_10444d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3288,31 +3288,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010444c8: 0x10444c8: lui   v0, 0x60000
+// 0x010444d8: 0x10444d8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010444cc: 0x10444cc: lw    v0, 12840(v0)
+// 0x010444dc: 0x10444dc: lw    v0, 13304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x010444d0: 0x10444d0: addiu sp, sp, -32
+// 0x010444e0: 0x10444e0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010444d4: 0x10444d4: sw    ra, 28(sp)
-// 0x010444d8: 0x10444d8: bne   v0, zero, 0x10444ec addu  a1, a0, zero
+// 0x010444e4: 0x10444e4: sw    ra, 28(sp)
+// 0x010444e8: 0x10444e8: bne   v0, zero, 0x10444fc addu  a1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc.2
-	brtrue L_10444ec
+	brtrue L_10444fc
 // --- basic block ---
-// 0x010444e0: 0x10444e0: jal   0x1043e70 sw    a0, 16(sp)
+// 0x010444f0: 0x10444f0: jal   0x1043e80 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3326,12 +3326,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010444e8: 0x10444e8: lw    a1, 16(sp)
+// 0x010444f8: 0x10444f8: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3340,11 +3340,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_10444ec:
-// 0x010444ec: 0x10444ec: lui   a0, 0x0
+L_10444fc:
+// 0x010444fc: 0x10444fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010444f0: 0x10444f0: jal   0x100e5c0 addiu a0, a0, 13352
+// 0x01044500: 0x1044500: jal   0x100e5d0 addiu a0, a0, 13352
 	ldloc.1
 	ldc.i4 13352
 	add
@@ -3354,14 +3354,14 @@ L_10444ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010444f8: 0x10444f8: lw    ra, 28(sp)
-// 0x010444fc: 0x10444fc: sll   zero, zero, 0
-// 0x01044500: 0x1044500: jr    ra addiu sp, sp, 32
+// 0x01044508: 0x1044508: lw    ra, 28(sp)
+// 0x0104450c: 0x104450c: sll   zero, zero, 0
+// 0x01044510: 0x1044510: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3373,7 +3373,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_init_1044508(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_init_1044518(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -3411,13 +3411,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044508: 0x1044508: addiu sp, sp, -24
+// 0x01044518: 0x1044518: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104450c: 0x104450c: sw    ra, 20(sp)
-// 0x01044510: 0x1044510: jal   0x1043e70 sw    s0, 16(sp)
+// 0x0104451c: 0x104451c: sw    ra, 20(sp)
+// 0x01044520: 0x1044520: jal   0x1043e80 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3431,43 +3431,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044518: 0x1044518: jal   0x1044134 sll   zero, zero, 0
+// 0x01044528: 0x1044528: jal   0x1044144 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044520: 0x1044520: lb    v0, 0(v0)
+// 0x01044530: 0x1044530: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01044524: 0x1044524: sll   zero, zero, 0
-// 0x01044528: 0x1044528: bne   v0, zero, 0x1044570 sll   zero, zero, 0
+// 0x01044534: 0x1044534: sll   zero, zero, 0
+// 0x01044538: 0x1044538: bne   v0, zero, 0x1044580 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1044570
+	brtrue L_1044580
 // --- basic block ---
-// 0x01044530: 0x1044530: jal   0x101d484 sll   zero, zero, 0
+// 0x01044540: 0x1044540: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044538: 0x1044538: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01044548: 0x1044548: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3480,18 +3480,18 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044540: 0x1044540: lui   a1, 0x10000
+// 0x01044550: 0x1044550: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01044544: 0x1044544: addu  a0, v0, zero
+// 0x01044554: 0x1044554: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01044548: 0x1044548: addiu a1, a1, -2376
+// 0x01044558: 0x1044558: addiu a1, a1, -2380
 	ldloc.2
-	ldc.i4 -2376
+	ldc.i4 -2380
 	add
 	stloc.2
-// 0x0104454c: 0x104454c: jal   0x1000420 addu  s0, v0, zero
+// 0x0104455c: 0x104455c: jal   0x1000420 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -3504,16 +3504,16 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044554: 0x1044554: beq   v0, zero, 0x1044560 sll   zero, zero, 0
+// 0x01044564: 0x1044564: beq   v0, zero, 0x1044570 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1044560
+	brfalse L_1044570
 // --- basic block ---
-// 0x0104455c: 0x104455c: sb    zero, 0(v0)
+// 0x0104456c: 0x104456c: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1044560:
-// 0x01044560: 0x1044560: jal   0x10444c8 addu  a0, s0, zero
+L_1044570:
+// 0x01044570: 0x1044570: jal   0x10444d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3521,12 +3521,12 @@ L_1044560:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_name_10444c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_name_10444d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044568: 0x1044568: jal   0x1000930 addu  a0, s0, zero
+// 0x01044578: 0x1044578: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3539,19 +3539,19 @@ L_1044560:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1044570:
-// 0x01044570: 0x1044570: jal   0x104c524 sll   zero, zero, 0
+L_1044580:
+// 0x01044580: 0x1044580: jal   0x104c534 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044578: 0x1044578: jal   0x1043f0c addu  a0, v0, zero
+// 0x01044588: 0x1044588: jal   0x1043f1c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3559,17 +3559,17 @@ L_1044570:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_conf_load_1043f0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_conf_load_1043f1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01044580: 0x1044580: lui   a0, 0x1040000
+// 0x01044590: 0x1044590: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01044584: 0x1044584: jal   0x106bcfc addiu a0, a0, 18436
+// 0x01044594: 0x1044594: jal   0x106c320 addiu a0, a0, 18452
 	ldloc.1
-	ldc.i4 18436
+	ldc.i4 18452
 	add
 	stloc.1
 	ldloc.0
@@ -3577,16 +3577,16 @@ L_1044570:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104458c: 0x104458c: lw    ra, 20(sp)
-// 0x01044590: 0x1044590: lui   v1, 0x60000
+// 0x0104459c: 0x104459c: lw    ra, 20(sp)
+// 0x010445a0: 0x10445a0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01044594: 0x1044594: lw    s0, 16(sp)
+// 0x010445a4: 0x10445a4: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3595,16 +3595,16 @@ L_1044570:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044598: 0x1044598: sw    v0, 12836(v1)
+// 0x010445a8: 0x10445a8: sw    v0, 13300(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3209
+	ldc.i4 3325
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104459c: 0x104459c: jr    ra addiu sp, sp, 24
+// 0x010445ac: 0x10445ac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3616,7 +3616,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 load_prompt_list_10445a4(int32,int32,int32,int32,int32)
+.method public static int32 load_prompt_list_10445b4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s0,int32 s1,int32 s3,int32 s2,int32 ra)
@@ -3666,12 +3666,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010445a4: 0x10445a4: addiu sp, sp, -1088
+// 0x010445b4: 0x10445b4: addiu sp, sp, -1088
 	ldloc.0
 	ldc.i4 -1088
 	add
 	stloc.0
-// 0x010445a8: 0x10445a8: sw    s1, 1068(sp)
+// 0x010445b8: 0x10445b8: sw    s1, 1068(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3680,11 +3680,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010445ac: 0x10445ac: lui   s1, 0x60000
+// 0x010445bc: 0x10445bc: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x010445b0: 0x10445b0: sw    ra, 1084(sp)
-// 0x010445b4: 0x10445b4: sw    s4, 1080(sp)
+// 0x010445c0: 0x10445c0: sw    ra, 1084(sp)
+// 0x010445c4: 0x10445c4: sw    s4, 1080(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3693,7 +3693,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010445b8: 0x10445b8: sw    s3, 1076(sp)
+// 0x010445c8: 0x10445c8: sw    s3, 1076(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3702,7 +3702,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010445bc: 0x10445bc: sw    s2, 1072(sp)
+// 0x010445cc: 0x10445cc: sw    s2, 1072(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3711,7 +3711,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010445c0: 0x10445c0: jal   0x104c564 sw    s0, 1064(sp)
+// 0x010445d0: 0x10445d0: jal   0x104c574 sw    s0, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3725,41 +3725,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010445c8: 0x10445c8: lw    v1, 12848(s1)
+// 0x010445d8: 0x10445d8: lw    v1, 13312(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc 7
-// 0x010445cc: 0x10445cc: sll   zero, zero, 0
-// 0x010445d0: 0x10445d0: bne   v1, zero, 0x10446c4 addiu v0, zero, 1
+// 0x010445dc: 0x10445dc: sll   zero, zero, 0
+// 0x010445e0: 0x10445e0: bne   v1, zero, 0x10446d4 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brtrue L_10446c4
+	brtrue L_10446d4
 // --- basic block ---
-// 0x010445d8: 0x10445d8: addiu s0, sp, 16
+// 0x010445e8: 0x10445e8: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x010445dc: 0x10445dc: lui   a1, 0x10000
+// 0x010445ec: 0x10445ec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010445e0: 0x10445e0: addu  a0, s0, zero
+// 0x010445f0: 0x10445f0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010445e4: 0x10445e4: jal   0x1001b68 addiu a1, a1, -2368
+// 0x010445f4: 0x10445f4: jal   0x1001b68 addiu a1, a1, -2372
 	ldloc.2
-	ldc.i4 -2368
+	ldc.i4 -2372
 	add
 	stloc.2
 	ldloc.1
@@ -3769,18 +3769,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010445ec: 0x10445ec: lui   a2, 0x0
+// 0x010445fc: 0x10445fc: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010445f0: 0x10445f0: addu  a1, s0, zero
+// 0x01044600: 0x1044600: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010445f4: 0x10445f4: addiu a2, a2, 26128
+// 0x01044604: 0x1044604: addiu a2, a2, 26128
 	ldloc.3
 	ldc.i4 26128
 	add
 	stloc.3
-// 0x010445f8: 0x10445f8: jal   0x104dac8 addu  a0, zero, zero
+// 0x01044608: 0x1044608: jal   0x104dad8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3788,37 +3788,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044600: 0x1044600: bne   v0, zero, 0x1044694 addu  s0, v0, zero
+// 0x01044610: 0x1044610: bne   v0, zero, 0x10446a4 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_1044694
+	brtrue L_10446a4
 // --- basic block ---
-// 0x01044608: 0x1044608: lui   a1, 0x10000
+// 0x01044618: 0x1044618: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104460c: 0x104460c: lui   a3, 0x10000
+// 0x0104461c: 0x104461c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01044610: 0x1044610: addiu a1, a1, -2452
+// 0x01044620: 0x1044620: addiu a1, a1, -2456
 	ldloc.2
-	ldc.i4 -2452
+	ldc.i4 -2456
 	add
 	stloc.2
-// 0x01044614: 0x1044614: addiu a3, a3, -2352
+// 0x01044624: 0x1044624: addiu a3, a3, -2356
 	ldloc 4
-	ldc.i4 -2352
+	ldc.i4 -2356
 	add
 	stloc 4
-// 0x01044618: 0x1044618: addiu a0, zero, 4
+// 0x01044628: 0x1044628: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104461c: 0x104461c: jal   0x100449c addiu a2, zero, 217
+// 0x0104462c: 0x104462c: jal   0x100449c addiu a2, zero, 217
 	ldc.i4 217
 	stloc.3
 	ldloc.0
@@ -3831,13 +3831,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044624: 0x1044624: j	 0x10446c4 addu  v0, zero, zero
+// 0x01044634: 0x1044634: j	 0x10446d4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10446c4
+	br L_10446d4
 // --- basic block ---
-L_104462c:
-// 0x0104462c: 0x104462c: jal   0x1001e98 sll   zero, zero, 0
+L_104463c:
+// 0x0104463c: 0x104463c: jal   0x1001e98 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3848,71 +3848,71 @@ L_104462c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044634: 0x1044634: addu  a0, s2, zero
+// 0x01044644: 0x1044644: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x01044638: 0x1044638: beq   v0, zero, 0x10446b8 addiu a1, zero, 1024
+// 0x01044648: 0x1044648: beq   v0, zero, 0x10446c8 addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_10446b8
+	brfalse L_10446c8
 // --- basic block ---
-// 0x01044640: 0x1044640: jal   0x100e038 sll   zero, zero, 0
+// 0x01044650: 0x1044650: jal   0x100e048 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl10::roadmap_config_extract_data_100e038(int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_extract_data_100e048(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044648: 0x1044648: beq   v0, zero, 0x10446a0 addu  a0, v0, zero
+// 0x01044658: 0x1044658: beq   v0, zero, 0x10446b0 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_10446a0
+	brfalse L_10446b0
 // --- basic block ---
-// 0x01044650: 0x1044650: jal   0x100e004 sll   zero, zero, 0
+// 0x01044660: 0x1044660: jal   0x100e014 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_spaces_100e004(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_spaces_100e014(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044658: 0x1044658: addu  a0, v0, zero
+// 0x01044668: 0x1044668: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104465c: 0x104465c: addu  a1, zero, zero
+// 0x0104466c: 0x104466c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01044660: 0x1044660: jal   0x100dfc8 addu  s4, v0, zero
+// 0x01044670: 0x1044670: jal   0x100dfd8 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl10::roadmap_config_skip_until_100dfc8(int32,int32)
+	call int32 Cibyl10::roadmap_config_skip_until_100dfd8(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044668: 0x1044668: sb    zero, 0(v0)
+// 0x01044678: 0x1044678: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104466c: 0x104466c: addu  a0, s4, zero
+// 0x0104467c: 0x104467c: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x01044670: 0x1044670: lw    s4, 12848(s1)
+// 0x01044680: 0x1044680: lw    s4, 13312(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044674: 0x1044674: jal   0x1001ba8 sll   s4, s4, 2
+// 0x01044684: 0x1044684: jal   0x1001ba8 sll   s4, s4, 2
 	ldloc 8
 	ldc.i4.2
 	shl
@@ -3927,79 +3927,79 @@ L_104462c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104467c: 0x104467c: lw    v1, 12848(s1)
+// 0x0104468c: 0x104468c: lw    v1, 13312(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044680: 0x1044680: addu  s4, s4, s3
+// 0x01044690: 0x1044690: addu  s4, s4, s3
 	ldloc 8
 	ldloc 11
 	add
 	stloc 8
-// 0x01044684: 0x1044684: addiu v1, v1, 1
+// 0x01044694: 0x1044694: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01044688: 0x1044688: sw    v0, 0(s4)
+// 0x01044698: 0x1044698: sw    v0, 0(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104468c: 0x104468c: j	 0x10446a0 sw    v1, 12848(s1)
+// 0x0104469c: 0x104469c: j	 0x10446b0 sw    v1, 13312(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldloc 7
 	stelem.i4
-	br L_10446a0
+	br L_10446b0
 // --- basic block ---
-L_1044694:
-// 0x01044694: 0x1044694: lui   s3, 0x60000
+L_10446a4:
+// 0x010446a4: 0x10446a4: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01044698: 0x1044698: addiu s3, s3, 12852
+// 0x010446a8: 0x10446a8: addiu s3, s3, 13316
 	ldloc 11
-	ldc.i4 12852
+	ldc.i4 13316
 	add
 	stloc 11
-// 0x0104469c: 0x104469c: addiu s2, sp, 36
+// 0x010446ac: 0x10446ac: addiu s2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 12
-L_10446a0:
-// 0x010446a0: 0x10446a0: jal   0x1001e30 addu  a0, s0, zero
+L_10446b0:
+// 0x010446b0: 0x10446b0: jal   0x1001e30 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::feof_1001e30(int32)
 	stloc 5
 // --- basic block ---
-// 0x010446a8: 0x10446a8: addu  a2, s0, zero
+// 0x010446b8: 0x10446b8: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x010446ac: 0x10446ac: addu  a0, s2, zero
+// 0x010446bc: 0x10446bc: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x010446b0: 0x10446b0: beq   v0, zero, 0x104462c addiu a1, zero, 1024
+// 0x010446c0: 0x10446c0: beq   v0, zero, 0x104463c addiu a1, zero, 1024
 	ldloc 5
 	ldc.i4 1024
 	stloc.2
-	brfalse L_104462c
+	brfalse L_104463c
 // --- basic block ---
-L_10446b8:
-// 0x010446b8: 0x10446b8: jal   0x10023b4 addu  a0, s0, zero
+L_10446c8:
+// 0x010446c8: 0x10446c8: jal   0x10023b4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4012,12 +4012,12 @@ L_10446b8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010446c0: 0x10446c0: addiu v0, zero, 1
+// 0x010446d0: 0x10446d0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10446c4:
-// 0x010446c4: 0x10446c4: lw    ra, 1084(sp)
-// 0x010446c8: 0x10446c8: lw    s4, 1080(sp)
+L_10446d4:
+// 0x010446d4: 0x10446d4: lw    ra, 1084(sp)
+// 0x010446d8: 0x10446d8: lw    s4, 1080(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4026,7 +4026,7 @@ L_10446c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010446cc: 0x10446cc: lw    s3, 1076(sp)
+// 0x010446dc: 0x10446dc: lw    s3, 1076(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4035,7 +4035,7 @@ L_10446c4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010446d0: 0x10446d0: lw    s2, 1072(sp)
+// 0x010446e0: 0x10446e0: lw    s2, 1072(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4044,7 +4044,7 @@ L_10446c4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010446d4: 0x10446d4: lw    s1, 1068(sp)
+// 0x010446e4: 0x10446e4: lw    s1, 1068(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4053,7 +4053,7 @@ L_10446c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010446d8: 0x10446d8: lw    s0, 1064(sp)
+// 0x010446e8: 0x10446e8: lw    s0, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4062,7 +4062,7 @@ L_10446c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010446dc: 0x10446dc: jr    ra addiu sp, sp, 1088
+// 0x010446ec: 0x10446ec: jr    ra addiu sp, sp, 1088
 	ldloc.0
 	ldc.i4 1088
 	add
@@ -4074,7 +4074,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_download_10446e4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_download_10446f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 s4,int32 s3,int32 ra)
@@ -4124,12 +4124,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010446e4: 0x10446e4: addiu sp, sp, -56
+// 0x010446f4: 0x10446f4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010446e8: 0x10446e8: sw    s0, 32(sp)
+// 0x010446f8: 0x10446f8: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4138,8 +4138,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010446ec: 0x10446ec: sw    ra, 52(sp)
-// 0x010446f0: 0x10446f0: sw    s4, 48(sp)
+// 0x010446fc: 0x10446fc: sw    ra, 52(sp)
+// 0x01044700: 0x1044700: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4148,7 +4148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010446f4: 0x10446f4: sw    s3, 44(sp)
+// 0x01044704: 0x1044704: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4157,7 +4157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010446f8: 0x10446f8: sw    s2, 40(sp)
+// 0x01044708: 0x1044708: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4166,7 +4166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010446fc: 0x10446fc: sw    s1, 36(sp)
+// 0x0104470c: 0x104470c: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4175,7 +4175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01044700: 0x1044700: jal   0x10440c4 addu  s0, a0, zero
+// 0x01044710: 0x1044710: jal   0x10440d4 addu  s0, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -4183,24 +4183,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_downloading_lang_name_10440c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_downloading_lang_name_10440d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044708: 0x1044708: lb    v1, 0(v0)
+// 0x01044718: 0x1044718: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0104470c: 0x104470c: sll   zero, zero, 0
-// 0x01044710: 0x1044710: beq   v1, zero, 0x1044754 sll   zero, zero, 0
+// 0x0104471c: 0x104471c: sll   zero, zero, 0
+// 0x01044720: 0x1044720: beq   v1, zero, 0x1044764 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1044754
+	brfalse L_1044764
 // --- basic block ---
-// 0x01044718: 0x1044718: addu  a0, v0, zero
+// 0x01044728: 0x1044728: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104471c: 0x104471c: jal   0x1001b14 addu  a1, s0, zero
+// 0x0104472c: 0x104472c: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -4208,31 +4208,31 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01044724: 0x1044724: beq   v0, zero, 0x10447e4 sll   zero, zero, 0
+// 0x01044734: 0x1044734: beq   v0, zero, 0x10447f4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10447e4
+	brfalse L_10447f4
 // --- basic block ---
-// 0x0104472c: 0x104472c: jal   0x10440fc sll   zero, zero, 0
+// 0x0104473c: 0x104473c: jal   0x104410c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_queued_lang_10440fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_queued_lang_104410c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044734: 0x1044734: lb    v0, 0(v0)
+// 0x01044744: 0x1044744: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01044738: 0x1044738: sll   zero, zero, 0
-// 0x0104473c: 0x104473c: bne   v0, zero, 0x10447e4 sll   zero, zero, 0
+// 0x01044748: 0x1044748: sll   zero, zero, 0
+// 0x0104474c: 0x104474c: bne   v0, zero, 0x10447f4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10447e4
+	brtrue L_10447f4
 // --- basic block ---
-// 0x01044744: 0x1044744: jal   0x1044448 addu  a0, s0, zero
+// 0x01044754: 0x1044754: jal   0x1044458 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4240,16 +4240,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_queued_lang_1044448(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_queued_lang_1044458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104474c: 0x104474c: j	 0x10447e4 sll   zero, zero, 0
-	br L_10447e4
+// 0x0104475c: 0x104475c: j	 0x10447f4 sll   zero, zero, 0
+	br L_10447f4
 // --- basic block ---
-L_1044754:
-// 0x01044754: 0x1044754: jal   0x10445a4 lui   s2, 0x60000
+L_1044764:
+// 0x01044764: 0x1044764: jal   0x10445b4 lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 8
 	ldloc.0
@@ -4257,36 +4257,36 @@ L_1044754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::load_prompt_list_10445a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::load_prompt_list_10445b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104475c: 0x104475c: lui   a0, 0x30000
+// 0x0104476c: 0x104476c: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x01044760: 0x1044760: lui   a1, 0x1040000
+// 0x01044770: 0x1044770: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x01044764: 0x1044764: lui   v0, 0x60000
+// 0x01044774: 0x1044774: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044768: 0x1044768: ori   a0, a0, 43392
+// 0x01044778: 0x1044778: ori   a0, a0, 43392
 	ldloc.1
 	ldc.i4 43392
 	or
 	stloc.1
-// 0x0104476c: 0x104476c: addiu a1, a1, 19044
+// 0x0104477c: 0x104477c: addiu a1, a1, 19060
 	ldloc.2
-	ldc.i4 19044
+	ldc.i4 19060
 	add
 	stloc.2
-// 0x01044770: 0x1044770: jal   0x104fe98 sw    zero, 13292(v0)
+// 0x01044780: 0x1044780: jal   0x104fea8 sw    zero, 13756(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3323
+	ldc.i4 3439
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4295,25 +4295,25 @@ L_1044754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044778: 0x1044778: lui   a1, 0x10000
+// 0x01044788: 0x1044788: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104477c: 0x104477c: lui   a0, 0x1040000
+// 0x0104478c: 0x104478c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01044780: 0x1044780: addiu a1, a1, -2384
+// 0x01044790: 0x1044790: addiu a1, a1, -2388
 	ldloc.2
-	ldc.i4 -2384
+	ldc.i4 -2388
 	add
 	stloc.2
-// 0x01044784: 0x1044784: jal   0x100de8c addiu a0, a0, 16748
+// 0x01044794: 0x1044794: jal   0x100de9c addiu a0, a0, 16764
 	ldloc.1
-	ldc.i4 16748
+	ldc.i4 16764
 	add
 	stloc.1
 	ldloc.0
@@ -4321,15 +4321,15 @@ L_1044754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_register_100de8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_register_100de9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104478c: 0x104478c: addu  a0, s0, zero
+// 0x0104479c: 0x104479c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01044790: 0x1044790: jal   0x1044408 lui   s4, 0x1040000
+// 0x010447a0: 0x10447a0: jal   0x1044418 lui   s4, 0x1040000
 	ldc.i4 17039360
 	stloc 11
 	ldloc.0
@@ -4337,38 +4337,38 @@ L_1044754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044408(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044798: 0x1044798: addiu s2, s2, 12852
+// 0x010447a8: 0x10447a8: addiu s2, s2, 13316
 	ldloc 8
-	ldc.i4 12852
+	ldc.i4 13316
 	add
 	stloc 8
-// 0x0104479c: 0x104479c: addiu s4, s4, 19236
+// 0x010447ac: 0x10447ac: addiu s4, s4, 19252
 	ldloc 11
-	ldc.i4 19236
+	ldc.i4 19252
 	add
 	stloc 11
-// 0x010447a0: 0x10447a0: addu  s1, zero, zero
+// 0x010447b0: 0x10447b0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010447a4: 0x10447a4: j	 0x10447cc lui   s3, 0x60000
+// 0x010447b4: 0x10447b4: j	 0x10447dc lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 12
-	br L_10447cc
+	br L_10447dc
 // --- basic block ---
-L_10447ac:
-// 0x010447ac: 0x10447ac: lw    a1, 0(s2)
+L_10447bc:
+// 0x010447bc: 0x10447bc: lw    a1, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010447b0: 0x10447b0: sw    zero, 16(sp)
+// 0x010447c0: 0x10447c0: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4377,7 +4377,7 @@ L_10447ac:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010447b4: 0x10447b4: sw    zero, 20(sp)
+// 0x010447c4: 0x10447c4: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4386,7 +4386,7 @@ L_10447ac:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010447b8: 0x10447b8: sw    s4, 24(sp)
+// 0x010447c8: 0x10447c8: sw    s4, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4395,7 +4395,7 @@ L_10447ac:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010447bc: 0x10447bc: sw    zero, 28(sp)
+// 0x010447cc: 0x10447cc: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4404,7 +4404,7 @@ L_10447ac:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010447c0: 0x10447c0: jal   0x10a2c58 addiu s1, s1, 1
+// 0x010447d0: 0x10447d0: jal   0x10a32a0 addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
@@ -4414,46 +4414,46 @@ L_10447ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010447c8: 0x10447c8: addiu s2, s2, 4
+// 0x010447d8: 0x10447d8: addiu s2, s2, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_10447cc:
-// 0x010447cc: 0x10447cc: lw    v0, 12848(s3)
+L_10447dc:
+// 0x010447dc: 0x10447dc: lw    v0, 13312(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc 5
-// 0x010447d0: 0x10447d0: addiu a0, zero, 1
+// 0x010447e0: 0x10447e0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010447d4: 0x10447d4: slt   v0, s1, v0
+// 0x010447e4: 0x10447e4: slt   v0, s1, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x010447d8: 0x10447d8: addu  a2, zero, zero
+// 0x010447e8: 0x10447e8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010447dc: 0x10447dc: bne   v0, zero, 0x10447ac addu  a3, s0, zero
+// 0x010447ec: 0x10447ec: bne   v0, zero, 0x10447bc addu  a3, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc 4
-	brtrue L_10447ac
+	brtrue L_10447bc
 // --- basic block ---
-L_10447e4:
-// 0x010447e4: 0x10447e4: lw    ra, 52(sp)
-// 0x010447e8: 0x10447e8: lw    s4, 48(sp)
+L_10447f4:
+// 0x010447f4: 0x10447f4: lw    ra, 52(sp)
+// 0x010447f8: 0x10447f8: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4462,7 +4462,7 @@ L_10447e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010447ec: 0x10447ec: lw    s3, 44(sp)
+// 0x010447fc: 0x10447fc: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4471,7 +4471,7 @@ L_10447e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010447f0: 0x10447f0: lw    s2, 40(sp)
+// 0x01044800: 0x1044800: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4480,7 +4480,7 @@ L_10447e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010447f4: 0x10447f4: lw    s1, 36(sp)
+// 0x01044804: 0x1044804: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4489,7 +4489,7 @@ L_10447e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010447f8: 0x10447f8: lw    s0, 32(sp)
+// 0x01044808: 0x1044808: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4498,7 +4498,7 @@ L_10447e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010447fc: 0x10447fc: jr    ra addiu sp, sp, 56
+// 0x0104480c: 0x104480c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4510,7 +4510,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_login_cb_1044804(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_login_cb_1044814(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4551,25 +4551,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044804: 0x1044804: lui   v0, 0x60000
+// 0x01044814: 0x1044814: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044808: 0x1044808: lw    v0, 12840(v0)
+// 0x01044818: 0x1044818: lw    v0, 13304(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3210
+	ldc.i4 3326
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104480c: 0x104480c: addiu sp, sp, -56
+// 0x0104481c: 0x104481c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01044810: 0x1044810: sw    ra, 52(sp)
-// 0x01044814: 0x1044814: sw    s1, 48(sp)
+// 0x01044820: 0x1044820: sw    ra, 52(sp)
+// 0x01044824: 0x1044824: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4578,7 +4578,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044818: 0x1044818: bne   v0, zero, 0x1044828 sw    s0, 44(sp)
+// 0x01044828: 0x1044828: bne   v0, zero, 0x1044838 sw    s0, 44(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -4588,24 +4588,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1044828
+	brtrue L_1044838
 // --- basic block ---
-// 0x01044820: 0x1044820: jal   0x1043e70 sll   zero, zero, 0
+// 0x01044830: 0x1044830: jal   0x1043e80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_init_params_1043e70(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_init_params_1043e80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1044828:
-// 0x01044828: 0x1044828: lui   a0, 0x0
+L_1044838:
+// 0x01044838: 0x1044838: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104482c: 0x104482c: jal   0x100e348 addiu a0, a0, 13368
+// 0x0104483c: 0x104483c: jal   0x100e358 addiu a0, a0, 13368
 	ldloc.1
 	ldc.i4 13368
 	add
@@ -4615,37 +4615,37 @@ L_1044828:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044834: 0x1044834: lb    v1, 0(v0)
+// 0x01044844: 0x1044844: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01044838: 0x1044838: addu  a0, v0, zero
+// 0x01044848: 0x1044848: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104483c: 0x104483c: beq   v1, zero, 0x104484c addu  v0, zero, zero
+// 0x0104484c: 0x104484c: beq   v1, zero, 0x104485c addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_104484c
+	brfalse L_104485c
 // --- basic block ---
-// 0x01044844: 0x1044844: jal   0x106a58c sll   zero, zero, 0
+// 0x01044854: 0x1044854: jal   0x106abb0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::WDF_TimeFromModifiedSince_106a58c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::WDF_TimeFromModifiedSince_106abb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104484c:
-// 0x0104484c: 0x104484c: sw    v0, 20(sp)
+L_104485c:
+// 0x0104485c: 0x104485c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4654,40 +4654,40 @@ L_104484c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01044850: 0x1044850: lui   s1, 0x10000
+// 0x01044860: 0x1044860: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01044854: 0x1044854: lui   a1, 0x10000
+// 0x01044864: 0x1044864: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01044858: 0x1044858: lui   v0, 0x1040000
+// 0x01044868: 0x1044868: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0104485c: 0x104485c: addiu v1, zero, 1
+// 0x0104486c: 0x104486c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01044860: 0x1044860: addiu v0, v0, 18708
+// 0x01044870: 0x1044870: addiu v0, v0, 18724
 	ldloc 5
-	ldc.i4 18708
+	ldc.i4 18724
 	add
 	stloc 5
-// 0x01044864: 0x1044864: addiu a1, a1, -2468
+// 0x01044874: 0x1044874: addiu a1, a1, -2472
 	ldloc.2
-	ldc.i4 -2468
+	ldc.i4 -2472
 	add
 	stloc.2
-// 0x01044868: 0x1044868: addiu a0, zero, 2
+// 0x01044878: 0x1044878: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0104486c: 0x104486c: addu  a2, zero, zero
+// 0x0104487c: 0x104487c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01044870: 0x1044870: addiu a3, s1, 18500
+// 0x01044880: 0x1044880: addiu a3, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01044874: 0x1044874: sw    v1, 16(sp)
+// 0x01044884: 0x1044884: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4696,7 +4696,7 @@ L_104484c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01044878: 0x1044878: sw    v0, 24(sp)
+// 0x01044888: 0x1044888: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4705,7 +4705,7 @@ L_104484c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104487c: 0x104487c: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0104488c: 0x104488c: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4719,35 +4719,35 @@ L_104484c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044884: 0x1044884: jal   0x10440c4 sll   zero, zero, 0
+// 0x01044894: 0x1044894: jal   0x10440d4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_downloading_lang_name_10440c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_downloading_lang_name_10440d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104488c: 0x104488c: addu  s0, v0, zero
+// 0x0104489c: 0x104489c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01044890: 0x1044890: lb    v0, 0(v0)
+// 0x010448a0: 0x10448a0: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01044894: 0x1044894: sll   zero, zero, 0
-// 0x01044898: 0x1044898: beq   v0, zero, 0x10448e0 sll   zero, zero, 0
+// 0x010448a4: 0x10448a4: sll   zero, zero, 0
+// 0x010448a8: 0x10448a8: beq   v0, zero, 0x10448f0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10448e0
+	brfalse L_10448f0
 // --- basic block ---
-// 0x010448a0: 0x10448a0: jal   0x1001ba8 addu  a0, s0, zero
+// 0x010448b0: 0x10448b0: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4760,29 +4760,29 @@ L_104484c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010448a8: 0x10448a8: lui   a1, 0x10000
+// 0x010448b8: 0x10448b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010448ac: 0x10448ac: lui   a3, 0x10000
+// 0x010448bc: 0x10448bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010448b0: 0x10448b0: addiu a1, a1, -2452
+// 0x010448c0: 0x10448c0: addiu a1, a1, -2456
 	ldloc.2
-	ldc.i4 -2452
+	ldc.i4 -2456
 	add
 	stloc.2
-// 0x010448b4: 0x10448b4: addiu a3, a3, -2324
+// 0x010448c4: 0x10448c4: addiu a3, a3, -2328
 	ldloc 4
-	ldc.i4 -2324
+	ldc.i4 -2328
 	add
 	stloc 4
-// 0x010448b8: 0x10448b8: addiu a0, zero, 4
+// 0x010448c8: 0x10448c8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010448bc: 0x10448bc: addiu a2, zero, 490
+// 0x010448cc: 0x10448cc: addiu a2, zero, 490
 	ldc.i4 490
 	stloc.3
-// 0x010448c0: 0x10448c0: sw    v0, 32(sp)
+// 0x010448d0: 0x10448d0: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4791,7 +4791,7 @@ L_104484c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010448c4: 0x10448c4: jal   0x100449c sw    s0, 16(sp)
+// 0x010448d4: 0x10448d4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4810,9 +4810,9 @@ L_104484c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010448cc: 0x10448cc: jal   0x1044408 addiu a0, s1, 18500
+// 0x010448dc: 0x10448dc: jal   0x1044418 addiu a0, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -4820,12 +4820,12 @@ L_104484c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044408(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010448d4: 0x10448d4: lw    v0, 32(sp)
+// 0x010448e4: 0x10448e4: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4834,7 +4834,7 @@ L_104484c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010448d8: 0x10448d8: jal   0x10446e4 addu  a0, v0, zero
+// 0x010448e8: 0x10448e8: jal   0x10446f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4842,30 +4842,30 @@ L_104484c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_download_10446e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_download_10446f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10448e0:
-// 0x010448e0: 0x10448e0: lui   s0, 0x60000
+L_10448f0:
+// 0x010448f0: 0x10448f0: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x010448e4: 0x10448e4: lw    v0, 12836(s0)
+// 0x010448f4: 0x10448f4: lw    v0, 13300(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3209
+	ldc.i4 3325
 	add
 	ldelem.i4
 	stloc 5
-// 0x010448e8: 0x10448e8: sll   zero, zero, 0
-// 0x010448ec: 0x10448ec: beq   v0, zero, 0x1044900 sll   zero, zero, 0
+// 0x010448f8: 0x10448f8: sll   zero, zero, 0
+// 0x010448fc: 0x10448fc: beq   v0, zero, 0x1044910 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1044900
+	brfalse L_1044910
 // --- basic block ---
-// 0x010448f4: 0x10448f4: jalr  v0 sll   zero, zero, 0
+// 0x01044904: 0x1044904: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -4877,18 +4877,18 @@ L_10448e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010448fc: 0x10448fc: sw    zero, 12836(s0)
+// 0x0104490c: 0x104490c: sw    zero, 13300(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3209
+	ldc.i4 3325
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1044900:
-// 0x01044900: 0x1044900: lw    ra, 52(sp)
-// 0x01044904: 0x1044904: lw    s1, 48(sp)
+L_1044910:
+// 0x01044910: 0x1044910: lw    ra, 52(sp)
+// 0x01044914: 0x1044914: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4897,7 +4897,7 @@ L_1044900:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01044908: 0x1044908: lw    s0, 44(sp)
+// 0x01044918: 0x1044918: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4906,7 +4906,7 @@ L_1044900:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104490c: 0x104490c: jr    ra addiu sp, sp, 56
+// 0x0104491c: 0x104491c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4918,7 +4918,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_conf_file_downloaded_1044914(int32,int32,int32,int32,int32)
+.method public static int32 on_conf_file_downloaded_1044924(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra)
@@ -4965,13 +4965,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044914: 0x1044914: addiu sp, sp, -48
+// 0x01044924: 0x1044924: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01044918: 0x1044918: sw    ra, 44(sp)
-// 0x0104491c: 0x104491c: sw    s3, 40(sp)
+// 0x01044928: 0x1044928: sw    ra, 44(sp)
+// 0x0104492c: 0x104492c: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4980,7 +4980,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01044920: 0x1044920: sw    s2, 36(sp)
+// 0x01044930: 0x1044930: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4989,7 +4989,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044924: 0x1044924: sw    s1, 32(sp)
+// 0x01044934: 0x1044934: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4998,7 +4998,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01044928: 0x1044928: sw    s0, 28(sp)
+// 0x01044938: 0x1044938: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5007,49 +5007,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104492c: 0x104492c: beq   a1, zero, 0x1044964 addu  a0, a3, zero
+// 0x0104493c: 0x104493c: beq   a1, zero, 0x1044974 addu  a0, a3, zero
 	ldloc.2
 	ldloc 4
 	stloc.1
-	brfalse L_1044964
+	brfalse L_1044974
 // --- basic block ---
-// 0x01044934: 0x1044934: beq   a3, zero, 0x1044954 sll   zero, zero, 0
+// 0x01044944: 0x1044944: beq   a3, zero, 0x1044964 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1044954
+	brfalse L_1044964
 // --- basic block ---
-// 0x0104493c: 0x104493c: lb    v0, 0(a3)
+// 0x0104494c: 0x104494c: lb    v0, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01044940: 0x1044940: sll   zero, zero, 0
-// 0x01044944: 0x1044944: beq   v0, zero, 0x1044954 sll   zero, zero, 0
+// 0x01044950: 0x1044950: sll   zero, zero, 0
+// 0x01044954: 0x1044954: beq   v0, zero, 0x1044964 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1044954
+	brfalse L_1044964
 // --- basic block ---
-// 0x0104494c: 0x104494c: jal   0x1044488 sll   zero, zero, 0
+// 0x0104495c: 0x104495c: jal   0x1044498 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_update_time_1044488(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_update_time_1044498(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1044954:
-// 0x01044954: 0x1044954: jal   0x104c524 sll   zero, zero, 0
+L_1044964:
+// 0x01044964: 0x1044964: jal   0x104c534 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104495c: 0x104495c: jal   0x1043f0c addu  a0, v0, zero
+// 0x0104496c: 0x104496c: jal   0x1043f1c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5057,129 +5057,129 @@ L_1044954:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_conf_load_1043f0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_conf_load_1043f1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1044964:
-// 0x01044964: 0x1044964: jal   0x1044134 sll   zero, zero, 0
+L_1044974:
+// 0x01044974: 0x1044974: jal   0x1044144 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104496c: 0x104496c: beq   v0, zero, 0x10449c0 addu  s0, v0, zero
+// 0x0104497c: 0x104497c: beq   v0, zero, 0x10449d0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_10449c0
+	brfalse L_10449d0
 // --- basic block ---
-// 0x01044974: 0x1044974: lui   s2, 0x60000
+// 0x01044984: 0x1044984: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01044978: 0x1044978: addiu s2, s2, 13172
+// 0x01044988: 0x1044988: addiu s2, s2, 13636
 	ldloc 9
-	ldc.i4 13172
+	ldc.i4 13636
 	add
 	stloc 9
-// 0x0104497c: 0x104497c: addu  s1, zero, zero
+// 0x0104498c: 0x104498c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01044980: 0x1044980: j	 0x10449ac lui   s3, 0x60000
+// 0x01044990: 0x1044990: j	 0x10449bc lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 11
-	br L_10449ac
+	br L_10449bc
 // --- basic block ---
-L_1044988:
-// 0x01044988: 0x1044988: lw    v0, 0(s2)
+L_1044998:
+// 0x01044998: 0x1044998: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104498c: 0x104498c: addiu s1, s1, 1
+// 0x0104499c: 0x104499c: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01044990: 0x1044990: beq   v0, zero, 0x10449a8 addu  a0, v0, zero
+// 0x010449a0: 0x10449a0: beq   v0, zero, 0x10449b8 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_10449a8
+	brfalse L_10449b8
 // --- basic block ---
-// 0x01044998: 0x1044998: jal   0x1001b14 sll   zero, zero, 0
+// 0x010449a8: 0x10449a8: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010449a0: 0x10449a0: beq   v0, zero, 0x10449fc sll   zero, zero, 0
+// 0x010449b0: 0x10449b0: beq   v0, zero, 0x1044a0c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10449fc
+	brfalse L_1044a0c
 // --- basic block ---
-L_10449a8:
-// 0x010449a8: 0x10449a8: addiu s2, s2, 4
+L_10449b8:
+// 0x010449b8: 0x10449b8: addiu s2, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_10449ac:
-// 0x010449ac: 0x10449ac: lw    v0, 12844(s3)
+L_10449bc:
+// 0x010449bc: 0x10449bc: lw    v0, 13308(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 3211
+	ldc.i4 3327
 	add
 	ldelem.i4
 	stloc 5
-// 0x010449b0: 0x10449b0: sll   zero, zero, 0
-// 0x010449b4: 0x10449b4: slt   v0, s1, v0
+// 0x010449c0: 0x10449c0: sll   zero, zero, 0
+// 0x010449c4: 0x10449c4: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010449b8: 0x10449b8: bne   v0, zero, 0x1044988 addu  a1, s0, zero
+// 0x010449c8: 0x10449c8: bne   v0, zero, 0x1044998 addu  a1, s0, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brtrue L_1044988
+	brtrue L_1044998
 // --- basic block ---
-L_10449c0:
-// 0x010449c0: 0x10449c0: lui   a1, 0x10000
+L_10449d0:
+// 0x010449d0: 0x10449d0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010449c4: 0x10449c4: lui   a3, 0x10000
+// 0x010449d4: 0x10449d4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010449c8: 0x10449c8: addiu a1, a1, -2452
+// 0x010449d8: 0x10449d8: addiu a1, a1, -2456
 	ldloc.2
-	ldc.i4 -2452
+	ldc.i4 -2456
 	add
 	stloc.2
-// 0x010449cc: 0x10449cc: addiu a3, a3, -2252
+// 0x010449dc: 0x10449dc: addiu a3, a3, -2256
 	ldloc 4
-	ldc.i4 -2252
+	ldc.i4 -2256
 	add
 	stloc 4
-// 0x010449d0: 0x10449d0: addiu a2, zero, 396
+// 0x010449e0: 0x10449e0: addiu a2, zero, 396
 	ldc.i4 396
 	stloc.3
-// 0x010449d4: 0x10449d4: addiu a0, zero, 4
+// 0x010449e4: 0x10449e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010449d8: 0x10449d8: lui   s1, 0x10000
+// 0x010449e8: 0x10449e8: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010449dc: 0x10449dc: jal   0x100449c sw    s0, 16(sp)
+// 0x010449ec: 0x10449ec: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5198,7 +5198,7 @@ L_10449c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010449e4: 0x10449e4: jal   0x10444c8 addiu a0, s1, -30220
+// 0x010449f4: 0x10449f4: jal   0x10444d8 addiu a0, s1, -30220
 	ldloc 8
 	ldc.i4 -30220
 	add
@@ -5208,23 +5208,23 @@ L_10449c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_name_10444c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_name_10444d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010449ec: 0x10449ec: jal   0x1044134 sll   zero, zero, 0
+// 0x010449fc: 0x10449fc: jal   0x1044144 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010449f4: 0x10449f4: jal   0x10446e4 addiu a0, s1, -30220
+// 0x01044a04: 0x1044a04: jal   0x10446f4 addiu a0, s1, -30220
 	ldloc 8
 	ldc.i4 -30220
 	add
@@ -5234,14 +5234,14 @@ L_10449c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_download_10446e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_download_10446f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10449fc:
-// 0x010449fc: 0x10449fc: lw    ra, 44(sp)
-// 0x01044a00: 0x1044a00: lw    s3, 40(sp)
+L_1044a0c:
+// 0x01044a0c: 0x1044a0c: lw    ra, 44(sp)
+// 0x01044a10: 0x1044a10: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5250,7 +5250,7 @@ L_10449fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01044a04: 0x1044a04: lw    s2, 36(sp)
+// 0x01044a14: 0x1044a14: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5259,7 +5259,7 @@ L_10449fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01044a08: 0x1044a08: lw    s1, 32(sp)
+// 0x01044a18: 0x1044a18: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5268,7 +5268,7 @@ L_10449fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044a0c: 0x1044a0c: lw    s0, 28(sp)
+// 0x01044a1c: 0x1044a1c: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5277,7 +5277,7 @@ L_10449fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01044a10: 0x1044a10: jr    ra addiu sp, sp, 48
+// 0x01044a20: 0x1044a20: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5289,7 +5289,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_download_lang_confirm_1044a18(int32,int32,int32,int32,int32)
+.method public static int32 on_download_lang_confirm_1044a28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -5327,16 +5327,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044a18: 0x1044a18: addiu sp, sp, -24
+// 0x01044a28: 0x1044a28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01044a1c: 0x1044a1c: addiu v0, zero, 3
+// 0x01044a2c: 0x1044a2c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01044a20: 0x1044a20: sw    ra, 20(sp)
-// 0x01044a24: 0x1044a24: bne   a0, v0, 0x1044a34 sw    s0, 16(sp)
+// 0x01044a30: 0x1044a30: sw    ra, 20(sp)
+// 0x01044a34: 0x1044a34: bne   a0, v0, 0x1044a44 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -5347,9 +5347,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_1044a34
+	bne.un L_1044a44
 // --- basic block ---
-// 0x01044a2c: 0x1044a2c: jal   0x10446e4 addu  a0, a1, zero
+// 0x01044a3c: 0x1044a3c: jal   0x10446f4 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -5357,30 +5357,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_download_10446e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_download_10446f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1044a34:
-// 0x01044a34: 0x1044a34: lui   s0, 0x60000
+L_1044a44:
+// 0x01044a44: 0x1044a44: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01044a38: 0x1044a38: lw    v0, 12836(s0)
+// 0x01044a48: 0x1044a48: lw    v0, 13300(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3209
+	ldc.i4 3325
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044a3c: 0x1044a3c: sll   zero, zero, 0
-// 0x01044a40: 0x1044a40: beq   v0, zero, 0x1044a54 sll   zero, zero, 0
+// 0x01044a4c: 0x1044a4c: sll   zero, zero, 0
+// 0x01044a50: 0x1044a50: beq   v0, zero, 0x1044a64 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1044a54
+	brfalse L_1044a64
 // --- basic block ---
-// 0x01044a48: 0x1044a48: jalr  v0 sll   zero, zero, 0
+// 0x01044a58: 0x1044a58: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5392,18 +5392,18 @@ L_1044a34:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01044a50: 0x1044a50: sw    zero, 12836(s0)
+// 0x01044a60: 0x1044a60: sw    zero, 13300(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3209
+	ldc.i4 3325
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1044a54:
-// 0x01044a54: 0x1044a54: lw    ra, 20(sp)
-// 0x01044a58: 0x1044a58: lw    s0, 16(sp)
+L_1044a64:
+// 0x01044a64: 0x1044a64: lw    ra, 20(sp)
+// 0x01044a68: 0x1044a68: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5412,7 +5412,7 @@ L_1044a54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044a5c: 0x1044a5c: jr    ra addiu sp, sp, 24
+// 0x01044a6c: 0x1044a6c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5424,7 +5424,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_prompts_download_watchdog_timer_1044a64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_prompts_download_watchdog_timer_1044a74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 t0)
@@ -5468,13 +5468,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044a64: 0x1044a64: addiu sp, sp, -48
+// 0x01044a74: 0x1044a74: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01044a68: 0x1044a68: sw    ra, 44(sp)
-// 0x01044a6c: 0x1044a6c: sw    s1, 40(sp)
+// 0x01044a78: 0x1044a78: sw    ra, 44(sp)
+// 0x01044a7c: 0x1044a7c: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5483,7 +5483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044a70: 0x1044a70: jal   0x10440fc sw    s0, 36(sp)
+// 0x01044a80: 0x1044a80: jal   0x104410c sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5497,12 +5497,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_queued_lang_10440fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_queued_lang_104410c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044a78: 0x1044a78: jal   0x10440c4 addu  s0, v0, zero
+// 0x01044a88: 0x1044a88: jal   0x10440d4 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -5510,58 +5510,58 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_downloading_lang_name_10440c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_downloading_lang_name_10440d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044a80: 0x1044a80: lui   v1, 0x60000
+// 0x01044a90: 0x1044a90: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044a84: 0x1044a84: lw    t0, 13292(v1)
+// 0x01044a94: 0x1044a94: lw    t0, 13756(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3323
+	ldc.i4 3439
 	add
 	ldelem.i4
 	stloc 11
-// 0x01044a88: 0x1044a88: lui   v1, 0x60000
+// 0x01044a98: 0x1044a98: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044a8c: 0x1044a8c: lw    v1, 12848(v1)
+// 0x01044a9c: 0x1044a9c: lw    v1, 13312(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044a90: 0x1044a90: lui   a3, 0x10000
+// 0x01044aa0: 0x1044aa0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01044a94: 0x1044a94: lui   a1, 0x10000
+// 0x01044aa4: 0x1044aa4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01044a98: 0x1044a98: addiu a3, a3, -2204
+// 0x01044aa8: 0x1044aa8: addiu a3, a3, -2208
 	ldloc 4
-	ldc.i4 -2204
+	ldc.i4 -2208
 	add
 	stloc 4
-// 0x01044a9c: 0x1044a9c: addiu a2, zero, 177
+// 0x01044aac: 0x1044aac: addiu a2, zero, 177
 	ldc.i4 177
 	stloc.3
-// 0x01044aa0: 0x1044aa0: addiu a1, a1, -2452
+// 0x01044ab0: 0x1044ab0: addiu a1, a1, -2456
 	ldloc.2
-	ldc.i4 -2452
+	ldc.i4 -2456
 	add
 	stloc.2
-// 0x01044aa4: 0x1044aa4: addiu a0, zero, 4
+// 0x01044ab4: 0x1044ab4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01044aa8: 0x1044aa8: sw    t0, 20(sp)
+// 0x01044ab8: 0x1044ab8: sw    t0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5570,7 +5570,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01044aac: 0x1044aac: sw    v1, 24(sp)
+// 0x01044abc: 0x1044abc: sw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5579,7 +5579,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01044ab0: 0x1044ab0: jal   0x100449c sw    v0, 16(sp)
+// 0x01044ac0: 0x1044ac0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5598,18 +5598,18 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044ab8: 0x1044ab8: lui   a1, 0x10000
+// 0x01044ac8: 0x1044ac8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01044abc: 0x1044abc: lui   a0, 0x0
+// 0x01044acc: 0x1044acc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01044ac0: 0x1044ac0: addiu a1, a1, -2104
+// 0x01044ad0: 0x1044ad0: addiu a1, a1, -2108
 	ldloc.2
-	ldc.i4 -2104
+	ldc.i4 -2108
 	add
 	stloc.2
-// 0x01044ac4: 0x1044ac4: jal   0x104c148 addiu a0, a0, 30092
+// 0x01044ad4: 0x1044ad4: jal   0x104c158 addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
@@ -5619,34 +5619,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044acc: 0x1044acc: lui   a0, 0x1040000
+// 0x01044adc: 0x1044adc: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01044ad0: 0x1044ad0: addiu a0, a0, 16748
+// 0x01044ae0: 0x1044ae0: addiu a0, a0, 16764
 	ldloc.1
-	ldc.i4 16748
+	ldc.i4 16764
 	add
 	stloc.1
-// 0x01044ad4: 0x1044ad4: jal   0x100dc38 lui   s1, 0x10000
+// 0x01044ae4: 0x1044ae4: jal   0x100dc48 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_unregister_100dc38(int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_unregister_100dc48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044adc: 0x1044adc: jal   0x1044408 addiu a0, s1, 18500
+// 0x01044aec: 0x1044aec: jal   0x1044418 addiu a0, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -5654,23 +5654,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044408(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044ae4: 0x1044ae4: lb    v0, 0(s0)
+// 0x01044af4: 0x1044af4: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01044ae8: 0x1044ae8: sll   zero, zero, 0
-// 0x01044aec: 0x1044aec: beq   v0, zero, 0x1044b04 sll   zero, zero, 0
+// 0x01044af8: 0x1044af8: sll   zero, zero, 0
+// 0x01044afc: 0x1044afc: beq   v0, zero, 0x1044b14 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1044b04
+	brfalse L_1044b14
 // --- basic block ---
-// 0x01044af4: 0x1044af4: jal   0x1044448 addiu a0, s1, 18500
+// 0x01044b04: 0x1044b04: jal   0x1044458 addiu a0, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -5678,12 +5678,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_queued_lang_1044448(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_queued_lang_1044458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044afc: 0x1044afc: jal   0x10446e4 addu  a0, s0, zero
+// 0x01044b0c: 0x1044b0c: jal   0x10446f4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5691,18 +5691,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_download_10446e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_download_10446f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1044b04:
-// 0x01044b04: 0x1044b04: lui   a0, 0x1040000
+L_1044b14:
+// 0x01044b14: 0x1044b14: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01044b08: 0x1044b08: jal   0x104fd00 addiu a0, a0, 19044
+// 0x01044b18: 0x1044b18: jal   0x104fd10 addiu a0, a0, 19060
 	ldloc.1
-	ldc.i4 19044
+	ldc.i4 19060
 	add
 	stloc.1
 	ldloc.0
@@ -5710,13 +5710,13 @@ L_1044b04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01044b10: 0x1044b10: lw    ra, 44(sp)
-// 0x01044b14: 0x1044b14: lw    s1, 40(sp)
+// 0x01044b20: 0x1044b20: lw    ra, 44(sp)
+// 0x01044b24: 0x1044b24: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5725,7 +5725,7 @@ L_1044b04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01044b18: 0x1044b18: lw    s0, 36(sp)
+// 0x01044b28: 0x1044b28: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5734,7 +5734,7 @@ L_1044b04:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044b1c: 0x1044b1c: jr    ra addiu sp, sp, 48
+// 0x01044b2c: 0x1044b2c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5746,7 +5746,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_loaded_prompt_file_1044b24(int32,int32,int32,int32,int32)
+.method public static int32 on_loaded_prompt_file_1044b34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5787,13 +5787,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044b24: 0x1044b24: addiu sp, sp, -32
+// 0x01044b34: 0x1044b34: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01044b28: 0x1044b28: sw    ra, 28(sp)
-// 0x01044b2c: 0x1044b2c: sw    s1, 24(sp)
+// 0x01044b38: 0x1044b38: sw    ra, 28(sp)
+// 0x01044b3c: 0x1044b3c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5802,7 +5802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044b30: 0x1044b30: beq   a1, zero, 0x1044ba0 sw    s0, 20(sp)
+// 0x01044b40: 0x1044b40: beq   a1, zero, 0x1044bb0 sw    s0, 20(sp)
 	ldloc.2
 	ldloc 6
 	ldloc.0
@@ -5812,56 +5812,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1044ba0
+	brfalse L_1044bb0
 // --- basic block ---
-// 0x01044b38: 0x1044b38: lui   v1, 0x60000
+// 0x01044b48: 0x1044b48: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01044b3c: 0x1044b3c: lw    v0, 13292(v1)
+// 0x01044b4c: 0x1044b4c: lw    v0, 13756(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3323
+	ldc.i4 3439
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044b40: 0x1044b40: lui   a0, 0x60000
+// 0x01044b50: 0x1044b50: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01044b44: 0x1044b44: lw    a0, 12848(a0)
+// 0x01044b54: 0x1044b54: lw    a0, 13312(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3212
+	ldc.i4 3328
 	add
 	ldelem.i4
 	stloc.1
-// 0x01044b48: 0x1044b48: addiu v0, v0, 1
+// 0x01044b58: 0x1044b58: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01044b4c: 0x1044b4c: bne   v0, a0, 0x1044ba0 sw    v0, 13292(v1)
+// 0x01044b5c: 0x1044b5c: bne   v0, a0, 0x1044bb0 sw    v0, 13756(v1)
 	ldloc 5
 	ldloc.1
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3323
+	ldc.i4 3439
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_1044ba0
+	bne.un L_1044bb0
 // --- basic block ---
-// 0x01044b54: 0x1044b54: lui   a0, 0x1040000
+// 0x01044b64: 0x1044b64: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01044b58: 0x1044b58: jal   0x104fd00 addiu a0, a0, 19044
+// 0x01044b68: 0x1044b68: jal   0x104fd10 addiu a0, a0, 19060
 	ldloc.1
-	ldc.i4 19044
+	ldc.i4 19060
 	add
 	stloc.1
 	ldloc.0
@@ -5869,12 +5869,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044b60: 0x1044b60: jal   0x10440fc lui   s1, 0x10000
+// 0x01044b70: 0x1044b70: jal   0x104410c lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -5882,34 +5882,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_queued_lang_10440fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_queued_lang_104410c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044b68: 0x1044b68: lui   a0, 0x1040000
+// 0x01044b78: 0x1044b78: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01044b6c: 0x1044b6c: addiu a0, a0, 16748
+// 0x01044b7c: 0x1044b7c: addiu a0, a0, 16764
 	ldloc.1
-	ldc.i4 16748
+	ldc.i4 16764
 	add
 	stloc.1
-// 0x01044b70: 0x1044b70: jal   0x100dc38 addu  s0, v0, zero
+// 0x01044b80: 0x1044b80: jal   0x100dc48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_unregister_100dc38(int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_unregister_100dc48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044b78: 0x1044b78: jal   0x1044408 addiu a0, s1, 18500
+// 0x01044b88: 0x1044b88: jal   0x1044418 addiu a0, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -5917,23 +5917,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044408(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_downloading_lang_name_1044418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044b80: 0x1044b80: lb    v0, 0(s0)
+// 0x01044b90: 0x1044b90: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01044b84: 0x1044b84: sll   zero, zero, 0
-// 0x01044b88: 0x1044b88: beq   v0, zero, 0x1044ba0 sll   zero, zero, 0
+// 0x01044b94: 0x1044b94: sll   zero, zero, 0
+// 0x01044b98: 0x1044b98: beq   v0, zero, 0x1044bb0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1044ba0
+	brfalse L_1044bb0
 // --- basic block ---
-// 0x01044b90: 0x1044b90: jal   0x1044448 addiu a0, s1, 18500
+// 0x01044ba0: 0x1044ba0: jal   0x1044458 addiu a0, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -5941,12 +5941,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_set_queued_lang_1044448(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_set_queued_lang_1044458(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01044b98: 0x1044b98: jal   0x10446e4 addu  a0, s0, zero
+// 0x01044ba8: 0x1044ba8: jal   0x10446f4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5954,14 +5954,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_download_10446e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_download_10446f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1044ba0:
-// 0x01044ba0: 0x1044ba0: lw    ra, 28(sp)
-// 0x01044ba4: 0x1044ba4: lw    s1, 24(sp)
+L_1044bb0:
+// 0x01044bb0: 0x1044bb0: lw    ra, 28(sp)
+// 0x01044bb4: 0x1044bb4: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5970,7 +5970,7 @@ L_1044ba0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01044ba8: 0x1044ba8: lw    s0, 20(sp)
+// 0x01044bb8: 0x1044bb8: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5979,7 +5979,7 @@ L_1044ba0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044bac: 0x1044bac: jr    ra addiu sp, sp, 32
+// 0x01044bbc: 0x1044bbc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5991,7 +5991,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_border_shutdown_1044bd8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_border_shutdown_1044be8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 s2,int32 ra,int32 v1)
@@ -6035,12 +6035,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044bd8: 0x1044bd8: addiu sp, sp, -32
+// 0x01044be8: 0x1044be8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01044bdc: 0x1044bdc: sw    s1, 20(sp)
+// 0x01044bec: 0x1044bec: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6049,7 +6049,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01044be0: 0x1044be0: sw    s0, 16(sp)
+// 0x01044bf0: 0x1044bf0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6058,14 +6058,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01044be4: 0x1044be4: lui   s1, 0x60000
+// 0x01044bf4: 0x1044bf4: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01044be8: 0x1044be8: lui   s0, 0x60000
+// 0x01044bf8: 0x1044bf8: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044bec: 0x1044bec: sw    ra, 28(sp)
-// 0x01044bf0: 0x1044bf0: sw    s2, 24(sp)
+// 0x01044bfc: 0x1044bfc: sw    ra, 28(sp)
+// 0x01044c00: 0x1044c00: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6074,77 +6074,77 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044bf4: 0x1044bf4: addiu s0, s0, 13300
+// 0x01044c04: 0x1044c04: addiu s0, s0, 13764
 	ldloc 5
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 5
-// 0x01044bf8: 0x1044bf8: addiu s1, s1, 13564
+// 0x01044c08: 0x1044c08: addiu s1, s1, 14028
 	ldloc 7
-	ldc.i4 13564
+	ldc.i4 14028
 	add
 	stloc 7
-L_1044bfc:
-// 0x01044bfc: 0x1044bfc: lw    v0, 0(s0)
+L_1044c0c:
+// 0x01044c0c: 0x1044c0c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01044c00: 0x1044c00: addiu s0, s0, 12
+// 0x01044c10: 0x1044c10: addiu s0, s0, 12
 	ldloc 5
 	ldc.i4.s 12
 	add
 	stloc 5
-// 0x01044c04: 0x1044c04: beq   v0, zero, 0x1044c14 addu  a0, v0, zero
+// 0x01044c14: 0x1044c14: beq   v0, zero, 0x1044c24 addu  a0, v0, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
-	brfalse L_1044c14
+	brfalse L_1044c24
 // --- basic block ---
-// 0x01044c0c: 0x1044c0c: jal   0x104ec70 sll   zero, zero, 0
+// 0x01044c1c: 0x1044c1c: jal   0x104ec80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 8
 // --- basic block ---
-L_1044c14:
-// 0x01044c14: 0x1044c14: bne   s0, s1, 0x1044bfc sll   zero, zero, 0
+L_1044c24:
+// 0x01044c24: 0x1044c24: bne   s0, s1, 0x1044c0c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1044bfc
+	bne.un L_1044c0c
 // --- basic block ---
-// 0x01044c1c: 0x1044c1c: lui   s0, 0x60000
+// 0x01044c2c: 0x1044c2c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01044c20: 0x1044c20: addiu s0, s0, 13564
+// 0x01044c30: 0x1044c30: addiu s0, s0, 14028
 	ldloc 5
-	ldc.i4 13564
+	ldc.i4 14028
 	add
 	stloc 5
-// 0x01044c24: 0x1044c24: addu  s1, zero, zero
+// 0x01044c34: 0x1044c34: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01044c28: 0x1044c28: j	 0x1044c40 addu  s2, s0, zero
+// 0x01044c38: 0x1044c38: j	 0x1044c50 addu  s2, s0, zero
 	ldloc 5
 	stloc 9
-	br L_1044c40
+	br L_1044c50
 // --- basic block ---
-L_1044c30:
-// 0x01044c30: 0x1044c30: lw    a0, 0(s0)
+L_1044c40:
+// 0x01044c40: 0x1044c40: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01044c34: 0x1044c34: jal   0x104ec70 addiu s1, s1, 1
+// 0x01044c44: 0x1044c44: jal   0x104ec80 addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
@@ -6154,18 +6154,18 @@ L_1044c30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 8
 // --- basic block ---
-// 0x01044c3c: 0x1044c3c: addiu s0, s0, 28
+// 0x01044c4c: 0x1044c4c: addiu s0, s0, 28
 	ldloc 5
 	ldc.i4.s 28
 	add
 	stloc 5
-L_1044c40:
-// 0x01044c40: 0x1044c40: lw    v0, 560(s2)
+L_1044c50:
+// 0x01044c50: 0x1044c50: lw    v0, 560(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6174,18 +6174,18 @@ L_1044c40:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01044c44: 0x1044c44: sll   zero, zero, 0
-// 0x01044c48: 0x1044c48: slt   v0, s1, v0
+// 0x01044c54: 0x1044c54: sll   zero, zero, 0
+// 0x01044c58: 0x1044c58: slt   v0, s1, v0
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 8
-// 0x01044c4c: 0x1044c4c: bne   v0, zero, 0x1044c30 sll   zero, zero, 0
+// 0x01044c5c: 0x1044c5c: bne   v0, zero, 0x1044c40 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1044c30
+	brtrue L_1044c40
 // --- basic block ---
-// 0x01044c54: 0x1044c54: lw    ra, 28(sp)
-// 0x01044c58: 0x1044c58: lw    s2, 24(sp)
+// 0x01044c64: 0x1044c64: lw    ra, 28(sp)
+// 0x01044c68: 0x1044c68: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6194,7 +6194,7 @@ L_1044c40:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01044c5c: 0x1044c5c: lw    s1, 20(sp)
+// 0x01044c6c: 0x1044c6c: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6203,7 +6203,7 @@ L_1044c40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044c60: 0x1044c60: lw    s0, 16(sp)
+// 0x01044c70: 0x1044c70: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6212,7 +6212,7 @@ L_1044c40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01044c64: 0x1044c64: jr    ra addiu sp, sp, 32
+// 0x01044c74: 0x1044c74: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6224,7 +6224,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 get_image_1044c6c(int32,int32,int32,int32,int32)
+.method public static int32 get_image_1044c7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 lo,int32 s6,int32 s1,int32 s2,int32 s4,int32 s0,int32 s3,int32 s8,int32 s7,int32 s5,int32 t0,int32 t1,int32 ra,int32 t2,int32 t3)
@@ -6301,24 +6301,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01044c6c: 0x1044c6c: lui   v0, 0x60000
+// 0x01044c7c: 0x1044c7c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01044c70: 0x1044c70: lw    v1, 13296(v0)
+// 0x01044c80: 0x1044c80: lw    v1, 13760(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3324
+	ldc.i4 3440
 	add
 	ldelem.i4
 	stloc 6
-// 0x01044c74: 0x1044c74: addiu sp, sp, -120
+// 0x01044c84: 0x1044c84: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x01044c78: 0x1044c78: sw    s7, 108(sp)
+// 0x01044c88: 0x1044c88: sw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6327,12 +6327,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01044c7c: 0x1044c7c: addiu v1, v1, 1
+// 0x01044c8c: 0x1044c8c: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01044c80: 0x1044c80: lw    s7, 140(sp)
+// 0x01044c90: 0x1044c90: lw    s7, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6341,19 +6341,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01044c84: 0x1044c84: sw    v1, 13296(v0)
+// 0x01044c94: 0x1044c94: sw    v1, 13760(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3324
+	ldc.i4 3440
 	add
 	ldloc 6
 	stelem.i4
-// 0x01044c88: 0x1044c88: lui   v0, 0xf0000
+// 0x01044c98: 0x1044c98: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x01044c8c: 0x1044c8c: sw    s6, 104(sp)
+// 0x01044c9c: 0x1044c9c: sw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6362,7 +6362,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01044c90: 0x1044c90: sw    s4, 96(sp)
+// 0x01044ca0: 0x1044ca0: sw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6371,7 +6371,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01044c94: 0x1044c94: sw    s3, 92(sp)
+// 0x01044ca4: 0x1044ca4: sw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6380,7 +6380,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01044c98: 0x1044c98: sw    s2, 88(sp)
+// 0x01044ca8: 0x1044ca8: sw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6389,7 +6389,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01044c9c: 0x1044c9c: sw    s1, 84(sp)
+// 0x01044cac: 0x1044cac: sw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6398,11 +6398,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01044ca0: 0x1044ca0: addu  s2, a0, zero
+// 0x01044cb0: 0x1044cb0: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01044ca4: 0x1044ca4: sw    ra, 116(sp)
-// 0x01044ca8: 0x1044ca8: sw    s8, 112(sp)
+// 0x01044cb4: 0x1044cb4: sw    ra, 116(sp)
+// 0x01044cb8: 0x1044cb8: sw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6411,7 +6411,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01044cac: 0x1044cac: sw    s5, 100(sp)
+// 0x01044cbc: 0x1044cbc: sw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6420,7 +6420,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01044cb0: 0x1044cb0: sw    s0, 80(sp)
+// 0x01044cc0: 0x1044cc0: sw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6429,22 +6429,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01044cb4: 0x1044cb4: addu  s1, a1, zero
+// 0x01044cc4: 0x1044cc4: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01044cb8: 0x1044cb8: addu  s4, a2, zero
+// 0x01044cc8: 0x1044cc8: addu  s4, a2, zero
 	ldloc.3
 	stloc 12
-// 0x01044cbc: 0x1044cbc: lw    v0, -30068(v0)
+// 0x01044ccc: 0x1044ccc: lw    v0, -29604(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044cc0: 0x1044cc0: lw    s6, 136(sp)
+// 0x01044cd0: 0x1044cd0: lw    s6, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6453,7 +6453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01044cc4: 0x1044cc4: lw    s3, 144(sp)
+// 0x01044cd4: 0x1044cd4: lw    s3, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6462,134 +6462,134 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01044cc8: 0x1044cc8: beq   s7, zero, 0x1044cd4 addiu a0, zero, 1
+// 0x01044cd8: 0x1044cd8: beq   s7, zero, 0x1044ce4 addiu a0, zero, 1
 	ldloc 16
 	ldc.i4.1
 	stloc.1
-	brfalse L_1044cd4
+	brfalse L_1044ce4
 // --- basic block ---
-// 0x01044cd0: 0x1044cd0: lw    a0, 0(s7)
+// 0x01044ce0: 0x1044ce0: lw    a0, 0(s7)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-L_1044cd4:
-// 0x01044cd4: 0x1044cd4: beq   s6, zero, 0x1044ce4 addiu v0, v0, -1
+L_1044ce4:
+// 0x01044ce4: 0x1044ce4: beq   s6, zero, 0x1044cf4 addiu v0, v0, -1
 	ldloc 9
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-	brfalse L_1044ce4
+	brfalse L_1044cf4
 // --- basic block ---
-// 0x01044cdc: 0x1044cdc: lw    v0, 0(s6)
+// 0x01044cec: 0x1044cec: lw    v0, 0(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01044ce0: 0x1044ce0: sll   zero, zero, 0
-L_1044ce4:
-// 0x01044ce4: 0x1044ce4: subu  v0, v0, a0
+// 0x01044cf0: 0x1044cf0: sll   zero, zero, 0
+L_1044cf4:
+// 0x01044cf4: 0x1044cf4: subu  v0, v0, a0
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 7
-// 0x01044ce8: 0x1044ce8: addiu a0, zero, -1
+// 0x01044cf8: 0x1044cf8: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01044cec: 0x1044cec: bne   v1, a0, 0x1044d34 sll   zero, zero, 0
+// 0x01044cfc: 0x1044cfc: bne   v1, a0, 0x1044d44 sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	bne.un L_1044d34
+	bne.un L_1044d44
 // --- basic block ---
-// 0x01044cf4: 0x1044cf4: addiu a0, zero, 1
+// 0x01044d04: 0x1044d04: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01044cf8: 0x1044cf8: lui   v1, 0x60000
+// 0x01044d08: 0x1044d08: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01044cfc: 0x1044cfc: sw    a0, 13296(v1)
+// 0x01044d0c: 0x1044d0c: sw    a0, 13760(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3324
+	ldc.i4 3440
 	add
 	ldloc.1
 	stelem.i4
-// 0x01044d00: 0x1044d00: lui   v1, 0x60000
+// 0x01044d10: 0x1044d10: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01044d04: 0x1044d04: lui   a0, 0x60000
+// 0x01044d14: 0x1044d14: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01044d08: 0x1044d08: lw    a2, 14124(v1)
+// 0x01044d18: 0x1044d18: lw    a2, 14588(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3531
+	ldc.i4 3647
 	add
 	ldelem.i4
 	stloc.3
-// 0x01044d0c: 0x1044d0c: addiu a0, a0, 13588
+// 0x01044d1c: 0x1044d1c: addiu a0, a0, 14052
 	ldloc.1
-	ldc.i4 13588
+	ldc.i4 14052
 	add
 	stloc.1
-// 0x01044d10: 0x1044d10: addu  v1, zero, zero
+// 0x01044d20: 0x1044d20: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01044d14: 0x1044d14: j	 0x1044d28 addiu a1, zero, 1
+// 0x01044d24: 0x1044d24: j	 0x1044d38 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-	br L_1044d28
+	br L_1044d38
 // --- basic block ---
-L_1044d1c:
-// 0x01044d1c: 0x1044d1c: sw    a1, 0(a0)
+L_1044d2c:
+// 0x01044d2c: 0x1044d2c: sw    a1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01044d20: 0x1044d20: addiu v1, v1, 1
+// 0x01044d30: 0x1044d30: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01044d24: 0x1044d24: addiu a0, a0, 28
+// 0x01044d34: 0x1044d34: addiu a0, a0, 28
 	ldloc.1
 	ldc.i4.s 28
 	add
 	stloc.1
-L_1044d28:
-// 0x01044d28: 0x1044d28: slt   a3, v1, a2
+L_1044d38:
+// 0x01044d38: 0x1044d38: slt   a3, v1, a2
 	ldloc 6
 	ldloc.3
 	clt
 	stloc 4
-// 0x01044d2c: 0x1044d2c: bne   a3, zero, 0x1044d1c sll   zero, zero, 0
+// 0x01044d3c: 0x1044d3c: bne   a3, zero, 0x1044d2c sll   zero, zero, 0
 	ldloc 4
-	brtrue L_1044d1c
+	brtrue L_1044d2c
 // --- basic block ---
-L_1044d34:
-// 0x01044d34: 0x1044d34: lui   v1, 0x60000
+L_1044d44:
+// 0x01044d44: 0x1044d44: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01044d38: 0x1044d38: addiu v1, v1, 13564
+// 0x01044d48: 0x1044d48: addiu v1, v1, 14028
 	ldloc 6
-	ldc.i4 13564
+	ldc.i4 14028
 	add
 	stloc 6
-// 0x01044d3c: 0x1044d3c: addu  a0, v1, zero
+// 0x01044d4c: 0x1044d4c: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01044d40: 0x1044d40: lw    s5, 560(v1)
+// 0x01044d50: 0x1044d50: lw    s5, 560(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6598,19 +6598,19 @@ L_1044d34:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01044d44: 0x1044d44: addu  s8, zero, zero
+// 0x01044d54: 0x1044d54: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01044d48: 0x1044d48: addiu v1, zero, -1
+// 0x01044d58: 0x1044d58: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01044d4c: 0x1044d4c: j	 0x1044de4 addu  a1, zero, zero
+// 0x01044d5c: 0x1044d5c: j	 0x1044df4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_1044de4
+	br L_1044df4
 // --- basic block ---
-L_1044d54:
-// 0x01044d54: 0x1044d54: lw    a2, 8(a0)
+L_1044d64:
+// 0x01044d64: 0x1044d64: lw    a2, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6619,13 +6619,13 @@ L_1044d54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01044d58: 0x1044d58: sll   zero, zero, 0
-// 0x01044d5c: 0x1044d5c: bne   a2, s1, 0x1044db8 sll   zero, zero, 0
+// 0x01044d68: 0x1044d68: sll   zero, zero, 0
+// 0x01044d6c: 0x1044d6c: bne   a2, s1, 0x1044dc8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 10
-	bne.un L_1044db8
+	bne.un L_1044dc8
 // --- basic block ---
-// 0x01044d64: 0x1044d64: lw    a2, 12(a0)
+// 0x01044d74: 0x1044d74: lw    a2, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6634,13 +6634,13 @@ L_1044d54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01044d68: 0x1044d68: sll   zero, zero, 0
-// 0x01044d6c: 0x1044d6c: bne   a2, s4, 0x1044db8 sll   zero, zero, 0
+// 0x01044d78: 0x1044d78: sll   zero, zero, 0
+// 0x01044d7c: 0x1044d7c: bne   a2, s4, 0x1044dc8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 12
-	bne.un L_1044db8
+	bne.un L_1044dc8
 // --- basic block ---
-// 0x01044d74: 0x1044d74: lw    a2, 4(a0)
+// 0x01044d84: 0x1044d84: lw    a2, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6649,13 +6649,13 @@ L_1044d54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01044d78: 0x1044d78: sll   zero, zero, 0
-// 0x01044d7c: 0x1044d7c: bne   a2, s2, 0x1044db8 sll   zero, zero, 0
+// 0x01044d88: 0x1044d88: sll   zero, zero, 0
+// 0x01044d8c: 0x1044d8c: bne   a2, s2, 0x1044dc8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 11
-	bne.un L_1044db8
+	bne.un L_1044dc8
 // --- basic block ---
-// 0x01044d84: 0x1044d84: lw    a2, 20(a0)
+// 0x01044d94: 0x1044d94: lw    a2, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6664,13 +6664,13 @@ L_1044d54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01044d88: 0x1044d88: sll   zero, zero, 0
-// 0x01044d8c: 0x1044d8c: bne   a2, s3, 0x1044db8 sll   zero, zero, 0
+// 0x01044d98: 0x1044d98: sll   zero, zero, 0
+// 0x01044d9c: 0x1044d9c: bne   a2, s3, 0x1044dc8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 14
-	bne.un L_1044db8
+	bne.un L_1044dc8
 // --- basic block ---
-// 0x01044d94: 0x1044d94: lw    a2, 16(a0)
+// 0x01044da4: 0x1044da4: lw    a2, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6679,32 +6679,32 @@ L_1044d54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01044d98: 0x1044d98: sll   zero, zero, 0
-// 0x01044d9c: 0x1044d9c: bne   a2, v0, 0x1044db8 sll   zero, zero, 0
+// 0x01044da8: 0x1044da8: sll   zero, zero, 0
+// 0x01044dac: 0x1044dac: bne   a2, v0, 0x1044dc8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 7
-	bne.un L_1044db8
+	bne.un L_1044dc8
 // --- basic block ---
-// 0x01044da4: 0x1044da4: lui   v0, 0x60000
+// 0x01044db4: 0x1044db4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01044da8: 0x1044da8: lw    v0, 13296(v0)
+// 0x01044db8: 0x1044db8: lw    v0, 13760(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3324
+	ldc.i4 3440
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044dac: 0x1044dac: lw    s0, 0(a0)
+// 0x01044dbc: 0x1044dbc: lw    s0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x01044db0: 0x1044db0: j	 0x1045394 sw    v0, 24(a0)
+// 0x01044dc0: 0x1044dc0: j	 0x10453a4 sw    v0, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6713,10 +6713,10 @@ L_1044d54:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1045394
+	br L_10453a4
 // --- basic block ---
-L_1044db8:
-// 0x01044db8: 0x1044db8: lw    a2, 24(a0)
+L_1044dc8:
+// 0x01044dc8: 0x1044dc8: lw    a2, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6725,84 +6725,84 @@ L_1044db8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01044dbc: 0x1044dbc: sll   zero, zero, 0
-// 0x01044dc0: 0x1044dc0: sltu  a3, a2, v1
+// 0x01044dcc: 0x1044dcc: sll   zero, zero, 0
+// 0x01044dd0: 0x1044dd0: sltu  a3, a2, v1
 	ldloc.3
 	ldloc 6
 	clt.un
 	stloc 4
-// 0x01044dc4: 0x1044dc4: bne   a3, zero, 0x1044dd4 sll   zero, zero, 0
+// 0x01044dd4: 0x1044dd4: bne   a3, zero, 0x1044de4 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_1044dd4
+	brtrue L_1044de4
 // --- basic block ---
-// 0x01044dcc: 0x1044dcc: j	 0x1044dd8 addu  a2, v1, zero
+// 0x01044ddc: 0x1044ddc: j	 0x1044de8 addu  a2, v1, zero
 	ldloc 6
 	stloc.3
-	br L_1044dd8
+	br L_1044de8
 // --- basic block ---
-L_1044dd4:
-// 0x01044dd4: 0x1044dd4: addu  s8, a1, zero
+L_1044de4:
+// 0x01044de4: 0x1044de4: addu  s8, a1, zero
 	ldloc.2
 	stloc 15
-L_1044dd8:
-// 0x01044dd8: 0x1044dd8: addiu a1, a1, 1
+L_1044de8:
+// 0x01044de8: 0x1044de8: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01044ddc: 0x1044ddc: addiu a0, a0, 28
+// 0x01044dec: 0x1044dec: addiu a0, a0, 28
 	ldloc.1
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x01044de0: 0x1044de0: addu  v1, a2, zero
+// 0x01044df0: 0x1044df0: addu  v1, a2, zero
 	ldloc.3
 	stloc 6
-L_1044de4:
-// 0x01044de4: 0x1044de4: slt   a2, a1, s5
+L_1044df4:
+// 0x01044df4: 0x1044df4: slt   a2, a1, s5
 	ldloc.2
 	ldloc 17
 	clt
 	stloc.3
-// 0x01044de8: 0x1044de8: bne   a2, zero, 0x1044d54 lui   t0, 0x60000
+// 0x01044df8: 0x1044df8: bne   a2, zero, 0x1044d64 lui   t0, 0x60000
 	ldloc.3
 	ldc.i4 393216
 	stloc 18
-	brtrue L_1044d54
+	brtrue L_1044d64
 // --- basic block ---
-// 0x01044df0: 0x1044df0: addiu a0, zero, 20
+// 0x01044e00: 0x1044e00: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x01044df4: 0x1044df4: bne   s5, a0, 0x1044e84 addiu t0, t0, 13564
+// 0x01044e04: 0x1044e04: bne   s5, a0, 0x1044e94 addiu t0, t0, 14028
 	ldloc 17
 	ldloc.1
 	ldloc 18
-	ldc.i4 13564
+	ldc.i4 14028
 	add
 	stloc 18
-	bne.un L_1044e84
+	bne.un L_1044e94
 // --- basic block ---
-// 0x01044dfc: 0x1044dfc: addiu s0, zero, 28
+// 0x01044e0c: 0x1044e0c: addiu s0, zero, 28
 	ldc.i4.s 28
 	stloc 13
-// 0x01044e00: 0x1044e00: mult  s8, s0
+// 0x01044e10: 0x1044e10: mult  s8, s0
 	ldloc 15
 	ldloc 13
 	mul
 	stloc 8
-// 0x01044e04: 0x1044e04: lui   a0, 0x60000
+// 0x01044e14: 0x1044e14: lui   a0, 0x60000
 	ldc.i4 393216
 	stloc.1
-// 0x01044e08: 0x1044e08: lw    t1, 13296(a0)
+// 0x01044e18: 0x1044e18: lw    t1, 13760(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3324
+	ldc.i4 3440
 	add
 	ldelem.i4
 	stloc 19
-// 0x01044e0c: 0x1044e0c: sw    v0, 48(sp)
+// 0x01044e1c: 0x1044e1c: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6811,7 +6811,7 @@ L_1044de4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01044e10: 0x1044e10: sw    v1, 20(sp)
+// 0x01044e20: 0x1044e20: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6820,7 +6820,7 @@ L_1044de4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01044e14: 0x1044e14: sw    t1, 24(sp)
+// 0x01044e24: 0x1044e24: sw    t1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6829,7 +6829,7 @@ L_1044de4:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01044e18: 0x1044e18: sw    s8, 16(sp)
+// 0x01044e28: 0x1044e28: sw    s8, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6838,32 +6838,32 @@ L_1044de4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01044e1c: 0x1044e1c: lui   a1, 0x10000
+// 0x01044e2c: 0x1044e2c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01044e20: 0x1044e20: lui   a3, 0x10000
+// 0x01044e30: 0x1044e30: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01044e24: 0x1044e24: addiu a1, a1, -2004
+// 0x01044e34: 0x1044e34: addiu a1, a1, -2008
 	ldloc.2
-	ldc.i4 -2004
+	ldc.i4 -2008
 	add
 	stloc.2
-// 0x01044e28: 0x1044e28: addiu a3, a3, -1976
+// 0x01044e38: 0x1044e38: addiu a3, a3, -1980
 	ldloc 4
-	ldc.i4 -1976
+	ldc.i4 -1980
 	add
 	stloc 4
-// 0x01044e2c: 0x1044e2c: addiu a0, zero, 1
+// 0x01044e3c: 0x1044e3c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01044e30: 0x1044e30: addiu a2, zero, 532
+// 0x01044e40: 0x1044e40: addiu a2, zero, 532
 	ldc.i4 532
 	stloc.3
-// 0x01044e34: 0x1044e34: mflo  lo
+// 0x01044e44: 0x1044e44: mflo  lo
 	ldloc 8
 	stloc 13
-// 0x01044e38: 0x1044e38: sw    v0, 72(sp)
+// 0x01044e48: 0x1044e48: sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6872,12 +6872,12 @@ L_1044de4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01044e3c: 0x1044e3c: addu  s0, t0, s0
+// 0x01044e4c: 0x1044e4c: addu  s0, t0, s0
 	ldloc 18
 	ldloc 13
 	add
 	stloc 13
-// 0x01044e40: 0x1044e40: lw    t3, 8(s0)
+// 0x01044e50: 0x1044e50: lw    t3, 8(s0)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -6886,7 +6886,7 @@ L_1044de4:
 	add
 	ldelem.i4
 	stloc 22
-// 0x01044e44: 0x1044e44: lw    t2, 4(s0)
+// 0x01044e54: 0x1044e54: lw    t2, 4(s0)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -6895,7 +6895,7 @@ L_1044de4:
 	add
 	ldelem.i4
 	stloc 21
-// 0x01044e48: 0x1044e48: lw    t1, 12(s0)
+// 0x01044e58: 0x1044e58: lw    t1, 12(s0)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -6904,7 +6904,7 @@ L_1044de4:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01044e4c: 0x1044e4c: lw    t0, 20(s0)
+// 0x01044e5c: 0x1044e5c: lw    t0, 20(s0)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -6913,7 +6913,7 @@ L_1044de4:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01044e50: 0x1044e50: lw    v1, 16(s0)
+// 0x01044e60: 0x1044e60: lw    v1, 16(s0)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -6922,7 +6922,7 @@ L_1044de4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01044e54: 0x1044e54: sw    t3, 28(sp)
+// 0x01044e64: 0x1044e64: sw    t3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6931,7 +6931,7 @@ L_1044de4:
 	add
 	ldloc 22
 	stelem.i4
-// 0x01044e58: 0x1044e58: sw    t2, 32(sp)
+// 0x01044e68: 0x1044e68: sw    t2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6940,7 +6940,7 @@ L_1044de4:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01044e5c: 0x1044e5c: sw    t1, 36(sp)
+// 0x01044e6c: 0x1044e6c: sw    t1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6949,7 +6949,7 @@ L_1044de4:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01044e60: 0x1044e60: sw    t0, 40(sp)
+// 0x01044e70: 0x1044e70: sw    t0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6958,7 +6958,7 @@ L_1044de4:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01044e64: 0x1044e64: jal   0x100449c sw    v1, 44(sp)
+// 0x01044e74: 0x1044e74: jal   0x100449c sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6977,14 +6977,14 @@ L_1044de4:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01044e6c: 0x1044e6c: lw    a0, 0(s0)
+// 0x01044e7c: 0x1044e7c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01044e70: 0x1044e70: jal   0x104ec70 addu  s5, s8, zero
+// 0x01044e80: 0x1044e80: jal   0x104ec80 addu  s5, s8, zero
 	ldloc 15
 	stloc 17
 	ldloc.0
@@ -6992,12 +6992,12 @@ L_1044de4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01044e78: 0x1044e78: lw    v0, 72(sp)
+// 0x01044e88: 0x1044e88: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7006,18 +7006,18 @@ L_1044de4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044e7c: 0x1044e7c: j	 0x1044e90 addiu v1, zero, 28
+// 0x01044e8c: 0x1044e8c: j	 0x1044ea0 addiu v1, zero, 28
 	ldc.i4.s 28
 	stloc 6
-	br L_1044e90
+	br L_1044ea0
 // --- basic block ---
-L_1044e84:
-// 0x01044e84: 0x1044e84: addiu v1, s5, 1
+L_1044e94:
+// 0x01044e94: 0x1044e94: addiu v1, s5, 1
 	ldloc 17
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01044e88: 0x1044e88: sw    v1, 560(t0)
+// 0x01044e98: 0x1044e98: sw    v1, 560(t0)
 	ldloc 5
 	ldloc 18
 	ldc.i4.2
@@ -7026,32 +7026,32 @@ L_1044e84:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01044e8c: 0x1044e8c: addiu v1, zero, 28
+// 0x01044e9c: 0x1044e9c: addiu v1, zero, 28
 	ldc.i4.s 28
 	stloc 6
-L_1044e90:
-// 0x01044e90: 0x1044e90: mult  s5, v1
+L_1044ea0:
+// 0x01044ea0: 0x1044ea0: mult  s5, v1
 	ldloc 17
 	ldloc 6
 	mul
 	stloc 8
-// 0x01044e94: 0x1044e94: lui   v1, 0x60000
+// 0x01044ea4: 0x1044ea4: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01044e98: 0x1044e98: addiu v1, v1, 13564
+// 0x01044ea8: 0x1044ea8: addiu v1, v1, 14028
 	ldloc 6
-	ldc.i4 13564
+	ldc.i4 14028
 	add
 	stloc 6
-// 0x01044e9c: 0x1044e9c: mflo  lo
+// 0x01044eac: 0x1044eac: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01044ea0: 0x1044ea0: addu  v1, a0, v1
+// 0x01044eb0: 0x1044eb0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01044ea4: 0x1044ea4: sw    v0, 16(v1)
+// 0x01044eb4: 0x1044eb4: sw    v0, 16(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7060,7 +7060,7 @@ L_1044e90:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01044ea8: 0x1044ea8: sw    s3, 20(v1)
+// 0x01044eb8: 0x1044eb8: sw    s3, 20(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7069,7 +7069,7 @@ L_1044e90:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01044eac: 0x1044eac: sw    s1, 8(v1)
+// 0x01044ebc: 0x1044ebc: sw    s1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7078,7 +7078,7 @@ L_1044e90:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01044eb0: 0x1044eb0: sw    s4, 12(v1)
+// 0x01044ec0: 0x1044ec0: sw    s4, 12(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7087,7 +7087,7 @@ L_1044e90:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01044eb4: 0x1044eb4: beq   s2, zero, 0x1044ed8 sw    s2, 4(v1)
+// 0x01044ec4: 0x1044ec4: beq   s2, zero, 0x1044ee8 sw    s2, 4(v1)
 	ldloc 11
 	ldloc 5
 	ldloc 6
@@ -7097,103 +7097,103 @@ L_1044e90:
 	add
 	ldloc 11
 	stelem.i4
-	brfalse L_1044ed8
+	brfalse L_1044ee8
 // --- basic block ---
-// 0x01044ebc: 0x1044ebc: addiu v0, zero, 1
+// 0x01044ecc: 0x1044ecc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01044ec0: 0x1044ec0: beq   s2, v0, 0x104510c addiu v0, zero, 2
+// 0x01044ed0: 0x1044ed0: beq   s2, v0, 0x104511c addiu v0, zero, 2
 	ldloc 11
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	beq  L_104510c
+	beq  L_104511c
 // --- basic block ---
-// 0x01044ec8: 0x1044ec8: bne   s2, v0, 0x104536c addu  s0, zero, zero
+// 0x01044ed8: 0x1044ed8: bne   s2, v0, 0x104537c addu  s0, zero, zero
 	ldloc 11
 	ldloc 7
 	ldc.i4.s 0
 	stloc 13
-	bne.un L_104536c
+	bne.un L_104537c
 // --- basic block ---
-// 0x01044ed0: 0x1044ed0: j	 0x1045260 sll   zero, zero, 0
-	br L_1045260
+// 0x01044ee0: 0x1044ee0: j	 0x1045270 sll   zero, zero, 0
+	br L_1045270
 // --- basic block ---
-L_1044ed8:
-// 0x01044ed8: 0x1044ed8: lui   s2, 0x60000
+L_1044ee8:
+// 0x01044ee8: 0x1044ee8: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01044edc: 0x1044edc: addiu a0, zero, -1
+// 0x01044eec: 0x1044eec: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01044ee0: 0x1044ee0: lw    v0, 0(s7)
+// 0x01044ef0: 0x1044ef0: lw    v0, 0(s7)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01044ee4: 0x1044ee4: lw    v1, 0(s6)
+// 0x01044ef4: 0x1044ef4: lw    v1, 0(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01044ee8: 0x1044ee8: addiu s2, s2, 13300
+// 0x01044ef8: 0x1044ef8: addiu s2, s2, 13764
 	ldloc 11
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 11
-// 0x01044eec: 0x1044eec: bne   s4, a0, 0x1045004 addiu s3, sp, 56
+// 0x01044efc: 0x1044efc: bne   s4, a0, 0x1045014 addiu s3, sp, 56
 	ldloc 12
 	ldloc.1
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 14
-	bne.un L_1045004
+	bne.un L_1045014
 // --- basic block ---
-// 0x01044ef4: 0x1044ef4: addiu s6, zero, 12
+// 0x01044f04: 0x1044f04: addiu s6, zero, 12
 	ldc.i4.s 12
 	stloc 9
-// 0x01044ef8: 0x1044ef8: mult  s1, s6
+// 0x01044f08: 0x1044f08: mult  s1, s6
 	ldloc 10
 	ldloc 9
 	mul
 	stloc 8
-// 0x01044efc: 0x1044efc: subu  s4, v1, v0
+// 0x01044f0c: 0x1044f0c: subu  s4, v1, v0
 	ldloc 6
 	ldloc 7
 	sub
 	stloc 12
-// 0x01044f00: 0x1044f00: sra   a0, s4, 31
+// 0x01044f10: 0x1044f10: sra   a0, s4, 31
 	ldloc 12
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x01044f04: 0x1044f04: xor   s4, a0, s4
+// 0x01044f14: 0x1044f14: xor   s4, a0, s4
 	ldloc.1
 	ldloc 12
 	xor
 	stloc 12
-// 0x01044f08: 0x1044f08: subu  s4, s4, a0
+// 0x01044f18: 0x1044f18: subu  s4, s4, a0
 	ldloc 12
 	ldloc.1
 	sub
 	stloc 12
-// 0x01044f0c: 0x1044f0c: addu  a0, s4, zero
+// 0x01044f1c: 0x1044f1c: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x01044f10: 0x1044f10: mflo  lo
+// 0x01044f20: 0x1044f20: mflo  lo
 	ldloc 8
 	stloc 15
-// 0x01044f14: 0x1044f14: addu  s8, s2, s8
+// 0x01044f24: 0x1044f24: addu  s8, s2, s8
 	ldloc 11
 	ldloc 15
 	add
 	stloc 15
-// 0x01044f18: 0x1044f18: lw    a1, 4(s8)
+// 0x01044f28: 0x1044f28: lw    a1, 4(s8)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -7202,7 +7202,7 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01044f1c: 0x1044f1c: jal   0x104e170 addiu s7, zero, 1
+// 0x01044f2c: 0x1044f2c: jal   0x104e180 addiu s7, zero, 1
 	ldc.i4.1
 	stloc 16
 	ldloc.0
@@ -7210,30 +7210,30 @@ L_1044ed8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01044f24: 0x1044f24: addiu v1, s1, 2
+// 0x01044f34: 0x1044f34: addiu v1, s1, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 6
-// 0x01044f28: 0x1044f28: mult  v1, s6
+// 0x01044f38: 0x1044f38: mult  v1, s6
 	ldloc 6
 	ldloc 9
 	mul
 	stloc 8
-// 0x01044f2c: 0x1044f2c: addu  s0, v0, zero
+// 0x01044f3c: 0x1044f3c: addu  s0, v0, zero
 	ldloc 7
 	stloc 13
-// 0x01044f30: 0x1044f30: addiu v0, s1, 7
+// 0x01044f40: 0x1044f40: addiu v0, s1, 7
 	ldloc 10
 	ldc.i4.7
 	add
 	stloc 7
-// 0x01044f34: 0x1044f34: sw    s7, 16(sp)
+// 0x01044f44: 0x1044f44: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7242,7 +7242,7 @@ L_1044ed8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01044f38: 0x1044f38: sw    zero, 56(sp)
+// 0x01044f48: 0x1044f48: sw    zero, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7251,7 +7251,7 @@ L_1044ed8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01044f3c: 0x1044f3c: sw    zero, 60(sp)
+// 0x01044f4c: 0x1044f4c: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7260,36 +7260,36 @@ L_1044ed8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01044f40: 0x1044f40: addu  a0, s0, zero
+// 0x01044f50: 0x1044f50: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x01044f44: 0x1044f44: addu  a1, s3, zero
+// 0x01044f54: 0x1044f54: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x01044f48: 0x1044f48: addu  a2, zero, zero
+// 0x01044f58: 0x1044f58: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01044f4c: 0x1044f4c: mflo  lo
+// 0x01044f5c: 0x1044f5c: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01044f50: 0x1044f50: addu  v1, s2, v1
+// 0x01044f60: 0x1044f60: addu  v1, s2, v1
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x01044f54: 0x1044f54: lw    a3, 0(v1)
+// 0x01044f64: 0x1044f64: lw    a3, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01044f58: 0x1044f58: mult  v0, s6
+// 0x01044f68: 0x1044f68: mult  v0, s6
 	ldloc 7
 	ldloc 9
 	mul
 	stloc 8
-// 0x01044f5c: 0x1044f5c: sw    v1, 68(sp)
+// 0x01044f6c: 0x1044f6c: sw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7298,15 +7298,15 @@ L_1044ed8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01044f60: 0x1044f60: mflo  lo
+// 0x01044f70: 0x1044f70: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01044f64: 0x1044f64: addu  v0, s2, v0
+// 0x01044f74: 0x1044f74: addu  v0, s2, v0
 	ldloc 11
 	ldloc 7
 	add
 	stloc 7
-// 0x01044f68: 0x1044f68: lw    t0, 8(v0)
+// 0x01044f78: 0x1044f78: lw    t0, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7315,7 +7315,7 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01044f6c: 0x1044f6c: sw    v0, 72(sp)
+// 0x01044f7c: 0x1044f7c: sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7324,12 +7324,12 @@ L_1044ed8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01044f70: 0x1044f70: subu  t0, s4, t0
+// 0x01044f80: 0x1044f80: subu  t0, s4, t0
 	ldloc 12
 	ldloc 18
 	sub
 	stloc 18
-// 0x01044f74: 0x1044f74: jal   0x104def0 sw    t0, 64(sp)
+// 0x01044f84: 0x1044f84: jal   0x104df00 sw    t0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7342,22 +7342,22 @@ L_1044ed8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01044f7c: 0x1044f7c: addiu a3, s1, 1
+// 0x01044f8c: 0x1044f8c: addiu a3, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01044f80: 0x1044f80: mult  a3, s6
+// 0x01044f90: 0x1044f90: mult  a3, s6
 	ldloc 4
 	ldloc 9
 	mul
 	stloc 8
-// 0x01044f84: 0x1044f84: sw    s7, 16(sp)
+// 0x01044f94: 0x1044f94: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7366,7 +7366,7 @@ L_1044ed8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01044f88: 0x1044f88: lw    t0, 64(sp)
+// 0x01044f98: 0x1044f98: lw    t0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7375,16 +7375,16 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01044f8c: 0x1044f8c: addu  a1, s3, zero
+// 0x01044f9c: 0x1044f9c: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x01044f90: 0x1044f90: addu  a0, s0, zero
+// 0x01044fa0: 0x1044fa0: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x01044f94: 0x1044f94: addu  a2, zero, zero
+// 0x01044fa4: 0x1044fa4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01044f98: 0x1044f98: sw    t0, 56(sp)
+// 0x01044fa8: 0x1044fa8: sw    t0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7393,7 +7393,7 @@ L_1044ed8:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01044f9c: 0x1044f9c: sw    zero, 60(sp)
+// 0x01044fac: 0x1044fac: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7402,22 +7402,22 @@ L_1044ed8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01044fa0: 0x1044fa0: mflo  lo
+// 0x01044fb0: 0x1044fb0: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x01044fa4: 0x1044fa4: addu  a3, s2, a3
+// 0x01044fb4: 0x1044fb4: addu  a3, s2, a3
 	ldloc 11
 	ldloc 4
 	add
 	stloc 4
-// 0x01044fa8: 0x1044fa8: lw    a3, 0(a3)
+// 0x01044fb8: 0x1044fb8: lw    a3, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01044fac: 0x1044fac: jal   0x104def0 addiu s1, s1, 6
+// 0x01044fbc: 0x1044fbc: jal   0x104df00 addiu s1, s1, 6
 	ldloc 10
 	ldc.i4.6
 	add
@@ -7426,17 +7426,17 @@ L_1044ed8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01044fb4: 0x1044fb4: mult  s1, s6
+// 0x01044fc4: 0x1044fc4: mult  s1, s6
 	ldloc 10
 	ldloc 9
 	mul
 	stloc 8
-// 0x01044fb8: 0x1044fb8: lw    v0, 72(sp)
+// 0x01044fc8: 0x1044fc8: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7445,8 +7445,8 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044fbc: 0x1044fbc: sll   zero, zero, 0
-// 0x01044fc0: 0x1044fc0: lw    s1, 8(v0)
+// 0x01044fcc: 0x1044fcc: sll   zero, zero, 0
+// 0x01044fd0: 0x1044fd0: lw    s1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7455,7 +7455,7 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01044fc4: 0x1044fc4: lw    v0, 8(s8)
+// 0x01044fd4: 0x1044fd4: lw    v0, 8(s8)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -7464,20 +7464,20 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01044fc8: 0x1044fc8: subu  s4, s4, s1
+// 0x01044fd8: 0x1044fd8: subu  s4, s4, s1
 	ldloc 12
 	ldloc 10
 	sub
 	stloc 12
-// 0x01044fcc: 0x1044fcc: mflo  lo
+// 0x01044fdc: 0x1044fdc: mflo  lo
 	ldloc 8
 	stloc 9
-// 0x01044fd0: 0x1044fd0: addu  s2, s2, s6
+// 0x01044fe0: 0x1044fe0: addu  s2, s2, s6
 	ldloc 11
 	ldloc 9
 	add
 	stloc 11
-// 0x01044fd4: 0x1044fd4: lw    a1, 8(s2)
+// 0x01044fe4: 0x1044fe4: lw    a1, 8(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7486,21 +7486,21 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01044fd8: 0x1044fd8: sll   zero, zero, 0
-// 0x01044fdc: 0x1044fdc: subu  s4, s4, a1
+// 0x01044fe8: 0x1044fe8: sll   zero, zero, 0
+// 0x01044fec: 0x1044fec: subu  s4, s4, a1
 	ldloc 12
 	ldloc.2
 	sub
 	stloc 12
-// 0x01044fe0: 0x1044fe0: div   s4, v0
+// 0x01044ff0: 0x1044ff0: div   s4, v0
 	ldloc 12
 	ldloc 7
 	div
 	stloc 8
-// 0x01044fe4: 0x1044fe4: mflo  lo
+// 0x01044ff4: 0x1044ff4: mflo  lo
 	ldloc 8
 	stloc 10
-// 0x01044fe8: 0x1044fe8: jal   0x1000910 addiu a0, zero, 16
+// 0x01044ff8: 0x1044ff8: jal   0x1000910 addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
 	ldloc.0
@@ -7513,7 +7513,7 @@ L_1044ed8:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01044ff0: 0x1044ff0: lw    v1, 68(sp)
+// 0x01045000: 0x1045000: lw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7522,14 +7522,14 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01044ff4: 0x1044ff4: lw    a3, 0(s8)
+// 0x01045004: 0x1045004: lw    a3, 0(s8)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01044ff8: 0x1044ff8: lw    v1, 8(v1)
+// 0x01045008: 0x1045008: lw    v1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -7538,7 +7538,7 @@ L_1044ed8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01044ffc: 0x1044ffc: j	 0x10450ec sw    v1, 56(sp)
+// 0x0104500c: 0x104500c: j	 0x10450fc sw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7547,49 +7547,49 @@ L_1044ed8:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10450ec
+	br L_10450fc
 // --- basic block ---
-L_1045004:
-// 0x01045004: 0x1045004: addiu s8, zero, 12
+L_1045014:
+// 0x01045014: 0x1045014: addiu s8, zero, 12
 	ldc.i4.s 12
 	stloc 15
-// 0x01045008: 0x1045008: mult  s4, s8
+// 0x01045018: 0x1045018: mult  s4, s8
 	ldloc 12
 	ldloc 15
 	mul
 	stloc 8
-// 0x0104500c: 0x104500c: subu  s1, v1, v0
+// 0x0104501c: 0x104501c: subu  s1, v1, v0
 	ldloc 6
 	ldloc 7
 	sub
 	stloc 10
-// 0x01045010: 0x1045010: sra   a0, s1, 31
+// 0x01045020: 0x1045020: sra   a0, s1, 31
 	ldloc 10
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x01045014: 0x1045014: xor   s1, a0, s1
+// 0x01045024: 0x1045024: xor   s1, a0, s1
 	ldloc.1
 	ldloc 10
 	xor
 	stloc 10
-// 0x01045018: 0x1045018: subu  s1, s1, a0
+// 0x01045028: 0x1045028: subu  s1, s1, a0
 	ldloc 10
 	ldloc.1
 	sub
 	stloc 10
-// 0x0104501c: 0x104501c: addu  a0, s1, zero
+// 0x0104502c: 0x104502c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01045020: 0x1045020: mflo  lo
+// 0x01045030: 0x1045030: mflo  lo
 	ldloc 8
 	stloc 9
-// 0x01045024: 0x1045024: addu  s6, s2, s6
+// 0x01045034: 0x1045034: addu  s6, s2, s6
 	ldloc 11
 	ldloc 9
 	add
 	stloc 9
-// 0x01045028: 0x1045028: lw    a1, 4(s6)
+// 0x01045038: 0x1045038: lw    a1, 4(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7598,7 +7598,7 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104502c: 0x104502c: jal   0x104e170 addiu s7, zero, 1
+// 0x0104503c: 0x104503c: jal   0x104e180 addiu s7, zero, 1
 	ldc.i4.1
 	stloc 16
 	ldloc.0
@@ -7606,32 +7606,32 @@ L_1045004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01045034: 0x1045034: addu  s0, v0, zero
+// 0x01045044: 0x1045044: addu  s0, v0, zero
 	ldloc 7
 	stloc 13
-// 0x01045038: 0x1045038: addiu v0, s4, 2
+// 0x01045048: 0x1045048: addiu v0, s4, 2
 	ldloc 12
 	ldc.i4.2
 	add
 	stloc 7
-// 0x0104503c: 0x104503c: mult  v0, s8
+// 0x0104504c: 0x104504c: mult  v0, s8
 	ldloc 7
 	ldloc 15
 	mul
 	stloc 8
-// 0x01045040: 0x1045040: lw    a3, 0(s6)
+// 0x01045050: 0x1045050: lw    a3, 0(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01045044: 0x1045044: sw    zero, 56(sp)
+// 0x01045054: 0x1045054: sw    zero, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7640,7 +7640,7 @@ L_1045004:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045048: 0x1045048: sw    zero, 60(sp)
+// 0x01045058: 0x1045058: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7649,7 +7649,7 @@ L_1045004:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104504c: 0x104504c: sw    s7, 16(sp)
+// 0x0104505c: 0x104505c: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7658,29 +7658,29 @@ L_1045004:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01045050: 0x1045050: addu  a0, s0, zero
+// 0x01045060: 0x1045060: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x01045054: 0x1045054: addu  a1, s3, zero
+// 0x01045064: 0x1045064: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x01045058: 0x1045058: addu  a2, zero, zero
+// 0x01045068: 0x1045068: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104505c: 0x104505c: addiu s4, s4, 1
+// 0x0104506c: 0x104506c: addiu s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x01045060: 0x1045060: mflo  lo
+// 0x01045070: 0x1045070: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01045064: 0x1045064: addu  v0, s2, v0
+// 0x01045074: 0x1045074: addu  v0, s2, v0
 	ldloc 11
 	ldloc 7
 	add
 	stloc 7
-// 0x01045068: 0x1045068: lw    v1, 8(v0)
+// 0x01045078: 0x1045078: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7689,7 +7689,7 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104506c: 0x104506c: sw    v0, 72(sp)
+// 0x0104507c: 0x104507c: sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7698,12 +7698,12 @@ L_1045004:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045070: 0x1045070: subu  v1, s1, v1
+// 0x01045080: 0x1045080: subu  v1, s1, v1
 	ldloc 10
 	ldloc 6
 	sub
 	stloc 6
-// 0x01045074: 0x1045074: jal   0x104def0 sw    v1, 68(sp)
+// 0x01045084: 0x1045084: jal   0x104df00 sw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7716,12 +7716,12 @@ L_1045004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0104507c: 0x104507c: lw    v0, 72(sp)
+// 0x0104508c: 0x104508c: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7730,7 +7730,7 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045080: 0x1045080: lw    v1, 68(sp)
+// 0x01045090: 0x1045090: lw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7739,23 +7739,23 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045084: 0x1045084: lw    a3, 0(v0)
+// 0x01045094: 0x1045094: lw    a3, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01045088: 0x1045088: addu  a1, s3, zero
+// 0x01045098: 0x1045098: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x0104508c: 0x104508c: addu  a0, s0, zero
+// 0x0104509c: 0x104509c: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x01045090: 0x1045090: addu  a2, zero, zero
+// 0x010450a0: 0x10450a0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01045094: 0x1045094: sw    v1, 56(sp)
+// 0x010450a4: 0x10450a4: sw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7764,7 +7764,7 @@ L_1045004:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01045098: 0x1045098: sw    zero, 60(sp)
+// 0x010450a8: 0x10450a8: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7773,7 +7773,7 @@ L_1045004:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104509c: 0x104509c: jal   0x104def0 sw    s7, 16(sp)
+// 0x010450ac: 0x10450ac: jal   0x104df00 sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7786,17 +7786,17 @@ L_1045004:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010450a4: 0x10450a4: mult  s4, s8
+// 0x010450b4: 0x10450b4: mult  s4, s8
 	ldloc 12
 	ldloc 15
 	mul
 	stloc 8
-// 0x010450a8: 0x10450a8: lw    v0, 72(sp)
+// 0x010450b8: 0x10450b8: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7805,7 +7805,7 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010450ac: 0x10450ac: lw    a0, 8(s6)
+// 0x010450bc: 0x10450bc: lw    a0, 8(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7814,7 +7814,7 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010450b0: 0x10450b0: lw    v1, 8(v0)
+// 0x010450c0: 0x10450c0: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7823,25 +7823,25 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010450b4: 0x10450b4: subu  s1, s1, a0
+// 0x010450c4: 0x10450c4: subu  s1, s1, a0
 	ldloc 10
 	ldloc.1
 	sub
 	stloc 10
-// 0x010450b8: 0x10450b8: subu  s1, s1, v1
+// 0x010450c8: 0x10450c8: subu  s1, s1, v1
 	ldloc 10
 	ldloc 6
 	sub
 	stloc 10
-// 0x010450bc: 0x10450bc: mflo  lo
+// 0x010450cc: 0x10450cc: mflo  lo
 	ldloc 8
 	stloc 15
-// 0x010450c0: 0x10450c0: addu  s2, s2, s8
+// 0x010450d0: 0x10450d0: addu  s2, s2, s8
 	ldloc 11
 	ldloc 15
 	add
 	stloc 11
-// 0x010450c4: 0x10450c4: lw    v1, 8(s2)
+// 0x010450d4: 0x10450d4: lw    v1, 8(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -7850,16 +7850,16 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010450c8: 0x10450c8: sll   zero, zero, 0
-// 0x010450cc: 0x10450cc: div   s1, v1
+// 0x010450d8: 0x10450d8: sll   zero, zero, 0
+// 0x010450dc: 0x10450dc: div   s1, v1
 	ldloc 10
 	ldloc 6
 	div
 	stloc 8
-// 0x010450d0: 0x10450d0: mflo  lo
+// 0x010450e0: 0x10450e0: mflo  lo
 	ldloc 8
 	stloc 10
-// 0x010450d4: 0x10450d4: jal   0x1000910 addiu a0, zero, 16
+// 0x010450e4: 0x10450e4: jal   0x1000910 addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
 	ldloc.0
@@ -7872,14 +7872,14 @@ L_1045004:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010450dc: 0x10450dc: lw    a3, 0(s2)
+// 0x010450ec: 0x10450ec: lw    a3, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010450e0: 0x10450e0: lw    v1, 8(s6)
+// 0x010450f0: 0x10450f0: lw    v1, 8(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -7888,8 +7888,8 @@ L_1045004:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010450e4: 0x10450e4: sll   zero, zero, 0
-// 0x010450e8: 0x10450e8: sw    v1, 56(sp)
+// 0x010450f4: 0x10450f4: sll   zero, zero, 0
+// 0x010450f8: 0x10450f8: sw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7898,8 +7898,8 @@ L_1045004:
 	add
 	ldloc 6
 	stelem.i4
-L_10450ec:
-// 0x010450ec: 0x10450ec: sw    s7, 16(sp)
+L_10450fc:
+// 0x010450fc: 0x10450fc: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7908,10 +7908,10 @@ L_10450ec:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010450f0: 0x10450f0: addu  a1, s3, zero
+// 0x01045100: 0x1045100: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x010450f4: 0x10450f4: sw    zero, 4(v0)
+// 0x01045104: 0x1045104: sw    zero, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -7920,10 +7920,10 @@ L_10450ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010450f8: 0x10450f8: addu  a2, v0, zero
+// 0x01045108: 0x1045108: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x010450fc: 0x10450fc: sw    zero, 60(sp)
+// 0x0104510c: 0x104510c: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7932,81 +7932,81 @@ L_10450ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045100: 0x1045100: addu  a0, s0, zero
+// 0x01045110: 0x1045110: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x01045104: 0x1045104: j	 0x1045364 sw    s1, 0(v0)
+// 0x01045114: 0x1045114: j	 0x1045374 sw    s1, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-	br L_1045364
+	br L_1045374
 // --- basic block ---
-L_104510c:
-// 0x0104510c: 0x104510c: addiu s4, zero, 12
+L_104511c:
+// 0x0104511c: 0x104511c: addiu s4, zero, 12
 	ldc.i4.s 12
 	stloc 12
-// 0x01045110: 0x1045110: mult  s1, s4
+// 0x01045120: 0x1045120: mult  s1, s4
 	ldloc 10
 	ldloc 12
 	mul
 	stloc 8
-// 0x01045114: 0x1045114: lw    v0, 0(s7)
+// 0x01045124: 0x1045124: lw    v0, 0(s7)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01045118: 0x1045118: lw    s6, 0(s6)
+// 0x01045128: 0x1045128: lw    s6, 0(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0104511c: 0x104511c: lui   s3, 0x60000
+// 0x0104512c: 0x104512c: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 14
-// 0x01045120: 0x1045120: subu  s6, s6, v0
+// 0x01045130: 0x1045130: subu  s6, s6, v0
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 9
-// 0x01045124: 0x1045124: addiu s3, s3, 13300
+// 0x01045134: 0x1045134: addiu s3, s3, 13764
 	ldloc 14
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 14
-// 0x01045128: 0x1045128: sra   v0, s6, 31
+// 0x01045138: 0x1045138: sra   v0, s6, 31
 	ldloc 9
 	ldc.i4.s 31
 	shr
 	stloc 7
-// 0x0104512c: 0x104512c: xor   s6, v0, s6
+// 0x0104513c: 0x104513c: xor   s6, v0, s6
 	ldloc 7
 	ldloc 9
 	xor
 	stloc 9
-// 0x01045130: 0x1045130: subu  s6, s6, v0
+// 0x01045140: 0x1045140: subu  s6, s6, v0
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 9
-// 0x01045134: 0x1045134: addu  a0, s6, zero
+// 0x01045144: 0x1045144: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x01045138: 0x1045138: mflo  lo
+// 0x01045148: 0x1045148: mflo  lo
 	ldloc 8
 	stloc 15
-// 0x0104513c: 0x104513c: addu  s8, s3, s8
+// 0x0104514c: 0x104514c: addu  s8, s3, s8
 	ldloc 14
 	ldloc 15
 	add
 	stloc 15
-// 0x01045140: 0x1045140: lw    a1, 4(s8)
+// 0x01045150: 0x1045150: lw    a1, 4(s8)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -8015,7 +8015,7 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045144: 0x1045144: jal   0x104e170 addiu s7, sp, 56
+// 0x01045154: 0x1045154: jal   0x104e180 addiu s7, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -8025,30 +8025,30 @@ L_104510c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0104514c: 0x104514c: addiu v1, s1, 5
+// 0x0104515c: 0x104515c: addiu v1, s1, 5
 	ldloc 10
 	ldc.i4.5
 	add
 	stloc 6
-// 0x01045150: 0x1045150: mult  v1, s4
+// 0x01045160: 0x1045160: mult  v1, s4
 	ldloc 6
 	ldloc 12
 	mul
 	stloc 8
-// 0x01045154: 0x1045154: addu  s0, v0, zero
+// 0x01045164: 0x1045164: addu  s0, v0, zero
 	ldloc 7
 	stloc 13
-// 0x01045158: 0x1045158: addiu v0, s1, 7
+// 0x01045168: 0x1045168: addiu v0, s1, 7
 	ldloc 10
 	ldc.i4.7
 	add
 	stloc 7
-// 0x0104515c: 0x104515c: sw    s2, 16(sp)
+// 0x0104516c: 0x104516c: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8057,7 +8057,7 @@ L_104510c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01045160: 0x1045160: sw    zero, 56(sp)
+// 0x01045170: 0x1045170: sw    zero, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8066,7 +8066,7 @@ L_104510c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045164: 0x1045164: sw    zero, 60(sp)
+// 0x01045174: 0x1045174: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8075,44 +8075,44 @@ L_104510c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045168: 0x1045168: addu  a0, s0, zero
+// 0x01045178: 0x1045178: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x0104516c: 0x104516c: addu  a1, s7, zero
+// 0x0104517c: 0x104517c: addu  a1, s7, zero
 	ldloc 16
 	stloc.2
-// 0x01045170: 0x1045170: addu  a2, zero, zero
+// 0x01045180: 0x1045180: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01045174: 0x1045174: mflo  lo
+// 0x01045184: 0x1045184: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01045178: 0x1045178: addu  v1, v1, s3
+// 0x01045188: 0x1045188: addu  v1, v1, s3
 	ldloc 6
 	ldloc 14
 	add
 	stloc 6
-// 0x0104517c: 0x104517c: lw    a3, 0(v1)
+// 0x0104518c: 0x104518c: lw    a3, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01045180: 0x1045180: mult  v0, s4
+// 0x01045190: 0x1045190: mult  v0, s4
 	ldloc 7
 	ldloc 12
 	mul
 	stloc 8
-// 0x01045184: 0x1045184: mflo  lo
+// 0x01045194: 0x1045194: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01045188: 0x1045188: addu  v0, v0, s3
+// 0x01045198: 0x1045198: addu  v0, v0, s3
 	ldloc 7
 	ldloc 14
 	add
 	stloc 7
-// 0x0104518c: 0x104518c: lw    v1, 8(v0)
+// 0x0104519c: 0x104519c: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -8121,7 +8121,7 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045190: 0x1045190: sw    v0, 72(sp)
+// 0x010451a0: 0x10451a0: sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8130,12 +8130,12 @@ L_104510c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045194: 0x1045194: subu  v1, s6, v1
+// 0x010451a4: 0x10451a4: subu  v1, s6, v1
 	ldloc 9
 	ldloc 6
 	sub
 	stloc 6
-// 0x01045198: 0x1045198: jal   0x104def0 sw    v1, 68(sp)
+// 0x010451a8: 0x10451a8: jal   0x104df00 sw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8148,22 +8148,22 @@ L_104510c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010451a0: 0x10451a0: addiu a0, s1, 4
+// 0x010451b0: 0x10451b0: addiu a0, s1, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc.1
-// 0x010451a4: 0x10451a4: mult  a0, s4
+// 0x010451b4: 0x10451b4: mult  a0, s4
 	ldloc.1
 	ldloc 12
 	mul
 	stloc 8
-// 0x010451a8: 0x10451a8: lw    v1, 68(sp)
+// 0x010451b8: 0x10451b8: lw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8172,7 +8172,7 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010451ac: 0x10451ac: sw    s2, 16(sp)
+// 0x010451bc: 0x10451bc: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8181,7 +8181,7 @@ L_104510c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010451b0: 0x10451b0: sw    v1, 56(sp)
+// 0x010451c0: 0x10451c0: sw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8190,13 +8190,13 @@ L_104510c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010451b4: 0x10451b4: addu  a2, zero, zero
+// 0x010451c4: 0x10451c4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010451b8: 0x10451b8: addu  a1, s7, zero
+// 0x010451c8: 0x10451c8: addu  a1, s7, zero
 	ldloc 16
 	stloc.2
-// 0x010451bc: 0x10451bc: sw    zero, 60(sp)
+// 0x010451cc: 0x10451cc: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8205,44 +8205,44 @@ L_104510c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010451c0: 0x10451c0: mflo  lo
+// 0x010451d0: 0x10451d0: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x010451c4: 0x10451c4: addu  v1, a3, s3
+// 0x010451d4: 0x10451d4: addu  v1, a3, s3
 	ldloc 4
 	ldloc 14
 	add
 	stloc 6
-// 0x010451c8: 0x10451c8: lw    a3, 0(v1)
+// 0x010451d8: 0x10451d8: lw    a3, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010451cc: 0x10451cc: jal   0x104def0 addu  a0, s0, zero
+// 0x010451dc: 0x10451dc: jal   0x104df00 addu  a0, s0, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010451d4: 0x10451d4: addiu v1, s1, 6
+// 0x010451e4: 0x10451e4: addiu v1, s1, 6
 	ldloc 10
 	ldc.i4.6
 	add
 	stloc 6
-// 0x010451d8: 0x10451d8: mult  v1, s4
+// 0x010451e8: 0x10451e8: mult  v1, s4
 	ldloc 6
 	ldloc 12
 	mul
 	stloc 8
-// 0x010451dc: 0x10451dc: lw    v0, 72(sp)
+// 0x010451ec: 0x10451ec: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8251,7 +8251,7 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010451e0: 0x10451e0: lw    v1, 8(s8)
+// 0x010451f0: 0x10451f0: lw    v1, 8(s8)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
@@ -8260,7 +8260,7 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010451e4: 0x10451e4: lw    v0, 8(v0)
+// 0x010451f4: 0x10451f4: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -8269,21 +8269,21 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010451e8: 0x10451e8: sll   zero, zero, 0
-// 0x010451ec: 0x10451ec: subu  s6, s6, v0
+// 0x010451f8: 0x10451f8: sll   zero, zero, 0
+// 0x010451fc: 0x10451fc: subu  s6, s6, v0
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 9
-// 0x010451f0: 0x10451f0: mflo  lo
+// 0x01045200: 0x1045200: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010451f4: 0x10451f4: addu  v0, a1, s3
+// 0x01045204: 0x1045204: addu  v0, a1, s3
 	ldloc.2
 	ldloc 14
 	add
 	stloc 7
-// 0x010451f8: 0x10451f8: lw    a1, 8(v0)
+// 0x01045208: 0x1045208: lw    a1, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -8292,21 +8292,21 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010451fc: 0x10451fc: sll   zero, zero, 0
-// 0x01045200: 0x1045200: subu  s6, s6, a1
+// 0x0104520c: 0x104520c: sll   zero, zero, 0
+// 0x01045210: 0x1045210: subu  s6, s6, a1
 	ldloc 9
 	ldloc.2
 	sub
 	stloc 9
-// 0x01045204: 0x1045204: div   s6, v1
+// 0x01045214: 0x1045214: div   s6, v1
 	ldloc 9
 	ldloc 6
 	div
 	stloc 8
-// 0x01045208: 0x1045208: mflo  lo
+// 0x01045218: 0x1045218: mflo  lo
 	ldloc 8
 	stloc 9
-// 0x0104520c: 0x104520c: jal   0x1000910 addiu a0, zero, 16
+// 0x0104521c: 0x104521c: jal   0x1000910 addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
 	ldloc.0
@@ -8319,22 +8319,22 @@ L_104510c:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01045214: 0x1045214: addiu v1, s1, 3
+// 0x01045224: 0x1045224: addiu v1, s1, 3
 	ldloc 10
 	ldc.i4.3
 	add
 	stloc 6
-// 0x01045218: 0x1045218: addiu s1, s1, 2
+// 0x01045228: 0x1045228: addiu s1, s1, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x0104521c: 0x104521c: mult  v1, s4
+// 0x0104522c: 0x104522c: mult  v1, s4
 	ldloc 6
 	ldloc 12
 	mul
 	stloc 8
-// 0x01045220: 0x1045220: sw    s2, 16(sp)
+// 0x01045230: 0x1045230: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8343,7 +8343,7 @@ L_104510c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01045224: 0x1045224: sw    zero, 4(v0)
+// 0x01045234: 0x1045234: sw    zero, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -8352,7 +8352,7 @@ L_104510c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045228: 0x1045228: sw    zero, 60(sp)
+// 0x01045238: 0x1045238: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8361,51 +8361,51 @@ L_104510c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104522c: 0x104522c: sw    s6, 0(v0)
+// 0x0104523c: 0x104523c: sw    s6, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x01045230: 0x1045230: addu  a2, v0, zero
+// 0x01045240: 0x1045240: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x01045234: 0x1045234: addu  a1, s7, zero
+// 0x01045244: 0x1045244: addu  a1, s7, zero
 	ldloc 16
 	stloc.2
-// 0x01045238: 0x1045238: addu  a0, s0, zero
+// 0x01045248: 0x1045248: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x0104523c: 0x104523c: mflo  lo
+// 0x0104524c: 0x104524c: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x01045240: 0x1045240: addu  v1, v1, s3
+// 0x01045250: 0x1045250: addu  v1, v1, s3
 	ldloc 6
 	ldloc 14
 	add
 	stloc 6
-// 0x01045244: 0x1045244: lw    a3, 0(v1)
+// 0x01045254: 0x1045254: lw    a3, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01045248: 0x1045248: mult  s1, s4
+// 0x01045258: 0x1045258: mult  s1, s4
 	ldloc 10
 	ldloc 12
 	mul
 	stloc 8
-// 0x0104524c: 0x104524c: mflo  lo
+// 0x0104525c: 0x104525c: mflo  lo
 	ldloc 8
 	stloc 12
-// 0x01045250: 0x1045250: addu  s3, s4, s3
+// 0x01045260: 0x1045260: addu  s3, s4, s3
 	ldloc 12
 	ldloc 14
 	add
 	stloc 14
-// 0x01045254: 0x1045254: lw    v0, 8(s3)
+// 0x01045264: 0x1045264: lw    v0, 8(s3)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -8414,7 +8414,7 @@ L_104510c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045258: 0x1045258: j	 0x1045364 sw    v0, 56(sp)
+// 0x01045268: 0x1045268: j	 0x1045374 sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8423,94 +8423,94 @@ L_104510c:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1045364
+	br L_1045374
 // --- basic block ---
-L_1045260:
-// 0x01045260: 0x1045260: lw    v0, 0(s7)
+L_1045270:
+// 0x01045270: 0x1045270: lw    v0, 0(s7)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01045264: 0x1045264: lw    s2, 0(s6)
+// 0x01045274: 0x1045274: lw    s2, 0(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01045268: 0x1045268: sll   zero, zero, 0
-// 0x0104526c: 0x104526c: subu  s2, s2, v0
+// 0x01045278: 0x1045278: sll   zero, zero, 0
+// 0x0104527c: 0x104527c: subu  s2, s2, v0
 	ldloc 11
 	ldloc 7
 	sub
 	stloc 11
-// 0x01045270: 0x1045270: sra   v0, s2, 31
+// 0x01045280: 0x1045280: sra   v0, s2, 31
 	ldloc 11
 	ldc.i4.s 31
 	shr
 	stloc 7
-// 0x01045274: 0x1045274: xor   s2, v0, s2
+// 0x01045284: 0x1045284: xor   s2, v0, s2
 	ldloc 7
 	ldloc 11
 	xor
 	stloc 11
-// 0x01045278: 0x1045278: bgez  s3, 0x1045284 subu  s2, s2, v0
+// 0x01045288: 0x1045288: bgez  s3, 0x1045294 subu  s2, s2, v0
 	ldloc 14
 	ldloc 11
 	ldloc 7
 	sub
 	stloc 11
 	ldc.i4.s 0
-	bge L_1045284
+	bge L_1045294
 // --- basic block ---
-// 0x01045280: 0x1045280: addiu s3, zero, 1
+// 0x01045290: 0x1045290: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 14
-L_1045284:
-// 0x01045284: 0x1045284: addiu v1, zero, 12
+L_1045294:
+// 0x01045294: 0x1045294: addiu v1, zero, 12
 	ldc.i4.s 12
 	stloc 6
-// 0x01045288: 0x1045288: addiu s4, s1, 6
+// 0x01045298: 0x1045298: addiu s4, s1, 6
 	ldloc 10
 	ldc.i4.6
 	add
 	stloc 12
-// 0x0104528c: 0x104528c: mult  s4, v1
+// 0x0104529c: 0x104529c: mult  s4, v1
 	ldloc 12
 	ldloc 6
 	mul
 	stloc 8
-// 0x01045290: 0x1045290: lui   v1, 0x60000
+// 0x010452a0: 0x10452a0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01045294: 0x1045294: addiu v1, v1, 13300
+// 0x010452a4: 0x10452a4: addiu v1, v1, 13764
 	ldloc 6
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 6
-// 0x01045298: 0x1045298: lui   v0, 0xf0000
+// 0x010452a8: 0x10452a8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0104529c: 0x104529c: lw    v0, -30072(v0)
+// 0x010452ac: 0x10452ac: lw    v0, -29608(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x010452a0: 0x10452a0: mflo  lo
+// 0x010452b0: 0x10452b0: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010452a4: 0x10452a4: addu  v1, v1, a0
+// 0x010452b4: 0x10452b4: addu  v1, v1, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-// 0x010452a8: 0x10452a8: lw    a1, 4(v1)
+// 0x010452b8: 0x10452b8: lw    a1, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8519,29 +8519,29 @@ L_1045284:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010452ac: 0x10452ac: sll   zero, zero, 0
-// 0x010452b0: 0x10452b0: mult  s3, a1
+// 0x010452bc: 0x10452bc: sll   zero, zero, 0
+// 0x010452c0: 0x10452c0: mult  s3, a1
 	ldloc 14
 	ldloc.2
 	mul
 	stloc 8
-// 0x010452b4: 0x10452b4: mflo  lo
+// 0x010452c4: 0x10452c4: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010452b8: 0x10452b8: slt   v1, v0, a1
+// 0x010452c8: 0x10452c8: slt   v1, v0, a1
 	ldloc 7
 	ldloc.2
 	clt
 	stloc 6
-// 0x010452bc: 0x10452bc: beq   v1, zero, 0x10452c8 sll   zero, zero, 0
+// 0x010452cc: 0x10452cc: beq   v1, zero, 0x10452d8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10452c8
+	brfalse L_10452d8
 // --- basic block ---
-// 0x010452c4: 0x10452c4: addu  a1, v0, zero
+// 0x010452d4: 0x10452d4: addu  a1, v0, zero
 	ldloc 7
 	stloc.2
-L_10452c8:
-// 0x010452c8: 0x10452c8: jal   0x104e170 addu  a0, s2, zero
+L_10452d8:
+// 0x010452d8: 0x10452d8: jal   0x104e180 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -8549,15 +8549,15 @@ L_10452c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010452d0: 0x10452d0: addiu a0, zero, 16
+// 0x010452e0: 0x10452e0: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-// 0x010452d4: 0x10452d4: jal   0x1000910 addu  s0, v0, zero
+// 0x010452e4: 0x10452e4: jal   0x1000910 addu  s0, v0, zero
 	ldloc 7
 	stloc 13
 	ldloc.0
@@ -8570,31 +8570,31 @@ L_10452c8:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010452dc: 0x10452dc: addiu v1, s1, 7
+// 0x010452ec: 0x10452ec: addiu v1, s1, 7
 	ldloc 10
 	ldc.i4.7
 	add
 	stloc 6
-// 0x010452e0: 0x10452e0: addiu s1, zero, 12
+// 0x010452f0: 0x10452f0: addiu s1, zero, 12
 	ldc.i4.s 12
 	stloc 10
-// 0x010452e4: 0x10452e4: mult  v1, s1
+// 0x010452f4: 0x10452f4: mult  v1, s1
 	ldloc 6
 	ldloc 10
 	mul
 	stloc 8
-// 0x010452e8: 0x10452e8: lui   s6, 0x60000
+// 0x010452f8: 0x10452f8: lui   s6, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x010452ec: 0x10452ec: addiu s6, s6, 13300
+// 0x010452fc: 0x10452fc: addiu s6, s6, 13764
 	ldloc 9
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 9
-// 0x010452f0: 0x10452f0: addiu s7, zero, 1
+// 0x01045300: 0x1045300: addiu s7, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x010452f4: 0x10452f4: sw    s3, 4(v0)
+// 0x01045304: 0x1045304: sw    s3, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -8603,14 +8603,14 @@ L_10452c8:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010452f8: 0x10452f8: sw    zero, 0(v0)
+// 0x01045308: 0x1045308: sw    zero, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010452fc: 0x10452fc: sw    s7, 16(sp)
+// 0x0104530c: 0x104530c: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8619,7 +8619,7 @@ L_10452c8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01045300: 0x1045300: sw    zero, 60(sp)
+// 0x01045310: 0x1045310: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8628,21 +8628,21 @@ L_10452c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045304: 0x1045304: addiu s8, sp, 56
+// 0x01045314: 0x1045314: addiu s8, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 15
-// 0x01045308: 0x1045308: addu  a2, v0, zero
+// 0x01045318: 0x1045318: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x0104530c: 0x104530c: addu  a0, s0, zero
+// 0x0104531c: 0x104531c: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x01045310: 0x1045310: addu  a1, s8, zero
+// 0x01045320: 0x1045320: addu  a1, s8, zero
 	ldloc 15
 	stloc.2
-// 0x01045314: 0x1045314: sw    v0, 72(sp)
+// 0x01045324: 0x1045324: sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8651,22 +8651,22 @@ L_10452c8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045318: 0x1045318: mflo  lo
+// 0x01045328: 0x1045328: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x0104531c: 0x104531c: addu  v1, v1, s6
+// 0x0104532c: 0x104532c: addu  v1, v1, s6
 	ldloc 6
 	ldloc 9
 	add
 	stloc 6
-// 0x01045320: 0x1045320: lw    a3, 0(v1)
+// 0x01045330: 0x1045330: lw    a3, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01045324: 0x1045324: lw    v1, 8(v1)
+// 0x01045334: 0x1045334: lw    v1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -8675,13 +8675,13 @@ L_10452c8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045328: 0x1045328: sll   zero, zero, 0
-// 0x0104532c: 0x104532c: subu  s2, s2, v1
+// 0x01045338: 0x1045338: sll   zero, zero, 0
+// 0x0104533c: 0x104533c: subu  s2, s2, v1
 	ldloc 11
 	ldloc 6
 	sub
 	stloc 11
-// 0x01045330: 0x1045330: jal   0x104def0 sw    s2, 56(sp)
+// 0x01045340: 0x1045340: jal   0x104df00 sw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8694,17 +8694,17 @@ L_10452c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01045338: 0x1045338: mult  s4, s1
+// 0x01045348: 0x1045348: mult  s4, s1
 	ldloc 12
 	ldloc 10
 	mul
 	stloc 8
-// 0x0104533c: 0x104533c: lw    v0, 72(sp)
+// 0x0104534c: 0x104534c: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8713,7 +8713,7 @@ L_10452c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045340: 0x1045340: sw    s7, 16(sp)
+// 0x01045350: 0x1045350: sw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8722,16 +8722,16 @@ L_10452c8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01045344: 0x1045344: addu  a1, s8, zero
+// 0x01045354: 0x1045354: addu  a1, s8, zero
 	ldloc 15
 	stloc.2
-// 0x01045348: 0x1045348: addu  a2, v0, zero
+// 0x01045358: 0x1045358: addu  a2, v0, zero
 	ldloc 7
 	stloc.3
-// 0x0104534c: 0x104534c: addu  a0, s0, zero
+// 0x0104535c: 0x104535c: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x01045350: 0x1045350: sw    zero, 56(sp)
+// 0x01045360: 0x1045360: sw    zero, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8740,7 +8740,7 @@ L_10452c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045354: 0x1045354: sw    zero, 60(sp)
+// 0x01045364: 0x1045364: sw    zero, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8749,70 +8749,70 @@ L_10452c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045358: 0x1045358: mflo  lo
+// 0x01045368: 0x1045368: mflo  lo
 	ldloc 8
 	stloc 12
-// 0x0104535c: 0x104535c: addu  s6, s4, s6
+// 0x0104536c: 0x104536c: addu  s6, s4, s6
 	ldloc 12
 	ldloc 9
 	add
 	stloc 9
-// 0x01045360: 0x1045360: lw    a3, 0(s6)
+// 0x01045370: 0x1045370: lw    a3, 0(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-L_1045364:
-// 0x01045364: 0x1045364: jal   0x104def0 sll   zero, zero, 0
+L_1045374:
+// 0x01045374: 0x1045374: jal   0x104df00 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_104536c:
-// 0x0104536c: 0x104536c: addiu v0, zero, 28
+L_104537c:
+// 0x0104537c: 0x104537c: addiu v0, zero, 28
 	ldc.i4.s 28
 	stloc 7
-// 0x01045370: 0x1045370: mult  s5, v0
+// 0x01045380: 0x1045380: mult  s5, v0
 	ldloc 17
 	ldloc 7
 	mul
 	stloc 8
-// 0x01045374: 0x1045374: lui   v1, 0x60000
+// 0x01045384: 0x1045384: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01045378: 0x1045378: lui   v0, 0x60000
+// 0x01045388: 0x1045388: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0104537c: 0x104537c: lw    v0, 13296(v0)
+// 0x0104538c: 0x104538c: lw    v0, 13760(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3324
+	ldc.i4 3440
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045380: 0x1045380: addiu v1, v1, 13564
+// 0x01045390: 0x1045390: addiu v1, v1, 14028
 	ldloc 6
-	ldc.i4 13564
+	ldc.i4 14028
 	add
 	stloc 6
-// 0x01045384: 0x1045384: mflo  lo
+// 0x01045394: 0x1045394: mflo  lo
 	ldloc 8
 	stloc 17
-// 0x01045388: 0x1045388: addu  s5, s5, v1
+// 0x01045398: 0x1045398: addu  s5, s5, v1
 	ldloc 17
 	ldloc 6
 	add
 	stloc 17
-// 0x0104538c: 0x104538c: sw    v0, 24(s5)
+// 0x0104539c: 0x104539c: sw    v0, 24(s5)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
@@ -8821,19 +8821,19 @@ L_104536c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045390: 0x1045390: sw    s0, 0(s5)
+// 0x010453a0: 0x10453a0: sw    s0, 0(s5)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-L_1045394:
-// 0x01045394: 0x1045394: lw    ra, 116(sp)
-// 0x01045398: 0x1045398: addu  v0, s0, zero
+L_10453a4:
+// 0x010453a4: 0x10453a4: lw    ra, 116(sp)
+// 0x010453a8: 0x10453a8: addu  v0, s0, zero
 	ldloc 13
 	stloc 7
-// 0x0104539c: 0x104539c: lw    s8, 112(sp)
+// 0x010453ac: 0x10453ac: lw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8842,7 +8842,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010453a0: 0x10453a0: lw    s7, 108(sp)
+// 0x010453b0: 0x10453b0: lw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8851,7 +8851,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010453a4: 0x10453a4: lw    s6, 104(sp)
+// 0x010453b4: 0x10453b4: lw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8860,7 +8860,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010453a8: 0x10453a8: lw    s5, 100(sp)
+// 0x010453b8: 0x10453b8: lw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8869,7 +8869,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010453ac: 0x10453ac: lw    s4, 96(sp)
+// 0x010453bc: 0x10453bc: lw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8878,7 +8878,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010453b0: 0x10453b0: lw    s3, 92(sp)
+// 0x010453c0: 0x10453c0: lw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8887,7 +8887,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010453b4: 0x10453b4: lw    s2, 88(sp)
+// 0x010453c4: 0x10453c4: lw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8896,7 +8896,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010453b8: 0x10453b8: lw    s1, 84(sp)
+// 0x010453c8: 0x10453c8: lw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8905,7 +8905,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010453bc: 0x10453bc: lw    s0, 80(sp)
+// 0x010453cc: 0x10453cc: lw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -8914,7 +8914,7 @@ L_1045394:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010453c0: 0x10453c0: jr    ra addiu sp, sp, 120
+// 0x010453d0: 0x10453d0: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
diff --git a/converted/Cibyl51.j b/converted/Cibyl51.j
index 95a7ce4..7c136ac 100644
--- a/converted/Cibyl51.j
+++ b/converted/Cibyl51.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl51::.ctor
 
-.method public static int32 roadmap_display_border_10453c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_display_border_10453d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 s4,int32 s3,int32 s5,int32 s8,int32 s6,int32 s1,int32 s2,int32 s7,int32 s0,int32 t0,int32 t1,int32 ra,int32 t2)
@@ -115,15 +115,15 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010453c8: 0x10453c8: addiu sp, sp, -176
+// 0x010453d8: 0x10453d8: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x010453cc: 0x10453cc: lui   v0, 0xf0000
+// 0x010453dc: 0x10453dc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010453d0: 0x10453d0: sw    s2, 144(sp)
+// 0x010453e0: 0x10453e0: sw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -132,7 +132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010453d4: 0x10453d4: lw    s2, 192(sp)
+// 0x010453e4: 0x10453e4: lw    s2, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -141,7 +141,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010453d8: 0x10453d8: sw    s4, 152(sp)
+// 0x010453e8: 0x10453e8: sw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -150,19 +150,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010453dc: 0x10453dc: lw    s4, -30068(v0)
+// 0x010453ec: 0x10453ec: lw    s4, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x010453e0: 0x10453e0: lui   v0, 0xf0000
+// 0x010453f0: 0x10453f0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010453e4: 0x10453e4: sw    s8, 168(sp)
+// 0x010453f4: 0x10453f4: sw    s8, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -171,7 +171,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010453e8: 0x10453e8: sw    s5, 156(sp)
+// 0x010453f8: 0x10453f8: sw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -180,7 +180,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010453ec: 0x10453ec: sw    s3, 148(sp)
+// 0x010453fc: 0x10453fc: sw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -189,7 +189,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010453f0: 0x10453f0: sw    s1, 140(sp)
+// 0x01045400: 0x1045400: sw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -198,7 +198,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010453f4: 0x10453f4: sw    s0, 136(sp)
+// 0x01045404: 0x1045404: sw    s0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -207,8 +207,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x010453f8: 0x10453f8: sw    ra, 172(sp)
-// 0x010453fc: 0x10453fc: sw    s7, 164(sp)
+// 0x01045408: 0x1045408: sw    ra, 172(sp)
+// 0x0104540c: 0x104540c: sw    s7, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -217,7 +217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01045400: 0x1045400: sw    s6, 160(sp)
+// 0x01045410: 0x1045410: sw    s6, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -226,34 +226,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01045404: 0x1045404: addu  s0, a0, zero
+// 0x01045414: 0x1045414: addu  s0, a0, zero
 	ldloc.1
 	stloc 17
-// 0x01045408: 0x1045408: addu  s5, a1, zero
+// 0x01045418: 0x1045418: addu  s5, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0104540c: 0x104540c: addu  s1, a2, zero
+// 0x0104541c: 0x104541c: addu  s1, a2, zero
 	ldloc.3
 	stloc 14
-// 0x01045410: 0x1045410: lw    s8, -30072(v0)
+// 0x01045420: 0x1045420: lw    s8, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 12
-// 0x01045414: 0x1045414: bne   s2, zero, 0x1045430 addu  s3, a3, zero
+// 0x01045424: 0x1045424: bne   s2, zero, 0x1045440 addu  s3, a3, zero
 	ldloc 15
 	ldloc 4
 	stloc 10
-	brtrue L_1045430
+	brtrue L_1045440
 // --- basic block ---
-// 0x0104541c: 0x104541c: addiu v0, zero, 1
+// 0x0104542c: 0x104542c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01045420: 0x1045420: jal   0x10423fc sw    v0, 68(sp)
+// 0x01045430: 0x1045430: jal   0x104240c sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -262,12 +262,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045428: 0x1045428: j	 0x1045440 sw    v0, 72(sp)
+// 0x01045438: 0x1045438: j	 0x1045450 sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -276,17 +276,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1045440
+	br L_1045450
 // --- basic block ---
-L_1045430:
-// 0x01045430: 0x1045430: lw    v1, 0(s2)
+L_1045440:
+// 0x01045440: 0x1045440: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01045434: 0x1045434: lw    v0, 4(s2)
+// 0x01045444: 0x1045444: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -295,7 +295,7 @@ L_1045430:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045438: 0x1045438: sw    v1, 68(sp)
+// 0x01045448: 0x1045448: sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -304,7 +304,7 @@ L_1045430:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104543c: 0x104543c: sw    v0, 72(sp)
+// 0x0104544c: 0x104544c: sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -313,38 +313,38 @@ L_1045430:
 	add
 	ldloc 5
 	stelem.i4
-L_1045440:
-// 0x01045440: 0x1045440: bne   s3, zero, 0x104545c sll   zero, zero, 0
+L_1045450:
+// 0x01045450: 0x1045450: bne   s3, zero, 0x104546c sll   zero, zero, 0
 	ldloc 10
-	brtrue L_104545c
+	brtrue L_104546c
 // --- basic block ---
-// 0x01045448: 0x1045448: jal   0x1042430 sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+// 0x01045458: 0x1045458: jal   0x1042440 sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045450: 0x1045450: subu  v0, s8, v0
+// 0x01045460: 0x1045460: subu  v0, s8, v0
 	ldloc 12
 	ldloc 5
 	sub
 	stloc 5
-// 0x01045454: 0x1045454: j	 0x1045468 addiu t0, s4, -1
+// 0x01045464: 0x1045464: j	 0x1045478 addiu t0, s4, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 18
-	br L_1045468
+	br L_1045478
 // --- basic block ---
-L_104545c:
-// 0x0104545c: 0x104545c: lw    t0, 0(s3)
+L_104546c:
+// 0x0104546c: 0x104546c: lw    t0, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 18
-// 0x01045460: 0x1045460: lw    v0, 4(s3)
+// 0x01045470: 0x1045470: lw    v0, 4(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -353,9 +353,9 @@ L_104545c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045464: 0x1045464: sll   zero, zero, 0
-L_1045468:
-// 0x01045468: 0x1045468: sw    v0, 112(sp)
+// 0x01045474: 0x1045474: sll   zero, zero, 0
+L_1045478:
+// 0x01045478: 0x1045478: sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -364,7 +364,7 @@ L_1045468:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104546c: 0x104546c: lw    v0, 68(sp)
+// 0x0104547c: 0x104547c: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -373,18 +373,18 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045470: 0x1045470: lui   s6, 0x60000
+// 0x01045480: 0x1045480: lui   s6, 0x60000
 	ldc.i4 393216
 	stloc 13
-// 0x01045474: 0x1045474: subu  v1, t0, v0
+// 0x01045484: 0x1045484: subu  v1, t0, v0
 	ldloc 18
 	ldloc 5
 	sub
 	stloc 7
-// 0x01045478: 0x1045478: addiu a0, zero, -1
+// 0x01045488: 0x1045488: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0104547c: 0x104547c: sw    v1, 120(sp)
+// 0x0104548c: 0x104548c: sw    v1, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -393,7 +393,7 @@ L_1045468:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045480: 0x1045480: lw    v1, 72(sp)
+// 0x01045490: 0x1045490: lw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -402,28 +402,28 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045484: 0x1045484: beq   s5, a0, 0x1045520 addiu s6, s6, 13300
+// 0x01045494: 0x1045494: beq   s5, a0, 0x1045530 addiu s6, s6, 13764
 	ldloc 11
 	ldloc.1
 	ldloc 13
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 13
-	beq  L_1045520
+	beq  L_1045530
 // --- basic block ---
-// 0x0104548c: 0x104548c: addu  a1, s0, zero
+// 0x0104549c: 0x104549c: addu  a1, s0, zero
 	ldloc 17
 	stloc.2
-// 0x01045490: 0x1045490: addu  a2, s5, zero
+// 0x010454a0: 0x10454a0: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x01045494: 0x1045494: addu  a3, s1, zero
+// 0x010454a4: 0x10454a4: addu  a3, s1, zero
 	ldloc 14
 	stloc 4
-// 0x01045498: 0x1045498: addu  a0, zero, zero
+// 0x010454a8: 0x10454a8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0104549c: 0x104549c: sw    v1, 128(sp)
+// 0x010454ac: 0x10454ac: sw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -432,7 +432,7 @@ L_1045468:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010454a0: 0x10454a0: sw    s3, 16(sp)
+// 0x010454b0: 0x10454b0: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -441,7 +441,7 @@ L_1045468:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010454a4: 0x10454a4: sw    s2, 20(sp)
+// 0x010454b4: 0x10454b4: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -450,7 +450,7 @@ L_1045468:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010454a8: 0x10454a8: jal   0x1044c6c sw    zero, 24(sp)
+// 0x010454b8: 0x10454b8: jal   0x1044c7c sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -464,23 +464,23 @@ L_1045468:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::get_image_1044c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::get_image_1044c7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010454b0: 0x10454b0: addu  a0, v0, zero
+// 0x010454c0: 0x10454c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010454b4: 0x10454b4: addiu a1, sp, 68
+// 0x010454c4: 0x10454c4: addiu a1, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.2
-// 0x010454b8: 0x10454b8: addu  a2, zero, zero
+// 0x010454c8: 0x10454c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010454bc: 0x10454bc: jal   0x104f4a8 addu  a3, zero, zero
+// 0x010454cc: 0x10454cc: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -488,25 +488,25 @@ L_1045468:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010454c4: 0x10454c4: addiu a0, zero, 12
+// 0x010454d4: 0x10454d4: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x010454c8: 0x10454c8: mult  s5, a0
+// 0x010454d8: 0x10454d8: mult  s5, a0
 	ldloc 11
 	ldloc.1
 	mul
 	stloc 8
-// 0x010454cc: 0x10454cc: addiu a2, s5, 2
+// 0x010454dc: 0x10454dc: addiu a2, s5, 2
 	ldloc 11
 	ldc.i4.2
 	add
 	stloc.3
-// 0x010454d0: 0x10454d0: lw    v0, 68(sp)
+// 0x010454e0: 0x10454e0: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -515,7 +515,7 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010454d4: 0x10454d4: lw    s4, 72(sp)
+// 0x010454e4: 0x10454e4: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -524,7 +524,7 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010454d8: 0x10454d8: sw    v0, 44(sp)
+// 0x010454e8: 0x10454e8: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -533,7 +533,7 @@ L_1045468:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010454dc: 0x10454dc: lw    v1, 128(sp)
+// 0x010454ec: 0x10454ec: lw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -542,15 +542,15 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010454e0: 0x10454e0: mflo  lo
+// 0x010454f0: 0x10454f0: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010454e4: 0x10454e4: addu  a1, s6, a1
+// 0x010454f4: 0x10454f4: addu  a1, s6, a1
 	ldloc 13
 	ldloc.2
 	add
 	stloc.2
-// 0x010454e8: 0x10454e8: lw    s7, 4(a1)
+// 0x010454f8: 0x10454f8: lw    s7, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -559,30 +559,30 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010454ec: 0x10454ec: mult  a2, a0
+// 0x010454fc: 0x10454fc: mult  a2, a0
 	ldloc.3
 	ldloc.1
 	mul
 	stloc 8
-// 0x010454f0: 0x10454f0: addu  s4, s7, s4
+// 0x01045500: 0x1045500: addu  s4, s7, s4
 	ldloc 16
 	ldloc 9
 	add
 	stloc 9
-// 0x010454f4: 0x10454f4: addiu s7, s7, 7
+// 0x01045504: 0x1045504: addiu s7, s7, 7
 	ldloc 16
 	ldc.i4.7
 	add
 	stloc 16
-// 0x010454f8: 0x10454f8: mflo  lo
+// 0x01045508: 0x1045508: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010454fc: 0x10454fc: addu  s6, s6, a0
+// 0x0104550c: 0x104550c: addu  s6, s6, a0
 	ldloc 13
 	ldloc.1
 	add
 	stloc 13
-// 0x01045500: 0x1045500: lw    a0, 8(s6)
+// 0x01045510: 0x1045510: lw    a0, 8(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -591,13 +591,13 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045504: 0x1045504: sll   zero, zero, 0
-// 0x01045508: 0x1045508: subu  v0, v0, a0
+// 0x01045514: 0x1045514: sll   zero, zero, 0
+// 0x01045518: 0x1045518: subu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc 5
-// 0x0104550c: 0x104550c: lw    a0, 120(sp)
+// 0x0104551c: 0x104551c: lw    a0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -606,13 +606,13 @@ L_1045468:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045510: 0x1045510: sll   zero, zero, 0
-// 0x01045514: 0x1045514: addu  v0, v0, a0
+// 0x01045520: 0x1045520: sll   zero, zero, 0
+// 0x01045524: 0x1045524: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01045518: 0x1045518: j	 0x10455c8 sw    v0, 36(sp)
+// 0x01045528: 0x1045528: j	 0x10455d8 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -621,28 +621,28 @@ L_1045468:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10455c8
+	br L_10455d8
 // --- basic block ---
-L_1045520:
-// 0x01045520: 0x1045520: addiu s7, zero, 12
+L_1045530:
+// 0x01045530: 0x1045530: addiu s7, zero, 12
 	ldc.i4.s 12
 	stloc 16
-// 0x01045524: 0x1045524: addiu t1, s0, 7
+// 0x01045534: 0x1045534: addiu t1, s0, 7
 	ldloc 17
 	ldc.i4.7
 	add
 	stloc 19
-// 0x01045528: 0x1045528: mult  t1, s7
+// 0x01045538: 0x1045538: mult  t1, s7
 	ldloc 19
 	ldloc 16
 	mul
 	stloc 8
-// 0x0104552c: 0x104552c: addiu t2, s0, 1
+// 0x0104553c: 0x104553c: addiu t2, s0, 1
 	ldloc 17
 	ldc.i4.1
 	add
 	stloc 21
-// 0x01045530: 0x1045530: sw    v1, 48(sp)
+// 0x01045540: 0x1045540: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -651,7 +651,7 @@ L_1045520:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045534: 0x1045534: sw    v0, 44(sp)
+// 0x01045544: 0x1045544: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -660,7 +660,7 @@ L_1045520:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01045538: 0x1045538: sw    s3, 16(sp)
+// 0x01045548: 0x1045548: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -669,7 +669,7 @@ L_1045520:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104553c: 0x104553c: sw    s2, 20(sp)
+// 0x0104554c: 0x104554c: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -678,7 +678,7 @@ L_1045520:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01045540: 0x1045540: sw    zero, 24(sp)
+// 0x01045550: 0x1045550: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -687,19 +687,19 @@ L_1045520:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045544: 0x1045544: addu  a1, s0, zero
+// 0x01045554: 0x1045554: addu  a1, s0, zero
 	ldloc 17
 	stloc.2
-// 0x01045548: 0x1045548: addiu a2, zero, -1
+// 0x01045558: 0x1045558: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104554c: 0x104554c: addu  a3, s1, zero
+// 0x0104555c: 0x104555c: addu  a3, s1, zero
 	ldloc 14
 	stloc 4
-// 0x01045550: 0x1045550: addu  a0, zero, zero
+// 0x01045560: 0x1045560: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01045554: 0x1045554: sw    v1, 128(sp)
+// 0x01045564: 0x1045564: sw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -708,15 +708,15 @@ L_1045520:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045558: 0x1045558: mflo  lo
+// 0x01045568: 0x1045568: mflo  lo
 	ldloc 8
 	stloc 19
-// 0x0104555c: 0x104555c: addu  t1, s6, t1
+// 0x0104556c: 0x104556c: addu  t1, s6, t1
 	ldloc 13
 	ldloc 19
 	add
 	stloc 19
-// 0x01045560: 0x1045560: lw    t1, 8(t1)
+// 0x01045570: 0x1045570: lw    t1, 8(t1)
 	ldloc 6
 	ldloc 19
 	ldc.i4.2
@@ -725,17 +725,17 @@ L_1045520:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01045564: 0x1045564: mult  t2, s7
+// 0x01045574: 0x1045574: mult  t2, s7
 	ldloc 21
 	ldloc 16
 	mul
 	stloc 8
-// 0x01045568: 0x1045568: subu  t0, t0, t1
+// 0x01045578: 0x1045578: subu  t0, t0, t1
 	ldloc 18
 	ldloc 19
 	sub
 	stloc 18
-// 0x0104556c: 0x104556c: sw    t0, 36(sp)
+// 0x0104557c: 0x104557c: sw    t0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -744,15 +744,15 @@ L_1045520:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01045570: 0x1045570: mflo  lo
+// 0x01045580: 0x1045580: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x01045574: 0x1045574: addu  v0, s6, v0
+// 0x01045584: 0x1045584: addu  v0, s6, v0
 	ldloc 13
 	ldloc 5
 	add
 	stloc 5
-// 0x01045578: 0x1045578: lw    s4, 4(v0)
+// 0x01045588: 0x1045588: lw    s4, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -761,7 +761,7 @@ L_1045520:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104557c: 0x104557c: jal   0x1044c6c addu  s4, v1, s4
+// 0x0104558c: 0x104558c: jal   0x1044c7c addu  s4, v1, s4
 	ldloc 7
 	ldloc 9
 	add
@@ -771,23 +771,23 @@ L_1045520:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::get_image_1044c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::get_image_1044c7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045584: 0x1045584: addu  a0, v0, zero
+// 0x01045594: 0x1045594: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01045588: 0x1045588: addiu a1, sp, 44
+// 0x01045598: 0x1045598: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x0104558c: 0x104558c: addu  a2, zero, zero
+// 0x0104559c: 0x104559c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01045590: 0x1045590: jal   0x104f4a8 addu  a3, zero, zero
+// 0x010455a0: 0x10455a0: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -795,12 +795,12 @@ L_1045520:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045598: 0x1045598: lw    v0, 72(sp)
+// 0x010455a8: 0x10455a8: lw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -809,7 +809,7 @@ L_1045520:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104559c: 0x104559c: lw    v1, 128(sp)
+// 0x010455ac: 0x10455ac: lw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -818,7 +818,7 @@ L_1045520:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010455a0: 0x10455a0: sw    v0, 40(sp)
+// 0x010455b0: 0x10455b0: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -827,19 +827,19 @@ L_1045520:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010455a4: 0x10455a4: addiu v0, zero, 8
+// 0x010455b4: 0x10455b4: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x010455a8: 0x10455a8: bne   s0, v0, 0x10455bc mult  s0, s7
+// 0x010455b8: 0x10455b8: bne   s0, v0, 0x10455cc mult  s0, s7
 	ldloc 17
 	ldloc 5
 	ldloc 17
 	ldloc 16
 	mul
 	stloc 8
-	bne.un L_10455bc
+	bne.un L_10455cc
 // --- basic block ---
-// 0x010455b0: 0x10455b0: lw    s7, 100(s6)
+// 0x010455c0: 0x10455c0: lw    s7, 100(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -848,23 +848,23 @@ L_1045520:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010455b4: 0x10455b4: j	 0x10455c8 addiu s7, s7, 7
+// 0x010455c4: 0x10455c4: j	 0x10455d8 addiu s7, s7, 7
 	ldloc 16
 	ldc.i4.7
 	add
 	stloc 16
-	br L_10455c8
+	br L_10455d8
 // --- basic block ---
-L_10455bc:
-// 0x010455bc: 0x10455bc: mflo  lo
+L_10455cc:
+// 0x010455cc: 0x10455cc: mflo  lo
 	ldloc 8
 	stloc 16
-// 0x010455c0: 0x10455c0: addu  s6, s6, s7
+// 0x010455d0: 0x10455d0: addu  s6, s6, s7
 	ldloc 13
 	ldloc 16
 	add
 	stloc 13
-// 0x010455c4: 0x10455c4: lw    s7, 4(s6)
+// 0x010455d4: 0x10455d4: lw    s7, 4(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -873,26 +873,26 @@ L_10455bc:
 	add
 	ldelem.i4
 	stloc 16
-L_10455c8:
-// 0x010455c8: 0x10455c8: addiu a0, zero, 12
+L_10455d8:
+// 0x010455d8: 0x10455d8: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x010455cc: 0x10455cc: addiu s6, s0, 3
+// 0x010455dc: 0x10455dc: addiu s6, s0, 3
 	ldloc 17
 	ldc.i4.3
 	add
 	stloc 13
-// 0x010455d0: 0x10455d0: mult  s6, a0
+// 0x010455e0: 0x10455e0: mult  s6, a0
 	ldloc 13
 	ldloc.1
 	mul
 	stloc 8
-// 0x010455d4: 0x10455d4: addiu v0, s0, 7
+// 0x010455e4: 0x10455e4: addiu v0, s0, 7
 	ldloc 17
 	ldc.i4.7
 	add
 	stloc 5
-// 0x010455d8: 0x10455d8: sw    v0, 116(sp)
+// 0x010455e8: 0x10455e8: sw    v0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -901,7 +901,7 @@ L_10455c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010455dc: 0x10455dc: lw    a2, 116(sp)
+// 0x010455ec: 0x10455ec: lw    a2, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -910,27 +910,27 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010455e0: 0x10455e0: lui   v0, 0x60000
+// 0x010455f0: 0x10455f0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010455e4: 0x10455e4: addiu v0, v0, 13300
+// 0x010455f4: 0x10455f4: addiu v0, v0, 13764
 	ldloc 5
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 5
-// 0x010455e8: 0x10455e8: subu  v1, zero, v1
+// 0x010455f8: 0x10455f8: subu  v1, zero, v1
 	ldloc 7
 	neg
 	stloc 7
-// 0x010455ec: 0x10455ec: mflo  lo
+// 0x010455fc: 0x10455fc: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x010455f0: 0x10455f0: addu  a1, v0, a1
+// 0x01045600: 0x1045600: addu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc.2
-// 0x010455f4: 0x10455f4: lw    a1, 4(a1)
+// 0x01045604: 0x1045604: lw    a1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -939,17 +939,17 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010455f8: 0x10455f8: mult  a2, a0
+// 0x01045608: 0x1045608: mult  a2, a0
 	ldloc.3
 	ldloc.1
 	mul
 	stloc 8
-// 0x010455fc: 0x10455fc: subu  v1, v1, a1
+// 0x0104560c: 0x104560c: subu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	sub
 	stloc 7
-// 0x01045600: 0x1045600: lw    a1, 72(sp)
+// 0x01045610: 0x1045610: lw    a1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -958,13 +958,13 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045604: 0x1045604: sll   zero, zero, 0
-// 0x01045608: 0x1045608: addu  v1, v1, a1
+// 0x01045614: 0x1045614: sll   zero, zero, 0
+// 0x01045618: 0x1045618: addu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-// 0x0104560c: 0x104560c: lw    a1, 112(sp)
+// 0x0104561c: 0x104561c: lw    a1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -973,26 +973,26 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045610: 0x1045610: sll   zero, zero, 0
-// 0x01045614: 0x1045614: addu  v1, v1, a1
+// 0x01045620: 0x1045620: sll   zero, zero, 0
+// 0x01045624: 0x1045624: addu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-// 0x01045618: 0x1045618: subu  v1, v1, s4
+// 0x01045628: 0x1045628: subu  v1, v1, s4
 	ldloc 7
 	ldloc 9
 	sub
 	stloc 7
-// 0x0104561c: 0x104561c: mflo  lo
+// 0x0104562c: 0x104562c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01045620: 0x1045620: addu  v0, v0, a0
+// 0x01045630: 0x1045630: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01045624: 0x1045624: lw    v0, 4(v0)
+// 0x01045634: 0x1045634: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1001,37 +1001,37 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045628: 0x1045628: sll   zero, zero, 0
-// 0x0104562c: 0x104562c: div   v1, v0
+// 0x01045638: 0x1045638: sll   zero, zero, 0
+// 0x0104563c: 0x104563c: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 8
-// 0x01045630: 0x1045630: mflo  lo
+// 0x01045640: 0x1045640: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x01045634: 0x1045634: blez  v0, 0x10456f8 addu  a1, s0, zero
+// 0x01045644: 0x1045644: blez  v0, 0x1045708 addu  a1, s0, zero
 	ldloc 5
 	ldloc 17
 	stloc.2
 	ldc.i4.s 0
-	ble L_10456f8
+	ble L_1045708
 // --- basic block ---
-// 0x0104563c: 0x104563c: addiu v0, v0, 1
+// 0x0104564c: 0x104564c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01045640: 0x1045640: addu  a2, s5, zero
+// 0x01045650: 0x1045650: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x01045644: 0x1045644: addu  a3, s1, zero
+// 0x01045654: 0x1045654: addu  a3, s1, zero
 	ldloc 14
 	stloc 4
-// 0x01045648: 0x1045648: addiu a0, zero, 2
+// 0x01045658: 0x1045658: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0104564c: 0x104564c: sw    v1, 128(sp)
+// 0x0104565c: 0x104565c: sw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1040,7 +1040,7 @@ L_10455c8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045650: 0x1045650: sw    v0, 24(sp)
+// 0x01045660: 0x1045660: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1049,7 +1049,7 @@ L_10455c8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01045654: 0x1045654: sw    s3, 16(sp)
+// 0x01045664: 0x1045664: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1058,7 +1058,7 @@ L_10455c8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045658: 0x1045658: jal   0x1044c6c sw    s2, 20(sp)
+// 0x01045668: 0x1045668: jal   0x1044c7c sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1072,15 +1072,15 @@ L_10455c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::get_image_1044c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::get_image_1044c7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045660: 0x1045660: addu  a0, v0, zero
+// 0x01045670: 0x1045670: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01045664: 0x1045664: jal   0x104e020 sw    v0, 124(sp)
+// 0x01045674: 0x1045674: jal   0x104e030 sw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1090,12 +1090,12 @@ L_10455c8:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104566c: 0x104566c: lw    a0, 44(sp)
+// 0x0104567c: 0x104567c: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1104,7 +1104,7 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045670: 0x1045670: lw    v1, 128(sp)
+// 0x01045680: 0x1045680: lw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1113,7 +1113,7 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045674: 0x1045674: sw    s4, 56(sp)
+// 0x01045684: 0x1045684: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1122,7 +1122,7 @@ L_10455c8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01045678: 0x1045678: sw    a0, 76(sp)
+// 0x01045688: 0x1045688: sw    a0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1131,7 +1131,7 @@ L_10455c8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104567c: 0x104567c: sw    a0, 52(sp)
+// 0x0104568c: 0x104568c: sw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1140,7 +1140,7 @@ L_10455c8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01045680: 0x1045680: lw    a1, 124(sp)
+// 0x01045690: 0x1045690: lw    a1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1149,33 +1149,33 @@ L_10455c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045684: 0x1045684: bgez  s4, 0x10456ac addu  v1, v1, s4
+// 0x01045694: 0x1045694: bgez  s4, 0x10456bc addu  v1, v1, s4
 	ldloc 9
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
 	ldc.i4.s 0
-	bge L_10456ac
+	bge L_10456bc
 // --- basic block ---
-// 0x0104568c: 0x104568c: bltz  v1, 0x10456b8 slt   s8, s8, v1
+// 0x0104569c: 0x104569c: bltz  v1, 0x10456c8 slt   s8, s8, v1
 	ldloc 7
 	ldloc 12
 	ldloc 7
 	clt
 	stloc 12
 	ldc.i4.s 0
-	blt L_10456b8
+	blt L_10456c8
 // --- basic block ---
-// 0x01045694: 0x1045694: beq   s8, zero, 0x10456a4 subu  v0, v1, v0
+// 0x010456a4: 0x10456a4: beq   s8, zero, 0x10456b4 subu  v0, v1, v0
 	ldloc 12
 	ldloc 7
 	ldloc 5
 	sub
 	stloc 5
-	brfalse L_10456a4
+	brfalse L_10456b4
 // --- basic block ---
-// 0x0104569c: 0x104569c: j	 0x10456c4 sw    zero, 80(sp)
+// 0x010456ac: 0x10456ac: j	 0x10456d4 sw    zero, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1184,10 +1184,10 @@ L_10455c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10456c4
+	br L_10456d4
 // --- basic block ---
-L_10456a4:
-// 0x010456a4: 0x10456a4: j	 0x10456c4 sw    v0, 80(sp)
+L_10456b4:
+// 0x010456b4: 0x10456b4: j	 0x10456d4 sw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1196,26 +1196,26 @@ L_10456a4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10456c4
+	br L_10456d4
 // --- basic block ---
-L_10456ac:
-// 0x010456ac: 0x10456ac: slt   s8, s8, s4
+L_10456bc:
+// 0x010456bc: 0x10456bc: slt   s8, s8, s4
 	ldloc 12
 	ldloc 9
 	clt
 	stloc 12
-// 0x010456b0: 0x10456b0: beq   s8, zero, 0x10456c0 sll   zero, zero, 0
+// 0x010456c0: 0x10456c0: beq   s8, zero, 0x10456d0 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_10456c0
+	brfalse L_10456d0
 // --- basic block ---
-L_10456b8:
-// 0x010456b8: 0x10456b8: j	 0x10456a4 addiu v0, zero, -1
+L_10456c8:
+// 0x010456c8: 0x10456c8: j	 0x10456b4 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_10456a4
+	br L_10456b4
 // --- basic block ---
-L_10456c0:
-// 0x010456c0: 0x10456c0: sw    s4, 80(sp)
+L_10456d0:
+// 0x010456d0: 0x10456d0: sw    s4, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1224,8 +1224,8 @@ L_10456c0:
 	add
 	ldloc 9
 	stelem.i4
-L_10456c4:
-// 0x010456c4: 0x10456c4: lw    a0, 80(sp)
+L_10456d4:
+// 0x010456d4: 0x10456d4: lw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1234,28 +1234,28 @@ L_10456c4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010456c8: 0x10456c8: addiu v0, zero, -1
+// 0x010456d8: 0x10456d8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010456cc: 0x10456cc: beq   a0, v0, 0x10456f0 addu  a0, a1, zero
+// 0x010456dc: 0x10456dc: beq   a0, v0, 0x1045700 addu  a0, a1, zero
 	ldloc.1
 	ldloc 5
 	ldloc.2
 	stloc.1
-	beq  L_10456f0
+	beq  L_1045700
 // --- basic block ---
-// 0x010456d4: 0x10456d4: addu  a2, zero, zero
+// 0x010456e4: 0x10456e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010456d8: 0x10456d8: addiu a1, sp, 76
+// 0x010456e8: 0x10456e8: addiu a1, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.2
-// 0x010456dc: 0x10456dc: addu  a3, zero, zero
+// 0x010456ec: 0x10456ec: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010456e0: 0x10456e0: jal   0x104f4a8 sw    v1, 128(sp)
+// 0x010456f0: 0x10456f0: jal   0x104f4b8 sw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1269,12 +1269,12 @@ L_10456c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010456e8: 0x10456e8: lw    v1, 128(sp)
+// 0x010456f8: 0x10456f8: lw    v1, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1283,14 +1283,14 @@ L_10456c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010456ec: 0x10456ec: sll   zero, zero, 0
-L_10456f0:
-// 0x010456f0: 0x10456f0: addiu v1, v1, -1
+// 0x010456fc: 0x10456fc: sll   zero, zero, 0
+L_1045700:
+// 0x01045700: 0x1045700: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x010456f4: 0x10456f4: sw    v1, 56(sp)
+// 0x01045704: 0x1045704: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1299,32 +1299,32 @@ L_10456f0:
 	add
 	ldloc 7
 	stelem.i4
-L_10456f8:
-// 0x010456f8: 0x10456f8: addiu v0, s0, 6
+L_1045708:
+// 0x01045708: 0x1045708: addiu v0, s0, 6
 	ldloc 17
 	ldc.i4.6
 	add
 	stloc 5
-// 0x010456fc: 0x10456fc: addiu s8, zero, 12
+// 0x0104570c: 0x104570c: addiu s8, zero, 12
 	ldc.i4.s 12
 	stloc 12
-// 0x01045700: 0x1045700: mult  v0, s8
+// 0x01045710: 0x1045710: mult  v0, s8
 	ldloc 5
 	ldloc 12
 	mul
 	stloc 8
-// 0x01045704: 0x1045704: lui   s4, 0x60000
+// 0x01045714: 0x1045714: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01045708: 0x1045708: addiu s4, s4, 13300
+// 0x01045718: 0x1045718: addiu s4, s4, 13764
 	ldloc 9
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 9
-// 0x0104570c: 0x104570c: addu  a2, s5, zero
+// 0x0104571c: 0x104571c: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x01045710: 0x1045710: sw    s3, 16(sp)
+// 0x01045720: 0x1045720: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1333,7 +1333,7 @@ L_10456f8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045714: 0x1045714: sw    s2, 20(sp)
+// 0x01045724: 0x1045724: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1342,7 +1342,7 @@ L_10456f8:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01045718: 0x1045718: sw    zero, 24(sp)
+// 0x01045728: 0x1045728: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1351,7 +1351,7 @@ L_10456f8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104571c: 0x104571c: sw    v0, 112(sp)
+// 0x0104572c: 0x104572c: sw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1360,7 +1360,7 @@ L_10456f8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01045720: 0x1045720: lw    v0, 56(sp)
+// 0x01045730: 0x1045730: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1369,29 +1369,29 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045724: 0x1045724: addiu a0, zero, 1
+// 0x01045734: 0x1045734: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01045728: 0x1045728: addu  a1, s0, zero
+// 0x01045738: 0x1045738: addu  a1, s0, zero
 	ldloc 17
 	stloc.2
-// 0x0104572c: 0x104572c: addu  a3, s1, zero
+// 0x0104573c: 0x104573c: addu  a3, s1, zero
 	ldloc 14
 	stloc 4
-// 0x01045730: 0x1045730: addiu s3, sp, 44
+// 0x01045740: 0x1045740: addiu s3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 10
-// 0x01045734: 0x1045734: mflo  lo
+// 0x01045744: 0x1045744: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01045738: 0x1045738: addu  s5, s4, v1
+// 0x01045748: 0x1045748: addu  s5, s4, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 11
-// 0x0104573c: 0x104573c: lw    v1, 4(s5)
+// 0x0104574c: 0x104574c: lw    v1, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1400,13 +1400,13 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045740: 0x1045740: sll   zero, zero, 0
-// 0x01045744: 0x1045744: addu  v0, v1, v0
+// 0x01045750: 0x1045750: sll   zero, zero, 0
+// 0x01045754: 0x1045754: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01045748: 0x1045748: jal   0x1044c6c sw    v0, 48(sp)
+// 0x01045758: 0x1045758: jal   0x1044c7c sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1420,21 +1420,21 @@ L_10456f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::get_image_1044c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::get_image_1044c7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045750: 0x1045750: addu  a0, v0, zero
+// 0x01045760: 0x1045760: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01045754: 0x1045754: addu  a1, s3, zero
+// 0x01045764: 0x1045764: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x01045758: 0x1045758: addu  a2, zero, zero
+// 0x01045768: 0x1045768: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104575c: 0x104575c: jal   0x104f4a8 addu  a3, zero, zero
+// 0x0104576c: 0x104576c: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1442,29 +1442,29 @@ L_10456f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045764: 0x1045764: addiu v0, zero, -1
+// 0x01045774: 0x1045774: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01045768: 0x1045768: beq   s1, v0, 0x1045afc addiu v0, s0, 5
+// 0x01045778: 0x1045778: beq   s1, v0, 0x1045b0c addiu v0, s0, 5
 	ldloc 14
 	ldloc 5
 	ldloc 17
 	ldc.i4.5
 	add
 	stloc 5
-	beq  L_1045afc
+	beq  L_1045b0c
 // --- basic block ---
-// 0x01045770: 0x1045770: mult  v0, s8
+// 0x01045780: 0x1045780: mult  v0, s8
 	ldloc 5
 	ldloc 12
 	mul
 	stloc 8
-// 0x01045774: 0x1045774: lw    a2, 4(s5)
+// 0x01045784: 0x1045784: lw    a2, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1473,7 +1473,7 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01045778: 0x1045778: lw    a0, 56(sp)
+// 0x01045788: 0x1045788: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1482,15 +1482,15 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104577c: 0x104577c: addu  a1, s3, zero
+// 0x0104578c: 0x104578c: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x01045780: 0x1045780: addu  a0, a2, a0
+// 0x01045790: 0x1045790: addu  a0, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x01045784: 0x1045784: sw    a0, 48(sp)
+// 0x01045794: 0x1045794: sw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1499,13 +1499,13 @@ L_10456f8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01045788: 0x1045788: addu  a2, zero, zero
+// 0x01045798: 0x1045798: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104578c: 0x104578c: addu  a3, zero, zero
+// 0x0104579c: 0x104579c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01045790: 0x1045790: sw    v0, 124(sp)
+// 0x010457a0: 0x10457a0: sw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1514,22 +1514,22 @@ L_10456f8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01045794: 0x1045794: mflo  lo
+// 0x010457a4: 0x10457a4: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01045798: 0x1045798: addu  v1, v1, s4
+// 0x010457a8: 0x10457a8: addu  v1, v1, s4
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-// 0x0104579c: 0x104579c: lw    a0, 0(v1)
+// 0x010457ac: 0x10457ac: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010457a0: 0x10457a0: jal   0x104f4a8 addiu s5, zero, 1
+// 0x010457b0: 0x10457b0: jal   0x104f4b8 addiu s5, zero, 1
 	ldc.i4.1
 	stloc 11
 	ldloc.0
@@ -1537,12 +1537,12 @@ L_10456f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010457a8: 0x10457a8: lw    a0, 116(sp)
+// 0x010457b8: 0x10457b8: lw    a0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1551,39 +1551,39 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010457ac: 0x10457ac: addiu a1, sp, 36
+// 0x010457bc: 0x10457bc: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x010457b0: 0x10457b0: mult  a0, s8
+// 0x010457c0: 0x10457c0: mult  a0, s8
 	ldloc.1
 	ldloc 12
 	mul
 	stloc 8
-// 0x010457b4: 0x10457b4: addiu a0, s0, 4
+// 0x010457c4: 0x10457c4: addiu a0, s0, 4
 	ldloc 17
 	ldc.i4.4
 	add
 	stloc.1
-// 0x010457b8: 0x10457b8: addu  a2, zero, zero
+// 0x010457c8: 0x10457c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010457bc: 0x10457bc: mflo  lo
+// 0x010457cc: 0x10457cc: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x010457c0: 0x10457c0: addu  v1, s4, v1
+// 0x010457d0: 0x10457d0: addu  v1, s4, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x010457c4: 0x10457c4: sll   zero, zero, 0
-// 0x010457c8: 0x10457c8: mult  a0, s8
+// 0x010457d4: 0x10457d4: sll   zero, zero, 0
+// 0x010457d8: 0x10457d8: mult  a0, s8
 	ldloc.1
 	ldloc 12
 	mul
 	stloc 8
-// 0x010457cc: 0x10457cc: lw    a0, 4(v1)
+// 0x010457dc: 0x10457dc: lw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1592,7 +1592,7 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010457d0: 0x10457d0: lw    v1, 56(sp)
+// 0x010457e0: 0x10457e0: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1601,13 +1601,13 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010457d4: 0x10457d4: sll   zero, zero, 0
-// 0x010457d8: 0x10457d8: addu  v1, a0, v1
+// 0x010457e4: 0x10457e4: sll   zero, zero, 0
+// 0x010457e8: 0x10457e8: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x010457dc: 0x10457dc: sw    v1, 40(sp)
+// 0x010457ec: 0x10457ec: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1616,22 +1616,22 @@ L_10456f8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010457e0: 0x10457e0: mflo  lo
+// 0x010457f0: 0x10457f0: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x010457e4: 0x10457e4: addu  v1, a0, s4
+// 0x010457f4: 0x10457f4: addu  v1, a0, s4
 	ldloc.1
 	ldloc 9
 	add
 	stloc 7
-// 0x010457e8: 0x10457e8: lw    a0, 0(v1)
+// 0x010457f8: 0x10457f8: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010457ec: 0x10457ec: jal   0x104f4a8 addu  a3, zero, zero
+// 0x010457fc: 0x10457fc: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1639,15 +1639,15 @@ L_10456f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010457f4: 0x10457f4: addiu v1, zero, 19
+// 0x01045804: 0x1045804: addiu v1, zero, 19
 	ldc.i4.s 19
 	stloc 7
-// 0x010457f8: 0x10457f8: lw    v0, 124(sp)
+// 0x01045808: 0x1045808: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1656,23 +1656,23 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010457fc: 0x10457fc: beq   s1, v1, 0x10458a8 addiu v1, zero, 20
+// 0x0104580c: 0x104580c: beq   s1, v1, 0x10458b8 addiu v1, zero, 20
 	ldloc 14
 	ldloc 7
 	ldc.i4.s 20
 	stloc 7
-	beq  L_10458a8
+	beq  L_10458b8
 // --- basic block ---
-// 0x01045804: 0x1045804: bne   s1, v1, 0x104584c mult  s6, s8
+// 0x01045814: 0x1045814: bne   s1, v1, 0x104585c mult  s6, s8
 	ldloc 14
 	ldloc 7
 	ldloc 13
 	ldloc 12
 	mul
 	stloc 8
-	bne.un L_104584c
+	bne.un L_104585c
 // --- basic block ---
-// 0x0104580c: 0x104580c: lw    s5, 36(sp)
+// 0x0104581c: 0x104581c: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1681,7 +1681,7 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01045810: 0x1045810: lw    a0, 44(sp)
+// 0x01045820: 0x1045820: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1690,23 +1690,23 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045814: 0x1045814: addiu v1, zero, 4
+// 0x01045824: 0x1045824: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 7
-// 0x01045818: 0x1045818: subu  a0, s5, a0
+// 0x01045828: 0x1045828: subu  a0, s5, a0
 	ldloc 11
 	ldloc.1
 	sub
 	stloc.1
-// 0x0104581c: 0x104581c: mflo  lo
+// 0x0104582c: 0x104582c: mflo  lo
 	ldloc 8
 	stloc 12
-// 0x01045820: 0x1045820: addu  s4, s8, s4
+// 0x01045830: 0x1045830: addu  s4, s8, s4
 	ldloc 12
 	ldloc 9
 	add
 	stloc 9
-// 0x01045824: 0x1045824: lw    a1, 8(s4)
+// 0x01045834: 0x1045834: lw    a1, 8(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1715,34 +1715,34 @@ L_10456f8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045828: 0x1045828: sll   zero, zero, 0
-// 0x0104582c: 0x104582c: div   a0, a1
+// 0x01045838: 0x1045838: sll   zero, zero, 0
+// 0x0104583c: 0x104583c: div   a0, a1
 	ldloc.1
 	ldloc.2
 	div
 	stloc 8
-// 0x01045830: 0x1045830: mflo  lo
+// 0x01045840: 0x1045840: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01045834: 0x1045834: sll   zero, zero, 0
-// 0x01045838: 0x1045838: sll   zero, zero, 0
-// 0x0104583c: 0x104583c: div   a0, v1
+// 0x01045844: 0x1045844: sll   zero, zero, 0
+// 0x01045848: 0x1045848: sll   zero, zero, 0
+// 0x0104584c: 0x104584c: div   a0, v1
 	ldloc.1
 	ldloc 7
 	div
 	stloc 8
-// 0x01045840: 0x1045840: mflo  lo
+// 0x01045850: 0x1045850: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01045844: 0x1045844: j	 0x10458a8 addiu s5, a1, -2
+// 0x01045854: 0x1045854: j	 0x10458b8 addiu s5, a1, -2
 	ldloc.2
 	ldc.i4.s -2
 	add
 	stloc 11
-	br L_10458a8
+	br L_10458b8
 // --- basic block ---
-L_104584c:
-// 0x0104584c: 0x104584c: lw    a3, 44(sp)
+L_104585c:
+// 0x0104585c: 0x104585c: lw    a3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1751,7 +1751,7 @@ L_104584c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01045850: 0x1045850: lw    v1, 36(sp)
+// 0x01045860: 0x1045860: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1760,26 +1760,26 @@ L_104584c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045854: 0x1045854: mflo  lo
+// 0x01045864: 0x1045864: mflo  lo
 	ldloc 8
 	stloc 12
-// 0x01045858: 0x1045858: bne   s1, zero, 0x1045880 addiu a1, zero, 2
+// 0x01045868: 0x1045868: bne   s1, zero, 0x1045890 addiu a1, zero, 2
 	ldloc 14
 	ldc.i4.2
 	stloc.2
-	brtrue L_1045880
+	brtrue L_1045890
 // --- basic block ---
-// 0x01045860: 0x1045860: addu  s8, s4, s8
+// 0x01045870: 0x1045870: addu  s8, s4, s8
 	ldloc 9
 	ldloc 12
 	add
 	stloc 12
-// 0x01045864: 0x1045864: addiu v1, v1, -100
+// 0x01045874: 0x1045874: addiu v1, v1, -100
 	ldloc 7
 	ldc.i4.s -100
 	add
 	stloc 7
-// 0x01045868: 0x1045868: lw    a2, 8(s8)
+// 0x01045878: 0x1045878: lw    a2, 8(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1788,31 +1788,31 @@ L_104584c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104586c: 0x104586c: subu  a0, v1, a3
+// 0x0104587c: 0x104587c: subu  a0, v1, a3
 	ldloc 7
 	ldloc 4
 	sub
 	stloc.1
-// 0x01045870: 0x1045870: div   a0, a2
+// 0x01045880: 0x1045880: div   a0, a2
 	ldloc.1
 	ldloc.3
 	div
 	stloc 8
-// 0x01045874: 0x1045874: mflo  lo
+// 0x01045884: 0x1045884: mflo  lo
 	ldloc 8
 	stloc 11
-// 0x01045878: 0x1045878: j	 0x10458ac addiu s4, zero, 12
+// 0x01045888: 0x1045888: j	 0x10458bc addiu s4, zero, 12
 	ldc.i4.s 12
 	stloc 9
-	br L_10458ac
+	br L_10458bc
 // --- basic block ---
-L_1045880:
-// 0x01045880: 0x1045880: addu  s8, s4, s8
+L_1045890:
+// 0x01045890: 0x1045890: addu  s8, s4, s8
 	ldloc 9
 	ldloc 12
 	add
 	stloc 12
-// 0x01045884: 0x1045884: lw    a2, 8(s8)
+// 0x01045894: 0x1045894: lw    a2, 8(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1821,81 +1821,81 @@ L_1045880:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01045888: 0x1045888: subu  v1, v1, a3
+// 0x01045898: 0x1045898: subu  v1, v1, a3
 	ldloc 7
 	ldloc 4
 	sub
 	stloc 7
-// 0x0104588c: 0x104588c: div   v1, a2
+// 0x0104589c: 0x104589c: div   v1, a2
 	ldloc 7
 	ldloc.3
 	div
 	stloc 8
-// 0x01045890: 0x1045890: mflo  lo
+// 0x010458a0: 0x10458a0: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01045894: 0x1045894: sll   zero, zero, 0
-// 0x01045898: 0x1045898: sll   zero, zero, 0
-// 0x0104589c: 0x104589c: div   v1, a1
+// 0x010458a4: 0x10458a4: sll   zero, zero, 0
+// 0x010458a8: 0x10458a8: sll   zero, zero, 0
+// 0x010458ac: 0x10458ac: div   v1, a1
 	ldloc 7
 	ldloc.2
 	div
 	stloc 8
-// 0x010458a0: 0x10458a0: mflo  lo
+// 0x010458b0: 0x10458b0: mflo  lo
 	ldloc 8
 	stloc 11
-// 0x010458a4: 0x10458a4: addiu s5, s5, -2
+// 0x010458b4: 0x10458b4: addiu s5, s5, -2
 	ldloc 11
 	ldc.i4.s -2
 	add
 	stloc 11
-L_10458a8:
-// 0x010458a8: 0x10458a8: addiu s4, zero, 12
+L_10458b8:
+// 0x010458b8: 0x10458b8: addiu s4, zero, 12
 	ldc.i4.s 12
 	stloc 9
-L_10458ac:
-// 0x010458ac: 0x10458ac: mult  v0, s4
+L_10458bc:
+// 0x010458bc: 0x10458bc: mult  v0, s4
 	ldloc 5
 	ldloc 9
 	mul
 	stloc 8
-// 0x010458b0: 0x10458b0: lui   v1, 0x60000
+// 0x010458c0: 0x10458c0: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x010458b4: 0x10458b4: addiu v1, v1, 13300
+// 0x010458c4: 0x10458c4: addiu v1, v1, 13764
 	ldloc 7
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 7
-// 0x010458b8: 0x10458b8: addu  s3, zero, zero
+// 0x010458c8: 0x10458c8: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010458bc: 0x10458bc: mflo  lo
+// 0x010458cc: 0x10458cc: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010458c0: 0x10458c0: addu  s8, v0, v1
+// 0x010458d0: 0x10458d0: addu  s8, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 12
-// 0x010458c4: 0x10458c4: sll   zero, zero, 0
-// 0x010458c8: 0x10458c8: mult  s6, s4
+// 0x010458d4: 0x10458d4: sll   zero, zero, 0
+// 0x010458d8: 0x10458d8: mult  s6, s4
 	ldloc 13
 	ldloc 9
 	mul
 	stloc 8
-// 0x010458cc: 0x10458cc: mflo  lo
+// 0x010458dc: 0x10458dc: mflo  lo
 	ldloc 8
 	stloc 9
-// 0x010458d0: 0x10458d0: j	 0x104590c addu  s4, s4, v1
+// 0x010458e0: 0x10458e0: j	 0x104591c addu  s4, s4, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 9
-	br L_104590c
+	br L_104591c
 // --- basic block ---
-L_10458d8:
-// 0x010458d8: 0x10458d8: lw    v0, 8(s4)
+L_10458e8:
+// 0x010458e8: 0x10458e8: lw    v0, 8(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1904,7 +1904,7 @@ L_10458d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010458dc: 0x10458dc: lw    v1, 8(s8)
+// 0x010458ec: 0x10458ec: lw    v1, 8(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1913,12 +1913,12 @@ L_10458d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010458e0: 0x10458e0: mult  s3, v0
+// 0x010458f0: 0x10458f0: mult  s3, v0
 	ldloc 10
 	ldloc 5
 	mul
 	stloc 8
-// 0x010458e4: 0x10458e4: lw    v0, 44(sp)
+// 0x010458f4: 0x10458f4: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1927,19 +1927,19 @@ L_10458d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010458e8: 0x10458e8: lw    a0, 0(s4)
+// 0x010458f8: 0x10458f8: lw    a0, 0(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010458ec: 0x10458ec: addu  v0, v1, v0
+// 0x010458fc: 0x10458fc: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010458f0: 0x10458f0: lw    v1, 48(sp)
+// 0x01045900: 0x1045900: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1948,12 +1948,12 @@ L_10458d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010458f4: 0x10458f4: addiu s3, s3, 1
+// 0x01045904: 0x1045904: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x010458f8: 0x10458f8: sw    v1, 56(sp)
+// 0x01045908: 0x1045908: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1962,15 +1962,15 @@ L_10458d8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010458fc: 0x10458fc: mflo  lo
+// 0x0104590c: 0x104590c: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01045900: 0x1045900: addu  v0, v0, v1
+// 0x01045910: 0x1045910: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01045904: 0x1045904: jal   0x104f4a8 sw    v0, 52(sp)
+// 0x01045914: 0x1045914: jal   0x104f4b8 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1984,38 +1984,38 @@ L_10458d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104590c:
-// 0x0104590c: 0x104590c: slt   v0, s3, s5
+L_104591c:
+// 0x0104591c: 0x104591c: slt   v0, s3, s5
 	ldloc 10
 	ldloc 11
 	clt
 	stloc 5
-// 0x01045910: 0x1045910: addiu a1, sp, 52
+// 0x01045920: 0x1045920: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x01045914: 0x1045914: addu  a2, zero, zero
+// 0x01045924: 0x1045924: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01045918: 0x1045918: bne   v0, zero, 0x10458d8 addu  a3, zero, zero
+// 0x01045928: 0x1045928: bne   v0, zero, 0x10458e8 addu  a3, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_10458d8
+	brtrue L_10458e8
 // --- basic block ---
-// 0x01045920: 0x1045920: bne   s1, zero, 0x1045a48 lui   a2, 0xe0000
+// 0x01045930: 0x1045930: bne   s1, zero, 0x1045a58 lui   a2, 0xe0000
 	ldloc 14
 	ldc.i4 917504
 	stloc.3
-	brtrue L_1045a48
+	brtrue L_1045a58
 // --- basic block ---
-// 0x01045928: 0x1045928: lw    a0, 200(sp)
+// 0x01045938: 0x1045938: lw    a0, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2024,19 +2024,19 @@ L_104590c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104592c: 0x104592c: addiu a2, a2, 29604
+// 0x0104593c: 0x104593c: addiu a2, a2, 30068
 	ldloc.3
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.3
-// 0x01045930: 0x1045930: lw    a3, 0(a0)
+// 0x01045940: 0x1045940: lw    a3, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01045934: 0x1045934: lw    v0, 56(a2)
+// 0x01045944: 0x1045944: lw    v0, 56(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2045,17 +2045,17 @@ L_104590c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045938: 0x1045938: sll   zero, zero, 0
-// 0x0104593c: 0x104593c: slt   v0, v0, a3
+// 0x01045948: 0x1045948: sll   zero, zero, 0
+// 0x0104594c: 0x104594c: slt   v0, v0, a3
 	ldloc 5
 	ldloc 4
 	clt
 	stloc 5
-// 0x01045940: 0x1045940: bne   v0, zero, 0x1045a3c sll   zero, zero, 0
+// 0x01045950: 0x1045950: bne   v0, zero, 0x1045a4c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1045a3c
+	brtrue L_1045a4c
 // --- basic block ---
-// 0x01045948: 0x1045948: lw    v0, 64(a2)
+// 0x01045958: 0x1045958: lw    v0, 64(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2064,17 +2064,17 @@ L_104590c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104594c: 0x104594c: sll   zero, zero, 0
-// 0x01045950: 0x1045950: slt   v0, a3, v0
+// 0x0104595c: 0x104595c: sll   zero, zero, 0
+// 0x01045960: 0x1045960: slt   v0, a3, v0
 	ldloc 4
 	ldloc 5
 	clt
 	stloc 5
-// 0x01045954: 0x1045954: bne   v0, zero, 0x1045a3c sll   zero, zero, 0
+// 0x01045964: 0x1045964: bne   v0, zero, 0x1045a4c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1045a3c
+	brtrue L_1045a4c
 // --- basic block ---
-// 0x0104595c: 0x104595c: lw    v1, 4(a0)
+// 0x0104596c: 0x104596c: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2083,7 +2083,7 @@ L_104590c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045960: 0x1045960: lw    v0, 60(a2)
+// 0x01045970: 0x1045970: lw    v0, 60(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2092,17 +2092,17 @@ L_104590c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045964: 0x1045964: sll   zero, zero, 0
-// 0x01045968: 0x1045968: slt   v0, v0, v1
+// 0x01045974: 0x1045974: sll   zero, zero, 0
+// 0x01045978: 0x1045978: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x0104596c: 0x104596c: bne   v0, zero, 0x1045a3c sll   zero, zero, 0
+// 0x0104597c: 0x104597c: bne   v0, zero, 0x1045a4c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1045a3c
+	brtrue L_1045a4c
 // --- basic block ---
-// 0x01045974: 0x1045974: lw    v0, 68(a2)
+// 0x01045984: 0x1045984: lw    v0, 68(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2111,30 +2111,30 @@ L_104590c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045978: 0x1045978: sll   zero, zero, 0
-// 0x0104597c: 0x104597c: slt   v0, v1, v0
+// 0x01045988: 0x1045988: sll   zero, zero, 0
+// 0x0104598c: 0x104598c: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01045980: 0x1045980: bne   v0, zero, 0x1045a3c sll   zero, zero, 0
+// 0x01045990: 0x1045990: bne   v0, zero, 0x1045a4c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1045a3c
+	brtrue L_1045a4c
 // --- basic block ---
-// 0x01045988: 0x1045988: j	 0x1045c54 addiu s5, sp, 84
+// 0x01045998: 0x1045998: j	 0x1045c64 addiu s5, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc 11
-	br L_1045c54
+	br L_1045c64
 // --- basic block ---
-L_1045990:
-// 0x01045990: 0x1045990: addiu s4, s4, 13300
+L_10459a0:
+// 0x010459a0: 0x10459a0: addiu s4, s4, 13764
 	ldloc 9
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 9
-// 0x01045994: 0x1045994: lw    a0, 256(s4)
+// 0x010459a4: 0x10459a4: lw    a0, 256(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2143,7 +2143,7 @@ L_1045990:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045998: 0x1045998: lw    v1, 52(sp)
+// 0x010459a8: 0x10459a8: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2152,33 +2152,33 @@ L_1045990:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104599c: 0x104599c: addu  v0, v0, a0
+// 0x010459ac: 0x10459ac: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x010459a0: 0x10459a0: lui   a0, 0x10000
+// 0x010459b0: 0x10459b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010459a4: 0x10459a4: addiu a2, v1, 42
+// 0x010459b4: 0x10459b4: addiu a2, v1, 42
 	ldloc 7
 	ldc.i4.s 42
 	add
 	stloc.3
-// 0x010459a8: 0x10459a8: addu  a1, zero, zero
+// 0x010459b8: 0x10459b8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010459ac: 0x10459ac: addiu v0, v0, -3
+// 0x010459bc: 0x10459bc: addiu v0, v0, -3
 	ldloc 5
 	ldc.i4.s -3
 	add
 	stloc 5
-// 0x010459b0: 0x10459b0: addiu a0, a0, -1764
+// 0x010459c0: 0x10459c0: addiu a0, a0, -1768
 	ldloc.1
-	ldc.i4 -1764
+	ldc.i4 -1768
 	add
 	stloc.1
-// 0x010459b4: 0x10459b4: sw    v1, 92(sp)
+// 0x010459c4: 0x10459c4: sw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2187,7 +2187,7 @@ L_1045990:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010459b8: 0x10459b8: sw    a2, 100(sp)
+// 0x010459c8: 0x10459c8: sw    a2, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2196,7 +2196,7 @@ L_1045990:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010459bc: 0x10459bc: sw    v0, 104(sp)
+// 0x010459cc: 0x10459cc: sw    v0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2205,7 +2205,7 @@ L_1045990:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010459c0: 0x10459c0: jal   0x104ef00 sw    v0, 96(sp)
+// 0x010459d0: 0x10459d0: jal   0x104ef10 sw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2219,15 +2219,15 @@ L_1045990:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010459c8: 0x10459c8: lui   a0, 0x0
+// 0x010459d8: 0x10459d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010459cc: 0x10459cc: jal   0x104edb0 addiu a0, a0, 31980
+// 0x010459dc: 0x10459dc: jal   0x104edc0 addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
@@ -2237,12 +2237,12 @@ L_1045990:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010459d4: 0x10459d4: jal   0x104e410 addiu a0, zero, 188
+// 0x010459e4: 0x10459e4: jal   0x104e420 addiu a0, zero, 188
 	ldc.i4 188
 	stloc.1
 	ldloc.0
@@ -2250,26 +2250,26 @@ L_1045990:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010459dc: 0x10459dc: addu  a2, s5, zero
+// 0x010459ec: 0x10459ec: addu  a2, s5, zero
 	ldloc 11
 	stloc.3
-// 0x010459e0: 0x10459e0: addiu a0, zero, 1
+// 0x010459f0: 0x10459f0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010459e4: 0x10459e4: addiu a1, sp, 32
+// 0x010459f4: 0x10459f4: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x010459e8: 0x10459e8: addiu a3, zero, 1
+// 0x010459f8: 0x10459f8: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x010459ec: 0x10459ec: sw    s3, 32(sp)
+// 0x010459fc: 0x10459fc: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2278,7 +2278,7 @@ L_1045990:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010459f0: 0x10459f0: jal   0x104ef80 sw    zero, 16(sp)
+// 0x01045a00: 0x1045a00: jal   0x104ef90 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2292,12 +2292,12 @@ L_1045990:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010459f8: 0x10459f8: jal   0x104e410 addiu a0, zero, 255
+// 0x01045a08: 0x1045a08: jal   0x104e420 addiu a0, zero, 255
 	ldc.i4 255
 	stloc.1
 	ldloc.0
@@ -2305,24 +2305,24 @@ L_1045990:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045a00: 0x1045a00: addu  s3, zero, zero
+// 0x01045a10: 0x1045a10: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01045a04: 0x1045a04: addiu s8, sp, 52
+// 0x01045a14: 0x1045a14: addiu s8, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 12
-// 0x01045a08: 0x1045a08: addiu s5, zero, 40
+// 0x01045a18: 0x1045a18: addiu s5, zero, 40
 	ldc.i4.s 40
 	stloc 11
-L_1045a0c:
-// 0x01045a0c: 0x1045a0c: lw    v0, 260(s4)
+L_1045a1c:
+// 0x01045a1c: 0x1045a1c: lw    v0, 260(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2331,7 +2331,7 @@ L_1045a0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045a10: 0x1045a10: lw    v1, 52(sp)
+// 0x01045a20: 0x1045a20: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2340,7 +2340,7 @@ L_1045a0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045a14: 0x1045a14: lw    a0, 252(s4)
+// 0x01045a24: 0x1045a24: lw    a0, 252(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2349,26 +2349,26 @@ L_1045a0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045a18: 0x1045a18: addu  v0, v1, v0
+// 0x01045a28: 0x1045a28: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01045a1c: 0x1045a1c: addiu s3, s3, 1
+// 0x01045a2c: 0x1045a2c: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01045a20: 0x1045a20: addu  a1, s8, zero
+// 0x01045a30: 0x1045a30: addu  a1, s8, zero
 	ldloc 12
 	stloc.2
-// 0x01045a24: 0x1045a24: addu  a2, zero, zero
+// 0x01045a34: 0x1045a34: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01045a28: 0x1045a28: addu  a3, zero, zero
+// 0x01045a38: 0x1045a38: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01045a2c: 0x1045a2c: jal   0x104f4a8 sw    v0, 52(sp)
+// 0x01045a3c: 0x1045a3c: jal   0x104f4b8 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2382,18 +2382,18 @@ L_1045a0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045a34: 0x1045a34: bne   s3, s5, 0x1045a0c sll   zero, zero, 0
+// 0x01045a44: 0x1045a44: bne   s3, s5, 0x1045a1c sll   zero, zero, 0
 	ldloc 10
 	ldloc 11
-	bne.un L_1045a0c
+	bne.un L_1045a1c
 // --- basic block ---
-L_1045a3c:
-// 0x01045a3c: 0x1045a3c: lw    s4, 52(sp)
+L_1045a4c:
+// 0x01045a4c: 0x1045a4c: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2402,54 +2402,54 @@ L_1045a3c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01045a40: 0x1045a40: j	 0x1045a84 addiu s4, s4, 1
+// 0x01045a50: 0x1045a50: j	 0x1045a94 addiu s4, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_1045a84
+	br L_1045a94
 // --- basic block ---
-L_1045a48:
-// 0x01045a48: 0x1045a48: addiu s3, zero, 12
+L_1045a58:
+// 0x01045a58: 0x1045a58: addiu s3, zero, 12
 	ldc.i4.s 12
 	stloc 10
-// 0x01045a4c: 0x1045a4c: mult  s1, s3
+// 0x01045a5c: 0x1045a5c: mult  s1, s3
 	ldloc 14
 	ldloc 10
 	mul
 	stloc 8
-// 0x01045a50: 0x1045a50: lui   v0, 0x60000
+// 0x01045a60: 0x1045a60: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01045a54: 0x1045a54: addiu v0, v0, 13300
+// 0x01045a64: 0x1045a64: addiu v0, v0, 13764
 	ldloc 5
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 5
-// 0x01045a58: 0x1045a58: addiu a1, sp, 52
+// 0x01045a68: 0x1045a68: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x01045a5c: 0x1045a5c: addu  a2, zero, zero
+// 0x01045a6c: 0x1045a6c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01045a60: 0x1045a60: mflo  lo
+// 0x01045a70: 0x1045a70: mflo  lo
 	ldloc 8
 	stloc 10
-// 0x01045a64: 0x1045a64: addu  s3, s3, v0
+// 0x01045a74: 0x1045a74: addu  s3, s3, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x01045a68: 0x1045a68: lw    a0, 0(s3)
+// 0x01045a78: 0x1045a78: lw    a0, 0(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01045a6c: 0x1045a6c: jal   0x104f4a8 addu  a3, zero, zero
+// 0x01045a7c: 0x1045a7c: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2457,12 +2457,12 @@ L_1045a48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045a74: 0x1045a74: lw    s4, 8(s3)
+// 0x01045a84: 0x1045a84: lw    s4, 8(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2471,7 +2471,7 @@ L_1045a48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01045a78: 0x1045a78: lw    v0, 52(sp)
+// 0x01045a88: 0x1045a88: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2480,30 +2480,30 @@ L_1045a48:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045a7c: 0x1045a7c: sll   zero, zero, 0
-// 0x01045a80: 0x1045a80: addu  s4, s4, v0
+// 0x01045a8c: 0x1045a8c: sll   zero, zero, 0
+// 0x01045a90: 0x1045a90: addu  s4, s4, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-L_1045a84:
-// 0x01045a84: 0x1045a84: addiu v0, zero, 12
+L_1045a94:
+// 0x01045a94: 0x1045a94: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x01045a88: 0x1045a88: mult  s6, v0
+// 0x01045a98: 0x1045a98: mult  s6, v0
 	ldloc 13
 	ldloc 5
 	mul
 	stloc 8
-// 0x01045a8c: 0x1045a8c: lui   v0, 0x60000
+// 0x01045a9c: 0x1045a9c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01045a90: 0x1045a90: addiu v0, v0, 13300
+// 0x01045aa0: 0x1045aa0: addiu v0, v0, 13764
 	ldloc 5
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 5
-// 0x01045a94: 0x1045a94: lw    s5, 36(sp)
+// 0x01045aa4: 0x1045aa4: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2512,23 +2512,23 @@ L_1045a84:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01045a98: 0x1045a98: addu  s3, zero, zero
+// 0x01045aa8: 0x1045aa8: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01045a9c: 0x1045a9c: subu  s5, s5, s4
+// 0x01045aac: 0x1045aac: subu  s5, s5, s4
 	ldloc 11
 	ldloc 9
 	sub
 	stloc 11
-// 0x01045aa0: 0x1045aa0: mflo  lo
+// 0x01045ab0: 0x1045ab0: mflo  lo
 	ldloc 8
 	stloc 13
-// 0x01045aa4: 0x1045aa4: addu  s6, s6, v0
+// 0x01045ab4: 0x1045ab4: addu  s6, s6, v0
 	ldloc 13
 	ldloc 5
 	add
 	stloc 13
-// 0x01045aa8: 0x1045aa8: lw    v1, 8(s6)
+// 0x01045ab8: 0x1045ab8: lw    v1, 8(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2537,24 +2537,24 @@ L_1045a84:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045aac: 0x1045aac: sll   zero, zero, 0
-// 0x01045ab0: 0x1045ab0: div   s5, v1
+// 0x01045abc: 0x1045abc: sll   zero, zero, 0
+// 0x01045ac0: 0x1045ac0: div   s5, v1
 	ldloc 11
 	ldloc 7
 	div
 	stloc 8
-// 0x01045ab4: 0x1045ab4: mflo  lo
+// 0x01045ac4: 0x1045ac4: mflo  lo
 	ldloc 8
 	stloc 11
-// 0x01045ab8: 0x1045ab8: j	 0x1045ae8 addiu s8, sp, 60
+// 0x01045ac8: 0x1045ac8: j	 0x1045af8 addiu s8, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 12
-	br L_1045ae8
+	br L_1045af8
 // --- basic block ---
-L_1045ac0:
-// 0x01045ac0: 0x1045ac0: lw    v0, 8(s6)
+L_1045ad0:
+// 0x01045ad0: 0x1045ad0: lw    v0, 8(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2563,7 +2563,7 @@ L_1045ac0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045ac4: 0x1045ac4: lw    v1, 56(sp)
+// 0x01045ad4: 0x1045ad4: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2572,19 +2572,19 @@ L_1045ac0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045ac8: 0x1045ac8: mult  s3, v0
+// 0x01045ad8: 0x1045ad8: mult  s3, v0
 	ldloc 10
 	ldloc 5
 	mul
 	stloc 8
-// 0x01045acc: 0x1045acc: lw    a0, 0(s6)
+// 0x01045adc: 0x1045adc: lw    a0, 0(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01045ad0: 0x1045ad0: sw    v1, 64(sp)
+// 0x01045ae0: 0x1045ae0: sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2593,20 +2593,20 @@ L_1045ac0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045ad4: 0x1045ad4: addiu s3, s3, 1
+// 0x01045ae4: 0x1045ae4: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01045ad8: 0x1045ad8: mflo  lo
+// 0x01045ae8: 0x1045ae8: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x01045adc: 0x1045adc: addu  v0, v0, s4
+// 0x01045aec: 0x1045aec: addu  v0, v0, s4
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x01045ae0: 0x1045ae0: jal   0x104f4a8 sw    v0, 60(sp)
+// 0x01045af0: 0x1045af0: jal   0x104f4b8 sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2620,53 +2620,53 @@ L_1045ac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1045ae8:
-// 0x01045ae8: 0x1045ae8: slt   v0, s3, s5
+L_1045af8:
+// 0x01045af8: 0x1045af8: slt   v0, s3, s5
 	ldloc 10
 	ldloc 11
 	clt
 	stloc 5
-// 0x01045aec: 0x1045aec: addu  a1, s8, zero
+// 0x01045afc: 0x1045afc: addu  a1, s8, zero
 	ldloc 12
 	stloc.2
-// 0x01045af0: 0x1045af0: addu  a2, zero, zero
+// 0x01045b00: 0x1045b00: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01045af4: 0x1045af4: bne   v0, zero, 0x1045ac0 addu  a3, zero, zero
+// 0x01045b04: 0x1045b04: bne   v0, zero, 0x1045ad0 addu  a3, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_1045ac0
+	brtrue L_1045ad0
 // --- basic block ---
-L_1045afc:
-// 0x01045afc: 0x1045afc: addiu v0, zero, 8
+L_1045b0c:
+// 0x01045b0c: 0x1045b0c: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01045b00: 0x1045b00: bne   s0, v0, 0x1045b6c addiu v0, zero, 12
+// 0x01045b10: 0x1045b10: bne   s0, v0, 0x1045b7c addiu v0, zero, 12
 	ldloc 17
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	bne.un L_1045b6c
+	bne.un L_1045b7c
 // --- basic block ---
-// 0x01045b08: 0x1045b08: beq   s1, zero, 0x1045b18 addiu v0, zero, 20
+// 0x01045b18: 0x1045b18: beq   s1, zero, 0x1045b28 addiu v0, zero, 20
 	ldloc 14
 	ldc.i4.s 20
 	stloc 5
-	brfalse L_1045b18
+	brfalse L_1045b28
 // --- basic block ---
-// 0x01045b10: 0x1045b10: bne   s1, v0, 0x1045b28 sll   zero, zero, 0
+// 0x01045b20: 0x1045b20: bne   s1, v0, 0x1045b38 sll   zero, zero, 0
 	ldloc 14
 	ldloc 5
-	bne.un L_1045b28
+	bne.un L_1045b38
 // --- basic block ---
-L_1045b18:
-// 0x01045b18: 0x1045b18: lw    v0, 56(sp)
+L_1045b28:
+// 0x01045b28: 0x1045b28: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2675,13 +2675,13 @@ L_1045b18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045b1c: 0x1045b1c: sll   zero, zero, 0
-// 0x01045b20: 0x1045b20: addiu v0, v0, -1
+// 0x01045b2c: 0x1045b2c: sll   zero, zero, 0
+// 0x01045b30: 0x1045b30: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01045b24: 0x1045b24: sw    v0, 56(sp)
+// 0x01045b34: 0x1045b34: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2690,8 +2690,8 @@ L_1045b18:
 	add
 	ldloc 5
 	stelem.i4
-L_1045b28:
-// 0x01045b28: 0x1045b28: lw    v1, 112(sp)
+L_1045b38:
+// 0x01045b38: 0x1045b38: lw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2700,15 +2700,15 @@ L_1045b28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045b2c: 0x1045b2c: addiu v0, zero, 12
+// 0x01045b3c: 0x1045b3c: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x01045b30: 0x1045b30: mult  v1, v0
+// 0x01045b40: 0x1045b40: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 8
-// 0x01045b34: 0x1045b34: lw    v0, 4(s2)
+// 0x01045b44: 0x1045b44: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -2717,7 +2717,7 @@ L_1045b28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045b38: 0x1045b38: lw    s2, 56(sp)
+// 0x01045b48: 0x1045b48: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2726,30 +2726,30 @@ L_1045b28:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01045b3c: 0x1045b3c: addiu v0, v0, -7
+// 0x01045b4c: 0x1045b4c: addiu v0, v0, -7
 	ldloc 5
 	ldc.i4.s -7
 	add
 	stloc 5
-// 0x01045b40: 0x1045b40: addu  s7, v0, s7
+// 0x01045b50: 0x1045b50: addu  s7, v0, s7
 	ldloc 5
 	ldloc 16
 	add
 	stloc 16
-// 0x01045b44: 0x1045b44: lui   v0, 0x60000
+// 0x01045b54: 0x1045b54: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01045b48: 0x1045b48: addiu v0, v0, 13300
+// 0x01045b58: 0x1045b58: addiu v0, v0, 13764
 	ldloc 5
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 5
-// 0x01045b4c: 0x1045b4c: addiu s2, s2, 1
+// 0x01045b5c: 0x1045b5c: addiu s2, s2, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x01045b50: 0x1045b50: lw    s3, 36(sp)
+// 0x01045b60: 0x1045b60: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2758,15 +2758,15 @@ L_1045b28:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01045b54: 0x1045b54: mflo  lo
+// 0x01045b64: 0x1045b64: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01045b58: 0x1045b58: addu  v0, a0, v0
+// 0x01045b68: 0x1045b68: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01045b5c: 0x1045b5c: lw    s1, 8(v0)
+// 0x01045b6c: 0x1045b6c: lw    s1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2775,7 +2775,7 @@ L_1045b28:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01045b60: 0x1045b60: lw    v0, 44(sp)
+// 0x01045b70: 0x1045b70: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2784,15 +2784,15 @@ L_1045b28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045b64: 0x1045b64: j	 0x1045bb8 addu  s1, s1, v0
+// 0x01045b74: 0x1045b74: j	 0x1045bc8 addu  s1, s1, v0
 	ldloc 14
 	ldloc 5
 	add
 	stloc 14
-	br L_1045bb8
+	br L_1045bc8
 // --- basic block ---
-L_1045b6c:
-// 0x01045b6c: 0x1045b6c: lw    a1, 112(sp)
+L_1045b7c:
+// 0x01045b7c: 0x1045b7c: lw    a1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2801,13 +2801,13 @@ L_1045b6c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045b70: 0x1045b70: sll   zero, zero, 0
-// 0x01045b74: 0x1045b74: mult  a1, v0
+// 0x01045b80: 0x1045b80: sll   zero, zero, 0
+// 0x01045b84: 0x1045b84: mult  a1, v0
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 8
-// 0x01045b78: 0x1045b78: lw    v0, 4(s2)
+// 0x01045b88: 0x1045b88: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -2816,7 +2816,7 @@ L_1045b6c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045b7c: 0x1045b7c: lw    s1, 44(sp)
+// 0x01045b8c: 0x1045b8c: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2825,25 +2825,25 @@ L_1045b6c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01045b80: 0x1045b80: addiu v0, v0, -2
+// 0x01045b90: 0x1045b90: addiu v0, v0, -2
 	ldloc 5
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x01045b84: 0x1045b84: addu  s7, v0, s7
+// 0x01045b94: 0x1045b94: addu  s7, v0, s7
 	ldloc 5
 	ldloc 16
 	add
 	stloc 16
-// 0x01045b88: 0x1045b88: lui   v0, 0x60000
+// 0x01045b98: 0x1045b98: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01045b8c: 0x1045b8c: addiu v0, v0, 13300
+// 0x01045b9c: 0x1045b9c: addiu v0, v0, 13764
 	ldloc 5
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 5
-// 0x01045b90: 0x1045b90: lw    s3, 36(sp)
+// 0x01045ba0: 0x1045ba0: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2852,7 +2852,7 @@ L_1045b6c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01045b94: 0x1045b94: lw    s2, 56(sp)
+// 0x01045ba4: 0x1045ba4: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2861,25 +2861,25 @@ L_1045b6c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01045b98: 0x1045b98: addiu s3, s3, 2
+// 0x01045ba8: 0x1045ba8: addiu s3, s3, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x01045b9c: 0x1045b9c: addiu s2, s2, 2
+// 0x01045bac: 0x1045bac: addiu s2, s2, 2
 	ldloc 15
 	ldc.i4.2
 	add
 	stloc 15
-// 0x01045ba0: 0x1045ba0: mflo  lo
+// 0x01045bb0: 0x1045bb0: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x01045ba4: 0x1045ba4: addu  v0, a2, v0
+// 0x01045bb4: 0x1045bb4: addu  v0, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc 5
-// 0x01045ba8: 0x1045ba8: lw    v0, 8(v0)
+// 0x01045bb8: 0x1045bb8: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2888,27 +2888,27 @@ L_1045b6c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045bac: 0x1045bac: sll   zero, zero, 0
-// 0x01045bb0: 0x1045bb0: addu  s1, s1, v0
+// 0x01045bbc: 0x1045bbc: sll   zero, zero, 0
+// 0x01045bc0: 0x1045bc0: addu  s1, s1, v0
 	ldloc 14
 	ldloc 5
 	add
 	stloc 14
-// 0x01045bb4: 0x1045bb4: addiu s1, s1, -2
+// 0x01045bc4: 0x1045bc4: addiu s1, s1, -2
 	ldloc 14
 	ldc.i4.s -2
 	add
 	stloc 14
-L_1045bb8:
-// 0x01045bb8: 0x1045bb8: lui   a0, 0x10000
+L_1045bc8:
+// 0x01045bc8: 0x1045bc8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01045bbc: 0x1045bbc: addiu a0, a0, -1764
+// 0x01045bcc: 0x1045bcc: addiu a0, a0, -1768
 	ldloc.1
-	ldc.i4 -1764
+	ldc.i4 -1768
 	add
 	stloc.1
-// 0x01045bc0: 0x1045bc0: jal   0x104ef00 addu  a1, zero, zero
+// 0x01045bd0: 0x1045bd0: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2916,12 +2916,12 @@ L_1045bb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045bc8: 0x1045bc8: lw    a0, 196(sp)
+// 0x01045bd8: 0x1045bd8: lw    a0, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2930,26 +2930,26 @@ L_1045bb8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045bcc: 0x1045bcc: jal   0x104edb0 sll   zero, zero, 0
+// 0x01045bdc: 0x1045bdc: jal   0x104edc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045bd4: 0x1045bd4: addiu v0, zero, 8
+// 0x01045be4: 0x1045be4: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01045bd8: 0x1045bd8: bne   s0, v0, 0x1045be8 sll   zero, zero, 0
+// 0x01045be8: 0x1045be8: bne   s0, v0, 0x1045bf8 sll   zero, zero, 0
 	ldloc 17
 	ldloc 5
-	bne.un L_1045be8
+	bne.un L_1045bf8
 // --- basic block ---
-// 0x01045be0: 0x1045be0: jal   0x104e410 addiu a0, zero, 188
+// 0x01045bf0: 0x1045bf0: jal   0x104e420 addiu a0, zero, 188
 	ldc.i4 188
 	stloc.1
 	ldloc.0
@@ -2957,13 +2957,13 @@ L_1045bb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1045be8:
-// 0x01045be8: 0x1045be8: jal   0x1000910 addiu a0, zero, 16
+L_1045bf8:
+// 0x01045bf8: 0x1045bf8: jal   0x1000910 addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
 	ldloc.0
@@ -2976,27 +2976,27 @@ L_1045be8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045bf0: 0x1045bf0: addiu s3, s3, -1
+// 0x01045c00: 0x1045c00: addiu s3, s3, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x01045bf4: 0x1045bf4: addiu s2, s2, -1
+// 0x01045c04: 0x1045c04: addiu s2, s2, -1
 	ldloc 15
 	ldc.i4.m1
 	add
 	stloc 15
-// 0x01045bf8: 0x1045bf8: addu  a0, v0, zero
+// 0x01045c08: 0x1045c08: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01045bfc: 0x1045bfc: sw    s1, 0(v0)
+// 0x01045c0c: 0x1045c0c: sw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-// 0x01045c00: 0x1045c00: sw    s7, 4(v0)
+// 0x01045c10: 0x1045c10: sw    s7, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3005,7 +3005,7 @@ L_1045be8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01045c04: 0x1045c04: sw    s3, 8(v0)
+// 0x01045c14: 0x1045c14: sw    s3, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3014,7 +3014,7 @@ L_1045be8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045c08: 0x1045c08: sw    s2, 12(v0)
+// 0x01045c18: 0x1045c18: sw    s2, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3023,7 +3023,7 @@ L_1045be8:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01045c0c: 0x1045c0c: jal   0x104dde4 sw    v0, 124(sp)
+// 0x01045c1c: 0x1045c1c: jal   0x104ddf4 sw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3036,12 +3036,12 @@ L_1045be8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_erase_area_104dde4(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_erase_area_104ddf4(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045c14: 0x1045c14: lw    v0, 124(sp)
+// 0x01045c24: 0x1045c24: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3050,7 +3050,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045c18: 0x1045c18: jal   0x1000930 addu  a0, v0, zero
+// 0x01045c28: 0x1045c28: jal   0x1000930 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3063,8 +3063,8 @@ L_1045be8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045c20: 0x1045c20: lw    ra, 172(sp)
-// 0x01045c24: 0x1045c24: lw    v0, 120(sp)
+// 0x01045c30: 0x1045c30: lw    ra, 172(sp)
+// 0x01045c34: 0x1045c34: lw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3073,7 +3073,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045c28: 0x1045c28: lw    s8, 168(sp)
+// 0x01045c38: 0x1045c38: lw    s8, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3082,7 +3082,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01045c2c: 0x1045c2c: lw    s7, 164(sp)
+// 0x01045c3c: 0x1045c3c: lw    s7, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3091,7 +3091,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01045c30: 0x1045c30: lw    s6, 160(sp)
+// 0x01045c40: 0x1045c40: lw    s6, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3100,7 +3100,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01045c34: 0x1045c34: lw    s5, 156(sp)
+// 0x01045c44: 0x1045c44: lw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3109,7 +3109,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01045c38: 0x1045c38: lw    s4, 152(sp)
+// 0x01045c48: 0x1045c48: lw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3118,7 +3118,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01045c3c: 0x1045c3c: lw    s3, 148(sp)
+// 0x01045c4c: 0x1045c4c: lw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3127,7 +3127,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01045c40: 0x1045c40: lw    s2, 144(sp)
+// 0x01045c50: 0x1045c50: lw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3136,7 +3136,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01045c44: 0x1045c44: lw    s1, 140(sp)
+// 0x01045c54: 0x1045c54: lw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3145,7 +3145,7 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01045c48: 0x1045c48: lw    s0, 136(sp)
+// 0x01045c58: 0x1045c58: lw    s0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3154,15 +3154,15 @@ L_1045be8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01045c4c: 0x1045c4c: jr    ra addiu sp, sp, 176
+// 0x01045c5c: 0x1045c5c: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1045c54:
-// 0x01045c54: 0x1045c54: lw    a1, 80(a2)
+L_1045c64:
+// 0x01045c64: 0x1045c64: lw    a1, 80(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -3171,7 +3171,7 @@ L_1045c54:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045c58: 0x1045c58: lw    v0, 36(a2)
+// 0x01045c68: 0x1045c68: lw    v0, 36(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -3180,7 +3180,7 @@ L_1045c54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045c5c: 0x1045c5c: lw    t0, 76(a2)
+// 0x01045c6c: 0x1045c6c: lw    t0, 76(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -3189,7 +3189,7 @@ L_1045c54:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01045c60: 0x1045c60: lw    a2, 32(a2)
+// 0x01045c70: 0x1045c70: lw    a2, 32(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -3198,28 +3198,28 @@ L_1045c54:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01045c64: 0x1045c64: subu  a1, a3, a1
+// 0x01045c74: 0x1045c74: subu  a1, a3, a1
 	ldloc 4
 	ldloc.2
 	sub
 	stloc.2
-// 0x01045c68: 0x1045c68: div   a1, a2
+// 0x01045c78: 0x1045c78: div   a1, a2
 	ldloc.2
 	ldloc.3
 	div
 	stloc 8
-// 0x01045c6c: 0x1045c6c: subu  v1, t0, v1
+// 0x01045c7c: 0x1045c7c: subu  v1, t0, v1
 	ldloc 18
 	ldloc 7
 	sub
 	stloc 7
-// 0x01045c70: 0x1045c70: addu  a0, s5, zero
+// 0x01045c80: 0x1045c80: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x01045c74: 0x1045c74: addiu s3, zero, 3
+// 0x01045c84: 0x1045c84: addiu s3, zero, 3
 	ldc.i4.3
 	stloc 10
-// 0x01045c78: 0x1045c78: sw    s3, 32(sp)
+// 0x01045c88: 0x1045c88: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3228,10 +3228,10 @@ L_1045c54:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045c7c: 0x1045c7c: mflo  lo
+// 0x01045c8c: 0x1045c8c: mflo  lo
 	ldloc 8
 	stloc.2
-// 0x01045c80: 0x1045c80: sw    a1, 84(sp)
+// 0x01045c90: 0x1045c90: sw    a1, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3240,16 +3240,16 @@ L_1045c54:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01045c84: 0x1045c84: sll   zero, zero, 0
-// 0x01045c88: 0x1045c88: div   v1, v0
+// 0x01045c94: 0x1045c94: sll   zero, zero, 0
+// 0x01045c98: 0x1045c98: div   v1, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 8
-// 0x01045c8c: 0x1045c8c: mflo  lo
+// 0x01045c9c: 0x1045c9c: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x01045c90: 0x1045c90: jal   0x10073c4 sw    v1, 88(sp)
+// 0x01045ca0: 0x1045ca0: jal   0x10073d4 sw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3263,12 +3263,12 @@ L_1045c54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045c98: 0x1045c98: lw    v0, 56(sp)
+// 0x01045ca8: 0x1045ca8: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3277,7 +3277,7 @@ L_1045c54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045c9c: 0x1045c9c: lw    a0, 88(sp)
+// 0x01045cac: 0x1045cac: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3286,31 +3286,31 @@ L_1045c54:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045ca0: 0x1045ca0: addiu v1, v0, 10
+// 0x01045cb0: 0x1045cb0: addiu v1, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 7
-// 0x01045ca4: 0x1045ca4: slt   v1, v1, a0
+// 0x01045cb4: 0x1045cb4: slt   v1, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x01045ca8: 0x1045ca8: beq   v1, zero, 0x1045a3c sll   zero, zero, 0
+// 0x01045cb8: 0x1045cb8: beq   v1, zero, 0x1045a4c sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1045a3c
+	brfalse L_1045a4c
 // --- basic block ---
-// 0x01045cb0: 0x1045cb0: j	 0x1045990 lui   s4, 0x60000
+// 0x01045cc0: 0x1045cc0: j	 0x10459a0 lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 9
-	br L_1045990
+	br L_10459a0
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_border_initialize_1045cb8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_border_initialize_1045cc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s2,int32 s3,int32 s0,int32 v1,int32 ra)
@@ -3357,12 +3357,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01045cb8: 0x1045cb8: addiu sp, sp, -48
+// 0x01045cc8: 0x1045cc8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01045cbc: 0x1045cbc: sw    s3, 40(sp)
+// 0x01045ccc: 0x1045ccc: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3371,7 +3371,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01045cc0: 0x1045cc0: sw    s2, 36(sp)
+// 0x01045cd0: 0x1045cd0: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3380,7 +3380,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01045cc4: 0x1045cc4: sw    s1, 32(sp)
+// 0x01045cd4: 0x1045cd4: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3389,17 +3389,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045cc8: 0x1045cc8: lui   s2, 0x20000
+// 0x01045cd8: 0x1045cd8: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01045ccc: 0x1045ccc: lui   s1, 0x60000
+// 0x01045cdc: 0x1045cdc: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01045cd0: 0x1045cd0: lui   s3, 0x20000
+// 0x01045ce0: 0x1045ce0: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01045cd4: 0x1045cd4: sw    ra, 44(sp)
-// 0x01045cd8: 0x1045cd8: sw    s0, 28(sp)
+// 0x01045ce4: 0x1045ce4: sw    ra, 44(sp)
+// 0x01045ce8: 0x1045ce8: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3408,36 +3408,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045cdc: 0x1045cdc: addiu s2, s2, 27576
+// 0x01045cec: 0x1045cec: addiu s2, s2, 28040
 	ldloc 8
-	ldc.i4 27576
+	ldc.i4 28040
 	add
 	stloc 8
-// 0x01045ce0: 0x1045ce0: addiu s1, s1, 13300
+// 0x01045cf0: 0x1045cf0: addiu s1, s1, 13764
 	ldloc 7
-	ldc.i4 13300
+	ldc.i4 13764
 	add
 	stloc 7
-// 0x01045ce4: 0x1045ce4: addiu s3, s3, 27664
+// 0x01045cf4: 0x1045cf4: addiu s3, s3, 28128
 	ldloc 9
-	ldc.i4 27664
+	ldc.i4 28128
 	add
 	stloc 9
-L_1045ce8:
-// 0x01045ce8: 0x1045ce8: lw    s0, 0(s2)
+L_1045cf8:
+// 0x01045cf8: 0x1045cf8: lw    s0, 0(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01045cec: 0x1045cec: addu  a0, zero, zero
+// 0x01045cfc: 0x1045cfc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01045cf0: 0x1045cf0: addiu a1, zero, 3
+// 0x01045d00: 0x1045d00: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01045cf4: 0x1045cf4: jal   0x10a1918 addu  a2, s0, zero
+// 0x01045d04: 0x1045d04: jal   0x10a1f60 addu  a2, s0, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -3445,20 +3445,20 @@ L_1045ce8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01045cfc: 0x1045cfc: addu  a0, v0, zero
+// 0x01045d0c: 0x1045d0c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01045d00: 0x1045d00: addiu s2, s2, 4
+// 0x01045d10: 0x1045d10: addiu s2, s2, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x01045d04: 0x1045d04: bne   v0, zero, 0x1045d34 sw    v0, 0(s1)
+// 0x01045d14: 0x1045d14: bne   v0, zero, 0x1045d44 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -3466,31 +3466,31 @@ L_1045ce8:
 	shr.un
 	ldloc 6
 	stelem.i4
-	brtrue L_1045d34
+	brtrue L_1045d44
 // --- basic block ---
-// 0x01045d0c: 0x1045d0c: lui   a1, 0x10000
+// 0x01045d1c: 0x1045d1c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01045d10: 0x1045d10: lui   a3, 0x10000
+// 0x01045d20: 0x1045d20: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01045d14: 0x1045d14: addiu a1, a1, -2004
+// 0x01045d24: 0x1045d24: addiu a1, a1, -2008
 	ldloc.2
-	ldc.i4 -2004
+	ldc.i4 -2008
 	add
 	stloc.2
-// 0x01045d18: 0x1045d18: addiu a3, a3, -1748
+// 0x01045d28: 0x1045d28: addiu a3, a3, -1752
 	ldloc 4
-	ldc.i4 -1748
+	ldc.i4 -1752
 	add
 	stloc 4
-// 0x01045d1c: 0x1045d1c: addiu a0, zero, 4
+// 0x01045d2c: 0x1045d2c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01045d20: 0x1045d20: addiu a2, zero, 162
+// 0x01045d30: 0x1045d30: addiu a2, zero, 162
 	ldc.i4 162
 	stloc.3
-// 0x01045d24: 0x1045d24: jal   0x100449c sw    s0, 16(sp)
+// 0x01045d34: 0x1045d34: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3509,27 +3509,27 @@ L_1045ce8:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01045d2c: 0x1045d2c: j	 0x1045d60 addu  v0, zero, zero
+// 0x01045d3c: 0x1045d3c: j	 0x1045d70 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1045d60
+	br L_1045d70
 // --- basic block ---
-L_1045d34:
-// 0x01045d34: 0x1045d34: jal   0x104e020 sll   zero, zero, 0
+L_1045d44:
+// 0x01045d44: 0x1045d44: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01045d3c: 0x1045d3c: lw    a0, 0(s1)
+// 0x01045d4c: 0x1045d4c: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01045d40: 0x1045d40: jal   0x104dffc sw    v0, 4(s1)
+// 0x01045d50: 0x1045d50: jal   0x104e00c sw    v0, 4(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3539,12 +3539,12 @@ L_1045d34:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01045d48: 0x1045d48: sw    v0, 8(s1)
+// 0x01045d58: 0x1045d58: sw    v0, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3553,33 +3553,33 @@ L_1045d34:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01045d4c: 0x1045d4c: bne   s2, s3, 0x1045ce8 addiu s1, s1, 12
+// 0x01045d5c: 0x1045d5c: bne   s2, s3, 0x1045cf8 addiu s1, s1, 12
 	ldloc 8
 	ldloc 9
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 7
-	bne.un L_1045ce8
+	bne.un L_1045cf8
 // --- basic block ---
-// 0x01045d54: 0x1045d54: lui   v0, 0x60000
+// 0x01045d64: 0x1045d64: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 6
-// 0x01045d58: 0x1045d58: sw    zero, 14124(v0)
+// 0x01045d68: 0x1045d68: sw    zero, 14588(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3531
+	ldc.i4 3647
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045d5c: 0x1045d5c: addiu v0, zero, 1
+// 0x01045d6c: 0x1045d6c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1045d60:
-// 0x01045d60: 0x1045d60: lw    ra, 44(sp)
-// 0x01045d64: 0x1045d64: lw    s3, 40(sp)
+L_1045d70:
+// 0x01045d70: 0x1045d70: lw    ra, 44(sp)
+// 0x01045d74: 0x1045d74: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3588,7 +3588,7 @@ L_1045d60:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01045d68: 0x1045d68: lw    s2, 36(sp)
+// 0x01045d78: 0x1045d78: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3597,7 +3597,7 @@ L_1045d60:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01045d6c: 0x1045d6c: lw    s1, 32(sp)
+// 0x01045d7c: 0x1045d7c: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3606,7 +3606,7 @@ L_1045d60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045d70: 0x1045d70: lw    s0, 28(sp)
+// 0x01045d80: 0x1045d80: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3615,7 +3615,7 @@ L_1045d60:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01045d74: 0x1045d74: jr    ra addiu sp, sp, 48
+// 0x01045d84: 0x1045d84: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3627,7 +3627,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_http_async_copy_abort_1045d7c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_http_async_copy_abort_1045d8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 v1,int32 ra)
@@ -3668,12 +3668,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01045d7c: 0x1045d7c: addiu sp, sp, -32
+// 0x01045d8c: 0x1045d8c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01045d80: 0x1045d80: sw    s0, 20(sp)
+// 0x01045d90: 0x1045d90: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3682,8 +3682,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01045d84: 0x1045d84: sw    ra, 28(sp)
-// 0x01045d88: 0x1045d88: sw    s1, 24(sp)
+// 0x01045d94: 0x1045d94: sw    ra, 28(sp)
+// 0x01045d98: 0x1045d98: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3692,13 +3692,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045d8c: 0x1045d8c: beq   a0, zero, 0x1045dbc addu  s0, a0, zero
+// 0x01045d9c: 0x1045d9c: beq   a0, zero, 0x1045dcc addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_1045dbc
+	brfalse L_1045dcc
 // --- basic block ---
-// 0x01045d94: 0x1045d94: lw    v0, 544(a0)
+// 0x01045da4: 0x1045da4: lw    v0, 544(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3707,16 +3707,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045d98: 0x1045d98: sll   zero, zero, 0
-// 0x01045d9c: 0x1045d9c: beq   v0, zero, 0x1045db4 addiu s1, a0, 536
+// 0x01045da8: 0x1045da8: sll   zero, zero, 0
+// 0x01045dac: 0x1045dac: beq   v0, zero, 0x1045dc4 addiu s1, a0, 536
 	ldloc 6
 	ldloc.1
 	ldc.i4 536
 	add
 	stloc 7
-	brfalse L_1045db4
+	brfalse L_1045dc4
 // --- basic block ---
-// 0x01045da4: 0x1045da4: jal   0x1050eac addu  a0, s1, zero
+// 0x01045db4: 0x1045db4: jal   0x1050ebc addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3724,12 +3724,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_remove_input_1050eac(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_remove_input_1050ebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01045dac: 0x1045dac: jal   0x1037238 addu  a0, s1, zero
+// 0x01045dbc: 0x1045dbc: jal   0x1037248 addu  a0, s1, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3737,13 +3737,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_close_1037238(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_close_1037248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_1045db4:
-// 0x01045db4: 0x1045db4: jal   0x1000930 addu  a0, s0, zero
+L_1045dc4:
+// 0x01045dc4: 0x1045dc4: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3756,9 +3756,9 @@ L_1045db4:
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_1045dbc:
-// 0x01045dbc: 0x1045dbc: lw    ra, 28(sp)
-// 0x01045dc0: 0x1045dc0: lw    s1, 24(sp)
+L_1045dcc:
+// 0x01045dcc: 0x1045dcc: lw    ra, 28(sp)
+// 0x01045dd0: 0x1045dd0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3767,7 +3767,7 @@ L_1045dbc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045dc4: 0x1045dc4: lw    s0, 20(sp)
+// 0x01045dd4: 0x1045dd4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3776,7 +3776,7 @@ L_1045dbc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01045dc8: 0x1045dc8: jr    ra addiu sp, sp, 32
+// 0x01045dd8: 0x1045dd8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3788,7 +3788,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_http_async_copy_1045dd0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_http_async_copy_1045de0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -3832,12 +3832,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01045dd0: 0x1045dd0: addiu sp, sp, -56
+// 0x01045de0: 0x1045de0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01045dd4: 0x1045dd4: sw    s2, 48(sp)
+// 0x01045de4: 0x1045de4: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3846,14 +3846,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045dd8: 0x1045dd8: addu  s2, a0, zero
+// 0x01045de8: 0x1045de8: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01045ddc: 0x1045ddc: addiu a0, zero, 580
+// 0x01045dec: 0x1045dec: addiu a0, zero, 580
 	ldc.i4 580
 	stloc.1
-// 0x01045de0: 0x1045de0: sw    ra, 52(sp)
-// 0x01045de4: 0x1045de4: sw    s1, 44(sp)
+// 0x01045df0: 0x1045df0: sw    ra, 52(sp)
+// 0x01045df4: 0x1045df4: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3862,7 +3862,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01045de8: 0x1045de8: sw    s0, 40(sp)
+// 0x01045df8: 0x1045df8: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3871,10 +3871,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045dec: 0x1045dec: addu  s1, a1, zero
+// 0x01045dfc: 0x1045dfc: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01045df0: 0x1045df0: sw    a2, 32(sp)
+// 0x01045e00: 0x1045e00: sw    a2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3883,7 +3883,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01045df4: 0x1045df4: jal   0x1000910 sw    a3, 36(sp)
+// 0x01045e04: 0x1045e04: jal   0x1000910 sw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3902,7 +3902,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045dfc: 0x1045dfc: sw    zero, 544(v0)
+// 0x01045e0c: 0x1045e0c: sw    zero, 544(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3911,13 +3911,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045e00: 0x1045e00: sb    zero, 280(v0)
+// 0x01045e10: 0x1045e10: sb    zero, 280(v0)
 	ldloc 6
 	ldc.i4 280
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01045e04: 0x1045e04: lw    a3, 36(sp)
+// 0x01045e14: 0x1045e14: lw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3926,14 +3926,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01045e08: 0x1045e08: sw    s2, 0(v0)
+// 0x01045e18: 0x1045e18: sw    s2, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x01045e0c: 0x1045e0c: sw    s1, 4(v0)
+// 0x01045e1c: 0x1045e1c: sw    s1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3942,13 +3942,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01045e10: 0x1045e10: addu  s0, v0, zero
+// 0x01045e20: 0x1045e20: addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-// 0x01045e14: 0x1045e14: lui   a0, 0x10000
+// 0x01045e24: 0x1045e24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01045e18: 0x1045e18: lw    a1, 32(sp)
+// 0x01045e28: 0x1045e28: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3957,26 +3957,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01045e1c: 0x1045e1c: lui   v0, 0x1040000
+// 0x01045e2c: 0x1045e2c: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 6
-// 0x01045e20: 0x1045e20: addu  a2, a3, zero
+// 0x01045e30: 0x1045e30: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x01045e24: 0x1045e24: addiu v0, v0, 24200
+// 0x01045e34: 0x1045e34: addiu v0, v0, 24216
 	ldloc 6
-	ldc.i4 24200
+	ldc.i4 24216
 	add
 	stloc 6
-// 0x01045e28: 0x1045e28: addiu a0, a0, -1180
+// 0x01045e38: 0x1045e38: addiu a0, a0, -1184
 	ldloc.1
-	ldc.i4 -1180
+	ldc.i4 -1184
 	add
 	stloc.1
-// 0x01045e2c: 0x1045e2c: addiu a3, zero, 80
+// 0x01045e3c: 0x1045e3c: addiu a3, zero, 80
 	ldc.i4.s 80
 	stloc 4
-// 0x01045e30: 0x1045e30: sw    v0, 20(sp)
+// 0x01045e40: 0x1045e40: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3985,7 +3985,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01045e34: 0x1045e34: sw    zero, 16(sp)
+// 0x01045e44: 0x1045e44: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3994,7 +3994,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045e38: 0x1045e38: jal   0x1052354 sw    s0, 24(sp)
+// 0x01045e48: 0x1045e48: jal   0x1052364 sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4008,22 +4008,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_connect_async_1052354(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_connect_async_1052364(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045e40: 0x1045e40: addiu v1, zero, -1
+// 0x01045e50: 0x1045e50: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x01045e44: 0x1045e44: bne   v0, v1, 0x1045e6c lui   a2, 0x10000
+// 0x01045e54: 0x1045e54: bne   v0, v1, 0x1045e7c lui   a2, 0x10000
 	ldloc 6
 	ldloc 8
 	ldc.i4 65536
 	stloc.3
-	bne.un L_1045e6c
+	bne.un L_1045e7c
 // --- basic block ---
-// 0x01045e4c: 0x1045e4c: lw    v0, 8(s2)
+// 0x01045e5c: 0x1045e5c: lw    v0, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4032,15 +4032,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045e50: 0x1045e50: addiu a2, a2, -1168
+// 0x01045e60: 0x1045e60: addiu a2, a2, -1172
 	ldloc.3
-	ldc.i4 -1168
+	ldc.i4 -1172
 	add
 	stloc.3
-// 0x01045e54: 0x1045e54: addu  a0, s1, zero
+// 0x01045e64: 0x1045e64: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01045e58: 0x1045e58: jalr  v0 addiu a1, zero, 1
+// 0x01045e68: 0x1045e68: jalr  v0 addiu a1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.2
@@ -4054,7 +4054,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045e60: 0x1045e60: jal   0x1000930 addu  a0, s0, zero
+// 0x01045e70: 0x1045e70: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4067,15 +4067,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045e68: 0x1045e68: addu  s0, zero, zero
+// 0x01045e78: 0x1045e78: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1045e6c:
-// 0x01045e6c: 0x1045e6c: lw    ra, 52(sp)
-// 0x01045e70: 0x1045e70: addu  v0, s0, zero
+L_1045e7c:
+// 0x01045e7c: 0x1045e7c: lw    ra, 52(sp)
+// 0x01045e80: 0x1045e80: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01045e74: 0x1045e74: lw    s2, 48(sp)
+// 0x01045e84: 0x1045e84: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4084,7 +4084,7 @@ L_1045e6c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01045e78: 0x1045e78: lw    s1, 44(sp)
+// 0x01045e88: 0x1045e88: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4093,7 +4093,7 @@ L_1045e6c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01045e7c: 0x1045e7c: lw    s0, 40(sp)
+// 0x01045e8c: 0x1045e8c: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4102,7 +4102,7 @@ L_1045e6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045e80: 0x1045e80: jr    ra addiu sp, sp, 56
+// 0x01045e90: 0x1045e90: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4114,7 +4114,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_http_async_connect_cb_1045e88(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_http_async_connect_cb_1045e98(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -4158,12 +4158,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01045e88: 0x1045e88: addiu sp, sp, -32
+// 0x01045e98: 0x1045e98: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01045e8c: 0x1045e8c: sw    s1, 20(sp)
+// 0x01045e9c: 0x1045e9c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4172,7 +4172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01045e90: 0x1045e90: sw    s0, 16(sp)
+// 0x01045ea0: 0x1045ea0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4181,8 +4181,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01045e94: 0x1045e94: sw    ra, 28(sp)
-// 0x01045e98: 0x1045e98: sw    s2, 24(sp)
+// 0x01045ea4: 0x1045ea4: sw    ra, 28(sp)
+// 0x01045ea8: 0x1045ea8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4191,23 +4191,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045e9c: 0x1045e9c: lw    s1, 0(a1)
+// 0x01045eac: 0x1045eac: lw    s1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01045ea0: 0x1045ea0: bne   a0, zero, 0x1045ebc addu  s0, a1, zero
+// 0x01045eb0: 0x1045eb0: bne   a0, zero, 0x1045ecc addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 7
-	brtrue L_1045ebc
+	brtrue L_1045ecc
 // --- basic block ---
-// 0x01045ea8: 0x1045ea8: lui   a2, 0x10000
+// 0x01045eb8: 0x1045eb8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01045eac: 0x1045eac: lw    v0, 8(s1)
+// 0x01045ebc: 0x1045ebc: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045eb0: 0x1045eb0: lw    a0, 4(a1)
+// 0x01045ec0: 0x1045ec0: lw    a0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4225,18 +4225,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045eb4: 0x1045eb4: j	 0x1045f0c addiu a2, a2, -1136
+// 0x01045ec4: 0x1045ec4: j	 0x1045f1c addiu a2, a2, -1140
 	ldloc.3
-	ldc.i4 -1136
+	ldc.i4 -1140
 	add
 	stloc.3
-	br L_1045f0c
+	br L_1045f1c
 // --- basic block ---
-L_1045ebc:
-// 0x01045ebc: 0x1045ebc: addiu v0, zero, 2
+L_1045ecc:
+// 0x01045ecc: 0x1045ecc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01045ec0: 0x1045ec0: sw    a0, 544(a1)
+// 0x01045ed0: 0x1045ed0: sw    a0, 544(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4245,12 +4245,12 @@ L_1045ebc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01045ec4: 0x1045ec4: addiu s2, a1, 536
+// 0x01045ed4: 0x1045ed4: addiu s2, a1, 536
 	ldloc.2
 	ldc.i4 536
 	add
 	stloc 10
-// 0x01045ec8: 0x1045ec8: sw    v0, 536(a1)
+// 0x01045ed8: 0x1045ed8: sw    v0, 536(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4259,7 +4259,7 @@ L_1045ebc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01045ecc: 0x1045ecc: sw    a1, 540(s0)
+// 0x01045edc: 0x1045edc: sw    a1, 540(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4268,21 +4268,21 @@ L_1045ebc:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01045ed0: 0x1045ed0: lui   a1, 0x10000
+// 0x01045ee0: 0x1045ee0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01045ed4: 0x1045ed4: addiu a1, a1, 5360
+// 0x01045ee4: 0x1045ee4: addiu a1, a1, 5356
 	ldloc.2
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc.2
-// 0x01045ed8: 0x1045ed8: addu  a0, s2, zero
+// 0x01045ee8: 0x1045ee8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01045edc: 0x1045edc: addiu a2, zero, 2
+// 0x01045eec: 0x1045eec: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01045ee0: 0x1045ee0: jal   0x10372d4 addu  a3, zero, zero
+// 0x01045ef0: 0x1045ef0: jal   0x10372e4 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4290,22 +4290,22 @@ L_1045ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_write_10372d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_write_10372e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045ee8: 0x1045ee8: addiu v1, zero, -1
+// 0x01045ef8: 0x1045ef8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x01045eec: 0x1045eec: bne   v0, v1, 0x1045f24 addiu v0, zero, 1
+// 0x01045efc: 0x1045efc: bne   v0, v1, 0x1045f34 addiu v0, zero, 1
 	ldloc 6
 	ldloc 8
 	ldc.i4.1
 	stloc 6
-	bne.un L_1045f24
+	bne.un L_1045f34
 // --- basic block ---
-// 0x01045ef4: 0x1045ef4: jal   0x1037238 addu  a0, s2, zero
+// 0x01045f04: 0x1045f04: jal   0x1037248 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4313,15 +4313,15 @@ L_1045ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_close_1037238(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_close_1037248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045efc: 0x1045efc: lui   a2, 0x10000
+// 0x01045f0c: 0x1045f0c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01045f00: 0x1045f00: lw    v0, 8(s1)
+// 0x01045f10: 0x1045f10: lw    v0, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4330,7 +4330,7 @@ L_1045ebc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045f04: 0x1045f04: lw    a0, 4(s0)
+// 0x01045f14: 0x1045f14: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4339,13 +4339,13 @@ L_1045ebc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045f08: 0x1045f08: addiu a2, a2, -1108
+// 0x01045f18: 0x1045f18: addiu a2, a2, -1112
 	ldloc.3
-	ldc.i4 -1108
+	ldc.i4 -1112
 	add
 	stloc.3
-L_1045f0c:
-// 0x01045f0c: 0x1045f0c: jalr  v0 addiu a1, zero, 1
+L_1045f1c:
+// 0x01045f1c: 0x1045f1c: jalr  v0 addiu a1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc.2
@@ -4359,7 +4359,7 @@ L_1045f0c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045f14: 0x1045f14: jal   0x1000930 addu  a0, s0, zero
+// 0x01045f24: 0x1045f24: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4372,14 +4372,14 @@ L_1045f0c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045f1c: 0x1045f1c: j	 0x1045f5c sll   zero, zero, 0
-	br L_1045f5c
+// 0x01045f2c: 0x1045f2c: j	 0x1045f6c sll   zero, zero, 0
+	br L_1045f6c
 // --- basic block ---
-L_1045f24:
-// 0x01045f24: 0x1045f24: lui   a1, 0x1040000
+L_1045f34:
+// 0x01045f34: 0x1045f34: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x01045f28: 0x1045f28: sw    v0, 20(s0)
+// 0x01045f38: 0x1045f38: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4388,15 +4388,15 @@ L_1045f24:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01045f2c: 0x1045f2c: addu  a0, s2, zero
+// 0x01045f3c: 0x1045f3c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01045f30: 0x1045f30: addiu a1, a1, 24436
+// 0x01045f40: 0x1045f40: addiu a1, a1, 24452
 	ldloc.2
-	ldc.i4 24436
+	ldc.i4 24452
 	add
 	stloc.2
-// 0x01045f34: 0x1045f34: sw    v1, 16(s0)
+// 0x01045f44: 0x1045f44: sw    v1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4405,13 +4405,13 @@ L_1045f24:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01045f38: 0x1045f38: sb    zero, 24(s0)
+// 0x01045f48: 0x1045f48: sb    zero, 24(s0)
 	ldloc 7
 	ldc.i4.s 24
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01045f3c: 0x1045f3c: sw    zero, 8(s0)
+// 0x01045f4c: 0x1045f4c: sw    zero, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4420,7 +4420,7 @@ L_1045f24:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01045f40: 0x1045f40: jal   0x1050f84 sw    zero, 12(s0)
+// 0x01045f50: 0x1045f50: jal   0x1050f94 sw    zero, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4434,12 +4434,12 @@ L_1045f24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_input_1050f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_input_1050f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01045f48: 0x1045f48: lw    v0, 4(s1)
+// 0x01045f58: 0x1045f58: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4448,7 +4448,7 @@ L_1045f24:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01045f4c: 0x1045f4c: lw    a0, 4(s0)
+// 0x01045f5c: 0x1045f5c: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4457,10 +4457,10 @@ L_1045f24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01045f50: 0x1045f50: addu  a1, zero, zero
+// 0x01045f60: 0x1045f60: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01045f54: 0x1045f54: jalr  v0 addu  a2, zero, zero
+// 0x01045f64: 0x1045f64: jalr  v0 addu  a2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.3
@@ -4474,9 +4474,9 @@ L_1045f24:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1045f5c:
-// 0x01045f5c: 0x1045f5c: lw    ra, 28(sp)
-// 0x01045f60: 0x1045f60: lw    s2, 24(sp)
+L_1045f6c:
+// 0x01045f6c: 0x1045f6c: lw    ra, 28(sp)
+// 0x01045f70: 0x1045f70: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4485,7 +4485,7 @@ L_1045f5c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01045f64: 0x1045f64: lw    s1, 20(sp)
+// 0x01045f74: 0x1045f74: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4494,7 +4494,7 @@ L_1045f5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01045f68: 0x1045f68: lw    s0, 16(sp)
+// 0x01045f78: 0x1045f78: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4503,7 +4503,7 @@ L_1045f5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01045f6c: 0x1045f6c: jr    ra addiu sp, sp, 32
+// 0x01045f7c: 0x1045f7c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4515,7 +4515,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_http_async_has_data_cb_1045f74(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_http_async_has_data_cb_1045f84(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s1,int32 s4,int32 s6,int32 s2,int32 s3,int32 s7,int32 s8,int32 ra)
@@ -4577,12 +4577,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01045f74: 0x1045f74: addiu sp, sp, -4184
+// 0x01045f84: 0x1045f84: addiu sp, sp, -4184
 	ldloc.0
 	ldc.i4 -4184
 	add
 	stloc.0
-// 0x01045f78: 0x1045f78: sw    s0, 4144(sp)
+// 0x01045f88: 0x1045f88: sw    s0, 4144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4591,7 +4591,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01045f7c: 0x1045f7c: lw    s0, 4(a0)
+// 0x01045f8c: 0x1045f8c: lw    s0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4600,7 +4600,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01045f80: 0x1045f80: sw    s3, 4156(sp)
+// 0x01045f90: 0x1045f90: sw    s3, 4156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4609,7 +4609,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01045f84: 0x1045f84: lw    v0, 20(s0)
+// 0x01045f94: 0x1045f94: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4618,7 +4618,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045f88: 0x1045f88: sw    s2, 4152(sp)
+// 0x01045f98: 0x1045f98: sw    s2, 4152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4627,8 +4627,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01045f8c: 0x1045f8c: sw    ra, 4180(sp)
-// 0x01045f90: 0x1045f90: sw    s8, 4176(sp)
+// 0x01045f9c: 0x1045f9c: sw    ra, 4180(sp)
+// 0x01045fa0: 0x1045fa0: sw    s8, 4176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4637,7 +4637,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01045f94: 0x1045f94: sw    s7, 4172(sp)
+// 0x01045fa4: 0x1045fa4: sw    s7, 4172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4646,7 +4646,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01045f98: 0x1045f98: sw    s6, 4168(sp)
+// 0x01045fa8: 0x1045fa8: sw    s6, 4168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4655,7 +4655,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01045f9c: 0x1045f9c: sw    s5, 4164(sp)
+// 0x01045fac: 0x1045fac: sw    s5, 4164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4664,7 +4664,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01045fa0: 0x1045fa0: sw    s4, 4160(sp)
+// 0x01045fb0: 0x1045fb0: sw    s4, 4160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4673,7 +4673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01045fa4: 0x1045fa4: sw    s1, 4148(sp)
+// 0x01045fb4: 0x1045fb4: sw    s1, 4148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4682,20 +4682,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01045fa8: 0x1045fa8: lw    s2, 0(s0)
+// 0x01045fb8: 0x1045fb8: lw    s2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x01045fac: 0x1045fac: bne   v0, zero, 0x1046010 addu  s3, a0, zero
+// 0x01045fbc: 0x1045fbc: bne   v0, zero, 0x1046020 addu  s3, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 14
-	brtrue L_1046010
+	brtrue L_1046020
 // --- basic block ---
-// 0x01045fb4: 0x1045fb4: lw    v0, 8(s0)
+// 0x01045fc4: 0x1045fc4: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4704,7 +4704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045fb8: 0x1045fb8: lw    a2, 16(s0)
+// 0x01045fc8: 0x1045fc8: lw    a2, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4713,28 +4713,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01045fbc: 0x1045fbc: sll   zero, zero, 0
-// 0x01045fc0: 0x1045fc0: subu  a2, a2, v0
+// 0x01045fcc: 0x1045fcc: sll   zero, zero, 0
+// 0x01045fd0: 0x1045fd0: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01045fc4: 0x1045fc4: slti  v0, a2, 4097
+// 0x01045fd4: 0x1045fd4: slti  v0, a2, 4097
 	ldloc.3
 	ldc.i4 4097
 	clt
 	stloc 5
-// 0x01045fc8: 0x1045fc8: bne   v0, zero, 0x1045fd4 addu  a0, s3, zero
+// 0x01045fd8: 0x1045fd8: bne   v0, zero, 0x1045fe4 addu  a0, s3, zero
 	ldloc 5
 	ldloc 14
 	stloc.1
-	brtrue L_1045fd4
+	brtrue L_1045fe4
 // --- basic block ---
-// 0x01045fd0: 0x1045fd0: addiu a2, zero, 4096
+// 0x01045fe0: 0x1045fe0: addiu a2, zero, 4096
 	ldc.i4 4096
 	stloc.3
-L_1045fd4:
-// 0x01045fd4: 0x1045fd4: jal   0x1037370 addiu a1, sp, 24
+L_1045fe4:
+// 0x01045fe4: 0x1045fe4: jal   0x1037380 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4744,19 +4744,19 @@ L_1045fd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_read_1037370(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_read_1037380(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01045fdc: 0x1045fdc: bgez  v0, 0x1046328 addu  s5, v0, zero
+// 0x01045fec: 0x1045fec: bgez  v0, 0x1046338 addu  s5, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
 	ldc.i4.s 0
-	bge L_1046328
+	bge L_1046338
 // --- basic block ---
-// 0x01045fe4: 0x1045fe4: lw    v0, 8(s0)
+// 0x01045ff4: 0x1045ff4: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4765,10 +4765,10 @@ L_1045fd4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045fe8: 0x1045fe8: lui   a1, 0x10000
+// 0x01045ff8: 0x1045ff8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01045fec: 0x1045fec: sw    v0, 16(sp)
+// 0x01045ffc: 0x1045ffc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4777,7 +4777,7 @@ L_1045fd4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01045ff0: 0x1045ff0: lw    v0, 16(s0)
+// 0x01046000: 0x1046000: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4786,26 +4786,26 @@ L_1045fd4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01045ff4: 0x1045ff4: lui   a3, 0x10000
+// 0x01046004: 0x1046004: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01045ff8: 0x1045ff8: addiu a1, a1, -1084
+// 0x01046008: 0x1046008: addiu a1, a1, -1088
 	ldloc.2
-	ldc.i4 -1084
+	ldc.i4 -1088
 	add
 	stloc.2
-// 0x01045ffc: 0x1045ffc: addiu a3, a3, -1048
+// 0x0104600c: 0x104600c: addiu a3, a3, -1052
 	ldloc 4
-	ldc.i4 -1048
+	ldc.i4 -1052
 	add
 	stloc 4
-// 0x01046000: 0x1046000: addiu a0, zero, 4
+// 0x01046010: 0x1046010: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01046004: 0x1046004: addiu a2, zero, 185
+// 0x01046014: 0x1046014: addiu a2, zero, 185
 	ldc.i4 185
 	stloc.3
-// 0x01046008: 0x1046008: j	 0x1046318 sw    v0, 20(sp)
+// 0x01046018: 0x1046018: j	 0x1046328 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4814,15 +4814,15 @@ L_1045fd4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1046318
+	br L_1046328
 // --- basic block ---
-L_1046010:
-// 0x01046010: 0x1046010: addiu s7, s0, 24
+L_1046020:
+// 0x01046020: 0x1046020: addiu s7, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 15
-// 0x01046014: 0x1046014: jal   0x1001b48 addu  a0, s7, zero
+// 0x01046024: 0x1046024: jal   0x1001b48 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
@@ -4831,28 +4831,28 @@ L_1046010:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104601c: 0x104601c: addiu s4, sp, 24
+// 0x0104602c: 0x104602c: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 11
-// 0x01046020: 0x1046020: addiu a2, zero, 4096
+// 0x01046030: 0x1046030: addiu a2, zero, 4096
 	ldc.i4 4096
 	stloc.3
-// 0x01046024: 0x1046024: subu  a2, a2, v0
+// 0x01046034: 0x1046034: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x01046028: 0x1046028: addu  a0, s3, zero
+// 0x01046038: 0x1046038: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x0104602c: 0x104602c: addu  a1, s4, v0
+// 0x0104603c: 0x104603c: addu  a1, s4, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc.2
-// 0x01046030: 0x1046030: jal   0x1037370 addu  s1, v0, zero
+// 0x01046040: 0x1046040: jal   0x1037380 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -4860,28 +4860,28 @@ L_1046010:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_read_1037370(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_read_1037380(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046038: 0x1046038: blez  v0, 0x10462f8 addu  s5, v0, zero
+// 0x01046048: 0x1046048: blez  v0, 0x1046308 addu  s5, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
 	ldc.i4.s 0
-	ble L_10462f8
+	ble L_1046308
 // --- basic block ---
-// 0x01046040: 0x1046040: beq   s1, zero, 0x1046058 addu  a0, s4, zero
+// 0x01046050: 0x1046050: beq   s1, zero, 0x1046068 addu  a0, s4, zero
 	ldloc 10
 	ldloc 11
 	stloc.1
-	brfalse L_1046058
+	brfalse L_1046068
 // --- basic block ---
-// 0x01046048: 0x1046048: addu  a1, s7, zero
+// 0x01046058: 0x1046058: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x0104604c: 0x104604c: jal   0x1001800 addu  a2, s1, zero
+// 0x0104605c: 0x104605c: jal   0x1001800 addu  a2, s1, zero
 	ldloc 10
 	stloc.3
 	ldloc.1
@@ -4893,34 +4893,34 @@ L_1046010:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046054: 0x1046054: sb    zero, 24(s0)
+// 0x01046064: 0x1046064: sb    zero, 24(s0)
 	ldloc 8
 	ldc.i4.s 24
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1046058:
-// 0x01046058: 0x1046058: addu  s5, s1, s5
+L_1046068:
+// 0x01046068: 0x1046068: addu  s5, s1, s5
 	ldloc 10
 	ldloc 9
 	add
 	stloc 9
-// 0x0104605c: 0x104605c: addiu s1, sp, 24
+// 0x0104606c: 0x104606c: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x01046060: 0x1046060: addiu v0, s0, 280
+// 0x01046070: 0x1046070: addiu v0, s0, 280
 	ldloc 8
 	ldc.i4 280
 	add
 	stloc 5
-// 0x01046064: 0x1046064: addu  v1, s1, s5
+// 0x01046074: 0x1046074: addu  v1, s1, s5
 	ldloc 10
 	ldloc 9
 	add
 	stloc 7
-// 0x01046068: 0x1046068: sw    v0, 4128(sp)
+// 0x01046078: 0x1046078: sw    v0, 4128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4929,7 +4929,7 @@ L_1046058:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104606c: 0x104606c: sw    v1, 4132(sp)
+// 0x0104607c: 0x104607c: sw    v1, 4132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4938,11 +4938,11 @@ L_1046058:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01046070: 0x1046070: addiu s8, zero, 32
+// 0x01046080: 0x1046080: addiu s8, zero, 32
 	ldc.i4.s 32
 	stloc 16
-L_1046074:
-// 0x01046074: 0x1046074: lw    v0, 4132(sp)
+L_1046084:
+// 0x01046084: 0x1046084: lw    v0, 4132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4951,13 +4951,13 @@ L_1046074:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046078: 0x1046078: addu  a0, s1, zero
+// 0x01046088: 0x1046088: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0104607c: 0x104607c: addiu a1, zero, 10
+// 0x0104608c: 0x104608c: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x01046080: 0x1046080: jal   0x1001a5c sb    zero, 0(v0)
+// 0x01046090: 0x1046090: jal   0x1001a5c sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -4968,21 +4968,21 @@ L_1046074:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046088: 0x1046088: beq   v0, zero, 0x1046278 addu  s4, v0, zero
+// 0x01046098: 0x1046098: beq   v0, zero, 0x1046288 addu  s4, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brfalse L_1046278
+	brfalse L_1046288
 // --- basic block ---
-// 0x01046090: 0x1046090: lui   a1, 0x10000
+// 0x010460a0: 0x10460a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046094: 0x1046094: addu  a0, s1, zero
+// 0x010460a4: 0x10460a4: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01046098: 0x1046098: jal   0x1000420 addiu a1, a1, 5360
+// 0x010460a8: 0x10460a8: jal   0x1000420 addiu a1, a1, 5356
 	ldloc.2
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc.2
 	ldloc.0
@@ -4995,24 +4995,24 @@ L_1046074:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010460a0: 0x10460a0: beq   v0, zero, 0x10460b0 addiu s6, zero, 1
+// 0x010460b0: 0x10460b0: beq   v0, zero, 0x10460c0 addiu s6, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 12
-	brfalse L_10460b0
+	brfalse L_10460c0
 // --- basic block ---
-// 0x010460a8: 0x10460a8: addu  s4, v0, zero
+// 0x010460b8: 0x10460b8: addu  s4, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010460ac: 0x10460ac: addiu s6, zero, 2
+// 0x010460bc: 0x10460bc: addiu s6, zero, 2
 	ldc.i4.2
 	stloc 12
-L_10460b0:
-// 0x010460b0: 0x10460b0: sb    zero, 0(s4)
+L_10460c0:
+// 0x010460c0: 0x10460c0: sb    zero, 0(s4)
 	ldloc 11
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010460b4: 0x10460b4: lw    v0, 12(s0)
+// 0x010460c4: 0x10460c4: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5021,24 +5021,24 @@ L_10460b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010460b8: 0x10460b8: sll   zero, zero, 0
-// 0x010460bc: 0x10460bc: bne   v0, zero, 0x1046104 sll   zero, zero, 0
+// 0x010460c8: 0x10460c8: sll   zero, zero, 0
+// 0x010460cc: 0x10460cc: bne   v0, zero, 0x1046114 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1046104
+	brtrue L_1046114
 // --- basic block ---
-// 0x010460c4: 0x10460c4: beq   s4, s1, 0x1046254 lui   a1, 0x10000
+// 0x010460d4: 0x10460d4: beq   s4, s1, 0x1046264 lui   a1, 0x10000
 	ldloc 11
 	ldloc 10
 	ldc.i4 65536
 	stloc.2
-	beq  L_1046254
+	beq  L_1046264
 // --- basic block ---
-// 0x010460cc: 0x10460cc: addu  a0, s1, zero
+// 0x010460dc: 0x10460dc: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010460d0: 0x10460d0: jal   0x1000420 addiu a1, a1, -980
+// 0x010460e0: 0x10460e0: jal   0x1000420 addiu a1, a1, -984
 	ldloc.2
-	ldc.i4 -980
+	ldc.i4 -984
 	add
 	stloc.2
 	ldloc.0
@@ -5051,38 +5051,38 @@ L_10460b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010460d8: 0x10460d8: bne   v0, zero, 0x10460fc addiu v1, zero, 1
+// 0x010460e8: 0x10460e8: bne   v0, zero, 0x104610c addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brtrue L_10460fc
+	brtrue L_104610c
 // --- basic block ---
-// 0x010460e0: 0x10460e0: lui   a1, 0x10000
+// 0x010460f0: 0x10460f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010460e4: 0x10460e4: lui   a3, 0x10000
+// 0x010460f4: 0x10460f4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010460e8: 0x10460e8: addiu a1, a1, -1084
+// 0x010460f8: 0x10460f8: addiu a1, a1, -1088
 	ldloc.2
-	ldc.i4 -1084
+	ldc.i4 -1088
 	add
 	stloc.2
-// 0x010460ec: 0x10460ec: addiu a3, a3, -972
+// 0x010460fc: 0x10460fc: addiu a3, a3, -976
 	ldloc 4
-	ldc.i4 -972
+	ldc.i4 -976
 	add
 	stloc 4
-// 0x010460f0: 0x10460f0: addiu a0, zero, 1
+// 0x01046100: 0x1046100: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010460f4: 0x10460f4: j	 0x1046174 addiu a2, zero, 101
+// 0x01046104: 0x1046104: j	 0x1046184 addiu a2, zero, 101
 	ldc.i4.s 101
 	stloc.3
-	br L_1046174
+	br L_1046184
 // --- basic block ---
-L_10460fc:
-// 0x010460fc: 0x10460fc: j	 0x1046254 sw    v1, 12(s0)
+L_104610c:
+// 0x0104610c: 0x104610c: j	 0x1046264 sw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5091,22 +5091,22 @@ L_10460fc:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1046254
+	br L_1046264
 // --- basic block ---
-L_1046104:
-// 0x01046104: 0x1046104: bne   s4, s1, 0x1046130 lui   a1, 0x10000
+L_1046114:
+// 0x01046114: 0x1046114: bne   s4, s1, 0x1046140 lui   a1, 0x10000
 	ldloc 11
 	ldloc 10
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1046130
+	bne.un L_1046140
 // --- basic block ---
-// 0x0104610c: 0x104610c: subu  s5, s5, s6
+// 0x0104611c: 0x104611c: subu  s5, s5, s6
 	ldloc 9
 	ldloc 12
 	sub
 	stloc 9
-// 0x01046110: 0x1046110: sw    zero, 20(s0)
+// 0x01046120: 0x1046120: sw    zero, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5115,18 +5115,18 @@ L_1046104:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046114: 0x1046114: beq   s5, zero, 0x1046278 addu  a1, s4, s6
+// 0x01046124: 0x1046124: beq   s5, zero, 0x1046288 addu  a1, s4, s6
 	ldloc 9
 	ldloc 11
 	ldloc 12
 	add
 	stloc.2
-	brfalse L_1046278
+	brfalse L_1046288
 // --- basic block ---
-// 0x0104611c: 0x104611c: addu  a0, s4, zero
+// 0x0104612c: 0x104612c: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x01046120: 0x1046120: jal   0x100186c addu  a2, s5, zero
+// 0x01046130: 0x1046130: jal   0x100186c addu  a2, s5, zero
 	ldloc 9
 	stloc.3
 	ldloc.1
@@ -5138,19 +5138,19 @@ L_1046104:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046128: 0x1046128: j	 0x10462c4 sll   zero, zero, 0
-	br L_10462c4
+// 0x01046138: 0x1046138: j	 0x10462d4 sll   zero, zero, 0
+	br L_10462d4
 // --- basic block ---
-L_1046130:
-// 0x01046130: 0x1046130: addu  a0, s1, zero
+L_1046140:
+// 0x01046140: 0x1046140: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01046134: 0x1046134: addiu a1, a1, -908
+// 0x01046144: 0x1046144: addiu a1, a1, -912
 	ldloc.2
-	ldc.i4 -908
+	ldc.i4 -912
 	add
 	stloc.2
-// 0x01046138: 0x1046138: jal   0x100039c addiu a2, zero, 14
+// 0x01046148: 0x1046148: jal   0x100039c addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.1
@@ -5162,16 +5162,16 @@ L_1046130:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046140: 0x1046140: bne   v0, zero, 0x1046200 lui   a1, 0x10000
+// 0x01046150: 0x1046150: bne   v0, zero, 0x1046210 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1046200
+	brtrue L_1046210
 // --- basic block ---
-// 0x01046148: 0x1046148: addu  a0, s1, zero
+// 0x01046158: 0x1046158: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0104614c: 0x104614c: jal   0x1001a5c addiu a1, zero, 58
+// 0x0104615c: 0x104615c: jal   0x1001a5c addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
 	ldloc.1
@@ -5181,38 +5181,38 @@ L_1046130:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046154: 0x1046154: bne   v0, zero, 0x1046180 addiu v0, v0, 1
+// 0x01046164: 0x1046164: bne   v0, zero, 0x1046190 addiu v0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_1046180
+	brtrue L_1046190
 // --- basic block ---
-// 0x0104615c: 0x104615c: lui   a1, 0x10000
+// 0x0104616c: 0x104616c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046160: 0x1046160: lui   a3, 0x10000
+// 0x01046170: 0x1046170: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046164: 0x1046164: addiu a1, a1, -1084
+// 0x01046174: 0x1046174: addiu a1, a1, -1088
 	ldloc.2
-	ldc.i4 -1084
+	ldc.i4 -1088
 	add
 	stloc.2
-// 0x01046168: 0x1046168: addiu a3, a3, -892
+// 0x01046178: 0x1046178: addiu a3, a3, -896
 	ldloc 4
-	ldc.i4 -892
+	ldc.i4 -896
 	add
 	stloc 4
-// 0x0104616c: 0x104616c: addiu a0, zero, 4
+// 0x0104617c: 0x104617c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01046170: 0x1046170: addiu a2, zero, 127
+// 0x01046180: 0x1046180: addiu a2, zero, 127
 	ldc.i4.s 127
 	stloc.3
-L_1046174:
-// 0x01046174: 0x1046174: j	 0x10461c0 sw    s1, 16(sp)
+L_1046184:
+// 0x01046184: 0x1046184: j	 0x10461d0 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5221,26 +5221,26 @@ L_1046174:
 	add
 	ldloc 10
 	stelem.i4
-	br L_10461c0
+	br L_10461d0
 // --- basic block ---
-L_104617c:
-// 0x0104617c: 0x104617c: addiu v0, v0, 1
+L_104618c:
+// 0x0104618c: 0x104618c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_1046180:
-// 0x01046180: 0x1046180: lb    v1, 0(v0)
+L_1046190:
+// 0x01046190: 0x1046190: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01046184: 0x1046184: sll   zero, zero, 0
-// 0x01046188: 0x1046188: beq   v1, s8, 0x104617c sll   zero, zero, 0
+// 0x01046194: 0x1046194: sll   zero, zero, 0
+// 0x01046198: 0x1046198: beq   v1, s8, 0x104618c sll   zero, zero, 0
 	ldloc 7
 	ldloc 16
-	beq  L_104617c
+	beq  L_104618c
 // --- basic block ---
-// 0x01046190: 0x1046190: jal   0x1000d8c addu  a0, v0, zero
+// 0x010461a0: 0x10461a0: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5253,7 +5253,7 @@ L_1046180:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046198: 0x1046198: bgtz  v0, 0x10461d0 sw    v0, 16(s0)
+// 0x010461a8: 0x10461a8: bgtz  v0, 0x10461e0 sw    v0, 16(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -5264,37 +5264,37 @@ L_1046180:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	bgt L_10461d0
+	bgt L_10461e0
 // --- basic block ---
-// 0x010461a0: 0x10461a0: lui   a1, 0x10000
+// 0x010461b0: 0x10461b0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010461a4: 0x10461a4: lui   a3, 0x10000
+// 0x010461b4: 0x10461b4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010461a8: 0x10461a8: addiu a1, a1, -1084
+// 0x010461b8: 0x10461b8: addiu a1, a1, -1088
 	ldloc.2
-	ldc.i4 -1084
+	ldc.i4 -1088
 	add
 	stloc.2
-// 0x010461ac: 0x10461ac: addiu a3, a3, -892
+// 0x010461bc: 0x10461bc: addiu a3, a3, -896
 	ldloc 4
-	ldc.i4 -892
+	ldc.i4 -896
 	add
 	stloc 4
-// 0x010461b0: 0x10461b0: addiu a0, zero, 4
+// 0x010461c0: 0x10461c0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010461b4: 0x10461b4: addiu a2, zero, 134
+// 0x010461c4: 0x10461c4: addiu a2, zero, 134
 	ldc.i4 134
 	stloc.3
-L_10461b8:
-// 0x010461b8: 0x10461b8: addiu v0, sp, 24
+L_10461c8:
+// 0x010461c8: 0x10461c8: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010461bc: 0x10461bc: sw    v0, 16(sp)
+// 0x010461cc: 0x10461cc: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5303,8 +5303,8 @@ L_10461b8:
 	add
 	ldloc 5
 	stelem.i4
-L_10461c0:
-// 0x010461c0: 0x10461c0: jal   0x100449c addiu s5, zero, -1
+L_10461d0:
+// 0x010461d0: 0x10461d0: jal   0x100449c addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 9
 	ldloc.0
@@ -5317,64 +5317,64 @@ L_10461c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010461c8: 0x10461c8: j	 0x10462c4 sll   zero, zero, 0
-	br L_10462c4
+// 0x010461d8: 0x10461d8: j	 0x10462d4 sll   zero, zero, 0
+	br L_10462d4
 // --- basic block ---
-L_10461d0:
-// 0x010461d0: 0x10461d0: lui   v1, 0x10000
+L_10461e0:
+// 0x010461e0: 0x10461e0: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010461d4: 0x10461d4: ori   v1, v1, 34464
+// 0x010461e4: 0x10461e4: ori   v1, v1, 34464
 	ldloc 7
 	ldc.i4 34464
 	or
 	stloc 7
-// 0x010461d8: 0x10461d8: slt   v0, v0, v1
+// 0x010461e8: 0x10461e8: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010461dc: 0x10461dc: bne   v0, zero, 0x10461fc lui   a1, 0x10000
+// 0x010461ec: 0x10461ec: bne   v0, zero, 0x104620c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10461fc
+	brtrue L_104620c
 // --- basic block ---
-// 0x010461e4: 0x10461e4: lui   a3, 0x10000
+// 0x010461f4: 0x10461f4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010461e8: 0x10461e8: addiu a1, a1, -1084
+// 0x010461f8: 0x10461f8: addiu a1, a1, -1088
 	ldloc.2
-	ldc.i4 -1084
+	ldc.i4 -1088
 	add
 	stloc.2
-// 0x010461ec: 0x10461ec: addiu a3, a3, -832
+// 0x010461fc: 0x10461fc: addiu a3, a3, -836
 	ldloc 4
-	ldc.i4 -832
+	ldc.i4 -836
 	add
 	stloc 4
-// 0x010461f0: 0x10461f0: addiu a0, zero, 4
+// 0x01046200: 0x1046200: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010461f4: 0x10461f4: j	 0x10461b8 addiu a2, zero, 138
+// 0x01046204: 0x1046204: j	 0x10461c8 addiu a2, zero, 138
 	ldc.i4 138
 	stloc.3
-	br L_10461b8
+	br L_10461c8
 // --- basic block ---
-L_10461fc:
-// 0x010461fc: 0x10461fc: lui   a1, 0x10000
+L_104620c:
+// 0x0104620c: 0x104620c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_1046200:
-// 0x01046200: 0x1046200: addu  a0, s1, zero
+L_1046210:
+// 0x01046210: 0x1046210: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01046204: 0x1046204: addiu a1, a1, -772
+// 0x01046214: 0x1046214: addiu a1, a1, -776
 	ldloc.2
-	ldc.i4 -772
+	ldc.i4 -776
 	add
 	stloc.2
-// 0x01046208: 0x1046208: jal   0x100039c addiu a2, zero, 13
+// 0x01046218: 0x1046218: jal   0x100039c addiu a2, zero, 13
 	ldc.i4.s 13
 	stloc.3
 	ldloc.1
@@ -5386,18 +5386,18 @@ L_1046200:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046210: 0x1046210: bne   v0, zero, 0x1046258 addu  a1, s4, s6
+// 0x01046220: 0x1046220: bne   v0, zero, 0x1046268 addu  a1, s4, s6
 	ldloc 5
 	ldloc 11
 	ldloc 12
 	add
 	stloc.2
-	brtrue L_1046258
+	brtrue L_1046268
 // --- basic block ---
-// 0x01046218: 0x1046218: addu  a0, s1, zero
+// 0x01046228: 0x1046228: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0104621c: 0x104621c: jal   0x1001a5c addiu a1, zero, 58
+// 0x0104622c: 0x104622c: jal   0x1001a5c addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
 	ldloc.1
@@ -5407,33 +5407,33 @@ L_1046200:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046224: 0x1046224: beq   v0, zero, 0x1046254 sll   zero, zero, 0
+// 0x01046234: 0x1046234: beq   v0, zero, 0x1046264 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1046254
+	brfalse L_1046264
 // --- basic block ---
-L_104622c:
-// 0x0104622c: 0x104622c: addiu v0, v0, 1
+L_104623c:
+// 0x0104623c: 0x104623c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01046230: 0x1046230: lb    v1, 0(v0)
+// 0x01046240: 0x1046240: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01046234: 0x1046234: sll   zero, zero, 0
-// 0x01046238: 0x1046238: beq   v1, s8, 0x104622c sll   zero, zero, 0
+// 0x01046244: 0x1046244: sll   zero, zero, 0
+// 0x01046248: 0x1046248: beq   v1, s8, 0x104623c sll   zero, zero, 0
 	ldloc 7
 	ldloc 16
-	beq  L_104622c
+	beq  L_104623c
 // --- basic block ---
-// 0x01046240: 0x1046240: sb    zero, 280(s0)
+// 0x01046250: 0x1046250: sb    zero, 280(s0)
 	ldloc 8
 	ldc.i4 280
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01046244: 0x1046244: lw    a0, 4128(sp)
+// 0x01046254: 0x1046254: lw    a0, 4128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5442,10 +5442,10 @@ L_104622c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046248: 0x1046248: addu  a1, v0, zero
+// 0x01046258: 0x1046258: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104624c: 0x104624c: jal   0x1001af8 addiu a2, zero, 256
+// 0x0104625c: 0x104625c: jal   0x1001af8 addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
 	ldloc.1
@@ -5454,30 +5454,30 @@ L_104622c:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-L_1046254:
-// 0x01046254: 0x1046254: addu  a1, s4, s6
+L_1046264:
+// 0x01046264: 0x1046264: addu  a1, s4, s6
 	ldloc 11
 	ldloc 12
 	add
 	stloc.2
-L_1046258:
-// 0x01046258: 0x1046258: addu  s5, s1, s5
+L_1046268:
+// 0x01046268: 0x1046268: addu  s5, s1, s5
 	ldloc 10
 	ldloc 9
 	add
 	stloc 9
-// 0x0104625c: 0x104625c: subu  s5, s5, a1
+// 0x0104626c: 0x104626c: subu  s5, s5, a1
 	ldloc 9
 	ldloc.2
 	sub
 	stloc 9
-// 0x01046260: 0x1046260: beq   s5, zero, 0x1046074 addu  a0, s1, zero
+// 0x01046270: 0x1046270: beq   s5, zero, 0x1046084 addu  a0, s1, zero
 	ldloc 9
 	ldloc 10
 	stloc.1
-	brfalse L_1046074
+	brfalse L_1046084
 // --- basic block ---
-// 0x01046268: 0x1046268: jal   0x100186c addu  a2, s5, zero
+// 0x01046278: 0x1046278: jal   0x100186c addu  a2, s5, zero
 	ldloc 9
 	stloc.3
 	ldloc.1
@@ -5489,11 +5489,11 @@ L_1046258:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046270: 0x1046270: j	 0x1046074 sll   zero, zero, 0
-	br L_1046074
+// 0x01046280: 0x1046280: j	 0x1046084 sll   zero, zero, 0
+	br L_1046084
 // --- basic block ---
-L_1046278:
-// 0x01046278: 0x1046278: lw    v0, 20(s0)
+L_1046288:
+// 0x01046288: 0x1046288: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5502,32 +5502,32 @@ L_1046278:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104627c: 0x104627c: sll   zero, zero, 0
-// 0x01046280: 0x1046280: beq   v0, zero, 0x10462cc addu  s5, zero, zero
+// 0x0104628c: 0x104628c: sll   zero, zero, 0
+// 0x01046290: 0x1046290: beq   v0, zero, 0x10462dc addu  s5, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_10462cc
+	brfalse L_10462dc
 // --- basic block ---
-// 0x01046288: 0x1046288: lb    v0, 24(sp)
+// 0x01046298: 0x1046298: lb    v0, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104628c: 0x104628c: sll   zero, zero, 0
-// 0x01046290: 0x1046290: beq   v0, zero, 0x104641c addiu a1, sp, 24
+// 0x0104629c: 0x104629c: sll   zero, zero, 0
+// 0x010462a0: 0x10462a0: beq   v0, zero, 0x104642c addiu a1, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-	brfalse L_104641c
+	brfalse L_104642c
 // --- basic block ---
-// 0x01046298: 0x1046298: addu  a0, a1, zero
+// 0x010462a8: 0x10462a8: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104629c: 0x104629c: jal   0x1001b48 sw    a1, 4136(sp)
+// 0x010462ac: 0x10462ac: jal   0x1001b48 sw    a1, 4136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5542,12 +5542,12 @@ L_1046278:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010462a4: 0x10462a4: sltiu v0, v0, 256
+// 0x010462b4: 0x10462b4: sltiu v0, v0, 256
 	ldloc 5
 	ldc.i4 256
 	clt.un
 	stloc 5
-// 0x010462a8: 0x10462a8: lw    a1, 4136(sp)
+// 0x010462b8: 0x10462b8: lw    a1, 4136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5556,11 +5556,11 @@ L_1046278:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010462ac: 0x10462ac: beq   v0, zero, 0x104641c sll   zero, zero, 0
+// 0x010462bc: 0x10462bc: beq   v0, zero, 0x104642c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104641c
+	brfalse L_104642c
 // --- basic block ---
-// 0x010462b4: 0x10462b4: jal   0x1001b68 addu  a0, s7, zero
+// 0x010462c4: 0x10462c4: jal   0x1001b68 addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
@@ -5570,11 +5570,11 @@ L_1046278:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010462bc: 0x10462bc: j	 0x104641c sll   zero, zero, 0
-	br L_104641c
+// 0x010462cc: 0x10462cc: j	 0x104642c sll   zero, zero, 0
+	br L_104642c
 // --- basic block ---
-L_10462c4:
-// 0x010462c4: 0x10462c4: lw    v0, 20(s0)
+L_10462d4:
+// 0x010462d4: 0x10462d4: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5583,20 +5583,20 @@ L_10462c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010462c8: 0x10462c8: sll   zero, zero, 0
-L_10462cc:
-// 0x010462cc: 0x10462cc: bne   v0, zero, 0x1046328 sll   zero, zero, 0
+// 0x010462d8: 0x10462d8: sll   zero, zero, 0
+L_10462dc:
+// 0x010462dc: 0x10462dc: bne   v0, zero, 0x1046338 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1046328
+	brtrue L_1046338
 // --- basic block ---
-// 0x010462d4: 0x10462d4: lw    v0, 0(s2)
+// 0x010462e4: 0x10462e4: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010462d8: 0x10462d8: lw    a0, 4(s0)
+// 0x010462e8: 0x10462e8: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5605,7 +5605,7 @@ L_10462cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010462dc: 0x10462dc: lw    a1, 16(s0)
+// 0x010462ec: 0x10462ec: lw    a1, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5614,7 +5614,7 @@ L_10462cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010462e0: 0x10462e0: jalr  v0 sll   zero, zero, 0
+// 0x010462f0: 0x10462f0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5626,40 +5626,40 @@ L_10462cc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010462e8: 0x10462e8: beq   v0, zero, 0x1046414 sll   zero, zero, 0
+// 0x010462f8: 0x10462f8: beq   v0, zero, 0x1046424 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1046414
+	brfalse L_1046424
 // --- basic block ---
-// 0x010462f0: 0x10462f0: j	 0x1046328 sll   zero, zero, 0
-	br L_1046328
+// 0x01046300: 0x1046300: j	 0x1046338 sll   zero, zero, 0
+	br L_1046338
 // --- basic block ---
-L_10462f8:
-// 0x010462f8: 0x10462f8: beq   v0, zero, 0x104635c lui   a1, 0x10000
+L_1046308:
+// 0x01046308: 0x1046308: beq   v0, zero, 0x104636c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_104635c
+	brfalse L_104636c
 // --- basic block ---
-// 0x01046300: 0x1046300: lui   a3, 0x10000
+// 0x01046310: 0x1046310: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046304: 0x1046304: addiu a1, a1, -1084
+// 0x01046314: 0x1046314: addiu a1, a1, -1088
 	ldloc.2
-	ldc.i4 -1084
+	ldc.i4 -1088
 	add
 	stloc.2
-// 0x01046308: 0x1046308: addiu a3, a3, -756
+// 0x01046318: 0x1046318: addiu a3, a3, -760
 	ldloc 4
-	ldc.i4 -756
+	ldc.i4 -760
 	add
 	stloc 4
-// 0x0104630c: 0x104630c: addiu a0, zero, 4
+// 0x0104631c: 0x104631c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01046310: 0x1046310: addiu a2, zero, 209
+// 0x01046320: 0x1046320: addiu a2, zero, 209
 	ldc.i4 209
 	stloc.3
-// 0x01046314: 0x1046314: sw    s1, 16(sp)
+// 0x01046324: 0x1046324: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5668,8 +5668,8 @@ L_10462f8:
 	add
 	ldloc 10
 	stelem.i4
-L_1046318:
-// 0x01046318: 0x1046318: jal   0x100449c sll   zero, zero, 0
+L_1046328:
+// 0x01046328: 0x1046328: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5680,20 +5680,20 @@ L_1046318:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046320: 0x1046320: j	 0x1046354 sll   zero, zero, 0
-	br L_1046354
+// 0x01046330: 0x1046330: j	 0x1046364 sll   zero, zero, 0
+	br L_1046364
 // --- basic block ---
-L_1046328:
-// 0x01046328: 0x1046328: blez  s5, 0x1046354 addiu a1, sp, 24
+L_1046338:
+// 0x01046338: 0x1046338: blez  s5, 0x1046364 addiu a1, sp, 24
 	ldloc 9
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
 	ldc.i4.s 0
-	ble L_1046354
+	ble L_1046364
 // --- basic block ---
-// 0x01046330: 0x1046330: lw    v1, 8(s0)
+// 0x01046340: 0x1046340: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5702,7 +5702,7 @@ L_1046328:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01046334: 0x1046334: lw    v0, 4(s2)
+// 0x01046344: 0x1046344: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5711,12 +5711,12 @@ L_1046328:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046338: 0x1046338: addu  v1, v1, s5
+// 0x01046348: 0x1046348: addu  v1, v1, s5
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-// 0x0104633c: 0x104633c: lw    a0, 4(s0)
+// 0x0104634c: 0x104634c: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5725,7 +5725,7 @@ L_1046328:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046340: 0x1046340: sw    v1, 8(s0)
+// 0x01046350: 0x1046350: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5734,7 +5734,7 @@ L_1046328:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01046344: 0x1046344: jalr  v0 addu  a2, s5, zero
+// 0x01046354: 0x1046354: jalr  v0 addu  a2, s5, zero
 	ldloc 5
 	ldloc 9
 	stloc.3
@@ -5748,16 +5748,16 @@ L_1046328:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104634c: 0x104634c: j	 0x104635c sll   zero, zero, 0
-	br L_104635c
+// 0x0104635c: 0x104635c: j	 0x104636c sll   zero, zero, 0
+	br L_104636c
 // --- basic block ---
-L_1046354:
-// 0x01046354: 0x1046354: bne   s5, zero, 0x1046374 sll   zero, zero, 0
+L_1046364:
+// 0x01046364: 0x1046364: bne   s5, zero, 0x1046384 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_1046374
+	brtrue L_1046384
 // --- basic block ---
-L_104635c:
-// 0x0104635c: 0x104635c: lw    v1, 8(s0)
+L_104636c:
+// 0x0104636c: 0x104636c: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5766,7 +5766,7 @@ L_104635c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01046360: 0x1046360: lw    v0, 16(s0)
+// 0x01046370: 0x1046370: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5775,18 +5775,18 @@ L_104635c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046364: 0x1046364: sll   zero, zero, 0
-// 0x01046368: 0x1046368: slt   v0, v1, v0
+// 0x01046374: 0x1046374: sll   zero, zero, 0
+// 0x01046378: 0x1046378: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x0104636c: 0x104636c: bne   v0, zero, 0x104641c sll   zero, zero, 0
+// 0x0104637c: 0x104637c: bne   v0, zero, 0x104642c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104641c
+	brtrue L_104642c
 // --- basic block ---
-L_1046374:
-// 0x01046374: 0x1046374: jal   0x1050eac addu  a0, s3, zero
+L_1046384:
+// 0x01046384: 0x1046384: jal   0x1050ebc addu  a0, s3, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -5794,12 +5794,12 @@ L_1046374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_remove_input_1050eac(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_remove_input_1050ebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104637c: 0x104637c: jal   0x1037238 addiu a0, s0, 536
+// 0x0104638c: 0x104638c: jal   0x1037248 addiu a0, s0, 536
 	ldloc 8
 	ldc.i4 536
 	add
@@ -5809,19 +5809,19 @@ L_1046374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl40::roadmap_io_close_1037238(int32,int32,int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_close_1037248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046384: 0x1046384: bgez  s5, 0x10463a8 lui   a2, 0x10000
+// 0x01046394: 0x1046394: bgez  s5, 0x10463b8 lui   a2, 0x10000
 	ldloc 9
 	ldc.i4 65536
 	stloc.3
 	ldc.i4.s 0
-	bge L_10463a8
+	bge L_10463b8
 // --- basic block ---
-// 0x0104638c: 0x104638c: lw    v0, 8(s2)
+// 0x0104639c: 0x104639c: lw    v0, 8(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5830,7 +5830,7 @@ L_1046374:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046390: 0x1046390: lw    a0, 4(s0)
+// 0x010463a0: 0x10463a0: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5839,12 +5839,12 @@ L_1046374:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046394: 0x1046394: addiu a2, a2, -688
+// 0x010463a4: 0x10463a4: addiu a2, a2, -692
 	ldloc.3
-	ldc.i4 -688
+	ldc.i4 -692
 	add
 	stloc.3
-// 0x01046398: 0x1046398: jalr  v0 addu  a1, zero, zero
+// 0x010463a8: 0x10463a8: jalr  v0 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
@@ -5858,11 +5858,11 @@ L_1046374:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010463a0: 0x10463a0: j	 0x1046404 sll   zero, zero, 0
-	br L_1046404
+// 0x010463b0: 0x10463b0: j	 0x1046414 sll   zero, zero, 0
+	br L_1046414
 // --- basic block ---
-L_10463a8:
-// 0x010463a8: 0x10463a8: lw    v0, 16(s0)
+L_10463b8:
+// 0x010463b8: 0x10463b8: lw    v0, 16(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5871,13 +5871,13 @@ L_10463a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010463ac: 0x10463ac: sll   zero, zero, 0
-// 0x010463b0: 0x10463b0: blez  v0, 0x1046404 sll   zero, zero, 0
+// 0x010463bc: 0x10463bc: sll   zero, zero, 0
+// 0x010463c0: 0x10463c0: blez  v0, 0x1046414 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_1046404
+	ble L_1046414
 // --- basic block ---
-// 0x010463b8: 0x10463b8: lw    v1, 8(s0)
+// 0x010463c8: 0x10463c8: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5886,46 +5886,46 @@ L_10463a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010463bc: 0x10463bc: sll   zero, zero, 0
-// 0x010463c0: 0x10463c0: slt   a0, v1, v0
+// 0x010463cc: 0x10463cc: sll   zero, zero, 0
+// 0x010463d0: 0x10463d0: slt   a0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc.1
-// 0x010463c4: 0x10463c4: bne   a0, zero, 0x1046404 slt   a0, v0, v1
+// 0x010463d4: 0x10463d4: bne   a0, zero, 0x1046414 slt   a0, v0, v1
 	ldloc.1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc.1
-	brtrue L_1046404
+	brtrue L_1046414
 // --- basic block ---
-// 0x010463cc: 0x10463cc: beq   a0, zero, 0x10463f4 lui   a1, 0x10000
+// 0x010463dc: 0x10463dc: beq   a0, zero, 0x1046404 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brfalse L_10463f4
+	brfalse L_1046404
 // --- basic block ---
-// 0x010463d4: 0x10463d4: lui   a3, 0x10000
+// 0x010463e4: 0x10463e4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010463d8: 0x10463d8: addiu a1, a1, -1084
+// 0x010463e8: 0x10463e8: addiu a1, a1, -1088
 	ldloc.2
-	ldc.i4 -1084
+	ldc.i4 -1088
 	add
 	stloc.2
-// 0x010463dc: 0x10463dc: addiu a3, a3, -648
+// 0x010463ec: 0x10463ec: addiu a3, a3, -652
 	ldloc 4
-	ldc.i4 -648
+	ldc.i4 -652
 	add
 	stloc 4
-// 0x010463e0: 0x10463e0: addiu a0, zero, 4
+// 0x010463f0: 0x10463f0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010463e4: 0x10463e4: addiu a2, zero, 227
+// 0x010463f4: 0x10463f4: addiu a2, zero, 227
 	ldc.i4 227
 	stloc.3
-// 0x010463e8: 0x10463e8: sw    v1, 16(sp)
+// 0x010463f8: 0x10463f8: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5934,7 +5934,7 @@ L_10463a8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010463ec: 0x10463ec: jal   0x100449c sw    v0, 20(sp)
+// 0x010463fc: 0x10463fc: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5953,8 +5953,8 @@ L_10463a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10463f4:
-// 0x010463f4: 0x10463f4: lw    v0, 12(s2)
+L_1046404:
+// 0x01046404: 0x1046404: lw    v0, 12(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5963,7 +5963,7 @@ L_10463f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010463f8: 0x10463f8: lw    a0, 4(s0)
+// 0x01046408: 0x1046408: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5972,7 +5972,7 @@ L_10463f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010463fc: 0x10463fc: jalr  v0 addiu a1, s0, 280
+// 0x0104640c: 0x104640c: jalr  v0 addiu a1, s0, 280
 	ldloc 5
 	ldloc 8
 	ldc.i4 280
@@ -5988,8 +5988,8 @@ L_10463f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1046404:
-// 0x01046404: 0x1046404: jal   0x1000930 addu  a0, s0, zero
+L_1046414:
+// 0x01046414: 0x1046414: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6002,18 +6002,18 @@ L_1046404:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104640c: 0x104640c: j	 0x104641c sll   zero, zero, 0
-	br L_104641c
+// 0x0104641c: 0x104641c: j	 0x104642c sll   zero, zero, 0
+	br L_104642c
 // --- basic block ---
-L_1046414:
-// 0x01046414: 0x1046414: j	 0x1046374 addiu s5, zero, -1
+L_1046424:
+// 0x01046424: 0x1046424: j	 0x1046384 addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 9
-	br L_1046374
+	br L_1046384
 // --- basic block ---
-L_104641c:
-// 0x0104641c: 0x104641c: lw    ra, 4180(sp)
-// 0x01046420: 0x1046420: lw    s8, 4176(sp)
+L_104642c:
+// 0x0104642c: 0x104642c: lw    ra, 4180(sp)
+// 0x01046430: 0x1046430: lw    s8, 4176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6022,7 +6022,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01046424: 0x1046424: lw    s7, 4172(sp)
+// 0x01046434: 0x1046434: lw    s7, 4172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6031,7 +6031,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01046428: 0x1046428: lw    s6, 4168(sp)
+// 0x01046438: 0x1046438: lw    s6, 4168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6040,7 +6040,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104642c: 0x104642c: lw    s5, 4164(sp)
+// 0x0104643c: 0x104643c: lw    s5, 4164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6049,7 +6049,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01046430: 0x1046430: lw    s4, 4160(sp)
+// 0x01046440: 0x1046440: lw    s4, 4160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6058,7 +6058,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01046434: 0x1046434: lw    s3, 4156(sp)
+// 0x01046444: 0x1046444: lw    s3, 4156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6067,7 +6067,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01046438: 0x1046438: lw    s2, 4152(sp)
+// 0x01046448: 0x1046448: lw    s2, 4152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6076,7 +6076,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104643c: 0x104643c: lw    s1, 4148(sp)
+// 0x0104644c: 0x104644c: lw    s1, 4148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6085,7 +6085,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01046440: 0x1046440: lw    s0, 4144(sp)
+// 0x01046450: 0x1046450: lw    s0, 4144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6094,7 +6094,7 @@ L_104641c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01046444: 0x1046444: jr    ra addiu sp, sp, 4184
+// 0x01046454: 0x1046454: jr    ra addiu sp, sp, 4184
 	ldloc.0
 	ldc.i4 4184
 	add
@@ -6106,7 +6106,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 override_long_click_104644c()
+.method public static int32 override_long_click_104645c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -6120,7 +6120,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104644c: 0x104644c: jr    ra addiu v0, zero, 1
+// 0x0104645c: 0x104645c: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -6128,7 +6128,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 get_input_type_1046454()
+.method public static int32 get_input_type_1046464()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -6142,7 +6142,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046454: 0x1046454: jr    ra addiu v0, zero, 2
+// 0x01046464: 0x1046464: jr    ra addiu v0, zero, 2
 	ldc.i4.2
 	stloc.0
 	br __CIBYL_function_return
@@ -6150,7 +6150,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_alternative_routes_suggest_dlg_active_104645c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_suggest_dlg_active_104646c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -6185,33 +6185,33 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104645c: 0x104645c: addiu sp, sp, -24
+// 0x0104646c: 0x104646c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01046460: 0x1046460: sw    ra, 20(sp)
-// 0x01046464: 0x1046464: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x01046470: 0x1046470: sw    ra, 20(sp)
+// 0x01046474: 0x1046474: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104646c: 0x104646c: addu  a0, v0, zero
+// 0x0104647c: 0x104647c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046470: 0x1046470: beq   a0, zero, 0x1046488 addu  v0, zero, zero
+// 0x01046480: 0x1046480: beq   a0, zero, 0x1046498 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1046488
+	brfalse L_1046498
 // --- basic block ---
-// 0x01046478: 0x1046478: lui   a1, 0x10000
+// 0x01046488: 0x1046488: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104647c: 0x104647c: jal   0x1001b14 addiu a1, a1, -604
+// 0x0104648c: 0x104648c: jal   0x1001b14 addiu a1, a1, -608
 	ldloc.2
-	ldc.i4 -604
+	ldc.i4 -608
 	add
 	stloc.2
 	ldloc.1
@@ -6219,15 +6219,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01046484: 0x1046484: sltiu v0, v0, 1
+// 0x01046494: 0x1046494: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-L_1046488:
-// 0x01046488: 0x1046488: lw    ra, 20(sp)
-// 0x0104648c: 0x104648c: sll   zero, zero, 0
-// 0x01046490: 0x1046490: jr    ra addiu sp, sp, 24
+L_1046498:
+// 0x01046498: 0x1046498: lw    ra, 20(sp)
+// 0x0104649c: 0x104649c: sll   zero, zero, 0
+// 0x010464a0: 0x10464a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6239,7 +6239,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alertnative_routes_after_login_1046498(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alertnative_routes_after_login_10464a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra,int32 t0,int32 lo)
@@ -6283,12 +6283,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046498: 0x1046498: addiu sp, sp, -56
+// 0x010464a8: 0x10464a8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0104649c: 0x104649c: sw    s0, 48(sp)
+// 0x010464ac: 0x10464ac: sw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6297,112 +6297,112 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010464a0: 0x10464a0: sw    ra, 52(sp)
-// 0x010464a4: 0x10464a4: addu  s0, zero, zero
+// 0x010464b0: 0x10464b0: sw    ra, 52(sp)
+// 0x010464b4: 0x10464b4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010464a8: 0x10464a8: cibyl_sysc_arg 0x10
+// 0x010464b8: 0x10464b8: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010464ac: 0x10464ac: cibyl_sysc 0x6c2
+// 0x010464bc: 0x10464bc: cibyl_sysc 0x6c2
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010464b0: 0x10464b0: jal   0x1056758 addu  s0, v0, zero
+// 0x010464c0: 0x10464c0: jal   0x1056768 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl64::navigate_main_nav_resumed_1056758()
+	call int32 Cibyl64::navigate_main_nav_resumed_1056768()
 	stloc 5
 // --- basic block ---
-// 0x010464b8: 0x10464b8: beq   v0, zero, 0x10464d8 lui   a1, 0x10000
+// 0x010464c8: 0x10464c8: beq   v0, zero, 0x10464e8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_10464d8
+	brfalse L_10464e8
 // --- basic block ---
-// 0x010464c0: 0x10464c0: lui   a3, 0x10000
+// 0x010464d0: 0x10464d0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010464c4: 0x10464c4: addiu a1, a1, -576
+// 0x010464d4: 0x10464d4: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x010464c8: 0x10464c8: addiu a3, a3, -536
+// 0x010464d8: 0x10464d8: addiu a3, a3, -540
 	ldloc 4
-	ldc.i4 -536
+	ldc.i4 -540
 	add
 	stloc 4
-// 0x010464cc: 0x10464cc: addiu a0, zero, 1
+// 0x010464dc: 0x10464dc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010464d0: 0x10464d0: j	 0x1046524 addiu a2, zero, 1435
+// 0x010464e0: 0x10464e0: j	 0x1046534 addiu a2, zero, 1435
 	ldc.i4 1435
 	stloc.3
-	br L_1046524
+	br L_1046534
 // --- basic block ---
-L_10464d8:
-// 0x010464d8: 0x10464d8: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+L_10464e8:
+// 0x010464e8: 0x10464e8: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x010464e0: 0x10464e0: bne   v0, zero, 0x1046500 lui   a1, 0x10000
+// 0x010464f0: 0x10464f0: bne   v0, zero, 0x1046510 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1046500
+	brtrue L_1046510
 // --- basic block ---
-// 0x010464e8: 0x10464e8: lui   a3, 0x10000
+// 0x010464f8: 0x10464f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010464ec: 0x10464ec: addiu a1, a1, -576
+// 0x010464fc: 0x10464fc: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x010464f0: 0x10464f0: addiu a3, a3, -468
+// 0x01046500: 0x1046500: addiu a3, a3, -472
 	ldloc 4
-	ldc.i4 -468
+	ldc.i4 -472
 	add
 	stloc 4
-// 0x010464f4: 0x10464f4: addiu a0, zero, 1
+// 0x01046504: 0x1046504: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010464f8: 0x10464f8: j	 0x1046524 addiu a2, zero, 1442
+// 0x01046508: 0x1046508: j	 0x1046534 addiu a2, zero, 1442
 	ldc.i4 1442
 	stloc.3
-	br L_1046524
+	br L_1046534
 // --- basic block ---
-L_1046500:
-// 0x01046500: 0x1046500: jal   0x105688c sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_is_calculating_route_105688c()
+L_1046510:
+// 0x01046510: 0x1046510: jal   0x105689c sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_is_calculating_route_105689c()
 	stloc 5
 // --- basic block ---
-// 0x01046508: 0x1046508: beq   v0, zero, 0x1046534 lui   a1, 0x10000
+// 0x01046518: 0x1046518: beq   v0, zero, 0x1046544 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1046534
+	brfalse L_1046544
 // --- basic block ---
-// 0x01046510: 0x1046510: lui   a3, 0x10000
+// 0x01046520: 0x1046520: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046514: 0x1046514: addiu a1, a1, -576
+// 0x01046524: 0x1046524: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046518: 0x1046518: addiu a3, a3, -408
+// 0x01046528: 0x1046528: addiu a3, a3, -412
 	ldloc 4
-	ldc.i4 -408
+	ldc.i4 -412
 	add
 	stloc 4
-// 0x0104651c: 0x104651c: addiu a0, zero, 1
+// 0x0104652c: 0x104652c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01046520: 0x1046520: addiu a2, zero, 1449
+// 0x01046530: 0x1046530: addiu a2, zero, 1449
 	ldc.i4 1449
 	stloc.3
-L_1046524:
-// 0x01046524: 0x1046524: jal   0x100449c sll   zero, zero, 0
+L_1046534:
+// 0x01046534: 0x1046534: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6413,16 +6413,16 @@ L_1046524:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104652c: 0x104652c: j	 0x1046640 lui   v0, 0x60000
+// 0x0104653c: 0x104653c: j	 0x1046650 lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-	br L_1046640
+	br L_1046650
 // --- basic block ---
-L_1046534:
-// 0x01046534: 0x1046534: lui   a0, 0x0
+L_1046544:
+// 0x01046544: 0x1046544: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01046538: 0x1046538: jal   0x100e788 addiu a0, a0, 13448
+// 0x01046548: 0x1046548: jal   0x100e798 addiu a0, a0, 13448
 	ldloc.1
 	ldc.i4 13448
 	add
@@ -6432,65 +6432,65 @@ L_1046534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01046540: 0x1046540: addiu v1, zero, -1
+// 0x01046550: 0x1046550: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01046544: 0x1046544: beq   v0, v1, 0x1046588 subu  s0, s0, v0
+// 0x01046554: 0x1046554: beq   v0, v1, 0x1046598 subu  s0, s0, v0
 	ldloc 5
 	ldloc 6
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-	beq  L_1046588
+	beq  L_1046598
 // --- basic block ---
-// 0x0104654c: 0x104654c: slti  v0, s0, 3600
+// 0x0104655c: 0x104655c: slti  v0, s0, 3600
 	ldloc 8
 	ldc.i4 3600
 	clt
 	stloc 5
-// 0x01046550: 0x1046550: beq   v0, zero, 0x1046588 addiu v0, zero, 60
+// 0x01046560: 0x1046560: beq   v0, zero, 0x1046598 addiu v0, zero, 60
 	ldloc 5
 	ldc.i4.s 60
 	stloc 5
-	brfalse L_1046588
+	brfalse L_1046598
 // --- basic block ---
-// 0x01046558: 0x1046558: div   s0, v0
+// 0x01046568: 0x1046568: div   s0, v0
 	ldloc 8
 	ldloc 5
 	div
 	stloc 11
-// 0x0104655c: 0x104655c: lui   a1, 0x10000
+// 0x0104656c: 0x104656c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046560: 0x1046560: lui   a3, 0x10000
+// 0x01046570: 0x1046570: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046564: 0x1046564: addiu a1, a1, -576
+// 0x01046574: 0x1046574: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046568: 0x1046568: addiu a3, a3, -340
+// 0x01046578: 0x1046578: addiu a3, a3, -344
 	ldloc 4
-	ldc.i4 -340
+	ldc.i4 -344
 	add
 	stloc 4
-// 0x0104656c: 0x104656c: addiu a0, zero, 1
+// 0x0104657c: 0x104657c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01046570: 0x1046570: addiu a2, zero, 1457
+// 0x01046580: 0x1046580: addiu a2, zero, 1457
 	ldc.i4 1457
 	stloc.3
-// 0x01046574: 0x1046574: mflo  lo
+// 0x01046584: 0x1046584: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x01046578: 0x1046578: jal   0x100449c sw    v0, 16(sp)
+// 0x01046588: 0x1046588: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6509,38 +6509,38 @@ L_1046534:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01046580: 0x1046580: j	 0x1046640 lui   v0, 0x60000
+// 0x01046590: 0x1046590: j	 0x1046650 lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-	br L_1046640
+	br L_1046650
 // --- basic block ---
-L_1046588:
-// 0x01046588: 0x1046588: jal   0x1030c08 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+L_1046598:
+// 0x01046598: 0x1046598: jal   0x1030c18 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x01046590: 0x1046590: addiu v1, zero, 1
+// 0x010465a0: 0x10465a0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01046594: 0x1046594: beq   v0, v1, 0x1046664 lui   a0, 0x20000
+// 0x010465a4: 0x10465a4: beq   v0, v1, 0x1046674 lui   a0, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc.1
-	beq  L_1046664
+	beq  L_1046674
 // --- basic block ---
-// 0x0104659c: 0x104659c: jal   0x1030c08 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+// 0x010465ac: 0x10465ac: jal   0x1030c18 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x010465a4: 0x10465a4: beq   v0, zero, 0x1046660 sll   zero, zero, 0
+// 0x010465b4: 0x10465b4: beq   v0, zero, 0x1046670 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1046660
+	brfalse L_1046670
 // --- basic block ---
-// 0x010465ac: 0x10465ac: lui   a0, 0x10000
+// 0x010465bc: 0x10465bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010465b0: 0x10465b0: jal   0x101df50 addiu a0, a0, -31052
+// 0x010465c0: 0x10465c0: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -6550,43 +6550,43 @@ L_1046588:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010465b8: 0x10465b8: addiu v1, zero, 1
+// 0x010465c8: 0x10465c8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_10465bc:
-// 0x010465bc: 0x10465bc: beq   v0, zero, 0x10465ec sll   zero, zero, 0
+L_10465cc:
+// 0x010465cc: 0x10465cc: beq   v0, zero, 0x10465fc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10465ec
+	brfalse L_10465fc
 // --- basic block ---
-// 0x010465c4: 0x10465c4: lui   a0, 0x2120000
+// 0x010465d4: 0x10465d4: lui   a0, 0x2120000
 	ldc.i4 34734080
 	stloc.1
-// 0x010465c8: 0x10465c8: lw    a1, 0(v0)
+// 0x010465d8: 0x10465d8: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010465cc: 0x10465cc: ori   a0, a0, 60730
+// 0x010465dc: 0x10465dc: ori   a0, a0, 60730
 	ldloc.1
 	ldc.i4 60730
 	or
 	stloc.1
-// 0x010465d0: 0x10465d0: bne   a1, a0, 0x10465fc sll   zero, zero, 0
+// 0x010465e0: 0x10465e0: bne   a1, a0, 0x104660c sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_10465fc
+	bne.un L_104660c
 // --- basic block ---
-// 0x010465d8: 0x10465d8: lui   a0, 0x1e90000
+// 0x010465e8: 0x10465e8: lui   a0, 0x1e90000
 	ldc.i4 32047104
 	stloc.1
-// 0x010465dc: 0x10465dc: lw    a1, 4(v0)
+// 0x010465ec: 0x10465ec: lw    a1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6595,21 +6595,21 @@ L_10465bc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010465e0: 0x10465e0: ori   a0, a0, 58906
+// 0x010465f0: 0x10465f0: ori   a0, a0, 58906
 	ldloc.1
 	ldc.i4 58906
 	or
 	stloc.1
-// 0x010465e4: 0x10465e4: bne   a1, a0, 0x10465fc sll   zero, zero, 0
+// 0x010465f4: 0x10465f4: bne   a1, a0, 0x104660c sll   zero, zero, 0
 	ldloc.2
 	ldloc.1
-	bne.un L_10465fc
+	bne.un L_104660c
 // --- basic block ---
-L_10465ec:
-// 0x010465ec: 0x10465ec: addiu v0, zero, -1
+L_10465fc:
+// 0x010465fc: 0x10465fc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010465f0: 0x10465f0: sw    v0, 32(sp)
+// 0x01046600: 0x1046600: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6618,7 +6618,7 @@ L_10465ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010465f4: 0x10465f4: sw    v0, 36(sp)
+// 0x01046604: 0x1046604: sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6627,13 +6627,13 @@ L_10465ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010465f8: 0x10465f8: addiu v0, sp, 32
+// 0x01046608: 0x1046608: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-L_10465fc:
-// 0x010465fc: 0x10465fc: lw    a0, 4(v0)
+L_104660c:
+// 0x0104660c: 0x104660c: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6642,10 +6642,10 @@ L_10465fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046600: 0x1046600: lui   a1, 0x10000
+// 0x01046610: 0x1046610: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046604: 0x1046604: sw    a0, 16(sp)
+// 0x01046614: 0x1046614: sw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6654,33 +6654,33 @@ L_10465fc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01046608: 0x1046608: lw    t0, 0(v0)
+// 0x01046618: 0x1046618: lw    t0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0104660c: 0x104660c: lui   a3, 0x10000
+// 0x0104661c: 0x104661c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046610: 0x1046610: addiu a0, zero, 2
+// 0x01046620: 0x1046620: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01046614: 0x1046614: addiu a1, a1, -576
+// 0x01046624: 0x1046624: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046618: 0x1046618: addiu a3, a3, -268
+// 0x01046628: 0x1046628: addiu a3, a3, -272
 	ldloc 4
-	ldc.i4 -268
+	ldc.i4 -272
 	add
 	stloc 4
-// 0x0104661c: 0x104661c: addiu a2, zero, 1478
+// 0x0104662c: 0x104662c: addiu a2, zero, 1478
 	ldc.i4 1478
 	stloc.3
-// 0x01046620: 0x1046620: sw    v0, 40(sp)
+// 0x01046630: 0x1046630: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6689,7 +6689,7 @@ L_10465fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01046624: 0x1046624: sw    t0, 20(sp)
+// 0x01046634: 0x1046634: sw    t0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6698,7 +6698,7 @@ L_10465fc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01046628: 0x1046628: jal   0x100449c sw    v1, 24(sp)
+// 0x01046638: 0x1046638: jal   0x100449c sw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6717,7 +6717,7 @@ L_10465fc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01046630: 0x1046630: lw    v0, 40(sp)
+// 0x01046640: 0x1046640: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6726,7 +6726,7 @@ L_10465fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046634: 0x1046634: jal   0x106cb10 addu  a0, v0, zero
+// 0x01046644: 0x1046644: jal   0x106d134 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6734,30 +6734,30 @@ L_10465fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_TripServer_FindTrip_106cb10(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TripServer_FindTrip_106d134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104663c: 0x104663c: lui   v0, 0x60000
+// 0x0104664c: 0x104664c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_1046640:
-// 0x01046640: 0x1046640: lw    v0, 20304(v0)
+L_1046650:
+// 0x01046650: 0x1046650: lw    v0, 20768(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5076
+	ldc.i4 5192
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046644: 0x1046644: sll   zero, zero, 0
-// 0x01046648: 0x1046648: beq   v0, zero, 0x1046674 sll   zero, zero, 0
+// 0x01046654: 0x1046654: sll   zero, zero, 0
+// 0x01046658: 0x1046658: beq   v0, zero, 0x1046684 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1046674
+	brfalse L_1046684
 // --- basic block ---
-// 0x01046650: 0x1046650: jalr  v0 sll   zero, zero, 0
+// 0x01046660: 0x1046660: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -6769,17 +6769,17 @@ L_1046640:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01046658: 0x1046658: j	 0x1046674 sll   zero, zero, 0
-	br L_1046674
+// 0x01046668: 0x1046668: j	 0x1046684 sll   zero, zero, 0
+	br L_1046684
 // --- basic block ---
-L_1046660:
-// 0x01046660: 0x1046660: lui   a0, 0x20000
+L_1046670:
+// 0x01046670: 0x1046670: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_1046664:
-// 0x01046664: 0x1046664: jal   0x101df50 addiu a0, a0, 6792
+L_1046674:
+// 0x01046674: 0x1046674: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -6787,19 +6787,19 @@ L_1046664:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104666c: 0x104666c: j	 0x10465bc addu  v1, zero, zero
+// 0x0104667c: 0x104667c: j	 0x10465cc addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10465bc
+	br L_10465cc
 // --- basic block ---
-L_1046674:
-// 0x01046674: 0x1046674: lw    ra, 52(sp)
-// 0x01046678: 0x1046678: lw    s0, 48(sp)
+L_1046684:
+// 0x01046684: 0x1046684: lw    ra, 52(sp)
+// 0x01046688: 0x1046688: lw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6808,7 +6808,7 @@ L_1046674:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104667c: 0x104667c: jr    ra addiu sp, sp, 56
+// 0x0104668c: 0x104668c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl52.j b/converted/Cibyl52.j
index 03e2d14..493c31f 100644
--- a/converted/Cibyl52.j
+++ b/converted/Cibyl52.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl52::.ctor
 
-.method public static int32 roadmap_alternative_routes_suggested_trip_1046684(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_suggested_trip_1046694(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -76,21 +76,21 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046684: 0x1046684: lui   a1, 0x1050000
+// 0x01046694: 0x1046694: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x01046688: 0x1046688: addiu sp, sp, -24
+// 0x01046698: 0x1046698: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104668c: 0x104668c: addiu a1, a1, -32468
+// 0x0104669c: 0x104669c: addiu a1, a1, -32452
 	ldloc.2
-	ldc.i4 -32468
+	ldc.i4 -32452
 	add
 	stloc.2
-// 0x01046690: 0x1046690: sw    ra, 20(sp)
-// 0x01046694: 0x1046694: jal   0x104fe98 addiu a0, zero, 200
+// 0x010466a0: 0x10466a0: sw    ra, 20(sp)
+// 0x010466a4: 0x10466a4: jal   0x104fea8 addiu a0, zero, 200
 	ldc.i4 200
 	stloc.1
 	ldloc.0
@@ -98,14 +98,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104669c: 0x104669c: lw    ra, 20(sp)
-// 0x010466a0: 0x10466a0: sll   zero, zero, 0
-// 0x010466a4: 0x10466a4: jr    ra addiu sp, sp, 24
+// 0x010466ac: 0x10466ac: lw    ra, 20(sp)
+// 0x010466b0: 0x10466b0: sll   zero, zero, 0
+// 0x010466b4: 0x10466b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -117,7 +117,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_suggest_dlg_close_10466ac(int32,int32,int32,int32,int32)
+.method public static int32 on_suggest_dlg_close_10466bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -152,18 +152,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010466ac: 0x10466ac: lui   a0, 0x1040000
+// 0x010466bc: 0x10466bc: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x010466b0: 0x10466b0: addiu sp, sp, -24
+// 0x010466c0: 0x10466c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010466b4: 0x10466b4: sw    ra, 20(sp)
-// 0x010466b8: 0x10466b8: jal   0x104fd00 addiu a0, a0, 30880
+// 0x010466c4: 0x10466c4: sw    ra, 20(sp)
+// 0x010466c8: 0x10466c8: jal   0x104fd10 addiu a0, a0, 30896
 	ldloc.1
-	ldc.i4 30880
+	ldc.i4 30896
 	add
 	stloc.1
 	ldloc.0
@@ -171,14 +171,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010466c0: 0x10466c0: lw    ra, 20(sp)
-// 0x010466c4: 0x10466c4: sll   zero, zero, 0
-// 0x010466c8: 0x10466c8: jr    ra addiu sp, sp, 24
+// 0x010466d0: 0x10466d0: lw    ra, 20(sp)
+// 0x010466d4: 0x10466d4: sll   zero, zero, 0
+// 0x010466d8: 0x10466d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -190,7 +190,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_alternative_routes_routes_dialog_10466d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_routes_dialog_10466e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s5,int32 s3,int32 s6,int32 s2,int32 s7,int32 s4,int32 s8,int32 t0,int32 ra,int32 hi,int32 lo)
@@ -261,13 +261,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010466d0: 0x10466d0: addiu sp, sp, -104
+// 0x010466e0: 0x10466e0: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x010466d4: 0x10466d4: sw    ra, 100(sp)
-// 0x010466d8: 0x10466d8: sw    s4, 80(sp)
+// 0x010466e4: 0x10466e4: sw    ra, 100(sp)
+// 0x010466e8: 0x10466e8: sw    s4, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -276,7 +276,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010466dc: 0x10466dc: sw    s1, 68(sp)
+// 0x010466ec: 0x10466ec: sw    s1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -285,7 +285,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010466e0: 0x10466e0: sw    s8, 96(sp)
+// 0x010466f0: 0x10466f0: sw    s8, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -294,7 +294,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010466e4: 0x10466e4: sw    s7, 92(sp)
+// 0x010466f4: 0x10466f4: sw    s7, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -303,7 +303,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010466e8: 0x10466e8: sw    s6, 88(sp)
+// 0x010466f8: 0x10466f8: sw    s6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -312,7 +312,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010466ec: 0x10466ec: sw    s5, 84(sp)
+// 0x010466fc: 0x10466fc: sw    s5, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -321,7 +321,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010466f0: 0x10466f0: sw    s3, 76(sp)
+// 0x01046700: 0x1046700: sw    s3, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -330,7 +330,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010466f4: 0x10466f4: sw    s2, 72(sp)
+// 0x01046704: 0x1046704: sw    s2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -339,7 +339,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010466f8: 0x10466f8: sw    s0, 64(sp)
+// 0x01046708: 0x1046708: sw    s0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -348,35 +348,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010466fc: 0x10466fc: jal   0x108e568 lui   s1, 0x10000
+// 0x0104670c: 0x104670c: jal   0x108eb8c lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 6
 // --- basic block ---
-// 0x01046704: 0x1046704: lui   a3, 0x10000
+// 0x01046714: 0x1046714: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046708: 0x1046708: addu  s4, v0, zero
+// 0x01046718: 0x1046718: addu  s4, v0, zero
 	ldloc 6
 	stloc 15
-// 0x0104670c: 0x104670c: addiu a3, a3, -192
+// 0x0104671c: 0x104671c: addiu a3, a3, -196
 	ldloc 4
-	ldc.i4 -192
+	ldc.i4 -196
 	add
 	stloc 4
-// 0x01046710: 0x1046710: addiu a0, zero, 2
+// 0x01046720: 0x1046720: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01046714: 0x1046714: addiu a1, s1, -576
+// 0x01046724: 0x1046724: addiu a1, s1, -580
 	ldloc 8
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046718: 0x1046718: addiu a2, zero, 1528
+// 0x01046728: 0x1046728: addiu a2, zero, 1528
 	ldc.i4 1528
 	stloc.3
-// 0x0104671c: 0x104671c: jal   0x100449c sw    v0, 16(sp)
+// 0x0104672c: 0x104672c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -395,60 +395,60 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01046724: 0x1046724: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x01046734: 0x1046734: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104672c: 0x104672c: beq   s4, zero, 0x1046750 lui   s0, 0x60000
+// 0x0104673c: 0x104673c: beq   s4, zero, 0x1046760 lui   s0, 0x60000
 	ldloc 15
 	ldc.i4 393216
 	stloc 9
-	brfalse L_1046750
+	brfalse L_1046760
 // --- basic block ---
-// 0x01046734: 0x1046734: addiu s0, s0, 14128
+// 0x01046744: 0x1046744: addiu s0, s0, 14592
 	ldloc 9
-	ldc.i4 14128
+	ldc.i4 14592
 	add
 	stloc 9
-// 0x01046738: 0x1046738: lui   s8, 0x10000
+// 0x01046748: 0x1046748: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x0104673c: 0x104673c: addiu s8, s8, -32
+// 0x0104674c: 0x104674c: addiu s8, s8, -36
 	ldloc 16
-	ldc.i4.s -32
+	ldc.i4.s -36
 	add
 	stloc 16
-// 0x01046740: 0x1046740: addu  s1, zero, zero
+// 0x01046750: 0x1046750: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01046744: 0x1046744: addu  s3, s0, zero
+// 0x01046754: 0x1046754: addu  s3, s0, zero
 	ldloc 9
 	stloc 11
-// 0x01046748: 0x1046748: j	 0x10468e8 addiu t0, zero, 616
+// 0x01046758: 0x1046758: j	 0x10468f8 addiu t0, zero, 616
 	ldc.i4 616
 	stloc 17
-	br L_10468e8
+	br L_10468f8
 // --- basic block ---
-L_1046750:
-// 0x01046750: 0x1046750: lui   a3, 0x10000
+L_1046760:
+// 0x01046760: 0x1046760: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046754: 0x1046754: addiu a1, s1, -576
+// 0x01046764: 0x1046764: addiu a1, s1, -580
 	ldloc 8
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046758: 0x1046758: addiu a3, a3, -104
+// 0x01046768: 0x1046768: addiu a3, a3, -108
 	ldloc 4
-	ldc.i4.s -104
+	ldc.i4.s -108
 	add
 	stloc 4
-// 0x0104675c: 0x104675c: addiu a0, zero, 4
+// 0x0104676c: 0x104676c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01046760: 0x1046760: jal   0x100449c addiu a2, zero, 1534
+// 0x01046770: 0x1046770: jal   0x100449c addiu a2, zero, 1534
 	ldc.i4 1534
 	stloc.3
 	ldloc.0
@@ -461,19 +461,19 @@ L_1046750:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01046768: 0x1046768: j	 0x104691c sll   zero, zero, 0
-	br L_104691c
+// 0x01046778: 0x1046778: j	 0x104692c sll   zero, zero, 0
+	br L_104692c
 // --- basic block ---
-L_1046770:
-// 0x01046770: 0x1046770: mult  s1, t0
+L_1046780:
+// 0x01046780: 0x1046780: mult  s1, t0
 	ldloc 8
 	ldloc 17
 	mul
 	stloc 20
-// 0x01046774: 0x1046774: mflo  lo
+// 0x01046784: 0x1046784: mflo  lo
 	ldloc 20
 	stloc 10
-// 0x01046778: 0x1046778: jal   0x108e54c sw    t0, 56(sp)
+// 0x01046788: 0x1046788: jal   0x108eb70 sw    t0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -483,17 +483,17 @@ L_1046770:
 	ldloc 17
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Route_Result_108e54c(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Route_Result_108eb70(int32)
 	stloc 6
 // --- basic block ---
-// 0x01046780: 0x1046780: sw    s1, 0(s0)
+// 0x01046790: 0x1046790: sw    s1, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01046784: 0x1046784: lw    a0, 4(v0)
+// 0x01046794: 0x1046794: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -502,14 +502,14 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046788: 0x1046788: jal   0x1007df4 addu  s2, v0, zero
+// 0x01046798: 0x1046798: jal   0x1007e04 addu  s2, v0, zero
 	ldloc 6
 	stloc 13
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 6
 // --- basic block ---
-// 0x01046790: 0x1046790: lw    a0, 4(s2)
+// 0x010467a0: 0x10467a0: lw    a0, 4(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -518,7 +518,7 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046794: 0x1046794: jal   0x1007e18 sw    v0, 52(sp)
+// 0x010467a4: 0x10467a4: jal   0x1007e28 sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -528,18 +528,18 @@ L_1046770:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104679c: 0x104679c: jal   0x1007d84 addu  s6, v0, zero
+// 0x010467ac: 0x10467ac: jal   0x1007d94 addu  s6, v0, zero
 	ldloc 6
 	stloc 12
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 6
 // --- basic block ---
-// 0x010467a4: 0x10467a4: jal   0x101cd60 addu  a0, v0, zero
+// 0x010467b4: 0x10467b4: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -547,15 +547,15 @@ L_1046770:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010467ac: 0x10467ac: addiu a0, zero, 10
+// 0x010467bc: 0x10467bc: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x010467b0: 0x10467b0: div   s6, a0
+// 0x010467c0: 0x10467c0: div   s6, a0
 	ldloc 12
 	ldloc.1
 	ldloc 12
@@ -564,12 +564,12 @@ L_1046770:
 	stloc 20
 	rem
 	stloc 19
-// 0x010467b4: 0x10467b4: addu  s7, s3, s5
+// 0x010467c4: 0x10467c4: addu  s7, s3, s5
 	ldloc 11
 	ldloc 10
 	add
 	stloc 14
-// 0x010467b8: 0x10467b8: lw    a3, 52(sp)
+// 0x010467c8: 0x10467c8: lw    a3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -578,26 +578,26 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010467bc: 0x10467bc: addiu s7, s7, 4
+// 0x010467cc: 0x10467cc: addiu s7, s7, 4
 	ldloc 14
 	ldc.i4.4
 	add
 	stloc 14
-// 0x010467c0: 0x10467c0: lui   a2, 0x10000
+// 0x010467d0: 0x10467d0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010467c4: 0x10467c4: addiu a1, zero, 200
+// 0x010467d4: 0x10467d4: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x010467c8: 0x10467c8: addiu a2, a2, -44
+// 0x010467d8: 0x10467d8: addiu a2, a2, -48
 	ldloc.3
-	ldc.i4.s -44
+	ldc.i4.s -48
 	add
 	stloc.3
-// 0x010467cc: 0x10467cc: addu  a0, s7, zero
+// 0x010467dc: 0x10467dc: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x010467d0: 0x10467d0: sw    v0, 20(sp)
+// 0x010467e0: 0x10467e0: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -606,20 +606,20 @@ L_1046770:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010467d4: 0x10467d4: addu  s6, s3, s5
+// 0x010467e4: 0x10467e4: addu  s6, s3, s5
 	ldloc 11
 	ldloc 10
 	add
 	stloc 12
-// 0x010467d8: 0x10467d8: addiu s6, s6, 204
+// 0x010467e8: 0x10467e8: addiu s6, s6, 204
 	ldloc 12
 	ldc.i4 204
 	add
 	stloc 12
-// 0x010467dc: 0x10467dc: mfhi  hi
+// 0x010467ec: 0x10467ec: mfhi  hi
 	ldloc 19
 	stloc 7
-// 0x010467e0: 0x10467e0: jal   0x1000f9c sw    v1, 16(sp)
+// 0x010467f0: 0x10467f0: jal   0x1000f9c sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -638,7 +638,7 @@ L_1046770:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010467e8: 0x10467e8: lw    a0, 8(s2)
+// 0x010467f8: 0x10467f8: lw    a0, 8(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -647,26 +647,26 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010467ec: 0x10467ec: jal   0x10c09c0 sll   zero, zero, 0
+// 0x010467fc: 0x10467fc: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010467f4: 0x10467f4: addu  a0, v0, zero
+// 0x01046804: 0x1046804: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010467f8: 0x10467f8: lui   v0, 0x20000
+// 0x01046808: 0x1046808: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010467fc: 0x10467fc: addiu v0, v0, 23880
+// 0x0104680c: 0x104680c: addiu v0, v0, 24344
 	ldloc 6
-	ldc.i4 23880
+	ldc.i4 24344
 	add
 	stloc 6
-// 0x01046800: 0x1046800: lw    a3, 4(v0)
+// 0x01046810: 0x1046810: lw    a3, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -675,14 +675,14 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01046804: 0x1046804: lw    a2, 0(v0)
+// 0x01046814: 0x1046814: lw    a2, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01046808: 0x1046808: jal   0x10c0798 addu  a1, v1, zero
+// 0x01046818: 0x1046818: jal   0x10c0dd8 addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -690,29 +690,29 @@ L_1046770:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01046810: 0x1046810: addu  a1, v1, zero
+// 0x01046820: 0x1046820: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01046814: 0x1046814: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01046824: 0x1046824: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104681c: 0x104681c: addu  a0, s8, zero
+// 0x0104682c: 0x104682c: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x01046820: 0x1046820: jal   0x101cd60 sw    v0, 52(sp)
+// 0x01046830: 0x1046830: jal   0x101cd70 sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -726,12 +726,12 @@ L_1046770:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01046828: 0x1046828: lw    a3, 52(sp)
+// 0x01046838: 0x1046838: lw    a3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -740,21 +740,21 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104682c: 0x104682c: lui   a2, 0x20000
+// 0x0104683c: 0x104683c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01046830: 0x1046830: addiu a1, zero, 200
+// 0x01046840: 0x1046840: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x01046834: 0x1046834: addiu a2, a2, 22696
+// 0x01046844: 0x1046844: addiu a2, a2, 23156
 	ldloc.3
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.3
-// 0x01046838: 0x1046838: addu  a0, s6, zero
+// 0x01046848: 0x1046848: addu  a0, s6, zero
 	ldloc 12
 	stloc.1
-// 0x0104683c: 0x104683c: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0104684c: 0x104684c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -773,25 +773,25 @@ L_1046770:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01046844: 0x1046844: addu  v0, s3, s5
+// 0x01046854: 0x1046854: addu  v0, s3, s5
 	ldloc 11
 	ldloc 10
 	add
 	stloc 6
-// 0x01046848: 0x1046848: lui   a0, 0x10000
+// 0x01046858: 0x1046858: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104684c: 0x104684c: addiu a0, a0, -24
+// 0x0104685c: 0x104685c: addiu a0, a0, -28
 	ldloc.1
-	ldc.i4.s -24
+	ldc.i4.s -28
 	add
 	stloc.1
-// 0x01046850: 0x1046850: addiu v0, v0, 404
+// 0x01046860: 0x1046860: addiu v0, v0, 404
 	ldloc 6
 	ldc.i4 404
 	add
 	stloc 6
-// 0x01046854: 0x1046854: jal   0x101cd60 sw    v0, 48(sp)
+// 0x01046864: 0x1046864: jal   0x101cd70 sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -805,12 +805,12 @@ L_1046770:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104685c: 0x104685c: lw    a0, 20(s2)
+// 0x0104686c: 0x104686c: lw    a0, 20(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -819,7 +819,7 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046860: 0x1046860: jal   0x101cd60 sw    v0, 52(sp)
+// 0x01046870: 0x1046870: jal   0x101cd70 sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -833,12 +833,12 @@ L_1046770:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01046868: 0x1046868: lw    a3, 52(sp)
+// 0x01046878: 0x1046878: lw    a3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -847,7 +847,7 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104686c: 0x104686c: lw    a0, 48(sp)
+// 0x0104687c: 0x104687c: lw    a0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -856,18 +856,18 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046870: 0x1046870: lui   a2, 0x10000
+// 0x01046880: 0x1046880: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01046874: 0x1046874: addiu a1, zero, 200
+// 0x01046884: 0x1046884: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x01046878: 0x1046878: addiu a2, a2, -20
+// 0x01046888: 0x1046888: addiu a2, a2, -24
 	ldloc.3
-	ldc.i4.s -20
+	ldc.i4.s -24
 	add
 	stloc.3
-// 0x0104687c: 0x104687c: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0104688c: 0x104688c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -886,14 +886,14 @@ L_1046770:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01046884: 0x1046884: lw    v1, 0(s0)
+// 0x01046894: 0x1046894: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01046888: 0x1046888: lw    v0, 28(s2)
+// 0x01046898: 0x1046898: lw    v0, 28(s2)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -902,12 +902,12 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104688c: 0x104688c: addiu s5, s5, 608
+// 0x0104689c: 0x104689c: addiu s5, s5, 608
 	ldloc 10
 	ldc.i4 608
 	add
 	stloc 10
-// 0x01046890: 0x1046890: sw    v1, 20(sp)
+// 0x010468a0: 0x10468a0: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -916,10 +916,10 @@ L_1046770:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01046894: 0x1046894: lui   a1, 0x10000
+// 0x010468a4: 0x10468a4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046898: 0x1046898: lw    v1, 48(sp)
+// 0x010468a8: 0x10468a8: lw    v1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -928,31 +928,31 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104689c: 0x104689c: lui   a3, 0x10000
+// 0x010468ac: 0x10468ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010468a0: 0x10468a0: addu  s5, s3, s5
+// 0x010468b0: 0x10468b0: addu  s5, s3, s5
 	ldloc 11
 	ldloc 10
 	add
 	stloc 10
-// 0x010468a4: 0x10468a4: addiu a0, zero, 2
+// 0x010468b4: 0x10468b4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010468a8: 0x10468a8: addiu a1, a1, -576
+// 0x010468b8: 0x10468b8: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x010468ac: 0x10468ac: addiu a2, zero, 1553
+// 0x010468bc: 0x10468bc: addiu a2, zero, 1553
 	ldc.i4 1553
 	stloc.3
-// 0x010468b0: 0x10468b0: addiu a3, a3, -12
+// 0x010468c0: 0x10468c0: addiu a3, a3, -16
 	ldloc 4
-	ldc.i4.s -12
+	ldc.i4.s -16
 	add
 	stloc 4
-// 0x010468b4: 0x10468b4: sw    s1, 608(s0)
+// 0x010468c4: 0x10468c4: sw    s1, 608(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -961,7 +961,7 @@ L_1046770:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010468b8: 0x10468b8: sw    s2, 612(s0)
+// 0x010468c8: 0x10468c8: sw    s2, 612(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -970,7 +970,7 @@ L_1046770:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010468bc: 0x10468bc: sw    v0, 604(s0)
+// 0x010468cc: 0x10468cc: sw    v0, 604(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -979,7 +979,7 @@ L_1046770:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010468c0: 0x10468c0: sw    s1, 16(sp)
+// 0x010468d0: 0x10468d0: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -988,7 +988,7 @@ L_1046770:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010468c4: 0x10468c4: sw    s7, 24(sp)
+// 0x010468d4: 0x10468d4: sw    s7, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -997,7 +997,7 @@ L_1046770:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010468c8: 0x10468c8: sw    s6, 28(sp)
+// 0x010468d8: 0x10468d8: sw    s6, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1006,7 +1006,7 @@ L_1046770:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010468cc: 0x10468cc: sw    v1, 32(sp)
+// 0x010468dc: 0x10468dc: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1015,7 +1015,7 @@ L_1046770:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010468d0: 0x10468d0: sw    v0, 36(sp)
+// 0x010468e0: 0x10468e0: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1024,7 +1024,7 @@ L_1046770:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010468d4: 0x10468d4: jal   0x100449c sw    s5, 40(sp)
+// 0x010468e4: 0x10468e4: jal   0x100449c sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1043,7 +1043,7 @@ L_1046770:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010468dc: 0x10468dc: lw    t0, 56(sp)
+// 0x010468ec: 0x10468ec: lw    t0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1052,60 +1052,60 @@ L_1046770:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010468e0: 0x10468e0: addiu s1, s1, 1
+// 0x010468f0: 0x10468f0: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010468e4: 0x10468e4: addiu s0, s0, 616
+// 0x010468f4: 0x10468f4: addiu s0, s0, 616
 	ldloc 9
 	ldc.i4 616
 	add
 	stloc 9
-L_10468e8:
-// 0x010468e8: 0x10468e8: slt   v0, s1, s4
+L_10468f8:
+// 0x010468f8: 0x10468f8: slt   v0, s1, s4
 	ldloc 8
 	ldloc 15
 	clt
 	stloc 6
-// 0x010468ec: 0x10468ec: bne   v0, zero, 0x1046770 addu  a0, s1, zero
+// 0x010468fc: 0x10468fc: bne   v0, zero, 0x1046780 addu  a0, s1, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
-	brtrue L_1046770
+	brtrue L_1046780
 // --- basic block ---
-// 0x010468f4: 0x10468f4: lui   a0, 0x1050000
+// 0x01046904: 0x1046904: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x010468f8: 0x10468f8: lui   v1, 0x1040000
+// 0x01046908: 0x1046908: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 7
-// 0x010468fc: 0x10468fc: addiu a0, a0, -30960
+// 0x0104690c: 0x104690c: addiu a0, a0, -30944
 	ldloc.1
-	ldc.i4 -30960
+	ldc.i4 -30944
 	add
 	stloc.1
-// 0x01046900: 0x1046900: addiu v1, v1, 27856
+// 0x01046910: 0x1046910: addiu v1, v1, 27872
 	ldloc 7
-	ldc.i4 27856
+	ldc.i4 27872
 	add
 	stloc 7
-// 0x01046904: 0x1046904: cibyl_sysc_arg 0x14
+// 0x01046914: 0x1046914: cibyl_sysc_arg 0x14
 	ldloc 15
-// 0x01046908: 0x1046908: cibyl_sysc_arg 0x13
+// 0x01046918: 0x1046918: cibyl_sysc_arg 0x13
 	ldloc 11
-// 0x0104690c: 0x104690c: cibyl_sysc_arg 0x3
+// 0x0104691c: 0x104691c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01046910: 0x1046910: cibyl_sysc_arg 0x4
+// 0x01046920: 0x1046920: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01046914: 0x1046914: cibyl_sysc 0x6c7
+// 0x01046924: 0x1046924: cibyl_sysc 0x6c7
 	call void [WazeWP7]Syscalls::NOPH_AlternativeResultsDialog_showDialog(int32,int32,int32,int32)
-// 0x01046918: 0x1046918: addu  s3, v0, zero
+// 0x01046928: 0x1046928: addu  s3, v0, zero
 	ldloc 6
 	stloc 11
-L_104691c:
-// 0x0104691c: 0x104691c: lw    ra, 100(sp)
-// 0x01046920: 0x1046920: lw    s8, 96(sp)
+L_104692c:
+// 0x0104692c: 0x104692c: lw    ra, 100(sp)
+// 0x01046930: 0x1046930: lw    s8, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1114,7 +1114,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01046924: 0x1046924: lw    s7, 92(sp)
+// 0x01046934: 0x1046934: lw    s7, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01046928: 0x1046928: lw    s6, 88(sp)
+// 0x01046938: 0x1046938: lw    s6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1132,7 +1132,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104692c: 0x104692c: lw    s5, 84(sp)
+// 0x0104693c: 0x104693c: lw    s5, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1141,7 +1141,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01046930: 0x1046930: lw    s4, 80(sp)
+// 0x01046940: 0x1046940: lw    s4, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1150,7 +1150,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01046934: 0x1046934: lw    s3, 76(sp)
+// 0x01046944: 0x1046944: lw    s3, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1159,7 +1159,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01046938: 0x1046938: lw    s2, 72(sp)
+// 0x01046948: 0x1046948: lw    s2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1168,7 +1168,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104693c: 0x104693c: lw    s1, 68(sp)
+// 0x0104694c: 0x104694c: lw    s1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1177,7 +1177,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01046940: 0x1046940: lw    s0, 64(sp)
+// 0x01046950: 0x1046950: lw    s0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1186,7 +1186,7 @@ L_104691c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01046944: 0x1046944: jr    ra addiu sp, sp, 104
+// 0x01046954: 0x1046954: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -1198,7 +1198,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 suggest_route_dialog_close_104694c(int32,int32,int32,int32,int32)
+.method public static int32 suggest_route_dialog_close_104695c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -1236,24 +1236,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104694c: 0x104694c: lui   v0, 0x60000
+// 0x0104695c: 0x104695c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01046950: 0x1046950: lw    v0, 20288(v0)
+// 0x01046960: 0x1046960: lw    v0, 20752(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5072
+	ldc.i4 5188
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046954: 0x1046954: addiu sp, sp, -24
+// 0x01046964: 0x1046964: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01046958: 0x1046958: sw    s0, 16(sp)
+// 0x01046968: 0x1046968: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1262,19 +1262,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104695c: 0x104695c: sw    ra, 20(sp)
-// 0x01046960: 0x1046960: beq   v0, zero, 0x1046974 addu  s0, a0, zero
+// 0x0104696c: 0x104696c: sw    ra, 20(sp)
+// 0x01046970: 0x1046970: beq   v0, zero, 0x1046984 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_1046974
+	brfalse L_1046984
 // --- basic block ---
-// 0x01046968: 0x1046968: lui   a0, 0x1040000
+// 0x01046978: 0x1046978: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0104696c: 0x104696c: jal   0x104fd00 addiu a0, a0, 27584
+// 0x0104697c: 0x104697c: jal   0x104fd10 addiu a0, a0, 27600
 	ldloc.1
-	ldc.i4 27584
+	ldc.i4 27600
 	add
 	stloc.1
 	ldloc.0
@@ -1282,32 +1282,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1046974:
-// 0x01046974: 0x1046974: lui   a0, 0x10000
+L_1046984:
+// 0x01046984: 0x1046984: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01046978: 0x1046978: lui   v0, 0x60000
+// 0x01046988: 0x1046988: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104697c: 0x104697c: addiu a0, a0, -604
+// 0x0104698c: 0x104698c: addiu a0, a0, -608
 	ldloc.1
-	ldc.i4 -604
+	ldc.i4 -608
 	add
 	stloc.1
-// 0x01046980: 0x1046980: addiu a1, zero, 1
+// 0x01046990: 0x1046990: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01046984: 0x1046984: jal   0x1094884 sw    zero, 20288(v0)
+// 0x01046994: 0x1046994: jal   0x1094ff4 sw    zero, 20752(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5072
+	ldc.i4 5188
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1316,18 +1316,18 @@ L_1046974:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104698c: 0x104698c: bne   s0, zero, 0x10469b0 lui   a0, 0x10000
+// 0x0104699c: 0x104699c: bne   s0, zero, 0x10469c0 lui   a0, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc.1
-	brtrue L_10469b0
+	brtrue L_10469c0
 // --- basic block ---
-// 0x01046994: 0x1046994: jal   0x101f044 addiu a0, a0, -29748
+// 0x010469a4: 0x10469a4: jal   0x101f054 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -1337,15 +1337,15 @@ L_1046974:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104699c: 0x104699c: lui   a0, 0x10000
+// 0x010469ac: 0x10469ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010469a0: 0x10469a0: jal   0x101f044 addiu a0, a0, -29760
+// 0x010469b0: 0x10469b0: jal   0x101f054 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -1355,36 +1355,36 @@ L_1046974:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010469a8: 0x10469a8: jal   0x105944c sll   zero, zero, 0
+// 0x010469b8: 0x10469b8: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10469b0:
-// 0x010469b0: 0x10469b0: jal   0x1021900 sll   zero, zero, 0
+L_10469c0:
+// 0x010469c0: 0x10469c0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010469b8: 0x10469b8: lw    ra, 20(sp)
-// 0x010469bc: 0x10469bc: lw    s0, 16(sp)
+// 0x010469c8: 0x10469c8: lw    ra, 20(sp)
+// 0x010469cc: 0x10469cc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1393,7 +1393,7 @@ L_10469b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010469c0: 0x10469c0: jr    ra addiu sp, sp, 24
+// 0x010469d0: 0x10469d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1405,7 +1405,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 route_select_10469c8(int32,int32,int32,int32,int32)
+.method public static int32 route_select_10469d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -1452,12 +1452,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010469c8: 0x10469c8: addiu sp, sp, -72
+// 0x010469d8: 0x10469d8: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010469cc: 0x10469cc: sw    s0, 52(sp)
+// 0x010469dc: 0x10469dc: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1466,13 +1466,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010469d0: 0x10469d0: addu  s0, a0, zero
+// 0x010469e0: 0x10469e0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010469d4: 0x10469d4: addu  a0, zero, zero
+// 0x010469e4: 0x10469e4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010469d8: 0x10469d8: sw    s2, 60(sp)
+// 0x010469e8: 0x10469e8: sw    s2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1481,8 +1481,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010469dc: 0x10469dc: sw    ra, 68(sp)
-// 0x010469e0: 0x10469e0: sw    s3, 64(sp)
+// 0x010469ec: 0x10469ec: sw    ra, 68(sp)
+// 0x010469f0: 0x10469f0: sw    s3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1491,7 +1491,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010469e4: 0x10469e4: jal   0x108e530 sw    s1, 56(sp)
+// 0x010469f4: 0x10469f4: jal   0x108eb54 sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1501,67 +1501,67 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x010469ec: 0x10469ec: bne   v0, zero, 0x1046a10 addu  s2, v0, zero
+// 0x010469fc: 0x10469fc: bne   v0, zero, 0x1046a20 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brtrue L_1046a10
+	brtrue L_1046a20
 // --- basic block ---
-// 0x010469f4: 0x10469f4: lui   a1, 0x10000
+// 0x01046a04: 0x1046a04: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010469f8: 0x10469f8: lui   a3, 0x10000
+// 0x01046a08: 0x1046a08: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010469fc: 0x10469fc: addiu a1, a1, -576
+// 0x01046a0c: 0x1046a0c: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046a00: 0x1046a00: addiu a3, a3, 92
+// 0x01046a10: 0x1046a10: addiu a3, a3, 88
 	ldloc 4
-	ldc.i4.s 92
+	ldc.i4.s 88
 	add
 	stloc 4
-// 0x01046a04: 0x1046a04: addiu a0, zero, 4
+// 0x01046a14: 0x1046a14: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01046a08: 0x1046a08: j	 0x1046a2c addiu a2, zero, 333
+// 0x01046a18: 0x1046a18: j	 0x1046a3c addiu a2, zero, 333
 	ldc.i4 333
 	stloc.3
-	br L_1046a2c
+	br L_1046a3c
 // --- basic block ---
-L_1046a10:
-// 0x01046a10: 0x1046a10: bne   s0, zero, 0x1046a3c lui   s3, 0x10000
+L_1046a20:
+// 0x01046a20: 0x1046a20: bne   s0, zero, 0x1046a4c lui   s3, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc 11
-	brtrue L_1046a3c
+	brtrue L_1046a4c
 // --- basic block ---
-// 0x01046a18: 0x1046a18: lui   a3, 0x10000
+// 0x01046a28: 0x1046a28: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046a1c: 0x1046a1c: addiu a1, s3, -576
+// 0x01046a2c: 0x1046a2c: addiu a1, s3, -580
 	ldloc 11
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046a20: 0x1046a20: addiu a3, a3, 128
+// 0x01046a30: 0x1046a30: addiu a3, a3, 124
 	ldloc 4
-	ldc.i4 128
+	ldc.i4.s 124
 	add
 	stloc 4
-// 0x01046a24: 0x1046a24: addiu a0, zero, 4
+// 0x01046a34: 0x1046a34: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01046a28: 0x1046a28: addiu a2, zero, 338
+// 0x01046a38: 0x1046a38: addiu a2, zero, 338
 	ldc.i4 338
 	stloc.3
-L_1046a2c:
-// 0x01046a2c: 0x1046a2c: jal   0x100449c sll   zero, zero, 0
+L_1046a3c:
+// 0x01046a3c: 0x1046a3c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1572,26 +1572,26 @@ L_1046a2c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046a34: 0x1046a34: j	 0x1046b14 addu  v0, zero, zero
+// 0x01046a44: 0x1046a44: j	 0x1046b24 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1046b14
+	br L_1046b24
 // --- basic block ---
-L_1046a3c:
-// 0x01046a3c: 0x1046a3c: addiu s1, v0, 780
+L_1046a4c:
+// 0x01046a4c: 0x1046a4c: addiu s1, v0, 780
 	ldloc 5
 	ldc.i4 780
 	add
 	stloc 9
-// 0x01046a40: 0x1046a40: lui   a0, 0x10000
+// 0x01046a50: 0x1046a50: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01046a44: 0x1046a44: addiu a0, a0, -29748
+// 0x01046a54: 0x1046a54: addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
 	stloc.1
-// 0x01046a48: 0x1046a48: jal   0x101f76c addu  a1, s1, zero
+// 0x01046a58: 0x1046a58: jal   0x101f77c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -1599,20 +1599,20 @@ L_1046a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046a50: 0x1046a50: lui   a0, 0x10000
+// 0x01046a60: 0x1046a60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01046a54: 0x1046a54: addiu a0, a0, -29760
+// 0x01046a64: 0x1046a64: addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
 	stloc.1
-// 0x01046a58: 0x1046a58: jal   0x101f76c addiu a1, s2, 772
+// 0x01046a68: 0x1046a68: jal   0x101f77c addiu a1, s2, 772
 	ldloc 10
 	ldc.i4 772
 	add
@@ -1622,12 +1622,12 @@ L_1046a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046a60: 0x1046a60: lw    v0, 4(s0)
+// 0x01046a70: 0x1046a70: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1636,10 +1636,10 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046a64: 0x1046a64: addu  a0, zero, zero
+// 0x01046a74: 0x1046a74: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01046a68: 0x1046a68: lw    a3, 16(v0)
+// 0x01046a78: 0x1046a78: lw    a3, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1648,7 +1648,7 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01046a6c: 0x1046a6c: lw    a1, 40(v0)
+// 0x01046a7c: 0x1046a7c: lw    a1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1657,7 +1657,7 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01046a70: 0x1046a70: lw    a2, 32(v0)
+// 0x01046a80: 0x1046a80: lw    a2, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1666,7 +1666,7 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01046a74: 0x1046a74: jal   0x1058c68 sw    zero, 16(sp)
+// 0x01046a84: 0x1046a84: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1680,19 +1680,19 @@ L_1046a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046a7c: 0x1046a7c: jal   0x1006bfc addiu a0, zero, -1
+// 0x01046a8c: 0x1046a8c: jal   0x1006c0c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01046a84: 0x1046a84: lw    v0, 4(s0)
+// 0x01046a94: 0x1046a94: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1701,8 +1701,8 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046a88: 0x1046a88: sll   zero, zero, 0
-// 0x01046a8c: 0x1046a8c: lw    a0, 16(v0)
+// 0x01046a98: 0x1046a98: sll   zero, zero, 0
+// 0x01046a9c: 0x1046a9c: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1711,18 +1711,18 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046a90: 0x1046a90: jal   0x1056e44 sll   zero, zero, 0
+// 0x01046aa0: 0x1046aa0: jal   0x1056e54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_main_set_route_1056e44(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_main_set_route_1056e54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046a98: 0x1046a98: lw    v0, 4(s0)
+// 0x01046aa8: 0x1046aa8: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1731,8 +1731,8 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046a9c: 0x1046a9c: sll   zero, zero, 0
-// 0x01046aa0: 0x1046aa0: lw    a0, 16(v0)
+// 0x01046aac: 0x1046aac: sll   zero, zero, 0
+// 0x01046ab0: 0x1046ab0: lw    a0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1741,18 +1741,18 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046aa4: 0x1046aa4: jal   0x1064074 sll   zero, zero, 0
+// 0x01046ab4: 0x1046ab4: jal   0x1064084 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_select_1064074(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_select_1064084(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046aac: 0x1046aac: jal   0x1094a94 addu  a0, zero, zero
+// 0x01046abc: 0x1046abc: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1760,12 +1760,12 @@ L_1046a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046ab4: 0x1046ab4: lw    v0, 816(s2)
+// 0x01046ac4: 0x1046ac4: lw    v0, 816(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1774,26 +1774,26 @@ L_1046a3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046ab8: 0x1046ab8: lui   a3, 0x10000
+// 0x01046ac8: 0x1046ac8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046abc: 0x1046abc: addiu a3, a3, 160
+// 0x01046acc: 0x1046acc: addiu a3, a3, 156
 	ldloc 4
-	ldc.i4 160
+	ldc.i4 156
 	add
 	stloc 4
-// 0x01046ac0: 0x1046ac0: addiu a2, zero, 349
+// 0x01046ad0: 0x1046ad0: addiu a2, zero, 349
 	ldc.i4 349
 	stloc.3
-// 0x01046ac4: 0x1046ac4: addiu a1, s3, -576
+// 0x01046ad4: 0x1046ad4: addiu a1, s3, -580
 	ldloc 11
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046ac8: 0x1046ac8: addiu a0, zero, 2
+// 0x01046ad8: 0x1046ad8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01046acc: 0x1046acc: jal   0x100449c sw    v0, 16(sp)
+// 0x01046adc: 0x1046adc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1812,10 +1812,10 @@ L_1046a3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046ad4: 0x1046ad4: lui   a0, 0x10000
+// 0x01046ae4: 0x1046ae4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01046ad8: 0x1046ad8: jal   0x101cd60 addiu a0, a0, -15872
+// 0x01046ae8: 0x1046ae8: jal   0x101cd70 addiu a0, a0, -15872
 	ldloc.1
 	ldc.i4 -15872
 	add
@@ -1825,27 +1825,27 @@ L_1046a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046ae0: 0x1046ae0: jal   0x104c3d0 addu  a0, v0, zero
+// 0x01046af0: 0x1046af0: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01046ae8: 0x1046ae8: addu  a0, s1, zero
+// 0x01046af8: 0x1046af8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01046aec: 0x1046aec: addiu a1, sp, 24
+// 0x01046afc: 0x1046afc: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01046af0: 0x1046af0: sw    zero, 32(sp)
+// 0x01046b00: 0x1046b00: sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1854,7 +1854,7 @@ L_1046a3c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046af4: 0x1046af4: sw    zero, 28(sp)
+// 0x01046b04: 0x1046b04: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1863,7 +1863,7 @@ L_1046a3c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046af8: 0x1046af8: sw    zero, 40(sp)
+// 0x01046b08: 0x1046b08: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1872,7 +1872,7 @@ L_1046a3c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046afc: 0x1046afc: sw    zero, 24(sp)
+// 0x01046b0c: 0x1046b0c: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1881,7 +1881,7 @@ L_1046a3c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046b00: 0x1046b00: jal   0x106b848 sw    zero, 36(sp)
+// 0x01046b10: 0x1046b10: jal   0x106be6c sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1895,12 +1895,12 @@ L_1046a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_ReportOnNavigation_106b848(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ReportOnNavigation_106be6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046b08: 0x1046b08: jal   0x104694c addiu a0, zero, 1
+// 0x01046b18: 0x1046b18: jal   0x104695c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -1908,17 +1908,17 @@ L_1046a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::suggest_route_dialog_close_104694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::suggest_route_dialog_close_104695c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046b10: 0x1046b10: addiu v0, zero, 1
+// 0x01046b20: 0x1046b20: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1046b14:
-// 0x01046b14: 0x1046b14: lw    ra, 68(sp)
-// 0x01046b18: 0x1046b18: lw    s3, 64(sp)
+L_1046b24:
+// 0x01046b24: 0x1046b24: lw    ra, 68(sp)
+// 0x01046b28: 0x1046b28: lw    s3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1927,7 +1927,7 @@ L_1046b14:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01046b1c: 0x1046b1c: lw    s2, 60(sp)
+// 0x01046b2c: 0x1046b2c: lw    s2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1936,7 +1936,7 @@ L_1046b14:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01046b20: 0x1046b20: lw    s1, 56(sp)
+// 0x01046b30: 0x1046b30: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1945,7 +1945,7 @@ L_1046b14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01046b24: 0x1046b24: lw    s0, 52(sp)
+// 0x01046b34: 0x1046b34: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1954,7 +1954,7 @@ L_1046b14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01046b28: 0x1046b28: jr    ra addiu sp, sp, 72
+// 0x01046b38: 0x1046b38: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1966,7 +1966,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_route_selected_1046b30(int32,int32,int32,int32,int32)
+.method public static int32 on_route_selected_1046b40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2001,7 +2001,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046b30: 0x1046b30: lw    a0, 116(a0)
+// 0x01046b40: 0x1046b40: lw    a0, 116(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2010,26 +2010,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046b34: 0x1046b34: addiu sp, sp, -24
+// 0x01046b44: 0x1046b44: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01046b38: 0x1046b38: sw    ra, 20(sp)
-// 0x01046b3c: 0x1046b3c: jal   0x10469c8 sll   zero, zero, 0
+// 0x01046b48: 0x1046b48: sw    ra, 20(sp)
+// 0x01046b4c: 0x1046b4c: jal   0x10469d8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::route_select_10469c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::route_select_10469d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01046b44: 0x1046b44: lw    ra, 20(sp)
-// 0x01046b48: 0x1046b48: sll   zero, zero, 0
-// 0x01046b4c: 0x1046b4c: jr    ra addiu sp, sp, 24
+// 0x01046b54: 0x1046b54: lw    ra, 20(sp)
+// 0x01046b58: 0x1046b58: sll   zero, zero, 0
+// 0x01046b5c: 0x1046b5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2041,7 +2041,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_drive_btn_cb_1046b54(int32,int32,int32,int32,int32)
+.method public static int32 on_drive_btn_cb_1046b64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -2079,16 +2079,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046b54: 0x1046b54: addiu sp, sp, -56
+// 0x01046b64: 0x1046b64: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01046b58: 0x1046b58: addu  a0, zero, zero
+// 0x01046b68: 0x1046b68: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01046b5c: 0x1046b5c: sw    ra, 52(sp)
-// 0x01046b60: 0x1046b60: jal   0x108e530 sw    s0, 48(sp)
+// 0x01046b6c: 0x1046b6c: sw    ra, 52(sp)
+// 0x01046b70: 0x1046b70: jal   0x108eb54 sw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2098,13 +2098,13 @@ __CIBYL_javamethod_begin:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 6
 // --- basic block ---
-// 0x01046b68: 0x1046b68: addiu a0, zero, 1
+// 0x01046b78: 0x1046b78: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01046b6c: 0x1046b6c: jal   0x104694c sw    v0, 40(sp)
+// 0x01046b7c: 0x1046b7c: jal   0x104695c sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2118,12 +2118,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::suggest_route_dialog_close_104694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::suggest_route_dialog_close_104695c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01046b74: 0x1046b74: lw    v0, 40(sp)
+// 0x01046b84: 0x1046b84: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2132,19 +2132,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01046b78: 0x1046b78: sll   zero, zero, 0
-// 0x01046b7c: 0x1046b7c: beq   v0, zero, 0x1046bac addiu s0, v0, 780
+// 0x01046b88: 0x1046b88: sll   zero, zero, 0
+// 0x01046b8c: 0x1046b8c: beq   v0, zero, 0x1046bbc addiu s0, v0, 780
 	ldloc 6
 	ldloc 6
 	ldc.i4 780
 	add
 	stloc 7
-	brfalse L_1046bac
+	brfalse L_1046bbc
 // --- basic block ---
-// 0x01046b84: 0x1046b84: addu  a0, s0, zero
+// 0x01046b94: 0x1046b94: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01046b88: 0x1046b88: sw    zero, 24(sp)
+// 0x01046b98: 0x1046b98: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2153,7 +2153,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046b8c: 0x1046b8c: sw    zero, 20(sp)
+// 0x01046b9c: 0x1046b9c: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2162,7 +2162,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046b90: 0x1046b90: sw    zero, 32(sp)
+// 0x01046ba0: 0x1046ba0: sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2171,7 +2171,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046b94: 0x1046b94: sw    zero, 16(sp)
+// 0x01046ba4: 0x1046ba4: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2180,7 +2180,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046b98: 0x1046b98: jal   0x1056828 sw    zero, 28(sp)
+// 0x01046ba8: 0x1046ba8: jal   0x1056838 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2190,15 +2190,15 @@ __CIBYL_javamethod_begin:
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl64::navigate_main_set_dest_pos_1056828(int32)
+	call int32 Cibyl64::navigate_main_set_dest_pos_1056838(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01046ba0: 0x1046ba0: addu  a0, s0, zero
+// 0x01046bb0: 0x1046bb0: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01046ba4: 0x1046ba4: jal   0x106b848 addiu a1, sp, 16
+// 0x01046bb4: 0x1046bb4: jal   0x106be6c addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -2208,17 +2208,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_ReportOnNavigation_106b848(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ReportOnNavigation_106be6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1046bac:
-// 0x01046bac: 0x1046bac: lw    ra, 52(sp)
-// 0x01046bb0: 0x1046bb0: addiu v0, zero, 1
+L_1046bbc:
+// 0x01046bbc: 0x1046bbc: lw    ra, 52(sp)
+// 0x01046bc0: 0x1046bc0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01046bb4: 0x1046bb4: lw    s0, 48(sp)
+// 0x01046bc4: 0x1046bc4: lw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2227,7 +2227,7 @@ L_1046bac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01046bb8: 0x1046bb8: jr    ra addiu sp, sp, 56
+// 0x01046bc8: 0x1046bc8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2239,7 +2239,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 update_button_1046bc0(int32,int32,int32,int32,int32)
+.method public static int32 update_button_1046bd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -2283,12 +2283,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046bc0: 0x1046bc0: addiu sp, sp, -64
+// 0x01046bd0: 0x1046bd0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01046bc4: 0x1046bc4: sw    s1, 52(sp)
+// 0x01046bd4: 0x1046bd4: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2297,25 +2297,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01046bc8: 0x1046bc8: lui   s1, 0x60000
+// 0x01046bd8: 0x1046bd8: lui   s1, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01046bcc: 0x1046bcc: lw    v0, 20308(s1)
+// 0x01046bdc: 0x1046bdc: lw    v0, 20772(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5077
+	ldc.i4 5193
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046bd0: 0x1046bd0: sw    ra, 60(sp)
-// 0x01046bd4: 0x1046bd4: addiu v0, v0, -1
+// 0x01046be0: 0x1046be0: sw    ra, 60(sp)
+// 0x01046be4: 0x1046be4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01046bd8: 0x1046bd8: sw    s2, 56(sp)
+// 0x01046be8: 0x1046be8: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2324,7 +2324,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01046bdc: 0x1046bdc: sw    s0, 48(sp)
+// 0x01046bec: 0x1046bec: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2333,23 +2333,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01046be0: 0x1046be0: bgez  v0, 0x1046bfc sw    v0, 20308(s1)
+// 0x01046bf0: 0x1046bf0: bgez  v0, 0x1046c0c sw    v0, 20772(s1)
 	ldloc 5
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5077
+	ldc.i4 5193
 	add
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	bge L_1046bfc
+	bge L_1046c0c
 // --- basic block ---
-// 0x01046be8: 0x1046be8: addu  a0, zero, zero
+// 0x01046bf8: 0x1046bf8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01046bec: 0x1046bec: jal   0x1046b54 addu  a1, zero, zero
+// 0x01046bfc: 0x1046bfc: jal   0x1046b64 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2357,33 +2357,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::on_drive_btn_cb_1046b54(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::on_drive_btn_cb_1046b64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046bf4: 0x1046bf4: j	 0x1046cb8 sll   zero, zero, 0
-	br L_1046cb8
+// 0x01046c04: 0x1046c04: j	 0x1046cc8 sll   zero, zero, 0
+	br L_1046cc8
 // --- basic block ---
-L_1046bfc:
-// 0x01046bfc: 0x1046bfc: lui   v0, 0x60000
+L_1046c0c:
+// 0x01046c0c: 0x1046c0c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01046c00: 0x1046c00: lw    a0, 20312(v0)
+// 0x01046c10: 0x1046c10: lw    a0, 20776(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5078
+	ldc.i4 5194
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046c04: 0x1046c04: lui   a1, 0x10000
+// 0x01046c14: 0x1046c14: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046c08: 0x1046c08: jal   0x109b304 addiu a1, a1, 204
+// 0x01046c18: 0x1046c18: jal   0x109b94c addiu a1, a1, 200
 	ldloc.2
-	ldc.i4 204
+	ldc.i4 200
 	add
 	stloc.2
 	ldloc.0
@@ -2391,37 +2391,37 @@ L_1046bfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046c10: 0x1046c10: addu  s0, v0, zero
+// 0x01046c20: 0x1046c20: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01046c14: 0x1046c14: lw    v0, 20308(s1)
+// 0x01046c24: 0x1046c24: lw    v0, 20772(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5077
+	ldc.i4 5193
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046c18: 0x1046c18: lui   a0, 0x10000
+// 0x01046c28: 0x1046c28: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01046c1c: 0x1046c1c: beq   v0, zero, 0x1046c54 addiu s2, sp, 24
+// 0x01046c2c: 0x1046c2c: beq   v0, zero, 0x1046c64 addiu s2, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-	brfalse L_1046c54
+	brfalse L_1046c64
 // --- basic block ---
-// 0x01046c24: 0x1046c24: jal   0x101cd60 addiu a0, a0, -10624
+// 0x01046c34: 0x1046c34: jal   0x101cd70 addiu a0, a0, -10628
 	ldloc.1
-	ldc.i4 -10624
+	ldc.i4 -10628
 	add
 	stloc.1
 	ldloc.0
@@ -2429,38 +2429,38 @@ L_1046bfc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046c2c: 0x1046c2c: lw    v1, 20308(s1)
+// 0x01046c3c: 0x1046c3c: lw    v1, 20772(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5077
+	ldc.i4 5193
 	add
 	ldelem.i4
 	stloc 7
-// 0x01046c30: 0x1046c30: lui   a2, 0x10000
+// 0x01046c40: 0x1046c40: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01046c34: 0x1046c34: addu  a0, s2, zero
+// 0x01046c44: 0x1046c44: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01046c38: 0x1046c38: addiu a2, a2, -14432
+// 0x01046c48: 0x1046c48: addiu a2, a2, -14436
 	ldloc.3
-	ldc.i4 -14432
+	ldc.i4 -14436
 	add
 	stloc.3
-// 0x01046c3c: 0x1046c3c: addu  a3, v0, zero
+// 0x01046c4c: 0x1046c4c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01046c40: 0x1046c40: addiu a1, zero, 20
+// 0x01046c50: 0x1046c50: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01046c44: 0x1046c44: jal   0x1000f9c sw    v1, 16(sp)
+// 0x01046c54: 0x1046c54: jal   0x1000f9c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2479,13 +2479,13 @@ L_1046bfc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046c4c: 0x1046c4c: j	 0x1046ca0 sll   zero, zero, 0
-	br L_1046ca0
+// 0x01046c5c: 0x1046c5c: j	 0x1046cb0 sll   zero, zero, 0
+	br L_1046cb0
 // --- basic block ---
-L_1046c54:
-// 0x01046c54: 0x1046c54: jal   0x101cd60 addiu a0, a0, -10624
+L_1046c64:
+// 0x01046c64: 0x1046c64: jal   0x101cd70 addiu a0, a0, -10628
 	ldloc.1
-	ldc.i4 -10624
+	ldc.i4 -10628
 	add
 	stloc.1
 	ldloc.0
@@ -2493,26 +2493,26 @@ L_1046c54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046c5c: 0x1046c5c: lui   a2, 0x10000
+// 0x01046c6c: 0x1046c6c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01046c60: 0x1046c60: addu  a0, s2, zero
+// 0x01046c70: 0x1046c70: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01046c64: 0x1046c64: addiu a2, a2, 19912
+// 0x01046c74: 0x1046c74: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01046c68: 0x1046c68: addu  a3, v0, zero
+// 0x01046c78: 0x1046c78: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01046c6c: 0x1046c6c: jal   0x1000f9c addiu a1, zero, 20
+// 0x01046c7c: 0x1046c7c: jal   0x1000f9c addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -2525,24 +2525,24 @@ L_1046c54:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046c74: 0x1046c74: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x01046c84: 0x1046c84: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046c7c: 0x1046c7c: beq   v0, zero, 0x1046c98 lui   a1, 0x10000
+// 0x01046c8c: 0x1046c8c: beq   v0, zero, 0x1046ca8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1046c98
+	brfalse L_1046ca8
 // --- basic block ---
-// 0x01046c84: 0x1046c84: addu  a0, v0, zero
+// 0x01046c94: 0x1046c94: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046c88: 0x1046c88: jal   0x1001b14 addiu a1, a1, -604
+// 0x01046c98: 0x1046c98: jal   0x1001b14 addiu a1, a1, -608
 	ldloc.2
-	ldc.i4 -604
+	ldc.i4 -608
 	add
 	stloc.2
 	ldloc.1
@@ -2550,12 +2550,12 @@ L_1046c54:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01046c90: 0x1046c90: beq   v0, zero, 0x1046ca0 sll   zero, zero, 0
+// 0x01046ca0: 0x1046ca0: beq   v0, zero, 0x1046cb0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1046ca0
+	brfalse L_1046cb0
 // --- basic block ---
-L_1046c98:
-// 0x01046c98: 0x1046c98: jal   0x109617c addu  a0, s0, zero
+L_1046ca8:
+// 0x01046ca8: 0x1046ca8: jal   0x10967c4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2563,19 +2563,19 @@ L_1046c98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_set_focus_109617c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_set_focus_10967c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1046ca0:
-// 0x01046ca0: 0x1046ca0: beq   s0, zero, 0x1046cb0 addu  a0, s0, zero
+L_1046cb0:
+// 0x01046cb0: 0x1046cb0: beq   s0, zero, 0x1046cc0 addu  a0, s0, zero
 	ldloc 9
 	ldloc 9
 	stloc.1
-	brfalse L_1046cb0
+	brfalse L_1046cc0
 // --- basic block ---
-// 0x01046ca8: 0x1046ca8: jal   0x1090b0c addiu a1, sp, 24
+// 0x01046cb8: 0x1046cb8: jal   0x1091130 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2585,26 +2585,26 @@ L_1046ca0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_text_1090b0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_text_1091130(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1046cb0:
-// 0x01046cb0: 0x1046cb0: jal   0x1021900 sll   zero, zero, 0
+L_1046cc0:
+// 0x01046cc0: 0x1046cc0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1046cb8:
-// 0x01046cb8: 0x1046cb8: lw    ra, 60(sp)
-// 0x01046cbc: 0x1046cbc: lw    s2, 56(sp)
+L_1046cc8:
+// 0x01046cc8: 0x1046cc8: lw    ra, 60(sp)
+// 0x01046ccc: 0x1046ccc: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2613,7 +2613,7 @@ L_1046cb8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01046cc0: 0x1046cc0: lw    s1, 52(sp)
+// 0x01046cd0: 0x1046cd0: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2622,7 +2622,7 @@ L_1046cb8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01046cc4: 0x1046cc4: lw    s0, 48(sp)
+// 0x01046cd4: 0x1046cd4: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2631,7 +2631,7 @@ L_1046cb8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01046cc8: 0x1046cc8: jr    ra addiu sp, sp, 64
+// 0x01046cd8: 0x1046cd8: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -2643,7 +2643,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_show_routes_dlg_closed_1046cd0(int32,int32,int32,int32,int32)
+.method public static int32 on_show_routes_dlg_closed_1046ce0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2678,29 +2678,29 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046cd0: 0x1046cd0: addiu a0, a0, -1
+// 0x01046ce0: 0x1046ce0: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01046cd4: 0x1046cd4: addiu sp, sp, -24
+// 0x01046ce4: 0x1046ce4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01046cd8: 0x1046cd8: sltiu a0, a0, 2
+// 0x01046ce8: 0x1046ce8: sltiu a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	clt.un
 	stloc.1
-// 0x01046cdc: 0x1046cdc: beq   a0, zero, 0x1046d04 sw    ra, 20(sp)
+// 0x01046cec: 0x1046cec: beq   a0, zero, 0x1046d14 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1046d04
+	brfalse L_1046d14
 // --- basic block ---
-// 0x01046ce4: 0x1046ce4: lui   a0, 0x10000
+// 0x01046cf4: 0x1046cf4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01046ce8: 0x1046ce8: jal   0x101f044 addiu a0, a0, -29748
+// 0x01046cf8: 0x1046cf8: jal   0x101f054 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -2710,15 +2710,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01046cf0: 0x1046cf0: lui   a0, 0x10000
+// 0x01046d00: 0x1046d00: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01046cf4: 0x1046cf4: jal   0x101f044 addiu a0, a0, -29760
+// 0x01046d04: 0x1046d04: jal   0x101f054 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -2728,24 +2728,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01046cfc: 0x1046cfc: jal   0x105e2e4 addu  a0, zero, zero
+// 0x01046d0c: 0x1046d0c: jal   0x105e2f4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_mode_105e2e4(int32)
+	call int32 Cibyl70::navigate_bar_set_mode_105e2f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1046d04:
-// 0x01046d04: 0x1046d04: lw    ra, 20(sp)
-// 0x01046d08: 0x1046d08: sll   zero, zero, 0
-// 0x01046d0c: 0x1046d0c: jr    ra addiu sp, sp, 24
+L_1046d14:
+// 0x01046d14: 0x1046d14: lw    ra, 20(sp)
+// 0x01046d18: 0x1046d18: sll   zero, zero, 0
+// 0x01046d1c: 0x1046d1c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2757,7 +2757,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 space_1046d14(int32,int32,int32,int32,int32)
+.method public static int32 space_1046d24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2792,12 +2792,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046d14: 0x1046d14: addiu sp, sp, -40
+// 0x01046d24: 0x1046d24: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01046d18: 0x1046d18: sw    a0, 24(sp)
+// 0x01046d28: 0x1046d28: sw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2806,12 +2806,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01046d1c: 0x1046d1c: sw    ra, 36(sp)
-// 0x01046d20: 0x1046d20: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01046d2c: 0x1046d2c: sw    ra, 36(sp)
+// 0x01046d30: 0x1046d30: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01046d28: 0x1046d28: lw    a0, 24(sp)
+// 0x01046d38: 0x1046d38: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2820,39 +2820,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01046d2c: 0x1046d2c: beq   v0, zero, 0x1046d3c addu  a3, a0, zero
+// 0x01046d3c: 0x1046d3c: beq   v0, zero, 0x1046d4c addu  a3, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 4
-	brfalse L_1046d3c
+	brfalse L_1046d4c
 // --- basic block ---
-// 0x01046d34: 0x1046d34: sll   a0, a0, 1
+// 0x01046d44: 0x1046d44: sll   a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
 	stloc.1
-// 0x01046d38: 0x1046d38: addu  a3, a0, zero
+// 0x01046d48: 0x1046d48: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-L_1046d3c:
-// 0x01046d3c: 0x1046d3c: lui   a0, 0x0
+L_1046d4c:
+// 0x01046d4c: 0x1046d4c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01046d40: 0x1046d40: addiu a0, a0, 32124
+// 0x01046d50: 0x1046d50: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01046d44: 0x1046d44: addu  a1, zero, zero
+// 0x01046d54: 0x1046d54: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01046d48: 0x1046d48: addiu a2, zero, -2
+// 0x01046d58: 0x1046d58: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01046d4c: 0x1046d4c: addiu v0, zero, 136
+// 0x01046d5c: 0x1046d5c: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x01046d50: 0x1046d50: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01046d60: 0x1046d60: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2866,21 +2866,21 @@ L_1046d3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046d58: 0x1046d58: addu  a0, v0, zero
+// 0x01046d68: 0x1046d68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046d5c: 0x1046d5c: addu  a1, zero, zero
+// 0x01046d6c: 0x1046d6c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01046d60: 0x1046d60: addu  a2, zero, zero
+// 0x01046d70: 0x1046d70: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01046d64: 0x1046d64: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01046d74: 0x1046d74: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2892,10 +2892,10 @@ L_1046d3c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01046d6c: 0x1046d6c: lw    ra, 36(sp)
-// 0x01046d70: 0x1046d70: lw    v0, 24(sp)
+// 0x01046d7c: 0x1046d7c: lw    ra, 36(sp)
+// 0x01046d80: 0x1046d80: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2904,7 +2904,7 @@ L_1046d3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01046d74: 0x1046d74: jr    ra addiu sp, sp, 40
+// 0x01046d84: 0x1046d84: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2916,7 +2916,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_route_show_list_1046d7c(int32,int32,int32,int32,int32)
+.method public static int32 on_route_show_list_1046d8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -2951,13 +2951,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046d7c: 0x1046d7c: addiu sp, sp, -24
+// 0x01046d8c: 0x1046d8c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01046d80: 0x1046d80: sw    ra, 20(sp)
-// 0x01046d84: 0x1046d84: jal   0x1094b64 addu  a0, zero, zero
+// 0x01046d90: 0x1046d90: sw    ra, 20(sp)
+// 0x01046d94: 0x1046d94: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2965,16 +2965,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01046d8c: 0x1046d8c: lw    ra, 20(sp)
-// 0x01046d90: 0x1046d90: addiu v0, zero, 1
+// 0x01046d9c: 0x1046d9c: lw    ra, 20(sp)
+// 0x01046da0: 0x1046da0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01046d94: 0x1046d94: jr    ra addiu sp, sp, 24
+// 0x01046da4: 0x1046da4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2986,7 +2986,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 highligh_selection_1046d9c(int32,int32,int32,int32,int32)
+.method public static int32 highligh_selection_1046dac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s6,int32 s2,int32 s3,int32 s8,int32 s1,int32 s4,int32 s7,int32 ra)
@@ -3048,13 +3048,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046d9c: 0x1046d9c: addiu sp, sp, -80
+// 0x01046dac: 0x1046dac: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01046da0: 0x1046da0: sw    ra, 76(sp)
-// 0x01046da4: 0x1046da4: sw    s7, 68(sp)
+// 0x01046db0: 0x1046db0: sw    ra, 76(sp)
+// 0x01046db4: 0x1046db4: sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3063,7 +3063,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01046da8: 0x1046da8: sw    s3, 52(sp)
+// 0x01046db8: 0x1046db8: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3072,7 +3072,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01046dac: 0x1046dac: sw    s2, 48(sp)
+// 0x01046dbc: 0x1046dbc: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3081,10 +3081,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01046db0: 0x1046db0: addu  s3, a0, zero
+// 0x01046dc0: 0x1046dc0: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01046db4: 0x1046db4: sw    s8, 72(sp)
+// 0x01046dc4: 0x1046dc4: sw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3093,7 +3093,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01046db8: 0x1046db8: sw    s6, 64(sp)
+// 0x01046dc8: 0x1046dc8: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3102,7 +3102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01046dbc: 0x1046dbc: sw    s5, 60(sp)
+// 0x01046dcc: 0x1046dcc: sw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3111,7 +3111,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01046dc0: 0x1046dc0: sw    s4, 56(sp)
+// 0x01046dd0: 0x1046dd0: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3120,7 +3120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01046dc4: 0x1046dc4: sw    s1, 44(sp)
+// 0x01046dd4: 0x1046dd4: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3129,7 +3129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01046dc8: 0x1046dc8: jal   0x1093fa0 sw    s0, 40(sp)
+// 0x01046dd8: 0x1046dd8: jal   0x10945c4 sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3138,29 +3138,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046dd0: 0x1046dd0: jal   0x108e568 addu  s2, v0, zero
+// 0x01046de0: 0x1046de0: jal   0x108eb8c addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x01046dd8: 0x1046dd8: lui   a1, 0x10000
+// 0x01046de8: 0x1046de8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046ddc: 0x1046ddc: addu  a0, s2, zero
+// 0x01046dec: 0x1046dec: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01046de0: 0x1046de0: addiu a1, a1, 220
+// 0x01046df0: 0x1046df0: addiu a1, a1, 216
 	ldloc.2
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc.2
-// 0x01046de4: 0x1046de4: jal   0x109b304 addu  s7, v0, zero
+// 0x01046df4: 0x1046df4: jal   0x109b94c addu  s7, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.0
@@ -3168,20 +3168,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046dec: 0x1046dec: lui   a1, 0x10000
+// 0x01046dfc: 0x1046dfc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046df0: 0x1046df0: addu  a0, v0, zero
+// 0x01046e00: 0x1046e00: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046df4: 0x1046df4: jal   0x109b304 addiu a1, a1, 224
+// 0x01046e04: 0x1046e04: jal   0x109b94c addiu a1, a1, 220
 	ldloc.2
-	ldc.i4 224
+	ldc.i4 220
 	add
 	stloc.2
 	ldloc.0
@@ -3189,102 +3189,102 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046dfc: 0x1046dfc: addu  a0, v0, zero
+// 0x01046e0c: 0x1046e0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046e00: 0x1046e00: addiu v0, zero, -1
+// 0x01046e10: 0x1046e10: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01046e04: 0x1046e04: beq   s3, v0, 0x1046e4c sll   zero, zero, 0
+// 0x01046e14: 0x1046e14: beq   s3, v0, 0x1046e5c sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	beq  L_1046e4c
+	beq  L_1046e5c
 // --- basic block ---
-// 0x01046e0c: 0x1046e0c: beq   a0, zero, 0x1046e28 lui   a1, 0x10000
+// 0x01046e1c: 0x1046e1c: beq   a0, zero, 0x1046e38 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1046e28
+	brfalse L_1046e38
 // --- basic block ---
-// 0x01046e14: 0x1046e14: lui   a2, 0x0
+// 0x01046e24: 0x1046e24: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01046e18: 0x1046e18: addiu a1, a1, -29540
+// 0x01046e28: 0x1046e28: addiu a1, a1, -29540
 	ldloc.2
 	ldc.i4 -29540
 	add
 	stloc.2
-// 0x01046e1c: 0x1046e1c: addiu a2, a2, 23008
+// 0x01046e2c: 0x1046e2c: addiu a2, a2, 23008
 	ldloc.3
 	ldc.i4 23008
 	add
 	stloc.3
-L_1046e20:
-// 0x01046e20: 0x1046e20: jal   0x1098fe0 sll   zero, zero, 0
+L_1046e30:
+// 0x01046e30: 0x1046e30: jal   0x1099628 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1046e28:
-// 0x01046e28: 0x1046e28: lui   s6, 0x10000
+L_1046e38:
+// 0x01046e38: 0x1046e38: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01046e2c: 0x1046e2c: lui   s5, 0x0
+// 0x01046e3c: 0x1046e3c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01046e30: 0x1046e30: lui   s8, 0x10000
+// 0x01046e40: 0x1046e40: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x01046e34: 0x1046e34: addiu s6, s6, -29540
+// 0x01046e44: 0x1046e44: addiu s6, s6, -29540
 	ldloc 10
 	ldc.i4 -29540
 	add
 	stloc 10
-// 0x01046e38: 0x1046e38: addiu s5, s5, 23008
+// 0x01046e48: 0x1046e48: addiu s5, s5, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc 9
-// 0x01046e3c: 0x1046e3c: addiu s8, s8, 256
+// 0x01046e4c: 0x1046e4c: addiu s8, s8, 252
 	ldloc 13
-	ldc.i4 256
+	ldc.i4 252
 	add
 	stloc 13
-// 0x01046e40: 0x1046e40: addu  s0, zero, zero
+// 0x01046e50: 0x1046e50: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01046e44: 0x1046e44: j	 0x1046ed8 addiu s4, sp, 16
+// 0x01046e54: 0x1046e54: j	 0x1046ee8 addiu s4, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 15
-	br L_1046ed8
+	br L_1046ee8
 // --- basic block ---
-L_1046e4c:
-// 0x01046e4c: 0x1046e4c: beq   a0, zero, 0x1046e28 lui   a1, 0x0
+L_1046e5c:
+// 0x01046e5c: 0x1046e5c: beq   a0, zero, 0x1046e38 lui   a1, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1046e28
+	brfalse L_1046e38
 // --- basic block ---
-// 0x01046e54: 0x1046e54: addiu a1, a1, 23008
+// 0x01046e64: 0x1046e64: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01046e58: 0x1046e58: j	 0x1046e20 addu  a2, a1, zero
+// 0x01046e68: 0x1046e68: j	 0x1046e30 addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-	br L_1046e20
+	br L_1046e30
 // --- basic block ---
-L_1046e60:
-// 0x01046e60: 0x1046e60: jal   0x1000f64 sll   zero, zero, 0
+L_1046e70:
+// 0x01046e70: 0x1046e70: jal   0x1000f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3295,10 +3295,10 @@ L_1046e60:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046e68: 0x1046e68: addu  a0, s2, zero
+// 0x01046e78: 0x1046e78: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01046e6c: 0x1046e6c: jal   0x109b304 addu  a1, s4, zero
+// 0x01046e7c: 0x1046e7c: jal   0x109b94c addu  a1, s4, zero
 	ldloc 15
 	stloc.2
 	ldloc.0
@@ -3306,37 +3306,37 @@ L_1046e60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046e74: 0x1046e74: lui   a1, 0x10000
+// 0x01046e84: 0x1046e84: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046e78: 0x1046e78: addu  s1, v0, zero
+// 0x01046e88: 0x1046e88: addu  s1, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01046e7c: 0x1046e7c: addu  a0, v0, zero
+// 0x01046e8c: 0x1046e8c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046e80: 0x1046e80: beq   v0, zero, 0x1046e94 addiu a1, a1, 244
+// 0x01046e90: 0x1046e90: beq   v0, zero, 0x1046ea4 addiu a1, a1, 240
 	ldloc 5
 	ldloc.2
-	ldc.i4 244
+	ldc.i4 240
 	add
 	stloc.2
-	brfalse L_1046e94
+	brfalse L_1046ea4
 // --- basic block ---
-// 0x01046e88: 0x1046e88: lui   v0, 0x1040000
+// 0x01046e98: 0x1046e98: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01046e8c: 0x1046e8c: addiu v0, v0, 28820
+// 0x01046e9c: 0x1046e9c: addiu v0, v0, 28836
 	ldloc 5
-	ldc.i4 28820
+	ldc.i4 28836
 	add
 	stloc 5
-// 0x01046e90: 0x1046e90: sw    v0, 196(s1)
+// 0x01046ea0: 0x1046ea0: sw    v0, 196(s1)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -3345,41 +3345,41 @@ L_1046e60:
 	add
 	ldloc 5
 	stelem.i4
-L_1046e94:
-// 0x01046e94: 0x1046e94: jal   0x109b304 sll   zero, zero, 0
+L_1046ea4:
+// 0x01046ea4: 0x1046ea4: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046e9c: 0x1046e9c: addu  a0, v0, zero
+// 0x01046eac: 0x1046eac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046ea0: 0x1046ea0: addu  a2, s5, zero
+// 0x01046eb0: 0x1046eb0: addu  a2, s5, zero
 	ldloc 9
 	stloc.3
-// 0x01046ea4: 0x1046ea4: beq   v0, zero, 0x1046eb4 addu  a1, s6, zero
+// 0x01046eb4: 0x1046eb4: beq   v0, zero, 0x1046ec4 addu  a1, s6, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brfalse L_1046eb4
+	brfalse L_1046ec4
 // --- basic block ---
-// 0x01046eac: 0x1046eac: jal   0x1098fe0 sll   zero, zero, 0
+// 0x01046ebc: 0x1046ebc: jal   0x1099628 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1046eb4:
-// 0x01046eb4: 0x1046eb4: addu  a0, s1, zero
+L_1046ec4:
+// 0x01046ec4: 0x1046ec4: addu  a0, s1, zero
 	ldloc 14
 	stloc.1
-// 0x01046eb8: 0x1046eb8: jal   0x109b304 addu  a1, s8, zero
+// 0x01046ec8: 0x1046ec8: jal   0x109b94c addu  a1, s8, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -3387,83 +3387,83 @@ L_1046eb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046ec0: 0x1046ec0: addu  a0, v0, zero
+// 0x01046ed0: 0x1046ed0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046ec4: 0x1046ec4: addu  a1, s6, zero
+// 0x01046ed4: 0x1046ed4: addu  a1, s6, zero
 	ldloc 10
 	stloc.2
-// 0x01046ec8: 0x1046ec8: beq   v0, zero, 0x1046ed8 addu  a2, s5, zero
+// 0x01046ed8: 0x1046ed8: beq   v0, zero, 0x1046ee8 addu  a2, s5, zero
 	ldloc 5
 	ldloc 9
 	stloc.3
-	brfalse L_1046ed8
+	brfalse L_1046ee8
 // --- basic block ---
-// 0x01046ed0: 0x1046ed0: jal   0x1098fe0 sll   zero, zero, 0
+// 0x01046ee0: 0x1046ee0: jal   0x1099628 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1046ed8:
-// 0x01046ed8: 0x1046ed8: lui   a1, 0x10000
+L_1046ee8:
+// 0x01046ee8: 0x1046ee8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046edc: 0x1046edc: slt   v0, s0, s7
+// 0x01046eec: 0x1046eec: slt   v0, s0, s7
 	ldloc 8
 	ldloc 16
 	clt
 	stloc 5
-// 0x01046ee0: 0x1046ee0: addiu s0, s0, 1
+// 0x01046ef0: 0x1046ef0: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01046ee4: 0x1046ee4: addu  a0, s4, zero
+// 0x01046ef4: 0x1046ef4: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x01046ee8: 0x1046ee8: addiu a1, a1, 232
+// 0x01046ef8: 0x1046ef8: addiu a1, a1, 228
 	ldloc.2
-	ldc.i4 232
+	ldc.i4 228
 	add
 	stloc.2
-// 0x01046eec: 0x1046eec: bne   v0, zero, 0x1046e60 addu  a2, s0, zero
+// 0x01046efc: 0x1046efc: bne   v0, zero, 0x1046e70 addu  a2, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.3
-	brtrue L_1046e60
+	brtrue L_1046e70
 // --- basic block ---
-// 0x01046ef4: 0x1046ef4: addiu v0, zero, -1
+// 0x01046f04: 0x1046f04: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01046ef8: 0x1046ef8: beq   s3, v0, 0x1046f84 addiu s0, sp, 16
+// 0x01046f08: 0x1046f08: beq   s3, v0, 0x1046f94 addiu s0, sp, 16
 	ldloc 12
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-	beq  L_1046f84
+	beq  L_1046f94
 // --- basic block ---
-// 0x01046f00: 0x1046f00: lui   a1, 0x10000
+// 0x01046f10: 0x1046f10: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046f04: 0x1046f04: addu  a0, s0, zero
+// 0x01046f14: 0x1046f14: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01046f08: 0x1046f08: addiu a2, s3, 1
+// 0x01046f18: 0x1046f18: addiu a2, s3, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01046f0c: 0x1046f0c: jal   0x1000f64 addiu a1, a1, 232
+// 0x01046f1c: 0x1046f1c: jal   0x1000f64 addiu a1, a1, 228
 	ldloc.2
-	ldc.i4 232
+	ldc.i4 228
 	add
 	stloc.2
 	ldloc.0
@@ -3476,10 +3476,10 @@ L_1046ed8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046f14: 0x1046f14: addu  a1, s0, zero
+// 0x01046f24: 0x1046f24: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01046f18: 0x1046f18: jal   0x109b304 addu  a0, s2, zero
+// 0x01046f28: 0x1046f28: jal   0x109b94c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -3487,26 +3487,26 @@ L_1046ed8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046f20: 0x1046f20: beq   v0, zero, 0x1046f34 addu  s0, v0, zero
+// 0x01046f30: 0x1046f30: beq   v0, zero, 0x1046f44 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_1046f34
+	brfalse L_1046f44
 // --- basic block ---
-// 0x01046f28: 0x1046f28: lui   v0, 0x1040000
+// 0x01046f38: 0x1046f38: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01046f2c: 0x1046f2c: addiu v0, v0, 27440
+// 0x01046f3c: 0x1046f3c: addiu v0, v0, 27456
 	ldloc 5
-	ldc.i4 27440
+	ldc.i4 27456
 	add
 	stloc 5
-// 0x01046f30: 0x1046f30: sw    v0, 196(s0)
+// 0x01046f40: 0x1046f40: sw    v0, 196(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3515,16 +3515,16 @@ L_1046ed8:
 	add
 	ldloc 5
 	stelem.i4
-L_1046f34:
-// 0x01046f34: 0x1046f34: lui   a1, 0x10000
+L_1046f44:
+// 0x01046f44: 0x1046f44: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046f38: 0x1046f38: addiu a1, a1, 244
+// 0x01046f48: 0x1046f48: addiu a1, a1, 240
 	ldloc.2
-	ldc.i4 244
+	ldc.i4 240
 	add
 	stloc.2
-// 0x01046f3c: 0x1046f3c: jal   0x109b304 addu  a0, s0, zero
+// 0x01046f4c: 0x1046f4c: jal   0x109b94c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3532,43 +3532,43 @@ L_1046f34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046f44: 0x1046f44: beq   v0, zero, 0x1046f5c addu  a0, v0, zero
+// 0x01046f54: 0x1046f54: beq   v0, zero, 0x1046f6c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1046f5c
+	brfalse L_1046f6c
 // --- basic block ---
-// 0x01046f4c: 0x1046f4c: lui   a1, 0x0
+// 0x01046f5c: 0x1046f5c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01046f50: 0x1046f50: addiu a1, a1, 23008
+// 0x01046f60: 0x1046f60: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01046f54: 0x1046f54: jal   0x1098fe0 addu  a2, a1, zero
+// 0x01046f64: 0x1046f64: jal   0x1099628 addu  a2, a1, zero
 	ldloc.2
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1046f5c:
-// 0x01046f5c: 0x1046f5c: lui   a1, 0x10000
+L_1046f6c:
+// 0x01046f6c: 0x1046f6c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046f60: 0x1046f60: addu  a0, s0, zero
+// 0x01046f70: 0x1046f70: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01046f64: 0x1046f64: jal   0x109b304 addiu a1, a1, 256
+// 0x01046f74: 0x1046f74: jal   0x109b94c addiu a1, a1, 252
 	ldloc.2
-	ldc.i4 256
+	ldc.i4 252
 	add
 	stloc.2
 	ldloc.0
@@ -3576,36 +3576,36 @@ L_1046f5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046f6c: 0x1046f6c: beq   v0, zero, 0x1046f84 lui   a1, 0x0
+// 0x01046f7c: 0x1046f7c: beq   v0, zero, 0x1046f94 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1046f84
+	brfalse L_1046f94
 // --- basic block ---
-// 0x01046f74: 0x1046f74: addiu a1, a1, 23008
+// 0x01046f84: 0x1046f84: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01046f78: 0x1046f78: addu  a0, v0, zero
+// 0x01046f88: 0x1046f88: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01046f7c: 0x1046f7c: jal   0x1098fe0 addu  a2, a1, zero
+// 0x01046f8c: 0x1046f8c: jal   0x1099628 addu  a2, a1, zero
 	ldloc.2
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_1046f84:
-// 0x01046f84: 0x1046f84: lw    ra, 76(sp)
-// 0x01046f88: 0x1046f88: lw    s8, 72(sp)
+L_1046f94:
+// 0x01046f94: 0x1046f94: lw    ra, 76(sp)
+// 0x01046f98: 0x1046f98: lw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3614,7 +3614,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01046f8c: 0x1046f8c: lw    s7, 68(sp)
+// 0x01046f9c: 0x1046f9c: lw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3623,7 +3623,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01046f90: 0x1046f90: lw    s6, 64(sp)
+// 0x01046fa0: 0x1046fa0: lw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3632,7 +3632,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01046f94: 0x1046f94: lw    s5, 60(sp)
+// 0x01046fa4: 0x1046fa4: lw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3641,7 +3641,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01046f98: 0x1046f98: lw    s4, 56(sp)
+// 0x01046fa8: 0x1046fa8: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3650,7 +3650,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01046f9c: 0x1046f9c: lw    s3, 52(sp)
+// 0x01046fac: 0x1046fac: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3659,7 +3659,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01046fa0: 0x1046fa0: lw    s2, 48(sp)
+// 0x01046fb0: 0x1046fb0: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3668,7 +3668,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01046fa4: 0x1046fa4: lw    s1, 44(sp)
+// 0x01046fb4: 0x1046fb4: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3677,7 +3677,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01046fa8: 0x1046fa8: lw    s0, 40(sp)
+// 0x01046fb8: 0x1046fb8: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3686,7 +3686,7 @@ L_1046f84:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01046fac: 0x1046fac: jr    ra addiu sp, sp, 80
+// 0x01046fbc: 0x1046fbc: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -3698,7 +3698,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_routes_selection_all_1046fb4(int32,int32,int32,int32,int32)
+.method public static int32 on_routes_selection_all_1046fc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3742,12 +3742,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01046fb4: 0x1046fb4: addiu sp, sp, -48
+// 0x01046fc4: 0x1046fc4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01046fb8: 0x1046fb8: sw    zero, 136(a0)
+// 0x01046fc8: 0x1046fc8: sw    zero, 136(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3756,10 +3756,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01046fbc: 0x1046fbc: addu  a0, zero, zero
+// 0x01046fcc: 0x1046fcc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01046fc0: 0x1046fc0: sw    s0, 32(sp)
+// 0x01046fd0: 0x1046fd0: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3768,8 +3768,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01046fc4: 0x1046fc4: sw    ra, 44(sp)
-// 0x01046fc8: 0x1046fc8: sw    s2, 40(sp)
+// 0x01046fd4: 0x1046fd4: sw    ra, 44(sp)
+// 0x01046fd8: 0x1046fd8: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3778,7 +3778,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01046fcc: 0x1046fcc: jal   0x108e530 sw    s1, 36(sp)
+// 0x01046fdc: 0x1046fdc: jal   0x108eb54 sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3788,35 +3788,35 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x01046fd4: 0x1046fd4: bne   v0, zero, 0x1047000 addu  s0, v0, zero
+// 0x01046fe4: 0x1046fe4: bne   v0, zero, 0x1047010 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_1047000
+	brtrue L_1047010
 // --- basic block ---
-// 0x01046fdc: 0x1046fdc: lui   a1, 0x10000
+// 0x01046fec: 0x1046fec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01046fe0: 0x1046fe0: lui   a3, 0x10000
+// 0x01046ff0: 0x1046ff0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01046fe4: 0x1046fe4: addiu a1, a1, -576
+// 0x01046ff4: 0x1046ff4: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01046fe8: 0x1046fe8: addiu a3, a3, 268
+// 0x01046ff8: 0x1046ff8: addiu a3, a3, 264
 	ldloc 4
-	ldc.i4 268
+	ldc.i4 264
 	add
 	stloc 4
-// 0x01046fec: 0x1046fec: addiu a0, zero, 4
+// 0x01046ffc: 0x1046ffc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01046ff0: 0x1046ff0: jal   0x100449c addiu a2, zero, 795
+// 0x01047000: 0x1047000: jal   0x100449c addiu a2, zero, 795
 	ldc.i4 795
 	stloc.3
 	ldloc.0
@@ -3829,11 +3829,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01046ff8: 0x1046ff8: j	 0x1047078 sll   zero, zero, 0
-	br L_1047078
+// 0x01047008: 0x1047008: j	 0x1047088 sll   zero, zero, 0
+	br L_1047088
 // --- basic block ---
-L_1047000:
-// 0x01047000: 0x1047000: jal   0x1046d9c addiu a0, zero, -1
+L_1047010:
+// 0x01047010: 0x1047010: jal   0x1046dac addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.0
@@ -3841,29 +3841,29 @@ L_1047000:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::highligh_selection_1046d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::highligh_selection_1046dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047008: 0x1047008: addu  s1, zero, zero
+// 0x01047018: 0x1047018: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0104700c: 0x104700c: jal   0x108e568 addiu s2, zero, 1
+// 0x0104701c: 0x104701c: jal   0x108eb8c addiu s2, zero, 1
 	ldc.i4.1
 	stloc 10
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x01047014: 0x1047014: j	 0x1047040 slt   v1, s1, v0
+// 0x01047024: 0x1047024: j	 0x1047050 slt   v1, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 7
-	br L_1047040
+	br L_1047050
 // --- basic block ---
-L_104701c:
-// 0x0104701c: 0x104701c: lw    a1, 796(s0)
+L_104702c:
+// 0x0104702c: 0x104702c: lw    a1, 796(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3872,7 +3872,7 @@ L_104701c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047020: 0x1047020: lw    a2, 788(s0)
+// 0x01047030: 0x1047030: lw    a2, 788(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3881,7 +3881,7 @@ L_104701c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01047024: 0x1047024: lw    a3, 772(s0)
+// 0x01047034: 0x1047034: lw    a3, 772(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3890,7 +3890,7 @@ L_104701c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01047028: 0x1047028: sw    v0, 24(sp)
+// 0x01047038: 0x1047038: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3899,7 +3899,7 @@ L_104701c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104702c: 0x104702c: jal   0x1058c68 sw    s2, 16(sp)
+// 0x0104703c: 0x104703c: jal   0x1058c78 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3913,12 +3913,12 @@ L_104701c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047034: 0x1047034: lw    v0, 24(sp)
+// 0x01047044: 0x1047044: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3927,34 +3927,34 @@ L_104701c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01047038: 0x1047038: addiu s1, s1, 1
+// 0x01047048: 0x1047048: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0104703c: 0x104703c: slt   v1, s1, v0
+// 0x0104704c: 0x104704c: slt   v1, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 7
-L_1047040:
-// 0x01047040: 0x1047040: addu  a0, s1, zero
+L_1047050:
+// 0x01047050: 0x1047050: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01047044: 0x1047044: bne   v1, zero, 0x104701c addiu s0, s0, 44
+// 0x01047054: 0x1047054: bne   v1, zero, 0x104702c addiu s0, s0, 44
 	ldloc 7
 	ldloc 8
 	ldc.i4.s 44
 	add
 	stloc 8
-	brtrue L_104701c
+	brtrue L_104702c
 // --- basic block ---
-// 0x0104704c: 0x104704c: lui   a0, 0x10000
+// 0x0104705c: 0x104705c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047050: 0x1047050: jal   0x101cd60 addiu a0, a0, 312
+// 0x01047060: 0x1047060: jal   0x101cd70 addiu a0, a0, 308
 	ldloc.1
-	ldc.i4 312
+	ldc.i4 308
 	add
 	stloc.1
 	ldloc.0
@@ -3962,20 +3962,20 @@ L_1047040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047058: 0x1047058: lui   a0, 0x10000
+// 0x01047068: 0x1047068: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104705c: 0x104705c: addiu a0, a0, 328
+// 0x0104706c: 0x104706c: addiu a0, a0, 324
 	ldloc.1
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.1
-// 0x01047060: 0x1047060: jal   0x10958c4 addu  a1, v0, zero
+// 0x01047070: 0x1047070: jal   0x1095f0c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3983,35 +3983,35 @@ L_1047040:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_change_text_10958c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_change_text_1095f0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047068: 0x1047068: jal   0x1006bfc addiu a0, zero, 60
+// 0x01047078: 0x1047078: jal   0x1006c0c addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01047070: 0x1047070: jal   0x1021900 sll   zero, zero, 0
+// 0x01047080: 0x1047080: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1047078:
-// 0x01047078: 0x1047078: lw    ra, 44(sp)
-// 0x0104707c: 0x104707c: addiu v0, zero, 1
+L_1047088:
+// 0x01047088: 0x1047088: lw    ra, 44(sp)
+// 0x0104708c: 0x104708c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01047080: 0x1047080: lw    s2, 40(sp)
+// 0x01047090: 0x1047090: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4020,7 +4020,7 @@ L_1047078:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01047084: 0x1047084: lw    s1, 36(sp)
+// 0x01047094: 0x1047094: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4029,7 +4029,7 @@ L_1047078:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01047088: 0x1047088: lw    s0, 32(sp)
+// 0x01047098: 0x1047098: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4038,7 +4038,7 @@ L_1047078:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104708c: 0x104708c: jr    ra addiu sp, sp, 48
+// 0x0104709c: 0x104709c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4050,7 +4050,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_routes_selection_route_1047094(int32,int32,int32,int32,int32)
+.method public static int32 on_routes_selection_route_10470a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -4091,12 +4091,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01047094: 0x1047094: addiu sp, sp, -64
+// 0x010470a4: 0x10470a4: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01047098: 0x1047098: sw    s0, 52(sp)
+// 0x010470a8: 0x10470a8: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4105,7 +4105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104709c: 0x104709c: sw    zero, 136(a0)
+// 0x010470ac: 0x10470ac: sw    zero, 136(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4114,23 +4114,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010470a0: 0x10470a0: addu  s0, a0, zero
+// 0x010470b0: 0x10470b0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010470a4: 0x10470a4: addu  a1, zero, zero
+// 0x010470b4: 0x10470b4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010470a8: 0x10470a8: addu  a0, zero, zero
+// 0x010470b8: 0x10470b8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010470ac: 0x10470ac: addu  a2, zero, zero
+// 0x010470bc: 0x10470bc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010470b0: 0x10470b0: addiu a3, zero, -1
+// 0x010470c0: 0x10470c0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010470b4: 0x10470b4: sw    ra, 60(sp)
-// 0x010470b8: 0x10470b8: sw    s1, 56(sp)
+// 0x010470c4: 0x10470c4: sw    ra, 60(sp)
+// 0x010470c8: 0x10470c8: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4139,7 +4139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010470bc: 0x10470bc: jal   0x1058c68 sw    zero, 16(sp)
+// 0x010470cc: 0x10470cc: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4153,24 +4153,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010470c4: 0x10470c4: addiu a0, zero, 1
+// 0x010470d4: 0x10470d4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010470c8: 0x10470c8: addu  a1, zero, zero
+// 0x010470d8: 0x10470d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010470cc: 0x10470cc: addu  a2, zero, zero
+// 0x010470dc: 0x10470dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010470d0: 0x10470d0: addiu a3, zero, -1
+// 0x010470e0: 0x10470e0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010470d4: 0x10470d4: jal   0x1058c68 sw    zero, 16(sp)
+// 0x010470e4: 0x10470e4: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4184,24 +4184,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010470dc: 0x10470dc: addu  a1, zero, zero
+// 0x010470ec: 0x10470ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010470e0: 0x10470e0: addu  a2, zero, zero
+// 0x010470f0: 0x10470f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010470e4: 0x10470e4: addiu a3, zero, -1
+// 0x010470f4: 0x10470f4: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010470e8: 0x10470e8: addiu a0, zero, 2
+// 0x010470f8: 0x10470f8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010470ec: 0x10470ec: jal   0x1058c68 sw    zero, 16(sp)
+// 0x010470fc: 0x10470fc: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4215,19 +4215,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010470f4: 0x10470f4: jal   0x1006bfc addiu a0, zero, -1
+// 0x01047104: 0x1047104: jal   0x1006c0c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010470fc: 0x10470fc: lw    s0, 116(s0)
+// 0x0104710c: 0x104710c: lw    s0, 116(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4236,15 +4236,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01047100: 0x1047100: sll   zero, zero, 0
-// 0x01047104: 0x1047104: lw    a0, 0(s0)
+// 0x01047110: 0x1047110: sll   zero, zero, 0
+// 0x01047114: 0x1047114: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01047108: 0x1047108: jal   0x1046d9c addiu s1, sp, 24
+// 0x01047118: 0x1047118: jal   0x1046dac addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4254,12 +4254,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::highligh_selection_1046d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::highligh_selection_1046dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047110: 0x1047110: lw    v0, 4(s0)
+// 0x01047120: 0x1047120: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4268,14 +4268,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01047114: 0x1047114: lw    a0, 0(s0)
+// 0x01047124: 0x1047124: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01047118: 0x1047118: lw    a2, 32(v0)
+// 0x01047128: 0x1047128: lw    a2, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4284,7 +4284,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104711c: 0x104711c: lw    a1, 40(v0)
+// 0x0104712c: 0x104712c: lw    a1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4293,13 +4293,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047120: 0x1047120: addu  a3, a0, zero
+// 0x01047130: 0x1047130: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01047124: 0x1047124: addiu v0, zero, 1
+// 0x01047134: 0x1047134: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01047128: 0x1047128: jal   0x1058c68 sw    v0, 16(sp)
+// 0x01047138: 0x1047138: jal   0x1058c78 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4313,17 +4313,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047130: 0x1047130: lui   a0, 0x10000
+// 0x01047140: 0x1047140: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047134: 0x1047134: jal   0x101cd60 addiu a0, a0, 340
+// 0x01047144: 0x1047144: jal   0x101cd70 addiu a0, a0, 336
 	ldloc.1
-	ldc.i4 340
+	ldc.i4 336
 	add
 	stloc.1
 	ldloc.0
@@ -4331,27 +4331,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104713c: 0x104713c: lw    a2, 0(s0)
+// 0x0104714c: 0x104714c: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01047140: 0x1047140: addu  a1, v0, zero
+// 0x01047150: 0x1047150: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047144: 0x1047144: addiu a2, a2, 1
+// 0x01047154: 0x1047154: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01047148: 0x1047148: jal   0x1000f64 addu  a0, s1, zero
+// 0x01047158: 0x1047158: jal   0x1000f64 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4364,22 +4364,22 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047150: 0x1047150: jal   0x1006bfc addiu a0, zero, 60
+// 0x01047160: 0x1047160: jal   0x1006c0c addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01047158: 0x1047158: lui   a0, 0x10000
+// 0x01047168: 0x1047168: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104715c: 0x104715c: addu  a1, s1, zero
+// 0x0104716c: 0x104716c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01047160: 0x1047160: jal   0x10958c4 addiu a0, a0, 328
+// 0x01047170: 0x1047170: jal   0x1095f0c addiu a0, a0, 324
 	ldloc.1
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.1
 	ldloc.0
@@ -4387,27 +4387,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_change_text_10958c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_change_text_1095f0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047168: 0x1047168: jal   0x1021900 sll   zero, zero, 0
+// 0x01047178: 0x1047178: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047170: 0x1047170: lw    ra, 60(sp)
-// 0x01047174: 0x1047174: addiu v0, zero, 1
+// 0x01047180: 0x1047180: lw    ra, 60(sp)
+// 0x01047184: 0x1047184: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01047178: 0x1047178: lw    s1, 56(sp)
+// 0x01047188: 0x1047188: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4416,7 +4416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104717c: 0x104717c: lw    s0, 52(sp)
+// 0x0104718c: 0x104718c: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4425,7 +4425,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01047180: 0x1047180: jr    ra addiu sp, sp, 64
+// 0x01047190: 0x1047190: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4437,7 +4437,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 keypressed_showroute_1047188(int32,int32,int32,int32,int32)
+.method public static int32 keypressed_showroute_1047198(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 s3,int32 s5,int32 ra,int32 lo)
@@ -4493,13 +4493,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01047188: 0x1047188: addiu sp, sp, -80
+// 0x01047198: 0x1047198: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0104718c: 0x104718c: sw    ra, 76(sp)
-// 0x01047190: 0x1047190: sw    s2, 60(sp)
+// 0x0104719c: 0x104719c: sw    ra, 76(sp)
+// 0x010471a0: 0x10471a0: sw    s2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4508,7 +4508,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01047194: 0x1047194: sw    s1, 56(sp)
+// 0x010471a4: 0x10471a4: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4517,7 +4517,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01047198: 0x1047198: sw    s0, 52(sp)
+// 0x010471a8: 0x10471a8: sw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4526,7 +4526,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104719c: 0x104719c: sw    s5, 72(sp)
+// 0x010471ac: 0x10471ac: sw    s5, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4535,10 +4535,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010471a0: 0x10471a0: addu  s0, a0, zero
+// 0x010471b0: 0x10471b0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010471a4: 0x10471a4: sw    s4, 68(sp)
+// 0x010471b4: 0x10471b4: sw    s4, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4547,7 +4547,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010471a8: 0x10471a8: jal   0x1093fa0 sw    s3, 64(sp)
+// 0x010471b8: 0x10471b8: jal   0x10945c4 sw    s3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4556,47 +4556,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010471b0: 0x10471b0: addu  a0, zero, zero
+// 0x010471c0: 0x10471c0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010471b4: 0x10471b4: jal   0x108e530 addu  s1, v0, zero
+// 0x010471c4: 0x10471c4: jal   0x108eb54 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x010471bc: 0x10471bc: bne   v0, zero, 0x10471e8 addu  s2, v0, zero
+// 0x010471cc: 0x10471cc: bne   v0, zero, 0x10471f8 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10471e8
+	brtrue L_10471f8
 // --- basic block ---
-// 0x010471c4: 0x10471c4: lui   a1, 0x10000
+// 0x010471d4: 0x10471d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010471c8: 0x10471c8: lui   a3, 0x10000
+// 0x010471d8: 0x10471d8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010471cc: 0x10471cc: addiu a1, a1, -576
+// 0x010471dc: 0x10471dc: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x010471d0: 0x10471d0: addiu a3, a3, 352
+// 0x010471e0: 0x10471e0: addiu a3, a3, 348
 	ldloc 4
-	ldc.i4 352
+	ldc.i4 348
 	add
 	stloc 4
-// 0x010471d4: 0x10471d4: addiu a0, zero, 4
+// 0x010471e4: 0x10471e4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010471d8: 0x10471d8: jal   0x100449c addiu a2, zero, 440
+// 0x010471e8: 0x10471e8: jal   0x100449c addiu a2, zero, 440
 	ldc.i4 440
 	stloc.3
 	ldloc.0
@@ -4609,35 +4609,35 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010471e0: 0x10471e0: j	 0x1047380 sll   zero, zero, 0
-	br L_1047380
+// 0x010471f0: 0x10471f0: j	 0x1047390 sll   zero, zero, 0
+	br L_1047390
 // --- basic block ---
-L_10471e8:
-// 0x010471e8: 0x10471e8: jal   0x108e568 sll   zero, zero, 0
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+L_10471f8:
+// 0x010471f8: 0x10471f8: jal   0x108eb8c sll   zero, zero, 0
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x010471f0: 0x10471f0: slt   v0, s0, v0
+// 0x01047200: 0x1047200: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x010471f4: 0x10471f4: beq   v0, zero, 0x1047380 addu  a0, zero, zero
+// 0x01047204: 0x1047204: beq   v0, zero, 0x1047390 addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1047380
+	brfalse L_1047390
 // --- basic block ---
-// 0x010471fc: 0x10471fc: addu  a1, zero, zero
+// 0x0104720c: 0x104720c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047200: 0x1047200: addu  a2, zero, zero
+// 0x01047210: 0x1047210: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047204: 0x1047204: addiu a3, zero, -1
+// 0x01047214: 0x1047214: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01047208: 0x1047208: jal   0x1058c68 sw    zero, 16(sp)
+// 0x01047218: 0x1047218: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4651,24 +4651,24 @@ L_10471e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047210: 0x1047210: addiu a0, zero, 1
+// 0x01047220: 0x1047220: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01047214: 0x1047214: addu  a1, zero, zero
+// 0x01047224: 0x1047224: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047218: 0x1047218: addu  a2, zero, zero
+// 0x01047228: 0x1047228: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104721c: 0x104721c: addiu a3, zero, -1
+// 0x0104722c: 0x104722c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01047220: 0x1047220: jal   0x1058c68 sw    zero, 16(sp)
+// 0x01047230: 0x1047230: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4682,24 +4682,24 @@ L_10471e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047228: 0x1047228: addu  a1, zero, zero
+// 0x01047238: 0x1047238: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104722c: 0x104722c: addu  a2, zero, zero
+// 0x0104723c: 0x104723c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047230: 0x1047230: addiu a3, zero, -1
+// 0x01047240: 0x1047240: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01047234: 0x1047234: addiu a0, zero, 2
+// 0x01047244: 0x1047244: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01047238: 0x1047238: jal   0x1058c68 sw    zero, 16(sp)
+// 0x01047248: 0x1047248: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4713,19 +4713,19 @@ L_10471e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047240: 0x1047240: jal   0x1006bfc addiu a0, zero, -1
+// 0x01047250: 0x1047250: jal   0x1006c0c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01047248: 0x1047248: jal   0x1046d9c addu  a0, s0, zero
+// 0x01047258: 0x1047258: jal   0x1046dac addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4733,34 +4733,34 @@ L_10471e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::highligh_selection_1046d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::highligh_selection_1046dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047250: 0x1047250: addiu v0, zero, -1
+// 0x01047260: 0x1047260: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01047254: 0x1047254: bne   s0, v0, 0x10472c0 addiu s4, zero, 44
+// 0x01047264: 0x1047264: bne   s0, v0, 0x10472d0 addiu s4, zero, 44
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 44
 	stloc 10
-	bne.un L_10472c0
+	bne.un L_10472d0
 // --- basic block ---
-// 0x0104725c: 0x104725c: addu  s0, s2, zero
+// 0x0104726c: 0x104726c: addu  s0, s2, zero
 	ldloc 9
 	stloc 8
-// 0x01047260: 0x1047260: addiu s3, zero, 1
+// 0x01047270: 0x1047270: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x01047264: 0x1047264: j	 0x1047284 addu  s2, zero, zero
+// 0x01047274: 0x1047274: j	 0x1047294 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_1047284
+	br L_1047294
 // --- basic block ---
-L_104726c:
-// 0x0104726c: 0x104726c: lw    a1, 796(s0)
+L_104727c:
+// 0x0104727c: 0x104727c: lw    a1, 796(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4769,7 +4769,7 @@ L_104726c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047270: 0x1047270: lw    a2, 788(s0)
+// 0x01047280: 0x1047280: lw    a2, 788(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4778,7 +4778,7 @@ L_104726c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01047274: 0x1047274: lw    a3, 772(s0)
+// 0x01047284: 0x1047284: lw    a3, 772(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4787,12 +4787,12 @@ L_104726c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01047278: 0x1047278: addiu s2, s2, 1
+// 0x01047288: 0x1047288: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0104727c: 0x104727c: jal   0x1058c68 sw    s3, 16(sp)
+// 0x0104728c: 0x104728c: jal   0x1058c78 sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4806,35 +4806,35 @@ L_104726c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1047284:
-// 0x01047284: 0x1047284: jal   0x108e568 addiu s0, s0, 44
+L_1047294:
+// 0x01047294: 0x1047294: jal   0x108eb8c addiu s0, s0, 44
 	ldloc 8
 	ldc.i4.s 44
 	add
 	stloc 8
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x0104728c: 0x104728c: slt   v0, s2, v0
+// 0x0104729c: 0x104729c: slt   v0, s2, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01047290: 0x1047290: bne   v0, zero, 0x104726c addu  a0, s2, zero
+// 0x010472a0: 0x10472a0: bne   v0, zero, 0x104727c addu  a0, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_104726c
+	brtrue L_104727c
 // --- basic block ---
-// 0x01047298: 0x1047298: lui   a0, 0x10000
+// 0x010472a8: 0x10472a8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104729c: 0x104729c: sw    zero, 116(s1)
+// 0x010472ac: 0x10472ac: sw    zero, 116(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4843,9 +4843,9 @@ L_1047284:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010472a0: 0x10472a0: jal   0x101cd60 addiu a0, a0, 312
+// 0x010472b0: 0x10472b0: jal   0x101cd70 addiu a0, a0, 308
 	ldloc.1
-	ldc.i4 312
+	ldc.i4 308
 	add
 	stloc.1
 	ldloc.0
@@ -4853,20 +4853,20 @@ L_1047284:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010472a8: 0x10472a8: lui   a0, 0x10000
+// 0x010472b8: 0x10472b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010472ac: 0x10472ac: addiu a0, a0, 328
+// 0x010472bc: 0x10472bc: addiu a0, a0, 324
 	ldloc.1
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.1
-// 0x010472b0: 0x10472b0: jal   0x10958c4 addu  a1, v0, zero
+// 0x010472c0: 0x10472c0: jal   0x1095f0c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4874,40 +4874,40 @@ L_1047284:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_change_text_10958c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_change_text_1095f0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010472b8: 0x10472b8: j	 0x1047370 sll   zero, zero, 0
-	br L_1047370
+// 0x010472c8: 0x10472c8: j	 0x1047380 sll   zero, zero, 0
+	br L_1047380
 // --- basic block ---
-L_10472c0:
-// 0x010472c0: 0x10472c0: mult  s0, s4
+L_10472d0:
+// 0x010472d0: 0x10472d0: mult  s0, s4
 	ldloc 8
 	ldloc 10
 	mul
 	stloc 15
-// 0x010472c4: 0x10472c4: addu  a0, s0, zero
+// 0x010472d4: 0x10472d4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010472c8: 0x10472c8: addiu s5, sp, 24
+// 0x010472d8: 0x10472d8: addiu s5, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 13
-// 0x010472cc: 0x10472cc: lui   s3, 0x1040000
+// 0x010472dc: 0x10472dc: lui   s3, 0x1040000
 	ldc.i4 17039360
 	stloc 12
-// 0x010472d0: 0x10472d0: mflo  lo
+// 0x010472e0: 0x10472e0: mflo  lo
 	ldloc 15
 	stloc 10
-// 0x010472d4: 0x10472d4: addu  v0, s2, s4
+// 0x010472e4: 0x10472e4: addu  v0, s2, s4
 	ldloc 9
 	ldloc 10
 	add
 	stloc 5
-// 0x010472d8: 0x10472d8: lw    a3, 816(v0)
+// 0x010472e8: 0x10472e8: lw    a3, 816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4916,7 +4916,7 @@ L_10472c0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010472dc: 0x10472dc: lw    a1, 840(v0)
+// 0x010472ec: 0x10472ec: lw    a1, 840(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4925,7 +4925,7 @@ L_10472c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010472e0: 0x10472e0: lw    a2, 832(v0)
+// 0x010472f0: 0x10472f0: lw    a2, 832(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4934,10 +4934,10 @@ L_10472c0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010472e4: 0x10472e4: addiu v0, zero, 1
+// 0x010472f4: 0x10472f4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010472e8: 0x10472e8: jal   0x1058c68 sw    v0, 16(sp)
+// 0x010472f8: 0x10472f8: jal   0x1058c78 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4951,17 +4951,17 @@ L_10472c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010472f0: 0x10472f0: lui   a0, 0x10000
+// 0x01047300: 0x1047300: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010472f4: 0x10472f4: jal   0x101cd60 addiu a0, a0, 340
+// 0x01047304: 0x1047304: jal   0x101cd70 addiu a0, a0, 336
 	ldloc.1
-	ldc.i4 340
+	ldc.i4 336
 	add
 	stloc.1
 	ldloc.0
@@ -4969,20 +4969,20 @@ L_10472c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010472fc: 0x10472fc: addu  a1, v0, zero
+// 0x0104730c: 0x104730c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047300: 0x1047300: addiu a2, s0, 1
+// 0x01047310: 0x1047310: addiu a2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01047304: 0x1047304: jal   0x1000f64 addu  a0, s5, zero
+// 0x01047314: 0x1047314: jal   0x1000f64 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -4995,15 +4995,15 @@ L_10472c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104730c: 0x104730c: lui   a0, 0x10000
+// 0x0104731c: 0x104731c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047310: 0x1047310: addu  a1, s5, zero
+// 0x01047320: 0x1047320: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x01047314: 0x1047314: jal   0x10958c4 addiu a0, a0, 328
+// 0x01047324: 0x1047324: jal   0x1095f0c addiu a0, a0, 324
 	ldloc.1
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.1
 	ldloc.0
@@ -5011,17 +5011,17 @@ L_10472c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_change_text_10958c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_change_text_1095f0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104731c: 0x104731c: addiu s4, s4, 800
+// 0x0104732c: 0x104732c: addiu s4, s4, 800
 	ldloc 10
 	ldc.i4 800
 	add
 	stloc 10
-// 0x01047320: 0x1047320: jal   0x1000910 addiu a0, zero, 8
+// 0x01047330: 0x1047330: jal   0x1000910 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
 	ldloc.0
@@ -5034,17 +5034,17 @@ L_10472c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047328: 0x1047328: addu  s2, s2, s4
+// 0x01047338: 0x1047338: addu  s2, s2, s4
 	ldloc 9
 	ldloc 10
 	add
 	stloc 9
-// 0x0104732c: 0x104732c: addiu a1, s3, 30184
+// 0x0104733c: 0x104733c: addiu a1, s3, 30200
 	ldloc 12
-	ldc.i4 30184
+	ldc.i4 30200
 	add
 	stloc.2
-// 0x01047330: 0x1047330: sw    v0, 116(s1)
+// 0x01047340: 0x1047340: sw    v0, 116(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5053,17 +5053,17 @@ L_10472c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01047334: 0x1047334: addu  a0, s1, zero
+// 0x01047344: 0x1047344: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01047338: 0x1047338: sw    s0, 0(v0)
+// 0x01047348: 0x1047348: sw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0104733c: 0x104733c: jal   0x1099174 sw    s2, 4(v0)
+// 0x0104734c: 0x104734c: jal   0x10997bc sw    s2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5074,14 +5074,14 @@ L_10472c0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01047344: 0x1047344: lui   a0, 0x10000
+// 0x01047354: 0x1047354: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047348: 0x1047348: jal   0x101cd60 addiu a0, a0, -6188
+// 0x01047358: 0x1047358: jal   0x101cd70 addiu a0, a0, -6192
 	ldloc.1
-	ldc.i4 -6188
+	ldc.i4 -6192
 	add
 	stloc.1
 	ldloc.0
@@ -5089,15 +5089,15 @@ L_10472c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047350: 0x1047350: addu  a1, v0, zero
+// 0x01047360: 0x1047360: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047354: 0x1047354: jal   0x109b434 addu  a0, s1, zero
+// 0x01047364: 0x1047364: jal   0x109ba7c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -5105,23 +5105,23 @@ L_10472c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104735c: 0x104735c: jal   0x1095020 sll   zero, zero, 0
+// 0x0104736c: 0x104736c: jal   0x1095668 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095020(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095668(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047364: 0x1047364: lw    a1, 16(s1)
+// 0x01047374: 0x1047374: lw    a1, 16(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5130,9 +5130,9 @@ L_10472c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047368: 0x1047368: jal   0x109c5ec addiu a0, s3, 30184
+// 0x01047378: 0x1047378: jal   0x109cc34 addiu a0, s3, 30200
 	ldloc 12
-	ldc.i4 30184
+	ldc.i4 30200
 	add
 	stloc.1
 	ldloc.0
@@ -5140,33 +5140,33 @@ L_10472c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1047370:
-// 0x01047370: 0x1047370: jal   0x1006bfc addiu a0, zero, 60
+L_1047380:
+// 0x01047380: 0x1047380: jal   0x1006c0c addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01047378: 0x1047378: jal   0x1021900 sll   zero, zero, 0
+// 0x01047388: 0x1047388: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1047380:
-// 0x01047380: 0x1047380: lw    ra, 76(sp)
-// 0x01047384: 0x1047384: lw    s5, 72(sp)
+L_1047390:
+// 0x01047390: 0x1047390: lw    ra, 76(sp)
+// 0x01047394: 0x1047394: lw    s5, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5175,7 +5175,7 @@ L_1047380:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01047388: 0x1047388: lw    s4, 68(sp)
+// 0x01047398: 0x1047398: lw    s4, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5184,7 +5184,7 @@ L_1047380:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104738c: 0x104738c: lw    s3, 64(sp)
+// 0x0104739c: 0x104739c: lw    s3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5193,7 +5193,7 @@ L_1047380:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01047390: 0x1047390: lw    s2, 60(sp)
+// 0x010473a0: 0x10473a0: lw    s2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5202,7 +5202,7 @@ L_1047380:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01047394: 0x1047394: lw    s1, 56(sp)
+// 0x010473a4: 0x10473a4: lw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5211,7 +5211,7 @@ L_1047380:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01047398: 0x1047398: lw    s0, 52(sp)
+// 0x010473a8: 0x10473a8: lw    s0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5220,7 +5220,7 @@ L_1047380:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104739c: 0x104739c: jr    ra addiu sp, sp, 80
+// 0x010473ac: 0x10473ac: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -5232,7 +5232,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnKeyPressed_10473a4(int32,int32,int32,int32,int32)
+.method public static int32 OnKeyPressed_10473b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -5267,355 +5267,355 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010473a4: 0x10473a4: addiu sp, sp, -24
+// 0x010473b4: 0x10473b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010473a8: 0x10473a8: beq   a0, zero, 0x1047514 sw    ra, 20(sp)
+// 0x010473b8: 0x10473b8: beq   a0, zero, 0x1047524 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1047514
+	brfalse L_1047524
 // --- basic block ---
-// 0x010473b0: 0x10473b0: lb    v0, 0(a1)
+// 0x010473c0: 0x10473c0: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010473b4: 0x10473b4: addiu v1, zero, 4
+// 0x010473c4: 0x10473c4: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010473b8: 0x10473b8: beq   v0, v1, 0x1047470 addiu v1, zero, 5
+// 0x010473c8: 0x10473c8: beq   v0, v1, 0x1047480 addiu v1, zero, 5
 	ldloc 6
 	ldloc 5
 	ldc.i4.5
 	stloc 5
-	beq  L_1047470
+	beq  L_1047480
 // --- basic block ---
-// 0x010473c0: 0x10473c0: beq   v0, v1, 0x1047488 addiu v1, zero, 6
+// 0x010473d0: 0x10473d0: beq   v0, v1, 0x1047498 addiu v1, zero, 6
 	ldloc 6
 	ldloc 5
 	ldc.i4.6
 	stloc 5
-	beq  L_1047488
+	beq  L_1047498
 // --- basic block ---
-// 0x010473c8: 0x10473c8: beq   v0, v1, 0x10474a0 addiu v1, zero, 7
+// 0x010473d8: 0x10473d8: beq   v0, v1, 0x10474b0 addiu v1, zero, 7
 	ldloc 6
 	ldloc 5
 	ldc.i4.7
 	stloc 5
-	beq  L_10474a0
+	beq  L_10474b0
 // --- basic block ---
-// 0x010473d0: 0x10473d0: beq   v0, v1, 0x10474b8 addiu v1, zero, 35
+// 0x010473e0: 0x10473e0: beq   v0, v1, 0x10474c8 addiu v1, zero, 35
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 35
 	stloc 5
-	beq  L_10474b8
+	beq  L_10474c8
 // --- basic block ---
-// 0x010473d8: 0x10473d8: beq   v0, v1, 0x10474e0 slti  v1, v0, 42
+// 0x010473e8: 0x10473e8: beq   v0, v1, 0x10474f0 slti  v1, v0, 42
 	ldloc 6
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 42
 	clt
 	stloc 5
-	beq  L_10474e0
+	beq  L_10474f0
 // --- basic block ---
-// 0x010473e0: 0x10473e0: bne   v1, zero, 0x1047514 slti  v1, v0, 44
+// 0x010473f0: 0x10473f0: bne   v1, zero, 0x1047524 slti  v1, v0, 44
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 44
 	clt
 	stloc 5
-	brtrue L_1047514
+	brtrue L_1047524
 // --- basic block ---
-// 0x010473e8: 0x10473e8: bne   v1, zero, 0x10474d0 addiu v1, zero, 45
+// 0x010473f8: 0x10473f8: bne   v1, zero, 0x10474e0 addiu v1, zero, 45
 	ldloc 5
 	ldc.i4.s 45
 	stloc 5
-	brtrue L_10474d0
+	brtrue L_10474e0
 // --- basic block ---
-// 0x010473f0: 0x10473f0: beq   v0, v1, 0x10474e0 addiu v1, zero, 48
+// 0x01047400: 0x1047400: beq   v0, v1, 0x10474f0 addiu v1, zero, 48
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 48
 	stloc 5
-	beq  L_10474e0
+	beq  L_10474f0
 // --- basic block ---
-// 0x010473f8: 0x10473f8: beq   v0, v1, 0x10474f0 addiu v1, zero, 49
+// 0x01047408: 0x1047408: beq   v0, v1, 0x1047500 addiu v1, zero, 49
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 49
 	stloc 5
-	beq  L_10474f0
+	beq  L_1047500
 // --- basic block ---
-// 0x01047400: 0x1047400: beq   v0, v1, 0x10474f8 addiu v1, zero, 50
+// 0x01047410: 0x1047410: beq   v0, v1, 0x1047508 addiu v1, zero, 50
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 50
 	stloc 5
-	beq  L_10474f8
+	beq  L_1047508
 // --- basic block ---
-// 0x01047408: 0x1047408: beq   v0, v1, 0x1047500 addiu v1, zero, 51
+// 0x01047418: 0x1047418: beq   v0, v1, 0x1047510 addiu v1, zero, 51
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 51
 	stloc 5
-	beq  L_1047500
+	beq  L_1047510
 // --- basic block ---
-// 0x01047410: 0x1047410: beq   v0, v1, 0x1047508 addiu v1, zero, 69
+// 0x01047420: 0x1047420: beq   v0, v1, 0x1047518 addiu v1, zero, 69
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 69
 	stloc 5
-	beq  L_1047508
+	beq  L_1047518
 // --- basic block ---
-// 0x01047418: 0x1047418: beq   v0, v1, 0x1047500 addiu v1, zero, 73
+// 0x01047428: 0x1047428: beq   v0, v1, 0x1047510 addiu v1, zero, 73
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 73
 	stloc 5
-	beq  L_1047500
+	beq  L_1047510
 // --- basic block ---
-// 0x01047420: 0x1047420: beq   v0, v1, 0x10474d0 addiu v1, zero, 79
+// 0x01047430: 0x1047430: beq   v0, v1, 0x10474e0 addiu v1, zero, 79
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 79
 	stloc 5
-	beq  L_10474d0
+	beq  L_10474e0
 // --- basic block ---
-// 0x01047428: 0x1047428: beq   v0, v1, 0x10474e0 addiu v1, zero, 82
+// 0x01047438: 0x1047438: beq   v0, v1, 0x10474f0 addiu v1, zero, 82
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 82
 	stloc 5
-	beq  L_10474e0
+	beq  L_10474f0
 // --- basic block ---
-// 0x01047430: 0x1047430: beq   v0, v1, 0x1047508 addiu v1, zero, 87
+// 0x01047440: 0x1047440: beq   v0, v1, 0x1047518 addiu v1, zero, 87
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 87
 	stloc 5
-	beq  L_1047508
+	beq  L_1047518
 // --- basic block ---
-// 0x01047438: 0x1047438: beq   v0, v1, 0x10474f8 addiu v1, zero, 101
+// 0x01047448: 0x1047448: beq   v0, v1, 0x1047508 addiu v1, zero, 101
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 101
 	stloc 5
-	beq  L_10474f8
+	beq  L_1047508
 // --- basic block ---
-// 0x01047440: 0x1047440: beq   v0, v1, 0x1047500 addiu v1, zero, 105
+// 0x01047450: 0x1047450: beq   v0, v1, 0x1047510 addiu v1, zero, 105
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 105
 	stloc 5
-	beq  L_1047500
+	beq  L_1047510
 // --- basic block ---
-// 0x01047448: 0x1047448: beq   v0, v1, 0x10474d0 addiu v1, zero, 111
+// 0x01047458: 0x1047458: beq   v0, v1, 0x10474e0 addiu v1, zero, 111
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 111
 	stloc 5
-	beq  L_10474d0
+	beq  L_10474e0
 // --- basic block ---
-// 0x01047450: 0x1047450: beq   v0, v1, 0x10474e0 addiu v1, zero, 114
+// 0x01047460: 0x1047460: beq   v0, v1, 0x10474f0 addiu v1, zero, 114
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 114
 	stloc 5
-	beq  L_10474e0
+	beq  L_10474f0
 // --- basic block ---
-// 0x01047458: 0x1047458: beq   v0, v1, 0x1047508 addiu v1, zero, 119
+// 0x01047468: 0x1047468: beq   v0, v1, 0x1047518 addiu v1, zero, 119
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 119
 	stloc 5
-	beq  L_1047508
+	beq  L_1047518
 // --- basic block ---
-// 0x01047460: 0x1047460: bne   v0, v1, 0x1047514 addu  a0, zero, zero
+// 0x01047470: 0x1047470: bne   v0, v1, 0x1047524 addu  a0, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_1047514
+	bne.un L_1047524
 // --- basic block ---
-// 0x01047468: 0x1047468: j	 0x104750c sll   zero, zero, 0
-	br L_104750c
+// 0x01047478: 0x1047478: j	 0x104751c sll   zero, zero, 0
+	br L_104751c
 // --- basic block ---
-L_1047470:
-// 0x01047470: 0x1047470: jal   0x1021394 sll   zero, zero, 0
+L_1047480:
+// 0x01047480: 0x1047480: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01047478: 0x1047478: jal   0x1020bdc sll   zero, zero, 0
+// 0x01047488: 0x1047488: jal   0x1020bec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_up_1020bdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_up_1020bec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01047480: 0x1047480: j	 0x1047514 sll   zero, zero, 0
-	br L_1047514
+// 0x01047490: 0x1047490: j	 0x1047524 sll   zero, zero, 0
+	br L_1047524
 // --- basic block ---
-L_1047488:
-// 0x01047488: 0x1047488: jal   0x1021394 sll   zero, zero, 0
+L_1047498:
+// 0x01047498: 0x1047498: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01047490: 0x1047490: jal   0x1020ba0 sll   zero, zero, 0
+// 0x010474a0: 0x10474a0: jal   0x1020bb0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_down_1020ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_down_1020bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01047498: 0x1047498: j	 0x1047514 sll   zero, zero, 0
-	br L_1047514
+// 0x010474a8: 0x10474a8: j	 0x1047524 sll   zero, zero, 0
+	br L_1047524
 // --- basic block ---
-L_10474a0:
-// 0x010474a0: 0x10474a0: jal   0x1021394 sll   zero, zero, 0
+L_10474b0:
+// 0x010474b0: 0x10474b0: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010474a8: 0x10474a8: jal   0x1020b28 sll   zero, zero, 0
+// 0x010474b8: 0x10474b8: jal   0x1020b38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_left_1020b28(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_left_1020b38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010474b0: 0x10474b0: j	 0x1047514 sll   zero, zero, 0
-	br L_1047514
+// 0x010474c0: 0x10474c0: j	 0x1047524 sll   zero, zero, 0
+	br L_1047524
 // --- basic block ---
-L_10474b8:
-// 0x010474b8: 0x10474b8: jal   0x1021394 sll   zero, zero, 0
+L_10474c8:
+// 0x010474c8: 0x10474c8: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010474c0: 0x10474c0: jal   0x1020b64 sll   zero, zero, 0
+// 0x010474d0: 0x10474d0: jal   0x1020b74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_right_1020b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_right_1020b74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010474c8: 0x10474c8: j	 0x1047514 sll   zero, zero, 0
-	br L_1047514
+// 0x010474d8: 0x10474d8: j	 0x1047524 sll   zero, zero, 0
+	br L_1047524
 // --- basic block ---
-L_10474d0:
-// 0x010474d0: 0x10474d0: jal   0x1021110 sll   zero, zero, 0
+L_10474e0:
+// 0x010474e0: 0x10474e0: jal   0x1021120 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_in_1021110(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_in_1021120(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010474d8: 0x10474d8: j	 0x1047514 sll   zero, zero, 0
-	br L_1047514
+// 0x010474e8: 0x10474e8: j	 0x1047524 sll   zero, zero, 0
+	br L_1047524
 // --- basic block ---
-L_10474e0:
-// 0x010474e0: 0x10474e0: jal   0x1021040 sll   zero, zero, 0
+L_10474f0:
+// 0x010474f0: 0x10474f0: jal   0x1021050 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_out_1021040(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_out_1021050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010474e8: 0x10474e8: j	 0x1047514 sll   zero, zero, 0
-	br L_1047514
+// 0x010474f8: 0x10474f8: j	 0x1047524 sll   zero, zero, 0
+	br L_1047524
 // --- basic block ---
-L_10474f0:
-// 0x010474f0: 0x10474f0: j	 0x104750c addiu a0, zero, -1
+L_1047500:
+// 0x01047500: 0x1047500: j	 0x104751c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-	br L_104750c
+	br L_104751c
 // --- basic block ---
-L_10474f8:
-// 0x010474f8: 0x10474f8: j	 0x104750c addu  a0, zero, zero
+L_1047508:
+// 0x01047508: 0x1047508: j	 0x104751c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_104750c
+	br L_104751c
 // --- basic block ---
-L_1047500:
-// 0x01047500: 0x1047500: j	 0x104750c addiu a0, zero, 1
+L_1047510:
+// 0x01047510: 0x1047510: j	 0x104751c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-	br L_104750c
+	br L_104751c
 // --- basic block ---
-L_1047508:
-// 0x01047508: 0x1047508: addiu a0, zero, 2
+L_1047518:
+// 0x01047518: 0x1047518: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-L_104750c:
-// 0x0104750c: 0x104750c: jal   0x1047188 sll   zero, zero, 0
+L_104751c:
+// 0x0104751c: 0x104751c: jal   0x1047198 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::keypressed_showroute_1047188(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::keypressed_showroute_1047198(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1047514:
-// 0x01047514: 0x1047514: lw    ra, 20(sp)
-// 0x01047518: 0x1047518: addu  v0, zero, zero
+L_1047524:
+// 0x01047524: 0x1047524: lw    ra, 20(sp)
+// 0x01047528: 0x1047528: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0104751c: 0x104751c: jr    ra addiu sp, sp, 24
+// 0x0104752c: 0x104752c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5627,7 +5627,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_compare_routes_option_selected_1047524(int32,int32,int32,int32,int32)
+.method public static int32 on_compare_routes_option_selected_1047534(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -5665,12 +5665,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01047524: 0x1047524: addiu sp, sp, -32
+// 0x01047534: 0x1047534: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01047528: 0x1047528: sw    s0, 24(sp)
+// 0x01047538: 0x1047538: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5679,13 +5679,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104752c: 0x104752c: lui   v0, 0x60000
+// 0x0104753c: 0x104753c: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01047530: 0x1047530: addu  s0, a0, zero
+// 0x01047540: 0x1047540: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01047534: 0x1047534: sw    a1, 16(sp)
+// 0x01047544: 0x1047544: sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5694,17 +5694,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01047538: 0x1047538: sw    ra, 28(sp)
-// 0x0104753c: 0x104753c: sw    zero, 20292(v0)
+// 0x01047548: 0x1047548: sw    ra, 28(sp)
+// 0x0104754c: 0x104754c: sw    zero, 20756(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5073
+	ldc.i4 5189
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01047540: 0x1047540: jal   0x101fcfc sw    a2, 20(sp)
+// 0x01047550: 0x1047550: jal   0x101fd0c sw    a2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5718,12 +5718,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_unfreeze_101fcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_unfreeze_101fd0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047548: 0x1047548: lw    a0, 20(sp)
+// 0x01047558: 0x1047558: lw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5732,7 +5732,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104754c: 0x104754c: lw    a1, 16(sp)
+// 0x0104755c: 0x104755c: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5741,11 +5741,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047550: 0x1047550: beq   s0, zero, 0x10475d8 sll   zero, zero, 0
+// 0x01047560: 0x1047560: beq   s0, zero, 0x10475e8 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10475d8
+	brfalse L_10475e8
 // --- basic block ---
-// 0x01047558: 0x1047558: lw    v0, 20(a1)
+// 0x01047568: 0x1047568: lw    v0, 20(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5754,111 +5754,111 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104755c: 0x104755c: sll   zero, zero, 0
-// 0x01047560: 0x1047560: sltiu v1, v0, 11
+// 0x0104756c: 0x104756c: sll   zero, zero, 0
+// 0x01047570: 0x1047570: sltiu v1, v0, 11
 	ldloc 5
 	ldc.i4.s 11
 	clt.un
 	stloc 7
-// 0x01047564: 0x1047564: beq   v1, zero, 0x10475d0 lui   v1, 0x20000
+// 0x01047574: 0x1047574: beq   v1, zero, 0x10475e0 lui   v1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 7
-	brfalse L_10475d0
+	brfalse L_10475e0
 // --- basic block ---
-// 0x0104756c: 0x104756c: sll   v0, v0, 2
+// 0x0104757c: 0x104757c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01047570: 0x1047570: addiu v1, v1, 27664
+// 0x01047580: 0x1047580: addiu v1, v1, 28128
 	ldloc 7
-	ldc.i4 27664
+	ldc.i4 28128
 	add
 	stloc 7
-// 0x01047574: 0x1047574: addu  v0, v1, v0
+// 0x01047584: 0x1047584: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01047578: 0x1047578: lw    v0, 0(v0)
+// 0x01047588: 0x1047588: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104757c: 0x104757c: sll   zero, zero, 0
-// 0x01047580: 0x1047580: jr    v0 sll   zero, zero, 0
+// 0x0104758c: 0x104758c: sll   zero, zero, 0
+// 0x01047590: 0x1047590: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1047588:
-// 0x01047588: 0x1047588: jal   0x10469c8 sll   zero, zero, 0
+L_1047598:
+// 0x01047598: 0x1047598: jal   0x10469d8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::route_select_10469c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::route_select_10469d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047590: 0x1047590: j	 0x10475d4 lui   v0, 0x60000
+// 0x010475a0: 0x10475a0: j	 0x10475e4 lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-	br L_10475d4
+	br L_10475e4
 // --- basic block ---
-L_1047598:
-// 0x01047598: 0x1047598: j	 0x10475a4 addu  a0, zero, zero
+L_10475a8:
+// 0x010475a8: 0x10475a8: j	 0x10475b4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10475a4
+	br L_10475b4
 // --- basic block ---
-L_10475a0:
-// 0x010475a0: 0x10475a0: addiu a0, zero, 1
+L_10475b0:
+// 0x010475b0: 0x10475b0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_10475a4:
-// 0x010475a4: 0x10475a4: jal   0x1047188 sll   zero, zero, 0
+L_10475b4:
+// 0x010475b4: 0x10475b4: jal   0x1047198 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::keypressed_showroute_1047188(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::keypressed_showroute_1047198(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010475ac: 0x10475ac: j	 0x10475d4 lui   v0, 0x60000
+// 0x010475bc: 0x10475bc: j	 0x10475e4 lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-	br L_10475d4
+	br L_10475e4
 // --- basic block ---
-L_10475b4:
-// 0x010475b4: 0x10475b4: j	 0x10475a4 addiu a0, zero, 2
+L_10475c4:
+// 0x010475c4: 0x10475c4: j	 0x10475b4 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-	br L_10475a4
+	br L_10475b4
 // --- basic block ---
-L_10475bc:
-// 0x010475bc: 0x10475bc: j	 0x10475a4 addiu a0, zero, -1
+L_10475cc:
+// 0x010475cc: 0x10475cc: j	 0x10475b4 addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-	br L_10475a4
+	br L_10475b4
 // --- basic block ---
-L_10475c4:
-// 0x010475c4: 0x10475c4: lui   v0, 0x60000
+L_10475d4:
+// 0x010475d4: 0x10475d4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010475c8: 0x10475c8: jal   0x1021900 sw    zero, 20292(v0)
+// 0x010475d8: 0x10475d8: jal   0x1021910 sw    zero, 20756(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5073
+	ldc.i4 5189
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5867,28 +5867,28 @@ L_10475c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10475d0:
-// 0x010475d0: 0x10475d0: lui   v0, 0x60000
+L_10475e0:
+// 0x010475e0: 0x10475e0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-L_10475d4:
-// 0x010475d4: 0x10475d4: sw    zero, 20292(v0)
+L_10475e4:
+// 0x010475e4: 0x10475e4: sw    zero, 20756(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5073
+	ldc.i4 5189
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10475d8:
-// 0x010475d8: 0x10475d8: lw    ra, 28(sp)
-// 0x010475dc: 0x10475dc: lw    s0, 24(sp)
+L_10475e8:
+// 0x010475e8: 0x10475e8: lw    ra, 28(sp)
+// 0x010475ec: 0x10475ec: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5897,7 +5897,7 @@ L_10475d8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010475e0: 0x10475e0: jr    ra addiu sp, sp, 32
+// 0x010475f0: 0x10475f0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5907,26 +5907,26 @@ L_10475d8:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17069448
-	beq  L_1047588
-	ldloc 5
 	ldc.i4 17069464
 	beq  L_1047598
 	ldloc 5
-	ldc.i4 17069472
-	beq  L_10475a0
-	ldloc 5
-	ldc.i4 17069492
-	beq  L_10475b4
+	ldc.i4 17069480
+	beq  L_10475a8
 	ldloc 5
-	ldc.i4 17069500
-	beq  L_10475bc
+	ldc.i4 17069488
+	beq  L_10475b0
 	ldloc 5
 	ldc.i4 17069508
 	beq  L_10475c4
 	ldloc 5
-	ldc.i4 17069520
-	beq  L_10475d0
+	ldc.i4 17069516
+	beq  L_10475cc
+	ldloc 5
+	ldc.i4 17069524
+	beq  L_10475d4
+	ldloc 5
+	ldc.i4 17069536
+	beq  L_10475e0
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -5934,7 +5934,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 compare_routes_options_sk_cb_10475e8(int32,int32,int32,int32,int32)
+.method public static int32 compare_routes_options_sk_cb_10475f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 ra)
@@ -5984,12 +5984,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010475e8: 0x10475e8: addiu sp, sp, -56
+// 0x010475f8: 0x10475f8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010475ec: 0x10475ec: sw    s0, 32(sp)
+// 0x010475fc: 0x10475fc: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5998,14 +5998,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010475f0: 0x10475f0: addu  s0, a0, zero
+// 0x01047600: 0x1047600: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010475f4: 0x10475f4: addu  a0, zero, zero
+// 0x01047604: 0x1047604: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010475f8: 0x10475f8: sw    ra, 52(sp)
-// 0x010475fc: 0x10475fc: sw    s4, 48(sp)
+// 0x01047608: 0x1047608: sw    ra, 52(sp)
+// 0x0104760c: 0x104760c: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6014,7 +6014,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01047600: 0x1047600: sw    s3, 44(sp)
+// 0x01047610: 0x1047610: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6023,7 +6023,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01047604: 0x1047604: sw    s2, 40(sp)
+// 0x01047614: 0x1047614: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6032,7 +6032,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01047608: 0x1047608: jal   0x108e530 sw    s1, 36(sp)
+// 0x01047618: 0x1047618: jal   0x108eb54 sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6042,33 +6042,33 @@ __CIBYL_javamethod_begin:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x01047610: 0x1047610: beq   v0, zero, 0x1047710 sll   zero, zero, 0
+// 0x01047620: 0x1047620: beq   v0, zero, 0x1047720 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1047710
+	brfalse L_1047720
 // --- basic block ---
-// 0x01047618: 0x1047618: jal   0x108e568 sll   zero, zero, 0
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+// 0x01047628: 0x1047628: jal   0x108eb8c sll   zero, zero, 0
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x01047620: 0x1047620: addu  s3, v0, zero
+// 0x01047630: 0x1047630: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01047624: 0x1047624: lui   v0, 0x60000
+// 0x01047634: 0x1047634: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01047628: 0x1047628: lw    v0, 20288(v0)
+// 0x01047638: 0x1047638: lw    v0, 20752(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5072
+	ldc.i4 5188
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104762c: 0x104762c: lw    s2, 116(s0)
+// 0x0104763c: 0x104763c: lw    s2, 116(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6077,20 +6077,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01047630: 0x1047630: beq   v0, zero, 0x1047648 slti  s1, s3, 2
+// 0x01047640: 0x1047640: beq   v0, zero, 0x1047658 slti  s1, s3, 2
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	clt
 	stloc 9
-	brfalse L_1047648
+	brfalse L_1047658
 // --- basic block ---
-// 0x01047638: 0x1047638: lui   a0, 0x1040000
+// 0x01047648: 0x1047648: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0104763c: 0x104763c: jal   0x104fd00 addiu a0, a0, 27584
+// 0x0104764c: 0x104764c: jal   0x104fd10 addiu a0, a0, 27600
 	ldloc.1
-	ldc.i4 27584
+	ldc.i4 27600
 	add
 	stloc.1
 	ldloc.0
@@ -6098,37 +6098,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047644: 0x1047644: slti  s1, s3, 2
+// 0x01047654: 0x1047654: slti  s1, s3, 2
 	ldloc 10
 	ldc.i4.2
 	clt
 	stloc 9
-L_1047648:
-// 0x01047648: 0x1047648: lui   s0, 0x0
+L_1047658:
+// 0x01047658: 0x1047658: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0104764c: 0x104764c: xori  s1, s1, 1
+// 0x0104765c: 0x104765c: xori  s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	xor
 	stloc 9
-// 0x01047650: 0x1047650: addu  a0, zero, zero
+// 0x01047660: 0x1047660: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01047654: 0x1047654: lui   v0, 0x60000
+// 0x01047664: 0x1047664: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01047658: 0x1047658: jal   0x109a424 sw    zero, 20288(v0)
+// 0x01047668: 0x1047668: jal   0x109aa6c sw    zero, 20752(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5072
+	ldc.i4 5188
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6137,26 +6137,26 @@ L_1047648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047660: 0x1047660: addiu a0, s0, 13464
+// 0x01047670: 0x1047670: addiu a0, s0, 13464
 	ldloc 8
 	ldc.i4 13464
 	add
 	stloc.1
-// 0x01047664: 0x1047664: addiu a1, zero, 5
+// 0x01047674: 0x1047674: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01047668: 0x1047668: addu  a2, s1, zero
+// 0x01047678: 0x1047678: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0104766c: 0x104766c: addu  a3, zero, zero
+// 0x0104767c: 0x104767c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01047670: 0x1047670: jal   0x109c504 sltu  s4, zero, v0
+// 0x01047680: 0x1047680: jal   0x109cb4c sltu  s4, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
@@ -6166,23 +6166,23 @@ L_1047648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047678: 0x1047678: addiu a0, s0, 13464
+// 0x01047688: 0x1047688: addiu a0, s0, 13464
 	ldloc 8
 	ldc.i4 13464
 	add
 	stloc.1
-// 0x0104767c: 0x104767c: addiu a1, zero, 6
+// 0x0104768c: 0x104768c: addiu a1, zero, 6
 	ldc.i4.6
 	stloc.2
-// 0x01047680: 0x1047680: addu  a2, s1, zero
+// 0x01047690: 0x1047690: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x01047684: 0x1047684: jal   0x109c504 addu  a3, zero, zero
+// 0x01047694: 0x1047694: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6190,30 +6190,30 @@ L_1047648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104768c: 0x104768c: slti  a2, s3, 3
+// 0x0104769c: 0x104769c: slti  a2, s3, 3
 	ldloc 10
 	ldc.i4.3
 	clt
 	stloc.3
-// 0x01047690: 0x1047690: xori  a2, a2, 1
+// 0x010476a0: 0x10476a0: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x01047694: 0x1047694: addiu a0, s0, 13464
+// 0x010476a4: 0x10476a4: addiu a0, s0, 13464
 	ldloc 8
 	ldc.i4 13464
 	add
 	stloc.1
-// 0x01047698: 0x1047698: addiu a1, zero, 7
+// 0x010476a8: 0x10476a8: addiu a1, zero, 7
 	ldc.i4.7
 	stloc.2
-// 0x0104769c: 0x104769c: jal   0x109c504 addu  a3, zero, zero
+// 0x010476ac: 0x10476ac: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6221,34 +6221,34 @@ L_1047648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010476a4: 0x10476a4: sltu  s3, zero, s2
+// 0x010476b4: 0x10476b4: sltu  s3, zero, s2
 	ldc.i4.s 0
 	ldloc 12
 	clt.un
 	stloc 10
-// 0x010476a8: 0x10476a8: subu  a2, zero, s1
+// 0x010476b8: 0x10476b8: subu  a2, zero, s1
 	ldloc 9
 	neg
 	stloc.3
-// 0x010476ac: 0x10476ac: and   a2, s3, a2
+// 0x010476bc: 0x10476bc: and   a2, s3, a2
 	ldloc 10
 	ldloc.3
 	and
 	stloc.3
-// 0x010476b0: 0x10476b0: addiu a0, s0, 13464
+// 0x010476c0: 0x10476c0: addiu a0, s0, 13464
 	ldloc 8
 	ldc.i4 13464
 	add
 	stloc.1
-// 0x010476b4: 0x10476b4: addiu a1, zero, 2
+// 0x010476c4: 0x10476c4: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010476b8: 0x10476b8: jal   0x109c504 addu  a3, zero, zero
+// 0x010476c8: 0x10476c8: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6256,23 +6256,23 @@ L_1047648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010476c0: 0x10476c0: addu  a2, s3, zero
+// 0x010476d0: 0x10476d0: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x010476c4: 0x10476c4: addiu a0, s0, 13464
+// 0x010476d4: 0x10476d4: addiu a0, s0, 13464
 	ldloc 8
 	ldc.i4 13464
 	add
 	stloc.1
-// 0x010476c8: 0x10476c8: addu  a1, zero, zero
+// 0x010476d8: 0x10476d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010476cc: 0x10476cc: jal   0x109c504 addu  a3, zero, zero
+// 0x010476dc: 0x10476dc: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6280,23 +6280,23 @@ L_1047648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010476d4: 0x10476d4: nor   s4, zero, s4
+// 0x010476e4: 0x10476e4: nor   s4, zero, s4
 	ldloc 11
 	ldc.i4.m1
 	xor
 	stloc 11
-// 0x010476d8: 0x10476d8: addiu v0, zero, 2
+// 0x010476e8: 0x10476e8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010476dc: 0x10476dc: lui   a3, 0x1040000
+// 0x010476ec: 0x10476ec: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x010476e0: 0x10476e0: sw    v0, 20(sp)
+// 0x010476f0: 0x10476f0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6305,26 +6305,26 @@ L_1047648:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010476e4: 0x10476e4: addu  a0, s4, zero
+// 0x010476f4: 0x10476f4: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010476e8: 0x10476e8: addiu v0, zero, 1
+// 0x010476f8: 0x10476f8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010476ec: 0x10476ec: addiu a2, s0, 13464
+// 0x010476fc: 0x10476fc: addiu a2, s0, 13464
 	ldloc 8
 	ldc.i4 13464
 	add
 	stloc.3
-// 0x010476f0: 0x10476f0: addiu a3, a3, 29988
+// 0x01047700: 0x1047700: addiu a3, a3, 30004
 	ldloc 4
-	ldc.i4 29988
+	ldc.i4 30004
 	add
 	stloc 4
-// 0x010476f4: 0x10476f4: addiu a1, zero, -2
+// 0x01047704: 0x1047704: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x010476f8: 0x10476f8: sw    s2, 16(sp)
+// 0x01047708: 0x1047708: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6333,7 +6333,7 @@ L_1047648:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010476fc: 0x10476fc: sw    v0, 28(sp)
+// 0x0104770c: 0x104770c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6342,7 +6342,7 @@ L_1047648:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01047700: 0x1047700: jal   0x109c7f0 sw    zero, 24(sp)
+// 0x01047710: 0x1047710: jal   0x109ce38 sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6356,29 +6356,29 @@ L_1047648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01047708: 0x1047708: lui   v1, 0x60000
+// 0x01047718: 0x1047718: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x0104770c: 0x104770c: sw    v0, 20292(v1)
+// 0x0104771c: 0x104771c: sw    v0, 20756(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5073
+	ldc.i4 5189
 	add
 	ldloc 5
 	stelem.i4
-L_1047710:
-// 0x01047710: 0x1047710: lw    ra, 52(sp)
-// 0x01047714: 0x1047714: addiu v0, zero, 1
+L_1047720:
+// 0x01047720: 0x1047720: lw    ra, 52(sp)
+// 0x01047724: 0x1047724: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01047718: 0x1047718: lw    s4, 48(sp)
+// 0x01047728: 0x1047728: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6387,7 +6387,7 @@ L_1047710:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104771c: 0x104771c: lw    s3, 44(sp)
+// 0x0104772c: 0x104772c: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6396,7 +6396,7 @@ L_1047710:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01047720: 0x1047720: lw    s2, 40(sp)
+// 0x01047730: 0x1047730: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6405,7 +6405,7 @@ L_1047710:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01047724: 0x1047724: lw    s1, 36(sp)
+// 0x01047734: 0x1047734: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6414,7 +6414,7 @@ L_1047710:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01047728: 0x1047728: lw    s0, 32(sp)
+// 0x01047738: 0x1047738: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6423,7 +6423,7 @@ L_1047710:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104772c: 0x104772c: jr    ra addiu sp, sp, 56
+// 0x0104773c: 0x104773c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6435,7 +6435,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_show_route_highlight_dlg_closed_1047734(int32,int32,int32,int32,int32)
+.method public static int32 on_show_route_highlight_dlg_closed_1047744(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6470,25 +6470,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01047734: 0x1047734: addiu sp, sp, -32
+// 0x01047744: 0x1047744: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01047738: 0x1047738: addu  a0, zero, zero
+// 0x01047748: 0x1047748: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0104773c: 0x104773c: addu  a1, zero, zero
+// 0x0104774c: 0x104774c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047740: 0x1047740: addu  a2, zero, zero
+// 0x01047750: 0x1047750: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047744: 0x1047744: addiu a3, zero, -1
+// 0x01047754: 0x1047754: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01047748: 0x1047748: sw    ra, 28(sp)
-// 0x0104774c: 0x104774c: jal   0x1058c68 sw    zero, 16(sp)
+// 0x01047758: 0x1047758: sw    ra, 28(sp)
+// 0x0104775c: 0x104775c: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6502,24 +6502,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047754: 0x1047754: addiu a0, zero, 1
+// 0x01047764: 0x1047764: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01047758: 0x1047758: addu  a1, zero, zero
+// 0x01047768: 0x1047768: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104775c: 0x104775c: addu  a2, zero, zero
+// 0x0104776c: 0x104776c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047760: 0x1047760: addiu a3, zero, -1
+// 0x01047770: 0x1047770: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01047764: 0x1047764: jal   0x1058c68 sw    zero, 16(sp)
+// 0x01047774: 0x1047774: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6533,24 +6533,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104776c: 0x104776c: addu  a1, zero, zero
+// 0x0104777c: 0x104777c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047770: 0x1047770: addu  a2, zero, zero
+// 0x01047780: 0x1047780: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047774: 0x1047774: addiu a3, zero, -1
+// 0x01047784: 0x1047784: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01047778: 0x1047778: addiu a0, zero, 2
+// 0x01047788: 0x1047788: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0104777c: 0x104777c: jal   0x1058c68 sw    zero, 16(sp)
+// 0x0104778c: 0x104778c: jal   0x1058c78 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6564,22 +6564,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047784: 0x1047784: jal   0x1006bfc addiu a0, zero, -1
+// 0x01047794: 0x1047794: jal   0x1006c0c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0104778c: 0x104778c: lui   a0, 0x10000
+// 0x0104779c: 0x104779c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047790: 0x1047790: jal   0x101ece8 addiu a0, a0, -31052
+// 0x010477a0: 0x10477a0: jal   0x101ecf8 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -6589,17 +6589,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047798: 0x1047798: lui   a0, 0x1040000
+// 0x010477a8: 0x10477a8: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x0104779c: 0x104779c: jal   0x104b840 addiu a0, a0, 25676
+// 0x010477ac: 0x10477ac: jal   0x104b850 addiu a0, a0, 25692
 	ldloc.1
-	ldc.i4 25676
+	ldc.i4 25692
 	add
 	stloc.1
 	ldloc.0
@@ -6607,49 +6607,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_pointer_unregister_long_click_104b840(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_pointer_unregister_long_click_104b850(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010477a4: 0x10477a4: jal   0x101bd0c sll   zero, zero, 0
-	call int32 Cibyl20::roadmap_object_enable_short_click_101bd0c()
+// 0x010477b4: 0x10477b4: jal   0x101bd1c sll   zero, zero, 0
+	call int32 Cibyl20::roadmap_object_enable_short_click_101bd1c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010477ac: 0x10477ac: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x010477bc: 0x10477bc: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010477b4: 0x10477b4: beq   v0, zero, 0x10477c0 addiu a1, zero, -50
+// 0x010477c4: 0x10477c4: beq   v0, zero, 0x10477d0 addiu a1, zero, -50
 	ldloc 5
 	ldc.i4.s -50
 	stloc.2
-	brfalse L_10477c0
+	brfalse L_10477d0
 // --- basic block ---
-// 0x010477bc: 0x10477bc: addiu a1, zero, -110
+// 0x010477cc: 0x10477cc: addiu a1, zero, -110
 	ldc.i4.s -110
 	stloc.2
-L_10477c0:
-// 0x010477c0: 0x10477c0: jal   0x102f90c addu  a0, zero, zero
+L_10477d0:
+// 0x010477d0: 0x10477d0: jal   0x102f91c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f90c(int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f91c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010477c8: 0x10477c8: jal   0x104247c sll   zero, zero, 0
-	call void Cibyl48::roadmap_bottom_bar_show_104247c()
+// 0x010477d8: 0x10477d8: jal   0x104248c sll   zero, zero, 0
+	call void Cibyl48::roadmap_bottom_bar_show_104248c()
 // --- basic block ---
-// 0x010477d0: 0x10477d0: lw    ra, 28(sp)
-// 0x010477d4: 0x10477d4: sll   zero, zero, 0
-// 0x010477d8: 0x10477d8: jr    ra addiu sp, sp, 32
+// 0x010477e0: 0x10477e0: lw    ra, 28(sp)
+// 0x010477e4: 0x10477e4: sll   zero, zero, 0
+// 0x010477e8: 0x10477e8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6661,7 +6661,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alternative_route_get_src_10477e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_route_get_src_10477f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -6696,15 +6696,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010477e0: 0x10477e0: addiu sp, sp, -32
+// 0x010477f0: 0x10477f0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010477e4: 0x10477e4: addu  a1, a0, zero
+// 0x010477f4: 0x10477f4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010477e8: 0x10477e8: sw    a1, 16(sp)
+// 0x010477f8: 0x10477f8: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6713,15 +6713,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010477ec: 0x10477ec: sw    ra, 28(sp)
-// 0x010477f0: 0x10477f0: jal   0x108e530 addu  a0, zero, zero
+// 0x010477fc: 0x10477fc: sw    ra, 28(sp)
+// 0x01047800: 0x1047800: jal   0x108eb54 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 6
 // --- basic block ---
-// 0x010477f8: 0x10477f8: lw    a1, 16(sp)
+// 0x01047808: 0x1047808: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6730,27 +6730,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010477fc: 0x10477fc: bne   v0, zero, 0x1047814 sll   zero, zero, 0
+// 0x0104780c: 0x104780c: bne   v0, zero, 0x1047824 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1047814
+	brtrue L_1047824
 // --- basic block ---
-// 0x01047804: 0x1047804: jal   0x10565fc addiu a0, zero, -1
+// 0x01047814: 0x1047814: jal   0x105660c addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_get_waypoint_10565fc(int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_get_waypoint_105660c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104780c: 0x104780c: j	 0x104782c sll   zero, zero, 0
-	br L_104782c
+// 0x0104781c: 0x104781c: j	 0x104783c sll   zero, zero, 0
+	br L_104783c
 // --- basic block ---
-L_1047814:
-// 0x01047814: 0x1047814: lw    v1, 772(v0)
+L_1047824:
+// 0x01047824: 0x1047824: lw    v1, 772(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6759,15 +6759,15 @@ L_1047814:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01047818: 0x1047818: sll   zero, zero, 0
-// 0x0104781c: 0x104781c: sw    v1, 0(a1)
+// 0x01047828: 0x1047828: sll   zero, zero, 0
+// 0x0104782c: 0x104782c: sw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01047820: 0x1047820: lw    v0, 776(v0)
+// 0x01047830: 0x1047830: lw    v0, 776(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6776,8 +6776,8 @@ L_1047814:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01047824: 0x1047824: sll   zero, zero, 0
-// 0x01047828: 0x1047828: sw    v0, 4(a1)
+// 0x01047834: 0x1047834: sll   zero, zero, 0
+// 0x01047838: 0x1047838: sw    v0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6786,10 +6786,10 @@ L_1047814:
 	add
 	ldloc 6
 	stelem.i4
-L_104782c:
-// 0x0104782c: 0x104782c: lw    ra, 28(sp)
-// 0x01047830: 0x1047830: sll   zero, zero, 0
-// 0x01047834: 0x1047834: jr    ra addiu sp, sp, 32
+L_104783c:
+// 0x0104783c: 0x104783c: lw    ra, 28(sp)
+// 0x01047840: 0x1047840: sll   zero, zero, 0
+// 0x01047844: 0x1047844: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6801,7 +6801,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_alternative_route_get_waypoint_104783c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_route_get_waypoint_104784c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -6839,15 +6839,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104783c: 0x104783c: addiu sp, sp, -24
+// 0x0104784c: 0x104784c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01047840: 0x1047840: addu  a0, zero, zero
+// 0x01047850: 0x1047850: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01047844: 0x1047844: sw    s0, 16(sp)
+// 0x01047854: 0x1047854: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6856,40 +6856,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01047848: 0x1047848: sw    ra, 20(sp)
-// 0x0104784c: 0x104784c: jal   0x108e530 addu  s0, a1, zero
+// 0x01047858: 0x1047858: sw    ra, 20(sp)
+// 0x0104785c: 0x104785c: jal   0x108eb54 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 6
 // --- basic block ---
-// 0x01047854: 0x1047854: bne   v0, zero, 0x104787c sll   zero, zero, 0
+// 0x01047864: 0x1047864: bne   v0, zero, 0x104788c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_104787c
+	brtrue L_104788c
 // --- basic block ---
-// 0x0104785c: 0x104785c: jal   0x101de30 sll   zero, zero, 0
-	call int32 Cibyl22::roadmap_trip_get_focus_position_101de30()
+// 0x0104786c: 0x104786c: jal   0x101de40 sll   zero, zero, 0
+	call int32 Cibyl22::roadmap_trip_get_focus_position_101de40()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01047864: 0x1047864: lw    v1, 0(v0)
+// 0x01047874: 0x1047874: lw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01047868: 0x1047868: sll   zero, zero, 0
-// 0x0104786c: 0x104786c: sw    v1, 0(s0)
+// 0x01047878: 0x1047878: sll   zero, zero, 0
+// 0x0104787c: 0x104787c: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01047870: 0x1047870: lw    v0, 4(v0)
+// 0x01047880: 0x1047880: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6898,11 +6898,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01047874: 0x1047874: j	 0x104788c sll   zero, zero, 0
-	br L_104788c
+// 0x01047884: 0x1047884: j	 0x104789c sll   zero, zero, 0
+	br L_104789c
 // --- basic block ---
-L_104787c:
-// 0x0104787c: 0x104787c: lw    v1, 780(v0)
+L_104788c:
+// 0x0104788c: 0x104788c: lw    v1, 780(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6911,15 +6911,15 @@ L_104787c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01047880: 0x1047880: sll   zero, zero, 0
-// 0x01047884: 0x1047884: sw    v1, 0(s0)
+// 0x01047890: 0x1047890: sll   zero, zero, 0
+// 0x01047894: 0x1047894: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01047888: 0x1047888: lw    v0, 784(v0)
+// 0x01047898: 0x1047898: lw    v0, 784(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6928,9 +6928,9 @@ L_104787c:
 	add
 	ldelem.i4
 	stloc 6
-L_104788c:
-// 0x0104788c: 0x104788c: lw    ra, 20(sp)
-// 0x01047890: 0x1047890: sw    v0, 4(s0)
+L_104789c:
+// 0x0104789c: 0x104789c: lw    ra, 20(sp)
+// 0x010478a0: 0x10478a0: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6939,7 +6939,7 @@ L_104788c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01047894: 0x1047894: lw    s0, 16(sp)
+// 0x010478a4: 0x10478a4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6948,7 +6948,7 @@ L_104788c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01047898: 0x1047898: jr    ra addiu sp, sp, 24
+// 0x010478a8: 0x10478a8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl53.j b/converted/Cibyl53.j
index 5133e98..bac2d84 100644
--- a/converted/Cibyl53.j
+++ b/converted/Cibyl53.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl53::.ctor
 
-.method public static int32 update_progress_10478a0(int32,int32,int32,int32,int32)
+.method public static int32 update_progress_10478b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,105 +76,105 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010478a0: 0x10478a0: lui   v0, 0x60000
+// 0x010478b0: 0x10478b0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010478a4: 0x10478a4: lw    v1, 20296(v0)
+// 0x010478b4: 0x10478b4: lw    v1, 20760(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5074
+	ldc.i4 5190
 	add
 	ldelem.i4
 	stloc 6
-// 0x010478a8: 0x10478a8: addiu sp, sp, -24
+// 0x010478b8: 0x10478b8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010478ac: 0x10478ac: slti  a0, v1, 100
+// 0x010478bc: 0x10478bc: slti  a0, v1, 100
 	ldloc 6
 	ldc.i4.s 100
 	clt
 	stloc.1
-// 0x010478b0: 0x10478b0: beq   a0, zero, 0x10478c4 sw    ra, 20(sp)
+// 0x010478c0: 0x10478c0: beq   a0, zero, 0x10478d4 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_10478c4
+	brfalse L_10478d4
 // --- basic block ---
-// 0x010478b8: 0x10478b8: addiu v1, v1, 5
+// 0x010478c8: 0x10478c8: addiu v1, v1, 5
 	ldloc 6
 	ldc.i4.5
 	add
 	stloc 6
-// 0x010478bc: 0x10478bc: j	 0x10478c8 sw    v1, 20296(v0)
+// 0x010478cc: 0x10478cc: j	 0x10478d8 sw    v1, 20760(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5074
+	ldc.i4 5190
 	add
 	ldloc 6
 	stelem.i4
-	br L_10478c8
+	br L_10478d8
 // --- basic block ---
-L_10478c4:
-// 0x010478c4: 0x10478c4: sw    zero, 20296(v0)
+L_10478d4:
+// 0x010478d4: 0x10478d4: sw    zero, 20760(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5074
+	ldc.i4 5190
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10478c8:
-// 0x010478c8: 0x10478c8: lui   v0, 0x60000
+L_10478d8:
+// 0x010478d8: 0x10478d8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010478cc: 0x10478cc: lw    a0, 20316(v0)
+// 0x010478dc: 0x10478dc: lw    a0, 20780(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5079
+	ldc.i4 5195
 	add
 	ldelem.i4
 	stloc.1
-// 0x010478d0: 0x10478d0: lui   v0, 0x60000
+// 0x010478e0: 0x10478e0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010478d4: 0x10478d4: lw    a1, 20296(v0)
+// 0x010478e4: 0x10478e4: lw    a1, 20760(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5074
+	ldc.i4 5190
 	add
 	ldelem.i4
 	stloc.2
-// 0x010478d8: 0x10478d8: jal   0x109b694 sll   zero, zero, 0
+// 0x010478e8: 0x10478e8: jal   0x109bcdc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl116::ssd_progress_set_value_109b694(int32,int32)
+	call int32 Cibyl116::ssd_progress_set_value_109bcdc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010478e0: 0x10478e0: jal   0x1021900 sll   zero, zero, 0
+// 0x010478f0: 0x10478f0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010478e8: 0x10478e8: lw    ra, 20(sp)
-// 0x010478ec: 0x10478ec: sll   zero, zero, 0
-// 0x010478f0: 0x10478f0: jr    ra addiu sp, sp, 24
+// 0x010478f8: 0x10478f8: lw    ra, 20(sp)
+// 0x010478fc: 0x10478fc: sll   zero, zero, 0
+// 0x01047900: 0x1047900: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -186,7 +186,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alternative_routes_set_last_check_time_stamp_10478f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_set_last_check_time_stamp_1047908(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -221,19 +221,19 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010478f8: 0x10478f8: addu  a1, a0, zero
+// 0x01047908: 0x1047908: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010478fc: 0x10478fc: lui   a0, 0x0
+// 0x0104790c: 0x104790c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01047900: 0x1047900: addiu sp, sp, -24
+// 0x01047910: 0x1047910: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01047904: 0x1047904: sw    ra, 20(sp)
-// 0x01047908: 0x1047908: jal   0x100e610 addiu a0, a0, 13448
+// 0x01047914: 0x1047914: sw    ra, 20(sp)
+// 0x01047918: 0x1047918: jal   0x100e620 addiu a0, a0, 13448
 	ldloc.1
 	ldc.i4 13448
 	add
@@ -243,12 +243,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01047910: 0x1047910: jal   0x100ea50 addu  a0, zero, zero
+// 0x01047920: 0x1047920: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -256,14 +256,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01047918: 0x1047918: lw    ra, 20(sp)
-// 0x0104791c: 0x104791c: sll   zero, zero, 0
-// 0x01047920: 0x1047920: jr    ra addiu sp, sp, 24
+// 0x01047928: 0x1047928: lw    ra, 20(sp)
+// 0x0104792c: 0x104792c: sll   zero, zero, 0
+// 0x01047930: 0x1047930: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -275,7 +275,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 tod_1047928(int32,int32,int32,int32,int32)
+.method public static int32 tod_1047938(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -310,13 +310,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01047928: 0x1047928: addiu sp, sp, -40
+// 0x01047938: 0x1047938: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104792c: 0x104792c: sw    ra, 36(sp)
-// 0x01047930: 0x1047930: jal   0x10574f8 addiu a0, sp, 16
+// 0x0104793c: 0x104793c: sw    ra, 36(sp)
+// 0x01047940: 0x1047940: jal   0x1057508 addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -326,12 +326,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_get_current_time_10574f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_get_current_time_1057508(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047938: 0x1047938: lw    v1, 16(sp)
+// 0x01047948: 0x1047948: lw    v1, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -340,61 +340,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104793c: 0x104793c: sll   zero, zero, 0
-// 0x01047940: 0x1047940: addiu a0, v1, -4
+// 0x0104794c: 0x104794c: sll   zero, zero, 0
+// 0x01047950: 0x1047950: addiu a0, v1, -4
 	ldloc 6
 	ldc.i4.s -4
 	add
 	stloc.1
-// 0x01047944: 0x1047944: sltiu a0, a0, 8
+// 0x01047954: 0x1047954: sltiu a0, a0, 8
 	ldloc.1
 	ldc.i4.8
 	clt.un
 	stloc.1
-// 0x01047948: 0x1047948: bne   a0, zero, 0x1047970 addu  v0, zero, zero
+// 0x01047958: 0x1047958: bne   a0, zero, 0x1047980 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1047970
+	brtrue L_1047980
 // --- basic block ---
-// 0x01047950: 0x1047950: addiu a0, v1, -12
+// 0x01047960: 0x1047960: addiu a0, v1, -12
 	ldloc 6
 	ldc.i4.s -12
 	add
 	stloc.1
-// 0x01047954: 0x1047954: sltiu a0, a0, 5
+// 0x01047964: 0x1047964: sltiu a0, a0, 5
 	ldloc.1
 	ldc.i4.5
 	clt.un
 	stloc.1
-// 0x01047958: 0x1047958: bne   a0, zero, 0x1047970 addiu v0, zero, 1
+// 0x01047968: 0x1047968: bne   a0, zero, 0x1047980 addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	brtrue L_1047970
+	brtrue L_1047980
 // --- basic block ---
-// 0x01047960: 0x1047960: addiu v0, v1, -17
+// 0x01047970: 0x1047970: addiu v0, v1, -17
 	ldloc 6
 	ldc.i4.s -17
 	add
 	stloc 5
-// 0x01047964: 0x1047964: sltiu v0, v0, 6
+// 0x01047974: 0x1047974: sltiu v0, v0, 6
 	ldloc 5
 	ldc.i4.6
 	clt.un
 	stloc 5
-// 0x01047968: 0x1047968: addiu v1, zero, 3
+// 0x01047978: 0x1047978: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x0104796c: 0x104796c: subu  v0, v1, v0
+// 0x0104797c: 0x104797c: subu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 5
-L_1047970:
-// 0x01047970: 0x1047970: lw    ra, 36(sp)
-// 0x01047974: 0x1047974: sll   zero, zero, 0
-// 0x01047978: 0x1047978: jr    ra addiu sp, sp, 40
+L_1047980:
+// 0x01047980: 0x1047980: lw    ra, 36(sp)
+// 0x01047984: 0x1047984: sll   zero, zero, 0
+// 0x01047988: 0x1047988: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -406,7 +406,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alternative_routes_suggest_route_dialog_1047980(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_suggest_route_dialog_1047990(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s3,int32 s2,int32 s1,int32 s4,int32 s5,int32 ra)
@@ -459,13 +459,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01047980: 0x1047980: addiu sp, sp, -352
+// 0x01047990: 0x1047990: addiu sp, sp, -352
 	ldloc.0
 	ldc.i4 -352
 	add
 	stloc.0
-// 0x01047984: 0x1047984: sw    ra, 348(sp)
-// 0x01047988: 0x1047988: sw    s5, 344(sp)
+// 0x01047994: 0x1047994: sw    ra, 348(sp)
+// 0x01047998: 0x1047998: sw    s5, 344(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -474,7 +474,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104798c: 0x104798c: sw    s4, 340(sp)
+// 0x0104799c: 0x104799c: sw    s4, 340(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -483,7 +483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01047990: 0x1047990: sw    s3, 336(sp)
+// 0x010479a0: 0x10479a0: sw    s3, 336(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -492,7 +492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01047994: 0x1047994: sw    s2, 332(sp)
+// 0x010479a4: 0x10479a4: sw    s2, 332(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -501,7 +501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01047998: 0x1047998: sw    s1, 328(sp)
+// 0x010479a8: 0x10479a8: sw    s1, 328(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -510,7 +510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104799c: 0x104799c: jal   0x1056758 sw    s0, 324(sp)
+// 0x010479ac: 0x10479ac: jal   0x1056768 sw    s0, 324(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -519,83 +519,83 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl64::navigate_main_nav_resumed_1056758()
+	call int32 Cibyl64::navigate_main_nav_resumed_1056768()
 	stloc 5
 // --- basic block ---
-// 0x010479a4: 0x10479a4: beq   v0, zero, 0x10479c4 lui   a1, 0x10000
+// 0x010479b4: 0x10479b4: beq   v0, zero, 0x10479d4 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_10479c4
+	brfalse L_10479d4
 // --- basic block ---
-// 0x010479ac: 0x10479ac: lui   a3, 0x10000
+// 0x010479bc: 0x10479bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010479b0: 0x10479b0: addiu a1, a1, -576
+// 0x010479c0: 0x10479c0: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x010479b4: 0x10479b4: addiu a3, a3, 396
+// 0x010479c4: 0x10479c4: addiu a3, a3, 392
 	ldloc 4
-	ldc.i4 396
+	ldc.i4 392
 	add
 	stloc 4
-// 0x010479b8: 0x10479b8: addiu a0, zero, 4
+// 0x010479c8: 0x10479c8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010479bc: 0x10479bc: j	 0x10479fc addiu a2, zero, 1259
+// 0x010479cc: 0x10479cc: j	 0x1047a0c addiu a2, zero, 1259
 	ldc.i4 1259
 	stloc.3
-	br L_10479fc
+	br L_1047a0c
 // --- basic block ---
-L_10479c4:
-// 0x010479c4: 0x10479c4: jal   0x101fa28 addiu s4, zero, 40
+L_10479d4:
+// 0x010479d4: 0x10479d4: jal   0x101fa38 addiu s4, zero, 40
 	ldc.i4.s 40
 	stloc 12
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010479cc: 0x10479cc: beq   v0, zero, 0x10479d8 sll   zero, zero, 0
+// 0x010479dc: 0x10479dc: beq   v0, zero, 0x10479e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10479d8
+	brfalse L_10479e8
 // --- basic block ---
-// 0x010479d4: 0x10479d4: addiu s4, zero, 60
+// 0x010479e4: 0x10479e4: addiu s4, zero, 60
 	ldc.i4.s 60
 	stloc 12
-L_10479d8:
-// 0x010479d8: 0x10479d8: jal   0x108e4d0 sll   zero, zero, 0
-	call int32 Cibyl106::RealtimeAltRoutes_Count_108e4d0()
+L_10479e8:
+// 0x010479e8: 0x10479e8: jal   0x108eaf4 sll   zero, zero, 0
+	call int32 Cibyl106::RealtimeAltRoutes_Count_108eaf4()
 	stloc 5
 // --- basic block ---
-// 0x010479e0: 0x10479e0: bgtz  v0, 0x1047a0c lui   a1, 0x10000
+// 0x010479f0: 0x10479f0: bgtz  v0, 0x1047a1c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
 	ldc.i4.s 0
-	bgt L_1047a0c
+	bgt L_1047a1c
 // --- basic block ---
-// 0x010479e8: 0x10479e8: lui   a3, 0x10000
+// 0x010479f8: 0x10479f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010479ec: 0x10479ec: addiu a1, a1, -576
+// 0x010479fc: 0x10479fc: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x010479f0: 0x10479f0: addiu a3, a3, 472
+// 0x01047a00: 0x1047a00: addiu a3, a3, 468
 	ldloc 4
-	ldc.i4 472
+	ldc.i4 468
 	add
 	stloc 4
-// 0x010479f4: 0x10479f4: addiu a0, zero, 4
+// 0x01047a04: 0x1047a04: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010479f8: 0x10479f8: addiu a2, zero, 1276
+// 0x01047a08: 0x1047a08: addiu a2, zero, 1276
 	ldc.i4 1276
 	stloc.3
-L_10479fc:
-// 0x010479fc: 0x10479fc: jal   0x100449c sll   zero, zero, 0
+L_1047a0c:
+// 0x01047a0c: 0x1047a0c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -606,66 +606,66 @@ L_10479fc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047a04: 0x1047a04: j	 0x1048108 sll   zero, zero, 0
-	br L_1048108
+// 0x01047a14: 0x1047a14: j	 0x1048118 sll   zero, zero, 0
+	br L_1048118
 // --- basic block ---
-L_1047a0c:
-// 0x01047a0c: 0x1047a0c: jal   0x108e530 addu  a0, zero, zero
+L_1047a1c:
+// 0x01047a1c: 0x1047a1c: jal   0x108eb54 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x01047a14: 0x1047a14: bne   v0, zero, 0x1047a38 addu  s1, v0, zero
+// 0x01047a24: 0x1047a24: bne   v0, zero, 0x1047a48 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
-	brtrue L_1047a38
+	brtrue L_1047a48
 // --- basic block ---
-// 0x01047a1c: 0x1047a1c: lui   a1, 0x10000
+// 0x01047a2c: 0x1047a2c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01047a20: 0x1047a20: lui   a3, 0x10000
+// 0x01047a30: 0x1047a30: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01047a24: 0x1047a24: addiu a1, a1, -576
+// 0x01047a34: 0x1047a34: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01047a28: 0x1047a28: addiu a3, a3, 536
+// 0x01047a38: 0x1047a38: addiu a3, a3, 532
 	ldloc 4
-	ldc.i4 536
+	ldc.i4 532
 	add
 	stloc 4
-// 0x01047a2c: 0x1047a2c: addiu a0, zero, 4
+// 0x01047a3c: 0x1047a3c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01047a30: 0x1047a30: j	 0x10479fc addiu a2, zero, 1282
+// 0x01047a40: 0x1047a40: j	 0x1047a0c addiu a2, zero, 1282
 	ldc.i4 1282
 	stloc.3
-	br L_10479fc
+	br L_1047a0c
 // --- basic block ---
-L_1047a38:
-// 0x01047a38: 0x1047a38: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+L_1047a48:
+// 0x01047a48: 0x1047a48: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047a40: 0x1047a40: beq   v0, zero, 0x1047b20 lui   a1, 0x10000
+// 0x01047a50: 0x1047a50: beq   v0, zero, 0x1047b30 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1047b20
+	brfalse L_1047b30
 // --- basic block ---
-// 0x01047a48: 0x1047a48: addu  a0, v0, zero
+// 0x01047a58: 0x1047a58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047a4c: 0x1047a4c: jal   0x1001b14 addiu a1, a1, -604
+// 0x01047a5c: 0x1047a5c: jal   0x1001b14 addiu a1, a1, -608
 	ldloc.2
-	ldc.i4 -604
+	ldc.i4 -608
 	add
 	stloc.2
 	ldloc.1
@@ -673,18 +673,18 @@ L_1047a38:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01047a54: 0x1047a54: bne   v0, zero, 0x1047b20 lui   a0, 0x1040000
+// 0x01047a64: 0x1047a64: bne   v0, zero, 0x1047b30 lui   a0, 0x1040000
 	ldloc 5
 	ldc.i4 17039360
 	stloc.1
-	brtrue L_1047b20
+	brtrue L_1047b30
 // --- basic block ---
-// 0x01047a5c: 0x1047a5c: lui   s0, 0x60000
+// 0x01047a6c: 0x1047a6c: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01047a60: 0x1047a60: jal   0x104fd00 addiu a0, a0, 30880
+// 0x01047a70: 0x1047a70: jal   0x104fd10 addiu a0, a0, 30896
 	ldloc.1
-	ldc.i4 30880
+	ldc.i4 30896
 	add
 	stloc.1
 	ldloc.0
@@ -692,12 +692,12 @@ L_1047a38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047a68: 0x1047a68: lw    a1, 796(s1)
+// 0x01047a78: 0x1047a78: lw    a1, 796(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -706,7 +706,7 @@ L_1047a38:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047a6c: 0x1047a6c: lw    a3, 820(s1)
+// 0x01047a7c: 0x1047a7c: lw    a3, 820(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -715,7 +715,7 @@ L_1047a38:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01047a70: 0x1047a70: lw    a2, 792(s1)
+// 0x01047a80: 0x1047a80: lw    a2, 792(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -724,16 +724,16 @@ L_1047a38:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01047a74: 0x1047a74: lw    a0, 20312(s0)
+// 0x01047a84: 0x1047a84: lw    a0, 20776(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5078
+	ldc.i4 5194
 	add
 	ldelem.i4
 	stloc.1
-// 0x01047a78: 0x1047a78: jal   0x1055d70 sw    zero, 16(sp)
+// 0x01047a88: 0x1047a88: jal   0x1055d80 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -747,46 +747,46 @@ L_1047a38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::navigate_res_update_ETA_widget_1055d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::navigate_res_update_ETA_widget_1055d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047a80: 0x1047a80: lw    a0, 20312(s0)
+// 0x01047a90: 0x1047a90: lw    a0, 20776(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5078
+	ldc.i4 5194
 	add
 	ldelem.i4
 	stloc.1
-// 0x01047a84: 0x1047a84: jal   0x1056004 sll   zero, zero, 0
+// 0x01047a94: 0x1047a94: jal   0x1056014 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_res_show_ETA_widget_1056004(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_res_show_ETA_widget_1056014(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047a8c: 0x1047a8c: lui   a1, 0x10000
+// 0x01047a9c: 0x1047a9c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01047a90: 0x1047a90: lw    a0, 20312(s0)
+// 0x01047aa0: 0x1047aa0: lw    a0, 20776(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5078
+	ldc.i4 5194
 	add
 	ldelem.i4
 	stloc.1
-// 0x01047a94: 0x1047a94: jal   0x109b304 addiu a1, a1, 204
+// 0x01047aa4: 0x1047aa4: jal   0x109b94c addiu a1, a1, 200
 	ldloc.2
-	ldc.i4 204
+	ldc.i4 200
 	add
 	stloc.2
 	ldloc.0
@@ -794,16 +794,16 @@ L_1047a38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047a9c: 0x1047a9c: beq   v0, zero, 0x1047aac sll   zero, zero, 0
+// 0x01047aac: 0x1047aac: beq   v0, zero, 0x1047abc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1047aac
+	brfalse L_1047abc
 // --- basic block ---
-// 0x01047aa4: 0x1047aa4: jal   0x109098c addu  a0, v0, zero
+// 0x01047ab4: 0x1047ab4: jal   0x1090fb0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -811,30 +811,30 @@ L_1047a38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::ssd_button_enable_109098c(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::ssd_button_enable_1090fb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1047aac:
-// 0x01047aac: 0x1047aac: lui   v0, 0x60000
+L_1047abc:
+// 0x01047abc: 0x1047abc: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01047ab0: 0x1047ab0: lui   a1, 0x10000
+// 0x01047ac0: 0x1047ac0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01047ab4: 0x1047ab4: lw    a0, 20312(v0)
+// 0x01047ac4: 0x1047ac4: lw    a0, 20776(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5078
+	ldc.i4 5194
 	add
 	ldelem.i4
 	stloc.1
-// 0x01047ab8: 0x1047ab8: jal   0x109b304 addiu a1, a1, 604
+// 0x01047ac8: 0x1047ac8: jal   0x109b94c addiu a1, a1, 600
 	ldloc.2
-	ldc.i4 604
+	ldc.i4 600
 	add
 	stloc.2
 	ldloc.0
@@ -842,48 +842,48 @@ L_1047aac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ac0: 0x1047ac0: beq   v0, zero, 0x1047ad4 lui   a1, 0x1040000
+// 0x01047ad0: 0x1047ad0: beq   v0, zero, 0x1047ae4 lui   a1, 0x1040000
 	ldloc 5
 	ldc.i4 17039360
 	stloc.2
-	brfalse L_1047ad4
+	brfalse L_1047ae4
 // --- basic block ---
-// 0x01047ac8: 0x1047ac8: jal   0x1099098 addu  a0, v0, zero
+// 0x01047ad8: 0x1047ad8: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01047ad0: 0x1047ad0: lui   a1, 0x1040000
+// 0x01047ae0: 0x1047ae0: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-L_1047ad4:
-// 0x01047ad4: 0x1047ad4: addiu a1, a1, 27584
+L_1047ae4:
+// 0x01047ae4: 0x1047ae4: addiu a1, a1, 27600
 	ldloc.2
-	ldc.i4 27584
+	ldc.i4 27600
 	add
 	stloc.2
-// 0x01047ad8: 0x1047ad8: addiu v1, zero, 15
+// 0x01047ae8: 0x1047ae8: addiu v1, zero, 15
 	ldc.i4.s 15
 	stloc 6
-// 0x01047adc: 0x1047adc: lui   v0, 0x60000
+// 0x01047aec: 0x1047aec: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01047ae0: 0x1047ae0: addiu a0, zero, 1000
+// 0x01047af0: 0x1047af0: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x01047ae4: 0x1047ae4: jal   0x104fe98 sw    v1, 20308(v0)
+// 0x01047af4: 0x1047af4: jal   0x104fea8 sw    v1, 20772(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5077
+	ldc.i4 5193
 	add
 	ldloc 6
 	stelem.i4
@@ -892,31 +892,31 @@ L_1047ad4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047aec: 0x1047aec: lui   a0, 0x1040000
+// 0x01047afc: 0x1047afc: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01047af0: 0x1047af0: addiu v1, zero, 1
+// 0x01047b00: 0x1047b00: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01047af4: 0x1047af4: lui   v0, 0x60000
+// 0x01047b04: 0x1047b04: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01047af8: 0x1047af8: addiu a0, a0, 26284
+// 0x01047b08: 0x1047b08: addiu a0, a0, 26300
 	ldloc.1
-	ldc.i4 26284
+	ldc.i4 26300
 	add
 	stloc.1
-// 0x01047afc: 0x1047afc: jal   0x109468c sw    v1, 20288(v0)
+// 0x01047b0c: 0x1047b0c: jal   0x1094cb0 sw    v1, 20752(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5072
+	ldc.i4 5188
 	add
 	ldloc 6
 	stelem.i4
@@ -925,20 +925,20 @@ L_1047ad4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_callback_109468c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_callback_1094cb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b04: 0x1047b04: addu  a0, zero, zero
+// 0x01047b14: 0x1047b14: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01047b08: 0x1047b08: cibyl_sysc_arg 0x4
+// 0x01047b18: 0x1047b18: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01047b0c: 0x1047b0c: cibyl_sysc 0x6f0
+// 0x01047b1c: 0x1047b1c: cibyl_sysc 0x6f0
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01047b10: 0x1047b10: jal   0x10478f8 addu  a0, v0, zero
+// 0x01047b20: 0x1047b20: jal   0x1047908 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -946,30 +946,30 @@ L_1047ad4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::roadmap_alternative_routes_set_last_check_time_stamp_10478f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::roadmap_alternative_routes_set_last_check_time_stamp_1047908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b18: 0x1047b18: j	 0x1048100 sll   zero, zero, 0
-	br L_1048100
+// 0x01047b28: 0x1047b28: j	 0x1048110 sll   zero, zero, 0
+	br L_1048110
 // --- basic block ---
-L_1047b20:
-// 0x01047b20: 0x1047b20: jal   0x108e568 sll   zero, zero, 0
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+L_1047b30:
+// 0x01047b30: 0x1047b30: jal   0x108eb8c sll   zero, zero, 0
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x01047b28: 0x1047b28: blez  v0, 0x1047b58 lui   a2, 0x1050000
+// 0x01047b38: 0x1047b38: blez  v0, 0x1047b68 lui   a2, 0x1050000
 	ldloc 5
 	ldc.i4 17104896
 	stloc.3
 	ldc.i4.s 0
-	ble L_1047b58
+	ble L_1047b68
 // --- basic block ---
-// 0x01047b30: 0x1047b30: lui   a0, 0x10000
+// 0x01047b40: 0x1047b40: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047b34: 0x1047b34: jal   0x101f044 addiu a0, a0, -29748
+// 0x01047b44: 0x1047b44: jal   0x101f054 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -979,15 +979,15 @@ L_1047b20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b3c: 0x1047b3c: lui   a0, 0x10000
+// 0x01047b4c: 0x1047b4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047b40: 0x1047b40: jal   0x101f044 addiu a0, a0, -29760
+// 0x01047b50: 0x1047b50: jal   0x101f054 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -997,53 +997,53 @@ L_1047b20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b48: 0x1047b48: jal   0x105944c sll   zero, zero, 0
+// 0x01047b58: 0x1047b58: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b50: 0x1047b50: j	 0x1048108 sll   zero, zero, 0
-	br L_1048108
+// 0x01047b60: 0x1047b60: j	 0x1048118 sll   zero, zero, 0
+	br L_1048118
 // --- basic block ---
-L_1047b58:
-// 0x01047b58: 0x1047b58: lui   a3, 0x10010000
+L_1047b68:
+// 0x01047b68: 0x1047b68: lui   a3, 0x10010000
 	ldc.i4 268500992
 	stloc 4
-// 0x01047b5c: 0x1047b5c: lui   a0, 0x10000
+// 0x01047b6c: 0x1047b6c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047b60: 0x1047b60: lui   a1, 0x10000
+// 0x01047b70: 0x1047b70: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01047b64: 0x1047b64: addiu a2, a2, -32240
+// 0x01047b74: 0x1047b74: addiu a2, a2, -32224
 	ldloc.3
-	ldc.i4 -32240
+	ldc.i4 -32224
 	add
 	stloc.3
-// 0x01047b68: 0x1047b68: ori   a3, a3, 20497
+// 0x01047b78: 0x1047b78: ori   a3, a3, 20497
 	ldloc 4
 	ldc.i4 20497
 	or
 	stloc 4
-// 0x01047b6c: 0x1047b6c: addiu a1, a1, 18500
+// 0x01047b7c: 0x1047b7c: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01047b70: 0x1047b70: jal   0x1095a08 addiu a0, a0, -604
+// 0x01047b80: 0x1047b80: jal   0x1096050 addiu a0, a0, -608
 	ldloc.1
-	ldc.i4 -604
+	ldc.i4 -608
 	add
 	stloc.1
 	ldloc.0
@@ -1051,26 +1051,26 @@ L_1047b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b78: 0x1047b78: addu  s0, v0, zero
+// 0x01047b88: 0x1047b88: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01047b7c: 0x1047b7c: addiu a0, zero, 5
+// 0x01047b8c: 0x1047b8c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01047b80: 0x1047b80: lui   v0, 0x60000
+// 0x01047b90: 0x1047b90: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01047b84: 0x1047b84: jal   0x1046d14 sw    s0, 20312(v0)
+// 0x01047b94: 0x1047b94: jal   0x1046d24 sw    s0, 20776(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5078
+	ldc.i4 5194
 	add
 	ldloc 8
 	stelem.i4
@@ -1079,45 +1079,45 @@ L_1047b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::space_1046d14(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::space_1046d24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b8c: 0x1047b8c: addu  a1, v0, zero
+// 0x01047b9c: 0x1047b9c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047b90: 0x1047b90: addu  a0, s0, zero
+// 0x01047ba0: 0x1047ba0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01047b94: 0x1047b94: jal   0x1098ec4 lui   s3, 0x10000
+// 0x01047ba4: 0x1047ba4: jal   0x109950c lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047b9c: 0x1047b9c: addiu s2, zero, 137
+// 0x01047bac: 0x1047bac: addiu s2, zero, 137
 	ldc.i4 137
 	stloc 10
-// 0x01047ba0: 0x1047ba0: addu  a1, zero, zero
+// 0x01047bb0: 0x1047bb0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047ba4: 0x1047ba4: addiu a2, zero, -1
+// 0x01047bb4: 0x1047bb4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01047ba8: 0x1047ba8: addiu a3, zero, -1
+// 0x01047bb8: 0x1047bb8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01047bac: 0x1047bac: addiu a0, s3, 624
+// 0x01047bbc: 0x1047bbc: addiu a0, s3, 620
 	ldloc 9
-	ldc.i4 624
+	ldc.i4 620
 	add
 	stloc.1
-// 0x01047bb0: 0x1047bb0: jal   0x1093a24 sw    s2, 16(sp)
+// 0x01047bc0: 0x1047bc0: jal   0x1094048 sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1131,57 +1131,57 @@ L_1047b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047bb8: 0x1047bb8: addu  a0, v0, zero
+// 0x01047bc8: 0x1047bc8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047bbc: 0x1047bbc: addu  a1, zero, zero
+// 0x01047bcc: 0x1047bcc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047bc0: 0x1047bc0: addu  a2, zero, zero
+// 0x01047bd0: 0x1047bd0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047bc4: 0x1047bc4: jal   0x1098fe0 addu  s0, v0, zero
+// 0x01047bd4: 0x1047bd4: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01047bcc: 0x1047bcc: jal   0x1020318 sll   zero, zero, 0
+// 0x01047bdc: 0x1047bdc: jal   0x1020328 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::is_screen_wide_1020318(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::is_screen_wide_1020328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047bd4: 0x1047bd4: bne   v0, zero, 0x1047c88 addiu a0, s3, 624
+// 0x01047be4: 0x1047be4: bne   v0, zero, 0x1047c98 addiu a0, s3, 620
 	ldloc 5
 	ldloc 9
-	ldc.i4 624
+	ldc.i4 620
 	add
 	stloc.1
-	brtrue L_1047c88
+	brtrue L_1047c98
 // --- basic block ---
-// 0x01047bdc: 0x1047bdc: addu  a1, zero, zero
+// 0x01047bec: 0x1047bec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047be0: 0x1047be0: addiu a2, zero, 20
+// 0x01047bf0: 0x1047bf0: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x01047be4: 0x1047be4: addiu a3, zero, 30
+// 0x01047bf4: 0x1047bf4: addiu a3, zero, 30
 	ldc.i4.s 30
 	stloc 4
-// 0x01047be8: 0x1047be8: jal   0x1093a24 sw    s2, 16(sp)
+// 0x01047bf8: 0x1047bf8: jal   0x1094048 sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1195,86 +1195,86 @@ L_1047b58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047bf0: 0x1047bf0: addu  a0, v0, zero
+// 0x01047c00: 0x1047c00: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047bf4: 0x1047bf4: addu  a1, zero, zero
+// 0x01047c04: 0x1047c04: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047bf8: 0x1047bf8: addu  a2, zero, zero
+// 0x01047c08: 0x1047c08: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047bfc: 0x1047bfc: jal   0x1098fe0 addu  s2, v0, zero
+// 0x01047c0c: 0x1047c0c: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01047c04: 0x1047c04: jal   0x1047928 sll   zero, zero, 0
+// 0x01047c14: 0x1047c14: jal   0x1047938 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::tod_1047928(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::tod_1047938(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047c0c: 0x1047c0c: beq   v0, zero, 0x1047c2c lui   a1, 0x10000
+// 0x01047c1c: 0x1047c1c: beq   v0, zero, 0x1047c3c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1047c2c
+	brfalse L_1047c3c
 // --- basic block ---
-// 0x01047c14: 0x1047c14: jal   0x1047928 sll   zero, zero, 0
+// 0x01047c24: 0x1047c24: jal   0x1047938 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::tod_1047928(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::tod_1047938(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047c1c: 0x1047c1c: addiu v1, zero, 1
+// 0x01047c2c: 0x1047c2c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01047c20: 0x1047c20: bne   v0, v1, 0x1047c34 sll   zero, zero, 0
+// 0x01047c30: 0x1047c30: bne   v0, v1, 0x1047c44 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1047c34
+	bne.un L_1047c44
 // --- basic block ---
-// 0x01047c28: 0x1047c28: lui   a1, 0x10000
+// 0x01047c38: 0x1047c38: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_1047c2c:
-// 0x01047c2c: 0x1047c2c: j	 0x1047c3c addiu a1, a1, 640
+L_1047c3c:
+// 0x01047c3c: 0x1047c3c: j	 0x1047c4c addiu a1, a1, 636
 	ldloc.2
-	ldc.i4 640
+	ldc.i4 636
 	add
 	stloc.2
-	br L_1047c3c
+	br L_1047c4c
 // --- basic block ---
-L_1047c34:
-// 0x01047c34: 0x1047c34: lui   a1, 0x10000
+L_1047c44:
+// 0x01047c44: 0x1047c44: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01047c38: 0x1047c38: addiu a1, a1, 644
+// 0x01047c48: 0x1047c48: addiu a1, a1, 640
 	ldloc.2
-	ldc.i4 644
+	ldc.i4 640
 	add
 	stloc.2
-L_1047c3c:
-// 0x01047c3c: 0x1047c3c: jal   0x1001b68 addiu a0, sp, 24
+L_1047c4c:
+// 0x01047c4c: 0x1047c4c: jal   0x1001b68 addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1286,20 +1286,20 @@ L_1047c3c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047c44: 0x1047c44: lui   a0, 0x10000
+// 0x01047c54: 0x1047c54: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047c48: 0x1047c48: addiu a0, a0, 652
+// 0x01047c58: 0x1047c58: addiu a0, a0, 648
 	ldloc.1
-	ldc.i4 652
+	ldc.i4 648
 	add
 	stloc.1
-// 0x01047c4c: 0x1047c4c: addiu a1, sp, 24
+// 0x01047c5c: 0x1047c5c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01047c50: 0x1047c50: jal   0x109e13c addiu a2, zero, 129
+// 0x01047c60: 0x1047c60: jal   0x109e784 addiu a2, zero, 129
 	ldc.i4 129
 	stloc.3
 	ldloc.0
@@ -1307,29 +1307,29 @@ L_1047c3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047c58: 0x1047c58: addu  a0, v0, zero
+// 0x01047c68: 0x1047c68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047c5c: 0x1047c5c: lui   s3, 0x60000
+// 0x01047c6c: 0x1047c6c: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01047c60: 0x1047c60: addu  a1, zero, zero
+// 0x01047c70: 0x1047c70: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047c64: 0x1047c64: addiu a2, zero, -15
+// 0x01047c74: 0x1047c74: addiu a2, zero, -15
 	ldc.i4.s -15
 	stloc.3
-// 0x01047c68: 0x1047c68: jal   0x1098f84 sw    v0, 20300(s3)
+// 0x01047c78: 0x1047c78: jal   0x10995cc sw    v0, 20764(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5075
+	ldc.i4 5191
 	add
 	ldloc 5
 	stelem.i4
@@ -1338,64 +1338,64 @@ L_1047c3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047c70: 0x1047c70: lw    a1, 20300(s3)
+// 0x01047c80: 0x1047c80: lw    a1, 20764(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5075
+	ldc.i4 5191
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047c74: 0x1047c74: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01047c84: 0x1047c84: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047c7c: 0x1047c7c: addu  a0, s0, zero
+// 0x01047c8c: 0x1047c8c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01047c80: 0x1047c80: jal   0x1098ec4 addu  a1, s2, zero
+// 0x01047c90: 0x1047c90: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1047c88:
-// 0x01047c88: 0x1047c88: jal   0x1047928 sll   zero, zero, 0
+L_1047c98:
+// 0x01047c98: 0x1047c98: jal   0x1047938 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::tod_1047928(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::tod_1047938(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047c90: 0x1047c90: bne   v0, zero, 0x1047cb4 lui   a0, 0x10000
+// 0x01047ca0: 0x1047ca0: bne   v0, zero, 0x1047cc4 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_1047cb4
+	brtrue L_1047cc4
 // --- basic block ---
-// 0x01047c98: 0x1047c98: jal   0x101cd60 addiu a0, a0, 664
+// 0x01047ca8: 0x1047ca8: jal   0x101cd70 addiu a0, a0, 660
 	ldloc.1
-	ldc.i4 664
+	ldc.i4 660
 	add
 	stloc.1
 	ldloc.0
@@ -1403,31 +1403,31 @@ L_1047c88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ca0: 0x1047ca0: lui   a2, 0x20000
+// 0x01047cb0: 0x1047cb0: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01047ca4: 0x1047ca4: addiu a2, a2, 20272
+// 0x01047cb4: 0x1047cb4: addiu a2, a2, 20732
 	ldloc.3
-	ldc.i4 20272
+	ldc.i4 20732
 	add
 	stloc.3
-// 0x01047ca8: 0x1047ca8: addu  a3, v0, zero
+// 0x01047cb8: 0x1047cb8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01047cac: 0x1047cac: j	 0x1047cf0 addiu a0, sp, 56
+// 0x01047cbc: 0x1047cbc: j	 0x1047d00 addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-	br L_1047cf0
+	br L_1047d00
 // --- basic block ---
-L_1047cb4:
-// 0x01047cb4: 0x1047cb4: jal   0x1047928 addiu s3, sp, 56
+L_1047cc4:
+// 0x01047cc4: 0x1047cc4: jal   0x1047938 addiu s3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1437,65 +1437,65 @@ L_1047cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::tod_1047928(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::tod_1047938(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047cbc: 0x1047cbc: addiu v1, zero, 2
+// 0x01047ccc: 0x1047ccc: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01047cc0: 0x1047cc0: bne   v0, v1, 0x1047cd4 lui   s2, 0x20000
+// 0x01047cd0: 0x1047cd0: bne   v0, v1, 0x1047ce4 lui   s2, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc 10
-	bne.un L_1047cd4
+	bne.un L_1047ce4
 // --- basic block ---
-// 0x01047cc8: 0x1047cc8: lui   a0, 0x10000
+// 0x01047cd8: 0x1047cd8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047ccc: 0x1047ccc: j	 0x1047cdc addiu a0, a0, 680
+// 0x01047cdc: 0x1047cdc: j	 0x1047cec addiu a0, a0, 676
 	ldloc.1
-	ldc.i4 680
+	ldc.i4 676
 	add
 	stloc.1
-	br L_1047cdc
+	br L_1047cec
 // --- basic block ---
-L_1047cd4:
-// 0x01047cd4: 0x1047cd4: lui   a0, 0x10000
+L_1047ce4:
+// 0x01047ce4: 0x1047ce4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047cd8: 0x1047cd8: addiu a0, a0, 696
+// 0x01047ce8: 0x1047ce8: addiu a0, a0, 692
 	ldloc.1
-	ldc.i4 696
+	ldc.i4 692
 	add
 	stloc.1
-L_1047cdc:
-// 0x01047cdc: 0x1047cdc: jal   0x101cd60 sll   zero, zero, 0
+L_1047cec:
+// 0x01047cec: 0x1047cec: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ce4: 0x1047ce4: addu  a3, v0, zero
+// 0x01047cf4: 0x1047cf4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01047ce8: 0x1047ce8: addu  a0, s3, zero
+// 0x01047cf8: 0x1047cf8: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01047cec: 0x1047cec: addiu a2, s2, 20272
+// 0x01047cfc: 0x1047cfc: addiu a2, s2, 20732
 	ldloc 10
-	ldc.i4 20272
+	ldc.i4 20732
 	add
 	stloc.3
-L_1047cf0:
-// 0x01047cf0: 0x1047cf0: jal   0x1000f9c addiu a1, zero, 250
+L_1047d00:
+// 0x01047d00: 0x1047d00: jal   0x1000f9c addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
 	ldloc.0
@@ -1508,26 +1508,26 @@ L_1047cf0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047cf8: 0x1047cf8: addiu s2, sp, 56
+// 0x01047d08: 0x1047d08: addiu s2, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 10
-// 0x01047cfc: 0x1047cfc: lui   a0, 0x10000
+// 0x01047d0c: 0x1047d0c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047d00: 0x1047d00: addu  a3, zero, zero
+// 0x01047d10: 0x1047d10: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01047d04: 0x1047d04: addiu a2, zero, 18
+// 0x01047d14: 0x1047d14: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01047d08: 0x1047d08: addu  a1, s2, zero
+// 0x01047d18: 0x1047d18: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01047d0c: 0x1047d0c: jal   0x1098d10 addiu a0, a0, 704
+// 0x01047d1c: 0x1047d1c: jal   0x1099358 addiu a0, a0, 700
 	ldloc.1
-	ldc.i4 704
+	ldc.i4 700
 	add
 	stloc.1
 	ldloc.0
@@ -1535,23 +1535,23 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d14: 0x1047d14: lui   s3, 0x0
+// 0x01047d24: 0x1047d24: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01047d18: 0x1047d18: addu  a0, v0, zero
+// 0x01047d28: 0x1047d28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047d1c: 0x1047d1c: addiu a1, s3, 23008
+// 0x01047d2c: 0x1047d2c: addiu a1, s3, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01047d20: 0x1047d20: jal   0x1097af8 sw    v0, 312(sp)
+// 0x01047d30: 0x1047d30: jal   0x1098140 sw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1562,9 +1562,9 @@ L_1047cf0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01047d28: 0x1047d28: lw    v0, 312(sp)
+// 0x01047d38: 0x1047d38: lw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1573,26 +1573,26 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01047d2c: 0x1047d2c: addu  a0, s0, zero
+// 0x01047d3c: 0x1047d3c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01047d30: 0x1047d30: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01047d40: 0x1047d40: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d38: 0x1047d38: addu  a0, s0, zero
+// 0x01047d48: 0x1047d48: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01047d3c: 0x1047d3c: addiu a1, zero, 5
+// 0x01047d4c: 0x1047d4c: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01047d40: 0x1047d40: jal   0x109434c addu  a2, zero, zero
+// 0x01047d50: 0x1047d50: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1600,12 +1600,12 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d48: 0x1047d48: jal   0x106ac04 lui   s5, 0x10000
+// 0x01047d58: 0x1047d58: jal   0x106b228 lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 13
 	ldloc.0
@@ -1613,26 +1613,26 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::RealTime_GetUserName_106ac04(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::RealTime_GetUserName_106b228(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d50: 0x1047d50: lui   a0, 0x10000
+// 0x01047d60: 0x1047d60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047d54: 0x1047d54: addiu a2, zero, 18
+// 0x01047d64: 0x1047d64: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01047d58: 0x1047d58: addiu a3, zero, 8
+// 0x01047d68: 0x1047d68: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01047d5c: 0x1047d5c: addu  a1, v0, zero
+// 0x01047d6c: 0x1047d6c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047d60: 0x1047d60: jal   0x1098d10 addiu a0, a0, 716
+// 0x01047d70: 0x1047d70: jal   0x1099358 addiu a0, a0, 712
 	ldloc.1
-	ldc.i4 716
+	ldc.i4 712
 	add
 	stloc.1
 	ldloc.0
@@ -1640,20 +1640,20 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d68: 0x1047d68: addu  a0, v0, zero
+// 0x01047d78: 0x1047d78: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047d6c: 0x1047d6c: addiu a1, s3, 23008
+// 0x01047d7c: 0x1047d7c: addiu a1, s3, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01047d70: 0x1047d70: jal   0x1097af8 sw    v0, 312(sp)
+// 0x01047d80: 0x1047d80: jal   0x1098140 sw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1664,9 +1664,9 @@ L_1047cf0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01047d78: 0x1047d78: lw    v0, 312(sp)
+// 0x01047d88: 0x1047d88: lw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1675,20 +1675,20 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01047d7c: 0x1047d7c: addu  a0, s0, zero
+// 0x01047d8c: 0x1047d8c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01047d80: 0x1047d80: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01047d90: 0x1047d90: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d88: 0x1047d88: jal   0x1046d14 addiu a0, zero, 2
+// 0x01047d98: 0x1047d98: jal   0x1046d24 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -1696,33 +1696,33 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::space_1046d14(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::space_1046d24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d90: 0x1047d90: addu  a1, v0, zero
+// 0x01047da0: 0x1047da0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047d94: 0x1047d94: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01047da4: 0x1047da4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047d9c: 0x1047d9c: lui   a0, 0x10000
+// 0x01047dac: 0x1047dac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047da0: 0x1047da0: addiu a0, a0, -23548
+// 0x01047db0: 0x1047db0: addiu a0, a0, -23548
 	ldloc.1
 	ldc.i4 -23548
 	add
 	stloc.1
-// 0x01047da4: 0x1047da4: jal   0x109e6d0 addu  a1, zero, zero
+// 0x01047db4: 0x1047db4: jal   0x109ed18 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1730,25 +1730,25 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047dac: 0x1047dac: addu  a1, v0, zero
+// 0x01047dbc: 0x1047dbc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047db0: 0x1047db0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01047dc0: 0x1047dc0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047db8: 0x1047db8: jal   0x1046d14 addiu a0, zero, 3
+// 0x01047dc8: 0x1047dc8: jal   0x1046d24 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.0
@@ -1756,30 +1756,30 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::space_1046d14(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::space_1046d24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047dc0: 0x1047dc0: addu  a1, v0, zero
+// 0x01047dd0: 0x1047dd0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047dc4: 0x1047dc4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01047dd4: 0x1047dd4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047dcc: 0x1047dcc: lui   a0, 0x10000
+// 0x01047ddc: 0x1047ddc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047dd0: 0x1047dd0: jal   0x101cd60 addiu a0, a0, 732
+// 0x01047de0: 0x1047de0: jal   0x101cd70 addiu a0, a0, 728
 	ldloc.1
-	ldc.i4 732
+	ldc.i4 728
 	add
 	stloc.1
 	ldloc.0
@@ -1787,26 +1787,26 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047dd8: 0x1047dd8: lui   a2, 0x10000
+// 0x01047de8: 0x1047de8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01047ddc: 0x1047ddc: addu  a0, s2, zero
+// 0x01047dec: 0x1047dec: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01047de0: 0x1047de0: addiu a2, a2, 744
+// 0x01047df0: 0x1047df0: addiu a2, a2, 740
 	ldloc.3
-	ldc.i4 744
+	ldc.i4 740
 	add
 	stloc.3
-// 0x01047de4: 0x1047de4: addu  a3, v0, zero
+// 0x01047df4: 0x1047df4: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01047de8: 0x1047de8: jal   0x1000f9c addiu a1, zero, 250
+// 0x01047df8: 0x1047df8: jal   0x1000f9c addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
 	ldloc.0
@@ -1819,18 +1819,18 @@ L_1047cf0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047df0: 0x1047df0: addu  a3, zero, zero
+// 0x01047e00: 0x1047e00: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01047df4: 0x1047df4: addiu a2, zero, 18
+// 0x01047e04: 0x1047e04: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01047df8: 0x1047df8: addu  a1, s2, zero
+// 0x01047e08: 0x1047e08: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01047dfc: 0x1047dfc: jal   0x1098d10 addiu a0, s5, 748
+// 0x01047e0c: 0x1047e0c: jal   0x1099358 addiu a0, s5, 744
 	ldloc 13
-	ldc.i4 748
+	ldc.i4 744
 	add
 	stloc.1
 	ldloc.0
@@ -1838,20 +1838,20 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e04: 0x1047e04: addu  a0, v0, zero
+// 0x01047e14: 0x1047e14: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047e08: 0x1047e08: addiu a1, s3, 23008
+// 0x01047e18: 0x1047e18: addiu a1, s3, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01047e0c: 0x1047e0c: jal   0x1097af8 sw    v0, 312(sp)
+// 0x01047e1c: 0x1047e1c: jal   0x1098140 sw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1862,9 +1862,9 @@ L_1047cf0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01047e14: 0x1047e14: lw    v0, 312(sp)
+// 0x01047e24: 0x1047e24: lw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1873,26 +1873,26 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01047e18: 0x1047e18: addu  a0, s0, zero
+// 0x01047e28: 0x1047e28: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01047e1c: 0x1047e1c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01047e2c: 0x1047e2c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e24: 0x1047e24: addiu a1, zero, 5
+// 0x01047e34: 0x1047e34: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01047e28: 0x1047e28: addu  a2, zero, zero
+// 0x01047e38: 0x1047e38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047e2c: 0x1047e2c: jal   0x109434c addu  a0, s0, zero
+// 0x01047e3c: 0x1047e3c: jal   0x1094970 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1900,12 +1900,12 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e34: 0x1047e34: jal   0x101cd60 addiu a0, s1, 260
+// 0x01047e44: 0x1047e44: jal   0x101cd70 addiu a0, s1, 260
 	ldloc 11
 	ldc.i4 260
 	add
@@ -1915,26 +1915,26 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e3c: 0x1047e3c: lui   a2, 0x10000
+// 0x01047e4c: 0x1047e4c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01047e40: 0x1047e40: addu  a0, s2, zero
+// 0x01047e50: 0x1047e50: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01047e44: 0x1047e44: addiu a2, a2, 764
+// 0x01047e54: 0x1047e54: addiu a2, a2, 760
 	ldloc.3
-	ldc.i4 764
+	ldc.i4 760
 	add
 	stloc.3
-// 0x01047e48: 0x1047e48: addu  a3, v0, zero
+// 0x01047e58: 0x1047e58: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01047e4c: 0x1047e4c: jal   0x1000f9c addiu a1, zero, 250
+// 0x01047e5c: 0x1047e5c: jal   0x1000f9c addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
 	ldloc.0
@@ -1947,18 +1947,18 @@ L_1047cf0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e54: 0x1047e54: addiu a2, zero, 18
+// 0x01047e64: 0x1047e64: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01047e58: 0x1047e58: addiu a3, zero, 8
+// 0x01047e68: 0x1047e68: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01047e5c: 0x1047e5c: addu  a1, s2, zero
+// 0x01047e6c: 0x1047e6c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01047e60: 0x1047e60: jal   0x1098d10 addiu a0, s5, 748
+// 0x01047e70: 0x1047e70: jal   0x1099358 addiu a0, s5, 744
 	ldloc 13
-	ldc.i4 748
+	ldc.i4 744
 	add
 	stloc.1
 	ldloc.0
@@ -1966,23 +1966,23 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e68: 0x1047e68: lui   s2, 0x10000
+// 0x01047e78: 0x1047e78: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01047e6c: 0x1047e6c: addu  a0, v0, zero
+// 0x01047e7c: 0x1047e7c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047e70: 0x1047e70: addiu a1, s2, 772
+// 0x01047e80: 0x1047e80: addiu a1, s2, 768
 	ldloc 10
-	ldc.i4 772
+	ldc.i4 768
 	add
 	stloc.2
-// 0x01047e74: 0x1047e74: jal   0x1097af8 sw    v0, 312(sp)
+// 0x01047e84: 0x1047e84: jal   0x1098140 sw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1993,9 +1993,9 @@ L_1047cf0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01047e7c: 0x1047e7c: lw    v0, 312(sp)
+// 0x01047e8c: 0x1047e8c: lw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2004,20 +2004,20 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01047e80: 0x1047e80: addu  a0, s0, zero
+// 0x01047e90: 0x1047e90: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01047e84: 0x1047e84: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01047e94: 0x1047e94: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e8c: 0x1047e8c: jal   0x1046d14 addiu a0, zero, 3
+// 0x01047e9c: 0x1047e9c: jal   0x1046d24 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.0
@@ -2025,28 +2025,28 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::space_1046d14(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::space_1046d24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047e94: 0x1047e94: addu  a1, v0, zero
+// 0x01047ea4: 0x1047ea4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047e98: 0x1047e98: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01047ea8: 0x1047ea8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ea0: 0x1047ea0: addiu v0, zero, 1
+// 0x01047eb0: 0x1047eb0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01047ea4: 0x1047ea4: lw    a1, 792(s1)
+// 0x01047eb4: 0x1047eb4: lw    a1, 792(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -2055,7 +2055,7 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047ea8: 0x1047ea8: lw    a0, 796(s1)
+// 0x01047eb8: 0x1047eb8: lw    a0, 796(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -2064,10 +2064,10 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01047eac: 0x1047eac: lui   a2, 0x10000
+// 0x01047ebc: 0x1047ebc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01047eb0: 0x1047eb0: sw    v0, 16(sp)
+// 0x01047ec0: 0x1047ec0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2076,23 +2076,23 @@ L_1047cf0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01047eb4: 0x1047eb4: lui   v0, 0x1050000
+// 0x01047ec4: 0x1047ec4: lui   v0, 0x1050000
 	ldc.i4 17104896
 	stloc 5
-// 0x01047eb8: 0x1047eb8: addiu a2, a2, 18500
+// 0x01047ec8: 0x1047ec8: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01047ebc: 0x1047ebc: addu  a3, zero, zero
+// 0x01047ecc: 0x1047ecc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01047ec0: 0x1047ec0: addiu v0, v0, -32164
+// 0x01047ed0: 0x1047ed0: addiu v0, v0, -32148
 	ldloc 5
-	ldc.i4 -32164
+	ldc.i4 -32148
 	add
 	stloc 5
-// 0x01047ec4: 0x1047ec4: jal   0x10560d0 sw    v0, 20(sp)
+// 0x01047ed4: 0x1047ed4: jal   0x10560e0 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2106,25 +2106,25 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_res_ETA_widget_10560d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_res_ETA_widget_10560e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ecc: 0x1047ecc: addu  a1, v0, zero
+// 0x01047edc: 0x1047edc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047ed0: 0x1047ed0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01047ee0: 0x1047ee0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ed8: 0x1047ed8: jal   0x105603c addu  a0, s0, zero
+// 0x01047ee8: 0x1047ee8: jal   0x105604c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2132,32 +2132,32 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_res_hide_ETA_widget_105603c(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_res_hide_ETA_widget_105604c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ee0: 0x1047ee0: lui   a0, 0x10000
+// 0x01047ef0: 0x1047ef0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047ee4: 0x1047ee4: addiu a3, zero, 100
+// 0x01047ef4: 0x1047ef4: addiu a3, zero, 100
 	ldc.i4.s 100
 	stloc 4
-// 0x01047ee8: 0x1047ee8: addiu a0, a0, 604
+// 0x01047ef8: 0x1047ef8: addiu a0, a0, 600
 	ldloc.1
-	ldc.i4 604
+	ldc.i4 600
 	add
 	stloc.1
-// 0x01047eec: 0x1047eec: addu  a1, zero, zero
+// 0x01047efc: 0x1047efc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047ef0: 0x1047ef0: addiu a2, zero, -2
+// 0x01047f00: 0x1047f00: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01047ef4: 0x1047ef4: addiu v0, zero, 137
+// 0x01047f04: 0x1047f04: addiu v0, zero, 137
 	ldc.i4 137
 	stloc 5
-// 0x01047ef8: 0x1047ef8: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01047f08: 0x1047f08: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2171,29 +2171,29 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f00: 0x1047f00: addu  a0, v0, zero
+// 0x01047f10: 0x1047f10: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047f04: 0x1047f04: addu  a2, zero, zero
+// 0x01047f14: 0x1047f14: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01047f08: 0x1047f08: addu  a1, zero, zero
+// 0x01047f18: 0x1047f18: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047f0c: 0x1047f0c: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01047f1c: 0x1047f1c: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01047f14: 0x1047f14: jal   0x1046d14 addiu a0, zero, 2
+// 0x01047f24: 0x1047f24: jal   0x1046d24 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -2201,30 +2201,30 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::space_1046d14(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::space_1046d24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f1c: 0x1047f1c: addu  a1, v0, zero
+// 0x01047f2c: 0x1047f2c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047f20: 0x1047f20: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01047f30: 0x1047f30: jal   0x109950c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f28: 0x1047f28: lui   a0, 0x10000
+// 0x01047f38: 0x1047f38: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047f2c: 0x1047f2c: jal   0x101cd60 addiu a0, a0, 780
+// 0x01047f3c: 0x1047f3c: jal   0x101cd70 addiu a0, a0, 776
 	ldloc.1
-	ldc.i4 780
+	ldc.i4 776
 	add
 	stloc.1
 	ldloc.0
@@ -2232,28 +2232,28 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f34: 0x1047f34: lui   a0, 0x10000
+// 0x01047f44: 0x1047f44: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047f38: 0x1047f38: ori   a3, zero, 32776
+// 0x01047f48: 0x1047f48: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x01047f3c: 0x1047f3c: addiu a2, zero, 18
+// 0x01047f4c: 0x1047f4c: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01047f40: 0x1047f40: addu  a1, v0, zero
+// 0x01047f50: 0x1047f50: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047f44: 0x1047f44: jal   0x1098d10 addiu a0, a0, 816
+// 0x01047f54: 0x1047f54: jal   0x1099358 addiu a0, a0, 812
 	ldloc.1
-	ldc.i4 816
+	ldc.i4 812
 	add
 	stloc.1
 	ldloc.0
@@ -2261,20 +2261,20 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f4c: 0x1047f4c: addu  a0, v0, zero
+// 0x01047f5c: 0x1047f5c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047f50: 0x1047f50: addiu a1, s3, 23008
+// 0x01047f60: 0x1047f60: addiu a1, s3, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01047f54: 0x1047f54: jal   0x1097af8 sw    v0, 312(sp)
+// 0x01047f64: 0x1047f64: jal   0x1098140 sw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2285,9 +2285,9 @@ L_1047cf0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01047f5c: 0x1047f5c: lw    v0, 312(sp)
+// 0x01047f6c: 0x1047f6c: lw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2296,31 +2296,31 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01047f60: 0x1047f60: addu  a0, s1, zero
+// 0x01047f70: 0x1047f70: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01047f64: 0x1047f64: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01047f74: 0x1047f74: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f6c: 0x1047f6c: lui   a0, 0x10000
+// 0x01047f7c: 0x1047f7c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047f70: 0x1047f70: addiu a2, zero, 16
+// 0x01047f80: 0x1047f80: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01047f74: 0x1047f74: addiu a0, a0, 832
+// 0x01047f84: 0x1047f84: addiu a0, a0, 828
 	ldloc.1
-	ldc.i4 832
+	ldc.i4 828
 	add
 	stloc.1
-// 0x01047f78: 0x1047f78: jal   0x109b6bc addu  a1, zero, zero
+// 0x01047f88: 0x1047f88: jal   0x109bd04 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2328,64 +2328,64 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_progress_new_109b6bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_progress_new_109bd04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f80: 0x1047f80: addu  a0, v0, zero
+// 0x01047f90: 0x1047f90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01047f84: 0x1047f84: lui   s3, 0x60000
+// 0x01047f94: 0x1047f94: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 9
-// 0x01047f88: 0x1047f88: addu  a1, zero, zero
+// 0x01047f98: 0x1047f98: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01047f8c: 0x1047f8c: jal   0x109b694 sw    v0, 20316(s3)
+// 0x01047f9c: 0x1047f9c: jal   0x109bcdc sw    v0, 20780(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5079
+	ldc.i4 5195
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl116::ssd_progress_set_value_109b694(int32,int32)
+	call int32 Cibyl116::ssd_progress_set_value_109bcdc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047f94: 0x1047f94: lw    a1, 20316(s3)
+// 0x01047fa4: 0x1047fa4: lw    a1, 20780(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 5079
+	ldc.i4 5195
 	add
 	ldelem.i4
 	stloc.2
-// 0x01047f98: 0x1047f98: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01047fa8: 0x1047fa8: jal   0x109950c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047fa0: 0x1047fa0: lui   a1, 0x1040000
+// 0x01047fb0: 0x1047fb0: lui   a1, 0x1040000
 	ldc.i4 17039360
 	stloc.2
-// 0x01047fa4: 0x1047fa4: addiu a1, a1, 30880
+// 0x01047fb4: 0x1047fb4: addiu a1, a1, 30896
 	ldloc.2
-	ldc.i4 30880
+	ldc.i4 30896
 	add
 	stloc.2
-// 0x01047fa8: 0x1047fa8: jal   0x104fe98 addiu a0, zero, 100
+// 0x01047fb8: 0x1047fb8: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -2393,25 +2393,25 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047fb0: 0x1047fb0: addu  a1, s1, zero
+// 0x01047fc0: 0x1047fc0: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01047fb4: 0x1047fb4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01047fc4: 0x1047fc4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047fbc: 0x1047fbc: jal   0x1046d14 addiu a0, zero, 5
+// 0x01047fcc: 0x1047fcc: jal   0x1046d24 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -2419,30 +2419,30 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::space_1046d14(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::space_1046d24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047fc4: 0x1047fc4: addu  a1, v0, zero
+// 0x01047fd4: 0x1047fd4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047fc8: 0x1047fc8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01047fd8: 0x1047fd8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047fd0: 0x1047fd0: lui   a0, 0x10000
+// 0x01047fe0: 0x1047fe0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047fd4: 0x1047fd4: jal   0x101cd60 addiu a0, a0, -10624
+// 0x01047fe4: 0x1047fe4: jal   0x101cd70 addiu a0, a0, -10628
 	ldloc.1
-	ldc.i4 -10624
+	ldc.i4 -10628
 	add
 	stloc.1
 	ldloc.0
@@ -2450,36 +2450,36 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047fdc: 0x1047fdc: lui   s3, 0x100000
+// 0x01047fec: 0x1047fec: lui   s3, 0x100000
 	ldc.i4 1048576
 	stloc 9
-// 0x01047fe0: 0x1047fe0: lui   a3, 0x1040000
+// 0x01047ff0: 0x1047ff0: lui   a3, 0x1040000
 	ldc.i4 17039360
 	stloc 4
-// 0x01047fe4: 0x1047fe4: lui   a0, 0x10000
+// 0x01047ff4: 0x1047ff4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01047fe8: 0x1047fe8: ori   a2, s3, 1
+// 0x01047ff8: 0x1047ff8: ori   a2, s3, 1
 	ldloc 9
 	ldc.i4.1
 	or
 	stloc.3
-// 0x01047fec: 0x1047fec: addiu a3, a3, 27476
+// 0x01047ffc: 0x1047ffc: addiu a3, a3, 27492
 	ldloc 4
-	ldc.i4 27476
+	ldc.i4 27492
 	add
 	stloc 4
-// 0x01047ff0: 0x1047ff0: addu  a1, v0, zero
+// 0x01048000: 0x1048000: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01047ff4: 0x1047ff4: jal   0x1091088 addiu a0, a0, 204
+// 0x01048004: 0x1048004: jal   0x10916ac addiu a0, a0, 200
 	ldloc.1
-	ldc.i4 204
+	ldc.i4 200
 	add
 	stloc.1
 	ldloc.0
@@ -2487,15 +2487,15 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01047ffc: 0x1047ffc: addu  a0, v0, zero
+// 0x0104800c: 0x104800c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01048000: 0x1048000: jal   0x10909e0 sw    v0, 312(sp)
+// 0x01048010: 0x1048010: jal   0x1091004 sw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2509,12 +2509,12 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::ssd_button_disable_10909e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl107::ssd_button_disable_1091004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048008: 0x1048008: lw    v0, 312(sp)
+// 0x01048018: 0x1048018: lw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2523,25 +2523,25 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104800c: 0x104800c: addu  a0, s0, zero
+// 0x0104801c: 0x104801c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01048010: 0x1048010: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01048020: 0x1048020: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048018: 0x1048018: lui   a0, 0x10000
+// 0x01048028: 0x1048028: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104801c: 0x104801c: jal   0x101cd60 addiu a0, a0, 844
+// 0x0104802c: 0x104802c: jal   0x101cd70 addiu a0, a0, 840
 	ldloc.1
-	ldc.i4 844
+	ldc.i4 840
 	add
 	stloc.1
 	ldloc.0
@@ -2549,36 +2549,36 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048024: 0x1048024: lui   a2, 0x300000
+// 0x01048034: 0x1048034: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x01048028: 0x1048028: lui   a3, 0x1050000
+// 0x01048038: 0x1048038: lui   a3, 0x1050000
 	ldc.i4 17104896
 	stloc 4
-// 0x0104802c: 0x104802c: lui   a0, 0x10000
+// 0x0104803c: 0x104803c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048030: 0x1048030: ori   a2, a2, 9
+// 0x01048040: 0x1048040: ori   a2, a2, 9
 	ldloc.3
 	ldc.i4.s 9
 	or
 	stloc.3
-// 0x01048034: 0x1048034: addiu a3, a3, -32300
+// 0x01048044: 0x1048044: addiu a3, a3, -32284
 	ldloc 4
-	ldc.i4 -32300
+	ldc.i4 -32284
 	add
 	stloc 4
-// 0x01048038: 0x1048038: addiu a0, a0, 852
+// 0x01048048: 0x1048048: addiu a0, a0, 848
 	ldloc.1
-	ldc.i4 852
+	ldc.i4 848
 	add
 	stloc.1
-// 0x0104803c: 0x104803c: jal   0x1091088 addu  a1, v0, zero
+// 0x0104804c: 0x104804c: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2586,49 +2586,49 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048044: 0x1048044: addu  a1, v0, zero
+// 0x01048054: 0x1048054: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01048048: 0x1048048: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01048058: 0x1048058: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048050: 0x1048050: lui   a0, 0x10000
+// 0x01048060: 0x1048060: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048054: 0x1048054: addiu a3, s4, -3
+// 0x01048064: 0x1048064: addiu a3, s4, -3
 	ldloc 12
 	ldc.i4.s -3
 	add
 	stloc 4
-// 0x01048058: 0x1048058: addiu a0, a0, 868
+// 0x01048068: 0x1048068: addiu a0, a0, 864
 	ldloc.1
-	ldc.i4 868
+	ldc.i4 864
 	add
 	stloc.1
-// 0x0104805c: 0x104805c: addu  a1, zero, zero
+// 0x0104806c: 0x104806c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01048060: 0x1048060: addiu a2, zero, -2
+// 0x01048070: 0x1048070: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01048064: 0x1048064: ori   s3, s3, 137
+// 0x01048074: 0x1048074: ori   s3, s3, 137
 	ldloc 9
 	ldc.i4 137
 	or
 	stloc 9
-// 0x01048068: 0x1048068: jal   0x1093a24 sw    s3, 16(sp)
+// 0x01048078: 0x1048078: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2642,34 +2642,34 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048070: 0x1048070: addu  a0, v0, zero
+// 0x01048080: 0x1048080: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01048074: 0x1048074: addu  a1, zero, zero
+// 0x01048084: 0x1048084: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01048078: 0x1048078: addu  a2, zero, zero
+// 0x01048088: 0x1048088: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104807c: 0x104807c: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0104808c: 0x104808c: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01048084: 0x1048084: lui   a0, 0x10000
+// 0x01048094: 0x1048094: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048088: 0x1048088: jal   0x101cd60 addiu a0, a0, 884
+// 0x01048098: 0x1048098: jal   0x101cd70 addiu a0, a0, 880
 	ldloc.1
-	ldc.i4 884
+	ldc.i4 880
 	add
 	stloc.1
 	ldloc.0
@@ -2677,28 +2677,28 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048090: 0x1048090: lui   a0, 0x10000
+// 0x010480a0: 0x10480a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048094: 0x1048094: addiu a2, zero, 14
+// 0x010480a4: 0x10480a4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01048098: 0x1048098: ori   a3, zero, 32792
+// 0x010480a8: 0x10480a8: ori   a3, zero, 32792
 	ldc.i4.s 0
 	ldc.i4 32792
 	or
 	stloc 4
-// 0x0104809c: 0x104809c: addu  a1, v0, zero
+// 0x010480ac: 0x10480ac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010480a0: 0x10480a0: jal   0x1098d10 addiu a0, a0, 920
+// 0x010480b0: 0x10480b0: jal   0x1099358 addiu a0, a0, 916
 	ldloc.1
-	ldc.i4 920
+	ldc.i4 916
 	add
 	stloc.1
 	ldloc.0
@@ -2706,20 +2706,20 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010480a8: 0x10480a8: addu  a0, v0, zero
+// 0x010480b8: 0x10480b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010480ac: 0x10480ac: addiu a1, s2, 772
+// 0x010480bc: 0x10480bc: addiu a1, s2, 768
 	ldloc 10
-	ldc.i4 772
+	ldc.i4 768
 	add
 	stloc.2
-// 0x010480b0: 0x10480b0: jal   0x1097af8 sw    v0, 312(sp)
+// 0x010480c0: 0x10480c0: jal   0x1098140 sw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2730,9 +2730,9 @@ L_1047cf0:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010480b8: 0x10480b8: lw    v0, 312(sp)
+// 0x010480c8: 0x10480c8: lw    v0, 312(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2741,28 +2741,28 @@ L_1047cf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010480bc: 0x10480bc: addu  a0, s1, zero
+// 0x010480cc: 0x10480cc: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010480c0: 0x10480c0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010480d0: 0x10480d0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010480c8: 0x10480c8: lui   v0, 0x1050000
+// 0x010480d8: 0x10480d8: lui   v0, 0x1050000
 	ldc.i4 17104896
 	stloc 5
-// 0x010480cc: 0x10480cc: addiu v0, v0, -29748
+// 0x010480dc: 0x10480dc: addiu v0, v0, -29732
 	ldloc 5
-	ldc.i4 -29748
+	ldc.i4 -29732
 	add
 	stloc 5
-// 0x010480d0: 0x10480d0: sw    v0, 112(s1)
+// 0x010480e0: 0x10480e0: sw    v0, 112(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -2771,50 +2771,50 @@ L_1047cf0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010480d4: 0x10480d4: addu  a1, s1, zero
+// 0x010480e4: 0x10480e4: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x010480d8: 0x10480d8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010480e8: 0x10480e8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010480e0: 0x10480e0: lui   v0, 0x60000
+// 0x010480f0: 0x10480f0: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010480e4: 0x10480e4: lw    a0, 20312(v0)
+// 0x010480f4: 0x10480f4: lw    a0, 20776(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5078
+	ldc.i4 5194
 	add
 	ldelem.i4
 	stloc.1
-// 0x010480e8: 0x10480e8: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010480f8: 0x10480f8: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010480f0: 0x10480f0: lui   a0, 0x10000
+// 0x01048100: 0x1048100: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010480f4: 0x10480f4: addiu a0, a0, -604
+// 0x01048104: 0x1048104: addiu a0, a0, -608
 	ldloc.1
-	ldc.i4 -604
+	ldc.i4 -608
 	add
 	stloc.1
-// 0x010480f8: 0x10480f8: jal   0x1095eec addu  a1, zero, zero
+// 0x01048108: 0x1048108: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2822,26 +2822,26 @@ L_1047cf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1048100:
-// 0x01048100: 0x1048100: jal   0x1021900 sll   zero, zero, 0
+L_1048110:
+// 0x01048110: 0x1048110: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1048108:
-// 0x01048108: 0x1048108: lw    ra, 348(sp)
-// 0x0104810c: 0x104810c: lw    s5, 344(sp)
+L_1048118:
+// 0x01048118: 0x1048118: lw    ra, 348(sp)
+// 0x0104811c: 0x104811c: lw    s5, 344(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2850,7 +2850,7 @@ L_1048108:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01048110: 0x1048110: lw    s4, 340(sp)
+// 0x01048120: 0x1048120: lw    s4, 340(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2859,7 +2859,7 @@ L_1048108:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01048114: 0x1048114: lw    s3, 336(sp)
+// 0x01048124: 0x1048124: lw    s3, 336(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2868,7 +2868,7 @@ L_1048108:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01048118: 0x1048118: lw    s2, 332(sp)
+// 0x01048128: 0x1048128: lw    s2, 332(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2877,7 +2877,7 @@ L_1048108:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104811c: 0x104811c: lw    s1, 328(sp)
+// 0x0104812c: 0x104812c: lw    s1, 328(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2886,7 +2886,7 @@ L_1048108:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01048120: 0x1048120: lw    s0, 324(sp)
+// 0x01048130: 0x1048130: lw    s0, 324(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2895,7 +2895,7 @@ L_1048108:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01048124: 0x1048124: jr    ra addiu sp, sp, 352
+// 0x01048134: 0x1048134: jr    ra addiu sp, sp, 352
 	ldloc.0
 	ldc.i4 352
 	add
@@ -2907,7 +2907,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 request_route_104812c(int32,int32,int32,int32,int32)
+.method public static int32 request_route_104813c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -2948,12 +2948,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104812c: 0x104812c: addiu sp, sp, -40
+// 0x0104813c: 0x104813c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01048130: 0x1048130: sw    s1, 32(sp)
+// 0x01048140: 0x1048140: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2962,7 +2962,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01048134: 0x1048134: sw    s0, 28(sp)
+// 0x01048144: 0x1048144: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2971,40 +2971,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01048138: 0x1048138: sw    ra, 36(sp)
-// 0x0104813c: 0x104813c: jal   0x108e530 addu  a0, zero, zero
+// 0x01048148: 0x1048148: sw    ra, 36(sp)
+// 0x0104814c: 0x104814c: jal   0x108eb54 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048144: 0x1048144: addu  s0, v0, zero
+// 0x01048154: 0x1048154: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01048148: 0x1048148: bne   v0, zero, 0x1048170 lui   s1, 0x10000
+// 0x01048158: 0x1048158: bne   v0, zero, 0x1048180 lui   s1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 9
-	brtrue L_1048170
+	brtrue L_1048180
 // --- basic block ---
-// 0x01048150: 0x1048150: lui   a3, 0x10000
+// 0x01048160: 0x1048160: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01048154: 0x1048154: addiu a1, s1, -576
+// 0x01048164: 0x1048164: addiu a1, s1, -580
 	ldloc 9
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048158: 0x1048158: addiu a3, a3, 940
+// 0x01048168: 0x1048168: addiu a3, a3, 936
 	ldloc 4
-	ldc.i4 940
+	ldc.i4 936
 	add
 	stloc 4
-// 0x0104815c: 0x104815c: addiu a0, zero, 4
+// 0x0104816c: 0x104816c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01048160: 0x1048160: jal   0x100449c addiu a2, zero, 1568
+// 0x01048170: 0x1048170: jal   0x100449c addiu a2, zero, 1568
 	ldc.i4 1568
 	stloc.3
 	ldloc.0
@@ -3017,16 +3017,16 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01048168: 0x1048168: j	 0x10481c0 sll   zero, zero, 0
-	br L_10481c0
+// 0x01048178: 0x1048178: j	 0x10481d0 sll   zero, zero, 0
+	br L_10481d0
 // --- basic block ---
-L_1048170:
-// 0x01048170: 0x1048170: lui   a0, 0x1050000
+L_1048180:
+// 0x01048180: 0x1048180: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01048174: 0x1048174: jal   0x104fd00 addiu a0, a0, -32468
+// 0x01048184: 0x1048184: jal   0x104fd10 addiu a0, a0, -32452
 	ldloc.1
-	ldc.i4 -32468
+	ldc.i4 -32452
 	add
 	stloc.1
 	ldloc.0
@@ -3034,17 +3034,17 @@ L_1048170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104817c: 0x104817c: addiu v0, s0, 260
+// 0x0104818c: 0x104818c: addiu v0, s0, 260
 	ldloc 7
 	ldc.i4 260
 	add
 	stloc 5
-// 0x01048180: 0x1048180: sw    v0, 16(sp)
+// 0x01048190: 0x1048190: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3053,33 +3053,33 @@ L_1048170:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01048184: 0x1048184: lw    v0, 0(s0)
+// 0x01048194: 0x1048194: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01048188: 0x1048188: lui   a3, 0x10000
+// 0x01048198: 0x1048198: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104818c: 0x104818c: addiu a1, s1, -576
+// 0x0104819c: 0x104819c: addiu a1, s1, -580
 	ldloc 9
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048190: 0x1048190: addiu a3, a3, 1004
+// 0x010481a0: 0x10481a0: addiu a3, a3, 1000
 	ldloc 4
-	ldc.i4 1004
+	ldc.i4 1000
 	add
 	stloc 4
-// 0x01048194: 0x1048194: addiu a0, zero, 3
+// 0x010481a4: 0x10481a4: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01048198: 0x1048198: addiu a2, zero, 1574
+// 0x010481a8: 0x10481a8: addiu a2, zero, 1574
 	ldc.i4 1574
 	stloc.3
-// 0x0104819c: 0x104819c: jal   0x100449c sw    v0, 20(sp)
+// 0x010481ac: 0x10481ac: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3098,24 +3098,24 @@ L_1048170:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010481a4: 0x10481a4: lw    a0, 0(s0)
+// 0x010481b4: 0x10481b4: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010481a8: 0x10481a8: addiu a2, s0, 780
+// 0x010481b8: 0x10481b8: addiu a2, s0, 780
 	ldloc 7
 	ldc.i4 780
 	add
 	stloc.3
-// 0x010481ac: 0x10481ac: addiu a1, s0, 772
+// 0x010481bc: 0x10481bc: addiu a1, s0, 772
 	ldloc 7
 	ldc.i4 772
 	add
 	stloc.2
-// 0x010481b0: 0x10481b0: jal   0x108e638 addiu a3, zero, 1
+// 0x010481c0: 0x10481c0: jal   0x108ec5c addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -3123,25 +3123,25 @@ L_1048170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeAltRoutes_TripRoute_Request_108e638(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeAltRoutes_TripRoute_Request_108ec5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010481b8: 0x10481b8: jal   0x1047980 sll   zero, zero, 0
+// 0x010481c8: 0x10481c8: jal   0x1047990 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::roadmap_alternative_routes_suggest_route_dialog_1047980(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::roadmap_alternative_routes_suggest_route_dialog_1047990(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10481c0:
-// 0x010481c0: 0x10481c0: lw    ra, 36(sp)
-// 0x010481c4: 0x10481c4: lw    s1, 32(sp)
+L_10481d0:
+// 0x010481d0: 0x10481d0: lw    ra, 36(sp)
+// 0x010481d4: 0x10481d4: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3150,7 +3150,7 @@ L_10481c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010481c8: 0x10481c8: lw    s0, 28(sp)
+// 0x010481d8: 0x10481d8: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3159,7 +3159,7 @@ L_10481c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010481cc: 0x10481cc: jr    ra addiu sp, sp, 40
+// 0x010481dc: 0x10481dc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3171,7 +3171,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_close_btn_cb_10481d4(int32,int32,int32,int32,int32)
+.method public static int32 on_close_btn_cb_10481e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3206,21 +3206,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010481d4: 0x10481d4: addiu sp, sp, -24
+// 0x010481e4: 0x10481e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010481d8: 0x10481d8: sw    ra, 20(sp)
-// 0x010481dc: 0x10481dc: addu  a0, zero, zero
+// 0x010481e8: 0x10481e8: sw    ra, 20(sp)
+// 0x010481ec: 0x10481ec: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010481e0: 0x10481e0: cibyl_sysc_arg 0x4
+// 0x010481f0: 0x10481f0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010481e4: 0x10481e4: cibyl_sysc 0x6f5
+// 0x010481f4: 0x10481f4: cibyl_sysc 0x6f5
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010481e8: 0x10481e8: jal   0x10478f8 addu  a0, v0, zero
+// 0x010481f8: 0x10481f8: jal   0x1047908 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3228,18 +3228,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::roadmap_alternative_routes_set_last_check_time_stamp_10478f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::roadmap_alternative_routes_set_last_check_time_stamp_1047908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010481f0: 0x10481f0: jal   0x108e578 sll   zero, zero, 0
-	call int32 Cibyl106::RealtimeAltRoutes_Route_CancelRequest_108e578()
+// 0x01048200: 0x1048200: jal   0x108eb9c sll   zero, zero, 0
+	call int32 Cibyl106::RealtimeAltRoutes_Route_CancelRequest_108eb9c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010481f8: 0x10481f8: jal   0x104694c addu  a0, zero, zero
+// 0x01048208: 0x1048208: jal   0x104695c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3247,16 +3247,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::suggest_route_dialog_close_104694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::suggest_route_dialog_close_104695c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048200: 0x1048200: lw    ra, 20(sp)
-// 0x01048204: 0x1048204: addiu v0, zero, 1
+// 0x01048210: 0x1048210: lw    ra, 20(sp)
+// 0x01048214: 0x1048214: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01048208: 0x1048208: jr    ra addiu sp, sp, 24
+// 0x01048218: 0x1048218: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3268,7 +3268,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_suggest_dlg_canceled_1048210(int32,int32,int32,int32,int32)
+.method public static int32 on_suggest_dlg_canceled_1048220(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3303,22 +3303,22 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048210: 0x1048210: addiu sp, sp, -24
+// 0x01048220: 0x1048220: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01048214: 0x1048214: sw    ra, 20(sp)
-// 0x01048218: 0x1048218: jal   0x108e578 sll   zero, zero, 0
-	call int32 Cibyl106::RealtimeAltRoutes_Route_CancelRequest_108e578()
+// 0x01048224: 0x1048224: sw    ra, 20(sp)
+// 0x01048228: 0x1048228: jal   0x108eb9c sll   zero, zero, 0
+	call int32 Cibyl106::RealtimeAltRoutes_Route_CancelRequest_108eb9c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048220: 0x1048220: lui   a0, 0x10000
+// 0x01048230: 0x1048230: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048224: 0x1048224: jal   0x101f044 addiu a0, a0, -29748
+// 0x01048234: 0x1048234: jal   0x101f054 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -3328,15 +3328,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104822c: 0x104822c: lui   a0, 0x10000
+// 0x0104823c: 0x104823c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048230: 0x1048230: jal   0x101f044 addiu a0, a0, -29760
+// 0x01048240: 0x1048240: jal   0x101f054 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -3346,28 +3346,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048238: 0x1048238: jal   0x105944c sll   zero, zero, 0
+// 0x01048248: 0x1048248: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048240: 0x1048240: lui   a0, 0x1040000
+// 0x01048250: 0x1048250: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01048244: 0x1048244: jal   0x104fd00 addiu a0, a0, 30880
+// 0x01048254: 0x1048254: jal   0x104fd10 addiu a0, a0, 30896
 	ldloc.1
-	ldc.i4 30880
+	ldc.i4 30896
 	add
 	stloc.1
 	ldloc.0
@@ -3375,14 +3375,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104824c: 0x104824c: lw    ra, 20(sp)
-// 0x01048250: 0x1048250: sll   zero, zero, 0
-// 0x01048254: 0x1048254: jr    ra addiu sp, sp, 24
+// 0x0104825c: 0x104825c: lw    ra, 20(sp)
+// 0x01048260: 0x1048260: sll   zero, zero, 0
+// 0x01048264: 0x1048264: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3394,7 +3394,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_alt_routes_btn_cb_104825c(int32,int32,int32,int32,int32)
+.method public static int32 on_alt_routes_btn_cb_104826c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -3432,12 +3432,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104825c: 0x104825c: addiu sp, sp, -24
+// 0x0104826c: 0x104826c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01048260: 0x1048260: sw    s0, 16(sp)
+// 0x01048270: 0x1048270: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3446,40 +3446,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048264: 0x1048264: sw    ra, 20(sp)
-// 0x01048268: 0x1048268: jal   0x108e530 addu  a0, zero, zero
+// 0x01048274: 0x1048274: sw    ra, 20(sp)
+// 0x01048278: 0x1048278: jal   0x108eb54 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048270: 0x1048270: bne   v0, zero, 0x104829c addu  s0, v0, zero
+// 0x01048280: 0x1048280: bne   v0, zero, 0x10482ac addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_104829c
+	brtrue L_10482ac
 // --- basic block ---
-// 0x01048278: 0x1048278: lui   a1, 0x10000
+// 0x01048288: 0x1048288: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104827c: 0x104827c: lui   a3, 0x10000
+// 0x0104828c: 0x104828c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01048280: 0x1048280: addiu a1, a1, -576
+// 0x01048290: 0x1048290: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048284: 0x1048284: addiu a3, a3, 1064
+// 0x01048294: 0x1048294: addiu a3, a3, 1060
 	ldloc 4
-	ldc.i4 1064
+	ldc.i4 1060
 	add
 	stloc 4
-// 0x01048288: 0x1048288: addiu a0, zero, 4
+// 0x01048298: 0x1048298: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104828c: 0x104828c: jal   0x100449c addiu a2, zero, 292
+// 0x0104829c: 0x104829c: jal   0x100449c addiu a2, zero, 292
 	ldc.i4 292
 	stloc.3
 	ldloc.0
@@ -3492,32 +3492,32 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048294: 0x1048294: j	 0x1048308 addu  v0, zero, zero
+// 0x010482a4: 0x10482a4: j	 0x1048318 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1048308
+	br L_1048318
 // --- basic block ---
-L_104829c:
-// 0x0104829c: 0x104829c: jal   0x105944c sll   zero, zero, 0
+L_10482ac:
+// 0x010482ac: 0x10482ac: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010482a4: 0x10482a4: lui   a0, 0x10000
+// 0x010482b4: 0x10482b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010482a8: 0x10482a8: addiu a0, a0, -604
+// 0x010482b8: 0x10482b8: addiu a0, a0, -608
 	ldloc.1
-	ldc.i4 -604
+	ldc.i4 -608
 	add
 	stloc.1
-// 0x010482ac: 0x10482ac: jal   0x1094884 addiu a1, zero, 1
+// 0x010482bc: 0x10482bc: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3525,34 +3525,34 @@ L_104829c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010482b4: 0x10482b4: lui   v0, 0x60000
+// 0x010482c4: 0x10482c4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010482b8: 0x10482b8: lw    v0, 20288(v0)
+// 0x010482c8: 0x10482c8: lw    v0, 20752(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5072
+	ldc.i4 5188
 	add
 	ldelem.i4
 	stloc 5
-// 0x010482bc: 0x10482bc: sll   zero, zero, 0
-// 0x010482c0: 0x10482c0: beq   v0, zero, 0x10482d4 sll   zero, zero, 0
+// 0x010482cc: 0x10482cc: sll   zero, zero, 0
+// 0x010482d0: 0x10482d0: beq   v0, zero, 0x10482e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10482d4
+	brfalse L_10482e4
 // --- basic block ---
-// 0x010482c8: 0x10482c8: lui   a0, 0x1040000
+// 0x010482d8: 0x10482d8: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x010482cc: 0x10482cc: jal   0x104fd00 addiu a0, a0, 27584
+// 0x010482dc: 0x10482dc: jal   0x104fd10 addiu a0, a0, 27600
 	ldloc.1
-	ldc.i4 27584
+	ldc.i4 27600
 	add
 	stloc.1
 	ldloc.0
@@ -3560,29 +3560,29 @@ L_104829c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10482d4:
-// 0x010482d4: 0x10482d4: lui   a0, 0x10000
+L_10482e4:
+// 0x010482e4: 0x10482e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010482d8: 0x10482d8: addiu a0, a0, 1108
+// 0x010482e8: 0x10482e8: addiu a0, a0, 1104
 	ldloc.1
-	ldc.i4 1108
+	ldc.i4 1104
 	add
 	stloc.1
-// 0x010482dc: 0x10482dc: lui   v0, 0x60000
+// 0x010482ec: 0x10482ec: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x010482e0: 0x10482e0: jal   0x101cd60 sw    zero, 20288(v0)
+// 0x010482f0: 0x10482f0: jal   0x101cd70 sw    zero, 20752(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5072
+	ldc.i4 5188
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -3591,36 +3591,36 @@ L_10482d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010482e8: 0x10482e8: jal   0x104c3d0 addu  a0, v0, zero
+// 0x010482f8: 0x10482f8: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x010482f0: 0x10482f0: lw    a0, 0(s0)
+// 0x01048300: 0x1048300: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010482f4: 0x10482f4: addiu a2, s0, 780
+// 0x01048304: 0x1048304: addiu a2, s0, 780
 	ldloc 8
 	ldc.i4 780
 	add
 	stloc.3
-// 0x010482f8: 0x10482f8: addiu a1, s0, 772
+// 0x01048308: 0x1048308: addiu a1, s0, 772
 	ldloc 8
 	ldc.i4 772
 	add
 	stloc.2
-// 0x010482fc: 0x10482fc: jal   0x108e7b8 addiu a3, zero, 3
+// 0x0104830c: 0x104830c: jal   0x108eddc addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
 	ldloc.0
@@ -3628,17 +3628,17 @@ L_10482d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeAltRoutes_Route_Request_108e7b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Route_Request_108eddc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048304: 0x1048304: addiu v0, zero, 1
+// 0x01048314: 0x1048314: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1048308:
-// 0x01048308: 0x1048308: lw    ra, 20(sp)
-// 0x0104830c: 0x104830c: lw    s0, 16(sp)
+L_1048318:
+// 0x01048318: 0x1048318: lw    ra, 20(sp)
+// 0x0104831c: 0x104831c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3647,7 +3647,7 @@ L_1048308:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01048310: 0x1048310: jr    ra addiu sp, sp, 24
+// 0x01048320: 0x1048320: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3659,7 +3659,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 add_routes_selection_1048318(int32,int32,int32,int32,int32)
+.method public static int32 add_routes_selection_1048328(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s5,int32 s3,int32 s4,int32 s7,int32 s6,int32 s1,int32 s2,int32 s8,int32 ra,int32 lo)
@@ -3724,12 +3724,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048318: 0x1048318: addiu sp, sp, -408
+// 0x01048328: 0x1048328: addiu sp, sp, -408
 	ldloc.0
 	ldc.i4 -408
 	add
 	stloc.0
-// 0x0104831c: 0x104831c: sw    s5, 388(sp)
+// 0x0104832c: 0x104832c: sw    s5, 388(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3738,7 +3738,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01048320: 0x1048320: sw    s4, 384(sp)
+// 0x01048330: 0x1048330: sw    s4, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3747,7 +3747,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01048324: 0x1048324: sw    s2, 376(sp)
+// 0x01048334: 0x1048334: sw    s2, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3756,8 +3756,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01048328: 0x1048328: sw    ra, 404(sp)
-// 0x0104832c: 0x104832c: sw    s8, 400(sp)
+// 0x01048338: 0x1048338: sw    ra, 404(sp)
+// 0x0104833c: 0x104833c: sw    s8, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3766,7 +3766,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01048330: 0x1048330: sw    s7, 396(sp)
+// 0x01048340: 0x1048340: sw    s7, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3775,7 +3775,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01048334: 0x1048334: sw    s6, 392(sp)
+// 0x01048344: 0x1048344: sw    s6, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3784,7 +3784,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01048338: 0x1048338: sw    s3, 380(sp)
+// 0x01048348: 0x1048348: sw    s3, 380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3793,7 +3793,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104833c: 0x104833c: sw    s1, 372(sp)
+// 0x0104834c: 0x104834c: sw    s1, 372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3802,7 +3802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01048340: 0x1048340: sw    s0, 368(sp)
+// 0x01048350: 0x1048350: sw    s0, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3811,7 +3811,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048344: 0x1048344: jal   0x108e568 sw    a0, 408(sp)
+// 0x01048354: 0x1048354: jal   0x108eb8c sw    a0, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3820,90 +3820,90 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x0104834c: 0x104834c: addu  s2, v0, zero
+// 0x0104835c: 0x104835c: addu  s2, v0, zero
 	ldloc 5
 	stloc 15
-// 0x01048350: 0x1048350: lui   v0, 0xf0000
+// 0x01048360: 0x1048360: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01048354: 0x1048354: lw    s4, -30068(v0)
+// 0x01048364: 0x1048364: lw    s4, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 11
-// 0x01048358: 0x1048358: lui   v0, 0xf0000
+// 0x01048368: 0x1048368: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0104835c: 0x104835c: lw    s5, -30072(v0)
+// 0x0104836c: 0x104836c: lw    s5, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 9
-// 0x01048360: 0x1048360: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01048370: 0x1048370: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01048368: 0x1048368: bne   v0, zero, 0x1048378 addiu s0, zero, 56
+// 0x01048378: 0x1048378: bne   v0, zero, 0x1048388 addiu s0, zero, 56
 	ldloc 5
 	ldc.i4.s 56
 	stloc 8
-	brtrue L_1048378
+	brtrue L_1048388
 // --- basic block ---
-// 0x01048370: 0x1048370: j	 0x1048380 addiu s3, zero, 60
+// 0x01048380: 0x1048380: j	 0x1048390 addiu s3, zero, 60
 	ldc.i4.s 60
 	stloc 10
-	br L_1048380
+	br L_1048390
 // --- basic block ---
-L_1048378:
-// 0x01048378: 0x1048378: addiu s0, zero, 80
+L_1048388:
+// 0x01048388: 0x1048388: addiu s0, zero, 80
 	ldc.i4.s 80
 	stloc 8
-// 0x0104837c: 0x104837c: addiu s3, zero, 90
+// 0x0104838c: 0x104838c: addiu s3, zero, 90
 	ldc.i4.s 90
 	stloc 10
-L_1048380:
-// 0x01048380: 0x1048380: lui   a1, 0x10000
+L_1048390:
+// 0x01048390: 0x1048390: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01048384: 0x1048384: lui   a0, 0x10000
+// 0x01048394: 0x1048394: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048388: 0x1048388: lui   v0, 0x10000000
+// 0x01048398: 0x1048398: lui   v0, 0x10000000
 	ldc.i4 268435456
 	stloc 5
-// 0x0104838c: 0x104838c: addiu a1, a1, 18500
+// 0x0104839c: 0x104839c: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01048390: 0x1048390: addiu a0, a0, 1156
+// 0x010483a0: 0x10483a0: addiu a0, a0, 1152
 	ldloc.1
-	ldc.i4 1156
+	ldc.i4 1152
 	add
 	stloc.1
-// 0x01048394: 0x1048394: addiu a2, zero, -2
+// 0x010483a4: 0x10483a4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01048398: 0x1048398: addu  a3, s3, zero
+// 0x010483a8: 0x10483a8: addu  a3, s3, zero
 	ldloc 10
 	stloc 4
-// 0x0104839c: 0x104839c: ori   v0, v0, 20993
+// 0x010483ac: 0x10483ac: ori   v0, v0, 20993
 	ldloc 5
 	ldc.i4 20993
 	or
 	stloc 5
-// 0x010483a0: 0x10483a0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010483b0: 0x10483b0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3917,81 +3917,81 @@ L_1048380:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010483a8: 0x10483a8: addu  a0, v0, zero
+// 0x010483b8: 0x10483b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010483ac: 0x10483ac: addu  a1, zero, zero
+// 0x010483bc: 0x10483bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010483b0: 0x10483b0: addu  a2, zero, zero
+// 0x010483c0: 0x10483c0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010483b4: 0x10483b4: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010483c4: 0x10483c4: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010483bc: 0x10483bc: slt   v0, s4, s5
+// 0x010483cc: 0x10483cc: slt   v0, s4, s5
 	ldloc 11
 	ldloc 9
 	clt
 	stloc 5
-// 0x010483c0: 0x10483c0: beq   v0, zero, 0x10483cc sll   zero, zero, 0
+// 0x010483d0: 0x10483d0: beq   v0, zero, 0x10483dc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10483cc
+	brfalse L_10483dc
 // --- basic block ---
-// 0x010483c8: 0x10483c8: addu  s5, s4, zero
+// 0x010483d8: 0x10483d8: addu  s5, s4, zero
 	ldloc 11
 	stloc 9
-L_10483cc:
-// 0x010483cc: 0x10483cc: addiu s5, s5, -20
+L_10483dc:
+// 0x010483dc: 0x10483dc: addiu s5, s5, -20
 	ldloc 9
 	ldc.i4.s -20
 	add
 	stloc 9
-// 0x010483d0: 0x10483d0: subu  s5, s5, s0
+// 0x010483e0: 0x10483e0: subu  s5, s5, s0
 	ldloc 9
 	ldloc 8
 	sub
 	stloc 9
-// 0x010483d4: 0x10483d4: div   s5, s2
+// 0x010483e4: 0x10483e4: div   s5, s2
 	ldloc 9
 	ldloc 15
 	div
 	stloc 18
-// 0x010483d8: 0x10483d8: lui   s7, 0x10000
+// 0x010483e8: 0x10483e8: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x010483dc: 0x10483dc: lui   a0, 0x10000
+// 0x010483ec: 0x10483ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010483e0: 0x10483e0: addiu a3, s3, -6
+// 0x010483f0: 0x10483f0: addiu a3, s3, -6
 	ldloc 10
 	ldc.i4.s -6
 	add
 	stloc 4
-// 0x010483e4: 0x10483e4: addu  a2, s0, zero
+// 0x010483f4: 0x10483f4: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010483e8: 0x10483e8: addiu a1, s7, 18500
+// 0x010483f8: 0x10483f8: addiu a1, s7, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010483ec: 0x10483ec: addiu a0, a0, 220
+// 0x010483fc: 0x10483fc: addiu a0, a0, 216
 	ldloc.1
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc.1
-// 0x010483f0: 0x10483f0: sw    zero, 16(sp)
+// 0x01048400: 0x1048400: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4000,34 +4000,34 @@ L_10483cc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010483f4: 0x10483f4: lui   s5, 0x0
+// 0x01048404: 0x1048404: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010483f8: 0x10483f8: lui   s6, 0x10000
+// 0x01048408: 0x1048408: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x010483fc: 0x10483fc: lui   s4, 0x10000
+// 0x0104840c: 0x104840c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01048400: 0x1048400: addiu s7, s7, 18500
+// 0x01048410: 0x1048410: addiu s7, s7, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 12
-// 0x01048404: 0x1048404: addiu s6, s6, -16892
+// 0x01048414: 0x1048414: addiu s6, s6, 19396
 	ldloc 13
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc 13
-// 0x01048408: 0x1048408: addiu s4, s4, 244
+// 0x01048418: 0x1048418: addiu s4, s4, 240
 	ldloc 11
-	ldc.i4 244
+	ldc.i4 240
 	add
 	stloc 11
-// 0x0104840c: 0x104840c: mflo  lo
+// 0x0104841c: 0x104841c: mflo  lo
 	ldloc 18
 	stloc 5
-// 0x01048410: 0x1048410: jal   0x1093a24 sw    v0, 356(sp)
+// 0x01048420: 0x1048420: jal   0x1094048 sw    v0, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4041,40 +4041,40 @@ L_10483cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048418: 0x1048418: addu  a0, v0, zero
+// 0x01048428: 0x1048428: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104841c: 0x104841c: addu  a1, zero, zero
+// 0x0104842c: 0x104842c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01048420: 0x1048420: addu  a2, zero, zero
+// 0x01048430: 0x1048430: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01048424: 0x1048424: jal   0x1098fe0 addu  s0, v0, zero
+// 0x01048434: 0x1048434: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104842c: 0x104842c: lui   a0, 0x10000
+// 0x0104843c: 0x104843c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048430: 0x1048430: addiu a0, a0, 1168
+// 0x01048440: 0x1048440: addiu a0, a0, 1164
 	ldloc.1
-	ldc.i4 1168
+	ldc.i4 1164
 	add
 	stloc.1
-// 0x01048434: 0x1048434: addiu a2, zero, 17
+// 0x01048444: 0x1048444: addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
-// 0x01048438: 0x1048438: jal   0x109e13c addu  a1, a0, zero
+// 0x01048448: 0x1048448: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -4082,33 +4082,33 @@ L_10483cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048440: 0x1048440: addu  a1, v0, zero
+// 0x01048450: 0x1048450: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01048444: 0x1048444: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01048454: 0x1048454: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104844c: 0x104844c: addiu a0, s5, 32244
+// 0x0104845c: 0x104845c: addiu a0, s5, 32244
 	ldloc 9
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01048450: 0x1048450: addiu a2, zero, 2
+// 0x01048460: 0x1048460: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01048454: 0x1048454: jal   0x109e13c addu  a1, a0, zero
+// 0x01048464: 0x1048464: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -4116,40 +4116,40 @@ L_10483cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104845c: 0x104845c: addu  a1, v0, zero
+// 0x0104846c: 0x104846c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01048460: 0x1048460: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01048470: 0x1048470: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048468: 0x1048468: jal   0x1099190 addu  a0, s0, zero
+// 0x01048478: 0x1048478: jal   0x10997d8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048470: 0x1048470: lui   v0, 0x1040000
+// 0x01048480: 0x1048480: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01048474: 0x1048474: addiu v0, v0, 28596
+// 0x01048484: 0x1048484: addiu v0, v0, 28612
 	ldloc 5
-	ldc.i4 28596
+	ldc.i4 28612
 	add
 	stloc 5
-// 0x01048478: 0x1048478: sw    v0, 112(s0)
+// 0x01048488: 0x1048488: sw    v0, 112(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4158,47 +4158,47 @@ L_10483cc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104847c: 0x104847c: addu  a1, s0, zero
+// 0x0104848c: 0x104848c: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01048480: 0x1048480: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01048490: 0x1048490: jal   0x109950c addu  a0, s1, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048488: 0x1048488: addiu s5, s5, 32244
+// 0x01048498: 0x1048498: addiu s5, s5, 32244
 	ldloc 9
 	ldc.i4 32244
 	add
 	stloc 9
-// 0x0104848c: 0x104848c: j	 0x10486c8 addu  s0, zero, zero
+// 0x0104849c: 0x104849c: j	 0x10486d8 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_10486c8
+	br L_10486d8
 // --- basic block ---
-L_1048494:
-// 0x01048494: 0x1048494: addiu s8, s0, 1
+L_10484a4:
+// 0x010484a4: 0x10484a4: addiu s8, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 16
-// 0x01048498: 0x1048498: lui   a1, 0x10000
+// 0x010484a8: 0x10484a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104849c: 0x104849c: addiu a1, a1, 232
+// 0x010484ac: 0x10484ac: addiu a1, a1, 228
 	ldloc.2
-	ldc.i4 232
+	ldc.i4 228
 	add
 	stloc.2
-// 0x010484a0: 0x10484a0: addu  a2, s8, zero
+// 0x010484b0: 0x10484b0: addu  a2, s8, zero
 	ldloc 16
 	stloc.3
-// 0x010484a4: 0x10484a4: jal   0x1000f64 addu  a0, s3, zero
+// 0x010484b4: 0x10484b4: jal   0x1000f64 addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4211,23 +4211,23 @@ L_1048494:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010484ac: 0x10484ac: addu  a0, s0, zero
+// 0x010484bc: 0x10484bc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010484b0: 0x10484b0: jal   0x108e54c sb    zero, 44(sp)
+// 0x010484c0: 0x10484c0: jal   0x108eb70 sb    zero, 44(sp)
 	ldloc.0
 	ldc.i4.s 44
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Route_Result_108e54c(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Route_Result_108eb70(int32)
 	stloc 5
 // --- basic block ---
-// 0x010484b8: 0x10484b8: addu  a0, zero, zero
+// 0x010484c8: 0x10484c8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010484bc: 0x10484bc: jal   0x108e530 sw    v0, 348(sp)
+// 0x010484cc: 0x10484cc: jal   0x108eb54 sw    v0, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4237,10 +4237,10 @@ L_1048494:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x010484c4: 0x10484c4: lw    v1, 348(sp)
+// 0x010484d4: 0x10484d4: lw    v1, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4249,8 +4249,8 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010484c8: 0x10484c8: sll   zero, zero, 0
-// 0x010484cc: 0x10484cc: lw    a0, 8(v1)
+// 0x010484d8: 0x10484d8: sll   zero, zero, 0
+// 0x010484dc: 0x10484dc: lw    a0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4259,26 +4259,26 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010484d0: 0x10484d0: jal   0x10c09c0 sll   zero, zero, 0
+// 0x010484e0: 0x10484e0: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010484d8: 0x10484d8: addu  a0, v0, zero
+// 0x010484e8: 0x10484e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010484dc: 0x10484dc: lui   v0, 0x20000
+// 0x010484ec: 0x10484ec: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010484e0: 0x10484e0: addiu v0, v0, 23880
+// 0x010484f0: 0x10484f0: addiu v0, v0, 24344
 	ldloc 5
-	ldc.i4 23880
+	ldc.i4 24344
 	add
 	stloc 5
-// 0x010484e4: 0x10484e4: lw    a3, 4(v0)
+// 0x010484f4: 0x10484f4: lw    a3, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4287,14 +4287,14 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010484e8: 0x10484e8: lw    a2, 0(v0)
+// 0x010484f8: 0x10484f8: lw    a2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010484ec: 0x10484ec: jal   0x10c0798 addu  a1, v1, zero
+// 0x010484fc: 0x10484fc: jal   0x10c0dd8 addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -4302,45 +4302,45 @@ L_1048494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010484f4: 0x10484f4: addu  a1, v1, zero
+// 0x01048504: 0x1048504: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010484f8: 0x10484f8: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01048508: 0x1048508: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048500: 0x1048500: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x01048510: 0x1048510: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x01048504: 0x1048504: addiu a0, sp, 44
+// 0x01048514: 0x1048514: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x01048508: 0x1048508: addiu a1, zero, 300
+// 0x01048518: 0x1048518: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x0104850c: 0x104850c: addiu a2, a2, -13884
+// 0x0104851c: 0x104851c: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x01048510: 0x1048510: addu  a3, v0, zero
+// 0x01048520: 0x1048520: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01048514: 0x1048514: jal   0x1000f9c sw    v0, 352(sp)
+// 0x01048524: 0x1048524: jal   0x1000f9c sw    v0, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4359,7 +4359,7 @@ L_1048494:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104851c: 0x104851c: lw    a2, 356(sp)
+// 0x0104852c: 0x104852c: lw    a2, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4368,16 +4368,16 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01048520: 0x1048520: addiu a3, zero, 48
+// 0x01048530: 0x1048530: addiu a3, zero, 48
 	ldc.i4.s 48
 	stloc 4
-// 0x01048524: 0x1048524: addu  a1, s7, zero
+// 0x01048534: 0x1048534: addu  a1, s7, zero
 	ldloc 12
 	stloc.2
-// 0x01048528: 0x1048528: addu  a0, s3, zero
+// 0x01048538: 0x1048538: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0104852c: 0x104852c: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0104853c: 0x104853c: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4391,21 +4391,21 @@ L_1048494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048534: 0x1048534: addu  a0, v0, zero
+// 0x01048544: 0x1048544: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01048538: 0x1048538: addiu a1, zero, 1
+// 0x01048548: 0x1048548: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0104853c: 0x104853c: addu  a2, zero, zero
+// 0x0104854c: 0x104854c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01048540: 0x1048540: jal   0x10942e8 sw    v0, 344(sp)
+// 0x01048550: 0x1048550: jal   0x109490c sw    v0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4419,12 +4419,12 @@ L_1048494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048548: 0x1048548: lw    a0, 344(sp)
+// 0x01048558: 0x1048558: lw    a0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4433,10 +4433,10 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104854c: 0x104854c: addiu a1, zero, 2
+// 0x0104855c: 0x104855c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x01048550: 0x1048550: jal   0x109434c addu  a2, zero, zero
+// 0x01048560: 0x1048560: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4444,12 +4444,12 @@ L_1048494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048558: 0x1048558: lw    a0, 344(sp)
+// 0x01048568: 0x1048568: lw    a0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4458,24 +4458,24 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104855c: 0x104855c: addu  a2, zero, zero
+// 0x0104856c: 0x104856c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01048560: 0x1048560: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01048570: 0x1048570: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01048568: 0x1048568: addu  a2, zero, zero
+// 0x01048578: 0x1048578: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104856c: 0x104856c: addu  a0, s6, zero
+// 0x0104857c: 0x104857c: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x01048570: 0x1048570: jal   0x109e13c addu  a1, s3, zero
+// 0x01048580: 0x1048580: jal   0x109e784 addu  a1, s3, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4483,12 +4483,12 @@ L_1048494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048578: 0x1048578: lw    a0, 344(sp)
+// 0x01048588: 0x1048588: lw    a0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4497,17 +4497,17 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104857c: 0x104857c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0104858c: 0x104858c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048584: 0x1048584: lw    a0, 344(sp)
+// 0x01048594: 0x1048594: lw    a0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4516,10 +4516,10 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01048588: 0x1048588: addiu a1, zero, 3
+// 0x01048598: 0x1048598: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0104858c: 0x104858c: jal   0x109434c addu  a2, zero, zero
+// 0x0104859c: 0x104859c: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4527,30 +4527,30 @@ L_1048494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048594: 0x1048594: addiu v0, s2, -1
+// 0x010485a4: 0x10485a4: addiu v0, s2, -1
 	ldloc 15
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01048598: 0x1048598: beq   s0, v0, 0x10485c0 addiu a3, zero, -1
+// 0x010485a8: 0x10485a8: beq   s0, v0, 0x10485d0 addiu a3, zero, -1
 	ldloc 8
 	ldloc 5
 	ldc.i4.m1
 	stloc 4
-	beq  L_10485c0
+	beq  L_10485d0
 // --- basic block ---
-// 0x010485a0: 0x10485a0: addu  a0, s5, zero
+// 0x010485b0: 0x10485b0: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010485a4: 0x10485a4: addu  a1, s5, zero
+// 0x010485b4: 0x10485b4: addu  a1, s5, zero
 	ldloc 9
 	stloc.2
-// 0x010485a8: 0x10485a8: jal   0x109e13c addiu a2, zero, 2
+// 0x010485b8: 0x10485b8: jal   0x109e784 addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -4558,12 +4558,12 @@ L_1048494:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010485b0: 0x10485b0: lw    a0, 344(sp)
+// 0x010485c0: 0x10485c0: lw    a0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4572,30 +4572,30 @@ L_1048494:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010485b4: 0x10485b4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010485c4: 0x10485c4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010485bc: 0x10485bc: addiu a3, zero, -1
+// 0x010485cc: 0x10485cc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-L_10485c0:
-// 0x010485c0: 0x10485c0: addu  a1, s7, zero
+L_10485d0:
+// 0x010485d0: 0x10485d0: addu  a1, s7, zero
 	ldloc 12
 	stloc.2
-// 0x010485c4: 0x10485c4: addiu a2, zero, -2
+// 0x010485d4: 0x10485d4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010485c8: 0x10485c8: addu  a0, s6, zero
+// 0x010485d8: 0x10485d8: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x010485cc: 0x10485cc: jal   0x1093a24 sw    zero, 16(sp)
+// 0x010485dc: 0x10485dc: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4609,40 +4609,40 @@ L_10485c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010485d4: 0x10485d4: addu  a0, v0, zero
+// 0x010485e4: 0x10485e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010485d8: 0x10485d8: addu  a1, zero, zero
+// 0x010485e8: 0x10485e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010485dc: 0x10485dc: addu  a2, zero, zero
+// 0x010485ec: 0x10485ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010485e0: 0x10485e0: jal   0x1098fe0 addu  s3, v0, zero
+// 0x010485f0: 0x10485f0: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010485e8: 0x10485e8: addiu a3, zero, 9
+// 0x010485f8: 0x10485f8: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x010485ec: 0x10485ec: addiu a1, sp, 44
+// 0x010485fc: 0x10485fc: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x010485f0: 0x10485f0: addu  a0, s4, zero
+// 0x01048600: 0x1048600: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x010485f4: 0x10485f4: jal   0x1098d10 addiu a2, zero, 24
+// 0x01048604: 0x1048604: jal   0x1099358 addiu a2, zero, 24
 	ldc.i4.s 24
 	stloc.3
 	ldloc.0
@@ -4650,31 +4650,31 @@ L_10485c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010485fc: 0x10485fc: lui   a2, 0x0
+// 0x0104860c: 0x104860c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01048600: 0x1048600: lui   a1, 0x10000
+// 0x01048610: 0x1048610: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01048604: 0x1048604: addiu a2, a2, 23008
+// 0x01048614: 0x1048614: addiu a2, a2, 23008
 	ldloc.3
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01048608: 0x1048608: addu  a0, v0, zero
+// 0x01048618: 0x1048618: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104860c: 0x104860c: addiu a1, a1, -29540
+// 0x0104861c: 0x104861c: addiu a1, a1, -29540
 	ldloc.2
 	ldc.i4 -29540
 	add
 	stloc.2
-// 0x01048610: 0x1048610: jal   0x1098fe0 sw    v0, 360(sp)
+// 0x01048620: 0x1048620: jal   0x1099628 sw    v0, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4686,9 +4686,9 @@ L_10485c0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01048618: 0x1048618: lw    v0, 360(sp)
+// 0x01048628: 0x1048628: lw    v0, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4697,25 +4697,25 @@ L_10485c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104861c: 0x104861c: addu  a0, s3, zero
+// 0x0104862c: 0x104862c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01048620: 0x1048620: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01048630: 0x1048630: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048628: 0x1048628: lui   a1, 0x10000
+// 0x01048638: 0x1048638: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104862c: 0x104862c: jal   0x101cd60 addiu a0, a1, -32
+// 0x0104863c: 0x104863c: jal   0x101cd70 addiu a0, a1, -36
 	ldloc.2
-	ldc.i4.s -32
+	ldc.i4.s -36
 	add
 	stloc.1
 	ldloc.0
@@ -4723,28 +4723,28 @@ L_10485c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048634: 0x1048634: lui   a0, 0x10000
+// 0x01048644: 0x1048644: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048638: 0x1048638: ori   a3, zero, 32769
+// 0x01048648: 0x1048648: ori   a3, zero, 32769
 	ldc.i4.s 0
 	ldc.i4 32769
 	or
 	stloc 4
-// 0x0104863c: 0x104863c: addiu a0, a0, 256
+// 0x0104864c: 0x104864c: addiu a0, a0, 252
 	ldloc.1
-	ldc.i4 256
+	ldc.i4 252
 	add
 	stloc.1
-// 0x01048640: 0x1048640: addu  a1, v0, zero
+// 0x01048650: 0x1048650: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01048644: 0x1048644: jal   0x1098d10 addiu a2, zero, 14
+// 0x01048654: 0x1048654: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -4752,31 +4752,31 @@ L_10485c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104864c: 0x104864c: lui   a1, 0x10000
+// 0x0104865c: 0x104865c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01048650: 0x1048650: lui   a2, 0x0
+// 0x01048660: 0x1048660: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01048654: 0x1048654: addiu a2, a2, 23008
+// 0x01048664: 0x1048664: addiu a2, a2, 23008
 	ldloc.3
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x01048658: 0x1048658: addu  a0, v0, zero
+// 0x01048668: 0x1048668: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104865c: 0x104865c: addiu a1, a1, -29540
+// 0x0104866c: 0x104866c: addiu a1, a1, -29540
 	ldloc.2
 	ldc.i4 -29540
 	add
 	stloc.2
-// 0x01048660: 0x1048660: jal   0x1098fe0 sw    v0, 360(sp)
+// 0x01048670: 0x1048670: jal   0x1099628 sw    v0, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4788,9 +4788,9 @@ L_10485c0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01048668: 0x1048668: lw    v0, 360(sp)
+// 0x01048678: 0x1048678: lw    v0, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4799,20 +4799,20 @@ L_10485c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104866c: 0x104866c: addu  a0, s3, zero
+// 0x0104867c: 0x104867c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01048670: 0x1048670: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01048680: 0x1048680: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048678: 0x1048678: lw    a0, 344(sp)
+// 0x01048688: 0x1048688: lw    a0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4821,17 +4821,17 @@ L_10485c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104867c: 0x104867c: jal   0x1098ec4 addu  a1, s3, zero
+// 0x0104868c: 0x104868c: jal   0x109950c addu  a1, s3, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048684: 0x1048684: jal   0x1000910 addiu a0, zero, 8
+// 0x01048694: 0x1048694: jal   0x1000910 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
 	ldloc.0
@@ -4844,7 +4844,7 @@ L_10485c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104868c: 0x104868c: lw    v1, 344(sp)
+// 0x0104869c: 0x104869c: lw    v1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4853,7 +4853,7 @@ L_10485c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01048690: 0x1048690: lw    a1, 348(sp)
+// 0x010486a0: 0x10486a0: lw    a1, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ L_10485c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01048694: 0x1048694: sw    v0, 116(v1)
+// 0x010486a4: 0x10486a4: sw    v0, 116(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4871,17 +4871,17 @@ L_10485c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01048698: 0x1048698: addu  a0, v1, zero
+// 0x010486a8: 0x10486a8: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0104869c: 0x104869c: sw    s0, 0(v0)
+// 0x010486ac: 0x10486ac: sw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x010486a0: 0x10486a0: jal   0x1099190 sw    a1, 4(v0)
+// 0x010486b0: 0x10486b0: jal   0x10997d8 sw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4891,10 +4891,10 @@ L_10485c0:
 	ldloc.2
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x010486a8: 0x10486a8: lw    v0, 344(sp)
+// 0x010486b8: 0x10486b8: lw    v0, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4903,15 +4903,15 @@ L_10485c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010486ac: 0x10486ac: lui   v1, 0x1040000
+// 0x010486bc: 0x10486bc: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 7
-// 0x010486b0: 0x10486b0: addiu v1, v1, 28820
+// 0x010486c0: 0x10486c0: addiu v1, v1, 28836
 	ldloc 7
-	ldc.i4 28820
+	ldc.i4 28836
 	add
 	stloc 7
-// 0x010486b4: 0x10486b4: sw    v1, 196(v0)
+// 0x010486c4: 0x10486c4: sw    v1, 196(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4920,37 +4920,37 @@ L_10485c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010486b8: 0x10486b8: addu  a1, v0, zero
+// 0x010486c8: 0x10486c8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010486bc: 0x10486bc: jal   0x1098ec4 addu  a0, s1, zero
+// 0x010486cc: 0x10486cc: jal   0x109950c addu  a0, s1, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010486c4: 0x10486c4: addu  s0, s8, zero
+// 0x010486d4: 0x10486d4: addu  s0, s8, zero
 	ldloc 16
 	stloc 8
-L_10486c8:
-// 0x010486c8: 0x10486c8: slt   v0, s0, s2
+L_10486d8:
+// 0x010486d8: 0x10486d8: slt   v0, s0, s2
 	ldloc 8
 	ldloc 15
 	clt
 	stloc 5
-// 0x010486cc: 0x10486cc: bne   v0, zero, 0x1048494 addiu s3, sp, 24
+// 0x010486dc: 0x10486dc: bne   v0, zero, 0x10484a4 addiu s3, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-	brtrue L_1048494
+	brtrue L_10484a4
 // --- basic block ---
-// 0x010486d4: 0x10486d4: lw    a0, 408(sp)
+// 0x010486e4: 0x10486e4: lw    a0, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4959,18 +4959,18 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010486d8: 0x10486d8: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010486e8: 0x10486e8: jal   0x109950c addu  a1, s1, zero
 	ldloc 14
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010486e0: 0x10486e0: lw    ra, 404(sp)
-// 0x010486e4: 0x10486e4: lw    s8, 400(sp)
+// 0x010486f0: 0x10486f0: lw    ra, 404(sp)
+// 0x010486f4: 0x10486f4: lw    s8, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4979,7 +4979,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010486e8: 0x10486e8: lw    s7, 396(sp)
+// 0x010486f8: 0x10486f8: lw    s7, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4988,7 +4988,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010486ec: 0x10486ec: lw    s6, 392(sp)
+// 0x010486fc: 0x10486fc: lw    s6, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4997,7 +4997,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010486f0: 0x10486f0: lw    s5, 388(sp)
+// 0x01048700: 0x1048700: lw    s5, 388(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5006,7 +5006,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010486f4: 0x10486f4: lw    s4, 384(sp)
+// 0x01048704: 0x1048704: lw    s4, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5015,7 +5015,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010486f8: 0x10486f8: lw    s3, 380(sp)
+// 0x01048708: 0x1048708: lw    s3, 380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5024,7 +5024,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010486fc: 0x10486fc: lw    s2, 376(sp)
+// 0x0104870c: 0x104870c: lw    s2, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5033,7 +5033,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01048700: 0x1048700: lw    s1, 372(sp)
+// 0x01048710: 0x1048710: lw    s1, 372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5042,7 +5042,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01048704: 0x1048704: lw    s0, 368(sp)
+// 0x01048714: 0x1048714: lw    s0, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5051,7 +5051,7 @@ L_10486c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01048708: 0x1048708: jr    ra addiu sp, sp, 408
+// 0x01048718: 0x1048718: jr    ra addiu sp, sp, 408
 	ldloc.0
 	ldc.i4 408
 	add
@@ -5063,7 +5063,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_routes_option_selected_1048710(int32,int32,int32,int32,int32)
+.method public static int32 on_routes_option_selected_1048720(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s2,int32 s0,int32 s3,int32 ra)
@@ -5110,19 +5110,19 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048710: 0x1048710: addiu sp, sp, -96
+// 0x01048720: 0x1048720: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01048714: 0x1048714: lw    v0, 0(a1)
+// 0x01048724: 0x1048724: lw    v0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01048718: 0x1048718: sw    s2, 84(sp)
+// 0x01048728: 0x1048728: sw    s2, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5131,13 +5131,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104871c: 0x104871c: lui   a3, 0x10000
+// 0x0104872c: 0x104872c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01048720: 0x1048720: lui   s2, 0x10000
+// 0x01048730: 0x1048730: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01048724: 0x1048724: sw    s1, 80(sp)
+// 0x01048734: 0x1048734: sw    s1, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5146,7 +5146,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048728: 0x1048728: sw    s0, 76(sp)
+// 0x01048738: 0x1048738: sw    s0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5155,30 +5155,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104872c: 0x104872c: addu  s1, a0, zero
+// 0x0104873c: 0x104873c: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01048730: 0x1048730: addu  s0, a1, zero
+// 0x01048740: 0x1048740: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01048734: 0x1048734: addiu a3, a3, 1180
+// 0x01048744: 0x1048744: addiu a3, a3, 1176
 	ldloc 4
-	ldc.i4 1180
+	ldc.i4 1176
 	add
 	stloc 4
-// 0x01048738: 0x1048738: addiu a0, zero, 2
+// 0x01048748: 0x1048748: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0104873c: 0x104873c: addiu a1, s2, -576
+// 0x0104874c: 0x104874c: addiu a1, s2, -580
 	ldloc 9
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048740: 0x1048740: addiu a2, zero, 981
+// 0x01048750: 0x1048750: addiu a2, zero, 981
 	ldc.i4 981
 	stloc.3
-// 0x01048744: 0x1048744: sw    ra, 92(sp)
-// 0x01048748: 0x1048748: sw    s3, 88(sp)
+// 0x01048754: 0x1048754: sw    ra, 92(sp)
+// 0x01048758: 0x1048758: sw    s3, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5187,7 +5187,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104874c: 0x104874c: sw    v0, 24(sp)
+// 0x0104875c: 0x104875c: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5196,7 +5196,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01048750: 0x1048750: sw    s1, 16(sp)
+// 0x01048760: 0x1048760: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5205,7 +5205,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048754: 0x1048754: jal   0x100449c sw    s0, 20(sp)
+// 0x01048764: 0x1048764: jal   0x100449c sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5224,35 +5224,35 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104875c: 0x104875c: beq   s1, zero, 0x104877c addiu v0, zero, 1
+// 0x0104876c: 0x104876c: beq   s1, zero, 0x104878c addiu v0, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc 5
-	brfalse L_104877c
+	brfalse L_104878c
 // --- basic block ---
-// 0x01048764: 0x1048764: beq   s1, v0, 0x104878c addiu v0, zero, 2
+// 0x01048774: 0x1048774: beq   s1, v0, 0x104879c addiu v0, zero, 2
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	beq  L_104878c
+	beq  L_104879c
 // --- basic block ---
-// 0x0104876c: 0x104876c: bne   s1, v0, 0x1048b64 lui   v0, 0x10000
+// 0x0104877c: 0x104877c: bne   s1, v0, 0x1048b74 lui   v0, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc 5
-	bne.un L_1048b64
+	bne.un L_1048b74
 // --- basic block ---
-// 0x01048774: 0x1048774: j	 0x1048968 addiu v0, v0, 1296
+// 0x01048784: 0x1048784: j	 0x1048978 addiu v0, v0, 1292
 	ldloc 5
-	ldc.i4 1296
+	ldc.i4 1292
 	add
 	stloc 5
-	br L_1048968
+	br L_1048978
 // --- basic block ---
-L_104877c:
-// 0x0104877c: 0x104877c: jal   0x10469c8 addu  a0, s0, zero
+L_104878c:
+// 0x0104878c: 0x104878c: jal   0x10469d8 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5260,16 +5260,16 @@ L_104877c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::route_select_10469c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::route_select_10469d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048784: 0x1048784: j	 0x1048b64 sll   zero, zero, 0
-	br L_1048b64
+// 0x01048794: 0x1048794: j	 0x1048b74 sll   zero, zero, 0
+	br L_1048b74
 // --- basic block ---
-L_104878c:
-// 0x0104878c: 0x104878c: lw    v0, 4(s0)
+L_104879c:
+// 0x0104879c: 0x104879c: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5278,14 +5278,14 @@ L_104878c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01048790: 0x1048790: lw    a0, 0(s0)
+// 0x010487a0: 0x10487a0: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01048794: 0x1048794: lw    a2, 32(v0)
+// 0x010487a4: 0x10487a4: lw    a2, 32(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5294,7 +5294,7 @@ L_104878c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01048798: 0x1048798: lw    a1, 40(v0)
+// 0x010487a8: 0x10487a8: lw    a1, 40(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5303,15 +5303,15 @@ L_104878c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104879c: 0x104879c: lui   v0, 0x10000
+// 0x010487ac: 0x10487ac: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010487a0: 0x10487a0: addiu v0, v0, 1296
+// 0x010487b0: 0x10487b0: addiu v0, v0, 1292
 	ldloc 5
-	ldc.i4 1296
+	ldc.i4 1292
 	add
 	stloc 5
-// 0x010487a4: 0x10487a4: sw    v0, 32(sp)
+// 0x010487b4: 0x10487b4: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5320,18 +5320,18 @@ L_104878c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010487a8: 0x10487a8: lui   v0, 0x10000
+// 0x010487b8: 0x10487b8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010487ac: 0x10487ac: addu  a3, a0, zero
+// 0x010487bc: 0x10487bc: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x010487b0: 0x10487b0: addiu v0, v0, 1312
+// 0x010487c0: 0x10487c0: addiu v0, v0, 1308
 	ldloc 5
-	ldc.i4 1312
+	ldc.i4 1308
 	add
 	stloc 5
-// 0x010487b4: 0x10487b4: sw    v0, 36(sp)
+// 0x010487c4: 0x10487c4: sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5340,7 +5340,7 @@ L_104878c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010487b8: 0x10487b8: jal   0x1058c68 sw    s1, 16(sp)
+// 0x010487c8: 0x10487c8: jal   0x1058c78 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5354,35 +5354,35 @@ L_104878c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010487c0: 0x10487c0: jal   0x108e530 addu  a0, zero, zero
+// 0x010487d0: 0x10487d0: jal   0x108eb54 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x010487c8: 0x10487c8: beq   v0, zero, 0x1048b64 lui   a0, 0x10000
+// 0x010487d8: 0x10487d8: beq   v0, zero, 0x1048b74 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1048b64
+	brfalse L_1048b74
 // --- basic block ---
-// 0x010487d0: 0x10487d0: addiu a1, v0, 780
+// 0x010487e0: 0x10487e0: addiu a1, v0, 780
 	ldloc 5
 	ldc.i4 780
 	add
 	stloc.2
-// 0x010487d4: 0x10487d4: addiu a0, a0, -29748
+// 0x010487e4: 0x10487e4: addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
 	stloc.1
-// 0x010487d8: 0x10487d8: jal   0x101f76c sw    v0, 64(sp)
+// 0x010487e8: 0x10487e8: jal   0x101f77c sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5396,12 +5396,12 @@ L_104878c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010487e0: 0x10487e0: lw    v0, 64(sp)
+// 0x010487f0: 0x10487f0: lw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5410,15 +5410,15 @@ L_104878c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010487e4: 0x10487e4: lui   a0, 0x10000
+// 0x010487f4: 0x10487f4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010487e8: 0x10487e8: addiu a1, v0, 772
+// 0x010487f8: 0x10487f8: addiu a1, v0, 772
 	ldloc 5
 	ldc.i4 772
 	add
 	stloc.2
-// 0x010487ec: 0x10487ec: jal   0x101f76c addiu a0, a0, -29760
+// 0x010487fc: 0x10487fc: jal   0x101f77c addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -5428,36 +5428,36 @@ L_104878c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010487f4: 0x10487f4: jal   0x104246c addiu s1, sp, 40
+// 0x01048804: 0x1048804: jal   0x104247c addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-	call int32 Cibyl48::roadmap_bottom_bar_hide_104246c()
+	call int32 Cibyl48::roadmap_bottom_bar_hide_104247c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010487fc: 0x10487fc: jal   0x105e2e4 addu  a0, zero, zero
+// 0x0104880c: 0x104880c: jal   0x105e2f4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_mode_105e2e4(int32)
+	call int32 Cibyl70::navigate_bar_set_mode_105e2f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048804: 0x1048804: lui   a0, 0x10000
+// 0x01048814: 0x1048814: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048808: 0x1048808: jal   0x101cd60 addiu a0, a0, 340
+// 0x01048818: 0x1048818: jal   0x101cd70 addiu a0, a0, 336
 	ldloc.1
-	ldc.i4 340
+	ldc.i4 336
 	add
 	stloc.1
 	ldloc.0
@@ -5465,27 +5465,27 @@ L_104878c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048810: 0x1048810: lw    a2, 0(s0)
+// 0x01048820: 0x1048820: lw    a2, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01048814: 0x1048814: addu  a1, v0, zero
+// 0x01048824: 0x1048824: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01048818: 0x1048818: addiu a2, a2, 1
+// 0x01048828: 0x1048828: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0104881c: 0x104881c: jal   0x1000f64 addu  a0, s1, zero
+// 0x0104882c: 0x104882c: jal   0x1000f64 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5498,10 +5498,10 @@ L_104878c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048824: 0x1048824: lui   a0, 0x10000
+// 0x01048834: 0x1048834: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048828: 0x1048828: jal   0x101ece8 addiu a0, a0, -29624
+// 0x01048838: 0x1048838: jal   0x101ecf8 addiu a0, a0, -29624
 	ldloc.1
 	ldc.i4 -29624
 	add
@@ -5511,34 +5511,34 @@ L_104878c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048830: 0x1048830: lui   a0, 0x10000
+// 0x01048840: 0x1048840: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048834: 0x1048834: lui   a2, 0x1040000
+// 0x01048844: 0x1048844: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x01048838: 0x1048838: lui   a3, 0x30000
+// 0x01048848: 0x1048848: lui   a3, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x0104883c: 0x104883c: addu  a1, s1, zero
+// 0x0104884c: 0x104884c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01048840: 0x1048840: addiu a0, a0, 1328
+// 0x01048850: 0x1048850: addiu a0, a0, 1324
 	ldloc.1
-	ldc.i4 1328
+	ldc.i4 1324
 	add
 	stloc.1
-// 0x01048844: 0x1048844: addiu a2, a2, 30516
+// 0x01048854: 0x1048854: addiu a2, a2, 30532
 	ldloc.3
-	ldc.i4 30516
+	ldc.i4 30532
 	add
 	stloc.3
-// 0x01048848: 0x1048848: jal   0x1095a08 ori   a3, a3, 8192
+// 0x01048858: 0x1048858: jal   0x1096050 ori   a3, a3, 8192
 	ldloc 4
 	ldc.i4 8192
 	or
@@ -5548,40 +5548,40 @@ L_104878c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048850: 0x1048850: jal   0x101fa28 addu  s1, v0, zero
+// 0x01048860: 0x1048860: jal   0x101fa38 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01048858: 0x1048858: beq   v0, zero, 0x1048864 addiu a1, zero, 50
+// 0x01048868: 0x1048868: beq   v0, zero, 0x1048874 addiu a1, zero, 50
 	ldloc 5
 	ldc.i4.s 50
 	stloc.2
-	brfalse L_1048864
+	brfalse L_1048874
 // --- basic block ---
-// 0x01048860: 0x1048860: addiu a1, zero, 110
+// 0x01048870: 0x1048870: addiu a1, zero, 110
 	ldc.i4.s 110
 	stloc.2
-L_1048864:
-// 0x01048864: 0x1048864: jal   0x102f90c addu  a0, zero, zero
+L_1048874:
+// 0x01048874: 0x1048874: jal   0x102f91c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f90c(int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f91c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104886c: 0x104886c: lw    a1, 16(s1)
+// 0x0104887c: 0x104887c: lw    a1, 16(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5590,12 +5590,12 @@ L_1048864:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01048870: 0x1048870: lui   a0, 0x1040000
+// 0x01048880: 0x1048880: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01048874: 0x1048874: jal   0x109c5ec addiu a0, a0, 30184
+// 0x01048884: 0x1048884: jal   0x109cc34 addiu a0, a0, 30200
 	ldloc.1
-	ldc.i4 30184
+	ldc.i4 30200
 	add
 	stloc.1
 	ldloc.0
@@ -5603,20 +5603,20 @@ L_1048864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104887c: 0x104887c: lui   a0, 0x1040000
+// 0x0104888c: 0x104888c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01048880: 0x1048880: addiu a0, a0, 25676
+// 0x01048890: 0x1048890: addiu a0, a0, 25692
 	ldloc.1
-	ldc.i4 25676
+	ldc.i4 25692
 	add
 	stloc.1
-// 0x01048884: 0x1048884: jal   0x104bab0 addiu a1, zero, 3
+// 0x01048894: 0x1048894: jal   0x104bac0 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -5624,41 +5624,41 @@ L_1048864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104888c: 0x104888c: jal   0x101bd00 sll   zero, zero, 0
-	call int32 Cibyl20::roadmap_object_disable_short_click_101bd00()
+// 0x0104889c: 0x104889c: jal   0x101bd10 sll   zero, zero, 0
+	call int32 Cibyl20::roadmap_object_disable_short_click_101bd10()
 	stloc 5
 // --- basic block ---
-// 0x01048894: 0x1048894: lui   a1, 0x10000
+// 0x010488a4: 0x10488a4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01048898: 0x1048898: lui   a0, 0x20000
+// 0x010488a8: 0x10488a8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0104889c: 0x104889c: addu  a3, zero, zero
+// 0x010488ac: 0x10488ac: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010488a0: 0x10488a0: addiu a1, a1, 18500
+// 0x010488b0: 0x10488b0: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010488a4: 0x10488a4: addiu a0, a0, 11128
+// 0x010488b4: 0x10488b4: addiu a0, a0, 11588
 	ldloc.1
-	ldc.i4 11128
+	ldc.i4 11588
 	add
 	stloc.1
-// 0x010488a8: 0x10488a8: addiu a2, zero, -1
+// 0x010488b8: 0x10488b8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010488ac: 0x10488ac: lui   v0, 0x300000
+// 0x010488bc: 0x10488bc: lui   v0, 0x300000
 	ldc.i4 3145728
 	stloc 5
-// 0x010488b0: 0x10488b0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010488c0: 0x10488c0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5672,42 +5672,42 @@ L_1048864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010488b8: 0x10488b8: lui   a1, 0x0
+// 0x010488c8: 0x10488c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010488bc: 0x10488bc: addiu a1, a1, 23008
+// 0x010488cc: 0x10488cc: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010488c0: 0x10488c0: addu  a2, a1, zero
+// 0x010488d0: 0x10488d0: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x010488c4: 0x10488c4: addu  a0, v0, zero
+// 0x010488d4: 0x10488d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010488c8: 0x10488c8: jal   0x1098fe0 addu  s2, v0, zero
+// 0x010488d8: 0x10488d8: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010488d0: 0x10488d0: lui   v0, 0x1040000
+// 0x010488e0: 0x10488e0: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x010488d4: 0x10488d4: addiu v0, v0, 29604
+// 0x010488e4: 0x10488e4: addiu v0, v0, 29620
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 29620
 	add
 	stloc 5
-// 0x010488d8: 0x10488d8: sw    v0, 216(s2)
+// 0x010488e8: 0x10488e8: sw    v0, 216(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5716,39 +5716,39 @@ L_1048864:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010488dc: 0x10488dc: addu  a0, s1, zero
+// 0x010488ec: 0x10488ec: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010488e0: 0x10488e0: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010488f0: 0x10488f0: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010488e8: 0x10488e8: lui   v0, 0x1040000
+// 0x010488f8: 0x10488f8: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x010488ec: 0x10488ec: addiu v0, v0, 25684
+// 0x010488fc: 0x10488fc: addiu v0, v0, 25700
 	ldloc 5
-	ldc.i4 25684
+	ldc.i4 25700
 	add
 	stloc 5
-// 0x010488f0: 0x10488f0: lui   a0, 0x10000
+// 0x01048900: 0x1048900: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010488f4: 0x10488f4: addu  a1, zero, zero
+// 0x01048904: 0x1048904: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010488f8: 0x10488f8: addiu a0, a0, 1328
+// 0x01048908: 0x1048908: addiu a0, a0, 1324
 	ldloc.1
-	ldc.i4 1328
+	ldc.i4 1324
 	add
 	stloc.1
-// 0x010488fc: 0x10488fc: jal   0x1095eec sw    v0, 224(s2)
+// 0x0104890c: 0x104890c: jal   0x1096534 sw    v0, 224(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5762,43 +5762,43 @@ L_1048864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048904: 0x1048904: jal   0x10941e8 sll   zero, zero, 0
+// 0x01048914: 0x1048914: jal   0x109480c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_right_title_button_10941e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_right_title_button_109480c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104890c: 0x104890c: addu  s2, v0, zero
+// 0x0104891c: 0x104891c: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01048910: 0x1048910: jal   0x10990ac addu  a0, v0, zero
+// 0x01048920: 0x1048920: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048918: 0x1048918: addiu a1, sp, 32
+// 0x01048928: 0x1048928: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0104891c: 0x104891c: addiu a2, zero, 2
+// 0x0104892c: 0x104892c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01048920: 0x1048920: jal   0x1090cbc addu  a0, s2, zero
+// 0x01048930: 0x1048930: jal   0x10912e0 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5806,20 +5806,20 @@ L_1048864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_icon_1090cbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_icon_10912e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048928: 0x1048928: lui   v0, 0x1040000
+// 0x01048938: 0x1048938: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x0104892c: 0x104892c: addiu v0, v0, 28028
+// 0x0104893c: 0x104893c: addiu v0, v0, 28044
 	ldloc 5
-	ldc.i4 28028
+	ldc.i4 28044
 	add
 	stloc 5
-// 0x01048930: 0x1048930: sw    v0, 112(s2)
+// 0x01048940: 0x1048940: sw    v0, 112(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5828,7 +5828,7 @@ L_1048864:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01048934: 0x1048934: jal   0x1048318 addu  a0, s1, zero
+// 0x01048944: 0x1048944: jal   0x1048328 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5836,63 +5836,63 @@ L_1048864:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::add_routes_selection_1048318(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::add_routes_selection_1048328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104893c: 0x104893c: lw    a0, 0(s0)
+// 0x0104894c: 0x104894c: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01048940: 0x1048940: jal   0x1046d9c sll   zero, zero, 0
+// 0x01048950: 0x1048950: jal   0x1046dac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::highligh_selection_1046d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::highligh_selection_1046dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048948: 0x1048948: jal   0x1006bfc addiu a0, zero, 60
+// 0x01048958: 0x1048958: jal   0x1006c0c addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048950: 0x1048950: jal   0x1021900 sll   zero, zero, 0
+// 0x01048960: 0x1048960: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048958: 0x1048958: jal   0x101fcfc sll   zero, zero, 0
+// 0x01048968: 0x1048968: jal   0x101fd0c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_unfreeze_101fcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_unfreeze_101fd0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048960: 0x1048960: j	 0x1048b64 sll   zero, zero, 0
-	br L_1048b64
+// 0x01048970: 0x1048970: j	 0x1048b74 sll   zero, zero, 0
+	br L_1048b74
 // --- basic block ---
-L_1048968:
-// 0x01048968: 0x1048968: sw    v0, 32(sp)
+L_1048978:
+// 0x01048978: 0x1048978: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5901,18 +5901,18 @@ L_1048968:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104896c: 0x104896c: lui   v0, 0x10000
+// 0x0104897c: 0x104897c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01048970: 0x1048970: addiu v0, v0, 1312
+// 0x01048980: 0x1048980: addiu v0, v0, 1308
 	ldloc 5
-	ldc.i4 1312
+	ldc.i4 1308
 	add
 	stloc 5
-// 0x01048974: 0x1048974: addu  a0, zero, zero
+// 0x01048984: 0x1048984: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01048978: 0x1048978: jal   0x108e530 sw    v0, 36(sp)
+// 0x01048988: 0x1048988: jal   0x108eb54 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5922,32 +5922,32 @@ L_1048968:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108e530(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Record_108eb54(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048980: 0x1048980: bne   v0, zero, 0x10489a8 addu  s1, v0, zero
+// 0x01048990: 0x1048990: bne   v0, zero, 0x10489b8 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_10489a8
+	brtrue L_10489b8
 // --- basic block ---
-// 0x01048988: 0x1048988: lui   a3, 0x10000
+// 0x01048998: 0x1048998: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104898c: 0x104898c: addiu a1, s2, -576
+// 0x0104899c: 0x104899c: addiu a1, s2, -580
 	ldloc 9
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048990: 0x1048990: addiu a3, a3, 1348
+// 0x010489a0: 0x10489a0: addiu a3, a3, 1344
 	ldloc 4
-	ldc.i4 1348
+	ldc.i4 1344
 	add
 	stloc 4
-// 0x01048994: 0x1048994: addiu a0, zero, 4
+// 0x010489a4: 0x10489a4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01048998: 0x1048998: jal   0x100449c addiu a2, zero, 672
+// 0x010489a8: 0x10489a8: jal   0x100449c addiu a2, zero, 672
 	ldc.i4 672
 	stloc.3
 	ldloc.0
@@ -5960,31 +5960,31 @@ L_1048968:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010489a0: 0x10489a0: j	 0x1048b64 sll   zero, zero, 0
-	br L_1048b64
+// 0x010489b0: 0x10489b0: j	 0x1048b74 sll   zero, zero, 0
+	br L_1048b74
 // --- basic block ---
-L_10489a8:
-// 0x010489a8: 0x10489a8: addu  s0, v0, zero
+L_10489b8:
+// 0x010489b8: 0x10489b8: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010489ac: 0x10489ac: addu  s2, zero, zero
+// 0x010489bc: 0x10489bc: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010489b0: 0x10489b0: jal   0x108e568 addiu s3, zero, 1
+// 0x010489c0: 0x10489c0: jal   0x108eb8c addiu s3, zero, 1
 	ldc.i4.1
 	stloc 11
-	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108e568()
+	call int32 Cibyl106::RealtimeAltRoutes_Get_Num_Routes_108eb8c()
 	stloc 5
 // --- basic block ---
-// 0x010489b8: 0x10489b8: j	 0x10489e4 slt   v1, s2, v0
+// 0x010489c8: 0x10489c8: j	 0x10489f4 slt   v1, s2, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 6
-	br L_10489e4
+	br L_10489f4
 // --- basic block ---
-L_10489c0:
-// 0x010489c0: 0x10489c0: lw    a1, 796(s0)
+L_10489d0:
+// 0x010489d0: 0x10489d0: lw    a1, 796(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5993,7 +5993,7 @@ L_10489c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010489c4: 0x10489c4: lw    a2, 788(s0)
+// 0x010489d4: 0x10489d4: lw    a2, 788(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6002,7 +6002,7 @@ L_10489c0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010489c8: 0x10489c8: lw    a3, 772(s0)
+// 0x010489d8: 0x10489d8: lw    a3, 772(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6011,7 +6011,7 @@ L_10489c0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010489cc: 0x10489cc: sw    v0, 64(sp)
+// 0x010489dc: 0x10489dc: sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6020,7 +6020,7 @@ L_10489c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010489d0: 0x10489d0: jal   0x1058c68 sw    s3, 16(sp)
+// 0x010489e0: 0x10489e0: jal   0x1058c78 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6034,12 +6034,12 @@ L_10489c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010489d8: 0x10489d8: lw    v0, 64(sp)
+// 0x010489e8: 0x10489e8: lw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6048,34 +6048,34 @@ L_10489c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010489dc: 0x10489dc: addiu s2, s2, 1
+// 0x010489ec: 0x10489ec: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010489e0: 0x10489e0: slt   v1, s2, v0
+// 0x010489f0: 0x10489f0: slt   v1, s2, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 6
-L_10489e4:
-// 0x010489e4: 0x10489e4: addu  a0, s2, zero
+L_10489f4:
+// 0x010489f4: 0x10489f4: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010489e8: 0x10489e8: bne   v1, zero, 0x10489c0 addiu s0, s0, 44
+// 0x010489f8: 0x10489f8: bne   v1, zero, 0x10489d0 addiu s0, s0, 44
 	ldloc 6
 	ldloc 10
 	ldc.i4.s 44
 	add
 	stloc 10
-	brtrue L_10489c0
+	brtrue L_10489d0
 // --- basic block ---
-// 0x010489f0: 0x10489f0: lui   a0, 0x10000
+// 0x01048a00: 0x1048a00: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010489f4: 0x10489f4: jal   0x101cd60 addiu a0, a0, 312
+// 0x01048a04: 0x1048a04: jal   0x101cd70 addiu a0, a0, 308
 	ldloc.1
-	ldc.i4 312
+	ldc.i4 308
 	add
 	stloc.1
 	ldloc.0
@@ -6083,34 +6083,34 @@ L_10489e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010489fc: 0x10489fc: lui   a0, 0x10000
+// 0x01048a0c: 0x1048a0c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048a00: 0x1048a00: lui   a2, 0x1040000
+// 0x01048a10: 0x1048a10: lui   a2, 0x1040000
 	ldc.i4 17039360
 	stloc.3
-// 0x01048a04: 0x1048a04: lui   a3, 0x30000
+// 0x01048a14: 0x1048a14: lui   a3, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x01048a08: 0x1048a08: addu  a1, v0, zero
+// 0x01048a18: 0x1048a18: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01048a0c: 0x1048a0c: addiu a0, a0, 1388
+// 0x01048a1c: 0x1048a1c: addiu a0, a0, 1384
 	ldloc.1
-	ldc.i4 1388
+	ldc.i4 1384
 	add
 	stloc.1
-// 0x01048a10: 0x1048a10: addiu a2, a2, 30516
+// 0x01048a20: 0x1048a20: addiu a2, a2, 30532
 	ldloc.3
-	ldc.i4 30516
+	ldc.i4 30532
 	add
 	stloc.3
-// 0x01048a14: 0x1048a14: jal   0x1095a08 ori   a3, a3, 8192
+// 0x01048a24: 0x1048a24: jal   0x1096050 ori   a3, a3, 8192
 	ldloc 4
 	ldc.i4 8192
 	or
@@ -6120,48 +6120,48 @@ L_10489e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048a1c: 0x1048a1c: jal   0x101fa28 addu  s0, v0, zero
+// 0x01048a2c: 0x1048a2c: jal   0x101fa38 addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01048a24: 0x1048a24: beq   v0, zero, 0x1048a30 addiu a1, zero, 50
+// 0x01048a34: 0x1048a34: beq   v0, zero, 0x1048a40 addiu a1, zero, 50
 	ldloc 5
 	ldc.i4.s 50
 	stloc.2
-	brfalse L_1048a30
+	brfalse L_1048a40
 // --- basic block ---
-// 0x01048a2c: 0x1048a2c: addiu a1, zero, 110
+// 0x01048a3c: 0x1048a3c: addiu a1, zero, 110
 	ldc.i4.s 110
 	stloc.2
-L_1048a30:
-// 0x01048a30: 0x1048a30: jal   0x102f90c addu  a0, zero, zero
+L_1048a40:
+// 0x01048a40: 0x1048a40: jal   0x102f91c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f90c(int32,int32,int32,int32)
+	call int32 Cibyl34::roadmap_screen_obj_global_offset_102f91c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048a38: 0x1048a38: lui   a0, 0x1040000
+// 0x01048a48: 0x1048a48: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01048a3c: 0x1048a3c: addiu a0, a0, 25676
+// 0x01048a4c: 0x1048a4c: addiu a0, a0, 25692
 	ldloc.1
-	ldc.i4 25676
+	ldc.i4 25692
 	add
 	stloc.1
-// 0x01048a40: 0x1048a40: jal   0x104bab0 addiu a1, zero, 3
+// 0x01048a50: 0x1048a50: jal   0x104bac0 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -6169,43 +6169,43 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048a48: 0x1048a48: jal   0x101bd00 lui   s2, 0x10000
+// 0x01048a58: 0x1048a58: jal   0x101bd10 lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-	call int32 Cibyl20::roadmap_object_disable_short_click_101bd00()
+	call int32 Cibyl20::roadmap_object_disable_short_click_101bd10()
 	stloc 5
 // --- basic block ---
-// 0x01048a50: 0x1048a50: lui   a1, 0x10000
+// 0x01048a60: 0x1048a60: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01048a54: 0x1048a54: lui   a0, 0x20000
+// 0x01048a64: 0x1048a64: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01048a58: 0x1048a58: addu  a3, zero, zero
+// 0x01048a68: 0x1048a68: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01048a5c: 0x1048a5c: addiu a1, a1, 18500
+// 0x01048a6c: 0x1048a6c: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01048a60: 0x1048a60: addiu a0, a0, 11128
+// 0x01048a70: 0x1048a70: addiu a0, a0, 11588
 	ldloc.1
-	ldc.i4 11128
+	ldc.i4 11588
 	add
 	stloc.1
-// 0x01048a64: 0x1048a64: addiu a2, zero, -1
+// 0x01048a74: 0x1048a74: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01048a68: 0x1048a68: lui   v0, 0x300000
+// 0x01048a78: 0x1048a78: lui   v0, 0x300000
 	ldc.i4 3145728
 	stloc 5
-// 0x01048a6c: 0x1048a6c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01048a7c: 0x1048a7c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6219,26 +6219,26 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048a74: 0x1048a74: lui   a1, 0x0
+// 0x01048a84: 0x1048a84: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01048a78: 0x1048a78: addiu a1, a1, 23008
+// 0x01048a88: 0x1048a88: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01048a7c: 0x1048a7c: addu  a2, a1, zero
+// 0x01048a8c: 0x1048a8c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01048a80: 0x1048a80: addu  a0, v0, zero
+// 0x01048a90: 0x1048a90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01048a84: 0x1048a84: jal   0x1098fe0 sw    v0, 64(sp)
+// 0x01048a94: 0x1048a94: jal   0x1099628 sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6250,9 +6250,9 @@ L_1048a30:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01048a8c: 0x1048a8c: lw    v0, 64(sp)
+// 0x01048a9c: 0x1048a9c: lw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6261,15 +6261,15 @@ L_1048a30:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01048a90: 0x1048a90: lui   v1, 0x1040000
+// 0x01048aa0: 0x1048aa0: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 6
-// 0x01048a94: 0x1048a94: addiu v1, v1, 29604
+// 0x01048aa4: 0x1048aa4: addiu v1, v1, 29620
 	ldloc 6
-	ldc.i4 29604
+	ldc.i4 29620
 	add
 	stloc 6
-// 0x01048a98: 0x1048a98: sw    v1, 216(v0)
+// 0x01048aa8: 0x1048aa8: sw    v1, 216(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6278,15 +6278,15 @@ L_1048a30:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01048a9c: 0x1048a9c: lui   v1, 0x1040000
+// 0x01048aac: 0x1048aac: lui   v1, 0x1040000
 	ldc.i4 17039360
 	stloc 6
-// 0x01048aa0: 0x1048aa0: addiu v1, v1, 25684
+// 0x01048ab0: 0x1048ab0: addiu v1, v1, 25700
 	ldloc 6
-	ldc.i4 25684
+	ldc.i4 25700
 	add
 	stloc 6
-// 0x01048aa4: 0x1048aa4: sw    v1, 224(v0)
+// 0x01048ab4: 0x1048ab4: sw    v1, 224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6295,28 +6295,28 @@ L_1048a30:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01048aa8: 0x1048aa8: addu  a1, v0, zero
+// 0x01048ab8: 0x1048ab8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01048aac: 0x1048aac: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01048abc: 0x1048abc: jal   0x109950c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048ab4: 0x1048ab4: lui   a0, 0x10000
+// 0x01048ac4: 0x1048ac4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048ab8: 0x1048ab8: addiu a1, s1, 780
+// 0x01048ac8: 0x1048ac8: addiu a1, s1, 780
 	ldloc 8
 	ldc.i4 780
 	add
 	stloc.2
-// 0x01048abc: 0x1048abc: jal   0x101f76c addiu a0, a0, -29748
+// 0x01048acc: 0x1048acc: jal   0x101f77c addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -6326,20 +6326,20 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048ac4: 0x1048ac4: lui   a0, 0x10000
+// 0x01048ad4: 0x1048ad4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048ac8: 0x1048ac8: addiu a1, s1, 772
+// 0x01048ad8: 0x1048ad8: addiu a1, s1, 772
 	ldloc 8
 	ldc.i4 772
 	add
 	stloc.2
-// 0x01048acc: 0x1048acc: jal   0x101f76c addiu a0, a0, -29760
+// 0x01048adc: 0x1048adc: jal   0x101f77c addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -6349,15 +6349,15 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048ad4: 0x1048ad4: lui   a0, 0x10000
+// 0x01048ae4: 0x1048ae4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048ad8: 0x1048ad8: jal   0x101ece8 addiu a0, a0, -29624
+// 0x01048ae8: 0x1048ae8: jal   0x101ecf8 addiu a0, a0, -29624
 	ldloc.1
 	ldc.i4 -29624
 	add
@@ -6367,32 +6367,32 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048ae0: 0x1048ae0: jal   0x104246c sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bottom_bar_hide_104246c()
+// 0x01048af0: 0x1048af0: jal   0x104247c sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bottom_bar_hide_104247c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048ae8: 0x1048ae8: jal   0x105e2e4 addu  a0, zero, zero
+// 0x01048af8: 0x1048af8: jal   0x105e2f4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_mode_105e2e4(int32)
+	call int32 Cibyl70::navigate_bar_set_mode_105e2f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048af0: 0x1048af0: addu  a1, zero, zero
+// 0x01048b00: 0x1048b00: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01048af4: 0x1048af4: jal   0x1095eec addiu a0, s2, 1388
+// 0x01048b04: 0x1048b04: jal   0x1096534 addiu a0, s2, 1384
 	ldloc 9
-	ldc.i4 1388
+	ldc.i4 1384
 	add
 	stloc.1
 	ldloc.0
@@ -6400,43 +6400,43 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048afc: 0x1048afc: jal   0x10941e8 sll   zero, zero, 0
+// 0x01048b0c: 0x1048b0c: jal   0x109480c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_right_title_button_10941e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_right_title_button_109480c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048b04: 0x1048b04: addu  s1, v0, zero
+// 0x01048b14: 0x1048b14: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01048b08: 0x1048b08: jal   0x10990ac addu  a0, v0, zero
+// 0x01048b18: 0x1048b18: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048b10: 0x1048b10: addiu a2, zero, 2
+// 0x01048b20: 0x1048b20: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01048b14: 0x1048b14: addiu a1, sp, 32
+// 0x01048b24: 0x1048b24: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01048b18: 0x1048b18: jal   0x1090cbc addu  a0, s1, zero
+// 0x01048b28: 0x1048b28: jal   0x10912e0 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6444,20 +6444,20 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_change_icon_1090cbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_change_icon_10912e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048b20: 0x1048b20: lui   v0, 0x1040000
+// 0x01048b30: 0x1048b30: lui   v0, 0x1040000
 	ldc.i4 17039360
 	stloc 5
-// 0x01048b24: 0x1048b24: addiu v0, v0, 28028
+// 0x01048b34: 0x1048b34: addiu v0, v0, 28044
 	ldloc 5
-	ldc.i4 28028
+	ldc.i4 28044
 	add
 	stloc 5
-// 0x01048b28: 0x1048b28: sw    v0, 112(s1)
+// 0x01048b38: 0x1048b38: sw    v0, 112(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6466,7 +6466,7 @@ L_1048a30:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01048b2c: 0x1048b2c: jal   0x1048318 addu  a0, s0, zero
+// 0x01048b3c: 0x1048b3c: jal   0x1048328 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6474,22 +6474,22 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl53::add_routes_selection_1048318(int32,int32,int32,int32,int32)
+	call int32 Cibyl53::add_routes_selection_1048328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048b34: 0x1048b34: lui   a0, 0x1040000
+// 0x01048b44: 0x1048b44: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01048b38: 0x1048b38: addiu a1, s2, 1388
+// 0x01048b48: 0x1048b48: addiu a1, s2, 1384
 	ldloc 9
-	ldc.i4 1388
+	ldc.i4 1384
 	add
 	stloc.2
-// 0x01048b3c: 0x1048b3c: jal   0x109c5ec addiu a0, a0, 30184
+// 0x01048b4c: 0x1048b4c: jal   0x109cc34 addiu a0, a0, 30200
 	ldloc.1
-	ldc.i4 30184
+	ldc.i4 30200
 	add
 	stloc.1
 	ldloc.0
@@ -6497,12 +6497,12 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048b44: 0x1048b44: jal   0x1046d9c addiu a0, zero, -1
+// 0x01048b54: 0x1048b54: jal   0x1046dac addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.0
@@ -6510,43 +6510,43 @@ L_1048a30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::highligh_selection_1046d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::highligh_selection_1046dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048b4c: 0x1048b4c: jal   0x1006bfc addiu a0, zero, 60
+// 0x01048b5c: 0x1048b5c: jal   0x1006c0c addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
 	ldloc.1
-	call int32 Cibyl4::roadmap_math_set_min_zoom_1006bfc(int32)
+	call int32 Cibyl4::roadmap_math_set_min_zoom_1006c0c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048b54: 0x1048b54: jal   0x101fcfc sll   zero, zero, 0
+// 0x01048b64: 0x1048b64: jal   0x101fd0c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_unfreeze_101fcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_unfreeze_101fd0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048b5c: 0x1048b5c: jal   0x1021900 sll   zero, zero, 0
+// 0x01048b6c: 0x1048b6c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1048b64:
-// 0x01048b64: 0x1048b64: lw    ra, 92(sp)
-// 0x01048b68: 0x1048b68: lw    s3, 88(sp)
+L_1048b74:
+// 0x01048b74: 0x1048b74: lw    ra, 92(sp)
+// 0x01048b78: 0x1048b78: lw    s3, 88(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6555,7 +6555,7 @@ L_1048b64:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01048b6c: 0x1048b6c: lw    s2, 84(sp)
+// 0x01048b7c: 0x1048b7c: lw    s2, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6564,7 +6564,7 @@ L_1048b64:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01048b70: 0x1048b70: lw    s1, 80(sp)
+// 0x01048b80: 0x1048b80: lw    s1, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6573,7 +6573,7 @@ L_1048b64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01048b74: 0x1048b74: lw    s0, 76(sp)
+// 0x01048b84: 0x1048b84: lw    s0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6582,7 +6582,7 @@ L_1048b64:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01048b78: 0x1048b78: jr    ra addiu sp, sp, 96
+// 0x01048b88: 0x1048b88: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
diff --git a/converted/Cibyl54.j b/converted/Cibyl54.j
index 698eff1..6dfb0cf 100644
--- a/converted/Cibyl54.j
+++ b/converted/Cibyl54.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl54::.ctor
 
-.method public static int32 roadmap_alternative_routes_set_suggest_routes_1048b80(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_set_suggest_routes_1048b90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -76,60 +76,60 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048b80: 0x1048b80: addiu sp, sp, -24
+// 0x01048b90: 0x1048b90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01048b84: 0x1048b84: sw    ra, 20(sp)
-// 0x01048b88: 0x1048b88: beq   a0, zero, 0x1048ba0 lui   v0, 0x0
+// 0x01048b94: 0x1048b94: sw    ra, 20(sp)
+// 0x01048b98: 0x1048b98: beq   a0, zero, 0x1048bb0 lui   v0, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1048ba0
+	brfalse L_1048bb0
 // --- basic block ---
-// 0x01048b90: 0x1048b90: lui   a1, 0x0
+// 0x01048ba0: 0x1048ba0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01048b94: 0x1048b94: addiu a0, v0, 13416
+// 0x01048ba4: 0x1048ba4: addiu a0, v0, 13416
 	ldloc 5
 	ldc.i4 13416
 	add
 	stloc.1
-// 0x01048b98: 0x1048b98: j	 0x1048bac addiu a1, a1, 20820
+// 0x01048ba8: 0x1048ba8: j	 0x1048bbc addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-	br L_1048bac
+	br L_1048bbc
 // --- basic block ---
-L_1048ba0:
-// 0x01048ba0: 0x1048ba0: lui   a1, 0x20000
+L_1048bb0:
+// 0x01048bb0: 0x1048bb0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01048ba4: 0x1048ba4: addiu a0, v0, 13416
+// 0x01048bb4: 0x1048bb4: addiu a0, v0, 13416
 	ldloc 5
 	ldc.i4 13416
 	add
 	stloc.1
-// 0x01048ba8: 0x1048ba8: addiu a1, a1, 9464
+// 0x01048bb8: 0x1048bb8: addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-L_1048bac:
-// 0x01048bac: 0x1048bac: jal   0x100e5c0 sll   zero, zero, 0
+L_1048bbc:
+// 0x01048bbc: 0x1048bbc: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048bb4: 0x1048bb4: jal   0x100ea50 addu  a0, zero, zero
+// 0x01048bc4: 0x1048bc4: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -137,14 +137,14 @@ L_1048bac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048bbc: 0x1048bbc: lw    ra, 20(sp)
-// 0x01048bc0: 0x1048bc0: sll   zero, zero, 0
-// 0x01048bc4: 0x1048bc4: jr    ra addiu sp, sp, 24
+// 0x01048bcc: 0x1048bcc: lw    ra, 20(sp)
+// 0x01048bd0: 0x1048bd0: sll   zero, zero, 0
+// 0x01048bd4: 0x1048bd4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -156,7 +156,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 dont_show_callback_1048bcc(int32,int32,int32,int32,int32)
+.method public static int32 dont_show_callback_1048bdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -191,13 +191,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048bcc: 0x1048bcc: addiu sp, sp, -24
+// 0x01048bdc: 0x1048bdc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01048bd0: 0x1048bd0: sw    ra, 20(sp)
-// 0x01048bd4: 0x1048bd4: jal   0x1048b80 addu  a0, zero, zero
+// 0x01048be0: 0x1048be0: sw    ra, 20(sp)
+// 0x01048be4: 0x1048be4: jal   0x1048b90 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -205,15 +205,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_routes_set_suggest_routes_1048b80(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_routes_set_suggest_routes_1048b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048bdc: 0x1048bdc: lui   a0, 0x10000
+// 0x01048bec: 0x1048bec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048be0: 0x1048be0: jal   0x101f044 addiu a0, a0, -29748
+// 0x01048bf0: 0x1048bf0: jal   0x101f054 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -223,15 +223,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048be8: 0x1048be8: lui   a0, 0x10000
+// 0x01048bf8: 0x1048bf8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048bec: 0x1048bec: jal   0x101f044 addiu a0, a0, -29760
+// 0x01048bfc: 0x1048bfc: jal   0x101f054 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -241,12 +241,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048bf4: 0x1048bf4: jal   0x104694c addu  a0, zero, zero
+// 0x01048c04: 0x1048c04: jal   0x104695c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -254,16 +254,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl52::suggest_route_dialog_close_104694c(int32,int32,int32,int32,int32)
+	call int32 Cibyl52::suggest_route_dialog_close_104695c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048bfc: 0x1048bfc: lw    ra, 20(sp)
-// 0x01048c00: 0x1048c00: addiu v0, zero, 1
+// 0x01048c0c: 0x1048c0c: lw    ra, 20(sp)
+// 0x01048c10: 0x1048c10: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01048c04: 0x1048c04: jr    ra addiu sp, sp, 24
+// 0x01048c14: 0x1048c14: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -275,7 +275,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alternative_feature_enabled_1048c0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_feature_enabled_1048c1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -310,16 +310,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048c0c: 0x1048c0c: lui   a0, 0x0
+// 0x01048c1c: 0x1048c1c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01048c10: 0x1048c10: addiu sp, sp, -24
+// 0x01048c20: 0x1048c20: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01048c14: 0x1048c14: sw    ra, 20(sp)
-// 0x01048c18: 0x1048c18: jal   0x100e348 addiu a0, a0, 13432
+// 0x01048c24: 0x1048c24: sw    ra, 20(sp)
+// 0x01048c28: 0x1048c28: jal   0x100e358 addiu a0, a0, 13432
 	ldloc.1
 	ldc.i4 13432
 	add
@@ -329,18 +329,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048c20: 0x1048c20: lui   a1, 0x0
+// 0x01048c30: 0x1048c30: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01048c24: 0x1048c24: addu  a0, v0, zero
+// 0x01048c34: 0x1048c34: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01048c28: 0x1048c28: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01048c38: 0x1048c38: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -350,13 +350,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01048c30: 0x1048c30: lw    ra, 20(sp)
-// 0x01048c34: 0x1048c34: sltiu v0, v0, 1
+// 0x01048c40: 0x1048c40: lw    ra, 20(sp)
+// 0x01048c44: 0x1048c44: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01048c38: 0x1048c38: jr    ra addiu sp, sp, 24
+// 0x01048c48: 0x1048c48: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -368,7 +368,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alternative_routes_suggest_routes_1048c40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_suggest_routes_1048c50(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -403,16 +403,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048c40: 0x1048c40: lui   a0, 0x0
+// 0x01048c50: 0x1048c50: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01048c44: 0x1048c44: addiu sp, sp, -24
+// 0x01048c54: 0x1048c54: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01048c48: 0x1048c48: sw    ra, 20(sp)
-// 0x01048c4c: 0x1048c4c: jal   0x100e348 addiu a0, a0, 13416
+// 0x01048c58: 0x1048c58: sw    ra, 20(sp)
+// 0x01048c5c: 0x1048c5c: jal   0x100e358 addiu a0, a0, 13416
 	ldloc.1
 	ldc.i4 13416
 	add
@@ -422,18 +422,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01048c54: 0x1048c54: lui   a1, 0x0
+// 0x01048c64: 0x1048c64: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01048c58: 0x1048c58: addu  a0, v0, zero
+// 0x01048c68: 0x1048c68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01048c5c: 0x1048c5c: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01048c6c: 0x1048c6c: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -443,13 +443,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01048c64: 0x1048c64: lw    ra, 20(sp)
-// 0x01048c68: 0x1048c68: sltiu v0, v0, 1
+// 0x01048c74: 0x1048c74: lw    ra, 20(sp)
+// 0x01048c78: 0x1048c78: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01048c6c: 0x1048c6c: jr    ra addiu sp, sp, 24
+// 0x01048c7c: 0x1048c7c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -461,7 +461,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_alternative_routes_init_1048c74(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_alternative_routes_init_1048c84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -505,12 +505,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048c74: 0x1048c74: addiu sp, sp, -40
+// 0x01048c84: 0x1048c84: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01048c78: 0x1048c78: sw    s2, 32(sp)
+// 0x01048c88: 0x1048c88: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -519,7 +519,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01048c7c: 0x1048c7c: sw    s1, 28(sp)
+// 0x01048c8c: 0x1048c8c: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -528,7 +528,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048c80: 0x1048c80: sw    s0, 24(sp)
+// 0x01048c90: 0x1048c90: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -537,43 +537,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01048c84: 0x1048c84: lui   s2, 0x0
+// 0x01048c94: 0x1048c94: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01048c88: 0x1048c88: lui   s0, 0x20000
+// 0x01048c98: 0x1048c98: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01048c8c: 0x1048c8c: lui   s1, 0x20000
+// 0x01048c9c: 0x1048c9c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01048c90: 0x1048c90: lui   a1, 0x0
+// 0x01048ca0: 0x1048ca0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01048c94: 0x1048c94: addiu s1, s1, 9464
+// 0x01048ca4: 0x1048ca4: addiu s1, s1, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 8
-// 0x01048c98: 0x1048c98: addiu a1, a1, 13416
+// 0x01048ca8: 0x1048ca8: addiu a1, a1, 13416
 	ldloc.2
 	ldc.i4 13416
 	add
 	stloc.2
-// 0x01048c9c: 0x1048c9c: addiu a0, s0, -26888
+// 0x01048cac: 0x1048cac: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01048ca0: 0x1048ca0: addu  a2, zero, zero
+// 0x01048cb0: 0x1048cb0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01048ca4: 0x1048ca4: addiu a3, s2, 20820
+// 0x01048cb4: 0x1048cb4: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01048ca8: 0x1048ca8: sw    ra, 36(sp)
-// 0x01048cac: 0x1048cac: sw    s1, 16(sp)
+// 0x01048cb8: 0x1048cb8: sw    ra, 36(sp)
+// 0x01048cbc: 0x1048cbc: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -582,7 +582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048cb0: 0x1048cb0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01048cc0: 0x1048cc0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -596,36 +596,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048cb8: 0x1048cb8: lui   a0, 0x10000
+// 0x01048cc8: 0x1048cc8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048cbc: 0x1048cbc: lui   a1, 0x0
+// 0x01048ccc: 0x1048ccc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01048cc0: 0x1048cc0: addiu a0, a0, 12560
+// 0x01048cd0: 0x1048cd0: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01048cc4: 0x1048cc4: addiu a1, a1, 13432
+// 0x01048cd4: 0x1048cd4: addiu a1, a1, 13432
 	ldloc.2
 	ldc.i4 13432
 	add
 	stloc.2
-// 0x01048cc8: 0x1048cc8: addiu a3, s2, 20820
+// 0x01048cd8: 0x1048cd8: addiu a3, s2, 20820
 	ldloc 10
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01048ccc: 0x1048ccc: addu  a2, zero, zero
+// 0x01048cdc: 0x1048cdc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01048cd0: 0x1048cd0: sw    s1, 16(sp)
+// 0x01048ce0: 0x1048ce0: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -634,7 +634,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048cd4: 0x1048cd4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01048ce4: 0x1048ce4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -648,33 +648,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048cdc: 0x1048cdc: lui   a1, 0x0
+// 0x01048cec: 0x1048cec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01048ce0: 0x1048ce0: lui   a2, 0x10000
+// 0x01048cf0: 0x1048cf0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01048ce4: 0x1048ce4: addiu a0, s0, -26888
+// 0x01048cf4: 0x1048cf4: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01048ce8: 0x1048ce8: addiu a1, a1, 13448
+// 0x01048cf8: 0x1048cf8: addiu a1, a1, 13448
 	ldloc.2
 	ldc.i4 13448
 	add
 	stloc.2
-// 0x01048cec: 0x1048cec: addiu a2, a2, 9424
+// 0x01048cfc: 0x1048cfc: addiu a2, a2, 9420
 	ldloc.3
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.3
-// 0x01048cf0: 0x1048cf0: jal   0x100edb0 addu  a3, zero, zero
+// 0x01048d00: 0x1048d00: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -682,88 +682,88 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048cf8: 0x1048cf8: jal   0x1048c0c sll   zero, zero, 0
+// 0x01048d08: 0x1048d08: jal   0x1048c1c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_feature_enabled_1048c1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048d00: 0x1048d00: bne   v0, zero, 0x1048d20 lui   a1, 0x10000
+// 0x01048d10: 0x1048d10: bne   v0, zero, 0x1048d30 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1048d20
+	brtrue L_1048d30
 // --- basic block ---
-// 0x01048d08: 0x1048d08: lui   a3, 0x10000
+// 0x01048d18: 0x1048d18: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01048d0c: 0x1048d0c: addiu a1, a1, -576
+// 0x01048d1c: 0x1048d1c: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048d10: 0x1048d10: addiu a3, a3, 1408
+// 0x01048d20: 0x1048d20: addiu a3, a3, 1404
 	ldloc 4
-	ldc.i4 1408
+	ldc.i4 1404
 	add
 	stloc 4
-// 0x01048d14: 0x1048d14: addiu a0, zero, 2
+// 0x01048d24: 0x1048d24: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01048d18: 0x1048d18: j	 0x1048d44 addiu a2, zero, 1595
+// 0x01048d28: 0x1048d28: j	 0x1048d54 addiu a2, zero, 1595
 	ldc.i4 1595
 	stloc.3
-	br L_1048d44
+	br L_1048d54
 // --- basic block ---
-L_1048d20:
-// 0x01048d20: 0x1048d20: jal   0x1048c40 sll   zero, zero, 0
+L_1048d30:
+// 0x01048d30: 0x1048d30: jal   0x1048c50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_alternative_routes_suggest_routes_1048c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_alternative_routes_suggest_routes_1048c50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048d28: 0x1048d28: bne   v0, zero, 0x1048d54 lui   a1, 0x10000
+// 0x01048d38: 0x1048d38: bne   v0, zero, 0x1048d64 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1048d54
+	brtrue L_1048d64
 // --- basic block ---
-// 0x01048d30: 0x1048d30: lui   a3, 0x10000
+// 0x01048d40: 0x1048d40: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01048d34: 0x1048d34: addiu a1, a1, -576
+// 0x01048d44: 0x1048d44: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048d38: 0x1048d38: addiu a3, a3, 1448
+// 0x01048d48: 0x1048d48: addiu a3, a3, 1444
 	ldloc 4
-	ldc.i4 1448
+	ldc.i4 1444
 	add
 	stloc 4
-// 0x01048d3c: 0x1048d3c: addiu a0, zero, 1
+// 0x01048d4c: 0x1048d4c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01048d40: 0x1048d40: addiu a2, zero, 1600
+// 0x01048d50: 0x1048d50: addiu a2, zero, 1600
 	ldc.i4 1600
 	stloc.3
-L_1048d44:
-// 0x01048d44: 0x1048d44: jal   0x100449c sll   zero, zero, 0
+L_1048d54:
+// 0x01048d54: 0x1048d54: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -774,27 +774,27 @@ L_1048d44:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048d4c: 0x1048d4c: j	 0x1048d80 sll   zero, zero, 0
-	br L_1048d80
+// 0x01048d5c: 0x1048d5c: j	 0x1048d90 sll   zero, zero, 0
+	br L_1048d90
 // --- basic block ---
-L_1048d54:
-// 0x01048d54: 0x1048d54: lui   a3, 0x10000
+L_1048d64:
+// 0x01048d64: 0x1048d64: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01048d58: 0x1048d58: addiu a1, a1, -576
+// 0x01048d68: 0x1048d68: addiu a1, a1, -580
 	ldloc.2
-	ldc.i4 -576
+	ldc.i4 -580
 	add
 	stloc.2
-// 0x01048d5c: 0x1048d5c: addiu a3, a3, 1492
+// 0x01048d6c: 0x1048d6c: addiu a3, a3, 1488
 	ldloc 4
-	ldc.i4 1492
+	ldc.i4 1488
 	add
 	stloc 4
-// 0x01048d60: 0x1048d60: addiu a0, zero, 1
+// 0x01048d70: 0x1048d70: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01048d64: 0x1048d64: jal   0x100449c addiu a2, zero, 1603
+// 0x01048d74: 0x1048d74: jal   0x100449c addiu a2, zero, 1603
 	ldc.i4 1603
 	stloc.3
 	ldloc.0
@@ -807,12 +807,12 @@ L_1048d54:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048d6c: 0x1048d6c: lui   a0, 0x1040000
+// 0x01048d7c: 0x1048d7c: lui   a0, 0x1040000
 	ldc.i4 17039360
 	stloc.1
-// 0x01048d70: 0x1048d70: jal   0x106bcfc addiu a0, a0, 25752
+// 0x01048d80: 0x1048d80: jal   0x106c320 addiu a0, a0, 25768
 	ldloc.1
-	ldc.i4 25752
+	ldc.i4 25768
 	add
 	stloc.1
 	ldloc.0
@@ -820,26 +820,26 @@ L_1048d54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048d78: 0x1048d78: lui   v1, 0x60000
+// 0x01048d88: 0x1048d88: lui   v1, 0x60000
 	ldc.i4 393216
 	stloc 7
-// 0x01048d7c: 0x1048d7c: sw    v0, 20304(v1)
+// 0x01048d8c: 0x1048d8c: sw    v0, 20768(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5076
+	ldc.i4 5192
 	add
 	ldloc 6
 	stelem.i4
-L_1048d80:
-// 0x01048d80: 0x1048d80: lw    ra, 36(sp)
-// 0x01048d84: 0x1048d84: lw    s2, 32(sp)
+L_1048d90:
+// 0x01048d90: 0x1048d90: lw    ra, 36(sp)
+// 0x01048d94: 0x1048d94: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -848,7 +848,7 @@ L_1048d80:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01048d88: 0x1048d88: lw    s1, 28(sp)
+// 0x01048d98: 0x1048d98: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -857,7 +857,7 @@ L_1048d80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01048d8c: 0x1048d8c: lw    s0, 24(sp)
+// 0x01048d9c: 0x1048d9c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -866,7 +866,7 @@ L_1048d80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01048d90: 0x1048d90: jr    ra addiu sp, sp, 40
+// 0x01048da0: 0x1048da0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -878,7 +878,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_checkbox_selected_1048da0(int32,int32,int32,int32,int32)
+.method public static int32 on_checkbox_selected_1048db0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s1,int32 s2,int32 ra)
@@ -922,7 +922,7 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048da0: 0x1048da0: lw    v0, 4(a0)
+// 0x01048db0: 0x1048db0: lw    v0, 4(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -931,15 +931,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01048da4: 0x1048da4: addiu sp, sp, -32
+// 0x01048db4: 0x1048db4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01048da8: 0x1048da8: lui   a0, 0x10000
+// 0x01048db8: 0x1048db8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048dac: 0x1048dac: sw    s0, 16(sp)
+// 0x01048dbc: 0x1048dbc: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -948,12 +948,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01048db0: 0x1048db0: addiu a0, a0, 1648
+// 0x01048dc0: 0x1048dc0: addiu a0, a0, 1644
 	ldloc.1
-	ldc.i4 1648
+	ldc.i4 1644
 	add
 	stloc.1
-// 0x01048db4: 0x1048db4: lw    s0, 4(v0)
+// 0x01048dc4: 0x1048dc4: lw    s0, 4(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -962,8 +962,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01048db8: 0x1048db8: sw    ra, 28(sp)
-// 0x01048dbc: 0x1048dbc: sw    s2, 24(sp)
+// 0x01048dc8: 0x1048dc8: sw    ra, 28(sp)
+// 0x01048dcc: 0x1048dcc: sw    s2, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -972,7 +972,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01048dc0: 0x1048dc0: jal   0x10947ac sw    s1, 20(sp)
+// 0x01048dd0: 0x1048dd0: jal   0x1094dd0 sw    s1, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -986,26 +986,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048dc8: 0x1048dc8: addu  a0, v0, zero
+// 0x01048dd8: 0x1048dd8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01048dcc: 0x1048dcc: beq   s0, zero, 0x1048e7c addu  v0, zero, zero
+// 0x01048ddc: 0x1048ddc: beq   s0, zero, 0x1048e8c addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1048e7c
+	brfalse L_1048e8c
 // --- basic block ---
-// 0x01048dd4: 0x1048dd4: lui   a1, 0x20000
+// 0x01048de4: 0x1048de4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01048dd8: 0x1048dd8: jal   0x1001b14 addiu a1, a1, 9464
+// 0x01048de8: 0x1048de8: jal   0x1001b14 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.1
@@ -1013,24 +1013,24 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01048de0: 0x1048de0: lui   s2, 0x10000
+// 0x01048df0: 0x1048df0: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01048de4: 0x1048de4: lui   a1, 0x10000
+// 0x01048df4: 0x1048df4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01048de8: 0x1048de8: bne   v0, zero, 0x1048e34 lui   s1, 0x10000
+// 0x01048df8: 0x1048df8: bne   v0, zero, 0x1048e44 lui   s1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 9
-	brtrue L_1048e34
+	brtrue L_1048e44
 // --- basic block ---
-// 0x01048df0: 0x1048df0: addiu a1, a1, 1664
+// 0x01048e00: 0x1048e00: addiu a1, a1, 1660
 	ldloc.2
-	ldc.i4 1664
+	ldc.i4 1660
 	add
 	stloc.2
-// 0x01048df4: 0x1048df4: jal   0x109b304 addu  a0, s0, zero
+// 0x01048e04: 0x1048e04: jal   0x109b94c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1038,24 +1038,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048dfc: 0x1048dfc: jal   0x1099098 addu  a0, v0, zero
+// 0x01048e0c: 0x1048e0c: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048e04: 0x1048e04: addiu a1, s2, 1684
+// 0x01048e14: 0x1048e14: addiu a1, s2, 1680
 	ldloc 10
-	ldc.i4 1684
+	ldc.i4 1680
 	add
 	stloc.2
-// 0x01048e08: 0x1048e08: jal   0x109b304 addu  a0, s0, zero
+// 0x01048e18: 0x1048e18: jal   0x109b94c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1063,22 +1063,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e10: 0x1048e10: jal   0x1099098 addu  a0, v0, zero
+// 0x01048e20: 0x1048e20: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048e18: 0x1048e18: addu  a0, s0, zero
+// 0x01048e28: 0x1048e28: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01048e1c: 0x1048e1c: jal   0x109b304 addiu a1, s1, -25532
+// 0x01048e2c: 0x1048e2c: jal   0x109b94c addiu a1, s1, -25532
 	ldloc 9
 	ldc.i4 -25532
 	add
@@ -1088,28 +1088,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e24: 0x1048e24: jal   0x1099098 addu  a0, v0, zero
+// 0x01048e34: 0x1048e34: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01048e2c: 0x1048e2c: j	 0x1048e70 sll   zero, zero, 0
-	br L_1048e70
+// 0x01048e3c: 0x1048e3c: j	 0x1048e80 sll   zero, zero, 0
+	br L_1048e80
 // --- basic block ---
-L_1048e34:
-// 0x01048e34: 0x1048e34: addiu a1, a1, 1664
+L_1048e44:
+// 0x01048e44: 0x1048e44: addiu a1, a1, 1660
 	ldloc.2
-	ldc.i4 1664
+	ldc.i4 1660
 	add
 	stloc.2
-// 0x01048e38: 0x1048e38: jal   0x109b304 addu  a0, s0, zero
+// 0x01048e48: 0x1048e48: jal   0x109b94c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1117,26 +1117,26 @@ L_1048e34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e40: 0x1048e40: jal   0x10990ac addu  a0, v0, zero
+// 0x01048e50: 0x1048e50: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e48: 0x1048e48: addiu a1, s2, 1684
+// 0x01048e58: 0x1048e58: addiu a1, s2, 1680
 	ldloc 10
-	ldc.i4 1684
+	ldc.i4 1680
 	add
 	stloc.2
-// 0x01048e4c: 0x1048e4c: jal   0x109b304 addu  a0, s0, zero
+// 0x01048e5c: 0x1048e5c: jal   0x109b94c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1144,24 +1144,24 @@ L_1048e34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e54: 0x1048e54: jal   0x10990ac addu  a0, v0, zero
+// 0x01048e64: 0x1048e64: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e5c: 0x1048e5c: addu  a0, s0, zero
+// 0x01048e6c: 0x1048e6c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01048e60: 0x1048e60: jal   0x109b304 addiu a1, s1, -25532
+// 0x01048e70: 0x1048e70: jal   0x109b94c addiu a1, s1, -25532
 	ldloc 9
 	ldc.i4 -25532
 	add
@@ -1171,38 +1171,38 @@ L_1048e34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e68: 0x1048e68: jal   0x10990ac addu  a0, v0, zero
+// 0x01048e78: 0x1048e78: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1048e70:
-// 0x01048e70: 0x1048e70: jal   0x109483c sll   zero, zero, 0
+L_1048e80:
+// 0x01048e80: 0x1048e80: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01048e78: 0x1048e78: addiu v0, zero, 1
+// 0x01048e88: 0x1048e88: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1048e7c:
-// 0x01048e7c: 0x1048e7c: lw    ra, 28(sp)
-// 0x01048e80: 0x1048e80: lw    s2, 24(sp)
+L_1048e8c:
+// 0x01048e8c: 0x1048e8c: lw    ra, 28(sp)
+// 0x01048e90: 0x1048e90: lw    s2, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1211,7 +1211,7 @@ L_1048e7c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01048e84: 0x1048e84: lw    s1, 20(sp)
+// 0x01048e94: 0x1048e94: lw    s1, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1220,7 +1220,7 @@ L_1048e7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01048e88: 0x1048e88: lw    s0, 16(sp)
+// 0x01048e98: 0x1048e98: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1229,7 +1229,7 @@ L_1048e7c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01048e8c: 0x1048e8c: jr    ra addiu sp, sp, 32
+// 0x01048e9c: 0x1048e9c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1241,7 +1241,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 remider_add_pin_1048e94(int32,int32,int32,int32,int32)
+.method public static int32 remider_add_pin_1048ea4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 ra,int32 t0)
@@ -1294,12 +1294,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048e94: 0x1048e94: addiu sp, sp, -120
+// 0x01048ea4: 0x1048ea4: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x01048e98: 0x1048e98: sw    s0, 96(sp)
+// 0x01048ea8: 0x1048ea8: sw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1308,18 +1308,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01048e9c: 0x1048e9c: lui   a2, 0x10000
+// 0x01048eac: 0x1048eac: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01048ea0: 0x1048ea0: addiu s0, sp, 60
+// 0x01048eb0: 0x1048eb0: addiu s0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 8
-// 0x01048ea4: 0x1048ea4: addu  a3, a0, zero
+// 0x01048eb4: 0x1048eb4: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01048ea8: 0x1048ea8: sw    s4, 112(sp)
+// 0x01048eb8: 0x1048eb8: sw    s4, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1328,7 +1328,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01048eac: 0x1048eac: sw    s2, 104(sp)
+// 0x01048ebc: 0x1048ebc: sw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1337,25 +1337,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01048eb0: 0x1048eb0: addu  s4, a1, zero
+// 0x01048ec0: 0x1048ec0: addu  s4, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01048eb4: 0x1048eb4: addu  s2, a0, zero
+// 0x01048ec4: 0x1048ec4: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01048eb8: 0x1048eb8: addiu a2, a2, 1692
+// 0x01048ec8: 0x1048ec8: addiu a2, a2, 1688
 	ldloc.3
-	ldc.i4 1692
+	ldc.i4 1688
 	add
 	stloc.3
-// 0x01048ebc: 0x1048ebc: addiu a1, zero, 25
+// 0x01048ecc: 0x1048ecc: addiu a1, zero, 25
 	ldc.i4.s 25
 	stloc.2
-// 0x01048ec0: 0x1048ec0: addu  a0, s0, zero
+// 0x01048ed0: 0x1048ed0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01048ec4: 0x1048ec4: sw    ra, 116(sp)
-// 0x01048ec8: 0x1048ec8: sw    s3, 108(sp)
+// 0x01048ed4: 0x1048ed4: sw    ra, 116(sp)
+// 0x01048ed8: 0x1048ed8: sw    s3, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1364,7 +1364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01048ecc: 0x1048ecc: jal   0x1000f9c sw    s1, 100(sp)
+// 0x01048edc: 0x1048edc: jal   0x1000f9c sw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1383,7 +1383,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048ed4: 0x1048ed4: jal   0x101ca0c addu  a0, s0, zero
+// 0x01048ee4: 0x1048ee4: jal   0x101ca1c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1391,29 +1391,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048edc: 0x1048edc: lui   a2, 0x10000
+// 0x01048eec: 0x1048eec: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01048ee0: 0x1048ee0: addu  a3, s2, zero
+// 0x01048ef0: 0x1048ef0: addu  a3, s2, zero
 	ldloc 9
 	stloc 4
-// 0x01048ee4: 0x1048ee4: addiu a2, a2, 1704
+// 0x01048ef4: 0x1048ef4: addiu a2, a2, 1700
 	ldloc.3
-	ldc.i4 1704
+	ldc.i4 1700
 	add
 	stloc.3
-// 0x01048ee8: 0x1048ee8: addiu a1, zero, 25
+// 0x01048ef8: 0x1048ef8: addiu a1, zero, 25
 	ldc.i4.s 25
 	stloc.2
-// 0x01048eec: 0x1048eec: addu  a0, s0, zero
+// 0x01048efc: 0x1048efc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01048ef0: 0x1048ef0: jal   0x1000f9c addu  s1, v0, zero
+// 0x01048f00: 0x1048f00: jal   0x1000f9c addu  s1, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -1426,7 +1426,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048ef8: 0x1048ef8: jal   0x101ca0c addu  a0, s0, zero
+// 0x01048f08: 0x1048f08: jal   0x101ca1c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1434,20 +1434,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f00: 0x1048f00: lui   a0, 0x10000
+// 0x01048f10: 0x1048f10: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048f04: 0x1048f04: addiu a0, a0, -10576
+// 0x01048f14: 0x1048f14: addiu a0, a0, -10580
 	ldloc.1
-	ldc.i4 -10576
+	ldc.i4 -10580
 	add
 	stloc.1
-// 0x01048f08: 0x1048f08: jal   0x101ca0c addu  s3, v0, zero
+// 0x01048f18: 0x1048f18: jal   0x101ca1c addu  s3, v0, zero
 	ldloc 6
 	stloc 11
 	ldloc.0
@@ -1455,20 +1455,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f10: 0x1048f10: lui   a0, 0x10000
+// 0x01048f20: 0x1048f20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048f14: 0x1048f14: addiu a0, a0, -11248
+// 0x01048f24: 0x1048f24: addiu a0, a0, -11252
 	ldloc.1
-	ldc.i4 -11248
+	ldc.i4 -11252
 	add
 	stloc.1
-// 0x01048f18: 0x1048f18: jal   0x101ca0c addu  s0, v0, zero
+// 0x01048f28: 0x1048f28: jal   0x101ca1c addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -1476,20 +1476,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f20: 0x1048f20: lui   a0, 0x10000
+// 0x01048f30: 0x1048f30: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048f24: 0x1048f24: addiu a0, a0, 1724
+// 0x01048f34: 0x1048f34: addiu a0, a0, 1720
 	ldloc.1
-	ldc.i4 1724
+	ldc.i4 1720
 	add
 	stloc.1
-// 0x01048f28: 0x1048f28: jal   0x101ca0c addu  s2, v0, zero
+// 0x01048f38: 0x1048f38: jal   0x101ca1c addu  s2, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -1497,12 +1497,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f30: 0x1048f30: lw    v1, 4(s4)
+// 0x01048f40: 0x1048f40: lw    v1, 4(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -1511,26 +1511,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01048f34: 0x1048f34: lw    t0, 0(s4)
+// 0x01048f44: 0x1048f44: lw    t0, 0(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x01048f38: 0x1048f38: addu  a2, s3, zero
+// 0x01048f48: 0x1048f48: addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-// 0x01048f3c: 0x1048f3c: addu  a3, s0, zero
+// 0x01048f4c: 0x1048f4c: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x01048f40: 0x1048f40: addu  a1, s1, zero
+// 0x01048f50: 0x1048f50: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01048f44: 0x1048f44: addu  a0, s2, zero
+// 0x01048f54: 0x1048f54: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01048f48: 0x1048f48: sw    v1, 44(sp)
+// 0x01048f58: 0x1048f58: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1539,12 +1539,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01048f4c: 0x1048f4c: addiu v1, sp, 40
+// 0x01048f5c: 0x1048f5c: addiu v1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 7
-// 0x01048f50: 0x1048f50: sw    t0, 40(sp)
+// 0x01048f60: 0x1048f60: sw    t0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1553,7 +1553,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01048f54: 0x1048f54: sw    v1, 20(sp)
+// 0x01048f64: 0x1048f64: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1562,7 +1562,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01048f58: 0x1048f58: sw    v0, 16(sp)
+// 0x01048f68: 0x1048f68: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1571,7 +1571,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01048f5c: 0x1048f5c: sw    v0, 88(sp)
+// 0x01048f6c: 0x1048f6c: sw    v0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1580,7 +1580,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01048f60: 0x1048f60: sw    zero, 48(sp)
+// 0x01048f70: 0x1048f70: sw    zero, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1589,7 +1589,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01048f64: 0x1048f64: sw    zero, 52(sp)
+// 0x01048f74: 0x1048f74: sw    zero, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1598,7 +1598,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01048f68: 0x1048f68: sw    zero, 56(sp)
+// 0x01048f78: 0x1048f78: sw    zero, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1607,7 +1607,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01048f6c: 0x1048f6c: sw    zero, 24(sp)
+// 0x01048f7c: 0x1048f7c: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1616,7 +1616,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01048f70: 0x1048f70: sw    zero, 28(sp)
+// 0x01048f80: 0x1048f80: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1625,7 +1625,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01048f74: 0x1048f74: jal   0x101c4fc sw    zero, 32(sp)
+// 0x01048f84: 0x1048f84: jal   0x101c50c sw    zero, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1639,20 +1639,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f7c: 0x1048f7c: lui   a1, 0x1050000
+// 0x01048f8c: 0x1048f8c: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x01048f80: 0x1048f80: addiu a1, a1, -28376
+// 0x01048f90: 0x1048f90: addiu a1, a1, -28360
 	ldloc.2
-	ldc.i4 -28376
+	ldc.i4 -28360
 	add
 	stloc.2
-// 0x01048f84: 0x1048f84: jal   0x101bed0 addu  a0, s1, zero
+// 0x01048f94: 0x1048f94: jal   0x101bee0 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1660,12 +1660,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f8c: 0x1048f8c: jal   0x101c8f8 addu  a0, s1, zero
+// 0x01048f9c: 0x1048f9c: jal   0x101c908 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1673,12 +1673,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f94: 0x1048f94: jal   0x101c8f8 addu  a0, s3, zero
+// 0x01048fa4: 0x1048fa4: jal   0x101c908 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -1686,12 +1686,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048f9c: 0x1048f9c: jal   0x101c8f8 addu  a0, s2, zero
+// 0x01048fac: 0x1048fac: jal   0x101c908 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1699,12 +1699,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048fa4: 0x1048fa4: jal   0x101c8f8 addu  a0, s0, zero
+// 0x01048fb4: 0x1048fb4: jal   0x101c908 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1712,12 +1712,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048fac: 0x1048fac: lw    v0, 88(sp)
+// 0x01048fbc: 0x1048fbc: lw    v0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1726,7 +1726,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01048fb0: 0x1048fb0: jal   0x101c8f8 addu  a0, v0, zero
+// 0x01048fc0: 0x1048fc0: jal   0x101c908 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -1734,13 +1734,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01048fb8: 0x1048fb8: lw    ra, 116(sp)
-// 0x01048fbc: 0x1048fbc: lw    s4, 112(sp)
+// 0x01048fc8: 0x1048fc8: lw    ra, 116(sp)
+// 0x01048fcc: 0x1048fcc: lw    s4, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1749,7 +1749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01048fc0: 0x1048fc0: lw    s3, 108(sp)
+// 0x01048fd0: 0x1048fd0: lw    s3, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1758,7 +1758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01048fc4: 0x1048fc4: lw    s2, 104(sp)
+// 0x01048fd4: 0x1048fd4: lw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1767,7 +1767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01048fc8: 0x1048fc8: lw    s1, 100(sp)
+// 0x01048fd8: 0x1048fd8: lw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1776,7 +1776,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01048fcc: 0x1048fcc: lw    s0, 96(sp)
+// 0x01048fdc: 0x1048fdc: lw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1785,7 +1785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01048fd0: 0x1048fd0: jr    ra addiu sp, sp, 120
+// 0x01048fe0: 0x1048fe0: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
@@ -1797,7 +1797,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 create_reminder_dlg_1048fd8(int32,int32,int32,int32,int32)
+.method public static int32 create_reminder_dlg_1048fe8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -1841,12 +1841,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01048fd8: 0x1048fd8: addiu sp, sp, -48
+// 0x01048fe8: 0x1048fe8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01048fdc: 0x1048fdc: sw    s1, 36(sp)
+// 0x01048fec: 0x1048fec: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1855,35 +1855,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01048fe0: 0x1048fe0: lui   a3, 0x10000
+// 0x01048ff0: 0x1048ff0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01048fe4: 0x1048fe4: lui   s1, 0x10000
+// 0x01048ff4: 0x1048ff4: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01048fe8: 0x1048fe8: lui   a0, 0x10000
+// 0x01048ff8: 0x1048ff8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01048fec: 0x1048fec: ori   a3, a3, 1
+// 0x01048ffc: 0x1048ffc: ori   a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	or
 	stloc 4
-// 0x01048ff0: 0x1048ff0: addiu a1, s1, 18500
+// 0x01049000: 0x1049000: addiu a1, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01048ff4: 0x1048ff4: addiu a0, a0, 1740
+// 0x01049004: 0x1049004: addiu a0, a0, 1736
 	ldloc.1
-	ldc.i4 1740
+	ldc.i4 1736
 	add
 	stloc.1
-// 0x01048ff8: 0x1048ff8: addu  a2, zero, zero
+// 0x01049008: 0x1049008: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01048ffc: 0x1048ffc: sw    ra, 44(sp)
-// 0x01049000: 0x1049000: sw    s2, 40(sp)
+// 0x0104900c: 0x104900c: sw    ra, 44(sp)
+// 0x01049010: 0x1049010: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1892,7 +1892,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01049004: 0x1049004: jal   0x1095a08 sw    s0, 32(sp)
+// 0x01049014: 0x1049014: jal   0x1096050 sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1906,40 +1906,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104900c: 0x104900c: addu  a0, v0, zero
+// 0x0104901c: 0x104901c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049010: 0x1049010: addu  a1, zero, zero
+// 0x01049020: 0x1049020: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01049014: 0x1049014: addu  a2, zero, zero
+// 0x01049024: 0x1049024: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01049018: 0x1049018: jal   0x1098fe0 addu  s2, v0, zero
+// 0x01049028: 0x1049028: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01049020: 0x1049020: lui   a0, 0x10000
+// 0x01049030: 0x1049030: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049024: 0x1049024: addiu a0, a0, 1756
+// 0x01049034: 0x1049034: addiu a0, a0, 1752
 	ldloc.1
-	ldc.i4 1756
+	ldc.i4 1752
 	add
 	stloc.1
-// 0x01049028: 0x1049028: addiu a2, zero, 1
+// 0x01049038: 0x1049038: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0104902c: 0x104902c: jal   0x109e13c addu  a1, a0, zero
+// 0x0104903c: 0x104903c: jal   0x109e784 addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -1947,50 +1947,50 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049034: 0x1049034: addu  a1, v0, zero
+// 0x01049044: 0x1049044: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01049038: 0x1049038: addu  a0, s2, zero
+// 0x01049048: 0x1049048: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0104903c: 0x104903c: jal   0x1098ec4 addu  s0, v0, zero
+// 0x0104904c: 0x104904c: jal   0x109950c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049044: 0x1049044: lui   a0, 0x10000
+// 0x01049054: 0x1049054: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049048: 0x1049048: addiu a1, s1, 18500
+// 0x01049058: 0x1049058: addiu a1, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104904c: 0x104904c: addiu a3, zero, 60
+// 0x0104905c: 0x104905c: addiu a3, zero, 60
 	ldc.i4.s 60
 	stloc 4
-// 0x01049050: 0x1049050: addiu a0, a0, 1764
+// 0x01049060: 0x1049060: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x01049054: 0x1049054: addiu a2, zero, 10
+// 0x01049064: 0x1049064: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x01049058: 0x1049058: addiu v0, zero, 8
+// 0x01049068: 0x1049068: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0104905c: 0x104905c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0104906c: 0x104906c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2004,21 +2004,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049064: 0x1049064: addu  a0, v0, zero
+// 0x01049074: 0x1049074: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049068: 0x1049068: addu  a2, zero, zero
+// 0x01049078: 0x1049078: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104906c: 0x104906c: addu  a1, zero, zero
+// 0x0104907c: 0x104907c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01049070: 0x1049070: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01049080: 0x1049080: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2030,9 +2030,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01049078: 0x1049078: lw    v0, 24(sp)
+// 0x01049088: 0x1049088: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2041,24 +2041,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104907c: 0x104907c: addu  a0, s0, zero
+// 0x0104908c: 0x104908c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01049080: 0x1049080: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01049090: 0x1049090: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049088: 0x1049088: lw    ra, 44(sp)
-// 0x0104908c: 0x104908c: addu  v0, s0, zero
+// 0x01049098: 0x1049098: lw    ra, 44(sp)
+// 0x0104909c: 0x104909c: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01049090: 0x1049090: lw    s2, 40(sp)
+// 0x010490a0: 0x10490a0: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2067,7 +2067,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01049094: 0x1049094: lw    s1, 36(sp)
+// 0x010490a4: 0x10490a4: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2076,7 +2076,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01049098: 0x1049098: lw    s0, 32(sp)
+// 0x010490a8: 0x10490a8: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2085,7 +2085,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104909c: 0x104909c: jr    ra addiu sp, sp, 48
+// 0x010490ac: 0x10490ac: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2097,7 +2097,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 get_id_10490a4(int32,int32,int32,int32,int32)
+.method public static int32 get_id_10490b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2132,13 +2132,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010490a4: 0x10490a4: addiu sp, sp, -24
+// 0x010490b4: 0x10490b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010490a8: 0x10490a8: sw    ra, 20(sp)
-// 0x010490ac: 0x10490ac: jal   0x1001ba8 sll   zero, zero, 0
+// 0x010490b8: 0x10490b8: sw    ra, 20(sp)
+// 0x010490bc: 0x10490bc: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2149,15 +2149,15 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010490b4: 0x10490b4: lui   a1, 0x20000
+// 0x010490c4: 0x10490c4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010490b8: 0x10490b8: addu  a0, v0, zero
+// 0x010490c8: 0x10490c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010490bc: 0x10490bc: jal   0x1001984 addiu a1, a1, -24304
+// 0x010490cc: 0x10490cc: jal   0x1001984 addiu a1, a1, -23840
 	ldloc.2
-	ldc.i4 -24304
+	ldc.i4 -23840
 	add
 	stloc.2
 	ldloc.0
@@ -2170,16 +2170,16 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010490c4: 0x10490c4: addu  a0, v0, zero
+// 0x010490d4: 0x10490d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010490c8: 0x10490c8: beq   a0, zero, 0x10490d8 addiu v0, zero, -1
+// 0x010490d8: 0x10490d8: beq   a0, zero, 0x10490e8 addiu v0, zero, -1
 	ldloc.1
 	ldc.i4.m1
 	stloc 5
-	brfalse L_10490d8
+	brfalse L_10490e8
 // --- basic block ---
-// 0x010490d0: 0x10490d0: jal   0x1000d8c sll   zero, zero, 0
+// 0x010490e0: 0x10490e0: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2190,10 +2190,10 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10490d8:
-// 0x010490d8: 0x10490d8: lw    ra, 20(sp)
-// 0x010490dc: 0x10490dc: sll   zero, zero, 0
-// 0x010490e0: 0x10490e0: jr    ra addiu sp, sp, 24
+L_10490e8:
+// 0x010490e8: 0x10490e8: lw    ra, 20(sp)
+// 0x010490ec: 0x10490ec: sll   zero, zero, 0
+// 0x010490f0: 0x10490f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2205,7 +2205,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 show_reminder_dlg_10490e8(int32,int32,int32,int32,int32)
+.method public static int32 show_reminder_dlg_10490f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2240,21 +2240,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010490e8: 0x10490e8: lui   a0, 0x10000
+// 0x010490f8: 0x10490f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010490ec: 0x10490ec: addiu sp, sp, -24
+// 0x010490fc: 0x10490fc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010490f0: 0x10490f0: addiu a0, a0, 1740
+// 0x01049100: 0x1049100: addiu a0, a0, 1736
 	ldloc.1
-	ldc.i4 1740
+	ldc.i4 1736
 	add
 	stloc.1
-// 0x010490f4: 0x10490f4: sw    ra, 20(sp)
-// 0x010490f8: 0x10490f8: jal   0x1095eec addu  a1, zero, zero
+// 0x01049104: 0x1049104: sw    ra, 20(sp)
+// 0x01049108: 0x1049108: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2262,41 +2262,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049100: 0x1049100: jal   0x102146c sll   zero, zero, 0
+// 0x01049110: 0x1049110: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049108: 0x1049108: bne   v0, zero, 0x1049118 sll   zero, zero, 0
+// 0x01049118: 0x1049118: bne   v0, zero, 0x1049128 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1049118
+	brtrue L_1049128
 // --- basic block ---
-// 0x01049110: 0x1049110: jal   0x1021900 sll   zero, zero, 0
+// 0x01049120: 0x1049120: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1049118:
-// 0x01049118: 0x1049118: lw    ra, 20(sp)
-// 0x0104911c: 0x104911c: sll   zero, zero, 0
-// 0x01049120: 0x1049120: jr    ra addiu sp, sp, 24
+L_1049128:
+// 0x01049128: 0x1049128: lw    ra, 20(sp)
+// 0x0104912c: 0x104912c: sll   zero, zero, 0
+// 0x01049130: 0x1049130: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2308,7 +2308,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnReminderShortClick_1049128(int32,int32,int32,int32,int32)
+.method public static int32 OnReminderShortClick_1049138(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s4,int32 s7,int32 s5,int32 s6,int32 s3,int32 ra,int32 lo)
@@ -2370,12 +2370,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01049128: 0x1049128: addiu sp, sp, -712
+// 0x01049138: 0x1049138: addiu sp, sp, -712
 	ldloc.0
 	ldc.i4 -712
 	add
 	stloc.0
-// 0x0104912c: 0x104912c: sw    s1, 680(sp)
+// 0x0104913c: 0x104913c: sw    s1, 680(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2384,8 +2384,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01049130: 0x1049130: sw    ra, 708(sp)
-// 0x01049134: 0x1049134: sw    s7, 704(sp)
+// 0x01049140: 0x1049140: sw    ra, 708(sp)
+// 0x01049144: 0x1049144: sw    s7, 704(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2394,7 +2394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01049138: 0x1049138: sw    s6, 700(sp)
+// 0x01049148: 0x1049148: sw    s6, 700(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2403,7 +2403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104913c: 0x104913c: sw    s5, 696(sp)
+// 0x0104914c: 0x104914c: sw    s5, 696(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2412,7 +2412,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01049140: 0x1049140: sw    s4, 692(sp)
+// 0x01049150: 0x1049150: sw    s4, 692(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2421,7 +2421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01049144: 0x1049144: sw    s3, 688(sp)
+// 0x01049154: 0x1049154: sw    s3, 688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2430,7 +2430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01049148: 0x1049148: sw    s2, 684(sp)
+// 0x01049158: 0x1049158: sw    s2, 684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2439,7 +2439,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104914c: 0x104914c: sw    s0, 676(sp)
+// 0x0104915c: 0x104915c: sw    s0, 676(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2448,7 +2448,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01049150: 0x1049150: lw    s1, 744(sp)
+// 0x01049160: 0x1049160: lw    s1, 744(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2457,29 +2457,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01049154: 0x1049154: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x01049164: 0x1049164: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0104915c: 0x104915c: beq   v0, zero, 0x104918c sll   zero, zero, 0
+// 0x0104916c: 0x104916c: beq   v0, zero, 0x104919c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104918c
+	brfalse L_104919c
 // --- basic block ---
-// 0x01049164: 0x1049164: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x01049174: 0x1049174: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104916c: 0x104916c: lui   a1, 0x10000
+// 0x0104917c: 0x104917c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01049170: 0x1049170: addu  a0, v0, zero
+// 0x01049180: 0x1049180: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049174: 0x1049174: jal   0x1001b14 addiu a1, a1, 1740
+// 0x01049184: 0x1049184: jal   0x1001b14 addiu a1, a1, 1736
 	ldloc.2
-	ldc.i4 1740
+	ldc.i4 1736
 	add
 	stloc.2
 	ldloc.1
@@ -2487,11 +2487,11 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104917c: 0x104917c: bne   v0, zero, 0x104918c sll   zero, zero, 0
+// 0x0104918c: 0x104918c: bne   v0, zero, 0x104919c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104918c
+	brtrue L_104919c
 // --- basic block ---
-// 0x01049184: 0x1049184: jal   0x1094b64 addu  a0, zero, zero
+// 0x01049194: 0x1049194: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2499,27 +2499,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104918c:
-// 0x0104918c: 0x104918c: jal   0x1048fd8 sll   zero, zero, 0
+L_104919c:
+// 0x0104919c: 0x104919c: jal   0x1048fe8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::create_reminder_dlg_1048fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::create_reminder_dlg_1048fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049194: 0x1049194: addu  a0, s1, zero
+// 0x010491a4: 0x10491a4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01049198: 0x1049198: jal   0x10490a4 addu  s3, v0, zero
+// 0x010491a8: 0x10491a8: jal   0x10490b4 addu  s3, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -2527,41 +2527,41 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::get_id_10490a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::get_id_10490b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010491a0: 0x10491a0: addiu v1, zero, -1
+// 0x010491b0: 0x10491b0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010491a4: 0x10491a4: beq   v0, v1, 0x10493d0 lui   s4, 0x10000
+// 0x010491b4: 0x10491b4: beq   v0, v1, 0x10493e0 lui   s4, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc 11
-	beq  L_10493d0
+	beq  L_10493e0
 // --- basic block ---
-// 0x010491ac: 0x10491ac: lui   a0, 0x10000
+// 0x010491bc: 0x10491bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010491b0: 0x10491b0: addiu a3, zero, -1
+// 0x010491c0: 0x10491c0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010491b4: 0x10491b4: addiu a1, s4, 18500
+// 0x010491c4: 0x10491c4: addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010491b8: 0x10491b8: addiu a0, a0, 1772
+// 0x010491c8: 0x10491c8: addiu a0, a0, 1768
 	ldloc.1
-	ldc.i4 1772
+	ldc.i4 1768
 	add
 	stloc.1
-// 0x010491bc: 0x10491bc: addiu a2, zero, -1
+// 0x010491cc: 0x10491cc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010491c0: 0x10491c0: jal   0x1093a24 sw    zero, 16(sp)
+// 0x010491d0: 0x10491d0: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2575,29 +2575,29 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010491c8: 0x10491c8: addu  a0, v0, zero
+// 0x010491d8: 0x10491d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010491cc: 0x10491cc: addu  a1, zero, zero
+// 0x010491dc: 0x10491dc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010491d0: 0x10491d0: addu  a2, zero, zero
+// 0x010491e0: 0x10491e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010491d4: 0x10491d4: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010491e4: 0x10491e4: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010491dc: 0x10491dc: jal   0x10490a4 addu  a0, s1, zero
+// 0x010491ec: 0x10491ec: jal   0x10490b4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2605,53 +2605,53 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::get_id_10490a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::get_id_10490b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010491e4: 0x10491e4: addiu v1, zero, 388
+// 0x010491f4: 0x10491f4: addiu v1, zero, 388
 	ldc.i4 388
 	stloc 6
-// 0x010491e8: 0x10491e8: mult  v0, v1
+// 0x010491f8: 0x10491f8: mult  v0, v1
 	ldloc 5
 	ldloc 6
 	mul
 	stloc 17
-// 0x010491ec: 0x10491ec: lui   a1, 0x60000
+// 0x010491fc: 0x10491fc: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010491f0: 0x10491f0: addiu a1, a1, 20416
+// 0x01049200: 0x1049200: addiu a1, a1, 20880
 	ldloc.2
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc.2
-// 0x010491f4: 0x10491f4: addiu a0, sp, 276
+// 0x01049204: 0x1049204: addiu a0, sp, 276
 	ldloc.0
 	ldc.i4 276
 	add
 	stloc.1
-// 0x010491f8: 0x10491f8: addiu a2, zero, 388
+// 0x01049208: 0x1049208: addiu a2, zero, 388
 	ldc.i4 388
 	stloc.3
-// 0x010491fc: 0x10491fc: lui   s1, 0x10000
+// 0x0104920c: 0x104920c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01049200: 0x1049200: lui   s6, 0x10000
+// 0x01049210: 0x1049210: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x01049204: 0x1049204: addiu s5, zero, 8
+// 0x01049214: 0x1049214: addiu s5, zero, 8
 	ldc.i4.8
 	stloc 13
-// 0x01049208: 0x1049208: addiu s2, sp, 24
+// 0x01049218: 0x1049218: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x0104920c: 0x104920c: mflo  lo
+// 0x0104921c: 0x104921c: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x01049210: 0x1049210: jal   0x1001800 addu  a1, a1, v0
+// 0x01049220: 0x1049220: jal   0x1001800 addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
@@ -2665,21 +2665,21 @@ L_104918c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049218: 0x1049218: lui   a0, 0x10000
+// 0x01049228: 0x1049228: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104921c: 0x104921c: addiu a3, zero, 8
+// 0x0104922c: 0x104922c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01049220: 0x1049220: addiu a2, zero, 22
+// 0x01049230: 0x1049230: addiu a2, zero, 22
 	ldc.i4.s 22
 	stloc.3
-// 0x01049224: 0x1049224: addiu a0, a0, 1788
+// 0x01049234: 0x1049234: addiu a0, a0, 1784
 	ldloc.1
-	ldc.i4 1788
+	ldc.i4 1784
 	add
 	stloc.1
-// 0x01049228: 0x1049228: jal   0x1098d10 addiu a1, sp, 288
+// 0x01049238: 0x1049238: jal   0x1099358 addiu a1, sp, 288
 	ldloc.0
 	ldc.i4 288
 	add
@@ -2689,33 +2689,33 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049230: 0x1049230: addu  s7, v0, zero
+// 0x01049240: 0x1049240: addu  s7, v0, zero
 	ldloc 5
 	stloc 12
-// 0x01049234: 0x1049234: addu  a0, v0, zero
+// 0x01049244: 0x1049244: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049238: 0x1049238: jal   0x1097af8 addiu a1, s1, 1804
+// 0x01049248: 0x1049248: jal   0x1098140 addiu a1, s1, 1800
 	ldloc 9
-	ldc.i4 1804
+	ldc.i4 1800
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01049240: 0x1049240: addu  a0, s7, zero
+// 0x01049250: 0x1049250: addu  a0, s7, zero
 	ldloc 12
 	stloc.1
-// 0x01049244: 0x1049244: addu  a2, zero, zero
+// 0x01049254: 0x1049254: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01049248: 0x1049248: jal   0x1098f84 addiu a1, zero, 25
+// 0x01049258: 0x1049258: jal   0x10995cc addiu a1, zero, 25
 	ldc.i4.s 25
 	stloc.2
 	ldloc.0
@@ -2723,41 +2723,41 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049250: 0x1049250: addu  a1, s7, zero
+// 0x01049260: 0x1049260: addu  a1, s7, zero
 	ldloc 12
 	stloc.2
-// 0x01049254: 0x1049254: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01049264: 0x1049264: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104925c: 0x104925c: addiu a3, zero, 10
+// 0x0104926c: 0x104926c: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x01049260: 0x1049260: addiu a1, s4, 18500
+// 0x01049270: 0x1049270: addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01049264: 0x1049264: addiu a0, s6, 1764
+// 0x01049274: 0x1049274: addiu a0, s6, 1760
 	ldloc 14
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x01049268: 0x1049268: addiu a2, zero, -1
+// 0x01049278: 0x1049278: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104926c: 0x104926c: jal   0x1093a24 sw    s5, 16(sp)
+// 0x0104927c: 0x104927c: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2771,21 +2771,21 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049274: 0x1049274: addu  a0, v0, zero
+// 0x01049284: 0x1049284: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049278: 0x1049278: addu  a2, zero, zero
+// 0x01049288: 0x1049288: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104927c: 0x104927c: addu  a1, zero, zero
+// 0x0104928c: 0x104928c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01049280: 0x1049280: jal   0x1098fe0 sw    v0, 664(sp)
+// 0x01049290: 0x1049290: jal   0x1099628 sw    v0, 664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2797,9 +2797,9 @@ L_104918c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01049288: 0x1049288: lw    v0, 664(sp)
+// 0x01049298: 0x1049298: lw    v0, 664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2808,34 +2808,34 @@ L_104918c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104928c: 0x104928c: addu  a0, s0, zero
+// 0x0104929c: 0x104929c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01049290: 0x1049290: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010492a0: 0x10492a0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049298: 0x1049298: lui   a0, 0x10000
+// 0x010492a8: 0x10492a8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104929c: 0x104929c: addiu a3, zero, 8
+// 0x010492ac: 0x10492ac: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010492a0: 0x10492a0: addiu a2, zero, 18
+// 0x010492b0: 0x10492b0: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x010492a4: 0x10492a4: addiu a0, a0, 1812
+// 0x010492b4: 0x10492b4: addiu a0, a0, 1808
 	ldloc.1
-	ldc.i4 1812
+	ldc.i4 1808
 	add
 	stloc.1
-// 0x010492a8: 0x10492a8: jal   0x1098d10 addiu a1, sp, 388
+// 0x010492b8: 0x10492b8: jal   0x1099358 addiu a1, sp, 388
 	ldloc.0
 	ldc.i4 388
 	add
@@ -2845,33 +2845,33 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010492b0: 0x10492b0: addu  s7, v0, zero
+// 0x010492c0: 0x10492c0: addu  s7, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010492b4: 0x10492b4: addu  a0, v0, zero
+// 0x010492c4: 0x10492c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010492b8: 0x10492b8: jal   0x1097af8 addiu a1, s1, 1804
+// 0x010492c8: 0x10492c8: jal   0x1098140 addiu a1, s1, 1800
 	ldloc 9
-	ldc.i4 1804
+	ldc.i4 1800
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010492c0: 0x10492c0: addu  a2, zero, zero
+// 0x010492d0: 0x10492d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010492c4: 0x10492c4: addu  a0, s7, zero
+// 0x010492d4: 0x10492d4: addu  a0, s7, zero
 	ldloc 12
 	stloc.1
-// 0x010492c8: 0x10492c8: jal   0x1098f84 addiu a1, zero, 30
+// 0x010492d8: 0x10492d8: jal   0x10995cc addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
 	ldloc.0
@@ -2879,41 +2879,41 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010492d0: 0x10492d0: addu  a0, s0, zero
+// 0x010492e0: 0x10492e0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010492d4: 0x10492d4: jal   0x1098ec4 addu  a1, s7, zero
+// 0x010492e4: 0x10492e4: jal   0x109950c addu  a1, s7, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010492dc: 0x10492dc: addiu a3, zero, 10
+// 0x010492ec: 0x10492ec: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010492e0: 0x10492e0: addiu a1, s4, 18500
+// 0x010492f0: 0x10492f0: addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010492e4: 0x10492e4: addiu a0, s6, 1764
+// 0x010492f4: 0x10492f4: addiu a0, s6, 1760
 	ldloc 14
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x010492e8: 0x10492e8: addiu a2, zero, -1
+// 0x010492f8: 0x10492f8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010492ec: 0x10492ec: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010492fc: 0x10492fc: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2927,21 +2927,21 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010492f4: 0x10492f4: addu  a0, v0, zero
+// 0x01049304: 0x1049304: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010492f8: 0x10492f8: addu  a2, zero, zero
+// 0x01049308: 0x1049308: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010492fc: 0x10492fc: addu  a1, zero, zero
+// 0x0104930c: 0x104930c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01049300: 0x1049300: jal   0x1098fe0 sw    v0, 664(sp)
+// 0x01049310: 0x1049310: jal   0x1099628 sw    v0, 664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2953,9 +2953,9 @@ L_104918c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01049308: 0x1049308: lw    v0, 664(sp)
+// 0x01049318: 0x1049318: lw    v0, 664(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2964,20 +2964,20 @@ L_104918c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104930c: 0x104930c: addu  a0, s0, zero
+// 0x0104931c: 0x104931c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01049310: 0x1049310: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01049320: 0x1049320: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049318: 0x1049318: lw    a0, 644(sp)
+// 0x01049328: 0x1049328: lw    a0, 644(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2986,22 +2986,22 @@ L_104918c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104931c: 0x104931c: jal   0x1007e18 sll   zero, zero, 0
+// 0x0104932c: 0x104932c: jal   0x1007e28 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049324: 0x1049324: lui   a0, 0x10000
+// 0x01049334: 0x1049334: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049328: 0x1049328: addiu a0, a0, 1828
+// 0x01049338: 0x1049338: addiu a0, a0, 1824
 	ldloc.1
-	ldc.i4 1828
+	ldc.i4 1824
 	add
 	stloc.1
-// 0x0104932c: 0x104932c: jal   0x101cd60 addu  s6, v0, zero
+// 0x0104933c: 0x104933c: jal   0x101cd70 addu  s6, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -3009,18 +3009,18 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049334: 0x1049334: jal   0x1007d84 addu  s5, v0, zero
+// 0x01049344: 0x1049344: jal   0x1007d94 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0104933c: 0x104933c: jal   0x101cd60 addu  a0, v0, zero
+// 0x0104934c: 0x104934c: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3028,49 +3028,49 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049344: 0x1049344: addu  a0, s6, zero
+// 0x01049354: 0x1049354: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01049348: 0x1049348: jal   0x10c09c0 addu  s4, v0, zero
+// 0x01049358: 0x1049358: jal   0x10c1000 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049350: 0x1049350: lui   a0, 0x20000
+// 0x01049360: 0x1049360: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01049354: 0x1049354: lw    a3, 23740(a0)
+// 0x01049364: 0x1049364: lw    a3, 24204(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5935
+	ldc.i4 6051
 	add
 	ldelem.i4
 	stloc 4
-// 0x01049358: 0x1049358: lw    a2, 23736(a0)
+// 0x01049368: 0x1049368: lw    a2, 24200(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5934
+	ldc.i4 6050
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104935c: 0x104935c: addu  a1, v1, zero
+// 0x0104936c: 0x104936c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01049360: 0x1049360: jal   0x10c0798 addu  a0, v0, zero
+// 0x01049370: 0x1049370: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3078,24 +3078,24 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049368: 0x1049368: addu  a3, v1, zero
+// 0x01049378: 0x1049378: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x0104936c: 0x104936c: addu  a0, s2, zero
+// 0x0104937c: 0x104937c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01049370: 0x1049370: addu  a1, s5, zero
+// 0x01049380: 0x1049380: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x01049374: 0x1049374: addu  a2, v0, zero
+// 0x01049384: 0x1049384: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01049378: 0x1049378: jal   0x1000f64 sw    s4, 16(sp)
+// 0x01049388: 0x1049388: jal   0x1000f64 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3114,21 +3114,21 @@ L_104918c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049380: 0x1049380: lui   a0, 0x10000
+// 0x01049390: 0x1049390: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049384: 0x1049384: addiu a3, zero, 8
+// 0x01049394: 0x1049394: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01049388: 0x1049388: addu  a1, s2, zero
+// 0x01049398: 0x1049398: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0104938c: 0x104938c: addiu a2, zero, 14
+// 0x0104939c: 0x104939c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01049390: 0x1049390: jal   0x1098d10 addiu a0, a0, 1856
+// 0x010493a0: 0x10493a0: jal   0x1099358 addiu a0, a0, 1852
 	ldloc.1
-	ldc.i4 1856
+	ldc.i4 1852
 	add
 	stloc.1
 	ldloc.0
@@ -3136,33 +3136,33 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049398: 0x1049398: addu  s2, v0, zero
+// 0x010493a8: 0x10493a8: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0104939c: 0x104939c: addu  a0, v0, zero
+// 0x010493ac: 0x10493ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010493a0: 0x10493a0: jal   0x1097af8 addiu a1, s1, 1804
+// 0x010493b0: 0x10493b0: jal   0x1098140 addiu a1, s1, 1800
 	ldloc 9
-	ldc.i4 1804
+	ldc.i4 1800
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010493a8: 0x10493a8: addu  a0, s2, zero
+// 0x010493b8: 0x10493b8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010493ac: 0x10493ac: addu  a2, zero, zero
+// 0x010493bc: 0x10493bc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010493b0: 0x10493b0: jal   0x1098f84 addiu a1, zero, 30
+// 0x010493c0: 0x10493c0: jal   0x10995cc addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
 	ldloc.0
@@ -3170,51 +3170,51 @@ L_104918c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010493b8: 0x10493b8: addu  a0, s0, zero
+// 0x010493c8: 0x10493c8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010493bc: 0x10493bc: jal   0x1098ec4 addu  a1, s2, zero
+// 0x010493cc: 0x10493cc: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010493c4: 0x10493c4: addu  a0, s3, zero
+// 0x010493d4: 0x10493d4: addu  a0, s3, zero
 	ldloc 15
 	stloc.1
-// 0x010493c8: 0x10493c8: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010493d8: 0x10493d8: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10493d0:
-// 0x010493d0: 0x10493d0: jal   0x10490e8 sll   zero, zero, 0
+L_10493e0:
+// 0x010493e0: 0x10493e0: jal   0x10490f8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::show_reminder_dlg_10490e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::show_reminder_dlg_10490f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010493d8: 0x10493d8: lw    ra, 708(sp)
-// 0x010493dc: 0x10493dc: lw    s7, 704(sp)
+// 0x010493e8: 0x10493e8: lw    ra, 708(sp)
+// 0x010493ec: 0x10493ec: lw    s7, 704(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3223,7 +3223,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010493e0: 0x10493e0: lw    s6, 700(sp)
+// 0x010493f0: 0x10493f0: lw    s6, 700(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3232,7 +3232,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010493e4: 0x10493e4: lw    s5, 696(sp)
+// 0x010493f4: 0x10493f4: lw    s5, 696(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3241,7 +3241,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010493e8: 0x10493e8: lw    s4, 692(sp)
+// 0x010493f8: 0x10493f8: lw    s4, 692(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3250,7 +3250,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010493ec: 0x10493ec: lw    s3, 688(sp)
+// 0x010493fc: 0x10493fc: lw    s3, 688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3259,7 +3259,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010493f0: 0x10493f0: lw    s2, 684(sp)
+// 0x01049400: 0x1049400: lw    s2, 684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3268,7 +3268,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010493f4: 0x10493f4: lw    s1, 680(sp)
+// 0x01049404: 0x1049404: lw    s1, 680(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3277,7 +3277,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010493f8: 0x10493f8: lw    s0, 676(sp)
+// 0x01049408: 0x1049408: lw    s0, 676(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3286,7 +3286,7 @@ L_10493d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010493fc: 0x10493fc: jr    ra addiu sp, sp, 712
+// 0x0104940c: 0x104940c: jr    ra addiu sp, sp, 712
 	ldloc.0
 	ldc.i4 712
 	add
@@ -3298,7 +3298,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 show_reminder_1049404(int32,int32,int32,int32,int32)
+.method public static int32 show_reminder_1049414(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s4,int32 s7,int32 s5,int32 s6,int32 s3,int32 ra,int32 lo)
@@ -3360,12 +3360,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01049404: 0x1049404: addiu sp, sp, -720
+// 0x01049414: 0x1049414: addiu sp, sp, -720
 	ldloc.0
 	ldc.i4 -720
 	add
 	stloc.0
-// 0x01049408: 0x1049408: sw    s1, 688(sp)
+// 0x01049418: 0x1049418: sw    s1, 688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3374,8 +3374,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104940c: 0x104940c: sw    ra, 716(sp)
-// 0x01049410: 0x1049410: sw    s7, 712(sp)
+// 0x0104941c: 0x104941c: sw    ra, 716(sp)
+// 0x01049420: 0x1049420: sw    s7, 712(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3384,7 +3384,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01049414: 0x1049414: sw    s6, 708(sp)
+// 0x01049424: 0x1049424: sw    s6, 708(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3393,7 +3393,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01049418: 0x1049418: sw    s5, 704(sp)
+// 0x01049428: 0x1049428: sw    s5, 704(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3402,7 +3402,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104941c: 0x104941c: sw    s4, 700(sp)
+// 0x0104942c: 0x104942c: sw    s4, 700(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3411,7 +3411,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01049420: 0x1049420: sw    s3, 696(sp)
+// 0x01049430: 0x1049430: sw    s3, 696(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3420,7 +3420,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01049424: 0x1049424: sw    s2, 692(sp)
+// 0x01049434: 0x1049434: sw    s2, 692(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3429,7 +3429,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01049428: 0x1049428: sw    s0, 684(sp)
+// 0x01049438: 0x1049438: sw    s0, 684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3438,31 +3438,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104942c: 0x104942c: jal   0x1093f90 addu  s1, a0, zero
+// 0x0104943c: 0x104943c: jal   0x10945b4 addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x01049434: 0x1049434: beq   v0, zero, 0x1049464 sll   zero, zero, 0
+// 0x01049444: 0x1049444: beq   v0, zero, 0x1049474 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1049464
+	brfalse L_1049474
 // --- basic block ---
-// 0x0104943c: 0x104943c: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0104944c: 0x104944c: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049444: 0x1049444: lui   a1, 0x10000
+// 0x01049454: 0x1049454: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01049448: 0x1049448: addu  a0, v0, zero
+// 0x01049458: 0x1049458: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104944c: 0x104944c: jal   0x1001b14 addiu a1, a1, 1740
+// 0x0104945c: 0x104945c: jal   0x1001b14 addiu a1, a1, 1736
 	ldloc.2
-	ldc.i4 1740
+	ldc.i4 1736
 	add
 	stloc.2
 	ldloc.1
@@ -3470,11 +3470,11 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01049454: 0x1049454: bne   v0, zero, 0x1049464 sll   zero, zero, 0
+// 0x01049464: 0x1049464: bne   v0, zero, 0x1049474 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1049464
+	brtrue L_1049474
 // --- basic block ---
-// 0x0104945c: 0x104945c: jal   0x1094b64 addu  a0, zero, zero
+// 0x0104946c: 0x104946c: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3482,56 +3482,56 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1049464:
-// 0x01049464: 0x1049464: jal   0x1048fd8 sll   zero, zero, 0
+L_1049474:
+// 0x01049474: 0x1049474: jal   0x1048fe8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::create_reminder_dlg_1048fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::create_reminder_dlg_1048fe8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104946c: 0x104946c: addu  s3, v0, zero
+// 0x0104947c: 0x104947c: addu  s3, v0, zero
 	ldloc 5
 	stloc 15
-// 0x01049470: 0x1049470: addiu v0, zero, -1
+// 0x01049480: 0x1049480: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01049474: 0x1049474: beq   s1, v0, 0x10496a0 lui   s4, 0x10000
+// 0x01049484: 0x1049484: beq   s1, v0, 0x10496b0 lui   s4, 0x10000
 	ldloc 9
 	ldloc 5
 	ldc.i4 65536
 	stloc 11
-	beq  L_10496a0
+	beq  L_10496b0
 // --- basic block ---
-// 0x0104947c: 0x104947c: lui   a0, 0x10000
+// 0x0104948c: 0x104948c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049480: 0x1049480: addiu a3, zero, -1
+// 0x01049490: 0x1049490: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01049484: 0x1049484: addiu a1, s4, 18500
+// 0x01049494: 0x1049494: addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01049488: 0x1049488: addiu a0, a0, 1772
+// 0x01049498: 0x1049498: addiu a0, a0, 1768
 	ldloc.1
-	ldc.i4 1772
+	ldc.i4 1768
 	add
 	stloc.1
-// 0x0104948c: 0x104948c: addiu a2, zero, -1
+// 0x0104949c: 0x104949c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01049490: 0x1049490: jal   0x1093a24 sw    zero, 16(sp)
+// 0x010494a0: 0x10494a0: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3545,70 +3545,70 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049498: 0x1049498: addu  a0, v0, zero
+// 0x010494a8: 0x10494a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104949c: 0x104949c: addu  a1, zero, zero
+// 0x010494ac: 0x10494ac: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010494a0: 0x10494a0: addu  a2, zero, zero
+// 0x010494b0: 0x10494b0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010494a4: 0x10494a4: jal   0x1098fe0 addu  s0, v0, zero
+// 0x010494b4: 0x10494b4: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010494ac: 0x10494ac: addiu v0, zero, 388
+// 0x010494bc: 0x10494bc: addiu v0, zero, 388
 	ldc.i4 388
 	stloc 5
-// 0x010494b0: 0x10494b0: mult  s1, v0
+// 0x010494c0: 0x10494c0: mult  s1, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 17
-// 0x010494b4: 0x10494b4: lui   a1, 0x60000
+// 0x010494c4: 0x10494c4: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x010494b8: 0x10494b8: addiu a1, a1, 20416
+// 0x010494c8: 0x10494c8: addiu a1, a1, 20880
 	ldloc.2
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc.2
-// 0x010494bc: 0x10494bc: addiu a0, sp, 284
+// 0x010494cc: 0x10494cc: addiu a0, sp, 284
 	ldloc.0
 	ldc.i4 284
 	add
 	stloc.1
-// 0x010494c0: 0x10494c0: addiu a2, zero, 388
+// 0x010494d0: 0x10494d0: addiu a2, zero, 388
 	ldc.i4 388
 	stloc.3
-// 0x010494c4: 0x10494c4: lui   s1, 0x10000
+// 0x010494d4: 0x10494d4: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010494c8: 0x10494c8: lui   s6, 0x10000
+// 0x010494d8: 0x10494d8: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010494cc: 0x10494cc: addiu s5, zero, 8
+// 0x010494dc: 0x10494dc: addiu s5, zero, 8
 	ldc.i4.8
 	stloc 13
-// 0x010494d0: 0x10494d0: addiu s2, sp, 32
+// 0x010494e0: 0x10494e0: addiu s2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x010494d4: 0x10494d4: mflo  lo
+// 0x010494e4: 0x10494e4: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x010494d8: 0x10494d8: jal   0x1001800 addu  a1, a1, v0
+// 0x010494e8: 0x10494e8: jal   0x1001800 addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
@@ -3622,21 +3622,21 @@ L_1049464:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010494e0: 0x10494e0: lui   a0, 0x10000
+// 0x010494f0: 0x10494f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010494e4: 0x10494e4: addiu a3, zero, 8
+// 0x010494f4: 0x10494f4: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x010494e8: 0x10494e8: addiu a2, zero, 22
+// 0x010494f8: 0x10494f8: addiu a2, zero, 22
 	ldc.i4.s 22
 	stloc.3
-// 0x010494ec: 0x10494ec: addiu a0, a0, 1788
+// 0x010494fc: 0x10494fc: addiu a0, a0, 1784
 	ldloc.1
-	ldc.i4 1788
+	ldc.i4 1784
 	add
 	stloc.1
-// 0x010494f0: 0x10494f0: jal   0x1098d10 addiu a1, sp, 296
+// 0x01049500: 0x1049500: jal   0x1099358 addiu a1, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
@@ -3646,33 +3646,33 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010494f8: 0x10494f8: addu  s7, v0, zero
+// 0x01049508: 0x1049508: addu  s7, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010494fc: 0x10494fc: addu  a0, v0, zero
+// 0x0104950c: 0x104950c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049500: 0x1049500: jal   0x1097af8 addiu a1, s1, 1804
+// 0x01049510: 0x1049510: jal   0x1098140 addiu a1, s1, 1800
 	ldloc 9
-	ldc.i4 1804
+	ldc.i4 1800
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01049508: 0x1049508: addu  a0, s7, zero
+// 0x01049518: 0x1049518: addu  a0, s7, zero
 	ldloc 12
 	stloc.1
-// 0x0104950c: 0x104950c: addu  a2, zero, zero
+// 0x0104951c: 0x104951c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01049510: 0x1049510: jal   0x1098f84 addiu a1, zero, 25
+// 0x01049520: 0x1049520: jal   0x10995cc addiu a1, zero, 25
 	ldc.i4.s 25
 	stloc.2
 	ldloc.0
@@ -3680,41 +3680,41 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049518: 0x1049518: addu  a1, s7, zero
+// 0x01049528: 0x1049528: addu  a1, s7, zero
 	ldloc 12
 	stloc.2
-// 0x0104951c: 0x104951c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0104952c: 0x104952c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049524: 0x1049524: addiu a3, zero, 10
+// 0x01049534: 0x1049534: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x01049528: 0x1049528: addiu a1, s4, 18500
+// 0x01049538: 0x1049538: addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104952c: 0x104952c: addiu a0, s6, 1764
+// 0x0104953c: 0x104953c: addiu a0, s6, 1760
 	ldloc 14
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x01049530: 0x1049530: addiu a2, zero, -1
+// 0x01049540: 0x1049540: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01049534: 0x1049534: jal   0x1093a24 sw    s5, 16(sp)
+// 0x01049544: 0x1049544: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3728,21 +3728,21 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104953c: 0x104953c: addu  a0, v0, zero
+// 0x0104954c: 0x104954c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049540: 0x1049540: addu  a2, zero, zero
+// 0x01049550: 0x1049550: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01049544: 0x1049544: addu  a1, zero, zero
+// 0x01049554: 0x1049554: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01049548: 0x1049548: jal   0x1098fe0 sw    v0, 672(sp)
+// 0x01049558: 0x1049558: jal   0x1099628 sw    v0, 672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3754,9 +3754,9 @@ L_1049464:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01049550: 0x1049550: lw    v0, 672(sp)
+// 0x01049560: 0x1049560: lw    v0, 672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3765,34 +3765,34 @@ L_1049464:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01049554: 0x1049554: addu  a0, s0, zero
+// 0x01049564: 0x1049564: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01049558: 0x1049558: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01049568: 0x1049568: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049560: 0x1049560: lui   a0, 0x10000
+// 0x01049570: 0x1049570: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049564: 0x1049564: addiu a3, zero, 8
+// 0x01049574: 0x1049574: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01049568: 0x1049568: addiu a2, zero, 18
+// 0x01049578: 0x1049578: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0104956c: 0x104956c: addiu a0, a0, 1812
+// 0x0104957c: 0x104957c: addiu a0, a0, 1808
 	ldloc.1
-	ldc.i4 1812
+	ldc.i4 1808
 	add
 	stloc.1
-// 0x01049570: 0x1049570: jal   0x1098d10 addiu a1, sp, 396
+// 0x01049580: 0x1049580: jal   0x1099358 addiu a1, sp, 396
 	ldloc.0
 	ldc.i4 396
 	add
@@ -3802,33 +3802,33 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049578: 0x1049578: addu  s7, v0, zero
+// 0x01049588: 0x1049588: addu  s7, v0, zero
 	ldloc 5
 	stloc 12
-// 0x0104957c: 0x104957c: addu  a0, v0, zero
+// 0x0104958c: 0x104958c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049580: 0x1049580: jal   0x1097af8 addiu a1, s1, 1804
+// 0x01049590: 0x1049590: jal   0x1098140 addiu a1, s1, 1800
 	ldloc 9
-	ldc.i4 1804
+	ldc.i4 1800
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01049588: 0x1049588: addu  a2, zero, zero
+// 0x01049598: 0x1049598: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104958c: 0x104958c: addu  a0, s7, zero
+// 0x0104959c: 0x104959c: addu  a0, s7, zero
 	ldloc 12
 	stloc.1
-// 0x01049590: 0x1049590: jal   0x1098f84 addiu a1, zero, 30
+// 0x010495a0: 0x10495a0: jal   0x10995cc addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
 	ldloc.0
@@ -3836,41 +3836,41 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049598: 0x1049598: addu  a0, s0, zero
+// 0x010495a8: 0x10495a8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0104959c: 0x104959c: jal   0x1098ec4 addu  a1, s7, zero
+// 0x010495ac: 0x10495ac: jal   0x109950c addu  a1, s7, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010495a4: 0x10495a4: addiu a3, zero, 10
+// 0x010495b4: 0x10495b4: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010495a8: 0x10495a8: addiu a1, s4, 18500
+// 0x010495b8: 0x10495b8: addiu a1, s4, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010495ac: 0x10495ac: addiu a0, s6, 1764
+// 0x010495bc: 0x10495bc: addiu a0, s6, 1760
 	ldloc 14
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x010495b0: 0x10495b0: addiu a2, zero, -1
+// 0x010495c0: 0x10495c0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010495b4: 0x10495b4: jal   0x1093a24 sw    s5, 16(sp)
+// 0x010495c4: 0x10495c4: jal   0x1094048 sw    s5, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3884,21 +3884,21 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010495bc: 0x10495bc: addu  a0, v0, zero
+// 0x010495cc: 0x10495cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010495c0: 0x10495c0: addu  a2, zero, zero
+// 0x010495d0: 0x10495d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010495c4: 0x10495c4: addu  a1, zero, zero
+// 0x010495d4: 0x10495d4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010495c8: 0x10495c8: jal   0x1098fe0 sw    v0, 672(sp)
+// 0x010495d8: 0x10495d8: jal   0x1099628 sw    v0, 672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3910,9 +3910,9 @@ L_1049464:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010495d0: 0x10495d0: lw    v0, 672(sp)
+// 0x010495e0: 0x10495e0: lw    v0, 672(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3921,20 +3921,20 @@ L_1049464:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010495d4: 0x10495d4: addu  a0, s0, zero
+// 0x010495e4: 0x10495e4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010495d8: 0x10495d8: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010495e8: 0x10495e8: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010495e0: 0x10495e0: lw    a0, 652(sp)
+// 0x010495f0: 0x10495f0: lw    a0, 652(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3943,22 +3943,22 @@ L_1049464:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010495e4: 0x10495e4: jal   0x1007e18 sll   zero, zero, 0
+// 0x010495f4: 0x10495f4: jal   0x1007e28 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010495ec: 0x10495ec: lui   a0, 0x10000
+// 0x010495fc: 0x10495fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010495f0: 0x10495f0: addiu a0, a0, -25532
+// 0x01049600: 0x1049600: addiu a0, a0, -25532
 	ldloc.1
 	ldc.i4 -25532
 	add
 	stloc.1
-// 0x010495f4: 0x10495f4: jal   0x101cd60 addu  s6, v0, zero
+// 0x01049604: 0x1049604: jal   0x101cd70 addu  s6, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -3966,18 +3966,18 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010495fc: 0x10495fc: jal   0x1007d84 addu  s5, v0, zero
+// 0x0104960c: 0x104960c: jal   0x1007d94 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x01049604: 0x1049604: jal   0x101cd60 addu  a0, v0, zero
+// 0x01049614: 0x1049614: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3985,49 +3985,49 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104960c: 0x104960c: addu  a0, s6, zero
+// 0x0104961c: 0x104961c: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01049610: 0x1049610: jal   0x10c09c0 addu  s4, v0, zero
+// 0x01049620: 0x1049620: jal   0x10c1000 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049618: 0x1049618: lui   a0, 0x20000
+// 0x01049628: 0x1049628: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0104961c: 0x104961c: lw    a3, 23740(a0)
+// 0x0104962c: 0x104962c: lw    a3, 24204(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5935
+	ldc.i4 6051
 	add
 	ldelem.i4
 	stloc 4
-// 0x01049620: 0x1049620: lw    a2, 23736(a0)
+// 0x01049630: 0x1049630: lw    a2, 24200(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5934
+	ldc.i4 6050
 	add
 	ldelem.i4
 	stloc.3
-// 0x01049624: 0x1049624: addu  a1, v1, zero
+// 0x01049634: 0x1049634: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01049628: 0x1049628: jal   0x10c0798 addu  a0, v0, zero
+// 0x01049638: 0x1049638: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4035,26 +4035,26 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049630: 0x1049630: lui   a1, 0x10000
+// 0x01049640: 0x1049640: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01049634: 0x1049634: addu  a0, s2, zero
+// 0x01049644: 0x1049644: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01049638: 0x1049638: addiu a1, a1, 1872
+// 0x01049648: 0x1049648: addiu a1, a1, 1868
 	ldloc.2
-	ldc.i4 1872
+	ldc.i4 1868
 	add
 	stloc.2
-// 0x0104963c: 0x104963c: addu  a2, s5, zero
+// 0x0104964c: 0x104964c: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x01049640: 0x1049640: sw    v1, 20(sp)
+// 0x01049650: 0x1049650: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4063,7 +4063,7 @@ L_1049464:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01049644: 0x1049644: sw    s4, 24(sp)
+// 0x01049654: 0x1049654: sw    s4, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4072,7 +4072,7 @@ L_1049464:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01049648: 0x1049648: jal   0x1000f64 sw    v0, 16(sp)
+// 0x01049658: 0x1049658: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4091,21 +4091,21 @@ L_1049464:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049650: 0x1049650: lui   a0, 0x10000
+// 0x01049660: 0x1049660: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049654: 0x1049654: addiu a3, zero, 8
+// 0x01049664: 0x1049664: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01049658: 0x1049658: addu  a1, s2, zero
+// 0x01049668: 0x1049668: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0104965c: 0x104965c: addiu a2, zero, 14
+// 0x0104966c: 0x104966c: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01049660: 0x1049660: jal   0x1098d10 addiu a0, a0, 1856
+// 0x01049670: 0x1049670: jal   0x1099358 addiu a0, a0, 1852
 	ldloc.1
-	ldc.i4 1856
+	ldc.i4 1852
 	add
 	stloc.1
 	ldloc.0
@@ -4113,33 +4113,33 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049668: 0x1049668: addu  s2, v0, zero
+// 0x01049678: 0x1049678: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0104966c: 0x104966c: addu  a0, v0, zero
+// 0x0104967c: 0x104967c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049670: 0x1049670: jal   0x1097af8 addiu a1, s1, 1804
+// 0x01049680: 0x1049680: jal   0x1098140 addiu a1, s1, 1800
 	ldloc 9
-	ldc.i4 1804
+	ldc.i4 1800
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01049678: 0x1049678: addu  a0, s2, zero
+// 0x01049688: 0x1049688: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0104967c: 0x104967c: addu  a2, zero, zero
+// 0x0104968c: 0x104968c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01049680: 0x1049680: jal   0x1098f84 addiu a1, zero, 30
+// 0x01049690: 0x1049690: jal   0x10995cc addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
 	ldloc.0
@@ -4147,51 +4147,51 @@ L_1049464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049688: 0x1049688: addu  a0, s0, zero
+// 0x01049698: 0x1049698: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0104968c: 0x104968c: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0104969c: 0x104969c: jal   0x109950c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049694: 0x1049694: addu  a0, s3, zero
+// 0x010496a4: 0x10496a4: addu  a0, s3, zero
 	ldloc 15
 	stloc.1
-// 0x01049698: 0x1049698: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010496a8: 0x10496a8: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10496a0:
-// 0x010496a0: 0x10496a0: jal   0x10490e8 sll   zero, zero, 0
+L_10496b0:
+// 0x010496b0: 0x10496b0: jal   0x10490f8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::show_reminder_dlg_10490e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::show_reminder_dlg_10490f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010496a8: 0x10496a8: lw    ra, 716(sp)
-// 0x010496ac: 0x10496ac: lw    s7, 712(sp)
+// 0x010496b8: 0x10496b8: lw    ra, 716(sp)
+// 0x010496bc: 0x10496bc: lw    s7, 712(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4200,7 +4200,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010496b0: 0x10496b0: lw    s6, 708(sp)
+// 0x010496c0: 0x10496c0: lw    s6, 708(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4209,7 +4209,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010496b4: 0x10496b4: lw    s5, 704(sp)
+// 0x010496c4: 0x10496c4: lw    s5, 704(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4218,7 +4218,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010496b8: 0x10496b8: lw    s4, 700(sp)
+// 0x010496c8: 0x10496c8: lw    s4, 700(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4227,7 +4227,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010496bc: 0x10496bc: lw    s3, 696(sp)
+// 0x010496cc: 0x10496cc: lw    s3, 696(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4236,7 +4236,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010496c0: 0x10496c0: lw    s2, 692(sp)
+// 0x010496d0: 0x10496d0: lw    s2, 692(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4245,7 +4245,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010496c4: 0x10496c4: lw    s1, 688(sp)
+// 0x010496d4: 0x10496d4: lw    s1, 688(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4254,7 +4254,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010496c8: 0x10496c8: lw    s0, 684(sp)
+// 0x010496d8: 0x10496d8: lw    s0, 684(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4263,7 +4263,7 @@ L_10496a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010496cc: 0x10496cc: jr    ra addiu sp, sp, 720
+// 0x010496dc: 0x10496dc: jr    ra addiu sp, sp, 720
 	ldloc.0
 	ldc.i4 720
 	add
@@ -4275,7 +4275,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_reminder_add_entry_10496d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_reminder_add_entry_10496e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s5,int32 lo,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4331,12 +4331,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010496d4: 0x10496d4: addiu sp, sp, -48
+// 0x010496e4: 0x10496e4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010496d8: 0x10496d8: sw    s3, 32(sp)
+// 0x010496e8: 0x10496e8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4345,10 +4345,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010496dc: 0x10496dc: addu  s3, a0, zero
+// 0x010496ec: 0x10496ec: addu  s3, a0, zero
 	ldloc.1
 	stloc 13
-// 0x010496e0: 0x10496e0: sw    s0, 20(sp)
+// 0x010496f0: 0x10496f0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4357,17 +4357,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010496e4: 0x10496e4: addiu a0, zero, 83
+// 0x010496f4: 0x10496f4: addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
-// 0x010496e8: 0x10496e8: addu  s0, a1, zero
+// 0x010496f8: 0x10496f8: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010496ec: 0x10496ec: addu  a1, s3, zero
+// 0x010496fc: 0x10496fc: addu  a1, s3, zero
 	ldloc 13
 	stloc.2
-// 0x010496f0: 0x10496f0: sw    ra, 44(sp)
-// 0x010496f4: 0x10496f4: sw    s5, 40(sp)
+// 0x01049700: 0x1049700: sw    ra, 44(sp)
+// 0x01049704: 0x1049704: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4376,7 +4376,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010496f8: 0x10496f8: sw    s4, 36(sp)
+// 0x01049708: 0x1049708: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4385,7 +4385,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010496fc: 0x10496fc: sw    s2, 28(sp)
+// 0x0104970c: 0x104970c: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4394,7 +4394,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01049700: 0x1049700: jal   0x103822c sw    s1, 24(sp)
+// 0x01049710: 0x1049710: jal   0x103823c sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4408,31 +4408,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_add_103822c(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_add_103823c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01049708: 0x1049708: beq   s0, zero, 0x1049884 lui   s1, 0x60000
+// 0x01049718: 0x1049718: beq   s0, zero, 0x1049894 lui   s1, 0x60000
 	ldloc 10
 	ldc.i4 393216
 	stloc 11
-	brfalse L_1049884
+	brfalse L_1049894
 // --- basic block ---
-// 0x01049710: 0x1049710: addiu s1, s1, 20416
+// 0x01049720: 0x1049720: addiu s1, s1, 20880
 	ldloc 11
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc 11
-// 0x01049714: 0x1049714: lui   s0, 0x10000
+// 0x01049724: 0x1049724: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01049718: 0x1049718: addu  s0, s0, s1
+// 0x01049728: 0x1049728: addu  s0, s0, s1
 	ldloc 10
 	ldloc 11
 	add
 	stloc 10
-// 0x0104971c: 0x104971c: lw    s4, -26736(s0)
+// 0x0104972c: 0x104972c: lw    s4, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4441,7 +4441,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01049720: 0x1049720: lw    a0, 20(s3)
+// 0x01049730: 0x1049730: lw    a0, 20(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4450,7 +4450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049724: 0x1049724: jal   0x1000d8c addiu s2, zero, 388
+// 0x01049734: 0x1049734: jal   0x1000d8c addiu s2, zero, 388
 	ldc.i4 388
 	stloc 12
 	ldloc.0
@@ -4463,12 +4463,12 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0104972c: 0x104972c: mult  s4, s2
+// 0x0104973c: 0x104973c: mult  s4, s2
 	ldloc 14
 	ldloc 12
 	mul
 	stloc 9
-// 0x01049730: 0x1049730: lw    a0, 24(s3)
+// 0x01049740: 0x1049740: lw    a0, 24(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4477,15 +4477,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049734: 0x1049734: mflo  lo
+// 0x01049744: 0x1049744: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x01049738: 0x1049738: addu  v1, s1, v1
+// 0x01049748: 0x1049748: addu  v1, s1, v1
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x0104973c: 0x104973c: sw    v0, 8(v1)
+// 0x0104974c: 0x104974c: sw    v0, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4494,7 +4494,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01049740: 0x1049740: lw    s5, -26736(s0)
+// 0x01049750: 0x1049750: lw    s5, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4503,7 +4503,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01049744: 0x1049744: jal   0x1000d8c lui   s4, 0x10000
+// 0x01049754: 0x1049754: jal   0x1000d8c lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 14
 	ldloc.0
@@ -4516,12 +4516,12 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0104974c: 0x104974c: mult  s5, s2
+// 0x0104975c: 0x104975c: mult  s5, s2
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 9
-// 0x01049750: 0x1049750: lw    a0, 32(s3)
+// 0x01049760: 0x1049760: lw    a0, 32(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4530,15 +4530,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049754: 0x1049754: mflo  lo
+// 0x01049764: 0x1049764: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01049758: 0x1049758: addu  s5, s1, s5
+// 0x01049768: 0x1049768: addu  s5, s1, s5
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x0104975c: 0x104975c: sw    v0, 4(s5)
+// 0x0104976c: 0x104976c: sw    v0, 4(s5)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4547,7 +4547,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01049760: 0x1049760: lw    s5, -26736(s0)
+// 0x01049770: 0x1049770: lw    s5, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4556,7 +4556,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01049764: 0x1049764: jal   0x1000d8c sll   zero, zero, 0
+// 0x01049774: 0x1049774: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4567,20 +4567,20 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0104976c: 0x104976c: mult  s5, s2
+// 0x0104977c: 0x104977c: mult  s5, s2
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 9
-// 0x01049770: 0x1049770: mflo  lo
+// 0x01049780: 0x1049780: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01049774: 0x1049774: addu  s5, s5, s1
+// 0x01049784: 0x1049784: addu  s5, s5, s1
 	ldloc 8
 	ldloc 11
 	add
 	stloc 8
-// 0x01049778: 0x1049778: sw    v0, 368(s5)
+// 0x01049788: 0x1049788: sw    v0, 368(s5)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4589,7 +4589,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104977c: 0x104977c: lw    s5, -26736(s0)
+// 0x0104978c: 0x104978c: lw    s5, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4598,22 +4598,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01049780: 0x1049780: jal   0x103772c addiu a0, zero, 83
+// 0x01049790: 0x1049790: jal   0x103773c addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl40::roadmap_history_latest_103772c(int32,int32)
+	call int32 Cibyl40::roadmap_history_latest_103773c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01049788: 0x1049788: mult  s5, s2
+// 0x01049798: 0x1049798: mult  s5, s2
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 9
-// 0x0104978c: 0x104978c: lw    v1, -26736(s0)
+// 0x0104979c: 0x104979c: lw    v1, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4622,7 +4622,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01049790: 0x1049790: lw    a0, 40(s3)
+// 0x010497a0: 0x10497a0: lw    a0, 40(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4631,15 +4631,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049794: 0x1049794: mflo  lo
+// 0x010497a4: 0x10497a4: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01049798: 0x1049798: addu  s5, s1, s5
+// 0x010497a8: 0x10497a8: addu  s5, s1, s5
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x0104979c: 0x104979c: sw    v0, 372(s5)
+// 0x010497ac: 0x10497ac: sw    v0, 372(s5)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4648,20 +4648,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010497a0: 0x10497a0: mult  v1, s2
+// 0x010497b0: 0x10497b0: mult  v1, s2
 	ldloc 6
 	ldloc 12
 	mul
 	stloc 9
-// 0x010497a4: 0x10497a4: mflo  lo
+// 0x010497b4: 0x10497b4: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x010497a8: 0x10497a8: addu  v1, v1, s1
+// 0x010497b8: 0x10497b8: addu  v1, v1, s1
 	ldloc 6
 	ldloc 11
 	add
 	stloc 6
-// 0x010497ac: 0x10497ac: sw    zero, 376(v1)
+// 0x010497bc: 0x10497bc: sw    zero, 376(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4670,7 +4670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010497b0: 0x10497b0: lw    v0, -26736(s0)
+// 0x010497c0: 0x10497c0: lw    v0, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4679,23 +4679,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010497b4: 0x10497b4: addiu v1, zero, 1
+// 0x010497c4: 0x10497c4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010497b8: 0x10497b8: mult  v0, s2
+// 0x010497c8: 0x10497c8: mult  v0, s2
 	ldloc 7
 	ldloc 12
 	mul
 	stloc 9
-// 0x010497bc: 0x10497bc: mflo  lo
+// 0x010497cc: 0x10497cc: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x010497c0: 0x10497c0: addu  v0, v0, s1
+// 0x010497d0: 0x10497d0: addu  v0, v0, s1
 	ldloc 7
 	ldloc 11
 	add
 	stloc 7
-// 0x010497c4: 0x10497c4: sw    v1, 384(v0)
+// 0x010497d4: 0x10497d4: sw    v1, 384(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4704,7 +4704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010497c8: 0x10497c8: lw    s5, -26736(s0)
+// 0x010497d8: 0x10497d8: lw    s5, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4713,7 +4713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010497cc: 0x10497cc: jal   0x1000d8c sll   zero, zero, 0
+// 0x010497dc: 0x10497dc: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4724,12 +4724,12 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x010497d4: 0x10497d4: mult  s5, s2
+// 0x010497e4: 0x10497e4: mult  s5, s2
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 9
-// 0x010497d8: 0x10497d8: lw    a0, -26736(s0)
+// 0x010497e8: 0x10497e8: lw    a0, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4738,7 +4738,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010497dc: 0x10497dc: lw    a3, 16(s3)
+// 0x010497ec: 0x10497ec: lw    a3, 16(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4747,23 +4747,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010497e0: 0x10497e0: addiu a1, zero, 100
+// 0x010497f0: 0x10497f0: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010497e4: 0x10497e4: addiu a2, s4, 19912
+// 0x010497f4: 0x10497f4: addiu a2, s4, 20332
 	ldloc 14
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010497e8: 0x10497e8: mflo  lo
+// 0x010497f8: 0x10497f8: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x010497ec: 0x10497ec: addu  v1, s1, v1
+// 0x010497fc: 0x10497fc: addu  v1, s1, v1
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x010497f0: 0x10497f0: sw    v0, 380(v1)
+// 0x01049800: 0x1049800: sw    v0, 380(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4772,20 +4772,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010497f4: 0x10497f4: mult  a0, s2
+// 0x01049804: 0x1049804: mult  a0, s2
 	ldloc.1
 	ldloc 12
 	mul
 	stloc 9
-// 0x010497f8: 0x10497f8: mflo  lo
+// 0x01049808: 0x1049808: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x010497fc: 0x10497fc: addu  a0, s1, a0
+// 0x0104980c: 0x104980c: addu  a0, s1, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc.1
-// 0x01049800: 0x1049800: jal   0x1000f9c addiu a0, a0, 12
+// 0x01049810: 0x1049810: jal   0x1000f9c addiu a0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	add
@@ -4800,7 +4800,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01049808: 0x1049808: lw    a0, -26736(s0)
+// 0x01049818: 0x1049818: lw    a0, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4809,7 +4809,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104980c: 0x104980c: lw    a3, 36(s3)
+// 0x0104981c: 0x104981c: lw    a3, 36(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -4818,28 +4818,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01049810: 0x1049810: mult  a0, s2
+// 0x01049820: 0x1049820: mult  a0, s2
 	ldloc.1
 	ldloc 12
 	mul
 	stloc 9
-// 0x01049814: 0x1049814: addiu a2, s4, 19912
+// 0x01049824: 0x1049824: addiu a2, s4, 20332
 	ldloc 14
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01049818: 0x1049818: addiu a1, zero, 256
+// 0x01049828: 0x1049828: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0104981c: 0x104981c: mflo  lo
+// 0x0104982c: 0x104982c: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x01049820: 0x1049820: addiu a0, a0, 112
+// 0x01049830: 0x1049830: addiu a0, a0, 112
 	ldloc.1
 	ldc.i4.s 112
 	add
 	stloc.1
-// 0x01049824: 0x1049824: jal   0x1000f9c addu  a0, s1, a0
+// 0x01049834: 0x1049834: jal   0x1000f9c addu  a0, s1, a0
 	ldloc 11
 	ldloc.1
 	add
@@ -4854,7 +4854,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0104982c: 0x104982c: lw    a0, -26736(s0)
+// 0x0104983c: 0x104983c: lw    a0, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4863,21 +4863,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049830: 0x1049830: sll   zero, zero, 0
-// 0x01049834: 0x1049834: mult  a0, s2
+// 0x01049840: 0x1049840: sll   zero, zero, 0
+// 0x01049844: 0x1049844: mult  a0, s2
 	ldloc.1
 	ldloc 12
 	mul
 	stloc 9
-// 0x01049838: 0x1049838: mflo  lo
+// 0x01049848: 0x1049848: mflo  lo
 	ldloc 9
 	stloc 12
-// 0x0104983c: 0x104983c: addu  s1, s1, s2
+// 0x0104984c: 0x104984c: addu  s1, s1, s2
 	ldloc 11
 	ldloc 12
 	add
 	stloc 11
-// 0x01049840: 0x1049840: jal   0x1048e94 addiu a1, s1, 4
+// 0x01049850: 0x1049850: jal   0x1048ea4 addiu a1, s1, 4
 	ldloc 11
 	ldc.i4.4
 	add
@@ -4887,12 +4887,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::remider_add_pin_1048e94(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::remider_add_pin_1048ea4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01049848: 0x1049848: lw    v0, -26736(s0)
+// 0x01049858: 0x1049858: lw    v0, -26736(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4901,47 +4901,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104984c: 0x104984c: sll   zero, zero, 0
-// 0x01049850: 0x1049850: bne   v0, zero, 0x1049868 lui   v0, 0x60000
+// 0x0104985c: 0x104985c: sll   zero, zero, 0
+// 0x01049860: 0x1049860: bne   v0, zero, 0x1049878 lui   v0, 0x60000
 	ldloc 7
 	ldc.i4 393216
 	stloc 7
-	brtrue L_1049868
+	brtrue L_1049878
 // --- basic block ---
-// 0x01049858: 0x1049858: lui   a0, 0x1050000
+// 0x01049868: 0x1049868: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104985c: 0x104985c: jal   0x1030d38 addiu a0, a0, -25804
+// 0x0104986c: 0x104986c: jal   0x1030d48 addiu a0, a0, -25788
 	ldloc.1
-	ldc.i4 -25804
+	ldc.i4 -25788
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl35::roadmap_gps_register_listener_1030d38(int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_listener_1030d48(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01049864: 0x1049864: lui   v0, 0x60000
+// 0x01049874: 0x1049874: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 7
-L_1049868:
-// 0x01049868: 0x1049868: lui   v1, 0x10000
+L_1049878:
+// 0x01049878: 0x1049878: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0104986c: 0x104986c: addiu v0, v0, 20416
+// 0x0104987c: 0x104987c: addiu v0, v0, 20880
 	ldloc 7
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc 7
-// 0x01049870: 0x1049870: addu  v0, v1, v0
+// 0x01049880: 0x1049880: addu  v0, v1, v0
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x01049874: 0x1049874: lw    v1, -26736(v0)
+// 0x01049884: 0x1049884: lw    v1, -26736(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4950,13 +4950,13 @@ L_1049868:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01049878: 0x1049878: sll   zero, zero, 0
-// 0x0104987c: 0x104987c: addiu v1, v1, 1
+// 0x01049888: 0x1049888: sll   zero, zero, 0
+// 0x0104988c: 0x104988c: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01049880: 0x1049880: sw    v1, -26736(v0)
+// 0x01049890: 0x1049890: sw    v1, -26736(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4965,9 +4965,9 @@ L_1049868:
 	add
 	ldloc 6
 	stelem.i4
-L_1049884:
-// 0x01049884: 0x1049884: lw    ra, 44(sp)
-// 0x01049888: 0x1049888: lw    s5, 40(sp)
+L_1049894:
+// 0x01049894: 0x1049894: lw    ra, 44(sp)
+// 0x01049898: 0x1049898: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4976,7 +4976,7 @@ L_1049884:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104988c: 0x104988c: lw    s4, 36(sp)
+// 0x0104989c: 0x104989c: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4985,7 +4985,7 @@ L_1049884:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01049890: 0x1049890: lw    s3, 32(sp)
+// 0x010498a0: 0x10498a0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4994,7 +4994,7 @@ L_1049884:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01049894: 0x1049894: lw    s2, 28(sp)
+// 0x010498a4: 0x10498a4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5003,7 +5003,7 @@ L_1049884:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01049898: 0x1049898: lw    s1, 24(sp)
+// 0x010498a8: 0x10498a8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5012,7 +5012,7 @@ L_1049884:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104989c: 0x104989c: lw    s0, 20(sp)
+// 0x010498ac: 0x10498ac: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5021,7 +5021,7 @@ L_1049884:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010498a0: 0x10498a0: jr    ra addiu sp, sp, 48
+// 0x010498b0: 0x10498b0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5033,7 +5033,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 reminder_add_dlg_buttons_callback_10498a8(int32,int32,int32,int32,int32)
+.method public static int32 reminder_add_dlg_buttons_callback_10498b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -5092,13 +5092,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010498a8: 0x10498a8: addu  v0, a0, zero
+// 0x010498b8: 0x10498b8: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x010498ac: 0x10498ac: lui   a1, 0x10000
+// 0x010498bc: 0x10498bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010498b0: 0x10498b0: lw    a0, 16(a0)
+// 0x010498c0: 0x10498c0: lw    a0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5107,12 +5107,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010498b4: 0x10498b4: addiu sp, sp, -120
+// 0x010498c4: 0x10498c4: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x010498b8: 0x10498b8: sw    s1, 88(sp)
+// 0x010498c8: 0x10498c8: sw    s1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5121,8 +5121,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010498bc: 0x10498bc: sw    ra, 116(sp)
-// 0x010498c0: 0x10498c0: sw    s7, 112(sp)
+// 0x010498cc: 0x10498cc: sw    ra, 116(sp)
+// 0x010498d0: 0x10498d0: sw    s7, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5131,7 +5131,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010498c4: 0x10498c4: sw    s6, 108(sp)
+// 0x010498d4: 0x10498d4: sw    s6, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5140,7 +5140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010498c8: 0x10498c8: sw    s5, 104(sp)
+// 0x010498d8: 0x10498d8: sw    s5, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5149,7 +5149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010498cc: 0x10498cc: sw    s4, 100(sp)
+// 0x010498dc: 0x10498dc: sw    s4, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5158,7 +5158,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010498d0: 0x10498d0: sw    s3, 96(sp)
+// 0x010498e0: 0x10498e0: sw    s3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5167,7 +5167,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010498d4: 0x10498d4: sw    s2, 92(sp)
+// 0x010498e4: 0x10498e4: sw    s2, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5176,7 +5176,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010498d8: 0x10498d8: sw    s0, 84(sp)
+// 0x010498e8: 0x10498e8: sw    s0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5185,7 +5185,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010498dc: 0x10498dc: lw    s1, 4(v0)
+// 0x010498ec: 0x10498ec: lw    s1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5194,7 +5194,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010498e0: 0x10498e0: jal   0x1001b14 addiu a1, a1, -21272
+// 0x010498f0: 0x10498f0: jal   0x1001b14 addiu a1, a1, -21272
 	ldloc.2
 	ldc.i4 -21272
 	add
@@ -5204,18 +5204,18 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010498e8: 0x10498e8: bne   v0, zero, 0x1049afc lui   s0, 0x10000
+// 0x010498f8: 0x10498f8: bne   v0, zero, 0x1049b0c lui   s0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 9
-	brtrue L_1049afc
+	brtrue L_1049b0c
 // --- basic block ---
-// 0x010498f0: 0x10498f0: addiu a1, s0, 1884
+// 0x01049900: 0x1049900: addiu a1, s0, 1880
 	ldloc 9
-	ldc.i4 1884
+	ldc.i4 1880
 	add
 	stloc.2
-// 0x010498f4: 0x10498f4: jal   0x109b304 addu  a0, s1, zero
+// 0x01049904: 0x1049904: jal   0x109b94c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5223,20 +5223,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010498fc: 0x10498fc: addu  a0, v0, zero
+// 0x0104990c: 0x104990c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049900: 0x1049900: addiu a1, s0, 1884
+// 0x01049910: 0x1049910: addiu a1, s0, 1880
 	ldloc 9
-	ldc.i4 1884
+	ldc.i4 1880
 	add
 	stloc.2
-// 0x01049904: 0x1049904: jal   0x109b634 lui   s0, 0x10000
+// 0x01049914: 0x1049914: jal   0x109bc7c lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -5244,20 +5244,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104990c: 0x104990c: addu  a0, s1, zero
+// 0x0104991c: 0x104991c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01049910: 0x1049910: addiu a1, s0, 1664
+// 0x01049920: 0x1049920: addiu a1, s0, 1660
 	ldloc 9
-	ldc.i4 1664
+	ldc.i4 1660
 	add
 	stloc.2
-// 0x01049914: 0x1049914: jal   0x109b304 addu  s7, v0, zero
+// 0x01049924: 0x1049924: jal   0x109b94c addu  s7, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -5265,17 +5265,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104991c: 0x104991c: addu  a0, v0, zero
+// 0x0104992c: 0x104992c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049920: 0x1049920: jal   0x109b634 addiu a1, s0, 1664
+// 0x01049930: 0x1049930: jal   0x109bc7c addiu a1, s0, 1660
 	ldloc 9
-	ldc.i4 1664
+	ldc.i4 1660
 	add
 	stloc.2
 	ldloc.0
@@ -5283,20 +5283,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049928: 0x1049928: lui   a0, 0x10000
+// 0x01049938: 0x1049938: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104992c: 0x104992c: addiu a0, a0, 1896
+// 0x0104993c: 0x104993c: addiu a0, a0, 1892
 	ldloc.1
-	ldc.i4 1896
+	ldc.i4 1892
 	add
 	stloc.1
-// 0x01049930: 0x1049930: jal   0x10947ac addu  s5, v0, zero
+// 0x01049940: 0x1049940: jal   0x1094dd0 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -5304,20 +5304,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049938: 0x1049938: lui   a0, 0x10000
+// 0x01049948: 0x1049948: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104993c: 0x104993c: addiu a0, a0, 1908
+// 0x0104994c: 0x104994c: addiu a0, a0, 1904
 	ldloc.1
-	ldc.i4 1908
+	ldc.i4 1904
 	add
 	stloc.1
-// 0x01049940: 0x1049940: jal   0x10947ac addu  s6, v0, zero
+// 0x01049950: 0x1049950: jal   0x1094dd0 addu  s6, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.0
@@ -5325,23 +5325,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049948: 0x1049948: lui   a0, 0x10000
+// 0x01049958: 0x1049958: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104994c: 0x104994c: addiu a0, a0, 1648
+// 0x0104995c: 0x104995c: addiu a0, a0, 1644
 	ldloc.1
-	ldc.i4 1648
+	ldc.i4 1644
 	add
 	stloc.1
-// 0x01049950: 0x1049950: lui   s2, 0x60000
+// 0x01049960: 0x1049960: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01049954: 0x1049954: jal   0x10947ac addu  s4, v0, zero
+// 0x01049964: 0x1049964: jal   0x1094dd0 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -5349,15 +5349,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104995c: 0x104995c: addu  a0, zero, zero
+// 0x0104996c: 0x104996c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01049960: 0x1049960: jal   0x1094a94 addu  s0, v0, zero
+// 0x01049970: 0x1049970: jal   0x10950dc addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -5365,23 +5365,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049968: 0x1049968: lw    a0, 20380(s2)
+// 0x01049978: 0x1049978: lw    a0, 20844(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5095
+	ldc.i4 5211
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104996c: 0x104996c: jal   0x1001ba8 addiu s2, s2, 20380
+// 0x0104997c: 0x104997c: jal   0x1001ba8 addiu s2, s2, 20844
 	ldloc 10
-	ldc.i4 20380
+	ldc.i4 20844
 	add
 	stloc 10
 	ldloc.0
@@ -5394,7 +5394,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049974: 0x1049974: lw    a0, 4(s2)
+// 0x01049984: 0x1049984: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5403,7 +5403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049978: 0x1049978: jal   0x1001ba8 sw    v0, 32(sp)
+// 0x01049988: 0x1049988: jal   0x1001ba8 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5422,7 +5422,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049980: 0x1049980: lw    a0, 12(s2)
+// 0x01049990: 0x1049990: lw    a0, 12(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5431,7 +5431,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049984: 0x1049984: jal   0x1001ba8 sw    v0, 36(sp)
+// 0x01049994: 0x1049994: jal   0x1001ba8 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5450,12 +5450,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104998c: 0x104998c: addiu s1, sp, 16
+// 0x0104999c: 0x104999c: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x01049990: 0x1049990: lw    a2, 32(s2)
+// 0x010499a0: 0x10499a0: lw    a2, 32(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5464,10 +5464,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01049994: 0x1049994: lui   s3, 0x20000
-	ldc.i4 131072
+// 0x010499a4: 0x10499a4: lui   s3, 0x10000
+	ldc.i4 65536
 	stloc 11
-// 0x01049998: 0x1049998: sw    v0, 40(sp)
+// 0x010499a8: 0x10499a8: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5476,23 +5476,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104999c: 0x104999c: lui   v0, 0x10000
+// 0x010499ac: 0x10499ac: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x010499a0: 0x10499a0: addiu a1, s3, -13884
+// 0x010499b0: 0x10499b0: addiu a1, s3, 19088
 	ldloc 11
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x010499a4: 0x10499a4: addu  a0, s1, zero
+// 0x010499b4: 0x10499b4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010499a8: 0x10499a8: addiu v0, v0, 18500
+// 0x010499b8: 0x10499b8: addiu v0, v0, 18768
 	ldloc 5
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 5
-// 0x010499ac: 0x10499ac: jal   0x1000f64 sw    v0, 44(sp)
+// 0x010499bc: 0x10499bc: jal   0x1000f64 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5511,7 +5511,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010499b4: 0x10499b4: jal   0x1001ba8 addu  a0, s1, zero
+// 0x010499c4: 0x10499c4: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5524,7 +5524,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010499bc: 0x10499bc: lw    a2, 28(s2)
+// 0x010499cc: 0x10499cc: lw    a2, 28(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5533,15 +5533,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010499c0: 0x10499c0: addiu a1, s3, -13884
+// 0x010499d0: 0x10499d0: addiu a1, s3, 19088
 	ldloc 11
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x010499c4: 0x10499c4: addu  a0, s1, zero
+// 0x010499d4: 0x10499d4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010499c8: 0x10499c8: jal   0x1000f64 sw    v0, 52(sp)
+// 0x010499d8: 0x10499d8: jal   0x1000f64 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5560,7 +5560,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010499d0: 0x10499d0: jal   0x1001ba8 addu  a0, s1, zero
+// 0x010499e0: 0x10499e0: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5573,10 +5573,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010499d8: 0x10499d8: addu  a0, s7, zero
+// 0x010499e8: 0x10499e8: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-// 0x010499dc: 0x10499dc: jal   0x1001ba8 sw    v0, 56(sp)
+// 0x010499ec: 0x10499ec: jal   0x1001ba8 sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5595,7 +5595,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010499e4: 0x10499e4: beq   s0, zero, 0x1049a38 sw    v0, 48(sp)
+// 0x010499f4: 0x10499f4: beq   s0, zero, 0x1049a48 sw    v0, 48(sp)
 	ldloc 9
 	ldloc 6
 	ldloc.0
@@ -5605,17 +5605,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1049a38
+	brfalse L_1049a48
 // --- basic block ---
-// 0x010499ec: 0x10499ec: lui   a1, 0x0
+// 0x010499fc: 0x10499fc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010499f0: 0x10499f0: addiu a1, a1, 20820
+// 0x01049a00: 0x1049a00: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010499f4: 0x10499f4: jal   0x1001b14 addu  a0, s0, zero
+// 0x01049a04: 0x1049a04: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -5623,24 +5623,24 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010499fc: 0x10499fc: bne   v0, zero, 0x1049a3c lui   s1, 0x10000
+// 0x01049a0c: 0x1049a0c: bne   v0, zero, 0x1049a4c lui   s1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brtrue L_1049a3c
+	brtrue L_1049a4c
 // --- basic block ---
-// 0x01049a04: 0x1049a04: lui   v0, 0x10000
+// 0x01049a14: 0x1049a14: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049a08: 0x1049a08: addu  a0, s6, zero
+// 0x01049a18: 0x1049a18: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01049a0c: 0x1049a0c: addiu v0, v0, -16892
+// 0x01049a1c: 0x1049a1c: addiu v0, v0, 19396
 	ldloc 5
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc 5
-// 0x01049a10: 0x1049a10: jal   0x1001ba8 sw    v0, 60(sp)
+// 0x01049a20: 0x1049a20: jal   0x1001ba8 sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5659,10 +5659,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049a18: 0x1049a18: addu  a0, s5, zero
+// 0x01049a28: 0x1049a28: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01049a1c: 0x1049a1c: jal   0x1001ba8 sw    v0, 64(sp)
+// 0x01049a2c: 0x1049a2c: jal   0x1001ba8 sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5681,10 +5681,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049a24: 0x1049a24: addu  a0, s4, zero
+// 0x01049a34: 0x1049a34: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x01049a28: 0x1049a28: jal   0x1001ba8 sw    v0, 68(sp)
+// 0x01049a38: 0x1049a38: jal   0x1001ba8 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5703,7 +5703,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049a30: 0x1049a30: j	 0x1049a70 sw    v0, 72(sp)
+// 0x01049a40: 0x1049a40: j	 0x1049a80 sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5712,27 +5712,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1049a70
+	br L_1049a80
 // --- basic block ---
-L_1049a38:
-// 0x01049a38: 0x1049a38: lui   s1, 0x10000
+L_1049a48:
+// 0x01049a48: 0x1049a48: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-L_1049a3c:
-// 0x01049a3c: 0x1049a3c: lui   v0, 0x10000
+L_1049a4c:
+// 0x01049a4c: 0x1049a4c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049a40: 0x1049a40: addiu a0, s1, 18500
+// 0x01049a50: 0x1049a50: addiu a0, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x01049a44: 0x1049a44: addiu v0, v0, -48
+// 0x01049a54: 0x1049a54: addiu v0, v0, -52
 	ldloc 5
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc 5
-// 0x01049a48: 0x1049a48: jal   0x1001ba8 sw    v0, 60(sp)
+// 0x01049a58: 0x1049a58: jal   0x1001ba8 sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5751,12 +5751,12 @@ L_1049a3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049a50: 0x1049a50: addiu a0, s1, 18500
+// 0x01049a60: 0x1049a60: addiu a0, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x01049a54: 0x1049a54: jal   0x1001ba8 sw    v0, 64(sp)
+// 0x01049a64: 0x1049a64: jal   0x1001ba8 sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5775,12 +5775,12 @@ L_1049a3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049a5c: 0x1049a5c: addiu a0, s1, 18500
+// 0x01049a6c: 0x1049a6c: addiu a0, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x01049a60: 0x1049a60: jal   0x1001ba8 sw    v0, 68(sp)
+// 0x01049a70: 0x1049a70: jal   0x1001ba8 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5799,7 +5799,7 @@ L_1049a3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049a68: 0x1049a68: beq   s0, zero, 0x1049a88 sw    v0, 72(sp)
+// 0x01049a78: 0x1049a78: beq   s0, zero, 0x1049a98 sw    v0, 72(sp)
 	ldloc 9
 	ldloc 6
 	ldloc.0
@@ -5809,18 +5809,18 @@ L_1049a3c:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1049a88
+	brfalse L_1049a98
 // --- basic block ---
-L_1049a70:
-// 0x01049a70: 0x1049a70: lui   a1, 0x0
+L_1049a80:
+// 0x01049a80: 0x1049a80: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01049a74: 0x1049a74: addiu a1, a1, 20820
+// 0x01049a84: 0x1049a84: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x01049a78: 0x1049a78: jal   0x1001b14 addu  a0, s0, zero
+// 0x01049a88: 0x1049a88: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -5828,18 +5828,18 @@ L_1049a70:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01049a80: 0x1049a80: beq   v0, zero, 0x1049a8c addiu a1, zero, 1
+// 0x01049a90: 0x1049a90: beq   v0, zero, 0x1049a9c addiu a1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.2
-	brfalse L_1049a8c
+	brfalse L_1049a9c
 // --- basic block ---
-L_1049a88:
-// 0x01049a88: 0x1049a88: addu  a1, zero, zero
+L_1049a98:
+// 0x01049a98: 0x1049a98: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_1049a8c:
-// 0x01049a8c: 0x1049a8c: jal   0x10496d4 addiu a0, sp, 32
+L_1049a9c:
+// 0x01049a9c: 0x1049a9c: jal   0x10496e4 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5849,12 +5849,12 @@ L_1049a8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_reminder_add_entry_10496d4(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_reminder_add_entry_10496e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049a94: 0x1049a94: lw    a0, 32(sp)
+// 0x01049aa4: 0x1049aa4: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5863,7 +5863,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049a98: 0x1049a98: jal   0x1000930 sll   zero, zero, 0
+// 0x01049aa8: 0x1049aa8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5874,7 +5874,7 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049aa0: 0x1049aa0: lw    a0, 36(sp)
+// 0x01049ab0: 0x1049ab0: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5883,7 +5883,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049aa4: 0x1049aa4: jal   0x1000930 sll   zero, zero, 0
+// 0x01049ab4: 0x1049ab4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5894,7 +5894,7 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049aac: 0x1049aac: lw    a0, 40(sp)
+// 0x01049abc: 0x1049abc: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5903,7 +5903,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049ab0: 0x1049ab0: jal   0x1000930 sll   zero, zero, 0
+// 0x01049ac0: 0x1049ac0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5914,7 +5914,7 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049ab8: 0x1049ab8: lw    a0, 52(sp)
+// 0x01049ac8: 0x1049ac8: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5923,7 +5923,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049abc: 0x1049abc: jal   0x1000930 sll   zero, zero, 0
+// 0x01049acc: 0x1049acc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5934,7 +5934,7 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049ac4: 0x1049ac4: lw    a0, 56(sp)
+// 0x01049ad4: 0x1049ad4: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5943,7 +5943,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049ac8: 0x1049ac8: jal   0x1000930 sll   zero, zero, 0
+// 0x01049ad8: 0x1049ad8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5954,7 +5954,7 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049ad0: 0x1049ad0: lw    a0, 64(sp)
+// 0x01049ae0: 0x1049ae0: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5963,7 +5963,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049ad4: 0x1049ad4: jal   0x1000930 sll   zero, zero, 0
+// 0x01049ae4: 0x1049ae4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5974,7 +5974,7 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049adc: 0x1049adc: lw    a0, 68(sp)
+// 0x01049aec: 0x1049aec: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5983,7 +5983,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049ae0: 0x1049ae0: jal   0x1000930 sll   zero, zero, 0
+// 0x01049af0: 0x1049af0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5994,7 +5994,7 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049ae8: 0x1049ae8: lw    a0, 72(sp)
+// 0x01049af8: 0x1049af8: lw    a0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6003,7 +6003,7 @@ L_1049a8c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049aec: 0x1049aec: jal   0x1000930 sll   zero, zero, 0
+// 0x01049afc: 0x1049afc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6014,11 +6014,11 @@ L_1049a8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049af4: 0x1049af4: j	 0x1049b04 sll   zero, zero, 0
-	br L_1049b04
+// 0x01049b04: 0x1049b04: j	 0x1049b14 sll   zero, zero, 0
+	br L_1049b14
 // --- basic block ---
-L_1049afc:
-// 0x01049afc: 0x1049afc: jal   0x1094b64 addu  a0, zero, zero
+L_1049b0c:
+// 0x01049b0c: 0x1049b0c: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6026,17 +6026,17 @@ L_1049afc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1049b04:
-// 0x01049b04: 0x1049b04: lw    ra, 116(sp)
-// 0x01049b08: 0x1049b08: addiu v0, zero, 1
+L_1049b14:
+// 0x01049b14: 0x1049b14: lw    ra, 116(sp)
+// 0x01049b18: 0x1049b18: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01049b0c: 0x1049b0c: lw    s7, 112(sp)
+// 0x01049b1c: 0x1049b1c: lw    s7, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6045,7 +6045,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01049b10: 0x1049b10: lw    s6, 108(sp)
+// 0x01049b20: 0x1049b20: lw    s6, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6054,7 +6054,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01049b14: 0x1049b14: lw    s5, 104(sp)
+// 0x01049b24: 0x1049b24: lw    s5, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6063,7 +6063,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01049b18: 0x1049b18: lw    s4, 100(sp)
+// 0x01049b28: 0x1049b28: lw    s4, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6072,7 +6072,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01049b1c: 0x1049b1c: lw    s3, 96(sp)
+// 0x01049b2c: 0x1049b2c: lw    s3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6081,7 +6081,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01049b20: 0x1049b20: lw    s2, 92(sp)
+// 0x01049b30: 0x1049b30: lw    s2, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6090,7 +6090,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01049b24: 0x1049b24: lw    s1, 88(sp)
+// 0x01049b34: 0x1049b34: lw    s1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6099,7 +6099,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01049b28: 0x1049b28: lw    s0, 84(sp)
+// 0x01049b38: 0x1049b38: lw    s0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6108,7 +6108,7 @@ L_1049b04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01049b2c: 0x1049b2c: jr    ra addiu sp, sp, 120
+// 0x01049b3c: 0x1049b3c: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
@@ -6120,7 +6120,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_gps_update_1049b34(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_gps_update_1049b44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -6185,19 +6185,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01049b34: 0x1049b34: addiu sp, sp, -64
+// 0x01049b44: 0x1049b44: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01049b38: 0x1049b38: lw    v0, 0(a2)
+// 0x01049b48: 0x1049b48: lw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01049b3c: 0x1049b3c: lw    v1, 4(a2)
+// 0x01049b4c: 0x1049b4c: lw    v1, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6206,7 +6206,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01049b40: 0x1049b40: sw    s4, 40(sp)
+// 0x01049b50: 0x1049b50: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6215,7 +6215,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01049b44: 0x1049b44: sw    s3, 36(sp)
+// 0x01049b54: 0x1049b54: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6224,7 +6224,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01049b48: 0x1049b48: sw    s0, 24(sp)
+// 0x01049b58: 0x1049b58: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6233,16 +6233,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01049b4c: 0x1049b4c: lui   s4, 0x60000
+// 0x01049b5c: 0x1049b5c: lui   s4, 0x60000
 	ldc.i4 393216
 	stloc 12
-// 0x01049b50: 0x1049b50: lui   s0, 0x60000
+// 0x01049b60: 0x1049b60: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 8
-// 0x01049b54: 0x1049b54: lui   s3, 0x10000
+// 0x01049b64: 0x1049b64: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01049b58: 0x1049b58: sw    s8, 56(sp)
+// 0x01049b68: 0x1049b68: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6251,7 +6251,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01049b5c: 0x1049b5c: sw    s7, 52(sp)
+// 0x01049b6c: 0x1049b6c: sw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6260,7 +6260,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01049b60: 0x1049b60: sw    s6, 48(sp)
+// 0x01049b70: 0x1049b70: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6269,7 +6269,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01049b64: 0x1049b64: sw    s2, 32(sp)
+// 0x01049b74: 0x1049b74: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6278,7 +6278,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01049b68: 0x1049b68: sw    s1, 28(sp)
+// 0x01049b78: 0x1049b78: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6287,8 +6287,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01049b6c: 0x1049b6c: sw    ra, 60(sp)
-// 0x01049b70: 0x1049b70: sw    s5, 44(sp)
+// 0x01049b7c: 0x1049b7c: sw    ra, 60(sp)
+// 0x01049b80: 0x1049b80: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6297,12 +6297,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01049b74: 0x1049b74: addiu s4, s4, 20416
+// 0x01049b84: 0x1049b84: addiu s4, s4, 20880
 	ldloc 12
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc 12
-// 0x01049b78: 0x1049b78: sw    v1, 20(sp)
+// 0x01049b88: 0x1049b88: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6311,7 +6311,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01049b7c: 0x1049b7c: sw    v0, 16(sp)
+// 0x01049b8c: 0x1049b8c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6320,37 +6320,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01049b80: 0x1049b80: addiu s0, s0, 20792
+// 0x01049b90: 0x1049b90: addiu s0, s0, 21256
 	ldloc 8
-	ldc.i4 20792
+	ldc.i4 21256
 	add
 	stloc 8
-// 0x01049b84: 0x1049b84: addiu s3, s3, 1652
+// 0x01049b94: 0x1049b94: addiu s3, s3, 1648
 	ldloc 10
-	ldc.i4 1652
+	ldc.i4 1648
 	add
 	stloc 10
-// 0x01049b88: 0x1049b88: addu  s1, zero, zero
+// 0x01049b98: 0x1049b98: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01049b8c: 0x1049b8c: addiu s8, zero, 388
+// 0x01049b9c: 0x1049b9c: addiu s8, zero, 388
 	ldc.i4 388
 	stloc 16
-// 0x01049b90: 0x1049b90: addiu s7, sp, 16
+// 0x01049ba0: 0x1049ba0: addiu s7, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 15
-// 0x01049b94: 0x1049b94: lui   s2, 0x60000
+// 0x01049ba4: 0x1049ba4: lui   s2, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x01049b98: 0x1049b98: j	 0x1049c48 addiu s6, zero, 1
+// 0x01049ba8: 0x1049ba8: j	 0x1049c58 addiu s6, zero, 1
 	ldc.i4.1
 	stloc 14
-	br L_1049c48
+	br L_1049c58
 // --- basic block ---
-L_1049ba0:
-// 0x01049ba0: 0x1049ba0: lw    v0, 8(s0)
+L_1049bb0:
+// 0x01049bb0: 0x1049bb0: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6359,39 +6359,39 @@ L_1049ba0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01049ba4: 0x1049ba4: sll   zero, zero, 0
-// 0x01049ba8: 0x1049ba8: beq   v0, zero, 0x1049c40 sll   zero, zero, 0
+// 0x01049bb4: 0x1049bb4: sll   zero, zero, 0
+// 0x01049bb8: 0x1049bb8: beq   v0, zero, 0x1049c50 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1049c40
+	brfalse L_1049c50
 // --- basic block ---
-// 0x01049bb0: 0x1049bb0: lw    v0, 0(s0)
+// 0x01049bc0: 0x1049bc0: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01049bb4: 0x1049bb4: sll   zero, zero, 0
-// 0x01049bb8: 0x1049bb8: bne   v0, zero, 0x1049c40 mult  s1, s8
+// 0x01049bc4: 0x1049bc4: sll   zero, zero, 0
+// 0x01049bc8: 0x1049bc8: bne   v0, zero, 0x1049c50 mult  s1, s8
 	ldloc 6
 	ldloc 9
 	ldloc 16
 	mul
 	stloc 18
-	brtrue L_1049c40
+	brtrue L_1049c50
 // --- basic block ---
-// 0x01049bc0: 0x1049bc0: addu  a1, s7, zero
+// 0x01049bd0: 0x1049bd0: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x01049bc4: 0x1049bc4: mflo  lo
+// 0x01049bd4: 0x1049bd4: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x01049bc8: 0x1049bc8: addu  a0, s4, a0
+// 0x01049bd8: 0x1049bd8: addu  a0, s4, a0
 	ldloc 12
 	ldloc.1
 	add
 	stloc.1
-// 0x01049bcc: 0x1049bcc: jal   0x1008eb0 addiu a0, a0, 4
+// 0x01049bdc: 0x1049bdc: jal   0x1008ec0 addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
@@ -6401,15 +6401,15 @@ L_1049ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01049bd4: 0x1049bd4: addu  s5, v0, zero
+// 0x01049be4: 0x1049be4: addu  s5, v0, zero
 	ldloc 6
 	stloc 13
-// 0x01049bd8: 0x1049bd8: lw    v0, -8(s0)
+// 0x01049be8: 0x1049be8: lw    v0, -8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6418,68 +6418,68 @@ L_1049ba0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01049bdc: 0x1049bdc: sll   zero, zero, 0
-// 0x01049be0: 0x1049be0: slt   v0, v0, s5
+// 0x01049bec: 0x1049bec: sll   zero, zero, 0
+// 0x01049bf0: 0x1049bf0: slt   v0, v0, s5
 	ldloc 6
 	ldloc 13
 	clt
 	stloc 6
-// 0x01049be4: 0x1049be4: bne   v0, zero, 0x1049c40 sll   zero, zero, 0
+// 0x01049bf4: 0x1049bf4: bne   v0, zero, 0x1049c50 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1049c40
+	brtrue L_1049c50
 // --- basic block ---
-// 0x01049bec: 0x1049bec: lw    v0, 20376(s2)
+// 0x01049bfc: 0x1049bfc: lw    v0, 20840(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 5094
+	ldc.i4 5210
 	add
 	ldelem.i4
 	stloc 6
-// 0x01049bf0: 0x1049bf0: sll   zero, zero, 0
-// 0x01049bf4: 0x1049bf4: bne   v0, zero, 0x1049c24 sll   zero, zero, 0
+// 0x01049c00: 0x1049c00: sll   zero, zero, 0
+// 0x01049c04: 0x1049c04: bne   v0, zero, 0x1049c34 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1049c24
+	brtrue L_1049c34
 // --- basic block ---
-// 0x01049bfc: 0x1049bfc: jal   0x10518a8 addiu a0, zero, 1
+// 0x01049c0c: 0x1049c0c: jal   0x10518b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01049c04: 0x1049c04: addu  a0, v0, zero
+// 0x01049c14: 0x1049c14: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01049c08: 0x1049c08: addu  a1, s3, zero
+// 0x01049c18: 0x1049c18: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x01049c0c: 0x1049c0c: jal   0x10518cc sw    v0, 20376(s2)
+// 0x01049c1c: 0x1049c1c: jal   0x10518dc sw    v0, 20840(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 5094
+	ldc.i4 5210
 	add
 	ldloc 6
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01049c14: 0x1049c14: addu  a2, s3, zero
+// 0x01049c24: 0x1049c24: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x01049c18: 0x1049c18: addiu a0, zero, 1
+// 0x01049c28: 0x1049c28: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01049c1c: 0x1049c1c: jal   0x10a1918 addu  a1, zero, zero
+// 0x01049c2c: 0x1049c2c: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6487,36 +6487,36 @@ L_1049ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1049c24:
-// 0x01049c24: 0x1049c24: lw    a0, 20376(s2)
+L_1049c34:
+// 0x01049c34: 0x1049c34: lw    a0, 20840(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 5094
+	ldc.i4 5210
 	add
 	ldelem.i4
 	stloc.1
-// 0x01049c28: 0x1049c28: jal   0x105195c sll   zero, zero, 0
+// 0x01049c38: 0x1049c38: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01049c30: 0x1049c30: addu  a0, s1, zero
+// 0x01049c40: 0x1049c40: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01049c34: 0x1049c34: jal   0x1049404 addu  a1, s5, zero
+// 0x01049c44: 0x1049c44: jal   0x1049414 addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -6524,39 +6524,39 @@ L_1049c24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::show_reminder_1049404(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::show_reminder_1049414(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01049c3c: 0x1049c3c: sw    s6, 0(s0)
+// 0x01049c4c: 0x1049c4c: sw    s6, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-L_1049c40:
-// 0x01049c40: 0x1049c40: addiu s1, s1, 1
+L_1049c50:
+// 0x01049c50: 0x1049c50: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01049c44: 0x1049c44: addiu s0, s0, 388
+// 0x01049c54: 0x1049c54: addiu s0, s0, 388
 	ldloc 8
 	ldc.i4 388
 	add
 	stloc 8
-L_1049c48:
-// 0x01049c48: 0x1049c48: lui   v1, 0x70000
+L_1049c58:
+// 0x01049c58: 0x1049c58: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01049c4c: 0x1049c4c: addiu v1, v1, 20416
+// 0x01049c5c: 0x1049c5c: addiu v1, v1, 20880
 	ldloc 7
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc 7
-// 0x01049c50: 0x1049c50: lw    v0, -26736(v1)
+// 0x01049c60: 0x1049c60: lw    v0, -26736(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6565,18 +6565,18 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01049c54: 0x1049c54: sll   zero, zero, 0
-// 0x01049c58: 0x1049c58: slt   v0, s1, v0
+// 0x01049c64: 0x1049c64: sll   zero, zero, 0
+// 0x01049c68: 0x1049c68: slt   v0, s1, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x01049c5c: 0x1049c5c: bne   v0, zero, 0x1049ba0 sll   zero, zero, 0
+// 0x01049c6c: 0x1049c6c: bne   v0, zero, 0x1049bb0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1049ba0
+	brtrue L_1049bb0
 // --- basic block ---
-// 0x01049c64: 0x1049c64: lw    ra, 60(sp)
-// 0x01049c68: 0x1049c68: lw    s8, 56(sp)
+// 0x01049c74: 0x1049c74: lw    ra, 60(sp)
+// 0x01049c78: 0x1049c78: lw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6585,7 +6585,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01049c6c: 0x1049c6c: lw    s7, 52(sp)
+// 0x01049c7c: 0x1049c7c: lw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6594,7 +6594,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01049c70: 0x1049c70: lw    s6, 48(sp)
+// 0x01049c80: 0x1049c80: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6603,7 +6603,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01049c74: 0x1049c74: lw    s5, 44(sp)
+// 0x01049c84: 0x1049c84: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6612,7 +6612,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01049c78: 0x1049c78: lw    s4, 40(sp)
+// 0x01049c88: 0x1049c88: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6621,7 +6621,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01049c7c: 0x1049c7c: lw    s3, 36(sp)
+// 0x01049c8c: 0x1049c8c: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6630,7 +6630,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01049c80: 0x1049c80: lw    s2, 32(sp)
+// 0x01049c90: 0x1049c90: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6639,7 +6639,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01049c84: 0x1049c84: lw    s1, 28(sp)
+// 0x01049c94: 0x1049c94: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6648,7 +6648,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01049c88: 0x1049c88: lw    s0, 24(sp)
+// 0x01049c98: 0x1049c98: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6657,7 +6657,7 @@ L_1049c48:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01049c8c: 0x1049c8c: jr    ra addiu sp, sp, 64
+// 0x01049c9c: 0x1049c9c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -6669,7 +6669,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_reminder_feature_enabled_1049d9c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_reminder_feature_enabled_1049dac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -6704,16 +6704,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01049d9c: 0x1049d9c: lui   a0, 0x0
+// 0x01049dac: 0x1049dac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01049da0: 0x1049da0: addiu sp, sp, -24
+// 0x01049db0: 0x1049db0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01049da4: 0x1049da4: sw    ra, 20(sp)
-// 0x01049da8: 0x1049da8: jal   0x100e348 addiu a0, a0, 13628
+// 0x01049db4: 0x1049db4: sw    ra, 20(sp)
+// 0x01049db8: 0x1049db8: jal   0x100e358 addiu a0, a0, 13628
 	ldloc.1
 	ldc.i4 13628
 	add
@@ -6723,20 +6723,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01049db0: 0x1049db0: lui   a1, 0x10000
+// 0x01049dc0: 0x1049dc0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01049db4: 0x1049db4: addu  a0, v0, zero
+// 0x01049dc4: 0x1049dc4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01049db8: 0x1049db8: jal   0x1001b14 addiu a1, a1, 1916
+// 0x01049dc8: 0x1049dc8: jal   0x1001b14 addiu a1, a1, 1912
 	ldloc.2
-	ldc.i4 1916
+	ldc.i4 1912
 	add
 	stloc.2
 	ldloc.1
@@ -6744,13 +6744,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01049dc0: 0x1049dc0: lw    ra, 20(sp)
-// 0x01049dc4: 0x1049dc4: sltiu v0, v0, 1
+// 0x01049dd0: 0x1049dd0: lw    ra, 20(sp)
+// 0x01049dd4: 0x1049dd4: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01049dc8: 0x1049dc8: jr    ra addiu sp, sp, 24
+// 0x01049dd8: 0x1049dd8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6762,7 +6762,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 reminder_add_dlg_1049dd0(int32,int32,int32,int32,int32)
+.method public static int32 reminder_add_dlg_1049de0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s3,int32 s0,int32 s2,int32 s5,int32 s7,int32 s4,int32 s6,int32 t0,int32 t1,int32 s8,int32 t2,int32 lo,int32 ra)
@@ -6836,12 +6836,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01049dd0: 0x1049dd0: addiu sp, sp, -88
+// 0x01049de0: 0x1049de0: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01049dd4: 0x1049dd4: sw    s1, 52(sp)
+// 0x01049de4: 0x1049de4: sw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6850,13 +6850,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01049dd8: 0x1049dd8: lui   v0, 0x60000
+// 0x01049de8: 0x1049de8: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01049ddc: 0x1049ddc: addu  s1, a0, zero
+// 0x01049dec: 0x1049dec: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01049de0: 0x1049de0: sw    s6, 72(sp)
+// 0x01049df0: 0x1049df0: sw    s6, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6865,7 +6865,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01049de4: 0x1049de4: sw    s0, 48(sp)
+// 0x01049df4: 0x1049df4: sw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6874,8 +6874,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01049de8: 0x1049de8: sw    ra, 84(sp)
-// 0x01049dec: 0x1049dec: sw    s8, 80(sp)
+// 0x01049df8: 0x1049df8: sw    ra, 84(sp)
+// 0x01049dfc: 0x1049dfc: sw    s8, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6884,7 +6884,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01049df0: 0x1049df0: sw    s7, 76(sp)
+// 0x01049e00: 0x1049e00: sw    s7, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6893,7 +6893,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01049df4: 0x1049df4: sw    s5, 68(sp)
+// 0x01049e04: 0x1049e04: sw    s5, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6902,7 +6902,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01049df8: 0x1049df8: sw    s4, 64(sp)
+// 0x01049e08: 0x1049e08: sw    s4, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6911,7 +6911,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01049dfc: 0x1049dfc: sw    s3, 60(sp)
+// 0x01049e0c: 0x1049e0c: sw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6920,7 +6920,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01049e00: 0x1049e00: sw    s2, 56(sp)
+// 0x01049e10: 0x1049e10: sw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6929,24 +6929,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01049e04: 0x1049e04: addu  s0, a1, zero
+// 0x01049e14: 0x1049e14: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01049e08: 0x1049e08: addu  s6, a3, zero
+// 0x01049e18: 0x1049e18: addu  s6, a3, zero
 	ldloc 4
 	stloc 15
-// 0x01049e0c: 0x1049e0c: beq   s1, zero, 0x1049e28 addiu a0, v0, 20380
+// 0x01049e1c: 0x1049e1c: beq   s1, zero, 0x1049e38 addiu a0, v0, 20844
 	ldloc 8
 	ldloc 5
-	ldc.i4 20380
+	ldc.i4 20844
 	add
 	stloc.1
-	brfalse L_1049e28
+	brfalse L_1049e38
 // --- basic block ---
-// 0x01049e14: 0x1049e14: addu  a1, s1, zero
+// 0x01049e24: 0x1049e24: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x01049e18: 0x1049e18: jal   0x1001800 addiu a2, zero, 28
+// 0x01049e28: 0x1049e28: jal   0x1001800 addiu a2, zero, 28
 	ldc.i4.s 28
 	stloc.3
 	ldloc.1
@@ -6958,19 +6958,19 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049e20: 0x1049e20: j	 0x1049e3c sll   zero, zero, 0
-	br L_1049e3c
+// 0x01049e30: 0x1049e30: j	 0x1049e4c sll   zero, zero, 0
+	br L_1049e4c
 // --- basic block ---
-L_1049e28:
-// 0x01049e28: 0x1049e28: lui   v1, 0x10000
+L_1049e38:
+// 0x01049e38: 0x1049e38: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01049e2c: 0x1049e2c: addiu v1, v1, 18500
+// 0x01049e3c: 0x1049e3c: addiu v1, v1, 18768
 	ldloc 6
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 6
-// 0x01049e30: 0x1049e30: sw    v1, 12(a0)
+// 0x01049e40: 0x1049e40: sw    v1, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6979,16 +6979,16 @@ L_1049e28:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01049e34: 0x1049e34: sw    v1, 20380(v0)
+// 0x01049e44: 0x1049e44: sw    v1, 20844(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5095
+	ldc.i4 5211
 	add
 	ldloc 6
 	stelem.i4
-// 0x01049e38: 0x1049e38: sw    v1, 4(a0)
+// 0x01049e48: 0x1049e48: sw    v1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6997,23 +6997,23 @@ L_1049e28:
 	add
 	ldloc 6
 	stelem.i4
-L_1049e3c:
-// 0x01049e3c: 0x1049e3c: lw    v1, 0(s0)
+L_1049e4c:
+// 0x01049e4c: 0x1049e4c: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01049e40: 0x1049e40: lui   v0, 0x60000
+// 0x01049e50: 0x1049e50: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x01049e44: 0x1049e44: addiu v0, v0, 20380
+// 0x01049e54: 0x1049e54: addiu v0, v0, 20844
 	ldloc 5
-	ldc.i4 20380
+	ldc.i4 20844
 	add
 	stloc 5
-// 0x01049e48: 0x1049e48: sw    v1, 28(v0)
+// 0x01049e58: 0x1049e58: sw    v1, 28(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7022,7 +7022,7 @@ L_1049e3c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01049e4c: 0x1049e4c: lw    v1, 4(s0)
+// 0x01049e5c: 0x1049e5c: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7031,10 +7031,10 @@ L_1049e3c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01049e50: 0x1049e50: lui   a0, 0x10000
+// 0x01049e60: 0x1049e60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049e54: 0x1049e54: sw    v1, 32(v0)
+// 0x01049e64: 0x1049e64: sw    v1, 32(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7043,9 +7043,9 @@ L_1049e3c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01049e58: 0x1049e58: jal   0x101cd60 addiu a0, a0, 1924
+// 0x01049e68: 0x1049e68: jal   0x101cd70 addiu a0, a0, 1920
 	ldloc.1
-	ldc.i4 1924
+	ldc.i4 1920
 	add
 	stloc.1
 	ldloc.0
@@ -7053,28 +7053,28 @@ L_1049e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049e60: 0x1049e60: lui   a0, 0x10000
+// 0x01049e70: 0x1049e70: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049e64: 0x1049e64: addiu a0, a0, 1932
+// 0x01049e74: 0x1049e74: addiu a0, a0, 1928
 	ldloc.1
-	ldc.i4 1932
+	ldc.i4 1928
 	add
 	stloc.1
-// 0x01049e68: 0x1049e68: lui   s0, 0x60000
+// 0x01049e78: 0x1049e78: lui   s0, 0x60000
 	ldc.i4 393216
 	stloc 10
-// 0x01049e6c: 0x1049e6c: jal   0x101cd60 sw    v0, 20320(s0)
+// 0x01049e7c: 0x1049e7c: jal   0x101cd70 sw    v0, 20784(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5080
+	ldc.i4 5196
 	add
 	ldloc 5
 	stelem.i4
@@ -7083,17 +7083,17 @@ L_1049e3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049e74: 0x1049e74: addiu s0, s0, 20320
+// 0x01049e84: 0x1049e84: addiu s0, s0, 20784
 	ldloc 10
-	ldc.i4 20320
+	ldc.i4 20784
 	add
 	stloc 10
-// 0x01049e78: 0x1049e78: jal   0x1008478 sw    v0, 4(s0)
+// 0x01049e88: 0x1049e88: jal   0x1008488 sw    v0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -7102,54 +7102,54 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_is_metric_1008478()
+	call int32 Cibyl5::roadmap_math_is_metric_1008488()
 	stloc 5
 // --- basic block ---
-// 0x01049e80: 0x1049e80: lui   a2, 0x60000
+// 0x01049e90: 0x1049e90: lui   a2, 0x60000
 	ldc.i4 393216
 	stloc.3
-// 0x01049e84: 0x1049e84: lui   a1, 0x60000
+// 0x01049e94: 0x1049e94: lui   a1, 0x60000
 	ldc.i4 393216
 	stloc.2
-// 0x01049e88: 0x1049e88: addiu a0, a2, 20328
+// 0x01049e98: 0x1049e98: addiu a0, a2, 20792
 	ldloc.3
-	ldc.i4 20328
+	ldc.i4 20792
 	add
 	stloc.1
-// 0x01049e8c: 0x1049e8c: beq   v0, zero, 0x1049f24 addiu v1, a1, 20352
+// 0x01049e9c: 0x1049e9c: beq   v0, zero, 0x1049f34 addiu v1, a1, 20816
 	ldloc 5
 	ldloc.2
-	ldc.i4 20352
+	ldc.i4 20816
 	add
 	stloc 6
-	brfalse L_1049f24
+	brfalse L_1049f34
 // --- basic block ---
-// 0x01049e94: 0x1049e94: lui   v0, 0x10000
+// 0x01049ea4: 0x1049ea4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049e98: 0x1049e98: addiu v0, v0, 1944
+// 0x01049ea8: 0x1049ea8: addiu v0, v0, 1940
 	ldloc 5
-	ldc.i4 1944
+	ldc.i4 1940
 	add
 	stloc 5
-// 0x01049e9c: 0x1049e9c: sw    v0, 20328(a2)
+// 0x01049eac: 0x1049eac: sw    v0, 20792(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 5082
+	ldc.i4 5198
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049ea0: 0x1049ea0: lui   v0, 0x10000
+// 0x01049eb0: 0x1049eb0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049ea4: 0x1049ea4: addiu v0, v0, 1976
+// 0x01049eb4: 0x1049eb4: addiu v0, v0, 1972
 	ldloc 5
-	ldc.i4 1976
+	ldc.i4 1972
 	add
 	stloc 5
-// 0x01049ea8: 0x1049ea8: sw    v0, 20(a0)
+// 0x01049eb8: 0x1049eb8: sw    v0, 20(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7158,32 +7158,32 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049eac: 0x1049eac: lui   v0, 0x10000
+// 0x01049ebc: 0x1049ebc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049eb0: 0x1049eb0: addiu v0, v0, 1984
+// 0x01049ec0: 0x1049ec0: addiu v0, v0, 1980
 	ldloc 5
-	ldc.i4 1984
+	ldc.i4 1980
 	add
 	stloc 5
-// 0x01049eb4: 0x1049eb4: sw    v0, 20352(a1)
+// 0x01049ec4: 0x1049ec4: sw    v0, 20816(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 5088
+	ldc.i4 5204
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049eb8: 0x1049eb8: lui   v0, 0x10000
+// 0x01049ec8: 0x1049ec8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049ebc: 0x1049ebc: addiu v0, v0, 2024
+// 0x01049ecc: 0x1049ecc: addiu v0, v0, 2020
 	ldloc 5
-	ldc.i4 2024
+	ldc.i4 2020
 	add
 	stloc 5
-// 0x01049ec0: 0x1049ec0: sw    v0, 20(v1)
+// 0x01049ed0: 0x1049ed0: sw    v0, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7192,15 +7192,15 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049ec4: 0x1049ec4: lui   v0, 0x10000
+// 0x01049ed4: 0x1049ed4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049ec8: 0x1049ec8: addiu v0, v0, 1948
+// 0x01049ed8: 0x1049ed8: addiu v0, v0, 1944
 	ldloc 5
-	ldc.i4 1948
+	ldc.i4 1944
 	add
 	stloc 5
-// 0x01049ecc: 0x1049ecc: sw    v0, 4(a0)
+// 0x01049edc: 0x1049edc: sw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7209,15 +7209,15 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049ed0: 0x1049ed0: lui   v0, 0x10000
+// 0x01049ee0: 0x1049ee0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049ed4: 0x1049ed4: addiu v0, v0, 1952
+// 0x01049ee4: 0x1049ee4: addiu v0, v0, 1948
 	ldloc 5
-	ldc.i4 1952
+	ldc.i4 1948
 	add
 	stloc 5
-// 0x01049ed8: 0x1049ed8: sw    v0, 8(a0)
+// 0x01049ee8: 0x1049ee8: sw    v0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7226,15 +7226,15 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049edc: 0x1049edc: lui   v0, 0x10000
+// 0x01049eec: 0x1049eec: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049ee0: 0x1049ee0: addiu v0, v0, 1960
+// 0x01049ef0: 0x1049ef0: addiu v0, v0, 1956
 	ldloc 5
-	ldc.i4 1960
+	ldc.i4 1956
 	add
 	stloc 5
-// 0x01049ee4: 0x1049ee4: sw    v0, 12(a0)
+// 0x01049ef4: 0x1049ef4: sw    v0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7243,15 +7243,15 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049ee8: 0x1049ee8: lui   v0, 0x10000
+// 0x01049ef8: 0x1049ef8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049eec: 0x1049eec: addiu v0, v0, 1968
+// 0x01049efc: 0x1049efc: addiu v0, v0, 1964
 	ldloc 5
-	ldc.i4 1968
+	ldc.i4 1964
 	add
 	stloc 5
-// 0x01049ef0: 0x1049ef0: sw    v0, 16(a0)
+// 0x01049f00: 0x1049f00: sw    v0, 16(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7260,15 +7260,15 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049ef4: 0x1049ef4: lui   v0, 0x10000
+// 0x01049f04: 0x1049f04: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049ef8: 0x1049ef8: addiu v0, v0, 1992
+// 0x01049f08: 0x1049f08: addiu v0, v0, 1988
 	ldloc 5
-	ldc.i4 1992
+	ldc.i4 1988
 	add
 	stloc 5
-// 0x01049efc: 0x1049efc: sw    v0, 4(v1)
+// 0x01049f0c: 0x1049f0c: sw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7277,15 +7277,15 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f00: 0x1049f00: lui   v0, 0x10000
+// 0x01049f10: 0x1049f10: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f04: 0x1049f04: addiu v0, v0, 2000
+// 0x01049f14: 0x1049f14: addiu v0, v0, 1996
 	ldloc 5
-	ldc.i4 2000
+	ldc.i4 1996
 	add
 	stloc 5
-// 0x01049f08: 0x1049f08: sw    v0, 8(v1)
+// 0x01049f18: 0x1049f18: sw    v0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7294,15 +7294,15 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f0c: 0x1049f0c: lui   v0, 0x10000
+// 0x01049f1c: 0x1049f1c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f10: 0x1049f10: addiu v0, v0, 2008
+// 0x01049f20: 0x1049f20: addiu v0, v0, 2004
 	ldloc 5
-	ldc.i4 2008
+	ldc.i4 2004
 	add
 	stloc 5
-// 0x01049f14: 0x1049f14: sw    v0, 12(v1)
+// 0x01049f24: 0x1049f24: sw    v0, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7311,43 +7311,43 @@ L_1049e3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f18: 0x1049f18: lui   v0, 0x10000
+// 0x01049f28: 0x1049f28: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f1c: 0x1049f1c: j	 0x1049fb0 addiu v0, v0, 2016
+// 0x01049f2c: 0x1049f2c: j	 0x1049fc0 addiu v0, v0, 2012
 	ldloc 5
-	ldc.i4 2016
+	ldc.i4 2012
 	add
 	stloc 5
-	br L_1049fb0
+	br L_1049fc0
 // --- basic block ---
-L_1049f24:
-// 0x01049f24: 0x1049f24: lui   v0, 0x10000
+L_1049f34:
+// 0x01049f34: 0x1049f34: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f28: 0x1049f28: addiu v0, v0, -15288
+// 0x01049f38: 0x1049f38: addiu v0, v0, -15292
 	ldloc 5
-	ldc.i4 -15288
+	ldc.i4 -15292
 	add
 	stloc 5
-// 0x01049f2c: 0x1049f2c: sw    v0, 20328(a2)
+// 0x01049f3c: 0x1049f3c: sw    v0, 20792(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 5082
+	ldc.i4 5198
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f30: 0x1049f30: lui   v0, 0x10000
+// 0x01049f40: 0x1049f40: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f34: 0x1049f34: addiu v0, v0, 2060
+// 0x01049f44: 0x1049f44: addiu v0, v0, 2056
 	ldloc 5
-	ldc.i4 2060
+	ldc.i4 2056
 	add
 	stloc 5
-// 0x01049f38: 0x1049f38: sw    v0, 20(a0)
+// 0x01049f48: 0x1049f48: sw    v0, 20(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7356,32 +7356,32 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f3c: 0x1049f3c: lui   v0, 0x10000
+// 0x01049f4c: 0x1049f4c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f40: 0x1049f40: addiu v0, v0, 2068
+// 0x01049f50: 0x1049f50: addiu v0, v0, 2064
 	ldloc 5
-	ldc.i4 2068
+	ldc.i4 2064
 	add
 	stloc 5
-// 0x01049f44: 0x1049f44: sw    v0, 20352(a1)
+// 0x01049f54: 0x1049f54: sw    v0, 20816(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 5088
+	ldc.i4 5204
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f48: 0x1049f48: lui   v0, 0x10000
+// 0x01049f58: 0x1049f58: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f4c: 0x1049f4c: addiu v0, v0, 2108
+// 0x01049f5c: 0x1049f5c: addiu v0, v0, 2104
 	ldloc 5
-	ldc.i4 2108
+	ldc.i4 2104
 	add
 	stloc 5
-// 0x01049f50: 0x1049f50: sw    v0, 20(v1)
+// 0x01049f60: 0x1049f60: sw    v0, 20(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7390,15 +7390,15 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f54: 0x1049f54: lui   v0, 0x10000
+// 0x01049f64: 0x1049f64: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f58: 0x1049f58: addiu v0, v0, 2032
+// 0x01049f68: 0x1049f68: addiu v0, v0, 2028
 	ldloc 5
-	ldc.i4 2032
+	ldc.i4 2028
 	add
 	stloc 5
-// 0x01049f5c: 0x1049f5c: sw    v0, 4(a0)
+// 0x01049f6c: 0x1049f6c: sw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7407,15 +7407,15 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f60: 0x1049f60: lui   v0, 0x10000
+// 0x01049f70: 0x1049f70: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f64: 0x1049f64: addiu v0, v0, 2036
+// 0x01049f74: 0x1049f74: addiu v0, v0, 2032
 	ldloc 5
-	ldc.i4 2036
+	ldc.i4 2032
 	add
 	stloc 5
-// 0x01049f68: 0x1049f68: sw    v0, 8(a0)
+// 0x01049f78: 0x1049f78: sw    v0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7424,15 +7424,15 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f6c: 0x1049f6c: lui   v0, 0x10000
+// 0x01049f7c: 0x1049f7c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f70: 0x1049f70: addiu v0, v0, 2044
+// 0x01049f80: 0x1049f80: addiu v0, v0, 2040
 	ldloc 5
-	ldc.i4 2044
+	ldc.i4 2040
 	add
 	stloc 5
-// 0x01049f74: 0x1049f74: sw    v0, 12(a0)
+// 0x01049f84: 0x1049f84: sw    v0, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7441,15 +7441,15 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f78: 0x1049f78: lui   v0, 0x10000
+// 0x01049f88: 0x1049f88: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f7c: 0x1049f7c: addiu v0, v0, 2052
+// 0x01049f8c: 0x1049f8c: addiu v0, v0, 2048
 	ldloc 5
-	ldc.i4 2052
+	ldc.i4 2048
 	add
 	stloc 5
-// 0x01049f80: 0x1049f80: sw    v0, 16(a0)
+// 0x01049f90: 0x1049f90: sw    v0, 16(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -7458,15 +7458,15 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f84: 0x1049f84: lui   v0, 0x10000
+// 0x01049f94: 0x1049f94: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f88: 0x1049f88: addiu v0, v0, 2076
+// 0x01049f98: 0x1049f98: addiu v0, v0, 2072
 	ldloc 5
-	ldc.i4 2076
+	ldc.i4 2072
 	add
 	stloc 5
-// 0x01049f8c: 0x1049f8c: sw    v0, 4(v1)
+// 0x01049f9c: 0x1049f9c: sw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7475,15 +7475,15 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f90: 0x1049f90: lui   v0, 0x10000
+// 0x01049fa0: 0x1049fa0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049f94: 0x1049f94: addiu v0, v0, 2084
+// 0x01049fa4: 0x1049fa4: addiu v0, v0, 2080
 	ldloc 5
-	ldc.i4 2084
+	ldc.i4 2080
 	add
 	stloc 5
-// 0x01049f98: 0x1049f98: sw    v0, 8(v1)
+// 0x01049fa8: 0x1049fa8: sw    v0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7492,15 +7492,15 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049f9c: 0x1049f9c: lui   v0, 0x10000
+// 0x01049fac: 0x1049fac: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049fa0: 0x1049fa0: addiu v0, v0, 2092
+// 0x01049fb0: 0x1049fb0: addiu v0, v0, 2088
 	ldloc 5
-	ldc.i4 2092
+	ldc.i4 2088
 	add
 	stloc 5
-// 0x01049fa4: 0x1049fa4: sw    v0, 12(v1)
+// 0x01049fb4: 0x1049fb4: sw    v0, 12(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -7509,16 +7509,16 @@ L_1049f24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049fa8: 0x1049fa8: lui   v0, 0x10000
+// 0x01049fb8: 0x1049fb8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01049fac: 0x1049fac: addiu v0, v0, 2100
+// 0x01049fbc: 0x1049fbc: addiu v0, v0, 2096
 	ldloc 5
-	ldc.i4 2100
+	ldc.i4 2096
 	add
 	stloc 5
-L_1049fb0:
-// 0x01049fb0: 0x1049fb0: beq   s6, zero, 0x1049fc4 sw    v0, 16(v1)
+L_1049fc0:
+// 0x01049fc0: 0x1049fc0: beq   s6, zero, 0x1049fd4 sw    v0, 16(v1)
 	ldloc 15
 	ldloc 7
 	ldloc 6
@@ -7528,54 +7528,54 @@ L_1049fb0:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1049fc4
+	brfalse L_1049fd4
 // --- basic block ---
-// 0x01049fb8: 0x1049fb8: lui   a0, 0x10000
+// 0x01049fc8: 0x1049fc8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049fbc: 0x1049fbc: j	 0x1049fcc addiu a0, a0, 2116
+// 0x01049fcc: 0x1049fcc: j	 0x1049fdc addiu a0, a0, 2112
 	ldloc.1
-	ldc.i4 2116
+	ldc.i4 2112
 	add
 	stloc.1
-	br L_1049fcc
+	br L_1049fdc
 // --- basic block ---
-L_1049fc4:
-// 0x01049fc4: 0x1049fc4: lui   a0, 0x10000
+L_1049fd4:
+// 0x01049fd4: 0x1049fd4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049fc8: 0x1049fc8: addiu a0, a0, -23836
+// 0x01049fd8: 0x1049fd8: addiu a0, a0, -23836
 	ldloc.1
 	ldc.i4 -23836
 	add
 	stloc.1
-L_1049fcc:
-// 0x01049fcc: 0x1049fcc: jal   0x101cd60 sll   zero, zero, 0
+L_1049fdc:
+// 0x01049fdc: 0x1049fdc: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049fd4: 0x1049fd4: lui   a0, 0x10000
+// 0x01049fe4: 0x1049fe4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049fd8: 0x1049fd8: addiu a0, a0, 2136
+// 0x01049fe8: 0x1049fe8: addiu a0, a0, 2132
 	ldloc.1
-	ldc.i4 2136
+	ldc.i4 2132
 	add
 	stloc.1
-// 0x01049fdc: 0x1049fdc: addu  a1, v0, zero
+// 0x01049fec: 0x1049fec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01049fe0: 0x1049fe0: addu  a2, zero, zero
+// 0x01049ff0: 0x1049ff0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01049fe4: 0x1049fe4: jal   0x1095a08 addiu a3, zero, 8192
+// 0x01049ff4: 0x1049ff4: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -7583,21 +7583,21 @@ L_1049fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01049fec: 0x1049fec: lui   a1, 0x10000
+// 0x01049ffc: 0x1049ffc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01049ff0: 0x1049ff0: lui   a0, 0x10000
+// 0x0104a000: 0x104a000: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01049ff4: 0x1049ff4: addiu a3, zero, -2
+// 0x0104a004: 0x104a004: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x01049ff8: 0x1049ff8: sw    v0, 32(sp)
+// 0x0104a008: 0x104a008: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7606,23 +7606,23 @@ L_1049fcc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01049ffc: 0x1049ffc: addiu a1, a1, 18500
+// 0x0104a00c: 0x104a00c: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104a000: 0x104a000: addiu a0, a0, 2148
+// 0x0104a010: 0x104a010: addiu a0, a0, 2144
 	ldloc.1
-	ldc.i4 2148
+	ldc.i4 2144
 	add
 	stloc.1
-// 0x0104a004: 0x104a004: addiu a2, zero, -2
+// 0x0104a014: 0x104a014: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0104a008: 0x104a008: addiu v0, zero, 8
+// 0x0104a018: 0x104a018: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0104a00c: 0x104a00c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0104a01c: 0x104a01c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7636,32 +7636,32 @@ L_1049fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a014: 0x104a014: addu  a0, v0, zero
+// 0x0104a024: 0x104a024: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104a018: 0x104a018: addu  a1, zero, zero
+// 0x0104a028: 0x104a028: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a01c: 0x104a01c: addu  a2, zero, zero
+// 0x0104a02c: 0x104a02c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a020: 0x104a020: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0104a030: 0x104a030: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104a028: 0x104a028: lui   a0, 0x0
+// 0x0104a038: 0x104a038: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104a02c: 0x104a02c: jal   0x101cd60 addiu a0, a0, 27208
+// 0x0104a03c: 0x104a03c: jal   0x101cd70 addiu a0, a0, 27208
 	ldloc.1
 	ldc.i4 27208
 	add
@@ -7671,26 +7671,26 @@ L_1049fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a034: 0x104a034: lui   a0, 0x10000
+// 0x0104a044: 0x104a044: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a038: 0x104a038: addiu a2, zero, 18
+// 0x0104a048: 0x104a048: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0104a03c: 0x104a03c: addiu a3, zero, 8
+// 0x0104a04c: 0x104a04c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0104a040: 0x104a040: addiu a0, a0, 2168
+// 0x0104a050: 0x104a050: addiu a0, a0, 2164
 	ldloc.1
-	ldc.i4 2168
+	ldc.i4 2164
 	add
 	stloc.1
-// 0x0104a044: 0x104a044: jal   0x1098d10 addu  a1, v0, zero
+// 0x0104a054: 0x104a054: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -7698,50 +7698,50 @@ L_1049fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a04c: 0x104a04c: addu  a1, v0, zero
+// 0x0104a05c: 0x104a05c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a050: 0x104a050: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0104a060: 0x104a060: jal   0x109950c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a058: 0x104a058: lui   a0, 0x10000
+// 0x0104a068: 0x104a068: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a05c: 0x104a05c: lui   v0, 0x41000000
+// 0x0104a06c: 0x104a06c: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x0104a060: 0x104a060: ori   v0, v0, 20616
+// 0x0104a070: 0x104a070: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x0104a064: 0x104a064: addiu a0, a0, -23936
+// 0x0104a074: 0x104a074: addiu a0, a0, -23936
 	ldloc.1
 	ldc.i4 -23936
 	add
 	stloc.1
-// 0x0104a068: 0x104a068: addu  a1, zero, zero
+// 0x0104a078: 0x104a078: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a06c: 0x104a06c: addiu a2, zero, -2
+// 0x0104a07c: 0x104a07c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0104a070: 0x104a070: addiu a3, zero, -1
+// 0x0104a080: 0x104a080: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a074: 0x104a074: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0104a084: 0x104a084: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7755,18 +7755,18 @@ L_1049fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a07c: 0x104a07c: beq   s1, zero, 0x104a0fc addu  s2, v0, zero
+// 0x0104a08c: 0x104a08c: beq   s1, zero, 0x104a10c addu  s2, v0, zero
 	ldloc 8
 	ldloc 5
 	stloc 11
-	brfalse L_104a0fc
+	brfalse L_104a10c
 // --- basic block ---
-// 0x0104a084: 0x104a084: lw    a1, 4(s1)
+// 0x0104a094: 0x104a094: lw    a1, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7775,33 +7775,33 @@ L_1049fcc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104a088: 0x104a088: sll   zero, zero, 0
-// 0x0104a08c: 0x104a08c: beq   a1, zero, 0x104a0cc addu  v0, zero, zero
+// 0x0104a098: 0x104a098: sll   zero, zero, 0
+// 0x0104a09c: 0x104a09c: beq   a1, zero, 0x104a0dc addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_104a0cc
+	brfalse L_104a0dc
 // --- basic block ---
-// 0x0104a094: 0x104a094: lb    v0, 0(a1)
+// 0x0104a0a4: 0x104a0a4: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104a098: 0x104a098: sll   zero, zero, 0
-// 0x0104a09c: 0x104a09c: beq   v0, zero, 0x104a0c8 lui   a0, 0x10000
+// 0x0104a0a8: 0x104a0a8: sll   zero, zero, 0
+// 0x0104a0ac: 0x104a0ac: beq   v0, zero, 0x104a0d8 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_104a0c8
+	brfalse L_104a0d8
 // --- basic block ---
-// 0x0104a0a4: 0x104a0a4: addiu a0, a0, 2184
+// 0x0104a0b4: 0x104a0b4: addiu a0, a0, 2180
 	ldloc.1
-	ldc.i4 2184
+	ldc.i4 2180
 	add
 	stloc.1
-// 0x0104a0a8: 0x104a0a8: addiu a2, zero, -1
+// 0x0104a0b8: 0x104a0b8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104a0ac: 0x104a0ac: jal   0x1098d10 addiu a3, zero, 8
+// 0x0104a0bc: 0x104a0bc: jal   0x1099358 addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
 	ldloc.0
@@ -7809,35 +7809,35 @@ L_1049fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a0b4: 0x104a0b4: addu  a1, v0, zero
+// 0x0104a0c4: 0x104a0c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a0b8: 0x104a0b8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x0104a0c8: 0x104a0c8: jal   0x109950c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a0c0: 0x104a0c0: j	 0x104a0cc addiu v0, zero, 1
+// 0x0104a0d0: 0x104a0d0: j	 0x104a0dc addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_104a0cc
+	br L_104a0dc
 // --- basic block ---
-L_104a0c8:
-// 0x0104a0c8: 0x104a0c8: addu  v0, zero, zero
+L_104a0d8:
+// 0x0104a0d8: 0x104a0d8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_104a0cc:
-// 0x0104a0cc: 0x104a0cc: lw    a1, 12(s1)
+L_104a0dc:
+// 0x0104a0dc: 0x104a0dc: lw    a1, 12(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -7846,56 +7846,56 @@ L_104a0cc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104a0d0: 0x104a0d0: sll   zero, zero, 0
-// 0x0104a0d4: 0x104a0d4: beq   a1, zero, 0x104a0f4 sll   zero, zero, 0
+// 0x0104a0e0: 0x104a0e0: sll   zero, zero, 0
+// 0x0104a0e4: 0x104a0e4: beq   a1, zero, 0x104a104 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_104a0f4
+	brfalse L_104a104
 // --- basic block ---
-// 0x0104a0dc: 0x104a0dc: lb    v1, 0(a1)
+// 0x0104a0ec: 0x104a0ec: lb    v1, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0104a0e0: 0x104a0e0: sll   zero, zero, 0
-// 0x0104a0e4: 0x104a0e4: beq   v1, zero, 0x104a0f4 lui   a0, 0x10000
+// 0x0104a0f0: 0x104a0f0: sll   zero, zero, 0
+// 0x0104a0f4: 0x104a0f4: beq   v1, zero, 0x104a104 lui   a0, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	brfalse L_104a0f4
+	brfalse L_104a104
 // --- basic block ---
-// 0x0104a0ec: 0x104a0ec: j	 0x104a10c addiu a0, a0, 2196
+// 0x0104a0fc: 0x104a0fc: j	 0x104a11c addiu a0, a0, 2192
 	ldloc.1
-	ldc.i4 2196
+	ldc.i4 2192
 	add
 	stloc.1
-	br L_104a10c
+	br L_104a11c
 // --- basic block ---
-L_104a0f4:
-// 0x0104a0f4: 0x104a0f4: bne   v0, zero, 0x104a124 sll   zero, zero, 0
+L_104a104:
+// 0x0104a104: 0x104a104: bne   v0, zero, 0x104a134 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104a124
+	brtrue L_104a134
 // --- basic block ---
-L_104a0fc:
-// 0x0104a0fc: 0x104a0fc: lui   a0, 0x10000
+L_104a10c:
+// 0x0104a10c: 0x104a10c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a100: 0x104a100: lui   a1, 0x10000
+// 0x0104a110: 0x104a110: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104a104: 0x104a104: addiu a0, a0, 2184
+// 0x0104a114: 0x104a114: addiu a0, a0, 2180
 	ldloc.1
-	ldc.i4 2184
+	ldc.i4 2180
 	add
 	stloc.1
-// 0x0104a108: 0x104a108: addiu a1, a1, -22604
+// 0x0104a118: 0x104a118: addiu a1, a1, -22604
 	ldloc.2
 	ldc.i4 -22604
 	add
 	stloc.2
-L_104a10c:
-// 0x0104a10c: 0x104a10c: addiu a2, zero, -1
+L_104a11c:
+// 0x0104a11c: 0x104a11c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104a110: 0x104a110: jal   0x1098d10 addiu a3, zero, 8
+// 0x0104a120: 0x104a120: jal   0x1099358 addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
 	ldloc.0
@@ -7903,48 +7903,48 @@ L_104a10c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a118: 0x104a118: addu  a1, v0, zero
+// 0x0104a128: 0x104a128: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a11c: 0x104a11c: jal   0x1098ec4 addu  a0, s2, zero
+// 0x0104a12c: 0x104a12c: jal   0x109950c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104a124:
-// 0x0104a124: 0x104a124: addu  a1, s2, zero
+L_104a134:
+// 0x0104a134: 0x104a134: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x0104a128: 0x104a128: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0104a138: 0x104a138: jal   0x109950c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a130: 0x104a130: lui   s1, 0x20000
+// 0x0104a140: 0x104a140: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0104a134: 0x104a134: addiu a1, zero, 5
+// 0x0104a144: 0x104a144: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0104a138: 0x104a138: addiu a2, zero, 8
+// 0x0104a148: 0x104a148: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x0104a13c: 0x104a13c: jal   0x109434c addu  a0, s0, zero
+// 0x0104a14c: 0x104a14c: jal   0x1094970 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7952,14 +7952,14 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a144: 0x104a144: jal   0x101cd60 addiu a0, s1, -18240
+// 0x0104a154: 0x104a154: jal   0x101cd70 addiu a0, s1, -17776
 	ldloc 8
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
 	ldloc.0
@@ -7967,23 +7967,23 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a14c: 0x104a14c: addu  a1, v0, zero
+// 0x0104a15c: 0x104a15c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a150: 0x104a150: addiu a2, zero, 18
+// 0x0104a160: 0x104a160: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0104a154: 0x104a154: addiu a3, zero, 8
+// 0x0104a164: 0x104a164: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0104a158: 0x104a158: jal   0x1098d10 addiu a0, s1, -18240
+// 0x0104a168: 0x104a168: jal   0x1099358 addiu a0, s1, -17776
 	ldloc 8
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
 	ldloc.0
@@ -7991,50 +7991,50 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a160: 0x104a160: addu  a1, v0, zero
+// 0x0104a170: 0x104a170: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a164: 0x104a164: addu  a0, s0, zero
+// 0x0104a174: 0x104a174: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104a168: 0x104a168: lui   s5, 0x10000
+// 0x0104a178: 0x104a178: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0104a16c: 0x104a16c: jal   0x1098ec4 lui   s3, 0x41000000
+// 0x0104a17c: 0x104a17c: jal   0x109950c lui   s3, 0x41000000
 	ldc.i4 1090519040
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a174: 0x104a174: ori   s3, s3, 20616
+// 0x0104a184: 0x104a184: ori   s3, s3, 20616
 	ldloc 9
 	ldc.i4 20616
 	or
 	stloc 9
-// 0x0104a178: 0x104a178: addu  a1, zero, zero
+// 0x0104a188: 0x104a188: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a17c: 0x104a17c: addiu a2, zero, -2
+// 0x0104a18c: 0x104a18c: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0104a180: 0x104a180: addiu a3, zero, -1
+// 0x0104a190: 0x104a190: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a184: 0x104a184: addiu a0, s5, -23936
+// 0x0104a194: 0x104a194: addiu a0, s5, -23936
 	ldloc 12
 	ldc.i4 -23936
 	add
 	stloc.1
-// 0x0104a188: 0x104a188: jal   0x1093a24 sw    s3, 16(sp)
+// 0x0104a198: 0x104a198: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8048,20 +8048,20 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a190: 0x104a190: addiu a0, s1, -18240
+// 0x0104a1a0: 0x104a1a0: addiu a0, s1, -17776
 	ldloc 8
-	ldc.i4 -18240
+	ldc.i4 -17776
 	add
 	stloc.1
-// 0x0104a194: 0x104a194: addu  s7, v0, zero
+// 0x0104a1a4: 0x104a1a4: addu  s7, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0104a198: 0x104a198: jal   0x101cd60 lui   s2, 0x10000
+// 0x0104a1a8: 0x104a1a8: jal   0x101cd70 lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 11
 	ldloc.0
@@ -8069,39 +8069,39 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a1a0: 0x104a1a0: lui   s4, 0x100000
+// 0x0104a1b0: 0x104a1b0: lui   s4, 0x100000
 	ldc.i4 1048576
 	stloc 14
-// 0x0104a1a4: 0x104a1a4: lui   a0, 0x10000
+// 0x0104a1b4: 0x104a1b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a1a8: 0x104a1a8: addiu v1, zero, -1
+// 0x0104a1b8: 0x104a1b8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0104a1ac: 0x104a1ac: ori   a2, s4, 136
+// 0x0104a1bc: 0x104a1bc: ori   a2, s4, 136
 	ldloc 14
 	ldc.i4 136
 	or
 	stloc.3
-// 0x0104a1b0: 0x104a1b0: addu  a3, zero, zero
+// 0x0104a1c0: 0x104a1c0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104a1b4: 0x104a1b4: addiu a0, a0, 1884
+// 0x0104a1c4: 0x104a1c4: addiu a0, a0, 1880
 	ldloc.1
-	ldc.i4 1884
+	ldc.i4 1880
 	add
 	stloc.1
-// 0x0104a1b8: 0x104a1b8: addiu a1, s2, 18500
+// 0x0104a1c8: 0x104a1c8: addiu a1, s2, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104a1bc: 0x104a1bc: sw    v0, 24(sp)
+// 0x0104a1cc: 0x104a1cc: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8110,10 +8110,10 @@ L_104a124:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104a1c0: 0x104a1c0: addiu v0, zero, -2
+// 0x0104a1d0: 0x104a1d0: addiu v0, zero, -2
 	ldc.i4.s -2
 	stloc 5
-// 0x0104a1c4: 0x104a1c4: sw    v1, 20(sp)
+// 0x0104a1d4: 0x104a1d4: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8122,7 +8122,7 @@ L_104a124:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104a1c8: 0x104a1c8: jal   0x109683c sw    v0, 16(sp)
+// 0x0104a1d8: 0x104a1d8: jal   0x1096e84 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8136,44 +8136,44 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a1d0: 0x104a1d0: addu  a1, v0, zero
+// 0x0104a1e0: 0x104a1e0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a1d4: 0x104a1d4: jal   0x1098ec4 addu  a0, s7, zero
+// 0x0104a1e4: 0x104a1e4: jal   0x109950c addu  a0, s7, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a1dc: 0x104a1dc: addu  a0, s0, zero
+// 0x0104a1ec: 0x104a1ec: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104a1e0: 0x104a1e0: jal   0x1098ec4 addu  a1, s7, zero
+// 0x0104a1f0: 0x104a1f0: jal   0x109950c addu  a1, s7, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a1e8: 0x104a1e8: addu  a0, s0, zero
+// 0x0104a1f8: 0x104a1f8: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104a1ec: 0x104a1ec: addiu a1, zero, 5
+// 0x0104a1fc: 0x104a1fc: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0104a1f0: 0x104a1f0: jal   0x109434c addiu a2, zero, 8
+// 0x0104a200: 0x104a200: jal   0x1094970 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -8181,34 +8181,34 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a1f8: 0x104a1f8: jal   0x1049d9c sll   zero, zero, 0
+// 0x0104a208: 0x104a208: jal   0x1049dac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_reminder_feature_enabled_1049d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_reminder_feature_enabled_1049dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a200: 0x104a200: beq   v0, zero, 0x104a614 lui   s1, 0x10000
+// 0x0104a210: 0x104a210: beq   v0, zero, 0x104a624 lui   s1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brfalse L_104a614
+	brfalse L_104a624
 // --- basic block ---
-// 0x0104a208: 0x104a208: lui   a0, 0x10000
+// 0x0104a218: 0x104a218: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a20c: 0x104a20c: jal   0x101cd60 addiu a0, a0, -10576
+// 0x0104a21c: 0x104a21c: jal   0x101cd70 addiu a0, a0, -10580
 	ldloc.1
-	ldc.i4 -10576
+	ldc.i4 -10580
 	add
 	stloc.1
 	ldloc.0
@@ -8216,26 +8216,26 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a214: 0x104a214: lui   a0, 0x10000
+// 0x0104a224: 0x104a224: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a218: 0x104a218: addiu a2, zero, 18
+// 0x0104a228: 0x104a228: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0104a21c: 0x104a21c: addiu a3, zero, 8
+// 0x0104a22c: 0x104a22c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0104a220: 0x104a220: addiu a0, a0, 2208
+// 0x0104a230: 0x104a230: addiu a0, a0, 2204
 	ldloc.1
-	ldc.i4 2208
+	ldc.i4 2204
 	add
 	stloc.1
-// 0x0104a224: 0x104a224: jal   0x1098d10 addu  a1, v0, zero
+// 0x0104a234: 0x104a234: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -8243,39 +8243,39 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a22c: 0x104a22c: addu  a1, v0, zero
+// 0x0104a23c: 0x104a23c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a230: 0x104a230: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0104a240: 0x104a240: jal   0x109950c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a238: 0x104a238: addiu a0, s5, -23936
+// 0x0104a248: 0x104a248: addiu a0, s5, -23936
 	ldloc 12
 	ldc.i4 -23936
 	add
 	stloc.1
-// 0x0104a23c: 0x104a23c: addu  a1, zero, zero
+// 0x0104a24c: 0x104a24c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a240: 0x104a240: addiu a2, zero, -2
+// 0x0104a250: 0x104a250: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0104a244: 0x104a244: addiu a3, zero, -1
+// 0x0104a254: 0x104a254: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a248: 0x104a248: jal   0x1093a24 sw    s3, 16(sp)
+// 0x0104a258: 0x104a258: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8289,34 +8289,34 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a250: 0x104a250: lui   a0, 0x10000
+// 0x0104a260: 0x104a260: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a254: 0x104a254: addiu t0, zero, 8
+// 0x0104a264: 0x104a264: addiu t0, zero, 8
 	ldc.i4.8
 	stloc 16
-// 0x0104a258: 0x104a258: addiu a3, zero, -1
+// 0x0104a268: 0x104a268: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a25c: 0x104a25c: addiu a0, a0, 2228
+// 0x0104a26c: 0x104a26c: addiu a0, a0, 2224
 	ldloc.1
-	ldc.i4 2228
+	ldc.i4 2224
 	add
 	stloc.1
-// 0x0104a260: 0x104a260: addiu a1, s2, 18500
+// 0x0104a270: 0x104a270: addiu a1, s2, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104a264: 0x104a264: addiu a2, zero, -2
+// 0x0104a274: 0x104a274: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0104a268: 0x104a268: sw    t0, 16(sp)
+// 0x0104a278: 0x104a278: sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8325,7 +8325,7 @@ L_104a124:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104a26c: 0x104a26c: sw    t0, 36(sp)
+// 0x0104a27c: 0x104a27c: sw    t0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8334,7 +8334,7 @@ L_104a124:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104a270: 0x104a270: jal   0x1093a24 addu  s1, v0, zero
+// 0x0104a280: 0x104a280: jal   0x1094048 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -8342,34 +8342,34 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a278: 0x104a278: addu  a0, v0, zero
+// 0x0104a288: 0x104a288: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104a27c: 0x104a27c: addu  a1, zero, zero
+// 0x0104a28c: 0x104a28c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a280: 0x104a280: addu  a2, zero, zero
+// 0x0104a290: 0x104a290: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a284: 0x104a284: jal   0x1098fe0 addu  s3, v0, zero
+// 0x0104a294: 0x104a294: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104a28c: 0x104a28c: lui   a0, 0x10000
+// 0x0104a29c: 0x104a29c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a290: 0x104a290: jal   0x101cd60 addiu a0, a0, -10584
+// 0x0104a2a0: 0x104a2a0: jal   0x101cd70 addiu a0, a0, -10588
 	ldloc.1
-	ldc.i4 -10584
+	ldc.i4 -10588
 	add
 	stloc.1
 	ldloc.0
@@ -8377,26 +8377,26 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a298: 0x104a298: lui   a0, 0x20000
+// 0x0104a2a8: 0x104a2a8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0104a29c: 0x104a29c: addiu a2, zero, 14
+// 0x0104a2ac: 0x104a2ac: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x0104a2a0: 0x104a2a0: addiu a3, zero, 4240
+// 0x0104a2b0: 0x104a2b0: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x0104a2a4: 0x104a2a4: addiu a0, a0, 9016
+// 0x0104a2b4: 0x104a2b4: addiu a0, a0, 9480
 	ldloc.1
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
-// 0x0104a2a8: 0x104a2a8: jal   0x1098d10 addu  a1, v0, zero
+// 0x0104a2b8: 0x104a2b8: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -8404,47 +8404,47 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a2b0: 0x104a2b0: addu  a1, v0, zero
+// 0x0104a2c0: 0x104a2c0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a2b4: 0x104a2b4: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0104a2c4: 0x104a2c4: jal   0x109950c addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a2bc: 0x104a2bc: lui   a3, 0x1050000
+// 0x0104a2cc: 0x104a2cc: lui   a3, 0x1050000
 	ldc.i4 17104896
 	stloc 4
-// 0x0104a2c0: 0x104a2c0: lui   a0, 0x10000
+// 0x0104a2d0: 0x104a2d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a2c4: 0x104a2c4: addiu a3, a3, -29280
+// 0x0104a2d4: 0x104a2d4: addiu a3, a3, -29264
 	ldloc 4
-	ldc.i4 -29280
+	ldc.i4 -29264
 	add
 	stloc 4
-// 0x0104a2c8: 0x104a2c8: addiu a2, zero, 2
+// 0x0104a2d8: 0x104a2d8: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0104a2cc: 0x104a2cc: addiu a0, a0, 1648
+// 0x0104a2dc: 0x104a2dc: addiu a0, a0, 1644
 	ldloc.1
-	ldc.i4 1648
+	ldc.i4 1644
 	add
 	stloc.1
-// 0x0104a2d0: 0x104a2d0: addu  a1, s6, zero
+// 0x0104a2e0: 0x104a2e0: addu  a1, s6, zero
 	ldloc 15
 	stloc.2
-// 0x0104a2d4: 0x104a2d4: sw    zero, 16(sp)
+// 0x0104a2e4: 0x104a2e4: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8453,7 +8453,7 @@ L_104a124:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104a2d8: 0x104a2d8: sw    zero, 20(sp)
+// 0x0104a2e8: 0x104a2e8: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8462,7 +8462,7 @@ L_104a124:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104a2dc: 0x104a2dc: jal   0x109c14c sw    zero, 24(sp)
+// 0x0104a2ec: 0x104a2ec: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8476,57 +8476,57 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a2e4: 0x104a2e4: addu  a1, v0, zero
+// 0x0104a2f4: 0x104a2f4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a2e8: 0x104a2e8: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0104a2f8: 0x104a2f8: jal   0x109950c addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a2f0: 0x104a2f0: addu  a1, s3, zero
+// 0x0104a300: 0x104a300: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0104a2f4: 0x104a2f4: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0104a304: 0x104a304: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a2fc: 0x104a2fc: lui   v0, 0x10000
+// 0x0104a30c: 0x104a30c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104a300: 0x104a300: addiu a3, zero, -1
+// 0x0104a310: 0x104a310: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a304: 0x104a304: addiu a1, s2, 18500
+// 0x0104a314: 0x104a314: addiu a1, s2, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104a308: 0x104a308: addiu a2, zero, -1
+// 0x0104a318: 0x104a318: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104a30c: 0x104a30c: addiu a0, v0, -25532
+// 0x0104a31c: 0x104a31c: addiu a0, v0, -25532
 	ldloc 5
 	ldc.i4 -25532
 	add
 	stloc.1
-// 0x0104a310: 0x104a310: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0104a320: 0x104a320: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8540,27 +8540,27 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a318: 0x104a318: addu  a0, v0, zero
+// 0x0104a328: 0x104a328: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104a31c: 0x104a31c: lui   v1, 0xf0000
+// 0x0104a32c: 0x104a32c: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0104a320: 0x104a320: addu  a1, zero, zero
+// 0x0104a330: 0x104a330: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a324: 0x104a324: addu  a2, zero, zero
+// 0x0104a334: 0x104a334: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a328: 0x104a328: addu  s3, v0, zero
+// 0x0104a338: 0x104a338: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0104a32c: 0x104a32c: jal   0x1098fe0 sw    v1, 44(sp)
+// 0x0104a33c: 0x104a33c: jal   0x1099628 sw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8572,9 +8572,9 @@ L_104a124:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104a334: 0x104a334: lw    v1, 44(sp)
+// 0x0104a344: 0x104a344: lw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8583,41 +8583,41 @@ L_104a124:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104a338: 0x104a338: addiu s5, zero, 2
+// 0x0104a348: 0x104a348: addiu s5, zero, 2
 	ldc.i4.2
 	stloc 12
-// 0x0104a33c: 0x104a33c: lw    a2, -30068(v1)
+// 0x0104a34c: 0x104a34c: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104a340: 0x104a340: lui   s8, 0x10000
+// 0x0104a350: 0x104a350: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 18
-// 0x0104a344: 0x104a344: div   a2, s5
+// 0x0104a354: 0x104a354: div   a2, s5
 	ldloc.3
 	ldloc 12
 	div
 	stloc 20
-// 0x0104a348: 0x104a348: addiu t1, zero, 16
+// 0x0104a358: 0x104a358: addiu t1, zero, 16
 	ldc.i4.s 16
 	stloc 17
-// 0x0104a34c: 0x104a34c: addiu a3, zero, -1
+// 0x0104a35c: 0x104a35c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a350: 0x104a350: addu  a1, zero, zero
+// 0x0104a360: 0x104a360: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a354: 0x104a354: addiu a0, s8, -32632
+// 0x0104a364: 0x104a364: addiu a0, s8, -32632
 	ldloc 18
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x0104a358: 0x104a358: sw    t1, 16(sp)
+// 0x0104a368: 0x104a368: sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8626,10 +8626,10 @@ L_104a124:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0104a35c: 0x104a35c: mflo  lo
+// 0x0104a36c: 0x104a36c: mflo  lo
 	ldloc 20
 	stloc.3
-// 0x0104a360: 0x104a360: jal   0x1093a24 sw    t1, 40(sp)
+// 0x0104a370: 0x104a370: jal   0x1094048 sw    t1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8643,34 +8643,34 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a368: 0x104a368: addu  a0, v0, zero
+// 0x0104a378: 0x104a378: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104a36c: 0x104a36c: addu  a1, zero, zero
+// 0x0104a37c: 0x104a37c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a370: 0x104a370: addu  a2, zero, zero
+// 0x0104a380: 0x104a380: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a374: 0x104a374: jal   0x1098fe0 addu  s7, v0, zero
+// 0x0104a384: 0x104a384: jal   0x1099628 addu  s7, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104a37c: 0x104a37c: lui   v0, 0x10000
+// 0x0104a38c: 0x104a38c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104a380: 0x104a380: jal   0x101cd60 addiu a0, v0, 2248
+// 0x0104a390: 0x104a390: jal   0x101cd70 addiu a0, v0, 2244
 	ldloc 5
-	ldc.i4 2248
+	ldc.i4 2244
 	add
 	stloc.1
 	ldloc.0
@@ -8678,26 +8678,26 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a388: 0x104a388: lui   a0, 0x10000
+// 0x0104a398: 0x104a398: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a38c: 0x104a38c: addiu a3, zero, 16
+// 0x0104a39c: 0x104a39c: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x0104a390: 0x104a390: addiu a2, zero, -1
+// 0x0104a3a0: 0x104a3a0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104a394: 0x104a394: addiu a0, a0, 2268
+// 0x0104a3a4: 0x104a3a4: addiu a0, a0, 2264
 	ldloc.1
-	ldc.i4 2268
+	ldc.i4 2264
 	add
 	stloc.1
-// 0x0104a398: 0x104a398: jal   0x1098d10 addu  a1, v0, zero
+// 0x0104a3a8: 0x104a3a8: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -8705,44 +8705,44 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a3a0: 0x104a3a0: addu  a1, v0, zero
+// 0x0104a3b0: 0x104a3b0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a3a4: 0x104a3a4: jal   0x1098ec4 addu  a0, s7, zero
+// 0x0104a3b4: 0x104a3b4: jal   0x109950c addu  a0, s7, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a3ac: 0x104a3ac: addu  a0, s3, zero
+// 0x0104a3bc: 0x104a3bc: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0104a3b0: 0x104a3b0: jal   0x1098ec4 addu  a1, s7, zero
+// 0x0104a3c0: 0x104a3c0: jal   0x109950c addu  a1, s7, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a3b8: 0x104a3b8: addu  a0, s3, zero
+// 0x0104a3c8: 0x104a3c8: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0104a3bc: 0x104a3bc: addiu a1, zero, 5
+// 0x0104a3cc: 0x104a3cc: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0104a3c0: 0x104a3c0: jal   0x109434c addu  a2, zero, zero
+// 0x0104a3d0: 0x104a3d0: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -8750,17 +8750,17 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a3c8: 0x104a3c8: lui   v0, 0x10000
+// 0x0104a3d8: 0x104a3d8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104a3cc: 0x104a3cc: jal   0x101cd60 addiu a0, v0, 2248
+// 0x0104a3dc: 0x104a3dc: jal   0x101cd70 addiu a0, v0, 2244
 	ldloc 5
-	ldc.i4 2248
+	ldc.i4 2244
 	add
 	stloc.1
 	ldloc.0
@@ -8768,47 +8768,47 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a3d4: 0x104a3d4: lui   a3, 0x60000
+// 0x0104a3e4: 0x104a3e4: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0104a3d8: 0x104a3d8: lui   a0, 0x10000
+// 0x0104a3e8: 0x104a3e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a3dc: 0x104a3dc: lui   t2, 0x60000
+// 0x0104a3ec: 0x104a3ec: lui   t2, 0x60000
 	ldc.i4 393216
 	stloc 19
-// 0x0104a3e0: 0x104a3e0: addiu t2, t2, 20328
+// 0x0104a3f0: 0x104a3f0: addiu t2, t2, 20792
 	ldloc 19
-	ldc.i4 20328
+	ldc.i4 20792
 	add
 	stloc 19
-// 0x0104a3e4: 0x104a3e4: addiu a3, a3, 20352
+// 0x0104a3f4: 0x104a3f4: addiu a3, a3, 20816
 	ldloc 4
-	ldc.i4 20352
+	ldc.i4 20816
 	add
 	stloc 4
-// 0x0104a3e8: 0x104a3e8: addu  a1, v0, zero
+// 0x0104a3f8: 0x104a3f8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a3ec: 0x104a3ec: addiu a2, zero, 5
+// 0x0104a3fc: 0x104a3fc: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x0104a3f0: 0x104a3f0: addiu a0, a0, 1896
+// 0x0104a400: 0x104a400: addiu a0, a0, 1892
 	ldloc.1
-	ldc.i4 1896
+	ldc.i4 1892
 	add
 	stloc.1
-// 0x0104a3f4: 0x104a3f4: ori   v0, s4, 24
+// 0x0104a404: 0x104a404: ori   v0, s4, 24
 	ldloc 14
 	ldc.i4.s 24
 	or
 	stloc 5
-// 0x0104a3f8: 0x104a3f8: sw    t2, 16(sp)
+// 0x0104a408: 0x104a408: sw    t2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8817,7 +8817,7 @@ L_104a124:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0104a3fc: 0x104a3fc: sw    v0, 20(sp)
+// 0x0104a40c: 0x104a40c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8826,7 +8826,7 @@ L_104a124:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104a400: 0x104a400: jal   0x10929e0 sw    zero, 24(sp)
+// 0x0104a410: 0x104a410: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8840,25 +8840,25 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a408: 0x104a408: addu  a1, v0, zero
+// 0x0104a418: 0x104a418: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a40c: 0x104a40c: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0104a41c: 0x104a41c: jal   0x109950c addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a414: 0x104a414: lw    t0, 36(sp)
+// 0x0104a424: 0x104a424: lw    t0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8867,26 +8867,26 @@ L_104a124:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104a418: 0x104a418: lui   a0, 0x10000
+// 0x0104a428: 0x104a428: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a41c: 0x104a41c: addiu a3, zero, 1
+// 0x0104a42c: 0x104a42c: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0104a420: 0x104a420: addiu a0, a0, 1764
+// 0x0104a430: 0x104a430: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x0104a424: 0x104a424: addiu a1, s2, 18500
+// 0x0104a434: 0x104a434: addiu a1, s2, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104a428: 0x104a428: addiu a2, zero, -1
+// 0x0104a438: 0x104a438: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104a42c: 0x104a42c: jal   0x1093a24 sw    t0, 16(sp)
+// 0x0104a43c: 0x104a43c: jal   0x1094048 sw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8900,21 +8900,21 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a434: 0x104a434: addu  a0, v0, zero
+// 0x0104a444: 0x104a444: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104a438: 0x104a438: addu  a2, zero, zero
+// 0x0104a448: 0x104a448: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a43c: 0x104a43c: addu  a1, zero, zero
+// 0x0104a44c: 0x104a44c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a440: 0x104a440: jal   0x1098fe0 sw    v0, 36(sp)
+// 0x0104a450: 0x104a450: jal   0x1099628 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8926,9 +8926,9 @@ L_104a124:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104a448: 0x104a448: lw    v0, 36(sp)
+// 0x0104a458: 0x104a458: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8937,52 +8937,52 @@ L_104a124:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104a44c: 0x104a44c: addu  a0, s1, zero
+// 0x0104a45c: 0x104a45c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0104a450: 0x104a450: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0104a460: 0x104a460: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a458: 0x104a458: addu  a1, s3, zero
+// 0x0104a468: 0x104a468: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0104a45c: 0x104a45c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0104a46c: 0x104a46c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a464: 0x104a464: lui   v0, 0x10000
+// 0x0104a474: 0x104a474: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104a468: 0x104a468: addiu a3, zero, -1
+// 0x0104a478: 0x104a478: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a46c: 0x104a46c: addiu a1, s2, 18500
+// 0x0104a47c: 0x104a47c: addiu a1, s2, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104a470: 0x104a470: addiu a2, zero, -1
+// 0x0104a480: 0x104a480: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104a474: 0x104a474: addiu a0, v0, 1684
+// 0x0104a484: 0x104a484: addiu a0, v0, 1680
 	ldloc 5
-	ldc.i4 1684
+	ldc.i4 1680
 	add
 	stloc.1
-// 0x0104a478: 0x104a478: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0104a488: 0x104a488: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8996,29 +8996,29 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a480: 0x104a480: addu  a0, v0, zero
+// 0x0104a490: 0x104a490: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104a484: 0x104a484: addu  a1, zero, zero
+// 0x0104a494: 0x104a494: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a488: 0x104a488: addu  a2, zero, zero
+// 0x0104a498: 0x104a498: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a48c: 0x104a48c: jal   0x1098fe0 addu  s3, v0, zero
+// 0x0104a49c: 0x104a49c: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104a494: 0x104a494: lw    v1, 44(sp)
+// 0x0104a4a4: 0x104a4a4: lw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9027,7 +9027,7 @@ L_104a124:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104a498: 0x104a498: lw    t1, 40(sp)
+// 0x0104a4a8: 0x104a4a8: lw    t1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9036,35 +9036,35 @@ L_104a124:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0104a49c: 0x104a49c: lw    a2, -30068(v1)
+// 0x0104a4ac: 0x104a4ac: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104a4a0: 0x104a4a0: addiu a3, zero, -1
+// 0x0104a4b0: 0x104a4b0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0104a4a4: 0x104a4a4: div   a2, s5
+// 0x0104a4b4: 0x104a4b4: div   a2, s5
 	ldloc.3
 	ldloc 12
 	div
 	stloc 20
-// 0x0104a4a8: 0x104a4a8: addiu a0, s8, -32632
+// 0x0104a4b8: 0x104a4b8: addiu a0, s8, -32632
 	ldloc 18
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x0104a4ac: 0x104a4ac: addu  a1, zero, zero
+// 0x0104a4bc: 0x104a4bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a4b0: 0x104a4b0: mflo  lo
+// 0x0104a4c0: 0x104a4c0: mflo  lo
 	ldloc 20
 	stloc.3
-// 0x0104a4b4: 0x104a4b4: jal   0x1093a24 sw    t1, 16(sp)
+// 0x0104a4c4: 0x104a4c4: jal   0x1094048 sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9078,34 +9078,34 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a4bc: 0x104a4bc: addu  a0, v0, zero
+// 0x0104a4cc: 0x104a4cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104a4c0: 0x104a4c0: addu  a1, zero, zero
+// 0x0104a4d0: 0x104a4d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a4c4: 0x104a4c4: addu  a2, zero, zero
+// 0x0104a4d4: 0x104a4d4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a4c8: 0x104a4c8: jal   0x1098fe0 addu  s5, v0, zero
+// 0x0104a4d8: 0x104a4d8: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0104a4d0: 0x104a4d0: lui   v0, 0x10000
+// 0x0104a4e0: 0x104a4e0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104a4d4: 0x104a4d4: jal   0x101cd60 addiu a0, v0, 2284
+// 0x0104a4e4: 0x104a4e4: jal   0x101cd70 addiu a0, v0, 2280
 	ldloc 5
-	ldc.i4 2284
+	ldc.i4 2280
 	add
 	stloc.1
 	ldloc.0
@@ -9113,26 +9113,26 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a4dc: 0x104a4dc: lui   a0, 0x10000
+// 0x0104a4ec: 0x104a4ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a4e0: 0x104a4e0: addiu a3, zero, 16
+// 0x0104a4f0: 0x104a4f0: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x0104a4e4: 0x104a4e4: addiu a2, zero, -1
+// 0x0104a4f4: 0x104a4f4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0104a4e8: 0x104a4e8: addiu a0, a0, 2300
+// 0x0104a4f8: 0x104a4f8: addiu a0, a0, 2296
 	ldloc.1
-	ldc.i4 2300
+	ldc.i4 2296
 	add
 	stloc.1
-// 0x0104a4ec: 0x104a4ec: jal   0x1098d10 addu  a1, v0, zero
+// 0x0104a4fc: 0x104a4fc: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -9140,44 +9140,44 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a4f4: 0x104a4f4: addu  a1, v0, zero
+// 0x0104a504: 0x104a504: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a4f8: 0x104a4f8: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0104a508: 0x104a508: jal   0x109950c addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a500: 0x104a500: addu  a0, s3, zero
+// 0x0104a510: 0x104a510: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x0104a504: 0x104a504: jal   0x1098ec4 addu  a1, s5, zero
+// 0x0104a514: 0x104a514: jal   0x109950c addu  a1, s5, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a50c: 0x104a50c: addiu a1, zero, 5
+// 0x0104a51c: 0x104a51c: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0104a510: 0x104a510: addu  a2, zero, zero
+// 0x0104a520: 0x104a520: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a514: 0x104a514: jal   0x109434c addu  a0, s3, zero
+// 0x0104a524: 0x104a524: jal   0x1094970 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -9185,17 +9185,17 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a51c: 0x104a51c: lui   v1, 0x10000
+// 0x0104a52c: 0x104a52c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0104a520: 0x104a520: jal   0x101cd60 addiu a0, v1, 2284
+// 0x0104a530: 0x104a530: jal   0x101cd70 addiu a0, v1, 2280
 	ldloc 6
-	ldc.i4 2284
+	ldc.i4 2280
 	add
 	stloc.1
 	ldloc.0
@@ -9203,47 +9203,47 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a528: 0x104a528: lui   a3, 0x60000
+// 0x0104a538: 0x104a538: lui   a3, 0x60000
 	ldc.i4 393216
 	stloc 4
-// 0x0104a52c: 0x104a52c: lui   a0, 0x10000
+// 0x0104a53c: 0x104a53c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a530: 0x104a530: lui   v1, 0x0
+// 0x0104a540: 0x104a540: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0104a534: 0x104a534: addiu v1, v1, 13620
+// 0x0104a544: 0x104a544: addiu v1, v1, 13620
 	ldloc 6
 	ldc.i4 13620
 	add
 	stloc 6
-// 0x0104a538: 0x104a538: addiu a3, a3, 20320
+// 0x0104a548: 0x104a548: addiu a3, a3, 20784
 	ldloc 4
-	ldc.i4 20320
+	ldc.i4 20784
 	add
 	stloc 4
-// 0x0104a53c: 0x104a53c: addiu a2, zero, 2
+// 0x0104a54c: 0x104a54c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0104a540: 0x104a540: addu  a1, v0, zero
+// 0x0104a550: 0x104a550: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a544: 0x104a544: addiu a0, a0, 1908
+// 0x0104a554: 0x104a554: addiu a0, a0, 1904
 	ldloc.1
-	ldc.i4 1908
+	ldc.i4 1904
 	add
 	stloc.1
-// 0x0104a548: 0x104a548: ori   v0, s4, 16
+// 0x0104a558: 0x104a558: ori   v0, s4, 16
 	ldloc 14
 	ldc.i4.s 16
 	or
 	stloc 5
-// 0x0104a54c: 0x104a54c: sw    v1, 16(sp)
+// 0x0104a55c: 0x104a55c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9252,7 +9252,7 @@ L_104a124:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104a550: 0x104a550: sw    v0, 20(sp)
+// 0x0104a560: 0x104a560: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9261,7 +9261,7 @@ L_104a124:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104a554: 0x104a554: jal   0x10929e0 sw    zero, 24(sp)
+// 0x0104a564: 0x104a564: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9275,43 +9275,43 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a55c: 0x104a55c: addu  a1, v0, zero
+// 0x0104a56c: 0x104a56c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a560: 0x104a560: jal   0x1098ec4 addu  a0, s3, zero
+// 0x0104a570: 0x104a570: jal   0x109950c addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a568: 0x104a568: addu  a1, s3, zero
+// 0x0104a578: 0x104a578: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0104a56c: 0x104a56c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0104a57c: 0x104a57c: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a574: 0x104a574: lui   a0, 0x10000
+// 0x0104a584: 0x104a584: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a578: 0x104a578: jal   0x101cd60 addiu a0, a0, 2312
+// 0x0104a588: 0x104a588: jal   0x101cd70 addiu a0, a0, 2308
 	ldloc.1
-	ldc.i4 2312
+	ldc.i4 2308
 	add
 	stloc.1
 	ldloc.0
@@ -9319,36 +9319,36 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a580: 0x104a580: lui   v1, 0x10000
+// 0x0104a590: 0x104a590: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0104a584: 0x104a584: addiu a0, v1, 1664
+// 0x0104a594: 0x104a594: addiu a0, v1, 1660
 	ldloc 6
-	ldc.i4 1664
+	ldc.i4 1660
 	add
 	stloc.1
-// 0x0104a588: 0x104a588: addiu v1, zero, -2
+// 0x0104a598: 0x104a598: addiu v1, zero, -2
 	ldc.i4.s -2
 	stloc 6
-// 0x0104a58c: 0x104a58c: ori   a2, s4, 136
+// 0x0104a59c: 0x104a59c: ori   a2, s4, 136
 	ldloc 14
 	ldc.i4 136
 	or
 	stloc.3
-// 0x0104a590: 0x104a590: addiu a1, s2, 18500
+// 0x0104a5a0: 0x104a5a0: addiu a1, s2, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0104a594: 0x104a594: addu  a3, zero, zero
+// 0x0104a5a4: 0x104a5a4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104a598: 0x104a598: sw    v1, 16(sp)
+// 0x0104a5a8: 0x104a5a8: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9357,10 +9357,10 @@ L_104a124:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104a59c: 0x104a59c: addiu v1, zero, -1
+// 0x0104a5ac: 0x104a5ac: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0104a5a0: 0x104a5a0: sw    v1, 20(sp)
+// 0x0104a5b0: 0x104a5b0: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9369,7 +9369,7 @@ L_104a124:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104a5a4: 0x104a5a4: jal   0x109683c sw    v0, 24(sp)
+// 0x0104a5b4: 0x104a5b4: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9383,49 +9383,49 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a5ac: 0x104a5ac: addu  a1, v0, zero
+// 0x0104a5bc: 0x104a5bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a5b0: 0x104a5b0: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0104a5c0: 0x104a5c0: jal   0x109950c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a5b8: 0x104a5b8: addu  a0, s0, zero
+// 0x0104a5c8: 0x104a5c8: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104a5bc: 0x104a5bc: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0104a5cc: 0x104a5cc: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a5c4: 0x104a5c4: bne   s6, zero, 0x104a610 lui   v0, 0x10000
+// 0x0104a5d4: 0x104a5d4: bne   s6, zero, 0x104a620 lui   v0, 0x10000
 	ldloc 15
 	ldc.i4 65536
 	stloc 5
-	brtrue L_104a610
+	brtrue L_104a620
 // --- basic block ---
-// 0x0104a5cc: 0x104a5cc: addiu a1, v0, 1664
+// 0x0104a5dc: 0x104a5dc: addiu a1, v0, 1660
 	ldloc 5
-	ldc.i4 1664
+	ldc.i4 1660
 	add
 	stloc.2
-// 0x0104a5d0: 0x104a5d0: jal   0x109b304 addu  a0, s1, zero
+// 0x0104a5e0: 0x104a5e0: jal   0x109b94c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -9433,27 +9433,27 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a5d8: 0x104a5d8: jal   0x1099098 addu  a0, v0, zero
+// 0x0104a5e8: 0x104a5e8: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0104a5e0: 0x104a5e0: lui   v1, 0x10000
+// 0x0104a5f0: 0x104a5f0: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0104a5e4: 0x104a5e4: addiu a1, v1, 1684
+// 0x0104a5f4: 0x104a5f4: addiu a1, v1, 1680
 	ldloc 6
-	ldc.i4 1684
+	ldc.i4 1680
 	add
 	stloc.2
-// 0x0104a5e8: 0x104a5e8: jal   0x109b304 addu  a0, s1, zero
+// 0x0104a5f8: 0x104a5f8: jal   0x109b94c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -9461,25 +9461,25 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a5f0: 0x104a5f0: jal   0x1099098 addu  a0, v0, zero
+// 0x0104a600: 0x104a600: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0104a5f8: 0x104a5f8: lui   v0, 0x10000
+// 0x0104a608: 0x104a608: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104a5fc: 0x104a5fc: addu  a0, s1, zero
+// 0x0104a60c: 0x104a60c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0104a600: 0x104a600: jal   0x109b304 addiu a1, v0, -25532
+// 0x0104a610: 0x104a610: jal   0x109b94c addiu a1, v0, -25532
 	ldloc 5
 	ldc.i4 -25532
 	add
@@ -9489,24 +9489,24 @@ L_104a124:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a608: 0x104a608: jal   0x1099098 addu  a0, v0, zero
+// 0x0104a618: 0x104a618: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_104a610:
-// 0x0104a610: 0x104a610: lui   s1, 0x10000
+L_104a620:
+// 0x0104a620: 0x104a620: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-L_104a614:
-// 0x0104a614: 0x104a614: jal   0x101cd60 addiu a0, s1, -21272
+L_104a624:
+// 0x0104a624: 0x104a624: jal   0x101cd70 addiu a0, s1, -21272
 	ldloc 8
 	ldc.i4 -21272
 	add
@@ -9516,33 +9516,33 @@ L_104a614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a61c: 0x104a61c: lui   s3, 0x100000
+// 0x0104a62c: 0x104a62c: lui   s3, 0x100000
 	ldc.i4 1048576
 	stloc 9
-// 0x0104a620: 0x104a620: lui   s2, 0x1050000
+// 0x0104a630: 0x104a630: lui   s2, 0x1050000
 	ldc.i4 17104896
 	stloc 11
-// 0x0104a624: 0x104a624: ori   a2, s3, 1
+// 0x0104a634: 0x104a634: ori   a2, s3, 1
 	ldloc 9
 	ldc.i4.1
 	or
 	stloc.3
-// 0x0104a628: 0x104a628: addiu a3, s2, -26456
+// 0x0104a638: 0x104a638: addiu a3, s2, -26440
 	ldloc 11
-	ldc.i4 -26456
+	ldc.i4 -26440
 	add
 	stloc 4
-// 0x0104a62c: 0x104a62c: addiu a0, s1, -21272
+// 0x0104a63c: 0x104a63c: addiu a0, s1, -21272
 	ldloc 8
 	ldc.i4 -21272
 	add
 	stloc.1
-// 0x0104a630: 0x104a630: jal   0x1091088 addu  a1, v0, zero
+// 0x0104a640: 0x104a640: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -9550,28 +9550,28 @@ L_104a614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a638: 0x104a638: addu  a1, v0, zero
+// 0x0104a648: 0x104a648: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a63c: 0x104a63c: addu  a0, s0, zero
+// 0x0104a64c: 0x104a64c: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104a640: 0x104a640: jal   0x1098ec4 lui   s1, 0x10000
+// 0x0104a650: 0x104a650: jal   0x109950c lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a648: 0x104a648: jal   0x101cd60 addiu a0, s1, -25292
+// 0x0104a658: 0x104a658: jal   0x101cd70 addiu a0, s1, -25292
 	ldloc 8
 	ldc.i4 -25292
 	add
@@ -9581,25 +9581,25 @@ L_104a614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a650: 0x104a650: addu  a1, v0, zero
+// 0x0104a660: 0x104a660: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a654: 0x104a654: ori   a2, s3, 1
+// 0x0104a664: 0x104a664: ori   a2, s3, 1
 	ldloc 9
 	ldc.i4.1
 	or
 	stloc.3
-// 0x0104a658: 0x104a658: addiu a3, s2, -26456
+// 0x0104a668: 0x104a668: addiu a3, s2, -26440
 	ldloc 11
-	ldc.i4 -26456
+	ldc.i4 -26440
 	add
 	stloc 4
-// 0x0104a65c: 0x104a65c: jal   0x1091088 addiu a0, s1, -25292
+// 0x0104a66c: 0x104a66c: jal   0x10916ac addiu a0, s1, -25292
 	ldloc 8
 	ldc.i4 -25292
 	add
@@ -9609,25 +9609,25 @@ L_104a614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a664: 0x104a664: addu  a1, v0, zero
+// 0x0104a674: 0x104a674: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104a668: 0x104a668: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0104a678: 0x104a678: jal   0x109950c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a670: 0x104a670: lw    a0, 32(sp)
+// 0x0104a680: 0x104a680: lw    a0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9636,25 +9636,25 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104a674: 0x104a674: jal   0x1098ec4 addu  a1, s0, zero
+// 0x0104a684: 0x104a684: jal   0x109950c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a67c: 0x104a67c: lui   a0, 0x10000
+// 0x0104a68c: 0x104a68c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a680: 0x104a680: addiu a0, a0, 2136
+// 0x0104a690: 0x104a690: addiu a0, a0, 2132
 	ldloc.1
-	ldc.i4 2136
+	ldc.i4 2132
 	add
 	stloc.1
-// 0x0104a684: 0x104a684: jal   0x1095eec addu  a1, zero, zero
+// 0x0104a694: 0x104a694: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -9662,13 +9662,13 @@ L_104a614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104a68c: 0x104a68c: lw    ra, 84(sp)
-// 0x0104a690: 0x104a690: lw    s8, 80(sp)
+// 0x0104a69c: 0x104a69c: lw    ra, 84(sp)
+// 0x0104a6a0: 0x104a6a0: lw    s8, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9677,7 +9677,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0104a694: 0x104a694: lw    s7, 76(sp)
+// 0x0104a6a4: 0x104a6a4: lw    s7, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9686,7 +9686,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104a698: 0x104a698: lw    s6, 72(sp)
+// 0x0104a6a8: 0x104a6a8: lw    s6, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9695,7 +9695,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104a69c: 0x104a69c: lw    s5, 68(sp)
+// 0x0104a6ac: 0x104a6ac: lw    s5, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9704,7 +9704,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104a6a0: 0x104a6a0: lw    s4, 64(sp)
+// 0x0104a6b0: 0x104a6b0: lw    s4, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9713,7 +9713,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104a6a4: 0x104a6a4: lw    s3, 60(sp)
+// 0x0104a6b4: 0x104a6b4: lw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9722,7 +9722,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104a6a8: 0x104a6a8: lw    s2, 56(sp)
+// 0x0104a6b8: 0x104a6b8: lw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9731,7 +9731,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104a6ac: 0x104a6ac: lw    s1, 52(sp)
+// 0x0104a6bc: 0x104a6bc: lw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9740,7 +9740,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104a6b0: 0x104a6b0: lw    s0, 48(sp)
+// 0x0104a6c0: 0x104a6c0: lw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9749,7 +9749,7 @@ L_104a614:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104a6b4: 0x104a6b4: jr    ra addiu sp, sp, 88
+// 0x0104a6c4: 0x104a6c4: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
diff --git a/converted/Cibyl55.j b/converted/Cibyl55.j
index 107181b..d492d8e 100644
--- a/converted/Cibyl55.j
+++ b/converted/Cibyl55.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl55::.ctor
 
-.method public static int32 roadmap_reminder_add_at_position_104a6bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_reminder_add_at_position_104a6cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s3,int32 s4,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -91,12 +91,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104a6bc: 0x104a6bc: addiu sp, sp, -712
+// 0x0104a6cc: 0x104a6cc: addiu sp, sp, -712
 	ldloc.0
 	ldc.i4 -712
 	add
 	stloc.0
-// 0x0104a6c0: 0x104a6c0: sw    s2, 696(sp)
+// 0x0104a6d0: 0x104a6d0: sw    s2, 696(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -105,7 +105,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104a6c4: 0x104a6c4: sw    s1, 692(sp)
+// 0x0104a6d4: 0x104a6d4: sw    s1, 692(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -114,7 +114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104a6c8: 0x104a6c8: sw    s0, 688(sp)
+// 0x0104a6d8: 0x104a6d8: sw    s0, 688(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -123,8 +123,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104a6cc: 0x104a6cc: sw    ra, 708(sp)
-// 0x0104a6d0: 0x104a6d0: sw    s4, 704(sp)
+// 0x0104a6dc: 0x104a6dc: sw    ra, 708(sp)
+// 0x0104a6e0: 0x104a6e0: sw    s4, 704(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -133,7 +133,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104a6d4: 0x104a6d4: sw    s3, 700(sp)
+// 0x0104a6e4: 0x104a6e4: sw    s3, 700(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -142,32 +142,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104a6d8: 0x104a6d8: addu  s0, a0, zero
+// 0x0104a6e8: 0x104a6e8: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0104a6dc: 0x104a6dc: addu  s2, a1, zero
+// 0x0104a6ec: 0x104a6ec: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0104a6e0: 0x104a6e0: beq   a0, zero, 0x104a7a0 addu  s1, a2, zero
+// 0x0104a6f0: 0x104a6f0: beq   a0, zero, 0x104a7b0 addu  s1, a2, zero
 	ldloc.1
 	ldloc.3
 	stloc 11
-	brfalse L_104a7a0
+	brfalse L_104a7b0
 // --- basic block ---
-// 0x0104a6e8: 0x104a6e8: addiu s4, sp, 36
+// 0x0104a6f8: 0x104a6f8: addiu s4, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-// 0x0104a6ec: 0x104a6ec: addiu s3, sp, 168
+// 0x0104a6fc: 0x104a6fc: addiu s3, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
 	stloc 7
-// 0x0104a6f0: 0x104a6f0: addu  a0, s4, zero
+// 0x0104a700: 0x104a700: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x0104a6f4: 0x104a6f4: jal   0x100844c addiu a1, sp, 32
+// 0x0104a704: 0x104a704: jal   0x100845c addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -175,33 +175,33 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104a6fc: 0x104a6fc: addu  a0, s3, zero
+// 0x0104a70c: 0x104a70c: addu  a0, s3, zero
 	ldloc 7
 	stloc.1
-// 0x0104a700: 0x104a700: jal   0x1010058 addiu a1, zero, 128
+// 0x0104a710: 0x104a710: jal   0x1010068 addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104a708: 0x104a708: addu  a0, s0, zero
+// 0x0104a718: 0x104a718: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104a70c: 0x104a70c: addiu a1, zero, 20
+// 0x0104a71c: 0x104a71c: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0104a710: 0x104a710: jal   0x10086bc sw    v0, 680(sp)
+// 0x0104a720: 0x104a720: jal   0x10086cc sw    v0, 680(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -215,12 +215,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104a718: 0x104a718: lw    v0, 680(sp)
+// 0x0104a728: 0x104a728: lw    v0, 680(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -229,27 +229,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104a71c: 0x104a71c: addu  a2, s3, zero
+// 0x0104a72c: 0x104a72c: addu  a2, s3, zero
 	ldloc 7
 	stloc.3
-// 0x0104a720: 0x104a720: addu  a3, v0, zero
+// 0x0104a730: 0x104a730: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0104a724: 0x104a724: addu  a1, zero, zero
+// 0x0104a734: 0x104a734: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a728: 0x104a728: addiu v0, zero, 1
+// 0x0104a738: 0x104a738: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0104a72c: 0x104a72c: addu  a0, s0, zero
+// 0x0104a73c: 0x104a73c: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104a730: 0x104a730: addiu s3, sp, 72
+// 0x0104a740: 0x104a740: addiu s3, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 7
-// 0x0104a734: 0x104a734: sw    v0, 24(sp)
+// 0x0104a744: 0x104a744: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -258,7 +258,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104a738: 0x104a738: sw    v0, 16(sp)
+// 0x0104a748: 0x104a748: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -267,7 +267,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104a73c: 0x104a73c: jal   0x1013028 sw    s3, 20(sp)
+// 0x0104a74c: 0x104a74c: jal   0x1013038 sw    s3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -281,12 +281,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104a744: 0x104a744: lw    a1, 32(sp)
+// 0x0104a754: 0x104a754: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -295,10 +295,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104a748: 0x104a748: addu  a0, s4, zero
+// 0x0104a758: 0x104a758: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x0104a74c: 0x104a74c: jal   0x10086bc sw    v0, 680(sp)
+// 0x0104a75c: 0x104a75c: jal   0x10086cc sw    v0, 680(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -312,12 +312,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104a754: 0x104a754: lw    v0, 680(sp)
+// 0x0104a764: 0x104a764: lw    v0, 680(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -326,23 +326,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104a758: 0x104a758: sll   zero, zero, 0
-// 0x0104a75c: 0x104a75c: blez  v0, 0x104a788 addiu s4, sp, 44
+// 0x0104a768: 0x104a768: sll   zero, zero, 0
+// 0x0104a76c: 0x104a76c: blez  v0, 0x104a798 addiu s4, sp, 44
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 8
 	ldc.i4.s 0
-	ble L_104a788
+	ble L_104a798
 // --- basic block ---
-// 0x0104a764: 0x104a764: addu  a0, s3, zero
+// 0x0104a774: 0x104a774: addu  a0, s3, zero
 	ldloc 7
 	stloc.1
-// 0x0104a768: 0x104a768: addu  a1, s4, zero
+// 0x0104a778: 0x104a778: addu  a1, s4, zero
 	ldloc 8
 	stloc.2
-// 0x0104a76c: 0x104a76c: jal   0x1015174 addu  a2, zero, zero
+// 0x0104a77c: 0x104a77c: jal   0x1015184 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -350,53 +350,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104a774: 0x104a774: addu  a0, s4, zero
+// 0x0104a784: 0x104a784: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x0104a778: 0x104a778: addu  a1, s0, zero
+// 0x0104a788: 0x104a788: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0104a77c: 0x104a77c: addu  a2, s2, zero
+// 0x0104a78c: 0x104a78c: addu  a2, s2, zero
 	ldloc 12
 	stloc.3
-// 0x0104a780: 0x104a780: j	 0x104a798 addu  a3, s1, zero
+// 0x0104a790: 0x104a790: j	 0x104a7a8 addu  a3, s1, zero
 	ldloc 11
 	stloc 4
-	br L_104a798
+	br L_104a7a8
 // --- basic block ---
-L_104a788:
-// 0x0104a788: 0x104a788: addu  a1, s0, zero
+L_104a798:
+// 0x0104a798: 0x104a798: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0104a78c: 0x104a78c: addu  a2, s2, zero
+// 0x0104a79c: 0x104a79c: addu  a2, s2, zero
 	ldloc 12
 	stloc.3
-// 0x0104a790: 0x104a790: addu  a3, s1, zero
+// 0x0104a7a0: 0x104a7a0: addu  a3, s1, zero
 	ldloc 11
 	stloc 4
-// 0x0104a794: 0x104a794: addu  a0, zero, zero
+// 0x0104a7a4: 0x104a7a4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_104a798:
-// 0x0104a798: 0x104a798: jal   0x1049dd0 sll   zero, zero, 0
+L_104a7a8:
+// 0x0104a7a8: 0x104a7a8: jal   0x1049de0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::reminder_add_dlg_1049dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::reminder_add_dlg_1049de0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_104a7a0:
-// 0x0104a7a0: 0x104a7a0: lw    ra, 708(sp)
-// 0x0104a7a4: 0x104a7a4: lw    s4, 704(sp)
+L_104a7b0:
+// 0x0104a7b0: 0x104a7b0: lw    ra, 708(sp)
+// 0x0104a7b4: 0x104a7b4: lw    s4, 704(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -405,7 +405,7 @@ L_104a7a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104a7a8: 0x104a7a8: lw    s3, 700(sp)
+// 0x0104a7b8: 0x104a7b8: lw    s3, 700(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -414,7 +414,7 @@ L_104a7a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104a7ac: 0x104a7ac: lw    s2, 696(sp)
+// 0x0104a7bc: 0x104a7bc: lw    s2, 696(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -423,7 +423,7 @@ L_104a7a0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104a7b0: 0x104a7b0: lw    s1, 692(sp)
+// 0x0104a7c0: 0x104a7c0: lw    s1, 692(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -432,7 +432,7 @@ L_104a7a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104a7b4: 0x104a7b4: lw    s0, 688(sp)
+// 0x0104a7c4: 0x104a7c4: lw    s0, 688(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -441,7 +441,7 @@ L_104a7a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104a7b8: 0x104a7b8: jr    ra addiu sp, sp, 712
+// 0x0104a7c8: 0x104a7c8: jr    ra addiu sp, sp, 712
 	ldloc.0
 	ldc.i4 712
 	add
@@ -453,7 +453,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_reminder_save_location_104a7c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_reminder_save_location_104a7d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -488,19 +488,19 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104a7c0:
-// 0x0104a7c0: 0x104a7c0: lui   a0, 0x20000
+L_104a7d0:
+// 0x0104a7d0: 0x104a7d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0104a7c4: 0x104a7c4: addiu sp, sp, -24
+// 0x0104a7d4: 0x104a7d4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104a7c8: 0x104a7c8: sw    ra, 20(sp)
-// 0x0104a7cc: 0x104a7cc: jal   0x101df50 addiu a0, a0, -28932
+// 0x0104a7d8: 0x104a7d8: sw    ra, 20(sp)
+// 0x0104a7dc: 0x104a7dc: jal   0x101df60 addiu a0, a0, -28468
 	ldloc.1
-	ldc.i4 -28932
+	ldc.i4 -28468
 	add
 	stloc.1
 	ldloc.0
@@ -508,21 +508,21 @@ L_104a7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a7d4: 0x104a7d4: beq   v0, zero, 0x104a7e8 addu  a0, v0, zero
+// 0x0104a7e4: 0x104a7e4: beq   v0, zero, 0x104a7f8 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_104a7e8
+	brfalse L_104a7f8
 // --- basic block ---
-// 0x0104a7dc: 0x104a7dc: addu  a1, zero, zero
+// 0x0104a7ec: 0x104a7ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a7e0: 0x104a7e0: jal   0x104a6bc addu  a2, zero, zero
+// 0x0104a7f0: 0x104a7f0: jal   0x104a6cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -530,15 +530,15 @@ L_104a7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_reminder_add_at_position_104a6bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_reminder_add_at_position_104a6cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104a7e8:
-// 0x0104a7e8: 0x104a7e8: lw    ra, 20(sp)
-// 0x0104a7ec: 0x104a7ec: sll   zero, zero, 0
-// 0x0104a7f0: 0x104a7f0: jr    ra addiu sp, sp, 24
+L_104a7f8:
+// 0x0104a7f8: 0x104a7f8: lw    ra, 20(sp)
+// 0x0104a7fc: 0x104a7fc: sll   zero, zero, 0
+// 0x0104a800: 0x104a800: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -550,7 +550,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_reminder_init_104a830(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_reminder_init_104a840(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s5,int32 s4,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -615,24 +615,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104a830: 0x104a830: addiu sp, sp, -112
+// 0x0104a840: 0x104a840: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x0104a834: 0x104a834: lui   a0, 0x10000
+// 0x0104a844: 0x104a844: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104a838: 0x104a838: lui   a1, 0x0
+// 0x0104a848: 0x104a848: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104a83c: 0x104a83c: lui   a3, 0x20000
+// 0x0104a84c: 0x104a84c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0104a840: 0x104a840: lui   v0, 0x0
+// 0x0104a850: 0x104a850: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104a844: 0x104a844: sw    s3, 84(sp)
+// 0x0104a854: 0x104a854: sw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -641,34 +641,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104a848: 0x104a848: addiu a0, a0, 12560
+// 0x0104a858: 0x104a858: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0104a84c: 0x104a84c: addiu a1, a1, 13628
+// 0x0104a85c: 0x104a85c: addiu a1, a1, 13628
 	ldloc.2
 	ldc.i4 13628
 	add
 	stloc.2
-// 0x0104a850: 0x104a850: addiu a3, a3, 9464
+// 0x0104a860: 0x104a860: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x0104a854: 0x104a854: addu  a2, zero, zero
+// 0x0104a864: 0x104a864: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104a858: 0x104a858: addiu v0, v0, 20820
+// 0x0104a868: 0x104a868: addiu v0, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
 	stloc 5
-// 0x0104a85c: 0x104a85c: lui   s3, 0x60000
+// 0x0104a86c: 0x104a86c: lui   s3, 0x60000
 	ldc.i4 393216
 	stloc 11
-// 0x0104a860: 0x104a860: sw    ra, 108(sp)
-// 0x0104a864: 0x104a864: sw    s8, 104(sp)
+// 0x0104a870: 0x104a870: sw    ra, 108(sp)
+// 0x0104a874: 0x104a874: sw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -677,7 +677,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104a868: 0x104a868: sw    s7, 100(sp)
+// 0x0104a878: 0x104a878: sw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -686,7 +686,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0104a86c: 0x104a86c: sw    s6, 96(sp)
+// 0x0104a87c: 0x104a87c: sw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -695,7 +695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104a870: 0x104a870: sw    s5, 92(sp)
+// 0x0104a880: 0x104a880: sw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -704,7 +704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104a874: 0x104a874: sw    s4, 88(sp)
+// 0x0104a884: 0x104a884: sw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -713,7 +713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104a878: 0x104a878: sw    s2, 80(sp)
+// 0x0104a888: 0x104a888: sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -722,7 +722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104a87c: 0x104a87c: sw    s1, 76(sp)
+// 0x0104a88c: 0x104a88c: sw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -731,7 +731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104a880: 0x104a880: sw    s0, 72(sp)
+// 0x0104a890: 0x104a890: sw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -740,7 +740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104a884: 0x104a884: sw    v0, 16(sp)
+// 0x0104a894: 0x104a894: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -749,7 +749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104a888: 0x104a888: sw    zero, 20(sp)
+// 0x0104a898: 0x104a898: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -758,9 +758,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104a88c: 0x104a88c: jal   0x100edf8 addiu s3, s3, 20416
+// 0x0104a89c: 0x104a89c: jal   0x100ee08 addiu s3, s3, 20880
 	ldloc 11
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc 11
 	ldloc.0
@@ -768,26 +768,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a894: 0x104a894: lui   v0, 0x10000
+// 0x0104a8a4: 0x104a8a4: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104a898: 0x104a898: addu  v0, v0, s3
+// 0x0104a8a8: 0x104a8a8: addu  v0, v0, s3
 	ldloc 5
 	ldloc 11
 	add
 	stloc 5
-// 0x0104a89c: 0x104a89c: addiu a0, zero, 83
+// 0x0104a8ac: 0x104a8ac: addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
-// 0x0104a8a0: 0x104a8a0: addiu a1, zero, 11
+// 0x0104a8b0: 0x104a8b0: addiu a1, zero, 11
 	ldc.i4.s 11
 	stloc.2
-// 0x0104a8a4: 0x104a8a4: jal   0x1037918 sw    zero, -26736(v0)
+// 0x0104a8b4: 0x104a8b4: jal   0x1037928 sw    zero, -26736(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -801,79 +801,79 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_declare_1037918(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_declare_1037928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a8ac: 0x104a8ac: jal   0x1049d9c sll   zero, zero, 0
+// 0x0104a8bc: 0x104a8bc: jal   0x1049dac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::roadmap_reminder_feature_enabled_1049d9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::roadmap_reminder_feature_enabled_1049dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a8b4: 0x104a8b4: beq   v0, zero, 0x104a9d8 sll   zero, zero, 0
+// 0x0104a8c4: 0x104a8c4: beq   v0, zero, 0x104a9e8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104a9d8
+	brfalse L_104a9e8
 // --- basic block ---
-// 0x0104a8bc: 0x104a8bc: jal   0x103772c addiu a0, zero, 83
+// 0x0104a8cc: 0x104a8cc: jal   0x103773c addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl40::roadmap_history_latest_103772c(int32,int32)
+	call int32 Cibyl40::roadmap_history_latest_103773c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a8c4: 0x104a8c4: lui   s5, 0x10000
+// 0x0104a8d4: 0x104a8d4: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0104a8c8: 0x104a8c8: addu  s2, v0, zero
+// 0x0104a8d8: 0x104a8d8: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0104a8cc: 0x104a8cc: addiu s5, s5, 19912
+// 0x0104a8dc: 0x104a8dc: addiu s5, s5, 20332
 	ldloc 12
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc 12
-// 0x0104a8d0: 0x104a8d0: addu  s1, zero, zero
+// 0x0104a8e0: 0x104a8e0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0104a8d4: 0x104a8d4: addiu s8, sp, 24
+// 0x0104a8e4: 0x104a8e4: addiu s8, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 16
-// 0x0104a8d8: 0x104a8d8: addiu s7, zero, 388
+// 0x0104a8e8: 0x104a8e8: addiu s7, zero, 388
 	ldc.i4 388
 	stloc 15
-// 0x0104a8dc: 0x104a8dc: j	 0x104a998 addiu s6, zero, 1
+// 0x0104a8ec: 0x104a8ec: j	 0x104a9a8 addiu s6, zero, 1
 	ldc.i4.1
 	stloc 14
-	br L_104a998
+	br L_104a9a8
 // --- basic block ---
-L_104a8e4:
-// 0x0104a8e4: 0x104a8e4: jal   0x1037c10 sll   zero, zero, 0
+L_104a8f4:
+// 0x0104a8f4: 0x104a8f4: jal   0x1037c20 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_history_get_1037c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_history_get_1037c20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a8ec: 0x104a8ec: lui   a1, 0x10000
+// 0x0104a8fc: 0x104a8fc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104a8f0: 0x104a8f0: lw    a0, 52(sp)
+// 0x0104a900: 0x104a900: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -882,9 +882,9 @@ L_104a8e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104a8f4: 0x104a8f4: jal   0x1001b14 addiu a1, a1, -16892
+// 0x0104a904: 0x104a904: jal   0x1001b14 addiu a1, a1, 19396
 	ldloc.2
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc.2
 	ldloc.1
@@ -892,15 +892,15 @@ L_104a8e4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104a8fc: 0x104a8fc: bne   v0, zero, 0x104a984 mult  s1, s7
+// 0x0104a90c: 0x104a90c: bne   v0, zero, 0x104a994 mult  s1, s7
 	ldloc 5
 	ldloc 9
 	ldloc 15
 	mul
 	stloc 18
-	brtrue L_104a984
+	brtrue L_104a994
 // --- basic block ---
-// 0x0104a904: 0x104a904: lw    a0, 44(sp)
+// 0x0104a914: 0x104a914: lw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -909,10 +909,10 @@ L_104a8e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104a908: 0x104a908: mflo  lo
+// 0x0104a918: 0x104a918: mflo  lo
 	ldloc 18
 	stloc 13
-// 0x0104a90c: 0x104a90c: jal   0x1000d8c addu  s0, s3, s4
+// 0x0104a91c: 0x104a91c: jal   0x1000d8c addu  s0, s3, s4
 	ldloc 11
 	ldloc 13
 	add
@@ -927,7 +927,7 @@ L_104a8e4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a914: 0x104a914: lw    a0, 48(sp)
+// 0x0104a924: 0x104a924: lw    a0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -936,7 +936,7 @@ L_104a8e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104a918: 0x104a918: jal   0x1000d8c sw    v0, 8(s0)
+// 0x0104a928: 0x104a928: jal   0x1000d8c sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -955,7 +955,7 @@ L_104a8e4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a920: 0x104a920: lw    a0, 56(sp)
+// 0x0104a930: 0x104a930: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -964,7 +964,7 @@ L_104a8e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104a924: 0x104a924: jal   0x1000d8c sw    v0, 4(s0)
+// 0x0104a934: 0x104a934: jal   0x1000d8c sw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -983,7 +983,7 @@ L_104a8e4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a92c: 0x104a92c: lw    a0, 64(sp)
+// 0x0104a93c: 0x104a93c: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -992,7 +992,7 @@ L_104a8e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104a930: 0x104a930: sw    v0, 368(s0)
+// 0x0104a940: 0x104a940: sw    v0, 368(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1001,7 +1001,7 @@ L_104a8e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104a934: 0x104a934: sw    s2, 372(s0)
+// 0x0104a944: 0x104a944: sw    s2, 372(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1010,7 +1010,7 @@ L_104a8e4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104a938: 0x104a938: sw    zero, 376(s0)
+// 0x0104a948: 0x104a948: sw    zero, 376(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1019,7 +1019,7 @@ L_104a8e4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104a93c: 0x104a93c: jal   0x1000d8c sw    s6, 384(s0)
+// 0x0104a94c: 0x104a94c: jal   0x1000d8c sw    s6, 384(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1038,7 +1038,7 @@ L_104a8e4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a944: 0x104a944: lw    a3, 40(sp)
+// 0x0104a954: 0x104a954: lw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1047,18 +1047,18 @@ L_104a8e4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104a948: 0x104a948: addiu a0, s0, 12
+// 0x0104a958: 0x104a958: addiu a0, s0, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc.1
-// 0x0104a94c: 0x104a94c: addiu a1, zero, 100
+// 0x0104a95c: 0x104a95c: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0104a950: 0x104a950: addu  a2, s5, zero
+// 0x0104a960: 0x104a960: addu  a2, s5, zero
 	ldloc 12
 	stloc.3
-// 0x0104a954: 0x104a954: jal   0x1000f9c sw    v0, 380(s0)
+// 0x0104a964: 0x104a964: jal   0x1000f9c sw    v0, 380(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1077,7 +1077,7 @@ L_104a8e4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a95c: 0x104a95c: lw    a3, 60(sp)
+// 0x0104a96c: 0x104a96c: lw    a3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1086,20 +1086,20 @@ L_104a8e4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104a960: 0x104a960: addiu a0, s4, 112
+// 0x0104a970: 0x104a970: addiu a0, s4, 112
 	ldloc 13
 	ldc.i4.s 112
 	add
 	stloc.1
-// 0x0104a964: 0x104a964: addu  a0, s3, a0
+// 0x0104a974: 0x104a974: addu  a0, s3, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc.1
-// 0x0104a968: 0x104a968: addu  a2, s5, zero
+// 0x0104a978: 0x104a978: addu  a2, s5, zero
 	ldloc 12
 	stloc.3
-// 0x0104a96c: 0x104a96c: jal   0x1000f9c addiu a1, zero, 256
+// 0x0104a97c: 0x104a97c: jal   0x1000f9c addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -1112,10 +1112,10 @@ L_104a8e4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a974: 0x104a974: addu  a0, s1, zero
+// 0x0104a984: 0x104a984: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104a978: 0x104a978: jal   0x1048e94 addiu a1, s0, 4
+// 0x0104a988: 0x104a988: jal   0x1048ea4 addiu a1, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
@@ -1125,78 +1125,78 @@ L_104a8e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl54::remider_add_pin_1048e94(int32,int32,int32,int32,int32)
+	call int32 Cibyl54::remider_add_pin_1048ea4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a980: 0x104a980: addiu s1, s1, 1
+// 0x0104a990: 0x104a990: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_104a984:
-// 0x0104a984: 0x104a984: addu  a1, s2, zero
+L_104a994:
+// 0x0104a994: 0x104a994: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0104a988: 0x104a988: jal   0x1037788 addiu a0, zero, 83
+// 0x0104a998: 0x104a998: jal   0x1037798 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl40::roadmap_history_before_1037788(int32,int32,int32)
+	call int32 Cibyl40::roadmap_history_before_1037798(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104a990: 0x104a990: beq   v0, s2, 0x104a9b4 addu  s2, v0, zero
+// 0x0104a9a0: 0x104a9a0: beq   v0, s2, 0x104a9c4 addu  s2, v0, zero
 	ldloc 5
 	ldloc 10
 	ldloc 5
 	stloc 10
-	beq  L_104a9b4
+	beq  L_104a9c4
 // --- basic block ---
-L_104a998:
-// 0x0104a998: 0x104a998: addu  a2, s8, zero
+L_104a9a8:
+// 0x0104a9a8: 0x104a9a8: addu  a2, s8, zero
 	ldloc 16
 	stloc.3
-// 0x0104a99c: 0x104a99c: addu  a1, s2, zero
+// 0x0104a9ac: 0x104a9ac: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0104a9a0: 0x104a9a0: addiu a0, zero, 83
+// 0x0104a9b0: 0x104a9b0: addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
-// 0x0104a9a4: 0x104a9a4: beq   s2, zero, 0x104a9b4 slti  v0, s1, 100
+// 0x0104a9b4: 0x104a9b4: beq   s2, zero, 0x104a9c4 slti  v0, s1, 100
 	ldloc 10
 	ldloc 9
 	ldc.i4.s 100
 	clt
 	stloc 5
-	brfalse L_104a9b4
+	brfalse L_104a9c4
 // --- basic block ---
-// 0x0104a9ac: 0x104a9ac: bne   v0, zero, 0x104a8e4 sll   zero, zero, 0
+// 0x0104a9bc: 0x104a9bc: bne   v0, zero, 0x104a8f4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104a8e4
+	brtrue L_104a8f4
 // --- basic block ---
-L_104a9b4:
-// 0x0104a9b4: 0x104a9b4: lui   v0, 0x60000
+L_104a9c4:
+// 0x0104a9c4: 0x104a9c4: lui   v0, 0x60000
 	ldc.i4 393216
 	stloc 5
-// 0x0104a9b8: 0x104a9b8: lui   v1, 0x10000
+// 0x0104a9c8: 0x104a9c8: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0104a9bc: 0x104a9bc: addiu v0, v0, 20416
+// 0x0104a9cc: 0x104a9cc: addiu v0, v0, 20880
 	ldloc 5
-	ldc.i4 20416
+	ldc.i4 20880
 	add
 	stloc 5
-// 0x0104a9c0: 0x104a9c0: addu  v0, v1, v0
+// 0x0104a9d0: 0x104a9d0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0104a9c4: 0x104a9c4: beq   s1, zero, 0x104a9d8 sw    s1, -26736(v0)
+// 0x0104a9d4: 0x104a9d4: beq   s1, zero, 0x104a9e8 sw    s1, -26736(v0)
 	ldloc 9
 	ldloc 6
 	ldloc 5
@@ -1206,27 +1206,27 @@ L_104a9b4:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_104a9d8
+	brfalse L_104a9e8
 // --- basic block ---
-// 0x0104a9cc: 0x104a9cc: lui   a0, 0x1050000
+// 0x0104a9dc: 0x104a9dc: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104a9d0: 0x104a9d0: jal   0x1030d38 addiu a0, a0, -25804
+// 0x0104a9e0: 0x104a9e0: jal   0x1030d48 addiu a0, a0, -25788
 	ldloc.1
-	ldc.i4 -25804
+	ldc.i4 -25788
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl35::roadmap_gps_register_listener_1030d38(int32,int32,int32)
+	call int32 Cibyl35::roadmap_gps_register_listener_1030d48(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104a9d8:
-// 0x0104a9d8: 0x104a9d8: lw    ra, 108(sp)
-// 0x0104a9dc: 0x104a9dc: lw    s8, 104(sp)
+L_104a9e8:
+// 0x0104a9e8: 0x104a9e8: lw    ra, 108(sp)
+// 0x0104a9ec: 0x104a9ec: lw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1235,7 +1235,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104a9e0: 0x104a9e0: lw    s7, 100(sp)
+// 0x0104a9f0: 0x104a9f0: lw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1244,7 +1244,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104a9e4: 0x104a9e4: lw    s6, 96(sp)
+// 0x0104a9f4: 0x104a9f4: lw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1253,7 +1253,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104a9e8: 0x104a9e8: lw    s5, 92(sp)
+// 0x0104a9f8: 0x104a9f8: lw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1262,7 +1262,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104a9ec: 0x104a9ec: lw    s4, 88(sp)
+// 0x0104a9fc: 0x104a9fc: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1271,7 +1271,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104a9f0: 0x104a9f0: lw    s3, 84(sp)
+// 0x0104aa00: 0x104aa00: lw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1280,7 +1280,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104a9f4: 0x104a9f4: lw    s2, 80(sp)
+// 0x0104aa04: 0x104aa04: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1289,7 +1289,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104a9f8: 0x104a9f8: lw    s1, 76(sp)
+// 0x0104aa08: 0x104aa08: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1298,7 +1298,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104a9fc: 0x104a9fc: lw    s0, 72(sp)
+// 0x0104aa0c: 0x104aa0c: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1307,7 +1307,7 @@ L_104a9d8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104aa00: 0x104aa00: jr    ra addiu sp, sp, 112
+// 0x0104aa10: 0x104aa10: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -1319,7 +1319,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_speedometer_set_offset_104aa08(int32)
+.method public static int32 roadmap_speedometer_set_offset_104aa18(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -1339,15 +1339,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104aa08: 0x104aa08: lui   v0, 0x70000
+// 0x0104aa18: 0x104aa18: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104aa0c: 0x104aa0c: jr    ra sw    a0, -6312(v0)
+// 0x0104aa1c: 0x104aa1c: jr    ra sw    a0, -5848(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1578
+	ldc.i4 -1462
 	add
 	ldloc.0
 	stelem.i4
@@ -1356,7 +1356,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_speedometer_initialize_104aa14(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_speedometer_initialize_104aa24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -1391,24 +1391,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104aa14: 0x104aa14: lui   a2, 0x10000
+// 0x0104aa24: 0x104aa24: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104aa18: 0x104aa18: addiu sp, sp, -24
+// 0x0104aa28: 0x104aa28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104aa1c: 0x104aa1c: addiu a2, a2, 2324
+// 0x0104aa2c: 0x104aa2c: addiu a2, a2, 2320
 	ldloc.3
-	ldc.i4 2324
+	ldc.i4 2320
 	add
 	stloc.3
-// 0x0104aa20: 0x104aa20: addu  a0, zero, zero
+// 0x0104aa30: 0x104aa30: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0104aa24: 0x104aa24: sw    ra, 20(sp)
-// 0x0104aa28: 0x104aa28: jal   0x10a1918 addiu a1, zero, 3
+// 0x0104aa34: 0x104aa34: sw    ra, 20(sp)
+// 0x0104aa38: 0x104aa38: jal   0x10a1f60 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -1416,46 +1416,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0104aa30: 0x104aa30: lui   v1, 0x70000
+// 0x0104aa40: 0x104aa40: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104aa34: 0x104aa34: bne   v0, zero, 0x104aa60 sw    v0, -6308(v1)
+// 0x0104aa44: 0x104aa44: bne   v0, zero, 0x104aa70 sw    v0, -5844(v1)
 	ldloc 6
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1577
+	ldc.i4 -1461
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_104aa60
+	brtrue L_104aa70
 // --- basic block ---
-// 0x0104aa3c: 0x104aa3c: lui   a1, 0x10000
+// 0x0104aa4c: 0x104aa4c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104aa40: 0x104aa40: lui   a3, 0x10000
+// 0x0104aa50: 0x104aa50: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104aa44: 0x104aa44: addiu a1, a1, 2336
+// 0x0104aa54: 0x104aa54: addiu a1, a1, 2332
 	ldloc.2
-	ldc.i4 2336
+	ldc.i4 2332
 	add
 	stloc.2
-// 0x0104aa48: 0x104aa48: addiu a3, a3, 2368
+// 0x0104aa58: 0x104aa58: addiu a3, a3, 2364
 	ldloc 4
-	ldc.i4 2368
+	ldc.i4 2364
 	add
 	stloc 4
-// 0x0104aa4c: 0x104aa4c: addiu a0, zero, 4
+// 0x0104aa5c: 0x104aa5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104aa50: 0x104aa50: jal   0x100449c addiu a2, zero, 147
+// 0x0104aa60: 0x104aa60: jal   0x100449c addiu a2, zero, 147
 	ldc.i4 147
 	stloc.3
 	ldloc.0
@@ -1468,40 +1468,40 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0104aa58: 0x104aa58: j	 0x104aa74 sll   zero, zero, 0
-	br L_104aa74
+// 0x0104aa68: 0x104aa68: j	 0x104aa84 sll   zero, zero, 0
+	br L_104aa84
 // --- basic block ---
-L_104aa60:
-// 0x0104aa60: 0x104aa60: lui   a0, 0x1050000
+L_104aa70:
+// 0x0104aa70: 0x104aa70: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104aa64: 0x104aa64: jal   0x101f970 addiu a0, a0, -21884
+// 0x0104aa74: 0x104aa74: jal   0x101f980 addiu a0, a0, -21868
 	ldloc.1
-	ldc.i4 -21884
+	ldc.i4 -21868
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0104aa6c: 0x104aa6c: lui   v1, 0x70000
+// 0x0104aa7c: 0x104aa7c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104aa70: 0x104aa70: sw    v0, -6316(v1)
+// 0x0104aa80: 0x104aa80: sw    v0, -5852(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1579
+	ldc.i4 -1463
 	add
 	ldloc 6
 	stelem.i4
-L_104aa74:
-// 0x0104aa74: 0x104aa74: lw    ra, 20(sp)
-// 0x0104aa78: 0x104aa78: sll   zero, zero, 0
-// 0x0104aa7c: 0x104aa7c: jr    ra addiu sp, sp, 24
+L_104aa84:
+// 0x0104aa84: 0x104aa84: lw    ra, 20(sp)
+// 0x0104aa88: 0x104aa88: sll   zero, zero, 0
+// 0x0104aa8c: 0x104aa8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1513,7 +1513,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_speedometer_after_refresh_104aa84(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_speedometer_after_refresh_104aa94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s0,int32 s5,int32 s4,int32 s1,int32 t0,int32 s2,int32 s6,int32 t1,int32 ra)
@@ -1575,25 +1575,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104aa84: 0x104aa84: lui   v0, 0x70000
+// 0x0104aa94: 0x104aa94: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104aa88: 0x104aa88: lw    v0, -6308(v0)
+// 0x0104aa98: 0x104aa98: lw    v0, -5844(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1577
+	ldc.i4 -1461
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104aa8c: 0x104aa8c: addiu sp, sp, -168
+// 0x0104aa9c: 0x104aa9c: addiu sp, sp, -168
 	ldloc.0
 	ldc.i4 -168
 	add
 	stloc.0
-// 0x0104aa90: 0x104aa90: sw    ra, 164(sp)
-// 0x0104aa94: 0x104aa94: sw    s6, 160(sp)
+// 0x0104aaa0: 0x104aaa0: sw    ra, 164(sp)
+// 0x0104aaa4: 0x104aaa4: sw    s6, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1602,7 +1602,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0104aa98: 0x104aa98: sw    s5, 156(sp)
+// 0x0104aaa8: 0x104aaa8: sw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1611,7 +1611,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104aa9c: 0x104aa9c: sw    s4, 152(sp)
+// 0x0104aaac: 0x104aaac: sw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1620,7 +1620,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104aaa0: 0x104aaa0: sw    s3, 148(sp)
+// 0x0104aab0: 0x104aab0: sw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1629,7 +1629,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104aaa4: 0x104aaa4: sw    s2, 144(sp)
+// 0x0104aab4: 0x104aab4: sw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1638,7 +1638,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104aaa8: 0x104aaa8: sw    s1, 140(sp)
+// 0x0104aab8: 0x104aab8: sw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1647,7 +1647,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104aaac: 0x104aaac: beq   v0, zero, 0x104ad70 sw    s0, 136(sp)
+// 0x0104aabc: 0x104aabc: beq   v0, zero, 0x104ad80 sw    s0, 136(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1657,57 +1657,57 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_104ad70
+	brfalse L_104ad80
 // --- basic block ---
-// 0x0104aab4: 0x104aab4: jal   0x10a6f60 sll   zero, zero, 0
+// 0x0104aac4: 0x104aac4: jal   0x10a75a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_isShowSpeedometer_10a6f60(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_isShowSpeedometer_10a75a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104aabc: 0x104aabc: beq   v0, zero, 0x104ad58 lui   v0, 0x70000
+// 0x0104aacc: 0x104aacc: beq   v0, zero, 0x104ad68 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_104ad58
+	brfalse L_104ad68
 // --- basic block ---
-// 0x0104aac4: 0x104aac4: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0104aad4: 0x104aad4: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0104aacc: 0x104aacc: beq   v0, zero, 0x104aadc addiu s1, zero, 4
+// 0x0104aadc: 0x104aadc: beq   v0, zero, 0x104aaec addiu s1, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 12
-	brfalse L_104aadc
+	brfalse L_104aaec
 // --- basic block ---
-// 0x0104aad4: 0x104aad4: j	 0x104aae4 addiu s4, zero, 7
+// 0x0104aae4: 0x104aae4: j	 0x104aaf4 addiu s4, zero, 7
 	ldc.i4.7
 	stloc 11
-	br L_104aae4
+	br L_104aaf4
 // --- basic block ---
-L_104aadc:
-// 0x0104aadc: 0x104aadc: addiu s1, zero, 3
+L_104aaec:
+// 0x0104aaec: 0x104aaec: addiu s1, zero, 3
 	ldc.i4.3
 	stloc 12
-// 0x0104aae0: 0x104aae0: addiu s4, zero, 5
+// 0x0104aaf0: 0x104aaf0: addiu s4, zero, 5
 	ldc.i4.5
 	stloc 11
-L_104aae4:
-// 0x0104aae4: 0x104aae4: addiu a0, sp, 40
+L_104aaf4:
+// 0x0104aaf4: 0x104aaf4: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0104aae8: 0x104aae8: addu  a1, zero, zero
+// 0x0104aaf8: 0x104aaf8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104aaec: 0x104aaec: jal   0x1029da8 addu  a2, zero, zero
+// 0x0104aafc: 0x104aafc: jal   0x1029db8 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1715,12 +1715,12 @@ L_104aae4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104aaf4: 0x104aaf4: lw    s6, 52(sp)
+// 0x0104ab04: 0x104ab04: lw    s6, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1729,35 +1729,35 @@ L_104aae4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104aaf8: 0x104aaf8: addiu v0, zero, -1
+// 0x0104ab08: 0x104ab08: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0104aafc: 0x104aafc: beq   s6, v0, 0x104ad58 lui   v0, 0x70000
+// 0x0104ab0c: 0x104ab0c: beq   s6, v0, 0x104ad68 lui   v0, 0x70000
 	ldloc 15
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	beq  L_104ad58
+	beq  L_104ad68
 // --- basic block ---
-// 0x0104ab04: 0x104ab04: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+// 0x0104ab14: 0x104ab14: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
 // --- basic block ---
-// 0x0104ab0c: 0x104ab0c: beq   v0, zero, 0x104ad58 lui   v0, 0x70000
+// 0x0104ab1c: 0x104ab1c: beq   v0, zero, 0x104ad68 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_104ad58
+	brfalse L_104ad68
 // --- basic block ---
-// 0x0104ab14: 0x104ab14: lui   a0, 0x10000
+// 0x0104ab24: 0x104ab24: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104ab18: 0x104ab18: addiu a0, a0, 2400
+// 0x0104ab28: 0x104ab28: addiu a0, a0, 2396
 	ldloc.1
-	ldc.i4 2400
+	ldc.i4 2396
 	add
 	stloc.1
-// 0x0104ab1c: 0x104ab1c: jal   0x104ef00 addu  a1, zero, zero
+// 0x0104ab2c: 0x104ab2c: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1765,51 +1765,51 @@ L_104aae4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ab24: 0x104ab24: jal   0x1014194 sll   zero, zero, 0
+// 0x0104ab34: 0x104ab34: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ab2c: 0x104ab2c: addiu v1, zero, 1
+// 0x0104ab3c: 0x104ab3c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0104ab30: 0x104ab30: bne   v0, v1, 0x104ab44 sll   zero, zero, 0
+// 0x0104ab40: 0x104ab40: bne   v0, v1, 0x104ab54 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_104ab44
+	bne.un L_104ab54
 // --- basic block ---
-// 0x0104ab38: 0x104ab38: lui   a0, 0x10000
+// 0x0104ab48: 0x104ab48: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104ab3c: 0x104ab3c: j	 0x104ab4c addiu a0, a0, 2416
+// 0x0104ab4c: 0x104ab4c: j	 0x104ab5c addiu a0, a0, 2412
 	ldloc.1
-	ldc.i4 2416
+	ldc.i4 2412
 	add
 	stloc.1
-	br L_104ab4c
+	br L_104ab5c
 // --- basic block ---
-L_104ab44:
-// 0x0104ab44: 0x104ab44: lui   a0, 0x0
+L_104ab54:
+// 0x0104ab54: 0x104ab54: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104ab48: 0x104ab48: addiu a0, a0, 23008
+// 0x0104ab58: 0x104ab58: addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
 	stloc.1
-L_104ab4c:
-// 0x0104ab4c: 0x104ab4c: jal   0x104edb0 lui   s0, 0x70000
+L_104ab5c:
+// 0x0104ab5c: 0x104ab5c: jal   0x104edc0 lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 9
 	ldloc.0
@@ -1817,57 +1817,57 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ab54: 0x104ab54: lui   s2, 0xf0000
+// 0x0104ab64: 0x104ab64: lui   s2, 0xf0000
 	ldc.i4 983040
 	stloc 14
-// 0x0104ab58: 0x104ab58: lw    a0, -6308(s0)
+// 0x0104ab68: 0x104ab68: lw    a0, -5844(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1577
+	ldc.i4 -1461
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104ab5c: 0x104ab5c: lw    s3, -30068(s2)
+// 0x0104ab6c: 0x104ab6c: lw    s3, -29604(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ab60: 0x104ab60: jal   0x104dffc sll   zero, zero, 0
+// 0x0104ab70: 0x104ab70: jal   0x104e00c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ab68: 0x104ab68: lw    a0, -6308(s0)
+// 0x0104ab78: 0x104ab78: lw    a0, -5844(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1577
+	ldc.i4 -1461
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104ab6c: 0x104ab6c: lui   v1, 0xf0000
+// 0x0104ab7c: 0x104ab7c: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0104ab70: 0x104ab70: subu  v0, s3, v0
+// 0x0104ab80: 0x104ab80: subu  v0, s3, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 5
-// 0x0104ab74: 0x104ab74: sw    v0, 16(sp)
+// 0x0104ab84: 0x104ab84: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1876,78 +1876,78 @@ L_104ab4c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ab78: 0x104ab78: lw    s3, -30072(v1)
+// 0x0104ab88: 0x104ab88: lw    s3, -29608(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ab7c: 0x104ab7c: jal   0x104e020 sll   zero, zero, 0
+// 0x0104ab8c: 0x104ab8c: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ab84: 0x104ab84: jal   0x1042430 addu  s5, v0, zero
+// 0x0104ab94: 0x104ab94: jal   0x1042440 addu  s5, v0, zero
 	ldloc 5
 	stloc 10
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ab8c: 0x104ab8c: lui   v1, 0x70000
+// 0x0104ab9c: 0x104ab9c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104ab90: 0x104ab90: lw    v1, -6312(v1)
+// 0x0104aba0: 0x104aba0: lw    v1, -5848(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1578
+	ldc.i4 -1462
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104ab94: 0x104ab94: subu  s3, s3, s5
+// 0x0104aba4: 0x104aba4: subu  s3, s3, s5
 	ldloc 8
 	ldloc 10
 	sub
 	stloc 8
-// 0x0104ab98: 0x104ab98: subu  s3, s3, v0
+// 0x0104aba8: 0x104aba8: subu  s3, s3, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x0104ab9c: 0x104ab9c: lw    a0, -6308(s0)
+// 0x0104abac: 0x104abac: lw    a0, -5844(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1577
+	ldc.i4 -1461
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104aba0: 0x104aba0: addiu a1, sp, 16
+// 0x0104abb0: 0x104abb0: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0104aba4: 0x104aba4: addu  a2, zero, zero
+// 0x0104abb4: 0x104abb4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104aba8: 0x104aba8: addu  a3, zero, zero
+// 0x0104abb8: 0x104abb8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104abac: 0x104abac: subu  s3, s3, v1
+// 0x0104abbc: 0x104abbc: subu  s3, s3, v1
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-// 0x0104abb0: 0x104abb0: jal   0x104f4a8 sw    s3, 20(sp)
+// 0x0104abc0: 0x104abc0: jal   0x104f4b8 sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1961,12 +1961,12 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104abb8: 0x104abb8: lw    a0, 20(sp)
+// 0x0104abc8: 0x104abc8: lw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1975,29 +1975,29 @@ L_104ab4c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104abbc: 0x104abbc: jal   0x10c09c0 lui   s5, 0x20000
+// 0x0104abcc: 0x104abcc: jal   0x10c1000 lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 10
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104abc4: 0x104abc4: lw    a0, -6308(s0)
+// 0x0104abd4: 0x104abd4: lw    a0, -5844(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1577
+	ldc.i4 -1461
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104abc8: 0x104abc8: addu  t0, v0, zero
+// 0x0104abd8: 0x104abd8: addu  t0, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0104abcc: 0x104abcc: sw    t0, 128(sp)
+// 0x0104abdc: 0x104abdc: sw    t0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2006,7 +2006,7 @@ L_104ab4c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104abd0: 0x104abd0: jal   0x104e020 sw    v1, 132(sp)
+// 0x0104abe0: 0x104abe0: jal   0x104e030 sw    v1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2016,43 +2016,43 @@ L_104ab4c:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104abd8: 0x104abd8: jal   0x10c09c0 addu  a0, v0, zero
+// 0x0104abe8: 0x104abe8: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104abe0: 0x104abe0: lw    a3, 23892(s5)
+// 0x0104abf0: 0x104abf0: lw    a3, 24356(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5973
+	ldc.i4 6089
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104abe4: 0x104abe4: lw    a2, 23888(s5)
+// 0x0104abf4: 0x104abf4: lw    a2, 24352(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5972
+	ldc.i4 6088
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104abe8: 0x104abe8: addu  a1, v1, zero
+// 0x0104abf8: 0x104abf8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0104abec: 0x104abec: jal   0x10c0798 addu  a0, v0, zero
+// 0x0104abfc: 0x104abfc: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2060,12 +2060,12 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104abf4: 0x104abf4: lw    t1, 132(sp)
+// 0x0104ac04: 0x104ac04: lw    t1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2074,7 +2074,7 @@ L_104ab4c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104abf8: 0x104abf8: lw    t0, 128(sp)
+// 0x0104ac08: 0x104ac08: lw    t0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2083,16 +2083,16 @@ L_104ab4c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104abfc: 0x104abfc: addu  a3, t1, zero
+// 0x0104ac0c: 0x104ac0c: addu  a3, t1, zero
 	ldloc 16
 	stloc 4
-// 0x0104ac00: 0x104ac00: addu  a2, t0, zero
+// 0x0104ac10: 0x104ac10: addu  a2, t0, zero
 	ldloc 13
 	stloc.3
-// 0x0104ac04: 0x104ac04: addu  a1, v1, zero
+// 0x0104ac14: 0x104ac14: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0104ac08: 0x104ac08: jal   0x10c06e8 addu  a0, v0, zero
+// 0x0104ac18: 0x104ac18: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2100,26 +2100,26 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac10: 0x104ac10: addu  a1, v1, zero
+// 0x0104ac20: 0x104ac20: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0104ac14: 0x104ac14: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0104ac24: 0x104ac24: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac1c: 0x104ac1c: lw    a0, 20(sp)
+// 0x0104ac2c: 0x104ac2c: lw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2128,7 +2128,7 @@ L_104ab4c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104ac20: 0x104ac20: jal   0x10c09c0 sw    v0, 28(sp)
+// 0x0104ac30: 0x104ac30: jal   0x10c1000 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2139,24 +2139,24 @@ L_104ab4c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac28: 0x104ac28: lw    a0, -6308(s0)
+// 0x0104ac38: 0x104ac38: lw    a0, -5844(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1577
+	ldc.i4 -1461
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104ac2c: 0x104ac2c: addu  t0, v0, zero
+// 0x0104ac3c: 0x104ac3c: addu  t0, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0104ac30: 0x104ac30: sw    t0, 128(sp)
+// 0x0104ac40: 0x104ac40: sw    t0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2165,7 +2165,7 @@ L_104ab4c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104ac34: 0x104ac34: jal   0x104e020 sw    v1, 132(sp)
+// 0x0104ac44: 0x104ac44: jal   0x104e030 sw    v1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2175,43 +2175,43 @@ L_104ab4c:
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac3c: 0x104ac3c: jal   0x10c09c0 addu  a0, v0, zero
+// 0x0104ac4c: 0x104ac4c: jal   0x10c1000 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac44: 0x104ac44: lw    a3, 23892(s5)
+// 0x0104ac54: 0x104ac54: lw    a3, 24356(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5973
+	ldc.i4 6089
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104ac48: 0x104ac48: lw    a2, 23888(s5)
+// 0x0104ac58: 0x104ac58: lw    a2, 24352(s5)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 5972
+	ldc.i4 6088
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104ac4c: 0x104ac4c: addu  a1, v1, zero
+// 0x0104ac5c: 0x104ac5c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0104ac50: 0x104ac50: jal   0x10c0798 addu  a0, v0, zero
+// 0x0104ac60: 0x104ac60: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2219,12 +2219,12 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac58: 0x104ac58: lw    t0, 128(sp)
+// 0x0104ac68: 0x104ac68: lw    t0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2233,7 +2233,7 @@ L_104ab4c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104ac5c: 0x104ac5c: lw    t1, 132(sp)
+// 0x0104ac6c: 0x104ac6c: lw    t1, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2242,16 +2242,16 @@ L_104ab4c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104ac60: 0x104ac60: addu  a2, t0, zero
+// 0x0104ac70: 0x104ac70: addu  a2, t0, zero
 	ldloc 13
 	stloc.3
-// 0x0104ac64: 0x104ac64: addu  a3, t1, zero
+// 0x0104ac74: 0x104ac74: addu  a3, t1, zero
 	ldloc 16
 	stloc 4
-// 0x0104ac68: 0x104ac68: addu  a1, v1, zero
+// 0x0104ac78: 0x104ac78: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0104ac6c: 0x104ac6c: jal   0x10c06e8 addu  a0, v0, zero
+// 0x0104ac7c: 0x104ac7c: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2259,34 +2259,34 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac74: 0x104ac74: addu  a1, v1, zero
+// 0x0104ac84: 0x104ac84: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0104ac78: 0x104ac78: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0104ac88: 0x104ac88: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac80: 0x104ac80: addu  a0, s6, zero
+// 0x0104ac90: 0x104ac90: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x0104ac84: 0x104ac84: addiu s3, sp, 60
+// 0x0104ac94: 0x104ac94: addiu s3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 8
-// 0x0104ac88: 0x104ac88: jal   0x1007e4c sw    v0, 36(sp)
+// 0x0104ac98: 0x104ac98: jal   0x1007e5c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2300,26 +2300,26 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ac90: 0x104ac90: lui   a2, 0x10000
+// 0x0104aca0: 0x104aca0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104ac94: 0x104ac94: addiu a2, a2, 2424
+// 0x0104aca4: 0x104aca4: addiu a2, a2, 2420
 	ldloc.3
-	ldc.i4 2424
+	ldc.i4 2420
 	add
 	stloc.3
-// 0x0104ac98: 0x104ac98: addu  a3, v0, zero
+// 0x0104aca8: 0x104aca8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0104ac9c: 0x104ac9c: addiu a1, zero, 30
+// 0x0104acac: 0x104acac: addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
-// 0x0104aca0: 0x104aca0: jal   0x1000f9c addu  a0, s3, zero
+// 0x0104acb0: 0x104acb0: jal   0x1000f9c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2332,15 +2332,15 @@ L_104ab4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104aca8: 0x104aca8: jal   0x1007d9c addiu s0, sp, 92
+// 0x0104acb8: 0x104acb8: jal   0x1007dac addiu s0, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc 9
-	call int32 Cibyl5::roadmap_math_speed_unit_1007d9c()
+	call int32 Cibyl5::roadmap_math_speed_unit_1007dac()
 	stloc 5
 // --- basic block ---
-// 0x0104acb0: 0x104acb0: jal   0x101cd60 addu  a0, v0, zero
+// 0x0104acc0: 0x104acc0: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2348,26 +2348,26 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104acb8: 0x104acb8: lui   a2, 0x10000
+// 0x0104acc8: 0x104acc8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104acbc: 0x104acbc: addiu a2, a2, 19912
+// 0x0104accc: 0x104accc: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0104acc0: 0x104acc0: addu  a3, v0, zero
+// 0x0104acd0: 0x104acd0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0104acc4: 0x104acc4: addu  a0, s0, zero
+// 0x0104acd4: 0x104acd4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0104acc8: 0x104acc8: jal   0x1000f9c addiu a1, zero, 30
+// 0x0104acd8: 0x104acd8: jal   0x1000f9c addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
 	ldloc.0
@@ -2380,7 +2380,7 @@ L_104ab4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104acd0: 0x104acd0: jal   0x109a424 addu  a0, zero, zero
+// 0x0104ace0: 0x104ace0: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2388,48 +2388,48 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104acd8: 0x104acd8: addiu s5, sp, 32
+// 0x0104ace8: 0x104ace8: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 10
-// 0x0104acdc: 0x104acdc: beq   v0, zero, 0x104ad18 addiu a0, sp, 24
+// 0x0104acec: 0x104acec: beq   v0, zero, 0x104ad28 addiu a0, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-	brfalse L_104ad18
+	brfalse L_104ad28
 // --- basic block ---
-// 0x0104ace4: 0x104ace4: lw    v0, -30068(s2)
+// 0x0104acf4: 0x104acf4: lw    v0, -29604(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ace8: 0x104ace8: addu  a3, s3, zero
+// 0x0104acf8: 0x104acf8: addu  a3, s3, zero
 	ldloc 8
 	stloc 4
-// 0x0104acec: 0x104acec: subu  s4, v0, s4
+// 0x0104acfc: 0x104acfc: subu  s4, v0, s4
 	ldloc 5
 	ldloc 11
 	sub
 	stloc 11
-// 0x0104acf0: 0x104acf0: addiu a1, zero, 3
+// 0x0104ad00: 0x104ad00: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0104acf4: 0x104acf4: addiu a2, zero, 18
+// 0x0104ad04: 0x104ad04: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0104acf8: 0x104acf8: jal   0x104ea60 sw    s4, 24(sp)
+// 0x0104ad08: 0x104ad08: jal   0x104ea70 sw    s4, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2443,12 +2443,12 @@ L_104ab4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ad00: 0x104ad00: lw    v0, 16(sp)
+// 0x0104ad10: 0x104ad10: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2457,24 +2457,24 @@ L_104ab4c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ad04: 0x104ad04: addu  a0, s5, zero
+// 0x0104ad14: 0x104ad14: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-// 0x0104ad08: 0x104ad08: addu  s1, s1, v0
+// 0x0104ad18: 0x104ad18: addu  s1, s1, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 12
-// 0x0104ad0c: 0x104ad0c: addu  a3, s0, zero
+// 0x0104ad1c: 0x104ad1c: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x0104ad10: 0x104ad10: j	 0x104ad48 addiu a1, zero, 2
+// 0x0104ad20: 0x104ad20: j	 0x104ad58 addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-	br L_104ad48
+	br L_104ad58
 // --- basic block ---
-L_104ad18:
-// 0x0104ad18: 0x104ad18: lw    v0, 16(sp)
+L_104ad28:
+// 0x0104ad28: 0x104ad28: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2483,21 +2483,21 @@ L_104ad18:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ad1c: 0x104ad1c: addu  a3, s3, zero
+// 0x0104ad2c: 0x104ad2c: addu  a3, s3, zero
 	ldloc 8
 	stloc 4
-// 0x0104ad20: 0x104ad20: addu  s4, s4, v0
+// 0x0104ad30: 0x104ad30: addu  s4, s4, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x0104ad24: 0x104ad24: addiu a1, zero, 2
+// 0x0104ad34: 0x104ad34: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0104ad28: 0x104ad28: addiu a2, zero, 18
+// 0x0104ad38: 0x104ad38: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x0104ad2c: 0x104ad2c: jal   0x104ea60 sw    s4, 24(sp)
+// 0x0104ad3c: 0x104ad3c: jal   0x104ea70 sw    s4, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2511,39 +2511,39 @@ L_104ad18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ad34: 0x104ad34: lw    v0, -30068(s2)
+// 0x0104ad44: 0x104ad44: lw    v0, -29604(s2)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ad38: 0x104ad38: addu  a0, s5, zero
+// 0x0104ad48: 0x104ad48: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-// 0x0104ad3c: 0x104ad3c: subu  s1, v0, s1
+// 0x0104ad4c: 0x104ad4c: subu  s1, v0, s1
 	ldloc 5
 	ldloc 12
 	sub
 	stloc 12
-// 0x0104ad40: 0x104ad40: addu  a3, s0, zero
+// 0x0104ad50: 0x104ad50: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x0104ad44: 0x104ad44: addiu a1, zero, 3
+// 0x0104ad54: 0x104ad54: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-L_104ad48:
-// 0x0104ad48: 0x104ad48: addiu a2, zero, 9
+L_104ad58:
+// 0x0104ad58: 0x104ad58: addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
-// 0x0104ad4c: 0x104ad4c: jal   0x104ea60 sw    s1, 32(sp)
+// 0x0104ad5c: 0x104ad5c: jal   0x104ea70 sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2557,30 +2557,30 @@ L_104ad48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ad54: 0x104ad54: lui   v0, 0x70000
+// 0x0104ad64: 0x104ad64: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_104ad58:
-// 0x0104ad58: 0x104ad58: lw    v0, -6316(v0)
+L_104ad68:
+// 0x0104ad68: 0x104ad68: lw    v0, -5852(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1579
+	ldc.i4 -1463
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ad5c: 0x104ad5c: sll   zero, zero, 0
-// 0x0104ad60: 0x104ad60: beq   v0, zero, 0x104ad70 sll   zero, zero, 0
+// 0x0104ad6c: 0x104ad6c: sll   zero, zero, 0
+// 0x0104ad70: 0x104ad70: beq   v0, zero, 0x104ad80 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104ad70
+	brfalse L_104ad80
 // --- basic block ---
-// 0x0104ad68: 0x104ad68: jalr  v0 sll   zero, zero, 0
+// 0x0104ad78: 0x104ad78: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2592,9 +2592,9 @@ L_104ad58:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104ad70:
-// 0x0104ad70: 0x104ad70: lw    ra, 164(sp)
-// 0x0104ad74: 0x104ad74: lw    s6, 160(sp)
+L_104ad80:
+// 0x0104ad80: 0x104ad80: lw    ra, 164(sp)
+// 0x0104ad84: 0x104ad84: lw    s6, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2603,7 +2603,7 @@ L_104ad70:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104ad78: 0x104ad78: lw    s5, 156(sp)
+// 0x0104ad88: 0x104ad88: lw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2612,7 +2612,7 @@ L_104ad70:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104ad7c: 0x104ad7c: lw    s4, 152(sp)
+// 0x0104ad8c: 0x104ad8c: lw    s4, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2621,7 +2621,7 @@ L_104ad70:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104ad80: 0x104ad80: lw    s3, 148(sp)
+// 0x0104ad90: 0x104ad90: lw    s3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2630,7 +2630,7 @@ L_104ad70:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ad84: 0x104ad84: lw    s2, 144(sp)
+// 0x0104ad94: 0x104ad94: lw    s2, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2639,7 +2639,7 @@ L_104ad70:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104ad88: 0x104ad88: lw    s1, 140(sp)
+// 0x0104ad98: 0x104ad98: lw    s1, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2648,7 +2648,7 @@ L_104ad70:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104ad8c: 0x104ad8c: lw    s0, 136(sp)
+// 0x0104ad9c: 0x104ad9c: lw    s0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2657,7 +2657,7 @@ L_104ad70:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104ad90: 0x104ad90: jr    ra addiu sp, sp, 168
+// 0x0104ada0: 0x104ada0: jr    ra addiu sp, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
@@ -2669,7 +2669,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void roadmap_scoreboard_request_failed_104ad98()
+.method public static void roadmap_scoreboard_request_failed_104ada8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2680,12 +2680,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ad98: 0x104ad98: jr    ra sll   zero, zero, 0
+// 0x0104ada8: 0x104ada8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_scoreboard_response_104ada0(int32)
+.method public static int32 roadmap_scoreboard_response_104adb0(int32)
 {
 .maxstack 4
 .locals init (int32 a3,int32 v0,int32 ra)
@@ -2702,7 +2702,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ada0: 0x104ada0: jr    ra addu  v0, a3, zero
+// 0x0104adb0: 0x104adb0: jr    ra addu  v0, a3, zero
 	ldloc.0
 	stloc.1
 	br __CIBYL_function_return
@@ -2710,7 +2710,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_scoreboard_feature_enabled_104ada8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_scoreboard_feature_enabled_104adb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -2745,16 +2745,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ada8: 0x104ada8: lui   a0, 0x0
+// 0x0104adb8: 0x104adb8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104adac: 0x104adac: addiu sp, sp, -24
+// 0x0104adbc: 0x104adbc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104adb0: 0x104adb0: sw    ra, 20(sp)
-// 0x0104adb4: 0x104adb4: jal   0x100e348 addiu a0, a0, 13644
+// 0x0104adc0: 0x104adc0: sw    ra, 20(sp)
+// 0x0104adc4: 0x104adc4: jal   0x100e358 addiu a0, a0, 13644
 	ldloc.1
 	ldc.i4 13644
 	add
@@ -2764,18 +2764,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104adbc: 0x104adbc: lui   a1, 0x0
+// 0x0104adcc: 0x104adcc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104adc0: 0x104adc0: addu  a0, v0, zero
+// 0x0104add0: 0x104add0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104adc4: 0x104adc4: jal   0x1001b14 addiu a1, a1, 20820
+// 0x0104add4: 0x104add4: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2785,13 +2785,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104adcc: 0x104adcc: lw    ra, 20(sp)
-// 0x0104add0: 0x104add0: sltiu v0, v0, 1
+// 0x0104addc: 0x104addc: lw    ra, 20(sp)
+// 0x0104ade0: 0x104ade0: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0104add4: 0x104add4: jr    ra addiu sp, sp, 24
+// 0x0104ade4: 0x104ade4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2803,7 +2803,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_scoreboard_104addc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_scoreboard_104adec(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra,int32 t0)
@@ -2862,13 +2862,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104addc:
-// 0x0104addc: 0x104addc: addiu sp, sp, -88
+L_104adec:
+// 0x0104adec: 0x104adec: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x0104ade0: 0x104ade0: sw    s0, 56(sp)
+// 0x0104adf0: 0x104adf0: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2877,20 +2877,20 @@ L_104addc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104ade4: 0x104ade4: lui   s0, 0x70000
+// 0x0104adf4: 0x104adf4: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104ade8: 0x104ade8: lw    v0, -6304(s0)
+// 0x0104adf8: 0x104adf8: lw    v0, -5840(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1576
+	ldc.i4 -1460
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104adec: 0x104adec: sw    ra, 84(sp)
-// 0x0104adf0: 0x104adf0: sw    s6, 80(sp)
+// 0x0104adfc: 0x104adfc: sw    ra, 84(sp)
+// 0x0104ae00: 0x104ae00: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2899,7 +2899,7 @@ L_104addc:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104adf4: 0x104adf4: sw    s5, 76(sp)
+// 0x0104ae04: 0x104ae04: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2908,7 +2908,7 @@ L_104addc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104adf8: 0x104adf8: sw    s4, 72(sp)
+// 0x0104ae08: 0x104ae08: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2917,7 +2917,7 @@ L_104addc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104adfc: 0x104adfc: sw    s3, 68(sp)
+// 0x0104ae0c: 0x104ae0c: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2926,7 +2926,7 @@ L_104addc:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104ae00: 0x104ae00: sw    s2, 64(sp)
+// 0x0104ae10: 0x104ae10: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2935,7 +2935,7 @@ L_104addc:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104ae04: 0x104ae04: bne   v0, zero, 0x104ae6c sw    s1, 60(sp)
+// 0x0104ae14: 0x104ae14: bne   v0, zero, 0x104ae7c sw    s1, 60(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -2945,44 +2945,44 @@ L_104addc:
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_104ae6c
+	brtrue L_104ae7c
 // --- basic block ---
-// 0x0104ae0c: 0x104ae0c: lui   s1, 0x10000
+// 0x0104ae1c: 0x104ae1c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0104ae10: 0x104ae10: lui   a1, 0x0
+// 0x0104ae20: 0x104ae20: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104ae14: 0x104ae14: lui   a3, 0x20000
+// 0x0104ae24: 0x104ae24: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0104ae18: 0x104ae18: lui   v0, 0x0
+// 0x0104ae28: 0x104ae28: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104ae1c: 0x104ae1c: addiu a1, a1, 13644
+// 0x0104ae2c: 0x104ae2c: addiu a1, a1, 13644
 	ldloc.2
 	ldc.i4 13644
 	add
 	stloc.2
-// 0x0104ae20: 0x104ae20: addiu a3, a3, 9464
+// 0x0104ae30: 0x104ae30: addiu a3, a3, 9928
 	ldloc 4
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x0104ae24: 0x104ae24: addiu a0, s1, 12560
+// 0x0104ae34: 0x104ae34: addiu a0, s1, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0104ae28: 0x104ae28: addu  a2, zero, zero
+// 0x0104ae38: 0x104ae38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104ae2c: 0x104ae2c: addiu v0, v0, 20820
+// 0x0104ae3c: 0x104ae3c: addiu v0, v0, 20820
 	ldloc 5
 	ldc.i4 20820
 	add
 	stloc 5
-// 0x0104ae30: 0x104ae30: sw    v0, 16(sp)
+// 0x0104ae40: 0x104ae40: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2991,7 +2991,7 @@ L_104addc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ae34: 0x104ae34: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0104ae44: 0x104ae44: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3005,36 +3005,36 @@ L_104addc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ae3c: 0x104ae3c: lui   a1, 0x0
+// 0x0104ae4c: 0x104ae4c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104ae40: 0x104ae40: lui   a3, 0x10000
+// 0x0104ae50: 0x104ae50: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104ae44: 0x104ae44: addiu a0, s1, 12560
+// 0x0104ae54: 0x104ae54: addiu a0, s1, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0104ae48: 0x104ae48: addiu a1, a1, 13660
+// 0x0104ae58: 0x104ae58: addiu a1, a1, 13660
 	ldloc.2
 	ldc.i4 13660
 	add
 	stloc.2
-// 0x0104ae4c: 0x104ae4c: addiu a3, a3, 2428
+// 0x0104ae5c: 0x104ae5c: addiu a3, a3, 2424
 	ldloc 4
-	ldc.i4 2428
+	ldc.i4 2424
 	add
 	stloc 4
-// 0x0104ae50: 0x104ae50: addu  a2, zero, zero
+// 0x0104ae60: 0x104ae60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104ae54: 0x104ae54: jal   0x100edf8 sw    zero, 16(sp)
+// 0x0104ae64: 0x104ae64: jal   0x100ee08 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3048,67 +3048,67 @@ L_104addc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ae5c: 0x104ae5c: addiu v0, zero, 1
+// 0x0104ae6c: 0x104ae6c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0104ae60: 0x104ae60: sw    v0, -6304(s0)
+// 0x0104ae70: 0x104ae70: sw    v0, -5840(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1576
+	ldc.i4 -1460
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ae64: 0x104ae64: lui   v0, 0x70000
+// 0x0104ae74: 0x104ae74: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104ae68: 0x104ae68: sb    zero, -6300(v0)
+// 0x0104ae78: 0x104ae78: sb    zero, -5836(v0)
 	ldloc 5
-	ldc.i4 -6300
+	ldc.i4 -5836
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_104ae6c:
-// 0x0104ae6c: 0x104ae6c: jal   0x104ada8 sll   zero, zero, 0
+L_104ae7c:
+// 0x0104ae7c: 0x104ae7c: jal   0x104adb8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_scoreboard_feature_enabled_104ada8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_scoreboard_feature_enabled_104adb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ae74: 0x104ae74: bne   v0, zero, 0x104ae9c lui   v0, 0x20000
+// 0x0104ae84: 0x104ae84: bne   v0, zero, 0x104aeac lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brtrue L_104ae9c
+	brtrue L_104aeac
 // --- basic block ---
-// 0x0104ae7c: 0x104ae7c: lui   a0, 0x10000
+// 0x0104ae8c: 0x104ae8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104ae80: 0x104ae80: lui   a1, 0x10000
+// 0x0104ae90: 0x104ae90: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104ae84: 0x104ae84: addiu a0, a0, -30972
+// 0x0104ae94: 0x104ae94: addiu a0, a0, -30972
 	ldloc.1
 	ldc.i4 -30972
 	add
 	stloc.1
-// 0x0104ae88: 0x104ae88: addiu a1, a1, 2468
+// 0x0104ae98: 0x104ae98: addiu a1, a1, 2464
 	ldloc.2
-	ldc.i4 2468
+	ldc.i4 2464
 	add
 	stloc.2
-// 0x0104ae8c: 0x104ae8c: jal   0x104bfe4 addiu a2, zero, 5
+// 0x0104ae9c: 0x104ae9c: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -3116,36 +3116,36 @@ L_104ae6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ae94: 0x104ae94: j	 0x104af58 sll   zero, zero, 0
-	br L_104af58
+// 0x0104aea4: 0x104aea4: j	 0x104af68 sll   zero, zero, 0
+	br L_104af68
 // --- basic block ---
-L_104ae9c:
-// 0x0104ae9c: 0x104ae9c: lw    a0, 27708(v0)
+L_104aeac:
+// 0x0104aeac: 0x104aeac: lw    a0, 28172(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6927
+	ldc.i4 7043
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104aea0: 0x104aea0: addu  a1, zero, zero
+// 0x0104aeb0: 0x104aeb0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104aea4: 0x104aea4: jal   0x104bfdc addu  a2, zero, zero
+// 0x0104aeb4: 0x104aeb4: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x0104aeac: 0x104aeac: lui   a0, 0x0
+// 0x0104aebc: 0x104aebc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104aeb0: 0x104aeb0: jal   0x100e348 addiu a0, a0, 13660
+// 0x0104aec0: 0x104aec0: jal   0x100e358 addiu a0, a0, 13660
 	ldloc.1
 	ldc.i4 13660
 	add
@@ -3155,12 +3155,12 @@ L_104ae9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104aeb8: 0x104aeb8: jal   0x106ab1c sw    v0, 48(sp)
+// 0x0104aec8: 0x104aec8: jal   0x106b140 sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3169,51 +3169,51 @@ L_104ae9c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 5
 // --- basic block ---
-// 0x0104aec0: 0x104aec0: jal   0x106ab10 addu  s4, v0, zero
+// 0x0104aed0: 0x104aed0: jal   0x106b134 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 5
 // --- basic block ---
-// 0x0104aec8: 0x104aec8: addu  s3, v0, zero
+// 0x0104aed8: 0x104aed8: addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0104aecc: 0x104aecc: lui   v0, 0xf0000
+// 0x0104aedc: 0x104aedc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0104aed0: 0x104aed0: lw    s6, -30072(v0)
+// 0x0104aee0: 0x104aee0: lw    s6, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104aed4: 0x104aed4: lui   v0, 0xf0000
+// 0x0104aee4: 0x104aee4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0104aed8: 0x104aed8: lw    s2, -30068(v0)
+// 0x0104aee8: 0x104aee8: lw    s2, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104aedc: 0x104aedc: jal   0x1042430 lui   s0, 0x70000
+// 0x0104aeec: 0x104aeec: jal   0x1042440 lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104aee4: 0x104aee4: jal   0x101d484 addu  s5, v0, zero
+// 0x0104aef4: 0x104aef4: jal   0x101d494 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -3221,12 +3221,12 @@ L_104ae9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104aeec: 0x104aeec: jal   0x102c3f0 addu  s1, v0, zero
+// 0x0104aefc: 0x104aefc: jal   0x102c400 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -3234,12 +3234,12 @@ L_104ae9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104aef4: 0x104aef4: lw    a3, 48(sp)
+// 0x0104af04: 0x104af04: lw    a3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3248,7 +3248,7 @@ L_104ae9c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104aef8: 0x104aef8: sw    v0, 40(sp)
+// 0x0104af08: 0x104af08: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3257,39 +3257,39 @@ L_104ae9c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104aefc: 0x104aefc: lui   a2, 0x10000
+// 0x0104af0c: 0x104af0c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104af00: 0x104af00: lui   v0, 0x10000
+// 0x0104af10: 0x104af10: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104af04: 0x104af04: subu  v1, s6, s5
+// 0x0104af14: 0x104af14: subu  v1, s6, s5
 	ldloc 14
 	ldloc 13
 	sub
 	stloc 7
-// 0x0104af08: 0x104af08: addiu a2, a2, 2520
+// 0x0104af18: 0x104af18: addiu a2, a2, 2516
 	ldloc.3
-	ldc.i4 2520
+	ldc.i4 2516
 	add
 	stloc.3
-// 0x0104af0c: 0x104af0c: addiu a0, s0, -6300
+// 0x0104af1c: 0x104af1c: addiu a0, s0, -5836
 	ldloc 8
-	ldc.i4 -6300
+	ldc.i4 -5836
 	add
 	stloc.1
-// 0x0104af10: 0x104af10: addiu a1, zero, 1024
+// 0x0104af20: 0x104af20: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x0104af14: 0x104af14: addiu t0, zero, 20
+// 0x0104af24: 0x104af24: addiu t0, zero, 20
 	ldc.i4.s 20
 	stloc 16
-// 0x0104af18: 0x104af18: addiu v0, v0, -16892
+// 0x0104af28: 0x104af28: addiu v0, v0, 19396
 	ldloc 5
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc 5
-// 0x0104af1c: 0x104af1c: sw    s4, 16(sp)
+// 0x0104af2c: 0x104af2c: sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3298,7 +3298,7 @@ L_104ae9c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104af20: 0x104af20: sw    s3, 20(sp)
+// 0x0104af30: 0x104af30: sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3307,7 +3307,7 @@ L_104ae9c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104af24: 0x104af24: sw    t0, 24(sp)
+// 0x0104af34: 0x104af34: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3316,7 +3316,7 @@ L_104ae9c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104af28: 0x104af28: sw    s2, 28(sp)
+// 0x0104af38: 0x104af38: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3325,7 +3325,7 @@ L_104ae9c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104af2c: 0x104af2c: sw    v1, 32(sp)
+// 0x0104af3c: 0x104af3c: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3334,7 +3334,7 @@ L_104ae9c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104af30: 0x104af30: sw    s1, 36(sp)
+// 0x0104af40: 0x104af40: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3343,7 +3343,7 @@ L_104ae9c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104af34: 0x104af34: jal   0x1000f9c sw    v0, 44(sp)
+// 0x0104af44: 0x104af44: jal   0x1000f9c sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3362,28 +3362,28 @@ L_104ae9c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104af3c: 0x104af3c: lui   a0, 0x10000
+// 0x0104af4c: 0x104af4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104af40: 0x104af40: lui   a2, 0x1020000
+// 0x0104af50: 0x104af50: lui   a2, 0x1020000
 	ldc.i4 16908288
 	stloc.3
-// 0x0104af44: 0x104af44: addiu a0, a0, -18256
+// 0x0104af54: 0x104af54: addiu a0, a0, -18256
 	ldloc.1
 	ldc.i4 -18256
 	add
 	stloc.1
-// 0x0104af48: 0x104af48: addiu a1, s0, -6300
+// 0x0104af58: 0x104af58: addiu a1, s0, -5836
 	ldloc 8
-	ldc.i4 -6300
+	ldc.i4 -5836
 	add
 	stloc.2
-// 0x0104af4c: 0x104af4c: addiu a2, a2, 29848
+// 0x0104af5c: 0x104af5c: addiu a2, a2, 29864
 	ldloc.3
-	ldc.i4 29848
+	ldc.i4 29864
 	add
 	stloc.3
-// 0x0104af50: 0x104af50: jal   0x1055238 addu  a3, zero, zero
+// 0x0104af60: 0x104af60: jal   0x1055248 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3391,14 +3391,14 @@ L_104ae9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_show_1055238(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_show_1055248(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104af58:
-// 0x0104af58: 0x104af58: lw    ra, 84(sp)
-// 0x0104af5c: 0x104af5c: lw    s6, 80(sp)
+L_104af68:
+// 0x0104af68: 0x104af68: lw    ra, 84(sp)
+// 0x0104af6c: 0x104af6c: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3407,7 +3407,7 @@ L_104af58:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104af60: 0x104af60: lw    s5, 76(sp)
+// 0x0104af70: 0x104af70: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3416,7 +3416,7 @@ L_104af58:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104af64: 0x104af64: lw    s4, 72(sp)
+// 0x0104af74: 0x104af74: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3425,7 +3425,7 @@ L_104af58:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104af68: 0x104af68: lw    s3, 68(sp)
+// 0x0104af78: 0x104af78: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3434,7 +3434,7 @@ L_104af58:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104af6c: 0x104af6c: lw    s2, 64(sp)
+// 0x0104af7c: 0x104af7c: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3443,7 +3443,7 @@ L_104af58:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104af70: 0x104af70: lw    s1, 60(sp)
+// 0x0104af80: 0x104af80: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3452,7 +3452,7 @@ L_104af58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104af74: 0x104af74: lw    s0, 56(sp)
+// 0x0104af84: 0x104af84: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3461,7 +3461,7 @@ L_104af58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104af78: 0x104af78: jr    ra addiu sp, sp, 88
+// 0x0104af88: 0x104af88: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -3473,7 +3473,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 social_image_download_update_bitmap_cb_104af80(int32,int32,int32,int32,int32)
+.method public static int32 social_image_download_update_bitmap_cb_104af90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -3508,16 +3508,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104af80: 0x104af80: addiu sp, sp, -24
+// 0x0104af90: 0x104af90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104af84: 0x104af84: bne   a1, zero, 0x104af9c sw    ra, 20(sp)
+// 0x0104af94: 0x104af94: bne   a1, zero, 0x104afac sw    ra, 20(sp)
 	ldloc.2
-	brtrue L_104af9c
+	brtrue L_104afac
 // --- basic block ---
-// 0x0104af8c: 0x104af8c: jal   0x109df3c addu  a1, a2, zero
+// 0x0104af9c: 0x104af9c: jal   0x109e584 addu  a1, a2, zero
 	ldloc.3
 	stloc.2
 	ldloc.0
@@ -3525,26 +3525,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_image_update_109df3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_image_update_109e584(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104af94: 0x104af94: jal   0x102146c sll   zero, zero, 0
+// 0x0104afa4: 0x104afa4: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_104af9c:
-// 0x0104af9c: 0x104af9c: lw    ra, 20(sp)
-// 0x0104afa0: 0x104afa0: sll   zero, zero, 0
-// 0x0104afa4: 0x104afa4: jr    ra addiu sp, sp, 24
+L_104afac:
+// 0x0104afac: 0x104afac: lw    ra, 20(sp)
+// 0x0104afb0: 0x104afb0: sll   zero, zero, 0
+// 0x0104afb4: 0x104afb4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3556,7 +3556,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 download_size_callback_104afac(int32,int32,int32,int32,int32)
+.method public static int32 download_size_callback_104afbc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -3594,13 +3594,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104afac:
-// 0x0104afac: 0x104afac: addiu sp, sp, -32
+L_104afbc:
+// 0x0104afbc: 0x104afbc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104afb0: 0x104afb0: sw    s0, 24(sp)
+// 0x0104afc0: 0x104afc0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3609,17 +3609,17 @@ L_104afac:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104afb4: 0x104afb4: sw    ra, 28(sp)
-// 0x0104afb8: 0x104afb8: beq   a1, zero, 0x104afd8 addu  s0, a0, zero
+// 0x0104afc4: 0x104afc4: sw    ra, 28(sp)
+// 0x0104afc8: 0x104afc8: beq   a1, zero, 0x104afe8 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 6
-	brfalse L_104afd8
+	brfalse L_104afe8
 // --- basic block ---
-// 0x0104afc0: 0x104afc0: addu  a0, a1, zero
+// 0x0104afd0: 0x104afd0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104afc4: 0x104afc4: jal   0x1000910 sw    a1, 16(sp)
+// 0x0104afd4: 0x104afd4: jal   0x1000910 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3638,7 +3638,7 @@ L_104afac:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0104afcc: 0x104afcc: lw    a1, 16(sp)
+// 0x0104afdc: 0x104afdc: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3647,7 +3647,7 @@ L_104afac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104afd0: 0x104afd0: sw    v0, 4(s0)
+// 0x0104afe0: 0x104afe0: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3656,7 +3656,7 @@ L_104afac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104afd4: 0x104afd4: sw    zero, 8(s0)
+// 0x0104afe4: 0x104afe4: sw    zero, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3665,12 +3665,12 @@ L_104afac:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_104afd8:
-// 0x0104afd8: 0x104afd8: lw    ra, 28(sp)
-// 0x0104afdc: 0x104afdc: addu  v0, a1, zero
+L_104afe8:
+// 0x0104afe8: 0x104afe8: lw    ra, 28(sp)
+// 0x0104afec: 0x104afec: addu  v0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0104afe0: 0x104afe0: lw    s0, 24(sp)
+// 0x0104aff0: 0x104aff0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3679,7 +3679,7 @@ L_104afd8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104afe4: 0x104afe4: jr    ra addiu sp, sp, 32
+// 0x0104aff4: 0x104aff4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3691,7 +3691,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_social_image_terminate_104afec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_image_terminate_104affc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 ra,int32 v1)
@@ -3732,12 +3732,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104afec: 0x104afec: addiu sp, sp, -32
+// 0x0104affc: 0x104affc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104aff0: 0x104aff0: sw    s1, 24(sp)
+// 0x0104b000: 0x104b000: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3746,7 +3746,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104aff4: 0x104aff4: sw    s0, 20(sp)
+// 0x0104b004: 0x104b004: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3755,39 +3755,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104aff8: 0x104aff8: lui   s1, 0xf0000
+// 0x0104b008: 0x104b008: lui   s1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0104affc: 0x104affc: lui   s0, 0xf0000
+// 0x0104b00c: 0x104b00c: lui   s0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0104b000: 0x104b000: sw    ra, 28(sp)
-// 0x0104b004: 0x104b004: addiu s0, s0, -30472
+// 0x0104b010: 0x104b010: sw    ra, 28(sp)
+// 0x0104b014: 0x104b014: addiu s0, s0, -30008
 	ldloc 5
-	ldc.i4 -30472
+	ldc.i4 -30008
 	add
 	stloc 5
-// 0x0104b008: 0x104b008: addiu s1, s1, -30072
+// 0x0104b018: 0x104b018: addiu s1, s1, -29608
 	ldloc 7
-	ldc.i4 -30072
+	ldc.i4 -29608
 	add
 	stloc 7
-L_104b00c:
-// 0x0104b00c: 0x104b00c: lw    v0, 0(s0)
+L_104b01c:
+// 0x0104b01c: 0x104b01c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0104b010: 0x104b010: sll   zero, zero, 0
-// 0x0104b014: 0x104b014: beq   v0, zero, 0x104b024 addu  a0, v0, zero
+// 0x0104b020: 0x104b020: sll   zero, zero, 0
+// 0x0104b024: 0x104b024: beq   v0, zero, 0x104b034 addu  a0, v0, zero
 	ldloc 8
 	ldloc 8
 	stloc.1
-	brfalse L_104b024
+	brfalse L_104b034
 // --- basic block ---
-// 0x0104b01c: 0x104b01c: jal   0x1000930 sll   zero, zero, 0
+// 0x0104b02c: 0x104b02c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3798,26 +3798,26 @@ L_104b00c:
 	stloc 10
 	stloc 8
 // --- basic block ---
-L_104b024:
-// 0x0104b024: 0x104b024: sw    zero, 0(s0)
+L_104b034:
+// 0x0104b034: 0x104b034: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104b028: 0x104b028: addiu s0, s0, 8
+// 0x0104b038: 0x104b038: addiu s0, s0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0104b02c: 0x104b02c: bne   s0, s1, 0x104b00c sll   zero, zero, 0
+// 0x0104b03c: 0x104b03c: bne   s0, s1, 0x104b01c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_104b00c
+	bne.un L_104b01c
 // --- basic block ---
-// 0x0104b034: 0x104b034: lw    ra, 28(sp)
-// 0x0104b038: 0x104b038: lw    s1, 24(sp)
+// 0x0104b044: 0x104b044: lw    ra, 28(sp)
+// 0x0104b048: 0x104b048: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3826,7 +3826,7 @@ L_104b024:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104b03c: 0x104b03c: lw    s0, 20(sp)
+// 0x0104b04c: 0x104b04c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3835,7 +3835,7 @@ L_104b024:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104b040: 0x104b040: jr    ra addiu sp, sp, 32
+// 0x0104b050: 0x104b050: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3847,7 +3847,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 download_done_callback_104b048(int32,int32,int32,int32,int32)
+.method public static int32 download_done_callback_104b058(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s3,int32 s1,int32 ra,int32 hi,int32 lo)
@@ -3900,13 +3900,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104b048:
-// 0x0104b048: 0x104b048: addiu sp, sp, -40
+L_104b058:
+// 0x0104b058: 0x104b058: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104b04c: 0x104b04c: sw    s0, 20(sp)
+// 0x0104b05c: 0x104b05c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3915,10 +3915,10 @@ L_104b048:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104b050: 0x104b050: addu  s0, a0, zero
+// 0x0104b060: 0x104b060: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104b054: 0x104b054: lw    a1, 8(s0)
+// 0x0104b064: 0x104b064: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3927,7 +3927,7 @@ L_104b048:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104b058: 0x104b058: lw    a0, 4(a0)
+// 0x0104b068: 0x104b068: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3936,7 +3936,7 @@ L_104b048:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104b05c: 0x104b05c: sw    s1, 24(sp)
+// 0x0104b06c: 0x104b06c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3945,8 +3945,8 @@ L_104b048:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104b060: 0x104b060: sw    ra, 36(sp)
-// 0x0104b064: 0x104b064: sw    s3, 32(sp)
+// 0x0104b070: 0x104b070: sw    ra, 36(sp)
+// 0x0104b074: 0x104b074: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3955,7 +3955,7 @@ L_104b048:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104b068: 0x104b068: jal   0x104e124 sw    s2, 28(sp)
+// 0x0104b078: 0x104b078: jal   0x104e134 sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3969,15 +3969,15 @@ L_104b048:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_image_jpg_from_buff_104e124(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_image_jpg_from_buff_104e134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104b070: 0x104b070: addu  s1, v0, zero
+// 0x0104b080: 0x104b080: addu  s1, v0, zero
 	ldloc 6
 	stloc 11
-// 0x0104b074: 0x104b074: lw    v0, 12(s0)
+// 0x0104b084: 0x104b084: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3986,14 +3986,14 @@ L_104b048:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104b078: 0x104b078: sll   zero, zero, 0
-// 0x0104b07c: 0x104b07c: beq   v0, zero, 0x104b090 addu  a1, zero, zero
+// 0x0104b088: 0x104b088: sll   zero, zero, 0
+// 0x0104b08c: 0x104b08c: beq   v0, zero, 0x104b0a0 addu  a1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_104b090
+	brfalse L_104b0a0
 // --- basic block ---
-// 0x0104b084: 0x104b084: lw    a0, 16(s0)
+// 0x0104b094: 0x104b094: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4002,7 +4002,7 @@ L_104b048:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104b088: 0x104b088: jalr  v0 addu  a2, s1, zero
+// 0x0104b098: 0x104b098: jalr  v0 addu  a2, s1, zero
 	ldloc 6
 	ldloc 11
 	stloc.3
@@ -4016,56 +4016,56 @@ L_104b048:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_104b090:
-// 0x0104b090: 0x104b090: lui   v0, 0x70000
+L_104b0a0:
+// 0x0104b0a0: 0x104b0a0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104b094: 0x104b094: lw    v1, -5276(v0)
+// 0x0104b0a4: 0x104b0a4: lw    v1, -4812(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1319
+	ldc.i4 -1203
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104b098: 0x104b098: lui   v0, 0xf0000
+// 0x0104b0a8: 0x104b0a8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0104b09c: 0x104b09c: sll   v1, v1, 3
+// 0x0104b0ac: 0x104b0ac: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x0104b0a0: 0x104b0a0: addiu v0, v0, -30472
+// 0x0104b0b0: 0x104b0b0: addiu v0, v0, -30008
 	ldloc 6
-	ldc.i4 -30472
+	ldc.i4 -30008
 	add
 	stloc 6
-// 0x0104b0a4: 0x104b0a4: addu  v0, v1, v0
+// 0x0104b0b4: 0x104b0b4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x0104b0a8: 0x104b0a8: lw    a0, 0(v0)
+// 0x0104b0b8: 0x104b0b8: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104b0ac: 0x104b0ac: lw    s2, 0(s0)
+// 0x0104b0bc: 0x104b0bc: lw    s2, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0104b0b0: 0x104b0b0: beq   a0, zero, 0x104b0c0 sll   zero, zero, 0
+// 0x0104b0c0: 0x104b0c0: beq   a0, zero, 0x104b0d0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_104b0c0
+	brfalse L_104b0d0
 // --- basic block ---
-// 0x0104b0b8: 0x104b0b8: jal   0x1000930 sll   zero, zero, 0
+// 0x0104b0c8: 0x104b0c8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4076,23 +4076,23 @@ L_104b090:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_104b0c0:
-// 0x0104b0c0: 0x104b0c0: addu  a0, s2, zero
+L_104b0d0:
+// 0x0104b0d0: 0x104b0d0: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0104b0c4: 0x104b0c4: lui   s2, 0x70000
+// 0x0104b0d4: 0x104b0d4: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0104b0c8: 0x104b0c8: lw    s3, -5276(s2)
+// 0x0104b0d8: 0x104b0d8: lw    s3, -4812(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1319
+	ldc.i4 -1203
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104b0cc: 0x104b0cc: jal   0x1001ba8 sll   s3, s3, 3
+// 0x0104b0dc: 0x104b0dc: jal   0x1001ba8 sll   s3, s3, 3
 	ldloc 10
 	ldc.i4.3
 	shl
@@ -4107,24 +4107,24 @@ L_104b0c0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104b0d4: 0x104b0d4: lw    a0, -5276(s2)
+// 0x0104b0e4: 0x104b0e4: lw    a0, -4812(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1319
+	ldc.i4 -1203
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104b0d8: 0x104b0d8: addiu v1, zero, 50
+// 0x0104b0e8: 0x104b0e8: addiu v1, zero, 50
 	ldc.i4.s 50
 	stloc 7
-// 0x0104b0dc: 0x104b0dc: addiu a1, a0, 1
+// 0x0104b0ec: 0x104b0ec: addiu a1, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0104b0e0: 0x104b0e0: div   a1, v1
+// 0x0104b0f0: 0x104b0f0: div   a1, v1
 	ldloc.2
 	ldloc 7
 	ldloc.2
@@ -4133,37 +4133,37 @@ L_104b0c0:
 	stloc 14
 	rem
 	stloc 13
-// 0x0104b0e4: 0x104b0e4: lui   a1, 0xf0000
+// 0x0104b0f4: 0x104b0f4: lui   a1, 0xf0000
 	ldc.i4 983040
 	stloc.2
-// 0x0104b0e8: 0x104b0e8: addiu a1, a1, -30472
+// 0x0104b0f8: 0x104b0f8: addiu a1, a1, -30008
 	ldloc.2
-	ldc.i4 -30472
+	ldc.i4 -30008
 	add
 	stloc.2
-// 0x0104b0ec: 0x104b0ec: addu  s3, s3, a1
+// 0x0104b0fc: 0x104b0fc: addu  s3, s3, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc 10
-// 0x0104b0f0: 0x104b0f0: sw    v0, 0(s3)
+// 0x0104b100: 0x104b100: sw    v0, 0(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0104b0f4: 0x104b0f4: sll   v0, a0, 3
+// 0x0104b104: 0x104b104: sll   v0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x0104b0f8: 0x104b0f8: addu  a1, a1, v0
+// 0x0104b108: 0x104b108: addu  a1, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc.2
-// 0x0104b0fc: 0x104b0fc: lw    a0, 4(s0)
+// 0x0104b10c: 0x104b10c: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4172,7 +4172,7 @@ L_104b0c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104b100: 0x104b100: sw    s1, 4(a1)
+// 0x0104b110: 0x104b110: sw    s1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4181,15 +4181,15 @@ L_104b0c0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104b104: 0x104b104: mfhi  hi
+// 0x0104b114: 0x104b114: mfhi  hi
 	ldloc 13
 	stloc 7
-// 0x0104b108: 0x104b108: jal   0x1000930 sw    v1, -5276(s2)
+// 0x0104b118: 0x104b118: jal   0x1000930 sw    v1, -4812(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1319
+	ldc.i4 -1203
 	add
 	ldloc 7
 	stelem.i4
@@ -4203,14 +4203,14 @@ L_104b0c0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104b110: 0x104b110: lw    a0, 0(s0)
+// 0x0104b120: 0x104b120: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104b114: 0x104b114: jal   0x1000930 sll   zero, zero, 0
+// 0x0104b124: 0x104b124: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4221,7 +4221,7 @@ L_104b0c0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104b11c: 0x104b11c: jal   0x1000930 addu  a0, s0, zero
+// 0x0104b12c: 0x104b12c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4234,8 +4234,8 @@ L_104b0c0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104b124: 0x104b124: lw    ra, 36(sp)
-// 0x0104b128: 0x104b128: lw    s3, 32(sp)
+// 0x0104b134: 0x104b134: lw    ra, 36(sp)
+// 0x0104b138: 0x104b138: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4244,7 +4244,7 @@ L_104b0c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104b12c: 0x104b12c: lw    s2, 28(sp)
+// 0x0104b13c: 0x104b13c: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4253,7 +4253,7 @@ L_104b0c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104b130: 0x104b130: lw    s1, 24(sp)
+// 0x0104b140: 0x104b140: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4262,7 +4262,7 @@ L_104b0c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104b134: 0x104b134: lw    s0, 20(sp)
+// 0x0104b144: 0x104b144: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4271,7 +4271,7 @@ L_104b0c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104b138: 0x104b138: jr    ra addiu sp, sp, 40
+// 0x0104b148: 0x104b148: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4283,7 +4283,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 download_error_callback_104b140(int32,int32,int32,int32,int32)
+.method public static int32 download_error_callback_104b150(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -4324,18 +4324,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104b140:
-// 0x0104b140: 0x104b140: addiu sp, sp, -1064
+L_104b150:
+// 0x0104b150: 0x104b150: addiu sp, sp, -1064
 	ldloc.0
 	ldc.i4 -1064
 	add
 	stloc.0
-// 0x0104b144: 0x104b144: addiu v0, sp, 1076
+// 0x0104b154: 0x104b154: addiu v0, sp, 1076
 	ldloc.0
 	ldc.i4 1076
 	add
 	stloc 6
-// 0x0104b148: 0x104b148: sw    s1, 1056(sp)
+// 0x0104b158: 0x104b158: sw    s1, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4344,12 +4344,12 @@ L_104b140:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b14c: 0x104b14c: addiu s1, sp, 20
+// 0x0104b15c: 0x104b15c: addiu s1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 9
-// 0x0104b150: 0x104b150: sw    s0, 1052(sp)
+// 0x0104b160: 0x104b160: sw    s0, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4358,7 +4358,7 @@ L_104b140:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104b154: 0x104b154: sw    a3, 1076(sp)
+// 0x0104b164: 0x104b164: sw    a3, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4367,20 +4367,20 @@ L_104b140:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0104b158: 0x104b158: addu  s0, a0, zero
+// 0x0104b168: 0x104b168: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0104b15c: 0x104b15c: addu  a3, v0, zero
+// 0x0104b16c: 0x104b16c: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0104b160: 0x104b160: addu  a0, s1, zero
+// 0x0104b170: 0x104b170: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104b164: 0x104b164: addiu a1, zero, 1024
+// 0x0104b174: 0x104b174: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x0104b168: 0x104b168: sw    ra, 1060(sp)
-// 0x0104b16c: 0x104b16c: jal   0x10c0a70 sw    v0, 16(sp)
+// 0x0104b178: 0x104b178: sw    ra, 1060(sp)
+// 0x0104b17c: 0x104b17c: jal   0x10c10b0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4394,26 +4394,26 @@ L_104b140:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104b174: 0x104b174: lui   a1, 0x10000
+// 0x0104b184: 0x104b184: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104b178: 0x104b178: addiu a0, zero, 3
+// 0x0104b188: 0x104b188: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0104b17c: 0x104b17c: addiu a1, a1, 2632
+// 0x0104b18c: 0x104b18c: addiu a1, a1, 2628
 	ldloc.2
-	ldc.i4 2632
+	ldc.i4 2628
 	add
 	stloc.2
-// 0x0104b180: 0x104b180: addu  a3, s1, zero
+// 0x0104b190: 0x104b190: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0104b184: 0x104b184: jal   0x100449c addiu a2, zero, 179
+// 0x0104b194: 0x104b194: jal   0x100449c addiu a2, zero, 179
 	ldc.i4 179
 	stloc.3
 	ldloc.0
@@ -4426,7 +4426,7 @@ L_104b140:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104b18c: 0x104b18c: lw    a0, 4(s0)
+// 0x0104b19c: 0x104b19c: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4435,12 +4435,12 @@ L_104b140:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104b190: 0x104b190: sll   zero, zero, 0
-// 0x0104b194: 0x104b194: beq   a0, zero, 0x104b1a8 sll   zero, zero, 0
+// 0x0104b1a0: 0x104b1a0: sll   zero, zero, 0
+// 0x0104b1a4: 0x104b1a4: beq   a0, zero, 0x104b1b8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_104b1a8
+	brfalse L_104b1b8
 // --- basic block ---
-// 0x0104b19c: 0x104b19c: jal   0x1000930 sll   zero, zero, 0
+// 0x0104b1ac: 0x104b1ac: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4451,7 +4451,7 @@ L_104b140:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104b1a4: 0x104b1a4: sw    zero, 4(s0)
+// 0x0104b1b4: 0x104b1b4: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4460,15 +4460,15 @@ L_104b140:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_104b1a8:
-// 0x0104b1a8: 0x104b1a8: lw    a0, 0(s0)
+L_104b1b8:
+// 0x0104b1b8: 0x104b1b8: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104b1ac: 0x104b1ac: jal   0x1000930 sll   zero, zero, 0
+// 0x0104b1bc: 0x104b1bc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4479,7 +4479,7 @@ L_104b1a8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104b1b4: 0x104b1b4: lw    v0, 12(s0)
+// 0x0104b1c4: 0x104b1c4: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4488,14 +4488,14 @@ L_104b1a8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104b1b8: 0x104b1b8: sll   zero, zero, 0
-// 0x0104b1bc: 0x104b1bc: beq   v0, zero, 0x104b1d0 addiu a1, zero, -1
+// 0x0104b1c8: 0x104b1c8: sll   zero, zero, 0
+// 0x0104b1cc: 0x104b1cc: beq   v0, zero, 0x104b1e0 addiu a1, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc.2
-	brfalse L_104b1d0
+	brfalse L_104b1e0
 // --- basic block ---
-// 0x0104b1c4: 0x104b1c4: lw    a0, 16(s0)
+// 0x0104b1d4: 0x104b1d4: lw    a0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4504,7 +4504,7 @@ L_104b1a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104b1c8: 0x104b1c8: jalr  v0 addu  a2, zero, zero
+// 0x0104b1d8: 0x104b1d8: jalr  v0 addu  a2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.3
@@ -4518,9 +4518,9 @@ L_104b1a8:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_104b1d0:
-// 0x0104b1d0: 0x104b1d0: lw    ra, 1060(sp)
-// 0x0104b1d4: 0x104b1d4: lw    s1, 1056(sp)
+L_104b1e0:
+// 0x0104b1e0: 0x104b1e0: lw    ra, 1060(sp)
+// 0x0104b1e4: 0x104b1e4: lw    s1, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4529,7 +4529,7 @@ L_104b1d0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104b1d8: 0x104b1d8: lw    s0, 1052(sp)
+// 0x0104b1e8: 0x104b1e8: lw    s0, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4538,7 +4538,7 @@ L_104b1d0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104b1dc: 0x104b1dc: jr    ra addiu sp, sp, 1064
+// 0x0104b1ec: 0x104b1ec: jr    ra addiu sp, sp, 1064
 	ldloc.0
 	ldc.i4 1064
 	add
@@ -4550,7 +4550,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 download_progress_callback_104b1e4(int32,int32,int32,int32,int32)
+.method public static int32 download_progress_callback_104b1f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 ra,int32 v1)
@@ -4591,8 +4591,8 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104b1e4:
-// 0x0104b1e4: 0x104b1e4: lw    v0, 4(a0)
+L_104b1f4:
+// 0x0104b1f4: 0x104b1f4: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4601,12 +4601,12 @@ L_104b1e4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104b1e8: 0x104b1e8: addiu sp, sp, -32
+// 0x0104b1f8: 0x104b1f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104b1ec: 0x104b1ec: sw    s1, 24(sp)
+// 0x0104b1fc: 0x104b1fc: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4615,7 +4615,7 @@ L_104b1e4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104b1f0: 0x104b1f0: sw    s0, 20(sp)
+// 0x0104b200: 0x104b200: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4624,17 +4624,17 @@ L_104b1e4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104b1f4: 0x104b1f4: sw    ra, 28(sp)
-// 0x0104b1f8: 0x104b1f8: addu  s0, a0, zero
+// 0x0104b204: 0x104b204: sw    ra, 28(sp)
+// 0x0104b208: 0x104b208: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104b1fc: 0x104b1fc: beq   v0, zero, 0x104b220 addu  s1, a2, zero
+// 0x0104b20c: 0x104b20c: beq   v0, zero, 0x104b230 addu  s1, a2, zero
 	ldloc 6
 	ldloc.3
 	stloc 7
-	brfalse L_104b220
+	brfalse L_104b230
 // --- basic block ---
-// 0x0104b204: 0x104b204: lw    a0, 8(a0)
+// 0x0104b214: 0x104b214: lw    a0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4643,7 +4643,7 @@ L_104b1e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104b208: 0x104b208: jal   0x1001800 addu  a0, v0, a0
+// 0x0104b218: 0x104b218: jal   0x1001800 addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
@@ -4657,7 +4657,7 @@ L_104b1e4:
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0104b210: 0x104b210: lw    v0, 8(s0)
+// 0x0104b220: 0x104b220: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4666,13 +4666,13 @@ L_104b1e4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104b214: 0x104b214: sll   zero, zero, 0
-// 0x0104b218: 0x104b218: addu  s1, v0, s1
+// 0x0104b224: 0x104b224: sll   zero, zero, 0
+// 0x0104b228: 0x104b228: addu  s1, v0, s1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x0104b21c: 0x104b21c: sw    s1, 8(s0)
+// 0x0104b22c: 0x104b22c: sw    s1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4681,9 +4681,9 @@ L_104b1e4:
 	add
 	ldloc 7
 	stelem.i4
-L_104b220:
-// 0x0104b220: 0x104b220: lw    ra, 28(sp)
-// 0x0104b224: 0x104b224: lw    s1, 24(sp)
+L_104b230:
+// 0x0104b230: 0x104b230: lw    ra, 28(sp)
+// 0x0104b234: 0x104b234: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4692,7 +4692,7 @@ L_104b220:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104b228: 0x104b228: lw    s0, 20(sp)
+// 0x0104b238: 0x104b238: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4701,7 +4701,7 @@ L_104b220:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104b22c: 0x104b22c: jr    ra addiu sp, sp, 32
+// 0x0104b23c: 0x104b23c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4713,7 +4713,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_social_image_download_104b234(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_image_download_104b244(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s0,int32 s8,int32 s5,int32 s3,int32 s4,int32 s6,int32 s7,int32 ra)
@@ -4775,12 +4775,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b234: 0x104b234: addiu sp, sp, -184
+// 0x0104b244: 0x104b244: addiu sp, sp, -184
 	ldloc.0
 	ldc.i4 -184
 	add
 	stloc.0
-// 0x0104b238: 0x104b238: sw    s4, 160(sp)
+// 0x0104b248: 0x104b248: sw    s4, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4789,7 +4789,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104b23c: 0x104b23c: sw    s1, 148(sp)
+// 0x0104b24c: 0x104b24c: sw    s1, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4798,7 +4798,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b240: 0x104b240: sw    s0, 144(sp)
+// 0x0104b250: 0x104b250: sw    s0, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4807,7 +4807,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104b244: 0x104b244: lw    s1, 200(sp)
+// 0x0104b254: 0x104b254: lw    s1, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4816,18 +4816,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104b248: 0x104b248: addiu s0, sp, 80
+// 0x0104b258: 0x104b258: addiu s0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 10
-// 0x0104b24c: 0x104b24c: addu  s4, a2, zero
+// 0x0104b25c: 0x104b25c: addu  s4, a2, zero
 	ldloc.3
 	stloc 14
-// 0x0104b250: 0x104b250: lui   a2, 0x10000
+// 0x0104b260: 0x104b260: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104b254: 0x104b254: sw    s8, 176(sp)
+// 0x0104b264: 0x104b264: sw    s8, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4836,7 +4836,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104b258: 0x104b258: sw    s5, 164(sp)
+// 0x0104b268: 0x104b268: sw    s5, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4845,7 +4845,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104b25c: 0x104b25c: sw    s3, 156(sp)
+// 0x0104b26c: 0x104b26c: sw    s3, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4854,30 +4854,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104b260: 0x104b260: addu  s5, a1, zero
+// 0x0104b270: 0x104b270: addu  s5, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0104b264: 0x104b264: addu  s3, a3, zero
+// 0x0104b274: 0x104b274: addu  s3, a3, zero
 	ldloc 4
 	stloc 13
-// 0x0104b268: 0x104b268: addiu a2, a2, 2668
+// 0x0104b278: 0x104b278: addiu a2, a2, 2664
 	ldloc.3
-	ldc.i4 2668
+	ldc.i4 2664
 	add
 	stloc.3
-// 0x0104b26c: 0x104b26c: addu  a3, a0, zero
+// 0x0104b27c: 0x104b27c: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x0104b270: 0x104b270: addiu a1, zero, 50
+// 0x0104b280: 0x104b280: addiu a1, zero, 50
 	ldc.i4.s 50
 	stloc.2
-// 0x0104b274: 0x104b274: addu  a0, s0, zero
+// 0x0104b284: 0x104b284: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104b278: 0x104b278: lui   s8, 0xf0000
+// 0x0104b288: 0x104b288: lui   s8, 0xf0000
 	ldc.i4 983040
 	stloc 11
-// 0x0104b27c: 0x104b27c: sw    s7, 172(sp)
+// 0x0104b28c: 0x104b28c: sw    s7, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4886,7 +4886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104b280: 0x104b280: sw    s6, 168(sp)
+// 0x0104b290: 0x104b290: sw    s6, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4895,7 +4895,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0104b284: 0x104b284: sw    s2, 152(sp)
+// 0x0104b294: 0x104b294: sw    s2, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4904,8 +4904,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104b288: 0x104b288: sw    ra, 180(sp)
-// 0x0104b28c: 0x104b28c: sw    s5, 16(sp)
+// 0x0104b298: 0x104b298: sw    ra, 180(sp)
+// 0x0104b29c: 0x104b29c: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4914,7 +4914,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104b290: 0x104b290: sw    s4, 20(sp)
+// 0x0104b2a0: 0x104b2a0: sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4923,7 +4923,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104b294: 0x104b294: sw    s3, 24(sp)
+// 0x0104b2a4: 0x104b2a4: sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4932,7 +4932,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104b298: 0x104b298: sw    s1, 28(sp)
+// 0x0104b2a8: 0x104b2a8: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4941,7 +4941,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b29c: 0x104b29c: lw    s7, 204(sp)
+// 0x0104b2ac: 0x104b2ac: lw    s7, 204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4950,7 +4950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104b2a0: 0x104b2a0: lw    s6, 208(sp)
+// 0x0104b2b0: 0x104b2b0: lw    s6, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4959,9 +4959,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104b2a4: 0x104b2a4: jal   0x1000f9c addiu s8, s8, -30472
+// 0x0104b2b4: 0x104b2b4: jal   0x1000f9c addiu s8, s8, -30008
 	ldloc 11
-	ldc.i4 -30472
+	ldc.i4 -30008
 	add
 	stloc 11
 	ldloc.0
@@ -4974,33 +4974,33 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b2ac: 0x104b2ac: addu  s2, zero, zero
+// 0x0104b2bc: 0x104b2bc: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0104b2b0: 0x104b2b0: addu  v1, s0, zero
+// 0x0104b2c0: 0x104b2c0: addu  v1, s0, zero
 	ldloc 10
 	stloc 7
-// 0x0104b2b4: 0x104b2b4: addiu s0, zero, 50
+// 0x0104b2c4: 0x104b2c4: addiu s0, zero, 50
 	ldc.i4.s 50
 	stloc 10
-L_104b2b8:
-// 0x0104b2b8: 0x104b2b8: lw    v0, 0(s8)
+L_104b2c8:
+// 0x0104b2c8: 0x104b2c8: lw    v0, 0(s8)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104b2bc: 0x104b2bc: addu  a1, v1, zero
+// 0x0104b2cc: 0x104b2cc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0104b2c0: 0x104b2c0: beq   v0, zero, 0x104b308 addu  a0, v0, zero
+// 0x0104b2d0: 0x104b2d0: beq   v0, zero, 0x104b318 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_104b308
+	brfalse L_104b318
 // --- basic block ---
-// 0x0104b2c8: 0x104b2c8: jal   0x1001b14 sw    v1, 136(sp)
+// 0x0104b2d8: 0x104b2d8: jal   0x1001b14 sw    v1, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5014,7 +5014,7 @@ L_104b2b8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104b2d0: 0x104b2d0: lw    v1, 136(sp)
+// 0x0104b2e0: 0x104b2e0: lw    v1, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5023,38 +5023,38 @@ L_104b2b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104b2d4: 0x104b2d4: bne   v0, zero, 0x104b30c addiu s2, s2, 1
+// 0x0104b2e4: 0x104b2e4: bne   v0, zero, 0x104b31c addiu s2, s2, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_104b30c
+	brtrue L_104b31c
 // --- basic block ---
-// 0x0104b2dc: 0x104b2dc: addiu s2, s2, -1
+// 0x0104b2ec: 0x104b2ec: addiu s2, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x0104b2e0: 0x104b2e0: lui   v0, 0xf0000
+// 0x0104b2f0: 0x104b2f0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0104b2e4: 0x104b2e4: sll   s2, s2, 3
+// 0x0104b2f4: 0x104b2f4: sll   s2, s2, 3
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 8
-// 0x0104b2e8: 0x104b2e8: addiu v0, v0, -30472
+// 0x0104b2f8: 0x104b2f8: addiu v0, v0, -30008
 	ldloc 5
-	ldc.i4 -30472
+	ldc.i4 -30008
 	add
 	stloc 5
-// 0x0104b2ec: 0x104b2ec: addu  s2, v0, s2
+// 0x0104b2fc: 0x104b2fc: addu  s2, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0104b2f0: 0x104b2f0: lw    a2, 4(s2)
+// 0x0104b300: 0x104b300: lw    a2, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5063,42 +5063,42 @@ L_104b2b8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104b2f4: 0x104b2f4: sll   zero, zero, 0
-// 0x0104b2f8: 0x104b2f8: bne   a2, zero, 0x104b31c sll   zero, zero, 0
+// 0x0104b304: 0x104b304: sll   zero, zero, 0
+// 0x0104b308: 0x104b308: bne   a2, zero, 0x104b32c sll   zero, zero, 0
 	ldloc.3
-	brtrue L_104b31c
+	brtrue L_104b32c
 // --- basic block ---
-// 0x0104b300: 0x104b300: j	 0x104b330 lui   a0, 0x0
+// 0x0104b310: 0x104b310: j	 0x104b340 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_104b330
+	br L_104b340
 // --- basic block ---
-L_104b308:
-// 0x0104b308: 0x104b308: addiu s2, s2, 1
+L_104b318:
+// 0x0104b318: 0x104b318: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_104b30c:
-// 0x0104b30c: 0x104b30c: bne   s2, s0, 0x104b2b8 addiu s8, s8, 8
+L_104b31c:
+// 0x0104b31c: 0x104b31c: bne   s2, s0, 0x104b2c8 addiu s8, s8, 8
 	ldloc 8
 	ldloc 10
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 11
-	bne.un L_104b2b8
+	bne.un L_104b2c8
 // --- basic block ---
-// 0x0104b314: 0x104b314: j	 0x104b330 lui   a0, 0x0
+// 0x0104b324: 0x104b324: j	 0x104b340 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_104b330
+	br L_104b340
 // --- basic block ---
-L_104b31c:
-// 0x0104b31c: 0x104b31c: addu  a0, s7, zero
+L_104b32c:
+// 0x0104b32c: 0x104b32c: addu  a0, s7, zero
 	ldloc 16
 	stloc.1
-// 0x0104b320: 0x104b320: jalr  s6 addu  a1, zero, zero
+// 0x0104b330: 0x104b330: jalr  s6 addu  a1, zero, zero
 	ldloc 15
 	ldc.i4.s 0
 	stloc.2
@@ -5112,11 +5112,11 @@ L_104b31c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b328: 0x104b328: j	 0x104b500 sll   zero, zero, 0
-	br L_104b500
+// 0x0104b338: 0x104b338: j	 0x104b510 sll   zero, zero, 0
+	br L_104b510
 // --- basic block ---
-L_104b330:
-// 0x0104b330: 0x104b330: jal   0x100e348 addiu a0, a0, 13692
+L_104b340:
+// 0x0104b340: 0x104b340: jal   0x100e358 addiu a0, a0, 13692
 	ldloc.1
 	ldc.i4 13692
 	add
@@ -5126,15 +5126,15 @@ L_104b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b338: 0x104b338: addu  a0, v0, zero
+// 0x0104b348: 0x104b348: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104b33c: 0x104b33c: jal   0x1001b48 addu  s2, v0, zero
+// 0x0104b34c: 0x104b34c: jal   0x1001b48 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -5143,7 +5143,7 @@ L_104b330:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b344: 0x104b344: jal   0x1000910 addiu a0, v0, 200
+// 0x0104b354: 0x104b354: jal   0x1000910 addiu a0, v0, 200
 	ldloc 5
 	ldc.i4 200
 	add
@@ -5158,21 +5158,21 @@ L_104b330:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b34c: 0x104b34c: lui   a0, 0x10000
+// 0x0104b35c: 0x104b35c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104b350: 0x104b350: addu  a2, v0, zero
+// 0x0104b360: 0x104b360: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0104b354: 0x104b354: addiu a0, a0, 2632
+// 0x0104b364: 0x104b364: addiu a0, a0, 2628
 	ldloc.1
-	ldc.i4 2632
+	ldc.i4 2628
 	add
 	stloc.1
-// 0x0104b358: 0x104b358: addiu a1, zero, 229
+// 0x0104b368: 0x104b368: addiu a1, zero, 229
 	ldc.i4 229
 	stloc.2
-// 0x0104b35c: 0x104b35c: jal   0x1004a38 addu  s0, v0, zero
+// 0x0104b36c: 0x104b36c: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -5180,49 +5180,49 @@ L_104b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b364: 0x104b364: addiu v0, zero, 1
+// 0x0104b374: 0x104b374: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0104b368: 0x104b368: bne   s5, v0, 0x104b37c addiu v0, zero, 2
+// 0x0104b378: 0x104b378: bne   s5, v0, 0x104b38c addiu v0, zero, 2
 	ldloc 12
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	bne.un L_104b37c
+	bne.un L_104b38c
 // --- basic block ---
-// 0x0104b370: 0x104b370: lui   a1, 0x10000
+// 0x0104b380: 0x104b380: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104b374: 0x104b374: j	 0x104b38c addiu a1, a1, 18248
+// 0x0104b384: 0x104b384: j	 0x104b39c addiu a1, a1, 19712
 	ldloc.2
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.2
-	br L_104b38c
+	br L_104b39c
 // --- basic block ---
-L_104b37c:
-// 0x0104b37c: 0x104b37c: bne   s5, v0, 0x104b398 addiu v0, zero, -3
+L_104b38c:
+// 0x0104b38c: 0x104b38c: bne   s5, v0, 0x104b3a8 addiu v0, zero, -3
 	ldloc 12
 	ldloc 5
 	ldc.i4.s -3
 	stloc 5
-	bne.un L_104b398
+	bne.un L_104b3a8
 // --- basic block ---
-// 0x0104b384: 0x104b384: lui   a1, 0x10000
+// 0x0104b394: 0x104b394: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104b388: 0x104b388: addiu a1, a1, 2260
+// 0x0104b398: 0x104b398: addiu a1, a1, 2256
 	ldloc.2
-	ldc.i4 2260
+	ldc.i4 2256
 	add
 	stloc.2
-L_104b38c:
-// 0x0104b38c: 0x104b38c: jal   0x1001b68 addiu a0, sp, 40
+L_104b39c:
+// 0x0104b39c: 0x104b39c: jal   0x1001b68 addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5234,75 +5234,75 @@ L_104b38c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b394: 0x104b394: addiu v0, zero, -3
+// 0x0104b3a4: 0x104b3a4: addiu v0, zero, -3
 	ldc.i4.s -3
 	stloc 5
-L_104b398:
-// 0x0104b398: 0x104b398: beq   s1, v0, 0x104b3f8 lui   a1, 0x0
+L_104b3a8:
+// 0x0104b3a8: 0x104b3a8: beq   s1, v0, 0x104b408 lui   a1, 0x0
 	ldloc 9
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_104b3f8
+	beq  L_104b408
 // --- basic block ---
-// 0x0104b3a0: 0x104b3a0: addiu v0, zero, -2
+// 0x0104b3b0: 0x104b3b0: addiu v0, zero, -2
 	ldc.i4.s -2
 	stloc 5
-// 0x0104b3a4: 0x104b3a4: beq   s1, v0, 0x104b3f0 lui   a1, 0x10000
+// 0x0104b3b4: 0x104b3b4: beq   s1, v0, 0x104b400 lui   a1, 0x10000
 	ldloc 9
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_104b3f0
+	beq  L_104b400
 // --- basic block ---
-// 0x0104b3ac: 0x104b3ac: addiu v0, zero, -1
+// 0x0104b3bc: 0x104b3bc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0104b3b0: 0x104b3b0: bne   s1, v0, 0x104b404 lui   a2, 0x10000
+// 0x0104b3c0: 0x104b3c0: bne   s1, v0, 0x104b414 lui   a2, 0x10000
 	ldloc 9
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	bne.un L_104b404
+	bne.un L_104b414
 // --- basic block ---
-// 0x0104b3b8: 0x104b3b8: jal   0x101fa28 addiu s1, sp, 60
+// 0x0104b3c8: 0x104b3c8: jal   0x101fa38 addiu s1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0104b3c0: 0x104b3c0: beq   v0, zero, 0x104b3d4 lui   a1, 0x10000
+// 0x0104b3d0: 0x104b3d0: beq   v0, zero, 0x104b3e4 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_104b3d4
+	brfalse L_104b3e4
 // --- basic block ---
-// 0x0104b3c8: 0x104b3c8: addu  a0, s1, zero
+// 0x0104b3d8: 0x104b3d8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104b3cc: 0x104b3cc: j	 0x104b3e0 addiu a1, a1, 2692
+// 0x0104b3dc: 0x104b3dc: j	 0x104b3f0 addiu a1, a1, 2688
 	ldloc.2
-	ldc.i4 2692
+	ldc.i4 2688
 	add
 	stloc.2
-	br L_104b3e0
+	br L_104b3f0
 // --- basic block ---
-L_104b3d4:
-// 0x0104b3d4: 0x104b3d4: lui   a1, 0x0
+L_104b3e4:
+// 0x0104b3e4: 0x104b3e4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104b3d8: 0x104b3d8: addu  a0, s1, zero
+// 0x0104b3e8: 0x104b3e8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104b3dc: 0x104b3dc: addiu a1, a1, 30448
+// 0x0104b3ec: 0x104b3ec: addiu a1, a1, 30448
 	ldloc.2
 	ldc.i4 30448
 	add
 	stloc.2
-L_104b3e0:
-// 0x0104b3e0: 0x104b3e0: jal   0x1001b68 sll   zero, zero, 0
+L_104b3f0:
+// 0x0104b3f0: 0x104b3f0: jal   0x1001b68 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcpy_1001b68(int32,int32)
@@ -5310,48 +5310,48 @@ L_104b3e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b3e8: 0x104b3e8: j	 0x104b41c addiu v0, zero, -1
+// 0x0104b3f8: 0x104b3f8: j	 0x104b42c addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_104b41c
+	br L_104b42c
 // --- basic block ---
-L_104b3f0:
-// 0x0104b3f0: 0x104b3f0: j	 0x104b3fc addiu a1, a1, 2704
+L_104b400:
+// 0x0104b400: 0x104b400: j	 0x104b40c addiu a1, a1, 2700
 	ldloc.2
-	ldc.i4 2704
+	ldc.i4 2700
 	add
 	stloc.2
-	br L_104b3fc
+	br L_104b40c
 // --- basic block ---
-L_104b3f8:
-// 0x0104b3f8: 0x104b3f8: addiu a1, a1, 25352
+L_104b408:
+// 0x0104b408: 0x104b408: addiu a1, a1, 25352
 	ldloc.2
 	ldc.i4 25352
 	add
 	stloc.2
-L_104b3fc:
-// 0x0104b3fc: 0x104b3fc: j	 0x104b3e0 addiu a0, sp, 60
+L_104b40c:
+// 0x0104b40c: 0x104b40c: j	 0x104b3f0 addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-	br L_104b3e0
+	br L_104b3f0
 // --- basic block ---
-L_104b404:
-// 0x0104b404: 0x104b404: addiu a2, a2, 2712
+L_104b414:
+// 0x0104b414: 0x104b414: addiu a2, a2, 2708
 	ldloc.3
-	ldc.i4 2712
+	ldc.i4 2708
 	add
 	stloc.3
-// 0x0104b408: 0x104b408: addu  a3, s1, zero
+// 0x0104b418: 0x104b418: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0104b40c: 0x104b40c: addiu a0, sp, 60
+// 0x0104b41c: 0x104b41c: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x0104b410: 0x104b410: jal   0x1000f9c addiu a1, zero, 20
+// 0x0104b420: 0x104b420: jal   0x1000f9c addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -5364,25 +5364,25 @@ L_104b404:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b418: 0x104b418: addiu v0, zero, -1
+// 0x0104b428: 0x104b428: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_104b41c:
-// 0x0104b41c: 0x104b41c: addiu s5, sp, 40
+L_104b42c:
+// 0x0104b42c: 0x104b42c: addiu s5, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 12
-// 0x0104b420: 0x104b420: bne   s3, v0, 0x104b46c addiu s1, sp, 60
+// 0x0104b430: 0x104b430: bne   s3, v0, 0x104b47c addiu s1, sp, 60
 	ldloc 13
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 9
-	bne.un L_104b46c
+	bne.un L_104b47c
 // --- basic block ---
-// 0x0104b428: 0x104b428: jal   0x1001b48 addu  a0, s2, zero
+// 0x0104b438: 0x104b438: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5391,38 +5391,38 @@ L_104b41c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b430: 0x104b430: jal   0x106ab1c addu  s8, v0, zero
+// 0x0104b440: 0x104b440: jal   0x106b140 addu  s8, v0, zero
 	ldloc 5
 	stloc 11
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 5
 // --- basic block ---
-// 0x0104b438: 0x104b438: jal   0x106ab10 addu  s3, v0, zero
+// 0x0104b448: 0x104b448: jal   0x106b134 addu  s3, v0, zero
 	ldloc 5
 	stloc 13
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 5
 // --- basic block ---
-// 0x0104b440: 0x104b440: lui   a2, 0x10000
+// 0x0104b450: 0x104b450: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104b444: 0x104b444: addiu a1, s8, 200
+// 0x0104b454: 0x104b454: addiu a1, s8, 200
 	ldloc 11
 	ldc.i4 200
 	add
 	stloc.2
-// 0x0104b448: 0x104b448: addiu a2, a2, 2724
+// 0x0104b458: 0x104b458: addiu a2, a2, 2720
 	ldloc.3
-	ldc.i4 2724
+	ldc.i4 2720
 	add
 	stloc.3
-// 0x0104b44c: 0x104b44c: addu  a3, s2, zero
+// 0x0104b45c: 0x104b45c: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x0104b450: 0x104b450: addu  a0, s0, zero
+// 0x0104b460: 0x104b460: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104b454: 0x104b454: sw    s5, 16(sp)
+// 0x0104b464: 0x104b464: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5431,7 +5431,7 @@ L_104b41c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104b458: 0x104b458: sw    s4, 20(sp)
+// 0x0104b468: 0x104b468: sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5440,7 +5440,7 @@ L_104b41c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104b45c: 0x104b45c: sw    s1, 24(sp)
+// 0x0104b46c: 0x104b46c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5449,7 +5449,7 @@ L_104b41c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b460: 0x104b460: sw    s3, 28(sp)
+// 0x0104b470: 0x104b470: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5458,7 +5458,7 @@ L_104b41c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104b464: 0x104b464: j	 0x104b4b4 sw    v0, 32(sp)
+// 0x0104b474: 0x104b474: j	 0x104b4c4 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5467,10 +5467,10 @@ L_104b41c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_104b4b4
+	br L_104b4c4
 // --- basic block ---
-L_104b46c:
-// 0x0104b46c: 0x104b46c: jal   0x1001b48 addu  a0, s2, zero
+L_104b47c:
+// 0x0104b47c: 0x104b47c: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5479,7 +5479,7 @@ L_104b46c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b474: 0x104b474: jal   0x106ab1c sw    v0, 136(sp)
+// 0x0104b484: 0x104b484: jal   0x106b140 sw    v0, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5488,16 +5488,16 @@ L_104b46c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 5
 // --- basic block ---
-// 0x0104b47c: 0x104b47c: jal   0x106ab10 addu  s8, v0, zero
+// 0x0104b48c: 0x104b48c: jal   0x106b134 addu  s8, v0, zero
 	ldloc 5
 	stloc 11
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 5
 // --- basic block ---
-// 0x0104b484: 0x104b484: lw    a1, 136(sp)
+// 0x0104b494: 0x104b494: lw    a1, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5506,26 +5506,26 @@ L_104b46c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104b488: 0x104b488: lui   a2, 0x10000
+// 0x0104b498: 0x104b498: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104b48c: 0x104b48c: addiu a1, a1, 200
+// 0x0104b49c: 0x104b49c: addiu a1, a1, 200
 	ldloc.2
 	ldc.i4 200
 	add
 	stloc.2
-// 0x0104b490: 0x104b490: addiu a2, a2, 2772
+// 0x0104b4a0: 0x104b4a0: addiu a2, a2, 2768
 	ldloc.3
-	ldc.i4 2772
+	ldc.i4 2768
 	add
 	stloc.3
-// 0x0104b494: 0x104b494: addu  a3, s2, zero
+// 0x0104b4a4: 0x104b4a4: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x0104b498: 0x104b498: addu  a0, s0, zero
+// 0x0104b4a8: 0x104b4a8: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104b49c: 0x104b49c: sw    s5, 16(sp)
+// 0x0104b4ac: 0x104b4ac: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5534,7 +5534,7 @@ L_104b46c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104b4a0: 0x104b4a0: sw    s4, 20(sp)
+// 0x0104b4b0: 0x104b4b0: sw    s4, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5543,7 +5543,7 @@ L_104b46c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104b4a4: 0x104b4a4: sw    s3, 24(sp)
+// 0x0104b4b4: 0x104b4b4: sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5552,7 +5552,7 @@ L_104b46c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104b4a8: 0x104b4a8: sw    s1, 28(sp)
+// 0x0104b4b8: 0x104b4b8: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5561,7 +5561,7 @@ L_104b46c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b4ac: 0x104b4ac: sw    s8, 32(sp)
+// 0x0104b4bc: 0x104b4bc: sw    s8, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5570,7 +5570,7 @@ L_104b46c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104b4b0: 0x104b4b0: sw    v0, 36(sp)
+// 0x0104b4c0: 0x104b4c0: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5579,8 +5579,8 @@ L_104b46c:
 	add
 	ldloc 5
 	stelem.i4
-L_104b4b4:
-// 0x0104b4b4: 0x104b4b4: jal   0x1000f9c sll   zero, zero, 0
+L_104b4c4:
+// 0x0104b4c4: 0x104b4c4: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5591,7 +5591,7 @@ L_104b4b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b4bc: 0x104b4bc: jal   0x1000910 addiu a0, zero, 20
+// 0x0104b4cc: 0x104b4cc: jal   0x1000910 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -5604,7 +5604,7 @@ L_104b4b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b4c4: 0x104b4c4: sw    s7, 16(v0)
+// 0x0104b4d4: 0x104b4d4: sw    s7, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5613,12 +5613,12 @@ L_104b4b4:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104b4c8: 0x104b4c8: addiu a0, sp, 80
+// 0x0104b4d8: 0x104b4d8: addiu a0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x0104b4cc: 0x104b4cc: sw    s6, 12(v0)
+// 0x0104b4dc: 0x104b4dc: sw    s6, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5627,7 +5627,7 @@ L_104b4b4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0104b4d0: 0x104b4d0: sw    zero, 4(v0)
+// 0x0104b4e0: 0x104b4e0: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5636,7 +5636,7 @@ L_104b4b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104b4d4: 0x104b4d4: jal   0x1001ba8 addu  s1, v0, zero
+// 0x0104b4e4: 0x104b4e4: jal   0x1001ba8 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -5649,24 +5649,24 @@ L_104b4b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b4dc: 0x104b4dc: lui   a0, 0x0
+// 0x0104b4ec: 0x104b4ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104b4e0: 0x104b4e0: addiu a0, a0, 13676
+// 0x0104b4f0: 0x104b4f0: addiu a0, a0, 13676
 	ldloc.1
 	ldc.i4 13676
 	add
 	stloc.1
-// 0x0104b4e4: 0x104b4e4: addu  a1, s1, zero
+// 0x0104b4f4: 0x104b4f4: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0104b4e8: 0x104b4e8: addu  a2, s0, zero
+// 0x0104b4f8: 0x104b4f8: addu  a2, s0, zero
 	ldloc 10
 	stloc.3
-// 0x0104b4ec: 0x104b4ec: addu  a3, zero, zero
+// 0x0104b4fc: 0x104b4fc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104b4f0: 0x104b4f0: jal   0x1045dd0 sw    v0, 0(s1)
+// 0x0104b500: 0x104b500: jal   0x1045de0 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5678,12 +5678,12 @@ L_104b4b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_http_async_copy_1045dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_http_async_copy_1045de0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104b4f8: 0x104b4f8: jal   0x1000930 addu  a0, s0, zero
+// 0x0104b508: 0x104b508: jal   0x1000930 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5696,12 +5696,12 @@ L_104b4b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104b500:
-// 0x0104b500: 0x104b500: lw    ra, 180(sp)
-// 0x0104b504: 0x104b504: addiu v0, zero, 1
+L_104b510:
+// 0x0104b510: 0x104b510: lw    ra, 180(sp)
+// 0x0104b514: 0x104b514: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0104b508: 0x104b508: lw    s8, 176(sp)
+// 0x0104b518: 0x104b518: lw    s8, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5710,7 +5710,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104b50c: 0x104b50c: lw    s7, 172(sp)
+// 0x0104b51c: 0x104b51c: lw    s7, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5719,7 +5719,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104b510: 0x104b510: lw    s6, 168(sp)
+// 0x0104b520: 0x104b520: lw    s6, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5728,7 +5728,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104b514: 0x104b514: lw    s5, 164(sp)
+// 0x0104b524: 0x104b524: lw    s5, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5737,7 +5737,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104b518: 0x104b518: lw    s4, 160(sp)
+// 0x0104b528: 0x104b528: lw    s4, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5746,7 +5746,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104b51c: 0x104b51c: lw    s3, 156(sp)
+// 0x0104b52c: 0x104b52c: lw    s3, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5755,7 +5755,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104b520: 0x104b520: lw    s2, 152(sp)
+// 0x0104b530: 0x104b530: lw    s2, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5764,7 +5764,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104b524: 0x104b524: lw    s1, 148(sp)
+// 0x0104b534: 0x104b534: lw    s1, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5773,7 +5773,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104b528: 0x104b528: lw    s0, 144(sp)
+// 0x0104b538: 0x104b538: lw    s0, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5782,7 +5782,7 @@ L_104b500:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104b52c: 0x104b52c: jr    ra addiu sp, sp, 184
+// 0x0104b53c: 0x104b53c: jr    ra addiu sp, sp, 184
 	ldloc.0
 	ldc.i4 184
 	add
@@ -5794,7 +5794,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_social_image_download_update_bitmap_104b534(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_image_download_update_bitmap_104b544(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -5829,12 +5829,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b534: 0x104b534: addiu sp, sp, -40
+// 0x0104b544: 0x104b544: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104b538: 0x104b538: lw    v0, 56(sp)
+// 0x0104b548: 0x104b548: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5843,8 +5843,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104b53c: 0x104b53c: sw    ra, 36(sp)
-// 0x0104b540: 0x104b540: sw    v0, 16(sp)
+// 0x0104b54c: 0x104b54c: sw    ra, 36(sp)
+// 0x0104b550: 0x104b550: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5853,7 +5853,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104b544: 0x104b544: lw    v0, 60(sp)
+// 0x0104b554: 0x104b554: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5862,8 +5862,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104b548: 0x104b548: sll   zero, zero, 0
-// 0x0104b54c: 0x104b54c: sw    v0, 20(sp)
+// 0x0104b558: 0x104b558: sll   zero, zero, 0
+// 0x0104b55c: 0x104b55c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5872,15 +5872,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104b550: 0x104b550: lui   v0, 0x1050000
+// 0x0104b560: 0x104b560: lui   v0, 0x1050000
 	ldc.i4 17104896
 	stloc 5
-// 0x0104b554: 0x104b554: addiu v0, v0, -20608
+// 0x0104b564: 0x104b564: addiu v0, v0, -20592
 	ldloc 5
-	ldc.i4 -20608
+	ldc.i4 -20592
 	add
 	stloc 5
-// 0x0104b558: 0x104b558: jal   0x104b234 sw    v0, 24(sp)
+// 0x0104b568: 0x104b568: jal   0x104b244 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5894,14 +5894,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_download_104b234(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_social_image_download_104b244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104b560: 0x104b560: lw    ra, 36(sp)
-// 0x0104b564: 0x104b564: sll   zero, zero, 0
-// 0x0104b568: 0x104b568: jr    ra addiu sp, sp, 40
+// 0x0104b570: 0x104b570: lw    ra, 36(sp)
+// 0x0104b574: 0x104b574: sll   zero, zero, 0
+// 0x0104b578: 0x104b578: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5913,7 +5913,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_social_image_initialize_104b570(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_social_image_initialize_104b580(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5948,37 +5948,37 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b570: 0x104b570: lui   a0, 0x10000
+// 0x0104b580: 0x104b580: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104b574: 0x104b574: lui   a1, 0x0
+// 0x0104b584: 0x104b584: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104b578: 0x104b578: lui   a2, 0x10000
+// 0x0104b588: 0x104b588: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104b57c: 0x104b57c: addiu sp, sp, -24
+// 0x0104b58c: 0x104b58c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b580: 0x104b580: addiu a0, a0, 12560
+// 0x0104b590: 0x104b590: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0104b584: 0x104b584: addiu a1, a1, 13692
+// 0x0104b594: 0x104b594: addiu a1, a1, 13692
 	ldloc.2
 	ldc.i4 13692
 	add
 	stloc.2
-// 0x0104b588: 0x104b588: addiu a2, a2, 18500
+// 0x0104b598: 0x104b598: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0104b58c: 0x104b58c: sw    ra, 20(sp)
-// 0x0104b590: 0x104b590: jal   0x100edb0 addu  a3, zero, zero
+// 0x0104b59c: 0x104b59c: sw    ra, 20(sp)
+// 0x0104b5a0: 0x104b5a0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5986,14 +5986,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b598: 0x104b598: lw    ra, 20(sp)
-// 0x0104b59c: 0x104b59c: sll   zero, zero, 0
-// 0x0104b5a0: 0x104b5a0: jr    ra addiu sp, sp, 24
+// 0x0104b5a8: 0x104b5a8: lw    ra, 20(sp)
+// 0x0104b5ac: 0x104b5ac: sll   zero, zero, 0
+// 0x0104b5b0: 0x104b5b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6005,7 +6005,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+.method public static int32 exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 v0,int32 s2,int32 ra,int32 lo,int32 v1)
@@ -6052,12 +6052,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b5a8: 0x104b5a8: addiu sp, sp, -40
+// 0x0104b5b8: 0x104b5b8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104b5ac: 0x104b5ac: sw    s0, 24(sp)
+// 0x0104b5bc: 0x104b5bc: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6066,23 +6066,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104b5b0: 0x104b5b0: addiu s0, zero, 80
+// 0x0104b5c0: 0x104b5c0: addiu s0, zero, 80
 	ldc.i4.s 80
 	stloc 5
-// 0x0104b5b4: 0x104b5b4: mult  a0, s0
+// 0x0104b5c4: 0x104b5c4: mult  a0, s0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 11
-// 0x0104b5b8: 0x104b5b8: lui   s0, 0x70000
+// 0x0104b5c8: 0x104b5c8: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104b5bc: 0x104b5bc: addiu s0, s0, -5228
+// 0x0104b5cc: 0x104b5cc: addiu s0, s0, -4764
 	ldloc 5
-	ldc.i4 -5228
+	ldc.i4 -4764
 	add
 	stloc 5
-// 0x0104b5c0: 0x104b5c0: sw    s2, 32(sp)
+// 0x0104b5d0: 0x104b5d0: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6091,7 +6091,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b5c4: 0x104b5c4: sw    s1, 28(sp)
+// 0x0104b5d4: 0x104b5d4: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6100,25 +6100,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104b5c8: 0x104b5c8: sw    ra, 36(sp)
-// 0x0104b5cc: 0x104b5cc: addu  s1, zero, zero
+// 0x0104b5d8: 0x104b5d8: sw    ra, 36(sp)
+// 0x0104b5dc: 0x104b5dc: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0104b5d0: 0x104b5d0: addiu s2, zero, 10
+// 0x0104b5e0: 0x104b5e0: addiu s2, zero, 10
 	ldc.i4.s 10
 	stloc 9
-// 0x0104b5d4: 0x104b5d4: mflo  lo
+// 0x0104b5e4: 0x104b5e4: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x0104b5d8: 0x104b5d8: j	 0x104b5fc addu  s0, s0, a0
+// 0x0104b5e8: 0x104b5e8: j	 0x104b60c addu  s0, s0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-	br L_104b5fc
+	br L_104b60c
 // --- basic block ---
-L_104b5e0:
-// 0x0104b5e0: 0x104b5e0: jalr  v0 sw    a1, 16(sp)
+L_104b5f0:
+// 0x0104b5f0: 0x104b5f0: jalr  v0 sw    a1, 16(sp)
 	ldloc 8
 	ldloc 6
 	ldloc.0
@@ -6138,7 +6138,7 @@ L_104b5e0:
 	stloc 12
 	stloc 8
 // --- basic block ---
-// 0x0104b5e8: 0x104b5e8: lw    a1, 16(sp)
+// 0x0104b5f8: 0x104b5f8: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6147,41 +6147,41 @@ L_104b5e0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104b5ec: 0x104b5ec: bne   v0, zero, 0x104b60c sll   zero, zero, 0
+// 0x0104b5fc: 0x104b5fc: bne   v0, zero, 0x104b61c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_104b60c
+	brtrue L_104b61c
 // --- basic block ---
-// 0x0104b5f4: 0x104b5f4: beq   s1, s2, 0x104b60c addiu s0, s0, 8
+// 0x0104b604: 0x104b604: beq   s1, s2, 0x104b61c addiu s0, s0, 8
 	ldloc 7
 	ldloc 9
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-	beq  L_104b60c
+	beq  L_104b61c
 // --- basic block ---
-L_104b5fc:
-// 0x0104b5fc: 0x104b5fc: lw    v0, 0(s0)
+L_104b60c:
+// 0x0104b60c: 0x104b60c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0104b600: 0x104b600: addu  a0, a1, zero
+// 0x0104b610: 0x104b610: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104b604: 0x104b604: bne   v0, zero, 0x104b5e0 addiu s1, s1, 1
+// 0x0104b614: 0x104b614: bne   v0, zero, 0x104b5f0 addiu s1, s1, 1
 	ldloc 8
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_104b5e0
+	brtrue L_104b5f0
 // --- basic block ---
-L_104b60c:
-// 0x0104b60c: 0x104b60c: lw    ra, 36(sp)
-// 0x0104b610: 0x104b610: lw    s2, 32(sp)
+L_104b61c:
+// 0x0104b61c: 0x104b61c: lw    ra, 36(sp)
+// 0x0104b620: 0x104b620: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6190,7 +6190,7 @@ L_104b60c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104b614: 0x104b614: lw    s1, 28(sp)
+// 0x0104b624: 0x104b624: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6199,7 +6199,7 @@ L_104b60c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104b618: 0x104b618: lw    s0, 24(sp)
+// 0x0104b628: 0x104b628: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6208,7 +6208,7 @@ L_104b60c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104b61c: 0x104b61c: jr    ra addiu sp, sp, 40
+// 0x0104b62c: 0x104b62c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6220,7 +6220,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_pointer_force_click_104b624(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_force_click_104b634(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6255,26 +6255,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b624: 0x104b624: addiu sp, sp, -24
+// 0x0104b634: 0x104b634: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b628: 0x104b628: sw    ra, 20(sp)
-// 0x0104b62c: 0x104b62c: jal   0x104b5a8 sll   zero, zero, 0
+// 0x0104b638: 0x104b638: sw    ra, 20(sp)
+// 0x0104b63c: 0x104b63c: jal   0x104b5b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b634: 0x104b634: lw    ra, 20(sp)
-// 0x0104b638: 0x104b638: sll   zero, zero, 0
-// 0x0104b63c: 0x104b63c: jr    ra addiu sp, sp, 24
+// 0x0104b644: 0x104b644: lw    ra, 20(sp)
+// 0x0104b648: 0x104b648: sll   zero, zero, 0
+// 0x0104b64c: 0x104b64c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6286,7 +6286,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_enable_double_click_104b650()
+.method public static int32 roadmap_pointer_enable_double_click_104b660()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6306,18 +6306,18 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b650: 0x104b650: addiu v1, zero, 1
+// 0x0104b660: 0x104b660: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0104b654: 0x104b654: lui   v0, 0x70000
+// 0x0104b664: 0x104b664: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0104b658: 0x104b658: jr    ra sw    v1, -5260(v0)
+// 0x0104b668: 0x104b668: jr    ra sw    v1, -4796(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1315
+	ldc.i4 -1199
 	add
 	ldloc.1
 	stelem.i4
@@ -6328,7 +6328,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_pointer_long_click_expired_104b670()
+.method public static int32 roadmap_pointer_long_click_expired_104b680()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6345,25 +6345,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b670: 0x104b670: lui   v0, 0x70000
+// 0x0104b680: 0x104b680: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0104b674: 0x104b674: lw    v0, -5268(v0)
+// 0x0104b684: 0x104b684: lw    v0, -4804(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1317
+	ldc.i4 -1201
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104b678: 0x104b678: jr    ra sll   zero, zero, 0
+// 0x0104b688: 0x104b688: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 remove_callback_104b690(int32,int32,int32,int32,int32)
+.method public static int32 remove_callback_104b6a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s1,int32[] mem,int32 s0,int32 lo,int32 ra)
@@ -6407,28 +6407,28 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b690: 0x104b690: addiu v0, zero, 80
+// 0x0104b6a0: 0x104b6a0: addiu v0, zero, 80
 	ldc.i4.s 80
 	stloc 5
-// 0x0104b694: 0x104b694: mult  a0, v0
+// 0x0104b6a4: 0x104b6a4: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 10
-// 0x0104b698: 0x104b698: lui   v1, 0x70000
+// 0x0104b6a8: 0x104b6a8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104b69c: 0x104b69c: addiu sp, sp, -40
+// 0x0104b6ac: 0x104b6ac: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104b6a0: 0x104b6a0: addiu v1, v1, -5228
+// 0x0104b6b0: 0x104b6b0: addiu v1, v1, -4764
 	ldloc 6
-	ldc.i4 -5228
+	ldc.i4 -4764
 	add
 	stloc 6
-// 0x0104b6a4: 0x104b6a4: sw    s0, 28(sp)
+// 0x0104b6b4: 0x104b6b4: sw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6437,11 +6437,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b6a8: 0x104b6a8: sw    ra, 36(sp)
-// 0x0104b6ac: 0x104b6ac: addu  s0, a0, zero
+// 0x0104b6b8: 0x104b6b8: sw    ra, 36(sp)
+// 0x0104b6bc: 0x104b6bc: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0104b6b0: 0x104b6b0: sw    s1, 32(sp)
+// 0x0104b6c0: 0x104b6c0: sw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6450,70 +6450,70 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104b6b4: 0x104b6b4: addu  v0, zero, zero
+// 0x0104b6c4: 0x104b6c4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0104b6b8: 0x104b6b8: addiu a0, zero, 10
+// 0x0104b6c8: 0x104b6c8: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x0104b6bc: 0x104b6bc: mflo  lo
+// 0x0104b6cc: 0x104b6cc: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x0104b6c0: 0x104b6c0: addu  v1, v1, a2
+// 0x0104b6d0: 0x104b6d0: addu  v1, v1, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc 6
-L_104b6c4:
-// 0x0104b6c4: 0x104b6c4: lw    a2, 0(v1)
+L_104b6d4:
+// 0x0104b6d4: 0x104b6d4: lw    a2, 0(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0104b6c8: 0x104b6c8: sll   zero, zero, 0
-// 0x0104b6cc: 0x104b6cc: beq   a2, a1, 0x104b704 addiu v1, v1, 8
+// 0x0104b6d8: 0x104b6d8: sll   zero, zero, 0
+// 0x0104b6dc: 0x104b6dc: beq   a2, a1, 0x104b714 addiu v1, v1, 8
 	ldloc.3
 	ldloc.2
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-	beq  L_104b704
+	beq  L_104b714
 // --- basic block ---
-// 0x0104b6d4: 0x104b6d4: addiu v0, v0, 1
+// 0x0104b6e4: 0x104b6e4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0104b6d8: 0x104b6d8: bne   v0, a0, 0x104b6c4 lui   a3, 0x10000
+// 0x0104b6e8: 0x104b6e8: bne   v0, a0, 0x104b6d4 lui   a3, 0x10000
 	ldloc 5
 	ldloc.1
 	ldc.i4 65536
 	stloc 4
-	bne.un L_104b6c4
+	bne.un L_104b6d4
 // --- basic block ---
-// 0x0104b6e0: 0x104b6e0: lui   a1, 0x10000
+// 0x0104b6f0: 0x104b6f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104b6e4: 0x104b6e4: addiu a1, a1, 2852
+// 0x0104b6f4: 0x104b6f4: addiu a1, a1, 2848
 	ldloc.2
-	ldc.i4 2852
+	ldc.i4 2848
 	add
 	stloc.2
-// 0x0104b6e8: 0x104b6e8: addiu a3, a3, 2880
+// 0x0104b6f8: 0x104b6f8: addiu a3, a3, 2876
 	ldloc 4
-	ldc.i4 2880
+	ldc.i4 2876
 	add
 	stloc 4
-// 0x0104b6ec: 0x104b6ec: addiu a0, zero, 4
+// 0x0104b6fc: 0x104b6fc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104b6f0: 0x104b6f0: addiu a2, zero, 278
+// 0x0104b700: 0x104b700: addiu a2, zero, 278
 	ldc.i4 278
 	stloc.3
-// 0x0104b6f4: 0x104b6f4: jal   0x100449c sw    s0, 16(sp)
+// 0x0104b704: 0x104b704: jal   0x100449c sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6532,68 +6532,68 @@ L_104b6c4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104b6fc: 0x104b6fc: j	 0x104b754 sll   zero, zero, 0
-	br L_104b754
+// 0x0104b70c: 0x104b70c: j	 0x104b764 sll   zero, zero, 0
+	br L_104b764
 // --- basic block ---
-L_104b704:
-// 0x0104b704: 0x104b704: addiu v1, zero, 10
+L_104b714:
+// 0x0104b714: 0x104b714: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x0104b708: 0x104b708: mult  s0, v1
+// 0x0104b718: 0x104b718: mult  s0, v1
 	ldloc 9
 	ldloc 6
 	mul
 	stloc 10
-// 0x0104b70c: 0x104b70c: addiu a2, zero, 9
+// 0x0104b71c: 0x104b71c: addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
-// 0x0104b710: 0x104b710: subu  a2, a2, v0
+// 0x0104b720: 0x104b720: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x0104b714: 0x104b714: lui   s1, 0x70000
+// 0x0104b724: 0x104b724: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104b718: 0x104b718: addiu s1, s1, -5228
+// 0x0104b728: 0x104b728: addiu s1, s1, -4764
 	ldloc 7
-	ldc.i4 -5228
+	ldc.i4 -4764
 	add
 	stloc 7
-// 0x0104b71c: 0x104b71c: sll   a2, a2, 3
+// 0x0104b72c: 0x104b72c: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x0104b720: 0x104b720: mflo  lo
+// 0x0104b730: 0x104b730: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x0104b724: 0x104b724: addu  v0, v0, v1
+// 0x0104b734: 0x104b734: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0104b728: 0x104b728: addiu a1, v0, 1
+// 0x0104b738: 0x104b738: addiu a1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0104b72c: 0x104b72c: sll   a1, a1, 3
+// 0x0104b73c: 0x104b73c: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x0104b730: 0x104b730: sll   v0, v0, 3
+// 0x0104b740: 0x104b740: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0104b734: 0x104b734: addu  a0, s1, v0
+// 0x0104b744: 0x104b744: addu  a0, s1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc.1
-// 0x0104b738: 0x104b738: jal   0x100186c addu  a1, s1, a1
+// 0x0104b748: 0x104b748: jal   0x100186c addu  a1, s1, a1
 	ldloc 7
 	ldloc.2
 	add
@@ -6607,23 +6607,23 @@ L_104b704:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104b740: 0x104b740: addiu v0, zero, 80
+// 0x0104b750: 0x104b750: addiu v0, zero, 80
 	ldc.i4.s 80
 	stloc 5
-// 0x0104b744: 0x104b744: mult  s0, v0
+// 0x0104b754: 0x104b754: mult  s0, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 10
-// 0x0104b748: 0x104b748: mflo  lo
+// 0x0104b758: 0x104b758: mflo  lo
 	ldloc 10
 	stloc 9
-// 0x0104b74c: 0x104b74c: addu  s1, s0, s1
+// 0x0104b75c: 0x104b75c: addu  s1, s0, s1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 7
-// 0x0104b750: 0x104b750: sw    zero, 72(s1)
+// 0x0104b760: 0x104b760: sw    zero, 72(s1)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
@@ -6632,9 +6632,9 @@ L_104b704:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_104b754:
-// 0x0104b754: 0x104b754: lw    ra, 36(sp)
-// 0x0104b758: 0x104b758: lw    s1, 32(sp)
+L_104b764:
+// 0x0104b764: 0x104b764: lw    ra, 36(sp)
+// 0x0104b768: 0x104b768: lw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6643,7 +6643,7 @@ L_104b754:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104b75c: 0x104b75c: lw    s0, 28(sp)
+// 0x0104b76c: 0x104b76c: lw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6652,7 +6652,7 @@ L_104b754:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104b760: 0x104b760: jr    ra addiu sp, sp, 40
+// 0x0104b770: 0x104b770: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6664,7 +6664,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_pointer_unregister_drag_end_104b768(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_unregister_drag_end_104b778(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6699,16 +6699,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b768: 0x104b768: addiu sp, sp, -24
+// 0x0104b778: 0x104b778: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b76c: 0x104b76c: addu  a1, a0, zero
+// 0x0104b77c: 0x104b77c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b770: 0x104b770: sw    ra, 20(sp)
-// 0x0104b774: 0x104b774: jal   0x104b690 addiu a0, zero, 7
+// 0x0104b780: 0x104b780: sw    ra, 20(sp)
+// 0x0104b784: 0x104b784: jal   0x104b6a0 addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
 	ldloc.0
@@ -6716,14 +6716,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::remove_callback_104b690(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::remove_callback_104b6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b77c: 0x104b77c: lw    ra, 20(sp)
-// 0x0104b780: 0x104b780: sll   zero, zero, 0
-// 0x0104b784: 0x104b784: jr    ra addiu sp, sp, 24
+// 0x0104b78c: 0x104b78c: lw    ra, 20(sp)
+// 0x0104b790: 0x104b790: sll   zero, zero, 0
+// 0x0104b794: 0x104b794: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6735,7 +6735,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_unregister_drag_motion_104b78c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_unregister_drag_motion_104b79c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6770,16 +6770,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b78c: 0x104b78c: addiu sp, sp, -24
+// 0x0104b79c: 0x104b79c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b790: 0x104b790: addu  a1, a0, zero
+// 0x0104b7a0: 0x104b7a0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b794: 0x104b794: sw    ra, 20(sp)
-// 0x0104b798: 0x104b798: jal   0x104b690 addiu a0, zero, 6
+// 0x0104b7a4: 0x104b7a4: sw    ra, 20(sp)
+// 0x0104b7a8: 0x104b7a8: jal   0x104b6a0 addiu a0, zero, 6
 	ldc.i4.6
 	stloc.1
 	ldloc.0
@@ -6787,14 +6787,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::remove_callback_104b690(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::remove_callback_104b6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b7a0: 0x104b7a0: lw    ra, 20(sp)
-// 0x0104b7a4: 0x104b7a4: sll   zero, zero, 0
-// 0x0104b7a8: 0x104b7a8: jr    ra addiu sp, sp, 24
+// 0x0104b7b0: 0x104b7b0: lw    ra, 20(sp)
+// 0x0104b7b4: 0x104b7b4: sll   zero, zero, 0
+// 0x0104b7b8: 0x104b7b8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6806,7 +6806,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_unregister_drag_start_104b7b0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_unregister_drag_start_104b7c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6841,16 +6841,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b7b0: 0x104b7b0: addiu sp, sp, -24
+// 0x0104b7c0: 0x104b7c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b7b4: 0x104b7b4: addu  a1, a0, zero
+// 0x0104b7c4: 0x104b7c4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b7b8: 0x104b7b8: sw    ra, 20(sp)
-// 0x0104b7bc: 0x104b7bc: jal   0x104b690 addiu a0, zero, 5
+// 0x0104b7c8: 0x104b7c8: sw    ra, 20(sp)
+// 0x0104b7cc: 0x104b7cc: jal   0x104b6a0 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -6858,14 +6858,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::remove_callback_104b690(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::remove_callback_104b6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b7c4: 0x104b7c4: lw    ra, 20(sp)
-// 0x0104b7c8: 0x104b7c8: sll   zero, zero, 0
-// 0x0104b7cc: 0x104b7cc: jr    ra addiu sp, sp, 24
+// 0x0104b7d4: 0x104b7d4: lw    ra, 20(sp)
+// 0x0104b7d8: 0x104b7d8: sll   zero, zero, 0
+// 0x0104b7dc: 0x104b7dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6877,7 +6877,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_unregister_released_104b7d4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_unregister_released_104b7e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6912,16 +6912,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b7d4: 0x104b7d4: addiu sp, sp, -24
+// 0x0104b7e4: 0x104b7e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b7d8: 0x104b7d8: addu  a1, a0, zero
+// 0x0104b7e8: 0x104b7e8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b7dc: 0x104b7dc: sw    ra, 20(sp)
-// 0x0104b7e0: 0x104b7e0: jal   0x104b690 addiu a0, zero, 4
+// 0x0104b7ec: 0x104b7ec: sw    ra, 20(sp)
+// 0x0104b7f0: 0x104b7f0: jal   0x104b6a0 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -6929,14 +6929,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::remove_callback_104b690(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::remove_callback_104b6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b7e8: 0x104b7e8: lw    ra, 20(sp)
-// 0x0104b7ec: 0x104b7ec: sll   zero, zero, 0
-// 0x0104b7f0: 0x104b7f0: jr    ra addiu sp, sp, 24
+// 0x0104b7f8: 0x104b7f8: lw    ra, 20(sp)
+// 0x0104b7fc: 0x104b7fc: sll   zero, zero, 0
+// 0x0104b800: 0x104b800: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6948,7 +6948,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_unregister_pressed_104b7f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_unregister_pressed_104b808(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6983,16 +6983,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b7f8: 0x104b7f8: addiu sp, sp, -24
+// 0x0104b808: 0x104b808: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b7fc: 0x104b7fc: addu  a1, a0, zero
+// 0x0104b80c: 0x104b80c: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b800: 0x104b800: sw    ra, 20(sp)
-// 0x0104b804: 0x104b804: jal   0x104b690 addiu a0, zero, 3
+// 0x0104b810: 0x104b810: sw    ra, 20(sp)
+// 0x0104b814: 0x104b814: jal   0x104b6a0 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.0
@@ -7000,14 +7000,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::remove_callback_104b690(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::remove_callback_104b6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b80c: 0x104b80c: lw    ra, 20(sp)
-// 0x0104b810: 0x104b810: sll   zero, zero, 0
-// 0x0104b814: 0x104b814: jr    ra addiu sp, sp, 24
+// 0x0104b81c: 0x104b81c: lw    ra, 20(sp)
+// 0x0104b820: 0x104b820: sll   zero, zero, 0
+// 0x0104b824: 0x104b824: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7019,7 +7019,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_unregister_long_click_104b840(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_unregister_long_click_104b850(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -7054,16 +7054,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b840: 0x104b840: addiu sp, sp, -24
+// 0x0104b850: 0x104b850: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b844: 0x104b844: addu  a1, a0, zero
+// 0x0104b854: 0x104b854: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b848: 0x104b848: sw    ra, 20(sp)
-// 0x0104b84c: 0x104b84c: jal   0x104b690 addiu a0, zero, 1
+// 0x0104b858: 0x104b858: sw    ra, 20(sp)
+// 0x0104b85c: 0x104b85c: jal   0x104b6a0 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -7071,14 +7071,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::remove_callback_104b690(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::remove_callback_104b6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b854: 0x104b854: lw    ra, 20(sp)
-// 0x0104b858: 0x104b858: sll   zero, zero, 0
-// 0x0104b85c: 0x104b85c: jr    ra addiu sp, sp, 24
+// 0x0104b864: 0x104b864: lw    ra, 20(sp)
+// 0x0104b868: 0x104b868: sll   zero, zero, 0
+// 0x0104b86c: 0x104b86c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7090,7 +7090,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_unregister_short_click_104b864(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_unregister_short_click_104b874(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -7125,16 +7125,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b864: 0x104b864: addiu sp, sp, -24
+// 0x0104b874: 0x104b874: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b868: 0x104b868: addu  a1, a0, zero
+// 0x0104b878: 0x104b878: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b86c: 0x104b86c: sw    ra, 20(sp)
-// 0x0104b870: 0x104b870: jal   0x104b690 addu  a0, zero, zero
+// 0x0104b87c: 0x104b87c: sw    ra, 20(sp)
+// 0x0104b880: 0x104b880: jal   0x104b6a0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -7142,14 +7142,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::remove_callback_104b690(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::remove_callback_104b6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b878: 0x104b878: lw    ra, 20(sp)
-// 0x0104b87c: 0x104b87c: sll   zero, zero, 0
-// 0x0104b880: 0x104b880: jr    ra addiu sp, sp, 24
+// 0x0104b888: 0x104b888: lw    ra, 20(sp)
+// 0x0104b88c: 0x104b88c: sll   zero, zero, 0
+// 0x0104b890: 0x104b890: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7161,7 +7161,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 queue_callback_104b888(int32,int32,int32,int32,int32)
+.method public static int32 queue_callback_104b898(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s3,int32 lo,int32 s0,int32 s1,int32 ra)
@@ -7211,28 +7211,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b888: 0x104b888: addiu v0, zero, 80
+// 0x0104b898: 0x104b898: addiu v0, zero, 80
 	ldc.i4.s 80
 	stloc 5
-// 0x0104b88c: 0x104b88c: mult  a0, v0
+// 0x0104b89c: 0x104b89c: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 10
-// 0x0104b890: 0x104b890: lui   v0, 0x70000
+// 0x0104b8a0: 0x104b8a0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104b894: 0x104b894: addiu v0, v0, -5228
+// 0x0104b8a4: 0x104b8a4: addiu v0, v0, -4764
 	ldloc 5
-	ldc.i4 -5228
+	ldc.i4 -4764
 	add
 	stloc 5
-// 0x0104b898: 0x104b898: addiu sp, sp, -48
+// 0x0104b8a8: 0x104b8a8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104b89c: 0x104b89c: sw    s2, 36(sp)
+// 0x0104b8ac: 0x104b8ac: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7241,7 +7241,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104b8a0: 0x104b8a0: sw    s1, 32(sp)
+// 0x0104b8b0: 0x104b8b0: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7250,7 +7250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104b8a4: 0x104b8a4: sw    s0, 28(sp)
+// 0x0104b8b4: 0x104b8b4: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7259,8 +7259,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104b8a8: 0x104b8a8: sw    ra, 44(sp)
-// 0x0104b8ac: 0x104b8ac: sw    s3, 40(sp)
+// 0x0104b8b8: 0x104b8b8: sw    ra, 44(sp)
+// 0x0104b8bc: 0x104b8bc: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7269,21 +7269,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104b8b0: 0x104b8b0: addu  s2, a0, zero
+// 0x0104b8c0: 0x104b8c0: addu  s2, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104b8b4: 0x104b8b4: addu  s1, a1, zero
+// 0x0104b8c4: 0x104b8c4: addu  s1, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0104b8b8: 0x104b8b8: mflo  lo
+// 0x0104b8c8: 0x104b8c8: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x0104b8bc: 0x104b8bc: addu  v0, v1, v0
+// 0x0104b8cc: 0x104b8cc: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0104b8c0: 0x104b8c0: lw    v0, 72(v0)
+// 0x0104b8d0: 0x104b8d0: lw    v0, 72(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -7292,36 +7292,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104b8c4: 0x104b8c4: sll   zero, zero, 0
-// 0x0104b8c8: 0x104b8c8: beq   v0, zero, 0x104b8f0 addu  s0, a2, zero
+// 0x0104b8d4: 0x104b8d4: sll   zero, zero, 0
+// 0x0104b8d8: 0x104b8d8: beq   v0, zero, 0x104b900 addu  s0, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 11
-	brfalse L_104b8f0
+	brfalse L_104b900
 // --- basic block ---
-// 0x0104b8d0: 0x104b8d0: lui   a1, 0x10000
+// 0x0104b8e0: 0x104b8e0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104b8d4: 0x104b8d4: lui   a3, 0x10000
+// 0x0104b8e4: 0x104b8e4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104b8d8: 0x104b8d8: addiu a1, a1, 2852
+// 0x0104b8e8: 0x104b8e8: addiu a1, a1, 2848
 	ldloc.2
-	ldc.i4 2852
+	ldc.i4 2848
 	add
 	stloc.2
-// 0x0104b8dc: 0x104b8dc: addiu a3, a3, 2924
+// 0x0104b8ec: 0x104b8ec: addiu a3, a3, 2920
 	ldloc 4
-	ldc.i4 2924
+	ldc.i4 2920
 	add
 	stloc 4
-// 0x0104b8e0: 0x104b8e0: addiu a0, zero, 5
+// 0x0104b8f0: 0x104b8f0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0104b8e4: 0x104b8e4: addiu a2, zero, 294
+// 0x0104b8f4: 0x104b8f4: addiu a2, zero, 294
 	ldc.i4 294
 	stloc.3
-// 0x0104b8e8: 0x104b8e8: jal   0x100449c sw    s2, 16(sp)
+// 0x0104b8f8: 0x104b8f8: jal   0x100449c sw    s2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7340,136 +7340,136 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104b8f0:
-// 0x0104b8f0: 0x104b8f0: addiu v1, zero, 80
+L_104b900:
+// 0x0104b900: 0x104b900: addiu v1, zero, 80
 	ldc.i4.s 80
 	stloc 6
-// 0x0104b8f4: 0x104b8f4: mult  s2, v1
+// 0x0104b904: 0x104b904: mult  s2, v1
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 10
-// 0x0104b8f8: 0x104b8f8: lui   v1, 0x70000
+// 0x0104b908: 0x104b908: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104b8fc: 0x104b8fc: addiu v1, v1, -5228
+// 0x0104b90c: 0x104b90c: addiu v1, v1, -4764
 	ldloc 6
-	ldc.i4 -5228
+	ldc.i4 -4764
 	add
 	stloc 6
-// 0x0104b900: 0x104b900: addu  v0, zero, zero
+// 0x0104b910: 0x104b910: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0104b904: 0x104b904: addiu a0, zero, 10
+// 0x0104b914: 0x104b914: addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
-// 0x0104b908: 0x104b908: mflo  lo
+// 0x0104b918: 0x104b918: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x0104b90c: 0x104b90c: addu  v1, v1, a1
+// 0x0104b91c: 0x104b91c: addu  v1, v1, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x0104b910: 0x104b910: addiu v1, v1, 4
+// 0x0104b920: 0x104b920: addiu v1, v1, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-L_104b914:
-// 0x0104b914: 0x104b914: lw    a1, 0(v1)
+L_104b924:
+// 0x0104b924: 0x104b924: lw    a1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0104b918: 0x104b918: sll   zero, zero, 0
-// 0x0104b91c: 0x104b91c: slt   a1, s0, a1
+// 0x0104b928: 0x104b928: sll   zero, zero, 0
+// 0x0104b92c: 0x104b92c: slt   a1, s0, a1
 	ldloc 11
 	ldloc.2
 	clt
 	stloc.2
-// 0x0104b920: 0x104b920: beq   a1, zero, 0x104b934 addiu v1, v1, 8
+// 0x0104b930: 0x104b930: beq   a1, zero, 0x104b944 addiu v1, v1, 8
 	ldloc.2
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-	brfalse L_104b934
+	brfalse L_104b944
 // --- basic block ---
-// 0x0104b928: 0x104b928: addiu v0, v0, 1
+// 0x0104b938: 0x104b938: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0104b92c: 0x104b92c: bne   v0, a0, 0x104b914 sll   zero, zero, 0
+// 0x0104b93c: 0x104b93c: bne   v0, a0, 0x104b924 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_104b914
+	bne.un L_104b924
 // --- basic block ---
-L_104b934:
-// 0x0104b934: 0x104b934: addiu v1, zero, 10
+L_104b944:
+// 0x0104b944: 0x104b944: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x0104b938: 0x104b938: mult  s2, v1
+// 0x0104b948: 0x104b948: mult  s2, v1
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 10
-// 0x0104b93c: 0x104b93c: addiu a2, zero, 9
+// 0x0104b94c: 0x104b94c: addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
-// 0x0104b940: 0x104b940: subu  a2, a2, v0
+// 0x0104b950: 0x104b950: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x0104b944: 0x104b944: lui   v1, 0x70000
+// 0x0104b954: 0x104b954: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104b948: 0x104b948: addiu v1, v1, -5228
+// 0x0104b958: 0x104b958: addiu v1, v1, -4764
 	ldloc 6
-	ldc.i4 -5228
+	ldc.i4 -4764
 	add
 	stloc 6
-// 0x0104b94c: 0x104b94c: sll   a2, a2, 3
+// 0x0104b95c: 0x104b95c: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x0104b950: 0x104b950: mflo  lo
+// 0x0104b960: 0x104b960: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x0104b954: 0x104b954: addu  v0, v0, s2
+// 0x0104b964: 0x104b964: addu  v0, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0104b958: 0x104b958: sll   s3, v0, 3
+// 0x0104b968: 0x104b968: sll   s3, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 9
-// 0x0104b95c: 0x104b95c: addiu v0, v0, 1
+// 0x0104b96c: 0x104b96c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0104b960: 0x104b960: addu  s3, v1, s3
+// 0x0104b970: 0x104b970: addu  s3, v1, s3
 	ldloc 6
 	ldloc 9
 	add
 	stloc 9
-// 0x0104b964: 0x104b964: sll   a0, v0, 3
+// 0x0104b974: 0x104b974: sll   a0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0104b968: 0x104b968: addu  a1, s3, zero
+// 0x0104b978: 0x104b978: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0104b96c: 0x104b96c: jal   0x100186c addu  a0, v1, a0
+// 0x0104b97c: 0x104b97c: jal   0x100186c addu  a0, v1, a0
 	ldloc 6
 	ldloc.1
 	add
@@ -7483,8 +7483,8 @@ L_104b934:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104b974: 0x104b974: lw    ra, 44(sp)
-// 0x0104b978: 0x104b978: sw    s0, 4(s3)
+// 0x0104b984: 0x104b984: lw    ra, 44(sp)
+// 0x0104b988: 0x104b988: sw    s0, 4(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7493,14 +7493,14 @@ L_104b934:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104b97c: 0x104b97c: sw    s1, 0(s3)
+// 0x0104b98c: 0x104b98c: sw    s1, 0(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x0104b980: 0x104b980: lw    s2, 36(sp)
+// 0x0104b990: 0x104b990: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7509,7 +7509,7 @@ L_104b934:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104b984: 0x104b984: lw    s3, 40(sp)
+// 0x0104b994: 0x104b994: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7518,7 +7518,7 @@ L_104b934:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104b988: 0x104b988: lw    s1, 32(sp)
+// 0x0104b998: 0x104b998: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7527,7 +7527,7 @@ L_104b934:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104b98c: 0x104b98c: lw    s0, 28(sp)
+// 0x0104b99c: 0x104b99c: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7536,7 +7536,7 @@ L_104b934:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104b990: 0x104b990: jr    ra addiu sp, sp, 48
+// 0x0104b9a0: 0x104b9a0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -7548,7 +7548,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_pointer_register_drag_end_104b998(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_drag_end_104b9a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -7583,19 +7583,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b998: 0x104b998: addiu sp, sp, -24
+// 0x0104b9a8: 0x104b9a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b99c: 0x104b99c: addu  a2, a1, zero
+// 0x0104b9ac: 0x104b9ac: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104b9a0: 0x104b9a0: addu  a1, a0, zero
+// 0x0104b9b0: 0x104b9b0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b9a4: 0x104b9a4: sw    ra, 20(sp)
-// 0x0104b9a8: 0x104b9a8: jal   0x104b888 addiu a0, zero, 7
+// 0x0104b9b4: 0x104b9b4: sw    ra, 20(sp)
+// 0x0104b9b8: 0x104b9b8: jal   0x104b898 addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
 	ldloc.0
@@ -7603,14 +7603,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b9b0: 0x104b9b0: lw    ra, 20(sp)
-// 0x0104b9b4: 0x104b9b4: sll   zero, zero, 0
-// 0x0104b9b8: 0x104b9b8: jr    ra addiu sp, sp, 24
+// 0x0104b9c0: 0x104b9c0: lw    ra, 20(sp)
+// 0x0104b9c4: 0x104b9c4: sll   zero, zero, 0
+// 0x0104b9c8: 0x104b9c8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl56.j b/converted/Cibyl56.j
index 23fc381..bba8e65 100644
--- a/converted/Cibyl56.j
+++ b/converted/Cibyl56.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl56::.ctor
 
-.method public static int32 roadmap_pointer_register_drag_motion_104b9c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_drag_motion_104b9d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -76,19 +76,19 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b9c0: 0x104b9c0: addiu sp, sp, -24
+// 0x0104b9d0: 0x104b9d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b9c4: 0x104b9c4: addu  a2, a1, zero
+// 0x0104b9d4: 0x104b9d4: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104b9c8: 0x104b9c8: addu  a1, a0, zero
+// 0x0104b9d8: 0x104b9d8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b9cc: 0x104b9cc: sw    ra, 20(sp)
-// 0x0104b9d0: 0x104b9d0: jal   0x104b888 addiu a0, zero, 6
+// 0x0104b9dc: 0x104b9dc: sw    ra, 20(sp)
+// 0x0104b9e0: 0x104b9e0: jal   0x104b898 addiu a0, zero, 6
 	ldc.i4.6
 	stloc.1
 	ldloc.0
@@ -96,14 +96,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104b9d8: 0x104b9d8: lw    ra, 20(sp)
-// 0x0104b9dc: 0x104b9dc: sll   zero, zero, 0
-// 0x0104b9e0: 0x104b9e0: jr    ra addiu sp, sp, 24
+// 0x0104b9e8: 0x104b9e8: lw    ra, 20(sp)
+// 0x0104b9ec: 0x104b9ec: sll   zero, zero, 0
+// 0x0104b9f0: 0x104b9f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -115,7 +115,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_register_drag_start_104b9e8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_drag_start_104b9f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -150,19 +150,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104b9e8: 0x104b9e8: addiu sp, sp, -24
+// 0x0104b9f8: 0x104b9f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104b9ec: 0x104b9ec: addu  a2, a1, zero
+// 0x0104b9fc: 0x104b9fc: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104b9f0: 0x104b9f0: addu  a1, a0, zero
+// 0x0104ba00: 0x104ba00: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104b9f4: 0x104b9f4: sw    ra, 20(sp)
-// 0x0104b9f8: 0x104b9f8: jal   0x104b888 addiu a0, zero, 5
+// 0x0104ba04: 0x104ba04: sw    ra, 20(sp)
+// 0x0104ba08: 0x104ba08: jal   0x104b898 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -170,14 +170,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104ba00: 0x104ba00: lw    ra, 20(sp)
-// 0x0104ba04: 0x104ba04: sll   zero, zero, 0
-// 0x0104ba08: 0x104ba08: jr    ra addiu sp, sp, 24
+// 0x0104ba10: 0x104ba10: lw    ra, 20(sp)
+// 0x0104ba14: 0x104ba14: sll   zero, zero, 0
+// 0x0104ba18: 0x104ba18: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -189,7 +189,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_register_released_104ba10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_released_104ba20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -224,19 +224,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ba10: 0x104ba10: addiu sp, sp, -24
+// 0x0104ba20: 0x104ba20: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104ba14: 0x104ba14: addu  a2, a1, zero
+// 0x0104ba24: 0x104ba24: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104ba18: 0x104ba18: addu  a1, a0, zero
+// 0x0104ba28: 0x104ba28: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104ba1c: 0x104ba1c: sw    ra, 20(sp)
-// 0x0104ba20: 0x104ba20: jal   0x104b888 addiu a0, zero, 4
+// 0x0104ba2c: 0x104ba2c: sw    ra, 20(sp)
+// 0x0104ba30: 0x104ba30: jal   0x104b898 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -244,14 +244,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104ba28: 0x104ba28: lw    ra, 20(sp)
-// 0x0104ba2c: 0x104ba2c: sll   zero, zero, 0
-// 0x0104ba30: 0x104ba30: jr    ra addiu sp, sp, 24
+// 0x0104ba38: 0x104ba38: lw    ra, 20(sp)
+// 0x0104ba3c: 0x104ba3c: sll   zero, zero, 0
+// 0x0104ba40: 0x104ba40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -263,7 +263,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_register_pressed_104ba38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_pressed_104ba48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -298,19 +298,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ba38: 0x104ba38: addiu sp, sp, -24
+// 0x0104ba48: 0x104ba48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104ba3c: 0x104ba3c: addu  a2, a1, zero
+// 0x0104ba4c: 0x104ba4c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104ba40: 0x104ba40: addu  a1, a0, zero
+// 0x0104ba50: 0x104ba50: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104ba44: 0x104ba44: sw    ra, 20(sp)
-// 0x0104ba48: 0x104ba48: jal   0x104b888 addiu a0, zero, 3
+// 0x0104ba54: 0x104ba54: sw    ra, 20(sp)
+// 0x0104ba58: 0x104ba58: jal   0x104b898 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.0
@@ -318,14 +318,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104ba50: 0x104ba50: lw    ra, 20(sp)
-// 0x0104ba54: 0x104ba54: sll   zero, zero, 0
-// 0x0104ba58: 0x104ba58: jr    ra addiu sp, sp, 24
+// 0x0104ba60: 0x104ba60: lw    ra, 20(sp)
+// 0x0104ba64: 0x104ba64: sll   zero, zero, 0
+// 0x0104ba68: 0x104ba68: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -337,7 +337,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_register_enter_key_press_104ba60(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_enter_key_press_104ba70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -372,19 +372,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ba60: 0x104ba60: addiu sp, sp, -24
+// 0x0104ba70: 0x104ba70: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104ba64: 0x104ba64: addu  a2, a1, zero
+// 0x0104ba74: 0x104ba74: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104ba68: 0x104ba68: addu  a1, a0, zero
+// 0x0104ba78: 0x104ba78: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104ba6c: 0x104ba6c: sw    ra, 20(sp)
-// 0x0104ba70: 0x104ba70: jal   0x104b888 addiu a0, zero, 8
+// 0x0104ba7c: 0x104ba7c: sw    ra, 20(sp)
+// 0x0104ba80: 0x104ba80: jal   0x104b898 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
 	ldloc.0
@@ -392,14 +392,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104ba78: 0x104ba78: lw    ra, 20(sp)
-// 0x0104ba7c: 0x104ba7c: sll   zero, zero, 0
-// 0x0104ba80: 0x104ba80: jr    ra addiu sp, sp, 24
+// 0x0104ba88: 0x104ba88: lw    ra, 20(sp)
+// 0x0104ba8c: 0x104ba8c: sll   zero, zero, 0
+// 0x0104ba90: 0x104ba90: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -411,7 +411,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_register_double_click_104ba88(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_double_click_104ba98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -446,19 +446,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ba88: 0x104ba88: addiu sp, sp, -24
+// 0x0104ba98: 0x104ba98: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104ba8c: 0x104ba8c: addu  a2, a1, zero
+// 0x0104ba9c: 0x104ba9c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104ba90: 0x104ba90: addu  a1, a0, zero
+// 0x0104baa0: 0x104baa0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104ba94: 0x104ba94: sw    ra, 20(sp)
-// 0x0104ba98: 0x104ba98: jal   0x104b888 addiu a0, zero, 2
+// 0x0104baa4: 0x104baa4: sw    ra, 20(sp)
+// 0x0104baa8: 0x104baa8: jal   0x104b898 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -466,14 +466,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104baa0: 0x104baa0: lw    ra, 20(sp)
-// 0x0104baa4: 0x104baa4: sll   zero, zero, 0
-// 0x0104baa8: 0x104baa8: jr    ra addiu sp, sp, 24
+// 0x0104bab0: 0x104bab0: lw    ra, 20(sp)
+// 0x0104bab4: 0x104bab4: sll   zero, zero, 0
+// 0x0104bab8: 0x104bab8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -485,7 +485,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_register_long_click_104bab0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_long_click_104bac0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -520,19 +520,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bab0: 0x104bab0: addiu sp, sp, -24
+// 0x0104bac0: 0x104bac0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104bab4: 0x104bab4: addu  a2, a1, zero
+// 0x0104bac4: 0x104bac4: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104bab8: 0x104bab8: addu  a1, a0, zero
+// 0x0104bac8: 0x104bac8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104babc: 0x104babc: sw    ra, 20(sp)
-// 0x0104bac0: 0x104bac0: jal   0x104b888 addiu a0, zero, 1
+// 0x0104bacc: 0x104bacc: sw    ra, 20(sp)
+// 0x0104bad0: 0x104bad0: jal   0x104b898 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -540,14 +540,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104bac8: 0x104bac8: lw    ra, 20(sp)
-// 0x0104bacc: 0x104bacc: sll   zero, zero, 0
-// 0x0104bad0: 0x104bad0: jr    ra addiu sp, sp, 24
+// 0x0104bad8: 0x104bad8: lw    ra, 20(sp)
+// 0x0104badc: 0x104badc: sll   zero, zero, 0
+// 0x0104bae0: 0x104bae0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -559,7 +559,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -594,19 +594,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bad8: 0x104bad8: addiu sp, sp, -24
+// 0x0104bae8: 0x104bae8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104badc: 0x104badc: addu  a2, a1, zero
+// 0x0104baec: 0x104baec: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104bae0: 0x104bae0: addu  a1, a0, zero
+// 0x0104baf0: 0x104baf0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104bae4: 0x104bae4: sw    ra, 20(sp)
-// 0x0104bae8: 0x104bae8: jal   0x104b888 addu  a0, zero, zero
+// 0x0104baf4: 0x104baf4: sw    ra, 20(sp)
+// 0x0104baf8: 0x104baf8: jal   0x104b898 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -614,14 +614,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::queue_callback_104b888(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::queue_callback_104b898(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104baf0: 0x104baf0: lw    ra, 20(sp)
-// 0x0104baf4: 0x104baf4: sll   zero, zero, 0
-// 0x0104baf8: 0x104baf8: jr    ra addiu sp, sp, 24
+// 0x0104bb00: 0x104bb00: lw    ra, 20(sp)
+// 0x0104bb04: 0x104bb04: sll   zero, zero, 0
+// 0x0104bb08: 0x104bb08: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -633,7 +633,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_pointer_initialize_104bb00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_initialize_104bb10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -668,51 +668,51 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bb00: 0x104bb00: lui   a0, 0x1050000
+// 0x0104bb10: 0x104bb10: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104bb04: 0x104bb04: addiu sp, sp, -24
+// 0x0104bb14: 0x104bb14: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104bb08: 0x104bb08: sw    ra, 20(sp)
-// 0x0104bb0c: 0x104bb0c: jal   0x104de80 addiu a0, a0, -17604
+// 0x0104bb18: 0x104bb18: sw    ra, 20(sp)
+// 0x0104bb1c: 0x104bb1c: jal   0x104de90 addiu a0, a0, -17588
 	ldloc.1
-	ldc.i4 -17604
+	ldc.i4 -17588
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_register_button_pressed_handler_104de80(int32)
+	call int32 Cibyl57::roadmap_canvas_register_button_pressed_handler_104de90(int32)
 	stloc 5
 // --- basic block ---
-// 0x0104bb14: 0x104bb14: lui   a0, 0x1050000
+// 0x0104bb24: 0x104bb24: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104bb18: 0x104bb18: jal   0x104de8c addiu a0, a0, -17104
+// 0x0104bb28: 0x104bb28: jal   0x104de9c addiu a0, a0, -17088
 	ldloc.1
-	ldc.i4 -17104
+	ldc.i4 -17088
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_register_button_released_handler_104de8c(int32)
+	call int32 Cibyl57::roadmap_canvas_register_button_released_handler_104de9c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0104bb20: 0x104bb20: lui   a0, 0x1050000
+// 0x0104bb30: 0x104bb30: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104bb24: 0x104bb24: jal   0x104de98 addiu a0, a0, -17476
+// 0x0104bb34: 0x104bb34: jal   0x104dea8 addiu a0, a0, -17460
 	ldloc.1
-	ldc.i4 -17476
+	ldc.i4 -17460
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_register_mouse_move_handler_104de98(int32)
+	call int32 Cibyl57::roadmap_canvas_register_mouse_move_handler_104dea8(int32)
 	stloc 5
 // --- basic block ---
-// 0x0104bb2c: 0x104bb2c: lw    ra, 20(sp)
-// 0x0104bb30: 0x104bb30: sll   zero, zero, 0
-// 0x0104bb34: 0x104bb34: jr    ra addiu sp, sp, 24
+// 0x0104bb3c: 0x104bb3c: lw    ra, 20(sp)
+// 0x0104bb40: 0x104bb40: sll   zero, zero, 0
+// 0x0104bb44: 0x104bb44: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -724,7 +724,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_pointer_button_pressed_104bb3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_button_pressed_104bb4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -759,26 +759,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bb3c: 0x104bb3c: lw    v1, 0(a0)
+// 0x0104bb4c: 0x104bb4c: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104bb40: 0x104bb40: lui   v0, 0x70000
+// 0x0104bb50: 0x104bb50: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bb44: 0x104bb44: sw    v1, -5244(v0)
+// 0x0104bb54: 0x104bb54: sw    v1, -4780(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1311
+	ldc.i4 -1195
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104bb48: 0x104bb48: lw    v1, 4(a0)
+// 0x0104bb58: 0x104bb58: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -787,12 +787,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104bb4c: 0x104bb4c: addiu v0, v0, -5244
+// 0x0104bb5c: 0x104bb5c: addiu v0, v0, -4780
 	ldloc 5
-	ldc.i4 -5244
+	ldc.i4 -4780
 	add
 	stloc 5
-// 0x0104bb50: 0x104bb50: sw    v1, 4(v0)
+// 0x0104bb60: 0x104bb60: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -801,26 +801,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104bb54: 0x104bb54: lw    v1, 0(a0)
+// 0x0104bb64: 0x104bb64: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104bb58: 0x104bb58: lui   v0, 0x70000
+// 0x0104bb68: 0x104bb68: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bb5c: 0x104bb5c: sw    v1, -5236(v0)
+// 0x0104bb6c: 0x104bb6c: sw    v1, -4772(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1309
+	ldc.i4 -1193
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104bb60: 0x104bb60: lw    v1, 4(a0)
+// 0x0104bb70: 0x104bb70: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -829,12 +829,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104bb64: 0x104bb64: addiu v0, v0, -5236
+// 0x0104bb74: 0x104bb74: addiu v0, v0, -4772
 	ldloc 5
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc 5
-// 0x0104bb68: 0x104bb68: sw    v1, 4(v0)
+// 0x0104bb78: 0x104bb78: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -843,42 +843,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104bb6c: 0x104bb6c: addiu v1, zero, 1
+// 0x0104bb7c: 0x104bb7c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0104bb70: 0x104bb70: lui   v0, 0x70000
+// 0x0104bb80: 0x104bb80: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bb74: 0x104bb74: addiu sp, sp, -24
+// 0x0104bb84: 0x104bb84: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104bb78: 0x104bb78: addu  a1, a0, zero
+// 0x0104bb88: 0x104bb88: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104bb7c: 0x104bb7c: sw    v1, -5272(v0)
+// 0x0104bb8c: 0x104bb8c: sw    v1, -4808(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1318
+	ldc.i4 -1202
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104bb80: 0x104bb80: addiu a0, zero, 3
+// 0x0104bb90: 0x104bb90: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0104bb84: 0x104bb84: lui   v0, 0x70000
+// 0x0104bb94: 0x104bb94: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bb88: 0x104bb88: sw    ra, 20(sp)
-// 0x0104bb8c: 0x104bb8c: jal   0x104b5a8 sw    zero, -5264(v0)
+// 0x0104bb98: 0x104bb98: sw    ra, 20(sp)
+// 0x0104bb9c: 0x104bb9c: jal   0x104b5b8 sw    zero, -4800(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1316
+	ldc.i4 -1200
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -887,31 +887,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104bb94: 0x104bb94: lui   a1, 0x1050000
+// 0x0104bba4: 0x104bba4: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0104bb98: 0x104bb98: lui   v0, 0x70000
+// 0x0104bba8: 0x104bba8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bb9c: 0x104bb9c: addiu a1, a1, -16620
+// 0x0104bbac: 0x104bbac: addiu a1, a1, -16604
 	ldloc.2
-	ldc.i4 -16620
+	ldc.i4 -16604
 	add
 	stloc.2
-// 0x0104bba0: 0x104bba0: addiu a0, zero, 2400
+// 0x0104bbb0: 0x104bbb0: addiu a0, zero, 2400
 	ldc.i4 2400
 	stloc.1
-// 0x0104bba4: 0x104bba4: jal   0x104fe98 sw    zero, -5268(v0)
+// 0x0104bbb4: 0x104bbb4: jal   0x104fea8 sw    zero, -4804(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1317
+	ldc.i4 -1201
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -920,14 +920,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104bbac: 0x104bbac: lw    ra, 20(sp)
-// 0x0104bbb0: 0x104bbb0: sll   zero, zero, 0
-// 0x0104bbb4: 0x104bbb4: jr    ra addiu sp, sp, 24
+// 0x0104bbbc: 0x104bbbc: lw    ra, 20(sp)
+// 0x0104bbc0: 0x104bbc0: sll   zero, zero, 0
+// 0x0104bbc4: 0x104bbc4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -939,7 +939,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_pointer_moved_104bbbc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_moved_104bbcc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 v1,int32 s2,int32 s3,int32 ra)
@@ -986,24 +986,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bbbc: 0x104bbbc: lui   v0, 0x70000
+// 0x0104bbcc: 0x104bbcc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bbc0: 0x104bbc0: lw    v0, -5264(v0)
+// 0x0104bbd0: 0x104bbd0: lw    v0, -4800(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1316
+	ldc.i4 -1200
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bbc4: 0x104bbc4: addiu sp, sp, -40
+// 0x0104bbd4: 0x104bbd4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104bbc8: 0x104bbc8: sw    s0, 20(sp)
+// 0x0104bbd8: 0x104bbd8: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1012,8 +1012,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104bbcc: 0x104bbcc: sw    ra, 36(sp)
-// 0x0104bbd0: 0x104bbd0: sw    s3, 32(sp)
+// 0x0104bbdc: 0x104bbdc: sw    ra, 36(sp)
+// 0x0104bbe0: 0x104bbe0: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1022,7 +1022,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104bbd4: 0x104bbd4: sw    s2, 28(sp)
+// 0x0104bbe4: 0x104bbe4: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1031,7 +1031,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104bbd8: 0x104bbd8: sw    s1, 24(sp)
+// 0x0104bbe8: 0x104bbe8: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1040,110 +1040,110 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104bbdc: 0x104bbdc: bne   v0, zero, 0x104bcdc addu  s0, a0, zero
+// 0x0104bbec: 0x104bbec: bne   v0, zero, 0x104bcec addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brtrue L_104bcdc
+	brtrue L_104bcec
 // --- basic block ---
-// 0x0104bbe4: 0x104bbe4: lui   v0, 0x70000
+// 0x0104bbf4: 0x104bbf4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bbe8: 0x104bbe8: lw    v0, -5256(v0)
+// 0x0104bbf8: 0x104bbf8: lw    v0, -4792(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1314
+	ldc.i4 -1198
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bbec: 0x104bbec: sll   zero, zero, 0
-// 0x0104bbf0: 0x104bbf0: bne   v0, zero, 0x104bcdc lui   v0, 0x70000
+// 0x0104bbfc: 0x104bbfc: sll   zero, zero, 0
+// 0x0104bc00: 0x104bc00: bne   v0, zero, 0x104bcec lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_104bcdc
+	brtrue L_104bcec
 // --- basic block ---
-// 0x0104bbf8: 0x104bbf8: lw    v0, -5272(v0)
+// 0x0104bc08: 0x104bc08: lw    v0, -4808(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1318
+	ldc.i4 -1202
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bbfc: 0x104bbfc: sll   zero, zero, 0
-// 0x0104bc00: 0x104bc00: bne   v0, zero, 0x104bc18 lui   v0, 0x70000
+// 0x0104bc0c: 0x104bc0c: sll   zero, zero, 0
+// 0x0104bc10: 0x104bc10: bne   v0, zero, 0x104bc28 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_104bc18
+	brtrue L_104bc28
 // --- basic block ---
-// 0x0104bc08: 0x104bc08: lw    v0, -5252(v0)
+// 0x0104bc18: 0x104bc18: lw    v0, -4788(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1313
+	ldc.i4 -1197
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bc0c: 0x104bc0c: sll   zero, zero, 0
-// 0x0104bc10: 0x104bc10: beq   v0, zero, 0x104bcdc lui   v0, 0x70000
+// 0x0104bc1c: 0x104bc1c: sll   zero, zero, 0
+// 0x0104bc20: 0x104bc20: beq   v0, zero, 0x104bcec lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_104bcdc
+	brfalse L_104bcec
 // --- basic block ---
-L_104bc18:
-// 0x0104bc18: 0x104bc18: lw    v0, -5252(v0)
+L_104bc28:
+// 0x0104bc28: 0x104bc28: lw    v0, -4788(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1313
+	ldc.i4 -1197
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bc1c: 0x104bc1c: sll   zero, zero, 0
-// 0x0104bc20: 0x104bc20: bne   v0, zero, 0x104bca4 lui   s1, 0x70000
+// 0x0104bc2c: 0x104bc2c: sll   zero, zero, 0
+// 0x0104bc30: 0x104bc30: bne   v0, zero, 0x104bcb4 lui   s1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 7
-	brtrue L_104bca4
+	brtrue L_104bcb4
 // --- basic block ---
-// 0x0104bc28: 0x104bc28: lw    s3, 0(s0)
+// 0x0104bc38: 0x104bc38: lw    s3, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0104bc2c: 0x104bc2c: lw    s2, -5236(s1)
+// 0x0104bc3c: 0x104bc3c: lw    s2, -4772(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1309
+	ldc.i4 -1193
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104bc30: 0x104bc30: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0104bc40: 0x104bc40: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0104bc38: 0x104bc38: bne   s3, s2, 0x104bc58 addiu s1, s1, -5236
+// 0x0104bc48: 0x104bc48: bne   s3, s2, 0x104bc68 addiu s1, s1, -4772
 	ldloc 11
 	ldloc 10
 	ldloc 7
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc 7
-	bne.un L_104bc58
+	bne.un L_104bc68
 // --- basic block ---
-// 0x0104bc40: 0x104bc40: lw    s1, 4(s1)
+// 0x0104bc50: 0x104bc50: lw    s1, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1152,7 +1152,7 @@ L_104bc18:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104bc44: 0x104bc44: lw    s2, 4(s0)
+// 0x0104bc54: 0x104bc54: lw    s2, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1161,25 +1161,25 @@ L_104bc18:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104bc48: 0x104bc48: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0104bc58: 0x104bc58: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0104bc50: 0x104bc50: beq   s2, s1, 0x104bcdc sll   zero, zero, 0
+// 0x0104bc60: 0x104bc60: beq   s2, s1, 0x104bcec sll   zero, zero, 0
 	ldloc 10
 	ldloc 7
-	beq  L_104bcdc
+	beq  L_104bcec
 // --- basic block ---
-L_104bc58:
-// 0x0104bc58: 0x104bc58: lui   s1, 0x70000
+L_104bc68:
+// 0x0104bc68: 0x104bc68: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104bc5c: 0x104bc5c: addiu a1, s1, -5236
+// 0x0104bc6c: 0x104bc6c: addiu a1, s1, -4772
 	ldloc 7
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc.2
-// 0x0104bc60: 0x104bc60: jal   0x104b5a8 addiu a0, zero, 5
+// 0x0104bc70: 0x104bc70: jal   0x104b5b8 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -1187,31 +1187,31 @@ L_104bc58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0104bc68: 0x104bc68: lw    v0, 0(s0)
+// 0x0104bc78: 0x104bc78: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104bc6c: 0x104bc6c: lui   a1, 0x1050000
+// 0x0104bc7c: 0x104bc7c: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0104bc70: 0x104bc70: sw    v0, -5236(s1)
+// 0x0104bc80: 0x104bc80: sw    v0, -4772(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1309
+	ldc.i4 -1193
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104bc74: 0x104bc74: lw    v0, 4(s0)
+// 0x0104bc84: 0x104bc84: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1220,15 +1220,15 @@ L_104bc58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bc78: 0x104bc78: addiu s1, s1, -5236
+// 0x0104bc88: 0x104bc88: addiu s1, s1, -4772
 	ldloc 7
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc 7
-// 0x0104bc7c: 0x104bc7c: addiu s0, zero, 1
+// 0x0104bc8c: 0x104bc8c: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0104bc80: 0x104bc80: sw    v0, 4(s1)
+// 0x0104bc90: 0x104bc90: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1237,23 +1237,23 @@ L_104bc58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104bc84: 0x104bc84: addiu a1, a1, -17160
+// 0x0104bc94: 0x104bc94: addiu a1, a1, -17144
 	ldloc.2
-	ldc.i4 -17160
+	ldc.i4 -17144
 	add
 	stloc.2
-// 0x0104bc88: 0x104bc88: lui   v0, 0x70000
+// 0x0104bc98: 0x104bc98: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bc8c: 0x104bc8c: addiu a0, zero, 30
+// 0x0104bc9c: 0x104bc9c: addiu a0, zero, 30
 	ldc.i4.s 30
 	stloc.1
-// 0x0104bc90: 0x104bc90: jal   0x104fe98 sw    s0, -5248(v0)
+// 0x0104bca0: 0x104bca0: jal   0x104fea8 sw    s0, -4784(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1312
+	ldc.i4 -1196
 	add
 	ldloc 8
 	stelem.i4
@@ -1262,46 +1262,46 @@ L_104bc58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0104bc98: 0x104bc98: lui   v0, 0x70000
+// 0x0104bca8: 0x104bca8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bc9c: 0x104bc9c: j	 0x104bcdc sw    s0, -5252(v0)
+// 0x0104bcac: 0x104bcac: j	 0x104bcec sw    s0, -4788(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1313
+	ldc.i4 -1197
 	add
 	ldloc 8
 	stelem.i4
-	br L_104bcdc
+	br L_104bcec
 // --- basic block ---
-L_104bca4:
-// 0x0104bca4: 0x104bca4: lw    v1, 0(s0)
+L_104bcb4:
+// 0x0104bcb4: 0x104bcb4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0104bca8: 0x104bca8: lui   v0, 0x70000
+// 0x0104bcb8: 0x104bcb8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bcac: 0x104bcac: sw    v1, -5236(s1)
+// 0x0104bcbc: 0x104bcbc: sw    v1, -4772(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1309
+	ldc.i4 -1193
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104bcb0: 0x104bcb0: lw    a0, 4(s0)
+// 0x0104bcc0: 0x104bcc0: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1310,21 +1310,21 @@ L_104bca4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104bcb4: 0x104bcb4: lw    v1, -5248(v0)
+// 0x0104bcc4: 0x104bcc4: lw    v1, -4784(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1312
+	ldc.i4 -1196
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104bcb8: 0x104bcb8: addiu s1, s1, -5236
+// 0x0104bcc8: 0x104bcc8: addiu s1, s1, -4772
 	ldloc 7
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc 7
-// 0x0104bcbc: 0x104bcbc: bne   v1, zero, 0x104bcdc sw    a0, 4(s1)
+// 0x0104bccc: 0x104bccc: bne   v1, zero, 0x104bcec sw    a0, 4(s1)
 	ldloc 9
 	ldloc 6
 	ldloc 7
@@ -1334,28 +1334,28 @@ L_104bca4:
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_104bcdc
+	brtrue L_104bcec
 // --- basic block ---
-// 0x0104bcc4: 0x104bcc4: lui   a1, 0x1050000
+// 0x0104bcd4: 0x104bcd4: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0104bcc8: 0x104bcc8: addiu v1, zero, 1
+// 0x0104bcd8: 0x104bcd8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0104bccc: 0x104bccc: addiu a1, a1, -17160
+// 0x0104bcdc: 0x104bcdc: addiu a1, a1, -17144
 	ldloc.2
-	ldc.i4 -17160
+	ldc.i4 -17144
 	add
 	stloc.2
-// 0x0104bcd0: 0x104bcd0: addiu a0, zero, 30
+// 0x0104bce0: 0x104bce0: addiu a0, zero, 30
 	ldc.i4.s 30
 	stloc.1
-// 0x0104bcd4: 0x104bcd4: jal   0x104fe98 sw    v1, -5248(v0)
+// 0x0104bce4: 0x104bce4: jal   0x104fea8 sw    v1, -4784(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1312
+	ldc.i4 -1196
 	add
 	ldloc 9
 	stelem.i4
@@ -1364,14 +1364,14 @@ L_104bca4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_104bcdc:
-// 0x0104bcdc: 0x104bcdc: lw    ra, 36(sp)
-// 0x0104bce0: 0x104bce0: lw    s3, 32(sp)
+L_104bcec:
+// 0x0104bcec: 0x104bcec: lw    ra, 36(sp)
+// 0x0104bcf0: 0x104bcf0: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1380,7 +1380,7 @@ L_104bcdc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104bce4: 0x104bce4: lw    s2, 28(sp)
+// 0x0104bcf4: 0x104bcf4: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1389,7 +1389,7 @@ L_104bcdc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104bce8: 0x104bce8: lw    s1, 24(sp)
+// 0x0104bcf8: 0x104bcf8: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1398,7 +1398,7 @@ L_104bcdc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104bcec: 0x104bcec: lw    s0, 20(sp)
+// 0x0104bcfc: 0x104bcfc: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1407,7 +1407,7 @@ L_104bcdc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104bcf0: 0x104bcf0: jr    ra addiu sp, sp, 40
+// 0x0104bd00: 0x104bd00: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1419,7 +1419,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 drag_flow_control_104bcf8(int32,int32,int32,int32,int32)
+.method public static int32 drag_flow_control_104bd08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1454,18 +1454,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bcf8: 0x104bcf8: lui   a0, 0x1050000
+// 0x0104bd08: 0x104bd08: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104bcfc: 0x104bcfc: addiu sp, sp, -24
+// 0x0104bd0c: 0x104bd0c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104bd00: 0x104bd00: sw    ra, 20(sp)
-// 0x0104bd04: 0x104bd04: jal   0x104fd00 addiu a0, a0, -17160
+// 0x0104bd10: 0x104bd10: sw    ra, 20(sp)
+// 0x0104bd14: 0x104bd14: jal   0x104fd10 addiu a0, a0, -17144
 	ldloc.1
-	ldc.i4 -17160
+	ldc.i4 -17144
 	add
 	stloc.1
 	ldloc.0
@@ -1473,20 +1473,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104bd0c: 0x104bd0c: lui   a1, 0x70000
+// 0x0104bd1c: 0x104bd1c: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0104bd10: 0x104bd10: addiu a1, a1, -5236
+// 0x0104bd20: 0x104bd20: addiu a1, a1, -4772
 	ldloc.2
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc.2
-// 0x0104bd14: 0x104bd14: jal   0x104b5a8 addiu a0, zero, 6
+// 0x0104bd24: 0x104bd24: jal   0x104b5b8 addiu a0, zero, 6
 	ldc.i4.6
 	stloc.1
 	ldloc.0
@@ -1494,25 +1494,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104bd1c: 0x104bd1c: lw    ra, 20(sp)
-// 0x0104bd20: 0x104bd20: lui   v0, 0x70000
+// 0x0104bd2c: 0x104bd2c: lw    ra, 20(sp)
+// 0x0104bd30: 0x104bd30: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bd24: 0x104bd24: sw    zero, -5248(v0)
+// 0x0104bd34: 0x104bd34: sw    zero, -4784(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1312
+	ldc.i4 -1196
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104bd28: 0x104bd28: jr    ra addiu sp, sp, 24
+// 0x0104bd38: 0x104bd38: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1524,7 +1524,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_pointer_button_released_104bd30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_pointer_button_released_104bd40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -1565,12 +1565,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bd30: 0x104bd30: addiu sp, sp, -32
+// 0x0104bd40: 0x104bd40: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104bd34: 0x104bd34: sw    s1, 24(sp)
+// 0x0104bd44: 0x104bd44: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1579,19 +1579,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104bd38: 0x104bd38: lui   s1, 0x70000
+// 0x0104bd48: 0x104bd48: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104bd3c: 0x104bd3c: lw    v0, -5248(s1)
+// 0x0104bd4c: 0x104bd4c: lw    v0, -4784(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1312
+	ldc.i4 -1196
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bd40: 0x104bd40: sw    s0, 20(sp)
+// 0x0104bd50: 0x104bd50: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1600,19 +1600,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104bd44: 0x104bd44: sw    ra, 28(sp)
-// 0x0104bd48: 0x104bd48: beq   v0, zero, 0x104bd60 addu  s0, a0, zero
+// 0x0104bd54: 0x104bd54: sw    ra, 28(sp)
+// 0x0104bd58: 0x104bd58: beq   v0, zero, 0x104bd70 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
-	brfalse L_104bd60
+	brfalse L_104bd70
 // --- basic block ---
-// 0x0104bd50: 0x104bd50: lui   a0, 0x1050000
+// 0x0104bd60: 0x104bd60: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104bd54: 0x104bd54: jal   0x104fd00 addiu a0, a0, -17160
+// 0x0104bd64: 0x104bd64: jal   0x104fd10 addiu a0, a0, -17144
 	ldloc.1
-	ldc.i4 -17160
+	ldc.i4 -17144
 	add
 	stloc.1
 	ldloc.0
@@ -1620,43 +1620,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104bd5c: 0x104bd5c: sw    zero, -5248(s1)
+// 0x0104bd6c: 0x104bd6c: sw    zero, -4784(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1312
+	ldc.i4 -1196
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_104bd60:
-// 0x0104bd60: 0x104bd60: lui   s1, 0x70000
+L_104bd70:
+// 0x0104bd70: 0x104bd70: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104bd64: 0x104bd64: lw    v0, -5272(s1)
+// 0x0104bd74: 0x104bd74: lw    v0, -4808(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1318
+	ldc.i4 -1202
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bd68: 0x104bd68: sll   zero, zero, 0
-// 0x0104bd6c: 0x104bd6c: beq   v0, zero, 0x104beb4 lui   a0, 0x1050000
+// 0x0104bd78: 0x104bd78: sll   zero, zero, 0
+// 0x0104bd7c: 0x104bd7c: beq   v0, zero, 0x104bec4 lui   a0, 0x1050000
 	ldloc 5
 	ldc.i4 17104896
 	stloc.1
-	brfalse L_104beb4
+	brfalse L_104bec4
 // --- basic block ---
-// 0x0104bd74: 0x104bd74: jal   0x104fd00 addiu a0, a0, -16620
+// 0x0104bd84: 0x104bd84: jal   0x104fd10 addiu a0, a0, -16604
 	ldloc.1
-	ldc.i4 -16620
+	ldc.i4 -16604
 	add
 	stloc.1
 	ldloc.0
@@ -1664,99 +1664,99 @@ L_104bd60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104bd7c: 0x104bd7c: lui   v0, 0x70000
+// 0x0104bd8c: 0x104bd8c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bd80: 0x104bd80: sw    zero, -5272(s1)
+// 0x0104bd90: 0x104bd90: sw    zero, -4808(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1318
+	ldc.i4 -1202
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104bd84: 0x104bd84: jal   0x101fa28 sw    zero, -5264(v0)
+// 0x0104bd94: 0x104bd94: jal   0x101fa38 sw    zero, -4800(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1316
+	ldc.i4 -1200
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0104bd8c: 0x104bd8c: bne   v0, zero, 0x104bd98 addiu v1, zero, 22
+// 0x0104bd9c: 0x104bd9c: bne   v0, zero, 0x104bda8 addiu v1, zero, 22
 	ldloc 5
 	ldc.i4.s 22
 	stloc 7
-	brtrue L_104bd98
+	brtrue L_104bda8
 // --- basic block ---
-// 0x0104bd94: 0x104bd94: addiu v1, zero, 15
+// 0x0104bda4: 0x104bda4: addiu v1, zero, 15
 	ldc.i4.s 15
 	stloc 7
-L_104bd98:
-// 0x0104bd98: 0x104bd98: lui   v0, 0x70000
+L_104bda8:
+// 0x0104bda8: 0x104bda8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bd9c: 0x104bd9c: lw    a0, 0(s0)
+// 0x0104bdac: 0x104bdac: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104bda0: 0x104bda0: lw    a1, -5244(v0)
+// 0x0104bdb0: 0x104bdb0: lw    a1, -4780(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1311
+	ldc.i4 -1195
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104bda4: 0x104bda4: sll   zero, zero, 0
-// 0x0104bda8: 0x104bda8: subu  a1, a1, a0
+// 0x0104bdb4: 0x104bdb4: sll   zero, zero, 0
+// 0x0104bdb8: 0x104bdb8: subu  a1, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.2
-// 0x0104bdac: 0x104bdac: sra   a0, a1, 31
+// 0x0104bdbc: 0x104bdbc: sra   a0, a1, 31
 	ldloc.2
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x0104bdb0: 0x104bdb0: xor   a1, a0, a1
+// 0x0104bdc0: 0x104bdc0: xor   a1, a0, a1
 	ldloc.1
 	ldloc.2
 	xor
 	stloc.2
-// 0x0104bdb4: 0x104bdb4: subu  a0, a1, a0
+// 0x0104bdc4: 0x104bdc4: subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-// 0x0104bdb8: 0x104bdb8: slt   a0, v1, a0
+// 0x0104bdc8: 0x104bdc8: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x0104bdbc: 0x104bdbc: bne   a0, zero, 0x104be98 addiu v0, v0, -5244
+// 0x0104bdcc: 0x104bdcc: bne   a0, zero, 0x104bea8 addiu v0, v0, -4780
 	ldloc.1
 	ldloc 5
-	ldc.i4 -5244
+	ldc.i4 -4780
 	add
 	stloc 5
-	brtrue L_104be98
+	brtrue L_104bea8
 // --- basic block ---
-// 0x0104bdc4: 0x104bdc4: lw    a0, 4(v0)
+// 0x0104bdd4: 0x104bdd4: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1765,7 +1765,7 @@ L_104bd98:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104bdc8: 0x104bdc8: lw    v0, 4(s0)
+// 0x0104bdd8: 0x104bdd8: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1774,82 +1774,82 @@ L_104bd98:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bdcc: 0x104bdcc: sll   zero, zero, 0
-// 0x0104bdd0: 0x104bdd0: subu  a0, a0, v0
+// 0x0104bddc: 0x104bddc: sll   zero, zero, 0
+// 0x0104bde0: 0x104bde0: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x0104bdd4: 0x104bdd4: sra   v0, a0, 31
+// 0x0104bde4: 0x104bde4: sra   v0, a0, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x0104bdd8: 0x104bdd8: xor   a0, v0, a0
+// 0x0104bde8: 0x104bde8: xor   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	xor
 	stloc.1
-// 0x0104bddc: 0x104bddc: subu  v0, a0, v0
+// 0x0104bdec: 0x104bdec: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x0104bde0: 0x104bde0: slt   v1, v1, v0
+// 0x0104bdf0: 0x104bdf0: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x0104bde4: 0x104bde4: bne   v1, zero, 0x104be9c lui   v0, 0x70000
+// 0x0104bdf4: 0x104bdf4: bne   v1, zero, 0x104beac lui   v0, 0x70000
 	ldloc 7
 	ldc.i4 458752
 	stloc 5
-	brtrue L_104be9c
+	brtrue L_104beac
 // --- basic block ---
-// 0x0104bdec: 0x104bdec: lui   v0, 0x70000
+// 0x0104bdfc: 0x104bdfc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bdf0: 0x104bdf0: lw    v0, -5268(v0)
+// 0x0104be00: 0x104be00: lw    v0, -4804(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1317
+	ldc.i4 -1201
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bdf4: 0x104bdf4: sll   zero, zero, 0
-// 0x0104bdf8: 0x104bdf8: bne   v0, zero, 0x104be9c lui   v0, 0x70000
+// 0x0104be04: 0x104be04: sll   zero, zero, 0
+// 0x0104be08: 0x104be08: bne   v0, zero, 0x104beac lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_104be9c
+	brtrue L_104beac
 // --- basic block ---
-// 0x0104be00: 0x104be00: lui   s1, 0x70000
+// 0x0104be10: 0x104be10: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104be04: 0x104be04: lw    v0, -5256(s1)
+// 0x0104be14: 0x104be14: lw    v0, -4792(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1314
+	ldc.i4 -1198
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104be08: 0x104be08: sll   zero, zero, 0
-// 0x0104be0c: 0x104be0c: beq   v0, zero, 0x104be34 lui   v0, 0x70000
+// 0x0104be18: 0x104be18: sll   zero, zero, 0
+// 0x0104be1c: 0x104be1c: beq   v0, zero, 0x104be44 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_104be34
+	brfalse L_104be44
 // --- basic block ---
-// 0x0104be14: 0x104be14: lui   a0, 0x1050000
+// 0x0104be24: 0x104be24: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104be18: 0x104be18: jal   0x104fd00 addiu a0, a0, -16696
+// 0x0104be28: 0x104be28: jal   0x104fd10 addiu a0, a0, -16680
 	ldloc.1
-	ldc.i4 -16696
+	ldc.i4 -16680
 	add
 	stloc.1
 	ldloc.0
@@ -1857,91 +1857,91 @@ L_104bd98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104be20: 0x104be20: lui   a1, 0x70000
+// 0x0104be30: 0x104be30: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0104be24: 0x104be24: addiu a1, a1, -5236
+// 0x0104be34: 0x104be34: addiu a1, a1, -4772
 	ldloc.2
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc.2
-// 0x0104be28: 0x104be28: addiu a0, zero, 2
+// 0x0104be38: 0x104be38: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0104be2c: 0x104be2c: j	 0x104be74 sw    zero, -5256(s1)
+// 0x0104be3c: 0x104be3c: j	 0x104be84 sw    zero, -4792(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1314
+	ldc.i4 -1198
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_104be74
+	br L_104be84
 // --- basic block ---
-L_104be34:
-// 0x0104be34: 0x104be34: lw    v1, -5260(v0)
+L_104be44:
+// 0x0104be44: 0x104be44: lw    v1, -4796(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1315
+	ldc.i4 -1199
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104be38: 0x104be38: sll   zero, zero, 0
-// 0x0104be3c: 0x104be3c: beq   v1, zero, 0x104be70 addu  a0, zero, zero
+// 0x0104be48: 0x104be48: sll   zero, zero, 0
+// 0x0104be4c: 0x104be4c: beq   v1, zero, 0x104be80 addu  a0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_104be70
+	brfalse L_104be80
 // --- basic block ---
-// 0x0104be44: 0x104be44: addiu v1, zero, 1
+// 0x0104be54: 0x104be54: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0104be48: 0x104be48: lui   a1, 0x1050000
+// 0x0104be58: 0x104be58: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0104be4c: 0x104be4c: sw    v1, -5256(s1)
+// 0x0104be5c: 0x104be5c: sw    v1, -4792(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1314
+	ldc.i4 -1198
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104be50: 0x104be50: addiu a1, a1, -16696
+// 0x0104be60: 0x104be60: addiu a1, a1, -16680
 	ldloc.2
-	ldc.i4 -16696
+	ldc.i4 -16680
 	add
 	stloc.2
-// 0x0104be54: 0x104be54: lui   v1, 0x70000
+// 0x0104be64: 0x104be64: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104be58: 0x104be58: addiu a0, zero, 300
+// 0x0104be68: 0x104be68: addiu a0, zero, 300
 	ldc.i4 300
 	stloc.1
-// 0x0104be5c: 0x104be5c: sw    zero, -5252(v1)
+// 0x0104be6c: 0x104be6c: sw    zero, -4788(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1313
+	ldc.i4 -1197
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104be60: 0x104be60: jal   0x104fe98 sw    zero, -5260(v0)
+// 0x0104be70: 0x104be70: jal   0x104fea8 sw    zero, -4796(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1315
+	ldc.i4 -1199
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1950,46 +1950,46 @@ L_104be34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104be68: 0x104be68: j	 0x104beb4 sll   zero, zero, 0
-	br L_104beb4
+// 0x0104be78: 0x104be78: j	 0x104bec4 sll   zero, zero, 0
+	br L_104bec4
 // --- basic block ---
-L_104be70:
-// 0x0104be70: 0x104be70: addu  a1, s0, zero
+L_104be80:
+// 0x0104be80: 0x104be80: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-L_104be74:
-// 0x0104be74: 0x104be74: jal   0x104b5a8 sll   zero, zero, 0
+L_104be84:
+// 0x0104be84: 0x104be84: jal   0x104b5b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104be7c: 0x104be7c: addu  a1, s0, zero
+// 0x0104be8c: 0x104be8c: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-L_104be80:
-// 0x0104be80: 0x104be80: addiu a0, zero, 4
+L_104be90:
+// 0x0104be90: 0x104be90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104be84: 0x104be84: lui   v0, 0x70000
+// 0x0104be94: 0x104be94: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104be88: 0x104be88: jal   0x104b5a8 sw    zero, -5252(v0)
+// 0x0104be98: 0x104be98: jal   0x104b5b8 sw    zero, -4788(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1313
+	ldc.i4 -1197
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1998,43 +1998,43 @@ L_104be80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104be90: 0x104be90: j	 0x104beb4 sll   zero, zero, 0
-	br L_104beb4
+// 0x0104bea0: 0x104bea0: j	 0x104bec4 sll   zero, zero, 0
+	br L_104bec4
 // --- basic block ---
-L_104be98:
-// 0x0104be98: 0x104be98: lui   v0, 0x70000
+L_104bea8:
+// 0x0104bea8: 0x104bea8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_104be9c:
-// 0x0104be9c: 0x104be9c: lw    v0, -5252(v0)
+L_104beac:
+// 0x0104beac: 0x104beac: lw    v0, -4788(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1313
+	ldc.i4 -1197
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bea0: 0x104bea0: sll   zero, zero, 0
-// 0x0104bea4: 0x104bea4: beq   v0, zero, 0x104be80 addu  a1, s0, zero
+// 0x0104beb0: 0x104beb0: sll   zero, zero, 0
+// 0x0104beb4: 0x104beb4: beq   v0, zero, 0x104be90 addu  a1, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brfalse L_104be80
+	brfalse L_104be90
 // --- basic block ---
-// 0x0104beac: 0x104beac: j	 0x104be74 addiu a0, zero, 7
+// 0x0104bebc: 0x104bebc: j	 0x104be84 addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
-	br L_104be74
+	br L_104be84
 // --- basic block ---
-L_104beb4:
-// 0x0104beb4: 0x104beb4: lw    ra, 28(sp)
-// 0x0104beb8: 0x104beb8: lw    s1, 24(sp)
+L_104bec4:
+// 0x0104bec4: 0x104bec4: lw    ra, 28(sp)
+// 0x0104bec8: 0x104bec8: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2043,7 +2043,7 @@ L_104beb4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104bebc: 0x104bebc: lw    s0, 20(sp)
+// 0x0104becc: 0x104becc: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2052,7 +2052,7 @@ L_104beb4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104bec0: 0x104bec0: jr    ra addiu sp, sp, 32
+// 0x0104bed0: 0x104bed0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2064,7 +2064,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 double_click_flow_control_104bec8(int32,int32,int32,int32,int32)
+.method public static int32 double_click_flow_control_104bed8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -2102,15 +2102,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bec8: 0x104bec8: addiu sp, sp, -24
+// 0x0104bed8: 0x104bed8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104becc: 0x104becc: lui   a0, 0x1050000
+// 0x0104bedc: 0x104bedc: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104bed0: 0x104bed0: sw    s0, 16(sp)
+// 0x0104bee0: 0x104bee0: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2119,24 +2119,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104bed4: 0x104bed4: lui   v0, 0x70000
+// 0x0104bee4: 0x104bee4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bed8: 0x104bed8: lui   s0, 0x70000
+// 0x0104bee8: 0x104bee8: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104bedc: 0x104bedc: addiu a0, a0, -16696
+// 0x0104beec: 0x104beec: addiu a0, a0, -16680
 	ldloc.1
-	ldc.i4 -16696
+	ldc.i4 -16680
 	add
 	stloc.1
-// 0x0104bee0: 0x104bee0: sw    ra, 20(sp)
-// 0x0104bee4: 0x104bee4: jal   0x104fd00 sw    zero, -5256(v0)
+// 0x0104bef0: 0x104bef0: sw    ra, 20(sp)
+// 0x0104bef4: 0x104bef4: jal   0x104fd10 sw    zero, -4792(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1314
+	ldc.i4 -1198
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2145,17 +2145,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104beec: 0x104beec: addiu a1, s0, -5236
+// 0x0104befc: 0x104befc: addiu a1, s0, -4772
 	ldloc 6
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc.2
-// 0x0104bef0: 0x104bef0: jal   0x104b5a8 addu  a0, zero, zero
+// 0x0104bf00: 0x104bf00: jal   0x104b5b8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2163,17 +2163,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104bef8: 0x104bef8: addiu a1, s0, -5236
+// 0x0104bf08: 0x104bf08: addiu a1, s0, -4772
 	ldloc 6
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc.2
-// 0x0104befc: 0x104befc: jal   0x104b5a8 addiu a0, zero, 4
+// 0x0104bf0c: 0x104bf0c: jal   0x104b5b8 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -2181,13 +2181,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104bf04: 0x104bf04: lw    ra, 20(sp)
-// 0x0104bf08: 0x104bf08: lw    s0, 16(sp)
+// 0x0104bf14: 0x104bf14: lw    ra, 20(sp)
+// 0x0104bf18: 0x104bf18: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2196,7 +2196,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104bf0c: 0x104bf0c: jr    ra addiu sp, sp, 24
+// 0x0104bf1c: 0x104bf1c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2208,7 +2208,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 long_click_flow_control_104bf14(int32,int32,int32,int32,int32)
+.method public static int32 long_click_flow_control_104bf24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2243,18 +2243,18 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bf14: 0x104bf14: lui   a0, 0x1050000
+// 0x0104bf24: 0x104bf24: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104bf18: 0x104bf18: addiu sp, sp, -24
+// 0x0104bf28: 0x104bf28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104bf1c: 0x104bf1c: sw    ra, 20(sp)
-// 0x0104bf20: 0x104bf20: jal   0x104fd00 addiu a0, a0, -16620
+// 0x0104bf2c: 0x104bf2c: sw    ra, 20(sp)
+// 0x0104bf30: 0x104bf30: jal   0x104fd10 addiu a0, a0, -16604
 	ldloc.1
-	ldc.i4 -16620
+	ldc.i4 -16604
 	add
 	stloc.1
 	ldloc.0
@@ -2262,103 +2262,103 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104bf28: 0x104bf28: addiu v1, zero, 1
+// 0x0104bf38: 0x104bf38: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0104bf2c: 0x104bf2c: lui   v0, 0x70000
+// 0x0104bf3c: 0x104bf3c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bf30: 0x104bf30: jal   0x101fa28 sw    v1, -5268(v0)
+// 0x0104bf40: 0x104bf40: jal   0x101fa38 sw    v1, -4804(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1317
+	ldc.i4 -1201
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0104bf38: 0x104bf38: bne   v0, zero, 0x104bf44 addiu v1, zero, 22
+// 0x0104bf48: 0x104bf48: bne   v0, zero, 0x104bf54 addiu v1, zero, 22
 	ldloc 5
 	ldc.i4.s 22
 	stloc 6
-	brtrue L_104bf44
+	brtrue L_104bf54
 // --- basic block ---
-// 0x0104bf40: 0x104bf40: addiu v1, zero, 15
+// 0x0104bf50: 0x104bf50: addiu v1, zero, 15
 	ldc.i4.s 15
 	stloc 6
-L_104bf44:
-// 0x0104bf44: 0x104bf44: lui   a0, 0x70000
+L_104bf54:
+// 0x0104bf54: 0x104bf54: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104bf48: 0x104bf48: lui   v0, 0x70000
+// 0x0104bf58: 0x104bf58: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104bf4c: 0x104bf4c: lw    a1, -5236(v0)
+// 0x0104bf5c: 0x104bf5c: lw    a1, -4772(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1309
+	ldc.i4 -1193
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104bf50: 0x104bf50: lw    a2, -5244(a0)
+// 0x0104bf60: 0x104bf60: lw    a2, -4780(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1311
+	ldc.i4 -1195
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104bf54: 0x104bf54: sll   zero, zero, 0
-// 0x0104bf58: 0x104bf58: subu  a2, a2, a1
+// 0x0104bf64: 0x104bf64: sll   zero, zero, 0
+// 0x0104bf68: 0x104bf68: subu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.3
-// 0x0104bf5c: 0x104bf5c: sra   a1, a2, 31
+// 0x0104bf6c: 0x104bf6c: sra   a1, a2, 31
 	ldloc.3
 	ldc.i4.s 31
 	shr
 	stloc.2
-// 0x0104bf60: 0x104bf60: xor   a2, a1, a2
+// 0x0104bf70: 0x104bf70: xor   a2, a1, a2
 	ldloc.2
 	ldloc.3
 	xor
 	stloc.3
-// 0x0104bf64: 0x104bf64: subu  a1, a2, a1
+// 0x0104bf74: 0x104bf74: subu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.2
-// 0x0104bf68: 0x104bf68: slt   a1, v1, a1
+// 0x0104bf78: 0x104bf78: slt   a1, v1, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc.2
-// 0x0104bf6c: 0x104bf6c: bne   a1, zero, 0x104bfb8 addiu a0, a0, -5244
+// 0x0104bf7c: 0x104bf7c: bne   a1, zero, 0x104bfc8 addiu a0, a0, -4780
 	ldloc.2
 	ldloc.1
-	ldc.i4 -5244
+	ldc.i4 -4780
 	add
 	stloc.1
-	brtrue L_104bfb8
+	brtrue L_104bfc8
 // --- basic block ---
-// 0x0104bf74: 0x104bf74: addiu v0, v0, -5236
+// 0x0104bf84: 0x104bf84: addiu v0, v0, -4772
 	ldloc 5
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc 5
-// 0x0104bf78: 0x104bf78: lw    v0, 4(v0)
+// 0x0104bf88: 0x104bf88: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2367,7 +2367,7 @@ L_104bf44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bf7c: 0x104bf7c: lw    a0, 4(a0)
+// 0x0104bf8c: 0x104bf8c: lw    a0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2376,48 +2376,48 @@ L_104bf44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104bf80: 0x104bf80: sll   zero, zero, 0
-// 0x0104bf84: 0x104bf84: subu  a0, a0, v0
+// 0x0104bf90: 0x104bf90: sll   zero, zero, 0
+// 0x0104bf94: 0x104bf94: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x0104bf88: 0x104bf88: sra   v0, a0, 31
+// 0x0104bf98: 0x104bf98: sra   v0, a0, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x0104bf8c: 0x104bf8c: xor   a0, v0, a0
+// 0x0104bf9c: 0x104bf9c: xor   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	xor
 	stloc.1
-// 0x0104bf90: 0x104bf90: subu  v0, a0, v0
+// 0x0104bfa0: 0x104bfa0: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x0104bf94: 0x104bf94: slt   v1, v1, v0
+// 0x0104bfa4: 0x104bfa4: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x0104bf98: 0x104bf98: bne   v1, zero, 0x104bfbc lui   v0, 0x70000
+// 0x0104bfa8: 0x104bfa8: bne   v1, zero, 0x104bfcc lui   v0, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 5
-	brtrue L_104bfbc
+	brtrue L_104bfcc
 // --- basic block ---
-// 0x0104bfa0: 0x104bfa0: lui   a1, 0x70000
+// 0x0104bfb0: 0x104bfb0: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-L_104bfa4:
-// 0x0104bfa4: 0x104bfa4: addiu a1, a1, -5236
+L_104bfb4:
+// 0x0104bfb4: 0x104bfb4: addiu a1, a1, -4772
 	ldloc.2
-	ldc.i4 -5236
+	ldc.i4 -4772
 	add
 	stloc.2
-// 0x0104bfa8: 0x104bfa8: jal   0x104b5a8 addiu a0, zero, 1
+// 0x0104bfb8: 0x104bfb8: jal   0x104b5b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -2425,39 +2425,39 @@ L_104bfa4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::exec_callbacks_104b5a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::exec_callbacks_104b5b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104bfb0: 0x104bfb0: j	 0x104bfcc sll   zero, zero, 0
-	br L_104bfcc
+// 0x0104bfc0: 0x104bfc0: j	 0x104bfdc sll   zero, zero, 0
+	br L_104bfdc
 // --- basic block ---
-L_104bfb8:
-// 0x0104bfb8: 0x104bfb8: lui   v0, 0x70000
+L_104bfc8:
+// 0x0104bfc8: 0x104bfc8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_104bfbc:
-// 0x0104bfbc: 0x104bfbc: lw    v0, -5252(v0)
+L_104bfcc:
+// 0x0104bfcc: 0x104bfcc: lw    v0, -4788(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1313
+	ldc.i4 -1197
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104bfc0: 0x104bfc0: sll   zero, zero, 0
-// 0x0104bfc4: 0x104bfc4: beq   v0, zero, 0x104bfa4 lui   a1, 0x70000
+// 0x0104bfd0: 0x104bfd0: sll   zero, zero, 0
+// 0x0104bfd4: 0x104bfd4: beq   v0, zero, 0x104bfb4 lui   a1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc.2
-	brfalse L_104bfa4
+	brfalse L_104bfb4
 // --- basic block ---
-L_104bfcc:
-// 0x0104bfcc: 0x104bfcc: lw    ra, 20(sp)
-// 0x0104bfd0: 0x104bfd0: sll   zero, zero, 0
-// 0x0104bfd4: 0x104bfd4: jr    ra addiu sp, sp, 24
+L_104bfdc:
+// 0x0104bfdc: 0x104bfdc: lw    ra, 20(sp)
+// 0x0104bfe0: 0x104bfe0: sll   zero, zero, 0
+// 0x0104bfe4: 0x104bfe4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2469,7 +2469,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static void roadmap_analytics_log_event_104bfdc()
+.method public static void roadmap_analytics_log_event_104bfec()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2480,12 +2480,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bfdc: 0x104bfdc: jr    ra sll   zero, zero, 0
+// 0x0104bfec: 0x104bfec: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2526,12 +2526,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104bfe4: 0x104bfe4: addiu sp, sp, -40
+// 0x0104bff4: 0x104bff4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104bfe8: 0x104bfe8: sw    a2, 20(sp)
+// 0x0104bff8: 0x104bff8: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2540,8 +2540,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0104bfec: 0x104bfec: sw    ra, 36(sp)
-// 0x0104bff0: 0x104bff0: sw    s1, 32(sp)
+// 0x0104bffc: 0x104bffc: sw    ra, 36(sp)
+// 0x0104c000: 0x104c000: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2550,7 +2550,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104bff4: 0x104bff4: sw    s0, 28(sp)
+// 0x0104c004: 0x104c004: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2559,7 +2559,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104bff8: 0x104bff8: jal   0x101cd60 sw    a1, 16(sp)
+// 0x0104c008: 0x104c008: jal   0x101cd70 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2573,12 +2573,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c000: 0x104c000: lw    a1, 16(sp)
+// 0x0104c010: 0x104c010: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2587,10 +2587,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104c004: 0x104c004: addu  s0, v0, zero
+// 0x0104c014: 0x104c014: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c008: 0x104c008: jal   0x101cd60 addu  a0, a1, zero
+// 0x0104c018: 0x104c018: jal   0x101cd70 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -2598,20 +2598,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c010: 0x104c010: lui   a0, 0x0
+// 0x0104c020: 0x104c020: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104c014: 0x104c014: addiu a0, a0, 32524
+// 0x0104c024: 0x104c024: addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
 	stloc.1
-// 0x0104c018: 0x104c018: jal   0x101cd60 addu  s1, v0, zero
+// 0x0104c028: 0x104c028: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -2619,15 +2619,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c020: 0x104c020: addu  v1, v0, zero
+// 0x0104c030: 0x104c030: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104c024: 0x104c024: lw    a2, 20(sp)
+// 0x0104c034: 0x104c034: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2636,22 +2636,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104c028: 0x104c028: sll   zero, zero, 0
-// 0x0104c02c: 0x104c02c: cibyl_sysc_arg 0x10
+// 0x0104c038: 0x104c038: sll   zero, zero, 0
+// 0x0104c03c: 0x104c03c: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0104c030: 0x104c030: cibyl_sysc_arg 0x11
+// 0x0104c040: 0x104c040: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x0104c034: 0x104c034: cibyl_sysc_arg 0x3
+// 0x0104c044: 0x104c044: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104c038: 0x104c038: cibyl_sysc_arg 0x6
+// 0x0104c048: 0x104c048: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104c03c: 0x104c03c: cibyl_sysc 0x6fa
+// 0x0104c04c: 0x104c04c: cibyl_sysc 0x6fa
 	call void [WazeWP7]Syscalls::NOPH_MessageBoxFactory_messageBoxTimed(int32,int32,int32,int32)
-// 0x0104c040: 0x104c040: addu  s0, v0, zero
+// 0x0104c050: 0x104c050: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c044: 0x104c044: lw    ra, 36(sp)
-// 0x0104c048: 0x104c048: lw    s1, 32(sp)
+// 0x0104c054: 0x104c054: lw    ra, 36(sp)
+// 0x0104c058: 0x104c058: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2660,7 +2660,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c04c: 0x104c04c: lw    s0, 28(sp)
+// 0x0104c05c: 0x104c05c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2669,7 +2669,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104c050: 0x104c050: jr    ra addiu sp, sp, 40
+// 0x0104c060: 0x104c060: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2681,7 +2681,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2722,12 +2722,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c058: 0x104c058: addiu sp, sp, -40
+// 0x0104c068: 0x104c068: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104c05c: 0x104c05c: sw    a2, 20(sp)
+// 0x0104c06c: 0x104c06c: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2736,8 +2736,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0104c060: 0x104c060: sw    ra, 36(sp)
-// 0x0104c064: 0x104c064: sw    s1, 32(sp)
+// 0x0104c070: 0x104c070: sw    ra, 36(sp)
+// 0x0104c074: 0x104c074: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2746,7 +2746,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104c068: 0x104c068: sw    s0, 28(sp)
+// 0x0104c078: 0x104c078: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2755,7 +2755,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104c06c: 0x104c06c: jal   0x101cd60 sw    a1, 16(sp)
+// 0x0104c07c: 0x104c07c: jal   0x101cd70 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2769,12 +2769,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c074: 0x104c074: lw    a1, 16(sp)
+// 0x0104c084: 0x104c084: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2783,10 +2783,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104c078: 0x104c078: addu  s0, v0, zero
+// 0x0104c088: 0x104c088: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c07c: 0x104c07c: jal   0x101cd60 addu  a0, a1, zero
+// 0x0104c08c: 0x104c08c: jal   0x101cd70 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -2794,20 +2794,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c084: 0x104c084: lui   a0, 0x0
+// 0x0104c094: 0x104c094: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104c088: 0x104c088: addiu a0, a0, 32524
+// 0x0104c098: 0x104c098: addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
 	stloc.1
-// 0x0104c08c: 0x104c08c: jal   0x101cd60 addu  s1, v0, zero
+// 0x0104c09c: 0x104c09c: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -2815,15 +2815,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c094: 0x104c094: addu  v1, v0, zero
+// 0x0104c0a4: 0x104c0a4: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104c098: 0x104c098: lw    a2, 20(sp)
+// 0x0104c0a8: 0x104c0a8: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2832,22 +2832,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104c09c: 0x104c09c: sll   zero, zero, 0
-// 0x0104c0a0: 0x104c0a0: cibyl_sysc_arg 0x10
+// 0x0104c0ac: 0x104c0ac: sll   zero, zero, 0
+// 0x0104c0b0: 0x104c0b0: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0104c0a4: 0x104c0a4: cibyl_sysc_arg 0x11
+// 0x0104c0b4: 0x104c0b4: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x0104c0a8: 0x104c0a8: cibyl_sysc_arg 0x3
+// 0x0104c0b8: 0x104c0b8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104c0ac: 0x104c0ac: cibyl_sysc_arg 0x6
+// 0x0104c0bc: 0x104c0bc: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104c0b0: 0x104c0b0: cibyl_sysc 0x721
+// 0x0104c0c0: 0x104c0c0: cibyl_sysc 0x721
 	call void [WazeWP7]Syscalls::NOPH_MessageBoxFactory_messageBoxCb(int32,int32,int32,int32)
-// 0x0104c0b4: 0x104c0b4: addu  s0, v0, zero
+// 0x0104c0c4: 0x104c0c4: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c0b8: 0x104c0b8: lw    ra, 36(sp)
-// 0x0104c0bc: 0x104c0bc: lw    s1, 32(sp)
+// 0x0104c0c8: 0x104c0c8: lw    ra, 36(sp)
+// 0x0104c0cc: 0x104c0cc: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2856,7 +2856,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c0c0: 0x104c0c0: lw    s0, 28(sp)
+// 0x0104c0d0: 0x104c0d0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2865,7 +2865,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104c0c4: 0x104c0c4: jr    ra addiu sp, sp, 40
+// 0x0104c0d4: 0x104c0d4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2877,7 +2877,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_messagebox_custom_104c0cc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_messagebox_custom_104c0dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2918,12 +2918,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c0cc: 0x104c0cc: addiu sp, sp, -40
+// 0x0104c0dc: 0x104c0dc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104c0d0: 0x104c0d0: sw    a2, 20(sp)
+// 0x0104c0e0: 0x104c0e0: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2932,8 +2932,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0104c0d4: 0x104c0d4: sw    ra, 36(sp)
-// 0x0104c0d8: 0x104c0d8: sw    s1, 32(sp)
+// 0x0104c0e4: 0x104c0e4: sw    ra, 36(sp)
+// 0x0104c0e8: 0x104c0e8: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2942,7 +2942,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104c0dc: 0x104c0dc: sw    s0, 28(sp)
+// 0x0104c0ec: 0x104c0ec: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2951,7 +2951,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104c0e0: 0x104c0e0: jal   0x101cd60 sw    a1, 16(sp)
+// 0x0104c0f0: 0x104c0f0: jal   0x101cd70 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2965,12 +2965,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c0e8: 0x104c0e8: lw    a1, 16(sp)
+// 0x0104c0f8: 0x104c0f8: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2979,10 +2979,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104c0ec: 0x104c0ec: addu  s0, v0, zero
+// 0x0104c0fc: 0x104c0fc: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c0f0: 0x104c0f0: jal   0x101cd60 addu  a0, a1, zero
+// 0x0104c100: 0x104c100: jal   0x101cd70 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -2990,20 +2990,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c0f8: 0x104c0f8: lui   a0, 0x0
+// 0x0104c108: 0x104c108: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104c0fc: 0x104c0fc: addiu a0, a0, 32524
+// 0x0104c10c: 0x104c10c: addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
 	stloc.1
-// 0x0104c100: 0x104c100: jal   0x101cd60 addu  s1, v0, zero
+// 0x0104c110: 0x104c110: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -3011,15 +3011,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c108: 0x104c108: addu  a0, v0, zero
+// 0x0104c118: 0x104c118: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104c10c: 0x104c10c: lw    v1, 56(sp)
+// 0x0104c11c: 0x104c11c: lw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3028,7 +3028,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104c110: 0x104c110: lw    a2, 20(sp)
+// 0x0104c120: 0x104c120: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3037,24 +3037,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104c114: 0x104c114: sll   zero, zero, 0
-// 0x0104c118: 0x104c118: cibyl_sysc_arg 0x10
+// 0x0104c124: 0x104c124: sll   zero, zero, 0
+// 0x0104c128: 0x104c128: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0104c11c: 0x104c11c: cibyl_sysc_arg 0x6
+// 0x0104c12c: 0x104c12c: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104c120: 0x104c120: cibyl_sysc_arg 0x11
+// 0x0104c130: 0x104c130: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x0104c124: 0x104c124: cibyl_sysc_arg 0x3
+// 0x0104c134: 0x104c134: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104c128: 0x104c128: cibyl_sysc_arg 0x4
+// 0x0104c138: 0x104c138: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104c12c: 0x104c12c: cibyl_sysc 0x745
+// 0x0104c13c: 0x104c13c: cibyl_sysc 0x745
 	call void [WazeWP7]Syscalls::NOPH_MessageBoxFactory_messageBoxCustom(int32,int32,int32,int32,int32)
-// 0x0104c130: 0x104c130: addu  s0, v0, zero
+// 0x0104c140: 0x104c140: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c134: 0x104c134: lw    ra, 36(sp)
-// 0x0104c138: 0x104c138: lw    s1, 32(sp)
+// 0x0104c144: 0x104c144: lw    ra, 36(sp)
+// 0x0104c148: 0x104c148: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3063,7 +3063,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c13c: 0x104c13c: lw    s0, 28(sp)
+// 0x0104c14c: 0x104c14c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3072,7 +3072,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104c140: 0x104c140: jr    ra addiu sp, sp, 40
+// 0x0104c150: 0x104c150: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3084,7 +3084,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3125,13 +3125,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c148: 0x104c148: addiu sp, sp, -40
+// 0x0104c158: 0x104c158: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104c14c: 0x104c14c: sw    ra, 36(sp)
-// 0x0104c150: 0x104c150: sw    s1, 32(sp)
+// 0x0104c15c: 0x104c15c: sw    ra, 36(sp)
+// 0x0104c160: 0x104c160: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3140,7 +3140,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104c154: 0x104c154: sw    s0, 28(sp)
+// 0x0104c164: 0x104c164: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3149,7 +3149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104c158: 0x104c158: jal   0x101cd60 sw    a1, 16(sp)
+// 0x0104c168: 0x104c168: jal   0x101cd70 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3163,12 +3163,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c160: 0x104c160: lw    a1, 16(sp)
+// 0x0104c170: 0x104c170: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3177,10 +3177,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104c164: 0x104c164: addu  s0, v0, zero
+// 0x0104c174: 0x104c174: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c168: 0x104c168: jal   0x101cd60 addu  a0, a1, zero
+// 0x0104c178: 0x104c178: jal   0x101cd70 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -3188,20 +3188,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c170: 0x104c170: lui   a0, 0x0
+// 0x0104c180: 0x104c180: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104c174: 0x104c174: addiu a0, a0, 32524
+// 0x0104c184: 0x104c184: addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
 	stloc.1
-// 0x0104c178: 0x104c178: jal   0x101cd60 addu  s1, v0, zero
+// 0x0104c188: 0x104c188: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -3209,27 +3209,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c180: 0x104c180: addu  v1, v0, zero
+// 0x0104c190: 0x104c190: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104c184: 0x104c184: cibyl_sysc_arg 0x10
+// 0x0104c194: 0x104c194: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0104c188: 0x104c188: cibyl_sysc_arg 0x11
+// 0x0104c198: 0x104c198: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x0104c18c: 0x104c18c: cibyl_sysc_arg 0x3
+// 0x0104c19c: 0x104c19c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104c190: 0x104c190: cibyl_sysc 0x76d
+// 0x0104c1a0: 0x104c1a0: cibyl_sysc 0x76d
 	call void [WazeWP7]Syscalls::NOPH_MessageBoxFactory_messageBox(int32,int32,int32)
-// 0x0104c194: 0x104c194: addu  s0, v0, zero
+// 0x0104c1a4: 0x104c1a4: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c198: 0x104c198: lw    ra, 36(sp)
-// 0x0104c19c: 0x104c19c: lw    s1, 32(sp)
+// 0x0104c1a8: 0x104c1a8: lw    ra, 36(sp)
+// 0x0104c1ac: 0x104c1ac: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3238,7 +3238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c1a0: 0x104c1a0: lw    s0, 28(sp)
+// 0x0104c1b0: 0x104c1b0: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3247,7 +3247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104c1a4: 0x104c1a4: jr    ra addiu sp, sp, 40
+// 0x0104c1b4: 0x104c1b4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3259,7 +3259,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_confirm_dialog_custom_timeout_104c1b8(int32,int32,int32,int32,int32)
+.method public static int32 ssd_confirm_dialog_custom_timeout_104c1c8(int32,int32,int32,int32,int32)
 {
 .maxstack 11
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s3,int32 s2,int32 s4,int32 ra)
@@ -3309,12 +3309,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c1b8: 0x104c1b8: addiu sp, sp, -48
+// 0x0104c1c8: 0x104c1c8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104c1bc: 0x104c1bc: sw    s0, 24(sp)
+// 0x0104c1cc: 0x104c1cc: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3323,14 +3323,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104c1c0: 0x104c1c0: addu  s0, a0, zero
+// 0x0104c1d0: 0x104c1d0: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0104c1c4: 0x104c1c4: addiu a0, zero, 8
+// 0x0104c1d4: 0x104c1d4: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-// 0x0104c1c8: 0x104c1c8: sw    ra, 44(sp)
-// 0x0104c1cc: 0x104c1cc: sw    a3, 16(sp)
+// 0x0104c1d8: 0x104c1d8: sw    ra, 44(sp)
+// 0x0104c1dc: 0x104c1dc: sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3339,7 +3339,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0104c1d0: 0x104c1d0: sw    s4, 40(sp)
+// 0x0104c1e0: 0x104c1e0: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3348,7 +3348,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104c1d4: 0x104c1d4: sw    s3, 36(sp)
+// 0x0104c1e4: 0x104c1e4: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3357,7 +3357,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104c1d8: 0x104c1d8: sw    s2, 32(sp)
+// 0x0104c1e8: 0x104c1e8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3366,10 +3366,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104c1dc: 0x104c1dc: addu  s3, a1, zero
+// 0x0104c1ec: 0x104c1ec: addu  s3, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0104c1e0: 0x104c1e0: sw    s1, 28(sp)
+// 0x0104c1f0: 0x104c1f0: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3378,7 +3378,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104c1e4: 0x104c1e4: jal   0x1000910 addu  s2, a2, zero
+// 0x0104c1f4: 0x104c1f4: jal   0x1000910 addu  s2, a2, zero
 	ldloc.3
 	stloc 11
 	ldloc.0
@@ -3391,16 +3391,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c1ec: 0x104c1ec: addu  a0, v0, zero
+// 0x0104c1fc: 0x104c1fc: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104c1f0: 0x104c1f0: addu  a1, zero, zero
+// 0x0104c200: 0x104c200: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104c1f4: 0x104c1f4: addiu a2, zero, 8
+// 0x0104c204: 0x104c204: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x0104c1f8: 0x104c1f8: jal   0x100177c addu  s1, v0, zero
+// 0x0104c208: 0x104c208: jal   0x100177c addu  s1, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.1
@@ -3412,7 +3412,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c200: 0x104c200: lw    a3, 16(sp)
+// 0x0104c210: 0x104c210: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3421,7 +3421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104c204: 0x104c204: lw    v0, 64(sp)
+// 0x0104c214: 0x104c214: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3430,7 +3430,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c208: 0x104c208: sw    a3, 4(s1)
+// 0x0104c218: 0x104c218: sw    a3, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3439,10 +3439,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0104c20c: 0x104c20c: addu  a0, s0, zero
+// 0x0104c21c: 0x104c21c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0104c210: 0x104c210: jal   0x101cd60 sw    v0, 0(s1)
+// 0x0104c220: 0x104c220: jal   0x101cd70 sw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3454,15 +3454,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c218: 0x104c218: addu  a0, s3, zero
+// 0x0104c228: 0x104c228: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x0104c21c: 0x104c21c: jal   0x101cd60 addu  s0, v0, zero
+// 0x0104c22c: 0x104c22c: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -3470,12 +3470,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c224: 0x104c224: lw    a0, 68(sp)
+// 0x0104c234: 0x104c234: lw    a0, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3484,7 +3484,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104c228: 0x104c228: jal   0x101cd60 addu  s3, v0, zero
+// 0x0104c238: 0x104c238: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -3492,12 +3492,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c230: 0x104c230: lw    a0, 72(sp)
+// 0x0104c240: 0x104c240: lw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3506,7 +3506,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104c234: 0x104c234: jal   0x101cd60 addu  s4, v0, zero
+// 0x0104c244: 0x104c244: jal   0x101cd70 addu  s4, v0, zero
 	ldloc 6
 	stloc 12
 	ldloc.0
@@ -3514,31 +3514,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c23c: 0x104c23c: lui   a2, 0x1050000
+// 0x0104c24c: 0x104c24c: lui   a2, 0x1050000
 	ldc.i4 17104896
 	stloc.3
-// 0x0104c240: 0x104c240: lui   a1, 0x1050000
+// 0x0104c250: 0x104c250: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0104c244: 0x104c244: addu  v1, v0, zero
+// 0x0104c254: 0x104c254: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104c248: 0x104c248: addiu a2, a2, -15520
+// 0x0104c258: 0x104c258: addiu a2, a2, -15504
 	ldloc.3
-	ldc.i4 -15520
+	ldc.i4 -15504
 	add
 	stloc.3
-// 0x0104c24c: 0x104c24c: addiu a1, a1, -15464
+// 0x0104c25c: 0x104c25c: addiu a1, a1, -15448
 	ldloc.2
-	ldc.i4 -15464
+	ldc.i4 -15448
 	add
 	stloc.2
-// 0x0104c250: 0x104c250: lw    a0, 76(sp)
+// 0x0104c260: 0x104c260: lw    a0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3547,32 +3547,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104c254: 0x104c254: sll   zero, zero, 0
-// 0x0104c258: 0x104c258: cibyl_sysc_arg 0x10
+// 0x0104c264: 0x104c264: sll   zero, zero, 0
+// 0x0104c268: 0x104c268: cibyl_sysc_arg 0x10
 	ldloc 9
-// 0x0104c25c: 0x104c25c: cibyl_sysc_arg 0x13
+// 0x0104c26c: 0x104c26c: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x0104c260: 0x104c260: cibyl_sysc_arg 0x12
+// 0x0104c270: 0x104c270: cibyl_sysc_arg 0x12
 	ldloc 11
-// 0x0104c264: 0x104c264: cibyl_sysc_arg 0x14
+// 0x0104c274: 0x104c274: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x0104c268: 0x104c268: cibyl_sysc_arg 0x3
+// 0x0104c278: 0x104c278: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104c26c: 0x104c26c: cibyl_sysc_arg 0x4
+// 0x0104c27c: 0x104c27c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104c270: 0x104c270: cibyl_sysc_arg 0x5
+// 0x0104c280: 0x104c280: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104c274: 0x104c274: cibyl_sysc_arg 0x6
+// 0x0104c284: 0x104c284: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104c278: 0x104c278: cibyl_sysc_arg 0x11
+// 0x0104c288: 0x104c288: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x0104c27c: 0x104c27c: cibyl_sysc 0x7ae
+// 0x0104c28c: 0x104c28c: cibyl_sysc 0x7ae
 	call void [WazeWP7]Syscalls::NOPH_ConfirmDialog_CreateDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x0104c280: 0x104c280: addu  s1, v0, zero
+// 0x0104c290: 0x104c290: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104c284: 0x104c284: lw    ra, 44(sp)
-// 0x0104c288: 0x104c288: lw    s4, 40(sp)
+// 0x0104c294: 0x104c294: lw    ra, 44(sp)
+// 0x0104c298: 0x104c298: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3581,7 +3581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104c28c: 0x104c28c: lw    s3, 36(sp)
+// 0x0104c29c: 0x104c29c: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3590,7 +3590,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104c290: 0x104c290: lw    s2, 32(sp)
+// 0x0104c2a0: 0x104c2a0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3599,7 +3599,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104c294: 0x104c294: lw    s1, 28(sp)
+// 0x0104c2a4: 0x104c2a4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3608,7 +3608,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104c298: 0x104c298: lw    s0, 24(sp)
+// 0x0104c2a8: 0x104c2a8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3617,7 +3617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c29c: 0x104c29c: jr    ra addiu sp, sp, 48
+// 0x0104c2ac: 0x104c2ac: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3629,7 +3629,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_confirm_dialog_custom_104c2a4(int32,int32,int32,int32,int32)
+.method public static int32 ssd_confirm_dialog_custom_104c2b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -3664,12 +3664,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c2a4: 0x104c2a4: addiu sp, sp, -40
+// 0x0104c2b4: 0x104c2b4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104c2a8: 0x104c2a8: lw    v0, 56(sp)
+// 0x0104c2b8: 0x104c2b8: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3678,8 +3678,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c2ac: 0x104c2ac: sw    ra, 36(sp)
-// 0x0104c2b0: 0x104c2b0: sw    v0, 16(sp)
+// 0x0104c2bc: 0x104c2bc: sw    ra, 36(sp)
+// 0x0104c2c0: 0x104c2c0: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3688,7 +3688,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104c2b4: 0x104c2b4: lw    v0, 60(sp)
+// 0x0104c2c4: 0x104c2c4: lw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3697,7 +3697,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c2b8: 0x104c2b8: sw    zero, 28(sp)
+// 0x0104c2c8: 0x104c2c8: sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3706,7 +3706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104c2bc: 0x104c2bc: sw    v0, 20(sp)
+// 0x0104c2cc: 0x104c2cc: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3715,7 +3715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104c2c0: 0x104c2c0: lw    v0, 64(sp)
+// 0x0104c2d0: 0x104c2d0: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3724,7 +3724,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c2c4: 0x104c2c4: jal   0x104c1b8 sw    v0, 24(sp)
+// 0x0104c2d4: 0x104c2d4: jal   0x104c1c8 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3738,14 +3738,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104c2cc: 0x104c2cc: lw    ra, 36(sp)
-// 0x0104c2d0: 0x104c2d0: sll   zero, zero, 0
-// 0x0104c2d4: 0x104c2d4: jr    ra addiu sp, sp, 40
+// 0x0104c2dc: 0x104c2dc: lw    ra, 36(sp)
+// 0x0104c2e0: 0x104c2e0: sll   zero, zero, 0
+// 0x0104c2e4: 0x104c2e4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3757,7 +3757,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_confirm_dialog_timeout_104c2dc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_confirm_dialog_timeout_104c2ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3792,12 +3792,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c2dc: 0x104c2dc: addiu sp, sp, -40
+// 0x0104c2ec: 0x104c2ec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104c2e0: 0x104c2e0: lw    v0, 56(sp)
+// 0x0104c2f0: 0x104c2f0: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3806,8 +3806,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104c2e4: 0x104c2e4: sw    ra, 36(sp)
-// 0x0104c2e8: 0x104c2e8: sw    v0, 16(sp)
+// 0x0104c2f4: 0x104c2f4: sw    ra, 36(sp)
+// 0x0104c2f8: 0x104c2f8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3816,15 +3816,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104c2ec: 0x104c2ec: lui   v0, 0x0
+// 0x0104c2fc: 0x104c2fc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104c2f0: 0x104c2f0: addiu v0, v0, 32116
+// 0x0104c300: 0x104c300: addiu v0, v0, 32116
 	ldloc 5
 	ldc.i4 32116
 	add
 	stloc 5
-// 0x0104c2f4: 0x104c2f4: sw    v0, 20(sp)
+// 0x0104c304: 0x104c304: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3833,15 +3833,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104c2f8: 0x104c2f8: lui   v0, 0x0
+// 0x0104c308: 0x104c308: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104c2fc: 0x104c2fc: addiu v0, v0, 32120
+// 0x0104c30c: 0x104c30c: addiu v0, v0, 32120
 	ldloc 5
 	ldc.i4 32120
 	add
 	stloc 5
-// 0x0104c300: 0x104c300: sw    v0, 24(sp)
+// 0x0104c310: 0x104c310: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3850,7 +3850,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104c304: 0x104c304: lw    v0, 60(sp)
+// 0x0104c314: 0x104c314: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3859,7 +3859,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104c308: 0x104c308: jal   0x104c1b8 sw    v0, 28(sp)
+// 0x0104c318: 0x104c318: jal   0x104c1c8 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3873,14 +3873,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104c310: 0x104c310: lw    ra, 36(sp)
-// 0x0104c314: 0x104c314: sll   zero, zero, 0
-// 0x0104c318: 0x104c318: jr    ra addiu sp, sp, 40
+// 0x0104c320: 0x104c320: lw    ra, 36(sp)
+// 0x0104c324: 0x104c324: sll   zero, zero, 0
+// 0x0104c328: 0x104c328: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3892,7 +3892,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+.method public static int32 ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -3927,12 +3927,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c320: 0x104c320: addiu sp, sp, -40
+// 0x0104c330: 0x104c330: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104c324: 0x104c324: lw    v0, 56(sp)
+// 0x0104c334: 0x104c334: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3941,8 +3941,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104c328: 0x104c328: sw    ra, 36(sp)
-// 0x0104c32c: 0x104c32c: sw    v0, 16(sp)
+// 0x0104c338: 0x104c338: sw    ra, 36(sp)
+// 0x0104c33c: 0x104c33c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3951,15 +3951,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104c330: 0x104c330: lui   v0, 0x0
+// 0x0104c340: 0x104c340: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104c334: 0x104c334: addiu v0, v0, 32116
+// 0x0104c344: 0x104c344: addiu v0, v0, 32116
 	ldloc 5
 	ldc.i4 32116
 	add
 	stloc 5
-// 0x0104c338: 0x104c338: sw    v0, 20(sp)
+// 0x0104c348: 0x104c348: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3968,15 +3968,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104c33c: 0x104c33c: lui   v0, 0x0
+// 0x0104c34c: 0x104c34c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104c340: 0x104c340: addiu v0, v0, 32120
+// 0x0104c350: 0x104c350: addiu v0, v0, 32120
 	ldloc 5
 	ldc.i4 32120
 	add
 	stloc 5
-// 0x0104c344: 0x104c344: sw    v0, 24(sp)
+// 0x0104c354: 0x104c354: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3985,7 +3985,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104c348: 0x104c348: jal   0x104c1b8 sw    zero, 28(sp)
+// 0x0104c358: 0x104c358: jal   0x104c1c8 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3999,14 +3999,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104c350: 0x104c350: lw    ra, 36(sp)
-// 0x0104c354: 0x104c354: sll   zero, zero, 0
-// 0x0104c358: 0x104c358: jr    ra addiu sp, sp, 40
+// 0x0104c360: 0x104c360: lw    ra, 36(sp)
+// 0x0104c364: 0x104c364: sll   zero, zero, 0
+// 0x0104c368: 0x104c368: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4018,7 +4018,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 no_button_callback_104c360(int32,int32,int32,int32,int32)
+.method public static int32 no_button_callback_104c370(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -4056,12 +4056,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c360: 0x104c360: addiu sp, sp, -24
+// 0x0104c370: 0x104c370: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c364: 0x104c364: lw    v0, 4(a0)
+// 0x0104c374: 0x104c374: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4070,15 +4070,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c368: 0x104c368: lw    a1, 0(a0)
+// 0x0104c378: 0x104c378: lw    a1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0104c36c: 0x104c36c: sw    ra, 20(sp)
-// 0x0104c370: 0x104c370: sw    s0, 16(sp)
+// 0x0104c37c: 0x104c37c: sw    ra, 20(sp)
+// 0x0104c380: 0x104c380: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4087,10 +4087,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104c374: 0x104c374: addu  s0, a0, zero
+// 0x0104c384: 0x104c384: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0104c378: 0x104c378: jalr  v0 addiu a0, zero, 4
+// 0x0104c388: 0x104c388: jalr  v0 addiu a0, zero, 4
 	ldloc 6
 	ldc.i4.4
 	stloc.1
@@ -4104,7 +4104,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104c380: 0x104c380: jal   0x1000930 addu  a0, s0, zero
+// 0x0104c390: 0x104c390: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4117,8 +4117,8 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104c388: 0x104c388: lw    ra, 20(sp)
-// 0x0104c38c: 0x104c38c: lw    s0, 16(sp)
+// 0x0104c398: 0x104c398: lw    ra, 20(sp)
+// 0x0104c39c: 0x104c39c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4127,7 +4127,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104c390: 0x104c390: jr    ra addiu sp, sp, 24
+// 0x0104c3a0: 0x104c3a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4139,7 +4139,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 yes_button_callback_104c398(int32,int32,int32,int32,int32)
+.method public static int32 yes_button_callback_104c3a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -4177,12 +4177,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c398: 0x104c398: addiu sp, sp, -24
+// 0x0104c3a8: 0x104c3a8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c39c: 0x104c39c: lw    v0, 4(a0)
+// 0x0104c3ac: 0x104c3ac: lw    v0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4191,15 +4191,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c3a0: 0x104c3a0: lw    a1, 0(a0)
+// 0x0104c3b0: 0x104c3b0: lw    a1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0104c3a4: 0x104c3a4: sw    ra, 20(sp)
-// 0x0104c3a8: 0x104c3a8: sw    s0, 16(sp)
+// 0x0104c3b4: 0x104c3b4: sw    ra, 20(sp)
+// 0x0104c3b8: 0x104c3b8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4208,10 +4208,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104c3ac: 0x104c3ac: addu  s0, a0, zero
+// 0x0104c3bc: 0x104c3bc: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0104c3b0: 0x104c3b0: jalr  v0 addiu a0, zero, 3
+// 0x0104c3c0: 0x104c3c0: jalr  v0 addiu a0, zero, 3
 	ldloc 6
 	ldc.i4.3
 	stloc.1
@@ -4225,7 +4225,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104c3b8: 0x104c3b8: jal   0x1000930 addu  a0, s0, zero
+// 0x0104c3c8: 0x104c3c8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4238,8 +4238,8 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104c3c0: 0x104c3c0: lw    ra, 20(sp)
-// 0x0104c3c4: 0x104c3c4: lw    s0, 16(sp)
+// 0x0104c3d0: 0x104c3d0: lw    ra, 20(sp)
+// 0x0104c3d4: 0x104c3d4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4248,7 +4248,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104c3c8: 0x104c3c8: jr    ra addiu sp, sp, 24
+// 0x0104c3d8: 0x104c3d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4260,7 +4260,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ssd_progress_msg_dialog_show_104c3d0(int32)
+.method public static int32 ssd_progress_msg_dialog_show_104c3e0(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -4277,11 +4277,11 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c3d0: 0x104c3d0: cibyl_sysc_arg 0x4
+// 0x0104c3e0: 0x104c3e0: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104c3d4: 0x104c3d4: cibyl_sysc 0x7ce
+// 0x0104c3e4: 0x104c3e4: cibyl_sysc 0x7ce
 	call void [WazeWP7]Syscalls::NOPH_ProgressMessageDialog_showDialog(int32)
-// 0x0104c3d8: 0x104c3d8: jr    ra addu  a0, v0, zero
+// 0x0104c3e8: 0x104c3e8: jr    ra addu  a0, v0, zero
 	ldloc.1
 	stloc.0
 	br __CIBYL_function_return
@@ -4289,7 +4289,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ssd_progress_msg_dialog_hide_104c3f0()
+.method public static int32 ssd_progress_msg_dialog_hide_104c400()
 {
 .maxstack 4
 .locals init (int32 v0,int32 v1,int32 ra)
@@ -4306,9 +4306,9 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c3f0: 0x104c3f0: cibyl_sysc 0x81c
+// 0x0104c400: 0x104c400: cibyl_sysc 0x81c
 	call void [WazeWP7]Syscalls::NOPH_ProgressMessageDialog_hideDialog()
-// 0x0104c3f4: 0x104c3f4: jr    ra addu  v1, v0, zero
+// 0x0104c404: 0x104c404: jr    ra addu  v1, v0, zero
 	ldloc.0
 	stloc.1
 	br __CIBYL_function_return
@@ -4318,7 +4318,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 ssd_progress_msg_dialog_show_timed_104c3fc(int32,int32,int32,int32,int32)
+.method public static int32 ssd_progress_msg_dialog_show_timed_104c40c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 lo,int32[] mem,int32 v1)
@@ -4356,36 +4356,36 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c3fc: 0x104c3fc: addiu sp, sp, -24
+// 0x0104c40c: 0x104c40c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c400: 0x104c400: sw    ra, 20(sp)
-// 0x0104c404: 0x104c404: cibyl_sysc_arg 0x4
+// 0x0104c410: 0x104c410: sw    ra, 20(sp)
+// 0x0104c414: 0x104c414: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104c408: 0x104c408: cibyl_sysc 0x842
+// 0x0104c418: 0x104c418: cibyl_sysc 0x842
 	call void [WazeWP7]Syscalls::NOPH_ProgressMessageDialog_showDialog(int32)
-// 0x0104c40c: 0x104c40c: addu  a0, v0, zero
+// 0x0104c41c: 0x104c41c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104c410: 0x104c410: addiu a0, zero, 1000
+// 0x0104c420: 0x104c420: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x0104c414: 0x104c414: mult  a1, a0
+// 0x0104c424: 0x104c424: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 7
-// 0x0104c418: 0x104c418: lui   a1, 0x1050000
+// 0x0104c428: 0x104c428: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0104c41c: 0x104c41c: mflo  lo
+// 0x0104c42c: 0x104c42c: mflo  lo
 	ldloc 7
 	stloc.1
-// 0x0104c420: 0x104c420: jal   0x104fe98 addiu a1, a1, -15304
+// 0x0104c430: 0x104c430: jal   0x104fea8 addiu a1, a1, -15288
 	ldloc.2
-	ldc.i4 -15304
+	ldc.i4 -15288
 	add
 	stloc.2
 	ldloc.0
@@ -4393,14 +4393,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104c428: 0x104c428: lw    ra, 20(sp)
-// 0x0104c42c: 0x104c42c: sll   zero, zero, 0
-// 0x0104c430: 0x104c430: jr    ra addiu sp, sp, 24
+// 0x0104c438: 0x104c438: lw    ra, 20(sp)
+// 0x0104c43c: 0x104c43c: sll   zero, zero, 0
+// 0x0104c440: 0x104c440: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4412,7 +4412,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 hide_timer_104c438(int32,int32,int32,int32,int32)
+.method public static int32 hide_timer_104c448(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4447,23 +4447,23 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c438: 0x104c438: addiu sp, sp, -24
+// 0x0104c448: 0x104c448: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c43c: 0x104c43c: sw    ra, 20(sp)
-// 0x0104c440: 0x104c440: cibyl_sysc 0x868
+// 0x0104c44c: 0x104c44c: sw    ra, 20(sp)
+// 0x0104c450: 0x104c450: cibyl_sysc 0x868
 	call void [WazeWP7]Syscalls::NOPH_ProgressMessageDialog_hideDialog()
-// 0x0104c444: 0x104c444: addu  v1, v0, zero
+// 0x0104c454: 0x104c454: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104c448: 0x104c448: lui   a0, 0x1050000
+// 0x0104c458: 0x104c458: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104c44c: 0x104c44c: jal   0x104fd00 addiu a0, a0, -15304
+// 0x0104c45c: 0x104c45c: jal   0x104fd10 addiu a0, a0, -15288
 	ldloc.1
-	ldc.i4 -15304
+	ldc.i4 -15288
 	add
 	stloc.1
 	ldloc.0
@@ -4471,14 +4471,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104c454: 0x104c454: lw    ra, 20(sp)
-// 0x0104c458: 0x104c458: sll   zero, zero, 0
-// 0x0104c45c: 0x104c45c: jr    ra addiu sp, sp, 24
+// 0x0104c464: 0x104c464: lw    ra, 20(sp)
+// 0x0104c468: 0x104c468: sll   zero, zero, 0
+// 0x0104c46c: 0x104c46c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4490,7 +4490,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_path_list_104c464()
+.method public static int32 roadmap_path_list_104c474()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4504,12 +4504,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c464: 0x104c464: lui   v0, 0x70000
+// 0x0104c474: 0x104c474: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0104c468: 0x104c468: jr    ra addiu v0, v0, -4196
+// 0x0104c478: 0x104c478: jr    ra addiu v0, v0, -3732
 	ldloc.0
-	ldc.i4 -4196
+	ldc.i4 -3732
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -4517,7 +4517,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 file_connection_path_104c498(int32,int32,int32,int32,int32)
+.method public static int32 file_connection_path_104c4a8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4552,13 +4552,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c498: 0x104c498: lui   a0, 0x0
+// 0x0104c4a8: 0x104c4a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104c49c: 0x104c49c: lui   a1, 0x70000
+// 0x0104c4ac: 0x104c4ac: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0104c4a0: 0x104c4a0: lw    a2, 13708(a0)
+// 0x0104c4b0: 0x104c4b0: lw    a2, 13708(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4567,30 +4567,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104c4a4: 0x104c4a4: addiu sp, sp, -24
+// 0x0104c4b4: 0x104c4b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c4a8: 0x104c4a8: addiu v1, a1, -4508
+// 0x0104c4b8: 0x104c4b8: addiu v1, a1, -4044
 	ldloc.2
-	ldc.i4 -4508
+	ldc.i4 -4044
 	add
 	stloc 6
-// 0x0104c4ac: 0x104c4ac: sw    ra, 20(sp)
-// 0x0104c4b0: 0x104c4b0: beq   a2, zero, 0x104c4f4 addu  v0, v1, zero
+// 0x0104c4bc: 0x104c4bc: sw    ra, 20(sp)
+// 0x0104c4c0: 0x104c4c0: beq   a2, zero, 0x104c504 addu  v0, v1, zero
 	ldloc.3
 	ldloc 6
 	stloc 5
-	brfalse L_104c4f4
+	brfalse L_104c504
 // --- basic block ---
-// 0x0104c4b8: 0x104c4b8: sb    zero, -4508(a1)
+// 0x0104c4c8: 0x104c4c8: sb    zero, -4044(a1)
 	ldloc.2
-	ldc.i4 -4508
+	ldc.i4 -4044
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104c4bc: 0x104c4bc: sw    zero, 13708(a0)
+// 0x0104c4cc: 0x104c4cc: sw    zero, 13708(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4599,31 +4599,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104c4c0: 0x104c4c0: cibyl_sysc_arg 0x3
+// 0x0104c4d0: 0x104c4d0: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104c4c4: 0x104c4c4: cibyl_sysc 0x88e
+// 0x0104c4d4: 0x104c4d4: cibyl_sysc 0x88e
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_fileConnectionPath(int32)
 	stloc 5
-// 0x0104c4c8: 0x104c4c8: addu  a0, v0, zero
+// 0x0104c4d8: 0x104c4d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104c4cc: 0x104c4cc: bne   a0, zero, 0x104c4ec addu  a0, a0, v1
+// 0x0104c4dc: 0x104c4dc: bne   a0, zero, 0x104c4fc addu  a0, a0, v1
 	ldloc.1
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-	brtrue L_104c4ec
+	brtrue L_104c4fc
 // --- basic block ---
-// 0x0104c4d4: 0x104c4d4: lui   a0, 0x10000
+// 0x0104c4e4: 0x104c4e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104c4d8: 0x104c4d8: addiu a0, a0, 2968
+// 0x0104c4e8: 0x104c4e8: addiu a0, a0, 2964
 	ldloc.1
-	ldc.i4 2968
+	ldc.i4 2964
 	add
 	stloc.1
-// 0x0104c4dc: 0x104c4dc: jal   0x1000e78 addiu a1, zero, 1
+// 0x0104c4ec: 0x104c4ec: jal   0x1000e78 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4636,23 +4636,23 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c4e4: 0x104c4e4: j	 0x104c4f4 addu  v0, zero, zero
+// 0x0104c4f4: 0x104c4f4: j	 0x104c504 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_104c4f4
+	br L_104c504
 // --- basic block ---
-L_104c4ec:
-// 0x0104c4ec: 0x104c4ec: sb    zero, 0(a0)
+L_104c4fc:
+// 0x0104c4fc: 0x104c4fc: sb    zero, 0(a0)
 	ldloc.1
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104c4f0: 0x104c4f0: addu  v0, v1, zero
+// 0x0104c500: 0x104c500: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-L_104c4f4:
-// 0x0104c4f4: 0x104c4f4: lw    ra, 20(sp)
-// 0x0104c4f8: 0x104c4f8: sll   zero, zero, 0
-// 0x0104c4fc: 0x104c4fc: jr    ra addiu sp, sp, 24
+L_104c504:
+// 0x0104c504: 0x104c504: lw    ra, 20(sp)
+// 0x0104c508: 0x104c508: sll   zero, zero, 0
+// 0x0104c50c: 0x104c50c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4664,7 +4664,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_debug_104c504(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_debug_104c514(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4699,26 +4699,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c504: 0x104c504: addiu sp, sp, -24
+// 0x0104c514: 0x104c514: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c508: 0x104c508: sw    ra, 20(sp)
-// 0x0104c50c: 0x104c50c: jal   0x104c498 sll   zero, zero, 0
+// 0x0104c518: 0x104c518: sw    ra, 20(sp)
+// 0x0104c51c: 0x104c51c: jal   0x104c4a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::file_connection_path_104c498(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::file_connection_path_104c4a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104c514: 0x104c514: lw    ra, 20(sp)
-// 0x0104c518: 0x104c518: sll   zero, zero, 0
-// 0x0104c51c: 0x104c51c: jr    ra addiu sp, sp, 24
+// 0x0104c524: 0x104c524: lw    ra, 20(sp)
+// 0x0104c528: 0x104c528: sll   zero, zero, 0
+// 0x0104c52c: 0x104c52c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4730,7 +4730,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4765,26 +4765,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c524: 0x104c524: addiu sp, sp, -24
+// 0x0104c534: 0x104c534: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c528: 0x104c528: sw    ra, 20(sp)
-// 0x0104c52c: 0x104c52c: jal   0x104c498 sll   zero, zero, 0
+// 0x0104c538: 0x104c538: sw    ra, 20(sp)
+// 0x0104c53c: 0x104c53c: jal   0x104c4a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::file_connection_path_104c498(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::file_connection_path_104c4a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104c534: 0x104c534: lw    ra, 20(sp)
-// 0x0104c538: 0x104c538: sll   zero, zero, 0
-// 0x0104c53c: 0x104c53c: jr    ra addiu sp, sp, 24
+// 0x0104c544: 0x104c544: lw    ra, 20(sp)
+// 0x0104c548: 0x104c548: sll   zero, zero, 0
+// 0x0104c54c: 0x104c54c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4796,7 +4796,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_path_gps_104c544(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_gps_104c554(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4831,26 +4831,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c544: 0x104c544: addiu sp, sp, -24
+// 0x0104c554: 0x104c554: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c548: 0x104c548: sw    ra, 20(sp)
-// 0x0104c54c: 0x104c54c: jal   0x104c498 sll   zero, zero, 0
+// 0x0104c558: 0x104c558: sw    ra, 20(sp)
+// 0x0104c55c: 0x104c55c: jal   0x104c4a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::file_connection_path_104c498(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::file_connection_path_104c4a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104c554: 0x104c554: lw    ra, 20(sp)
-// 0x0104c558: 0x104c558: sll   zero, zero, 0
-// 0x0104c55c: 0x104c55c: jr    ra addiu sp, sp, 24
+// 0x0104c564: 0x104c564: lw    ra, 20(sp)
+// 0x0104c568: 0x104c568: sll   zero, zero, 0
+// 0x0104c56c: 0x104c56c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4862,7 +4862,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -4897,39 +4897,39 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c564: 0x104c564: addiu sp, sp, -24
+// 0x0104c574: 0x104c574: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c568: 0x104c568: sw    ra, 20(sp)
-// 0x0104c56c: 0x104c56c: jal   0x104c498 sll   zero, zero, 0
+// 0x0104c578: 0x104c578: sw    ra, 20(sp)
+// 0x0104c57c: 0x104c57c: jal   0x104c4a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::file_connection_path_104c498(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::file_connection_path_104c4a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104c574: 0x104c574: bne   v0, zero, 0x104c584 sll   zero, zero, 0
+// 0x0104c584: 0x104c584: bne   v0, zero, 0x104c594 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104c584
+	brtrue L_104c594
 // --- basic block ---
-// 0x0104c57c: 0x104c57c: lui   v0, 0x10000
+// 0x0104c58c: 0x104c58c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104c580: 0x104c580: addiu v0, v0, 3044
+// 0x0104c590: 0x104c590: addiu v0, v0, 3040
 	ldloc 5
-	ldc.i4 3044
+	ldc.i4 3040
 	add
 	stloc 5
-L_104c584:
-// 0x0104c584: 0x104c584: lw    ra, 20(sp)
-// 0x0104c588: 0x104c588: sll   zero, zero, 0
-// 0x0104c58c: 0x104c58c: jr    ra addiu sp, sp, 24
+L_104c594:
+// 0x0104c594: 0x104c594: lw    ra, 20(sp)
+// 0x0104c598: 0x104c598: sll   zero, zero, 0
+// 0x0104c59c: 0x104c59c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4941,7 +4941,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_config_104c594(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_config_104c5a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4976,26 +4976,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c594: 0x104c594: addiu sp, sp, -24
+// 0x0104c5a4: 0x104c5a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c598: 0x104c598: sw    ra, 20(sp)
-// 0x0104c59c: 0x104c59c: jal   0x104c564 sll   zero, zero, 0
+// 0x0104c5a8: 0x104c5a8: sw    ra, 20(sp)
+// 0x0104c5ac: 0x104c5ac: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104c5a4: 0x104c5a4: lw    ra, 20(sp)
-// 0x0104c5a8: 0x104c5a8: sll   zero, zero, 0
-// 0x0104c5ac: 0x104c5ac: jr    ra addiu sp, sp, 24
+// 0x0104c5b4: 0x104c5b4: lw    ra, 20(sp)
+// 0x0104c5b8: 0x104c5b8: sll   zero, zero, 0
+// 0x0104c5bc: 0x104c5bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5007,7 +5007,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5042,13 +5042,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c670: 0x104c670: addiu sp, sp, -24
+// 0x0104c680: 0x104c680: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104c674: 0x104c674: sw    ra, 20(sp)
-// 0x0104c678: 0x104c678: jal   0x1000930 sll   zero, zero, 0
+// 0x0104c684: 0x104c684: sw    ra, 20(sp)
+// 0x0104c688: 0x104c688: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5059,9 +5059,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104c680: 0x104c680: lw    ra, 20(sp)
-// 0x0104c684: 0x104c684: sll   zero, zero, 0
-// 0x0104c688: 0x104c688: jr    ra addiu sp, sp, 24
+// 0x0104c690: 0x104c690: lw    ra, 20(sp)
+// 0x0104c694: 0x104c694: sll   zero, zero, 0
+// 0x0104c698: 0x104c698: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5073,7 +5073,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_path_list_free_104c690(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_list_free_104c6a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 ra,int32 v1)
@@ -5114,12 +5114,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c690: 0x104c690: addiu sp, sp, -32
+// 0x0104c6a0: 0x104c6a0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104c694: 0x104c694: sw    s0, 20(sp)
+// 0x0104c6a4: 0x104c6a4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5128,8 +5128,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104c698: 0x104c698: sw    ra, 28(sp)
-// 0x0104c69c: 0x104c69c: sw    s1, 24(sp)
+// 0x0104c6a8: 0x104c6a8: sw    ra, 28(sp)
+// 0x0104c6ac: 0x104c6ac: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5138,32 +5138,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104c6a0: 0x104c6a0: beq   a0, zero, 0x104c6e0 addu  s0, a0, zero
+// 0x0104c6b0: 0x104c6b0: beq   a0, zero, 0x104c6f0 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_104c6e0
+	brfalse L_104c6f0
 // --- basic block ---
-// 0x0104c6a8: 0x104c6a8: lui   v0, 0x70000
+// 0x0104c6b8: 0x104c6b8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104c6ac: 0x104c6ac: addiu v0, v0, -4196
+// 0x0104c6bc: 0x104c6bc: addiu v0, v0, -3732
 	ldloc 5
-	ldc.i4 -4196
+	ldc.i4 -3732
 	add
 	stloc 5
-// 0x0104c6b0: 0x104c6b0: bne   a0, v0, 0x104c6c8 addu  s1, a0, zero
+// 0x0104c6c0: 0x104c6c0: bne   a0, v0, 0x104c6d8 addu  s1, a0, zero
 	ldloc.1
 	ldloc 5
 	ldloc.1
 	stloc 7
-	bne.un L_104c6c8
+	bne.un L_104c6d8
 // --- basic block ---
-// 0x0104c6b8: 0x104c6b8: j	 0x104c6e0 sll   zero, zero, 0
-	br L_104c6e0
+// 0x0104c6c8: 0x104c6c8: j	 0x104c6f0 sll   zero, zero, 0
+	br L_104c6f0
 // --- basic block ---
-L_104c6c0:
-// 0x0104c6c0: 0x104c6c0: jal   0x1000930 sll   zero, zero, 0
+L_104c6d0:
+// 0x0104c6d0: 0x104c6d0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5174,26 +5174,26 @@ L_104c6c0:
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_104c6c8:
-// 0x0104c6c8: 0x104c6c8: lw    v0, 0(s1)
+L_104c6d8:
+// 0x0104c6d8: 0x104c6d8: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104c6cc: 0x104c6cc: addiu s1, s1, 4
+// 0x0104c6dc: 0x104c6dc: addiu s1, s1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x0104c6d0: 0x104c6d0: bne   v0, zero, 0x104c6c0 addu  a0, v0, zero
+// 0x0104c6e0: 0x104c6e0: bne   v0, zero, 0x104c6d0 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brtrue L_104c6c0
+	brtrue L_104c6d0
 // --- basic block ---
-// 0x0104c6d8: 0x104c6d8: jal   0x1000930 addu  a0, s0, zero
+// 0x0104c6e8: 0x104c6e8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5206,9 +5206,9 @@ L_104c6c8:
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_104c6e0:
-// 0x0104c6e0: 0x104c6e0: lw    ra, 28(sp)
-// 0x0104c6e4: 0x104c6e4: lw    s1, 24(sp)
+L_104c6f0:
+// 0x0104c6f0: 0x104c6f0: lw    ra, 28(sp)
+// 0x0104c6f4: 0x104c6f4: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5217,7 +5217,7 @@ L_104c6e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104c6e8: 0x104c6e8: lw    s0, 20(sp)
+// 0x0104c6f8: 0x104c6f8: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5226,7 +5226,7 @@ L_104c6e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104c6ec: 0x104c6ec: jr    ra addiu sp, sp, 32
+// 0x0104c6fc: 0x104c6fc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5238,7 +5238,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_create_104c6f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_create_104c704(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s3,int32 s2,int32 ra)
@@ -5285,20 +5285,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c6f4: 0x104c6f4: lui   a1, 0x10000
+// 0x0104c704: 0x104c704: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104c6f8: 0x104c6f8: addiu sp, sp, -112
+// 0x0104c708: 0x104c708: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x0104c6fc: 0x104c6fc: addiu a1, a1, 3112
+// 0x0104c70c: 0x104c70c: addiu a1, a1, 3108
 	ldloc.2
-	ldc.i4 3112
+	ldc.i4 3108
 	add
 	stloc.2
-// 0x0104c700: 0x104c700: sw    s1, 96(sp)
+// 0x0104c710: 0x104c710: sw    s1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5307,7 +5307,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104c704: 0x104c704: sw    s0, 92(sp)
+// 0x0104c714: 0x104c714: sw    s0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5316,11 +5316,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104c708: 0x104c708: sw    ra, 108(sp)
-// 0x0104c70c: 0x104c70c: addu  s0, a0, zero
+// 0x0104c718: 0x104c718: sw    ra, 108(sp)
+// 0x0104c71c: 0x104c71c: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0104c710: 0x104c710: sw    s3, 104(sp)
+// 0x0104c720: 0x104c720: sw    s3, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5329,7 +5329,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104c714: 0x104c714: jal   0x1000420 sw    s2, 100(sp)
+// 0x0104c724: 0x104c724: jal   0x1000420 sw    s2, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5348,28 +5348,28 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104c71c: 0x104c71c: addiu s1, sp, 24
+// 0x0104c72c: 0x104c72c: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x0104c720: 0x104c720: bne   v0, zero, 0x104c764 addiu a0, s0, 12
+// 0x0104c730: 0x104c730: bne   v0, zero, 0x104c774 addiu a0, s0, 12
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc.1
-	brtrue L_104c764
+	brtrue L_104c774
 // --- basic block ---
-// 0x0104c728: 0x104c728: lui   a1, 0x10000
+// 0x0104c738: 0x104c738: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104c72c: 0x104c72c: addiu a1, a1, 3128
+// 0x0104c73c: 0x104c73c: addiu a1, a1, 3124
 	ldloc.2
-	ldc.i4 3128
+	ldc.i4 3124
 	add
 	stloc.2
-// 0x0104c730: 0x104c730: jal   0x1001b14 addu  a0, s0, zero
+// 0x0104c740: 0x104c740: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -5377,32 +5377,32 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c738: 0x104c738: beq   v0, zero, 0x104c7d8 lui   a1, 0x10000
+// 0x0104c748: 0x104c748: beq   v0, zero, 0x104c7e8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_104c7d8
+	brfalse L_104c7e8
 // --- basic block ---
-// 0x0104c740: 0x104c740: lui   a3, 0x10000
+// 0x0104c750: 0x104c750: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104c744: 0x104c744: addiu a1, a1, 3144
+// 0x0104c754: 0x104c754: addiu a1, a1, 3140
 	ldloc.2
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.2
-// 0x0104c748: 0x104c748: addiu a3, a3, 3160
+// 0x0104c758: 0x104c758: addiu a3, a3, 3156
 	ldloc 4
-	ldc.i4 3160
+	ldc.i4 3156
 	add
 	stloc 4
-// 0x0104c74c: 0x104c74c: addiu a0, zero, 4
+// 0x0104c75c: 0x104c75c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104c750: 0x104c750: addiu a2, zero, 525
+// 0x0104c760: 0x104c760: addiu a2, zero, 525
 	ldc.i4 525
 	stloc.3
-// 0x0104c754: 0x104c754: jal   0x100449c sw    s0, 16(sp)
+// 0x0104c764: 0x104c764: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5421,11 +5421,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104c75c: 0x104c75c: j	 0x104c7d8 sll   zero, zero, 0
-	br L_104c7d8
+// 0x0104c76c: 0x104c76c: j	 0x104c7e8 sll   zero, zero, 0
+	br L_104c7e8
 // --- basic block ---
-L_104c764:
-// 0x0104c764: 0x104c764: jal   0x1001a5c addiu a1, zero, 47
+L_104c774:
+// 0x0104c774: 0x104c774: jal   0x1001a5c addiu a1, zero, 47
 	ldc.i4.s 47
 	stloc.2
 	ldloc.1
@@ -5435,27 +5435,27 @@ L_104c764:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104c76c: 0x104c76c: subu  s3, v0, s0
+// 0x0104c77c: 0x104c77c: subu  s3, v0, s0
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 10
-// 0x0104c770: 0x104c770: addu  s2, v0, zero
+// 0x0104c780: 0x104c780: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0104c774: 0x104c774: addu  a0, s1, zero
+// 0x0104c784: 0x104c784: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104c778: 0x104c778: addu  a1, s0, zero
+// 0x0104c788: 0x104c788: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x0104c77c: 0x104c77c: beq   v0, zero, 0x104c7b8 addu  a2, s3, zero
+// 0x0104c78c: 0x104c78c: beq   v0, zero, 0x104c7c8 addu  a2, s3, zero
 	ldloc 5
 	ldloc 10
 	stloc.3
-	brfalse L_104c7b8
+	brfalse L_104c7c8
 // --- basic block ---
-// 0x0104c784: 0x104c784: jal   0x1001af8 addu  s3, s1, s3
+// 0x0104c794: 0x104c794: jal   0x1001af8 addu  s3, s1, s3
 	ldloc 9
 	ldloc 10
 	add
@@ -5466,62 +5466,62 @@ L_104c764:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c78c: 0x104c78c: sb    zero, 0(s3)
+// 0x0104c79c: 0x104c79c: sb    zero, 0(s3)
 	ldloc 10
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104c790: 0x104c790: cibyl_sysc_arg 0x11
+// 0x0104c7a0: 0x104c7a0: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x0104c794: 0x104c794: cibyl_sysc 0x8b1
+// 0x0104c7a4: 0x104c7a4: cibyl_sysc 0x8b1
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_pathExists(int32)
 	stloc 5
-// 0x0104c798: 0x104c798: addu  v1, v0, zero
+// 0x0104c7a8: 0x104c7a8: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104c79c: 0x104c79c: bne   v1, zero, 0x104c7b0 sll   zero, zero, 0
+// 0x0104c7ac: 0x104c7ac: bne   v1, zero, 0x104c7c0 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_104c7b0
+	brtrue L_104c7c0
 // --- basic block ---
-// 0x0104c7a4: 0x104c7a4: cibyl_sysc_arg 0x11
+// 0x0104c7b4: 0x104c7b4: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x0104c7a8: 0x104c7a8: cibyl_sysc 0x8cc
+// 0x0104c7b8: 0x104c7b8: cibyl_sysc 0x8cc
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_createPath(int32)
 	stloc 5
-// 0x0104c7ac: 0x104c7ac: addu  v1, v0, zero
+// 0x0104c7bc: 0x104c7bc: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-L_104c7b0:
-// 0x0104c7b0: 0x104c7b0: j	 0x104c764 addiu a0, s2, 1
+L_104c7c0:
+// 0x0104c7c0: 0x104c7c0: j	 0x104c774 addiu a0, s2, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc.1
-	br L_104c764
+	br L_104c774
 // --- basic block ---
-L_104c7b8:
-// 0x0104c7b8: 0x104c7b8: cibyl_sysc_arg 0x10
+L_104c7c8:
+// 0x0104c7c8: 0x104c7c8: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x0104c7bc: 0x104c7bc: cibyl_sysc 0x8e7
+// 0x0104c7cc: 0x104c7cc: cibyl_sysc 0x8e7
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_pathExists(int32)
 	stloc 5
-// 0x0104c7c0: 0x104c7c0: addu  v1, v0, zero
+// 0x0104c7d0: 0x104c7d0: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104c7c4: 0x104c7c4: bne   v1, zero, 0x104c7d8 sll   zero, zero, 0
+// 0x0104c7d4: 0x104c7d4: bne   v1, zero, 0x104c7e8 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_104c7d8
+	brtrue L_104c7e8
 // --- basic block ---
-// 0x0104c7cc: 0x104c7cc: cibyl_sysc_arg 0x10
+// 0x0104c7dc: 0x104c7dc: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x0104c7d0: 0x104c7d0: cibyl_sysc 0x902
+// 0x0104c7e0: 0x104c7e0: cibyl_sysc 0x902
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_createPath(int32)
 	stloc 5
-// 0x0104c7d4: 0x104c7d4: addu  s0, v0, zero
+// 0x0104c7e4: 0x104c7e4: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-L_104c7d8:
-// 0x0104c7d8: 0x104c7d8: lw    ra, 108(sp)
-// 0x0104c7dc: 0x104c7dc: lw    s3, 104(sp)
+L_104c7e8:
+// 0x0104c7e8: 0x104c7e8: lw    ra, 108(sp)
+// 0x0104c7ec: 0x104c7ec: lw    s3, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5530,7 +5530,7 @@ L_104c7d8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104c7e0: 0x104c7e0: lw    s2, 100(sp)
+// 0x0104c7f0: 0x104c7f0: lw    s2, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5539,7 +5539,7 @@ L_104c7d8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104c7e4: 0x104c7e4: lw    s1, 96(sp)
+// 0x0104c7f4: 0x104c7f4: lw    s1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5548,7 +5548,7 @@ L_104c7d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c7e8: 0x104c7e8: lw    s0, 92(sp)
+// 0x0104c7f8: 0x104c7f8: lw    s0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5557,7 +5557,7 @@ L_104c7d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104c7ec: 0x104c7ec: jr    ra addiu sp, sp, 112
+// 0x0104c7fc: 0x104c7fc: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -5569,7 +5569,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_expand_104c7f4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_expand_104c804(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s0,int32 s1,int32 s2,int32 s4,int32 ra)
@@ -5619,24 +5619,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c7f4: 0x104c7f4: lui   v0, 0x70000
+// 0x0104c804: 0x104c804: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104c7f8: 0x104c7f8: lw    v1, -4188(v0)
+// 0x0104c808: 0x104c808: lw    v1, -3724(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1047
+	ldc.i4 -931
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c7fc: 0x104c7fc: addiu sp, sp, -40
+// 0x0104c80c: 0x104c80c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104c800: 0x104c800: sw    s1, 20(sp)
+// 0x0104c810: 0x104c810: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5645,7 +5645,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104c804: 0x104c804: sw    s0, 16(sp)
+// 0x0104c814: 0x104c814: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5654,8 +5654,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104c808: 0x104c808: sw    ra, 36(sp)
-// 0x0104c80c: 0x104c80c: sw    s4, 32(sp)
+// 0x0104c818: 0x104c818: sw    ra, 36(sp)
+// 0x0104c81c: 0x104c81c: sw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5664,7 +5664,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104c810: 0x104c810: sw    s3, 28(sp)
+// 0x0104c820: 0x104c820: sw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5673,7 +5673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104c814: 0x104c814: sw    s2, 24(sp)
+// 0x0104c824: 0x104c824: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5682,71 +5682,71 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104c818: 0x104c818: addu  s0, a0, zero
+// 0x0104c828: 0x104c828: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0104c81c: 0x104c81c: bne   v1, zero, 0x104c82c addu  s1, a1, zero
+// 0x0104c82c: 0x104c82c: bne   v1, zero, 0x104c83c addu  s1, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 10
-	brtrue L_104c82c
+	brtrue L_104c83c
 // --- basic block ---
-// 0x0104c824: 0x104c824: addiu v1, zero, 14
+// 0x0104c834: 0x104c834: addiu v1, zero, 14
 	ldc.i4.s 14
 	stloc 6
-// 0x0104c828: 0x104c828: sw    v1, -4188(v0)
+// 0x0104c838: 0x104c838: sw    v1, -3724(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1047
+	ldc.i4 -931
 	add
 	ldloc 6
 	stelem.i4
-L_104c82c:
-// 0x0104c82c: 0x104c82c: lb    v0, 0(s0)
+L_104c83c:
+// 0x0104c83c: 0x104c83c: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104c830: 0x104c830: addiu v1, zero, 38
+// 0x0104c840: 0x104c840: addiu v1, zero, 38
 	ldc.i4.s 38
 	stloc 6
-// 0x0104c834: 0x104c834: beq   v0, v1, 0x104c858 addiu v1, zero, 126
+// 0x0104c844: 0x104c844: beq   v0, v1, 0x104c868 addiu v1, zero, 126
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 126
 	stloc 6
-	beq  L_104c858
+	beq  L_104c868
 // --- basic block ---
-// 0x0104c83c: 0x104c83c: bne   v0, v1, 0x104c86c lui   a1, 0x10000
+// 0x0104c84c: 0x104c84c: bne   v0, v1, 0x104c87c lui   a1, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	bne.un L_104c86c
+	bne.un L_104c87c
 // --- basic block ---
-// 0x0104c844: 0x104c844: lui   s3, 0x10000
+// 0x0104c854: 0x104c854: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0104c848: 0x104c848: addiu s0, s0, 1
+// 0x0104c858: 0x104c858: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0104c84c: 0x104c84c: addiu s1, s1, -1
+// 0x0104c85c: 0x104c85c: addiu s1, s1, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0104c850: 0x104c850: j	 0x104c8e0 addiu s3, s3, -29244
+// 0x0104c860: 0x104c860: j	 0x104c8f0 addiu s3, s3, -29244
 	ldloc 8
 	ldc.i4 -29244
 	add
 	stloc 8
-	br L_104c8e0
+	br L_104c8f0
 // --- basic block ---
-L_104c858:
-// 0x0104c858: 0x104c858: jal   0x104c564 addiu s0, s0, 1
+L_104c868:
+// 0x0104c868: 0x104c868: jal   0x104c574 addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -5756,31 +5756,31 @@ L_104c858:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c860: 0x104c860: addiu s1, s1, -1
+// 0x0104c870: 0x104c870: addiu s1, s1, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0104c864: 0x104c864: j	 0x104c8e0 addu  s3, v0, zero
+// 0x0104c874: 0x104c874: j	 0x104c8f0 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-	br L_104c8e0
+	br L_104c8f0
 // --- basic block ---
-L_104c86c:
-// 0x0104c86c: 0x104c86c: addiu a1, a1, 3216
+L_104c87c:
+// 0x0104c87c: 0x104c87c: addiu a1, a1, 3212
 	ldloc.2
-	ldc.i4 3216
+	ldc.i4 3212
 	add
 	stloc.2
-// 0x0104c870: 0x104c870: addu  a0, s0, zero
+// 0x0104c880: 0x104c880: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0104c874: 0x104c874: jal   0x1001b2c addiu a2, zero, 5
+// 0x0104c884: 0x104c884: jal   0x1001b2c addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.1
@@ -5789,21 +5789,21 @@ L_104c86c:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c87c: 0x104c87c: beq   v0, zero, 0x104c8d8 lui   a1, 0x10000
+// 0x0104c88c: 0x104c88c: beq   v0, zero, 0x104c8e8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_104c8d8
+	brfalse L_104c8e8
 // --- basic block ---
-// 0x0104c884: 0x104c884: addiu a1, a1, 3224
+// 0x0104c894: 0x104c894: addiu a1, a1, 3220
 	ldloc.2
-	ldc.i4 3224
+	ldc.i4 3220
 	add
 	stloc.2
-// 0x0104c888: 0x104c888: addu  a0, s0, zero
+// 0x0104c898: 0x104c898: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0104c88c: 0x104c88c: jal   0x1001b2c addiu a2, zero, 9
+// 0x0104c89c: 0x104c89c: jal   0x1001b2c addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
 	ldloc.1
@@ -5812,21 +5812,21 @@ L_104c86c:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c894: 0x104c894: beq   v0, zero, 0x104c8d8 lui   a1, 0x10000
+// 0x0104c8a4: 0x104c8a4: beq   v0, zero, 0x104c8e8 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_104c8d8
+	brfalse L_104c8e8
 // --- basic block ---
-// 0x0104c89c: 0x104c89c: addiu a1, a1, 3236
+// 0x0104c8ac: 0x104c8ac: addiu a1, a1, 3232
 	ldloc.2
-	ldc.i4 3236
+	ldc.i4 3232
 	add
 	stloc.2
-// 0x0104c8a0: 0x104c8a0: addu  a0, s0, zero
+// 0x0104c8b0: 0x104c8b0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0104c8a4: 0x104c8a4: jal   0x1001b2c addiu a2, zero, 12
+// 0x0104c8b4: 0x104c8b4: jal   0x1001b2c addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
 	ldloc.1
@@ -5835,30 +5835,30 @@ L_104c86c:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c8ac: 0x104c8ac: beq   v0, zero, 0x104c8d8 lui   v0, 0x70000
+// 0x0104c8bc: 0x104c8bc: beq   v0, zero, 0x104c8e8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_104c8d8
+	brfalse L_104c8e8
 // --- basic block ---
-// 0x0104c8b4: 0x104c8b4: lui   a1, 0x10000
+// 0x0104c8c4: 0x104c8c4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104c8b8: 0x104c8b8: lw    a2, -4188(v0)
+// 0x0104c8c8: 0x104c8c8: lw    a2, -3724(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1047
+	ldc.i4 -931
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104c8bc: 0x104c8bc: addiu a1, a1, 3252
+// 0x0104c8cc: 0x104c8cc: addiu a1, a1, 3248
 	ldloc.2
-	ldc.i4 3252
+	ldc.i4 3248
 	add
 	stloc.2
-// 0x0104c8c0: 0x104c8c0: jal   0x1001b2c addu  a0, s0, zero
+// 0x0104c8d0: 0x104c8d0: jal   0x1001b2c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -5867,30 +5867,30 @@ L_104c86c:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c8c8: 0x104c8c8: beq   v0, zero, 0x104c8d8 lui   s3, 0x10000
+// 0x0104c8d8: 0x104c8d8: beq   v0, zero, 0x104c8e8 lui   s3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brfalse L_104c8d8
+	brfalse L_104c8e8
 // --- basic block ---
-// 0x0104c8d0: 0x104c8d0: j	 0x104c8e0 addiu s3, s3, 3268
+// 0x0104c8e0: 0x104c8e0: j	 0x104c8f0 addiu s3, s3, 3264
 	ldloc 8
-	ldc.i4 3268
+	ldc.i4 3264
 	add
 	stloc 8
-	br L_104c8e0
+	br L_104c8f0
 // --- basic block ---
-L_104c8d8:
-// 0x0104c8d8: 0x104c8d8: lui   s3, 0x10000
+L_104c8e8:
+// 0x0104c8e8: 0x104c8e8: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0104c8dc: 0x104c8dc: addiu s3, s3, 18500
+// 0x0104c8ec: 0x104c8ec: addiu s3, s3, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 8
-L_104c8e0:
-// 0x0104c8e0: 0x104c8e0: jal   0x1001b48 addu  a0, s3, zero
+L_104c8f0:
+// 0x0104c8f0: 0x104c8f0: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -5899,12 +5899,12 @@ L_104c8e0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c8e8: 0x104c8e8: addu  s4, v0, s1
+// 0x0104c8f8: 0x104c8f8: addu  s4, v0, s1
 	ldloc 5
 	ldloc 10
 	add
 	stloc 12
-// 0x0104c8ec: 0x104c8ec: jal   0x1000910 addiu a0, s4, 1
+// 0x0104c8fc: 0x104c8fc: jal   0x1000910 addiu a0, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
@@ -5919,21 +5919,21 @@ L_104c8e0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c8f4: 0x104c8f4: lui   a0, 0x10000
+// 0x0104c904: 0x104c904: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104c8f8: 0x104c8f8: addu  s2, v0, zero
+// 0x0104c908: 0x104c908: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0104c8fc: 0x104c8fc: addu  a2, v0, zero
+// 0x0104c90c: 0x104c90c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0104c900: 0x104c900: addiu a0, a0, 3144
+// 0x0104c910: 0x104c910: addiu a0, a0, 3140
 	ldloc.1
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.1
-// 0x0104c904: 0x104c904: jal   0x1004a38 addiu a1, zero, 359
+// 0x0104c914: 0x104c914: jal   0x1004a48 addiu a1, zero, 359
 	ldc.i4 359
 	stloc.2
 	ldloc.0
@@ -5941,15 +5941,15 @@ L_104c8e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c90c: 0x104c90c: addu  a0, s2, zero
+// 0x0104c91c: 0x104c91c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0104c910: 0x104c910: jal   0x1001b68 addu  a1, s3, zero
+// 0x0104c920: 0x104c920: jal   0x1001b68 addu  a1, s3, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
@@ -5959,18 +5959,18 @@ L_104c8e0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c918: 0x104c918: addu  s4, s2, s4
+// 0x0104c928: 0x104c928: addu  s4, s2, s4
 	ldloc 11
 	ldloc 12
 	add
 	stloc 12
-// 0x0104c91c: 0x104c91c: addu  a0, s2, zero
+// 0x0104c92c: 0x104c92c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0104c920: 0x104c920: addu  a1, s0, zero
+// 0x0104c930: 0x104c930: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0104c924: 0x104c924: jal   0x1001adc addu  a2, s1, zero
+// 0x0104c934: 0x104c934: jal   0x1001adc addu  a2, s1, zero
 	ldloc 10
 	stloc.3
 	ldloc.1
@@ -5979,15 +5979,15 @@ L_104c8e0:
 	call int32 Cibyl1::strncat_1001adc(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c92c: 0x104c92c: sb    zero, 0(s4)
+// 0x0104c93c: 0x104c93c: sb    zero, 0(s4)
 	ldloc 12
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104c930: 0x104c930: lw    ra, 36(sp)
-// 0x0104c934: 0x104c934: addu  v0, s2, zero
+// 0x0104c940: 0x104c940: lw    ra, 36(sp)
+// 0x0104c944: 0x104c944: addu  v0, s2, zero
 	ldloc 11
 	stloc 5
-// 0x0104c938: 0x104c938: lw    s4, 32(sp)
+// 0x0104c948: 0x104c948: lw    s4, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5996,7 +5996,7 @@ L_104c8e0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104c93c: 0x104c93c: lw    s3, 28(sp)
+// 0x0104c94c: 0x104c94c: lw    s3, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6005,7 +6005,7 @@ L_104c8e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104c940: 0x104c940: lw    s2, 24(sp)
+// 0x0104c950: 0x104c950: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6014,7 +6014,7 @@ L_104c8e0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104c944: 0x104c944: lw    s1, 20(sp)
+// 0x0104c954: 0x104c954: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6023,7 +6023,7 @@ L_104c8e0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104c948: 0x104c948: lw    s0, 16(sp)
+// 0x0104c958: 0x104c958: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6032,7 +6032,7 @@ L_104c8e0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c94c: 0x104c94c: jr    ra addiu sp, sp, 40
+// 0x0104c95c: 0x104c95c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6044,7 +6044,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_cat_104c954(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_cat_104c964(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s4,int32 s2,int32 s3,int32 s5,int32 ra)
@@ -6097,24 +6097,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104c954: 0x104c954: lui   v0, 0x70000
+// 0x0104c964: 0x104c964: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104c958: 0x104c958: lw    v1, -4188(v0)
+// 0x0104c968: 0x104c968: lw    v1, -3724(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1047
+	ldc.i4 -931
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104c95c: 0x104c95c: addiu sp, sp, -48
+// 0x0104c96c: 0x104c96c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104c960: 0x104c960: sw    s3, 32(sp)
+// 0x0104c970: 0x104c970: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6123,7 +6123,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104c964: 0x104c964: sw    s2, 28(sp)
+// 0x0104c974: 0x104c974: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6132,8 +6132,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104c968: 0x104c968: sw    ra, 44(sp)
-// 0x0104c96c: 0x104c96c: sw    s5, 40(sp)
+// 0x0104c978: 0x104c978: sw    ra, 44(sp)
+// 0x0104c97c: 0x104c97c: sw    s5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6142,7 +6142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104c970: 0x104c970: sw    s4, 36(sp)
+// 0x0104c980: 0x104c980: sw    s4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6151,7 +6151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104c974: 0x104c974: sw    s1, 24(sp)
+// 0x0104c984: 0x104c984: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6160,7 +6160,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104c978: 0x104c978: sw    s0, 20(sp)
+// 0x0104c988: 0x104c988: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6169,52 +6169,52 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104c97c: 0x104c97c: addu  s2, a0, zero
+// 0x0104c98c: 0x104c98c: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0104c980: 0x104c980: bne   v1, zero, 0x104c990 addu  s3, a1, zero
+// 0x0104c990: 0x104c990: bne   v1, zero, 0x104c9a0 addu  s3, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 12
-	brtrue L_104c990
+	brtrue L_104c9a0
 // --- basic block ---
-// 0x0104c988: 0x104c988: addiu v1, zero, 14
+// 0x0104c998: 0x104c998: addiu v1, zero, 14
 	ldc.i4.s 14
 	stloc 6
-// 0x0104c98c: 0x104c98c: sw    v1, -4188(v0)
+// 0x0104c99c: 0x104c99c: sw    v1, -3724(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1047
+	ldc.i4 -931
 	add
 	ldloc 6
 	stelem.i4
-L_104c990:
-// 0x0104c990: 0x104c990: lui   s0, 0x70000
+L_104c9a0:
+// 0x0104c9a0: 0x104c9a0: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104c994: 0x104c994: addu  s1, zero, zero
+// 0x0104c9a4: 0x104c9a4: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0104c998: 0x104c998: lui   a1, 0x10000
+// 0x0104c9a8: 0x104c9a8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104c99c: 0x104c99c: lw    a2, -4188(s0)
+// 0x0104c9ac: 0x104c9ac: lw    a2, -3724(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1047
+	ldc.i4 -931
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104c9a0: 0x104c9a0: addiu a1, a1, 3252
+// 0x0104c9b0: 0x104c9b0: addiu a1, a1, 3248
 	ldloc.2
-	ldc.i4 3252
+	ldc.i4 3248
 	add
 	stloc.2
-// 0x0104c9a4: 0x104c9a4: jal   0x1001b2c addu  a0, s1, zero
+// 0x0104c9b4: 0x104c9b4: jal   0x1001b2c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6223,11 +6223,11 @@ L_104c990:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104c9ac: 0x104c9ac: bne   v0, zero, 0x104c9f0 sll   zero, zero, 0
+// 0x0104c9bc: 0x104c9bc: bne   v0, zero, 0x104ca00 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104c9f0
+	brtrue L_104ca00
 // --- basic block ---
-// 0x0104c9b4: 0x104c9b4: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0104c9c4: 0x104c9c4: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -6240,24 +6240,24 @@ L_104c990:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c9bc: 0x104c9bc: lw    s1, -4188(s0)
+// 0x0104c9cc: 0x104c9cc: lw    s1, -3724(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1047
+	ldc.i4 -931
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104c9c0: 0x104c9c0: addiu s4, zero, 1
+// 0x0104c9d0: 0x104c9d0: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x0104c9c4: 0x104c9c4: addu  s1, v0, s1
+// 0x0104c9d4: 0x104c9d4: addu  s1, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x0104c9c8: 0x104c9c8: jal   0x1001b48 addu  a0, s1, zero
+// 0x0104c9d8: 0x104c9d8: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6266,10 +6266,10 @@ L_104c990:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c9d0: 0x104c9d0: addu  a0, s3, zero
+// 0x0104c9e0: 0x104c9e0: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x0104c9d4: 0x104c9d4: jal   0x1001b48 addu  s0, v0, zero
+// 0x0104c9e4: 0x104c9e4: jal   0x1001b48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -6278,12 +6278,12 @@ L_104c990:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c9dc: 0x104c9dc: addu  v0, s0, v0
+// 0x0104c9ec: 0x104c9ec: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x0104c9e0: 0x104c9e0: jal   0x1000910 addiu a0, v0, 4
+// 0x0104c9f0: 0x104c9f0: jal   0x1000910 addiu a0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
@@ -6298,13 +6298,13 @@ L_104c990:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c9e8: 0x104c9e8: j	 0x104ca18 addu  s0, v0, zero
+// 0x0104c9f8: 0x104c9f8: j	 0x104ca28 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	br L_104ca18
+	br L_104ca28
 // --- basic block ---
-L_104c9f0:
-// 0x0104c9f0: 0x104c9f0: jal   0x1001b48 addu  a0, s2, zero
+L_104ca00:
+// 0x0104ca00: 0x104ca00: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -6313,10 +6313,10 @@ L_104c9f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104c9f8: 0x104c9f8: addu  a0, s3, zero
+// 0x0104ca08: 0x104ca08: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x0104c9fc: 0x104c9fc: jal   0x1001b48 addu  s0, v0, zero
+// 0x0104ca0c: 0x104ca0c: jal   0x1001b48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -6325,12 +6325,12 @@ L_104c9f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104ca04: 0x104ca04: addu  v0, s0, v0
+// 0x0104ca14: 0x104ca14: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x0104ca08: 0x104ca08: jal   0x1000910 addiu a0, v0, 4
+// 0x0104ca18: 0x104ca18: jal   0x1000910 addiu a0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
@@ -6345,25 +6345,25 @@ L_104c9f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104ca10: 0x104ca10: addu  s0, v0, zero
+// 0x0104ca20: 0x104ca20: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104ca14: 0x104ca14: addu  s4, zero, zero
+// 0x0104ca24: 0x104ca24: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_104ca18:
-// 0x0104ca18: 0x104ca18: lui   a0, 0x10000
+L_104ca28:
+// 0x0104ca28: 0x104ca28: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104ca1c: 0x104ca1c: addiu a0, a0, 3144
+// 0x0104ca2c: 0x104ca2c: addiu a0, a0, 3140
 	ldloc.1
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.1
-// 0x0104ca20: 0x104ca20: addiu a1, zero, 210
+// 0x0104ca30: 0x104ca30: addiu a1, zero, 210
 	ldc.i4 210
 	stloc.2
-// 0x0104ca24: 0x104ca24: jal   0x1004a38 addu  a2, s0, zero
+// 0x0104ca34: 0x104ca34: jal   0x1004a48 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -6371,47 +6371,47 @@ L_104ca18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104ca2c: 0x104ca2c: beq   s4, zero, 0x104ca80 addu  s4, zero, zero
+// 0x0104ca3c: 0x104ca3c: beq   s4, zero, 0x104ca90 addu  s4, zero, zero
 	ldloc 10
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_104ca80
+	brfalse L_104ca90
 // --- basic block ---
-// 0x0104ca34: 0x104ca34: j	 0x104ca54 addiu s5, zero, 47
+// 0x0104ca44: 0x104ca44: j	 0x104ca64 addiu s5, zero, 47
 	ldc.i4.s 47
 	stloc 13
-	br L_104ca54
+	br L_104ca64
 // --- basic block ---
-L_104ca3c:
-// 0x0104ca3c: 0x104ca3c: lb    v0, 0(v1)
+L_104ca4c:
+// 0x0104ca4c: 0x104ca4c: lb    v0, 0(v1)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104ca40: 0x104ca40: sll   zero, zero, 0
-// 0x0104ca44: 0x104ca44: bne   v0, s5, 0x104ca50 addiu s4, s4, 1
+// 0x0104ca50: 0x104ca50: sll   zero, zero, 0
+// 0x0104ca54: 0x104ca54: bne   v0, s5, 0x104ca60 addiu s4, s4, 1
 	ldloc 5
 	ldloc 13
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	bne.un L_104ca50
+	bne.un L_104ca60
 // --- basic block ---
-// 0x0104ca4c: 0x104ca4c: addiu v0, zero, 95
+// 0x0104ca5c: 0x104ca5c: addiu v0, zero, 95
 	ldc.i4.s 95
 	stloc 5
-L_104ca50:
-// 0x0104ca50: 0x104ca50: sb    v0, 0(a0)
+L_104ca60:
+// 0x0104ca60: 0x104ca60: sb    v0, 0(a0)
 	ldloc.1
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_104ca54:
-// 0x0104ca54: 0x104ca54: jal   0x1001b48 addu  a0, s1, zero
+L_104ca64:
+// 0x0104ca64: 0x104ca64: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6420,29 +6420,29 @@ L_104ca54:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104ca5c: 0x104ca5c: sltu  v0, s4, v0
+// 0x0104ca6c: 0x104ca6c: sltu  v0, s4, v0
 	ldloc 10
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0104ca60: 0x104ca60: addu  v1, s1, s4
+// 0x0104ca70: 0x104ca70: addu  v1, s1, s4
 	ldloc 9
 	ldloc 10
 	add
 	stloc 6
-// 0x0104ca64: 0x104ca64: bne   v0, zero, 0x104ca3c addu  a0, s0, s4
+// 0x0104ca74: 0x104ca74: bne   v0, zero, 0x104ca4c addu  a0, s0, s4
 	ldloc 5
 	ldloc 8
 	ldloc 10
 	add
 	stloc.1
-	brtrue L_104ca3c
+	brtrue L_104ca4c
 // --- basic block ---
-// 0x0104ca6c: 0x104ca6c: sb    zero, 0(a0)
+// 0x0104ca7c: 0x104ca7c: sb    zero, 0(a0)
 	ldloc.1
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104ca70: 0x104ca70: jal   0x1000930 addu  a0, s1, zero
+// 0x0104ca80: 0x104ca80: jal   0x1000930 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6455,16 +6455,16 @@ L_104ca54:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104ca78: 0x104ca78: j	 0x104ca90 lui   s1, 0x20000
+// 0x0104ca88: 0x104ca88: j	 0x104caa0 lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-	br L_104ca90
+	br L_104caa0
 // --- basic block ---
-L_104ca80:
-// 0x0104ca80: 0x104ca80: addu  a0, s0, zero
+L_104ca90:
+// 0x0104ca90: 0x104ca90: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0104ca84: 0x104ca84: jal   0x1001b68 addu  a1, s2, zero
+// 0x0104ca94: 0x104ca94: jal   0x1001b68 addu  a1, s2, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
@@ -6474,16 +6474,16 @@ L_104ca80:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104ca8c: 0x104ca8c: lui   s1, 0x20000
+// 0x0104ca9c: 0x104ca9c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-L_104ca90:
-// 0x0104ca90: 0x104ca90: addu  a0, s2, zero
+L_104caa0:
+// 0x0104caa0: 0x104caa0: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0104ca94: 0x104ca94: jal   0x1001b14 addiu a1, s1, 23444
+// 0x0104caa4: 0x104caa4: jal   0x1001b14 addiu a1, s1, 23904
 	ldloc 9
-	ldc.i4 23444
+	ldc.i4 23904
 	add
 	stloc.2
 	ldloc.1
@@ -6491,18 +6491,18 @@ L_104ca90:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104ca9c: 0x104ca9c: beq   v0, zero, 0x104cab4 addu  a1, s3, zero
+// 0x0104caac: 0x104caac: beq   v0, zero, 0x104cac4 addu  a1, s3, zero
 	ldloc 5
 	ldloc 12
 	stloc.2
-	brfalse L_104cab4
+	brfalse L_104cac4
 // --- basic block ---
-// 0x0104caa4: 0x104caa4: addiu a1, s1, 23444
+// 0x0104cab4: 0x104cab4: addiu a1, s1, 23904
 	ldloc 9
-	ldc.i4 23444
+	ldc.i4 23904
 	add
 	stloc.2
-// 0x0104caa8: 0x104caa8: jal   0x1001ac4 addu  a0, s0, zero
+// 0x0104cab8: 0x104cab8: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -6510,11 +6510,11 @@ L_104ca90:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104cab0: 0x104cab0: addu  a1, s3, zero
+// 0x0104cac0: 0x104cac0: addu  a1, s3, zero
 	ldloc 12
 	stloc.2
-L_104cab4:
-// 0x0104cab4: 0x104cab4: jal   0x1001ac4 addu  a0, s0, zero
+L_104cac4:
+// 0x0104cac4: 0x104cac4: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -6522,11 +6522,11 @@ L_104cab4:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104cabc: 0x104cabc: lw    ra, 44(sp)
-// 0x0104cac0: 0x104cac0: addu  v0, s0, zero
+// 0x0104cacc: 0x104cacc: lw    ra, 44(sp)
+// 0x0104cad0: 0x104cad0: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0104cac4: 0x104cac4: lw    s5, 40(sp)
+// 0x0104cad4: 0x104cad4: lw    s5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6535,7 +6535,7 @@ L_104cab4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104cac8: 0x104cac8: lw    s4, 36(sp)
+// 0x0104cad8: 0x104cad8: lw    s4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6544,7 +6544,7 @@ L_104cab4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104cacc: 0x104cacc: lw    s3, 32(sp)
+// 0x0104cadc: 0x104cadc: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6553,7 +6553,7 @@ L_104cab4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104cad0: 0x104cad0: lw    s2, 28(sp)
+// 0x0104cae0: 0x104cae0: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6562,7 +6562,7 @@ L_104cab4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104cad4: 0x104cad4: lw    s1, 24(sp)
+// 0x0104cae4: 0x104cae4: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6571,7 +6571,7 @@ L_104cab4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104cad8: 0x104cad8: lw    s0, 20(sp)
+// 0x0104cae8: 0x104cae8: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6580,7 +6580,7 @@ L_104cab4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104cadc: 0x104cadc: jr    ra addiu sp, sp, 48
+// 0x0104caec: 0x104caec: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6592,7 +6592,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6627,29 +6627,29 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104cb30: 0x104cb30: addiu sp, sp, -24
+// 0x0104cb40: 0x104cb40: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104cb34: 0x104cb34: sw    ra, 20(sp)
-// 0x0104cb38: 0x104cb38: beq   a0, zero, 0x104cb50 addu  v1, a1, zero
+// 0x0104cb44: 0x104cb44: sw    ra, 20(sp)
+// 0x0104cb48: 0x104cb48: beq   a0, zero, 0x104cb60 addu  v1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 6
-	brfalse L_104cb50
+	brfalse L_104cb60
 // --- basic block ---
-// 0x0104cb40: 0x104cb40: lb    v0, 0(a0)
+// 0x0104cb50: 0x104cb50: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104cb44: 0x104cb44: sll   zero, zero, 0
-// 0x0104cb48: 0x104cb48: bne   v0, zero, 0x104cb60 sll   zero, zero, 0
+// 0x0104cb54: 0x104cb54: sll   zero, zero, 0
+// 0x0104cb58: 0x104cb58: bne   v0, zero, 0x104cb70 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104cb60
+	brtrue L_104cb70
 // --- basic block ---
-L_104cb50:
-// 0x0104cb50: 0x104cb50: jal   0x1001ba8 addu  a0, v1, zero
+L_104cb60:
+// 0x0104cb60: 0x104cb60: jal   0x1001ba8 addu  a0, v1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6662,25 +6662,25 @@ L_104cb50:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104cb58: 0x104cb58: j	 0x104cb68 sll   zero, zero, 0
-	br L_104cb68
+// 0x0104cb68: 0x104cb68: j	 0x104cb78 sll   zero, zero, 0
+	br L_104cb78
 // --- basic block ---
-L_104cb60:
-// 0x0104cb60: 0x104cb60: jal   0x104c954 sll   zero, zero, 0
+L_104cb70:
+// 0x0104cb70: 0x104cb70: jal   0x104c964 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_cat_104c954(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_cat_104c964(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104cb68:
-// 0x0104cb68: 0x104cb68: lw    ra, 20(sp)
-// 0x0104cb6c: 0x104cb6c: sll   zero, zero, 0
-// 0x0104cb70: 0x104cb70: jr    ra addiu sp, sp, 24
+L_104cb78:
+// 0x0104cb78: 0x104cb78: lw    ra, 20(sp)
+// 0x0104cb7c: 0x104cb7c: sll   zero, zero, 0
+// 0x0104cb80: 0x104cb80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6692,7 +6692,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_images_104cb78(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_images_104cb88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -6730,12 +6730,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104cb78: 0x104cb78: addiu sp, sp, -24
+// 0x0104cb88: 0x104cb88: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104cb7c: 0x104cb7c: sw    s0, 16(sp)
+// 0x0104cb8c: 0x104cb8c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6744,43 +6744,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104cb80: 0x104cb80: lui   s0, 0x70000
+// 0x0104cb90: 0x104cb90: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104cb84: 0x104cb84: lw    v0, -4456(s0)
+// 0x0104cb94: 0x104cb94: lw    v0, -3992(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1114
+	ldc.i4 -998
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104cb88: 0x104cb88: sll   zero, zero, 0
-// 0x0104cb8c: 0x104cb8c: bne   v0, zero, 0x104cbb8 sw    ra, 20(sp)
+// 0x0104cb98: 0x104cb98: sll   zero, zero, 0
+// 0x0104cb9c: 0x104cb9c: bne   v0, zero, 0x104cbc8 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_104cbb8
+	brtrue L_104cbc8
 // --- basic block ---
-// 0x0104cb94: 0x104cb94: jal   0x104c498 sll   zero, zero, 0
+// 0x0104cba4: 0x104cba4: jal   0x104c4a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::file_connection_path_104c498(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::file_connection_path_104c4a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104cb9c: 0x104cb9c: lui   a1, 0x10000
+// 0x0104cbac: 0x104cbac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104cba0: 0x104cba0: addu  a0, v0, zero
+// 0x0104cbb0: 0x104cbb0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104cba4: 0x104cba4: jal   0x104cb30 addiu a1, a1, 3280
+// 0x0104cbb4: 0x104cbb4: jal   0x104cb40 addiu a1, a1, 3276
 	ldloc.2
-	ldc.i4 3280
+	ldc.i4 3276
 	add
 	stloc.2
 	ldloc.0
@@ -6788,20 +6788,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104cbac: 0x104cbac: addu  a0, v0, zero
+// 0x0104cbbc: 0x104cbbc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104cbb0: 0x104cbb0: jal   0x104c6f4 sw    v0, -4456(s0)
+// 0x0104cbc0: 0x104cbc0: jal   0x104c704 sw    v0, -3992(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1114
+	ldc.i4 -998
 	add
 	ldloc 5
 	stelem.i4
@@ -6810,26 +6810,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_create_104c6f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_create_104c704(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_104cbb8:
-// 0x0104cbb8: 0x104cbb8: lw    ra, 20(sp)
-// 0x0104cbbc: 0x104cbbc: lui   v0, 0x70000
+L_104cbc8:
+// 0x0104cbc8: 0x104cbc8: lw    ra, 20(sp)
+// 0x0104cbcc: 0x104cbcc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104cbc0: 0x104cbc0: lw    v0, -4456(v0)
+// 0x0104cbd0: 0x104cbd0: lw    v0, -3992(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1114
+	ldc.i4 -998
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104cbc4: 0x104cbc4: lw    s0, 16(sp)
+// 0x0104cbd4: 0x104cbd4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6838,7 +6838,7 @@ L_104cbb8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104cbc8: 0x104cbc8: jr    ra addiu sp, sp, 24
+// 0x0104cbd8: 0x104cbd8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6850,7 +6850,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_skip_directories_104cbd0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_skip_directories_104cbe0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6888,15 +6888,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104cbd0: 0x104cbd0: addiu sp, sp, -24
+// 0x0104cbe0: 0x104cbe0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104cbd4: 0x104cbd4: addiu a1, zero, 47
+// 0x0104cbe4: 0x104cbe4: addiu a1, zero, 47
 	ldc.i4.s 47
 	stloc.2
-// 0x0104cbd8: 0x104cbd8: sw    s0, 16(sp)
+// 0x0104cbe8: 0x104cbe8: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6905,8 +6905,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104cbdc: 0x104cbdc: sw    ra, 20(sp)
-// 0x0104cbe0: 0x104cbe0: jal   0x1001a94 addu  s0, a0, zero
+// 0x0104cbec: 0x104cbec: sw    ra, 20(sp)
+// 0x0104cbf0: 0x104cbf0: jal   0x1001a94 addu  s0, a0, zero
 	ldloc.1
 	stloc 5
 	ldloc.1
@@ -6916,21 +6916,21 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104cbe8: 0x104cbe8: beq   v0, zero, 0x104cbf4 sll   zero, zero, 0
+// 0x0104cbf8: 0x104cbf8: beq   v0, zero, 0x104cc04 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_104cbf4
+	brfalse L_104cc04
 // --- basic block ---
-// 0x0104cbf0: 0x104cbf0: addiu s0, v0, 1
+// 0x0104cc00: 0x104cc00: addiu s0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 5
-L_104cbf4:
-// 0x0104cbf4: 0x104cbf4: lw    ra, 20(sp)
-// 0x0104cbf8: 0x104cbf8: addu  v0, s0, zero
+L_104cc04:
+// 0x0104cc04: 0x104cc04: lw    ra, 20(sp)
+// 0x0104cc08: 0x104cc08: addu  v0, s0, zero
 	ldloc 5
 	stloc 6
-// 0x0104cbfc: 0x104cbfc: lw    s0, 16(sp)
+// 0x0104cc0c: 0x104cc0c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6939,7 +6939,7 @@ L_104cbf4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104cc00: 0x104cc00: jr    ra addiu sp, sp, 24
+// 0x0104cc10: 0x104cc10: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6951,7 +6951,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_path_parent_104cc64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_parent_104cc74(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 ra,int32 v1)
@@ -6989,12 +6989,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104cc64: 0x104cc64: addiu sp, sp, -24
+// 0x0104cc74: 0x104cc74: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104cc68: 0x104cc68: sw    s0, 16(sp)
+// 0x0104cc78: 0x104cc78: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7003,25 +7003,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104cc6c: 0x104cc6c: sw    ra, 20(sp)
-// 0x0104cc70: 0x104cc70: jal   0x104cb30 sll   zero, zero, 0
+// 0x0104cc7c: 0x104cc7c: sw    ra, 20(sp)
+// 0x0104cc80: 0x104cc80: jal   0x104cb40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0104cc78: 0x104cc78: addu  a0, v0, zero
+// 0x0104cc88: 0x104cc88: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104cc7c: 0x104cc7c: addiu a1, zero, 47
+// 0x0104cc8c: 0x104cc8c: addiu a1, zero, 47
 	ldc.i4.s 47
 	stloc.2
-// 0x0104cc80: 0x104cc80: jal   0x1001a94 addu  s0, v0, zero
+// 0x0104cc90: 0x104cc90: jal   0x1001a94 addu  s0, v0, zero
 	ldloc 5
 	stloc 6
 	ldloc.1
@@ -7031,31 +7031,31 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0104cc88: 0x104cc88: bne   v0, zero, 0x104cc9c sll   zero, zero, 0
+// 0x0104cc98: 0x104cc98: bne   v0, zero, 0x104ccac sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104cc9c
+	brtrue L_104ccac
 // --- basic block ---
-// 0x0104cc90: 0x104cc90: lui   s0, 0x10000
+// 0x0104cca0: 0x104cca0: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0104cc94: 0x104cc94: j	 0x104cca0 addiu s0, s0, -29244
+// 0x0104cca4: 0x104cca4: j	 0x104ccb0 addiu s0, s0, -29244
 	ldloc 6
 	ldc.i4 -29244
 	add
 	stloc 6
-	br L_104cca0
+	br L_104ccb0
 // --- basic block ---
-L_104cc9c:
-// 0x0104cc9c: 0x104cc9c: sb    zero, 0(v0)
+L_104ccac:
+// 0x0104ccac: 0x104ccac: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_104cca0:
-// 0x0104cca0: 0x104cca0: lw    ra, 20(sp)
-// 0x0104cca4: 0x104cca4: addu  v0, s0, zero
+L_104ccb0:
+// 0x0104ccb0: 0x104ccb0: lw    ra, 20(sp)
+// 0x0104ccb4: 0x104ccb4: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-// 0x0104cca8: 0x104cca8: lw    s0, 16(sp)
+// 0x0104ccb8: 0x104ccb8: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7064,7 +7064,7 @@ L_104cca0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104ccac: 0x104ccac: jr    ra addiu sp, sp, 24
+// 0x0104ccbc: 0x104ccbc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7076,7 +7076,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s4,int32 s3,int32 s0,int32 s5,int32 s6,int32 s7,int32 v1,int32 s1,int32 ra)
@@ -7135,12 +7135,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ccb4: 0x104ccb4: addiu sp, sp, -56
+// 0x0104ccc4: 0x104ccc4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0104ccb8: 0x104ccb8: sw    s7, 48(sp)
+// 0x0104ccc8: 0x104ccc8: sw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7149,7 +7149,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104ccbc: 0x104ccbc: sw    s5, 40(sp)
+// 0x0104cccc: 0x104cccc: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7158,7 +7158,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104ccc0: 0x104ccc0: sw    s2, 28(sp)
+// 0x0104ccd0: 0x104ccd0: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7167,7 +7167,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104ccc4: 0x104ccc4: sw    s1, 24(sp)
+// 0x0104ccd4: 0x104ccd4: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7176,7 +7176,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0104ccc8: 0x104ccc8: sw    s0, 20(sp)
+// 0x0104ccd8: 0x104ccd8: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7185,8 +7185,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104cccc: 0x104cccc: sw    ra, 52(sp)
-// 0x0104ccd0: 0x104ccd0: sw    s6, 44(sp)
+// 0x0104ccdc: 0x104ccdc: sw    ra, 52(sp)
+// 0x0104cce0: 0x104cce0: sw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7195,7 +7195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104ccd4: 0x104ccd4: sw    s4, 36(sp)
+// 0x0104cce4: 0x104cce4: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7204,7 +7204,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104ccd8: 0x104ccd8: sw    s3, 32(sp)
+// 0x0104cce8: 0x104cce8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7213,25 +7213,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104ccdc: 0x104ccdc: addu  s1, a2, zero
+// 0x0104ccec: 0x104ccec: addu  s1, a2, zero
 	ldloc.3
 	stloc 15
-// 0x0104cce0: 0x104cce0: addu  s0, a0, zero
+// 0x0104ccf0: 0x104ccf0: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0104cce4: 0x104cce4: addu  s5, a1, zero
+// 0x0104ccf4: 0x104ccf4: addu  s5, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0104cce8: 0x104cce8: addu  s7, a3, zero
+// 0x0104ccf8: 0x104ccf8: addu  s7, a3, zero
 	ldloc 4
 	stloc 13
-// 0x0104ccec: 0x104ccec: beq   a2, zero, 0x104cd00 addu  s2, zero, zero
+// 0x0104ccfc: 0x104ccfc: beq   a2, zero, 0x104cd10 addu  s2, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_104cd00
+	brfalse L_104cd10
 // --- basic block ---
-// 0x0104ccf4: 0x104ccf4: jal   0x1001b48 addu  a0, a2, zero
+// 0x0104cd04: 0x104cd04: jal   0x1001b48 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.1
@@ -7240,17 +7240,17 @@ __CIBYL_javamethod_begin:
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x0104ccfc: 0x104ccfc: addu  s2, v0, zero
+// 0x0104cd0c: 0x104cd0c: addu  s2, v0, zero
 	ldloc 6
 	stloc 7
-L_104cd00:
-// 0x0104cd00: 0x104cd00: beq   s7, zero, 0x104cd14 addu  s4, zero, zero
+L_104cd10:
+// 0x0104cd10: 0x104cd10: beq   s7, zero, 0x104cd24 addu  s4, zero, zero
 	ldloc 13
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_104cd14
+	brfalse L_104cd24
 // --- basic block ---
-// 0x0104cd08: 0x104cd08: jal   0x1001b48 addu  a0, s7, zero
+// 0x0104cd18: 0x104cd18: jal   0x1001b48 addu  a0, s7, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
@@ -7259,25 +7259,25 @@ L_104cd00:
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x0104cd10: 0x104cd10: addu  s4, v0, zero
+// 0x0104cd20: 0x104cd20: addu  s4, v0, zero
 	ldloc 6
 	stloc 8
-L_104cd14:
-// 0x0104cd14: 0x104cd14: beq   s2, zero, 0x104cd30 addu  s3, zero, zero
+L_104cd24:
+// 0x0104cd24: 0x104cd24: beq   s2, zero, 0x104cd40 addu  s3, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_104cd30
+	brfalse L_104cd40
 // --- basic block ---
-// 0x0104cd1c: 0x104cd1c: lui   a1, 0x20000
+// 0x0104cd2c: 0x104cd2c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0104cd20: 0x104cd20: addiu a1, a1, 23444
+// 0x0104cd30: 0x104cd30: addiu a1, a1, 23904
 	ldloc.2
-	ldc.i4 23444
+	ldc.i4 23904
 	add
 	stloc.2
-// 0x0104cd24: 0x104cd24: jal   0x1001b14 addu  a0, s1, zero
+// 0x0104cd34: 0x104cd34: jal   0x1001b14 addu  a0, s1, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
@@ -7285,93 +7285,93 @@ L_104cd14:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0104cd2c: 0x104cd2c: sltu  s3, zero, v0
+// 0x0104cd3c: 0x104cd3c: sltu  s3, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 9
-L_104cd30:
-// 0x0104cd30: 0x104cd30: addu  v0, s3, s2
+L_104cd40:
+// 0x0104cd40: 0x104cd40: addu  v0, s3, s2
 	ldloc 9
 	ldloc 7
 	add
 	stloc 6
-// 0x0104cd34: 0x104cd34: slt   v0, v0, s5
+// 0x0104cd44: 0x104cd44: slt   v0, v0, s5
 	ldloc 6
 	ldloc 11
 	clt
 	stloc 6
-// 0x0104cd38: 0x104cd38: bne   v0, zero, 0x104cd4c addu  s6, s2, s3
+// 0x0104cd48: 0x104cd48: bne   v0, zero, 0x104cd5c addu  s6, s2, s3
 	ldloc 6
 	ldloc 7
 	ldloc 9
 	add
 	stloc 12
-	brtrue L_104cd4c
+	brtrue L_104cd5c
 // --- basic block ---
-// 0x0104cd40: 0x104cd40: addiu s2, s5, -1
+// 0x0104cd50: 0x104cd50: addiu s2, s5, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0104cd44: 0x104cd44: subu  s2, s2, s3
+// 0x0104cd54: 0x104cd54: subu  s2, s2, s3
 	ldloc 7
 	ldloc 9
 	sub
 	stloc 7
-// 0x0104cd48: 0x104cd48: addu  s6, s2, s3
+// 0x0104cd58: 0x104cd58: addu  s6, s2, s3
 	ldloc 7
 	ldloc 9
 	add
 	stloc 12
-L_104cd4c:
-// 0x0104cd4c: 0x104cd4c: addu  v0, s6, s4
+L_104cd5c:
+// 0x0104cd5c: 0x104cd5c: addu  v0, s6, s4
 	ldloc 12
 	ldloc 8
 	add
 	stloc 6
-// 0x0104cd50: 0x104cd50: slt   v0, v0, s5
+// 0x0104cd60: 0x104cd60: slt   v0, v0, s5
 	ldloc 6
 	ldloc 11
 	clt
 	stloc 6
-// 0x0104cd54: 0x104cd54: bne   v0, zero, 0x104cd68 sll   zero, zero, 0
+// 0x0104cd64: 0x104cd64: bne   v0, zero, 0x104cd78 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_104cd68
+	brtrue L_104cd78
 // --- basic block ---
-// 0x0104cd5c: 0x104cd5c: addiu s4, s5, -1
+// 0x0104cd6c: 0x104cd6c: addiu s4, s5, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x0104cd60: 0x104cd60: subu  s4, s4, s3
+// 0x0104cd70: 0x104cd70: subu  s4, s4, s3
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 8
-// 0x0104cd64: 0x104cd64: subu  s4, s4, s2
+// 0x0104cd74: 0x104cd74: subu  s4, s4, s2
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-L_104cd68:
-// 0x0104cd68: 0x104cd68: beq   s4, zero, 0x104cd80 addu  a0, s2, s3
+L_104cd78:
+// 0x0104cd78: 0x104cd78: beq   s4, zero, 0x104cd90 addu  a0, s2, s3
 	ldloc 8
 	ldloc 7
 	ldloc 9
 	add
 	stloc.1
-	brfalse L_104cd80
+	brfalse L_104cd90
 // --- basic block ---
-// 0x0104cd70: 0x104cd70: addu  a0, s0, a0
+// 0x0104cd80: 0x104cd80: addu  a0, s0, a0
 	ldloc 10
 	ldloc.1
 	add
 	stloc.1
-// 0x0104cd74: 0x104cd74: addu  a1, s7, zero
+// 0x0104cd84: 0x104cd84: addu  a1, s7, zero
 	ldloc 13
 	stloc.2
-// 0x0104cd78: 0x104cd78: jal   0x100186c addu  a2, s4, zero
+// 0x0104cd88: 0x104cd88: jal   0x100186c addu  a2, s4, zero
 	ldloc 8
 	stloc.3
 	ldloc.1
@@ -7383,17 +7383,17 @@ L_104cd68:
 	stloc 14
 	stloc 6
 // --- basic block ---
-L_104cd80:
-// 0x0104cd80: 0x104cd80: beq   s2, zero, 0x104cda4 addu  a1, s1, zero
+L_104cd90:
+// 0x0104cd90: 0x104cd90: beq   s2, zero, 0x104cdb4 addu  a1, s1, zero
 	ldloc 7
 	ldloc 15
 	stloc.2
-	brfalse L_104cda4
+	brfalse L_104cdb4
 // --- basic block ---
-// 0x0104cd88: 0x104cd88: addu  a0, s0, zero
+// 0x0104cd98: 0x104cd98: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0104cd8c: 0x104cd8c: jal   0x100186c addu  a2, s2, zero
+// 0x0104cd9c: 0x104cd9c: jal   0x100186c addu  a2, s2, zero
 	ldloc 7
 	stloc.3
 	ldloc.1
@@ -7405,38 +7405,38 @@ L_104cd80:
 	stloc 14
 	stloc 6
 // --- basic block ---
-// 0x0104cd94: 0x104cd94: beq   s3, zero, 0x104cda4 addu  s2, s0, s2
+// 0x0104cda4: 0x104cda4: beq   s3, zero, 0x104cdb4 addu  s2, s0, s2
 	ldloc 9
 	ldloc 10
 	ldloc 7
 	add
 	stloc 7
-	brfalse L_104cda4
+	brfalse L_104cdb4
 // --- basic block ---
-// 0x0104cd9c: 0x104cd9c: addiu v0, zero, 47
+// 0x0104cdac: 0x104cdac: addiu v0, zero, 47
 	ldc.i4.s 47
 	stloc 6
-// 0x0104cda0: 0x104cda0: sb    v0, 0(s2)
+// 0x0104cdb0: 0x104cdb0: sb    v0, 0(s2)
 	ldloc 7
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_104cda4:
-// 0x0104cda4: 0x104cda4: addu  s0, s0, s6
+L_104cdb4:
+// 0x0104cdb4: 0x104cdb4: addu  s0, s0, s6
 	ldloc 10
 	ldloc 12
 	add
 	stloc 10
-// 0x0104cda8: 0x104cda8: addu  s4, s0, s4
+// 0x0104cdb8: 0x104cdb8: addu  s4, s0, s4
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x0104cdac: 0x104cdac: sb    zero, 0(s4)
+// 0x0104cdbc: 0x104cdbc: sb    zero, 0(s4)
 	ldloc 8
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104cdb0: 0x104cdb0: lw    ra, 52(sp)
-// 0x0104cdb4: 0x104cdb4: lw    s7, 48(sp)
+// 0x0104cdc0: 0x104cdc0: lw    ra, 52(sp)
+// 0x0104cdc4: 0x104cdc4: lw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7445,7 +7445,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104cdb8: 0x104cdb8: lw    s6, 44(sp)
+// 0x0104cdc8: 0x104cdc8: lw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7454,7 +7454,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104cdbc: 0x104cdbc: lw    s5, 40(sp)
+// 0x0104cdcc: 0x104cdcc: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7463,7 +7463,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104cdc0: 0x104cdc0: lw    s4, 36(sp)
+// 0x0104cdd0: 0x104cdd0: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7472,7 +7472,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104cdc4: 0x104cdc4: lw    s3, 32(sp)
+// 0x0104cdd4: 0x104cdd4: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7481,7 +7481,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104cdc8: 0x104cdc8: lw    s2, 28(sp)
+// 0x0104cdd8: 0x104cdd8: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7490,7 +7490,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104cdcc: 0x104cdcc: lw    s1, 24(sp)
+// 0x0104cddc: 0x104cddc: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7499,7 +7499,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104cdd0: 0x104cdd0: lw    s0, 20(sp)
+// 0x0104cde0: 0x104cde0: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7508,7 +7508,7 @@ L_104cda4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104cdd4: 0x104cdd4: jr    ra addiu sp, sp, 56
+// 0x0104cde4: 0x104cde4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
diff --git a/converted/Cibyl57.j b/converted/Cibyl57.j
index 1166ad8..3805321 100644
--- a/converted/Cibyl57.j
+++ b/converted/Cibyl57.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl57::.ctor
 
-.method public static int32 T_56_104cddc(int32,int32,int32,int32,int32)
+.method public static int32 T_56_104cdec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -79,21 +79,21 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104cddc: 0x104cddc: sll   a2, a0, 2
+// 0x0104cdec: 0x104cdec: sll   a2, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x0104cde0: 0x104cde0: addiu sp, sp, -32
+// 0x0104cdf0: 0x104cdf0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104cde4: 0x104cde4: addu  a0, a2, zero
+// 0x0104cdf4: 0x104cdf4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0104cde8: 0x104cde8: sw    ra, 28(sp)
-// 0x0104cdec: 0x104cdec: sw    s0, 24(sp)
+// 0x0104cdf8: 0x104cdf8: sw    ra, 28(sp)
+// 0x0104cdfc: 0x104cdfc: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -102,7 +102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104cdf0: 0x104cdf0: jal   0x1000910 sw    a2, 16(sp)
+// 0x0104ce00: 0x104ce00: jal   0x1000910 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -121,7 +121,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104cdf8: 0x104cdf8: lw    a2, 16(sp)
+// 0x0104ce08: 0x104ce08: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -130,13 +130,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104cdfc: 0x104cdfc: addu  a0, v0, zero
+// 0x0104ce0c: 0x104ce0c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104ce00: 0x104ce00: addu  a1, zero, zero
+// 0x0104ce10: 0x104ce10: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104ce04: 0x104ce04: jal   0x100177c addu  s0, v0, zero
+// 0x0104ce14: 0x104ce14: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -148,11 +148,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104ce0c: 0x104ce0c: lw    ra, 28(sp)
-// 0x0104ce10: 0x104ce10: addu  v0, s0, zero
+// 0x0104ce1c: 0x104ce1c: lw    ra, 28(sp)
+// 0x0104ce20: 0x104ce20: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x0104ce14: 0x104ce14: lw    s0, 24(sp)
+// 0x0104ce24: 0x104ce24: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -161,7 +161,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104ce18: 0x104ce18: jr    ra addiu sp, sp, 32
+// 0x0104ce28: 0x104ce28: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -173,7 +173,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_path_list_create_104ce20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_list_create_104ce30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s0,int32 s1,int32 s5,int32 s2,int32 s3,int32 s6,int32 ra)
@@ -229,12 +229,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ce20: 0x104ce20: addiu sp, sp, -48
+// 0x0104ce30: 0x104ce30: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104ce24: 0x104ce24: sw    s5, 36(sp)
+// 0x0104ce34: 0x104ce34: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -243,7 +243,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104ce28: 0x104ce28: sw    s3, 28(sp)
+// 0x0104ce38: 0x104ce38: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -252,7 +252,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104ce2c: 0x104ce2c: sw    s2, 24(sp)
+// 0x0104ce3c: 0x104ce3c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -261,7 +261,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104ce30: 0x104ce30: sw    s1, 20(sp)
+// 0x0104ce40: 0x104ce40: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -270,8 +270,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104ce34: 0x104ce34: sw    ra, 44(sp)
-// 0x0104ce38: 0x104ce38: sw    s6, 40(sp)
+// 0x0104ce44: 0x104ce44: sw    ra, 44(sp)
+// 0x0104ce48: 0x104ce48: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -280,7 +280,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104ce3c: 0x104ce3c: sw    s4, 32(sp)
+// 0x0104ce4c: 0x104ce4c: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -289,7 +289,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104ce40: 0x104ce40: sw    s0, 16(sp)
+// 0x0104ce50: 0x104ce50: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -298,47 +298,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104ce44: 0x104ce44: addu  s2, a1, zero
+// 0x0104ce54: 0x104ce54: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0104ce48: 0x104ce48: addu  s5, a0, zero
+// 0x0104ce58: 0x104ce58: addu  s5, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0104ce4c: 0x104ce4c: addu  s3, a2, zero
+// 0x0104ce5c: 0x104ce5c: addu  s3, a2, zero
 	ldloc.3
 	stloc 13
-// 0x0104ce50: 0x104ce50: addu  v0, a1, zero
+// 0x0104ce60: 0x104ce60: addu  v0, a1, zero
 	ldloc.2
 	stloc 5
-// 0x0104ce54: 0x104ce54: j	 0x104ce60 addu  s1, zero, zero
+// 0x0104ce64: 0x104ce64: j	 0x104ce70 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_104ce60
+	br L_104ce70
 // --- basic block ---
-L_104ce5c:
-// 0x0104ce5c: 0x104ce5c: addiu s1, s1, 1
+L_104ce6c:
+// 0x0104ce6c: 0x104ce6c: addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_104ce60:
-// 0x0104ce60: 0x104ce60: lw    v1, 0(v0)
+L_104ce70:
+// 0x0104ce70: 0x104ce70: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104ce64: 0x104ce64: sll   zero, zero, 0
-// 0x0104ce68: 0x104ce68: bne   v1, zero, 0x104ce5c addiu v0, v0, 4
+// 0x0104ce74: 0x104ce74: sll   zero, zero, 0
+// 0x0104ce78: 0x104ce78: bne   v1, zero, 0x104ce6c addiu v0, v0, 4
 	ldloc 7
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	brtrue L_104ce5c
+	brtrue L_104ce6c
 // --- basic block ---
-// 0x0104ce70: 0x104ce70: jal   0x1000910 addiu a0, zero, 20
+// 0x0104ce80: 0x104ce80: jal   0x1000910 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -351,21 +351,21 @@ L_104ce60:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ce78: 0x104ce78: lui   s4, 0x10000
+// 0x0104ce88: 0x104ce88: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0104ce7c: 0x104ce7c: addu  a2, v0, zero
+// 0x0104ce8c: 0x104ce8c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0104ce80: 0x104ce80: addiu a1, zero, 139
+// 0x0104ce90: 0x104ce90: addiu a1, zero, 139
 	ldc.i4 139
 	stloc.2
-// 0x0104ce84: 0x104ce84: addiu a0, s4, 3144
+// 0x0104ce94: 0x104ce94: addiu a0, s4, 3140
 	ldloc 8
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.1
-// 0x0104ce88: 0x104ce88: jal   0x1004a38 addu  s0, v0, zero
+// 0x0104ce98: 0x104ce98: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -373,27 +373,27 @@ L_104ce60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ce90: 0x104ce90: lui   v0, 0x70000
+// 0x0104cea0: 0x104cea0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104ce94: 0x104ce94: lw    v0, -4192(v0)
+// 0x0104cea4: 0x104cea4: lw    v0, -3728(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1048
+	ldc.i4 -932
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ce98: 0x104ce98: addu  a0, s5, zero
+// 0x0104cea8: 0x104cea8: addu  a0, s5, zero
 	ldloc 11
 	stloc.1
-// 0x0104ce9c: 0x104ce9c: jal   0x1001ba8 sw    v0, 0(s0)
+// 0x0104ceac: 0x104ceac: jal   0x1001ba8 sw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -410,10 +410,10 @@ L_104ce60:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104cea4: 0x104cea4: addu  a0, s1, zero
+// 0x0104ceb4: 0x104ceb4: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0104cea8: 0x104cea8: sw    v0, 4(s0)
+// 0x0104ceb8: 0x104ceb8: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -422,7 +422,7 @@ L_104ce60:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ceac: 0x104ceac: jal   0x104cddc sw    s1, 8(s0)
+// 0x0104cebc: 0x104cebc: jal   0x104cdec sw    s1, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -436,23 +436,23 @@ L_104ce60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::T_56_104cddc(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::T_56_104cdec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ceb4: 0x104ceb4: addu  a2, v0, zero
+// 0x0104cec4: 0x104cec4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0104ceb8: 0x104ceb8: addiu a0, s4, 3144
+// 0x0104cec8: 0x104cec8: addiu a0, s4, 3140
 	ldloc 8
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.1
-// 0x0104cebc: 0x104cebc: addiu a1, zero, 146
+// 0x0104cecc: 0x104cecc: addiu a1, zero, 146
 	ldc.i4 146
 	stloc.2
-// 0x0104cec0: 0x104cec0: sw    v0, 12(s0)
+// 0x0104ced0: 0x104ced0: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -461,7 +461,7 @@ L_104ce60:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104cec4: 0x104cec4: jal   0x1004a38 addu  s4, zero, zero
+// 0x0104ced4: 0x104ced4: jal   0x1004a48 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -469,27 +469,27 @@ L_104ce60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104cecc: 0x104cecc: j	 0x104cf04 sltu  v1, s4, s1
+// 0x0104cedc: 0x104cedc: j	 0x104cf14 sltu  v1, s4, s1
 	ldloc 8
 	ldloc 10
 	clt.un
 	stloc 7
-	br L_104cf04
+	br L_104cf14
 // --- basic block ---
-L_104ced4:
-// 0x0104ced4: 0x104ced4: lw    s6, 0(s2)
+L_104cee4:
+// 0x0104cee4: 0x104cee4: lw    s6, 0(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 14
-// 0x0104ced8: 0x104ced8: lw    s5, 12(s0)
+// 0x0104cee8: 0x104cee8: lw    s5, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -498,10 +498,10 @@ L_104ced4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104cedc: 0x104cedc: addu  a0, s6, zero
+// 0x0104ceec: 0x104ceec: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x0104cee0: 0x104cee0: jal   0x1001b48 addu  s5, s5, v0
+// 0x0104cef0: 0x104cef0: jal   0x1001b48 addu  s5, s5, v0
 	ldloc 11
 	ldloc 5
 	add
@@ -512,10 +512,10 @@ L_104ced4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104cee8: 0x104cee8: addu  a1, v0, zero
+// 0x0104cef8: 0x104cef8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104ceec: 0x104ceec: jal   0x104c7f4 addu  a0, s6, zero
+// 0x0104cefc: 0x104cefc: jal   0x104c804 addu  a0, s6, zero
 	ldloc 14
 	stloc.1
 	ldloc.0
@@ -523,43 +523,43 @@ L_104ced4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_expand_104c7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_expand_104c804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104cef4: 0x104cef4: sw    v0, 0(s5)
+// 0x0104cf04: 0x104cf04: sw    v0, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104cef8: 0x104cef8: addiu s4, s4, 1
+// 0x0104cf08: 0x104cf08: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0104cefc: 0x104cefc: addiu s2, s2, 4
+// 0x0104cf0c: 0x104cf0c: addiu s2, s2, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-// 0x0104cf00: 0x104cf00: sltu  v1, s4, s1
+// 0x0104cf10: 0x104cf10: sltu  v1, s4, s1
 	ldloc 8
 	ldloc 10
 	clt.un
 	stloc 7
-L_104cf04:
-// 0x0104cf04: 0x104cf04: bne   v1, zero, 0x104ced4 sll   v0, s4, 2
+L_104cf14:
+// 0x0104cf14: 0x104cf14: bne   v1, zero, 0x104cee4 sll   v0, s4, 2
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-	brtrue L_104ced4
+	brtrue L_104cee4
 // --- basic block ---
-// 0x0104cf0c: 0x104cf0c: jal   0x1001b48 addu  a0, s3, zero
+// 0x0104cf1c: 0x104cf1c: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
@@ -568,10 +568,10 @@ L_104cf04:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104cf14: 0x104cf14: addu  a1, v0, zero
+// 0x0104cf24: 0x104cf24: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104cf18: 0x104cf18: jal   0x104c7f4 addu  a0, s3, zero
+// 0x0104cf28: 0x104cf28: jal   0x104c804 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -579,25 +579,25 @@ L_104cf04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_expand_104c7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_expand_104c804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104cf20: 0x104cf20: lw    ra, 44(sp)
-// 0x0104cf24: 0x104cf24: lui   v1, 0x70000
+// 0x0104cf30: 0x104cf30: lw    ra, 44(sp)
+// 0x0104cf34: 0x104cf34: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104cf28: 0x104cf28: sw    s0, -4192(v1)
+// 0x0104cf38: 0x104cf38: sw    s0, -3728(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1048
+	ldc.i4 -932
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104cf2c: 0x104cf2c: sw    v0, 16(s0)
+// 0x0104cf3c: 0x104cf3c: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -606,7 +606,7 @@ L_104cf04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104cf30: 0x104cf30: lw    s6, 40(sp)
+// 0x0104cf40: 0x104cf40: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -615,7 +615,7 @@ L_104cf04:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104cf34: 0x104cf34: lw    s5, 36(sp)
+// 0x0104cf44: 0x104cf44: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -624,7 +624,7 @@ L_104cf04:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104cf38: 0x104cf38: lw    s4, 32(sp)
+// 0x0104cf48: 0x104cf48: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -633,7 +633,7 @@ L_104cf04:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104cf3c: 0x104cf3c: lw    s3, 28(sp)
+// 0x0104cf4c: 0x104cf4c: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -642,7 +642,7 @@ L_104cf04:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104cf40: 0x104cf40: lw    s2, 24(sp)
+// 0x0104cf50: 0x104cf50: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -651,7 +651,7 @@ L_104cf04:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104cf44: 0x104cf44: lw    s1, 20(sp)
+// 0x0104cf54: 0x104cf54: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -660,7 +660,7 @@ L_104cf04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104cf48: 0x104cf48: lw    s0, 16(sp)
+// 0x0104cf58: 0x104cf58: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -669,7 +669,7 @@ L_104cf04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104cf4c: 0x104cf4c: jr    ra addiu sp, sp, 48
+// 0x0104cf5c: 0x104cf5c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -681,7 +681,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_find_104cf54(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_find_104cf64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -722,24 +722,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104cf54: 0x104cf54: lui   v0, 0x70000
+// 0x0104cf64: 0x104cf64: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104cf58: 0x104cf58: lw    v0, -4192(v0)
+// 0x0104cf68: 0x104cf68: lw    v0, -3728(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1048
+	ldc.i4 -932
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104cf5c: 0x104cf5c: addiu sp, sp, -32
+// 0x0104cf6c: 0x104cf6c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104cf60: 0x104cf60: sw    s0, 20(sp)
+// 0x0104cf70: 0x104cf70: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -748,8 +748,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104cf64: 0x104cf64: sw    ra, 28(sp)
-// 0x0104cf68: 0x104cf68: sw    s1, 24(sp)
+// 0x0104cf74: 0x104cf74: sw    ra, 28(sp)
+// 0x0104cf78: 0x104cf78: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -758,36 +758,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104cf6c: 0x104cf6c: bne   v0, zero, 0x104d000 addu  s0, a0, zero
+// 0x0104cf7c: 0x104cf7c: bne   v0, zero, 0x104d010 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
-	brtrue L_104d000
+	brtrue L_104d010
 // --- basic block ---
-// 0x0104cf74: 0x104cf74: lui   v0, 0x20000
+// 0x0104cf84: 0x104cf84: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0104cf78: 0x104cf78: lw    a2, 27712(v0)
+// 0x0104cf88: 0x104cf88: lw    a2, 28176(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6928
+	ldc.i4 7044
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104cf7c: 0x104cf7c: lui   a0, 0x20000
+// 0x0104cf8c: 0x104cf8c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0104cf80: 0x104cf80: lui   a1, 0x0
+// 0x0104cf90: 0x104cf90: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104cf84: 0x104cf84: addiu a0, a0, -26888
+// 0x0104cf94: 0x104cf94: addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0104cf88: 0x104cf88: jal   0x104ce20 addiu a1, a1, 13712
+// 0x0104cf98: 0x104cf98: jal   0x104ce30 addiu a1, a1, 13712
 	ldloc.2
 	ldc.i4 13712
 	add
@@ -797,35 +797,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_list_create_104ce20(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_list_create_104ce30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104cf90: 0x104cf90: lui   v0, 0x20000
+// 0x0104cfa0: 0x104cfa0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0104cf94: 0x104cf94: lw    a2, 27716(v0)
+// 0x0104cfa4: 0x104cfa4: lw    a2, 28180(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6929
+	ldc.i4 7045
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104cf98: 0x104cf98: lui   a0, 0x0
+// 0x0104cfa8: 0x104cfa8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104cf9c: 0x104cf9c: lui   a1, 0x0
+// 0x0104cfac: 0x104cfac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104cfa0: 0x104cfa0: addiu a0, a0, 26228
+// 0x0104cfb0: 0x104cfb0: addiu a0, a0, 26228
 	ldloc.1
 	ldc.i4 26228
 	add
 	stloc.1
-// 0x0104cfa4: 0x104cfa4: jal   0x104ce20 addiu a1, a1, 13720
+// 0x0104cfb4: 0x104cfb4: jal   0x104ce30 addiu a1, a1, 13720
 	ldloc.2
 	ldc.i4 13720
 	add
@@ -835,35 +835,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_list_create_104ce20(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_list_create_104ce30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104cfac: 0x104cfac: lui   v0, 0x20000
+// 0x0104cfbc: 0x104cfbc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0104cfb0: 0x104cfb0: lw    a2, 27720(v0)
+// 0x0104cfc0: 0x104cfc0: lw    a2, 28184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6930
+	ldc.i4 7046
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104cfb4: 0x104cfb4: lui   a0, 0x0
+// 0x0104cfc4: 0x104cfc4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104cfb8: 0x104cfb8: lui   a1, 0x0
+// 0x0104cfc8: 0x104cfc8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104cfbc: 0x104cfbc: addiu a0, a0, 26244
+// 0x0104cfcc: 0x104cfcc: addiu a0, a0, 26244
 	ldloc.1
 	ldc.i4 26244
 	add
 	stloc.1
-// 0x0104cfc0: 0x104cfc0: jal   0x104ce20 addiu a1, a1, 13744
+// 0x0104cfd0: 0x104cfd0: jal   0x104ce30 addiu a1, a1, 13744
 	ldloc.2
 	ldc.i4 13744
 	add
@@ -873,35 +873,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_list_create_104ce20(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_list_create_104ce30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104cfc8: 0x104cfc8: lui   v0, 0x20000
+// 0x0104cfd8: 0x104cfd8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0104cfcc: 0x104cfcc: lw    a2, 27724(v0)
+// 0x0104cfdc: 0x104cfdc: lw    a2, 28188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6931
+	ldc.i4 7047
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104cfd0: 0x104cfd0: lui   a0, 0x0
+// 0x0104cfe0: 0x104cfe0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104cfd4: 0x104cfd4: lui   a1, 0x0
+// 0x0104cfe4: 0x104cfe4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104cfd8: 0x104cfd8: addiu a0, a0, 21376
+// 0x0104cfe8: 0x104cfe8: addiu a0, a0, 21376
 	ldloc.1
 	ldc.i4 21376
 	add
 	stloc.1
-// 0x0104cfdc: 0x104cfdc: jal   0x104ce20 addiu a1, a1, 13760
+// 0x0104cfec: 0x104cfec: jal   0x104ce30 addiu a1, a1, 13760
 	ldloc.2
 	ldc.i4 13760
 	add
@@ -911,35 +911,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_list_create_104ce20(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_list_create_104ce30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104cfe4: 0x104cfe4: lui   v0, 0x20000
+// 0x0104cff4: 0x104cff4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0104cfe8: 0x104cfe8: lui   a0, 0x10000
+// 0x0104cff8: 0x104cff8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104cfec: 0x104cfec: lui   a1, 0x0
+// 0x0104cffc: 0x104cffc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104cff0: 0x104cff0: lw    a2, 27728(v0)
+// 0x0104d000: 0x104d000: lw    a2, 28192(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6932
+	ldc.i4 7048
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104cff4: 0x104cff4: addiu a0, a0, 3288
+// 0x0104d004: 0x104d004: addiu a0, a0, 3284
 	ldloc.1
-	ldc.i4 3288
+	ldc.i4 3284
 	add
 	stloc.1
-// 0x0104cff8: 0x104cff8: jal   0x104ce20 addiu a1, a1, 13768
+// 0x0104d008: 0x104d008: jal   0x104ce30 addiu a1, a1, 13768
 	ldloc.2
 	ldc.i4 13768
 	add
@@ -949,31 +949,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_list_create_104ce20(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_list_create_104ce30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_104d000:
-// 0x0104d000: 0x104d000: lui   v0, 0x70000
+L_104d010:
+// 0x0104d010: 0x104d010: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104d004: 0x104d004: lw    s1, -4192(v0)
+// 0x0104d014: 0x104d014: lw    s1, -3728(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1048
+	ldc.i4 -932
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d008: 0x104d008: j	 0x104d02c addu  a1, s0, zero
+// 0x0104d018: 0x104d018: j	 0x104d03c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-	br L_104d02c
+	br L_104d03c
 // --- basic block ---
-L_104d010:
-// 0x0104d010: 0x104d010: lw    a0, 4(s1)
+L_104d020:
+// 0x0104d020: 0x104d020: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -982,7 +982,7 @@ L_104d010:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104d014: 0x104d014: jal   0x1001c08 sll   zero, zero, 0
+// 0x0104d024: 0x104d024: jal   0x1001c08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -993,31 +993,31 @@ L_104d010:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d01c: 0x104d01c: beq   v0, zero, 0x104d034 sll   zero, zero, 0
+// 0x0104d02c: 0x104d02c: beq   v0, zero, 0x104d044 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104d034
+	brfalse L_104d044
 // --- basic block ---
-// 0x0104d024: 0x104d024: lw    s1, 0(s1)
+// 0x0104d034: 0x104d034: lw    s1, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104d028: 0x104d028: addu  a1, s0, zero
+// 0x0104d038: 0x104d038: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-L_104d02c:
-// 0x0104d02c: 0x104d02c: bne   s1, zero, 0x104d010 sll   zero, zero, 0
+L_104d03c:
+// 0x0104d03c: 0x104d03c: bne   s1, zero, 0x104d020 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_104d010
+	brtrue L_104d020
 // --- basic block ---
-L_104d034:
-// 0x0104d034: 0x104d034: lw    ra, 28(sp)
-// 0x0104d038: 0x104d038: addu  v0, s1, zero
+L_104d044:
+// 0x0104d044: 0x104d044: lw    ra, 28(sp)
+// 0x0104d048: 0x104d048: addu  v0, s1, zero
 	ldloc 7
 	stloc 5
-// 0x0104d03c: 0x104d03c: lw    s1, 24(sp)
+// 0x0104d04c: 0x104d04c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1026,7 +1026,7 @@ L_104d034:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d040: 0x104d040: lw    s0, 20(sp)
+// 0x0104d050: 0x104d050: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1035,7 +1035,7 @@ L_104d034:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d044: 0x104d044: jr    ra addiu sp, sp, 32
+// 0x0104d054: 0x104d054: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1047,7 +1047,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_path_preferred_104d04c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_preferred_104d05c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -1085,12 +1085,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d04c: 0x104d04c: addiu sp, sp, -40
+// 0x0104d05c: 0x104d05c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104d050: 0x104d050: sw    s0, 32(sp)
+// 0x0104d060: 0x104d060: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1099,8 +1099,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104d054: 0x104d054: sw    ra, 36(sp)
-// 0x0104d058: 0x104d058: jal   0x104cf54 addu  s0, a0, zero
+// 0x0104d064: 0x104d064: sw    ra, 36(sp)
+// 0x0104d068: 0x104d068: jal   0x104cf64 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -1108,37 +1108,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_find_104cf54(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_find_104cf64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104d060: 0x104d060: bne   v0, zero, 0x104d08c lui   a1, 0x10000
+// 0x0104d070: 0x104d070: bne   v0, zero, 0x104d09c lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_104d08c
+	brtrue L_104d09c
 // --- basic block ---
-// 0x0104d068: 0x104d068: lui   a3, 0x10000
+// 0x0104d078: 0x104d078: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104d06c: 0x104d06c: addiu a1, a1, 3144
+// 0x0104d07c: 0x104d07c: addiu a1, a1, 3140
 	ldloc.2
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.2
-// 0x0104d070: 0x104d070: addiu a3, a3, 3296
+// 0x0104d080: 0x104d080: addiu a3, a3, 3292
 	ldloc 4
-	ldc.i4 3296
+	ldc.i4 3292
 	add
 	stloc 4
-// 0x0104d074: 0x104d074: addiu a0, zero, 5
+// 0x0104d084: 0x104d084: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0104d078: 0x104d078: addiu a2, zero, 504
+// 0x0104d088: 0x104d088: addiu a2, zero, 504
 	ldc.i4 504
 	stloc.3
-// 0x0104d07c: 0x104d07c: sw    v0, 24(sp)
+// 0x0104d08c: 0x104d08c: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1147,7 +1147,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104d080: 0x104d080: jal   0x100449c sw    s0, 16(sp)
+// 0x0104d090: 0x104d090: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1166,7 +1166,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104d088: 0x104d088: lw    v0, 24(sp)
+// 0x0104d098: 0x104d098: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1175,9 +1175,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-L_104d08c:
-// 0x0104d08c: 0x104d08c: lw    ra, 36(sp)
-// 0x0104d090: 0x104d090: lw    v0, 16(v0)
+L_104d09c:
+// 0x0104d09c: 0x104d09c: lw    ra, 36(sp)
+// 0x0104d0a0: 0x104d0a0: lw    v0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1186,7 +1186,7 @@ L_104d08c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104d094: 0x104d094: lw    s0, 32(sp)
+// 0x0104d0a4: 0x104d0a4: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1195,7 +1195,7 @@ L_104d08c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d098: 0x104d098: jr    ra addiu sp, sp, 40
+// 0x0104d0a8: 0x104d0a8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1207,7 +1207,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 t0,int32 v0,int32 ra)
@@ -1245,12 +1245,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d18c: 0x104d18c: addiu sp, sp, -32
+// 0x0104d19c: 0x104d19c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104d190: 0x104d190: sw    a1, 16(sp)
+// 0x0104d1a0: 0x104d1a0: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1259,19 +1259,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104d194: 0x104d194: sw    ra, 28(sp)
-// 0x0104d198: 0x104d198: jal   0x104cf54 sll   zero, zero, 0
+// 0x0104d1a4: 0x104d1a4: sw    ra, 28(sp)
+// 0x0104d1a8: 0x104d1a8: jal   0x104cf64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_find_104cf54(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_find_104cf64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x0104d1a0: 0x104d1a0: lw    a3, 8(v0)
+// 0x0104d1b0: 0x104d1b0: lw    a3, 8(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1280,10 +1280,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104d1a4: 0x104d1a4: addu  v1, zero, zero
+// 0x0104d1b4: 0x104d1b4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0104d1a8: 0x104d1a8: lw    a1, 16(sp)
+// 0x0104d1b8: 0x104d1b8: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1292,15 +1292,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104d1ac: 0x104d1ac: j	 0x104d1e4 addiu a3, a3, -1
+// 0x0104d1bc: 0x104d1bc: j	 0x104d1f4 addiu a3, a3, -1
 	ldloc 4
 	ldc.i4.m1
 	add
 	stloc 4
-	br L_104d1e4
+	br L_104d1f4
 // --- basic block ---
-L_104d1b4:
-// 0x0104d1b4: 0x104d1b4: lw    a0, 12(v0)
+L_104d1c4:
+// 0x0104d1c4: 0x104d1c4: lw    a0, 12(v0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1309,72 +1309,72 @@ L_104d1b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104d1b8: 0x104d1b8: addiu a2, v1, 1
+// 0x0104d1c8: 0x104d1c8: addiu a2, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0104d1bc: 0x104d1bc: addu  t0, a0, t0
+// 0x0104d1cc: 0x104d1cc: addu  t0, a0, t0
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0104d1c0: 0x104d1c0: lw    t0, 0(t0)
+// 0x0104d1d0: 0x104d1d0: lw    t0, 0(t0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104d1c4: 0x104d1c4: sll   zero, zero, 0
-// 0x0104d1c8: 0x104d1c8: bne   t0, a1, 0x104d1e4 addu  v1, a2, zero
+// 0x0104d1d4: 0x104d1d4: sll   zero, zero, 0
+// 0x0104d1d8: 0x104d1d8: bne   t0, a1, 0x104d1f4 addu  v1, a2, zero
 	ldloc 7
 	ldloc.2
 	ldloc.3
 	stloc 6
-	bne.un L_104d1e4
+	bne.un L_104d1f4
 // --- basic block ---
-// 0x0104d1d0: 0x104d1d0: sll   a2, a2, 2
+// 0x0104d1e0: 0x104d1e0: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x0104d1d4: 0x104d1d4: addu  a0, a0, a2
+// 0x0104d1e4: 0x104d1e4: addu  a0, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc.1
-// 0x0104d1d8: 0x104d1d8: lw    v0, 0(a0)
+// 0x0104d1e8: 0x104d1e8: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0104d1dc: 0x104d1dc: j	 0x104d1f4 sll   zero, zero, 0
-	br L_104d1f4
+// 0x0104d1ec: 0x104d1ec: j	 0x104d204 sll   zero, zero, 0
+	br L_104d204
 // --- basic block ---
-L_104d1e4:
-// 0x0104d1e4: 0x104d1e4: slt   a0, v1, a3
+L_104d1f4:
+// 0x0104d1f4: 0x104d1f4: slt   a0, v1, a3
 	ldloc 6
 	ldloc 4
 	clt
 	stloc.1
-// 0x0104d1e8: 0x104d1e8: bne   a0, zero, 0x104d1b4 sll   t0, v1, 2
+// 0x0104d1f8: 0x104d1f8: bne   a0, zero, 0x104d1c4 sll   t0, v1, 2
 	ldloc.1
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 7
-	brtrue L_104d1b4
+	brtrue L_104d1c4
 // --- basic block ---
-// 0x0104d1f0: 0x104d1f0: addu  v0, zero, zero
+// 0x0104d200: 0x104d200: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_104d1f4:
-// 0x0104d1f4: 0x104d1f4: lw    ra, 28(sp)
-// 0x0104d1f8: 0x104d1f8: sll   zero, zero, 0
-// 0x0104d1fc: 0x104d1fc: jr    ra addiu sp, sp, 32
+L_104d204:
+// 0x0104d204: 0x104d204: lw    ra, 28(sp)
+// 0x0104d208: 0x104d208: sll   zero, zero, 0
+// 0x0104d20c: 0x104d20c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1386,7 +1386,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -1427,12 +1427,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d204: 0x104d204: addiu sp, sp, -40
+// 0x0104d214: 0x104d214: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104d208: 0x104d208: sw    s1, 32(sp)
+// 0x0104d218: 0x104d218: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1441,7 +1441,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104d20c: 0x104d20c: sw    s0, 28(sp)
+// 0x0104d21c: 0x104d21c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1450,8 +1450,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104d210: 0x104d210: sw    ra, 36(sp)
-// 0x0104d214: 0x104d214: jal   0x104cf54 addu  s0, a0, zero
+// 0x0104d220: 0x104d220: sw    ra, 36(sp)
+// 0x0104d224: 0x104d224: jal   0x104cf64 addu  s0, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -1459,40 +1459,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_find_104cf54(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_find_104cf64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104d21c: 0x104d21c: bne   v0, zero, 0x104d244 addu  s1, v0, zero
+// 0x0104d22c: 0x104d22c: bne   v0, zero, 0x104d254 addu  s1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
-	brtrue L_104d244
+	brtrue L_104d254
 // --- basic block ---
-// 0x0104d224: 0x104d224: lui   a1, 0x10000
+// 0x0104d234: 0x104d234: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104d228: 0x104d228: lui   a3, 0x10000
+// 0x0104d238: 0x104d238: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104d22c: 0x104d22c: addiu a1, a1, 3144
+// 0x0104d23c: 0x104d23c: addiu a1, a1, 3140
 	ldloc.2
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.2
-// 0x0104d230: 0x104d230: addiu a3, a3, 3344
+// 0x0104d240: 0x104d240: addiu a3, a3, 3340
 	ldloc 4
-	ldc.i4 3344
+	ldc.i4 3340
 	add
 	stloc 4
-// 0x0104d234: 0x104d234: addiu a0, zero, 5
+// 0x0104d244: 0x104d244: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0104d238: 0x104d238: addiu a2, zero, 438
+// 0x0104d248: 0x104d248: addiu a2, zero, 438
 	ldc.i4 438
 	stloc.3
-// 0x0104d23c: 0x104d23c: jal   0x100449c sw    s0, 16(sp)
+// 0x0104d24c: 0x104d24c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1511,8 +1511,8 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_104d244:
-// 0x0104d244: 0x104d244: lw    v1, 8(s1)
+L_104d254:
+// 0x0104d254: 0x104d254: lw    v1, 8(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1521,15 +1521,15 @@ L_104d244:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104d248: 0x104d248: sll   zero, zero, 0
-// 0x0104d24c: 0x104d24c: blez  v1, 0x104d260 addu  v0, zero, zero
+// 0x0104d258: 0x104d258: sll   zero, zero, 0
+// 0x0104d25c: 0x104d25c: blez  v1, 0x104d270 addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	ble L_104d260
+	ble L_104d270
 // --- basic block ---
-// 0x0104d254: 0x104d254: lw    v0, 12(s1)
+// 0x0104d264: 0x104d264: lw    v0, 12(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1538,17 +1538,17 @@ L_104d244:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104d258: 0x104d258: sll   zero, zero, 0
-// 0x0104d25c: 0x104d25c: lw    v0, 0(v0)
+// 0x0104d268: 0x104d268: sll   zero, zero, 0
+// 0x0104d26c: 0x104d26c: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-L_104d260:
-// 0x0104d260: 0x104d260: lw    ra, 36(sp)
-// 0x0104d264: 0x104d264: lw    s1, 32(sp)
+L_104d270:
+// 0x0104d270: 0x104d270: lw    ra, 36(sp)
+// 0x0104d274: 0x104d274: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1557,7 +1557,7 @@ L_104d260:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d268: 0x104d268: lw    s0, 28(sp)
+// 0x0104d278: 0x104d278: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1566,7 +1566,7 @@ L_104d260:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d26c: 0x104d26c: jr    ra addiu sp, sp, 40
+// 0x0104d27c: 0x104d27c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1578,7 +1578,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_path_set_104d274(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_path_set_104d284(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 v1,int32 s5,int32 s1,int32 s4,int32 s0,int32 s3,int32 ra)
@@ -1631,12 +1631,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d274: 0x104d274: addiu sp, sp, -56
+// 0x0104d284: 0x104d284: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0104d278: 0x104d278: sw    s2, 36(sp)
+// 0x0104d288: 0x104d288: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1645,7 +1645,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104d27c: 0x104d27c: sw    s1, 32(sp)
+// 0x0104d28c: 0x104d28c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1654,7 +1654,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104d280: 0x104d280: sw    s0, 28(sp)
+// 0x0104d290: 0x104d290: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1663,8 +1663,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104d284: 0x104d284: sw    ra, 52(sp)
-// 0x0104d288: 0x104d288: sw    s5, 48(sp)
+// 0x0104d294: 0x104d294: sw    ra, 52(sp)
+// 0x0104d298: 0x104d298: sw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1673,7 +1673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104d28c: 0x104d28c: sw    s4, 44(sp)
+// 0x0104d29c: 0x104d29c: sw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1682,7 +1682,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104d290: 0x104d290: sw    s3, 40(sp)
+// 0x0104d2a0: 0x104d2a0: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1691,10 +1691,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104d294: 0x104d294: addu  s1, a1, zero
+// 0x0104d2a4: 0x104d2a4: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0104d298: 0x104d298: jal   0x104cf54 addu  s2, a0, zero
+// 0x0104d2a8: 0x104d2a8: jal   0x104cf64 addu  s2, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -1702,40 +1702,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_find_104cf54(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_find_104cf64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d2a0: 0x104d2a0: bne   v0, zero, 0x104d2d8 addu  s0, v0, zero
+// 0x0104d2b0: 0x104d2b0: bne   v0, zero, 0x104d2e8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
-	brtrue L_104d2d8
+	brtrue L_104d2e8
 // --- basic block ---
-// 0x0104d2a8: 0x104d2a8: lui   a1, 0x10000
+// 0x0104d2b8: 0x104d2b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104d2ac: 0x104d2ac: lui   a3, 0x10000
+// 0x0104d2bc: 0x104d2bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104d2b0: 0x104d2b0: addiu a1, a1, 3144
+// 0x0104d2c0: 0x104d2c0: addiu a1, a1, 3140
 	ldloc.2
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.2
-// 0x0104d2b4: 0x104d2b4: addiu a3, a3, 3368
+// 0x0104d2c4: 0x104d2c4: addiu a3, a3, 3364
 	ldloc 4
-	ldc.i4 3368
+	ldc.i4 3364
 	add
 	stloc 4
-// 0x0104d2b8: 0x104d2b8: addiu a0, zero, 5
+// 0x0104d2c8: 0x104d2c8: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0104d2bc: 0x104d2bc: addiu a2, zero, 383
+// 0x0104d2cc: 0x104d2cc: addiu a2, zero, 383
 	ldc.i4 383
 	stloc.3
-// 0x0104d2c0: 0x104d2c0: jal   0x100449c sw    s2, 16(sp)
+// 0x0104d2d0: 0x104d2d0: jal   0x100449c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1754,39 +1754,39 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d2c8: 0x104d2c8: j	 0x104d2dc addiu v1, zero, 44
+// 0x0104d2d8: 0x104d2d8: j	 0x104d2ec addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 8
-	br L_104d2dc
+	br L_104d2ec
 // --- basic block ---
-L_104d2d0:
-// 0x0104d2d0: 0x104d2d0: j	 0x104d2dc addiu s1, s1, 1
+L_104d2e0:
+// 0x0104d2e0: 0x104d2e0: j	 0x104d2ec addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	br L_104d2dc
+	br L_104d2ec
 // --- basic block ---
-L_104d2d8:
-// 0x0104d2d8: 0x104d2d8: addiu v1, zero, 44
+L_104d2e8:
+// 0x0104d2e8: 0x104d2e8: addiu v1, zero, 44
 	ldc.i4.s 44
 	stloc 8
-L_104d2dc:
-// 0x0104d2dc: 0x104d2dc: lb    v0, 0(s1)
+L_104d2ec:
+// 0x0104d2ec: 0x104d2ec: lb    v0, 0(s1)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104d2e0: 0x104d2e0: sll   zero, zero, 0
-// 0x0104d2e4: 0x104d2e4: beq   v0, v1, 0x104d2d0 sll   zero, zero, 0
+// 0x0104d2f0: 0x104d2f0: sll   zero, zero, 0
+// 0x0104d2f4: 0x104d2f4: beq   v0, v1, 0x104d2e0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	beq  L_104d2d0
+	beq  L_104d2e0
 // --- basic block ---
-// 0x0104d2ec: 0x104d2ec: beq   v0, zero, 0x104d3f0 sll   zero, zero, 0
+// 0x0104d2fc: 0x104d2fc: beq   v0, zero, 0x104d400 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104d3f0
+	brfalse L_104d400
 // --- basic block ---
-// 0x0104d2f4: 0x104d2f4: lw    v0, 12(s0)
+// 0x0104d304: 0x104d304: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1795,12 +1795,12 @@ L_104d2dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104d2f8: 0x104d2f8: sll   zero, zero, 0
-// 0x0104d2fc: 0x104d2fc: beq   v0, zero, 0x104d340 sll   zero, zero, 0
+// 0x0104d308: 0x104d308: sll   zero, zero, 0
+// 0x0104d30c: 0x104d30c: beq   v0, zero, 0x104d350 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104d340
+	brfalse L_104d350
 // --- basic block ---
-// 0x0104d304: 0x104d304: lw    s2, 8(s0)
+// 0x0104d314: 0x104d314: lw    s2, 8(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1809,28 +1809,28 @@ L_104d2dc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d308: 0x104d308: sll   zero, zero, 0
-// 0x0104d30c: 0x104d30c: addiu s2, s2, -1
+// 0x0104d318: 0x104d318: sll   zero, zero, 0
+// 0x0104d31c: 0x104d31c: addiu s2, s2, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0104d310: 0x104d310: j	 0x104d328 sll   s4, s2, 2
+// 0x0104d320: 0x104d320: j	 0x104d338 sll   s4, s2, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 11
-	br L_104d328
+	br L_104d338
 // --- basic block ---
-L_104d318:
-// 0x0104d318: 0x104d318: lw    a0, 0(s5)
+L_104d328:
+// 0x0104d328: 0x104d328: lw    a0, 0(s5)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104d31c: 0x104d31c: jal   0x1000930 addiu s2, s2, -1
+// 0x0104d32c: 0x104d32c: jal   0x1000930 addiu s2, s2, -1
 	ldloc 7
 	ldc.i4.m1
 	add
@@ -1845,13 +1845,13 @@ L_104d318:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d324: 0x104d324: addiu s4, s4, -4
+// 0x0104d334: 0x104d334: addiu s4, s4, -4
 	ldloc 11
 	ldc.i4.s -4
 	add
 	stloc 11
-L_104d328:
-// 0x0104d328: 0x104d328: lw    s5, 12(s0)
+L_104d338:
+// 0x0104d338: 0x104d338: lw    s5, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1860,21 +1860,21 @@ L_104d328:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d32c: 0x104d32c: bgez  s2, 0x104d318 addu  s5, s5, s4
+// 0x0104d33c: 0x104d33c: bgez  s2, 0x104d328 addu  s5, s5, s4
 	ldloc 7
 	ldloc 9
 	ldloc 11
 	add
 	stloc 9
 	ldc.i4.s 0
-	bge L_104d318
+	bge L_104d328
 // --- basic block ---
-// 0x0104d334: 0x104d334: subu  s5, s5, s4
+// 0x0104d344: 0x104d344: subu  s5, s5, s4
 	ldloc 9
 	ldloc 11
 	sub
 	stloc 9
-// 0x0104d338: 0x104d338: jal   0x1000930 addu  a0, s5, zero
+// 0x0104d348: 0x104d348: jal   0x1000930 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1887,22 +1887,22 @@ L_104d328:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_104d340:
-// 0x0104d340: 0x104d340: addiu s1, s1, -1
+L_104d350:
+// 0x0104d350: 0x104d350: addiu s1, s1, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x0104d344: 0x104d344: addu  v0, s1, zero
+// 0x0104d354: 0x104d354: addu  v0, s1, zero
 	ldloc 10
 	stloc 5
-// 0x0104d348: 0x104d348: j	 0x104d358 addu  s2, zero, zero
+// 0x0104d358: 0x104d358: j	 0x104d368 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_104d358
+	br L_104d368
 // --- basic block ---
-L_104d350:
-// 0x0104d350: 0x104d350: jal   0x1001a5c addiu s2, s2, 1
+L_104d360:
+// 0x0104d360: 0x104d360: jal   0x1001a5c addiu s2, s2, 1
 	ldloc 7
 	ldc.i4.1
 	add
@@ -1914,19 +1914,19 @@ L_104d350:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_104d358:
-// 0x0104d358: 0x104d358: addiu a0, v0, 1
+L_104d368:
+// 0x0104d368: 0x104d368: addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0104d35c: 0x104d35c: bne   v0, zero, 0x104d350 addiu a1, zero, 44
+// 0x0104d36c: 0x104d36c: bne   v0, zero, 0x104d360 addiu a1, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc.2
-	brtrue L_104d350
+	brtrue L_104d360
 // --- basic block ---
-// 0x0104d364: 0x104d364: jal   0x104cddc addu  a0, s2, zero
+// 0x0104d374: 0x104d374: jal   0x104cdec addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1934,15 +1934,15 @@ L_104d358:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::T_56_104cddc(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::T_56_104cdec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d36c: 0x104d36c: lui   a0, 0x10000
+// 0x0104d37c: 0x104d37c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104d370: 0x104d370: sw    v0, 12(s0)
+// 0x0104d380: 0x104d380: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -1951,15 +1951,15 @@ L_104d358:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104d374: 0x104d374: addiu a0, a0, 3144
+// 0x0104d384: 0x104d384: addiu a0, a0, 3140
 	ldloc.1
-	ldc.i4 3144
+	ldc.i4 3140
 	add
 	stloc.1
-// 0x0104d378: 0x104d378: addu  a2, v0, zero
+// 0x0104d388: 0x104d388: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0104d37c: 0x104d37c: jal   0x1004a38 addiu a1, zero, 409
+// 0x0104d38c: 0x104d38c: jal   0x1004a48 addiu a1, zero, 409
 	ldc.i4 409
 	stloc.2
 	ldloc.0
@@ -1967,21 +1967,21 @@ L_104d358:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d384: 0x104d384: addu  s2, zero, zero
+// 0x0104d394: 0x104d394: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0104d388: 0x104d388: j	 0x104d3dc addu  s4, zero, zero
+// 0x0104d398: 0x104d398: j	 0x104d3ec addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_104d3dc
+	br L_104d3ec
 // --- basic block ---
-L_104d390:
-// 0x0104d390: 0x104d390: jal   0x1001a5c sll   zero, zero, 0
+L_104d3a0:
+// 0x0104d3a0: 0x104d3a0: jal   0x1001a5c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strchr_1001a5c(int32,int32)
@@ -1989,13 +1989,13 @@ L_104d390:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d398: 0x104d398: addu  s1, v0, zero
+// 0x0104d3a8: 0x104d3a8: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0104d39c: 0x104d39c: addu  a0, s3, zero
+// 0x0104d3ac: 0x104d3ac: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x0104d3a0: 0x104d3a0: lw    s5, 12(s0)
+// 0x0104d3b0: 0x104d3b0: lw    s5, 12(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2004,15 +2004,15 @@ L_104d390:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d3a4: 0x104d3a4: bne   v0, zero, 0x104d3c8 subu  a1, v0, s3
+// 0x0104d3b4: 0x104d3b4: bne   v0, zero, 0x104d3d8 subu  a1, v0, s3
 	ldloc 5
 	ldloc 5
 	ldloc 13
 	sub
 	stloc.2
-	brtrue L_104d3c8
+	brtrue L_104d3d8
 // --- basic block ---
-// 0x0104d3ac: 0x104d3ac: jal   0x1001b48 addu  s5, s5, s2
+// 0x0104d3bc: 0x104d3bc: jal   0x1001b48 addu  s5, s5, s2
 	ldloc 9
 	ldloc 7
 	add
@@ -2023,10 +2023,10 @@ L_104d390:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d3b4: 0x104d3b4: addu  a1, v0, zero
+// 0x0104d3c4: 0x104d3c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104d3b8: 0x104d3b8: jal   0x104c7f4 addu  a0, s3, zero
+// 0x0104d3c8: 0x104d3c8: jal   0x104c804 addu  a0, s3, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -2034,22 +2034,22 @@ L_104d390:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_expand_104c7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_expand_104c804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d3c0: 0x104d3c0: j	 0x104d3d4 sw    v0, 0(s5)
+// 0x0104d3d0: 0x104d3d0: j	 0x104d3e4 sw    v0, 0(s5)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_104d3d4
+	br L_104d3e4
 // --- basic block ---
-L_104d3c8:
-// 0x0104d3c8: 0x104d3c8: jal   0x104c7f4 addu  s3, s5, s2
+L_104d3d8:
+// 0x0104d3d8: 0x104d3d8: jal   0x104c804 addu  s3, s5, s2
 	ldloc 9
 	ldloc 7
 	add
@@ -2059,45 +2059,45 @@ L_104d3c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_expand_104c7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_expand_104c804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d3d0: 0x104d3d0: sw    v0, 0(s3)
+// 0x0104d3e0: 0x104d3e0: sw    v0, 0(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_104d3d4:
-// 0x0104d3d4: 0x104d3d4: addiu s4, s4, 1
+L_104d3e4:
+// 0x0104d3e4: 0x104d3e4: addiu s4, s4, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x0104d3d8: 0x104d3d8: addiu s2, s2, 4
+// 0x0104d3e8: 0x104d3e8: addiu s2, s2, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_104d3dc:
-// 0x0104d3dc: 0x104d3dc: addiu s3, s1, 1
+L_104d3ec:
+// 0x0104d3ec: 0x104d3ec: addiu s3, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 13
-// 0x0104d3e0: 0x104d3e0: addu  a0, s3, zero
+// 0x0104d3f0: 0x104d3f0: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x0104d3e4: 0x104d3e4: bne   s1, zero, 0x104d390 addiu a1, zero, 44
+// 0x0104d3f4: 0x104d3f4: bne   s1, zero, 0x104d3a0 addiu a1, zero, 44
 	ldloc 10
 	ldc.i4.s 44
 	stloc.2
-	brtrue L_104d390
+	brtrue L_104d3a0
 // --- basic block ---
-// 0x0104d3ec: 0x104d3ec: sw    s4, 8(s0)
+// 0x0104d3fc: 0x104d3fc: sw    s4, 8(s0)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2106,9 +2106,9 @@ L_104d3dc:
 	add
 	ldloc 11
 	stelem.i4
-L_104d3f0:
-// 0x0104d3f0: 0x104d3f0: lw    ra, 52(sp)
-// 0x0104d3f4: 0x104d3f4: lw    s5, 48(sp)
+L_104d400:
+// 0x0104d400: 0x104d400: lw    ra, 52(sp)
+// 0x0104d404: 0x104d404: lw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2117,7 +2117,7 @@ L_104d3f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d3f8: 0x104d3f8: lw    s4, 44(sp)
+// 0x0104d408: 0x104d408: lw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2126,7 +2126,7 @@ L_104d3f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104d3fc: 0x104d3fc: lw    s3, 40(sp)
+// 0x0104d40c: 0x104d40c: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2135,7 +2135,7 @@ L_104d3f0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104d400: 0x104d400: lw    s2, 36(sp)
+// 0x0104d410: 0x104d410: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2144,7 +2144,7 @@ L_104d3f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d404: 0x104d404: lw    s1, 32(sp)
+// 0x0104d414: 0x104d414: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2153,7 +2153,7 @@ L_104d3f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104d408: 0x104d408: lw    s0, 28(sp)
+// 0x0104d418: 0x104d418: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2162,7 +2162,7 @@ L_104d3f0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104d40c: 0x104d40c: jr    ra addiu sp, sp, 56
+// 0x0104d41c: 0x104d41c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2174,7 +2174,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_file_base_104d414(int32)
+.method public static int32 roadmap_file_base_104d424(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2194,12 +2194,12 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d414: 0x104d414: beq   a0, zero, 0x104d420 addu  v0, zero, zero
+// 0x0104d424: 0x104d424: beq   a0, zero, 0x104d430 addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_104d420
-// 0x0104d41c: 0x104d41c: lw    v0, 4(a0)
+	brfalse L_104d430
+// 0x0104d42c: 0x104d42c: lw    v0, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2208,14 +2208,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-L_104d420:
-// 0x0104d420: 0x104d420: jr    ra sll   zero, zero, 0
+L_104d430:
+// 0x0104d430: 0x104d430: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_file_size_104d428(int32)
+.method public static int32 roadmap_file_size_104d438(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2235,12 +2235,12 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d428: 0x104d428: beq   a0, zero, 0x104d434 addu  v0, zero, zero
+// 0x0104d438: 0x104d438: beq   a0, zero, 0x104d444 addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_104d434
-// 0x0104d430: 0x104d430: lw    v0, 8(a0)
+	brfalse L_104d444
+// 0x0104d440: 0x104d440: lw    v0, 8(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2249,14 +2249,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-L_104d434:
-// 0x0104d434: 0x104d434: jr    ra sll   zero, zero, 0
+L_104d444:
+// 0x0104d444: 0x104d444: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_file_free_space_104d444()
+.method public static int32 roadmap_file_free_space_104d454()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -2270,7 +2270,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d444: 0x104d444: jr    ra addiu v0, zero, -1
+// 0x0104d454: 0x104d454: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.0
 	br __CIBYL_function_return
@@ -2278,7 +2278,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2313,13 +2313,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d44c: 0x104d44c: addiu sp, sp, -24
+// 0x0104d45c: 0x104d45c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104d450: 0x104d450: sw    ra, 20(sp)
-// 0x0104d454: 0x104d454: jal   0x10023b4 sll   zero, zero, 0
+// 0x0104d460: 0x104d460: sw    ra, 20(sp)
+// 0x0104d464: 0x104d464: jal   0x10023b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2330,9 +2330,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104d45c: 0x104d45c: lw    ra, 20(sp)
-// 0x0104d460: 0x104d460: sll   zero, zero, 0
-// 0x0104d464: 0x104d464: jr    ra addiu sp, sp, 24
+// 0x0104d46c: 0x104d46c: lw    ra, 20(sp)
+// 0x0104d470: 0x104d470: sll   zero, zero, 0
+// 0x0104d474: 0x104d474: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2344,7 +2344,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_file_write_104d46c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_write_104d47c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2379,19 +2379,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d46c: 0x104d46c: addiu sp, sp, -24
+// 0x0104d47c: 0x104d47c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104d470: 0x104d470: addu  a3, a0, zero
+// 0x0104d480: 0x104d480: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x0104d474: 0x104d474: addu  a0, a1, zero
+// 0x0104d484: 0x104d484: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104d478: 0x104d478: sw    ra, 20(sp)
-// 0x0104d47c: 0x104d47c: jal   0x1001da4 addiu a1, zero, 1
+// 0x0104d488: 0x104d488: sw    ra, 20(sp)
+// 0x0104d48c: 0x104d48c: jal   0x1001da4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2404,9 +2404,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104d484: 0x104d484: lw    ra, 20(sp)
-// 0x0104d488: 0x104d488: sll   zero, zero, 0
-// 0x0104d48c: 0x104d48c: jr    ra addiu sp, sp, 24
+// 0x0104d494: 0x104d494: lw    ra, 20(sp)
+// 0x0104d498: 0x104d498: sll   zero, zero, 0
+// 0x0104d49c: 0x104d49c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2418,7 +2418,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_file_read_104d494(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_read_104d4a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2453,19 +2453,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d494: 0x104d494: addiu sp, sp, -24
+// 0x0104d4a4: 0x104d4a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104d498: 0x104d498: addu  a3, a0, zero
+// 0x0104d4a8: 0x104d4a8: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x0104d49c: 0x104d49c: addu  a0, a1, zero
+// 0x0104d4ac: 0x104d4ac: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104d4a0: 0x104d4a0: sw    ra, 20(sp)
-// 0x0104d4a4: 0x104d4a4: jal   0x1001cec addiu a1, zero, 1
+// 0x0104d4b0: 0x104d4b0: sw    ra, 20(sp)
+// 0x0104d4b4: 0x104d4b4: jal   0x1001cec addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2478,9 +2478,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104d4ac: 0x104d4ac: lw    ra, 20(sp)
-// 0x0104d4b0: 0x104d4b0: sll   zero, zero, 0
-// 0x0104d4b4: 0x104d4b4: jr    ra addiu sp, sp, 24
+// 0x0104d4bc: 0x104d4bc: lw    ra, 20(sp)
+// 0x0104d4c0: 0x104d4c0: sll   zero, zero, 0
+// 0x0104d4c4: 0x104d4c4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2492,7 +2492,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 fopen_exception_handler_104d4bc(int32,int32,int32,int32,int32)
+.method public static int32 fopen_exception_handler_104d4cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2530,12 +2530,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d4bc: 0x104d4bc: addiu sp, sp, -544
+// 0x0104d4cc: 0x104d4cc: addiu sp, sp, -544
 	ldloc.0
 	ldc.i4 -544
 	add
 	stloc.0
-// 0x0104d4c0: 0x104d4c0: sw    s0, 536(sp)
+// 0x0104d4d0: 0x104d4d0: sw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2544,61 +2544,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104d4c4: 0x104d4c4: sw    ra, 540(sp)
-// 0x0104d4c8: 0x104d4c8: addu  s0, a1, zero
+// 0x0104d4d4: 0x104d4d4: sw    ra, 540(sp)
+// 0x0104d4d8: 0x104d4d8: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0104d4cc: 0x104d4cc: cibyl_sysc_arg 0x4
+// 0x0104d4dc: 0x104d4dc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104d4d0: 0x104d4d0: cibyl_sysc 0x91d
+// 0x0104d4e0: 0x104d4e0: cibyl_sysc 0x91d
 	call int32 [WazeWP7]Syscalls::NOPH_Throwable_toString(int32)
 	stloc 5
-// 0x0104d4d4: 0x104d4d4: addu  a0, v0, zero
+// 0x0104d4e4: 0x104d4e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104d4d8: 0x104d4d8: addiu a1, zero, 512
+// 0x0104d4e8: 0x104d4e8: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x0104d4dc: 0x104d4dc: addiu v1, sp, 24
+// 0x0104d4ec: 0x104d4ec: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x0104d4e0: 0x104d4e0: cibyl_sysc_arg 0x4
+// 0x0104d4f0: 0x104d4f0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104d4e4: 0x104d4e4: cibyl_sysc_arg 0x3
+// 0x0104d4f4: 0x104d4f4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104d4e8: 0x104d4e8: cibyl_sysc_arg 0x5
+// 0x0104d4f8: 0x104d4f8: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104d4ec: 0x104d4ec: cibyl_sysc 0x935
+// 0x0104d4fc: 0x104d4fc: cibyl_sysc 0x935
 	call int32 [WazeWP7]Syscalls::NOPH_String_toCharPtr(int32,int32,int32)
 	stloc 5
-// 0x0104d4f0: 0x104d4f0: addu  a0, v0, zero
+// 0x0104d500: 0x104d500: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104d4f4: 0x104d4f4: lui   a1, 0x10000
+// 0x0104d504: 0x104d504: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104d4f8: 0x104d4f8: lui   a3, 0x10000
+// 0x0104d508: 0x104d508: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104d4fc: 0x104d4fc: addiu a1, a1, 3448
+// 0x0104d50c: 0x104d50c: addiu a1, a1, 3444
 	ldloc.2
-	ldc.i4 3448
+	ldc.i4 3444
 	add
 	stloc.2
-// 0x0104d500: 0x104d500: addiu a3, a3, 3464
+// 0x0104d510: 0x104d510: addiu a3, a3, 3460
 	ldloc 4
-	ldc.i4 3464
+	ldc.i4 3460
 	add
 	stloc 4
-// 0x0104d504: 0x104d504: addiu a0, zero, 4
+// 0x0104d514: 0x104d514: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104d508: 0x104d508: addiu a2, zero, 67
+// 0x0104d518: 0x104d518: addiu a2, zero, 67
 	ldc.i4.s 67
 	stloc.3
-// 0x0104d50c: 0x104d50c: jal   0x100449c sw    v1, 16(sp)
+// 0x0104d51c: 0x104d51c: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2617,18 +2617,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d514: 0x104d514: lw    ra, 540(sp)
-// 0x0104d518: 0x104d518: addiu v0, zero, -1
+// 0x0104d524: 0x104d524: lw    ra, 540(sp)
+// 0x0104d528: 0x104d528: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0104d51c: 0x104d51c: sw    v0, 0(s0)
+// 0x0104d52c: 0x104d52c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104d520: 0x104d520: lw    s0, 536(sp)
+// 0x0104d530: 0x104d530: lw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2637,7 +2637,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104d524: 0x104d524: jr    ra addiu sp, sp, 544
+// 0x0104d534: 0x104d534: jr    ra addiu sp, sp, 544
 	ldloc.0
 	ldc.i4 544
 	add
@@ -2649,7 +2649,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 favail_104d5c0(int32,int32,int32,int32,int32)
+.method public static int32 favail_104d5d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -2693,12 +2693,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d5c0: 0x104d5c0: addiu sp, sp, -32
+// 0x0104d5d0: 0x104d5d0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104d5c4: 0x104d5c4: sw    s0, 16(sp)
+// 0x0104d5d4: 0x104d5d4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2707,11 +2707,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104d5c8: 0x104d5c8: addu  s0, a0, zero
+// 0x0104d5d8: 0x104d5d8: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0104d5cc: 0x104d5cc: sw    ra, 28(sp)
-// 0x0104d5d0: 0x104d5d0: sw    s2, 24(sp)
+// 0x0104d5dc: 0x104d5dc: sw    ra, 28(sp)
+// 0x0104d5e0: 0x104d5e0: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2720,7 +2720,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104d5d4: 0x104d5d4: jal   0x1001e0c sw    s1, 20(sp)
+// 0x0104d5e4: 0x104d5e4: jal   0x1001e0c sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2733,16 +2733,16 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::ftell_1001e0c(int32)
 	stloc 6
 // --- basic block ---
-// 0x0104d5dc: 0x104d5dc: addu  a0, s0, zero
+// 0x0104d5ec: 0x104d5ec: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0104d5e0: 0x104d5e0: addiu a2, zero, 2
+// 0x0104d5f0: 0x104d5f0: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0104d5e4: 0x104d5e4: addu  a1, zero, zero
+// 0x0104d5f4: 0x104d5f4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104d5e8: 0x104d5e8: jal   0x10022c4 addu  s2, v0, zero
+// 0x0104d5f8: 0x104d5f8: jal   0x10022c4 addu  s2, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -2755,23 +2755,23 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104d5f0: 0x104d5f0: jal   0x1001e0c addu  a0, s0, zero
+// 0x0104d600: 0x104d600: jal   0x1001e0c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
 	call int32 Cibyl1::ftell_1001e0c(int32)
 	stloc 6
 // --- basic block ---
-// 0x0104d5f8: 0x104d5f8: addu  a0, s0, zero
+// 0x0104d608: 0x104d608: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0104d5fc: 0x104d5fc: addu  a1, s2, zero
+// 0x0104d60c: 0x104d60c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0104d600: 0x104d600: addu  a2, zero, zero
+// 0x0104d610: 0x104d610: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104d604: 0x104d604: jal   0x10022c4 addu  s1, v0, zero
+// 0x0104d614: 0x104d614: jal   0x10022c4 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
 	ldloc.0
@@ -2784,11 +2784,11 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104d60c: 0x104d60c: lw    ra, 28(sp)
-// 0x0104d610: 0x104d610: addu  v0, s1, zero
+// 0x0104d61c: 0x104d61c: lw    ra, 28(sp)
+// 0x0104d620: 0x104d620: addu  v0, s1, zero
 	ldloc 9
 	stloc 6
-// 0x0104d614: 0x104d614: lw    s2, 24(sp)
+// 0x0104d624: 0x104d624: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2797,7 +2797,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104d618: 0x104d618: lw    s1, 20(sp)
+// 0x0104d628: 0x104d628: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2806,7 +2806,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d61c: 0x104d61c: lw    s0, 16(sp)
+// 0x0104d62c: 0x104d62c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2815,7 +2815,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d620: 0x104d620: jr    ra addiu sp, sp, 32
+// 0x0104d630: 0x104d630: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2827,7 +2827,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_file_unmap_104d628(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_unmap_104d638(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
@@ -2868,12 +2868,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d628: 0x104d628: addiu sp, sp, -32
+// 0x0104d638: 0x104d638: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104d62c: 0x104d62c: sw    s0, 20(sp)
+// 0x0104d63c: 0x104d63c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2882,14 +2882,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104d630: 0x104d630: lw    s0, 0(a0)
+// 0x0104d640: 0x104d640: lw    s0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104d634: 0x104d634: sw    s1, 24(sp)
+// 0x0104d644: 0x104d644: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2898,10 +2898,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104d638: 0x104d638: addu  s1, a0, zero
+// 0x0104d648: 0x104d648: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0104d63c: 0x104d63c: lw    a0, 4(s0)
+// 0x0104d64c: 0x104d64c: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2910,12 +2910,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104d640: 0x104d640: sll   zero, zero, 0
-// 0x0104d644: 0x104d644: beq   a0, zero, 0x104d658 sw    ra, 28(sp)
+// 0x0104d650: 0x104d650: sll   zero, zero, 0
+// 0x0104d654: 0x104d654: beq   a0, zero, 0x104d668 sw    ra, 28(sp)
 	ldloc.1
-	brfalse L_104d658
+	brfalse L_104d668
 // --- basic block ---
-// 0x0104d64c: 0x104d64c: jal   0x1000930 sll   zero, zero, 0
+// 0x0104d65c: 0x104d65c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2926,7 +2926,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0104d654: 0x104d654: sw    zero, 4(s0)
+// 0x0104d664: 0x104d664: sw    zero, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2935,20 +2935,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_104d658:
-// 0x0104d658: 0x104d658: lw    a0, 0(s0)
+L_104d668:
+// 0x0104d668: 0x104d668: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104d65c: 0x104d65c: sll   zero, zero, 0
-// 0x0104d660: 0x104d660: beq   a0, zero, 0x104d670 sll   zero, zero, 0
+// 0x0104d66c: 0x104d66c: sll   zero, zero, 0
+// 0x0104d670: 0x104d670: beq   a0, zero, 0x104d680 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_104d670
+	brfalse L_104d680
 // --- basic block ---
-// 0x0104d668: 0x104d668: jal   0x10023b4 sll   zero, zero, 0
+// 0x0104d678: 0x104d678: jal   0x10023b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2959,8 +2959,8 @@ L_104d658:
 	stloc 9
 	stloc 8
 // --- basic block ---
-L_104d670:
-// 0x0104d670: 0x104d670: jal   0x1000930 addu  a0, s0, zero
+L_104d680:
+// 0x0104d680: 0x104d680: jal   0x1000930 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2973,15 +2973,15 @@ L_104d670:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x0104d678: 0x104d678: lw    ra, 28(sp)
-// 0x0104d67c: 0x104d67c: sw    zero, 0(s1)
+// 0x0104d688: 0x104d688: lw    ra, 28(sp)
+// 0x0104d68c: 0x104d68c: sw    zero, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104d680: 0x104d680: lw    s0, 20(sp)
+// 0x0104d690: 0x104d690: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2990,7 +2990,7 @@ L_104d670:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104d684: 0x104d684: lw    s1, 24(sp)
+// 0x0104d694: 0x104d694: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2999,7 +2999,7 @@ L_104d670:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d688: 0x104d688: jr    ra addiu sp, sp, 32
+// 0x0104d698: 0x104d698: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3011,7 +3011,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -3049,13 +3049,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d690: 0x104d690: addiu sp, sp, -24
+// 0x0104d6a0: 0x104d6a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104d694: 0x104d694: sw    ra, 20(sp)
-// 0x0104d698: 0x104d698: beq   a0, zero, 0x104d6c4 sw    s0, 16(sp)
+// 0x0104d6a4: 0x104d6a4: sw    ra, 20(sp)
+// 0x0104d6a8: 0x104d6a8: beq   a0, zero, 0x104d6d4 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 7
 	ldloc.0
@@ -3065,53 +3065,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_104d6c4
+	brfalse L_104d6d4
 // --- basic block ---
-// 0x0104d6a0: 0x104d6a0: lbu   v0, 0(a1)
+// 0x0104d6b0: 0x104d6b0: lbu   v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0104d6a4: 0x104d6a4: sll   zero, zero, 0
-// 0x0104d6a8: 0x104d6a8: bne   v0, zero, 0x104d6c4 sll   zero, zero, 0
+// 0x0104d6b4: 0x104d6b4: sll   zero, zero, 0
+// 0x0104d6b8: 0x104d6b8: bne   v0, zero, 0x104d6d4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104d6c4
+	brtrue L_104d6d4
 // --- basic block ---
-// 0x0104d6b0: 0x104d6b0: cibyl_sysc_arg 0x4
+// 0x0104d6c0: 0x104d6c0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104d6b4: 0x104d6b4: cibyl_sysc 0x94b
+// 0x0104d6c4: 0x104d6c4: cibyl_sysc 0x94b
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_pathExists(int32)
 	stloc 5
-// 0x0104d6b8: 0x104d6b8: addu  s0, v0, zero
+// 0x0104d6c8: 0x104d6c8: addu  s0, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0104d6bc: 0x104d6bc: j	 0x104d6ec sltu  s0, zero, s0
+// 0x0104d6cc: 0x104d6cc: j	 0x104d6fc sltu  s0, zero, s0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc 6
-	br L_104d6ec
+	br L_104d6fc
 // --- basic block ---
-L_104d6c4:
-// 0x0104d6c4: 0x104d6c4: jal   0x104cb30 sll   zero, zero, 0
+L_104d6d4:
+// 0x0104d6d4: 0x104d6d4: jal   0x104cb40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d6cc: 0x104d6cc: lui   a1, 0x10000
+// 0x0104d6dc: 0x104d6dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104d6d0: 0x104d6d0: addu  a0, v0, zero
+// 0x0104d6e0: 0x104d6e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104d6d4: 0x104d6d4: jal   0x1002540 addiu a1, a1, 6924
+// 0x0104d6e4: 0x104d6e4: jal   0x1002540 addiu a1, a1, 6920
 	ldloc.2
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc.2
 	ldloc.0
@@ -3124,15 +3124,15 @@ L_104d6c4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104d6dc: 0x104d6dc: beq   v0, zero, 0x104d6ec sltu  s0, zero, v0
+// 0x0104d6ec: 0x104d6ec: beq   v0, zero, 0x104d6fc sltu  s0, zero, v0
 	ldloc 5
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 6
-	brfalse L_104d6ec
+	brfalse L_104d6fc
 // --- basic block ---
-// 0x0104d6e4: 0x104d6e4: jal   0x10023b4 addu  a0, v0, zero
+// 0x0104d6f4: 0x104d6f4: jal   0x10023b4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3145,12 +3145,12 @@ L_104d6c4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_104d6ec:
-// 0x0104d6ec: 0x104d6ec: lw    ra, 20(sp)
-// 0x0104d6f0: 0x104d6f0: addu  v0, s0, zero
+L_104d6fc:
+// 0x0104d6fc: 0x104d6fc: lw    ra, 20(sp)
+// 0x0104d700: 0x104d700: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-// 0x0104d6f4: 0x104d6f4: lw    s0, 16(sp)
+// 0x0104d704: 0x104d704: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3159,7 +3159,7 @@ L_104d6ec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104d6f8: 0x104d6f8: jr    ra addiu sp, sp, 24
+// 0x0104d708: 0x104d708: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3171,7 +3171,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_file_length_104d700(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_length_104d710(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 ra)
@@ -3215,13 +3215,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d700: 0x104d700: addiu sp, sp, -32
+// 0x0104d710: 0x104d710: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104d704: 0x104d704: sw    ra, 28(sp)
-// 0x0104d708: 0x104d708: sw    s2, 24(sp)
+// 0x0104d714: 0x104d714: sw    ra, 28(sp)
+// 0x0104d718: 0x104d718: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3230,7 +3230,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104d70c: 0x104d70c: sw    s1, 20(sp)
+// 0x0104d71c: 0x104d71c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3239,7 +3239,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104d710: 0x104d710: jal   0x104cb30 sw    s0, 16(sp)
+// 0x0104d720: 0x104d720: jal   0x104cb40 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3253,23 +3253,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d718: 0x104d718: lui   a1, 0x10000
+// 0x0104d728: 0x104d728: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104d71c: 0x104d71c: addu  a0, v0, zero
+// 0x0104d72c: 0x104d72c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104d720: 0x104d720: addiu a1, a1, 6924
+// 0x0104d730: 0x104d730: addiu a1, a1, 6920
 	ldloc.2
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc.2
-// 0x0104d724: 0x104d724: jal   0x1002540 addu  s0, v0, zero
+// 0x0104d734: 0x104d734: jal   0x1002540 addu  s0, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -3282,16 +3282,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d72c: 0x104d72c: addu  s1, v0, zero
+// 0x0104d73c: 0x104d73c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104d730: 0x104d730: beq   v0, zero, 0x104d754 addiu s2, zero, -1
+// 0x0104d740: 0x104d740: beq   v0, zero, 0x104d764 addiu s2, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 9
-	brfalse L_104d754
+	brfalse L_104d764
 // --- basic block ---
-// 0x0104d738: 0x104d738: jal   0x104c670 addu  a0, s0, zero
+// 0x0104d748: 0x104d748: jal   0x104c680 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -3299,12 +3299,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d740: 0x104d740: jal   0x104d5c0 addu  a0, s1, zero
+// 0x0104d750: 0x104d750: jal   0x104d5d0 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3312,15 +3312,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::favail_104d5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::favail_104d5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d748: 0x104d748: addu  a0, s1, zero
+// 0x0104d758: 0x104d758: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0104d74c: 0x104d74c: jal   0x10023b4 addu  s2, v0, zero
+// 0x0104d75c: 0x104d75c: jal   0x10023b4 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -3333,12 +3333,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104d754:
-// 0x0104d754: 0x104d754: lw    ra, 28(sp)
-// 0x0104d758: 0x104d758: addu  v0, s2, zero
+L_104d764:
+// 0x0104d764: 0x104d764: lw    ra, 28(sp)
+// 0x0104d768: 0x104d768: addu  v0, s2, zero
 	ldloc 9
 	stloc 5
-// 0x0104d75c: 0x104d75c: lw    s2, 24(sp)
+// 0x0104d76c: 0x104d76c: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3347,7 +3347,7 @@ L_104d754:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d760: 0x104d760: lw    s1, 20(sp)
+// 0x0104d770: 0x104d770: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3356,7 +3356,7 @@ L_104d754:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104d764: 0x104d764: lw    s0, 16(sp)
+// 0x0104d774: 0x104d774: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3365,7 +3365,7 @@ L_104d754:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104d768: 0x104d768: jr    ra addiu sp, sp, 32
+// 0x0104d778: 0x104d778: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3377,7 +3377,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_file_map_104d770(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_map_104d780(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s5,int32 s2,int32 s4,int32 ra)
@@ -3430,12 +3430,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104d770: 0x104d770: addiu sp, sp, -64
+// 0x0104d780: 0x104d780: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0104d774: 0x104d774: sw    s2, 44(sp)
+// 0x0104d784: 0x104d784: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3444,14 +3444,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104d778: 0x104d778: addu  s2, a0, zero
+// 0x0104d788: 0x104d788: addu  s2, a0, zero
 	ldloc.1
 	stloc 12
-// 0x0104d77c: 0x104d77c: addiu a0, zero, 12
+// 0x0104d78c: 0x104d78c: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0104d780: 0x104d780: sw    ra, 60(sp)
-// 0x0104d784: 0x104d784: sw    s5, 56(sp)
+// 0x0104d790: 0x104d790: sw    ra, 60(sp)
+// 0x0104d794: 0x104d794: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3460,7 +3460,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104d788: 0x104d788: sw    s4, 52(sp)
+// 0x0104d798: 0x104d798: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3469,7 +3469,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104d78c: 0x104d78c: sw    s3, 48(sp)
+// 0x0104d79c: 0x104d79c: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3478,7 +3478,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104d790: 0x104d790: sw    s1, 40(sp)
+// 0x0104d7a0: 0x104d7a0: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3487,10 +3487,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104d794: 0x104d794: addu  s3, a3, zero
+// 0x0104d7a4: 0x104d7a4: addu  s3, a3, zero
 	ldloc 4
 	stloc 9
-// 0x0104d798: 0x104d798: sw    s0, 36(sp)
+// 0x0104d7a8: 0x104d7a8: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3499,13 +3499,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104d79c: 0x104d79c: addu  s1, a1, zero
+// 0x0104d7ac: 0x104d7ac: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0104d7a0: 0x104d7a0: addu  s0, a2, zero
+// 0x0104d7b0: 0x104d7b0: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0104d7a4: 0x104d7a4: jal   0x1000910 lui   s4, 0x10000
+// 0x0104d7b4: 0x104d7b4: jal   0x1000910 lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 13
 	ldloc.0
@@ -3518,18 +3518,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d7ac: 0x104d7ac: addu  a2, v0, zero
+// 0x0104d7bc: 0x104d7bc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0104d7b0: 0x104d7b0: addiu a0, s4, 3448
+// 0x0104d7c0: 0x104d7c0: addiu a0, s4, 3444
 	ldloc 13
-	ldc.i4 3448
+	ldc.i4 3444
 	add
 	stloc.1
-// 0x0104d7b4: 0x104d7b4: addiu a1, zero, 309
+// 0x0104d7c4: 0x104d7c4: addiu a1, zero, 309
 	ldc.i4 309
 	stloc.2
-// 0x0104d7b8: 0x104d7b8: jal   0x1004a38 sw    v0, 24(sp)
+// 0x0104d7c8: 0x104d7c8: jal   0x1004a48 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3543,12 +3543,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d7c0: 0x104d7c0: lw    s5, 24(sp)
+// 0x0104d7d0: 0x104d7d0: lw    s5, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3557,17 +3557,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104d7c4: 0x104d7c4: lui   a1, 0x10000
+// 0x0104d7d4: 0x104d7d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104d7c8: 0x104d7c8: sw    zero, 0(s5)
+// 0x0104d7d8: 0x104d7d8: sw    zero, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104d7cc: 0x104d7cc: sw    zero, 4(s5)
+// 0x0104d7dc: 0x104d7dc: sw    zero, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3576,7 +3576,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104d7d0: 0x104d7d0: sw    zero, 8(s5)
+// 0x0104d7e0: 0x104d7e0: sw    zero, 8(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3585,12 +3585,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104d7d4: 0x104d7d4: addiu a1, a1, 6924
+// 0x0104d7e4: 0x104d7e4: addiu a1, a1, 6920
 	ldloc.2
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc.2
-// 0x0104d7d8: 0x104d7d8: jal   0x1001b14 addu  a0, s3, zero
+// 0x0104d7e8: 0x104d7e8: jal   0x1001b14 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -3598,32 +3598,32 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104d7e0: 0x104d7e0: beq   v0, zero, 0x104d818 addiu v0, zero, 47
+// 0x0104d7f0: 0x104d7f0: beq   v0, zero, 0x104d828 addiu v0, zero, 47
 	ldloc 5
 	ldc.i4.s 47
 	stloc 5
-	brfalse L_104d818
+	brfalse L_104d828
 // --- basic block ---
-// 0x0104d7e8: 0x104d7e8: lui   a3, 0x10000
+// 0x0104d7f8: 0x104d7f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104d7ec: 0x104d7ec: addiu a0, zero, 4
+// 0x0104d7fc: 0x104d7fc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104d7f0: 0x104d7f0: addiu a1, s4, 3448
+// 0x0104d800: 0x104d800: addiu a1, s4, 3444
 	ldloc 13
-	ldc.i4 3448
+	ldc.i4 3444
 	add
 	stloc.2
-// 0x0104d7f4: 0x104d7f4: addiu a3, a3, 3552
+// 0x0104d804: 0x104d804: addiu a3, a3, 3548
 	ldloc 4
-	ldc.i4 3552
+	ldc.i4 3548
 	add
 	stloc 4
-// 0x0104d7f8: 0x104d7f8: addiu a2, zero, 316
+// 0x0104d808: 0x104d808: addiu a2, zero, 316
 	ldc.i4 316
 	stloc.3
-// 0x0104d7fc: 0x104d7fc: sw    s1, 16(sp)
+// 0x0104d80c: 0x104d80c: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3632,7 +3632,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104d800: 0x104d800: sw    s3, 20(sp)
+// 0x0104d810: 0x104d810: sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3641,7 +3641,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104d804: 0x104d804: jal   0x100449c addu  s0, zero, zero
+// 0x0104d814: 0x104d814: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -3654,7 +3654,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d80c: 0x104d80c: lw    a0, 24(sp)
+// 0x0104d81c: 0x104d81c: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3663,23 +3663,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104d810: 0x104d810: j	 0x104d870 sll   zero, zero, 0
-	br L_104d870
+// 0x0104d820: 0x104d820: j	 0x104d880 sll   zero, zero, 0
+	br L_104d880
 // --- basic block ---
-L_104d818:
-// 0x0104d818: 0x104d818: lb    v1, 0(s1)
+L_104d828:
+// 0x0104d828: 0x104d828: lb    v1, 0(s1)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0104d81c: 0x104d81c: sll   zero, zero, 0
-// 0x0104d820: 0x104d820: bne   v1, v0, 0x104d840 addu  a1, s3, zero
+// 0x0104d82c: 0x104d82c: sll   zero, zero, 0
+// 0x0104d830: 0x104d830: bne   v1, v0, 0x104d850 addu  a1, s3, zero
 	ldloc 7
 	ldloc 5
 	ldloc 9
 	stloc.2
-	bne.un L_104d840
+	bne.un L_104d850
 // --- basic block ---
-// 0x0104d828: 0x104d828: jal   0x1002540 addu  a0, s1, zero
+// 0x0104d838: 0x104d838: jal   0x1002540 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -3692,31 +3692,31 @@ L_104d818:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d830: 0x104d830: lui   s0, 0x10000
+// 0x0104d840: 0x104d840: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0104d834: 0x104d834: sw    v0, 0(s5)
+// 0x0104d844: 0x104d844: sw    v0, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104d838: 0x104d838: j	 0x104d8d4 addiu s0, s0, 18500
+// 0x0104d848: 0x104d848: j	 0x104d8e4 addiu s0, s0, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 8
-	br L_104d8d4
+	br L_104d8e4
 // --- basic block ---
-L_104d840:
-// 0x0104d840: 0x104d840: bne   s0, zero, 0x104d858 addu  a1, s0, zero
+L_104d850:
+// 0x0104d850: 0x104d850: bne   s0, zero, 0x104d868 addu  a1, s0, zero
 	ldloc 8
 	ldloc 8
 	stloc.2
-	brtrue L_104d858
+	brtrue L_104d868
 // --- basic block ---
-// 0x0104d848: 0x104d848: jal   0x104d204 addu  a0, s2, zero
+// 0x0104d858: 0x104d858: jal   0x104d214 addu  a0, s2, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -3724,18 +3724,18 @@ L_104d840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d850: 0x104d850: j	 0x104d864 addu  s0, v0, zero
+// 0x0104d860: 0x104d860: j	 0x104d874 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	br L_104d864
+	br L_104d874
 // --- basic block ---
-L_104d858:
-// 0x0104d858: 0x104d858: jal   0x104d18c addu  a0, s2, zero
+L_104d868:
+// 0x0104d868: 0x104d868: jal   0x104d19c addu  a0, s2, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -3743,22 +3743,22 @@ L_104d858:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d860: 0x104d860: addu  s0, v0, zero
+// 0x0104d870: 0x104d870: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_104d864:
-// 0x0104d864: 0x104d864: bne   v0, zero, 0x104d884 addu  a0, s0, zero
+L_104d874:
+// 0x0104d874: 0x104d874: bne   v0, zero, 0x104d894 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_104d884
+	brtrue L_104d894
 // --- basic block ---
-// 0x0104d86c: 0x104d86c: lw    a0, 24(sp)
+// 0x0104d87c: 0x104d87c: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3767,8 +3767,8 @@ L_104d864:
 	add
 	ldelem.i4
 	stloc.1
-L_104d870:
-// 0x0104d870: 0x104d870: jal   0x1000930 sll   zero, zero, 0
+L_104d880:
+// 0x0104d880: 0x104d880: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3779,15 +3779,15 @@ L_104d870:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d878: 0x104d878: j	 0x104d9dc sll   zero, zero, 0
-	br L_104d9dc
+// 0x0104d888: 0x104d888: j	 0x104d9ec sll   zero, zero, 0
+	br L_104d9ec
 // --- basic block ---
-L_104d880:
-// 0x0104d880: 0x104d880: addu  a0, s0, zero
+L_104d890:
+// 0x0104d890: 0x104d890: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_104d884:
-// 0x0104d884: 0x104d884: jal   0x104cb30 addu  a1, s1, zero
+L_104d894:
+// 0x0104d894: 0x104d894: jal   0x104cb40 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -3795,18 +3795,18 @@ L_104d884:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d88c: 0x104d88c: addu  a0, v0, zero
+// 0x0104d89c: 0x104d89c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104d890: 0x104d890: addu  a1, s3, zero
+// 0x0104d8a0: 0x104d8a0: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0104d894: 0x104d894: lw    s5, 24(sp)
+// 0x0104d8a4: 0x104d8a4: lw    s5, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3815,7 +3815,7 @@ L_104d884:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104d898: 0x104d898: jal   0x1002540 addu  s4, v0, zero
+// 0x0104d8a8: 0x104d8a8: jal   0x1002540 addu  s4, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -3828,14 +3828,14 @@ L_104d884:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d8a0: 0x104d8a0: sw    v0, 0(s5)
+// 0x0104d8b0: 0x104d8b0: sw    v0, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104d8a4: 0x104d8a4: jal   0x104c670 addu  a0, s4, zero
+// 0x0104d8b4: 0x104d8b4: jal   0x104c680 addu  a0, s4, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -3843,12 +3843,12 @@ L_104d884:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d8ac: 0x104d8ac: lw    v0, 24(sp)
+// 0x0104d8bc: 0x104d8bc: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3857,42 +3857,42 @@ L_104d884:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104d8b0: 0x104d8b0: addu  a1, s0, zero
+// 0x0104d8c0: 0x104d8c0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0104d8b4: 0x104d8b4: lw    v0, 0(v0)
+// 0x0104d8c4: 0x104d8c4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104d8b8: 0x104d8b8: sll   zero, zero, 0
-// 0x0104d8bc: 0x104d8bc: bne   v0, zero, 0x104d8d4 addu  a0, s2, zero
+// 0x0104d8c8: 0x104d8c8: sll   zero, zero, 0
+// 0x0104d8cc: 0x104d8cc: bne   v0, zero, 0x104d8e4 addu  a0, s2, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brtrue L_104d8d4
+	brtrue L_104d8e4
 // --- basic block ---
-// 0x0104d8c4: 0x104d8c4: jal   0x104d18c sll   zero, zero, 0
+// 0x0104d8d4: 0x104d8d4: jal   0x104d19c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d8cc: 0x104d8cc: bne   v0, zero, 0x104d880 addu  s0, v0, zero
+// 0x0104d8dc: 0x104d8dc: bne   v0, zero, 0x104d890 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brtrue L_104d880
+	brtrue L_104d890
 // --- basic block ---
-L_104d8d4:
-// 0x0104d8d4: 0x104d8d4: lw    s3, 24(sp)
+L_104d8e4:
+// 0x0104d8e4: 0x104d8e4: lw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3901,59 +3901,59 @@ L_104d8d4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d8d8: 0x104d8d8: sll   zero, zero, 0
-// 0x0104d8dc: 0x104d8dc: lw    a0, 0(s3)
+// 0x0104d8e8: 0x104d8e8: sll   zero, zero, 0
+// 0x0104d8ec: 0x104d8ec: lw    a0, 0(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104d8e0: 0x104d8e0: sll   zero, zero, 0
-// 0x0104d8e4: 0x104d8e4: bne   a0, zero, 0x104d90c sll   zero, zero, 0
+// 0x0104d8f0: 0x104d8f0: sll   zero, zero, 0
+// 0x0104d8f4: 0x104d8f4: bne   a0, zero, 0x104d91c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_104d90c
+	brtrue L_104d91c
 // --- basic block ---
-// 0x0104d8ec: 0x104d8ec: bne   s0, zero, 0x104d984 lui   a3, 0x10000
+// 0x0104d8fc: 0x104d8fc: bne   s0, zero, 0x104d994 lui   a3, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc 4
-	brtrue L_104d984
+	brtrue L_104d994
 // --- basic block ---
-// 0x0104d8f4: 0x104d8f4: lui   a1, 0x10000
+// 0x0104d904: 0x104d904: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104d8f8: 0x104d8f8: addiu a1, a1, 3448
+// 0x0104d908: 0x104d908: addiu a1, a1, 3444
 	ldloc.2
-	ldc.i4 3448
+	ldc.i4 3444
 	add
 	stloc.2
-// 0x0104d8fc: 0x104d8fc: addiu a3, a3, 3584
+// 0x0104d90c: 0x104d90c: addiu a3, a3, 3580
 	ldloc 4
-	ldc.i4 3584
+	ldc.i4 3580
 	add
 	stloc 4
-// 0x0104d900: 0x104d900: addiu a0, zero, 2
+// 0x0104d910: 0x104d910: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0104d904: 0x104d904: j	 0x104d97c addiu a2, zero, 356
+// 0x0104d914: 0x104d914: j	 0x104d98c addiu a2, zero, 356
 	ldc.i4 356
 	stloc.3
-	br L_104d97c
+	br L_104d98c
 // --- basic block ---
-L_104d90c:
-// 0x0104d90c: 0x104d90c: jal   0x104d5c0 sll   zero, zero, 0
+L_104d91c:
+// 0x0104d91c: 0x104d91c: jal   0x104d5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::favail_104d5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::favail_104d5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d914: 0x104d914: blez  v0, 0x104d984 sw    v0, 8(s3)
+// 0x0104d924: 0x104d924: blez  v0, 0x104d994 sw    v0, 8(s3)
 	ldloc 5
 	ldloc 6
 	ldloc 9
@@ -3964,9 +3964,9 @@ L_104d90c:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	ble L_104d984
+	ble L_104d994
 // --- basic block ---
-// 0x0104d91c: 0x104d91c: lw    s3, 24(sp)
+// 0x0104d92c: 0x104d92c: lw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3975,8 +3975,8 @@ L_104d90c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d920: 0x104d920: sll   zero, zero, 0
-// 0x0104d924: 0x104d924: lw    a0, 8(s3)
+// 0x0104d930: 0x104d930: sll   zero, zero, 0
+// 0x0104d934: 0x104d934: lw    a0, 8(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3985,7 +3985,7 @@ L_104d90c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104d928: 0x104d928: jal   0x1000910 sll   zero, zero, 0
+// 0x0104d938: 0x104d938: jal   0x1000910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3996,7 +3996,7 @@ L_104d90c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d930: 0x104d930: lw    v1, 24(sp)
+// 0x0104d940: 0x104d940: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4005,7 +4005,7 @@ L_104d90c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d934: 0x104d934: sw    v0, 4(s3)
+// 0x0104d944: 0x104d944: sw    v0, 4(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4014,7 +4014,7 @@ L_104d90c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104d938: 0x104d938: lw    a0, 4(v1)
+// 0x0104d948: 0x104d948: lw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4023,21 +4023,21 @@ L_104d90c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104d93c: 0x104d93c: sll   zero, zero, 0
-// 0x0104d940: 0x104d940: beq   a0, zero, 0x104d968 lui   a1, 0x10000
+// 0x0104d94c: 0x104d94c: sll   zero, zero, 0
+// 0x0104d950: 0x104d950: beq   a0, zero, 0x104d978 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brfalse L_104d968
+	brfalse L_104d978
 // --- basic block ---
-// 0x0104d948: 0x104d948: lw    a3, 0(v1)
+// 0x0104d958: 0x104d958: lw    a3, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0104d94c: 0x104d94c: lw    a1, 8(v1)
+// 0x0104d95c: 0x104d95c: lw    a1, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4046,7 +4046,7 @@ L_104d90c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104d950: 0x104d950: jal   0x1001cec addiu a2, zero, 1
+// 0x0104d960: 0x104d960: jal   0x1001cec addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -4059,39 +4059,39 @@ L_104d90c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d958: 0x104d958: addiu v1, zero, 1
+// 0x0104d968: 0x104d968: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0104d95c: 0x104d95c: beq   v0, v1, 0x104d994 sll   zero, zero, 0
+// 0x0104d96c: 0x104d96c: beq   v0, v1, 0x104d9a4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_104d994
+	beq  L_104d9a4
 // --- basic block ---
-// 0x0104d964: 0x104d964: lui   a1, 0x10000
+// 0x0104d974: 0x104d974: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_104d968:
-// 0x0104d968: 0x104d968: lui   a3, 0x10000
+L_104d978:
+// 0x0104d978: 0x104d978: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104d96c: 0x104d96c: addiu a1, a1, 3448
+// 0x0104d97c: 0x104d97c: addiu a1, a1, 3444
 	ldloc.2
-	ldc.i4 3448
+	ldc.i4 3444
 	add
 	stloc.2
-// 0x0104d970: 0x104d970: addiu a3, a3, 3604
+// 0x0104d980: 0x104d980: addiu a3, a3, 3600
 	ldloc 4
-	ldc.i4 3604
+	ldc.i4 3600
 	add
 	stloc 4
-// 0x0104d974: 0x104d974: addiu a0, zero, 4
+// 0x0104d984: 0x104d984: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104d978: 0x104d978: addiu a2, zero, 371
+// 0x0104d988: 0x104d988: addiu a2, zero, 371
 	ldc.i4 371
 	stloc.3
-L_104d97c:
-// 0x0104d97c: 0x104d97c: jal   0x100449c sw    s1, 16(sp)
+L_104d98c:
+// 0x0104d98c: 0x104d98c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4110,8 +4110,8 @@ L_104d97c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104d984:
-// 0x0104d984: 0x104d984: jal   0x104d628 addiu a0, sp, 24
+L_104d994:
+// 0x0104d994: 0x104d994: jal   0x104d638 addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4121,18 +4121,18 @@ L_104d984:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_unmap_104d628(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_unmap_104d638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d98c: 0x104d98c: j	 0x104d9dc addu  s0, zero, zero
+// 0x0104d99c: 0x104d99c: j	 0x104d9ec addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_104d9dc
+	br L_104d9ec
 // --- basic block ---
-L_104d994:
-// 0x0104d994: 0x104d994: lw    v1, 24(sp)
+L_104d9a4:
+// 0x0104d9a4: 0x104d9a4: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4141,7 +4141,7 @@ L_104d994:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104d998: 0x104d998: lw    v0, 80(sp)
+// 0x0104d9a8: 0x104d9a8: lw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4150,20 +4150,20 @@ L_104d994:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104d99c: 0x104d99c: lui   a1, 0x0
+// 0x0104d9ac: 0x104d9ac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0104d9a0: 0x104d9a0: sw    v1, 0(v0)
+// 0x0104d9b0: 0x104d9b0: sw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0104d9a4: 0x104d9a4: addu  a0, s2, zero
+// 0x0104d9b4: 0x104d9b4: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x0104d9a8: 0x104d9a8: jal   0x1001b14 addiu a1, a1, 21376
+// 0x0104d9b8: 0x104d9b8: jal   0x1001b14 addiu a1, a1, 21376
 	ldloc.2
 	ldc.i4 21376
 	add
@@ -4173,13 +4173,13 @@ L_104d994:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104d9b0: 0x104d9b0: bne   v0, zero, 0x104d9dc lui   s1, 0x0
+// 0x0104d9c0: 0x104d9c0: bne   v0, zero, 0x104d9ec lui   s1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brtrue L_104d9dc
+	brtrue L_104d9ec
 // --- basic block ---
-// 0x0104d9b8: 0x104d9b8: jal   0x100e348 addiu a0, s1, 6804
+// 0x0104d9c8: 0x104d9c8: jal   0x100e358 addiu a0, s1, 6804
 	ldloc 10
 	ldc.i4 6804
 	add
@@ -4189,15 +4189,15 @@ L_104d994:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104d9c0: 0x104d9c0: addu  a1, v0, zero
+// 0x0104d9d0: 0x104d9d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104d9c4: 0x104d9c4: jal   0x1001b14 addu  a0, s0, zero
+// 0x0104d9d4: 0x104d9d4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -4205,15 +4205,15 @@ L_104d994:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104d9cc: 0x104d9cc: beq   v0, zero, 0x104d9dc addiu a0, s1, 6804
+// 0x0104d9dc: 0x104d9dc: beq   v0, zero, 0x104d9ec addiu a0, s1, 6804
 	ldloc 5
 	ldloc 10
 	ldc.i4 6804
 	add
 	stloc.1
-	brfalse L_104d9dc
+	brfalse L_104d9ec
 // --- basic block ---
-// 0x0104d9d4: 0x104d9d4: jal   0x100e5c0 addu  a1, s0, zero
+// 0x0104d9e4: 0x104d9e4: jal   0x100e5d0 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4221,17 +4221,17 @@ L_104d994:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104d9dc:
-// 0x0104d9dc: 0x104d9dc: lw    ra, 60(sp)
-// 0x0104d9e0: 0x104d9e0: addu  v0, s0, zero
+L_104d9ec:
+// 0x0104d9ec: 0x104d9ec: lw    ra, 60(sp)
+// 0x0104d9f0: 0x104d9f0: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0104d9e4: 0x104d9e4: lw    s5, 56(sp)
+// 0x0104d9f4: 0x104d9f4: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4240,7 +4240,7 @@ L_104d9dc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104d9e8: 0x104d9e8: lw    s4, 52(sp)
+// 0x0104d9f8: 0x104d9f8: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4249,7 +4249,7 @@ L_104d9dc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104d9ec: 0x104d9ec: lw    s3, 48(sp)
+// 0x0104d9fc: 0x104d9fc: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4258,7 +4258,7 @@ L_104d9dc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104d9f0: 0x104d9f0: lw    s2, 44(sp)
+// 0x0104da00: 0x104da00: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4267,7 +4267,7 @@ L_104d9dc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104d9f4: 0x104d9f4: lw    s1, 40(sp)
+// 0x0104da04: 0x104da04: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4276,7 +4276,7 @@ L_104d9dc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104d9f8: 0x104d9f8: lw    s0, 36(sp)
+// 0x0104da08: 0x104da08: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4285,7 +4285,7 @@ L_104d9dc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104d9fc: 0x104d9fc: jr    ra addiu sp, sp, 64
+// 0x0104da0c: 0x104da0c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4297,7 +4297,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra,int32 ecb,int32 ear)
@@ -4341,12 +4341,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104da04: 0x104da04: addiu sp, sp, -40
+// 0x0104da14: 0x104da14: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104da08: 0x104da08: sw    s0, 32(sp)
+// 0x0104da18: 0x104da18: sw    s0, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4355,30 +4355,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104da0c: 0x104da0c: sw    ra, 36(sp)
-// 0x0104da10: 0x104da10: jal   0x104cb30 sll   zero, zero, 0
+// 0x0104da1c: 0x104da1c: sw    ra, 36(sp)
+// 0x0104da20: 0x104da20: jal   0x104cb40 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104da18: 0x104da18: lui   a1, 0x10000
+// 0x0104da28: 0x104da28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104da1c: 0x104da1c: addu  a0, v0, zero
+// 0x0104da2c: 0x104da2c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104da20: 0x104da20: addiu a1, a1, 3624
+// 0x0104da30: 0x104da30: addiu a1, a1, 3620
 	ldloc.2
-	ldc.i4 3624
+	ldc.i4 3620
 	add
 	stloc.2
-// 0x0104da24: 0x104da24: jal   0x1000420 addu  s0, v0, zero
+// 0x0104da34: 0x104da34: jal   0x1000420 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -4391,32 +4391,32 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104da2c: 0x104da2c: bne   v0, zero, 0x104da50 lui   a1, 0x10000
+// 0x0104da3c: 0x104da3c: bne   v0, zero, 0x104da60 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_104da50
+	brtrue L_104da60
 // --- basic block ---
-// 0x0104da34: 0x104da34: lui   a3, 0x10000
+// 0x0104da44: 0x104da44: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104da38: 0x104da38: addiu a1, a1, 3448
+// 0x0104da48: 0x104da48: addiu a1, a1, 3444
 	ldloc.2
-	ldc.i4 3448
+	ldc.i4 3444
 	add
 	stloc.2
-// 0x0104da3c: 0x104da3c: addiu a3, a3, 3632
+// 0x0104da4c: 0x104da4c: addiu a3, a3, 3628
 	ldloc 4
-	ldc.i4 3632
+	ldc.i4 3628
 	add
 	stloc 4
-// 0x0104da40: 0x104da40: addiu a0, zero, 4
+// 0x0104da50: 0x104da50: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104da44: 0x104da44: addiu a2, zero, 163
+// 0x0104da54: 0x104da54: addiu a2, zero, 163
 	ldc.i4 163
 	stloc.3
-// 0x0104da48: 0x104da48: jal   0x100449c sw    s0, 16(sp)
+// 0x0104da58: 0x104da58: jal   0x100449c sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4435,17 +4435,17 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104da50:
-// 0x0104da50: 0x104da50: lui   a0, 0x1000000
+L_104da60:
+// 0x0104da60: 0x104da60: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x0104da54: 0x104da54: addiu a0, a0, 264
+// 0x0104da64: 0x104da64: addiu a0, a0, 264
 	ldloc.1
 	ldc.i4 264
 	add
 	stloc.1
-L_104da58:
-// 0x0104da58: 0x104da58: jal   0x1000120 addiu a1, sp, 24
+L_104da68:
+// 0x0104da68: 0x104da68: jal   0x1000120 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4455,58 +4455,58 @@ L_104da58:
 	ldloc.2
 	stloc 11
 // --- basic block ---
-// 0x0104da60: 0x104da60: lw    v0, 0(zero)
+// 0x0104da70: 0x104da70: lw    v0, 0(zero)
 	ldloc 8
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104da64: 0x104da64: sll   zero, zero, 0
-// 0x0104da68: 0x104da68: beq   v0, zero, 0x104da90 addu  v1, zero, zero
+// 0x0104da74: 0x104da74: sll   zero, zero, 0
+// 0x0104da78: 0x104da78: beq   v0, zero, 0x104daa0 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_104da90
+	brfalse L_104daa0
 // --- basic block ---
-// 0x0104da70: 0x104da70: addiu v1, zero, 2
+// 0x0104da80: 0x104da80: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0104da74: 0x104da74: cibyl_sysc_arg 0x10
+// 0x0104da84: 0x104da84: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x0104da78: 0x104da78: cibyl_sysc_arg 0x3
+// 0x0104da88: 0x104da88: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104da7c: 0x104da7c: cibyl_sysc 0x966
+// 0x0104da8c: 0x104da8c: cibyl_sysc 0x966
 	call int32 [WazeWP7]Syscalls::NOPH_Connector_openFileConnection_mode(int32,int32)
 	stloc 5
-// 0x0104da80: 0x104da80: addu  v1, v0, zero
+// 0x0104da90: 0x104da90: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0104da84: 0x104da84: cibyl_sysc_arg 0x3
+// 0x0104da94: 0x104da94: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104da88: 0x104da88: cibyl_sysc 0x98d
+// 0x0104da98: 0x104da98: cibyl_sysc 0x98d
 	call void [WazeWP7]Syscalls::NOPH_FileConnection_delete(int32)
-// 0x0104da8c: 0x104da8c: addu  a0, v0, zero
+// 0x0104da9c: 0x104da9c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_104da90:
-// 0x0104da90: 0x104da90: sll   zero, zero, 0
-// 0x0104da94: 0x104da94: Unknown instruction 0x0
-L_104da94:
-// 0x0104da98: 0x104da98: sll   zero, zero, 0
-// 0x0104da9c: 0x104da9c: beq   v1, zero, 0x104dab0 sll   zero, zero, 0
+L_104daa0:
+// 0x0104daa0: 0x104daa0: sll   zero, zero, 0
+// 0x0104daa4: 0x104daa4: Unknown instruction 0x0
+L_104daa4:
+// 0x0104daa8: 0x104daa8: sll   zero, zero, 0
+// 0x0104daac: 0x104daac: beq   v1, zero, 0x104dac0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_104dab0
+	brfalse L_104dac0
 // --- basic block ---
-// 0x0104daa4: 0x104daa4: cibyl_sysc_arg 0x3
+// 0x0104dab4: 0x104dab4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104daa8: 0x104daa8: cibyl_sysc 0x9a8
+// 0x0104dab8: 0x104dab8: cibyl_sysc 0x9a8
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104daac: 0x104daac: addu  v1, v0, zero
+// 0x0104dabc: 0x104dabc: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_104dab0:
-// 0x0104dab0: 0x104dab0: jal   0x104c670 addu  a0, s0, zero
+L_104dac0:
+// 0x0104dac0: 0x104dac0: jal   0x104c680 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -4514,13 +4514,13 @@ L_104dab0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104dab8: 0x104dab8: lw    ra, 36(sp)
-// 0x0104dabc: 0x104dabc: lw    s0, 32(sp)
+// 0x0104dac8: 0x104dac8: lw    ra, 36(sp)
+// 0x0104dacc: 0x104dacc: lw    s0, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4529,7 +4529,7 @@ L_104dab0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104dac0: 0x104dac0: jr    ra addiu sp, sp, 40
+// 0x0104dad0: 0x104dad0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4541,7 +4541,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 ecb,int32 ear)
@@ -4600,12 +4600,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dac8: 0x104dac8: addiu sp, sp, -64
+// 0x0104dad8: 0x104dad8: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0104dacc: 0x104dacc: sw    s5, 56(sp)
+// 0x0104dadc: 0x104dadc: sw    s5, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4614,7 +4614,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104dad0: 0x104dad0: sw    s3, 48(sp)
+// 0x0104dae0: 0x104dae0: sw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4623,7 +4623,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104dad4: 0x104dad4: sw    s1, 40(sp)
+// 0x0104dae4: 0x104dae4: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4632,8 +4632,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104dad8: 0x104dad8: sw    ra, 60(sp)
-// 0x0104dadc: 0x104dadc: sw    s4, 52(sp)
+// 0x0104dae8: 0x104dae8: sw    ra, 60(sp)
+// 0x0104daec: 0x104daec: sw    s4, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4642,7 +4642,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104dae0: 0x104dae0: sw    s2, 44(sp)
+// 0x0104daf0: 0x104daf0: sw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4651,7 +4651,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104dae4: 0x104dae4: sw    s0, 36(sp)
+// 0x0104daf4: 0x104daf4: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4660,10 +4660,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104dae8: 0x104dae8: addu  s3, a2, zero
+// 0x0104daf8: 0x104daf8: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0104daec: 0x104daec: jal   0x104cb30 addu  s5, a1, zero
+// 0x0104dafc: 0x104dafc: jal   0x104cb40 addu  s5, a1, zero
 	ldloc.2
 	stloc 13
 	ldloc.0
@@ -4671,28 +4671,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_join_104cb30(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_join_104cb40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104daf4: 0x104daf4: addu  s1, v0, zero
+// 0x0104db04: 0x104db04: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0104daf8: 0x104daf8: lui   v0, 0x70000
+// 0x0104db08: 0x104db08: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104dafc: 0x104dafc: lw    v1, -4180(v0)
+// 0x0104db0c: 0x104db0c: lw    v1, -3716(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1045
+	ldc.i4 -929
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104db00: 0x104db00: sll   zero, zero, 0
-// 0x0104db04: 0x104db04: bne   v1, zero, 0x104db14 sw    zero, 24(sp)
+// 0x0104db10: 0x104db10: sll   zero, zero, 0
+// 0x0104db14: 0x104db14: bne   v1, zero, 0x104db24 sw    zero, 24(sp)
 	ldloc 6
 	ldloc 7
 	ldloc.0
@@ -4702,56 +4702,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_104db14
+	brtrue L_104db24
 // --- basic block ---
-// 0x0104db0c: 0x104db0c: addiu v1, zero, 14
+// 0x0104db1c: 0x104db1c: addiu v1, zero, 14
 	ldc.i4.s 14
 	stloc 6
-// 0x0104db10: 0x104db10: sw    v1, -4180(v0)
+// 0x0104db20: 0x104db20: sw    v1, -3716(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1045
+	ldc.i4 -929
 	add
 	ldloc 6
 	stelem.i4
-L_104db14:
-// 0x0104db14: 0x104db14: lb    v1, 0(s3)
+L_104db24:
+// 0x0104db24: 0x104db24: lb    v1, 0(s3)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0104db18: 0x104db18: addiu v0, zero, 115
+// 0x0104db28: 0x104db28: addiu v0, zero, 115
 	ldc.i4.s 115
 	stloc 5
-// 0x0104db1c: 0x104db1c: bne   v1, v0, 0x104db2c addu  s4, zero, zero
+// 0x0104db2c: 0x104db2c: bne   v1, v0, 0x104db3c addu  s4, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	bne.un L_104db2c
+	bne.un L_104db3c
 // --- basic block ---
-// 0x0104db24: 0x104db24: addiu s3, s3, 1
+// 0x0104db34: 0x104db34: addiu s3, s3, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x0104db28: 0x104db28: addiu s4, zero, 1
+// 0x0104db38: 0x104db38: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 12
-L_104db2c:
-// 0x0104db2c: 0x104db2c: lui   a1, 0x10000
+L_104db3c:
+// 0x0104db3c: 0x104db3c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104db30: 0x104db30: addiu a1, a1, 3044
+// 0x0104db40: 0x104db40: addiu a1, a1, 3040
 	ldloc.2
-	ldc.i4 3044
+	ldc.i4 3040
 	add
 	stloc.2
-// 0x0104db34: 0x104db34: addu  a0, s1, zero
+// 0x0104db44: 0x104db44: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104db38: 0x104db38: jal   0x1001b2c addiu a2, zero, 13
+// 0x0104db48: 0x104db48: jal   0x1001b2c addiu a2, zero, 13
 	ldc.i4.s 13
 	stloc.3
 	ldloc.1
@@ -4760,18 +4760,18 @@ L_104db2c:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104db40: 0x104db40: bne   v0, zero, 0x104db94 lui   a1, 0x10000
+// 0x0104db50: 0x104db50: bne   v0, zero, 0x104dba4 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_104db94
+	brtrue L_104dba4
 // --- basic block ---
-// 0x0104db48: 0x104db48: addiu a0, s1, 13
+// 0x0104db58: 0x104db58: addiu a0, s1, 13
 	ldloc 9
 	ldc.i4.s 13
 	add
 	stloc.1
-// 0x0104db4c: 0x104db4c: jal   0x1001a5c addiu a1, zero, 58
+// 0x0104db5c: 0x104db5c: jal   0x1001a5c addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
 	ldloc.1
@@ -4781,11 +4781,11 @@ L_104db2c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104db54: 0x104db54: bne   v0, zero, 0x104dc18 sll   zero, zero, 0
+// 0x0104db64: 0x104db64: bne   v0, zero, 0x104dc28 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104dc18
+	brtrue L_104dc28
 // --- basic block ---
-// 0x0104db5c: 0x104db5c: jal   0x1001b48 addu  a0, s1, zero
+// 0x0104db6c: 0x104db6c: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -4794,7 +4794,7 @@ L_104db2c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104db64: 0x104db64: jal   0x1000910 addiu a0, v0, 3
+// 0x0104db74: 0x104db74: jal   0x1000910 addiu a0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
@@ -4809,21 +4809,21 @@ L_104db2c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104db6c: 0x104db6c: lui   a1, 0x10000
+// 0x0104db7c: 0x104db7c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104db70: 0x104db70: addu  a2, s1, zero
+// 0x0104db80: 0x104db80: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0104db74: 0x104db74: addu  a0, v0, zero
+// 0x0104db84: 0x104db84: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104db78: 0x104db78: addiu a1, a1, 3700
+// 0x0104db88: 0x104db88: addiu a1, a1, 3696
 	ldloc.2
-	ldc.i4 3700
+	ldc.i4 3696
 	add
 	stloc.2
-// 0x0104db7c: 0x104db7c: jal   0x1000f64 addu  s0, v0, zero
+// 0x0104db8c: 0x104db8c: jal   0x1000f64 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4836,7 +4836,7 @@ L_104db2c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104db84: 0x104db84: jal   0x104c670 addu  a0, s1, zero
+// 0x0104db94: 0x104db94: jal   0x104c680 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4844,26 +4844,26 @@ L_104db2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104db8c: 0x104db8c: j	 0x104dc1c addu  s1, s0, zero
+// 0x0104db9c: 0x104db9c: j	 0x104dc2c addu  s1, s0, zero
 	ldloc 8
 	stloc 9
-	br L_104dc1c
+	br L_104dc2c
 // --- basic block ---
-L_104db94:
-// 0x0104db94: 0x104db94: addiu a1, a1, 3708
+L_104dba4:
+// 0x0104dba4: 0x104dba4: addiu a1, a1, 3704
 	ldloc.2
-	ldc.i4 3708
+	ldc.i4 3704
 	add
 	stloc.2
-// 0x0104db98: 0x104db98: addu  a0, s1, zero
+// 0x0104dba8: 0x104dba8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104db9c: 0x104db9c: jal   0x1001b2c addiu a2, zero, 6
+// 0x0104dbac: 0x104dbac: jal   0x1001b2c addiu a2, zero, 6
 	ldc.i4.6
 	stloc.3
 	ldloc.1
@@ -4872,36 +4872,36 @@ L_104db94:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104dba4: 0x104dba4: beq   v0, zero, 0x104dc1c addu  s0, s1, zero
+// 0x0104dbb4: 0x104dbb4: beq   v0, zero, 0x104dc2c addu  s0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc 8
-	brfalse L_104dc1c
+	brfalse L_104dc2c
 // --- basic block ---
-// 0x0104dbac: 0x104dbac: lui   v0, 0x70000
+// 0x0104dbbc: 0x104dbbc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104dbb0: 0x104dbb0: lw    s0, -4180(v0)
+// 0x0104dbc0: 0x104dbc0: lw    s0, -3716(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1045
+	ldc.i4 -929
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104dbb4: 0x104dbb4: lui   a1, 0x10000
+// 0x0104dbc4: 0x104dbc4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104dbb8: 0x104dbb8: addiu a1, a1, 3252
+// 0x0104dbc8: 0x104dbc8: addiu a1, a1, 3248
 	ldloc.2
-	ldc.i4 3252
+	ldc.i4 3248
 	add
 	stloc.2
-// 0x0104dbbc: 0x104dbbc: addu  a0, s1, zero
+// 0x0104dbcc: 0x104dbcc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0104dbc0: 0x104dbc0: jal   0x1001b2c addu  a2, s0, zero
+// 0x0104dbd0: 0x104dbd0: jal   0x1001b2c addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.1
@@ -4910,88 +4910,88 @@ L_104db94:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104dbc8: 0x104dbc8: bne   v0, zero, 0x104dc18 addu  s0, s1, s0
+// 0x0104dbd8: 0x104dbd8: bne   v0, zero, 0x104dc28 addu  s0, s1, s0
 	ldloc 5
 	ldloc 9
 	ldloc 8
 	add
 	stloc 8
-	brtrue L_104dc18
+	brtrue L_104dc28
 // --- basic block ---
-// 0x0104dbd0: 0x104dbd0: lb    v0, 0(s0)
+// 0x0104dbe0: 0x104dbe0: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104dbd4: 0x104dbd4: addiu a1, zero, 47
+// 0x0104dbe4: 0x104dbe4: addiu a1, zero, 47
 	ldc.i4.s 47
 	stloc.2
-// 0x0104dbd8: 0x104dbd8: xori  v0, v0, 47
+// 0x0104dbe8: 0x104dbe8: xori  v0, v0, 47
 	ldloc 5
 	ldc.i4.s 47
 	xor
 	stloc 5
-// 0x0104dbdc: 0x104dbdc: sltiu v0, v0, 1
+// 0x0104dbec: 0x104dbec: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0104dbe0: 0x104dbe0: addu  s0, s0, v0
+// 0x0104dbf0: 0x104dbf0: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0104dbe4: 0x104dbe4: addu  v0, s0, zero
+// 0x0104dbf4: 0x104dbf4: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0104dbe8: 0x104dbe8: j	 0x104dc00 addiu a0, zero, 95
+// 0x0104dbf8: 0x104dbf8: j	 0x104dc10 addiu a0, zero, 95
 	ldc.i4.s 95
 	stloc.1
-	br L_104dc00
+	br L_104dc10
 // --- basic block ---
-L_104dbf0:
-// 0x0104dbf0: 0x104dbf0: bne   v1, a1, 0x104dbfc sll   zero, zero, 0
+L_104dc00:
+// 0x0104dc00: 0x104dc00: bne   v1, a1, 0x104dc0c sll   zero, zero, 0
 	ldloc 6
 	ldloc.2
-	bne.un L_104dbfc
+	bne.un L_104dc0c
 // --- basic block ---
-// 0x0104dbf8: 0x104dbf8: sb    a0, 0(v0)
+// 0x0104dc08: 0x104dc08: sb    a0, 0(v0)
 	ldloc 5
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_104dbfc:
-// 0x0104dbfc: 0x104dbfc: addiu v0, v0, 1
+L_104dc0c:
+// 0x0104dc0c: 0x104dc0c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_104dc00:
-// 0x0104dc00: 0x104dc00: lb    v1, 0(v0)
+L_104dc10:
+// 0x0104dc10: 0x104dc10: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0104dc04: 0x104dc04: sll   zero, zero, 0
-// 0x0104dc08: 0x104dc08: bne   v1, zero, 0x104dbf0 sll   zero, zero, 0
+// 0x0104dc14: 0x104dc14: sll   zero, zero, 0
+// 0x0104dc18: 0x104dc18: bne   v1, zero, 0x104dc00 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_104dbf0
+	brtrue L_104dc00
 // --- basic block ---
-// 0x0104dc10: 0x104dc10: j	 0x104dc1c sll   zero, zero, 0
-	br L_104dc1c
+// 0x0104dc20: 0x104dc20: j	 0x104dc2c sll   zero, zero, 0
+	br L_104dc2c
 // --- basic block ---
-L_104dc18:
-// 0x0104dc18: 0x104dc18: addu  s0, s1, zero
+L_104dc28:
+// 0x0104dc28: 0x104dc28: addu  s0, s1, zero
 	ldloc 9
 	stloc 8
-L_104dc1c:
-// 0x0104dc1c: 0x104dc1c: lui   a0, 0x1050000
+L_104dc2c:
+// 0x0104dc2c: 0x104dc2c: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104dc20: 0x104dc20: addiu a0, a0, -11076
+// 0x0104dc30: 0x104dc30: addiu a0, a0, -11060
 	ldloc.1
-	ldc.i4 -11076
+	ldc.i4 -11060
 	add
 	stloc.1
-L_104dc24:
-// 0x0104dc24: 0x104dc24: jal   0x1000120 addiu a1, sp, 24
+L_104dc34:
+// 0x0104dc34: 0x104dc34: jal   0x1000120 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5001,24 +5001,24 @@ L_104dc24:
 	ldloc.2
 	stloc 16
 // --- basic block ---
-// 0x0104dc2c: 0x104dc2c: lw    v0, 0(zero)
+// 0x0104dc3c: 0x104dc3c: lw    v0, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104dc30: 0x104dc30: sll   zero, zero, 0
-// 0x0104dc34: 0x104dc34: beq   v0, zero, 0x104dc4c addu  s2, zero, zero
+// 0x0104dc40: 0x104dc40: sll   zero, zero, 0
+// 0x0104dc44: 0x104dc44: beq   v0, zero, 0x104dc5c addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_104dc4c
+	brfalse L_104dc5c
 // --- basic block ---
-// 0x0104dc3c: 0x104dc3c: addu  a1, s3, zero
+// 0x0104dc4c: 0x104dc4c: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0104dc40: 0x104dc40: jal   0x1002540 addu  a0, s0, zero
+// 0x0104dc50: 0x104dc50: jal   0x1002540 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5031,26 +5031,26 @@ L_104dc24:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104dc48: 0x104dc48: addu  s2, v0, zero
+// 0x0104dc58: 0x104dc58: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-L_104dc4c:
-// 0x0104dc4c: 0x104dc4c: sll   zero, zero, 0
-// 0x0104dc50: 0x104dc50: Unknown instruction 0x0
-L_104dc50:
-// 0x0104dc54: 0x104dc54: sll   zero, zero, 0
-// 0x0104dc58: 0x104dc58: bne   s2, zero, 0x104dc6c lui   a0, 0x10000
+L_104dc5c:
+// 0x0104dc5c: 0x104dc5c: sll   zero, zero, 0
+// 0x0104dc60: 0x104dc60: Unknown instruction 0x0
+L_104dc60:
+// 0x0104dc64: 0x104dc64: sll   zero, zero, 0
+// 0x0104dc68: 0x104dc68: bne   s2, zero, 0x104dc7c lui   a0, 0x10000
 	ldloc 10
 	ldc.i4 65536
 	stloc.1
-	brtrue L_104dc6c
+	brtrue L_104dc7c
 // --- basic block ---
-// 0x0104dc60: 0x104dc60: addiu a0, a0, 3716
+// 0x0104dc70: 0x104dc70: addiu a0, a0, 3712
 	ldloc.1
-	ldc.i4 3716
+	ldc.i4 3712
 	add
 	stloc.1
-// 0x0104dc64: 0x104dc64: jal   0x1000e78 addu  a1, s0, zero
+// 0x0104dc74: 0x104dc74: jal   0x1000e78 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5063,8 +5063,8 @@ L_104dc50:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104dc6c:
-// 0x0104dc6c: 0x104dc6c: lw    v1, 24(sp)
+L_104dc7c:
+// 0x0104dc7c: 0x104dc7c: lw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5073,36 +5073,36 @@ L_104dc6c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104dc70: 0x104dc70: addiu v0, zero, -1
+// 0x0104dc80: 0x104dc80: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0104dc74: 0x104dc74: bne   v1, v0, 0x104dc84 sll   zero, zero, 0
+// 0x0104dc84: 0x104dc84: bne   v1, v0, 0x104dc94 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_104dc84
+	bne.un L_104dc94
 // --- basic block ---
-// 0x0104dc7c: 0x104dc7c: j	 0x104dce8 addu  s2, zero, zero
+// 0x0104dc8c: 0x104dc8c: j	 0x104dcf8 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_104dce8
+	br L_104dcf8
 // --- basic block ---
-L_104dc84:
-// 0x0104dc84: 0x104dc84: bne   s2, zero, 0x104dce0 sll   zero, zero, 0
+L_104dc94:
+// 0x0104dc94: 0x104dc94: bne   s2, zero, 0x104dcf0 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_104dce0
+	brtrue L_104dcf0
 // --- basic block ---
-// 0x0104dc8c: 0x104dc8c: bne   s4, zero, 0x104dce0 lui   a1, 0x10000
+// 0x0104dc9c: 0x104dc9c: bne   s4, zero, 0x104dcf0 lui   a1, 0x10000
 	ldloc 12
 	ldc.i4 65536
 	stloc.2
-	brtrue L_104dce0
+	brtrue L_104dcf0
 // --- basic block ---
-// 0x0104dc94: 0x104dc94: addu  a0, s5, zero
+// 0x0104dca4: 0x104dca4: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x0104dc98: 0x104dc98: jal   0x1001b14 addiu a1, a1, 3764
+// 0x0104dca8: 0x104dca8: jal   0x1001b14 addiu a1, a1, 3760
 	ldloc.2
-	ldc.i4 3764
+	ldc.i4 3760
 	add
 	stloc.2
 	ldloc.1
@@ -5110,30 +5110,30 @@ L_104dc84:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0104dca0: 0x104dca0: bne   v0, zero, 0x104dcc4 lui   a3, 0x10000
+// 0x0104dcb0: 0x104dcb0: bne   v0, zero, 0x104dcd4 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_104dcc4
+	brtrue L_104dcd4
 // --- basic block ---
-// 0x0104dca8: 0x104dca8: lui   v0, 0xe0000
+// 0x0104dcb8: 0x104dcb8: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0104dcac: 0x104dcac: lw    a0, 29596(v0)
+// 0x0104dcbc: 0x104dcbc: lw    a0, 30060(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7399
+	ldc.i4 7515
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104dcb0: 0x104dcb0: addiu a1, a3, 3584
+// 0x0104dcc0: 0x104dcc0: addiu a1, a3, 3580
 	ldloc 4
-	ldc.i4 3584
+	ldc.i4 3580
 	add
 	stloc.2
-// 0x0104dcb4: 0x104dcb4: jal   0x1000ef4 addu  a2, s0, zero
+// 0x0104dcc4: 0x104dcc4: jal   0x1000ef4 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -5146,30 +5146,30 @@ L_104dc84:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104dcbc: 0x104dcbc: j	 0x104dce0 sll   zero, zero, 0
-	br L_104dce0
+// 0x0104dccc: 0x104dccc: j	 0x104dcf0 sll   zero, zero, 0
+	br L_104dcf0
 // --- basic block ---
-L_104dcc4:
-// 0x0104dcc4: 0x104dcc4: lui   a1, 0x10000
+L_104dcd4:
+// 0x0104dcd4: 0x104dcd4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104dcc8: 0x104dcc8: addiu a1, a1, 3448
+// 0x0104dcd8: 0x104dcd8: addiu a1, a1, 3444
 	ldloc.2
-	ldc.i4 3448
+	ldc.i4 3444
 	add
 	stloc.2
-// 0x0104dccc: 0x104dccc: addiu a3, a3, 3584
+// 0x0104dcdc: 0x104dcdc: addiu a3, a3, 3580
 	ldloc 4
-	ldc.i4 3584
+	ldc.i4 3580
 	add
 	stloc 4
-// 0x0104dcd0: 0x104dcd0: addiu a0, zero, 4
+// 0x0104dce0: 0x104dce0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104dcd4: 0x104dcd4: addiu a2, zero, 149
+// 0x0104dce4: 0x104dce4: addiu a2, zero, 149
 	ldc.i4 149
 	stloc.3
-// 0x0104dcd8: 0x104dcd8: jal   0x100449c sw    s0, 16(sp)
+// 0x0104dce8: 0x104dce8: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5188,8 +5188,8 @@ L_104dcc4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104dce0:
-// 0x0104dce0: 0x104dce0: jal   0x104c670 addu  a0, s1, zero
+L_104dcf0:
+// 0x0104dcf0: 0x104dcf0: jal   0x104c680 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5197,17 +5197,17 @@ L_104dce0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_free_104c670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_free_104c680(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_104dce8:
-// 0x0104dce8: 0x104dce8: lw    ra, 60(sp)
-// 0x0104dcec: 0x104dcec: addu  v0, s2, zero
+L_104dcf8:
+// 0x0104dcf8: 0x104dcf8: lw    ra, 60(sp)
+// 0x0104dcfc: 0x104dcfc: addu  v0, s2, zero
 	ldloc 10
 	stloc 5
-// 0x0104dcf0: 0x104dcf0: lw    s5, 56(sp)
+// 0x0104dd00: 0x104dd00: lw    s5, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5216,7 +5216,7 @@ L_104dce8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104dcf4: 0x104dcf4: lw    s4, 52(sp)
+// 0x0104dd04: 0x104dd04: lw    s4, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5225,7 +5225,7 @@ L_104dce8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104dcf8: 0x104dcf8: lw    s3, 48(sp)
+// 0x0104dd08: 0x104dd08: lw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5234,7 +5234,7 @@ L_104dce8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104dcfc: 0x104dcfc: lw    s2, 44(sp)
+// 0x0104dd0c: 0x104dd0c: lw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5243,7 +5243,7 @@ L_104dce8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104dd00: 0x104dd00: lw    s1, 40(sp)
+// 0x0104dd10: 0x104dd10: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5252,7 +5252,7 @@ L_104dce8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104dd04: 0x104dd04: lw    s0, 36(sp)
+// 0x0104dd14: 0x104dd14: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5261,7 +5261,7 @@ L_104dce8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104dd08: 0x104dd08: jr    ra addiu sp, sp, 64
+// 0x0104dd18: 0x104dd18: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5273,7 +5273,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5308,19 +5308,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dd10: 0x104dd10: addiu sp, sp, -24
+// 0x0104dd20: 0x104dd20: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104dd14: 0x104dd14: addu  a2, a1, zero
+// 0x0104dd24: 0x104dd24: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104dd18: 0x104dd18: addu  a1, a0, zero
+// 0x0104dd28: 0x104dd28: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104dd1c: 0x104dd1c: sw    ra, 20(sp)
-// 0x0104dd20: 0x104dd20: jal   0x104dac8 addu  a0, zero, zero
+// 0x0104dd2c: 0x104dd2c: sw    ra, 20(sp)
+// 0x0104dd30: 0x104dd30: jal   0x104dad8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5328,14 +5328,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104dd28: 0x104dd28: lw    ra, 20(sp)
-// 0x0104dd2c: 0x104dd2c: sll   zero, zero, 0
-// 0x0104dd30: 0x104dd30: jr    ra addiu sp, sp, 24
+// 0x0104dd38: 0x104dd38: lw    ra, 20(sp)
+// 0x0104dd3c: 0x104dd3c: sll   zero, zero, 0
+// 0x0104dd40: 0x104dd40: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5347,7 +5347,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static void roadmap_canvas_ignore_mouse_104dd38()
+.method public static void roadmap_canvas_ignore_mouse_104dd48()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -5358,13 +5358,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104dd38:
-// 0x0104dd38: 0x104dd38: jr    ra sll   zero, zero, 0
+L_104dd48:
+// 0x0104dd48: 0x104dd48: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_canvas_ignore_configure_104dd40()
+.method public static void roadmap_canvas_ignore_configure_104dd50()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -5375,13 +5375,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104dd40:
-// 0x0104dd40: 0x104dd40: jr    ra sll   zero, zero, 0
+L_104dd50:
+// 0x0104dd50: 0x104dd50: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_canvas_get_thickness_104dd48(int32)
+.method public static int32 roadmap_canvas_get_thickness_104dd58(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5401,12 +5401,12 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dd48: 0x104dd48: beq   a0, zero, 0x104dd54 addu  v0, zero, zero
+// 0x0104dd58: 0x104dd58: beq   a0, zero, 0x104dd64 addu  v0, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_104dd54
-// 0x0104dd50: 0x104dd50: lw    v0, 16(a0)
+	brfalse L_104dd64
+// 0x0104dd60: 0x104dd60: lw    v0, 16(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -5415,14 +5415,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-L_104dd54:
-// 0x0104dd54: 0x104dd54: jr    ra sll   zero, zero, 0
+L_104dd64:
+// 0x0104dd64: 0x104dd64: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_canvas_set_thickness_104dd5c(int32)
+.method public static int32 roadmap_canvas_set_thickness_104dd6c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5445,24 +5445,24 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dd5c: 0x104dd5c: lui   v0, 0x70000
+// 0x0104dd6c: 0x104dd6c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104dd60: 0x104dd60: lw    v0, -4172(v0)
+// 0x0104dd70: 0x104dd70: lw    v0, -3708(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1043
+	ldc.i4 -927
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104dd64: 0x104dd64: sll   zero, zero, 0
-// 0x0104dd68: 0x104dd68: beq   v0, zero, 0x104dd84 sll   zero, zero, 0
+// 0x0104dd74: 0x104dd74: sll   zero, zero, 0
+// 0x0104dd78: 0x104dd78: beq   v0, zero, 0x104dd94 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_104dd84
+	brfalse L_104dd94
 // --- basic block ---
-// 0x0104dd70: 0x104dd70: lw    v1, 16(v0)
+// 0x0104dd80: 0x104dd80: lw    v1, 16(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -5471,13 +5471,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104dd74: 0x104dd74: sll   zero, zero, 0
-// 0x0104dd78: 0x104dd78: beq   v1, a0, 0x104dd84 sll   zero, zero, 0
+// 0x0104dd84: 0x104dd84: sll   zero, zero, 0
+// 0x0104dd88: 0x104dd88: beq   v1, a0, 0x104dd94 sll   zero, zero, 0
 	ldloc.3
 	ldloc.0
-	beq  L_104dd84
+	beq  L_104dd94
 // --- basic block ---
-// 0x0104dd80: 0x104dd80: sw    a0, 16(v0)
+// 0x0104dd90: 0x104dd90: sw    a0, 16(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -5486,8 +5486,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.0
 	stelem.i4
-L_104dd84:
-// 0x0104dd84: 0x104dd84: jr    ra sll   zero, zero, 0
+L_104dd94:
+// 0x0104dd94: 0x104dd94: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -5495,7 +5495,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_canvas_erase_104dd8c(int32,int32,int32)
+.method public static int32 roadmap_canvas_erase_104dd9c(int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5524,73 +5524,73 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dd8c: 0x104dd8c: lui   a0, 0x70000
+// 0x0104dd9c: 0x104dd9c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0104dd90: 0x104dd90: lui   v0, 0x70000
+// 0x0104dda0: 0x104dda0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x0104dd94: 0x104dd94: lw    a1, -4112(v0)
+// 0x0104dda4: 0x104dda4: lw    a1, -3648(v0)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104dd98: 0x104dd98: lw    a2, -4116(a0)
+// 0x0104dda8: 0x104dda8: lw    a2, -3652(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1029
+	ldc.i4 -913
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104dd9c: 0x104dd9c: sll   zero, zero, 0
-// 0x0104dda0: 0x104dda0: cibyl_sysc_arg 0x6
+// 0x0104ddac: 0x104ddac: sll   zero, zero, 0
+// 0x0104ddb0: 0x104ddb0: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104dda4: 0x104dda4: cibyl_sysc 0xa0a
+// 0x0104ddb4: 0x104ddb4: cibyl_sysc 0xa0a
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_getVisibleWidth(int32)
 	stloc.3
-// 0x0104dda8: 0x104dda8: addu  a2, v0, zero
+// 0x0104ddb8: 0x104ddb8: addu  a2, v0, zero
 	ldloc.3
 	stloc.2
-// 0x0104ddac: 0x104ddac: lw    a0, -4116(a0)
+// 0x0104ddbc: 0x104ddbc: lw    a0, -3652(a0)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1029
+	ldc.i4 -913
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104ddb0: 0x104ddb0: sll   zero, zero, 0
-// 0x0104ddb4: 0x104ddb4: cibyl_sysc_arg 0x4
+// 0x0104ddc0: 0x104ddc0: sll   zero, zero, 0
+// 0x0104ddc4: 0x104ddc4: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104ddb8: 0x104ddb8: cibyl_sysc 0xa31
+// 0x0104ddc8: 0x104ddc8: cibyl_sysc 0xa31
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_getVisibleHeight(int32)
 	stloc.3
-// 0x0104ddbc: 0x104ddbc: addu  a0, v0, zero
+// 0x0104ddcc: 0x104ddcc: addu  a0, v0, zero
 	ldloc.3
 	stloc.0
-// 0x0104ddc0: 0x104ddc0: addu  v1, zero, zero
+// 0x0104ddd0: 0x104ddd0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104ddc4: 0x104ddc4: cibyl_sysc_arg 0x5
+// 0x0104ddd4: 0x104ddd4: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104ddc8: 0x104ddc8: cibyl_sysc_arg 0x3
+// 0x0104ddd8: 0x104ddd8: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x0104ddcc: 0x104ddcc: cibyl_sysc_arg 0x3
+// 0x0104dddc: 0x104dddc: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x0104ddd0: 0x104ddd0: cibyl_sysc_arg 0x6
+// 0x0104dde0: 0x104dde0: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104ddd4: 0x104ddd4: cibyl_sysc_arg 0x4
+// 0x0104dde4: 0x104dde4: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104ddd8: 0x104ddd8: cibyl_sysc 0xa59
+// 0x0104dde8: 0x104dde8: cibyl_sysc 0xa59
 	call void [WazeWP7]Syscalls::NOPH_Graphics_fillRect(int32,int32,int32,int32,int32)
-// 0x0104dddc: 0x104dddc: jr    ra addu  v1, v0, zero
+// 0x0104ddec: 0x104ddec: jr    ra addu  v1, v0, zero
 	ldloc.3
 	stloc 4
 	br __CIBYL_function_return
@@ -5600,7 +5600,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_canvas_erase_area_104dde4(int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_erase_area_104ddf4(int32,int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -5632,7 +5632,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dde4: 0x104dde4: lw    a3, 12(a0)
+// 0x0104ddf4: 0x104ddf4: lw    a3, 12(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -5641,7 +5641,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104dde8: 0x104dde8: lw    a2, 8(a0)
+// 0x0104ddf8: 0x104ddf8: lw    a2, 8(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -5650,14 +5650,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104ddec: 0x104ddec: lw    v1, 0(a0)
+// 0x0104ddfc: 0x104ddfc: lw    v1, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104ddf0: 0x104ddf0: lw    a0, 4(a0)
+// 0x0104de00: 0x104de00: lw    a0, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -5666,51 +5666,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104ddf4: 0x104ddf4: lui   v0, 0x70000
+// 0x0104de04: 0x104de04: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104ddf8: 0x104ddf8: addiu a2, a2, 1
+// 0x0104de08: 0x104de08: addiu a2, a2, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0104ddfc: 0x104ddfc: addiu a3, a3, 1
+// 0x0104de0c: 0x104de0c: addiu a3, a3, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0104de00: 0x104de00: lw    a1, -4112(v0)
+// 0x0104de10: 0x104de10: lw    a1, -3648(v0)
 	ldloc 4
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104de04: 0x104de04: subu  a2, a2, v1
+// 0x0104de14: 0x104de14: subu  a2, a2, v1
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0104de08: 0x104de08: subu  a3, a3, a0
+// 0x0104de18: 0x104de18: subu  a3, a3, a0
 	ldloc.3
 	ldloc.0
 	sub
 	stloc.3
-// 0x0104de0c: 0x104de0c: cibyl_sysc_arg 0x5
+// 0x0104de1c: 0x104de1c: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104de10: 0x104de10: cibyl_sysc_arg 0x3
+// 0x0104de20: 0x104de20: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104de14: 0x104de14: cibyl_sysc_arg 0x4
+// 0x0104de24: 0x104de24: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104de18: 0x104de18: cibyl_sysc_arg 0x6
+// 0x0104de28: 0x104de28: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104de1c: 0x104de1c: cibyl_sysc_arg 0x7
+// 0x0104de2c: 0x104de2c: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x0104de20: 0x104de20: cibyl_sysc 0xa70
+// 0x0104de30: 0x104de30: cibyl_sysc 0xa70
 	call void [WazeWP7]Syscalls::NOPH_Graphics_fillRect(int32,int32,int32,int32,int32)
-// 0x0104de24: 0x104de24: jr    ra addu  v1, v0, zero
+// 0x0104de34: 0x104de34: jr    ra addu  v1, v0, zero
 	ldloc 6
 	stloc 5
 	br __CIBYL_function_return
@@ -5720,7 +5720,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_draw_multiple_points_104de2c(int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_multiple_points_104de3c(int32,int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 t0,int32 t1,int32 ra)
@@ -5758,23 +5758,23 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104de2c: 0x104de2c: addu  v1, zero, zero
+// 0x0104de3c: 0x104de3c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104de30: 0x104de30: j	 0x104de6c lui   t0, 0x70000
+// 0x0104de40: 0x104de40: j	 0x104de7c lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 7
-	br L_104de6c
+	br L_104de7c
 // --- basic block ---
-L_104de38:
-// 0x0104de38: 0x104de38: lw    a2, 0(a1)
+L_104de48:
+// 0x0104de48: 0x104de48: lw    a2, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0104de3c: 0x104de3c: lw    a3, 4(a1)
+// 0x0104de4c: 0x104de4c: lw    a3, 4(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5783,52 +5783,52 @@ L_104de38:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104de40: 0x104de40: lw    t1, -4112(t0)
+// 0x0104de50: 0x104de50: lw    t1, -3648(t0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104de44: 0x104de44: sll   zero, zero, 0
-// 0x0104de48: 0x104de48: cibyl_sysc_arg 0x9
+// 0x0104de54: 0x104de54: sll   zero, zero, 0
+// 0x0104de58: 0x104de58: cibyl_sysc_arg 0x9
 	ldloc 8
-// 0x0104de4c: 0x104de4c: cibyl_sysc_arg 0x6
+// 0x0104de5c: 0x104de5c: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104de50: 0x104de50: cibyl_sysc_arg 0x7
+// 0x0104de60: 0x104de60: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x0104de54: 0x104de54: cibyl_sysc_arg 0x6
+// 0x0104de64: 0x104de64: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104de58: 0x104de58: cibyl_sysc_arg 0x7
+// 0x0104de68: 0x104de68: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x0104de5c: 0x104de5c: cibyl_sysc 0xa87
+// 0x0104de6c: 0x104de6c: cibyl_sysc 0xa87
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawLine(int32,int32,int32,int32,int32)
-// 0x0104de60: 0x104de60: addu  a2, v0, zero
+// 0x0104de70: 0x104de70: addu  a2, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104de64: 0x104de64: addiu v1, v1, 1
+// 0x0104de74: 0x104de74: addiu v1, v1, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x0104de68: 0x104de68: addiu a1, a1, 8
+// 0x0104de78: 0x104de78: addiu a1, a1, 8
 	ldloc.1
 	ldc.i4.8
 	add
 	stloc.1
-L_104de6c:
-// 0x0104de6c: 0x104de6c: slt   v0, v1, a0
+L_104de7c:
+// 0x0104de7c: 0x104de7c: slt   v0, v1, a0
 	ldloc 4
 	ldloc.0
 	clt
 	stloc 5
-// 0x0104de70: 0x104de70: bne   v0, zero, 0x104de38 sll   zero, zero, 0
+// 0x0104de80: 0x104de80: bne   v0, zero, 0x104de48 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104de38
+	brtrue L_104de48
 // --- basic block ---
-// 0x0104de78: 0x104de78: jr    ra sll   zero, zero, 0
+// 0x0104de88: 0x104de88: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 4
@@ -5836,7 +5836,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_register_button_pressed_handler_104de80(int32)
+.method public static int32 roadmap_canvas_register_button_pressed_handler_104de90(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5856,10 +5856,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104de80: 0x104de80: lui   v0, 0x0
+// 0x0104de90: 0x104de90: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104de84: 0x104de84: jr    ra sw    a0, 13792(v0)
+// 0x0104de94: 0x104de94: jr    ra sw    a0, 13792(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -5873,7 +5873,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_canvas_register_button_released_handler_104de8c(int32)
+.method public static int32 roadmap_canvas_register_button_released_handler_104de9c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5893,10 +5893,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104de8c: 0x104de8c: lui   v0, 0x0
+// 0x0104de9c: 0x104de9c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104de90: 0x104de90: jr    ra sw    a0, 13796(v0)
+// 0x0104dea0: 0x104dea0: jr    ra sw    a0, 13796(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -5910,7 +5910,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_canvas_register_mouse_move_handler_104de98(int32)
+.method public static int32 roadmap_canvas_register_mouse_move_handler_104dea8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5930,10 +5930,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104de98: 0x104de98: lui   v0, 0x0
+// 0x0104dea8: 0x104dea8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104de9c: 0x104de9c: jr    ra sw    a0, 13800(v0)
+// 0x0104deac: 0x104deac: jr    ra sw    a0, 13800(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -5947,7 +5947,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_canvas_register_configure_handler_104dea4(int32)
+.method public static int32 roadmap_canvas_register_configure_handler_104deb4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5967,10 +5967,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dea4: 0x104dea4: lui   v0, 0x0
+// 0x0104deb4: 0x104deb4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104dea8: 0x104dea8: jr    ra sw    a0, 13804(v0)
+// 0x0104deb8: 0x104deb8: jr    ra sw    a0, 13804(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -5984,7 +5984,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 t1,int32 t2,int32 ra)
@@ -6025,7 +6025,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104def0: 0x104def0: lw    v0, 4(a0)
+// 0x0104df00: 0x104df00: lw    v0, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -6034,28 +6034,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104def4: 0x104def4: sll   zero, zero, 0
-// 0x0104def8: 0x104def8: bne   v0, zero, 0x104df18 sll   zero, zero, 0
+// 0x0104df04: 0x104df04: sll   zero, zero, 0
+// 0x0104df08: 0x104df08: bne   v0, zero, 0x104df28 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104df18
+	brtrue L_104df28
 // --- basic block ---
-// 0x0104df00: 0x104df00: lw    v1, 0(a0)
+// 0x0104df10: 0x104df10: lw    v1, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104df04: 0x104df04: sll   zero, zero, 0
-// 0x0104df08: 0x104df08: cibyl_sysc_arg 0x3
+// 0x0104df14: 0x104df14: sll   zero, zero, 0
+// 0x0104df18: 0x104df18: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104df0c: 0x104df0c: cibyl_sysc 0xabc
+// 0x0104df1c: 0x104df1c: cibyl_sysc 0xabc
 	call int32 [WazeWP7]Syscalls::NOPH_Graphics_new(int32)
 	stloc 5
-// 0x0104df10: 0x104df10: addu  v1, v0, zero
+// 0x0104df20: 0x104df20: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0104df14: 0x104df14: sw    v1, 4(a0)
+// 0x0104df24: 0x104df24: sw    v1, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -6064,43 +6064,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_104df18:
-// 0x0104df18: 0x104df18: lw    v1, 0(a0)
+L_104df28:
+// 0x0104df28: 0x104df28: lw    v1, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104df1c: 0x104df1c: beq   a2, zero, 0x104df94 sll   zero, zero, 0
+// 0x0104df2c: 0x104df2c: beq   a2, zero, 0x104dfa4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_104df94
+	brfalse L_104dfa4
 // --- basic block ---
-// 0x0104df24: 0x104df24: cibyl_sysc_arg 0x3
+// 0x0104df34: 0x104df34: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104df28: 0x104df28: cibyl_sysc 0xace
+// 0x0104df38: 0x104df38: cibyl_sysc 0xace
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getWidth(int32)
 	stloc 5
-// 0x0104df2c: 0x104df2c: addu  v1, v0, zero
+// 0x0104df3c: 0x104df3c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0104df30: 0x104df30: lw    t0, 0(a0)
+// 0x0104df40: 0x104df40: lw    t0, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104df34: 0x104df34: sll   zero, zero, 0
-// 0x0104df38: 0x104df38: cibyl_sysc_arg 0x8
+// 0x0104df44: 0x104df44: sll   zero, zero, 0
+// 0x0104df48: 0x104df48: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x0104df3c: 0x104df3c: cibyl_sysc 0xae3
+// 0x0104df4c: 0x104df4c: cibyl_sysc 0xae3
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getHeight(int32)
 	stloc 5
-// 0x0104df40: 0x104df40: addu  t0, v0, zero
+// 0x0104df50: 0x104df50: addu  t0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0104df44: 0x104df44: lw    t1, 4(a1)
+// 0x0104df54: 0x104df54: lw    t1, 4(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -6109,14 +6109,14 @@ L_104df18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104df48: 0x104df48: lw    a1, 0(a1)
+// 0x0104df58: 0x104df58: lw    a1, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104df4c: 0x104df4c: lw    t2, 4(a2)
+// 0x0104df5c: 0x104df5c: lw    t2, 4(a2)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
@@ -6125,7 +6125,7 @@ L_104df18:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104df50: 0x104df50: lw    a0, 4(a0)
+// 0x0104df60: 0x104df60: lw    a0, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -6134,80 +6134,80 @@ L_104df18:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104df54: 0x104df54: subu  v1, v1, a1
+// 0x0104df64: 0x104df64: subu  v1, v1, a1
 	ldloc 6
 	ldloc.1
 	sub
 	stloc 6
-// 0x0104df58: 0x104df58: subu  t0, t0, t1
+// 0x0104df68: 0x104df68: subu  t0, t0, t1
 	ldloc 7
 	ldloc 8
 	sub
 	stloc 7
-// 0x0104df5c: 0x104df5c: lw    a3, 0(a3)
+// 0x0104df6c: 0x104df6c: lw    a3, 0(a3)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0104df60: 0x104df60: lw    a2, 0(a2)
+// 0x0104df70: 0x104df70: lw    a2, 0(a2)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0104df64: 0x104df64: sll   zero, zero, 0
-// 0x0104df68: 0x104df68: cibyl_sysc_arg 0x4
+// 0x0104df74: 0x104df74: sll   zero, zero, 0
+// 0x0104df78: 0x104df78: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104df6c: 0x104df6c: cibyl_sysc_arg 0x5
+// 0x0104df7c: 0x104df7c: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104df70: 0x104df70: cibyl_sysc_arg 0x9
+// 0x0104df80: 0x104df80: cibyl_sysc_arg 0x9
 	ldloc 8
-// 0x0104df74: 0x104df74: cibyl_sysc_arg 0x3
+// 0x0104df84: 0x104df84: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104df78: 0x104df78: cibyl_sysc_arg 0x8
+// 0x0104df88: 0x104df88: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x0104df7c: 0x104df7c: cibyl_sysc_arg 0x7
+// 0x0104df8c: 0x104df8c: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x0104df80: 0x104df80: cibyl_sysc_arg 0x6
+// 0x0104df90: 0x104df90: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104df84: 0x104df84: cibyl_sysc_arg 0xa
+// 0x0104df94: 0x104df94: cibyl_sysc_arg 0xa
 	ldloc 9
-// 0x0104df88: 0x104df88: cibyl_sysc 0xaf9
+// 0x0104df98: 0x104df98: cibyl_sysc 0xaf9
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawBitmap(int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x0104df8c: 0x104df8c: jr    ra addu  a1, v0, zero
+// 0x0104df9c: 0x104df9c: jr    ra addu  a1, v0, zero
 	ldloc 5
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_104df94:
-// 0x0104df94: 0x104df94: cibyl_sysc_arg 0x3
+L_104dfa4:
+// 0x0104dfa4: 0x104dfa4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104df98: 0x104df98: cibyl_sysc 0xb12
+// 0x0104dfa8: 0x104dfa8: cibyl_sysc 0xb12
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getWidth(int32)
 	stloc 5
-// 0x0104df9c: 0x104df9c: addu  t2, v0, zero
+// 0x0104dfac: 0x104dfac: addu  t2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0104dfa0: 0x104dfa0: lw    t1, 0(a0)
+// 0x0104dfb0: 0x104dfb0: lw    t1, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0104dfa4: 0x104dfa4: sll   zero, zero, 0
-// 0x0104dfa8: 0x104dfa8: cibyl_sysc_arg 0x9
+// 0x0104dfb4: 0x104dfb4: sll   zero, zero, 0
+// 0x0104dfb8: 0x104dfb8: cibyl_sysc_arg 0x9
 	ldloc 8
-// 0x0104dfac: 0x104dfac: cibyl_sysc 0xb27
+// 0x0104dfbc: 0x104dfbc: cibyl_sysc 0xb27
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getHeight(int32)
 	stloc 5
-// 0x0104dfb0: 0x104dfb0: addu  t1, v0, zero
+// 0x0104dfc0: 0x104dfc0: addu  t1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104dfb4: 0x104dfb4: lw    t0, 4(a1)
+// 0x0104dfc4: 0x104dfc4: lw    t0, 4(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -6216,14 +6216,14 @@ L_104df94:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104dfb8: 0x104dfb8: lw    v1, 0(a1)
+// 0x0104dfc8: 0x104dfc8: lw    v1, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104dfbc: 0x104dfbc: lw    a0, 4(a0)
+// 0x0104dfcc: 0x104dfcc: lw    a0, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -6232,43 +6232,43 @@ L_104df94:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104dfc0: 0x104dfc0: subu  a1, t2, v1
+// 0x0104dfd0: 0x104dfd0: subu  a1, t2, v1
 	ldloc 9
 	ldloc 6
 	sub
 	stloc.1
-// 0x0104dfc4: 0x104dfc4: subu  t1, t1, t0
+// 0x0104dfd4: 0x104dfd4: subu  t1, t1, t0
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-// 0x0104dfc8: 0x104dfc8: lw    a3, 0(a3)
+// 0x0104dfd8: 0x104dfd8: lw    a3, 0(a3)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0104dfcc: 0x104dfcc: sll   zero, zero, 0
-// 0x0104dfd0: 0x104dfd0: cibyl_sysc_arg 0x4
+// 0x0104dfdc: 0x104dfdc: sll   zero, zero, 0
+// 0x0104dfe0: 0x104dfe0: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104dfd4: 0x104dfd4: cibyl_sysc_arg 0x3
+// 0x0104dfe4: 0x104dfe4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104dfd8: 0x104dfd8: cibyl_sysc_arg 0x8
+// 0x0104dfe8: 0x104dfe8: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x0104dfdc: 0x104dfdc: cibyl_sysc_arg 0x5
+// 0x0104dfec: 0x104dfec: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104dfe0: 0x104dfe0: cibyl_sysc_arg 0x9
+// 0x0104dff0: 0x104dff0: cibyl_sysc_arg 0x9
 	ldloc 8
-// 0x0104dfe4: 0x104dfe4: cibyl_sysc_arg 0x7
+// 0x0104dff4: 0x104dff4: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x0104dfe8: 0x104dfe8: cibyl_sysc_arg 0x6
+// 0x0104dff8: 0x104dff8: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104dfec: 0x104dfec: cibyl_sysc_arg 0x6
+// 0x0104dffc: 0x104dffc: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104dff0: 0x104dff0: cibyl_sysc 0xb3d
+// 0x0104e000: 0x104e000: cibyl_sysc 0xb3d
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawBitmap(int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x0104dff4: 0x104dff4: jr    ra addu  a2, v0, zero
+// 0x0104e004: 0x104e004: jr    ra addu  a2, v0, zero
 	ldloc 5
 	stloc.2
 	br __CIBYL_function_return
@@ -6278,7 +6278,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_image_width_104dffc(int32)
+.method public static int32 roadmap_canvas_image_width_104e00c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -6301,29 +6301,29 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104dffc: 0x104dffc: beq   a0, zero, 0x104e018 addu  v1, zero, zero
+// 0x0104e00c: 0x104e00c: beq   a0, zero, 0x104e028 addu  v1, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_104e018
-// 0x0104e004: 0x104e004: lw    v1, 0(a0)
+	brfalse L_104e028
+// 0x0104e014: 0x104e014: lw    v1, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104e008: 0x104e008: sll   zero, zero, 0
-// 0x0104e00c: 0x104e00c: cibyl_sysc_arg 0x3
+// 0x0104e018: 0x104e018: sll   zero, zero, 0
+// 0x0104e01c: 0x104e01c: cibyl_sysc_arg 0x3
 	ldloc.1
-// 0x0104e010: 0x104e010: cibyl_sysc 0xb56
+// 0x0104e020: 0x104e020: cibyl_sysc 0xb56
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getWidth(int32)
 	stloc.2
-// 0x0104e014: 0x104e014: addu  v1, v0, zero
+// 0x0104e024: 0x104e024: addu  v1, v0, zero
 	ldloc.2
 	stloc.1
-L_104e018:
-// 0x0104e018: 0x104e018: jr    ra addu  v0, v1, zero
+L_104e028:
+// 0x0104e028: 0x104e028: jr    ra addu  v0, v1, zero
 	ldloc.1
 	stloc.2
 	br __CIBYL_function_return
@@ -6333,7 +6333,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_canvas_image_height_104e020(int32)
+.method public static int32 roadmap_canvas_image_height_104e030(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -6356,29 +6356,29 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e020: 0x104e020: beq   a0, zero, 0x104e03c addu  v1, zero, zero
+// 0x0104e030: 0x104e030: beq   a0, zero, 0x104e04c addu  v1, zero, zero
 	ldloc.0
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_104e03c
-// 0x0104e028: 0x104e028: lw    v1, 0(a0)
+	brfalse L_104e04c
+// 0x0104e038: 0x104e038: lw    v1, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104e02c: 0x104e02c: sll   zero, zero, 0
-// 0x0104e030: 0x104e030: cibyl_sysc_arg 0x3
+// 0x0104e03c: 0x104e03c: sll   zero, zero, 0
+// 0x0104e040: 0x104e040: cibyl_sysc_arg 0x3
 	ldloc.1
-// 0x0104e034: 0x104e034: cibyl_sysc 0xb6b
+// 0x0104e044: 0x104e044: cibyl_sysc 0xb6b
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getHeight(int32)
 	stloc.2
-// 0x0104e038: 0x104e038: addu  v1, v0, zero
+// 0x0104e048: 0x104e048: addu  v1, v0, zero
 	ldloc.2
 	stloc.1
-L_104e03c:
-// 0x0104e03c: 0x104e03c: jr    ra addu  v0, v1, zero
+L_104e04c:
+// 0x0104e04c: 0x104e04c: jr    ra addu  v0, v1, zero
 	ldloc.1
 	stloc.2
 	br __CIBYL_function_return
@@ -6388,7 +6388,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 rim_on_canvas_button_pressed_104e044(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_canvas_button_pressed_104e054(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6423,35 +6423,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e044: 0x104e044: sll   a0, a0, 16
+// 0x0104e054: 0x104e054: sll   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shl
 	stloc.1
-// 0x0104e048: 0x104e048: sll   a1, a1, 16
+// 0x0104e058: 0x104e058: sll   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x0104e04c: 0x104e04c: lui   v0, 0x0
+// 0x0104e05c: 0x104e05c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104e050: 0x104e050: addiu sp, sp, -32
+// 0x0104e060: 0x104e060: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e054: 0x104e054: sra   a0, a0, 16
+// 0x0104e064: 0x104e064: sra   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shr
 	stloc.1
-// 0x0104e058: 0x104e058: sra   a1, a1, 16
+// 0x0104e068: 0x104e068: sra   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x0104e05c: 0x104e05c: lw    v0, 13792(v0)
+// 0x0104e06c: 0x104e06c: lw    v0, 13792(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6460,8 +6460,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e060: 0x104e060: sw    ra, 28(sp)
-// 0x0104e064: 0x104e064: sw    a0, 16(sp)
+// 0x0104e070: 0x104e070: sw    ra, 28(sp)
+// 0x0104e074: 0x104e074: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6470,7 +6470,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104e068: 0x104e068: sw    a1, 20(sp)
+// 0x0104e078: 0x104e078: sw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6479,7 +6479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104e06c: 0x104e06c: jalr  v0 addiu a0, sp, 16
+// 0x0104e07c: 0x104e07c: jalr  v0 addiu a0, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
@@ -6495,9 +6495,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104e074: 0x104e074: lw    ra, 28(sp)
-// 0x0104e078: 0x104e078: sll   zero, zero, 0
-// 0x0104e07c: 0x104e07c: jr    ra addiu sp, sp, 32
+// 0x0104e084: 0x104e084: lw    ra, 28(sp)
+// 0x0104e088: 0x104e088: sll   zero, zero, 0
+// 0x0104e08c: 0x104e08c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6509,7 +6509,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rim_on_canvas_button_released_104e084(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_canvas_button_released_104e094(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6544,35 +6544,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e084: 0x104e084: sll   a0, a0, 16
+// 0x0104e094: 0x104e094: sll   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shl
 	stloc.1
-// 0x0104e088: 0x104e088: sll   a1, a1, 16
+// 0x0104e098: 0x104e098: sll   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x0104e08c: 0x104e08c: lui   v0, 0x0
+// 0x0104e09c: 0x104e09c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104e090: 0x104e090: addiu sp, sp, -32
+// 0x0104e0a0: 0x104e0a0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e094: 0x104e094: sra   a0, a0, 16
+// 0x0104e0a4: 0x104e0a4: sra   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shr
 	stloc.1
-// 0x0104e098: 0x104e098: sra   a1, a1, 16
+// 0x0104e0a8: 0x104e0a8: sra   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x0104e09c: 0x104e09c: lw    v0, 13796(v0)
+// 0x0104e0ac: 0x104e0ac: lw    v0, 13796(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6581,8 +6581,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e0a0: 0x104e0a0: sw    ra, 28(sp)
-// 0x0104e0a4: 0x104e0a4: sw    a0, 16(sp)
+// 0x0104e0b0: 0x104e0b0: sw    ra, 28(sp)
+// 0x0104e0b4: 0x104e0b4: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6591,7 +6591,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104e0a8: 0x104e0a8: sw    a1, 20(sp)
+// 0x0104e0b8: 0x104e0b8: sw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6600,7 +6600,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104e0ac: 0x104e0ac: jalr  v0 addiu a0, sp, 16
+// 0x0104e0bc: 0x104e0bc: jalr  v0 addiu a0, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
@@ -6616,9 +6616,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104e0b4: 0x104e0b4: lw    ra, 28(sp)
-// 0x0104e0b8: 0x104e0b8: sll   zero, zero, 0
-// 0x0104e0bc: 0x104e0bc: jr    ra addiu sp, sp, 32
+// 0x0104e0c4: 0x104e0c4: lw    ra, 28(sp)
+// 0x0104e0c8: 0x104e0c8: sll   zero, zero, 0
+// 0x0104e0cc: 0x104e0cc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6630,7 +6630,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rim_on_canvas_button_moved_104e0c4(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_canvas_button_moved_104e0d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6665,35 +6665,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e0c4: 0x104e0c4: sll   a0, a0, 16
+// 0x0104e0d4: 0x104e0d4: sll   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shl
 	stloc.1
-// 0x0104e0c8: 0x104e0c8: sll   a1, a1, 16
+// 0x0104e0d8: 0x104e0d8: sll   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x0104e0cc: 0x104e0cc: lui   v0, 0x0
+// 0x0104e0dc: 0x104e0dc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104e0d0: 0x104e0d0: addiu sp, sp, -32
+// 0x0104e0e0: 0x104e0e0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e0d4: 0x104e0d4: sra   a0, a0, 16
+// 0x0104e0e4: 0x104e0e4: sra   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shr
 	stloc.1
-// 0x0104e0d8: 0x104e0d8: sra   a1, a1, 16
+// 0x0104e0e8: 0x104e0e8: sra   a1, a1, 16
 	ldloc.2
 	ldc.i4.s 16
 	shr
 	stloc.2
-// 0x0104e0dc: 0x104e0dc: lw    v0, 13800(v0)
+// 0x0104e0ec: 0x104e0ec: lw    v0, 13800(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6702,8 +6702,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e0e0: 0x104e0e0: sw    ra, 28(sp)
-// 0x0104e0e4: 0x104e0e4: sw    a0, 16(sp)
+// 0x0104e0f0: 0x104e0f0: sw    ra, 28(sp)
+// 0x0104e0f4: 0x104e0f4: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6712,7 +6712,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104e0e8: 0x104e0e8: sw    a1, 20(sp)
+// 0x0104e0f8: 0x104e0f8: sw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6721,7 +6721,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104e0ec: 0x104e0ec: jalr  v0 addiu a0, sp, 16
+// 0x0104e0fc: 0x104e0fc: jalr  v0 addiu a0, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
@@ -6737,9 +6737,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104e0f4: 0x104e0f4: lw    ra, 28(sp)
-// 0x0104e0f8: 0x104e0f8: sll   zero, zero, 0
-// 0x0104e0fc: 0x104e0fc: jr    ra addiu sp, sp, 32
+// 0x0104e104: 0x104e104: lw    ra, 28(sp)
+// 0x0104e108: 0x104e108: sll   zero, zero, 0
+// 0x0104e10c: 0x104e10c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6751,7 +6751,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_image_from_buf_104e104()
+.method public static int32 roadmap_canvas_image_from_buf_104e114()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -6765,7 +6765,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e104: 0x104e104: jr    ra addu  v0, zero, zero
+// 0x0104e114: 0x104e114: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -6773,7 +6773,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_canvas_shutdown_104e10c()
+.method public static void roadmap_canvas_shutdown_104e11c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -6784,12 +6784,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e10c: 0x104e10c: jr    ra sll   zero, zero, 0
+// 0x0104e11c: 0x104e11c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_canvas_image_invalidate_104e114()
+.method public static void roadmap_canvas_image_invalidate_104e124()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -6800,12 +6800,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e114: 0x104e114: jr    ra sll   zero, zero, 0
+// 0x0104e124: 0x104e124: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_canvas_unmanaged_list_add_104e11c()
+.method public static void roadmap_canvas_unmanaged_list_add_104e12c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -6816,12 +6816,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e11c: 0x104e11c: jr    ra sll   zero, zero, 0
+// 0x0104e12c: 0x104e12c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_canvas_image_jpg_from_buff_104e124(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_image_jpg_from_buff_104e134(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6859,12 +6859,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e124: 0x104e124: addiu sp, sp, -24
+// 0x0104e134: 0x104e134: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104e128: 0x104e128: sw    s0, 16(sp)
+// 0x0104e138: 0x104e138: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6873,29 +6873,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104e12c: 0x104e12c: sw    ra, 20(sp)
-// 0x0104e130: 0x104e130: addiu s0, zero, 1
+// 0x0104e13c: 0x104e13c: sw    ra, 20(sp)
+// 0x0104e140: 0x104e140: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0104e134: 0x104e134: cibyl_sysc_arg 0x4
+// 0x0104e144: 0x104e144: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e138: 0x104e138: cibyl_sysc_arg 0x5
+// 0x0104e148: 0x104e148: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104e13c: 0x104e13c: cibyl_sysc_arg 0x10
+// 0x0104e14c: 0x104e14c: cibyl_sysc_arg 0x10
 	ldloc 5
-// 0x0104e140: 0x104e140: cibyl_sysc 0xb81
+// 0x0104e150: 0x104e150: cibyl_sysc 0xb81
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getBitmapFromBytes(int32,int32,int32)
 	stloc 6
-// 0x0104e144: 0x104e144: addu  s0, v0, zero
+// 0x0104e154: 0x104e154: addu  s0, v0, zero
 	ldloc 6
 	stloc 5
-// 0x0104e148: 0x104e148: beq   s0, zero, 0x104e160 addu  v0, zero, zero
+// 0x0104e158: 0x104e158: beq   s0, zero, 0x104e170 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_104e160
+	brfalse L_104e170
 // --- basic block ---
-// 0x0104e150: 0x104e150: jal   0x1000910 addiu a0, zero, 4
+// 0x0104e160: 0x104e160: jal   0x1000910 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -6908,14 +6908,14 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0104e158: 0x104e158: sw    s0, 0(v0)
+// 0x0104e168: 0x104e168: sw    s0, 0(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104e15c: 0x104e15c: sw    zero, 4(v0)
+// 0x0104e16c: 0x104e16c: sw    zero, 4(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6924,9 +6924,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_104e160:
-// 0x0104e160: 0x104e160: lw    ra, 20(sp)
-// 0x0104e164: 0x104e164: lw    s0, 16(sp)
+L_104e170:
+// 0x0104e170: 0x104e170: lw    ra, 20(sp)
+// 0x0104e174: 0x104e174: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6935,7 +6935,7 @@ L_104e160:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e168: 0x104e168: jr    ra addiu sp, sp, 24
+// 0x0104e178: 0x104e178: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6947,7 +6947,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -6985,12 +6985,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e170: 0x104e170: addiu sp, sp, -32
+// 0x0104e180: 0x104e180: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e174: 0x104e174: sw    s0, 24(sp)
+// 0x0104e184: 0x104e184: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6999,10 +6999,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104e178: 0x104e178: addu  s0, a0, zero
+// 0x0104e188: 0x104e188: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0104e17c: 0x104e17c: sw    a1, 16(sp)
+// 0x0104e18c: 0x104e18c: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7011,8 +7011,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104e180: 0x104e180: sw    ra, 28(sp)
-// 0x0104e184: 0x104e184: jal   0x1000910 addiu a0, zero, 20
+// 0x0104e190: 0x104e190: sw    ra, 28(sp)
+// 0x0104e194: 0x104e194: jal   0x1000910 addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
 	ldloc.0
@@ -7025,10 +7025,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104e18c: 0x104e18c: addu  v1, v0, zero
+// 0x0104e19c: 0x104e19c: addu  v1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104e190: 0x104e190: lw    a1, 16(sp)
+// 0x0104e1a0: 0x104e1a0: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7037,33 +7037,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104e194: 0x104e194: sll   zero, zero, 0
-// 0x0104e198: 0x104e198: cibyl_sysc_arg 0x10
+// 0x0104e1a4: 0x104e1a4: sll   zero, zero, 0
+// 0x0104e1a8: 0x104e1a8: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x0104e19c: 0x104e19c: cibyl_sysc_arg 0x5
+// 0x0104e1ac: 0x104e1ac: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104e1a0: 0x104e1a0: cibyl_sysc 0xba0
+// 0x0104e1b0: 0x104e1b0: cibyl_sysc 0xba0
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_new(int32,int32)
 	stloc 6
-// 0x0104e1a4: 0x104e1a4: addu  a0, v0, zero
+// 0x0104e1b4: 0x104e1b4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104e1a8: 0x104e1a8: cibyl_sysc_arg 0x4
+// 0x0104e1b8: 0x104e1b8: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e1ac: 0x104e1ac: cibyl_sysc_arg 0x10
+// 0x0104e1bc: 0x104e1bc: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x0104e1b0: 0x104e1b0: cibyl_sysc_arg 0x5
+// 0x0104e1c0: 0x104e1c0: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104e1b4: 0x104e1b4: cibyl_sysc 0xbb0
+// 0x0104e1c4: 0x104e1c4: cibyl_sysc 0xbb0
 	call void [WazeWP7]Syscalls::NOPH_Bitmap_Waze_resetARGB(int32,int32,int32)
-// 0x0104e1b8: 0x104e1b8: addu  s0, v0, zero
+// 0x0104e1c8: 0x104e1c8: addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104e1bc: 0x104e1bc: lw    ra, 28(sp)
-// 0x0104e1c0: 0x104e1c0: addu  v0, v1, zero
+// 0x0104e1cc: 0x104e1cc: lw    ra, 28(sp)
+// 0x0104e1d0: 0x104e1d0: addu  v0, v1, zero
 	ldloc 8
 	stloc 6
-// 0x0104e1c4: 0x104e1c4: lw    s0, 24(sp)
+// 0x0104e1d4: 0x104e1d4: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7072,14 +7072,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104e1c8: 0x104e1c8: sw    a0, 0(v1)
+// 0x0104e1d8: 0x104e1d8: sw    a0, 0(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0104e1cc: 0x104e1cc: sw    zero, 4(v1)
+// 0x0104e1dc: 0x104e1dc: sw    zero, 4(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7088,7 +7088,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104e1d0: 0x104e1d0: jr    ra addiu sp, sp, 32
+// 0x0104e1e0: 0x104e1e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -7100,7 +7100,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 dummy_handler_104e1d8(int32,int32,int32,int32,int32)
+.method public static int32 dummy_handler_104e1e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -7138,12 +7138,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e1d8: 0x104e1d8: addiu sp, sp, -32
+// 0x0104e1e8: 0x104e1e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e1dc: 0x104e1dc: sw    s0, 24(sp)
+// 0x0104e1ec: 0x104e1ec: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7152,14 +7152,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104e1e0: 0x104e1e0: sw    ra, 28(sp)
-// 0x0104e1e4: 0x104e1e4: beq   a1, zero, 0x104e210 addu  s0, a0, zero
+// 0x0104e1f0: 0x104e1f0: sw    ra, 28(sp)
+// 0x0104e1f4: 0x104e1f4: beq   a1, zero, 0x104e220 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 6
-	brfalse L_104e210
+	brfalse L_104e220
 // --- basic block ---
-// 0x0104e1ec: 0x104e1ec: lw    v0, 8(a1)
+// 0x0104e1fc: 0x104e1fc: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -7168,29 +7168,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104e1f0: 0x104e1f0: lui   a3, 0x10000
+// 0x0104e200: 0x104e200: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104e1f4: 0x104e1f4: lui   a1, 0x10000
+// 0x0104e204: 0x104e204: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104e1f8: 0x104e1f8: addiu a1, a1, 3776
+// 0x0104e208: 0x104e208: addiu a1, a1, 3772
 	ldloc.2
-	ldc.i4 3776
+	ldc.i4 3772
 	add
 	stloc.2
-// 0x0104e1fc: 0x104e1fc: addiu a3, a3, 3796
+// 0x0104e20c: 0x104e20c: addiu a3, a3, 3792
 	ldloc 4
-	ldc.i4 3796
+	ldc.i4 3792
 	add
 	stloc 4
-// 0x0104e200: 0x104e200: addiu a0, zero, 4
+// 0x0104e210: 0x104e210: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104e204: 0x104e204: addiu a2, zero, 235
+// 0x0104e214: 0x104e214: addiu a2, zero, 235
 	ldc.i4 235
 	stloc.3
-// 0x0104e208: 0x104e208: jal   0x100449c sw    v0, 16(sp)
+// 0x0104e218: 0x104e218: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7209,16 +7209,16 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-L_104e210:
-// 0x0104e210: 0x104e210: cibyl_sysc_arg 0x10
+L_104e220:
+// 0x0104e220: 0x104e220: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x0104e214: 0x104e214: cibyl_sysc 0xbcb
+// 0x0104e224: 0x104e224: cibyl_sysc 0xbcb
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104e218: 0x104e218: addu  s0, v0, zero
+// 0x0104e228: 0x104e228: addu  s0, v0, zero
 	ldloc 7
 	stloc 6
-// 0x0104e21c: 0x104e21c: lw    ra, 28(sp)
-// 0x0104e220: 0x104e220: lw    s0, 24(sp)
+// 0x0104e22c: 0x104e22c: lw    ra, 28(sp)
+// 0x0104e230: 0x104e230: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7227,7 +7227,7 @@ L_104e210:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e224: 0x104e224: jr    ra addiu sp, sp, 32
+// 0x0104e234: 0x104e234: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl58.j b/converted/Cibyl58.j
index d968225..e8f961b 100644
--- a/converted/Cibyl58.j
+++ b/converted/Cibyl58.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl58::.ctor
 
-.method public static int32 roadmap_canvas_configure_104e22c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_configure_104e23c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,35 +76,35 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e22c: 0x104e22c: addiu sp, sp, -128
+// 0x0104e23c: 0x104e23c: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x0104e230: 0x104e230: sw    ra, 124(sp)
-// 0x0104e234: 0x104e234: addiu a0, sp, 16
+// 0x0104e240: 0x104e240: sw    ra, 124(sp)
+// 0x0104e244: 0x104e244: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0104e238: 0x104e238: addiu v1, zero, 100
+// 0x0104e248: 0x104e248: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 6
-// 0x0104e23c: 0x104e23c: cibyl_sysc_arg 0x4
+// 0x0104e24c: 0x104e24c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e240: 0x104e240: cibyl_sysc_arg 0x3
+// 0x0104e250: 0x104e250: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104e244: 0x104e244: cibyl_sysc 0xbd7
+// 0x0104e254: 0x104e254: cibyl_sysc 0xbd7
 	call void [WazeWP7]Syscalls::NOPH_DeviceSpecific_getPlatform(int32,int32)
-// 0x0104e248: 0x104e248: addu  v1, v0, zero
+// 0x0104e258: 0x104e258: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0104e24c: 0x104e24c: lui   a1, 0x10000
+// 0x0104e25c: 0x104e25c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104e250: 0x104e250: jal   0x1000420 addiu a1, a1, 3824
+// 0x0104e260: 0x104e260: jal   0x1000420 addiu a1, a1, 3820
 	ldloc.2
-	ldc.i4 3824
+	ldc.i4 3820
 	add
 	stloc.2
 	ldloc.0
@@ -117,42 +117,42 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104e258: 0x104e258: lui   a1, 0x10000
+// 0x0104e268: 0x104e268: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104e25c: 0x104e25c: lui   a3, 0x10000
+// 0x0104e26c: 0x104e26c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104e260: 0x104e260: sltu  v0, zero, v0
+// 0x0104e270: 0x104e270: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0104e264: 0x104e264: lui   v1, 0x70000
+// 0x0104e274: 0x104e274: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104e268: 0x104e268: addiu a1, a1, 3776
+// 0x0104e278: 0x104e278: addiu a1, a1, 3772
 	ldloc.2
-	ldc.i4 3776
+	ldc.i4 3772
 	add
 	stloc.2
-// 0x0104e26c: 0x104e26c: addiu a3, a3, 3840
+// 0x0104e27c: 0x104e27c: addiu a3, a3, 3836
 	ldloc 4
-	ldc.i4 3840
+	ldc.i4 3836
 	add
 	stloc 4
-// 0x0104e270: 0x104e270: addiu a0, zero, 1
+// 0x0104e280: 0x104e280: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0104e274: 0x104e274: addiu a2, zero, 1176
+// 0x0104e284: 0x104e284: addiu a2, zero, 1176
 	ldc.i4 1176
 	stloc.3
-// 0x0104e278: 0x104e278: jal   0x100449c sw    v0, -4176(v1)
+// 0x0104e288: 0x104e288: jal   0x100449c sw    v0, -3712(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1044
+	ldc.i4 -928
 	add
 	ldloc 5
 	stelem.i4
@@ -166,141 +166,141 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104e280: 0x104e280: cibyl_sysc 0xbf7
+// 0x0104e290: 0x104e290: cibyl_sysc 0xbf7
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_get()
 	stloc 5
-// 0x0104e284: 0x104e284: addu  a0, v0, zero
+// 0x0104e294: 0x104e294: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104e288: 0x104e288: lui   v1, 0x70000
+// 0x0104e298: 0x104e298: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104e28c: 0x104e28c: sw    a0, -4116(v1)
+// 0x0104e29c: 0x104e29c: sw    a0, -3652(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1029
+	ldc.i4 -913
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104e290: 0x104e290: cibyl_sysc_arg 0x4
+// 0x0104e2a0: 0x104e2a0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e294: 0x104e294: cibyl_sysc 0xc12
+// 0x0104e2a4: 0x104e2a4: cibyl_sysc 0xc12
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_getGraphics(int32)
 	stloc 5
-// 0x0104e298: 0x104e298: addu  a0, v0, zero
+// 0x0104e2a8: 0x104e2a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104e29c: 0x104e29c: lui   v0, 0x70000
+// 0x0104e2ac: 0x104e2ac: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e2a0: 0x104e2a0: sw    a0, -4112(v0)
+// 0x0104e2b0: 0x104e2b0: sw    a0, -3648(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104e2a4: 0x104e2a4: lw    a1, -4116(v1)
+// 0x0104e2b4: 0x104e2b4: lw    a1, -3652(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1029
+	ldc.i4 -913
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104e2a8: 0x104e2a8: sll   zero, zero, 0
-// 0x0104e2ac: 0x104e2ac: cibyl_sysc_arg 0x5
+// 0x0104e2b8: 0x104e2b8: sll   zero, zero, 0
+// 0x0104e2bc: 0x104e2bc: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104e2b0: 0x104e2b0: cibyl_sysc 0xc35
+// 0x0104e2c0: 0x104e2c0: cibyl_sysc 0xc35
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_getVisibleWidth(int32)
 	stloc 5
-// 0x0104e2b4: 0x104e2b4: addu  a1, v0, zero
+// 0x0104e2c4: 0x104e2c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104e2b8: 0x104e2b8: lui   a0, 0xf0000
+// 0x0104e2c8: 0x104e2c8: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0104e2bc: 0x104e2bc: sw    a1, -30068(a0)
+// 0x0104e2cc: 0x104e2cc: sw    a1, -29604(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104e2c0: 0x104e2c0: lw    v1, -4116(v1)
+// 0x0104e2d0: 0x104e2d0: lw    v1, -3652(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1029
+	ldc.i4 -913
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e2c4: 0x104e2c4: sll   zero, zero, 0
-// 0x0104e2c8: 0x104e2c8: cibyl_sysc_arg 0x3
+// 0x0104e2d4: 0x104e2d4: sll   zero, zero, 0
+// 0x0104e2d8: 0x104e2d8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104e2cc: 0x104e2cc: cibyl_sysc 0xc5c
+// 0x0104e2dc: 0x104e2dc: cibyl_sysc 0xc5c
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_getVisibleHeight(int32)
 	stloc 5
-// 0x0104e2d0: 0x104e2d0: addu  v1, v0, zero
+// 0x0104e2e0: 0x104e2e0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0104e2d4: 0x104e2d4: lw    v0, -30068(a0)
+// 0x0104e2e4: 0x104e2e4: lw    v0, -29604(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e2d8: 0x104e2d8: lui   a0, 0xf0000
+// 0x0104e2e8: 0x104e2e8: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0104e2dc: 0x104e2dc: slti  v0, v0, 360
+// 0x0104e2ec: 0x104e2ec: slti  v0, v0, 360
 	ldloc 5
 	ldc.i4 360
 	clt
 	stloc 5
-// 0x0104e2e0: 0x104e2e0: sw    v1, -30072(a0)
+// 0x0104e2f0: 0x104e2f0: sw    v1, -29608(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104e2e4: 0x104e2e4: beq   v0, zero, 0x104e2f0 lui   a0, 0x20000
+// 0x0104e2f4: 0x104e2f4: beq   v0, zero, 0x104e300 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_104e2f0
+	brfalse L_104e300
 // --- basic block ---
-// 0x0104e2ec: 0x104e2ec: lui   a0, 0x10000
+// 0x0104e2fc: 0x104e2fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_104e2f0:
-// 0x0104e2f0: 0x104e2f0: jal   0x101fa0c ori   a0, a0, 1
+L_104e300:
+// 0x0104e300: 0x104e300: jal   0x101fa1c ori   a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	or
 	stloc.1
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_set_screen_type_101fa0c(int32)
+	call int32 Cibyl23::roadmap_screen_set_screen_type_101fa1c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0104e2f8: 0x104e2f8: lui   v0, 0x0
+// 0x0104e308: 0x104e308: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0104e2fc: 0x104e2fc: lw    v0, 13804(v0)
+// 0x0104e30c: 0x104e30c: lw    v0, 13804(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -309,8 +309,8 @@ L_104e2f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e300: 0x104e300: sll   zero, zero, 0
-// 0x0104e304: 0x104e304: jalr  v0 sll   zero, zero, 0
+// 0x0104e310: 0x104e310: sll   zero, zero, 0
+// 0x0104e314: 0x104e314: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -322,9 +322,9 @@ L_104e2f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104e30c: 0x104e30c: lw    ra, 124(sp)
-// 0x0104e310: 0x104e310: sll   zero, zero, 0
-// 0x0104e314: 0x104e314: jr    ra addiu sp, sp, 128
+// 0x0104e31c: 0x104e31c: lw    ra, 124(sp)
+// 0x0104e320: 0x104e320: sll   zero, zero, 0
+// 0x0104e324: 0x104e324: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -336,7 +336,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_refresh_104e31c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_refresh_104e32c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -371,45 +371,45 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e31c: 0x104e31c: addiu sp, sp, -24
+// 0x0104e32c: 0x104e32c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104e320: 0x104e320: sw    ra, 20(sp)
-// 0x0104e324: 0x104e324: jal   0x101f9b8 addiu a0, zero, 7
+// 0x0104e330: 0x104e330: sw    ra, 20(sp)
+// 0x0104e334: 0x104e334: jal   0x101f9c8 addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
-	call void Cibyl23::dbg_time_start_101f9b8()
+	call void Cibyl23::dbg_time_start_101f9c8()
 // --- basic block ---
-// 0x0104e32c: 0x104e32c: lui   v0, 0x70000
+// 0x0104e33c: 0x104e33c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e330: 0x104e330: lw    v1, -4116(v0)
+// 0x0104e340: 0x104e340: lw    v1, -3652(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1029
+	ldc.i4 -913
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e334: 0x104e334: sll   zero, zero, 0
-// 0x0104e338: 0x104e338: cibyl_sysc_arg 0x3
+// 0x0104e344: 0x104e344: sll   zero, zero, 0
+// 0x0104e348: 0x104e348: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0104e33c: 0x104e33c: cibyl_sysc 0xc84
+// 0x0104e34c: 0x104e34c: cibyl_sysc 0xc84
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_refresh(int32)
-// 0x0104e340: 0x104e340: addu  v1, v0, zero
+// 0x0104e350: 0x104e350: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0104e344: 0x104e344: jal   0x101f9c0 addiu a0, zero, 7
+// 0x0104e354: 0x104e354: jal   0x101f9d0 addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
-	call void Cibyl23::dbg_time_end_101f9c0()
+	call void Cibyl23::dbg_time_end_101f9d0()
 // --- basic block ---
-// 0x0104e34c: 0x104e34c: lw    ra, 20(sp)
-// 0x0104e350: 0x104e350: sll   zero, zero, 0
-// 0x0104e354: 0x104e354: jr    ra addiu sp, sp, 24
+// 0x0104e35c: 0x104e35c: lw    ra, 20(sp)
+// 0x0104e360: 0x104e360: sll   zero, zero, 0
+// 0x0104e364: 0x104e364: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -421,7 +421,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra)
@@ -465,12 +465,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e35c: 0x104e35c: addiu sp, sp, -32
+// 0x0104e36c: 0x104e36c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e360: 0x104e360: sw    s2, 24(sp)
+// 0x0104e370: 0x104e370: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -479,7 +479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104e364: 0x104e364: sw    s0, 16(sp)
+// 0x0104e374: 0x104e374: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -488,13 +488,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104e368: 0x104e368: lui   s2, 0x70000
+// 0x0104e378: 0x104e378: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0104e36c: 0x104e36c: addu  s0, a0, zero
+// 0x0104e37c: 0x104e37c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104e370: 0x104e370: sw    s1, 20(sp)
+// 0x0104e380: 0x104e380: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -503,47 +503,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104e374: 0x104e374: sw    ra, 28(sp)
-// 0x0104e378: 0x104e378: lw    s1, -4172(s2)
+// 0x0104e384: 0x104e384: sw    ra, 28(sp)
+// 0x0104e388: 0x104e388: lw    s1, -3708(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1043
+	ldc.i4 -927
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104e37c: 0x104e37c: jal   0x101f9b8 addiu a0, zero, 3
+// 0x0104e38c: 0x104e38c: jal   0x101f9c8 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-	call void Cibyl23::dbg_time_start_101f9b8()
+	call void Cibyl23::dbg_time_start_101f9c8()
 // --- basic block ---
-// 0x0104e384: 0x104e384: lui   a1, 0x70000
+// 0x0104e394: 0x104e394: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0104e388: 0x104e388: lw    v1, -4112(a1)
+// 0x0104e398: 0x104e398: lw    v1, -3648(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104e38c: 0x104e38c: sll   zero, zero, 0
-// 0x0104e390: 0x104e390: beq   v1, zero, 0x104e3ec sw    s0, -4172(s2)
+// 0x0104e39c: 0x104e39c: sll   zero, zero, 0
+// 0x0104e3a0: 0x104e3a0: beq   v1, zero, 0x104e3fc sw    s0, -3708(s2)
 	ldloc 7
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1043
+	ldc.i4 -927
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_104e3ec
+	brfalse L_104e3fc
 // --- basic block ---
-// 0x0104e398: 0x104e398: lw    a0, 8(s0)
+// 0x0104e3a8: 0x104e3a8: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -552,20 +552,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104e39c: 0x104e39c: sll   zero, zero, 0
-// 0x0104e3a0: 0x104e3a0: cibyl_sysc_arg 0x3
+// 0x0104e3ac: 0x104e3ac: sll   zero, zero, 0
+// 0x0104e3b0: 0x104e3b0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104e3a4: 0x104e3a4: cibyl_sysc_arg 0x4
+// 0x0104e3b4: 0x104e3b4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e3a8: 0x104e3a8: cibyl_sysc 0xca3
+// 0x0104e3b8: 0x104e3b8: cibyl_sysc 0xca3
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setColor(int32,int32)
-// 0x0104e3ac: 0x104e3ac: addu  v1, v0, zero
+// 0x0104e3bc: 0x104e3bc: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104e3b0: 0x104e3b0: lui   v1, 0x0
+// 0x0104e3c0: 0x104e3c0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0104e3b4: 0x104e3b4: lw    a0, 12(s0)
+// 0x0104e3c4: 0x104e3c4: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -574,7 +574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104e3b8: 0x104e3b8: lw    v0, 13808(v1)
+// 0x0104e3c8: 0x104e3c8: lw    v0, 13808(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -583,32 +583,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e3bc: 0x104e3bc: sll   zero, zero, 0
-// 0x0104e3c0: 0x104e3c0: beq   a0, v0, 0x104e3ec sll   zero, zero, 0
+// 0x0104e3cc: 0x104e3cc: sll   zero, zero, 0
+// 0x0104e3d0: 0x104e3d0: beq   a0, v0, 0x104e3fc sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_104e3ec
+	beq  L_104e3fc
 // --- basic block ---
-// 0x0104e3c8: 0x104e3c8: lw    a1, -4112(a1)
+// 0x0104e3d8: 0x104e3d8: lw    a1, -3648(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104e3cc: 0x104e3cc: sll   zero, zero, 0
-// 0x0104e3d0: 0x104e3d0: cibyl_sysc_arg 0x5
+// 0x0104e3dc: 0x104e3dc: sll   zero, zero, 0
+// 0x0104e3e0: 0x104e3e0: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104e3d4: 0x104e3d4: cibyl_sysc_arg 0x4
+// 0x0104e3e4: 0x104e3e4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e3d8: 0x104e3d8: cibyl_sysc 0xcba
+// 0x0104e3e8: 0x104e3e8: cibyl_sysc 0xcba
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setGlobalAlpha(int32,int32)
-// 0x0104e3dc: 0x104e3dc: addu  a0, v0, zero
+// 0x0104e3ec: 0x104e3ec: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104e3e0: 0x104e3e0: lw    v0, 12(s0)
+// 0x0104e3f0: 0x104e3f0: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -617,8 +617,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e3e4: 0x104e3e4: sll   zero, zero, 0
-// 0x0104e3e8: 0x104e3e8: sw    v0, 13808(v1)
+// 0x0104e3f4: 0x104e3f4: sll   zero, zero, 0
+// 0x0104e3f8: 0x104e3f8: sw    v0, 13808(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -627,17 +627,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-L_104e3ec:
-// 0x0104e3ec: 0x104e3ec: jal   0x101f9c0 addiu a0, zero, 3
+L_104e3fc:
+// 0x0104e3fc: 0x104e3fc: jal   0x101f9d0 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-	call void Cibyl23::dbg_time_end_101f9c0()
+	call void Cibyl23::dbg_time_end_101f9d0()
 // --- basic block ---
-// 0x0104e3f4: 0x104e3f4: lw    ra, 28(sp)
-// 0x0104e3f8: 0x104e3f8: addu  v0, s1, zero
+// 0x0104e404: 0x104e404: lw    ra, 28(sp)
+// 0x0104e408: 0x104e408: addu  v0, s1, zero
 	ldloc 10
 	stloc 6
-// 0x0104e3fc: 0x104e3fc: lw    s2, 24(sp)
+// 0x0104e40c: 0x104e40c: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -646,7 +646,7 @@ L_104e3ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104e400: 0x104e400: lw    s1, 20(sp)
+// 0x0104e410: 0x104e410: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -655,7 +655,7 @@ L_104e3ec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104e404: 0x104e404: lw    s0, 16(sp)
+// 0x0104e414: 0x104e414: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -664,7 +664,7 @@ L_104e3ec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104e408: 0x104e408: jr    ra addiu sp, sp, 32
+// 0x0104e418: 0x104e418: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -676,7 +676,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_set_opacity_104e410(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_set_opacity_104e420(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -711,28 +711,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e410: 0x104e410: lui   v0, 0x70000
+// 0x0104e420: 0x104e420: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e414: 0x104e414: lw    v0, -4172(v0)
+// 0x0104e424: 0x104e424: lw    v0, -3708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1043
+	ldc.i4 -927
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e418: 0x104e418: addiu sp, sp, -24
+// 0x0104e428: 0x104e428: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104e41c: 0x104e41c: beq   v0, zero, 0x104e430 sw    ra, 20(sp)
+// 0x0104e42c: 0x104e42c: beq   v0, zero, 0x104e440 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_104e430
+	brfalse L_104e440
 // --- basic block ---
-// 0x0104e424: 0x104e424: sw    a0, 12(v0)
+// 0x0104e434: 0x104e434: sw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -741,7 +741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104e428: 0x104e428: jal   0x104e35c addu  a0, v0, zero
+// 0x0104e438: 0x104e438: jal   0x104e36c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -749,15 +749,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_104e430:
-// 0x0104e430: 0x104e430: lw    ra, 20(sp)
-// 0x0104e434: 0x104e434: sll   zero, zero, 0
-// 0x0104e438: 0x104e438: jr    ra addiu sp, sp, 24
+L_104e440:
+// 0x0104e440: 0x104e440: lw    ra, 20(sp)
+// 0x0104e444: 0x104e444: sll   zero, zero, 0
+// 0x0104e448: 0x104e448: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -769,7 +769,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 bidi_string_104e440(int32,int32,int32,int32,int32)
+.method public static int32 bidi_string_104e450(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 v1,int32 s5,int32 t0,int32 t1,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -837,12 +837,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e440: 0x104e440: addiu sp, sp, -576
+// 0x0104e450: 0x104e450: addiu sp, sp, -576
 	ldloc.0
 	ldc.i4 -576
 	add
 	stloc.0
-// 0x0104e444: 0x104e444: sw    s8, 568(sp)
+// 0x0104e454: 0x104e454: sw    s8, 568(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -851,7 +851,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0104e448: 0x104e448: sw    s7, 564(sp)
+// 0x0104e458: 0x104e458: sw    s7, 564(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -860,7 +860,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0104e44c: 0x104e44c: sw    s6, 560(sp)
+// 0x0104e45c: 0x104e45c: sw    s6, 560(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -869,7 +869,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104e450: 0x104e450: sw    s5, 556(sp)
+// 0x0104e460: 0x104e460: sw    s5, 556(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -878,7 +878,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104e454: 0x104e454: sw    s4, 552(sp)
+// 0x0104e464: 0x104e464: sw    s4, 552(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -887,7 +887,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104e458: 0x104e458: sw    s3, 548(sp)
+// 0x0104e468: 0x104e468: sw    s3, 548(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -896,7 +896,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104e45c: 0x104e45c: sw    s2, 544(sp)
+// 0x0104e46c: 0x104e46c: sw    s2, 544(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -905,7 +905,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104e460: 0x104e460: sw    s1, 540(sp)
+// 0x0104e470: 0x104e470: sw    s1, 540(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -914,7 +914,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104e464: 0x104e464: sw    s0, 536(sp)
+// 0x0104e474: 0x104e474: sw    s0, 536(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -923,174 +923,174 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104e468: 0x104e468: sw    ra, 572(sp)
-// 0x0104e46c: 0x104e46c: addu  s3, a0, zero
+// 0x0104e478: 0x104e478: sw    ra, 572(sp)
+// 0x0104e47c: 0x104e47c: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0104e470: 0x104e470: addu  s2, a1, zero
+// 0x0104e480: 0x104e480: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0104e474: 0x104e474: addu  s1, zero, zero
+// 0x0104e484: 0x104e484: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0104e478: 0x104e478: addu  s0, zero, zero
+// 0x0104e488: 0x104e488: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0104e47c: 0x104e47c: addiu t1, zero, -41
+// 0x0104e48c: 0x104e48c: addiu t1, zero, -41
 	ldc.i4.s -41
 	stloc 15
-// 0x0104e480: 0x104e480: addiu s5, zero, 500
+// 0x0104e490: 0x104e490: addiu s5, zero, 500
 	ldc.i4 500
 	stloc 13
-// 0x0104e484: 0x104e484: addiu s4, sp, 16
+// 0x0104e494: 0x104e494: addiu s4, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 11
-// 0x0104e488: 0x104e488: addiu t0, zero, 32
+// 0x0104e498: 0x104e498: addiu t0, zero, 32
 	ldc.i4.s 32
 	stloc 14
-// 0x0104e48c: 0x104e48c: addiu a3, zero, 34
+// 0x0104e49c: 0x104e49c: addiu a3, zero, 34
 	ldc.i4.s 34
 	stloc 4
-// 0x0104e490: 0x104e490: addiu v1, zero, 58
+// 0x0104e4a0: 0x104e4a0: addiu v1, zero, 58
 	ldc.i4.s 58
 	stloc 12
-// 0x0104e494: 0x104e494: addiu s8, zero, 63
+// 0x0104e4a4: 0x104e4a4: addiu s8, zero, 63
 	ldc.i4.s 63
 	stloc 18
-// 0x0104e498: 0x104e498: addiu s7, zero, 92
+// 0x0104e4a8: 0x104e4a8: addiu s7, zero, 92
 	ldc.i4.s 92
 	stloc 17
-// 0x0104e49c: 0x104e49c: j	 0x104e5c0 addiu s6, zero, 95
+// 0x0104e4ac: 0x104e4ac: j	 0x104e5d0 addiu s6, zero, 95
 	ldc.i4.s 95
 	stloc 16
-	br L_104e5c0
+	br L_104e5d0
 // --- basic block ---
-L_104e4a4:
-// 0x0104e4a4: 0x104e4a4: beq   v0, t1, 0x104e50c sll   zero, zero, 0
+L_104e4b4:
+// 0x0104e4b4: 0x104e4b4: beq   v0, t1, 0x104e51c sll   zero, zero, 0
 	ldloc 6
 	ldloc 15
-	beq  L_104e50c
+	beq  L_104e51c
 // --- basic block ---
-// 0x0104e4ac: 0x104e4ac: beq   v0, t0, 0x104e588 sll   zero, zero, 0
+// 0x0104e4bc: 0x104e4bc: beq   v0, t0, 0x104e598 sll   zero, zero, 0
 	ldloc 6
 	ldloc 14
-	beq  L_104e588
+	beq  L_104e598
 // --- basic block ---
-// 0x0104e4b4: 0x104e4b4: beq   v0, a3, 0x104e588 slti  a0, v0, 40
+// 0x0104e4c4: 0x104e4c4: beq   v0, a3, 0x104e598 slti  a0, v0, 40
 	ldloc 6
 	ldloc 4
 	ldloc 6
 	ldc.i4.s 40
 	clt
 	stloc.1
-	beq  L_104e588
+	beq  L_104e598
 // --- basic block ---
-// 0x0104e4bc: 0x104e4bc: bne   a0, zero, 0x104e5b4 addu  a0, s3, s1
+// 0x0104e4cc: 0x104e4cc: bne   a0, zero, 0x104e5c4 addu  a0, s3, s1
 	ldloc.1
 	ldloc 10
 	ldloc 8
 	add
 	stloc.1
-	brtrue L_104e5b4
+	brtrue L_104e5c4
 // --- basic block ---
-// 0x0104e4c4: 0x104e4c4: slti  a0, v0, 42
+// 0x0104e4d4: 0x104e4d4: slti  a0, v0, 42
 	ldloc 6
 	ldc.i4.s 42
 	clt
 	stloc.1
-// 0x0104e4c8: 0x104e4c8: bne   a0, zero, 0x104e588 slti  a0, v0, 44
+// 0x0104e4d8: 0x104e4d8: bne   a0, zero, 0x104e598 slti  a0, v0, 44
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 44
 	clt
 	stloc.1
-	brtrue L_104e588
+	brtrue L_104e598
 // --- basic block ---
-// 0x0104e4d0: 0x104e4d0: bne   a0, zero, 0x104e5b4 addu  a0, s3, s1
+// 0x0104e4e0: 0x104e4e0: bne   a0, zero, 0x104e5c4 addu  a0, s3, s1
 	ldloc.1
 	ldloc 10
 	ldloc 8
 	add
 	stloc.1
-	brtrue L_104e5b4
+	brtrue L_104e5c4
 // --- basic block ---
-// 0x0104e4d8: 0x104e4d8: slti  a0, v0, 48
+// 0x0104e4e8: 0x104e4e8: slti  a0, v0, 48
 	ldloc 6
 	ldc.i4.s 48
 	clt
 	stloc.1
-// 0x0104e4dc: 0x104e4dc: bne   a0, zero, 0x104e588 sll   zero, zero, 0
+// 0x0104e4ec: 0x104e4ec: bne   a0, zero, 0x104e598 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_104e588
+	brtrue L_104e598
 // --- basic block ---
-// 0x0104e4e4: 0x104e4e4: beq   v0, v1, 0x104e588 sll   zero, zero, 0
+// 0x0104e4f4: 0x104e4f4: beq   v0, v1, 0x104e598 sll   zero, zero, 0
 	ldloc 6
 	ldloc 12
-	beq  L_104e588
+	beq  L_104e598
 // --- basic block ---
-// 0x0104e4ec: 0x104e4ec: beq   v0, s8, 0x104e588 sll   zero, zero, 0
+// 0x0104e4fc: 0x104e4fc: beq   v0, s8, 0x104e598 sll   zero, zero, 0
 	ldloc 6
 	ldloc 18
-	beq  L_104e588
+	beq  L_104e598
 // --- basic block ---
-// 0x0104e4f4: 0x104e4f4: beq   v0, s7, 0x104e588 sll   zero, zero, 0
+// 0x0104e504: 0x104e504: beq   v0, s7, 0x104e598 sll   zero, zero, 0
 	ldloc 6
 	ldloc 17
-	beq  L_104e588
+	beq  L_104e598
 // --- basic block ---
-// 0x0104e4fc: 0x104e4fc: bne   v0, s6, 0x104e5b4 addu  a0, s3, s1
+// 0x0104e50c: 0x104e50c: bne   v0, s6, 0x104e5c4 addu  a0, s3, s1
 	ldloc 6
 	ldloc 16
 	ldloc 10
 	ldloc 8
 	add
 	stloc.1
-	bne.un L_104e5b4
+	bne.un L_104e5c4
 // --- basic block ---
-// 0x0104e504: 0x104e504: j	 0x104e58c addiu s2, s2, 1
+// 0x0104e514: 0x104e514: j	 0x104e59c addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_104e58c
+	br L_104e59c
 // --- basic block ---
-L_104e50c:
-// 0x0104e50c: 0x104e50c: beq   s1, zero, 0x104e558 addiu v0, s0, 1
+L_104e51c:
+// 0x0104e51c: 0x104e51c: beq   s1, zero, 0x104e568 addiu v0, s0, 1
 	ldloc 8
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_104e558
+	brfalse L_104e568
 // --- basic block ---
-// 0x0104e514: 0x104e514: subu  a0, zero, s0
+// 0x0104e524: 0x104e524: subu  a0, zero, s0
 	ldloc 7
 	neg
 	stloc.1
-// 0x0104e518: 0x104e518: subu  a0, a0, s1
+// 0x0104e528: 0x104e528: subu  a0, a0, s1
 	ldloc.1
 	ldloc 8
 	sub
 	stloc.1
-// 0x0104e51c: 0x104e51c: addiu a0, a0, 500
+// 0x0104e52c: 0x104e52c: addiu a0, a0, 500
 	ldloc.1
 	ldc.i4 500
 	add
 	stloc.1
-// 0x0104e520: 0x104e520: addu  a0, s4, a0
+// 0x0104e530: 0x104e530: addu  a0, s4, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc.1
-// 0x0104e524: 0x104e524: addu  a1, s3, zero
+// 0x0104e534: 0x104e534: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x0104e528: 0x104e528: addu  a2, s1, zero
+// 0x0104e538: 0x104e538: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x0104e52c: 0x104e52c: sw    v1, 532(sp)
+// 0x0104e53c: 0x104e53c: sw    v1, 532(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1099,7 +1099,7 @@ L_104e50c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104e530: 0x104e530: sw    a3, 528(sp)
+// 0x0104e540: 0x104e540: sw    a3, 528(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1108,7 +1108,7 @@ L_104e50c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0104e534: 0x104e534: sw    t0, 524(sp)
+// 0x0104e544: 0x104e544: sw    t0, 524(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1117,7 +1117,7 @@ L_104e50c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104e538: 0x104e538: jal   0x1001800 sw    t1, 520(sp)
+// 0x0104e548: 0x104e548: jal   0x1001800 sw    t1, 520(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1135,7 +1135,7 @@ L_104e50c:
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x0104e540: 0x104e540: lw    t1, 520(sp)
+// 0x0104e550: 0x104e550: lw    t1, 520(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1144,7 +1144,7 @@ L_104e50c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104e544: 0x104e544: lw    t0, 524(sp)
+// 0x0104e554: 0x104e554: lw    t0, 524(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1153,7 +1153,7 @@ L_104e50c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104e548: 0x104e548: lw    a3, 528(sp)
+// 0x0104e558: 0x104e558: lw    a3, 528(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1162,7 +1162,7 @@ L_104e50c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104e54c: 0x104e54c: lw    v1, 532(sp)
+// 0x0104e55c: 0x104e55c: lw    v1, 532(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1171,170 +1171,170 @@ L_104e50c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104e550: 0x104e550: addu  s0, s0, s1
+// 0x0104e560: 0x104e560: addu  s0, s0, s1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 7
-// 0x0104e554: 0x104e554: addiu v0, s0, 1
+// 0x0104e564: 0x104e564: addiu v0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 6
-L_104e558:
-// 0x0104e558: 0x104e558: lbu   a0, 1(s2)
+L_104e568:
+// 0x0104e568: 0x104e568: lbu   a0, 1(s2)
 	ldloc 9
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x0104e55c: 0x104e55c: subu  v0, s5, v0
+// 0x0104e56c: 0x104e56c: subu  v0, s5, v0
 	ldloc 13
 	ldloc 6
 	sub
 	stloc 6
-// 0x0104e560: 0x104e560: addu  v0, s4, v0
+// 0x0104e570: 0x104e570: addu  v0, s4, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x0104e564: 0x104e564: sb    a0, 0(v0)
+// 0x0104e574: 0x104e574: sb    a0, 0(v0)
 	ldloc 6
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104e568: 0x104e568: addiu s0, s0, 2
+// 0x0104e578: 0x104e578: addiu s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x0104e56c: 0x104e56c: lbu   a0, 0(s2)
+// 0x0104e57c: 0x104e57c: lbu   a0, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x0104e570: 0x104e570: subu  v0, s5, s0
+// 0x0104e580: 0x104e580: subu  v0, s5, s0
 	ldloc 13
 	ldloc 7
 	sub
 	stloc 6
-// 0x0104e574: 0x104e574: addu  v0, s4, v0
+// 0x0104e584: 0x104e584: addu  v0, s4, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x0104e578: 0x104e578: sb    a0, 0(v0)
+// 0x0104e588: 0x104e588: sb    a0, 0(v0)
 	ldloc 6
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104e57c: 0x104e57c: addiu s2, s2, 2
+// 0x0104e58c: 0x104e58c: addiu s2, s2, 2
 	ldloc 9
 	ldc.i4.2
 	add
 	stloc 9
-// 0x0104e580: 0x104e580: j	 0x104e5c0 addu  s1, zero, zero
+// 0x0104e590: 0x104e590: j	 0x104e5d0 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_104e5c0
+	br L_104e5d0
 // --- basic block ---
-L_104e588:
-// 0x0104e588: 0x104e588: addiu s2, s2, 1
+L_104e598:
+// 0x0104e598: 0x104e598: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_104e58c:
-// 0x0104e58c: 0x104e58c: beq   s0, zero, 0x104e5a8 addu  a0, s3, s1
+L_104e59c:
+// 0x0104e59c: 0x104e59c: beq   s0, zero, 0x104e5b8 addu  a0, s3, s1
 	ldloc 7
 	ldloc 10
 	ldloc 8
 	add
 	stloc.1
-	brfalse L_104e5a8
+	brfalse L_104e5b8
 // --- basic block ---
-// 0x0104e594: 0x104e594: addiu s0, s0, 1
+// 0x0104e5a4: 0x104e5a4: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0104e598: 0x104e598: subu  a0, s5, s0
+// 0x0104e5a8: 0x104e5a8: subu  a0, s5, s0
 	ldloc 13
 	ldloc 7
 	sub
 	stloc.1
-// 0x0104e59c: 0x104e59c: addu  a0, s4, a0
+// 0x0104e5ac: 0x104e5ac: addu  a0, s4, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc.1
-// 0x0104e5a0: 0x104e5a0: j	 0x104e5c0 sb    v0, 0(a0)
+// 0x0104e5b0: 0x104e5b0: j	 0x104e5d0 sb    v0, 0(a0)
 	ldloc.1
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_104e5c0
+	br L_104e5d0
 // --- basic block ---
-L_104e5a8:
-// 0x0104e5a8: 0x104e5a8: sb    v0, 0(a0)
+L_104e5b8:
+// 0x0104e5b8: 0x104e5b8: sb    v0, 0(a0)
 	ldloc.1
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104e5ac: 0x104e5ac: j	 0x104e5c0 addiu s1, s1, 1
+// 0x0104e5bc: 0x104e5bc: j	 0x104e5d0 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	br L_104e5c0
+	br L_104e5d0
 // --- basic block ---
-L_104e5b4:
-// 0x0104e5b4: 0x104e5b4: sb    v0, 0(a0)
+L_104e5c4:
+// 0x0104e5c4: 0x104e5c4: sb    v0, 0(a0)
 	ldloc.1
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104e5b8: 0x104e5b8: addiu s1, s1, 1
+// 0x0104e5c8: 0x104e5c8: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0104e5bc: 0x104e5bc: addiu s2, s2, 1
+// 0x0104e5cc: 0x104e5cc: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_104e5c0:
-// 0x0104e5c0: 0x104e5c0: lb    v0, 0(s2)
+L_104e5d0:
+// 0x0104e5d0: 0x104e5d0: lb    v0, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0104e5c4: 0x104e5c4: sll   zero, zero, 0
-// 0x0104e5c8: 0x104e5c8: bne   v0, zero, 0x104e4a4 sll   zero, zero, 0
+// 0x0104e5d4: 0x104e5d4: sll   zero, zero, 0
+// 0x0104e5d8: 0x104e5d8: bne   v0, zero, 0x104e4b4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_104e4a4
+	brtrue L_104e4b4
 // --- basic block ---
-// 0x0104e5d0: 0x104e5d0: beq   s0, zero, 0x104e5f0 addiu a1, zero, 500
+// 0x0104e5e0: 0x104e5e0: beq   s0, zero, 0x104e600 addiu a1, zero, 500
 	ldloc 7
 	ldc.i4 500
 	stloc.2
-	brfalse L_104e5f0
+	brfalse L_104e600
 // --- basic block ---
-// 0x0104e5d8: 0x104e5d8: subu  a1, a1, s0
+// 0x0104e5e8: 0x104e5e8: subu  a1, a1, s0
 	ldloc.2
 	ldloc 7
 	sub
 	stloc.2
-// 0x0104e5dc: 0x104e5dc: addiu v0, sp, 16
+// 0x0104e5ec: 0x104e5ec: addiu v0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x0104e5e0: 0x104e5e0: addu  a1, v0, a1
+// 0x0104e5f0: 0x104e5f0: addu  a1, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc.2
-// 0x0104e5e4: 0x104e5e4: addu  a0, s3, s1
+// 0x0104e5f4: 0x104e5f4: addu  a0, s3, s1
 	ldloc 10
 	ldloc 8
 	add
 	stloc.1
-// 0x0104e5e8: 0x104e5e8: jal   0x1001800 addu  a2, s0, zero
+// 0x0104e5f8: 0x104e5f8: jal   0x1001800 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.1
@@ -1346,23 +1346,23 @@ L_104e5c0:
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_104e5f0:
-// 0x0104e5f0: 0x104e5f0: addu  s1, s3, s1
+L_104e600:
+// 0x0104e600: 0x104e600: addu  s1, s3, s1
 	ldloc 10
 	ldloc 8
 	add
 	stloc 8
-// 0x0104e5f4: 0x104e5f4: addu  s0, s1, s0
+// 0x0104e604: 0x104e604: addu  s0, s1, s0
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x0104e5f8: 0x104e5f8: sb    zero, 0(s0)
+// 0x0104e608: 0x104e608: sb    zero, 0(s0)
 	ldloc 7
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0104e5fc: 0x104e5fc: lw    ra, 572(sp)
-// 0x0104e600: 0x104e600: lw    s8, 568(sp)
+// 0x0104e60c: 0x104e60c: lw    ra, 572(sp)
+// 0x0104e610: 0x104e610: lw    s8, 568(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1371,7 +1371,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0104e604: 0x104e604: lw    s7, 564(sp)
+// 0x0104e614: 0x104e614: lw    s7, 564(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1380,7 +1380,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0104e608: 0x104e608: lw    s6, 560(sp)
+// 0x0104e618: 0x104e618: lw    s6, 560(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1389,7 +1389,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104e60c: 0x104e60c: lw    s5, 556(sp)
+// 0x0104e61c: 0x104e61c: lw    s5, 556(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1398,7 +1398,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104e610: 0x104e610: lw    s4, 552(sp)
+// 0x0104e620: 0x104e620: lw    s4, 552(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1407,7 +1407,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104e614: 0x104e614: lw    s3, 548(sp)
+// 0x0104e624: 0x104e624: lw    s3, 548(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1416,7 +1416,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104e618: 0x104e618: lw    s2, 544(sp)
+// 0x0104e628: 0x104e628: lw    s2, 544(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1425,7 +1425,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104e61c: 0x104e61c: lw    s1, 540(sp)
+// 0x0104e62c: 0x104e62c: lw    s1, 540(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1434,7 +1434,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104e620: 0x104e620: lw    s0, 536(sp)
+// 0x0104e630: 0x104e630: lw    s0, 536(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1443,7 +1443,7 @@ L_104e5f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104e624: 0x104e624: jr    ra addiu sp, sp, 576
+// 0x0104e634: 0x104e634: jr    ra addiu sp, sp, 576
 	ldloc.0
 	ldc.i4 576
 	add
@@ -1455,7 +1455,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_getFont_104e62c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_getFont_104e63c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1490,53 +1490,53 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e62c: 0x104e62c: lui   v1, 0x70000
+// 0x0104e63c: 0x104e63c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104e630: 0x104e630: lw    v0, -4168(v1)
+// 0x0104e640: 0x104e640: lw    v0, -3704(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1042
+	ldc.i4 -926
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e634: 0x104e634: addiu sp, sp, -32
+// 0x0104e644: 0x104e644: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e638: 0x104e638: bne   v0, zero, 0x104e64c sw    ra, 28(sp)
+// 0x0104e648: 0x104e648: bne   v0, zero, 0x104e65c sw    ra, 28(sp)
 	ldloc 5
-	brtrue L_104e64c
+	brtrue L_104e65c
 // --- basic block ---
-// 0x0104e640: 0x104e640: cibyl_sysc 0xcd7
+// 0x0104e650: 0x104e650: cibyl_sysc 0xcd7
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_getDeviceVersion()
 	stloc 5
-// 0x0104e644: 0x104e644: addu  a1, v0, zero
+// 0x0104e654: 0x104e654: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104e648: 0x104e648: sw    a1, -4168(v1)
+// 0x0104e658: 0x104e658: sw    a1, -3704(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1042
+	ldc.i4 -926
 	add
 	ldloc.2
 	stelem.i4
-L_104e64c:
-// 0x0104e64c: 0x104e64c: bgtz  a0, 0x104e658 sll   zero, zero, 0
+L_104e65c:
+// 0x0104e65c: 0x104e65c: bgtz  a0, 0x104e668 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	bgt L_104e658
+	bgt L_104e668
 // --- basic block ---
-// 0x0104e654: 0x104e654: addiu a0, zero, 12
+// 0x0104e664: 0x104e664: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-L_104e658:
-// 0x0104e658: 0x104e658: jal   0x101fa28 sw    a0, 16(sp)
+L_104e668:
+// 0x0104e668: 0x104e668: jal   0x101fa38 sw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1545,10 +1545,10 @@ L_104e658:
 	add
 	ldloc.1
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0104e660: 0x104e660: lw    a0, 16(sp)
+// 0x0104e670: 0x104e670: lw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1557,45 +1557,45 @@ L_104e658:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104e664: 0x104e664: beq   v0, zero, 0x104e6c8 lui   v1, 0x70000
+// 0x0104e674: 0x104e674: beq   v0, zero, 0x104e6d8 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_104e6c8
+	brfalse L_104e6d8
 // --- basic block ---
-// 0x0104e66c: 0x104e66c: jal   0x10c09c0 sll   zero, zero, 0
+// 0x0104e67c: 0x104e67c: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104e674: 0x104e674: lui   a0, 0x20000
+// 0x0104e684: 0x104e684: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0104e678: 0x104e678: lw    a3, 23876(a0)
+// 0x0104e688: 0x104e688: lw    a3, 24340(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5969
+	ldc.i4 6085
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104e67c: 0x104e67c: lw    a2, 23872(a0)
+// 0x0104e68c: 0x104e68c: lw    a2, 24336(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5968
+	ldc.i4 6084
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104e680: 0x104e680: addu  a1, v1, zero
+// 0x0104e690: 0x104e690: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x0104e684: 0x104e684: jal   0x10c0798 addu  a0, v0, zero
+// 0x0104e694: 0x104e694: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1603,212 +1603,212 @@ L_104e658:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104e68c: 0x104e68c: addu  a0, v0, zero
+// 0x0104e69c: 0x104e69c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104e690: 0x104e690: jal   0x10c08d0 addu  a1, v1, zero
+// 0x0104e6a0: 0x104e6a0: jal   0x10c0f10 addu  a1, v1, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0104e698: 0x104e698: addu  a0, v0, zero
+// 0x0104e6a8: 0x104e6a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104e69c: 0x104e69c: lui   v0, 0x70000
+// 0x0104e6ac: 0x104e6ac: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e6a0: 0x104e6a0: lw    v0, -4168(v0)
+// 0x0104e6b0: 0x104e6b0: lw    v0, -3704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1042
+	ldc.i4 -926
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e6a4: 0x104e6a4: addiu v1, zero, 8900
+// 0x0104e6b4: 0x104e6b4: addiu v1, zero, 8900
 	ldc.i4 8900
 	stloc 6
-// 0x0104e6a8: 0x104e6a8: bne   v0, v1, 0x104e6b8 addiu v1, zero, 9100
+// 0x0104e6b8: 0x104e6b8: bne   v0, v1, 0x104e6c8 addiu v1, zero, 9100
 	ldloc 5
 	ldloc 6
 	ldc.i4 9100
 	stloc 6
-	bne.un L_104e6b8
+	bne.un L_104e6c8
 // --- basic block ---
-// 0x0104e6b0: 0x104e6b0: j	 0x104e6c4 addiu a0, a0, 2
+// 0x0104e6c0: 0x104e6c0: j	 0x104e6d4 addiu a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	add
 	stloc.1
-	br L_104e6c4
+	br L_104e6d4
 // --- basic block ---
-L_104e6b8:
-// 0x0104e6b8: 0x104e6b8: bne   v0, v1, 0x104e6c8 lui   v1, 0x70000
+L_104e6c8:
+// 0x0104e6c8: 0x104e6c8: bne   v0, v1, 0x104e6d8 lui   v1, 0x70000
 	ldloc 5
 	ldloc 6
 	ldc.i4 458752
 	stloc 6
-	bne.un L_104e6c8
+	bne.un L_104e6d8
 // --- basic block ---
-// 0x0104e6c0: 0x104e6c0: addiu a0, a0, -2
+// 0x0104e6d0: 0x104e6d0: addiu a0, a0, -2
 	ldloc.1
 	ldc.i4.s -2
 	add
 	stloc.1
-L_104e6c4:
-// 0x0104e6c4: 0x104e6c4: lui   v1, 0x70000
+L_104e6d4:
+// 0x0104e6d4: 0x104e6d4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-L_104e6c8:
-// 0x0104e6c8: 0x104e6c8: lw    v0, -4164(v1)
+L_104e6d8:
+// 0x0104e6d8: 0x104e6d8: lw    v0, -3700(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1041
+	ldc.i4 -925
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e6cc: 0x104e6cc: sll   zero, zero, 0
-// 0x0104e6d0: 0x104e6d0: bne   v0, zero, 0x104e6e8 slti  v0, a0, 40
+// 0x0104e6dc: 0x104e6dc: sll   zero, zero, 0
+// 0x0104e6e0: 0x104e6e0: bne   v0, zero, 0x104e6f8 slti  v0, a0, 40
 	ldloc 5
 	ldloc.1
 	ldc.i4.s 40
 	clt
 	stloc 5
-	brtrue L_104e6e8
+	brtrue L_104e6f8
 // --- basic block ---
-// 0x0104e6d8: 0x104e6d8: cibyl_sysc 0xcf8
+// 0x0104e6e8: 0x104e6e8: cibyl_sysc 0xcf8
 	call int32 [WazeWP7]Syscalls::NOPH_Font_getDefault()
 	stloc 5
-// 0x0104e6dc: 0x104e6dc: addu  a1, v0, zero
+// 0x0104e6ec: 0x104e6ec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104e6e0: 0x104e6e0: sw    a1, -4164(v1)
+// 0x0104e6f0: 0x104e6f0: sw    a1, -3700(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1041
+	ldc.i4 -925
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104e6e4: 0x104e6e4: slti  v0, a0, 40
+// 0x0104e6f4: 0x104e6f4: slti  v0, a0, 40
 	ldloc.1
 	ldc.i4.s 40
 	clt
 	stloc 5
-L_104e6e8:
-// 0x0104e6e8: 0x104e6e8: bne   v0, zero, 0x104e6f4 lui   v1, 0x70000
+L_104e6f8:
+// 0x0104e6f8: 0x104e6f8: bne   v0, zero, 0x104e704 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brtrue L_104e6f4
+	brtrue L_104e704
 // --- basic block ---
-// 0x0104e6f0: 0x104e6f0: addiu a0, zero, 39
+// 0x0104e700: 0x104e700: addiu a0, zero, 39
 	ldc.i4.s 39
 	stloc.1
-L_104e6f4:
-// 0x0104e6f4: 0x104e6f4: sll   v0, a0, 2
+L_104e704:
+// 0x0104e704: 0x104e704: sll   v0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0104e6f8: 0x104e6f8: addiu v1, v1, -4108
+// 0x0104e708: 0x104e708: addiu v1, v1, -3644
 	ldloc 6
-	ldc.i4 -4108
+	ldc.i4 -3644
 	add
 	stloc 6
-// 0x0104e6fc: 0x104e6fc: addu  v1, v0, v1
+// 0x0104e70c: 0x104e70c: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x0104e700: 0x104e700: lw    v0, 0(v1)
+// 0x0104e710: 0x104e710: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104e704: 0x104e704: sll   zero, zero, 0
-// 0x0104e708: 0x104e708: bne   v0, zero, 0x104e730 lui   v0, 0x70000
+// 0x0104e714: 0x104e714: sll   zero, zero, 0
+// 0x0104e718: 0x104e718: bne   v0, zero, 0x104e740 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_104e730
+	brtrue L_104e740
 // --- basic block ---
-// 0x0104e710: 0x104e710: lw    a1, -4164(v0)
+// 0x0104e720: 0x104e720: lw    a1, -3700(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1041
+	ldc.i4 -925
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104e714: 0x104e714: addiu a2, zero, 1
+// 0x0104e724: 0x104e724: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0104e718: 0x104e718: cibyl_sysc_arg 0x5
+// 0x0104e728: 0x104e728: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104e71c: 0x104e71c: cibyl_sysc_arg 0x6
+// 0x0104e72c: 0x104e72c: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104e720: 0x104e720: cibyl_sysc_arg 0x4
+// 0x0104e730: 0x104e730: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e724: 0x104e724: cibyl_sysc 0xd0d
+// 0x0104e734: 0x104e734: cibyl_sysc 0xd0d
 	call int32 [WazeWP7]Syscalls::NOPH_Font_derive(int32,int32,int32)
 	stloc 5
-// 0x0104e728: 0x104e728: addu  a1, v0, zero
+// 0x0104e738: 0x104e738: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104e72c: 0x104e72c: sw    a1, 0(v1)
+// 0x0104e73c: 0x104e73c: sw    a1, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-L_104e730:
-// 0x0104e730: 0x104e730: lui   v0, 0x70000
+L_104e740:
+// 0x0104e740: 0x104e740: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e734: 0x104e734: addiu v0, v0, -4108
+// 0x0104e744: 0x104e744: addiu v0, v0, -3644
 	ldloc 5
-	ldc.i4 -4108
+	ldc.i4 -3644
 	add
 	stloc 5
-// 0x0104e738: 0x104e738: sll   a0, a0, 2
+// 0x0104e748: 0x104e748: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0104e73c: 0x104e73c: lw    ra, 28(sp)
-// 0x0104e740: 0x104e740: addu  a0, a0, v0
+// 0x0104e74c: 0x104e74c: lw    ra, 28(sp)
+// 0x0104e750: 0x104e750: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x0104e744: 0x104e744: lw    v0, 0(a0)
+// 0x0104e754: 0x104e754: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104e748: 0x104e748: jr    ra addiu sp, sp, 32
+// 0x0104e758: 0x104e758: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1820,7 +1820,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_draw_string_angle_104e86c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_string_angle_104e87c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s3,int32 s2,int32 s0,int32 s1,int32 s4,int32 ra)
@@ -1870,24 +1870,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e86c: 0x104e86c: lui   v0, 0x70000
+// 0x0104e87c: 0x104e87c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104e870: 0x104e870: lw    v0, -4176(v0)
+// 0x0104e880: 0x104e880: lw    v0, -3712(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1044
+	ldc.i4 -928
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e874: 0x104e874: addiu sp, sp, -552
+// 0x0104e884: 0x104e884: addiu sp, sp, -552
 	ldloc.0
 	ldc.i4 -552
 	add
 	stloc.0
-// 0x0104e878: 0x104e878: sw    s2, 536(sp)
+// 0x0104e888: 0x104e888: sw    s2, 536(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1896,7 +1896,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104e87c: 0x104e87c: sw    s1, 532(sp)
+// 0x0104e88c: 0x104e88c: sw    s1, 532(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1905,7 +1905,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104e880: 0x104e880: sw    s0, 528(sp)
+// 0x0104e890: 0x104e890: sw    s0, 528(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1914,8 +1914,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104e884: 0x104e884: sw    ra, 548(sp)
-// 0x0104e888: 0x104e888: sw    s4, 544(sp)
+// 0x0104e894: 0x104e894: sw    ra, 548(sp)
+// 0x0104e898: 0x104e898: sw    s4, 544(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1924,7 +1924,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104e88c: 0x104e88c: sw    s3, 540(sp)
+// 0x0104e89c: 0x104e89c: sw    s3, 540(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1933,13 +1933,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104e890: 0x104e890: addu  s0, a0, zero
+// 0x0104e8a0: 0x104e8a0: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0104e894: 0x104e894: addu  s1, a2, zero
+// 0x0104e8a4: 0x104e8a4: addu  s1, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0104e898: 0x104e898: lw    a1, 568(sp)
+// 0x0104e8a8: 0x104e8a8: lw    a1, 568(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1948,18 +1948,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104e89c: 0x104e89c: beq   v0, zero, 0x104e8b4 addu  s2, a3, zero
+// 0x0104e8ac: 0x104e8ac: beq   v0, zero, 0x104e8c4 addu  s2, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 9
-	brfalse L_104e8b4
+	brfalse L_104e8c4
 // --- basic block ---
-// 0x0104e8a4: 0x104e8a4: addiu s3, sp, 16
+// 0x0104e8b4: 0x104e8b4: addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x0104e8a8: 0x104e8a8: jal   0x104e440 addu  a0, s3, zero
+// 0x0104e8b8: 0x104e8b8: jal   0x104e450 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1967,47 +1967,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::bidi_string_104e440(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::bidi_string_104e450(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104e8b0: 0x104e8b0: addu  a1, s3, zero
+// 0x0104e8c0: 0x104e8c0: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-L_104e8b4:
-// 0x0104e8b4: 0x104e8b4: lui   s3, 0x70000
+L_104e8c4:
+// 0x0104e8c4: 0x104e8c4: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104e8b8: 0x104e8b8: lw    v0, -4156(s3)
+// 0x0104e8c8: 0x104e8c8: lw    v0, -3692(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1039
+	ldc.i4 -923
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e8bc: 0x104e8bc: lui   v1, 0x70000
+// 0x0104e8cc: 0x104e8cc: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104e8c0: 0x104e8c0: lw    s4, -4112(v1)
+// 0x0104e8d0: 0x104e8d0: lw    s4, -3648(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104e8c4: 0x104e8c4: beq   s2, v0, 0x104e8f0 addu  a0, s2, zero
+// 0x0104e8d4: 0x104e8d4: beq   s2, v0, 0x104e900 addu  a0, s2, zero
 	ldloc 9
 	ldloc 6
 	ldloc 9
 	stloc.1
-	beq  L_104e8f0
+	beq  L_104e900
 // --- basic block ---
-// 0x0104e8cc: 0x104e8cc: jal   0x104e62c sw    a1, 520(sp)
+// 0x0104e8dc: 0x104e8dc: jal   0x104e63c sw    a1, 520(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2021,24 +2021,24 @@ L_104e8b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_getFont_104e62c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_getFont_104e63c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104e8d4: 0x104e8d4: addu  v1, v0, zero
+// 0x0104e8e4: 0x104e8e4: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104e8d8: 0x104e8d8: cibyl_sysc_arg 0x14
+// 0x0104e8e8: 0x104e8e8: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x0104e8dc: 0x104e8dc: cibyl_sysc_arg 0x3
+// 0x0104e8ec: 0x104e8ec: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104e8e0: 0x104e8e0: cibyl_sysc 0xd74
+// 0x0104e8f0: 0x104e8f0: cibyl_sysc 0xd74
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setFont(int32,int32)
-// 0x0104e8e4: 0x104e8e4: addu  s4, v0, zero
+// 0x0104e8f4: 0x104e8f4: addu  s4, v0, zero
 	ldloc 6
 	stloc 12
-// 0x0104e8e8: 0x104e8e8: lw    a1, 520(sp)
+// 0x0104e8f8: 0x104e8f8: lw    a1, 520(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2047,29 +2047,29 @@ L_104e8b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104e8ec: 0x104e8ec: sw    s2, -4156(s3)
+// 0x0104e8fc: 0x104e8fc: sw    s2, -3692(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1039
+	ldc.i4 -923
 	add
 	ldloc 9
 	stelem.i4
-L_104e8f0:
-// 0x0104e8f0: 0x104e8f0: lui   v0, 0x70000
+L_104e900:
+// 0x0104e900: 0x104e900: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104e8f4: 0x104e8f4: lw    v1, -4112(v0)
+// 0x0104e904: 0x104e904: lw    v1, -3648(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104e8f8: 0x104e8f8: lw    a2, 4(s0)
+// 0x0104e908: 0x104e908: lw    a2, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2078,35 +2078,35 @@ L_104e8f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104e8fc: 0x104e8fc: lw    a0, 0(s0)
+// 0x0104e90c: 0x104e90c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104e900: 0x104e900: addiu a3, zero, 14
+// 0x0104e910: 0x104e910: addiu a3, zero, 14
 	ldc.i4.s 14
 	stloc 4
-// 0x0104e904: 0x104e904: cibyl_sysc_arg 0x3
+// 0x0104e914: 0x104e914: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104e908: 0x104e908: cibyl_sysc_arg 0x5
+// 0x0104e918: 0x104e918: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104e90c: 0x104e90c: cibyl_sysc_arg 0x4
+// 0x0104e91c: 0x104e91c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e910: 0x104e910: cibyl_sysc_arg 0x6
+// 0x0104e920: 0x104e920: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104e914: 0x104e914: cibyl_sysc_arg 0x7
+// 0x0104e924: 0x104e924: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104e918: 0x104e918: cibyl_sysc_arg 0x11
+// 0x0104e928: 0x104e928: cibyl_sysc_arg 0x11
 	ldloc 11
-// 0x0104e91c: 0x104e91c: cibyl_sysc 0xd8a
+// 0x0104e92c: 0x104e92c: cibyl_sysc 0xd8a
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawTextAngle(int32,int32,int32,int32,int32,int32)
-// 0x0104e920: 0x104e920: addu  s1, v0, zero
+// 0x0104e930: 0x104e930: addu  s1, v0, zero
 	ldloc 6
 	stloc 11
-// 0x0104e924: 0x104e924: lw    ra, 548(sp)
-// 0x0104e928: 0x104e928: lw    s4, 544(sp)
+// 0x0104e934: 0x104e934: lw    ra, 548(sp)
+// 0x0104e938: 0x104e938: lw    s4, 544(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2115,7 +2115,7 @@ L_104e8f0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104e92c: 0x104e92c: lw    s3, 540(sp)
+// 0x0104e93c: 0x104e93c: lw    s3, 540(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2124,7 +2124,7 @@ L_104e8f0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104e930: 0x104e930: lw    s2, 536(sp)
+// 0x0104e940: 0x104e940: lw    s2, 536(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2133,7 +2133,7 @@ L_104e8f0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104e934: 0x104e934: lw    s1, 532(sp)
+// 0x0104e944: 0x104e944: lw    s1, 532(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2142,7 +2142,7 @@ L_104e8f0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104e938: 0x104e938: lw    s0, 528(sp)
+// 0x0104e948: 0x104e948: lw    s0, 528(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2151,7 +2151,7 @@ L_104e8f0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104e93c: 0x104e93c: jr    ra addiu sp, sp, 552
+// 0x0104e94c: 0x104e94c: jr    ra addiu sp, sp, 552
 	ldloc.0
 	ldc.i4 552
 	add
@@ -2163,7 +2163,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_draw_formated_string_angle_104e944(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_formated_string_angle_104e954(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -2198,12 +2198,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e944: 0x104e944: addiu sp, sp, -32
+// 0x0104e954: 0x104e954: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104e948: 0x104e948: lw    v0, 52(sp)
+// 0x0104e958: 0x104e958: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2212,8 +2212,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104e94c: 0x104e94c: sw    ra, 28(sp)
-// 0x0104e950: 0x104e950: jal   0x104e86c sw    v0, 16(sp)
+// 0x0104e95c: 0x104e95c: sw    ra, 28(sp)
+// 0x0104e960: 0x104e960: jal   0x104e87c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2227,14 +2227,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_angle_104e86c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_angle_104e87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104e958: 0x104e958: lw    ra, 28(sp)
-// 0x0104e95c: 0x104e95c: sll   zero, zero, 0
-// 0x0104e960: 0x104e960: jr    ra addiu sp, sp, 32
+// 0x0104e968: 0x104e968: lw    ra, 28(sp)
+// 0x0104e96c: 0x104e96c: sll   zero, zero, 0
+// 0x0104e970: 0x104e970: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2246,7 +2246,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -2287,24 +2287,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104e968: 0x104e968: lui   v0, 0x70000
+// 0x0104e978: 0x104e978: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e96c: 0x104e96c: lw    v0, -4120(v0)
+// 0x0104e97c: 0x104e97c: lw    v0, -3656(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1030
+	ldc.i4 -914
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e970: 0x104e970: addiu sp, sp, -40
+// 0x0104e980: 0x104e980: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104e974: 0x104e974: sw    s1, 32(sp)
+// 0x0104e984: 0x104e984: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2313,7 +2313,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104e978: 0x104e978: sw    s0, 28(sp)
+// 0x0104e988: 0x104e988: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2322,8 +2322,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104e97c: 0x104e97c: sw    ra, 36(sp)
-// 0x0104e980: 0x104e980: lw    s1, 60(sp)
+// 0x0104e98c: 0x104e98c: sw    ra, 36(sp)
+// 0x0104e990: 0x104e990: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2332,49 +2332,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104e984: 0x104e984: beq   v0, zero, 0x104e9a0 addu  s0, a0, zero
+// 0x0104e994: 0x104e994: beq   v0, zero, 0x104e9b0 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_104e9a0
+	brfalse L_104e9b0
 // --- basic block ---
-// 0x0104e98c: 0x104e98c: lui   v0, 0x70000
+// 0x0104e99c: 0x104e99c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e990: 0x104e990: lw    v0, -4132(v0)
+// 0x0104e9a0: 0x104e9a0: lw    v0, -3668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1033
+	ldc.i4 -917
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104e994: 0x104e994: sll   zero, zero, 0
-// 0x0104e998: 0x104e998: beq   v0, a1, 0x104ea00 lui   v0, 0x70000
+// 0x0104e9a4: 0x104e9a4: sll   zero, zero, 0
+// 0x0104e9a8: 0x104e9a8: beq   v0, a1, 0x104ea10 lui   v0, 0x70000
 	ldloc 5
 	ldloc.2
 	ldc.i4 458752
 	stloc 5
-	beq  L_104ea00
+	beq  L_104ea10
 // --- basic block ---
-L_104e9a0:
-// 0x0104e9a0: 0x104e9a0: addu  a0, a1, zero
+L_104e9b0:
+// 0x0104e9b0: 0x104e9b0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104e9a4: 0x104e9a4: lui   v0, 0x70000
+// 0x0104e9b4: 0x104e9b4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e9a8: 0x104e9a8: sw    a1, -4132(v0)
+// 0x0104e9b8: 0x104e9b8: sw    a1, -3668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1033
+	ldc.i4 -917
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104e9ac: 0x104e9ac: sw    a2, 16(sp)
+// 0x0104e9bc: 0x104e9bc: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2383,7 +2383,7 @@ L_104e9a0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0104e9b0: 0x104e9b0: jal   0x104e62c sw    a3, 20(sp)
+// 0x0104e9c0: 0x104e9c0: jal   0x104e63c sw    a3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2397,68 +2397,68 @@ L_104e9a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_getFont_104e62c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_getFont_104e63c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104e9b8: 0x104e9b8: lui   v1, 0x70000
+// 0x0104e9c8: 0x104e9c8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104e9bc: 0x104e9bc: sw    v0, -4120(v1)
+// 0x0104e9cc: 0x104e9cc: sw    v0, -3656(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1030
+	ldc.i4 -914
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104e9c0: 0x104e9c0: addu  a0, v0, zero
+// 0x0104e9d0: 0x104e9d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104e9c4: 0x104e9c4: cibyl_sysc_arg 0x4
+// 0x0104e9d4: 0x104e9d4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104e9c8: 0x104e9c8: cibyl_sysc 0xda6
+// 0x0104e9d8: 0x104e9d8: cibyl_sysc 0xda6
 	call int32 [WazeWP7]Syscalls::NOPH_Font_getAscent(int32)
 	stloc 5
-// 0x0104e9cc: 0x104e9cc: addu  a0, v0, zero
+// 0x0104e9dc: 0x104e9dc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104e9d0: 0x104e9d0: lui   v0, 0x70000
+// 0x0104e9e0: 0x104e9e0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e9d4: 0x104e9d4: sw    a0, -4124(v0)
+// 0x0104e9e4: 0x104e9e4: sw    a0, -3660(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1031
+	ldc.i4 -915
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104e9d8: 0x104e9d8: lw    v1, -4120(v1)
+// 0x0104e9e8: 0x104e9e8: lw    v1, -3656(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1030
+	ldc.i4 -914
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104e9dc: 0x104e9dc: sll   zero, zero, 0
-// 0x0104e9e0: 0x104e9e0: cibyl_sysc_arg 0x3
+// 0x0104e9ec: 0x104e9ec: sll   zero, zero, 0
+// 0x0104e9f0: 0x104e9f0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104e9e4: 0x104e9e4: cibyl_sysc 0xdba
+// 0x0104e9f4: 0x104e9f4: cibyl_sysc 0xdba
 	call int32 [WazeWP7]Syscalls::NOPH_Font_getDescent(int32)
 	stloc 5
-// 0x0104e9e8: 0x104e9e8: addu  v1, v0, zero
+// 0x0104e9f8: 0x104e9f8: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0104e9ec: 0x104e9ec: lui   v0, 0x70000
+// 0x0104e9fc: 0x104e9fc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104e9f0: 0x104e9f0: lw    a3, 20(sp)
+// 0x0104ea00: 0x104ea00: lw    a3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2467,7 +2467,7 @@ L_104e9a0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104e9f4: 0x104e9f4: lw    a2, 16(sp)
+// 0x0104ea04: 0x104ea04: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2476,49 +2476,49 @@ L_104e9a0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104e9f8: 0x104e9f8: sw    v1, -4128(v0)
+// 0x0104ea08: 0x104ea08: sw    v1, -3664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1032
+	ldc.i4 -916
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104e9fc: 0x104e9fc: lui   v0, 0x70000
+// 0x0104ea0c: 0x104ea0c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_104ea00:
-// 0x0104ea00: 0x104ea00: lw    v0, -4124(v0)
+L_104ea10:
+// 0x0104ea10: 0x104ea10: lw    v0, -3660(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1031
+	ldc.i4 -915
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ea04: 0x104ea04: sll   zero, zero, 0
-// 0x0104ea08: 0x104ea08: sw    v0, 0(a3)
+// 0x0104ea14: 0x104ea14: sll   zero, zero, 0
+// 0x0104ea18: 0x104ea18: sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0104ea0c: 0x104ea0c: lui   v0, 0x70000
+// 0x0104ea1c: 0x104ea1c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104ea10: 0x104ea10: lw    v1, -4128(v0)
+// 0x0104ea20: 0x104ea20: lw    v1, -3664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1032
+	ldc.i4 -916
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104ea14: 0x104ea14: lw    v0, 56(sp)
+// 0x0104ea24: 0x104ea24: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2527,7 +2527,7 @@ L_104ea00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ea18: 0x104ea18: beq   s1, zero, 0x104ea28 sw    v1, 0(v0)
+// 0x0104ea28: 0x104ea28: beq   s1, zero, 0x104ea38 sw    v1, 0(v0)
 	ldloc 9
 	ldloc 6
 	ldloc 5
@@ -2535,56 +2535,56 @@ L_104ea00:
 	shr.un
 	ldloc 7
 	stelem.i4
-	brfalse L_104ea28
+	brfalse L_104ea38
 // --- basic block ---
-// 0x0104ea20: 0x104ea20: addiu v0, zero, 1
+// 0x0104ea30: 0x104ea30: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0104ea24: 0x104ea24: sw    v0, 0(s1)
+// 0x0104ea34: 0x104ea34: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_104ea28:
-// 0x0104ea28: 0x104ea28: lui   v0, 0x70000
+L_104ea38:
+// 0x0104ea38: 0x104ea38: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104ea2c: 0x104ea2c: lw    v1, -4120(v0)
+// 0x0104ea3c: 0x104ea3c: lw    v1, -3656(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1030
+	ldc.i4 -914
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104ea30: 0x104ea30: sll   zero, zero, 0
-// 0x0104ea34: 0x104ea34: cibyl_sysc_arg 0x3
+// 0x0104ea40: 0x104ea40: sll   zero, zero, 0
+// 0x0104ea44: 0x104ea44: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104ea38: 0x104ea38: cibyl_sysc_arg 0x10
+// 0x0104ea48: 0x104ea48: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0104ea3c: 0x104ea3c: cibyl_sysc 0xdcf
+// 0x0104ea4c: 0x104ea4c: cibyl_sysc 0xdcf
 	call int32 [WazeWP7]Syscalls::NOPH_Font_getAdvance(int32,int32)
 	stloc 5
-// 0x0104ea40: 0x104ea40: addu  s0, v0, zero
+// 0x0104ea50: 0x104ea50: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104ea44: 0x104ea44: lw    ra, 36(sp)
-// 0x0104ea48: 0x104ea48: addiu s0, s0, 3
+// 0x0104ea54: 0x104ea54: lw    ra, 36(sp)
+// 0x0104ea58: 0x104ea58: addiu s0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	add
 	stloc 8
-// 0x0104ea4c: 0x104ea4c: sw    s0, 0(a2)
+// 0x0104ea5c: 0x104ea5c: sw    s0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0104ea50: 0x104ea50: lw    s1, 32(sp)
+// 0x0104ea60: 0x104ea60: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2593,7 +2593,7 @@ L_104ea28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104ea54: 0x104ea54: lw    s0, 28(sp)
+// 0x0104ea64: 0x104ea64: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2602,7 +2602,7 @@ L_104ea28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ea58: 0x104ea58: jr    ra addiu sp, sp, 40
+// 0x0104ea68: 0x104ea68: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2614,7 +2614,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 t1,int32 lo,int32 s3,int32 s1,int32 s2,int32 ra,int32 t0)
@@ -2670,17 +2670,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ea60: 0x104ea60: addiu sp, sp, -72
+// 0x0104ea70: 0x104ea70: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0104ea64: 0x104ea64: addiu v0, sp, 32
+// 0x0104ea74: 0x104ea74: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-// 0x0104ea68: 0x104ea68: sw    s3, 64(sp)
+// 0x0104ea78: 0x104ea78: sw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2689,7 +2689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104ea6c: 0x104ea6c: sw    s2, 60(sp)
+// 0x0104ea7c: 0x104ea7c: sw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2698,7 +2698,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104ea70: 0x104ea70: sw    s1, 56(sp)
+// 0x0104ea80: 0x104ea80: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2707,7 +2707,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104ea74: 0x104ea74: sw    s0, 52(sp)
+// 0x0104ea84: 0x104ea84: sw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2716,35 +2716,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104ea78: 0x104ea78: addu  s3, a1, zero
+// 0x0104ea88: 0x104ea88: addu  s3, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0104ea7c: 0x104ea7c: addu  s2, a2, zero
+// 0x0104ea8c: 0x104ea8c: addu  s2, a2, zero
 	ldloc.3
 	stloc 13
-// 0x0104ea80: 0x104ea80: addu  a1, a2, zero
+// 0x0104ea90: 0x104ea90: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x0104ea84: 0x104ea84: addu  s1, a3, zero
+// 0x0104ea94: 0x104ea94: addu  s1, a3, zero
 	ldloc 4
 	stloc 12
-// 0x0104ea88: 0x104ea88: addu  s0, a0, zero
+// 0x0104ea98: 0x104ea98: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104ea8c: 0x104ea8c: addiu a2, sp, 24
+// 0x0104ea9c: 0x104ea9c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0104ea90: 0x104ea90: addu  a0, a3, zero
+// 0x0104eaa0: 0x104eaa0: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x0104ea94: 0x104ea94: addiu a3, sp, 28
+// 0x0104eaa4: 0x104eaa4: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0104ea98: 0x104ea98: sw    v0, 16(sp)
+// 0x0104eaa8: 0x104eaa8: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2753,8 +2753,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104ea9c: 0x104ea9c: sw    ra, 68(sp)
-// 0x0104eaa0: 0x104eaa0: jal   0x104e968 sw    zero, 20(sp)
+// 0x0104eaac: 0x104eaac: sw    ra, 68(sp)
+// 0x0104eab0: 0x104eab0: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2768,12 +2768,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104eaa8: 0x104eaa8: lw    v1, 28(sp)
+// 0x0104eab8: 0x104eab8: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2782,7 +2782,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104eaac: 0x104eaac: lw    a1, 32(sp)
+// 0x0104eabc: 0x104eabc: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2791,51 +2791,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104eab0: 0x104eab0: sltiu v0, s3, 13
+// 0x0104eac0: 0x104eac0: sltiu v0, s3, 13
 	ldloc 11
 	ldc.i4.s 13
 	clt.un
 	stloc 6
-// 0x0104eab4: 0x104eab4: beq   v0, zero, 0x104ebe0 addu  a0, a1, v1
+// 0x0104eac4: 0x104eac4: beq   v0, zero, 0x104ebf0 addu  a0, a1, v1
 	ldloc 6
 	ldloc.2
 	ldloc 7
 	add
 	stloc.1
-	brfalse L_104ebe0
+	brfalse L_104ebf0
 // --- basic block ---
-// 0x0104eabc: 0x104eabc: lui   v0, 0x20000
+// 0x0104eacc: 0x104eacc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0104eac0: 0x104eac0: addiu v0, v0, 27732
+// 0x0104ead0: 0x104ead0: addiu v0, v0, 28196
 	ldloc 6
-	ldc.i4 27732
+	ldc.i4 28196
 	add
 	stloc 6
-// 0x0104eac4: 0x104eac4: sll   s3, s3, 2
+// 0x0104ead4: 0x104ead4: sll   s3, s3, 2
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 11
-// 0x0104eac8: 0x104eac8: addu  s3, v0, s3
+// 0x0104ead8: 0x104ead8: addu  s3, v0, s3
 	ldloc 6
 	ldloc 11
 	add
 	stloc 11
-// 0x0104eacc: 0x104eacc: lw    v0, 0(s3)
+// 0x0104eadc: 0x104eadc: lw    v0, 0(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104ead0: 0x104ead0: sll   zero, zero, 0
-// 0x0104ead4: 0x104ead4: jr    v0 sll   zero, zero, 0
+// 0x0104eae0: 0x104eae0: sll   zero, zero, 0
+// 0x0104eae4: 0x104eae4: jr    v0 sll   zero, zero, 0
 	ldloc 6
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_104eadc:
-// 0x0104eadc: 0x104eadc: lw    t1, 4(s0)
+L_104eaec:
+// 0x0104eaec: 0x104eaec: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2844,29 +2844,29 @@ L_104eadc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eae0: 0x104eae0: lw    v0, 0(s0)
+// 0x0104eaf0: 0x104eaf0: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104eae4: 0x104eae4: j	 0x104ebc0 addu  v1, t1, a0
+// 0x0104eaf4: 0x104eaf4: j	 0x104ebd0 addu  v1, t1, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc 7
-	br L_104ebc0
+	br L_104ebd0
 // --- basic block ---
-L_104eaec:
-// 0x0104eaec: 0x104eaec: lw    v1, 0(s0)
+L_104eafc:
+// 0x0104eafc: 0x104eafc: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104eaf0: 0x104eaf0: lw    v0, 24(sp)
+// 0x0104eb00: 0x104eb00: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2875,7 +2875,7 @@ L_104eaec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104eaf4: 0x104eaf4: lw    t1, 4(s0)
+// 0x0104eb04: 0x104eb04: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2884,15 +2884,15 @@ L_104eaec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eaf8: 0x104eaf8: j	 0x104ebbc subu  v0, v1, v0
+// 0x0104eb08: 0x104eb08: j	 0x104ebcc subu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 6
-	br L_104ebbc
+	br L_104ebcc
 // --- basic block ---
-L_104eb00:
-// 0x0104eb00: 0x104eb00: lw    t1, 4(s0)
+L_104eb10:
+// 0x0104eb10: 0x104eb10: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2901,14 +2901,14 @@ L_104eb00:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eb04: 0x104eb04: lw    a2, 0(s0)
+// 0x0104eb14: 0x104eb14: lw    a2, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0104eb08: 0x104eb08: lw    v0, 24(sp)
+// 0x0104eb18: 0x104eb18: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2917,15 +2917,15 @@ L_104eb00:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104eb0c: 0x104eb0c: j	 0x104eb40 subu  t1, t1, a0
+// 0x0104eb1c: 0x104eb1c: j	 0x104eb50 subu  t1, t1, a0
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 9
-	br L_104eb40
+	br L_104eb50
 // --- basic block ---
-L_104eb14:
-// 0x0104eb14: 0x104eb14: lw    t1, 4(s0)
+L_104eb24:
+// 0x0104eb24: 0x104eb24: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2934,22 +2934,22 @@ L_104eb14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eb18: 0x104eb18: lw    v0, 0(s0)
+// 0x0104eb28: 0x104eb28: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104eb1c: 0x104eb1c: j	 0x104ebbc subu  t1, t1, a0
+// 0x0104eb2c: 0x104eb2c: j	 0x104ebcc subu  t1, t1, a0
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 9
-	br L_104ebbc
+	br L_104ebcc
 // --- basic block ---
-L_104eb24:
-// 0x0104eb24: 0x104eb24: lw    v1, 24(sp)
+L_104eb34:
+// 0x0104eb34: 0x104eb34: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2958,15 +2958,15 @@ L_104eb24:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104eb28: 0x104eb28: addiu v0, zero, 2
+// 0x0104eb38: 0x104eb38: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0104eb2c: 0x104eb2c: div   v1, v0
+// 0x0104eb3c: 0x104eb3c: div   v1, v0
 	ldloc 7
 	ldloc 6
 	div
 	stloc 10
-// 0x0104eb30: 0x104eb30: lw    t1, 4(s0)
+// 0x0104eb40: 0x104eb40: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2975,39 +2975,39 @@ L_104eb24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eb34: 0x104eb34: lw    a2, 0(s0)
+// 0x0104eb44: 0x104eb44: lw    a2, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0104eb38: 0x104eb38: subu  t1, t1, a0
+// 0x0104eb48: 0x104eb48: subu  t1, t1, a0
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 9
-// 0x0104eb3c: 0x104eb3c: mflo  lo
+// 0x0104eb4c: 0x104eb4c: mflo  lo
 	ldloc 10
 	stloc 6
-L_104eb40:
-// 0x0104eb40: 0x104eb40: j	 0x104ebbc subu  v0, a2, v0
+L_104eb50:
+// 0x0104eb50: 0x104eb50: j	 0x104ebcc subu  v0, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc 6
-	br L_104ebbc
+	br L_104ebcc
 // --- basic block ---
-L_104eb48:
-// 0x0104eb48: 0x104eb48: addiu a2, zero, 2
+L_104eb58:
+// 0x0104eb58: 0x104eb58: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0104eb4c: 0x104eb4c: div   v1, a2
+// 0x0104eb5c: 0x104eb5c: div   v1, a2
 	ldloc 7
 	ldloc.3
 	div
 	stloc 10
-// 0x0104eb50: 0x104eb50: lw    v1, 24(sp)
+// 0x0104eb60: 0x104eb60: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3016,7 +3016,7 @@ L_104eb48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104eb54: 0x104eb54: lw    t1, 4(s0)
+// 0x0104eb64: 0x104eb64: lw    t1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3025,62 +3025,62 @@ L_104eb48:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eb58: 0x104eb58: lw    t0, 0(s0)
+// 0x0104eb68: 0x104eb68: lw    t0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x0104eb5c: 0x104eb5c: mflo  lo
+// 0x0104eb6c: 0x104eb6c: mflo  lo
 	ldloc 10
 	stloc 4
-// 0x0104eb60: 0x104eb60: subu  a3, zero, a3
+// 0x0104eb70: 0x104eb70: subu  a3, zero, a3
 	ldloc 4
 	neg
 	stloc 4
-// 0x0104eb64: 0x104eb64: subu  a1, a3, a1
+// 0x0104eb74: 0x104eb74: subu  a1, a3, a1
 	ldloc 4
 	ldloc.2
 	sub
 	stloc.2
-// 0x0104eb68: 0x104eb68: div   v1, a2
+// 0x0104eb78: 0x104eb78: div   v1, a2
 	ldloc 7
 	ldloc.3
 	div
 	stloc 10
-// 0x0104eb6c: 0x104eb6c: addu  t1, a1, t1
+// 0x0104eb7c: 0x104eb7c: addu  t1, a1, t1
 	ldloc.2
 	ldloc 9
 	add
 	stloc 9
-// 0x0104eb70: 0x104eb70: mflo  lo
+// 0x0104eb80: 0x104eb80: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x0104eb74: 0x104eb74: j	 0x104ebbc subu  v0, t0, v0
+// 0x0104eb84: 0x104eb84: j	 0x104ebcc subu  v0, t0, v0
 	ldloc 15
 	ldloc 6
 	sub
 	stloc 6
-	br L_104ebbc
+	br L_104ebcc
 // --- basic block ---
-L_104eb7c:
-// 0x0104eb7c: 0x104eb7c: addiu v0, zero, 2
+L_104eb8c:
+// 0x0104eb8c: 0x104eb8c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0104eb80: 0x104eb80: div   v1, v0
+// 0x0104eb90: 0x104eb90: div   v1, v0
 	ldloc 7
 	ldloc 6
 	div
 	stloc 10
-// 0x0104eb84: 0x104eb84: lw    a3, 0(s0)
+// 0x0104eb94: 0x104eb94: lw    a3, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0104eb88: 0x104eb88: lw    v0, 24(sp)
+// 0x0104eb98: 0x104eb98: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3089,7 +3089,7 @@ L_104eb7c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104eb8c: 0x104eb8c: lw    a2, 4(s0)
+// 0x0104eb9c: 0x104eb9c: lw    a2, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3098,26 +3098,26 @@ L_104eb7c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104eb90: 0x104eb90: mflo  lo
+// 0x0104eba0: 0x104eba0: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x0104eb94: 0x104eb94: j	 0x104ebb0 subu  v0, a3, v0
+// 0x0104eba4: 0x104eba4: j	 0x104ebc0 subu  v0, a3, v0
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 6
-	br L_104ebb0
+	br L_104ebc0
 // --- basic block ---
-L_104eb9c:
-// 0x0104eb9c: 0x104eb9c: addiu v0, zero, 2
+L_104ebac:
+// 0x0104ebac: 0x104ebac: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0104eba0: 0x104eba0: div   v1, v0
+// 0x0104ebb0: 0x104ebb0: div   v1, v0
 	ldloc 7
 	ldloc 6
 	div
 	stloc 10
-// 0x0104eba4: 0x104eba4: lw    a2, 4(s0)
+// 0x0104ebb4: 0x104ebb4: lw    a2, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3126,53 +3126,53 @@ L_104eb9c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104eba8: 0x104eba8: lw    v0, 0(s0)
+// 0x0104ebb8: 0x104ebb8: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104ebac: 0x104ebac: mflo  lo
+// 0x0104ebbc: 0x104ebbc: mflo  lo
 	ldloc 10
 	stloc 7
-L_104ebb0:
-// 0x0104ebb0: 0x104ebb0: subu  v1, zero, v1
+L_104ebc0:
+// 0x0104ebc0: 0x104ebc0: subu  v1, zero, v1
 	ldloc 7
 	neg
 	stloc 7
-// 0x0104ebb4: 0x104ebb4: subu  v1, v1, a1
+// 0x0104ebc4: 0x104ebc4: subu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	sub
 	stloc 7
-// 0x0104ebb8: 0x104ebb8: addu  t1, v1, a2
+// 0x0104ebc8: 0x104ebc8: addu  t1, v1, a2
 	ldloc 7
 	ldloc.3
 	add
 	stloc 9
-L_104ebbc:
-// 0x0104ebbc: 0x104ebbc: addu  v1, t1, a0
+L_104ebcc:
+// 0x0104ebcc: 0x104ebcc: addu  v1, t1, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc 7
-L_104ebc0:
-// 0x0104ebc0: 0x104ebc0: addu  a1, s0, zero
+L_104ebd0:
+// 0x0104ebd0: 0x104ebd0: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0104ebc4: 0x104ebc4: addu  a3, s2, zero
+// 0x0104ebd4: 0x104ebd4: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0104ebc8: 0x104ebc8: addiu a0, sp, 36
+// 0x0104ebd8: 0x104ebd8: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x0104ebcc: 0x104ebcc: addu  a2, zero, zero
+// 0x0104ebdc: 0x104ebdc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104ebd0: 0x104ebd0: sw    v0, 36(sp)
+// 0x0104ebe0: 0x104ebe0: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3181,7 +3181,7 @@ L_104ebc0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104ebd4: 0x104ebd4: sw    v1, 40(sp)
+// 0x0104ebe4: 0x104ebe4: sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3190,7 +3190,7 @@ L_104ebc0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104ebd8: 0x104ebd8: jal   0x104e86c sw    s1, 16(sp)
+// 0x0104ebe8: 0x104ebe8: jal   0x104e87c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3204,14 +3204,14 @@ L_104ebc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_angle_104e86c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_angle_104e87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_104ebe0:
-// 0x0104ebe0: 0x104ebe0: lw    ra, 68(sp)
-// 0x0104ebe4: 0x104ebe4: lw    s3, 64(sp)
+L_104ebf0:
+// 0x0104ebf0: 0x104ebf0: lw    ra, 68(sp)
+// 0x0104ebf4: 0x104ebf4: lw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3220,7 +3220,7 @@ L_104ebe0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104ebe8: 0x104ebe8: lw    s2, 60(sp)
+// 0x0104ebf8: 0x104ebf8: lw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3229,7 +3229,7 @@ L_104ebe0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104ebec: 0x104ebec: lw    s1, 56(sp)
+// 0x0104ebfc: 0x104ebfc: lw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3238,7 +3238,7 @@ L_104ebe0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104ebf0: 0x104ebf0: lw    s0, 52(sp)
+// 0x0104ec00: 0x104ec00: lw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3247,7 +3247,7 @@ L_104ebe0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ebf4: 0x104ebf4: jr    ra addiu sp, sp, 72
+// 0x0104ec04: 0x104ec04: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3257,32 +3257,32 @@ L_104ebe0:
 __CIBYL_local_jumptab:
 	stloc 6
 	ldloc 6
-	ldc.i4 17099484
-	beq  L_104eadc
-	ldloc 6
 	ldc.i4 17099500
 	beq  L_104eaec
 	ldloc 6
-	ldc.i4 17099520
-	beq  L_104eb00
+	ldc.i4 17099516
+	beq  L_104eafc
 	ldloc 6
-	ldc.i4 17099540
-	beq  L_104eb14
+	ldc.i4 17099536
+	beq  L_104eb10
 	ldloc 6
 	ldc.i4 17099556
 	beq  L_104eb24
 	ldloc 6
-	ldc.i4 17099592
-	beq  L_104eb48
+	ldc.i4 17099572
+	beq  L_104eb34
 	ldloc 6
-	ldc.i4 17099644
-	beq  L_104eb7c
+	ldc.i4 17099608
+	beq  L_104eb58
 	ldloc 6
-	ldc.i4 17099676
-	beq  L_104eb9c
+	ldc.i4 17099660
+	beq  L_104eb8c
 	ldloc 6
-	ldc.i4 17099744
-	beq  L_104ebe0
+	ldc.i4 17099692
+	beq  L_104ebac
+	ldloc 6
+	ldc.i4 17099760
+	beq  L_104ebf0
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -3290,7 +3290,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_draw_string_104ebfc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_string_104ec0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3325,16 +3325,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ebfc: 0x104ebfc: addiu sp, sp, -24
+// 0x0104ec0c: 0x104ec0c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104ec00: 0x104ec00: addu  a3, a2, zero
+// 0x0104ec10: 0x104ec10: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x0104ec04: 0x104ec04: sw    ra, 20(sp)
-// 0x0104ec08: 0x104ec08: jal   0x104ea60 addiu a2, zero, -1
+// 0x0104ec14: 0x104ec14: sw    ra, 20(sp)
+// 0x0104ec18: 0x104ec18: jal   0x104ea70 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -3342,14 +3342,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104ec10: 0x104ec10: lw    ra, 20(sp)
-// 0x0104ec14: 0x104ec14: sll   zero, zero, 0
-// 0x0104ec18: 0x104ec18: jr    ra addiu sp, sp, 24
+// 0x0104ec20: 0x104ec20: lw    ra, 20(sp)
+// 0x0104ec24: 0x104ec24: sll   zero, zero, 0
+// 0x0104ec28: 0x104ec28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3361,7 +3361,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_canvas_draw_formated_string_size_104ec20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_formated_string_size_104ec30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3396,12 +3396,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ec20: 0x104ec20: addiu sp, sp, -24
+// 0x0104ec30: 0x104ec30: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104ec24: 0x104ec24: lw    a3, 40(sp)
+// 0x0104ec34: 0x104ec34: lw    a3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3410,21 +3410,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104ec28: 0x104ec28: sw    ra, 20(sp)
-// 0x0104ec2c: 0x104ec2c: jal   0x104ea60 sll   zero, zero, 0
+// 0x0104ec38: 0x104ec38: sw    ra, 20(sp)
+// 0x0104ec3c: 0x104ec3c: jal   0x104ea70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0104ec34: 0x104ec34: lw    ra, 20(sp)
-// 0x0104ec38: 0x104ec38: sll   zero, zero, 0
-// 0x0104ec3c: 0x104ec3c: jr    ra addiu sp, sp, 24
+// 0x0104ec44: 0x104ec44: lw    ra, 20(sp)
+// 0x0104ec48: 0x104ec48: sll   zero, zero, 0
+// 0x0104ec4c: 0x104ec4c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3436,7 +3436,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_canvas_get_formated_text_extents_104ec44(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_get_formated_text_extents_104ec54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -3471,12 +3471,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ec44: 0x104ec44: addiu sp, sp, -32
+// 0x0104ec54: 0x104ec54: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104ec48: 0x104ec48: lw    v0, 48(sp)
+// 0x0104ec58: 0x104ec58: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3485,8 +3485,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104ec4c: 0x104ec4c: sw    ra, 28(sp)
-// 0x0104ec50: 0x104ec50: sw    v0, 16(sp)
+// 0x0104ec5c: 0x104ec5c: sw    ra, 28(sp)
+// 0x0104ec60: 0x104ec60: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3495,7 +3495,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104ec54: 0x104ec54: lw    v0, 52(sp)
+// 0x0104ec64: 0x104ec64: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3504,7 +3504,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104ec58: 0x104ec58: jal   0x104e968 sw    v0, 20(sp)
+// 0x0104ec68: 0x104ec68: jal   0x104e978 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3518,14 +3518,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104ec60: 0x104ec60: lw    ra, 28(sp)
-// 0x0104ec64: 0x104ec64: sll   zero, zero, 0
-// 0x0104ec68: 0x104ec68: jr    ra addiu sp, sp, 32
+// 0x0104ec70: 0x104ec70: lw    ra, 28(sp)
+// 0x0104ec74: 0x104ec74: sll   zero, zero, 0
+// 0x0104ec78: 0x104ec78: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3537,7 +3537,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 ra,int32[] mem,int32 v0)
@@ -3572,25 +3572,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ec70: 0x104ec70: addiu sp, sp, -24
+// 0x0104ec80: 0x104ec80: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0104ec74: 0x104ec74: sw    ra, 20(sp)
-// 0x0104ec78: 0x104ec78: lw    v1, 0(a0)
+// 0x0104ec84: 0x104ec84: sw    ra, 20(sp)
+// 0x0104ec88: 0x104ec88: lw    v1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104ec7c: 0x104ec7c: sll   zero, zero, 0
-// 0x0104ec80: 0x104ec80: cibyl_sysc_arg 0x3
+// 0x0104ec8c: 0x104ec8c: sll   zero, zero, 0
+// 0x0104ec90: 0x104ec90: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104ec84: 0x104ec84: cibyl_sysc 0xde4
+// 0x0104ec94: 0x104ec94: cibyl_sysc 0xde4
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104ec88: 0x104ec88: jal   0x1000930 addu  v1, v0, zero
+// 0x0104ec98: 0x104ec98: jal   0x1000930 addu  v1, v0, zero
 	ldloc 8
 	stloc 5
 	ldloc.0
@@ -3603,9 +3603,9 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x0104ec90: 0x104ec90: lw    ra, 20(sp)
-// 0x0104ec94: 0x104ec94: sll   zero, zero, 0
-// 0x0104ec98: 0x104ec98: jr    ra addiu sp, sp, 24
+// 0x0104eca0: 0x104eca0: lw    ra, 20(sp)
+// 0x0104eca4: 0x104eca4: sll   zero, zero, 0
+// 0x0104eca8: 0x104eca8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3617,7 +3617,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_canvas_load_image_104eca0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_load_image_104ecb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -3658,13 +3658,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104eca0: 0x104eca0: addiu sp, sp, -40
+// 0x0104ecb0: 0x104ecb0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104eca4: 0x104eca4: sw    ra, 36(sp)
-// 0x0104eca8: 0x104eca8: sw    s1, 32(sp)
+// 0x0104ecb4: 0x104ecb4: sw    ra, 36(sp)
+// 0x0104ecb8: 0x104ecb8: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3673,7 +3673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104ecac: 0x104ecac: bne   a0, zero, 0x104ed00 sw    s0, 28(sp)
+// 0x0104ecbc: 0x104ecbc: bne   a0, zero, 0x104ed10 sw    s0, 28(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -3683,15 +3683,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_104ed00
+	brtrue L_104ed10
 // --- basic block ---
-// 0x0104ecb4: 0x104ecb4: j	 0x104ece8 addu  s0, zero, zero
+// 0x0104ecc4: 0x104ecc4: j	 0x104ecf8 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_104ece8
+	br L_104ecf8
 // --- basic block ---
-L_104ecbc:
-// 0x0104ecbc: 0x104ecbc: jal   0x1000910 sw    a1, 16(sp)
+L_104eccc:
+// 0x0104eccc: 0x104eccc: jal   0x1000910 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3710,7 +3710,7 @@ L_104ecbc:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0104ecc4: 0x104ecc4: lw    a1, 16(sp)
+// 0x0104ecd4: 0x104ecd4: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3719,14 +3719,14 @@ L_104ecbc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104ecc8: 0x104ecc8: sw    s1, 0(v0)
+// 0x0104ecd8: 0x104ecd8: sw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0104eccc: 0x104eccc: sw    zero, 4(v0)
+// 0x0104ecdc: 0x104ecdc: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3735,10 +3735,10 @@ L_104ecbc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104ecd0: 0x104ecd0: addu  a0, a1, zero
+// 0x0104ece0: 0x104ece0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104ecd4: 0x104ecd4: jal   0x1001ba8 addu  s0, v0, zero
+// 0x0104ece4: 0x104ece4: jal   0x1001ba8 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -3751,7 +3751,7 @@ L_104ecbc:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0104ecdc: 0x104ecdc: j	 0x104ece8 sw    v0, 8(s0)
+// 0x0104ecec: 0x104ecec: j	 0x104ecf8 sw    v0, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3760,18 +3760,18 @@ L_104ecbc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_104ece8
+	br L_104ecf8
 // --- basic block ---
-L_104ece4:
-// 0x0104ece4: 0x104ece4: addu  s0, zero, zero
+L_104ecf4:
+// 0x0104ecf4: 0x104ecf4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_104ece8:
-// 0x0104ece8: 0x104ece8: lw    ra, 36(sp)
-// 0x0104ecec: 0x104ecec: addu  v0, s0, zero
+L_104ecf8:
+// 0x0104ecf8: 0x104ecf8: lw    ra, 36(sp)
+// 0x0104ecfc: 0x104ecfc: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0104ecf0: 0x104ecf0: lw    s1, 32(sp)
+// 0x0104ed00: 0x104ed00: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3780,7 +3780,7 @@ L_104ece8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ecf4: 0x104ecf4: lw    s0, 28(sp)
+// 0x0104ed04: 0x104ed04: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3789,57 +3789,57 @@ L_104ece8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104ecf8: 0x104ecf8: jr    ra addiu sp, sp, 40
+// 0x0104ed08: 0x104ed08: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_104ed00:
-// 0x0104ed00: 0x104ed00: lb    v0, 0(a1)
+L_104ed10:
+// 0x0104ed10: 0x104ed10: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0104ed04: 0x104ed04: sll   zero, zero, 0
-// 0x0104ed08: 0x104ed08: xori  v0, v0, 47
+// 0x0104ed14: 0x104ed14: sll   zero, zero, 0
+// 0x0104ed18: 0x104ed18: xori  v0, v0, 47
 	ldloc 5
 	ldc.i4.s 47
 	xor
 	stloc 5
-// 0x0104ed0c: 0x104ed0c: sltiu v0, v0, 1
+// 0x0104ed1c: 0x104ed1c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0104ed10: 0x104ed10: addu  a1, a1, v0
+// 0x0104ed20: 0x104ed20: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x0104ed14: 0x104ed14: cibyl_sysc_arg 0x5
+// 0x0104ed24: 0x104ed24: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104ed18: 0x104ed18: cibyl_sysc 0xdf0
+// 0x0104ed28: 0x104ed28: cibyl_sysc 0xdf0
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getBitmapResource(int32)
 	stloc 5
-// 0x0104ed1c: 0x104ed1c: addu  s1, v0, zero
+// 0x0104ed2c: 0x104ed2c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104ed20: 0x104ed20: beq   s1, zero, 0x104ece4 addiu a0, zero, 20
+// 0x0104ed30: 0x104ed30: beq   s1, zero, 0x104ecf4 addiu a0, zero, 20
 	ldloc 8
 	ldc.i4.s 20
 	stloc.1
-	brfalse L_104ece4
+	brfalse L_104ecf4
 // --- basic block ---
-// 0x0104ed28: 0x104ed28: j	 0x104ecbc sll   zero, zero, 0
-	br L_104ecbc
+// 0x0104ed38: 0x104ed38: j	 0x104eccc sll   zero, zero, 0
+	br L_104eccc
 __CIBYL_function_return:
 	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_create_pen_new_104ed30(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_create_pen_new_104ed40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -3880,12 +3880,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ed30: 0x104ed30: addiu sp, sp, -32
+// 0x0104ed40: 0x104ed40: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104ed34: 0x104ed34: sw    s1, 24(sp)
+// 0x0104ed44: 0x104ed44: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3894,14 +3894,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104ed38: 0x104ed38: addu  s1, a0, zero
+// 0x0104ed48: 0x104ed48: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0104ed3c: 0x104ed3c: addiu a0, zero, 20
+// 0x0104ed4c: 0x104ed4c: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0104ed40: 0x104ed40: sw    ra, 28(sp)
-// 0x0104ed44: 0x104ed44: jal   0x1000910 sw    s0, 20(sp)
+// 0x0104ed50: 0x104ed50: sw    ra, 28(sp)
+// 0x0104ed54: 0x104ed54: jal   0x1000910 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3920,21 +3920,21 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104ed4c: 0x104ed4c: lui   a0, 0x10000
+// 0x0104ed5c: 0x104ed5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104ed50: 0x104ed50: addiu a1, zero, 352
+// 0x0104ed60: 0x104ed60: addiu a1, zero, 352
 	ldc.i4 352
 	stloc.2
-// 0x0104ed54: 0x104ed54: addu  a2, v0, zero
+// 0x0104ed64: 0x104ed64: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0104ed58: 0x104ed58: addiu a0, a0, 3776
+// 0x0104ed68: 0x104ed68: addiu a0, a0, 3772
 	ldloc.1
-	ldc.i4 3776
+	ldc.i4 3772
 	add
 	stloc.1
-// 0x0104ed5c: 0x104ed5c: jal   0x1004a38 addu  s0, v0, zero
+// 0x0104ed6c: 0x104ed6c: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -3942,12 +3942,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104ed64: 0x104ed64: jal   0x1001ba8 addu  a0, s1, zero
+// 0x0104ed74: 0x104ed74: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3960,19 +3960,19 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104ed6c: 0x104ed6c: lui   v1, 0x70000
+// 0x0104ed7c: 0x104ed7c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104ed70: 0x104ed70: lw    a1, -4136(v1)
+// 0x0104ed80: 0x104ed80: lw    a1, -3672(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1034
+	ldc.i4 -918
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104ed74: 0x104ed74: sw    v0, 4(s0)
+// 0x0104ed84: 0x104ed84: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3981,10 +3981,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ed78: 0x104ed78: addiu v0, zero, 255
+// 0x0104ed88: 0x104ed88: addiu v0, zero, 255
 	ldc.i4 255
 	stloc 5
-// 0x0104ed7c: 0x104ed7c: sw    v0, 12(s0)
+// 0x0104ed8c: 0x104ed8c: sw    v0, 12(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3993,13 +3993,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ed80: 0x104ed80: addu  a0, s0, zero
+// 0x0104ed90: 0x104ed90: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0104ed84: 0x104ed84: addiu v0, zero, 1
+// 0x0104ed94: 0x104ed94: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0104ed88: 0x104ed88: sw    v0, 16(s0)
+// 0x0104ed98: 0x104ed98: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4008,19 +4008,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ed8c: 0x104ed8c: sw    a1, 0(s0)
+// 0x0104ed9c: 0x104ed9c: sw    a1, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0104ed90: 0x104ed90: jal   0x104e35c sw    s0, -4136(v1)
+// 0x0104eda0: 0x104eda0: jal   0x104e36c sw    s0, -3672(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1034
+	ldc.i4 -918
 	add
 	ldloc 7
 	stelem.i4
@@ -4029,16 +4029,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104ed98: 0x104ed98: lw    ra, 28(sp)
-// 0x0104ed9c: 0x104ed9c: addu  v0, s0, zero
+// 0x0104eda8: 0x104eda8: lw    ra, 28(sp)
+// 0x0104edac: 0x104edac: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0104eda0: 0x104eda0: lw    s1, 24(sp)
+// 0x0104edb0: 0x104edb0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4047,7 +4047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eda4: 0x104eda4: lw    s0, 20(sp)
+// 0x0104edb4: 0x104edb4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4056,7 +4056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104eda8: 0x104eda8: jr    ra addiu sp, sp, 32
+// 0x0104edb8: 0x104edb8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4068,7 +4068,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s4,int32 s2,int32 s1,int32 s3,int32 s5,int32 ra)
@@ -4121,12 +4121,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104edb0: 0x104edb0: addiu sp, sp, -64
+// 0x0104edc0: 0x104edc0: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0104edb4: 0x104edb4: sw    s1, 40(sp)
+// 0x0104edc4: 0x104edc4: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4135,8 +4135,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104edb8: 0x104edb8: sw    ra, 60(sp)
-// 0x0104edbc: 0x104edbc: sw    s5, 56(sp)
+// 0x0104edc8: 0x104edc8: sw    ra, 60(sp)
+// 0x0104edcc: 0x104edcc: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4145,7 +4145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104edc0: 0x104edc0: sw    s4, 52(sp)
+// 0x0104edd0: 0x104edd0: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4154,7 +4154,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104edc4: 0x104edc4: sw    s3, 48(sp)
+// 0x0104edd4: 0x104edd4: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4163,7 +4163,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104edc8: 0x104edc8: sw    s2, 44(sp)
+// 0x0104edd8: 0x104edd8: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4172,7 +4172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104edcc: 0x104edcc: sw    s0, 36(sp)
+// 0x0104eddc: 0x104eddc: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4181,59 +4181,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104edd0: 0x104edd0: lui   v0, 0x70000
+// 0x0104ede0: 0x104ede0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104edd4: 0x104edd4: lb    v1, 0(a0)
+// 0x0104ede4: 0x104ede4: lb    v1, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0104edd8: 0x104edd8: lw    s1, -4172(v0)
+// 0x0104ede8: 0x104ede8: lw    s1, -3708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1043
+	ldc.i4 -927
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104eddc: 0x104eddc: addiu v0, zero, 35
+// 0x0104edec: 0x104edec: addiu v0, zero, 35
 	ldc.i4.s 35
 	stloc 5
-// 0x0104ede0: 0x104ede0: bne   v1, v0, 0x104eed4 addiu s2, a0, 1
+// 0x0104edf0: 0x104edf0: bne   v1, v0, 0x104eee4 addiu s2, a0, 1
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc 10
-	bne.un L_104eed4
+	bne.un L_104eee4
 // --- basic block ---
-// 0x0104ede8: 0x104ede8: addiu s5, a0, 7
+// 0x0104edf8: 0x104edf8: addiu s5, a0, 7
 	ldloc.1
 	ldc.i4.7
 	add
 	stloc 13
-// 0x0104edec: 0x104edec: addiu s3, sp, 16
+// 0x0104edfc: 0x104edfc: addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-// 0x0104edf0: 0x104edf0: j	 0x104ee1c addu  s0, s2, zero
+// 0x0104ee00: 0x104ee00: j	 0x104ee2c addu  s0, s2, zero
 	ldloc 10
 	stloc 8
-	br L_104ee1c
+	br L_104ee2c
 // --- basic block ---
-L_104edf8:
-// 0x0104edf8: 0x104edf8: j	 0x104ee0c addu  s4, v1, s4
+L_104ee08:
+// 0x0104ee08: 0x104ee08: j	 0x104ee1c addu  s4, v1, s4
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-	br L_104ee0c
+	br L_104ee1c
 // --- basic block ---
-L_104ee00:
-// 0x0104ee00: 0x104ee00: jal   0x1000364 addiu s4, s4, -87
+L_104ee10:
+// 0x0104ee10: 0x104ee10: jal   0x1000364 addiu s4, s4, -87
 	ldloc 9
 	ldc.i4.s -87
 	add
@@ -4244,173 +4244,173 @@ L_104ee00:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ee08: 0x104ee08: addu  s4, s4, v0
+// 0x0104ee18: 0x104ee18: addu  s4, s4, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-L_104ee0c:
-// 0x0104ee0c: 0x104ee0c: addiu s0, s0, 2
+L_104ee1c:
+// 0x0104ee1c: 0x104ee1c: addiu s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 8
-// 0x0104ee10: 0x104ee10: sw    s4, 0(s3)
+// 0x0104ee20: 0x104ee20: sw    s4, 0(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x0104ee14: 0x104ee14: beq   s0, s5, 0x104ee5c addiu s3, s3, 4
+// 0x0104ee24: 0x104ee24: beq   s0, s5, 0x104ee6c addiu s3, s3, 4
 	ldloc 8
 	ldloc 13
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-	beq  L_104ee5c
+	beq  L_104ee6c
 // --- basic block ---
-L_104ee1c:
-// 0x0104ee1c: 0x104ee1c: lb    s4, 0(s0)
+L_104ee2c:
+// 0x0104ee2c: 0x104ee2c: lb    s4, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x0104ee20: 0x104ee20: sll   zero, zero, 0
-// 0x0104ee24: 0x104ee24: slti  v0, s4, 58
+// 0x0104ee30: 0x104ee30: sll   zero, zero, 0
+// 0x0104ee34: 0x104ee34: slti  v0, s4, 58
 	ldloc 9
 	ldc.i4.s 58
 	clt
 	stloc 5
-// 0x0104ee28: 0x104ee28: addu  a0, s4, zero
+// 0x0104ee38: 0x104ee38: addu  a0, s4, zero
 	ldloc 9
 	stloc.1
-// 0x0104ee2c: 0x104ee2c: bne   v0, zero, 0x104ee40 addiu s4, s4, -48
+// 0x0104ee3c: 0x104ee3c: bne   v0, zero, 0x104ee50 addiu s4, s4, -48
 	ldloc 5
 	ldloc 9
 	ldc.i4.s -48
 	add
 	stloc 9
-	brtrue L_104ee40
+	brtrue L_104ee50
 // --- basic block ---
-// 0x0104ee34: 0x104ee34: jal   0x1000364 sll   zero, zero, 0
+// 0x0104ee44: 0x104ee44: jal   0x1000364 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl::tolower_1000364(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ee3c: 0x104ee3c: addiu s4, v0, -87
+// 0x0104ee4c: 0x104ee4c: addiu s4, v0, -87
 	ldloc 5
 	ldc.i4.s -87
 	add
 	stloc 9
-L_104ee40:
-// 0x0104ee40: 0x104ee40: lb    a0, 1(s0)
+L_104ee50:
+// 0x0104ee50: 0x104ee50: lb    a0, 1(s0)
 	ldloc 8
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0104ee44: 0x104ee44: sll   s4, s4, 4
+// 0x0104ee54: 0x104ee54: sll   s4, s4, 4
 	ldloc 9
 	ldc.i4.4
 	shl
 	stloc 9
-// 0x0104ee48: 0x104ee48: slti  v0, a0, 58
+// 0x0104ee58: 0x104ee58: slti  v0, a0, 58
 	ldloc.1
 	ldc.i4.s 58
 	clt
 	stloc 5
-// 0x0104ee4c: 0x104ee4c: bne   v0, zero, 0x104edf8 addiu v1, a0, -48
+// 0x0104ee5c: 0x104ee5c: bne   v0, zero, 0x104ee08 addiu v1, a0, -48
 	ldloc 5
 	ldloc.1
 	ldc.i4.s -48
 	add
 	stloc 7
-	brtrue L_104edf8
+	brtrue L_104ee08
 // --- basic block ---
-// 0x0104ee54: 0x104ee54: j	 0x104ee00 sll   zero, zero, 0
-	br L_104ee00
+// 0x0104ee64: 0x104ee64: j	 0x104ee10 sll   zero, zero, 0
+	br L_104ee10
 // --- basic block ---
-L_104ee5c:
-// 0x0104ee5c: 0x104ee5c: lb    a0, 6(s2)
+L_104ee6c:
+// 0x0104ee6c: 0x104ee6c: lb    a0, 6(s2)
 	ldloc 10
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0104ee60: 0x104ee60: addiu s0, zero, 255
+// 0x0104ee70: 0x104ee70: addiu s0, zero, 255
 	ldc.i4 255
 	stloc 8
-// 0x0104ee64: 0x104ee64: beq   a0, zero, 0x104eeb0 addiu s2, s2, 6
+// 0x0104ee74: 0x104ee74: beq   a0, zero, 0x104eec0 addiu s2, s2, 6
 	ldloc.1
 	ldloc 10
 	ldc.i4.6
 	add
 	stloc 10
-	brfalse L_104eeb0
+	brfalse L_104eec0
 // --- basic block ---
-// 0x0104ee6c: 0x104ee6c: slti  v1, a0, 58
+// 0x0104ee7c: 0x104ee7c: slti  v1, a0, 58
 	ldloc.1
 	ldc.i4.s 58
 	clt
 	stloc 7
-// 0x0104ee70: 0x104ee70: bne   v1, zero, 0x104ee84 addiu v0, a0, -48
+// 0x0104ee80: 0x104ee80: bne   v1, zero, 0x104ee94 addiu v0, a0, -48
 	ldloc 7
 	ldloc.1
 	ldc.i4.s -48
 	add
 	stloc 5
-	brtrue L_104ee84
+	brtrue L_104ee94
 // --- basic block ---
-// 0x0104ee78: 0x104ee78: jal   0x1000364 sll   zero, zero, 0
+// 0x0104ee88: 0x104ee88: jal   0x1000364 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl::tolower_1000364(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ee80: 0x104ee80: addiu v0, v0, -87
+// 0x0104ee90: 0x104ee90: addiu v0, v0, -87
 	ldloc 5
 	ldc.i4.s -87
 	add
 	stloc 5
-L_104ee84:
-// 0x0104ee84: 0x104ee84: lb    a0, 1(s2)
+L_104ee94:
+// 0x0104ee94: 0x104ee94: lb    a0, 1(s2)
 	ldloc 10
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0104ee88: 0x104ee88: sll   s0, v0, 4
+// 0x0104ee98: 0x104ee98: sll   s0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc 8
-// 0x0104ee8c: 0x104ee8c: slti  v0, a0, 58
+// 0x0104ee9c: 0x104ee9c: slti  v0, a0, 58
 	ldloc.1
 	ldc.i4.s 58
 	clt
 	stloc 5
-// 0x0104ee90: 0x104ee90: beq   v0, zero, 0x104eea4 sll   zero, zero, 0
+// 0x0104eea0: 0x104eea0: beq   v0, zero, 0x104eeb4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_104eea4
+	brfalse L_104eeb4
 // --- basic block ---
-// 0x0104ee98: 0x104ee98: addiu a0, a0, -48
+// 0x0104eea8: 0x104eea8: addiu a0, a0, -48
 	ldloc.1
 	ldc.i4.s -48
 	add
 	stloc.1
-// 0x0104ee9c: 0x104ee9c: j	 0x104eeb0 addu  s0, a0, s0
+// 0x0104eeac: 0x104eeac: j	 0x104eec0 addu  s0, a0, s0
 	ldloc.1
 	ldloc 8
 	add
 	stloc 8
-	br L_104eeb0
+	br L_104eec0
 // --- basic block ---
-L_104eea4:
-// 0x0104eea4: 0x104eea4: jal   0x1000364 addiu s0, s0, -87
+L_104eeb4:
+// 0x0104eeb4: 0x104eeb4: jal   0x1000364 addiu s0, s0, -87
 	ldloc 8
 	ldc.i4.s -87
 	add
@@ -4421,13 +4421,13 @@ L_104eea4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104eeac: 0x104eeac: addu  s0, s0, v0
+// 0x0104eebc: 0x104eebc: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_104eeb0:
-// 0x0104eeb0: 0x104eeb0: lw    v1, 16(sp)
+L_104eec0:
+// 0x0104eec0: 0x104eec0: lw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4436,7 +4436,7 @@ L_104eeb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104eeb4: 0x104eeb4: lw    v0, 20(sp)
+// 0x0104eec4: 0x104eec4: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4445,22 +4445,22 @@ L_104eeb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104eeb8: 0x104eeb8: sll   v1, v1, 16
+// 0x0104eec8: 0x104eec8: sll   v1, v1, 16
 	ldloc 7
 	ldc.i4.s 16
 	shl
 	stloc 7
-// 0x0104eebc: 0x104eebc: sll   v0, v0, 8
+// 0x0104eecc: 0x104eecc: sll   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	shl
 	stloc 5
-// 0x0104eec0: 0x104eec0: or    v0, v1, v0
+// 0x0104eed0: 0x104eed0: or    v0, v1, v0
 	ldloc 7
 	ldloc 5
 	or
 	stloc 5
-// 0x0104eec4: 0x104eec4: lw    v1, 24(sp)
+// 0x0104eed4: 0x104eed4: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4469,7 +4469,7 @@ L_104eeb0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104eec8: 0x104eec8: sw    s0, 12(s1)
+// 0x0104eed8: 0x104eed8: sw    s0, 12(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4478,12 +4478,12 @@ L_104eeb0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104eecc: 0x104eecc: or    v0, v0, v1
+// 0x0104eedc: 0x104eedc: or    v0, v0, v1
 	ldloc 5
 	ldloc 7
 	or
 	stloc 5
-// 0x0104eed0: 0x104eed0: sw    v0, 8(s1)
+// 0x0104eee0: 0x104eee0: sw    v0, 8(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4492,8 +4492,8 @@ L_104eeb0:
 	add
 	ldloc 5
 	stelem.i4
-L_104eed4:
-// 0x0104eed4: 0x104eed4: jal   0x104e35c addu  a0, s1, zero
+L_104eee4:
+// 0x0104eee4: 0x104eee4: jal   0x104e36c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4501,13 +4501,13 @@ L_104eed4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104eedc: 0x104eedc: lw    ra, 60(sp)
-// 0x0104eee0: 0x104eee0: lw    s5, 56(sp)
+// 0x0104eeec: 0x104eeec: lw    ra, 60(sp)
+// 0x0104eef0: 0x104eef0: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4516,7 +4516,7 @@ L_104eed4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104eee4: 0x104eee4: lw    s4, 52(sp)
+// 0x0104eef4: 0x104eef4: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4525,7 +4525,7 @@ L_104eed4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104eee8: 0x104eee8: lw    s3, 48(sp)
+// 0x0104eef8: 0x104eef8: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4534,7 +4534,7 @@ L_104eed4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104eeec: 0x104eeec: lw    s2, 44(sp)
+// 0x0104eefc: 0x104eefc: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4543,7 +4543,7 @@ L_104eed4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104eef0: 0x104eef0: lw    s1, 40(sp)
+// 0x0104ef00: 0x104ef00: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4552,7 +4552,7 @@ L_104eed4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104eef4: 0x104eef4: lw    s0, 36(sp)
+// 0x0104ef04: 0x104ef04: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4561,7 +4561,7 @@ L_104eed4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104eef8: 0x104eef8: jr    ra addiu sp, sp, 64
+// 0x0104ef08: 0x104ef08: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4573,7 +4573,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 v1,int32 ra)
@@ -4614,12 +4614,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ef00: 0x104ef00: addiu sp, sp, -32
+// 0x0104ef10: 0x104ef10: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104ef04: 0x104ef04: sw    s1, 24(sp)
+// 0x0104ef14: 0x104ef14: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4628,8 +4628,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104ef08: 0x104ef08: sw    ra, 28(sp)
-// 0x0104ef0c: 0x104ef0c: sw    s0, 20(sp)
+// 0x0104ef18: 0x104ef18: sw    ra, 28(sp)
+// 0x0104ef1c: 0x104ef1c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4638,31 +4638,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ef10: 0x104ef10: bne   a1, zero, 0x104ef4c addu  s1, a0, zero
+// 0x0104ef20: 0x104ef20: bne   a1, zero, 0x104ef5c addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 8
-	brtrue L_104ef4c
+	brtrue L_104ef5c
 // --- basic block ---
-// 0x0104ef18: 0x104ef18: lui   v0, 0x70000
+// 0x0104ef28: 0x104ef28: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104ef1c: 0x104ef1c: lw    s0, -4136(v0)
+// 0x0104ef2c: 0x104ef2c: lw    s0, -3672(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1034
+	ldc.i4 -918
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ef20: 0x104ef20: j	 0x104ef44 addu  a1, s1, zero
+// 0x0104ef30: 0x104ef30: j	 0x104ef54 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-	br L_104ef44
+	br L_104ef54
 // --- basic block ---
-L_104ef28:
-// 0x0104ef28: 0x104ef28: lw    a0, 4(s0)
+L_104ef38:
+// 0x0104ef38: 0x104ef38: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4671,33 +4671,33 @@ L_104ef28:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104ef2c: 0x104ef2c: jal   0x1001b14 sll   zero, zero, 0
+// 0x0104ef3c: 0x104ef3c: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0104ef34: 0x104ef34: beq   v0, zero, 0x104ef70 addu  a1, s1, zero
+// 0x0104ef44: 0x104ef44: beq   v0, zero, 0x104ef80 addu  a1, s1, zero
 	ldloc 7
 	ldloc 8
 	stloc.2
-	brfalse L_104ef70
+	brfalse L_104ef80
 // --- basic block ---
-// 0x0104ef3c: 0x104ef3c: lw    s0, 0(s0)
+// 0x0104ef4c: 0x104ef4c: lw    s0, 0(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104ef40: 0x104ef40: sll   zero, zero, 0
-L_104ef44:
-// 0x0104ef44: 0x104ef44: bne   s0, zero, 0x104ef28 sll   zero, zero, 0
+// 0x0104ef50: 0x104ef50: sll   zero, zero, 0
+L_104ef54:
+// 0x0104ef54: 0x104ef54: bne   s0, zero, 0x104ef38 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104ef28
+	brtrue L_104ef38
 // --- basic block ---
-L_104ef4c:
-// 0x0104ef4c: 0x104ef4c: jal   0x104ed30 addu  a0, s1, zero
+L_104ef5c:
+// 0x0104ef5c: 0x104ef5c: jal   0x104ed40 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4705,20 +4705,20 @@ L_104ef4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_new_104ed30(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_new_104ed40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0104ef54: 0x104ef54: addu  s0, v0, zero
+// 0x0104ef64: 0x104ef64: addu  s0, v0, zero
 	ldloc 7
 	stloc 5
-L_104ef58:
-// 0x0104ef58: 0x104ef58: lw    ra, 28(sp)
-// 0x0104ef5c: 0x104ef5c: addu  v0, s0, zero
+L_104ef68:
+// 0x0104ef68: 0x104ef68: lw    ra, 28(sp)
+// 0x0104ef6c: 0x104ef6c: addu  v0, s0, zero
 	ldloc 5
 	stloc 7
-// 0x0104ef60: 0x104ef60: lw    s1, 24(sp)
+// 0x0104ef70: 0x104ef70: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4727,7 +4727,7 @@ L_104ef58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ef64: 0x104ef64: lw    s0, 20(sp)
+// 0x0104ef74: 0x104ef74: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4736,15 +4736,15 @@ L_104ef58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104ef68: 0x104ef68: jr    ra addiu sp, sp, 32
+// 0x0104ef78: 0x104ef78: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_104ef70:
-// 0x0104ef70: 0x104ef70: jal   0x104e35c addu  a0, s0, zero
+L_104ef80:
+// 0x0104ef80: 0x104ef80: jal   0x104e36c addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4752,20 +4752,20 @@ L_104ef70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0104ef78: 0x104ef78: j	 0x104ef58 sll   zero, zero, 0
-	br L_104ef58
+// 0x0104ef88: 0x104ef88: j	 0x104ef68 sll   zero, zero, 0
+	br L_104ef68
 __CIBYL_function_return:
 	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_canvas_draw_multiple_polygons_104ef80(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_multiple_polygons_104ef90(int32,int32,int32,int32,int32)
 {
 .maxstack 9
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s3,int32 s1,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 s0,int32 ra)
@@ -4830,15 +4830,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104ef80: 0x104ef80: addiu sp, sp, -64
+// 0x0104ef90: 0x104ef90: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0104ef84: 0x104ef84: lui   v1, 0x70000
+// 0x0104ef94: 0x104ef94: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104ef88: 0x104ef88: lw    t0, 80(sp)
+// 0x0104ef98: 0x104ef98: lw    t0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4847,21 +4847,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104ef8c: 0x104ef8c: lw    v0, -4152(v1)
+// 0x0104ef9c: 0x104ef9c: lw    v0, -3688(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104ef90: 0x104ef90: sltiu t0, t0, 1
+// 0x0104efa0: 0x104efa0: sltiu t0, t0, 1
 	ldloc 8
 	ldc.i4.1
 	clt.un
 	stloc 8
-// 0x0104ef94: 0x104ef94: sw    s7, 52(sp)
+// 0x0104efa4: 0x104efa4: sw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4870,7 +4870,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0104ef98: 0x104ef98: sw    s2, 32(sp)
+// 0x0104efa8: 0x104efa8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4879,7 +4879,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104ef9c: 0x104ef9c: sw    s1, 28(sp)
+// 0x0104efac: 0x104efac: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4888,7 +4888,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104efa0: 0x104efa0: sw    s0, 24(sp)
+// 0x0104efb0: 0x104efb0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4897,8 +4897,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0104efa4: 0x104efa4: sw    ra, 60(sp)
-// 0x0104efa8: 0x104efa8: sw    s8, 56(sp)
+// 0x0104efb4: 0x104efb4: sw    ra, 60(sp)
+// 0x0104efb8: 0x104efb8: sw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4907,7 +4907,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104efac: 0x104efac: sw    s6, 48(sp)
+// 0x0104efbc: 0x104efbc: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4916,7 +4916,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104efb0: 0x104efb0: sw    s5, 44(sp)
+// 0x0104efc0: 0x104efc0: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4925,7 +4925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104efb4: 0x104efb4: sw    s4, 40(sp)
+// 0x0104efc4: 0x104efc4: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4934,7 +4934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104efb8: 0x104efb8: sw    s3, 36(sp)
+// 0x0104efc8: 0x104efc8: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4943,157 +4943,157 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104efbc: 0x104efbc: addu  s0, a0, zero
+// 0x0104efcc: 0x104efcc: addu  s0, a0, zero
 	ldloc.1
 	stloc 17
-// 0x0104efc0: 0x104efc0: addu  s1, a1, zero
+// 0x0104efd0: 0x104efd0: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0104efc4: 0x104efc4: addu  s2, a2, zero
+// 0x0104efd4: 0x104efd4: addu  s2, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0104efc8: 0x104efc8: beq   v0, t0, 0x104f014 addu  s7, a3, zero
+// 0x0104efd8: 0x104efd8: beq   v0, t0, 0x104f024 addu  s7, a3, zero
 	ldloc 6
 	ldloc 8
 	ldloc 4
 	stloc 15
-	beq  L_104f014
+	beq  L_104f024
 // --- basic block ---
-// 0x0104efd0: 0x104efd0: sw    t0, -4152(v1)
+// 0x0104efe0: 0x104efe0: sw    t0, -3688(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104efd4: 0x104efd4: lui   a0, 0x70000
+// 0x0104efe4: 0x104efe4: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104efd8: 0x104efd8: lw    a1, -4112(a0)
+// 0x0104efe8: 0x104efe8: lw    a1, -3648(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104efdc: 0x104efdc: addiu a2, zero, 1
+// 0x0104efec: 0x104efec: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0104efe0: 0x104efe0: cibyl_sysc_arg 0x5
+// 0x0104eff0: 0x104eff0: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104efe4: 0x104efe4: cibyl_sysc_arg 0x6
+// 0x0104eff4: 0x104eff4: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104efe8: 0x104efe8: cibyl_sysc_arg 0x8
+// 0x0104eff8: 0x104eff8: cibyl_sysc_arg 0x8
 	ldloc 8
-// 0x0104efec: 0x104efec: cibyl_sysc 0xe0e
+// 0x0104effc: 0x104effc: cibyl_sysc 0xe0e
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setDrawingStyle(int32,int32,int32)
-// 0x0104eff0: 0x104eff0: addu  t0, v0, zero
+// 0x0104f000: 0x104f000: addu  t0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104eff4: 0x104eff4: lw    a1, -4152(v1)
+// 0x0104f004: 0x104f004: lw    a1, -3688(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104eff8: 0x104eff8: lw    a0, -4112(a0)
+// 0x0104f008: 0x104f008: lw    a0, -3648(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104effc: 0x104effc: addiu v1, zero, 2
+// 0x0104f00c: 0x104f00c: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0104f000: 0x104f000: cibyl_sysc_arg 0x4
+// 0x0104f010: 0x104f010: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f004: 0x104f004: cibyl_sysc_arg 0x3
+// 0x0104f014: 0x104f014: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104f008: 0x104f008: cibyl_sysc_arg 0x5
+// 0x0104f018: 0x104f018: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104f00c: 0x104f00c: cibyl_sysc 0xe2c
+// 0x0104f01c: 0x104f01c: cibyl_sysc 0xe2c
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setDrawingStyle(int32,int32,int32)
-// 0x0104f010: 0x104f010: addu  a0, v0, zero
+// 0x0104f020: 0x104f020: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-L_104f014:
-// 0x0104f014: 0x104f014: addu  s6, zero, zero
+L_104f024:
+// 0x0104f024: 0x104f024: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x0104f018: 0x104f018: lui   v1, 0x70000
+// 0x0104f028: 0x104f028: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104f01c: 0x104f01c: lui   s5, 0x70000
+// 0x0104f02c: 0x104f02c: lui   s5, 0x70000
 	ldc.i4 458752
 	stloc 13
-// 0x0104f020: 0x104f020: lui   s4, 0x70000
+// 0x0104f030: 0x104f030: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 12
-// 0x0104f024: 0x104f024: j	 0x104f148 lui   s8, 0x70000
+// 0x0104f034: 0x104f034: j	 0x104f158 lui   s8, 0x70000
 	ldc.i4 458752
 	stloc 16
-	br L_104f148
+	br L_104f158
 // --- basic block ---
-L_104f02c:
-// 0x0104f02c: 0x104f02c: lw    s3, 0(s1)
+L_104f03c:
+// 0x0104f03c: 0x104f03c: lw    s3, 0(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0104f030: 0x104f030: lw    v0, -4148(v1)
+// 0x0104f040: 0x104f040: lw    v0, -3684(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1037
+	ldc.i4 -921
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f034: 0x104f034: sll   zero, zero, 0
-// 0x0104f038: 0x104f038: slt   v0, v0, s3
+// 0x0104f044: 0x104f044: sll   zero, zero, 0
+// 0x0104f048: 0x104f048: slt   v0, v0, s3
 	ldloc 6
 	ldloc 9
 	clt
 	stloc 6
-// 0x0104f03c: 0x104f03c: beq   v0, zero, 0x104f098 sll   zero, zero, 0
+// 0x0104f04c: 0x104f04c: beq   v0, zero, 0x104f0a8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_104f098
+	brfalse L_104f0a8
 // --- basic block ---
-// 0x0104f044: 0x104f044: lw    a0, -4140(s5)
+// 0x0104f054: 0x104f054: lw    a0, -3676(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1035
+	ldc.i4 -919
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f048: 0x104f048: sll   zero, zero, 0
-// 0x0104f04c: 0x104f04c: beq   a0, zero, 0x104f06c sw    s3, -4148(v1)
+// 0x0104f058: 0x104f058: sll   zero, zero, 0
+// 0x0104f05c: 0x104f05c: beq   a0, zero, 0x104f07c sw    s3, -3684(v1)
 	ldloc.1
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1037
+	ldc.i4 -921
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_104f06c
+	brfalse L_104f07c
 // --- basic block ---
-// 0x0104f054: 0x104f054: jal   0x1000930 sw    v1, 20(sp)
+// 0x0104f064: 0x104f064: jal   0x1000930 sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5112,16 +5112,16 @@ L_104f02c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104f05c: 0x104f05c: lw    a0, -4144(s4)
+// 0x0104f06c: 0x104f06c: lw    a0, -3680(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1036
+	ldc.i4 -920
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f060: 0x104f060: jal   0x1000930 sll   zero, zero, 0
+// 0x0104f070: 0x104f070: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5132,7 +5132,7 @@ L_104f02c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104f068: 0x104f068: lw    v1, 20(sp)
+// 0x0104f078: 0x104f078: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5141,16 +5141,16 @@ L_104f02c:
 	add
 	ldelem.i4
 	stloc 7
-L_104f06c:
-// 0x0104f06c: 0x104f06c: sll   a1, s3, 2
+L_104f07c:
+// 0x0104f07c: 0x104f07c: sll   a1, s3, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0104f070: 0x104f070: addu  a0, a1, zero
+// 0x0104f080: 0x104f080: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0104f074: 0x104f074: sw    v1, 20(sp)
+// 0x0104f084: 0x104f084: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5159,7 +5159,7 @@ L_104f06c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104f078: 0x104f078: jal   0x1000910 sw    a1, 16(sp)
+// 0x0104f088: 0x104f088: jal   0x1000910 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5178,7 +5178,7 @@ L_104f06c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104f080: 0x104f080: lw    a1, 16(sp)
+// 0x0104f090: 0x104f090: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5187,16 +5187,16 @@ L_104f06c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104f084: 0x104f084: sw    v0, -4140(s5)
+// 0x0104f094: 0x104f094: sw    v0, -3676(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1035
+	ldc.i4 -919
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f088: 0x104f088: jal   0x1000910 addu  a0, a1, zero
+// 0x0104f098: 0x104f098: jal   0x1000910 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -5209,7 +5209,7 @@ L_104f06c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104f090: 0x104f090: lw    v1, 20(sp)
+// 0x0104f0a0: 0x104f0a0: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5218,62 +5218,62 @@ L_104f06c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104f094: 0x104f094: sw    v0, -4144(s4)
+// 0x0104f0a4: 0x104f0a4: sw    v0, -3680(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1036
+	ldc.i4 -920
 	add
 	ldloc 6
 	stelem.i4
-L_104f098:
-// 0x0104f098: 0x104f098: lw    a0, -4140(s5)
+L_104f0a8:
+// 0x0104f0a8: 0x104f0a8: lw    a0, -3676(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1035
+	ldc.i4 -919
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f09c: 0x104f09c: lw    a1, -4144(s4)
+// 0x0104f0ac: 0x104f0ac: lw    a1, -3680(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1036
+	ldc.i4 -920
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104f0a0: 0x104f0a0: addu  a3, a0, zero
+// 0x0104f0b0: 0x104f0b0: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x0104f0a4: 0x104f0a4: addu  a2, a1, zero
+// 0x0104f0b4: 0x104f0b4: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0104f0a8: 0x104f0a8: j	 0x104f0d0 addu  v0, zero, zero
+// 0x0104f0b8: 0x104f0b8: j	 0x104f0e0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_104f0d0
+	br L_104f0e0
 // --- basic block ---
-L_104f0b0:
-// 0x0104f0b0: 0x104f0b0: lw    t0, 0(s2)
+L_104f0c0:
+// 0x0104f0c0: 0x104f0c0: lw    t0, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0104f0b4: 0x104f0b4: sll   zero, zero, 0
-// 0x0104f0b8: 0x104f0b8: sw    t0, 0(a3)
+// 0x0104f0c4: 0x104f0c4: sll   zero, zero, 0
+// 0x0104f0c8: 0x104f0c8: sw    t0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0104f0bc: 0x104f0bc: lw    t0, 4(s2)
+// 0x0104f0cc: 0x104f0cc: lw    t0, 4(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -5282,137 +5282,137 @@ L_104f0b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104f0c0: 0x104f0c0: addiu a3, a3, 4
+// 0x0104f0d0: 0x104f0d0: addiu a3, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0104f0c4: 0x104f0c4: sw    t0, 0(a2)
+// 0x0104f0d4: 0x104f0d4: sw    t0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0104f0c8: 0x104f0c8: addiu s2, s2, 8
+// 0x0104f0d8: 0x104f0d8: addiu s2, s2, 8
 	ldloc 11
 	ldc.i4.8
 	add
 	stloc 11
-// 0x0104f0cc: 0x104f0cc: addiu a2, a2, 4
+// 0x0104f0dc: 0x104f0dc: addiu a2, a2, 4
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-L_104f0d0:
-// 0x0104f0d0: 0x104f0d0: slt   t0, v0, s3
+L_104f0e0:
+// 0x0104f0e0: 0x104f0e0: slt   t0, v0, s3
 	ldloc 6
 	ldloc 9
 	clt
 	stloc 8
-// 0x0104f0d4: 0x104f0d4: bne   t0, zero, 0x104f0b0 addiu v0, v0, 1
+// 0x0104f0e4: 0x104f0e4: bne   t0, zero, 0x104f0c0 addiu v0, v0, 1
 	ldloc 8
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_104f0b0
+	brtrue L_104f0c0
 // --- basic block ---
-// 0x0104f0dc: 0x104f0dc: beq   s7, zero, 0x104f114 addiu t0, zero, 1
+// 0x0104f0ec: 0x104f0ec: beq   s7, zero, 0x104f124 addiu t0, zero, 1
 	ldloc 15
 	ldc.i4.1
 	stloc 8
-	brfalse L_104f114
+	brfalse L_104f124
 // --- basic block ---
-// 0x0104f0e4: 0x104f0e4: lw    a2, -4112(s8)
+// 0x0104f0f4: 0x104f0f4: lw    a2, -3648(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104f0e8: 0x104f0e8: addu  a3, zero, zero
+// 0x0104f0f8: 0x104f0f8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104f0ec: 0x104f0ec: cibyl_sysc_arg 0x6
+// 0x0104f0fc: 0x104f0fc: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104f0f0: 0x104f0f0: cibyl_sysc_arg 0x4
+// 0x0104f100: 0x104f100: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f0f4: 0x104f0f4: cibyl_sysc_arg 0x5
+// 0x0104f104: 0x104f104: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104f0f8: 0x104f0f8: cibyl_sysc_arg 0x7
+// 0x0104f108: 0x104f108: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f0fc: 0x104f0fc: cibyl_sysc_arg 0x7
+// 0x0104f10c: 0x104f10c: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f100: 0x104f100: cibyl_sysc_arg 0x13
+// 0x0104f110: 0x104f110: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x0104f104: 0x104f104: cibyl_sysc 0xe4a
+// 0x0104f114: 0x104f114: cibyl_sysc 0xe4a
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawShadedFilledPath(int32,int32,int32,int32,int32,int32)
-// 0x0104f108: 0x104f108: addu  s3, v0, zero
+// 0x0104f118: 0x104f118: addu  s3, v0, zero
 	ldloc 6
 	stloc 9
-// 0x0104f10c: 0x104f10c: j	 0x104f144 addiu s1, s1, 4
+// 0x0104f11c: 0x104f11c: j	 0x104f154 addiu s1, s1, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-	br L_104f144
+	br L_104f154
 // --- basic block ---
-L_104f114:
-// 0x0104f114: 0x104f114: lw    a2, -4112(s8)
+L_104f124:
+// 0x0104f124: 0x104f124: lw    a2, -3648(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104f118: 0x104f118: sll   zero, zero, 0
-// 0x0104f11c: 0x104f11c: cibyl_sysc_arg 0x6
+// 0x0104f128: 0x104f128: sll   zero, zero, 0
+// 0x0104f12c: 0x104f12c: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104f120: 0x104f120: cibyl_sysc_arg 0x4
+// 0x0104f130: 0x104f130: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f124: 0x104f124: cibyl_sysc_arg 0x5
+// 0x0104f134: 0x104f134: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104f128: 0x104f128: cibyl_sysc_arg 0x17
+// 0x0104f138: 0x104f138: cibyl_sysc_arg 0x17
 	ldloc 15
-// 0x0104f12c: 0x104f12c: cibyl_sysc_arg 0x17
+// 0x0104f13c: 0x104f13c: cibyl_sysc_arg 0x17
 	ldloc 15
-// 0x0104f130: 0x104f130: cibyl_sysc_arg 0x13
+// 0x0104f140: 0x104f140: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x0104f134: 0x104f134: cibyl_sysc_arg 0x8
+// 0x0104f144: 0x104f144: cibyl_sysc_arg 0x8
 	ldloc 8
-// 0x0104f138: 0x104f138: cibyl_sysc 0xe6d
+// 0x0104f148: 0x104f148: cibyl_sysc 0xe6d
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawPathOutline(int32,int32,int32,int32,int32,int32,int32)
-// 0x0104f13c: 0x104f13c: addu  s3, v0, zero
+// 0x0104f14c: 0x104f14c: addu  s3, v0, zero
 	ldloc 6
 	stloc 9
-// 0x0104f140: 0x104f140: addiu s1, s1, 4
+// 0x0104f150: 0x104f150: addiu s1, s1, 4
 	ldloc 10
 	ldc.i4.4
 	add
 	stloc 10
-L_104f144:
-// 0x0104f144: 0x104f144: addiu s6, s6, 1
+L_104f154:
+// 0x0104f154: 0x104f154: addiu s6, s6, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-L_104f148:
-// 0x0104f148: 0x104f148: slt   v0, s6, s0
+L_104f158:
+// 0x0104f158: 0x104f158: slt   v0, s6, s0
 	ldloc 14
 	ldloc 17
 	clt
 	stloc 6
-// 0x0104f14c: 0x104f14c: bne   v0, zero, 0x104f02c sll   zero, zero, 0
+// 0x0104f15c: 0x104f15c: bne   v0, zero, 0x104f03c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_104f02c
+	brtrue L_104f03c
 // --- basic block ---
-// 0x0104f154: 0x104f154: lw    ra, 60(sp)
-// 0x0104f158: 0x104f158: lw    s8, 56(sp)
+// 0x0104f164: 0x104f164: lw    ra, 60(sp)
+// 0x0104f168: 0x104f168: lw    s8, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5421,7 +5421,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104f15c: 0x104f15c: lw    s7, 52(sp)
+// 0x0104f16c: 0x104f16c: lw    s7, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5430,7 +5430,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0104f160: 0x104f160: lw    s6, 48(sp)
+// 0x0104f170: 0x104f170: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5439,7 +5439,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104f164: 0x104f164: lw    s5, 44(sp)
+// 0x0104f174: 0x104f174: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5448,7 +5448,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104f168: 0x104f168: lw    s4, 40(sp)
+// 0x0104f178: 0x104f178: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5457,7 +5457,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104f16c: 0x104f16c: lw    s3, 36(sp)
+// 0x0104f17c: 0x104f17c: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5466,7 +5466,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f170: 0x104f170: lw    s2, 32(sp)
+// 0x0104f180: 0x104f180: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5475,7 +5475,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104f174: 0x104f174: lw    s1, 28(sp)
+// 0x0104f184: 0x104f184: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5484,7 +5484,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104f178: 0x104f178: lw    s0, 24(sp)
+// 0x0104f188: 0x104f188: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5493,7 +5493,7 @@ L_104f148:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0104f17c: 0x104f17c: jr    ra addiu sp, sp, 64
+// 0x0104f18c: 0x104f18c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5505,7 +5505,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_draw_multiple_circles_104f184(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_multiple_circles_104f194(int32,int32,int32,int32,int32)
 {
 .maxstack 9
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 t0,int32[] mem,int32 v0,int32 t1,int32 t3,int32 t2,int32 t4,int32 t6,int32 t5,int32 ra)
@@ -5561,10 +5561,10 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f184: 0x104f184: lui   v1, 0x70000
+// 0x0104f194: 0x104f194: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104f188: 0x104f188: lw    t0, 16(sp)
+// 0x0104f198: 0x104f198: lw    t0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5573,123 +5573,123 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f18c: 0x104f18c: lw    v0, -4152(v1)
+// 0x0104f19c: 0x104f19c: lw    v0, -3688(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104f190: 0x104f190: sltiu t0, t0, 1
+// 0x0104f1a0: 0x104f1a0: sltiu t0, t0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x0104f194: 0x104f194: beq   v0, t0, 0x104f1e0 addiu t3, zero, 1
+// 0x0104f1a4: 0x104f1a4: beq   v0, t0, 0x104f1f0 addiu t3, zero, 1
 	ldloc 8
 	ldloc 6
 	ldc.i4.1
 	stloc 10
-	beq  L_104f1e0
+	beq  L_104f1f0
 // --- basic block ---
-// 0x0104f19c: 0x104f19c: sw    t0, -4152(v1)
+// 0x0104f1ac: 0x104f1ac: sw    t0, -3688(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f1a0: 0x104f1a0: lui   t1, 0x70000
+// 0x0104f1b0: 0x104f1b0: lui   t1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0104f1a4: 0x104f1a4: lw    t2, -4112(t1)
+// 0x0104f1b4: 0x104f1b4: lw    t2, -3648(t1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104f1a8: 0x104f1a8: sll   zero, zero, 0
-// 0x0104f1ac: 0x104f1ac: cibyl_sysc_arg 0xa
+// 0x0104f1b8: 0x104f1b8: sll   zero, zero, 0
+// 0x0104f1bc: 0x104f1bc: cibyl_sysc_arg 0xa
 	ldloc 11
-// 0x0104f1b0: 0x104f1b0: cibyl_sysc_arg 0xb
+// 0x0104f1c0: 0x104f1c0: cibyl_sysc_arg 0xb
 	ldloc 10
-// 0x0104f1b4: 0x104f1b4: cibyl_sysc_arg 0x8
+// 0x0104f1c4: 0x104f1c4: cibyl_sysc_arg 0x8
 	ldloc 6
-// 0x0104f1b8: 0x104f1b8: cibyl_sysc 0xe8b
+// 0x0104f1c8: 0x104f1c8: cibyl_sysc 0xe8b
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setDrawingStyle(int32,int32,int32)
-// 0x0104f1bc: 0x104f1bc: addu  t0, v0, zero
+// 0x0104f1cc: 0x104f1cc: addu  t0, v0, zero
 	ldloc 8
 	stloc 6
-// 0x0104f1c0: 0x104f1c0: lw    t0, -4112(t1)
+// 0x0104f1d0: 0x104f1d0: lw    t0, -3648(t1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f1c4: 0x104f1c4: lw    t1, -4152(v1)
+// 0x0104f1d4: 0x104f1d4: lw    t1, -3688(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f1c8: 0x104f1c8: addiu v1, zero, 2
+// 0x0104f1d8: 0x104f1d8: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0104f1cc: 0x104f1cc: cibyl_sysc_arg 0x8
+// 0x0104f1dc: 0x104f1dc: cibyl_sysc_arg 0x8
 	ldloc 6
-// 0x0104f1d0: 0x104f1d0: cibyl_sysc_arg 0x3
+// 0x0104f1e0: 0x104f1e0: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104f1d4: 0x104f1d4: cibyl_sysc_arg 0x9
+// 0x0104f1e4: 0x104f1e4: cibyl_sysc_arg 0x9
 	ldloc 9
-// 0x0104f1d8: 0x104f1d8: cibyl_sysc 0xea9
+// 0x0104f1e8: 0x104f1e8: cibyl_sysc 0xea9
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setDrawingStyle(int32,int32,int32)
-// 0x0104f1dc: 0x104f1dc: addu  t0, v0, zero
+// 0x0104f1ec: 0x104f1ec: addu  t0, v0, zero
 	ldloc 8
 	stloc 6
-L_104f1e0:
-// 0x0104f1e0: 0x104f1e0: addu  t0, zero, zero
+L_104f1f0:
+// 0x0104f1f0: 0x104f1f0: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0104f1e4: 0x104f1e4: lui   t2, 0x70000
+// 0x0104f1f4: 0x104f1f4: lui   t2, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x0104f1e8: 0x104f1e8: addiu t1, zero, 360
+// 0x0104f1f8: 0x104f1f8: addiu t1, zero, 360
 	ldc.i4 360
 	stloc 9
-// 0x0104f1ec: 0x104f1ec: j	 0x104f27c addu  t5, zero, zero
+// 0x0104f1fc: 0x104f1fc: j	 0x104f28c addu  t5, zero, zero
 	ldc.i4.s 0
 	stloc 14
-	br L_104f27c
+	br L_104f28c
 // --- basic block ---
-L_104f1f4:
-// 0x0104f1f4: 0x104f1f4: lw    v1, 0(a2)
+L_104f204:
+// 0x0104f204: 0x104f204: lw    v1, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104f1f8: 0x104f1f8: lw    t3, 0(a1)
+// 0x0104f208: 0x104f208: lw    t3, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0104f1fc: 0x104f1fc: lw    t4, 4(a1)
+// 0x0104f20c: 0x104f20c: lw    t4, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -5698,117 +5698,117 @@ L_104f1f4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104f200: 0x104f200: subu  t3, t3, v1
+// 0x0104f210: 0x104f210: subu  t3, t3, v1
 	ldloc 10
 	ldloc 5
 	sub
 	stloc 10
-// 0x0104f204: 0x104f204: subu  t4, t4, v1
+// 0x0104f214: 0x104f214: subu  t4, t4, v1
 	ldloc 12
 	ldloc 5
 	sub
 	stloc 12
-// 0x0104f208: 0x104f208: beq   a3, zero, 0x104f244 sll   v1, v1, 1
+// 0x0104f218: 0x104f218: beq   a3, zero, 0x104f254 sll   v1, v1, 1
 	ldloc 4
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-	brfalse L_104f244
+	brfalse L_104f254
 // --- basic block ---
-// 0x0104f210: 0x104f210: lw    t6, -4112(t2)
+// 0x0104f220: 0x104f220: lw    t6, -3648(t2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104f214: 0x104f214: sll   zero, zero, 0
-// 0x0104f218: 0x104f218: cibyl_sysc_arg 0xe
+// 0x0104f224: 0x104f224: sll   zero, zero, 0
+// 0x0104f228: 0x104f228: cibyl_sysc_arg 0xe
 	ldloc 13
-// 0x0104f21c: 0x104f21c: cibyl_sysc_arg 0xb
+// 0x0104f22c: 0x104f22c: cibyl_sysc_arg 0xb
 	ldloc 10
-// 0x0104f220: 0x104f220: cibyl_sysc_arg 0xc
+// 0x0104f230: 0x104f230: cibyl_sysc_arg 0xc
 	ldloc 12
-// 0x0104f224: 0x104f224: cibyl_sysc_arg 0x3
+// 0x0104f234: 0x104f234: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104f228: 0x104f228: cibyl_sysc_arg 0x3
+// 0x0104f238: 0x104f238: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104f22c: 0x104f22c: cibyl_sysc_arg 0xd
+// 0x0104f23c: 0x104f23c: cibyl_sysc_arg 0xd
 	ldloc 14
-// 0x0104f230: 0x104f230: cibyl_sysc_arg 0x9
+// 0x0104f240: 0x104f240: cibyl_sysc_arg 0x9
 	ldloc 9
-// 0x0104f234: 0x104f234: cibyl_sysc 0xec7
+// 0x0104f244: 0x104f244: cibyl_sysc 0xec7
 	call void [WazeWP7]Syscalls::NOPH_Graphics_fillArc(int32,int32,int32,int32,int32,int32,int32)
-// 0x0104f238: 0x104f238: addu  v1, v0, zero
+// 0x0104f248: 0x104f248: addu  v1, v0, zero
 	ldloc 8
 	stloc 5
-// 0x0104f23c: 0x104f23c: j	 0x104f274 addiu t0, t0, 1
+// 0x0104f24c: 0x104f24c: j	 0x104f284 addiu t0, t0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	br L_104f274
+	br L_104f284
 // --- basic block ---
-L_104f244:
-// 0x0104f244: 0x104f244: lw    t6, -4112(t2)
+L_104f254:
+// 0x0104f254: 0x104f254: lw    t6, -3648(t2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104f248: 0x104f248: sll   zero, zero, 0
-// 0x0104f24c: 0x104f24c: cibyl_sysc_arg 0xe
+// 0x0104f258: 0x104f258: sll   zero, zero, 0
+// 0x0104f25c: 0x104f25c: cibyl_sysc_arg 0xe
 	ldloc 13
-// 0x0104f250: 0x104f250: cibyl_sysc_arg 0xb
+// 0x0104f260: 0x104f260: cibyl_sysc_arg 0xb
 	ldloc 10
-// 0x0104f254: 0x104f254: cibyl_sysc_arg 0xc
+// 0x0104f264: 0x104f264: cibyl_sysc_arg 0xc
 	ldloc 12
-// 0x0104f258: 0x104f258: cibyl_sysc_arg 0x3
+// 0x0104f268: 0x104f268: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104f25c: 0x104f25c: cibyl_sysc_arg 0x3
+// 0x0104f26c: 0x104f26c: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104f260: 0x104f260: cibyl_sysc_arg 0x7
+// 0x0104f270: 0x104f270: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f264: 0x104f264: cibyl_sysc_arg 0x9
+// 0x0104f274: 0x104f274: cibyl_sysc_arg 0x9
 	ldloc 9
-// 0x0104f268: 0x104f268: cibyl_sysc 0xedd
+// 0x0104f278: 0x104f278: cibyl_sysc 0xedd
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawArc(int32,int32,int32,int32,int32,int32,int32)
-// 0x0104f26c: 0x104f26c: addu  v1, v0, zero
+// 0x0104f27c: 0x104f27c: addu  v1, v0, zero
 	ldloc 8
 	stloc 5
-// 0x0104f270: 0x104f270: addiu t0, t0, 1
+// 0x0104f280: 0x104f280: addiu t0, t0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_104f274:
-// 0x0104f274: 0x104f274: addiu a2, a2, 4
+L_104f284:
+// 0x0104f284: 0x104f284: addiu a2, a2, 4
 	ldloc.3
 	ldc.i4.4
 	add
 	stloc.3
-// 0x0104f278: 0x104f278: addiu a1, a1, 8
+// 0x0104f288: 0x104f288: addiu a1, a1, 8
 	ldloc.2
 	ldc.i4.8
 	add
 	stloc.2
-L_104f27c:
-// 0x0104f27c: 0x104f27c: slt   v0, t0, a0
+L_104f28c:
+// 0x0104f28c: 0x104f28c: slt   v0, t0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 8
-// 0x0104f280: 0x104f280: bne   v0, zero, 0x104f1f4 sll   zero, zero, 0
+// 0x0104f290: 0x104f290: bne   v0, zero, 0x104f204 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_104f1f4
+	brtrue L_104f204
 // --- basic block ---
-// 0x0104f288: 0x104f288: jr    ra sll   zero, zero, 0
+// 0x0104f298: 0x104f298: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -5816,7 +5816,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_canvas_draw_multiple_lines_104f290(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_multiple_lines_104f2a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1,int32 t0,int32 t1,int32 t6,int32 s1,int32 t3,int32 s2,int32 t2,int32 s0,int32 s3,int32 s4,int32 s5,int32 t4,int32 t5,int32 t7,int32 t8,int32 t9)
@@ -5899,27 +5899,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f290: 0x104f290: lui   v0, 0x70000
+// 0x0104f2a0: 0x104f2a0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104f294: 0x104f294: lw    v0, -4172(v0)
+// 0x0104f2a4: 0x104f2a4: lw    v0, -3708(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1043
+	ldc.i4 -927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f298: 0x104f298: addiu sp, sp, -88
+// 0x0104f2a8: 0x104f2a8: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x0104f29c: 0x104f29c: lui   v1, 0x70000
+// 0x0104f2ac: 0x104f2ac: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104f2a0: 0x104f2a0: sw    s1, 64(sp)
+// 0x0104f2b0: 0x104f2b0: sw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5928,7 +5928,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104f2a4: 0x104f2a4: lw    s1, 16(v0)
+// 0x0104f2b4: 0x104f2b4: lw    s1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5937,21 +5937,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104f2a8: 0x104f2a8: lw    v0, -4152(v1)
+// 0x0104f2b8: 0x104f2b8: lw    v0, -3688(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f2ac: 0x104f2ac: sltiu a3, a3, 1
+// 0x0104f2bc: 0x104f2bc: sltiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	clt.un
 	stloc 4
-// 0x0104f2b0: 0x104f2b0: sw    s0, 60(sp)
+// 0x0104f2c0: 0x104f2c0: sw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5960,8 +5960,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104f2b4: 0x104f2b4: sw    ra, 84(sp)
-// 0x0104f2b8: 0x104f2b8: sw    s5, 80(sp)
+// 0x0104f2c4: 0x104f2c4: sw    ra, 84(sp)
+// 0x0104f2c8: 0x104f2c8: sw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5970,7 +5970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0104f2bc: 0x104f2bc: sw    s4, 76(sp)
+// 0x0104f2cc: 0x104f2cc: sw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5979,7 +5979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0104f2c0: 0x104f2c0: sw    s3, 72(sp)
+// 0x0104f2d0: 0x104f2d0: sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5988,7 +5988,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0104f2c4: 0x104f2c4: sw    s2, 68(sp)
+// 0x0104f2d4: 0x104f2d4: sw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5997,90 +5997,90 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104f2c8: 0x104f2c8: addu  s0, a0, zero
+// 0x0104f2d8: 0x104f2d8: addu  s0, a0, zero
 	ldloc.1
 	stloc 16
-// 0x0104f2cc: 0x104f2cc: beq   v0, a3, 0x104f318 sra   s1, s1, 1
+// 0x0104f2dc: 0x104f2dc: beq   v0, a3, 0x104f328 sra   s1, s1, 1
 	ldloc 6
 	ldloc 4
 	ldloc 12
 	ldc.i4.1
 	shr
 	stloc 12
-	beq  L_104f318
+	beq  L_104f328
 // --- basic block ---
-// 0x0104f2d4: 0x104f2d4: sw    a3, -4152(v1)
+// 0x0104f2e4: 0x104f2e4: sw    a3, -3688(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldloc 4
 	stelem.i4
-// 0x0104f2d8: 0x104f2d8: lui   a0, 0x70000
+// 0x0104f2e8: 0x104f2e8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104f2dc: 0x104f2dc: lw    t0, -4112(a0)
+// 0x0104f2ec: 0x104f2ec: lw    t0, -3648(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f2e0: 0x104f2e0: addiu t1, zero, 1
+// 0x0104f2f0: 0x104f2f0: addiu t1, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x0104f2e4: 0x104f2e4: cibyl_sysc_arg 0x8
+// 0x0104f2f4: 0x104f2f4: cibyl_sysc_arg 0x8
 	ldloc 9
-// 0x0104f2e8: 0x104f2e8: cibyl_sysc_arg 0x9
+// 0x0104f2f8: 0x104f2f8: cibyl_sysc_arg 0x9
 	ldloc 10
-// 0x0104f2ec: 0x104f2ec: cibyl_sysc_arg 0x7
+// 0x0104f2fc: 0x104f2fc: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f2f0: 0x104f2f0: cibyl_sysc 0xef3
+// 0x0104f300: 0x104f300: cibyl_sysc 0xef3
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setDrawingStyle(int32,int32,int32)
-// 0x0104f2f4: 0x104f2f4: addu  a3, v0, zero
+// 0x0104f304: 0x104f304: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0104f2f8: 0x104f2f8: lw    a3, -4152(v1)
+// 0x0104f308: 0x104f308: lw    a3, -3688(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1038
+	ldc.i4 -922
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104f2fc: 0x104f2fc: lw    a0, -4112(a0)
+// 0x0104f30c: 0x104f30c: lw    a0, -3648(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f300: 0x104f300: addiu v1, zero, 2
+// 0x0104f310: 0x104f310: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 8
-// 0x0104f304: 0x104f304: cibyl_sysc_arg 0x4
+// 0x0104f314: 0x104f314: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f308: 0x104f308: cibyl_sysc_arg 0x3
+// 0x0104f318: 0x104f318: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0104f30c: 0x104f30c: cibyl_sysc_arg 0x7
+// 0x0104f31c: 0x104f31c: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f310: 0x104f310: cibyl_sysc 0xf11
+// 0x0104f320: 0x104f320: cibyl_sysc 0xf11
 	call void [WazeWP7]Syscalls::NOPH_Graphics_setDrawingStyle(int32,int32,int32)
-// 0x0104f314: 0x104f314: addu  a0, v0, zero
+// 0x0104f324: 0x104f324: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-L_104f318:
-// 0x0104f318: 0x104f318: addiu a0, zero, 4
+L_104f328:
+// 0x0104f328: 0x104f328: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104f31c: 0x104f31c: sw    a1, 48(sp)
+// 0x0104f32c: 0x104f32c: sw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6089,7 +6089,7 @@ L_104f318:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104f320: 0x104f320: jal   0x101f9b8 sw    a2, 52(sp)
+// 0x0104f330: 0x104f330: jal   0x101f9c8 sw    a2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6098,26 +6098,26 @@ L_104f318:
 	add
 	ldloc.3
 	stelem.i4
-	call void Cibyl23::dbg_time_start_101f9b8()
+	call void Cibyl23::dbg_time_start_101f9c8()
 // --- basic block ---
-// 0x0104f328: 0x104f328: addu  t2, zero, zero
+// 0x0104f338: 0x104f338: addu  t2, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x0104f32c: 0x104f32c: addu  t5, zero, zero
+// 0x0104f33c: 0x104f33c: addu  t5, zero, zero
 	ldc.i4.s 0
 	stloc 21
-// 0x0104f330: 0x104f330: lui   t4, 0x70000
+// 0x0104f340: 0x104f340: lui   t4, 0x70000
 	ldc.i4 458752
 	stloc 20
-// 0x0104f334: 0x104f334: addiu t9, sp, 32
+// 0x0104f344: 0x104f344: addiu t9, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 24
-// 0x0104f338: 0x104f338: addiu t8, zero, 4
+// 0x0104f348: 0x104f348: addiu t8, zero, 4
 	ldc.i4.4
 	stloc 23
-// 0x0104f33c: 0x104f33c: lw    a1, 48(sp)
+// 0x0104f34c: 0x104f34c: lw    a1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6126,7 +6126,7 @@ L_104f318:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104f340: 0x104f340: lw    a2, 52(sp)
+// 0x0104f350: 0x104f350: lw    a2, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6135,45 +6135,45 @@ L_104f318:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104f344: 0x104f344: j	 0x104f470 addiu t7, sp, 16
+// 0x0104f354: 0x104f354: j	 0x104f480 addiu t7, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 22
-	br L_104f470
+	br L_104f480
 // --- basic block ---
-L_104f34c:
-// 0x0104f34c: 0x104f34c: lw    t6, 0(a1)
+L_104f35c:
+// 0x0104f35c: 0x104f35c: lw    t6, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0104f350: 0x104f350: sll   zero, zero, 0
-// 0x0104f354: 0x104f354: slti  v0, t6, 2
+// 0x0104f360: 0x104f360: sll   zero, zero, 0
+// 0x0104f364: 0x104f364: slti  v0, t6, 2
 	ldloc 11
 	ldc.i4.2
 	clt
 	stloc 6
-// 0x0104f358: 0x104f358: bne   v0, zero, 0x104f46c addiu t6, t6, -1
+// 0x0104f368: 0x104f368: bne   v0, zero, 0x104f47c addiu t6, t6, -1
 	ldloc 6
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-	brtrue L_104f46c
+	brtrue L_104f47c
 // --- basic block ---
-// 0x0104f360: 0x104f360: addu  v0, a2, zero
+// 0x0104f370: 0x104f370: addu  v0, a2, zero
 	ldloc.3
 	stloc 6
-// 0x0104f364: 0x104f364: j	 0x104f450 addu  t3, zero, zero
+// 0x0104f374: 0x104f374: j	 0x104f460 addu  t3, zero, zero
 	ldc.i4.s 0
 	stloc 13
-	br L_104f450
+	br L_104f460
 // --- basic block ---
-L_104f36c:
-// 0x0104f36c: 0x104f36c: lw    t0, 8(v0)
+L_104f37c:
+// 0x0104f37c: 0x104f37c: lw    t0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6182,7 +6182,7 @@ L_104f36c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f370: 0x104f370: lw    t1, -8(v1)
+// 0x0104f380: 0x104f380: lw    t1, -8(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6191,7 +6191,7 @@ L_104f36c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104f374: 0x104f374: lw    a3, -4(v1)
+// 0x0104f384: 0x104f384: lw    a3, -4(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6200,27 +6200,27 @@ L_104f36c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104f378: 0x104f378: subu  v0, t0, t1
+// 0x0104f388: 0x104f388: subu  v0, t0, t1
 	ldloc 9
 	ldloc 10
 	sub
 	stloc 6
-// 0x0104f37c: 0x104f37c: sra   a0, v0, 31
+// 0x0104f38c: 0x104f38c: sra   a0, v0, 31
 	ldloc 6
 	ldc.i4.s 31
 	shr
 	stloc.1
-// 0x0104f380: 0x104f380: xor   v0, a0, v0
+// 0x0104f390: 0x104f390: xor   v0, a0, v0
 	ldloc.1
 	ldloc 6
 	xor
 	stloc 6
-// 0x0104f384: 0x104f384: subu  s2, v0, a0
+// 0x0104f394: 0x104f394: subu  s2, v0, a0
 	ldloc 6
 	ldloc.1
 	sub
 	stloc 14
-// 0x0104f388: 0x104f388: lw    a0, 4(v1)
+// 0x0104f398: 0x104f398: lw    a0, 4(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6229,113 +6229,113 @@ L_104f36c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f38c: 0x104f38c: bne   s1, zero, 0x104f3c0 subu  ra, a0, a3
+// 0x0104f39c: 0x104f39c: bne   s1, zero, 0x104f3d0 subu  ra, a0, a3
 	ldloc 12
 	ldloc.1
 	ldloc 4
 	sub
 	stloc 7
-	brtrue L_104f3c0
+	brtrue L_104f3d0
 // --- basic block ---
-// 0x0104f394: 0x104f394: lw    ra, -4112(t4)
-// 0x0104f398: 0x104f398: sll   zero, zero, 0
-// 0x0104f39c: 0x104f39c: cibyl_sysc_arg 0x1f
+// 0x0104f3a4: 0x104f3a4: lw    ra, -3648(t4)
+// 0x0104f3a8: 0x104f3a8: sll   zero, zero, 0
+// 0x0104f3ac: 0x104f3ac: cibyl_sysc_arg 0x1f
 	ldloc 7
-// 0x0104f3a0: 0x104f3a0: cibyl_sysc_arg 0x9
+// 0x0104f3b0: 0x104f3b0: cibyl_sysc_arg 0x9
 	ldloc 10
-// 0x0104f3a4: 0x104f3a4: cibyl_sysc_arg 0x7
+// 0x0104f3b4: 0x104f3b4: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f3a8: 0x104f3a8: cibyl_sysc_arg 0x8
+// 0x0104f3b8: 0x104f3b8: cibyl_sysc_arg 0x8
 	ldloc 9
-// 0x0104f3ac: 0x104f3ac: cibyl_sysc_arg 0x4
+// 0x0104f3bc: 0x104f3bc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f3b0: 0x104f3b0: cibyl_sysc 0xf2f
+// 0x0104f3c0: 0x104f3c0: cibyl_sysc 0xf2f
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawLine(int32,int32,int32,int32,int32)
-// 0x0104f3b4: 0x104f3b4: addu  a0, v0, zero
+// 0x0104f3c4: 0x104f3c4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104f3b8: 0x104f3b8: j	 0x104f44c addiu t3, t3, 1
+// 0x0104f3c8: 0x104f3c8: j	 0x104f45c addiu t3, t3, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	br L_104f44c
+	br L_104f45c
 // --- basic block ---
-L_104f3c0:
-// 0x0104f3c0: 0x104f3c0: sra   v0, ra, 31
+L_104f3d0:
+// 0x0104f3d0: 0x104f3d0: sra   v0, ra, 31
 	ldloc 7
 	ldc.i4.s 31
 	shr
 	stloc 6
-// 0x0104f3c4: 0x104f3c4: xor   ra, v0, ra
+// 0x0104f3d4: 0x104f3d4: xor   ra, v0, ra
 	ldloc 6
 	ldloc 7
 	xor
 	stloc 7
-// 0x0104f3c8: 0x104f3c8: subu  v0, ra, v0
+// 0x0104f3d8: 0x104f3d8: subu  v0, ra, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 6
-// 0x0104f3cc: 0x104f3cc: slt   v0, v0, s2
+// 0x0104f3dc: 0x104f3dc: slt   v0, v0, s2
 	ldloc 6
 	ldloc 14
 	clt
 	stloc 6
-// 0x0104f3d0: 0x104f3d0: beq   v0, zero, 0x104f3e0 addu  ra, s1, zero
+// 0x0104f3e0: 0x104f3e0: beq   v0, zero, 0x104f3f0 addu  ra, s1, zero
 	ldloc 6
 	ldloc 12
 	stloc 7
-	brfalse L_104f3e0
+	brfalse L_104f3f0
 // --- basic block ---
-// 0x0104f3d8: 0x104f3d8: addu  v0, s1, zero
+// 0x0104f3e8: 0x104f3e8: addu  v0, s1, zero
 	ldloc 12
 	stloc 6
-// 0x0104f3dc: 0x104f3dc: addu  ra, zero, zero
+// 0x0104f3ec: 0x104f3ec: addu  ra, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_104f3e0:
-// 0x0104f3e0: 0x104f3e0: addu  s2, v0, a0
+L_104f3f0:
+// 0x0104f3f0: 0x104f3f0: addu  s2, v0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 14
-// 0x0104f3e4: 0x104f3e4: subu  s3, a3, v0
+// 0x0104f3f4: 0x104f3f4: subu  s3, a3, v0
 	ldloc 4
 	ldloc 6
 	sub
 	stloc 17
-// 0x0104f3e8: 0x104f3e8: addu  s4, ra, t0
+// 0x0104f3f8: 0x104f3f8: addu  s4, ra, t0
 	ldloc 7
 	ldloc 9
 	add
 	stloc 18
-// 0x0104f3ec: 0x104f3ec: subu  s5, t1, ra
+// 0x0104f3fc: 0x104f3fc: subu  s5, t1, ra
 	ldloc 10
 	ldloc 7
 	sub
 	stloc 19
-// 0x0104f3f0: 0x104f3f0: addu  a3, v0, a3
+// 0x0104f400: 0x104f400: addu  a3, v0, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 4
-// 0x0104f3f4: 0x104f3f4: addu  t1, ra, t1
+// 0x0104f404: 0x104f404: addu  t1, ra, t1
 	ldloc 7
 	ldloc 10
 	add
 	stloc 10
-// 0x0104f3f8: 0x104f3f8: subu  v0, a0, v0
+// 0x0104f408: 0x104f408: subu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	sub
 	stloc 6
-// 0x0104f3fc: 0x104f3fc: subu  t0, t0, ra
+// 0x0104f40c: 0x104f40c: subu  t0, t0, ra
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 9
-// 0x0104f400: 0x104f400: sw    t1, 16(sp)
+// 0x0104f410: 0x104f410: sw    t1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6344,7 +6344,7 @@ L_104f3e0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104f404: 0x104f404: sw    s5, 20(sp)
+// 0x0104f414: 0x104f414: sw    s5, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6353,7 +6353,7 @@ L_104f3e0:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0104f408: 0x104f408: sw    t0, 24(sp)
+// 0x0104f418: 0x104f418: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6362,7 +6362,7 @@ L_104f3e0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104f40c: 0x104f40c: sw    s4, 28(sp)
+// 0x0104f41c: 0x104f41c: sw    s4, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6371,7 +6371,7 @@ L_104f3e0:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0104f410: 0x104f410: sw    a3, 32(sp)
+// 0x0104f420: 0x104f420: sw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6380,7 +6380,7 @@ L_104f3e0:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0104f414: 0x104f414: sw    s3, 36(sp)
+// 0x0104f424: 0x104f424: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6389,7 +6389,7 @@ L_104f3e0:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0104f418: 0x104f418: sw    v0, 40(sp)
+// 0x0104f428: 0x104f428: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6398,7 +6398,7 @@ L_104f3e0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f41c: 0x104f41c: sw    s2, 44(sp)
+// 0x0104f42c: 0x104f42c: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6407,99 +6407,99 @@ L_104f3e0:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104f420: 0x104f420: lw    a0, -4112(t4)
+// 0x0104f430: 0x104f430: lw    a0, -3648(t4)
 	ldloc 5
 	ldloc 20
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f424: 0x104f424: sll   zero, zero, 0
-// 0x0104f428: 0x104f428: cibyl_sysc_arg 0x4
+// 0x0104f434: 0x104f434: sll   zero, zero, 0
+// 0x0104f438: 0x104f438: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f42c: 0x104f42c: cibyl_sysc_arg 0xf
+// 0x0104f43c: 0x104f43c: cibyl_sysc_arg 0xf
 	ldloc 22
-// 0x0104f430: 0x104f430: cibyl_sysc_arg 0x19
+// 0x0104f440: 0x104f440: cibyl_sysc_arg 0x19
 	ldloc 24
-// 0x0104f434: 0x104f434: cibyl_sysc_arg 0xd
+// 0x0104f444: 0x104f444: cibyl_sysc_arg 0xd
 	ldloc 21
-// 0x0104f438: 0x104f438: cibyl_sysc_arg 0xd
+// 0x0104f448: 0x104f448: cibyl_sysc_arg 0xd
 	ldloc 21
-// 0x0104f43c: 0x104f43c: cibyl_sysc_arg 0x18
+// 0x0104f44c: 0x104f44c: cibyl_sysc_arg 0x18
 	ldloc 23
-// 0x0104f440: 0x104f440: cibyl_sysc 0xf46
+// 0x0104f450: 0x104f450: cibyl_sysc 0xf46
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawFilledPath(int32,int32,int32,int32,int32,int32)
-// 0x0104f444: 0x104f444: addu  a0, v0, zero
+// 0x0104f454: 0x104f454: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0104f448: 0x104f448: addiu t3, t3, 1
+// 0x0104f458: 0x104f458: addiu t3, t3, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-L_104f44c:
-// 0x0104f44c: 0x104f44c: addu  v0, v1, zero
+L_104f45c:
+// 0x0104f45c: 0x104f45c: addu  v0, v1, zero
 	ldloc 8
 	stloc 6
-L_104f450:
-// 0x0104f450: 0x104f450: slt   a0, t3, t6
+L_104f460:
+// 0x0104f460: 0x104f460: slt   a0, t3, t6
 	ldloc 13
 	ldloc 11
 	clt
 	stloc.1
-// 0x0104f454: 0x104f454: bne   a0, zero, 0x104f36c addiu v1, v0, 8
+// 0x0104f464: 0x104f464: bne   a0, zero, 0x104f37c addiu v1, v0, 8
 	ldloc.1
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 8
-	brtrue L_104f36c
+	brtrue L_104f37c
 // --- basic block ---
-// 0x0104f45c: 0x104f45c: sll   t6, t6, 3
+// 0x0104f46c: 0x104f46c: sll   t6, t6, 3
 	ldloc 11
 	ldc.i4.3
 	shl
 	stloc 11
-// 0x0104f460: 0x104f460: addu  a2, a2, t6
+// 0x0104f470: 0x104f470: addu  a2, a2, t6
 	ldloc.3
 	ldloc 11
 	add
 	stloc.3
-// 0x0104f464: 0x104f464: addiu a2, a2, 8
+// 0x0104f474: 0x104f474: addiu a2, a2, 8
 	ldloc.3
 	ldc.i4.8
 	add
 	stloc.3
-// 0x0104f468: 0x104f468: addiu a1, a1, 4
+// 0x0104f478: 0x104f478: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-L_104f46c:
-// 0x0104f46c: 0x104f46c: addiu t2, t2, 1
+L_104f47c:
+// 0x0104f47c: 0x104f47c: addiu t2, t2, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-L_104f470:
-// 0x0104f470: 0x104f470: slt   v0, t2, s0
+L_104f480:
+// 0x0104f480: 0x104f480: slt   v0, t2, s0
 	ldloc 15
 	ldloc 16
 	clt
 	stloc 6
-// 0x0104f474: 0x104f474: bne   v0, zero, 0x104f34c sll   zero, zero, 0
+// 0x0104f484: 0x104f484: bne   v0, zero, 0x104f35c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_104f34c
+	brtrue L_104f35c
 // --- basic block ---
-// 0x0104f47c: 0x104f47c: jal   0x101f9c0 addiu a0, zero, 4
+// 0x0104f48c: 0x104f48c: jal   0x101f9d0 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-	call void Cibyl23::dbg_time_end_101f9c0()
+	call void Cibyl23::dbg_time_end_101f9d0()
 // --- basic block ---
-// 0x0104f484: 0x104f484: lw    ra, 84(sp)
-// 0x0104f488: 0x104f488: lw    s5, 80(sp)
+// 0x0104f494: 0x104f494: lw    ra, 84(sp)
+// 0x0104f498: 0x104f498: lw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6508,7 +6508,7 @@ L_104f470:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0104f48c: 0x104f48c: lw    s4, 76(sp)
+// 0x0104f49c: 0x104f49c: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6517,7 +6517,7 @@ L_104f470:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0104f490: 0x104f490: lw    s3, 72(sp)
+// 0x0104f4a0: 0x104f4a0: lw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6526,7 +6526,7 @@ L_104f470:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0104f494: 0x104f494: lw    s2, 68(sp)
+// 0x0104f4a4: 0x104f4a4: lw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6535,7 +6535,7 @@ L_104f470:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0104f498: 0x104f498: lw    s1, 64(sp)
+// 0x0104f4a8: 0x104f4a8: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6544,7 +6544,7 @@ L_104f470:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104f49c: 0x104f49c: lw    s0, 60(sp)
+// 0x0104f4ac: 0x104f4ac: lw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6553,7 +6553,7 @@ L_104f470:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0104f4a0: 0x104f4a0: jr    ra addiu sp, sp, 88
+// 0x0104f4b0: 0x104f4b0: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -6565,7 +6565,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s0,int32 ra,int32 t0,int32 ecb,int32 ear)
@@ -6621,12 +6621,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f4a8: 0x104f4a8: addiu sp, sp, -96
+// 0x0104f4b8: 0x104f4b8: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0104f4ac: 0x104f4ac: sw    s1, 80(sp)
+// 0x0104f4bc: 0x104f4bc: sw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6635,7 +6635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104f4b0: 0x104f4b0: sw    s0, 76(sp)
+// 0x0104f4c0: 0x104f4c0: sw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6644,8 +6644,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104f4b4: 0x104f4b4: sw    ra, 92(sp)
-// 0x0104f4b8: 0x104f4b8: sw    s3, 88(sp)
+// 0x0104f4c4: 0x104f4c4: sw    ra, 92(sp)
+// 0x0104f4c8: 0x104f4c8: sw    s3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6654,7 +6654,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104f4bc: 0x104f4bc: sw    s2, 84(sp)
+// 0x0104f4cc: 0x104f4cc: sw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6663,25 +6663,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104f4c0: 0x104f4c0: addu  s1, a0, zero
+// 0x0104f4d0: 0x104f4d0: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104f4c4: 0x104f4c4: addu  s0, a1, zero
+// 0x0104f4d4: 0x104f4d4: addu  s0, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0104f4c8: 0x104f4c8: lui   a0, 0x1050000
+// 0x0104f4d8: 0x104f4d8: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0104f4cc: 0x104f4cc: addiu a0, a0, -7720
+// 0x0104f4dc: 0x104f4dc: addiu a0, a0, -7704
 	ldloc.1
-	ldc.i4 -7720
+	ldc.i4 -7704
 	add
 	stloc.1
-// 0x0104f4d0: 0x104f4d0: addu  a1, s1, zero
+// 0x0104f4e0: 0x104f4e0: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-L_104f4d4:
-// 0x0104f4d4: 0x104f4d4: jal   0x1000120 sw    a3, 64(sp)
+L_104f4e4:
+// 0x0104f4e4: 0x104f4e4: jal   0x1000120 sw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6695,14 +6695,14 @@ L_104f4d4:
 	ldloc.2
 	stloc 15
 // --- basic block ---
-// 0x0104f4dc: 0x104f4dc: lw    v0, 0(zero)
+// 0x0104f4ec: 0x104f4ec: lw    v0, 0(zero)
 	ldloc 5
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104f4e0: 0x104f4e0: lw    a3, 64(sp)
+// 0x0104f4f0: 0x104f4f0: lw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6711,71 +6711,71 @@ L_104f4d4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104f4e4: 0x104f4e4: beq   v0, zero, 0x104f600 addu  v1, zero, zero
+// 0x0104f4f4: 0x104f4f4: beq   v0, zero, 0x104f610 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_104f600
+	brfalse L_104f610
 // --- basic block ---
-// 0x0104f4ec: 0x104f4ec: lw    s3, 0(s1)
+// 0x0104f4fc: 0x104f4fc: lw    s3, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0104f4f0: 0x104f4f0: sll   zero, zero, 0
-// 0x0104f4f4: 0x104f4f4: cibyl_sysc_arg 0x13
+// 0x0104f500: 0x104f500: sll   zero, zero, 0
+// 0x0104f504: 0x104f504: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x0104f4f8: 0x104f4f8: cibyl_sysc 0xf63
+// 0x0104f508: 0x104f508: cibyl_sysc 0xf63
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getWidth(int32)
 	stloc 6
-// 0x0104f4fc: 0x104f4fc: addu  s3, v0, zero
+// 0x0104f50c: 0x104f50c: addu  s3, v0, zero
 	ldloc 6
 	stloc 10
-// 0x0104f500: 0x104f500: lw    s2, 0(s1)
+// 0x0104f510: 0x104f510: lw    s2, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0104f504: 0x104f504: sll   zero, zero, 0
-// 0x0104f508: 0x104f508: cibyl_sysc_arg 0x12
+// 0x0104f514: 0x104f514: sll   zero, zero, 0
+// 0x0104f518: 0x104f518: cibyl_sysc_arg 0x12
 	ldloc 9
-// 0x0104f50c: 0x104f50c: cibyl_sysc 0xf78
+// 0x0104f51c: 0x104f51c: cibyl_sysc 0xf78
 	call int32 [WazeWP7]Syscalls::NOPH_Bitmap_getHeight(int32)
 	stloc 6
-// 0x0104f510: 0x104f510: addu  s2, v0, zero
+// 0x0104f520: 0x104f520: addu  s2, v0, zero
 	ldloc 6
 	stloc 9
-// 0x0104f514: 0x104f514: lui   v0, 0x70000
+// 0x0104f524: 0x104f524: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0104f518: 0x104f518: lw    a0, -4112(v0)
+// 0x0104f528: 0x104f528: lw    a0, -3648(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1028
+	ldc.i4 -912
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f51c: 0x104f51c: lw    t0, 0(s1)
+// 0x0104f52c: 0x104f52c: lw    t0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0104f520: 0x104f520: lw    a1, 0(s0)
+// 0x0104f530: 0x104f530: lw    a1, 0(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0104f524: 0x104f524: lw    a2, 4(s0)
+// 0x0104f534: 0x104f534: lw    a2, 4(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6784,61 +6784,61 @@ L_104f4d4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0104f528: 0x104f528: sll   zero, zero, 0
-// 0x0104f52c: 0x104f52c: cibyl_sysc_arg 0x4
+// 0x0104f538: 0x104f538: sll   zero, zero, 0
+// 0x0104f53c: 0x104f53c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f530: 0x104f530: cibyl_sysc_arg 0x5
+// 0x0104f540: 0x104f540: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0104f534: 0x104f534: cibyl_sysc_arg 0x6
+// 0x0104f544: 0x104f544: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0104f538: 0x104f538: cibyl_sysc_arg 0x13
+// 0x0104f548: 0x104f548: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x0104f53c: 0x104f53c: cibyl_sysc_arg 0x12
+// 0x0104f54c: 0x104f54c: cibyl_sysc_arg 0x12
 	ldloc 9
-// 0x0104f540: 0x104f540: cibyl_sysc_arg 0x8
+// 0x0104f550: 0x104f550: cibyl_sysc_arg 0x8
 	ldloc 13
-// 0x0104f544: 0x104f544: cibyl_sysc_arg 0x3
+// 0x0104f554: 0x104f554: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104f548: 0x104f548: cibyl_sysc_arg 0x3
+// 0x0104f558: 0x104f558: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104f54c: 0x104f54c: cibyl_sysc 0xf8e
+// 0x0104f55c: 0x104f55c: cibyl_sysc 0xf8e
 	call void [WazeWP7]Syscalls::NOPH_Graphics_drawBitmap(int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x0104f550: 0x104f550: addu  v1, v0, zero
+// 0x0104f560: 0x104f560: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0104f554: 0x104f554: addiu v0, zero, 1
+// 0x0104f564: 0x104f564: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0104f558: 0x104f558: bne   a3, v0, 0x104f600 lui   s1, 0x70000
+// 0x0104f568: 0x104f568: bne   a3, v0, 0x104f610 lui   s1, 0x70000
 	ldloc 4
 	ldloc 6
 	ldc.i4 458752
 	stloc 8
-	bne.un L_104f600
+	bne.un L_104f610
 // --- basic block ---
-// 0x0104f560: 0x104f560: lw    v0, -4160(s1)
+// 0x0104f570: 0x104f570: lw    v0, -3696(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1040
+	ldc.i4 -924
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f564: 0x104f564: sll   zero, zero, 0
-// 0x0104f568: 0x104f568: bne   v0, zero, 0x104f590 sll   zero, zero, 0
+// 0x0104f574: 0x104f574: sll   zero, zero, 0
+// 0x0104f578: 0x104f578: bne   v0, zero, 0x104f5a0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_104f590
+	brtrue L_104f5a0
 // --- basic block ---
-// 0x0104f570: 0x104f570: lui   a0, 0x10000
+// 0x0104f580: 0x104f580: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0104f574: 0x104f574: addiu a0, a0, 3884
+// 0x0104f584: 0x104f584: addiu a0, a0, 3880
 	ldloc.1
-	ldc.i4 3884
+	ldc.i4 3880
 	add
 	stloc.1
-// 0x0104f578: 0x104f578: jal   0x104ef00 addu  a1, zero, zero
+// 0x0104f588: 0x104f588: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6846,25 +6846,25 @@ L_104f4d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104f580: 0x104f580: lui   a0, 0x0
+// 0x0104f590: 0x104f590: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0104f584: 0x104f584: addiu a0, a0, 31980
+// 0x0104f594: 0x104f594: addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
 	stloc.1
-// 0x0104f588: 0x104f588: jal   0x104edb0 sw    v0, -4160(s1)
+// 0x0104f598: 0x104f598: jal   0x104edc0 sw    v0, -3696(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1040
+	ldc.i4 -924
 	add
 	ldloc 6
 	stelem.i4
@@ -6873,13 +6873,13 @@ L_104f4d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_104f590:
-// 0x0104f590: 0x104f590: lw    v1, 4(s0)
+L_104f5a0:
+// 0x0104f5a0: 0x104f5a0: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -6888,39 +6888,39 @@ L_104f590:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104f594: 0x104f594: lw    v0, 0(s0)
+// 0x0104f5a4: 0x104f5a4: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0104f598: 0x104f598: lui   a0, 0x70000
+// 0x0104f5a8: 0x104f5a8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104f59c: 0x104f59c: lw    a0, -4160(a0)
+// 0x0104f5ac: 0x104f5ac: lw    a0, -3696(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1040
+	ldc.i4 -924
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f5a0: 0x104f5a0: addu  s2, s2, v1
+// 0x0104f5b0: 0x104f5b0: addu  s2, s2, v1
 	ldloc 9
 	ldloc 7
 	add
 	stloc 9
-// 0x0104f5a4: 0x104f5a4: addu  s3, s3, v0
+// 0x0104f5b4: 0x104f5b4: addu  s3, s3, v0
 	ldloc 10
 	ldloc 6
 	add
 	stloc 10
-// 0x0104f5a8: 0x104f5a8: addiu a1, zero, 5
+// 0x0104f5b8: 0x104f5b8: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0104f5ac: 0x104f5ac: sw    v1, 56(sp)
+// 0x0104f5bc: 0x104f5bc: sw    v1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6929,7 +6929,7 @@ L_104f590:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104f5b0: 0x104f5b0: sw    a1, 16(sp)
+// 0x0104f5c0: 0x104f5c0: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6938,7 +6938,7 @@ L_104f590:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0104f5b4: 0x104f5b4: sw    v1, 24(sp)
+// 0x0104f5c4: 0x104f5c4: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6947,7 +6947,7 @@ L_104f590:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104f5b8: 0x104f5b8: sw    v1, 32(sp)
+// 0x0104f5c8: 0x104f5c8: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6956,7 +6956,7 @@ L_104f590:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104f5bc: 0x104f5bc: sw    s3, 36(sp)
+// 0x0104f5cc: 0x104f5cc: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6965,7 +6965,7 @@ L_104f590:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104f5c0: 0x104f5c0: sw    s2, 48(sp)
+// 0x0104f5d0: 0x104f5d0: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6974,7 +6974,7 @@ L_104f590:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104f5c4: 0x104f5c4: sw    v0, 52(sp)
+// 0x0104f5d4: 0x104f5d4: sw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6983,7 +6983,7 @@ L_104f590:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f5c8: 0x104f5c8: sw    v0, 20(sp)
+// 0x0104f5d8: 0x104f5d8: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6992,7 +6992,7 @@ L_104f590:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f5cc: 0x104f5cc: sw    s3, 28(sp)
+// 0x0104f5dc: 0x104f5dc: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7001,7 +7001,7 @@ L_104f590:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104f5d0: 0x104f5d0: sw    s2, 40(sp)
+// 0x0104f5e0: 0x104f5e0: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7010,7 +7010,7 @@ L_104f590:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104f5d4: 0x104f5d4: jal   0x104e35c sw    v0, 44(sp)
+// 0x0104f5e4: 0x104f5e4: jal   0x104e36c sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7024,28 +7024,28 @@ L_104f590:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104f5dc: 0x104f5dc: addiu a0, zero, 1
+// 0x0104f5ec: 0x104f5ec: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0104f5e0: 0x104f5e0: addiu a1, sp, 16
+// 0x0104f5f0: 0x104f5f0: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0104f5e4: 0x104f5e4: addiu a2, sp, 20
+// 0x0104f5f4: 0x104f5f4: addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.3
-// 0x0104f5e8: 0x104f5e8: addu  a3, zero, zero
+// 0x0104f5f8: 0x104f5f8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0104f5ec: 0x104f5ec: jal   0x104f290 sw    v0, 64(sp)
+// 0x0104f5fc: 0x104f5fc: jal   0x104f2a0 sw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7059,12 +7059,12 @@ L_104f590:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f290(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_multiple_lines_104f2a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0104f5f4: 0x104f5f4: lw    v0, 64(sp)
+// 0x0104f604: 0x104f604: lw    v0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7073,7 +7073,7 @@ L_104f590:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f5f8: 0x104f5f8: jal   0x104e35c addu  a0, v0, zero
+// 0x0104f608: 0x104f608: jal   0x104e36c addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -7081,18 +7081,18 @@ L_104f590:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_104f600:
-// 0x0104f600: 0x104f600: sll   zero, zero, 0
-// 0x0104f604: 0x104f604: Unknown instruction 0x0
-L_104f604:
-// 0x0104f608: 0x104f608: sll   zero, zero, 0
-// 0x0104f60c: 0x104f60c: lw    ra, 92(sp)
-// 0x0104f610: 0x104f610: lw    s3, 88(sp)
+L_104f610:
+// 0x0104f610: 0x104f610: sll   zero, zero, 0
+// 0x0104f614: 0x104f614: Unknown instruction 0x0
+L_104f614:
+// 0x0104f618: 0x104f618: sll   zero, zero, 0
+// 0x0104f61c: 0x104f61c: lw    ra, 92(sp)
+// 0x0104f620: 0x104f620: lw    s3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7101,7 +7101,7 @@ L_104f604:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104f614: 0x104f614: lw    s2, 84(sp)
+// 0x0104f624: 0x104f624: lw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7110,7 +7110,7 @@ L_104f604:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f618: 0x104f618: lw    s1, 80(sp)
+// 0x0104f628: 0x104f628: lw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7119,7 +7119,7 @@ L_104f604:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104f61c: 0x104f61c: lw    s0, 76(sp)
+// 0x0104f62c: 0x104f62c: lw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7128,7 +7128,7 @@ L_104f604:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104f620: 0x104f620: jr    ra addiu sp, sp, 96
+// 0x0104f630: 0x104f630: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
diff --git a/converted/Cibyl59.j b/converted/Cibyl59.j
index e2c81aa..af69123 100644
--- a/converted/Cibyl59.j
+++ b/converted/Cibyl59.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl59::.ctor
 
-.method public static int32 roadmap_internet_open_browser_104f628(int32)
+.method public static int32 roadmap_internet_open_browser_104f638(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra)
@@ -61,26 +61,26 @@
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f628: 0x104f628: cibyl_sysc 0xfa7
+// 0x0104f638: 0x104f638: cibyl_sysc 0xfa7
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_get()
 	stloc.1
-// 0x0104f62c: 0x104f62c: addu  v1, v0, zero
+// 0x0104f63c: 0x104f63c: addu  v1, v0, zero
 	ldloc.1
 	stloc.2
-// 0x0104f630: 0x104f630: cibyl_sysc_arg 0x3
+// 0x0104f640: 0x104f640: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104f634: 0x104f634: cibyl_sysc_arg 0x4
+// 0x0104f644: 0x104f644: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104f638: 0x104f638: cibyl_sysc 0xfc2
+// 0x0104f648: 0x104f648: cibyl_sysc 0xfc2
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_openBrowser(int32,int32)
-// 0x0104f63c: 0x104f63c: addu  a0, v0, zero
+// 0x0104f64c: 0x104f64c: addu  a0, v0, zero
 	ldloc.1
 	stloc.0
-// 0x0104f640: 0x104f640: cibyl_sysc_arg 0x3
+// 0x0104f650: 0x104f650: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104f644: 0x104f644: cibyl_sysc 0xfe5
+// 0x0104f654: 0x104f654: cibyl_sysc 0xfe5
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104f648: 0x104f648: jr    ra addu  v1, v0, zero
+// 0x0104f658: 0x104f658: jr    ra addu  v1, v0, zero
 	ldloc.1
 	stloc.2
 	br __CIBYL_function_return
@@ -90,7 +90,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_time_get_time_104f650(int32,int32)
+.method public static int32 roadmap_time_get_time_104f660(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -116,46 +116,46 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f650: 0x104f650: cibyl_sysc 0xff1
+// 0x0104f660: 0x104f660: cibyl_sysc 0xff1
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_getInstance()
 	stloc.2
-// 0x0104f654: 0x104f654: addu  v1, v0, zero
+// 0x0104f664: 0x104f664: addu  v1, v0, zero
 	ldloc.2
 	stloc.3
-// 0x0104f658: 0x104f658: addiu a1, zero, 11
+// 0x0104f668: 0x104f668: addiu a1, zero, 11
 	ldc.i4.s 11
 	stloc.1
-// 0x0104f65c: 0x104f65c: cibyl_sysc_arg 0x3
+// 0x0104f66c: 0x104f66c: cibyl_sysc_arg 0x3
 	ldloc.3
-// 0x0104f660: 0x104f660: cibyl_sysc_arg 0x5
+// 0x0104f670: 0x104f670: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104f664: 0x104f664: cibyl_sysc 0x100b
+// 0x0104f674: 0x104f674: cibyl_sysc 0x100b
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc.2
-// 0x0104f668: 0x104f668: addu  a1, v0, zero
+// 0x0104f678: 0x104f678: addu  a1, v0, zero
 	ldloc.2
 	stloc.1
-// 0x0104f66c: 0x104f66c: sw    a1, 0(a0)
+// 0x0104f67c: 0x104f67c: sw    a1, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0104f670: 0x104f670: addiu a1, zero, 12
+// 0x0104f680: 0x104f680: addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0104f674: 0x104f674: cibyl_sysc_arg 0x3
+// 0x0104f684: 0x104f684: cibyl_sysc_arg 0x3
 	ldloc.3
-// 0x0104f678: 0x104f678: cibyl_sysc_arg 0x5
+// 0x0104f688: 0x104f688: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104f67c: 0x104f67c: cibyl_sysc 0x101d
+// 0x0104f68c: 0x104f68c: cibyl_sysc 0x101d
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc.2
-// 0x0104f680: 0x104f680: addu  a1, v0, zero
+// 0x0104f690: 0x104f690: addu  a1, v0, zero
 	ldloc.2
 	stloc.1
-// 0x0104f684: 0x104f684: sw    a1, 4(a0)
+// 0x0104f694: 0x104f694: sw    a1, 4(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -164,20 +164,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104f688: 0x104f688: addiu a1, zero, 13
+// 0x0104f698: 0x104f698: addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.1
-// 0x0104f68c: 0x104f68c: cibyl_sysc_arg 0x3
+// 0x0104f69c: 0x104f69c: cibyl_sysc_arg 0x3
 	ldloc.3
-// 0x0104f690: 0x104f690: cibyl_sysc_arg 0x5
+// 0x0104f6a0: 0x104f6a0: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104f694: 0x104f694: cibyl_sysc 0x102f
+// 0x0104f6a4: 0x104f6a4: cibyl_sysc 0x102f
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc.2
-// 0x0104f698: 0x104f698: addu  a1, v0, zero
+// 0x0104f6a8: 0x104f6a8: addu  a1, v0, zero
 	ldloc.2
 	stloc.1
-// 0x0104f69c: 0x104f69c: sw    a1, 8(a0)
+// 0x0104f6ac: 0x104f6ac: sw    a1, 8(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -186,11 +186,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0104f6a0: 0x104f6a0: cibyl_sysc_arg 0x3
+// 0x0104f6b0: 0x104f6b0: cibyl_sysc_arg 0x3
 	ldloc.3
-// 0x0104f6a4: 0x104f6a4: cibyl_sysc 0x1041
+// 0x0104f6b4: 0x104f6b4: cibyl_sysc 0x1041
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104f6a8: 0x104f6a8: jr    ra addu  v1, v0, zero
+// 0x0104f6b8: 0x104f6b8: jr    ra addu  v1, v0, zero
 	ldloc.2
 	stloc.3
 	br __CIBYL_function_return
@@ -200,7 +200,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_time_get_millis_104f6b0(int32)
+.method public static int32 roadmap_time_get_millis_104f6c0(int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -223,19 +223,19 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f6b0: 0x104f6b0: addiu sp, sp, -8
+// 0x0104f6c0: 0x104f6c0: addiu sp, sp, -8
 	ldloc.0
 	ldc.i4.s -8
 	add
 	stloc.0
-// 0x0104f6b4: 0x104f6b4: cibyl_sysc_arg 0x1d
+// 0x0104f6c4: 0x104f6c4: cibyl_sysc_arg 0x1d
 	ldloc.0
-// 0x0104f6b8: 0x104f6b8: cibyl_sysc 0x104d
+// 0x0104f6c8: 0x104f6c8: cibyl_sysc 0x104d
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x0104f6bc: 0x104f6bc: addu  v1, v0, zero
+// 0x0104f6cc: 0x104f6cc: addu  v1, v0, zero
 	ldloc.1
 	stloc.2
-// 0x0104f6c0: 0x104f6c0: lw    v0, 4(sp)
+// 0x0104f6d0: 0x104f6d0: lw    v0, 4(sp)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -244,7 +244,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104f6c4: 0x104f6c4: jr    ra addiu sp, sp, 8
+// 0x0104f6d4: 0x104f6d4: jr    ra addiu sp, sp, 8
 	ldloc.0
 	ldc.i4.8
 	add
@@ -256,7 +256,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 getIntegerFromString_104f6cc(int32,int32,int32,int32,int32)
+.method public static int32 getIntegerFromString_104f6dc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s8,int32 s1,int32 ra,int32 v1)
@@ -300,28 +300,28 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f6cc: 0x104f6cc: addiu v0, a3, 15
+// 0x0104f6dc: 0x104f6dc: addiu v0, a3, 15
 	ldloc 4
 	ldc.i4.s 15
 	add
 	stloc 6
-// 0x0104f6d0: 0x104f6d0: srl   v0, v0, 3
+// 0x0104f6e0: 0x104f6e0: srl   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shr.un
 	stloc 6
-// 0x0104f6d4: 0x104f6d4: addiu sp, sp, -40
+// 0x0104f6e4: 0x104f6e4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0104f6d8: 0x104f6d8: sll   v0, v0, 3
+// 0x0104f6e8: 0x104f6e8: sll   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x0104f6dc: 0x104f6dc: sw    ra, 36(sp)
-// 0x0104f6e0: 0x104f6e0: sw    s8, 32(sp)
+// 0x0104f6ec: 0x104f6ec: sw    ra, 36(sp)
+// 0x0104f6f0: 0x104f6f0: sw    s8, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -330,7 +330,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104f6e4: 0x104f6e4: sw    s1, 28(sp)
+// 0x0104f6f4: 0x104f6f4: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -339,10 +339,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104f6e8: 0x104f6e8: addu  s8, sp, zero
+// 0x0104f6f8: 0x104f6f8: addu  s8, sp, zero
 	ldloc.0
 	stloc 8
-// 0x0104f6ec: 0x104f6ec: sw    s0, 24(sp)
+// 0x0104f6fc: 0x104f6fc: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -351,34 +351,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104f6f0: 0x104f6f0: subu  sp, sp, v0
+// 0x0104f700: 0x104f700: subu  sp, sp, v0
 	ldloc.0
 	ldloc 6
 	sub
 	stloc.0
-// 0x0104f6f4: 0x104f6f4: addiu s0, sp, 16
+// 0x0104f704: 0x104f704: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x0104f6f8: 0x104f6f8: addu  a0, a0, a2
+// 0x0104f708: 0x104f708: addu  a0, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc.1
-// 0x0104f6fc: 0x104f6fc: addu  s1, a1, zero
+// 0x0104f70c: 0x104f70c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0104f700: 0x104f700: addu  a2, a3, zero
+// 0x0104f710: 0x104f710: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x0104f704: 0x104f704: addu  a1, a0, zero
+// 0x0104f714: 0x104f714: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0104f708: 0x104f708: addu  a0, s0, zero
+// 0x0104f718: 0x104f718: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0104f70c: 0x104f70c: jal   0x1001af8 sw    a3, 16(s8)
+// 0x0104f71c: 0x104f71c: jal   0x1001af8 sw    a3, 16(s8)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -393,7 +393,7 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0104f714: 0x104f714: lw    a3, 16(s8)
+// 0x0104f724: 0x104f724: lw    a3, 16(s8)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -402,15 +402,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104f718: 0x104f718: addu  a0, s0, zero
+// 0x0104f728: 0x104f728: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0104f71c: 0x104f71c: addu  a3, s0, a3
+// 0x0104f72c: 0x104f72c: addu  a3, s0, a3
 	ldloc 7
 	ldloc 4
 	add
 	stloc 4
-// 0x0104f720: 0x104f720: jal   0x1000d8c sb    zero, 0(a3)
+// 0x0104f730: 0x104f730: jal   0x1000d8c sb    zero, 0(a3)
 	ldloc 4
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -424,18 +424,18 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0104f728: 0x104f728: addu  sp, s8, zero
+// 0x0104f738: 0x104f738: addu  sp, s8, zero
 	ldloc 8
 	stloc.0
-// 0x0104f72c: 0x104f72c: lw    ra, 36(sp)
-// 0x0104f730: 0x104f730: sw    v0, 0(s1)
+// 0x0104f73c: 0x104f73c: lw    ra, 36(sp)
+// 0x0104f740: 0x104f740: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0104f734: 0x104f734: lw    s8, 32(sp)
+// 0x0104f744: 0x104f744: lw    s8, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -444,7 +444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104f738: 0x104f738: lw    s1, 28(sp)
+// 0x0104f748: 0x104f748: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -453,7 +453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f73c: 0x104f73c: lw    s0, 24(sp)
+// 0x0104f74c: 0x104f74c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -462,7 +462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104f740: 0x104f740: jr    ra addiu sp, sp, 40
+// 0x0104f750: 0x104f750: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -474,7 +474,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_time_parseGMTString_104f748(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_time_parseGMTString_104f758(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 s0,int32 s3,int32 v1,int32 s2,int32 s4,int32 ra)
@@ -524,12 +524,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f748: 0x104f748: addiu sp, sp, -48
+// 0x0104f758: 0x104f758: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104f74c: 0x104f74c: sw    s2, 32(sp)
+// 0x0104f75c: 0x104f75c: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -538,7 +538,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104f750: 0x104f750: sw    s1, 28(sp)
+// 0x0104f760: 0x104f760: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -547,15 +547,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f754: 0x104f754: addiu s2, sp, 16
+// 0x0104f764: 0x104f764: addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 11
-// 0x0104f758: 0x104f758: addu  s1, a0, zero
+// 0x0104f768: 0x104f768: addu  s1, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0104f75c: 0x104f75c: sw    s0, 24(sp)
+// 0x0104f76c: 0x104f76c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -564,22 +564,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104f760: 0x104f760: addu  a0, s2, zero
+// 0x0104f770: 0x104f770: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0104f764: 0x104f764: addu  s0, a1, zero
+// 0x0104f774: 0x104f774: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0104f768: 0x104f768: addiu a2, zero, 3
+// 0x0104f778: 0x104f778: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x0104f76c: 0x104f76c: addiu a1, s1, 8
+// 0x0104f77c: 0x104f77c: addiu a1, s1, 8
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc.2
-// 0x0104f770: 0x104f770: sw    ra, 44(sp)
-// 0x0104f774: 0x104f774: sw    s4, 40(sp)
+// 0x0104f780: 0x104f780: sw    ra, 44(sp)
+// 0x0104f784: 0x104f784: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -588,7 +588,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104f778: 0x104f778: jal   0x1001af8 sw    s3, 36(sp)
+// 0x0104f788: 0x104f788: jal   0x1001af8 sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -603,21 +603,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0104f780: 0x104f780: addu  a0, s1, zero
+// 0x0104f790: 0x104f790: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x0104f784: 0x104f784: addiu a1, s0, 20
+// 0x0104f794: 0x104f794: addiu a1, s0, 20
 	ldloc 8
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x0104f788: 0x104f788: addiu a2, zero, 12
+// 0x0104f798: 0x104f798: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0104f78c: 0x104f78c: addiu a3, zero, 4
+// 0x0104f79c: 0x104f79c: addiu a3, zero, 4
 	ldc.i4.4
 	stloc 4
-// 0x0104f790: 0x104f790: jal   0x104f6cc sb    zero, 19(sp)
+// 0x0104f7a0: 0x104f7a0: jal   0x104f6dc sb    zero, 19(sp)
 	ldloc.0
 	ldc.i4.s 19
 	add
@@ -628,23 +628,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::getIntegerFromString_104f6cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::getIntegerFromString_104f6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0104f798: 0x104f798: addu  a0, s1, zero
+// 0x0104f7a8: 0x104f7a8: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x0104f79c: 0x104f79c: addiu a1, s0, 12
+// 0x0104f7ac: 0x104f7ac: addiu a1, s0, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc.2
-// 0x0104f7a0: 0x104f7a0: addiu a2, zero, 5
+// 0x0104f7b0: 0x104f7b0: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x0104f7a4: 0x104f7a4: jal   0x104f6cc addiu a3, zero, 2
+// 0x0104f7b4: 0x104f7b4: jal   0x104f6dc addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
 	ldloc.0
@@ -652,23 +652,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::getIntegerFromString_104f6cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::getIntegerFromString_104f6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0104f7ac: 0x104f7ac: addu  a0, s1, zero
+// 0x0104f7bc: 0x104f7bc: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x0104f7b0: 0x104f7b0: addiu a1, s0, 8
+// 0x0104f7c0: 0x104f7c0: addiu a1, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc.2
-// 0x0104f7b4: 0x104f7b4: addiu a2, zero, 17
+// 0x0104f7c4: 0x104f7c4: addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
-// 0x0104f7b8: 0x104f7b8: jal   0x104f6cc addiu a3, zero, 2
+// 0x0104f7c8: 0x104f7c8: jal   0x104f6dc addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
 	ldloc.0
@@ -676,21 +676,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::getIntegerFromString_104f6cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::getIntegerFromString_104f6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0104f7c0: 0x104f7c0: addu  a0, s1, zero
+// 0x0104f7d0: 0x104f7d0: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x0104f7c4: 0x104f7c4: addiu a2, zero, 20
+// 0x0104f7d4: 0x104f7d4: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x0104f7c8: 0x104f7c8: addiu a3, zero, 2
+// 0x0104f7d8: 0x104f7d8: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x0104f7cc: 0x104f7cc: jal   0x104f6cc addiu a1, s0, 4
+// 0x0104f7dc: 0x104f7dc: jal   0x104f6dc addiu a1, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
@@ -700,21 +700,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::getIntegerFromString_104f6cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::getIntegerFromString_104f6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0104f7d4: 0x104f7d4: addu  a0, s1, zero
+// 0x0104f7e4: 0x104f7e4: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x0104f7d8: 0x104f7d8: addu  a1, s0, zero
+// 0x0104f7e8: 0x104f7e8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0104f7dc: 0x104f7dc: addiu a2, zero, 23
+// 0x0104f7ec: 0x104f7ec: addiu a2, zero, 23
 	ldc.i4.s 23
 	stloc.3
-// 0x0104f7e0: 0x104f7e0: jal   0x104f6cc addiu a3, zero, 2
+// 0x0104f7f0: 0x104f7f0: jal   0x104f6dc addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
 	ldloc.0
@@ -722,12 +722,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::getIntegerFromString_104f6cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::getIntegerFromString_104f6dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x0104f7e8: 0x104f7e8: lw    v0, 20(s0)
+// 0x0104f7f8: 0x104f7f8: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -736,15 +736,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104f7ec: 0x104f7ec: lui   s3, 0x20000
+// 0x0104f7fc: 0x104f7fc: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x0104f7f0: 0x104f7f0: addiu v0, v0, -1900
+// 0x0104f800: 0x104f800: addiu v0, v0, -1900
 	ldloc 7
 	ldc.i4 -1900
 	add
 	stloc 7
-// 0x0104f7f4: 0x104f7f4: sw    v0, 20(s0)
+// 0x0104f804: 0x104f804: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -753,26 +753,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104f7f8: 0x104f7f8: addiu s3, s3, 27784
+// 0x0104f808: 0x104f808: addiu s3, s3, 28248
 	ldloc 9
-	ldc.i4 27784
+	ldc.i4 28248
 	add
 	stloc 9
-// 0x0104f7fc: 0x104f7fc: addu  s1, zero, zero
+// 0x0104f80c: 0x104f80c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0104f800: 0x104f800: addiu s4, zero, 12
+// 0x0104f810: 0x104f810: addiu s4, zero, 12
 	ldc.i4.s 12
 	stloc 12
-L_104f804:
-// 0x0104f804: 0x104f804: lw    a1, 0(s3)
+L_104f814:
+// 0x0104f814: 0x104f814: lw    a1, 0(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0104f808: 0x104f808: jal   0x1001b14 addu  a0, s2, zero
+// 0x0104f818: 0x104f818: jal   0x1001b14 addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
@@ -780,27 +780,27 @@ L_104f804:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0104f810: 0x104f810: beq   v0, zero, 0x104f824 sll   zero, zero, 0
+// 0x0104f820: 0x104f820: beq   v0, zero, 0x104f834 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_104f824
+	brfalse L_104f834
 // --- basic block ---
-// 0x0104f818: 0x104f818: addiu s1, s1, 1
+// 0x0104f828: 0x104f828: addiu s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0104f81c: 0x104f81c: bne   s1, s4, 0x104f804 addiu s3, s3, 4
+// 0x0104f82c: 0x104f82c: bne   s1, s4, 0x104f814 addiu s3, s3, 4
 	ldloc 6
 	ldloc 12
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	bne.un L_104f804
+	bne.un L_104f814
 // --- basic block ---
-L_104f824:
-// 0x0104f824: 0x104f824: lw    ra, 44(sp)
-// 0x0104f828: 0x104f828: sw    s1, 16(s0)
+L_104f834:
+// 0x0104f834: 0x104f834: lw    ra, 44(sp)
+// 0x0104f838: 0x104f838: sw    s1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -809,7 +809,7 @@ L_104f824:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f82c: 0x104f82c: lw    s4, 40(sp)
+// 0x0104f83c: 0x104f83c: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -818,7 +818,7 @@ L_104f824:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104f830: 0x104f830: lw    s3, 36(sp)
+// 0x0104f840: 0x104f840: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -827,7 +827,7 @@ L_104f824:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f834: 0x104f834: lw    s2, 32(sp)
+// 0x0104f844: 0x104f844: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -836,7 +836,7 @@ L_104f824:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104f838: 0x104f838: lw    s1, 28(sp)
+// 0x0104f848: 0x104f848: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -845,7 +845,7 @@ L_104f824:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f83c: 0x104f83c: lw    s0, 24(sp)
+// 0x0104f84c: 0x104f84c: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -854,7 +854,7 @@ L_104f824:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104f840: 0x104f840: jr    ra addiu sp, sp, 48
+// 0x0104f850: 0x104f850: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -866,7 +866,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_time_get_time_wseconds_104f848(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_time_get_time_wseconds_104f858(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 t0,int32 ra)
@@ -907,13 +907,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f848: 0x104f848: addiu sp, sp, -32
+// 0x0104f858: 0x104f858: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104f84c: 0x104f84c: sw    ra, 28(sp)
-// 0x0104f850: 0x104f850: sw    s0, 24(sp)
+// 0x0104f85c: 0x104f85c: sw    ra, 28(sp)
+// 0x0104f860: 0x104f860: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -922,78 +922,78 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104f854: 0x104f854: cibyl_sysc 0x106d
+// 0x0104f864: 0x104f864: cibyl_sysc 0x106d
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_getInstance()
 	stloc 5
-// 0x0104f858: 0x104f858: addu  a0, v0, zero
+// 0x0104f868: 0x104f868: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104f85c: 0x104f85c: addiu a3, zero, 11
+// 0x0104f86c: 0x104f86c: addiu a3, zero, 11
 	ldc.i4.s 11
 	stloc 4
-// 0x0104f860: 0x104f860: cibyl_sysc_arg 0x4
+// 0x0104f870: 0x104f870: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f864: 0x104f864: cibyl_sysc_arg 0x7
+// 0x0104f874: 0x104f874: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f868: 0x104f868: cibyl_sysc 0x1087
+// 0x0104f878: 0x104f878: cibyl_sysc 0x1087
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc 5
-// 0x0104f86c: 0x104f86c: addu  a3, v0, zero
+// 0x0104f87c: 0x104f87c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0104f870: 0x104f870: addiu t0, zero, 12
+// 0x0104f880: 0x104f880: addiu t0, zero, 12
 	ldc.i4.s 12
 	stloc 9
-// 0x0104f874: 0x104f874: cibyl_sysc_arg 0x4
+// 0x0104f884: 0x104f884: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f878: 0x104f878: cibyl_sysc_arg 0x8
+// 0x0104f888: 0x104f888: cibyl_sysc_arg 0x8
 	ldloc 9
-// 0x0104f87c: 0x104f87c: cibyl_sysc 0x1099
+// 0x0104f88c: 0x104f88c: cibyl_sysc 0x1099
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc 5
-// 0x0104f880: 0x104f880: addu  t0, v0, zero
+// 0x0104f890: 0x104f890: addu  t0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0104f884: 0x104f884: addiu v1, zero, 13
+// 0x0104f894: 0x104f894: addiu v1, zero, 13
 	ldc.i4.s 13
 	stloc 7
-// 0x0104f888: 0x104f888: cibyl_sysc_arg 0x4
+// 0x0104f898: 0x104f898: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f88c: 0x104f88c: cibyl_sysc_arg 0x3
+// 0x0104f89c: 0x104f89c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0104f890: 0x104f890: cibyl_sysc 0x10ab
+// 0x0104f8a0: 0x104f8a0: cibyl_sysc 0x10ab
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc 5
-// 0x0104f894: 0x104f894: addu  v1, v0, zero
+// 0x0104f8a4: 0x104f8a4: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0104f898: 0x104f898: cibyl_sysc_arg 0x4
+// 0x0104f8a8: 0x104f8a8: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f89c: 0x104f89c: cibyl_sysc 0x10bd
+// 0x0104f8ac: 0x104f8ac: cibyl_sysc 0x10bd
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104f8a0: 0x104f8a0: addu  a0, v0, zero
+// 0x0104f8b0: 0x104f8b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104f8a4: 0x104f8a4: lui   s0, 0x70000
+// 0x0104f8b4: 0x104f8b4: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104f8a8: 0x104f8a8: lui   a2, 0x10000
+// 0x0104f8b8: 0x104f8b8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104f8ac: 0x104f8ac: addiu a0, s0, -3948
+// 0x0104f8bc: 0x104f8bc: addiu a0, s0, -3484
 	ldloc 8
-	ldc.i4 -3948
+	ldc.i4 -3484
 	add
 	stloc.1
-// 0x0104f8b0: 0x104f8b0: addiu a2, a2, 3896
+// 0x0104f8c0: 0x104f8c0: addiu a2, a2, 3892
 	ldloc.3
-	ldc.i4 3896
+	ldc.i4 3892
 	add
 	stloc.3
-// 0x0104f8b4: 0x104f8b4: addiu a1, zero, 15
+// 0x0104f8c4: 0x104f8c4: addiu a1, zero, 15
 	ldc.i4.s 15
 	stloc.2
-// 0x0104f8b8: 0x104f8b8: sw    t0, 16(sp)
+// 0x0104f8c8: 0x104f8c8: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1002,7 +1002,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104f8bc: 0x104f8bc: jal   0x1000f9c sw    v1, 20(sp)
+// 0x0104f8cc: 0x104f8cc: jal   0x1000f9c sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1021,13 +1021,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104f8c4: 0x104f8c4: lw    ra, 28(sp)
-// 0x0104f8c8: 0x104f8c8: addiu v0, s0, -3948
+// 0x0104f8d4: 0x104f8d4: lw    ra, 28(sp)
+// 0x0104f8d8: 0x104f8d8: addiu v0, s0, -3484
 	ldloc 8
-	ldc.i4 -3948
+	ldc.i4 -3484
 	add
 	stloc 5
-// 0x0104f8cc: 0x104f8cc: lw    s0, 24(sp)
+// 0x0104f8dc: 0x104f8dc: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1036,7 +1036,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104f8d0: 0x104f8d0: jr    ra addiu sp, sp, 32
+// 0x0104f8e0: 0x104f8e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1048,7 +1048,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_time_get_hours_minutes_104f8d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_time_get_hours_minutes_104f8e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 s1,int32 ra,int32 hi,int32 lo)
@@ -1095,13 +1095,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f8d8: 0x104f8d8: addiu sp, sp, -48
+// 0x0104f8e8: 0x104f8e8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104f8dc: 0x104f8dc: sw    ra, 44(sp)
-// 0x0104f8e0: 0x104f8e0: sw    s1, 40(sp)
+// 0x0104f8ec: 0x104f8ec: sw    ra, 44(sp)
+// 0x0104f8f0: 0x104f8f0: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1110,7 +1110,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104f8e4: 0x104f8e4: sw    s0, 36(sp)
+// 0x0104f8f4: 0x104f8f4: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1119,59 +1119,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104f8e8: 0x104f8e8: cibyl_sysc 0x10c9
+// 0x0104f8f8: 0x104f8f8: cibyl_sysc 0x10c9
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_getInstance()
 	stloc 5
-// 0x0104f8ec: 0x104f8ec: addu  v1, v0, zero
+// 0x0104f8fc: 0x104f8fc: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104f8f0: 0x104f8f0: addiu a3, zero, 11
+// 0x0104f900: 0x104f900: addiu a3, zero, 11
 	ldc.i4.s 11
 	stloc 4
-// 0x0104f8f4: 0x104f8f4: cibyl_sysc_arg 0x3
+// 0x0104f904: 0x104f904: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0104f8f8: 0x104f8f8: cibyl_sysc_arg 0x7
+// 0x0104f908: 0x104f908: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x0104f8fc: 0x104f8fc: cibyl_sysc 0x10e3
+// 0x0104f90c: 0x104f90c: cibyl_sysc 0x10e3
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc 5
-// 0x0104f900: 0x104f900: addu  a3, v0, zero
+// 0x0104f910: 0x104f910: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0104f904: 0x104f904: addiu s0, zero, 12
+// 0x0104f914: 0x104f914: addiu s0, zero, 12
 	ldc.i4.s 12
 	stloc 6
-// 0x0104f908: 0x104f908: cibyl_sysc_arg 0x3
+// 0x0104f918: 0x104f918: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0104f90c: 0x104f90c: cibyl_sysc_arg 0x10
+// 0x0104f91c: 0x104f91c: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x0104f910: 0x104f910: cibyl_sysc 0x10f5
+// 0x0104f920: 0x104f920: cibyl_sysc 0x10f5
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc 5
-// 0x0104f914: 0x104f914: addu  s1, v0, zero
+// 0x0104f924: 0x104f924: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0104f918: 0x104f918: addiu a0, zero, 13
+// 0x0104f928: 0x104f928: addiu a0, zero, 13
 	ldc.i4.s 13
 	stloc.1
-// 0x0104f91c: 0x104f91c: cibyl_sysc_arg 0x3
+// 0x0104f92c: 0x104f92c: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0104f920: 0x104f920: cibyl_sysc_arg 0x4
+// 0x0104f930: 0x104f930: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104f924: 0x104f924: cibyl_sysc 0x1107
+// 0x0104f934: 0x104f934: cibyl_sysc 0x1107
 	call int32 [WazeWP7]Syscalls::NOPH_Calendar_get(int32,int32)
 	stloc 5
-// 0x0104f928: 0x104f928: addu  a0, v0, zero
+// 0x0104f938: 0x104f938: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0104f92c: 0x104f92c: cibyl_sysc_arg 0x3
+// 0x0104f93c: 0x104f93c: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0104f930: 0x104f930: cibyl_sysc 0x1119
+// 0x0104f940: 0x104f940: cibyl_sysc 0x1119
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104f934: 0x104f934: addu  v1, v0, zero
+// 0x0104f944: 0x104f944: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0104f938: 0x104f938: jal   0x10a48f4 sw    a3, 24(sp)
+// 0x0104f948: 0x104f948: jal   0x10a4f3c sw    a3, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1185,12 +1185,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_general_settings_is_24_hour_clock_10a48f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_general_settings_is_24_hour_clock_10a4f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104f940: 0x104f940: lw    a3, 24(sp)
+// 0x0104f950: 0x104f950: lw    a3, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1199,11 +1199,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104f944: 0x104f944: bne   v0, zero, 0x104f960 sll   zero, zero, 0
+// 0x0104f954: 0x104f954: bne   v0, zero, 0x104f970 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_104f960
+	brtrue L_104f970
 // --- basic block ---
-// 0x0104f94c: 0x104f94c: div   a3, s0
+// 0x0104f95c: 0x104f95c: div   a3, s0
 	ldloc 4
 	ldloc 6
 	ldloc 4
@@ -1212,40 +1212,40 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	rem
 	stloc 11
-// 0x0104f950: 0x104f950: mfhi  hi
+// 0x0104f960: 0x104f960: mfhi  hi
 	ldloc 11
 	stloc 4
-// 0x0104f954: 0x104f954: bne   a3, zero, 0x104f964 lui   s0, 0x70000
+// 0x0104f964: 0x104f964: bne   a3, zero, 0x104f974 lui   s0, 0x70000
 	ldloc 4
 	ldc.i4 458752
 	stloc 6
-	brtrue L_104f964
+	brtrue L_104f974
 // --- basic block ---
-// 0x0104f95c: 0x104f95c: addiu a3, zero, 12
+// 0x0104f96c: 0x104f96c: addiu a3, zero, 12
 	ldc.i4.s 12
 	stloc 4
-L_104f960:
-// 0x0104f960: 0x104f960: lui   s0, 0x70000
+L_104f970:
+// 0x0104f970: 0x104f970: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 6
-L_104f964:
-// 0x0104f964: 0x104f964: lui   a2, 0x10000
+L_104f974:
+// 0x0104f974: 0x104f974: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0104f968: 0x104f968: addiu a0, s0, -3932
+// 0x0104f978: 0x104f978: addiu a0, s0, -3468
 	ldloc 6
-	ldc.i4 -3932
+	ldc.i4 -3468
 	add
 	stloc.1
-// 0x0104f96c: 0x104f96c: addiu a2, a2, 3912
+// 0x0104f97c: 0x104f97c: addiu a2, a2, 3908
 	ldloc.3
-	ldc.i4 3912
+	ldc.i4 3908
 	add
 	stloc.3
-// 0x0104f970: 0x104f970: addiu a1, zero, 6
+// 0x0104f980: 0x104f980: addiu a1, zero, 6
 	ldc.i4.6
 	stloc.2
-// 0x0104f974: 0x104f974: jal   0x1000f9c sw    s1, 16(sp)
+// 0x0104f984: 0x104f984: jal   0x1000f9c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1264,13 +1264,13 @@ L_104f964:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0104f97c: 0x104f97c: lw    ra, 44(sp)
-// 0x0104f980: 0x104f980: addiu v0, s0, -3932
+// 0x0104f98c: 0x104f98c: lw    ra, 44(sp)
+// 0x0104f990: 0x104f990: addiu v0, s0, -3468
 	ldloc 6
-	ldc.i4 -3932
+	ldc.i4 -3468
 	add
 	stloc 5
-// 0x0104f984: 0x104f984: lw    s1, 40(sp)
+// 0x0104f994: 0x104f994: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1279,7 +1279,7 @@ L_104f964:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104f988: 0x104f988: lw    s0, 36(sp)
+// 0x0104f998: 0x104f998: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1288,7 +1288,7 @@ L_104f964:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104f98c: 0x104f98c: jr    ra addiu sp, sp, 48
+// 0x0104f99c: 0x104f99c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1300,7 +1300,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_serial_read_104f9d8(int32,int32,int32)
+.method public static int32 roadmap_serial_read_104f9e8(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1329,39 +1329,39 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104f9d8: 0x104f9d8: lui   v0, 0x70000
+// 0x0104f9e8: 0x104f9e8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x0104f9dc: 0x104f9dc: lw    v1, -3924(v0)
+// 0x0104f9ec: 0x104f9ec: lw    v1, -3460(v0)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 -981
+	ldc.i4 -865
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104f9e0: 0x104f9e0: sll   zero, zero, 0
-// 0x0104f9e4: 0x104f9e4: beq   v1, zero, 0x104fa00 addiu a0, zero, -1
+// 0x0104f9f0: 0x104f9f0: sll   zero, zero, 0
+// 0x0104f9f4: 0x104f9f4: beq   v1, zero, 0x104fa10 addiu a0, zero, -1
 	ldloc 4
 	ldc.i4.m1
 	stloc.0
-	brfalse L_104fa00
+	brfalse L_104fa10
 // --- basic block ---
-// 0x0104f9ec: 0x104f9ec: cibyl_sysc_arg 0x3
+// 0x0104f9fc: 0x104f9fc: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x0104f9f0: 0x104f9f0: cibyl_sysc_arg 0x5
+// 0x0104fa00: 0x104fa00: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104f9f4: 0x104f9f4: cibyl_sysc_arg 0x6
+// 0x0104fa04: 0x104fa04: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104f9f8: 0x104f9f8: cibyl_sysc 0x1159
+// 0x0104fa08: 0x104fa08: cibyl_sysc 0x1159
 	call int32 [WazeWP7]Syscalls::NOPH_GpsManager_read(int32,int32,int32)
 	stloc.3
-// 0x0104f9fc: 0x104f9fc: addu  a0, v0, zero
+// 0x0104fa0c: 0x104fa0c: addu  a0, v0, zero
 	ldloc.3
 	stloc.0
-L_104fa00:
-// 0x0104fa00: 0x104fa00: jr    ra addu  v0, a0, zero
+L_104fa10:
+// 0x0104fa10: 0x104fa10: jr    ra addu  v0, a0, zero
 	ldloc.0
 	stloc.3
 	br __CIBYL_function_return
@@ -1371,7 +1371,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_serial_write_104fa08()
+.method public static int32 roadmap_serial_write_104fa18()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1385,7 +1385,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fa08: 0x104fa08: jr    ra addiu v0, zero, -1
+// 0x0104fa18: 0x104fa18: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.0
 	br __CIBYL_function_return
@@ -1393,7 +1393,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_serial_close_104fa10()
+.method public static int32 roadmap_serial_close_104fa20()
 {
 .maxstack 5
 .locals init (int32 v1,int32 v0,int32 ra,int32[] mem)
@@ -1413,32 +1413,32 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fa10: 0x104fa10: lui   v0, 0x70000
+// 0x0104fa20: 0x104fa20: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104fa14: 0x104fa14: lw    v1, -3924(v0)
+// 0x0104fa24: 0x104fa24: lw    v1, -3460(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -981
+	ldc.i4 -865
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104fa18: 0x104fa18: sll   zero, zero, 0
-// 0x0104fa1c: 0x104fa1c: beq   v1, zero, 0x104fa30 sll   zero, zero, 0
+// 0x0104fa28: 0x104fa28: sll   zero, zero, 0
+// 0x0104fa2c: 0x104fa2c: beq   v1, zero, 0x104fa40 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_104fa30
+	brfalse L_104fa40
 // --- basic block ---
-// 0x0104fa24: 0x104fa24: cibyl_sysc_arg 0x3
+// 0x0104fa34: 0x104fa34: cibyl_sysc_arg 0x3
 	ldloc.0
-// 0x0104fa28: 0x104fa28: cibyl_sysc 0x116e
+// 0x0104fa38: 0x104fa38: cibyl_sysc 0x116e
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_disconnect(int32)
-// 0x0104fa2c: 0x104fa2c: addu  v1, v0, zero
+// 0x0104fa3c: 0x104fa3c: addu  v1, v0, zero
 	ldloc.1
 	stloc.0
-L_104fa30:
-// 0x0104fa30: 0x104fa30: jr    ra sll   zero, zero, 0
+L_104fa40:
+// 0x0104fa40: 0x104fa40: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
@@ -1446,7 +1446,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_horizontal_screen_orientation_104fa48()
+.method public static int32 roadmap_horizontal_screen_orientation_104fa58()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1466,31 +1466,31 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fa48: 0x104fa48: lui   v0, 0xf0000
+// 0x0104fa58: 0x104fa58: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc.0
-// 0x0104fa4c: 0x104fa4c: lw    v1, -30072(v0)
+// 0x0104fa5c: 0x104fa5c: lw    v1, -29608(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104fa50: 0x104fa50: lui   v0, 0xf0000
+// 0x0104fa60: 0x104fa60: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc.0
-// 0x0104fa54: 0x104fa54: lw    v0, -30068(v0)
+// 0x0104fa64: 0x104fa64: lw    v0, -29604(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104fa58: 0x104fa58: jr    ra slt   v0, v1, v0
+// 0x0104fa68: 0x104fa68: jr    ra slt   v0, v1, v0
 	ldloc.1
 	ldloc.0
 	clt
@@ -1502,7 +1502,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_main_toggle_full_screen_104fa60()
+.method public static void roadmap_main_toggle_full_screen_104fa70()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1513,13 +1513,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_104fa60:
-// 0x0104fa60: 0x104fa60: jr    ra sll   zero, zero, 0
+L_104fa70:
+// 0x0104fa70: 0x104fa70: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_main_set_keyboard_104fa68()
+.method public static void roadmap_main_set_keyboard_104fa78()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1530,12 +1530,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fa68: 0x104fa68: jr    ra sll   zero, zero, 0
+// 0x0104fa78: 0x104fa78: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_main_new_menu_104fa70()
+.method public static int32 roadmap_main_new_menu_104fa80()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -1549,7 +1549,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fa70: 0x104fa70: jr    ra addu  v0, zero, zero
+// 0x0104fa80: 0x104fa80: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -1557,7 +1557,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_main_add_menu_104fa80()
+.method public static void roadmap_main_add_menu_104fa90()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1568,12 +1568,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fa80: 0x104fa80: jr    ra sll   zero, zero, 0
+// 0x0104fa90: 0x104fa90: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_main_browser_hide_104fa88()
+.method public static int32 roadmap_main_browser_hide_104fa98()
 {
 .maxstack 4
 .locals init (int32 v0,int32 v1,int32 ra)
@@ -1590,9 +1590,9 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fa88: 0x104fa88: cibyl_sysc 0x131f
+// 0x0104fa98: 0x104fa98: cibyl_sysc 0x131f
 	call void [WazeWP7]Syscalls::NOPH_EmbeddedBrowser_EmbeddedBrowserHide()
-// 0x0104fa8c: 0x104fa8c: jr    ra addu  v1, v0, zero
+// 0x0104fa9c: 0x104fa9c: jr    ra addu  v1, v0, zero
 	ldloc.0
 	stloc.1
 	br __CIBYL_function_return
@@ -1602,7 +1602,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 rim_on_menuItem_104fab4(int32,int32)
+.method public static int32 rim_on_menuItem_104fac4(int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 v1,int32 v0,int32 ra)
@@ -1625,22 +1625,22 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fab4: 0x104fab4: addu  v1, zero, zero
+// 0x0104fac4: 0x104fac4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104fab8: 0x104fab8: cibyl_sysc_arg 0x4
+// 0x0104fac8: 0x104fac8: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104fabc: 0x104fabc: cibyl_sysc_arg 0x5
+// 0x0104facc: 0x104facc: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104fac0: 0x104fac0: cibyl_sysc_arg 0x3
+// 0x0104fad0: 0x104fad0: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104fac4: 0x104fac4: cibyl_sysc_arg 0x3
+// 0x0104fad4: 0x104fad4: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104fac8: 0x104fac8: cibyl_sysc_arg 0x3
+// 0x0104fad8: 0x104fad8: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104facc: 0x104facc: cibyl_sysc 0x1363
+// 0x0104fadc: 0x104fadc: cibyl_sysc 0x1363
 	call void [WazeWP7]Syscalls::NOPH_UIWorker_addCallback(int32,int32,int32,int32,int32)
-// 0x0104fad0: 0x104fad0: jr    ra addu  v1, v0, zero
+// 0x0104fae0: 0x104fae0: jr    ra addu  v1, v0, zero
 	ldloc.3
 	stloc.2
 	br __CIBYL_function_return
@@ -1650,7 +1650,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_main_set_miniMenu_item_104fad8(int32,int32,int32,int32)
+.method public static int32 roadmap_main_set_miniMenu_item_104fae8(int32,int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1682,39 +1682,39 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fad8: 0x104fad8: lui   v0, 0x70000
+// 0x0104fae8: 0x104fae8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0104fadc: 0x104fadc: lui   a3, 0x1050000
+// 0x0104faec: 0x104faec: lui   a3, 0x1050000
 	ldc.i4 17104896
 	stloc.3
-// 0x0104fae0: 0x104fae0: lw    v1, -1688(v0)
+// 0x0104faf0: 0x104faf0: lw    v1, -1224(v0)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 5
-// 0x0104fae4: 0x104fae4: addiu a3, a3, 4412
+// 0x0104faf4: 0x104faf4: addiu a3, a3, 4428
 	ldloc.3
-	ldc.i4 4412
+	ldc.i4 4428
 	add
 	stloc.3
-// 0x0104fae8: 0x104fae8: cibyl_sysc_arg 0x3
+// 0x0104faf8: 0x104faf8: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0104faec: 0x104faec: cibyl_sysc_arg 0x5
+// 0x0104fafc: 0x104fafc: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104faf0: 0x104faf0: cibyl_sysc_arg 0x4
+// 0x0104fb00: 0x104fb00: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104faf4: 0x104faf4: cibyl_sysc_arg 0x7
+// 0x0104fb04: 0x104fb04: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x0104faf8: 0x104faf8: cibyl_sysc_arg 0x6
+// 0x0104fb08: 0x104fb08: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104fafc: 0x104fafc: cibyl_sysc 0x137d
+// 0x0104fb0c: 0x104fb0c: cibyl_sysc 0x137d
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_setMiniMenuItem(int32,int32,int32,int32,int32)
-// 0x0104fb00: 0x104fb00: jr    ra addu  v1, v0, zero
+// 0x0104fb10: 0x104fb10: jr    ra addu  v1, v0, zero
 	ldloc 4
 	stloc 5
 	br __CIBYL_function_return
@@ -1724,7 +1724,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_main_context_menu_reset_104fb08(int32)
+.method public static int32 roadmap_main_context_menu_reset_104fb18(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1747,52 +1747,52 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fb08: 0x104fb08: beq   a0, zero, 0x104fb2c lui   v0, 0x70000
+// 0x0104fb18: 0x104fb18: beq   a0, zero, 0x104fb3c lui   v0, 0x70000
 	ldloc.0
 	ldc.i4 458752
 	stloc.1
-	brfalse L_104fb2c
-// 0x0104fb10: 0x104fb10: lw    v1, -1688(v0)
+	brfalse L_104fb3c
+// 0x0104fb20: 0x104fb20: lw    v1, -1224(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104fb14: 0x104fb14: addiu a0, zero, 2
+// 0x0104fb24: 0x104fb24: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.0
-// 0x0104fb18: 0x104fb18: cibyl_sysc_arg 0x3
+// 0x0104fb28: 0x104fb28: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104fb1c: 0x104fb1c: cibyl_sysc_arg 0x4
+// 0x0104fb2c: 0x104fb2c: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104fb20: 0x104fb20: cibyl_sysc 0x13a4
+// 0x0104fb30: 0x104fb30: cibyl_sysc 0x13a4
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_resetContextMenu(int32,int32)
-// 0x0104fb24: 0x104fb24: jr    ra addu  v1, v0, zero
+// 0x0104fb34: 0x104fb34: jr    ra addu  v1, v0, zero
 	ldloc.1
 	stloc.2
 	br __CIBYL_function_return
 // --- basic block ---
-L_104fb2c:
-// 0x0104fb2c: 0x104fb2c: lw    v1, -1688(v0)
+L_104fb3c:
+// 0x0104fb3c: 0x104fb3c: lw    v1, -1224(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104fb30: 0x104fb30: sll   zero, zero, 0
-// 0x0104fb34: 0x104fb34: cibyl_sysc_arg 0x3
+// 0x0104fb40: 0x104fb40: sll   zero, zero, 0
+// 0x0104fb44: 0x104fb44: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104fb38: 0x104fb38: cibyl_sysc_arg 0x4
+// 0x0104fb48: 0x104fb48: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104fb3c: 0x104fb3c: cibyl_sysc 0x13cc
+// 0x0104fb4c: 0x104fb4c: cibyl_sysc 0x13cc
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_resetContextMenu(int32,int32)
-// 0x0104fb40: 0x104fb40: jr    ra addu  a0, v0, zero
+// 0x0104fb50: 0x104fb50: jr    ra addu  a0, v0, zero
 	ldloc.1
 	stloc.0
 	br __CIBYL_function_return
@@ -1802,7 +1802,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_main_add_menu_item_104fb48(int32,int32,int32,int32)
+.method public static int32 roadmap_main_add_menu_item_104fb58(int32,int32,int32,int32)
 {
 .maxstack 9
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 t0,int32 ra,int32[] mem)
@@ -1837,75 +1837,75 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fb48: 0x104fb48: beq   a1, zero, 0x104fb8c lui   v0, 0x70000
+// 0x0104fb58: 0x104fb58: beq   a1, zero, 0x104fb9c lui   v0, 0x70000
 	ldloc.1
 	ldc.i4 458752
 	stloc 5
-	brfalse L_104fb8c
-// 0x0104fb50: 0x104fb50: lui   a2, 0x1050000
+	brfalse L_104fb9c
+// 0x0104fb60: 0x104fb60: lui   a2, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0104fb54: 0x104fb54: lw    a0, -1688(v0)
+// 0x0104fb64: 0x104fb64: lw    a0, -1224(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc.0
-// 0x0104fb58: 0x104fb58: addiu v1, zero, 1
+// 0x0104fb68: 0x104fb68: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0104fb5c: 0x104fb5c: addu  t0, zero, zero
+// 0x0104fb6c: 0x104fb6c: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0104fb60: 0x104fb60: addiu a2, a2, 4412
+// 0x0104fb70: 0x104fb70: addiu a2, a2, 4428
 	ldloc.2
-	ldc.i4 4412
+	ldc.i4 4428
 	add
 	stloc.2
-// 0x0104fb64: 0x104fb64: cibyl_sysc_arg 0x4
+// 0x0104fb74: 0x104fb74: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104fb68: 0x104fb68: cibyl_sysc_arg 0x5
+// 0x0104fb78: 0x104fb78: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x0104fb6c: 0x104fb6c: cibyl_sysc_arg 0x3
+// 0x0104fb7c: 0x104fb7c: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x0104fb70: 0x104fb70: cibyl_sysc_arg 0x3
+// 0x0104fb80: 0x104fb80: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x0104fb74: 0x104fb74: cibyl_sysc_arg 0x6
+// 0x0104fb84: 0x104fb84: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x0104fb78: 0x104fb78: cibyl_sysc_arg 0x7
+// 0x0104fb88: 0x104fb88: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x0104fb7c: 0x104fb7c: cibyl_sysc_arg 0x8
+// 0x0104fb8c: 0x104fb8c: cibyl_sysc_arg 0x8
 	ldloc 6
-// 0x0104fb80: 0x104fb80: cibyl_sysc 0x13f4
+// 0x0104fb90: 0x104fb90: cibyl_sysc 0x13f4
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_addMenuItem(int32,int32,int32,int32,int32,int32,int32)
-// 0x0104fb84: 0x104fb84: jr    ra addu  v1, v0, zero
+// 0x0104fb94: 0x104fb94: jr    ra addu  v1, v0, zero
 	ldloc 5
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_104fb8c:
-// 0x0104fb8c: 0x104fb8c: lw    v1, -1688(v0)
+L_104fb9c:
+// 0x0104fb9c: 0x104fb9c: lw    v1, -1224(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 4
-// 0x0104fb90: 0x104fb90: addiu a0, zero, 1
+// 0x0104fba0: 0x104fba0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.0
-// 0x0104fb94: 0x104fb94: cibyl_sysc_arg 0x3
+// 0x0104fba4: 0x104fba4: cibyl_sysc_arg 0x3
 	ldloc 4
-// 0x0104fb98: 0x104fb98: cibyl_sysc_arg 0x4
+// 0x0104fba8: 0x104fba8: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104fb9c: 0x104fb9c: cibyl_sysc 0x1417
+// 0x0104fbac: 0x104fbac: cibyl_sysc 0x1417
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_addMenuItemSeparator(int32,int32)
-// 0x0104fba0: 0x104fba0: jr    ra addu  v1, v0, zero
+// 0x0104fbb0: 0x104fbb0: jr    ra addu  v1, v0, zero
 	ldloc 5
 	stloc 4
 	br __CIBYL_function_return
@@ -1915,7 +1915,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_add_separator_104fbb0(int32)
+.method public static int32 roadmap_main_add_separator_104fbc0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1938,28 +1938,28 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fbb0: 0x104fbb0: lui   v0, 0x70000
+// 0x0104fbc0: 0x104fbc0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104fbb4: 0x104fbb4: lw    v1, -1688(v0)
+// 0x0104fbc4: 0x104fbc4: lw    v1, -1224(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc.2
-// 0x0104fbb8: 0x104fbb8: addiu a0, zero, 1
+// 0x0104fbc8: 0x104fbc8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.0
-// 0x0104fbbc: 0x104fbbc: cibyl_sysc_arg 0x3
+// 0x0104fbcc: 0x104fbcc: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x0104fbc0: 0x104fbc0: cibyl_sysc_arg 0x4
+// 0x0104fbd0: 0x104fbd0: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x0104fbc4: 0x104fbc4: cibyl_sysc 0x1443
+// 0x0104fbd4: 0x104fbd4: cibyl_sysc 0x1443
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_addMenuItemSeparator(int32,int32)
-// 0x0104fbc8: 0x104fbc8: jr    ra addu  v1, v0, zero
+// 0x0104fbd8: 0x104fbd8: jr    ra addu  v1, v0, zero
 	ldloc.1
 	stloc.2
 	br __CIBYL_function_return
@@ -1969,7 +1969,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static void roadmap_main_add_tool_104fbd0()
+.method public static void roadmap_main_add_tool_104fbe0()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1980,12 +1980,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fbd0: 0x104fbd0: jr    ra sll   zero, zero, 0
+// 0x0104fbe0: 0x104fbe0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_main_add_tool_space_104fbd8()
+.method public static void roadmap_main_add_tool_space_104fbe8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -1996,12 +1996,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fbd8: 0x104fbd8: jr    ra sll   zero, zero, 0
+// 0x0104fbe8: 0x104fbe8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_main_show_104fbe8()
+.method public static void roadmap_main_show_104fbf8()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2012,12 +2012,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fbe8: 0x104fbe8: jr    ra sll   zero, zero, 0
+// 0x0104fbf8: 0x104fbf8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_main_set_last_cb_104fbf0(int32)
+.method public static int32 roadmap_main_set_last_cb_104fc00(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -2037,15 +2037,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fbf0: 0x104fbf0: lui   v0, 0x70000
+// 0x0104fc00: 0x104fc00: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104fbf4: 0x104fbf4: jr    ra sw    a0, -3908(v0)
+// 0x0104fc04: 0x104fc04: jr    ra sw    a0, -3444(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -977
+	ldc.i4 -861
 	add
 	ldloc.0
 	stelem.i4
@@ -2054,7 +2054,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static void roadmap_main_flush_104fc04()
+.method public static void roadmap_main_flush_104fc14()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2065,12 +2065,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fc04: 0x104fc04: jr    ra sll   zero, zero, 0
+// 0x0104fc14: 0x104fc14: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 rim_on_gps_104fc1c(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_gps_104fc2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s4,int32 v1,int32 s0,int32 s1,int32 s5,int32 s2,int32 s3,int32 ra)
@@ -2123,12 +2123,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fc1c: 0x104fc1c: addiu sp, sp, -48
+// 0x0104fc2c: 0x104fc2c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0104fc20: 0x104fc20: sw    s5, 40(sp)
+// 0x0104fc30: 0x104fc30: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2137,20 +2137,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104fc24: 0x104fc24: lui   s5, 0x70000
+// 0x0104fc34: 0x104fc34: lui   s5, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x0104fc28: 0x104fc28: lw    v0, -3912(s5)
+// 0x0104fc38: 0x104fc38: lw    v0, -3448(s5)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -978
+	ldc.i4 -862
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104fc2c: 0x104fc2c: sw    ra, 44(sp)
-// 0x0104fc30: 0x104fc30: sw    s4, 36(sp)
+// 0x0104fc3c: 0x104fc3c: sw    ra, 44(sp)
+// 0x0104fc40: 0x104fc40: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2159,7 +2159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104fc34: 0x104fc34: sw    s3, 32(sp)
+// 0x0104fc44: 0x104fc44: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2168,7 +2168,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104fc38: 0x104fc38: sw    s2, 28(sp)
+// 0x0104fc48: 0x104fc48: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2177,7 +2177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104fc3c: 0x104fc3c: sw    s1, 24(sp)
+// 0x0104fc4c: 0x104fc4c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2186,7 +2186,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104fc40: 0x104fc40: bne   v0, zero, 0x104fc74 sw    s0, 20(sp)
+// 0x0104fc50: 0x104fc50: bne   v0, zero, 0x104fc84 sw    s0, 20(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -2196,13 +2196,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_104fc74
+	brtrue L_104fc84
 // --- basic block ---
-// 0x0104fc48: 0x104fc48: j	 0x104fcc0 sll   zero, zero, 0
-	br L_104fcc0
+// 0x0104fc58: 0x104fc58: j	 0x104fcd0 sll   zero, zero, 0
+	br L_104fcd0
 // --- basic block ---
-L_104fc50:
-// 0x0104fc50: 0x104fc50: lw    v0, 52(s3)
+L_104fc60:
+// 0x0104fc60: 0x104fc60: lw    v0, 52(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -2211,21 +2211,21 @@ L_104fc50:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104fc54: 0x104fc54: sll   zero, zero, 0
-// 0x0104fc58: 0x104fc58: beq   v0, zero, 0x104fc8c sll   zero, zero, 0
+// 0x0104fc64: 0x104fc64: sll   zero, zero, 0
+// 0x0104fc68: 0x104fc68: beq   v0, zero, 0x104fc9c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_104fc8c
+	brfalse L_104fc9c
 // --- basic block ---
-// 0x0104fc60: 0x104fc60: sw    v0, -3908(s2)
+// 0x0104fc70: 0x104fc70: sw    v0, -3444(s2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -977
+	ldc.i4 -861
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104fc64: 0x104fc64: jalr  v0 addu  a0, s4, zero
+// 0x0104fc74: 0x104fc74: jalr  v0 addu  a0, s4, zero
 	ldloc 6
 	ldloc 7
 	stloc.1
@@ -2239,76 +2239,76 @@ L_104fc50:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0104fc6c: 0x104fc6c: j	 0x104fc8c sll   zero, zero, 0
-	br L_104fc8c
+// 0x0104fc7c: 0x104fc7c: j	 0x104fc9c sll   zero, zero, 0
+	br L_104fc9c
 // --- basic block ---
-L_104fc74:
-// 0x0104fc74: 0x104fc74: lui   s0, 0x70000
+L_104fc84:
+// 0x0104fc84: 0x104fc84: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0104fc78: 0x104fc78: lui   s4, 0x70000
+// 0x0104fc88: 0x104fc88: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0104fc7c: 0x104fc7c: addiu s4, s4, -2864
+// 0x0104fc8c: 0x104fc8c: addiu s4, s4, -2400
 	ldloc 7
-	ldc.i4 -2864
+	ldc.i4 -2400
 	add
 	stloc 7
-// 0x0104fc80: 0x104fc80: addu  s1, zero, zero
+// 0x0104fc90: 0x104fc90: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0104fc84: 0x104fc84: addiu s3, s0, -2872
+// 0x0104fc94: 0x104fc94: addiu s3, s0, -2408
 	ldloc 9
-	ldc.i4 -2872
+	ldc.i4 -2408
 	add
 	stloc 13
-// 0x0104fc88: 0x104fc88: lui   s2, 0x70000
+// 0x0104fc98: 0x104fc98: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 12
-L_104fc8c:
-// 0x0104fc8c: 0x104fc8c: lw    v0, -2872(s0)
+L_104fc9c:
+// 0x0104fc9c: 0x104fc9c: lw    v0, -2408(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -718
+	ldc.i4 -602
 	add
 	ldelem.i4
 	stloc 6
-// 0x0104fc90: 0x104fc90: sll   zero, zero, 0
-// 0x0104fc94: 0x104fc94: beq   v0, zero, 0x104fcc0 sll   zero, zero, 0
+// 0x0104fca0: 0x104fca0: sll   zero, zero, 0
+// 0x0104fca4: 0x104fca4: beq   v0, zero, 0x104fcd0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_104fcc0
+	brfalse L_104fcd0
 // --- basic block ---
-// 0x0104fc9c: 0x104fc9c: lw    v1, -3912(s5)
+// 0x0104fcac: 0x104fcac: lw    v1, -3448(s5)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -978
+	ldc.i4 -862
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104fca0: 0x104fca0: sll   zero, zero, 0
-// 0x0104fca4: 0x104fca4: cibyl_sysc_arg 0x3
+// 0x0104fcb0: 0x104fcb0: sll   zero, zero, 0
+// 0x0104fcb4: 0x104fcb4: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0104fca8: 0x104fca8: cibyl_sysc_arg 0x11
+// 0x0104fcb8: 0x104fcb8: cibyl_sysc_arg 0x11
 	ldloc 10
-// 0x0104fcac: 0x104fcac: cibyl_sysc_arg 0x11
+// 0x0104fcbc: 0x104fcbc: cibyl_sysc_arg 0x11
 	ldloc 10
-// 0x0104fcb0: 0x104fcb0: cibyl_sysc 0x147f
+// 0x0104fcc0: 0x104fcc0: cibyl_sysc 0x147f
 	call int32 [WazeWP7]Syscalls::NOPH_GpsManager_read(int32,int32,int32)
 	stloc 6
-// 0x0104fcb4: 0x104fcb4: addu  v1, v0, zero
+// 0x0104fcc4: 0x104fcc4: addu  v1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0104fcb8: 0x104fcb8: bne   v1, zero, 0x104fc50 sll   zero, zero, 0
+// 0x0104fcc8: 0x104fcc8: bne   v1, zero, 0x104fc60 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_104fc50
+	brtrue L_104fc60
 // --- basic block ---
-L_104fcc0:
-// 0x0104fcc0: 0x104fcc0: lw    ra, 44(sp)
-// 0x0104fcc4: 0x104fcc4: lw    s5, 40(sp)
+L_104fcd0:
+// 0x0104fcd0: 0x104fcd0: lw    ra, 44(sp)
+// 0x0104fcd4: 0x104fcd4: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2317,7 +2317,7 @@ L_104fcc0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0104fcc8: 0x104fcc8: lw    s4, 36(sp)
+// 0x0104fcd8: 0x104fcd8: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2326,7 +2326,7 @@ L_104fcc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104fccc: 0x104fccc: lw    s3, 32(sp)
+// 0x0104fcdc: 0x104fcdc: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2335,7 +2335,7 @@ L_104fcc0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0104fcd0: 0x104fcd0: lw    s2, 28(sp)
+// 0x0104fce0: 0x104fce0: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2344,7 +2344,7 @@ L_104fcc0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0104fcd4: 0x104fcd4: lw    s1, 24(sp)
+// 0x0104fce4: 0x104fce4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2353,7 +2353,7 @@ L_104fcc0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0104fcd8: 0x104fcd8: lw    s0, 20(sp)
+// 0x0104fce8: 0x104fce8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2362,7 +2362,7 @@ L_104fcc0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104fcdc: 0x104fcdc: jr    ra addiu sp, sp, 48
+// 0x0104fcec: 0x104fcec: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2374,7 +2374,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_main_show_miniMenu_104fce4()
+.method public static int32 roadmap_main_show_miniMenu_104fcf4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2394,24 +2394,24 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fce4: 0x104fce4: lui   v0, 0x70000
+// 0x0104fcf4: 0x104fcf4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0104fce8: 0x104fce8: lw    v1, -1688(v0)
+// 0x0104fcf8: 0x104fcf8: lw    v1, -1224(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104fcec: 0x104fcec: sll   zero, zero, 0
-// 0x0104fcf0: 0x104fcf0: cibyl_sysc_arg 0x3
+// 0x0104fcfc: 0x104fcfc: sll   zero, zero, 0
+// 0x0104fd00: 0x104fd00: cibyl_sysc_arg 0x3
 	ldloc.1
-// 0x0104fcf4: 0x104fcf4: cibyl_sysc 0x1494
+// 0x0104fd04: 0x104fd04: cibyl_sysc 0x1494
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_showMiniMenu(int32)
-// 0x0104fcf8: 0x104fcf8: jr    ra addu  v1, v0, zero
+// 0x0104fd08: 0x104fd08: jr    ra addu  v1, v0, zero
 	ldloc.0
 	stloc.1
 	br __CIBYL_function_return
@@ -2421,7 +2421,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 t1,int32 t0,int32 lo,int32 ra)
@@ -2465,87 +2465,87 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fd00: 0x104fd00: addiu sp, sp, -32
+// 0x0104fd10: 0x104fd10: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104fd04: 0x104fd04: addu  v0, a0, zero
+// 0x0104fd14: 0x104fd14: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0104fd08: 0x104fd08: lui   v1, 0x70000
+// 0x0104fd18: 0x104fd18: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104fd0c: 0x104fd0c: lui   a0, 0x70000
+// 0x0104fd1c: 0x104fd1c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104fd10: 0x104fd10: sw    ra, 28(sp)
-// 0x0104fd14: 0x104fd14: addiu a0, a0, -1976
+// 0x0104fd20: 0x104fd20: sw    ra, 28(sp)
+// 0x0104fd24: 0x104fd24: addiu a0, a0, -1512
 	ldloc.1
-	ldc.i4 -1976
+	ldc.i4 -1512
 	add
 	stloc.1
-// 0x0104fd18: 0x104fd18: addiu v1, v1, -636
+// 0x0104fd28: 0x104fd28: addiu v1, v1, -172
 	ldloc 5
-	ldc.i4 -636
+	ldc.i4 -172
 	add
 	stloc 5
-// 0x0104fd1c: 0x104fd1c: addu  a2, zero, zero
+// 0x0104fd2c: 0x104fd2c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0104fd20: 0x104fd20: addu  a1, zero, zero
+// 0x0104fd30: 0x104fd30: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0104fd24: 0x104fd24: addiu a3, zero, 24
+// 0x0104fd34: 0x104fd34: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0104fd28: 0x104fd28: addu  t1, a0, a2
+// 0x0104fd38: 0x104fd38: addu  t1, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc 8
-L_104fd2c:
-// 0x0104fd2c: 0x104fd2c: lw    t1, 0(t1)
+L_104fd3c:
+// 0x0104fd3c: 0x104fd3c: lw    t1, 0(t1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0104fd30: 0x104fd30: addu  t0, v1, a2
+// 0x0104fd40: 0x104fd40: addu  t0, v1, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc 9
-// 0x0104fd34: 0x104fd34: bne   t1, v0, 0x104fd7c addiu a2, a2, 12
+// 0x0104fd44: 0x104fd44: bne   t1, v0, 0x104fd8c addiu a2, a2, 12
 	ldloc 8
 	ldloc 6
 	ldloc.3
 	ldc.i4.s 12
 	add
 	stloc.3
-	bne.un L_104fd7c
+	bne.un L_104fd8c
 // --- basic block ---
-// 0x0104fd3c: 0x104fd3c: addiu v1, zero, 12
+// 0x0104fd4c: 0x104fd4c: addiu v1, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x0104fd40: 0x104fd40: mult  a1, v1
+// 0x0104fd50: 0x104fd50: mult  a1, v1
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 10
-// 0x0104fd44: 0x104fd44: addiu v0, zero, -1
+// 0x0104fd54: 0x104fd54: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0104fd48: 0x104fd48: mflo  lo
+// 0x0104fd58: 0x104fd58: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x0104fd4c: 0x104fd4c: addu  a1, a0, a1
+// 0x0104fd5c: 0x104fd5c: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x0104fd50: 0x104fd50: lw    a0, 4(a1)
+// 0x0104fd60: 0x104fd60: lw    a0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -2554,7 +2554,7 @@ L_104fd2c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0104fd54: 0x104fd54: sw    zero, 8(a1)
+// 0x0104fd64: 0x104fd64: sw    zero, 8(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -2563,14 +2563,14 @@ L_104fd2c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104fd58: 0x104fd58: sw    zero, 0(a1)
+// 0x0104fd68: 0x104fd68: sw    zero, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104fd5c: 0x104fd5c: sw    v0, 4(a1)
+// 0x0104fd6c: 0x104fd6c: sw    v0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -2579,24 +2579,24 @@ L_104fd2c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0104fd60: 0x104fd60: cibyl_sysc_arg 0x4
+// 0x0104fd70: 0x104fd70: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104fd64: 0x104fd64: cibyl_sysc 0x14b8
+// 0x0104fd74: 0x104fd74: cibyl_sysc 0x14b8
 	call void [WazeWP7]Syscalls::NOPH_TimerTask_cancel(int32)
-// 0x0104fd68: 0x104fd68: addu  v1, v0, zero
+// 0x0104fd78: 0x104fd78: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x0104fd6c: 0x104fd6c: cibyl_sysc_arg 0x4
+// 0x0104fd7c: 0x104fd7c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0104fd70: 0x104fd70: cibyl_sysc 0x14ce
+// 0x0104fd80: 0x104fd80: cibyl_sysc 0x14ce
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x0104fd74: 0x104fd74: j	 0x104fddc addu  a0, v0, zero
+// 0x0104fd84: 0x104fd84: j	 0x104fdec addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-	br L_104fddc
+	br L_104fdec
 // --- basic block ---
-L_104fd7c:
-// 0x0104fd7c: 0x104fd7c: lw    t0, 4(t0)
+L_104fd8c:
+// 0x0104fd8c: 0x104fd8c: lw    t0, 4(t0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -2605,48 +2605,48 @@ L_104fd7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104fd80: 0x104fd80: sll   zero, zero, 0
-// 0x0104fd84: 0x104fd84: bne   t0, v0, 0x104fdb4 addiu a1, a1, 1
+// 0x0104fd90: 0x104fd90: sll   zero, zero, 0
+// 0x0104fd94: 0x104fd94: bne   t0, v0, 0x104fdc4 addiu a1, a1, 1
 	ldloc 9
 	ldloc 6
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-	bne.un L_104fdb4
+	bne.un L_104fdc4
 // --- basic block ---
-// 0x0104fd8c: 0x104fd8c: addiu a1, a1, -1
+// 0x0104fd9c: 0x104fd9c: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x0104fd90: 0x104fd90: addiu a0, zero, 12
+// 0x0104fda0: 0x104fda0: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0104fd94: 0x104fd94: mult  a1, a0
+// 0x0104fda4: 0x104fda4: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 10
-// 0x0104fd98: 0x104fd98: addiu v0, zero, -1
+// 0x0104fda8: 0x104fda8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0104fd9c: 0x104fd9c: mflo  lo
+// 0x0104fdac: 0x104fdac: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x0104fda0: 0x104fda0: addu  v1, v1, a1
+// 0x0104fdb0: 0x104fdb0: addu  v1, v1, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-// 0x0104fda4: 0x104fda4: sw    v0, 0(v1)
+// 0x0104fdb4: 0x104fdb4: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0104fda8: 0x104fda8: sw    zero, 4(v1)
+// 0x0104fdb8: 0x104fdb8: sw    zero, 4(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2655,7 +2655,7 @@ L_104fd7c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0104fdac: 0x104fdac: j	 0x104fddc sw    v0, 8(v1)
+// 0x0104fdbc: 0x104fdbc: j	 0x104fdec sw    v0, 8(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2664,41 +2664,41 @@ L_104fd7c:
 	add
 	ldloc 6
 	stelem.i4
-	br L_104fddc
+	br L_104fdec
 // --- basic block ---
-L_104fdb4:
-// 0x0104fdb4: 0x104fdb4: bne   a1, a3, 0x104fd2c addu  t1, a0, a2
+L_104fdc4:
+// 0x0104fdc4: 0x104fdc4: bne   a1, a3, 0x104fd3c addu  t1, a0, a2
 	ldloc.2
 	ldloc 4
 	ldloc.1
 	ldloc.3
 	add
 	stloc 8
-	bne.un L_104fd2c
+	bne.un L_104fd3c
 // --- basic block ---
-// 0x0104fdbc: 0x104fdbc: lui   a1, 0x10000
+// 0x0104fdcc: 0x104fdcc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104fdc0: 0x104fdc0: lui   a3, 0x10000
+// 0x0104fdd0: 0x104fdd0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104fdc4: 0x104fdc4: addiu a1, a1, 3972
+// 0x0104fdd4: 0x104fdd4: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x0104fdc8: 0x104fdc8: addiu a3, a3, 3988
+// 0x0104fdd8: 0x104fdd8: addiu a3, a3, 3984
 	ldloc 4
-	ldc.i4 3988
+	ldc.i4 3984
 	add
 	stloc 4
-// 0x0104fdcc: 0x104fdcc: addiu a0, zero, 4
+// 0x0104fddc: 0x104fddc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104fdd0: 0x104fdd0: addiu a2, zero, 968
+// 0x0104fde0: 0x104fde0: addiu a2, zero, 968
 	ldc.i4 968
 	stloc.3
-// 0x0104fdd4: 0x104fdd4: jal   0x100449c sw    v0, 16(sp)
+// 0x0104fde4: 0x104fde4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2717,10 +2717,10 @@ L_104fdb4:
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_104fddc:
-// 0x0104fddc: 0x104fddc: lw    ra, 28(sp)
-// 0x0104fde0: 0x104fde0: sll   zero, zero, 0
-// 0x0104fde4: 0x104fde4: jr    ra addiu sp, sp, 32
+L_104fdec:
+// 0x0104fdec: 0x104fdec: lw    ra, 28(sp)
+// 0x0104fdf0: 0x104fdf0: sll   zero, zero, 0
+// 0x0104fdf4: 0x104fdf4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2732,7 +2732,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_main_set_seconds_timer_104fdec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_set_seconds_timer_104fdfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s2,int32 s1,int32 v1,int32 ra)
@@ -2776,12 +2776,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fdec: 0x104fdec: addiu sp, sp, -32
+// 0x0104fdfc: 0x104fdfc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0104fdf0: 0x104fdf0: sw    s2, 24(sp)
+// 0x0104fe00: 0x104fe00: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2790,16 +2790,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104fdf4: 0x104fdf4: lui   v0, 0x70000
+// 0x0104fe04: 0x104fe04: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0104fdf8: 0x104fdf8: addu  s2, a0, zero
+// 0x0104fe08: 0x104fe08: addu  s2, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0104fdfc: 0x104fdfc: lui   a0, 0x70000
+// 0x0104fe0c: 0x104fe0c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0104fe00: 0x104fe00: sw    s1, 20(sp)
+// 0x0104fe10: 0x104fe10: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2808,7 +2808,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104fe04: 0x104fe04: sw    s0, 16(sp)
+// 0x0104fe14: 0x104fe14: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2817,89 +2817,89 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104fe08: 0x104fe08: sw    ra, 28(sp)
-// 0x0104fe0c: 0x104fe0c: addu  s1, a1, zero
+// 0x0104fe18: 0x104fe18: sw    ra, 28(sp)
+// 0x0104fe1c: 0x104fe1c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0104fe10: 0x104fe10: addiu v0, v0, -632
+// 0x0104fe20: 0x104fe20: addiu v0, v0, -168
 	ldloc 5
-	ldc.i4 -632
+	ldc.i4 -168
 	add
 	stloc 5
-// 0x0104fe14: 0x104fe14: addiu a0, a0, -344
+// 0x0104fe24: 0x104fe24: addiu a0, a0, 120
 	ldloc.1
-	ldc.i4 -344
+	ldc.i4.s 120
 	add
 	stloc.1
-// 0x0104fe18: 0x104fe18: addu  s0, zero, zero
+// 0x0104fe28: 0x104fe28: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_104fe1c:
-// 0x0104fe1c: 0x104fe1c: lw    v1, 0(v0)
+L_104fe2c:
+// 0x0104fe2c: 0x104fe2c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0104fe20: 0x104fe20: sll   zero, zero, 0
-// 0x0104fe24: 0x104fe24: beq   v1, s1, 0x104fe80 sll   zero, zero, 0
+// 0x0104fe30: 0x104fe30: sll   zero, zero, 0
+// 0x0104fe34: 0x104fe34: beq   v1, s1, 0x104fe90 sll   zero, zero, 0
 	ldloc 10
 	ldloc 9
-	beq  L_104fe80
+	beq  L_104fe90
 // --- basic block ---
-// 0x0104fe2c: 0x104fe2c: bne   s0, zero, 0x104fe40 sll   zero, zero, 0
+// 0x0104fe3c: 0x104fe3c: bne   s0, zero, 0x104fe50 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_104fe40
+	brtrue L_104fe50
 // --- basic block ---
-// 0x0104fe34: 0x104fe34: bne   v1, zero, 0x104fe40 sll   zero, zero, 0
+// 0x0104fe44: 0x104fe44: bne   v1, zero, 0x104fe50 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_104fe40
+	brtrue L_104fe50
 // --- basic block ---
-// 0x0104fe3c: 0x104fe3c: addiu s0, v0, -4
+// 0x0104fe4c: 0x104fe4c: addiu s0, v0, -4
 	ldloc 5
 	ldc.i4.s -4
 	add
 	stloc 7
-L_104fe40:
-// 0x0104fe40: 0x104fe40: addiu v0, v0, 12
+L_104fe50:
+// 0x0104fe50: 0x104fe50: addiu v0, v0, 12
 	ldloc 5
 	ldc.i4.s 12
 	add
 	stloc 5
-// 0x0104fe44: 0x104fe44: bne   v0, a0, 0x104fe1c sll   zero, zero, 0
+// 0x0104fe54: 0x104fe54: bne   v0, a0, 0x104fe2c sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_104fe1c
+	bne.un L_104fe2c
 // --- basic block ---
-// 0x0104fe4c: 0x104fe4c: bne   s0, zero, 0x104fe74 addiu v0, s2, 1
+// 0x0104fe5c: 0x104fe5c: bne   s0, zero, 0x104fe84 addiu v0, s2, 1
 	ldloc 7
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 5
-	brtrue L_104fe74
+	brtrue L_104fe84
 // --- basic block ---
-// 0x0104fe54: 0x104fe54: lui   a1, 0x10000
+// 0x0104fe64: 0x104fe64: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0104fe58: 0x104fe58: lui   a3, 0x10000
+// 0x0104fe68: 0x104fe68: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0104fe5c: 0x104fe5c: addiu a1, a1, 3972
+// 0x0104fe6c: 0x104fe6c: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x0104fe60: 0x104fe60: addiu a3, a3, 4012
+// 0x0104fe70: 0x104fe70: addiu a3, a3, 4008
 	ldloc 4
-	ldc.i4 4012
+	ldc.i4 4008
 	add
 	stloc 4
-// 0x0104fe64: 0x104fe64: addiu a0, zero, 5
+// 0x0104fe74: 0x104fe74: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0104fe68: 0x104fe68: jal   0x100449c addiu a2, zero, 830
+// 0x0104fe78: 0x104fe78: jal   0x100449c addiu a2, zero, 830
 	ldc.i4 830
 	stloc.3
 	ldloc.0
@@ -2912,20 +2912,20 @@ L_104fe40:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0104fe70: 0x104fe70: addiu v0, s2, 1
+// 0x0104fe80: 0x104fe80: addiu v0, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 5
-L_104fe74:
-// 0x0104fe74: 0x104fe74: sw    s2, 0(s0)
+L_104fe84:
+// 0x0104fe84: 0x104fe84: sw    s2, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0104fe78: 0x104fe78: sw    s1, 4(s0)
+// 0x0104fe88: 0x104fe88: sw    s1, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2934,7 +2934,7 @@ L_104fe74:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104fe7c: 0x104fe7c: sw    v0, 8(s0)
+// 0x0104fe8c: 0x104fe8c: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2943,9 +2943,9 @@ L_104fe74:
 	add
 	ldloc 5
 	stelem.i4
-L_104fe80:
-// 0x0104fe80: 0x104fe80: lw    ra, 28(sp)
-// 0x0104fe84: 0x104fe84: lw    s2, 24(sp)
+L_104fe90:
+// 0x0104fe90: 0x104fe90: lw    ra, 28(sp)
+// 0x0104fe94: 0x104fe94: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2954,7 +2954,7 @@ L_104fe80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0104fe88: 0x104fe88: lw    s1, 20(sp)
+// 0x0104fe98: 0x104fe98: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2963,7 +2963,7 @@ L_104fe80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0104fe8c: 0x104fe8c: lw    s0, 16(sp)
+// 0x0104fe9c: 0x104fe9c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2972,7 +2972,7 @@ L_104fe80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0104fe90: 0x104fe90: jr    ra addiu sp, sp, 32
+// 0x0104fea0: 0x104fea0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2984,7 +2984,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s4,int32 s2,int32 s5,int32 s6,int32 s1,int32 s3,int32 s7,int32 s8,int32 ra,int32 hi,int32 lo)
@@ -3052,20 +3052,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0104fe98: 0x104fe98: lui   v0, 0x1050000
+// 0x0104fea8: 0x104fea8: lui   v0, 0x1050000
 	ldc.i4 17104896
 	stloc 5
-// 0x0104fe9c: 0x104fe9c: addiu sp, sp, -72
+// 0x0104feac: 0x104feac: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0104fea0: 0x104fea0: addiu v0, v0, 316
+// 0x0104feb0: 0x104feb0: addiu v0, v0, 332
 	ldloc 5
-	ldc.i4 316
+	ldc.i4 332
 	add
 	stloc 5
-// 0x0104fea4: 0x104fea4: sw    s3, 44(sp)
+// 0x0104feb4: 0x104feb4: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3074,7 +3074,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0104fea8: 0x104fea8: sw    s1, 36(sp)
+// 0x0104feb8: 0x104feb8: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3083,8 +3083,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0104feac: 0x104feac: sw    ra, 68(sp)
-// 0x0104feb0: 0x104feb0: sw    s8, 64(sp)
+// 0x0104febc: 0x104febc: sw    ra, 68(sp)
+// 0x0104fec0: 0x104fec0: sw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3093,7 +3093,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0104feb4: 0x104feb4: sw    s7, 60(sp)
+// 0x0104fec4: 0x104fec4: sw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3102,7 +3102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0104feb8: 0x104feb8: sw    s6, 56(sp)
+// 0x0104fec8: 0x104fec8: sw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3111,7 +3111,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0104febc: 0x104febc: sw    s5, 52(sp)
+// 0x0104fecc: 0x104fecc: sw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3120,7 +3120,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0104fec0: 0x104fec0: sw    s4, 48(sp)
+// 0x0104fed0: 0x104fed0: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3129,7 +3129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0104fec4: 0x104fec4: sw    s2, 40(sp)
+// 0x0104fed4: 0x104fed4: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3138,7 +3138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0104fec8: 0x104fec8: sw    s0, 32(sp)
+// 0x0104fed8: 0x104fed8: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3147,20 +3147,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0104fecc: 0x104fecc: addu  s1, a1, zero
+// 0x0104fedc: 0x104fedc: addu  s1, a1, zero
 	ldloc.2
 	stloc 13
-// 0x0104fed0: 0x104fed0: beq   a1, v0, 0x104feec addu  s3, a0, zero
+// 0x0104fee0: 0x104fee0: beq   a1, v0, 0x104fefc addu  s3, a0, zero
 	ldloc.2
 	ldloc 5
 	ldloc.1
 	stloc 14
-	beq  L_104feec
+	beq  L_104fefc
 // --- basic block ---
-// 0x0104fed8: 0x104fed8: addiu v0, zero, 1000
+// 0x0104fee8: 0x104fee8: addiu v0, zero, 1000
 	ldc.i4 1000
 	stloc 5
-// 0x0104fedc: 0x104fedc: div   a0, v0
+// 0x0104feec: 0x104feec: div   a0, v0
 	ldloc.1
 	ldloc 5
 	ldloc.1
@@ -3169,102 +3169,102 @@ __CIBYL_javamethod_begin:
 	stloc 19
 	rem
 	stloc 18
-// 0x0104fee0: 0x104fee0: mfhi  hi
+// 0x0104fef0: 0x104fef0: mfhi  hi
 	ldloc 18
 	stloc 5
-// 0x0104fee4: 0x104fee4: beq   v0, zero, 0x104ff0c lui   s5, 0x70000
+// 0x0104fef4: 0x104fef4: beq   v0, zero, 0x104ff1c lui   s5, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 11
-	brfalse L_104ff0c
+	brfalse L_104ff1c
 // --- basic block ---
-L_104feec:
-// 0x0104feec: 0x104feec: lui   s2, 0x70000
+L_104fefc:
+// 0x0104fefc: 0x104fefc: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0104fef0: 0x104fef0: addiu s2, s2, -1976
+// 0x0104ff00: 0x104ff00: addiu s2, s2, -1512
 	ldloc 10
-	ldc.i4 -1976
+	ldc.i4 -1512
 	add
 	stloc 10
-// 0x0104fef4: 0x104fef4: addu  v1, s2, zero
+// 0x0104ff04: 0x104ff04: addu  v1, s2, zero
 	ldloc 10
 	stloc 7
-// 0x0104fef8: 0x104fef8: addu  s0, zero, zero
+// 0x0104ff08: 0x104ff08: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0104fefc: 0x104fefc: addu  s6, zero, zero
+// 0x0104ff0c: 0x104ff0c: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x0104ff00: 0x104ff00: addu  v0, zero, zero
+// 0x0104ff10: 0x104ff10: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0104ff04: 0x104ff04: j	 0x104ff70 addiu a1, zero, 24
+// 0x0104ff14: 0x104ff14: j	 0x104ff80 addiu a1, zero, 24
 	ldc.i4.s 24
 	stloc.2
-	br L_104ff70
+	br L_104ff80
 // --- basic block ---
-L_104ff0c:
-// 0x0104ff0c: 0x104ff0c: lui   s0, 0x70000
+L_104ff1c:
+// 0x0104ff1c: 0x104ff1c: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0104ff10: 0x104ff10: lui   s4, 0x10000
+// 0x0104ff20: 0x104ff20: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0104ff14: 0x104ff14: lui   s2, 0x10000
+// 0x0104ff24: 0x104ff24: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0104ff18: 0x104ff18: addiu s0, s0, -1976
+// 0x0104ff28: 0x104ff28: addiu s0, s0, -1512
 	ldloc 8
-	ldc.i4 -1976
+	ldc.i4 -1512
 	add
 	stloc 8
-// 0x0104ff1c: 0x104ff1c: addiu s5, s5, -1688
+// 0x0104ff2c: 0x104ff2c: addiu s5, s5, -1224
 	ldloc 11
-	ldc.i4 -1688
+	ldc.i4 -1224
 	add
 	stloc 11
-// 0x0104ff20: 0x104ff20: addiu s4, s4, 3972
+// 0x0104ff30: 0x104ff30: addiu s4, s4, 3968
 	ldloc 9
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc 9
-// 0x0104ff24: 0x104ff24: addiu s2, s2, 4036
+// 0x0104ff34: 0x104ff34: addiu s2, s2, 4032
 	ldloc 10
-	ldc.i4 4036
+	ldc.i4 4032
 	add
 	stloc 10
-L_104ff28:
-// 0x0104ff28: 0x104ff28: lw    v0, 0(s0)
+L_104ff38:
+// 0x0104ff38: 0x104ff38: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0104ff2c: 0x104ff2c: sll   zero, zero, 0
-// 0x0104ff30: 0x104ff30: bne   v0, s1, 0x104ff50 addiu s0, s0, 12
+// 0x0104ff3c: 0x104ff3c: sll   zero, zero, 0
+// 0x0104ff40: 0x104ff40: bne   v0, s1, 0x104ff60 addiu s0, s0, 12
 	ldloc 5
 	ldloc 13
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 8
-	bne.un L_104ff50
+	bne.un L_104ff60
 // --- basic block ---
-// 0x0104ff38: 0x104ff38: addiu a0, zero, 4
+// 0x0104ff48: 0x104ff48: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104ff3c: 0x104ff3c: addu  a1, s4, zero
+// 0x0104ff4c: 0x104ff4c: addu  a1, s4, zero
 	ldloc 9
 	stloc.2
-// 0x0104ff40: 0x104ff40: addiu a2, zero, 889
+// 0x0104ff50: 0x104ff50: addiu a2, zero, 889
 	ldc.i4 889
 	stloc.3
-// 0x0104ff44: 0x104ff44: addu  a3, s2, zero
+// 0x0104ff54: 0x104ff54: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x0104ff48: 0x104ff48: jal   0x100449c sw    s1, 16(sp)
+// 0x0104ff58: 0x104ff58: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3283,15 +3283,15 @@ L_104ff28:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_104ff50:
-// 0x0104ff50: 0x104ff50: bne   s0, s5, 0x104ff28 addiu a0, zero, 1000
+L_104ff60:
+// 0x0104ff60: 0x104ff60: bne   s0, s5, 0x104ff38 addiu a0, zero, 1000
 	ldloc 8
 	ldloc 11
 	ldc.i4 1000
 	stloc.1
-	bne.un L_104ff28
+	bne.un L_104ff38
 // --- basic block ---
-// 0x0104ff58: 0x104ff58: div   s3, a0
+// 0x0104ff68: 0x104ff68: div   s3, a0
 	ldloc 14
 	ldloc.1
 	ldloc 14
@@ -3300,10 +3300,10 @@ L_104ff50:
 	stloc 19
 	rem
 	stloc 18
-// 0x0104ff5c: 0x104ff5c: mflo  lo
+// 0x0104ff6c: 0x104ff6c: mflo  lo
 	ldloc 19
 	stloc.1
-// 0x0104ff60: 0x104ff60: jal   0x104fdec addu  a1, s1, zero
+// 0x0104ff70: 0x104ff70: jal   0x104fdfc addu  a1, s1, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -3311,112 +3311,112 @@ L_104ff50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_seconds_timer_104fdec(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_seconds_timer_104fdfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104ff68: 0x104ff68: j	 0x10500e4 sll   zero, zero, 0
-	br L_10500e4
+// 0x0104ff78: 0x104ff78: j	 0x10500f4 sll   zero, zero, 0
+	br L_10500f4
 // --- basic block ---
-L_104ff70:
-// 0x0104ff70: 0x104ff70: lw    a0, 0(v1)
+L_104ff80:
+// 0x0104ff80: 0x104ff80: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0104ff74: 0x104ff74: sll   zero, zero, 0
-// 0x0104ff78: 0x104ff78: beq   a0, s1, 0x10500e4 sll   zero, zero, 0
+// 0x0104ff84: 0x104ff84: sll   zero, zero, 0
+// 0x0104ff88: 0x104ff88: beq   a0, s1, 0x10500f4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 13
-	beq  L_10500e4
+	beq  L_10500f4
 // --- basic block ---
-// 0x0104ff80: 0x104ff80: bne   s0, zero, 0x104ff98 sll   zero, zero, 0
+// 0x0104ff90: 0x104ff90: bne   s0, zero, 0x104ffa8 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_104ff98
+	brtrue L_104ffa8
 // --- basic block ---
-// 0x0104ff88: 0x104ff88: bne   a0, zero, 0x104ff98 sll   zero, zero, 0
+// 0x0104ff98: 0x104ff98: bne   a0, zero, 0x104ffa8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_104ff98
+	brtrue L_104ffa8
 // --- basic block ---
-// 0x0104ff90: 0x104ff90: addu  s0, v1, zero
+// 0x0104ffa0: 0x104ffa0: addu  s0, v1, zero
 	ldloc 7
 	stloc 8
-// 0x0104ff94: 0x104ff94: addu  s6, v0, zero
+// 0x0104ffa4: 0x104ffa4: addu  s6, v0, zero
 	ldloc 5
 	stloc 12
-L_104ff98:
-// 0x0104ff98: 0x104ff98: addiu v0, v0, 1
+L_104ffa8:
+// 0x0104ffa8: 0x104ffa8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0104ff9c: 0x104ff9c: bne   v0, a1, 0x104ff70 addiu v1, v1, 12
+// 0x0104ffac: 0x104ffac: bne   v0, a1, 0x104ff80 addiu v1, v1, 12
 	ldloc 5
 	ldloc.2
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 7
-	bne.un L_104ff70
+	bne.un L_104ff80
 // --- basic block ---
-// 0x0104ffa4: 0x104ffa4: bne   s0, zero, 0x1050020 lui   v0, 0x70000
+// 0x0104ffb4: 0x104ffb4: bne   s0, zero, 0x1050030 lui   v0, 0x70000
 	ldloc 8
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1050020
+	brtrue L_1050030
 // --- basic block ---
-// 0x0104ffac: 0x104ffac: lui   v0, 0x10000
+// 0x0104ffbc: 0x104ffbc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0104ffb0: 0x104ffb0: lui   s8, 0x10000
+// 0x0104ffc0: 0x104ffc0: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x0104ffb4: 0x104ffb4: addiu v0, v0, 3972
+// 0x0104ffc4: 0x104ffc4: addiu v0, v0, 3968
 	ldloc 5
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc 5
-// 0x0104ffb8: 0x104ffb8: addiu s8, s8, 4140
+// 0x0104ffc8: 0x104ffc8: addiu s8, s8, 4136
 	ldloc 16
-	ldc.i4 4140
+	ldc.i4 4136
 	add
 	stloc 16
-// 0x0104ffbc: 0x104ffbc: addu  s5, s2, zero
+// 0x0104ffcc: 0x104ffcc: addu  s5, s2, zero
 	ldloc 10
 	stloc 11
-// 0x0104ffc0: 0x104ffc0: addu  s4, zero, zero
+// 0x0104ffd0: 0x104ffd0: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0104ffc4: 0x104ffc4: addiu s7, zero, 24
+// 0x0104ffd4: 0x104ffd4: addiu s7, zero, 24
 	ldc.i4.s 24
 	stloc 15
-L_104ffc8:
-// 0x0104ffc8: 0x104ffc8: lw    v1, 0(s5)
+L_104ffd8:
+// 0x0104ffd8: 0x104ffd8: lw    v1, 0(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0104ffcc: 0x104ffcc: addiu a0, zero, 4
+// 0x0104ffdc: 0x104ffdc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0104ffd0: 0x104ffd0: addu  a1, v0, zero
+// 0x0104ffe0: 0x104ffe0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0104ffd4: 0x104ffd4: addiu a2, zero, 915
+// 0x0104ffe4: 0x104ffe4: addiu a2, zero, 915
 	ldc.i4 915
 	stloc.3
-// 0x0104ffd8: 0x104ffd8: beq   v1, zero, 0x104fff4 addu  a3, s8, zero
+// 0x0104ffe8: 0x104ffe8: beq   v1, zero, 0x1050004 addu  a3, s8, zero
 	ldloc 7
 	ldloc 16
 	stloc 4
-	brfalse L_104fff4
+	brfalse L_1050004
 // --- basic block ---
-// 0x0104ffe0: 0x104ffe0: sw    v0, 24(sp)
+// 0x0104fff0: 0x104fff0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3425,7 +3425,7 @@ L_104ffc8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0104ffe4: 0x104ffe4: sw    v1, 20(sp)
+// 0x0104fff4: 0x104fff4: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3434,7 +3434,7 @@ L_104ffc8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0104ffe8: 0x104ffe8: jal   0x100449c sw    s4, 16(sp)
+// 0x0104fff8: 0x104fff8: jal   0x100449c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3453,7 +3453,7 @@ L_104ffc8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0104fff0: 0x104fff0: lw    v0, 24(sp)
+// 0x01050000: 0x1050000: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3462,41 +3462,41 @@ L_104ffc8:
 	add
 	ldelem.i4
 	stloc 5
-L_104fff4:
-// 0x0104fff4: 0x104fff4: addiu s4, s4, 1
+L_1050004:
+// 0x01050004: 0x1050004: addiu s4, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0104fff8: 0x104fff8: bne   s4, s7, 0x104ffc8 addiu s5, s5, 12
+// 0x01050008: 0x1050008: bne   s4, s7, 0x104ffd8 addiu s5, s5, 12
 	ldloc 9
 	ldloc 15
 	ldloc 11
 	ldc.i4.s 12
 	add
 	stloc 11
-	bne.un L_104ffc8
+	bne.un L_104ffd8
 // --- basic block ---
-// 0x01050000: 0x1050000: lui   a1, 0x10000
+// 0x01050010: 0x1050010: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01050004: 0x1050004: lui   a3, 0x10000
+// 0x01050014: 0x1050014: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050008: 0x1050008: addiu a1, a1, 3972
+// 0x01050018: 0x1050018: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x0105000c: 0x105000c: addiu a3, a3, 4012
+// 0x0105001c: 0x105001c: addiu a3, a3, 4008
 	ldloc 4
-	ldc.i4 4012
+	ldc.i4 4008
 	add
 	stloc 4
-// 0x01050010: 0x1050010: addiu a0, zero, 5
+// 0x01050020: 0x1050020: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01050014: 0x1050014: jal   0x100449c addiu a2, zero, 918
+// 0x01050024: 0x1050024: jal   0x100449c addiu a2, zero, 918
 	ldc.i4 918
 	stloc.3
 	ldloc.0
@@ -3509,142 +3509,142 @@ L_104fff4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105001c: 0x105001c: lui   v0, 0x70000
+// 0x0105002c: 0x105002c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1050020:
-// 0x01050020: 0x1050020: lw    v1, -2896(v0)
+L_1050030:
+// 0x01050030: 0x1050030: lw    v1, -2432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -724
+	ldc.i4 -608
 	add
 	ldelem.i4
 	stloc 7
-// 0x01050024: 0x1050024: addiu a0, zero, 10000
+// 0x01050034: 0x1050034: addiu a0, zero, 10000
 	ldc.i4 10000
 	stloc.1
-// 0x01050028: 0x1050028: addiu v1, v1, 1
+// 0x01050038: 0x1050038: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0105002c: 0x105002c: bne   v1, a0, 0x105003c sw    v1, -2896(v0)
+// 0x0105003c: 0x105003c: bne   v1, a0, 0x105004c sw    v1, -2432(v0)
 	ldloc 7
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -724
+	ldc.i4 -608
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_105003c
+	bne.un L_105004c
 // --- basic block ---
-// 0x01050034: 0x1050034: addiu v1, zero, 1
+// 0x01050044: 0x1050044: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01050038: 0x1050038: sw    v1, -2896(v0)
+// 0x01050048: 0x1050048: sw    v1, -2432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -724
+	ldc.i4 -608
 	add
 	ldloc 7
 	stelem.i4
-L_105003c:
-// 0x0105003c: 0x105003c: lui   v0, 0x70000
+L_105004c:
+// 0x0105004c: 0x105004c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050040: 0x1050040: lw    v0, -2896(v0)
+// 0x01050050: 0x1050050: lw    v0, -2432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -724
+	ldc.i4 -608
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050044: 0x1050044: addiu v1, zero, 1
+// 0x01050054: 0x1050054: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01050048: 0x1050048: sll   v0, v0, 16
+// 0x01050058: 0x1050058: sll   v0, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	shl
 	stloc 5
-// 0x0105004c: 0x105004c: or    s6, s6, v0
+// 0x0105005c: 0x105005c: or    s6, s6, v0
 	ldloc 12
 	ldloc 5
 	or
 	stloc 12
-// 0x01050050: 0x1050050: cibyl_sysc_arg 0x16
+// 0x01050060: 0x1050060: cibyl_sysc_arg 0x16
 	ldloc 12
-// 0x01050054: 0x1050054: cibyl_sysc_arg 0x13
+// 0x01050064: 0x1050064: cibyl_sysc_arg 0x13
 	ldloc 14
-// 0x01050058: 0x1050058: cibyl_sysc_arg 0x3
+// 0x01050068: 0x1050068: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0105005c: 0x105005c: cibyl_sysc 0x14da
+// 0x0105006c: 0x105006c: cibyl_sysc 0x14da
 	call int32 [WazeWP7]Syscalls::NOPH_RimTimerMgr_schedule(int32,int32,int32)
 	stloc 5
-// 0x01050060: 0x1050060: addu  s3, v0, zero
+// 0x01050070: 0x1050070: addu  s3, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01050064: 0x1050064: bne   s3, zero, 0x10500d4 lui   v0, 0x70000
+// 0x01050074: 0x1050074: bne   s3, zero, 0x10500e4 lui   v0, 0x70000
 	ldloc 14
 	ldc.i4 458752
 	stloc 5
-	brtrue L_10500d4
+	brtrue L_10500e4
 // --- basic block ---
-// 0x0105006c: 0x105006c: lui   s7, 0x10000
+// 0x0105007c: 0x105007c: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 15
-// 0x01050070: 0x1050070: lui   s6, 0x10000
+// 0x01050080: 0x1050080: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x01050074: 0x1050074: addiu s7, s7, 3972
+// 0x01050084: 0x1050084: addiu s7, s7, 3968
 	ldloc 15
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc 15
-// 0x01050078: 0x1050078: addiu s6, s6, 4140
+// 0x01050088: 0x1050088: addiu s6, s6, 4136
 	ldloc 12
-	ldc.i4 4140
+	ldc.i4 4136
 	add
 	stloc 12
-// 0x0105007c: 0x105007c: addu  s4, zero, zero
+// 0x0105008c: 0x105008c: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01050080: 0x1050080: addiu s5, zero, 24
+// 0x01050090: 0x1050090: addiu s5, zero, 24
 	ldc.i4.s 24
 	stloc 11
-L_1050084:
-// 0x01050084: 0x1050084: lw    v0, 0(s2)
+L_1050094:
+// 0x01050094: 0x1050094: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01050088: 0x1050088: addiu a0, zero, 4
+// 0x01050098: 0x1050098: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105008c: 0x105008c: addu  a1, s7, zero
+// 0x0105009c: 0x105009c: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x01050090: 0x1050090: addiu a2, zero, 930
+// 0x010500a0: 0x10500a0: addiu a2, zero, 930
 	ldc.i4 930
 	stloc.3
-// 0x01050094: 0x1050094: beq   v0, zero, 0x10500a8 addu  a3, s6, zero
+// 0x010500a4: 0x10500a4: beq   v0, zero, 0x10500b8 addu  a3, s6, zero
 	ldloc 5
 	ldloc 12
 	stloc 4
-	brfalse L_10500a8
+	brfalse L_10500b8
 // --- basic block ---
-// 0x0105009c: 0x105009c: sw    v0, 20(sp)
+// 0x010500ac: 0x10500ac: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3653,7 +3653,7 @@ L_1050084:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010500a0: 0x10500a0: jal   0x100449c sw    s4, 16(sp)
+// 0x010500b0: 0x10500b0: jal   0x100449c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3672,41 +3672,41 @@ L_1050084:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10500a8:
-// 0x010500a8: 0x10500a8: addiu s4, s4, 1
+L_10500b8:
+// 0x010500b8: 0x10500b8: addiu s4, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010500ac: 0x10500ac: bne   s4, s5, 0x1050084 addiu s2, s2, 12
+// 0x010500bc: 0x10500bc: bne   s4, s5, 0x1050094 addiu s2, s2, 12
 	ldloc 9
 	ldloc 11
 	ldloc 10
 	ldc.i4.s 12
 	add
 	stloc 10
-	bne.un L_1050084
+	bne.un L_1050094
 // --- basic block ---
-// 0x010500b4: 0x10500b4: lui   a1, 0x10000
+// 0x010500c4: 0x10500c4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010500b8: 0x10500b8: lui   a3, 0x10000
+// 0x010500c8: 0x10500c8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010500bc: 0x10500bc: addiu a1, a1, 3972
+// 0x010500cc: 0x10500cc: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x010500c0: 0x10500c0: addiu a3, a3, 4160
+// 0x010500d0: 0x10500d0: addiu a3, a3, 4156
 	ldloc 4
-	ldc.i4 4160
+	ldc.i4 4156
 	add
 	stloc 4
-// 0x010500c4: 0x10500c4: addiu a0, zero, 5
+// 0x010500d4: 0x10500d4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010500c8: 0x10500c8: jal   0x100449c addiu a2, zero, 934
+// 0x010500d8: 0x10500d8: jal   0x100449c addiu a2, zero, 934
 	ldc.i4 934
 	stloc.3
 	ldloc.0
@@ -3719,27 +3719,27 @@ L_10500a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010500d0: 0x10500d0: lui   v0, 0x70000
+// 0x010500e0: 0x10500e0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_10500d4:
-// 0x010500d4: 0x10500d4: lw    v0, -2896(v0)
+L_10500e4:
+// 0x010500e4: 0x10500e4: lw    v0, -2432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -724
+	ldc.i4 -608
 	add
 	ldelem.i4
 	stloc 5
-// 0x010500d8: 0x10500d8: sw    s1, 0(s0)
+// 0x010500e8: 0x10500e8: sw    s1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-// 0x010500dc: 0x10500dc: sw    v0, 8(s0)
+// 0x010500ec: 0x10500ec: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3748,7 +3748,7 @@ L_10500d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010500e0: 0x10500e0: sw    s3, 4(s0)
+// 0x010500f0: 0x10500f0: sw    s3, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3757,9 +3757,9 @@ L_10500d4:
 	add
 	ldloc 14
 	stelem.i4
-L_10500e4:
-// 0x010500e4: 0x10500e4: lw    ra, 68(sp)
-// 0x010500e8: 0x10500e8: lw    s8, 64(sp)
+L_10500f4:
+// 0x010500f4: 0x10500f4: lw    ra, 68(sp)
+// 0x010500f8: 0x10500f8: lw    s8, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3768,7 +3768,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010500ec: 0x10500ec: lw    s7, 60(sp)
+// 0x010500fc: 0x10500fc: lw    s7, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3777,7 +3777,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010500f0: 0x10500f0: lw    s6, 56(sp)
+// 0x01050100: 0x1050100: lw    s6, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010500f4: 0x10500f4: lw    s5, 52(sp)
+// 0x01050104: 0x1050104: lw    s5, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3795,7 +3795,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010500f8: 0x10500f8: lw    s4, 48(sp)
+// 0x01050108: 0x1050108: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3804,7 +3804,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010500fc: 0x10500fc: lw    s3, 44(sp)
+// 0x0105010c: 0x105010c: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3813,7 +3813,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01050100: 0x1050100: lw    s2, 40(sp)
+// 0x01050110: 0x1050110: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3822,7 +3822,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01050104: 0x1050104: lw    s1, 36(sp)
+// 0x01050114: 0x1050114: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3831,7 +3831,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01050108: 0x1050108: lw    s0, 32(sp)
+// 0x01050118: 0x1050118: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3840,7 +3840,7 @@ L_10500e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105010c: 0x105010c: jr    ra addiu sp, sp, 72
+// 0x0105011c: 0x105011c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3852,7 +3852,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_register_seconds_timer_mgr_1050114(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_register_seconds_timer_mgr_1050124(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3887,21 +3887,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050114: 0x1050114: lui   a1, 0x1050000
+// 0x01050124: 0x1050124: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x01050118: 0x1050118: addiu sp, sp, -24
+// 0x01050128: 0x1050128: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105011c: 0x105011c: addiu a1, a1, 316
+// 0x0105012c: 0x105012c: addiu a1, a1, 332
 	ldloc.2
-	ldc.i4 316
+	ldc.i4 332
 	add
 	stloc.2
-// 0x01050120: 0x1050120: sw    ra, 20(sp)
-// 0x01050124: 0x1050124: jal   0x104fe98 addiu a0, zero, 1000
+// 0x01050130: 0x1050130: sw    ra, 20(sp)
+// 0x01050134: 0x1050134: jal   0x104fea8 addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
 	ldloc.0
@@ -3909,14 +3909,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0105012c: 0x105012c: lw    ra, 20(sp)
-// 0x01050130: 0x1050130: sll   zero, zero, 0
-// 0x01050134: 0x1050134: jr    ra addiu sp, sp, 24
+// 0x0105013c: 0x105013c: lw    ra, 20(sp)
+// 0x01050140: 0x1050140: sll   zero, zero, 0
+// 0x01050144: 0x1050144: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3928,7 +3928,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_main_seconds_timer_mgr_105013c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_seconds_timer_mgr_105014c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 s2,int32 s3,int32 s4,int32 s1,int32 ra)
@@ -3978,12 +3978,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105013c: 0x105013c: addiu sp, sp, -40
+// 0x0105014c: 0x105014c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01050140: 0x1050140: sw    s4, 32(sp)
+// 0x01050150: 0x1050150: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3992,7 +3992,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01050144: 0x1050144: sw    s3, 28(sp)
+// 0x01050154: 0x1050154: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4001,7 +4001,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01050148: 0x1050148: sw    s2, 24(sp)
+// 0x01050158: 0x1050158: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4010,7 +4010,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105014c: 0x105014c: sw    s0, 16(sp)
+// 0x0105015c: 0x105015c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4019,19 +4019,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01050150: 0x1050150: lui   s4, 0x70000
+// 0x01050160: 0x1050160: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x01050154: 0x1050154: lui   s0, 0x70000
+// 0x01050164: 0x1050164: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01050158: 0x1050158: lui   s3, 0x10000
+// 0x01050168: 0x1050168: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0105015c: 0x105015c: lui   s2, 0x10000
+// 0x0105016c: 0x105016c: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01050160: 0x1050160: sw    s1, 20(sp)
+// 0x01050170: 0x1050170: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4040,44 +4040,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01050164: 0x1050164: sw    ra, 36(sp)
-// 0x01050168: 0x1050168: addiu s0, s0, -632
+// 0x01050174: 0x1050174: sw    ra, 36(sp)
+// 0x01050178: 0x1050178: addiu s0, s0, -168
 	ldloc 6
-	ldc.i4 -632
+	ldc.i4 -168
 	add
 	stloc 6
-// 0x0105016c: 0x105016c: addiu s4, s4, -344
+// 0x0105017c: 0x105017c: addiu s4, s4, 120
 	ldloc 11
-	ldc.i4 -344
+	ldc.i4.s 120
 	add
 	stloc 11
-// 0x01050170: 0x1050170: addiu s3, s3, 3972
+// 0x01050180: 0x1050180: addiu s3, s3, 3968
 	ldloc 10
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc 10
-// 0x01050174: 0x1050174: addiu s2, s2, 4188
+// 0x01050184: 0x1050184: addiu s2, s2, 4184
 	ldloc 9
-	ldc.i4 4188
+	ldc.i4 4184
 	add
 	stloc 9
-// 0x01050178: 0x1050178: lui   s1, 0x70000
+// 0x01050188: 0x1050188: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 12
-L_105017c:
-// 0x0105017c: 0x105017c: lw    v1, 0(s0)
+L_105018c:
+// 0x0105018c: 0x105018c: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01050180: 0x1050180: sll   zero, zero, 0
-// 0x01050184: 0x1050184: beq   v1, zero, 0x10501d0 sll   zero, zero, 0
+// 0x01050190: 0x1050190: sll   zero, zero, 0
+// 0x01050194: 0x1050194: beq   v1, zero, 0x10501e0 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10501d0
+	brfalse L_10501e0
 // --- basic block ---
-// 0x0105018c: 0x105018c: lw    v0, 4(s0)
+// 0x0105019c: 0x105019c: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4086,13 +4086,13 @@ L_105017c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01050190: 0x1050190: sll   zero, zero, 0
-// 0x01050194: 0x1050194: addiu v0, v0, -1
+// 0x010501a0: 0x10501a0: sll   zero, zero, 0
+// 0x010501a4: 0x10501a4: addiu v0, v0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01050198: 0x1050198: bne   v0, zero, 0x10501b8 sw    v0, 4(s0)
+// 0x010501a8: 0x10501a8: bne   v0, zero, 0x10501c8 sw    v0, 4(s0)
 	ldloc 7
 	ldloc 5
 	ldloc 6
@@ -4102,9 +4102,9 @@ L_105017c:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_10501b8
+	brtrue L_10501c8
 // --- basic block ---
-// 0x010501a0: 0x10501a0: lw    v0, -4(s0)
+// 0x010501b0: 0x10501b0: lw    v0, -4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4113,16 +4113,16 @@ L_105017c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010501a4: 0x10501a4: sw    v1, -3908(s1)
+// 0x010501b4: 0x10501b4: sw    v1, -3444(s1)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 -977
+	ldc.i4 -861
 	add
 	ldloc 8
 	stelem.i4
-// 0x010501a8: 0x10501a8: jalr  v1 sw    v0, 4(s0)
+// 0x010501b8: 0x10501b8: jalr  v1 sw    v0, 4(s0)
 	ldloc 8
 	ldloc 5
 	ldloc 6
@@ -4142,28 +4142,28 @@ L_105017c:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010501b0: 0x10501b0: j	 0x10501d4 addiu s0, s0, 12
+// 0x010501c0: 0x10501c0: j	 0x10501e4 addiu s0, s0, 12
 	ldloc 6
 	ldc.i4.s 12
 	add
 	stloc 6
-	br L_10501d4
+	br L_10501e4
 // --- basic block ---
-L_10501b8:
-// 0x010501b8: 0x10501b8: bgez  v0, 0x10501d0 addiu a0, zero, 4
+L_10501c8:
+// 0x010501c8: 0x10501c8: bgez  v0, 0x10501e0 addiu a0, zero, 4
 	ldloc 7
 	ldc.i4.4
 	stloc.1
 	ldc.i4.s 0
-	bge L_10501d0
+	bge L_10501e0
 // --- basic block ---
-// 0x010501c0: 0x10501c0: addu  a1, s3, zero
+// 0x010501d0: 0x10501d0: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x010501c4: 0x10501c4: addiu a2, zero, 802
+// 0x010501d4: 0x10501d4: addiu a2, zero, 802
 	ldc.i4 802
 	stloc.3
-// 0x010501c8: 0x10501c8: jal   0x100449c addu  a3, s2, zero
+// 0x010501d8: 0x10501d8: jal   0x100449c addu  a3, s2, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -4176,20 +4176,20 @@ L_10501b8:
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_10501d0:
-// 0x010501d0: 0x10501d0: addiu s0, s0, 12
+L_10501e0:
+// 0x010501e0: 0x10501e0: addiu s0, s0, 12
 	ldloc 6
 	ldc.i4.s 12
 	add
 	stloc 6
-L_10501d4:
-// 0x010501d4: 0x10501d4: bne   s0, s4, 0x105017c sll   zero, zero, 0
+L_10501e4:
+// 0x010501e4: 0x10501e4: bne   s0, s4, 0x105018c sll   zero, zero, 0
 	ldloc 6
 	ldloc 11
-	bne.un L_105017c
+	bne.un L_105018c
 // --- basic block ---
-// 0x010501dc: 0x10501dc: lw    ra, 36(sp)
-// 0x010501e0: 0x10501e0: lw    s4, 32(sp)
+// 0x010501ec: 0x10501ec: lw    ra, 36(sp)
+// 0x010501f0: 0x10501f0: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4198,7 +4198,7 @@ L_10501d4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010501e4: 0x10501e4: lw    s3, 28(sp)
+// 0x010501f4: 0x10501f4: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4207,7 +4207,7 @@ L_10501d4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010501e8: 0x10501e8: lw    s2, 24(sp)
+// 0x010501f8: 0x10501f8: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ L_10501d4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010501ec: 0x10501ec: lw    s1, 20(sp)
+// 0x010501fc: 0x10501fc: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4225,7 +4225,7 @@ L_10501d4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010501f0: 0x10501f0: lw    s0, 16(sp)
+// 0x01050200: 0x1050200: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4234,7 +4234,7 @@ L_10501d4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010501f4: 0x10501f4: jr    ra addiu sp, sp, 40
+// 0x01050204: 0x1050204: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4246,7 +4246,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 battery_status_print_10501fc(int32,int32,int32,int32,int32)
+.method public static int32 battery_status_print_105020c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -4287,17 +4287,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010501fc: 0x10501fc: addiu sp, sp, -40
+// 0x0105020c: 0x105020c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01050200: 0x1050200: slti  v0, a0, 15
+// 0x01050210: 0x1050210: slti  v0, a0, 15
 	ldloc.1
 	ldc.i4.s 15
 	clt
 	stloc 5
-// 0x01050204: 0x1050204: sw    s0, 28(sp)
+// 0x01050214: 0x1050214: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4306,8 +4306,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01050208: 0x1050208: sw    ra, 36(sp)
-// 0x0105020c: 0x105020c: sw    s1, 32(sp)
+// 0x01050218: 0x1050218: sw    ra, 36(sp)
+// 0x0105021c: 0x105021c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4316,16 +4316,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01050210: 0x1050210: beq   v0, zero, 0x1050254 addu  s0, a0, zero
+// 0x01050220: 0x1050220: beq   v0, zero, 0x1050264 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_1050254
+	brfalse L_1050264
 // --- basic block ---
-// 0x01050218: 0x1050218: lui   s1, 0x0
+// 0x01050228: 0x1050228: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0105021c: 0x105021c: lw    v0, 13848(s1)
+// 0x0105022c: 0x105022c: lw    v0, 13848(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4334,43 +4334,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050220: 0x1050220: sll   zero, zero, 0
-// 0x01050224: 0x1050224: addiu v0, v0, -2
+// 0x01050230: 0x1050230: sll   zero, zero, 0
+// 0x01050234: 0x1050234: addiu v0, v0, -2
 	ldloc 5
 	ldc.i4.s -2
 	add
 	stloc 5
-// 0x01050228: 0x1050228: slt   v0, a0, v0
+// 0x01050238: 0x1050238: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x0105022c: 0x105022c: beq   v0, zero, 0x1050254 lui   a1, 0x10000
+// 0x0105023c: 0x105023c: beq   v0, zero, 0x1050264 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1050254
+	brfalse L_1050264
 // --- basic block ---
-// 0x01050234: 0x1050234: lui   a3, 0x10000
+// 0x01050244: 0x1050244: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050238: 0x1050238: addiu a1, a1, 3972
+// 0x01050248: 0x1050248: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x0105023c: 0x105023c: addiu a3, a3, 4264
+// 0x0105024c: 0x105024c: addiu a3, a3, 4260
 	ldloc 4
-	ldc.i4 4264
+	ldc.i4 4260
 	add
 	stloc 4
-// 0x01050240: 0x1050240: addiu a0, zero, 4
+// 0x01050250: 0x1050250: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050244: 0x1050244: addiu a2, zero, 386
+// 0x01050254: 0x1050254: addiu a2, zero, 386
 	ldc.i4 386
 	stloc.3
-// 0x01050248: 0x1050248: jal   0x100449c sw    s0, 16(sp)
+// 0x01050258: 0x1050258: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4389,7 +4389,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01050250: 0x1050250: sw    s0, 13848(s1)
+// 0x01050260: 0x1050260: sw    s0, 13848(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4398,9 +4398,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-L_1050254:
-// 0x01050254: 0x1050254: lw    ra, 36(sp)
-// 0x01050258: 0x1050258: lw    s1, 32(sp)
+L_1050264:
+// 0x01050264: 0x1050264: lw    ra, 36(sp)
+// 0x01050268: 0x1050268: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4409,7 +4409,7 @@ L_1050254:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105025c: 0x105025c: lw    s0, 28(sp)
+// 0x0105026c: 0x105026c: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4418,7 +4418,7 @@ L_1050254:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01050260: 0x1050260: jr    ra addiu sp, sp, 40
+// 0x01050270: 0x1050270: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4430,7 +4430,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_add_canvas_10502f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_add_canvas_1050300(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4465,26 +4465,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010502f0: 0x10502f0: addiu sp, sp, -24
+// 0x01050300: 0x1050300: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010502f4: 0x10502f4: sw    ra, 20(sp)
-// 0x010502f8: 0x10502f8: jal   0x104e22c sll   zero, zero, 0
+// 0x01050304: 0x1050304: sw    ra, 20(sp)
+// 0x01050308: 0x1050308: jal   0x104e23c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_configure_104e22c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_configure_104e23c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01050300: 0x1050300: lw    ra, 20(sp)
-// 0x01050304: 0x1050304: sll   zero, zero, 0
-// 0x01050308: 0x1050308: jr    ra addiu sp, sp, 24
+// 0x01050310: 0x1050310: lw    ra, 20(sp)
+// 0x01050314: 0x1050314: sll   zero, zero, 0
+// 0x01050318: 0x1050318: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4496,7 +4496,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 rim_on_orientation_change_1050310(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_orientation_change_1050320(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4531,18 +4531,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050310: 0x1050310: addiu sp, sp, -32
+// 0x01050320: 0x1050320: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01050314: 0x1050314: lui   a1, 0x10000
+// 0x01050324: 0x1050324: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01050318: 0x1050318: lui   a3, 0x10000
+// 0x01050328: 0x1050328: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105031c: 0x105031c: sw    a0, 16(sp)
+// 0x0105032c: 0x105032c: sw    a0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4551,21 +4551,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01050320: 0x1050320: addiu a1, a1, 3972
+// 0x01050330: 0x1050330: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050324: 0x1050324: addiu a3, a3, 4292
+// 0x01050334: 0x1050334: addiu a3, a3, 4288
 	ldloc 4
-	ldc.i4 4292
+	ldc.i4 4288
 	add
 	stloc 4
-// 0x01050328: 0x1050328: addiu a0, zero, 4
+// 0x01050338: 0x1050338: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105032c: 0x105032c: sw    ra, 28(sp)
-// 0x01050330: 0x1050330: jal   0x100449c addiu a2, zero, 1543
+// 0x0105033c: 0x105033c: sw    ra, 28(sp)
+// 0x01050340: 0x1050340: jal   0x100449c addiu a2, zero, 1543
 	ldc.i4 1543
 	stloc.3
 	ldloc.0
@@ -4578,18 +4578,18 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050338: 0x1050338: jal   0x104e22c sll   zero, zero, 0
+// 0x01050348: 0x1050348: jal   0x104e23c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_configure_104e22c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_configure_104e23c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050340: 0x1050340: jal   0x1040030 addiu a0, zero, 10
+// 0x01050350: 0x1050350: jal   0x1040040 addiu a0, zero, 10
 	ldc.i4.s 10
 	stloc.1
 	ldloc.0
@@ -4597,14 +4597,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_event_notification_1040030(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_event_notification_1040040(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050348: 0x1050348: lw    ra, 28(sp)
-// 0x0105034c: 0x105034c: sll   zero, zero, 0
-// 0x01050350: 0x1050350: jr    ra addiu sp, sp, 32
+// 0x01050358: 0x1050358: lw    ra, 28(sp)
+// 0x0105035c: 0x105035c: sll   zero, zero, 0
+// 0x01050360: 0x1050360: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4616,7 +4616,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rim_on_navigation_movement_1050358(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_navigation_movement_1050368(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s1,int32 s2,int32 lo,int32 s3,int32 ra)
@@ -4666,12 +4666,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050358: 0x1050358: addiu sp, sp, -48
+// 0x01050368: 0x1050368: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0105035c: 0x105035c: sw    s3, 40(sp)
+// 0x0105036c: 0x105036c: sw    s3, 40(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4680,7 +4680,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01050360: 0x1050360: sw    s2, 36(sp)
+// 0x01050370: 0x1050370: sw    s2, 36(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4689,7 +4689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01050364: 0x1050364: sw    s1, 32(sp)
+// 0x01050374: 0x1050374: sw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4698,7 +4698,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01050368: 0x1050368: sw    s0, 28(sp)
+// 0x01050378: 0x1050378: sw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4707,131 +4707,131 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105036c: 0x105036c: sw    ra, 44(sp)
-// 0x01050370: 0x1050370: addu  s0, a0, zero
+// 0x0105037c: 0x105037c: sw    ra, 44(sp)
+// 0x01050380: 0x1050380: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01050374: 0x1050374: addu  s1, a1, zero
+// 0x01050384: 0x1050384: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01050378: 0x1050378: addu  s2, a2, zero
+// 0x01050388: 0x1050388: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0105037c: 0x105037c: jal   0x1093f90 addu  s3, a3, zero
+// 0x0105038c: 0x105038c: jal   0x10945b4 addu  s3, a3, zero
 	ldloc 4
 	stloc 12
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x01050384: 0x1050384: beq   v0, zero, 0x10503c8 sll   zero, zero, 0
+// 0x01050394: 0x1050394: beq   v0, zero, 0x10503d8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10503c8
+	brfalse L_10503d8
 // --- basic block ---
-// 0x0105038c: 0x105038c: lui   v0, 0x70000
+// 0x0105039c: 0x105039c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050390: 0x1050390: lw    v1, -3916(v0)
+// 0x010503a0: 0x10503a0: lw    v1, -3452(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -979
+	ldc.i4 -863
 	add
 	ldelem.i4
 	stloc 6
-// 0x01050394: 0x1050394: sll   zero, zero, 0
-// 0x01050398: 0x1050398: subu  v1, s3, v1
+// 0x010503a4: 0x10503a4: sll   zero, zero, 0
+// 0x010503a8: 0x10503a8: subu  v1, s3, v1
 	ldloc 12
 	ldloc 6
 	sub
 	stloc 6
-// 0x0105039c: 0x105039c: slti  v1, v1, 100
+// 0x010503ac: 0x10503ac: slti  v1, v1, 100
 	ldloc 6
 	ldc.i4.s 100
 	clt
 	stloc 6
-// 0x010503a0: 0x10503a0: bne   v1, zero, 0x1050480 addu  v0, zero, zero
+// 0x010503b0: 0x10503b0: bne   v1, zero, 0x1050490 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1050480
+	brtrue L_1050490
 // --- basic block ---
-// 0x010503a8: 0x10503a8: bgtz  s0, 0x10504a0 addiu v0, zero, 7
+// 0x010503b8: 0x10503b8: bgtz  s0, 0x10504b0 addiu v0, zero, 7
 	ldloc 7
 	ldc.i4.7
 	stloc 5
 	ldc.i4.s 0
-	bgt L_10504a0
+	bgt L_10504b0
 // --- basic block ---
-// 0x010503b0: 0x10503b0: bne   s0, zero, 0x10504a0 addiu v0, zero, 6
+// 0x010503c0: 0x10503c0: bne   s0, zero, 0x10504b0 addiu v0, zero, 6
 	ldloc 7
 	ldc.i4.6
 	stloc 5
-	brtrue L_10504a0
+	brtrue L_10504b0
 // --- basic block ---
-// 0x010503b8: 0x10503b8: bgtz  s1, 0x10504a0 addiu v0, zero, 5
+// 0x010503c8: 0x10503c8: bgtz  s1, 0x10504b0 addiu v0, zero, 5
 	ldloc 9
 	ldc.i4.5
 	stloc 5
 	ldc.i4.s 0
-	bgt L_10504a0
+	bgt L_10504b0
 // --- basic block ---
-// 0x010503c0: 0x10503c0: bne   s1, zero, 0x105049c sll   zero, zero, 0
+// 0x010503d0: 0x10503d0: bne   s1, zero, 0x10504ac sll   zero, zero, 0
 	ldloc 9
-	brtrue L_105049c
+	brtrue L_10504ac
 // --- basic block ---
-L_10503c8:
-// 0x010503c8: 0x10503c8: andi  s2, s2, 1
+L_10503d8:
+// 0x010503d8: 0x10503d8: andi  s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	and
 	stloc 10
-L_10503cc:
-// 0x010503cc: 0x10503cc: beq   s2, zero, 0x1050440 sll   zero, zero, 0
+L_10503dc:
+// 0x010503dc: 0x10503dc: beq   s2, zero, 0x1050450 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_1050440
+	brfalse L_1050450
 // --- basic block ---
-// 0x010503d4: 0x10503d4: bgtz  s0, 0x10503e4 addiu a0, zero, -10
+// 0x010503e4: 0x10503e4: bgtz  s0, 0x10503f4 addiu a0, zero, -10
 	ldloc 7
 	ldc.i4.s -10
 	stloc.1
 	ldc.i4.s 0
-	bgt L_10503e4
+	bgt L_10503f4
 // --- basic block ---
-// 0x010503dc: 0x10503dc: beq   s0, zero, 0x10503f4 sll   zero, zero, 0
+// 0x010503ec: 0x10503ec: beq   s0, zero, 0x1050404 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_10503f4
+	brfalse L_1050404
 // --- basic block ---
-L_10503e4:
-// 0x010503e4: 0x10503e4: mult  s0, a0
+L_10503f4:
+// 0x010503f4: 0x10503f4: mult  s0, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 11
-// 0x010503e8: 0x10503e8: mflo  lo
+// 0x010503f8: 0x10503f8: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x010503ec: 0x10503ec: jal   0x10212b4 sll   zero, zero, 0
+// 0x010503fc: 0x10503fc: jal   0x10212c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_rotate_10212b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_rotate_10212c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10503f4:
-// 0x010503f4: 0x10503f4: blez  s1, 0x1050418 addu  s0, zero, zero
+L_1050404:
+// 0x01050404: 0x1050404: blez  s1, 0x1050428 addu  s0, zero, zero
 	ldloc 9
 	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
-	ble L_1050418
+	ble L_1050428
 // --- basic block ---
-L_10503fc:
-// 0x010503fc: 0x10503fc: jal   0x1021040 addiu s0, s0, 1
+L_105040c:
+// 0x0105040c: 0x105040c: jal   0x1021050 addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
@@ -4841,39 +4841,39 @@ L_10503fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_out_1021040(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_out_1021050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050404: 0x1050404: slt   v0, s0, s1
+// 0x01050414: 0x1050414: slt   v0, s0, s1
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 5
-// 0x01050408: 0x1050408: bne   v0, zero, 0x10503fc addiu v0, zero, 1
+// 0x01050418: 0x1050418: bne   v0, zero, 0x105040c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10503fc
+	brtrue L_105040c
 // --- basic block ---
-// 0x01050410: 0x1050410: j	 0x105047c lui   v1, 0x70000
+// 0x01050420: 0x1050420: j	 0x105048c lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-	br L_105047c
+	br L_105048c
 // --- basic block ---
-L_1050418:
-// 0x01050418: 0x1050418: beq   s1, zero, 0x1050478 addiu v0, zero, 1
+L_1050428:
+// 0x01050428: 0x1050428: beq   s1, zero, 0x1050488 addiu v0, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 5
-	brfalse L_1050478
+	brfalse L_1050488
 // --- basic block ---
-// 0x01050420: 0x1050420: addu  s0, zero, zero
+// 0x01050430: 0x1050430: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1050424:
-// 0x01050424: 0x1050424: jal   0x1021110 addiu s0, s0, -1
+L_1050434:
+// 0x01050434: 0x1050434: jal   0x1021120 addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
@@ -4883,72 +4883,72 @@ L_1050424:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_in_1021110(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_in_1021120(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105042c: 0x105042c: slt   v0, s1, s0
+// 0x0105043c: 0x105043c: slt   v0, s1, s0
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 5
-// 0x01050430: 0x1050430: bne   v0, zero, 0x1050424 addiu v0, zero, 1
+// 0x01050440: 0x1050440: bne   v0, zero, 0x1050434 addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_1050424
+	brtrue L_1050434
 // --- basic block ---
-// 0x01050438: 0x1050438: j	 0x105047c lui   v1, 0x70000
+// 0x01050448: 0x1050448: j	 0x105048c lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-	br L_105047c
+	br L_105048c
 // --- basic block ---
-L_1050440:
-// 0x01050440: 0x1050440: jal   0x1021394 sll   zero, zero, 0
+L_1050450:
+// 0x01050450: 0x1050450: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050448: 0x1050448: addiu a0, zero, 30
+// 0x01050458: 0x1050458: addiu a0, zero, 30
 	ldc.i4.s 30
 	stloc.1
-// 0x0105044c: 0x105044c: mult  s1, a0
+// 0x0105045c: 0x105045c: mult  s1, a0
 	ldloc 9
 	ldloc.1
 	mul
 	stloc 11
-// 0x01050450: 0x1050450: mflo  lo
+// 0x01050460: 0x1050460: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x01050454: 0x1050454: sll   zero, zero, 0
-// 0x01050458: 0x1050458: sll   zero, zero, 0
-// 0x0105045c: 0x105045c: mult  s0, a0
+// 0x01050464: 0x1050464: sll   zero, zero, 0
+// 0x01050468: 0x1050468: sll   zero, zero, 0
+// 0x0105046c: 0x105046c: mult  s0, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 11
-// 0x01050460: 0x1050460: mflo  lo
+// 0x01050470: 0x1050470: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01050464: 0x1050464: jal   0x1020c18 sll   zero, zero, 0
+// 0x01050474: 0x1050474: jal   0x1020c28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_move_1020c18(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_move_1020c28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105046c: 0x105046c: jal   0x101fc00 addiu a0, zero, 1
+// 0x0105047c: 0x105047c: jal   0x101fc10 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -4956,31 +4956,31 @@ L_1050440:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050474: 0x1050474: addiu v0, zero, 1
+// 0x01050484: 0x1050484: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1050478:
-// 0x01050478: 0x1050478: lui   v1, 0x70000
+L_1050488:
+// 0x01050488: 0x1050488: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-L_105047c:
-// 0x0105047c: 0x105047c: sw    s3, -3916(v1)
+L_105048c:
+// 0x0105048c: 0x105048c: sw    s3, -3452(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -979
+	ldc.i4 -863
 	add
 	ldloc 12
 	stelem.i4
-L_1050480:
-// 0x01050480: 0x1050480: lw    ra, 44(sp)
-// 0x01050484: 0x1050484: lw    s3, 40(sp)
+L_1050490:
+// 0x01050490: 0x1050490: lw    ra, 44(sp)
+// 0x01050494: 0x1050494: lw    s3, 40(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4989,7 +4989,7 @@ L_1050480:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01050488: 0x1050488: lw    s2, 36(sp)
+// 0x01050498: 0x1050498: lw    s2, 36(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4998,7 +4998,7 @@ L_1050480:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105048c: 0x105048c: lw    s1, 32(sp)
+// 0x0105049c: 0x105049c: lw    s1, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5007,7 +5007,7 @@ L_1050480:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01050490: 0x1050490: lw    s0, 28(sp)
+// 0x010504a0: 0x10504a0: lw    s0, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5016,33 +5016,33 @@ L_1050480:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01050494: 0x1050494: jr    ra addiu sp, sp, 48
+// 0x010504a4: 0x10504a4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_105049c:
-// 0x0105049c: 0x105049c: addiu v0, zero, 4
+L_10504ac:
+// 0x010504ac: 0x10504ac: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-L_10504a0:
-// 0x010504a0: 0x10504a0: addiu a0, sp, 16
+L_10504b0:
+// 0x010504b0: 0x10504b0: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x010504a4: 0x10504a4: addiu a1, zero, 1
+// 0x010504b4: 0x10504b4: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010504a8: 0x10504a8: sb    v0, 16(sp)
+// 0x010504b8: 0x10504b8: sb    v0, 16(sp)
 	ldloc.0
 	ldc.i4.s 16
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010504ac: 0x10504ac: jal   0x10388b4 sb    zero, 17(sp)
+// 0x010504bc: 0x10504bc: jal   0x10388c4 sb    zero, 17(sp)
 	ldloc.0
 	ldc.i4.s 17
 	add
@@ -5053,30 +5053,30 @@ L_10504a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_handler__key_pressed_10388b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_handler__key_pressed_10388c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010504b4: 0x10504b4: bne   v0, zero, 0x105047c lui   v1, 0x70000
+// 0x010504c4: 0x10504c4: bne   v0, zero, 0x105048c lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brtrue L_105047c
+	brtrue L_105048c
 // --- basic block ---
-// 0x010504bc: 0x10504bc: j	 0x10503cc andi  s2, s2, 1
+// 0x010504cc: 0x10504cc: j	 0x10503dc andi  s2, s2, 1
 	ldloc 10
 	ldc.i4.1
 	and
 	stloc 10
-	br L_10503cc
+	br L_10503dc
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 rim_on_scheduledTask_10504c4(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_scheduledTask_10504d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra,int32 lo)
@@ -5117,39 +5117,39 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010504c4: 0x10504c4: andi  v1, a0, 65535
+// 0x010504d4: 0x10504d4: andi  v1, a0, 65535
 	ldloc.1
 	ldc.i4 65535
 	and
 	stloc 6
-// 0x010504c8: 0x10504c8: addiu v0, zero, 12
+// 0x010504d8: 0x10504d8: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x010504cc: 0x10504cc: mult  v1, v0
+// 0x010504dc: 0x10504dc: mult  v1, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 10
-// 0x010504d0: 0x10504d0: lui   v0, 0x70000
+// 0x010504e0: 0x10504e0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010504d4: 0x10504d4: addiu v0, v0, -1976
+// 0x010504e4: 0x10504e4: addiu v0, v0, -1512
 	ldloc 5
-	ldc.i4 -1976
+	ldc.i4 -1512
 	add
 	stloc 5
-// 0x010504d8: 0x10504d8: sra   v1, a0, 16
+// 0x010504e8: 0x10504e8: sra   v1, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shr
 	stloc 6
-// 0x010504dc: 0x10504dc: addiu sp, sp, -48
+// 0x010504ec: 0x10504ec: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010504e0: 0x10504e0: sw    ra, 44(sp)
-// 0x010504e4: 0x10504e4: sw    s0, 40(sp)
+// 0x010504f0: 0x10504f0: sw    ra, 44(sp)
+// 0x010504f4: 0x10504f4: sw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5158,15 +5158,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010504e8: 0x10504e8: mflo  lo
+// 0x010504f8: 0x10504f8: mflo  lo
 	ldloc 10
 	stloc.2
-// 0x010504ec: 0x10504ec: addu  a0, a1, v0
+// 0x010504fc: 0x10504fc: addu  a0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.1
-// 0x010504f0: 0x10504f0: lw    v0, 8(a0)
+// 0x01050500: 0x1050500: lw    v0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5175,34 +5175,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010504f4: 0x10504f4: sll   zero, zero, 0
-// 0x010504f8: 0x10504f8: beq   v1, v0, 0x1050528 lui   a1, 0x10000
+// 0x01050504: 0x1050504: sll   zero, zero, 0
+// 0x01050508: 0x1050508: beq   v1, v0, 0x1050538 lui   a1, 0x10000
 	ldloc 6
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	beq  L_1050528
+	beq  L_1050538
 // --- basic block ---
-// 0x01050500: 0x1050500: lui   a3, 0x10000
+// 0x01050510: 0x1050510: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050504: 0x1050504: addiu a1, a1, 3972
+// 0x01050514: 0x1050514: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050508: 0x1050508: addiu a3, a3, 4332
+// 0x01050518: 0x1050518: addiu a3, a3, 4328
 	ldloc 4
-	ldc.i4 4332
+	ldc.i4 4328
 	add
 	stloc 4
-// 0x0105050c: 0x105050c: addiu a0, zero, 4
+// 0x0105051c: 0x105051c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050510: 0x1050510: addiu a2, zero, 853
+// 0x01050520: 0x1050520: addiu a2, zero, 853
 	ldc.i4 853
 	stloc.3
-// 0x01050514: 0x1050514: sw    v1, 16(sp)
+// 0x01050524: 0x1050524: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5211,7 +5211,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01050518: 0x1050518: jal   0x100449c sw    v0, 20(sp)
+// 0x01050528: 0x1050528: jal   0x100449c sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5230,30 +5230,30 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050520: 0x1050520: j	 0x105058c sll   zero, zero, 0
-	br L_105058c
+// 0x01050530: 0x1050530: j	 0x105059c sll   zero, zero, 0
+	br L_105059c
 // --- basic block ---
-L_1050528:
-// 0x01050528: 0x1050528: lw    a2, 0(a0)
+L_1050538:
+// 0x01050538: 0x1050538: lw    a2, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0105052c: 0x105052c: addiu v1, sp, 24
+// 0x0105053c: 0x105053c: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x01050530: 0x1050530: cibyl_sysc_arg 0x3
+// 0x01050540: 0x1050540: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01050534: 0x1050534: cibyl_sysc 0x1514
+// 0x01050544: 0x1050544: cibyl_sysc 0x1514
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x01050538: 0x1050538: addu  v1, v0, zero
+// 0x01050548: 0x1050548: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0105053c: 0x105053c: lw    s0, 28(sp)
+// 0x0105054c: 0x105054c: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5262,22 +5262,22 @@ L_1050528:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01050540: 0x1050540: beq   a2, zero, 0x1050558 lui   v0, 0x70000
+// 0x01050550: 0x1050550: beq   a2, zero, 0x1050568 lui   v0, 0x70000
 	ldloc.3
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1050558
+	brfalse L_1050568
 // --- basic block ---
-// 0x01050548: 0x1050548: sw    a2, -3908(v0)
+// 0x01050558: 0x1050558: sw    a2, -3444(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -977
+	ldc.i4 -861
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105054c: 0x105054c: jalr  a2 sw    a2, 32(sp)
+// 0x0105055c: 0x105055c: jalr  a2 sw    a2, 32(sp)
 	ldloc.3
 	ldloc 7
 	ldloc.0
@@ -5297,7 +5297,7 @@ L_1050528:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050554: 0x1050554: lw    a2, 32(sp)
+// 0x01050564: 0x1050564: lw    a2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5306,20 +5306,20 @@ L_1050528:
 	add
 	ldelem.i4
 	stloc.3
-L_1050558:
-// 0x01050558: 0x1050558: addiu v1, sp, 24
+L_1050568:
+// 0x01050568: 0x1050568: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x0105055c: 0x105055c: cibyl_sysc_arg 0x3
+// 0x0105056c: 0x105056c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01050560: 0x1050560: cibyl_sysc 0x1534
+// 0x01050570: 0x1050570: cibyl_sysc 0x1534
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x01050564: 0x1050564: addu  v1, v0, zero
+// 0x01050574: 0x1050574: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01050568: 0x1050568: lw    a1, 28(sp)
+// 0x01050578: 0x1050578: lw    a1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5328,27 +5328,27 @@ L_1050558:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105056c: 0x105056c: sll   zero, zero, 0
-// 0x01050570: 0x1050570: subu  a1, a1, s0
+// 0x0105057c: 0x105057c: sll   zero, zero, 0
+// 0x01050580: 0x1050580: subu  a1, a1, s0
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x01050574: 0x1050574: slti  v0, a1, 1001
+// 0x01050584: 0x1050584: slti  v0, a1, 1001
 	ldloc.2
 	ldc.i4 1001
 	clt
 	stloc 5
-// 0x01050578: 0x1050578: bne   v0, zero, 0x105058c sll   zero, zero, 0
+// 0x01050588: 0x1050588: bne   v0, zero, 0x105059c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_105058c
+	brtrue L_105059c
 // --- basic block ---
-// 0x01050580: 0x1050580: lui   a0, 0x10000
+// 0x01050590: 0x1050590: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050584: 0x1050584: jal   0x1000e78 addiu a0, a0, 4364
+// 0x01050594: 0x1050594: jal   0x1000e78 addiu a0, a0, 4360
 	ldloc.1
-	ldc.i4 4364
+	ldc.i4 4360
 	add
 	stloc.1
 	ldloc.0
@@ -5361,9 +5361,9 @@ L_1050558:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105058c:
-// 0x0105058c: 0x105058c: lw    ra, 44(sp)
-// 0x01050590: 0x1050590: lw    s0, 40(sp)
+L_105059c:
+// 0x0105059c: 0x105059c: lw    ra, 44(sp)
+// 0x010505a0: 0x10505a0: lw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5372,7 +5372,7 @@ L_105058c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01050594: 0x1050594: jr    ra addiu sp, sp, 48
+// 0x010505a4: 0x10505a4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5384,7 +5384,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_input_ready_105059c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_input_ready_10505ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 lo,int32 ra)
@@ -5431,16 +5431,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105059c: 0x105059c: addiu sp, sp, -48
+// 0x010505ac: 0x10505ac: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010505a0: 0x10505a0: lui   v0, 0x70000
+// 0x010505b0: 0x10505b0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010505a4: 0x10505a4: sw    ra, 44(sp)
-// 0x010505a8: 0x10505a8: sw    s2, 40(sp)
+// 0x010505b4: 0x10505b4: sw    ra, 44(sp)
+// 0x010505b8: 0x10505b8: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5449,7 +5449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010505ac: 0x10505ac: sw    s1, 36(sp)
+// 0x010505bc: 0x10505bc: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5458,7 +5458,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010505b0: 0x10505b0: sw    s0, 32(sp)
+// 0x010505c0: 0x10505c0: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5467,67 +5467,67 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010505b4: 0x10505b4: addiu v0, v0, -2812
+// 0x010505c4: 0x10505c4: addiu v0, v0, -2348
 	ldloc 5
-	ldc.i4 -2812
+	ldc.i4 -2348
 	add
 	stloc 5
-// 0x010505b8: 0x10505b8: addiu v1, zero, 1
+// 0x010505c8: 0x10505c8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010505bc: 0x10505bc: addiu a1, zero, 16
+// 0x010505cc: 0x10505cc: addiu a1, zero, 16
 	ldc.i4.s 16
 	stloc.2
-L_10505c0:
-// 0x010505c0: 0x10505c0: lw    a2, 0(v0)
+L_10505d0:
+// 0x010505d0: 0x10505d0: lw    a2, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010505c4: 0x10505c4: sll   zero, zero, 0
-// 0x010505c8: 0x10505c8: bne   a2, a0, 0x1050698 addiu v0, v0, 56
+// 0x010505d4: 0x10505d4: sll   zero, zero, 0
+// 0x010505d8: 0x10505d8: bne   a2, a0, 0x10506a8 addiu v0, v0, 56
 	ldloc.3
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 56
 	add
 	stloc 5
-	bne.un L_1050698
+	bne.un L_10506a8
 // --- basic block ---
-// 0x010505d0: 0x10505d0: addiu s1, sp, 24
+// 0x010505e0: 0x10505e0: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x010505d4: 0x10505d4: cibyl_sysc_arg 0x11
+// 0x010505e4: 0x10505e4: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x010505d8: 0x10505d8: cibyl_sysc 0x1554
+// 0x010505e8: 0x10505e8: cibyl_sysc 0x1554
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x010505dc: 0x10505dc: addu  a0, v0, zero
+// 0x010505ec: 0x10505ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010505e0: 0x10505e0: addiu s0, zero, 56
+// 0x010505f0: 0x10505f0: addiu s0, zero, 56
 	ldc.i4.s 56
 	stloc 8
-// 0x010505e4: 0x10505e4: mult  v1, s0
+// 0x010505f4: 0x10505f4: mult  v1, s0
 	ldloc 6
 	ldloc 8
 	mul
 	stloc 11
-// 0x010505e8: 0x10505e8: addiu a0, zero, 7
+// 0x010505f8: 0x10505f8: addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
-// 0x010505ec: 0x10505ec: lui   a1, 0x70000
+// 0x010505fc: 0x10505fc: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x010505f0: 0x10505f0: addiu a1, a1, -2872
+// 0x01050600: 0x1050600: addiu a1, a1, -2408
 	ldloc.2
-	ldc.i4 -2872
+	ldc.i4 -2408
 	add
 	stloc.2
-// 0x010505f4: 0x10505f4: lw    s2, 28(sp)
+// 0x01050604: 0x1050604: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5536,15 +5536,15 @@ L_10505c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010505f8: 0x10505f8: mflo  lo
+// 0x01050608: 0x1050608: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x010505fc: 0x10505fc: addu  s0, a1, s0
+// 0x0105060c: 0x105060c: addu  s0, a1, s0
 	ldloc.2
 	ldloc 8
 	add
 	stloc 8
-// 0x01050600: 0x1050600: lw    v0, 52(s0)
+// 0x01050610: 0x1050610: lw    v0, 52(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5553,37 +5553,37 @@ L_10505c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050604: 0x1050604: mult  v1, a0
+// 0x01050614: 0x1050614: mult  v1, a0
 	ldloc 6
 	ldloc.1
 	mul
 	stloc 11
-// 0x01050608: 0x1050608: lui   v1, 0x70000
+// 0x01050618: 0x1050618: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105060c: 0x105060c: sw    v0, -3908(v1)
+// 0x0105061c: 0x105061c: sw    v0, -3444(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -977
+	ldc.i4 -861
 	add
 	ldloc 5
 	stelem.i4
-// 0x01050610: 0x1050610: mflo  lo
+// 0x01050620: 0x1050620: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01050614: 0x1050614: addiu a0, a0, 1
+// 0x01050624: 0x1050624: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01050618: 0x1050618: sll   a0, a0, 3
+// 0x01050628: 0x1050628: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0105061c: 0x105061c: jalr  v0 addu  a0, a1, a0
+// 0x0105062c: 0x105062c: jalr  v0 addu  a0, a1, a0
 	ldloc 5
 	ldloc.2
 	ldloc.1
@@ -5599,14 +5599,14 @@ L_10505c0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050624: 0x1050624: cibyl_sysc_arg 0x11
+// 0x01050634: 0x1050634: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01050628: 0x1050628: cibyl_sysc 0x1574
+// 0x01050638: 0x1050638: cibyl_sysc 0x1574
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x0105062c: 0x105062c: addu  s1, v0, zero
+// 0x0105063c: 0x105063c: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01050630: 0x1050630: lw    v0, 28(sp)
+// 0x01050640: 0x1050640: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5615,27 +5615,27 @@ L_10505c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050634: 0x1050634: sll   zero, zero, 0
-// 0x01050638: 0x1050638: subu  v0, v0, s2
+// 0x01050644: 0x1050644: sll   zero, zero, 0
+// 0x01050648: 0x1050648: subu  v0, v0, s2
 	ldloc 5
 	ldloc 10
 	sub
 	stloc 5
-// 0x0105063c: 0x105063c: slti  v1, v0, 751
+// 0x0105064c: 0x105064c: slti  v1, v0, 751
 	ldloc 5
 	ldc.i4 751
 	clt
 	stloc 6
-// 0x01050640: 0x1050640: bne   v1, zero, 0x10506a4 sll   zero, zero, 0
+// 0x01050650: 0x1050650: bne   v1, zero, 0x10506b4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10506a4
+	brtrue L_10506b4
 // --- basic block ---
-// 0x01050648: 0x1050648: slti  a1, v0, 3001
+// 0x01050658: 0x1050658: slti  a1, v0, 3001
 	ldloc 5
 	ldc.i4 3001
 	clt
 	stloc.2
-// 0x0105064c: 0x105064c: lw    v1, 52(s0)
+// 0x0105065c: 0x105065c: lw    v1, 52(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5644,32 +5644,32 @@ L_10505c0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01050650: 0x1050650: bne   a1, zero, 0x1050680 lui   a0, 0x10000
+// 0x01050660: 0x1050660: bne   a1, zero, 0x1050690 lui   a0, 0x10000
 	ldloc.2
 	ldc.i4 65536
 	stloc.1
-	brtrue L_1050680
+	brtrue L_1050690
 // --- basic block ---
-// 0x01050658: 0x1050658: lui   a1, 0x10000
+// 0x01050668: 0x1050668: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105065c: 0x105065c: addiu a3, a0, 4408
+// 0x0105066c: 0x105066c: addiu a3, a0, 4404
 	ldloc.1
-	ldc.i4 4408
+	ldc.i4 4404
 	add
 	stloc 4
-// 0x01050660: 0x1050660: addiu a1, a1, 3972
+// 0x01050670: 0x1050670: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050664: 0x1050664: addiu a0, zero, 4
+// 0x01050674: 0x1050674: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050668: 0x1050668: addiu a2, zero, 715
+// 0x01050678: 0x1050678: addiu a2, zero, 715
 	ldc.i4 715
 	stloc.3
-// 0x0105066c: 0x105066c: sw    v0, 16(sp)
+// 0x0105067c: 0x105067c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5678,7 +5678,7 @@ L_10505c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01050670: 0x1050670: jal   0x100449c sw    v1, 20(sp)
+// 0x01050680: 0x1050680: jal   0x100449c sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5697,19 +5697,19 @@ L_10505c0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050678: 0x1050678: j	 0x10506a4 sll   zero, zero, 0
-	br L_10506a4
+// 0x01050688: 0x1050688: j	 0x10506b4 sll   zero, zero, 0
+	br L_10506b4
 // --- basic block ---
-L_1050680:
-// 0x01050680: 0x1050680: addiu a0, a0, 4408
+L_1050690:
+// 0x01050690: 0x1050690: addiu a0, a0, 4404
 	ldloc.1
-	ldc.i4 4408
+	ldc.i4 4404
 	add
 	stloc.1
-// 0x01050684: 0x1050684: addu  a1, v0, zero
+// 0x01050694: 0x1050694: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01050688: 0x1050688: jal   0x1000e78 addu  a2, v1, zero
+// 0x01050698: 0x1050698: jal   0x1000e78 addu  a2, v1, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -5722,23 +5722,23 @@ L_1050680:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050690: 0x1050690: j	 0x10506a4 sll   zero, zero, 0
-	br L_10506a4
+// 0x010506a0: 0x10506a0: j	 0x10506b4 sll   zero, zero, 0
+	br L_10506b4
 // --- basic block ---
-L_1050698:
-// 0x01050698: 0x1050698: addiu v1, v1, 1
+L_10506a8:
+// 0x010506a8: 0x10506a8: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0105069c: 0x105069c: bne   v1, a1, 0x10505c0 sll   zero, zero, 0
+// 0x010506ac: 0x10506ac: bne   v1, a1, 0x10505d0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.2
-	bne.un L_10505c0
+	bne.un L_10505d0
 // --- basic block ---
-L_10506a4:
-// 0x010506a4: 0x10506a4: lw    ra, 44(sp)
-// 0x010506a8: 0x10506a8: lw    s2, 40(sp)
+L_10506b4:
+// 0x010506b4: 0x10506b4: lw    ra, 44(sp)
+// 0x010506b8: 0x10506b8: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5747,7 +5747,7 @@ L_10506a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010506ac: 0x10506ac: lw    s1, 36(sp)
+// 0x010506bc: 0x10506bc: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5756,7 +5756,7 @@ L_10506a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010506b0: 0x10506b0: lw    s0, 32(sp)
+// 0x010506c0: 0x10506c0: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5765,7 +5765,7 @@ L_10506a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010506b4: 0x10506b4: jr    ra addiu sp, sp, 48
+// 0x010506c4: 0x10506c4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5777,7 +5777,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 main_10506bc(int32,int32,int32,int32,int32)
+.method public static int32 main_10506cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -5812,29 +5812,29 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010506bc: 0x10506bc: lui   a0, 0x10000
+// 0x010506cc: 0x10506cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010506c0: 0x10506c0: addiu sp, sp, -24
+// 0x010506d0: 0x10506d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010506c4: 0x10506c4: sw    ra, 20(sp)
-// 0x010506c8: 0x10506c8: jal   0x1000350 addiu a0, a0, 4456
+// 0x010506d4: 0x10506d4: sw    ra, 20(sp)
+// 0x010506d8: 0x10506d8: jal   0x1000350 addiu a0, a0, 4452
 	ldloc.1
-	ldc.i4 4456
+	ldc.i4 4452
 	add
 	stloc.1
 	ldloc.1
 	call int32 Cibyl::puts_1000350(int32)
 	stloc 6
 // --- basic block ---
-// 0x010506d0: 0x10506d0: lw    ra, 20(sp)
-// 0x010506d4: 0x10506d4: addu  v0, zero, zero
+// 0x010506e0: 0x10506e0: lw    ra, 20(sp)
+// 0x010506e4: 0x10506e4: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010506d8: 0x10506d8: jr    ra addiu sp, sp, 24
+// 0x010506e8: 0x10506e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5846,7 +5846,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_main_browser_launcher_10506e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_browser_launcher_10506f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 v0,int32 v1,int32 ra)
@@ -5896,12 +5896,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010506e0: 0x10506e0: addiu sp, sp, -40
+// 0x010506f0: 0x10506f0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010506e4: 0x10506e4: sw    s0, 16(sp)
+// 0x010506f4: 0x10506f4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5910,13 +5910,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010506e8: 0x10506e8: addu  s0, a0, zero
+// 0x010506f8: 0x10506f8: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010506ec: 0x10506ec: lui   a0, 0x10000
+// 0x010506fc: 0x10506fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010506f0: 0x10506f0: sw    s4, 32(sp)
+// 0x01050700: 0x1050700: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5925,7 +5925,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010506f4: 0x10506f4: sw    s3, 28(sp)
+// 0x01050704: 0x1050704: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5934,7 +5934,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010506f8: 0x10506f8: sw    s2, 24(sp)
+// 0x01050708: 0x1050708: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5943,7 +5943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010506fc: 0x10506fc: sw    s1, 20(sp)
+// 0x0105070c: 0x105070c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5952,7 +5952,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01050700: 0x1050700: lw    s2, 4(s0)
+// 0x01050710: 0x1050710: lw    s2, 4(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5961,14 +5961,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01050704: 0x1050704: lw    s1, 0(s0)
+// 0x01050714: 0x1050714: lw    s1, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01050708: 0x1050708: lw    s3, 8(s0)
+// 0x01050718: 0x1050718: lw    s3, 8(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5977,7 +5977,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105070c: 0x105070c: lw    s4, 12(s0)
+// 0x0105071c: 0x105071c: lw    s4, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5986,10 +5986,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01050710: 0x1050710: sw    ra, 36(sp)
-// 0x01050714: 0x1050714: jal   0x101cd60 addiu a0, a0, -11868
+// 0x01050720: 0x1050720: sw    ra, 36(sp)
+// 0x01050724: 0x1050724: jal   0x101cd70 addiu a0, a0, -11872
 	ldloc.1
-	ldc.i4 -11868
+	ldc.i4 -11872
 	add
 	stloc.1
 	ldloc.0
@@ -5997,38 +5997,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 11
 // --- basic block ---
-// 0x0105071c: 0x105071c: addu  v1, v0, zero
+// 0x0105072c: 0x105072c: addu  v1, v0, zero
 	ldloc 11
 	stloc 12
-// 0x01050720: 0x1050720: addiu s0, s0, 16
+// 0x01050730: 0x1050730: addiu s0, s0, 16
 	ldloc 6
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x01050724: 0x1050724: cibyl_sysc_arg 0x10
+// 0x01050734: 0x1050734: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x01050728: 0x1050728: cibyl_sysc_arg 0x11
+// 0x01050738: 0x1050738: cibyl_sysc_arg 0x11
 	ldloc 7
-// 0x0105072c: 0x105072c: cibyl_sysc_arg 0x12
+// 0x0105073c: 0x105073c: cibyl_sysc_arg 0x12
 	ldloc 8
-// 0x01050730: 0x1050730: cibyl_sysc_arg 0x13
+// 0x01050740: 0x1050740: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x01050734: 0x1050734: cibyl_sysc_arg 0x14
+// 0x01050744: 0x1050744: cibyl_sysc_arg 0x14
 	ldloc 10
-// 0x01050738: 0x1050738: cibyl_sysc_arg 0x3
+// 0x01050748: 0x1050748: cibyl_sysc_arg 0x3
 	ldloc 12
-// 0x0105073c: 0x105073c: cibyl_sysc 0x1594
+// 0x0105074c: 0x105074c: cibyl_sysc 0x1594
 	call void [WazeWP7]Syscalls::NOPH_EmbeddedBrowser_EmbeddedBrowserShow(int32,int32,int32,int32,int32,int32)
-// 0x01050740: 0x1050740: addu  s0, v0, zero
+// 0x01050750: 0x1050750: addu  s0, v0, zero
 	ldloc 11
 	stloc 6
-// 0x01050744: 0x1050744: lw    ra, 36(sp)
-// 0x01050748: 0x1050748: lw    s4, 32(sp)
+// 0x01050754: 0x1050754: lw    ra, 36(sp)
+// 0x01050758: 0x1050758: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6037,7 +6037,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105074c: 0x105074c: lw    s3, 28(sp)
+// 0x0105075c: 0x105075c: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6046,7 +6046,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01050750: 0x1050750: lw    s2, 24(sp)
+// 0x01050760: 0x1050760: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6055,7 +6055,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01050754: 0x1050754: lw    s1, 20(sp)
+// 0x01050764: 0x1050764: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6064,7 +6064,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01050758: 0x1050758: lw    s0, 16(sp)
+// 0x01050768: 0x1050768: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6073,7 +6073,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105075c: 0x105075c: jr    ra addiu sp, sp, 40
+// 0x0105076c: 0x105076c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6085,7 +6085,7 @@ __CIBYL_function_return:
 	ldloc 11
 	ret
 }
-.method public static int32 roadmap_main_context_menu_set_1050764(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_context_menu_set_1050774(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -6126,12 +6126,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050764: 0x1050764: addiu sp, sp, -40
+// 0x01050774: 0x1050774: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01050768: 0x1050768: sw    s1, 32(sp)
+// 0x01050778: 0x1050778: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6140,18 +6140,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105076c: 0x105076c: addu  s1, a0, zero
+// 0x0105077c: 0x105077c: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01050770: 0x1050770: lui   a0, 0x10000
+// 0x01050780: 0x1050780: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050774: 0x1050774: addiu a0, a0, -29376
+// 0x01050784: 0x1050784: addiu a0, a0, -29376
 	ldloc.1
 	ldc.i4 -29376
 	add
 	stloc.1
-// 0x01050778: 0x1050778: sw    a2, 16(sp)
+// 0x01050788: 0x1050788: sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6160,8 +6160,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105077c: 0x105077c: sw    ra, 36(sp)
-// 0x01050780: 0x1050780: sw    s0, 28(sp)
+// 0x0105078c: 0x105078c: sw    ra, 36(sp)
+// 0x01050790: 0x1050790: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6170,7 +6170,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01050784: 0x1050784: jal   0x101cd60 addu  s0, a1, zero
+// 0x01050794: 0x1050794: jal   0x101cd70 addu  s0, a1, zero
 	ldloc.2
 	stloc 7
 	ldloc.0
@@ -6178,15 +6178,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105078c: 0x105078c: addu  a0, v0, zero
+// 0x0105079c: 0x105079c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01050790: 0x1050790: jal   0x1001b14 addu  a1, s0, zero
+// 0x010507a0: 0x10507a0: jal   0x1001b14 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -6194,7 +6194,7 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01050798: 0x1050798: lw    a2, 16(sp)
+// 0x010507a8: 0x10507a8: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6203,38 +6203,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105079c: 0x105079c: beq   v0, zero, 0x10507c4 lui   v0, 0x70000
+// 0x010507ac: 0x10507ac: beq   v0, zero, 0x10507d4 lui   v0, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 6
-	brfalse L_10507c4
+	brfalse L_10507d4
 // --- basic block ---
-// 0x010507a4: 0x10507a4: lw    v1, -1688(v0)
+// 0x010507b4: 0x10507b4: lw    v1, -1224(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 8
-// 0x010507a8: 0x10507a8: sll   zero, zero, 0
-// 0x010507ac: 0x10507ac: cibyl_sysc_arg 0x3
+// 0x010507b8: 0x10507b8: sll   zero, zero, 0
+// 0x010507bc: 0x10507bc: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x010507b0: 0x10507b0: cibyl_sysc_arg 0x10
+// 0x010507c0: 0x10507c0: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x010507b4: 0x10507b4: cibyl_sysc_arg 0x11
+// 0x010507c4: 0x10507c4: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x010507b8: 0x10507b8: cibyl_sysc_arg 0x6
+// 0x010507c8: 0x10507c8: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x010507bc: 0x10507bc: cibyl_sysc 0x15bd
+// 0x010507cc: 0x10507cc: cibyl_sysc 0x15bd
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_setContextMenuItem(int32,int32,int32,int32)
-// 0x010507c0: 0x10507c0: addu  s0, v0, zero
+// 0x010507d0: 0x10507d0: addu  s0, v0, zero
 	ldloc 6
 	stloc 7
-L_10507c4:
-// 0x010507c4: 0x10507c4: lw    ra, 36(sp)
-// 0x010507c8: 0x10507c8: lw    s1, 32(sp)
+L_10507d4:
+// 0x010507d4: 0x10507d4: lw    ra, 36(sp)
+// 0x010507d8: 0x10507d8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6243,7 +6243,7 @@ L_10507c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010507cc: 0x10507cc: lw    s0, 28(sp)
+// 0x010507dc: 0x10507dc: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6252,7 +6252,7 @@ L_10507c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010507d0: 0x10507d0: jr    ra addiu sp, sp, 40
+// 0x010507e0: 0x10507e0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6264,7 +6264,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 rim_start_10507d8(int32,int32,int32,int32,int32)
+.method public static int32 rim_start_10507e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -6305,13 +6305,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010507d8: 0x10507d8: addiu sp, sp, -32
+// 0x010507e8: 0x10507e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010507dc: 0x10507dc: sw    ra, 28(sp)
-// 0x010507e0: 0x10507e0: sw    s1, 24(sp)
+// 0x010507ec: 0x10507ec: sw    ra, 28(sp)
+// 0x010507f0: 0x10507f0: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6320,7 +6320,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010507e4: 0x10507e4: jal   0x102c3f0 sw    s0, 20(sp)
+// 0x010507f4: 0x10507f4: jal   0x102c400 sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6334,12 +6334,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010507ec: 0x10507ec: jal   0x105366c addu  s0, v0, zero
+// 0x010507fc: 0x10507fc: jal   0x105367c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6347,37 +6347,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_version_read_105366c(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_version_read_105367c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010507f4: 0x10507f4: lui   v1, 0x70000
+// 0x01050804: 0x1050804: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010507f8: 0x10507f8: addu  s1, v0, zero
+// 0x01050808: 0x1050808: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010507fc: 0x10507fc: addiu a0, zero, 1000
+// 0x0105080c: 0x105080c: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x01050800: 0x1050800: addiu v1, v1, -1684
+// 0x01050810: 0x1050810: addiu v1, v1, -1220
 	ldloc 6
-	ldc.i4 -1684
+	ldc.i4 -1220
 	add
 	stloc 6
-// 0x01050804: 0x1050804: cibyl_sysc_arg 0x3
+// 0x01050814: 0x1050814: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01050808: 0x1050808: cibyl_sysc_arg 0x4
+// 0x01050818: 0x1050818: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0105080c: 0x105080c: cibyl_sysc 0x15e7
+// 0x0105081c: 0x105081c: cibyl_sysc 0x15e7
 	call void [WazeWP7]Syscalls::NOPH_UIWorker_registerMsgAddr(int32,int32)
-// 0x01050810: 0x1050810: addu  v1, v0, zero
+// 0x01050820: 0x1050820: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01050814: 0x1050814: cibyl_sysc 0x1605
+// 0x01050824: 0x1050824: cibyl_sysc 0x1605
 	call void [WazeWP7]Syscalls::NOPH_FreemapApp_printOSVersionToLog()
-// 0x01050818: 0x1050818: jal   0x1050114 addu  v1, v0, zero
+// 0x01050828: 0x1050828: jal   0x1050124 addu  v1, v0, zero
 	ldloc 5
 	stloc 6
 	ldloc.0
@@ -6385,53 +6385,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_register_seconds_timer_mgr_1050114(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_register_seconds_timer_mgr_1050124(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050820: 0x1050820: cibyl_sysc 0x1629
+// 0x01050830: 0x1050830: cibyl_sysc 0x1629
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_get()
 	stloc 5
-// 0x01050824: 0x1050824: addu  v1, v0, zero
+// 0x01050834: 0x1050834: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01050828: 0x1050828: lui   v0, 0x70000
+// 0x01050838: 0x1050838: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105082c: 0x105082c: sw    v1, -1688(v0)
+// 0x0105083c: 0x105083c: sw    v1, -1224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldloc 6
 	stelem.i4
-// 0x01050830: 0x1050830: lui   v1, 0xf0000
+// 0x01050840: 0x1050840: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x01050834: 0x1050834: addiu v1, v1, -30064
+// 0x01050844: 0x1050844: addiu v1, v1, -29600
 	ldloc 6
-	ldc.i4 -30064
+	ldc.i4 -29600
 	add
 	stloc 6
-// 0x01050838: 0x1050838: cibyl_sysc_arg 0x3
+// 0x01050848: 0x1050848: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0105083c: 0x105083c: cibyl_sysc 0x1644
+// 0x0105084c: 0x105084c: cibyl_sysc 0x1644
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_setKeyDownAddr(int32)
-// 0x01050840: 0x1050840: addu  v1, v0, zero
+// 0x01050850: 0x1050850: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01050844: 0x1050844: lui   a1, 0x1050000
+// 0x01050854: 0x1050854: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x01050848: 0x1050848: addiu a1, a1, 2340
+// 0x01050858: 0x1050858: addiu a1, a1, 2356
 	ldloc.2
-	ldc.i4 2340
+	ldc.i4 2356
 	add
 	stloc.2
-// 0x0105084c: 0x105084c: jal   0x104fe98 addiu a0, zero, 20000
+// 0x0105085c: 0x105085c: jal   0x104fea8 addiu a0, zero, 20000
 	ldc.i4 20000
 	stloc.1
 	ldloc.0
@@ -6439,63 +6439,63 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050854: 0x1050854: lui   a0, 0x1050000
+// 0x01050864: 0x1050864: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01050858: 0x1050858: jal   0x1054de0 addiu a0, a0, 1760
+// 0x01050868: 0x1050868: jal   0x1054df0 addiu a0, a0, 1776
 	ldloc.1
-	ldc.i4 1760
+	ldc.i4 1776
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl63::roadmap_browser_register_launcher_1054de0(int32)
+	call int32 Cibyl63::roadmap_browser_register_launcher_1054df0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01050860: 0x1050860: lui   a0, 0x1050000
+// 0x01050870: 0x1050870: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01050864: 0x1050864: jal   0x1054dec addiu a0, a0, -1400
+// 0x01050874: 0x1050874: jal   0x1054dfc addiu a0, a0, -1384
 	ldloc.1
-	ldc.i4 -1400
+	ldc.i4 -1384
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl63::roadmap_browser_register_close_1054dec(int32)
+	call int32 Cibyl63::roadmap_browser_register_close_1054dfc(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105086c: 0x105086c: lui   v0, 0x70000
+// 0x0105087c: 0x105087c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050870: 0x1050870: lui   a0, 0x70000
+// 0x01050880: 0x1050880: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01050874: 0x1050874: addiu v0, v0, -2856
+// 0x01050884: 0x1050884: addiu v0, v0, -2392
 	ldloc 5
-	ldc.i4 -2856
+	ldc.i4 -2392
 	add
 	stloc 5
-// 0x01050878: 0x1050878: addiu a0, a0, -1960
+// 0x01050888: 0x1050888: addiu a0, a0, -1496
 	ldloc.1
-	ldc.i4 -1960
+	ldc.i4 -1496
 	add
 	stloc.1
-// 0x0105087c: 0x105087c: addiu v1, zero, -1
+// 0x0105088c: 0x105088c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_1050880:
-// 0x01050880: 0x1050880: sw    v1, 0(v0)
+L_1050890:
+// 0x01050890: 0x1050890: sw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01050884: 0x1050884: sw    zero, -8(v0)
+// 0x01050894: 0x1050894: sw    zero, -8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6504,38 +6504,38 @@ L_1050880:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01050888: 0x1050888: addiu v0, v0, 56
+// 0x01050898: 0x1050898: addiu v0, v0, 56
 	ldloc 5
 	ldc.i4.s 56
 	add
 	stloc 5
-// 0x0105088c: 0x105088c: bne   v0, a0, 0x1050880 sll   zero, zero, 0
+// 0x0105089c: 0x105089c: bne   v0, a0, 0x1050890 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_1050880
+	bne.un L_1050890
 // --- basic block ---
-// 0x01050894: 0x1050894: lui   a0, 0x1050000
+// 0x010508a4: 0x10508a4: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01050898: 0x1050898: jal   0x102c180 addiu a0, a0, 2300
+// 0x010508a8: 0x10508a8: jal   0x102c190 addiu a0, a0, 2316
 	ldloc.1
-	ldc.i4 2300
+	ldc.i4 2316
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl32::roadmap_start_subscribe_102c180(int32)
+	call int32 Cibyl32::roadmap_start_subscribe_102c190(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010508a0: 0x10508a0: beq   s1, zero, 0x10508bc sll   zero, zero, 0
+// 0x010508b0: 0x10508b0: beq   s1, zero, 0x10508cc sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10508bc
+	brfalse L_10508cc
 // --- basic block ---
-// 0x010508a8: 0x10508a8: addu  a1, s1, zero
+// 0x010508b8: 0x10508b8: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x010508ac: 0x10508ac: jal   0x1001b14 addu  a0, s0, zero
+// 0x010508bc: 0x10508bc: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -6543,14 +6543,14 @@ L_1050880:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010508b4: 0x10508b4: beq   v0, zero, 0x10508e0 addu  a0, zero, zero
+// 0x010508c4: 0x10508c4: beq   v0, zero, 0x10508f0 addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10508e0
+	brfalse L_10508f0
 // --- basic block ---
-L_10508bc:
-// 0x010508bc: 0x10508bc: jal   0x10535f8 addu  a0, s0, zero
+L_10508cc:
+// 0x010508cc: 0x10508cc: jal   0x1053608 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6558,31 +6558,31 @@ L_10508bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_version_write_10535f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_version_write_1053608(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010508c4: 0x10508c4: jal   0x104c564 sll   zero, zero, 0
+// 0x010508d4: 0x10508d4: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010508cc: 0x10508cc: lui   a1, 0x10000
+// 0x010508dc: 0x10508dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010508d0: 0x10508d0: addu  a0, v0, zero
+// 0x010508e0: 0x10508e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010508d4: 0x10508d4: jal   0x104da04 addiu a1, a1, 4468
+// 0x010508e4: 0x10508e4: jal   0x104da14 addiu a1, a1, 4464
 	ldloc.2
-	ldc.i4 4468
+	ldc.i4 4464
 	add
 	stloc.2
 	ldloc.0
@@ -6590,16 +6590,16 @@ L_10508bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_remove_104da04(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_remove_104da14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010508dc: 0x10508dc: addu  a0, zero, zero
+// 0x010508ec: 0x10508ec: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_10508e0:
-// 0x010508e0: 0x10508e0: jal   0x102dcbc addu  a1, zero, zero
+L_10508f0:
+// 0x010508f0: 0x10508f0: jal   0x102dccc addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6607,13 +6607,13 @@ L_10508e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_102dcbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_102dccc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010508e8: 0x10508e8: lw    ra, 28(sp)
-// 0x010508ec: 0x10508ec: lw    s1, 24(sp)
+// 0x010508f8: 0x10508f8: lw    ra, 28(sp)
+// 0x010508fc: 0x10508fc: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6622,7 +6622,7 @@ L_10508e0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010508f0: 0x10508f0: lw    s0, 20(sp)
+// 0x01050900: 0x1050900: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6631,7 +6631,7 @@ L_10508e0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010508f4: 0x10508f4: jr    ra addiu sp, sp, 32
+// 0x01050904: 0x1050904: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6643,7 +6643,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_start_event_10508fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_start_event_105090c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -6678,34 +6678,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010508fc: 0x10508fc: addiu sp, sp, -24
+// 0x0105090c: 0x105090c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01050900: 0x1050900: addiu v0, zero, 1
+// 0x01050910: 0x1050910: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01050904: 0x1050904: bne   a0, v0, 0x1050914 sw    ra, 20(sp)
+// 0x01050914: 0x1050914: bne   a0, v0, 0x1050924 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1050914
+	bne.un L_1050924
 // --- basic block ---
-// 0x0105090c: 0x105090c: jal   0x10ac7a4 sll   zero, zero, 0
+// 0x0105091c: 0x105091c: jal   0x10acdec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_main_check_map_10ac7a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_main_check_map_10acdec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1050914:
-// 0x01050914: 0x1050914: lw    ra, 20(sp)
-// 0x01050918: 0x1050918: sll   zero, zero, 0
-// 0x0105091c: 0x105091c: jr    ra addiu sp, sp, 24
+L_1050924:
+// 0x01050924: 0x1050924: lw    ra, 20(sp)
+// 0x01050928: 0x1050928: sll   zero, zero, 0
+// 0x0105092c: 0x105092c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6717,7 +6717,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rim_backlight_on_callback_1050924(int32,int32,int32,int32,int32)
+.method public static int32 rim_backlight_on_callback_1050934(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -6758,13 +6758,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050924: 0x1050924: addiu sp, sp, -32
+// 0x01050934: 0x1050934: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01050928: 0x1050928: sw    ra, 28(sp)
-// 0x0105092c: 0x105092c: sw    s1, 24(sp)
+// 0x01050938: 0x1050938: sw    ra, 28(sp)
+// 0x0105093c: 0x105093c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6773,7 +6773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01050930: 0x1050930: sw    s0, 20(sp)
+// 0x01050940: 0x1050940: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6782,15 +6782,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01050934: 0x1050934: cibyl_sysc 0x166a
+// 0x01050944: 0x1050944: cibyl_sysc 0x166a
 	call void [WazeWP7]Syscalls::NOPH_DeviceSpecific_setBacklightOn()
-// 0x01050938: 0x1050938: addu  v1, v0, zero
+// 0x01050948: 0x1050948: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0105093c: 0x105093c: lui   s0, 0x0
+// 0x0105094c: 0x105094c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01050940: 0x1050940: lw    v0, 13828(s0)
+// 0x01050950: 0x1050950: lw    v0, 13828(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6799,35 +6799,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01050944: 0x1050944: sll   zero, zero, 0
-// 0x01050948: 0x1050948: beq   v0, zero, 0x1050990 lui   s1, 0x0
+// 0x01050954: 0x1050954: sll   zero, zero, 0
+// 0x01050958: 0x1050958: beq   v0, zero, 0x10509a0 lui   s1, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_1050990
+	brfalse L_10509a0
 // --- basic block ---
-// 0x01050950: 0x1050950: lui   a0, 0x10000
+// 0x01050960: 0x1050960: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050954: 0x1050954: lui   a2, 0x10000
+// 0x01050964: 0x1050964: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01050958: 0x1050958: addiu a2, a2, -16892
+// 0x01050968: 0x1050968: addiu a2, a2, 19396
 	ldloc.3
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc.3
-// 0x0105095c: 0x105095c: addiu a1, s1, 13812
+// 0x0105096c: 0x105096c: addiu a1, s1, 13812
 	ldloc 9
 	ldc.i4 13812
 	add
 	stloc.2
-// 0x01050960: 0x1050960: addu  a3, zero, zero
+// 0x01050970: 0x1050970: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01050964: 0x1050964: jal   0x100edb0 addiu a0, a0, 12560
+// 0x01050974: 0x1050974: jal   0x100edc0 addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
 	ldloc.0
@@ -6835,12 +6835,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105096c: 0x105096c: jal   0x100e788 addiu a0, s1, 13812
+// 0x0105097c: 0x105097c: jal   0x100e798 addiu a0, s1, 13812
 	ldloc 9
 	ldc.i4 13812
 	add
@@ -6850,27 +6850,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01050974: 0x1050974: addu  a0, v0, zero
+// 0x01050984: 0x1050984: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01050978: 0x1050978: addiu v1, zero, 30
+// 0x01050988: 0x1050988: addiu v1, zero, 30
 	ldc.i4.s 30
 	stloc 7
-// 0x0105097c: 0x105097c: cibyl_sysc_arg 0x3
+// 0x0105098c: 0x105098c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01050980: 0x1050980: cibyl_sysc_arg 0x4
+// 0x01050990: 0x1050990: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01050984: 0x1050984: cibyl_sysc 0x168d
+// 0x01050994: 0x1050994: cibyl_sysc 0x168d
 	call void [WazeWP7]Syscalls::NOPH_DeviceSpecific_init(int32,int32)
-// 0x01050988: 0x1050988: addu  v1, v0, zero
+// 0x01050998: 0x1050998: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0105098c: 0x105098c: sw    zero, 13828(s0)
+// 0x0105099c: 0x105099c: sw    zero, 13828(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6879,9 +6879,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1050990:
-// 0x01050990: 0x1050990: lw    ra, 28(sp)
-// 0x01050994: 0x1050994: lw    s1, 24(sp)
+L_10509a0:
+// 0x010509a0: 0x10509a0: lw    ra, 28(sp)
+// 0x010509a4: 0x10509a4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6890,7 +6890,7 @@ L_1050990:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01050998: 0x1050998: lw    s0, 20(sp)
+// 0x010509a8: 0x10509a8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6899,7 +6899,7 @@ L_1050990:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105099c: 0x105099c: jr    ra addiu sp, sp, 32
+// 0x010509ac: 0x10509ac: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6911,7 +6911,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_main_sound_level_init_10509a4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_sound_level_init_10509b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 s0,int32 v0,int32[] mem,int32 ra)
@@ -6949,12 +6949,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010509a4: 0x10509a4: addiu sp, sp, -24
+// 0x010509b4: 0x10509b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010509a8: 0x10509a8: sw    s0, 16(sp)
+// 0x010509b8: 0x10509b8: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6963,32 +6963,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010509ac: 0x10509ac: lui   a0, 0x20000
+// 0x010509bc: 0x10509bc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010509b0: 0x10509b0: lui   s0, 0x0
+// 0x010509c0: 0x10509c0: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x010509b4: 0x10509b4: lui   a2, 0x10000
+// 0x010509c4: 0x10509c4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010509b8: 0x10509b8: addiu a2, a2, 4488
+// 0x010509c8: 0x10509c8: addiu a2, a2, 4484
 	ldloc.3
-	ldc.i4 4488
+	ldc.i4 4484
 	add
 	stloc.3
-// 0x010509bc: 0x10509bc: addiu a1, s0, 13832
+// 0x010509cc: 0x10509cc: addiu a1, s0, 13832
 	ldloc 6
 	ldc.i4 13832
 	add
 	stloc.2
-// 0x010509c0: 0x10509c0: addu  a3, zero, zero
+// 0x010509d0: 0x10509d0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010509c4: 0x10509c4: sw    ra, 20(sp)
-// 0x010509c8: 0x10509c8: jal   0x100edb0 addiu a0, a0, -26888
+// 0x010509d4: 0x10509d4: sw    ra, 20(sp)
+// 0x010509d8: 0x10509d8: jal   0x100edc0 addiu a0, a0, -26424
 	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
 	ldloc.0
@@ -6996,12 +6996,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010509d0: 0x10509d0: jal   0x100e788 addiu a0, s0, 13832
+// 0x010509e0: 0x10509e0: jal   0x100e798 addiu a0, s0, 13832
 	ldloc 6
 	ldc.i4 13832
 	add
@@ -7011,23 +7011,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x010509d8: 0x10509d8: addu  v1, v0, zero
+// 0x010509e8: 0x10509e8: addu  v1, v0, zero
 	ldloc 7
 	stloc 5
-// 0x010509dc: 0x10509dc: cibyl_sysc_arg 0x3
+// 0x010509ec: 0x10509ec: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x010509e0: 0x10509e0: cibyl_sysc 0x16a6
+// 0x010509f0: 0x10509f0: cibyl_sysc 0x16a6
 	call void [WazeWP7]Syscalls::NOPH_SoundMgr_setVolume(int32)
-// 0x010509e4: 0x10509e4: addu  v1, v0, zero
+// 0x010509f4: 0x10509f4: addu  v1, v0, zero
 	ldloc 7
 	stloc 5
-// 0x010509e8: 0x10509e8: lw    ra, 20(sp)
-// 0x010509ec: 0x10509ec: lw    s0, 16(sp)
+// 0x010509f8: 0x10509f8: lw    ra, 20(sp)
+// 0x010509fc: 0x10509fc: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7036,7 +7036,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010509f0: 0x10509f0: jr    ra addiu sp, sp, 24
+// 0x01050a00: 0x1050a00: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7048,7 +7048,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_main_set_sound_level_10509f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_set_sound_level_1050a08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -7086,12 +7086,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010509f8: 0x10509f8: addiu sp, sp, -24
+// 0x01050a08: 0x1050a08: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010509fc: 0x10509fc: sw    s0, 16(sp)
+// 0x01050a0c: 0x1050a0c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7100,24 +7100,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01050a00: 0x1050a00: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x01050a10: 0x1050a10: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01050a04: 0x1050a04: lui   s0, 0x70000
+// 0x01050a14: 0x1050a14: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050a08: 0x1050a08: addu  a2, a0, zero
+// 0x01050a18: 0x1050a18: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x01050a0c: 0x1050a0c: addiu a1, a1, -13884
+// 0x01050a1c: 0x1050a1c: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01050a10: 0x1050a10: sw    ra, 20(sp)
-// 0x01050a14: 0x1050a14: jal   0x1000f64 addiu a0, s0, -3904
+// 0x01050a20: 0x1050a20: sw    ra, 20(sp)
+// 0x01050a24: 0x1050a24: jal   0x1000f64 addiu a0, s0, -3440
 	ldloc 5
-	ldc.i4 -3904
+	ldc.i4 -3440
 	add
 	stloc.1
 	ldloc.0
@@ -7130,15 +7130,15 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01050a1c: 0x1050a1c: lui   a0, 0x0
+// 0x01050a2c: 0x1050a2c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01050a20: 0x1050a20: addiu a1, s0, -3904
+// 0x01050a30: 0x1050a30: addiu a1, s0, -3440
 	ldloc 5
-	ldc.i4 -3904
+	ldc.i4 -3440
 	add
 	stloc.2
-// 0x01050a24: 0x1050a24: jal   0x100e5c0 addiu a0, a0, 13832
+// 0x01050a34: 0x1050a34: jal   0x100e5d0 addiu a0, a0, 13832
 	ldloc.1
 	ldc.i4 13832
 	add
@@ -7148,13 +7148,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01050a2c: 0x1050a2c: lw    ra, 20(sp)
-// 0x01050a30: 0x1050a30: lw    s0, 16(sp)
+// 0x01050a3c: 0x1050a3c: lw    ra, 20(sp)
+// 0x01050a40: 0x1050a40: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7163,7 +7163,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050a34: 0x1050a34: jr    ra addiu sp, sp, 24
+// 0x01050a44: 0x1050a44: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7175,7 +7175,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_main_write_exception_to_log_1050a3c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_write_exception_to_log_1050a4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -7213,15 +7213,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050a3c: 0x1050a3c: addiu sp, sp, -32
+// 0x01050a4c: 0x1050a4c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01050a40: 0x1050a40: lui   v0, 0x70000
+// 0x01050a50: 0x1050a50: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050a44: 0x1050a44: sw    s0, 24(sp)
+// 0x01050a54: 0x1050a54: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7230,44 +7230,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01050a48: 0x1050a48: lw    v0, -3908(v0)
+// 0x01050a58: 0x1050a58: lw    v0, -3444(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -977
+	ldc.i4 -861
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050a4c: 0x1050a4c: lui   s0, 0x70000
+// 0x01050a5c: 0x1050a5c: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01050a50: 0x1050a50: lui   a2, 0x10000
+// 0x01050a60: 0x1050a60: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01050a54: 0x1050a54: lui   a3, 0x70000
+// 0x01050a64: 0x1050a64: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01050a58: 0x1050a58: addiu a0, s0, -3900
+// 0x01050a68: 0x1050a68: addiu a0, s0, -3436
 	ldloc 7
-	ldc.i4 -3900
+	ldc.i4 -3436
 	add
 	stloc.1
-// 0x01050a5c: 0x1050a5c: addiu a2, a2, 4492
+// 0x01050a6c: 0x1050a6c: addiu a2, a2, 4488
 	ldloc.3
-	ldc.i4 4492
+	ldc.i4 4488
 	add
 	stloc.3
-// 0x01050a60: 0x1050a60: addiu a3, a3, -1684
+// 0x01050a70: 0x1050a70: addiu a3, a3, -1220
 	ldloc 4
-	ldc.i4 -1684
+	ldc.i4 -1220
 	add
 	stloc 4
-// 0x01050a64: 0x1050a64: addiu a1, zero, 1000
+// 0x01050a74: 0x1050a74: addiu a1, zero, 1000
 	ldc.i4 1000
 	stloc.2
-// 0x01050a68: 0x1050a68: sw    ra, 28(sp)
-// 0x01050a6c: 0x1050a6c: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01050a78: 0x1050a78: sw    ra, 28(sp)
+// 0x01050a7c: 0x1050a7c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7286,23 +7286,23 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01050a74: 0x1050a74: lui   a1, 0x10000
+// 0x01050a84: 0x1050a84: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01050a78: 0x1050a78: addiu a3, s0, -3900
+// 0x01050a88: 0x1050a88: addiu a3, s0, -3436
 	ldloc 7
-	ldc.i4 -3900
+	ldc.i4 -3436
 	add
 	stloc 4
-// 0x01050a7c: 0x1050a7c: addiu a1, a1, 3972
+// 0x01050a8c: 0x1050a8c: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050a80: 0x1050a80: addiu a0, zero, 4
+// 0x01050a90: 0x1050a90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050a84: 0x1050a84: jal   0x100449c addiu a2, zero, 1199
+// 0x01050a94: 0x1050a94: jal   0x100449c addiu a2, zero, 1199
 	ldc.i4 1199
 	stloc.3
 	ldloc.0
@@ -7315,8 +7315,8 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01050a8c: 0x1050a8c: lw    ra, 28(sp)
-// 0x01050a90: 0x1050a90: lw    s0, 24(sp)
+// 0x01050a9c: 0x1050a9c: lw    ra, 28(sp)
+// 0x01050aa0: 0x1050aa0: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7325,7 +7325,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01050a94: 0x1050a94: jr    ra addiu sp, sp, 32
+// 0x01050aa4: 0x1050aa4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl6.j b/converted/Cibyl6.j
index 2ff32ba..32a1320 100644
--- a/converted/Cibyl6.j
+++ b/converted/Cibyl6.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl6::.ctor
 
-.method public static int32 roadmap_math_arccosine_1008a70(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_arccosine_1008a80(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 t2,int32 lo,int32 t4,int32[] mem,int32 t1,int32 t3,int32 t0,int32 ra)
@@ -94,77 +94,77 @@
 	stloc 10
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008a70: 0x1008a70: addiu sp, sp, -32
+// 0x01008a80: 0x1008a80: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01008a74: 0x1008a74: sw    ra, 28(sp)
-// 0x01008a78: 0x1008a78: addu  v1, a0, zero
+// 0x01008a84: 0x1008a84: sw    ra, 28(sp)
+// 0x01008a88: 0x1008a88: addu  v1, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01008a7c: 0x1008a7c: bgez  a0, 0x1008a8c addu  t0, zero, zero
+// 0x01008a8c: 0x1008a8c: bgez  a0, 0x1008a9c addu  t0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 13
 	ldc.i4.s 0
-	bge L_1008a8c
+	bge L_1008a9c
 // --- basic block ---
-// 0x01008a84: 0x1008a84: subu  v1, zero, a0
+// 0x01008a94: 0x1008a94: subu  v1, zero, a0
 	ldloc.1
 	neg
 	stloc 6
-// 0x01008a88: 0x1008a88: addiu t0, zero, 1
+// 0x01008a98: 0x1008a98: addiu t0, zero, 1
 	ldc.i4.1
 	stloc 13
-L_1008a8c:
-// 0x01008a8c: 0x1008a8c: ori   v0, zero, 32768
+L_1008a9c:
+// 0x01008a9c: 0x1008a9c: ori   v0, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 5
-// 0x01008a90: 0x1008a90: slt   a0, v1, v0
+// 0x01008aa0: 0x1008aa0: slt   a0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc.1
-// 0x01008a94: 0x1008a94: bne   a0, zero, 0x1008ad0 sll   zero, zero, 0
+// 0x01008aa4: 0x1008aa4: bne   a0, zero, 0x1008ae0 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1008ad0
+	brtrue L_1008ae0
 // --- basic block ---
-// 0x01008a9c: 0x1008a9c: bne   v1, v0, 0x1008aac addiu a0, zero, 4
+// 0x01008aac: 0x1008aac: bne   v1, v0, 0x1008abc addiu a0, zero, 4
 	ldloc 6
 	ldloc 5
 	ldc.i4.4
 	stloc.1
-	bne.un L_1008aac
+	bne.un L_1008abc
 // --- basic block ---
-// 0x01008aa4: 0x1008aa4: j	 0x1008af0 addiu v1, zero, 32767
+// 0x01008ab4: 0x1008ab4: j	 0x1008b00 addiu v1, zero, 32767
 	ldc.i4 32767
 	stloc 6
-	br L_1008af0
+	br L_1008b00
 // --- basic block ---
-L_1008aac:
-// 0x01008aac: 0x1008aac: lui   a1, 0x0
+L_1008abc:
+// 0x01008abc: 0x1008abc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01008ab0: 0x1008ab0: lui   a3, 0x0
+// 0x01008ac0: 0x1008ac0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01008ab4: 0x1008ab4: addiu a1, a1, 24004
+// 0x01008ac4: 0x1008ac4: addiu a1, a1, 24004
 	ldloc.2
 	ldc.i4 24004
 	add
 	stloc.2
-// 0x01008ab8: 0x1008ab8: addiu a3, a3, 24060
+// 0x01008ac8: 0x1008ac8: addiu a3, a3, 24060
 	ldloc 4
 	ldc.i4 24060
 	add
 	stloc 4
-// 0x01008abc: 0x1008abc: addiu a2, zero, 176
+// 0x01008acc: 0x1008acc: addiu a2, zero, 176
 	ldc.i4 176
 	stloc.3
-// 0x01008ac0: 0x1008ac0: jal   0x100449c sw    v1, 16(sp)
+// 0x01008ad0: 0x1008ad0: jal   0x100449c sw    v1, 16(sp)
 	ldloc 10
 	ldloc.0
 	ldc.i4.2
@@ -183,84 +183,84 @@ L_1008aac:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01008ac8: 0x1008ac8: j	 0x1008bfc addu  v0, zero, zero
+// 0x01008ad8: 0x1008ad8: j	 0x1008c0c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1008bfc
+	br L_1008c0c
 // --- basic block ---
-L_1008ad0:
-// 0x01008ad0: 0x1008ad0: slti  v0, v1, 23170
+L_1008ae0:
+// 0x01008ae0: 0x1008ae0: slti  v0, v1, 23170
 	ldloc 6
 	ldc.i4 23170
 	clt
 	stloc 5
-// 0x01008ad4: 0x1008ad4: beq   v0, zero, 0x1008af0 addiu a0, zero, 45
+// 0x01008ae4: 0x1008ae4: beq   v0, zero, 0x1008b00 addiu a0, zero, 45
 	ldloc 5
 	ldc.i4.s 45
 	stloc.1
-	brfalse L_1008af0
+	brfalse L_1008b00
 // --- basic block ---
-// 0x01008adc: 0x1008adc: lui   t2, 0x20000
+// 0x01008aec: 0x1008aec: lui   t2, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01008ae0: 0x1008ae0: addiu t2, t2, 24376
+// 0x01008af0: 0x1008af0: addiu t2, t2, 24840
 	ldloc 7
-	ldc.i4 24376
+	ldc.i4 24840
 	add
 	stloc 7
-// 0x01008ae4: 0x1008ae4: addu  a3, zero, zero
+// 0x01008af4: 0x1008af4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01008ae8: 0x1008ae8: j	 0x1008bc0 addiu t1, zero, 2
+// 0x01008af8: 0x1008af8: j	 0x1008bd0 addiu t1, zero, 2
 	ldc.i4.2
 	stloc 11
-	br L_1008bc0
+	br L_1008bd0
 // --- basic block ---
-L_1008af0:
-// 0x01008af0: 0x1008af0: lui   t2, 0x20000
+L_1008b00:
+// 0x01008b00: 0x1008b00: lui   t2, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01008af4: 0x1008af4: addiu t2, t2, 24376
+// 0x01008b04: 0x1008b04: addiu t2, t2, 24840
 	ldloc 7
-	ldc.i4 24376
+	ldc.i4 24840
 	add
 	stloc 7
-// 0x01008af8: 0x1008af8: addiu a2, zero, 45
+// 0x01008b08: 0x1008b08: addiu a2, zero, 45
 	ldc.i4.s 45
 	stloc.3
-// 0x01008afc: 0x1008afc: addu  a3, zero, zero
+// 0x01008b0c: 0x1008b0c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01008b00: 0x1008b00: j	 0x1008b4c addiu t1, zero, 2
+// 0x01008b10: 0x1008b10: j	 0x1008b5c addiu t1, zero, 2
 	ldc.i4.2
 	stloc 11
-	br L_1008b4c
+	br L_1008b5c
 // --- basic block ---
-L_1008b08:
-// 0x01008b08: 0x1008b08: div   a0, t1
+L_1008b18:
+// 0x01008b18: 0x1008b18: div   a0, t1
 	ldloc.1
 	ldloc 11
 	div
 	stloc 8
-// 0x01008b0c: 0x1008b0c: mflo  lo
+// 0x01008b1c: 0x1008b1c: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01008b10: 0x1008b10: addiu v0, a0, -1
+// 0x01008b20: 0x1008b20: addiu v0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01008b14: 0x1008b14: sll   t4, v0, 3
+// 0x01008b24: 0x1008b24: sll   t4, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 9
-// 0x01008b18: 0x1008b18: addu  t4, t2, t4
+// 0x01008b28: 0x1008b28: addu  t4, t2, t4
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-// 0x01008b1c: 0x1008b1c: lw    t4, 4(t4)
+// 0x01008b2c: 0x1008b2c: lw    t4, 4(t4)
 	ldloc 10
 	ldloc 9
 	ldc.i4.2
@@ -269,31 +269,31 @@ L_1008b08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01008b20: 0x1008b20: sll   t3, a0, 3
+// 0x01008b30: 0x1008b30: sll   t3, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc 12
-// 0x01008b24: 0x1008b24: slt   t4, t4, v1
+// 0x01008b34: 0x1008b34: slt   t4, t4, v1
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 9
-// 0x01008b28: 0x1008b28: beq   t4, zero, 0x1008b38 addu  t3, t2, t3
+// 0x01008b38: 0x1008b38: beq   t4, zero, 0x1008b48 addu  t3, t2, t3
 	ldloc 9
 	ldloc 7
 	ldloc 12
 	add
 	stloc 12
-	brfalse L_1008b38
+	brfalse L_1008b48
 // --- basic block ---
-// 0x01008b30: 0x1008b30: j	 0x1008b4c addu  a2, v0, zero
+// 0x01008b40: 0x1008b40: j	 0x1008b5c addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-	br L_1008b4c
+	br L_1008b5c
 // --- basic block ---
-L_1008b38:
-// 0x01008b38: 0x1008b38: lw    v0, 4(t3)
+L_1008b48:
+// 0x01008b48: 0x1008b48: lw    v0, 4(t3)
 	ldloc 10
 	ldloc 12
 	ldc.i4.2
@@ -302,109 +302,109 @@ L_1008b38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008b3c: 0x1008b3c: mflo  lo
+// 0x01008b4c: 0x1008b4c: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x01008b40: 0x1008b40: slt   v0, v1, v0
+// 0x01008b50: 0x1008b50: slt   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x01008b44: 0x1008b44: beq   v0, zero, 0x1008bdc mult  a0, a1
+// 0x01008b54: 0x1008b54: beq   v0, zero, 0x1008bec mult  a0, a1
 	ldloc 5
 	ldloc.1
 	ldloc.2
 	mul
 	stloc 8
-	brfalse L_1008bdc
+	brfalse L_1008bec
 // --- basic block ---
-L_1008b4c:
-// 0x01008b4c: 0x1008b4c: addiu v0, a3, 1
+L_1008b5c:
+// 0x01008b5c: 0x1008b5c: addiu v0, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01008b50: 0x1008b50: slt   v0, v0, a2
+// 0x01008b60: 0x1008b60: slt   v0, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc 5
-// 0x01008b54: 0x1008b54: bne   v0, zero, 0x1008b08 addu  a0, a2, a3
+// 0x01008b64: 0x1008b64: bne   v0, zero, 0x1008b18 addu  a0, a2, a3
 	ldloc 5
 	ldloc.3
 	ldloc 4
 	add
 	stloc.1
-	brtrue L_1008b08
+	brtrue L_1008b18
 // --- basic block ---
-// 0x01008b5c: 0x1008b5c: j	 0x1008bd8 addu  a0, a2, zero
+// 0x01008b6c: 0x1008b6c: j	 0x1008be8 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-	br L_1008bd8
+	br L_1008be8
 // --- basic block ---
-L_1008b64:
-// 0x01008b64: 0x1008b64: div   v0, t1
+L_1008b74:
+// 0x01008b74: 0x1008b74: div   v0, t1
 	ldloc 5
 	ldloc 11
 	div
 	stloc 8
-// 0x01008b68: 0x1008b68: mflo  lo
+// 0x01008b78: 0x1008b78: mflo  lo
 	ldloc 8
 	stloc.3
-// 0x01008b6c: 0x1008b6c: sll   v0, a2, 3
+// 0x01008b7c: 0x1008b7c: sll   v0, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01008b70: 0x1008b70: addu  v0, v0, t2
+// 0x01008b80: 0x1008b80: addu  v0, v0, t2
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01008b74: 0x1008b74: lw    v0, 0(v0)
+// 0x01008b84: 0x1008b84: lw    v0, 0(v0)
 	ldloc 10
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01008b78: 0x1008b78: sll   zero, zero, 0
-// 0x01008b7c: 0x1008b7c: slt   v0, v1, v0
+// 0x01008b88: 0x1008b88: sll   zero, zero, 0
+// 0x01008b8c: 0x1008b8c: slt   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x01008b80: 0x1008b80: bne   v0, zero, 0x1008b94 sll   zero, zero, 0
+// 0x01008b90: 0x1008b90: bne   v0, zero, 0x1008ba4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1008b94
+	brtrue L_1008ba4
 // --- basic block ---
-// 0x01008b88: 0x1008b88: mflo  lo
+// 0x01008b98: 0x1008b98: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x01008b8c: 0x1008b8c: j	 0x1008bc4 addiu a2, a3, 1
+// 0x01008b9c: 0x1008b9c: j	 0x1008bd4 addiu a2, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc.3
-	br L_1008bc4
+	br L_1008bd4
 // --- basic block ---
-L_1008b94:
-// 0x01008b94: 0x1008b94: addiu a0, a2, -1
+L_1008ba4:
+// 0x01008ba4: 0x1008ba4: addiu a0, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01008b98: 0x1008b98: sll   v0, a0, 3
+// 0x01008ba8: 0x1008ba8: sll   v0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01008b9c: 0x1008b9c: addu  v0, t2, v0
+// 0x01008bac: 0x1008bac: addu  v0, t2, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01008ba0: 0x1008ba0: lw    v0, 4(v0)
+// 0x01008bb0: 0x1008bb0: lw    v0, 4(v0)
 	ldloc 10
 	ldloc 5
 	ldc.i4.2
@@ -413,96 +413,96 @@ L_1008b94:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008ba4: 0x1008ba4: sll   zero, zero, 0
-// 0x01008ba8: 0x1008ba8: slt   v0, v1, v0
+// 0x01008bb4: 0x1008bb4: sll   zero, zero, 0
+// 0x01008bb8: 0x1008bb8: slt   v0, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x01008bac: 0x1008bac: bne   v0, zero, 0x1008bc4 addiu a2, a3, 1
+// 0x01008bbc: 0x1008bbc: bne   v0, zero, 0x1008bd4 addiu a2, a3, 1
 	ldloc 5
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc.3
-	brtrue L_1008bc4
+	brtrue L_1008bd4
 // --- basic block ---
-// 0x01008bb4: 0x1008bb4: mflo  lo
+// 0x01008bc4: 0x1008bc4: mflo  lo
 	ldloc 8
 	stloc.1
-// 0x01008bb8: 0x1008bb8: j	 0x1008bd4 addiu v0, zero, 90
+// 0x01008bc8: 0x1008bc8: j	 0x1008be4 addiu v0, zero, 90
 	ldc.i4.s 90
 	stloc 5
-	br L_1008bd4
+	br L_1008be4
 // --- basic block ---
-L_1008bc0:
-// 0x01008bc0: 0x1008bc0: addiu a2, a3, 1
+L_1008bd0:
+// 0x01008bd0: 0x1008bd0: addiu a2, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc.3
-L_1008bc4:
-// 0x01008bc4: 0x1008bc4: slt   a2, a2, a0
+L_1008bd4:
+// 0x01008bd4: 0x1008bd4: slt   a2, a2, a0
 	ldloc.3
 	ldloc.1
 	clt
 	stloc.3
-// 0x01008bc8: 0x1008bc8: bne   a2, zero, 0x1008b64 addu  v0, a3, a0
+// 0x01008bd8: 0x1008bd8: bne   a2, zero, 0x1008b74 addu  v0, a3, a0
 	ldloc.3
 	ldloc 4
 	ldloc.1
 	add
 	stloc 5
-	brtrue L_1008b64
+	brtrue L_1008b74
 // --- basic block ---
-// 0x01008bd0: 0x1008bd0: addiu v0, zero, 90
+// 0x01008be0: 0x1008be0: addiu v0, zero, 90
 	ldc.i4.s 90
 	stloc 5
-L_1008bd4:
-// 0x01008bd4: 0x1008bd4: subu  a0, v0, a0
+L_1008be4:
+// 0x01008be4: 0x1008be4: subu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc.1
-L_1008bd8:
-// 0x01008bd8: 0x1008bd8: mult  a0, a1
+L_1008be8:
+// 0x01008be8: 0x1008be8: mult  a0, a1
 	ldloc.1
 	ldloc.2
 	mul
 	stloc 8
-L_1008bdc:
-// 0x01008bdc: 0x1008bdc: mflo  lo
+L_1008bec:
+// 0x01008bec: 0x1008bec: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x01008be0: 0x1008be0: beq   t0, zero, 0x1008bfc addiu v1, zero, 180
+// 0x01008bf0: 0x1008bf0: beq   t0, zero, 0x1008c0c addiu v1, zero, 180
 	ldloc 13
 	ldc.i4 180
 	stloc 6
-	brfalse L_1008bfc
+	brfalse L_1008c0c
 // --- basic block ---
-// 0x01008be8: 0x1008be8: subu  v0, v1, v0
+// 0x01008bf8: 0x1008bf8: subu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 5
-// 0x01008bec: 0x1008bec: slti  v1, v0, 181
+// 0x01008bfc: 0x1008bfc: slti  v1, v0, 181
 	ldloc 5
 	ldc.i4 181
 	clt
 	stloc 6
-// 0x01008bf0: 0x1008bf0: bne   v1, zero, 0x1008bfc sll   zero, zero, 0
+// 0x01008c00: 0x1008c00: bne   v1, zero, 0x1008c0c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1008bfc
+	brtrue L_1008c0c
 // --- basic block ---
-// 0x01008bf8: 0x1008bf8: addiu v0, v0, -360
+// 0x01008c08: 0x1008c08: addiu v0, v0, -360
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-L_1008bfc:
-// 0x01008bfc: 0x1008bfc: lw    ra, 28(sp)
-// 0x01008c00: 0x1008c00: sll   zero, zero, 0
-// 0x01008c04: 0x1008c04: jr    ra addiu sp, sp, 32
+L_1008c0c:
+// 0x01008c0c: 0x1008c0c: lw    ra, 28(sp)
+// 0x01008c10: 0x1008c10: sll   zero, zero, 0
+// 0x01008c14: 0x1008c14: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -514,7 +514,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_to_current_unit_1008c0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_to_current_unit_1008c1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -555,12 +555,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008c0c: 0x1008c0c: addiu sp, sp, -40
+// 0x01008c1c: 0x1008c1c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01008c10: 0x1008c10: sw    s1, 32(sp)
+// 0x01008c20: 0x1008c20: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -569,13 +569,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01008c14: 0x1008c14: addu  s1, a1, zero
+// 0x01008c24: 0x1008c24: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01008c18: 0x1008c18: lui   a1, 0x0
+// 0x01008c28: 0x1008c28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01008c1c: 0x1008c1c: sw    s0, 28(sp)
+// 0x01008c2c: 0x1008c2c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -584,16 +584,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01008c20: 0x1008c20: addiu a1, a1, 24084
+// 0x01008c30: 0x1008c30: addiu a1, a1, 24084
 	ldloc.2
 	ldc.i4 24084
 	add
 	stloc.2
-// 0x01008c24: 0x1008c24: addu  s0, a0, zero
+// 0x01008c34: 0x1008c34: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01008c28: 0x1008c28: sw    ra, 36(sp)
-// 0x01008c2c: 0x1008c2c: jal   0x1001c08 addu  a0, s1, zero
+// 0x01008c38: 0x1008c38: sw    ra, 36(sp)
+// 0x01008c3c: 0x1008c3c: jal   0x1001c08 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -606,33 +606,33 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008c34: 0x1008c34: bne   v0, zero, 0x1008c94 lui   a1, 0x0
+// 0x01008c44: 0x1008c44: bne   v0, zero, 0x1008ca4 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1008c94
+	brtrue L_1008ca4
 // --- basic block ---
-// 0x01008c3c: 0x1008c3c: lui   s1, 0x20000
+// 0x01008c4c: 0x1008c4c: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01008c40: 0x1008c40: lw    v0, 31208(s1)
+// 0x01008c50: 0x1008c50: lw    v0, 31672(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7802
+	ldc.i4 7918
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008c44: 0x1008c44: sll   zero, zero, 0
-// 0x01008c48: 0x1008c48: beq   s0, v0, 0x1008c88 lui   v0, 0x20000
+// 0x01008c54: 0x1008c54: sll   zero, zero, 0
+// 0x01008c58: 0x1008c58: beq   s0, v0, 0x1008c98 lui   v0, 0x20000
 	ldloc 8
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_1008c88
+	beq  L_1008c98
 // --- basic block ---
-// 0x01008c50: 0x1008c50: jal   0x10c09ac addu  a0, s0, zero
+// 0x01008c60: 0x1008c60: jal   0x10c0fec addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -640,20 +640,20 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01008c58: 0x1008c58: lui   v1, 0xe0000
+// 0x01008c68: 0x1008c68: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01008c5c: 0x1008c5c: lw    v1, 29720(v1)
+// 0x01008c6c: 0x1008c6c: lw    v1, 30184(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 7
-// 0x01008c60: 0x1008c60: sll   zero, zero, 0
-// 0x01008c64: 0x1008c64: lw    a1, 20(v1)
+// 0x01008c70: 0x1008c70: sll   zero, zero, 0
+// 0x01008c74: 0x1008c74: lw    a1, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -662,15 +662,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008c68: 0x1008c68: jal   0x10c0780 addu  a0, v0, zero
+// 0x01008c78: 0x1008c78: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008c70: 0x1008c70: jal   0x10c08bc addu  a0, v0, zero
+// 0x01008c80: 0x1008c80: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -678,64 +678,64 @@ __CIBYL_javamethod_begin:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01008c78: 0x1008c78: lui   v1, 0x20000
+// 0x01008c88: 0x1008c88: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01008c7c: 0x1008c7c: sw    v0, 31204(v1)
+// 0x01008c8c: 0x1008c8c: sw    v0, 31668(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7801
+	ldc.i4 7917
 	add
 	ldloc 5
 	stelem.i4
-// 0x01008c80: 0x1008c80: sw    s0, 31208(s1)
+// 0x01008c90: 0x1008c90: sw    s0, 31672(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7802
+	ldc.i4 7918
 	add
 	ldloc 8
 	stelem.i4
-// 0x01008c84: 0x1008c84: lui   v0, 0x20000
+// 0x01008c94: 0x1008c94: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_1008c88:
-// 0x01008c88: 0x1008c88: lw    s0, 31204(v0)
+L_1008c98:
+// 0x01008c98: 0x1008c98: lw    s0, 31668(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7801
+	ldc.i4 7917
 	add
 	ldelem.i4
 	stloc 8
-// 0x01008c8c: 0x1008c8c: j	 0x1008cb0 sll   zero, zero, 0
-	br L_1008cb0
+// 0x01008c9c: 0x1008c9c: j	 0x1008cc0 sll   zero, zero, 0
+	br L_1008cc0
 // --- basic block ---
-L_1008c94:
-// 0x01008c94: 0x1008c94: lui   a3, 0x0
+L_1008ca4:
+// 0x01008ca4: 0x1008ca4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01008c98: 0x1008c98: addiu a1, a1, 24004
+// 0x01008ca8: 0x1008ca8: addiu a1, a1, 24004
 	ldloc.2
 	ldc.i4 24004
 	add
 	stloc.2
-// 0x01008c9c: 0x1008c9c: addiu a3, a3, 24088
+// 0x01008cac: 0x1008cac: addiu a3, a3, 24088
 	ldloc 4
 	ldc.i4 24088
 	add
 	stloc 4
-// 0x01008ca0: 0x1008ca0: addiu a0, zero, 4
+// 0x01008cb0: 0x1008cb0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01008ca4: 0x1008ca4: addiu a2, zero, 1660
+// 0x01008cb4: 0x1008cb4: addiu a2, zero, 1660
 	ldc.i4 1660
 	stloc.3
-// 0x01008ca8: 0x1008ca8: jal   0x100449c sw    s1, 16(sp)
+// 0x01008cb8: 0x1008cb8: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -754,12 +754,12 @@ L_1008c94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1008cb0:
-// 0x01008cb0: 0x1008cb0: lw    ra, 36(sp)
-// 0x01008cb4: 0x1008cb4: addu  v0, s0, zero
+L_1008cc0:
+// 0x01008cc0: 0x1008cc0: lw    ra, 36(sp)
+// 0x01008cc4: 0x1008cc4: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x01008cb8: 0x1008cb8: lw    s1, 32(sp)
+// 0x01008cc8: 0x1008cc8: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -768,7 +768,7 @@ L_1008cb0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01008cbc: 0x1008cbc: lw    s0, 28(sp)
+// 0x01008ccc: 0x1008ccc: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -777,7 +777,7 @@ L_1008cb0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01008cc0: 0x1008cc0: jr    ra addiu sp, sp, 40
+// 0x01008cd0: 0x1008cd0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -789,7 +789,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_distance_convert_1008cc8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_distance_convert_1008cd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s1,int32 s0,int32 s5,int32 s2,int32 s3,int32 ra,int32 t0,int32 t1)
@@ -848,15 +848,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008cc8: 0x1008cc8: addiu sp, sp, -64
+// 0x01008cd8: 0x1008cd8: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01008ccc: 0x1008ccc: lui   v0, 0xe0000
+// 0x01008cdc: 0x1008cdc: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01008cd0: 0x1008cd0: sw    s5, 56(sp)
+// 0x01008ce0: 0x1008ce0: sw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -865,24 +865,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01008cd4: 0x1008cd4: lw    s5, 29720(v0)
+// 0x01008ce4: 0x1008ce4: lw    s5, 30184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 11
-// 0x01008cd8: 0x1008cd8: lui   v0, 0x0
+// 0x01008ce8: 0x1008ce8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01008cdc: 0x1008cdc: addiu v0, v0, 388
+// 0x01008cec: 0x1008cec: addiu v0, v0, 388
 	ldloc 5
 	ldc.i4 388
 	add
 	stloc 5
-// 0x01008ce0: 0x1008ce0: sw    s4, 52(sp)
+// 0x01008cf0: 0x1008cf0: sw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -891,7 +891,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01008ce4: 0x1008ce4: sw    s3, 48(sp)
+// 0x01008cf4: 0x1008cf4: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -900,7 +900,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01008ce8: 0x1008ce8: sw    s2, 44(sp)
+// 0x01008cf8: 0x1008cf8: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -909,8 +909,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01008cec: 0x1008cec: sw    ra, 60(sp)
-// 0x01008cf0: 0x1008cf0: sw    s1, 40(sp)
+// 0x01008cfc: 0x1008cfc: sw    ra, 60(sp)
+// 0x01008d00: 0x1008d00: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -919,7 +919,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01008cf4: 0x1008cf4: sw    s0, 36(sp)
+// 0x01008d04: 0x1008d04: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -928,37 +928,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01008cf8: 0x1008cf8: addu  s2, a0, zero
+// 0x01008d08: 0x1008d08: addu  s2, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01008cfc: 0x1008cfc: addu  s3, a1, zero
+// 0x01008d0c: 0x1008d0c: addu  s3, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01008d00: 0x1008d00: bne   s5, v0, 0x1008d10 addu  s4, v0, zero
+// 0x01008d10: 0x1008d10: bne   s5, v0, 0x1008d20 addu  s4, v0, zero
 	ldloc 11
 	ldloc 5
 	ldloc 5
 	stloc 8
-	bne.un L_1008d10
+	bne.un L_1008d20
 // --- basic block ---
-// 0x01008d08: 0x1008d08: lui   s4, 0x0
+// 0x01008d18: 0x1008d18: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01008d0c: 0x1008d0c: addiu s4, s4, 432
+// 0x01008d1c: 0x1008d1c: addiu s4, s4, 432
 	ldloc 8
 	ldc.i4 432
 	add
 	stloc 8
-L_1008d10:
-// 0x01008d10: 0x1008d10: addiu a1, sp, 24
+L_1008d20:
+// 0x01008d20: 0x1008d20: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01008d14: 0x1008d14: addiu a2, zero, 10
+// 0x01008d24: 0x1008d24: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x01008d18: 0x1008d18: jal   0x1000d6c addu  a0, s2, zero
+// 0x01008d28: 0x1008d28: jal   0x1000d6c addu  a0, s2, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -971,7 +971,7 @@ L_1008d10:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008d20: 0x1008d20: jal   0x10c09ac addu  a0, v0, zero
+// 0x01008d30: 0x1008d30: jal   0x10c0fec addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -979,29 +979,29 @@ L_1008d10:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01008d28: 0x1008d28: addu  s0, v0, zero
+// 0x01008d38: 0x1008d38: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01008d2c: 0x1008d2c: addiu t0, zero, 32
+// 0x01008d3c: 0x1008d3c: addiu t0, zero, 32
 	ldc.i4.s 32
 	stloc 15
-// 0x01008d30: 0x1008d30: addiu a3, zero, 12
+// 0x01008d40: 0x1008d40: addiu a3, zero, 12
 	ldc.i4.s 12
 	stloc 4
-// 0x01008d34: 0x1008d34: addiu a2, zero, 10
+// 0x01008d44: 0x1008d44: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x01008d38: 0x1008d38: addiu a1, zero, 13
+// 0x01008d48: 0x1008d48: addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
-// 0x01008d3c: 0x1008d3c: addiu a0, zero, 9
+// 0x01008d4c: 0x1008d4c: addiu a0, zero, 9
 	ldc.i4.s 9
 	stloc.1
-// 0x01008d40: 0x1008d40: addiu v1, zero, 11
+// 0x01008d50: 0x1008d50: addiu v1, zero, 11
 	ldc.i4.s 11
 	stloc 7
-L_1008d44:
-// 0x01008d44: 0x1008d44: lw    s1, 24(sp)
+L_1008d54:
+// 0x01008d54: 0x1008d54: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1010,52 +1010,52 @@ L_1008d44:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01008d48: 0x1008d48: sll   zero, zero, 0
-// 0x01008d4c: 0x1008d4c: lb    v0, 0(s1)
+// 0x01008d58: 0x1008d58: sll   zero, zero, 0
+// 0x01008d5c: 0x1008d5c: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01008d50: 0x1008d50: sll   zero, zero, 0
-// 0x01008d54: 0x1008d54: beq   v0, zero, 0x1008e58 addiu t1, s1, 1
+// 0x01008d60: 0x1008d60: sll   zero, zero, 0
+// 0x01008d64: 0x1008d64: beq   v0, zero, 0x1008e68 addiu t1, s1, 1
 	ldloc 5
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 16
-	brfalse L_1008e58
+	brfalse L_1008e68
 // --- basic block ---
-// 0x01008d5c: 0x1008d5c: beq   v0, t0, 0x1008d8c sll   zero, zero, 0
+// 0x01008d6c: 0x1008d6c: beq   v0, t0, 0x1008d9c sll   zero, zero, 0
 	ldloc 5
 	ldloc 15
-	beq  L_1008d8c
+	beq  L_1008d9c
 // --- basic block ---
-// 0x01008d64: 0x1008d64: beq   v0, a3, 0x1008d8c sll   zero, zero, 0
+// 0x01008d74: 0x1008d74: beq   v0, a3, 0x1008d9c sll   zero, zero, 0
 	ldloc 5
 	ldloc 4
-	beq  L_1008d8c
+	beq  L_1008d9c
 // --- basic block ---
-// 0x01008d6c: 0x1008d6c: beq   v0, a2, 0x1008d8c sll   zero, zero, 0
+// 0x01008d7c: 0x1008d7c: beq   v0, a2, 0x1008d9c sll   zero, zero, 0
 	ldloc 5
 	ldloc.3
-	beq  L_1008d8c
+	beq  L_1008d9c
 // --- basic block ---
-// 0x01008d74: 0x1008d74: beq   v0, a1, 0x1008d8c sll   zero, zero, 0
+// 0x01008d84: 0x1008d84: beq   v0, a1, 0x1008d9c sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	beq  L_1008d8c
+	beq  L_1008d9c
 // --- basic block ---
-// 0x01008d7c: 0x1008d7c: beq   v0, a0, 0x1008d8c sll   zero, zero, 0
+// 0x01008d8c: 0x1008d8c: beq   v0, a0, 0x1008d9c sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	beq  L_1008d8c
+	beq  L_1008d9c
 // --- basic block ---
-// 0x01008d84: 0x1008d84: bne   v0, v1, 0x1008e94 sll   zero, zero, 0
+// 0x01008d94: 0x1008d94: bne   v0, v1, 0x1008ea4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1008e94
+	bne.un L_1008ea4
 // --- basic block ---
-L_1008d8c:
-// 0x01008d8c: 0x1008d8c: j	 0x1008d44 sw    t1, 24(sp)
+L_1008d9c:
+// 0x01008d9c: 0x1008d9c: j	 0x1008d54 sw    t1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1064,10 +1064,10 @@ L_1008d8c:
 	add
 	ldloc 16
 	stelem.i4
-	br L_1008d44
+	br L_1008d54
 // --- basic block ---
-L_1008d94:
-// 0x01008d94: 0x1008d94: lw    a1, 36(s5)
+L_1008da4:
+// 0x01008da4: 0x1008da4: lw    a1, 36(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1076,7 +1076,7 @@ L_1008d94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008d98: 0x1008d98: jal   0x1001c08 addu  a0, s1, zero
+// 0x01008da8: 0x1008da8: jal   0x1001c08 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1089,11 +1089,11 @@ L_1008d94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008da0: 0x1008da0: bne   v0, zero, 0x1008dc0 sll   zero, zero, 0
+// 0x01008db0: 0x1008db0: bne   v0, zero, 0x1008dd0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1008dc0
+	brtrue L_1008dd0
 // --- basic block ---
-// 0x01008da8: 0x1008da8: lw    a0, 24(s5)
+// 0x01008db8: 0x1008db8: lw    a0, 24(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1102,22 +1102,22 @@ L_1008d94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01008dac: 0x1008dac: jal   0x10c09ac sll   zero, zero, 0
+// 0x01008dbc: 0x1008dbc: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01008db4: 0x1008db4: addu  a1, v0, zero
+// 0x01008dc4: 0x1008dc4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01008db8: 0x1008db8: j	 0x1008e24 addu  a0, s0, zero
+// 0x01008dc8: 0x1008dc8: j	 0x1008e34 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-	br L_1008e24
+	br L_1008e34
 // --- basic block ---
-L_1008dc0:
-// 0x01008dc0: 0x1008dc0: lw    a1, 32(s4)
+L_1008dd0:
+// 0x01008dd0: 0x1008dd0: lw    a1, 32(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1126,7 +1126,7 @@ L_1008dc0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008dc4: 0x1008dc4: jal   0x1001c08 addu  a0, s1, zero
+// 0x01008dd4: 0x1008dd4: jal   0x1001c08 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1139,13 +1139,13 @@ L_1008dc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008dcc: 0x1008dcc: bne   v0, zero, 0x1008de0 addu  a0, s0, zero
+// 0x01008ddc: 0x1008ddc: bne   v0, zero, 0x1008df0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_1008de0
+	brtrue L_1008df0
 // --- basic block ---
-// 0x01008dd4: 0x1008dd4: lw    a1, 20(s4)
+// 0x01008de4: 0x1008de4: lw    a1, 20(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1154,11 +1154,11 @@ L_1008dc0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008dd8: 0x1008dd8: j	 0x1008e14 sll   zero, zero, 0
-	br L_1008e14
+// 0x01008de8: 0x1008de8: j	 0x1008e24 sll   zero, zero, 0
+	br L_1008e24
 // --- basic block ---
-L_1008de0:
-// 0x01008de0: 0x1008de0: lw    a1, 36(s4)
+L_1008df0:
+// 0x01008df0: 0x1008df0: lw    a1, 36(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1167,7 +1167,7 @@ L_1008de0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008de4: 0x1008de4: jal   0x1001c08 addu  a0, s1, zero
+// 0x01008df4: 0x1008df4: jal   0x1001c08 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1180,13 +1180,13 @@ L_1008de0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008dec: 0x1008dec: bne   v0, zero, 0x1008e38 lui   a1, 0x0
+// 0x01008dfc: 0x1008dfc: bne   v0, zero, 0x1008e48 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_1008e38
+	brtrue L_1008e48
 // --- basic block ---
-// 0x01008df4: 0x1008df4: lw    a0, 24(s4)
+// 0x01008e04: 0x1008e04: lw    a0, 24(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1195,24 +1195,24 @@ L_1008de0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01008df8: 0x1008df8: jal   0x10c09ac sll   zero, zero, 0
+// 0x01008e08: 0x1008e08: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01008e00: 0x1008e00: addu  a1, v0, zero
+// 0x01008e10: 0x1008e10: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01008e04: 0x1008e04: jal   0x10c0780 addu  a0, s0, zero
+// 0x01008e14: 0x1008e14: jal   0x10c0dc0 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008e0c: 0x1008e0c: lw    a1, 20(s4)
+// 0x01008e1c: 0x1008e1c: lw    a1, 20(s4)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1221,17 +1221,17 @@ L_1008de0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008e10: 0x1008e10: addu  a0, v0, zero
+// 0x01008e20: 0x1008e20: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_1008e14:
-// 0x01008e14: 0x1008e14: jal   0x10c07d8 sll   zero, zero, 0
+L_1008e24:
+// 0x01008e24: 0x1008e24: jal   0x10c0e18 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008e1c: 0x1008e1c: lw    a1, 20(s5)
+// 0x01008e2c: 0x1008e2c: lw    a1, 20(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1240,45 +1240,45 @@ L_1008e14:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008e20: 0x1008e20: addu  a0, v0, zero
+// 0x01008e30: 0x1008e30: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_1008e24:
-// 0x01008e24: 0x1008e24: jal   0x10c0780 sll   zero, zero, 0
+L_1008e34:
+// 0x01008e34: 0x1008e34: jal   0x10c0dc0 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008e2c: 0x1008e2c: addu  s0, v0, zero
+// 0x01008e3c: 0x1008e3c: addu  s0, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01008e30: 0x1008e30: j	 0x1008e5c addiu v1, zero, 1
+// 0x01008e40: 0x1008e40: j	 0x1008e6c addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1008e5c
+	br L_1008e6c
 // --- basic block ---
-L_1008e38:
-// 0x01008e38: 0x1008e38: lui   a3, 0x0
+L_1008e48:
+// 0x01008e48: 0x1008e48: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x01008e3c: 0x1008e3c: addiu a1, a1, 24004
+// 0x01008e4c: 0x1008e4c: addiu a1, a1, 24004
 	ldloc.2
 	ldc.i4 24004
 	add
 	stloc.2
-// 0x01008e40: 0x1008e40: addiu a3, a3, 24112
+// 0x01008e50: 0x1008e50: addiu a3, a3, 24112
 	ldloc 4
 	ldc.i4 24112
 	add
 	stloc 4
-// 0x01008e44: 0x1008e44: addiu a0, zero, 3
+// 0x01008e54: 0x1008e54: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01008e48: 0x1008e48: addiu a2, zero, 1351
+// 0x01008e58: 0x1008e58: addiu a2, zero, 1351
 	ldc.i4 1351
 	stloc.3
-// 0x01008e4c: 0x1008e4c: sw    s1, 16(sp)
+// 0x01008e5c: 0x1008e5c: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1287,7 +1287,7 @@ L_1008e38:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01008e50: 0x1008e50: jal   0x100449c sw    s2, 20(sp)
+// 0x01008e60: 0x1008e60: jal   0x100449c sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1306,24 +1306,24 @@ L_1008e38:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1008e58:
-// 0x01008e58: 0x1008e58: addu  v1, zero, zero
+L_1008e68:
+// 0x01008e68: 0x1008e68: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1008e5c:
-// 0x01008e5c: 0x1008e5c: beq   s3, zero, 0x1008e68 sll   zero, zero, 0
+L_1008e6c:
+// 0x01008e6c: 0x1008e6c: beq   s3, zero, 0x1008e78 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1008e68
+	brfalse L_1008e78
 // --- basic block ---
-// 0x01008e64: 0x1008e64: sw    v1, 0(s3)
+// 0x01008e74: 0x1008e74: sw    v1, 0(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_1008e68:
-// 0x01008e68: 0x1008e68: jal   0x10c08bc addu  a0, s0, zero
+L_1008e78:
+// 0x01008e78: 0x1008e78: jal   0x10c0efc addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -1331,8 +1331,8 @@ L_1008e68:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01008e70: 0x1008e70: lw    ra, 60(sp)
-// 0x01008e74: 0x1008e74: lw    s5, 56(sp)
+// 0x01008e80: 0x1008e80: lw    ra, 60(sp)
+// 0x01008e84: 0x1008e84: lw    s5, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1341,7 +1341,7 @@ L_1008e68:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01008e78: 0x1008e78: lw    s4, 52(sp)
+// 0x01008e88: 0x1008e88: lw    s4, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1350,7 +1350,7 @@ L_1008e68:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01008e7c: 0x1008e7c: lw    s3, 48(sp)
+// 0x01008e8c: 0x1008e8c: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1359,7 +1359,7 @@ L_1008e68:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01008e80: 0x1008e80: lw    s2, 44(sp)
+// 0x01008e90: 0x1008e90: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1368,7 +1368,7 @@ L_1008e68:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01008e84: 0x1008e84: lw    s1, 40(sp)
+// 0x01008e94: 0x1008e94: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1377,7 +1377,7 @@ L_1008e68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01008e88: 0x1008e88: lw    s0, 36(sp)
+// 0x01008e98: 0x1008e98: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1386,15 +1386,15 @@ L_1008e68:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01008e8c: 0x1008e8c: jr    ra addiu sp, sp, 64
+// 0x01008e9c: 0x1008e9c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1008e94:
-// 0x01008e94: 0x1008e94: lw    a1, 32(s5)
+L_1008ea4:
+// 0x01008ea4: 0x1008ea4: lw    a1, 32(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1403,7 +1403,7 @@ L_1008e94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008e98: 0x1008e98: jal   0x1001c08 addu  a0, s1, zero
+// 0x01008ea8: 0x1008ea8: jal   0x1001c08 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1416,21 +1416,21 @@ L_1008e94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008ea0: 0x1008ea0: beq   v0, zero, 0x1008e5c addiu v1, zero, 1
+// 0x01008eb0: 0x1008eb0: beq   v0, zero, 0x1008e6c addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_1008e5c
+	brfalse L_1008e6c
 // --- basic block ---
-// 0x01008ea8: 0x1008ea8: j	 0x1008d94 sll   zero, zero, 0
-	br L_1008d94
+// 0x01008eb8: 0x1008eb8: j	 0x1008da4 sll   zero, zero, 0
+	br L_1008da4
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 ra)
@@ -1477,15 +1477,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008eb0: 0x1008eb0: addiu sp, sp, -40
+// 0x01008ec0: 0x1008ec0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01008eb4: 0x1008eb4: lui   v1, 0xe0000
+// 0x01008ec4: 0x1008ec4: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x01008eb8: 0x1008eb8: sw    s2, 28(sp)
+// 0x01008ec8: 0x1008ec8: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1494,24 +1494,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01008ebc: 0x1008ebc: lw    v0, 0(a1)
+// 0x01008ecc: 0x1008ecc: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01008ec0: 0x1008ec0: addu  s2, a0, zero
+// 0x01008ed0: 0x1008ed0: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01008ec4: 0x1008ec4: lw    a0, 0(a0)
+// 0x01008ed4: 0x1008ed4: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01008ec8: 0x1008ec8: sw    s0, 20(sp)
+// 0x01008ed8: 0x1008ed8: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1520,22 +1520,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01008ecc: 0x1008ecc: lw    s0, 29720(v1)
+// 0x01008edc: 0x1008edc: lw    s0, 30184(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 8
-// 0x01008ed0: 0x1008ed0: subu  a0, a0, v0
+// 0x01008ee0: 0x1008ee0: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x01008ed4: 0x1008ed4: sw    ra, 36(sp)
-// 0x01008ed8: 0x1008ed8: sw    s3, 32(sp)
+// 0x01008ee4: 0x1008ee4: sw    ra, 36(sp)
+// 0x01008ee8: 0x1008ee8: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1544,7 +1544,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01008edc: 0x1008edc: sw    s1, 24(sp)
+// 0x01008eec: 0x1008eec: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1553,7 +1553,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01008ee0: 0x1008ee0: jal   0x10c09ac addu  s1, a1, zero
+// 0x01008ef0: 0x1008ef0: jal   0x10c0fec addu  s1, a1, zero
 	ldloc.2
 	stloc 10
 	ldloc.1
@@ -1561,7 +1561,7 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01008ee8: 0x1008ee8: lw    a1, 8(s0)
+// 0x01008ef8: 0x1008ef8: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1570,18 +1570,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008eec: 0x1008eec: jal   0x10c0780 addu  a0, v0, zero
+// 0x01008efc: 0x1008efc: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008ef4: 0x1008ef4: addu  s3, v0, zero
+// 0x01008f04: 0x1008f04: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01008ef8: 0x1008ef8: lw    a0, 4(s2)
+// 0x01008f08: 0x1008f08: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1590,7 +1590,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01008efc: 0x1008efc: lw    v0, 4(s1)
+// 0x01008f0c: 0x1008f0c: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1599,7 +1599,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008f00: 0x1008f00: jal   0x10c09ac subu  a0, a0, v0
+// 0x01008f10: 0x1008f10: jal   0x10c0fec subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
@@ -1609,7 +1609,7 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01008f08: 0x1008f08: lw    a1, 4(s0)
+// 0x01008f18: 0x1008f18: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1618,90 +1618,90 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008f0c: 0x1008f0c: jal   0x10c0780 addu  a0, v0, zero
+// 0x01008f1c: 0x1008f1c: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008f14: 0x1008f14: addu  a0, v0, zero
+// 0x01008f24: 0x1008f24: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01008f18: 0x1008f18: jal   0x10c0780 addu  a1, v0, zero
+// 0x01008f28: 0x1008f28: jal   0x10c0dc0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008f20: 0x1008f20: addu  a0, s3, zero
+// 0x01008f30: 0x1008f30: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01008f24: 0x1008f24: addu  a1, s3, zero
+// 0x01008f34: 0x1008f34: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x01008f28: 0x1008f28: jal   0x10c0780 addu  s0, v0, zero
+// 0x01008f38: 0x1008f38: jal   0x10c0dc0 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008f30: 0x1008f30: addu  a1, v0, zero
+// 0x01008f40: 0x1008f40: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01008f34: 0x1008f34: jal   0x10c06d0 addu  a0, s0, zero
+// 0x01008f44: 0x1008f44: jal   0x10c0d10 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01008f3c: 0x1008f3c: jal   0x10c0874 addu  a0, v0, zero
+// 0x01008f4c: 0x1008f4c: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008f44: 0x1008f44: addu  a1, v1, zero
+// 0x01008f54: 0x1008f54: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01008f48: 0x1008f48: jal   0x10c1fe4 addu  a0, v0, zero
+// 0x01008f58: 0x1008f58: jal   0x10c2624 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sqrt_10c1fe4(int32,int32,int32)
+	call int32 Cibyl144::sqrt_10c2624(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008f50: 0x1008f50: addu  a1, v1, zero
+// 0x01008f60: 0x1008f60: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01008f54: 0x1008f54: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01008f64: 0x1008f64: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01008f5c: 0x1008f5c: lw    ra, 36(sp)
-// 0x01008f60: 0x1008f60: lw    s3, 32(sp)
+// 0x01008f6c: 0x1008f6c: lw    ra, 36(sp)
+// 0x01008f70: 0x1008f70: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1710,7 +1710,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01008f64: 0x1008f64: lw    s2, 28(sp)
+// 0x01008f74: 0x1008f74: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1719,7 +1719,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01008f68: 0x1008f68: lw    s1, 24(sp)
+// 0x01008f78: 0x1008f78: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1728,7 +1728,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01008f6c: 0x1008f6c: lw    s0, 20(sp)
+// 0x01008f7c: 0x1008f7c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1737,7 +1737,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01008f70: 0x1008f70: jr    ra addiu sp, sp, 40
+// 0x01008f80: 0x1008f80: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1749,7 +1749,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_get_visible_coordinates_1008f78(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_get_visible_coordinates_1008f88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t0,int32 s7,int32 s3,int32 s0,int32 s1,int32 s2,int32 s6,int32 s5,int32 lo,int32 s4,int32 s8,int32 t1,int32 t2,int32 ra,int32 t3)
@@ -1826,20 +1826,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01008f78: 0x1008f78: lui   v0, 0xe0000
+// 0x01008f88: 0x1008f88: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01008f7c: 0x1008f7c: addiu sp, sp, -112
+// 0x01008f8c: 0x1008f8c: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x01008f80: 0x1008f80: addiu v0, v0, 29604
+// 0x01008f90: 0x1008f90: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01008f84: 0x1008f84: sw    s3, 84(sp)
+// 0x01008f94: 0x1008f94: sw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1848,7 +1848,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01008f88: 0x1008f88: lw    v1, 56(v0)
+// 0x01008f98: 0x1008f98: lw    v1, 56(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1857,14 +1857,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01008f8c: 0x1008f8c: lw    s3, 0(a0)
+// 0x01008f9c: 0x1008f9c: lw    s3, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01008f90: 0x1008f90: sw    s0, 72(sp)
+// 0x01008fa0: 0x1008fa0: sw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1873,15 +1873,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01008f94: 0x1008f94: addu  s0, a0, zero
+// 0x01008fa4: 0x1008fa4: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01008f98: 0x1008f98: slt   a0, v1, s3
+// 0x01008fa8: 0x1008fa8: slt   a0, v1, s3
 	ldloc 7
 	ldloc 10
 	clt
 	stloc.1
-// 0x01008f9c: 0x1008f9c: sw    s4, 88(sp)
+// 0x01008fac: 0x1008fac: sw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1890,7 +1890,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01008fa0: 0x1008fa0: sw    s1, 76(sp)
+// 0x01008fb0: 0x1008fb0: sw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1899,8 +1899,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01008fa4: 0x1008fa4: sw    ra, 108(sp)
-// 0x01008fa8: 0x1008fa8: sw    s8, 104(sp)
+// 0x01008fb4: 0x1008fb4: sw    ra, 108(sp)
+// 0x01008fb8: 0x1008fb8: sw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1909,7 +1909,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01008fac: 0x1008fac: sw    s7, 100(sp)
+// 0x01008fbc: 0x1008fbc: sw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1918,7 +1918,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01008fb0: 0x1008fb0: sw    s6, 96(sp)
+// 0x01008fc0: 0x1008fc0: sw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1927,7 +1927,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01008fb4: 0x1008fb4: sw    s5, 92(sp)
+// 0x01008fc4: 0x1008fc4: sw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1936,7 +1936,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01008fb8: 0x1008fb8: sw    s2, 80(sp)
+// 0x01008fc8: 0x1008fc8: sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1945,13 +1945,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01008fbc: 0x1008fbc: addu  s1, a1, zero
+// 0x01008fcc: 0x1008fcc: addu  s1, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01008fc0: 0x1008fc0: addu  s4, a2, zero
+// 0x01008fd0: 0x1008fd0: addu  s4, a2, zero
 	ldloc.3
 	stloc 17
-// 0x01008fc4: 0x1008fc4: bne   a0, zero, 0x1009010 sw    a3, 124(sp)
+// 0x01008fd4: 0x1008fd4: bne   a0, zero, 0x1009020 sw    a3, 124(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -1961,9 +1961,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-	brtrue L_1009010
+	brtrue L_1009020
 // --- basic block ---
-// 0x01008fcc: 0x1008fcc: lw    a0, 64(v0)
+// 0x01008fdc: 0x1008fdc: lw    a0, 64(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1972,17 +1972,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01008fd0: 0x1008fd0: sll   zero, zero, 0
-// 0x01008fd4: 0x1008fd4: slt   a0, s3, a0
+// 0x01008fe0: 0x1008fe0: sll   zero, zero, 0
+// 0x01008fe4: 0x1008fe4: slt   a0, s3, a0
 	ldloc 10
 	ldloc.1
 	clt
 	stloc.1
-// 0x01008fd8: 0x1008fd8: bne   a0, zero, 0x1009010 sll   zero, zero, 0
+// 0x01008fe8: 0x1008fe8: bne   a0, zero, 0x1009020 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1009010
+	brtrue L_1009020
 // --- basic block ---
-// 0x01008fe0: 0x1008fe0: lw    a0, 4(s0)
+// 0x01008ff0: 0x1008ff0: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1991,7 +1991,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01008fe4: 0x1008fe4: lw    a1, 60(v0)
+// 0x01008ff4: 0x1008ff4: lw    a1, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2000,17 +2000,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01008fe8: 0x1008fe8: sll   zero, zero, 0
-// 0x01008fec: 0x1008fec: slt   a1, a1, a0
+// 0x01008ff8: 0x1008ff8: sll   zero, zero, 0
+// 0x01008ffc: 0x1008ffc: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x01008ff0: 0x1008ff0: bne   a1, zero, 0x1009010 sll   zero, zero, 0
+// 0x01009000: 0x1009000: bne   a1, zero, 0x1009020 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1009010
+	brtrue L_1009020
 // --- basic block ---
-// 0x01008ff8: 0x1008ff8: lw    v0, 68(v0)
+// 0x01009008: 0x1009008: lw    v0, 68(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2019,18 +2019,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01008ffc: 0x1008ffc: sll   zero, zero, 0
-// 0x01009000: 0x1009000: slt   a0, a0, v0
+// 0x0100900c: 0x100900c: sll   zero, zero, 0
+// 0x01009010: 0x1009010: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x01009004: 0x1009004: xori  a0, a0, 1
+// 0x01009014: 0x1009014: xori  a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	xor
 	stloc.1
-// 0x01009008: 0x1009008: j	 0x1009014 sw    a0, 52(sp)
+// 0x01009018: 0x1009018: j	 0x1009024 sw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2039,10 +2039,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-	br L_1009014
+	br L_1009024
 // --- basic block ---
-L_1009010:
-// 0x01009010: 0x1009010: sw    zero, 52(sp)
+L_1009020:
+// 0x01009020: 0x1009020: sw    zero, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2051,32 +2051,32 @@ L_1009010:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1009014:
-// 0x01009014: 0x1009014: lw    t0, 0(s1)
+L_1009024:
+// 0x01009024: 0x1009024: lw    t0, 0(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01009018: 0x1009018: sll   zero, zero, 0
-// 0x0100901c: 0x100901c: slt   v1, v1, t0
+// 0x01009028: 0x1009028: sll   zero, zero, 0
+// 0x0100902c: 0x100902c: slt   v1, v1, t0
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 7
-// 0x01009020: 0x1009020: bne   v1, zero, 0x1009070 lui   v0, 0xe0000
+// 0x01009030: 0x1009030: bne   v1, zero, 0x1009080 lui   v0, 0xe0000
 	ldloc 7
 	ldc.i4 917504
 	stloc 5
-	brtrue L_1009070
+	brtrue L_1009080
 // --- basic block ---
-// 0x01009028: 0x1009028: addiu v0, v0, 29604
+// 0x01009038: 0x1009038: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x0100902c: 0x100902c: lw    v1, 64(v0)
+// 0x0100903c: 0x100903c: lw    v1, 64(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2085,17 +2085,17 @@ L_1009014:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009030: 0x1009030: sll   zero, zero, 0
-// 0x01009034: 0x1009034: slt   v1, t0, v1
+// 0x01009040: 0x1009040: sll   zero, zero, 0
+// 0x01009044: 0x1009044: slt   v1, t0, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 7
-// 0x01009038: 0x1009038: bne   v1, zero, 0x1009070 sll   zero, zero, 0
+// 0x01009048: 0x1009048: bne   v1, zero, 0x1009080 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1009070
+	brtrue L_1009080
 // --- basic block ---
-// 0x01009040: 0x1009040: lw    v1, 4(s1)
+// 0x01009050: 0x1009050: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2104,7 +2104,7 @@ L_1009014:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009044: 0x1009044: lw    a0, 60(v0)
+// 0x01009054: 0x1009054: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2113,17 +2113,17 @@ L_1009014:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009048: 0x1009048: sll   zero, zero, 0
-// 0x0100904c: 0x100904c: slt   a0, a0, v1
+// 0x01009058: 0x1009058: sll   zero, zero, 0
+// 0x0100905c: 0x100905c: slt   a0, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc.1
-// 0x01009050: 0x1009050: bne   a0, zero, 0x1009070 sll   zero, zero, 0
+// 0x01009060: 0x1009060: bne   a0, zero, 0x1009080 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1009070
+	brtrue L_1009080
 // --- basic block ---
-// 0x01009058: 0x1009058: lw    v0, 68(v0)
+// 0x01009068: 0x1009068: lw    v0, 68(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2132,18 +2132,18 @@ L_1009014:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100905c: 0x100905c: sll   zero, zero, 0
-// 0x01009060: 0x1009060: slt   v1, v1, v0
+// 0x0100906c: 0x100906c: sll   zero, zero, 0
+// 0x01009070: 0x1009070: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01009064: 0x1009064: xori  v1, v1, 1
+// 0x01009074: 0x1009074: xori  v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	xor
 	stloc 7
-// 0x01009068: 0x1009068: j	 0x1009074 sw    v1, 48(sp)
+// 0x01009078: 0x1009078: j	 0x1009084 sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2152,10 +2152,10 @@ L_1009014:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1009074
+	br L_1009084
 // --- basic block ---
-L_1009070:
-// 0x01009070: 0x1009070: sw    zero, 48(sp)
+L_1009080:
+// 0x01009080: 0x1009080: sw    zero, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2164,12 +2164,12 @@ L_1009070:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1009074:
-// 0x01009074: 0x1009074: bne   s4, zero, 0x10090a4 sll   zero, zero, 0
+L_1009084:
+// 0x01009084: 0x1009084: bne   s4, zero, 0x10090b4 sll   zero, zero, 0
 	ldloc 17
-	brtrue L_10090a4
+	brtrue L_10090b4
 // --- basic block ---
-// 0x0100907c: 0x100907c: lw    v0, 48(sp)
+// 0x0100908c: 0x100908c: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2178,14 +2178,14 @@ L_1009074:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009080: 0x1009080: sll   zero, zero, 0
-// 0x01009084: 0x1009084: bne   v0, zero, 0x1009660 addiu a0, zero, 1
+// 0x01009090: 0x1009090: sll   zero, zero, 0
+// 0x01009094: 0x1009094: bne   v0, zero, 0x1009670 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brtrue L_1009660
+	brtrue L_1009670
 // --- basic block ---
-// 0x0100908c: 0x100908c: lw    v1, 52(sp)
+// 0x0100909c: 0x100909c: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2194,18 +2194,18 @@ L_1009074:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009090: 0x1009090: sll   zero, zero, 0
-// 0x01009094: 0x1009094: beq   v1, zero, 0x10090f0 addiu s2, zero, 2
+// 0x010090a0: 0x10090a0: sll   zero, zero, 0
+// 0x010090a4: 0x10090a4: beq   v1, zero, 0x1009100 addiu s2, zero, 2
 	ldloc 7
 	ldc.i4.2
 	stloc 13
-	brfalse L_10090f0
+	brfalse L_1009100
 // --- basic block ---
-// 0x0100909c: 0x100909c: j	 0x1009660 sll   zero, zero, 0
-	br L_1009660
+// 0x010090ac: 0x10090ac: j	 0x1009670 sll   zero, zero, 0
+	br L_1009670
 // --- basic block ---
-L_10090a4:
-// 0x010090a4: 0x10090a4: lw    a1, 52(sp)
+L_10090b4:
+// 0x010090b4: 0x10090b4: lw    a1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2214,12 +2214,12 @@ L_10090a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010090a8: 0x10090a8: sll   zero, zero, 0
-// 0x010090ac: 0x10090ac: beq   a1, zero, 0x10090cc sll   zero, zero, 0
+// 0x010090b8: 0x10090b8: sll   zero, zero, 0
+// 0x010090bc: 0x10090bc: beq   a1, zero, 0x10090dc sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10090cc
+	brfalse L_10090dc
 // --- basic block ---
-// 0x010090b4: 0x10090b4: lw    a2, 48(sp)
+// 0x010090c4: 0x10090c4: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2228,18 +2228,18 @@ L_10090a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010090b8: 0x10090b8: sll   zero, zero, 0
-// 0x010090bc: 0x10090bc: bne   a2, zero, 0x1009548 lui   v0, 0xe0000
+// 0x010090c8: 0x10090c8: sll   zero, zero, 0
+// 0x010090cc: 0x10090cc: bne   a2, zero, 0x1009558 lui   v0, 0xe0000
 	ldloc.3
 	ldc.i4 917504
 	stloc 5
-	brtrue L_1009548
+	brtrue L_1009558
 // --- basic block ---
-// 0x010090c4: 0x10090c4: j	 0x10090dc sll   zero, zero, 0
-	br L_10090dc
+// 0x010090d4: 0x10090d4: j	 0x10090ec sll   zero, zero, 0
+	br L_10090ec
 // --- basic block ---
-L_10090cc:
-// 0x010090cc: 0x10090cc: lw    v0, 48(sp)
+L_10090dc:
+// 0x010090dc: 0x10090dc: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2248,15 +2248,15 @@ L_10090cc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010090d0: 0x10090d0: sll   zero, zero, 0
-// 0x010090d4: 0x10090d4: bne   v0, zero, 0x10090f0 addiu s2, zero, 1
+// 0x010090e0: 0x10090e0: sll   zero, zero, 0
+// 0x010090e4: 0x10090e4: bne   v0, zero, 0x1009100 addiu s2, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 13
-	brtrue L_10090f0
+	brtrue L_1009100
 // --- basic block ---
-L_10090dc:
-// 0x010090dc: 0x10090dc: lw    v1, 52(sp)
+L_10090ec:
+// 0x010090ec: 0x10090ec: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2265,37 +2265,37 @@ L_10090dc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010090e0: 0x10090e0: sll   zero, zero, 0
-// 0x010090e4: 0x10090e4: beq   v1, zero, 0x10090f0 addiu s2, zero, 2
+// 0x010090f0: 0x10090f0: sll   zero, zero, 0
+// 0x010090f4: 0x10090f4: beq   v1, zero, 0x1009100 addiu s2, zero, 2
 	ldloc 7
 	ldc.i4.2
 	stloc 13
-	brfalse L_10090f0
+	brfalse L_1009100
 // --- basic block ---
-// 0x010090ec: 0x10090ec: addiu s2, zero, 1
+// 0x010090fc: 0x10090fc: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 13
-L_10090f0:
-// 0x010090f0: 0x10090f0: bne   s3, t0, 0x1009108 addu  s8, zero, zero
+L_1009100:
+// 0x01009100: 0x1009100: bne   s3, t0, 0x1009118 addu  s8, zero, zero
 	ldloc 10
 	ldloc 8
 	ldc.i4.s 0
 	stloc 18
-	bne.un L_1009108
+	bne.un L_1009118
 // --- basic block ---
-// 0x010090f8: 0x10090f8: addu  s7, zero, zero
+// 0x01009108: 0x1009108: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010090fc: 0x10090fc: addu  s6, zero, zero
+// 0x0100910c: 0x100910c: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x01009100: 0x1009100: j	 0x10091b0 addu  s5, zero, zero
+// 0x01009110: 0x1009110: j	 0x10091c0 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 15
-	br L_10091b0
+	br L_10091c0
 // --- basic block ---
-L_1009108:
-// 0x01009108: 0x1009108: lw    s7, 4(s0)
+L_1009118:
+// 0x01009118: 0x1009118: lw    s7, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2304,7 +2304,7 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100910c: 0x100910c: lw    a0, 4(s1)
+// 0x0100911c: 0x100911c: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2313,7 +2313,7 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009110: 0x1009110: sw    t0, 64(sp)
+// 0x01009120: 0x1009120: sw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2322,19 +2322,19 @@ L_1009108:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01009114: 0x1009114: jal   0x10c09c0 subu  a0, s7, a0
+// 0x01009124: 0x1009124: jal   0x10c1000 subu  a0, s7, a0
 	ldloc 9
 	ldloc.1
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100911c: 0x100911c: lw    t0, 64(sp)
+// 0x0100912c: 0x100912c: lw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2343,15 +2343,15 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01009120: 0x1009120: addu  a2, v0, zero
+// 0x01009130: 0x1009130: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01009124: 0x1009124: subu  a0, s3, t0
+// 0x01009134: 0x1009134: subu  a0, s3, t0
 	ldloc 10
 	ldloc 8
 	sub
 	stloc.1
-// 0x01009128: 0x1009128: sw    a2, 56(sp)
+// 0x01009138: 0x1009138: sw    a2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2360,7 +2360,7 @@ L_1009108:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0100912c: 0x100912c: jal   0x10c09c0 sw    v1, 60(sp)
+// 0x0100913c: 0x100913c: jal   0x10c1000 sw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2371,12 +2371,12 @@ L_1009108:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009134: 0x1009134: lw    a2, 56(sp)
+// 0x01009144: 0x1009144: lw    a2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2385,7 +2385,7 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01009138: 0x1009138: lw    a3, 60(sp)
+// 0x01009148: 0x1009148: lw    a3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2394,16 +2394,16 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100913c: 0x100913c: addu  a0, a2, zero
+// 0x0100914c: 0x100914c: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01009140: 0x1009140: addu  a1, a3, zero
+// 0x01009150: 0x1009150: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01009144: 0x1009144: addu  a2, v0, zero
+// 0x01009154: 0x1009154: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01009148: 0x1009148: jal   0x10c07f0 addu  a3, v1, zero
+// 0x01009158: 0x1009158: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -2411,34 +2411,34 @@ L_1009108:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009150: 0x1009150: addu  a0, s7, zero
+// 0x01009160: 0x1009160: addu  a0, s7, zero
 	ldloc 9
 	stloc.1
-// 0x01009154: 0x1009154: addu  s6, v0, zero
+// 0x01009164: 0x1009164: addu  s6, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01009158: 0x1009158: jal   0x10c09c0 addu  s5, v1, zero
+// 0x01009168: 0x1009168: jal   0x10c1000 addu  s5, v1, zero
 	ldloc 7
 	stloc 15
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009160: 0x1009160: addu  t2, v0, zero
+// 0x01009170: 0x1009170: addu  t2, v0, zero
 	ldloc 5
 	stloc 20
-// 0x01009164: 0x1009164: addu  a0, s3, zero
+// 0x01009174: 0x1009174: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01009168: 0x1009168: sw    t2, 56(sp)
+// 0x01009178: 0x1009178: sw    t2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2447,7 +2447,7 @@ L_1009108:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0100916c: 0x100916c: jal   0x10c09c0 sw    v1, 60(sp)
+// 0x0100917c: 0x100917c: jal   0x10c1000 sw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2458,21 +2458,21 @@ L_1009108:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009174: 0x1009174: addu  a3, v1, zero
+// 0x01009184: 0x1009184: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01009178: 0x1009178: addu  a0, s6, zero
+// 0x01009188: 0x1009188: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x0100917c: 0x100917c: addu  a1, s5, zero
+// 0x0100918c: 0x100918c: addu  a1, s5, zero
 	ldloc 15
 	stloc.2
-// 0x01009180: 0x1009180: jal   0x10c0798 addu  a2, v0, zero
+// 0x01009190: 0x1009190: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -2480,12 +2480,12 @@ L_1009108:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009188: 0x1009188: lw    t2, 56(sp)
+// 0x01009198: 0x1009198: lw    t2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2494,7 +2494,7 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc 20
-// 0x0100918c: 0x100918c: lw    t3, 60(sp)
+// 0x0100919c: 0x100919c: lw    t3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2503,16 +2503,16 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc 22
-// 0x01009190: 0x1009190: addu  a0, t2, zero
+// 0x010091a0: 0x10091a0: addu  a0, t2, zero
 	ldloc 20
 	stloc.1
-// 0x01009194: 0x1009194: addu  a1, t3, zero
+// 0x010091a4: 0x10091a4: addu  a1, t3, zero
 	ldloc 22
 	stloc.2
-// 0x01009198: 0x1009198: addu  a3, v1, zero
+// 0x010091a8: 0x10091a8: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x0100919c: 0x100919c: jal   0x10c0740 addu  a2, v0, zero
+// 0x010091ac: 0x10091ac: jal   0x10c0d80 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -2520,12 +2520,12 @@ L_1009108:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010091a4: 0x10091a4: lw    t0, 64(sp)
+// 0x010091b4: 0x10091b4: lw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2534,56 +2534,56 @@ L_1009108:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010091a8: 0x10091a8: addu  s8, v0, zero
+// 0x010091b8: 0x10091b8: addu  s8, v0, zero
 	ldloc 5
 	stloc 18
-// 0x010091ac: 0x10091ac: addu  s7, v1, zero
+// 0x010091bc: 0x10091bc: addu  s7, v1, zero
 	ldloc 7
 	stloc 9
-L_10091b0:
-// 0x010091b0: 0x10091b0: jal   0x10c09c0 subu  a0, s3, t0
+L_10091c0:
+// 0x010091c0: 0x10091c0: jal   0x10c1000 subu  a0, s3, t0
 	ldloc 10
 	ldloc 8
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010091b8: 0x10091b8: addu  t0, v0, zero
+// 0x010091c8: 0x10091c8: addu  t0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010091bc: 0x10091bc: lui   v0, 0x20000
+// 0x010091cc: 0x10091cc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010091c0: 0x10091c0: lw    a3, 23756(v0)
+// 0x010091d0: 0x10091d0: lw    a3, 24220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5939
+	ldc.i4 6055
 	add
 	ldelem.i4
 	stloc 4
-// 0x010091c4: 0x10091c4: lw    a2, 23752(v0)
+// 0x010091d4: 0x10091d4: lw    a2, 24216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5938
+	ldc.i4 6054
 	add
 	ldelem.i4
 	stloc.3
-// 0x010091c8: 0x10091c8: addu  a0, t0, zero
+// 0x010091d8: 0x10091d8: addu  a0, t0, zero
 	ldloc 8
 	stloc.1
-// 0x010091cc: 0x10091cc: addu  a1, v1, zero
+// 0x010091dc: 0x10091dc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010091d0: 0x10091d0: sw    t0, 64(sp)
+// 0x010091e0: 0x10091e0: sw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2592,7 +2592,7 @@ L_10091b0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010091d4: 0x10091d4: jal   0x10c17ac sw    v1, 56(sp)
+// 0x010091e4: 0x10091e4: jal   0x10c1dec sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2606,12 +2606,12 @@ L_10091b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010091dc: 0x10091dc: lw    t0, 64(sp)
+// 0x010091ec: 0x10091ec: lw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2620,7 +2620,7 @@ L_10091b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010091e0: 0x10091e0: lw    t1, 56(sp)
+// 0x010091f0: 0x10091f0: lw    t1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2629,35 +2629,35 @@ L_10091b0:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010091e4: 0x10091e4: blez  v0, 0x1009258 lui   v0, 0x20000
+// 0x010091f4: 0x10091f4: blez  v0, 0x1009268 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	ble L_1009258
+	ble L_1009268
 // --- basic block ---
-// 0x010091ec: 0x10091ec: lw    a3, 23764(v0)
+// 0x010091fc: 0x10091fc: lw    a3, 24228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5941
+	ldc.i4 6057
 	add
 	ldelem.i4
 	stloc 4
-// 0x010091f0: 0x10091f0: lw    a2, 23760(v0)
+// 0x01009200: 0x1009200: lw    a2, 24224(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5940
+	ldc.i4 6056
 	add
 	ldelem.i4
 	stloc.3
-// 0x010091f4: 0x10091f4: addu  a1, t1, zero
+// 0x01009204: 0x1009204: addu  a1, t1, zero
 	ldloc 19
 	stloc.2
-// 0x010091f8: 0x10091f8: jal   0x10c188c addu  a0, t0, zero
+// 0x01009208: 0x1009208: jal   0x10c1ecc addu  a0, t0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2665,27 +2665,27 @@ L_10091b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009200: 0x1009200: bgez  v0, 0x1009258 addu  a1, s1, zero
+// 0x01009210: 0x1009210: bgez  v0, 0x1009268 addu  a1, s1, zero
 	ldloc 5
 	ldloc 12
 	stloc.2
 	ldc.i4.s 0
-	bge L_1009258
+	bge L_1009268
 // --- basic block ---
-// 0x01009208: 0x1009208: lui   s7, 0xe0000
+// 0x01009218: 0x1009218: lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x0100920c: 0x100920c: addiu s7, s7, 29604
+// 0x0100921c: 0x100921c: addiu s7, s7, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x01009210: 0x1009210: lw    v0, 60(s7)
+// 0x01009220: 0x1009220: lw    v0, 60(s7)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2694,26 +2694,26 @@ L_10091b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009214: 0x1009214: addiu s6, sp, 24
+// 0x01009224: 0x1009224: addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-// 0x01009218: 0x1009218: addiu s5, sp, 32
+// 0x01009228: 0x1009228: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 15
-// 0x0100921c: 0x100921c: addu  a0, s0, zero
+// 0x0100922c: 0x100922c: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01009220: 0x1009220: addu  a2, s6, zero
+// 0x01009230: 0x1009230: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x01009224: 0x1009224: addu  a3, zero, zero
+// 0x01009234: 0x1009234: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01009228: 0x1009228: sw    s3, 24(sp)
+// 0x01009238: 0x1009238: sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2722,7 +2722,7 @@ L_10091b0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100922c: 0x100922c: sw    v0, 28(sp)
+// 0x0100923c: 0x100923c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2731,7 +2731,7 @@ L_10091b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01009230: 0x1009230: jal   0x1006cc8 sw    s5, 16(sp)
+// 0x01009240: 0x1009240: jal   0x1006cd8 sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2745,19 +2745,19 @@ L_10091b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009238: 0x1009238: beq   v0, s2, 0x10094e4 addu  a2, s6, zero
+// 0x01009248: 0x1009248: beq   v0, s2, 0x10094f4 addu  a2, s6, zero
 	ldloc 5
 	ldloc 13
 	ldloc 14
 	stloc.3
-	beq  L_10094e4
+	beq  L_10094f4
 // --- basic block ---
-// 0x01009240: 0x1009240: lw    v1, 68(s7)
+// 0x01009250: 0x1009250: lw    v1, 68(s7)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2766,16 +2766,16 @@ L_10091b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009244: 0x1009244: addu  a3, v0, zero
+// 0x01009254: 0x1009254: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01009248: 0x1009248: addu  a0, s0, zero
+// 0x01009258: 0x1009258: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x0100924c: 0x100924c: addu  a1, s1, zero
+// 0x0100925c: 0x100925c: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x01009250: 0x1009250: j	 0x1009304 sw    v1, 28(sp)
+// 0x01009260: 0x1009260: j	 0x1009314 sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2784,10 +2784,10 @@ L_10091b0:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1009304
+	br L_1009314
 // --- basic block ---
-L_1009258:
-// 0x01009258: 0x1009258: lw    s3, 4(s0)
+L_1009268:
+// 0x01009268: 0x1009268: lw    s3, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2796,7 +2796,7 @@ L_1009258:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100925c: 0x100925c: lw    a0, 4(s1)
+// 0x0100926c: 0x100926c: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2805,49 +2805,49 @@ L_1009258:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009260: 0x1009260: jal   0x10c09c0 subu  a0, s3, a0
+// 0x01009270: 0x1009270: jal   0x10c1000 subu  a0, s3, a0
 	ldloc 10
 	ldloc.1
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009268: 0x1009268: addu  t0, v0, zero
+// 0x01009278: 0x1009278: addu  t0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0100926c: 0x100926c: lui   v0, 0x20000
+// 0x0100927c: 0x100927c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01009270: 0x1009270: lw    a3, 23756(v0)
+// 0x01009280: 0x1009280: lw    a3, 24220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5939
+	ldc.i4 6055
 	add
 	ldelem.i4
 	stloc 4
-// 0x01009274: 0x1009274: lw    a2, 23752(v0)
+// 0x01009284: 0x1009284: lw    a2, 24216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5938
+	ldc.i4 6054
 	add
 	ldelem.i4
 	stloc.3
-// 0x01009278: 0x1009278: addu  a0, t0, zero
+// 0x01009288: 0x1009288: addu  a0, t0, zero
 	ldloc 8
 	stloc.1
-// 0x0100927c: 0x100927c: addu  a1, v1, zero
+// 0x0100928c: 0x100928c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01009280: 0x1009280: sw    t0, 64(sp)
+// 0x01009290: 0x1009290: sw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2856,7 +2856,7 @@ L_1009258:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01009284: 0x1009284: jal   0x10c17ac sw    v1, 56(sp)
+// 0x01009294: 0x1009294: jal   0x10c1dec sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2870,12 +2870,12 @@ L_1009258:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100928c: 0x100928c: lw    t0, 64(sp)
+// 0x0100929c: 0x100929c: lw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2884,7 +2884,7 @@ L_1009258:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01009290: 0x1009290: lw    t1, 56(sp)
+// 0x010092a0: 0x10092a0: lw    t1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2893,35 +2893,35 @@ L_1009258:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01009294: 0x1009294: blez  v0, 0x100930c lui   v0, 0x20000
+// 0x010092a4: 0x10092a4: blez  v0, 0x100931c lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	ble L_100930c
+	ble L_100931c
 // --- basic block ---
-// 0x0100929c: 0x100929c: lw    a3, 23764(v0)
+// 0x010092ac: 0x10092ac: lw    a3, 24228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5941
+	ldc.i4 6057
 	add
 	ldelem.i4
 	stloc 4
-// 0x010092a0: 0x10092a0: lw    a2, 23760(v0)
+// 0x010092b0: 0x10092b0: lw    a2, 24224(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5940
+	ldc.i4 6056
 	add
 	ldelem.i4
 	stloc.3
-// 0x010092a4: 0x10092a4: addu  a1, t1, zero
+// 0x010092b4: 0x10092b4: addu  a1, t1, zero
 	ldloc 19
 	stloc.2
-// 0x010092a8: 0x10092a8: jal   0x10c188c addu  a0, t0, zero
+// 0x010092b8: 0x10092b8: jal   0x10c1ecc addu  a0, t0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2929,27 +2929,27 @@ L_1009258:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010092b0: 0x10092b0: bgez  v0, 0x100930c addu  a1, s1, zero
+// 0x010092c0: 0x10092c0: bgez  v0, 0x100931c addu  a1, s1, zero
 	ldloc 5
 	ldloc 12
 	stloc.2
 	ldc.i4.s 0
-	bge L_100930c
+	bge L_100931c
 // --- basic block ---
-// 0x010092b8: 0x10092b8: lui   s7, 0xe0000
+// 0x010092c8: 0x10092c8: lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x010092bc: 0x10092bc: addiu s7, s7, 29604
+// 0x010092cc: 0x10092cc: addiu s7, s7, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x010092c0: 0x10092c0: lw    v0, 64(s7)
+// 0x010092d0: 0x10092d0: lw    v0, 64(s7)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2958,26 +2958,26 @@ L_1009258:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010092c4: 0x10092c4: addiu s6, sp, 24
+// 0x010092d4: 0x10092d4: addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-// 0x010092c8: 0x10092c8: addiu s5, sp, 32
+// 0x010092d8: 0x10092d8: addiu s5, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 15
-// 0x010092cc: 0x10092cc: addu  a0, s0, zero
+// 0x010092dc: 0x10092dc: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010092d0: 0x10092d0: addu  a2, s6, zero
+// 0x010092e0: 0x10092e0: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x010092d4: 0x10092d4: addu  a3, zero, zero
+// 0x010092e4: 0x10092e4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010092d8: 0x10092d8: sw    s3, 28(sp)
+// 0x010092e8: 0x10092e8: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2986,7 +2986,7 @@ L_1009258:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010092dc: 0x10092dc: sw    v0, 24(sp)
+// 0x010092ec: 0x10092ec: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2995,7 +2995,7 @@ L_1009258:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010092e0: 0x10092e0: jal   0x1006cc8 sw    s5, 16(sp)
+// 0x010092f0: 0x10092f0: jal   0x1006cd8 sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3009,19 +3009,19 @@ L_1009258:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010092e8: 0x10092e8: beq   v0, s2, 0x10094e4 addu  a2, s6, zero
+// 0x010092f8: 0x10092f8: beq   v0, s2, 0x10094f4 addu  a2, s6, zero
 	ldloc 5
 	ldloc 13
 	ldloc 14
 	stloc.3
-	beq  L_10094e4
+	beq  L_10094f4
 // --- basic block ---
-// 0x010092f0: 0x10092f0: lw    v1, 56(s7)
+// 0x01009300: 0x1009300: lw    v1, 56(s7)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3030,16 +3030,16 @@ L_1009258:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010092f4: 0x10092f4: addu  a3, v0, zero
+// 0x01009304: 0x1009304: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010092f8: 0x10092f8: addu  a0, s0, zero
+// 0x01009308: 0x1009308: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010092fc: 0x10092fc: addu  a1, s1, zero
+// 0x0100930c: 0x100930c: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x01009300: 0x1009300: sw    v1, 24(sp)
+// 0x01009310: 0x1009310: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3048,8 +3048,8 @@ L_1009258:
 	add
 	ldloc 7
 	stelem.i4
-L_1009304:
-// 0x01009304: 0x1009304: j	 0x10094d4 sw    s5, 16(sp)
+L_1009314:
+// 0x01009314: 0x1009314: j	 0x10094e4 sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3058,18 +3058,18 @@ L_1009304:
 	add
 	ldloc 15
 	stelem.i4
-	br L_10094d4
+	br L_10094e4
 // --- basic block ---
-L_100930c:
-// 0x0100930c: 0x100930c: lui   s3, 0xe0000
+L_100931c:
+// 0x0100931c: 0x100931c: lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 10
-// 0x01009310: 0x1009310: addiu s3, s3, 29604
+// 0x01009320: 0x1009320: addiu s3, s3, 30068
 	ldloc 10
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 10
-// 0x01009314: 0x1009314: lw    v0, 60(s3)
+// 0x01009324: 0x1009324: lw    v0, 60(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3078,11 +3078,11 @@ L_100930c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009318: 0x1009318: sll   zero, zero, 0
-// 0x0100931c: 0x100931c: addu  a0, v0, zero
+// 0x01009328: 0x1009328: sll   zero, zero, 0
+// 0x0100932c: 0x100932c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009320: 0x1009320: jal   0x10c09c0 sw    v0, 28(sp)
+// 0x01009330: 0x1009330: jal   0x10c1000 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3093,21 +3093,21 @@ L_100930c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009328: 0x1009328: addu  a1, v1, zero
+// 0x01009338: 0x1009338: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0100932c: 0x100932c: addu  a0, v0, zero
+// 0x0100933c: 0x100933c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009330: 0x1009330: addu  a2, s8, zero
+// 0x01009340: 0x1009340: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x01009334: 0x1009334: jal   0x10c0740 addu  a3, s7, zero
+// 0x01009344: 0x1009344: jal   0x10c0d80 addu  a3, s7, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -3115,21 +3115,21 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100933c: 0x100933c: addu  a1, v1, zero
+// 0x0100934c: 0x100934c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01009340: 0x1009340: addu  a2, s6, zero
+// 0x01009350: 0x1009350: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x01009344: 0x1009344: addu  a3, s5, zero
+// 0x01009354: 0x1009354: addu  a3, s5, zero
 	ldloc 15
 	stloc 4
-// 0x01009348: 0x1009348: jal   0x10c07f0 addu  a0, v0, zero
+// 0x01009358: 0x1009358: jal   0x10c0e30 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3137,26 +3137,26 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009350: 0x1009350: addu  a1, v1, zero
+// 0x01009360: 0x1009360: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01009354: 0x1009354: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01009364: 0x1009364: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100935c: 0x100935c: sw    v0, 24(sp)
+// 0x0100936c: 0x100936c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3165,26 +3165,26 @@ L_100930c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01009360: 0x1009360: addu  a0, s0, zero
+// 0x01009370: 0x1009370: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01009364: 0x1009364: addiu v0, sp, 32
+// 0x01009374: 0x1009374: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01009368: 0x1009368: addu  a1, s1, zero
+// 0x01009378: 0x1009378: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x0100936c: 0x100936c: addiu a2, sp, 24
+// 0x0100937c: 0x100937c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x01009370: 0x1009370: addu  a3, zero, zero
+// 0x01009380: 0x1009380: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01009374: 0x1009374: jal   0x1006cc8 sw    v0, 16(sp)
+// 0x01009384: 0x1009384: jal   0x1006cd8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3198,19 +3198,19 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100937c: 0x100937c: beq   v0, s2, 0x10094e4 addu  t0, v0, zero
+// 0x0100938c: 0x100938c: beq   v0, s2, 0x10094f4 addu  t0, v0, zero
 	ldloc 5
 	ldloc 13
 	ldloc 5
 	stloc 8
-	beq  L_10094e4
+	beq  L_10094f4
 // --- basic block ---
-// 0x01009384: 0x1009384: lw    v0, 68(s3)
+// 0x01009394: 0x1009394: lw    v0, 68(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3219,7 +3219,7 @@ L_100930c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009388: 0x1009388: sw    t0, 64(sp)
+// 0x01009398: 0x1009398: sw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3228,10 +3228,10 @@ L_100930c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100938c: 0x100938c: addu  a0, v0, zero
+// 0x0100939c: 0x100939c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009390: 0x1009390: jal   0x10c09c0 sw    v0, 28(sp)
+// 0x010093a0: 0x10093a0: jal   0x10c1000 sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3242,21 +3242,21 @@ L_100930c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009398: 0x1009398: addu  a1, v1, zero
+// 0x010093a8: 0x10093a8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0100939c: 0x100939c: addu  a0, v0, zero
+// 0x010093ac: 0x10093ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010093a0: 0x10093a0: addu  a2, s8, zero
+// 0x010093b0: 0x10093b0: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x010093a4: 0x10093a4: jal   0x10c0740 addu  a3, s7, zero
+// 0x010093b4: 0x10093b4: jal   0x10c0d80 addu  a3, s7, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -3264,21 +3264,21 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010093ac: 0x10093ac: addu  a1, v1, zero
+// 0x010093bc: 0x10093bc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010093b0: 0x10093b0: addu  a2, s6, zero
+// 0x010093c0: 0x10093c0: addu  a2, s6, zero
 	ldloc 14
 	stloc.3
-// 0x010093b4: 0x10093b4: addu  a3, s5, zero
+// 0x010093c4: 0x10093c4: addu  a3, s5, zero
 	ldloc 15
 	stloc 4
-// 0x010093b8: 0x10093b8: jal   0x10c07f0 addu  a0, v0, zero
+// 0x010093c8: 0x10093c8: jal   0x10c0e30 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3286,26 +3286,26 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010093c0: 0x10093c0: addu  a1, v1, zero
+// 0x010093d0: 0x10093d0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010093c4: 0x10093c4: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010093d4: 0x10093d4: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010093cc: 0x10093cc: lw    t0, 64(sp)
+// 0x010093dc: 0x10093dc: lw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3314,26 +3314,26 @@ L_100930c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010093d0: 0x10093d0: addiu v1, sp, 32
+// 0x010093e0: 0x10093e0: addiu v1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 7
-// 0x010093d4: 0x10093d4: addu  a3, t0, zero
+// 0x010093e4: 0x10093e4: addu  a3, t0, zero
 	ldloc 8
 	stloc 4
-// 0x010093d8: 0x10093d8: addu  a0, s0, zero
+// 0x010093e8: 0x10093e8: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010093dc: 0x10093dc: addu  a1, s1, zero
+// 0x010093ec: 0x10093ec: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x010093e0: 0x10093e0: addiu a2, sp, 24
+// 0x010093f0: 0x10093f0: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010093e4: 0x10093e4: sw    v0, 24(sp)
+// 0x010093f4: 0x10093f4: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3342,7 +3342,7 @@ L_100930c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010093e8: 0x10093e8: jal   0x1006cc8 sw    v1, 16(sp)
+// 0x010093f8: 0x10093f8: jal   0x1006cd8 sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3356,19 +3356,19 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010093f0: 0x10093f0: beq   v0, s2, 0x10094e4 addu  t0, v0, zero
+// 0x01009400: 0x1009400: beq   v0, s2, 0x10094f4 addu  t0, v0, zero
 	ldloc 5
 	ldloc 13
 	ldloc 5
 	stloc 8
-	beq  L_10094e4
+	beq  L_10094f4
 // --- basic block ---
-// 0x010093f8: 0x10093f8: lw    v0, 64(s3)
+// 0x01009408: 0x1009408: lw    v0, 64(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3377,7 +3377,7 @@ L_100930c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010093fc: 0x10093fc: sw    t0, 64(sp)
+// 0x0100940c: 0x100940c: sw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3386,10 +3386,10 @@ L_100930c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01009400: 0x1009400: addu  a0, v0, zero
+// 0x01009410: 0x1009410: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009404: 0x1009404: jal   0x10c09c0 sw    v0, 24(sp)
+// 0x01009414: 0x1009414: jal   0x10c1000 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3400,21 +3400,21 @@ L_100930c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100940c: 0x100940c: addu  a3, v1, zero
+// 0x0100941c: 0x100941c: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01009410: 0x1009410: addu  a0, s6, zero
+// 0x01009420: 0x1009420: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01009414: 0x1009414: addu  a1, s5, zero
+// 0x01009424: 0x1009424: addu  a1, s5, zero
 	ldloc 15
 	stloc.2
-// 0x01009418: 0x1009418: jal   0x10c0798 addu  a2, v0, zero
+// 0x01009428: 0x1009428: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3422,21 +3422,21 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009420: 0x1009420: addu  a1, v1, zero
+// 0x01009430: 0x1009430: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01009424: 0x1009424: addu  a2, s8, zero
+// 0x01009434: 0x1009434: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x01009428: 0x1009428: addu  a3, s7, zero
+// 0x01009438: 0x1009438: addu  a3, s7, zero
 	ldloc 9
 	stloc 4
-// 0x0100942c: 0x100942c: jal   0x10c06e8 addu  a0, v0, zero
+// 0x0100943c: 0x100943c: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3444,26 +3444,26 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009434: 0x1009434: addu  a1, v1, zero
+// 0x01009444: 0x1009444: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01009438: 0x1009438: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01009448: 0x1009448: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009440: 0x1009440: lw    t0, 64(sp)
+// 0x01009450: 0x1009450: lw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3472,7 +3472,7 @@ L_100930c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01009444: 0x1009444: sw    v0, 28(sp)
+// 0x01009454: 0x1009454: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3481,26 +3481,26 @@ L_100930c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01009448: 0x1009448: addu  a3, t0, zero
+// 0x01009458: 0x1009458: addu  a3, t0, zero
 	ldloc 8
 	stloc 4
-// 0x0100944c: 0x100944c: addiu v0, sp, 32
+// 0x0100945c: 0x100945c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01009450: 0x1009450: addu  a0, s0, zero
+// 0x01009460: 0x1009460: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01009454: 0x1009454: addu  a1, s1, zero
+// 0x01009464: 0x1009464: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x01009458: 0x1009458: addiu a2, sp, 24
+// 0x01009468: 0x1009468: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0100945c: 0x100945c: jal   0x1006cc8 sw    v0, 16(sp)
+// 0x0100946c: 0x100946c: jal   0x1006cd8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3514,19 +3514,19 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009464: 0x1009464: beq   v0, s2, 0x10094e4 addu  t0, v0, zero
+// 0x01009474: 0x1009474: beq   v0, s2, 0x10094f4 addu  t0, v0, zero
 	ldloc 5
 	ldloc 13
 	ldloc 5
 	stloc 8
-	beq  L_10094e4
+	beq  L_10094f4
 // --- basic block ---
-// 0x0100946c: 0x100946c: lw    v0, 56(s3)
+// 0x0100947c: 0x100947c: lw    v0, 56(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3535,7 +3535,7 @@ L_100930c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009470: 0x1009470: sw    t0, 64(sp)
+// 0x01009480: 0x1009480: sw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3544,10 +3544,10 @@ L_100930c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01009474: 0x1009474: addu  a0, v0, zero
+// 0x01009484: 0x1009484: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009478: 0x1009478: jal   0x10c09c0 sw    v0, 24(sp)
+// 0x01009488: 0x1009488: jal   0x10c1000 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3558,21 +3558,21 @@ L_100930c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009480: 0x1009480: addu  a3, v1, zero
+// 0x01009490: 0x1009490: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01009484: 0x1009484: addu  a0, s6, zero
+// 0x01009494: 0x1009494: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x01009488: 0x1009488: addu  a1, s5, zero
+// 0x01009498: 0x1009498: addu  a1, s5, zero
 	ldloc 15
 	stloc.2
-// 0x0100948c: 0x100948c: jal   0x10c0798 addu  a2, v0, zero
+// 0x0100949c: 0x100949c: jal   0x10c0dd8 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3580,21 +3580,21 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01009494: 0x1009494: addu  a1, v1, zero
+// 0x010094a4: 0x10094a4: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01009498: 0x1009498: addu  a2, s8, zero
+// 0x010094a8: 0x10094a8: addu  a2, s8, zero
 	ldloc 18
 	stloc.3
-// 0x0100949c: 0x100949c: addu  a3, s7, zero
+// 0x010094ac: 0x10094ac: addu  a3, s7, zero
 	ldloc 9
 	stloc 4
-// 0x010094a0: 0x10094a0: jal   0x10c06e8 addu  a0, v0, zero
+// 0x010094b0: 0x10094b0: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3602,26 +3602,26 @@ L_100930c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010094a8: 0x10094a8: addu  a1, v1, zero
+// 0x010094b8: 0x10094b8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010094ac: 0x10094ac: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010094bc: 0x10094bc: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010094b4: 0x10094b4: lw    t0, 64(sp)
+// 0x010094c4: 0x10094c4: lw    t0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3630,26 +3630,26 @@ L_100930c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010094b8: 0x10094b8: addiu v1, sp, 32
+// 0x010094c8: 0x10094c8: addiu v1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 7
-// 0x010094bc: 0x10094bc: addiu a2, sp, 24
+// 0x010094cc: 0x10094cc: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x010094c0: 0x10094c0: addu  a3, t0, zero
+// 0x010094d0: 0x10094d0: addu  a3, t0, zero
 	ldloc 8
 	stloc 4
-// 0x010094c4: 0x10094c4: addu  a0, s0, zero
+// 0x010094d4: 0x10094d4: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010094c8: 0x10094c8: addu  a1, s1, zero
+// 0x010094d8: 0x10094d8: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x010094cc: 0x10094cc: sw    v0, 28(sp)
+// 0x010094dc: 0x10094dc: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3658,7 +3658,7 @@ L_100930c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010094d0: 0x10094d0: sw    v1, 16(sp)
+// 0x010094e0: 0x10094e0: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3667,42 +3667,42 @@ L_100930c:
 	add
 	ldloc 7
 	stelem.i4
-L_10094d4:
-// 0x010094d4: 0x10094d4: jal   0x1006cc8 sll   zero, zero, 0
+L_10094e4:
+// 0x010094e4: 0x10094e4: jal   0x1006cd8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_check_point_in_segment_1006cd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010094dc: 0x10094dc: bne   v0, s2, 0x1009660 addu  a0, zero, zero
+// 0x010094ec: 0x10094ec: bne   v0, s2, 0x1009670 addu  a0, zero, zero
 	ldloc 5
 	ldloc 13
 	ldc.i4.s 0
 	stloc.1
-	bne.un L_1009660
+	bne.un L_1009670
 // --- basic block ---
-L_10094e4:
-// 0x010094e4: 0x10094e4: beq   s4, zero, 0x100965c addiu v0, zero, 2
+L_10094f4:
+// 0x010094f4: 0x10094f4: beq   s4, zero, 0x100966c addiu v0, zero, 2
 	ldloc 17
 	ldc.i4.2
 	stloc 5
-	brfalse L_100965c
+	brfalse L_100966c
 // --- basic block ---
-// 0x010094ec: 0x10094ec: bne   s2, v0, 0x1009538 addiu a1, sp, 32
+// 0x010094fc: 0x10094fc: bne   s2, v0, 0x1009548 addiu a1, sp, 32
 	ldloc 13
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-	bne.un L_1009538
+	bne.un L_1009548
 // --- basic block ---
-// 0x010094f4: 0x10094f4: jal   0x1008eb0 addu  a0, s0, zero
+// 0x01009504: 0x1009504: jal   0x1008ec0 addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -3710,20 +3710,20 @@ L_10094e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010094fc: 0x10094fc: addu  a0, s0, zero
+// 0x0100950c: 0x100950c: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01009500: 0x1009500: addiu a1, sp, 40
+// 0x01009510: 0x1009510: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x01009504: 0x1009504: jal   0x1008eb0 addu  s2, v0, zero
+// 0x01009514: 0x1009514: jal   0x1008ec0 addu  s2, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -3731,21 +3731,21 @@ L_10094e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100950c: 0x100950c: slt   v0, v0, s2
+// 0x0100951c: 0x100951c: slt   v0, v0, s2
 	ldloc 5
 	ldloc 13
 	clt
 	stloc 5
-// 0x01009510: 0x1009510: beq   v0, zero, 0x1009538 sll   zero, zero, 0
+// 0x01009520: 0x1009520: beq   v0, zero, 0x1009548 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1009538
+	brfalse L_1009548
 // --- basic block ---
-// 0x01009518: 0x1009518: lw    a0, 32(sp)
+// 0x01009528: 0x1009528: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3754,7 +3754,7 @@ L_10094e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100951c: 0x100951c: lw    v1, 44(sp)
+// 0x0100952c: 0x100952c: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3763,7 +3763,7 @@ L_10094e4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009520: 0x1009520: lw    v0, 40(sp)
+// 0x01009530: 0x1009530: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3772,7 +3772,7 @@ L_10094e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009524: 0x1009524: sw    a0, 40(sp)
+// 0x01009534: 0x1009534: sw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3781,7 +3781,7 @@ L_10094e4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01009528: 0x1009528: lw    a0, 36(sp)
+// 0x01009538: 0x1009538: lw    a0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3790,7 +3790,7 @@ L_10094e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100952c: 0x100952c: sw    v0, 32(sp)
+// 0x0100953c: 0x100953c: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3799,7 +3799,7 @@ L_10094e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01009530: 0x1009530: sw    a0, 44(sp)
+// 0x01009540: 0x1009540: sw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3808,7 +3808,7 @@ L_10094e4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01009534: 0x1009534: sw    v1, 36(sp)
+// 0x01009544: 0x1009544: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3817,8 +3817,8 @@ L_10094e4:
 	add
 	ldloc 7
 	stelem.i4
-L_1009538:
-// 0x01009538: 0x1009538: lw    a1, 52(sp)
+L_1009548:
+// 0x01009548: 0x1009548: lw    a1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3827,27 +3827,27 @@ L_1009538:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100953c: 0x100953c: sll   zero, zero, 0
-// 0x01009540: 0x1009540: beq   a1, zero, 0x1009574 lui   v0, 0xe0000
+// 0x0100954c: 0x100954c: sll   zero, zero, 0
+// 0x01009550: 0x1009550: beq   a1, zero, 0x1009584 lui   v0, 0xe0000
 	ldloc.2
 	ldc.i4 917504
 	stloc 5
-	brfalse L_1009574
+	brfalse L_1009584
 // --- basic block ---
-L_1009548:
-// 0x01009548: 0x1009548: addiu v0, v0, 29604
+L_1009558:
+// 0x01009558: 0x1009558: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x0100954c: 0x100954c: lw    a1, 0(s0)
+// 0x0100955c: 0x100955c: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01009550: 0x1009550: lw    v1, 80(v0)
+// 0x01009560: 0x1009560: lw    v1, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3856,7 +3856,7 @@ L_1009548:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009554: 0x1009554: lw    a0, 32(v0)
+// 0x01009564: 0x1009564: lw    a0, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3865,27 +3865,27 @@ L_1009548:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009558: 0x1009558: subu  v1, a1, v1
+// 0x01009568: 0x1009568: subu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	sub
 	stloc 7
-// 0x0100955c: 0x100955c: div   v1, a0
+// 0x0100956c: 0x100956c: div   v1, a0
 	ldloc 7
 	ldloc.1
 	div
 	stloc 16
-// 0x01009560: 0x1009560: mflo  lo
+// 0x01009570: 0x1009570: mflo  lo
 	ldloc 16
 	stloc.3
-// 0x01009564: 0x1009564: sw    a2, 0(s4)
+// 0x01009574: 0x1009574: sw    a2, 0(s4)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01009568: 0x1009568: lw    a1, 4(s0)
+// 0x01009578: 0x1009578: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3894,18 +3894,18 @@ L_1009548:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100956c: 0x100956c: j	 0x100959c addu  a0, zero, zero
+// 0x0100957c: 0x100957c: j	 0x10095ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_100959c
+	br L_10095ac
 // --- basic block ---
-L_1009574:
-// 0x01009574: 0x1009574: addiu v0, v0, 29604
+L_1009584:
+// 0x01009584: 0x1009584: addiu v0, v0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01009578: 0x1009578: lw    a1, 32(sp)
+// 0x01009588: 0x1009588: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3914,7 +3914,7 @@ L_1009574:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100957c: 0x100957c: lw    v1, 80(v0)
+// 0x0100958c: 0x100958c: lw    v1, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3923,7 +3923,7 @@ L_1009574:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009580: 0x1009580: lw    a0, 32(v0)
+// 0x01009590: 0x1009590: lw    a0, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3932,17 +3932,17 @@ L_1009574:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009584: 0x1009584: subu  v1, a1, v1
+// 0x01009594: 0x1009594: subu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	sub
 	stloc 7
-// 0x01009588: 0x1009588: div   v1, a0
+// 0x01009598: 0x1009598: div   v1, a0
 	ldloc 7
 	ldloc.1
 	div
 	stloc 16
-// 0x0100958c: 0x100958c: lw    a1, 36(sp)
+// 0x0100959c: 0x100959c: lw    a1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3951,21 +3951,21 @@ L_1009574:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009590: 0x1009590: addiu a0, zero, 1
+// 0x010095a0: 0x10095a0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01009594: 0x1009594: mflo  lo
+// 0x010095a4: 0x10095a4: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x01009598: 0x1009598: sw    v1, 0(s4)
+// 0x010095a8: 0x10095a8: sw    v1, 0(s4)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_100959c:
-// 0x0100959c: 0x100959c: lw    a2, 76(v0)
+L_10095ac:
+// 0x010095ac: 0x10095ac: lw    a2, 76(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3974,7 +3974,7 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010095a0: 0x10095a0: lw    v1, 36(v0)
+// 0x010095b0: 0x10095b0: lw    v1, 36(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3983,17 +3983,17 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010095a4: 0x10095a4: subu  v0, a2, a1
+// 0x010095b4: 0x10095b4: subu  v0, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc 5
-// 0x010095a8: 0x10095a8: div   v0, v1
+// 0x010095b8: 0x10095b8: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 16
-// 0x010095ac: 0x10095ac: lw    v0, 48(sp)
+// 0x010095bc: 0x10095bc: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4002,10 +4002,10 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010095b0: 0x10095b0: mflo  lo
+// 0x010095c0: 0x10095c0: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x010095b4: 0x10095b4: sw    v1, 4(s4)
+// 0x010095c4: 0x10095c4: sw    v1, 4(s4)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
@@ -4014,25 +4014,25 @@ L_100959c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010095b8: 0x10095b8: lui   v1, 0xe0000
+// 0x010095c8: 0x10095c8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 7
-// 0x010095bc: 0x10095bc: beq   v0, zero, 0x100960c addiu v1, v1, 29604
+// 0x010095cc: 0x10095cc: beq   v0, zero, 0x100961c addiu v1, v1, 30068
 	ldloc 5
 	ldloc 7
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 7
-	brfalse L_100960c
+	brfalse L_100961c
 // --- basic block ---
-// 0x010095c4: 0x10095c4: lw    a1, 0(s1)
+// 0x010095d4: 0x10095d4: lw    a1, 0(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010095c8: 0x10095c8: lw    v0, 80(v1)
+// 0x010095d8: 0x10095d8: lw    v0, 80(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4041,7 +4041,7 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010095cc: 0x10095cc: lw    a0, 32(v1)
+// 0x010095dc: 0x10095dc: lw    a0, 32(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4050,17 +4050,17 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010095d0: 0x10095d0: subu  v0, a1, v0
+// 0x010095e0: 0x10095e0: subu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc 5
-// 0x010095d4: 0x10095d4: div   v0, a0
+// 0x010095e4: 0x10095e4: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 16
-// 0x010095d8: 0x10095d8: lw    a1, 124(sp)
+// 0x010095e8: 0x10095e8: lw    a1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4069,20 +4069,20 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010095dc: 0x10095dc: addiu a0, zero, 1
+// 0x010095ec: 0x10095ec: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010095e0: 0x10095e0: mflo  lo
+// 0x010095f0: 0x10095f0: mflo  lo
 	ldloc 16
 	stloc.3
-// 0x010095e4: 0x10095e4: sw    a2, 0(a1)
+// 0x010095f4: 0x10095f4: sw    a2, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x010095e8: 0x10095e8: lw    a1, 76(v1)
+// 0x010095f8: 0x10095f8: lw    a1, 76(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4091,7 +4091,7 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010095ec: 0x10095ec: lw    v0, 4(s1)
+// 0x010095fc: 0x10095fc: lw    v0, 4(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -4100,7 +4100,7 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010095f0: 0x10095f0: lw    v1, 36(v1)
+// 0x01009600: 0x1009600: lw    v1, 36(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4109,17 +4109,17 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010095f4: 0x10095f4: subu  v0, a1, v0
+// 0x01009604: 0x1009604: subu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc 5
-// 0x010095f8: 0x10095f8: div   v0, v1
+// 0x01009608: 0x1009608: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 16
-// 0x010095fc: 0x10095fc: lw    v0, 124(sp)
+// 0x0100960c: 0x100960c: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4128,10 +4128,10 @@ L_100959c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009600: 0x1009600: mflo  lo
+// 0x01009610: 0x1009610: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x01009604: 0x1009604: j	 0x1009660 sw    v1, 4(v0)
+// 0x01009614: 0x1009614: j	 0x1009670 sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4140,32 +4140,32 @@ L_100959c:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1009660
+	br L_1009670
 // --- basic block ---
-L_100960c:
-// 0x0100960c: 0x100960c: sll   a0, a0, 3
+L_100961c:
+// 0x0100961c: 0x100961c: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x01009610: 0x1009610: addiu v0, sp, 32
+// 0x01009620: 0x1009620: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01009614: 0x1009614: addu  v0, v0, a0
+// 0x01009624: 0x1009624: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01009618: 0x1009618: lw    a2, 0(v0)
+// 0x01009628: 0x1009628: lw    a2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100961c: 0x100961c: lw    a0, 80(v1)
+// 0x0100962c: 0x100962c: lw    a0, 80(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4174,7 +4174,7 @@ L_100960c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009620: 0x1009620: lw    a1, 32(v1)
+// 0x01009630: 0x1009630: lw    a1, 32(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4183,17 +4183,17 @@ L_100960c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009624: 0x1009624: subu  a0, a2, a0
+// 0x01009634: 0x1009634: subu  a0, a2, a0
 	ldloc.3
 	ldloc.1
 	sub
 	stloc.1
-// 0x01009628: 0x1009628: div   a0, a1
+// 0x01009638: 0x1009638: div   a0, a1
 	ldloc.1
 	ldloc.2
 	div
 	stloc 16
-// 0x0100962c: 0x100962c: lw    a2, 124(sp)
+// 0x0100963c: 0x100963c: lw    a2, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4202,7 +4202,7 @@ L_100960c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01009630: 0x1009630: lw    v0, 4(v0)
+// 0x01009640: 0x1009640: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4211,20 +4211,20 @@ L_100960c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009634: 0x1009634: addiu a0, zero, 1
+// 0x01009644: 0x1009644: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01009638: 0x1009638: mflo  lo
+// 0x01009648: 0x1009648: mflo  lo
 	ldloc 16
 	stloc.2
-// 0x0100963c: 0x100963c: sw    a1, 0(a2)
+// 0x0100964c: 0x100964c: sw    a1, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01009640: 0x1009640: lw    a1, 76(v1)
+// 0x01009650: 0x1009650: lw    a1, 76(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4233,7 +4233,7 @@ L_100960c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009644: 0x1009644: lw    v1, 36(v1)
+// 0x01009654: 0x1009654: lw    v1, 36(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4242,20 +4242,20 @@ L_100960c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009648: 0x1009648: subu  v0, a1, v0
+// 0x01009658: 0x1009658: subu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc 5
-// 0x0100964c: 0x100964c: div   v0, v1
+// 0x0100965c: 0x100965c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 16
-// 0x01009650: 0x1009650: mflo  lo
+// 0x01009660: 0x1009660: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x01009654: 0x1009654: j	 0x1009660 sw    v1, 4(a2)
+// 0x01009664: 0x1009664: j	 0x1009670 sw    v1, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4264,18 +4264,18 @@ L_100960c:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1009660
+	br L_1009670
 // --- basic block ---
-L_100965c:
-// 0x0100965c: 0x100965c: addiu a0, zero, 1
+L_100966c:
+// 0x0100966c: 0x100966c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_1009660:
-// 0x01009660: 0x1009660: lw    ra, 108(sp)
-// 0x01009664: 0x1009664: addu  v0, a0, zero
+L_1009670:
+// 0x01009670: 0x1009670: lw    ra, 108(sp)
+// 0x01009674: 0x1009674: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01009668: 0x1009668: lw    s8, 104(sp)
+// 0x01009678: 0x1009678: lw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4284,7 +4284,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0100966c: 0x100966c: lw    s7, 100(sp)
+// 0x0100967c: 0x100967c: lw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4293,7 +4293,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01009670: 0x1009670: lw    s6, 96(sp)
+// 0x01009680: 0x1009680: lw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4302,7 +4302,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01009674: 0x1009674: lw    s5, 92(sp)
+// 0x01009684: 0x1009684: lw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4311,7 +4311,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01009678: 0x1009678: lw    s4, 88(sp)
+// 0x01009688: 0x1009688: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4320,7 +4320,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0100967c: 0x100967c: lw    s3, 84(sp)
+// 0x0100968c: 0x100968c: lw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4329,7 +4329,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01009680: 0x1009680: lw    s2, 80(sp)
+// 0x01009690: 0x1009690: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4338,7 +4338,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01009684: 0x1009684: lw    s1, 76(sp)
+// 0x01009694: 0x1009694: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4347,7 +4347,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01009688: 0x1009688: lw    s0, 72(sp)
+// 0x01009698: 0x1009698: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4356,7 +4356,7 @@ L_1009660:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100968c: 0x100968c: jr    ra addiu sp, sp, 112
+// 0x0100969c: 0x100969c: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -4368,7 +4368,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_screen_distance_1009694(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_screen_distance_10096a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 lo,int32 ra)
@@ -4406,7 +4406,7 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009694: 0x1009694: lw    a3, 4(a0)
+// 0x010096a4: 0x10096a4: lw    a3, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4415,7 +4415,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01009698: 0x1009698: lw    v0, 4(a1)
+// 0x010096a8: 0x10096a8: lw    v0, 4(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -4424,63 +4424,63 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100969c: 0x100969c: lw    v1, 0(a0)
+// 0x010096ac: 0x10096ac: lw    v1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010096a0: 0x10096a0: subu  v0, a3, v0
+// 0x010096b0: 0x10096b0: subu  v0, a3, v0
 	ldloc 4
 	ldloc 5
 	sub
 	stloc 5
-// 0x010096a4: 0x10096a4: mult  v0, v0
+// 0x010096b4: 0x10096b4: mult  v0, v0
 	ldloc 5
 	ldloc 5
 	mul
 	stloc 8
-// 0x010096a8: 0x10096a8: lw    a0, 0(a1)
+// 0x010096b8: 0x10096b8: lw    a0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010096ac: 0x10096ac: addiu sp, sp, -24
+// 0x010096bc: 0x10096bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010096b0: 0x10096b0: subu  v1, v1, a0
+// 0x010096c0: 0x10096c0: subu  v1, v1, a0
 	ldloc 6
 	ldloc.1
 	sub
 	stloc 6
-// 0x010096b4: 0x10096b4: sw    ra, 20(sp)
-// 0x010096b8: 0x10096b8: mflo  lo
+// 0x010096c4: 0x10096c4: sw    ra, 20(sp)
+// 0x010096c8: 0x10096c8: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010096bc: 0x10096bc: sll   zero, zero, 0
-// 0x010096c0: 0x10096c0: sll   zero, zero, 0
-// 0x010096c4: 0x10096c4: mult  v1, v1
+// 0x010096cc: 0x10096cc: sll   zero, zero, 0
+// 0x010096d0: 0x10096d0: sll   zero, zero, 0
+// 0x010096d4: 0x10096d4: mult  v1, v1
 	ldloc 6
 	ldloc 6
 	mul
 	stloc 8
-// 0x010096c8: 0x10096c8: mflo  lo
+// 0x010096d8: 0x10096d8: mflo  lo
 	ldloc 8
 	stloc 6
-// 0x010096cc: 0x10096cc: bne   a2, zero, 0x10096fc addu  v0, v0, v1
+// 0x010096dc: 0x10096dc: bne   a2, zero, 0x100970c addu  v0, v0, v1
 	ldloc.3
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-	brtrue L_10096fc
+	brtrue L_100970c
 // --- basic block ---
-// 0x010096d4: 0x10096d4: jal   0x10c09ac addu  a0, v0, zero
+// 0x010096e4: 0x10096e4: jal   0x10c0fec addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -4488,48 +4488,48 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x010096dc: 0x10096dc: jal   0x10c0874 addu  a0, v0, zero
+// 0x010096ec: 0x10096ec: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010096e4: 0x10096e4: addu  a1, v1, zero
+// 0x010096f4: 0x10096f4: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010096e8: 0x10096e8: jal   0x10c1fe4 addu  a0, v0, zero
+// 0x010096f8: 0x10096f8: jal   0x10c2624 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sqrt_10c1fe4(int32,int32,int32)
+	call int32 Cibyl144::sqrt_10c2624(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010096f0: 0x10096f0: addu  a1, v1, zero
+// 0x01009700: 0x1009700: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010096f4: 0x10096f4: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01009704: 0x1009704: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10096fc:
-// 0x010096fc: 0x10096fc: lw    ra, 20(sp)
-// 0x01009700: 0x1009700: sll   zero, zero, 0
-// 0x01009704: 0x1009704: jr    ra addiu sp, sp, 24
+L_100970c:
+// 0x0100970c: 0x100970c: lw    ra, 20(sp)
+// 0x01009710: 0x1009710: sll   zero, zero, 0
+// 0x01009714: 0x1009714: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4541,7 +4541,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s4,int32 s1,int32 s5,int32 ra)
@@ -4591,12 +4591,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009824: 0x1009824: addiu sp, sp, -40
+// 0x01009834: 0x1009834: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01009828: 0x1009828: sw    s2, 24(sp)
+// 0x01009838: 0x1009838: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4605,27 +4605,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100982c: 0x100982c: addu  s2, a0, zero
+// 0x0100983c: 0x100983c: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01009830: 0x1009830: lui   v1, 0xe0000
+// 0x01009840: 0x1009840: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x01009834: 0x1009834: lw    a0, 0(a1)
+// 0x01009844: 0x1009844: lw    a0, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01009838: 0x1009838: lw    v0, 0(s2)
+// 0x01009848: 0x1009848: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100983c: 0x100983c: sw    s0, 16(sp)
+// 0x0100984c: 0x100984c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4634,22 +4634,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01009840: 0x1009840: lw    s0, 29720(v1)
+// 0x01009850: 0x1009850: lw    s0, 30184(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 8
-// 0x01009844: 0x1009844: subu  a0, a0, v0
+// 0x01009854: 0x1009854: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x01009848: 0x1009848: sw    ra, 36(sp)
-// 0x0100984c: 0x100984c: sw    s5, 32(sp)
+// 0x01009858: 0x1009858: sw    ra, 36(sp)
+// 0x0100985c: 0x100985c: sw    s5, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4658,7 +4658,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01009850: 0x1009850: sw    s4, 28(sp)
+// 0x01009860: 0x1009860: sw    s4, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4667,7 +4667,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01009854: 0x1009854: sw    s1, 20(sp)
+// 0x01009864: 0x1009864: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4676,7 +4676,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01009858: 0x1009858: jal   0x10c09ac addu  s4, a1, zero
+// 0x01009868: 0x1009868: jal   0x10c0fec addu  s4, a1, zero
 	ldloc.2
 	stloc 10
 	ldloc.1
@@ -4684,7 +4684,7 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01009860: 0x1009860: lw    a1, 8(s0)
+// 0x01009870: 0x1009870: lw    a1, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4693,18 +4693,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009864: 0x1009864: jal   0x10c0780 addu  a0, v0, zero
+// 0x01009874: 0x1009874: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100986c: 0x100986c: addu  s1, v0, zero
+// 0x0100987c: 0x100987c: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01009870: 0x1009870: lw    a0, 4(s4)
+// 0x01009880: 0x1009880: lw    a0, 4(s4)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -4713,7 +4713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009874: 0x1009874: lw    v0, 4(s2)
+// 0x01009884: 0x1009884: lw    v0, 4(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4722,7 +4722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009878: 0x1009878: jal   0x10c09ac subu  a0, a0, v0
+// 0x01009888: 0x1009888: jal   0x10c0fec subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
@@ -4732,7 +4732,7 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01009880: 0x1009880: lw    a1, 4(s0)
+// 0x01009890: 0x1009890: lw    a1, 4(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4741,135 +4741,135 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009884: 0x1009884: jal   0x10c0780 addu  a0, v0, zero
+// 0x01009894: 0x1009894: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100988c: 0x100988c: addu  a0, v0, zero
+// 0x0100989c: 0x100989c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009890: 0x1009890: addu  a1, v0, zero
+// 0x010098a0: 0x10098a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01009894: 0x1009894: jal   0x10c0780 addu  s0, v0, zero
+// 0x010098a4: 0x10098a4: jal   0x10c0dc0 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100989c: 0x100989c: addu  a0, s1, zero
+// 0x010098ac: 0x10098ac: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010098a0: 0x10098a0: addu  a1, s1, zero
+// 0x010098b0: 0x10098b0: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x010098a4: 0x10098a4: jal   0x10c0780 addu  s2, v0, zero
+// 0x010098b4: 0x10098b4: jal   0x10c0dc0 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010098ac: 0x10098ac: addu  a1, v0, zero
+// 0x010098bc: 0x10098bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010098b0: 0x10098b0: jal   0x10c06d0 addu  a0, s2, zero
+// 0x010098c0: 0x10098c0: jal   0x10c0d10 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010098b8: 0x10098b8: jal   0x10c0874 addu  a0, v0, zero
+// 0x010098c8: 0x10098c8: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010098c0: 0x10098c0: addu  a1, v1, zero
+// 0x010098d0: 0x10098d0: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010098c4: 0x10098c4: jal   0x10c1fe4 addu  a0, v0, zero
+// 0x010098d4: 0x10098d4: jal   0x10c2624 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sqrt_10c1fe4(int32,int32,int32)
+	call int32 Cibyl144::sqrt_10c2624(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010098cc: 0x10098cc: addu  a1, v1, zero
+// 0x010098dc: 0x10098dc: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010098d0: 0x10098d0: jal   0x10c0898 addu  a0, v0, zero
+// 0x010098e0: 0x10098e0: jal   0x10c0ed8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__truncdfsf2_10c0898(int32,int32,int32)
+	call int32 Cibyl143::__truncdfsf2_10c0ed8(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010098d8: 0x10098d8: addu  a0, v0, zero
+// 0x010098e8: 0x10098e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010098dc: 0x10098dc: jal   0x10c0874 addu  s2, v0, zero
+// 0x010098ec: 0x10098ec: jal   0x10c0eb4 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010098e4: 0x10098e4: addu  s4, v0, zero
+// 0x010098f4: 0x10098f4: addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010098e8: 0x10098e8: lui   v0, 0x20000
+// 0x010098f8: 0x10098f8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010098ec: 0x10098ec: lw    a3, 23772(v0)
+// 0x010098fc: 0x10098fc: lw    a3, 24236(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5943
+	ldc.i4 6059
 	add
 	ldelem.i4
 	stloc 4
-// 0x010098f0: 0x10098f0: lw    a2, 23768(v0)
+// 0x01009900: 0x1009900: lw    a2, 24232(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5942
+	ldc.i4 6058
 	add
 	ldelem.i4
 	stloc.3
-// 0x010098f4: 0x10098f4: addu  a1, v1, zero
+// 0x01009904: 0x1009904: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010098f8: 0x10098f8: addu  a0, s4, zero
+// 0x01009908: 0x1009908: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x010098fc: 0x10098fc: jal   0x10c17ac addu  s5, v1, zero
+// 0x0100990c: 0x100990c: jal   0x10c1dec addu  s5, v1, zero
 	ldloc 6
 	stloc 12
 	ldloc.0
@@ -4877,40 +4877,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtdf2_10c17ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtdf2_10c1dec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009904: 0x1009904: bgtz  v0, 0x1009928 lui   v0, 0x20000
+// 0x01009914: 0x1009914: bgtz  v0, 0x1009938 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	bgt L_1009928
+	bgt L_1009938
 // --- basic block ---
-// 0x0100990c: 0x100990c: lw    a3, 23780(v0)
+// 0x0100991c: 0x100991c: lw    a3, 24244(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5945
+	ldc.i4 6061
 	add
 	ldelem.i4
 	stloc 4
-// 0x01009910: 0x1009910: lw    a2, 23776(v0)
+// 0x01009920: 0x1009920: lw    a2, 24240(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5944
+	ldc.i4 6060
 	add
 	ldelem.i4
 	stloc.3
-// 0x01009914: 0x1009914: addu  a1, s5, zero
+// 0x01009924: 0x1009924: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x01009918: 0x1009918: jal   0x10c188c addu  a0, s4, zero
+// 0x01009928: 0x1009928: jal   0x10c1ecc addu  a0, s4, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4918,23 +4918,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__ltdf2_10c188c(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__ltdf2_10c1ecc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009920: 0x1009920: bgez  v0, 0x1009974 addu  v1, zero, zero
+// 0x01009930: 0x1009930: bgez  v0, 0x1009984 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	bge L_1009974
+	bge L_1009984
 // --- basic block ---
-L_1009928:
-// 0x01009928: 0x1009928: addu  a0, s1, zero
+L_1009938:
+// 0x01009938: 0x1009938: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0100992c: 0x100992c: jal   0x10c1a80 addu  a1, zero, zero
+// 0x0100993c: 0x100993c: jal   0x10c20c0 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4942,57 +4942,57 @@ L_1009928:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::__gtsf2_10c1a80(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtsf2_10c20c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009934: 0x1009934: lui   v1, 0x20000
+// 0x01009944: 0x1009944: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01009938: 0x1009938: lw    a1, 23636(v1)
+// 0x01009948: 0x1009948: lw    a1, 24096(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 5909
+	ldc.i4 6024
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100993c: 0x100993c: slti  v0, v0, 1
+// 0x0100994c: 0x100994c: slti  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt
 	stloc 5
-// 0x01009940: 0x1009940: addu  a0, s0, zero
+// 0x01009950: 0x1009950: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01009944: 0x1009944: subu  v0, zero, v0
+// 0x01009954: 0x1009954: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x01009948: 0x1009948: jal   0x10c0780 ori   s0, v0, 1
+// 0x01009958: 0x1009958: jal   0x10c0dc0 ori   s0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 8
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01009950: 0x1009950: addu  a0, v0, zero
+// 0x01009960: 0x1009960: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009954: 0x1009954: jal   0x10c07d8 addu  a1, s2, zero
+// 0x01009964: 0x1009964: jal   0x10c0e18 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100995c: 0x100995c: jal   0x10c08bc addu  a0, v0, zero
+// 0x0100996c: 0x100996c: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -5000,10 +5000,10 @@ L_1009928:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01009964: 0x1009964: addu  a0, v0, zero
+// 0x01009974: 0x1009974: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01009968: 0x1009968: jal   0x1008a70 addu  a1, s0, zero
+// 0x01009978: 0x1009978: jal   0x1008a80 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5011,20 +5011,20 @@ L_1009928:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_arccosine_1008a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_arccosine_1008a80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009970: 0x1009970: addu  v1, v0, zero
+// 0x01009980: 0x1009980: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_1009974:
-// 0x01009974: 0x1009974: lw    ra, 36(sp)
-// 0x01009978: 0x1009978: addu  v0, v1, zero
+L_1009984:
+// 0x01009984: 0x1009984: lw    ra, 36(sp)
+// 0x01009988: 0x1009988: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0100997c: 0x100997c: lw    s5, 32(sp)
+// 0x0100998c: 0x100998c: lw    s5, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5033,7 +5033,7 @@ L_1009974:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01009980: 0x1009980: lw    s4, 28(sp)
+// 0x01009990: 0x1009990: lw    s4, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5042,7 +5042,7 @@ L_1009974:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01009984: 0x1009984: lw    s2, 24(sp)
+// 0x01009994: 0x1009994: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5051,7 +5051,7 @@ L_1009974:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01009988: 0x1009988: lw    s1, 20(sp)
+// 0x01009998: 0x1009998: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5060,7 +5060,7 @@ L_1009974:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100998c: 0x100998c: lw    s0, 16(sp)
+// 0x0100999c: 0x100999c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5069,7 +5069,7 @@ L_1009974:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01009990: 0x1009990: jr    ra addiu sp, sp, 40
+// 0x010099a0: 0x10099a0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5081,7 +5081,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_restore_zoom_1009998(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_restore_zoom_10099a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5119,20 +5119,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009998: 0x1009998: lui   a0, 0x0
+// 0x010099a8: 0x10099a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100999c: 0x100999c: addiu sp, sp, -24
+// 0x010099ac: 0x10099ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010099a0: 0x10099a0: addiu a0, a0, 492
+// 0x010099b0: 0x10099b0: addiu a0, a0, 492
 	ldloc.1
 	ldc.i4 492
 	add
 	stloc.1
-// 0x010099a4: 0x10099a4: sw    s0, 16(sp)
+// 0x010099b4: 0x10099b4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5141,8 +5141,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010099a8: 0x10099a8: sw    ra, 20(sp)
-// 0x010099ac: 0x10099ac: jal   0x100e788 lui   s0, 0xe0000
+// 0x010099b8: 0x10099b8: sw    ra, 20(sp)
+// 0x010099bc: 0x10099bc: jal   0x100e798 lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 7
 	ldloc.0
@@ -5150,27 +5150,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010099b4: 0x10099b4: bne   v0, zero, 0x10099d8 sw    v0, 29604(s0)
+// 0x010099c4: 0x10099c4: bne   v0, zero, 0x10099e8 sw    v0, 30068(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10099d8
+	brtrue L_10099e8
 // --- basic block ---
-// 0x010099bc: 0x10099bc: lui   a0, 0x0
+// 0x010099cc: 0x10099cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010099c0: 0x10099c0: jal   0x100e788 addiu a0, a0, 476
+// 0x010099d0: 0x10099d0: jal   0x100e798 addiu a0, a0, 476
 	ldloc.1
 	ldc.i4 476
 	add
@@ -5180,49 +5180,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010099c8: 0x10099c8: bne   v0, zero, 0x10099d8 sw    v0, 29604(s0)
+// 0x010099d8: 0x10099d8: bne   v0, zero, 0x10099e8 sw    v0, 30068(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10099d8
+	brtrue L_10099e8
 // --- basic block ---
-// 0x010099d0: 0x10099d0: addiu v0, zero, 20
+// 0x010099e0: 0x10099e0: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x010099d4: 0x10099d4: sw    v0, 29604(s0)
+// 0x010099e4: 0x10099e4: sw    v0, 30068(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 5
 	stelem.i4
-L_10099d8:
-// 0x010099d8: 0x10099d8: jal   0x1008498 sll   zero, zero, 0
+L_10099e8:
+// 0x010099e8: 0x10099e8: jal   0x10084a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010099e0: 0x10099e0: lw    ra, 20(sp)
-// 0x010099e4: 0x10099e4: lw    s0, 16(sp)
+// 0x010099f0: 0x10099f0: lw    ra, 20(sp)
+// 0x010099f4: 0x10099f4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ L_10099d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010099e8: 0x10099e8: jr    ra addiu sp, sp, 24
+// 0x010099f8: 0x10099f8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5243,7 +5243,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_zoom_state_10099f0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_zoom_state_1009a00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -5281,18 +5281,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010099f0: 0x10099f0: addiu sp, sp, -24
+// 0x01009a00: 0x1009a00: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010099f4: 0x10099f4: lui   v0, 0xe0000
+// 0x01009a04: 0x1009a04: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x010099f8: 0x10099f8: lui   a0, 0x0
+// 0x01009a08: 0x1009a08: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010099fc: 0x10099fc: sw    s0, 16(sp)
+// 0x01009a0c: 0x1009a0c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5301,17 +5301,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01009a00: 0x1009a00: lw    s0, 29604(v0)
+// 0x01009a10: 0x1009a10: lw    s0, 30068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009a04: 0x1009a04: sw    ra, 20(sp)
-// 0x01009a08: 0x1009a08: jal   0x100e788 addiu a0, a0, 476
+// 0x01009a14: 0x1009a14: sw    ra, 20(sp)
+// 0x01009a18: 0x1009a18: jal   0x100e798 addiu a0, a0, 476
 	ldloc.1
 	ldc.i4 476
 	add
@@ -5321,23 +5321,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01009a10: 0x1009a10: lw    ra, 20(sp)
-// 0x01009a14: 0x1009a14: xor   v0, s0, v0
+// 0x01009a20: 0x1009a20: lw    ra, 20(sp)
+// 0x01009a24: 0x1009a24: xor   v0, s0, v0
 	ldloc 7
 	ldloc 5
 	xor
 	stloc 5
-// 0x01009a18: 0x1009a18: sltiu v0, v0, 1
+// 0x01009a28: 0x1009a28: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01009a1c: 0x1009a1c: lw    s0, 16(sp)
+// 0x01009a2c: 0x1009a2c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5346,7 +5346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009a20: 0x1009a20: jr    ra addiu sp, sp, 24
+// 0x01009a30: 0x1009a30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5358,7 +5358,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_zoom_reset_1009a28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_zoom_reset_1009a38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5393,16 +5393,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009a28: 0x1009a28: lui   a0, 0x0
+// 0x01009a38: 0x1009a38: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01009a2c: 0x1009a2c: addiu sp, sp, -24
+// 0x01009a3c: 0x1009a3c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01009a30: 0x1009a30: sw    ra, 20(sp)
-// 0x01009a34: 0x1009a34: jal   0x100e788 addiu a0, a0, 476
+// 0x01009a40: 0x1009a40: sw    ra, 20(sp)
+// 0x01009a44: 0x1009a44: jal   0x100e798 addiu a0, a0, 476
 	ldloc.1
 	ldc.i4 476
 	add
@@ -5412,31 +5412,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009a3c: 0x1009a3c: lui   a0, 0x0
+// 0x01009a4c: 0x1009a4c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01009a40: 0x1009a40: lui   v1, 0xe0000
+// 0x01009a50: 0x1009a50: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x01009a44: 0x1009a44: addiu a0, a0, 492
+// 0x01009a54: 0x1009a54: addiu a0, a0, 492
 	ldloc.1
 	ldc.i4 492
 	add
 	stloc.1
-// 0x01009a48: 0x1009a48: addu  a1, v0, zero
+// 0x01009a58: 0x1009a58: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01009a4c: 0x1009a4c: jal   0x100e610 sw    v0, 29604(v1)
+// 0x01009a5c: 0x1009a5c: jal   0x100e620 sw    v0, 30068(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 5
 	stelem.i4
@@ -5445,25 +5445,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009a54: 0x1009a54: jal   0x1008498 sll   zero, zero, 0
+// 0x01009a64: 0x1009a64: jal   0x10084a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009a5c: 0x1009a5c: lw    ra, 20(sp)
-// 0x01009a60: 0x1009a60: sll   zero, zero, 0
-// 0x01009a64: 0x1009a64: jr    ra addiu sp, sp, 24
+// 0x01009a6c: 0x1009a6c: lw    ra, 20(sp)
+// 0x01009a70: 0x1009a70: sll   zero, zero, 0
+// 0x01009a74: 0x1009a74: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5475,7 +5475,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_zoom_set_1009a6c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_zoom_set_1009a7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5510,93 +5510,93 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009a6c: 0x1009a6c: lui   v1, 0xe0000
+// 0x01009a7c: 0x1009a7c: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x01009a70: 0x1009a70: lw    a1, 29604(v1)
+// 0x01009a80: 0x1009a80: lw    a1, 30068(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009a74: 0x1009a74: addiu sp, sp, -24
+// 0x01009a84: 0x1009a84: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01009a78: 0x1009a78: sw    ra, 20(sp)
-// 0x01009a7c: 0x1009a7c: beq   a1, a0, 0x1009b00 addu  v0, zero, zero
+// 0x01009a88: 0x1009a88: sw    ra, 20(sp)
+// 0x01009a8c: 0x1009a8c: beq   a1, a0, 0x1009b10 addu  v0, zero, zero
 	ldloc.2
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1009b00
+	beq  L_1009b10
 // --- basic block ---
-// 0x01009a84: 0x1009a84: slti  v0, a0, 6
+// 0x01009a94: 0x1009a94: slti  v0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	clt
 	stloc 5
-// 0x01009a88: 0x1009a88: beq   v0, zero, 0x1009a98 sw    a0, 29604(v1)
+// 0x01009a98: 0x1009a98: beq   v0, zero, 0x1009aa8 sw    a0, 30068(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_1009a98
+	brfalse L_1009aa8
 // --- basic block ---
-// 0x01009a90: 0x1009a90: j	 0x1009ab0 addiu v0, zero, 6
+// 0x01009aa0: 0x1009aa0: j	 0x1009ac0 addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-	br L_1009ab0
+	br L_1009ac0
 // --- basic block ---
-L_1009a98:
-// 0x01009a98: 0x1009a98: lui   v0, 0x10000
+L_1009aa8:
+// 0x01009aa8: 0x1009aa8: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01009a9c: 0x1009a9c: ori   v0, v0, 1
+// 0x01009aac: 0x1009aac: ori   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	or
 	stloc 5
-// 0x01009aa0: 0x1009aa0: slt   a0, a0, v0
+// 0x01009ab0: 0x1009ab0: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x01009aa4: 0x1009aa4: bne   a0, zero, 0x1009ab8 lui   v0, 0x0
+// 0x01009ab4: 0x1009ab4: bne   a0, zero, 0x1009ac8 lui   v0, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_1009ab8
+	brtrue L_1009ac8
 // --- basic block ---
-// 0x01009aac: 0x1009aac: ori   v0, zero, 65535
+// 0x01009abc: 0x1009abc: ori   v0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 5
-L_1009ab0:
-// 0x01009ab0: 0x1009ab0: sw    v0, 29604(v1)
+L_1009ac0:
+// 0x01009ac0: 0x1009ac0: sw    v0, 30068(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 5
 	stelem.i4
-// 0x01009ab4: 0x1009ab4: lui   v0, 0x0
+// 0x01009ac4: 0x1009ac4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1009ab8:
-// 0x01009ab8: 0x1009ab8: lw    v0, 508(v0)
+L_1009ac8:
+// 0x01009ac8: 0x1009ac8: lw    v0, 508(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5605,61 +5605,61 @@ L_1009ab8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009abc: 0x1009abc: addiu v1, zero, -1
+// 0x01009acc: 0x1009acc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01009ac0: 0x1009ac0: beq   v0, v1, 0x1009ae0 lui   v1, 0xe0000
+// 0x01009ad0: 0x1009ad0: beq   v0, v1, 0x1009af0 lui   v1, 0xe0000
 	ldloc 5
 	ldloc 6
 	ldc.i4 917504
 	stloc 6
-	beq  L_1009ae0
+	beq  L_1009af0
 // --- basic block ---
-// 0x01009ac8: 0x1009ac8: lw    a0, 29604(v1)
+// 0x01009ad8: 0x1009ad8: lw    a0, 30068(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009acc: 0x1009acc: sll   zero, zero, 0
-// 0x01009ad0: 0x1009ad0: slt   a0, a0, v0
+// 0x01009adc: 0x1009adc: sll   zero, zero, 0
+// 0x01009ae0: 0x1009ae0: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x01009ad4: 0x1009ad4: beq   a0, zero, 0x1009ae0 sll   zero, zero, 0
+// 0x01009ae4: 0x1009ae4: beq   a0, zero, 0x1009af0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1009ae0
+	brfalse L_1009af0
 // --- basic block ---
-// 0x01009adc: 0x1009adc: sw    v0, 29604(v1)
+// 0x01009aec: 0x1009aec: sw    v0, 30068(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldloc 5
 	stelem.i4
-L_1009ae0:
-// 0x01009ae0: 0x1009ae0: lui   v0, 0xe0000
+L_1009af0:
+// 0x01009af0: 0x1009af0: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01009ae4: 0x1009ae4: lw    a1, 29604(v0)
+// 0x01009af4: 0x1009af4: lw    a1, 30068(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009ae8: 0x1009ae8: lui   a0, 0x0
+// 0x01009af8: 0x1009af8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01009aec: 0x1009aec: jal   0x100e610 addiu a0, a0, 492
+// 0x01009afc: 0x1009afc: jal   0x100e620 addiu a0, a0, 492
 	ldloc.1
 	ldc.i4 492
 	add
@@ -5669,29 +5669,29 @@ L_1009ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009af4: 0x1009af4: jal   0x1008498 sll   zero, zero, 0
+// 0x01009b04: 0x1009b04: jal   0x10084a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009afc: 0x1009afc: addiu v0, zero, 1
+// 0x01009b0c: 0x1009b0c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1009b00:
-// 0x01009b00: 0x1009b00: lw    ra, 20(sp)
-// 0x01009b04: 0x1009b04: sll   zero, zero, 0
-// 0x01009b08: 0x1009b08: jr    ra addiu sp, sp, 24
+L_1009b10:
+// 0x01009b10: 0x1009b10: lw    ra, 20(sp)
+// 0x01009b14: 0x1009b14: sll   zero, zero, 0
+// 0x01009b18: 0x1009b18: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5703,7 +5703,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_set_scale_1009b10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_set_scale_1009b20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5741,13 +5741,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009b10: 0x1009b10: addiu sp, sp, -32
+// 0x01009b20: 0x1009b20: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01009b14: 0x1009b14: sw    ra, 28(sp)
-// 0x01009b18: 0x1009b18: sw    s0, 24(sp)
+// 0x01009b24: 0x1009b24: sw    ra, 28(sp)
+// 0x01009b28: 0x1009b28: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5756,18 +5756,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01009b1c: 0x1009b1c: bltz  a0, 0x1009bc4 addu  v0, zero, zero
+// 0x01009b2c: 0x1009b2c: bltz  a0, 0x1009bd4 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_1009bc4
+	blt L_1009bd4
 // --- basic block ---
-// 0x01009b24: 0x1009b24: beq   a1, zero, 0x1009b90 sll   zero, zero, 0
+// 0x01009b34: 0x1009b34: beq   a1, zero, 0x1009ba0 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1009b90
+	brfalse L_1009ba0
 // --- basic block ---
-// 0x01009b2c: 0x1009b2c: jal   0x10c09ac sw    a1, 16(sp)
+// 0x01009b3c: 0x1009b3c: jal   0x10c0fec sw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5781,7 +5781,7 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01009b34: 0x1009b34: lw    a1, 16(sp)
+// 0x01009b44: 0x1009b44: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5790,10 +5790,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009b38: 0x1009b38: addu  s0, v0, zero
+// 0x01009b48: 0x1009b48: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01009b3c: 0x1009b3c: jal   0x10c09ac addu  a0, a1, zero
+// 0x01009b4c: 0x1009b4c: jal   0x10c0fec addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.1
@@ -5801,20 +5801,20 @@ __CIBYL_javamethod_begin:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01009b44: 0x1009b44: lui   v1, 0xe0000
+// 0x01009b54: 0x1009b54: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 6
-// 0x01009b48: 0x1009b48: lw    v1, 29720(v1)
+// 0x01009b58: 0x1009b58: lw    v1, 30184(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7430
+	ldc.i4 7546
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009b4c: 0x1009b4c: sll   zero, zero, 0
-// 0x01009b50: 0x1009b50: lw    a1, 4(v1)
+// 0x01009b5c: 0x1009b5c: sll   zero, zero, 0
+// 0x01009b60: 0x1009b60: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5823,60 +5823,60 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01009b54: 0x1009b54: jal   0x10c0780 addu  a0, v0, zero
+// 0x01009b64: 0x1009b64: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01009b5c: 0x1009b5c: addu  a1, v0, zero
+// 0x01009b6c: 0x1009b6c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01009b60: 0x1009b60: jal   0x10c07d8 addu  a0, s0, zero
+// 0x01009b70: 0x1009b70: jal   0x10c0e18 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01009b68: 0x1009b68: jal   0x10c0874 addu  a0, v0, zero
+// 0x01009b78: 0x1009b78: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009b70: 0x1009b70: lui   a0, 0x20000
+// 0x01009b80: 0x1009b80: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01009b74: 0x1009b74: lw    a3, 23716(a0)
+// 0x01009b84: 0x1009b84: lw    a3, 24180(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5929
+	ldc.i4 6045
 	add
 	ldelem.i4
 	stloc 4
-// 0x01009b78: 0x1009b78: lw    a2, 23712(a0)
+// 0x01009b88: 0x1009b88: lw    a2, 24176(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5928
+	ldc.i4 6044
 	add
 	ldelem.i4
 	stloc.3
-// 0x01009b7c: 0x1009b7c: addu  a1, v1, zero
+// 0x01009b8c: 0x1009b8c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01009b80: 0x1009b80: jal   0x10c06e8 addu  a0, v0, zero
+// 0x01009b90: 0x1009b90: jal   0x10c0d28 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5884,50 +5884,50 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__adddf3_10c06e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__adddf3_10c0d28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009b88: 0x1009b88: j	 0x1009bb4 addu  a0, v0, zero
+// 0x01009b98: 0x1009b98: j	 0x1009bc4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	br L_1009bb4
+	br L_1009bc4
 // --- basic block ---
-L_1009b90:
-// 0x01009b90: 0x1009b90: jal   0x10c09c0 sll   zero, zero, 0
+L_1009ba0:
+// 0x01009ba0: 0x1009ba0: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009b98: 0x1009b98: lui   a0, 0x20000
+// 0x01009ba8: 0x1009ba8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01009b9c: 0x1009b9c: lw    a3, 23788(a0)
+// 0x01009bac: 0x1009bac: lw    a3, 24252(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5947
+	ldc.i4 6063
 	add
 	ldelem.i4
 	stloc 4
-// 0x01009ba0: 0x1009ba0: lw    a2, 23784(a0)
+// 0x01009bb0: 0x1009bb0: lw    a2, 24248(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5946
+	ldc.i4 6062
 	add
 	ldelem.i4
 	stloc.3
-// 0x01009ba4: 0x1009ba4: addu  a1, v1, zero
+// 0x01009bb4: 0x1009bb4: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01009ba8: 0x1009ba8: jal   0x10c0798 addu  a0, v0, zero
+// 0x01009bb8: 0x1009bb8: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5935,27 +5935,27 @@ L_1009b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009bb0: 0x1009bb0: addu  a0, v0, zero
+// 0x01009bc0: 0x1009bc0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_1009bb4:
-// 0x01009bb4: 0x1009bb4: jal   0x10c08d0 addu  a1, v1, zero
+L_1009bc4:
+// 0x01009bc4: 0x1009bc4: jal   0x10c0f10 addu  a1, v1, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01009bbc: 0x1009bbc: jal   0x1009a6c addu  a0, v0, zero
+// 0x01009bcc: 0x1009bcc: jal   0x1009a7c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5963,14 +5963,14 @@ L_1009bb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_zoom_set_1009a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_zoom_set_1009a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1009bc4:
-// 0x01009bc4: 0x1009bc4: lw    ra, 28(sp)
-// 0x01009bc8: 0x1009bc8: lw    s0, 24(sp)
+L_1009bd4:
+// 0x01009bd4: 0x1009bd4: lw    ra, 28(sp)
+// 0x01009bd8: 0x1009bd8: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5979,7 +5979,7 @@ L_1009bc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01009bcc: 0x1009bcc: jr    ra addiu sp, sp, 32
+// 0x01009bdc: 0x1009bdc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5991,7 +5991,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_adjust_zoom_1009cd0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_adjust_zoom_1009ce0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -6029,12 +6029,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009cd0: 0x1009cd0: addiu sp, sp, -24
+// 0x01009ce0: 0x1009ce0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01009cd4: 0x1009cd4: sw    s0, 16(sp)
+// 0x01009ce4: 0x1009ce4: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6043,8 +6043,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01009cd8: 0x1009cd8: sw    ra, 20(sp)
-// 0x01009cdc: 0x1009cdc: jal   0x100adf4 addu  s0, a0, zero
+// 0x01009ce8: 0x1009ce8: sw    ra, 20(sp)
+// 0x01009cec: 0x1009cec: jal   0x100ae04 addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.0
@@ -6052,16 +6052,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_at_current_scale_100adf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_at_current_scale_100ae04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01009ce4: 0x1009ce4: bne   v0, zero, 0x1009d08 sll   zero, zero, 0
+// 0x01009cf4: 0x1009cf4: bne   v0, zero, 0x1009d18 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1009d08
+	brtrue L_1009d18
 // --- basic block ---
-// 0x01009cec: 0x1009cec: jal   0x100add4 addu  a0, s0, zero
+// 0x01009cfc: 0x1009cfc: jal   0x100ade4 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6069,35 +6069,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_scale_100add4(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_scale_100ade4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01009cf4: 0x1009cf4: beq   v0, zero, 0x1009d00 addiu a0, zero, 90
+// 0x01009d04: 0x1009d04: beq   v0, zero, 0x1009d10 addiu a0, zero, 90
 	ldloc 5
 	ldc.i4.s 90
 	stloc.1
-	brfalse L_1009d00
+	brfalse L_1009d10
 // --- basic block ---
-// 0x01009cfc: 0x1009cfc: addiu a0, zero, 130
+// 0x01009d0c: 0x1009d0c: addiu a0, zero, 130
 	ldc.i4 130
 	stloc.1
-L_1009d00:
-// 0x01009d00: 0x1009d00: jal   0x1009a6c sll   zero, zero, 0
+L_1009d10:
+// 0x01009d10: 0x1009d10: jal   0x1009a7c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_zoom_set_1009a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_zoom_set_1009a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1009d08:
-// 0x01009d08: 0x1009d08: lw    ra, 20(sp)
-// 0x01009d0c: 0x1009d0c: lw    s0, 16(sp)
+L_1009d18:
+// 0x01009d18: 0x1009d18: lw    ra, 20(sp)
+// 0x01009d1c: 0x1009d1c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6106,7 +6106,7 @@ L_1009d08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009d10: 0x1009d10: jr    ra addiu sp, sp, 24
+// 0x01009d20: 0x1009d20: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6118,7 +6118,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_math_initialize_1009d18(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_initialize_1009d28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6156,12 +6156,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009d18: 0x1009d18: addiu sp, sp, -24
+// 0x01009d28: 0x1009d28: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01009d1c: 0x1009d1c: sw    s0, 16(sp)
+// 0x01009d2c: 0x1009d2c: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6170,22 +6170,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01009d20: 0x1009d20: lui   s0, 0xe0000
+// 0x01009d30: 0x1009d30: lui   s0, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x01009d24: 0x1009d24: addiu s0, s0, 29604
+// 0x01009d34: 0x1009d34: addiu s0, s0, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x01009d28: 0x1009d28: addu  a0, s0, zero
+// 0x01009d38: 0x1009d38: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x01009d2c: 0x1009d2c: addu  a1, zero, zero
+// 0x01009d3c: 0x1009d3c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01009d30: 0x1009d30: sw    ra, 20(sp)
-// 0x01009d34: 0x1009d34: jal   0x100177c addiu a2, zero, 124
+// 0x01009d40: 0x1009d40: sw    ra, 20(sp)
+// 0x01009d44: 0x1009d44: jal   0x100177c addiu a2, zero, 124
 	ldc.i4.s 124
 	stloc.3
 	ldloc.1
@@ -6197,31 +6197,31 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009d3c: 0x1009d3c: lui   a0, 0x10000
+// 0x01009d4c: 0x1009d4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01009d40: 0x1009d40: lui   a1, 0x0
+// 0x01009d50: 0x1009d50: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01009d44: 0x1009d44: lui   a2, 0x10000
+// 0x01009d54: 0x1009d54: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01009d48: 0x1009d48: addiu a0, a0, 18248
+// 0x01009d58: 0x1009d58: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01009d4c: 0x1009d4c: addiu a1, a1, 492
+// 0x01009d5c: 0x1009d5c: addiu a1, a1, 492
 	ldloc.2
 	ldc.i4 492
 	add
 	stloc.2
-// 0x01009d50: 0x1009d50: addiu a2, a2, -48
+// 0x01009d60: 0x1009d60: addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x01009d54: 0x1009d54: jal   0x100edb0 addu  a3, zero, zero
+// 0x01009d64: 0x1009d64: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6229,34 +6229,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009d5c: 0x1009d5c: lui   a2, 0x0
+// 0x01009d6c: 0x1009d6c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01009d60: 0x1009d60: lui   a0, 0x10000
+// 0x01009d70: 0x1009d70: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01009d64: 0x1009d64: lui   a1, 0x0
+// 0x01009d74: 0x1009d74: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01009d68: 0x1009d68: addiu a2, a2, 24152
+// 0x01009d78: 0x1009d78: addiu a2, a2, 24152
 	ldloc.3
 	ldc.i4 24152
 	add
 	stloc.3
-// 0x01009d6c: 0x1009d6c: addu  a3, zero, zero
+// 0x01009d7c: 0x1009d7c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01009d70: 0x1009d70: addiu a0, a0, 12560
+// 0x01009d80: 0x1009d80: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01009d74: 0x1009d74: jal   0x100edb0 addiu a1, a1, 476
+// 0x01009d84: 0x1009d84: jal   0x100edc0 addiu a1, a1, 476
 	ldloc.2
 	ldc.i4 476
 	add
@@ -6266,25 +6266,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009d7c: 0x1009d7c: lui   a0, 0x0
+// 0x01009d8c: 0x1009d8c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01009d80: 0x1009d80: lui   a1, 0x1010000
+// 0x01009d90: 0x1009d90: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x01009d84: 0x1009d84: addiu a0, a0, 24156
+// 0x01009d94: 0x1009d94: addiu a0, a0, 24156
 	ldloc.1
 	ldc.i4 24156
 	add
 	stloc.1
-// 0x01009d88: 0x1009d88: jal   0x100f48c addiu a1, a1, -26128
+// 0x01009d98: 0x1009d98: jal   0x100f49c addiu a1, a1, -26112
 	ldloc.2
-	ldc.i4 -26128
+	ldc.i4 -26112
 	add
 	stloc.2
 	ldloc.0
@@ -6292,12 +6292,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_state_add_100f48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_add_100f49c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009d90: 0x1009d90: sw    zero, 120(s0)
+// 0x01009da0: 0x1009da0: sw    zero, 120(s0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -6306,7 +6306,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01009d94: 0x1009d94: jal   0x100766c sw    zero, 104(s0)
+// 0x01009da4: 0x1009da4: jal   0x100767c sw    zero, 104(s0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -6320,24 +6320,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_use_imperial_100766c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_use_imperial_100767c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009d9c: 0x1009d9c: jal   0x1008498 sll   zero, zero, 0
+// 0x01009dac: 0x1009dac: jal   0x10084a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_compute_scale_1008498(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_compute_scale_10084a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009da4: 0x1009da4: lw    ra, 20(sp)
-// 0x01009da8: 0x1009da8: lw    s0, 16(sp)
+// 0x01009db4: 0x1009db4: lw    ra, 20(sp)
+// 0x01009db8: 0x1009db8: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6346,7 +6346,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01009dac: 0x1009dac: jr    ra addiu sp, sp, 24
+// 0x01009dbc: 0x1009dbc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6358,7 +6358,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_math_calc_line_length_1009db4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_math_calc_line_length_1009dc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s3,int32 s0,int32 s2,int32 s5,int32 s6,int32 s7,int32 s8,int32 s4,int32 lo,int32 ra)
@@ -6423,12 +6423,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01009db4: 0x1009db4: addiu sp, sp, -96
+// 0x01009dc4: 0x1009dc4: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01009db8: 0x1009db8: sw    s4, 72(sp)
+// 0x01009dc8: 0x1009dc8: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6437,7 +6437,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01009dbc: 0x1009dbc: sw    s0, 56(sp)
+// 0x01009dcc: 0x1009dcc: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6446,8 +6446,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01009dc0: 0x1009dc0: sw    ra, 92(sp)
-// 0x01009dc4: 0x1009dc4: sw    s8, 88(sp)
+// 0x01009dd0: 0x1009dd0: sw    ra, 92(sp)
+// 0x01009dd4: 0x1009dd4: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6456,7 +6456,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01009dc8: 0x1009dc8: sw    s7, 84(sp)
+// 0x01009dd8: 0x1009dd8: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6465,7 +6465,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01009dcc: 0x1009dcc: sw    s6, 80(sp)
+// 0x01009ddc: 0x1009ddc: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6474,7 +6474,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01009dd0: 0x1009dd0: sw    s5, 76(sp)
+// 0x01009de0: 0x1009de0: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6483,7 +6483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01009dd4: 0x1009dd4: sw    s3, 68(sp)
+// 0x01009de4: 0x1009de4: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6492,7 +6492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01009dd8: 0x1009dd8: sw    s2, 64(sp)
+// 0x01009de8: 0x1009de8: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6501,7 +6501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01009ddc: 0x1009ddc: sw    s1, 60(sp)
+// 0x01009dec: 0x1009dec: sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6510,10 +6510,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01009de0: 0x1009de0: addu  s0, a0, zero
+// 0x01009df0: 0x1009df0: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01009de4: 0x1009de4: lw    v0, 4(a1)
+// 0x01009df4: 0x1009df4: lw    v0, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6522,21 +6522,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009de8: 0x1009de8: lw    v1, 0(a1)
+// 0x01009df8: 0x1009df8: lw    v1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01009dec: 0x1009dec: bgez  a3, 0x1009e20 addu  s4, a2, zero
+// 0x01009dfc: 0x1009dfc: bgez  a3, 0x1009e30 addu  s4, a2, zero
 	ldloc 4
 	ldloc.3
 	stloc 16
 	ldc.i4.s 0
-	bge L_1009e20
+	bge L_1009e30
 // --- basic block ---
-// 0x01009df4: 0x1009df4: lw    a0, 4(a2)
+// 0x01009e04: 0x1009e04: lw    a0, 4(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -6545,17 +6545,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009df8: 0x1009df8: lw    a1, 0(a2)
+// 0x01009e08: 0x1009e08: lw    a1, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01009dfc: 0x1009dfc: lui   s3, 0x7fff0000
+// 0x01009e0c: 0x1009e0c: lui   s3, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 9
-// 0x01009e00: 0x1009e00: sw    v1, 16(sp)
+// 0x01009e10: 0x1009e10: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6564,7 +6564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01009e04: 0x1009e04: sw    v0, 20(sp)
+// 0x01009e14: 0x1009e14: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6573,7 +6573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01009e08: 0x1009e08: sw    a1, 24(sp)
+// 0x01009e18: 0x1009e18: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6582,7 +6582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01009e0c: 0x1009e0c: sw    a0, 28(sp)
+// 0x01009e1c: 0x1009e1c: sw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6591,21 +6591,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01009e10: 0x1009e10: ori   s3, s3, 65535
+// 0x01009e20: 0x1009e20: ori   s3, s3, 65535
 	ldloc 9
 	ldc.i4 65535
 	or
 	stloc 9
-// 0x01009e14: 0x1009e14: addu  s2, zero, zero
+// 0x01009e24: 0x1009e24: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01009e18: 0x1009e18: j	 0x1009f90 addu  s1, zero, zero
+// 0x01009e28: 0x1009e28: j	 0x1009fa0 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1009f90
+	br L_1009fa0
 // --- basic block ---
-L_1009e20:
-// 0x01009e20: 0x1009e20: sw    v0, 28(sp)
+L_1009e30:
+// 0x01009e30: 0x1009e30: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6614,7 +6614,7 @@ L_1009e20:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01009e24: 0x1009e24: sw    v0, 20(sp)
+// 0x01009e34: 0x1009e34: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6623,15 +6623,15 @@ L_1009e20:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01009e28: 0x1009e28: lui   s3, 0x7fff0000
+// 0x01009e38: 0x1009e38: lui   s3, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 9
-// 0x01009e2c: 0x1009e2c: addiu v0, sp, 32
+// 0x01009e3c: 0x1009e3c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-// 0x01009e30: 0x1009e30: sw    v1, 24(sp)
+// 0x01009e40: 0x1009e40: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6640,7 +6640,7 @@ L_1009e20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01009e34: 0x1009e34: sw    v1, 16(sp)
+// 0x01009e44: 0x1009e44: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6649,31 +6649,31 @@ L_1009e20:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01009e38: 0x1009e38: addu  s5, a3, zero
+// 0x01009e48: 0x1009e48: addu  s5, a3, zero
 	ldloc 4
 	stloc 12
-// 0x01009e3c: 0x1009e3c: ori   s3, s3, 65535
+// 0x01009e4c: 0x1009e4c: ori   s3, s3, 65535
 	ldloc 9
 	ldc.i4 65535
 	or
 	stloc 9
-// 0x01009e40: 0x1009e40: sll   s8, a3, 2
+// 0x01009e50: 0x1009e50: sll   s8, a3, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 15
-// 0x01009e44: 0x1009e44: addu  s2, zero, zero
+// 0x01009e54: 0x1009e54: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01009e48: 0x1009e48: addu  s1, zero, zero
+// 0x01009e58: 0x1009e58: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01009e4c: 0x1009e4c: addiu s7, sp, 24
+// 0x01009e5c: 0x1009e5c: addiu s7, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-// 0x01009e50: 0x1009e50: sw    v0, 48(sp)
+// 0x01009e60: 0x1009e60: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6682,15 +6682,15 @@ L_1009e20:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01009e54: 0x1009e54: j	 0x1009f6c addiu s6, sp, 16
+// 0x01009e64: 0x1009e64: j	 0x1009f7c addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 13
-	br L_1009f6c
+	br L_1009f7c
 // --- basic block ---
-L_1009e5c:
-// 0x01009e5c: 0x1009e5c: lw    v1, 116(sp)
+L_1009e6c:
+// 0x01009e6c: 0x1009e6c: lw    v1, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6699,18 +6699,18 @@ L_1009e5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009e60: 0x1009e60: sll   zero, zero, 0
-// 0x01009e64: 0x1009e64: bne   v1, zero, 0x1009eec sll   zero, zero, 0
+// 0x01009e70: 0x1009e70: sll   zero, zero, 0
+// 0x01009e74: 0x1009e74: bne   v1, zero, 0x1009efc sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1009eec
+	brtrue L_1009efc
 // --- basic block ---
-// 0x01009e6c: 0x1009e6c: lui   a0, 0x0
+// 0x01009e7c: 0x1009e7c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01009e70: 0x1009e70: lui   a1, 0x0
+// 0x01009e80: 0x1009e80: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01009e74: 0x1009e74: lw    v0, 576(a0)
+// 0x01009e84: 0x1009e84: lw    v0, 576(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6719,7 +6719,7 @@ L_1009e5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009e78: 0x1009e78: lw    v1, 548(a1)
+// 0x01009e88: 0x1009e88: lw    v1, 548(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6728,13 +6728,13 @@ L_1009e5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009e7c: 0x1009e7c: sll   zero, zero, 0
-// 0x01009e80: 0x1009e80: beq   v0, v1, 0x1009e98 sll   zero, zero, 0
+// 0x01009e8c: 0x1009e8c: sll   zero, zero, 0
+// 0x01009e90: 0x1009e90: beq   v0, v1, 0x1009ea8 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	beq  L_1009e98
+	beq  L_1009ea8
 // --- basic block ---
-// 0x01009e88: 0x1009e88: jal   0x100ae78 sw    v0, 548(a1)
+// 0x01009e98: 0x1009e98: jal   0x100ae88 sw    v0, 548(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -6748,15 +6748,15 @@ L_1009e5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009e90: 0x1009e90: lui   v1, 0x0
+// 0x01009ea0: 0x1009ea0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01009e94: 0x1009e94: sw    v0, 552(v1)
+// 0x01009ea4: 0x1009ea4: sw    v0, 552(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6765,28 +6765,28 @@ L_1009e5c:
 	add
 	ldloc 6
 	stelem.i4
-L_1009e98:
-// 0x01009e98: 0x1009e98: lui   a1, 0x20000
+L_1009ea8:
+// 0x01009ea8: 0x1009ea8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01009e9c: 0x1009e9c: lw    a0, 31240(a1)
+// 0x01009eac: 0x1009eac: lw    a0, 31704(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009ea0: 0x1009ea0: lui   v1, 0x0
+// 0x01009eb0: 0x1009eb0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01009ea4: 0x1009ea4: addu  a0, a0, s8
+// 0x01009eb4: 0x1009eb4: addu  a0, a0, s8
 	ldloc.1
 	ldloc 15
 	add
 	stloc.1
-// 0x01009ea8: 0x1009ea8: lw    v0, 552(v1)
+// 0x01009eb8: 0x1009eb8: lw    v0, 552(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6795,32 +6795,32 @@ L_1009e98:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009eac: 0x1009eac: lh    v1, 2(a0)
+// 0x01009ebc: 0x1009ebc: lh    v1, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01009eb0: 0x1009eb0: lh    a0, 0(a0)
+// 0x01009ec0: 0x1009ec0: lh    a0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01009eb4: 0x1009eb4: mult  v1, v0
+// 0x01009ec4: 0x1009ec4: mult  v1, v0
 	ldloc 7
 	ldloc 6
 	mul
 	stloc 17
-// 0x01009eb8: 0x1009eb8: mflo  lo
+// 0x01009ec8: 0x1009ec8: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x01009ebc: 0x1009ebc: sll   zero, zero, 0
-// 0x01009ec0: 0x1009ec0: sll   zero, zero, 0
-// 0x01009ec4: 0x1009ec4: mult  a0, v0
+// 0x01009ecc: 0x1009ecc: sll   zero, zero, 0
+// 0x01009ed0: 0x1009ed0: sll   zero, zero, 0
+// 0x01009ed4: 0x1009ed4: mult  a0, v0
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 17
-// 0x01009ec8: 0x1009ec8: lw    a0, 28(sp)
+// 0x01009ed8: 0x1009ed8: lw    a0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6829,13 +6829,13 @@ L_1009e98:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009ecc: 0x1009ecc: sll   zero, zero, 0
-// 0x01009ed0: 0x1009ed0: addu  v1, a0, v1
+// 0x01009edc: 0x1009edc: sll   zero, zero, 0
+// 0x01009ee0: 0x1009ee0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01009ed4: 0x1009ed4: lw    a0, 24(sp)
+// 0x01009ee4: 0x1009ee4: lw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6844,7 +6844,7 @@ L_1009e98:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009ed8: 0x1009ed8: sw    v1, 28(sp)
+// 0x01009ee8: 0x1009ee8: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6853,15 +6853,15 @@ L_1009e98:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01009edc: 0x1009edc: mflo  lo
+// 0x01009eec: 0x1009eec: mflo  lo
 	ldloc 17
 	stloc 6
-// 0x01009ee0: 0x1009ee0: addu  v0, a0, v0
+// 0x01009ef0: 0x1009ef0: addu  v0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01009ee4: 0x1009ee4: j	 0x1009efc sw    v0, 24(sp)
+// 0x01009ef4: 0x1009ef4: j	 0x1009f0c sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6870,10 +6870,10 @@ L_1009e98:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1009efc
+	br L_1009f0c
 // --- basic block ---
-L_1009eec:
-// 0x01009eec: 0x1009eec: lw    v0, 116(sp)
+L_1009efc:
+// 0x01009efc: 0x1009efc: lw    v0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6882,8 +6882,8 @@ L_1009eec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009ef0: 0x1009ef0: sll   zero, zero, 0
-// 0x01009ef4: 0x1009ef4: jalr  v0 sll   zero, zero, 0
+// 0x01009f00: 0x1009f00: sll   zero, zero, 0
+// 0x01009f04: 0x1009f04: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -6895,8 +6895,8 @@ L_1009eec:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1009efc:
-// 0x01009efc: 0x1009efc: lw    a0, 48(sp)
+L_1009f0c:
+// 0x01009f0c: 0x1009f0c: lw    a0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6905,42 +6905,42 @@ L_1009efc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009f00: 0x1009f00: addu  a1, zero, zero
+// 0x01009f10: 0x1009f10: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01009f04: 0x1009f04: cibyl_sysc_arg 0x10
+// 0x01009f14: 0x1009f14: cibyl_sysc_arg 0x10
 	ldloc 10
-// 0x01009f08: 0x1009f08: cibyl_sysc_arg 0x16
+// 0x01009f18: 0x1009f18: cibyl_sysc_arg 0x16
 	ldloc 13
-// 0x01009f0c: 0x1009f0c: cibyl_sysc_arg 0x17
+// 0x01009f1c: 0x1009f1c: cibyl_sysc_arg 0x17
 	ldloc 14
-// 0x01009f10: 0x1009f10: cibyl_sysc_arg 0x4
+// 0x01009f20: 0x1009f20: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01009f14: 0x1009f14: cibyl_sysc_arg 0x5
+// 0x01009f24: 0x1009f24: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01009f18: 0x1009f18: cibyl_sysc 0x24a
+// 0x01009f28: 0x1009f28: cibyl_sysc 0x24a
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 6
-// 0x01009f1c: 0x1009f1c: addu  v1, v0, zero
+// 0x01009f2c: 0x1009f2c: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x01009f20: 0x1009f20: slt   v0, v1, s3
+// 0x01009f30: 0x1009f30: slt   v0, v1, s3
 	ldloc 7
 	ldloc 9
 	clt
 	stloc 6
-// 0x01009f24: 0x1009f24: beq   v0, zero, 0x1009f48 addu  a0, s6, zero
+// 0x01009f34: 0x1009f34: beq   v0, zero, 0x1009f58 addu  a0, s6, zero
 	ldloc 6
 	ldloc 13
 	stloc.1
-	brfalse L_1009f48
+	brfalse L_1009f58
 // --- basic block ---
-// 0x01009f2c: 0x1009f2c: addiu a1, sp, 32
+// 0x01009f3c: 0x1009f3c: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01009f30: 0x1009f30: jal   0x1008eb0 sw    v1, 40(sp)
+// 0x01009f40: 0x1009f40: jal   0x1008ec0 sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6954,12 +6954,12 @@ L_1009efc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009f38: 0x1009f38: lw    v1, 40(sp)
+// 0x01009f48: 0x1009f48: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6968,19 +6968,19 @@ L_1009efc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009f3c: 0x1009f3c: addu  s2, v0, s1
+// 0x01009f4c: 0x1009f4c: addu  s2, v0, s1
 	ldloc 6
 	ldloc 8
 	add
 	stloc 11
-// 0x01009f40: 0x1009f40: addu  s3, v1, zero
+// 0x01009f50: 0x1009f50: addu  s3, v1, zero
 	ldloc 7
 	stloc 9
-// 0x01009f44: 0x1009f44: addu  a0, s6, zero
+// 0x01009f54: 0x1009f54: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-L_1009f48:
-// 0x01009f48: 0x1009f48: jal   0x1008eb0 addu  a1, s7, zero
+L_1009f58:
+// 0x01009f58: 0x1009f58: jal   0x1008ec0 addu  a1, s7, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -6988,17 +6988,17 @@ L_1009f48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009f50: 0x1009f50: addu  s1, s1, v0
+// 0x01009f60: 0x1009f60: addu  s1, s1, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x01009f54: 0x1009f54: lw    v0, 24(sp)
+// 0x01009f64: 0x1009f64: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7007,12 +7007,12 @@ L_1009f48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009f58: 0x1009f58: addiu s5, s5, 1
+// 0x01009f68: 0x1009f68: addiu s5, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x01009f5c: 0x1009f5c: sw    v0, 16(sp)
+// 0x01009f6c: 0x1009f6c: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7021,7 +7021,7 @@ L_1009f48:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01009f60: 0x1009f60: lw    v0, 28(sp)
+// 0x01009f70: 0x1009f70: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7030,12 +7030,12 @@ L_1009f48:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01009f64: 0x1009f64: addiu s8, s8, 4
+// 0x01009f74: 0x1009f74: addiu s8, s8, 4
 	ldloc 15
 	ldc.i4.4
 	add
 	stloc 15
-// 0x01009f68: 0x1009f68: sw    v0, 20(sp)
+// 0x01009f78: 0x1009f78: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7044,8 +7044,8 @@ L_1009f48:
 	add
 	ldloc 6
 	stelem.i4
-L_1009f6c:
-// 0x01009f6c: 0x1009f6c: lw    v1, 112(sp)
+L_1009f7c:
+// 0x01009f7c: 0x1009f7c: lw    v1, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7054,21 +7054,21 @@ L_1009f6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009f70: 0x1009f70: addu  a0, s5, zero
+// 0x01009f80: 0x1009f80: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01009f74: 0x1009f74: slt   v0, v1, s5
+// 0x01009f84: 0x1009f84: slt   v0, v1, s5
 	ldloc 7
 	ldloc 12
 	clt
 	stloc 6
-// 0x01009f78: 0x1009f78: beq   v0, zero, 0x1009e5c addu  a1, s7, zero
+// 0x01009f88: 0x1009f88: beq   v0, zero, 0x1009e6c addu  a1, s7, zero
 	ldloc 6
 	ldloc 14
 	stloc.2
-	brfalse L_1009e5c
+	brfalse L_1009e6c
 // --- basic block ---
-// 0x01009f80: 0x1009f80: lw    v1, 4(s4)
+// 0x01009f90: 0x1009f90: lw    v1, 4(s4)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -7077,14 +7077,14 @@ L_1009f6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01009f84: 0x1009f84: lw    v0, 0(s4)
+// 0x01009f94: 0x1009f94: lw    v0, 0(s4)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01009f88: 0x1009f88: sw    v1, 28(sp)
+// 0x01009f98: 0x1009f98: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7093,7 +7093,7 @@ L_1009f6c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01009f8c: 0x1009f8c: sw    v0, 24(sp)
+// 0x01009f9c: 0x1009f9c: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7102,73 +7102,73 @@ L_1009f6c:
 	add
 	ldloc 6
 	stelem.i4
-L_1009f90:
-// 0x01009f90: 0x1009f90: addiu a1, sp, 32
+L_1009fa0:
+// 0x01009fa0: 0x1009fa0: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01009f94: 0x1009f94: addiu a0, sp, 16
+// 0x01009fa4: 0x1009fa4: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01009f98: 0x1009f98: addu  a2, zero, zero
+// 0x01009fa8: 0x1009fa8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01009f9c: 0x1009f9c: addiu v1, sp, 24
+// 0x01009fac: 0x1009fac: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x01009fa0: 0x1009fa0: cibyl_sysc_arg 0x10
+// 0x01009fb0: 0x1009fb0: cibyl_sysc_arg 0x10
 	ldloc 10
-// 0x01009fa4: 0x1009fa4: cibyl_sysc_arg 0x4
+// 0x01009fb4: 0x1009fb4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01009fa8: 0x1009fa8: cibyl_sysc_arg 0x3
+// 0x01009fb8: 0x1009fb8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01009fac: 0x1009fac: cibyl_sysc_arg 0x5
+// 0x01009fbc: 0x1009fbc: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01009fb0: 0x1009fb0: cibyl_sysc_arg 0x6
+// 0x01009fc0: 0x1009fc0: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01009fb4: 0x1009fb4: cibyl_sysc 0x267
+// 0x01009fc4: 0x1009fc4: cibyl_sysc 0x267
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 6
-// 0x01009fb8: 0x1009fb8: addu  s0, v0, zero
+// 0x01009fc8: 0x1009fc8: addu  s0, v0, zero
 	ldloc 6
 	stloc 10
-// 0x01009fbc: 0x1009fbc: slt   s0, s0, s3
+// 0x01009fcc: 0x1009fcc: slt   s0, s0, s3
 	ldloc 10
 	ldloc 9
 	clt
 	stloc 10
-// 0x01009fc0: 0x1009fc0: beq   s0, zero, 0x1009fd4 sll   zero, zero, 0
+// 0x01009fd0: 0x1009fd0: beq   s0, zero, 0x1009fe4 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_1009fd4
+	brfalse L_1009fe4
 // --- basic block ---
-// 0x01009fc8: 0x1009fc8: jal   0x1008eb0 sll   zero, zero, 0
+// 0x01009fd8: 0x1009fd8: jal   0x1008ec0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009fd0: 0x1009fd0: addu  s2, v0, s1
+// 0x01009fe0: 0x1009fe0: addu  s2, v0, s1
 	ldloc 6
 	ldloc 8
 	add
 	stloc 11
-L_1009fd4:
-// 0x01009fd4: 0x1009fd4: addiu a0, sp, 16
+L_1009fe4:
+// 0x01009fe4: 0x1009fe4: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01009fd8: 0x1009fd8: jal   0x1008eb0 addiu a1, sp, 24
+// 0x01009fe8: 0x1009fe8: jal   0x1008ec0 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -7178,12 +7178,12 @@ L_1009fd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01009fe0: 0x1009fe0: lw    a0, 120(sp)
+// 0x01009ff0: 0x1009ff0: lw    a0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7192,28 +7192,28 @@ L_1009fd4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01009fe4: 0x1009fe4: sll   zero, zero, 0
-// 0x01009fe8: 0x1009fe8: beq   a0, zero, 0x1009ff4 addu  s1, v0, s1
+// 0x01009ff4: 0x1009ff4: sll   zero, zero, 0
+// 0x01009ff8: 0x1009ff8: beq   a0, zero, 0x100a004 addu  s1, v0, s1
 	ldloc.1
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-	brfalse L_1009ff4
+	brfalse L_100a004
 // --- basic block ---
-// 0x01009ff0: 0x1009ff0: sw    s1, 0(a0)
+// 0x0100a000: 0x100a000: sw    s1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_1009ff4:
-// 0x01009ff4: 0x1009ff4: lw    ra, 92(sp)
-// 0x01009ff8: 0x1009ff8: addu  v0, s2, zero
+L_100a004:
+// 0x0100a004: 0x100a004: lw    ra, 92(sp)
+// 0x0100a008: 0x100a008: addu  v0, s2, zero
 	ldloc 11
 	stloc 6
-// 0x01009ffc: 0x1009ffc: lw    s8, 88(sp)
+// 0x0100a00c: 0x100a00c: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7222,7 +7222,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100a000: 0x100a000: lw    s7, 84(sp)
+// 0x0100a010: 0x100a010: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7231,7 +7231,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100a004: 0x100a004: lw    s6, 80(sp)
+// 0x0100a014: 0x100a014: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7240,7 +7240,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100a008: 0x100a008: lw    s5, 76(sp)
+// 0x0100a018: 0x100a018: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7249,7 +7249,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100a00c: 0x100a00c: lw    s4, 72(sp)
+// 0x0100a01c: 0x100a01c: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7258,7 +7258,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100a010: 0x100a010: lw    s3, 68(sp)
+// 0x0100a020: 0x100a020: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7267,7 +7267,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100a014: 0x100a014: lw    s2, 64(sp)
+// 0x0100a024: 0x100a024: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7276,7 +7276,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100a018: 0x100a018: lw    s1, 60(sp)
+// 0x0100a028: 0x100a028: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7285,7 +7285,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a01c: 0x100a01c: lw    s0, 56(sp)
+// 0x0100a02c: 0x100a02c: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7294,7 +7294,7 @@ L_1009ff4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100a020: 0x100a020: jr    ra addiu sp, sp, 96
+// 0x0100a030: 0x100a030: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
diff --git a/converted/Cibyl60.j b/converted/Cibyl60.j
index 9371bd6..1e6ef77 100644
--- a/converted/Cibyl60.j
+++ b/converted/Cibyl60.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl60::.ctor
 
-.method public static int32 roadmap_main_browser_url_handler_1050a9c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_browser_url_handler_1050aac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -79,12 +79,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050a9c: 0x1050a9c: addiu sp, sp, -24
+// 0x01050aac: 0x1050aac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01050aa0: 0x1050aa0: sw    s0, 16(sp)
+// 0x01050ab0: 0x1050ab0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -93,21 +93,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01050aa4: 0x1050aa4: lui   a0, 0x10000
+// 0x01050ab4: 0x1050ab4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050aa8: 0x1050aa8: lui   s0, 0x70000
+// 0x01050ab8: 0x1050ab8: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050aac: 0x1050aac: addiu a1, s0, -1684
+// 0x01050abc: 0x1050abc: addiu a1, s0, -1220
 	ldloc 5
-	ldc.i4 -1684
+	ldc.i4 -1220
 	add
 	stloc.2
-// 0x01050ab0: 0x1050ab0: sw    ra, 20(sp)
-// 0x01050ab4: 0x1050ab4: jal   0x1000e78 addiu a0, a0, 4516
+// 0x01050ac0: 0x1050ac0: sw    ra, 20(sp)
+// 0x01050ac4: 0x1050ac4: jal   0x1000e78 addiu a0, a0, 4512
 	ldloc.1
-	ldc.i4 4516
+	ldc.i4 4512
 	add
 	stloc.1
 	ldloc.0
@@ -120,9 +120,9 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01050abc: 0x1050abc: jal   0x10552a0 addiu a0, s0, -1684
+// 0x01050acc: 0x1050acc: jal   0x10552b0 addiu a0, s0, -1220
 	ldloc 5
-	ldc.i4 -1684
+	ldc.i4 -1220
 	add
 	stloc.1
 	ldloc.0
@@ -130,13 +130,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_url_handler_10552a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_url_handler_10552b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01050ac4: 0x1050ac4: lw    ra, 20(sp)
-// 0x01050ac8: 0x1050ac8: lw    s0, 16(sp)
+// 0x01050ad4: 0x1050ad4: lw    ra, 20(sp)
+// 0x01050ad8: 0x1050ad8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -145,7 +145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050acc: 0x1050acc: jr    ra addiu sp, sp, 24
+// 0x01050adc: 0x1050adc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -157,7 +157,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -192,23 +192,23 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050ad4: 0x1050ad4: addiu sp, sp, -24
+// 0x01050ae4: 0x1050ae4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01050ad8: 0x1050ad8: addiu v0, zero, 2
+// 0x01050ae8: 0x1050ae8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01050adc: 0x1050adc: bne   a0, v0, 0x1050b00 sw    ra, 20(sp)
+// 0x01050aec: 0x1050aec: bne   a0, v0, 0x1050b10 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1050b00
+	bne.un L_1050b10
 // --- basic block ---
-// 0x01050ae4: 0x1050ae4: lui   a0, 0x10000
+// 0x01050af4: 0x1050af4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050ae8: 0x1050ae8: jal   0x101cd60 addiu a0, a0, -15872
+// 0x01050af8: 0x1050af8: jal   0x101cd70 addiu a0, a0, -15872
 	ldloc.1
 	ldc.i4 -15872
 	add
@@ -218,40 +218,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050af0: 0x1050af0: jal   0x104c3d0 addu  a0, v0, zero
+// 0x01050b00: 0x1050b00: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01050af8: 0x1050af8: j	 0x1050b14 sll   zero, zero, 0
-	br L_1050b14
+// 0x01050b08: 0x1050b08: j	 0x1050b24 sll   zero, zero, 0
+	br L_1050b24
 // --- basic block ---
-L_1050b00:
-// 0x01050b00: 0x1050b00: addiu v0, zero, 1
+L_1050b10:
+// 0x01050b10: 0x1050b10: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01050b04: 0x1050b04: bne   a0, v0, 0x1050b14 sll   zero, zero, 0
+// 0x01050b14: 0x1050b14: bne   a0, v0, 0x1050b24 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_1050b14
+	bne.un L_1050b24
 // --- basic block ---
-// 0x01050b0c: 0x1050b0c: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x01050b1c: 0x1050b1c: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1050b14:
-// 0x01050b14: 0x1050b14: lw    ra, 20(sp)
-// 0x01050b18: 0x1050b18: sll   zero, zero, 0
-// 0x01050b1c: 0x1050b1c: jr    ra addiu sp, sp, 24
+L_1050b24:
+// 0x01050b24: 0x1050b24: lw    ra, 20(sp)
+// 0x01050b28: 0x1050b28: sll   zero, zero, 0
+// 0x01050b2c: 0x1050b2c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -263,7 +263,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 ra,int32 ecb,int32 ear)
@@ -307,14 +307,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1050b24:
-// 0x01050b24: 0x1050b24: addiu sp, sp, -24
+L_1050b34:
+// 0x01050b34: 0x1050b34: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01050b28: 0x1050b28: sw    ra, 20(sp)
-// 0x01050b2c: 0x1050b2c: sw    s0, 16(sp)
+// 0x01050b38: 0x1050b38: sw    ra, 20(sp)
+// 0x01050b3c: 0x1050b3c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -323,16 +323,16 @@ L_1050b24:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01050b30: 0x1050b30: lui   a0, 0x1050000
+// 0x01050b40: 0x1050b40: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01050b34: 0x1050b34: addiu a0, a0, 3636
+// 0x01050b44: 0x1050b44: addiu a0, a0, 3652
 	ldloc.1
-	ldc.i4 3636
+	ldc.i4 3652
 	add
 	stloc.1
-L_1050b38:
-// 0x01050b38: 0x1050b38: jal   0x1000120 addu  a1, zero, zero
+L_1050b48:
+// 0x01050b48: 0x1050b48: jal   0x1000120 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
@@ -340,37 +340,37 @@ L_1050b38:
 	ldloc.2
 	stloc 11
 // --- basic block ---
-// 0x01050b40: 0x1050b40: lw    v0, 0(zero)
+// 0x01050b50: 0x1050b50: lw    v0, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01050b44: 0x1050b44: sll   zero, zero, 0
-// 0x01050b48: 0x1050b48: beq   v0, zero, 0x1050c34 lui   s0, 0x10000
+// 0x01050b54: 0x1050b54: sll   zero, zero, 0
+// 0x01050b58: 0x1050b58: beq   v0, zero, 0x1050c44 lui   s0, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 8
-	brfalse L_1050c34
+	brfalse L_1050c44
 // --- basic block ---
-// 0x01050b50: 0x1050b50: lui   a3, 0x10000
+// 0x01050b60: 0x1050b60: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050b54: 0x1050b54: addiu a3, a3, 4552
+// 0x01050b64: 0x1050b64: addiu a3, a3, 4548
 	ldloc 4
-	ldc.i4 4552
+	ldc.i4 4548
 	add
 	stloc 4
-// 0x01050b58: 0x1050b58: addiu a0, zero, 4
+// 0x01050b68: 0x1050b68: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050b5c: 0x1050b5c: addiu a1, s0, 3972
+// 0x01050b6c: 0x1050b6c: addiu a1, s0, 3968
 	ldloc 8
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050b60: 0x1050b60: jal   0x100449c addiu a2, zero, 1107
+// 0x01050b70: 0x1050b70: jal   0x100449c addiu a2, zero, 1107
 	ldc.i4 1107
 	stloc.3
 	ldloc.0
@@ -383,43 +383,43 @@ L_1050b38:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01050b68: 0x1050b68: lui   v0, 0x70000
+// 0x01050b78: 0x1050b78: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01050b6c: 0x1050b6c: lw    v1, -1688(v0)
+// 0x01050b7c: 0x1050b7c: lw    v1, -1224(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050b70: 0x1050b70: sll   zero, zero, 0
-// 0x01050b74: 0x1050b74: cibyl_sysc_arg 0x3
+// 0x01050b80: 0x1050b80: sll   zero, zero, 0
+// 0x01050b84: 0x1050b84: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01050b78: 0x1050b78: cibyl_sysc 0x16be
+// 0x01050b88: 0x1050b88: cibyl_sysc 0x16be
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_revertToInitialLocale(int32)
-// 0x01050b7c: 0x1050b7c: addu  v1, v0, zero
+// 0x01050b8c: 0x1050b8c: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x01050b80: 0x1050b80: lui   a3, 0x10000
+// 0x01050b90: 0x1050b90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050b84: 0x1050b84: addiu a1, s0, 3972
+// 0x01050b94: 0x1050b94: addiu a1, s0, 3968
 	ldloc 8
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050b88: 0x1050b88: addiu a3, a3, 4584
+// 0x01050b98: 0x1050b98: addiu a3, a3, 4580
 	ldloc 4
-	ldc.i4 4584
+	ldc.i4 4580
 	add
 	stloc 4
-// 0x01050b8c: 0x1050b8c: addiu a0, zero, 1
+// 0x01050b9c: 0x1050b9c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01050b90: 0x1050b90: jal   0x100449c addiu a2, zero, 1109
+// 0x01050ba0: 0x1050ba0: jal   0x100449c addiu a2, zero, 1109
 	ldc.i4 1109
 	stloc.3
 	ldloc.0
@@ -432,34 +432,34 @@ L_1050b38:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01050b98: 0x1050b98: jal   0x102d664 sll   zero, zero, 0
+// 0x01050ba8: 0x1050ba8: jal   0x102d674 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_exit_102d664(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_exit_102d674(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01050ba0: 0x1050ba0: lui   a3, 0x10000
+// 0x01050bb0: 0x1050bb0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050ba4: 0x1050ba4: addiu a1, s0, 3972
+// 0x01050bb4: 0x1050bb4: addiu a1, s0, 3968
 	ldloc 8
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050ba8: 0x1050ba8: addiu a3, a3, 4612
+// 0x01050bb8: 0x1050bb8: addiu a3, a3, 4608
 	ldloc 4
-	ldc.i4 4612
+	ldc.i4 4608
 	add
 	stloc 4
-// 0x01050bac: 0x1050bac: addiu a0, zero, 1
+// 0x01050bbc: 0x1050bbc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01050bb0: 0x1050bb0: jal   0x100449c addiu a2, zero, 1111
+// 0x01050bc0: 0x1050bc0: jal   0x100449c addiu a2, zero, 1111
 	ldc.i4 1111
 	stloc.3
 	ldloc.0
@@ -472,56 +472,56 @@ L_1050b38:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01050bb8: 0x1050bb8: addiu v1, zero, 1
+// 0x01050bc8: 0x1050bc8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01050bbc: 0x1050bbc: lui   v0, 0x70000
+// 0x01050bcc: 0x1050bcc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01050bc0: 0x1050bc0: sw    v1, -2900(v0)
+// 0x01050bd0: 0x1050bd0: sw    v1, -2436(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -725
+	ldc.i4 -609
 	add
 	ldloc 5
 	stelem.i4
-// 0x01050bc4: 0x1050bc4: cibyl_sysc 0x16eb
+// 0x01050bd4: 0x1050bd4: cibyl_sysc 0x16eb
 	call void [WazeWP7]Syscalls::NOPH_RimTimerMgr_cancelTimer()
-// 0x01050bc8: 0x1050bc8: addu  v1, v0, zero
+// 0x01050bd8: 0x1050bd8: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x01050bcc: 0x1050bcc: lui   v1, 0x70000
+// 0x01050bdc: 0x1050bdc: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050bd0: 0x1050bd0: lui   a0, 0x70000
+// 0x01050be0: 0x1050be0: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01050bd4: 0x1050bd4: addiu v1, v1, -1976
+// 0x01050be4: 0x1050be4: addiu v1, v1, -1512
 	ldloc 5
-	ldc.i4 -1976
+	ldc.i4 -1512
 	add
 	stloc 5
-// 0x01050bd8: 0x1050bd8: addiu a0, a0, -1688
+// 0x01050be8: 0x1050be8: addiu a0, a0, -1224
 	ldloc.1
-	ldc.i4 -1688
+	ldc.i4 -1224
 	add
 	stloc.1
-L_1050bdc:
-// 0x01050bdc: 0x1050bdc: lw    v0, 0(v1)
+L_1050bec:
+// 0x01050bec: 0x1050bec: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01050be0: 0x1050be0: sll   zero, zero, 0
-// 0x01050be4: 0x1050be4: beq   v0, zero, 0x1050c18 sll   zero, zero, 0
+// 0x01050bf0: 0x1050bf0: sll   zero, zero, 0
+// 0x01050bf4: 0x1050bf4: beq   v0, zero, 0x1050c28 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1050c18
+	brfalse L_1050c28
 // --- basic block ---
-// 0x01050bec: 0x1050bec: lw    a1, 4(v1)
+// 0x01050bfc: 0x1050bfc: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -530,15 +530,15 @@ L_1050bdc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01050bf0: 0x1050bf0: sll   zero, zero, 0
-// 0x01050bf4: 0x1050bf4: cibyl_sysc_arg 0x5
+// 0x01050c00: 0x1050c00: sll   zero, zero, 0
+// 0x01050c04: 0x1050c04: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01050bf8: 0x1050bf8: cibyl_sysc 0x1708
+// 0x01050c08: 0x1050c08: cibyl_sysc 0x1708
 	call void [WazeWP7]Syscalls::NOPH_TimerTask_cancel(int32)
-// 0x01050bfc: 0x1050bfc: addu  a1, v0, zero
+// 0x01050c0c: 0x1050c0c: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01050c00: 0x1050c00: lw    a1, 4(v1)
+// 0x01050c10: 0x1050c10: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -547,21 +547,21 @@ L_1050bdc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01050c04: 0x1050c04: sw    zero, 0(v1)
+// 0x01050c14: 0x1050c14: sw    zero, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01050c08: 0x1050c08: cibyl_sysc_arg 0x5
+// 0x01050c18: 0x1050c18: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01050c0c: 0x1050c0c: cibyl_sysc 0x171e
+// 0x01050c1c: 0x1050c1c: cibyl_sysc 0x171e
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01050c10: 0x1050c10: addu  a1, v0, zero
+// 0x01050c20: 0x1050c20: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01050c14: 0x1050c14: sw    zero, 4(v1)
+// 0x01050c24: 0x1050c24: sw    zero, 4(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -570,18 +570,18 @@ L_1050bdc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1050c18:
-// 0x01050c18: 0x1050c18: addiu v1, v1, 12
+L_1050c28:
+// 0x01050c28: 0x1050c28: addiu v1, v1, 12
 	ldloc 5
 	ldc.i4.s 12
 	add
 	stloc 5
-// 0x01050c1c: 0x1050c1c: bne   v1, a0, 0x1050bdc sll   zero, zero, 0
+// 0x01050c2c: 0x1050c2c: bne   v1, a0, 0x1050bec sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_1050bdc
+	bne.un L_1050bec
 // --- basic block ---
-// 0x01050c24: 0x1050c24: jal   0x10042a8 sll   zero, zero, 0
+// 0x01050c34: 0x1050c34: jal   0x10042a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -592,20 +592,20 @@ L_1050c18:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01050c2c: 0x1050c2c: jal   0x1000ac0 addu  a0, zero, zero
+// 0x01050c3c: 0x1050c3c: jal   0x1000ac0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
 	call int32 Cibyl::exit_1000ac0(int32)
 	stloc 6
 // --- basic block ---
-L_1050c34:
-// 0x01050c34: 0x1050c34: sll   zero, zero, 0
-// 0x01050c38: 0x1050c38: Unknown instruction 0x0
-L_1050c38:
-// 0x01050c3c: 0x1050c3c: sll   zero, zero, 0
-// 0x01050c40: 0x1050c40: lw    ra, 20(sp)
-// 0x01050c44: 0x1050c44: lw    s0, 16(sp)
+L_1050c44:
+// 0x01050c44: 0x1050c44: sll   zero, zero, 0
+// 0x01050c48: 0x1050c48: Unknown instruction 0x0
+L_1050c48:
+// 0x01050c4c: 0x1050c4c: sll   zero, zero, 0
+// 0x01050c50: 0x1050c50: lw    ra, 20(sp)
+// 0x01050c54: 0x1050c54: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -614,7 +614,7 @@ L_1050c38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01050c48: 0x1050c48: jr    ra addiu sp, sp, 24
+// 0x01050c58: 0x1050c58: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -626,7 +626,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 rim_on_key_down_1050c50(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_key_down_1050c60(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s5,int32 s4,int32 ra)
@@ -679,16 +679,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050c50: 0x1050c50: addiu sp, sp, -184
+// 0x01050c60: 0x1050c60: addiu sp, sp, -184
 	ldloc.0
 	ldc.i4 -184
 	add
 	stloc.0
-// 0x01050c54: 0x1050c54: addiu v0, zero, 10
+// 0x01050c64: 0x1050c64: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x01050c58: 0x1050c58: sw    ra, 180(sp)
-// 0x01050c5c: 0x1050c5c: sw    s5, 176(sp)
+// 0x01050c68: 0x1050c68: sw    ra, 180(sp)
+// 0x01050c6c: 0x1050c6c: sw    s5, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -697,7 +697,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01050c60: 0x1050c60: sw    s4, 172(sp)
+// 0x01050c70: 0x1050c70: sw    s4, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -706,7 +706,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01050c64: 0x1050c64: sw    s3, 168(sp)
+// 0x01050c74: 0x1050c74: sw    s3, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -715,7 +715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01050c68: 0x1050c68: sw    s2, 164(sp)
+// 0x01050c78: 0x1050c78: sw    s2, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -724,7 +724,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01050c6c: 0x1050c6c: sw    s1, 160(sp)
+// 0x01050c7c: 0x1050c7c: sw    s1, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -733,7 +733,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01050c70: 0x1050c70: sw    s0, 156(sp)
+// 0x01050c80: 0x1050c80: sw    s0, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -742,7 +742,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01050c74: 0x1050c74: bne   a0, v0, 0x1050d50 sh    zero, 32(sp)
+// 0x01050c84: 0x1050c84: bne   a0, v0, 0x1050d60 sh    zero, 32(sp)
 	ldloc.1
 	ldloc 5
 	ldloc.0
@@ -750,46 +750,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	bne.un L_1050d50
+	bne.un L_1050d60
 // --- basic block ---
-// 0x01050c7c: 0x1050c7c: andi  a1, a1, 1
+// 0x01050c8c: 0x1050c8c: andi  a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	and
 	stloc.2
-// 0x01050c80: 0x1050c80: bne   a1, zero, 0x1050e10 addiu v0, zero, 1
+// 0x01050c90: 0x1050c90: bne   a1, zero, 0x1050e20 addiu v0, zero, 1
 	ldloc.2
 	ldc.i4.1
 	stloc 5
-	brtrue L_1050e10
+	brtrue L_1050e20
 // --- basic block ---
-// 0x01050c88: 0x1050c88: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x01050c98: 0x1050c98: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x01050c90: 0x1050c90: bne   v0, zero, 0x1050d6c lui   s3, 0x10000
+// 0x01050ca0: 0x1050ca0: bne   v0, zero, 0x1050d7c lui   s3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 11
-	brtrue L_1050d6c
+	brtrue L_1050d7c
 // --- basic block ---
-// 0x01050c98: 0x1050c98: lui   a3, 0x10000
+// 0x01050ca8: 0x1050ca8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050c9c: 0x1050c9c: addiu a3, a3, 4644
+// 0x01050cac: 0x1050cac: addiu a3, a3, 4640
 	ldloc 4
-	ldc.i4 4644
+	ldc.i4 4640
 	add
 	stloc 4
-// 0x01050ca0: 0x1050ca0: addiu a0, zero, 4
+// 0x01050cb0: 0x1050cb0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050ca4: 0x1050ca4: addiu a1, s3, 3972
+// 0x01050cb4: 0x1050cb4: addiu a1, s3, 3968
 	ldloc 11
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050ca8: 0x1050ca8: jal   0x100449c addiu a2, zero, 1360
+// 0x01050cb8: 0x1050cb8: jal   0x100449c addiu a2, zero, 1360
 	ldc.i4 1360
 	stloc.3
 	ldloc.0
@@ -802,19 +802,19 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050cb0: 0x1050cb0: addiu v1, sp, 40
+// 0x01050cc0: 0x1050cc0: addiu v1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 7
-// 0x01050cb4: 0x1050cb4: cibyl_sysc_arg 0x3
+// 0x01050cc4: 0x1050cc4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01050cb8: 0x1050cb8: cibyl_sysc 0x172a
+// 0x01050cc8: 0x1050cc8: cibyl_sysc 0x172a
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x01050cbc: 0x1050cbc: addu  a0, v0, zero
+// 0x01050ccc: 0x1050ccc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01050cc0: 0x1050cc0: lw    s4, 40(sp)
+// 0x01050cd0: 0x1050cd0: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -823,7 +823,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01050cc4: 0x1050cc4: lw    s2, 44(sp)
+// 0x01050cd4: 0x1050cd4: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -832,18 +832,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01050cc8: 0x1050cc8: sll   zero, zero, 0
-// 0x01050ccc: 0x1050ccc: cibyl_sysc_arg 0x3
+// 0x01050cd8: 0x1050cd8: sll   zero, zero, 0
+// 0x01050cdc: 0x1050cdc: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01050cd0: 0x1050cd0: cibyl_sysc 0x174a
+// 0x01050ce0: 0x1050ce0: cibyl_sysc 0x174a
 	call void [WazeWP7]Syscalls::__NOPH_System_currentTimeMillis(int32)
-// 0x01050cd4: 0x1050cd4: addu  v1, v0, zero
+// 0x01050ce4: 0x1050ce4: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01050cd8: 0x1050cd8: lui   a0, 0x10000
+// 0x01050ce8: 0x1050ce8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050cdc: 0x1050cdc: lw    s1, 44(sp)
+// 0x01050cec: 0x1050cec: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -852,12 +852,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01050ce0: 0x1050ce0: addiu a0, a0, 4660
+// 0x01050cf0: 0x1050cf0: addiu a0, a0, 4656
 	ldloc.1
-	ldc.i4 4660
+	ldc.i4 4656
 	add
 	stloc.1
-// 0x01050ce4: 0x1050ce4: jal   0x1000e78 addu  a1, zero, zero
+// 0x01050cf4: 0x1050cf4: jal   0x1000e78 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -870,31 +870,31 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050cec: 0x1050cec: subu  s1, s1, s2
+// 0x01050cfc: 0x1050cfc: subu  s1, s1, s2
 	ldloc 9
 	ldloc 10
 	sub
 	stloc 9
-// 0x01050cf0: 0x1050cf0: addiu s5, sp, 48
+// 0x01050d00: 0x1050d00: addiu s5, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 12
-// 0x01050cf4: 0x1050cf4: lui   a1, 0x10000
+// 0x01050d04: 0x1050d04: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01050cf8: 0x1050cf8: addu  a0, s5, zero
+// 0x01050d08: 0x1050d08: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01050cfc: 0x1050cfc: addu  a2, s1, zero
+// 0x01050d0c: 0x1050d0c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x01050d00: 0x1050d00: lui   s0, 0x10000
+// 0x01050d10: 0x1050d10: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01050d04: 0x1050d04: jal   0x1000f64 addiu a1, a1, 4672
+// 0x01050d14: 0x1050d14: jal   0x1000f64 addiu a1, a1, 4668
 	ldloc.2
-	ldc.i4 4672
+	ldc.i4 4668
 	add
 	stloc.2
 	ldloc.0
@@ -907,15 +907,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050d0c: 0x1050d0c: addu  a1, s5, zero
+// 0x01050d1c: 0x1050d1c: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x01050d10: 0x1050d10: addiu a0, s0, 4692
+// 0x01050d20: 0x1050d20: addiu a0, s0, 4688
 	ldloc 8
-	ldc.i4 4692
+	ldc.i4 4688
 	add
 	stloc.1
-// 0x01050d14: 0x1050d14: jal   0x104bfe4 addiu a2, zero, 15
+// 0x01050d24: 0x1050d24: jal   0x104bff4 addiu a2, zero, 15
 	ldc.i4.s 15
 	stloc.3
 	ldloc.0
@@ -923,31 +923,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050d1c: 0x1050d1c: lui   a3, 0x10000
+// 0x01050d2c: 0x1050d2c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050d20: 0x1050d20: addiu a1, s3, 3972
+// 0x01050d30: 0x1050d30: addiu a1, s3, 3968
 	ldloc 11
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050d24: 0x1050d24: addiu a3, a3, 4700
+// 0x01050d34: 0x1050d34: addiu a3, a3, 4696
 	ldloc 4
-	ldc.i4 4700
+	ldc.i4 4696
 	add
 	stloc 4
-// 0x01050d28: 0x1050d28: addiu a0, zero, 4
+// 0x01050d38: 0x1050d38: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050d2c: 0x1050d2c: addiu a2, zero, 1408
+// 0x01050d3c: 0x1050d3c: addiu a2, zero, 1408
 	ldc.i4 1408
 	stloc.3
-// 0x01050d30: 0x1050d30: sw    s4, 16(sp)
+// 0x01050d40: 0x1050d40: sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -956,7 +956,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01050d34: 0x1050d34: sw    s2, 20(sp)
+// 0x01050d44: 0x1050d44: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -965,7 +965,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01050d38: 0x1050d38: jal   0x100449c sw    s1, 24(sp)
+// 0x01050d48: 0x1050d48: jal   0x100449c sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -984,90 +984,90 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050d40: 0x1050d40: jal   0x1000350 addiu a0, s0, 4692
+// 0x01050d50: 0x1050d50: jal   0x1000350 addiu a0, s0, 4688
 	ldloc 8
-	ldc.i4 4692
+	ldc.i4 4688
 	add
 	stloc.1
 	ldloc.1
 	call int32 Cibyl::puts_1000350(int32)
 	stloc 5
 // --- basic block ---
-// 0x01050d48: 0x1050d48: j	 0x1050e10 addiu v0, zero, 1
+// 0x01050d58: 0x1050d58: j	 0x1050e20 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1050e10
+	br L_1050e20
 // --- basic block ---
-L_1050d50:
-// 0x01050d50: 0x1050d50: addiu v0, zero, 18
+L_1050d60:
+// 0x01050d60: 0x1050d60: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01050d54: 0x1050d54: beq   a0, v0, 0x1050d84 addiu v0, zero, 27
+// 0x01050d64: 0x1050d64: beq   a0, v0, 0x1050d94 addiu v0, zero, 27
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 27
 	stloc 5
-	beq  L_1050d84
+	beq  L_1050d94
 // --- basic block ---
-// 0x01050d5c: 0x1050d5c: bne   a0, v0, 0x1050ddc sll   zero, zero, 0
+// 0x01050d6c: 0x1050d6c: bne   a0, v0, 0x1050dec sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_1050ddc
+	bne.un L_1050dec
 // --- basic block ---
-// 0x01050d64: 0x1050d64: j	 0x1050d74 sb    a0, 32(sp)
+// 0x01050d74: 0x1050d74: j	 0x1050d84 sb    a0, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1050d74
+	br L_1050d84
 // --- basic block ---
-L_1050d6c:
-// 0x01050d6c: 0x1050d6c: addiu v0, zero, 13
+L_1050d7c:
+// 0x01050d7c: 0x1050d7c: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x01050d70: 0x1050d70: sb    v0, 32(sp)
+// 0x01050d80: 0x1050d80: sb    v0, 32(sp)
 	ldloc.0
 	ldc.i4.s 32
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1050d74:
-// 0x01050d74: 0x1050d74: sb    zero, 33(sp)
+L_1050d84:
+// 0x01050d84: 0x1050d84: sb    zero, 33(sp)
 	ldloc.0
 	ldc.i4.s 33
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01050d78: 0x1050d78: addiu a1, zero, 2
+// 0x01050d88: 0x1050d88: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x01050d7c: 0x1050d7c: j	 0x1050e08 addiu a0, sp, 32
+// 0x01050d8c: 0x1050d8c: j	 0x1050e18 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-	br L_1050e08
+	br L_1050e18
 // --- basic block ---
-L_1050d84:
-// 0x01050d84: 0x1050d84: jal   0x1093fe0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_current_container_1093fe0()
+L_1050d94:
+// 0x01050d94: 0x1050d94: jal   0x1094604 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_current_container_1094604()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050d8c: 0x1050d8c: beq   v0, zero, 0x1050dcc lui   a1, 0x20000
+// 0x01050d9c: 0x1050d9c: beq   v0, zero, 0x1050ddc lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1050dcc
+	brfalse L_1050ddc
 // --- basic block ---
-// 0x01050d94: 0x1050d94: addiu a1, a1, -2684
+// 0x01050da4: 0x1050da4: addiu a1, a1, -2220
 	ldloc.2
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.2
-// 0x01050d98: 0x1050d98: jal   0x109b634 addu  a0, v0, zero
+// 0x01050da8: 0x1050da8: jal   0x109bc7c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1075,20 +1075,20 @@ L_1050d84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050da0: 0x1050da0: lui   a0, 0x10000
+// 0x01050db0: 0x1050db0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050da4: 0x1050da4: addiu a0, a0, -25408
+// 0x01050db4: 0x1050db4: addiu a0, a0, -25408
 	ldloc.1
 	ldc.i4 -25408
 	add
 	stloc.1
-// 0x01050da8: 0x1050da8: jal   0x101cd60 addu  s0, v0, zero
+// 0x01050db8: 0x1050db8: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1096,15 +1096,15 @@ L_1050d84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050db0: 0x1050db0: addu  a1, v0, zero
+// 0x01050dc0: 0x1050dc0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01050db4: 0x1050db4: jal   0x1001b14 addu  a0, s0, zero
+// 0x01050dc4: 0x1050dc4: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -1112,91 +1112,91 @@ L_1050d84:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01050dbc: 0x1050dbc: bne   v0, zero, 0x1050dcc sll   zero, zero, 0
+// 0x01050dcc: 0x1050dcc: bne   v0, zero, 0x1050ddc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1050dcc
+	brtrue L_1050ddc
 // --- basic block ---
-// 0x01050dc4: 0x1050dc4: jal   0x1050b24 sll   zero, zero, 0
+// 0x01050dd4: 0x1050dd4: jal   0x1050b34 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_exit_1050b24(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_exit_1050b34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1050dcc:
-// 0x01050dcc: 0x1050dcc: jal   0x102c364 sll   zero, zero, 0
+L_1050ddc:
+// 0x01050ddc: 0x1050ddc: jal   0x102c374 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_confirmed_exit_102c364(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_confirmed_exit_102c374(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01050dd4: 0x1050dd4: j	 0x1050e10 addiu v0, zero, 1
+// 0x01050de4: 0x1050de4: j	 0x1050e20 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1050e10
+	br L_1050e20
 // --- basic block ---
-L_1050ddc:
-// 0x01050ddc: 0x1050ddc: lui   a0, 0xf0000
+L_1050dec:
+// 0x01050dec: 0x1050dec: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x01050de0: 0x1050de0: lb    v1, -30064(a0)
+// 0x01050df0: 0x1050df0: lb    v1, -29600(a0)
 	ldloc.1
-	ldc.i4 -30064
+	ldc.i4 -29600
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01050de4: 0x1050de4: sll   zero, zero, 0
-// 0x01050de8: 0x1050de8: beq   v1, zero, 0x1050e10 addu  v0, zero, zero
+// 0x01050df4: 0x1050df4: sll   zero, zero, 0
+// 0x01050df8: 0x1050df8: beq   v1, zero, 0x1050e20 addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1050e10
+	brfalse L_1050e20
 // --- basic block ---
-// 0x01050df0: 0x1050df0: addiu a0, a0, -30064
+// 0x01050e00: 0x1050e00: addiu a0, a0, -29600
 	ldloc.1
-	ldc.i4 -30064
+	ldc.i4 -29600
 	add
 	stloc.1
-// 0x01050df4: 0x1050df4: lb    v0, 1(a0)
+// 0x01050e04: 0x1050e04: lb    v0, 1(a0)
 	ldloc.1
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01050df8: 0x1050df8: sll   zero, zero, 0
-// 0x01050dfc: 0x1050dfc: beq   v0, zero, 0x1050e08 addiu a1, zero, 2
+// 0x01050e08: 0x1050e08: sll   zero, zero, 0
+// 0x01050e0c: 0x1050e0c: beq   v0, zero, 0x1050e18 addiu a1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc.2
-	brfalse L_1050e08
+	brfalse L_1050e18
 // --- basic block ---
-// 0x01050e04: 0x1050e04: addu  a1, zero, zero
+// 0x01050e14: 0x1050e14: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_1050e08:
-// 0x01050e08: 0x1050e08: jal   0x10388b4 sll   zero, zero, 0
+L_1050e18:
+// 0x01050e18: 0x1050e18: jal   0x10388c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_handler__key_pressed_10388b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_handler__key_pressed_10388c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1050e10:
-// 0x01050e10: 0x1050e10: lw    ra, 180(sp)
-// 0x01050e14: 0x1050e14: lw    s5, 176(sp)
+L_1050e20:
+// 0x01050e20: 0x1050e20: lw    ra, 180(sp)
+// 0x01050e24: 0x1050e24: lw    s5, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1205,7 +1205,7 @@ L_1050e10:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01050e18: 0x1050e18: lw    s4, 172(sp)
+// 0x01050e28: 0x1050e28: lw    s4, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1214,7 +1214,7 @@ L_1050e10:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01050e1c: 0x1050e1c: lw    s3, 168(sp)
+// 0x01050e2c: 0x1050e2c: lw    s3, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1223,7 +1223,7 @@ L_1050e10:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01050e20: 0x1050e20: lw    s2, 164(sp)
+// 0x01050e30: 0x1050e30: lw    s2, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1232,7 +1232,7 @@ L_1050e10:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01050e24: 0x1050e24: lw    s1, 160(sp)
+// 0x01050e34: 0x1050e34: lw    s1, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1241,7 +1241,7 @@ L_1050e10:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01050e28: 0x1050e28: lw    s0, 156(sp)
+// 0x01050e38: 0x1050e38: lw    s0, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1250,7 +1250,7 @@ L_1050e10:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01050e2c: 0x1050e2c: jr    ra addiu sp, sp, 184
+// 0x01050e3c: 0x1050e3c: jr    ra addiu sp, sp, 184
 	ldloc.0
 	ldc.i4 184
 	add
@@ -1262,7 +1262,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 exit_handler_1050e34(int32,int32,int32,int32,int32)
+.method public static int32 exit_handler_1050e44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -1300,12 +1300,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050e34: 0x1050e34: addiu sp, sp, -544
+// 0x01050e44: 0x1050e44: addiu sp, sp, -544
 	ldloc.0
 	ldc.i4 -544
 	add
 	stloc.0
-// 0x01050e38: 0x1050e38: sw    s0, 536(sp)
+// 0x01050e48: 0x1050e48: sw    s0, 536(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1314,61 +1314,61 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01050e3c: 0x1050e3c: sw    ra, 540(sp)
-// 0x01050e40: 0x1050e40: addu  s0, a0, zero
+// 0x01050e4c: 0x1050e4c: sw    ra, 540(sp)
+// 0x01050e50: 0x1050e50: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01050e44: 0x1050e44: cibyl_sysc_arg 0x4
+// 0x01050e54: 0x1050e54: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01050e48: 0x1050e48: cibyl_sysc 0x176a
+// 0x01050e58: 0x1050e58: cibyl_sysc 0x176a
 	call int32 [WazeWP7]Syscalls::NOPH_Throwable_toString(int32)
 	stloc 5
-// 0x01050e4c: 0x1050e4c: addu  a0, v0, zero
+// 0x01050e5c: 0x1050e5c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01050e50: 0x1050e50: addiu a1, zero, 512
+// 0x01050e60: 0x1050e60: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x01050e54: 0x1050e54: addiu v1, sp, 24
+// 0x01050e64: 0x1050e64: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x01050e58: 0x1050e58: cibyl_sysc_arg 0x4
+// 0x01050e68: 0x1050e68: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01050e5c: 0x1050e5c: cibyl_sysc_arg 0x3
+// 0x01050e6c: 0x1050e6c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01050e60: 0x1050e60: cibyl_sysc_arg 0x5
+// 0x01050e70: 0x1050e70: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01050e64: 0x1050e64: cibyl_sysc 0x1782
+// 0x01050e74: 0x1050e74: cibyl_sysc 0x1782
 	call int32 [WazeWP7]Syscalls::NOPH_String_toCharPtr(int32,int32,int32)
 	stloc 5
-// 0x01050e68: 0x1050e68: addu  a0, v0, zero
+// 0x01050e78: 0x1050e78: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01050e6c: 0x1050e6c: lui   a1, 0x10000
+// 0x01050e7c: 0x1050e7c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01050e70: 0x1050e70: lui   a3, 0x10000
+// 0x01050e80: 0x1050e80: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01050e74: 0x1050e74: addiu a1, a1, 3972
+// 0x01050e84: 0x1050e84: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x01050e78: 0x1050e78: addiu a3, a3, 4728
+// 0x01050e88: 0x1050e88: addiu a3, a3, 4724
 	ldloc 4
-	ldc.i4 4728
+	ldc.i4 4724
 	add
 	stloc 4
-// 0x01050e7c: 0x1050e7c: addiu a0, zero, 4
+// 0x01050e8c: 0x1050e8c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01050e80: 0x1050e80: addiu a2, zero, 1098
+// 0x01050e90: 0x1050e90: addiu a2, zero, 1098
 	ldc.i4 1098
 	stloc.3
-// 0x01050e84: 0x1050e84: jal   0x100449c sw    v1, 16(sp)
+// 0x01050e94: 0x1050e94: jal   0x100449c sw    v1, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1387,21 +1387,21 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050e8c: 0x1050e8c: cibyl_sysc_arg 0x10
+// 0x01050e9c: 0x1050e9c: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x01050e90: 0x1050e90: cibyl_sysc 0x1798
+// 0x01050ea0: 0x1050ea0: cibyl_sysc 0x1798
 	call void [WazeWP7]Syscalls::NOPH_Throwable_printStackTrace(int32)
-// 0x01050e94: 0x1050e94: addu  v1, v0, zero
+// 0x01050ea4: 0x1050ea4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01050e98: 0x1050e98: cibyl_sysc_arg 0x10
+// 0x01050ea8: 0x1050ea8: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x01050e9c: 0x1050e9c: cibyl_sysc 0x17b7
+// 0x01050eac: 0x1050eac: cibyl_sysc 0x17b7
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01050ea0: 0x1050ea0: addu  s0, v0, zero
+// 0x01050eb0: 0x1050eb0: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01050ea4: 0x1050ea4: jal   0x1000ac0 addu  a0, zero, zero
+// 0x01050eb4: 0x1050eb4: jal   0x1000ac0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
@@ -1413,7 +1413,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_remove_input_1050eac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_remove_input_1050ebc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 lo,int32 ra)
@@ -1454,23 +1454,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050eac: 0x1050eac: lw    v0, 0(a0)
+// 0x01050ebc: 0x1050ebc: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01050eb0: 0x1050eb0: addiu sp, sp, -24
+// 0x01050ec0: 0x1050ec0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01050eb4: 0x1050eb4: addiu v1, zero, 3
+// 0x01050ec4: 0x1050ec4: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x01050eb8: 0x1050eb8: sw    ra, 20(sp)
-// 0x01050ebc: 0x1050ebc: bne   v0, v1, 0x1050ef0 sw    s0, 16(sp)
+// 0x01050ec8: 0x1050ec8: sw    ra, 20(sp)
+// 0x01050ecc: 0x1050ecc: bne   v0, v1, 0x1050f00 sw    s0, 16(sp)
 	ldloc 5
 	ldloc 6
 	ldloc 7
@@ -1481,62 +1481,62 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_1050ef0
+	bne.un L_1050f00
 // --- basic block ---
-// 0x01050ec4: 0x1050ec4: lui   v0, 0x70000
+// 0x01050ed4: 0x1050ed4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050ec8: 0x1050ec8: lw    v1, -3912(v0)
+// 0x01050ed8: 0x1050ed8: lw    v1, -3448(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -978
+	ldc.i4 -862
 	add
 	ldelem.i4
 	stloc 6
-// 0x01050ecc: 0x1050ecc: sll   zero, zero, 0
-// 0x01050ed0: 0x1050ed0: beq   v1, zero, 0x1050ee4 sll   zero, zero, 0
+// 0x01050edc: 0x1050edc: sll   zero, zero, 0
+// 0x01050ee0: 0x1050ee0: beq   v1, zero, 0x1050ef4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1050ee4
+	brfalse L_1050ef4
 // --- basic block ---
-// 0x01050ed8: 0x1050ed8: cibyl_sysc_arg 0x3
+// 0x01050ee8: 0x1050ee8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01050edc: 0x1050edc: cibyl_sysc 0x17c3
+// 0x01050eec: 0x1050eec: cibyl_sysc 0x17c3
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_stop(int32)
-// 0x01050ee0: 0x1050ee0: addu  v1, v0, zero
+// 0x01050ef0: 0x1050ef0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_1050ee4:
-// 0x01050ee4: 0x1050ee4: lui   v0, 0x70000
+L_1050ef4:
+// 0x01050ef4: 0x1050ef4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050ee8: 0x1050ee8: j	 0x1050f74 sw    zero, -2872(v0)
+// 0x01050ef8: 0x1050ef8: j	 0x1050f84 sw    zero, -2408(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -718
+	ldc.i4 -602
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1050f74
+	br L_1050f84
 // --- basic block ---
-L_1050ef0:
-// 0x01050ef0: 0x1050ef0: addiu v1, zero, 2
+L_1050f00:
+// 0x01050f00: 0x1050f00: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01050ef4: 0x1050ef4: bne   v0, v1, 0x1050f74 addiu s0, zero, 1
+// 0x01050f04: 0x1050f04: bne   v0, v1, 0x1050f84 addiu s0, zero, 1
 	ldloc 5
 	ldloc 6
 	ldc.i4.1
 	stloc 8
-	bne.un L_1050f74
+	bne.un L_1050f84
 // --- basic block ---
-// 0x01050efc: 0x1050efc: lui   v0, 0x70000
+// 0x01050f0c: 0x1050f0c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050f00: 0x1050f00: lw    a0, 8(a0)
+// 0x01050f10: 0x1050f10: lw    a0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1545,104 +1545,104 @@ L_1050ef0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01050f04: 0x1050f04: addiu v0, v0, -2800
+// 0x01050f14: 0x1050f14: addiu v0, v0, -2336
 	ldloc 5
-	ldc.i4 -2800
+	ldc.i4 -2336
 	add
 	stloc 5
-// 0x01050f08: 0x1050f08: addiu v1, zero, 16
+// 0x01050f18: 0x1050f18: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 6
-L_1050f0c:
-// 0x01050f0c: 0x1050f0c: lw    a1, 0(v0)
+L_1050f1c:
+// 0x01050f1c: 0x1050f1c: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01050f10: 0x1050f10: sll   zero, zero, 0
-// 0x01050f14: 0x1050f14: bne   a1, a0, 0x1050f68 addiu v0, v0, 56
+// 0x01050f20: 0x1050f20: sll   zero, zero, 0
+// 0x01050f24: 0x1050f24: bne   a1, a0, 0x1050f78 addiu v0, v0, 56
 	ldloc.2
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 56
 	add
 	stloc 5
-	bne.un L_1050f68
+	bne.un L_1050f78
 // --- basic block ---
-// 0x01050f1c: 0x1050f1c: jal   0x1051c80 sll   zero, zero, 0
+// 0x01050f2c: 0x1050f2c: jal   0x1051c90 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_net_remove_input_1051c80(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_net_remove_input_1051c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050f24: 0x1050f24: addiu v1, zero, 7
+// 0x01050f34: 0x1050f34: addiu v1, zero, 7
 	ldc.i4.7
 	stloc 6
-// 0x01050f28: 0x1050f28: mult  s0, v1
+// 0x01050f38: 0x1050f38: mult  s0, v1
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 9
-// 0x01050f2c: 0x1050f2c: addiu a0, zero, 56
+// 0x01050f3c: 0x1050f3c: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.1
-// 0x01050f30: 0x1050f30: lui   v0, 0x70000
+// 0x01050f40: 0x1050f40: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01050f34: 0x1050f34: addiu v0, v0, -2872
+// 0x01050f44: 0x1050f44: addiu v0, v0, -2408
 	ldloc 5
-	ldc.i4 -2872
+	ldc.i4 -2408
 	add
 	stloc 5
-// 0x01050f38: 0x1050f38: mflo  lo
+// 0x01050f48: 0x1050f48: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x01050f3c: 0x1050f3c: addiu v1, v1, 1
+// 0x01050f4c: 0x1050f4c: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01050f40: 0x1050f40: sll   v1, v1, 3
+// 0x01050f50: 0x1050f50: sll   v1, v1, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x01050f44: 0x1050f44: mult  s0, a0
+// 0x01050f54: 0x1050f54: mult  s0, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 9
-// 0x01050f48: 0x1050f48: addu  v1, v1, v0
+// 0x01050f58: 0x1050f58: addu  v1, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x01050f4c: 0x1050f4c: sw    zero, 0(v1)
+// 0x01050f5c: 0x1050f5c: sw    zero, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01050f50: 0x1050f50: addiu v1, zero, -1
+// 0x01050f60: 0x1050f60: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01050f54: 0x1050f54: mflo  lo
+// 0x01050f64: 0x1050f64: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01050f58: 0x1050f58: addu  v0, s0, v0
+// 0x01050f68: 0x1050f68: addu  v0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01050f5c: 0x1050f5c: sw    v1, 4(v0)
+// 0x01050f6c: 0x1050f6c: sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1651,29 +1651,29 @@ L_1050f0c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01050f60: 0x1050f60: j	 0x1050f74 sw    zero, 0(v0)
+// 0x01050f70: 0x1050f70: j	 0x1050f84 sw    zero, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_1050f74
+	br L_1050f84
 // --- basic block ---
-L_1050f68:
-// 0x01050f68: 0x1050f68: addiu s0, s0, 1
+L_1050f78:
+// 0x01050f78: 0x1050f78: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01050f6c: 0x1050f6c: bne   s0, v1, 0x1050f0c sll   zero, zero, 0
+// 0x01050f7c: 0x1050f7c: bne   s0, v1, 0x1050f1c sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	bne.un L_1050f0c
+	bne.un L_1050f1c
 // --- basic block ---
-L_1050f74:
-// 0x01050f74: 0x1050f74: lw    ra, 20(sp)
-// 0x01050f78: 0x1050f78: lw    s0, 16(sp)
+L_1050f84:
+// 0x01050f84: 0x1050f84: lw    ra, 20(sp)
+// 0x01050f88: 0x1050f88: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1682,7 +1682,7 @@ L_1050f74:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01050f7c: 0x1050f7c: jr    ra addiu sp, sp, 24
+// 0x01050f8c: 0x1050f8c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1694,7 +1694,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_set_input_1050f84(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_set_input_1050f94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s3,int32 s1,int32 s2,int32 lo,int32 ra)
@@ -1744,22 +1744,22 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01050f84: 0x1050f84: lw    v0, 0(a0)
+// 0x01050f94: 0x1050f94: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01050f88: 0x1050f88: addiu sp, sp, -40
+// 0x01050f98: 0x1050f98: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01050f8c: 0x1050f8c: addiu v1, zero, 3
+// 0x01050f9c: 0x1050f9c: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x01050f90: 0x1050f90: sw    s2, 28(sp)
+// 0x01050fa0: 0x1050fa0: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1768,7 +1768,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01050f94: 0x1050f94: sw    s1, 24(sp)
+// 0x01050fa4: 0x1050fa4: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1777,8 +1777,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01050f98: 0x1050f98: sw    ra, 36(sp)
-// 0x01050f9c: 0x1050f9c: sw    s3, 32(sp)
+// 0x01050fa8: 0x1050fa8: sw    ra, 36(sp)
+// 0x01050fac: 0x1050fac: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1787,7 +1787,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01050fa0: 0x1050fa0: sw    s0, 20(sp)
+// 0x01050fb0: 0x1050fb0: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1796,55 +1796,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01050fa4: 0x1050fa4: addu  s1, a0, zero
+// 0x01050fb4: 0x1050fb4: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01050fa8: 0x1050fa8: bne   v0, v1, 0x1051050 addu  s2, a1, zero
+// 0x01050fb8: 0x1050fb8: bne   v0, v1, 0x1051060 addu  s2, a1, zero
 	ldloc 5
 	ldloc 6
 	ldloc.2
 	stloc 11
-	bne.un L_1051050
+	bne.un L_1051060
 // --- basic block ---
-// 0x01050fb0: 0x1050fb0: lui   v1, 0x70000
+// 0x01050fc0: 0x1050fc0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01050fb4: 0x1050fb4: lw    v0, -3912(v1)
+// 0x01050fc4: 0x1050fc4: lw    v0, -3448(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -978
+	ldc.i4 -862
 	add
 	ldelem.i4
 	stloc 5
-// 0x01050fb8: 0x1050fb8: sll   zero, zero, 0
-// 0x01050fbc: 0x1050fbc: bne   v0, zero, 0x1051008 lui   s0, 0x70000
+// 0x01050fc8: 0x1050fc8: sll   zero, zero, 0
+// 0x01050fcc: 0x1050fcc: bne   v0, zero, 0x1051018 lui   s0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 8
-	brtrue L_1051008
+	brtrue L_1051018
 // --- basic block ---
-// 0x01050fc4: 0x1050fc4: cibyl_sysc 0x17d8
+// 0x01050fd4: 0x1050fd4: cibyl_sysc 0x17d8
 	call int32 [WazeWP7]Syscalls::NOPH_GpsManager_getInstance()
 	stloc 5
-// 0x01050fc8: 0x1050fc8: addu  s0, v0, zero
+// 0x01050fd8: 0x1050fd8: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01050fcc: 0x1050fcc: lui   a0, 0x10000
+// 0x01050fdc: 0x1050fdc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050fd0: 0x1050fd0: addiu a0, a0, 4776
+// 0x01050fe0: 0x1050fe0: addiu a0, a0, 4772
 	ldloc.1
-	ldc.i4 4776
+	ldc.i4 4772
 	add
 	stloc.1
-// 0x01050fd4: 0x1050fd4: jal   0x101cd60 sw    s0, -3912(v1)
+// 0x01050fe4: 0x1050fe4: jal   0x101cd70 sw    s0, -3448(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -978
+	ldc.i4 -862
 	add
 	ldloc 8
 	stelem.i4
@@ -1853,20 +1853,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050fdc: 0x1050fdc: lui   a0, 0x10000
+// 0x01050fec: 0x1050fec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01050fe0: 0x1050fe0: addiu a0, a0, 4792
+// 0x01050ff0: 0x1050ff0: addiu a0, a0, 4788
 	ldloc.1
-	ldc.i4 4792
+	ldc.i4 4788
 	add
 	stloc.1
-// 0x01050fe4: 0x1050fe4: jal   0x101cd60 addu  s3, v0, zero
+// 0x01050ff4: 0x1050ff4: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -1874,43 +1874,43 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01050fec: 0x1050fec: addu  v1, v0, zero
+// 0x01050ffc: 0x1050ffc: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01050ff0: 0x1050ff0: cibyl_sysc_arg 0x10
+// 0x01051000: 0x1051000: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x01050ff4: 0x1050ff4: cibyl_sysc_arg 0x13
+// 0x01051004: 0x1051004: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x01050ff8: 0x1050ff8: cibyl_sysc_arg 0x3
+// 0x01051008: 0x1051008: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01050ffc: 0x1050ffc: cibyl_sysc 0x17f4
+// 0x0105100c: 0x105100c: cibyl_sysc 0x17f4
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_setTypeMsgs(int32,int32,int32)
-// 0x01051000: 0x1051000: addu  s0, v0, zero
+// 0x01051010: 0x1051010: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01051004: 0x1051004: lui   s0, 0x70000
+// 0x01051014: 0x1051014: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-L_1051008:
-// 0x01051008: 0x1051008: addiu s3, s0, -2872
+L_1051018:
+// 0x01051018: 0x1051018: addiu s3, s0, -2408
 	ldloc 8
-	ldc.i4 -2872
+	ldc.i4 -2408
 	add
 	stloc 9
-// 0x0105100c: 0x105100c: addiu a0, s3, 8
+// 0x0105101c: 0x105101c: addiu a0, s3, 8
 	ldloc 9
 	ldc.i4.8
 	add
 	stloc.1
-// 0x01051010: 0x1051010: addu  a1, s1, zero
+// 0x01051020: 0x1051020: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x01051014: 0x1051014: jal   0x1001800 addiu a2, zero, 44
+// 0x01051024: 0x1051024: jal   0x1001800 addiu a2, zero, 44
 	ldc.i4.s 44
 	stloc.3
 	ldloc.1
@@ -1922,13 +1922,13 @@ L_1051008:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105101c: 0x105101c: addiu v1, zero, 1
+// 0x0105102c: 0x105102c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01051020: 0x1051020: lui   v0, 0x70000
+// 0x01051030: 0x1051030: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01051024: 0x1051024: sw    s2, 52(s3)
+// 0x01051034: 0x1051034: sw    s2, 52(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1937,115 +1937,115 @@ L_1051008:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01051028: 0x1051028: sw    v1, -2872(s0)
+// 0x01051038: 0x1051038: sw    v1, -2408(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -718
+	ldc.i4 -602
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105102c: 0x105102c: lw    a0, -3912(v0)
+// 0x0105103c: 0x105103c: lw    a0, -3448(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -978
+	ldc.i4 -862
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051030: 0x1051030: sll   zero, zero, 0
-// 0x01051034: 0x1051034: cibyl_sysc_arg 0x4
+// 0x01051040: 0x1051040: sll   zero, zero, 0
+// 0x01051044: 0x1051044: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051038: 0x1051038: cibyl_sysc_arg 0x3
+// 0x01051048: 0x1051048: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0105103c: 0x105103c: cibyl_sysc_arg 0x3
+// 0x0105104c: 0x105104c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051040: 0x1051040: cibyl_sysc_arg 0x3
+// 0x01051050: 0x1051050: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051044: 0x1051044: cibyl_sysc 0x1810
+// 0x01051054: 0x1051054: cibyl_sysc 0x1810
 	call void [WazeWP7]Syscalls::NOPH_GpsManager_start(int32,int32,int32,int32)
-// 0x01051048: 0x1051048: j	 0x1051120 addu  v1, v0, zero
+// 0x01051058: 0x1051058: j	 0x1051130 addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-	br L_1051120
+	br L_1051130
 // --- basic block ---
-L_1051050:
-// 0x01051050: 0x1051050: addiu v1, zero, 2
+L_1051060:
+// 0x01051060: 0x1051060: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01051054: 0x1051054: bne   v0, v1, 0x1051120 lui   v0, 0x70000
+// 0x01051064: 0x1051064: bne   v0, v1, 0x1051130 lui   v0, 0x70000
 	ldloc 5
 	ldloc 6
 	ldc.i4 458752
 	stloc 5
-	bne.un L_1051120
+	bne.un L_1051130
 // --- basic block ---
-// 0x0105105c: 0x105105c: addiu v0, v0, -2808
+// 0x0105106c: 0x105106c: addiu v0, v0, -2344
 	ldloc 5
-	ldc.i4 -2808
+	ldc.i4 -2344
 	add
 	stloc 5
-// 0x01051060: 0x1051060: addiu s0, zero, 1
+// 0x01051070: 0x1051070: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01051064: 0x1051064: addiu v1, zero, 16
+// 0x01051074: 0x1051074: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 6
-L_1051068:
-// 0x01051068: 0x1051068: lw    a0, 0(v0)
+L_1051078:
+// 0x01051078: 0x1051078: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0105106c: 0x105106c: sll   zero, zero, 0
-// 0x01051070: 0x1051070: bne   a0, zero, 0x10510e8 addiu v0, v0, 56
+// 0x0105107c: 0x105107c: sll   zero, zero, 0
+// 0x01051080: 0x1051080: bne   a0, zero, 0x10510f8 addiu v0, v0, 56
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 56
 	add
 	stloc 5
-	brtrue L_10510e8
+	brtrue L_10510f8
 // --- basic block ---
-// 0x01051078: 0x1051078: addiu a0, zero, 7
+// 0x01051088: 0x1051088: addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
-// 0x0105107c: 0x105107c: mult  s0, a0
+// 0x0105108c: 0x105108c: mult  s0, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 12
-// 0x01051080: 0x1051080: lui   s3, 0x70000
+// 0x01051090: 0x1051090: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01051084: 0x1051084: addiu s3, s3, -2872
+// 0x01051094: 0x1051094: addiu s3, s3, -2408
 	ldloc 9
-	ldc.i4 -2872
+	ldc.i4 -2408
 	add
 	stloc 9
-// 0x01051088: 0x1051088: addu  a1, s1, zero
+// 0x01051098: 0x1051098: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0105108c: 0x105108c: addiu a2, zero, 44
+// 0x0105109c: 0x105109c: addiu a2, zero, 44
 	ldc.i4.s 44
 	stloc.3
-// 0x01051090: 0x1051090: mflo  lo
+// 0x010510a0: 0x10510a0: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x01051094: 0x1051094: addiu a0, a0, 1
+// 0x010510a4: 0x10510a4: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01051098: 0x1051098: sll   a0, a0, 3
+// 0x010510a8: 0x10510a8: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0105109c: 0x105109c: jal   0x1001800 addu  a0, s3, a0
+// 0x010510ac: 0x10510ac: jal   0x1001800 addu  a0, s3, a0
 	ldloc 9
 	ldloc.1
 	add
@@ -2059,63 +2059,63 @@ L_1051068:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010510a4: 0x10510a4: addiu v0, zero, 56
+// 0x010510b4: 0x10510b4: addiu v0, zero, 56
 	ldc.i4.s 56
 	stloc 5
-// 0x010510a8: 0x10510a8: mult  s0, v0
+// 0x010510b8: 0x10510b8: mult  s0, v0
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 12
-// 0x010510ac: 0x10510ac: lui   v0, 0x70000
+// 0x010510bc: 0x10510bc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010510b0: 0x10510b0: lw    a1, -2892(v0)
+// 0x010510c0: 0x10510c0: lw    a1, -2428(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -723
+	ldc.i4 -607
 	add
 	ldelem.i4
 	stloc.2
-// 0x010510b4: 0x10510b4: sll   zero, zero, 0
-// 0x010510b8: 0x10510b8: addiu a1, a1, 1
+// 0x010510c4: 0x10510c4: sll   zero, zero, 0
+// 0x010510c8: 0x10510c8: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x010510bc: 0x10510bc: sw    a1, -2892(v0)
+// 0x010510cc: 0x10510cc: sw    a1, -2428(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -723
+	ldc.i4 -607
 	add
 	ldloc.2
 	stelem.i4
-// 0x010510c0: 0x10510c0: mflo  lo
+// 0x010510d0: 0x10510d0: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x010510c4: 0x10510c4: addu  s3, s3, v0
+// 0x010510d4: 0x10510d4: addu  s3, s3, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x010510c8: 0x10510c8: addiu v0, zero, 1
+// 0x010510d8: 0x10510d8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010510cc: 0x10510cc: sw    v0, 0(s3)
+// 0x010510dc: 0x10510dc: sw    v0, 0(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010510d0: 0x10510d0: addiu v0, zero, 16
+// 0x010510e0: 0x10510e0: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010510d4: 0x10510d4: sw    s2, 52(s3)
+// 0x010510e4: 0x10510e4: sw    s2, 52(s3)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -2124,7 +2124,7 @@ L_1051068:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010510d8: 0x10510d8: bne   s0, v0, 0x1051114 sw    a1, 4(s3)
+// 0x010510e8: 0x10510e8: bne   s0, v0, 0x1051124 sw    a1, 4(s3)
 	ldloc 8
 	ldloc 5
 	ldloc 7
@@ -2135,44 +2135,44 @@ L_1051068:
 	add
 	ldloc.2
 	stelem.i4
-	bne.un L_1051114
+	bne.un L_1051124
 // --- basic block ---
-// 0x010510e0: 0x10510e0: j	 0x10510f4 lui   a1, 0x10000
+// 0x010510f0: 0x10510f0: j	 0x1051104 lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-	br L_10510f4
+	br L_1051104
 // --- basic block ---
-L_10510e8:
-// 0x010510e8: 0x10510e8: addiu s0, s0, 1
+L_10510f8:
+// 0x010510f8: 0x10510f8: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x010510ec: 0x10510ec: bne   s0, v1, 0x1051068 lui   a1, 0x10000
+// 0x010510fc: 0x10510fc: bne   s0, v1, 0x1051078 lui   a1, 0x10000
 	ldloc 8
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1051068
+	bne.un L_1051078
 // --- basic block ---
-L_10510f4:
-// 0x010510f4: 0x10510f4: lui   a3, 0x10000
+L_1051104:
+// 0x01051104: 0x1051104: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010510f8: 0x10510f8: addiu a1, a1, 3972
+// 0x01051108: 0x1051108: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x010510fc: 0x10510fc: addiu a3, a3, 4808
+// 0x0105110c: 0x105110c: addiu a3, a3, 4804
 	ldloc 4
-	ldc.i4 4808
+	ldc.i4 4804
 	add
 	stloc 4
-// 0x01051100: 0x1051100: addiu a0, zero, 5
+// 0x01051110: 0x1051110: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01051104: 0x1051104: jal   0x100449c addiu a2, zero, 760
+// 0x01051114: 0x1051114: jal   0x100449c addiu a2, zero, 760
 	ldc.i4 760
 	stloc.3
 	ldloc.0
@@ -2185,11 +2185,11 @@ L_10510f4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105110c: 0x105110c: j	 0x1051120 sll   zero, zero, 0
-	br L_1051120
+// 0x0105111c: 0x105111c: j	 0x1051130 sll   zero, zero, 0
+	br L_1051130
 // --- basic block ---
-L_1051114:
-// 0x01051114: 0x1051114: lw    a0, 8(s1)
+L_1051124:
+// 0x01051124: 0x1051124: lw    a0, 8(s1)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -2198,20 +2198,20 @@ L_1051114:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051118: 0x1051118: jal   0x1051d00 sll   zero, zero, 0
+// 0x01051128: 0x1051128: jal   0x1051d10 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_net_set_input_1051d00(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_net_set_input_1051d10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1051120:
-// 0x01051120: 0x1051120: lw    ra, 36(sp)
-// 0x01051124: 0x1051124: lw    s3, 32(sp)
+L_1051130:
+// 0x01051130: 0x1051130: lw    ra, 36(sp)
+// 0x01051134: 0x1051134: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2220,7 +2220,7 @@ L_1051120:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01051128: 0x1051128: lw    s2, 28(sp)
+// 0x01051138: 0x1051138: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2229,7 +2229,7 @@ L_1051120:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105112c: 0x105112c: lw    s1, 24(sp)
+// 0x0105113c: 0x105113c: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2238,7 +2238,7 @@ L_1051120:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01051130: 0x1051130: lw    s0, 20(sp)
+// 0x01051140: 0x1051140: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2247,7 +2247,7 @@ L_1051120:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01051134: 0x1051134: jr    ra addiu sp, sp, 40
+// 0x01051144: 0x1051144: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2259,7 +2259,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 menu_wrapper_105113c(int32,int32,int32,int32,int32)
+.method public static int32 menu_wrapper_105114c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 ra,int32 v0,int32[] mem)
@@ -2294,28 +2294,28 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105113c: 0x105113c: addiu sp, sp, -24
+// 0x0105114c: 0x105114c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01051140: 0x1051140: sw    ra, 20(sp)
-// 0x01051144: 0x1051144: addu  v1, zero, zero
+// 0x01051150: 0x1051150: sw    ra, 20(sp)
+// 0x01051154: 0x1051154: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01051148: 0x1051148: cibyl_sysc_arg 0x4
+// 0x01051158: 0x1051158: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0105114c: 0x105114c: cibyl_sysc_arg 0x3
+// 0x0105115c: 0x105115c: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051150: 0x1051150: cibyl_sysc_arg 0x3
+// 0x01051160: 0x1051160: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051154: 0x1051154: cibyl_sysc_arg 0x3
+// 0x01051164: 0x1051164: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051158: 0x1051158: cibyl_sysc_arg 0x3
+// 0x01051168: 0x1051168: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x0105115c: 0x105115c: cibyl_sysc 0x1826
+// 0x0105116c: 0x105116c: cibyl_sysc 0x1826
 	call void [WazeWP7]Syscalls::NOPH_UIWorker_addCallback(int32,int32,int32,int32,int32)
-// 0x01051160: 0x1051160: jal   0x1021900 addu  v1, v0, zero
+// 0x01051170: 0x1051170: jal   0x1021910 addu  v1, v0, zero
 	ldloc 7
 	stloc 5
 	ldloc.0
@@ -2323,14 +2323,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01051168: 0x1051168: lw    ra, 20(sp)
-// 0x0105116c: 0x105116c: sll   zero, zero, 0
-// 0x01051170: 0x1051170: jr    ra addiu sp, sp, 24
+// 0x01051178: 0x1051178: lw    ra, 20(sp)
+// 0x0105117c: 0x105117c: sll   zero, zero, 0
+// 0x01051180: 0x1051180: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2342,7 +2342,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_main_on_battery_stat_changed_1051178(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_on_battery_stat_changed_1051188(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2377,34 +2377,34 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051178: 0x1051178: lui   v0, 0x70000
+// 0x01051188: 0x1051188: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105117c: 0x105117c: lw    v1, -2884(v0)
+// 0x0105118c: 0x105118c: lw    v1, -2420(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -721
+	ldc.i4 -605
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051180: 0x1051180: addiu sp, sp, -24
+// 0x01051190: 0x1051190: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01051184: 0x1051184: beq   v1, a0, 0x1051194 sw    ra, 20(sp)
+// 0x01051194: 0x1051194: beq   v1, a0, 0x10511a4 sw    ra, 20(sp)
 	ldloc 7
 	ldloc.1
-	beq  L_1051194
+	beq  L_10511a4
 // --- basic block ---
-// 0x0105118c: 0x105118c: jal   0x1021900 sw    a0, -2884(v0)
+// 0x0105119c: 0x105119c: jal   0x1021910 sw    a0, -2420(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -721
+	ldc.i4 -605
 	add
 	ldloc.1
 	stelem.i4
@@ -2413,15 +2413,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1051194:
-// 0x01051194: 0x1051194: lw    ra, 20(sp)
-// 0x01051198: 0x1051198: sll   zero, zero, 0
-// 0x0105119c: 0x105119c: jr    ra addiu sp, sp, 24
+L_10511a4:
+// 0x010511a4: 0x10511a4: lw    ra, 20(sp)
+// 0x010511a8: 0x10511a8: sll   zero, zero, 0
+// 0x010511ac: 0x10511ac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2433,7 +2433,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rim_on_menu_button_10511a4(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_menu_button_10511b4(int32,int32,int32,int32,int32)
 {
 .maxstack 9
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 ra,int32 lo)
@@ -2489,21 +2489,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010511a4: 0x10511a4: lui   a0, 0x10000
+// 0x010511b4: 0x10511b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010511a8: 0x10511a8: addiu sp, sp, -48
+// 0x010511b8: 0x10511b8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010511ac: 0x10511ac: addiu a0, a0, -25488
+// 0x010511bc: 0x10511bc: addiu a0, a0, -25488
 	ldloc.1
 	ldc.i4 -25488
 	add
 	stloc.1
-// 0x010511b0: 0x10511b0: sw    ra, 44(sp)
-// 0x010511b4: 0x10511b4: sw    s4, 36(sp)
+// 0x010511c0: 0x10511c0: sw    ra, 44(sp)
+// 0x010511c4: 0x10511c4: sw    s4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2512,7 +2512,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010511b8: 0x10511b8: sw    s2, 28(sp)
+// 0x010511c8: 0x10511c8: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2521,7 +2521,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010511bc: 0x10511bc: sw    s1, 24(sp)
+// 0x010511cc: 0x10511cc: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2530,7 +2530,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010511c0: 0x10511c0: sw    s5, 40(sp)
+// 0x010511d0: 0x10511d0: sw    s5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2539,7 +2539,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010511c4: 0x10511c4: sw    s3, 32(sp)
+// 0x010511d4: 0x10511d4: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2548,7 +2548,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010511c8: 0x10511c8: jal   0x102c720 sw    s0, 20(sp)
+// 0x010511d8: 0x10511d8: jal   0x102c730 sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2562,20 +2562,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010511d0: 0x10511d0: lui   a0, 0x10000
+// 0x010511e0: 0x10511e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010511d4: 0x10511d4: addiu a0, a0, -25472
+// 0x010511e4: 0x10511e4: addiu a0, a0, -25472
 	ldloc.1
 	ldc.i4 -25472
 	add
 	stloc.1
-// 0x010511d8: 0x10511d8: jal   0x102c720 addu  s4, v0, zero
+// 0x010511e8: 0x10511e8: jal   0x102c730 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2583,18 +2583,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010511e0: 0x10511e0: jal   0x1056874 addu  s2, v0, zero
+// 0x010511f0: 0x10511f0: jal   0x1056884 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-	call int32 Cibyl64::navigate_main_state_1056874()
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x010511e8: 0x10511e8: lw    a0, 4(s4)
+// 0x010511f8: 0x10511f8: lw    a0, 4(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -2603,22 +2603,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010511ec: 0x10511ec: bne   v0, zero, 0x10512b0 lui   s1, 0x70000
+// 0x010511fc: 0x10511fc: bne   v0, zero, 0x10512c0 lui   s1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 9
-	brtrue L_10512b0
+	brtrue L_10512c0
 // --- basic block ---
-// 0x010511f4: 0x10511f4: lw    s5, -1688(s1)
+// 0x01051204: 0x1051204: lw    s5, -1224(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 13
-// 0x010511f8: 0x10511f8: jal   0x101cd60 lui   s3, 0x1050000
+// 0x01051208: 0x1051208: jal   0x101cd70 lui   s3, 0x1050000
 	ldc.i4 17104896
 	stloc 10
 	ldloc.0
@@ -2626,15 +2626,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051200: 0x1051200: addu  v1, v0, zero
+// 0x01051210: 0x1051210: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01051204: 0x1051204: lw    a0, 20(s4)
+// 0x01051214: 0x1051214: lw    a0, 20(s4)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -2643,34 +2643,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051208: 0x1051208: addiu s3, s3, 4412
+// 0x01051218: 0x1051218: addiu s3, s3, 4428
 	ldloc 10
-	ldc.i4 4412
+	ldc.i4 4428
 	add
 	stloc 10
-// 0x0105120c: 0x105120c: addiu s0, zero, 1
+// 0x0105121c: 0x105121c: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01051210: 0x1051210: cibyl_sysc_arg 0x15
+// 0x01051220: 0x1051220: cibyl_sysc_arg 0x15
 	ldloc 13
-// 0x01051214: 0x1051214: cibyl_sysc_arg 0x3
+// 0x01051224: 0x1051224: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051218: 0x1051218: cibyl_sysc_arg 0x10
+// 0x01051228: 0x1051228: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0105121c: 0x105121c: cibyl_sysc_arg 0x10
+// 0x0105122c: 0x105122c: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x01051220: 0x1051220: cibyl_sysc_arg 0x13
+// 0x01051230: 0x1051230: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x01051224: 0x1051224: cibyl_sysc_arg 0x4
+// 0x01051234: 0x1051234: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051228: 0x1051228: cibyl_sysc_arg 0x10
+// 0x01051238: 0x1051238: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0105122c: 0x105122c: cibyl_sysc 0x1840
+// 0x0105123c: 0x105123c: cibyl_sysc 0x1840
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_addMenuItem(int32,int32,int32,int32,int32,int32,int32)
-// 0x01051230: 0x1051230: addu  s5, v0, zero
+// 0x01051240: 0x1051240: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x01051234: 0x1051234: lw    a0, 4(s2)
+// 0x01051244: 0x1051244: lw    a0, 4(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -2679,30 +2679,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051238: 0x1051238: lw    s1, -1688(s1)
+// 0x01051248: 0x1051248: lw    s1, -1224(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105123c: 0x105123c: jal   0x101cd60 sll   zero, zero, 0
+// 0x0105124c: 0x105124c: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051244: 0x1051244: addu  v1, v0, zero
+// 0x01051254: 0x1051254: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01051248: 0x1051248: lw    a0, 20(s2)
+// 0x01051258: 0x1051258: lw    a0, 20(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -2711,36 +2711,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105124c: 0x105124c: sll   zero, zero, 0
-// 0x01051250: 0x1051250: cibyl_sysc_arg 0x11
+// 0x0105125c: 0x105125c: sll   zero, zero, 0
+// 0x01051260: 0x1051260: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01051254: 0x1051254: cibyl_sysc_arg 0x3
+// 0x01051264: 0x1051264: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051258: 0x1051258: cibyl_sysc_arg 0x10
+// 0x01051268: 0x1051268: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0105125c: 0x105125c: cibyl_sysc_arg 0x10
+// 0x0105126c: 0x105126c: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x01051260: 0x1051260: cibyl_sysc_arg 0x13
+// 0x01051270: 0x1051270: cibyl_sysc_arg 0x13
 	ldloc 10
-// 0x01051264: 0x1051264: cibyl_sysc_arg 0x4
+// 0x01051274: 0x1051274: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051268: 0x1051268: cibyl_sysc_arg 0x10
+// 0x01051278: 0x1051278: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0105126c: 0x105126c: cibyl_sysc 0x1863
+// 0x0105127c: 0x105127c: cibyl_sysc 0x1863
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_addMenuItem(int32,int32,int32,int32,int32,int32,int32)
-// 0x01051270: 0x1051270: addu  s0, v0, zero
+// 0x01051280: 0x1051280: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01051274: 0x1051274: lui   v0, 0x70000
+// 0x01051284: 0x1051284: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1051278:
-// 0x01051278: 0x1051278: addiu v0, v0, -684
+L_1051288:
+// 0x01051288: 0x1051288: addiu v0, v0, -220
 	ldloc 5
-	ldc.i4 -684
+	ldc.i4 -220
 	add
 	stloc 5
-// 0x0105127c: 0x105127c: lw    a0, 16(v0)
+// 0x0105128c: 0x105128c: lw    a0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2749,14 +2749,14 @@ L_1051278:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051280: 0x1051280: sll   zero, zero, 0
-// 0x01051284: 0x1051284: beq   a0, zero, 0x10512fc addu  v1, zero, zero
+// 0x01051290: 0x1051290: sll   zero, zero, 0
+// 0x01051294: 0x1051294: beq   a0, zero, 0x105130c addu  v1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10512fc
+	brfalse L_105130c
 // --- basic block ---
-// 0x0105128c: 0x105128c: lw    a0, 28(v0)
+// 0x0105129c: 0x105129c: lw    a0, 28(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2765,14 +2765,14 @@ L_1051278:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051290: 0x1051290: sll   zero, zero, 0
-// 0x01051294: 0x1051294: beq   a0, zero, 0x10512fc addiu v1, zero, 1
+// 0x010512a0: 0x10512a0: sll   zero, zero, 0
+// 0x010512a4: 0x10512a4: beq   a0, zero, 0x105130c addiu v1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 6
-	brfalse L_10512fc
+	brfalse L_105130c
 // --- basic block ---
-// 0x0105129c: 0x105129c: lw    v1, 40(v0)
+// 0x010512ac: 0x10512ac: lw    v1, 40(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2781,55 +2781,55 @@ L_1051278:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010512a0: 0x10512a0: addiu v0, zero, 3
+// 0x010512b0: 0x10512b0: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010512a4: 0x10512a4: sltiu v1, v1, 1
+// 0x010512b4: 0x10512b4: sltiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x010512a8: 0x10512a8: j	 0x10512fc subu  v1, v0, v1
+// 0x010512b8: 0x10512b8: j	 0x105130c subu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	sub
 	stloc 6
-	br L_10512fc
+	br L_105130c
 // --- basic block ---
-L_10512b0:
-// 0x010512b0: 0x10512b0: lw    s0, -1688(s1)
+L_10512c0:
+// 0x010512c0: 0x10512c0: lw    s0, -1224(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 8
-// 0x010512b4: 0x10512b4: jal   0x101cd60 sll   zero, zero, 0
+// 0x010512c4: 0x10512c4: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010512bc: 0x10512bc: addu  v1, v0, zero
+// 0x010512cc: 0x10512cc: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010512c0: 0x10512c0: cibyl_sysc_arg 0x10
+// 0x010512d0: 0x10512d0: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010512c4: 0x10512c4: cibyl_sysc_arg 0x3
+// 0x010512d4: 0x10512d4: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010512c8: 0x10512c8: cibyl_sysc 0x1886
+// 0x010512d8: 0x10512d8: cibyl_sysc 0x1886
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_removeMenuItemByLabel(int32,int32)
-// 0x010512cc: 0x10512cc: addu  s0, v0, zero
+// 0x010512dc: 0x10512dc: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010512d0: 0x10512d0: lw    a0, 4(s2)
+// 0x010512e0: 0x10512e0: lw    a0, 4(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -2838,69 +2838,69 @@ L_10512b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010512d4: 0x10512d4: lw    s0, -1688(s1)
+// 0x010512e4: 0x10512e4: lw    s0, -1224(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 8
-// 0x010512d8: 0x10512d8: jal   0x101cd60 sll   zero, zero, 0
+// 0x010512e8: 0x10512e8: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010512e0: 0x10512e0: addu  v1, v0, zero
+// 0x010512f0: 0x10512f0: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010512e4: 0x10512e4: cibyl_sysc_arg 0x10
+// 0x010512f4: 0x10512f4: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010512e8: 0x10512e8: cibyl_sysc_arg 0x3
+// 0x010512f8: 0x10512f8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010512ec: 0x10512ec: cibyl_sysc 0x18b3
+// 0x010512fc: 0x10512fc: cibyl_sysc 0x18b3
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_removeMenuItemByLabel(int32,int32)
-// 0x010512f0: 0x10512f0: addu  s0, v0, zero
+// 0x01051300: 0x1051300: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010512f4: 0x10512f4: j	 0x1051278 lui   v0, 0x70000
+// 0x01051304: 0x1051304: j	 0x1051288 lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-	br L_1051278
+	br L_1051288
 // --- basic block ---
-L_10512fc:
-// 0x010512fc: 0x10512fc: addiu v0, zero, 12
+L_105130c:
+// 0x0105130c: 0x105130c: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x01051300: 0x1051300: mult  v1, v0
+// 0x01051310: 0x1051310: mult  v1, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 15
-// 0x01051304: 0x1051304: lui   v0, 0x70000
+// 0x01051314: 0x1051314: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01051308: 0x1051308: addiu v0, v0, -684
+// 0x01051318: 0x1051318: addiu v0, v0, -220
 	ldloc 5
-	ldc.i4 -684
+	ldc.i4 -220
 	add
 	stloc 5
-// 0x0105130c: 0x105130c: mflo  lo
+// 0x0105131c: 0x105131c: mflo  lo
 	ldloc 15
 	stloc 6
-// 0x01051310: 0x1051310: addu  v1, v0, v1
+// 0x01051320: 0x1051320: addu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01051314: 0x1051314: lw    v0, 4(v1)
+// 0x01051324: 0x1051324: lw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2909,51 +2909,51 @@ L_10512fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051318: 0x1051318: sll   zero, zero, 0
-// 0x0105131c: 0x105131c: beq   v0, zero, 0x1051360 lui   v0, 0x70000
+// 0x01051328: 0x1051328: sll   zero, zero, 0
+// 0x0105132c: 0x105132c: beq   v0, zero, 0x1051370 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1051360
+	brfalse L_1051370
 // --- basic block ---
-// 0x01051324: 0x1051324: lw    v0, -2888(v0)
+// 0x01051334: 0x1051334: lw    v0, -2424(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -722
+	ldc.i4 -606
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051328: 0x1051328: sll   zero, zero, 0
-// 0x0105132c: 0x105132c: beq   v0, zero, 0x1051360 lui   v0, 0x70000
+// 0x01051338: 0x1051338: sll   zero, zero, 0
+// 0x0105133c: 0x105133c: beq   v0, zero, 0x1051370 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1051360
+	brfalse L_1051370
 // --- basic block ---
-// 0x01051334: 0x1051334: lw    a0, -1688(v0)
+// 0x01051344: 0x1051344: lw    a0, -1224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051338: 0x1051338: addu  a1, zero, zero
+// 0x01051348: 0x1051348: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105133c: 0x105133c: cibyl_sysc_arg 0x4
+// 0x0105134c: 0x105134c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051340: 0x1051340: cibyl_sysc_arg 0x5
+// 0x01051350: 0x1051350: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01051344: 0x1051344: cibyl_sysc 0x18e0
+// 0x01051354: 0x1051354: cibyl_sysc 0x18e0
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_resetContextMenu(int32,int32)
-// 0x01051348: 0x1051348: addu  a0, v0, zero
+// 0x01051358: 0x1051358: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105134c: 0x105134c: lw    v0, 4(v1)
+// 0x0105135c: 0x105135c: lw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2962,23 +2962,23 @@ L_10512fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051350: 0x1051350: lw    a0, 0(v1)
+// 0x01051360: 0x1051360: lw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01051354: 0x1051354: lui   v1, 0x70000
+// 0x01051364: 0x1051364: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01051358: 0x1051358: jalr  v0 sw    v0, -3908(v1)
+// 0x01051368: 0x1051368: jalr  v0 sw    v0, -3444(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -977
+	ldc.i4 -861
 	add
 	ldloc 5
 	stelem.i4
@@ -2992,9 +2992,9 @@ L_10512fc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1051360:
-// 0x01051360: 0x1051360: lw    ra, 44(sp)
-// 0x01051364: 0x1051364: lw    s5, 40(sp)
+L_1051370:
+// 0x01051370: 0x1051370: lw    ra, 44(sp)
+// 0x01051374: 0x1051374: lw    s5, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3003,7 +3003,7 @@ L_1051360:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01051368: 0x1051368: lw    s4, 36(sp)
+// 0x01051378: 0x1051378: lw    s4, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3012,7 +3012,7 @@ L_1051360:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105136c: 0x105136c: lw    s3, 32(sp)
+// 0x0105137c: 0x105137c: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3021,7 +3021,7 @@ L_1051360:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01051370: 0x1051370: lw    s2, 28(sp)
+// 0x01051380: 0x1051380: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3030,7 +3030,7 @@ L_1051360:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01051374: 0x1051374: lw    s1, 24(sp)
+// 0x01051384: 0x1051384: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3039,7 +3039,7 @@ L_1051360:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01051378: 0x1051378: lw    s0, 20(sp)
+// 0x01051388: 0x1051388: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3048,7 +3048,7 @@ L_1051360:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105137c: 0x105137c: jr    ra addiu sp, sp, 48
+// 0x0105138c: 0x105138c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3060,7 +3060,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 rim_on_navigation_click_1051384(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_navigation_click_1051394(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3095,30 +3095,30 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051384: 0x1051384: addiu sp, sp, -32
+// 0x01051394: 0x1051394: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01051388: 0x1051388: addiu v0, zero, 13
+// 0x01051398: 0x1051398: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x0105138c: 0x105138c: addiu a0, sp, 16
+// 0x0105139c: 0x105139c: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01051390: 0x1051390: addiu a1, zero, 2
+// 0x010513a0: 0x10513a0: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x01051394: 0x1051394: sw    ra, 28(sp)
-// 0x01051398: 0x1051398: sb    v0, 16(sp)
+// 0x010513a4: 0x10513a4: sw    ra, 28(sp)
+// 0x010513a8: 0x10513a8: sb    v0, 16(sp)
 	ldloc.0
 	ldc.i4.s 16
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105139c: 0x105139c: jal   0x10388b4 sb    zero, 17(sp)
+// 0x010513ac: 0x10513ac: jal   0x10388c4 sb    zero, 17(sp)
 	ldloc.0
 	ldc.i4.s 17
 	add
@@ -3129,52 +3129,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl41::roadmap_keyboard_handler__key_pressed_10388b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl41::roadmap_keyboard_handler__key_pressed_10388c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010513a4: 0x10513a4: bne   v0, zero, 0x10513cc sll   zero, zero, 0
+// 0x010513b4: 0x10513b4: bne   v0, zero, 0x10513dc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10513cc
+	brtrue L_10513dc
 // --- basic block ---
-// 0x010513ac: 0x10513ac: jal   0x10511a4 sll   zero, zero, 0
+// 0x010513bc: 0x10513bc: jal   0x10511b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::rim_on_menu_button_10511a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::rim_on_menu_button_10511b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010513b4: 0x10513b4: lui   v0, 0x70000
+// 0x010513c4: 0x10513c4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010513b8: 0x10513b8: lw    v1, -1688(v0)
+// 0x010513c8: 0x10513c8: lw    v1, -1224(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 6
-// 0x010513bc: 0x10513bc: sll   zero, zero, 0
-// 0x010513c0: 0x10513c0: cibyl_sysc_arg 0x3
+// 0x010513cc: 0x10513cc: sll   zero, zero, 0
+// 0x010513d0: 0x10513d0: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010513c4: 0x10513c4: cibyl_sysc 0x1908
+// 0x010513d4: 0x10513d4: cibyl_sysc 0x1908
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_showMiniMenu(int32)
-// 0x010513c8: 0x10513c8: addu  v1, v0, zero
+// 0x010513d8: 0x10513d8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_10513cc:
-// 0x010513cc: 0x10513cc: lw    ra, 28(sp)
-// 0x010513d0: 0x10513d0: addiu v0, zero, 1
+L_10513dc:
+// 0x010513dc: 0x10513dc: lw    ra, 28(sp)
+// 0x010513e0: 0x10513e0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010513d4: 0x10513d4: jr    ra addiu sp, sp, 32
+// 0x010513e4: 0x10513e4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3186,7 +3186,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_menu_button_unregister_10513dc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_menu_button_unregister_10513ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 s0,int32 s2,int32 s3,int32 v1,int32 lo,int32 ra)
@@ -3236,12 +3236,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010513dc: 0x10513dc: addiu sp, sp, -40
+// 0x010513ec: 0x10513ec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010513e0: 0x10513e0: sw    s1, 24(sp)
+// 0x010513f0: 0x10513f0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3250,10 +3250,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010513e4: 0x10513e4: lui   s1, 0x70000
+// 0x010513f4: 0x10513f4: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010513e8: 0x10513e8: sw    s3, 32(sp)
+// 0x010513f8: 0x10513f8: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3262,7 +3262,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010513ec: 0x10513ec: sw    s2, 28(sp)
+// 0x010513fc: 0x10513fc: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3271,7 +3271,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010513f0: 0x10513f0: sw    s0, 20(sp)
+// 0x01051400: 0x1051400: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3280,37 +3280,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010513f4: 0x10513f4: sw    ra, 36(sp)
-// 0x010513f8: 0x10513f8: addu  s3, a0, zero
+// 0x01051404: 0x1051404: sw    ra, 36(sp)
+// 0x01051408: 0x1051408: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010513fc: 0x10513fc: addiu s1, s1, -680
+// 0x0105140c: 0x105140c: addiu s1, s1, -216
 	ldloc 6
-	ldc.i4 -680
+	ldc.i4 -216
 	add
 	stloc 6
-// 0x01051400: 0x1051400: addu  s0, zero, zero
+// 0x01051410: 0x1051410: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01051404: 0x1051404: addiu s2, zero, 4
+// 0x01051414: 0x1051414: addiu s2, zero, 4
 	ldc.i4.4
 	stloc 9
-L_1051408:
-// 0x01051408: 0x1051408: lw    v0, 0(s1)
+L_1051418:
+// 0x01051418: 0x1051418: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105140c: 0x105140c: sll   zero, zero, 0
-// 0x01051410: 0x1051410: beq   v0, zero, 0x10514c4 addu  a1, s3, zero
+// 0x0105141c: 0x105141c: sll   zero, zero, 0
+// 0x01051420: 0x1051420: beq   v0, zero, 0x10514d4 addu  a1, s3, zero
 	ldloc 7
 	ldloc 10
 	stloc.2
-	brfalse L_10514c4
+	brfalse L_10514d4
 // --- basic block ---
-// 0x01051418: 0x1051418: lw    a0, 4(s1)
+// 0x01051428: 0x1051428: lw    a0, 4(s1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3319,7 +3319,7 @@ L_1051408:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105141c: 0x105141c: jal   0x1001b14 addiu s1, s1, 12
+// 0x0105142c: 0x105142c: jal   0x1001b14 addiu s1, s1, 12
 	ldloc 6
 	ldc.i4.s 12
 	add
@@ -3329,56 +3329,56 @@ L_1051408:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x01051424: 0x1051424: beq   v0, zero, 0x1051474 addiu a0, zero, 2
+// 0x01051434: 0x1051434: beq   v0, zero, 0x1051484 addiu a0, zero, 2
 	ldloc 7
 	ldc.i4.2
 	stloc.1
-	brfalse L_1051474
+	brfalse L_1051484
 // --- basic block ---
-// 0x0105142c: 0x105142c: addiu s0, s0, 1
+// 0x0105143c: 0x105143c: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01051430: 0x1051430: bne   s0, s2, 0x1051408 sll   zero, zero, 0
+// 0x01051440: 0x1051440: bne   s0, s2, 0x1051418 sll   zero, zero, 0
 	ldloc 8
 	ldloc 9
-	bne.un L_1051408
+	bne.un L_1051418
 // --- basic block ---
-// 0x01051438: 0x1051438: j	 0x10514c4 sll   zero, zero, 0
-	br L_10514c4
+// 0x01051448: 0x1051448: j	 0x10514d4 sll   zero, zero, 0
+	br L_10514d4
 // --- basic block ---
-L_1051440:
-// 0x01051440: 0x1051440: mult  a1, s3
+L_1051450:
+// 0x01051450: 0x1051450: mult  a1, s3
 	ldloc.2
 	ldloc 10
 	mul
 	stloc 12
-// 0x01051444: 0x1051444: addiu v0, zero, 3
+// 0x01051454: 0x1051454: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x01051448: 0x1051448: subu  s0, v0, s0
+// 0x01051458: 0x1051458: subu  s0, v0, s0
 	ldloc 7
 	ldloc 8
 	sub
 	stloc 8
-// 0x0105144c: 0x105144c: addu  a0, s2, zero
+// 0x0105145c: 0x105145c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01051450: 0x1051450: mflo  lo
+// 0x01051460: 0x1051460: mflo  lo
 	ldloc 12
 	stloc.2
-// 0x01051454: 0x1051454: sll   zero, zero, 0
-// 0x01051458: 0x1051458: sll   zero, zero, 0
-// 0x0105145c: 0x105145c: mult  s0, s3
+// 0x01051464: 0x1051464: sll   zero, zero, 0
+// 0x01051468: 0x1051468: sll   zero, zero, 0
+// 0x0105146c: 0x105146c: mult  s0, s3
 	ldloc 8
 	ldloc 10
 	mul
 	stloc 12
-// 0x01051460: 0x1051460: mflo  lo
+// 0x01051470: 0x1051470: mflo  lo
 	ldloc 12
 	stloc.3
-// 0x01051464: 0x1051464: jal   0x100186c addu  a1, s1, a1
+// 0x01051474: 0x1051474: jal   0x100186c addu  a1, s1, a1
 	ldloc 6
 	ldloc.2
 	add
@@ -3392,57 +3392,57 @@ L_1051440:
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x0105146c: 0x105146c: j	 0x10514c4 sll   zero, zero, 0
-	br L_10514c4
+// 0x0105147c: 0x105147c: j	 0x10514d4 sll   zero, zero, 0
+	br L_10514d4
 // --- basic block ---
-L_1051474:
-// 0x01051474: 0x1051474: lui   v0, 0x70000
+L_1051484:
+// 0x01051484: 0x1051484: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01051478: 0x1051478: lw    v1, -1688(v0)
+// 0x01051488: 0x1051488: lw    v1, -1224(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -422
+	ldc.i4 -306
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105147c: 0x105147c: sll   zero, zero, 0
-// 0x01051480: 0x1051480: cibyl_sysc_arg 0x3
+// 0x0105148c: 0x105148c: sll   zero, zero, 0
+// 0x01051490: 0x1051490: cibyl_sysc_arg 0x3
 	ldloc 11
-// 0x01051484: 0x1051484: cibyl_sysc_arg 0x4
+// 0x01051494: 0x1051494: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051488: 0x1051488: cibyl_sysc 0x192c
+// 0x01051498: 0x1051498: cibyl_sysc 0x192c
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_resetContextMenu(int32,int32)
-// 0x0105148c: 0x105148c: addu  v1, v0, zero
+// 0x0105149c: 0x105149c: addu  v1, v0, zero
 	ldloc 7
 	stloc 11
-// 0x01051490: 0x1051490: addiu s3, zero, 12
+// 0x010514a0: 0x10514a0: addiu s3, zero, 12
 	ldc.i4.s 12
 	stloc 10
-// 0x01051494: 0x1051494: mult  s0, s3
+// 0x010514a4: 0x10514a4: mult  s0, s3
 	ldloc 8
 	ldloc 10
 	mul
 	stloc 12
-// 0x01051498: 0x1051498: lui   s1, 0x70000
+// 0x010514a8: 0x10514a8: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105149c: 0x105149c: addiu s1, s1, -684
+// 0x010514ac: 0x10514ac: addiu s1, s1, -220
 	ldloc 6
-	ldc.i4 -684
+	ldc.i4 -220
 	add
 	stloc 6
-// 0x010514a0: 0x10514a0: mflo  lo
+// 0x010514b0: 0x10514b0: mflo  lo
 	ldloc 12
 	stloc 9
-// 0x010514a4: 0x10514a4: addu  s2, s1, s2
+// 0x010514b4: 0x10514b4: addu  s2, s1, s2
 	ldloc 6
 	ldloc 9
 	add
 	stloc 9
-// 0x010514a8: 0x10514a8: lw    a0, 8(s2)
+// 0x010514b8: 0x10514b8: lw    a0, 8(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3451,7 +3451,7 @@ L_1051474:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010514ac: 0x10514ac: sw    zero, 4(s2)
+// 0x010514bc: 0x10514bc: sw    zero, 4(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3460,7 +3460,7 @@ L_1051474:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010514b0: 0x10514b0: jal   0x1000930 sw    zero, 0(s2)
+// 0x010514c0: 0x10514c0: jal   0x1000930 sw    zero, 0(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3477,22 +3477,22 @@ L_1051474:
 	stloc 11
 	stloc 7
 // --- basic block ---
-// 0x010514b8: 0x10514b8: slti  v0, s0, 3
+// 0x010514c8: 0x10514c8: slti  v0, s0, 3
 	ldloc 8
 	ldc.i4.3
 	clt
 	stloc 7
-// 0x010514bc: 0x10514bc: bne   v0, zero, 0x1051440 addiu a1, s0, 1
+// 0x010514cc: 0x10514cc: bne   v0, zero, 0x1051450 addiu a1, s0, 1
 	ldloc 7
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc.2
-	brtrue L_1051440
+	brtrue L_1051450
 // --- basic block ---
-L_10514c4:
-// 0x010514c4: 0x10514c4: lw    ra, 36(sp)
-// 0x010514c8: 0x10514c8: lw    s3, 32(sp)
+L_10514d4:
+// 0x010514d4: 0x10514d4: lw    ra, 36(sp)
+// 0x010514d8: 0x10514d8: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3501,7 +3501,7 @@ L_10514c4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010514cc: 0x10514cc: lw    s2, 28(sp)
+// 0x010514dc: 0x10514dc: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3510,7 +3510,7 @@ L_10514c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010514d0: 0x10514d0: lw    s1, 24(sp)
+// 0x010514e0: 0x10514e0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3519,7 +3519,7 @@ L_10514c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010514d4: 0x10514d4: lw    s0, 20(sp)
+// 0x010514e4: 0x10514e4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3528,7 +3528,7 @@ L_10514c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010514d8: 0x10514d8: jr    ra addiu sp, sp, 40
+// 0x010514e8: 0x10514e8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3540,7 +3540,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_main_menu_button_register_10514e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_menu_button_register_10514f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s4,int32 v1,int32 s1,int32 s2,int32 s3,int32 s5,int32 lo,int32 ra)
@@ -3596,12 +3596,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010514e0: 0x10514e0: addiu sp, sp, -56
+// 0x010514f0: 0x10514f0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010514e4: 0x10514e4: sw    s4, 44(sp)
+// 0x010514f4: 0x10514f4: sw    s4, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3610,10 +3610,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010514e8: 0x10514e8: lui   s4, 0x70000
+// 0x010514f8: 0x10514f8: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010514ec: 0x10514ec: sw    s5, 48(sp)
+// 0x010514fc: 0x10514fc: sw    s5, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3622,7 +3622,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010514f0: 0x10514f0: sw    s3, 40(sp)
+// 0x01051500: 0x1051500: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3631,7 +3631,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010514f4: 0x10514f4: sw    s2, 36(sp)
+// 0x01051504: 0x1051504: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3640,7 +3640,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010514f8: 0x10514f8: sw    s1, 32(sp)
+// 0x01051508: 0x1051508: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3649,7 +3649,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010514fc: 0x10514fc: sw    s0, 28(sp)
+// 0x0105150c: 0x105150c: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3658,36 +3658,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01051500: 0x1051500: sw    ra, 52(sp)
-// 0x01051504: 0x1051504: addu  s3, a0, zero
+// 0x01051510: 0x1051510: sw    ra, 52(sp)
+// 0x01051514: 0x1051514: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01051508: 0x1051508: addu  s1, a1, zero
+// 0x01051518: 0x1051518: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0105150c: 0x105150c: addu  s2, a2, zero
+// 0x0105151c: 0x105151c: addu  s2, a2, zero
 	ldloc.3
 	stloc 11
-// 0x01051510: 0x1051510: addiu s4, s4, -340
+// 0x01051520: 0x1051520: addiu s4, s4, 124
 	ldloc 8
-	ldc.i4 -340
+	ldc.i4.s 124
 	add
 	stloc 8
-// 0x01051514: 0x1051514: addu  s0, zero, zero
+// 0x01051524: 0x1051524: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01051518: 0x1051518: addiu s5, zero, 20
+// 0x01051528: 0x1051528: addiu s5, zero, 20
 	ldc.i4.s 20
 	stloc 13
-L_105151c:
-// 0x0105151c: 0x105151c: lw    a0, 0(s4)
+L_105152c:
+// 0x0105152c: 0x105152c: lw    a0, 0(s4)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01051520: 0x1051520: jal   0x1001b14 addu  a1, s1, zero
+// 0x01051530: 0x1051530: jal   0x1001b14 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
@@ -3695,41 +3695,41 @@ L_105151c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01051528: 0x1051528: bne   v0, zero, 0x1051554 addiu v0, zero, 12
+// 0x01051538: 0x1051538: bne   v0, zero, 0x1051564 addiu v0, zero, 12
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	brtrue L_1051554
+	brtrue L_1051564
 // --- basic block ---
-// 0x01051530: 0x1051530: mult  s0, v0
+// 0x01051540: 0x1051540: mult  s0, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 14
-// 0x01051534: 0x1051534: lui   v0, 0x70000
+// 0x01051544: 0x1051544: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01051538: 0x1051538: addiu v0, v0, -348
+// 0x01051548: 0x1051548: addiu v0, v0, 116
 	ldloc 5
-	ldc.i4 -348
+	ldc.i4.s 116
 	add
 	stloc 5
-// 0x0105153c: 0x105153c: mflo  lo
+// 0x0105154c: 0x105154c: mflo  lo
 	ldloc 14
 	stloc 6
-// 0x01051540: 0x1051540: addu  s0, v0, s0
+// 0x01051550: 0x1051550: addu  s0, v0, s0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01051544: 0x1051544: lw    s2, 0(s0)
+// 0x01051554: 0x1051554: lw    s2, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01051548: 0x1051548: lw    s3, 4(s0)
+// 0x01051558: 0x1051558: lw    s3, 4(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3738,11 +3738,11 @@ L_105151c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105154c: 0x105154c: j	 0x10515ac sll   zero, zero, 0
-	br L_10515ac
+// 0x0105155c: 0x105155c: j	 0x10515bc sll   zero, zero, 0
+	br L_10515bc
 // --- basic block ---
-L_1051554:
-// 0x01051554: 0x1051554: lw    v0, -4(s4)
+L_1051564:
+// 0x01051564: 0x1051564: lw    v0, -4(s4)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3751,56 +3751,56 @@ L_1051554:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051558: 0x1051558: sll   zero, zero, 0
-// 0x0105155c: 0x105155c: bne   v0, zero, 0x10515a0 addiu s4, s4, 12
+// 0x01051568: 0x1051568: sll   zero, zero, 0
+// 0x0105156c: 0x105156c: bne   v0, zero, 0x10515b0 addiu s4, s4, 12
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 8
-	brtrue L_10515a0
+	brtrue L_10515b0
 // --- basic block ---
-// 0x01051564: 0x1051564: beq   s2, zero, 0x10515a4 addiu s0, s0, 1
+// 0x01051574: 0x1051574: beq   s2, zero, 0x10515b4 addiu s0, s0, 1
 	ldloc 11
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_10515a4
+	brfalse L_10515b4
 // --- basic block ---
-// 0x0105156c: 0x105156c: addiu s0, s0, -1
+// 0x0105157c: 0x105157c: addiu s0, s0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x01051570: 0x1051570: addiu v0, zero, 12
+// 0x01051580: 0x1051580: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x01051574: 0x1051574: mult  s0, v0
+// 0x01051584: 0x1051584: mult  s0, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 14
-// 0x01051578: 0x1051578: lui   v0, 0x70000
+// 0x01051588: 0x1051588: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105157c: 0x105157c: addiu v0, v0, -348
+// 0x0105158c: 0x105158c: addiu v0, v0, 116
 	ldloc 5
-	ldc.i4 -348
+	ldc.i4.s 116
 	add
 	stloc 5
-// 0x01051580: 0x1051580: addu  a0, s1, zero
+// 0x01051590: 0x1051590: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01051584: 0x1051584: mflo  lo
+// 0x01051594: 0x1051594: mflo  lo
 	ldloc 14
 	stloc 6
-// 0x01051588: 0x1051588: addu  s0, v0, s0
+// 0x01051598: 0x1051598: addu  s0, v0, s0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x0105158c: 0x105158c: sw    s3, 4(s0)
+// 0x0105159c: 0x105159c: sw    s3, 4(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3809,7 +3809,7 @@ L_1051554:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01051590: 0x1051590: jal   0x1001ba8 sw    s2, 0(s0)
+// 0x010515a0: 0x10515a0: jal   0x1001ba8 sw    s2, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3826,7 +3826,7 @@ L_1051554:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01051598: 0x1051598: j	 0x10515c0 sw    v0, 8(s0)
+// 0x010515a8: 0x10515a8: j	 0x10515d0 sw    v0, 8(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3835,76 +3835,76 @@ L_1051554:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10515c0
+	br L_10515d0
 // --- basic block ---
-L_10515a0:
-// 0x010515a0: 0x10515a0: addiu s0, s0, 1
+L_10515b0:
+// 0x010515b0: 0x10515b0: addiu s0, s0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_10515a4:
-// 0x010515a4: 0x10515a4: bne   s0, s5, 0x105151c sll   zero, zero, 0
+L_10515b4:
+// 0x010515b4: 0x10515b4: bne   s0, s5, 0x105152c sll   zero, zero, 0
 	ldloc 6
 	ldloc 13
-	bne.un L_105151c
+	bne.un L_105152c
 // --- basic block ---
-L_10515ac:
-// 0x010515ac: 0x10515ac: bne   s2, zero, 0x10515c4 lui   s4, 0x70000
+L_10515bc:
+// 0x010515bc: 0x10515bc: bne   s2, zero, 0x10515d4 lui   s4, 0x70000
 	ldloc 11
 	ldc.i4 458752
 	stloc 8
-	brtrue L_10515c4
+	brtrue L_10515d4
 // --- basic block ---
-// 0x010515b4: 0x10515b4: lui   v0, 0x70000
+// 0x010515c4: 0x10515c4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010515b8: 0x10515b8: j	 0x1051670 sw    zero, -2888(v0)
+// 0x010515c8: 0x10515c8: j	 0x1051680 sw    zero, -2424(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -722
+	ldc.i4 -606
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1051670
+	br L_1051680
 // --- basic block ---
-L_10515c0:
-// 0x010515c0: 0x10515c0: lui   s4, 0x70000
+L_10515d0:
+// 0x010515d0: 0x10515d0: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 8
-L_10515c4:
-// 0x010515c4: 0x10515c4: addiu s4, s4, -684
+L_10515d4:
+// 0x010515d4: 0x10515d4: addiu s4, s4, -220
 	ldloc 8
-	ldc.i4 -684
+	ldc.i4 -220
 	add
 	stloc 8
-// 0x010515c8: 0x10515c8: addiu v1, zero, 1
+// 0x010515d8: 0x10515d8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x010515cc: 0x10515cc: lui   v0, 0x70000
+// 0x010515dc: 0x10515dc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010515d0: 0x10515d0: sw    v1, -2888(v0)
+// 0x010515e0: 0x10515e0: sw    v1, -2424(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -722
+	ldc.i4 -606
 	add
 	ldloc 9
 	stelem.i4
-// 0x010515d4: 0x10515d4: addiu s5, s4, 48
+// 0x010515e4: 0x10515e4: addiu s5, s4, 48
 	ldloc 8
 	ldc.i4.s 48
 	add
 	stloc 13
-// 0x010515d8: 0x10515d8: addu  s0, zero, zero
+// 0x010515e8: 0x10515e8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10515dc:
-// 0x010515dc: 0x10515dc: lw    a0, 8(s4)
+L_10515ec:
+// 0x010515ec: 0x10515ec: lw    a0, 8(s4)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3913,7 +3913,7 @@ L_10515dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010515e0: 0x10515e0: jal   0x1001b14 addu  a1, s1, zero
+// 0x010515f0: 0x10515f0: jal   0x1001b14 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.1
@@ -3921,32 +3921,32 @@ L_10515dc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010515e8: 0x10515e8: bne   v0, zero, 0x1051614 lui   a1, 0x10000
+// 0x010515f8: 0x10515f8: bne   v0, zero, 0x1051624 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1051614
+	brtrue L_1051624
 // --- basic block ---
-// 0x010515f0: 0x10515f0: lui   a3, 0x10000
+// 0x01051600: 0x1051600: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010515f4: 0x10515f4: addiu a1, a1, 3972
+// 0x01051604: 0x1051604: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x010515f8: 0x10515f8: addiu a3, a3, 4836
+// 0x01051608: 0x1051608: addiu a3, a3, 4832
 	ldloc 4
-	ldc.i4 4836
+	ldc.i4 4832
 	add
 	stloc 4
-// 0x010515fc: 0x10515fc: addiu a0, zero, 1
+// 0x0105160c: 0x105160c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01051600: 0x1051600: addiu a2, zero, 516
+// 0x01051610: 0x1051610: addiu a2, zero, 516
 	ldc.i4 516
 	stloc.3
-// 0x01051604: 0x1051604: jal   0x100449c sw    s1, 16(sp)
+// 0x01051614: 0x1051614: jal   0x100449c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3965,15 +3965,15 @@ L_10515dc:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0105160c: 0x105160c: j	 0x1051670 sll   zero, zero, 0
-	br L_1051670
+// 0x0105161c: 0x105161c: j	 0x1051680 sll   zero, zero, 0
+	br L_1051680
 // --- basic block ---
-L_1051614:
-// 0x01051614: 0x1051614: bne   s0, zero, 0x1051630 sll   zero, zero, 0
+L_1051624:
+// 0x01051624: 0x1051624: bne   s0, zero, 0x1051640 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1051630
+	brtrue L_1051640
 // --- basic block ---
-// 0x0105161c: 0x105161c: lw    v0, 4(s4)
+// 0x0105162c: 0x105162c: lw    v0, 4(s4)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3982,48 +3982,48 @@ L_1051614:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051620: 0x1051620: sll   zero, zero, 0
-// 0x01051624: 0x1051624: bne   v0, zero, 0x1051630 sll   zero, zero, 0
+// 0x01051630: 0x1051630: sll   zero, zero, 0
+// 0x01051634: 0x1051634: bne   v0, zero, 0x1051640 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1051630
+	brtrue L_1051640
 // --- basic block ---
-// 0x0105162c: 0x105162c: addu  s0, s4, zero
+// 0x0105163c: 0x105163c: addu  s0, s4, zero
 	ldloc 8
 	stloc 6
-L_1051630:
-// 0x01051630: 0x1051630: addiu s4, s4, 12
+L_1051640:
+// 0x01051640: 0x1051640: addiu s4, s4, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 8
-// 0x01051634: 0x1051634: bne   s4, s5, 0x10515dc sll   zero, zero, 0
+// 0x01051644: 0x1051644: bne   s4, s5, 0x10515ec sll   zero, zero, 0
 	ldloc 8
 	ldloc 13
-	bne.un L_10515dc
+	bne.un L_10515ec
 // --- basic block ---
-// 0x0105163c: 0x105163c: bne   s0, zero, 0x105165c lui   a1, 0x10000
+// 0x0105164c: 0x105164c: bne   s0, zero, 0x105166c lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_105165c
+	brtrue L_105166c
 // --- basic block ---
-// 0x01051644: 0x1051644: lui   a3, 0x10000
+// 0x01051654: 0x1051654: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01051648: 0x1051648: addiu a1, a1, 3972
+// 0x01051658: 0x1051658: addiu a1, a1, 3968
 	ldloc.2
-	ldc.i4 3972
+	ldc.i4 3968
 	add
 	stloc.2
-// 0x0105164c: 0x105164c: addiu a3, a3, 4928
+// 0x0105165c: 0x105165c: addiu a3, a3, 4924
 	ldloc 4
-	ldc.i4 4928
+	ldc.i4 4924
 	add
 	stloc 4
-// 0x01051650: 0x1051650: addiu a0, zero, 5
+// 0x01051660: 0x1051660: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01051654: 0x1051654: jal   0x100449c addiu a2, zero, 528
+// 0x01051664: 0x1051664: jal   0x100449c addiu a2, zero, 528
 	ldc.i4 528
 	stloc.3
 	ldloc.0
@@ -4036,15 +4036,15 @@ L_1051630:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_105165c:
-// 0x0105165c: 0x105165c: sw    s2, 0(s0)
+L_105166c:
+// 0x0105166c: 0x105166c: sw    s2, 0(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x01051660: 0x1051660: sw    s3, 4(s0)
+// 0x01051670: 0x1051670: sw    s3, 4(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4053,7 +4053,7 @@ L_105165c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01051664: 0x1051664: jal   0x1001ba8 addu  a0, s1, zero
+// 0x01051674: 0x1051674: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -4066,7 +4066,7 @@ L_105165c:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0105166c: 0x105166c: sw    v0, 8(s0)
+// 0x0105167c: 0x105167c: sw    v0, 8(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4075,9 +4075,9 @@ L_105165c:
 	add
 	ldloc 5
 	stelem.i4
-L_1051670:
-// 0x01051670: 0x1051670: lw    ra, 52(sp)
-// 0x01051674: 0x1051674: lw    s5, 48(sp)
+L_1051680:
+// 0x01051680: 0x1051680: lw    ra, 52(sp)
+// 0x01051684: 0x1051684: lw    s5, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4086,7 +4086,7 @@ L_1051670:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01051678: 0x1051678: lw    s4, 44(sp)
+// 0x01051688: 0x1051688: lw    s4, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4095,7 +4095,7 @@ L_1051670:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105167c: 0x105167c: lw    s3, 40(sp)
+// 0x0105168c: 0x105168c: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4104,7 +4104,7 @@ L_1051670:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01051680: 0x1051680: lw    s2, 36(sp)
+// 0x01051690: 0x1051690: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4113,7 +4113,7 @@ L_1051670:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01051684: 0x1051684: lw    s1, 32(sp)
+// 0x01051694: 0x1051694: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4122,7 +4122,7 @@ L_1051670:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01051688: 0x1051688: lw    s0, 28(sp)
+// 0x01051698: 0x1051698: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4131,7 +4131,7 @@ L_1051670:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105168c: 0x105168c: jr    ra addiu sp, sp, 56
+// 0x0105169c: 0x105169c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4143,7 +4143,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_main_alloc_stack_1051694(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_alloc_stack_10516a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -4181,13 +4181,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051694: 0x1051694: addiu sp, sp, -24
+// 0x010516a4: 0x10516a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01051698: 0x1051698: sw    ra, 20(sp)
-// 0x0105169c: 0x105169c: sw    s0, 16(sp)
+// 0x010516a8: 0x10516a8: sw    ra, 20(sp)
+// 0x010516ac: 0x10516ac: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4196,7 +4196,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010516a0: 0x10516a0: jal   0x1000910 addu  s0, a0, zero
+// 0x010516b0: 0x10516b0: jal   0x1000910 addu  s0, a0, zero
 	ldloc.1
 	stloc 5
 	ldloc.0
@@ -4209,18 +4209,18 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010516a8: 0x10516a8: lw    ra, 20(sp)
-// 0x010516ac: 0x10516ac: addiu s0, s0, -8
+// 0x010516b8: 0x10516b8: lw    ra, 20(sp)
+// 0x010516bc: 0x10516bc: addiu s0, s0, -8
 	ldloc 5
 	ldc.i4.s -8
 	add
 	stloc 5
-// 0x010516b0: 0x10516b0: addu  v0, v0, s0
+// 0x010516c0: 0x10516c0: addu  v0, v0, s0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x010516b4: 0x10516b4: lw    s0, 16(sp)
+// 0x010516c4: 0x10516c4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4229,7 +4229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010516b8: 0x10516b8: jr    ra addiu sp, sp, 24
+// 0x010516c8: 0x10516c8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4241,7 +4241,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_main_new_10516c0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_main_new_10516d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4276,13 +4276,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010516c0: 0x10516c0: addiu sp, sp, -24
+// 0x010516d0: 0x10516d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010516c4: 0x10516c4: sw    ra, 20(sp)
-// 0x010516c8: 0x10516c8: jal   0x10ac6b4 addiu a0, zero, 1
+// 0x010516d4: 0x10516d4: sw    ra, 20(sp)
+// 0x010516d8: 0x10516d8: jal   0x10accfc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -4290,14 +4290,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_main_set_10ac6b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_main_set_10accfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010516d0: 0x10516d0: lw    ra, 20(sp)
-// 0x010516d4: 0x10516d4: sll   zero, zero, 0
-// 0x010516d8: 0x10516d8: jr    ra addiu sp, sp, 24
+// 0x010516e0: 0x10516e0: lw    ra, 20(sp)
+// 0x010516e4: 0x10516e4: sll   zero, zero, 0
+// 0x010516e8: 0x10516e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4309,7 +4309,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -4347,25 +4347,25 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010516e0: 0x10516e0: lui   v1, 0x70000
+// 0x010516f0: 0x10516f0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010516e4: 0x10516e4: lw    v0, -108(v1)
+// 0x010516f4: 0x10516f4: lw    v0, 356(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -27
+	ldc.i4.s 89
 	add
 	ldelem.i4
 	stloc 5
-// 0x010516e8: 0x10516e8: addiu sp, sp, -24
+// 0x010516f8: 0x10516f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010516ec: 0x10516ec: sw    ra, 20(sp)
-// 0x010516f0: 0x10516f0: beq   a0, v0, 0x1051878 sw    s0, 16(sp)
+// 0x010516fc: 0x10516fc: sw    ra, 20(sp)
+// 0x01051700: 0x1051700: beq   a0, v0, 0x1051888 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 8
@@ -4376,90 +4376,90 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	beq  L_1051878
+	beq  L_1051888
 // --- basic block ---
-// 0x010516f8: 0x10516f8: addiu v0, zero, 255
+// 0x01051708: 0x1051708: addiu v0, zero, 255
 	ldc.i4 255
 	stloc 5
-// 0x010516fc: 0x10516fc: beq   a0, v0, 0x1051878 sll   zero, zero, 0
+// 0x0105170c: 0x105170c: beq   a0, v0, 0x1051888 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1051878
+	beq  L_1051888
 // --- basic block ---
-// 0x01051704: 0x1051704: cibyl_sysc 0x1954
+// 0x01051714: 0x1051714: cibyl_sysc 0x1954
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapMainScreen_get()
 	stloc 5
-// 0x01051708: 0x1051708: addu  s0, v0, zero
+// 0x01051718: 0x1051718: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0105170c: 0x105170c: addiu v0, zero, 1
+// 0x0105171c: 0x105171c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01051710: 0x1051710: beq   a0, v0, 0x105173c sw    a0, -108(v1)
+// 0x01051720: 0x1051720: beq   a0, v0, 0x105174c sw    a0, 356(v1)
 	ldloc.1
 	ldloc 5
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -27
+	ldc.i4.s 89
 	add
 	ldloc.1
 	stelem.i4
-	beq  L_105173c
+	beq  L_105174c
 // --- basic block ---
-// 0x01051718: 0x1051718: addiu v0, zero, 2
+// 0x01051728: 0x1051728: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0105171c: 0x105171c: beq   a0, v0, 0x1051854 addiu v0, zero, 3
+// 0x0105172c: 0x105172c: beq   a0, v0, 0x1051864 addiu v0, zero, 3
 	ldloc.1
 	ldloc 5
 	ldc.i4.3
 	stloc 5
-	beq  L_1051854
+	beq  L_1051864
 // --- basic block ---
-// 0x01051724: 0x1051724: beq   a0, v0, 0x1051854 addiu v0, zero, 15
+// 0x01051734: 0x1051734: beq   a0, v0, 0x1051864 addiu v0, zero, 15
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 15
 	stloc 5
-	beq  L_1051854
+	beq  L_1051864
 // --- basic block ---
-// 0x0105172c: 0x105172c: beq   a0, v0, 0x1051854 addiu v0, zero, 31
+// 0x0105173c: 0x105173c: beq   a0, v0, 0x1051864 addiu v0, zero, 31
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 31
 	stloc 5
-	beq  L_1051854
+	beq  L_1051864
 // --- basic block ---
-// 0x01051734: 0x1051734: bne   a0, v0, 0x1051858 lui   v1, 0x20000
+// 0x01051744: 0x1051744: bne   a0, v0, 0x1051868 lui   v1, 0x20000
 	ldloc.1
 	ldloc 5
 	ldc.i4 131072
 	stloc 6
-	bne.un L_1051858
+	bne.un L_1051868
 // --- basic block ---
-L_105173c:
-// 0x0105173c: 0x105173c: jal   0x101d484 sll   zero, zero, 0
+L_105174c:
+// 0x0105174c: 0x105174c: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051744: 0x1051744: lui   a1, 0x10000
+// 0x01051754: 0x1051754: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051748: 0x1051748: addu  a0, v0, zero
+// 0x01051758: 0x1051758: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105174c: 0x105174c: jal   0x1001b14 addiu a1, a1, -7400
+// 0x0105175c: 0x105175c: jal   0x1001b14 addiu a1, a1, -7404
 	ldloc.2
-	ldc.i4 -7400
+	ldc.i4 -7404
 	add
 	stloc.2
 	ldloc.1
@@ -4467,40 +4467,40 @@ L_105173c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01051754: 0x1051754: bne   v0, zero, 0x1051764 lui   v1, 0x10000
+// 0x01051764: 0x1051764: bne   v0, zero, 0x1051774 lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 6
-	brtrue L_1051764
+	brtrue L_1051774
 // --- basic block ---
-// 0x0105175c: 0x105175c: j	 0x105185c addiu v1, v1, 29580
+// 0x0105176c: 0x105176c: j	 0x105186c addiu v1, v1, 30044
 	ldloc 6
-	ldc.i4 29580
+	ldc.i4 30044
 	add
 	stloc 6
-	br L_105185c
+	br L_105186c
 // --- basic block ---
-L_1051764:
-// 0x01051764: 0x1051764: jal   0x101d484 sll   zero, zero, 0
+L_1051774:
+// 0x01051774: 0x1051774: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105176c: 0x105176c: lui   a1, 0x10000
+// 0x0105177c: 0x105177c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051770: 0x1051770: addu  a0, v0, zero
+// 0x01051780: 0x1051780: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01051774: 0x1051774: jal   0x1000420 addiu a1, a1, 5016
+// 0x01051784: 0x1051784: jal   0x1000420 addiu a1, a1, 5012
 	ldloc.2
-	ldc.i4 5016
+	ldc.i4 5012
 	add
 	stloc.2
 	ldloc.0
@@ -4513,40 +4513,40 @@ L_1051764:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105177c: 0x105177c: beq   v0, zero, 0x105178c lui   v1, 0x20000
+// 0x0105178c: 0x105178c: beq   v0, zero, 0x105179c lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 6
-	brfalse L_105178c
+	brfalse L_105179c
 // --- basic block ---
-// 0x01051784: 0x1051784: j	 0x105185c addiu v1, v1, 13440
+// 0x01051794: 0x1051794: j	 0x105186c addiu v1, v1, 13900
 	ldloc 6
-	ldc.i4 13440
+	ldc.i4 13900
 	add
 	stloc 6
-	br L_105185c
+	br L_105186c
 // --- basic block ---
-L_105178c:
-// 0x0105178c: 0x105178c: jal   0x101d484 sll   zero, zero, 0
+L_105179c:
+// 0x0105179c: 0x105179c: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051794: 0x1051794: lui   a1, 0x10000
+// 0x010517a4: 0x10517a4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051798: 0x1051798: addu  a0, v0, zero
+// 0x010517a8: 0x10517a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105179c: 0x105179c: jal   0x1001b14 addiu a1, a1, 5020
+// 0x010517ac: 0x10517ac: jal   0x1001b14 addiu a1, a1, 5016
 	ldloc.2
-	ldc.i4 5020
+	ldc.i4 5016
 	add
 	stloc.2
 	ldloc.1
@@ -4554,40 +4554,40 @@ L_105178c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010517a4: 0x10517a4: bne   v0, zero, 0x10517b4 lui   v1, 0x10000
+// 0x010517b4: 0x10517b4: bne   v0, zero, 0x10517c4 lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 6
-	brtrue L_10517b4
+	brtrue L_10517c4
 // --- basic block ---
-// 0x010517ac: 0x10517ac: j	 0x105185c addiu v1, v1, -24980
+// 0x010517bc: 0x10517bc: j	 0x105186c addiu v1, v1, -24980
 	ldloc 6
 	ldc.i4 -24980
 	add
 	stloc 6
-	br L_105185c
+	br L_105186c
 // --- basic block ---
-L_10517b4:
-// 0x010517b4: 0x10517b4: jal   0x101d484 sll   zero, zero, 0
+L_10517c4:
+// 0x010517c4: 0x10517c4: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010517bc: 0x10517bc: lui   a1, 0x10000
+// 0x010517cc: 0x10517cc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010517c0: 0x10517c0: addu  a0, v0, zero
+// 0x010517d0: 0x10517d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010517c4: 0x10517c4: jal   0x1001b14 addiu a1, a1, 5032
+// 0x010517d4: 0x10517d4: jal   0x1001b14 addiu a1, a1, 5028
 	ldloc.2
-	ldc.i4 5032
+	ldc.i4 5028
 	add
 	stloc.2
 	ldloc.1
@@ -4595,40 +4595,40 @@ L_10517b4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010517cc: 0x10517cc: bne   v0, zero, 0x10517dc lui   v1, 0x10000
+// 0x010517dc: 0x10517dc: bne   v0, zero, 0x10517ec lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 6
-	brtrue L_10517dc
+	brtrue L_10517ec
 // --- basic block ---
-// 0x010517d4: 0x10517d4: j	 0x105185c addiu v1, v1, 5040
+// 0x010517e4: 0x10517e4: j	 0x105186c addiu v1, v1, 5036
 	ldloc 6
-	ldc.i4 5040
+	ldc.i4 5036
 	add
 	stloc 6
-	br L_105185c
+	br L_105186c
 // --- basic block ---
-L_10517dc:
-// 0x010517dc: 0x10517dc: jal   0x101d484 sll   zero, zero, 0
+L_10517ec:
+// 0x010517ec: 0x10517ec: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010517e4: 0x10517e4: lui   a1, 0x10000
+// 0x010517f4: 0x10517f4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010517e8: 0x10517e8: addu  a0, v0, zero
+// 0x010517f8: 0x10517f8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010517ec: 0x10517ec: jal   0x1001b14 addiu a1, a1, 5044
+// 0x010517fc: 0x10517fc: jal   0x1001b14 addiu a1, a1, 5040
 	ldloc.2
-	ldc.i4 5044
+	ldc.i4 5040
 	add
 	stloc.2
 	ldloc.1
@@ -4636,40 +4636,40 @@ L_10517dc:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010517f4: 0x10517f4: bne   v0, zero, 0x1051804 lui   v1, 0x20000
+// 0x01051804: 0x1051804: bne   v0, zero, 0x1051814 lui   v1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 6
-	brtrue L_1051804
+	brtrue L_1051814
 // --- basic block ---
-// 0x010517fc: 0x10517fc: j	 0x105185c addiu v1, v1, 22008
+// 0x0105180c: 0x105180c: j	 0x105186c addiu v1, v1, 22468
 	ldloc 6
-	ldc.i4 22008
+	ldc.i4 22468
 	add
 	stloc 6
-	br L_105185c
+	br L_105186c
 // --- basic block ---
-L_1051804:
-// 0x01051804: 0x1051804: jal   0x101d484 sll   zero, zero, 0
+L_1051814:
+// 0x01051814: 0x1051814: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105180c: 0x105180c: lui   a1, 0x10000
+// 0x0105181c: 0x105181c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051810: 0x1051810: addu  a0, v0, zero
+// 0x01051820: 0x1051820: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01051814: 0x1051814: jal   0x1001b14 addiu a1, a1, 5052
+// 0x01051824: 0x1051824: jal   0x1001b14 addiu a1, a1, 5048
 	ldloc.2
-	ldc.i4 5052
+	ldc.i4 5048
 	add
 	stloc.2
 	ldloc.1
@@ -4677,40 +4677,40 @@ L_1051804:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0105181c: 0x105181c: bne   v0, zero, 0x105182c lui   v1, 0x10000
+// 0x0105182c: 0x105182c: bne   v0, zero, 0x105183c lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 6
-	brtrue L_105182c
+	brtrue L_105183c
 // --- basic block ---
-// 0x01051824: 0x1051824: j	 0x105185c addiu v1, v1, 5060
+// 0x01051834: 0x1051834: j	 0x105186c addiu v1, v1, 5056
 	ldloc 6
-	ldc.i4 5060
+	ldc.i4 5056
 	add
 	stloc 6
-	br L_105185c
+	br L_105186c
 // --- basic block ---
-L_105182c:
-// 0x0105182c: 0x105182c: jal   0x101d484 sll   zero, zero, 0
+L_105183c:
+// 0x0105183c: 0x105183c: jal   0x101d494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051834: 0x1051834: lui   a1, 0x10000
+// 0x01051844: 0x1051844: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051838: 0x1051838: addu  a0, v0, zero
+// 0x01051848: 0x1051848: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105183c: 0x105183c: jal   0x1001b14 addiu a1, a1, 5064
+// 0x0105184c: 0x105184c: jal   0x1001b14 addiu a1, a1, 5060
 	ldloc.2
-	ldc.i4 5064
+	ldc.i4 5060
 	add
 	stloc.2
 	ldloc.1
@@ -4718,49 +4718,49 @@ L_105182c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01051844: 0x1051844: bne   v0, zero, 0x1051854 lui   v1, 0x10000
+// 0x01051854: 0x1051854: bne   v0, zero, 0x1051864 lui   v1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 6
-	brtrue L_1051854
+	brtrue L_1051864
 // --- basic block ---
-// 0x0105184c: 0x105184c: j	 0x105185c addiu v1, v1, 5076
+// 0x0105185c: 0x105185c: j	 0x105186c addiu v1, v1, 5072
 	ldloc 6
-	ldc.i4 5076
+	ldc.i4 5072
 	add
 	stloc 6
-	br L_105185c
+	br L_105186c
 // --- basic block ---
-L_1051854:
-// 0x01051854: 0x1051854: lui   v1, 0x20000
+L_1051864:
+// 0x01051864: 0x1051864: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-L_1051858:
-// 0x01051858: 0x1051858: addiu v1, v1, 20152
+L_1051868:
+// 0x01051868: 0x1051868: addiu v1, v1, 20612
 	ldloc 6
-	ldc.i4 20152
+	ldc.i4 20612
 	add
 	stloc 6
-L_105185c:
-// 0x0105185c: 0x105185c: cibyl_sysc_arg 0x10
+L_105186c:
+// 0x0105186c: 0x105186c: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x01051860: 0x1051860: cibyl_sysc_arg 0x3
+// 0x01051870: 0x1051870: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051864: 0x1051864: cibyl_sysc 0x196f
+// 0x01051874: 0x1051874: cibyl_sysc 0x196f
 	call void [WazeWP7]Syscalls::NOPH_FreemapMainScreen_setLocale(int32,int32)
-// 0x01051868: 0x1051868: addu  v1, v0, zero
+// 0x01051878: 0x1051878: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0105186c: 0x105186c: cibyl_sysc_arg 0x10
+// 0x0105187c: 0x105187c: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x01051870: 0x1051870: cibyl_sysc 0x1990
+// 0x01051880: 0x1051880: cibyl_sysc 0x1990
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01051874: 0x1051874: addu  s0, v0, zero
+// 0x01051884: 0x1051884: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-L_1051878:
-// 0x01051878: 0x1051878: lw    ra, 20(sp)
-// 0x0105187c: 0x105187c: lw    s0, 16(sp)
+L_1051888:
+// 0x01051888: 0x1051888: lw    ra, 20(sp)
+// 0x0105188c: 0x105188c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4769,7 +4769,7 @@ L_1051878:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051880: 0x1051880: jr    ra addiu sp, sp, 24
+// 0x01051890: 0x1051890: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4781,7 +4781,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_sound_load_1051898()
+.method public static int32 roadmap_sound_load_10518a8()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4795,7 +4795,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051898: 0x1051898: jr    ra addu  v0, zero, zero
+// 0x010518a8: 0x10518a8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -4803,7 +4803,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_sound_free_10518a0()
+.method public static int32 roadmap_sound_free_10518b0()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4817,7 +4817,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010518a0: 0x10518a0: jr    ra addu  v0, zero, zero
+// 0x010518b0: 0x10518b0: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -4825,7 +4825,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_sound_list_create_10518a8(int32)
+.method public static int32 roadmap_sound_list_create_10518b8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4848,30 +4848,30 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010518a8: 0x10518a8: lui   v0, 0x70000
+// 0x010518b8: 0x10518b8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010518ac: 0x10518ac: lw    v1, -100(v0)
+// 0x010518bc: 0x10518bc: lw    v1, 364(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -25
+	ldc.i4.s 91
 	add
 	ldelem.i4
 	stloc.2
-// 0x010518b0: 0x10518b0: sll   zero, zero, 0
-// 0x010518b4: 0x10518b4: cibyl_sysc_arg 0x3
+// 0x010518c0: 0x10518c0: sll   zero, zero, 0
+// 0x010518c4: 0x10518c4: cibyl_sysc_arg 0x3
 	ldloc.2
-// 0x010518b8: 0x10518b8: cibyl_sysc_arg 0x4
+// 0x010518c8: 0x10518c8: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010518bc: 0x10518bc: cibyl_sysc 0x19c0
+// 0x010518cc: 0x10518cc: cibyl_sysc 0x19c0
 	call int32 [WazeWP7]Syscalls::NOPH_SoundMgr_listCreate(int32,int32)
 	stloc.1
-// 0x010518c0: 0x10518c0: addu  v1, v0, zero
+// 0x010518d0: 0x10518d0: addu  v1, v0, zero
 	ldloc.1
 	stloc.2
-// 0x010518c4: 0x10518c4: jr    ra addu  v0, v1, zero
+// 0x010518d4: 0x10518d4: jr    ra addu  v0, v1, zero
 	ldloc.2
 	stloc.1
 	br __CIBYL_function_return
@@ -4881,7 +4881,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_sound_list_add_10518cc(int32,int32)
+.method public static int32 roadmap_sound_list_add_10518dc(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4907,32 +4907,32 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010518cc: 0x10518cc: lui   v0, 0x70000
+// 0x010518dc: 0x10518dc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x010518d0: 0x10518d0: lw    v1, -100(v0)
+// 0x010518e0: 0x10518e0: lw    v1, 364(v0)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -25
+	ldc.i4.s 91
 	add
 	ldelem.i4
 	stloc.3
-// 0x010518d4: 0x10518d4: sll   zero, zero, 0
-// 0x010518d8: 0x10518d8: cibyl_sysc_arg 0x3
+// 0x010518e4: 0x10518e4: sll   zero, zero, 0
+// 0x010518e8: 0x10518e8: cibyl_sysc_arg 0x3
 	ldloc.3
-// 0x010518dc: 0x10518dc: cibyl_sysc_arg 0x4
+// 0x010518ec: 0x10518ec: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x010518e0: 0x10518e0: cibyl_sysc_arg 0x5
+// 0x010518f0: 0x10518f0: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x010518e4: 0x10518e4: cibyl_sysc 0x19d9
+// 0x010518f4: 0x10518f4: cibyl_sysc 0x19d9
 	call int32 [WazeWP7]Syscalls::NOPH_SoundMgr_listAdd(int32,int32,int32)
 	stloc.2
-// 0x010518e8: 0x10518e8: addu  v1, v0, zero
+// 0x010518f8: 0x10518f8: addu  v1, v0, zero
 	ldloc.2
 	stloc.3
-// 0x010518ec: 0x10518ec: jr    ra addu  v0, v1, zero
+// 0x010518fc: 0x10518fc: jr    ra addu  v0, v1, zero
 	ldloc.3
 	stloc.2
 	br __CIBYL_function_return
@@ -4942,7 +4942,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 roadmap_sound_initialize_1051938()
+.method public static int32 roadmap_sound_initialize_1051948()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4962,21 +4962,21 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051938: 0x1051938: cibyl_sysc 0x1a1e
+// 0x01051948: 0x1051948: cibyl_sysc 0x1a1e
 	call int32 [WazeWP7]Syscalls::NOPH_SoundMgr_getInstance()
 	stloc.0
-// 0x0105193c: 0x105193c: addu  v1, v0, zero
+// 0x0105194c: 0x105194c: addu  v1, v0, zero
 	ldloc.0
 	stloc.1
-// 0x01051940: 0x1051940: lui   v0, 0x70000
+// 0x01051950: 0x1051950: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01051944: 0x1051944: jr    ra sw    v1, -100(v0)
+// 0x01051954: 0x1051954: jr    ra sw    v1, 364(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -25
+	ldc.i4.s 91
 	add
 	ldloc.1
 	stelem.i4
@@ -4987,7 +4987,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_sound_shutdown_105194c()
+.method public static void roadmap_sound_shutdown_105195c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -4998,12 +4998,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105194c: 0x105194c: jr    ra sll   zero, zero, 0
+// 0x0105195c: 0x105195c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5044,13 +5044,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105195c: 0x105195c: addiu sp, sp, -304
+// 0x0105196c: 0x105196c: addiu sp, sp, -304
 	ldloc.0
 	ldc.i4 -304
 	add
 	stloc.0
-// 0x01051960: 0x1051960: sw    ra, 300(sp)
-// 0x01051964: 0x1051964: sw    s1, 296(sp)
+// 0x01051970: 0x1051970: sw    ra, 300(sp)
+// 0x01051974: 0x1051974: sw    s1, 296(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5059,7 +5059,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01051968: 0x1051968: sw    s0, 292(sp)
+// 0x01051978: 0x1051978: sw    s0, 292(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5068,7 +5068,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105196c: 0x105196c: jal   0x104c524 addu  s1, a0, zero
+// 0x0105197c: 0x105197c: jal   0x104c534 addu  s1, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -5076,17 +5076,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_downloads_104c524(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_downloads_104c534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01051974: 0x1051974: addiu s0, sp, 24
+// 0x01051984: 0x1051984: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01051978: 0x1051978: jal   0x1044134 sw    v0, 280(sp)
+// 0x01051988: 0x1051988: jal   0x1044144 sw    v0, 280(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5100,12 +5100,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01051980: 0x1051980: lw    a3, 280(sp)
+// 0x01051990: 0x1051990: lw    a3, 280(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5114,29 +5114,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01051984: 0x1051984: lui   a2, 0x10000
+// 0x01051994: 0x1051994: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01051988: 0x1051988: lui   v1, 0x10000
+// 0x01051998: 0x1051998: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0105198c: 0x105198c: addiu v1, v1, 5092
+// 0x0105199c: 0x105199c: addiu v1, v1, 5088
 	ldloc 7
-	ldc.i4 5092
+	ldc.i4 5088
 	add
 	stloc 7
-// 0x01051990: 0x1051990: addiu a2, a2, 5080
+// 0x010519a0: 0x10519a0: addiu a2, a2, 5076
 	ldloc.3
-	ldc.i4 5080
+	ldc.i4 5076
 	add
 	stloc.3
-// 0x01051994: 0x1051994: addu  a0, s0, zero
+// 0x010519a4: 0x10519a4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01051998: 0x1051998: addiu a1, zero, 256
+// 0x010519a8: 0x10519a8: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0105199c: 0x105199c: sw    v1, 16(sp)
+// 0x010519ac: 0x10519ac: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5145,7 +5145,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010519a0: 0x10519a0: jal   0x1000f9c sw    v0, 20(sp)
+// 0x010519b0: 0x10519b0: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5164,35 +5164,35 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010519a8: 0x10519a8: lui   v0, 0x70000
+// 0x010519b8: 0x10519b8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010519ac: 0x10519ac: lw    v1, -100(v0)
+// 0x010519bc: 0x10519bc: lw    v1, 364(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -25
+	ldc.i4.s 91
 	add
 	ldelem.i4
 	stloc 7
-// 0x010519b0: 0x10519b0: sll   zero, zero, 0
-// 0x010519b4: 0x10519b4: cibyl_sysc_arg 0x3
+// 0x010519c0: 0x10519c0: sll   zero, zero, 0
+// 0x010519c4: 0x10519c4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010519b8: 0x10519b8: cibyl_sysc_arg 0x11
+// 0x010519c8: 0x10519c8: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x010519bc: 0x10519bc: cibyl_sysc_arg 0x10
+// 0x010519cc: 0x10519cc: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x010519c0: 0x10519c0: cibyl_sysc 0x1a38
+// 0x010519d0: 0x10519d0: cibyl_sysc 0x1a38
 	call void [WazeWP7]Syscalls::NOPH_SoundMgr_playList(int32,int32,int32)
-// 0x010519c4: 0x10519c4: addu  s0, v0, zero
+// 0x010519d4: 0x10519d4: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010519c8: 0x10519c8: lw    ra, 300(sp)
-// 0x010519cc: 0x10519cc: addu  v0, zero, zero
+// 0x010519d8: 0x10519d8: lw    ra, 300(sp)
+// 0x010519dc: 0x10519dc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010519d0: 0x10519d0: lw    s1, 296(sp)
+// 0x010519e0: 0x10519e0: lw    s1, 296(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5201,7 +5201,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010519d4: 0x10519d4: lw    s0, 292(sp)
+// 0x010519e4: 0x10519e4: lw    s0, 292(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5210,7 +5210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010519d8: 0x10519d8: jr    ra addiu sp, sp, 304
+// 0x010519e8: 0x10519e8: jr    ra addiu sp, sp, 304
 	ldloc.0
 	ldc.i4 304
 	add
@@ -5222,7 +5222,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_sound_play_background_sound_10519e0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_sound_play_background_sound_10519f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -5257,117 +5257,117 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010519e0: 0x10519e0: lui   a1, 0x70000
+// 0x010519f0: 0x10519f0: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x010519e4: 0x10519e4: lw    v0, -104(a1)
+// 0x010519f4: 0x10519f4: lw    v0, 360(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -26
+	ldc.i4.s 90
 	add
 	ldelem.i4
 	stloc 5
-// 0x010519e8: 0x10519e8: addiu sp, sp, -24
+// 0x010519f8: 0x10519f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010519ec: 0x10519ec: bne   v0, zero, 0x1051a34 sw    ra, 20(sp)
+// 0x010519fc: 0x10519fc: bne   v0, zero, 0x1051a44 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1051a34
+	brtrue L_1051a44
 // --- basic block ---
-// 0x010519f4: 0x10519f4: lui   a0, 0x70000
+// 0x01051a04: 0x1051a04: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010519f8: 0x10519f8: lw    v1, -100(a0)
+// 0x01051a08: 0x1051a08: lw    v1, 364(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -25
+	ldc.i4.s 91
 	add
 	ldelem.i4
 	stloc 6
-// 0x010519fc: 0x10519fc: addiu a2, zero, 1
+// 0x01051a0c: 0x1051a0c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01051a00: 0x1051a00: cibyl_sysc_arg 0x3
+// 0x01051a10: 0x1051a10: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051a04: 0x1051a04: cibyl_sysc_arg 0x6
+// 0x01051a14: 0x1051a14: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01051a08: 0x1051a08: cibyl_sysc 0x1a4f
+// 0x01051a18: 0x1051a18: cibyl_sysc 0x1a4f
 	call int32 [WazeWP7]Syscalls::NOPH_SoundMgr_listCreate(int32,int32)
 	stloc 5
-// 0x01051a0c: 0x1051a0c: addu  v1, v0, zero
+// 0x01051a1c: 0x1051a1c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01051a10: 0x1051a10: sw    v1, -104(a1)
+// 0x01051a20: 0x1051a20: sw    v1, 360(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -26
+	ldc.i4.s 90
 	add
 	ldloc 6
 	stelem.i4
-// 0x01051a14: 0x1051a14: lui   a1, 0x10000
+// 0x01051a24: 0x1051a24: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051a18: 0x1051a18: lw    a0, -100(a0)
+// 0x01051a28: 0x1051a28: lw    a0, 364(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -25
+	ldc.i4.s 91
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051a1c: 0x1051a1c: addiu a1, a1, 5100
+// 0x01051a2c: 0x1051a2c: addiu a1, a1, 5096
 	ldloc.2
-	ldc.i4 5100
+	ldc.i4 5096
 	add
 	stloc.2
-// 0x01051a20: 0x1051a20: cibyl_sysc_arg 0x4
+// 0x01051a30: 0x1051a30: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051a24: 0x1051a24: cibyl_sysc_arg 0x3
+// 0x01051a34: 0x1051a34: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051a28: 0x1051a28: cibyl_sysc_arg 0x5
+// 0x01051a38: 0x1051a38: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01051a2c: 0x1051a2c: cibyl_sysc 0x1a68
+// 0x01051a3c: 0x1051a3c: cibyl_sysc 0x1a68
 	call int32 [WazeWP7]Syscalls::NOPH_SoundMgr_listAdd(int32,int32,int32)
 	stloc 5
-// 0x01051a30: 0x1051a30: addu  v1, v0, zero
+// 0x01051a40: 0x1051a40: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-L_1051a34:
-// 0x01051a34: 0x1051a34: lui   v0, 0x70000
+L_1051a44:
+// 0x01051a44: 0x1051a44: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01051a38: 0x1051a38: lw    a0, -104(v0)
+// 0x01051a48: 0x1051a48: lw    a0, 360(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -26
+	ldc.i4.s 90
 	add
 	ldelem.i4
 	stloc.1
-// 0x01051a3c: 0x1051a3c: jal   0x105195c sll   zero, zero, 0
+// 0x01051a4c: 0x1051a4c: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051a44: 0x1051a44: lw    ra, 20(sp)
-// 0x01051a48: 0x1051a48: sll   zero, zero, 0
-// 0x01051a4c: 0x1051a4c: jr    ra addiu sp, sp, 24
+// 0x01051a54: 0x1051a54: lw    ra, 20(sp)
+// 0x01051a58: 0x1051a58: sll   zero, zero, 0
+// 0x01051a5c: 0x1051a5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5379,7 +5379,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_set_compress_enabled_1051a64(int32)
+.method public static int32 roadmap_net_set_compress_enabled_1051a74(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5399,15 +5399,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051a64: 0x1051a64: lui   v0, 0x70000
+// 0x01051a74: 0x1051a74: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01051a68: 0x1051a68: jr    ra sw    a0, -96(v0)
+// 0x01051a78: 0x1051a78: jr    ra sw    a0, 368(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -24
+	ldc.i4.s 92
 	add
 	ldloc.0
 	stelem.i4
@@ -5416,7 +5416,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_net_shutdown_1051a80(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_shutdown_1051a90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5451,26 +5451,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051a80: 0x1051a80: addiu sp, sp, -24
+// 0x01051a90: 0x1051a90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01051a84: 0x1051a84: sw    ra, 20(sp)
-// 0x01051a88: 0x1051a88: jal   0x103f960 sll   zero, zero, 0
+// 0x01051a94: 0x1051a94: sw    ra, 20(sp)
+// 0x01051a98: 0x1051a98: jal   0x103f970 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_destroy_103f960(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_destroy_103f970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01051a90: 0x1051a90: lw    ra, 20(sp)
-// 0x01051a94: 0x1051a94: sll   zero, zero, 0
-// 0x01051a98: 0x1051a98: jr    ra addiu sp, sp, 24
+// 0x01051aa0: 0x1051aa0: lw    ra, 20(sp)
+// 0x01051aa4: 0x1051aa4: sll   zero, zero, 0
+// 0x01051aa8: 0x1051aa8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5482,7 +5482,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 print_url_1051aa0(int32,int32,int32,int32,int32)
+.method public static int32 print_url_1051ab0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 ra,int32[] mem,int32 v0)
@@ -5517,16 +5517,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051aa0: 0x1051aa0: addiu sp, sp, -24
+// 0x01051ab0: 0x1051ab0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01051aa4: 0x1051aa4: beq   a0, zero, 0x1051ac4 sw    ra, 20(sp)
+// 0x01051ab4: 0x1051ab4: beq   a0, zero, 0x1051ad4 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1051ac4
+	brfalse L_1051ad4
 // --- basic block ---
-// 0x01051aac: 0x1051aac: lw    v1, 12(a0)
+// 0x01051abc: 0x1051abc: lw    v1, 12(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5535,37 +5535,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051ab0: 0x1051ab0: sll   zero, zero, 0
-// 0x01051ab4: 0x1051ab4: cibyl_sysc_arg 0x3
+// 0x01051ac0: 0x1051ac0: sll   zero, zero, 0
+// 0x01051ac4: 0x1051ac4: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051ab8: 0x1051ab8: cibyl_sysc 0x1a92
+// 0x01051ac8: 0x1051ac8: cibyl_sysc 0x1a92
 	call void [WazeWP7]Syscalls::NOPH_AsyncNet_printUrl(int32)
-// 0x01051abc: 0x1051abc: j	 0x1051ae0 addu  v1, v0, zero
+// 0x01051acc: 0x1051acc: j	 0x1051af0 addu  v1, v0, zero
 	ldloc 8
 	stloc 5
-	br L_1051ae0
+	br L_1051af0
 // --- basic block ---
-L_1051ac4:
-// 0x01051ac4: 0x1051ac4: lui   a1, 0x10000
+L_1051ad4:
+// 0x01051ad4: 0x1051ad4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051ac8: 0x1051ac8: lui   a3, 0x10000
+// 0x01051ad8: 0x1051ad8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01051acc: 0x1051acc: addiu a1, a1, 5116
+// 0x01051adc: 0x1051adc: addiu a1, a1, 5112
 	ldloc.2
-	ldc.i4 5116
+	ldc.i4 5112
 	add
 	stloc.2
-// 0x01051ad0: 0x1051ad0: addiu a3, a3, 5132
+// 0x01051ae0: 0x1051ae0: addiu a3, a3, 5128
 	ldloc 4
-	ldc.i4 5132
+	ldc.i4 5128
 	add
 	stloc 4
-// 0x01051ad4: 0x1051ad4: addiu a0, zero, 4
+// 0x01051ae4: 0x1051ae4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01051ad8: 0x1051ad8: jal   0x100449c addiu a2, zero, 97
+// 0x01051ae8: 0x1051ae8: jal   0x100449c addiu a2, zero, 97
 	ldc.i4.s 97
 	stloc.3
 	ldloc.0
@@ -5578,10 +5578,10 @@ L_1051ac4:
 	stloc 5
 	stloc 8
 // --- basic block ---
-L_1051ae0:
-// 0x01051ae0: 0x1051ae0: lw    ra, 20(sp)
-// 0x01051ae4: 0x1051ae4: sll   zero, zero, 0
-// 0x01051ae8: 0x1051ae8: jr    ra addiu sp, sp, 24
+L_1051af0:
+// 0x01051af0: 0x1051af0: lw    ra, 20(sp)
+// 0x01051af4: 0x1051af4: sll   zero, zero, 0
+// 0x01051af8: 0x1051af8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5593,7 +5593,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_net_close_1051af0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_close_1051b00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 ra,int32 ecb,int32 ear)
@@ -5637,15 +5637,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051af0: 0x1051af0: addiu sp, sp, -32
+// 0x01051b00: 0x1051b00: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01051af4: 0x1051af4: addiu v0, zero, 7
+// 0x01051b04: 0x1051b04: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 6
-// 0x01051af8: 0x1051af8: sw    s0, 24(sp)
+// 0x01051b08: 0x1051b08: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5654,8 +5654,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01051afc: 0x1051afc: sw    ra, 28(sp)
-// 0x01051b00: 0x1051b00: sw    v0, 16(sp)
+// 0x01051b0c: 0x1051b0c: sw    ra, 28(sp)
+// 0x01051b10: 0x1051b10: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5664,19 +5664,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01051b04: 0x1051b04: addu  s0, a0, zero
+// 0x01051b14: 0x1051b14: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01051b08: 0x1051b08: lui   a0, 0x1050000
+// 0x01051b18: 0x1051b18: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01051b0c: 0x1051b0c: addiu a0, a0, 7568
+// 0x01051b1c: 0x1051b1c: addiu a0, a0, 7584
 	ldloc.1
-	ldc.i4 7568
+	ldc.i4 7584
 	add
 	stloc.1
-L_1051b10:
-// 0x01051b10: 0x1051b10: jal   0x1000120 addiu a1, sp, 16
+L_1051b20:
+// 0x01051b20: 0x1051b20: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -5686,19 +5686,19 @@ L_1051b10:
 	ldloc.2
 	stloc 11
 // --- basic block ---
-// 0x01051b18: 0x1051b18: lw    v0, 0(zero)
+// 0x01051b28: 0x1051b28: lw    v0, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01051b1c: 0x1051b1c: sll   zero, zero, 0
-// 0x01051b20: 0x1051b20: beq   v0, zero, 0x1051c4c sll   zero, zero, 0
+// 0x01051b2c: 0x1051b2c: sll   zero, zero, 0
+// 0x01051b30: 0x1051b30: beq   v0, zero, 0x1051c5c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1051c4c
+	brfalse L_1051c5c
 // --- basic block ---
-// 0x01051b28: 0x1051b28: lw    v1, 20(s0)
+// 0x01051b38: 0x1051b38: lw    v1, 20(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5707,19 +5707,19 @@ L_1051b10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051b2c: 0x1051b2c: sll   zero, zero, 0
-// 0x01051b30: 0x1051b30: beq   v1, zero, 0x1051b58 sll   zero, zero, 0
+// 0x01051b3c: 0x1051b3c: sll   zero, zero, 0
+// 0x01051b40: 0x1051b40: beq   v1, zero, 0x1051b68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1051b58
+	brfalse L_1051b68
 // --- basic block ---
-// 0x01051b38: 0x1051b38: cibyl_sysc_arg 0x3
+// 0x01051b48: 0x1051b48: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051b3c: 0x1051b3c: cibyl_sysc 0x1aa9
+// 0x01051b4c: 0x1051b4c: cibyl_sysc 0x1aa9
 	call void [WazeWP7]Syscalls::NOPH_OutputStream_close(int32)
-// 0x01051b40: 0x1051b40: addu  v1, v0, zero
+// 0x01051b50: 0x1051b50: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x01051b44: 0x1051b44: lw    v1, 20(s0)
+// 0x01051b54: 0x1051b54: lw    v1, 20(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5728,16 +5728,16 @@ L_1051b10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051b48: 0x1051b48: sll   zero, zero, 0
-// 0x01051b4c: 0x1051b4c: cibyl_sysc_arg 0x3
+// 0x01051b58: 0x1051b58: sll   zero, zero, 0
+// 0x01051b5c: 0x1051b5c: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051b50: 0x1051b50: cibyl_sysc 0x1ac1
+// 0x01051b60: 0x1051b60: cibyl_sysc 0x1ac1
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01051b54: 0x1051b54: addu  v1, v0, zero
+// 0x01051b64: 0x1051b64: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-L_1051b58:
-// 0x01051b58: 0x1051b58: lw    v1, 16(s0)
+L_1051b68:
+// 0x01051b68: 0x1051b68: lw    v1, 16(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5746,19 +5746,19 @@ L_1051b58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051b5c: 0x1051b5c: sll   zero, zero, 0
-// 0x01051b60: 0x1051b60: beq   v1, zero, 0x1051b88 sll   zero, zero, 0
+// 0x01051b6c: 0x1051b6c: sll   zero, zero, 0
+// 0x01051b70: 0x1051b70: beq   v1, zero, 0x1051b98 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1051b88
+	brfalse L_1051b98
 // --- basic block ---
-// 0x01051b68: 0x1051b68: cibyl_sysc_arg 0x3
+// 0x01051b78: 0x1051b78: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051b6c: 0x1051b6c: cibyl_sysc 0x1acd
+// 0x01051b7c: 0x1051b7c: cibyl_sysc 0x1acd
 	call void [WazeWP7]Syscalls::NOPH_InputStream_close(int32)
-// 0x01051b70: 0x1051b70: addu  v1, v0, zero
+// 0x01051b80: 0x1051b80: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x01051b74: 0x1051b74: lw    v1, 16(s0)
+// 0x01051b84: 0x1051b84: lw    v1, 16(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5767,16 +5767,16 @@ L_1051b58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051b78: 0x1051b78: sll   zero, zero, 0
-// 0x01051b7c: 0x1051b7c: cibyl_sysc_arg 0x3
+// 0x01051b88: 0x1051b88: sll   zero, zero, 0
+// 0x01051b8c: 0x1051b8c: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051b80: 0x1051b80: cibyl_sysc 0x1ae4
+// 0x01051b90: 0x1051b90: cibyl_sysc 0x1ae4
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01051b84: 0x1051b84: addu  v1, v0, zero
+// 0x01051b94: 0x1051b94: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-L_1051b88:
-// 0x01051b88: 0x1051b88: lw    v0, 12(s0)
+L_1051b98:
+// 0x01051b98: 0x1051b98: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5785,12 +5785,12 @@ L_1051b88:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051b8c: 0x1051b8c: sll   zero, zero, 0
-// 0x01051b90: 0x1051b90: bne   v0, zero, 0x1051ba8 sll   zero, zero, 0
+// 0x01051b9c: 0x1051b9c: sll   zero, zero, 0
+// 0x01051ba0: 0x1051ba0: bne   v0, zero, 0x1051bb8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1051ba8
+	brtrue L_1051bb8
 // --- basic block ---
-// 0x01051b98: 0x1051b98: lw    v0, 8(s0)
+// 0x01051ba8: 0x1051ba8: lw    v0, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5799,21 +5799,21 @@ L_1051b88:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051b9c: 0x1051b9c: sll   zero, zero, 0
-// 0x01051ba0: 0x1051ba0: beq   v0, zero, 0x1051bb0 sll   zero, zero, 0
+// 0x01051bac: 0x1051bac: sll   zero, zero, 0
+// 0x01051bb0: 0x1051bb0: beq   v0, zero, 0x1051bc0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1051bb0
+	brfalse L_1051bc0
 // --- basic block ---
-L_1051ba8:
-// 0x01051ba8: 0x1051ba8: jal   0x103f650 sll   zero, zero, 0
+L_1051bb8:
+// 0x01051bb8: 0x1051bb8: jal   0x103f660 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl47::roadmap_net_mon_disconnect_103f650(int32)
+	call int32 Cibyl47::roadmap_net_mon_disconnect_103f660(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1051bb0:
-// 0x01051bb0: 0x1051bb0: lw    v1, 12(s0)
+L_1051bc0:
+// 0x01051bc0: 0x1051bc0: lw    v1, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5822,42 +5822,42 @@ L_1051bb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051bb4: 0x1051bb4: sll   zero, zero, 0
-// 0x01051bb8: 0x1051bb8: beq   v1, zero, 0x1051c00 sll   zero, zero, 0
+// 0x01051bc4: 0x1051bc4: sll   zero, zero, 0
+// 0x01051bc8: 0x1051bc8: beq   v1, zero, 0x1051c10 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1051c00
+	brfalse L_1051c10
 // --- basic block ---
-// 0x01051bc0: 0x1051bc0: lw    v0, 0(s0)
+// 0x01051bd0: 0x1051bd0: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01051bc4: 0x1051bc4: sll   zero, zero, 0
-// 0x01051bc8: 0x1051bc8: beq   v0, zero, 0x1051be0 sll   zero, zero, 0
+// 0x01051bd4: 0x1051bd4: sll   zero, zero, 0
+// 0x01051bd8: 0x1051bd8: beq   v0, zero, 0x1051bf0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1051be0
+	brfalse L_1051bf0
 // --- basic block ---
-// 0x01051bd0: 0x1051bd0: cibyl_sysc_arg 0x3
+// 0x01051be0: 0x1051be0: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051bd4: 0x1051bd4: cibyl_sysc 0x1af0
+// 0x01051be4: 0x1051be4: cibyl_sysc 0x1af0
 	call void [WazeWP7]Syscalls::NOPH_HttpConnection_close(int32)
-// 0x01051bd8: 0x1051bd8: j	 0x1051bec addu  v1, v0, zero
+// 0x01051be8: 0x1051be8: j	 0x1051bfc addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-	br L_1051bec
+	br L_1051bfc
 // --- basic block ---
-L_1051be0:
-// 0x01051be0: 0x1051be0: cibyl_sysc_arg 0x3
+L_1051bf0:
+// 0x01051bf0: 0x1051bf0: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051be4: 0x1051be4: cibyl_sysc 0x1b0a
+// 0x01051bf4: 0x1051bf4: cibyl_sysc 0x1b0a
 	call void [WazeWP7]Syscalls::NOPH_SocketConnection_close(int32)
-// 0x01051be8: 0x1051be8: addu  v1, v0, zero
+// 0x01051bf8: 0x1051bf8: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-L_1051bec:
-// 0x01051bec: 0x1051bec: lw    v1, 12(s0)
+L_1051bfc:
+// 0x01051bfc: 0x1051bfc: lw    v1, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5866,16 +5866,16 @@ L_1051bec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051bf0: 0x1051bf0: sll   zero, zero, 0
-// 0x01051bf4: 0x1051bf4: cibyl_sysc_arg 0x3
+// 0x01051c00: 0x1051c00: sll   zero, zero, 0
+// 0x01051c04: 0x1051c04: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051bf8: 0x1051bf8: cibyl_sysc 0x1b26
+// 0x01051c08: 0x1051c08: cibyl_sysc 0x1b26
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01051bfc: 0x1051bfc: addu  v1, v0, zero
+// 0x01051c0c: 0x1051c0c: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-L_1051c00:
-// 0x01051c00: 0x1051c00: lw    v1, 8(s0)
+L_1051c10:
+// 0x01051c10: 0x1051c10: lw    v1, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5884,19 +5884,19 @@ L_1051c00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051c04: 0x1051c04: sll   zero, zero, 0
-// 0x01051c08: 0x1051c08: beq   v1, zero, 0x1051c44 sll   zero, zero, 0
+// 0x01051c14: 0x1051c14: sll   zero, zero, 0
+// 0x01051c18: 0x1051c18: beq   v1, zero, 0x1051c54 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1051c44
+	brfalse L_1051c54
 // --- basic block ---
-// 0x01051c10: 0x1051c10: cibyl_sysc_arg 0x3
+// 0x01051c20: 0x1051c20: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051c14: 0x1051c14: cibyl_sysc 0x1b32
+// 0x01051c24: 0x1051c24: cibyl_sysc 0x1b32
 	call void [WazeWP7]Syscalls::NOPH_AsyncNet_close(int32)
-// 0x01051c18: 0x1051c18: addu  v1, v0, zero
+// 0x01051c28: 0x1051c28: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x01051c1c: 0x1051c1c: lw    v1, 8(s0)
+// 0x01051c2c: 0x1051c2c: lw    v1, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5905,15 +5905,15 @@ L_1051c00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051c20: 0x1051c20: sll   zero, zero, 0
-// 0x01051c24: 0x1051c24: cibyl_sysc_arg 0x3
+// 0x01051c30: 0x1051c30: sll   zero, zero, 0
+// 0x01051c34: 0x1051c34: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051c28: 0x1051c28: cibyl_sysc 0x1b46
+// 0x01051c38: 0x1051c38: cibyl_sysc 0x1b46
 	call void [WazeWP7]Syscalls::NOPH_AsyncNet_stopRead(int32)
-// 0x01051c2c: 0x1051c2c: addu  v1, v0, zero
+// 0x01051c3c: 0x1051c3c: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x01051c30: 0x1051c30: lw    v1, 8(s0)
+// 0x01051c40: 0x1051c40: lw    v1, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5922,16 +5922,16 @@ L_1051c00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051c34: 0x1051c34: sll   zero, zero, 0
-// 0x01051c38: 0x1051c38: cibyl_sysc_arg 0x3
+// 0x01051c44: 0x1051c44: sll   zero, zero, 0
+// 0x01051c48: 0x1051c48: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01051c3c: 0x1051c3c: cibyl_sysc 0x1b5d
+// 0x01051c4c: 0x1051c4c: cibyl_sysc 0x1b5d
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01051c40: 0x1051c40: addu  v1, v0, zero
+// 0x01051c50: 0x1051c50: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-L_1051c44:
-// 0x01051c44: 0x1051c44: jal   0x1000930 addu  a0, s0, zero
+L_1051c54:
+// 0x01051c54: 0x1051c54: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5944,12 +5944,12 @@ L_1051c44:
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1051c4c:
-// 0x01051c4c: 0x1051c4c: sll   zero, zero, 0
-// 0x01051c50: 0x1051c50: Unknown instruction 0x0
-L_1051c50:
-// 0x01051c54: 0x1051c54: sll   zero, zero, 0
-// 0x01051c58: 0x1051c58: lw    v1, 16(sp)
+L_1051c5c:
+// 0x01051c5c: 0x1051c5c: sll   zero, zero, 0
+// 0x01051c60: 0x1051c60: Unknown instruction 0x0
+L_1051c60:
+// 0x01051c64: 0x1051c64: sll   zero, zero, 0
+// 0x01051c68: 0x1051c68: lw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5958,15 +5958,15 @@ L_1051c50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051c5c: 0x1051c5c: addiu v0, zero, -1
+// 0x01051c6c: 0x1051c6c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01051c60: 0x1051c60: bne   v1, v0, 0x1051c70 sll   zero, zero, 0
+// 0x01051c70: 0x1051c70: bne   v1, v0, 0x1051c80 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1051c70
+	bne.un L_1051c80
 // --- basic block ---
-// 0x01051c68: 0x1051c68: jal   0x1051aa0 addu  a0, s0, zero
+// 0x01051c78: 0x1051c78: jal   0x1051ab0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5974,14 +5974,14 @@ L_1051c50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::print_url_1051aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::print_url_1051ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1051c70:
-// 0x01051c70: 0x1051c70: lw    ra, 28(sp)
-// 0x01051c74: 0x1051c74: lw    s0, 24(sp)
+L_1051c80:
+// 0x01051c80: 0x1051c80: lw    ra, 28(sp)
+// 0x01051c84: 0x1051c84: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5990,7 +5990,7 @@ L_1051c70:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01051c78: 0x1051c78: jr    ra addiu sp, sp, 32
+// 0x01051c88: 0x1051c88: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6002,7 +6002,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_net_remove_input_1051c80(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_remove_input_1051c90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra,int32 ecb,int32 ear)
@@ -6046,15 +6046,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051c80: 0x1051c80: addiu sp, sp, -32
+// 0x01051c90: 0x1051c90: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01051c84: 0x1051c84: addiu v0, zero, 2
+// 0x01051c94: 0x1051c94: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01051c88: 0x1051c88: sw    s0, 24(sp)
+// 0x01051c98: 0x1051c98: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6063,8 +6063,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01051c8c: 0x1051c8c: sw    ra, 28(sp)
-// 0x01051c90: 0x1051c90: sw    v0, 16(sp)
+// 0x01051c9c: 0x1051c9c: sw    ra, 28(sp)
+// 0x01051ca0: 0x1051ca0: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6073,19 +6073,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01051c94: 0x1051c94: addu  s0, a0, zero
+// 0x01051ca4: 0x1051ca4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01051c98: 0x1051c98: lui   a0, 0x1050000
+// 0x01051ca8: 0x1051ca8: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01051c9c: 0x1051c9c: addiu a0, a0, 7568
+// 0x01051cac: 0x1051cac: addiu a0, a0, 7584
 	ldloc.1
-	ldc.i4 7568
+	ldc.i4 7584
 	add
 	stloc.1
-L_1051ca0:
-// 0x01051ca0: 0x1051ca0: jal   0x1000120 addiu a1, sp, 16
+L_1051cb0:
+// 0x01051cb0: 0x1051cb0: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6095,19 +6095,19 @@ L_1051ca0:
 	ldloc.2
 	stloc 11
 // --- basic block ---
-// 0x01051ca8: 0x1051ca8: lw    v0, 0(zero)
+// 0x01051cb8: 0x1051cb8: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01051cac: 0x1051cac: sll   zero, zero, 0
-// 0x01051cb0: 0x1051cb0: beq   v0, zero, 0x1051ccc sll   zero, zero, 0
+// 0x01051cbc: 0x1051cbc: sll   zero, zero, 0
+// 0x01051cc0: 0x1051cc0: beq   v0, zero, 0x1051cdc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1051ccc
+	brfalse L_1051cdc
 // --- basic block ---
-// 0x01051cb8: 0x1051cb8: lw    v1, 8(s0)
+// 0x01051cc8: 0x1051cc8: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6116,20 +6116,20 @@ L_1051ca0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051cbc: 0x1051cbc: sll   zero, zero, 0
-// 0x01051cc0: 0x1051cc0: cibyl_sysc_arg 0x3
+// 0x01051ccc: 0x1051ccc: sll   zero, zero, 0
+// 0x01051cd0: 0x1051cd0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01051cc4: 0x1051cc4: cibyl_sysc 0x1b69
+// 0x01051cd4: 0x1051cd4: cibyl_sysc 0x1b69
 	call void [WazeWP7]Syscalls::NOPH_AsyncNet_stopRead(int32)
-// 0x01051cc8: 0x1051cc8: addu  v1, v0, zero
+// 0x01051cd8: 0x1051cd8: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-L_1051ccc:
-// 0x01051ccc: 0x1051ccc: sll   zero, zero, 0
-// 0x01051cd0: 0x1051cd0: Unknown instruction 0x0
-L_1051cd0:
-// 0x01051cd4: 0x1051cd4: sll   zero, zero, 0
-// 0x01051cd8: 0x1051cd8: lw    v1, 16(sp)
+L_1051cdc:
+// 0x01051cdc: 0x1051cdc: sll   zero, zero, 0
+// 0x01051ce0: 0x1051ce0: Unknown instruction 0x0
+L_1051ce0:
+// 0x01051ce4: 0x1051ce4: sll   zero, zero, 0
+// 0x01051ce8: 0x1051ce8: lw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6138,15 +6138,15 @@ L_1051cd0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051cdc: 0x1051cdc: addiu v0, zero, -1
+// 0x01051cec: 0x1051cec: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01051ce0: 0x1051ce0: bne   v1, v0, 0x1051cf0 sll   zero, zero, 0
+// 0x01051cf0: 0x1051cf0: bne   v1, v0, 0x1051d00 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1051cf0
+	bne.un L_1051d00
 // --- basic block ---
-// 0x01051ce8: 0x1051ce8: jal   0x1051aa0 addu  a0, s0, zero
+// 0x01051cf8: 0x1051cf8: jal   0x1051ab0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6154,14 +6154,14 @@ L_1051cd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::print_url_1051aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::print_url_1051ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1051cf0:
-// 0x01051cf0: 0x1051cf0: lw    ra, 28(sp)
-// 0x01051cf4: 0x1051cf4: lw    s0, 24(sp)
+L_1051d00:
+// 0x01051d00: 0x1051d00: lw    ra, 28(sp)
+// 0x01051d04: 0x1051d04: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6170,7 +6170,7 @@ L_1051cf0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01051cf8: 0x1051cf8: jr    ra addiu sp, sp, 32
+// 0x01051d08: 0x1051d08: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6182,7 +6182,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_set_input_1051d00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_set_input_1051d10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra,int32 ecb,int32 ear)
@@ -6229,15 +6229,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051d00: 0x1051d00: addiu sp, sp, -40
+// 0x01051d10: 0x1051d10: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01051d04: 0x1051d04: addiu v0, zero, 1
+// 0x01051d14: 0x1051d14: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01051d08: 0x1051d08: sw    s1, 32(sp)
+// 0x01051d18: 0x1051d18: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6246,7 +6246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01051d0c: 0x1051d0c: sw    s0, 28(sp)
+// 0x01051d1c: 0x1051d1c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6255,8 +6255,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01051d10: 0x1051d10: sw    ra, 36(sp)
-// 0x01051d14: 0x1051d14: sw    v0, 16(sp)
+// 0x01051d20: 0x1051d20: sw    ra, 36(sp)
+// 0x01051d24: 0x1051d24: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6265,22 +6265,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01051d18: 0x1051d18: addu  s0, a0, zero
+// 0x01051d28: 0x1051d28: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01051d1c: 0x1051d1c: addu  s1, a1, zero
+// 0x01051d2c: 0x1051d2c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01051d20: 0x1051d20: lui   a0, 0x1050000
+// 0x01051d30: 0x1051d30: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01051d24: 0x1051d24: addiu a0, a0, 7568
+// 0x01051d34: 0x1051d34: addiu a0, a0, 7584
 	ldloc.1
-	ldc.i4 7568
+	ldc.i4 7584
 	add
 	stloc.1
-L_1051d28:
-// 0x01051d28: 0x1051d28: jal   0x1000120 addiu a1, sp, 16
+L_1051d38:
+// 0x01051d38: 0x1051d38: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -6290,19 +6290,19 @@ L_1051d28:
 	ldloc.2
 	stloc 12
 // --- basic block ---
-// 0x01051d30: 0x1051d30: lw    v0, 0(zero)
+// 0x01051d40: 0x1051d40: lw    v0, 0(zero)
 	ldloc 5
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01051d34: 0x1051d34: sll   zero, zero, 0
-// 0x01051d38: 0x1051d38: beq   v0, zero, 0x1051d58 sll   zero, zero, 0
+// 0x01051d44: 0x1051d44: sll   zero, zero, 0
+// 0x01051d48: 0x1051d48: beq   v0, zero, 0x1051d68 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1051d58
+	brfalse L_1051d68
 // --- basic block ---
-// 0x01051d40: 0x1051d40: lw    v1, 8(s0)
+// 0x01051d50: 0x1051d50: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6311,22 +6311,22 @@ L_1051d28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051d44: 0x1051d44: sll   zero, zero, 0
-// 0x01051d48: 0x1051d48: cibyl_sysc_arg 0x3
+// 0x01051d54: 0x1051d54: sll   zero, zero, 0
+// 0x01051d58: 0x1051d58: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01051d4c: 0x1051d4c: cibyl_sysc_arg 0x11
+// 0x01051d5c: 0x1051d5c: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01051d50: 0x1051d50: cibyl_sysc 0x1b80
+// 0x01051d60: 0x1051d60: cibyl_sysc 0x1b80
 	call void [WazeWP7]Syscalls::NOPH_AsyncNet_startRead(int32,int32)
-// 0x01051d54: 0x1051d54: addu  s1, v0, zero
+// 0x01051d64: 0x1051d64: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-L_1051d58:
-// 0x01051d58: 0x1051d58: sll   zero, zero, 0
-// 0x01051d5c: 0x1051d5c: Unknown instruction 0x0
-L_1051d5c:
-// 0x01051d60: 0x1051d60: sll   zero, zero, 0
-// 0x01051d64: 0x1051d64: lw    v1, 16(sp)
+L_1051d68:
+// 0x01051d68: 0x1051d68: sll   zero, zero, 0
+// 0x01051d6c: 0x1051d6c: Unknown instruction 0x0
+L_1051d6c:
+// 0x01051d70: 0x1051d70: sll   zero, zero, 0
+// 0x01051d74: 0x1051d74: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6335,15 +6335,15 @@ L_1051d5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051d68: 0x1051d68: addiu v0, zero, -1
+// 0x01051d78: 0x1051d78: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01051d6c: 0x1051d6c: bne   v1, v0, 0x1051d7c sll   zero, zero, 0
+// 0x01051d7c: 0x1051d7c: bne   v1, v0, 0x1051d8c sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	bne.un L_1051d7c
+	bne.un L_1051d8c
 // --- basic block ---
-// 0x01051d74: 0x1051d74: jal   0x1051aa0 addu  a0, s0, zero
+// 0x01051d84: 0x1051d84: jal   0x1051ab0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6351,14 +6351,14 @@ L_1051d5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::print_url_1051aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::print_url_1051ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1051d7c:
-// 0x01051d7c: 0x1051d7c: lw    ra, 36(sp)
-// 0x01051d80: 0x1051d80: lw    s1, 32(sp)
+L_1051d8c:
+// 0x01051d8c: 0x1051d8c: lw    ra, 36(sp)
+// 0x01051d90: 0x1051d90: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6367,7 +6367,7 @@ L_1051d7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01051d84: 0x1051d84: lw    s0, 28(sp)
+// 0x01051d94: 0x1051d94: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6376,7 +6376,7 @@ L_1051d7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01051d88: 0x1051d88: jr    ra addiu sp, sp, 40
+// 0x01051d98: 0x1051d98: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6388,7 +6388,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 general_net_exception_handler_1051d90(int32,int32,int32,int32,int32)
+.method public static int32 general_net_exception_handler_1051da0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -6426,12 +6426,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051d90: 0x1051d90: addiu sp, sp, -544
+// 0x01051da0: 0x1051da0: addiu sp, sp, -544
 	ldloc.0
 	ldc.i4 -544
 	add
 	stloc.0
-// 0x01051d94: 0x1051d94: sw    s0, 536(sp)
+// 0x01051da4: 0x1051da4: sw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6440,68 +6440,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01051d98: 0x1051d98: sw    ra, 540(sp)
-// 0x01051d9c: 0x1051d9c: addu  s0, a1, zero
+// 0x01051da8: 0x1051da8: sw    ra, 540(sp)
+// 0x01051dac: 0x1051dac: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01051da0: 0x1051da0: cibyl_sysc_arg 0x4
+// 0x01051db0: 0x1051db0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051da4: 0x1051da4: cibyl_sysc 0x1b98
+// 0x01051db4: 0x1051db4: cibyl_sysc 0x1b98
 	call int32 [WazeWP7]Syscalls::NOPH_Throwable_toString(int32)
 	stloc 5
-// 0x01051da8: 0x1051da8: addu  a0, v0, zero
+// 0x01051db8: 0x1051db8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01051dac: 0x1051dac: addiu a1, zero, 512
+// 0x01051dbc: 0x1051dbc: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x01051db0: 0x1051db0: addiu v1, sp, 24
+// 0x01051dc0: 0x1051dc0: addiu v1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x01051db4: 0x1051db4: cibyl_sysc_arg 0x4
+// 0x01051dc4: 0x1051dc4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051db8: 0x1051db8: cibyl_sysc_arg 0x3
+// 0x01051dc8: 0x1051dc8: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x01051dbc: 0x1051dbc: cibyl_sysc_arg 0x5
+// 0x01051dcc: 0x1051dcc: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01051dc0: 0x1051dc0: cibyl_sysc 0x1bb0
+// 0x01051dd0: 0x1051dd0: cibyl_sysc 0x1bb0
 	call int32 [WazeWP7]Syscalls::NOPH_String_toCharPtr(int32,int32,int32)
 	stloc 5
-// 0x01051dc4: 0x1051dc4: addu  a0, v0, zero
+// 0x01051dd4: 0x1051dd4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01051dc8: 0x1051dc8: lui   a1, 0x10000
+// 0x01051dd8: 0x1051dd8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051dcc: 0x1051dcc: lw    v0, 0(s0)
+// 0x01051ddc: 0x1051ddc: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01051dd0: 0x1051dd0: lui   a3, 0x10000
+// 0x01051de0: 0x1051de0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01051dd4: 0x1051dd4: addiu a1, a1, 5116
+// 0x01051de4: 0x1051de4: addiu a1, a1, 5112
 	ldloc.2
-	ldc.i4 5116
+	ldc.i4 5112
 	add
 	stloc.2
-// 0x01051dd8: 0x1051dd8: addiu a3, a3, 5184
+// 0x01051de8: 0x1051de8: addiu a3, a3, 5180
 	ldloc 4
-	ldc.i4 5184
+	ldc.i4 5180
 	add
 	stloc 4
-// 0x01051ddc: 0x1051ddc: addiu a0, zero, 4
+// 0x01051dec: 0x1051dec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01051de0: 0x1051de0: addiu a2, zero, 108
+// 0x01051df0: 0x1051df0: addiu a2, zero, 108
 	ldc.i4.s 108
 	stloc.3
-// 0x01051de4: 0x1051de4: sw    v0, 20(sp)
+// 0x01051df4: 0x1051df4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6510,7 +6510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01051de8: 0x1051de8: jal   0x100449c sw    v1, 16(sp)
+// 0x01051df8: 0x1051df8: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6529,18 +6529,18 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01051df0: 0x1051df0: lw    ra, 540(sp)
-// 0x01051df4: 0x1051df4: addiu v0, zero, -1
+// 0x01051e00: 0x1051e00: lw    ra, 540(sp)
+// 0x01051e04: 0x1051e04: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01051df8: 0x1051df8: sw    v0, 0(s0)
+// 0x01051e08: 0x1051e08: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01051dfc: 0x1051dfc: lw    s0, 536(sp)
+// 0x01051e0c: 0x1051e0c: lw    s0, 536(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6549,7 +6549,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051e00: 0x1051e00: jr    ra addiu sp, sp, 544
+// 0x01051e10: 0x1051e10: jr    ra addiu sp, sp, 544
 	ldloc.0
 	ldc.i4 544
 	add
diff --git a/converted/Cibyl61.j b/converted/Cibyl61.j
index 197a1f8..07297de 100644
--- a/converted/Cibyl61.j
+++ b/converted/Cibyl61.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl61::.ctor
 
-.method public static int32 do_async_exception_handler_1051e08(int32,int32,int32,int32,int32)
+.method public static int32 do_async_exception_handler_1051e18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -79,12 +79,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051e08: 0x1051e08: addiu sp, sp, -40
+// 0x01051e18: 0x1051e18: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01051e0c: 0x1051e0c: lw    v0, 8(a1)
+// 0x01051e1c: 0x1051e1c: lw    v0, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -93,7 +93,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01051e10: 0x1051e10: lw    v1, 4(a1)
+// 0x01051e20: 0x1051e20: lw    v1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -102,7 +102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01051e14: 0x1051e14: sw    s0, 32(sp)
+// 0x01051e24: 0x1051e24: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -111,37 +111,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01051e18: 0x1051e18: lui   a3, 0x10000
+// 0x01051e28: 0x1051e28: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01051e1c: 0x1051e1c: lw    s0, 0(a1)
+// 0x01051e2c: 0x1051e2c: lw    s0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01051e20: 0x1051e20: lui   a1, 0x10000
+// 0x01051e30: 0x1051e30: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01051e24: 0x1051e24: addiu a1, a1, 5116
+// 0x01051e34: 0x1051e34: addiu a1, a1, 5112
 	ldloc.2
-	ldc.i4 5116
+	ldc.i4 5112
 	add
 	stloc.2
-// 0x01051e28: 0x1051e28: addiu a3, a3, 5248
+// 0x01051e38: 0x1051e38: addiu a3, a3, 5244
 	ldloc 4
-	ldc.i4 5248
+	ldc.i4 5244
 	add
 	stloc 4
-// 0x01051e2c: 0x1051e2c: addiu a0, zero, 4
+// 0x01051e3c: 0x1051e3c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01051e30: 0x1051e30: addiu a2, zero, 79
+// 0x01051e40: 0x1051e40: addiu a2, zero, 79
 	ldc.i4.s 79
 	stloc.3
-// 0x01051e34: 0x1051e34: sw    ra, 36(sp)
-// 0x01051e38: 0x1051e38: sw    v1, 20(sp)
+// 0x01051e44: 0x1051e44: sw    ra, 36(sp)
+// 0x01051e48: 0x1051e48: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -150,7 +150,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01051e3c: 0x1051e3c: sw    v0, 24(sp)
+// 0x01051e4c: 0x1051e4c: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -159,7 +159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01051e40: 0x1051e40: jal   0x100449c sw    s0, 16(sp)
+// 0x01051e50: 0x1051e50: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -178,15 +178,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01051e48: 0x1051e48: cibyl_sysc_arg 0x10
+// 0x01051e58: 0x1051e58: cibyl_sysc_arg 0x10
 	ldloc 6
-// 0x01051e4c: 0x1051e4c: cibyl_sysc 0x1bc6
+// 0x01051e5c: 0x1051e5c: cibyl_sysc 0x1bc6
 	call void [WazeWP7]Syscalls::NOPH_AsyncNet_printUrl(int32)
-// 0x01051e50: 0x1051e50: addu  s0, v0, zero
+// 0x01051e60: 0x1051e60: addu  s0, v0, zero
 	ldloc 7
 	stloc 6
-// 0x01051e54: 0x1051e54: lw    ra, 36(sp)
-// 0x01051e58: 0x1051e58: lw    s0, 32(sp)
+// 0x01051e64: 0x1051e64: lw    ra, 36(sp)
+// 0x01051e68: 0x1051e68: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -195,7 +195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051e5c: 0x1051e5c: jr    ra addiu sp, sp, 40
+// 0x01051e6c: 0x1051e6c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -207,7 +207,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_net_receive_1051e64(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_receive_1051e74(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 ra,int32 ecb,int32 ear)
@@ -257,15 +257,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01051e64: 0x1051e64: addiu sp, sp, -56
+// 0x01051e74: 0x1051e74: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01051e68: 0x1051e68: addiu v0, zero, 6
+// 0x01051e78: 0x1051e78: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x01051e6c: 0x1051e6c: sw    s1, 44(sp)
+// 0x01051e7c: 0x1051e7c: sw    s1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -274,7 +274,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01051e70: 0x1051e70: sw    s0, 40(sp)
+// 0x01051e80: 0x1051e80: sw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -283,8 +283,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01051e74: 0x1051e74: sw    ra, 52(sp)
-// 0x01051e78: 0x1051e78: sw    s2, 48(sp)
+// 0x01051e84: 0x1051e84: sw    ra, 52(sp)
+// 0x01051e88: 0x1051e88: sw    s2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -293,7 +293,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01051e7c: 0x1051e7c: sw    v0, 28(sp)
+// 0x01051e8c: 0x1051e8c: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -302,33 +302,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01051e80: 0x1051e80: sh    zero, 24(sp)
+// 0x01051e90: 0x1051e90: sh    zero, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01051e84: 0x1051e84: addu  s0, a0, zero
+// 0x01051e94: 0x1051e94: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01051e88: 0x1051e88: addu  s1, a1, zero
+// 0x01051e98: 0x1051e98: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01051e8c: 0x1051e8c: lui   a0, 0x1050000
+// 0x01051e9c: 0x1051e9c: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01051e90: 0x1051e90: addiu a0, a0, 7568
+// 0x01051ea0: 0x1051ea0: addiu a0, a0, 7584
 	ldloc.1
-	ldc.i4 7568
+	ldc.i4 7584
 	add
 	stloc.1
-// 0x01051e94: 0x1051e94: addiu a1, sp, 28
+// 0x01051ea4: 0x1051ea4: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-L_1051e98:
-// 0x01051e98: 0x1051e98: jal   0x1000120 sw    a2, 32(sp)
+L_1051ea8:
+// 0x01051ea8: 0x1051ea8: jal   0x1000120 sw    a2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -342,14 +342,14 @@ L_1051e98:
 	ldloc.2
 	stloc 13
 // --- basic block ---
-// 0x01051ea0: 0x1051ea0: lw    v0, 0(zero)
+// 0x01051eb0: 0x1051eb0: lw    v0, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01051ea4: 0x1051ea4: lw    a2, 32(sp)
+// 0x01051eb4: 0x1051eb4: lw    a2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -358,13 +358,13 @@ L_1051e98:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01051ea8: 0x1051ea8: beq   v0, zero, 0x1051fd4 addu  s2, zero, zero
+// 0x01051eb8: 0x1051eb8: beq   v0, zero, 0x1051fe4 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_1051fd4
+	brfalse L_1051fe4
 // --- basic block ---
-// 0x01051eb0: 0x1051eb0: lw    v1, 8(s0)
+// 0x01051ec0: 0x1051ec0: lw    v1, 8(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -373,24 +373,24 @@ L_1051e98:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051eb4: 0x1051eb4: sll   zero, zero, 0
-// 0x01051eb8: 0x1051eb8: beq   v1, zero, 0x1051f00 sll   zero, zero, 0
+// 0x01051ec4: 0x1051ec4: sll   zero, zero, 0
+// 0x01051ec8: 0x1051ec8: beq   v1, zero, 0x1051f10 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1051f00
+	brfalse L_1051f10
 // --- basic block ---
-// 0x01051ec0: 0x1051ec0: cibyl_sysc_arg 0x3
+// 0x01051ed0: 0x1051ed0: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051ec4: 0x1051ec4: cibyl_sysc 0x1bdd
+// 0x01051ed4: 0x1051ed4: cibyl_sysc 0x1bdd
 	call int32 [WazeWP7]Syscalls::NOPH_AsyncNet_isReading(int32)
 	stloc 5
-// 0x01051ec8: 0x1051ec8: addu  v1, v0, zero
+// 0x01051ed8: 0x1051ed8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01051ecc: 0x1051ecc: beq   v1, zero, 0x1051f00 sll   zero, zero, 0
+// 0x01051edc: 0x1051edc: beq   v1, zero, 0x1051f10 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1051f00
+	brfalse L_1051f10
 // --- basic block ---
-// 0x01051ed4: 0x1051ed4: lw    v1, 8(s0)
+// 0x01051ee4: 0x1051ee4: lw    v1, 8(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -399,20 +399,20 @@ L_1051e98:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051ed8: 0x1051ed8: sll   zero, zero, 0
-// 0x01051edc: 0x1051edc: cibyl_sysc_arg 0x3
+// 0x01051ee8: 0x1051ee8: sll   zero, zero, 0
+// 0x01051eec: 0x1051eec: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051ee0: 0x1051ee0: cibyl_sysc_arg 0x11
+// 0x01051ef0: 0x1051ef0: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x01051ee4: 0x1051ee4: cibyl_sysc_arg 0x6
+// 0x01051ef4: 0x1051ef4: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01051ee8: 0x1051ee8: cibyl_sysc 0x1bf5
+// 0x01051ef8: 0x1051ef8: cibyl_sysc 0x1bf5
 	call int32 [WazeWP7]Syscalls::NOPH_AsyncNet_read(int32,int32,int32)
 	stloc 5
-// 0x01051eec: 0x1051eec: addu  s1, v0, zero
+// 0x01051efc: 0x1051efc: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01051ef0: 0x1051ef0: jal   0x103f7a8 addu  a0, s1, zero
+// 0x01051f00: 0x1051f00: jal   0x103f7b8 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -420,30 +420,30 @@ L_1051e98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_recv_103f7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_recv_103f7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051ef8: 0x1051ef8: j	 0x1051ffc sll   zero, zero, 0
-	br L_1051ffc
+// 0x01051f08: 0x1051f08: j	 0x105200c sll   zero, zero, 0
+	br L_105200c
 // --- basic block ---
-L_1051f00:
-// 0x01051f00: 0x1051f00: lw    v0, 0(s0)
+L_1051f10:
+// 0x01051f10: 0x1051f10: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01051f04: 0x1051f04: sll   zero, zero, 0
-// 0x01051f08: 0x1051f08: beq   v0, zero, 0x1051fc0 addu  s2, zero, zero
+// 0x01051f14: 0x1051f14: sll   zero, zero, 0
+// 0x01051f18: 0x1051f18: beq   v0, zero, 0x1051fd0 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_1051fc0
+	brfalse L_1051fd0
 // --- basic block ---
-// 0x01051f10: 0x1051f10: lw    v0, 16(s0)
+// 0x01051f20: 0x1051f20: lw    v0, 16(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -452,12 +452,12 @@ L_1051f00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01051f14: 0x1051f14: sll   zero, zero, 0
-// 0x01051f18: 0x1051f18: bne   v0, zero, 0x1051fc0 sll   zero, zero, 0
+// 0x01051f24: 0x1051f24: sll   zero, zero, 0
+// 0x01051f28: 0x1051f28: bne   v0, zero, 0x1051fd0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1051fc0
+	brtrue L_1051fd0
 // --- basic block ---
-// 0x01051f20: 0x1051f20: lw    v1, 12(s0)
+// 0x01051f30: 0x1051f30: lw    v1, 12(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -466,16 +466,16 @@ L_1051f00:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051f24: 0x1051f24: sll   zero, zero, 0
-// 0x01051f28: 0x1051f28: cibyl_sysc_arg 0x3
+// 0x01051f34: 0x1051f34: sll   zero, zero, 0
+// 0x01051f38: 0x1051f38: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051f2c: 0x1051f2c: cibyl_sysc 0x1c08
+// 0x01051f3c: 0x1051f3c: cibyl_sysc 0x1c08
 	call int32 [WazeWP7]Syscalls::NOPH_HttpConnection_openInputStream(int32)
 	stloc 5
-// 0x01051f30: 0x1051f30: addu  v1, v0, zero
+// 0x01051f40: 0x1051f40: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01051f34: 0x1051f34: sw    v1, 16(s0)
+// 0x01051f44: 0x1051f44: sw    v1, 16(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -484,7 +484,7 @@ L_1051f00:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01051f38: 0x1051f38: lw    a3, 12(s0)
+// 0x01051f48: 0x1051f48: lw    a3, 12(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -493,16 +493,16 @@ L_1051f00:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01051f3c: 0x1051f3c: sll   zero, zero, 0
-// 0x01051f40: 0x1051f40: cibyl_sysc_arg 0x7
+// 0x01051f4c: 0x1051f4c: sll   zero, zero, 0
+// 0x01051f50: 0x1051f50: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01051f44: 0x1051f44: cibyl_sysc 0x1c2c
+// 0x01051f54: 0x1051f54: cibyl_sysc 0x1c2c
 	call int32 [WazeWP7]Syscalls::NOPH_HttpConnection_getResponseCode(int32)
 	stloc 5
-// 0x01051f48: 0x1051f48: addu  a3, v0, zero
+// 0x01051f58: 0x1051f58: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01051f4c: 0x1051f4c: lw    v1, 12(s0)
+// 0x01051f5c: 0x1051f5c: lw    v1, 12(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -511,30 +511,30 @@ L_1051f00:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051f50: 0x1051f50: sll   zero, zero, 0
-// 0x01051f54: 0x1051f54: cibyl_sysc_arg 0x3
+// 0x01051f60: 0x1051f60: sll   zero, zero, 0
+// 0x01051f64: 0x1051f64: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051f58: 0x1051f58: cibyl_sysc 0x1c50
+// 0x01051f68: 0x1051f68: cibyl_sysc 0x1c50
 	call int32 [WazeWP7]Syscalls::NOPH_HttpConnection_getLength(int32)
 	stloc 5
-// 0x01051f5c: 0x1051f5c: addu  v1, v0, zero
+// 0x01051f6c: 0x1051f6c: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01051f60: 0x1051f60: addu  a1, a2, zero
+// 0x01051f70: 0x1051f70: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x01051f64: 0x1051f64: lui   a2, 0x10000
+// 0x01051f74: 0x1051f74: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01051f68: 0x1051f68: addu  a0, s1, zero
+// 0x01051f78: 0x1051f78: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01051f6c: 0x1051f6c: addiu a2, a2, 5320
+// 0x01051f7c: 0x1051f7c: addiu a2, a2, 5316
 	ldloc.3
-	ldc.i4 5320
+	ldc.i4 5316
 	add
 	stloc.3
-// 0x01051f70: 0x1051f70: jal   0x1000f9c sw    v1, 16(sp)
+// 0x01051f80: 0x1051f80: jal   0x1000f9c sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -553,13 +553,13 @@ L_1051f00:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051f78: 0x1051f78: j	 0x1051ffc addu  s1, v0, zero
+// 0x01051f88: 0x1051f88: j	 0x105200c addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-	br L_1051ffc
+	br L_105200c
 // --- basic block ---
-L_1051f80:
-// 0x01051f80: 0x1051f80: lw    a1, 16(s0)
+L_1051f90:
+// 0x01051f90: 0x1051f90: lw    a1, 16(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -568,74 +568,74 @@ L_1051f80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01051f84: 0x1051f84: bne   v0, zero, 0x1051f90 addu  v1, a2, zero
+// 0x01051f94: 0x1051f94: bne   v0, zero, 0x1051fa0 addu  v1, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 6
-	brtrue L_1051f90
+	brtrue L_1051fa0
 // --- basic block ---
-// 0x01051f8c: 0x1051f8c: addiu v1, zero, 4096
+// 0x01051f9c: 0x1051f9c: addiu v1, zero, 4096
 	ldc.i4 4096
 	stloc 6
-L_1051f90:
-// 0x01051f90: 0x1051f90: cibyl_sysc_arg 0x5
+L_1051fa0:
+// 0x01051fa0: 0x1051fa0: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01051f94: 0x1051f94: cibyl_sysc_arg 0x11
+// 0x01051fa4: 0x1051fa4: cibyl_sysc_arg 0x11
 	ldloc 8
-// 0x01051f98: 0x1051f98: cibyl_sysc_arg 0x3
+// 0x01051fa8: 0x1051fa8: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01051f9c: 0x1051f9c: cibyl_sysc_arg 0x4
+// 0x01051fac: 0x1051fac: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01051fa0: 0x1051fa0: cibyl_sysc 0x1c6e
+// 0x01051fb0: 0x1051fb0: cibyl_sysc 0x1c6e
 	call int32 [WazeWP7]Syscalls::NOPH_InputStream_read_into(int32,int32,int32,int32)
 	stloc 5
-// 0x01051fa4: 0x1051fa4: addu  v1, v0, zero
+// 0x01051fb4: 0x1051fb4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01051fa8: 0x1051fa8: lh    v0, 24(sp)
+// 0x01051fb8: 0x1051fb8: lh    v0, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01051fac: 0x1051fac: addu  s1, s1, v1
+// 0x01051fbc: 0x1051fbc: addu  s1, s1, v1
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x01051fb0: 0x1051fb0: bne   v0, zero, 0x1051fcc addu  s2, s2, v1
+// 0x01051fc0: 0x1051fc0: bne   v0, zero, 0x1051fdc addu  s2, s2, v1
 	ldloc 5
 	ldloc 10
 	ldloc 6
 	add
 	stloc 10
-	brtrue L_1051fcc
+	brtrue L_1051fdc
 // --- basic block ---
-// 0x01051fb8: 0x1051fb8: j	 0x1051fc4 subu  a2, a2, v1
+// 0x01051fc8: 0x1051fc8: j	 0x1051fd4 subu  a2, a2, v1
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-	br L_1051fc4
+	br L_1051fd4
 // --- basic block ---
-L_1051fc0:
-// 0x01051fc0: 0x1051fc0: addiu a0, sp, 24
+L_1051fd0:
+// 0x01051fd0: 0x1051fd0: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-L_1051fc4:
-// 0x01051fc4: 0x1051fc4: bgtz  a2, 0x1051f80 slti  v0, a2, 4097
+L_1051fd4:
+// 0x01051fd4: 0x1051fd4: bgtz  a2, 0x1051f90 slti  v0, a2, 4097
 	ldloc.3
 	ldloc.3
 	ldc.i4 4097
 	clt
 	stloc 5
 	ldc.i4.s 0
-	bgt L_1051f80
+	bgt L_1051f90
 // --- basic block ---
-L_1051fcc:
-// 0x01051fcc: 0x1051fcc: jal   0x103f7a8 addu  a0, s2, zero
+L_1051fdc:
+// 0x01051fdc: 0x1051fdc: jal   0x103f7b8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -643,17 +643,17 @@ L_1051fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_recv_103f7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_recv_103f7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1051fd4:
-// 0x01051fd4: 0x1051fd4: sll   zero, zero, 0
-// 0x01051fd8: 0x1051fd8: Unknown instruction 0x0
-L_1051fd8:
-// 0x01051fdc: 0x1051fdc: sll   zero, zero, 0
-// 0x01051fe0: 0x1051fe0: lw    v1, 28(sp)
+L_1051fe4:
+// 0x01051fe4: 0x1051fe4: sll   zero, zero, 0
+// 0x01051fe8: 0x1051fe8: Unknown instruction 0x0
+L_1051fe8:
+// 0x01051fec: 0x1051fec: sll   zero, zero, 0
+// 0x01051ff0: 0x1051ff0: lw    v1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -662,17 +662,17 @@ L_1051fd8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01051fe4: 0x1051fe4: addiu v0, zero, -1
+// 0x01051ff4: 0x1051ff4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01051fe8: 0x1051fe8: bne   v1, v0, 0x1051ffc addu  s1, s2, zero
+// 0x01051ff8: 0x1051ff8: bne   v1, v0, 0x105200c addu  s1, s2, zero
 	ldloc 6
 	ldloc 5
 	ldloc 10
 	stloc 8
-	bne.un L_1051ffc
+	bne.un L_105200c
 // --- basic block ---
-// 0x01051ff0: 0x1051ff0: jal   0x1051aa0 addu  a0, s0, zero
+// 0x01052000: 0x1052000: jal   0x1051ab0 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -680,12 +680,12 @@ L_1051fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::print_url_1051aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::print_url_1051ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01051ff8: 0x1051ff8: lw    s1, 28(sp)
+// 0x01052008: 0x1052008: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -694,12 +694,12 @@ L_1051fd8:
 	add
 	ldelem.i4
 	stloc 8
-L_1051ffc:
-// 0x01051ffc: 0x1051ffc: lw    ra, 52(sp)
-// 0x01052000: 0x1052000: addu  v0, s1, zero
+L_105200c:
+// 0x0105200c: 0x105200c: lw    ra, 52(sp)
+// 0x01052010: 0x1052010: addu  v0, s1, zero
 	ldloc 8
 	stloc 5
-// 0x01052004: 0x1052004: lw    s2, 48(sp)
+// 0x01052014: 0x1052014: lw    s2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -708,7 +708,7 @@ L_1051ffc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01052008: 0x1052008: lw    s1, 44(sp)
+// 0x01052018: 0x1052018: lw    s1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -717,7 +717,7 @@ L_1051ffc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105200c: 0x105200c: lw    s0, 40(sp)
+// 0x0105201c: 0x105201c: lw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -726,7 +726,7 @@ L_1051ffc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01052010: 0x1052010: jr    ra addiu sp, sp, 56
+// 0x01052020: 0x1052020: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -738,7 +738,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_send_1052018(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_send_1052028(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s0,int32 s3,int32 s5,int32 s4,int32 s8,int32 s6,int32 s7,int32 ra,int32 ecb,int32 ear)
@@ -806,15 +806,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052018: 0x1052018: addiu sp, sp, -64
+// 0x01052028: 0x1052028: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0105201c: 0x105201c: addiu v0, zero, 5
+// 0x0105202c: 0x105202c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01052020: 0x1052020: sw    s4, 40(sp)
+// 0x01052030: 0x1052030: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -823,7 +823,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01052024: 0x1052024: sw    s1, 28(sp)
+// 0x01052034: 0x1052034: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -832,7 +832,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052028: 0x1052028: sw    s0, 24(sp)
+// 0x01052038: 0x1052038: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -841,8 +841,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105202c: 0x105202c: sw    ra, 60(sp)
-// 0x01052030: 0x1052030: sw    s8, 56(sp)
+// 0x0105203c: 0x105203c: sw    ra, 60(sp)
+// 0x01052040: 0x1052040: sw    s8, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -851,7 +851,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01052034: 0x1052034: sw    s7, 52(sp)
+// 0x01052044: 0x1052044: sw    s7, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -860,7 +860,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01052038: 0x1052038: sw    s6, 48(sp)
+// 0x01052048: 0x1052048: sw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -869,7 +869,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105203c: 0x105203c: sw    s5, 44(sp)
+// 0x0105204c: 0x105204c: sw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -878,7 +878,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01052040: 0x1052040: sw    s3, 36(sp)
+// 0x01052050: 0x1052050: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -887,7 +887,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01052044: 0x1052044: sw    s2, 32(sp)
+// 0x01052054: 0x1052054: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -896,7 +896,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01052048: 0x1052048: sw    v0, 16(sp)
+// 0x01052058: 0x1052058: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -905,25 +905,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105204c: 0x105204c: addu  s0, a0, zero
+// 0x0105205c: 0x105205c: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01052050: 0x1052050: addu  s1, a1, zero
+// 0x01052060: 0x1052060: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01052054: 0x1052054: addu  s4, a2, zero
+// 0x01052064: 0x1052064: addu  s4, a2, zero
 	ldloc.3
 	stloc 13
-// 0x01052058: 0x1052058: lui   a0, 0x1050000
+// 0x01052068: 0x1052068: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0105205c: 0x105205c: addiu a0, a0, 7568
+// 0x0105206c: 0x105206c: addiu a0, a0, 7584
 	ldloc.1
-	ldc.i4 7568
+	ldc.i4 7584
 	add
 	stloc.1
-L_1052060:
-// 0x01052060: 0x1052060: jal   0x1000120 addiu a1, sp, 16
+L_1052070:
+// 0x01052070: 0x1052070: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -933,33 +933,33 @@ L_1052060:
 	ldloc.2
 	stloc 19
 // --- basic block ---
-// 0x01052068: 0x1052068: lw    v0, 0(zero)
+// 0x01052078: 0x1052078: lw    v0, 0(zero)
 	ldloc 6
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105206c: 0x105206c: sll   zero, zero, 0
-// 0x01052070: 0x1052070: beq   v0, zero, 0x10521f4 sll   zero, zero, 0
+// 0x0105207c: 0x105207c: sll   zero, zero, 0
+// 0x01052080: 0x1052080: beq   v0, zero, 0x1052204 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10521f4
+	brfalse L_1052204
 // --- basic block ---
-// 0x01052078: 0x1052078: lw    v0, 0(s0)
+// 0x01052088: 0x1052088: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105207c: 0x105207c: sll   zero, zero, 0
-// 0x01052080: 0x1052080: beq   v0, zero, 0x10521ac addu  s2, s4, zero
+// 0x0105208c: 0x105208c: sll   zero, zero, 0
+// 0x01052090: 0x1052090: beq   v0, zero, 0x10521bc addu  s2, s4, zero
 	ldloc 5
 	ldloc 13
 	stloc 8
-	brfalse L_10521ac
+	brfalse L_10521bc
 // --- basic block ---
-// 0x01052088: 0x1052088: lw    v0, 20(s0)
+// 0x01052098: 0x1052098: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -968,16 +968,16 @@ L_1052060:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105208c: 0x105208c: sll   zero, zero, 0
-// 0x01052090: 0x1052090: bne   v0, zero, 0x10521b0 addu  v1, s1, s2
+// 0x0105209c: 0x105209c: sll   zero, zero, 0
+// 0x010520a0: 0x10520a0: bne   v0, zero, 0x10521c0 addu  v1, s1, s2
 	ldloc 5
 	ldloc 9
 	ldloc 8
 	add
 	stloc 7
-	brtrue L_10521b0
+	brtrue L_10521c0
 // --- basic block ---
-// 0x01052098: 0x1052098: jal   0x1001ba8 addu  a0, s1, zero
+// 0x010520a8: 0x10520a8: jal   0x1001ba8 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -990,44 +990,44 @@ L_1052060:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010520a0: 0x10520a0: lui   s8, 0x10000
+// 0x010520b0: 0x10520b0: lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x010520a4: 0x10520a4: addu  s5, v0, zero
+// 0x010520b4: 0x10520b4: addu  s5, v0, zero
 	ldloc 5
 	stloc 12
-// 0x010520a8: 0x10520a8: addiu s8, s8, 5360
+// 0x010520b8: 0x10520b8: addiu s8, s8, 5356
 	ldloc 14
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc 14
-// 0x010520ac: 0x10520ac: addu  s2, v0, zero
+// 0x010520bc: 0x10520bc: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010520b0: 0x10520b0: j	 0x1052178 addiu s7, zero, 32
+// 0x010520c0: 0x10520c0: j	 0x1052188 addiu s7, zero, 32
 	ldc.i4.s 32
 	stloc 16
-	br L_1052178
+	br L_1052188
 // --- basic block ---
-L_10520b8:
-// 0x010520b8: 0x10520b8: sb    zero, 0(v0)
+L_10520c8:
+// 0x010520c8: 0x10520c8: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010520bc: 0x10520bc: lb    v1, 0(s2)
+// 0x010520cc: 0x10520cc: lb    v1, 0(s2)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010520c0: 0x10520c0: sll   zero, zero, 0
-// 0x010520c4: 0x10520c4: bne   v1, zero, 0x1052118 addiu s6, v0, 2
+// 0x010520d0: 0x10520d0: sll   zero, zero, 0
+// 0x010520d4: 0x10520d4: bne   v1, zero, 0x1052128 addiu s6, v0, 2
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 15
-	brtrue L_1052118
+	brtrue L_1052128
 // --- basic block ---
-// 0x010520cc: 0x10520cc: lw    s2, 12(s0)
+// 0x010520dc: 0x10520dc: lw    s2, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1036,40 +1036,40 @@ L_10520b8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010520d0: 0x10520d0: jal   0x102c3f0 sll   zero, zero, 0
+// 0x010520e0: 0x10520e0: jal   0x102c400 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010520d8: 0x10520d8: lui   v1, 0x10000
+// 0x010520e8: 0x10520e8: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010520dc: 0x10520dc: addu  a0, v0, zero
+// 0x010520ec: 0x10520ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010520e0: 0x10520e0: addiu v1, v1, 5364
+// 0x010520f0: 0x10520f0: addiu v1, v1, 5360
 	ldloc 7
-	ldc.i4 5364
+	ldc.i4 5360
 	add
 	stloc 7
-// 0x010520e4: 0x10520e4: cibyl_sysc_arg 0x12
+// 0x010520f4: 0x10520f4: cibyl_sysc_arg 0x12
 	ldloc 8
-// 0x010520e8: 0x10520e8: cibyl_sysc_arg 0x3
+// 0x010520f8: 0x10520f8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010520ec: 0x10520ec: cibyl_sysc_arg 0x4
+// 0x010520fc: 0x10520fc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010520f0: 0x10520f0: cibyl_sysc 0x1c89
+// 0x01052100: 0x1052100: cibyl_sysc 0x1c89
 	call void [WazeWP7]Syscalls::NOPH_HttpConnection_setRequestProperty(int32,int32,int32)
-// 0x010520f4: 0x10520f4: addu  s2, v0, zero
+// 0x01052104: 0x1052104: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010520f8: 0x10520f8: lw    v1, 12(s0)
+// 0x01052108: 0x1052108: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1078,16 +1078,16 @@ L_10520b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010520fc: 0x10520fc: sll   zero, zero, 0
-// 0x01052100: 0x1052100: cibyl_sysc_arg 0x3
+// 0x0105210c: 0x105210c: sll   zero, zero, 0
+// 0x01052110: 0x1052110: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01052104: 0x1052104: cibyl_sysc 0x1cb0
+// 0x01052114: 0x1052114: cibyl_sysc 0x1cb0
 	call int32 [WazeWP7]Syscalls::NOPH_HttpConnection_openOutputStream(int32)
 	stloc 5
-// 0x01052108: 0x1052108: addu  v1, v0, zero
+// 0x01052118: 0x1052118: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0105210c: 0x105210c: sw    v1, 20(s0)
+// 0x0105211c: 0x105211c: sw    v1, 20(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1096,16 +1096,16 @@ L_10520b8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01052110: 0x1052110: j	 0x105218c addu  s2, s6, zero
+// 0x01052120: 0x1052120: j	 0x105219c addu  s2, s6, zero
 	ldloc 15
 	stloc 8
-	br L_105218c
+	br L_105219c
 // --- basic block ---
-L_1052118:
-// 0x01052118: 0x1052118: addu  a0, s2, zero
+L_1052128:
+// 0x01052128: 0x1052128: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105211c: 0x105211c: jal   0x1001a5c addiu a1, zero, 58
+// 0x0105212c: 0x105212c: jal   0x1001a5c addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
 	ldloc.1
@@ -1115,39 +1115,39 @@ L_1052118:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052124: 0x1052124: sb    zero, 0(v0)
+// 0x01052134: 0x1052134: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01052128: 0x1052128: addiu s3, v0, 1
+// 0x01052138: 0x1052138: addiu s3, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 11
-L_105212c:
-// 0x0105212c: 0x105212c: lb    v0, 0(s3)
+L_105213c:
+// 0x0105213c: 0x105213c: lb    v0, 0(s3)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01052130: 0x1052130: sll   zero, zero, 0
-// 0x01052134: 0x1052134: beq   v0, s7, 0x105212c addiu s3, s3, 1
+// 0x01052140: 0x1052140: sll   zero, zero, 0
+// 0x01052144: 0x1052144: beq   v0, s7, 0x105213c addiu s3, s3, 1
 	ldloc 5
 	ldloc 16
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-	beq  L_105212c
+	beq  L_105213c
 // --- basic block ---
-// 0x0105213c: 0x105213c: addiu s3, s3, -1
+// 0x0105214c: 0x105214c: addiu s3, s3, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-// 0x01052140: 0x1052140: addu  a0, s3, zero
+// 0x01052150: 0x1052150: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x01052144: 0x1052144: jal   0x1001a5c addiu a1, zero, 13
+// 0x01052154: 0x1052154: jal   0x1001a5c addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
 	ldloc.1
@@ -1157,16 +1157,16 @@ L_105212c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105214c: 0x105214c: beq   v0, zero, 0x1052158 sll   zero, zero, 0
+// 0x0105215c: 0x105215c: beq   v0, zero, 0x1052168 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1052158
+	brfalse L_1052168
 // --- basic block ---
-// 0x01052154: 0x1052154: sb    zero, 0(v0)
+// 0x01052164: 0x1052164: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1052158:
-// 0x01052158: 0x1052158: lw    v1, 12(s0)
+L_1052168:
+// 0x01052168: 0x1052168: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1175,26 +1175,26 @@ L_1052158:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105215c: 0x105215c: sll   zero, zero, 0
-// 0x01052160: 0x1052160: cibyl_sysc_arg 0x3
+// 0x0105216c: 0x105216c: sll   zero, zero, 0
+// 0x01052170: 0x1052170: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01052164: 0x1052164: cibyl_sysc_arg 0x12
+// 0x01052174: 0x1052174: cibyl_sysc_arg 0x12
 	ldloc 8
-// 0x01052168: 0x1052168: cibyl_sysc_arg 0x13
+// 0x01052178: 0x1052178: cibyl_sysc_arg 0x13
 	ldloc 11
-// 0x0105216c: 0x105216c: cibyl_sysc 0x1cd5
+// 0x0105217c: 0x105217c: cibyl_sysc 0x1cd5
 	call void [WazeWP7]Syscalls::NOPH_HttpConnection_setRequestProperty(int32,int32,int32)
-// 0x01052170: 0x1052170: addu  s2, v0, zero
+// 0x01052180: 0x1052180: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01052174: 0x1052174: addu  s2, s6, zero
+// 0x01052184: 0x1052184: addu  s2, s6, zero
 	ldloc 15
 	stloc 8
-L_1052178:
-// 0x01052178: 0x1052178: addu  a0, s2, zero
+L_1052188:
+// 0x01052188: 0x1052188: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105217c: 0x105217c: jal   0x1000420 addu  a1, s8, zero
+// 0x0105218c: 0x105218c: jal   0x1000420 addu  a1, s8, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -1207,30 +1207,30 @@ L_1052178:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052184: 0x1052184: bne   v0, zero, 0x10520b8 sll   zero, zero, 0
+// 0x01052194: 0x1052194: bne   v0, zero, 0x10520c8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10520b8
+	brtrue L_10520c8
 // --- basic block ---
-L_105218c:
-// 0x0105218c: 0x105218c: subu  v0, s2, s5
+L_105219c:
+// 0x0105219c: 0x105219c: subu  v0, s2, s5
 	ldloc 8
 	ldloc 12
 	sub
 	stloc 5
-// 0x01052190: 0x1052190: addu  a0, s5, zero
+// 0x010521a0: 0x10521a0: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01052194: 0x1052194: addu  s5, s5, s4
+// 0x010521a4: 0x10521a4: addu  s5, s5, s4
 	ldloc 12
 	ldloc 13
 	add
 	stloc 12
-// 0x01052198: 0x1052198: addu  s1, s1, v0
+// 0x010521a8: 0x10521a8: addu  s1, s1, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x0105219c: 0x105219c: jal   0x1000930 subu  s2, s5, s2
+// 0x010521ac: 0x10521ac: jal   0x1000930 subu  s2, s5, s2
 	ldloc 12
 	ldloc 8
 	sub
@@ -1245,33 +1245,33 @@ L_105218c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010521a4: 0x10521a4: j	 0x10521b0 addu  v1, s1, s2
+// 0x010521b4: 0x10521b4: j	 0x10521c0 addu  v1, s1, s2
 	ldloc 9
 	ldloc 8
 	add
 	stloc 7
-	br L_10521b0
+	br L_10521c0
 // --- basic block ---
-L_10521ac:
-// 0x010521ac: 0x10521ac: addu  v1, s1, s2
+L_10521bc:
+// 0x010521bc: 0x10521bc: addu  v1, s1, s2
 	ldloc 9
 	ldloc 8
 	add
 	stloc 7
-L_10521b0:
-// 0x010521b0: 0x10521b0: bne   s2, zero, 0x10521e4 sltu  v0, s1, v1
+L_10521c0:
+// 0x010521c0: 0x10521c0: bne   s2, zero, 0x10521f4 sltu  v0, s1, v1
 	ldloc 8
 	ldloc 9
 	ldloc 7
 	clt.un
 	stloc 5
-	brtrue L_10521e4
+	brtrue L_10521f4
 // --- basic block ---
-// 0x010521b8: 0x10521b8: j	 0x10521ec sll   zero, zero, 0
-	br L_10521ec
+// 0x010521c8: 0x10521c8: j	 0x10521fc sll   zero, zero, 0
+	br L_10521fc
 // --- basic block ---
-L_10521c0:
-// 0x010521c0: 0x10521c0: lw    a0, 20(s0)
+L_10521d0:
+// 0x010521d0: 0x10521d0: lw    a0, 20(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1280,37 +1280,37 @@ L_10521c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010521c4: 0x10521c4: lb    a1, 0(s1)
+// 0x010521d4: 0x10521d4: lb    a1, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x010521c8: 0x10521c8: sll   zero, zero, 0
-// 0x010521cc: 0x10521cc: cibyl_sysc_arg 0x4
+// 0x010521d8: 0x10521d8: sll   zero, zero, 0
+// 0x010521dc: 0x10521dc: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010521d0: 0x10521d0: cibyl_sysc_arg 0x5
+// 0x010521e0: 0x10521e0: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x010521d4: 0x10521d4: cibyl_sysc 0x1cfc
+// 0x010521e4: 0x10521e4: cibyl_sysc 0x1cfc
 	call void [WazeWP7]Syscalls::NOPH_OutputStream_write(int32,int32)
-// 0x010521d8: 0x10521d8: addu  a0, v0, zero
+// 0x010521e8: 0x10521e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010521dc: 0x10521dc: addiu s1, s1, 1
+// 0x010521ec: 0x10521ec: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010521e0: 0x10521e0: sltu  v0, s1, v1
+// 0x010521f0: 0x10521f0: sltu  v0, s1, v1
 	ldloc 9
 	ldloc 7
 	clt.un
 	stloc 5
-L_10521e4:
-// 0x010521e4: 0x10521e4: bne   v0, zero, 0x10521c0 sll   zero, zero, 0
+L_10521f4:
+// 0x010521f4: 0x10521f4: bne   v0, zero, 0x10521d0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10521c0
+	brtrue L_10521d0
 // --- basic block ---
-L_10521ec:
-// 0x010521ec: 0x10521ec: jal   0x103f810 addu  a0, s2, zero
+L_10521fc:
+// 0x010521fc: 0x10521fc: jal   0x103f820 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1318,17 +1318,17 @@ L_10521ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_send_103f810(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_send_103f820(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10521f4:
-// 0x010521f4: 0x10521f4: sll   zero, zero, 0
-// 0x010521f8: 0x10521f8: Unknown instruction 0x0
-L_10521f8:
-// 0x010521fc: 0x10521fc: sll   zero, zero, 0
-// 0x01052200: 0x1052200: lw    v1, 16(sp)
+L_1052204:
+// 0x01052204: 0x1052204: sll   zero, zero, 0
+// 0x01052208: 0x1052208: Unknown instruction 0x0
+L_1052208:
+// 0x0105220c: 0x105220c: sll   zero, zero, 0
+// 0x01052210: 0x1052210: lw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1337,15 +1337,15 @@ L_10521f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01052204: 0x1052204: addiu v0, zero, -1
+// 0x01052214: 0x1052214: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01052208: 0x1052208: bne   v1, v0, 0x105221c sll   zero, zero, 0
+// 0x01052218: 0x1052218: bne   v1, v0, 0x105222c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_105221c
+	bne.un L_105222c
 // --- basic block ---
-// 0x01052210: 0x1052210: jal   0x1051aa0 addu  a0, s0, zero
+// 0x01052220: 0x1052220: jal   0x1051ab0 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1353,12 +1353,12 @@ L_10521f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::print_url_1051aa0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::print_url_1051ab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052218: 0x1052218: lw    s4, 16(sp)
+// 0x01052228: 0x1052228: lw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1367,12 +1367,12 @@ L_10521f8:
 	add
 	ldelem.i4
 	stloc 13
-L_105221c:
-// 0x0105221c: 0x105221c: lw    ra, 60(sp)
-// 0x01052220: 0x1052220: addu  v0, s4, zero
+L_105222c:
+// 0x0105222c: 0x105222c: lw    ra, 60(sp)
+// 0x01052230: 0x1052230: addu  v0, s4, zero
 	ldloc 13
 	stloc 5
-// 0x01052224: 0x1052224: lw    s8, 56(sp)
+// 0x01052234: 0x1052234: lw    s8, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1381,7 +1381,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01052228: 0x1052228: lw    s7, 52(sp)
+// 0x01052238: 0x1052238: lw    s7, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1390,7 +1390,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105222c: 0x105222c: lw    s6, 48(sp)
+// 0x0105223c: 0x105223c: lw    s6, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1399,7 +1399,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01052230: 0x1052230: lw    s5, 44(sp)
+// 0x01052240: 0x1052240: lw    s5, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1408,7 +1408,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01052234: 0x1052234: lw    s4, 40(sp)
+// 0x01052244: 0x1052244: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1417,7 +1417,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01052238: 0x1052238: lw    s3, 36(sp)
+// 0x01052248: 0x1052248: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1426,7 +1426,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105223c: 0x105223c: lw    s2, 32(sp)
+// 0x0105224c: 0x105224c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1435,7 +1435,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01052240: 0x1052240: lw    s1, 28(sp)
+// 0x01052250: 0x1052250: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1444,7 +1444,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01052244: 0x1052244: lw    s0, 24(sp)
+// 0x01052254: 0x1052254: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1453,7 +1453,7 @@ L_105221c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01052248: 0x1052248: jr    ra addiu sp, sp, 64
+// 0x01052258: 0x1052258: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1465,7 +1465,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 do_async_connect_cb_1052250(int32,int32,int32,int32,int32)
+.method public static int32 do_async_connect_cb_1052260(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s1,int32 s0,int32 ra,int32 ecb,int32 ear)
@@ -1515,12 +1515,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052250: 0x1052250: addiu sp, sp, -56
+// 0x01052260: 0x1052260: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01052254: 0x1052254: sw    s1, 44(sp)
+// 0x01052264: 0x1052264: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1529,13 +1529,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052258: 0x1052258: addu  s1, a0, zero
+// 0x01052268: 0x1052268: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0105225c: 0x105225c: addu  a0, a1, zero
+// 0x0105226c: 0x105226c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01052260: 0x1052260: sw    s2, 48(sp)
+// 0x01052270: 0x1052270: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1544,7 +1544,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01052264: 0x1052264: sw    s0, 40(sp)
+// 0x01052274: 0x1052274: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1553,14 +1553,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01052268: 0x1052268: sw    ra, 52(sp)
-// 0x0105226c: 0x105226c: addu  s0, a1, zero
+// 0x01052278: 0x1052278: sw    ra, 52(sp)
+// 0x0105227c: 0x105227c: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01052270: 0x1052270: addu  s2, a2, zero
+// 0x01052280: 0x1052280: addu  s2, a2, zero
 	ldloc.3
 	stloc 7
-// 0x01052274: 0x1052274: sw    s1, 16(sp)
+// 0x01052284: 0x1052284: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1569,7 +1569,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052278: 0x1052278: sw    a1, 20(sp)
+// 0x01052288: 0x1052288: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1578,7 +1578,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105227c: 0x105227c: jal   0x104fbf0 sw    a2, 24(sp)
+// 0x0105228c: 0x105228c: jal   0x104fc00 sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1588,19 +1588,19 @@ __CIBYL_javamethod_begin:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl59::roadmap_main_set_last_cb_104fbf0(int32)
+	call int32 Cibyl59::roadmap_main_set_last_cb_104fc00(int32)
 	stloc 6
 // --- basic block ---
-// 0x01052284: 0x1052284: lui   a0, 0x1050000
+// 0x01052294: 0x1052294: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01052288: 0x1052288: addiu a0, a0, 7688
+// 0x01052298: 0x1052298: addiu a0, a0, 7704
 	ldloc.1
-	ldc.i4 7688
+	ldc.i4 7704
 	add
 	stloc.1
-L_105228c:
-// 0x0105228c: 0x105228c: jal   0x1000120 addiu a1, sp, 16
+L_105229c:
+// 0x0105229c: 0x105229c: jal   0x1000120 addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1610,19 +1610,19 @@ L_105228c:
 	ldloc.2
 	stloc 13
 // --- basic block ---
-// 0x01052294: 0x1052294: lw    v0, 0(zero)
+// 0x010522a4: 0x10522a4: lw    v0, 0(zero)
 	ldloc 5
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01052298: 0x1052298: sll   zero, zero, 0
-// 0x0105229c: 0x105229c: beq   v0, zero, 0x10522f4 sll   zero, zero, 0
+// 0x010522a8: 0x10522a8: sll   zero, zero, 0
+// 0x010522ac: 0x10522ac: beq   v0, zero, 0x1052304 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10522f4
+	brfalse L_1052304
 // --- basic block ---
-// 0x010522a4: 0x10522a4: lw    a1, 4(s2)
+// 0x010522b4: 0x10522b4: lw    a1, 4(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1631,21 +1631,21 @@ L_105228c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010522a8: 0x10522a8: bne   s1, zero, 0x10522e0 addiu v0, zero, 1
+// 0x010522b8: 0x10522b8: bne   s1, zero, 0x10522f0 addiu v0, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 6
-	brtrue L_10522e0
+	brtrue L_10522f0
 // --- basic block ---
-// 0x010522b0: 0x10522b0: lui   a0, 0x10000
+// 0x010522c0: 0x10522c0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010522b4: 0x10522b4: addiu a0, a0, 5376
+// 0x010522c4: 0x10522c4: addiu a0, a0, 5372
 	ldloc.1
-	ldc.i4 5376
+	ldc.i4 5372
 	add
 	stloc.1
-// 0x010522b8: 0x10522b8: jal   0x103f75c sw    a1, 32(sp)
+// 0x010522c8: 0x10522c8: jal   0x103f76c sw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1659,12 +1659,12 @@ L_105228c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_error_103f75c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_error_103f76c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010522c0: 0x10522c0: jal   0x1051af0 addu  a0, s2, zero
+// 0x010522d0: 0x10522d0: jal   0x1051b00 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1672,12 +1672,12 @@ L_105228c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_net_close_1051af0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_net_close_1051b00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010522c8: 0x10522c8: lw    a1, 32(sp)
+// 0x010522d8: 0x10522d8: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1686,10 +1686,10 @@ L_105228c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010522cc: 0x10522cc: addu  a0, zero, zero
+// 0x010522dc: 0x10522dc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010522d0: 0x10522d0: jalr  s0 addiu a2, zero, 11
+// 0x010522e0: 0x10522e0: jalr  s0 addiu a2, zero, 11
 	ldloc 10
 	ldc.i4.s 11
 	stloc.3
@@ -1703,18 +1703,18 @@ L_105228c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010522d8: 0x10522d8: j	 0x1052300 sll   zero, zero, 0
-	br L_1052300
+// 0x010522e8: 0x10522e8: j	 0x1052310 sll   zero, zero, 0
+	br L_1052310
 // --- basic block ---
-L_10522e0:
-// 0x010522e0: 0x10522e0: sw    v0, 0(s2)
+L_10522f0:
+// 0x010522f0: 0x10522f0: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010522e4: 0x10522e4: sw    s1, 12(s2)
+// 0x010522f4: 0x10522f4: sw    s1, 12(s2)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1723,10 +1723,10 @@ L_10522e0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010522e8: 0x10522e8: addu  a0, s2, zero
+// 0x010522f8: 0x10522f8: addu  a0, s2, zero
 	ldloc 7
 	stloc.1
-// 0x010522ec: 0x10522ec: jalr  s0 addu  a2, zero, zero
+// 0x010522fc: 0x10522fc: jalr  s0 addu  a2, zero, zero
 	ldloc 10
 	ldc.i4.s 0
 	stloc.3
@@ -1740,14 +1740,14 @@ L_10522e0:
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_10522f4:
-// 0x010522f4: 0x10522f4: sll   zero, zero, 0
-// 0x010522f8: 0x10522f8: Unknown instruction 0x0
-L_10522f8:
-// 0x010522fc: 0x10522fc: sll   zero, zero, 0
-L_1052300:
-// 0x01052300: 0x1052300: lw    ra, 52(sp)
-// 0x01052304: 0x1052304: lw    s2, 48(sp)
+L_1052304:
+// 0x01052304: 0x1052304: sll   zero, zero, 0
+// 0x01052308: 0x1052308: Unknown instruction 0x0
+L_1052308:
+// 0x0105230c: 0x105230c: sll   zero, zero, 0
+L_1052310:
+// 0x01052310: 0x1052310: lw    ra, 52(sp)
+// 0x01052314: 0x1052314: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1756,7 +1756,7 @@ L_1052300:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01052308: 0x1052308: lw    s1, 44(sp)
+// 0x01052318: 0x1052318: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1765,7 +1765,7 @@ L_1052300:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105230c: 0x105230c: lw    s0, 40(sp)
+// 0x0105231c: 0x105231c: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1774,7 +1774,7 @@ L_1052300:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01052310: 0x1052310: jr    ra addiu sp, sp, 56
+// 0x01052320: 0x1052320: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1786,7 +1786,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 T_49_1052318(int32,int32,int32,int32,int32)
+.method public static int32 T_49_1052328(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 ra,int32 v1)
@@ -1824,16 +1824,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052318: 0x1052318: addiu sp, sp, -24
+// 0x01052328: 0x1052328: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105231c: 0x105231c: addiu a0, zero, 24
+// 0x0105232c: 0x105232c: addiu a0, zero, 24
 	ldc.i4.s 24
 	stloc.1
-// 0x01052320: 0x1052320: sw    ra, 20(sp)
-// 0x01052324: 0x1052324: jal   0x1000910 sw    s0, 16(sp)
+// 0x01052330: 0x1052330: sw    ra, 20(sp)
+// 0x01052334: 0x1052334: jal   0x1000910 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1852,16 +1852,16 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0105232c: 0x105232c: addu  a0, v0, zero
+// 0x0105233c: 0x105233c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01052330: 0x1052330: addu  a1, zero, zero
+// 0x01052340: 0x1052340: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01052334: 0x1052334: addiu a2, zero, 24
+// 0x01052344: 0x1052344: addiu a2, zero, 24
 	ldc.i4.s 24
 	stloc.3
-// 0x01052338: 0x1052338: jal   0x100177c addu  s0, v0, zero
+// 0x01052348: 0x1052348: jal   0x100177c addu  s0, v0, zero
 	ldloc 5
 	stloc 6
 	ldloc.1
@@ -1873,11 +1873,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01052340: 0x1052340: lw    ra, 20(sp)
-// 0x01052344: 0x1052344: addu  v0, s0, zero
+// 0x01052350: 0x1052350: lw    ra, 20(sp)
+// 0x01052354: 0x1052354: addu  v0, s0, zero
 	ldloc 6
 	stloc 5
-// 0x01052348: 0x1052348: lw    s0, 16(sp)
+// 0x01052358: 0x1052358: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1886,7 +1886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105234c: 0x105234c: jr    ra addiu sp, sp, 24
+// 0x0105235c: 0x105235c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1898,7 +1898,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_net_connect_async_1052354(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_net_connect_async_1052364(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s3,int32 s1,int32 s4,int32 s0,int32 ra,int32 ecb,int32 ear)
@@ -1954,12 +1954,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052354: 0x1052354: addiu sp, sp, -368
+// 0x01052364: 0x1052364: addiu sp, sp, -368
 	ldloc.0
 	ldc.i4 -368
 	add
 	stloc.0
-// 0x01052358: 0x1052358: sw    s4, 360(sp)
+// 0x01052368: 0x1052368: sw    s4, 360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1968,10 +1968,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105235c: 0x105235c: addu  s4, a1, zero
+// 0x0105236c: 0x105236c: addu  s4, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01052360: 0x1052360: sw    s3, 356(sp)
+// 0x01052370: 0x1052370: sw    s3, 356(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1980,16 +1980,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052364: 0x1052364: addiu a1, zero, 58
+// 0x01052374: 0x1052374: addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
-// 0x01052368: 0x1052368: addu  s3, a0, zero
+// 0x01052378: 0x1052378: addu  s3, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0105236c: 0x105236c: addu  a0, s4, zero
+// 0x0105237c: 0x105237c: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-// 0x01052370: 0x1052370: sw    s2, 352(sp)
+// 0x01052380: 0x1052380: sw    s2, 352(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1998,7 +1998,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01052374: 0x1052374: sw    s1, 348(sp)
+// 0x01052384: 0x1052384: sw    s1, 348(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2007,7 +2007,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01052378: 0x1052378: sw    s0, 344(sp)
+// 0x01052388: 0x1052388: sw    s0, 344(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2016,8 +2016,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105237c: 0x105237c: sw    ra, 364(sp)
-// 0x01052380: 0x1052380: jal   0x1001a5c addu  s2, a2, zero
+// 0x0105238c: 0x105238c: sw    ra, 364(sp)
+// 0x01052390: 0x1052390: jal   0x1001a5c addu  s2, a2, zero
 	ldloc.3
 	stloc 8
 	ldloc.1
@@ -2027,10 +2027,10 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052388: 0x1052388: addiu v1, zero, 3
+// 0x01052398: 0x1052398: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x0105238c: 0x105238c: sw    v1, 24(sp)
+// 0x0105239c: 0x105239c: sw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2039,7 +2039,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01052390: 0x1052390: lw    s0, 388(sp)
+// 0x010523a0: 0x10523a0: lw    s0, 388(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2048,7 +2048,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01052394: 0x1052394: lw    s1, 392(sp)
+// 0x010523a4: 0x10523a4: lw    s1, 392(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2057,21 +2057,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01052398: 0x1052398: lui   a0, 0x1050000
+// 0x010523a8: 0x10523a8: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0105239c: 0x105239c: addiu a0, a0, 7568
+// 0x010523ac: 0x10523ac: addiu a0, a0, 7584
 	ldloc.1
-	ldc.i4 7568
+	ldc.i4 7584
 	add
 	stloc.1
-// 0x010523a0: 0x10523a0: addiu a1, sp, 24
+// 0x010523b0: 0x10523b0: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-L_10523a4:
-// 0x010523a4: 0x10523a4: jal   0x1000120 sw    v0, 336(sp)
+L_10523b4:
+// 0x010523b4: 0x10523b4: jal   0x1000120 sw    v0, 336(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2085,14 +2085,14 @@ L_10523a4:
 	ldloc.2
 	stloc 15
 // --- basic block ---
-// 0x010523ac: 0x10523ac: lw    v1, 0(zero)
+// 0x010523bc: 0x10523bc: lw    v1, 0(zero)
 	ldloc 7
 	ldc.i4.s 0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010523b0: 0x10523b0: lw    v0, 336(sp)
+// 0x010523c0: 0x10523c0: lw    v0, 336(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2101,42 +2101,42 @@ L_10523a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010523b4: 0x10523b4: beq   v1, zero, 0x1052568 sll   zero, zero, 0
+// 0x010523c4: 0x10523c4: beq   v1, zero, 0x1052578 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1052568
+	brfalse L_1052578
 // --- basic block ---
-// 0x010523bc: 0x10523bc: beq   v0, zero, 0x10523e4 addiu a0, v0, 1
+// 0x010523cc: 0x10523cc: beq   v0, zero, 0x10523f4 addiu a0, v0, 1
 	ldloc 5
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.1
-	brfalse L_10523e4
+	brfalse L_10523f4
 // --- basic block ---
-// 0x010523c4: 0x10523c4: lb    v1, 1(v0)
+// 0x010523d4: 0x10523d4: lb    v1, 1(v0)
 	ldloc 5
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010523c8: 0x10523c8: sll   zero, zero, 0
-// 0x010523cc: 0x10523cc: addiu v0, v1, -48
+// 0x010523d8: 0x10523d8: sll   zero, zero, 0
+// 0x010523dc: 0x10523dc: addiu v0, v1, -48
 	ldloc 6
 	ldc.i4.s -48
 	add
 	stloc 5
-// 0x010523d0: 0x10523d0: sltiu v0, v0, 10
+// 0x010523e0: 0x10523e0: sltiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt.un
 	stloc 5
-// 0x010523d4: 0x10523d4: beq   v0, zero, 0x10523e8 lui   v1, 0x70000
+// 0x010523e4: 0x10523e4: beq   v0, zero, 0x10523f8 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_10523e8
+	brfalse L_10523f8
 // --- basic block ---
-// 0x010523dc: 0x10523dc: jal   0x1000d8c sll   zero, zero, 0
+// 0x010523ec: 0x10523ec: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2147,68 +2147,68 @@ L_10523a4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10523e4:
-// 0x010523e4: 0x10523e4: lui   v1, 0x70000
+L_10523f4:
+// 0x010523f4: 0x10523f4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-L_10523e8:
-// 0x010523e8: 0x10523e8: lb    v0, -88(v1)
+L_10523f8:
+// 0x010523f8: 0x10523f8: lb    v0, 376(v1)
 	ldloc 6
-	ldc.i4.s -88
+	ldc.i4 376
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010523ec: 0x10523ec: sll   zero, zero, 0
-// 0x010523f0: 0x10523f0: bne   v0, zero, 0x105245c addiu v1, v1, -88
+// 0x010523fc: 0x10523fc: sll   zero, zero, 0
+// 0x01052400: 0x1052400: bne   v0, zero, 0x105246c addiu v1, v1, 376
 	ldloc 5
 	ldloc 6
-	ldc.i4.s -88
+	ldc.i4 376
 	add
 	stloc 6
-	brtrue L_105245c
+	brtrue L_105246c
 // --- basic block ---
-// 0x010523f8: 0x10523f8: addiu a1, zero, 100
+// 0x01052408: 0x1052408: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010523fc: 0x10523fc: addiu a0, zero, 1
+// 0x0105240c: 0x105240c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01052400: 0x1052400: cibyl_sysc_arg 0x4
+// 0x01052410: 0x1052410: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01052404: 0x1052404: cibyl_sysc_arg 0x3
+// 0x01052414: 0x1052414: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01052408: 0x1052408: cibyl_sysc_arg 0x5
+// 0x01052418: 0x1052418: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0105240c: 0x105240c: cibyl_sysc 0x1d14
+// 0x0105241c: 0x105241c: cibyl_sysc 0x1d14
 	call int32 [WazeWP7]Syscalls::NOPH_FreemapApp_getConnectionString(int32,int32,int32)
 	stloc 5
-// 0x01052410: 0x1052410: addu  v1, v0, zero
+// 0x01052420: 0x1052420: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01052414: 0x1052414: addiu v0, zero, -1
+// 0x01052424: 0x1052424: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01052418: 0x1052418: bne   v1, v0, 0x1052460 lui   a2, 0x20000
+// 0x01052428: 0x1052428: bne   v1, v0, 0x1052470 lui   a2, 0x20000
 	ldloc 6
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	bne.un L_1052460
+	bne.un L_1052470
 // --- basic block ---
-// 0x01052420: 0x1052420: lui   s0, 0x10000
+// 0x01052430: 0x1052430: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x01052424: 0x1052424: lui   s1, 0x10000
+// 0x01052434: 0x1052434: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01052428: 0x1052428: addiu a1, s1, 5404
+// 0x01052438: 0x1052438: addiu a1, s1, 5400
 	ldloc 10
-	ldc.i4 5404
+	ldc.i4 5400
 	add
 	stloc.2
-// 0x0105242c: 0x105242c: jal   0x104c148 addiu a0, s0, 5396
+// 0x0105243c: 0x105243c: jal   0x104c158 addiu a0, s0, 5392
 	ldloc 12
-	ldc.i4 5396
+	ldc.i4 5392
 	add
 	stloc.1
 	ldloc.0
@@ -2216,36 +2216,36 @@ L_10523e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052434: 0x1052434: lui   a1, 0x10000
+// 0x01052444: 0x1052444: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01052438: 0x1052438: addiu s1, s1, 5404
+// 0x01052448: 0x1052448: addiu s1, s1, 5400
 	ldloc 10
-	ldc.i4 5404
+	ldc.i4 5400
 	add
 	stloc 10
-// 0x0105243c: 0x105243c: addiu a1, a1, 5116
+// 0x0105244c: 0x105244c: addiu a1, a1, 5112
 	ldloc.2
-	ldc.i4 5116
+	ldc.i4 5112
 	add
 	stloc.2
-// 0x01052440: 0x1052440: addiu a3, s0, 5396
+// 0x01052450: 0x1052450: addiu a3, s0, 5392
 	ldloc 12
-	ldc.i4 5396
+	ldc.i4 5392
 	add
 	stloc 4
-// 0x01052444: 0x1052444: addiu a0, zero, 4
+// 0x01052454: 0x1052454: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01052448: 0x1052448: addiu a2, zero, 198
+// 0x01052458: 0x1052458: addiu a2, zero, 198
 	ldc.i4 198
 	stloc.3
-// 0x0105244c: 0x105244c: jal   0x100449c sw    s1, 16(sp)
+// 0x0105245c: 0x105245c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2264,41 +2264,41 @@ L_10523e8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052454: 0x1052454: j	 0x10525ac addu  v0, zero, zero
+// 0x01052464: 0x1052464: j	 0x10525bc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10525ac
+	br L_10525bc
 // --- basic block ---
-L_105245c:
-// 0x0105245c: 0x105245c: lui   a2, 0x20000
+L_105246c:
+// 0x0105246c: 0x105246c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-L_1052460:
-// 0x01052460: 0x1052460: lui   v0, 0x70000
+L_1052470:
+// 0x01052470: 0x1052470: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01052464: 0x1052464: addu  a3, s4, zero
+// 0x01052474: 0x1052474: addu  a3, s4, zero
 	ldloc 11
 	stloc 4
-// 0x01052468: 0x1052468: addiu a2, a2, 21592
+// 0x01052478: 0x1052478: addiu a2, a2, 22052
 	ldloc.3
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x0105246c: 0x105246c: addiu a1, zero, 255
+// 0x0105247c: 0x105247c: addiu a1, zero, 255
 	ldc.i4 255
 	stloc.2
-// 0x01052470: 0x1052470: addiu a0, sp, 80
+// 0x01052480: 0x1052480: addiu a0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x01052474: 0x1052474: addiu v0, v0, -88
+// 0x01052484: 0x1052484: addiu v0, v0, 376
 	ldloc 5
-	ldc.i4.s -88
+	ldc.i4 376
 	add
 	stloc 5
-// 0x01052478: 0x1052478: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01052488: 0x1052488: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2317,18 +2317,18 @@ L_1052460:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052480: 0x1052480: lui   a1, 0x10000
+// 0x01052490: 0x1052490: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01052484: 0x1052484: addu  a0, s3, zero
+// 0x01052494: 0x1052494: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01052488: 0x1052488: addiu a1, a1, 5456
+// 0x01052498: 0x1052498: addiu a1, a1, 5452
 	ldloc.2
-	ldc.i4 5456
+	ldc.i4 5452
 	add
 	stloc.2
-// 0x0105248c: 0x105248c: jal   0x1001b14 addiu s3, sp, 28
+// 0x0105249c: 0x105249c: jal   0x1001b14 addiu s3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -2338,13 +2338,13 @@ L_1052460:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01052494: 0x1052494: addu  a0, s2, zero
+// 0x010524a4: 0x10524a4: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01052498: 0x1052498: addu  a1, s3, zero
+// 0x010524a8: 0x10524a8: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x0105249c: 0x105249c: jal   0x106a5d0 addu  s4, v0, zero
+// 0x010524ac: 0x10524ac: jal   0x106abf4 addu  s4, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2352,28 +2352,28 @@ L_1052460:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::WDF_FormatHttpIfModifiedSince_106a5d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::WDF_FormatHttpIfModifiedSince_106abf4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010524a4: 0x10524a4: lb    v0, 28(sp)
+// 0x010524b4: 0x10524b4: lb    v0, 28(sp)
 	ldloc.0
 	ldc.i4.s 28
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010524a8: 0x10524a8: sll   zero, zero, 0
-// 0x010524ac: 0x10524ac: beq   v0, zero, 0x10524e0 addu  s2, zero, zero
+// 0x010524b8: 0x10524b8: sll   zero, zero, 0
+// 0x010524bc: 0x10524bc: beq   v0, zero, 0x10524f0 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_10524e0
+	brfalse L_10524f0
 // --- basic block ---
-// 0x010524b4: 0x10524b4: addu  a0, s3, zero
+// 0x010524c4: 0x10524c4: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x010524b8: 0x10524b8: jal   0x1001a5c addiu a1, zero, 58
+// 0x010524c8: 0x10524c8: jal   0x1001a5c addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
 	ldloc.1
@@ -2383,25 +2383,25 @@ L_1052460:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010524c0: 0x10524c0: beq   v0, zero, 0x10524e0 addu  s2, v0, zero
+// 0x010524d0: 0x10524d0: beq   v0, zero, 0x10524f0 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_10524e0
+	brfalse L_10524f0
 // --- basic block ---
-// 0x010524c8: 0x10524c8: addiu s2, v0, 2
+// 0x010524d8: 0x10524d8: addiu s2, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 8
-// 0x010524cc: 0x10524cc: sb    zero, 0(v0)
+// 0x010524dc: 0x10524dc: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010524d0: 0x10524d0: addu  a0, s2, zero
+// 0x010524e0: 0x10524e0: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010524d4: 0x10524d4: jal   0x1001a5c addiu a1, zero, 13
+// 0x010524e4: 0x10524e4: jal   0x1001a5c addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
 	ldloc.1
@@ -2411,39 +2411,39 @@ L_1052460:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010524dc: 0x10524dc: sb    zero, 0(v0)
+// 0x010524ec: 0x10524ec: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10524e0:
-// 0x010524e0: 0x10524e0: jal   0x1052318 sll   zero, zero, 0
+L_10524f0:
+// 0x010524f0: 0x10524f0: jal   0x1052328 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::T_49_1052318(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::T_49_1052328(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010524e8: 0x10524e8: addu  s3, v0, zero
+// 0x010524f8: 0x10524f8: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010524ec: 0x10524ec: lui   v0, 0x70000
+// 0x010524fc: 0x10524fc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010524f0: 0x10524f0: lw    v1, -92(v0)
+// 0x01052500: 0x1052500: lw    v1, 372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -23
+	ldc.i4.s 93
 	add
 	ldelem.i4
 	stloc 6
-// 0x010524f4: 0x10524f4: sll   zero, zero, 0
-// 0x010524f8: 0x10524f8: bne   v1, zero, 0x105250c sw    s1, 4(s3)
+// 0x01052504: 0x1052504: sll   zero, zero, 0
+// 0x01052508: 0x1052508: bne   v1, zero, 0x105251c sw    s1, 4(s3)
 	ldloc 6
 	ldloc 7
 	ldloc 9
@@ -2453,17 +2453,17 @@ L_10524e0:
 	add
 	ldloc 10
 	stelem.i4
-	brtrue L_105250c
+	brtrue L_105251c
 // --- basic block ---
-// 0x01052500: 0x1052500: addiu v1, zero, 1
+// 0x01052510: 0x1052510: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01052504: 0x1052504: jal   0x103f88c sw    v1, -92(v0)
+// 0x01052514: 0x1052514: jal   0x103f89c sw    v1, 372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s -23
+	ldc.i4.s 93
 	add
 	ldloc 6
 	stelem.i4
@@ -2472,13 +2472,13 @@ L_10524e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_start_103f88c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_start_103f89c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105250c:
-// 0x0105250c: 0x105250c: jal   0x103f848 sltiu s4, s4, 1
+L_105251c:
+// 0x0105251c: 0x105251c: jal   0x103f858 sltiu s4, s4, 1
 	ldloc 11
 	ldc.i4.1
 	clt.un
@@ -2488,33 +2488,33 @@ L_105250c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_connect_103f848(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_connect_103f858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052514: 0x1052514: addiu v1, sp, 80
+// 0x01052524: 0x1052524: addiu v1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 6
-// 0x01052518: 0x1052518: cibyl_sysc_arg 0x3
+// 0x01052528: 0x1052528: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0105251c: 0x105251c: cibyl_sysc_arg 0x14
+// 0x0105252c: 0x105252c: cibyl_sysc_arg 0x14
 	ldloc 11
-// 0x01052520: 0x1052520: cibyl_sysc_arg 0x12
+// 0x01052530: 0x1052530: cibyl_sysc_arg 0x12
 	ldloc 8
-// 0x01052524: 0x1052524: cibyl_sysc_arg 0x10
+// 0x01052534: 0x1052534: cibyl_sysc_arg 0x10
 	ldloc 12
-// 0x01052528: 0x1052528: cibyl_sysc_arg 0x13
+// 0x01052538: 0x1052538: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x0105252c: 0x105252c: cibyl_sysc 0x1d38
+// 0x0105253c: 0x105253c: cibyl_sysc 0x1d38
 	call int32 [WazeWP7]Syscalls::NOPH_AsyncNet_new(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x01052530: 0x1052530: addu  s2, v0, zero
+// 0x01052540: 0x1052540: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01052534: 0x1052534: bne   s2, zero, 0x1052568 sw    s2, 8(s3)
+// 0x01052544: 0x1052544: bne   s2, zero, 0x1052578 sw    s2, 8(s3)
 	ldloc 8
 	ldloc 7
 	ldloc 9
@@ -2524,9 +2524,9 @@ L_105250c:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1052568
+	brtrue L_1052578
 // --- basic block ---
-// 0x0105253c: 0x105253c: jal   0x1000930 addu  a0, s3, zero
+// 0x0105254c: 0x105254c: jal   0x1000930 addu  a0, s3, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2539,12 +2539,12 @@ L_105250c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052544: 0x1052544: lui   a0, 0x10000
+// 0x01052554: 0x1052554: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01052548: 0x1052548: jal   0x103f75c addiu a0, a0, 5376
+// 0x01052558: 0x1052558: jal   0x103f76c addiu a0, a0, 5372
 	ldloc.1
-	ldc.i4 5376
+	ldc.i4 5372
 	add
 	stloc.1
 	ldloc.0
@@ -2552,25 +2552,25 @@ L_105250c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_error_103f75c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_net_mon_error_103f76c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052550: 0x1052550: jal   0x103f650 sll   zero, zero, 0
+// 0x01052560: 0x1052560: jal   0x103f660 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl47::roadmap_net_mon_disconnect_103f650(int32)
+	call int32 Cibyl47::roadmap_net_mon_disconnect_103f660(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052558: 0x1052558: addu  a1, s1, zero
+// 0x01052568: 0x1052568: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0105255c: 0x105255c: addu  a0, zero, zero
+// 0x0105256c: 0x105256c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01052560: 0x1052560: jalr  s0 addiu a2, zero, 11
+// 0x01052570: 0x1052570: jalr  s0 addiu a2, zero, 11
 	ldloc 12
 	ldc.i4.s 11
 	stloc.3
@@ -2584,12 +2584,12 @@ L_105250c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1052568:
-// 0x01052568: 0x1052568: sll   zero, zero, 0
-// 0x0105256c: 0x105256c: Unknown instruction 0x0
-L_105256c:
-// 0x01052570: 0x1052570: sll   zero, zero, 0
-// 0x01052574: 0x1052574: lw    a0, 24(sp)
+L_1052578:
+// 0x01052578: 0x1052578: sll   zero, zero, 0
+// 0x0105257c: 0x105257c: Unknown instruction 0x0
+L_105257c:
+// 0x01052580: 0x1052580: sll   zero, zero, 0
+// 0x01052584: 0x1052584: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2598,44 +2598,44 @@ L_105256c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01052578: 0x1052578: addiu v1, zero, -1
+// 0x01052588: 0x1052588: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0105257c: 0x105257c: bne   a0, v1, 0x10525ac addu  v0, zero, zero
+// 0x0105258c: 0x105258c: bne   a0, v1, 0x10525bc addu  v0, zero, zero
 	ldloc.1
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_10525ac
+	bne.un L_10525bc
 // --- basic block ---
-// 0x01052584: 0x1052584: lui   a1, 0x10000
+// 0x01052594: 0x1052594: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01052588: 0x1052588: lui   a3, 0x10000
+// 0x01052598: 0x1052598: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105258c: 0x105258c: addiu v0, sp, 80
+// 0x0105259c: 0x105259c: addiu v0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 5
-// 0x01052590: 0x1052590: addiu a1, a1, 5116
+// 0x010525a0: 0x10525a0: addiu a1, a1, 5112
 	ldloc.2
-	ldc.i4 5116
+	ldc.i4 5112
 	add
 	stloc.2
-// 0x01052594: 0x1052594: addiu a3, a3, 5468
+// 0x010525a4: 0x10525a4: addiu a3, a3, 5464
 	ldloc 4
-	ldc.i4 5468
+	ldc.i4 5464
 	add
 	stloc 4
-// 0x01052598: 0x1052598: addiu a0, zero, 4
+// 0x010525a8: 0x10525a8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105259c: 0x105259c: addiu a2, zero, 235
+// 0x010525ac: 0x10525ac: addiu a2, zero, 235
 	ldc.i4 235
 	stloc.3
-// 0x010525a0: 0x10525a0: jal   0x100449c sw    v0, 16(sp)
+// 0x010525b0: 0x10525b0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2654,7 +2654,7 @@ L_105256c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010525a8: 0x10525a8: lw    v0, 24(sp)
+// 0x010525b8: 0x10525b8: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2663,9 +2663,9 @@ L_105256c:
 	add
 	ldelem.i4
 	stloc 5
-L_10525ac:
-// 0x010525ac: 0x10525ac: lw    ra, 364(sp)
-// 0x010525b0: 0x10525b0: lw    s4, 360(sp)
+L_10525bc:
+// 0x010525bc: 0x10525bc: lw    ra, 364(sp)
+// 0x010525c0: 0x10525c0: lw    s4, 360(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2674,7 +2674,7 @@ L_10525ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010525b4: 0x10525b4: lw    s3, 356(sp)
+// 0x010525c4: 0x10525c4: lw    s3, 356(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2683,7 +2683,7 @@ L_10525ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010525b8: 0x10525b8: lw    s2, 352(sp)
+// 0x010525c8: 0x10525c8: lw    s2, 352(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2692,7 +2692,7 @@ L_10525ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010525bc: 0x10525bc: lw    s1, 348(sp)
+// 0x010525cc: 0x10525cc: lw    s1, 348(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2701,7 +2701,7 @@ L_10525ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010525c0: 0x10525c0: lw    s0, 344(sp)
+// 0x010525d0: 0x10525d0: lw    s0, 344(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2710,7 +2710,7 @@ L_10525ac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010525c4: 0x10525c4: jr    ra addiu sp, sp, 368
+// 0x010525d4: 0x10525d4: jr    ra addiu sp, sp, 368
 	ldloc.0
 	ldc.i4 368
 	add
@@ -2722,7 +2722,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_initialize_1052a5c()
+.method public static int32 roadmap_tile_initialize_1052a6c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -2736,7 +2736,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052a5c: 0x1052a5c: jr    ra addu  v0, zero, zero
+// 0x01052a6c: 0x1052a6c: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -2744,7 +2744,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_tile_shutdown_1052a64(int32)
+.method public static int32 roadmap_tile_shutdown_1052a74(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2767,35 +2767,35 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052a64: 0x1052a64: lui   v0, 0x70000
+// 0x01052a74: 0x1052a74: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01052a68: 0x1052a68: lw    a0, 16(v0)
+// 0x01052a78: 0x1052a78: lw    a0, 480(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldelem.i4
 	stloc.0
-// 0x01052a6c: 0x1052a6c: sll   zero, zero, 0
-// 0x01052a70: 0x1052a70: beq   a0, zero, 0x1052a84 addiu v1, zero, -1
+// 0x01052a7c: 0x1052a7c: sll   zero, zero, 0
+// 0x01052a80: 0x1052a80: beq   a0, zero, 0x1052a94 addiu v1, zero, -1
 	ldloc.0
 	ldc.i4.m1
 	stloc.2
-	brfalse L_1052a84
+	brfalse L_1052a94
 // --- basic block ---
-// 0x01052a78: 0x1052a78: cibyl_sysc_arg 0x4
+// 0x01052a88: 0x1052a88: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x01052a7c: 0x1052a7c: cibyl_sysc 0x1e08
+// 0x01052a8c: 0x1052a8c: cibyl_sysc 0x1e08
 	call int32 [WazeWP7]Syscalls::NOPH_TileStorage_shutdown(int32)
 	stloc.1
-// 0x01052a80: 0x1052a80: addu  v1, v0, zero
+// 0x01052a90: 0x1052a90: addu  v1, v0, zero
 	ldloc.1
 	stloc.2
-L_1052a84:
-// 0x01052a84: 0x1052a84: jr    ra addu  v0, v1, zero
+L_1052a94:
+// 0x01052a94: 0x1052a94: jr    ra addu  v0, v1, zero
 	ldloc.2
 	stloc.1
 	br __CIBYL_function_return
@@ -2805,7 +2805,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_tile_store_1052a8c(int32,int32,int32,int32)
+.method public static int32 roadmap_tile_store_1052a9c(int32,int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 t0,int32 ra,int32[] mem)
@@ -2840,43 +2840,43 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052a8c: 0x1052a8c: lui   v0, 0x70000
+// 0x01052a9c: 0x1052a9c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01052a90: 0x1052a90: lw    v1, 16(v0)
+// 0x01052aa0: 0x1052aa0: lw    v1, 480(v0)
 	ldloc 8
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldelem.i4
 	stloc 5
-// 0x01052a94: 0x1052a94: sll   zero, zero, 0
-// 0x01052a98: 0x1052a98: beq   v1, zero, 0x1052abc addiu t0, zero, -1
+// 0x01052aa4: 0x1052aa4: sll   zero, zero, 0
+// 0x01052aa8: 0x1052aa8: beq   v1, zero, 0x1052acc addiu t0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
-	brfalse L_1052abc
+	brfalse L_1052acc
 // --- basic block ---
-// 0x01052aa0: 0x1052aa0: cibyl_sysc_arg 0x3
+// 0x01052ab0: 0x1052ab0: cibyl_sysc_arg 0x3
 	ldloc 5
-// 0x01052aa4: 0x1052aa4: cibyl_sysc_arg 0x4
+// 0x01052ab4: 0x1052ab4: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x01052aa8: 0x1052aa8: cibyl_sysc_arg 0x5
+// 0x01052ab8: 0x1052ab8: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x01052aac: 0x1052aac: cibyl_sysc_arg 0x6
+// 0x01052abc: 0x1052abc: cibyl_sysc_arg 0x6
 	ldloc.2
-// 0x01052ab0: 0x1052ab0: cibyl_sysc_arg 0x7
+// 0x01052ac0: 0x1052ac0: cibyl_sysc_arg 0x7
 	ldloc.3
-// 0x01052ab4: 0x1052ab4: cibyl_sysc 0x1e22
+// 0x01052ac4: 0x1052ac4: cibyl_sysc 0x1e22
 	call int32 [WazeWP7]Syscalls::NOPH_TileStorage_storeTile(int32,int32,int32,int32,int32)
 	stloc 4
-// 0x01052ab8: 0x1052ab8: addu  t0, v0, zero
+// 0x01052ac8: 0x1052ac8: addu  t0, v0, zero
 	ldloc 4
 	stloc 6
-L_1052abc:
-// 0x01052abc: 0x1052abc: jr    ra addu  v0, t0, zero
+L_1052acc:
+// 0x01052acc: 0x1052acc: jr    ra addu  v0, t0, zero
 	ldloc 6
 	stloc 4
 	br __CIBYL_function_return
@@ -2886,7 +2886,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static void roadmap_tile_remove_1052ac4()
+.method public static void roadmap_tile_remove_1052ad4()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2897,12 +2897,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052ac4: 0x1052ac4: jr    ra sll   zero, zero, 0
+// 0x01052ad4: 0x1052ad4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static void roadmap_tile_remove_all_1052acc()
+.method public static void roadmap_tile_remove_all_1052adc()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2913,12 +2913,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052acc: 0x1052acc: jr    ra sll   zero, zero, 0
+// 0x01052adc: 0x1052adc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 load_index_1052ad4(int32,int32,int32,int32,int32)
+.method public static int32 load_index_1052ae4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s3,int32 s0,int32 s1,int32 s4,int32 ra)
@@ -2968,13 +2968,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052ad4: 0x1052ad4: addiu sp, sp, -600
+// 0x01052ae4: 0x1052ae4: addiu sp, sp, -600
 	ldloc.0
 	ldc.i4 -600
 	add
 	stloc.0
-// 0x01052ad8: 0x1052ad8: sw    ra, 596(sp)
-// 0x01052adc: 0x1052adc: sw    s4, 592(sp)
+// 0x01052ae8: 0x1052ae8: sw    ra, 596(sp)
+// 0x01052aec: 0x1052aec: sw    s4, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2983,7 +2983,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01052ae0: 0x1052ae0: sw    s3, 588(sp)
+// 0x01052af0: 0x1052af0: sw    s3, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2992,7 +2992,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052ae4: 0x1052ae4: sw    s2, 584(sp)
+// 0x01052af4: 0x1052af4: sw    s2, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3001,7 +3001,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01052ae8: 0x1052ae8: sw    s1, 580(sp)
+// 0x01052af8: 0x1052af8: sw    s1, 580(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3010,7 +3010,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01052aec: 0x1052aec: sw    s0, 576(sp)
+// 0x01052afc: 0x1052afc: sw    s0, 576(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3019,13 +3019,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01052af0: 0x1052af0: addu  s1, a1, zero
+// 0x01052b00: 0x1052b00: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01052af4: 0x1052af4: addu  s0, a2, zero
+// 0x01052b04: 0x1052b04: addu  s0, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01052af8: 0x1052af8: jal   0x1002f74 sw    a0, 568(sp)
+// 0x01052b08: 0x1052b08: jal   0x1002f74 sw    a0, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3044,13 +3044,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052b00: 0x1052b00: addu  s4, v0, zero
+// 0x01052b10: 0x1052b10: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x01052b04: 0x1052b04: lui   v0, 0x0
+// 0x01052b14: 0x1052b14: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01052b08: 0x1052b08: lw    a0, 568(sp)
+// 0x01052b18: 0x1052b18: lw    a0, 568(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3059,17 +3059,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01052b0c: 0x1052b0c: addiu v0, v0, 21920
+// 0x01052b1c: 0x1052b1c: addiu v0, v0, 21920
 	ldloc 5
 	ldc.i4 21920
 	add
 	stloc 5
-// 0x01052b10: 0x1052b10: addiu s3, sp, 24
+// 0x01052b20: 0x1052b20: addiu s3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x01052b14: 0x1052b14: sw    v0, 16(sp)
+// 0x01052b24: 0x1052b24: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3078,37 +3078,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01052b18: 0x1052b18: lui   a2, 0x10000
+// 0x01052b28: 0x1052b28: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01052b1c: 0x1052b1c: lui   v0, 0x0
+// 0x01052b2c: 0x1052b2c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01052b20: 0x1052b20: addu  a3, a0, zero
+// 0x01052b30: 0x1052b30: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01052b24: 0x1052b24: addiu s2, sp, 56
+// 0x01052b34: 0x1052b34: addiu s2, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 8
-// 0x01052b28: 0x1052b28: addiu a2, a2, 5724
+// 0x01052b38: 0x1052b38: addiu a2, a2, 5720
 	ldloc.3
-	ldc.i4 5724
+	ldc.i4 5720
 	add
 	stloc.3
-// 0x01052b2c: 0x1052b2c: addu  a0, s3, zero
+// 0x01052b3c: 0x1052b3c: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01052b30: 0x1052b30: addiu a1, zero, 30
+// 0x01052b40: 0x1052b40: addiu a1, zero, 30
 	ldc.i4.s 30
 	stloc.2
-// 0x01052b34: 0x1052b34: addiu v0, v0, 25472
+// 0x01052b44: 0x1052b44: addiu v0, v0, 25472
 	ldloc 5
 	ldc.i4 25472
 	add
 	stloc 5
-// 0x01052b38: 0x1052b38: jal   0x1000f9c sw    v0, 20(sp)
+// 0x01052b48: 0x1052b48: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3127,16 +3127,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052b40: 0x1052b40: addu  a0, s2, zero
+// 0x01052b50: 0x1052b50: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01052b44: 0x1052b44: addu  a2, s4, zero
+// 0x01052b54: 0x1052b54: addu  a2, s4, zero
 	ldloc 12
 	stloc.3
-// 0x01052b48: 0x1052b48: addu  a3, s3, zero
+// 0x01052b58: 0x1052b58: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x01052b4c: 0x1052b4c: jal   0x104ccb4 addiu a1, zero, 512
+// 0x01052b5c: 0x1052b5c: jal   0x104ccc4 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3144,20 +3144,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_format_104ccb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_format_104ccc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052b54: 0x1052b54: lui   a1, 0x10000
+// 0x01052b64: 0x1052b64: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01052b58: 0x1052b58: addu  a0, s2, zero
+// 0x01052b68: 0x1052b68: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01052b5c: 0x1052b5c: jal   0x104dd10 addiu a1, a1, 6924
+// 0x01052b6c: 0x1052b6c: jal   0x104dd20 addiu a1, a1, 6920
 	ldloc.2
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc.2
 	ldloc.0
@@ -3165,21 +3165,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_open_104dd10(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_open_104dd20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052b64: 0x1052b64: addu  s2, v0, zero
+// 0x01052b74: 0x1052b74: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01052b68: 0x1052b68: beq   s2, zero, 0x1052bc4 addiu v0, zero, -1
+// 0x01052b78: 0x1052b78: beq   s2, zero, 0x1052bd4 addiu v0, zero, -1
 	ldloc 8
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1052bc4
+	brfalse L_1052bd4
 // --- basic block ---
-// 0x01052b70: 0x1052b70: jal   0x104d5c0 addu  a0, s2, zero
+// 0x01052b80: 0x1052b80: jal   0x104d5d0 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3187,15 +3187,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::favail_104d5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::favail_104d5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052b78: 0x1052b78: addu  a0, v0, zero
+// 0x01052b88: 0x1052b88: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01052b7c: 0x1052b7c: jal   0x1000910 sw    v0, 0(s0)
+// 0x01052b8c: 0x1052b8c: jal   0x1000910 sw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3212,20 +3212,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052b84: 0x1052b84: lw    a2, 0(s0)
+// 0x01052b94: 0x1052b94: lw    a2, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01052b88: 0x1052b88: addu  a1, v0, zero
+// 0x01052b98: 0x1052b98: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01052b8c: 0x1052b8c: addu  a0, s2, zero
+// 0x01052b9c: 0x1052b9c: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01052b90: 0x1052b90: jal   0x104d494 sw    v0, 0(s1)
+// 0x01052ba0: 0x1052ba0: jal   0x104d4a4 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3237,15 +3237,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_read_104d494(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_read_104d4a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052b98: 0x1052b98: addu  a0, s2, zero
+// 0x01052ba8: 0x1052ba8: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x01052b9c: 0x1052b9c: jal   0x104d44c addu  s3, v0, zero
+// 0x01052bac: 0x1052bac: jal   0x104d45c addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -3253,34 +3253,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_close_104d44c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_close_104d45c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052ba4: 0x1052ba4: lw    v1, 0(s0)
+// 0x01052bb4: 0x1052bb4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01052ba8: 0x1052ba8: sll   zero, zero, 0
-// 0x01052bac: 0x1052bac: beq   s3, v1, 0x1052bc4 addu  v0, zero, zero
+// 0x01052bb8: 0x1052bb8: sll   zero, zero, 0
+// 0x01052bbc: 0x1052bbc: beq   s3, v1, 0x1052bd4 addu  v0, zero, zero
 	ldloc 9
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1052bc4
+	beq  L_1052bd4
 // --- basic block ---
-// 0x01052bb4: 0x1052bb4: lw    a0, 0(s1)
+// 0x01052bc4: 0x1052bc4: lw    a0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01052bb8: 0x1052bb8: jal   0x1000930 sll   zero, zero, 0
+// 0x01052bc8: 0x1052bc8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3291,12 +3291,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052bc0: 0x1052bc0: addiu v0, zero, -1
+// 0x01052bd0: 0x1052bd0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_1052bc4:
-// 0x01052bc4: 0x1052bc4: lw    ra, 596(sp)
-// 0x01052bc8: 0x1052bc8: lw    s4, 592(sp)
+L_1052bd4:
+// 0x01052bd4: 0x1052bd4: lw    ra, 596(sp)
+// 0x01052bd8: 0x1052bd8: lw    s4, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3305,7 +3305,7 @@ L_1052bc4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01052bcc: 0x1052bcc: lw    s3, 588(sp)
+// 0x01052bdc: 0x1052bdc: lw    s3, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3314,7 +3314,7 @@ L_1052bc4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01052bd0: 0x1052bd0: lw    s2, 584(sp)
+// 0x01052be0: 0x1052be0: lw    s2, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3323,7 +3323,7 @@ L_1052bc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01052bd4: 0x1052bd4: lw    s1, 580(sp)
+// 0x01052be4: 0x1052be4: lw    s1, 580(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3332,7 +3332,7 @@ L_1052bc4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01052bd8: 0x1052bd8: lw    s0, 576(sp)
+// 0x01052be8: 0x1052be8: lw    s0, 576(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3341,7 +3341,7 @@ L_1052bc4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01052bdc: 0x1052bdc: jr    ra addiu sp, sp, 600
+// 0x01052bec: 0x1052bec: jr    ra addiu sp, sp, 600
 	ldloc.0
 	ldc.i4 600
 	add
@@ -3353,7 +3353,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_load_1052be4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_load_1052bf4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s4,int32 s1,int32 s2,int32 ra)
@@ -3403,12 +3403,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052be4: 0x1052be4: addiu sp, sp, -48
+// 0x01052bf4: 0x1052bf4: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01052be8: 0x1052be8: sw    s0, 24(sp)
+// 0x01052bf8: 0x1052bf8: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3417,13 +3417,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01052bec: 0x1052bec: addiu v0, zero, -1
+// 0x01052bfc: 0x1052bfc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01052bf0: 0x1052bf0: addu  s0, a1, zero
+// 0x01052c00: 0x1052c00: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01052bf4: 0x1052bf4: sw    s2, 32(sp)
+// 0x01052c04: 0x1052c04: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3432,11 +3432,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01052bf8: 0x1052bf8: addu  a1, a2, zero
+// 0x01052c08: 0x1052c08: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x01052bfc: 0x1052bfc: sw    ra, 44(sp)
-// 0x01052c00: 0x1052c00: sw    s4, 40(sp)
+// 0x01052c0c: 0x1052c0c: sw    ra, 44(sp)
+// 0x01052c10: 0x1052c10: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3445,7 +3445,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01052c04: 0x1052c04: sw    s3, 36(sp)
+// 0x01052c14: 0x1052c14: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3454,7 +3454,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052c08: 0x1052c08: sw    s1, 28(sp)
+// 0x01052c18: 0x1052c18: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3463,179 +3463,179 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01052c0c: 0x1052c0c: addu  a2, a3, zero
+// 0x01052c1c: 0x1052c1c: addu  a2, a3, zero
 	ldloc 4
 	stloc.3
-// 0x01052c10: 0x1052c10: bne   s0, v0, 0x1052c28 addu  s2, a0, zero
+// 0x01052c20: 0x1052c20: bne   s0, v0, 0x1052c38 addu  s2, a0, zero
 	ldloc 8
 	ldloc 5
 	ldloc.1
 	stloc 12
-	bne.un L_1052c28
+	bne.un L_1052c38
 // --- basic block ---
-// 0x01052c18: 0x1052c18: jal   0x1052ad4 sll   zero, zero, 0
+// 0x01052c28: 0x1052c28: jal   0x1052ae4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::load_index_1052ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::load_index_1052ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052c20: 0x1052c20: j	 0x1052d14 sll   zero, zero, 0
-	br L_1052d14
+// 0x01052c30: 0x1052c30: j	 0x1052d24 sll   zero, zero, 0
+	br L_1052d24
 // --- basic block ---
-L_1052c28:
-// 0x01052c28: 0x1052c28: lui   v1, 0x70000
+L_1052c38:
+// 0x01052c38: 0x1052c38: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01052c2c: 0x1052c2c: lw    v0, 16(v1)
+// 0x01052c3c: 0x1052c3c: lw    v0, 480(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldelem.i4
 	stloc 5
-// 0x01052c30: 0x1052c30: sll   zero, zero, 0
-// 0x01052c34: 0x1052c34: bne   v0, zero, 0x1052c94 lui   s4, 0x70000
+// 0x01052c40: 0x1052c40: sll   zero, zero, 0
+// 0x01052c44: 0x1052c44: bne   v0, zero, 0x1052ca4 lui   s4, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 10
-	brtrue L_1052c94
+	brtrue L_1052ca4
 // --- basic block ---
-// 0x01052c3c: 0x1052c3c: lui   a0, 0x70000
+// 0x01052c4c: 0x1052c4c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01052c40: 0x1052c40: lw    v0, 12(a0)
+// 0x01052c50: 0x1052c50: lw    v0, 476(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 119
 	add
 	ldelem.i4
 	stloc 5
-// 0x01052c44: 0x1052c44: sll   zero, zero, 0
-// 0x01052c48: 0x1052c48: bne   v0, zero, 0x1052d14 addiu v0, zero, -1
+// 0x01052c54: 0x1052c54: sll   zero, zero, 0
+// 0x01052c58: 0x1052c58: bne   v0, zero, 0x1052d24 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1052d14
+	brtrue L_1052d24
 // --- basic block ---
-// 0x01052c50: 0x1052c50: cibyl_sysc 0x1e3d
+// 0x01052c60: 0x1052c60: cibyl_sysc 0x1e3d
 	call int32 [WazeWP7]Syscalls::NOPH_TileStorage_new()
 	stloc 5
-// 0x01052c54: 0x1052c54: addu  a3, v0, zero
+// 0x01052c64: 0x1052c64: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01052c58: 0x1052c58: sw    a3, 16(v1)
+// 0x01052c68: 0x1052c68: sw    a3, 480(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldloc 4
 	stelem.i4
-// 0x01052c5c: 0x1052c5c: cibyl_sysc_arg 0x7
+// 0x01052c6c: 0x1052c6c: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01052c60: 0x1052c60: cibyl_sysc 0x1e52
+// 0x01052c70: 0x1052c70: cibyl_sysc 0x1e52
 	call int32 [WazeWP7]Syscalls::NOPH_TileStorage_initialize(int32)
 	stloc 5
-// 0x01052c64: 0x1052c64: addu  a3, v0, zero
+// 0x01052c74: 0x1052c74: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01052c68: 0x1052c68: beq   a3, zero, 0x1052c94 lui   s4, 0x70000
+// 0x01052c78: 0x1052c78: beq   a3, zero, 0x1052ca4 lui   s4, 0x70000
 	ldloc 4
 	ldc.i4 458752
 	stloc 10
-	brfalse L_1052c94
+	brfalse L_1052ca4
 // --- basic block ---
-// 0x01052c70: 0x1052c70: lw    a1, 16(v1)
+// 0x01052c80: 0x1052c80: lw    a1, 480(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldelem.i4
 	stloc.2
-// 0x01052c74: 0x1052c74: sll   zero, zero, 0
-// 0x01052c78: 0x1052c78: cibyl_sysc_arg 0x5
+// 0x01052c84: 0x1052c84: sll   zero, zero, 0
+// 0x01052c88: 0x1052c88: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01052c7c: 0x1052c7c: cibyl_sysc 0x1e6e
+// 0x01052c8c: 0x1052c8c: cibyl_sysc 0x1e6e
 	call void [WazeWP7]Syscalls::NOPH_delete(int32)
-// 0x01052c80: 0x1052c80: addu  a1, v0, zero
+// 0x01052c90: 0x1052c90: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01052c84: 0x1052c84: addiu v0, zero, 1
+// 0x01052c94: 0x1052c94: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01052c88: 0x1052c88: sw    v0, 12(a0)
+// 0x01052c98: 0x1052c98: sw    v0, 476(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 119
 	add
 	ldloc 5
 	stelem.i4
-// 0x01052c8c: 0x1052c8c: j	 0x1052d10 sw    zero, 16(v1)
+// 0x01052c9c: 0x1052c9c: j	 0x1052d20 sw    zero, 480(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1052d10
+	br L_1052d20
 // --- basic block ---
-L_1052c94:
-// 0x01052c94: 0x1052c94: lw    s3, 16(s4)
+L_1052ca4:
+// 0x01052ca4: 0x1052ca4: lw    s3, 480(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldelem.i4
 	stloc 9
-// 0x01052c98: 0x1052c98: sll   zero, zero, 0
-// 0x01052c9c: 0x1052c9c: cibyl_sysc_arg 0x13
+// 0x01052ca8: 0x1052ca8: sll   zero, zero, 0
+// 0x01052cac: 0x1052cac: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x01052ca0: 0x1052ca0: cibyl_sysc_arg 0x12
+// 0x01052cb0: 0x1052cb0: cibyl_sysc_arg 0x12
 	ldloc 12
-// 0x01052ca4: 0x1052ca4: cibyl_sysc_arg 0x10
+// 0x01052cb4: 0x1052cb4: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x01052ca8: 0x1052ca8: cibyl_sysc_arg 0x6
+// 0x01052cb8: 0x1052cb8: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01052cac: 0x1052cac: cibyl_sysc 0x1e7a
+// 0x01052cbc: 0x1052cbc: cibyl_sysc 0x1e7a
 	call int32 [WazeWP7]Syscalls::NOPH_TileStorage_findTile(int32,int32,int32,int32)
 	stloc 5
-// 0x01052cb0: 0x1052cb0: addu  s3, v0, zero
+// 0x01052cc0: 0x1052cc0: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01052cb4: 0x1052cb4: addiu s1, zero, -1
+// 0x01052cc4: 0x1052cc4: addiu s1, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x01052cb8: 0x1052cb8: beq   s3, s1, 0x1052d10 sll   zero, zero, 0
+// 0x01052cc8: 0x1052cc8: beq   s3, s1, 0x1052d20 sll   zero, zero, 0
 	ldloc 9
 	ldloc 11
-	beq  L_1052d10
+	beq  L_1052d20
 // --- basic block ---
-// 0x01052cc0: 0x1052cc0: lw    a0, 0(a2)
+// 0x01052cd0: 0x1052cd0: lw    a0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01052cc4: 0x1052cc4: jal   0x1000910 sw    a1, 16(sp)
+// 0x01052cd4: 0x1052cd4: jal   0x1000910 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3654,7 +3654,7 @@ L_1052c94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052ccc: 0x1052ccc: lw    a1, 16(sp)
+// 0x01052cdc: 0x1052cdc: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3663,57 +3663,57 @@ L_1052c94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01052cd0: 0x1052cd0: addu  v1, v0, zero
+// 0x01052ce0: 0x1052ce0: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01052cd4: 0x1052cd4: sw    v0, 0(a1)
+// 0x01052ce4: 0x1052ce4: sw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01052cd8: 0x1052cd8: lw    a0, 16(s4)
+// 0x01052ce8: 0x1052ce8: lw    a0, 480(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 120
 	add
 	ldelem.i4
 	stloc.1
-// 0x01052cdc: 0x1052cdc: sll   zero, zero, 0
-// 0x01052ce0: 0x1052ce0: cibyl_sysc_arg 0x4
+// 0x01052cec: 0x1052cec: sll   zero, zero, 0
+// 0x01052cf0: 0x1052cf0: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01052ce4: 0x1052ce4: cibyl_sysc_arg 0x12
+// 0x01052cf4: 0x1052cf4: cibyl_sysc_arg 0x12
 	ldloc 12
-// 0x01052ce8: 0x1052ce8: cibyl_sysc_arg 0x10
+// 0x01052cf8: 0x1052cf8: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x01052cec: 0x1052cec: cibyl_sysc_arg 0x13
+// 0x01052cfc: 0x1052cfc: cibyl_sysc_arg 0x13
 	ldloc 9
-// 0x01052cf0: 0x1052cf0: cibyl_sysc_arg 0x3
+// 0x01052d00: 0x1052d00: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01052cf4: 0x1052cf4: cibyl_sysc 0x1e94
+// 0x01052d04: 0x1052d04: cibyl_sysc 0x1e94
 	call int32 [WazeWP7]Syscalls::NOPH_TileStorage_loadTile(int32,int32,int32,int32,int32)
 	stloc 5
-// 0x01052cf8: 0x1052cf8: addu  s0, v0, zero
+// 0x01052d08: 0x1052d08: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01052cfc: 0x1052cfc: bne   s0, s1, 0x1052d14 addu  v0, zero, zero
+// 0x01052d0c: 0x1052d0c: bne   s0, s1, 0x1052d24 addu  v0, zero, zero
 	ldloc 8
 	ldloc 11
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1052d14
+	bne.un L_1052d24
 // --- basic block ---
-// 0x01052d04: 0x1052d04: lw    a0, 0(a1)
+// 0x01052d14: 0x1052d14: lw    a0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01052d08: 0x1052d08: jal   0x1000930 sll   zero, zero, 0
+// 0x01052d18: 0x1052d18: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3724,13 +3724,13 @@ L_1052c94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1052d10:
-// 0x01052d10: 0x1052d10: addiu v0, zero, -1
+L_1052d20:
+// 0x01052d20: 0x1052d20: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_1052d14:
-// 0x01052d14: 0x1052d14: lw    ra, 44(sp)
-// 0x01052d18: 0x1052d18: lw    s4, 40(sp)
+L_1052d24:
+// 0x01052d24: 0x1052d24: lw    ra, 44(sp)
+// 0x01052d28: 0x1052d28: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3739,7 +3739,7 @@ L_1052d14:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01052d1c: 0x1052d1c: lw    s3, 36(sp)
+// 0x01052d2c: 0x1052d2c: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3748,7 +3748,7 @@ L_1052d14:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01052d20: 0x1052d20: lw    s2, 32(sp)
+// 0x01052d30: 0x1052d30: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3757,7 +3757,7 @@ L_1052d14:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01052d24: 0x1052d24: lw    s1, 28(sp)
+// 0x01052d34: 0x1052d34: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3766,7 +3766,7 @@ L_1052d14:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01052d28: 0x1052d28: lw    s0, 24(sp)
+// 0x01052d38: 0x1052d38: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3775,7 +3775,7 @@ L_1052d14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01052d2c: 0x1052d2c: jr    ra addiu sp, sp, 48
+// 0x01052d3c: 0x1052d3c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3787,7 +3787,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_native_keyboard_enabled_1052d34()
+.method public static int32 roadmap_native_keyboard_enabled_1052d44()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -3801,7 +3801,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052d34: 0x1052d34: jr    ra addu  v0, zero, zero
+// 0x01052d44: 0x1052d44: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -3809,7 +3809,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_native_keyboard_hide_1052d44()
+.method public static void roadmap_native_keyboard_hide_1052d54()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3820,12 +3820,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052d44: 0x1052d44: jr    ra sll   zero, zero, 0
+// 0x01052d54: 0x1052d54: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 ShowSearchEditbox_1052d5c(int32,int32)
+.method public static int32 ShowSearchEditbox_1052d6c(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3851,55 +3851,55 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052d5c: 0x1052d5c: lui   v1, 0x70000
+// 0x01052d6c: 0x1052d6c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01052d60: 0x1052d60: lw    v0, 20(v1)
+// 0x01052d70: 0x1052d70: lw    v0, 484(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 121
 	add
 	ldelem.i4
 	stloc.2
-// 0x01052d64: 0x1052d64: sll   zero, zero, 0
-// 0x01052d68: 0x1052d68: bne   v0, zero, 0x1052d88 lui   a1, 0x70000
+// 0x01052d74: 0x1052d74: sll   zero, zero, 0
+// 0x01052d78: 0x1052d78: bne   v0, zero, 0x1052d98 lui   a1, 0x70000
 	ldloc.2
 	ldc.i4 458752
 	stloc.1
-	brtrue L_1052d88
+	brtrue L_1052d98
 // --- basic block ---
-// 0x01052d70: 0x1052d70: addiu a1, a1, 24
+// 0x01052d80: 0x1052d80: addiu a1, a1, 488
 	ldloc.1
-	ldc.i4.s 24
+	ldc.i4 488
 	add
 	stloc.1
-// 0x01052d74: 0x1052d74: cibyl_sysc_arg 0x5
+// 0x01052d84: 0x1052d84: cibyl_sysc_arg 0x5
 	ldloc.1
-// 0x01052d78: 0x1052d78: cibyl_sysc 0x1ec4
+// 0x01052d88: 0x1052d88: cibyl_sysc 0x1ec4
 	call void [WazeWP7]Syscalls::NOPH_EditBoxScreen_registerEditBoxTextAddr(int32)
-// 0x01052d7c: 0x1052d7c: addu  a1, v0, zero
+// 0x01052d8c: 0x1052d8c: addu  a1, v0, zero
 	ldloc.2
 	stloc.1
-// 0x01052d80: 0x1052d80: addiu v0, zero, 1
+// 0x01052d90: 0x1052d90: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01052d84: 0x1052d84: sw    v0, 20(v1)
+// 0x01052d94: 0x1052d94: sw    v0, 484(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 121
 	add
 	ldloc.2
 	stelem.i4
-L_1052d88:
-// 0x01052d88: 0x1052d88: cibyl_sysc_arg 0x4
+L_1052d98:
+// 0x01052d98: 0x1052d98: cibyl_sysc_arg 0x4
 	ldloc.0
-// 0x01052d8c: 0x1052d8c: cibyl_sysc 0x1eef
+// 0x01052d9c: 0x1052d9c: cibyl_sysc 0x1eef
 	call void [WazeWP7]Syscalls::NOPH_SearchDialog_showDialog(int32)
-// 0x01052d90: 0x1052d90: jr    ra addu  a0, v0, zero
+// 0x01052da0: 0x1052da0: jr    ra addu  a0, v0, zero
 	ldloc.2
 	stloc.0
 	br __CIBYL_function_return
@@ -3909,7 +3909,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 GetEditboxText_1052d98()
+.method public static int32 GetEditboxText_1052da8()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -3923,12 +3923,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052d98: 0x1052d98: lui   v0, 0x70000
+// 0x01052da8: 0x1052da8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01052d9c: 0x1052d9c: jr    ra addiu v0, v0, 24
+// 0x01052dac: 0x1052dac: jr    ra addiu v0, v0, 488
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4 488
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3936,7 +3936,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_is_touchScreen_supported_1052da4()
+.method public static int32 roadmap_is_touchScreen_supported_1052db4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 v1,int32 ra)
@@ -3953,13 +3953,13 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052da4: 0x1052da4: cibyl_sysc 0x1f0c
+// 0x01052db4: 0x1052db4: cibyl_sysc 0x1f0c
 	call int32 [WazeWP7]Syscalls::NOPH_EditBoxScreenOS5_isTouchScreenSupported()
 	stloc.0
-// 0x01052da8: 0x1052da8: addu  v1, v0, zero
+// 0x01052db8: 0x1052db8: addu  v1, v0, zero
 	ldloc.0
 	stloc.1
-// 0x01052dac: 0x1052dac: jr    ra addu  v0, v1, zero
+// 0x01052dbc: 0x1052dbc: jr    ra addu  v0, v1, zero
 	ldloc.1
 	stloc.0
 	br __CIBYL_function_return
@@ -3969,7 +3969,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 rim_on_editbox_closed_1052db4(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_editbox_closed_1052dc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4004,57 +4004,57 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052db4: 0x1052db4: addiu sp, sp, -24
+// 0x01052dc4: 0x1052dc4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01052db8: 0x1052db8: slti  a3, a2, 2
+// 0x01052dc8: 0x1052dc8: slti  a3, a2, 2
 	ldloc.3
 	ldc.i4.2
 	clt
 	stloc 4
-// 0x01052dbc: 0x1052dbc: addu  v0, a0, zero
+// 0x01052dcc: 0x1052dcc: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01052dc0: 0x1052dc0: sw    ra, 20(sp)
-// 0x01052dc4: 0x1052dc4: addu  v1, a1, zero
+// 0x01052dd0: 0x1052dd0: sw    ra, 20(sp)
+// 0x01052dd4: 0x1052dd4: addu  v1, a1, zero
 	ldloc.2
 	stloc 6
-// 0x01052dc8: 0x1052dc8: beq   a3, zero, 0x1052de0 addu  a0, a2, zero
+// 0x01052dd8: 0x1052dd8: beq   a3, zero, 0x1052df0 addu  a0, a2, zero
 	ldloc 4
 	ldloc.3
 	stloc.1
-	brfalse L_1052de0
+	brfalse L_1052df0
 // --- basic block ---
-// 0x01052dd0: 0x1052dd0: xori  a2, a2, 1
+// 0x01052de0: 0x1052de0: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x01052dd4: 0x1052dd4: sltiu a2, a2, 1
+// 0x01052de4: 0x1052de4: sltiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x01052dd8: 0x1052dd8: addiu a0, zero, 2
+// 0x01052de8: 0x1052de8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01052ddc: 0x1052ddc: subu  a0, a0, a2
+// 0x01052dec: 0x1052dec: subu  a0, a0, a2
 	ldloc.1
 	ldloc.3
 	sub
 	stloc.1
-L_1052de0:
-// 0x01052de0: 0x1052de0: lui   a1, 0x70000
+L_1052df0:
+// 0x01052df0: 0x1052df0: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01052de4: 0x1052de4: addiu a1, a1, 24
+// 0x01052df4: 0x1052df4: addiu a1, a1, 488
 	ldloc.2
-	ldc.i4.s 24
+	ldc.i4 488
 	add
 	stloc.2
-// 0x01052de8: 0x1052de8: jalr  v0 addu  a2, v1, zero
+// 0x01052df8: 0x1052df8: jalr  v0 addu  a2, v1, zero
 	ldloc 5
 	ldloc 6
 	stloc.3
@@ -4068,20 +4068,20 @@ L_1052de0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052df0: 0x1052df0: jal   0x1021900 sll   zero, zero, 0
+// 0x01052e00: 0x1052e00: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01052df8: 0x1052df8: lw    ra, 20(sp)
-// 0x01052dfc: 0x1052dfc: sll   zero, zero, 0
-// 0x01052e00: 0x1052e00: jr    ra addiu sp, sp, 24
+// 0x01052e08: 0x1052e08: lw    ra, 20(sp)
+// 0x01052e0c: 0x1052e0c: sll   zero, zero, 0
+// 0x01052e10: 0x1052e10: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4093,7 +4093,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+.method public static int32 ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -4140,24 +4140,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052e08: 0x1052e08: lui   v1, 0x70000
+// 0x01052e18: 0x1052e18: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01052e0c: 0x1052e0c: lw    v0, 20(v1)
+// 0x01052e1c: 0x1052e1c: lw    v0, 484(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 121
 	add
 	ldelem.i4
 	stloc 5
-// 0x01052e10: 0x1052e10: addiu sp, sp, -40
+// 0x01052e20: 0x1052e20: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01052e14: 0x1052e14: sw    s3, 32(sp)
+// 0x01052e24: 0x1052e24: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4166,7 +4166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01052e18: 0x1052e18: sw    s2, 28(sp)
+// 0x01052e28: 0x1052e28: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4175,7 +4175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01052e1c: 0x1052e1c: sw    s1, 24(sp)
+// 0x01052e2c: 0x1052e2c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4184,7 +4184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052e20: 0x1052e20: sw    s0, 20(sp)
+// 0x01052e30: 0x1052e30: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4193,17 +4193,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01052e24: 0x1052e24: sw    ra, 36(sp)
-// 0x01052e28: 0x1052e28: addu  s0, a0, zero
+// 0x01052e34: 0x1052e34: sw    ra, 36(sp)
+// 0x01052e38: 0x1052e38: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01052e2c: 0x1052e2c: addu  s1, a1, zero
+// 0x01052e3c: 0x1052e3c: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01052e30: 0x1052e30: addu  s2, a2, zero
+// 0x01052e40: 0x1052e40: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01052e34: 0x1052e34: lw    a0, 56(sp)
+// 0x01052e44: 0x1052e44: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4212,54 +4212,54 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01052e38: 0x1052e38: bne   v0, zero, 0x1052e5c addu  s3, a3, zero
+// 0x01052e48: 0x1052e48: bne   v0, zero, 0x1052e6c addu  s3, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 11
-	brtrue L_1052e5c
+	brtrue L_1052e6c
 // --- basic block ---
-// 0x01052e40: 0x1052e40: lui   a1, 0x70000
+// 0x01052e50: 0x1052e50: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01052e44: 0x1052e44: addiu a1, a1, 24
+// 0x01052e54: 0x1052e54: addiu a1, a1, 488
 	ldloc.2
-	ldc.i4.s 24
+	ldc.i4 488
 	add
 	stloc.2
-// 0x01052e48: 0x1052e48: cibyl_sysc_arg 0x5
+// 0x01052e58: 0x1052e58: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01052e4c: 0x1052e4c: cibyl_sysc 0x1f39
+// 0x01052e5c: 0x1052e5c: cibyl_sysc 0x1f39
 	call void [WazeWP7]Syscalls::NOPH_EditBoxScreen_registerEditBoxTextAddr(int32)
-// 0x01052e50: 0x1052e50: addu  a1, v0, zero
+// 0x01052e60: 0x1052e60: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01052e54: 0x1052e54: addiu v0, zero, 1
+// 0x01052e64: 0x1052e64: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01052e58: 0x1052e58: sw    v0, 20(v1)
+// 0x01052e68: 0x1052e68: sw    v0, 484(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 121
 	add
 	ldloc 5
 	stelem.i4
-L_1052e5c:
-// 0x01052e5c: 0x1052e5c: andi  v0, a0, 32
+L_1052e6c:
+// 0x01052e6c: 0x1052e6c: andi  v0, a0, 32
 	ldloc.1
 	ldc.i4.s 32
 	and
 	stloc 5
-// 0x01052e60: 0x1052e60: beq   v0, zero, 0x1052e78 andi  v0, a0, 2
+// 0x01052e70: 0x1052e70: beq   v0, zero, 0x1052e88 andi  v0, a0, 2
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	and
 	stloc 5
-	brfalse L_1052e78
+	brfalse L_1052e88
 // --- basic block ---
-// 0x01052e68: 0x1052e68: jal   0x10516e0 addiu a0, zero, 31
+// 0x01052e78: 0x1052e78: jal   0x10516f0 addiu a0, zero, 31
 	ldc.i4.s 31
 	stloc.1
 	ldloc.0
@@ -4267,24 +4267,24 @@ L_1052e5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052e70: 0x1052e70: j	 0x1052ec4 sll   zero, zero, 0
-	br L_1052ec4
+// 0x01052e80: 0x1052e80: j	 0x1052ed4 sll   zero, zero, 0
+	br L_1052ed4
 // --- basic block ---
-L_1052e78:
-// 0x01052e78: 0x1052e78: beq   v0, zero, 0x1052e90 andi  a0, a0, 4
+L_1052e88:
+// 0x01052e88: 0x1052e88: beq   v0, zero, 0x1052ea0 andi  a0, a0, 4
 	ldloc 5
 	ldloc.1
 	ldc.i4.4
 	and
 	stloc.1
-	brfalse L_1052e90
+	brfalse L_1052ea0
 // --- basic block ---
-// 0x01052e80: 0x1052e80: jal   0x10516e0 addiu a0, zero, 31
+// 0x01052e90: 0x1052e90: jal   0x10516f0 addiu a0, zero, 31
 	ldc.i4.s 31
 	stloc.1
 	ldloc.0
@@ -4292,60 +4292,60 @@ L_1052e78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052e88: 0x1052e88: j	 0x1052ea8 addiu v1, zero, 1
+// 0x01052e98: 0x1052e98: j	 0x1052eb8 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1052ea8
+	br L_1052eb8
 // --- basic block ---
-L_1052e90:
-// 0x01052e90: 0x1052e90: bne   a0, zero, 0x1052e9c addiu a0, zero, 3
+L_1052ea0:
+// 0x01052ea0: 0x1052ea0: bne   a0, zero, 0x1052eac addiu a0, zero, 3
 	ldloc.1
 	ldc.i4.3
 	stloc.1
-	brtrue L_1052e9c
+	brtrue L_1052eac
 // --- basic block ---
-// 0x01052e98: 0x1052e98: addiu a0, zero, 31
+// 0x01052ea8: 0x1052ea8: addiu a0, zero, 31
 	ldc.i4.s 31
 	stloc.1
-L_1052e9c:
-// 0x01052e9c: 0x1052e9c: jal   0x10516e0 sll   zero, zero, 0
+L_1052eac:
+// 0x01052eac: 0x1052eac: jal   0x10516f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01052ea4: 0x1052ea4: addiu v1, zero, 3
+// 0x01052eb4: 0x1052eb4: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-L_1052ea8:
-// 0x01052ea8: 0x1052ea8: cibyl_sysc_arg 0x10
+L_1052eb8:
+// 0x01052eb8: 0x1052eb8: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x01052eac: 0x1052eac: cibyl_sysc_arg 0x11
+// 0x01052ebc: 0x1052ebc: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01052eb0: 0x1052eb0: cibyl_sysc_arg 0x12
+// 0x01052ec0: 0x1052ec0: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x01052eb4: 0x1052eb4: cibyl_sysc_arg 0x13
+// 0x01052ec4: 0x1052ec4: cibyl_sysc_arg 0x13
 	ldloc 11
-// 0x01052eb8: 0x1052eb8: cibyl_sysc_arg 0x3
+// 0x01052ec8: 0x1052ec8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01052ebc: 0x1052ebc: cibyl_sysc 0x1f64
+// 0x01052ecc: 0x1052ecc: cibyl_sysc 0x1f64
 	call void [WazeWP7]Syscalls::NOPH_EditBoxScreenOS5_showEditBox(int32,int32,int32,int32,int32)
-// 0x01052ec0: 0x1052ec0: addu  s0, v0, zero
+// 0x01052ed0: 0x1052ed0: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-L_1052ec4:
-// 0x01052ec4: 0x1052ec4: lw    ra, 36(sp)
-// 0x01052ec8: 0x1052ec8: lw    s3, 32(sp)
+L_1052ed4:
+// 0x01052ed4: 0x1052ed4: lw    ra, 36(sp)
+// 0x01052ed8: 0x1052ed8: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4354,7 +4354,7 @@ L_1052ec4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01052ecc: 0x1052ecc: lw    s2, 28(sp)
+// 0x01052edc: 0x1052edc: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4363,7 +4363,7 @@ L_1052ec4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01052ed0: 0x1052ed0: lw    s1, 24(sp)
+// 0x01052ee0: 0x1052ee0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4372,7 +4372,7 @@ L_1052ec4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01052ed4: 0x1052ed4: lw    s0, 20(sp)
+// 0x01052ee4: 0x1052ee4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4381,7 +4381,7 @@ L_1052ec4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01052ed8: 0x1052ed8: jr    ra addiu sp, sp, 40
+// 0x01052ee8: 0x1052ee8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4393,7 +4393,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ResetEditBoxCameraImagePath_1052ee0()
+.method public static int32 ResetEditBoxCameraImagePath_1052ef0()
 {
 .maxstack 10
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -4410,12 +4410,12 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052ee0: 0x1052ee0: lui   v0, 0x70000
+// 0x01052ef0: 0x1052ef0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01052ee4: 0x1052ee4: jr    ra sb    zero, 2028(v0)
+// 0x01052ef4: 0x1052ef4: jr    ra sb    zero, 2492(v0)
 	ldloc.0
-	ldc.i4 2028
+	ldc.i4 2492
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -4424,7 +4424,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 rim_on_editboxcamera_closed_1052f2c(int32,int32,int32,int32,int32)
+.method public static int32 rim_on_editboxcamera_closed_1052f3c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 t1,int32 ra,int32 t0)
@@ -4465,105 +4465,105 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052f2c: 0x1052f2c: lui   v0, 0x70000
+// 0x01052f3c: 0x1052f3c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01052f30: 0x1052f30: lui   v1, 0x70000
+// 0x01052f40: 0x1052f40: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01052f34: 0x1052f34: xori  a2, a2, 1
+// 0x01052f44: 0x1052f44: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x01052f38: 0x1052f38: addiu v1, v1, 1028
+// 0x01052f48: 0x1052f48: addiu v1, v1, 1492
 	ldloc 5
-	ldc.i4 1028
+	ldc.i4 1492
 	add
 	stloc 5
-// 0x01052f3c: 0x1052f3c: lb    t0, 2028(v0)
+// 0x01052f4c: 0x1052f4c: lb    t0, 2492(v0)
 	ldloc 6
-	ldc.i4 2028
+	ldc.i4 2492
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x01052f40: 0x1052f40: addu  v1, v1, a3
+// 0x01052f50: 0x1052f50: addu  v1, v1, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
-// 0x01052f44: 0x1052f44: sltiu a2, a2, 1
+// 0x01052f54: 0x1052f54: sltiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x01052f48: 0x1052f48: addiu sp, sp, -24
+// 0x01052f58: 0x1052f58: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01052f4c: 0x1052f4c: addiu t1, zero, 2
+// 0x01052f5c: 0x1052f5c: addiu t1, zero, 2
 	ldc.i4.2
 	stloc 8
-// 0x01052f50: 0x1052f50: sw    ra, 20(sp)
-// 0x01052f54: 0x1052f54: subu  t1, t1, a2
+// 0x01052f60: 0x1052f60: sw    ra, 20(sp)
+// 0x01052f64: 0x1052f64: subu  t1, t1, a2
 	ldloc 8
 	ldloc.3
 	sub
 	stloc 8
-// 0x01052f58: 0x1052f58: sb    zero, 0(v1)
+// 0x01052f68: 0x1052f68: sb    zero, 0(v1)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01052f5c: 0x1052f5c: addu  a2, a1, zero
+// 0x01052f6c: 0x1052f6c: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x01052f60: 0x1052f60: addu  v1, a0, zero
+// 0x01052f70: 0x1052f70: addu  v1, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01052f64: 0x1052f64: beq   t0, zero, 0x1052f78 lui   a0, 0x70000
+// 0x01052f74: 0x1052f74: beq   t0, zero, 0x1052f88 lui   a0, 0x70000
 	ldloc 10
 	ldc.i4 458752
 	stloc.1
-	brfalse L_1052f78
+	brfalse L_1052f88
 // --- basic block ---
-// 0x01052f6c: 0x1052f6c: addiu v0, v0, 2028
+// 0x01052f7c: 0x1052f7c: addiu v0, v0, 2492
 	ldloc 6
-	ldc.i4 2028
+	ldc.i4 2492
 	add
 	stloc 6
-// 0x01052f70: 0x1052f70: j	 0x1052f7c sw    v0, 2284(a0)
+// 0x01052f80: 0x1052f80: j	 0x1052f8c sw    v0, 2748(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 571
+	ldc.i4 687
 	add
 	ldloc 6
 	stelem.i4
-	br L_1052f7c
+	br L_1052f8c
 // --- basic block ---
-L_1052f78:
-// 0x01052f78: 0x1052f78: sw    zero, 2284(a0)
+L_1052f88:
+// 0x01052f88: 0x1052f88: sw    zero, 2748(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 571
+	ldc.i4 687
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1052f7c:
-// 0x01052f7c: 0x1052f7c: lui   a1, 0x70000
+L_1052f8c:
+// 0x01052f8c: 0x1052f8c: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01052f80: 0x1052f80: addu  a0, t1, zero
+// 0x01052f90: 0x1052f90: addu  a0, t1, zero
 	ldloc 8
 	stloc.1
-// 0x01052f84: 0x1052f84: jalr  v1 addiu a1, a1, 1028
+// 0x01052f94: 0x1052f94: jalr  v1 addiu a1, a1, 1492
 	ldloc 5
 	ldloc.2
-	ldc.i4 1028
+	ldc.i4 1492
 	add
 	stloc.2
 	ldloc.0
@@ -4576,20 +4576,20 @@ L_1052f7c:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01052f8c: 0x1052f8c: jal   0x1021900 sll   zero, zero, 0
+// 0x01052f9c: 0x1052f9c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01052f94: 0x1052f94: lw    ra, 20(sp)
-// 0x01052f98: 0x1052f98: sll   zero, zero, 0
-// 0x01052f9c: 0x1052f9c: jr    ra addiu sp, sp, 24
+// 0x01052fa4: 0x1052fa4: lw    ra, 20(sp)
+// 0x01052fa8: 0x1052fa8: sll   zero, zero, 0
+// 0x01052fac: 0x1052fac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4601,7 +4601,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ShowEditboxCamera_1052fa4(int32,int32,int32,int32,int32)
+.method public static int32 ShowEditboxCamera_1052fb4(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra)
@@ -4657,24 +4657,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01052fa4: 0x1052fa4: lui   v1, 0x70000
+// 0x01052fb4: 0x1052fb4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01052fa8: 0x1052fa8: lw    v0, 1024(v1)
+// 0x01052fb8: 0x1052fb8: lw    v0, 1488(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 256
+	ldc.i4 372
 	add
 	ldelem.i4
 	stloc 6
-// 0x01052fac: 0x1052fac: addiu sp, sp, -48
+// 0x01052fbc: 0x1052fbc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01052fb0: 0x1052fb0: sw    s6, 40(sp)
+// 0x01052fc0: 0x1052fc0: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4683,7 +4683,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01052fb4: 0x1052fb4: sw    s5, 36(sp)
+// 0x01052fc4: 0x1052fc4: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4692,7 +4692,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01052fb8: 0x1052fb8: sw    s4, 32(sp)
+// 0x01052fc8: 0x1052fc8: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4701,7 +4701,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01052fbc: 0x1052fbc: sw    s3, 28(sp)
+// 0x01052fcc: 0x1052fcc: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4710,7 +4710,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01052fc0: 0x1052fc0: sw    s2, 24(sp)
+// 0x01052fd0: 0x1052fd0: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4719,7 +4719,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01052fc4: 0x1052fc4: sw    s1, 20(sp)
+// 0x01052fd4: 0x1052fd4: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4728,7 +4728,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01052fc8: 0x1052fc8: sw    s0, 16(sp)
+// 0x01052fd8: 0x1052fd8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4737,17 +4737,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01052fcc: 0x1052fcc: sw    ra, 44(sp)
-// 0x01052fd0: 0x1052fd0: addu  s0, a0, zero
+// 0x01052fdc: 0x1052fdc: sw    ra, 44(sp)
+// 0x01052fe0: 0x1052fe0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01052fd4: 0x1052fd4: addu  s1, a1, zero
+// 0x01052fe4: 0x1052fe4: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01052fd8: 0x1052fd8: addu  s2, a2, zero
+// 0x01052fe8: 0x1052fe8: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01052fdc: 0x1052fdc: lw    s4, 64(sp)
+// 0x01052fec: 0x1052fec: lw    s4, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4756,7 +4756,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01052fe0: 0x1052fe0: lw    s5, 68(sp)
+// 0x01052ff0: 0x1052ff0: lw    s5, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4765,7 +4765,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01052fe4: 0x1052fe4: lw    s6, 72(sp)
+// 0x01052ff4: 0x1052ff4: lw    s6, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4774,7 +4774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01052fe8: 0x1052fe8: lw    a0, 76(sp)
+// 0x01052ff8: 0x1052ff8: lw    a0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4783,64 +4783,64 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01052fec: 0x1052fec: bne   v0, zero, 0x105301c addu  s3, a3, zero
+// 0x01052ffc: 0x1052ffc: bne   v0, zero, 0x105302c addu  s3, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 11
-	brtrue L_105301c
+	brtrue L_105302c
 // --- basic block ---
-// 0x01052ff4: 0x1052ff4: lui   a2, 0x70000
+// 0x01053004: 0x1053004: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01052ff8: 0x1052ff8: lui   a1, 0x70000
+// 0x01053008: 0x1053008: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01052ffc: 0x1052ffc: addiu a2, a2, 2028
+// 0x0105300c: 0x105300c: addiu a2, a2, 2492
 	ldloc.3
-	ldc.i4 2028
+	ldc.i4 2492
 	add
 	stloc.3
-// 0x01053000: 0x1053000: addiu a1, a1, 1028
+// 0x01053010: 0x1053010: addiu a1, a1, 1492
 	ldloc.2
-	ldc.i4 1028
+	ldc.i4 1492
 	add
 	stloc.2
-// 0x01053004: 0x1053004: cibyl_sysc_arg 0x5
+// 0x01053014: 0x1053014: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01053008: 0x1053008: cibyl_sysc_arg 0x6
+// 0x01053018: 0x1053018: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0105300c: 0x105300c: cibyl_sysc 0x1fa2
+// 0x0105301c: 0x105301c: cibyl_sysc 0x1fa2
 	call void [WazeWP7]Syscalls::NOPH_EditBoxCameraScreen_registerAddrs(int32,int32)
-// 0x01053010: 0x1053010: addu  a1, v0, zero
+// 0x01053020: 0x1053020: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01053014: 0x1053014: addiu v0, zero, 1
+// 0x01053024: 0x1053024: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01053018: 0x1053018: sw    v0, 1024(v1)
+// 0x01053028: 0x1053028: sw    v0, 1488(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 256
+	ldc.i4 372
 	add
 	ldloc 6
 	stelem.i4
-L_105301c:
-// 0x0105301c: 0x105301c: andi  v0, a0, 32
+L_105302c:
+// 0x0105302c: 0x105302c: andi  v0, a0, 32
 	ldloc.1
 	ldc.i4.s 32
 	and
 	stloc 6
-// 0x01053020: 0x1053020: beq   v0, zero, 0x1053038 andi  v0, a0, 2
+// 0x01053030: 0x1053030: beq   v0, zero, 0x1053048 andi  v0, a0, 2
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	and
 	stloc 6
-	brfalse L_1053038
+	brfalse L_1053048
 // --- basic block ---
-// 0x01053028: 0x1053028: jal   0x10516e0 addiu a0, zero, 31
+// 0x01053038: 0x1053038: jal   0x10516f0 addiu a0, zero, 31
 	ldc.i4.s 31
 	stloc.1
 	ldloc.0
@@ -4848,26 +4848,26 @@ L_105301c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01053030: 0x1053030: j	 0x1053088 addiu v1, zero, 2
+// 0x01053040: 0x1053040: j	 0x1053098 addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-	br L_1053088
+	br L_1053098
 // --- basic block ---
-L_1053038:
-// 0x01053038: 0x1053038: beq   v0, zero, 0x1053050 andi  v0, a0, 4
+L_1053048:
+// 0x01053048: 0x1053048: beq   v0, zero, 0x1053060 andi  v0, a0, 4
 	ldloc 6
 	ldloc.1
 	ldc.i4.4
 	and
 	stloc 6
-	brfalse L_1053050
+	brfalse L_1053060
 // --- basic block ---
-// 0x01053040: 0x1053040: jal   0x10516e0 addiu a0, zero, 31
+// 0x01053050: 0x1053050: jal   0x10516f0 addiu a0, zero, 31
 	ldc.i4.s 31
 	stloc.1
 	ldloc.0
@@ -4875,41 +4875,41 @@ L_1053038:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01053048: 0x1053048: j	 0x1053088 addiu v1, zero, 1
+// 0x01053058: 0x1053058: j	 0x1053098 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1053088
+	br L_1053098
 // --- basic block ---
-L_1053050:
-// 0x01053050: 0x1053050: beq   v0, zero, 0x1053060 lui   v0, 0x20000
+L_1053060:
+// 0x01053060: 0x1053060: beq   v0, zero, 0x1053070 lui   v0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_1053060
+	brfalse L_1053070
 // --- basic block ---
-// 0x01053058: 0x1053058: j	 0x105307c addiu a0, zero, 3
+// 0x01053068: 0x1053068: j	 0x105308c addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-	br L_105307c
+	br L_105308c
 // --- basic block ---
-L_1053060:
-// 0x01053060: 0x1053060: and   a0, a0, v0
+L_1053070:
+// 0x01053070: 0x1053070: and   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	and
 	stloc.1
-// 0x01053064: 0x1053064: beq   a0, zero, 0x105307c addiu a0, zero, 31
+// 0x01053074: 0x1053074: beq   a0, zero, 0x105308c addiu a0, zero, 31
 	ldloc.1
 	ldc.i4.s 31
 	stloc.1
-	brfalse L_105307c
+	brfalse L_105308c
 // --- basic block ---
-// 0x0105306c: 0x105306c: jal   0x10516e0 addiu a0, zero, 31
+// 0x0105307c: 0x105307c: jal   0x10516f0 addiu a0, zero, 31
 	ldc.i4.s 31
 	stloc.1
 	ldloc.0
@@ -4917,55 +4917,55 @@ L_1053060:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01053074: 0x1053074: j	 0x1053088 addiu v1, zero, 5
+// 0x01053084: 0x1053084: j	 0x1053098 addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-	br L_1053088
+	br L_1053098
 // --- basic block ---
-L_105307c:
-// 0x0105307c: 0x105307c: jal   0x10516e0 sll   zero, zero, 0
+L_105308c:
+// 0x0105308c: 0x105308c: jal   0x10516f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_input_type_set_mode_10516e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_input_type_set_mode_10516f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01053084: 0x1053084: addiu v1, zero, 3
+// 0x01053094: 0x1053094: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-L_1053088:
-// 0x01053088: 0x1053088: cibyl_sysc_arg 0x10
+L_1053098:
+// 0x01053098: 0x1053098: cibyl_sysc_arg 0x10
 	ldloc 8
-// 0x0105308c: 0x105308c: cibyl_sysc_arg 0x11
+// 0x0105309c: 0x105309c: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01053090: 0x1053090: cibyl_sysc_arg 0x12
+// 0x010530a0: 0x10530a0: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x01053094: 0x1053094: cibyl_sysc_arg 0x13
+// 0x010530a4: 0x10530a4: cibyl_sysc_arg 0x13
 	ldloc 11
-// 0x01053098: 0x1053098: cibyl_sysc_arg 0x14
+// 0x010530a8: 0x10530a8: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x0105309c: 0x105309c: cibyl_sysc_arg 0x15
+// 0x010530ac: 0x10530ac: cibyl_sysc_arg 0x15
 	ldloc 13
-// 0x010530a0: 0x10530a0: cibyl_sysc_arg 0x16
+// 0x010530b0: 0x10530b0: cibyl_sysc_arg 0x16
 	ldloc 14
-// 0x010530a4: 0x10530a4: cibyl_sysc_arg 0x3
+// 0x010530b4: 0x10530b4: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x010530a8: 0x10530a8: cibyl_sysc 0x1fc9
+// 0x010530b8: 0x10530b8: cibyl_sysc 0x1fc9
 	call void [WazeWP7]Syscalls::NOPH_EditBoxCameraScreen_showEditBox(int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x010530ac: 0x10530ac: addu  s0, v0, zero
+// 0x010530bc: 0x10530bc: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010530b0: 0x10530b0: lw    ra, 44(sp)
-// 0x010530b4: 0x10530b4: lw    s6, 40(sp)
+// 0x010530c0: 0x10530c0: lw    ra, 44(sp)
+// 0x010530c4: 0x10530c4: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4974,7 +4974,7 @@ L_1053088:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010530b8: 0x10530b8: lw    s5, 36(sp)
+// 0x010530c8: 0x10530c8: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4983,7 +4983,7 @@ L_1053088:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010530bc: 0x10530bc: lw    s4, 32(sp)
+// 0x010530cc: 0x10530cc: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4992,7 +4992,7 @@ L_1053088:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010530c0: 0x10530c0: lw    s3, 28(sp)
+// 0x010530d0: 0x10530d0: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5001,7 +5001,7 @@ L_1053088:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010530c4: 0x10530c4: lw    s2, 24(sp)
+// 0x010530d4: 0x10530d4: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5010,7 +5010,7 @@ L_1053088:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010530c8: 0x10530c8: lw    s1, 20(sp)
+// 0x010530d8: 0x10530d8: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5019,7 +5019,7 @@ L_1053088:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010530cc: 0x10530cc: lw    s0, 16(sp)
+// 0x010530dc: 0x10530dc: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5028,7 +5028,7 @@ L_1053088:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010530d0: 0x10530d0: jr    ra addiu sp, sp, 48
+// 0x010530e0: 0x10530e0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5040,7 +5040,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 save_changes_10530d8(int32,int32,int32,int32,int32)
+.method public static int32 save_changes_10530e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5075,18 +5075,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010530d8: 0x10530d8: lui   a0, 0x10000
+// 0x010530e8: 0x10530e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010530dc: 0x10530dc: addiu sp, sp, -24
+// 0x010530ec: 0x10530ec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010530e0: 0x10530e0: sw    ra, 20(sp)
-// 0x010530e4: 0x10530e4: jal   0x10947ac addiu a0, a0, 5736
+// 0x010530f0: 0x10530f0: sw    ra, 20(sp)
+// 0x010530f4: 0x10530f4: jal   0x1094dd0 addiu a0, a0, 5732
 	ldloc.1
-	ldc.i4 5736
+	ldc.i4 5732
 	add
 	stloc.1
 	ldloc.0
@@ -5094,12 +5094,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010530ec: 0x10530ec: jal   0x10544d8 addu  a0, v0, zero
+// 0x010530fc: 0x10530fc: jal   0x10544e8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5107,17 +5107,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_set_popup_config_10544d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_set_popup_config_10544e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010530f4: 0x10530f4: lui   a0, 0x10000
+// 0x01053104: 0x1053104: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010530f8: 0x10530f8: jal   0x10947ac addiu a0, a0, 5744
+// 0x01053108: 0x1053108: jal   0x1094dd0 addiu a0, a0, 5740
 	ldloc.1
-	ldc.i4 5744
+	ldc.i4 5740
 	add
 	stloc.1
 	ldloc.0
@@ -5125,12 +5125,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053100: 0x1053100: jal   0x10544b0 addu  a0, v0, zero
+// 0x01053110: 0x1053110: jal   0x10544c0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5138,12 +5138,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_set_show_wazer_config_10544b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_set_show_wazer_config_10544c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053108: 0x1053108: jal   0x100ea50 addu  a0, zero, zero
+// 0x01053118: 0x1053118: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5151,14 +5151,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053110: 0x1053110: lw    ra, 20(sp)
-// 0x01053114: 0x1053114: sll   zero, zero, 0
-// 0x01053118: 0x1053118: jr    ra addiu sp, sp, 24
+// 0x01053120: 0x1053120: lw    ra, 20(sp)
+// 0x01053124: 0x1053124: sll   zero, zero, 0
+// 0x01053128: 0x1053128: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5170,7 +5170,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_save_1053120(int32,int32,int32,int32,int32)
+.method public static int32 on_save_1053130(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -5205,24 +5205,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053120: 0x1053120: addiu sp, sp, -24
+// 0x01053130: 0x1053130: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01053124: 0x1053124: sw    ra, 20(sp)
-// 0x01053128: 0x1053128: jal   0x10530d8 sll   zero, zero, 0
+// 0x01053134: 0x1053134: sw    ra, 20(sp)
+// 0x01053138: 0x1053138: jal   0x10530e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::save_changes_10530d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::save_changes_10530e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053130: 0x1053130: jal   0x1094b64 addu  a0, zero, zero
+// 0x01053140: 0x1053140: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5230,16 +5230,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053138: 0x1053138: lw    ra, 20(sp)
-// 0x0105313c: 0x105313c: addiu v0, zero, 1
+// 0x01053148: 0x1053148: lw    ra, 20(sp)
+// 0x0105314c: 0x105314c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01053140: 0x1053140: jr    ra addiu sp, sp, 24
+// 0x01053150: 0x1053150: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5251,7 +5251,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_close_dialog_1053148(int32,int32,int32,int32,int32)
+.method public static int32 on_close_dialog_1053158(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5286,34 +5286,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053148: 0x1053148: addiu sp, sp, -24
+// 0x01053158: 0x1053158: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105314c: 0x105314c: addiu v0, zero, 1
+// 0x0105315c: 0x105315c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01053150: 0x1053150: bne   a0, v0, 0x1053160 sw    ra, 20(sp)
+// 0x01053160: 0x1053160: bne   a0, v0, 0x1053170 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1053160
+	bne.un L_1053170
 // --- basic block ---
-// 0x01053158: 0x1053158: jal   0x10530d8 sll   zero, zero, 0
+// 0x01053168: 0x1053168: jal   0x10530e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::save_changes_10530d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::save_changes_10530e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1053160:
-// 0x01053160: 0x1053160: lw    ra, 20(sp)
-// 0x01053164: 0x1053164: sll   zero, zero, 0
-// 0x01053168: 0x1053168: jr    ra addiu sp, sp, 24
+L_1053170:
+// 0x01053170: 0x1053170: lw    ra, 20(sp)
+// 0x01053174: 0x1053174: sll   zero, zero, 0
+// 0x01053178: 0x1053178: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5325,7 +5325,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_settings_1053170(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_settings_1053180(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s3,int32 s2,int32 s4,int32 s5,int32 s6,int32 s8,int32 s7,int32 ra)
@@ -5387,13 +5387,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1053170:
-// 0x01053170: 0x1053170: addiu sp, sp, -72
+L_1053180:
+// 0x01053180: 0x1053180: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01053174: 0x1053174: sw    s0, 32(sp)
+// 0x01053184: 0x1053184: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5402,20 +5402,20 @@ L_1053170:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01053178: 0x1053178: lui   s0, 0x70000
+// 0x01053188: 0x1053188: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0105317c: 0x105317c: lw    v0, 2288(s0)
+// 0x0105318c: 0x105318c: lw    v0, 2752(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4 688
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053180: 0x1053180: sw    ra, 68(sp)
-// 0x01053184: 0x1053184: sw    s8, 64(sp)
+// 0x01053190: 0x1053190: sw    ra, 68(sp)
+// 0x01053194: 0x1053194: sw    s8, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5424,7 +5424,7 @@ L_1053170:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01053188: 0x1053188: sw    s7, 60(sp)
+// 0x01053198: 0x1053198: sw    s7, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5433,7 +5433,7 @@ L_1053170:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105318c: 0x105318c: sw    s6, 56(sp)
+// 0x0105319c: 0x105319c: sw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5442,7 +5442,7 @@ L_1053170:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01053190: 0x1053190: sw    s5, 52(sp)
+// 0x010531a0: 0x10531a0: sw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5451,7 +5451,7 @@ L_1053170:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01053194: 0x1053194: sw    s4, 48(sp)
+// 0x010531a4: 0x10531a4: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5460,7 +5460,7 @@ L_1053170:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01053198: 0x1053198: sw    s3, 44(sp)
+// 0x010531a8: 0x10531a8: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5469,7 +5469,7 @@ L_1053170:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105319c: 0x105319c: sw    s2, 40(sp)
+// 0x010531ac: 0x10531ac: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5478,7 +5478,7 @@ L_1053170:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010531a0: 0x10531a0: bne   v0, zero, 0x1053268 sw    s1, 36(sp)
+// 0x010531b0: 0x10531b0: bne   v0, zero, 0x1053278 sw    s1, 36(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -5488,39 +5488,39 @@ L_1053170:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1053268
+	brtrue L_1053278
 // --- basic block ---
-// 0x010531a8: 0x10531a8: lui   v1, 0x70000
+// 0x010531b8: 0x10531b8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010531ac: 0x10531ac: lui   s1, 0x10000
+// 0x010531bc: 0x10531bc: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010531b0: 0x10531b0: lui   a1, 0x10000
+// 0x010531c0: 0x10531c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010531b4: 0x10531b4: addiu v0, v1, 2304
+// 0x010531c4: 0x10531c4: addiu v0, v1, 2768
 	ldloc 6
-	ldc.i4 2304
+	ldc.i4 2768
 	add
 	stloc 5
-// 0x010531b8: 0x10531b8: addiu a1, a1, 5772
+// 0x010531c8: 0x10531c8: addiu a1, a1, 5768
 	ldloc.2
-	ldc.i4 5772
+	ldc.i4 5768
 	add
 	stloc.2
-// 0x010531bc: 0x10531bc: addiu s1, s1, 5760
+// 0x010531cc: 0x10531cc: addiu s1, s1, 5756
 	ldloc 8
-	ldc.i4 5760
+	ldc.i4 5756
 	add
 	stloc 8
-// 0x010531c0: 0x10531c0: lui   s2, 0x10000
+// 0x010531d0: 0x10531d0: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x010531c4: 0x10531c4: lui   a0, 0x10000
+// 0x010531d4: 0x10531d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010531c8: 0x10531c8: sw    a1, 8(v0)
+// 0x010531d8: 0x10531d8: sw    a1, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5529,17 +5529,17 @@ L_1053170:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010531cc: 0x10531cc: addiu s2, s2, 5752
+// 0x010531dc: 0x10531dc: addiu s2, s2, 5748
 	ldloc 11
-	ldc.i4 5752
+	ldc.i4 5748
 	add
 	stloc 11
-// 0x010531d0: 0x10531d0: addiu a0, a0, 5780
+// 0x010531e0: 0x10531e0: addiu a0, a0, 5776
 	ldloc.1
-	ldc.i4 5780
+	ldc.i4 5776
 	add
 	stloc.1
-// 0x010531d4: 0x10531d4: sw    s1, 4(v0)
+// 0x010531e4: 0x10531e4: sw    s1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5548,12 +5548,12 @@ L_1053170:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010531d8: 0x10531d8: jal   0x101cd60 sw    s2, 2304(v1)
+// 0x010531e8: 0x10531e8: jal   0x101cd70 sw    s2, 2768(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 576
+	ldc.i4 692
 	add
 	ldloc 11
 	stelem.i4
@@ -5562,28 +5562,28 @@ L_1053170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010531e0: 0x10531e0: lui   a0, 0x10000
+// 0x010531f0: 0x10531f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010531e4: 0x10531e4: addiu a0, a0, 5800
+// 0x010531f4: 0x10531f4: addiu a0, a0, 5796
 	ldloc.1
-	ldc.i4 5800
+	ldc.i4 5796
 	add
 	stloc.1
-// 0x010531e8: 0x10531e8: lui   s3, 0x70000
+// 0x010531f8: 0x10531f8: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x010531ec: 0x10531ec: jal   0x101cd60 sw    v0, 2292(s3)
+// 0x010531fc: 0x10531fc: jal   0x101cd70 sw    v0, 2756(s3)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 573
+	ldc.i4 689
 	add
 	ldloc 5
 	stelem.i4
@@ -5592,25 +5592,25 @@ L_1053170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010531f4: 0x10531f4: addiu s3, s3, 2292
+// 0x01053204: 0x1053204: addiu s3, s3, 2756
 	ldloc 10
-	ldc.i4 2292
+	ldc.i4 2756
 	add
 	stloc 10
-// 0x010531f8: 0x10531f8: lui   a0, 0x10000
+// 0x01053208: 0x1053208: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010531fc: 0x10531fc: addiu a0, a0, 5828
+// 0x0105320c: 0x105320c: addiu a0, a0, 5824
 	ldloc.1
-	ldc.i4 5828
+	ldc.i4 5824
 	add
 	stloc.1
-// 0x01053200: 0x1053200: jal   0x101cd60 sw    v0, 4(s3)
+// 0x01053210: 0x1053210: jal   0x101cd70 sw    v0, 4(s3)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5624,12 +5624,12 @@ L_1053170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053208: 0x1053208: sw    v0, 8(s3)
+// 0x01053218: 0x1053218: sw    v0, 8(s3)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5638,26 +5638,26 @@ L_1053170:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105320c: 0x105320c: lui   a1, 0x70000
+// 0x0105321c: 0x105321c: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01053210: 0x1053210: lui   v0, 0x10000
+// 0x01053220: 0x1053220: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01053214: 0x1053214: addiu v1, a1, 2328
+// 0x01053224: 0x1053224: addiu v1, a1, 2792
 	ldloc.2
-	ldc.i4 2328
+	ldc.i4 2792
 	add
 	stloc 6
-// 0x01053218: 0x1053218: addiu v0, v0, 220
+// 0x01053228: 0x1053228: addiu v0, v0, 216
 	ldloc 5
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc 5
-// 0x0105321c: 0x105321c: lui   a0, 0x10000
+// 0x0105322c: 0x105322c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053220: 0x1053220: sw    s1, 4(v1)
+// 0x01053230: 0x1053230: sw    s1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5666,7 +5666,7 @@ L_1053170:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01053224: 0x1053224: sw    v0, 8(v1)
+// 0x01053234: 0x1053234: sw    v0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5675,17 +5675,17 @@ L_1053170:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01053228: 0x1053228: addiu a0, a0, 5836
+// 0x01053238: 0x1053238: addiu a0, a0, 5832
 	ldloc.1
-	ldc.i4 5836
+	ldc.i4 5832
 	add
 	stloc.1
-// 0x0105322c: 0x105322c: jal   0x101cd60 sw    s2, 2328(a1)
+// 0x0105323c: 0x105323c: jal   0x101cd70 sw    s2, 2792(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 582
+	ldc.i4 698
 	add
 	ldloc 11
 	stelem.i4
@@ -5694,28 +5694,28 @@ L_1053170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053234: 0x1053234: lui   a0, 0x10000
+// 0x01053244: 0x1053244: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053238: 0x1053238: addiu a0, a0, 5856
+// 0x01053248: 0x1053248: addiu a0, a0, 5852
 	ldloc.1
-	ldc.i4 5856
+	ldc.i4 5852
 	add
 	stloc.1
-// 0x0105323c: 0x105323c: lui   s1, 0x70000
+// 0x0105324c: 0x105324c: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01053240: 0x1053240: jal   0x101cd60 sw    v0, 2316(s1)
+// 0x01053250: 0x1053250: jal   0x101cd70 sw    v0, 2780(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 579
+	ldc.i4 695
 	add
 	ldloc 5
 	stelem.i4
@@ -5724,25 +5724,25 @@ L_1053170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053248: 0x1053248: addiu s1, s1, 2316
+// 0x01053258: 0x1053258: addiu s1, s1, 2780
 	ldloc 8
-	ldc.i4 2316
+	ldc.i4 2780
 	add
 	stloc 8
-// 0x0105324c: 0x105324c: lui   a0, 0x10000
+// 0x0105325c: 0x105325c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053250: 0x1053250: addiu a0, a0, 5876
+// 0x01053260: 0x1053260: addiu a0, a0, 5872
 	ldloc.1
-	ldc.i4 5876
+	ldc.i4 5872
 	add
 	stloc.1
-// 0x01053254: 0x1053254: jal   0x101cd60 sw    v0, 4(s1)
+// 0x01053264: 0x1053264: jal   0x101cd70 sw    v0, 4(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5756,12 +5756,12 @@ L_1053170:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105325c: 0x105325c: sw    v0, 8(s1)
+// 0x0105326c: 0x105326c: sw    v0, 8(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5770,28 +5770,28 @@ L_1053170:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01053260: 0x1053260: addiu v0, zero, 1
+// 0x01053270: 0x1053270: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01053264: 0x1053264: sw    v0, 2288(s0)
+// 0x01053274: 0x1053274: sw    v0, 2752(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4 688
 	add
 	ldloc 5
 	stelem.i4
-L_1053268:
-// 0x01053268: 0x1053268: lui   s1, 0x10000
+L_1053278:
+// 0x01053278: 0x1053278: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0105326c: 0x105326c: addiu a0, s1, 5888
+// 0x0105327c: 0x105327c: addiu a0, s1, 5884
 	ldloc 8
-	ldc.i4 5888
+	ldc.i4 5884
 	add
 	stloc.1
-// 0x01053270: 0x1053270: jal   0x1095eec addu  a1, zero, zero
+// 0x01053280: 0x1053280: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5799,20 +5799,20 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053278: 0x1053278: bne   v0, zero, 0x105351c lui   a0, 0x20000
+// 0x01053288: 0x1053288: bne   v0, zero, 0x105352c lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_105351c
+	brtrue L_105352c
 // --- basic block ---
-// 0x01053280: 0x1053280: jal   0x101cd60 addiu a0, a0, -28948
+// 0x01053290: 0x1053290: jal   0x101cd70 addiu a0, a0, -28484
 	ldloc.1
-	ldc.i4 -28948
+	ldc.i4 -28484
 	add
 	stloc.1
 	ldloc.0
@@ -5820,28 +5820,28 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053288: 0x1053288: lui   a2, 0x1050000
+// 0x01053298: 0x1053298: lui   a2, 0x1050000
 	ldc.i4 17104896
 	stloc.3
-// 0x0105328c: 0x105328c: addu  a1, v0, zero
+// 0x0105329c: 0x105329c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053290: 0x1053290: addiu a2, a2, 12616
+// 0x010532a0: 0x10532a0: addiu a2, a2, 12632
 	ldloc.3
-	ldc.i4 12616
+	ldc.i4 12632
 	add
 	stloc.3
-// 0x01053294: 0x1053294: addiu a0, s1, 5888
+// 0x010532a4: 0x10532a4: addiu a0, s1, 5884
 	ldloc 8
-	ldc.i4 5888
+	ldc.i4 5884
 	add
 	stloc.1
-// 0x01053298: 0x1053298: jal   0x1095a08 addiu a3, zero, 8192
+// 0x010532a8: 0x10532a8: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -5849,40 +5849,40 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010532a0: 0x10532a0: addu  s2, v0, zero
+// 0x010532b0: 0x10532b0: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010532a4: 0x10532a4: lui   a0, 0x10000
+// 0x010532b4: 0x10532b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010532a8: 0x10532a8: lui   v0, 0x41000000
+// 0x010532b8: 0x10532b8: lui   v0, 0x41000000
 	ldc.i4 1090519040
 	stloc 5
-// 0x010532ac: 0x10532ac: addiu a0, a0, 5908
+// 0x010532bc: 0x10532bc: addiu a0, a0, 5904
 	ldloc.1
-	ldc.i4 5908
+	ldc.i4 5904
 	add
 	stloc.1
-// 0x010532b0: 0x10532b0: addu  a1, zero, zero
+// 0x010532c0: 0x10532c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010532b4: 0x10532b4: addiu a2, zero, -2
+// 0x010532c4: 0x10532c4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010532b8: 0x10532b8: addiu a3, zero, -1
+// 0x010532c8: 0x10532c8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010532bc: 0x10532bc: ori   v0, v0, 20616
+// 0x010532cc: 0x10532cc: ori   v0, v0, 20616
 	ldloc 5
 	ldc.i4 20616
 	or
 	stloc 5
-// 0x010532c0: 0x10532c0: sw    v0, 16(sp)
+// 0x010532d0: 0x10532d0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5891,7 +5891,7 @@ L_1053268:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010532c4: 0x10532c4: jal   0x1093a24 lui   s8, 0x100000
+// 0x010532d4: 0x10532d4: jal   0x1094048 lui   s8, 0x100000
 	ldc.i4 1048576
 	stloc 15
 	ldloc.0
@@ -5899,37 +5899,37 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010532cc: 0x10532cc: lui   a0, 0x10000
+// 0x010532dc: 0x10532dc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010532d0: 0x10532d0: addiu a3, zero, -1
+// 0x010532e0: 0x10532e0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010532d4: 0x10532d4: ori   s8, s8, 136
+// 0x010532e4: 0x10532e4: ori   s8, s8, 136
 	ldloc 15
 	ldc.i4 136
 	or
 	stloc 15
-// 0x010532d8: 0x10532d8: addiu a0, a0, 5936
+// 0x010532e8: 0x10532e8: addiu a0, a0, 5932
 	ldloc.1
-	ldc.i4 5936
+	ldc.i4 5932
 	add
 	stloc.1
-// 0x010532dc: 0x10532dc: addu  a1, zero, zero
+// 0x010532ec: 0x10532ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010532e0: 0x10532e0: addiu a2, zero, -2
+// 0x010532f0: 0x10532f0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010532e4: 0x10532e4: addu  s3, v0, zero
+// 0x010532f4: 0x10532f4: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010532e8: 0x10532e8: jal   0x1093a24 sw    s8, 16(sp)
+// 0x010532f8: 0x10532f8: jal   0x1094048 sw    s8, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5943,49 +5943,49 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010532f0: 0x10532f0: addu  a0, v0, zero
+// 0x01053300: 0x1053300: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010532f4: 0x10532f4: addu  a1, zero, zero
+// 0x01053304: 0x1053304: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010532f8: 0x10532f8: addu  a2, zero, zero
+// 0x01053308: 0x1053308: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010532fc: 0x10532fc: lui   s7, 0x10000
+// 0x0105330c: 0x105330c: lui   s7, 0x10000
 	ldc.i4 65536
 	stloc 16
-// 0x01053300: 0x1053300: addu  s0, v0, zero
+// 0x01053310: 0x1053310: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01053304: 0x1053304: jal   0x1098fe0 addiu s6, zero, 8
+// 0x01053314: 0x1053314: jal   0x1099628 addiu s6, zero, 8
 	ldc.i4.8
 	stloc 14
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0105330c: 0x105330c: addiu a3, zero, -1
+// 0x0105331c: 0x105331c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01053310: 0x1053310: addu  a1, zero, zero
+// 0x01053320: 0x1053320: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01053314: 0x1053314: addiu a2, zero, -2
+// 0x01053324: 0x1053324: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01053318: 0x1053318: addiu a0, s7, -32632
+// 0x01053328: 0x1053328: addiu a0, s7, -32632
 	ldloc 16
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x0105331c: 0x105331c: jal   0x1093a24 sw    s6, 16(sp)
+// 0x0105332c: 0x105332c: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5999,34 +5999,34 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053324: 0x1053324: addu  a0, v0, zero
+// 0x01053334: 0x1053334: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01053328: 0x1053328: addu  a1, zero, zero
+// 0x01053338: 0x1053338: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105332c: 0x105332c: addu  a2, zero, zero
+// 0x0105333c: 0x105333c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01053330: 0x1053330: lui   s5, 0x10000
+// 0x01053340: 0x1053340: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x01053334: 0x1053334: jal   0x1098fe0 addu  s4, v0, zero
+// 0x01053344: 0x1053344: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0105333c: 0x105333c: jal   0x101cd60 addiu a0, s5, 5948
+// 0x0105334c: 0x105334c: jal   0x101cd70 addiu a0, s5, 5944
 	ldloc 13
-	ldc.i4 5948
+	ldc.i4 5944
 	add
 	stloc.1
 	ldloc.0
@@ -6034,26 +6034,26 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053344: 0x1053344: lui   a0, 0x10000
+// 0x01053354: 0x1053354: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053348: 0x1053348: addiu a2, zero, -1
+// 0x01053358: 0x1053358: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0105334c: 0x105334c: addiu a3, zero, 4240
+// 0x0105335c: 0x105335c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01053350: 0x1053350: addiu a0, a0, 5964
+// 0x01053360: 0x1053360: addiu a0, a0, 5960
 	ldloc.1
-	ldc.i4 5964
+	ldc.i4 5960
 	add
 	stloc.1
-// 0x01053354: 0x1053354: jal   0x1098d10 addu  a1, v0, zero
+// 0x01053364: 0x1053364: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6061,40 +6061,40 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105335c: 0x105335c: addu  a1, v0, zero
+// 0x0105336c: 0x105336c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053360: 0x1053360: jal   0x1098ec4 addu  a0, s4, zero
+// 0x01053370: 0x1053370: jal   0x109950c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053368: 0x1053368: addu  a1, s4, zero
+// 0x01053378: 0x1053378: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x0105336c: 0x105336c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0105337c: 0x105337c: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053374: 0x1053374: jal   0x101cd60 addiu a0, s5, 5948
+// 0x01053384: 0x1053384: jal   0x101cd70 addiu a0, s5, 5944
 	ldloc 13
-	ldc.i4 5948
+	ldc.i4 5944
 	add
 	stloc.1
 	ldloc.0
@@ -6102,45 +6102,45 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105337c: 0x105337c: addu  a1, v0, zero
+// 0x0105338c: 0x105338c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053380: 0x1053380: lui   a3, 0x70000
+// 0x01053390: 0x1053390: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01053384: 0x1053384: lui   a0, 0x10000
+// 0x01053394: 0x1053394: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053388: 0x1053388: lui   v0, 0x70000
+// 0x01053398: 0x1053398: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105338c: 0x105338c: addiu a3, a3, 2292
+// 0x0105339c: 0x105339c: addiu a3, a3, 2756
 	ldloc 4
-	ldc.i4 2292
+	ldc.i4 2756
 	add
 	stloc 4
-// 0x01053390: 0x1053390: addiu a2, zero, 3
+// 0x010533a0: 0x10533a0: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x01053394: 0x1053394: addiu a0, a0, 5736
+// 0x010533a4: 0x10533a4: addiu a0, a0, 5732
 	ldloc.1
-	ldc.i4 5736
+	ldc.i4 5732
 	add
 	stloc.1
-// 0x01053398: 0x1053398: addiu s5, zero, 2
+// 0x010533a8: 0x10533a8: addiu s5, zero, 2
 	ldc.i4.2
 	stloc 13
-// 0x0105339c: 0x105339c: addiu v0, v0, 2304
+// 0x010533ac: 0x10533ac: addiu v0, v0, 2768
 	ldloc 5
-	ldc.i4 2304
+	ldc.i4 2768
 	add
 	stloc 5
-// 0x010533a0: 0x10533a0: sw    v0, 16(sp)
+// 0x010533b0: 0x10533b0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6149,7 +6149,7 @@ L_1053268:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010533a4: 0x10533a4: sw    s5, 20(sp)
+// 0x010533b4: 0x10533b4: sw    s5, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6158,7 +6158,7 @@ L_1053268:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010533a8: 0x10533a8: jal   0x10929e0 sw    zero, 24(sp)
+// 0x010533b8: 0x10533b8: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6172,31 +6172,31 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010533b0: 0x10533b0: addu  a1, v0, zero
+// 0x010533c0: 0x10533c0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010533b4: 0x10533b4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010533c4: 0x10533c4: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010533bc: 0x10533bc: addu  a2, zero, zero
+// 0x010533cc: 0x10533cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010533c0: 0x10533c0: addu  a0, s0, zero
+// 0x010533d0: 0x10533d0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010533c4: 0x10533c4: jal   0x10942e8 addiu a1, zero, 1
+// 0x010533d4: 0x10533d4: jal   0x109490c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6204,20 +6204,20 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010533cc: 0x10533cc: lui   a0, 0x0
+// 0x010533dc: 0x10533dc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010533d0: 0x10533d0: addiu a0, a0, 32244
+// 0x010533e0: 0x10533e0: addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010533d4: 0x10533d4: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010533e4: 0x10533e4: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -6225,55 +6225,55 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010533dc: 0x10533dc: addu  a1, v0, zero
+// 0x010533ec: 0x10533ec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010533e0: 0x10533e0: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010533f0: 0x10533f0: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010533e8: 0x10533e8: addu  a1, s0, zero
+// 0x010533f8: 0x10533f8: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010533ec: 0x10533ec: jal   0x1098ec4 addu  a0, s3, zero
+// 0x010533fc: 0x10533fc: jal   0x109950c addu  a0, s3, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010533f4: 0x10533f4: lui   a0, 0x10000
+// 0x01053404: 0x1053404: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010533f8: 0x10533f8: addiu a3, zero, -1
+// 0x01053408: 0x1053408: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010533fc: 0x10533fc: addiu a0, a0, 5976
+// 0x0105340c: 0x105340c: addiu a0, a0, 5972
 	ldloc.1
-	ldc.i4 5976
+	ldc.i4 5972
 	add
 	stloc.1
-// 0x01053400: 0x1053400: addu  a1, zero, zero
+// 0x01053410: 0x1053410: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01053404: 0x1053404: addiu a2, zero, -2
+// 0x01053414: 0x1053414: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01053408: 0x1053408: jal   0x1093a24 sw    s8, 16(sp)
+// 0x01053418: 0x1053418: jal   0x1094048 sw    s8, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6287,43 +6287,43 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053410: 0x1053410: addu  a0, v0, zero
+// 0x01053420: 0x1053420: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01053414: 0x1053414: addu  a1, zero, zero
+// 0x01053424: 0x1053424: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01053418: 0x1053418: addu  a2, zero, zero
+// 0x01053428: 0x1053428: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105341c: 0x105341c: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0105342c: 0x105342c: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01053424: 0x1053424: addiu a3, zero, -1
+// 0x01053434: 0x1053434: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01053428: 0x1053428: addiu a0, s7, -32632
+// 0x01053438: 0x1053438: addiu a0, s7, -32632
 	ldloc 16
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x0105342c: 0x105342c: addu  a1, zero, zero
+// 0x0105343c: 0x105343c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01053430: 0x1053430: addiu a2, zero, -2
+// 0x01053440: 0x1053440: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01053434: 0x1053434: jal   0x1093a24 sw    s6, 16(sp)
+// 0x01053444: 0x1053444: jal   0x1094048 sw    s6, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6337,34 +6337,34 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105343c: 0x105343c: addu  a0, v0, zero
+// 0x0105344c: 0x105344c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01053440: 0x1053440: addu  a1, zero, zero
+// 0x01053450: 0x1053450: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01053444: 0x1053444: addu  a2, zero, zero
+// 0x01053454: 0x1053454: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01053448: 0x1053448: lui   s6, 0x10000
+// 0x01053458: 0x1053458: lui   s6, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x0105344c: 0x105344c: jal   0x1098fe0 addu  s4, v0, zero
+// 0x0105345c: 0x105345c: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01053454: 0x1053454: jal   0x101cd60 addiu a0, s6, 5988
+// 0x01053464: 0x1053464: jal   0x101cd70 addiu a0, s6, 5984
 	ldloc 14
-	ldc.i4 5988
+	ldc.i4 5984
 	add
 	stloc.1
 	ldloc.0
@@ -6372,26 +6372,26 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105345c: 0x105345c: lui   a0, 0x10000
+// 0x0105346c: 0x105346c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053460: 0x1053460: addiu a2, zero, -1
+// 0x01053470: 0x1053470: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01053464: 0x1053464: addiu a3, zero, 4240
+// 0x01053474: 0x1053474: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01053468: 0x1053468: addiu a0, a0, 6008
+// 0x01053478: 0x1053478: addiu a0, a0, 6004
 	ldloc.1
-	ldc.i4 6008
+	ldc.i4 6004
 	add
 	stloc.1
-// 0x0105346c: 0x105346c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0105347c: 0x105347c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6399,40 +6399,40 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053474: 0x1053474: addu  a1, v0, zero
+// 0x01053484: 0x1053484: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053478: 0x1053478: jal   0x1098ec4 addu  a0, s4, zero
+// 0x01053488: 0x1053488: jal   0x109950c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053480: 0x1053480: addu  a1, s4, zero
+// 0x01053490: 0x1053490: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01053484: 0x1053484: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01053494: 0x1053494: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105348c: 0x105348c: jal   0x101cd60 addiu a0, s6, 5988
+// 0x0105349c: 0x105349c: jal   0x101cd70 addiu a0, s6, 5984
 	ldloc 14
-	ldc.i4 5988
+	ldc.i4 5984
 	add
 	stloc.1
 	ldloc.0
@@ -6440,42 +6440,42 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053494: 0x1053494: addu  a1, v0, zero
+// 0x010534a4: 0x10534a4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053498: 0x1053498: lui   a3, 0x70000
+// 0x010534a8: 0x10534a8: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105349c: 0x105349c: lui   a0, 0x10000
+// 0x010534ac: 0x10534ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010534a0: 0x10534a0: lui   v0, 0x70000
+// 0x010534b0: 0x10534b0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010534a4: 0x10534a4: addiu a3, a3, 2316
+// 0x010534b4: 0x10534b4: addiu a3, a3, 2780
 	ldloc 4
-	ldc.i4 2316
+	ldc.i4 2780
 	add
 	stloc 4
-// 0x010534a8: 0x10534a8: addiu a2, zero, 3
+// 0x010534b8: 0x10534b8: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x010534ac: 0x10534ac: addiu a0, a0, 5744
+// 0x010534bc: 0x10534bc: addiu a0, a0, 5740
 	ldloc.1
-	ldc.i4 5744
+	ldc.i4 5740
 	add
 	stloc.1
-// 0x010534b0: 0x10534b0: addiu v0, v0, 2328
+// 0x010534c0: 0x10534c0: addiu v0, v0, 2792
 	ldloc 5
-	ldc.i4 2328
+	ldc.i4 2792
 	add
 	stloc 5
-// 0x010534b4: 0x10534b4: sw    v0, 16(sp)
+// 0x010534c4: 0x10534c4: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6484,7 +6484,7 @@ L_1053268:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010534b8: 0x10534b8: sw    s5, 20(sp)
+// 0x010534c8: 0x10534c8: sw    s5, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6493,7 +6493,7 @@ L_1053268:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010534bc: 0x10534bc: jal   0x10929e0 sw    zero, 24(sp)
+// 0x010534cc: 0x10534cc: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6507,54 +6507,54 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010534c4: 0x10534c4: addu  a1, v0, zero
+// 0x010534d4: 0x10534d4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010534c8: 0x10534c8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010534d8: 0x10534d8: jal   0x109950c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010534d0: 0x10534d0: addu  a0, s3, zero
+// 0x010534e0: 0x10534e0: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010534d4: 0x10534d4: jal   0x1098ec4 addu  a1, s0, zero
+// 0x010534e4: 0x10534e4: jal   0x109950c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010534dc: 0x10534dc: addu  a1, s3, zero
+// 0x010534ec: 0x10534ec: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x010534e0: 0x10534e0: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010534f0: 0x10534f0: jal   0x109950c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010534e8: 0x10534e8: lui   a0, 0x0
+// 0x010534f8: 0x10534f8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010534ec: 0x10534ec: jal   0x101cd60 addiu a0, a0, 32524
+// 0x010534fc: 0x10534fc: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -6564,15 +6564,15 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010534f4: 0x10534f4: addu  a1, v0, zero
+// 0x01053504: 0x1053504: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010534f8: 0x10534f8: jal   0x109b434 addu  a0, s2, zero
+// 0x01053508: 0x1053508: jal   0x109ba7c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -6580,32 +6580,32 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053500: 0x1053500: lui   a1, 0x1050000
+// 0x01053510: 0x1053510: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x01053504: 0x1053504: addu  a0, s2, zero
+// 0x01053514: 0x1053514: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01053508: 0x1053508: jal   0x1099174 addiu a1, a1, 12576
+// 0x01053518: 0x1053518: jal   0x10997bc addiu a1, a1, 12592
 	ldloc.2
-	ldc.i4 12576
+	ldc.i4 12592
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01053510: 0x1053510: addiu a0, s1, 5888
+// 0x01053520: 0x1053520: addiu a0, s1, 5884
 	ldloc 8
-	ldc.i4 5888
+	ldc.i4 5884
 	add
 	stloc.1
-// 0x01053514: 0x1053514: jal   0x1095eec addu  a1, zero, zero
+// 0x01053524: 0x1053524: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6613,101 +6613,101 @@ L_1053268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105351c:
-// 0x0105351c: 0x105351c: jal   0x1054434 sll   zero, zero, 0
+L_105352c:
+// 0x0105352c: 0x105352c: jal   0x1054444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_popup_config_1054434(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_popup_config_1054444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053524: 0x1053524: bne   v0, zero, 0x105353c addiu v1, zero, 1
+// 0x01053534: 0x1053534: bne   v0, zero, 0x105354c addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_105353c
+	brtrue L_105354c
 // --- basic block ---
-// 0x0105352c: 0x105352c: lui   v0, 0x70000
+// 0x0105353c: 0x105353c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053530: 0x1053530: lw    a1, 2312(v0)
+// 0x01053540: 0x1053540: lw    a1, 2776(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4 694
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053534: 0x1053534: j	 0x1053578 lui   a0, 0x10000
+// 0x01053544: 0x1053544: j	 0x1053588 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1053578
+	br L_1053588
 // --- basic block ---
-L_105353c:
-// 0x0105353c: 0x105353c: bne   v0, v1, 0x1053554 lui   a0, 0x10000
+L_105354c:
+// 0x0105354c: 0x105354c: bne   v0, v1, 0x1053564 lui   a0, 0x10000
 	ldloc 5
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	bne.un L_1053554
+	bne.un L_1053564
 // --- basic block ---
-// 0x01053544: 0x1053544: lui   v0, 0x70000
+// 0x01053554: 0x1053554: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053548: 0x1053548: lw    a1, 2308(v0)
+// 0x01053558: 0x1053558: lw    a1, 2772(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 577
+	ldc.i4 693
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105354c: 0x105354c: j	 0x1053578 sll   zero, zero, 0
-	br L_1053578
+// 0x0105355c: 0x105355c: j	 0x1053588 sll   zero, zero, 0
+	br L_1053588
 // --- basic block ---
-L_1053554:
-// 0x01053554: 0x1053554: addiu a0, zero, 2
+L_1053564:
+// 0x01053564: 0x1053564: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01053558: 0x1053558: bne   v0, a0, 0x105356c lui   v1, 0x70000
+// 0x01053568: 0x1053568: bne   v0, a0, 0x105357c lui   v1, 0x70000
 	ldloc 5
 	ldloc.1
 	ldc.i4 458752
 	stloc 6
-	bne.un L_105356c
+	bne.un L_105357c
 // --- basic block ---
-// 0x01053560: 0x1053560: lw    a1, 2304(v1)
+// 0x01053570: 0x1053570: lw    a1, 2768(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 576
+	ldc.i4 692
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053564: 0x1053564: j	 0x1053578 lui   a0, 0x10000
+// 0x01053574: 0x1053574: j	 0x1053588 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1053578
+	br L_1053588
 // --- basic block ---
-L_105356c:
-// 0x0105356c: 0x105356c: addiu v1, v1, 2304
+L_105357c:
+// 0x0105357c: 0x105357c: addiu v1, v1, 2768
 	ldloc 6
-	ldc.i4 2304
+	ldc.i4 2768
 	add
 	stloc 6
-// 0x01053570: 0x1053570: lw    a1, 8(v1)
+// 0x01053580: 0x1053580: lw    a1, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6716,13 +6716,13 @@ L_105356c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053574: 0x1053574: lui   a0, 0x10000
+// 0x01053584: 0x1053584: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1053578:
-// 0x01053578: 0x1053578: jal   0x1094734 addiu a0, a0, 5736
+L_1053588:
+// 0x01053588: 0x1053588: jal   0x1094d58 addiu a0, a0, 5732
 	ldloc.1
-	ldc.i4 5736
+	ldc.i4 5732
 	add
 	stloc.1
 	ldloc.0
@@ -6730,87 +6730,87 @@ L_1053578:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053580: 0x1053580: jal   0x10543d0 sll   zero, zero, 0
+// 0x01053590: 0x1053590: jal   0x10543e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_show_wazer_config_10543e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053588: 0x1053588: bne   v0, zero, 0x10535a0 addiu v1, zero, 1
+// 0x01053598: 0x1053598: bne   v0, zero, 0x10535b0 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_10535a0
+	brtrue L_10535b0
 // --- basic block ---
-// 0x01053590: 0x1053590: lui   v0, 0x70000
+// 0x010535a0: 0x10535a0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053594: 0x1053594: lw    a1, 2336(v0)
+// 0x010535a4: 0x10535a4: lw    a1, 2800(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 584
+	ldc.i4 700
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053598: 0x1053598: j	 0x10535c0 lui   a0, 0x10000
+// 0x010535a8: 0x10535a8: j	 0x10535d0 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_10535c0
+	br L_10535d0
 // --- basic block ---
-L_10535a0:
-// 0x010535a0: 0x10535a0: bne   v0, v1, 0x10535b8 lui   v0, 0x70000
+L_10535b0:
+// 0x010535b0: 0x10535b0: bne   v0, v1, 0x10535c8 lui   v0, 0x70000
 	ldloc 5
 	ldloc 6
 	ldc.i4 458752
 	stloc 5
-	bne.un L_10535b8
+	bne.un L_10535c8
 // --- basic block ---
-// 0x010535a8: 0x10535a8: lui   v0, 0x70000
+// 0x010535b8: 0x10535b8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010535ac: 0x10535ac: lw    a1, 2332(v0)
+// 0x010535bc: 0x10535bc: lw    a1, 2796(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 583
+	ldc.i4 699
 	add
 	ldelem.i4
 	stloc.2
-// 0x010535b0: 0x10535b0: j	 0x10535c0 lui   a0, 0x10000
+// 0x010535c0: 0x10535c0: j	 0x10535d0 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_10535c0
+	br L_10535d0
 // --- basic block ---
-L_10535b8:
-// 0x010535b8: 0x10535b8: lw    a1, 2328(v0)
+L_10535c8:
+// 0x010535c8: 0x10535c8: lw    a1, 2792(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 582
+	ldc.i4 698
 	add
 	ldelem.i4
 	stloc.2
-// 0x010535bc: 0x10535bc: lui   a0, 0x10000
+// 0x010535cc: 0x10535cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10535c0:
-// 0x010535c0: 0x10535c0: jal   0x1094734 addiu a0, a0, 5744
+L_10535d0:
+// 0x010535d0: 0x10535d0: jal   0x1094d58 addiu a0, a0, 5740
 	ldloc.1
-	ldc.i4 5744
+	ldc.i4 5740
 	add
 	stloc.1
 	ldloc.0
@@ -6818,13 +6818,13 @@ L_10535c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010535c8: 0x10535c8: lw    ra, 68(sp)
-// 0x010535cc: 0x10535cc: lw    s8, 64(sp)
+// 0x010535d8: 0x10535d8: lw    ra, 68(sp)
+// 0x010535dc: 0x10535dc: lw    s8, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6833,7 +6833,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010535d0: 0x10535d0: lw    s7, 60(sp)
+// 0x010535e0: 0x10535e0: lw    s7, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6842,7 +6842,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010535d4: 0x10535d4: lw    s6, 56(sp)
+// 0x010535e4: 0x10535e4: lw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6851,7 +6851,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010535d8: 0x10535d8: lw    s5, 52(sp)
+// 0x010535e8: 0x10535e8: lw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6860,7 +6860,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010535dc: 0x10535dc: lw    s4, 48(sp)
+// 0x010535ec: 0x10535ec: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6869,7 +6869,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010535e0: 0x10535e0: lw    s3, 44(sp)
+// 0x010535f0: 0x10535f0: lw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6878,7 +6878,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010535e4: 0x10535e4: lw    s2, 40(sp)
+// 0x010535f4: 0x10535f4: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6887,7 +6887,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010535e8: 0x10535e8: lw    s1, 36(sp)
+// 0x010535f8: 0x10535f8: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6896,7 +6896,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010535ec: 0x10535ec: lw    s0, 32(sp)
+// 0x010535fc: 0x10535fc: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6905,7 +6905,7 @@ L_10535c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010535f0: 0x10535f0: jr    ra addiu sp, sp, 72
+// 0x01053600: 0x1053600: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
diff --git a/converted/Cibyl62.j b/converted/Cibyl62.j
index bf2329e..e27cccc 100644
--- a/converted/Cibyl62.j
+++ b/converted/Cibyl62.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl62::.ctor
 
-.method public static int32 roadmap_version_write_10535f8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_version_write_1053608(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -82,13 +82,13 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010535f8: 0x10535f8: addiu sp, sp, -32
+// 0x01053608: 0x1053608: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010535fc: 0x10535fc: sw    ra, 28(sp)
-// 0x01053600: 0x1053600: sw    s1, 24(sp)
+// 0x0105360c: 0x105360c: sw    ra, 28(sp)
+// 0x01053610: 0x1053610: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -97,7 +97,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01053604: 0x1053604: sw    s0, 20(sp)
+// 0x01053614: 0x1053614: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -106,7 +106,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01053608: 0x1053608: jal   0x104c564 addu  s0, a0, zero
+// 0x01053618: 0x1053618: jal   0x104c574 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -114,26 +114,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053610: 0x1053610: lui   a1, 0x10000
+// 0x01053620: 0x1053620: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01053614: 0x1053614: lui   a2, 0x0
+// 0x01053624: 0x1053624: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01053618: 0x1053618: addu  a0, v0, zero
+// 0x01053628: 0x1053628: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105361c: 0x105361c: addiu a1, a1, 6020
+// 0x0105362c: 0x105362c: addiu a1, a1, 6016
 	ldloc.2
-	ldc.i4 6020
+	ldc.i4 6016
 	add
 	stloc.2
-// 0x01053620: 0x1053620: jal   0x104dac8 addiu a2, a2, 28940
+// 0x01053630: 0x1053630: jal   0x104dad8 addiu a2, a2, 28940
 	ldloc.3
 	ldc.i4 28940
 	add
@@ -143,21 +143,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053628: 0x1053628: beq   v0, zero, 0x105364c addu  s1, v0, zero
+// 0x01053638: 0x1053638: beq   v0, zero, 0x105365c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_105364c
+	brfalse L_105365c
 // --- basic block ---
-// 0x01053630: 0x1053630: addu  a1, s0, zero
+// 0x01053640: 0x1053640: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01053634: 0x1053634: jal   0x1000ef4 addu  a0, v0, zero
+// 0x01053644: 0x1053644: jal   0x1000ef4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -170,7 +170,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105363c: 0x105363c: jal   0x10023b4 addu  a0, s1, zero
+// 0x0105364c: 0x105364c: jal   0x10023b4 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -183,16 +183,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053644: 0x1053644: j	 0x1053658 sll   zero, zero, 0
-	br L_1053658
+// 0x01053654: 0x1053654: j	 0x1053668 sll   zero, zero, 0
+	br L_1053668
 // --- basic block ---
-L_105364c:
-// 0x0105364c: 0x105364c: lui   a0, 0x10000
+L_105365c:
+// 0x0105365c: 0x105365c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053650: 0x1053650: jal   0x100449c addiu a0, a0, 6028
+// 0x01053660: 0x1053660: jal   0x100449c addiu a0, a0, 6024
 	ldloc.1
-	ldc.i4 6028
+	ldc.i4 6024
 	add
 	stloc.1
 	ldloc.0
@@ -205,9 +205,9 @@ L_105364c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1053658:
-// 0x01053658: 0x1053658: lw    ra, 28(sp)
-// 0x0105365c: 0x105365c: lw    s1, 24(sp)
+L_1053668:
+// 0x01053668: 0x1053668: lw    ra, 28(sp)
+// 0x0105366c: 0x105366c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -216,7 +216,7 @@ L_1053658:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01053660: 0x1053660: lw    s0, 20(sp)
+// 0x01053670: 0x1053670: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -225,7 +225,7 @@ L_1053658:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01053664: 0x1053664: jr    ra addiu sp, sp, 32
+// 0x01053674: 0x1053674: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -237,7 +237,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_version_read_105366c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_version_read_105367c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -278,25 +278,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105366c: 0x105366c: lui   v0, 0x70000
+// 0x0105367c: 0x105367c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053670: 0x1053670: lw    v0, 2340(v0)
+// 0x01053680: 0x1053680: lw    v0, 2804(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
+	ldc.i4 701
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053674: 0x1053674: addiu sp, sp, -32
+// 0x01053684: 0x1053684: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01053678: 0x1053678: sw    ra, 28(sp)
-// 0x0105367c: 0x105367c: sw    s1, 24(sp)
+// 0x01053688: 0x1053688: sw    ra, 28(sp)
+// 0x0105368c: 0x105368c: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -305,7 +305,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01053680: 0x1053680: bne   v0, zero, 0x10536f4 sw    s0, 20(sp)
+// 0x01053690: 0x1053690: bne   v0, zero, 0x1053704 sw    s0, 20(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -315,17 +315,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_10536f4
+	brtrue L_1053704
 // --- basic block ---
-// 0x01053688: 0x1053688: lui   s1, 0x70000
+// 0x01053698: 0x1053698: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0105368c: 0x105368c: lui   s0, 0x10000
+// 0x0105369c: 0x105369c: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01053690: 0x1053690: jal   0x104c564 sb    zero, 2344(s1)
+// 0x010536a0: 0x10536a0: jal   0x104c574 sb    zero, 2808(s1)
 	ldloc 9
-	ldc.i4 2344
+	ldc.i4 2808
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -334,17 +334,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053698: 0x1053698: addu  a0, v0, zero
+// 0x010536a8: 0x10536a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105369c: 0x105369c: jal   0x104d690 addiu a1, s0, 6020
+// 0x010536ac: 0x10536ac: jal   0x104d6a0 addiu a1, s0, 6016
 	ldloc 8
-	ldc.i4 6020
+	ldc.i4 6016
 	add
 	stloc.2
 	ldloc.0
@@ -352,42 +352,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010536a4: 0x10536a4: beq   v0, zero, 0x10536ec addiu v1, zero, 1
+// 0x010536b4: 0x10536b4: beq   v0, zero, 0x10536fc addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_10536ec
+	brfalse L_10536fc
 // --- basic block ---
-// 0x010536ac: 0x10536ac: jal   0x104c564 sll   zero, zero, 0
+// 0x010536bc: 0x10536bc: jal   0x104c574 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010536b4: 0x10536b4: lui   a2, 0x10000
+// 0x010536c4: 0x10536c4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010536b8: 0x10536b8: addiu a1, s0, 6020
+// 0x010536c8: 0x10536c8: addiu a1, s0, 6016
 	ldloc 8
-	ldc.i4 6020
+	ldc.i4 6016
 	add
 	stloc.2
-// 0x010536bc: 0x10536bc: addu  a0, v0, zero
+// 0x010536cc: 0x10536cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010536c0: 0x10536c0: jal   0x104dac8 addiu a2, a2, 6924
+// 0x010536d0: 0x10536d0: jal   0x104dad8 addiu a2, a2, 6920
 	ldloc.3
-	ldc.i4 6924
+	ldc.i4 6920
 	add
 	stloc.3
 	ldloc.0
@@ -395,26 +395,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_fopen_104dac8(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_fopen_104dad8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010536c8: 0x10536c8: beq   v0, zero, 0x10536e8 addu  s0, v0, zero
+// 0x010536d8: 0x10536d8: beq   v0, zero, 0x10536f8 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_10536e8
+	brfalse L_10536f8
 // --- basic block ---
-// 0x010536d0: 0x10536d0: addiu a0, s1, 2344
+// 0x010536e0: 0x10536e0: addiu a0, s1, 2808
 	ldloc 9
-	ldc.i4 2344
+	ldc.i4 2808
 	add
 	stloc.1
-// 0x010536d4: 0x10536d4: addiu a1, zero, 100
+// 0x010536e4: 0x10536e4: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010536d8: 0x10536d8: jal   0x1001e98 addu  a2, v0, zero
+// 0x010536e8: 0x10536e8: jal   0x1001e98 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -427,7 +427,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010536e0: 0x10536e0: jal   0x10023b4 addu  a0, s0, zero
+// 0x010536f0: 0x10536f0: jal   0x10023b4 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -440,34 +440,34 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10536e8:
-// 0x010536e8: 0x10536e8: addiu v1, zero, 1
+L_10536f8:
+// 0x010536f8: 0x10536f8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_10536ec:
-// 0x010536ec: 0x10536ec: lui   v0, 0x70000
+L_10536fc:
+// 0x010536fc: 0x10536fc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010536f0: 0x10536f0: sw    v1, 2340(v0)
+// 0x01053700: 0x1053700: sw    v1, 2804(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
+	ldc.i4 701
 	add
 	ldloc 6
 	stelem.i4
-L_10536f4:
-// 0x010536f4: 0x10536f4: lw    ra, 28(sp)
-// 0x010536f8: 0x10536f8: lui   v0, 0x70000
+L_1053704:
+// 0x01053704: 0x1053704: lw    ra, 28(sp)
+// 0x01053708: 0x1053708: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010536fc: 0x10536fc: addiu v0, v0, 2344
+// 0x0105370c: 0x105370c: addiu v0, v0, 2808
 	ldloc 5
-	ldc.i4 2344
+	ldc.i4 2808
 	add
 	stloc 5
-// 0x01053700: 0x1053700: lw    s1, 24(sp)
+// 0x01053710: 0x1053710: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -476,7 +476,7 @@ L_10536f4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01053704: 0x1053704: lw    s0, 20(sp)
+// 0x01053714: 0x1053714: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -485,7 +485,7 @@ L_10536f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01053708: 0x1053708: jr    ra addiu sp, sp, 32
+// 0x01053718: 0x1053718: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -497,7 +497,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_ticker_height_1053710(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_ticker_height_1053720(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -532,34 +532,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053710: 0x1053710: lui   v0, 0x70000
+// 0x01053720: 0x1053720: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053714: 0x1053714: lw    v1, 2460(v0)
+// 0x01053724: 0x1053724: lw    v1, 2924(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldelem.i4
 	stloc 6
-// 0x01053718: 0x1053718: addiu sp, sp, -24
+// 0x01053728: 0x1053728: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105371c: 0x105371c: sw    ra, 20(sp)
-// 0x01053720: 0x1053720: beq   v1, zero, 0x1053740 addu  v0, zero, zero
+// 0x0105372c: 0x105372c: sw    ra, 20(sp)
+// 0x01053730: 0x1053730: beq   v1, zero, 0x1053750 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1053740
+	brfalse L_1053750
 // --- basic block ---
-// 0x01053728: 0x1053728: lui   v0, 0x0
+// 0x01053738: 0x1053738: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105372c: 0x105372c: lw    a0, 13864(v0)
+// 0x0105373c: 0x105373c: lw    a0, 13864(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -568,13 +568,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053730: 0x1053730: jal   0x10c09ac sll   zero, zero, 0
+// 0x01053740: 0x1053740: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01053738: 0x1053738: jal   0x10c08bc addu  a0, v0, zero
+// 0x01053748: 0x1053748: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -582,10 +582,10 @@ __CIBYL_javamethod_begin:
 	conv.i4
 	stloc 5
 // --- basic block ---
-L_1053740:
-// 0x01053740: 0x1053740: lw    ra, 20(sp)
-// 0x01053744: 0x1053744: sll   zero, zero, 0
-// 0x01053748: 0x1053748: jr    ra addiu sp, sp, 24
+L_1053750:
+// 0x01053750: 0x1053750: lw    ra, 20(sp)
+// 0x01053754: 0x1053754: sll   zero, zero, 0
+// 0x01053758: 0x1053758: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -597,7 +597,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_ticker_key_pressed_1053750(int32)
+.method public static int32 roadmap_message_ticker_key_pressed_1053760(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -620,48 +620,48 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053750: 0x1053750: lui   v0, 0x70000
+// 0x01053760: 0x1053760: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01053754: 0x1053754: lw    v0, 2528(v0)
+// 0x01053764: 0x1053764: lw    v0, 2992(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 632
+	ldc.i4 748
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053758: 0x1053758: sll   zero, zero, 0
-// 0x0105375c: 0x105375c: beq   v0, zero, 0x10537a8 sll   zero, zero, 0
+// 0x01053768: 0x1053768: sll   zero, zero, 0
+// 0x0105376c: 0x105376c: beq   v0, zero, 0x10537b8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10537a8
+	brfalse L_10537b8
 // --- basic block ---
-// 0x01053764: 0x1053764: lui   v0, 0x70000
+// 0x01053774: 0x1053774: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01053768: 0x1053768: lw    v0, 2460(v0)
+// 0x01053778: 0x1053778: lw    v0, 2924(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105376c: 0x105376c: sll   zero, zero, 0
-// 0x01053770: 0x1053770: beq   v0, zero, 0x10537a8 lui   v1, 0x70000
+// 0x0105377c: 0x105377c: sll   zero, zero, 0
+// 0x01053780: 0x1053780: beq   v0, zero, 0x10537b8 lui   v1, 0x70000
 	ldloc.1
 	ldc.i4 458752
 	stloc.2
-	brfalse L_10537a8
+	brfalse L_10537b8
 // --- basic block ---
-// 0x01053778: 0x1053778: addiu v1, v1, 2532
+// 0x01053788: 0x1053788: addiu v1, v1, 2996
 	ldloc.2
-	ldc.i4 2532
+	ldc.i4 2996
 	add
 	stloc.2
-// 0x0105377c: 0x105377c: lw    v0, 4(a0)
+// 0x0105378c: 0x105378c: lw    v0, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -670,7 +670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053780: 0x1053780: lw    a0, 4(v1)
+// 0x01053790: 0x1053790: lw    a0, 4(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -679,17 +679,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01053784: 0x1053784: sll   zero, zero, 0
-// 0x01053788: 0x1053788: slt   a0, v0, a0
+// 0x01053794: 0x1053794: sll   zero, zero, 0
+// 0x01053798: 0x1053798: slt   a0, v0, a0
 	ldloc.1
 	ldloc.0
 	clt
 	stloc.0
-// 0x0105378c: 0x105378c: bne   a0, zero, 0x10537a8 sll   zero, zero, 0
+// 0x0105379c: 0x105379c: bne   a0, zero, 0x10537b8 sll   zero, zero, 0
 	ldloc.0
-	brtrue L_10537a8
+	brtrue L_10537b8
 // --- basic block ---
-// 0x01053794: 0x1053794: lw    v1, 12(v1)
+// 0x010537a4: 0x10537a4: lw    v1, 12(v1)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -698,21 +698,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053798: 0x1053798: sll   zero, zero, 0
-// 0x0105379c: 0x105379c: slt   v0, v1, v0
+// 0x010537a8: 0x10537a8: sll   zero, zero, 0
+// 0x010537ac: 0x10537ac: slt   v0, v1, v0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.1
-// 0x010537a0: 0x10537a0: jr    ra xori  v0, v0, 1
+// 0x010537b0: 0x10537b0: jr    ra xori  v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	xor
 	stloc.1
 	br __CIBYL_function_return
 // --- basic block ---
-L_10537a8:
-// 0x010537a8: 0x10537a8: jr    ra addu  v0, zero, zero
+L_10537b8:
+// 0x010537b8: 0x10537b8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	br __CIBYL_function_return
@@ -722,7 +722,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_message_ticker_short_click_10537b0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_ticker_short_click_10537c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -757,52 +757,52 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010537b0: 0x10537b0: lui   v0, 0x70000
+// 0x010537c0: 0x10537c0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010537b4: 0x10537b4: lw    v0, 2528(v0)
+// 0x010537c4: 0x10537c4: lw    v0, 2992(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 632
+	ldc.i4 748
 	add
 	ldelem.i4
 	stloc 5
-// 0x010537b8: 0x10537b8: addiu sp, sp, -24
+// 0x010537c8: 0x10537c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010537bc: 0x10537bc: beq   v0, zero, 0x1053830 sw    ra, 20(sp)
+// 0x010537cc: 0x10537cc: beq   v0, zero, 0x1053840 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1053830
+	brfalse L_1053840
 // --- basic block ---
-// 0x010537c4: 0x10537c4: lui   v1, 0x70000
+// 0x010537d4: 0x10537d4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x010537c8: 0x10537c8: lw    v0, 2460(v1)
+// 0x010537d8: 0x10537d8: lw    v0, 2924(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldelem.i4
 	stloc 5
-// 0x010537cc: 0x10537cc: sll   zero, zero, 0
-// 0x010537d0: 0x10537d0: beq   v0, zero, 0x1053830 lui   a1, 0x70000
+// 0x010537dc: 0x10537dc: sll   zero, zero, 0
+// 0x010537e0: 0x10537e0: beq   v0, zero, 0x1053840 lui   a1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc.2
-	brfalse L_1053830
+	brfalse L_1053840
 // --- basic block ---
-// 0x010537d8: 0x10537d8: addiu a1, a1, 2532
+// 0x010537e8: 0x10537e8: addiu a1, a1, 2996
 	ldloc.2
-	ldc.i4 2532
+	ldc.i4 2996
 	add
 	stloc.2
-// 0x010537dc: 0x10537dc: lw    v0, 4(a0)
+// 0x010537ec: 0x10537ec: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -811,7 +811,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010537e0: 0x10537e0: lw    a0, 4(a1)
+// 0x010537f0: 0x10537f0: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -820,17 +820,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010537e4: 0x10537e4: sll   zero, zero, 0
-// 0x010537e8: 0x10537e8: slt   a0, v0, a0
+// 0x010537f4: 0x10537f4: sll   zero, zero, 0
+// 0x010537f8: 0x10537f8: slt   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.1
-// 0x010537ec: 0x10537ec: bne   a0, zero, 0x1053830 sll   zero, zero, 0
+// 0x010537fc: 0x10537fc: bne   a0, zero, 0x1053840 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1053830
+	brtrue L_1053840
 // --- basic block ---
-// 0x010537f4: 0x10537f4: lw    a0, 12(a1)
+// 0x01053804: 0x1053804: lw    a0, 12(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -839,41 +839,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010537f8: 0x10537f8: sll   zero, zero, 0
-// 0x010537fc: 0x10537fc: slt   v0, a0, v0
+// 0x01053808: 0x1053808: sll   zero, zero, 0
+// 0x0105380c: 0x105380c: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x01053800: 0x1053800: bne   v0, zero, 0x1053830 lui   v0, 0x70000
+// 0x01053810: 0x1053810: bne   v0, zero, 0x1053840 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1053830
+	brtrue L_1053840
 // --- basic block ---
-// 0x01053808: 0x1053808: lw    v0, 2456(v0)
+// 0x01053818: 0x1053818: lw    v0, 2920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105380c: 0x105380c: sll   zero, zero, 0
-// 0x01053810: 0x1053810: beq   v0, zero, 0x1053820 sw    zero, 2460(v1)
+// 0x0105381c: 0x105381c: sll   zero, zero, 0
+// 0x01053820: 0x1053820: beq   v0, zero, 0x1053830 sw    zero, 2924(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1053820
+	brfalse L_1053830
 // --- basic block ---
-// 0x01053818: 0x1053818: jalr  v0 sll   zero, zero, 0
+// 0x01053828: 0x1053828: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -885,32 +885,32 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1053820:
-// 0x01053820: 0x1053820: lui   v0, 0x70000
+L_1053830:
+// 0x01053830: 0x1053830: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053824: 0x1053824: sw    zero, 2456(v0)
+// 0x01053834: 0x1053834: sw    zero, 2920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01053828: 0x1053828: j	 0x1053834 addiu v0, zero, 1
+// 0x01053838: 0x1053838: j	 0x1053844 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1053834
+	br L_1053844
 // --- basic block ---
-L_1053830:
-// 0x01053830: 0x1053830: addu  v0, zero, zero
+L_1053840:
+// 0x01053840: 0x1053840: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1053834:
-// 0x01053834: 0x1053834: lw    ra, 20(sp)
-// 0x01053838: 0x1053838: sll   zero, zero, 0
-// 0x0105383c: 0x105383c: jr    ra addiu sp, sp, 24
+L_1053844:
+// 0x01053844: 0x1053844: lw    ra, 20(sp)
+// 0x01053848: 0x1053848: sll   zero, zero, 0
+// 0x0105384c: 0x105384c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -922,7 +922,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_ticker_is_on_1053844()
+.method public static int32 roadmap_message_ticker_is_on_1053854()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -939,25 +939,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053844: 0x1053844: lui   v0, 0x70000
+// 0x01053854: 0x1053854: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01053848: 0x1053848: lw    v0, 2460(v0)
+// 0x01053858: 0x1053858: lw    v0, 2924(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldelem.i4
 	stloc.0
-// 0x0105384c: 0x105384c: jr    ra sll   zero, zero, 0
+// 0x0105385c: 0x105385c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_message_ticker_initialize_1053854(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_ticker_initialize_1053864(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 ra)
@@ -1001,12 +1001,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053854: 0x1053854: addiu sp, sp, -40
+// 0x01053864: 0x1053864: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01053858: 0x1053858: sw    s1, 28(sp)
+// 0x01053868: 0x1053868: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1015,10 +1015,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105385c: 0x105385c: lui   s1, 0x0
+// 0x0105386c: 0x105386c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01053860: 0x1053860: sw    s0, 24(sp)
+// 0x01053870: 0x1053870: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1027,21 +1027,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01053864: 0x1053864: addu  a0, zero, zero
+// 0x01053874: 0x1053874: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01053868: 0x1053868: lui   s0, 0x70000
+// 0x01053878: 0x1053878: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105386c: 0x105386c: addiu a1, zero, 1
+// 0x0105387c: 0x105387c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01053870: 0x1053870: addiu a2, s1, 29704
+// 0x01053880: 0x1053880: addiu a2, s1, 29704
 	ldloc 8
 	ldc.i4 29704
 	add
 	stloc.3
-// 0x01053874: 0x1053874: sw    s2, 32(sp)
+// 0x01053884: 0x1053884: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1050,13 +1050,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01053878: 0x1053878: sw    ra, 36(sp)
-// 0x0105387c: 0x105387c: jal   0x10a1918 sw    zero, 2528(s0)
+// 0x01053888: 0x1053888: sw    ra, 36(sp)
+// 0x0105388c: 0x105388c: jal   0x10a1f60 sw    zero, 2992(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 632
+	ldc.i4 748
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1065,45 +1065,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053884: 0x1053884: bne   v0, zero, 0x10538b8 addu  s2, v0, zero
+// 0x01053894: 0x1053894: bne   v0, zero, 0x10538c8 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_10538b8
+	brtrue L_10538c8
 // --- basic block ---
-// 0x0105388c: 0x105388c: lui   a1, 0x10000
+// 0x0105389c: 0x105389c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01053890: 0x1053890: lui   a3, 0x10000
+// 0x010538a0: 0x10538a0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01053894: 0x1053894: addiu s1, s1, 29704
+// 0x010538a4: 0x10538a4: addiu s1, s1, 29704
 	ldloc 8
 	ldc.i4 29704
 	add
 	stloc 8
-// 0x01053898: 0x1053898: addiu a1, a1, 6068
+// 0x010538a8: 0x10538a8: addiu a1, a1, 6064
 	ldloc.2
-	ldc.i4 6068
+	ldc.i4 6064
 	add
 	stloc.2
-// 0x0105389c: 0x105389c: addiu a3, a3, 6104
+// 0x010538ac: 0x10538ac: addiu a3, a3, 6100
 	ldloc 4
-	ldc.i4 6104
+	ldc.i4 6100
 	add
 	stloc 4
-// 0x010538a0: 0x10538a0: addiu a0, zero, 4
+// 0x010538b0: 0x10538b0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010538a4: 0x10538a4: addiu a2, zero, 345
+// 0x010538b4: 0x10538b4: addiu a2, zero, 345
 	ldc.i4 345
 	stloc.3
-// 0x010538a8: 0x10538a8: jal   0x100449c sw    s1, 16(sp)
+// 0x010538b8: 0x10538b8: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1122,26 +1122,26 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010538b0: 0x10538b0: j	 0x105394c sll   zero, zero, 0
-	br L_105394c
+// 0x010538c0: 0x10538c0: j	 0x105395c sll   zero, zero, 0
+	br L_105395c
 // --- basic block ---
-L_10538b8:
-// 0x010538b8: 0x10538b8: jal   0x104dffc addu  a0, v0, zero
+L_10538c8:
+// 0x010538c8: 0x10538c8: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010538c0: 0x10538c0: addu  a0, s2, zero
+// 0x010538d0: 0x10538d0: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x010538c4: 0x10538c4: lui   s2, 0x0
+// 0x010538d4: 0x10538d4: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010538c8: 0x10538c8: jal   0x104e020 sw    v0, 13860(s2)
+// 0x010538d8: 0x10538d8: jal   0x104e030 sw    v0, 13860(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1151,17 +1151,17 @@ L_10538b8:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010538d0: 0x10538d0: addiu s2, s2, 13860
+// 0x010538e0: 0x10538e0: addiu s2, s2, 13860
 	ldloc 9
 	ldc.i4 13860
 	add
 	stloc 9
-// 0x010538d4: 0x10538d4: jal   0x10423fc sw    v0, 4(s2)
+// 0x010538e4: 0x10538e4: jal   0x104240c sw    v0, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1170,25 +1170,25 @@ L_10538b8:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010538dc: 0x10538dc: lui   s1, 0x70000
+// 0x010538ec: 0x10538ec: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010538e0: 0x10538e0: addiu s1, s1, 2532
+// 0x010538f0: 0x10538f0: addiu s1, s1, 2996
 	ldloc 8
-	ldc.i4 2532
+	ldc.i4 2996
 	add
 	stloc 8
-// 0x010538e4: 0x10538e4: addiu v0, v0, 2
+// 0x010538f4: 0x10538f4: addiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 5
-// 0x010538e8: 0x10538e8: jal   0x10423fc sw    v0, 4(s1)
+// 0x010538f8: 0x10538f8: jal   0x104240c sw    v0, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1197,12 +1197,12 @@ L_10538b8:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010538f0: 0x10538f0: lw    v1, 4(s2)
+// 0x01053900: 0x1053900: lw    v1, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1211,28 +1211,28 @@ L_10538b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010538f4: 0x10538f4: lui   a0, 0x0
+// 0x01053904: 0x1053904: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010538f8: 0x10538f8: addiu v1, v1, 2
+// 0x01053908: 0x1053908: addiu v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	add
 	stloc 7
-// 0x010538fc: 0x10538fc: addu  v0, v1, v0
+// 0x0105390c: 0x105390c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01053900: 0x1053900: addiu a1, zero, 1
+// 0x01053910: 0x1053910: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01053904: 0x1053904: addiu a0, a0, 29788
+// 0x01053914: 0x1053914: addiu a0, a0, 29788
 	ldloc.1
 	ldc.i4 29788
 	add
 	stloc.1
-// 0x01053908: 0x1053908: jal   0x104ef00 sw    v0, 12(s1)
+// 0x01053918: 0x1053918: jal   0x104ef10 sw    v0, 12(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1246,28 +1246,28 @@ L_10538b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053910: 0x1053910: lui   a0, 0x0
+// 0x01053920: 0x1053920: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01053914: 0x1053914: lui   v1, 0x70000
+// 0x01053924: 0x1053924: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01053918: 0x1053918: addiu a0, a0, 29800
+// 0x01053928: 0x1053928: addiu a0, a0, 29800
 	ldloc.1
 	ldc.i4 29800
 	add
 	stloc.1
-// 0x0105391c: 0x105391c: jal   0x104edb0 sw    v0, 2548(v1)
+// 0x0105392c: 0x105392c: jal   0x104edc0 sw    v0, 3012(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 637
+	ldc.i4 753
 	add
 	ldloc 5
 	stelem.i4
@@ -1276,20 +1276,20 @@ L_10538b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053924: 0x1053924: lui   a0, 0x1050000
+// 0x01053934: 0x1053934: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01053928: 0x1053928: addiu a0, a0, 14160
+// 0x01053938: 0x1053938: addiu a0, a0, 14176
 	ldloc.1
-	ldc.i4 14160
+	ldc.i4 14176
 	add
 	stloc.1
-// 0x0105392c: 0x105392c: jal   0x104ba38 addiu a1, zero, 3
+// 0x0105393c: 0x105393c: jal   0x104ba48 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -1297,20 +1297,20 @@ L_10538b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba38(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_pressed_104ba48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053934: 0x1053934: lui   a0, 0x1050000
+// 0x01053944: 0x1053944: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01053938: 0x1053938: addiu a0, a0, 14256
+// 0x01053948: 0x1053948: addiu a0, a0, 14272
 	ldloc.1
-	ldc.i4 14256
+	ldc.i4 14272
 	add
 	stloc.1
-// 0x0105393c: 0x105393c: jal   0x104bad8 addiu a1, zero, 3
+// 0x0105394c: 0x105394c: jal   0x104bae8 addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
 	ldloc.0
@@ -1318,26 +1318,26 @@ L_10538b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_pointer_register_short_click_104bad8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_pointer_register_short_click_104bae8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053944: 0x1053944: addiu v0, zero, 1
+// 0x01053954: 0x1053954: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01053948: 0x1053948: sw    v0, 2528(s0)
+// 0x01053958: 0x1053958: sw    v0, 2992(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 632
+	ldc.i4 748
 	add
 	ldloc 5
 	stelem.i4
-L_105394c:
-// 0x0105394c: 0x105394c: lw    ra, 36(sp)
-// 0x01053950: 0x1053950: lw    s2, 32(sp)
+L_105395c:
+// 0x0105395c: 0x105395c: lw    ra, 36(sp)
+// 0x01053960: 0x1053960: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1346,7 +1346,7 @@ L_105394c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01053954: 0x1053954: lw    s1, 28(sp)
+// 0x01053964: 0x1053964: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1355,7 +1355,7 @@ L_105394c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01053958: 0x1053958: lw    s0, 24(sp)
+// 0x01053968: 0x1053968: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1364,7 +1364,7 @@ L_105394c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105395c: 0x105395c: jr    ra addiu sp, sp, 40
+// 0x0105396c: 0x105396c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1376,7 +1376,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_ticker_show_cb_1053964(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_ticker_show_cb_1053974(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra,int32 lo)
@@ -1426,27 +1426,27 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053964: 0x1053964: lui   v0, 0x70000
+// 0x01053974: 0x1053974: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053968: 0x1053968: lw    v0, 2444(v0)
+// 0x01053978: 0x1053978: lw    v0, 2908(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 611
+	ldc.i4 727
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105396c: 0x105396c: addiu sp, sp, -56
+// 0x0105397c: 0x105397c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01053970: 0x1053970: lui   v1, 0x70000
+// 0x01053980: 0x1053980: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01053974: 0x1053974: sw    s3, 48(sp)
+// 0x01053984: 0x1053984: sw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1455,7 +1455,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01053978: 0x1053978: sw    s2, 44(sp)
+// 0x01053988: 0x1053988: sw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1464,7 +1464,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105397c: 0x105397c: sw    s1, 40(sp)
+// 0x0105398c: 0x105398c: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1473,7 +1473,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01053980: 0x1053980: sw    s0, 36(sp)
+// 0x01053990: 0x1053990: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1482,32 +1482,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01053984: 0x1053984: sw    ra, 52(sp)
-// 0x01053988: 0x1053988: sw    zero, 2460(v1)
+// 0x01053994: 0x1053994: sw    ra, 52(sp)
+// 0x01053998: 0x1053998: sw    zero, 2924(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105398c: 0x105398c: addu  s3, a0, zero
+// 0x0105399c: 0x105399c: addu  s3, a0, zero
 	ldloc.1
 	stloc 11
-// 0x01053990: 0x1053990: addu  s2, a1, zero
+// 0x010539a0: 0x10539a0: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01053994: 0x1053994: addu  s0, a2, zero
+// 0x010539a4: 0x10539a4: addu  s0, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01053998: 0x1053998: beq   v0, zero, 0x10539a8 addu  s1, a3, zero
+// 0x010539a8: 0x10539a8: beq   v0, zero, 0x10539b8 addu  s1, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 10
-	brfalse L_10539a8
+	brfalse L_10539b8
 // --- basic block ---
-// 0x010539a0: 0x10539a0: jal   0x1000930 addu  a0, v0, zero
+// 0x010539b0: 0x10539b0: jal   0x1000930 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1520,8 +1520,8 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10539a8:
-// 0x010539a8: 0x10539a8: jal   0x1001ba8 addu  a0, s3, zero
+L_10539b8:
+// 0x010539b8: 0x10539b8: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -1534,34 +1534,34 @@ L_10539a8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010539b0: 0x10539b0: lui   v1, 0x70000
+// 0x010539c0: 0x10539c0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010539b4: 0x10539b4: lw    a0, 2448(v1)
+// 0x010539c4: 0x10539c4: lw    a0, 2912(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 612
+	ldc.i4 728
 	add
 	ldelem.i4
 	stloc.1
-// 0x010539b8: 0x10539b8: lui   v1, 0x70000
+// 0x010539c8: 0x10539c8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010539bc: 0x10539bc: beq   a0, zero, 0x10539cc sw    v0, 2444(v1)
+// 0x010539cc: 0x10539cc: beq   a0, zero, 0x10539dc sw    v0, 2908(v1)
 	ldloc.1
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 611
+	ldc.i4 727
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_10539cc
+	brfalse L_10539dc
 // --- basic block ---
-// 0x010539c4: 0x10539c4: jal   0x1000930 sll   zero, zero, 0
+// 0x010539d4: 0x10539d4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1572,8 +1572,8 @@ L_10539a8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10539cc:
-// 0x010539cc: 0x10539cc: jal   0x1001ba8 addu  a0, s0, zero
+L_10539dc:
+// 0x010539dc: 0x10539dc: jal   0x1001ba8 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1586,34 +1586,34 @@ L_10539cc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010539d4: 0x10539d4: lui   v1, 0x70000
+// 0x010539e4: 0x10539e4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010539d8: 0x10539d8: lw    a0, 2452(v1)
+// 0x010539e8: 0x10539e8: lw    a0, 2916(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 613
+	ldc.i4 729
 	add
 	ldelem.i4
 	stloc.1
-// 0x010539dc: 0x10539dc: lui   v1, 0x70000
+// 0x010539ec: 0x10539ec: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010539e0: 0x10539e0: beq   a0, zero, 0x10539f0 sw    v0, 2448(v1)
+// 0x010539f0: 0x10539f0: beq   a0, zero, 0x1053a00 sw    v0, 2912(v1)
 	ldloc.1
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 612
+	ldc.i4 728
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_10539f0
+	brfalse L_1053a00
 // --- basic block ---
-// 0x010539e8: 0x10539e8: jal   0x1000930 sll   zero, zero, 0
+// 0x010539f8: 0x10539f8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1624,8 +1624,8 @@ L_10539cc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10539f0:
-// 0x010539f0: 0x10539f0: jal   0x1001ba8 addu  a0, s2, zero
+L_1053a00:
+// 0x01053a00: 0x1053a00: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1638,34 +1638,34 @@ L_10539f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010539f8: 0x10539f8: lui   v1, 0x70000
+// 0x01053a08: 0x1053a08: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010539fc: 0x10539fc: lw    v1, 2456(v1)
+// 0x01053a0c: 0x1053a0c: lw    v1, 2920(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldelem.i4
 	stloc 6
-// 0x01053a00: 0x1053a00: lui   a0, 0x70000
+// 0x01053a10: 0x1053a10: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01053a04: 0x1053a04: beq   v1, zero, 0x1053a14 sw    v0, 2452(a0)
+// 0x01053a14: 0x1053a14: beq   v1, zero, 0x1053a24 sw    v0, 2916(a0)
 	ldloc 6
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 613
+	ldc.i4 729
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1053a14
+	brfalse L_1053a24
 // --- basic block ---
-// 0x01053a0c: 0x1053a0c: jalr  v1 sll   zero, zero, 0
+// 0x01053a1c: 0x1053a1c: jalr  v1 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -1677,8 +1677,8 @@ L_10539f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1053a14:
-// 0x01053a14: 0x1053a14: lw    v1, 72(sp)
+L_1053a24:
+// 0x01053a24: 0x1053a24: lw    v1, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1687,22 +1687,22 @@ L_1053a14:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01053a18: 0x1053a18: lui   v0, 0x70000
+// 0x01053a28: 0x1053a28: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053a1c: 0x1053a1c: sw    v1, 2456(v0)
+// 0x01053a2c: 0x1053a2c: sw    v1, 2920(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldloc 6
 	stelem.i4
-// 0x01053a20: 0x1053a20: lui   v0, 0x0
+// 0x01053a30: 0x1053a30: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01053a24: 0x1053a24: beq   s0, zero, 0x1053a7c sw    s1, 13856(v0)
+// 0x01053a34: 0x1053a34: beq   s0, zero, 0x1053a8c sw    s1, 13856(v0)
 	ldloc 8
 	ldloc 7
 	ldloc 5
@@ -1712,15 +1712,15 @@ L_1053a14:
 	add
 	ldloc 10
 	stelem.i4
-	brfalse L_1053a7c
+	brfalse L_1053a8c
 // --- basic block ---
-// 0x01053a2c: 0x1053a2c: addu  a0, zero, zero
+// 0x01053a3c: 0x1053a3c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01053a30: 0x1053a30: addiu a1, zero, 1
+// 0x01053a40: 0x1053a40: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01053a34: 0x1053a34: jal   0x10a1918 addu  a2, s0, zero
+// 0x01053a44: 0x1053a44: jal   0x10a1f60 addu  a2, s0, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -1728,43 +1728,43 @@ L_1053a14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053a3c: 0x1053a3c: bne   v0, zero, 0x1053a80 lui   s2, 0x70000
+// 0x01053a4c: 0x1053a4c: bne   v0, zero, 0x1053a90 lui   s2, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 9
-	brtrue L_1053a80
+	brtrue L_1053a90
 // --- basic block ---
-// 0x01053a44: 0x1053a44: lui   a3, 0x10000
+// 0x01053a54: 0x1053a54: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01053a48: 0x1053a48: lui   v0, 0x1050000
+// 0x01053a58: 0x1053a58: lui   v0, 0x1050000
 	ldc.i4 17104896
 	stloc 5
-// 0x01053a4c: 0x1053a4c: addiu v0, v0, 15152
+// 0x01053a5c: 0x1053a5c: addiu v0, v0, 15168
 	ldloc 5
-	ldc.i4 15152
+	ldc.i4 15168
 	add
 	stloc 5
-// 0x01053a50: 0x1053a50: addu  a1, s0, zero
+// 0x01053a60: 0x1053a60: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01053a54: 0x1053a54: addiu a3, a3, 18500
+// 0x01053a64: 0x1053a64: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01053a58: 0x1053a58: addu  a0, zero, zero
+// 0x01053a68: 0x1053a68: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01053a5c: 0x1053a5c: addu  a2, zero, zero
+// 0x01053a6c: 0x1053a6c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01053a60: 0x1053a60: sw    v0, 24(sp)
+// 0x01053a70: 0x1053a70: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1773,7 +1773,7 @@ L_1053a14:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01053a64: 0x1053a64: sw    zero, 16(sp)
+// 0x01053a74: 0x1053a74: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1782,7 +1782,7 @@ L_1053a14:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01053a68: 0x1053a68: sw    zero, 20(sp)
+// 0x01053a78: 0x1053a78: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1791,7 +1791,7 @@ L_1053a14:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01053a6c: 0x1053a6c: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x01053a7c: 0x1053a7c: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1805,80 +1805,80 @@ L_1053a14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053a74: 0x1053a74: j	 0x1053af4 sll   zero, zero, 0
-	br L_1053af4
+// 0x01053a84: 0x1053a84: j	 0x1053b04 sll   zero, zero, 0
+	br L_1053b04
 // --- basic block ---
-L_1053a7c:
-// 0x01053a7c: 0x1053a7c: lui   s2, 0x70000
+L_1053a8c:
+// 0x01053a8c: 0x1053a8c: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 9
-L_1053a80:
-// 0x01053a80: 0x1053a80: lw    v0, 2464(s2)
+L_1053a90:
+// 0x01053a90: 0x1053a90: lw    v0, 2928(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 616
+	ldc.i4 732
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053a84: 0x1053a84: sll   zero, zero, 0
-// 0x01053a88: 0x1053a88: bne   v0, zero, 0x1053ac0 lui   v0, 0x70000
+// 0x01053a94: 0x1053a94: sll   zero, zero, 0
+// 0x01053a98: 0x1053a98: bne   v0, zero, 0x1053ad0 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1053ac0
+	brtrue L_1053ad0
 // --- basic block ---
-// 0x01053a90: 0x1053a90: jal   0x10518a8 addiu a0, zero, 1
+// 0x01053aa0: 0x1053aa0: jal   0x10518b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053a98: 0x1053a98: lui   s0, 0x10000
+// 0x01053aa8: 0x1053aa8: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01053a9c: 0x1053a9c: addu  a0, v0, zero
+// 0x01053aac: 0x1053aac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01053aa0: 0x1053aa0: addiu a1, s0, 6152
+// 0x01053ab0: 0x1053ab0: addiu a1, s0, 6148
 	ldloc 8
-	ldc.i4 6152
+	ldc.i4 6148
 	add
 	stloc.2
-// 0x01053aa4: 0x1053aa4: jal   0x10518cc sw    v0, 2464(s2)
+// 0x01053ab4: 0x1053ab4: jal   0x10518dc sw    v0, 2928(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 616
+	ldc.i4 732
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053aac: 0x1053aac: addiu a2, s0, 6152
+// 0x01053abc: 0x1053abc: addiu a2, s0, 6148
 	ldloc 8
-	ldc.i4 6152
+	ldc.i4 6148
 	add
 	stloc.3
-// 0x01053ab0: 0x1053ab0: addiu a0, zero, 1
+// 0x01053ac0: 0x1053ac0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01053ab4: 0x1053ab4: jal   0x10a1918 addu  a1, zero, zero
+// 0x01053ac4: 0x1053ac4: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1886,71 +1886,71 @@ L_1053a80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053abc: 0x1053abc: lui   v0, 0x70000
+// 0x01053acc: 0x1053acc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1053ac0:
-// 0x01053ac0: 0x1053ac0: lw    a0, 2464(v0)
+L_1053ad0:
+// 0x01053ad0: 0x1053ad0: lw    a0, 2928(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 616
+	ldc.i4 732
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053ac4: 0x1053ac4: jal   0x105195c sll   zero, zero, 0
+// 0x01053ad4: 0x1053ad4: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053acc: 0x1053acc: addiu v1, zero, 1
+// 0x01053adc: 0x1053adc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01053ad0: 0x1053ad0: lui   v0, 0x70000
+// 0x01053ae0: 0x1053ae0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053ad4: 0x1053ad4: blez  s1, 0x1053af4 sw    v1, 2460(v0)
+// 0x01053ae4: 0x1053ae4: blez  s1, 0x1053b04 sw    v1, 2924(v0)
 	ldloc 10
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldloc 6
 	stelem.i4
 	ldc.i4.s 0
-	ble L_1053af4
+	ble L_1053b04
 // --- basic block ---
-// 0x01053adc: 0x1053adc: addiu a0, zero, 1000
+// 0x01053aec: 0x1053aec: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x01053ae0: 0x1053ae0: mult  s1, a0
+// 0x01053af0: 0x1053af0: mult  s1, a0
 	ldloc 10
 	ldloc.1
 	mul
 	stloc 13
-// 0x01053ae4: 0x1053ae4: lui   a1, 0x1050000
+// 0x01053af4: 0x1053af4: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x01053ae8: 0x1053ae8: mflo  lo
+// 0x01053af8: 0x1053af8: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x01053aec: 0x1053aec: jal   0x104fe98 addiu a1, a1, 15308
+// 0x01053afc: 0x1053afc: jal   0x104fea8 addiu a1, a1, 15324
 	ldloc.2
-	ldc.i4 15308
+	ldc.i4 15324
 	add
 	stloc.2
 	ldloc.0
@@ -1958,14 +1958,14 @@ L_1053ac0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1053af4:
-// 0x01053af4: 0x1053af4: lw    ra, 52(sp)
-// 0x01053af8: 0x1053af8: lw    s3, 48(sp)
+L_1053b04:
+// 0x01053b04: 0x1053b04: lw    ra, 52(sp)
+// 0x01053b08: 0x1053b08: lw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1974,7 +1974,7 @@ L_1053af4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01053afc: 0x1053afc: lw    s2, 44(sp)
+// 0x01053b0c: 0x1053b0c: lw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1983,7 +1983,7 @@ L_1053af4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01053b00: 0x1053b00: lw    s1, 40(sp)
+// 0x01053b10: 0x1053b10: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1992,7 +1992,7 @@ L_1053af4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01053b04: 0x1053b04: lw    s0, 36(sp)
+// 0x01053b14: 0x1053b14: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2001,7 +2001,7 @@ L_1053af4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01053b08: 0x1053b08: jr    ra addiu sp, sp, 56
+// 0x01053b18: 0x1053b18: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -2013,7 +2013,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_ticker_show_1053b10(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_ticker_show_1053b20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -2048,13 +2048,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053b10: 0x1053b10: addiu sp, sp, -32
+// 0x01053b20: 0x1053b20: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01053b14: 0x1053b14: sw    ra, 28(sp)
-// 0x01053b18: 0x1053b18: jal   0x1053964 sw    zero, 16(sp)
+// 0x01053b24: 0x1053b24: sw    ra, 28(sp)
+// 0x01053b28: 0x1053b28: jal   0x1053974 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2068,14 +2068,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_show_cb_1053964(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_show_cb_1053974(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01053b20: 0x1053b20: lw    ra, 28(sp)
-// 0x01053b24: 0x1053b24: sll   zero, zero, 0
-// 0x01053b28: 0x1053b28: jr    ra addiu sp, sp, 32
+// 0x01053b30: 0x1053b30: lw    ra, 28(sp)
+// 0x01053b34: 0x1053b34: sll   zero, zero, 0
+// 0x01053b38: 0x1053b38: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2087,7 +2087,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_resource_downloaded_1053b30(int32,int32,int32,int32,int32)
+.method public static int32 on_resource_downloaded_1053b40(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra,int32 lo)
@@ -2131,12 +2131,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053b30: 0x1053b30: addiu sp, sp, -32
+// 0x01053b40: 0x1053b40: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01053b34: 0x1053b34: sw    s1, 24(sp)
+// 0x01053b44: 0x1053b44: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2145,20 +2145,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01053b38: 0x1053b38: lui   s1, 0x70000
+// 0x01053b48: 0x1053b48: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01053b3c: 0x1053b3c: lw    v0, 2468(s1)
+// 0x01053b4c: 0x1053b4c: lw    v0, 2932(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 617
+	ldc.i4 733
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053b40: 0x1053b40: sw    ra, 28(sp)
-// 0x01053b44: 0x1053b44: bne   v0, zero, 0x1053b78 sw    s0, 20(sp)
+// 0x01053b50: 0x1053b50: sw    ra, 28(sp)
+// 0x01053b54: 0x1053b54: bne   v0, zero, 0x1053b88 sw    s0, 20(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -2168,53 +2168,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brtrue L_1053b78
+	brtrue L_1053b88
 // --- basic block ---
-// 0x01053b4c: 0x1053b4c: jal   0x10518a8 addiu a0, zero, 1
+// 0x01053b5c: 0x1053b5c: jal   0x10518b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053b54: 0x1053b54: lui   s0, 0x10000
+// 0x01053b64: 0x1053b64: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01053b58: 0x1053b58: addu  a0, v0, zero
+// 0x01053b68: 0x1053b68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01053b5c: 0x1053b5c: addiu a1, s0, 6152
+// 0x01053b6c: 0x1053b6c: addiu a1, s0, 6148
 	ldloc 8
-	ldc.i4 6152
+	ldc.i4 6148
 	add
 	stloc.2
-// 0x01053b60: 0x1053b60: jal   0x10518cc sw    v0, 2468(s1)
+// 0x01053b70: 0x1053b70: jal   0x10518dc sw    v0, 2932(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 617
+	ldc.i4 733
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053b68: 0x1053b68: addiu a2, s0, 6152
+// 0x01053b78: 0x1053b78: addiu a2, s0, 6148
 	ldloc 8
-	ldc.i4 6152
+	ldc.i4 6148
 	add
 	stloc.3
-// 0x01053b6c: 0x1053b6c: addiu a0, zero, 1
+// 0x01053b7c: 0x1053b7c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01053b70: 0x1053b70: jal   0x10a1918 addu  a1, zero, zero
+// 0x01053b80: 0x1053b80: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2222,39 +2222,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1053b78:
-// 0x01053b78: 0x1053b78: lui   v0, 0x70000
+L_1053b88:
+// 0x01053b88: 0x1053b88: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053b7c: 0x1053b7c: lw    a0, 2468(v0)
+// 0x01053b8c: 0x1053b8c: lw    a0, 2932(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 617
+	ldc.i4 733
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053b80: 0x1053b80: jal   0x105195c sll   zero, zero, 0
+// 0x01053b90: 0x1053b90: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053b88: 0x1053b88: lui   v0, 0x0
+// 0x01053b98: 0x1053b98: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01053b8c: 0x1053b8c: lw    v0, 13856(v0)
+// 0x01053b9c: 0x1053b9c: lw    v0, 13856(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2263,42 +2263,42 @@ L_1053b78:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053b90: 0x1053b90: addiu a0, zero, 1
+// 0x01053ba0: 0x1053ba0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01053b94: 0x1053b94: lui   v1, 0x70000
+// 0x01053ba4: 0x1053ba4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01053b98: 0x1053b98: blez  v0, 0x1053bb8 sw    a0, 2460(v1)
+// 0x01053ba8: 0x1053ba8: blez  v0, 0x1053bc8 sw    a0, 2924(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldloc.1
 	stelem.i4
 	ldc.i4.s 0
-	ble L_1053bb8
+	ble L_1053bc8
 // --- basic block ---
-// 0x01053ba0: 0x1053ba0: addiu a0, zero, 1000
+// 0x01053bb0: 0x1053bb0: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x01053ba4: 0x1053ba4: mult  v0, a0
+// 0x01053bb4: 0x1053bb4: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 11
-// 0x01053ba8: 0x1053ba8: lui   a1, 0x1050000
+// 0x01053bb8: 0x1053bb8: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x01053bac: 0x1053bac: mflo  lo
+// 0x01053bbc: 0x1053bbc: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01053bb0: 0x1053bb0: jal   0x104fe98 addiu a1, a1, 15308
+// 0x01053bc0: 0x1053bc0: jal   0x104fea8 addiu a1, a1, 15324
 	ldloc.2
-	ldc.i4 15308
+	ldc.i4 15324
 	add
 	stloc.2
 	ldloc.0
@@ -2306,14 +2306,14 @@ L_1053b78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1053bb8:
-// 0x01053bb8: 0x1053bb8: lw    ra, 28(sp)
-// 0x01053bbc: 0x1053bbc: lw    s1, 24(sp)
+L_1053bc8:
+// 0x01053bc8: 0x1053bc8: lw    ra, 28(sp)
+// 0x01053bcc: 0x1053bcc: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2322,7 +2322,7 @@ L_1053bb8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01053bc0: 0x1053bc0: lw    s0, 20(sp)
+// 0x01053bd0: 0x1053bd0: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2331,7 +2331,7 @@ L_1053bb8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01053bc4: 0x1053bc4: jr    ra addiu sp, sp, 32
+// 0x01053bd4: 0x1053bd4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2343,7 +2343,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_ticker_hide_1053bcc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_ticker_hide_1053bdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2378,40 +2378,40 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053bcc: 0x1053bcc: lui   v0, 0x70000
+// 0x01053bdc: 0x1053bdc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053bd0: 0x1053bd0: lw    v0, 2456(v0)
+// 0x01053be0: 0x1053be0: lw    v0, 2920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053bd4: 0x1053bd4: addiu sp, sp, -24
+// 0x01053be4: 0x1053be4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01053bd8: 0x1053bd8: lui   v1, 0x70000
+// 0x01053be8: 0x1053be8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01053bdc: 0x1053bdc: sw    ra, 20(sp)
-// 0x01053be0: 0x1053be0: beq   v0, zero, 0x1053bf0 sw    zero, 2460(v1)
+// 0x01053bec: 0x1053bec: sw    ra, 20(sp)
+// 0x01053bf0: 0x1053bf0: beq   v0, zero, 0x1053c00 sw    zero, 2924(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1053bf0
+	brfalse L_1053c00
 // --- basic block ---
-// 0x01053be8: 0x1053be8: jalr  v0 sll   zero, zero, 0
+// 0x01053bf8: 0x1053bf8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2423,24 +2423,24 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1053bf0:
-// 0x01053bf0: 0x1053bf0: lui   a0, 0x1050000
+L_1053c00:
+// 0x01053c00: 0x1053c00: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01053bf4: 0x1053bf4: lui   v0, 0x70000
+// 0x01053c04: 0x1053c04: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053bf8: 0x1053bf8: addiu a0, a0, 15308
+// 0x01053c08: 0x1053c08: addiu a0, a0, 15324
 	ldloc.1
-	ldc.i4 15308
+	ldc.i4 15324
 	add
 	stloc.1
-// 0x01053bfc: 0x1053bfc: jal   0x104fd00 sw    zero, 2456(v0)
+// 0x01053c0c: 0x1053c0c: jal   0x104fd10 sw    zero, 2920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2449,14 +2449,14 @@ L_1053bf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053c04: 0x1053c04: lw    ra, 20(sp)
-// 0x01053c08: 0x1053c08: sll   zero, zero, 0
-// 0x01053c0c: 0x1053c0c: jr    ra addiu sp, sp, 24
+// 0x01053c14: 0x1053c14: lw    ra, 20(sp)
+// 0x01053c18: 0x1053c18: sll   zero, zero, 0
+// 0x01053c1c: 0x1053c1c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2468,7 +2468,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_message_ticker_display_1053c14(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_message_ticker_display_1053c24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -2518,25 +2518,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053c14: 0x1053c14: lui   v0, 0x70000
+// 0x01053c24: 0x1053c24: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053c18: 0x1053c18: lw    v0, 2528(v0)
+// 0x01053c28: 0x1053c28: lw    v0, 2992(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 632
+	ldc.i4 748
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053c1c: 0x1053c1c: addiu sp, sp, -64
+// 0x01053c2c: 0x1053c2c: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01053c20: 0x1053c20: sw    ra, 60(sp)
-// 0x01053c24: 0x1053c24: sw    s3, 56(sp)
+// 0x01053c30: 0x1053c30: sw    ra, 60(sp)
+// 0x01053c34: 0x1053c34: sw    s3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2545,7 +2545,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01053c28: 0x1053c28: sw    s2, 52(sp)
+// 0x01053c38: 0x1053c38: sw    s2, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2554,7 +2554,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01053c2c: 0x1053c2c: sw    s1, 48(sp)
+// 0x01053c3c: 0x1053c3c: sw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2563,7 +2563,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01053c30: 0x1053c30: beq   v0, zero, 0x1053e98 sw    s0, 44(sp)
+// 0x01053c40: 0x1053c40: beq   v0, zero, 0x1053ea8 sw    s0, 44(sp)
 	ldloc 5
 	ldloc 7
 	ldloc.0
@@ -2573,48 +2573,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1053e98
+	brfalse L_1053ea8
 // --- basic block ---
-// 0x01053c38: 0x1053c38: lui   v0, 0x70000
+// 0x01053c48: 0x1053c48: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053c3c: 0x1053c3c: lw    v0, 2460(v0)
+// 0x01053c4c: 0x1053c4c: lw    v0, 2924(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053c40: 0x1053c40: sll   zero, zero, 0
-// 0x01053c44: 0x1053c44: beq   v0, zero, 0x1053e98 lui   v0, 0xf0000
+// 0x01053c50: 0x1053c50: sll   zero, zero, 0
+// 0x01053c54: 0x1053c54: beq   v0, zero, 0x1053ea8 lui   v0, 0xf0000
 	ldloc 5
 	ldc.i4 983040
 	stloc 5
-	brfalse L_1053e98
+	brfalse L_1053ea8
 // --- basic block ---
-// 0x01053c4c: 0x1053c4c: lui   a2, 0x0
+// 0x01053c5c: 0x1053c5c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01053c50: 0x1053c50: addiu a2, a2, 29704
+// 0x01053c60: 0x1053c60: addiu a2, a2, 29704
 	ldloc.3
 	ldc.i4 29704
 	add
 	stloc.3
-// 0x01053c54: 0x1053c54: addu  a0, zero, zero
+// 0x01053c64: 0x1053c64: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01053c58: 0x1053c58: lw    s3, -30068(v0)
+// 0x01053c68: 0x1053c68: lw    s3, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 11
-// 0x01053c5c: 0x1053c5c: jal   0x10a1918 addiu a1, zero, 1
+// 0x01053c6c: 0x1053c6c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2622,29 +2622,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053c64: 0x1053c64: beq   v0, zero, 0x1053cb0 addu  s1, v0, zero
+// 0x01053c74: 0x1053c74: beq   v0, zero, 0x1053cc0 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_1053cb0
+	brfalse L_1053cc0
 // --- basic block ---
-// 0x01053c6c: 0x1053c6c: addiu s0, zero, 1
+// 0x01053c7c: 0x1053c7c: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01053c70: 0x1053c70: j	 0x1053ca4 addiu s2, sp, 16
+// 0x01053c80: 0x1053c80: j	 0x1053cb4 addiu s2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-	br L_1053ca4
+	br L_1053cb4
 // --- basic block ---
-L_1053c78:
-// 0x01053c78: 0x1053c78: jal   0x10423fc sw    s0, 16(sp)
+L_1053c88:
+// 0x01053c88: 0x1053c88: jal   0x104240c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2653,24 +2653,24 @@ L_1053c78:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053c80: 0x1053c80: addu  a1, s2, zero
+// 0x01053c90: 0x1053c90: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01053c84: 0x1053c84: addu  a2, zero, zero
+// 0x01053c94: 0x1053c94: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01053c88: 0x1053c88: addu  a3, zero, zero
+// 0x01053c98: 0x1053c98: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01053c8c: 0x1053c8c: addu  a0, s1, zero
+// 0x01053c9c: 0x1053c9c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01053c90: 0x1053c90: jal   0x104f4a8 sw    v0, 20(sp)
+// 0x01053ca0: 0x1053ca0: jal   0x104f4b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2684,49 +2684,49 @@ L_1053c78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053c98: 0x1053c98: jal   0x104dffc addu  a0, s1, zero
+// 0x01053ca8: 0x1053ca8: jal   0x104e00c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053ca0: 0x1053ca0: addu  s0, s0, v0
+// 0x01053cb0: 0x1053cb0: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_1053ca4:
-// 0x01053ca4: 0x1053ca4: slt   v0, s0, s3
+L_1053cb4:
+// 0x01053cb4: 0x1053cb4: slt   v0, s0, s3
 	ldloc 8
 	ldloc 11
 	clt
 	stloc 5
-// 0x01053ca8: 0x1053ca8: bne   v0, zero, 0x1053c78 sll   zero, zero, 0
+// 0x01053cb8: 0x1053cb8: bne   v0, zero, 0x1053c88 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1053c78
+	brtrue L_1053c88
 // --- basic block ---
-L_1053cb0:
-// 0x01053cb0: 0x1053cb0: lui   v0, 0x70000
+L_1053cc0:
+// 0x01053cc0: 0x1053cc0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053cb4: 0x1053cb4: lw    a0, 2548(v0)
+// 0x01053cc4: 0x1053cc4: lw    a0, 3012(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 637
+	ldc.i4 753
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053cb8: 0x1053cb8: jal   0x104e35c sw    zero, 16(sp)
+// 0x01053cc8: 0x1053cc8: jal   0x104e36c sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2740,43 +2740,43 @@ L_1053cb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053cc0: 0x1053cc0: lui   v0, 0xf0000
+// 0x01053cd0: 0x1053cd0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01053cc4: 0x1053cc4: lw    v1, -30068(v0)
+// 0x01053cd4: 0x1053cd4: lw    v1, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 6
-// 0x01053cc8: 0x1053cc8: addiu v0, zero, 2
+// 0x01053cd8: 0x1053cd8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01053ccc: 0x1053ccc: div   v1, v0
+// 0x01053cdc: 0x1053cdc: div   v1, v0
 	ldloc 6
 	ldloc 5
 	div
 	stloc 13
-// 0x01053cd0: 0x1053cd0: addiu s1, sp, 16
+// 0x01053ce0: 0x1053ce0: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x01053cd4: 0x1053cd4: addu  s0, zero, zero
+// 0x01053ce4: 0x1053ce4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01053cd8: 0x1053cd8: mflo  lo
+// 0x01053ce8: 0x1053ce8: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x01053cdc: 0x1053cdc: jal   0x10423fc sw    v1, 16(sp)
+// 0x01053cec: 0x1053cec: jal   0x104240c sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2785,38 +2785,38 @@ L_1053cb0:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053ce4: 0x1053ce4: lui   v1, 0x70000
+// 0x01053cf4: 0x1053cf4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01053ce8: 0x1053ce8: lw    a3, 2444(v1)
+// 0x01053cf8: 0x1053cf8: lw    a3, 2908(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 611
+	ldc.i4 727
 	add
 	ldelem.i4
 	stloc 4
-// 0x01053cec: 0x1053cec: addiu v0, v0, 18
+// 0x01053cfc: 0x1053cfc: addiu v0, v0, 18
 	ldloc 5
 	ldc.i4.s 18
 	add
 	stloc 5
-// 0x01053cf0: 0x1053cf0: addiu a2, zero, 16
+// 0x01053d00: 0x1053d00: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01053cf4: 0x1053cf4: addu  a0, s1, zero
+// 0x01053d04: 0x1053d04: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01053cf8: 0x1053cf8: addiu a1, zero, 10
+// 0x01053d08: 0x1053d08: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x01053cfc: 0x1053cfc: jal   0x104ea60 sw    v0, 20(sp)
+// 0x01053d0c: 0x1053d0c: jal   0x104ea70 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2830,34 +2830,34 @@ L_1053cb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053d04: 0x1053d04: lui   v0, 0x70000
+// 0x01053d14: 0x1053d14: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053d08: 0x1053d08: lw    a2, 2448(v0)
+// 0x01053d18: 0x1053d18: lw    a2, 2912(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 612
+	ldc.i4 728
 	add
 	ldelem.i4
 	stloc.3
-// 0x01053d0c: 0x1053d0c: sll   zero, zero, 0
-// 0x01053d10: 0x1053d10: beq   a2, zero, 0x1053d94 lui   a0, 0x10000
+// 0x01053d1c: 0x1053d1c: sll   zero, zero, 0
+// 0x01053d20: 0x1053d20: beq   a2, zero, 0x1053da4 lui   a0, 0x10000
 	ldloc.3
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1053d94
+	brfalse L_1053da4
 // --- basic block ---
-// 0x01053d18: 0x1053d18: addu  a0, zero, zero
+// 0x01053d28: 0x1053d28: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01053d1c: 0x1053d1c: jal   0x10a1918 addiu a1, zero, 1
+// 0x01053d2c: 0x1053d2c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2865,21 +2865,21 @@ L_1053cb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053d24: 0x1053d24: beq   v0, zero, 0x1053d90 addu  s0, v0, zero
+// 0x01053d34: 0x1053d34: beq   v0, zero, 0x1053da0 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_1053d90
+	brfalse L_1053da0
 // --- basic block ---
-// 0x01053d2c: 0x1053d2c: addiu v0, zero, 5
+// 0x01053d3c: 0x1053d3c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01053d30: 0x1053d30: jal   0x10423fc sw    v0, 16(sp)
+// 0x01053d40: 0x1053d40: jal   0x104240c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2888,12 +2888,12 @@ L_1053cb0:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053d38: 0x1053d38: jal   0x10c09ac addu  a0, v0, zero
+// 0x01053d48: 0x1053d48: jal   0x10c0fec addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -2901,13 +2901,13 @@ L_1053cb0:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01053d40: 0x1053d40: addu  s2, v0, zero
+// 0x01053d50: 0x1053d50: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x01053d44: 0x1053d44: lui   v0, 0x0
+// 0x01053d54: 0x1053d54: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01053d48: 0x1053d48: lw    a0, 13864(v0)
+// 0x01053d58: 0x1053d58: lw    a0, 13864(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2916,44 +2916,44 @@ L_1053cb0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053d4c: 0x1053d4c: jal   0x10c09ac sll   zero, zero, 0
+// 0x01053d5c: 0x1053d5c: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01053d54: 0x1053d54: lui   v1, 0x20000
+// 0x01053d64: 0x1053d64: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01053d58: 0x1053d58: lw    a1, 23640(v1)
+// 0x01053d68: 0x1053d68: lw    a1, 24100(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 5910
+	ldc.i4 6025
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053d5c: 0x1053d5c: jal   0x10c0780 addu  a0, v0, zero
+// 0x01053d6c: 0x1053d6c: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01053d64: 0x1053d64: addu  a1, v0, zero
+// 0x01053d74: 0x1053d74: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053d68: 0x1053d68: jal   0x10c06d0 addu  a0, s2, zero
+// 0x01053d78: 0x1053d78: jal   0x10c0d10 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01053d70: 0x1053d70: jal   0x10c08bc addu  a0, v0, zero
+// 0x01053d80: 0x1053d80: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -2961,19 +2961,19 @@ L_1053cb0:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01053d78: 0x1053d78: addu  a1, s1, zero
+// 0x01053d88: 0x1053d88: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01053d7c: 0x1053d7c: addu  a0, s0, zero
+// 0x01053d8c: 0x1053d8c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01053d80: 0x1053d80: addu  a2, zero, zero
+// 0x01053d90: 0x1053d90: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01053d84: 0x1053d84: addu  a3, zero, zero
+// 0x01053d94: 0x1053d94: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01053d88: 0x1053d88: jal   0x104f4a8 sw    v0, 20(sp)
+// 0x01053d98: 0x1053d98: jal   0x104f4b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2987,19 +2987,19 @@ L_1053cb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1053d90:
-// 0x01053d90: 0x1053d90: lui   a0, 0x10000
+L_1053da0:
+// 0x01053da0: 0x1053da0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1053d94:
-// 0x01053d94: 0x1053d94: jal   0x101cd60 addiu a0, a0, -14440
+L_1053da4:
+// 0x01053da4: 0x1053da4: jal   0x101cd70 addiu a0, a0, -14444
 	ldloc.1
-	ldc.i4 -14440
+	ldc.i4 -14444
 	add
 	stloc.1
 	ldloc.0
@@ -3007,20 +3007,20 @@ L_1053d94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053d9c: 0x1053d9c: lui   s1, 0x70000
+// 0x01053dac: 0x1053dac: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01053da0: 0x1053da0: addiu a0, s1, 2472
+// 0x01053db0: 0x1053db0: addiu a0, s1, 2936
 	ldloc 9
-	ldc.i4 2472
+	ldc.i4 2936
 	add
 	stloc.1
-// 0x01053da4: 0x1053da4: jal   0x1001b68 addu  a1, v0, zero
+// 0x01053db4: 0x1053db4: jal   0x1001b68 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -3030,31 +3030,31 @@ L_1053d94:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053dac: 0x1053dac: lui   v1, 0x1050000
+// 0x01053dbc: 0x1053dbc: lui   v1, 0x1050000
 	ldc.i4 17104896
 	stloc 6
-// 0x01053db0: 0x1053db0: addiu v0, s1, 2472
+// 0x01053dc0: 0x1053dc0: addiu v0, s1, 2936
 	ldloc 9
-	ldc.i4 2472
+	ldc.i4 2936
 	add
 	stloc 5
-// 0x01053db4: 0x1053db4: addiu v1, v1, 16052
+// 0x01053dc4: 0x1053dc4: addiu v1, v1, 16068
 	ldloc 6
-	ldc.i4 16052
+	ldc.i4 16068
 	add
 	stloc 6
-// 0x01053db8: 0x1053db8: lui   a0, 0x20000
+// 0x01053dc8: 0x1053dc8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01053dbc: 0x1053dbc: addiu a0, a0, -28968
+// 0x01053dcc: 0x1053dcc: addiu a0, a0, -28504
 	ldloc.1
-	ldc.i4 -28968
+	ldc.i4 -28504
 	add
 	stloc.1
-// 0x01053dc0: 0x1053dc0: addu  a1, v0, zero
+// 0x01053dd0: 0x1053dd0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053dc4: 0x1053dc4: sw    v1, 52(v0)
+// 0x01053dd4: 0x1053dd4: sw    v1, 52(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3063,7 +3063,7 @@ L_1053d94:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01053dc8: 0x1053dc8: jal   0x103ff3c lui   s1, 0x70000
+// 0x01053dd8: 0x1053dd8: jal   0x103ff4c lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
 	ldloc.0
@@ -3071,66 +3071,66 @@ L_1053d94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053dd0: 0x1053dd0: jal   0x102146c sll   zero, zero, 0
+// 0x01053de0: 0x1053de0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053dd8: 0x1053dd8: lw    v0, 2452(s1)
+// 0x01053de8: 0x1053de8: lw    v0, 2916(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 613
+	ldc.i4 729
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053ddc: 0x1053ddc: sll   zero, zero, 0
-// 0x01053de0: 0x1053de0: beq   v0, zero, 0x1053e98 sll   zero, zero, 0
+// 0x01053dec: 0x1053dec: sll   zero, zero, 0
+// 0x01053df0: 0x1053df0: beq   v0, zero, 0x1053ea8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1053e98
+	brfalse L_1053ea8
 // --- basic block ---
-// 0x01053de8: 0x1053de8: jal   0x104dffc addu  a0, s0, zero
+// 0x01053df8: 0x1053df8: jal   0x104e00c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053df0: 0x1053df0: lui   v1, 0xf0000
+// 0x01053e00: 0x1053e00: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x01053df4: 0x1053df4: lw    s0, -30068(v1)
+// 0x01053e04: 0x1053e04: lw    s0, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 8
-// 0x01053df8: 0x1053df8: addu  a0, zero, zero
+// 0x01053e08: 0x1053e08: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01053dfc: 0x1053dfc: addiu v0, v0, 10
+// 0x01053e0c: 0x1053e0c: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x01053e00: 0x1053e00: sw    v0, 24(sp)
+// 0x01053e10: 0x1053e10: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3139,23 +3139,23 @@ L_1053d94:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01053e04: 0x1053e04: jal   0x104dffc addiu s0, s0, -5
+// 0x01053e14: 0x1053e14: jal   0x104e00c addiu s0, s0, -5
 	ldloc 8
 	ldc.i4.s -5
 	add
 	stloc 8
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053e0c: 0x1053e0c: subu  s0, s0, v0
+// 0x01053e1c: 0x1053e1c: subu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x01053e10: 0x1053e10: jal   0x10423fc sw    s0, 32(sp)
+// 0x01053e20: 0x1053e20: jal   0x104240c sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3164,17 +3164,17 @@ L_1053d94:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053e18: 0x1053e18: addiu v0, v0, 27
+// 0x01053e28: 0x1053e28: addiu v0, v0, 27
 	ldloc 5
 	ldc.i4.s 27
 	add
 	stloc 5
-// 0x01053e1c: 0x1053e1c: jal   0x10423fc sw    v0, 28(sp)
+// 0x01053e2c: 0x1053e2c: jal   0x104240c sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3183,18 +3183,18 @@ L_1053d94:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl48::roadmap_bar_top_height_10423fc()
+	call int32 Cibyl48::roadmap_bar_top_height_104240c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053e24: 0x1053e24: addu  s0, v0, zero
+// 0x01053e34: 0x1053e34: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01053e28: 0x1053e28: lui   v0, 0x0
+// 0x01053e38: 0x1053e38: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01053e2c: 0x1053e2c: lw    a0, 13864(v0)
+// 0x01053e3c: 0x1053e3c: lw    a0, 13864(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3203,36 +3203,36 @@ L_1053d94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01053e30: 0x1053e30: jal   0x10c09ac sll   zero, zero, 0
+// 0x01053e40: 0x1053e40: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01053e38: 0x1053e38: lui   v1, 0x20000
+// 0x01053e48: 0x1053e48: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01053e3c: 0x1053e3c: lw    a1, 23644(v1)
+// 0x01053e4c: 0x1053e4c: lw    a1, 24104(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 5911
+	ldc.i4 6026
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053e40: 0x1053e40: jal   0x10c06d0 addu  a0, v0, zero
+// 0x01053e50: 0x1053e50: jal   0x10c0d10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01053e48: 0x1053e48: addu  a0, s0, zero
+// 0x01053e58: 0x1053e58: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01053e4c: 0x1053e4c: jal   0x10c09ac addu  s2, v0, zero
+// 0x01053e5c: 0x1053e5c: jal   0x10c0fec addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
@@ -3240,18 +3240,18 @@ L_1053d94:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01053e54: 0x1053e54: addu  a1, v0, zero
+// 0x01053e64: 0x1053e64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01053e58: 0x1053e58: jal   0x10c06d0 addu  a0, s2, zero
+// 0x01053e68: 0x1053e68: jal   0x10c0d10 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01053e60: 0x1053e60: jal   0x10c08bc addu  a0, v0, zero
+// 0x01053e70: 0x1053e70: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -3259,30 +3259,30 @@ L_1053d94:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01053e68: 0x1053e68: lw    a1, 2452(s1)
+// 0x01053e78: 0x1053e78: lw    a1, 2916(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 613
+	ldc.i4 729
 	add
 	ldelem.i4
 	stloc.2
-// 0x01053e6c: 0x1053e6c: lui   a0, 0x10000
+// 0x01053e7c: 0x1053e7c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01053e70: 0x1053e70: addiu a0, a0, 6168
+// 0x01053e80: 0x1053e80: addiu a0, a0, 6164
 	ldloc.1
-	ldc.i4 6168
+	ldc.i4 6164
 	add
 	stloc.1
-// 0x01053e74: 0x1053e74: addiu a2, zero, 14
+// 0x01053e84: 0x1053e84: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01053e78: 0x1053e78: addiu a3, zero, 17
+// 0x01053e88: 0x1053e88: addiu a3, zero, 17
 	ldc.i4.s 17
 	stloc 4
-// 0x01053e7c: 0x1053e7c: jal   0x1098d10 sw    v0, 36(sp)
+// 0x01053e8c: 0x1053e8c: jal   0x1099358 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3296,12 +3296,12 @@ L_1053d94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01053e84: 0x1053e84: lw    v1, 184(v0)
+// 0x01053e94: 0x1053e94: lw    v1, 184(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3310,15 +3310,15 @@ L_1053d94:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01053e88: 0x1053e88: addu  a0, v0, zero
+// 0x01053e98: 0x1053e98: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01053e8c: 0x1053e8c: addiu a1, sp, 24
+// 0x01053e9c: 0x1053e9c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01053e90: 0x1053e90: jalr  v1 addu  a2, zero, zero
+// 0x01053ea0: 0x1053ea0: jalr  v1 addu  a2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.3
@@ -3332,9 +3332,9 @@ L_1053d94:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1053e98:
-// 0x01053e98: 0x1053e98: lw    ra, 60(sp)
-// 0x01053e9c: 0x1053e9c: lw    s3, 56(sp)
+L_1053ea8:
+// 0x01053ea8: 0x1053ea8: lw    ra, 60(sp)
+// 0x01053eac: 0x1053eac: lw    s3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3343,7 +3343,7 @@ L_1053e98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01053ea0: 0x1053ea0: lw    s2, 52(sp)
+// 0x01053eb0: 0x1053eb0: lw    s2, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3352,7 +3352,7 @@ L_1053e98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01053ea4: 0x1053ea4: lw    s1, 48(sp)
+// 0x01053eb4: 0x1053eb4: lw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3361,7 +3361,7 @@ L_1053e98:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01053ea8: 0x1053ea8: lw    s0, 44(sp)
+// 0x01053eb8: 0x1053eb8: lw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3370,7 +3370,7 @@ L_1053e98:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01053eac: 0x1053eac: jr    ra addiu sp, sp, 64
+// 0x01053ebc: 0x1053ebc: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -3382,7 +3382,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 softkey_callback_1053eb4(int32,int32,int32,int32,int32)
+.method public static int32 softkey_callback_1053ec4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -3417,18 +3417,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053eb4: 0x1053eb4: lui   a0, 0x20000
+// 0x01053ec4: 0x1053ec4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01053eb8: 0x1053eb8: addiu sp, sp, -24
+// 0x01053ec8: 0x1053ec8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01053ebc: 0x1053ebc: sw    ra, 20(sp)
-// 0x01053ec0: 0x1053ec0: jal   0x103fdbc addiu a0, a0, -28968
+// 0x01053ecc: 0x1053ecc: sw    ra, 20(sp)
+// 0x01053ed0: 0x1053ed0: jal   0x103fdcc addiu a0, a0, -28504
 	ldloc.1
-	ldc.i4 -28968
+	ldc.i4 -28504
 	add
 	stloc.1
 	ldloc.0
@@ -3436,69 +3436,69 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01053ec8: 0x1053ec8: lui   v0, 0x70000
+// 0x01053ed8: 0x1053ed8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053ecc: 0x1053ecc: lw    v0, 2528(v0)
+// 0x01053edc: 0x1053edc: lw    v0, 2992(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 632
+	ldc.i4 748
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053ed0: 0x1053ed0: sll   zero, zero, 0
-// 0x01053ed4: 0x1053ed4: beq   v0, zero, 0x1053f0c lui   v1, 0x70000
+// 0x01053ee0: 0x1053ee0: sll   zero, zero, 0
+// 0x01053ee4: 0x1053ee4: beq   v0, zero, 0x1053f1c lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 7
-	brfalse L_1053f0c
+	brfalse L_1053f1c
 // --- basic block ---
-// 0x01053edc: 0x1053edc: lw    v0, 2460(v1)
+// 0x01053eec: 0x1053eec: lw    v0, 2924(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053ee0: 0x1053ee0: sll   zero, zero, 0
-// 0x01053ee4: 0x1053ee4: beq   v0, zero, 0x1053f0c lui   v0, 0x70000
+// 0x01053ef0: 0x1053ef0: sll   zero, zero, 0
+// 0x01053ef4: 0x1053ef4: beq   v0, zero, 0x1053f1c lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1053f0c
+	brfalse L_1053f1c
 // --- basic block ---
-// 0x01053eec: 0x1053eec: lw    v0, 2456(v0)
+// 0x01053efc: 0x1053efc: lw    v0, 2920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldelem.i4
 	stloc 5
-// 0x01053ef0: 0x1053ef0: sll   zero, zero, 0
-// 0x01053ef4: 0x1053ef4: beq   v0, zero, 0x1053f04 sw    zero, 2460(v1)
+// 0x01053f00: 0x1053f00: sll   zero, zero, 0
+// 0x01053f04: 0x1053f04: beq   v0, zero, 0x1053f14 sw    zero, 2924(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 615
+	ldc.i4 731
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1053f04
+	brfalse L_1053f14
 // --- basic block ---
-// 0x01053efc: 0x1053efc: jalr  v0 sll   zero, zero, 0
+// 0x01053f0c: 0x1053f0c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3510,23 +3510,23 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1053f04:
-// 0x01053f04: 0x1053f04: lui   v0, 0x70000
+L_1053f14:
+// 0x01053f14: 0x1053f14: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01053f08: 0x1053f08: sw    zero, 2456(v0)
+// 0x01053f18: 0x1053f18: sw    zero, 2920(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 614
+	ldc.i4 730
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1053f0c:
-// 0x01053f0c: 0x1053f0c: lw    ra, 20(sp)
-// 0x01053f10: 0x1053f10: sll   zero, zero, 0
-// 0x01053f14: 0x1053f14: jr    ra addiu sp, sp, 24
+L_1053f1c:
+// 0x01053f1c: 0x1053f1c: lw    ra, 20(sp)
+// 0x01053f20: 0x1053f20: sll   zero, zero, 0
+// 0x01053f24: 0x1053f24: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3538,7 +3538,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_set_num_following_1053f1c(int32)
+.method public static int32 roadmap_groups_set_num_following_1053f2c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -3558,15 +3558,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053f1c: 0x1053f1c: lui   v0, 0x70000
+// 0x01053f2c: 0x1053f2c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01053f20: 0x1053f20: jr    ra sw    a0, 7000(v0)
+// 0x01053f30: 0x1053f30: jr    ra sw    a0, 7464(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 1750
+	ldc.i4 1866
 	add
 	ldloc.0
 	stelem.i4
@@ -3575,7 +3575,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_groups_get_num_following_1053f28()
+.method public static int32 roadmap_groups_get_num_following_1053f38()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3592,25 +3592,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053f28: 0x1053f28: lui   v0, 0x70000
+// 0x01053f38: 0x1053f38: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01053f2c: 0x1053f2c: lw    v0, 7000(v0)
+// 0x01053f3c: 0x1053f3c: lw    v0, 7464(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1750
+	ldc.i4 1866
 	add
 	ldelem.i4
 	stloc.0
-// 0x01053f30: 0x1053f30: jr    ra sll   zero, zero, 0
+// 0x01053f40: 0x1053f40: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_groups_get_active_group_wazer_icon_1053f88()
+.method public static int32 roadmap_groups_get_active_group_wazer_icon_1053f98()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -3624,13 +3624,13 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1053f88:
-// 0x01053f88: 0x1053f88: lui   v0, 0x70000
+L_1053f98:
+// 0x01053f98: 0x1053f98: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01053f8c: 0x1053f8c: jr    ra addiu v0, v0, 7356
+// 0x01053f9c: 0x1053f9c: jr    ra addiu v0, v0, 7820
 	ldloc.0
-	ldc.i4 7356
+	ldc.i4 7820
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3638,7 +3638,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_groups_display_groups_supported_1053f94()
+.method public static int32 roadmap_groups_display_groups_supported_1053fa4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -3652,7 +3652,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053f94: 0x1053f94: jr    ra addiu v0, zero, 1
+// 0x01053fa4: 0x1053fa4: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -3660,7 +3660,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_groups_term_1053f9c()
+.method public static void roadmap_groups_term_1053fac()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -3671,12 +3671,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01053f9c: 0x1053f9c: jr    ra sll   zero, zero, 0
+// 0x01053fac: 0x1053fac: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 groups_callback_105425c(int32,int32,int32,int32,int32)
+.method public static int32 groups_callback_105426c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s1,int32 s4,int32 ra)
@@ -3726,7 +3726,7 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105425c: 0x105425c: lw    v0, 4(a0)
+// 0x0105426c: 0x105426c: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3735,16 +3735,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054260: 0x1054260: lb    v1, 0(a2)
+// 0x01054270: 0x1054270: lb    v1, 0(a2)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01054264: 0x1054264: addiu sp, sp, -40
+// 0x01054274: 0x1054274: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01054268: 0x1054268: sw    s3, 28(sp)
+// 0x01054278: 0x1054278: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3753,7 +3753,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105426c: 0x105426c: sw    s1, 20(sp)
+// 0x0105427c: 0x105427c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3762,7 +3762,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01054270: 0x1054270: lw    s3, 116(v0)
+// 0x01054280: 0x1054280: lw    s3, 116(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3771,8 +3771,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01054274: 0x1054274: sw    ra, 36(sp)
-// 0x01054278: 0x1054278: sw    s4, 32(sp)
+// 0x01054284: 0x1054284: sw    ra, 36(sp)
+// 0x01054288: 0x1054288: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3781,7 +3781,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105427c: 0x105427c: sw    s2, 24(sp)
+// 0x0105428c: 0x105428c: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3790,7 +3790,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01054280: 0x1054280: sw    s0, 16(sp)
+// 0x01054290: 0x1054290: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3799,32 +3799,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01054284: 0x1054284: addu  s1, a2, zero
+// 0x01054294: 0x1054294: addu  s1, a2, zero
 	ldloc.3
 	stloc 11
-// 0x01054288: 0x1054288: beq   v1, zero, 0x1054320 lui   v0, 0x70000
+// 0x01054298: 0x1054298: beq   v1, zero, 0x1054330 lui   v0, 0x70000
 	ldloc 7
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1054320
+	brfalse L_1054330
 // --- basic block ---
-// 0x01054290: 0x1054290: lui   a1, 0x70000
+// 0x010542a0: 0x10542a0: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01054294: 0x1054294: addiu a1, a1, 7004
+// 0x010542a4: 0x10542a4: addiu a1, a1, 7468
 	ldloc.2
-	ldc.i4 7004
+	ldc.i4 7468
 	add
 	stloc.2
-// 0x01054298: 0x1054298: addu  a0, a2, zero
+// 0x010542a8: 0x10542a8: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0105429c: 0x105429c: jal   0x1001b14 sw    a2, 9056(v0)
+// 0x010542ac: 0x10542ac: jal   0x1001b14 sw    a2, 9520(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2264
+	ldc.i4 2380
 	add
 	ldloc.3
 	stelem.i4
@@ -3833,45 +3833,45 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010542a4: 0x10542a4: beq   v0, zero, 0x10542c0 lui   v1, 0x70000
+// 0x010542b4: 0x10542b4: beq   v0, zero, 0x10542d0 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 7
-	brfalse L_10542c0
+	brfalse L_10542d0
 // --- basic block ---
-// 0x010542ac: 0x10542ac: lui   s2, 0x70000
+// 0x010542bc: 0x10542bc: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x010542b0: 0x10542b0: addiu s2, s2, 7456
+// 0x010542c0: 0x10542c0: addiu s2, s2, 7920
 	ldloc 9
-	ldc.i4 7456
+	ldc.i4 7920
 	add
 	stloc 9
-// 0x010542b4: 0x10542b4: addu  s0, zero, zero
+// 0x010542c4: 0x10542c4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010542b8: 0x10542b8: j	 0x1054300 lui   s4, 0x70000
+// 0x010542c8: 0x10542c8: j	 0x1054310 lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 12
-	br L_1054300
+	br L_1054310
 // --- basic block ---
-L_10542c0:
-// 0x010542c0: 0x10542c0: j	 0x10542f4 addiu v1, v1, 7256
+L_10542d0:
+// 0x010542d0: 0x10542d0: j	 0x1054304 addiu v1, v1, 7720
 	ldloc 7
-	ldc.i4 7256
+	ldc.i4 7720
 	add
 	stloc 7
-	br L_10542f4
+	br L_1054304
 // --- basic block ---
-L_10542c8:
-// 0x010542c8: 0x10542c8: lw    a0, 0(s2)
+L_10542d8:
+// 0x010542d8: 0x10542d8: lw    a0, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010542cc: 0x10542cc: jal   0x1001b14 addiu s2, s2, 4
+// 0x010542dc: 0x10542dc: jal   0x1001b14 addiu s2, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
@@ -3881,132 +3881,132 @@ L_10542c8:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010542d4: 0x10542d4: bne   v0, zero, 0x1054300 addiu s0, s0, 1
+// 0x010542e4: 0x10542e4: bne   v0, zero, 0x1054310 addiu s0, s0, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_1054300
+	brtrue L_1054310
 // --- basic block ---
-// 0x010542dc: 0x10542dc: addiu s0, s0, -1
+// 0x010542ec: 0x10542ec: addiu s0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x010542e0: 0x10542e0: lui   v0, 0x70000
+// 0x010542f0: 0x10542f0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010542e4: 0x10542e4: sll   s0, s0, 2
+// 0x010542f4: 0x10542f4: sll   s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x010542e8: 0x10542e8: addiu v0, v0, 8256
+// 0x010542f8: 0x10542f8: addiu v0, v0, 8720
 	ldloc 5
-	ldc.i4 8256
+	ldc.i4 8720
 	add
 	stloc 5
-// 0x010542ec: 0x10542ec: addu  s0, s0, v0
+// 0x010542fc: 0x10542fc: addu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x010542f0: 0x10542f0: lw    v1, 0(s0)
+// 0x01054300: 0x1054300: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-L_10542f4:
-// 0x010542f4: 0x10542f4: lui   v0, 0x70000
+L_1054304:
+// 0x01054304: 0x1054304: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010542f8: 0x10542f8: j	 0x1054334 sw    v1, 9060(v0)
+// 0x01054308: 0x1054308: j	 0x1054344 sw    v1, 9524(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2265
+	ldc.i4 2381
 	add
 	ldloc 7
 	stelem.i4
-	br L_1054334
+	br L_1054344
 // --- basic block ---
-L_1054300:
-// 0x01054300: 0x1054300: lw    v0, 7000(s4)
+L_1054310:
+// 0x01054310: 0x1054310: lw    v0, 7464(s4)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 1750
+	ldc.i4 1866
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054304: 0x1054304: sll   zero, zero, 0
-// 0x01054308: 0x1054308: addiu v0, v0, -1
+// 0x01054314: 0x1054314: sll   zero, zero, 0
+// 0x01054318: 0x1054318: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0105430c: 0x105430c: slt   v0, s0, v0
+// 0x0105431c: 0x105431c: slt   v0, s0, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01054310: 0x1054310: bne   v0, zero, 0x10542c8 addu  a1, s1, zero
+// 0x01054320: 0x1054320: bne   v0, zero, 0x10542d8 addu  a1, s1, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brtrue L_10542c8
+	brtrue L_10542d8
 // --- basic block ---
-// 0x01054318: 0x1054318: j	 0x1054338 lui   a0, 0x10000
+// 0x01054328: 0x1054328: j	 0x1054348 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1054338
+	br L_1054348
 // --- basic block ---
-L_1054320:
-// 0x01054320: 0x1054320: lui   v1, 0x10000
+L_1054330:
+// 0x01054330: 0x1054330: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01054324: 0x1054324: addiu v1, v1, 18500
+// 0x01054334: 0x1054334: addiu v1, v1, 18768
 	ldloc 7
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 7
-// 0x01054328: 0x1054328: lui   a0, 0x70000
+// 0x01054338: 0x1054338: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105432c: 0x105432c: sw    v1, 9060(a0)
+// 0x0105433c: 0x105433c: sw    v1, 9524(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2265
+	ldc.i4 2381
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054330: 0x1054330: sw    v1, 9056(v0)
+// 0x01054340: 0x1054340: sw    v1, 9520(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2264
+	ldc.i4 2380
 	add
 	ldloc 7
 	stelem.i4
-L_1054334:
-// 0x01054334: 0x1054334: lui   a0, 0x10000
+L_1054344:
+// 0x01054344: 0x1054344: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1054338:
-// 0x01054338: 0x1054338: addiu a0, a0, 6188
+L_1054348:
+// 0x01054348: 0x1054348: addiu a0, a0, 6184
 	ldloc.1
-	ldc.i4 6188
+	ldc.i4 6184
 	add
 	stloc.1
-// 0x0105433c: 0x105433c: jal   0x1094884 addu  a1, zero, zero
+// 0x0105434c: 0x105434c: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4014,16 +4014,16 @@ L_1054338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01054344: 0x1054344: beq   s3, zero, 0x1054354 sll   zero, zero, 0
+// 0x01054354: 0x1054354: beq   s3, zero, 0x1054364 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_1054354
+	brfalse L_1054364
 // --- basic block ---
-// 0x0105434c: 0x105434c: jalr  s3 sll   zero, zero, 0
+// 0x0105435c: 0x105435c: jalr  s3 sll   zero, zero, 0
 	ldloc 10
 	ldloc.0
 	ldloc.1
@@ -4035,12 +4035,12 @@ L_1054338:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1054354:
-// 0x01054354: 0x1054354: lw    ra, 36(sp)
-// 0x01054358: 0x1054358: addiu v0, zero, 1
+L_1054364:
+// 0x01054364: 0x1054364: lw    ra, 36(sp)
+// 0x01054368: 0x1054368: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105435c: 0x105435c: lw    s4, 32(sp)
+// 0x0105436c: 0x105436c: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4049,7 +4049,7 @@ L_1054354:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01054360: 0x1054360: lw    s3, 28(sp)
+// 0x01054370: 0x1054370: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4058,7 +4058,7 @@ L_1054354:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01054364: 0x1054364: lw    s2, 24(sp)
+// 0x01054374: 0x1054374: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4067,7 +4067,7 @@ L_1054354:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01054368: 0x1054368: lw    s1, 20(sp)
+// 0x01054378: 0x1054378: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4076,7 +4076,7 @@ L_1054354:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105436c: 0x105436c: lw    s0, 16(sp)
+// 0x0105437c: 0x105437c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4085,7 +4085,7 @@ L_1054354:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01054370: 0x1054370: jr    ra addiu sp, sp, 40
+// 0x01054380: 0x1054380: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4097,7 +4097,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_feature_enabled_1054378(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_feature_enabled_1054388(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -4132,16 +4132,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054378: 0x1054378: lui   a0, 0x0
+// 0x01054388: 0x1054388: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105437c: 0x105437c: addiu sp, sp, -24
+// 0x0105438c: 0x105438c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01054380: 0x1054380: sw    ra, 20(sp)
-// 0x01054384: 0x1054384: jal   0x100e348 addiu a0, a0, 13932
+// 0x01054390: 0x1054390: sw    ra, 20(sp)
+// 0x01054394: 0x1054394: jal   0x100e358 addiu a0, a0, 13932
 	ldloc.1
 	ldc.i4 13932
 	add
@@ -4151,18 +4151,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105438c: 0x105438c: lui   a1, 0x0
+// 0x0105439c: 0x105439c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01054390: 0x1054390: addu  a0, v0, zero
+// 0x010543a0: 0x10543a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01054394: 0x1054394: jal   0x1001b14 addiu a1, a1, 20820
+// 0x010543a4: 0x10543a4: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4172,13 +4172,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0105439c: 0x105439c: lw    ra, 20(sp)
-// 0x010543a0: 0x10543a0: sltiu v0, v0, 1
+// 0x010543ac: 0x10543ac: lw    ra, 20(sp)
+// 0x010543b0: 0x10543b0: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010543a4: 0x10543a4: jr    ra addiu sp, sp, 24
+// 0x010543b4: 0x10543b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4190,7 +4190,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_get_url_10543ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_get_url_10543bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4225,16 +4225,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010543ac: 0x10543ac: lui   a0, 0x0
+// 0x010543bc: 0x10543bc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010543b0: 0x10543b0: addiu sp, sp, -24
+// 0x010543c0: 0x10543c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010543b4: 0x10543b4: sw    ra, 20(sp)
-// 0x010543b8: 0x10543b8: jal   0x100e348 addiu a0, a0, 13916
+// 0x010543c4: 0x10543c4: sw    ra, 20(sp)
+// 0x010543c8: 0x10543c8: jal   0x100e358 addiu a0, a0, 13916
 	ldloc.1
 	ldc.i4 13916
 	add
@@ -4244,14 +4244,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010543c0: 0x10543c0: lw    ra, 20(sp)
-// 0x010543c4: 0x10543c4: sll   zero, zero, 0
-// 0x010543c8: 0x10543c8: jr    ra addiu sp, sp, 24
+// 0x010543d0: 0x10543d0: lw    ra, 20(sp)
+// 0x010543d4: 0x10543d4: sll   zero, zero, 0
+// 0x010543d8: 0x10543d8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4263,7 +4263,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_groups_get_show_wazer_config_10543d0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_get_show_wazer_config_10543e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -4301,21 +4301,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010543d0: 0x10543d0: lui   a0, 0x0
+// 0x010543e0: 0x10543e0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010543d4: 0x10543d4: addiu sp, sp, -24
+// 0x010543e4: 0x10543e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010543d8: 0x10543d8: addiu a0, a0, 13900
+// 0x010543e8: 0x10543e8: addiu a0, a0, 13900
 	ldloc.1
 	ldc.i4 13900
 	add
 	stloc.1
-// 0x010543dc: 0x10543dc: sw    ra, 20(sp)
-// 0x010543e0: 0x10543e0: jal   0x100e348 sw    s0, 16(sp)
+// 0x010543ec: 0x10543ec: sw    ra, 20(sp)
+// 0x010543f0: 0x10543f0: jal   0x100e358 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4329,23 +4329,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010543e8: 0x10543e8: lui   a1, 0x10000
+// 0x010543f8: 0x10543f8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010543ec: 0x10543ec: addu  a0, v0, zero
+// 0x010543fc: 0x10543fc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010543f0: 0x10543f0: addiu a1, a1, 220
+// 0x01054400: 0x1054400: addiu a1, a1, 216
 	ldloc.2
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc.2
-// 0x010543f4: 0x10543f4: jal   0x1001b14 addu  s0, v0, zero
+// 0x01054404: 0x1054404: jal   0x1001b14 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.1
@@ -4353,21 +4353,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010543fc: 0x10543fc: beq   v0, zero, 0x1054420 addu  v1, zero, zero
+// 0x0105440c: 0x105440c: beq   v0, zero, 0x1054430 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1054420
+	brfalse L_1054430
 // --- basic block ---
-// 0x01054404: 0x1054404: lui   a1, 0x10000
+// 0x01054414: 0x1054414: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01054408: 0x1054408: addu  a0, s0, zero
+// 0x01054418: 0x1054418: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0105440c: 0x105440c: jal   0x1001b14 addiu a1, a1, 5760
+// 0x0105441c: 0x105441c: jal   0x1001b14 addiu a1, a1, 5756
 	ldloc.2
-	ldc.i4 5760
+	ldc.i4 5756
 	add
 	stloc.2
 	ldloc.1
@@ -4375,25 +4375,25 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01054414: 0x1054414: sltiu v1, v0, 1
+// 0x01054424: 0x1054424: sltiu v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x01054418: 0x1054418: addiu v0, zero, 2
+// 0x01054428: 0x1054428: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0105441c: 0x105441c: subu  v1, v0, v1
+// 0x0105442c: 0x105442c: subu  v1, v0, v1
 	ldloc 5
 	ldloc 6
 	sub
 	stloc 6
-L_1054420:
-// 0x01054420: 0x1054420: lw    ra, 20(sp)
-// 0x01054424: 0x1054424: addu  v0, v1, zero
+L_1054430:
+// 0x01054430: 0x1054430: lw    ra, 20(sp)
+// 0x01054434: 0x1054434: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01054428: 0x1054428: lw    s0, 16(sp)
+// 0x01054438: 0x1054438: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4402,7 +4402,7 @@ L_1054420:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105442c: 0x105442c: jr    ra addiu sp, sp, 24
+// 0x0105443c: 0x105443c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4414,7 +4414,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_get_popup_config_1054434(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_get_popup_config_1054444(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -4452,15 +4452,15 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054434: 0x1054434: lui   a0, 0x0
+// 0x01054444: 0x1054444: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01054438: 0x1054438: addiu sp, sp, -24
+// 0x01054448: 0x1054448: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105443c: 0x105443c: sw    s0, 16(sp)
+// 0x0105444c: 0x105444c: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4469,8 +4469,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054440: 0x1054440: sw    ra, 20(sp)
-// 0x01054444: 0x1054444: jal   0x100e348 addiu a0, a0, 13884
+// 0x01054450: 0x1054450: sw    ra, 20(sp)
+// 0x01054454: 0x1054454: jal   0x100e358 addiu a0, a0, 13884
 	ldloc.1
 	ldc.i4 13884
 	add
@@ -4480,23 +4480,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105444c: 0x105444c: lui   a1, 0x10000
+// 0x0105445c: 0x105445c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01054450: 0x1054450: addu  a0, v0, zero
+// 0x01054460: 0x1054460: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01054454: 0x1054454: addiu a1, a1, 5772
+// 0x01054464: 0x1054464: addiu a1, a1, 5768
 	ldloc.2
-	ldc.i4 5772
+	ldc.i4 5768
 	add
 	stloc.2
-// 0x01054458: 0x1054458: jal   0x1001b14 addu  s0, v0, zero
+// 0x01054468: 0x1054468: jal   0x1001b14 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.1
@@ -4504,19 +4504,19 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01054460: 0x1054460: beq   v0, zero, 0x1054498 sll   zero, zero, 0
+// 0x01054470: 0x1054470: beq   v0, zero, 0x10544a8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1054498
+	brfalse L_10544a8
 // --- basic block ---
-// 0x01054468: 0x1054468: lui   a1, 0x10000
+// 0x01054478: 0x1054478: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105446c: 0x105446c: addiu a1, a1, 5760
+// 0x0105447c: 0x105447c: addiu a1, a1, 5756
 	ldloc.2
-	ldc.i4 5760
+	ldc.i4 5756
 	add
 	stloc.2
-// 0x01054470: 0x1054470: jal   0x1001b14 addu  a0, s0, zero
+// 0x01054480: 0x1054480: jal   0x1001b14 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -4524,21 +4524,21 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01054478: 0x1054478: beq   v0, zero, 0x105449c addiu v1, zero, 1
+// 0x01054488: 0x1054488: beq   v0, zero, 0x10544ac addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_105449c
+	brfalse L_10544ac
 // --- basic block ---
-// 0x01054480: 0x1054480: lui   a1, 0x10000
+// 0x01054490: 0x1054490: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01054484: 0x1054484: addu  a0, s0, zero
+// 0x01054494: 0x1054494: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01054488: 0x1054488: jal   0x1001b14 addiu a1, a1, 5752
+// 0x01054498: 0x1054498: jal   0x1001b14 addiu a1, a1, 5748
 	ldloc.2
-	ldc.i4 5752
+	ldc.i4 5748
 	add
 	stloc.2
 	ldloc.1
@@ -4546,22 +4546,22 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01054490: 0x1054490: beq   v0, zero, 0x105449c addiu v1, zero, 2
+// 0x010544a0: 0x10544a0: beq   v0, zero, 0x10544ac addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_105449c
+	brfalse L_10544ac
 // --- basic block ---
-L_1054498:
-// 0x01054498: 0x1054498: addu  v1, zero, zero
+L_10544a8:
+// 0x010544a8: 0x10544a8: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_105449c:
-// 0x0105449c: 0x105449c: lw    ra, 20(sp)
-// 0x010544a0: 0x10544a0: addu  v0, v1, zero
+L_10544ac:
+// 0x010544ac: 0x10544ac: lw    ra, 20(sp)
+// 0x010544b0: 0x10544b0: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010544a4: 0x10544a4: lw    s0, 16(sp)
+// 0x010544b4: 0x10544b4: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -4570,7 +4570,7 @@ L_105449c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010544a8: 0x10544a8: jr    ra addiu sp, sp, 24
+// 0x010544b8: 0x10544b8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4582,7 +4582,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_set_show_wazer_config_10544b0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_set_show_wazer_config_10544c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4617,19 +4617,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010544b0: 0x10544b0: addu  a1, a0, zero
+// 0x010544c0: 0x10544c0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010544b4: 0x10544b4: lui   a0, 0x0
+// 0x010544c4: 0x10544c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010544b8: 0x10544b8: addiu sp, sp, -24
+// 0x010544c8: 0x10544c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010544bc: 0x10544bc: sw    ra, 20(sp)
-// 0x010544c0: 0x10544c0: jal   0x100e5c0 addiu a0, a0, 13900
+// 0x010544cc: 0x10544cc: sw    ra, 20(sp)
+// 0x010544d0: 0x10544d0: jal   0x100e5d0 addiu a0, a0, 13900
 	ldloc.1
 	ldc.i4 13900
 	add
@@ -4639,14 +4639,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010544c8: 0x10544c8: lw    ra, 20(sp)
-// 0x010544cc: 0x10544cc: sll   zero, zero, 0
-// 0x010544d0: 0x10544d0: jr    ra addiu sp, sp, 24
+// 0x010544d8: 0x10544d8: lw    ra, 20(sp)
+// 0x010544dc: 0x10544dc: sll   zero, zero, 0
+// 0x010544e0: 0x10544e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4658,7 +4658,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_groups_set_popup_config_10544d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_set_popup_config_10544e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -4693,19 +4693,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010544d8: 0x10544d8: addu  a1, a0, zero
+// 0x010544e8: 0x10544e8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010544dc: 0x10544dc: lui   a0, 0x0
+// 0x010544ec: 0x10544ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010544e0: 0x10544e0: addiu sp, sp, -24
+// 0x010544f0: 0x10544f0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010544e4: 0x10544e4: sw    ra, 20(sp)
-// 0x010544e8: 0x10544e8: jal   0x100e5c0 addiu a0, a0, 13884
+// 0x010544f4: 0x10544f4: sw    ra, 20(sp)
+// 0x010544f8: 0x10544f8: jal   0x100e5d0 addiu a0, a0, 13884
 	ldloc.1
 	ldc.i4 13884
 	add
@@ -4715,14 +4715,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010544f0: 0x10544f0: lw    ra, 20(sp)
-// 0x010544f4: 0x10544f4: sll   zero, zero, 0
-// 0x010544f8: 0x10544f8: jr    ra addiu sp, sp, 24
+// 0x01054500: 0x1054500: lw    ra, 20(sp)
+// 0x01054504: 0x1054504: sll   zero, zero, 0
+// 0x01054508: 0x1054508: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4734,7 +4734,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_groups_alerts_action_1054500(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_alerts_action_1054510(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -4772,14 +4772,14 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1054500:
-// 0x01054500: 0x1054500: addiu sp, sp, -24
+L_1054510:
+// 0x01054510: 0x1054510: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01054504: 0x1054504: sw    ra, 20(sp)
-// 0x01054508: 0x1054508: jal   0x1054378 sw    s0, 16(sp)
+// 0x01054514: 0x1054514: sw    ra, 20(sp)
+// 0x01054518: 0x1054518: jal   0x1054388 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4793,18 +4793,18 @@ L_1054500:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_feature_enabled_1054378(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_feature_enabled_1054388(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01054510: 0x1054510: beq   v0, zero, 0x10545d0 lui   a0, 0x0
+// 0x01054520: 0x1054520: beq   v0, zero, 0x10545e0 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10545d0
+	brfalse L_10545e0
 // --- basic block ---
-// 0x01054518: 0x1054518: jal   0x100e348 addiu a0, a0, 13868
+// 0x01054528: 0x1054528: jal   0x100e358 addiu a0, a0, 13868
 	ldloc.1
 	ldc.i4 13868
 	add
@@ -4814,18 +4814,18 @@ L_1054500:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01054520: 0x1054520: lui   a1, 0x0
+// 0x01054530: 0x1054530: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01054524: 0x1054524: addu  a0, v0, zero
+// 0x01054534: 0x1054534: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01054528: 0x1054528: jal   0x1001b14 addiu a1, a1, 20820
+// 0x01054538: 0x1054538: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4835,37 +4835,37 @@ L_1054500:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01054530: 0x1054530: beq   v0, zero, 0x10545a0 lui   v0, 0x70000
+// 0x01054540: 0x1054540: beq   v0, zero, 0x10545b0 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10545a0
+	brfalse L_10545b0
 // --- basic block ---
-// 0x01054538: 0x1054538: j	 0x10545b8 sll   zero, zero, 0
-	br L_10545b8
+// 0x01054548: 0x1054548: j	 0x10545c8 sll   zero, zero, 0
+	br L_10545c8
 // --- basic block ---
-L_1054540:
-// 0x01054540: 0x1054540: jal   0x1054434 sll   zero, zero, 0
+L_1054550:
+// 0x01054550: 0x1054550: jal   0x1054444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_popup_config_1054434(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_popup_config_1054444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01054548: 0x1054548: bne   v0, zero, 0x1054584 sll   zero, zero, 0
+// 0x01054558: 0x1054558: bne   v0, zero, 0x1054594 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1054584
+	brtrue L_1054594
 // --- basic block ---
-// 0x01054550: 0x1054550: lui   a0, 0x10000
+// 0x01054560: 0x1054560: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01054554: 0x1054554: jal   0x101cd60 addiu a0, a0, 6212
+// 0x01054564: 0x1054564: jal   0x101cd70 addiu a0, a0, 6208
 	ldloc.1
-	ldc.i4 6212
+	ldc.i4 6208
 	add
 	stloc.1
 	ldloc.0
@@ -4873,20 +4873,20 @@ L_1054540:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105455c: 0x105455c: lui   a0, 0x10000
+// 0x0105456c: 0x105456c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01054560: 0x1054560: addiu a0, a0, 6228
+// 0x01054570: 0x1054570: addiu a0, a0, 6224
 	ldloc.1
-	ldc.i4 6228
+	ldc.i4 6224
 	add
 	stloc.1
-// 0x01054564: 0x1054564: jal   0x101cd60 addu  s0, v0, zero
+// 0x01054574: 0x1054574: jal   0x101cd70 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4894,26 +4894,26 @@ L_1054540:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105456c: 0x105456c: lui   a2, 0x10000
+// 0x0105457c: 0x105457c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01054570: 0x1054570: addu  a0, s0, zero
+// 0x01054580: 0x1054580: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01054574: 0x1054574: addu  a1, v0, zero
+// 0x01054584: 0x1054584: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01054578: 0x1054578: addiu a2, a2, -17456
+// 0x01054588: 0x1054588: addiu a2, a2, -17456
 	ldloc.3
 	ldc.i4 -17456
 	add
 	stloc.3
-// 0x0105457c: 0x105457c: jal   0x1053b10 addiu a3, zero, -1
+// 0x0105458c: 0x105458c: jal   0x1053b20 addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
 	ldloc.0
@@ -4921,24 +4921,24 @@ L_1054540:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_show_1053b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_show_1053b20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1054584:
-// 0x01054584: 0x1054584: lui   a0, 0x0
+L_1054594:
+// 0x01054594: 0x1054594: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01054588: 0x1054588: lui   a1, 0x0
+// 0x01054598: 0x1054598: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105458c: 0x105458c: addiu a0, a0, 13868
+// 0x0105459c: 0x105459c: addiu a0, a0, 13868
 	ldloc.1
 	ldc.i4 13868
 	add
 	stloc.1
-// 0x01054590: 0x1054590: jal   0x100e5c0 addiu a1, a1, 20820
+// 0x010545a0: 0x10545a0: jal   0x100e5d0 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4948,12 +4948,12 @@ L_1054584:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01054598: 0x1054598: jal   0x100ea50 addu  a0, zero, zero
+// 0x010545a8: 0x10545a8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4961,54 +4961,54 @@ L_1054584:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10545a0:
-// 0x010545a0: 0x10545a0: jal   0x1077d40 sll   zero, zero, 0
-	call int32 Cibyl90::RTAlerts_clear_group_counter_1077d40()
+L_10545b0:
+// 0x010545b0: 0x10545b0: jal   0x1078364 sll   zero, zero, 0
+	call int32 Cibyl90::RTAlerts_clear_group_counter_1078364()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010545a8: 0x10545a8: jal   0x1082400 sll   zero, zero, 0
+// 0x010545b8: 0x10545b8: jal   0x1082a24 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RealtimeAlertsListGroup_1082400(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RealtimeAlertsListGroup_1082a24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010545b0: 0x10545b0: j	 0x10545d0 sll   zero, zero, 0
-	br L_10545d0
+// 0x010545c0: 0x10545c0: j	 0x10545e0 sll   zero, zero, 0
+	br L_10545e0
 // --- basic block ---
-L_10545b8:
-// 0x010545b8: 0x10545b8: lw    v0, 7000(v0)
+L_10545c8:
+// 0x010545c8: 0x10545c8: lw    v0, 7464(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 1750
+	ldc.i4 1866
 	add
 	ldelem.i4
 	stloc 5
-// 0x010545bc: 0x10545bc: sll   zero, zero, 0
-// 0x010545c0: 0x10545c0: bgtz  v0, 0x1054540 sll   zero, zero, 0
+// 0x010545cc: 0x10545cc: sll   zero, zero, 0
+// 0x010545d0: 0x10545d0: bgtz  v0, 0x1054550 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_1054540
+	bgt L_1054550
 // --- basic block ---
-// 0x010545c8: 0x10545c8: j	 0x10545a0 sll   zero, zero, 0
-	br L_10545a0
+// 0x010545d8: 0x10545d8: j	 0x10545b0 sll   zero, zero, 0
+	br L_10545b0
 // --- basic block ---
-L_10545d0:
-// 0x010545d0: 0x10545d0: lw    ra, 20(sp)
-// 0x010545d4: 0x10545d4: lw    s0, 16(sp)
+L_10545e0:
+// 0x010545e0: 0x10545e0: lw    ra, 20(sp)
+// 0x010545e4: 0x10545e4: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5017,7 +5017,7 @@ L_10545d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010545d8: 0x10545d8: jr    ra addiu sp, sp, 24
+// 0x010545e8: 0x10545e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5029,7 +5029,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 configure_browser_10545e0(int32,int32,int32,int32,int32)
+.method public static int32 configure_browser_10545f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
@@ -5067,13 +5067,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010545e0: 0x10545e0: addiu sp, sp, -32
+// 0x010545f0: 0x10545f0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010545e4: 0x10545e4: sw    ra, 28(sp)
-// 0x010545e8: 0x10545e8: sw    s0, 24(sp)
+// 0x010545f4: 0x10545f4: sw    ra, 28(sp)
+// 0x010545f8: 0x10545f8: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5082,7 +5082,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010545ec: 0x10545ec: jal   0x1054ea4 addu  s0, a0, zero
+// 0x010545fc: 0x10545fc: jal   0x1054eb4 addu  s0, a0, zero
 	ldloc.1
 	stloc 7
 	ldloc.0
@@ -5090,35 +5090,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_reset_attributes_1054ea4(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_reset_attributes_1054eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010545f4: 0x10545f4: lui   v0, 0x20000
+// 0x01054604: 0x1054604: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010545f8: 0x10545f8: addiu v0, v0, -28948
+// 0x01054608: 0x1054608: addiu v0, v0, -28484
 	ldloc 5
-	ldc.i4 -28948
+	ldc.i4 -28484
 	add
 	stloc 5
-// 0x010545fc: 0x10545fc: sw    v0, 0(s0)
+// 0x0105460c: 0x105460c: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01054600: 0x1054600: lui   v0, 0x10000
+// 0x01054610: 0x1054610: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01054604: 0x1054604: addiu v0, v0, 6292
+// 0x01054614: 0x1054614: addiu v0, v0, 6288
 	ldloc 5
-	ldc.i4 6292
+	ldc.i4 6288
 	add
 	stloc 5
-// 0x01054608: 0x1054608: sw    v0, 16(sp)
+// 0x01054618: 0x1054618: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5127,37 +5127,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105460c: 0x105460c: lui   a2, 0x10000
+// 0x0105461c: 0x105461c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01054610: 0x1054610: lui   a3, 0x1050000
+// 0x01054620: 0x1054620: lui   a3, 0x1050000
 	ldc.i4 17104896
 	stloc 4
-// 0x01054614: 0x1054614: lui   v0, 0x10000
+// 0x01054624: 0x1054624: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01054618: 0x1054618: addu  a0, s0, zero
+// 0x01054628: 0x1054628: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x0105461c: 0x105461c: addiu v0, v0, 6308
+// 0x0105462c: 0x105462c: addiu v0, v0, 6304
 	ldloc 5
-	ldc.i4 6308
+	ldc.i4 6304
 	add
 	stloc 5
-// 0x01054620: 0x1054620: addiu a2, a2, 844
+// 0x01054630: 0x1054630: addiu a2, a2, 840
 	ldloc.3
-	ldc.i4 844
+	ldc.i4 840
 	add
 	stloc.3
-// 0x01054624: 0x1054624: addiu a3, a3, 18908
+// 0x01054634: 0x1054634: addiu a3, a3, 18924
 	ldloc 4
-	ldc.i4 18908
+	ldc.i4 18924
 	add
 	stloc 4
-// 0x01054628: 0x1054628: addiu a1, zero, 8
+// 0x01054638: 0x1054638: addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
-// 0x0105462c: 0x105462c: jal   0x1054e40 sw    v0, 20(sp)
+// 0x0105463c: 0x105463c: jal   0x1054e50 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5171,13 +5171,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_set_button_attrs_1054e40(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_set_button_attrs_1054e50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01054634: 0x1054634: lw    ra, 28(sp)
-// 0x01054638: 0x1054638: lw    s0, 24(sp)
+// 0x01054644: 0x1054644: lw    ra, 28(sp)
+// 0x01054648: 0x1054648: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5186,7 +5186,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105463c: 0x105463c: jr    ra addiu sp, sp, 32
+// 0x0105464c: 0x105464c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5198,7 +5198,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 append_current_location_1054644(int32,int32,int32,int32,int32)
+.method public static int32 append_current_location_1054654(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5239,12 +5239,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054644: 0x1054644: addiu sp, sp, -152
+// 0x01054654: 0x1054654: addiu sp, sp, -152
 	ldloc.0
 	ldc.i4 -152
 	add
 	stloc.0
-// 0x01054648: 0x1054648: sw    s0, 140(sp)
+// 0x01054658: 0x1054658: sw    s0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5253,26 +5253,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105464c: 0x105464c: addiu a1, sp, 20
+// 0x0105465c: 0x105465c: addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x01054650: 0x1054650: addu  s0, a0, zero
+// 0x01054660: 0x1054660: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01054654: 0x1054654: addiu a2, sp, 16
+// 0x01054664: 0x1054664: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x01054658: 0x1054658: addiu a0, sp, 40
+// 0x01054668: 0x1054668: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0105465c: 0x105465c: sw    ra, 148(sp)
-// 0x01054660: 0x1054660: jal   0x1029da8 sw    s1, 144(sp)
+// 0x0105466c: 0x105466c: sw    ra, 148(sp)
+// 0x01054670: 0x1054670: jal   0x1029db8 sw    s1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5286,24 +5286,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01054668: 0x1054668: addiu v1, zero, -1
+// 0x01054678: 0x1054678: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0105466c: 0x105466c: beq   v0, v1, 0x1054690 addiu a2, sp, 60
+// 0x0105467c: 0x105467c: beq   v0, v1, 0x10546a0 addiu a2, sp, 60
 	ldloc 5
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.3
-	beq  L_1054690
+	beq  L_10546a0
 // --- basic block ---
-// 0x01054674: 0x1054674: lw    a1, 40(sp)
+// 0x01054684: 0x1054684: lw    a1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5312,10 +5312,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01054678: 0x1054678: addu  a0, a2, zero
+// 0x01054688: 0x1054688: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0105467c: 0x105467c: jal   0x1072468 sw    a2, 132(sp)
+// 0x0105468c: 0x105468c: jal   0x1072a8c sw    a2, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5329,12 +5329,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01054684: 0x1054684: lw    a1, 44(sp)
+// 0x01054694: 0x1054694: lw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5343,20 +5343,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01054688: 0x1054688: j	 0x10546e0 addiu a3, sp, 92
+// 0x01054698: 0x1054698: j	 0x10546f0 addiu a3, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc 4
-	br L_10546e0
+	br L_10546f0
 // --- basic block ---
-L_1054690:
-// 0x01054690: 0x1054690: lui   a0, 0x20000
+L_10546a0:
+// 0x010546a0: 0x10546a0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01054694: 0x1054694: jal   0x101df50 addiu a0, a0, 6792
+// 0x010546a4: 0x10546a4: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -5364,40 +5364,40 @@ L_1054690:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105469c: 0x105469c: beq   v0, zero, 0x105470c addu  s1, v0, zero
+// 0x010546ac: 0x10546ac: beq   v0, zero, 0x105471c addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_105470c
+	brfalse L_105471c
 // --- basic block ---
-// 0x010546a4: 0x10546a4: lw    a1, 0(v0)
+// 0x010546b4: 0x10546b4: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010546a8: 0x10546a8: lui   v0, 0x2120000
+// 0x010546b8: 0x10546b8: lui   v0, 0x2120000
 	ldc.i4 34734080
 	stloc 5
-// 0x010546ac: 0x10546ac: ori   v0, v0, 60730
+// 0x010546bc: 0x10546bc: ori   v0, v0, 60730
 	ldloc 5
 	ldc.i4 60730
 	or
 	stloc 5
-// 0x010546b0: 0x10546b0: bne   a1, v0, 0x10546c8 lui   v0, 0x1e90000
+// 0x010546c0: 0x10546c0: bne   a1, v0, 0x10546d8 lui   v0, 0x1e90000
 	ldloc.2
 	ldloc 5
 	ldc.i4 32047104
 	stloc 5
-	bne.un L_10546c8
+	bne.un L_10546d8
 // --- basic block ---
-// 0x010546b8: 0x10546b8: lw    v1, 4(s1)
+// 0x010546c8: 0x10546c8: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5406,26 +5406,26 @@ L_1054690:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010546bc: 0x10546bc: ori   v0, v0, 58906
+// 0x010546cc: 0x10546cc: ori   v0, v0, 58906
 	ldloc 5
 	ldc.i4 58906
 	or
 	stloc 5
-// 0x010546c0: 0x10546c0: beq   v1, v0, 0x105470c sll   zero, zero, 0
+// 0x010546d0: 0x10546d0: beq   v1, v0, 0x105471c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_105470c
+	beq  L_105471c
 // --- basic block ---
-L_10546c8:
-// 0x010546c8: 0x10546c8: addiu a2, sp, 60
+L_10546d8:
+// 0x010546d8: 0x10546d8: addiu a2, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.3
-// 0x010546cc: 0x10546cc: addu  a0, a2, zero
+// 0x010546dc: 0x10546dc: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010546d0: 0x10546d0: jal   0x1072468 sw    a2, 132(sp)
+// 0x010546e0: 0x10546e0: jal   0x1072a8c sw    a2, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5439,12 +5439,12 @@ L_10546c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010546d8: 0x10546d8: lw    a1, 4(s1)
+// 0x010546e8: 0x10546e8: lw    a1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5453,16 +5453,16 @@ L_10546c8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010546dc: 0x10546dc: addiu a3, sp, 92
+// 0x010546ec: 0x10546ec: addiu a3, sp, 92
 	ldloc.0
 	ldc.i4.s 92
 	add
 	stloc 4
-L_10546e0:
-// 0x010546e0: 0x10546e0: addu  a0, a3, zero
+L_10546f0:
+// 0x010546f0: 0x10546f0: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x010546e4: 0x10546e4: jal   0x1072468 sw    a3, 128(sp)
+// 0x010546f4: 0x10546f4: jal   0x1072a8c sw    a3, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5476,15 +5476,15 @@ L_10546e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010546ec: 0x10546ec: lui   a1, 0x10000
+// 0x010546fc: 0x10546fc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010546f0: 0x10546f0: lw    a2, 132(sp)
+// 0x01054700: 0x1054700: lw    a2, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5493,7 +5493,7 @@ L_10546e0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010546f4: 0x10546f4: lw    a3, 128(sp)
+// 0x01054704: 0x1054704: lw    a3, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5502,12 +5502,12 @@ L_10546e0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010546f8: 0x10546f8: addu  a0, s0, zero
+// 0x01054708: 0x1054708: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010546fc: 0x10546fc: jal   0x1000f64 addiu a1, a1, 6328
+// 0x0105470c: 0x105470c: jal   0x1000f64 addiu a1, a1, 6324
 	ldloc.2
-	ldc.i4 6328
+	ldc.i4 6324
 	add
 	stloc.2
 	ldloc.0
@@ -5520,30 +5520,30 @@ L_10546e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01054704: 0x1054704: j	 0x1054738 sll   zero, zero, 0
-	br L_1054738
+// 0x01054714: 0x1054714: j	 0x1054748 sll   zero, zero, 0
+	br L_1054748
 // --- basic block ---
-L_105470c:
-// 0x0105470c: 0x105470c: lui   a1, 0x10000
+L_105471c:
+// 0x0105471c: 0x105471c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01054710: 0x1054710: lui   a3, 0x10000
+// 0x01054720: 0x1054720: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01054714: 0x1054714: addiu a1, a1, 6344
+// 0x01054724: 0x1054724: addiu a1, a1, 6340
 	ldloc.2
-	ldc.i4 6344
+	ldc.i4 6340
 	add
 	stloc.2
-// 0x01054718: 0x1054718: addiu a0, zero, 1
+// 0x01054728: 0x1054728: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105471c: 0x105471c: addiu a3, a3, -5772
+// 0x0105472c: 0x105472c: addiu a3, a3, -5776
 	ldloc 4
-	ldc.i4 -5772
+	ldc.i4 -5776
 	add
 	stloc 4
-// 0x01054720: 0x1054720: jal   0x100449c addiu a2, zero, 317
+// 0x01054730: 0x1054730: jal   0x100449c addiu a2, zero, 317
 	ldc.i4 317
 	stloc.3
 	ldloc.0
@@ -5556,15 +5556,15 @@ L_105470c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01054728: 0x1054728: lui   a1, 0x10000
+// 0x01054738: 0x1054738: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105472c: 0x105472c: addu  a0, s0, zero
+// 0x0105473c: 0x105473c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01054730: 0x1054730: jal   0x1001b68 addiu a1, a1, 6372
+// 0x01054740: 0x1054740: jal   0x1001b68 addiu a1, a1, 6368
 	ldloc.2
-	ldc.i4 6372
+	ldc.i4 6368
 	add
 	stloc.2
 	ldloc.1
@@ -5574,9 +5574,9 @@ L_105470c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1054738:
-// 0x01054738: 0x1054738: lw    ra, 148(sp)
-// 0x0105473c: 0x105473c: lw    s1, 144(sp)
+L_1054748:
+// 0x01054748: 0x1054748: lw    ra, 148(sp)
+// 0x0105474c: 0x105474c: lw    s1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5585,7 +5585,7 @@ L_1054738:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01054740: 0x1054740: lw    s0, 140(sp)
+// 0x01054750: 0x1054750: lw    s0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5594,7 +5594,7 @@ L_1054738:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01054744: 0x1054744: jr    ra addiu sp, sp, 152
+// 0x01054754: 0x1054754: jr    ra addiu sp, sp, 152
 	ldloc.0
 	ldc.i4 152
 	add
@@ -5606,7 +5606,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_show_group_105474c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_show_group_105475c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 t0)
@@ -5671,12 +5671,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105474c: 0x105474c: addiu sp, sp, -176
+// 0x0105475c: 0x105475c: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x01054750: 0x1054750: sw    s1, 140(sp)
+// 0x01054760: 0x1054760: sw    s1, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5685,8 +5685,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01054754: 0x1054754: sw    ra, 172(sp)
-// 0x01054758: 0x1054758: sw    s8, 168(sp)
+// 0x01054764: 0x1054764: sw    ra, 172(sp)
+// 0x01054768: 0x1054768: sw    s8, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5695,7 +5695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105475c: 0x105475c: sw    s7, 164(sp)
+// 0x0105476c: 0x105476c: sw    s7, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5704,7 +5704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01054760: 0x1054760: sw    s6, 160(sp)
+// 0x01054770: 0x1054770: sw    s6, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5713,7 +5713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01054764: 0x1054764: sw    s5, 156(sp)
+// 0x01054774: 0x1054774: sw    s5, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5722,7 +5722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01054768: 0x1054768: sw    s4, 152(sp)
+// 0x01054778: 0x1054778: sw    s4, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5731,7 +5731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105476c: 0x105476c: sw    s3, 148(sp)
+// 0x0105477c: 0x105477c: sw    s3, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5740,7 +5740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01054770: 0x1054770: sw    s2, 144(sp)
+// 0x01054780: 0x1054780: sw    s2, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5749,7 +5749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01054774: 0x1054774: sw    s0, 136(sp)
+// 0x01054784: 0x1054784: sw    s0, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5758,7 +5758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01054778: 0x1054778: jal   0x1054378 addu  s1, a0, zero
+// 0x01054788: 0x1054788: jal   0x1054388 addu  s1, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -5766,44 +5766,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_feature_enabled_1054378(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_feature_enabled_1054388(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054780: 0x1054780: beq   v0, zero, 0x1054868 sll   zero, zero, 0
+// 0x01054790: 0x1054790: beq   v0, zero, 0x1054878 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1054868
+	brfalse L_1054878
 // --- basic block ---
-// 0x01054788: 0x1054788: beq   s1, zero, 0x1054868 sll   zero, zero, 0
+// 0x01054798: 0x1054798: beq   s1, zero, 0x1054878 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_1054868
+	brfalse L_1054878
 // --- basic block ---
-// 0x01054790: 0x1054790: lb    v0, 0(s1)
+// 0x010547a0: 0x10547a0: lb    v0, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01054794: 0x1054794: sll   zero, zero, 0
-// 0x01054798: 0x1054798: beq   v0, zero, 0x1054868 addiu s2, sp, 56
+// 0x010547a4: 0x10547a4: sll   zero, zero, 0
+// 0x010547a8: 0x10547a8: beq   v0, zero, 0x1054878 addiu s2, sp, 56
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 10
-	brfalse L_1054868
+	brfalse L_1054878
 // --- basic block ---
-// 0x010547a0: 0x10547a0: lui   v0, 0x1050000
+// 0x010547b0: 0x10547b0: lui   v0, 0x1050000
 	ldc.i4 17104896
 	stloc 6
-// 0x010547a4: 0x10547a4: addu  a0, s2, zero
+// 0x010547b4: 0x10547b4: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010547a8: 0x10547a8: addiu v0, v0, 18876
+// 0x010547b8: 0x10547b8: addiu v0, v0, 18892
 	ldloc 6
-	ldc.i4 18876
+	ldc.i4 18892
 	add
 	stloc 6
-// 0x010547ac: 0x10547ac: jal   0x10545e0 sw    v0, 124(sp)
+// 0x010547bc: 0x10547bc: jal   0x10545f0 sw    v0, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5817,12 +5817,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::configure_browser_10545e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::configure_browser_10545f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010547b4: 0x10547b4: jal   0x10543ac lui   s0, 0x70000
+// 0x010547c4: 0x10547c4: jal   0x10543bc lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
 	ldloc.0
@@ -5830,12 +5830,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_url_10543ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_url_10543bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010547bc: 0x10547bc: jal   0x106ab1c sw    v0, 128(sp)
+// 0x010547cc: 0x10547cc: jal   0x106b140 sw    v0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5844,49 +5844,49 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 6
 // --- basic block ---
-// 0x010547c4: 0x10547c4: jal   0x106ab10 addu  s6, v0, zero
+// 0x010547d4: 0x10547d4: jal   0x106b134 addu  s6, v0, zero
 	ldloc 6
 	stloc 14
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 6
 // --- basic block ---
-// 0x010547cc: 0x10547cc: addu  s5, v0, zero
+// 0x010547dc: 0x10547dc: addu  s5, v0, zero
 	ldloc 6
 	stloc 13
-// 0x010547d0: 0x10547d0: lui   v0, 0xf0000
+// 0x010547e0: 0x10547e0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010547d4: 0x10547d4: lw    s8, -30072(v0)
+// 0x010547e4: 0x10547e4: lw    s8, -29608(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 16
-// 0x010547d8: 0x10547d8: lui   v0, 0xf0000
+// 0x010547e8: 0x10547e8: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010547dc: 0x10547dc: lw    s4, -30068(v0)
+// 0x010547ec: 0x10547ec: lw    s4, -29604(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 12
-// 0x010547e0: 0x10547e0: jal   0x1042430 sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+// 0x010547f0: 0x10547f0: jal   0x1042440 sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010547e8: 0x10547e8: jal   0x102c3f0 addu  s7, v0, zero
+// 0x010547f8: 0x10547f8: jal   0x102c400 addu  s7, v0, zero
 	ldloc 6
 	stloc 15
 	ldloc.0
@@ -5894,12 +5894,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010547f0: 0x10547f0: jal   0x101d484 addu  s3, v0, zero
+// 0x01054800: 0x1054800: jal   0x101d494 addu  s3, v0, zero
 	ldloc 6
 	stloc 11
 	ldloc.0
@@ -5907,17 +5907,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010547f8: 0x10547f8: subu  v1, s8, s7
+// 0x01054808: 0x1054808: subu  v1, s8, s7
 	ldloc 16
 	ldloc 15
 	sub
 	stloc 7
-// 0x010547fc: 0x10547fc: lw    a3, 128(sp)
+// 0x0105480c: 0x105480c: lw    a3, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5926,7 +5926,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01054800: 0x1054800: sw    v1, 32(sp)
+// 0x01054810: 0x1054810: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5935,34 +5935,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054804: 0x1054804: lui   a2, 0x10000
+// 0x01054814: 0x1054814: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01054808: 0x1054808: lui   v1, 0x10000
+// 0x01054818: 0x1054818: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0105480c: 0x105480c: addiu a2, a2, 6388
+// 0x0105481c: 0x105481c: addiu a2, a2, 6384
 	ldloc.3
-	ldc.i4 6388
+	ldc.i4 6384
 	add
 	stloc.3
-// 0x01054810: 0x1054810: addiu a1, zero, 1024
+// 0x01054820: 0x1054820: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x01054814: 0x1054814: addiu t0, zero, 70
+// 0x01054824: 0x1054824: addiu t0, zero, 70
 	ldc.i4.s 70
 	stloc 18
-// 0x01054818: 0x1054818: addiu v1, v1, -16892
+// 0x01054828: 0x1054828: addiu v1, v1, 19396
 	ldloc 7
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc 7
-// 0x0105481c: 0x105481c: addiu a0, s0, 4952
+// 0x0105482c: 0x105482c: addiu a0, s0, 5416
 	ldloc 8
-	ldc.i4 4952
+	ldc.i4 5416
 	add
 	stloc.1
-// 0x01054820: 0x1054820: sw    t0, 24(sp)
+// 0x01054830: 0x1054830: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5971,7 +5971,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01054824: 0x1054824: sw    v1, 44(sp)
+// 0x01054834: 0x1054834: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5980,7 +5980,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054828: 0x1054828: sw    s6, 16(sp)
+// 0x01054838: 0x1054838: sw    s6, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5989,7 +5989,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105482c: 0x105482c: sw    s5, 20(sp)
+// 0x0105483c: 0x105483c: sw    s5, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5998,7 +5998,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01054830: 0x1054830: sw    s4, 28(sp)
+// 0x01054840: 0x1054840: sw    s4, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6007,7 +6007,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01054834: 0x1054834: sw    s1, 36(sp)
+// 0x01054844: 0x1054844: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6016,7 +6016,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01054838: 0x1054838: sw    s3, 40(sp)
+// 0x01054848: 0x1054848: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6025,7 +6025,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105483c: 0x105483c: jal   0x1000f9c sw    v0, 48(sp)
+// 0x0105484c: 0x105484c: jal   0x1000f9c sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6044,12 +6044,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054844: 0x1054844: addiu a0, s0, 4952
+// 0x01054854: 0x1054854: addiu a0, s0, 5416
 	ldloc 8
-	ldc.i4 4952
+	ldc.i4 5416
 	add
 	stloc.1
-// 0x01054848: 0x1054848: jal   0x1001b48 addu  s0, a0, zero
+// 0x01054858: 0x1054858: jal   0x1001b48 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
@@ -6058,7 +6058,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054850: 0x1054850: jal   0x1054644 addu  a0, s0, v0
+// 0x01054860: 0x1054860: jal   0x1054654 addu  a0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
@@ -6068,18 +6068,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::append_current_location_1054644(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::append_current_location_1054654(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054858: 0x1054858: addu  a0, s0, zero
+// 0x01054868: 0x1054868: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105485c: 0x105485c: addu  a2, s2, zero
+// 0x0105486c: 0x105486c: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x01054860: 0x1054860: jal   0x10551ec addiu a1, zero, 11
+// 0x01054870: 0x1054870: jal   0x10551fc addiu a1, zero, 11
 	ldc.i4.s 11
 	stloc.2
 	ldloc.0
@@ -6087,14 +6087,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_show_extended_10551ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_show_extended_10551fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1054868:
-// 0x01054868: 0x1054868: lw    ra, 172(sp)
-// 0x0105486c: 0x105486c: lw    s8, 168(sp)
+L_1054878:
+// 0x01054878: 0x1054878: lw    ra, 172(sp)
+// 0x0105487c: 0x105487c: lw    s8, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6103,7 +6103,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01054870: 0x1054870: lw    s7, 164(sp)
+// 0x01054880: 0x1054880: lw    s7, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6112,7 +6112,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01054874: 0x1054874: lw    s6, 160(sp)
+// 0x01054884: 0x1054884: lw    s6, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6121,7 +6121,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01054878: 0x1054878: lw    s5, 156(sp)
+// 0x01054888: 0x1054888: lw    s5, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6130,7 +6130,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105487c: 0x105487c: lw    s4, 152(sp)
+// 0x0105488c: 0x105488c: lw    s4, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6139,7 +6139,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01054880: 0x1054880: lw    s3, 148(sp)
+// 0x01054890: 0x1054890: lw    s3, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6148,7 +6148,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01054884: 0x1054884: lw    s2, 144(sp)
+// 0x01054894: 0x1054894: lw    s2, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6157,7 +6157,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01054888: 0x1054888: lw    s1, 140(sp)
+// 0x01054898: 0x1054898: lw    s1, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6166,7 +6166,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105488c: 0x105488c: lw    s0, 136(sp)
+// 0x0105489c: 0x105489c: lw    s0, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6175,7 +6175,7 @@ L_1054868:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01054890: 0x1054890: jr    ra addiu sp, sp, 176
+// 0x010548a0: 0x10548a0: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -6187,7 +6187,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_groups_show_1054898(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_show_10548a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra,int32 t0)
@@ -6249,14 +6249,14 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1054898:
-// 0x01054898: 0x1054898: addiu sp, sp, -168
+L_10548a8:
+// 0x010548a8: 0x10548a8: addiu sp, sp, -168
 	ldloc.0
 	ldc.i4 -168
 	add
 	stloc.0
-// 0x0105489c: 0x105489c: sw    ra, 164(sp)
-// 0x010548a0: 0x10548a0: sw    s7, 160(sp)
+// 0x010548ac: 0x10548ac: sw    ra, 164(sp)
+// 0x010548b0: 0x10548b0: sw    s7, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6265,7 +6265,7 @@ L_1054898:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010548a4: 0x10548a4: sw    s6, 156(sp)
+// 0x010548b4: 0x10548b4: sw    s6, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6274,7 +6274,7 @@ L_1054898:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010548a8: 0x10548a8: sw    s5, 152(sp)
+// 0x010548b8: 0x10548b8: sw    s5, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6283,7 +6283,7 @@ L_1054898:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010548ac: 0x10548ac: sw    s4, 148(sp)
+// 0x010548bc: 0x10548bc: sw    s4, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6292,7 +6292,7 @@ L_1054898:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010548b0: 0x10548b0: sw    s3, 144(sp)
+// 0x010548c0: 0x10548c0: sw    s3, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6301,7 +6301,7 @@ L_1054898:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010548b4: 0x10548b4: sw    s2, 140(sp)
+// 0x010548c4: 0x10548c4: sw    s2, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6310,7 +6310,7 @@ L_1054898:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010548b8: 0x10548b8: sw    s1, 136(sp)
+// 0x010548c8: 0x10548c8: sw    s1, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6319,7 +6319,7 @@ L_1054898:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010548bc: 0x10548bc: jal   0x1054378 sw    s0, 132(sp)
+// 0x010548cc: 0x10548cc: jal   0x1054388 sw    s0, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6333,31 +6333,31 @@ L_1054898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_feature_enabled_1054378(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_feature_enabled_1054388(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010548c4: 0x10548c4: beq   v0, zero, 0x1054990 addiu s1, sp, 48
+// 0x010548d4: 0x10548d4: beq   v0, zero, 0x10549a0 addiu s1, sp, 48
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 9
-	brfalse L_1054990
+	brfalse L_10549a0
 // --- basic block ---
-// 0x010548cc: 0x10548cc: lui   v0, 0x1050000
+// 0x010548dc: 0x10548dc: lui   v0, 0x1050000
 	ldc.i4 17104896
 	stloc 6
-// 0x010548d0: 0x10548d0: addu  a0, s1, zero
+// 0x010548e0: 0x10548e0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010548d4: 0x10548d4: addiu v0, v0, 18876
+// 0x010548e4: 0x10548e4: addiu v0, v0, 18892
 	ldloc 6
-	ldc.i4 18876
+	ldc.i4 18892
 	add
 	stloc 6
-// 0x010548d8: 0x10548d8: jal   0x10545e0 sw    v0, 116(sp)
+// 0x010548e8: 0x10548e8: jal   0x10545f0 sw    v0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6371,12 +6371,12 @@ L_1054898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::configure_browser_10545e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::configure_browser_10545f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010548e0: 0x10548e0: jal   0x10543ac lui   s0, 0x70000
+// 0x010548f0: 0x10548f0: jal   0x10543bc lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
 	ldloc.0
@@ -6384,12 +6384,12 @@ L_1054898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_url_10543ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_url_10543bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010548e8: 0x10548e8: jal   0x106ab1c sw    v0, 120(sp)
+// 0x010548f8: 0x10548f8: jal   0x106b140 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6398,49 +6398,49 @@ L_1054898:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl79::Realtime_GetServerId_106ab1c()
+	call int32 Cibyl79::Realtime_GetServerId_106b140()
 	stloc 6
 // --- basic block ---
-// 0x010548f0: 0x10548f0: jal   0x106ab10 addu  s5, v0, zero
+// 0x01054900: 0x1054900: jal   0x106b134 addu  s5, v0, zero
 	ldloc 6
 	stloc 13
-	call int32 Cibyl79::Realtime_GetServerCookie_106ab10()
+	call int32 Cibyl79::Realtime_GetServerCookie_106b134()
 	stloc 6
 // --- basic block ---
-// 0x010548f8: 0x10548f8: addu  s4, v0, zero
+// 0x01054908: 0x1054908: addu  s4, v0, zero
 	ldloc 6
 	stloc 12
-// 0x010548fc: 0x10548fc: lui   v0, 0xf0000
+// 0x0105490c: 0x105490c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x01054900: 0x1054900: lw    s7, -30072(v0)
+// 0x01054910: 0x1054910: lw    s7, -29608(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 15
-// 0x01054904: 0x1054904: lui   v0, 0xf0000
+// 0x01054914: 0x1054914: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x01054908: 0x1054908: lw    s3, -30068(v0)
+// 0x01054918: 0x1054918: lw    s3, -29604(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105490c: 0x105490c: jal   0x1042430 sll   zero, zero, 0
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+// 0x0105491c: 0x105491c: jal   0x1042440 sll   zero, zero, 0
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054914: 0x1054914: jal   0x102c3f0 addu  s6, v0, zero
+// 0x01054924: 0x1054924: jal   0x102c400 addu  s6, v0, zero
 	ldloc 6
 	stloc 14
 	ldloc.0
@@ -6448,12 +6448,12 @@ L_1054898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105491c: 0x105491c: jal   0x101d484 addu  s2, v0, zero
+// 0x0105492c: 0x105492c: jal   0x101d494 addu  s2, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.0
@@ -6461,17 +6461,17 @@ L_1054898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054924: 0x1054924: subu  v1, s7, s6
+// 0x01054934: 0x1054934: subu  v1, s7, s6
 	ldloc 15
 	ldloc 14
 	sub
 	stloc 7
-// 0x01054928: 0x1054928: lw    a3, 120(sp)
+// 0x01054938: 0x1054938: lw    a3, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6480,7 +6480,7 @@ L_1054898:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105492c: 0x105492c: sw    v1, 32(sp)
+// 0x0105493c: 0x105493c: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6489,34 +6489,34 @@ L_1054898:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054930: 0x1054930: lui   a2, 0x10000
+// 0x01054940: 0x1054940: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01054934: 0x1054934: lui   v1, 0x10000
+// 0x01054944: 0x1054944: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01054938: 0x1054938: addiu a2, a2, 6500
+// 0x01054948: 0x1054948: addiu a2, a2, 6496
 	ldloc.3
-	ldc.i4 6500
+	ldc.i4 6496
 	add
 	stloc.3
-// 0x0105493c: 0x105493c: addiu a1, zero, 1024
+// 0x0105494c: 0x105494c: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x01054940: 0x1054940: addiu t0, zero, 20
+// 0x01054950: 0x1054950: addiu t0, zero, 20
 	ldc.i4.s 20
 	stloc 17
-// 0x01054944: 0x1054944: addiu v1, v1, -16892
+// 0x01054954: 0x1054954: addiu v1, v1, 19396
 	ldloc 7
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc 7
-// 0x01054948: 0x1054948: addiu a0, s0, 5976
+// 0x01054958: 0x1054958: addiu a0, s0, 6440
 	ldloc 8
-	ldc.i4 5976
+	ldc.i4 6440
 	add
 	stloc.1
-// 0x0105494c: 0x105494c: sw    t0, 24(sp)
+// 0x0105495c: 0x105495c: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6525,7 +6525,7 @@ L_1054898:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01054950: 0x1054950: sw    v1, 40(sp)
+// 0x01054960: 0x1054960: sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6534,7 +6534,7 @@ L_1054898:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054954: 0x1054954: sw    s5, 16(sp)
+// 0x01054964: 0x1054964: sw    s5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6543,7 +6543,7 @@ L_1054898:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01054958: 0x1054958: sw    s4, 20(sp)
+// 0x01054968: 0x1054968: sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6552,7 +6552,7 @@ L_1054898:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105495c: 0x105495c: sw    s3, 28(sp)
+// 0x0105496c: 0x105496c: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6561,7 +6561,7 @@ L_1054898:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01054960: 0x1054960: sw    s2, 36(sp)
+// 0x01054970: 0x1054970: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6570,7 +6570,7 @@ L_1054898:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01054964: 0x1054964: jal   0x1000f9c sw    v0, 44(sp)
+// 0x01054974: 0x1054974: jal   0x1000f9c sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6589,12 +6589,12 @@ L_1054898:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105496c: 0x105496c: addiu a0, s0, 5976
+// 0x0105497c: 0x105497c: addiu a0, s0, 6440
 	ldloc 8
-	ldc.i4 5976
+	ldc.i4 6440
 	add
 	stloc.1
-// 0x01054970: 0x1054970: jal   0x1001b48 addu  s0, a0, zero
+// 0x01054980: 0x1054980: jal   0x1001b48 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
@@ -6603,7 +6603,7 @@ L_1054898:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054978: 0x1054978: jal   0x1054644 addu  a0, s0, v0
+// 0x01054988: 0x1054988: jal   0x1054654 addu  a0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
@@ -6613,18 +6613,18 @@ L_1054898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::append_current_location_1054644(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::append_current_location_1054654(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01054980: 0x1054980: addu  a0, s0, zero
+// 0x01054990: 0x1054990: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01054984: 0x1054984: addu  a2, s1, zero
+// 0x01054994: 0x1054994: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x01054988: 0x1054988: jal   0x10551ec addiu a1, zero, 11
+// 0x01054998: 0x1054998: jal   0x10551fc addiu a1, zero, 11
 	ldc.i4.s 11
 	stloc.2
 	ldloc.0
@@ -6632,14 +6632,14 @@ L_1054898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_show_extended_10551ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_show_extended_10551fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1054990:
-// 0x01054990: 0x1054990: lw    ra, 164(sp)
-// 0x01054994: 0x1054994: lw    s7, 160(sp)
+L_10549a0:
+// 0x010549a0: 0x10549a0: lw    ra, 164(sp)
+// 0x010549a4: 0x10549a4: lw    s7, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6648,7 +6648,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01054998: 0x1054998: lw    s6, 156(sp)
+// 0x010549a8: 0x10549a8: lw    s6, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6657,7 +6657,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105499c: 0x105499c: lw    s5, 152(sp)
+// 0x010549ac: 0x10549ac: lw    s5, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6666,7 +6666,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010549a0: 0x10549a0: lw    s4, 148(sp)
+// 0x010549b0: 0x10549b0: lw    s4, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6675,7 +6675,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010549a4: 0x10549a4: lw    s3, 144(sp)
+// 0x010549b4: 0x10549b4: lw    s3, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6684,7 +6684,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010549a8: 0x10549a8: lw    s2, 140(sp)
+// 0x010549b8: 0x10549b8: lw    s2, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6693,7 +6693,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010549ac: 0x10549ac: lw    s1, 136(sp)
+// 0x010549bc: 0x10549bc: lw    s1, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6702,7 +6702,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010549b0: 0x10549b0: lw    s0, 132(sp)
+// 0x010549c0: 0x10549c0: lw    s0, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6711,7 +6711,7 @@ L_1054990:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010549b4: 0x10549b4: jr    ra addiu sp, sp, 168
+// 0x010549c4: 0x10549c4: jr    ra addiu sp, sp, 168
 	ldloc.0
 	ldc.i4 168
 	add
@@ -6723,7 +6723,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 on_close_cb_10549bc(int32,int32,int32,int32,int32)
+.method public static int32 on_close_cb_10549cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6758,26 +6758,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010549bc: 0x10549bc: addiu sp, sp, -24
+// 0x010549cc: 0x10549cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010549c0: 0x10549c0: sw    ra, 20(sp)
-// 0x010549c4: 0x10549c4: jal   0x106db7c sll   zero, zero, 0
+// 0x010549d0: 0x10549d0: sw    ra, 20(sp)
+// 0x010549d4: 0x10549d4: jal   0x106e1a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_SendCurrenScreenEdges_106db7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_SendCurrenScreenEdges_106e1a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010549cc: 0x10549cc: lw    ra, 20(sp)
-// 0x010549d0: 0x10549d0: sll   zero, zero, 0
-// 0x010549d4: 0x10549d4: jr    ra addiu sp, sp, 24
+// 0x010549dc: 0x10549dc: lw    ra, 20(sp)
+// 0x010549e0: 0x10549e0: sll   zero, zero, 0
+// 0x010549e4: 0x10549e4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6789,7 +6789,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_groups_browser_btn_close_cb_10549dc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_browser_btn_close_cb_10549ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6824,13 +6824,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010549dc: 0x10549dc: addiu sp, sp, -24
+// 0x010549ec: 0x10549ec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010549e0: 0x10549e0: sw    ra, 20(sp)
-// 0x010549e4: 0x10549e4: jal   0x1094b64 addiu a0, zero, 1
+// 0x010549f0: 0x10549f0: sw    ra, 20(sp)
+// 0x010549f4: 0x10549f4: jal   0x10951ac addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -6838,14 +6838,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010549ec: 0x10549ec: lw    ra, 20(sp)
-// 0x010549f0: 0x10549f0: sll   zero, zero, 0
-// 0x010549f4: 0x10549f4: jr    ra addiu sp, sp, 24
+// 0x010549fc: 0x10549fc: lw    ra, 20(sp)
+// 0x01054a00: 0x1054a00: sll   zero, zero, 0
+// 0x01054a04: 0x1054a04: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6857,7 +6857,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_groups_init_10549fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_init_1054a0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s2,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -6901,12 +6901,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010549fc: 0x10549fc: addiu sp, sp, -48
+// 0x01054a0c: 0x1054a0c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01054a00: 0x1054a00: sw    s2, 40(sp)
+// 0x01054a10: 0x1054a10: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6915,7 +6915,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054a04: 0x1054a04: sw    s1, 36(sp)
+// 0x01054a14: 0x1054a14: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6924,7 +6924,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01054a08: 0x1054a08: sw    s0, 32(sp)
+// 0x01054a18: 0x1054a18: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6933,51 +6933,51 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01054a0c: 0x1054a0c: lui   s2, 0x10000
+// 0x01054a1c: 0x1054a1c: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01054a10: 0x1054a10: lui   s0, 0x20000
+// 0x01054a20: 0x1054a20: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01054a14: 0x1054a14: lui   s1, 0x10000
+// 0x01054a24: 0x1054a24: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01054a18: 0x1054a18: lui   a1, 0x0
+// 0x01054a28: 0x1054a28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01054a1c: 0x1054a1c: lui   a3, 0x10000
+// 0x01054a2c: 0x1054a2c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01054a20: 0x1054a20: addiu s2, s2, 5760
+// 0x01054a30: 0x1054a30: addiu s2, s2, 5756
 	ldloc 7
-	ldc.i4 5760
+	ldc.i4 5756
 	add
 	stloc 7
-// 0x01054a24: 0x1054a24: addiu s1, s1, 5752
+// 0x01054a34: 0x1054a34: addiu s1, s1, 5748
 	ldloc 6
-	ldc.i4 5752
+	ldc.i4 5748
 	add
 	stloc 6
-// 0x01054a28: 0x1054a28: addiu a0, s0, -26888
+// 0x01054a38: 0x1054a38: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01054a2c: 0x1054a2c: addiu a1, a1, 13884
+// 0x01054a3c: 0x1054a3c: addiu a1, a1, 13884
 	ldloc.2
 	ldc.i4 13884
 	add
 	stloc.2
-// 0x01054a30: 0x1054a30: addiu a3, a3, 5772
+// 0x01054a40: 0x1054a40: addiu a3, a3, 5768
 	ldloc 4
-	ldc.i4 5772
+	ldc.i4 5768
 	add
 	stloc 4
-// 0x01054a34: 0x1054a34: addu  a2, zero, zero
+// 0x01054a44: 0x1054a44: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01054a38: 0x1054a38: sw    ra, 44(sp)
-// 0x01054a3c: 0x1054a3c: sw    s2, 16(sp)
+// 0x01054a48: 0x1054a48: sw    ra, 44(sp)
+// 0x01054a4c: 0x1054a4c: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6986,7 +6986,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054a40: 0x1054a40: sw    s1, 20(sp)
+// 0x01054a50: 0x1054a50: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6995,7 +6995,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01054a44: 0x1054a44: jal   0x100edf8 sw    zero, 24(sp)
+// 0x01054a54: 0x1054a54: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7009,39 +7009,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01054a4c: 0x1054a4c: lui   a1, 0x0
+// 0x01054a5c: 0x1054a5c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01054a50: 0x1054a50: lui   v0, 0x10000
+// 0x01054a60: 0x1054a60: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01054a54: 0x1054a54: addu  a3, s2, zero
+// 0x01054a64: 0x1054a64: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x01054a58: 0x1054a58: addiu a0, s0, -26888
+// 0x01054a68: 0x1054a68: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01054a5c: 0x1054a5c: addiu a1, a1, 13900
+// 0x01054a6c: 0x1054a6c: addiu a1, a1, 13900
 	ldloc.2
 	ldc.i4 13900
 	add
 	stloc.2
-// 0x01054a60: 0x1054a60: addu  a2, zero, zero
+// 0x01054a70: 0x1054a70: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01054a64: 0x1054a64: addiu v0, v0, 220
+// 0x01054a74: 0x1054a74: addiu v0, v0, 216
 	ldloc 8
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc 8
-// 0x01054a68: 0x1054a68: sw    s1, 16(sp)
+// 0x01054a78: 0x1054a78: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7050,7 +7050,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01054a6c: 0x1054a6c: sw    v0, 20(sp)
+// 0x01054a7c: 0x1054a7c: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7059,7 +7059,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01054a70: 0x1054a70: sw    zero, 24(sp)
+// 0x01054a80: 0x1054a80: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7068,7 +7068,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054a74: 0x1054a74: jal   0x100edf8 lui   s1, 0x20000
+// 0x01054a84: 0x1054a84: jal   0x100ee08 lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 6
 	ldloc.0
@@ -7076,41 +7076,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01054a7c: 0x1054a7c: lui   s2, 0x0
+// 0x01054a8c: 0x1054a8c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01054a80: 0x1054a80: lui   a1, 0x0
+// 0x01054a90: 0x1054a90: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01054a84: 0x1054a84: addiu s2, s2, 20820
+// 0x01054a94: 0x1054a94: addiu s2, s2, 20820
 	ldloc 7
 	ldc.i4 20820
 	add
 	stloc 7
-// 0x01054a88: 0x1054a88: addiu a0, s0, -26888
+// 0x01054a98: 0x1054a98: addiu a0, s0, -26424
 	ldloc 9
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01054a8c: 0x1054a8c: addiu a3, s1, 9464
+// 0x01054a9c: 0x1054a9c: addiu a3, s1, 9928
 	ldloc 6
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01054a90: 0x1054a90: addiu a1, a1, 13868
+// 0x01054aa0: 0x1054aa0: addiu a1, a1, 13868
 	ldloc.2
 	ldc.i4 13868
 	add
 	stloc.2
-// 0x01054a94: 0x1054a94: addu  a2, zero, zero
+// 0x01054aa4: 0x1054aa4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01054a98: 0x1054a98: sw    s2, 16(sp)
+// 0x01054aa8: 0x1054aa8: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7119,10 +7119,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054a9c: 0x1054a9c: lui   s0, 0x10000
+// 0x01054aac: 0x1054aac: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01054aa0: 0x1054aa0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01054ab0: 0x1054ab0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7136,33 +7136,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01054aa8: 0x1054aa8: lui   a1, 0x0
+// 0x01054ab8: 0x1054ab8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01054aac: 0x1054aac: lui   a2, 0x10000
+// 0x01054abc: 0x1054abc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01054ab0: 0x1054ab0: addiu a0, s0, 12560
+// 0x01054ac0: 0x1054ac0: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01054ab4: 0x1054ab4: addiu a1, a1, 13916
+// 0x01054ac4: 0x1054ac4: addiu a1, a1, 13916
 	ldloc.2
 	ldc.i4 13916
 	add
 	stloc.2
-// 0x01054ab8: 0x1054ab8: addiu a2, a2, 18500
+// 0x01054ac8: 0x1054ac8: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x01054abc: 0x1054abc: jal   0x100edb0 addu  a3, zero, zero
+// 0x01054acc: 0x1054acc: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -7170,36 +7170,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01054ac4: 0x1054ac4: lui   a1, 0x0
+// 0x01054ad4: 0x1054ad4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01054ac8: 0x1054ac8: addu  a3, s2, zero
+// 0x01054ad8: 0x1054ad8: addu  a3, s2, zero
 	ldloc 7
 	stloc 4
-// 0x01054acc: 0x1054acc: addiu a0, s0, 12560
+// 0x01054adc: 0x1054adc: addiu a0, s0, 12556
 	ldloc 9
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01054ad0: 0x1054ad0: addiu a1, a1, 13932
+// 0x01054ae0: 0x1054ae0: addiu a1, a1, 13932
 	ldloc.2
 	ldc.i4 13932
 	add
 	stloc.2
-// 0x01054ad4: 0x1054ad4: addiu s1, s1, 9464
+// 0x01054ae4: 0x1054ae4: addiu s1, s1, 9928
 	ldloc 6
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 6
-// 0x01054ad8: 0x1054ad8: addu  a2, zero, zero
+// 0x01054ae8: 0x1054ae8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01054adc: 0x1054adc: sw    s1, 16(sp)
+// 0x01054aec: 0x1054aec: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7208,7 +7208,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01054ae0: 0x1054ae0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01054af0: 0x1054af0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7222,23 +7222,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01054ae8: 0x1054ae8: lui   a0, 0x70000
+// 0x01054af8: 0x1054af8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01054aec: 0x1054aec: addiu a0, a0, 7004
+// 0x01054afc: 0x1054afc: addiu a0, a0, 7468
 	ldloc.1
-	ldc.i4 7004
+	ldc.i4 7468
 	add
 	stloc.1
-// 0x01054af0: 0x1054af0: addu  a1, zero, zero
+// 0x01054b00: 0x1054b00: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01054af4: 0x1054af4: jal   0x100177c addiu a2, zero, 250
+// 0x01054b04: 0x1054b04: jal   0x100177c addiu a2, zero, 250
 	ldc.i4 250
 	stloc.3
 	ldloc.1
@@ -7250,18 +7250,18 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01054afc: 0x1054afc: lui   a0, 0x70000
+// 0x01054b0c: 0x1054b0c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01054b00: 0x1054b00: addiu a0, a0, 7256
+// 0x01054b10: 0x1054b10: addiu a0, a0, 7720
 	ldloc.1
-	ldc.i4 7256
+	ldc.i4 7720
 	add
 	stloc.1
-// 0x01054b04: 0x1054b04: addu  a1, zero, zero
+// 0x01054b14: 0x1054b14: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01054b08: 0x1054b08: jal   0x100177c addiu a2, zero, 100
+// 0x01054b18: 0x1054b18: jal   0x100177c addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.1
@@ -7273,8 +7273,8 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01054b10: 0x1054b10: lw    ra, 44(sp)
-// 0x01054b14: 0x1054b14: lw    s2, 40(sp)
+// 0x01054b20: 0x1054b20: lw    ra, 44(sp)
+// 0x01054b24: 0x1054b24: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7283,7 +7283,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01054b18: 0x1054b18: lw    s1, 36(sp)
+// 0x01054b28: 0x1054b28: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7292,7 +7292,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01054b1c: 0x1054b1c: lw    s0, 32(sp)
+// 0x01054b2c: 0x1054b2c: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7301,7 +7301,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01054b20: 0x1054b20: jr    ra addiu sp, sp, 48
+// 0x01054b30: 0x1054b30: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -7313,7 +7313,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_groups_add_following_group_name_1054b28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_add_following_group_name_1054b38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -7351,17 +7351,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054b28: 0x1054b28: addiu sp, sp, -32
+// 0x01054b38: 0x1054b38: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01054b2c: 0x1054b2c: slti  v0, a0, 201
+// 0x01054b3c: 0x1054b3c: slti  v0, a0, 201
 	ldloc.1
 	ldc.i4 201
 	clt
 	stloc 5
-// 0x01054b30: 0x1054b30: sw    s0, 24(sp)
+// 0x01054b40: 0x1054b40: sw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7370,44 +7370,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054b34: 0x1054b34: sw    ra, 28(sp)
-// 0x01054b38: 0x1054b38: beq   v0, zero, 0x1054b88 addu  s0, a0, zero
+// 0x01054b44: 0x1054b44: sw    ra, 28(sp)
+// 0x01054b48: 0x1054b48: beq   v0, zero, 0x1054b98 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_1054b88
+	brfalse L_1054b98
 // --- basic block ---
-// 0x01054b40: 0x1054b40: lui   v0, 0x70000
+// 0x01054b50: 0x1054b50: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01054b44: 0x1054b44: sll   v1, a0, 2
+// 0x01054b54: 0x1054b54: sll   v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01054b48: 0x1054b48: addiu v0, v0, 7456
+// 0x01054b58: 0x1054b58: addiu v0, v0, 7920
 	ldloc 5
-	ldc.i4 7456
+	ldc.i4 7920
 	add
 	stloc 5
-// 0x01054b4c: 0x1054b4c: addu  v0, v1, v0
+// 0x01054b5c: 0x1054b5c: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01054b50: 0x1054b50: lw    a0, 0(v0)
+// 0x01054b60: 0x1054b60: lw    a0, 0(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01054b54: 0x1054b54: sll   zero, zero, 0
-// 0x01054b58: 0x1054b58: beq   a0, zero, 0x1054b6c sll   zero, zero, 0
+// 0x01054b64: 0x1054b64: sll   zero, zero, 0
+// 0x01054b68: 0x1054b68: beq   a0, zero, 0x1054b7c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1054b6c
+	brfalse L_1054b7c
 // --- basic block ---
-// 0x01054b60: 0x1054b60: jal   0x1000930 sw    a1, 16(sp)
+// 0x01054b70: 0x1054b70: jal   0x1000930 sw    a1, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7426,7 +7426,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01054b68: 0x1054b68: lw    a1, 16(sp)
+// 0x01054b78: 0x1054b78: lw    a1, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7435,8 +7435,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_1054b6c:
-// 0x01054b6c: 0x1054b6c: jal   0x1001ba8 addu  a0, a1, zero
+L_1054b7c:
+// 0x01054b7c: 0x1054b7c: jal   0x1001ba8 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -7449,34 +7449,34 @@ L_1054b6c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01054b74: 0x1054b74: lui   v1, 0x70000
+// 0x01054b84: 0x1054b84: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01054b78: 0x1054b78: sll   s0, s0, 2
+// 0x01054b88: 0x1054b88: sll   s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01054b7c: 0x1054b7c: addiu v1, v1, 7456
+// 0x01054b8c: 0x1054b8c: addiu v1, v1, 7920
 	ldloc 6
-	ldc.i4 7456
+	ldc.i4 7920
 	add
 	stloc 6
-// 0x01054b80: 0x1054b80: addu  s0, s0, v1
+// 0x01054b90: 0x1054b90: addu  s0, s0, v1
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x01054b84: 0x1054b84: sw    v0, 0(s0)
+// 0x01054b94: 0x1054b94: sw    v0, 0(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1054b88:
-// 0x01054b88: 0x1054b88: lw    ra, 28(sp)
-// 0x01054b8c: 0x1054b8c: lw    s0, 24(sp)
+L_1054b98:
+// 0x01054b98: 0x1054b98: lw    ra, 28(sp)
+// 0x01054b9c: 0x1054b9c: lw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -7485,7 +7485,7 @@ L_1054b88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01054b90: 0x1054b90: jr    ra addiu sp, sp, 32
+// 0x01054ba0: 0x1054ba0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl63.j b/converted/Cibyl63.j
index 25bb767..bd252ec 100644
--- a/converted/Cibyl63.j
+++ b/converted/Cibyl63.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl63::.ctor
 
-.method public static int32 roadmap_groups_add_following_group_icon_1054b98(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_add_following_group_icon_1054ba8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 ra)
@@ -82,12 +82,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054b98: 0x1054b98: addiu sp, sp, -152
+// 0x01054ba8: 0x1054ba8: addiu sp, sp, -152
 	ldloc.0
 	ldc.i4 -152
 	add
 	stloc.0
-// 0x01054b9c: 0x1054b9c: sw    s1, 144(sp)
+// 0x01054bac: 0x1054bac: sw    s1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -96,7 +96,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054ba0: 0x1054ba0: sw    s0, 140(sp)
+// 0x01054bb0: 0x1054bb0: sw    s0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -105,46 +105,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01054ba4: 0x1054ba4: sw    ra, 148(sp)
-// 0x01054ba8: 0x1054ba8: addu  s0, a1, zero
+// 0x01054bb4: 0x1054bb4: sw    ra, 148(sp)
+// 0x01054bb8: 0x1054bb8: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01054bac: 0x1054bac: beq   a1, zero, 0x1054c1c addu  s1, a0, zero
+// 0x01054bbc: 0x1054bbc: beq   a1, zero, 0x1054c2c addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 7
-	brfalse L_1054c1c
+	brfalse L_1054c2c
 // --- basic block ---
-// 0x01054bb4: 0x1054bb4: lb    v0, 0(a1)
+// 0x01054bc4: 0x1054bc4: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01054bb8: 0x1054bb8: sll   zero, zero, 0
-// 0x01054bbc: 0x1054bbc: beq   v0, zero, 0x1054c20 slti  v0, s1, 201
+// 0x01054bc8: 0x1054bc8: sll   zero, zero, 0
+// 0x01054bcc: 0x1054bcc: beq   v0, zero, 0x1054c30 slti  v0, s1, 201
 	ldloc 5
 	ldloc 7
 	ldc.i4 201
 	clt
 	stloc 5
-	brfalse L_1054c20
+	brfalse L_1054c30
 // --- basic block ---
-// 0x01054bc4: 0x1054bc4: lui   a2, 0x10000
+// 0x01054bd4: 0x1054bd4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01054bc8: 0x1054bc8: addiu a2, a2, 6600
+// 0x01054bd8: 0x1054bd8: addiu a2, a2, 6596
 	ldloc.3
-	ldc.i4 6600
+	ldc.i4 6596
 	add
 	stloc.3
-// 0x01054bcc: 0x1054bcc: addiu a0, sp, 32
+// 0x01054bdc: 0x1054bdc: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01054bd0: 0x1054bd0: addiu a1, zero, 100
+// 0x01054be0: 0x1054be0: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x01054bd4: 0x1054bd4: jal   0x1000f9c addu  a3, s0, zero
+// 0x01054be4: 0x1054be4: jal   0x1000f9c addu  a3, s0, zero
 	ldloc 9
 	stloc 4
 	ldloc.0
@@ -157,13 +157,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054bdc: 0x1054bdc: addu  a0, zero, zero
+// 0x01054bec: 0x1054bec: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01054be0: 0x1054be0: addiu a1, zero, 1
+// 0x01054bf0: 0x1054bf0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01054be4: 0x1054be4: jal   0x10a1918 addu  a2, s0, zero
+// 0x01054bf4: 0x1054bf4: jal   0x10a1f60 addu  a2, s0, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -171,37 +171,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054bec: 0x1054bec: bne   v0, zero, 0x1054c20 slti  v0, s1, 201
+// 0x01054bfc: 0x1054bfc: bne   v0, zero, 0x1054c30 slti  v0, s1, 201
 	ldloc 5
 	ldloc 7
 	ldc.i4 201
 	clt
 	stloc 5
-	brtrue L_1054c20
+	brtrue L_1054c30
 // --- basic block ---
-// 0x01054bf4: 0x1054bf4: lui   a3, 0x10000
+// 0x01054c04: 0x1054c04: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01054bf8: 0x1054bf8: addiu a3, a3, 18500
+// 0x01054c08: 0x1054c08: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01054bfc: 0x1054bfc: addu  a0, zero, zero
+// 0x01054c0c: 0x1054c0c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01054c00: 0x1054c00: addu  a1, s0, zero
+// 0x01054c10: 0x1054c10: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x01054c04: 0x1054c04: addu  a2, zero, zero
+// 0x01054c14: 0x1054c14: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01054c08: 0x1054c08: sw    zero, 16(sp)
+// 0x01054c18: 0x1054c18: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -210,7 +210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054c0c: 0x1054c0c: sw    zero, 20(sp)
+// 0x01054c1c: 0x1054c1c: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -219,7 +219,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054c10: 0x1054c10: sw    zero, 24(sp)
+// 0x01054c20: 0x1054c20: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -228,7 +228,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054c14: 0x1054c14: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x01054c24: 0x1054c24: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -242,52 +242,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1054c1c:
-// 0x01054c1c: 0x1054c1c: slti  v0, s1, 201
+L_1054c2c:
+// 0x01054c2c: 0x1054c2c: slti  v0, s1, 201
 	ldloc 7
 	ldc.i4 201
 	clt
 	stloc 5
-L_1054c20:
-// 0x01054c20: 0x1054c20: beq   v0, zero, 0x1054c84 lui   v0, 0x70000
+L_1054c30:
+// 0x01054c30: 0x1054c30: beq   v0, zero, 0x1054c94 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1054c84
+	brfalse L_1054c94
 // --- basic block ---
-// 0x01054c28: 0x1054c28: sll   v1, s1, 2
+// 0x01054c38: 0x1054c38: sll   v1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x01054c2c: 0x1054c2c: addiu v0, v0, 8256
+// 0x01054c3c: 0x1054c3c: addiu v0, v0, 8720
 	ldloc 5
-	ldc.i4 8256
+	ldc.i4 8720
 	add
 	stloc 5
-// 0x01054c30: 0x1054c30: addu  v0, v1, v0
+// 0x01054c40: 0x1054c40: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01054c34: 0x1054c34: lw    a0, 0(v0)
+// 0x01054c44: 0x1054c44: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01054c38: 0x1054c38: sll   zero, zero, 0
-// 0x01054c3c: 0x1054c3c: beq   a0, zero, 0x1054c4c sll   zero, zero, 0
+// 0x01054c48: 0x1054c48: sll   zero, zero, 0
+// 0x01054c4c: 0x1054c4c: beq   a0, zero, 0x1054c5c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1054c4c
+	brfalse L_1054c5c
 // --- basic block ---
-// 0x01054c44: 0x1054c44: jal   0x1000930 sll   zero, zero, 0
+// 0x01054c54: 0x1054c54: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -298,35 +298,35 @@ L_1054c20:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1054c4c:
-// 0x01054c4c: 0x1054c4c: beq   s0, zero, 0x1054c68 lui   a0, 0x10000
+L_1054c5c:
+// 0x01054c5c: 0x1054c5c: beq   s0, zero, 0x1054c78 lui   a0, 0x10000
 	ldloc 9
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1054c68
+	brfalse L_1054c78
 // --- basic block ---
-// 0x01054c54: 0x1054c54: lb    v0, 0(s0)
+// 0x01054c64: 0x1054c64: lb    v0, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01054c58: 0x1054c58: sll   zero, zero, 0
-// 0x01054c5c: 0x1054c5c: bne   v0, zero, 0x1054c6c addu  a0, s0, zero
+// 0x01054c68: 0x1054c68: sll   zero, zero, 0
+// 0x01054c6c: 0x1054c6c: bne   v0, zero, 0x1054c7c addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_1054c6c
+	brtrue L_1054c7c
 // --- basic block ---
-// 0x01054c64: 0x1054c64: lui   a0, 0x10000
+// 0x01054c74: 0x1054c74: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1054c68:
-// 0x01054c68: 0x1054c68: addiu a0, a0, 6612
+L_1054c78:
+// 0x01054c78: 0x1054c78: addiu a0, a0, 6608
 	ldloc.1
-	ldc.i4 6612
+	ldc.i4 6608
 	add
 	stloc.1
-L_1054c6c:
-// 0x01054c6c: 0x1054c6c: jal   0x1001ba8 sll   s1, s1, 2
+L_1054c7c:
+// 0x01054c7c: 0x1054c7c: jal   0x1001ba8 sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
@@ -341,29 +341,29 @@ L_1054c6c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054c74: 0x1054c74: lui   v1, 0x70000
+// 0x01054c84: 0x1054c84: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01054c78: 0x1054c78: addiu v1, v1, 8256
+// 0x01054c88: 0x1054c88: addiu v1, v1, 8720
 	ldloc 8
-	ldc.i4 8256
+	ldc.i4 8720
 	add
 	stloc 8
-// 0x01054c7c: 0x1054c7c: addu  s1, s1, v1
+// 0x01054c8c: 0x1054c8c: addu  s1, s1, v1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 7
-// 0x01054c80: 0x1054c80: sw    v0, 0(s1)
+// 0x01054c90: 0x1054c90: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1054c84:
-// 0x01054c84: 0x1054c84: lw    ra, 148(sp)
-// 0x01054c88: 0x1054c88: lw    s1, 144(sp)
+L_1054c94:
+// 0x01054c94: 0x1054c94: lw    ra, 148(sp)
+// 0x01054c98: 0x1054c98: lw    s1, 144(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -372,7 +372,7 @@ L_1054c84:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01054c8c: 0x1054c8c: lw    s0, 140(sp)
+// 0x01054c9c: 0x1054c9c: lw    s0, 140(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -381,7 +381,7 @@ L_1054c84:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01054c90: 0x1054c90: jr    ra addiu sp, sp, 152
+// 0x01054ca0: 0x1054ca0: jr    ra addiu sp, sp, 152
 	ldloc.0
 	ldc.i4 152
 	add
@@ -393,7 +393,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_set_active_group_icon_1054c98(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_set_active_group_icon_1054ca8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -431,12 +431,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054c98: 0x1054c98: addiu sp, sp, -40
+// 0x01054ca8: 0x1054ca8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01054c9c: 0x1054c9c: sw    s0, 32(sp)
+// 0x01054cac: 0x1054cac: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -445,36 +445,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054ca0: 0x1054ca0: sw    ra, 36(sp)
-// 0x01054ca4: 0x1054ca4: beq   a0, zero, 0x1054d70 addu  s0, a0, zero
+// 0x01054cb0: 0x1054cb0: sw    ra, 36(sp)
+// 0x01054cb4: 0x1054cb4: beq   a0, zero, 0x1054d80 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_1054d70
+	brfalse L_1054d80
 // --- basic block ---
-// 0x01054cac: 0x1054cac: lb    v0, 0(a0)
+// 0x01054cbc: 0x1054cbc: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01054cb0: 0x1054cb0: sll   zero, zero, 0
-// 0x01054cb4: 0x1054cb4: beq   v0, zero, 0x1054d74 lui   v0, 0x70000
+// 0x01054cc0: 0x1054cc0: sll   zero, zero, 0
+// 0x01054cc4: 0x1054cc4: beq   v0, zero, 0x1054d84 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1054d74
+	brfalse L_1054d84
 // --- basic block ---
-// 0x01054cbc: 0x1054cbc: lui   a0, 0x70000
+// 0x01054ccc: 0x1054ccc: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01054cc0: 0x1054cc0: addiu a0, a0, 7256
+// 0x01054cd0: 0x1054cd0: addiu a0, a0, 7720
 	ldloc.1
-	ldc.i4 7256
+	ldc.i4 7720
 	add
 	stloc.1
-// 0x01054cc4: 0x1054cc4: addu  a1, s0, zero
+// 0x01054cd4: 0x1054cd4: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01054cc8: 0x1054cc8: jal   0x1001af8 addiu a2, zero, 100
+// 0x01054cd8: 0x1054cd8: jal   0x1001af8 addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.1
@@ -483,26 +483,26 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01054cd0: 0x1054cd0: lui   a0, 0x70000
+// 0x01054ce0: 0x1054ce0: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01054cd4: 0x1054cd4: lui   a2, 0x10000
+// 0x01054ce4: 0x1054ce4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01054cd8: 0x1054cd8: addiu a0, a0, 7356
+// 0x01054ce8: 0x1054ce8: addiu a0, a0, 7820
 	ldloc.1
-	ldc.i4 7356
+	ldc.i4 7820
 	add
 	stloc.1
-// 0x01054cdc: 0x1054cdc: addiu a2, a2, 6600
+// 0x01054cec: 0x1054cec: addiu a2, a2, 6596
 	ldloc.3
-	ldc.i4 6600
+	ldc.i4 6596
 	add
 	stloc.3
-// 0x01054ce0: 0x1054ce0: addiu a1, zero, 100
+// 0x01054cf0: 0x1054cf0: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x01054ce4: 0x1054ce4: jal   0x1000f9c addu  a3, s0, zero
+// 0x01054cf4: 0x1054cf4: jal   0x1000f9c addu  a3, s0, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -515,13 +515,13 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054cec: 0x1054cec: addu  a0, zero, zero
+// 0x01054cfc: 0x1054cfc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01054cf0: 0x1054cf0: addiu a1, zero, 1
+// 0x01054d00: 0x1054d00: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01054cf4: 0x1054cf4: jal   0x10a1918 addu  a2, s0, zero
+// 0x01054d04: 0x1054d04: jal   0x10a1f60 addu  a2, s0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -529,32 +529,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054cfc: 0x1054cfc: bne   v0, zero, 0x1054d28 lui   a3, 0x10000
+// 0x01054d0c: 0x1054d0c: bne   v0, zero, 0x1054d38 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1054d28
+	brtrue L_1054d38
 // --- basic block ---
-// 0x01054d04: 0x1054d04: addu  a1, s0, zero
+// 0x01054d14: 0x1054d14: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01054d08: 0x1054d08: addiu a3, a3, 18500
+// 0x01054d18: 0x1054d18: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01054d0c: 0x1054d0c: addu  a0, zero, zero
+// 0x01054d1c: 0x1054d1c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01054d10: 0x1054d10: addu  a2, zero, zero
+// 0x01054d20: 0x1054d20: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01054d14: 0x1054d14: sw    zero, 16(sp)
+// 0x01054d24: 0x1054d24: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -563,7 +563,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054d18: 0x1054d18: sw    zero, 20(sp)
+// 0x01054d28: 0x1054d28: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -572,7 +572,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054d1c: 0x1054d1c: sw    zero, 24(sp)
+// 0x01054d2c: 0x1054d2c: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -581,7 +581,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054d20: 0x1054d20: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x01054d30: 0x1054d30: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -595,24 +595,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1054d28:
-// 0x01054d28: 0x1054d28: lui   s0, 0x70000
+L_1054d38:
+// 0x01054d38: 0x1054d38: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01054d2c: 0x1054d2c: addu  a0, zero, zero
+// 0x01054d3c: 0x1054d3c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01054d30: 0x1054d30: addiu a1, zero, 1
+// 0x01054d40: 0x1054d40: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01054d34: 0x1054d34: jal   0x10a1918 addiu a2, s0, 7356
+// 0x01054d44: 0x1054d44: jal   0x10a1f60 addiu a2, s0, 7820
 	ldloc 7
-	ldc.i4 7356
+	ldc.i4 7820
 	add
 	stloc.3
 	ldloc.0
@@ -620,34 +620,34 @@ L_1054d28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054d3c: 0x1054d3c: bne   v0, zero, 0x1054d80 lui   a3, 0x10000
+// 0x01054d4c: 0x1054d4c: bne   v0, zero, 0x1054d90 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1054d80
+	brtrue L_1054d90
 // --- basic block ---
-// 0x01054d44: 0x1054d44: addiu a1, s0, 7356
+// 0x01054d54: 0x1054d54: addiu a1, s0, 7820
 	ldloc 7
-	ldc.i4 7356
+	ldc.i4 7820
 	add
 	stloc.2
-// 0x01054d48: 0x1054d48: addiu a3, a3, 18500
+// 0x01054d58: 0x1054d58: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01054d4c: 0x1054d4c: addu  a0, zero, zero
+// 0x01054d5c: 0x1054d5c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01054d50: 0x1054d50: addu  a2, zero, zero
+// 0x01054d60: 0x1054d60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01054d54: 0x1054d54: sw    zero, 16(sp)
+// 0x01054d64: 0x1054d64: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -656,7 +656,7 @@ L_1054d28:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054d58: 0x1054d58: sw    zero, 20(sp)
+// 0x01054d68: 0x1054d68: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -665,7 +665,7 @@ L_1054d28:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054d5c: 0x1054d5c: sw    zero, 24(sp)
+// 0x01054d6c: 0x1054d6c: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -674,7 +674,7 @@ L_1054d28:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01054d60: 0x1054d60: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x01054d70: 0x1054d70: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -688,37 +688,37 @@ L_1054d28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054d68: 0x1054d68: j	 0x1054d80 sll   zero, zero, 0
-	br L_1054d80
+// 0x01054d78: 0x1054d78: j	 0x1054d90 sll   zero, zero, 0
+	br L_1054d90
 // --- basic block ---
-L_1054d70:
-// 0x01054d70: 0x1054d70: lui   v0, 0x70000
+L_1054d80:
+// 0x01054d80: 0x1054d80: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1054d74:
-// 0x01054d74: 0x1054d74: sb    zero, 7256(v0)
+L_1054d84:
+// 0x01054d84: 0x1054d84: sb    zero, 7720(v0)
 	ldloc 5
-	ldc.i4 7256
+	ldc.i4 7720
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01054d78: 0x1054d78: lui   v0, 0x70000
+// 0x01054d88: 0x1054d88: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01054d7c: 0x1054d7c: sb    zero, 7356(v0)
+// 0x01054d8c: 0x1054d8c: sb    zero, 7820(v0)
 	ldloc 5
-	ldc.i4 7356
+	ldc.i4 7820
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1054d80:
-// 0x01054d80: 0x1054d80: lw    ra, 36(sp)
-// 0x01054d84: 0x1054d84: lw    s0, 32(sp)
+L_1054d90:
+// 0x01054d90: 0x1054d90: lw    ra, 36(sp)
+// 0x01054d94: 0x1054d94: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -727,7 +727,7 @@ L_1054d80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01054d88: 0x1054d88: jr    ra addiu sp, sp, 40
+// 0x01054d98: 0x1054d98: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -739,7 +739,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_groups_set_active_group_name_1054d90(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_groups_set_active_group_name_1054da0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -774,38 +774,38 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054d90: 0x1054d90: addiu sp, sp, -24
+// 0x01054da0: 0x1054da0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01054d94: 0x1054d94: sw    ra, 20(sp)
-// 0x01054d98: 0x1054d98: beq   a0, zero, 0x1054dc8 addu  a1, a0, zero
+// 0x01054da4: 0x1054da4: sw    ra, 20(sp)
+// 0x01054da8: 0x1054da8: beq   a0, zero, 0x1054dd8 addu  a1, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc.2
-	brfalse L_1054dc8
+	brfalse L_1054dd8
 // --- basic block ---
-// 0x01054da0: 0x1054da0: lb    v0, 0(a0)
+// 0x01054db0: 0x1054db0: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01054da4: 0x1054da4: sll   zero, zero, 0
-// 0x01054da8: 0x1054da8: beq   v0, zero, 0x1054dcc lui   v0, 0x70000
+// 0x01054db4: 0x1054db4: sll   zero, zero, 0
+// 0x01054db8: 0x1054db8: beq   v0, zero, 0x1054ddc lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1054dcc
+	brfalse L_1054ddc
 // --- basic block ---
-// 0x01054db0: 0x1054db0: lui   a0, 0x70000
+// 0x01054dc0: 0x1054dc0: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01054db4: 0x1054db4: addiu a0, a0, 7004
+// 0x01054dc4: 0x1054dc4: addiu a0, a0, 7468
 	ldloc.1
-	ldc.i4 7004
+	ldc.i4 7468
 	add
 	stloc.1
-// 0x01054db8: 0x1054db8: jal   0x1001af8 addiu a2, zero, 250
+// 0x01054dc8: 0x1054dc8: jal   0x1001af8 addiu a2, zero, 250
 	ldc.i4 250
 	stloc.3
 	ldloc.1
@@ -814,24 +814,24 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01054dc0: 0x1054dc0: j	 0x1054dd0 sll   zero, zero, 0
-	br L_1054dd0
+// 0x01054dd0: 0x1054dd0: j	 0x1054de0 sll   zero, zero, 0
+	br L_1054de0
 // --- basic block ---
-L_1054dc8:
-// 0x01054dc8: 0x1054dc8: lui   v0, 0x70000
+L_1054dd8:
+// 0x01054dd8: 0x1054dd8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1054dcc:
-// 0x01054dcc: 0x1054dcc: sb    zero, 7004(v0)
+L_1054ddc:
+// 0x01054ddc: 0x1054ddc: sb    zero, 7468(v0)
 	ldloc 5
-	ldc.i4 7004
+	ldc.i4 7468
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1054dd0:
-// 0x01054dd0: 0x1054dd0: lw    ra, 20(sp)
-// 0x01054dd4: 0x1054dd4: sll   zero, zero, 0
-// 0x01054dd8: 0x1054dd8: jr    ra addiu sp, sp, 24
+L_1054de0:
+// 0x01054de0: 0x1054de0: lw    ra, 20(sp)
+// 0x01054de4: 0x1054de4: sll   zero, zero, 0
+// 0x01054de8: 0x1054de8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -843,7 +843,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_browser_register_launcher_1054de0(int32)
+.method public static int32 roadmap_browser_register_launcher_1054df0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -863,15 +863,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054de0: 0x1054de0: lui   v0, 0x70000
+// 0x01054df0: 0x1054df0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01054de4: 0x1054de4: jr    ra sw    a0, 9064(v0)
+// 0x01054df4: 0x1054df4: jr    ra sw    a0, 9528(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2266
+	ldc.i4 2382
 	add
 	ldloc.0
 	stelem.i4
@@ -880,7 +880,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_browser_register_close_1054dec(int32)
+.method public static int32 roadmap_browser_register_close_1054dfc(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -900,15 +900,15 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054dec: 0x1054dec: lui   v0, 0x70000
+// 0x01054dfc: 0x1054dfc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01054df0: 0x1054df0: jr    ra sw    a0, 9072(v0)
+// 0x01054e00: 0x1054e00: jr    ra sw    a0, 9536(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2268
+	ldc.i4 2384
 	add
 	ldloc.0
 	stelem.i4
@@ -917,7 +917,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_browser_hide_1054df8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_hide_1054e08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -952,28 +952,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054df8: 0x1054df8: lui   v0, 0x70000
+// 0x01054e08: 0x1054e08: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01054dfc: 0x1054dfc: lw    v0, 9072(v0)
+// 0x01054e0c: 0x1054e0c: lw    v0, 9536(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2268
+	ldc.i4 2384
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054e00: 0x1054e00: addiu sp, sp, -24
+// 0x01054e10: 0x1054e10: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01054e04: 0x1054e04: beq   v0, zero, 0x1054e14 sw    ra, 20(sp)
+// 0x01054e14: 0x1054e14: beq   v0, zero, 0x1054e24 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_1054e14
+	brfalse L_1054e24
 // --- basic block ---
-// 0x01054e0c: 0x1054e0c: jalr  v0 sll   zero, zero, 0
+// 0x01054e1c: 0x1054e1c: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -985,10 +985,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1054e14:
-// 0x01054e14: 0x1054e14: lw    ra, 20(sp)
-// 0x01054e18: 0x1054e18: sll   zero, zero, 0
-// 0x01054e1c: 0x1054e1c: jr    ra addiu sp, sp, 24
+L_1054e24:
+// 0x01054e24: 0x1054e24: lw    ra, 20(sp)
+// 0x01054e28: 0x1054e28: sll   zero, zero, 0
+// 0x01054e2c: 0x1054e2c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1000,7 +1000,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_browser_set_button_attrs_1054e40(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_set_button_attrs_1054e50(int32,int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1035,77 +1035,77 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054e40: 0x1054e40: andi  v0, a1, 1
+// 0x01054e50: 0x1054e50: andi  v0, a1, 1
 	ldloc.2
 	ldc.i4.1
 	and
 	stloc 5
-// 0x01054e44: 0x1054e44: bne   v0, zero, 0x1054e70 addu  v1, zero, zero
+// 0x01054e54: 0x1054e54: bne   v0, zero, 0x1054e80 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1054e70
+	brtrue L_1054e80
 // --- basic block ---
-// 0x01054e4c: 0x1054e4c: andi  v0, a1, 2
+// 0x01054e5c: 0x1054e5c: andi  v0, a1, 2
 	ldloc.2
 	ldc.i4.2
 	and
 	stloc 5
-// 0x01054e50: 0x1054e50: bne   v0, zero, 0x1054e70 addiu v1, zero, 1
+// 0x01054e60: 0x1054e60: bne   v0, zero, 0x1054e80 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brtrue L_1054e70
+	brtrue L_1054e80
 // --- basic block ---
-// 0x01054e58: 0x1054e58: andi  v0, a1, 4
+// 0x01054e68: 0x1054e68: andi  v0, a1, 4
 	ldloc.2
 	ldc.i4.4
 	and
 	stloc 5
-// 0x01054e5c: 0x1054e5c: bne   v0, zero, 0x1054e70 addiu v1, zero, 2
+// 0x01054e6c: 0x1054e6c: bne   v0, zero, 0x1054e80 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brtrue L_1054e70
+	brtrue L_1054e80
 // --- basic block ---
-// 0x01054e64: 0x1054e64: andi  a1, a1, 8
+// 0x01054e74: 0x1054e74: andi  a1, a1, 8
 	ldloc.2
 	ldc.i4.8
 	and
 	stloc.2
-// 0x01054e68: 0x1054e68: beq   a1, zero, 0x1054e9c addiu v1, zero, 3
+// 0x01054e78: 0x1054e78: beq   a1, zero, 0x1054eac addiu v1, zero, 3
 	ldloc.2
 	ldc.i4.3
 	stloc 6
-	brfalse L_1054e9c
+	brfalse L_1054eac
 // --- basic block ---
-L_1054e70:
-// 0x01054e70: 0x1054e70: sll   v0, v1, 4
+L_1054e80:
+// 0x01054e80: 0x1054e80: sll   v0, v1, 4
 	ldloc 6
 	ldc.i4.4
 	shl
 	stloc 5
-// 0x01054e74: 0x1054e74: addiu v0, v0, 8
+// 0x01054e84: 0x1054e84: addiu v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01054e78: 0x1054e78: sll   v1, v1, 4
+// 0x01054e88: 0x1054e88: sll   v1, v1, 4
 	ldloc 6
 	ldc.i4.4
 	shl
 	stloc 6
-// 0x01054e7c: 0x1054e7c: addu  v1, a0, v1
+// 0x01054e8c: 0x1054e8c: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x01054e80: 0x1054e80: addu  a0, a0, v0
+// 0x01054e90: 0x1054e90: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x01054e84: 0x1054e84: lw    v0, 20(sp)
+// 0x01054e94: 0x1054e94: lw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1114,7 +1114,7 @@ L_1054e70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054e88: 0x1054e88: sw    a2, 4(a0)
+// 0x01054e98: 0x1054e98: sw    a2, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ L_1054e70:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01054e8c: 0x1054e8c: sw    v0, 8(v1)
+// 0x01054e9c: 0x1054e9c: sw    v0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1132,7 +1132,7 @@ L_1054e70:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01054e90: 0x1054e90: lw    v0, 16(sp)
+// 0x01054ea0: 0x1054ea0: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1141,7 +1141,7 @@ L_1054e70:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054e94: 0x1054e94: sw    a3, 8(a0)
+// 0x01054ea4: 0x1054ea4: sw    a3, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -1150,7 +1150,7 @@ L_1054e70:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01054e98: 0x1054e98: sw    v0, 4(v1)
+// 0x01054ea8: 0x1054ea8: sw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1159,8 +1159,8 @@ L_1054e70:
 	add
 	ldloc 5
 	stelem.i4
-L_1054e9c:
-// 0x01054e9c: 0x1054e9c: jr    ra sll   zero, zero, 0
+L_1054eac:
+// 0x01054eac: 0x1054eac: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
@@ -1168,7 +1168,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_browser_reset_attributes_1054ea4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_reset_attributes_1054eb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1203,16 +1203,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054ea4: 0x1054ea4: addiu sp, sp, -24
+// 0x01054eb4: 0x1054eb4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01054ea8: 0x1054ea8: addu  a1, zero, zero
+// 0x01054eb8: 0x1054eb8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01054eac: 0x1054eac: sw    ra, 20(sp)
-// 0x01054eb0: 0x1054eb0: jal   0x100177c addiu a2, zero, 72
+// 0x01054ebc: 0x1054ebc: sw    ra, 20(sp)
+// 0x01054ec0: 0x1054ec0: jal   0x100177c addiu a2, zero, 72
 	ldc.i4.s 72
 	stloc.3
 	ldloc.1
@@ -1224,9 +1224,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01054eb8: 0x1054eb8: lw    ra, 20(sp)
-// 0x01054ebc: 0x1054ebc: sll   zero, zero, 0
-// 0x01054ec0: 0x1054ec0: jr    ra addiu sp, sp, 24
+// 0x01054ec8: 0x1054ec8: lw    ra, 20(sp)
+// 0x01054ecc: 0x1054ecc: sll   zero, zero, 0
+// 0x01054ed0: 0x1054ed0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1238,7 +1238,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_dlg_close_1054ec8(int32,int32,int32,int32,int32)
+.method public static int32 on_dlg_close_1054ed8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1276,15 +1276,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054ec8: 0x1054ec8: addiu sp, sp, -32
+// 0x01054ed8: 0x1054ed8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01054ecc: 0x1054ecc: lui   v0, 0x70000
+// 0x01054edc: 0x1054edc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01054ed0: 0x1054ed0: sw    s0, 24(sp)
+// 0x01054ee0: 0x1054ee0: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1293,39 +1293,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01054ed4: 0x1054ed4: lui   a1, 0x10000
+// 0x01054ee4: 0x1054ee4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01054ed8: 0x1054ed8: lw    s0, 9144(v0)
+// 0x01054ee8: 0x1054ee8: lw    s0, 9608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2286
+	ldc.i4 2402
 	add
 	ldelem.i4
 	stloc 7
-// 0x01054edc: 0x1054edc: lui   a3, 0x10000
+// 0x01054eec: 0x1054eec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01054ee0: 0x1054ee0: addiu a1, a1, 6660
+// 0x01054ef0: 0x1054ef0: addiu a1, a1, 6656
 	ldloc.2
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x01054ee4: 0x1054ee4: addiu a3, a3, 6688
+// 0x01054ef4: 0x1054ef4: addiu a3, a3, 6684
 	ldloc 4
-	ldc.i4 6688
+	ldc.i4 6684
 	add
 	stloc 4
-// 0x01054ee8: 0x1054ee8: addiu a0, zero, 3
+// 0x01054ef8: 0x1054ef8: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01054eec: 0x1054eec: addiu a2, zero, 335
+// 0x01054efc: 0x1054efc: addiu a2, zero, 335
 	ldc.i4 335
 	stloc.3
-// 0x01054ef0: 0x1054ef0: sw    ra, 28(sp)
-// 0x01054ef4: 0x1054ef4: jal   0x100449c sw    s0, 16(sp)
+// 0x01054f00: 0x1054f00: sw    ra, 28(sp)
+// 0x01054f04: 0x1054f04: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1344,24 +1344,24 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054efc: 0x1054efc: lui   v0, 0x70000
+// 0x01054f0c: 0x1054f0c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01054f00: 0x1054f00: lw    v0, 9072(v0)
+// 0x01054f10: 0x1054f10: lw    v0, 9536(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2268
+	ldc.i4 2384
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054f04: 0x1054f04: sll   zero, zero, 0
-// 0x01054f08: 0x1054f08: beq   v0, zero, 0x1054f18 sll   zero, zero, 0
+// 0x01054f14: 0x1054f14: sll   zero, zero, 0
+// 0x01054f18: 0x1054f18: beq   v0, zero, 0x1054f28 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1054f18
+	brfalse L_1054f28
 // --- basic block ---
-// 0x01054f10: 0x1054f10: jalr  v0 sll   zero, zero, 0
+// 0x01054f20: 0x1054f20: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -1373,12 +1373,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1054f18:
-// 0x01054f18: 0x1054f18: beq   s0, zero, 0x1054f28 sll   zero, zero, 0
+L_1054f28:
+// 0x01054f28: 0x1054f28: beq   s0, zero, 0x1054f38 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1054f28
+	brfalse L_1054f38
 // --- basic block ---
-// 0x01054f20: 0x1054f20: jalr  s0 sll   zero, zero, 0
+// 0x01054f30: 0x1054f30: jalr  s0 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
 	ldloc.1
@@ -1390,9 +1390,9 @@ L_1054f18:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1054f28:
-// 0x01054f28: 0x1054f28: lw    ra, 28(sp)
-// 0x01054f2c: 0x1054f2c: lw    s0, 24(sp)
+L_1054f38:
+// 0x01054f38: 0x1054f38: lw    ra, 28(sp)
+// 0x01054f3c: 0x1054f3c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1401,7 +1401,7 @@ L_1054f28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01054f30: 0x1054f30: jr    ra addiu sp, sp, 32
+// 0x01054f40: 0x1054f40: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1413,7 +1413,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_browser_show_embeded_1054f38(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_show_embeded_1054f48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1448,79 +1448,79 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054f38: 0x1054f38: lui   v0, 0x70000
+// 0x01054f48: 0x1054f48: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01054f3c: 0x1054f3c: lw    v0, 9064(v0)
+// 0x01054f4c: 0x1054f4c: lw    v0, 9528(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2266
+	ldc.i4 2382
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054f40: 0x1054f40: addiu sp, sp, -24
+// 0x01054f50: 0x1054f50: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01054f44: 0x1054f44: bne   v0, zero, 0x1054f68 sw    ra, 20(sp)
+// 0x01054f54: 0x1054f54: bne   v0, zero, 0x1054f78 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1054f68
+	brtrue L_1054f78
 // --- basic block ---
-// 0x01054f4c: 0x1054f4c: lui   a1, 0x10000
+// 0x01054f5c: 0x1054f5c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01054f50: 0x1054f50: lui   a3, 0x10000
+// 0x01054f60: 0x1054f60: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01054f54: 0x1054f54: addiu a1, a1, 6660
+// 0x01054f64: 0x1054f64: addiu a1, a1, 6656
 	ldloc.2
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x01054f58: 0x1054f58: addiu a3, a3, 6704
+// 0x01054f68: 0x1054f68: addiu a3, a3, 6700
 	ldloc 4
-	ldc.i4 6704
+	ldc.i4 6700
 	add
 	stloc 4
-// 0x01054f5c: 0x1054f5c: addiu a0, zero, 4
+// 0x01054f6c: 0x1054f6c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01054f60: 0x1054f60: j	 0x1054f84 addiu a2, zero, 126
+// 0x01054f70: 0x1054f70: j	 0x1054f94 addiu a2, zero, 126
 	ldc.i4.s 126
 	stloc.3
-	br L_1054f84
+	br L_1054f94
 // --- basic block ---
-L_1054f68:
-// 0x01054f68: 0x1054f68: bne   a0, zero, 0x1054f94 lui   a1, 0x10000
+L_1054f78:
+// 0x01054f78: 0x1054f78: bne   a0, zero, 0x1054fa4 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1054f94
+	brtrue L_1054fa4
 // --- basic block ---
-// 0x01054f70: 0x1054f70: lui   a3, 0x10000
+// 0x01054f80: 0x1054f80: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01054f74: 0x1054f74: addiu a1, a1, 6660
+// 0x01054f84: 0x1054f84: addiu a1, a1, 6656
 	ldloc.2
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x01054f78: 0x1054f78: addiu a3, a3, 6776
+// 0x01054f88: 0x1054f88: addiu a3, a3, 6772
 	ldloc 4
-	ldc.i4 6776
+	ldc.i4 6772
 	add
 	stloc 4
-// 0x01054f7c: 0x1054f7c: addiu a0, zero, 4
+// 0x01054f8c: 0x1054f8c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01054f80: 0x1054f80: addiu a2, zero, 132
+// 0x01054f90: 0x1054f90: addiu a2, zero, 132
 	ldc.i4 132
 	stloc.3
-L_1054f84:
-// 0x01054f84: 0x1054f84: jal   0x100449c sll   zero, zero, 0
+L_1054f94:
+// 0x01054f94: 0x1054f94: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1531,11 +1531,11 @@ L_1054f84:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01054f8c: 0x1054f8c: j	 0x1054fa8 sll   zero, zero, 0
-	br L_1054fa8
+// 0x01054f9c: 0x1054f9c: j	 0x1054fb8 sll   zero, zero, 0
+	br L_1054fb8
 // --- basic block ---
-L_1054f94:
-// 0x01054f94: 0x1054f94: lw    a1, 2064(a0)
+L_1054fa4:
+// 0x01054fa4: 0x1054fa4: lw    a1, 2064(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -1544,13 +1544,13 @@ L_1054f94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01054f98: 0x1054f98: sll   zero, zero, 0
-// 0x01054f9c: 0x1054f9c: ori   a1, a1, 128
+// 0x01054fa8: 0x1054fa8: sll   zero, zero, 0
+// 0x01054fac: 0x1054fac: ori   a1, a1, 128
 	ldloc.2
 	ldc.i4 128
 	or
 	stloc.2
-// 0x01054fa0: 0x1054fa0: jalr  v0 sw    a1, 2064(a0)
+// 0x01054fb0: 0x1054fb0: jalr  v0 sw    a1, 2064(a0)
 	ldloc 5
 	ldloc 6
 	ldloc.1
@@ -1570,10 +1570,10 @@ L_1054f94:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_1054fa8:
-// 0x01054fa8: 0x1054fa8: lw    ra, 20(sp)
-// 0x01054fac: 0x1054fac: sll   zero, zero, 0
-// 0x01054fb0: 0x1054fb0: jr    ra addiu sp, sp, 24
+L_1054fb8:
+// 0x01054fb8: 0x1054fb8: lw    ra, 20(sp)
+// 0x01054fbc: 0x1054fbc: sll   zero, zero, 0
+// 0x01054fc0: 0x1054fc0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1585,7 +1585,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_browser_show_ssd_1054fb8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_show_ssd_1054fc8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 s3,int32 s4,int32 s7,int32 ra)
@@ -1644,24 +1644,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01054fb8: 0x1054fb8: lui   v0, 0x70000
+// 0x01054fc8: 0x1054fc8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01054fbc: 0x1054fbc: lw    v0, 9064(v0)
+// 0x01054fcc: 0x1054fcc: lw    v0, 9528(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2266
+	ldc.i4 2382
 	add
 	ldelem.i4
 	stloc 5
-// 0x01054fc0: 0x1054fc0: addiu sp, sp, -2296
+// 0x01054fd0: 0x1054fd0: addiu sp, sp, -2296
 	ldloc.0
 	ldc.i4 -2296
 	add
 	stloc.0
-// 0x01054fc4: 0x1054fc4: sw    s4, 2276(sp)
+// 0x01054fd4: 0x1054fd4: sw    s4, 2276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1670,7 +1670,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01054fc8: 0x1054fc8: sw    s2, 2268(sp)
+// 0x01054fd8: 0x1054fd8: sw    s2, 2268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1679,8 +1679,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01054fcc: 0x1054fcc: sw    ra, 2292(sp)
-// 0x01054fd0: 0x1054fd0: sw    s7, 2288(sp)
+// 0x01054fdc: 0x1054fdc: sw    ra, 2292(sp)
+// 0x01054fe0: 0x1054fe0: sw    s7, 2288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1689,7 +1689,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01054fd4: 0x1054fd4: sw    s6, 2284(sp)
+// 0x01054fe4: 0x1054fe4: sw    s6, 2284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1698,7 +1698,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01054fd8: 0x1054fd8: sw    s5, 2280(sp)
+// 0x01054fe8: 0x1054fe8: sw    s5, 2280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1707,7 +1707,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01054fdc: 0x1054fdc: sw    s3, 2272(sp)
+// 0x01054fec: 0x1054fec: sw    s3, 2272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1716,7 +1716,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01054fe0: 0x1054fe0: sw    s1, 2264(sp)
+// 0x01054ff0: 0x1054ff0: sw    s1, 2264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1725,7 +1725,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01054fe4: 0x1054fe4: sw    s0, 2260(sp)
+// 0x01054ff4: 0x1054ff4: sw    s0, 2260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1734,35 +1734,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01054fe8: 0x1054fe8: addu  s4, a0, zero
+// 0x01054ff8: 0x1054ff8: addu  s4, a0, zero
 	ldloc.1
 	stloc 14
-// 0x01054fec: 0x1054fec: bne   v0, zero, 0x1055018 addu  s2, a1, zero
+// 0x01054ffc: 0x1054ffc: bne   v0, zero, 0x1055028 addu  s2, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 10
-	brtrue L_1055018
+	brtrue L_1055028
 // --- basic block ---
-// 0x01054ff4: 0x1054ff4: lui   a1, 0x10000
+// 0x01055004: 0x1055004: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01054ff8: 0x1054ff8: lui   a3, 0x10000
+// 0x01055008: 0x1055008: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01054ffc: 0x1054ffc: addiu a1, a1, 6660
+// 0x0105500c: 0x105500c: addiu a1, a1, 6656
 	ldloc.2
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x01055000: 0x1055000: addiu a3, a3, 6828
+// 0x01055010: 0x1055010: addiu a3, a3, 6824
 	ldloc 4
-	ldc.i4 6828
+	ldc.i4 6824
 	add
 	stloc 4
-// 0x01055004: 0x1055004: addiu a0, zero, 4
+// 0x01055014: 0x1055014: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01055008: 0x1055008: jal   0x100449c addiu a2, zero, 372
+// 0x01055018: 0x1055018: jal   0x100449c addiu a2, zero, 372
 	ldc.i4 372
 	stloc.3
 	ldloc.0
@@ -1775,40 +1775,40 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055010: 0x1055010: j	 0x10551c0 sll   zero, zero, 0
-	br L_10551c0
+// 0x01055020: 0x1055020: j	 0x10551d0 sll   zero, zero, 0
+	br L_10551d0
 // --- basic block ---
-L_1055018:
-// 0x01055018: 0x1055018: lui   s0, 0x70000
+L_1055028:
+// 0x01055028: 0x1055028: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105501c: 0x105501c: lw    v0, 9068(s0)
+// 0x0105502c: 0x105502c: lw    v0, 9532(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2267
+	ldc.i4 2383
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055020: 0x1055020: sll   zero, zero, 0
-// 0x01055024: 0x1055024: beq   v0, zero, 0x1055044 andi  a3, s2, 256
+// 0x01055030: 0x1055030: sll   zero, zero, 0
+// 0x01055034: 0x1055034: beq   v0, zero, 0x1055054 andi  a3, s2, 256
 	ldloc 5
 	ldloc 10
 	ldc.i4 256
 	and
 	stloc 4
-	brfalse L_1055044
+	brfalse L_1055054
 // --- basic block ---
-// 0x0105502c: 0x105502c: lui   a0, 0x10000
+// 0x0105503c: 0x105503c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055030: 0x1055030: addiu a0, a0, 6868
+// 0x01055040: 0x1055040: addiu a0, a0, 6864
 	ldloc.1
-	ldc.i4 6868
+	ldc.i4 6864
 	add
 	stloc.1
-// 0x01055034: 0x1055034: jal   0x1094218 addu  a1, zero, zero
+// 0x01055044: 0x1055044: jal   0x109483c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1816,61 +1816,61 @@ L_1055018:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_free_1094218(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_free_109483c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105503c: 0x105503c: sw    zero, 9068(s0)
+// 0x0105504c: 0x105504c: sw    zero, 9532(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2267
+	ldc.i4 2383
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01055040: 0x1055040: andi  a3, s2, 256
+// 0x01055050: 0x1055050: andi  a3, s2, 256
 	ldloc 10
 	ldc.i4 256
 	and
 	stloc 4
-L_1055044:
-// 0x01055044: 0x1055044: lui   s1, 0x10000
+L_1055054:
+// 0x01055054: 0x1055054: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01055048: 0x1055048: sltiu a3, a3, 1
+// 0x01055058: 0x1055058: sltiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	clt.un
 	stloc 4
-// 0x0105504c: 0x105504c: lui   a1, 0x10000
+// 0x0105505c: 0x105505c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055050: 0x1055050: lui   a2, 0x1050000
+// 0x01055060: 0x1055060: lui   a2, 0x1050000
 	ldc.i4 17104896
 	stloc.3
-// 0x01055054: 0x1055054: addiu a0, s1, 6868
+// 0x01055064: 0x1055064: addiu a0, s1, 6864
 	ldloc 9
-	ldc.i4 6868
+	ldc.i4 6864
 	add
 	stloc.1
-// 0x01055058: 0x1055058: addiu a1, a1, 18500
+// 0x01055068: 0x1055068: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0105505c: 0x105505c: addiu a2, a2, 20168
+// 0x0105506c: 0x105506c: addiu a2, a2, 20184
 	ldloc.3
-	ldc.i4 20168
+	ldc.i4 20184
 	add
 	stloc.3
-// 0x01055060: 0x1055060: sll   a3, a3, 13
+// 0x01055070: 0x1055070: sll   a3, a3, 13
 	ldloc 4
 	ldc.i4.s 13
 	shl
 	stloc 4
-// 0x01055064: 0x1055064: jal   0x1095a08 lui   s3, 0x10000
+// 0x01055074: 0x1055074: jal   0x1096050 lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 13
 	ldloc.0
@@ -1878,38 +1878,38 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105506c: 0x105506c: lui   s0, 0x70000
+// 0x0105507c: 0x105507c: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01055070: 0x1055070: addiu a3, zero, -2
+// 0x01055080: 0x1055080: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x01055074: 0x1055074: addiu a2, zero, -2
+// 0x01055084: 0x1055084: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01055078: 0x1055078: addiu a0, s3, 6884
+// 0x01055088: 0x1055088: addiu a0, s3, 6880
 	ldloc 13
-	ldc.i4 6884
+	ldc.i4 6880
 	add
 	stloc.1
-// 0x0105507c: 0x105507c: addu  a1, zero, zero
+// 0x0105508c: 0x105508c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01055080: 0x1055080: sw    v0, 9068(s0)
+// 0x01055090: 0x1055090: sw    v0, 9532(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2267
+	ldc.i4 2383
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055084: 0x1055084: jal   0x1093a24 sw    zero, 16(sp)
+// 0x01055094: 0x1055094: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1923,36 +1923,36 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105508c: 0x105508c: lw    a0, 9068(s0)
+// 0x0105509c: 0x105509c: lw    a0, 9532(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2267
+	ldc.i4 2383
 	add
 	ldelem.i4
 	stloc.1
-// 0x01055090: 0x1055090: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010550a0: 0x10550a0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055098: 0x1055098: addiu a0, s1, 6868
+// 0x010550a8: 0x10550a8: addiu a0, s1, 6864
 	ldloc 9
-	ldc.i4 6868
+	ldc.i4 6864
 	add
 	stloc.1
-// 0x0105509c: 0x105509c: jal   0x1095eec addu  a1, zero, zero
+// 0x010550ac: 0x10550ac: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -1960,36 +1960,36 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010550a4: 0x10550a4: lui   s5, 0x70000
+// 0x010550b4: 0x10550b4: lui   s5, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x010550a8: 0x10550a8: lui   a1, 0x10000
+// 0x010550b8: 0x10550b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010550ac: 0x10550ac: addu  a0, v0, zero
+// 0x010550bc: 0x10550bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010550b0: 0x10550b0: addiu a1, a1, 6916
+// 0x010550c0: 0x10550c0: addiu a1, a1, 6912
 	ldloc.2
-	ldc.i4 6916
+	ldc.i4 6912
 	add
 	stloc.2
-// 0x010550b4: 0x10550b4: addiu s5, s5, 9076
+// 0x010550c4: 0x10550c4: addiu s5, s5, 9540
 	ldloc 11
-	ldc.i4 9076
+	ldc.i4 9540
 	add
 	stloc 11
-// 0x010550b8: 0x10550b8: jal   0x109b304 sw    v0, 9068(s0)
+// 0x010550c8: 0x10550c8: jal   0x109b94c sw    v0, 9532(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2267
+	ldc.i4 2383
 	add
 	ldloc 5
 	stelem.i4
@@ -1998,23 +1998,23 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010550c0: 0x10550c0: addiu a2, zero, 68
+// 0x010550d0: 0x10550d0: addiu a2, zero, 68
 	ldc.i4.s 68
 	stloc.3
-// 0x010550c4: 0x10550c4: addiu a0, sp, 40
+// 0x010550d4: 0x10550d4: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x010550c8: 0x10550c8: addu  a1, s5, zero
+// 0x010550d8: 0x10550d8: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x010550cc: 0x10550cc: jal   0x1001800 addu  s6, v0, zero
+// 0x010550dc: 0x10550dc: jal   0x1001800 addu  s6, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
@@ -2026,7 +2026,7 @@ L_1055044:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010550d4: 0x10550d4: lw    s7, 40(sp)
+// 0x010550e4: 0x10550e4: lw    s7, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2035,15 +2035,15 @@ L_1055044:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010550d8: 0x10550d8: lui   a1, 0x10000
+// 0x010550e8: 0x10550e8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010550dc: 0x10550dc: addiu a1, a1, 328
+// 0x010550ec: 0x10550ec: addiu a1, a1, 324
 	ldloc.2
-	ldc.i4 328
+	ldc.i4 324
 	add
 	stloc.2
-// 0x010550e0: 0x10550e0: jal   0x109b304 addu  a0, s6, zero
+// 0x010550f0: 0x10550f0: jal   0x109b94c addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -2051,15 +2051,15 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010550e8: 0x10550e8: addu  a0, s7, zero
+// 0x010550f8: 0x10550f8: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-// 0x010550ec: 0x10550ec: jal   0x101cd60 addu  s6, v0, zero
+// 0x010550fc: 0x10550fc: jal   0x101cd70 addu  s6, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2067,15 +2067,15 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010550f4: 0x10550f4: addu  a1, v0, zero
+// 0x01055104: 0x1055104: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010550f8: 0x10550f8: jal   0x1097e5c addu  a0, s6, zero
+// 0x01055108: 0x1055108: jal   0x10984a4 addu  a0, s6, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -2083,14 +2083,14 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055100: 0x1055100: jal   0x10957d8 addiu a0, s1, 6868
+// 0x01055110: 0x1055110: jal   0x1095e20 addiu a0, s1, 6864
 	ldloc 9
-	ldc.i4 6868
+	ldc.i4 6864
 	add
 	stloc.1
 	ldloc.0
@@ -2098,23 +2098,23 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_recalculate_10957d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_recalculate_1095e20(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055108: 0x1055108: lw    a0, 9068(s0)
+// 0x01055118: 0x1055118: lw    a0, 9532(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2267
+	ldc.i4 2383
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105510c: 0x105510c: jal   0x109b304 addiu a1, s3, 6884
+// 0x0105511c: 0x105511c: jal   0x109b94c addiu a1, s3, 6880
 	ldloc 13
-	ldc.i4 6884
+	ldc.i4 6880
 	add
 	stloc.2
 	ldloc.0
@@ -2122,29 +2122,29 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055114: 0x1055114: lw    a0, 9068(s0)
+// 0x01055124: 0x1055124: lw    a0, 9532(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2267
+	ldc.i4 2383
 	add
 	ldelem.i4
 	stloc.1
-// 0x01055118: 0x1055118: addiu a1, sp, 24
+// 0x01055128: 0x1055128: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0105511c: 0x105511c: addu  a2, zero, zero
+// 0x0105512c: 0x105512c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01055120: 0x1055120: jal   0x1099350 sw    v0, 2248(sp)
+// 0x01055130: 0x1055130: jal   0x1099998 sw    v0, 2248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2158,12 +2158,12 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055128: 0x1055128: lw    v0, 2248(sp)
+// 0x01055138: 0x1055138: lw    v0, 2248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2172,15 +2172,15 @@ L_1055044:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105512c: 0x105512c: addiu a1, sp, 32
+// 0x0105513c: 0x105513c: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01055130: 0x1055130: addu  a0, v0, zero
+// 0x01055140: 0x1055140: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055134: 0x1055134: jal   0x1099350 addu  a2, zero, zero
+// 0x01055144: 0x1055144: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2188,34 +2188,34 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105513c: 0x105513c: jal   0x109483c sll   zero, zero, 0
+// 0x0105514c: 0x105514c: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055144: 0x1055144: addu  a1, s5, zero
+// 0x01055154: 0x1055154: addu  a1, s5, zero
 	ldloc 11
 	stloc.2
-// 0x01055148: 0x1055148: addiu a0, sp, 2176
+// 0x01055158: 0x1055158: addiu a0, sp, 2176
 	ldloc.0
 	ldc.i4 2176
 	add
 	stloc.1
-// 0x0105514c: 0x105514c: addiu a2, zero, 72
+// 0x0105515c: 0x105515c: addiu a2, zero, 72
 	ldc.i4.s 72
 	stloc.3
-// 0x01055150: 0x1055150: jal   0x1001800 sw    s2, 2172(sp)
+// 0x01055160: 0x1055160: jal   0x1001800 sw    s2, 2172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2233,31 +2233,31 @@ L_1055044:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055158: 0x1055158: lui   v0, 0xf0000
+// 0x01055168: 0x1055168: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105515c: 0x105515c: lw    s0, -30068(v0)
+// 0x0105516c: 0x105516c: lw    s0, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 8
-// 0x01055160: 0x1055160: lui   v0, 0xf0000
+// 0x01055170: 0x1055170: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01055164: 0x1055164: lw    s2, -30072(v0)
+// 0x01055174: 0x1055174: lw    s2, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 10
-// 0x01055168: 0x1055168: lw    s1, 28(sp)
+// 0x01055178: 0x1055178: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2266,7 +2266,7 @@ L_1055044:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105516c: 0x105516c: lw    v0, 36(sp)
+// 0x0105517c: 0x105517c: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2275,43 +2275,43 @@ L_1055044:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055170: 0x1055170: addiu s2, s2, -1
+// 0x01055180: 0x1055180: addiu s2, s2, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x01055174: 0x1055174: jal   0x1042430 subu  s1, s1, v0
+// 0x01055184: 0x1055184: jal   0x1042440 subu  s1, s1, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 9
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105517c: 0x105517c: subu  v0, s2, v0
+// 0x0105518c: 0x105518c: subu  v0, s2, v0
 	ldloc 10
 	ldloc 5
 	sub
 	stloc 5
-// 0x01055180: 0x1055180: addiu a0, sp, 124
+// 0x01055190: 0x1055190: addiu a0, sp, 124
 	ldloc.0
 	ldc.i4.s 124
 	add
 	stloc.1
-// 0x01055184: 0x1055184: addu  a1, s4, zero
+// 0x01055194: 0x1055194: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x01055188: 0x1055188: addiu a2, zero, 2048
+// 0x01055198: 0x1055198: addiu a2, zero, 2048
 	ldc.i4 2048
 	stloc.3
-// 0x0105518c: 0x105518c: addiu s0, s0, -1
+// 0x0105519c: 0x105519c: addiu s0, s0, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01055190: 0x1055190: sw    v0, 120(sp)
+// 0x010551a0: 0x10551a0: sw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2320,7 +2320,7 @@ L_1055044:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055194: 0x1055194: sw    s1, 112(sp)
+// 0x010551a4: 0x10551a4: sw    s1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2329,7 +2329,7 @@ L_1055044:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01055198: 0x1055198: sw    s0, 116(sp)
+// 0x010551a8: 0x10551a8: sw    s0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2338,7 +2338,7 @@ L_1055044:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105519c: 0x105519c: jal   0x1001af8 sw    zero, 108(sp)
+// 0x010551ac: 0x10551ac: jal   0x1001af8 sw    zero, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2353,7 +2353,7 @@ L_1055044:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010551a4: 0x10551a4: jal   0x109483c sb    zero, 2171(sp)
+// 0x010551b4: 0x10551b4: jal   0x1094e60 sb    zero, 2171(sp)
 	ldloc.0
 	ldc.i4 2171
 	add
@@ -2364,25 +2364,25 @@ L_1055044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010551ac: 0x10551ac: lui   v0, 0x70000
+// 0x010551bc: 0x10551bc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010551b0: 0x10551b0: lw    v0, 9064(v0)
+// 0x010551c0: 0x10551c0: lw    v0, 9528(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2266
+	ldc.i4 2382
 	add
 	ldelem.i4
 	stloc 5
-// 0x010551b4: 0x10551b4: sll   zero, zero, 0
-// 0x010551b8: 0x10551b8: jalr  v0 addiu a0, sp, 108
+// 0x010551c4: 0x10551c4: sll   zero, zero, 0
+// 0x010551c8: 0x10551c8: jalr  v0 addiu a0, sp, 108
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 108
@@ -2398,9 +2398,9 @@ L_1055044:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10551c0:
-// 0x010551c0: 0x10551c0: lw    ra, 2292(sp)
-// 0x010551c4: 0x10551c4: lw    s7, 2288(sp)
+L_10551d0:
+// 0x010551d0: 0x10551d0: lw    ra, 2292(sp)
+// 0x010551d4: 0x10551d4: lw    s7, 2288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2409,7 +2409,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010551c8: 0x10551c8: lw    s6, 2284(sp)
+// 0x010551d8: 0x10551d8: lw    s6, 2284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2418,7 +2418,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010551cc: 0x10551cc: lw    s5, 2280(sp)
+// 0x010551dc: 0x10551dc: lw    s5, 2280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2427,7 +2427,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010551d0: 0x10551d0: lw    s4, 2276(sp)
+// 0x010551e0: 0x10551e0: lw    s4, 2276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2436,7 +2436,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010551d4: 0x10551d4: lw    s3, 2272(sp)
+// 0x010551e4: 0x10551e4: lw    s3, 2272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2445,7 +2445,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010551d8: 0x10551d8: lw    s2, 2268(sp)
+// 0x010551e8: 0x10551e8: lw    s2, 2268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2454,7 +2454,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010551dc: 0x10551dc: lw    s1, 2264(sp)
+// 0x010551ec: 0x10551ec: lw    s1, 2264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2463,7 +2463,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010551e0: 0x10551e0: lw    s0, 2260(sp)
+// 0x010551f0: 0x10551f0: lw    s0, 2260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2472,7 +2472,7 @@ L_10551c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010551e4: 0x10551e4: jr    ra addiu sp, sp, 2296
+// 0x010551f4: 0x10551f4: jr    ra addiu sp, sp, 2296
 	ldloc.0
 	ldc.i4 2296
 	add
@@ -2484,7 +2484,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_browser_show_extended_10551ec(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_show_extended_10551fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -2525,12 +2525,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010551ec: 0x10551ec: addiu sp, sp, -32
+// 0x010551fc: 0x10551fc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010551f0: 0x10551f0: sw    s1, 24(sp)
+// 0x01055200: 0x1055200: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2539,13 +2539,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010551f4: 0x10551f4: addu  s1, a0, zero
+// 0x01055204: 0x1055204: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010551f8: 0x10551f8: lui   a0, 0x70000
+// 0x01055208: 0x1055208: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010551fc: 0x10551fc: sw    s0, 20(sp)
+// 0x0105520c: 0x105520c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2554,19 +2554,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01055200: 0x1055200: addiu a0, a0, 9076
+// 0x01055210: 0x1055210: addiu a0, a0, 9540
 	ldloc.1
-	ldc.i4 9076
+	ldc.i4 9540
 	add
 	stloc.1
-// 0x01055204: 0x1055204: addu  s0, a1, zero
+// 0x01055214: 0x1055214: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x01055208: 0x1055208: addu  a1, a2, zero
+// 0x01055218: 0x1055218: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x0105520c: 0x105520c: sw    ra, 28(sp)
-// 0x01055210: 0x1055210: jal   0x1001800 addiu a2, zero, 72
+// 0x0105521c: 0x105521c: sw    ra, 28(sp)
+// 0x01055220: 0x1055220: jal   0x1001800 addiu a2, zero, 72
 	ldc.i4.s 72
 	stloc.3
 	ldloc.1
@@ -2578,10 +2578,10 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01055218: 0x1055218: addu  a0, s1, zero
+// 0x01055228: 0x1055228: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0105521c: 0x105521c: jal   0x1054fb8 addu  a1, s0, zero
+// 0x0105522c: 0x105522c: jal   0x1054fc8 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -2589,13 +2589,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_show_ssd_1054fb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_show_ssd_1054fc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01055224: 0x1055224: lw    ra, 28(sp)
-// 0x01055228: 0x1055228: lw    s1, 24(sp)
+// 0x01055234: 0x1055234: lw    ra, 28(sp)
+// 0x01055238: 0x1055238: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2604,7 +2604,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105522c: 0x105522c: lw    s0, 20(sp)
+// 0x0105523c: 0x105523c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2613,7 +2613,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01055230: 0x1055230: jr    ra addiu sp, sp, 32
+// 0x01055240: 0x1055240: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2625,7 +2625,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 roadmap_browser_show_1055238(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_show_1055248(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 v0,int32 v1)
@@ -2672,12 +2672,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055238: 0x1055238: addiu sp, sp, -120
+// 0x01055248: 0x1055248: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x0105523c: 0x105523c: sw    s0, 100(sp)
+// 0x0105524c: 0x105524c: sw    s0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2686,12 +2686,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01055240: 0x1055240: addiu s0, sp, 16
+// 0x01055250: 0x1055250: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 6
-// 0x01055244: 0x1055244: sw    s1, 104(sp)
+// 0x01055254: 0x1055254: sw    s1, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2700,14 +2700,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01055248: 0x1055248: addu  s1, a0, zero
+// 0x01055258: 0x1055258: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0105524c: 0x105524c: addu  a0, s0, zero
+// 0x0105525c: 0x105525c: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01055250: 0x1055250: sw    ra, 116(sp)
-// 0x01055254: 0x1055254: sw    s3, 112(sp)
+// 0x01055260: 0x1055260: sw    ra, 116(sp)
+// 0x01055264: 0x1055264: sw    s3, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2716,7 +2716,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01055258: 0x1055258: sw    s2, 108(sp)
+// 0x01055268: 0x1055268: sw    s2, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2725,13 +2725,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105525c: 0x105525c: addu  s3, a1, zero
+// 0x0105526c: 0x105526c: addu  s3, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01055260: 0x1055260: addu  s2, a2, zero
+// 0x01055270: 0x1055270: addu  s2, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01055264: 0x1055264: jal   0x1054ea4 sw    a3, 88(sp)
+// 0x01055274: 0x1055274: jal   0x1054eb4 sw    a3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2745,12 +2745,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_reset_attributes_1054ea4(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_reset_attributes_1054eb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 11
 // --- basic block ---
-// 0x0105526c: 0x105526c: lw    a1, 88(sp)
+// 0x0105527c: 0x105527c: lw    a1, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2759,13 +2759,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01055270: 0x1055270: addu  a0, s3, zero
+// 0x01055280: 0x1055280: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01055274: 0x1055274: addu  a2, s0, zero
+// 0x01055284: 0x1055284: addu  a2, s0, zero
 	ldloc 6
 	stloc.3
-// 0x01055278: 0x1055278: sw    s2, 84(sp)
+// 0x01055288: 0x1055288: sw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2774,7 +2774,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105527c: 0x105527c: jal   0x10551ec sw    s1, 16(sp)
+// 0x0105528c: 0x105528c: jal   0x10551fc sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2788,13 +2788,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_browser_show_extended_10551ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_browser_show_extended_10551fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 11
 // --- basic block ---
-// 0x01055284: 0x1055284: lw    ra, 116(sp)
-// 0x01055288: 0x1055288: lw    s3, 112(sp)
+// 0x01055294: 0x1055294: lw    ra, 116(sp)
+// 0x01055298: 0x1055298: lw    s3, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2803,7 +2803,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105528c: 0x105528c: lw    s2, 108(sp)
+// 0x0105529c: 0x105529c: lw    s2, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2812,7 +2812,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01055290: 0x1055290: lw    s1, 104(sp)
+// 0x010552a0: 0x10552a0: lw    s1, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2821,7 +2821,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01055294: 0x1055294: lw    s0, 100(sp)
+// 0x010552a4: 0x10552a4: lw    s0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2830,7 +2830,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01055298: 0x1055298: jr    ra addiu sp, sp, 120
+// 0x010552a8: 0x10552a8: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
@@ -2842,7 +2842,7 @@ __CIBYL_function_return:
 	ldloc 11
 	ret
 }
-.method public static int32 roadmap_browser_url_handler_10552a0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_browser_url_handler_10552b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2886,12 +2886,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010552a0: 0x10552a0: addiu sp, sp, -48
+// 0x010552b0: 0x10552b0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010552a4: 0x10552a4: sw    s0, 32(sp)
+// 0x010552b4: 0x10552b4: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2900,8 +2900,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010552a8: 0x10552a8: sw    ra, 44(sp)
-// 0x010552ac: 0x10552ac: sw    s2, 40(sp)
+// 0x010552b8: 0x10552b8: sw    ra, 44(sp)
+// 0x010552bc: 0x10552bc: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2910,7 +2910,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010552b0: 0x10552b0: sw    s1, 36(sp)
+// 0x010552c0: 0x10552c0: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2919,44 +2919,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010552b4: 0x10552b4: beq   a0, zero, 0x10552cc addu  s0, a0, zero
+// 0x010552c4: 0x10552c4: beq   a0, zero, 0x10552dc addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_10552cc
+	brfalse L_10552dc
 // --- basic block ---
-// 0x010552bc: 0x10552bc: lb    v0, 0(a0)
+// 0x010552cc: 0x10552cc: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010552c0: 0x10552c0: sll   zero, zero, 0
-// 0x010552c4: 0x10552c4: bne   v0, zero, 0x10552f0 lui   s2, 0x10000
+// 0x010552d0: 0x10552d0: sll   zero, zero, 0
+// 0x010552d4: 0x10552d4: bne   v0, zero, 0x1055300 lui   s2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 10
-	brtrue L_10552f0
+	brtrue L_1055300
 // --- basic block ---
-L_10552cc:
-// 0x010552cc: 0x10552cc: lui   a1, 0x10000
+L_10552dc:
+// 0x010552dc: 0x10552dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010552d0: 0x10552d0: lui   a3, 0x10000
+// 0x010552e0: 0x10552e0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010552d4: 0x10552d4: addiu a1, a1, 6660
+// 0x010552e4: 0x10552e4: addiu a1, a1, 6656
 	ldloc.2
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x010552d8: 0x10552d8: addiu a3, a3, 6928
+// 0x010552e8: 0x10552e8: addiu a3, a3, 6924
 	ldloc 4
-	ldc.i4 6928
+	ldc.i4 6924
 	add
 	stloc 4
-// 0x010552dc: 0x10552dc: addiu a0, zero, 4
+// 0x010552ec: 0x10552ec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010552e0: 0x10552e0: jal   0x100449c addiu a2, zero, 263
+// 0x010552f0: 0x10552f0: jal   0x100449c addiu a2, zero, 263
 	ldc.i4 263
 	stloc.3
 	ldloc.0
@@ -2969,32 +2969,32 @@ L_10552cc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010552e8: 0x10552e8: j	 0x10553a4 addu  v0, zero, zero
+// 0x010552f8: 0x10552f8: j	 0x10553b4 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10553a4
+	br L_10553b4
 // --- basic block ---
-L_10552f0:
-// 0x010552f0: 0x10552f0: lui   a3, 0x10000
+L_1055300:
+// 0x01055300: 0x1055300: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010552f4: 0x10552f4: addiu a3, a3, 6948
+// 0x01055304: 0x1055304: addiu a3, a3, 6944
 	ldloc 4
-	ldc.i4 6948
+	ldc.i4 6944
 	add
 	stloc 4
-// 0x010552f8: 0x10552f8: addiu a1, s2, 6660
+// 0x01055308: 0x1055308: addiu a1, s2, 6656
 	ldloc 10
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x010552fc: 0x10552fc: addiu a2, zero, 267
+// 0x0105530c: 0x105530c: addiu a2, zero, 267
 	ldc.i4 267
 	stloc.3
-// 0x01055300: 0x1055300: addiu a0, zero, 1
+// 0x01055310: 0x1055310: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01055304: 0x1055304: jal   0x100449c sw    s0, 16(sp)
+// 0x01055314: 0x1055314: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3013,15 +3013,15 @@ L_10552f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105530c: 0x105530c: lui   a1, 0x10000
+// 0x0105531c: 0x105531c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055310: 0x1055310: addu  a0, s0, zero
+// 0x01055320: 0x1055320: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01055314: 0x1055314: jal   0x1000420 addiu a1, a1, 6968
+// 0x01055324: 0x1055324: jal   0x1000420 addiu a1, a1, 6964
 	ldloc.2
-	ldc.i4 6968
+	ldc.i4 6964
 	add
 	stloc.2
 	ldloc.0
@@ -3034,22 +3034,22 @@ L_10552f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105531c: 0x105531c: addu  s1, v0, zero
+// 0x0105532c: 0x105532c: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01055320: 0x1055320: bne   s1, s0, 0x10553a4 addu  v0, zero, zero
+// 0x01055330: 0x1055330: bne   s1, s0, 0x10553b4 addu  v0, zero, zero
 	ldloc 9
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_10553a4
+	bne.un L_10553b4
 // --- basic block ---
-// 0x01055328: 0x1055328: addiu s0, s1, 7
+// 0x01055338: 0x1055338: addiu s0, s1, 7
 	ldloc 9
 	ldc.i4.7
 	add
 	stloc 8
-// 0x0105532c: 0x105532c: jal   0x102c720 addu  a0, s0, zero
+// 0x0105533c: 0x105533c: jal   0x102c730 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3057,41 +3057,41 @@ L_10552f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_find_action_102c720(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_find_action_102c730(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055334: 0x1055334: beq   v0, zero, 0x1055380 lui   a3, 0x10000
+// 0x01055344: 0x1055344: beq   v0, zero, 0x1055390 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brfalse L_1055380
+	brfalse L_1055390
 // --- basic block ---
-// 0x0105533c: 0x105533c: lw    v1, 0(v0)
+// 0x0105534c: 0x105534c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01055340: 0x1055340: addiu a1, s2, 6660
+// 0x01055350: 0x1055350: addiu a1, s2, 6656
 	ldloc 10
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x01055344: 0x1055344: addiu a3, a3, 6976
+// 0x01055354: 0x1055354: addiu a3, a3, 6972
 	ldloc 4
-	ldc.i4 6976
+	ldc.i4 6972
 	add
 	stloc 4
-// 0x01055348: 0x1055348: addiu a0, zero, 1
+// 0x01055358: 0x1055358: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105534c: 0x105534c: addiu a2, zero, 289
+// 0x0105535c: 0x105535c: addiu a2, zero, 289
 	ldc.i4 289
 	stloc.3
-// 0x01055350: 0x1055350: sw    v1, 16(sp)
+// 0x01055360: 0x1055360: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3100,7 +3100,7 @@ L_10552f0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01055354: 0x1055354: sw    v0, 24(sp)
+// 0x01055364: 0x1055364: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3109,7 +3109,7 @@ L_10552f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055358: 0x1055358: jal   0x100449c sw    s1, 20(sp)
+// 0x01055368: 0x1055368: jal   0x100449c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3128,7 +3128,7 @@ L_10552f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055360: 0x1055360: lw    v0, 24(sp)
+// 0x01055370: 0x1055370: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3137,8 +3137,8 @@ L_10552f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055364: 0x1055364: sll   zero, zero, 0
-// 0x01055368: 0x1055368: lw    v0, 20(v0)
+// 0x01055374: 0x1055374: sll   zero, zero, 0
+// 0x01055378: 0x1055378: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3147,8 +3147,8 @@ L_10552f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105536c: 0x105536c: sll   zero, zero, 0
-// 0x01055370: 0x1055370: jalr  v0 sll   zero, zero, 0
+// 0x0105537c: 0x105537c: sll   zero, zero, 0
+// 0x01055380: 0x1055380: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -3160,32 +3160,32 @@ L_10552f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055378: 0x1055378: j	 0x10553a4 addiu v0, zero, 1
+// 0x01055388: 0x1055388: j	 0x10553b4 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10553a4
+	br L_10553b4
 // --- basic block ---
-L_1055380:
-// 0x01055380: 0x1055380: lui   a3, 0x10000
+L_1055390:
+// 0x01055390: 0x1055390: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01055384: 0x1055384: addiu a1, s2, 6660
+// 0x01055394: 0x1055394: addiu a1, s2, 6656
 	ldloc 10
-	ldc.i4 6660
+	ldc.i4 6656
 	add
 	stloc.2
-// 0x01055388: 0x1055388: addiu a3, a3, 7020
+// 0x01055398: 0x1055398: addiu a3, a3, 7016
 	ldloc 4
-	ldc.i4 7020
+	ldc.i4 7016
 	add
 	stloc 4
-// 0x0105538c: 0x105538c: addiu a0, zero, 3
+// 0x0105539c: 0x105539c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01055390: 0x1055390: addiu a2, zero, 295
+// 0x010553a0: 0x10553a0: addiu a2, zero, 295
 	ldc.i4 295
 	stloc.3
-// 0x01055394: 0x1055394: sw    s0, 16(sp)
+// 0x010553a4: 0x10553a4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3194,7 +3194,7 @@ L_1055380:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01055398: 0x1055398: jal   0x100449c sw    s1, 20(sp)
+// 0x010553a8: 0x10553a8: jal   0x100449c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3213,12 +3213,12 @@ L_1055380:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010553a0: 0x10553a0: addu  v0, zero, zero
+// 0x010553b0: 0x10553b0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10553a4:
-// 0x010553a4: 0x10553a4: lw    ra, 44(sp)
-// 0x010553a8: 0x10553a8: lw    s2, 40(sp)
+L_10553b4:
+// 0x010553b4: 0x10553b4: lw    ra, 44(sp)
+// 0x010553b8: 0x10553b8: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3227,7 +3227,7 @@ L_10553a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010553ac: 0x10553ac: lw    s1, 36(sp)
+// 0x010553bc: 0x10553bc: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3236,7 +3236,7 @@ L_10553a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010553b0: 0x10553b0: lw    s0, 32(sp)
+// 0x010553c0: 0x10553c0: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3245,7 +3245,7 @@ L_10553a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010553b4: 0x10553b4: jr    ra addiu sp, sp, 48
+// 0x010553c4: 0x10553c4: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3257,7 +3257,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_help_first_topic_1055490(int32,int32,int32)
+.method public static int32 roadmap_help_first_topic_10554a0(int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -3286,10 +3286,10 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055490: 0x1055490: lui   v1, 0x0
+// 0x010554a0: 0x10554a0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01055494: 0x1055494: lw    v0, 14044(v1)
+// 0x010554a4: 0x10554a4: lw    v0, 14044(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
@@ -3298,39 +3298,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055498: 0x1055498: lui   a2, 0x70000
+// 0x010554a8: 0x10554a8: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0105549c: 0x105549c: addiu v1, v1, 14044
+// 0x010554ac: 0x10554ac: addiu v1, v1, 14044
 	ldloc.3
 	ldc.i4 14044
 	add
 	stloc.3
-// 0x010554a0: 0x10554a0: bne   v0, zero, 0x10554b0 sw    v1, 9148(a2)
+// 0x010554b0: 0x10554b0: bne   v0, zero, 0x10554c0 sw    v1, 9612(a2)
 	ldloc 5
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2287
+	ldc.i4 2403
 	add
 	ldloc.3
 	stelem.i4
-	brtrue L_10554b0
+	brtrue L_10554c0
 // --- basic block ---
-// 0x010554a8: 0x10554a8: jr    ra sw    zero, 9148(a2)
+// 0x010554b8: 0x10554b8: jr    ra sw    zero, 9612(a2)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2287
+	ldc.i4 2403
 	add
 	ldc.i4.s 0
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_10554b0:
-// 0x010554b0: 0x10554b0: lw    v1, 4(v1)
+L_10554c0:
+// 0x010554c0: 0x10554c0: lw    v1, 4(v1)
 	ldloc 4
 	ldloc.3
 	ldc.i4.2
@@ -3339,21 +3339,21 @@ L_10554b0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010554b4: 0x10554b4: sw    v0, 0(a0)
+// 0x010554c4: 0x10554c4: sw    v0, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010554b8: 0x10554b8: sw    v1, 0(a1)
+// 0x010554c8: 0x10554c8: sw    v1, 0(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x010554bc: 0x10554bc: jr    ra addiu v0, zero, 1
+// 0x010554cc: 0x10554cc: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
 	br __CIBYL_function_return
@@ -3363,7 +3363,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_help_initialize_10554c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_initialize_10554d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 v0,int32 v1,int32 s2,int32 ra)
@@ -3407,12 +3407,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010554c4: 0x10554c4: addiu sp, sp, -40
+// 0x010554d4: 0x10554d4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010554c8: 0x10554c8: sw    s0, 24(sp)
+// 0x010554d8: 0x10554d8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3421,35 +3421,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010554cc: 0x10554cc: lui   a1, 0x0
+// 0x010554dc: 0x10554dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010554d0: 0x10554d0: lui   s0, 0x10000
+// 0x010554e0: 0x10554e0: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010554d4: 0x10554d4: lui   a2, 0x10000
+// 0x010554e4: 0x10554e4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010554d8: 0x10554d8: addiu a0, s0, 12560
+// 0x010554e8: 0x10554e8: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010554dc: 0x10554dc: addiu a1, a1, 13948
+// 0x010554ec: 0x10554ec: addiu a1, a1, 13948
 	ldloc.2
 	ldc.i4 13948
 	add
 	stloc.2
-// 0x010554e0: 0x10554e0: addiu a2, a2, 19912
+// 0x010554f0: 0x10554f0: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010554e4: 0x10554e4: addu  a3, zero, zero
+// 0x010554f4: 0x10554f4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010554e8: 0x10554e8: sw    ra, 36(sp)
-// 0x010554ec: 0x10554ec: sw    s2, 32(sp)
+// 0x010554f8: 0x10554f8: sw    ra, 36(sp)
+// 0x010554fc: 0x10554fc: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3458,7 +3458,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010554f0: 0x10554f0: jal   0x100edb0 sw    s1, 28(sp)
+// 0x01055500: 0x1055500: jal   0x100edc0 sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3472,33 +3472,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010554f8: 0x10554f8: lui   a1, 0x0
+// 0x01055508: 0x1055508: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010554fc: 0x10554fc: lui   a2, 0x10000
+// 0x0105550c: 0x105550c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01055500: 0x1055500: addiu a0, s0, 12560
+// 0x01055510: 0x1055510: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01055504: 0x1055504: addiu a1, a1, 13964
+// 0x01055514: 0x1055514: addiu a1, a1, 13964
 	ldloc.2
 	ldc.i4 13964
 	add
 	stloc.2
-// 0x01055508: 0x1055508: addiu a2, a2, 7064
+// 0x01055518: 0x1055518: addiu a2, a2, 7060
 	ldloc.3
-	ldc.i4 7064
+	ldc.i4 7060
 	add
 	stloc.3
-// 0x0105550c: 0x105550c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0105551c: 0x105551c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3506,33 +3506,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01055514: 0x1055514: lui   s1, 0x10000
+// 0x01055524: 0x1055524: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01055518: 0x1055518: lui   a1, 0x0
+// 0x01055528: 0x1055528: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105551c: 0x105551c: addiu a0, s0, 12560
+// 0x0105552c: 0x105552c: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01055520: 0x1055520: addiu a2, s1, 7072
+// 0x01055530: 0x1055530: addiu a2, s1, 7068
 	ldloc 6
-	ldc.i4 7072
+	ldc.i4 7068
 	add
 	stloc.3
-// 0x01055524: 0x1055524: addiu a1, a1, 13980
+// 0x01055534: 0x1055534: addiu a1, a1, 13980
 	ldloc.2
 	ldc.i4 13980
 	add
 	stloc.2
-// 0x01055528: 0x1055528: jal   0x100edb0 addu  a3, zero, zero
+// 0x01055538: 0x1055538: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3540,30 +3540,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01055530: 0x1055530: lui   a1, 0x0
+// 0x01055540: 0x1055540: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01055534: 0x1055534: addiu a2, s1, 7072
+// 0x01055544: 0x1055544: addiu a2, s1, 7068
 	ldloc 6
-	ldc.i4 7072
+	ldc.i4 7068
 	add
 	stloc.3
-// 0x01055538: 0x1055538: addiu a0, s0, 12560
+// 0x01055548: 0x1055548: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105553c: 0x105553c: addiu a1, a1, 13996
+// 0x0105554c: 0x105554c: addiu a1, a1, 13996
 	ldloc.2
 	ldc.i4 13996
 	add
 	stloc.2
-// 0x01055540: 0x1055540: jal   0x100edb0 addu  a3, zero, zero
+// 0x01055550: 0x1055550: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3571,44 +3571,44 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01055548: 0x1055548: lui   s2, 0x20000
+// 0x01055558: 0x1055558: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x0105554c: 0x105554c: lui   s1, 0x0
+// 0x0105555c: 0x105555c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01055550: 0x1055550: lui   a1, 0x0
+// 0x01055560: 0x1055560: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01055554: 0x1055554: addiu s1, s1, 20820
+// 0x01055564: 0x1055564: addiu s1, s1, 20820
 	ldloc 6
 	ldc.i4 20820
 	add
 	stloc 6
-// 0x01055558: 0x1055558: addiu a0, s0, 12560
+// 0x01055568: 0x1055568: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105555c: 0x105555c: addiu a3, s2, 9464
+// 0x0105556c: 0x105556c: addiu a3, s2, 9928
 	ldloc 10
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01055560: 0x1055560: addiu a1, a1, 14012
+// 0x01055570: 0x1055570: addiu a1, a1, 14012
 	ldloc.2
 	ldc.i4 14012
 	add
 	stloc.2
-// 0x01055564: 0x1055564: addu  a2, zero, zero
+// 0x01055574: 0x1055574: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01055568: 0x1055568: sw    s1, 16(sp)
+// 0x01055578: 0x1055578: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3617,7 +3617,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105556c: 0x105556c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0105557c: 0x105557c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3631,33 +3631,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01055574: 0x1055574: lui   a1, 0x0
+// 0x01055584: 0x1055584: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01055578: 0x1055578: addiu a0, s0, 12560
+// 0x01055588: 0x1055588: addiu a0, s0, 12556
 	ldloc 7
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105557c: 0x105557c: addiu a3, s2, 9464
+// 0x0105558c: 0x105558c: addiu a3, s2, 9928
 	ldloc 10
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01055580: 0x1055580: addiu a1, a1, 14028
+// 0x01055590: 0x1055590: addiu a1, a1, 14028
 	ldloc.2
 	ldc.i4 14028
 	add
 	stloc.2
-// 0x01055584: 0x1055584: addu  a2, zero, zero
+// 0x01055594: 0x1055594: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01055588: 0x1055588: sw    s1, 16(sp)
+// 0x01055598: 0x1055598: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3666,7 +3666,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105558c: 0x105558c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0105559c: 0x105559c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3680,13 +3680,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01055594: 0x1055594: lw    ra, 36(sp)
-// 0x01055598: 0x1055598: lw    s2, 32(sp)
+// 0x010555a4: 0x10555a4: lw    ra, 36(sp)
+// 0x010555a8: 0x10555a8: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3695,7 +3695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105559c: 0x105559c: lw    s1, 28(sp)
+// 0x010555ac: 0x10555ac: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3704,7 +3704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010555a0: 0x10555a0: lw    s0, 24(sp)
+// 0x010555b0: 0x10555b0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3713,7 +3713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010555a4: 0x10555a4: jr    ra addiu sp, sp, 40
+// 0x010555b4: 0x10555b4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3725,7 +3725,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 roadmap_open_help_10555ac(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_open_help_10555bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -3760,17 +3760,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10555ac:
-// 0x010555ac: 0x10555ac: lui   a0, 0x0
+L_10555bc:
+// 0x010555bc: 0x10555bc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010555b0: 0x10555b0: addiu sp, sp, -24
+// 0x010555c0: 0x10555c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010555b4: 0x10555b4: sw    ra, 20(sp)
-// 0x010555b8: 0x10555b8: jal   0x100e348 addiu a0, a0, 13948
+// 0x010555c4: 0x10555c4: sw    ra, 20(sp)
+// 0x010555c8: 0x10555c8: jal   0x100e358 addiu a0, a0, 13948
 	ldloc.1
 	ldc.i4 13948
 	add
@@ -3780,23 +3780,23 @@ L_10555ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010555c0: 0x10555c0: jal   0x104f628 addu  a0, v0, zero
+// 0x010555d0: 0x10555d0: jal   0x104f638 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl59::roadmap_internet_open_browser_104f628(int32)
+	call int32 Cibyl59::roadmap_internet_open_browser_104f638(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010555c8: 0x10555c8: lw    ra, 20(sp)
-// 0x010555cc: 0x10555cc: sll   zero, zero, 0
-// 0x010555d0: 0x10555d0: jr    ra addiu sp, sp, 24
+// 0x010555d8: 0x10555d8: lw    ra, 20(sp)
+// 0x010555dc: 0x10555dc: sll   zero, zero, 0
+// 0x010555e0: 0x10555e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3808,7 +3808,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_help_about_10555d8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_about_10555e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -3855,13 +3855,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10555d8:
-// 0x010555d8: 0x10555d8: addiu sp, sp, -560
+L_10555e8:
+// 0x010555e8: 0x10555e8: addiu sp, sp, -560
 	ldloc.0
 	ldc.i4 -560
 	add
 	stloc.0
-// 0x010555dc: 0x10555dc: sw    s2, 548(sp)
+// 0x010555ec: 0x10555ec: sw    s2, 548(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3870,15 +3870,15 @@ L_10555d8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010555e0: 0x10555e0: lui   a1, 0x10000
+// 0x010555f0: 0x10555f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010555e4: 0x10555e4: addiu s2, sp, 24
+// 0x010555f4: 0x10555f4: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-// 0x010555e8: 0x10555e8: sw    s0, 540(sp)
+// 0x010555f8: 0x10555f8: sw    s0, 540(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3887,19 +3887,19 @@ L_10555d8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010555ec: 0x10555ec: addu  a0, s2, zero
+// 0x010555fc: 0x10555fc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x010555f0: 0x10555f0: addiu a1, a1, 7128
+// 0x01055600: 0x1055600: addiu a1, a1, 7124
 	ldloc.2
-	ldc.i4 7128
+	ldc.i4 7124
 	add
 	stloc.2
-// 0x010555f4: 0x10555f4: lui   s0, 0x10000
+// 0x01055604: 0x1055604: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010555f8: 0x10555f8: sw    ra, 556(sp)
-// 0x010555fc: 0x10555fc: sw    s3, 552(sp)
+// 0x01055608: 0x1055608: sw    ra, 556(sp)
+// 0x0105560c: 0x105560c: sw    s3, 552(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3908,7 +3908,7 @@ L_10555d8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01055600: 0x1055600: jal   0x1001b68 sw    s1, 544(sp)
+// 0x01055610: 0x1055610: jal   0x1001b68 sw    s1, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3924,7 +3924,7 @@ L_10555d8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055608: 0x1055608: jal   0x10941a4 addiu a0, s0, -20332
+// 0x01055618: 0x1055618: jal   0x10947c8 addiu a0, s0, -20332
 	ldloc 8
 	ldc.i4 -20332
 	add
@@ -3934,36 +3934,36 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_exists_10941a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_exists_10947c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055610: 0x1055610: bne   v0, zero, 0x105575c lui   a3, 0x10010000
+// 0x01055620: 0x1055620: bne   v0, zero, 0x105576c lui   a3, 0x10010000
 	ldloc 5
 	ldc.i4 268500992
 	stloc 4
-	brtrue L_105575c
+	brtrue L_105576c
 // --- basic block ---
-// 0x01055618: 0x1055618: lui   a1, 0x10000
+// 0x01055628: 0x1055628: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105561c: 0x105561c: ori   a3, a3, 20497
+// 0x0105562c: 0x105562c: ori   a3, a3, 20497
 	ldloc 4
 	ldc.i4 20497
 	or
 	stloc 4
-// 0x01055620: 0x1055620: addiu a0, s0, -20332
+// 0x01055630: 0x1055630: addiu a0, s0, -20332
 	ldloc 8
 	ldc.i4 -20332
 	add
 	stloc.1
-// 0x01055624: 0x1055624: addiu a1, a1, 18500
+// 0x01055634: 0x1055634: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01055628: 0x1055628: jal   0x1095a08 addu  a2, zero, zero
+// 0x01055638: 0x1055638: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3971,59 +3971,59 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055630: 0x1055630: lui   a1, 0x0
+// 0x01055640: 0x1055640: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01055634: 0x1055634: lui   a2, 0x10000
+// 0x01055644: 0x1055644: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01055638: 0x1055638: addu  a0, v0, zero
+// 0x01055648: 0x1055648: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105563c: 0x105563c: addiu a1, a1, 31980
+// 0x0105564c: 0x105564c: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x01055640: 0x1055640: addiu a2, a2, 7252
+// 0x01055650: 0x1055650: addiu a2, a2, 7248
 	ldloc.3
-	ldc.i4 7252
+	ldc.i4 7248
 	add
 	stloc.3
-// 0x01055644: 0x1055644: lui   s3, 0x10000
+// 0x01055654: 0x1055654: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01055648: 0x1055648: addu  s0, v0, zero
+// 0x01055658: 0x1055658: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0105564c: 0x105564c: jal   0x1098fe0 addiu s1, zero, 8
+// 0x0105565c: 0x105565c: jal   0x1099628 addiu s1, zero, 8
 	ldc.i4.8
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01055654: 0x1055654: addiu a3, zero, 10
+// 0x01055664: 0x1055664: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x01055658: 0x1055658: addu  a2, zero, zero
+// 0x01055668: 0x1055668: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105565c: 0x105565c: addiu a0, s3, -27036
+// 0x0105566c: 0x105566c: addiu a0, s3, -27036
 	ldloc 11
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x01055660: 0x1055660: addu  a1, zero, zero
+// 0x01055670: 0x1055670: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01055664: 0x1055664: jal   0x1093a24 sw    s1, 16(sp)
+// 0x01055674: 0x1055674: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4037,41 +4037,41 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105566c: 0x105566c: addu  a1, v0, zero
+// 0x0105567c: 0x105567c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01055670: 0x1055670: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01055680: 0x1055680: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055678: 0x1055678: lui   a0, 0x10000
+// 0x01055688: 0x1055688: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105567c: 0x105567c: lui   a1, 0x10000
+// 0x0105568c: 0x105568c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055680: 0x1055680: addiu a2, zero, 9
+// 0x01055690: 0x1055690: addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
-// 0x01055684: 0x1055684: addiu a0, a0, 7264
+// 0x01055694: 0x1055694: addiu a0, a0, 7260
 	ldloc.1
-	ldc.i4 7264
+	ldc.i4 7260
 	add
 	stloc.1
-// 0x01055688: 0x1055688: jal   0x109e13c addiu a1, a1, 7276
+// 0x01055698: 0x1055698: jal   0x109e784 addiu a1, a1, 7272
 	ldloc.2
-	ldc.i4 7276
+	ldc.i4 7272
 	add
 	stloc.2
 	ldloc.0
@@ -4079,39 +4079,39 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055690: 0x1055690: addu  a1, v0, zero
+// 0x010556a0: 0x10556a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01055694: 0x1055694: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010556a4: 0x10556a4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105569c: 0x105569c: addu  a2, zero, zero
+// 0x010556ac: 0x10556ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010556a0: 0x10556a0: addiu a3, zero, 10
+// 0x010556b0: 0x10556b0: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x010556a4: 0x10556a4: addiu a0, s3, -27036
+// 0x010556b4: 0x10556b4: addiu a0, s3, -27036
 	ldloc 11
 	ldc.i4 -27036
 	add
 	stloc.1
-// 0x010556a8: 0x10556a8: addu  a1, zero, zero
+// 0x010556b8: 0x10556b8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010556ac: 0x10556ac: jal   0x1093a24 sw    s1, 16(sp)
+// 0x010556bc: 0x10556bc: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4125,39 +4125,39 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010556b4: 0x10556b4: addu  a1, v0, zero
+// 0x010556c4: 0x10556c4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010556b8: 0x10556b8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010556c8: 0x10556c8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010556c0: 0x10556c0: lui   a0, 0x20000
+// 0x010556d0: 0x10556d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010556c4: 0x10556c4: addiu a2, zero, 13
+// 0x010556d4: 0x10556d4: addiu a2, zero, 13
 	ldc.i4.s 13
 	stloc.3
-// 0x010556c8: 0x10556c8: addiu a3, zero, 137
+// 0x010556d8: 0x10556d8: addiu a3, zero, 137
 	ldc.i4 137
 	stloc 4
-// 0x010556cc: 0x10556cc: addu  a1, s2, zero
+// 0x010556dc: 0x10556dc: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010556d0: 0x10556d0: jal   0x1098d10 addiu a0, a0, -2684
+// 0x010556e0: 0x10556e0: jal   0x1099358 addiu a0, a0, -2220
 	ldloc.1
-	ldc.i4 -2684
+	ldc.i4 -2220
 	add
 	stloc.1
 	ldloc.0
@@ -4165,23 +4165,23 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010556d8: 0x10556d8: lui   a1, 0x0
+// 0x010556e8: 0x10556e8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010556dc: 0x10556dc: addu  a0, v0, zero
+// 0x010556ec: 0x10556ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010556e0: 0x10556e0: addiu a1, a1, 23008
+// 0x010556f0: 0x10556f0: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010556e4: 0x10556e4: jal   0x1097af8 sw    v0, 528(sp)
+// 0x010556f4: 0x10556f4: jal   0x1098140 sw    v0, 528(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4192,9 +4192,9 @@ L_10555d8:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010556ec: 0x10556ec: lw    v0, 528(sp)
+// 0x010556fc: 0x10556fc: lw    v0, 528(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4203,37 +4203,37 @@ L_10555d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010556f0: 0x10556f0: addu  a0, s0, zero
+// 0x01055700: 0x1055700: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010556f4: 0x10556f4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01055704: 0x1055704: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010556fc: 0x10556fc: lui   a0, 0x10000
+// 0x0105570c: 0x105570c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055700: 0x1055700: addu  a2, zero, zero
+// 0x01055710: 0x1055710: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01055704: 0x1055704: addiu a3, zero, 20
+// 0x01055714: 0x1055714: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x01055708: 0x1055708: addiu a0, a0, -25324
+// 0x01055718: 0x1055718: addiu a0, a0, -25324
 	ldloc.1
 	ldc.i4 -25324
 	add
 	stloc.1
-// 0x0105570c: 0x105570c: addu  a1, zero, zero
+// 0x0105571c: 0x105571c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01055710: 0x1055710: jal   0x1093a24 sw    s1, 16(sp)
+// 0x01055720: 0x1055720: jal   0x1094048 sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4247,28 +4247,28 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055718: 0x1055718: addu  a1, v0, zero
+// 0x01055728: 0x1055728: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105571c: 0x105571c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0105572c: 0x105572c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055724: 0x1055724: lui   a0, 0x0
+// 0x01055734: 0x1055734: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01055728: 0x1055728: jal   0x101cd60 addiu a0, a0, 32524
+// 0x01055738: 0x1055738: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -4278,36 +4278,36 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055730: 0x1055730: lui   a0, 0x0
+// 0x01055740: 0x1055740: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01055734: 0x1055734: lui   a2, 0x300000
+// 0x01055744: 0x1055744: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x01055738: 0x1055738: lui   a3, 0x1050000
+// 0x01055748: 0x1055748: lui   a3, 0x1050000
 	ldc.i4 17104896
 	stloc 4
-// 0x0105573c: 0x105573c: addiu a0, a0, 32528
+// 0x0105574c: 0x105574c: addiu a0, a0, 32528
 	ldloc.1
 	ldc.i4 32528
 	add
 	stloc.1
-// 0x01055740: 0x1055740: addu  a1, v0, zero
+// 0x01055750: 0x1055750: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01055744: 0x1055744: ori   a2, a2, 5
+// 0x01055754: 0x1055754: ori   a2, a2, 5
 	ldloc.3
 	ldc.i4.5
 	or
 	stloc.3
-// 0x01055748: 0x1055748: jal   0x1091088 addiu a3, a3, 22416
+// 0x01055758: 0x1055758: jal   0x10916ac addiu a3, a3, 22432
 	ldloc 4
-	ldc.i4 22416
+	ldc.i4 22432
 	add
 	stloc 4
 	ldloc.0
@@ -4315,34 +4315,34 @@ L_10555d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055750: 0x1055750: addu  a1, v0, zero
+// 0x01055760: 0x1055760: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01055754: 0x1055754: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01055764: 0x1055764: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105575c:
-// 0x0105575c: 0x105575c: lui   a0, 0x10000
+L_105576c:
+// 0x0105576c: 0x105576c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055760: 0x1055760: addiu a0, a0, -20332
+// 0x01055770: 0x1055770: addiu a0, a0, -20332
 	ldloc.1
 	ldc.i4 -20332
 	add
 	stloc.1
-// 0x01055764: 0x1055764: jal   0x1095eec addu  a1, zero, zero
+// 0x01055774: 0x1055774: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4350,24 +4350,24 @@ L_105575c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105576c: 0x105576c: jal   0x1021900 sll   zero, zero, 0
+// 0x0105577c: 0x105577c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055774: 0x1055774: lw    ra, 556(sp)
-// 0x01055778: 0x1055778: lw    s3, 552(sp)
+// 0x01055784: 0x1055784: lw    ra, 556(sp)
+// 0x01055788: 0x1055788: lw    s3, 552(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4376,7 +4376,7 @@ L_105575c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105577c: 0x105577c: lw    s2, 548(sp)
+// 0x0105578c: 0x105578c: lw    s2, 548(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4385,7 +4385,7 @@ L_105575c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01055780: 0x1055780: lw    s1, 544(sp)
+// 0x01055790: 0x1055790: lw    s1, 544(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4394,7 +4394,7 @@ L_105575c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01055784: 0x1055784: lw    s0, 540(sp)
+// 0x01055794: 0x1055794: lw    s0, 540(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4403,7 +4403,7 @@ L_105575c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01055788: 0x1055788: jr    ra addiu sp, sp, 560
+// 0x01055798: 0x1055798: jr    ra addiu sp, sp, 560
 	ldloc.0
 	ldc.i4 560
 	add
@@ -4415,7 +4415,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 about_callbak_1055790(int32,int32,int32,int32,int32)
+.method public static int32 about_callbak_10557a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
@@ -4450,21 +4450,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055790: 0x1055790: lui   a0, 0x10000
+// 0x010557a0: 0x10557a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055794: 0x1055794: addiu sp, sp, -24
+// 0x010557a4: 0x10557a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01055798: 0x1055798: addiu a0, a0, -20332
+// 0x010557a8: 0x10557a8: addiu a0, a0, -20332
 	ldloc.1
 	ldc.i4 -20332
 	add
 	stloc.1
-// 0x0105579c: 0x105579c: sw    ra, 20(sp)
-// 0x010557a0: 0x10557a0: jal   0x1094884 addiu a1, zero, 1
+// 0x010557ac: 0x10557ac: sw    ra, 20(sp)
+// 0x010557b0: 0x10557b0: jal   0x1094ff4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4472,16 +4472,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010557a8: 0x10557a8: lw    ra, 20(sp)
-// 0x010557ac: 0x10557ac: addu  v0, zero, zero
+// 0x010557b8: 0x10557b8: lw    ra, 20(sp)
+// 0x010557bc: 0x10557bc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010557b0: 0x10557b0: jr    ra addiu sp, sp, 24
+// 0x010557c0: 0x10557c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4493,7 +4493,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_help_next_topic_10557b8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_next_topic_10557c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -4528,47 +4528,47 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010557b8: 0x10557b8: lui   v0, 0x70000
+// 0x010557c8: 0x10557c8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010557bc: 0x10557bc: lw    v1, 9148(v0)
+// 0x010557cc: 0x10557cc: lw    v1, 9612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2287
+	ldc.i4 2403
 	add
 	ldelem.i4
 	stloc 7
-// 0x010557c0: 0x10557c0: addiu sp, sp, -24
+// 0x010557d0: 0x10557d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010557c4: 0x10557c4: bne   v1, zero, 0x10557f0 sw    ra, 20(sp)
+// 0x010557d4: 0x10557d4: bne   v1, zero, 0x1055800 sw    ra, 20(sp)
 	ldloc 7
-	brtrue L_10557f0
+	brtrue L_1055800
 // --- basic block ---
-// 0x010557cc: 0x10557cc: lui   a1, 0x10000
+// 0x010557dc: 0x10557dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010557d0: 0x10557d0: lui   a3, 0x10000
+// 0x010557e0: 0x10557e0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010557d4: 0x10557d4: addiu a1, a1, 7288
+// 0x010557e4: 0x10557e4: addiu a1, a1, 7284
 	ldloc.2
-	ldc.i4 7288
+	ldc.i4 7284
 	add
 	stloc.2
-// 0x010557d8: 0x10557d8: addiu a3, a3, 7316
+// 0x010557e8: 0x10557e8: addiu a3, a3, 7312
 	ldloc 4
-	ldc.i4 7316
+	ldc.i4 7312
 	add
 	stloc 4
-// 0x010557dc: 0x10557dc: addiu a0, zero, 4
+// 0x010557ec: 0x10557ec: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010557e0: 0x10557e0: jal   0x100449c addiu a2, zero, 229
+// 0x010557f0: 0x10557f0: jal   0x100449c addiu a2, zero, 229
 	ldc.i4 229
 	stloc.3
 	ldloc.0
@@ -4581,25 +4581,25 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010557e8: 0x10557e8: j	 0x105582c addu  v0, zero, zero
+// 0x010557f8: 0x10557f8: j	 0x105583c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_105582c
+	br L_105583c
 // --- basic block ---
-L_10557f0:
-// 0x010557f0: 0x10557f0: lw    a2, 0(v1)
+L_1055800:
+// 0x01055800: 0x1055800: lw    a2, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010557f4: 0x10557f4: sll   zero, zero, 0
-// 0x010557f8: 0x10557f8: beq   a2, zero, 0x1055810 sll   zero, zero, 0
+// 0x01055804: 0x1055804: sll   zero, zero, 0
+// 0x01055808: 0x1055808: beq   a2, zero, 0x1055820 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1055810
+	brfalse L_1055820
 // --- basic block ---
-// 0x01055800: 0x1055800: lw    a2, 8(v1)
+// 0x01055810: 0x1055810: lw    a2, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4608,40 +4608,40 @@ L_10557f0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01055804: 0x1055804: addiu v1, v1, 8
+// 0x01055814: 0x1055814: addiu v1, v1, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 7
-// 0x01055808: 0x1055808: bne   a2, zero, 0x105581c sw    v1, 9148(v0)
+// 0x01055818: 0x1055818: bne   a2, zero, 0x105582c sw    v1, 9612(v0)
 	ldloc.3
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2287
+	ldc.i4 2403
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_105581c
+	brtrue L_105582c
 // --- basic block ---
-L_1055810:
-// 0x01055810: 0x1055810: sw    zero, 9148(v0)
+L_1055820:
+// 0x01055820: 0x1055820: sw    zero, 9612(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2287
+	ldc.i4 2403
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01055814: 0x1055814: j	 0x105582c addu  v0, zero, zero
+// 0x01055824: 0x1055824: j	 0x105583c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_105582c
+	br L_105583c
 // --- basic block ---
-L_105581c:
-// 0x0105581c: 0x105581c: lw    v0, 4(v1)
+L_105582c:
+// 0x0105582c: 0x105582c: lw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4650,27 +4650,27 @@ L_105581c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055820: 0x1055820: sw    a2, 0(a0)
+// 0x01055830: 0x1055830: sw    a2, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01055824: 0x1055824: sw    v0, 0(a1)
+// 0x01055834: 0x1055834: sw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01055828: 0x1055828: addiu v0, zero, 1
+// 0x01055838: 0x1055838: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_105582c:
-// 0x0105582c: 0x105582c: lw    ra, 20(sp)
-// 0x01055830: 0x1055830: sll   zero, zero, 0
-// 0x01055834: 0x1055834: jr    ra addiu sp, sp, 24
+L_105583c:
+// 0x0105583c: 0x105583c: lw    ra, 20(sp)
+// 0x01055840: 0x1055840: sll   zero, zero, 0
+// 0x01055844: 0x1055844: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4682,7 +4682,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_help_make_url_105583c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_make_url_105584c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -4729,12 +4729,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105583c: 0x105583c: addiu sp, sp, -40
+// 0x0105584c: 0x105584c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01055840: 0x1055840: sw    s1, 24(sp)
+// 0x01055850: 0x1055850: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4743,19 +4743,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01055844: 0x1055844: addu  s1, a0, zero
+// 0x01055854: 0x1055854: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01055848: 0x1055848: lui   a0, 0x0
+// 0x01055858: 0x1055858: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105584c: 0x105584c: addiu a0, a0, 13948
+// 0x0105585c: 0x105585c: addiu a0, a0, 13948
 	ldloc.1
 	ldc.i4 13948
 	add
 	stloc.1
-// 0x01055850: 0x1055850: sw    ra, 36(sp)
-// 0x01055854: 0x1055854: sw    s3, 32(sp)
+// 0x01055860: 0x1055860: sw    ra, 36(sp)
+// 0x01055864: 0x1055864: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4764,7 +4764,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01055858: 0x1055858: sw    s2, 28(sp)
+// 0x01055868: 0x1055868: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4773,7 +4773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105585c: 0x105585c: jal   0x100e348 sw    s0, 20(sp)
+// 0x0105586c: 0x105586c: jal   0x100e358 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4787,15 +4787,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055864: 0x1055864: addu  a0, v0, zero
+// 0x01055874: 0x1055874: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055868: 0x1055868: jal   0x1001b48 addu  s2, v0, zero
+// 0x01055878: 0x1055878: jal   0x1001b48 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
@@ -4804,10 +4804,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055870: 0x1055870: addu  a0, s1, zero
+// 0x01055880: 0x1055880: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01055874: 0x1055874: jal   0x1001b48 addu  s3, v0, zero
+// 0x01055884: 0x1055884: jal   0x1001b48 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -4816,17 +4816,17 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105587c: 0x105587c: addu  s3, s3, v0
+// 0x0105588c: 0x105588c: addu  s3, s3, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01055880: 0x1055880: addiu s3, s3, 26
+// 0x01055890: 0x1055890: addiu s3, s3, 26
 	ldloc 8
 	ldc.i4.s 26
 	add
 	stloc 8
-// 0x01055884: 0x1055884: jal   0x1000910 addu  a0, s3, zero
+// 0x01055894: 0x1055894: jal   0x1000910 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4839,18 +4839,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105588c: 0x105588c: lui   a1, 0x10000
+// 0x0105589c: 0x105589c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055890: 0x1055890: addu  s0, v0, zero
+// 0x010558a0: 0x10558a0: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01055894: 0x1055894: addu  a0, v0, zero
+// 0x010558a4: 0x10558a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055898: 0x1055898: jal   0x1001b68 addiu a1, a1, 3624
+// 0x010558a8: 0x10558a8: jal   0x1001b68 addiu a1, a1, 3620
 	ldloc.2
-	ldc.i4 3624
+	ldc.i4 3620
 	add
 	stloc.2
 	ldloc.1
@@ -4860,10 +4860,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010558a0: 0x10558a0: addu  a1, s1, zero
+// 0x010558b0: 0x10558b0: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x010558a4: 0x10558a4: jal   0x1001ac4 addu  a0, s0, zero
+// 0x010558b4: 0x10558b4: jal   0x1001ac4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -4871,15 +4871,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010558ac: 0x10558ac: lui   a1, 0x10000
+// 0x010558bc: 0x10558bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010558b0: 0x10558b0: addu  a0, s0, zero
+// 0x010558c0: 0x10558c0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010558b4: 0x10558b4: jal   0x1001ac4 addiu a1, a1, 7344
+// 0x010558c4: 0x10558c4: jal   0x1001ac4 addiu a1, a1, 7340
 	ldloc.2
-	ldc.i4 7344
+	ldc.i4 7340
 	add
 	stloc.2
 	ldloc.1
@@ -4887,18 +4887,18 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010558bc: 0x10558bc: lb    v0, 0(s2)
+// 0x010558cc: 0x10558cc: lb    v0, 0(s2)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010558c0: 0x10558c0: sll   zero, zero, 0
-// 0x010558c4: 0x10558c4: beq   v0, zero, 0x10558f8 lui   s1, 0x70000
+// 0x010558d0: 0x10558d0: sll   zero, zero, 0
+// 0x010558d4: 0x10558d4: beq   v0, zero, 0x1055908 lui   s1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 10
-	brfalse L_10558f8
+	brfalse L_1055908
 // --- basic block ---
-// 0x010558cc: 0x10558cc: jal   0x1000910 addu  a0, s3, zero
+// 0x010558dc: 0x10558dc: jal   0x1000910 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4911,21 +4911,21 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010558d4: 0x10558d4: addu  a0, v0, zero
+// 0x010558e4: 0x10558e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010558d8: 0x10558d8: addu  a1, s2, zero
+// 0x010558e8: 0x10558e8: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x010558dc: 0x10558dc: addu  a2, s0, zero
+// 0x010558ec: 0x10558ec: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x010558e0: 0x10558e0: jal   0x1000f64 sw    v0, 9152(s1)
+// 0x010558f0: 0x10558f0: jal   0x1000f64 sw    v0, 9616(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2288
+	ldc.i4 2404
 	add
 	ldloc 5
 	stelem.i4
@@ -4939,7 +4939,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010558e8: 0x10558e8: jal   0x1000930 addu  a0, s0, zero
+// 0x010558f8: 0x10558f8: jal   0x1000930 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4952,22 +4952,22 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010558f0: 0x10558f0: j	 0x10558fc sll   zero, zero, 0
-	br L_10558fc
+// 0x01055900: 0x1055900: j	 0x105590c sll   zero, zero, 0
+	br L_105590c
 // --- basic block ---
-L_10558f8:
-// 0x010558f8: 0x10558f8: sw    s0, 9152(s1)
+L_1055908:
+// 0x01055908: 0x1055908: sw    s0, 9616(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2288
+	ldc.i4 2404
 	add
 	ldloc 9
 	stelem.i4
-L_10558fc:
-// 0x010558fc: 0x10558fc: lw    ra, 36(sp)
-// 0x01055900: 0x1055900: lw    s3, 32(sp)
+L_105590c:
+// 0x0105590c: 0x105590c: lw    ra, 36(sp)
+// 0x01055910: 0x1055910: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4976,7 +4976,7 @@ L_10558fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01055904: 0x1055904: lw    s2, 28(sp)
+// 0x01055914: 0x1055914: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4985,7 +4985,7 @@ L_10558fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01055908: 0x1055908: lw    s1, 24(sp)
+// 0x01055918: 0x1055918: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4994,7 +4994,7 @@ L_10558fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105590c: 0x105590c: lw    s0, 20(sp)
+// 0x0105591c: 0x105591c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5003,7 +5003,7 @@ L_10558fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01055910: 0x1055910: jr    ra addiu sp, sp, 40
+// 0x01055920: 0x1055920: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5015,7 +5015,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_help_show_1055918(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_show_1055928(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s1,int32 s0,int32 s3,int32 ra)
@@ -5062,24 +5062,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055918: 0x1055918: lui   v0, 0x70000
+// 0x01055928: 0x1055928: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105591c: 0x105591c: lw    v0, 9152(v0)
+// 0x0105592c: 0x105592c: lw    v0, 9616(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2288
+	ldc.i4 2404
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055920: 0x1055920: addiu sp, sp, -48
+// 0x01055930: 0x1055930: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01055924: 0x1055924: sw    s0, 28(sp)
+// 0x01055934: 0x1055934: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5088,8 +5088,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01055928: 0x1055928: sw    ra, 44(sp)
-// 0x0105592c: 0x105592c: sw    s3, 40(sp)
+// 0x01055938: 0x1055938: sw    ra, 44(sp)
+// 0x0105593c: 0x105593c: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5098,7 +5098,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01055930: 0x1055930: sw    s2, 36(sp)
+// 0x01055940: 0x1055940: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5107,7 +5107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01055934: 0x1055934: sw    s1, 32(sp)
+// 0x01055944: 0x1055944: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5116,13 +5116,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01055938: 0x1055938: bne   v0, zero, 0x10559e0 addu  s0, a0, zero
+// 0x01055948: 0x1055948: bne   v0, zero, 0x10559f0 addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 10
-	brtrue L_10559e0
+	brtrue L_10559f0
 // --- basic block ---
-// 0x01055940: 0x1055940: jal   0x104c564 lui   s1, 0x10000
+// 0x01055950: 0x1055950: jal   0x104c574 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -5130,20 +5130,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_path_user_104c564(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_path_user_104c574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055948: 0x1055948: addu  a0, v0, zero
+// 0x01055958: 0x1055958: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105594c: 0x105594c: addiu a1, s1, 7360
+// 0x0105595c: 0x105595c: addiu a1, s1, 7356
 	ldloc 9
-	ldc.i4 7360
+	ldc.i4 7356
 	add
 	stloc.2
-// 0x01055950: 0x1055950: jal   0x104d690 addu  s2, v0, zero
+// 0x01055960: 0x1055960: jal   0x104d6a0 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5151,31 +5151,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055958: 0x1055958: bne   v0, zero, 0x1055994 addu  a0, s2, zero
+// 0x01055968: 0x1055968: bne   v0, zero, 0x10559a4 addu  a0, s2, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_1055994
+	brtrue L_10559a4
 // --- basic block ---
-// 0x01055960: 0x1055960: lui   s2, 0x0
+// 0x01055970: 0x1055970: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01055964: 0x1055964: addiu a0, s2, 26228
+// 0x01055974: 0x1055974: addiu a0, s2, 26228
 	ldloc 8
 	ldc.i4 26228
 	add
 	stloc.1
-// 0x01055968: 0x1055968: addiu s3, s1, 7360
+// 0x01055978: 0x1055978: addiu s3, s1, 7356
 	ldloc 9
-	ldc.i4 7360
+	ldc.i4 7356
 	add
 	stloc 11
-// 0x0105596c: 0x105596c: jal   0x104d204 addu  s2, a0, zero
+// 0x0105597c: 0x105597c: jal   0x104d214 addu  s2, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -5183,100 +5183,100 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_first_104d204(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_first_104d214(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055974: 0x1055974: j	 0x10559b0 addu  s1, v0, zero
+// 0x01055984: 0x1055984: j	 0x10559c0 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-	br L_10559b0
+	br L_10559c0
 // --- basic block ---
-L_105597c:
-// 0x0105597c: 0x105597c: jal   0x104d690 sll   zero, zero, 0
+L_105598c:
+// 0x0105598c: 0x105598c: jal   0x104d6a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_file_exists_104d690(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_file_exists_104d6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055984: 0x1055984: addu  a1, s1, zero
+// 0x01055994: 0x1055994: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01055988: 0x1055988: beq   v0, zero, 0x10559a4 addu  a0, s2, zero
+// 0x01055998: 0x1055998: beq   v0, zero, 0x10559b4 addu  a0, s2, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brfalse L_10559a4
+	brfalse L_10559b4
 // --- basic block ---
-// 0x01055990: 0x1055990: addu  a0, s1, zero
+// 0x010559a0: 0x10559a0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-L_1055994:
-// 0x01055994: 0x1055994: jal   0x105583c sll   zero, zero, 0
+L_10559a4:
+// 0x010559a4: 0x10559a4: jal   0x105584c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_make_url_105583c(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_make_url_105584c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105599c: 0x105599c: j	 0x10559e0 sll   zero, zero, 0
-	br L_10559e0
+// 0x010559ac: 0x10559ac: j	 0x10559f0 sll   zero, zero, 0
+	br L_10559f0
 // --- basic block ---
-L_10559a4:
-// 0x010559a4: 0x10559a4: jal   0x104d18c sll   zero, zero, 0
+L_10559b4:
+// 0x010559b4: 0x10559b4: jal   0x104d19c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_path_next_104d18c(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_path_next_104d19c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010559ac: 0x10559ac: addu  s1, v0, zero
+// 0x010559bc: 0x10559bc: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-L_10559b0:
-// 0x010559b0: 0x10559b0: addu  a0, v0, zero
+L_10559c0:
+// 0x010559c0: 0x10559c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010559b4: 0x10559b4: bne   v0, zero, 0x105597c addu  a1, s3, zero
+// 0x010559c4: 0x10559c4: bne   v0, zero, 0x105598c addu  a1, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brtrue L_105597c
+	brtrue L_105598c
 // --- basic block ---
-// 0x010559bc: 0x10559bc: lui   a1, 0x10000
+// 0x010559cc: 0x10559cc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010559c0: 0x10559c0: lui   a3, 0x10000
+// 0x010559d0: 0x10559d0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010559c4: 0x10559c4: addiu a1, a1, 7288
+// 0x010559d4: 0x10559d4: addiu a1, a1, 7284
 	ldloc.2
-	ldc.i4 7288
+	ldc.i4 7284
 	add
 	stloc.2
-// 0x010559c8: 0x10559c8: addiu a3, a3, 7372
+// 0x010559d8: 0x10559d8: addiu a3, a3, 7368
 	ldloc 4
-	ldc.i4 7372
+	ldc.i4 7368
 	add
 	stloc 4
-// 0x010559cc: 0x10559cc: addiu a0, zero, 4
+// 0x010559dc: 0x10559dc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010559d0: 0x10559d0: jal   0x100449c addiu a2, zero, 150
+// 0x010559e0: 0x10559e0: jal   0x100449c addiu a2, zero, 150
 	ldc.i4 150
 	stloc.3
 	ldloc.0
@@ -5289,61 +5289,61 @@ L_10559b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010559d8: 0x10559d8: j	 0x1055a7c sll   zero, zero, 0
-	br L_1055a7c
+// 0x010559e8: 0x10559e8: j	 0x1055a8c sll   zero, zero, 0
+	br L_1055a8c
 // --- basic block ---
-L_10559e0:
-// 0x010559e0: 0x10559e0: beq   s0, zero, 0x10559f8 sll   zero, zero, 0
+L_10559f0:
+// 0x010559f0: 0x10559f0: beq   s0, zero, 0x1055a08 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_10559f8
+	brfalse L_1055a08
 // --- basic block ---
-// 0x010559e8: 0x10559e8: lb    v0, 0(s0)
+// 0x010559f8: 0x10559f8: lb    v0, 0(s0)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010559ec: 0x10559ec: sll   zero, zero, 0
-// 0x010559f0: 0x10559f0: bne   v0, zero, 0x1055a04 lui   a3, 0x10000
+// 0x010559fc: 0x10559fc: sll   zero, zero, 0
+// 0x01055a00: 0x1055a00: bne   v0, zero, 0x1055a14 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1055a04
+	brtrue L_1055a14
 // --- basic block ---
-L_10559f8:
-// 0x010559f8: 0x10559f8: lui   s0, 0x10000
+L_1055a08:
+// 0x01055a08: 0x1055a08: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010559fc: 0x10559fc: addiu s0, s0, 7392
+// 0x01055a0c: 0x1055a0c: addiu s0, s0, 7388
 	ldloc 10
-	ldc.i4 7392
+	ldc.i4 7388
 	add
 	stloc 10
-// 0x01055a00: 0x1055a00: lui   a3, 0x10000
+// 0x01055a10: 0x1055a10: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-L_1055a04:
-// 0x01055a04: 0x1055a04: lui   a1, 0x10000
+L_1055a14:
+// 0x01055a14: 0x1055a14: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055a08: 0x1055a08: addiu a3, a3, 7400
+// 0x01055a18: 0x1055a18: addiu a3, a3, 7396
 	ldloc 4
-	ldc.i4 7400
+	ldc.i4 7396
 	add
 	stloc 4
-// 0x01055a0c: 0x1055a0c: addiu a1, a1, 7288
+// 0x01055a1c: 0x1055a1c: addiu a1, a1, 7284
 	ldloc.2
-	ldc.i4 7288
+	ldc.i4 7284
 	add
 	stloc.2
-// 0x01055a10: 0x1055a10: addiu a2, zero, 165
+// 0x01055a20: 0x1055a20: addiu a2, zero, 165
 	ldc.i4 165
 	stloc.3
-// 0x01055a14: 0x1055a14: addiu a0, zero, 1
+// 0x01055a24: 0x1055a24: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01055a18: 0x1055a18: lui   s1, 0x70000
+// 0x01055a28: 0x1055a28: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01055a1c: 0x1055a1c: jal   0x100449c sw    s0, 16(sp)
+// 0x01055a2c: 0x1055a2c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5362,26 +5362,26 @@ L_1055a04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055a24: 0x1055a24: lw    a0, 9152(s1)
+// 0x01055a34: 0x1055a34: lw    a0, 9616(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2288
+	ldc.i4 2404
 	add
 	ldelem.i4
 	stloc.1
-// 0x01055a28: 0x1055a28: jal   0x1001b48 sll   zero, zero, 0
+// 0x01055a38: 0x1055a38: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055a30: 0x1055a30: addu  a0, s0, zero
+// 0x01055a40: 0x1055a40: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x01055a34: 0x1055a34: jal   0x1001b48 addu  s2, v0, zero
+// 0x01055a44: 0x1055a44: jal   0x1001b48 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -5390,12 +5390,12 @@ L_1055a04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055a3c: 0x1055a3c: addu  v0, s2, v0
+// 0x01055a4c: 0x1055a4c: addu  v0, s2, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01055a40: 0x1055a40: jal   0x1000910 addiu a0, v0, 1
+// 0x01055a50: 0x1055a50: jal   0x1000910 addiu a0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
@@ -5410,22 +5410,22 @@ L_1055a04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055a48: 0x1055a48: lw    a1, 9152(s1)
+// 0x01055a58: 0x1055a58: lw    a1, 9616(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2288
+	ldc.i4 2404
 	add
 	ldelem.i4
 	stloc.2
-// 0x01055a4c: 0x1055a4c: addu  a2, s0, zero
+// 0x01055a5c: 0x1055a5c: addu  a2, s0, zero
 	ldloc 10
 	stloc.3
-// 0x01055a50: 0x1055a50: addu  a0, v0, zero
+// 0x01055a60: 0x1055a60: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055a54: 0x1055a54: jal   0x1000f64 addu  s2, v0, zero
+// 0x01055a64: 0x1055a64: jal   0x1000f64 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5438,10 +5438,10 @@ L_1055a04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055a5c: 0x1055a5c: lui   a0, 0x0
+// 0x01055a6c: 0x1055a6c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01055a60: 0x1055a60: jal   0x100e348 addiu a0, a0, 13964
+// 0x01055a70: 0x1055a70: jal   0x100e358 addiu a0, a0, 13964
 	ldloc.1
 	ldc.i4 13964
 	add
@@ -5451,21 +5451,21 @@ L_1055a04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01055a68: 0x1055a68: addu  a0, v0, zero
+// 0x01055a78: 0x1055a78: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055a6c: 0x1055a6c: jal   0x10ac5f4 addu  a1, s2, zero
+// 0x01055a7c: 0x1055a7c: jal   0x10acc3c addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-	call int32 Cibyl129::roadmap_spawn_10ac5f4()
+	call int32 Cibyl129::roadmap_spawn_10acc3c()
 	stloc 5
 // --- basic block ---
-// 0x01055a74: 0x1055a74: jal   0x1000930 addu  a0, s2, zero
+// 0x01055a84: 0x1055a84: jal   0x1000930 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5478,9 +5478,9 @@ L_1055a04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1055a7c:
-// 0x01055a7c: 0x1055a7c: lw    ra, 44(sp)
-// 0x01055a80: 0x1055a80: lw    s3, 40(sp)
+L_1055a8c:
+// 0x01055a8c: 0x1055a8c: lw    ra, 44(sp)
+// 0x01055a90: 0x1055a90: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5489,7 +5489,7 @@ L_1055a7c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01055a84: 0x1055a84: lw    s2, 36(sp)
+// 0x01055a94: 0x1055a94: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5498,7 +5498,7 @@ L_1055a7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01055a88: 0x1055a88: lw    s1, 32(sp)
+// 0x01055a98: 0x1055a98: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5507,7 +5507,7 @@ L_1055a7c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01055a8c: 0x1055a8c: lw    s0, 28(sp)
+// 0x01055a9c: 0x1055a9c: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5516,7 +5516,7 @@ L_1055a7c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01055a90: 0x1055a90: jr    ra addiu sp, sp, 48
+// 0x01055aa0: 0x1055aa0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5528,7 +5528,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_help_trips_1055a98(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_trips_1055aa8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5563,19 +5563,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1055a98:
-// 0x01055a98: 0x1055a98: lui   a0, 0x10000
+L_1055aa8:
+// 0x01055aa8: 0x1055aa8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055a9c: 0x1055a9c: addiu sp, sp, -24
+// 0x01055aac: 0x1055aac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01055aa0: 0x1055aa0: sw    ra, 20(sp)
-// 0x01055aa4: 0x1055aa4: jal   0x1055918 addiu a0, a0, 7420
+// 0x01055ab0: 0x1055ab0: sw    ra, 20(sp)
+// 0x01055ab4: 0x1055ab4: jal   0x1055928 addiu a0, a0, 7416
 	ldloc.1
-	ldc.i4 7420
+	ldc.i4 7416
 	add
 	stloc.1
 	ldloc.0
@@ -5583,14 +5583,14 @@ L_1055a98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_show_1055918(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_show_1055928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01055aac: 0x1055aac: lw    ra, 20(sp)
-// 0x01055ab0: 0x1055ab0: sll   zero, zero, 0
-// 0x01055ab4: 0x1055ab4: jr    ra addiu sp, sp, 24
+// 0x01055abc: 0x1055abc: lw    ra, 20(sp)
+// 0x01055ac0: 0x1055ac0: sll   zero, zero, 0
+// 0x01055ac4: 0x1055ac4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5602,7 +5602,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_help_street_1055abc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_street_1055acc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5637,19 +5637,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1055abc:
-// 0x01055abc: 0x1055abc: lui   a0, 0x10000
+L_1055acc:
+// 0x01055acc: 0x1055acc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055ac0: 0x1055ac0: addiu sp, sp, -24
+// 0x01055ad0: 0x1055ad0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01055ac4: 0x1055ac4: sw    ra, 20(sp)
-// 0x01055ac8: 0x1055ac8: jal   0x1055918 addiu a0, a0, 13528
+// 0x01055ad4: 0x1055ad4: sw    ra, 20(sp)
+// 0x01055ad8: 0x1055ad8: jal   0x1055928 addiu a0, a0, 13524
 	ldloc.1
-	ldc.i4 13528
+	ldc.i4 13524
 	add
 	stloc.1
 	ldloc.0
@@ -5657,14 +5657,14 @@ L_1055abc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_show_1055918(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_show_1055928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01055ad0: 0x1055ad0: lw    ra, 20(sp)
-// 0x01055ad4: 0x1055ad4: sll   zero, zero, 0
-// 0x01055ad8: 0x1055ad8: jr    ra addiu sp, sp, 24
+// 0x01055ae0: 0x1055ae0: lw    ra, 20(sp)
+// 0x01055ae4: 0x1055ae4: sll   zero, zero, 0
+// 0x01055ae8: 0x1055ae8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5676,7 +5676,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_help_key_1055ae0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_key_1055af0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5711,19 +5711,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1055ae0:
-// 0x01055ae0: 0x1055ae0: lui   a0, 0x10000
+L_1055af0:
+// 0x01055af0: 0x1055af0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055ae4: 0x1055ae4: addiu sp, sp, -24
+// 0x01055af4: 0x1055af4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01055ae8: 0x1055ae8: sw    ra, 20(sp)
-// 0x01055aec: 0x1055aec: jal   0x1055918 addiu a0, a0, 7428
+// 0x01055af8: 0x1055af8: sw    ra, 20(sp)
+// 0x01055afc: 0x1055afc: jal   0x1055928 addiu a0, a0, 7424
 	ldloc.1
-	ldc.i4 7428
+	ldc.i4 7424
 	add
 	stloc.1
 	ldloc.0
@@ -5731,14 +5731,14 @@ L_1055ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_show_1055918(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_show_1055928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01055af4: 0x1055af4: lw    ra, 20(sp)
-// 0x01055af8: 0x1055af8: sll   zero, zero, 0
-// 0x01055afc: 0x1055afc: jr    ra addiu sp, sp, 24
+// 0x01055b04: 0x1055b04: lw    ra, 20(sp)
+// 0x01055b08: 0x1055b08: sll   zero, zero, 0
+// 0x01055b0c: 0x1055b0c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5750,7 +5750,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_help_voice_1055b04(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_voice_1055b14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5785,17 +5785,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1055b04:
-// 0x01055b04: 0x1055b04: lui   a0, 0x10000
+L_1055b14:
+// 0x01055b14: 0x1055b14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055b08: 0x1055b08: addiu sp, sp, -24
+// 0x01055b18: 0x1055b18: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01055b0c: 0x1055b0c: sw    ra, 20(sp)
-// 0x01055b10: 0x1055b10: jal   0x1055918 addiu a0, a0, -23324
+// 0x01055b1c: 0x1055b1c: sw    ra, 20(sp)
+// 0x01055b20: 0x1055b20: jal   0x1055928 addiu a0, a0, -23324
 	ldloc.1
 	ldc.i4 -23324
 	add
@@ -5805,14 +5805,14 @@ L_1055b04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_show_1055918(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_show_1055928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01055b18: 0x1055b18: lw    ra, 20(sp)
-// 0x01055b1c: 0x1055b1c: sll   zero, zero, 0
-// 0x01055b20: 0x1055b20: jr    ra addiu sp, sp, 24
+// 0x01055b28: 0x1055b28: lw    ra, 20(sp)
+// 0x01055b2c: 0x1055b2c: sll   zero, zero, 0
+// 0x01055b30: 0x1055b30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5824,7 +5824,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_help_options_1055b28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_options_1055b38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5859,17 +5859,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1055b28:
-// 0x01055b28: 0x1055b28: lui   a0, 0x0
+L_1055b38:
+// 0x01055b38: 0x1055b38: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01055b2c: 0x1055b2c: addiu sp, sp, -24
+// 0x01055b3c: 0x1055b3c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01055b30: 0x1055b30: sw    ra, 20(sp)
-// 0x01055b34: 0x1055b34: jal   0x1055918 addiu a0, a0, 28308
+// 0x01055b40: 0x1055b40: sw    ra, 20(sp)
+// 0x01055b44: 0x1055b44: jal   0x1055928 addiu a0, a0, 28308
 	ldloc.1
 	ldc.i4 28308
 	add
@@ -5879,14 +5879,14 @@ L_1055b28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_show_1055918(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_show_1055928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01055b3c: 0x1055b3c: lw    ra, 20(sp)
-// 0x01055b40: 0x1055b40: sll   zero, zero, 0
-// 0x01055b44: 0x1055b44: jr    ra addiu sp, sp, 24
+// 0x01055b4c: 0x1055b4c: lw    ra, 20(sp)
+// 0x01055b50: 0x1055b50: sll   zero, zero, 0
+// 0x01055b54: 0x1055b54: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5898,7 +5898,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_help_install_1055b4c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_help_install_1055b5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5933,19 +5933,19 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1055b4c:
-// 0x01055b4c: 0x1055b4c: lui   a0, 0x10000
+L_1055b5c:
+// 0x01055b5c: 0x1055b5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055b50: 0x1055b50: addiu sp, sp, -24
+// 0x01055b60: 0x1055b60: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01055b54: 0x1055b54: sw    ra, 20(sp)
-// 0x01055b58: 0x1055b58: jal   0x1055918 addiu a0, a0, 7432
+// 0x01055b64: 0x1055b64: sw    ra, 20(sp)
+// 0x01055b68: 0x1055b68: jal   0x1055928 addiu a0, a0, 7428
 	ldloc.1
-	ldc.i4 7432
+	ldc.i4 7428
 	add
 	stloc.1
 	ldloc.0
@@ -5953,14 +5953,14 @@ L_1055b4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::roadmap_help_show_1055918(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::roadmap_help_show_1055928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01055b60: 0x1055b60: lw    ra, 20(sp)
-// 0x01055b64: 0x1055b64: sll   zero, zero, 0
-// 0x01055b68: 0x1055b68: jr    ra addiu sp, sp, 24
+// 0x01055b70: 0x1055b70: lw    ra, 20(sp)
+// 0x01055b74: 0x1055b74: sll   zero, zero, 0
+// 0x01055b78: 0x1055b78: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5972,7 +5972,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 on_drive_btn_cb_1055b70()
+.method public static int32 on_drive_btn_cb_1055b80()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -5986,7 +5986,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055b70: 0x1055b70: jr    ra addiu v0, zero, 1
+// 0x01055b80: 0x1055b80: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -5994,7 +5994,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_res_dlg_1055b78(int32,int32,int32,int32,int32)
+.method public static int32 navigate_res_dlg_1055b88(int32,int32,int32,int32,int32)
 {
 .maxstack 12
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 s0,int32 v0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -6056,12 +6056,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055b78: 0x1055b78: addiu sp, sp, -208
+// 0x01055b88: 0x1055b88: addiu sp, sp, -208
 	ldloc.0
 	ldc.i4 -208
 	add
 	stloc.0
-// 0x01055b7c: 0x1055b7c: sw    s3, 180(sp)
+// 0x01055b8c: 0x1055b8c: sw    s3, 180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6070,7 +6070,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01055b80: 0x1055b80: sw    s2, 176(sp)
+// 0x01055b90: 0x1055b90: sw    s2, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6079,20 +6079,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01055b84: 0x1055b84: addiu s3, sp, 48
+// 0x01055b94: 0x1055b94: addiu s3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 11
-// 0x01055b88: 0x1055b88: addiu s2, sp, 68
+// 0x01055b98: 0x1055b98: addiu s2, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 10
-// 0x01055b8c: 0x1055b8c: addiu v0, zero, 20
+// 0x01055b9c: 0x1055b9c: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 8
-// 0x01055b90: 0x1055b90: sw    s8, 200(sp)
+// 0x01055ba0: 0x1055ba0: sw    s8, 200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6101,7 +6101,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01055b94: 0x1055b94: sw    s4, 184(sp)
+// 0x01055ba4: 0x1055ba4: sw    s4, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6110,7 +6110,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01055b98: 0x1055b98: sw    s1, 172(sp)
+// 0x01055ba8: 0x1055ba8: sw    s1, 172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6119,7 +6119,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01055b9c: 0x1055b9c: sw    s0, 168(sp)
+// 0x01055bac: 0x1055bac: sw    s0, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6128,29 +6128,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01055ba0: 0x1055ba0: addu  s8, a2, zero
+// 0x01055bb0: 0x1055bb0: addu  s8, a2, zero
 	ldloc.3
 	stloc 16
-// 0x01055ba4: 0x1055ba4: addu  s0, a0, zero
+// 0x01055bb4: 0x1055bb4: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01055ba8: 0x1055ba8: addu  s1, a1, zero
+// 0x01055bb8: 0x1055bb8: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01055bac: 0x1055bac: addu  s4, a3, zero
+// 0x01055bbc: 0x1055bbc: addu  s4, a3, zero
 	ldloc 4
 	stloc 12
-// 0x01055bb0: 0x1055bb0: addu  a0, a2, zero
+// 0x01055bc0: 0x1055bc0: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01055bb4: 0x1055bb4: addu  a1, s2, zero
+// 0x01055bc4: 0x1055bc4: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01055bb8: 0x1055bb8: addu  a3, s3, zero
+// 0x01055bc8: 0x1055bc8: addu  a3, s3, zero
 	ldloc 11
 	stloc 4
-// 0x01055bbc: 0x1055bbc: sw    ra, 204(sp)
-// 0x01055bc0: 0x1055bc0: sw    s7, 196(sp)
+// 0x01055bcc: 0x1055bcc: sw    ra, 204(sp)
+// 0x01055bd0: 0x1055bd0: sw    s7, 196(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6159,7 +6159,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01055bc4: 0x1055bc4: sw    s6, 192(sp)
+// 0x01055bd4: 0x1055bd4: sw    s6, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6168,7 +6168,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01055bc8: 0x1055bc8: sw    s5, 188(sp)
+// 0x01055bd8: 0x1055bd8: sw    s5, 188(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6177,7 +6177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01055bcc: 0x1055bcc: sw    v0, 16(sp)
+// 0x01055bdc: 0x1055bdc: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6186,7 +6186,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01055bd0: 0x1055bd0: lw    s5, 224(sp)
+// 0x01055be0: 0x1055be0: lw    s5, 224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6195,7 +6195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01055bd4: 0x1055bd4: lw    s6, 228(sp)
+// 0x01055be4: 0x1055be4: lw    s6, 228(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6204,7 +6204,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01055bd8: 0x1055bd8: lw    s7, 232(sp)
+// 0x01055be8: 0x1055be8: lw    s7, 232(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6213,7 +6213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01055bdc: 0x1055bdc: jal   0x105a23c addiu a2, zero, 100
+// 0x01055bec: 0x1055bec: jal   0x105a24c addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
 	ldloc.0
@@ -6221,34 +6221,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_get_distance_str_105a23c(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_get_distance_str_105a24c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x01055be4: 0x1055be4: lui   a1, 0x10000
+// 0x01055bf4: 0x1055bf4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055be8: 0x1055be8: lui   a3, 0x10000
+// 0x01055bf8: 0x1055bf8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01055bec: 0x1055bec: addiu a1, a1, 7664
+// 0x01055bfc: 0x1055bfc: addiu a1, a1, 7660
 	ldloc.2
-	ldc.i4 7664
+	ldc.i4 7660
 	add
 	stloc.2
-// 0x01055bf0: 0x1055bf0: addiu a3, a3, 7704
+// 0x01055c00: 0x1055c00: addiu a3, a3, 7700
 	ldloc 4
-	ldc.i4 7704
+	ldc.i4 7700
 	add
 	stloc 4
-// 0x01055bf4: 0x1055bf4: addiu a0, zero, 2
+// 0x01055c04: 0x1055c04: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01055bf8: 0x1055bf8: addiu a2, zero, 337
+// 0x01055c08: 0x1055c08: addiu a2, zero, 337
 	ldc.i4 337
 	stloc.3
-// 0x01055bfc: 0x1055bfc: sw    s8, 24(sp)
+// 0x01055c0c: 0x1055c0c: sw    s8, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6257,7 +6257,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01055c00: 0x1055c00: sw    s0, 16(sp)
+// 0x01055c10: 0x1055c10: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6266,7 +6266,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01055c04: 0x1055c04: sw    s1, 20(sp)
+// 0x01055c14: 0x1055c14: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6275,7 +6275,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01055c08: 0x1055c08: sw    s4, 28(sp)
+// 0x01055c18: 0x1055c18: sw    s4, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6284,7 +6284,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01055c0c: 0x1055c0c: sw    s5, 32(sp)
+// 0x01055c1c: 0x1055c1c: sw    s5, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6293,7 +6293,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01055c10: 0x1055c10: sw    s6, 36(sp)
+// 0x01055c20: 0x1055c20: sw    s6, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6302,7 +6302,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01055c14: 0x1055c14: jal   0x100449c sw    s7, 40(sp)
+// 0x01055c24: 0x1055c24: jal   0x100449c sw    s7, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6321,49 +6321,49 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 8
 // --- basic block ---
-// 0x01055c1c: 0x1055c1c: lui   a0, 0x1050000
+// 0x01055c2c: 0x1055c2c: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01055c20: 0x1055c20: lui   v1, 0x1050000
+// 0x01055c30: 0x1055c30: lui   v1, 0x1050000
 	ldc.i4 17104896
 	stloc 6
-// 0x01055c24: 0x1055c24: addiu a0, a0, 23692
+// 0x01055c34: 0x1055c34: addiu a0, a0, 23708
 	ldloc.1
-	ldc.i4 23692
+	ldc.i4 23708
 	add
 	stloc.1
-// 0x01055c28: 0x1055c28: addiu v1, v1, 23408
+// 0x01055c38: 0x1055c38: addiu v1, v1, 23424
 	ldloc 6
-	ldc.i4 23408
+	ldc.i4 23424
 	add
 	stloc 6
-// 0x01055c2c: 0x1055c2c: cibyl_sysc_arg 0x10
+// 0x01055c3c: 0x1055c3c: cibyl_sysc_arg 0x10
 	ldloc 7
-// 0x01055c30: 0x1055c30: cibyl_sysc_arg 0x11
+// 0x01055c40: 0x1055c40: cibyl_sysc_arg 0x11
 	ldloc 9
-// 0x01055c34: 0x1055c34: cibyl_sysc_arg 0x12
+// 0x01055c44: 0x1055c44: cibyl_sysc_arg 0x12
 	ldloc 10
-// 0x01055c38: 0x1055c38: cibyl_sysc_arg 0x13
+// 0x01055c48: 0x1055c48: cibyl_sysc_arg 0x13
 	ldloc 11
-// 0x01055c3c: 0x1055c3c: cibyl_sysc_arg 0x14
+// 0x01055c4c: 0x1055c4c: cibyl_sysc_arg 0x14
 	ldloc 12
-// 0x01055c40: 0x1055c40: cibyl_sysc_arg 0x15
+// 0x01055c50: 0x1055c50: cibyl_sysc_arg 0x15
 	ldloc 13
-// 0x01055c44: 0x1055c44: cibyl_sysc_arg 0x16
+// 0x01055c54: 0x1055c54: cibyl_sysc_arg 0x16
 	ldloc 14
-// 0x01055c48: 0x1055c48: cibyl_sysc_arg 0x17
+// 0x01055c58: 0x1055c58: cibyl_sysc_arg 0x17
 	ldloc 15
-// 0x01055c4c: 0x1055c4c: cibyl_sysc_arg 0x3
+// 0x01055c5c: 0x1055c5c: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x01055c50: 0x1055c50: cibyl_sysc_arg 0x4
+// 0x01055c60: 0x1055c60: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01055c54: 0x1055c54: cibyl_sysc 0x1fee
+// 0x01055c64: 0x1055c64: cibyl_sysc 0x1fee
 	call void [WazeWP7]Syscalls::NOPH_NavigateResultDialog_showDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x01055c58: 0x1055c58: addu  s0, v0, zero
+// 0x01055c68: 0x1055c68: addu  s0, v0, zero
 	ldloc 8
 	stloc 7
-// 0x01055c5c: 0x1055c5c: lw    ra, 204(sp)
-// 0x01055c60: 0x1055c60: lw    s8, 200(sp)
+// 0x01055c6c: 0x1055c6c: lw    ra, 204(sp)
+// 0x01055c70: 0x1055c70: lw    s8, 200(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6372,7 +6372,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01055c64: 0x1055c64: lw    s7, 196(sp)
+// 0x01055c74: 0x1055c74: lw    s7, 196(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6381,7 +6381,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01055c68: 0x1055c68: lw    s6, 192(sp)
+// 0x01055c78: 0x1055c78: lw    s6, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6390,7 +6390,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01055c6c: 0x1055c6c: lw    s5, 188(sp)
+// 0x01055c7c: 0x1055c7c: lw    s5, 188(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6399,7 +6399,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01055c70: 0x1055c70: lw    s4, 184(sp)
+// 0x01055c80: 0x1055c80: lw    s4, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6408,7 +6408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01055c74: 0x1055c74: lw    s3, 180(sp)
+// 0x01055c84: 0x1055c84: lw    s3, 180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6417,7 +6417,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01055c78: 0x1055c78: lw    s2, 176(sp)
+// 0x01055c88: 0x1055c88: lw    s2, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6426,7 +6426,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01055c7c: 0x1055c7c: lw    s1, 172(sp)
+// 0x01055c8c: 0x1055c8c: lw    s1, 172(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6435,7 +6435,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01055c80: 0x1055c80: lw    s0, 168(sp)
+// 0x01055c90: 0x1055c90: lw    s0, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6444,7 +6444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01055c84: 0x1055c84: jr    ra addiu sp, sp, 208
+// 0x01055c94: 0x1055c94: jr    ra addiu sp, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
@@ -6456,7 +6456,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 on_alt_routes_btn_cb_1055c8c(int32,int32,int32,int32,int32)
+.method public static int32 on_alt_routes_btn_cb_1055c9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -6500,12 +6500,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055c8c: 0x1055c8c: addiu sp, sp, -976
+// 0x01055c9c: 0x1055c9c: addiu sp, sp, -976
 	ldloc.0
 	ldc.i4 -976
 	add
 	stloc.0
-// 0x01055c90: 0x1055c90: sw    s1, 964(sp)
+// 0x01055ca0: 0x1055ca0: sw    s1, 964(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6514,13 +6514,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01055c94: 0x1055c94: addiu s1, sp, 16
+// 0x01055ca4: 0x1055ca4: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 9
-// 0x01055c98: 0x1055c98: sw    ra, 972(sp)
-// 0x01055c9c: 0x1055c9c: sw    s2, 968(sp)
+// 0x01055ca8: 0x1055ca8: sw    ra, 972(sp)
+// 0x01055cac: 0x1055cac: sw    s2, 968(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6529,7 +6529,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01055ca0: 0x1055ca0: jal   0x108e4e0 sw    s0, 960(sp)
+// 0x01055cb0: 0x1055cb0: jal   0x108eb04 sw    s0, 960(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6538,41 +6538,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl106::RealtimeAltRoutes_Clear_108e4e0()
+	call int32 Cibyl106::RealtimeAltRoutes_Clear_108eb04()
 	stloc 5
 // --- basic block ---
-// 0x01055ca8: 0x1055ca8: jal   0x10568b4 addiu s2, sp, 24
+// 0x01055cb8: 0x1055cb8: jal   0x10568c4 addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 10
-	call int32 Cibyl64::navigate_main_get_src_position_10568b4()
+	call int32 Cibyl64::navigate_main_get_src_position_10568c4()
 	stloc 5
 // --- basic block ---
-// 0x01055cb0: 0x1055cb0: addu  a1, s1, zero
+// 0x01055cc0: 0x1055cc0: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01055cb4: 0x1055cb4: addiu a0, zero, -1
+// 0x01055cc4: 0x1055cc4: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01055cb8: 0x1055cb8: jal   0x10565fc addu  s0, v0, zero
+// 0x01055cc8: 0x1055cc8: jal   0x105660c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_get_waypoint_10565fc(int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_get_waypoint_105660c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055cc0: 0x1055cc0: lui   a0, 0x10000
+// 0x01055cd0: 0x1055cd0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055cc4: 0x1055cc4: jal   0x101cd60 addiu a0, a0, 1108
+// 0x01055cd4: 0x1055cd4: jal   0x101cd70 addiu a0, a0, 1104
 	ldloc.1
-	ldc.i4 1108
+	ldc.i4 1104
 	add
 	stloc.1
 	ldloc.0
@@ -6580,34 +6580,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055ccc: 0x1055ccc: jal   0x104c3d0 addu  a0, v0, zero
+// 0x01055cdc: 0x1055cdc: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01055cd4: 0x1055cd4: jal   0x108e4ec addu  a0, s2, zero
+// 0x01055ce4: 0x1055ce4: jal   0x108eb10 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl106::RealtimeAltRoutes_Init_Record_108e4ec(int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Init_Record_108eb10(int32)
 	stloc 5
 // --- basic block ---
-// 0x01055cdc: 0x1055cdc: lw    v0, 0(s0)
+// 0x01055cec: 0x1055cec: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01055ce0: 0x1055ce0: sll   zero, zero, 0
-// 0x01055ce4: 0x1055ce4: sw    v0, 796(sp)
+// 0x01055cf0: 0x1055cf0: sll   zero, zero, 0
+// 0x01055cf4: 0x1055cf4: sw    v0, 796(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6616,7 +6616,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055ce8: 0x1055ce8: lw    v0, 4(s0)
+// 0x01055cf8: 0x1055cf8: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6625,8 +6625,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055cec: 0x1055cec: sll   zero, zero, 0
-// 0x01055cf0: 0x1055cf0: sw    v0, 800(sp)
+// 0x01055cfc: 0x1055cfc: sll   zero, zero, 0
+// 0x01055d00: 0x1055d00: sw    v0, 800(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6635,7 +6635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055cf4: 0x1055cf4: lw    v0, 16(sp)
+// 0x01055d04: 0x1055d04: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6644,8 +6644,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055cf8: 0x1055cf8: sll   zero, zero, 0
-// 0x01055cfc: 0x1055cfc: sw    v0, 804(sp)
+// 0x01055d08: 0x1055d08: sll   zero, zero, 0
+// 0x01055d0c: 0x1055d0c: sw    v0, 804(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6654,7 +6654,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055d00: 0x1055d00: lw    v0, 20(sp)
+// 0x01055d10: 0x1055d10: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6663,8 +6663,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055d04: 0x1055d04: sll   zero, zero, 0
-// 0x01055d08: 0x1055d08: sw    v0, 808(sp)
+// 0x01055d14: 0x1055d14: sll   zero, zero, 0
+// 0x01055d18: 0x1055d18: sw    v0, 808(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6673,10 +6673,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055d0c: 0x1055d0c: addiu v0, zero, -1
+// 0x01055d1c: 0x1055d1c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01055d10: 0x1055d10: jal   0x105944c sw    v0, 24(sp)
+// 0x01055d20: 0x1055d20: jal   0x105945c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6690,20 +6690,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055d18: 0x1055d18: lui   a0, 0x10000
+// 0x01055d28: 0x1055d28: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055d1c: 0x1055d1c: addiu a1, sp, 804
+// 0x01055d2c: 0x1055d2c: addiu a1, sp, 804
 	ldloc.0
 	ldc.i4 804
 	add
 	stloc.2
-// 0x01055d20: 0x1055d20: jal   0x101f76c addiu a0, a0, -29748
+// 0x01055d30: 0x1055d30: jal   0x101f77c addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -6713,20 +6713,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055d28: 0x1055d28: lui   a0, 0x10000
+// 0x01055d38: 0x1055d38: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055d2c: 0x1055d2c: addiu a1, sp, 796
+// 0x01055d3c: 0x1055d3c: addiu a1, sp, 796
 	ldloc.0
 	ldc.i4 796
 	add
 	stloc.2
-// 0x01055d30: 0x1055d30: jal   0x101f76c addiu a0, a0, -29760
+// 0x01055d40: 0x1055d40: jal   0x101f77c addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -6736,12 +6736,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055d38: 0x1055d38: jal   0x108eba0 addu  a0, s2, zero
+// 0x01055d48: 0x1055d48: jal   0x108f1c4 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -6749,21 +6749,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeAltRoutes_Add_Route_108eba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Add_Route_108f1c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055d40: 0x1055d40: addu  a1, s0, zero
+// 0x01055d50: 0x1055d50: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01055d44: 0x1055d44: addu  a2, s1, zero
+// 0x01055d54: 0x1055d54: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x01055d48: 0x1055d48: addiu a0, zero, -1
+// 0x01055d58: 0x1055d58: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x01055d4c: 0x1055d4c: jal   0x108e7b8 addiu a3, zero, 3
+// 0x01055d5c: 0x1055d5c: jal   0x108eddc addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
 	ldloc.0
@@ -6771,16 +6771,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::RealtimeAltRoutes_Route_Request_108e7b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl106::RealtimeAltRoutes_Route_Request_108eddc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055d54: 0x1055d54: lw    ra, 972(sp)
-// 0x01055d58: 0x1055d58: addiu v0, zero, 1
+// 0x01055d64: 0x1055d64: lw    ra, 972(sp)
+// 0x01055d68: 0x1055d68: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01055d5c: 0x1055d5c: lw    s2, 968(sp)
+// 0x01055d6c: 0x1055d6c: lw    s2, 968(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6789,7 +6789,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01055d60: 0x1055d60: lw    s1, 964(sp)
+// 0x01055d70: 0x1055d70: lw    s1, 964(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6798,7 +6798,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01055d64: 0x1055d64: lw    s0, 960(sp)
+// 0x01055d74: 0x1055d74: lw    s0, 960(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6807,7 +6807,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01055d68: 0x1055d68: jr    ra addiu sp, sp, 976
+// 0x01055d78: 0x1055d78: jr    ra addiu sp, sp, 976
 	ldloc.0
 	ldc.i4 976
 	add
@@ -6819,7 +6819,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_res_update_ETA_widget_1055d70(int32,int32,int32,int32,int32)
+.method public static int32 navigate_res_update_ETA_widget_1055d80(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s6,int32 s2,int32 s3,int32 s4,int32 s5,int32 hi,int32 lo,int32 s7,int32 t0,int32 ra)
@@ -6887,12 +6887,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01055d70: 0x1055d70: addiu sp, sp, -488
+// 0x01055d80: 0x1055d80: addiu sp, sp, -488
 	ldloc.0
 	ldc.i4 -488
 	add
 	stloc.0
-// 0x01055d74: 0x1055d74: sw    s1, 456(sp)
+// 0x01055d84: 0x1055d84: sw    s1, 456(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6901,16 +6901,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01055d78: 0x1055d78: addu  s1, a0, zero
+// 0x01055d88: 0x1055d88: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01055d7c: 0x1055d7c: addiu a0, sp, 44
+// 0x01055d8c: 0x1055d8c: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x01055d80: 0x1055d80: sw    ra, 484(sp)
-// 0x01055d84: 0x1055d84: sw    s7, 480(sp)
+// 0x01055d90: 0x1055d90: sw    ra, 484(sp)
+// 0x01055d94: 0x1055d94: sw    s7, 480(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6919,7 +6919,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01055d88: 0x1055d88: sw    s6, 476(sp)
+// 0x01055d98: 0x1055d98: sw    s6, 476(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6928,13 +6928,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01055d8c: 0x1055d8c: addu  s7, a1, zero
+// 0x01055d9c: 0x1055d9c: addu  s7, a1, zero
 	ldloc.2
 	stloc 17
-// 0x01055d90: 0x1055d90: addu  s6, a2, zero
+// 0x01055da0: 0x1055da0: addu  s6, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01055d94: 0x1055d94: sw    s5, 472(sp)
+// 0x01055da4: 0x1055da4: sw    s5, 472(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6943,7 +6943,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01055d98: 0x1055d98: sw    s4, 468(sp)
+// 0x01055da8: 0x1055da8: sw    s4, 468(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6952,7 +6952,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01055d9c: 0x1055d9c: sw    s3, 464(sp)
+// 0x01055dac: 0x1055dac: sw    s3, 464(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6961,7 +6961,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01055da0: 0x1055da0: sw    s2, 460(sp)
+// 0x01055db0: 0x1055db0: sw    s2, 460(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6970,7 +6970,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01055da4: 0x1055da4: sw    s0, 452(sp)
+// 0x01055db4: 0x1055db4: sw    s0, 452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6979,7 +6979,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01055da8: 0x1055da8: jal   0x10574f8 addu  s2, a3, zero
+// 0x01055db8: 0x1055db8: jal   0x1057508 addu  s2, a3, zero
 	ldloc 4
 	stloc 11
 	ldloc.0
@@ -6987,15 +6987,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_get_current_time_10574f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_get_current_time_1057508(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055db0: 0x1055db0: addiu v1, zero, 3600
+// 0x01055dc0: 0x1055dc0: addiu v1, zero, 3600
 	ldc.i4 3600
 	stloc 7
-// 0x01055db4: 0x1055db4: div   s6, v1
+// 0x01055dc4: 0x1055dc4: div   s6, v1
 	ldloc 10
 	ldloc 7
 	ldloc 10
@@ -7004,10 +7004,10 @@ __CIBYL_javamethod_begin:
 	stloc 16
 	rem
 	stloc 15
-// 0x01055db8: 0x1055db8: addiu v0, zero, 60
+// 0x01055dc8: 0x1055dc8: addiu v0, zero, 60
 	ldc.i4.s 60
 	stloc 5
-// 0x01055dbc: 0x1055dbc: lw    a1, 44(sp)
+// 0x01055dcc: 0x1055dcc: lw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7016,7 +7016,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01055dc0: 0x1055dc0: lw    a2, 48(sp)
+// 0x01055dd0: 0x1055dd0: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7025,7 +7025,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01055dc4: 0x1055dc4: lw    a3, 52(sp)
+// 0x01055dd4: 0x1055dd4: lw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7034,36 +7034,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01055dc8: 0x1055dc8: addiu a0, sp, 32
+// 0x01055dd8: 0x1055dd8: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01055dcc: 0x1055dcc: addiu s4, sp, 88
+// 0x01055ddc: 0x1055ddc: addiu s4, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc 13
-// 0x01055dd0: 0x1055dd0: addiu s3, sp, 68
+// 0x01055de0: 0x1055de0: addiu s3, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 12
-// 0x01055dd4: 0x1055dd4: addiu s0, sp, 188
+// 0x01055de4: 0x1055de4: addiu s0, sp, 188
 	ldloc.0
 	ldc.i4 188
 	add
 	stloc 8
-// 0x01055dd8: 0x1055dd8: addiu s5, zero, 250
+// 0x01055de8: 0x1055de8: addiu s5, zero, 250
 	ldc.i4 250
 	stloc 14
-// 0x01055ddc: 0x1055ddc: mfhi  hi
+// 0x01055dec: 0x1055dec: mfhi  hi
 	ldloc 15
 	stloc 7
-// 0x01055de0: 0x1055de0: mflo  lo
+// 0x01055df0: 0x1055df0: mflo  lo
 	ldloc 16
 	stloc 18
-// 0x01055de4: 0x1055de4: sw    t0, 16(sp)
+// 0x01055df4: 0x1055df4: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7072,7 +7072,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01055de8: 0x1055de8: sw    t0, 56(sp)
+// 0x01055df8: 0x1055df8: sw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7081,7 +7081,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01055dec: 0x1055dec: div   v1, v0
+// 0x01055dfc: 0x1055dfc: div   v1, v0
 	ldloc 7
 	ldloc 5
 	ldloc 7
@@ -7090,10 +7090,10 @@ __CIBYL_javamethod_begin:
 	stloc 16
 	rem
 	stloc 15
-// 0x01055df0: 0x1055df0: mflo  lo
+// 0x01055e00: 0x1055e00: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x01055df4: 0x1055df4: sw    v1, 20(sp)
+// 0x01055e04: 0x1055e04: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7102,7 +7102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01055df8: 0x1055df8: sw    v1, 60(sp)
+// 0x01055e08: 0x1055e08: sw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7111,7 +7111,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01055dfc: 0x1055dfc: div   s6, v0
+// 0x01055e0c: 0x1055e0c: div   s6, v0
 	ldloc 10
 	ldloc 5
 	ldloc 10
@@ -7120,10 +7120,10 @@ __CIBYL_javamethod_begin:
 	stloc 16
 	rem
 	stloc 15
-// 0x01055e00: 0x1055e00: mfhi  hi
+// 0x01055e10: 0x1055e10: mfhi  hi
 	ldloc 15
 	stloc 5
-// 0x01055e04: 0x1055e04: sw    v0, 24(sp)
+// 0x01055e14: 0x1055e14: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7132,7 +7132,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01055e08: 0x1055e08: jal   0x105753c sw    v0, 64(sp)
+// 0x01055e18: 0x1055e18: jal   0x105754c sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7146,27 +7146,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_calculate_eta_105753c(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_calculate_eta_105754c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e10: 0x1055e10: addu  a1, s4, zero
+// 0x01055e20: 0x1055e20: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x01055e14: 0x1055e14: addiu a2, zero, 100
+// 0x01055e24: 0x1055e24: addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
-// 0x01055e18: 0x1055e18: addu  a3, s3, zero
+// 0x01055e28: 0x1055e28: addu  a3, s3, zero
 	ldloc 12
 	stloc 4
-// 0x01055e1c: 0x1055e1c: addiu v0, zero, 20
+// 0x01055e2c: 0x1055e2c: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x01055e20: 0x1055e20: addu  a0, s7, zero
+// 0x01055e30: 0x1055e30: addu  a0, s7, zero
 	ldloc 17
 	stloc.1
-// 0x01055e24: 0x1055e24: jal   0x105a23c sw    v0, 16(sp)
+// 0x01055e34: 0x1055e34: jal   0x105a24c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7180,46 +7180,46 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_get_distance_str_105a23c(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_get_distance_str_105a24c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e2c: 0x1055e2c: jal   0x10c09c0 addu  a0, s6, zero
+// 0x01055e3c: 0x1055e3c: jal   0x10c1000 addu  a0, s6, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e34: 0x1055e34: lui   a0, 0x20000
+// 0x01055e44: 0x1055e44: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01055e38: 0x1055e38: lw    a3, 23884(a0)
+// 0x01055e48: 0x1055e48: lw    a3, 24348(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5971
+	ldc.i4 6087
 	add
 	ldelem.i4
 	stloc 4
-// 0x01055e3c: 0x1055e3c: lw    a2, 23880(a0)
+// 0x01055e4c: 0x1055e4c: lw    a2, 24344(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5970
+	ldc.i4 6086
 	add
 	ldelem.i4
 	stloc.3
-// 0x01055e40: 0x1055e40: addu  a1, v1, zero
+// 0x01055e50: 0x1055e50: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01055e44: 0x1055e44: jal   0x10c0798 addu  a0, v0, zero
+// 0x01055e54: 0x1055e54: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -7227,40 +7227,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e4c: 0x1055e4c: addu  a1, v1, zero
+// 0x01055e5c: 0x1055e5c: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01055e50: 0x1055e50: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01055e60: 0x1055e60: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e58: 0x1055e58: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x01055e68: 0x1055e68: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x01055e5c: 0x1055e5c: addiu a2, a2, -13884
+// 0x01055e6c: 0x1055e6c: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x01055e60: 0x1055e60: addu  a3, v0, zero
+// 0x01055e70: 0x1055e70: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01055e64: 0x1055e64: addu  a0, s0, zero
+// 0x01055e74: 0x1055e74: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01055e68: 0x1055e68: jal   0x1000f9c addiu a1, zero, 250
+// 0x01055e78: 0x1055e78: jal   0x1000f9c addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
 	ldloc.0
@@ -7273,15 +7273,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e70: 0x1055e70: lui   a1, 0x10000
+// 0x01055e80: 0x1055e80: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055e74: 0x1055e74: addu  a0, s1, zero
+// 0x01055e84: 0x1055e84: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01055e78: 0x1055e78: jal   0x109b304 addiu a1, a1, 7876
+// 0x01055e88: 0x1055e88: jal   0x109b94c addiu a1, a1, 7872
 	ldloc.2
-	ldc.i4 7876
+	ldc.i4 7872
 	add
 	stloc.2
 	ldloc.0
@@ -7289,15 +7289,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e80: 0x1055e80: addu  a0, v0, zero
+// 0x01055e90: 0x1055e90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055e84: 0x1055e84: jal   0x1097e5c addu  a1, s0, zero
+// 0x01055e94: 0x1055e94: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -7305,15 +7305,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e8c: 0x1055e8c: addu  a0, s0, zero
+// 0x01055e9c: 0x1055e9c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01055e90: 0x1055e90: jal   0x1001b48 sb    zero, 188(sp)
+// 0x01055ea0: 0x1055ea0: jal   0x1001b48 sb    zero, 188(sp)
 	ldloc.0
 	ldc.i4 188
 	add
@@ -7325,15 +7325,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055e98: 0x1055e98: lui   a0, 0x10000
+// 0x01055ea8: 0x1055ea8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01055e9c: 0x1055e9c: addiu a0, a0, 7896
+// 0x01055eac: 0x1055eac: addiu a0, a0, 7892
 	ldloc.1
-	ldc.i4 7896
+	ldc.i4 7892
 	add
 	stloc.1
-// 0x01055ea0: 0x1055ea0: jal   0x101cd60 addu  s6, v0, zero
+// 0x01055eb0: 0x1055eb0: jal   0x101cd70 addu  s6, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -7341,28 +7341,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055ea8: 0x1055ea8: lui   a2, 0x10000
+// 0x01055eb8: 0x1055eb8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01055eac: 0x1055eac: addiu a2, a2, 19912
+// 0x01055ebc: 0x1055ebc: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01055eb0: 0x1055eb0: addu  a3, v0, zero
+// 0x01055ec0: 0x1055ec0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01055eb4: 0x1055eb4: subu  a1, s5, s6
+// 0x01055ec4: 0x1055ec4: subu  a1, s5, s6
 	ldloc 14
 	ldloc 10
 	sub
 	stloc.2
-// 0x01055eb8: 0x1055eb8: jal   0x1000f9c addu  a0, s0, s6
+// 0x01055ec8: 0x1055ec8: jal   0x1000f9c addu  a0, s0, s6
 	ldloc 8
 	ldloc 10
 	add
@@ -7377,15 +7377,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055ec0: 0x1055ec0: lui   a1, 0x10000
+// 0x01055ed0: 0x1055ed0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055ec4: 0x1055ec4: addu  a0, s1, zero
+// 0x01055ed4: 0x1055ed4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01055ec8: 0x1055ec8: jal   0x109b304 addiu a1, a1, 7900
+// 0x01055ed8: 0x1055ed8: jal   0x109b94c addiu a1, a1, 7896
 	ldloc.2
-	ldc.i4 7900
+	ldc.i4 7896
 	add
 	stloc.2
 	ldloc.0
@@ -7393,15 +7393,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055ed0: 0x1055ed0: addu  a0, v0, zero
+// 0x01055ee0: 0x1055ee0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055ed4: 0x1055ed4: jal   0x1097e5c addu  a1, s0, zero
+// 0x01055ee4: 0x1055ee4: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -7409,15 +7409,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055edc: 0x1055edc: addu  a0, s0, zero
+// 0x01055eec: 0x1055eec: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01055ee0: 0x1055ee0: jal   0x1001b48 sb    zero, 188(sp)
+// 0x01055ef0: 0x1055ef0: jal   0x1001b48 sb    zero, 188(sp)
 	ldloc.0
 	ldc.i4 188
 	add
@@ -7429,12 +7429,12 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055ee8: 0x1055ee8: subu  a1, s5, v0
+// 0x01055ef8: 0x1055ef8: subu  a1, s5, v0
 	ldloc 14
 	ldloc 5
 	sub
 	stloc.2
-// 0x01055eec: 0x1055eec: lw    a3, 32(sp)
+// 0x01055efc: 0x1055efc: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7443,15 +7443,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01055ef0: 0x1055ef0: addu  a0, s0, v0
+// 0x01055f00: 0x1055f00: addu  a0, s0, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x01055ef4: 0x1055ef4: lui   a2, 0x10000
+// 0x01055f04: 0x1055f04: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01055ef8: 0x1055ef8: lw    v0, 36(sp)
+// 0x01055f08: 0x1055f08: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7460,12 +7460,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055efc: 0x1055efc: addiu a2, a2, 7912
+// 0x01055f0c: 0x1055f0c: addiu a2, a2, 7908
 	ldloc.3
-	ldc.i4 7912
+	ldc.i4 7908
 	add
 	stloc.3
-// 0x01055f00: 0x1055f00: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01055f10: 0x1055f10: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7484,15 +7484,15 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055f08: 0x1055f08: lui   a1, 0x10000
+// 0x01055f18: 0x1055f18: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055f0c: 0x1055f0c: addu  a0, s1, zero
+// 0x01055f1c: 0x1055f1c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01055f10: 0x1055f10: jal   0x109b304 addiu a1, a1, 7920
+// 0x01055f20: 0x1055f20: jal   0x109b94c addiu a1, a1, 7916
 	ldloc.2
-	ldc.i4 7920
+	ldc.i4 7916
 	add
 	stloc.2
 	ldloc.0
@@ -7500,15 +7500,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055f18: 0x1055f18: addu  a0, v0, zero
+// 0x01055f28: 0x1055f28: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055f1c: 0x1055f1c: jal   0x1097e5c addu  a1, s0, zero
+// 0x01055f2c: 0x1055f2c: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -7516,12 +7516,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055f24: 0x1055f24: lw    v0, 504(sp)
+// 0x01055f34: 0x1055f34: lw    v0, 504(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7530,20 +7530,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01055f28: 0x1055f28: sll   zero, zero, 0
-// 0x01055f2c: 0x1055f2c: beq   v0, zero, 0x1055f6c sll   zero, zero, 0
+// 0x01055f38: 0x1055f38: sll   zero, zero, 0
+// 0x01055f3c: 0x1055f3c: beq   v0, zero, 0x1055f7c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1055f6c
+	brfalse L_1055f7c
 // --- basic block ---
-// 0x01055f34: 0x1055f34: lui   a1, 0x10000
+// 0x01055f44: 0x1055f44: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055f38: 0x1055f38: addiu a1, a1, 7940
+// 0x01055f48: 0x1055f48: addiu a1, a1, 7936
 	ldloc.2
-	ldc.i4 7940
+	ldc.i4 7936
 	add
 	stloc.2
-// 0x01055f3c: 0x1055f3c: jal   0x109b304 addu  a0, s1, zero
+// 0x01055f4c: 0x1055f4c: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7551,15 +7551,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055f44: 0x1055f44: addu  a0, v0, zero
+// 0x01055f54: 0x1055f54: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055f48: 0x1055f48: jal   0x1097e5c addu  a1, s4, zero
+// 0x01055f58: 0x1055f58: jal   0x10984a4 addu  a1, s4, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -7567,20 +7567,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055f50: 0x1055f50: lui   a1, 0x10000
+// 0x01055f60: 0x1055f60: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055f54: 0x1055f54: addu  a0, s1, zero
+// 0x01055f64: 0x1055f64: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01055f58: 0x1055f58: jal   0x109b304 addiu a1, a1, 7960
+// 0x01055f68: 0x1055f68: jal   0x109b94c addiu a1, a1, 7956
 	ldloc.2
-	ldc.i4 7960
+	ldc.i4 7956
 	add
 	stloc.2
 	ldloc.0
@@ -7588,15 +7588,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055f60: 0x1055f60: addu  a0, v0, zero
+// 0x01055f70: 0x1055f70: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055f64: 0x1055f64: jal   0x1097e5c addu  a1, s3, zero
+// 0x01055f74: 0x1055f74: jal   0x10984a4 addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -7604,33 +7604,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1055f6c:
-// 0x01055f6c: 0x1055f6c: beq   s2, zero, 0x1055fd8 sll   zero, zero, 0
+L_1055f7c:
+// 0x01055f7c: 0x1055f7c: beq   s2, zero, 0x1055fe8 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_1055fd8
+	brfalse L_1055fe8
 // --- basic block ---
-// 0x01055f74: 0x1055f74: lb    v0, 0(s2)
+// 0x01055f84: 0x1055f84: lb    v0, 0(s2)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01055f78: 0x1055f78: sll   zero, zero, 0
-// 0x01055f7c: 0x1055f7c: beq   v0, zero, 0x1055fd8 lui   a0, 0x10000
+// 0x01055f88: 0x1055f88: sll   zero, zero, 0
+// 0x01055f8c: 0x1055f8c: beq   v0, zero, 0x1055fe8 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1055fd8
+	brfalse L_1055fe8
 // --- basic block ---
-// 0x01055f84: 0x1055f84: addiu a0, a0, -24
+// 0x01055f94: 0x1055f94: addiu a0, a0, -28
 	ldloc.1
-	ldc.i4.s -24
+	ldc.i4.s -28
 	add
 	stloc.1
-// 0x01055f88: 0x1055f88: jal   0x101cd60 sb    zero, 188(sp)
+// 0x01055f98: 0x1055f98: jal   0x101cd70 sb    zero, 188(sp)
 	ldloc.0
 	ldc.i4 188
 	add
@@ -7641,20 +7641,20 @@ L_1055f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055f90: 0x1055f90: addu  a0, s2, zero
+// 0x01055fa0: 0x1055fa0: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01055f94: 0x1055f94: addiu s0, sp, 188
+// 0x01055fa4: 0x1055fa4: addiu s0, sp, 188
 	ldloc.0
 	ldc.i4 188
 	add
 	stloc 8
-// 0x01055f98: 0x1055f98: jal   0x101cd60 sw    v0, 440(sp)
+// 0x01055fa8: 0x1055fa8: jal   0x101cd70 sw    v0, 440(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7668,12 +7668,12 @@ L_1055f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055fa0: 0x1055fa0: lw    a3, 440(sp)
+// 0x01055fb0: 0x1055fb0: lw    a3, 440(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7682,21 +7682,21 @@ L_1055f6c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01055fa4: 0x1055fa4: lui   a2, 0x10000
+// 0x01055fb4: 0x1055fb4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01055fa8: 0x1055fa8: addiu a2, a2, -20
+// 0x01055fb8: 0x1055fb8: addiu a2, a2, -24
 	ldloc.3
-	ldc.i4.s -20
+	ldc.i4.s -24
 	add
 	stloc.3
-// 0x01055fac: 0x1055fac: addiu a1, zero, 250
+// 0x01055fbc: 0x1055fbc: addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
-// 0x01055fb0: 0x1055fb0: addu  a0, s0, zero
+// 0x01055fc0: 0x1055fc0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01055fb4: 0x1055fb4: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01055fc4: 0x1055fc4: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7715,15 +7715,15 @@ L_1055f6c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055fbc: 0x1055fbc: lui   a1, 0x10000
+// 0x01055fcc: 0x1055fcc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01055fc0: 0x1055fc0: addu  a0, s1, zero
+// 0x01055fd0: 0x1055fd0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01055fc4: 0x1055fc4: jal   0x109b304 addiu a1, a1, 7988
+// 0x01055fd4: 0x1055fd4: jal   0x109b94c addiu a1, a1, 7984
 	ldloc.2
-	ldc.i4 7988
+	ldc.i4 7984
 	add
 	stloc.2
 	ldloc.0
@@ -7731,15 +7731,15 @@ L_1055f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01055fcc: 0x1055fcc: addu  a0, v0, zero
+// 0x01055fdc: 0x1055fdc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01055fd0: 0x1055fd0: jal   0x1097e5c addu  a1, s0, zero
+// 0x01055fe0: 0x1055fe0: jal   0x10984a4 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -7747,14 +7747,14 @@ L_1055f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1055fd8:
-// 0x01055fd8: 0x1055fd8: lw    ra, 484(sp)
-// 0x01055fdc: 0x1055fdc: lw    s7, 480(sp)
+L_1055fe8:
+// 0x01055fe8: 0x1055fe8: lw    ra, 484(sp)
+// 0x01055fec: 0x1055fec: lw    s7, 480(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7763,7 +7763,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01055fe0: 0x1055fe0: lw    s6, 476(sp)
+// 0x01055ff0: 0x1055ff0: lw    s6, 476(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7772,7 +7772,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01055fe4: 0x1055fe4: lw    s5, 472(sp)
+// 0x01055ff4: 0x1055ff4: lw    s5, 472(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7781,7 +7781,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01055fe8: 0x1055fe8: lw    s4, 468(sp)
+// 0x01055ff8: 0x1055ff8: lw    s4, 468(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7790,7 +7790,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01055fec: 0x1055fec: lw    s3, 464(sp)
+// 0x01055ffc: 0x1055ffc: lw    s3, 464(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7799,7 +7799,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01055ff0: 0x1055ff0: lw    s2, 460(sp)
+// 0x01056000: 0x1056000: lw    s2, 460(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7808,7 +7808,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01055ff4: 0x1055ff4: lw    s1, 456(sp)
+// 0x01056004: 0x1056004: lw    s1, 456(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7817,7 +7817,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01055ff8: 0x1055ff8: lw    s0, 452(sp)
+// 0x01056008: 0x1056008: lw    s0, 452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7826,7 +7826,7 @@ L_1055fd8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01055ffc: 0x1055ffc: jr    ra addiu sp, sp, 488
+// 0x0105600c: 0x105600c: jr    ra addiu sp, sp, 488
 	ldloc.0
 	ldc.i4 488
 	add
diff --git a/converted/Cibyl64.j b/converted/Cibyl64.j
index c79c6fd..37d5bd9 100644
--- a/converted/Cibyl64.j
+++ b/converted/Cibyl64.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl64::.ctor
 
-.method public static int32 navigate_res_show_ETA_widget_1056004(int32,int32,int32,int32,int32)
+.method public static int32 navigate_res_show_ETA_widget_1056014(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -76,21 +76,21 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056004: 0x1056004: addiu sp, sp, -24
+// 0x01056014: 0x1056014: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01056008: 0x1056008: beq   a0, zero, 0x105602c sw    ra, 20(sp)
+// 0x01056018: 0x1056018: beq   a0, zero, 0x105603c sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_105602c
+	brfalse L_105603c
 // --- basic block ---
-// 0x01056010: 0x1056010: lui   a1, 0x10000
+// 0x01056020: 0x1056020: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01056014: 0x1056014: jal   0x109b304 addiu a1, a1, 8004
+// 0x01056024: 0x1056024: jal   0x109b94c addiu a1, a1, 8000
 	ldloc.2
-	ldc.i4 8004
+	ldc.i4 8000
 	add
 	stloc.2
 	ldloc.0
@@ -98,28 +98,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105601c: 0x105601c: beq   v0, zero, 0x105602c sll   zero, zero, 0
+// 0x0105602c: 0x105602c: beq   v0, zero, 0x105603c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105602c
+	brfalse L_105603c
 // --- basic block ---
-// 0x01056024: 0x1056024: jal   0x10990ac addu  a0, v0, zero
+// 0x01056034: 0x1056034: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105602c:
-// 0x0105602c: 0x105602c: lw    ra, 20(sp)
-// 0x01056030: 0x1056030: sll   zero, zero, 0
-// 0x01056034: 0x1056034: jr    ra addiu sp, sp, 24
+L_105603c:
+// 0x0105603c: 0x105603c: lw    ra, 20(sp)
+// 0x01056040: 0x1056040: sll   zero, zero, 0
+// 0x01056044: 0x1056044: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -131,7 +131,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_res_hide_ETA_widget_105603c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_res_hide_ETA_widget_105604c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -166,21 +166,21 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105603c: 0x105603c: addiu sp, sp, -24
+// 0x0105604c: 0x105604c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01056040: 0x1056040: beq   a0, zero, 0x1056064 sw    ra, 20(sp)
+// 0x01056050: 0x1056050: beq   a0, zero, 0x1056074 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1056064
+	brfalse L_1056074
 // --- basic block ---
-// 0x01056048: 0x1056048: lui   a1, 0x10000
+// 0x01056058: 0x1056058: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105604c: 0x105604c: jal   0x109b304 addiu a1, a1, 8004
+// 0x0105605c: 0x105605c: jal   0x109b94c addiu a1, a1, 8000
 	ldloc.2
-	ldc.i4 8004
+	ldc.i4 8000
 	add
 	stloc.2
 	ldloc.0
@@ -188,26 +188,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056054: 0x1056054: beq   v0, zero, 0x1056064 sll   zero, zero, 0
+// 0x01056064: 0x1056064: beq   v0, zero, 0x1056074 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1056064
+	brfalse L_1056074
 // --- basic block ---
-// 0x0105605c: 0x105605c: jal   0x1099098 addu  a0, v0, zero
+// 0x0105606c: 0x105606c: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1056064:
-// 0x01056064: 0x1056064: lw    ra, 20(sp)
-// 0x01056068: 0x1056068: sll   zero, zero, 0
-// 0x0105606c: 0x105606c: jr    ra addiu sp, sp, 24
+L_1056074:
+// 0x01056074: 0x1056074: lw    ra, 20(sp)
+// 0x01056078: 0x1056078: sll   zero, zero, 0
+// 0x0105607c: 0x105607c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -219,7 +219,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_58_1056074(int32,int32,int32,int32,int32)
+.method public static int32 T_58_1056084(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -254,44 +254,44 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056074: 0x1056074: addiu sp, sp, -40
+// 0x01056084: 0x1056084: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01056078: 0x1056078: sw    ra, 36(sp)
-// 0x0105607c: 0x105607c: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01056088: 0x1056088: sw    ra, 36(sp)
+// 0x0105608c: 0x105608c: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01056084: 0x1056084: beq   v0, zero, 0x1056090 addiu a3, zero, 2
+// 0x01056094: 0x1056094: beq   v0, zero, 0x10560a0 addiu a3, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 4
-	brfalse L_1056090
+	brfalse L_10560a0
 // --- basic block ---
-// 0x0105608c: 0x105608c: addiu a3, zero, 4
+// 0x0105609c: 0x105609c: addiu a3, zero, 4
 	ldc.i4.4
 	stloc 4
-L_1056090:
-// 0x01056090: 0x1056090: lui   a0, 0x0
+L_10560a0:
+// 0x010560a0: 0x10560a0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01056094: 0x1056094: addiu a0, a0, 32124
+// 0x010560a4: 0x10560a4: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01056098: 0x1056098: addu  a1, zero, zero
+// 0x010560a8: 0x10560a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105609c: 0x105609c: addiu a2, zero, -2
+// 0x010560ac: 0x10560ac: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010560a0: 0x10560a0: addiu v0, zero, 136
+// 0x010560b0: 0x10560b0: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x010560a4: 0x10560a4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010560b4: 0x10560b4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -305,21 +305,21 @@ L_1056090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010560ac: 0x10560ac: addu  a0, v0, zero
+// 0x010560bc: 0x10560bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010560b0: 0x10560b0: addu  a1, zero, zero
+// 0x010560c0: 0x10560c0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010560b4: 0x10560b4: addu  a2, zero, zero
+// 0x010560c4: 0x10560c4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010560b8: 0x10560b8: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x010560c8: 0x10560c8: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -331,10 +331,10 @@ L_1056090:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010560c0: 0x10560c0: lw    ra, 36(sp)
-// 0x010560c4: 0x10560c4: lw    v0, 24(sp)
+// 0x010560d0: 0x10560d0: lw    ra, 36(sp)
+// 0x010560d4: 0x10560d4: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -343,7 +343,7 @@ L_1056090:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010560c8: 0x10560c8: jr    ra addiu sp, sp, 40
+// 0x010560d8: 0x10560d8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -355,7 +355,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_res_ETA_widget_10560d0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_res_ETA_widget_10560e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s3,int32 s2,int32 s8,int32 s1,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -417,12 +417,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010560d0: 0x10560d0: addiu sp, sp, -72
+// 0x010560e0: 0x10560e0: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010560d4: 0x10560d4: sw    s7, 60(sp)
+// 0x010560e4: 0x10560e4: sw    s7, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -431,7 +431,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010560d8: 0x10560d8: sw    s6, 56(sp)
+// 0x010560e8: 0x10560e8: sw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -440,7 +440,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010560dc: 0x10560dc: sw    s5, 52(sp)
+// 0x010560ec: 0x10560ec: sw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -449,7 +449,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010560e0: 0x10560e0: sw    s4, 48(sp)
+// 0x010560f0: 0x10560f0: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -458,11 +458,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010560e4: 0x10560e4: addu  s5, a2, zero
+// 0x010560f4: 0x10560f4: addu  s5, a2, zero
 	ldloc.3
 	stloc 14
-// 0x010560e8: 0x10560e8: sw    ra, 68(sp)
-// 0x010560ec: 0x10560ec: sw    s8, 64(sp)
+// 0x010560f8: 0x10560f8: sw    ra, 68(sp)
+// 0x010560fc: 0x10560fc: sw    s8, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -471,7 +471,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010560f0: 0x10560f0: sw    s3, 44(sp)
+// 0x01056100: 0x1056100: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -480,7 +480,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010560f4: 0x10560f4: sw    s2, 40(sp)
+// 0x01056104: 0x1056104: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -489,7 +489,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010560f8: 0x10560f8: sw    s1, 36(sp)
+// 0x01056108: 0x1056108: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -498,7 +498,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010560fc: 0x10560fc: sw    s0, 32(sp)
+// 0x0105610c: 0x105610c: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -507,79 +507,79 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01056100: 0x1056100: addu  s7, a0, zero
+// 0x01056110: 0x1056110: addu  s7, a0, zero
 	ldloc.1
 	stloc 16
-// 0x01056104: 0x1056104: addu  s6, a1, zero
+// 0x01056114: 0x1056114: addu  s6, a1, zero
 	ldloc.2
 	stloc 15
-// 0x01056108: 0x1056108: jal   0x101fa28 addu  s4, a3, zero
+// 0x01056118: 0x1056118: jal   0x101fa38 addu  s4, a3, zero
 	ldloc 4
 	stloc 13
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01056110: 0x1056110: lui   v0, 0xf0000
+// 0x01056120: 0x1056120: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01056114: 0x1056114: lw    v1, -30072(v0)
+// 0x01056124: 0x1056124: lw    v1, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056118: 0x1056118: lui   v0, 0xf0000
+// 0x01056128: 0x1056128: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105611c: 0x105611c: lw    v0, -30068(v0)
+// 0x0105612c: 0x105612c: lw    v0, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056120: 0x1056120: addiu a2, v1, -40
+// 0x01056130: 0x1056130: addiu a2, v1, -40
 	ldloc 6
 	ldc.i4.s -40
 	add
 	stloc.3
-// 0x01056124: 0x1056124: slt   v1, v1, v0
+// 0x01056134: 0x1056134: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x01056128: 0x1056128: bne   v1, zero, 0x1056134 lui   a0, 0x10000
+// 0x01056138: 0x1056138: bne   v1, zero, 0x1056144 lui   a0, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	brtrue L_1056134
+	brtrue L_1056144
 // --- basic block ---
-// 0x01056130: 0x1056130: addiu a2, v0, -40
+// 0x01056140: 0x1056140: addiu a2, v0, -40
 	ldloc 5
 	ldc.i4.s -40
 	add
 	stloc.3
-L_1056134:
-// 0x01056134: 0x1056134: addiu a0, a0, 8004
+L_1056144:
+// 0x01056144: 0x1056144: addiu a0, a0, 8000
 	ldloc.1
-	ldc.i4 8004
+	ldc.i4 8000
 	add
 	stloc.1
-// 0x01056138: 0x1056138: addu  a1, zero, zero
+// 0x01056148: 0x1056148: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105613c: 0x105613c: addiu a3, zero, -1
+// 0x0105614c: 0x105614c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01056140: 0x1056140: addiu v0, zero, 137
+// 0x01056150: 0x1056150: addiu v0, zero, 137
 	ldc.i4 137
 	stloc 5
-// 0x01056144: 0x1056144: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01056154: 0x1056154: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -593,90 +593,90 @@ L_1056134:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105614c: 0x105614c: addu  a0, v0, zero
+// 0x0105615c: 0x105615c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01056150: 0x1056150: addu  a2, zero, zero
+// 0x01056160: 0x1056160: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01056154: 0x1056154: addu  a1, zero, zero
+// 0x01056164: 0x1056164: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01056158: 0x1056158: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01056168: 0x1056168: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01056160: 0x1056160: lui   v0, 0xf0000
+// 0x01056170: 0x1056170: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x01056164: 0x1056164: lw    v1, -30068(v0)
+// 0x01056174: 0x1056174: lw    v1, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056168: 0x1056168: lui   v0, 0xf0000
+// 0x01056178: 0x1056178: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105616c: 0x105616c: lw    v0, -30072(v0)
+// 0x0105617c: 0x105617c: lw    v0, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056170: 0x1056170: addiu a2, v1, -40
+// 0x01056180: 0x1056180: addiu a2, v1, -40
 	ldloc 6
 	ldc.i4.s -40
 	add
 	stloc.3
-// 0x01056174: 0x1056174: slt   v1, v0, v1
+// 0x01056184: 0x1056184: slt   v1, v0, v1
 	ldloc 5
 	ldloc 6
 	clt
 	stloc 6
-// 0x01056178: 0x1056178: beq   v1, zero, 0x1056184 sll   zero, zero, 0
+// 0x01056188: 0x1056188: beq   v1, zero, 0x1056194 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1056184
+	brfalse L_1056194
 // --- basic block ---
-// 0x01056180: 0x1056180: addiu a2, v0, -40
+// 0x01056190: 0x1056190: addiu a2, v0, -40
 	ldloc 5
 	ldc.i4.s -40
 	add
 	stloc.3
-L_1056184:
-// 0x01056184: 0x1056184: lui   a0, 0x10000
+L_1056194:
+// 0x01056194: 0x1056194: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056188: 0x1056188: addiu a3, zero, -1
+// 0x01056198: 0x1056198: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0105618c: 0x105618c: addiu a0, a0, 8020
+// 0x0105619c: 0x105619c: addiu a0, a0, 8016
 	ldloc.1
-	ldc.i4 8020
+	ldc.i4 8016
 	add
 	stloc.1
-// 0x01056190: 0x1056190: addu  a1, zero, zero
+// 0x010561a0: 0x10561a0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01056194: 0x1056194: addiu v0, zero, 136
+// 0x010561a4: 0x10561a4: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x01056198: 0x1056198: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010561a8: 0x10561a8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -690,48 +690,48 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010561a0: 0x10561a0: addu  a0, v0, zero
+// 0x010561b0: 0x10561b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010561a4: 0x10561a4: addu  a1, zero, zero
+// 0x010561b4: 0x10561b4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010561a8: 0x10561a8: addu  a2, zero, zero
+// 0x010561b8: 0x10561b8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010561ac: 0x10561ac: addu  s0, v0, zero
+// 0x010561bc: 0x10561bc: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010561b0: 0x10561b0: jal   0x1098fe0 lui   s3, 0x10000
+// 0x010561c0: 0x10561c0: jal   0x1099628 lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010561b8: 0x10561b8: lui   a0, 0x10000
+// 0x010561c8: 0x10561c8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010561bc: 0x10561bc: addu  a3, zero, zero
+// 0x010561cc: 0x10561cc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010561c0: 0x10561c0: addiu a2, zero, 22
+// 0x010561d0: 0x10561d0: addiu a2, zero, 22
 	ldc.i4.s 22
 	stloc.3
-// 0x010561c4: 0x10561c4: addiu a0, a0, 7876
+// 0x010561d4: 0x10561d4: addiu a0, a0, 7872
 	ldloc.1
-	ldc.i4 7876
+	ldc.i4 7872
 	add
 	stloc.1
-// 0x010561c8: 0x10561c8: jal   0x1098d10 addiu a1, s3, 18500
+// 0x010561d8: 0x10561d8: jal   0x1099358 addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -739,49 +739,49 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010561d0: 0x10561d0: lui   s2, 0x0
+// 0x010561e0: 0x10561e0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010561d4: 0x10561d4: addu  s8, v0, zero
+// 0x010561e4: 0x10561e4: addu  s8, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010561d8: 0x10561d8: addu  a0, v0, zero
+// 0x010561e8: 0x10561e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010561dc: 0x10561dc: jal   0x1097af8 addiu a1, s2, 23008
+// 0x010561ec: 0x10561ec: jal   0x1098140 addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010561e4: 0x10561e4: addu  a1, s8, zero
+// 0x010561f4: 0x10561f4: addu  a1, s8, zero
 	ldloc 11
 	stloc.2
-// 0x010561e8: 0x10561e8: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010561f8: 0x10561f8: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010561f0: 0x10561f0: addu  a0, s0, zero
+// 0x01056200: 0x1056200: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010561f4: 0x10561f4: addiu a1, zero, 3
+// 0x01056204: 0x1056204: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x010561f8: 0x10561f8: jal   0x109434c addu  a2, zero, zero
+// 0x01056208: 0x1056208: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -789,18 +789,18 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056200: 0x1056200: addu  a0, s8, zero
+// 0x01056210: 0x1056210: addu  a0, s8, zero
 	ldloc 11
 	stloc.1
-// 0x01056204: 0x1056204: addu  a1, zero, zero
+// 0x01056214: 0x1056214: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01056208: 0x1056208: jal   0x1098f84 addiu a2, zero, 4
+// 0x01056218: 0x1056218: jal   0x10995cc addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -808,17 +808,17 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056210: 0x1056210: lui   a0, 0x10000
+// 0x01056220: 0x1056220: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056214: 0x1056214: jal   0x101cd60 addiu a0, a0, -32
+// 0x01056224: 0x1056224: jal   0x101cd70 addiu a0, a0, -36
 	ldloc.1
-	ldc.i4.s -32
+	ldc.i4.s -36
 	add
 	stloc.1
 	ldloc.0
@@ -826,26 +826,26 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105621c: 0x105621c: lui   a0, 0x10000
+// 0x0105622c: 0x105622c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056220: 0x1056220: addiu a2, zero, 16
+// 0x01056230: 0x1056230: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01056224: 0x1056224: addu  a3, zero, zero
+// 0x01056234: 0x1056234: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01056228: 0x1056228: addu  a1, v0, zero
+// 0x01056238: 0x1056238: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105622c: 0x105622c: jal   0x1098d10 addiu a0, a0, 8036
+// 0x0105623c: 0x105623c: jal   0x1099358 addiu a0, a0, 8032
 	ldloc.1
-	ldc.i4 8036
+	ldc.i4 8032
 	add
 	stloc.1
 	ldloc.0
@@ -853,33 +853,33 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056234: 0x1056234: addu  s8, v0, zero
+// 0x01056244: 0x1056244: addu  s8, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01056238: 0x1056238: addu  a0, v0, zero
+// 0x01056248: 0x1056248: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105623c: 0x105623c: jal   0x1097af8 addiu a1, s2, 23008
+// 0x0105624c: 0x105624c: jal   0x1098140 addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01056244: 0x1056244: addu  a0, s8, zero
+// 0x01056254: 0x1056254: addu  a0, s8, zero
 	ldloc 11
 	stloc.1
-// 0x01056248: 0x1056248: addu  a1, zero, zero
+// 0x01056258: 0x1056258: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105624c: 0x105624c: jal   0x1098f84 addiu a2, zero, 13
+// 0x0105625c: 0x105625c: jal   0x10995cc addiu a2, zero, 13
 	ldc.i4.s 13
 	stloc.3
 	ldloc.0
@@ -887,35 +887,35 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056254: 0x1056254: addu  a0, s0, zero
+// 0x01056264: 0x1056264: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01056258: 0x1056258: jal   0x1098ec4 addu  a1, s8, zero
+// 0x01056268: 0x1056268: jal   0x109950c addu  a1, s8, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056260: 0x1056260: beq   s4, zero, 0x1056310 sll   zero, zero, 0
+// 0x01056270: 0x1056270: beq   s4, zero, 0x1056320 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1056310
+	brfalse L_1056320
 // --- basic block ---
-// 0x01056268: 0x1056268: addu  a0, s0, zero
+// 0x01056278: 0x1056278: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105626c: 0x105626c: addiu a1, zero, 3
+// 0x0105627c: 0x105627c: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01056270: 0x1056270: jal   0x109434c addu  a2, zero, zero
+// 0x01056280: 0x1056280: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -923,30 +923,30 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056278: 0x1056278: lui   a0, 0x10000
+// 0x01056288: 0x1056288: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105627c: 0x105627c: ori   a3, zero, 32768
+// 0x0105628c: 0x105628c: ori   a3, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 4
-// 0x01056280: 0x1056280: addiu a2, zero, 18
+// 0x01056290: 0x1056290: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01056284: 0x1056284: addiu a1, s3, 18500
+// 0x01056294: 0x1056294: addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01056288: 0x1056288: jal   0x1098d10 addiu a0, a0, 7940
+// 0x01056298: 0x1056298: jal   0x1099358 addiu a0, a0, 7936
 	ldloc.1
-	ldc.i4 7940
+	ldc.i4 7936
 	add
 	stloc.1
 	ldloc.0
@@ -954,46 +954,46 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056290: 0x1056290: addu  s8, v0, zero
+// 0x010562a0: 0x10562a0: addu  s8, v0, zero
 	ldloc 5
 	stloc 11
-// 0x01056294: 0x1056294: addu  a0, v0, zero
+// 0x010562a4: 0x10562a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01056298: 0x1056298: jal   0x1097af8 addiu a1, s2, 23008
+// 0x010562a8: 0x10562a8: jal   0x1098140 addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010562a0: 0x10562a0: addu  a0, s0, zero
+// 0x010562b0: 0x10562b0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010562a4: 0x10562a4: jal   0x1098ec4 addu  a1, s8, zero
+// 0x010562b4: 0x10562b4: jal   0x109950c addu  a1, s8, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010562ac: 0x10562ac: addu  a0, s0, zero
+// 0x010562bc: 0x10562bc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010562b0: 0x10562b0: addiu a1, zero, 1
+// 0x010562c0: 0x10562c0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010562b4: 0x10562b4: jal   0x109434c addu  a2, zero, zero
+// 0x010562c4: 0x10562c4: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1001,18 +1001,18 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010562bc: 0x10562bc: addu  a0, s8, zero
+// 0x010562cc: 0x10562cc: addu  a0, s8, zero
 	ldloc 11
 	stloc.1
-// 0x010562c0: 0x10562c0: addu  a1, zero, zero
+// 0x010562d0: 0x10562d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010562c4: 0x10562c4: jal   0x1098f84 addiu a2, zero, 11
+// 0x010562d4: 0x10562d4: jal   0x10995cc addiu a2, zero, 11
 	ldc.i4.s 11
 	stloc.3
 	ldloc.0
@@ -1020,30 +1020,30 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010562cc: 0x10562cc: lui   a0, 0x10000
+// 0x010562dc: 0x10562dc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010562d0: 0x10562d0: addiu a2, zero, 16
+// 0x010562e0: 0x10562e0: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010562d4: 0x10562d4: addiu a1, s3, 18500
+// 0x010562e4: 0x10562e4: addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010562d8: 0x10562d8: ori   a3, zero, 32776
+// 0x010562e8: 0x10562e8: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x010562dc: 0x10562dc: jal   0x1098d10 addiu a0, a0, 7960
+// 0x010562ec: 0x10562ec: jal   0x1099358 addiu a0, a0, 7956
 	ldloc.1
-	ldc.i4 7960
+	ldc.i4 7956
 	add
 	stloc.1
 	ldloc.0
@@ -1051,46 +1051,46 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010562e4: 0x10562e4: addu  s3, v0, zero
+// 0x010562f4: 0x10562f4: addu  s3, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010562e8: 0x10562e8: addu  a0, v0, zero
+// 0x010562f8: 0x10562f8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010562ec: 0x10562ec: jal   0x1097af8 addiu a1, s2, 23008
+// 0x010562fc: 0x10562fc: jal   0x1098140 addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010562f4: 0x10562f4: addu  a0, s0, zero
+// 0x01056304: 0x1056304: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010562f8: 0x10562f8: jal   0x1098ec4 addu  a1, s3, zero
+// 0x01056308: 0x1056308: jal   0x109950c addu  a1, s3, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056300: 0x1056300: addu  a0, s3, zero
+// 0x01056310: 0x1056310: addu  a0, s3, zero
 	ldloc 9
 	stloc.1
-// 0x01056304: 0x1056304: addu  a1, zero, zero
+// 0x01056314: 0x1056314: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01056308: 0x1056308: jal   0x1098f84 addiu a2, zero, 13
+// 0x01056318: 0x1056318: jal   0x10995cc addiu a2, zero, 13
 	ldc.i4.s 13
 	stloc.3
 	ldloc.0
@@ -1098,13 +1098,13 @@ L_1056184:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1056310:
-// 0x01056310: 0x1056310: jal   0x1056074 lui   s3, 0x10000
+L_1056320:
+// 0x01056320: 0x1056320: jal   0x1056084 lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -1112,43 +1112,43 @@ L_1056310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::T_58_1056074(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::T_58_1056084(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056318: 0x1056318: addu  a1, v0, zero
+// 0x01056328: 0x1056328: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105631c: 0x105631c: jal   0x1098ec4 addu  a0, s0, zero
+// 0x0105632c: 0x105632c: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056324: 0x1056324: lui   a0, 0x10000
+// 0x01056334: 0x1056334: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056328: 0x1056328: ori   a3, zero, 32768
+// 0x01056338: 0x1056338: ori   a3, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 4
-// 0x0105632c: 0x105632c: addiu a2, zero, 18
+// 0x0105633c: 0x105633c: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01056330: 0x1056330: addiu a1, s3, 18500
+// 0x01056340: 0x1056340: addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01056334: 0x1056334: jal   0x1098d10 addiu a0, a0, 7900
+// 0x01056344: 0x1056344: jal   0x1099358 addiu a0, a0, 7896
 	ldloc.1
-	ldc.i4 7900
+	ldc.i4 7896
 	add
 	stloc.1
 	ldloc.0
@@ -1156,23 +1156,23 @@ L_1056310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105633c: 0x105633c: lui   s2, 0x0
+// 0x0105634c: 0x105634c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01056340: 0x1056340: addu  a0, v0, zero
+// 0x01056350: 0x1056350: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01056344: 0x1056344: addiu a1, s2, 23008
+// 0x01056354: 0x1056354: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01056348: 0x1056348: jal   0x1097af8 sw    v0, 24(sp)
+// 0x01056358: 0x1056358: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1183,9 +1183,9 @@ L_1056310:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01056350: 0x1056350: lw    v0, 24(sp)
+// 0x01056360: 0x1056360: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1194,26 +1194,26 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056354: 0x1056354: addu  a0, s0, zero
+// 0x01056364: 0x1056364: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01056358: 0x1056358: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01056368: 0x1056368: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056360: 0x1056360: addu  a0, s0, zero
+// 0x01056370: 0x1056370: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01056364: 0x1056364: addiu a1, zero, 3
+// 0x01056374: 0x1056374: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01056368: 0x1056368: jal   0x109434c addu  a2, zero, zero
+// 0x01056378: 0x1056378: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1221,30 +1221,30 @@ L_1056310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056370: 0x1056370: lui   a0, 0x10000
+// 0x01056380: 0x1056380: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056374: 0x1056374: addiu a2, zero, 18
+// 0x01056384: 0x1056384: addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
-// 0x01056378: 0x1056378: ori   a3, zero, 32776
+// 0x01056388: 0x1056388: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x0105637c: 0x105637c: addiu a1, s3, 18500
+// 0x0105638c: 0x105638c: addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01056380: 0x1056380: jal   0x1098d10 addiu a0, a0, 7920
+// 0x01056390: 0x1056390: jal   0x1099358 addiu a0, a0, 7916
 	ldloc.1
-	ldc.i4 7920
+	ldc.i4 7916
 	add
 	stloc.1
 	ldloc.0
@@ -1252,20 +1252,20 @@ L_1056310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056388: 0x1056388: addu  a0, v0, zero
+// 0x01056398: 0x1056398: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105638c: 0x105638c: addiu a1, s2, 23008
+// 0x0105639c: 0x105639c: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01056390: 0x1056390: jal   0x1097af8 sw    v0, 24(sp)
+// 0x010563a0: 0x10563a0: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1276,9 +1276,9 @@ L_1056310:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01056398: 0x1056398: lw    v0, 24(sp)
+// 0x010563a8: 0x10563a8: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1287,62 +1287,62 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105639c: 0x105639c: addu  a0, s0, zero
+// 0x010563ac: 0x10563ac: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010563a0: 0x10563a0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010563b0: 0x10563b0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010563a8: 0x10563a8: jal   0x1056074 sll   zero, zero, 0
+// 0x010563b8: 0x10563b8: jal   0x1056084 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::T_58_1056074(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::T_58_1056084(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010563b0: 0x10563b0: addu  a1, v0, zero
+// 0x010563c0: 0x10563c0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010563b4: 0x10563b4: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010563c4: 0x10563c4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010563bc: 0x10563bc: lui   a0, 0x10000
+// 0x010563cc: 0x10563cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010563c0: 0x10563c0: addiu a2, zero, 13
+// 0x010563d0: 0x10563d0: addiu a2, zero, 13
 	ldc.i4.s 13
 	stloc.3
-// 0x010563c4: 0x10563c4: ori   a3, zero, 32776
+// 0x010563d4: 0x10563d4: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x010563c8: 0x10563c8: addiu a1, s3, 18500
+// 0x010563d8: 0x10563d8: addiu a1, s3, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x010563cc: 0x10563cc: jal   0x1098d10 addiu a0, a0, 7988
+// 0x010563dc: 0x10563dc: jal   0x1099358 addiu a0, a0, 7984
 	ldloc.1
-	ldc.i4 7988
+	ldc.i4 7984
 	add
 	stloc.1
 	ldloc.0
@@ -1350,20 +1350,20 @@ L_1056310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010563d4: 0x10563d4: addu  a0, v0, zero
+// 0x010563e4: 0x10563e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010563d8: 0x10563d8: addiu a1, s2, 23008
+// 0x010563e8: 0x10563e8: addiu a1, s2, 23008
 	ldloc 10
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010563dc: 0x10563dc: jal   0x1097af8 sw    v0, 24(sp)
+// 0x010563ec: 0x10563ec: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1374,9 +1374,9 @@ L_1056310:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x010563e4: 0x10563e4: lw    v0, 24(sp)
+// 0x010563f4: 0x10563f4: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1385,45 +1385,45 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010563e8: 0x10563e8: addu  a0, s0, zero
+// 0x010563f8: 0x10563f8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010563ec: 0x10563ec: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010563fc: 0x10563fc: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010563f4: 0x10563f4: addu  a0, s1, zero
+// 0x01056404: 0x1056404: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x010563f8: 0x10563f8: jal   0x1098ec4 addu  a1, s0, zero
+// 0x01056408: 0x1056408: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056400: 0x1056400: addu  a1, s7, zero
+// 0x01056410: 0x1056410: addu  a1, s7, zero
 	ldloc 16
 	stloc.2
-// 0x01056404: 0x1056404: addu  a2, s6, zero
+// 0x01056414: 0x1056414: addu  a2, s6, zero
 	ldloc 15
 	stloc.3
-// 0x01056408: 0x1056408: addu  a3, s5, zero
+// 0x01056418: 0x1056418: addu  a3, s5, zero
 	ldloc 14
 	stloc 4
-// 0x0105640c: 0x105640c: addu  a0, s1, zero
+// 0x0105641c: 0x105641c: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x01056410: 0x1056410: jal   0x1055d70 sw    s4, 16(sp)
+// 0x01056420: 0x1056420: jal   0x1055d80 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1437,16 +1437,16 @@ L_1056310:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::navigate_res_update_ETA_widget_1055d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::navigate_res_update_ETA_widget_1055d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056418: 0x1056418: lw    ra, 68(sp)
-// 0x0105641c: 0x105641c: addu  v0, s1, zero
+// 0x01056428: 0x1056428: lw    ra, 68(sp)
+// 0x0105642c: 0x105642c: addu  v0, s1, zero
 	ldloc 12
 	stloc 5
-// 0x01056420: 0x1056420: lw    s8, 64(sp)
+// 0x01056430: 0x1056430: lw    s8, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1455,7 +1455,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01056424: 0x1056424: lw    s7, 60(sp)
+// 0x01056434: 0x1056434: lw    s7, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1464,7 +1464,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01056428: 0x1056428: lw    s6, 56(sp)
+// 0x01056438: 0x1056438: lw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1473,7 +1473,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105642c: 0x105642c: lw    s5, 52(sp)
+// 0x0105643c: 0x105643c: lw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1482,7 +1482,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01056430: 0x1056430: lw    s4, 48(sp)
+// 0x01056440: 0x1056440: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1491,7 +1491,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01056434: 0x1056434: lw    s3, 44(sp)
+// 0x01056444: 0x1056444: lw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1500,7 +1500,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01056438: 0x1056438: lw    s2, 40(sp)
+// 0x01056448: 0x1056448: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1509,7 +1509,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105643c: 0x105643c: lw    s1, 36(sp)
+// 0x0105644c: 0x105644c: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1518,7 +1518,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01056440: 0x1056440: lw    s0, 32(sp)
+// 0x01056450: 0x1056450: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1527,7 +1527,7 @@ L_1056310:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01056444: 0x1056444: jr    ra addiu sp, sp, 72
+// 0x01056454: 0x1056454: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1539,7 +1539,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_segment_func_105644c(int32,int32)
+.method public static int32 navigate_segment_func_105645c(int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 v0,int32 v1,int32 lo,int32[] mem,int32 ra)
@@ -1568,105 +1568,105 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105644c: 0x105644c: lui   v0, 0x70000
+// 0x0105645c: 0x105645c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01056450: 0x1056450: lw    v1, 9172(v0)
+// 0x01056460: 0x1056460: lw    v1, 9636(v0)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.3
-// 0x01056454: 0x1056454: sll   zero, zero, 0
-// 0x01056458: 0x1056458: slt   v0, a0, v1
+// 0x01056464: 0x1056464: sll   zero, zero, 0
+// 0x01056468: 0x1056468: slt   v0, a0, v1
 	ldloc.0
 	ldloc.3
 	clt
 	stloc.2
-// 0x0105645c: 0x105645c: beq   v0, zero, 0x1056480 addiu a1, zero, 56
+// 0x0105646c: 0x105646c: beq   v0, zero, 0x1056490 addiu a1, zero, 56
 	ldloc.2
 	ldc.i4.s 56
 	stloc.1
-	brfalse L_1056480
+	brfalse L_1056490
 // --- basic block ---
-// 0x01056464: 0x1056464: addiu v0, zero, 56
+// 0x01056474: 0x1056474: addiu v0, zero, 56
 	ldc.i4.s 56
 	stloc.2
-// 0x01056468: 0x1056468: mult  a0, v0
+// 0x01056478: 0x1056478: mult  a0, v0
 	ldloc.0
 	ldloc.2
 	mul
 	stloc 4
-// 0x0105646c: 0x105646c: lui   v0, 0x70000
+// 0x0105647c: 0x105647c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01056470: 0x1056470: lw    v0, 10724(v0)
+// 0x01056480: 0x1056480: lw    v0, 11188(v0)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056474: 0x1056474: mflo  lo
+// 0x01056484: 0x1056484: mflo  lo
 	ldloc 4
 	stloc.0
-// 0x01056478: 0x1056478: jr    ra addu  v0, v0, a0
+// 0x01056488: 0x1056488: jr    ra addu  v0, v0, a0
 	ldloc.2
 	ldloc.0
 	add
 	stloc.2
 	br __CIBYL_function_return
 // --- basic block ---
-L_1056480:
-// 0x01056480: 0x1056480: lui   v0, 0x70000
+L_1056490:
+// 0x01056490: 0x1056490: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01056484: 0x1056484: lw    v0, 9176(v0)
+// 0x01056494: 0x1056494: lw    v0, 9640(v0)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056488: 0x1056488: sll   zero, zero, 0
-// 0x0105648c: 0x105648c: subu  v1, v0, v1
+// 0x01056498: 0x1056498: sll   zero, zero, 0
+// 0x0105649c: 0x105649c: subu  v1, v0, v1
 	ldloc.2
 	ldloc.3
 	sub
 	stloc.3
-// 0x01056490: 0x1056490: addu  a0, v1, a0
+// 0x010564a0: 0x10564a0: addu  a0, v1, a0
 	ldloc.3
 	ldloc.0
 	add
 	stloc.0
-// 0x01056494: 0x1056494: mult  a0, a1
+// 0x010564a4: 0x10564a4: mult  a0, a1
 	ldloc.0
 	ldloc.1
 	mul
 	stloc 4
-// 0x01056498: 0x1056498: lui   v0, 0x70000
+// 0x010564a8: 0x10564a8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0105649c: 0x105649c: lw    v0, 10720(v0)
+// 0x010564ac: 0x10564ac: lw    v0, 11184(v0)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.2
-// 0x010564a0: 0x10564a0: mflo  lo
+// 0x010564b0: 0x10564b0: mflo  lo
 	ldloc 4
 	stloc.0
-// 0x010564a4: 0x10564a4: jr    ra addu  v0, v0, a0
+// 0x010564b4: 0x10564b4: jr    ra addu  v0, v0, a0
 	ldloc.2
 	ldloc.0
 	add
@@ -1678,7 +1678,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 navigate_line_in_route_10564ac(int32,int32,int32,int32)
+.method public static int32 navigate_line_in_route_10564bc(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 t0,int32 t1,int32 t3,int32 t2,int32 t4,int32 lo,int32 t5,int32 ra)
@@ -1731,117 +1731,117 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10564ac:
-// 0x010564ac: 0x10564ac: lui   v0, 0x70000
+L_10564bc:
+// 0x010564bc: 0x10564bc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010564b0: 0x10564b0: lw    v0, 9160(v0)
+// 0x010564c0: 0x10564c0: lw    v0, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x010564b4: 0x10564b4: sll   zero, zero, 0
-// 0x010564b8: 0x10564b8: beq   v0, zero, 0x10565a4 lui   v1, 0x70000
+// 0x010564c4: 0x10564c4: sll   zero, zero, 0
+// 0x010564c8: 0x10564c8: beq   v0, zero, 0x10565b4 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 4
-	brfalse L_10565a4
+	brfalse L_10565b4
 // --- basic block ---
-// 0x010564c0: 0x10564c0: lui   v0, 0x70000
+// 0x010564d0: 0x10564d0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010564c4: 0x10564c4: lw    v0, 9164(v0)
+// 0x010564d4: 0x10564d4: lw    v0, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 5
-// 0x010564c8: 0x10564c8: lw    t0, 9176(v1)
+// 0x010564d8: 0x10564d8: lw    t0, 9640(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 7
-// 0x010564cc: 0x10564cc: lui   v1, 0x70000
+// 0x010564dc: 0x10564dc: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x010564d0: 0x10564d0: lw    a2, 9172(v1)
+// 0x010564e0: 0x10564e0: lw    a2, 9636(v1)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.2
-// 0x010564d4: 0x10564d4: addu  t0, v0, t0
+// 0x010564e4: 0x10564e4: addu  t0, v0, t0
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x010564d8: 0x10564d8: addiu v1, zero, 56
+// 0x010564e8: 0x10564e8: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 4
-// 0x010564dc: 0x10564dc: subu  t0, t0, a2
+// 0x010564ec: 0x10564ec: subu  t0, t0, a2
 	ldloc 7
 	ldloc.2
 	sub
 	stloc 7
-// 0x010564e0: 0x10564e0: mult  t0, v1
+// 0x010564f0: 0x10564f0: mult  t0, v1
 	ldloc 7
 	ldloc 4
 	mul
 	stloc 12
-// 0x010564e4: 0x10564e4: lui   a3, 0x70000
+// 0x010564f4: 0x10564f4: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x010564e8: 0x10564e8: lui   t1, 0x70000
+// 0x010564f8: 0x10564f8: lui   t1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010564ec: 0x10564ec: lui   t2, 0x70000
+// 0x010564fc: 0x10564fc: lui   t2, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x010564f0: 0x10564f0: lw    a3, 10724(a3)
+// 0x01056500: 0x1056500: lw    a3, 11188(a3)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.3
-// 0x010564f4: 0x10564f4: lw    t1, 10720(t1)
+// 0x01056504: 0x1056504: lw    t1, 11184(t1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 8
-// 0x010564f8: 0x10564f8: lw    t3, 9168(t2)
+// 0x01056508: 0x1056508: lw    t3, 9632(t2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 9
-// 0x010564fc: 0x10564fc: lui   t2, 0x0
+// 0x0105650c: 0x105650c: lui   t2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01056500: 0x1056500: lw    t2, 1816(t2)
+// 0x01056510: 0x1056510: lw    t2, 1816(t2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1850,58 +1850,58 @@ L_10564ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01056504: 0x1056504: mflo  lo
+// 0x01056514: 0x1056514: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x01056508: 0x1056508: addu  t0, t1, t0
+// 0x01056518: 0x1056518: addu  t0, t1, t0
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x0105650c: 0x105650c: sll   zero, zero, 0
-// 0x01056510: 0x1056510: mult  v0, v1
+// 0x0105651c: 0x105651c: sll   zero, zero, 0
+// 0x01056520: 0x1056520: mult  v0, v1
 	ldloc 5
 	ldloc 4
 	mul
 	stloc 12
-// 0x01056514: 0x1056514: mflo  lo
+// 0x01056524: 0x1056524: mflo  lo
 	ldloc 12
 	stloc 4
-// 0x01056518: 0x1056518: j	 0x1056598 addu  a3, a3, v1
+// 0x01056528: 0x1056528: j	 0x10565a8 addu  a3, a3, v1
 	ldloc.3
 	ldloc 4
 	add
 	stloc.3
-	br L_1056598
+	br L_10565a8
 // --- basic block ---
-L_1056520:
-// 0x01056520: 0x1056520: addiu v0, v0, 1
+L_1056530:
+// 0x01056530: 0x1056530: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01056524: 0x1056524: beq   t1, zero, 0x1056530 addu  t4, t0, zero
+// 0x01056534: 0x1056534: beq   t1, zero, 0x1056540 addu  t4, t0, zero
 	ldloc 8
 	ldloc 7
 	stloc 11
-	brfalse L_1056530
+	brfalse L_1056540
 // --- basic block ---
-// 0x0105652c: 0x105652c: addu  t4, a3, zero
+// 0x0105653c: 0x105653c: addu  t4, a3, zero
 	ldloc.3
 	stloc 11
-L_1056530:
-// 0x01056530: 0x1056530: lb    v1, 50(t4)
+L_1056540:
+// 0x01056540: 0x1056540: lb    v1, 50(t4)
 	ldloc 11
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x01056534: 0x1056534: addiu a3, a3, 56
+// 0x01056544: 0x1056544: addiu a3, a3, 56
 	ldloc.3
 	ldc.i4.s 56
 	add
 	stloc.3
-// 0x01056538: 0x1056538: lw    t5, 24(t4)
+// 0x01056548: 0x1056548: lw    t5, 24(t4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1910,46 +1910,46 @@ L_1056530:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105653c: 0x105653c: lh    t1, 36(t4)
+// 0x0105654c: 0x105654c: lh    t1, 36(t4)
 	ldloc 11
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 8
-// 0x01056540: 0x1056540: bne   a1, v1, 0x1056598 addiu t0, t0, 56
+// 0x01056550: 0x1056550: bne   a1, v1, 0x10565a8 addiu t0, t0, 56
 	ldloc.1
 	ldloc 4
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc 7
-	bne.un L_1056598
+	bne.un L_10565a8
 // --- basic block ---
-// 0x01056548: 0x1056548: beq   a0, zero, 0x105659c slt   v1, v0, t3
+// 0x01056558: 0x1056558: beq   a0, zero, 0x10565ac slt   v1, v0, t3
 	ldloc.0
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 4
-	brfalse L_105659c
+	brfalse L_10565ac
 // --- basic block ---
-// 0x01056550: 0x1056550: lw    v1, 0(a0)
+// 0x01056560: 0x1056560: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01056554: 0x1056554: sll   zero, zero, 0
-// 0x01056558: 0x1056558: bne   v1, zero, 0x105659c slt   v1, v0, t3
+// 0x01056564: 0x1056564: sll   zero, zero, 0
+// 0x01056568: 0x1056568: bne   v1, zero, 0x10565ac slt   v1, v0, t3
 	ldloc 4
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 4
-	brtrue L_105659c
+	brtrue L_10565ac
 // --- basic block ---
-// 0x01056560: 0x1056560: lw    v1, 12(a0)
+// 0x01056570: 0x1056570: lw    v1, 12(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1958,17 +1958,17 @@ L_1056530:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056564: 0x1056564: sll   zero, zero, 0
-// 0x01056568: 0x1056568: bne   t5, v1, 0x105659c slt   v1, v0, t3
+// 0x01056574: 0x1056574: sll   zero, zero, 0
+// 0x01056578: 0x1056578: bne   t5, v1, 0x10565ac slt   v1, v0, t3
 	ldloc 13
 	ldloc 4
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 4
-	bne.un L_105659c
+	bne.un L_10565ac
 // --- basic block ---
-// 0x01056570: 0x1056570: lw    v1, 4(a0)
+// 0x01056580: 0x1056580: lw    v1, 4(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1977,17 +1977,17 @@ L_1056530:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056574: 0x1056574: sll   zero, zero, 0
-// 0x01056578: 0x1056578: bne   t1, v1, 0x105659c slt   v1, v0, t3
+// 0x01056584: 0x1056584: sll   zero, zero, 0
+// 0x01056588: 0x1056588: bne   t1, v1, 0x10565ac slt   v1, v0, t3
 	ldloc 8
 	ldloc 4
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 4
-	bne.un L_105659c
+	bne.un L_10565ac
 // --- basic block ---
-// 0x01056580: 0x1056580: lw    v1, 16(a0)
+// 0x01056590: 0x1056590: lw    v1, 16(a0)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1996,38 +1996,38 @@ L_1056530:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056584: 0x1056584: sll   zero, zero, 0
-// 0x01056588: 0x1056588: bne   t2, v1, 0x105659c slt   v1, v0, t3
+// 0x01056594: 0x1056594: sll   zero, zero, 0
+// 0x01056598: 0x1056598: bne   t2, v1, 0x10565ac slt   v1, v0, t3
 	ldloc 10
 	ldloc 4
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 4
-	bne.un L_105659c
+	bne.un L_10565ac
 // --- basic block ---
-// 0x01056590: 0x1056590: jr    ra addiu v0, zero, 1
+// 0x010565a0: 0x10565a0: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
 	br __CIBYL_function_return
 // --- basic block ---
-L_1056598:
-// 0x01056598: 0x1056598: slt   v1, v0, t3
+L_10565a8:
+// 0x010565a8: 0x10565a8: slt   v1, v0, t3
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 4
-L_105659c:
-// 0x0105659c: 0x105659c: bne   v1, zero, 0x1056520 slt   t1, v0, a2
+L_10565ac:
+// 0x010565ac: 0x10565ac: bne   v1, zero, 0x1056530 slt   t1, v0, a2
 	ldloc 4
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 8
-	brtrue L_1056520
+	brtrue L_1056530
 // --- basic block ---
-L_10565a4:
-// 0x010565a4: 0x10565a4: jr    ra addu  v0, zero, zero
+L_10565b4:
+// 0x010565b4: 0x10565b4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
 	br __CIBYL_function_return
@@ -2037,7 +2037,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_track_enabled_10565bc()
+.method public static int32 navigate_track_enabled_10565cc()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2054,25 +2054,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010565bc: 0x10565bc: lui   v0, 0x70000
+// 0x010565cc: 0x10565cc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x010565c0: 0x10565c0: lw    v0, 9160(v0)
+// 0x010565d0: 0x10565d0: lw    v0, 9624(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc.0
-// 0x010565c4: 0x10565c4: jr    ra sll   zero, zero, 0
+// 0x010565d4: 0x10565d4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_main_alt_routes_display_10565cc()
+.method public static int32 navigate_main_alt_routes_display_10565dc()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2089,25 +2089,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010565cc: 0x10565cc: lui   v0, 0x70000
+// 0x010565dc: 0x10565dc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x010565d0: 0x10565d0: lw    v0, 10348(v0)
+// 0x010565e0: 0x10565e0: lw    v0, 10812(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2587
+	ldc.i4 2703
 	add
 	ldelem.i4
 	stloc.0
-// 0x010565d4: 0x10565d4: jr    ra sll   zero, zero, 0
+// 0x010565e4: 0x10565e4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_main_is_alt_routes_10565dc()
+.method public static int32 navigate_main_is_alt_routes_10565ec()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2124,25 +2124,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010565dc: 0x10565dc: lui   v0, 0x70000
+// 0x010565ec: 0x10565ec: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x010565e0: 0x10565e0: lw    v0, 9192(v0)
+// 0x010565f0: 0x10565f0: lw    v0, 9656(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2298
+	ldc.i4 2414
 	add
 	ldelem.i4
 	stloc.0
-// 0x010565e4: 0x10565e4: jr    ra sll   zero, zero, 0
+// 0x010565f4: 0x10565f4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_offtrack_10565ec()
+.method public static int32 navigate_offtrack_10565fc()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2159,25 +2159,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010565ec: 0x10565ec: lui   v0, 0x70000
+// 0x010565fc: 0x10565fc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x010565f0: 0x10565f0: lw    v0, 9180(v0)
+// 0x01056600: 0x1056600: lw    v0, 9644(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2295
+	ldc.i4 2411
 	add
 	ldelem.i4
 	stloc.0
-// 0x010565f4: 0x10565f4: jr    ra sll   zero, zero, 0
+// 0x01056604: 0x1056604: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_get_waypoint_10565fc(int32,int32,int32,int32)
+.method public static int32 navigate_get_waypoint_105660c(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 t0,int32 v1,int32 t4,int32 t3,int32 lo,int32 t1,int32 t5,int32 t2,int32 ra,int32 t6)
@@ -2233,96 +2233,96 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010565fc: 0x10565fc: lui   v1, 0x70000
+// 0x0105660c: 0x105660c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056600: 0x1056600: lui   v0, 0x70000
+// 0x01056610: 0x1056610: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01056604: 0x1056604: lw    a2, 9168(v1)
+// 0x01056614: 0x1056614: lw    a2, 9632(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056608: 0x1056608: lw    v0, 9172(v0)
+// 0x01056618: 0x1056618: lw    v0, 9636(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105660c: 0x105660c: lui   v1, 0x70000
+// 0x0105661c: 0x105661c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056610: 0x1056610: lui   a3, 0x70000
+// 0x01056620: 0x1056620: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01056614: 0x1056614: lw    v1, 9176(v1)
+// 0x01056624: 0x1056624: lw    v1, 9640(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056618: 0x1056618: addu  a2, v0, a2
+// 0x01056628: 0x1056628: addu  a2, v0, a2
 	ldloc 4
 	ldloc.2
 	add
 	stloc.2
-// 0x0105661c: 0x105661c: lw    t0, 9164(a3)
+// 0x0105662c: 0x105662c: lw    t0, 9628(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056620: 0x1056620: addiu a3, zero, -1
+// 0x01056630: 0x1056630: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01056624: 0x1056624: bne   a0, a3, 0x1056648 subu  a2, a2, v1
+// 0x01056634: 0x1056634: bne   a0, a3, 0x1056658 subu  a2, a2, v1
 	ldloc.0
 	ldloc.3
 	ldloc.2
 	ldloc 7
 	sub
 	stloc.2
-	bne.un L_1056648
+	bne.un L_1056658
 // --- basic block ---
-// 0x0105662c: 0x105662c: lui   v0, 0x70000
+// 0x0105663c: 0x105663c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01056630: 0x1056630: lw    v1, 10732(v0)
+// 0x01056640: 0x1056640: lw    v1, 11196(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2683
+	ldc.i4 2799
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056634: 0x1056634: addiu v0, v0, 10732
+// 0x01056644: 0x1056644: addiu v0, v0, 11196
 	ldloc 4
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc 4
-// 0x01056638: 0x1056638: sw    v1, 0(a1)
+// 0x01056648: 0x1056648: sw    v1, 0(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0105663c: 0x105663c: lw    v0, 4(v0)
+// 0x0105664c: 0x105664c: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -2331,7 +2331,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056640: 0x1056640: jr    ra sw    v0, 4(a1)
+// 0x01056650: 0x1056650: jr    ra sw    v0, 4(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2342,220 +2342,220 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1056648:
-// 0x01056648: 0x1056648: addu  t4, v1, t0
+L_1056658:
+// 0x01056658: 0x1056658: addu  t4, v1, t0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 8
-// 0x0105664c: 0x105664c: addiu t4, t4, 1
+// 0x0105665c: 0x105665c: addiu t4, t4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01056650: 0x1056650: addiu t3, zero, 56
+// 0x01056660: 0x1056660: addiu t3, zero, 56
 	ldc.i4.s 56
 	stloc 9
-// 0x01056654: 0x1056654: subu  t4, t4, v0
+// 0x01056664: 0x1056664: subu  t4, t4, v0
 	ldloc 8
 	ldloc 4
 	sub
 	stloc 8
-// 0x01056658: 0x1056658: mult  t4, t3
+// 0x01056668: 0x1056668: mult  t4, t3
 	ldloc 8
 	ldloc 9
 	mul
 	stloc 10
-// 0x0105665c: 0x105665c: addiu t5, t0, 1
+// 0x0105666c: 0x105666c: addiu t5, t0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 12
-// 0x01056660: 0x1056660: lui   t1, 0x70000
+// 0x01056670: 0x1056670: lui   t1, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x01056664: 0x1056664: lw    t2, 10724(t1)
+// 0x01056674: 0x1056674: lw    t2, 11188(t1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 13
-// 0x01056668: 0x1056668: lui   a3, 0x70000
+// 0x01056678: 0x1056678: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x0105666c: 0x105666c: lui   t1, 0x70000
+// 0x0105667c: 0x105667c: lui   t1, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x01056670: 0x1056670: lw    a3, 10692(a3)
+// 0x01056680: 0x1056680: lw    a3, 11156(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldelem.i4
 	stloc.3
-// 0x01056674: 0x1056674: lw    t1, 10720(t1)
+// 0x01056684: 0x1056684: lw    t1, 11184(t1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 11
-// 0x01056678: 0x1056678: subu  a0, a0, a3
+// 0x01056688: 0x1056688: subu  a0, a0, a3
 	ldloc.0
 	ldloc.3
 	sub
 	stloc.0
-// 0x0105667c: 0x105667c: addu  a3, zero, zero
+// 0x0105668c: 0x105668c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01056680: 0x1056680: mflo  lo
+// 0x01056690: 0x1056690: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x01056684: 0x1056684: addu  t4, t1, t4
+// 0x01056694: 0x1056694: addu  t4, t1, t4
 	ldloc 11
 	ldloc 8
 	add
 	stloc 8
-// 0x01056688: 0x1056688: sll   zero, zero, 0
-// 0x0105668c: 0x105668c: mult  t5, t3
+// 0x01056698: 0x1056698: sll   zero, zero, 0
+// 0x0105669c: 0x105669c: mult  t5, t3
 	ldloc 12
 	ldloc 9
 	mul
 	stloc 10
-// 0x01056690: 0x1056690: mflo  lo
+// 0x010566a0: 0x10566a0: mflo  lo
 	ldloc 10
 	stloc 9
-// 0x01056694: 0x1056694: j	 0x10566b8 addu  t3, t2, t3
+// 0x010566a4: 0x10566a4: j	 0x10566c8 addu  t3, t2, t3
 	ldloc 13
 	ldloc 9
 	add
 	stloc 9
-	br L_10566b8
+	br L_10566c8
 // --- basic block ---
-L_105669c:
-// 0x0105669c: 0x105669c: beq   t6, zero, 0x10566a8 addu  a3, t4, zero
+L_10566ac:
+// 0x010566ac: 0x10566ac: beq   t6, zero, 0x10566b8 addu  a3, t4, zero
 	ldloc 15
 	ldloc 8
 	stloc.3
-	brfalse L_10566a8
+	brfalse L_10566b8
 // --- basic block ---
-// 0x010566a4: 0x10566a4: addu  a3, t3, zero
+// 0x010566b4: 0x10566b4: addu  a3, t3, zero
 	ldloc 9
 	stloc.3
-L_10566a8:
-// 0x010566a8: 0x10566a8: lh    t5, 46(a3)
+L_10566b8:
+// 0x010566b8: 0x10566b8: lh    t5, 46(a3)
 	ldloc.3
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 12
-// 0x010566ac: 0x10566ac: addiu t3, t3, 56
+// 0x010566bc: 0x10566bc: addiu t3, t3, 56
 	ldloc 9
 	ldc.i4.s 56
 	add
 	stloc 9
-// 0x010566b0: 0x10566b0: subu  a0, a0, t5
+// 0x010566c0: 0x10566c0: subu  a0, a0, t5
 	ldloc.0
 	ldloc 12
 	sub
 	stloc.0
-// 0x010566b4: 0x10566b4: addiu t4, t4, 56
+// 0x010566c4: 0x10566c4: addiu t4, t4, 56
 	ldloc 8
 	ldc.i4.s 56
 	add
 	stloc 8
-L_10566b8:
-// 0x010566b8: 0x10566b8: addiu t0, t0, 1
+L_10566c8:
+// 0x010566c8: 0x10566c8: addiu t0, t0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010566bc: 0x10566bc: slt   t5, t0, a2
+// 0x010566cc: 0x10566cc: slt   t5, t0, a2
 	ldloc 6
 	ldloc.2
 	clt
 	stloc 12
-// 0x010566c0: 0x10566c0: blez  a0, 0x10566fc slt   t6, t0, v0
+// 0x010566d0: 0x10566d0: blez  a0, 0x105670c slt   t6, t0, v0
 	ldloc.0
 	ldloc 6
 	ldloc 4
 	clt
 	stloc 15
 	ldc.i4.s 0
-	ble L_10566fc
+	ble L_105670c
 // --- basic block ---
-// 0x010566c8: 0x10566c8: bne   t5, zero, 0x105669c sll   zero, zero, 0
+// 0x010566d8: 0x10566d8: bne   t5, zero, 0x10566ac sll   zero, zero, 0
 	ldloc 12
-	brtrue L_105669c
+	brtrue L_10566ac
 // --- basic block ---
-// 0x010566d0: 0x10566d0: j	 0x1056744 addiu t0, t0, -1
+// 0x010566e0: 0x10566e0: j	 0x1056754 addiu t0, t0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-	br L_1056744
+	br L_1056754
 // --- basic block ---
-L_10566d8:
-// 0x010566d8: 0x10566d8: mult  t0, a3
+L_10566e8:
+// 0x010566e8: 0x10566e8: mult  t0, a3
 	ldloc 6
 	ldloc.3
 	mul
 	stloc 10
-// 0x010566dc: 0x10566dc: mflo  lo
+// 0x010566ec: 0x10566ec: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x010566e0: 0x10566e0: j	 0x10566fc addu  a3, t2, t0
+// 0x010566f0: 0x10566f0: j	 0x105670c addu  a3, t2, t0
 	ldloc 13
 	ldloc 6
 	add
 	stloc.3
-	br L_10566fc
+	br L_105670c
 // --- basic block ---
-L_10566e8:
-// 0x010566e8: 0x10566e8: addu  t0, v0, t0
+L_10566f8:
+// 0x010566f8: 0x10566f8: addu  t0, v0, t0
 	ldloc 4
 	ldloc 6
 	add
 	stloc 6
-// 0x010566ec: 0x10566ec: addiu a0, zero, 56
+// 0x010566fc: 0x10566fc: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.0
-// 0x010566f0: 0x10566f0: mult  t0, a0
+// 0x01056700: 0x1056700: mult  t0, a0
 	ldloc 6
 	ldloc.0
 	mul
 	stloc 10
-// 0x010566f4: 0x10566f4: mflo  lo
+// 0x01056704: 0x1056704: mflo  lo
 	ldloc 10
 	stloc.3
-// 0x010566f8: 0x10566f8: addu  a3, t1, a3
+// 0x01056708: 0x1056708: addu  a3, t1, a3
 	ldloc 11
 	ldloc.3
 	add
 	stloc.3
-L_10566fc:
-// 0x010566fc: 0x10566fc: lb    v1, 50(a3)
+L_105670c:
+// 0x0105670c: 0x105670c: lb    v1, 50(a3)
 	ldloc.3
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01056700: 0x1056700: addiu v0, zero, 1
+// 0x01056710: 0x1056710: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01056704: 0x1056704: bne   v1, v0, 0x105672c sll   zero, zero, 0
+// 0x01056714: 0x1056714: bne   v1, v0, 0x105673c sll   zero, zero, 0
 	ldloc 7
 	ldloc 4
-	bne.un L_105672c
+	bne.un L_105673c
 // --- basic block ---
-// 0x0105670c: 0x105670c: lw    v0, 8(a3)
+// 0x0105671c: 0x105671c: lw    v0, 8(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2564,15 +2564,15 @@ L_10566fc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056710: 0x1056710: sll   zero, zero, 0
-// 0x01056714: 0x1056714: sw    v0, 0(a1)
+// 0x01056720: 0x1056720: sll   zero, zero, 0
+// 0x01056724: 0x1056724: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-// 0x01056718: 0x1056718: lw    v0, 12(a3)
+// 0x01056728: 0x1056728: lw    v0, 12(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2581,8 +2581,8 @@ L_10566fc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105671c: 0x105671c: sll   zero, zero, 0
-// 0x01056720: 0x1056720: sw    v0, 4(a1)
+// 0x0105672c: 0x105672c: sll   zero, zero, 0
+// 0x01056730: 0x1056730: sw    v0, 4(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2591,26 +2591,26 @@ L_10566fc:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01056724: 0x1056724: jr    ra sll   zero, zero, 0
+// 0x01056734: 0x1056734: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_105672c:
-// 0x0105672c: 0x105672c: lw    v0, 0(a3)
+L_105673c:
+// 0x0105673c: 0x105673c: lw    v0, 0(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01056730: 0x1056730: sll   zero, zero, 0
-// 0x01056734: 0x1056734: sw    v0, 0(a1)
+// 0x01056740: 0x1056740: sll   zero, zero, 0
+// 0x01056744: 0x1056744: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-// 0x01056738: 0x1056738: lw    v0, 4(a3)
+// 0x01056748: 0x1056748: lw    v0, 4(a3)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -2619,7 +2619,7 @@ L_105672c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105673c: 0x105673c: jr    ra sw    v0, 4(a1)
+// 0x0105674c: 0x105674c: jr    ra sw    v0, 4(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2630,31 +2630,31 @@ L_105672c:
 	stelem.i4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1056744:
-// 0x01056744: 0x1056744: slt   a0, t0, v0
+L_1056754:
+// 0x01056754: 0x1056754: slt   a0, t0, v0
 	ldloc 6
 	ldloc 4
 	clt
 	stloc.0
-// 0x01056748: 0x1056748: bne   a0, zero, 0x10566d8 addiu a3, zero, 56
+// 0x01056758: 0x1056758: bne   a0, zero, 0x10566e8 addiu a3, zero, 56
 	ldloc.0
 	ldc.i4.s 56
 	stloc.3
-	brtrue L_10566d8
+	brtrue L_10566e8
 // --- basic block ---
-// 0x01056750: 0x1056750: j	 0x10566e8 subu  v0, v1, v0
+// 0x01056760: 0x1056760: j	 0x10566f8 subu  v0, v1, v0
 	ldloc 7
 	ldloc 4
 	sub
 	stloc 4
-	br L_10566e8
+	br L_10566f8
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 4
 	ret
 }
-.method public static int32 navigate_main_nav_resumed_1056758()
+.method public static int32 navigate_main_nav_resumed_1056768()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2671,25 +2671,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056758: 0x1056758: lui   v0, 0x70000
+// 0x01056768: 0x1056768: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0105675c: 0x105675c: lw    v0, 10372(v0)
+// 0x0105676c: 0x105676c: lw    v0, 10836(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2593
+	ldc.i4 2709
 	add
 	ldelem.i4
 	stloc.0
-// 0x01056760: 0x1056760: jr    ra sll   zero, zero, 0
+// 0x01056770: 0x1056770: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_main_prepare_for_request_10567c0()
+.method public static int32 navigate_main_prepare_for_request_10567d0()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2709,30 +2709,30 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010567c0: 0x10567c0: lui   v0, 0x70000
+// 0x010567d0: 0x10567d0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x010567c4: 0x10567c4: addiu v1, zero, 1
+// 0x010567d4: 0x10567d4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010567c8: 0x10567c8: sw    v1, 9188(v0)
+// 0x010567d8: 0x10567d8: sw    v1, 9652(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldloc.1
 	stelem.i4
-// 0x010567cc: 0x10567cc: lui   v0, 0x70000
+// 0x010567dc: 0x10567dc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x010567d0: 0x10567d0: jr    ra sw    zero, 9200(v0)
+// 0x010567e0: 0x10567e0: jr    ra sw    zero, 9664(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2300
+	ldc.i4 2416
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -2743,7 +2743,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_main_outline_iterator_10567d8(int32,int32)
+.method public static int32 navigate_main_outline_iterator_10567e8(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2769,87 +2769,87 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010567d8: 0x10567d8: lui   v0, 0x70000
+// 0x010567e8: 0x10567e8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x010567dc: 0x10567dc: lw    v0, 10028(v0)
+// 0x010567ec: 0x10567ec: lw    v0, 10492(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc.2
-// 0x010567e0: 0x10567e0: sll   zero, zero, 0
-// 0x010567e4: 0x10567e4: bne   v0, zero, 0x105680c sll   a0, a0, 3
+// 0x010567f0: 0x10567f0: sll   zero, zero, 0
+// 0x010567f4: 0x10567f4: bne   v0, zero, 0x105681c sll   a0, a0, 3
 	ldloc.2
 	ldloc.0
 	ldc.i4.3
 	shl
 	stloc.0
-	brtrue L_105680c
+	brtrue L_105681c
 // --- basic block ---
-// 0x010567ec: 0x10567ec: lui   v0, 0x70000
+// 0x010567fc: 0x10567fc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x010567f0: 0x10567f0: lw    v1, 10356(v0)
+// 0x01056800: 0x1056800: lw    v1, 10820(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2589
+	ldc.i4 2705
 	add
 	ldelem.i4
 	stloc 4
-// 0x010567f4: 0x10567f4: lui   v0, 0x70000
+// 0x01056804: 0x1056804: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x010567f8: 0x10567f8: sll   v1, v1, 2
+// 0x01056808: 0x1056808: sll   v1, v1, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x010567fc: 0x10567fc: addiu v0, v0, 10752
+// 0x0105680c: 0x105680c: addiu v0, v0, 11216
 	ldloc.2
-	ldc.i4 10752
+	ldc.i4 11216
 	add
 	stloc.2
-// 0x01056800: 0x1056800: addu  v0, v1, v0
+// 0x01056810: 0x1056810: addu  v0, v1, v0
 	ldloc 4
 	ldloc.2
 	add
 	stloc.2
-// 0x01056804: 0x1056804: lw    v0, 0(v0)
+// 0x01056814: 0x1056814: lw    v0, 0(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01056808: 0x1056808: sll   zero, zero, 0
-L_105680c:
-// 0x0105680c: 0x105680c: addu  v0, v0, a0
+// 0x01056818: 0x1056818: sll   zero, zero, 0
+L_105681c:
+// 0x0105681c: 0x105681c: addu  v0, v0, a0
 	ldloc.2
 	ldloc.0
 	add
 	stloc.2
-// 0x01056810: 0x1056810: lw    v1, 0(v0)
+// 0x01056820: 0x1056820: lw    v1, 0(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01056814: 0x1056814: sll   zero, zero, 0
-// 0x01056818: 0x1056818: sw    v1, 0(a1)
+// 0x01056824: 0x1056824: sll   zero, zero, 0
+// 0x01056828: 0x1056828: sw    v1, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-// 0x0105681c: 0x105681c: lw    v0, 4(v0)
+// 0x0105682c: 0x105682c: lw    v0, 4(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -2858,7 +2858,7 @@ L_105680c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056820: 0x1056820: jr    ra sw    v0, 4(a1)
+// 0x01056830: 0x1056830: jr    ra sw    v0, 4(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -2874,7 +2874,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 navigate_main_set_dest_pos_1056828(int32)
+.method public static int32 navigate_main_set_dest_pos_1056838(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -2897,26 +2897,26 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056828: 0x1056828: lw    v1, 0(a0)
+// 0x01056838: 0x1056838: lw    v1, 0(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0105682c: 0x105682c: lui   v0, 0x70000
+// 0x0105683c: 0x105683c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01056830: 0x1056830: sw    v1, 10732(v0)
+// 0x01056840: 0x1056840: sw    v1, 11196(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2683
+	ldc.i4 2799
 	add
 	ldloc.2
 	stelem.i4
-// 0x01056834: 0x1056834: lw    v1, 4(a0)
+// 0x01056844: 0x1056844: lw    v1, 4(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2925,12 +2925,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056838: 0x1056838: addiu v0, v0, 10732
+// 0x01056848: 0x1056848: addiu v0, v0, 11196
 	ldloc.1
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc.1
-// 0x0105683c: 0x105683c: jr    ra sw    v1, 4(v0)
+// 0x0105684c: 0x105684c: jr    ra sw    v1, 4(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -2946,7 +2946,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_main_state_1056874()
+.method public static int32 navigate_main_state_1056884()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -2963,25 +2963,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056874: 0x1056874: lui   v0, 0x70000
+// 0x01056884: 0x1056884: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01056878: 0x1056878: lw    v0, 9160(v0)
+// 0x01056888: 0x1056888: lw    v0, 9624(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc.0
-// 0x0105687c: 0x105687c: sll   zero, zero, 0
-// 0x01056880: 0x1056880: sltu  v0, zero, v0
+// 0x0105688c: 0x105688c: sll   zero, zero, 0
+// 0x01056890: 0x1056890: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc.0
 	clt.un
 	stloc.0
-// 0x01056884: 0x1056884: jr    ra addiu v0, v0, -1
+// 0x01056894: 0x1056894: jr    ra addiu v0, v0, -1
 	ldloc.0
 	ldc.i4.m1
 	add
@@ -2991,7 +2991,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_main_is_calculating_route_105688c()
+.method public static int32 navigate_main_is_calculating_route_105689c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3008,25 +3008,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105688c: 0x105688c: lui   v0, 0x70000
+// 0x0105689c: 0x105689c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01056890: 0x1056890: lw    v0, 10012(v0)
+// 0x010568a0: 0x10568a0: lw    v0, 10476(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldelem.i4
 	stloc.0
-// 0x01056894: 0x1056894: jr    ra sll   zero, zero, 0
+// 0x010568a4: 0x10568a4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 switchETAtoTime_105689c()
+.method public static int32 switchETAtoTime_10568ac()
 {
 .maxstack 8
 .locals init (int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -3046,30 +3046,30 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105689c: 0x105689c: lui   v0, 0x70000
+// 0x010568ac: 0x10568ac: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010568a0: 0x10568a0: lw    v1, 10364(v0)
+// 0x010568b0: 0x10568b0: lw    v1, 10828(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2591
+	ldc.i4 2707
 	add
 	ldelem.i4
 	stloc.0
-// 0x010568a4: 0x10568a4: sll   zero, zero, 0
-// 0x010568a8: 0x10568a8: sltiu v1, v1, 1
+// 0x010568b4: 0x10568b4: sll   zero, zero, 0
+// 0x010568b8: 0x10568b8: sltiu v1, v1, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
 	stloc.0
-// 0x010568ac: 0x10568ac: jr    ra sw    v1, 10364(v0)
+// 0x010568bc: 0x10568bc: jr    ra sw    v1, 10828(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2591
+	ldc.i4 2707
 	add
 	ldloc.0
 	stelem.i4
@@ -3080,7 +3080,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_main_get_src_position_10568b4()
+.method public static int32 navigate_main_get_src_position_10568c4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -3094,12 +3094,12 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010568b4: 0x10568b4: lui   v0, 0x70000
+// 0x010568c4: 0x10568c4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x010568b8: 0x10568b8: jr    ra addiu v0, v0, 10740
+// 0x010568c8: 0x10568c8: jr    ra addiu v0, v0, 11204
 	ldloc.0
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3107,7 +3107,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_play_sound_10569ac(int32,int32,int32,int32,int32)
+.method public static int32 navigate_play_sound_10569bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -3148,12 +3148,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010569ac: 0x10569ac: addiu sp, sp, -32
+// 0x010569bc: 0x10569bc: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010569b0: 0x10569b0: sw    s1, 24(sp)
+// 0x010569c0: 0x10569c0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3162,20 +3162,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010569b4: 0x10569b4: lui   s1, 0x70000
+// 0x010569c4: 0x10569c4: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010569b8: 0x10569b8: lw    v0, 10016(s1)
+// 0x010569c8: 0x10569c8: lw    v0, 10480(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldelem.i4
 	stloc 5
-// 0x010569bc: 0x10569bc: sw    ra, 28(sp)
-// 0x010569c0: 0x10569c0: bne   v0, zero, 0x10569f4 sw    s0, 20(sp)
+// 0x010569cc: 0x10569cc: sw    ra, 28(sp)
+// 0x010569d0: 0x10569d0: bne   v0, zero, 0x1056a04 sw    s0, 20(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3185,53 +3185,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_10569f4
+	brtrue L_1056a04
 // --- basic block ---
-// 0x010569c8: 0x10569c8: jal   0x10518a8 addiu a0, zero, 1
+// 0x010569d8: 0x10569d8: jal   0x10518b8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010569d0: 0x10569d0: lui   s0, 0x10000
+// 0x010569e0: 0x10569e0: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010569d4: 0x10569d4: addu  a0, v0, zero
+// 0x010569e4: 0x10569e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010569d8: 0x10569d8: addiu a1, s0, 5100
+// 0x010569e8: 0x10569e8: addiu a1, s0, 5096
 	ldloc 7
-	ldc.i4 5100
+	ldc.i4 5096
 	add
 	stloc.2
-// 0x010569dc: 0x10569dc: jal   0x10518cc sw    v0, 10016(s1)
+// 0x010569ec: 0x10569ec: jal   0x10518dc sw    v0, 10480(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010569e4: 0x10569e4: addiu a2, s0, 5100
+// 0x010569f4: 0x10569f4: addiu a2, s0, 5096
 	ldloc 7
-	ldc.i4 5100
+	ldc.i4 5096
 	add
 	stloc.3
-// 0x010569e8: 0x10569e8: addiu a0, zero, 1
+// 0x010569f8: 0x10569f8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010569ec: 0x10569ec: jal   0x10a1918 addu  a1, zero, zero
+// 0x010569fc: 0x10569fc: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3239,37 +3239,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_10569f4:
-// 0x010569f4: 0x10569f4: lui   v0, 0x70000
+L_1056a04:
+// 0x01056a04: 0x1056a04: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010569f8: 0x10569f8: lw    a0, 10016(v0)
+// 0x01056a08: 0x1056a08: lw    a0, 10480(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2504
+	ldc.i4 2620
 	add
 	ldelem.i4
 	stloc.1
-// 0x010569fc: 0x10569fc: jal   0x105195c sll   zero, zero, 0
+// 0x01056a0c: 0x1056a0c: jal   0x105196c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01056a04: 0x1056a04: lw    ra, 28(sp)
-// 0x01056a08: 0x1056a08: lw    s1, 24(sp)
+// 0x01056a14: 0x1056a14: lw    ra, 28(sp)
+// 0x01056a18: 0x1056a18: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3278,7 +3278,7 @@ L_10569f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01056a0c: 0x1056a0c: lw    s0, 20(sp)
+// 0x01056a1c: 0x1056a1c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3287,7 +3287,7 @@ L_10569f4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056a10: 0x1056a10: jr    ra addiu sp, sp, 32
+// 0x01056a20: 0x1056a20: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3299,7 +3299,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 refresh_eta_1056a18(int32,int32,int32,int32,int32)
+.method public static int32 refresh_eta_1056a28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 t0,int32 lo,int32 s2,int32 s3,int32 t1,int32 s4,int32 s5,int32 s6,int32 s8,int32 s7,int32 ra,int32 t2)
@@ -3373,15 +3373,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056a18: 0x1056a18: addiu sp, sp, -1072
+// 0x01056a28: 0x1056a28: addiu sp, sp, -1072
 	ldloc.0
 	ldc.i4 -1072
 	add
 	stloc.0
-// 0x01056a1c: 0x1056a1c: lui   v0, 0x70000
+// 0x01056a2c: 0x1056a2c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056a20: 0x1056a20: sw    s4, 1048(sp)
+// 0x01056a30: 0x1056a30: sw    s4, 1048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3390,22 +3390,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01056a24: 0x1056a24: lw    v0, 9160(v0)
+// 0x01056a34: 0x1056a34: lw    v0, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056a28: 0x1056a28: addu  s4, a0, zero
+// 0x01056a38: 0x1056a38: addu  s4, a0, zero
 	ldloc.1
 	stloc 15
-// 0x01056a2c: 0x1056a2c: lui   a0, 0x70000
+// 0x01056a3c: 0x1056a3c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01056a30: 0x1056a30: sw    s3, 1044(sp)
+// 0x01056a40: 0x1056a40: sw    s3, 1044(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3414,22 +3414,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01056a34: 0x1056a34: lui   v1, 0x70000
+// 0x01056a44: 0x1056a44: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056a38: 0x1056a38: lw    s3, 10696(a0)
+// 0x01056a48: 0x1056a48: lw    s3, 11160(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldelem.i4
 	stloc 13
-// 0x01056a3c: 0x1056a3c: lui   a0, 0x70000
+// 0x01056a4c: 0x1056a4c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01056a40: 0x1056a40: sw    s0, 1032(sp)
+// 0x01056a50: 0x1056a50: sw    s0, 1032(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3438,8 +3438,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01056a44: 0x1056a44: sw    ra, 1068(sp)
-// 0x01056a48: 0x1056a48: sw    s8, 1064(sp)
+// 0x01056a54: 0x1056a54: sw    ra, 1068(sp)
+// 0x01056a58: 0x1056a58: sw    s8, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3448,7 +3448,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01056a4c: 0x1056a4c: sw    s7, 1060(sp)
+// 0x01056a5c: 0x1056a5c: sw    s7, 1060(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3457,7 +3457,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01056a50: 0x1056a50: sw    s6, 1056(sp)
+// 0x01056a60: 0x1056a60: sw    s6, 1056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3466,7 +3466,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01056a54: 0x1056a54: sw    s5, 1052(sp)
+// 0x01056a64: 0x1056a64: sw    s5, 1052(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3475,7 +3475,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01056a58: 0x1056a58: sw    s2, 1040(sp)
+// 0x01056a68: 0x1056a68: sw    s2, 1040(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3484,7 +3484,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01056a5c: 0x1056a5c: sw    s1, 1036(sp)
+// 0x01056a6c: 0x1056a6c: sw    s1, 1036(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3493,212 +3493,212 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01056a60: 0x1056a60: lw    v1, 10684(v1)
+// 0x01056a70: 0x1056a70: lw    v1, 11148(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2671
+	ldc.i4 2787
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056a64: 0x1056a64: lw    s0, 9164(a0)
+// 0x01056a74: 0x1056a74: lw    s0, 9628(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 8
-// 0x01056a68: 0x1056a68: beq   v0, zero, 0x1056ddc sll   zero, zero, 0
+// 0x01056a78: 0x1056a78: beq   v0, zero, 0x1056dec sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1056ddc
+	brfalse L_1056dec
 // --- basic block ---
-// 0x01056a70: 0x1056a70: beq   s4, zero, 0x1056a84 addu  s3, s3, v1
+// 0x01056a80: 0x1056a80: beq   s4, zero, 0x1056a94 addu  s3, s3, v1
 	ldloc 15
 	ldloc 13
 	ldloc 7
 	add
 	stloc 13
-	brfalse L_1056a84
+	brfalse L_1056a94
 // --- basic block ---
-// 0x01056a78: 0x1056a78: lui   v0, 0x70000
+// 0x01056a88: 0x1056a88: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056a7c: 0x1056a7c: sw    zero, 10704(v0)
+// 0x01056a8c: 0x1056a8c: sw    zero, 11168(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01056a80: 0x1056a80: addu  s3, zero, zero
+// 0x01056a90: 0x1056a90: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 13
-L_1056a84:
-// 0x01056a84: 0x1056a84: lui   v1, 0x70000
+L_1056a94:
+// 0x01056a94: 0x1056a94: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056a88: 0x1056a88: lui   v0, 0x70000
+// 0x01056a98: 0x1056a98: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056a8c: 0x1056a8c: lw    s2, 9168(v1)
+// 0x01056a9c: 0x1056a9c: lw    s2, 9632(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 12
-// 0x01056a90: 0x1056a90: lw    v0, 9172(v0)
+// 0x01056aa0: 0x1056aa0: lw    v0, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056a94: 0x1056a94: lui   v1, 0x70000
+// 0x01056aa4: 0x1056aa4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056a98: 0x1056a98: lw    s1, 9176(v1)
+// 0x01056aa8: 0x1056aa8: lw    s1, 9640(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 9
-// 0x01056a9c: 0x1056a9c: addu  s2, v0, s2
+// 0x01056aac: 0x1056aac: addu  s2, v0, s2
 	ldloc 5
 	ldloc 12
 	add
 	stloc 12
-// 0x01056aa0: 0x1056aa0: subu  s2, s2, s1
+// 0x01056ab0: 0x1056ab0: subu  s2, s2, s1
 	ldloc 12
 	ldloc 9
 	sub
 	stloc 12
-// 0x01056aa4: 0x1056aa4: slt   v1, s0, s2
+// 0x01056ab4: 0x1056ab4: slt   v1, s0, s2
 	ldloc 8
 	ldloc 12
 	clt
 	stloc 7
-// 0x01056aa8: 0x1056aa8: beq   v1, zero, 0x1056ddc slt   v1, s0, v0
+// 0x01056ab8: 0x1056ab8: beq   v1, zero, 0x1056dec slt   v1, s0, v0
 	ldloc 7
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 7
-	brfalse L_1056ddc
+	brfalse L_1056dec
 // --- basic block ---
-// 0x01056ab0: 0x1056ab0: beq   v1, zero, 0x1056ad4 addiu v1, zero, 56
+// 0x01056ac0: 0x1056ac0: beq   v1, zero, 0x1056ae4 addiu v1, zero, 56
 	ldloc 7
 	ldc.i4.s 56
 	stloc 7
-	brfalse L_1056ad4
+	brfalse L_1056ae4
 // --- basic block ---
-// 0x01056ab8: 0x1056ab8: addiu s1, zero, 56
+// 0x01056ac8: 0x1056ac8: addiu s1, zero, 56
 	ldc.i4.s 56
 	stloc 9
-// 0x01056abc: 0x1056abc: mult  s0, s1
+// 0x01056acc: 0x1056acc: mult  s0, s1
 	ldloc 8
 	ldloc 9
 	mul
 	stloc 11
-// 0x01056ac0: 0x1056ac0: lui   v0, 0x70000
+// 0x01056ad0: 0x1056ad0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056ac4: 0x1056ac4: lw    v0, 10724(v0)
+// 0x01056ad4: 0x1056ad4: lw    v0, 11188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056ac8: 0x1056ac8: mflo  lo
+// 0x01056ad8: 0x1056ad8: mflo  lo
 	ldloc 11
 	stloc 9
-// 0x01056acc: 0x1056acc: j	 0x1056af0 addu  s1, s1, v0
+// 0x01056adc: 0x1056adc: j	 0x1056b00 addu  s1, s1, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-	br L_1056af0
+	br L_1056b00
 // --- basic block ---
-L_1056ad4:
-// 0x01056ad4: 0x1056ad4: addu  s1, s1, s0
+L_1056ae4:
+// 0x01056ae4: 0x1056ae4: addu  s1, s1, s0
 	ldloc 9
 	ldloc 8
 	add
 	stloc 9
-// 0x01056ad8: 0x1056ad8: subu  v0, s1, v0
+// 0x01056ae8: 0x1056ae8: subu  v0, s1, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 5
-// 0x01056adc: 0x1056adc: mult  v0, v1
+// 0x01056aec: 0x1056aec: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 11
-// 0x01056ae0: 0x1056ae0: lui   v1, 0x70000
+// 0x01056af0: 0x1056af0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056ae4: 0x1056ae4: lw    s1, 10720(v1)
+// 0x01056af4: 0x1056af4: lw    s1, 11184(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 9
-// 0x01056ae8: 0x1056ae8: mflo  lo
+// 0x01056af8: 0x1056af8: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x01056aec: 0x1056aec: addu  s1, s1, v0
+// 0x01056afc: 0x1056afc: addu  s1, s1, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-L_1056af0:
-// 0x01056af0: 0x1056af0: lui   v0, 0x70000
+L_1056b00:
+// 0x01056b00: 0x1056b00: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056af4: 0x1056af4: lw    v0, 9188(v0)
+// 0x01056b04: 0x1056b04: lw    v0, 9652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056af8: 0x1056af8: lh    s7, 44(s1)
+// 0x01056b08: 0x1056b08: lh    s7, 44(s1)
 	ldloc 9
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 19
-// 0x01056afc: 0x1056afc: bne   v0, zero, 0x1056b14 lui   v0, 0x70000
+// 0x01056b0c: 0x1056b0c: bne   v0, zero, 0x1056b24 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1056b14
+	brtrue L_1056b24
 // --- basic block ---
-// 0x01056b04: 0x1056b04: addu  a0, s1, zero
+// 0x01056b14: 0x1056b14: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01056b08: 0x1056b08: jal   0x105d2c0 subu  a1, s2, s0
+// 0x01056b18: 0x1056b18: jal   0x105d2d0 subu  a1, s2, s0
 	ldloc 12
 	ldloc 8
 	sub
@@ -3708,63 +3708,63 @@ L_1056af0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_cross_time_105d2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_cross_time_105d2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056b10: 0x1056b10: lui   v0, 0x70000
+// 0x01056b20: 0x1056b20: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1056b14:
-// 0x01056b14: 0x1056b14: lw    a0, 10692(v0)
+L_1056b24:
+// 0x01056b24: 0x1056b24: lw    a0, 11156(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldelem.i4
 	stloc.1
-// 0x01056b18: 0x1056b18: lh    s6, 46(s1)
+// 0x01056b28: 0x1056b28: lh    s6, 46(s1)
 	ldloc 9
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 17
-// 0x01056b1c: 0x1056b1c: sll   zero, zero, 0
-// 0x01056b20: 0x1056b20: slt   v0, a0, s6
+// 0x01056b2c: 0x1056b2c: sll   zero, zero, 0
+// 0x01056b30: 0x1056b30: slt   v0, a0, s6
 	ldloc.1
 	ldloc 17
 	clt
 	stloc 5
-// 0x01056b24: 0x1056b24: lh    s8, 48(s1)
+// 0x01056b34: 0x1056b34: lh    s8, 48(s1)
 	ldloc 9
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 18
-// 0x01056b28: 0x1056b28: beq   v0, zero, 0x1056bac lui   s5, 0x70000
+// 0x01056b38: 0x1056b38: beq   v0, zero, 0x1056bbc lui   s5, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 16
-	brfalse L_1056bac
+	brfalse L_1056bbc
 // --- basic block ---
-// 0x01056b30: 0x1056b30: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01056b40: 0x1056b40: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056b38: 0x1056b38: addu  a2, v0, zero
+// 0x01056b48: 0x1056b48: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01056b3c: 0x1056b3c: addu  a0, s8, zero
+// 0x01056b4c: 0x1056b4c: addu  a0, s8, zero
 	ldloc 18
 	stloc.1
-// 0x01056b40: 0x1056b40: sw    a2, 1024(sp)
+// 0x01056b50: 0x1056b50: sw    a2, 1024(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3773,7 +3773,7 @@ L_1056b14:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01056b44: 0x1056b44: jal   0x10c09c0 sw    v1, 1028(sp)
+// 0x01056b54: 0x1056b54: jal   0x10c1000 sw    v1, 1028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3784,12 +3784,12 @@ L_1056b14:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056b4c: 0x1056b4c: lw    a2, 1024(sp)
+// 0x01056b5c: 0x1056b5c: lw    a2, 1024(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3798,7 +3798,7 @@ L_1056b14:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01056b50: 0x1056b50: lw    a3, 1028(sp)
+// 0x01056b60: 0x1056b60: lw    a3, 1028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3807,16 +3807,16 @@ L_1056b14:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056b54: 0x1056b54: addu  a0, a2, zero
+// 0x01056b64: 0x1056b64: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01056b58: 0x1056b58: addu  a1, a3, zero
+// 0x01056b68: 0x1056b68: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01056b5c: 0x1056b5c: addu  a2, v0, zero
+// 0x01056b6c: 0x1056b6c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01056b60: 0x1056b60: jal   0x10c0798 addu  a3, v1, zero
+// 0x01056b70: 0x1056b70: jal   0x10c0dd8 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -3824,20 +3824,20 @@ L_1056b14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056b68: 0x1056b68: addu  a2, v0, zero
+// 0x01056b78: 0x1056b78: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01056b6c: 0x1056b6c: addiu a0, s6, 1
+// 0x01056b7c: 0x1056b7c: addiu a0, s6, 1
 	ldloc 17
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01056b70: 0x1056b70: sw    a2, 1024(sp)
+// 0x01056b80: 0x1056b80: sw    a2, 1024(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3846,7 +3846,7 @@ L_1056b14:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01056b74: 0x1056b74: jal   0x10c09c0 sw    v1, 1028(sp)
+// 0x01056b84: 0x1056b84: jal   0x10c1000 sw    v1, 1028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3857,12 +3857,12 @@ L_1056b14:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056b7c: 0x1056b7c: lw    a2, 1024(sp)
+// 0x01056b8c: 0x1056b8c: lw    a2, 1024(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3871,7 +3871,7 @@ L_1056b14:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01056b80: 0x1056b80: lw    a3, 1028(sp)
+// 0x01056b90: 0x1056b90: lw    a3, 1028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3880,16 +3880,16 @@ L_1056b14:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056b84: 0x1056b84: addu  a0, a2, zero
+// 0x01056b94: 0x1056b94: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01056b88: 0x1056b88: addu  a1, a3, zero
+// 0x01056b98: 0x1056b98: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01056b8c: 0x1056b8c: addu  a2, v0, zero
+// 0x01056b9c: 0x1056b9c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01056b90: 0x1056b90: jal   0x10c07f0 addu  a3, v1, zero
+// 0x01056ba0: 0x1056ba0: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -3897,458 +3897,458 @@ L_1056b14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056b98: 0x1056b98: addu  a1, v1, zero
+// 0x01056ba8: 0x1056ba8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01056b9c: 0x1056b9c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01056bac: 0x1056bac: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056ba4: 0x1056ba4: j	 0x1056bb0 sw    v0, 10696(s5)
+// 0x01056bb4: 0x1056bb4: j	 0x1056bc0 sw    v0, 11160(s5)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldloc 5
 	stelem.i4
-	br L_1056bb0
+	br L_1056bc0
 // --- basic block ---
-L_1056bac:
-// 0x01056bac: 0x1056bac: sw    s8, 10696(s5)
+L_1056bbc:
+// 0x01056bbc: 0x1056bbc: sw    s8, 11160(s5)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldloc 18
 	stelem.i4
-L_1056bb0:
-// 0x01056bb0: 0x1056bb0: lui   v0, 0x70000
+L_1056bc0:
+// 0x01056bc0: 0x1056bc0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056bb4: 0x1056bb4: lw    a2, 9176(v0)
+// 0x01056bc4: 0x1056bc4: lw    a2, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.3
-// 0x01056bb8: 0x1056bb8: lui   v0, 0x70000
+// 0x01056bc8: 0x1056bc8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056bbc: 0x1056bbc: lw    v1, 9172(v0)
+// 0x01056bcc: 0x1056bcc: lw    v1, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056bc0: 0x1056bc0: addu  t0, a2, s0
+// 0x01056bd0: 0x1056bd0: addu  t0, a2, s0
 	ldloc.3
 	ldloc 8
 	add
 	stloc 10
-// 0x01056bc4: 0x1056bc4: addiu t0, t0, 1
+// 0x01056bd4: 0x1056bd4: addiu t0, t0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01056bc8: 0x1056bc8: addiu a3, zero, 56
+// 0x01056bd8: 0x1056bd8: addiu a3, zero, 56
 	ldc.i4.s 56
 	stloc 4
-// 0x01056bcc: 0x1056bcc: subu  t0, t0, v1
+// 0x01056bdc: 0x1056bdc: subu  t0, t0, v1
 	ldloc 10
 	ldloc 7
 	sub
 	stloc 10
-// 0x01056bd0: 0x1056bd0: mult  t0, a3
+// 0x01056be0: 0x1056be0: mult  t0, a3
 	ldloc 10
 	ldloc 4
 	mul
 	stloc 11
-// 0x01056bd4: 0x1056bd4: addiu t1, s0, 1
+// 0x01056be4: 0x1056be4: addiu t1, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 14
-// 0x01056bd8: 0x1056bd8: lui   v0, 0x70000
+// 0x01056be8: 0x1056be8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056bdc: 0x1056bdc: lw    a0, 10724(v0)
+// 0x01056bec: 0x1056bec: lw    a0, 11188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.1
-// 0x01056be0: 0x1056be0: lui   v0, 0x70000
+// 0x01056bf0: 0x1056bf0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056be4: 0x1056be4: lw    a1, 10720(v0)
+// 0x01056bf4: 0x1056bf4: lw    a1, 11184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056be8: 0x1056be8: lui   v0, 0x70000
+// 0x01056bf8: 0x1056bf8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056bec: 0x1056bec: lw    v0, 10696(v0)
+// 0x01056bfc: 0x1056bfc: lw    v0, 11160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056bf0: 0x1056bf0: mflo  lo
+// 0x01056c00: 0x1056c00: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x01056bf4: 0x1056bf4: addu  t0, a1, t0
+// 0x01056c04: 0x1056c04: addu  t0, a1, t0
 	ldloc.2
 	ldloc 10
 	add
 	stloc 10
-// 0x01056bf8: 0x1056bf8: sll   zero, zero, 0
-// 0x01056bfc: 0x1056bfc: mult  t1, a3
+// 0x01056c08: 0x1056c08: sll   zero, zero, 0
+// 0x01056c0c: 0x1056c0c: mult  t1, a3
 	ldloc 14
 	ldloc 4
 	mul
 	stloc 11
-// 0x01056c00: 0x1056c00: mflo  lo
+// 0x01056c10: 0x1056c10: mflo  lo
 	ldloc 11
 	stloc 4
-// 0x01056c04: 0x1056c04: j	 0x1056c34 addu  a3, a0, a3
+// 0x01056c14: 0x1056c14: j	 0x1056c44 addu  a3, a0, a3
 	ldloc.1
 	ldloc 4
 	add
 	stloc 4
-	br L_1056c34
+	br L_1056c44
 // --- basic block ---
-L_1056c0c:
-// 0x01056c0c: 0x1056c0c: beq   t2, zero, 0x1056c18 addu  s1, t0, zero
+L_1056c1c:
+// 0x01056c1c: 0x1056c1c: beq   t2, zero, 0x1056c28 addu  s1, t0, zero
 	ldloc 21
 	ldloc 10
 	stloc 9
-	brfalse L_1056c18
+	brfalse L_1056c28
 // --- basic block ---
-// 0x01056c14: 0x1056c14: addu  s1, a3, zero
+// 0x01056c24: 0x1056c24: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-L_1056c18:
-// 0x01056c18: 0x1056c18: lh    t1, 44(s1)
+L_1056c28:
+// 0x01056c28: 0x1056c28: lh    t1, 44(s1)
 	ldloc 9
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 14
-// 0x01056c1c: 0x1056c1c: addiu a3, a3, 56
+// 0x01056c2c: 0x1056c2c: addiu a3, a3, 56
 	ldloc 4
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x01056c20: 0x1056c20: bne   t1, s7, 0x1056c44 addiu t0, t0, 56
+// 0x01056c30: 0x1056c30: bne   t1, s7, 0x1056c54 addiu t0, t0, 56
 	ldloc 14
 	ldloc 19
 	ldloc 10
 	ldc.i4.s 56
 	add
 	stloc 10
-	bne.un L_1056c44
+	bne.un L_1056c54
 // --- basic block ---
-// 0x01056c28: 0x1056c28: lh    t1, 48(s1)
+// 0x01056c38: 0x1056c38: lh    t1, 48(s1)
 	ldloc 9
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 14
-// 0x01056c2c: 0x1056c2c: sll   zero, zero, 0
-// 0x01056c30: 0x1056c30: addu  v0, v0, t1
+// 0x01056c3c: 0x1056c3c: sll   zero, zero, 0
+// 0x01056c40: 0x1056c40: addu  v0, v0, t1
 	ldloc 5
 	ldloc 14
 	add
 	stloc 5
-L_1056c34:
-// 0x01056c34: 0x1056c34: addiu s0, s0, 1
+L_1056c44:
+// 0x01056c44: 0x1056c44: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01056c38: 0x1056c38: slt   t1, s0, s2
+// 0x01056c48: 0x1056c48: slt   t1, s0, s2
 	ldloc 8
 	ldloc 12
 	clt
 	stloc 14
-// 0x01056c3c: 0x1056c3c: bne   t1, zero, 0x1056c0c slt   t2, s0, v1
+// 0x01056c4c: 0x1056c4c: bne   t1, zero, 0x1056c1c slt   t2, s0, v1
 	ldloc 14
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 21
-	brtrue L_1056c0c
+	brtrue L_1056c1c
 // --- basic block ---
-L_1056c44:
-// 0x01056c44: 0x1056c44: lui   a3, 0x70000
+L_1056c54:
+// 0x01056c54: 0x1056c54: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01056c48: 0x1056c48: sw    v0, 10696(a3)
+// 0x01056c58: 0x1056c58: sw    v0, 11160(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldloc 5
 	stelem.i4
-// 0x01056c4c: 0x1056c4c: addiu a3, a2, 1
+// 0x01056c5c: 0x1056c5c: addiu a3, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01056c50: 0x1056c50: subu  a3, a3, v1
+// 0x01056c60: 0x1056c60: subu  a3, a3, v1
 	ldloc 4
 	ldloc 7
 	sub
 	stloc 4
-// 0x01056c54: 0x1056c54: addiu a2, zero, 56
+// 0x01056c64: 0x1056c64: addiu a2, zero, 56
 	ldc.i4.s 56
 	stloc.3
-// 0x01056c58: 0x1056c58: addu  a3, a3, s0
+// 0x01056c68: 0x1056c68: addu  a3, a3, s0
 	ldloc 4
 	ldloc 8
 	add
 	stloc 4
-// 0x01056c5c: 0x1056c5c: mult  a3, a2
+// 0x01056c6c: 0x1056c6c: mult  a3, a2
 	ldloc 4
 	ldloc.3
 	mul
 	stloc 11
-// 0x01056c60: 0x1056c60: addiu t0, s0, 1
+// 0x01056c70: 0x1056c70: addiu t0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01056c64: 0x1056c64: addu  v0, zero, zero
+// 0x01056c74: 0x1056c74: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01056c68: 0x1056c68: mflo  lo
+// 0x01056c78: 0x1056c78: mflo  lo
 	ldloc 11
 	stloc 4
-// 0x01056c6c: 0x1056c6c: addu  a1, a1, a3
+// 0x01056c7c: 0x1056c7c: addu  a1, a1, a3
 	ldloc.2
 	ldloc 4
 	add
 	stloc.2
-// 0x01056c70: 0x1056c70: sll   zero, zero, 0
-// 0x01056c74: 0x1056c74: mult  t0, a2
+// 0x01056c80: 0x1056c80: sll   zero, zero, 0
+// 0x01056c84: 0x1056c84: mult  t0, a2
 	ldloc 10
 	ldloc.3
 	mul
 	stloc 11
-// 0x01056c78: 0x1056c78: mflo  lo
+// 0x01056c88: 0x1056c88: mflo  lo
 	ldloc 11
 	stloc.3
-// 0x01056c7c: 0x1056c7c: j	 0x1056ca0 addu  a0, a0, a2
+// 0x01056c8c: 0x1056c8c: j	 0x1056cb0 addu  a0, a0, a2
 	ldloc.1
 	ldloc.3
 	add
 	stloc.1
-	br L_1056ca0
+	br L_1056cb0
 // --- basic block ---
-L_1056c84:
-// 0x01056c84: 0x1056c84: lh    a2, 48(s1)
+L_1056c94:
+// 0x01056c94: 0x1056c94: lh    a2, 48(s1)
 	ldloc 9
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x01056c88: 0x1056c88: addu  s1, a1, zero
+// 0x01056c98: 0x1056c98: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01056c8c: 0x1056c8c: beq   a3, zero, 0x1056c98 addu  v0, v0, a2
+// 0x01056c9c: 0x1056c9c: beq   a3, zero, 0x1056ca8 addu  v0, v0, a2
 	ldloc 4
 	ldloc 5
 	ldloc.3
 	add
 	stloc 5
-	brfalse L_1056c98
+	brfalse L_1056ca8
 // --- basic block ---
-// 0x01056c94: 0x1056c94: addu  s1, a0, zero
+// 0x01056ca4: 0x1056ca4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-L_1056c98:
-// 0x01056c98: 0x1056c98: addiu a0, a0, 56
+L_1056ca8:
+// 0x01056ca8: 0x1056ca8: addiu a0, a0, 56
 	ldloc.1
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x01056c9c: 0x1056c9c: addiu a1, a1, 56
+// 0x01056cac: 0x1056cac: addiu a1, a1, 56
 	ldloc.2
 	ldc.i4.s 56
 	add
 	stloc.2
-L_1056ca0:
-// 0x01056ca0: 0x1056ca0: slt   a2, s0, s2
+L_1056cb0:
+// 0x01056cb0: 0x1056cb0: slt   a2, s0, s2
 	ldloc 8
 	ldloc 12
 	clt
 	stloc.3
-// 0x01056ca4: 0x1056ca4: addiu s0, s0, 1
+// 0x01056cb4: 0x1056cb4: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01056ca8: 0x1056ca8: bne   a2, zero, 0x1056c84 slt   a3, s0, v1
+// 0x01056cb8: 0x1056cb8: bne   a2, zero, 0x1056c94 slt   a3, s0, v1
 	ldloc.3
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 4
-	brtrue L_1056c84
+	brtrue L_1056c94
 // --- basic block ---
-// 0x01056cb0: 0x1056cb0: lui   v1, 0x70000
+// 0x01056cc0: 0x1056cc0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056cb4: 0x1056cb4: beq   s3, zero, 0x1056cdc sw    v0, 10684(v1)
+// 0x01056cc4: 0x1056cc4: beq   s3, zero, 0x1056cec sw    v0, 11148(v1)
 	ldloc 13
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2671
+	ldc.i4 2787
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1056cdc
+	brfalse L_1056cec
 // --- basic block ---
-// 0x01056cbc: 0x1056cbc: lui   v1, 0x70000
+// 0x01056ccc: 0x1056ccc: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056cc0: 0x1056cc0: lw    a1, 10704(v1)
+// 0x01056cd0: 0x1056cd0: lw    a1, 11168(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056cc4: 0x1056cc4: lui   a0, 0x70000
+// 0x01056cd4: 0x1056cd4: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01056cc8: 0x1056cc8: lw    a0, 10696(a0)
+// 0x01056cd8: 0x1056cd8: lw    a0, 11160(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldelem.i4
 	stloc.1
-// 0x01056ccc: 0x1056ccc: addu  v0, v0, a1
+// 0x01056cdc: 0x1056cdc: addu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-// 0x01056cd0: 0x1056cd0: addu  v0, v0, a0
+// 0x01056ce0: 0x1056ce0: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01056cd4: 0x1056cd4: subu  s3, v0, s3
+// 0x01056ce4: 0x1056ce4: subu  s3, v0, s3
 	ldloc 5
 	ldloc 13
 	sub
 	stloc 13
-// 0x01056cd8: 0x1056cd8: sw    s3, 10704(v1)
+// 0x01056ce8: 0x1056ce8: sw    s3, 11168(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldloc 13
 	stelem.i4
-L_1056cdc:
-// 0x01056cdc: 0x1056cdc: lui   s0, 0x70000
+L_1056cec:
+// 0x01056cec: 0x1056cec: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01056ce0: 0x1056ce0: lw    v0, 10704(s0)
+// 0x01056cf0: 0x1056cf0: lw    v0, 11168(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056ce4: 0x1056ce4: sll   zero, zero, 0
-// 0x01056ce8: 0x1056ce8: addiu v1, v0, 180
+// 0x01056cf4: 0x1056cf4: sll   zero, zero, 0
+// 0x01056cf8: 0x1056cf8: addiu v1, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 7
-// 0x01056cec: 0x1056cec: sltiu v1, v1, 361
+// 0x01056cfc: 0x1056cfc: sltiu v1, v1, 361
 	ldloc 7
 	ldc.i4 361
 	clt.un
 	stloc 7
-// 0x01056cf0: 0x1056cf0: bne   v1, zero, 0x1056dc8 addu  v1, zero, zero
+// 0x01056d00: 0x1056d00: bne   v1, zero, 0x1056dd8 addu  v1, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_1056dc8
+	brtrue L_1056dd8
 // --- basic block ---
-// 0x01056cf8: 0x1056cf8: bne   s4, zero, 0x1056dc8 sll   zero, zero, 0
+// 0x01056d08: 0x1056d08: bne   s4, zero, 0x1056dd8 sll   zero, zero, 0
 	ldloc 15
-	brtrue L_1056dc8
+	brtrue L_1056dd8
 // --- basic block ---
-// 0x01056d00: 0x1056d00: lui   s3, 0x10000
+// 0x01056d10: 0x1056d10: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x01056d04: 0x1056d04: addiu s2, sp, 24
+// 0x01056d14: 0x1056d14: addiu s2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 12
-// 0x01056d08: 0x1056d08: blez  v0, 0x1056d30 lui   s1, 0x10000
+// 0x01056d18: 0x1056d18: blez  v0, 0x1056d40 lui   s1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 9
 	ldc.i4.s 0
-	ble L_1056d30
+	ble L_1056d40
 // --- basic block ---
-// 0x01056d10: 0x1056d10: lui   a0, 0x10000
+// 0x01056d20: 0x1056d20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056d14: 0x1056d14: jal   0x101cd60 addiu a0, a0, 8364
+// 0x01056d24: 0x1056d24: jal   0x101cd70 addiu a0, a0, 8360
 	ldloc.1
-	ldc.i4 8364
+	ldc.i4 8360
 	add
 	stloc.1
 	ldloc.0
@@ -4356,40 +4356,40 @@ L_1056cdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056d1c: 0x1056d1c: lw    s0, 10704(s0)
+// 0x01056d2c: 0x1056d2c: lw    s0, 11168(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldelem.i4
 	stloc 8
-// 0x01056d20: 0x1056d20: addu  a3, v0, zero
+// 0x01056d30: 0x1056d30: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01056d24: 0x1056d24: addiu v1, zero, 60
+// 0x01056d34: 0x1056d34: addiu v1, zero, 60
 	ldc.i4.s 60
 	stloc 7
-// 0x01056d28: 0x1056d28: j	 0x1056d50 addiu s0, s0, 30
+// 0x01056d38: 0x1056d38: j	 0x1056d60 addiu s0, s0, 30
 	ldloc 8
 	ldc.i4.s 30
 	add
 	stloc 8
-	br L_1056d50
+	br L_1056d60
 // --- basic block ---
-L_1056d30:
-// 0x01056d30: 0x1056d30: lui   a0, 0x10000
+L_1056d40:
+// 0x01056d40: 0x1056d40: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056d34: 0x1056d34: jal   0x101cd60 addiu a0, a0, 8436
+// 0x01056d44: 0x1056d44: jal   0x101cd70 addiu a0, a0, 8432
 	ldloc.1
-	ldc.i4 8436
+	ldc.i4 8432
 	add
 	stloc.1
 	ldloc.0
@@ -4397,49 +4397,49 @@ L_1056d30:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056d3c: 0x1056d3c: addu  a3, v0, zero
+// 0x01056d4c: 0x1056d4c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01056d40: 0x1056d40: lw    v0, 10704(s0)
+// 0x01056d50: 0x1056d50: lw    v0, 11168(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056d44: 0x1056d44: addiu s0, zero, 30
+// 0x01056d54: 0x1056d54: addiu s0, zero, 30
 	ldc.i4.s 30
 	stloc 8
-// 0x01056d48: 0x1056d48: subu  s0, s0, v0
+// 0x01056d58: 0x1056d58: subu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 8
-// 0x01056d4c: 0x1056d4c: addiu v1, zero, 60
+// 0x01056d5c: 0x1056d5c: addiu v1, zero, 60
 	ldc.i4.s 60
 	stloc 7
-L_1056d50:
-// 0x01056d50: 0x1056d50: div   s0, v1
+L_1056d60:
+// 0x01056d60: 0x1056d60: div   s0, v1
 	ldloc 8
 	ldloc 7
 	div
 	stloc 11
-// 0x01056d54: 0x1056d54: addiu a0, s3, 8416
+// 0x01056d64: 0x1056d64: addiu a0, s3, 8412
 	ldloc 13
-	ldc.i4 8416
+	ldc.i4 8412
 	add
 	stloc.1
-// 0x01056d58: 0x1056d58: mflo  lo
+// 0x01056d68: 0x1056d68: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x01056d5c: 0x1056d5c: jal   0x101cd60 sw    a3, 1028(sp)
+// 0x01056d6c: 0x1056d6c: jal   0x101cd70 sw    a3, 1028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4453,12 +4453,12 @@ L_1056d50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056d64: 0x1056d64: lw    a3, 1028(sp)
+// 0x01056d74: 0x1056d74: lw    a3, 1028(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4467,18 +4467,18 @@ L_1056d50:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01056d68: 0x1056d68: addu  a0, s2, zero
+// 0x01056d78: 0x1056d78: addu  a0, s2, zero
 	ldloc 12
 	stloc.1
-// 0x01056d6c: 0x1056d6c: addiu a2, s1, 8424
+// 0x01056d7c: 0x1056d7c: addiu a2, s1, 8420
 	ldloc 9
-	ldc.i4 8424
+	ldc.i4 8420
 	add
 	stloc.3
-// 0x01056d70: 0x1056d70: addiu a1, zero, 1000
+// 0x01056d80: 0x1056d80: addiu a1, zero, 1000
 	ldc.i4 1000
 	stloc.2
-// 0x01056d74: 0x1056d74: sw    s0, 16(sp)
+// 0x01056d84: 0x1056d84: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4487,7 +4487,7 @@ L_1056d50:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01056d78: 0x1056d78: jal   0x1000f9c sw    v0, 20(sp)
+// 0x01056d88: 0x1056d88: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4506,7 +4506,7 @@ L_1056d50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056d80: 0x1056d80: jal   0x10569ac lui   s0, 0x70000
+// 0x01056d90: 0x1056d90: jal   0x10569bc lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
 	ldloc.0
@@ -4514,25 +4514,25 @@ L_1056d50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_play_sound_10569ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_play_sound_10569bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056d88: 0x1056d88: lui   a0, 0x10000
+// 0x01056d98: 0x1056d98: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056d8c: 0x1056d8c: addiu a0, a0, 8488
+// 0x01056d9c: 0x1056d9c: addiu a0, a0, 8484
 	ldloc.1
-	ldc.i4 8488
+	ldc.i4 8484
 	add
 	stloc.1
-// 0x01056d90: 0x1056d90: addiu a1, sp, 24
+// 0x01056da0: 0x1056da0: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01056d94: 0x1056d94: jal   0x104bfe4 addiu a2, zero, 8
+// 0x01056da4: 0x1056da4: jal   0x104bff4 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -4540,43 +4540,43 @@ L_1056d50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056d9c: 0x1056d9c: lw    v0, 10704(s0)
+// 0x01056dac: 0x1056dac: lw    v0, 11168(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056da0: 0x1056da0: lui   a1, 0x10000
+// 0x01056db0: 0x1056db0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01056da4: 0x1056da4: lui   a3, 0x10000
+// 0x01056db4: 0x1056db4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01056da8: 0x1056da8: addiu a1, a1, 8052
+// 0x01056db8: 0x1056db8: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x01056dac: 0x1056dac: addiu a3, a3, 8508
+// 0x01056dbc: 0x1056dbc: addiu a3, a3, 8504
 	ldloc 4
-	ldc.i4 8508
+	ldc.i4 8504
 	add
 	stloc 4
-// 0x01056db0: 0x1056db0: addiu a0, zero, 1
+// 0x01056dc0: 0x1056dc0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01056db4: 0x1056db4: addiu a2, zero, 663
+// 0x01056dc4: 0x1056dc4: addiu a2, zero, 663
 	ldc.i4 663
 	stloc.3
-// 0x01056db8: 0x1056db8: jal   0x100449c sw    v0, 16(sp)
+// 0x01056dc8: 0x1056dc8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4595,42 +4595,42 @@ L_1056d50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01056dc0: 0x1056dc0: sw    zero, 10704(s0)
+// 0x01056dd0: 0x1056dd0: sw    zero, 11168(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01056dc4: 0x1056dc4: addu  v1, zero, zero
+// 0x01056dd4: 0x1056dd4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_1056dc8:
-// 0x01056dc8: 0x1056dc8: cibyl_sysc_arg 0x3
+L_1056dd8:
+// 0x01056dd8: 0x1056dd8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01056dcc: 0x1056dcc: cibyl_sysc 0x201d
+// 0x01056ddc: 0x1056ddc: cibyl_sysc 0x201d
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01056dd0: 0x1056dd0: addu  v1, v0, zero
+// 0x01056de0: 0x1056de0: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01056dd4: 0x1056dd4: lui   v0, 0x70000
+// 0x01056de4: 0x1056de4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056dd8: 0x1056dd8: sw    v1, 10708(v0)
+// 0x01056de8: 0x1056de8: sw    v1, 11172(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2677
+	ldc.i4 2793
 	add
 	ldloc 7
 	stelem.i4
-L_1056ddc:
-// 0x01056ddc: 0x1056ddc: lw    ra, 1068(sp)
-// 0x01056de0: 0x1056de0: lw    s8, 1064(sp)
+L_1056dec:
+// 0x01056dec: 0x1056dec: lw    ra, 1068(sp)
+// 0x01056df0: 0x1056df0: lw    s8, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4639,7 +4639,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01056de4: 0x1056de4: lw    s7, 1060(sp)
+// 0x01056df4: 0x1056df4: lw    s7, 1060(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4648,7 +4648,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01056de8: 0x1056de8: lw    s6, 1056(sp)
+// 0x01056df8: 0x1056df8: lw    s6, 1056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4657,7 +4657,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01056dec: 0x1056dec: lw    s5, 1052(sp)
+// 0x01056dfc: 0x1056dfc: lw    s5, 1052(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4666,7 +4666,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01056df0: 0x1056df0: lw    s4, 1048(sp)
+// 0x01056e00: 0x1056e00: lw    s4, 1048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4675,7 +4675,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01056df4: 0x1056df4: lw    s3, 1044(sp)
+// 0x01056e04: 0x1056e04: lw    s3, 1044(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4684,7 +4684,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01056df8: 0x1056df8: lw    s2, 1040(sp)
+// 0x01056e08: 0x1056e08: lw    s2, 1040(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4693,7 +4693,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01056dfc: 0x1056dfc: lw    s1, 1036(sp)
+// 0x01056e0c: 0x1056e0c: lw    s1, 1036(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4702,7 +4702,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01056e00: 0x1056e00: lw    s0, 1032(sp)
+// 0x01056e10: 0x1056e10: lw    s0, 1032(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4711,7 +4711,7 @@ L_1056ddc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01056e04: 0x1056e04: jr    ra addiu sp, sp, 1072
+// 0x01056e14: 0x1056e14: jr    ra addiu sp, sp, 1072
 	ldloc.0
 	ldc.i4 1072
 	add
@@ -4723,7 +4723,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_on_routing_rc_1056e0c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_on_routing_rc_1056e1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
@@ -4761,14 +4761,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1056e0c:
-// 0x01056e0c: 0x1056e0c: addiu sp, sp, -24
+L_1056e1c:
+// 0x01056e1c: 0x1056e1c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01056e10: 0x1056e10: sw    ra, 20(sp)
-// 0x01056e14: 0x1056e14: bne   a0, zero, 0x1056e34 sw    s0, 16(sp)
+// 0x01056e20: 0x1056e20: sw    ra, 20(sp)
+// 0x01056e24: 0x1056e24: bne   a0, zero, 0x1056e44 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -4778,14 +4778,14 @@ L_1056e0c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1056e34
+	brtrue L_1056e44
 // --- basic block ---
-// 0x01056e1c: 0x1056e1c: lui   s0, 0x1050000
+// 0x01056e2c: 0x1056e2c: lui   s0, 0x1050000
 	ldc.i4 17104896
 	stloc 5
-// 0x01056e20: 0x1056e20: jal   0x104fd00 addiu a0, s0, 28868
+// 0x01056e30: 0x1056e30: jal   0x104fd10 addiu a0, s0, 28884
 	ldloc 5
-	ldc.i4 28868
+	ldc.i4 28884
 	add
 	stloc.1
 	ldloc.0
@@ -4793,17 +4793,17 @@ L_1056e0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01056e28: 0x1056e28: addiu a1, s0, 28868
+// 0x01056e38: 0x1056e38: addiu a1, s0, 28884
 	ldloc 5
-	ldc.i4 28868
+	ldc.i4 28884
 	add
 	stloc.2
-// 0x01056e2c: 0x1056e2c: jal   0x104fe98 ori   a0, zero, 40000
+// 0x01056e3c: 0x1056e3c: jal   0x104fea8 ori   a0, zero, 40000
 	ldc.i4.s 0
 	ldc.i4 40000
 	or
@@ -4813,14 +4813,14 @@ L_1056e0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-L_1056e34:
-// 0x01056e34: 0x1056e34: lw    ra, 20(sp)
-// 0x01056e38: 0x1056e38: lw    s0, 16(sp)
+L_1056e44:
+// 0x01056e44: 0x1056e44: lw    ra, 20(sp)
+// 0x01056e48: 0x1056e48: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4829,7 +4829,7 @@ L_1056e34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056e3c: 0x1056e3c: jr    ra addiu sp, sp, 24
+// 0x01056e4c: 0x1056e4c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4841,7 +4841,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 navigate_main_set_route_1056e44(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_set_route_1056e54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4876,28 +4876,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056e44: 0x1056e44: lui   v0, 0x70000
+// 0x01056e54: 0x1056e54: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01056e48: 0x1056e48: sw    a0, 9192(v0)
+// 0x01056e58: 0x1056e58: sw    a0, 9656(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2298
+	ldc.i4 2414
 	add
 	ldloc.1
 	stelem.i4
-// 0x01056e4c: 0x1056e4c: lui   a0, 0x10000
+// 0x01056e5c: 0x1056e5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056e50: 0x1056e50: addiu sp, sp, -24
+// 0x01056e60: 0x1056e60: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01056e54: 0x1056e54: sw    ra, 20(sp)
-// 0x01056e58: 0x1056e58: jal   0x101df50 addiu a0, a0, -29748
+// 0x01056e64: 0x1056e64: sw    ra, 20(sp)
+// 0x01056e68: 0x1056e68: jal   0x101df60 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -4907,35 +4907,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056e60: 0x1056e60: beq   v0, zero, 0x1056ea4 lui   a0, 0x70000
+// 0x01056e70: 0x1056e70: beq   v0, zero, 0x1056eb4 lui   a0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc.1
-	brfalse L_1056ea4
+	brfalse L_1056eb4
 // --- basic block ---
-// 0x01056e68: 0x1056e68: lw    v1, 0(v0)
+// 0x01056e78: 0x1056e78: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01056e6c: 0x1056e6c: sll   zero, zero, 0
-// 0x01056e70: 0x1056e70: sw    v1, 10732(a0)
+// 0x01056e7c: 0x1056e7c: sll   zero, zero, 0
+// 0x01056e80: 0x1056e80: sw    v1, 11196(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2683
+	ldc.i4 2799
 	add
 	ldloc 6
 	stelem.i4
-// 0x01056e74: 0x1056e74: lw    v1, 4(v0)
+// 0x01056e84: 0x1056e84: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4944,20 +4944,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056e78: 0x1056e78: addiu v0, a0, 10732
+// 0x01056e88: 0x1056e88: addiu v0, a0, 11196
 	ldloc.1
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc 5
-// 0x01056e7c: 0x1056e7c: lui   a0, 0x10000
+// 0x01056e8c: 0x1056e8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01056e80: 0x1056e80: addiu a0, a0, -29760
+// 0x01056e90: 0x1056e90: addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
 	stloc.1
-// 0x01056e84: 0x1056e84: jal   0x101df50 sw    v1, 4(v0)
+// 0x01056e94: 0x1056e94: jal   0x101df60 sw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4971,31 +4971,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01056e8c: 0x1056e8c: lw    a0, 0(v0)
+// 0x01056e9c: 0x1056e9c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01056e90: 0x1056e90: lui   v1, 0x70000
+// 0x01056ea0: 0x1056ea0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01056e94: 0x1056e94: sw    a0, 10740(v1)
+// 0x01056ea4: 0x1056ea4: sw    a0, 11204(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2685
+	ldc.i4 2801
 	add
 	ldloc.1
 	stelem.i4
-// 0x01056e98: 0x1056e98: lw    v0, 4(v0)
+// 0x01056ea8: 0x1056ea8: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5004,12 +5004,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01056e9c: 0x1056e9c: addiu v1, v1, 10740
+// 0x01056eac: 0x1056eac: addiu v1, v1, 11204
 	ldloc 6
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc 6
-// 0x01056ea0: 0x1056ea0: sw    v0, 4(v1)
+// 0x01056eb0: 0x1056eb0: sw    v0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5018,10 +5018,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_1056ea4:
-// 0x01056ea4: 0x1056ea4: lw    ra, 20(sp)
-// 0x01056ea8: 0x1056ea8: sll   zero, zero, 0
-// 0x01056eac: 0x1056eac: jr    ra addiu sp, sp, 24
+L_1056eb4:
+// 0x01056eb4: 0x1056eb4: lw    ra, 20(sp)
+// 0x01056eb8: 0x1056eb8: sll   zero, zero, 0
+// 0x01056ebc: 0x1056ebc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5033,7 +5033,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_is_line_on_route_1056eb4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_is_line_on_route_1056ec4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s3,int32 s4,int32 s0,int32 s2,int32 s1,int32 s5,int32 s6,int32 s7,int32 s8,int32 lo,int32 ra)
@@ -5098,24 +5098,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01056eb4: 0x1056eb4: lui   v0, 0x70000
+// 0x01056ec4: 0x1056ec4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01056eb8: 0x1056eb8: lw    v0, 9160(v0)
+// 0x01056ec8: 0x1056ec8: lw    v0, 9624(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056ebc: 0x1056ebc: addiu sp, sp, -72
+// 0x01056ecc: 0x1056ecc: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01056ec0: 0x1056ec0: sw    s5, 52(sp)
+// 0x01056ed0: 0x1056ed0: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5124,7 +5124,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01056ec4: 0x1056ec4: sw    s2, 40(sp)
+// 0x01056ed4: 0x1056ed4: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5133,7 +5133,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01056ec8: 0x1056ec8: sw    s1, 36(sp)
+// 0x01056ed8: 0x1056ed8: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5142,7 +5142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01056ecc: 0x1056ecc: sw    s0, 32(sp)
+// 0x01056edc: 0x1056edc: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5151,8 +5151,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01056ed0: 0x1056ed0: sw    ra, 68(sp)
-// 0x01056ed4: 0x1056ed4: sw    s8, 64(sp)
+// 0x01056ee0: 0x1056ee0: sw    ra, 68(sp)
+// 0x01056ee4: 0x1056ee4: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5161,7 +5161,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01056ed8: 0x1056ed8: sw    s7, 60(sp)
+// 0x01056ee8: 0x1056ee8: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5170,7 +5170,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01056edc: 0x1056edc: sw    s6, 56(sp)
+// 0x01056eec: 0x1056eec: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5179,7 +5179,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01056ee0: 0x1056ee0: sw    s4, 48(sp)
+// 0x01056ef0: 0x1056ef0: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5188,7 +5188,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01056ee4: 0x1056ee4: sw    s3, 44(sp)
+// 0x01056ef4: 0x1056ef4: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5197,93 +5197,93 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01056ee8: 0x1056ee8: addu  s0, a0, zero
+// 0x01056ef8: 0x1056ef8: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01056eec: 0x1056eec: addu  s1, a1, zero
+// 0x01056efc: 0x1056efc: addu  s1, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01056ef0: 0x1056ef0: addu  s2, a2, zero
+// 0x01056f00: 0x1056f00: addu  s2, a2, zero
 	ldloc.3
 	stloc 11
-// 0x01056ef4: 0x1056ef4: beq   v0, zero, 0x105704c addu  s5, a3, zero
+// 0x01056f04: 0x1056f04: beq   v0, zero, 0x105705c addu  s5, a3, zero
 	ldloc 6
 	ldloc 4
 	stloc 13
-	brfalse L_105704c
+	brfalse L_105705c
 // --- basic block ---
-// 0x01056efc: 0x1056efc: lui   v0, 0x70000
+// 0x01056f0c: 0x1056f0c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01056f00: 0x1056f00: lw    a1, 9168(v0)
+// 0x01056f10: 0x1056f10: lw    a1, 9632(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc.2
-// 0x01056f04: 0x1056f04: lui   v0, 0x70000
+// 0x01056f14: 0x1056f14: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01056f08: 0x1056f08: lw    s3, 9164(v0)
+// 0x01056f18: 0x1056f18: lw    s3, 9628(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 8
-// 0x01056f0c: 0x1056f0c: addiu s4, zero, 56
+// 0x01056f1c: 0x1056f1c: addiu s4, zero, 56
 	ldc.i4.s 56
 	stloc 9
-// 0x01056f10: 0x1056f10: addiu s3, s3, 1
+// 0x01056f20: 0x1056f20: addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01056f14: 0x1056f14: mult  s3, s4
+// 0x01056f24: 0x1056f24: mult  s3, s4
 	ldloc 8
 	ldloc 9
 	mul
 	stloc 17
-// 0x01056f18: 0x1056f18: lui   v1, 0x70000
+// 0x01056f28: 0x1056f28: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01056f1c: 0x1056f1c: lui   v0, 0x70000
+// 0x01056f2c: 0x1056f2c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01056f20: 0x1056f20: lw    a2, 9172(v1)
+// 0x01056f30: 0x1056f30: lw    a2, 9636(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.3
-// 0x01056f24: 0x1056f24: lw    a0, 9176(v0)
+// 0x01056f34: 0x1056f34: lw    a0, 9640(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.1
-// 0x01056f28: 0x1056f28: addu  a1, a2, a1
+// 0x01056f38: 0x1056f38: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x01056f2c: 0x1056f2c: subu  a0, a1, a0
+// 0x01056f3c: 0x1056f3c: subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-// 0x01056f30: 0x1056f30: sw    a0, 24(sp)
+// 0x01056f40: 0x1056f40: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5292,108 +5292,108 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01056f34: 0x1056f34: lui   s8, 0x70000
+// 0x01056f44: 0x1056f44: lui   s8, 0x70000
 	ldc.i4 458752
 	stloc 16
-// 0x01056f38: 0x1056f38: addiu s7, zero, -1
+// 0x01056f48: 0x1056f48: addiu s7, zero, -1
 	ldc.i4.m1
 	stloc 15
-// 0x01056f3c: 0x1056f3c: mflo  lo
+// 0x01056f4c: 0x1056f4c: mflo  lo
 	ldloc 17
 	stloc 9
-// 0x01056f40: 0x1056f40: j	 0x1057038 lui   s6, 0x0
+// 0x01056f50: 0x1056f50: j	 0x1057048 lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 14
-	br L_1057038
+	br L_1057048
 // --- basic block ---
-L_1056f48:
-// 0x01056f48: 0x1056f48: lw    v1, 9172(v0)
+L_1056f58:
+// 0x01056f58: 0x1056f58: lw    v1, 9636(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056f4c: 0x1056f4c: sll   zero, zero, 0
-// 0x01056f50: 0x1056f50: slt   v0, s3, v1
+// 0x01056f5c: 0x1056f5c: sll   zero, zero, 0
+// 0x01056f60: 0x1056f60: slt   v0, s3, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 6
-// 0x01056f54: 0x1056f54: beq   v0, zero, 0x1056f68 lui   a1, 0x70000
+// 0x01056f64: 0x1056f64: beq   v0, zero, 0x1056f78 lui   a1, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc.2
-	brfalse L_1056f68
+	brfalse L_1056f78
 // --- basic block ---
-// 0x01056f5c: 0x1056f5c: lw    v1, 10724(s8)
+// 0x01056f6c: 0x1056f6c: lw    v1, 11188(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056f60: 0x1056f60: j	 0x1056f8c addu  v1, v1, s4
+// 0x01056f70: 0x1056f70: j	 0x1056f9c addu  v1, v1, s4
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-	br L_1056f8c
+	br L_1056f9c
 // --- basic block ---
-L_1056f68:
-// 0x01056f68: 0x1056f68: lw    a0, 9176(a1)
+L_1056f78:
+// 0x01056f78: 0x1056f78: lw    a0, 9640(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.1
-// 0x01056f6c: 0x1056f6c: lui   a1, 0x70000
+// 0x01056f7c: 0x1056f7c: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01056f70: 0x1056f70: subu  v1, a0, v1
+// 0x01056f80: 0x1056f80: subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-// 0x01056f74: 0x1056f74: addu  v1, v1, s3
+// 0x01056f84: 0x1056f84: addu  v1, v1, s3
 	ldloc 7
 	ldloc 8
 	add
 	stloc 7
-// 0x01056f78: 0x1056f78: addiu a0, zero, 56
+// 0x01056f88: 0x1056f88: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.1
-// 0x01056f7c: 0x1056f7c: mult  v1, a0
+// 0x01056f8c: 0x1056f8c: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 17
-// 0x01056f80: 0x1056f80: lw    v0, 10720(a1)
+// 0x01056f90: 0x1056f90: lw    v0, 11184(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056f84: 0x1056f84: mflo  lo
+// 0x01056f94: 0x1056f94: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x01056f88: 0x1056f88: addu  v1, v0, v1
+// 0x01056f98: 0x1056f98: addu  v1, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-L_1056f8c:
-// 0x01056f8c: 0x1056f8c: lw    v0, 24(v1)
+L_1056f9c:
+// 0x01056f9c: 0x1056f9c: lw    v0, 24(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5402,38 +5402,38 @@ L_1056f8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056f90: 0x1056f90: sll   zero, zero, 0
-// 0x01056f94: 0x1056f94: bne   v0, s0, 0x1057030 sll   zero, zero, 0
+// 0x01056fa0: 0x1056fa0: sll   zero, zero, 0
+// 0x01056fa4: 0x1056fa4: bne   v0, s0, 0x1057040 sll   zero, zero, 0
 	ldloc 6
 	ldloc 10
-	bne.un L_1057030
+	bne.un L_1057040
 // --- basic block ---
-// 0x01056f9c: 0x1056f9c: lh    v0, 36(v1)
+// 0x01056fac: 0x1056fac: lh    v0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x01056fa0: 0x1056fa0: sll   zero, zero, 0
-// 0x01056fa4: 0x1056fa4: bne   v0, s1, 0x1057030 sll   zero, zero, 0
+// 0x01056fb0: 0x1056fb0: sll   zero, zero, 0
+// 0x01056fb4: 0x1056fb4: bne   v0, s1, 0x1057040 sll   zero, zero, 0
 	ldloc 6
 	ldloc 12
-	bne.un L_1057030
+	bne.un L_1057040
 // --- basic block ---
-// 0x01056fac: 0x1056fac: bne   s2, s7, 0x1056fbc sll   zero, zero, 0
+// 0x01056fbc: 0x1056fbc: bne   s2, s7, 0x1056fcc sll   zero, zero, 0
 	ldloc 11
 	ldloc 15
-	bne.un L_1056fbc
+	bne.un L_1056fcc
 // --- basic block ---
-// 0x01056fb4: 0x1056fb4: beq   s5, s2, 0x1057050 addiu v0, zero, 1
+// 0x01056fc4: 0x1056fc4: beq   s5, s2, 0x1057060 addiu v0, zero, 1
 	ldloc 13
 	ldloc 11
 	ldc.i4.1
 	stloc 6
-	beq  L_1057050
+	beq  L_1057060
 // --- basic block ---
-L_1056fbc:
-// 0x01056fbc: 0x1056fbc: lw    v0, 576(s6)
+L_1056fcc:
+// 0x01056fcc: 0x1056fcc: lw    v0, 576(s6)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -5442,20 +5442,20 @@ L_1056fbc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01056fc0: 0x1056fc0: sll   zero, zero, 0
-// 0x01056fc4: 0x1056fc4: beq   s0, v0, 0x1056fe4 sll   zero, zero, 0
+// 0x01056fd0: 0x1056fd0: sll   zero, zero, 0
+// 0x01056fd4: 0x1056fd4: beq   s0, v0, 0x1056ff4 sll   zero, zero, 0
 	ldloc 10
 	ldloc 6
-	beq  L_1056fe4
+	beq  L_1056ff4
 // --- basic block ---
-// 0x01056fcc: 0x1056fcc: bltz  s0, 0x1056fe4 addu  a0, s0, zero
+// 0x01056fdc: 0x1056fdc: bltz  s0, 0x1056ff4 addu  a0, s0, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
 	ldc.i4.s 0
-	blt L_1056fe4
+	blt L_1056ff4
 // --- basic block ---
-// 0x01056fd4: 0x1056fd4: jal   0x100b164 sw    v1, 28(sp)
+// 0x01056fe4: 0x1056fe4: jal   0x100b174 sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5469,12 +5469,12 @@ L_1056fbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01056fdc: 0x1056fdc: lw    v1, 28(sp)
+// 0x01056fec: 0x1056fec: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5483,49 +5483,49 @@ L_1056fbc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01056fe0: 0x1056fe0: sll   zero, zero, 0
-L_1056fe4:
-// 0x01056fe4: 0x1056fe4: lb    v0, 50(v1)
+// 0x01056ff0: 0x1056ff0: sll   zero, zero, 0
+L_1056ff4:
+// 0x01056ff4: 0x1056ff4: lb    v0, 50(v1)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01056fe8: 0x1056fe8: addiu a1, zero, 1
+// 0x01056ff8: 0x1056ff8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01056fec: 0x1056fec: bne   v0, a1, 0x1057000 addu  a0, s1, zero
+// 0x01056ffc: 0x1056ffc: bne   v0, a1, 0x1057010 addu  a0, s1, zero
 	ldloc 6
 	ldloc.2
 	ldloc 12
 	stloc.1
-	bne.un L_1057000
+	bne.un L_1057010
 // --- basic block ---
-// 0x01056ff4: 0x1056ff4: addiu a1, sp, 16
+// 0x01057004: 0x1057004: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01056ff8: 0x1056ff8: j	 0x1057008 addiu a2, sp, 20
+// 0x01057008: 0x1057008: j	 0x1057018 addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.3
-	br L_1057008
+	br L_1057018
 // --- basic block ---
-L_1057000:
-// 0x01057000: 0x1057000: addiu a1, sp, 20
+L_1057010:
+// 0x01057010: 0x1057010: addiu a1, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x01057004: 0x1057004: addiu a2, sp, 16
+// 0x01057014: 0x1057014: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-L_1057008:
-// 0x01057008: 0x1057008: jal   0x1003adc sll   zero, zero, 0
+L_1057018:
+// 0x01057018: 0x1057018: jal   0x1003adc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -5534,7 +5534,7 @@ L_1057008:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057010: 0x1057010: lw    v0, 16(sp)
+// 0x01057020: 0x1057020: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5543,13 +5543,13 @@ L_1057008:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057014: 0x1057014: sll   zero, zero, 0
-// 0x01057018: 0x1057018: bne   v0, s2, 0x1057030 sll   zero, zero, 0
+// 0x01057024: 0x1057024: sll   zero, zero, 0
+// 0x01057028: 0x1057028: bne   v0, s2, 0x1057040 sll   zero, zero, 0
 	ldloc 6
 	ldloc 11
-	bne.un L_1057030
+	bne.un L_1057040
 // --- basic block ---
-// 0x01057020: 0x1057020: lw    v0, 20(sp)
+// 0x01057030: 0x1057030: lw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5558,27 +5558,27 @@ L_1057008:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057024: 0x1057024: sll   zero, zero, 0
-// 0x01057028: 0x1057028: beq   v0, s5, 0x1057050 addiu v0, zero, 1
+// 0x01057034: 0x1057034: sll   zero, zero, 0
+// 0x01057038: 0x1057038: beq   v0, s5, 0x1057060 addiu v0, zero, 1
 	ldloc 6
 	ldloc 13
 	ldc.i4.1
 	stloc 6
-	beq  L_1057050
+	beq  L_1057060
 // --- basic block ---
-L_1057030:
-// 0x01057030: 0x1057030: addiu s3, s3, 1
+L_1057040:
+// 0x01057040: 0x1057040: addiu s3, s3, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01057034: 0x1057034: addiu s4, s4, 56
+// 0x01057044: 0x1057044: addiu s4, s4, 56
 	ldloc 9
 	ldc.i4.s 56
 	add
 	stloc 9
-L_1057038:
-// 0x01057038: 0x1057038: lw    v1, 24(sp)
+L_1057048:
+// 0x01057048: 0x1057048: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5587,25 +5587,25 @@ L_1057038:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105703c: 0x105703c: sll   zero, zero, 0
-// 0x01057040: 0x1057040: slt   v0, s3, v1
+// 0x0105704c: 0x105704c: sll   zero, zero, 0
+// 0x01057050: 0x1057050: slt   v0, s3, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 6
-// 0x01057044: 0x1057044: bne   v0, zero, 0x1056f48 lui   v0, 0x70000
+// 0x01057054: 0x1057054: bne   v0, zero, 0x1056f58 lui   v0, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 6
-	brtrue L_1056f48
+	brtrue L_1056f58
 // --- basic block ---
-L_105704c:
-// 0x0105704c: 0x105704c: addu  v0, zero, zero
+L_105705c:
+// 0x0105705c: 0x105705c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1057050:
-// 0x01057050: 0x1057050: lw    ra, 68(sp)
-// 0x01057054: 0x1057054: lw    s8, 64(sp)
+L_1057060:
+// 0x01057060: 0x1057060: lw    ra, 68(sp)
+// 0x01057064: 0x1057064: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5614,7 +5614,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01057058: 0x1057058: lw    s7, 60(sp)
+// 0x01057068: 0x1057068: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5623,7 +5623,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105705c: 0x105705c: lw    s6, 56(sp)
+// 0x0105706c: 0x105706c: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5632,7 +5632,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01057060: 0x1057060: lw    s5, 52(sp)
+// 0x01057070: 0x1057070: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5641,7 +5641,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01057064: 0x1057064: lw    s4, 48(sp)
+// 0x01057074: 0x1057074: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5650,7 +5650,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01057068: 0x1057068: lw    s3, 44(sp)
+// 0x01057078: 0x1057078: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5659,7 +5659,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105706c: 0x105706c: lw    s2, 40(sp)
+// 0x0105707c: 0x105707c: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5668,7 +5668,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01057070: 0x1057070: lw    s1, 36(sp)
+// 0x01057080: 0x1057080: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5677,7 +5677,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01057074: 0x1057074: lw    s0, 32(sp)
+// 0x01057084: 0x1057084: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5686,7 +5686,7 @@ L_1057050:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057078: 0x1057078: jr    ra addiu sp, sp, 72
+// 0x01057088: 0x1057088: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -5698,7 +5698,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_main_suspend_navigation_1057080(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_suspend_navigation_1057090(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -5733,37 +5733,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01057080: 0x1057080: lui   v0, 0x70000
+// 0x01057090: 0x1057090: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01057084: 0x1057084: lw    v1, 9160(v0)
+// 0x01057094: 0x1057094: lw    v1, 9624(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x01057088: 0x1057088: addiu sp, sp, -24
+// 0x01057098: 0x1057098: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105708c: 0x105708c: beq   v1, zero, 0x10570b4 sw    ra, 20(sp)
+// 0x0105709c: 0x105709c: beq   v1, zero, 0x10570c4 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_10570b4
+	brfalse L_10570c4
 // --- basic block ---
-// 0x01057094: 0x1057094: addiu a1, zero, -1
+// 0x010570a4: 0x10570a4: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x01057098: 0x1057098: lui   v1, 0x0
+// 0x010570a8: 0x10570a8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105709c: 0x105709c: addu  a0, zero, zero
+// 0x010570ac: 0x10570ac: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010570a0: 0x10570a0: sw    a1, 14320(v1)
+// 0x010570b0: 0x10570b0: sw    a1, 14320(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5772,29 +5772,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010570a4: 0x10570a4: jal   0x105e2e4 sw    zero, 9160(v0)
+// 0x010570b4: 0x10570b4: jal   0x105e2f4 sw    zero, 9624(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_mode_105e2e4(int32)
+	call int32 Cibyl70::navigate_bar_set_mode_105e2f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010570ac: 0x10570ac: jal   0x1029d78 sll   zero, zero, 0
-	call int32 Cibyl31::roadmap_navigate_end_route_1029d78()
+// 0x010570bc: 0x10570bc: jal   0x1029d88 sll   zero, zero, 0
+	call int32 Cibyl31::roadmap_navigate_end_route_1029d88()
 	stloc 6
 // --- basic block ---
-L_10570b4:
-// 0x010570b4: 0x10570b4: lw    ra, 20(sp)
-// 0x010570b8: 0x10570b8: sll   zero, zero, 0
-// 0x010570bc: 0x10570bc: jr    ra addiu sp, sp, 24
+L_10570c4:
+// 0x010570c4: 0x10570c4: lw    ra, 20(sp)
+// 0x010570c8: 0x10570c8: sll   zero, zero, 0
+// 0x010570cc: 0x10570cc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5806,7 +5806,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_progress_message_hide_delayed_10570c4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_progress_message_hide_delayed_10570d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -5847,15 +5847,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010570c4: 0x10570c4: addiu sp, sp, -176
+// 0x010570d4: 0x10570d4: addiu sp, sp, -176
 	ldloc.0
 	ldc.i4 -176
 	add
 	stloc.0
-// 0x010570c8: 0x10570c8: lui   a0, 0x1050000
+// 0x010570d8: 0x10570d8: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x010570cc: 0x10570cc: sw    s0, 164(sp)
+// 0x010570dc: 0x10570dc: sw    s0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5864,16 +5864,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010570d0: 0x10570d0: addiu a0, a0, 28868
+// 0x010570e0: 0x10570e0: addiu a0, a0, 28884
 	ldloc.1
-	ldc.i4 28868
+	ldc.i4 28884
 	add
 	stloc.1
-// 0x010570d4: 0x10570d4: lui   s0, 0x70000
+// 0x010570e4: 0x10570e4: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010570d8: 0x10570d8: sw    ra, 172(sp)
-// 0x010570dc: 0x10570dc: jal   0x104fd00 sw    s1, 168(sp)
+// 0x010570e8: 0x10570e8: sw    ra, 172(sp)
+// 0x010570ec: 0x10570ec: jal   0x104fd10 sw    s1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5887,36 +5887,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010570e4: 0x10570e4: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x010570f4: 0x10570f4: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010570ec: 0x10570ec: lw    v0, 10012(s0)
+// 0x010570fc: 0x10570fc: lw    v0, 10476(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldelem.i4
 	stloc 5
-// 0x010570f0: 0x10570f0: sll   zero, zero, 0
-// 0x010570f4: 0x10570f4: beq   v0, zero, 0x1057168 lui   a0, 0x10000
+// 0x01057100: 0x1057100: sll   zero, zero, 0
+// 0x01057104: 0x1057104: beq   v0, zero, 0x1057178 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1057168
+	brfalse L_1057178
 // --- basic block ---
-// 0x010570fc: 0x10570fc: jal   0x101cd60 addiu a0, a0, 8544
+// 0x0105710c: 0x105710c: jal   0x101cd70 addiu a0, a0, 8540
 	ldloc.1
-	ldc.i4 8544
+	ldc.i4 8540
 	add
 	stloc.1
 	ldloc.0
@@ -5924,25 +5924,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01057104: 0x1057104: lui   a0, 0x10000
+// 0x01057114: 0x1057114: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01057108: 0x1057108: addiu a0, a0, -2068
+// 0x01057118: 0x1057118: addiu a0, a0, -2072
 	ldloc.1
-	ldc.i4 -2068
+	ldc.i4 -2072
 	add
 	stloc.1
-// 0x0105710c: 0x105710c: addiu s1, sp, 24
+// 0x0105711c: 0x105711c: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 9
-// 0x01057110: 0x1057110: jal   0x101cd60 sw    v0, 152(sp)
+// 0x01057120: 0x1057120: jal   0x101cd70 sw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5956,12 +5956,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01057118: 0x1057118: lw    a3, 152(sp)
+// 0x01057128: 0x1057128: lw    a3, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5970,21 +5970,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105711c: 0x105711c: lui   a2, 0x10000
+// 0x0105712c: 0x105712c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01057120: 0x1057120: addiu a2, a2, 8572
+// 0x01057130: 0x1057130: addiu a2, a2, 8568
 	ldloc.3
-	ldc.i4 8572
+	ldc.i4 8568
 	add
 	stloc.3
-// 0x01057124: 0x1057124: addu  a0, s1, zero
+// 0x01057134: 0x1057134: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01057128: 0x1057128: addiu a1, zero, 128
+// 0x01057138: 0x1057138: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0105712c: 0x105712c: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0105713c: 0x105713c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6003,18 +6003,18 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01057134: 0x1057134: lui   a0, 0x0
+// 0x01057144: 0x1057144: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01057138: 0x1057138: addiu a0, a0, 30092
+// 0x01057148: 0x1057148: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x0105713c: 0x105713c: addu  a1, s1, zero
+// 0x0105714c: 0x105714c: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01057140: 0x1057140: jal   0x104bfe4 addiu a2, zero, 5
+// 0x01057150: 0x1057150: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -6022,54 +6022,54 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01057148: 0x1057148: lui   v0, 0x20000
+// 0x01057158: 0x1057158: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0105714c: 0x105714c: lw    a0, 27960(v0)
+// 0x0105715c: 0x105715c: lw    a0, 28424(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6990
+	ldc.i4 7106
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057150: 0x1057150: addu  a1, zero, zero
+// 0x01057160: 0x1057160: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01057154: 0x1057154: jal   0x104bfdc addu  a2, zero, zero
+// 0x01057164: 0x1057164: jal   0x104bfec addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x0105715c: 0x105715c: jal   0x1064038 sll   zero, zero, 0
+// 0x0105716c: 0x105716c: jal   0x1064048 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_cancel_request_1064038(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_cancel_request_1064048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01057164: 0x1057164: sw    zero, 10012(s0)
+// 0x01057174: 0x1057174: sw    zero, 10476(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1057168:
-// 0x01057168: 0x1057168: lw    ra, 172(sp)
-// 0x0105716c: 0x105716c: lw    s1, 168(sp)
+L_1057178:
+// 0x01057178: 0x1057178: lw    ra, 172(sp)
+// 0x0105717c: 0x105717c: lw    s1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6078,7 +6078,7 @@ L_1057168:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01057170: 0x1057170: lw    s0, 164(sp)
+// 0x01057180: 0x1057180: lw    s0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6087,7 +6087,7 @@ L_1057168:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01057174: 0x1057174: jr    ra addiu sp, sp, 176
+// 0x01057184: 0x1057184: jr    ra addiu sp, sp, 176
 	ldloc.0
 	ldc.i4 176
 	add
@@ -6099,7 +6099,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_progress_message_delayed_105717c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_progress_message_delayed_105718c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -6137,21 +6137,21 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105717c: 0x105717c: lui   a0, 0x1050000
+// 0x0105718c: 0x105718c: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01057180: 0x1057180: addiu sp, sp, -24
+// 0x01057190: 0x1057190: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01057184: 0x1057184: addiu a0, a0, 29052
+// 0x01057194: 0x1057194: addiu a0, a0, 29068
 	ldloc.1
-	ldc.i4 29052
+	ldc.i4 29068
 	add
 	stloc.1
-// 0x01057188: 0x1057188: sw    ra, 20(sp)
-// 0x0105718c: 0x105718c: jal   0x104fd00 sw    s0, 16(sp)
+// 0x01057198: 0x1057198: sw    ra, 20(sp)
+// 0x0105719c: 0x105719c: jal   0x104fd10 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6165,36 +6165,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01057194: 0x1057194: lui   v0, 0x70000
+// 0x010571a4: 0x10571a4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01057198: 0x1057198: lw    v0, 10012(v0)
+// 0x010571a8: 0x10571a8: lw    v0, 10476(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105719c: 0x105719c: sll   zero, zero, 0
-// 0x010571a0: 0x10571a0: beq   v0, zero, 0x10571bc lui   v0, 0x70000
+// 0x010571ac: 0x10571ac: sll   zero, zero, 0
+// 0x010571b0: 0x10571b0: beq   v0, zero, 0x10571cc lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10571bc
+	brfalse L_10571cc
 // --- basic block ---
-// 0x010571a8: 0x10571a8: lui   a0, 0x10000
+// 0x010571b8: 0x10571b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010571ac: 0x10571ac: jal   0x101cd60 addiu a0, a0, 8580
+// 0x010571bc: 0x10571bc: jal   0x101cd70 addiu a0, a0, 8576
 	ldloc.1
-	ldc.i4 8580
+	ldc.i4 8576
 	add
 	stloc.1
 	ldloc.0
@@ -6202,32 +6202,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010571b4: 0x10571b4: j	 0x10571fc addu  a0, v0, zero
+// 0x010571c4: 0x10571c4: j	 0x105720c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	br L_10571fc
+	br L_105720c
 // --- basic block ---
-L_10571bc:
-// 0x010571bc: 0x10571bc: lw    v0, 9196(v0)
+L_10571cc:
+// 0x010571cc: 0x10571cc: lw    v0, 9660(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2299
+	ldc.i4 2415
 	add
 	ldelem.i4
 	stloc 5
-// 0x010571c0: 0x10571c0: sll   zero, zero, 0
-// 0x010571c4: 0x10571c4: beq   v0, zero, 0x1057204 sll   zero, zero, 0
+// 0x010571d0: 0x10571d0: sll   zero, zero, 0
+// 0x010571d4: 0x10571d4: beq   v0, zero, 0x1057214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1057204
+	brfalse L_1057214
 // --- basic block ---
-// 0x010571cc: 0x10571cc: jal   0x10569ac lui   s0, 0x70000
+// 0x010571dc: 0x10571dc: jal   0x10569bc lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
 	ldloc.0
@@ -6235,17 +6235,17 @@ L_10571bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_play_sound_10569ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_play_sound_10569bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010571d4: 0x10571d4: lui   a0, 0x10000
+// 0x010571e4: 0x10571e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010571d8: 0x10571d8: jal   0x101cd60 addiu a0, a0, 8616
+// 0x010571e8: 0x10571e8: jal   0x101cd70 addiu a0, a0, 8612
 	ldloc.1
-	ldc.i4 8616
+	ldc.i4 8612
 	add
 	stloc.1
 	ldloc.0
@@ -6253,28 +6253,28 @@ L_10571bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010571e0: 0x10571e0: lui   a2, 0x10000
+// 0x010571f0: 0x10571f0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010571e4: 0x10571e4: addiu a0, s0, 10032
+// 0x010571f4: 0x10571f4: addiu a0, s0, 10496
 	ldloc 8
-	ldc.i4 10032
+	ldc.i4 10496
 	add
 	stloc.1
-// 0x010571e8: 0x10571e8: addiu a2, a2, 19912
+// 0x010571f8: 0x10571f8: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x010571ec: 0x10571ec: addu  a3, v0, zero
+// 0x010571fc: 0x10571fc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010571f0: 0x10571f0: jal   0x1000f9c addiu a1, zero, 256
+// 0x01057200: 0x1057200: jal   0x1000f9c addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -6287,20 +6287,20 @@ L_10571bc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010571f8: 0x10571f8: addiu a0, s0, 10032
+// 0x01057208: 0x1057208: addiu a0, s0, 10496
 	ldloc 8
-	ldc.i4 10032
+	ldc.i4 10496
 	add
 	stloc.1
-L_10571fc:
-// 0x010571fc: 0x10571fc: jal   0x104c3d0 sll   zero, zero, 0
+L_105720c:
+// 0x0105720c: 0x105720c: jal   0x104c3e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-L_1057204:
-// 0x01057204: 0x1057204: lw    ra, 20(sp)
-// 0x01057208: 0x1057208: lw    s0, 16(sp)
+L_1057214:
+// 0x01057214: 0x1057214: lw    ra, 20(sp)
+// 0x01057218: 0x1057218: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6309,7 +6309,7 @@ L_1057204:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105720c: 0x105720c: jr    ra addiu sp, sp, 24
+// 0x0105721c: 0x105721c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6321,7 +6321,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_display_street_1057214(int32,int32,int32,int32,int32)
+.method public static int32 navigate_display_street_1057224(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 v0,int32 s1,int32 s0,int32 v1,int32 t0,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 lo,int32 ra,int32 t1)
@@ -6392,12 +6392,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01057214: 0x1057214: addiu sp, sp, -120
+// 0x01057224: 0x1057224: addiu sp, sp, -120
 	ldloc.0
 	ldc.i4.s -120
 	add
 	stloc.0
-// 0x01057218: 0x1057218: sw    s1, 84(sp)
+// 0x01057228: 0x1057228: sw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6406,56 +6406,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105721c: 0x105721c: addiu s1, zero, 56
+// 0x0105722c: 0x105722c: addiu s1, zero, 56
 	ldc.i4.s 56
 	stloc 8
-// 0x01057220: 0x1057220: mult  a0, s1
+// 0x01057230: 0x1057230: mult  a0, s1
 	ldloc.1
 	ldloc 8
 	mul
 	stloc 18
-// 0x01057224: 0x1057224: lui   v0, 0x70000
+// 0x01057234: 0x1057234: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01057228: 0x1057228: lui   v1, 0x70000
+// 0x01057238: 0x1057238: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105722c: 0x105722c: lw    a2, 9168(v0)
+// 0x0105723c: 0x105723c: lw    a2, 9632(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc.3
-// 0x01057230: 0x1057230: lw    a3, 9172(v1)
+// 0x01057240: 0x1057240: lw    a3, 9636(v1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 4
-// 0x01057234: 0x1057234: lui   v0, 0x70000
+// 0x01057244: 0x1057244: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01057238: 0x1057238: lw    a1, 9176(v0)
+// 0x01057248: 0x1057248: lw    a1, 9640(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105723c: 0x105723c: addu  a3, a3, a2
+// 0x0105724c: 0x105724c: addu  a3, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc 4
-// 0x01057240: 0x1057240: sw    s8, 112(sp)
+// 0x01057250: 0x1057250: sw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6464,7 +6464,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01057244: 0x1057244: sw    s7, 108(sp)
+// 0x01057254: 0x1057254: sw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6473,7 +6473,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01057248: 0x1057248: sw    s6, 104(sp)
+// 0x01057258: 0x1057258: sw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6482,7 +6482,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105724c: 0x105724c: sw    s5, 100(sp)
+// 0x0105725c: 0x105725c: sw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6491,7 +6491,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01057250: 0x1057250: sw    s4, 96(sp)
+// 0x01057260: 0x1057260: sw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6500,7 +6500,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01057254: 0x1057254: sw    s3, 92(sp)
+// 0x01057264: 0x1057264: sw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6509,10 +6509,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01057258: 0x1057258: mflo  lo
+// 0x01057268: 0x1057268: mflo  lo
 	ldloc 18
 	stloc 8
-// 0x0105725c: 0x105725c: sw    s0, 80(sp)
+// 0x0105726c: 0x105726c: sw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6521,8 +6521,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01057260: 0x1057260: sw    ra, 116(sp)
-// 0x01057264: 0x1057264: sw    s2, 88(sp)
+// 0x01057270: 0x1057270: sw    ra, 116(sp)
+// 0x01057274: 0x1057274: sw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6531,141 +6531,141 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057268: 0x1057268: addu  s0, a0, zero
+// 0x01057278: 0x1057278: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0105726c: 0x105726c: subu  a3, a3, a1
+// 0x0105727c: 0x105727c: subu  a3, a3, a1
 	ldloc 4
 	ldloc.2
 	sub
 	stloc 4
-// 0x01057270: 0x1057270: lui   s8, 0x70000
+// 0x01057280: 0x1057280: lui   s8, 0x70000
 	ldc.i4 458752
 	stloc 17
-// 0x01057274: 0x1057274: addiu s7, zero, 56
+// 0x01057284: 0x1057284: addiu s7, zero, 56
 	ldc.i4.s 56
 	stloc 16
-// 0x01057278: 0x1057278: lui   s6, 0x70000
+// 0x01057288: 0x1057288: lui   s6, 0x70000
 	ldc.i4 458752
 	stloc 15
-// 0x0105727c: 0x105727c: lui   s5, 0x0
+// 0x0105728c: 0x105728c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x01057280: 0x1057280: addiu s4, sp, 36
+// 0x01057290: 0x1057290: addiu s4, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 13
-// 0x01057284: 0x1057284: j	 0x1057340 addiu s3, sp, 16
+// 0x01057294: 0x1057294: j	 0x1057350 addiu s3, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 12
-	br L_1057340
+	br L_1057350
 // --- basic block ---
-L_105728c:
-// 0x0105728c: 0x105728c: lw    a1, 9172(v1)
+L_105729c:
+// 0x0105729c: 0x105729c: lw    a1, 9636(v1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057290: 0x1057290: sll   zero, zero, 0
-// 0x01057294: 0x1057294: slt   a0, s0, a1
+// 0x010572a0: 0x10572a0: sll   zero, zero, 0
+// 0x010572a4: 0x10572a4: slt   a0, s0, a1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc.1
-// 0x01057298: 0x1057298: beq   a0, zero, 0x10572ac sll   zero, zero, 0
+// 0x010572a8: 0x10572a8: beq   a0, zero, 0x10572bc sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10572ac
+	brfalse L_10572bc
 // --- basic block ---
-// 0x010572a0: 0x10572a0: lw    s2, 10724(s6)
+// 0x010572b0: 0x10572b0: lw    s2, 11188(s6)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 6
-// 0x010572a4: 0x10572a4: j	 0x10572c8 addu  s2, s2, s1
+// 0x010572b4: 0x10572b4: j	 0x10572d8 addu  s2, s2, s1
 	ldloc 6
 	ldloc 8
 	add
 	stloc 6
-	br L_10572c8
+	br L_10572d8
 // --- basic block ---
-L_10572ac:
-// 0x010572ac: 0x10572ac: lw    s2, 9176(v0)
+L_10572bc:
+// 0x010572bc: 0x10572bc: lw    s2, 9640(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 6
-// 0x010572b0: 0x10572b0: lw    a0, 10720(s8)
+// 0x010572c0: 0x10572c0: lw    a0, 11184(s8)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.1
-// 0x010572b4: 0x10572b4: subu  s2, s2, a1
+// 0x010572c4: 0x10572c4: subu  s2, s2, a1
 	ldloc 6
 	ldloc.2
 	sub
 	stloc 6
-// 0x010572b8: 0x10572b8: addu  s2, s2, s0
+// 0x010572c8: 0x10572c8: addu  s2, s2, s0
 	ldloc 6
 	ldloc 9
 	add
 	stloc 6
-// 0x010572bc: 0x10572bc: mult  s2, s7
+// 0x010572cc: 0x10572cc: mult  s2, s7
 	ldloc 6
 	ldloc 16
 	mul
 	stloc 18
-// 0x010572c0: 0x10572c0: mflo  lo
+// 0x010572d0: 0x10572d0: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x010572c4: 0x10572c4: addu  s2, a0, s2
+// 0x010572d4: 0x10572d4: addu  s2, a0, s2
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-L_10572c8:
-// 0x010572c8: 0x10572c8: lb    t0, 55(s2)
+L_10572d8:
+// 0x010572d8: 0x10572d8: lb    t0, 55(s2)
 	ldloc 6
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 11
-// 0x010572cc: 0x10572cc: addu  a0, s3, zero
+// 0x010572dc: 0x10572dc: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x010572d0: 0x10572d0: addu  a1, s4, zero
+// 0x010572e0: 0x10572e0: addu  a1, s4, zero
 	ldloc 13
 	stloc.2
-// 0x010572d4: 0x10572d4: addu  a2, zero, zero
+// 0x010572e4: 0x10572e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010572d8: 0x10572d8: beq   t0, zero, 0x1057354 addiu s1, s1, 56
+// 0x010572e8: 0x10572e8: beq   t0, zero, 0x1057364 addiu s1, s1, 56
 	ldloc 11
 	ldloc 8
 	ldc.i4.s 56
 	add
 	stloc 8
-	brfalse L_1057354
+	brfalse L_1057364
 // --- basic block ---
-// 0x010572e0: 0x10572e0: lw    t0, 1816(s5)
+// 0x010572f0: 0x10572f0: lw    t0, 1816(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -6674,7 +6674,7 @@ L_10572c8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010572e4: 0x10572e4: sw    zero, 16(sp)
+// 0x010572f4: 0x10572f4: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6683,7 +6683,7 @@ L_10572c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010572e8: 0x10572e8: sw    t0, 32(sp)
+// 0x010572f8: 0x10572f8: sw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6692,7 +6692,7 @@ L_10572c8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010572ec: 0x10572ec: lw    t1, 24(s2)
+// 0x010572fc: 0x10572fc: lw    t1, 24(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6701,13 +6701,13 @@ L_10572c8:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010572f0: 0x10572f0: lh    t0, 36(s2)
+// 0x01057300: 0x1057300: lh    t0, 36(s2)
 	ldloc 6
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 11
-// 0x010572f4: 0x10572f4: sw    t1, 28(sp)
+// 0x01057304: 0x1057304: sw    t1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6716,7 +6716,7 @@ L_10572c8:
 	add
 	ldloc 20
 	stelem.i4
-// 0x010572f8: 0x10572f8: sw    t0, 20(sp)
+// 0x01057308: 0x1057308: sw    t0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6725,13 +6725,13 @@ L_10572c8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010572fc: 0x10572fc: lb    t0, 51(s2)
+// 0x0105730c: 0x105730c: lb    t0, 51(s2)
 	ldloc 6
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 11
-// 0x01057300: 0x1057300: sw    v0, 72(sp)
+// 0x01057310: 0x1057310: sw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6740,7 +6740,7 @@ L_10572c8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057304: 0x1057304: sw    v1, 68(sp)
+// 0x01057314: 0x1057314: sw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6749,7 +6749,7 @@ L_10572c8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01057308: 0x1057308: sw    a3, 64(sp)
+// 0x01057318: 0x1057318: sw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6758,7 +6758,7 @@ L_10572c8:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105730c: 0x105730c: jal   0x1015174 sw    t0, 24(sp)
+// 0x0105731c: 0x105731c: jal   0x1015184 sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6772,12 +6772,12 @@ L_10572c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01057314: 0x1057314: lw    a0, 40(sp)
+// 0x01057324: 0x1057324: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6786,7 +6786,7 @@ L_10572c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057318: 0x1057318: lw    v0, 72(sp)
+// 0x01057328: 0x1057328: lw    v0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6795,7 +6795,7 @@ L_10572c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105731c: 0x105731c: lw    v1, 68(sp)
+// 0x0105732c: 0x105732c: lw    v1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6804,7 +6804,7 @@ L_10572c8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057320: 0x1057320: lw    a3, 64(sp)
+// 0x01057330: 0x1057330: lw    a3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6813,53 +6813,53 @@ L_10572c8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01057324: 0x1057324: beq   a0, zero, 0x105733c sll   zero, zero, 0
+// 0x01057334: 0x1057334: beq   a0, zero, 0x105734c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_105733c
+	brfalse L_105734c
 // --- basic block ---
-// 0x0105732c: 0x105732c: lb    a0, 0(a0)
+// 0x0105733c: 0x105733c: lb    a0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01057330: 0x1057330: sll   zero, zero, 0
-// 0x01057334: 0x1057334: bne   a0, zero, 0x1057354 sll   zero, zero, 0
+// 0x01057340: 0x1057340: sll   zero, zero, 0
+// 0x01057344: 0x1057344: bne   a0, zero, 0x1057364 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1057354
+	brtrue L_1057364
 // --- basic block ---
-L_105733c:
-// 0x0105733c: 0x105733c: addiu s0, s0, 1
+L_105734c:
+// 0x0105734c: 0x105734c: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1057340:
-// 0x01057340: 0x1057340: slt   a0, s0, a3
+L_1057350:
+// 0x01057350: 0x1057350: slt   a0, s0, a3
 	ldloc 9
 	ldloc 4
 	clt
 	stloc.1
-// 0x01057344: 0x1057344: bne   a0, zero, 0x105728c sll   zero, zero, 0
+// 0x01057354: 0x1057354: bne   a0, zero, 0x105729c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_105728c
+	brtrue L_105729c
 // --- basic block ---
-// 0x0105734c: 0x105734c: j	 0x10573ac sll   zero, zero, 0
-	br L_10573ac
+// 0x0105735c: 0x105735c: j	 0x10573bc sll   zero, zero, 0
+	br L_10573bc
 // --- basic block ---
-L_1057354:
-// 0x01057354: 0x1057354: lb    v0, 55(s2)
+L_1057364:
+// 0x01057364: 0x1057364: lb    v0, 55(s2)
 	ldloc 6
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01057358: 0x1057358: sll   zero, zero, 0
-// 0x0105735c: 0x105735c: beq   v0, zero, 0x105737c lui   s1, 0x0
+// 0x01057368: 0x1057368: sll   zero, zero, 0
+// 0x0105736c: 0x105736c: beq   v0, zero, 0x105738c lui   s1, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 8
-	brfalse L_105737c
+	brfalse L_105738c
 // --- basic block ---
-// 0x01057364: 0x1057364: lw    a0, 40(sp)
+// 0x01057374: 0x1057374: lw    a0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6868,21 +6868,21 @@ L_1057354:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057368: 0x1057368: jal   0x105e520 sll   zero, zero, 0
+// 0x01057378: 0x1057378: jal   0x105e530 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_set_street_105e520(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_set_street_105e530(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01057370: 0x1057370: addiu v0, zero, -1
+// 0x01057380: 0x1057380: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01057374: 0x1057374: j	 0x10573ac sw    v0, 14320(s1)
+// 0x01057384: 0x1057384: j	 0x10573bc sw    v0, 14320(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6891,10 +6891,10 @@ L_1057354:
 	add
 	ldloc 7
 	stelem.i4
-	br L_10573ac
+	br L_10573bc
 // --- basic block ---
-L_105737c:
-// 0x0105737c: 0x105737c: lw    v0, 14320(s1)
+L_105738c:
+// 0x0105738c: 0x105738c: lw    v0, 14320(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6903,17 +6903,17 @@ L_105737c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057380: 0x1057380: sll   zero, zero, 0
-// 0x01057384: 0x1057384: beq   v0, s0, 0x10573ac lui   a0, 0x10000
+// 0x01057390: 0x1057390: sll   zero, zero, 0
+// 0x01057394: 0x1057394: beq   v0, s0, 0x10573bc lui   a0, 0x10000
 	ldloc 7
 	ldloc 9
 	ldc.i4 65536
 	stloc.1
-	beq  L_10573ac
+	beq  L_10573bc
 // --- basic block ---
-// 0x0105738c: 0x105738c: jal   0x105e520 addiu a0, a0, 18500
+// 0x0105739c: 0x105739c: jal   0x105e530 addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -6921,12 +6921,12 @@ L_105737c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_set_street_105e520(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_set_street_105e530(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01057394: 0x1057394: lw    a0, 24(s2)
+// 0x010573a4: 0x10573a4: lw    a0, 24(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6935,16 +6935,16 @@ L_105737c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057398: 0x1057398: lui   a1, 0x400000
+// 0x010573a8: 0x10573a8: lui   a1, 0x400000
 	ldc.i4 4194304
 	stloc.2
-// 0x0105739c: 0x105739c: addiu a2, zero, 1
+// 0x010573ac: 0x10573ac: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010573a0: 0x10573a0: addu  a3, zero, zero
+// 0x010573b0: 0x10573b0: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010573a4: 0x10573a4: jal   0x100d384 sw    s0, 14320(s1)
+// 0x010573b4: 0x10573b4: jal   0x100d394 sw    s0, 14320(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6958,14 +6958,14 @@ L_105737c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 7
 // --- basic block ---
-L_10573ac:
-// 0x010573ac: 0x10573ac: lw    ra, 116(sp)
-// 0x010573b0: 0x10573b0: lw    s8, 112(sp)
+L_10573bc:
+// 0x010573bc: 0x10573bc: lw    ra, 116(sp)
+// 0x010573c0: 0x10573c0: lw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6974,7 +6974,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010573b4: 0x10573b4: lw    s7, 108(sp)
+// 0x010573c4: 0x10573c4: lw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6983,7 +6983,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010573b8: 0x10573b8: lw    s6, 104(sp)
+// 0x010573c8: 0x10573c8: lw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6992,7 +6992,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010573bc: 0x10573bc: lw    s5, 100(sp)
+// 0x010573cc: 0x10573cc: lw    s5, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7001,7 +7001,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010573c0: 0x10573c0: lw    s4, 96(sp)
+// 0x010573d0: 0x10573d0: lw    s4, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7010,7 +7010,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010573c4: 0x10573c4: lw    s3, 92(sp)
+// 0x010573d4: 0x10573d4: lw    s3, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7019,7 +7019,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010573c8: 0x10573c8: lw    s2, 88(sp)
+// 0x010573d8: 0x10573d8: lw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7028,7 +7028,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010573cc: 0x10573cc: lw    s1, 84(sp)
+// 0x010573dc: 0x10573dc: lw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7037,7 +7037,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010573d0: 0x10573d0: lw    s0, 80(sp)
+// 0x010573e0: 0x10573e0: lw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7046,7 +7046,7 @@ L_10573ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010573d4: 0x10573d4: jr    ra addiu sp, sp, 120
+// 0x010573e4: 0x10573e4: jr    ra addiu sp, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
@@ -7058,7 +7058,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_is_auto_zoom_10573dc(int32,int32,int32,int32,int32)
+.method public static int32 navigate_is_auto_zoom_10573ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -7093,24 +7093,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010573dc: 0x10573dc: lui   a0, 0x0
+// 0x010573ec: 0x10573ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010573e0: 0x10573e0: lui   a1, 0x0
+// 0x010573f0: 0x10573f0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010573e4: 0x10573e4: addiu sp, sp, -24
+// 0x010573f4: 0x10573f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010573e8: 0x10573e8: addiu a0, a0, 14100
+// 0x010573f8: 0x10573f8: addiu a0, a0, 14100
 	ldloc.1
 	ldc.i4 14100
 	add
 	stloc.1
-// 0x010573ec: 0x10573ec: sw    ra, 20(sp)
-// 0x010573f0: 0x10573f0: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010573fc: 0x10573fc: sw    ra, 20(sp)
+// 0x01057400: 0x1057400: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -7120,14 +7120,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010573f8: 0x10573f8: lw    ra, 20(sp)
-// 0x010573fc: 0x10573fc: sll   zero, zero, 0
-// 0x01057400: 0x1057400: jr    ra addiu sp, sp, 24
+// 0x01057408: 0x1057408: lw    ra, 20(sp)
+// 0x0105740c: 0x105740c: sll   zero, zero, 0
+// 0x01057410: 0x1057410: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
diff --git a/converted/Cibyl65.j b/converted/Cibyl65.j
index 2d40aed..b75a1c3 100644
--- a/converted/Cibyl65.j
+++ b/converted/Cibyl65.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl65::.ctor
 
-.method public static int32 navigation_guidance_state_1057408(int32,int32,int32,int32,int32)
+.method public static int32 navigation_guidance_state_1057418(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -76,24 +76,24 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01057408: 0x1057408: lui   a0, 0x0
+// 0x01057418: 0x1057418: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105740c: 0x105740c: lui   a1, 0x0
+// 0x0105741c: 0x105741c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01057410: 0x1057410: addiu sp, sp, -24
+// 0x01057420: 0x1057420: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01057414: 0x1057414: addiu a0, a0, 14116
+// 0x01057424: 0x1057424: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x01057418: 0x1057418: sw    ra, 20(sp)
-// 0x0105741c: 0x105741c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01057428: 0x1057428: sw    ra, 20(sp)
+// 0x0105742c: 0x105742c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -103,18 +103,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01057424: 0x1057424: lw    ra, 20(sp)
-// 0x01057428: 0x1057428: sltu  v0, zero, v0
+// 0x01057434: 0x1057434: lw    ra, 20(sp)
+// 0x01057438: 0x1057438: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0105742c: 0x105742c: jr    ra addiu sp, sp, 24
+// 0x0105743c: 0x105743c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -126,7 +126,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_local_calc_enabled_1057434(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_local_calc_enabled_1057444(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -161,24 +161,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01057434: 0x1057434: lui   a0, 0x0
+// 0x01057444: 0x1057444: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01057438: 0x1057438: lui   a1, 0x0
+// 0x01057448: 0x1057448: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105743c: 0x105743c: addiu sp, sp, -24
+// 0x0105744c: 0x105744c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01057440: 0x1057440: addiu a0, a0, 14456
+// 0x01057450: 0x1057450: addiu a0, a0, 14456
 	ldloc.1
 	ldc.i4 14456
 	add
 	stloc.1
-// 0x01057444: 0x1057444: sw    ra, 20(sp)
-// 0x01057448: 0x1057448: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01057454: 0x1057454: sw    ra, 20(sp)
+// 0x01057458: 0x1057458: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -188,18 +188,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01057450: 0x1057450: lw    ra, 20(sp)
-// 0x01057454: 0x1057454: sltu  v0, zero, v0
+// 0x01057460: 0x1057460: lw    ra, 20(sp)
+// 0x01057464: 0x1057464: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01057458: 0x1057458: jr    ra addiu sp, sp, 24
+// 0x01057468: 0x1057468: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -211,7 +211,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navgiate_main_voice_guidance_enabled_1057460(int32,int32,int32,int32,int32)
+.method public static int32 navgiate_main_voice_guidance_enabled_1057470(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -246,24 +246,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01057460: 0x1057460: lui   a0, 0x0
+// 0x01057470: 0x1057470: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01057464: 0x1057464: lui   a1, 0x0
+// 0x01057474: 0x1057474: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01057468: 0x1057468: addiu sp, sp, -24
+// 0x01057478: 0x1057478: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105746c: 0x105746c: addiu a0, a0, 14132
+// 0x0105747c: 0x105747c: addiu a0, a0, 14132
 	ldloc.1
 	ldc.i4 14132
 	add
 	stloc.1
-// 0x01057470: 0x1057470: sw    ra, 20(sp)
-// 0x01057474: 0x1057474: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01057480: 0x1057480: sw    ra, 20(sp)
+// 0x01057484: 0x1057484: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -273,18 +273,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0105747c: 0x105747c: lw    ra, 20(sp)
-// 0x01057480: 0x1057480: sltu  v0, zero, v0
+// 0x0105748c: 0x105748c: lw    ra, 20(sp)
+// 0x01057490: 0x1057490: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01057484: 0x1057484: jr    ra addiu sp, sp, 24
+// 0x01057494: 0x1057494: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -296,7 +296,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_ETA_enabled_105748c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_ETA_enabled_105749c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -331,24 +331,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105748c: 0x105748c: lui   a0, 0x0
+// 0x0105749c: 0x105749c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01057490: 0x1057490: lui   a1, 0x0
+// 0x010574a0: 0x10574a0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01057494: 0x1057494: addiu sp, sp, -24
+// 0x010574a4: 0x10574a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01057498: 0x1057498: addiu a0, a0, 14148
+// 0x010574a8: 0x10574a8: addiu a0, a0, 14148
 	ldloc.1
 	ldc.i4 14148
 	add
 	stloc.1
-// 0x0105749c: 0x105749c: sw    ra, 20(sp)
-// 0x010574a0: 0x10574a0: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010574ac: 0x10574ac: sw    ra, 20(sp)
+// 0x010574b0: 0x10574b0: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -358,18 +358,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010574a8: 0x10574a8: lw    ra, 20(sp)
-// 0x010574ac: 0x10574ac: sltu  v0, zero, v0
+// 0x010574b8: 0x10574b8: lw    ra, 20(sp)
+// 0x010574bc: 0x10574bc: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010574b0: 0x10574b0: jr    ra addiu sp, sp, 24
+// 0x010574c0: 0x10574c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -381,7 +381,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_get_follow_gps_10574b8(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_get_follow_gps_10574c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -416,31 +416,31 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010574b8: 0x10574b8: addiu sp, sp, -24
+// 0x010574c8: 0x10574c8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010574bc: 0x10574bc: sw    ra, 20(sp)
-// 0x010574c0: 0x10574c0: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x010574cc: 0x10574cc: sw    ra, 20(sp)
+// 0x010574d0: 0x10574d0: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010574c8: 0x10574c8: addu  a0, v0, zero
+// 0x010574d8: 0x10574d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010574cc: 0x10574cc: beq   a0, zero, 0x10574e4 addu  v0, zero, zero
+// 0x010574dc: 0x10574dc: beq   a0, zero, 0x10574f4 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_10574e4
+	brfalse L_10574f4
 // --- basic block ---
-// 0x010574d4: 0x10574d4: lui   a1, 0x10000
+// 0x010574e4: 0x10574e4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010574d8: 0x10574d8: jal   0x1001b14 addiu a1, a1, -31052
+// 0x010574e8: 0x10574e8: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -450,26 +450,26 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010574e0: 0x10574e0: sltiu v0, v0, 1
+// 0x010574f0: 0x10574f0: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-L_10574e4:
-// 0x010574e4: 0x10574e4: lw    ra, 20(sp)
-// 0x010574e8: 0x10574e8: lui   v1, 0x70000
+L_10574f4:
+// 0x010574f4: 0x10574f4: lw    ra, 20(sp)
+// 0x010574f8: 0x10574f8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010574ec: 0x10574ec: sw    v0, 10020(v1)
+// 0x010574fc: 0x10574fc: sw    v0, 10484(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldloc 5
 	stelem.i4
-// 0x010574f0: 0x10574f0: jr    ra addiu sp, sp, 24
+// 0x01057500: 0x1057500: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -481,7 +481,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_get_current_time_10574f8(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_get_current_time_1057508(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -516,21 +516,21 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010574f8: 0x10574f8: addiu sp, sp, -48
+// 0x01057508: 0x1057508: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010574fc: 0x10574fc: addu  v0, a0, zero
+// 0x0105750c: 0x105750c: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01057500: 0x1057500: addiu a0, sp, 16
+// 0x01057510: 0x1057510: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x01057504: 0x1057504: sw    ra, 44(sp)
-// 0x01057508: 0x1057508: jal   0x104f650 sw    v0, 32(sp)
+// 0x01057514: 0x1057514: sw    ra, 44(sp)
+// 0x01057518: 0x1057518: jal   0x104f660 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -541,12 +541,12 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl59::roadmap_time_get_time_104f650(int32,int32)
+	call int32 Cibyl59::roadmap_time_get_time_104f660(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057510: 0x1057510: lw    v0, 32(sp)
+// 0x01057520: 0x1057520: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -555,7 +555,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057514: 0x1057514: lw    v1, 20(sp)
+// 0x01057524: 0x1057524: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -564,8 +564,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057518: 0x1057518: lw    ra, 44(sp)
-// 0x0105751c: 0x105751c: sw    v1, 4(v0)
+// 0x01057528: 0x1057528: lw    ra, 44(sp)
+// 0x0105752c: 0x105752c: sw    v1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -574,7 +574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057520: 0x1057520: lw    v1, 24(sp)
+// 0x01057530: 0x1057530: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -583,8 +583,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057524: 0x1057524: sll   zero, zero, 0
-// 0x01057528: 0x1057528: sw    v1, 8(v0)
+// 0x01057534: 0x1057534: sll   zero, zero, 0
+// 0x01057538: 0x1057538: sw    v1, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -593,7 +593,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105752c: 0x105752c: lw    v1, 16(sp)
+// 0x0105753c: 0x105753c: lw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -602,12 +602,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057530: 0x1057530: addiu sp, sp, 48
+// 0x01057540: 0x1057540: addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.0
-// 0x01057534: 0x1057534: jr    ra sw    v1, 0(v0)
+// 0x01057544: 0x1057544: jr    ra sw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -621,7 +621,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_main_calculate_eta_105753c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_calculate_eta_105754c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 lo,int32 hi,int32 t0,int32 t2,int32 v1,int32 s1,int32 t1,int32 ra)
@@ -677,12 +677,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105753c: 0x105753c: addiu sp, sp, -40
+// 0x0105754c: 0x105754c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01057540: 0x1057540: lw    t0, 56(sp)
+// 0x01057550: 0x1057550: lw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -691,20 +691,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057544: 0x1057544: addiu v0, zero, 3600
+// 0x01057554: 0x1057554: addiu v0, zero, 3600
 	ldc.i4 3600
 	stloc 7
-// 0x01057548: 0x1057548: addu  t0, t0, a1
+// 0x01057558: 0x1057558: addu  t0, t0, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc 10
-// 0x0105754c: 0x105754c: mult  t0, v0
+// 0x0105755c: 0x105755c: mult  t0, v0
 	ldloc 10
 	ldloc 7
 	mul
 	stloc 8
-// 0x01057550: 0x1057550: lw    t2, 60(sp)
+// 0x01057560: 0x1057560: lw    t2, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -713,15 +713,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01057554: 0x1057554: addiu v0, zero, 60
+// 0x01057564: 0x1057564: addiu v0, zero, 60
 	ldc.i4.s 60
 	stloc 7
-// 0x01057558: 0x1057558: addu  t2, t2, a2
+// 0x01057568: 0x1057568: addu  t2, t2, a2
 	ldloc 11
 	ldloc.3
 	add
 	stloc 11
-// 0x0105755c: 0x105755c: lw    t1, 64(sp)
+// 0x0105756c: 0x105756c: lw    t1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -730,7 +730,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01057560: 0x1057560: sw    s0, 28(sp)
+// 0x01057570: 0x1057570: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -739,20 +739,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01057564: 0x1057564: addu  t1, t1, a3
+// 0x01057574: 0x1057574: addu  t1, t1, a3
 	ldloc 14
 	ldloc 4
 	add
 	stloc 14
-// 0x01057568: 0x1057568: lui   v1, 0x10000
+// 0x01057578: 0x1057578: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0105756c: 0x105756c: ori   v1, v1, 20864
+// 0x0105757c: 0x105757c: ori   v1, v1, 20864
 	ldloc 12
 	ldc.i4 20864
 	or
 	stloc 12
-// 0x01057570: 0x1057570: sw    s1, 32(sp)
+// 0x01057580: 0x1057580: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -761,7 +761,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01057574: 0x1057574: sw    a0, 16(sp)
+// 0x01057584: 0x1057584: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -770,8 +770,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01057578: 0x1057578: sw    ra, 36(sp)
-// 0x0105757c: 0x105757c: sw    a1, 44(sp)
+// 0x01057588: 0x1057588: sw    ra, 36(sp)
+// 0x0105758c: 0x105758c: sw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -780,10 +780,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01057580: 0x1057580: mflo  lo
+// 0x01057590: 0x1057590: mflo  lo
 	ldloc 8
 	stloc 10
-// 0x01057584: 0x1057584: sw    a2, 48(sp)
+// 0x01057594: 0x1057594: sw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -792,26 +792,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01057588: 0x1057588: addu  s0, t1, t0
+// 0x01057598: 0x1057598: addu  s0, t1, t0
 	ldloc 14
 	ldloc 10
 	add
 	stloc 5
-// 0x0105758c: 0x105758c: mult  t2, v0
+// 0x0105759c: 0x105759c: mult  t2, v0
 	ldloc 11
 	ldloc 7
 	mul
 	stloc 8
-// 0x01057590: 0x1057590: mflo  lo
+// 0x010575a0: 0x10575a0: mflo  lo
 	ldloc 8
 	stloc 11
-// 0x01057594: 0x1057594: addu  s0, s0, t2
+// 0x010575a4: 0x10575a4: addu  s0, s0, t2
 	ldloc 5
 	ldloc 11
 	add
 	stloc 5
-// 0x01057598: 0x1057598: sll   zero, zero, 0
-// 0x0105759c: 0x105759c: div   s0, v1
+// 0x010575a8: 0x10575a8: sll   zero, zero, 0
+// 0x010575ac: 0x10575ac: div   s0, v1
 	ldloc 5
 	ldloc 12
 	ldloc 5
@@ -820,12 +820,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	rem
 	stloc 9
-// 0x010575a0: 0x10575a0: mfhi  hi
+// 0x010575b0: 0x10575b0: mfhi  hi
 	ldloc 9
 	stloc 5
-// 0x010575a4: 0x10575a4: sll   zero, zero, 0
-// 0x010575a8: 0x10575a8: sll   zero, zero, 0
-// 0x010575ac: 0x10575ac: div   s0, v0
+// 0x010575b4: 0x10575b4: sll   zero, zero, 0
+// 0x010575b8: 0x10575b8: sll   zero, zero, 0
+// 0x010575bc: 0x10575bc: div   s0, v0
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -834,12 +834,12 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	rem
 	stloc 9
-// 0x010575b0: 0x10575b0: mflo  lo
+// 0x010575c0: 0x10575c0: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010575b4: 0x10575b4: sll   zero, zero, 0
-// 0x010575b8: 0x10575b8: sll   zero, zero, 0
-// 0x010575bc: 0x10575bc: div   s0, v0
+// 0x010575c4: 0x10575c4: sll   zero, zero, 0
+// 0x010575c8: 0x10575c8: sll   zero, zero, 0
+// 0x010575cc: 0x10575cc: div   s0, v0
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -848,16 +848,16 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	rem
 	stloc 9
-// 0x010575c0: 0x10575c0: mfhi  hi
+// 0x010575d0: 0x10575d0: mfhi  hi
 	ldloc 9
 	stloc 13
-// 0x010575c4: 0x10575c4: subu  s0, s0, s1
+// 0x010575d4: 0x10575d4: subu  s0, s0, s1
 	ldloc 5
 	ldloc 13
 	sub
 	stloc 5
-// 0x010575c8: 0x10575c8: sll   zero, zero, 0
-// 0x010575cc: 0x10575cc: div   s0, v0
+// 0x010575d8: 0x10575d8: sll   zero, zero, 0
+// 0x010575dc: 0x10575dc: div   s0, v0
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -866,10 +866,10 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	rem
 	stloc 9
-// 0x010575d0: 0x10575d0: mflo  lo
+// 0x010575e0: 0x10575e0: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x010575d4: 0x10575d4: jal   0x10a48f4 sw    a3, 52(sp)
+// 0x010575e4: 0x10575e4: jal   0x10a4f3c sw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -883,12 +883,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_general_settings_is_24_hour_clock_10a48f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_general_settings_is_24_hour_clock_10a4f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 7
 // --- basic block ---
-// 0x010575dc: 0x10575dc: lw    a0, 16(sp)
+// 0x010575ec: 0x10575ec: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -897,13 +897,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010575e0: 0x10575e0: bne   v0, zero, 0x10575fc addiu v0, zero, 12
+// 0x010575f0: 0x10575f0: bne   v0, zero, 0x105760c addiu v0, zero, 12
 	ldloc 7
 	ldc.i4.s 12
 	stloc 7
-	brtrue L_10575fc
+	brtrue L_105760c
 // --- basic block ---
-// 0x010575e8: 0x10575e8: div   s0, v0
+// 0x010575f8: 0x10575f8: div   s0, v0
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -912,26 +912,26 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	rem
 	stloc 9
-// 0x010575ec: 0x10575ec: mfhi  hi
+// 0x010575fc: 0x10575fc: mfhi  hi
 	ldloc 9
 	stloc 5
-// 0x010575f0: 0x10575f0: bne   s0, zero, 0x10575fc sll   zero, zero, 0
+// 0x01057600: 0x1057600: bne   s0, zero, 0x105760c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10575fc
+	brtrue L_105760c
 // --- basic block ---
-// 0x010575f8: 0x10575f8: addiu s0, zero, 12
+// 0x01057608: 0x1057608: addiu s0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-L_10575fc:
-// 0x010575fc: 0x10575fc: lw    ra, 36(sp)
-// 0x01057600: 0x1057600: sw    s0, 0(a0)
+L_105760c:
+// 0x0105760c: 0x105760c: lw    ra, 36(sp)
+// 0x01057610: 0x1057610: sw    s0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01057604: 0x1057604: sw    s1, 4(a0)
+// 0x01057614: 0x1057614: sw    s1, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -940,10 +940,10 @@ L_10575fc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01057608: 0x1057608: addu  v0, a0, zero
+// 0x01057618: 0x1057618: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0105760c: 0x105760c: lw    s1, 32(sp)
+// 0x0105761c: 0x105761c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -952,7 +952,7 @@ L_10575fc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01057610: 0x1057610: lw    s0, 28(sp)
+// 0x01057620: 0x1057620: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -961,7 +961,7 @@ L_10575fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01057614: 0x1057614: sw    zero, 8(a0)
+// 0x01057624: 0x1057624: sw    zero, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -970,7 +970,7 @@ L_10575fc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01057618: 0x1057618: jr    ra addiu sp, sp, 40
+// 0x01057628: 0x1057628: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -982,7 +982,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_main_list_1057620(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_list_1057630(int32,int32,int32,int32,int32)
 {
 .maxstack 12
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 t0,int32 t1,int32 s2,int32 s3,int32 s0,int32 s6,int32 t3,int32 lo,int32 t2,int32 s4,int32 s7,int32 s5,int32 hi,int32 s8,int32 t4,int32 ra)
@@ -1065,17 +1065,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1057620:
-// 0x01057620: 0x1057620: addiu sp, sp, -400
+L_1057630:
+// 0x01057630: 0x1057630: addiu sp, sp, -400
 	ldloc.0
 	ldc.i4 -400
 	add
 	stloc.0
-// 0x01057624: 0x1057624: addu  a0, zero, zero
+// 0x01057634: 0x1057634: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01057628: 0x1057628: sw    ra, 396(sp)
-// 0x0105762c: 0x105762c: sw    s8, 392(sp)
+// 0x01057638: 0x1057638: sw    ra, 396(sp)
+// 0x0105763c: 0x105763c: sw    s8, 392(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1084,7 +1084,7 @@ L_1057620:
 	add
 	ldloc 22
 	stelem.i4
-// 0x01057630: 0x1057630: sw    s7, 388(sp)
+// 0x01057640: 0x1057640: sw    s7, 388(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1093,7 +1093,7 @@ L_1057620:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01057634: 0x1057634: sw    s6, 384(sp)
+// 0x01057644: 0x1057644: sw    s6, 384(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1102,7 +1102,7 @@ L_1057620:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01057638: 0x1057638: sw    s5, 380(sp)
+// 0x01057648: 0x1057648: sw    s5, 380(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1111,7 +1111,7 @@ L_1057620:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0105763c: 0x105763c: sw    s4, 376(sp)
+// 0x0105764c: 0x105764c: sw    s4, 376(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1120,7 +1120,7 @@ L_1057620:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01057640: 0x1057640: sw    s3, 372(sp)
+// 0x01057650: 0x1057650: sw    s3, 372(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1129,7 +1129,7 @@ L_1057620:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01057644: 0x1057644: sw    s2, 368(sp)
+// 0x01057654: 0x1057654: sw    s2, 368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1138,7 +1138,7 @@ L_1057620:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01057648: 0x1057648: sw    s1, 364(sp)
+// 0x01057658: 0x1057658: sw    s1, 364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1147,7 +1147,7 @@ L_1057620:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105764c: 0x105764c: jal   0x1094b64 sw    s0, 360(sp)
+// 0x0105765c: 0x105765c: jal   0x10951ac sw    s0, 360(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1161,77 +1161,77 @@ L_1057620:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057654: 0x1057654: lui   a2, 0x70000
+// 0x01057664: 0x1057664: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01057658: 0x1057658: lui   a1, 0x70000
+// 0x01057668: 0x1057668: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0105765c: 0x105765c: lui   a0, 0x70000
+// 0x0105766c: 0x105766c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01057660: 0x1057660: addiu a2, a2, 10764
+// 0x01057670: 0x1057670: addiu a2, a2, 11228
 	ldloc.3
-	ldc.i4 10764
+	ldc.i4 11228
 	add
 	stloc.3
-// 0x01057664: 0x1057664: addiu a1, a1, 11164
+// 0x01057674: 0x1057674: addiu a1, a1, 11628
 	ldloc.2
-	ldc.i4 11164
+	ldc.i4 11628
 	add
 	stloc.2
-// 0x01057668: 0x1057668: addiu a0, a0, 11564
+// 0x01057678: 0x1057678: addiu a0, a0, 12028
 	ldloc.1
-	ldc.i4 11564
+	ldc.i4 12028
 	add
 	stloc.1
-// 0x0105766c: 0x105766c: addu  v0, zero, zero
+// 0x0105767c: 0x105767c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01057670: 0x1057670: addiu v1, zero, 400
+// 0x01057680: 0x1057680: addiu v1, zero, 400
 	ldc.i4 400
 	stloc 7
-L_1057674:
-// 0x01057674: 0x1057674: addu  t1, a2, v0
+L_1057684:
+// 0x01057684: 0x1057684: addu  t1, a2, v0
 	ldloc.3
 	ldloc 6
 	add
 	stloc 10
-// 0x01057678: 0x1057678: addu  t0, a1, v0
+// 0x01057688: 0x1057688: addu  t0, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc 9
-// 0x0105767c: 0x105767c: addu  a3, a0, v0
+// 0x0105768c: 0x105768c: addu  a3, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc 4
-// 0x01057680: 0x1057680: addiu v0, v0, 4
+// 0x01057690: 0x1057690: addiu v0, v0, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-// 0x01057684: 0x1057684: sw    zero, 0(t1)
+// 0x01057694: 0x1057694: sw    zero, 0(t1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01057688: 0x1057688: sw    zero, 0(t0)
+// 0x01057698: 0x1057698: sw    zero, 0(t0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105768c: 0x105768c: bne   v0, v1, 0x1057674 sw    zero, 0(a3)
+// 0x0105769c: 0x105769c: bne   v0, v1, 0x1057684 sw    zero, 0(a3)
 	ldloc 6
 	ldloc 7
 	ldloc 5
@@ -1240,122 +1240,122 @@ L_1057674:
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_1057674
+	bne.un L_1057684
 // --- basic block ---
-// 0x01057694: 0x1057694: lui   v0, 0x70000
+// 0x010576a4: 0x10576a4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01057698: 0x1057698: lw    v0, 9160(v0)
+// 0x010576a8: 0x10576a8: lw    v0, 9624(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105769c: 0x105769c: sll   zero, zero, 0
-// 0x010576a0: 0x10576a0: beq   v0, zero, 0x1057f28 addu  s0, zero, zero
+// 0x010576ac: 0x10576ac: sll   zero, zero, 0
+// 0x010576b0: 0x10576b0: beq   v0, zero, 0x1057f38 addu  s0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 13
-	brfalse L_1057f28
+	brfalse L_1057f38
 // --- basic block ---
-// 0x010576a8: 0x10576a8: lui   v0, 0x70000
+// 0x010576b8: 0x10576b8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010576ac: 0x10576ac: lw    s4, 9164(v0)
+// 0x010576bc: 0x10576bc: lw    s4, 9628(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 18
-// 0x010576b0: 0x10576b0: lui   v0, 0x70000
+// 0x010576c0: 0x10576c0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010576b4: 0x10576b4: lw    a0, 9176(v0)
+// 0x010576c4: 0x10576c4: lw    a0, 9640(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.1
-// 0x010576b8: 0x10576b8: lui   v0, 0x70000
+// 0x010576c8: 0x10576c8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010576bc: 0x10576bc: lw    v0, 9172(v0)
+// 0x010576cc: 0x10576cc: lw    v0, 9636(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 6
-// 0x010576c0: 0x10576c0: addu  a2, s4, a0
+// 0x010576d0: 0x10576d0: addu  a2, s4, a0
 	ldloc 18
 	ldloc.1
 	add
 	stloc.3
-// 0x010576c4: 0x10576c4: addiu v1, zero, 56
+// 0x010576d4: 0x10576d4: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x010576c8: 0x10576c8: addiu a1, a2, 1
+// 0x010576d8: 0x10576d8: addiu a1, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.2
-// 0x010576cc: 0x10576cc: subu  a2, a2, v0
+// 0x010576dc: 0x10576dc: subu  a2, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-// 0x010576d0: 0x10576d0: mult  a2, v1
+// 0x010576e0: 0x10576e0: mult  a2, v1
 	ldloc.3
 	ldloc 7
 	mul
 	stloc 16
-// 0x010576d4: 0x10576d4: subu  a1, a1, v0
+// 0x010576e4: 0x10576e4: subu  a1, a1, v0
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-// 0x010576d8: 0x10576d8: addiu s6, s4, 1
+// 0x010576e8: 0x10576e8: addiu s6, s4, 1
 	ldloc 18
 	ldc.i4.1
 	add
 	stloc 14
-// 0x010576dc: 0x10576dc: lui   a3, 0x70000
+// 0x010576ec: 0x10576ec: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x010576e0: 0x10576e0: lw    a3, 9168(a3)
+// 0x010576f0: 0x10576f0: lw    a3, 9632(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 4
-// 0x010576e4: 0x10576e4: lui   t1, 0x70000
+// 0x010576f4: 0x10576f4: lui   t1, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x010576e8: 0x10576e8: addu  a3, v0, a3
+// 0x010576f8: 0x10576f8: addu  a3, v0, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 4
-// 0x010576ec: 0x10576ec: subu  a3, a3, a0
+// 0x010576fc: 0x10576fc: subu  a3, a3, a0
 	ldloc 4
 	ldloc.1
 	sub
 	stloc 4
-// 0x010576f0: 0x10576f0: sw    a3, 332(sp)
+// 0x01057700: 0x1057700: sw    a3, 332(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1364,19 +1364,19 @@ L_1057674:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010576f4: 0x10576f4: lw    t1, 10720(t1)
+// 0x01057704: 0x1057704: lw    t1, 11184(t1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 10
-// 0x010576f8: 0x10576f8: lui   t0, 0x70000
+// 0x01057708: 0x1057708: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x010576fc: 0x10576fc: lw    t2, 332(sp)
+// 0x0105770c: 0x105770c: lw    t2, 332(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1385,29 +1385,29 @@ L_1057674:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01057700: 0x1057700: lw    t0, 10724(t0)
+// 0x01057710: 0x1057710: lw    t0, 11188(t0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 9
-// 0x01057704: 0x1057704: mflo  lo
+// 0x01057714: 0x1057714: mflo  lo
 	ldloc 16
 	stloc.3
-// 0x01057708: 0x1057708: addiu t2, t2, -1
+// 0x01057718: 0x1057718: addiu t2, t2, -1
 	ldloc 17
 	ldc.i4.m1
 	add
 	stloc 17
-// 0x0105770c: 0x105770c: addu  a2, t1, a2
+// 0x0105771c: 0x105771c: addu  a2, t1, a2
 	ldloc 10
 	ldloc.3
 	add
 	stloc.3
-// 0x01057710: 0x1057710: sw    t2, 324(sp)
+// 0x01057720: 0x1057720: sw    t2, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1416,56 +1416,56 @@ L_1057674:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01057714: 0x1057714: mult  a1, v1
+// 0x01057724: 0x1057724: mult  a1, v1
 	ldloc.2
 	ldloc 7
 	mul
 	stloc 16
-// 0x01057718: 0x1057718: addu  a3, s6, zero
+// 0x01057728: 0x1057728: addu  a3, s6, zero
 	ldloc 14
 	stloc 4
-// 0x0105771c: 0x105771c: addu  a0, s4, zero
+// 0x0105772c: 0x105772c: addu  a0, s4, zero
 	ldloc 18
 	stloc.1
-// 0x01057720: 0x1057720: addu  s7, zero, zero
+// 0x01057730: 0x1057730: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 19
-// 0x01057724: 0x1057724: addiu t2, zero, 1
+// 0x01057734: 0x1057734: addiu t2, zero, 1
 	ldc.i4.1
 	stloc 17
-// 0x01057728: 0x1057728: mflo  lo
+// 0x01057738: 0x1057738: mflo  lo
 	ldloc 16
 	stloc.2
-// 0x0105772c: 0x105772c: addu  a1, t1, a1
+// 0x0105773c: 0x105773c: addu  a1, t1, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc.2
-// 0x01057730: 0x1057730: sll   zero, zero, 0
-// 0x01057734: 0x1057734: mult  s6, v1
+// 0x01057740: 0x1057740: sll   zero, zero, 0
+// 0x01057744: 0x1057744: mult  s6, v1
 	ldloc 14
 	ldloc 7
 	mul
 	stloc 16
-// 0x01057738: 0x1057738: mflo  lo
+// 0x01057748: 0x1057748: mflo  lo
 	ldloc 16
 	stloc 22
-// 0x0105773c: 0x105773c: sll   zero, zero, 0
-// 0x01057740: 0x1057740: sll   zero, zero, 0
-// 0x01057744: 0x1057744: mult  s4, v1
+// 0x0105774c: 0x105774c: sll   zero, zero, 0
+// 0x01057750: 0x1057750: sll   zero, zero, 0
+// 0x01057754: 0x1057754: mult  s4, v1
 	ldloc 18
 	ldloc 7
 	mul
 	stloc 16
-// 0x01057748: 0x1057748: addu  v1, t0, s8
+// 0x01057758: 0x1057758: addu  v1, t0, s8
 	ldloc 9
 	ldloc 22
 	add
 	stloc 7
-// 0x0105774c: 0x105774c: mflo  lo
+// 0x0105775c: 0x105775c: mflo  lo
 	ldloc 16
 	stloc 10
-// 0x01057750: 0x1057750: sw    t1, 320(sp)
+// 0x01057760: 0x1057760: sw    t1, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1474,111 +1474,111 @@ L_1057674:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01057754: 0x1057754: j	 0x10577b4 addu  t0, t0, t1
+// 0x01057764: 0x1057764: j	 0x10577c4 addu  t0, t0, t1
 	ldloc 9
 	ldloc 10
 	add
 	stloc 9
-	br L_10577b4
+	br L_10577c4
 // --- basic block ---
-L_105775c:
-// 0x0105775c: 0x105775c: beq   t3, zero, 0x1057768 addu  t1, a2, zero
+L_105776c:
+// 0x0105776c: 0x105776c: beq   t3, zero, 0x1057778 addu  t1, a2, zero
 	ldloc 15
 	ldloc.3
 	stloc 10
-	brfalse L_1057768
+	brfalse L_1057778
 // --- basic block ---
-// 0x01057764: 0x1057764: addu  t1, t0, zero
+// 0x01057774: 0x1057774: addu  t1, t0, zero
 	ldloc 9
 	stloc 10
-L_1057768:
-// 0x01057768: 0x1057768: lb    t3, 52(t1)
+L_1057778:
+// 0x01057778: 0x1057778: lb    t3, 52(t1)
 	ldloc 10
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 15
-// 0x0105776c: 0x105776c: sll   zero, zero, 0
-// 0x01057770: 0x1057770: beq   t3, t2, 0x105779c slt   t4, a3, v0
+// 0x0105777c: 0x105777c: sll   zero, zero, 0
+// 0x01057780: 0x1057780: beq   t3, t2, 0x10577ac slt   t4, a3, v0
 	ldloc 15
 	ldloc 17
 	ldloc 4
 	ldloc 6
 	clt
 	stloc 23
-	beq  L_105779c
+	beq  L_10577ac
 // --- basic block ---
-// 0x01057778: 0x1057778: beq   t4, zero, 0x1057784 addu  t3, a1, zero
+// 0x01057788: 0x1057788: beq   t4, zero, 0x1057794 addu  t3, a1, zero
 	ldloc 23
 	ldloc.2
 	stloc 15
-	brfalse L_1057784
+	brfalse L_1057794
 // --- basic block ---
-// 0x01057780: 0x1057780: addu  t3, v1, zero
+// 0x01057790: 0x1057790: addu  t3, v1, zero
 	ldloc 7
 	stloc 15
-L_1057784:
-// 0x01057784: 0x1057784: lh    t4, 44(t1)
+L_1057794:
+// 0x01057794: 0x1057794: lh    t4, 44(t1)
 	ldloc 10
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 23
-// 0x01057788: 0x1057788: lh    t1, 44(t3)
+// 0x01057798: 0x1057798: lh    t1, 44(t3)
 	ldloc 15
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 10
-// 0x0105778c: 0x105778c: sll   zero, zero, 0
-// 0x01057790: 0x1057790: xor   t1, t4, t1
+// 0x0105779c: 0x105779c: sll   zero, zero, 0
+// 0x010577a0: 0x10577a0: xor   t1, t4, t1
 	ldloc 23
 	ldloc 10
 	xor
 	stloc 10
-// 0x01057794: 0x1057794: sltu  t1, zero, t1
+// 0x010577a4: 0x10577a4: sltu  t1, zero, t1
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 10
-// 0x01057798: 0x1057798: addu  s7, s7, t1
+// 0x010577a8: 0x10577a8: addu  s7, s7, t1
 	ldloc 19
 	ldloc 10
 	add
 	stloc 19
-L_105779c:
-// 0x0105779c: 0x105779c: addiu a0, a0, 1
+L_10577ac:
+// 0x010577ac: 0x10577ac: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010577a0: 0x10577a0: addiu a3, a3, 1
+// 0x010577b0: 0x10577b0: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x010577a4: 0x10577a4: addiu v1, v1, 56
+// 0x010577b4: 0x10577b4: addiu v1, v1, 56
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc 7
-// 0x010577a8: 0x10577a8: addiu a1, a1, 56
+// 0x010577b8: 0x10577b8: addiu a1, a1, 56
 	ldloc.2
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x010577ac: 0x10577ac: addiu t0, t0, 56
+// 0x010577bc: 0x10577bc: addiu t0, t0, 56
 	ldloc 9
 	ldc.i4.s 56
 	add
 	stloc 9
-// 0x010577b0: 0x10577b0: addiu a2, a2, 56
+// 0x010577c0: 0x10577c0: addiu a2, a2, 56
 	ldloc.3
 	ldc.i4.s 56
 	add
 	stloc.3
-L_10577b4:
-// 0x010577b4: 0x10577b4: lw    t3, 324(sp)
+L_10577c4:
+// 0x010577c4: 0x10577c4: lw    t3, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1587,24 +1587,24 @@ L_10577b4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010577b8: 0x10577b8: sll   zero, zero, 0
-// 0x010577bc: 0x10577bc: slt   t1, a0, t3
+// 0x010577c8: 0x10577c8: sll   zero, zero, 0
+// 0x010577cc: 0x10577cc: slt   t1, a0, t3
 	ldloc.1
 	ldloc 15
 	clt
 	stloc 10
-// 0x010577c0: 0x10577c0: bne   t1, zero, 0x105775c slt   t3, a0, v0
+// 0x010577d0: 0x10577d0: bne   t1, zero, 0x105776c slt   t3, a0, v0
 	ldloc 10
 	ldloc.1
 	ldloc 6
 	clt
 	stloc 15
-	brtrue L_105775c
+	brtrue L_105776c
 // --- basic block ---
-// 0x010577c8: 0x10577c8: lui   s1, 0x10000
+// 0x010577d8: 0x10577d8: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010577cc: 0x10577cc: sw    s7, 328(sp)
+// 0x010577dc: 0x10577dc: sw    s7, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1613,18 +1613,18 @@ L_10577b4:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010577d0: 0x10577d0: addiu s1, s1, 18500
+// 0x010577e0: 0x10577e0: addiu s1, s1, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 8
-// 0x010577d4: 0x10577d4: addu  s0, zero, zero
+// 0x010577e4: 0x10577e4: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010577d8: 0x10577d8: addu  s5, zero, zero
+// 0x010577e8: 0x10577e8: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 20
-// 0x010577dc: 0x10577dc: sw    zero, 336(sp)
+// 0x010577ec: 0x10577ec: sw    zero, 336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1633,46 +1633,46 @@ L_10577b4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010577e0: 0x10577e0: j	 0x1057f14 addu  s7, s6, zero
+// 0x010577f0: 0x10577f0: j	 0x1057f24 addu  s7, s6, zero
 	ldloc 14
 	stloc 19
-	br L_1057f14
+	br L_1057f24
 // --- basic block ---
-L_10577e8:
-// 0x010577e8: 0x10577e8: lw    v0, 9172(v1)
+L_10577f8:
+// 0x010577f8: 0x10577f8: lw    v0, 9636(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 6
-// 0x010577ec: 0x10577ec: sll   zero, zero, 0
-// 0x010577f0: 0x10577f0: slt   v1, s4, v0
+// 0x010577fc: 0x10577fc: sll   zero, zero, 0
+// 0x01057800: 0x1057800: slt   v1, s4, v0
 	ldloc 18
 	ldloc 6
 	clt
 	stloc 7
-// 0x010577f4: 0x10577f4: beq   v1, zero, 0x1057810 lui   v1, 0x70000
+// 0x01057804: 0x1057804: beq   v1, zero, 0x1057820 lui   v1, 0x70000
 	ldloc 7
 	ldc.i4 458752
 	stloc 7
-	brfalse L_1057810
+	brfalse L_1057820
 // --- basic block ---
-// 0x010577fc: 0x10577fc: lui   v0, 0x70000
+// 0x0105780c: 0x105780c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01057800: 0x1057800: lw    s2, 10724(v0)
+// 0x01057810: 0x1057810: lw    s2, 11188(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 11
-// 0x01057804: 0x1057804: lw    a0, 320(sp)
+// 0x01057814: 0x1057814: lw    a0, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1681,242 +1681,242 @@ L_10577e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057808: 0x1057808: j	 0x1057834 addu  s2, s2, a0
+// 0x01057818: 0x1057818: j	 0x1057844 addu  s2, s2, a0
 	ldloc 11
 	ldloc.1
 	add
 	stloc 11
-	br L_1057834
+	br L_1057844
 // --- basic block ---
-L_1057810:
-// 0x01057810: 0x1057810: lw    s2, 9176(v1)
+L_1057820:
+// 0x01057820: 0x1057820: lw    s2, 9640(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 11
-// 0x01057814: 0x1057814: addiu v1, zero, 56
+// 0x01057824: 0x1057824: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x01057818: 0x1057818: subu  s2, s2, v0
+// 0x01057828: 0x1057828: subu  s2, s2, v0
 	ldloc 11
 	ldloc 6
 	sub
 	stloc 11
-// 0x0105781c: 0x105781c: addu  s2, s2, s4
+// 0x0105782c: 0x105782c: addu  s2, s2, s4
 	ldloc 11
 	ldloc 18
 	add
 	stloc 11
-// 0x01057820: 0x1057820: mult  s2, v1
+// 0x01057830: 0x1057830: mult  s2, v1
 	ldloc 11
 	ldloc 7
 	mul
 	stloc 16
-// 0x01057824: 0x1057824: lui   v0, 0x70000
+// 0x01057834: 0x1057834: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01057828: 0x1057828: lw    v0, 10720(v0)
+// 0x01057838: 0x1057838: lw    v0, 11184(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105782c: 0x105782c: mflo  lo
+// 0x0105783c: 0x105783c: mflo  lo
 	ldloc 16
 	stloc 11
-// 0x01057830: 0x1057830: addu  s2, v0, s2
+// 0x01057840: 0x1057840: addu  s2, v0, s2
 	ldloc 6
 	ldloc 11
 	add
 	stloc 11
-L_1057834:
-// 0x01057834: 0x1057834: lh    v0, 46(s2)
+L_1057844:
+// 0x01057844: 0x1057844: lh    v0, 46(s2)
 	ldloc 11
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x01057838: 0x1057838: lb    v1, 52(s2)
+// 0x01057848: 0x1057848: lb    v1, 52(s2)
 	ldloc 11
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105783c: 0x105783c: addu  s5, s5, v0
+// 0x0105784c: 0x105784c: addu  s5, s5, v0
 	ldloc 20
 	ldloc 6
 	add
 	stloc 20
-// 0x01057840: 0x1057840: addiu v0, zero, 1
+// 0x01057850: 0x1057850: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01057844: 0x1057844: beq   v1, v0, 0x1057efc sll   zero, zero, 0
+// 0x01057854: 0x1057854: beq   v1, v0, 0x1057f0c sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	beq  L_1057efc
+	beq  L_1057f0c
 // --- basic block ---
-// 0x0105784c: 0x105784c: lbu   v0, 54(s2)
+// 0x0105785c: 0x105785c: lbu   v0, 54(s2)
 	ldloc 11
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 6
-// 0x01057850: 0x1057850: sll   zero, zero, 0
-// 0x01057854: 0x1057854: sltiu v1, v0, 16
+// 0x01057860: 0x1057860: sll   zero, zero, 0
+// 0x01057864: 0x1057864: sltiu v1, v0, 16
 	ldloc 6
 	ldc.i4.s 16
 	clt.un
 	stloc 7
-// 0x01057858: 0x1057858: beq   v1, zero, 0x1057910 lui   v1, 0x20000
+// 0x01057868: 0x1057868: beq   v1, zero, 0x1057920 lui   v1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 7
-	brfalse L_1057910
+	brfalse L_1057920
 // --- basic block ---
-// 0x01057860: 0x1057860: sll   v0, v0, 2
+// 0x01057870: 0x1057870: sll   v0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01057864: 0x1057864: addiu v1, v1, 27832
+// 0x01057874: 0x1057874: addiu v1, v1, 28296
 	ldloc 7
-	ldc.i4 27832
+	ldc.i4 28296
 	add
 	stloc 7
-// 0x01057868: 0x1057868: addu  v0, v1, v0
+// 0x01057878: 0x1057878: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x0105786c: 0x105786c: lw    v0, 0(v0)
+// 0x0105787c: 0x105787c: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01057870: 0x1057870: sll   zero, zero, 0
-// 0x01057874: 0x1057874: jr    v0 sll   zero, zero, 0
+// 0x01057880: 0x1057880: sll   zero, zero, 0
+// 0x01057884: 0x1057884: jr    v0 sll   zero, zero, 0
 	ldloc 6
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_105787c:
-// 0x0105787c: 0x105787c: lui   s1, 0x10000
+L_105788c:
+// 0x0105788c: 0x105788c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01057880: 0x1057880: j	 0x1057910 addiu s1, s1, 8640
+// 0x01057890: 0x1057890: j	 0x1057920 addiu s1, s1, 8636
 	ldloc 8
-	ldc.i4 8640
+	ldc.i4 8636
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_1057888:
-// 0x01057888: 0x1057888: lui   s1, 0x10000
+L_1057898:
+// 0x01057898: 0x1057898: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0105788c: 0x105788c: j	 0x1057910 addiu s1, s1, 8652
+// 0x0105789c: 0x105789c: j	 0x1057920 addiu s1, s1, 8648
 	ldloc 8
-	ldc.i4 8652
+	ldc.i4 8648
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_1057894:
-// 0x01057894: 0x1057894: lui   s1, 0x10000
+L_10578a4:
+// 0x010578a4: 0x10578a4: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01057898: 0x1057898: j	 0x1057910 addiu s1, s1, 8684
+// 0x010578a8: 0x10578a8: j	 0x1057920 addiu s1, s1, 8680
 	ldloc 8
-	ldc.i4 8684
+	ldc.i4 8680
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578a0:
-// 0x010578a0: 0x10578a0: lui   s1, 0x10000
+L_10578b0:
+// 0x010578b0: 0x10578b0: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010578a4: 0x10578a4: j	 0x1057910 addiu s1, s1, 8696
+// 0x010578b4: 0x10578b4: j	 0x1057920 addiu s1, s1, 8692
 	ldloc 8
-	ldc.i4 8696
+	ldc.i4 8692
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578ac:
-// 0x010578ac: 0x10578ac: lui   s1, 0x10000
+L_10578bc:
+// 0x010578bc: 0x10578bc: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010578b0: 0x10578b0: j	 0x1057910 addiu s1, s1, 8708
+// 0x010578c0: 0x10578c0: j	 0x1057920 addiu s1, s1, 8704
 	ldloc 8
-	ldc.i4 8708
+	ldc.i4 8704
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578b8:
-// 0x010578b8: 0x10578b8: lui   s1, 0x10000
+L_10578c8:
+// 0x010578c8: 0x10578c8: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010578bc: 0x10578bc: j	 0x1057910 addiu s1, s1, 8740
+// 0x010578cc: 0x10578cc: j	 0x1057920 addiu s1, s1, 8736
 	ldloc 8
-	ldc.i4 8740
+	ldc.i4 8736
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578c4:
-// 0x010578c4: 0x10578c4: lui   s1, 0x10000
+L_10578d4:
+// 0x010578d4: 0x10578d4: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010578c8: 0x10578c8: j	 0x1057910 addiu s1, s1, 8752
+// 0x010578d8: 0x10578d8: j	 0x1057920 addiu s1, s1, 8748
 	ldloc 8
-	ldc.i4 8752
+	ldc.i4 8748
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578d0:
-// 0x010578d0: 0x10578d0: lui   s1, 0x10000
+L_10578e0:
+// 0x010578e0: 0x10578e0: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010578d4: 0x10578d4: j	 0x1057910 addiu s1, s1, 8776
+// 0x010578e4: 0x10578e4: j	 0x1057920 addiu s1, s1, 8772
 	ldloc 8
-	ldc.i4 8776
+	ldc.i4 8772
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578dc:
-// 0x010578dc: 0x10578dc: lui   s1, 0x10000
+L_10578ec:
+// 0x010578ec: 0x10578ec: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010578e0: 0x10578e0: j	 0x1057910 addiu s1, s1, 8796
+// 0x010578f0: 0x10578f0: j	 0x1057920 addiu s1, s1, 8792
 	ldloc 8
-	ldc.i4 8796
+	ldc.i4 8792
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578e8:
-// 0x010578e8: 0x10578e8: lb    a0, 53(s2)
+L_10578f8:
+// 0x010578f8: 0x10578f8: lb    a0, 53(s2)
 	ldloc 11
 	ldc.i4.s 53
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010578ec: 0x10578ec: lui   s1, 0x10000
+// 0x010578fc: 0x10578fc: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010578f0: 0x10578f0: sw    a0, 336(sp)
+// 0x01057900: 0x1057900: sw    a0, 336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1925,38 +1925,38 @@ L_10578e8:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010578f4: 0x10578f4: j	 0x1057910 addiu s1, s1, 8836
+// 0x01057904: 0x1057904: j	 0x1057920 addiu s1, s1, 8832
 	ldloc 8
-	ldc.i4 8836
+	ldc.i4 8832
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_10578fc:
-// 0x010578fc: 0x10578fc: lui   s1, 0x10000
+L_105790c:
+// 0x0105790c: 0x105790c: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01057900: 0x1057900: j	 0x1057910 addiu s1, s1, 8868
+// 0x01057910: 0x1057910: j	 0x1057920 addiu s1, s1, 8864
 	ldloc 8
-	ldc.i4 8868
+	ldc.i4 8864
 	add
 	stloc 8
-	br L_1057910
+	br L_1057920
 // --- basic block ---
-L_1057908:
-// 0x01057908: 0x1057908: lui   s1, 0x10000
+L_1057918:
+// 0x01057918: 0x1057918: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0105790c: 0x105790c: addiu s1, s1, 8892
+// 0x0105791c: 0x105791c: addiu s1, s1, 8888
 	ldloc 8
-	ldc.i4 8892
+	ldc.i4 8888
 	add
 	stloc 8
-L_1057910:
-// 0x01057910: 0x1057910: lui   v0, 0x0
+L_1057920:
+// 0x01057920: 0x1057920: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01057914: 0x1057914: lw    v0, 1816(v0)
+// 0x01057924: 0x1057924: lw    v0, 1816(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1965,7 +1965,7 @@ L_1057910:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057918: 0x1057918: sw    zero, 40(sp)
+// 0x01057928: 0x1057928: sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1974,7 +1974,7 @@ L_1057910:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105791c: 0x105791c: sw    v0, 56(sp)
+// 0x0105792c: 0x105792c: sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1983,7 +1983,7 @@ L_1057910:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057920: 0x1057920: lw    v1, 24(s2)
+// 0x01057930: 0x1057930: lw    v1, 24(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1992,13 +1992,13 @@ L_1057910:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057924: 0x1057924: lh    v0, 36(s2)
+// 0x01057934: 0x1057934: lh    v0, 36(s2)
 	ldloc 11
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x01057928: 0x1057928: sw    v1, 52(sp)
+// 0x01057938: 0x1057938: sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2007,7 +2007,7 @@ L_1057910:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105792c: 0x105792c: sw    v0, 44(sp)
+// 0x0105793c: 0x105793c: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2016,26 +2016,26 @@ L_1057910:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057930: 0x1057930: lb    v0, 51(s2)
+// 0x01057940: 0x1057940: lb    v0, 51(s2)
 	ldloc 11
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01057934: 0x1057934: addiu a0, sp, 40
+// 0x01057944: 0x1057944: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x01057938: 0x1057938: addiu a1, sp, 80
+// 0x01057948: 0x1057948: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x0105793c: 0x105793c: addu  a2, zero, zero
+// 0x0105794c: 0x105794c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01057940: 0x1057940: jal   0x1015174 sw    v0, 48(sp)
+// 0x01057950: 0x1057950: jal   0x1015184 sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2049,25 +2049,25 @@ L_1057910:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057948: 0x1057948: lb    v0, 55(s2)
+// 0x01057958: 0x1057958: lb    v0, 55(s2)
 	ldloc 11
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0105794c: 0x105794c: sll   zero, zero, 0
-// 0x01057950: 0x1057950: bne   v0, zero, 0x1057970 lui   a1, 0x70000
+// 0x0105795c: 0x105795c: sll   zero, zero, 0
+// 0x01057960: 0x1057960: bne   v0, zero, 0x1057980 lui   a1, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc.2
-	brtrue L_1057970
+	brtrue L_1057980
 // --- basic block ---
-// 0x01057958: 0x1057958: lw    a0, 52(sp)
+// 0x01057968: 0x1057968: lw    a0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2076,13 +2076,13 @@ L_1057910:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105795c: 0x105795c: lui   a1, 0x400000
+// 0x0105796c: 0x105796c: lui   a1, 0x400000
 	ldc.i4 4194304
 	stloc.2
-// 0x01057960: 0x1057960: addiu a2, zero, 1
+// 0x01057970: 0x1057970: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01057964: 0x1057964: jal   0x100d384 addu  a3, zero, zero
+// 0x01057974: 0x1057974: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2090,31 +2090,31 @@ L_1057910:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105796c: 0x105796c: lui   a1, 0x70000
+// 0x0105797c: 0x105797c: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-L_1057970:
-// 0x01057970: 0x1057970: lw    v0, 9172(a1)
+L_1057980:
+// 0x01057980: 0x1057980: lw    v0, 9636(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057974: 0x1057974: sll   zero, zero, 0
-// 0x01057978: 0x1057978: slt   v1, s7, v0
+// 0x01057984: 0x1057984: sll   zero, zero, 0
+// 0x01057988: 0x1057988: slt   v1, s7, v0
 	ldloc 19
 	ldloc 6
 	clt
 	stloc 7
-// 0x0105797c: 0x105797c: beq   v1, zero, 0x1057994 sw    s7, 340(sp)
+// 0x0105798c: 0x105798c: beq   v1, zero, 0x10579a4 sw    s7, 340(sp)
 	ldloc 7
 	ldloc 5
 	ldloc.0
@@ -2124,80 +2124,80 @@ L_1057970:
 	add
 	ldloc 19
 	stelem.i4
-	brfalse L_1057994
+	brfalse L_10579a4
 // --- basic block ---
-// 0x01057984: 0x1057984: lui   v0, 0x70000
+// 0x01057994: 0x1057994: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01057988: 0x1057988: lw    s3, 10724(v0)
+// 0x01057998: 0x1057998: lw    s3, 11188(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105798c: 0x105798c: j	 0x10579bc addu  s3, s3, s8
+// 0x0105799c: 0x105799c: j	 0x10579cc addu  s3, s3, s8
 	ldloc 12
 	ldloc 22
 	add
 	stloc 12
-	br L_10579bc
+	br L_10579cc
 // --- basic block ---
-L_1057994:
-// 0x01057994: 0x1057994: lui   v1, 0x70000
+L_10579a4:
+// 0x010579a4: 0x10579a4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01057998: 0x1057998: lw    s3, 9176(v1)
+// 0x010579a8: 0x10579a8: lw    s3, 9640(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105799c: 0x105799c: addiu v1, zero, 56
+// 0x010579ac: 0x10579ac: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x010579a0: 0x10579a0: subu  s3, s3, v0
+// 0x010579b0: 0x10579b0: subu  s3, s3, v0
 	ldloc 12
 	ldloc 6
 	sub
 	stloc 12
-// 0x010579a4: 0x10579a4: addu  s3, s3, s7
+// 0x010579b4: 0x10579b4: addu  s3, s3, s7
 	ldloc 12
 	ldloc 19
 	add
 	stloc 12
-// 0x010579a8: 0x10579a8: mult  s3, v1
+// 0x010579b8: 0x10579b8: mult  s3, v1
 	ldloc 12
 	ldloc 7
 	mul
 	stloc 16
-// 0x010579ac: 0x10579ac: lui   v0, 0x70000
+// 0x010579bc: 0x10579bc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010579b0: 0x10579b0: lw    v0, 10720(v0)
+// 0x010579c0: 0x10579c0: lw    v0, 11184(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 6
-// 0x010579b4: 0x10579b4: mflo  lo
+// 0x010579c4: 0x10579c4: mflo  lo
 	ldloc 16
 	stloc 12
-// 0x010579b8: 0x10579b8: addu  s3, v0, s3
+// 0x010579c8: 0x10579c8: addu  s3, v0, s3
 	ldloc 6
 	ldloc 12
 	add
 	stloc 12
-L_10579bc:
-// 0x010579bc: 0x10579bc: lw    v0, 324(sp)
+L_10579cc:
+// 0x010579cc: 0x10579cc: lw    v0, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2206,83 +2206,83 @@ L_10579bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010579c0: 0x10579c0: sll   zero, zero, 0
-// 0x010579c4: 0x10579c4: beq   s4, v0, 0x10579e0 sll   zero, zero, 0
+// 0x010579d0: 0x10579d0: sll   zero, zero, 0
+// 0x010579d4: 0x10579d4: beq   s4, v0, 0x10579f0 sll   zero, zero, 0
 	ldloc 18
 	ldloc 6
-	beq  L_10579e0
+	beq  L_10579f0
 // --- basic block ---
-// 0x010579cc: 0x10579cc: lh    a0, 44(s2)
+// 0x010579dc: 0x10579dc: lh    a0, 44(s2)
 	ldloc 11
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x010579d0: 0x10579d0: lh    v0, 44(s3)
+// 0x010579e0: 0x10579e0: lh    v0, 44(s3)
 	ldloc 12
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x010579d4: 0x10579d4: sll   zero, zero, 0
-// 0x010579d8: 0x10579d8: beq   a0, v0, 0x1057ed0 addu  v1, s0, zero
+// 0x010579e4: 0x10579e4: sll   zero, zero, 0
+// 0x010579e8: 0x10579e8: beq   a0, v0, 0x1057ee0 addu  v1, s0, zero
 	ldloc.1
 	ldloc 6
 	ldloc 13
 	stloc 7
-	beq  L_1057ed0
+	beq  L_1057ee0
 // --- basic block ---
-L_10579e0:
-// 0x010579e0: 0x10579e0: bne   s0, zero, 0x10579fc lui   v0, 0x70000
+L_10579f0:
+// 0x010579f0: 0x10579f0: bne   s0, zero, 0x1057a0c lui   v0, 0x70000
 	ldloc 13
 	ldc.i4 458752
 	stloc 6
-	brtrue L_10579fc
+	brtrue L_1057a0c
 // --- basic block ---
-// 0x010579e8: 0x10579e8: lw    v0, 10692(v0)
+// 0x010579f8: 0x10579f8: lw    v0, 11156(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldelem.i4
 	stloc 6
-// 0x010579ec: 0x10579ec: sll   zero, zero, 0
-// 0x010579f0: 0x10579f0: beq   v0, zero, 0x10579fc lui   v0, 0x70000
+// 0x010579fc: 0x10579fc: sll   zero, zero, 0
+// 0x01057a00: 0x1057a00: beq   v0, zero, 0x1057a0c lui   v0, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 6
-	brfalse L_10579fc
+	brfalse L_1057a0c
 // --- basic block ---
-// 0x010579f8: 0x10579f8: lw    s5, 10688(v0)
+// 0x01057a08: 0x1057a08: lw    s5, 11152(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc 20
-L_10579fc:
-// 0x010579fc: 0x10579fc: jal   0x1007df4 addu  a0, s5, zero
+L_1057a0c:
+// 0x01057a0c: 0x1057a0c: jal   0x1007e04 addu  a0, s5, zero
 	ldloc 20
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 6
 // --- basic block ---
-// 0x01057a04: 0x1057a04: addiu v1, sp, 208
+// 0x01057a14: 0x1057a14: addiu v1, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
 	stloc 7
-// 0x01057a08: 0x1057a08: addiu a0, sp, 60
+// 0x01057a18: 0x1057a18: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x01057a0c: 0x1057a0c: sw    v1, 312(sp)
+// 0x01057a1c: 0x1057a1c: sw    v1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2291,7 +2291,7 @@ L_10579fc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057a10: 0x1057a10: sw    a0, 316(sp)
+// 0x01057a20: 0x1057a20: sw    a0, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2300,17 +2300,17 @@ L_10579fc:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01057a14: 0x1057a14: blez  v0, 0x1057a60 lui   s6, 0x10000
+// 0x01057a24: 0x1057a24: blez  v0, 0x1057a70 lui   s6, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc 14
 	ldc.i4.s 0
-	ble L_1057a60
+	ble L_1057a70
 // --- basic block ---
-// 0x01057a1c: 0x1057a1c: addu  a0, s5, zero
+// 0x01057a2c: 0x1057a2c: addu  a0, s5, zero
 	ldloc 20
 	stloc.1
-// 0x01057a20: 0x1057a20: jal   0x1007e18 sw    v0, 348(sp)
+// 0x01057a30: 0x1057a30: jal   0x1007e28 sw    v0, 348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2320,15 +2320,15 @@ L_10579fc:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057a28: 0x1057a28: addiu v1, zero, 10
+// 0x01057a38: 0x1057a38: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 7
-// 0x01057a2c: 0x1057a2c: div   v0, v1
+// 0x01057a3c: 0x1057a3c: div   v0, v1
 	ldloc 6
 	ldloc 7
 	ldloc 6
@@ -2337,7 +2337,7 @@ L_10579fc:
 	stloc 16
 	rem
 	stloc 21
-// 0x01057a30: 0x1057a30: lw    a3, 348(sp)
+// 0x01057a40: 0x1057a40: lw    a3, 348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2346,7 +2346,7 @@ L_10579fc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01057a34: 0x1057a34: lw    a0, 312(sp)
+// 0x01057a44: 0x1057a44: lw    a0, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2355,21 +2355,21 @@ L_10579fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057a38: 0x1057a38: lui   a2, 0x10000
+// 0x01057a48: 0x1057a48: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01057a3c: 0x1057a3c: addiu a2, a2, 8928
+// 0x01057a4c: 0x1057a4c: addiu a2, a2, 8924
 	ldloc.3
-	ldc.i4 8928
+	ldc.i4 8924
 	add
 	stloc.3
-// 0x01057a40: 0x1057a40: addiu a1, zero, 100
+// 0x01057a50: 0x1057a50: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x01057a44: 0x1057a44: mfhi  hi
+// 0x01057a54: 0x1057a54: mfhi  hi
 	ldloc 21
 	stloc 6
-// 0x01057a48: 0x1057a48: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01057a58: 0x1057a58: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2388,15 +2388,15 @@ L_10579fc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057a50: 0x1057a50: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x01057a60: 0x1057a60: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 6
 // --- basic block ---
-// 0x01057a58: 0x1057a58: j	 0x1057a88 sll   zero, zero, 0
-	br L_1057a88
+// 0x01057a68: 0x1057a68: j	 0x1057a98 sll   zero, zero, 0
+	br L_1057a98
 // --- basic block ---
-L_1057a60:
-// 0x01057a60: 0x1057a60: jal   0x1007db4 addu  a0, s5, zero
+L_1057a70:
+// 0x01057a70: 0x1057a70: jal   0x1007dc4 addu  a0, s5, zero
 	ldloc 20
 	stloc.1
 	ldloc.0
@@ -2404,12 +2404,12 @@ L_1057a60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057a68: 0x1057a68: lw    a0, 312(sp)
+// 0x01057a78: 0x1057a78: lw    a0, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2418,18 +2418,18 @@ L_1057a60:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057a6c: 0x1057a6c: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x01057a7c: 0x1057a7c: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x01057a70: 0x1057a70: addiu a2, a2, -13884
+// 0x01057a80: 0x1057a80: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x01057a74: 0x1057a74: addu  a3, v0, zero
+// 0x01057a84: 0x1057a84: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x01057a78: 0x1057a78: jal   0x1000f9c addiu a1, zero, 100
+// 0x01057a88: 0x1057a88: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -2442,12 +2442,12 @@ L_1057a60:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057a80: 0x1057a80: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x01057a90: 0x1057a90: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 6
 // --- basic block ---
-L_1057a88:
-// 0x01057a88: 0x1057a88: jal   0x101cd60 addu  a0, v0, zero
+L_1057a98:
+// 0x01057a98: 0x1057a98: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -2455,12 +2455,12 @@ L_1057a88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057a90: 0x1057a90: lw    a0, 316(sp)
+// 0x01057aa0: 0x1057aa0: lw    a0, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2469,15 +2469,15 @@ L_1057a88:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057a94: 0x1057a94: addiu a2, s6, 19912
+// 0x01057aa4: 0x1057aa4: addiu a2, s6, 20332
 	ldloc 14
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01057a98: 0x1057a98: addiu a1, zero, 20
+// 0x01057aa8: 0x1057aa8: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01057a9c: 0x1057a9c: jal   0x1000f9c addu  a3, v0, zero
+// 0x01057aac: 0x1057aac: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -2490,7 +2490,7 @@ L_1057a88:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057aa4: 0x1057aa4: lw    a1, 324(sp)
+// 0x01057ab4: 0x1057ab4: lw    a1, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2499,124 +2499,124 @@ L_1057a88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057aa8: 0x1057aa8: lb    s6, 54(s2)
+// 0x01057ab8: 0x1057ab8: lb    s6, 54(s2)
 	ldloc 11
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 14
-// 0x01057aac: 0x1057aac: slt   v0, s4, a1
+// 0x01057abc: 0x1057abc: slt   v0, s4, a1
 	ldloc 18
 	ldloc.2
 	clt
 	stloc 6
-// 0x01057ab0: 0x1057ab0: beq   v0, zero, 0x1057dac addiu v0, s6, -5
+// 0x01057ac0: 0x1057ac0: beq   v0, zero, 0x1057dbc addiu v0, s6, -5
 	ldloc 6
 	ldloc 14
 	ldc.i4.s -5
 	add
 	stloc 6
-	brfalse L_1057dac
+	brfalse L_1057dbc
 // --- basic block ---
-// 0x01057ab8: 0x1057ab8: andi  v0, v0, 255
+// 0x01057ac8: 0x1057ac8: andi  v0, v0, 255
 	ldloc 6
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01057abc: 0x1057abc: sltiu v0, v0, 9
+// 0x01057acc: 0x1057acc: sltiu v0, v0, 9
 	ldloc 6
 	ldc.i4.s 9
 	clt.un
 	stloc 6
-// 0x01057ac0: 0x1057ac0: beq   v0, zero, 0x1057b44 lui   v0, 0x70000
+// 0x01057ad0: 0x1057ad0: beq   v0, zero, 0x1057b54 lui   v0, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 6
-	brfalse L_1057b44
+	brfalse L_1057b54
 // --- basic block ---
-// 0x01057ac8: 0x1057ac8: lw    v1, 9176(v0)
+// 0x01057ad8: 0x1057ad8: lw    v1, 9640(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057acc: 0x1057acc: lui   a2, 0x70000
+// 0x01057adc: 0x1057adc: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01057ad0: 0x1057ad0: lw    v0, 9172(a2)
+// 0x01057ae0: 0x1057ae0: lw    v0, 9636(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057ad4: 0x1057ad4: addiu v1, v1, 1
+// 0x01057ae4: 0x1057ae4: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01057ad8: 0x1057ad8: subu  v1, v1, v0
+// 0x01057ae8: 0x1057ae8: subu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 7
-// 0x01057adc: 0x1057adc: addu  v1, v1, s4
+// 0x01057aec: 0x1057aec: addu  v1, v1, s4
 	ldloc 7
 	ldloc 18
 	add
 	stloc 7
-// 0x01057ae0: 0x1057ae0: addiu a0, zero, 56
+// 0x01057af0: 0x1057af0: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.1
-// 0x01057ae4: 0x1057ae4: mult  v1, a0
+// 0x01057af4: 0x1057af4: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 16
-// 0x01057ae8: 0x1057ae8: lui   a1, 0x70000
+// 0x01057af8: 0x1057af8: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01057aec: 0x1057aec: lui   a0, 0x70000
+// 0x01057afc: 0x1057afc: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01057af0: 0x1057af0: lw    a1, 10720(a1)
+// 0x01057b00: 0x1057b00: lw    a1, 11184(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057af4: 0x1057af4: lw    a0, 10724(a0)
+// 0x01057b04: 0x1057b04: lw    a0, 11188(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.1
-// 0x01057af8: 0x1057af8: lh    a2, 44(s3)
+// 0x01057b08: 0x1057b08: lh    a2, 44(s3)
 	ldloc 12
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x01057afc: 0x1057afc: mflo  lo
+// 0x01057b0c: 0x1057b0c: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x01057b00: 0x1057b00: addu  v1, a1, v1
+// 0x01057b10: 0x1057b10: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x01057b04: 0x1057b04: lw    a1, 340(sp)
+// 0x01057b14: 0x1057b14: lw    a1, 340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2625,51 +2625,51 @@ L_1057a88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057b08: 0x1057b08: j	 0x1057b30 addu  a0, a0, s8
+// 0x01057b18: 0x1057b18: j	 0x1057b40 addu  a0, a0, s8
 	ldloc.1
 	ldloc 22
 	add
 	stloc.1
-	br L_1057b30
+	br L_1057b40
 // --- basic block ---
-L_1057b10:
-// 0x01057b10: 0x1057b10: beq   a3, zero, 0x1057b1c addu  s3, v1, zero
+L_1057b20:
+// 0x01057b20: 0x1057b20: beq   a3, zero, 0x1057b2c addu  s3, v1, zero
 	ldloc 4
 	ldloc 7
 	stloc 12
-	brfalse L_1057b1c
+	brfalse L_1057b2c
 // --- basic block ---
-// 0x01057b18: 0x1057b18: addu  s3, a0, zero
+// 0x01057b28: 0x1057b28: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-L_1057b1c:
-// 0x01057b1c: 0x1057b1c: lh    a3, 44(s3)
+L_1057b2c:
+// 0x01057b2c: 0x1057b2c: lh    a3, 44(s3)
 	ldloc 12
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x01057b20: 0x1057b20: addiu a0, a0, 56
+// 0x01057b30: 0x1057b30: addiu a0, a0, 56
 	ldloc.1
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x01057b24: 0x1057b24: bne   a3, a2, 0x1057b44 addiu v1, v1, 56
+// 0x01057b34: 0x1057b34: bne   a3, a2, 0x1057b54 addiu v1, v1, 56
 	ldloc 4
 	ldloc.3
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc 7
-	bne.un L_1057b44
+	bne.un L_1057b54
 // --- basic block ---
-// 0x01057b2c: 0x1057b2c: addiu a1, a1, 1
+// 0x01057b3c: 0x1057b3c: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-L_1057b30:
-// 0x01057b30: 0x1057b30: lw    t0, 332(sp)
+L_1057b40:
+// 0x01057b40: 0x1057b40: lw    t0, 332(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2678,25 +2678,25 @@ L_1057b30:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01057b34: 0x1057b34: sll   zero, zero, 0
-// 0x01057b38: 0x1057b38: slt   a3, a1, t0
+// 0x01057b44: 0x1057b44: sll   zero, zero, 0
+// 0x01057b48: 0x1057b48: slt   a3, a1, t0
 	ldloc.2
 	ldloc 9
 	clt
 	stloc 4
-// 0x01057b3c: 0x1057b3c: bne   a3, zero, 0x1057b10 slt   a3, a1, v0
+// 0x01057b4c: 0x1057b4c: bne   a3, zero, 0x1057b20 slt   a3, a1, v0
 	ldloc 4
 	ldloc.2
 	ldloc 6
 	clt
 	stloc 4
-	brtrue L_1057b10
+	brtrue L_1057b20
 // --- basic block ---
-L_1057b44:
-// 0x01057b44: 0x1057b44: lui   v0, 0x0
+L_1057b54:
+// 0x01057b54: 0x1057b54: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01057b48: 0x1057b48: lw    v0, 1816(v0)
+// 0x01057b58: 0x1057b58: lw    v0, 1816(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2705,7 +2705,7 @@ L_1057b44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057b4c: 0x1057b4c: sw    zero, 40(sp)
+// 0x01057b5c: 0x1057b5c: sw    zero, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2714,7 +2714,7 @@ L_1057b44:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01057b50: 0x1057b50: sw    v0, 56(sp)
+// 0x01057b60: 0x1057b60: sw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2723,7 +2723,7 @@ L_1057b44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057b54: 0x1057b54: lw    v1, 24(s3)
+// 0x01057b64: 0x1057b64: lw    v1, 24(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2732,13 +2732,13 @@ L_1057b44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057b58: 0x1057b58: lh    v0, 36(s3)
+// 0x01057b68: 0x1057b68: lh    v0, 36(s3)
 	ldloc 12
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x01057b5c: 0x1057b5c: sw    v1, 52(sp)
+// 0x01057b6c: 0x1057b6c: sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2747,7 +2747,7 @@ L_1057b44:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057b60: 0x1057b60: sw    v0, 44(sp)
+// 0x01057b70: 0x1057b70: sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2756,26 +2756,26 @@ L_1057b44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057b64: 0x1057b64: lb    v0, 51(s3)
+// 0x01057b74: 0x1057b74: lb    v0, 51(s3)
 	ldloc 12
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01057b68: 0x1057b68: addiu a0, sp, 40
+// 0x01057b78: 0x1057b78: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x01057b6c: 0x1057b6c: addiu a1, sp, 80
+// 0x01057b7c: 0x1057b7c: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x01057b70: 0x1057b70: addu  a2, zero, zero
+// 0x01057b80: 0x1057b80: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01057b74: 0x1057b74: jal   0x1015174 sw    v0, 48(sp)
+// 0x01057b84: 0x1057b84: jal   0x1015184 sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2789,22 +2789,22 @@ L_1057b44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057b7c: 0x1057b7c: addiu v0, zero, 5
+// 0x01057b8c: 0x1057b8c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 6
-// 0x01057b80: 0x1057b80: bne   s6, v0, 0x1057bc8 addiu v0, zero, 13
+// 0x01057b90: 0x1057b90: bne   s6, v0, 0x1057bd8 addiu v0, zero, 13
 	ldloc 14
 	ldloc 6
 	ldc.i4.s 13
 	stloc 6
-	bne.un L_1057bc8
+	bne.un L_1057bd8
 // --- basic block ---
-// 0x01057b88: 0x1057b88: jal   0x101cd60 addu  a0, s1, zero
+// 0x01057b98: 0x1057b98: jal   0x101cd70 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2812,17 +2812,17 @@ L_1057b44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057b90: 0x1057b90: addiu v1, sp, 208
+// 0x01057ba0: 0x1057ba0: addiu v1, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
 	stloc 7
-// 0x01057b94: 0x1057b94: lw    t1, 328(sp)
+// 0x01057ba4: 0x1057ba4: lw    t1, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2831,7 +2831,7 @@ L_1057b44:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057b98: 0x1057b98: lw    t2, 336(sp)
+// 0x01057ba8: 0x1057ba8: lw    t2, 336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2840,10 +2840,10 @@ L_1057b44:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01057b9c: 0x1057b9c: lui   a1, 0x10000
+// 0x01057bac: 0x1057bac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01057ba0: 0x1057ba0: sw    v1, 16(sp)
+// 0x01057bb0: 0x1057bb0: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2852,32 +2852,32 @@ L_1057b44:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057ba4: 0x1057ba4: addiu v1, sp, 60
+// 0x01057bb4: 0x1057bb4: addiu v1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 7
-// 0x01057ba8: 0x1057ba8: addiu a1, a1, 8936
+// 0x01057bb8: 0x1057bb8: addiu a1, a1, 8932
 	ldloc.2
-	ldc.i4 8936
+	ldc.i4 8932
 	add
 	stloc.2
-// 0x01057bac: 0x1057bac: addiu a0, sp, 108
+// 0x01057bbc: 0x1057bbc: addiu a0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.1
-// 0x01057bb0: 0x1057bb0: addiu a2, s0, 1
+// 0x01057bc0: 0x1057bc0: addiu a2, s0, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01057bb4: 0x1057bb4: addiu a3, t1, 1
+// 0x01057bc4: 0x1057bc4: addiu a3, t1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01057bb8: 0x1057bb8: sw    v1, 20(sp)
+// 0x01057bc8: 0x1057bc8: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2886,7 +2886,7 @@ L_1057b44:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057bbc: 0x1057bbc: sw    v0, 24(sp)
+// 0x01057bcc: 0x1057bcc: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2895,7 +2895,7 @@ L_1057b44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057bc0: 0x1057bc0: j	 0x1057cc8 sw    t2, 28(sp)
+// 0x01057bd0: 0x1057bd0: j	 0x1057cd8 sw    t2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2904,19 +2904,19 @@ L_1057b44:
 	add
 	ldloc 17
 	stelem.i4
-	br L_1057cc8
+	br L_1057cd8
 // --- basic block ---
-L_1057bc8:
-// 0x01057bc8: 0x1057bc8: bne   s6, v0, 0x1057c04 addiu v1, sp, 208
+L_1057bd8:
+// 0x01057bd8: 0x1057bd8: bne   s6, v0, 0x1057c14 addiu v1, sp, 208
 	ldloc 14
 	ldloc 6
 	ldloc.0
 	ldc.i4 208
 	add
 	stloc 7
-	bne.un L_1057c04
+	bne.un L_1057c14
 // --- basic block ---
-// 0x01057bd0: 0x1057bd0: jal   0x101cd60 addu  a0, s1, zero
+// 0x01057be0: 0x1057be0: jal   0x101cd70 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2924,17 +2924,17 @@ L_1057bc8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057bd8: 0x1057bd8: addiu v1, sp, 208
+// 0x01057be8: 0x1057be8: addiu v1, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
 	stloc 7
-// 0x01057bdc: 0x1057bdc: lw    t3, 328(sp)
+// 0x01057bec: 0x1057bec: lw    t3, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2943,10 +2943,10 @@ L_1057bc8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01057be0: 0x1057be0: lui   a1, 0x10000
+// 0x01057bf0: 0x1057bf0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01057be4: 0x1057be4: sw    v1, 16(sp)
+// 0x01057bf4: 0x1057bf4: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2955,32 +2955,32 @@ L_1057bc8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057be8: 0x1057be8: addiu v1, sp, 60
+// 0x01057bf8: 0x1057bf8: addiu v1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 7
-// 0x01057bec: 0x1057bec: addiu a1, a1, 8956
+// 0x01057bfc: 0x1057bfc: addiu a1, a1, 8952
 	ldloc.2
-	ldc.i4 8956
+	ldc.i4 8952
 	add
 	stloc.2
-// 0x01057bf0: 0x1057bf0: addiu a0, sp, 108
+// 0x01057c00: 0x1057c00: addiu a0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.1
-// 0x01057bf4: 0x1057bf4: addiu a2, s0, 1
+// 0x01057c04: 0x1057c04: addiu a2, s0, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01057bf8: 0x1057bf8: addiu a3, t3, 1
+// 0x01057c08: 0x1057c08: addiu a3, t3, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01057bfc: 0x1057bfc: j	 0x1057cc4 sw    v1, 20(sp)
+// 0x01057c0c: 0x1057c0c: j	 0x1057cd4 sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2989,10 +2989,10 @@ L_1057bc8:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1057cc4
+	br L_1057cd4
 // --- basic block ---
-L_1057c04:
-// 0x01057c04: 0x1057c04: lw    v0, 328(sp)
+L_1057c14:
+// 0x01057c14: 0x1057c14: lw    v0, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3001,13 +3001,13 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057c08: 0x1057c08: sll   zero, zero, 0
-// 0x01057c0c: 0x1057c0c: addiu a3, v0, 1
+// 0x01057c18: 0x1057c18: sll   zero, zero, 0
+// 0x01057c1c: 0x1057c1c: addiu a3, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01057c10: 0x1057c10: lw    v0, 84(sp)
+// 0x01057c20: 0x1057c20: lw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3016,21 +3016,21 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057c14: 0x1057c14: addiu a0, sp, 60
+// 0x01057c24: 0x1057c24: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x01057c18: 0x1057c18: lb    v0, 0(v0)
+// 0x01057c28: 0x1057c28: lb    v0, 0(v0)
 	ldloc 6
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01057c1c: 0x1057c1c: addiu a2, s0, 1
+// 0x01057c2c: 0x1057c2c: addiu a2, s0, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01057c20: 0x1057c20: sw    v1, 312(sp)
+// 0x01057c30: 0x1057c30: sw    v1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3039,7 +3039,7 @@ L_1057c04:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057c24: 0x1057c24: beq   v0, zero, 0x1057c90 sw    a0, 316(sp)
+// 0x01057c34: 0x1057c34: beq   v0, zero, 0x1057ca0 sw    a0, 316(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -3049,12 +3049,12 @@ L_1057c04:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_1057c90
+	brfalse L_1057ca0
 // --- basic block ---
-// 0x01057c2c: 0x1057c2c: addu  a0, s1, zero
+// 0x01057c3c: 0x1057c3c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01057c30: 0x1057c30: sw    a2, 344(sp)
+// 0x01057c40: 0x1057c40: sw    a2, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3063,7 +3063,7 @@ L_1057c04:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01057c34: 0x1057c34: jal   0x101cd60 sw    a3, 348(sp)
+// 0x01057c44: 0x1057c44: jal   0x101cd70 sw    a3, 348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3077,20 +3077,20 @@ L_1057c04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057c3c: 0x1057c3c: lui   a0, 0x10000
+// 0x01057c4c: 0x1057c4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01057c40: 0x1057c40: addiu a0, a0, 8976
+// 0x01057c50: 0x1057c50: addiu a0, a0, 8972
 	ldloc.1
-	ldc.i4 8976
+	ldc.i4 8972
 	add
 	stloc.1
-// 0x01057c44: 0x1057c44: jal   0x101cd60 sw    v0, 352(sp)
+// 0x01057c54: 0x1057c54: jal   0x101cd70 sw    v0, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3104,12 +3104,12 @@ L_1057c04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057c4c: 0x1057c4c: sw    v0, 28(sp)
+// 0x01057c5c: 0x1057c5c: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3118,7 +3118,7 @@ L_1057c04:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057c50: 0x1057c50: lw    t0, 312(sp)
+// 0x01057c60: 0x1057c60: lw    t0, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3127,7 +3127,7 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01057c54: 0x1057c54: lw    t1, 316(sp)
+// 0x01057c64: 0x1057c64: lw    t1, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3136,7 +3136,7 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057c58: 0x1057c58: lw    v1, 352(sp)
+// 0x01057c68: 0x1057c68: lw    v1, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3145,7 +3145,7 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057c5c: 0x1057c5c: lw    v0, 84(sp)
+// 0x01057c6c: 0x1057c6c: lw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3154,10 +3154,10 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057c60: 0x1057c60: lui   a1, 0x10000
+// 0x01057c70: 0x1057c70: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01057c64: 0x1057c64: lw    a2, 344(sp)
+// 0x01057c74: 0x1057c74: lw    a2, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3166,7 +3166,7 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01057c68: 0x1057c68: lw    a3, 348(sp)
+// 0x01057c78: 0x1057c78: lw    a3, 348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3175,17 +3175,17 @@ L_1057c04:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01057c6c: 0x1057c6c: addiu a0, sp, 108
+// 0x01057c7c: 0x1057c7c: addiu a0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.1
-// 0x01057c70: 0x1057c70: addiu a1, a1, 8980
+// 0x01057c80: 0x1057c80: addiu a1, a1, 8976
 	ldloc.2
-	ldc.i4 8980
+	ldc.i4 8976
 	add
 	stloc.2
-// 0x01057c74: 0x1057c74: sw    t0, 16(sp)
+// 0x01057c84: 0x1057c84: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3194,7 +3194,7 @@ L_1057c04:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01057c78: 0x1057c78: sw    t1, 20(sp)
+// 0x01057c88: 0x1057c88: sw    t1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3203,7 +3203,7 @@ L_1057c04:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01057c7c: 0x1057c7c: sw    v1, 24(sp)
+// 0x01057c8c: 0x1057c8c: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3212,7 +3212,7 @@ L_1057c04:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057c80: 0x1057c80: jal   0x1000f64 sw    v0, 32(sp)
+// 0x01057c90: 0x1057c90: jal   0x1000f64 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3231,18 +3231,18 @@ L_1057c04:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057c88: 0x1057c88: j	 0x1057cd4 addiu a1, sp, 108
+// 0x01057c98: 0x1057c98: j	 0x1057ce4 addiu a1, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.2
-	br L_1057cd4
+	br L_1057ce4
 // --- basic block ---
-L_1057c90:
-// 0x01057c90: 0x1057c90: addu  a0, s1, zero
+L_1057ca0:
+// 0x01057ca0: 0x1057ca0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01057c94: 0x1057c94: sw    a2, 344(sp)
+// 0x01057ca4: 0x1057ca4: sw    a2, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3251,7 +3251,7 @@ L_1057c90:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01057c98: 0x1057c98: jal   0x101cd60 sw    a3, 348(sp)
+// 0x01057ca8: 0x1057ca8: jal   0x101cd70 sw    a3, 348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3265,12 +3265,12 @@ L_1057c90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057ca0: 0x1057ca0: lw    t2, 312(sp)
+// 0x01057cb0: 0x1057cb0: lw    t2, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3279,7 +3279,7 @@ L_1057c90:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01057ca4: 0x1057ca4: lw    t3, 316(sp)
+// 0x01057cb4: 0x1057cb4: lw    t3, 316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3288,10 +3288,10 @@ L_1057c90:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01057ca8: 0x1057ca8: lui   a1, 0x10000
+// 0x01057cb8: 0x1057cb8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01057cac: 0x1057cac: lw    a2, 344(sp)
+// 0x01057cbc: 0x1057cbc: lw    a2, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3300,7 +3300,7 @@ L_1057c90:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01057cb0: 0x1057cb0: lw    a3, 348(sp)
+// 0x01057cc0: 0x1057cc0: lw    a3, 348(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3309,17 +3309,17 @@ L_1057c90:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01057cb4: 0x1057cb4: addiu a0, sp, 108
+// 0x01057cc4: 0x1057cc4: addiu a0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.1
-// 0x01057cb8: 0x1057cb8: addiu a1, a1, 8956
+// 0x01057cc8: 0x1057cc8: addiu a1, a1, 8952
 	ldloc.2
-	ldc.i4 8956
+	ldc.i4 8952
 	add
 	stloc.2
-// 0x01057cbc: 0x1057cbc: sw    t2, 16(sp)
+// 0x01057ccc: 0x1057ccc: sw    t2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3328,7 +3328,7 @@ L_1057c90:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01057cc0: 0x1057cc0: sw    t3, 20(sp)
+// 0x01057cd0: 0x1057cd0: sw    t3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3337,8 +3337,8 @@ L_1057c90:
 	add
 	ldloc 15
 	stelem.i4
-L_1057cc4:
-// 0x01057cc4: 0x1057cc4: sw    v0, 24(sp)
+L_1057cd4:
+// 0x01057cd4: 0x1057cd4: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3347,8 +3347,8 @@ L_1057cc4:
 	add
 	ldloc 6
 	stelem.i4
-L_1057cc8:
-// 0x01057cc8: 0x1057cc8: jal   0x1000f64 sll   zero, zero, 0
+L_1057cd8:
+// 0x01057cd8: 0x1057cd8: jal   0x1000f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3359,21 +3359,21 @@ L_1057cc8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057cd0: 0x1057cd0: addiu a1, sp, 108
+// 0x01057ce0: 0x1057ce0: addiu a1, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.2
-L_1057cd4:
-// 0x01057cd4: 0x1057cd4: addu  a0, a1, zero
+L_1057ce4:
+// 0x01057ce4: 0x1057ce4: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01057cd8: 0x1057cd8: sll   v1, s0, 2
+// 0x01057ce8: 0x1057ce8: sll   v1, s0, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01057cdc: 0x1057cdc: sw    a1, 344(sp)
+// 0x01057cec: 0x1057cec: sw    a1, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3382,7 +3382,7 @@ L_1057cd4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01057ce0: 0x1057ce0: jal   0x1001ba8 sw    v1, 352(sp)
+// 0x01057cf0: 0x1057cf0: jal   0x1001ba8 sw    v1, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3401,7 +3401,7 @@ L_1057cd4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057ce8: 0x1057ce8: lw    v1, 352(sp)
+// 0x01057cf8: 0x1057cf8: lw    v1, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3410,43 +3410,43 @@ L_1057cd4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057cec: 0x1057cec: lui   a3, 0x70000
+// 0x01057cfc: 0x1057cfc: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01057cf0: 0x1057cf0: addiu a3, a3, 10764
+// 0x01057d00: 0x1057d00: addiu a3, a3, 11228
 	ldloc 4
-	ldc.i4 10764
+	ldc.i4 11228
 	add
 	stloc 4
-// 0x01057cf4: 0x1057cf4: lui   t0, 0x70000
+// 0x01057d04: 0x1057d04: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01057cf8: 0x1057cf8: addu  a2, v1, a3
+// 0x01057d08: 0x1057d08: addu  a2, v1, a3
 	ldloc 7
 	ldloc 4
 	add
 	stloc.3
-// 0x01057cfc: 0x1057cfc: addiu t0, t0, 11164
+// 0x01057d0c: 0x1057d0c: addiu t0, t0, 11628
 	ldloc 9
-	ldc.i4 11164
+	ldc.i4 11628
 	add
 	stloc 9
-// 0x01057d00: 0x1057d00: addu  v1, v1, t0
+// 0x01057d10: 0x1057d10: addu  v1, v1, t0
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-// 0x01057d04: 0x1057d04: sw    v0, 0(a2)
+// 0x01057d14: 0x1057d14: sw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01057d08: 0x1057d08: addiu a0, zero, 20
+// 0x01057d18: 0x1057d18: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x01057d0c: 0x1057d0c: jal   0x1000910 sw    v1, 312(sp)
+// 0x01057d1c: 0x1057d1c: jal   0x1000910 sw    v1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3465,7 +3465,7 @@ L_1057cd4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057d14: 0x1057d14: lw    a1, 344(sp)
+// 0x01057d24: 0x1057d24: lw    a1, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3474,7 +3474,7 @@ L_1057cd4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057d18: 0x1057d18: lw    t1, 312(sp)
+// 0x01057d28: 0x1057d28: lw    t1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3483,17 +3483,17 @@ L_1057cd4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057d1c: 0x1057d1c: addu  a0, a1, zero
+// 0x01057d2c: 0x1057d2c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01057d20: 0x1057d20: sw    v0, 0(t1)
+// 0x01057d30: 0x1057d30: sw    v0, 0(t1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01057d24: 0x1057d24: jal   0x1001ba8 sw    v0, 352(sp)
+// 0x01057d34: 0x1057d34: jal   0x1001ba8 sw    v0, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3512,15 +3512,15 @@ L_1057cd4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057d2c: 0x1057d2c: addiu a0, zero, 40
+// 0x01057d3c: 0x1057d3c: addiu a0, zero, 40
 	ldc.i4.s 40
 	stloc.1
-// 0x01057d30: 0x1057d30: mult  s6, a0
+// 0x01057d40: 0x1057d40: mult  s6, a0
 	ldloc 14
 	ldloc.1
 	mul
 	stloc 16
-// 0x01057d34: 0x1057d34: lw    a1, 312(sp)
+// 0x01057d44: 0x1057d44: lw    a1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3529,17 +3529,17 @@ L_1057cd4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057d38: 0x1057d38: lui   a2, 0x20000
+// 0x01057d48: 0x1057d48: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01057d3c: 0x1057d3c: lw    a0, 0(a1)
+// 0x01057d4c: 0x1057d4c: lw    a0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01057d40: 0x1057d40: lw    v1, 352(sp)
+// 0x01057d50: 0x1057d50: lw    v1, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3548,19 +3548,19 @@ L_1057cd4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057d44: 0x1057d44: addiu a2, a2, 27996
+// 0x01057d54: 0x1057d54: addiu a2, a2, 28460
 	ldloc.3
-	ldc.i4 27996
+	ldc.i4 28460
 	add
 	stloc.3
-// 0x01057d48: 0x1057d48: sw    v0, 0(v1)
+// 0x01057d58: 0x1057d58: sw    v0, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01057d4c: 0x1057d4c: sw    s0, 8(a0)
+// 0x01057d5c: 0x1057d5c: sw    s0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3569,18 +3569,18 @@ L_1057cd4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01057d50: 0x1057d50: addiu v0, zero, 1
+// 0x01057d60: 0x1057d60: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01057d54: 0x1057d54: mflo  lo
+// 0x01057d64: 0x1057d64: mflo  lo
 	ldloc 16
 	stloc 14
-// 0x01057d58: 0x1057d58: addu  s6, a2, s6
+// 0x01057d68: 0x1057d68: addu  s6, a2, s6
 	ldloc.3
 	ldloc 14
 	add
 	stloc 14
-// 0x01057d5c: 0x1057d5c: sw    s6, 4(a0)
+// 0x01057d6c: 0x1057d6c: sw    s6, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3589,28 +3589,28 @@ L_1057cd4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01057d60: 0x1057d60: lb    v1, 50(s3)
+// 0x01057d70: 0x1057d70: lb    v1, 50(s3)
 	ldloc 12
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01057d64: 0x1057d64: sll   zero, zero, 0
-// 0x01057d68: 0x1057d68: bne   v1, v0, 0x1057d80 lui   a3, 0x70000
+// 0x01057d74: 0x1057d74: sll   zero, zero, 0
+// 0x01057d78: 0x1057d78: bne   v1, v0, 0x1057d90 lui   a3, 0x70000
 	ldloc 7
 	ldloc 6
 	ldc.i4 458752
 	stloc 4
-	bne.un L_1057d80
+	bne.un L_1057d90
 // --- basic block ---
-// 0x01057d70: 0x1057d70: lw    v1, 0(s3)
+// 0x01057d80: 0x1057d80: lw    v1, 0(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01057d74: 0x1057d74: lw    v0, 4(s3)
+// 0x01057d84: 0x1057d84: lw    v0, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -3619,7 +3619,7 @@ L_1057cd4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057d78: 0x1057d78: j	 0x1057d90 sw    v0, 16(a0)
+// 0x01057d88: 0x1057d88: j	 0x1057da0 sw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3628,10 +3628,10 @@ L_1057cd4:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1057d90
+	br L_1057da0
 // --- basic block ---
-L_1057d80:
-// 0x01057d80: 0x1057d80: lw    v1, 8(s3)
+L_1057d90:
+// 0x01057d90: 0x1057d90: lw    v1, 8(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -3640,7 +3640,7 @@ L_1057d80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057d84: 0x1057d84: lw    v0, 12(s3)
+// 0x01057d94: 0x1057d94: lw    v0, 12(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -3649,8 +3649,8 @@ L_1057d80:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057d88: 0x1057d88: sll   zero, zero, 0
-// 0x01057d8c: 0x1057d8c: sw    v0, 16(a0)
+// 0x01057d98: 0x1057d98: sll   zero, zero, 0
+// 0x01057d9c: 0x1057d9c: sw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3659,23 +3659,23 @@ L_1057d80:
 	add
 	ldloc 6
 	stelem.i4
-L_1057d90:
-// 0x01057d90: 0x1057d90: addiu a3, a3, 11564
+L_1057da0:
+// 0x01057da0: 0x1057da0: addiu a3, a3, 12028
 	ldloc 4
-	ldc.i4 11564
+	ldc.i4 12028
 	add
 	stloc 4
-// 0x01057d94: 0x1057d94: sll   v0, s0, 2
+// 0x01057da4: 0x1057da4: sll   v0, s0, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01057d98: 0x1057d98: addu  v0, v0, a3
+// 0x01057da8: 0x1057da8: addu  v0, v0, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 6
-// 0x01057d9c: 0x1057d9c: sw    v1, 12(a0)
+// 0x01057dac: 0x1057dac: sw    v1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3684,27 +3684,27 @@ L_1057d90:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057da0: 0x1057da0: sw    s6, 0(v0)
+// 0x01057db0: 0x1057db0: sw    s6, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-// 0x01057da4: 0x1057da4: j	 0x1057ed0 addiu v1, s0, 1
+// 0x01057db4: 0x1057db4: j	 0x1057ee0 addiu v1, s0, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 7
-	br L_1057ed0
+	br L_1057ee0
 // --- basic block ---
-L_1057dac:
-// 0x01057dac: 0x1057dac: lui   a0, 0x10000
+L_1057dbc:
+// 0x01057dbc: 0x1057dbc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01057db0: 0x1057db0: jal   0x101cd60 addiu a0, a0, 9004
+// 0x01057dc0: 0x1057dc0: jal   0x101cd70 addiu a0, a0, 9000
 	ldloc.1
-	ldc.i4 9004
+	ldc.i4 9000
 	add
 	stloc.1
 	ldloc.0
@@ -3712,15 +3712,15 @@ L_1057dac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057db8: 0x1057db8: addu  a0, s1, zero
+// 0x01057dc8: 0x1057dc8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01057dbc: 0x1057dbc: jal   0x101cd60 sw    v0, 344(sp)
+// 0x01057dcc: 0x1057dcc: jal   0x101cd70 sw    v0, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3734,12 +3734,12 @@ L_1057dac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057dc4: 0x1057dc4: lw    t0, 344(sp)
+// 0x01057dd4: 0x1057dd4: lw    t0, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3748,7 +3748,7 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01057dc8: 0x1057dc8: lw    t1, 328(sp)
+// 0x01057dd8: 0x1057dd8: lw    t1, 328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3757,12 +3757,12 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057dcc: 0x1057dcc: addiu v1, s0, 1
+// 0x01057ddc: 0x1057ddc: addiu v1, s0, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01057dd0: 0x1057dd0: sw    t0, 16(sp)
+// 0x01057de0: 0x1057de0: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3771,33 +3771,33 @@ L_1057dac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01057dd4: 0x1057dd4: lui   a1, 0x10000
+// 0x01057de4: 0x1057de4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01057dd8: 0x1057dd8: addiu t0, sp, 208
+// 0x01057de8: 0x1057de8: addiu t0, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
 	stloc 9
-// 0x01057ddc: 0x1057ddc: addu  a2, v1, zero
+// 0x01057dec: 0x1057dec: addu  a2, v1, zero
 	ldloc 7
 	stloc.3
-// 0x01057de0: 0x1057de0: addiu a3, t1, 1
+// 0x01057df0: 0x1057df0: addiu a3, t1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01057de4: 0x1057de4: addiu a1, a1, 9016
+// 0x01057df4: 0x1057df4: addiu a1, a1, 9012
 	ldloc.2
-	ldc.i4 9016
+	ldc.i4 9012
 	add
 	stloc.2
-// 0x01057de8: 0x1057de8: addiu a0, sp, 108
+// 0x01057df8: 0x1057df8: addiu a0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.1
-// 0x01057dec: 0x1057dec: sw    t0, 20(sp)
+// 0x01057dfc: 0x1057dfc: sw    t0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3806,12 +3806,12 @@ L_1057dac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01057df0: 0x1057df0: addiu t0, sp, 60
+// 0x01057e00: 0x1057e00: addiu t0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 9
-// 0x01057df4: 0x1057df4: sw    v1, 352(sp)
+// 0x01057e04: 0x1057e04: sw    v1, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3820,7 +3820,7 @@ L_1057dac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01057df8: 0x1057df8: sw    t0, 24(sp)
+// 0x01057e08: 0x1057e08: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3829,7 +3829,7 @@ L_1057dac:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01057dfc: 0x1057dfc: jal   0x1000f64 sw    v0, 28(sp)
+// 0x01057e0c: 0x1057e0c: jal   0x1000f64 sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3848,17 +3848,17 @@ L_1057dac:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057e04: 0x1057e04: sll   a1, s0, 2
+// 0x01057e14: 0x1057e14: sll   a1, s0, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01057e08: 0x1057e08: addiu a0, sp, 108
+// 0x01057e18: 0x1057e18: addiu a0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.1
-// 0x01057e0c: 0x1057e0c: jal   0x1001ba8 sw    a1, 344(sp)
+// 0x01057e1c: 0x1057e1c: jal   0x1001ba8 sw    a1, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3877,7 +3877,7 @@ L_1057dac:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057e14: 0x1057e14: lw    a1, 344(sp)
+// 0x01057e24: 0x1057e24: lw    a1, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3886,43 +3886,43 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057e18: 0x1057e18: lui   t2, 0x70000
+// 0x01057e28: 0x1057e28: lui   t2, 0x70000
 	ldc.i4 458752
 	stloc 17
-// 0x01057e1c: 0x1057e1c: addiu t2, t2, 10764
+// 0x01057e2c: 0x1057e2c: addiu t2, t2, 11228
 	ldloc 17
-	ldc.i4 10764
+	ldc.i4 11228
 	add
 	stloc 17
-// 0x01057e20: 0x1057e20: lui   t3, 0x70000
+// 0x01057e30: 0x1057e30: lui   t3, 0x70000
 	ldc.i4 458752
 	stloc 15
-// 0x01057e24: 0x1057e24: addu  a2, a1, t2
+// 0x01057e34: 0x1057e34: addu  a2, a1, t2
 	ldloc.2
 	ldloc 17
 	add
 	stloc.3
-// 0x01057e28: 0x1057e28: addiu t3, t3, 11164
+// 0x01057e38: 0x1057e38: addiu t3, t3, 11628
 	ldloc 15
-	ldc.i4 11164
+	ldc.i4 11628
 	add
 	stloc 15
-// 0x01057e2c: 0x1057e2c: addu  a1, a1, t3
+// 0x01057e3c: 0x1057e3c: addu  a1, a1, t3
 	ldloc.2
 	ldloc 15
 	add
 	stloc.2
-// 0x01057e30: 0x1057e30: sw    v0, 0(a2)
+// 0x01057e40: 0x1057e40: sw    v0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01057e34: 0x1057e34: addiu a0, zero, 20
+// 0x01057e44: 0x1057e44: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x01057e38: 0x1057e38: jal   0x1000910 sw    a1, 312(sp)
+// 0x01057e48: 0x1057e48: jal   0x1000910 sw    a1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3941,10 +3941,10 @@ L_1057dac:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057e40: 0x1057e40: addu  a1, v0, zero
+// 0x01057e50: 0x1057e50: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01057e44: 0x1057e44: lw    v0, 312(sp)
+// 0x01057e54: 0x1057e54: lw    v0, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3953,19 +3953,19 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057e48: 0x1057e48: addiu a0, sp, 108
+// 0x01057e58: 0x1057e58: addiu a0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.1
-// 0x01057e4c: 0x1057e4c: sw    a1, 0(v0)
+// 0x01057e5c: 0x1057e5c: sw    a1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01057e50: 0x1057e50: jal   0x1001ba8 sw    a1, 344(sp)
+// 0x01057e60: 0x1057e60: jal   0x1001ba8 sw    a1, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3984,15 +3984,15 @@ L_1057dac:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01057e58: 0x1057e58: addiu a0, zero, 40
+// 0x01057e68: 0x1057e68: addiu a0, zero, 40
 	ldc.i4.s 40
 	stloc.1
-// 0x01057e5c: 0x1057e5c: mult  s6, a0
+// 0x01057e6c: 0x1057e6c: mult  s6, a0
 	ldloc 14
 	ldloc.1
 	mul
 	stloc 16
-// 0x01057e60: 0x1057e60: lw    a2, 312(sp)
+// 0x01057e70: 0x1057e70: lw    a2, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4001,17 +4001,17 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01057e64: 0x1057e64: lui   a3, 0x20000
+// 0x01057e74: 0x1057e74: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01057e68: 0x1057e68: lw    a0, 0(a2)
+// 0x01057e78: 0x1057e78: lw    a0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01057e6c: 0x1057e6c: lw    a1, 344(sp)
+// 0x01057e7c: 0x1057e7c: lw    a1, 344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4020,19 +4020,19 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057e70: 0x1057e70: addiu a3, a3, 27996
+// 0x01057e80: 0x1057e80: addiu a3, a3, 28460
 	ldloc 4
-	ldc.i4 27996
+	ldc.i4 28460
 	add
 	stloc 4
-// 0x01057e74: 0x1057e74: sw    v0, 0(a1)
+// 0x01057e84: 0x1057e84: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01057e78: 0x1057e78: sw    s0, 8(a0)
+// 0x01057e88: 0x1057e88: sw    s0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4041,10 +4041,10 @@ L_1057dac:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01057e7c: 0x1057e7c: addiu v0, zero, 1
+// 0x01057e8c: 0x1057e8c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01057e80: 0x1057e80: lw    v1, 352(sp)
+// 0x01057e90: 0x1057e90: lw    v1, 352(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4053,15 +4053,15 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01057e84: 0x1057e84: mflo  lo
+// 0x01057e94: 0x1057e94: mflo  lo
 	ldloc 16
 	stloc 14
-// 0x01057e88: 0x1057e88: addu  s6, a3, s6
+// 0x01057e98: 0x1057e98: addu  s6, a3, s6
 	ldloc 4
 	ldloc 14
 	add
 	stloc 14
-// 0x01057e8c: 0x1057e8c: sw    s6, 4(a0)
+// 0x01057e9c: 0x1057e9c: sw    s6, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4070,21 +4070,21 @@ L_1057dac:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01057e90: 0x1057e90: lb    a1, 50(s2)
+// 0x01057ea0: 0x1057ea0: lb    a1, 50(s2)
 	ldloc 11
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01057e94: 0x1057e94: sll   zero, zero, 0
-// 0x01057e98: 0x1057e98: bne   a1, v0, 0x1057eb0 lui   t0, 0x70000
+// 0x01057ea4: 0x1057ea4: sll   zero, zero, 0
+// 0x01057ea8: 0x1057ea8: bne   a1, v0, 0x1057ec0 lui   t0, 0x70000
 	ldloc.2
 	ldloc 6
 	ldc.i4 458752
 	stloc 9
-	bne.un L_1057eb0
+	bne.un L_1057ec0
 // --- basic block ---
-// 0x01057ea0: 0x1057ea0: lw    a1, 8(s2)
+// 0x01057eb0: 0x1057eb0: lw    a1, 8(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4093,7 +4093,7 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01057ea4: 0x1057ea4: lw    v0, 12(s2)
+// 0x01057eb4: 0x1057eb4: lw    v0, 12(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4102,22 +4102,22 @@ L_1057dac:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057ea8: 0x1057ea8: j	 0x1057ebc sll   s0, s0, 2
+// 0x01057eb8: 0x1057eb8: j	 0x1057ecc sll   s0, s0, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc 13
-	br L_1057ebc
+	br L_1057ecc
 // --- basic block ---
-L_1057eb0:
-// 0x01057eb0: 0x1057eb0: lw    a1, 0(s2)
+L_1057ec0:
+// 0x01057ec0: 0x1057ec0: lw    a1, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01057eb4: 0x1057eb4: lw    v0, 4(s2)
+// 0x01057ec4: 0x1057ec4: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4126,23 +4126,23 @@ L_1057eb0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01057eb8: 0x1057eb8: sll   s0, s0, 2
+// 0x01057ec8: 0x1057ec8: sll   s0, s0, 2
 	ldloc 13
 	ldc.i4.2
 	shl
 	stloc 13
-L_1057ebc:
-// 0x01057ebc: 0x1057ebc: addiu t0, t0, 11564
+L_1057ecc:
+// 0x01057ecc: 0x1057ecc: addiu t0, t0, 12028
 	ldloc 9
-	ldc.i4 11564
+	ldc.i4 12028
 	add
 	stloc 9
-// 0x01057ec0: 0x1057ec0: addu  s0, s0, t0
+// 0x01057ed0: 0x1057ed0: addu  s0, s0, t0
 	ldloc 13
 	ldloc 9
 	add
 	stloc 13
-// 0x01057ec4: 0x1057ec4: sw    a1, 12(a0)
+// 0x01057ed4: 0x1057ed4: sw    a1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4151,7 +4151,7 @@ L_1057ebc:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01057ec8: 0x1057ec8: sw    v0, 16(a0)
+// 0x01057ed8: 0x1057ed8: sw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4160,15 +4160,15 @@ L_1057ebc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01057ecc: 0x1057ecc: sw    s6, 0(s0)
+// 0x01057edc: 0x1057edc: sw    s6, 0(s0)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-L_1057ed0:
-// 0x01057ed0: 0x1057ed0: lw    t1, 324(sp)
+L_1057ee0:
+// 0x01057ee0: 0x1057ee0: lw    t1, 324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4177,48 +4177,48 @@ L_1057ed0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01057ed4: 0x1057ed4: sll   zero, zero, 0
-// 0x01057ed8: 0x1057ed8: beq   s4, t1, 0x1057efc addu  s0, v1, zero
+// 0x01057ee4: 0x1057ee4: sll   zero, zero, 0
+// 0x01057ee8: 0x1057ee8: beq   s4, t1, 0x1057f0c addu  s0, v1, zero
 	ldloc 18
 	ldloc 10
 	ldloc 7
 	stloc 13
-	beq  L_1057efc
+	beq  L_1057f0c
 // --- basic block ---
-// 0x01057ee0: 0x1057ee0: lh    a0, 44(s2)
+// 0x01057ef0: 0x1057ef0: lh    a0, 44(s2)
 	ldloc 11
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01057ee4: 0x1057ee4: lh    v0, 44(s3)
+// 0x01057ef4: 0x1057ef4: lh    v0, 44(s3)
 	ldloc 12
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x01057ee8: 0x1057ee8: sll   zero, zero, 0
-// 0x01057eec: 0x1057eec: xor   v0, a0, v0
+// 0x01057ef8: 0x1057ef8: sll   zero, zero, 0
+// 0x01057efc: 0x1057efc: xor   v0, a0, v0
 	ldloc.1
 	ldloc 6
 	xor
 	stloc 6
-// 0x01057ef0: 0x1057ef0: sltiu v0, v0, 1
+// 0x01057f00: 0x1057f00: sltiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 6
-// 0x01057ef4: 0x1057ef4: subu  v0, zero, v0
+// 0x01057f04: 0x1057f04: subu  v0, zero, v0
 	ldloc 6
 	neg
 	stloc 6
-// 0x01057ef8: 0x1057ef8: and   s5, s5, v0
+// 0x01057f08: 0x1057f08: and   s5, s5, v0
 	ldloc 20
 	ldloc 6
 	and
 	stloc 20
-L_1057efc:
-// 0x01057efc: 0x1057efc: lw    t2, 320(sp)
+L_1057f0c:
+// 0x01057f0c: 0x1057f0c: lw    t2, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4227,27 +4227,27 @@ L_1057efc:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01057f00: 0x1057f00: addiu s4, s4, 1
+// 0x01057f10: 0x1057f10: addiu s4, s4, 1
 	ldloc 18
 	ldc.i4.1
 	add
 	stloc 18
-// 0x01057f04: 0x1057f04: addiu t2, t2, 56
+// 0x01057f14: 0x1057f14: addiu t2, t2, 56
 	ldloc 17
 	ldc.i4.s 56
 	add
 	stloc 17
-// 0x01057f08: 0x1057f08: addiu s7, s7, 1
+// 0x01057f18: 0x1057f18: addiu s7, s7, 1
 	ldloc 19
 	ldc.i4.1
 	add
 	stloc 19
-// 0x01057f0c: 0x1057f0c: addiu s8, s8, 56
+// 0x01057f1c: 0x1057f1c: addiu s8, s8, 56
 	ldloc 22
 	ldc.i4.s 56
 	add
 	stloc 22
-// 0x01057f10: 0x1057f10: sw    t2, 320(sp)
+// 0x01057f20: 0x1057f20: sw    t2, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4256,8 +4256,8 @@ L_1057efc:
 	add
 	ldloc 17
 	stelem.i4
-L_1057f14:
-// 0x01057f14: 0x1057f14: lw    t3, 332(sp)
+L_1057f24:
+// 0x01057f24: 0x1057f24: lw    t3, 332(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4266,101 +4266,101 @@ L_1057f14:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01057f18: 0x1057f18: sll   zero, zero, 0
-// 0x01057f1c: 0x1057f1c: slt   v0, s4, t3
+// 0x01057f28: 0x1057f28: sll   zero, zero, 0
+// 0x01057f2c: 0x1057f2c: slt   v0, s4, t3
 	ldloc 18
 	ldloc 15
 	clt
 	stloc 6
-// 0x01057f20: 0x1057f20: bne   v0, zero, 0x10577e8 lui   v1, 0x70000
+// 0x01057f30: 0x1057f30: bne   v0, zero, 0x10577f8 lui   v1, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 7
-	brtrue L_10577e8
+	brtrue L_10577f8
 // --- basic block ---
-L_1057f28:
-// 0x01057f28: 0x1057f28: lui   v0, 0x70000
+L_1057f38:
+// 0x01057f38: 0x1057f38: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01057f2c: 0x1057f2c: lui   t0, 0x70000
+// 0x01057f3c: 0x1057f3c: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01057f30: 0x1057f30: lui   a3, 0x70000
+// 0x01057f40: 0x1057f40: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01057f34: 0x1057f34: lui   a2, 0x70000
+// 0x01057f44: 0x1057f44: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01057f38: 0x1057f38: lui   a1, 0x1060000
+// 0x01057f48: 0x1057f48: lui   a1, 0x1060000
 	ldc.i4 17170432
 	stloc.2
-// 0x01057f3c: 0x1057f3c: lui   a0, 0x10000
+// 0x01057f4c: 0x1057f4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01057f40: 0x1057f40: sw    s0, 11968(v0)
+// 0x01057f50: 0x1057f50: sw    s0, 12432(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2992
+	ldc.i4 3108
 	add
 	ldloc 13
 	stelem.i4
-// 0x01057f44: 0x1057f44: addu  v1, zero, zero
+// 0x01057f54: 0x1057f54: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01057f48: 0x1057f48: addiu t0, t0, 11564
+// 0x01057f58: 0x1057f58: addiu t0, t0, 12028
 	ldloc 9
-	ldc.i4 11564
+	ldc.i4 12028
 	add
 	stloc 9
-// 0x01057f4c: 0x1057f4c: addiu a3, a3, 11164
+// 0x01057f5c: 0x1057f5c: addiu a3, a3, 11628
 	ldloc 4
-	ldc.i4 11164
+	ldc.i4 11628
 	add
 	stloc 4
-// 0x01057f50: 0x1057f50: addiu a2, a2, 10764
+// 0x01057f60: 0x1057f60: addiu a2, a2, 11228
 	ldloc.3
-	ldc.i4 10764
+	ldc.i4 11228
 	add
 	stloc.3
-// 0x01057f54: 0x1057f54: addiu a1, a1, -32352
+// 0x01057f64: 0x1057f64: addiu a1, a1, -32336
 	ldloc.2
-	ldc.i4 -32352
+	ldc.i4 -32336
 	add
 	stloc.2
-// 0x01057f58: 0x1057f58: addiu a0, a0, -17956
+// 0x01057f68: 0x1057f68: addiu a0, a0, -17956
 	ldloc.1
 	ldc.i4 -17956
 	add
 	stloc.1
-// 0x01057f5c: 0x1057f5c: cibyl_sysc_arg 0x4
+// 0x01057f6c: 0x1057f6c: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01057f60: 0x1057f60: cibyl_sysc_arg 0x5
+// 0x01057f70: 0x1057f70: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01057f64: 0x1057f64: cibyl_sysc_arg 0x10
+// 0x01057f74: 0x1057f74: cibyl_sysc_arg 0x10
 	ldloc 13
-// 0x01057f68: 0x1057f68: cibyl_sysc_arg 0x6
+// 0x01057f78: 0x1057f78: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x01057f6c: 0x1057f6c: cibyl_sysc_arg 0x7
+// 0x01057f7c: 0x1057f7c: cibyl_sysc_arg 0x7
 	ldloc 4
-// 0x01057f70: 0x1057f70: cibyl_sysc_arg 0x8
+// 0x01057f80: 0x1057f80: cibyl_sysc_arg 0x8
 	ldloc 9
-// 0x01057f74: 0x1057f74: cibyl_sysc_arg 0x3
+// 0x01057f84: 0x1057f84: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01057f78: 0x1057f78: cibyl_sysc_arg 0x3
+// 0x01057f88: 0x1057f88: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01057f7c: 0x1057f7c: cibyl_sysc_arg 0x3
+// 0x01057f8c: 0x1057f8c: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01057f80: 0x1057f80: cibyl_sysc_arg 0x3
+// 0x01057f90: 0x1057f90: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01057f84: 0x1057f84: cibyl_sysc 0x2022
+// 0x01057f94: 0x1057f94: cibyl_sysc 0x2022
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_showDialog(int32,int32,int32,int32,int32,int32,int32,int32,int32,int32)
-// 0x01057f88: 0x1057f88: addu  v1, v0, zero
+// 0x01057f98: 0x1057f98: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x01057f8c: 0x1057f8c: lw    ra, 396(sp)
-// 0x01057f90: 0x1057f90: lw    s8, 392(sp)
+// 0x01057f9c: 0x1057f9c: lw    ra, 396(sp)
+// 0x01057fa0: 0x1057fa0: lw    s8, 392(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4369,7 +4369,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 22
-// 0x01057f94: 0x1057f94: lw    s7, 388(sp)
+// 0x01057fa4: 0x1057fa4: lw    s7, 388(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4378,7 +4378,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01057f98: 0x1057f98: lw    s6, 384(sp)
+// 0x01057fa8: 0x1057fa8: lw    s6, 384(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4387,7 +4387,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01057f9c: 0x1057f9c: lw    s5, 380(sp)
+// 0x01057fac: 0x1057fac: lw    s5, 380(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4396,7 +4396,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01057fa0: 0x1057fa0: lw    s4, 376(sp)
+// 0x01057fb0: 0x1057fb0: lw    s4, 376(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4405,7 +4405,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01057fa4: 0x1057fa4: lw    s3, 372(sp)
+// 0x01057fb4: 0x1057fb4: lw    s3, 372(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4414,7 +4414,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01057fa8: 0x1057fa8: lw    s2, 368(sp)
+// 0x01057fb8: 0x1057fb8: lw    s2, 368(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4423,7 +4423,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01057fac: 0x1057fac: lw    s1, 364(sp)
+// 0x01057fbc: 0x1057fbc: lw    s1, 364(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4432,7 +4432,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01057fb0: 0x1057fb0: lw    s0, 360(sp)
+// 0x01057fc0: 0x1057fc0: lw    s0, 360(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4441,7 +4441,7 @@ L_1057f28:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01057fb4: 0x1057fb4: jr    ra addiu sp, sp, 400
+// 0x01057fc4: 0x1057fc4: jr    ra addiu sp, sp, 400
 	ldloc.0
 	ldc.i4 400
 	add
@@ -4451,47 +4451,47 @@ L_1057f28:
 __CIBYL_local_jumptab:
 	stloc 6
 	ldloc 6
-	ldc.i4 17135136
-	beq  L_1057620
+	ldc.i4 17135152
+	beq  L_1057630
 	ldloc 6
-	ldc.i4 17135740
-	beq  L_105787c
+	ldc.i4 17135756
+	beq  L_105788c
 	ldloc 6
-	ldc.i4 17135752
-	beq  L_1057888
+	ldc.i4 17135768
+	beq  L_1057898
 	ldloc 6
-	ldc.i4 17135764
-	beq  L_1057894
+	ldc.i4 17135780
+	beq  L_10578a4
 	ldloc 6
-	ldc.i4 17135776
-	beq  L_10578a0
+	ldc.i4 17135792
+	beq  L_10578b0
 	ldloc 6
-	ldc.i4 17135788
-	beq  L_10578ac
+	ldc.i4 17135804
+	beq  L_10578bc
 	ldloc 6
-	ldc.i4 17135800
-	beq  L_10578b8
+	ldc.i4 17135816
+	beq  L_10578c8
 	ldloc 6
-	ldc.i4 17135812
-	beq  L_10578c4
+	ldc.i4 17135828
+	beq  L_10578d4
 	ldloc 6
-	ldc.i4 17135824
-	beq  L_10578d0
+	ldc.i4 17135840
+	beq  L_10578e0
 	ldloc 6
-	ldc.i4 17135836
-	beq  L_10578dc
+	ldc.i4 17135852
+	beq  L_10578ec
 	ldloc 6
-	ldc.i4 17135848
-	beq  L_10578e8
+	ldc.i4 17135864
+	beq  L_10578f8
 	ldloc 6
-	ldc.i4 17135868
-	beq  L_10578fc
+	ldc.i4 17135884
+	beq  L_105790c
 	ldloc 6
-	ldc.i4 17135880
-	beq  L_1057908
+	ldc.i4 17135896
+	beq  L_1057918
 	ldloc 6
-	ldc.i4 17135888
-	beq  L_1057910
+	ldc.i4 17135904
+	beq  L_1057920
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -4499,7 +4499,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 display_pop_up_1057fbc(int32,int32,int32,int32,int32)
+.method public static int32 display_pop_up_1057fcc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -4549,13 +4549,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01057fbc: 0x1057fbc: addiu sp, sp, -64
+// 0x01057fcc: 0x1057fcc: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01057fc0: 0x1057fc0: sw    ra, 60(sp)
-// 0x01057fc4: 0x1057fc4: sw    s3, 56(sp)
+// 0x01057fd0: 0x1057fd0: sw    ra, 60(sp)
+// 0x01057fd4: 0x1057fd4: sw    s3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4564,7 +4564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01057fc8: 0x1057fc8: sw    s2, 52(sp)
+// 0x01057fd8: 0x1057fd8: sw    s2, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4573,7 +4573,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01057fcc: 0x1057fcc: sw    s1, 48(sp)
+// 0x01057fdc: 0x1057fdc: sw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4582,7 +4582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01057fd0: 0x1057fd0: sw    s0, 44(sp)
+// 0x01057fe0: 0x1057fe0: sw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4591,7 +4591,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01057fd4: 0x1057fd4: jal   0x1021394 addu  s0, a0, zero
+// 0x01057fe4: 0x1057fe4: jal   0x10213a4 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -4599,12 +4599,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01057fdc: 0x1057fdc: jal   0x101fc00 addu  a0, zero, zero
+// 0x01057fec: 0x1057fec: jal   0x101fc10 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4612,37 +4612,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01057fe4: 0x1057fe4: lui   s3, 0x10000
+// 0x01057ff4: 0x1057ff4: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01057fe8: 0x1057fe8: addiu v0, zero, -1
+// 0x01057ff8: 0x1057ff8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01057fec: 0x1057fec: lui   a0, 0x10000
+// 0x01057ffc: 0x1057ffc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01057ff0: 0x1057ff0: addiu a0, a0, -29856
+// 0x01058000: 0x1058000: addiu a0, a0, -29856
 	ldloc.1
 	ldc.i4 -29856
 	add
 	stloc.1
-// 0x01057ff4: 0x1057ff4: addiu a1, s3, 18500
+// 0x01058004: 0x1058004: addiu a1, s3, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01057ff8: 0x1057ff8: addu  a2, zero, zero
+// 0x01058008: 0x1058008: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01057ffc: 0x1057ffc: addiu a3, zero, -2
+// 0x0105800c: 0x105800c: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x01058000: 0x1058000: sw    v0, 16(sp)
+// 0x01058010: 0x1058010: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4651,15 +4651,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01058004: 0x1058004: addiu s2, s0, 12
+// 0x01058014: 0x1058014: addiu s2, s0, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 10
-// 0x01058008: 0x1058008: lui   v0, 0x10800000
+// 0x01058018: 0x1058018: lui   v0, 0x10800000
 	ldc.i4 276824064
 	stloc 5
-// 0x0105800c: 0x105800c: sw    v0, 24(sp)
+// 0x0105801c: 0x105801c: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4668,7 +4668,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01058010: 0x1058010: jal   0x109e4f0 sw    s2, 20(sp)
+// 0x01058020: 0x1058020: jal   0x109eb38 sw    s2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4682,30 +4682,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058018: 0x1058018: addu  s1, v0, zero
+// 0x01058028: 0x1058028: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0105801c: 0x105801c: addu  a0, v0, zero
+// 0x0105802c: 0x105802c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01058020: 0x1058020: addu  a1, zero, zero
+// 0x01058030: 0x1058030: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058024: 0x1058024: addiu v0, zero, 15
+// 0x01058034: 0x1058034: addiu v0, zero, 15
 	ldc.i4.s 15
 	stloc 5
-// 0x01058028: 0x1058028: addu  a2, zero, zero
+// 0x01058038: 0x1058038: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105802c: 0x105802c: addu  a3, zero, zero
+// 0x0105803c: 0x105803c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01058030: 0x1058030: jal   0x10991d0 sw    v0, 16(sp)
+// 0x01058040: 0x1058040: jal   0x1099818 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4719,32 +4719,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_10991d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_1099818(int32,int32,int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01058038: 0x1058038: lui   a0, 0x10000
+// 0x01058048: 0x1058048: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105803c: 0x105803c: addiu a3, zero, -1
+// 0x0105804c: 0x105804c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01058040: 0x1058040: addiu a1, s3, 18500
+// 0x01058050: 0x1058050: addiu a1, s3, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x01058044: 0x1058044: addiu a0, a0, 9040
+// 0x01058054: 0x1058054: addiu a0, a0, 9036
 	ldloc.1
-	ldc.i4 9040
+	ldc.i4 9036
 	add
 	stloc.1
-// 0x01058048: 0x1058048: addiu a2, zero, -1
+// 0x01058058: 0x1058058: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0105804c: 0x105804c: addiu v0, zero, 2
+// 0x0105805c: 0x105805c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01058050: 0x1058050: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01058060: 0x1058060: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4758,32 +4758,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058058: 0x1058058: addu  a0, v0, zero
+// 0x01058068: 0x1058068: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105805c: 0x105805c: addu  a1, zero, zero
+// 0x0105806c: 0x105806c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058060: 0x1058060: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01058070: 0x1058070: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01058068: 0x1058068: addu  a0, s1, zero
+// 0x01058078: 0x1058078: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0105806c: 0x105806c: addiu a1, zero, 5
+// 0x0105807c: 0x105807c: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01058070: 0x1058070: jal   0x10942e8 addu  a2, zero, zero
+// 0x01058080: 0x1058080: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4791,35 +4791,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058078: 0x1058078: lw    a1, 0(s0)
+// 0x01058088: 0x1058088: lw    a1, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0105807c: 0x105807c: lui   a3, 0x100000
+// 0x0105808c: 0x105808c: lui   a3, 0x100000
 	ldc.i4 1048576
 	stloc 4
-// 0x01058080: 0x1058080: lui   a0, 0x10000
+// 0x01058090: 0x1058090: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058084: 0x1058084: ori   a3, a3, 8
+// 0x01058094: 0x1058094: ori   a3, a3, 8
 	ldloc 4
 	ldc.i4.8
 	or
 	stloc 4
-// 0x01058088: 0x1058088: addiu a0, a0, 9056
+// 0x01058098: 0x1058098: addiu a0, a0, 9052
 	ldloc.1
-	ldc.i4 9056
+	ldc.i4 9052
 	add
 	stloc.1
-// 0x0105808c: 0x105808c: jal   0x1098d10 addiu a2, zero, -1
+// 0x0105809c: 0x105809c: jal   0x1099358 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -4827,23 +4827,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058094: 0x1058094: lui   v1, 0x1060000
+// 0x010580a4: 0x10580a4: lui   v1, 0x1060000
 	ldc.i4 17170432
 	stloc 6
-// 0x01058098: 0x1058098: addiu v1, v1, -32172
+// 0x010580a8: 0x10580a8: addiu v1, v1, -32156
 	ldloc 6
-	ldc.i4 -32172
+	ldc.i4 -32156
 	add
 	stloc 6
-// 0x0105809c: 0x105809c: lui   a1, 0x0
+// 0x010580ac: 0x10580ac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010580a0: 0x10580a0: sw    v1, 216(v0)
+// 0x010580b0: 0x10580b0: sw    v1, 216(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4852,18 +4852,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010580a4: 0x10580a4: addu  a2, zero, zero
+// 0x010580b4: 0x10580b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010580a8: 0x10580a8: addu  a0, v0, zero
+// 0x010580b8: 0x10580b8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010580ac: 0x10580ac: addiu a1, a1, 23008
+// 0x010580bc: 0x10580bc: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x010580b0: 0x10580b0: jal   0x1098fe0 sw    v0, 32(sp)
+// 0x010580c0: 0x10580c0: jal   0x1099628 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4875,9 +4875,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010580b8: 0x10580b8: lw    v0, 32(sp)
+// 0x010580c8: 0x10580c8: lw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4886,26 +4886,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010580bc: 0x10580bc: addu  a0, s1, zero
+// 0x010580cc: 0x10580cc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010580c0: 0x10580c0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010580d0: 0x10580d0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010580c8: 0x10580c8: addu  a0, s1, zero
+// 0x010580d8: 0x10580d8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010580cc: 0x10580cc: addiu a1, zero, 10
+// 0x010580dc: 0x10580dc: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010580d0: 0x10580d0: jal   0x10942e8 addu  a2, zero, zero
+// 0x010580e0: 0x10580e0: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4913,12 +4913,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010580d8: 0x10580d8: lw    v0, 16(s0)
+// 0x010580e8: 0x10580e8: lw    v0, 16(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4927,14 +4927,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010580dc: 0x10580dc: sll   zero, zero, 0
-// 0x010580e0: 0x10580e0: bne   v0, zero, 0x10580f8 lui   a0, 0x10000
+// 0x010580ec: 0x10580ec: sll   zero, zero, 0
+// 0x010580f0: 0x10580f0: bne   v0, zero, 0x1058108 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_10580f8
+	brtrue L_1058108
 // --- basic block ---
-// 0x010580e8: 0x10580e8: lw    v0, 12(s0)
+// 0x010580f8: 0x10580f8: lw    v0, 12(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4943,18 +4943,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010580ec: 0x10580ec: sll   zero, zero, 0
-// 0x010580f0: 0x10580f0: beq   v0, zero, 0x1058138 sll   zero, zero, 0
+// 0x010580fc: 0x10580fc: sll   zero, zero, 0
+// 0x01058100: 0x1058100: beq   v0, zero, 0x1058148 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1058138
+	brfalse L_1058148
 // --- basic block ---
-L_10580f8:
-// 0x010580f8: 0x10580f8: addiu a0, a0, -29680
+L_1058108:
+// 0x01058108: 0x1058108: addiu a0, a0, -29680
 	ldloc.1
 	ldc.i4 -29680
 	add
 	stloc.1
-// 0x010580fc: 0x10580fc: jal   0x101f76c addu  a1, s2, zero
+// 0x0105810c: 0x105810c: jal   0x101f77c addu  a1, s2, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4962,18 +4962,18 @@ L_10580f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058104: 0x1058104: addu  a0, s2, zero
+// 0x01058114: 0x1058114: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01058108: 0x1058108: addiu a1, zero, 600
+// 0x01058118: 0x1058118: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x0105810c: 0x105810c: jal   0x1020f5c addu  a2, zero, zero
+// 0x0105811c: 0x105811c: jal   0x1020f6c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4981,30 +4981,30 @@ L_10580f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058114: 0x1058114: jal   0x101f8cc sll   zero, zero, 0
+// 0x01058124: 0x1058124: jal   0x101f8dc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_height_101f8cc(int32)
+	call int32 Cibyl23::roadmap_screen_height_101f8dc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105811c: 0x105811c: addiu a1, zero, 3
+// 0x0105812c: 0x105812c: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01058120: 0x1058120: div   v0, a1
+// 0x01058130: 0x1058130: div   v0, a1
 	ldloc 5
 	ldloc.2
 	div
 	stloc 13
-// 0x01058124: 0x1058124: mflo  lo
+// 0x01058134: 0x1058134: mflo  lo
 	ldloc 13
 	stloc.2
-// 0x01058128: 0x1058128: jal   0x101fb0c addiu a0, zero, 300
+// 0x01058138: 0x1058138: jal   0x101fb1c addiu a0, zero, 300
 	ldc.i4 300
 	stloc.1
 	ldloc.0
@@ -5012,24 +5012,24 @@ L_10580f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_scale_101fb0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_scale_101fb1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058130: 0x1058130: jal   0x1025a40 sll   zero, zero, 0
+// 0x01058140: 0x1058140: jal   0x1025a50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_view_auto_zoom_suspend_1025a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl28::roadmap_view_auto_zoom_suspend_1025a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1058138:
-// 0x01058138: 0x1058138: jal   0x1094a94 addiu a0, zero, 1
+L_1058148:
+// 0x01058148: 0x1058148: jal   0x10950dc addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -5037,20 +5037,20 @@ L_1058138:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058140: 0x1058140: lui   a0, 0x10000
+// 0x01058150: 0x1058150: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058144: 0x1058144: addiu a0, a0, -29856
+// 0x01058154: 0x1058154: addiu a0, a0, -29856
 	ldloc.1
 	ldc.i4 -29856
 	add
 	stloc.1
-// 0x01058148: 0x1058148: jal   0x1095eec addu  a1, zero, zero
+// 0x01058158: 0x1058158: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5058,25 +5058,25 @@ L_1058138:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058150: 0x1058150: lui   s0, 0x70000
+// 0x01058160: 0x1058160: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01058154: 0x1058154: lui   a1, 0x10000
+// 0x01058164: 0x1058164: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01058158: 0x1058158: addiu a0, s0, 10292
+// 0x01058168: 0x1058168: addiu a0, s0, 10756
 	ldloc 8
-	ldc.i4 10292
+	ldc.i4 10756
 	add
 	stloc.1
-// 0x0105815c: 0x105815c: jal   0x1001b68 addiu a1, a1, -14440
+// 0x0105816c: 0x105816c: jal   0x1001b68 addiu a1, a1, -14444
 	ldloc.2
-	ldc.i4 -14440
+	ldc.i4 -14444
 	add
 	stloc.2
 	ldloc.1
@@ -5086,26 +5086,26 @@ L_1058138:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058164: 0x1058164: lui   v0, 0x1060000
+// 0x01058174: 0x1058174: lui   v0, 0x1060000
 	ldc.i4 17170432
 	stloc 5
-// 0x01058168: 0x1058168: addiu s0, s0, 10292
+// 0x01058178: 0x1058178: addiu s0, s0, 10756
 	ldloc 8
-	ldc.i4 10292
+	ldc.i4 10756
 	add
 	stloc 8
-// 0x0105816c: 0x105816c: addiu v0, v0, -31972
+// 0x0105817c: 0x105817c: addiu v0, v0, -31956
 	ldloc 5
-	ldc.i4 -31972
+	ldc.i4 -31956
 	add
 	stloc 5
-// 0x01058170: 0x1058170: lui   a0, 0x10000
+// 0x01058180: 0x1058180: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058174: 0x1058174: addu  a1, s0, zero
+// 0x01058184: 0x1058184: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01058178: 0x1058178: sw    v0, 52(s0)
+// 0x01058188: 0x1058188: sw    v0, 52(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5114,9 +5114,9 @@ L_1058138:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105817c: 0x105817c: jal   0x103ff3c addiu a0, a0, 9072
+// 0x0105818c: 0x105818c: jal   0x103ff4c addiu a0, a0, 9068
 	ldloc.1
-	ldc.i4 9072
+	ldc.i4 9068
 	add
 	stloc.1
 	ldloc.0
@@ -5124,13 +5124,13 @@ L_1058138:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_set_right_soft_key_103ff4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058184: 0x1058184: lw    ra, 60(sp)
-// 0x01058188: 0x1058188: lw    s3, 56(sp)
+// 0x01058194: 0x1058194: lw    ra, 60(sp)
+// 0x01058198: 0x1058198: lw    s3, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5139,7 +5139,7 @@ L_1058138:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105818c: 0x105818c: lw    s2, 52(sp)
+// 0x0105819c: 0x105819c: lw    s2, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5148,7 +5148,7 @@ L_1058138:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058190: 0x1058190: lw    s1, 48(sp)
+// 0x010581a0: 0x10581a0: lw    s1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5157,7 +5157,7 @@ L_1058138:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01058194: 0x1058194: lw    s0, 44(sp)
+// 0x010581a4: 0x10581a4: lw    s0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5166,7 +5166,7 @@ L_1058138:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01058198: 0x1058198: jr    ra addiu sp, sp, 64
+// 0x010581a8: 0x10581a8: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5178,7 +5178,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_list_call_back_10581a0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_list_call_back_10581b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -5219,19 +5219,19 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010581a0: 0x10581a0: addiu sp, sp, -56
+// 0x010581b0: 0x10581b0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010581a4: 0x10581a4: lw    v0, 0(a0)
+// 0x010581b4: 0x10581b4: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010581a8: 0x10581a8: sw    s1, 48(sp)
+// 0x010581b8: 0x10581b8: sw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5240,13 +5240,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010581ac: 0x10581ac: lui   a3, 0x10000
+// 0x010581bc: 0x10581bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010581b0: 0x10581b0: lui   s1, 0x10000
+// 0x010581c0: 0x10581c0: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010581b4: 0x10581b4: sw    s0, 44(sp)
+// 0x010581c4: 0x10581c4: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5255,7 +5255,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010581b8: 0x10581b8: sw    a2, 20(sp)
+// 0x010581c8: 0x10581c8: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5264,27 +5264,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010581bc: 0x10581bc: addu  s0, a1, zero
+// 0x010581cc: 0x10581cc: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x010581c0: 0x10581c0: addiu a3, a3, 9088
+// 0x010581d0: 0x10581d0: addiu a3, a3, 9084
 	ldloc 4
-	ldc.i4 9088
+	ldc.i4 9084
 	add
 	stloc 4
-// 0x010581c4: 0x10581c4: addiu a1, s1, 8052
+// 0x010581d4: 0x10581d4: addiu a1, s1, 8048
 	ldloc 9
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x010581c8: 0x10581c8: addiu a0, zero, 2
+// 0x010581d8: 0x10581d8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010581cc: 0x10581cc: addiu a2, zero, 3196
+// 0x010581dc: 0x10581dc: addiu a2, zero, 3196
 	ldc.i4 3196
 	stloc.3
-// 0x010581d0: 0x10581d0: sw    ra, 52(sp)
-// 0x010581d4: 0x10581d4: jal   0x100449c sw    v0, 16(sp)
+// 0x010581e0: 0x10581e0: sw    ra, 52(sp)
+// 0x010581e4: 0x10581e4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5303,29 +5303,29 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010581dc: 0x10581dc: lw    s0, 0(s0)
+// 0x010581ec: 0x10581ec: lw    s0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010581e0: 0x10581e0: lui   a3, 0x10000
+// 0x010581f0: 0x10581f0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010581e4: 0x10581e4: lw    v0, 0(s0)
+// 0x010581f4: 0x10581f4: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010581e8: 0x10581e8: addiu a1, s1, 8052
+// 0x010581f8: 0x10581f8: addiu a1, s1, 8048
 	ldloc 9
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x010581ec: 0x10581ec: sw    v0, 16(sp)
+// 0x010581fc: 0x10581fc: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5334,7 +5334,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010581f0: 0x10581f0: lw    v0, 4(s0)
+// 0x01058200: 0x1058200: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5343,12 +5343,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010581f4: 0x10581f4: addiu a3, a3, 9204
+// 0x01058204: 0x1058204: addiu a3, a3, 9200
 	ldloc 4
-	ldc.i4 9204
+	ldc.i4 9200
 	add
 	stloc 4
-// 0x010581f8: 0x10581f8: sw    v0, 20(sp)
+// 0x01058208: 0x1058208: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5357,7 +5357,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010581fc: 0x10581fc: lw    v0, 8(s0)
+// 0x0105820c: 0x105820c: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5366,10 +5366,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058200: 0x1058200: addiu a0, zero, 2
+// 0x01058210: 0x1058210: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01058204: 0x1058204: sw    v0, 24(sp)
+// 0x01058214: 0x1058214: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5378,7 +5378,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01058208: 0x1058208: lw    v0, 12(s0)
+// 0x01058218: 0x1058218: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5387,10 +5387,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105820c: 0x105820c: addiu a2, zero, 3201
+// 0x0105821c: 0x105821c: addiu a2, zero, 3201
 	ldc.i4 3201
 	stloc.3
-// 0x01058210: 0x1058210: sw    v0, 28(sp)
+// 0x01058220: 0x1058220: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5399,7 +5399,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01058214: 0x1058214: lw    v0, 16(s0)
+// 0x01058224: 0x1058224: lw    v0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5408,7 +5408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058218: 0x1058218: jal   0x100449c sw    v0, 32(sp)
+// 0x01058228: 0x1058228: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5427,28 +5427,28 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01058220: 0x1058220: addiu v1, zero, 1
+// 0x01058230: 0x1058230: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01058224: 0x1058224: cibyl_sysc_arg 0x3
+// 0x01058234: 0x1058234: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x01058228: 0x1058228: cibyl_sysc 0x2045
+// 0x01058238: 0x1058238: cibyl_sysc 0x2045
 	call void [WazeWP7]Syscalls::NOPH_GenericListDialogs_closeDialog(int32)
-// 0x0105822c: 0x105822c: addu  v1, v0, zero
+// 0x0105823c: 0x105823c: addu  v1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x01058230: 0x1058230: lui   v0, 0x70000
+// 0x01058240: 0x1058240: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058234: 0x1058234: addu  a0, s0, zero
+// 0x01058244: 0x1058244: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01058238: 0x1058238: jal   0x1057fbc sw    s0, 11964(v0)
+// 0x01058248: 0x1058248: jal   0x1057fcc sw    s0, 12428(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2991
+	ldc.i4 3107
 	add
 	ldloc 7
 	stelem.i4
@@ -5457,13 +5457,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::display_pop_up_1057fbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::display_pop_up_1057fcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01058240: 0x1058240: lw    ra, 52(sp)
-// 0x01058244: 0x1058244: lw    s1, 48(sp)
+// 0x01058250: 0x1058250: lw    ra, 52(sp)
+// 0x01058254: 0x1058254: lw    s1, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5472,7 +5472,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01058248: 0x1058248: lw    s0, 44(sp)
+// 0x01058258: 0x1058258: lw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5481,7 +5481,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105824c: 0x105824c: jr    ra addiu sp, sp, 56
+// 0x0105825c: 0x105825c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5493,7 +5493,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 NavList_OnKeyPressed_1058254(int32,int32,int32,int32,int32)
+.method public static int32 NavList_OnKeyPressed_1058264(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -5528,16 +5528,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01058254: 0x1058254: addiu sp, sp, -24
+// 0x01058264: 0x1058264: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01058258: 0x1058258: beq   a0, zero, 0x1058300 sw    ra, 20(sp)
+// 0x01058268: 0x1058268: beq   a0, zero, 0x1058310 sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1058300
+	brfalse L_1058310
 // --- basic block ---
-// 0x01058260: 0x1058260: lw    v0, 164(a0)
+// 0x01058270: 0x1058270: lw    v0, 164(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -5546,65 +5546,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058264: 0x1058264: sll   zero, zero, 0
-// 0x01058268: 0x1058268: beq   v0, zero, 0x1058300 andi  a2, a2, 1
+// 0x01058274: 0x1058274: sll   zero, zero, 0
+// 0x01058278: 0x1058278: beq   v0, zero, 0x1058310 andi  a2, a2, 1
 	ldloc 6
 	ldloc.3
 	ldc.i4.1
 	and
 	stloc.3
-	brfalse L_1058300
+	brfalse L_1058310
 // --- basic block ---
-// 0x01058270: 0x1058270: beq   a2, zero, 0x1058300 addiu v1, zero, 6
+// 0x01058280: 0x1058280: beq   a2, zero, 0x1058310 addiu v1, zero, 6
 	ldloc.3
 	ldc.i4.6
 	stloc 5
-	brfalse L_1058300
+	brfalse L_1058310
 // --- basic block ---
-// 0x01058278: 0x1058278: lb    v0, 0(a1)
+// 0x01058288: 0x1058288: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0105827c: 0x105827c: sll   zero, zero, 0
-// 0x01058280: 0x1058280: beq   v0, v1, 0x10582b8 addiu v1, zero, 7
+// 0x0105828c: 0x105828c: sll   zero, zero, 0
+// 0x01058290: 0x1058290: beq   v0, v1, 0x10582c8 addiu v1, zero, 7
 	ldloc 6
 	ldloc 5
 	ldc.i4.7
 	stloc 5
-	beq  L_10582b8
+	beq  L_10582c8
 // --- basic block ---
-// 0x01058288: 0x1058288: bne   v0, v1, 0x105830c addu  v0, zero, zero
+// 0x01058298: 0x1058298: bne   v0, v1, 0x105831c addu  v0, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	bne.un L_105830c
+	bne.un L_105831c
 // --- basic block ---
-// 0x01058290: 0x1058290: lui   v0, 0x70000
+// 0x010582a0: 0x10582a0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058294: 0x1058294: lw    v1, 11964(v0)
+// 0x010582a4: 0x10582a4: lw    v1, 12428(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2991
+	ldc.i4 3107
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058298: 0x1058298: lui   a0, 0x70000
+// 0x010582a8: 0x10582a8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105829c: 0x105829c: lw    a0, 11968(a0)
+// 0x010582ac: 0x10582ac: lw    a0, 12432(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2992
+	ldc.i4 3108
 	add
 	ldelem.i4
 	stloc.1
-// 0x010582a0: 0x10582a0: lw    v1, 8(v1)
+// 0x010582b0: 0x10582b0: lw    v1, 8(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5613,40 +5613,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010582a4: 0x10582a4: addiu a0, a0, -1
+// 0x010582b4: 0x10582b4: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010582a8: 0x10582a8: beq   v1, a0, 0x1058308 addiu v1, v1, 1
+// 0x010582b8: 0x10582b8: beq   v1, a0, 0x1058318 addiu v1, v1, 1
 	ldloc 5
 	ldloc.1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	beq  L_1058308
+	beq  L_1058318
 // --- basic block ---
-// 0x010582b0: 0x10582b0: j	 0x10582d8 lui   a0, 0x70000
+// 0x010582c0: 0x10582c0: j	 0x10582e8 lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-	br L_10582d8
+	br L_10582e8
 // --- basic block ---
-L_10582b8:
-// 0x010582b8: 0x10582b8: lui   v0, 0x70000
+L_10582c8:
+// 0x010582c8: 0x10582c8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010582bc: 0x10582bc: lw    v1, 11964(v0)
+// 0x010582cc: 0x10582cc: lw    v1, 12428(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2991
+	ldc.i4 3107
 	add
 	ldelem.i4
 	stloc 5
-// 0x010582c0: 0x10582c0: sll   zero, zero, 0
-// 0x010582c4: 0x10582c4: lw    v1, 8(v1)
+// 0x010582d0: 0x10582d0: sll   zero, zero, 0
+// 0x010582d4: 0x10582d4: lw    v1, 8(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5655,51 +5655,51 @@ L_10582b8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010582c8: 0x10582c8: sll   zero, zero, 0
-// 0x010582cc: 0x10582cc: beq   v1, zero, 0x1058308 addiu v1, v1, -1
+// 0x010582d8: 0x10582d8: sll   zero, zero, 0
+// 0x010582dc: 0x10582dc: beq   v1, zero, 0x1058318 addiu v1, v1, -1
 	ldloc 5
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-	brfalse L_1058308
+	brfalse L_1058318
 // --- basic block ---
-// 0x010582d4: 0x10582d4: lui   a0, 0x70000
+// 0x010582e4: 0x10582e4: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-L_10582d8:
-// 0x010582d8: 0x10582d8: addiu a0, a0, 11164
+L_10582e8:
+// 0x010582e8: 0x10582e8: addiu a0, a0, 11628
 	ldloc.1
-	ldc.i4 11164
+	ldc.i4 11628
 	add
 	stloc.1
-// 0x010582dc: 0x10582dc: sll   v1, v1, 2
+// 0x010582ec: 0x10582ec: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010582e0: 0x10582e0: addu  v1, v1, a0
+// 0x010582f0: 0x10582f0: addu  v1, v1, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x010582e4: 0x10582e4: lw    v1, 0(v1)
+// 0x010582f4: 0x10582f4: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010582e8: 0x10582e8: sll   zero, zero, 0
-// 0x010582ec: 0x10582ec: addu  a0, v1, zero
+// 0x010582f8: 0x10582f8: sll   zero, zero, 0
+// 0x010582fc: 0x10582fc: addu  a0, v1, zero
 	ldloc 5
 	stloc.1
-// 0x010582f0: 0x10582f0: jal   0x1057fbc sw    v1, 11964(v0)
+// 0x01058300: 0x1058300: jal   0x1057fcc sw    v1, 12428(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2991
+	ldc.i4 3107
 	add
 	ldloc 5
 	stelem.i4
@@ -5708,30 +5708,30 @@ L_10582d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::display_pop_up_1057fbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::display_pop_up_1057fcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010582f8: 0x10582f8: j	 0x105830c addiu v0, zero, 1
+// 0x01058308: 0x1058308: j	 0x105831c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_105830c
+	br L_105831c
 // --- basic block ---
-L_1058300:
-// 0x01058300: 0x1058300: j	 0x105830c addu  v0, zero, zero
+L_1058310:
+// 0x01058310: 0x1058310: j	 0x105831c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_105830c
+	br L_105831c
 // --- basic block ---
-L_1058308:
-// 0x01058308: 0x1058308: addiu v0, zero, 1
+L_1058318:
+// 0x01058318: 0x1058318: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_105830c:
-// 0x0105830c: 0x105830c: lw    ra, 20(sp)
-// 0x01058310: 0x1058310: sll   zero, zero, 0
-// 0x01058314: 0x1058314: jr    ra addiu sp, sp, 24
+L_105831c:
+// 0x0105831c: 0x105831c: lw    ra, 20(sp)
+// 0x01058320: 0x1058320: sll   zero, zero, 0
+// 0x01058324: 0x1058324: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5743,7 +5743,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_main_list_hide_105831c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_list_hide_105832c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -5778,17 +5778,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105831c:
-// 0x0105831c: 0x105831c: lui   a0, 0x10000
+L_105832c:
+// 0x0105832c: 0x105832c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058320: 0x1058320: addiu sp, sp, -24
+// 0x01058330: 0x1058330: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01058324: 0x1058324: sw    ra, 20(sp)
-// 0x01058328: 0x1058328: jal   0x1019564 addiu a0, a0, -30876
+// 0x01058334: 0x1058334: sw    ra, 20(sp)
+// 0x01058338: 0x1058338: jal   0x1019574 addiu a0, a0, -30876
 	ldloc.1
 	ldc.i4 -30876
 	add
@@ -5798,17 +5798,17 @@ L_105831c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_hide_1019564(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_hide_1019574(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058330: 0x1058330: lui   a0, 0x10000
+// 0x01058340: 0x1058340: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058334: 0x1058334: jal   0x103fdbc addiu a0, a0, 9072
+// 0x01058344: 0x1058344: jal   0x103fdcc addiu a0, a0, 9068
 	ldloc.1
-	ldc.i4 9072
+	ldc.i4 9068
 	add
 	stloc.1
 	ldloc.0
@@ -5816,14 +5816,14 @@ L_105831c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105833c: 0x105833c: lw    ra, 20(sp)
-// 0x01058340: 0x1058340: sll   zero, zero, 0
-// 0x01058344: 0x1058344: jr    ra addiu sp, sp, 24
+// 0x0105834c: 0x105834c: lw    ra, 20(sp)
+// 0x01058350: 0x1058350: sll   zero, zero, 0
+// 0x01058354: 0x1058354: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5835,7 +5835,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_main_list_state_105834c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_list_state_105835c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5870,16 +5870,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105834c: 0x105834c: lui   a0, 0x10000
+// 0x0105835c: 0x105835c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058350: 0x1058350: addiu sp, sp, -24
+// 0x01058360: 0x1058360: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01058354: 0x1058354: sw    ra, 20(sp)
-// 0x01058358: 0x1058358: jal   0x1019608 addiu a0, a0, -30876
+// 0x01058364: 0x1058364: sw    ra, 20(sp)
+// 0x01058368: 0x1058368: jal   0x1019618 addiu a0, a0, -30876
 	ldloc.1
 	ldc.i4 -30876
 	add
@@ -5889,23 +5889,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl18::roadmap_display_is_sign_active_1019608(int32,int32,int32,int32,int32)
+	call int32 Cibyl18::roadmap_display_is_sign_active_1019618(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01058360: 0x1058360: lw    ra, 20(sp)
-// 0x01058364: 0x1058364: sltu  v0, zero, v0
+// 0x01058370: 0x1058370: lw    ra, 20(sp)
+// 0x01058374: 0x1058374: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01058368: 0x1058368: addiu v0, v0, -1
+// 0x01058378: 0x1058378: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0105836c: 0x105836c: jr    ra addiu sp, sp, 24
+// 0x0105837c: 0x105837c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5917,7 +5917,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_is_list_displaying_1058374(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_is_list_displaying_1058384(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -5952,30 +5952,30 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01058374: 0x1058374: addiu sp, sp, -24
+// 0x01058384: 0x1058384: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01058378: 0x1058378: sw    ra, 20(sp)
-// 0x0105837c: 0x105837c: jal   0x105834c sll   zero, zero, 0
+// 0x01058388: 0x1058388: sw    ra, 20(sp)
+// 0x0105838c: 0x105838c: jal   0x105835c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_list_state_105834c(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_list_state_105835c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01058384: 0x1058384: lw    ra, 20(sp)
-// 0x01058388: 0x1058388: sltiu v0, v0, 1
+// 0x01058394: 0x1058394: lw    ra, 20(sp)
+// 0x01058398: 0x1058398: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0105838c: 0x105838c: jr    ra addiu sp, sp, 24
+// 0x0105839c: 0x105839c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5987,7 +5987,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_menu_1058394(int32,int32,int32,int32,int32)
+.method public static int32 navigate_menu_10583a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -6022,67 +6022,67 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1058394:
-// 0x01058394: 0x1058394: addiu sp, sp, -24
+L_10583a4:
+// 0x010583a4: 0x10583a4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01058398: 0x1058398: sw    ra, 20(sp)
-// 0x0105839c: 0x105839c: jal   0x1057408 sll   zero, zero, 0
+// 0x010583a8: 0x10583a8: sw    ra, 20(sp)
+// 0x010583ac: 0x10583ac: jal   0x1057418 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigation_guidance_state_1057408(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigation_guidance_state_1057418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010583a4: 0x10583a4: beq   v0, zero, 0x10583bc lui   a0, 0x10000
+// 0x010583b4: 0x10583b4: beq   v0, zero, 0x10583cc lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_10583bc
+	brfalse L_10583cc
 // --- basic block ---
-// 0x010583ac: 0x10583ac: lui   a1, 0x0
+// 0x010583bc: 0x10583bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010583b0: 0x10583b0: addiu a0, a0, 9284
+// 0x010583c0: 0x10583c0: addiu a0, a0, 9280
 	ldloc.1
-	ldc.i4 9284
+	ldc.i4 9280
 	add
 	stloc.1
-// 0x010583b4: 0x10583b4: j	 0x10583cc addiu a1, a1, 14328
+// 0x010583c4: 0x10583c4: j	 0x10583dc addiu a1, a1, 14328
 	ldloc.2
 	ldc.i4 14328
 	add
 	stloc.2
-	br L_10583cc
+	br L_10583dc
 // --- basic block ---
-L_10583bc:
-// 0x010583bc: 0x10583bc: lui   a0, 0x10000
+L_10583cc:
+// 0x010583cc: 0x10583cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010583c0: 0x10583c0: lui   a1, 0x0
+// 0x010583d0: 0x10583d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010583c4: 0x10583c4: addiu a0, a0, 9304
+// 0x010583d4: 0x10583d4: addiu a0, a0, 9300
 	ldloc.1
-	ldc.i4 9304
+	ldc.i4 9300
 	add
 	stloc.1
-// 0x010583c8: 0x10583c8: addiu a1, a1, 14344
+// 0x010583d8: 0x10583d8: addiu a1, a1, 14344
 	ldloc.2
 	ldc.i4 14344
 	add
 	stloc.2
-L_10583cc:
-// 0x010583cc: 0x10583cc: addu  a2, zero, zero
+L_10583dc:
+// 0x010583dc: 0x10583dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010583d0: 0x10583d0: jal   0x102d2b8 addu  a3, zero, zero
+// 0x010583e0: 0x10583e0: jal   0x102d2c8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6090,14 +6090,14 @@ L_10583cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::roadmap_start_popup_menu_102d2b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::roadmap_start_popup_menu_102d2c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010583d8: 0x10583d8: lw    ra, 20(sp)
-// 0x010583dc: 0x10583dc: sll   zero, zero, 0
-// 0x010583e0: 0x10583e0: jr    ra addiu sp, sp, 24
+// 0x010583e8: 0x10583e8: lw    ra, 20(sp)
+// 0x010583ec: 0x10583ec: sll   zero, zero, 0
+// 0x010583f0: 0x10583f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6109,7 +6109,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_screen_outline_1058410(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_screen_outline_1058420(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 t0,int32 ra)
@@ -6156,15 +6156,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01058410: 0x1058410: addiu sp, sp, -64
+// 0x01058420: 0x1058420: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01058414: 0x1058414: lui   v0, 0x70000
+// 0x01058424: 0x1058424: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01058418: 0x1058418: sw    s1, 52(sp)
+// 0x01058428: 0x1058428: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6173,17 +6173,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105841c: 0x105841c: lw    s1, 10028(v0)
+// 0x0105842c: 0x105842c: lw    s1, 10492(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058420: 0x1058420: sw    ra, 60(sp)
-// 0x01058424: 0x1058424: sw    s2, 56(sp)
+// 0x01058430: 0x1058430: sw    ra, 60(sp)
+// 0x01058434: 0x1058434: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6192,7 +6192,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058428: 0x1058428: beq   s1, zero, 0x1058440 sw    s0, 48(sp)
+// 0x01058438: 0x1058438: beq   s1, zero, 0x1058450 sw    s0, 48(sp)
 	ldloc 10
 	ldloc 6
 	ldloc.0
@@ -6202,222 +6202,222 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_1058440
+	brfalse L_1058450
 // --- basic block ---
-// 0x01058430: 0x1058430: lui   v0, 0x70000
+// 0x01058440: 0x1058440: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01058434: 0x1058434: lw    s0, 10024(v0)
+// 0x01058444: 0x1058444: lw    s0, 10488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldelem.i4
 	stloc 9
-// 0x01058438: 0x1058438: j	 0x1058474 slti  v0, s0, 2
+// 0x01058448: 0x1058448: j	 0x1058484 slti  v0, s0, 2
 	ldloc 9
 	ldc.i4.2
 	clt
 	stloc 5
-	br L_1058474
+	br L_1058484
 // --- basic block ---
-L_1058440:
-// 0x01058440: 0x1058440: lui   v0, 0x70000
+L_1058450:
+// 0x01058450: 0x1058450: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01058444: 0x1058444: lw    v0, 10356(v0)
+// 0x01058454: 0x1058454: lw    v0, 10820(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2589
+	ldc.i4 2705
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058448: 0x1058448: lui   v1, 0x70000
+// 0x01058458: 0x1058458: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105844c: 0x105844c: lui   a0, 0x70000
+// 0x0105845c: 0x105845c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01058450: 0x1058450: sll   v0, v0, 2
+// 0x01058460: 0x1058460: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01058454: 0x1058454: addiu v1, v1, 9996
+// 0x01058464: 0x1058464: addiu v1, v1, 10460
 	ldloc 7
-	ldc.i4 9996
+	ldc.i4 10460
 	add
 	stloc 7
-// 0x01058458: 0x1058458: addiu a0, a0, 10752
+// 0x01058468: 0x1058468: addiu a0, a0, 11216
 	ldloc.1
-	ldc.i4 10752
+	ldc.i4 11216
 	add
 	stloc.1
-// 0x0105845c: 0x105845c: addu  v1, v0, v1
+// 0x0105846c: 0x105846c: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01058460: 0x1058460: addu  v0, v0, a0
+// 0x01058470: 0x1058470: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01058464: 0x1058464: lw    s1, 0(v0)
+// 0x01058474: 0x1058474: lw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01058468: 0x1058468: lw    s0, 0(v1)
+// 0x01058478: 0x1058478: lw    s0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0105846c: 0x105846c: sll   zero, zero, 0
-// 0x01058470: 0x1058470: slti  v0, s0, 2
+// 0x0105847c: 0x105847c: sll   zero, zero, 0
+// 0x01058480: 0x1058480: slti  v0, s0, 2
 	ldloc 9
 	ldc.i4.2
 	clt
 	stloc 5
-L_1058474:
-// 0x01058474: 0x1058474: bne   v0, zero, 0x1058554 sll   zero, zero, 0
+L_1058484:
+// 0x01058484: 0x1058484: bne   v0, zero, 0x1058564 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1058554
+	brtrue L_1058564
 // --- basic block ---
-// 0x0105847c: 0x105847c: beq   s1, zero, 0x1058554 lui   v0, 0x70000
+// 0x0105848c: 0x105848c: beq   s1, zero, 0x1058564 lui   v0, 0x70000
 	ldloc 10
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1058554
+	brfalse L_1058564
 // --- basic block ---
-// 0x01058484: 0x1058484: lw    v0, 10700(v0)
+// 0x01058494: 0x1058494: lw    v0, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058488: 0x1058488: sll   zero, zero, 0
-// 0x0105848c: 0x105848c: andi  v0, v0, 192
+// 0x01058498: 0x1058498: sll   zero, zero, 0
+// 0x0105849c: 0x105849c: andi  v0, v0, 192
 	ldloc 5
 	ldc.i4 192
 	and
 	stloc 5
-// 0x01058490: 0x1058490: beq   v0, zero, 0x10584a8 lui   v0, 0x70000
+// 0x010584a0: 0x10584a0: beq   v0, zero, 0x10584b8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10584a8
+	brfalse L_10584b8
 // --- basic block ---
-// 0x01058498: 0x1058498: lui   s2, 0x70000
+// 0x010584a8: 0x10584a8: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105849c: 0x105849c: lw    a0, 10668(s2)
+// 0x010584ac: 0x10584ac: lw    a0, 11132(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2667
+	ldc.i4 2783
 	add
 	ldelem.i4
 	stloc.1
-// 0x010584a0: 0x10584a0: j	 0x10584dc addiu s2, s2, 10668
+// 0x010584b0: 0x10584b0: j	 0x10584ec addiu s2, s2, 11132
 	ldloc 8
-	ldc.i4 10668
+	ldc.i4 11132
 	add
 	stloc 8
-	br L_10584dc
+	br L_10584ec
 // --- basic block ---
-L_10584a8:
-// 0x010584a8: 0x10584a8: lw    v0, 10348(v0)
+L_10584b8:
+// 0x010584b8: 0x10584b8: lw    v0, 10812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2587
+	ldc.i4 2703
 	add
 	ldelem.i4
 	stloc 5
-// 0x010584ac: 0x10584ac: sll   zero, zero, 0
-// 0x010584b0: 0x10584b0: beq   v0, zero, 0x10584d0 lui   v0, 0x70000
+// 0x010584bc: 0x10584bc: sll   zero, zero, 0
+// 0x010584c0: 0x10584c0: beq   v0, zero, 0x10584e0 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10584d0
+	brfalse L_10584e0
 // --- basic block ---
-// 0x010584b8: 0x10584b8: lw    v0, 10356(v0)
+// 0x010584c8: 0x10584c8: lw    v0, 10820(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2589
+	ldc.i4 2705
 	add
 	ldelem.i4
 	stloc 5
-// 0x010584bc: 0x10584bc: lui   v1, 0x70000
+// 0x010584cc: 0x10584cc: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x010584c0: 0x10584c0: sll   v0, v0, 3
+// 0x010584d0: 0x10584d0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010584c4: 0x10584c4: addiu v1, v1, 10644
+// 0x010584d4: 0x10584d4: addiu v1, v1, 11108
 	ldloc 7
-	ldc.i4 10644
+	ldc.i4 11108
 	add
 	stloc 7
-// 0x010584c8: 0x10584c8: j	 0x105850c addu  v1, v1, v0
+// 0x010584d8: 0x10584d8: j	 0x105851c addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-	br L_105850c
+	br L_105851c
 // --- basic block ---
-L_10584d0:
-// 0x010584d0: 0x10584d0: lui   s2, 0x70000
+L_10584e0:
+// 0x010584e0: 0x10584e0: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010584d4: 0x10584d4: lw    a0, 10636(s2)
+// 0x010584e4: 0x10584e4: lw    a0, 11100(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2659
+	ldc.i4 2775
 	add
 	ldelem.i4
 	stloc.1
-// 0x010584d8: 0x10584d8: addiu s2, s2, 10636
+// 0x010584e8: 0x10584e8: addiu s2, s2, 11100
 	ldloc 8
-	ldc.i4 10636
+	ldc.i4 11100
 	add
 	stloc 8
-L_10584dc:
-// 0x010584dc: 0x10584dc: jal   0x104e35c sll   zero, zero, 0
+L_10584ec:
+// 0x010584ec: 0x10584ec: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010584e4: 0x10584e4: addiu a0, zero, 5
+// 0x010584f4: 0x10584f4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010584e8: 0x10584e8: jal   0x104dd5c sw    v0, 40(sp)
+// 0x010584f8: 0x10584f8: jal   0x104dd6c sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6427,12 +6427,12 @@ L_10584dc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010584f0: 0x10584f0: lw    v0, 40(sp)
+// 0x01058500: 0x1058500: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6441,14 +6441,14 @@ L_10584dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010584f4: 0x10584f4: sll   zero, zero, 0
-// 0x010584f8: 0x10584f8: beq   v0, zero, 0x105850c addu  v1, s2, zero
+// 0x01058504: 0x1058504: sll   zero, zero, 0
+// 0x01058508: 0x1058508: beq   v0, zero, 0x105851c addu  v1, s2, zero
 	ldloc 5
 	ldloc 8
 	stloc 7
-	brfalse L_105850c
+	brfalse L_105851c
 // --- basic block ---
-// 0x01058500: 0x1058500: jal   0x104e35c addu  a0, v0, zero
+// 0x01058510: 0x1058510: jal   0x104e36c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6456,42 +6456,42 @@ L_10584dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01058508: 0x1058508: addu  v1, s2, zero
+// 0x01058518: 0x1058518: addu  v1, s2, zero
 	ldloc 8
 	stloc 7
-L_105850c:
-// 0x0105850c: 0x105850c: addiu a1, s0, -1
+L_105851c:
+// 0x0105851c: 0x105851c: addiu a1, s0, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01058510: 0x1058510: sll   a1, a1, 3
+// 0x01058520: 0x1058520: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x01058514: 0x1058514: lui   t0, 0x1050000
+// 0x01058524: 0x1058524: lui   t0, 0x1050000
 	ldc.i4 17104896
 	stloc 11
-// 0x01058518: 0x1058518: addiu v0, zero, 1
+// 0x01058528: 0x1058528: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105851c: 0x105851c: addiu s0, s0, -2
+// 0x0105852c: 0x105852c: addiu s0, s0, -2
 	ldloc 9
 	ldc.i4.s -2
 	add
 	stloc 9
-// 0x01058520: 0x1058520: addiu t0, t0, 26584
+// 0x01058530: 0x1058530: addiu t0, t0, 26600
 	ldloc 11
-	ldc.i4 26584
+	ldc.i4 26600
 	add
 	stloc 11
-// 0x01058524: 0x1058524: sw    v1, 28(sp)
+// 0x01058534: 0x1058534: sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6500,24 +6500,24 @@ L_105850c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01058528: 0x1058528: addu  a0, s1, zero
+// 0x01058538: 0x1058538: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0105852c: 0x105852c: addiu v1, zero, -1
+// 0x0105853c: 0x105853c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01058530: 0x1058530: addu  a1, s1, a1
+// 0x01058540: 0x1058540: addu  a1, s1, a1
 	ldloc 10
 	ldloc.2
 	add
 	stloc.2
-// 0x01058534: 0x1058534: addu  a2, zero, zero
+// 0x01058544: 0x1058544: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01058538: 0x1058538: addu  a3, s1, zero
+// 0x01058548: 0x1058548: addu  a3, s1, zero
 	ldloc 10
 	stloc 4
-// 0x0105853c: 0x105853c: sw    s0, 20(sp)
+// 0x0105854c: 0x105854c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6526,7 +6526,7 @@ L_105850c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01058540: 0x1058540: sw    t0, 24(sp)
+// 0x01058550: 0x1058550: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6535,7 +6535,7 @@ L_105850c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01058544: 0x1058544: sw    v0, 32(sp)
+// 0x01058554: 0x1058554: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6544,7 +6544,7 @@ L_105850c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01058548: 0x1058548: sw    v1, 36(sp)
+// 0x01058558: 0x1058558: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6553,7 +6553,7 @@ L_105850c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105854c: 0x105854c: jal   0x1022e0c sw    v0, 16(sp)
+// 0x0105855c: 0x105855c: jal   0x1022e1c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6567,14 +6567,14 @@ L_105850c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1058554:
-// 0x01058554: 0x1058554: lw    ra, 60(sp)
-// 0x01058558: 0x1058558: lw    s2, 56(sp)
+L_1058564:
+// 0x01058564: 0x1058564: lw    ra, 60(sp)
+// 0x01058568: 0x1058568: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6583,7 +6583,7 @@ L_1058554:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105855c: 0x105855c: lw    s1, 52(sp)
+// 0x0105856c: 0x105856c: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6592,7 +6592,7 @@ L_1058554:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058560: 0x1058560: lw    s0, 48(sp)
+// 0x01058570: 0x1058570: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6601,7 +6601,7 @@ L_1058554:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01058564: 0x1058564: jr    ra addiu sp, sp, 64
+// 0x01058574: 0x1058574: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -6613,7 +6613,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_screen_repaint_105856c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_screen_repaint_105857c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s4,int32 s6,int32 lo,int32 s2,int32 s3,int32 hi,int32 s5,int32 s7,int32 s8,int32 ra)
@@ -6681,26 +6681,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105856c:
-// 0x0105856c: 0x105856c: lui   v0, 0x70000
+L_105857c:
+// 0x0105857c: 0x105857c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01058570: 0x1058570: lw    v0, 10348(v0)
+// 0x01058580: 0x1058580: lw    v0, 10812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2587
+	ldc.i4 2703
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058574: 0x1058574: addiu sp, sp, -112
+// 0x01058584: 0x1058584: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x01058578: 0x1058578: sw    ra, 108(sp)
-// 0x0105857c: 0x105857c: sw    s8, 104(sp)
+// 0x01058588: 0x1058588: sw    ra, 108(sp)
+// 0x0105858c: 0x105858c: sw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6709,7 +6709,7 @@ L_105856c:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01058580: 0x1058580: sw    s7, 100(sp)
+// 0x01058590: 0x1058590: sw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6718,7 +6718,7 @@ L_105856c:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01058584: 0x1058584: sw    s6, 96(sp)
+// 0x01058594: 0x1058594: sw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6727,7 +6727,7 @@ L_105856c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01058588: 0x1058588: sw    s5, 92(sp)
+// 0x01058598: 0x1058598: sw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6736,7 +6736,7 @@ L_105856c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105858c: 0x105858c: sw    s4, 88(sp)
+// 0x0105859c: 0x105859c: sw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6745,7 +6745,7 @@ L_105856c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01058590: 0x1058590: sw    s3, 84(sp)
+// 0x010585a0: 0x10585a0: sw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6754,7 +6754,7 @@ L_105856c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01058594: 0x1058594: sw    s2, 80(sp)
+// 0x010585a4: 0x10585a4: sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6763,7 +6763,7 @@ L_105856c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01058598: 0x1058598: sw    s1, 76(sp)
+// 0x010585a8: 0x10585a8: sw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6772,7 +6772,7 @@ L_105856c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105859c: 0x105859c: beq   v0, zero, 0x10585c8 sw    s0, 72(sp)
+// 0x010585ac: 0x10585ac: beq   v0, zero, 0x10585d8 sw    s0, 72(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6782,308 +6782,308 @@ L_105856c:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_10585c8
+	brfalse L_10585d8
 // --- basic block ---
-// 0x010585a4: 0x10585a4: lui   s0, 0x70000
+// 0x010585b4: 0x10585b4: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010585a8: 0x10585a8: lw    v0, 10352(s0)
+// 0x010585b8: 0x10585b8: lw    v0, 10816(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2588
+	ldc.i4 2704
 	add
 	ldelem.i4
 	stloc 5
-// 0x010585ac: 0x10585ac: sll   zero, zero, 0
-// 0x010585b0: 0x10585b0: bne   v0, zero, 0x1058a24 lui   a0, 0x1060000
+// 0x010585bc: 0x10585bc: sll   zero, zero, 0
+// 0x010585c0: 0x10585c0: bne   v0, zero, 0x1058a34 lui   a0, 0x1060000
 	ldloc 5
 	ldc.i4 17170432
 	stloc.1
-	brtrue L_1058a24
+	brtrue L_1058a34
 // --- basic block ---
-// 0x010585b8: 0x10585b8: jal   0x101f970 addiu a0, a0, -30124
+// 0x010585c8: 0x10585c8: jal   0x101f980 addiu a0, a0, -30108
 	ldloc.1
-	ldc.i4 -30124
+	ldc.i4 -30108
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010585c0: 0x10585c0: j	 0x1058a24 sw    v0, 10352(s0)
+// 0x010585d0: 0x10585d0: j	 0x1058a34 sw    v0, 10816(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2588
+	ldc.i4 2704
 	add
 	ldloc 5
 	stelem.i4
-	br L_1058a24
+	br L_1058a34
 // --- basic block ---
-L_10585c8:
-// 0x010585c8: 0x10585c8: lui   s0, 0x70000
+L_10585d8:
+// 0x010585d8: 0x10585d8: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010585cc: 0x10585cc: jal   0x1007a5c sw    zero, 10356(s0)
+// 0x010585dc: 0x10585dc: jal   0x1007a6c sw    zero, 10820(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2589
+	ldc.i4 2705
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_get_zoom_1007a5c()
+	call int32 Cibyl5::roadmap_math_get_zoom_1007a6c()
 	stloc 5
 // --- basic block ---
-// 0x010585d4: 0x10585d4: slti  v0, v0, 100
+// 0x010585e4: 0x10585e4: slti  v0, v0, 100
 	ldloc 5
 	ldc.i4.s 100
 	clt
 	stloc 5
-// 0x010585d8: 0x10585d8: bne   v0, zero, 0x1058660 lui   v0, 0x70000
+// 0x010585e8: 0x10585e8: bne   v0, zero, 0x1058670 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1058660
+	brtrue L_1058670
 // --- basic block ---
-// 0x010585e0: 0x10585e0: lui   v0, 0x70000
+// 0x010585f0: 0x10585f0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010585e4: 0x10585e4: lw    v0, 10028(v0)
+// 0x010585f4: 0x10585f4: lw    v0, 10492(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc 5
-// 0x010585e8: 0x10585e8: sll   zero, zero, 0
-// 0x010585ec: 0x10585ec: bne   v0, zero, 0x105864c lui   v0, 0x70000
+// 0x010585f8: 0x10585f8: sll   zero, zero, 0
+// 0x010585fc: 0x10585fc: bne   v0, zero, 0x105865c lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_105864c
+	brtrue L_105865c
 // --- basic block ---
-// 0x010585f4: 0x10585f4: lw    v0, 9160(v0)
+// 0x01058604: 0x1058604: lw    v0, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x010585f8: 0x10585f8: sll   zero, zero, 0
-// 0x010585fc: 0x10585fc: beq   v0, zero, 0x1058660 lui   v0, 0x70000
+// 0x01058608: 0x1058608: sll   zero, zero, 0
+// 0x0105860c: 0x105860c: beq   v0, zero, 0x1058670 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1058660
+	brfalse L_1058670
 // --- basic block ---
-// 0x01058604: 0x1058604: lw    v1, 10356(s0)
+// 0x01058614: 0x1058614: lw    v1, 10820(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2589
+	ldc.i4 2705
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058608: 0x1058608: lui   v0, 0x70000
+// 0x01058618: 0x1058618: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105860c: 0x105860c: sll   v1, v1, 2
+// 0x0105861c: 0x105861c: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01058610: 0x1058610: addiu v0, v0, 9996
+// 0x01058620: 0x1058620: addiu v0, v0, 10460
 	ldloc 5
-	ldc.i4 9996
+	ldc.i4 10460
 	add
 	stloc 5
-// 0x01058614: 0x1058614: addu  v0, v1, v0
+// 0x01058624: 0x1058624: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01058618: 0x1058618: lw    v0, 0(v0)
+// 0x01058628: 0x1058628: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105861c: 0x105861c: sll   zero, zero, 0
-// 0x01058620: 0x1058620: blez  v0, 0x105865c lui   v0, 0x70000
+// 0x0105862c: 0x105862c: sll   zero, zero, 0
+// 0x01058630: 0x1058630: blez  v0, 0x105866c lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
 	ldc.i4.s 0
-	ble L_105865c
+	ble L_105866c
 // --- basic block ---
-// 0x01058628: 0x1058628: lw    v0, 10288(v0)
+// 0x01058638: 0x1058638: lw    v0, 10752(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2572
+	ldc.i4 2688
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105862c: 0x105862c: sll   zero, zero, 0
-// 0x01058630: 0x1058630: beq   v0, zero, 0x105864c lui   v1, 0x70000
+// 0x0105863c: 0x105863c: sll   zero, zero, 0
+// 0x01058640: 0x1058640: beq   v0, zero, 0x105865c lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 7
-	brfalse L_105864c
+	brfalse L_105865c
 // --- basic block ---
-// 0x01058638: 0x1058638: lw    v1, 9168(v1)
+// 0x01058648: 0x1058648: lw    v1, 9632(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105863c: 0x105863c: sll   zero, zero, 0
-// 0x01058640: 0x1058640: slt   v0, v0, v1
+// 0x0105864c: 0x105864c: sll   zero, zero, 0
+// 0x01058650: 0x1058650: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01058644: 0x1058644: beq   v0, zero, 0x1058660 lui   v0, 0x70000
+// 0x01058654: 0x1058654: beq   v0, zero, 0x1058670 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1058660
+	brfalse L_1058670
 // --- basic block ---
-L_105864c:
-// 0x0105864c: 0x105864c: jal   0x1058410 sll   zero, zero, 0
+L_105865c:
+// 0x0105865c: 0x105865c: jal   0x1058420 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_screen_outline_1058410(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_screen_outline_1058420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01058654: 0x1058654: j	 0x1058a24 sll   zero, zero, 0
-	br L_1058a24
+// 0x01058664: 0x1058664: j	 0x1058a34 sll   zero, zero, 0
+	br L_1058a34
 // --- basic block ---
-L_105865c:
-// 0x0105865c: 0x105865c: lui   v0, 0x70000
+L_105866c:
+// 0x0105866c: 0x105866c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1058660:
-// 0x01058660: 0x1058660: lw    v0, 9160(v0)
+L_1058670:
+// 0x01058670: 0x1058670: lw    v0, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058664: 0x1058664: sll   zero, zero, 0
-// 0x01058668: 0x1058668: beq   v0, zero, 0x1058a24 lui   v0, 0x70000
+// 0x01058674: 0x1058674: sll   zero, zero, 0
+// 0x01058678: 0x1058678: beq   v0, zero, 0x1058a34 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1058a24
+	brfalse L_1058a34
 // --- basic block ---
-// 0x01058670: 0x1058670: lw    v0, 10700(v0)
+// 0x01058680: 0x1058680: lw    v0, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058674: 0x1058674: sll   zero, zero, 0
-// 0x01058678: 0x1058678: andi  v0, v0, 192
+// 0x01058684: 0x1058684: sll   zero, zero, 0
+// 0x01058688: 0x1058688: andi  v0, v0, 192
 	ldloc 5
 	ldc.i4 192
 	and
 	stloc 5
-// 0x0105867c: 0x105867c: bne   v0, zero, 0x105868c lui   s6, 0x70000
+// 0x0105868c: 0x105868c: bne   v0, zero, 0x105869c lui   s6, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 11
-	brtrue L_105868c
+	brtrue L_105869c
 // --- basic block ---
-// 0x01058684: 0x1058684: j	 0x1058694 addiu s6, s6, 10636
+// 0x01058694: 0x1058694: j	 0x10586a4 addiu s6, s6, 11100
 	ldloc 11
-	ldc.i4 10636
+	ldc.i4 11100
 	add
 	stloc 11
-	br L_1058694
+	br L_10586a4
 // --- basic block ---
-L_105868c:
-// 0x0105868c: 0x105868c: lui   s6, 0x70000
+L_105869c:
+// 0x0105869c: 0x105869c: lui   s6, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x01058690: 0x1058690: addiu s6, s6, 10668
+// 0x010586a0: 0x10586a0: addiu s6, s6, 11132
 	ldloc 11
-	ldc.i4 10668
+	ldc.i4 11132
 	add
 	stloc 11
-L_1058694:
-// 0x01058694: 0x1058694: lui   s0, 0x70000
+L_10586a4:
+// 0x010586a4: 0x10586a4: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01058698: 0x1058698: lw    v0, 10020(s0)
+// 0x010586a8: 0x10586a8: lw    v0, 10484(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105869c: 0x105869c: sll   zero, zero, 0
-// 0x010586a0: 0x10586a0: bne   v0, zero, 0x1058720 lui   v0, 0x70000
+// 0x010586ac: 0x10586ac: sll   zero, zero, 0
+// 0x010586b0: 0x10586b0: bne   v0, zero, 0x1058730 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1058720
+	brtrue L_1058730
 // --- basic block ---
-// 0x010586a8: 0x10586a8: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x010586b8: 0x10586b8: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010586b0: 0x10586b0: beq   v0, zero, 0x1058720 lui   v0, 0x70000
+// 0x010586c0: 0x10586c0: beq   v0, zero, 0x1058730 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1058720
+	brfalse L_1058730
 // --- basic block ---
-// 0x010586b8: 0x10586b8: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x010586c8: 0x10586c8: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010586c0: 0x10586c0: lui   a1, 0x10000
+// 0x010586d0: 0x10586d0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010586c4: 0x10586c4: addu  a0, v0, zero
+// 0x010586d4: 0x10586d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010586c8: 0x10586c8: jal   0x1001b14 addiu a1, a1, -31052
+// 0x010586d8: 0x10586d8: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -7093,24 +7093,24 @@ L_1058694:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010586d0: 0x10586d0: bne   v0, zero, 0x1058720 lui   v0, 0x70000
+// 0x010586e0: 0x10586e0: bne   v0, zero, 0x1058730 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1058720
+	brtrue L_1058730
 // --- basic block ---
-// 0x010586d8: 0x10586d8: addiu v0, zero, 1
+// 0x010586e8: 0x10586e8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010586dc: 0x10586dc: lui   s1, 0x10000
+// 0x010586ec: 0x10586ec: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x010586e0: 0x10586e0: jal   0x101ebac sw    v0, 10020(s0)
+// 0x010586f0: 0x10586f0: jal   0x101ebbc sw    v0, 10484(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldloc 5
 	stelem.i4
@@ -7119,12 +7119,12 @@ L_1058694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_stop_101ebac(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_stop_101ebbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010586e8: 0x10586e8: jal   0x101df50 addiu a0, s1, -29760
+// 0x010586f8: 0x10586f8: jal   0x101df60 addiu a0, s1, -29760
 	ldloc 9
 	ldc.i4 -29760
 	add
@@ -7134,18 +7134,18 @@ L_1058694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010586f0: 0x10586f0: beq   v0, zero, 0x1058704 lui   v1, 0x0
+// 0x01058700: 0x1058700: beq   v0, zero, 0x1058714 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1058704
+	brfalse L_1058714
 // --- basic block ---
-// 0x010586f8: 0x10586f8: jal   0x101f044 addiu a0, s1, -29760
+// 0x01058708: 0x1058708: jal   0x101f054 addiu a0, s1, -29760
 	ldloc 9
 	ldc.i4 -29760
 	add
@@ -7155,21 +7155,21 @@ L_1058694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01058700: 0x1058700: lui   v1, 0x0
+// 0x01058710: 0x1058710: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-L_1058704:
-// 0x01058704: 0x1058704: addiu v0, v1, 14216
+L_1058714:
+// 0x01058714: 0x1058714: addiu v0, v1, 14216
 	ldloc 7
 	ldc.i4 14216
 	add
 	stloc 5
-// 0x01058708: 0x1058708: lw    a2, 8(v0)
+// 0x01058718: 0x1058718: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7178,7 +7178,7 @@ L_1058704:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105870c: 0x105870c: lw    a0, 14216(v1)
+// 0x0105871c: 0x105871c: lw    a0, 14216(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7187,7 +7187,7 @@ L_1058704:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01058710: 0x1058710: lw    a1, 4(v0)
+// 0x01058720: 0x1058720: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7196,71 +7196,71 @@ L_1058704:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01058714: 0x1058714: jal   0x1029e68 sll   zero, zero, 0
+// 0x01058724: 0x1058724: jal   0x1029e78 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_route_1029e68(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_route_1029e78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105871c: 0x105871c: lui   v0, 0x70000
+// 0x0105872c: 0x105872c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1058720:
-// 0x01058720: 0x1058720: lui   v1, 0x70000
+L_1058730:
+// 0x01058730: 0x1058730: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01058724: 0x1058724: lw    a1, 9168(v0)
+// 0x01058734: 0x1058734: lw    a1, 9632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc.2
-// 0x01058728: 0x1058728: lw    a2, 9172(v1)
+// 0x01058738: 0x1058738: lw    a2, 9636(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105872c: 0x105872c: lui   v0, 0x70000
+// 0x0105873c: 0x105873c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01058730: 0x1058730: lw    a0, 9176(v0)
+// 0x01058740: 0x1058740: lw    a0, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.1
-// 0x01058734: 0x1058734: addu  a1, a2, a1
+// 0x01058744: 0x1058744: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x01058738: 0x1058738: lui   s8, 0xe0000
+// 0x01058748: 0x1058748: lui   s8, 0xe0000
 	ldc.i4 917504
 	stloc 18
-// 0x0105873c: 0x105873c: subu  a0, a1, a0
+// 0x0105874c: 0x105874c: subu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.1
-// 0x01058740: 0x1058740: addiu v0, zero, -1
+// 0x01058750: 0x1058750: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01058744: 0x1058744: sw    a0, 60(sp)
+// 0x01058754: 0x1058754: sw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7269,13 +7269,13 @@ L_1058720:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01058748: 0x1058748: addu  s2, zero, zero
+// 0x01058758: 0x1058758: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x0105874c: 0x105874c: addu  s4, zero, zero
+// 0x0105875c: 0x105875c: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01058750: 0x1058750: sw    v0, 56(sp)
+// 0x01058760: 0x1058760: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7284,150 +7284,150 @@ L_1058720:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01058754: 0x1058754: addiu s5, zero, -1
+// 0x01058764: 0x1058764: addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 16
-// 0x01058758: 0x1058758: addu  s1, zero, zero
+// 0x01058768: 0x1058768: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0105875c: 0x105875c: addiu s3, s8, 29604
+// 0x0105876c: 0x105876c: addiu s3, s8, 30068
 	ldloc 18
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 14
-// 0x01058760: 0x1058760: j	 0x10589ec lui   s7, 0xe0000
+// 0x01058770: 0x1058770: j	 0x10589fc lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 17
-	br L_10589ec
+	br L_10589fc
 // --- basic block ---
-L_1058768:
-// 0x01058768: 0x1058768: lw    v1, 9172(a0)
+L_1058778:
+// 0x01058778: 0x1058778: lw    v1, 9636(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105876c: 0x105876c: sll   zero, zero, 0
-// 0x01058770: 0x1058770: slt   v0, s1, v1
+// 0x0105877c: 0x105877c: sll   zero, zero, 0
+// 0x01058780: 0x1058780: slt   v0, s1, v1
 	ldloc 9
 	ldloc 7
 	clt
 	stloc 5
-// 0x01058774: 0x1058774: beq   v0, zero, 0x1058798 lui   v0, 0x70000
+// 0x01058784: 0x1058784: beq   v0, zero, 0x10587a8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1058798
+	brfalse L_10587a8
 // --- basic block ---
-// 0x0105877c: 0x105877c: addiu v0, zero, 56
+// 0x0105878c: 0x105878c: addiu v0, zero, 56
 	ldc.i4.s 56
 	stloc 5
-// 0x01058780: 0x1058780: mult  s1, v0
+// 0x01058790: 0x1058790: mult  s1, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 12
-// 0x01058784: 0x1058784: lui   v1, 0x70000
+// 0x01058794: 0x1058794: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01058788: 0x1058788: lw    s0, 10724(v1)
+// 0x01058798: 0x1058798: lw    s0, 11188(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105878c: 0x105878c: mflo  lo
+// 0x0105879c: 0x105879c: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x01058790: 0x1058790: j	 0x10587bc addu  s0, s0, a0
+// 0x010587a0: 0x10587a0: j	 0x10587cc addu  s0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-	br L_10587bc
+	br L_10587cc
 // --- basic block ---
-L_1058798:
-// 0x01058798: 0x1058798: lw    s0, 9176(v0)
+L_10587a8:
+// 0x010587a8: 0x10587a8: lw    s0, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105879c: 0x105879c: lui   a0, 0x70000
+// 0x010587ac: 0x10587ac: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010587a0: 0x10587a0: subu  s0, s0, v1
+// 0x010587b0: 0x10587b0: subu  s0, s0, v1
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 8
-// 0x010587a4: 0x10587a4: addu  s0, s0, s1
+// 0x010587b4: 0x10587b4: addu  s0, s0, s1
 	ldloc 8
 	ldloc 9
 	add
 	stloc 8
-// 0x010587a8: 0x10587a8: addiu v1, zero, 56
+// 0x010587b8: 0x10587b8: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x010587ac: 0x10587ac: mult  s0, v1
+// 0x010587bc: 0x10587bc: mult  s0, v1
 	ldloc 8
 	ldloc 7
 	mul
 	stloc 12
-// 0x010587b0: 0x10587b0: lw    v0, 10720(a0)
+// 0x010587c0: 0x10587c0: lw    v0, 11184(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 5
-// 0x010587b4: 0x10587b4: mflo  lo
+// 0x010587c4: 0x10587c4: mflo  lo
 	ldloc 12
 	stloc 8
-// 0x010587b8: 0x10587b8: addu  s0, v0, s0
+// 0x010587c8: 0x10587c8: addu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-L_10587bc:
-// 0x010587bc: 0x10587bc: lb    v0, 55(s0)
+L_10587cc:
+// 0x010587cc: 0x10587cc: lb    v0, 55(s0)
 	ldloc 8
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010587c0: 0x10587c0: sll   zero, zero, 0
-// 0x010587c4: 0x10587c4: beq   v0, zero, 0x10589e8 sll   zero, zero, 0
+// 0x010587d0: 0x10587d0: sll   zero, zero, 0
+// 0x010587d4: 0x10587d4: beq   v0, zero, 0x10589f8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10589e8
+	brfalse L_10589f8
 // --- basic block ---
-// 0x010587cc: 0x10587cc: lh    v0, 46(s0)
+// 0x010587dc: 0x10587dc: lh    v0, 46(s0)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x010587d0: 0x10587d0: sll   zero, zero, 0
-// 0x010587d4: 0x10587d4: beq   v0, zero, 0x10589e8 addiu v0, sp, 44
+// 0x010587e0: 0x10587e0: sll   zero, zero, 0
+// 0x010587e4: 0x10587e4: beq   v0, zero, 0x10589f8 addiu v0, sp, 44
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 5
-	brfalse L_10589e8
+	brfalse L_10589f8
 // --- basic block ---
-// 0x010587dc: 0x10587dc: lw    a0, 24(s0)
+// 0x010587ec: 0x10587ec: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7436,22 +7436,22 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010587e0: 0x10587e0: addiu a1, sp, 48
+// 0x010587f0: 0x10587f0: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x010587e4: 0x10587e4: addiu a2, sp, 40
+// 0x010587f4: 0x10587f4: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x010587e8: 0x10587e8: addiu a3, sp, 52
+// 0x010587f8: 0x10587f8: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x010587ec: 0x10587ec: jal   0x100c85c sw    v0, 16(sp)
+// 0x010587fc: 0x10587fc: jal   0x100c86c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7465,12 +7465,12 @@ L_10587bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_edges_100c85c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_edges_100c86c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010587f4: 0x10587f4: lw    v0, 56(s3)
+// 0x01058804: 0x1058804: lw    v0, 56(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7479,7 +7479,7 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010587f8: 0x10587f8: lw    v1, 48(sp)
+// 0x01058808: 0x1058808: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7488,17 +7488,17 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010587fc: 0x10587fc: sll   zero, zero, 0
-// 0x01058800: 0x1058800: slt   v0, v0, v1
+// 0x0105880c: 0x105880c: sll   zero, zero, 0
+// 0x01058810: 0x1058810: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01058804: 0x1058804: bne   v0, zero, 0x10589e8 sll   zero, zero, 0
+// 0x01058814: 0x1058814: bne   v0, zero, 0x10589f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10589e8
+	brtrue L_10589f8
 // --- basic block ---
-// 0x0105880c: 0x105880c: lw    v0, 64(s3)
+// 0x0105881c: 0x105881c: lw    v0, 64(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7507,7 +7507,7 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058810: 0x1058810: lw    v1, 40(sp)
+// 0x01058820: 0x1058820: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7516,17 +7516,17 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058814: 0x1058814: sll   zero, zero, 0
-// 0x01058818: 0x1058818: slt   v0, v1, v0
+// 0x01058824: 0x1058824: sll   zero, zero, 0
+// 0x01058828: 0x1058828: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x0105881c: 0x105881c: bne   v0, zero, 0x10589e8 sll   zero, zero, 0
+// 0x0105882c: 0x105882c: bne   v0, zero, 0x10589f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10589e8
+	brtrue L_10589f8
 // --- basic block ---
-// 0x01058824: 0x1058824: lw    v0, 60(s3)
+// 0x01058834: 0x1058834: lw    v0, 60(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7535,7 +7535,7 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058828: 0x1058828: lw    v1, 52(sp)
+// 0x01058838: 0x1058838: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7544,17 +7544,17 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105882c: 0x105882c: sll   zero, zero, 0
-// 0x01058830: 0x1058830: slt   v0, v0, v1
+// 0x0105883c: 0x105883c: sll   zero, zero, 0
+// 0x01058840: 0x1058840: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01058834: 0x1058834: bne   v0, zero, 0x10589e8 sll   zero, zero, 0
+// 0x01058844: 0x1058844: bne   v0, zero, 0x10589f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10589e8
+	brtrue L_10589f8
 // --- basic block ---
-// 0x0105883c: 0x105883c: lw    v0, 68(s3)
+// 0x0105884c: 0x105884c: lw    v0, 68(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -7563,7 +7563,7 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058840: 0x1058840: lw    v1, 44(sp)
+// 0x01058850: 0x1058850: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7572,46 +7572,46 @@ L_10587bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058844: 0x1058844: sll   zero, zero, 0
-// 0x01058848: 0x1058848: slt   v0, v1, v0
+// 0x01058854: 0x1058854: sll   zero, zero, 0
+// 0x01058858: 0x1058858: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x0105884c: 0x105884c: bne   v0, zero, 0x10589e8 lui   v1, 0x0
+// 0x0105885c: 0x105885c: bne   v0, zero, 0x10589f8 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_10589e8
+	brtrue L_10589f8
 // --- basic block ---
-// 0x01058854: 0x1058854: j	 0x1058a08 sll   zero, zero, 0
-	br L_1058a08
+// 0x01058864: 0x1058864: j	 0x1058a18 sll   zero, zero, 0
+	br L_1058a18
 // --- basic block ---
-L_105885c:
-// 0x0105885c: 0x105885c: bltz  a0, 0x105886c sll   zero, zero, 0
+L_105886c:
+// 0x0105886c: 0x105886c: bltz  a0, 0x105887c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105886c
+	blt L_105887c
 // --- basic block ---
-// 0x01058864: 0x1058864: jal   0x100b164 sll   zero, zero, 0
+// 0x01058874: 0x1058874: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105886c:
-// 0x0105886c: 0x105886c: lb    v0, 51(s0)
+L_105887c:
+// 0x0105887c: 0x105887c: lb    v0, 51(s0)
 	ldloc 8
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01058870: 0x1058870: lw    v1, 56(sp)
+// 0x01058880: 0x1058880: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7620,37 +7620,37 @@ L_105886c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058874: 0x1058874: sll   zero, zero, 0
-// 0x01058878: 0x1058878: beq   v0, v1, 0x10589a0 addiu a0, zero, 192
+// 0x01058884: 0x1058884: sll   zero, zero, 0
+// 0x01058888: 0x1058888: beq   v0, v1, 0x10589b0 addiu a0, zero, 192
 	ldloc 5
 	ldloc 7
 	ldc.i4 192
 	stloc.1
-	beq  L_10589a0
+	beq  L_10589b0
 // --- basic block ---
-// 0x01058880: 0x1058880: mult  v0, a0
+// 0x01058890: 0x1058890: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 12
-// 0x01058884: 0x1058884: lw    a0, 29728(s7)
+// 0x01058894: 0x1058894: lw    a0, 30192(s7)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc.1
-// 0x01058888: 0x1058888: mflo  lo
+// 0x01058898: 0x1058898: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x0105888c: 0x105888c: addu  a0, a0, v1
+// 0x0105889c: 0x105889c: addu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-// 0x01058890: 0x1058890: lw    a1, 8(a0)
+// 0x010588a0: 0x10588a0: lw    a1, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7659,12 +7659,12 @@ L_105886c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01058894: 0x1058894: sll   zero, zero, 0
-// 0x01058898: 0x1058898: beq   a1, zero, 0x1058924 sll   zero, zero, 0
+// 0x010588a4: 0x10588a4: sll   zero, zero, 0
+// 0x010588a8: 0x10588a8: beq   a1, zero, 0x1058934 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1058924
+	brfalse L_1058934
 // --- basic block ---
-// 0x010588a0: 0x10588a0: lw    a0, 16(a0)
+// 0x010588b0: 0x10588b0: lw    a0, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7673,33 +7673,33 @@ L_105886c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010588a4: 0x10588a4: lw    a1, 29604(s8)
+// 0x010588b4: 0x10588b4: lw    a1, 30068(s8)
 	ldloc 6
 	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.2
-// 0x010588a8: 0x10588a8: sll   zero, zero, 0
-// 0x010588ac: 0x10588ac: slt   a0, a1, a0
+// 0x010588b8: 0x10588b8: sll   zero, zero, 0
+// 0x010588bc: 0x10588bc: slt   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.1
-// 0x010588b0: 0x10588b0: beq   a0, zero, 0x1058924 addiu a0, zero, 16
+// 0x010588c0: 0x10588c0: beq   a0, zero, 0x1058934 addiu a0, zero, 16
 	ldloc.1
 	ldc.i4.s 16
 	stloc.1
-	brfalse L_1058924
+	brfalse L_1058934
 // --- basic block ---
-// 0x010588b8: 0x10588b8: bne   v0, a0, 0x10588d4 sll   zero, zero, 0
+// 0x010588c8: 0x10588c8: bne   v0, a0, 0x10588e4 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_10588d4
+	bne.un L_10588e4
 // --- basic block ---
-// 0x010588c0: 0x10588c0: jal   0x101f998 sw    v1, 68(sp)
+// 0x010588d0: 0x10588d0: jal   0x101f9a8 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7708,10 +7708,10 @@ L_105886c:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_fast_refresh_101f998()
+	call int32 Cibyl23::roadmap_screen_fast_refresh_101f9a8()
 	stloc 5
 // --- basic block ---
-// 0x010588c8: 0x10588c8: lw    v1, 68(sp)
+// 0x010588d8: 0x10588d8: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7720,27 +7720,27 @@ L_105886c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010588cc: 0x10588cc: bne   v0, zero, 0x1058924 sll   zero, zero, 0
+// 0x010588dc: 0x10588dc: bne   v0, zero, 0x1058934 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1058924
+	brtrue L_1058934
 // --- basic block ---
-L_10588d4:
-// 0x010588d4: 0x10588d4: lw    v0, 29728(s7)
+L_10588e4:
+// 0x010588e4: 0x10588e4: lw    v0, 30192(s7)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x010588d8: 0x10588d8: sll   zero, zero, 0
-// 0x010588dc: 0x10588dc: addu  v1, v0, v1
+// 0x010588e8: 0x10588e8: sll   zero, zero, 0
+// 0x010588ec: 0x10588ec: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x010588e0: 0x10588e0: lw    v0, 120(v1)
+// 0x010588f0: 0x10588f0: lw    v0, 120(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7749,12 +7749,12 @@ L_10588d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010588e4: 0x10588e4: sll   zero, zero, 0
-// 0x010588e8: 0x10588e8: beq   v0, zero, 0x1058924 sll   zero, zero, 0
+// 0x010588f4: 0x10588f4: sll   zero, zero, 0
+// 0x010588f8: 0x10588f8: beq   v0, zero, 0x1058934 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1058924
+	brfalse L_1058934
 // --- basic block ---
-// 0x010588f0: 0x10588f0: lw    a0, 48(v1)
+// 0x01058900: 0x1058900: lw    a0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7763,27 +7763,27 @@ L_10588d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010588f4: 0x10588f4: sll   zero, zero, 0
-// 0x010588f8: 0x10588f8: beq   a0, zero, 0x1058928 addiu v1, zero, 5
+// 0x01058904: 0x1058904: sll   zero, zero, 0
+// 0x01058908: 0x1058908: beq   a0, zero, 0x1058938 addiu v1, zero, 5
 	ldloc.1
 	ldc.i4.5
 	stloc 7
-	brfalse L_1058928
+	brfalse L_1058938
 // --- basic block ---
-// 0x01058900: 0x1058900: jal   0x104dd48 sll   zero, zero, 0
+// 0x01058910: 0x1058910: jal   0x104dd58 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd48(int32)
+	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd58(int32)
 	stloc 5
 // --- basic block ---
-// 0x01058908: 0x1058908: sll   v0, v0, 1
+// 0x01058918: 0x1058918: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x0105890c: 0x105890c: addiu a0, zero, 3
+// 0x0105891c: 0x105891c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01058910: 0x1058910: div   v0, a0
+// 0x01058920: 0x1058920: div   v0, a0
 	ldloc 5
 	ldloc.1
 	ldloc 5
@@ -7792,45 +7792,45 @@ L_10588d4:
 	stloc 12
 	rem
 	stloc 15
-// 0x01058914: 0x1058914: mflo  lo
+// 0x01058924: 0x1058924: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x01058918: 0x1058918: slti  v0, v1, 5
+// 0x01058928: 0x1058928: slti  v0, v1, 5
 	ldloc 7
 	ldc.i4.5
 	clt
 	stloc 5
-// 0x0105891c: 0x105891c: beq   v0, zero, 0x1058928 sll   zero, zero, 0
+// 0x0105892c: 0x105892c: beq   v0, zero, 0x1058938 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1058928
+	brfalse L_1058938
 // --- basic block ---
-L_1058924:
-// 0x01058924: 0x1058924: addiu v1, zero, 5
+L_1058934:
+// 0x01058934: 0x1058934: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-L_1058928:
-// 0x01058928: 0x1058928: beq   v1, s5, 0x1058994 sll   zero, zero, 0
+L_1058938:
+// 0x01058938: 0x1058938: beq   v1, s5, 0x10589a4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 16
-	beq  L_1058994
+	beq  L_10589a4
 // --- basic block ---
-// 0x01058930: 0x1058930: beq   s2, zero, 0x105894c sll   v0, s4, 2
+// 0x01058940: 0x1058940: beq   s2, zero, 0x105895c sll   v0, s4, 2
 	ldloc 13
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-	brfalse L_105894c
+	brfalse L_105895c
 // --- basic block ---
-// 0x01058938: 0x1058938: addiu s4, s4, 1
+// 0x01058948: 0x1058948: addiu s4, s4, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0105893c: 0x105893c: addiu v0, zero, 2
+// 0x0105894c: 0x105894c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01058940: 0x1058940: div   s4, v0
+// 0x01058950: 0x1058950: div   s4, v0
 	ldloc 10
 	ldloc 5
 	ldloc 10
@@ -7839,28 +7839,28 @@ L_1058928:
 	stloc 12
 	rem
 	stloc 15
-// 0x01058944: 0x1058944: mfhi  hi
+// 0x01058954: 0x1058954: mfhi  hi
 	ldloc 15
 	stloc 10
-// 0x01058948: 0x1058948: sll   v0, s4, 2
+// 0x01058958: 0x1058958: sll   v0, s4, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-L_105894c:
-// 0x0105894c: 0x105894c: addu  v0, s6, v0
+L_105895c:
+// 0x0105895c: 0x105895c: addu  v0, s6, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x01058950: 0x1058950: lw    a0, 0(v0)
+// 0x01058960: 0x1058960: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01058954: 0x1058954: jal   0x104e35c sw    v1, 68(sp)
+// 0x01058964: 0x1058964: jal   0x104e36c sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7874,12 +7874,12 @@ L_105894c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105895c: 0x105895c: lw    v1, 68(sp)
+// 0x0105896c: 0x105896c: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7888,7 +7888,7 @@ L_105894c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058960: 0x1058960: sw    v0, 64(sp)
+// 0x01058970: 0x1058970: sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7897,16 +7897,16 @@ L_105894c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01058964: 0x1058964: jal   0x104dd5c addu  a0, v1, zero
+// 0x01058974: 0x1058974: jal   0x104dd6c addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105896c: 0x105896c: lw    v0, 64(sp)
+// 0x0105897c: 0x105897c: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7915,7 +7915,7 @@ L_105894c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058970: 0x1058970: lw    v1, 68(sp)
+// 0x01058980: 0x1058980: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7924,13 +7924,13 @@ L_105894c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058974: 0x1058974: beq   v0, zero, 0x105898c addu  a0, v0, zero
+// 0x01058984: 0x1058984: beq   v0, zero, 0x105899c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_105898c
+	brfalse L_105899c
 // --- basic block ---
-// 0x0105897c: 0x105897c: jal   0x104e35c sw    v1, 68(sp)
+// 0x0105898c: 0x105898c: jal   0x104e36c sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7944,12 +7944,12 @@ L_105894c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01058984: 0x1058984: lw    v1, 68(sp)
+// 0x01058994: 0x1058994: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7958,23 +7958,23 @@ L_105894c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058988: 0x1058988: sll   zero, zero, 0
-L_105898c:
-// 0x0105898c: 0x105898c: addu  s5, v1, zero
+// 0x01058998: 0x1058998: sll   zero, zero, 0
+L_105899c:
+// 0x0105899c: 0x105899c: addu  s5, v1, zero
 	ldloc 7
 	stloc 16
-// 0x01058990: 0x1058990: addu  s2, zero, zero
+// 0x010589a0: 0x10589a0: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 13
-L_1058994:
-// 0x01058994: 0x1058994: lb    v1, 51(s0)
+L_10589a4:
+// 0x010589a4: 0x10589a4: lb    v1, 51(s0)
 	ldloc 8
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01058998: 0x1058998: sll   zero, zero, 0
-// 0x0105899c: 0x105899c: sw    v1, 56(sp)
+// 0x010589a8: 0x10589a8: sll   zero, zero, 0
+// 0x010589ac: 0x10589ac: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7983,17 +7983,17 @@ L_1058994:
 	add
 	ldloc 7
 	stelem.i4
-L_10589a0:
-// 0x010589a0: 0x10589a0: lh    v0, 40(s0)
+L_10589b0:
+// 0x010589b0: 0x10589b0: lh    v0, 40(s0)
 	ldloc 8
 	ldc.i4.s 40
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x010589a4: 0x10589a4: addu  a0, s0, zero
+// 0x010589b4: 0x10589b4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x010589a8: 0x10589a8: sw    v0, 16(sp)
+// 0x010589b8: 0x10589b8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8002,23 +8002,23 @@ L_10589a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010589ac: 0x10589ac: lh    v1, 42(s0)
+// 0x010589bc: 0x10589bc: lh    v1, 42(s0)
 	ldloc 8
 	ldc.i4.s 42
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x010589b0: 0x10589b0: sll   v0, s4, 2
+// 0x010589c0: 0x10589c0: sll   v0, s4, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010589b4: 0x10589b4: addu  v0, s6, v0
+// 0x010589c4: 0x10589c4: addu  v0, s6, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x010589b8: 0x10589b8: sw    v1, 20(sp)
+// 0x010589c8: 0x10589c8: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8027,7 +8027,7 @@ L_10589a0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010589bc: 0x10589bc: sw    v0, 28(sp)
+// 0x010589cc: 0x10589cc: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8036,26 +8036,26 @@ L_10589a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010589c0: 0x10589c0: addiu v1, zero, -1
+// 0x010589d0: 0x10589d0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010589c4: 0x10589c4: addiu v0, zero, 1
+// 0x010589d4: 0x10589d4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010589c8: 0x10589c8: addiu a1, s0, 8
+// 0x010589d8: 0x10589d8: addiu a1, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc.2
-// 0x010589cc: 0x10589cc: addu  a2, zero, zero
+// 0x010589dc: 0x10589dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010589d0: 0x10589d0: addiu a3, s0, 16
+// 0x010589e0: 0x10589e0: addiu a3, s0, 16
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 4
-// 0x010589d4: 0x10589d4: sw    zero, 24(sp)
+// 0x010589e4: 0x10589e4: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8064,7 +8064,7 @@ L_10589a0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010589d8: 0x10589d8: sw    v0, 32(sp)
+// 0x010589e8: 0x10589e8: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8073,7 +8073,7 @@ L_10589a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010589dc: 0x10589dc: jal   0x1022e0c sw    v1, 36(sp)
+// 0x010589ec: 0x10589ec: jal   0x1022e1c sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8087,24 +8087,24 @@ L_10589a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010589e4: 0x10589e4: or    s2, s2, v0
+// 0x010589f4: 0x10589f4: or    s2, s2, v0
 	ldloc 13
 	ldloc 5
 	or
 	stloc 13
-L_10589e8:
-// 0x010589e8: 0x10589e8: addiu s1, s1, 1
+L_10589f8:
+// 0x010589f8: 0x10589f8: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10589ec:
-// 0x010589ec: 0x10589ec: lw    a0, 60(sp)
+L_10589fc:
+// 0x010589fc: 0x10589fc: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8113,23 +8113,23 @@ L_10589ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010589f0: 0x10589f0: sll   zero, zero, 0
-// 0x010589f4: 0x10589f4: slt   v0, s1, a0
+// 0x01058a00: 0x1058a00: sll   zero, zero, 0
+// 0x01058a04: 0x1058a04: slt   v0, s1, a0
 	ldloc 9
 	ldloc.1
 	clt
 	stloc 5
-// 0x010589f8: 0x10589f8: bne   v0, zero, 0x1058768 lui   a0, 0x70000
+// 0x01058a08: 0x1058a08: bne   v0, zero, 0x1058778 lui   a0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc.1
-	brtrue L_1058768
+	brtrue L_1058778
 // --- basic block ---
-// 0x01058a00: 0x1058a00: j	 0x1058a24 sll   zero, zero, 0
-	br L_1058a24
+// 0x01058a10: 0x1058a10: j	 0x1058a34 sll   zero, zero, 0
+	br L_1058a34
 // --- basic block ---
-L_1058a08:
-// 0x01058a08: 0x1058a08: lw    a0, 24(s0)
+L_1058a18:
+// 0x01058a18: 0x1058a18: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8138,7 +8138,7 @@ L_1058a08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01058a0c: 0x1058a0c: lw    v0, 576(v1)
+// 0x01058a1c: 0x1058a1c: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -8147,18 +8147,18 @@ L_1058a08:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01058a10: 0x1058a10: sll   zero, zero, 0
-// 0x01058a14: 0x1058a14: bne   a0, v0, 0x105885c sll   zero, zero, 0
+// 0x01058a20: 0x1058a20: sll   zero, zero, 0
+// 0x01058a24: 0x1058a24: bne   a0, v0, 0x105886c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_105885c
+	bne.un L_105886c
 // --- basic block ---
-// 0x01058a1c: 0x1058a1c: j	 0x105886c sll   zero, zero, 0
-	br L_105886c
+// 0x01058a2c: 0x1058a2c: j	 0x105887c sll   zero, zero, 0
+	br L_105887c
 // --- basic block ---
-L_1058a24:
-// 0x01058a24: 0x1058a24: lw    ra, 108(sp)
-// 0x01058a28: 0x1058a28: lw    s8, 104(sp)
+L_1058a34:
+// 0x01058a34: 0x1058a34: lw    ra, 108(sp)
+// 0x01058a38: 0x1058a38: lw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8167,7 +8167,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01058a2c: 0x1058a2c: lw    s7, 100(sp)
+// 0x01058a3c: 0x1058a3c: lw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8176,7 +8176,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01058a30: 0x1058a30: lw    s6, 96(sp)
+// 0x01058a40: 0x1058a40: lw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8185,7 +8185,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01058a34: 0x1058a34: lw    s5, 92(sp)
+// 0x01058a44: 0x1058a44: lw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8194,7 +8194,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01058a38: 0x1058a38: lw    s4, 88(sp)
+// 0x01058a48: 0x1058a48: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8203,7 +8203,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058a3c: 0x1058a3c: lw    s3, 84(sp)
+// 0x01058a4c: 0x1058a4c: lw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8212,7 +8212,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01058a40: 0x1058a40: lw    s2, 80(sp)
+// 0x01058a50: 0x1058a50: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8221,7 +8221,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01058a44: 0x1058a44: lw    s1, 76(sp)
+// 0x01058a54: 0x1058a54: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8230,7 +8230,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01058a48: 0x1058a48: lw    s0, 72(sp)
+// 0x01058a58: 0x1058a58: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8239,7 +8239,7 @@ L_1058a24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01058a4c: 0x1058a4c: jr    ra addiu sp, sp, 112
+// 0x01058a5c: 0x1058a5c: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
diff --git a/converted/Cibyl66.j b/converted/Cibyl66.j
index 12be63b..2c03091 100644
--- a/converted/Cibyl66.j
+++ b/converted/Cibyl66.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl66::.ctor
 
-.method public static int32 navigate_main_draw_route_number_1058a54(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_draw_route_number_1058a64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s4,int32 s0,int32 s1,int32 lo,int32 s8,int32 s3,int32 s5,int32 t0,int32 t1,int32 s6,int32 s7,int32 ra)
@@ -112,25 +112,25 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01058a54: 0x1058a54: lui   v0, 0x70000
+// 0x01058a64: 0x1058a64: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058a58: 0x1058a58: lw    v0, 10348(v0)
+// 0x01058a68: 0x1058a68: lw    v0, 10812(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2587
+	ldc.i4 2703
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058a5c: 0x1058a5c: addiu sp, sp, -104
+// 0x01058a6c: 0x1058a6c: addiu sp, sp, -104
 	ldloc.0
 	ldc.i4.s -104
 	add
 	stloc.0
-// 0x01058a60: 0x1058a60: sw    ra, 100(sp)
-// 0x01058a64: 0x1058a64: sw    s8, 96(sp)
+// 0x01058a70: 0x1058a70: sw    ra, 100(sp)
+// 0x01058a74: 0x1058a74: sw    s8, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01058a68: 0x1058a68: sw    s7, 92(sp)
+// 0x01058a78: 0x1058a78: sw    s7, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -148,7 +148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01058a6c: 0x1058a6c: sw    s6, 88(sp)
+// 0x01058a7c: 0x1058a7c: sw    s6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -157,7 +157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01058a70: 0x1058a70: sw    s5, 84(sp)
+// 0x01058a80: 0x1058a80: sw    s5, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -166,7 +166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01058a74: 0x1058a74: sw    s4, 80(sp)
+// 0x01058a84: 0x1058a84: sw    s4, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -175,7 +175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01058a78: 0x1058a78: sw    s3, 76(sp)
+// 0x01058a88: 0x1058a88: sw    s3, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -184,7 +184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01058a7c: 0x1058a7c: sw    s2, 72(sp)
+// 0x01058a8c: 0x1058a8c: sw    s2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -193,7 +193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058a80: 0x1058a80: sw    s1, 68(sp)
+// 0x01058a90: 0x1058a90: sw    s1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -202,7 +202,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01058a84: 0x1058a84: beq   v0, zero, 0x1058c1c sw    s0, 64(sp)
+// 0x01058a94: 0x1058a94: beq   v0, zero, 0x1058c2c sw    s0, 64(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -212,17 +212,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	brfalse L_1058c1c
+	brfalse L_1058c2c
 // --- basic block ---
-// 0x01058a8c: 0x1058a8c: lui   v1, 0x0
+// 0x01058a9c: 0x1058a9c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01058a90: 0x1058a90: addiu v0, v1, 14360
+// 0x01058aa0: 0x1058aa0: addiu v0, v1, 14360
 	ldloc 7
 	ldc.i4 14360
 	add
 	stloc 6
-// 0x01058a94: 0x1058a94: lw    s2, 14360(v1)
+// 0x01058aa4: 0x1058aa4: lw    s2, 14360(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -231,7 +231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01058a98: 0x1058a98: lw    a0, 4(v0)
+// 0x01058aa8: 0x1058aa8: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -240,7 +240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01058a9c: 0x1058a9c: lw    v1, 8(v0)
+// 0x01058aac: 0x1058aac: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -249,95 +249,95 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058aa0: 0x1058aa0: addiu s2, s2, 1
+// 0x01058ab0: 0x1058ab0: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01058aa4: 0x1058aa4: nor   a0, zero, a0
+// 0x01058ab4: 0x1058ab4: nor   a0, zero, a0
 	ldloc.1
 	ldc.i4.m1
 	xor
 	stloc.1
-// 0x01058aa8: 0x1058aa8: sltu  s2, zero, s2
+// 0x01058ab8: 0x1058ab8: sltu  s2, zero, s2
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
-// 0x01058aac: 0x1058aac: sltu  a0, zero, a0
+// 0x01058abc: 0x1058abc: sltu  a0, zero, a0
 	ldc.i4.s 0
 	ldloc.1
 	clt.un
 	stloc.1
-// 0x01058ab0: 0x1058ab0: nor   v1, zero, v1
+// 0x01058ac0: 0x1058ac0: nor   v1, zero, v1
 	ldloc 7
 	ldc.i4.m1
 	xor
 	stloc 7
-// 0x01058ab4: 0x1058ab4: addu  s2, s2, a0
+// 0x01058ac4: 0x1058ac4: addu  s2, s2, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-// 0x01058ab8: 0x1058ab8: sltu  v1, zero, v1
+// 0x01058ac8: 0x1058ac8: sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc 7
 	clt.un
 	stloc 7
-// 0x01058abc: 0x1058abc: lui   s8, 0x70000
+// 0x01058acc: 0x1058acc: lui   s8, 0x70000
 	ldc.i4 458752
 	stloc 13
-// 0x01058ac0: 0x1058ac0: lui   s4, 0xe0000
+// 0x01058ad0: 0x1058ad0: lui   s4, 0xe0000
 	ldc.i4 917504
 	stloc 9
-// 0x01058ac4: 0x1058ac4: addu  s2, s2, v1
+// 0x01058ad4: 0x1058ad4: addu  s2, s2, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x01058ac8: 0x1058ac8: addiu s8, s8, 9996
+// 0x01058ad8: 0x1058ad8: addiu s8, s8, 10460
 	ldloc 13
-	ldc.i4 9996
+	ldc.i4 10460
 	add
 	stloc 13
-// 0x01058acc: 0x1058acc: addiu s4, s4, 29604
+// 0x01058adc: 0x1058adc: addiu s4, s4, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x01058ad0: 0x1058ad0: addu  s1, zero, zero
+// 0x01058ae0: 0x1058ae0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01058ad4: 0x1058ad4: addiu s0, zero, 2
+// 0x01058ae4: 0x1058ae4: addiu s0, zero, 2
 	ldc.i4.2
 	stloc 10
-// 0x01058ad8: 0x1058ad8: addiu s5, zero, -1
+// 0x01058ae8: 0x1058ae8: addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 15
-// 0x01058adc: 0x1058adc: lui   s7, 0x70000
+// 0x01058aec: 0x1058aec: lui   s7, 0x70000
 	ldc.i4 458752
 	stloc 19
-// 0x01058ae0: 0x1058ae0: addiu s6, zero, 1
+// 0x01058af0: 0x1058af0: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 18
-// 0x01058ae4: 0x1058ae4: addiu s3, zero, 2
+// 0x01058af4: 0x1058af4: addiu s3, zero, 2
 	ldc.i4.2
 	stloc 14
-L_1058ae8:
-// 0x01058ae8: 0x1058ae8: lui   v1, 0x0
+L_1058af8:
+// 0x01058af8: 0x1058af8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01058aec: 0x1058aec: addiu v1, v1, 14360
+// 0x01058afc: 0x1058afc: addiu v1, v1, 14360
 	ldloc 7
 	ldc.i4 14360
 	add
 	stloc 7
-// 0x01058af0: 0x1058af0: addu  v0, v1, s1
+// 0x01058b00: 0x1058b00: addu  v0, v1, s1
 	ldloc 7
 	ldloc 11
 	add
 	stloc 6
-// 0x01058af4: 0x1058af4: lw    v0, 8(v0)
+// 0x01058b04: 0x1058b04: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -346,18 +346,18 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058af8: 0x1058af8: sll   zero, zero, 0
-// 0x01058afc: 0x1058afc: beq   v0, s5, 0x1058c10 sll   zero, zero, 0
+// 0x01058b08: 0x1058b08: sll   zero, zero, 0
+// 0x01058b0c: 0x1058b0c: beq   v0, s5, 0x1058c20 sll   zero, zero, 0
 	ldloc 6
 	ldloc 15
-	beq  L_1058c10
+	beq  L_1058c20
 // --- basic block ---
-// 0x01058b04: 0x1058b04: jal   0x1058410 sw    s0, 10356(s7)
+// 0x01058b14: 0x1058b14: jal   0x1058420 sw    s0, 10820(s7)
 	ldloc 5
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 2589
+	ldc.i4 2705
 	add
 	ldloc 10
 	stelem.i4
@@ -366,42 +366,42 @@ L_1058ae8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_screen_outline_1058410(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_screen_outline_1058420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058b0c: 0x1058b0c: jal   0x1022434 sll   zero, zero, 0
+// 0x01058b1c: 0x1058b1c: jal   0x1022444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_flush_lines_and_points_1022434(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_flush_lines_and_points_1022444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058b14: 0x1058b14: bne   s2, s6, 0x1058c10 lui   a1, 0x10000
+// 0x01058b24: 0x1058b24: bne   s2, s6, 0x1058c20 lui   a1, 0x10000
 	ldloc 8
 	ldloc 18
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1058c10
+	bne.un L_1058c20
 // --- basic block ---
-// 0x01058b1c: 0x1058b1c: addiu a2, s0, 1
+// 0x01058b2c: 0x1058b2c: addiu a2, s0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01058b20: 0x1058b20: addiu a0, sp, 32
+// 0x01058b30: 0x1058b30: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01058b24: 0x1058b24: jal   0x1000f64 addiu a1, a1, 232
+// 0x01058b34: 0x1058b34: jal   0x1000f64 addiu a1, a1, 228
 	ldloc.2
-	ldc.i4 232
+	ldc.i4 228
 	add
 	stloc.2
 	ldloc.0
@@ -414,12 +414,12 @@ L_1058ae8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058b2c: 0x1058b2c: addu  v0, s8, s1
+// 0x01058b3c: 0x1058b3c: addu  v0, s8, s1
 	ldloc 13
 	ldloc 11
 	add
 	stloc 6
-// 0x01058b30: 0x1058b30: lw    v1, 8(v0)
+// 0x01058b40: 0x1058b40: lw    v1, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -428,25 +428,25 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058b34: 0x1058b34: lui   a0, 0x70000
+// 0x01058b44: 0x1058b44: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01058b38: 0x1058b38: div   v1, s3
+// 0x01058b48: 0x1058b48: div   v1, s3
 	ldloc 7
 	ldloc 14
 	div
 	stloc 12
-// 0x01058b3c: 0x1058b3c: addiu a0, a0, 10752
+// 0x01058b4c: 0x1058b4c: addiu a0, a0, 11216
 	ldloc.1
-	ldc.i4 10752
+	ldc.i4 11216
 	add
 	stloc.1
-// 0x01058b40: 0x1058b40: addu  v0, a0, s1
+// 0x01058b50: 0x1058b50: addu  v0, a0, s1
 	ldloc.1
 	ldloc 11
 	add
 	stloc 6
-// 0x01058b44: 0x1058b44: lw    t1, 8(v0)
+// 0x01058b54: 0x1058b54: lw    t1, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -455,7 +455,7 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01058b48: 0x1058b48: lw    a3, 80(s4)
+// 0x01058b58: 0x1058b58: lw    a3, 80(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -464,7 +464,7 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01058b4c: 0x1058b4c: lw    t0, 32(s4)
+// 0x01058b5c: 0x1058b5c: lw    t0, 32(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -473,7 +473,7 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01058b50: 0x1058b50: lw    a2, 76(s4)
+// 0x01058b60: 0x1058b60: lw    a2, 76(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -482,7 +482,7 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01058b54: 0x1058b54: lw    v0, 36(s4)
+// 0x01058b64: 0x1058b64: lw    v0, 36(s4)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -491,49 +491,49 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058b58: 0x1058b58: addiu a0, zero, 1
+// 0x01058b68: 0x1058b68: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01058b5c: 0x1058b5c: addiu a1, sp, 16
+// 0x01058b6c: 0x1058b6c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01058b60: 0x1058b60: mflo  lo
+// 0x01058b70: 0x1058b70: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x01058b64: 0x1058b64: sll   v1, v1, 3
+// 0x01058b74: 0x1058b74: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x01058b68: 0x1058b68: addu  v1, t1, v1
+// 0x01058b78: 0x1058b78: addu  v1, t1, v1
 	ldloc 17
 	ldloc 7
 	add
 	stloc 7
-// 0x01058b6c: 0x1058b6c: lw    t1, 0(v1)
+// 0x01058b7c: 0x1058b7c: lw    t1, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 17
-// 0x01058b70: 0x1058b70: sll   zero, zero, 0
-// 0x01058b74: 0x1058b74: subu  a3, t1, a3
+// 0x01058b80: 0x1058b80: sll   zero, zero, 0
+// 0x01058b84: 0x1058b84: subu  a3, t1, a3
 	ldloc 17
 	ldloc 4
 	sub
 	stloc 4
-// 0x01058b78: 0x1058b78: div   a3, t0
+// 0x01058b88: 0x1058b88: div   a3, t0
 	ldloc 4
 	ldloc 16
 	div
 	stloc 12
-// 0x01058b7c: 0x1058b7c: mflo  lo
+// 0x01058b8c: 0x1058b8c: mflo  lo
 	ldloc 12
 	stloc 16
-// 0x01058b80: 0x1058b80: sw    t0, 16(sp)
+// 0x01058b90: 0x1058b90: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -542,7 +542,7 @@ L_1058ae8:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01058b84: 0x1058b84: lw    v1, 4(v1)
+// 0x01058b94: 0x1058b94: lw    v1, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -551,21 +551,21 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058b88: 0x1058b88: sll   zero, zero, 0
-// 0x01058b8c: 0x1058b8c: subu  a2, a2, v1
+// 0x01058b98: 0x1058b98: sll   zero, zero, 0
+// 0x01058b9c: 0x1058b9c: subu  a2, a2, v1
 	ldloc.3
 	ldloc 7
 	sub
 	stloc.3
-// 0x01058b90: 0x1058b90: div   a2, v0
+// 0x01058ba0: 0x1058ba0: div   a2, v0
 	ldloc.3
 	ldloc 6
 	div
 	stloc 12
-// 0x01058b94: 0x1058b94: mflo  lo
+// 0x01058ba4: 0x1058ba4: mflo  lo
 	ldloc 12
 	stloc.3
-// 0x01058b98: 0x1058b98: jal   0x10072a4 sw    a2, 20(sp)
+// 0x01058ba8: 0x1058ba8: jal   0x10072b4 sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -579,20 +579,20 @@ L_1058ae8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_rotate_coordinates_10072b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058ba0: 0x1058ba0: addiu a1, zero, 1
+// 0x01058bb0: 0x1058bb0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01058ba4: 0x1058ba4: addiu a2, sp, 32
+// 0x01058bb4: 0x1058bb4: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x01058ba8: 0x1058ba8: jal   0x10a1918 addu  a0, zero, zero
+// 0x01058bb8: 0x1058bb8: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -600,12 +600,12 @@ L_1058ae8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058bb0: 0x1058bb0: lw    a2, 16(sp)
+// 0x01058bc0: 0x1058bc0: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -614,10 +614,10 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01058bb4: 0x1058bb4: addu  a0, v0, zero
+// 0x01058bc4: 0x1058bc4: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01058bb8: 0x1058bb8: sw    a2, 56(sp)
+// 0x01058bc8: 0x1058bc8: sw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -626,7 +626,7 @@ L_1058ae8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01058bbc: 0x1058bbc: jal   0x104dffc sw    v0, 60(sp)
+// 0x01058bcc: 0x1058bcc: jal   0x104e00c sw    v0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -636,17 +636,17 @@ L_1058ae8:
 	ldloc 6
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058bc4: 0x1058bc4: div   v0, s3
+// 0x01058bd4: 0x1058bd4: div   v0, s3
 	ldloc 6
 	ldloc 14
 	div
 	stloc 12
-// 0x01058bc8: 0x1058bc8: lw    v1, 60(sp)
+// 0x01058bd8: 0x1058bd8: lw    v1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -655,7 +655,7 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058bcc: 0x1058bcc: lw    a2, 56(sp)
+// 0x01058bdc: 0x1058bdc: lw    a2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -664,7 +664,7 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01058bd0: 0x1058bd0: lw    a1, 20(sp)
+// 0x01058be0: 0x1058be0: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -673,10 +673,10 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01058bd4: 0x1058bd4: addu  a0, v1, zero
+// 0x01058be4: 0x1058be4: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01058bd8: 0x1058bd8: sw    a1, 56(sp)
+// 0x01058be8: 0x1058be8: sw    a1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -685,15 +685,15 @@ L_1058ae8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01058bdc: 0x1058bdc: mflo  lo
+// 0x01058bec: 0x1058bec: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x01058be0: 0x1058be0: subu  a2, a2, v0
+// 0x01058bf0: 0x1058bf0: subu  a2, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-// 0x01058be4: 0x1058be4: jal   0x104e020 sw    a2, 24(sp)
+// 0x01058bf4: 0x1058bf4: jal   0x104e030 sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -703,12 +703,12 @@ L_1058ae8:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01058bec: 0x1058bec: lw    a1, 56(sp)
+// 0x01058bfc: 0x1058bfc: lw    a1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -717,7 +717,7 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01058bf0: 0x1058bf0: lw    v1, 60(sp)
+// 0x01058c00: 0x1058c00: lw    v1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -726,26 +726,26 @@ L_1058ae8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058bf4: 0x1058bf4: subu  v0, a1, v0
+// 0x01058c04: 0x1058c04: subu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	sub
 	stloc 6
-// 0x01058bf8: 0x1058bf8: addu  a0, v1, zero
+// 0x01058c08: 0x1058c08: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x01058bfc: 0x1058bfc: addiu a1, sp, 24
+// 0x01058c0c: 0x1058c0c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01058c00: 0x1058c00: addiu a2, zero, 255
+// 0x01058c10: 0x1058c10: addiu a2, zero, 255
 	ldc.i4 255
 	stloc.3
-// 0x01058c04: 0x1058c04: addu  a3, zero, zero
+// 0x01058c14: 0x1058c14: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01058c08: 0x1058c08: jal   0x104f4a8 sw    v0, 28(sp)
+// 0x01058c18: 0x1058c18: jal   0x104f4b8 sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -759,45 +759,45 @@ L_1058ae8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1058c10:
-// 0x01058c10: 0x1058c10: addiu s0, s0, -1
+L_1058c20:
+// 0x01058c20: 0x1058c20: addiu s0, s0, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x01058c14: 0x1058c14: bne   s0, s5, 0x1058ae8 addiu s1, s1, -4
+// 0x01058c24: 0x1058c24: bne   s0, s5, 0x1058af8 addiu s1, s1, -4
 	ldloc 10
 	ldloc 15
 	ldloc 11
 	ldc.i4.s -4
 	add
 	stloc 11
-	bne.un L_1058ae8
+	bne.un L_1058af8
 // --- basic block ---
-L_1058c1c:
-// 0x01058c1c: 0x1058c1c: lui   v0, 0x70000
+L_1058c2c:
+// 0x01058c2c: 0x1058c2c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058c20: 0x1058c20: lw    v0, 10352(v0)
+// 0x01058c30: 0x1058c30: lw    v0, 10816(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2588
+	ldc.i4 2704
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058c24: 0x1058c24: sll   zero, zero, 0
-// 0x01058c28: 0x1058c28: beq   v0, zero, 0x1058c38 sll   zero, zero, 0
+// 0x01058c34: 0x1058c34: sll   zero, zero, 0
+// 0x01058c38: 0x1058c38: beq   v0, zero, 0x1058c48 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1058c38
+	brfalse L_1058c48
 // --- basic block ---
-// 0x01058c30: 0x1058c30: jalr  v0 sll   zero, zero, 0
+// 0x01058c40: 0x1058c40: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -809,9 +809,9 @@ L_1058c1c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1058c38:
-// 0x01058c38: 0x1058c38: lw    ra, 100(sp)
-// 0x01058c3c: 0x1058c3c: lw    s8, 96(sp)
+L_1058c48:
+// 0x01058c48: 0x1058c48: lw    ra, 100(sp)
+// 0x01058c4c: 0x1058c4c: lw    s8, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -820,7 +820,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01058c40: 0x1058c40: lw    s7, 92(sp)
+// 0x01058c50: 0x1058c50: lw    s7, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -829,7 +829,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01058c44: 0x1058c44: lw    s6, 88(sp)
+// 0x01058c54: 0x1058c54: lw    s6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -838,7 +838,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01058c48: 0x1058c48: lw    s5, 84(sp)
+// 0x01058c58: 0x1058c58: lw    s5, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -847,7 +847,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01058c4c: 0x1058c4c: lw    s4, 80(sp)
+// 0x01058c5c: 0x1058c5c: lw    s4, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -856,7 +856,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01058c50: 0x1058c50: lw    s3, 76(sp)
+// 0x01058c60: 0x1058c60: lw    s3, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -865,7 +865,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01058c54: 0x1058c54: lw    s2, 72(sp)
+// 0x01058c64: 0x1058c64: lw    s2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -874,7 +874,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01058c58: 0x1058c58: lw    s1, 68(sp)
+// 0x01058c68: 0x1058c68: lw    s1, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -883,7 +883,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01058c5c: 0x1058c5c: lw    s0, 64(sp)
+// 0x01058c6c: 0x1058c6c: lw    s0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -892,7 +892,7 @@ L_1058c38:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058c60: 0x1058c60: jr    ra addiu sp, sp, 104
+// 0x01058c70: 0x1058c70: jr    ra addiu sp, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
@@ -904,7 +904,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_main_set_outline_1058c68(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_set_outline_1058c78(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s0,int32 s2,int32 ra)
@@ -948,12 +948,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01058c68: 0x1058c68: addiu sp, sp, -48
+// 0x01058c78: 0x1058c78: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01058c6c: 0x1058c6c: sw    s0, 32(sp)
+// 0x01058c7c: 0x1058c7c: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -962,19 +962,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01058c70: 0x1058c70: lui   s0, 0x70000
+// 0x01058c80: 0x1058c80: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01058c74: 0x1058c74: lw    v0, 10028(s0)
+// 0x01058c84: 0x1058c84: lw    v0, 10492(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc 6
-// 0x01058c78: 0x1058c78: sw    s2, 40(sp)
+// 0x01058c88: 0x1058c88: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -983,7 +983,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01058c7c: 0x1058c7c: sw    s1, 36(sp)
+// 0x01058c8c: 0x1058c8c: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -992,8 +992,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01058c80: 0x1058c80: sw    ra, 44(sp)
-// 0x01058c84: 0x1058c84: lw    s2, 64(sp)
+// 0x01058c90: 0x1058c90: sw    ra, 44(sp)
+// 0x01058c94: 0x1058c94: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1002,16 +1002,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058c88: 0x1058c88: beq   v0, zero, 0x1058cb4 addu  s1, a0, zero
+// 0x01058c98: 0x1058c98: beq   v0, zero, 0x1058cc4 addu  s1, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brfalse L_1058cb4
+	brfalse L_1058cc4
 // --- basic block ---
-// 0x01058c90: 0x1058c90: addu  a0, v0, zero
+// 0x01058ca0: 0x1058ca0: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01058c94: 0x1058c94: sw    a1, 16(sp)
+// 0x01058ca4: 0x1058ca4: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1020,7 +1020,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01058c98: 0x1058c98: sw    a2, 20(sp)
+// 0x01058ca8: 0x1058ca8: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1029,7 +1029,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01058c9c: 0x1058c9c: jal   0x1000930 sw    a3, 24(sp)
+// 0x01058cac: 0x1058cac: jal   0x1000930 sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1048,7 +1048,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01058ca4: 0x1058ca4: lw    a3, 24(sp)
+// 0x01058cb4: 0x1058cb4: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1057,7 +1057,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01058ca8: 0x1058ca8: lw    a2, 20(sp)
+// 0x01058cb8: 0x1058cb8: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1066,7 +1066,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01058cac: 0x1058cac: lw    a1, 16(sp)
+// 0x01058cbc: 0x1058cbc: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1075,104 +1075,104 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01058cb0: 0x1058cb0: sw    zero, 10028(s0)
+// 0x01058cc0: 0x1058cc0: sw    zero, 10492(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1058cb4:
-// 0x01058cb4: 0x1058cb4: lui   v0, 0x70000
+L_1058cc4:
+// 0x01058cc4: 0x1058cc4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058cb8: 0x1058cb8: beq   s2, zero, 0x1058cd4 sw    zero, 10024(v0)
+// 0x01058cc8: 0x1058cc8: beq   s2, zero, 0x1058ce4 sw    zero, 10488(v0)
 	ldloc 10
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1058cd4
+	brfalse L_1058ce4
 // --- basic block ---
-// 0x01058cc0: 0x1058cc0: beq   a1, zero, 0x1058cd4 addiu v1, zero, 1
+// 0x01058cd0: 0x1058cd0: beq   a1, zero, 0x1058ce4 addiu v1, zero, 1
 	ldloc.2
 	ldc.i4.1
 	stloc 8
-	brfalse L_1058cd4
+	brfalse L_1058ce4
 // --- basic block ---
-// 0x01058cc8: 0x1058cc8: lui   v0, 0x70000
+// 0x01058cd8: 0x1058cd8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058ccc: 0x1058ccc: j	 0x1058cdc sw    v1, 10348(v0)
+// 0x01058cdc: 0x1058cdc: j	 0x1058cec sw    v1, 10812(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2587
+	ldc.i4 2703
 	add
 	ldloc 8
 	stelem.i4
-	br L_1058cdc
+	br L_1058cec
 // --- basic block ---
-L_1058cd4:
-// 0x01058cd4: 0x1058cd4: lui   v0, 0x70000
+L_1058ce4:
+// 0x01058ce4: 0x1058ce4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058cd8: 0x1058cd8: sw    zero, 10348(v0)
+// 0x01058ce8: 0x1058ce8: sw    zero, 10812(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2587
+	ldc.i4 2703
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1058cdc:
-// 0x01058cdc: 0x1058cdc: lui   v1, 0x70000
+L_1058cec:
+// 0x01058cec: 0x1058cec: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01058ce0: 0x1058ce0: lui   v0, 0x70000
+// 0x01058cf0: 0x1058cf0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01058ce4: 0x1058ce4: sll   s1, s1, 2
+// 0x01058cf4: 0x1058cf4: sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01058ce8: 0x1058ce8: addiu v1, v1, 10752
+// 0x01058cf8: 0x1058cf8: addiu v1, v1, 11216
 	ldloc 8
-	ldc.i4 10752
+	ldc.i4 11216
 	add
 	stloc 8
-// 0x01058cec: 0x1058cec: addiu v0, v0, 9996
+// 0x01058cfc: 0x1058cfc: addiu v0, v0, 10460
 	ldloc 6
-	ldc.i4 9996
+	ldc.i4 10460
 	add
 	stloc 6
-// 0x01058cf0: 0x1058cf0: addu  v1, s1, v1
+// 0x01058d00: 0x1058d00: addu  v1, s1, v1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 8
-// 0x01058cf4: 0x1058cf4: addu  v0, s1, v0
+// 0x01058d04: 0x1058d04: addu  v0, s1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x01058cf8: 0x1058cf8: sw    a1, 0(v1)
+// 0x01058d08: 0x1058d08: sw    a1, 0(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01058cfc: 0x1058cfc: beq   s2, zero, 0x1058d14 sw    a2, 0(v0)
+// 0x01058d0c: 0x1058d0c: beq   s2, zero, 0x1058d24 sw    a2, 0(v0)
 	ldloc 10
 	ldloc 5
 	ldloc 6
@@ -1180,70 +1180,70 @@ L_1058cdc:
 	shr.un
 	ldloc.3
 	stelem.i4
-	brfalse L_1058d14
+	brfalse L_1058d24
 // --- basic block ---
-// 0x01058d04: 0x1058d04: lui   v0, 0x0
+// 0x01058d14: 0x1058d14: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01058d08: 0x1058d08: addiu v0, v0, 14360
+// 0x01058d18: 0x1058d18: addiu v0, v0, 14360
 	ldloc 6
 	ldc.i4 14360
 	add
 	stloc 6
-// 0x01058d0c: 0x1058d0c: j	 0x1058d28 addu  s1, s1, v0
+// 0x01058d1c: 0x1058d1c: j	 0x1058d38 addu  s1, s1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-	br L_1058d28
+	br L_1058d38
 // --- basic block ---
-L_1058d14:
-// 0x01058d14: 0x1058d14: lui   v1, 0x0
+L_1058d24:
+// 0x01058d24: 0x1058d24: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01058d18: 0x1058d18: addiu v0, zero, -1
+// 0x01058d28: 0x1058d28: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01058d1c: 0x1058d1c: bne   a3, v0, 0x1058d30 addiu v1, v1, 14360
+// 0x01058d2c: 0x1058d2c: bne   a3, v0, 0x1058d40 addiu v1, v1, 14360
 	ldloc 4
 	ldloc 6
 	ldloc 8
 	ldc.i4 14360
 	add
 	stloc 8
-	bne.un L_1058d30
+	bne.un L_1058d40
 // --- basic block ---
-// 0x01058d24: 0x1058d24: addu  s1, v1, s1
+// 0x01058d34: 0x1058d34: addu  s1, v1, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-L_1058d28:
-// 0x01058d28: 0x1058d28: j	 0x1058d38 sw    a3, 0(s1)
+L_1058d38:
+// 0x01058d38: 0x1058d38: j	 0x1058d48 sw    a3, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-	br L_1058d38
+	br L_1058d48
 // --- basic block ---
-L_1058d30:
-// 0x01058d30: 0x1058d30: addu  s1, v1, s1
+L_1058d40:
+// 0x01058d40: 0x1058d40: addu  s1, v1, s1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x01058d34: 0x1058d34: sw    v0, 0(s1)
+// 0x01058d44: 0x1058d44: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_1058d38:
-// 0x01058d38: 0x1058d38: lw    ra, 44(sp)
-// 0x01058d3c: 0x1058d3c: lw    s2, 40(sp)
+L_1058d48:
+// 0x01058d48: 0x1058d48: lw    ra, 44(sp)
+// 0x01058d4c: 0x1058d4c: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1252,7 +1252,7 @@ L_1058d38:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058d40: 0x1058d40: lw    s1, 36(sp)
+// 0x01058d50: 0x1058d50: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1261,7 +1261,7 @@ L_1058d38:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058d44: 0x1058d44: lw    s0, 32(sp)
+// 0x01058d54: 0x1058d54: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1270,7 +1270,7 @@ L_1058d38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01058d48: 0x1058d48: jr    ra addiu sp, sp, 48
+// 0x01058d58: 0x1058d58: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -1282,7 +1282,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_main_init_pens_1058d50(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_init_pens_1058d60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32 s2,int32[] mem,int32 s1,int32 s3,int32 ra)
@@ -1329,18 +1329,18 @@ __CIBYL_function_return:
 	stloc 9
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01058d50: 0x1058d50: addiu sp, sp, -40
+// 0x01058d60: 0x1058d60: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01058d54: 0x1058d54: lui   a0, 0x10000
+// 0x01058d64: 0x1058d64: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058d58: 0x1058d58: addu  a1, zero, zero
+// 0x01058d68: 0x1058d68: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058d5c: 0x1058d5c: sw    s1, 24(sp)
+// 0x01058d6c: 0x1058d6c: sw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -1349,16 +1349,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01058d60: 0x1058d60: addiu a0, a0, 9324
+// 0x01058d70: 0x1058d70: addiu a0, a0, 9320
 	ldloc.1
-	ldc.i4 9324
+	ldc.i4 9320
 	add
 	stloc.1
-// 0x01058d64: 0x1058d64: lui   s1, 0x0
+// 0x01058d74: 0x1058d74: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01058d68: 0x1058d68: sw    ra, 36(sp)
-// 0x01058d6c: 0x1058d6c: sw    s3, 32(sp)
+// 0x01058d78: 0x1058d78: sw    ra, 36(sp)
+// 0x01058d7c: 0x1058d7c: sw    s3, 32(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -1367,7 +1367,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01058d70: 0x1058d70: sw    s2, 28(sp)
+// 0x01058d80: 0x1058d80: sw    s2, 28(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -1376,7 +1376,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058d74: 0x1058d74: jal   0x104ef00 sw    s0, 20(sp)
+// 0x01058d84: 0x1058d84: jal   0x104ef10 sw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -1390,17 +1390,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058d7c: 0x1058d7c: addiu a0, s1, 14376
+// 0x01058d8c: 0x1058d8c: addiu a0, s1, 14376
 	ldloc 10
 	ldc.i4 14376
 	add
 	stloc.1
-// 0x01058d80: 0x1058d80: jal   0x100e348 addu  s2, v0, zero
+// 0x01058d90: 0x1058d90: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1408,12 +1408,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058d88: 0x1058d88: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058d98: 0x1058d98: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1421,40 +1421,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058d90: 0x1058d90: jal   0x104dd5c addiu a0, zero, 5
+// 0x01058da0: 0x1058da0: jal   0x104dd6c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058d98: 0x1058d98: lui   a0, 0x10000
+// 0x01058da8: 0x1058da8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058d9c: 0x1058d9c: addu  a1, zero, zero
+// 0x01058dac: 0x1058dac: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058da0: 0x1058da0: addiu a0, a0, 9340
+// 0x01058db0: 0x1058db0: addiu a0, a0, 9336
 	ldloc.1
-	ldc.i4 9340
+	ldc.i4 9336
 	add
 	stloc.1
-// 0x01058da4: 0x1058da4: lui   s0, 0x70000
+// 0x01058db4: 0x1058db4: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01058da8: 0x1058da8: jal   0x104ef00 sw    s2, 10636(s0)
+// 0x01058db8: 0x1058db8: jal   0x104ef10 sw    s2, 11100(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2659
+	ldc.i4 2775
 	add
 	ldloc 8
 	stelem.i4
@@ -1463,17 +1463,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058db0: 0x1058db0: addiu a0, s1, 14376
+// 0x01058dc0: 0x1058dc0: addiu a0, s1, 14376
 	ldloc 10
 	ldc.i4 14376
 	add
 	stloc.1
-// 0x01058db4: 0x1058db4: jal   0x100e348 addu  s2, v0, zero
+// 0x01058dc4: 0x1058dc4: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1481,12 +1481,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058dbc: 0x1058dbc: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058dcc: 0x1058dcc: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1494,35 +1494,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058dc4: 0x1058dc4: jal   0x104dd5c addiu a0, zero, 5
+// 0x01058dd4: 0x1058dd4: jal   0x104dd6c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058dcc: 0x1058dcc: addiu s0, s0, 10636
+// 0x01058ddc: 0x1058ddc: addiu s0, s0, 11100
 	ldloc 7
-	ldc.i4 10636
+	ldc.i4 11100
 	add
 	stloc 7
-// 0x01058dd0: 0x1058dd0: lui   a0, 0x10000
+// 0x01058de0: 0x1058de0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058dd4: 0x1058dd4: addu  a1, zero, zero
+// 0x01058de4: 0x1058de4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058dd8: 0x1058dd8: lui   s1, 0x0
+// 0x01058de8: 0x1058de8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01058ddc: 0x1058ddc: sw    s2, 4(s0)
+// 0x01058dec: 0x1058dec: sw    s2, 4(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
@@ -1531,9 +1531,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058de0: 0x1058de0: jal   0x104ef00 addiu a0, a0, 9356
+// 0x01058df0: 0x1058df0: jal   0x104ef10 addiu a0, a0, 9352
 	ldloc.1
-	ldc.i4 9356
+	ldc.i4 9352
 	add
 	stloc.1
 	ldloc.0
@@ -1541,17 +1541,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058de8: 0x1058de8: addiu a0, s1, 14392
+// 0x01058df8: 0x1058df8: addiu a0, s1, 14392
 	ldloc 10
 	ldc.i4 14392
 	add
 	stloc.1
-// 0x01058dec: 0x1058dec: jal   0x100e348 addu  s2, v0, zero
+// 0x01058dfc: 0x1058dfc: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1559,12 +1559,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058df4: 0x1058df4: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058e04: 0x1058e04: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1572,40 +1572,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058dfc: 0x1058dfc: jal   0x104dd5c addiu a0, zero, 5
+// 0x01058e0c: 0x1058e0c: jal   0x104dd6c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e04: 0x1058e04: lui   a0, 0x10000
+// 0x01058e14: 0x1058e14: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058e08: 0x1058e08: addu  a1, zero, zero
+// 0x01058e18: 0x1058e18: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058e0c: 0x1058e0c: addiu a0, a0, 9372
+// 0x01058e1c: 0x1058e1c: addiu a0, a0, 9368
 	ldloc.1
-	ldc.i4 9372
+	ldc.i4 9368
 	add
 	stloc.1
-// 0x01058e10: 0x1058e10: lui   s0, 0x70000
+// 0x01058e20: 0x1058e20: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01058e14: 0x1058e14: jal   0x104ef00 sw    s2, 10668(s0)
+// 0x01058e24: 0x1058e24: jal   0x104ef10 sw    s2, 11132(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2667
+	ldc.i4 2783
 	add
 	ldloc 8
 	stelem.i4
@@ -1614,17 +1614,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e1c: 0x1058e1c: addiu a0, s1, 14392
+// 0x01058e2c: 0x1058e2c: addiu a0, s1, 14392
 	ldloc 10
 	ldc.i4 14392
 	add
 	stloc.1
-// 0x01058e20: 0x1058e20: jal   0x100e348 addu  s2, v0, zero
+// 0x01058e30: 0x1058e30: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1632,12 +1632,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e28: 0x1058e28: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058e38: 0x1058e38: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1645,35 +1645,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e30: 0x1058e30: jal   0x104dd5c addiu a0, zero, 5
+// 0x01058e40: 0x1058e40: jal   0x104dd6c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e38: 0x1058e38: addiu s0, s0, 10668
+// 0x01058e48: 0x1058e48: addiu s0, s0, 11132
 	ldloc 7
-	ldc.i4 10668
+	ldc.i4 11132
 	add
 	stloc 7
-// 0x01058e3c: 0x1058e3c: lui   a0, 0x10000
+// 0x01058e4c: 0x1058e4c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058e40: 0x1058e40: addu  a1, zero, zero
+// 0x01058e50: 0x1058e50: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058e44: 0x1058e44: lui   s1, 0x0
+// 0x01058e54: 0x1058e54: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01058e48: 0x1058e48: sw    s2, 4(s0)
+// 0x01058e58: 0x1058e58: sw    s2, 4(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
@@ -1682,9 +1682,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058e4c: 0x1058e4c: jal   0x104ef00 addiu a0, a0, 9388
+// 0x01058e5c: 0x1058e5c: jal   0x104ef10 addiu a0, a0, 9384
 	ldloc.1
-	ldc.i4 9388
+	ldc.i4 9384
 	add
 	stloc.1
 	ldloc.0
@@ -1692,17 +1692,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e54: 0x1058e54: addiu a0, s1, 14408
+// 0x01058e64: 0x1058e64: addiu a0, s1, 14408
 	ldloc 10
 	ldc.i4 14408
 	add
 	stloc.1
-// 0x01058e58: 0x1058e58: jal   0x100e348 addu  s2, v0, zero
+// 0x01058e68: 0x1058e68: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1710,12 +1710,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e60: 0x1058e60: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058e70: 0x1058e70: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1723,40 +1723,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e68: 0x1058e68: jal   0x104dd5c addiu a0, zero, 5
+// 0x01058e78: 0x1058e78: jal   0x104dd6c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e70: 0x1058e70: lui   a0, 0x10000
+// 0x01058e80: 0x1058e80: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058e74: 0x1058e74: addu  a1, zero, zero
+// 0x01058e84: 0x1058e84: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058e78: 0x1058e78: addiu a0, a0, 9408
+// 0x01058e88: 0x1058e88: addiu a0, a0, 9404
 	ldloc.1
-	ldc.i4 9408
+	ldc.i4 9404
 	add
 	stloc.1
-// 0x01058e7c: 0x1058e7c: lui   s0, 0x70000
+// 0x01058e8c: 0x1058e8c: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01058e80: 0x1058e80: jal   0x104ef00 sw    s2, 10644(s0)
+// 0x01058e90: 0x1058e90: jal   0x104ef10 sw    s2, 11108(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2661
+	ldc.i4 2777
 	add
 	ldloc 8
 	stelem.i4
@@ -1765,17 +1765,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e88: 0x1058e88: addiu a0, s1, 14408
+// 0x01058e98: 0x1058e98: addiu a0, s1, 14408
 	ldloc 10
 	ldc.i4 14408
 	add
 	stloc.1
-// 0x01058e8c: 0x1058e8c: jal   0x100e348 addu  s2, v0, zero
+// 0x01058e9c: 0x1058e9c: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1783,12 +1783,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e94: 0x1058e94: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058ea4: 0x1058ea4: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1796,35 +1796,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058e9c: 0x1058e9c: jal   0x104dd5c addiu a0, zero, 5
+// 0x01058eac: 0x1058eac: jal   0x104dd6c addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058ea4: 0x1058ea4: addiu s0, s0, 10644
+// 0x01058eb4: 0x1058eb4: addiu s0, s0, 11108
 	ldloc 7
-	ldc.i4 10644
+	ldc.i4 11108
 	add
 	stloc 7
-// 0x01058ea8: 0x1058ea8: lui   a0, 0x10000
+// 0x01058eb8: 0x1058eb8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058eac: 0x1058eac: addu  a1, zero, zero
+// 0x01058ebc: 0x1058ebc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058eb0: 0x1058eb0: lui   s1, 0x0
+// 0x01058ec0: 0x1058ec0: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01058eb4: 0x1058eb4: sw    s2, 4(s0)
+// 0x01058ec4: 0x1058ec4: sw    s2, 4(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
@@ -1833,9 +1833,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058eb8: 0x1058eb8: jal   0x104ef00 addiu a0, a0, 9428
+// 0x01058ec8: 0x1058ec8: jal   0x104ef10 addiu a0, a0, 9424
 	ldloc.1
-	ldc.i4 9428
+	ldc.i4 9424
 	add
 	stloc.1
 	ldloc.0
@@ -1843,17 +1843,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058ec0: 0x1058ec0: addiu a0, s1, 14424
+// 0x01058ed0: 0x1058ed0: addiu a0, s1, 14424
 	ldloc 10
 	ldc.i4 14424
 	add
 	stloc.1
-// 0x01058ec4: 0x1058ec4: jal   0x100e348 addu  s2, v0, zero
+// 0x01058ed4: 0x1058ed4: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1861,12 +1861,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058ecc: 0x1058ecc: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058edc: 0x1058edc: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1874,27 +1874,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058ed4: 0x1058ed4: jal   0x104dd5c addiu a0, zero, 6
+// 0x01058ee4: 0x1058ee4: jal   0x104dd6c addiu a0, zero, 6
 	ldc.i4.6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058edc: 0x1058edc: lui   a0, 0x10000
+// 0x01058eec: 0x1058eec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01058ee0: 0x1058ee0: addu  a1, zero, zero
+// 0x01058ef0: 0x1058ef0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058ee4: 0x1058ee4: sw    s2, 8(s0)
+// 0x01058ef4: 0x1058ef4: sw    s2, 8(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
@@ -1903,9 +1903,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058ee8: 0x1058ee8: jal   0x104ef00 addiu a0, a0, 9448
+// 0x01058ef8: 0x1058ef8: jal   0x104ef10 addiu a0, a0, 9444
 	ldloc.1
-	ldc.i4 9448
+	ldc.i4 9444
 	add
 	stloc.1
 	ldloc.0
@@ -1913,17 +1913,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058ef0: 0x1058ef0: addiu a0, s1, 14424
+// 0x01058f00: 0x1058f00: addiu a0, s1, 14424
 	ldloc 10
 	ldc.i4 14424
 	add
 	stloc.1
-// 0x01058ef4: 0x1058ef4: jal   0x100e348 addu  s3, v0, zero
+// 0x01058f04: 0x1058f04: jal   0x100e358 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -1931,12 +1931,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058efc: 0x1058efc: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058f0c: 0x1058f0c: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1944,35 +1944,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f04: 0x1058f04: lui   s2, 0x10000
+// 0x01058f14: 0x1058f14: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01058f08: 0x1058f08: jal   0x104dd5c addiu a0, zero, 6
+// 0x01058f18: 0x1058f18: jal   0x104dd6c addiu a0, zero, 6
 	ldc.i4.6
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f10: 0x1058f10: lui   s1, 0x0
+// 0x01058f20: 0x1058f20: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01058f14: 0x1058f14: addu  a1, zero, zero
+// 0x01058f24: 0x1058f24: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058f18: 0x1058f18: addiu a0, s2, 9468
+// 0x01058f28: 0x1058f28: addiu a0, s2, 9464
 	ldloc 8
-	ldc.i4 9468
+	ldc.i4 9464
 	add
 	stloc.1
-// 0x01058f1c: 0x1058f1c: jal   0x104ef00 sw    s3, 12(s0)
+// 0x01058f2c: 0x1058f2c: jal   0x104ef10 sw    s3, 12(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
@@ -1986,17 +1986,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f24: 0x1058f24: addiu a0, s1, 14440
+// 0x01058f34: 0x1058f34: addiu a0, s1, 14440
 	ldloc 10
 	ldc.i4 14440
 	add
 	stloc.1
-// 0x01058f28: 0x1058f28: jal   0x100e348 addu  s3, v0, zero
+// 0x01058f38: 0x1058f38: jal   0x100e358 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2004,12 +2004,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f30: 0x1058f30: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058f40: 0x1058f40: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2017,29 +2017,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f38: 0x1058f38: jal   0x104dd5c addiu a0, zero, 7
+// 0x01058f48: 0x1058f48: jal   0x104dd6c addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f40: 0x1058f40: addu  a1, zero, zero
+// 0x01058f50: 0x1058f50: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01058f44: 0x1058f44: addiu a0, s2, 9468
+// 0x01058f54: 0x1058f54: addiu a0, s2, 9464
 	ldloc 8
-	ldc.i4 9468
+	ldc.i4 9464
 	add
 	stloc.1
-// 0x01058f48: 0x1058f48: jal   0x104ef00 sw    s3, 16(s0)
+// 0x01058f58: 0x1058f58: jal   0x104ef10 sw    s3, 16(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
@@ -2053,17 +2053,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f50: 0x1058f50: addiu a0, s1, 14440
+// 0x01058f60: 0x1058f60: addiu a0, s1, 14440
 	ldloc 10
 	ldc.i4 14440
 	add
 	stloc.1
-// 0x01058f54: 0x1058f54: jal   0x100e348 addu  s2, v0, zero
+// 0x01058f64: 0x1058f64: jal   0x100e358 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -2071,12 +2071,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f5c: 0x1058f5c: jal   0x104edb0 addu  a0, v0, zero
+// 0x01058f6c: 0x1058f6c: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2084,22 +2084,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f64: 0x1058f64: jal   0x104dd5c addiu a0, zero, 7
+// 0x01058f74: 0x1058f74: jal   0x104dd6c addiu a0, zero, 7
 	ldc.i4.7
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01058f6c: 0x1058f6c: lw    ra, 36(sp)
-// 0x01058f70: 0x1058f70: sw    s2, 20(s0)
+// 0x01058f7c: 0x1058f7c: lw    ra, 36(sp)
+// 0x01058f80: 0x1058f80: sw    s2, 20(s0)
 	ldloc 9
 	ldloc 7
 	ldc.i4.2
@@ -2108,7 +2108,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058f74: 0x1058f74: lw    s3, 32(sp)
+// 0x01058f84: 0x1058f84: lw    s3, 32(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -2117,7 +2117,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01058f78: 0x1058f78: lw    s2, 28(sp)
+// 0x01058f88: 0x1058f88: lw    s2, 28(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -2126,7 +2126,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01058f7c: 0x1058f7c: lw    s1, 24(sp)
+// 0x01058f8c: 0x1058f8c: lw    s1, 24(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -2135,7 +2135,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01058f80: 0x1058f80: lw    s0, 20(sp)
+// 0x01058f90: 0x1058f90: lw    s0, 20(sp)
 	ldloc 9
 	ldloc.0
 	ldc.i4.2
@@ -2144,7 +2144,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01058f84: 0x1058f84: jr    ra addiu sp, sp, 40
+// 0x01058f94: 0x1058f94: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2156,7 +2156,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_initialize_1058f8c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_initialize_1058f9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -2203,12 +2203,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01058f8c: 0x1058f8c: addiu sp, sp, -56
+// 0x01058f9c: 0x1058f9c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01058f90: 0x1058f90: sw    s0, 36(sp)
+// 0x01058fa0: 0x1058fa0: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2217,35 +2217,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01058f94: 0x1058f94: lui   a1, 0x0
+// 0x01058fa4: 0x1058fa4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01058f98: 0x1058f98: lui   s0, 0x0
+// 0x01058fa8: 0x1058fa8: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01058f9c: 0x1058f9c: lui   a2, 0x10000
+// 0x01058fac: 0x1058fac: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01058fa0: 0x1058fa0: addiu a0, s0, 26236
+// 0x01058fb0: 0x1058fb0: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01058fa4: 0x1058fa4: addiu a1, a1, 14376
+// 0x01058fb4: 0x1058fb4: addiu a1, a1, 14376
 	ldloc.2
 	ldc.i4 14376
 	add
 	stloc.2
-// 0x01058fa8: 0x1058fa8: addiu a2, a2, 9488
+// 0x01058fb8: 0x1058fb8: addiu a2, a2, 9484
 	ldloc.3
-	ldc.i4 9488
+	ldc.i4 9484
 	add
 	stloc.3
-// 0x01058fac: 0x1058fac: addu  a3, zero, zero
+// 0x01058fbc: 0x1058fbc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01058fb0: 0x1058fb0: sw    ra, 52(sp)
-// 0x01058fb4: 0x1058fb4: sw    s3, 48(sp)
+// 0x01058fc0: 0x1058fc0: sw    ra, 52(sp)
+// 0x01058fc4: 0x1058fc4: sw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2254,7 +2254,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01058fb8: 0x1058fb8: sw    s2, 44(sp)
+// 0x01058fc8: 0x1058fc8: sw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2263,7 +2263,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01058fbc: 0x1058fbc: jal   0x100edb0 sw    s1, 40(sp)
+// 0x01058fcc: 0x1058fcc: jal   0x100edc0 sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2277,33 +2277,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01058fc4: 0x1058fc4: lui   a1, 0x0
+// 0x01058fd4: 0x1058fd4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01058fc8: 0x1058fc8: lui   a2, 0x10000
+// 0x01058fd8: 0x1058fd8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01058fcc: 0x1058fcc: addiu a0, s0, 26236
+// 0x01058fdc: 0x1058fdc: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01058fd0: 0x1058fd0: addiu a1, a1, 14392
+// 0x01058fe0: 0x1058fe0: addiu a1, a1, 14392
 	ldloc.2
 	ldc.i4 14392
 	add
 	stloc.2
-// 0x01058fd4: 0x1058fd4: addiu a2, a2, 9500
+// 0x01058fe4: 0x1058fe4: addiu a2, a2, 9496
 	ldloc.3
-	ldc.i4 9500
+	ldc.i4 9496
 	add
 	stloc.3
-// 0x01058fd8: 0x1058fd8: jal   0x100edb0 addu  a3, zero, zero
+// 0x01058fe8: 0x1058fe8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2311,33 +2311,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01058fe0: 0x1058fe0: lui   a1, 0x0
+// 0x01058ff0: 0x1058ff0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01058fe4: 0x1058fe4: lui   a2, 0x10000
+// 0x01058ff4: 0x1058ff4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01058fe8: 0x1058fe8: addiu a0, s0, 26236
+// 0x01058ff8: 0x1058ff8: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01058fec: 0x1058fec: addiu a1, a1, 14408
+// 0x01058ffc: 0x1058ffc: addiu a1, a1, 14408
 	ldloc.2
 	ldc.i4 14408
 	add
 	stloc.2
-// 0x01058ff0: 0x1058ff0: addiu a2, a2, 9508
+// 0x01059000: 0x1059000: addiu a2, a2, 9504
 	ldloc.3
-	ldc.i4 9508
+	ldc.i4 9504
 	add
 	stloc.3
-// 0x01058ff4: 0x1058ff4: jal   0x100edb0 addu  a3, zero, zero
+// 0x01059004: 0x1059004: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2345,33 +2345,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01058ffc: 0x1058ffc: lui   a1, 0x0
+// 0x0105900c: 0x105900c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01059000: 0x1059000: lui   a2, 0x10000
+// 0x01059010: 0x1059010: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01059004: 0x1059004: addiu a0, s0, 26236
+// 0x01059014: 0x1059014: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01059008: 0x1059008: addiu a1, a1, 14424
+// 0x01059018: 0x1059018: addiu a1, a1, 14424
 	ldloc.2
 	ldc.i4 14424
 	add
 	stloc.2
-// 0x0105900c: 0x105900c: addiu a2, a2, 9516
+// 0x0105901c: 0x105901c: addiu a2, a2, 9512
 	ldloc.3
-	ldc.i4 9516
+	ldc.i4 9512
 	add
 	stloc.3
-// 0x01059010: 0x1059010: jal   0x100edb0 addu  a3, zero, zero
+// 0x01059020: 0x1059020: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2379,33 +2379,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059018: 0x1059018: lui   a1, 0x0
+// 0x01059028: 0x1059028: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105901c: 0x105901c: lui   a2, 0x10000
+// 0x0105902c: 0x105902c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01059020: 0x1059020: addiu a0, s0, 26236
+// 0x01059030: 0x1059030: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01059024: 0x1059024: addiu a1, a1, 14440
+// 0x01059034: 0x1059034: addiu a1, a1, 14440
 	ldloc.2
 	ldc.i4 14440
 	add
 	stloc.2
-// 0x01059028: 0x1059028: addiu a2, a2, 9524
+// 0x01059038: 0x1059038: addiu a2, a2, 9520
 	ldloc.3
-	ldc.i4 9524
+	ldc.i4 9520
 	add
 	stloc.3
-// 0x0105902c: 0x105902c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0105903c: 0x105903c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2413,47 +2413,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059034: 0x1059034: lui   s1, 0x0
+// 0x01059044: 0x1059044: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01059038: 0x1059038: lui   s2, 0x20000
+// 0x01059048: 0x1059048: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x0105903c: 0x105903c: lui   s0, 0x20000
+// 0x0105904c: 0x105904c: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01059040: 0x1059040: lui   a1, 0x0
+// 0x01059050: 0x1059050: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01059044: 0x1059044: addiu s0, s0, 9464
+// 0x01059054: 0x1059054: addiu s0, s0, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 8
-// 0x01059048: 0x1059048: addiu a0, s2, -26888
+// 0x01059058: 0x1059058: addiu a0, s2, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0105904c: 0x105904c: addiu a3, s1, 20820
+// 0x0105905c: 0x105905c: addiu a3, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01059050: 0x1059050: addiu a1, a1, 14100
+// 0x01059060: 0x1059060: addiu a1, a1, 14100
 	ldloc.2
 	ldc.i4 14100
 	add
 	stloc.2
-// 0x01059054: 0x1059054: addu  a2, zero, zero
+// 0x01059064: 0x1059064: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01059058: 0x1059058: sw    s0, 16(sp)
+// 0x01059068: 0x1059068: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2462,7 +2462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105905c: 0x105905c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0105906c: 0x105906c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2476,36 +2476,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059064: 0x1059064: lui   a1, 0x0
+// 0x01059074: 0x1059074: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01059068: 0x1059068: addiu a0, s2, -26888
+// 0x01059078: 0x1059078: addiu a0, s2, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0105906c: 0x105906c: addiu a3, s1, 20820
+// 0x0105907c: 0x105907c: addiu a3, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01059070: 0x1059070: addiu a1, a1, 14116
+// 0x01059080: 0x1059080: addiu a1, a1, 14116
 	ldloc.2
 	ldc.i4 14116
 	add
 	stloc.2
-// 0x01059074: 0x1059074: addu  a2, zero, zero
+// 0x01059084: 0x1059084: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01059078: 0x1059078: lui   s2, 0x10000
+// 0x01059088: 0x1059088: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0105907c: 0x105907c: sw    s0, 16(sp)
+// 0x0105908c: 0x105908c: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2514,7 +2514,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01059080: 0x1059080: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01059090: 0x1059090: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2528,33 +2528,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059088: 0x1059088: lui   a1, 0x0
+// 0x01059098: 0x1059098: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105908c: 0x105908c: addiu a3, s1, 20820
+// 0x0105909c: 0x105909c: addiu a3, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01059090: 0x1059090: addiu a1, a1, 14132
+// 0x010590a0: 0x10590a0: addiu a1, a1, 14132
 	ldloc.2
 	ldc.i4 14132
 	add
 	stloc.2
-// 0x01059094: 0x1059094: addiu a0, s2, 12560
+// 0x010590a4: 0x10590a4: addiu a0, s2, 12556
 	ldloc 10
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01059098: 0x1059098: addu  a2, zero, zero
+// 0x010590a8: 0x10590a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105909c: 0x105909c: sw    s0, 16(sp)
+// 0x010590ac: 0x10590ac: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2563,7 +2563,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010590a0: 0x10590a0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010590b0: 0x10590b0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2577,33 +2577,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010590a8: 0x10590a8: lui   a1, 0x0
+// 0x010590b8: 0x10590b8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010590ac: 0x10590ac: addiu a3, s1, 20820
+// 0x010590bc: 0x10590bc: addiu a3, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x010590b0: 0x10590b0: addiu a1, a1, 14148
+// 0x010590c0: 0x10590c0: addiu a1, a1, 14148
 	ldloc.2
 	ldc.i4 14148
 	add
 	stloc.2
-// 0x010590b4: 0x10590b4: addiu a0, s2, 12560
+// 0x010590c4: 0x10590c4: addiu a0, s2, 12556
 	ldloc 10
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010590b8: 0x10590b8: addu  a2, zero, zero
+// 0x010590c8: 0x10590c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010590bc: 0x10590bc: sw    s0, 16(sp)
+// 0x010590cc: 0x10590cc: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2612,7 +2612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010590c0: 0x10590c0: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010590d0: 0x10590d0: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2626,39 +2626,39 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010590c8: 0x10590c8: lui   a1, 0x0
+// 0x010590d8: 0x10590d8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010590cc: 0x10590cc: addiu s1, s1, 20820
+// 0x010590dc: 0x10590dc: addiu s1, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
 	stloc 9
-// 0x010590d0: 0x10590d0: addiu a1, a1, 14456
+// 0x010590e0: 0x10590e0: addiu a1, a1, 14456
 	ldloc.2
 	ldc.i4 14456
 	add
 	stloc.2
-// 0x010590d4: 0x10590d4: addiu a0, s2, 12560
+// 0x010590e4: 0x10590e4: addiu a0, s2, 12556
 	ldloc 10
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010590d8: 0x10590d8: addu  a2, zero, zero
+// 0x010590e8: 0x10590e8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010590dc: 0x10590dc: addu  a3, s0, zero
+// 0x010590ec: 0x10590ec: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x010590e0: 0x10590e0: lui   s3, 0x10000
+// 0x010590f0: 0x10590f0: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x010590e4: 0x10590e4: sw    s1, 16(sp)
+// 0x010590f4: 0x10590f4: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2667,7 +2667,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010590e8: 0x10590e8: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010590f8: 0x10590f8: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2681,33 +2681,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010590f0: 0x10590f0: lui   a1, 0x0
+// 0x01059100: 0x1059100: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010590f4: 0x10590f4: lui   a2, 0x10000
+// 0x01059104: 0x1059104: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010590f8: 0x10590f8: addiu a1, a1, 14164
+// 0x01059108: 0x1059108: addiu a1, a1, 14164
 	ldloc.2
 	ldc.i4 14164
 	add
 	stloc.2
-// 0x010590fc: 0x10590fc: addiu a2, a2, 9532
+// 0x0105910c: 0x105910c: addiu a2, a2, 9528
 	ldloc.3
-	ldc.i4 9532
+	ldc.i4 9528
 	add
 	stloc.3
-// 0x01059100: 0x1059100: addiu a0, s3, 18248
+// 0x01059110: 0x1059110: addiu a0, s3, 19712
 	ldloc 11
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01059104: 0x1059104: jal   0x100edb0 addu  a3, zero, zero
+// 0x01059114: 0x1059114: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2715,33 +2715,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0105910c: 0x105910c: lui   a1, 0x0
+// 0x0105911c: 0x105911c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01059110: 0x1059110: lui   a2, 0x10000
+// 0x01059120: 0x1059120: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01059114: 0x1059114: addiu a1, a1, 14180
+// 0x01059124: 0x1059124: addiu a1, a1, 14180
 	ldloc.2
 	ldc.i4 14180
 	add
 	stloc.2
-// 0x01059118: 0x1059118: addiu a2, a2, -48
+// 0x01059128: 0x1059128: addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x0105911c: 0x105911c: addiu a0, s3, 18248
+// 0x0105912c: 0x105912c: addiu a0, s3, 19712
 	ldloc 11
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01059120: 0x1059120: jal   0x100edb0 addu  a3, zero, zero
+// 0x01059130: 0x1059130: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2749,33 +2749,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059128: 0x1059128: lui   a1, 0x0
+// 0x01059138: 0x1059138: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105912c: 0x105912c: lui   a2, 0x10000
+// 0x0105913c: 0x105913c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01059130: 0x1059130: addiu a0, s3, 18248
+// 0x01059140: 0x1059140: addiu a0, s3, 19712
 	ldloc 11
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01059134: 0x1059134: addiu a1, a1, 14196
+// 0x01059144: 0x1059144: addiu a1, a1, 14196
 	ldloc.2
 	ldc.i4 14196
 	add
 	stloc.2
-// 0x01059138: 0x1059138: addiu a2, a2, 9424
+// 0x01059148: 0x1059148: addiu a2, a2, 9420
 	ldloc.3
-	ldc.i4 9424
+	ldc.i4 9420
 	add
 	stloc.3
-// 0x0105913c: 0x105913c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0105914c: 0x105914c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2783,31 +2783,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059144: 0x1059144: lui   a1, 0x0
+// 0x01059154: 0x1059154: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01059148: 0x1059148: addiu a0, s2, 12560
+// 0x01059158: 0x1059158: addiu a0, s2, 12556
 	ldloc 10
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105914c: 0x105914c: addiu a1, a1, 14472
+// 0x0105915c: 0x105915c: addiu a1, a1, 14472
 	ldloc.2
 	ldc.i4 14472
 	add
 	stloc.2
-// 0x01059150: 0x1059150: addu  a3, s0, zero
+// 0x01059160: 0x1059160: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x01059154: 0x1059154: addu  a2, zero, zero
+// 0x01059164: 0x1059164: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01059158: 0x1059158: sw    s1, 16(sp)
+// 0x01059168: 0x1059168: sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2816,7 +2816,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105915c: 0x105915c: jal   0x100edf8 sw    zero, 20(sp)
+// 0x0105916c: 0x105916c: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2830,48 +2830,48 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059164: 0x1059164: jal   0x1058d50 sll   zero, zero, 0
+// 0x01059174: 0x1059174: jal   0x1058d60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_init_pens_1058d50(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_init_pens_1058d60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0105916c: 0x105916c: jal   0x1061538 sll   zero, zero, 0
+// 0x0105917c: 0x105917c: jal   0x1061548 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_initialize_1061538(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_initialize_1061548(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059174: 0x1059174: jal   0x105fee4 sll   zero, zero, 0
+// 0x01059184: 0x1059184: jal   0x105fef4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_plugin_register_105fee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_plugin_register_105fef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0105917c: 0x105917c: lui   v1, 0x0
+// 0x0105918c: 0x105918c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01059180: 0x1059180: jal   0x10603d0 sw    v0, 14212(v1)
+// 0x01059190: 0x1059190: jal   0x10603e0 sw    v0, 14212(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2885,86 +2885,86 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_traffic_initialize_10603d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_traffic_initialize_10603e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059188: 0x1059188: lui   v0, 0x70000
+// 0x01059198: 0x1059198: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105918c: 0x105918c: lw    v1, 9156(v0)
+// 0x0105919c: 0x105919c: lw    v1, 9620(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2289
+	ldc.i4 2405
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059190: 0x1059190: sll   zero, zero, 0
-// 0x01059194: 0x1059194: bne   v1, zero, 0x10591a0 addiu v1, zero, 1
+// 0x010591a0: 0x10591a0: sll   zero, zero, 0
+// 0x010591a4: 0x10591a4: bne   v1, zero, 0x10591b0 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10591a0
+	brtrue L_10591b0
 // --- basic block ---
-// 0x0105919c: 0x105919c: sw    v1, 9156(v0)
+// 0x010591ac: 0x10591ac: sw    v1, 9620(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2289
+	ldc.i4 2405
 	add
 	ldloc 5
 	stelem.i4
-L_10591a0:
-// 0x010591a0: 0x10591a0: lui   a0, 0x1060000
+L_10591b0:
+// 0x010591b0: 0x10591b0: lui   a0, 0x1060000
 	ldc.i4 17170432
 	stloc.1
-// 0x010591a4: 0x10591a4: jal   0x101ada4 addiu a0, a0, -23564
+// 0x010591b4: 0x10591b4: jal   0x101adb4 addiu a0, a0, -23548
 	ldloc.1
-	ldc.i4 -23564
+	ldc.i4 -23548
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl19::roadmap_message_register_101ada4(int32)
+	call int32 Cibyl19::roadmap_message_register_101adb4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010591ac: 0x10591ac: lui   a0, 0x1060000
+// 0x010591bc: 0x10591bc: lui   a0, 0x1060000
 	ldc.i4 17170432
 	stloc.1
-// 0x010591b0: 0x10591b0: addiu a0, a0, -29360
+// 0x010591c0: 0x10591c0: addiu a0, a0, -29344
 	ldloc.1
-	ldc.i4 -29360
+	ldc.i4 -29344
 	add
 	stloc.1
-// 0x010591b4: 0x10591b4: lui   v1, 0x70000
+// 0x010591c4: 0x10591c4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010591b8: 0x10591b8: jal   0x1014064 sw    v0, 10676(v1)
+// 0x010591c8: 0x10591c8: jal   0x1014074 sw    v0, 11140(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2669
+	ldc.i4 2785
 	add
 	ldloc 6
 	stelem.i4
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010591c0: 0x10591c0: lui   a0, 0x0
+// 0x010591d0: 0x10591d0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010591c4: 0x10591c4: jal   0x100e788 addiu a0, a0, 14180
+// 0x010591d4: 0x10591d4: jal   0x100e798 addiu a0, a0, 14180
 	ldloc.1
 	ldc.i4 14180
 	add
@@ -2974,19 +2974,19 @@ L_10591a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010591cc: 0x10591cc: beq   v0, zero, 0x1059254 sll   zero, zero, 0
+// 0x010591dc: 0x10591dc: beq   v0, zero, 0x1059264 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1059254
+	brfalse L_1059264
 // --- basic block ---
-// 0x010591d4: 0x10591d4: lui   a0, 0x0
+// 0x010591e4: 0x10591e4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010591d8: 0x10591d8: jal   0x100e788 addiu a0, a0, 14196
+// 0x010591e8: 0x10591e8: jal   0x100e798 addiu a0, a0, 14196
 	ldloc.1
 	ldc.i4 14196
 	add
@@ -2996,63 +2996,63 @@ L_10591a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010591e0: 0x10591e0: addu  v1, v0, zero
+// 0x010591f0: 0x10591f0: addu  v1, v0, zero
 	ldloc 6
 	stloc 5
-// 0x010591e4: 0x10591e4: addiu v0, zero, -1
+// 0x010591f4: 0x10591f4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010591e8: 0x10591e8: beq   v1, v0, 0x1059210 addiu s0, sp, 24
+// 0x010591f8: 0x10591f8: beq   v1, v0, 0x1059220 addiu s0, sp, 24
 	ldloc 5
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	beq  L_1059210
+	beq  L_1059220
 // --- basic block ---
-// 0x010591f0: 0x10591f0: addu  a0, zero, zero
+// 0x01059200: 0x1059200: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010591f4: 0x10591f4: cibyl_sysc_arg 0x4
+// 0x01059204: 0x1059204: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x010591f8: 0x10591f8: cibyl_sysc 0x2069
+// 0x01059208: 0x1059208: cibyl_sysc 0x2069
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 6
-// 0x010591fc: 0x10591fc: addu  a0, v0, zero
+// 0x0105920c: 0x105920c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01059200: 0x1059200: subu  v1, a0, v1
+// 0x01059210: 0x1059210: subu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x01059204: 0x1059204: slti  v1, v1, 7200
+// 0x01059214: 0x1059214: slti  v1, v1, 7200
 	ldloc 5
 	ldc.i4 7200
 	clt
 	stloc 5
-// 0x01059208: 0x1059208: beq   v1, zero, 0x1059254 addiu s0, sp, 24
+// 0x01059218: 0x1059218: beq   v1, zero, 0x1059264 addiu s0, sp, 24
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	brfalse L_1059254
+	brfalse L_1059264
 // --- basic block ---
-L_1059210:
-// 0x01059210: 0x1059210: lui   a0, 0x0
+L_1059220:
+// 0x01059220: 0x1059220: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01059214: 0x1059214: addu  a1, s0, zero
+// 0x01059224: 0x1059224: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x01059218: 0x1059218: jal   0x100e65c addiu a0, a0, 14164
+// 0x01059228: 0x1059228: jal   0x100e66c addiu a0, a0, 14164
 	ldloc.1
 	ldc.i4 14164
 	add
@@ -3062,15 +3062,15 @@ L_1059210:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_position_100e65c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_position_100e66c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059220: 0x1059220: lui   a0, 0x10000
+// 0x01059230: 0x1059230: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01059224: 0x1059224: jal   0x101ece8 addiu a0, a0, -31052
+// 0x01059234: 0x1059234: jal   0x101ecf8 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -3080,20 +3080,20 @@ L_1059210:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0105922c: 0x105922c: lui   a0, 0x10000
+// 0x0105923c: 0x105923c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01059230: 0x1059230: addiu a0, a0, -29748
+// 0x01059240: 0x1059240: addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
 	stloc.1
-// 0x01059234: 0x1059234: jal   0x101f76c addu  a1, s0, zero
+// 0x01059244: 0x1059244: jal   0x101f77c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -3101,17 +3101,17 @@ L_1059210:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0105923c: 0x105923c: lui   a0, 0x1060000
+// 0x0105924c: 0x105924c: lui   a0, 0x1060000
 	ldc.i4 17170432
 	stloc.1
-// 0x01059240: 0x1059240: jal   0x106bcfc addiu a0, a0, -13792
+// 0x01059250: 0x1059250: jal   0x106c320 addiu a0, a0, -13776
 	ldloc.1
-	ldc.i4 -13792
+	ldc.i4 -13776
 	add
 	stloc.1
 	ldloc.0
@@ -3119,30 +3119,30 @@ L_1059210:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059248: 0x1059248: lui   v1, 0x70000
+// 0x01059258: 0x1059258: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105924c: 0x105924c: j	 0x1059280 sw    v0, 10368(v1)
+// 0x0105925c: 0x105925c: j	 0x1059290 sw    v0, 10832(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2592
+	ldc.i4 2708
 	add
 	ldloc 6
 	stelem.i4
-	br L_1059280
+	br L_1059290
 // --- basic block ---
-L_1059254:
-// 0x01059254: 0x1059254: lui   a0, 0x10000
+L_1059264:
+// 0x01059264: 0x1059264: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01059258: 0x1059258: jal   0x101f044 addiu a0, a0, -29748
+// 0x01059268: 0x1059268: jal   0x101f054 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -3152,20 +3152,20 @@ L_1059254:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059260: 0x1059260: lui   a0, 0x0
+// 0x01059270: 0x1059270: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01059264: 0x1059264: addiu a0, a0, 14180
+// 0x01059274: 0x1059274: addiu a0, a0, 14180
 	ldloc.1
 	ldc.i4 14180
 	add
 	stloc.1
-// 0x01059268: 0x1059268: jal   0x100e610 addu  a1, zero, zero
+// 0x01059278: 0x1059278: jal   0x100e620 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3173,20 +3173,20 @@ L_1059254:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059270: 0x1059270: lui   a0, 0x10000
+// 0x01059280: 0x1059280: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01059274: 0x1059274: addiu a0, a0, 18248
+// 0x01059284: 0x1059284: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x01059278: 0x1059278: jal   0x100e9c4 addiu a1, zero, 1
+// 0x01059288: 0x1059288: jal   0x100e9d4 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3194,21 +3194,21 @@ L_1059254:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_one_100e9c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_one_100e9d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1059280:
-// 0x01059280: 0x1059280: lui   a0, 0x0
+L_1059290:
+// 0x01059290: 0x1059290: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01059284: 0x1059284: addiu a0, a0, 14196
+// 0x01059294: 0x1059294: addiu a0, a0, 14196
 	ldloc.1
 	ldc.i4 14196
 	add
 	stloc.1
-// 0x01059288: 0x1059288: jal   0x100e610 addiu a1, zero, -1
+// 0x01059298: 0x1059298: jal   0x100e620 addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -3216,12 +3216,12 @@ L_1059280:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059290: 0x1059290: jal   0x100ea50 addu  a0, zero, zero
+// 0x010592a0: 0x10592a0: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3229,13 +3229,13 @@ L_1059280:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01059298: 0x1059298: lw    ra, 52(sp)
-// 0x0105929c: 0x105929c: lw    s3, 48(sp)
+// 0x010592a8: 0x10592a8: lw    ra, 52(sp)
+// 0x010592ac: 0x10592ac: lw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3244,7 +3244,7 @@ L_1059280:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010592a0: 0x10592a0: lw    s2, 44(sp)
+// 0x010592b0: 0x10592b0: lw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3253,7 +3253,7 @@ L_1059280:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010592a4: 0x10592a4: lw    s1, 40(sp)
+// 0x010592b4: 0x10592b4: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3262,7 +3262,7 @@ L_1059280:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010592a8: 0x10592a8: lw    s0, 36(sp)
+// 0x010592b8: 0x10592b8: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3271,7 +3271,7 @@ L_1059280:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010592ac: 0x10592ac: jr    ra addiu sp, sp, 56
+// 0x010592bc: 0x10592bc: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3283,7 +3283,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigation_guidance_off_10592b4(int32,int32,int32,int32,int32)
+.method public static int32 navigation_guidance_off_10592c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -3318,27 +3318,27 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10592b4:
-// 0x010592b4: 0x10592b4: lui   a0, 0x0
+L_10592c4:
+// 0x010592c4: 0x10592c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010592b8: 0x10592b8: lui   a1, 0x20000
+// 0x010592c8: 0x10592c8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010592bc: 0x10592bc: addiu sp, sp, -24
+// 0x010592cc: 0x10592cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010592c0: 0x10592c0: addiu a0, a0, 14116
+// 0x010592d0: 0x10592d0: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x010592c4: 0x10592c4: sw    ra, 20(sp)
-// 0x010592c8: 0x10592c8: jal   0x100e5c0 addiu a1, a1, 9464
+// 0x010592d4: 0x10592d4: sw    ra, 20(sp)
+// 0x010592d8: 0x10592d8: jal   0x100e5d0 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -3346,12 +3346,12 @@ L_10592b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010592d0: 0x10592d0: jal   0x1094b64 addu  a0, zero, zero
+// 0x010592e0: 0x10592e0: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3359,14 +3359,14 @@ L_10592b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010592d8: 0x10592d8: lw    ra, 20(sp)
-// 0x010592dc: 0x10592dc: sll   zero, zero, 0
-// 0x010592e0: 0x10592e0: jr    ra addiu sp, sp, 24
+// 0x010592e8: 0x10592e8: lw    ra, 20(sp)
+// 0x010592ec: 0x10592ec: sll   zero, zero, 0
+// 0x010592f0: 0x10592f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3378,7 +3378,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigation_guidance_on_10592e8(int32,int32,int32,int32,int32)
+.method public static int32 navigation_guidance_on_10592f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -3413,25 +3413,25 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10592e8:
-// 0x010592e8: 0x10592e8: lui   a0, 0x0
+L_10592f8:
+// 0x010592f8: 0x10592f8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010592ec: 0x10592ec: lui   a1, 0x0
+// 0x010592fc: 0x10592fc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010592f0: 0x10592f0: addiu sp, sp, -24
+// 0x01059300: 0x1059300: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010592f4: 0x10592f4: addiu a0, a0, 14116
+// 0x01059304: 0x1059304: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x010592f8: 0x10592f8: sw    ra, 20(sp)
-// 0x010592fc: 0x10592fc: jal   0x100e5c0 addiu a1, a1, 20820
+// 0x01059308: 0x1059308: sw    ra, 20(sp)
+// 0x0105930c: 0x105930c: jal   0x100e5d0 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3441,12 +3441,12 @@ L_10592e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01059304: 0x1059304: jal   0x1094b64 addu  a0, zero, zero
+// 0x01059314: 0x1059314: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3454,14 +3454,14 @@ L_10592e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105930c: 0x105930c: lw    ra, 20(sp)
-// 0x01059310: 0x1059310: sll   zero, zero, 0
-// 0x01059314: 0x1059314: jr    ra addiu sp, sp, 24
+// 0x0105931c: 0x105931c: lw    ra, 20(sp)
+// 0x01059320: 0x1059320: sll   zero, zero, 0
+// 0x01059324: 0x1059324: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3473,7 +3473,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 toggle_navigation_guidance_105931c(int32,int32,int32,int32,int32)
+.method public static int32 toggle_navigation_guidance_105932c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 v1,int32 ra)
@@ -3514,13 +3514,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105931c:
-// 0x0105931c: 0x105931c: addiu sp, sp, -32
+L_105932c:
+// 0x0105932c: 0x105932c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01059320: 0x1059320: sw    s1, 24(sp)
+// 0x01059330: 0x1059330: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3529,7 +3529,7 @@ L_105931c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01059324: 0x1059324: sw    s0, 20(sp)
+// 0x01059334: 0x1059334: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3538,19 +3538,19 @@ L_105931c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01059328: 0x1059328: lui   s1, 0x0
+// 0x01059338: 0x1059338: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0105932c: 0x105932c: lui   s0, 0x0
+// 0x0105933c: 0x105933c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01059330: 0x1059330: addiu a0, s0, 14116
+// 0x01059340: 0x1059340: addiu a0, s0, 14116
 	ldloc 5
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x01059334: 0x1059334: sw    ra, 28(sp)
-// 0x01059338: 0x1059338: jal   0x100e7f4 addiu a1, s1, 20820
+// 0x01059344: 0x1059344: sw    ra, 28(sp)
+// 0x01059348: 0x1059348: jal   0x100e804 addiu a1, s1, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
@@ -3560,23 +3560,23 @@ L_105931c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01059340: 0x1059340: beq   v0, zero, 0x1059364 lui   a0, 0x10000
+// 0x01059350: 0x1059350: beq   v0, zero, 0x1059374 lui   a0, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1059364
+	brfalse L_1059374
 // --- basic block ---
-// 0x01059348: 0x1059348: addiu a0, a0, 9540
+// 0x01059358: 0x1059358: addiu a0, a0, 9536
 	ldloc.1
-	ldc.i4 9540
+	ldc.i4 9536
 	add
 	stloc.1
-// 0x0105934c: 0x105934c: jal   0x109e1c0 addiu a1, zero, 1
+// 0x0105935c: 0x105935c: jal   0x109e808 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3584,36 +3584,36 @@ L_105931c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_splash_109e1c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_splash_109e808(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01059354: 0x1059354: lui   a1, 0x20000
+// 0x01059364: 0x1059364: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01059358: 0x1059358: addiu a0, s0, 14116
+// 0x01059368: 0x1059368: addiu a0, s0, 14116
 	ldloc 5
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x0105935c: 0x105935c: j	 0x105937c addiu a1, a1, 9464
+// 0x0105936c: 0x105936c: j	 0x105938c addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
-	br L_105937c
+	br L_105938c
 // --- basic block ---
-L_1059364:
-// 0x01059364: 0x1059364: lui   a0, 0x10000
+L_1059374:
+// 0x01059374: 0x1059374: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01059368: 0x1059368: addiu a0, a0, 9560
+// 0x01059378: 0x1059378: addiu a0, a0, 9556
 	ldloc.1
-	ldc.i4 9560
+	ldc.i4 9556
 	add
 	stloc.1
-// 0x0105936c: 0x105936c: jal   0x109e1c0 addiu a1, zero, 1
+// 0x0105937c: 0x105937c: jal   0x109e808 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3621,35 +3621,35 @@ L_1059364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_splash_109e1c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_splash_109e808(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01059374: 0x1059374: addiu a0, s0, 14116
+// 0x01059384: 0x1059384: addiu a0, s0, 14116
 	ldloc 5
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x01059378: 0x1059378: addiu a1, s1, 20820
+// 0x01059388: 0x1059388: addiu a1, s1, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc.2
-L_105937c:
-// 0x0105937c: 0x105937c: jal   0x100e5c0 sll   zero, zero, 0
+L_105938c:
+// 0x0105938c: 0x105938c: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01059384: 0x1059384: lw    ra, 28(sp)
-// 0x01059388: 0x1059388: lw    s1, 24(sp)
+// 0x01059394: 0x1059394: lw    ra, 28(sp)
+// 0x01059398: 0x1059398: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3658,7 +3658,7 @@ L_105937c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105938c: 0x105938c: lw    s0, 20(sp)
+// 0x0105939c: 0x105939c: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3667,7 +3667,7 @@ L_105937c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059390: 0x1059390: jr    ra addiu sp, sp, 32
+// 0x010593a0: 0x10593a0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3679,7 +3679,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_main_shutdown_1059398(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_shutdown_10593a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -3714,26 +3714,26 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01059398: 0x1059398: lui   a0, 0x0
+// 0x010593a8: 0x10593a8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105939c: 0x105939c: lui   a1, 0x10000
+// 0x010593ac: 0x10593ac: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010593a0: 0x10593a0: addiu sp, sp, -24
+// 0x010593b0: 0x10593b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010593a4: 0x10593a4: addiu a0, a0, 14180
+// 0x010593b4: 0x10593b4: addiu a0, a0, 14180
 	ldloc.1
 	ldc.i4 14180
 	add
 	stloc.1
-// 0x010593a8: 0x10593a8: sw    ra, 20(sp)
-// 0x010593ac: 0x10593ac: jal   0x100e7f4 addiu a1, a1, -16892
+// 0x010593b8: 0x10593b8: sw    ra, 20(sp)
+// 0x010593bc: 0x10593bc: jal   0x100e804 addiu a1, a1, 19396
 	ldloc.2
-	ldc.i4 -16892
+	ldc.i4 19396
 	add
 	stloc.2
 	ldloc.0
@@ -3741,109 +3741,109 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010593b4: 0x10593b4: beq   v0, zero, 0x105943c sll   zero, zero, 0
+// 0x010593c4: 0x10593c4: beq   v0, zero, 0x105944c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105943c
+	brfalse L_105944c
 // --- basic block ---
-// 0x010593bc: 0x10593bc: jal   0x10573dc sll   zero, zero, 0
+// 0x010593cc: 0x10593cc: jal   0x10573ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_is_auto_zoom_10573dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_is_auto_zoom_10573ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010593c4: 0x10593c4: beq   v0, zero, 0x10593d8 lui   v0, 0x70000
+// 0x010593d4: 0x10593d4: beq   v0, zero, 0x10593e8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10593d8
+	brfalse L_10593e8
 // --- basic block ---
-// 0x010593cc: 0x10593cc: jal   0x1009a28 sll   zero, zero, 0
+// 0x010593dc: 0x10593dc: jal   0x1009a38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_zoom_reset_1009a28(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_zoom_reset_1009a38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010593d4: 0x10593d4: lui   v0, 0x70000
+// 0x010593e4: 0x10593e4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_10593d8:
-// 0x010593d8: 0x10593d8: lw    a0, 9160(v0)
+L_10593e8:
+// 0x010593e8: 0x10593e8: lw    a0, 9624(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc.1
-// 0x010593dc: 0x10593dc: lui   v1, 0x70000
+// 0x010593ec: 0x10593ec: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010593e0: 0x10593e0: lui   v0, 0x70000
+// 0x010593f0: 0x10593f0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010593e4: 0x10593e4: lw    v0, 10680(v0)
+// 0x010593f4: 0x10593f4: lw    v0, 11144(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2670
+	ldc.i4 2786
 	add
 	ldelem.i4
 	stloc 5
-// 0x010593e8: 0x10593e8: lw    v1, 10688(v1)
+// 0x010593f8: 0x10593f8: lw    v1, 11152(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc 6
-// 0x010593ec: 0x10593ec: beq   a0, zero, 0x105941c addu  a1, zero, zero
+// 0x010593fc: 0x10593fc: beq   a0, zero, 0x105942c addu  a1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_105941c
+	brfalse L_105942c
 // --- basic block ---
-// 0x010593f4: 0x10593f4: addu  v0, v1, v0
+// 0x01059404: 0x1059404: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x010593f8: 0x10593f8: slti  v0, v0, 500
+// 0x01059408: 0x1059408: slti  v0, v0, 500
 	ldloc 5
 	ldc.i4 500
 	clt
 	stloc 5
-// 0x010593fc: 0x10593fc: beq   v0, zero, 0x105941c sll   zero, zero, 0
+// 0x0105940c: 0x105940c: beq   v0, zero, 0x105942c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105941c
+	brfalse L_105942c
 // --- basic block ---
-// 0x01059404: 0x1059404: lui   a0, 0x0
+// 0x01059414: 0x1059414: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01059408: 0x1059408: addiu a0, a0, 14180
+// 0x01059418: 0x1059418: addiu a0, a0, 14180
 	ldloc.1
 	ldc.i4 14180
 	add
 	stloc.1
-// 0x0105940c: 0x105940c: jal   0x100e610 addu  a1, zero, zero
+// 0x0105941c: 0x105941c: jal   0x100e620 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3851,27 +3851,27 @@ L_10593d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059414: 0x1059414: j	 0x105943c sll   zero, zero, 0
-	br L_105943c
+// 0x01059424: 0x1059424: j	 0x105944c sll   zero, zero, 0
+	br L_105944c
 // --- basic block ---
-L_105941c:
-// 0x0105941c: 0x105941c: cibyl_sysc_arg 0x5
+L_105942c:
+// 0x0105942c: 0x105942c: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x01059420: 0x1059420: cibyl_sysc 0x206e
+// 0x01059430: 0x1059430: cibyl_sysc 0x206e
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01059424: 0x1059424: addu  a1, v0, zero
+// 0x01059434: 0x1059434: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01059428: 0x1059428: lui   a0, 0x0
+// 0x01059438: 0x1059438: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105942c: 0x105942c: jal   0x100e610 addiu a0, a0, 14196
+// 0x0105943c: 0x105943c: jal   0x100e620 addiu a0, a0, 14196
 	ldloc.1
 	ldc.i4 14196
 	add
@@ -3881,12 +3881,12 @@ L_105941c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059434: 0x1059434: jal   0x100ea50 addu  a0, zero, zero
+// 0x01059444: 0x1059444: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3894,15 +3894,15 @@ L_105941c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105943c:
-// 0x0105943c: 0x105943c: lw    ra, 20(sp)
-// 0x01059440: 0x1059440: sll   zero, zero, 0
-// 0x01059444: 0x1059444: jr    ra addiu sp, sp, 24
+L_105944c:
+// 0x0105944c: 0x105944c: lw    ra, 20(sp)
+// 0x01059450: 0x1059450: sll   zero, zero, 0
+// 0x01059454: 0x1059454: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3914,7 +3914,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3949,28 +3949,28 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105944c: 0x105944c: lui   v0, 0x70000
+// 0x0105945c: 0x105945c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059450: 0x1059450: lw    v0, 9160(v0)
+// 0x01059460: 0x1059460: lw    v0, 9624(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059454: 0x1059454: addiu sp, sp, -24
+// 0x01059464: 0x1059464: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01059458: 0x1059458: beq   v0, zero, 0x10594b4 sw    ra, 20(sp)
+// 0x01059468: 0x1059468: beq   v0, zero, 0x10594c4 sw    ra, 20(sp)
 	ldloc 5
-	brfalse L_10594b4
+	brfalse L_10594c4
 // --- basic block ---
-// 0x01059460: 0x1059460: jal   0x101ae54 addiu a0, zero, 68
+// 0x01059470: 0x1059470: jal   0x101ae64 addiu a0, zero, 68
 	ldc.i4.s 68
 	stloc.1
 	ldloc.0
@@ -3978,12 +3978,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059468: 0x1059468: jal   0x101ae54 addiu a0, zero, 83
+// 0x01059478: 0x1059478: jal   0x101ae64 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -3991,12 +3991,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059470: 0x1059470: jal   0x101ae54 addiu a0, zero, 64
+// 0x01059480: 0x1059480: jal   0x101ae64 addiu a0, zero, 64
 	ldc.i4.s 64
 	stloc.1
 	ldloc.0
@@ -4004,12 +4004,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059478: 0x1059478: jal   0x101ae54 addiu a0, zero, 84
+// 0x01059488: 0x1059488: jal   0x101ae64 addiu a0, zero, 84
 	ldc.i4.s 84
 	stloc.1
 	ldloc.0
@@ -4017,26 +4017,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059480: 0x1059480: jal   0x1057080 sll   zero, zero, 0
+// 0x01059490: 0x1059490: jal   0x1057090 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_main_suspend_navigation_1057080(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_main_suspend_navigation_1057090(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059488: 0x1059488: lui   a0, 0x10000
+// 0x01059498: 0x1059498: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105948c: 0x105948c: jal   0x101f044 addiu a0, a0, -29748
+// 0x0105949c: 0x105949c: jal   0x101f054 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -4046,20 +4046,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059494: 0x1059494: lui   a0, 0x0
+// 0x010594a4: 0x10594a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01059498: 0x1059498: addiu a0, a0, 14180
+// 0x010594a8: 0x10594a8: addiu a0, a0, 14180
 	ldloc.1
 	ldc.i4 14180
 	add
 	stloc.1
-// 0x0105949c: 0x105949c: jal   0x100e610 addu  a1, zero, zero
+// 0x010594ac: 0x10594ac: jal   0x100e620 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4067,12 +4067,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010594a4: 0x10594a4: jal   0x100ea50 addu  a0, zero, zero
+// 0x010594b4: 0x10594b4: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4080,26 +4080,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010594ac: 0x10594ac: jal   0x1021900 sll   zero, zero, 0
+// 0x010594bc: 0x10594bc: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10594b4:
-// 0x010594b4: 0x10594b4: lw    ra, 20(sp)
-// 0x010594b8: 0x10594b8: sll   zero, zero, 0
-// 0x010594bc: 0x10594bc: jr    ra addiu sp, sp, 24
+L_10594c4:
+// 0x010594c4: 0x10594c4: lw    ra, 20(sp)
+// 0x010594c8: 0x10594c8: sll   zero, zero, 0
+// 0x010594cc: 0x10594cc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4111,7 +4111,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_update_10594c4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_update_10594d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s4,int32 s0,int32 s2,int32 s1,int32 s5,int32 lo,int32 s3,int32 s6,int32 s7,int32 t0,int32 s8,int32 ra)
@@ -4179,25 +4179,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10594c4:
-// 0x010594c4: 0x10594c4: lui   v0, 0x70000
+L_10594d4:
+// 0x010594d4: 0x10594d4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010594c8: 0x10594c8: lw    v0, 9160(v0)
+// 0x010594d8: 0x10594d8: lw    v0, 9624(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x010594cc: 0x10594cc: addiu sp, sp, -256
+// 0x010594dc: 0x10594dc: addiu sp, sp, -256
 	ldloc.0
 	ldc.i4 -256
 	add
 	stloc.0
-// 0x010594d0: 0x10594d0: sw    s7, 244(sp)
+// 0x010594e0: 0x10594e0: sw    s7, 244(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4206,8 +4206,8 @@ L_10594c4:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010594d4: 0x10594d4: sw    ra, 252(sp)
-// 0x010594d8: 0x10594d8: sw    s8, 248(sp)
+// 0x010594e4: 0x10594e4: sw    ra, 252(sp)
+// 0x010594e8: 0x10594e8: sw    s8, 248(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ L_10594c4:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010594dc: 0x10594dc: sw    s6, 240(sp)
+// 0x010594ec: 0x10594ec: sw    s6, 240(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4225,7 +4225,7 @@ L_10594c4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010594e0: 0x10594e0: sw    s5, 236(sp)
+// 0x010594f0: 0x10594f0: sw    s5, 236(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4234,7 +4234,7 @@ L_10594c4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010594e4: 0x10594e4: sw    s4, 232(sp)
+// 0x010594f4: 0x10594f4: sw    s4, 232(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4243,7 +4243,7 @@ L_10594c4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010594e8: 0x10594e8: sw    s3, 228(sp)
+// 0x010594f8: 0x10594f8: sw    s3, 228(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4252,7 +4252,7 @@ L_10594c4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010594ec: 0x10594ec: sw    s2, 224(sp)
+// 0x010594fc: 0x10594fc: sw    s2, 224(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4261,7 +4261,7 @@ L_10594c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010594f0: 0x10594f0: sw    s1, 220(sp)
+// 0x01059500: 0x1059500: sw    s1, 220(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4270,7 +4270,7 @@ L_10594c4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010594f4: 0x10594f4: sw    s0, 216(sp)
+// 0x01059504: 0x1059504: sw    s0, 216(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4279,170 +4279,170 @@ L_10594c4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010594f8: 0x10594f8: beq   v0, zero, 0x1059f3c addu  s7, a1, zero
+// 0x01059508: 0x1059508: beq   v0, zero, 0x1059f4c addu  s7, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 16
-	brfalse L_1059f3c
+	brfalse L_1059f4c
 // --- basic block ---
-// 0x01059500: 0x1059500: lui   v1, 0x70000
+// 0x01059510: 0x1059510: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059504: 0x1059504: lw    s4, 9168(v1)
+// 0x01059514: 0x1059514: lw    s4, 9632(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 8
-// 0x01059508: 0x1059508: lui   v0, 0x70000
+// 0x01059518: 0x1059518: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105950c: 0x105950c: lui   v1, 0x70000
+// 0x0105951c: 0x105951c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059510: 0x1059510: lw    v0, 9172(v0)
+// 0x01059520: 0x1059520: lw    v0, 9636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059514: 0x1059514: lui   a1, 0x70000
+// 0x01059524: 0x1059524: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01059518: 0x1059518: lw    v1, 9164(v1)
+// 0x01059528: 0x1059528: lw    v1, 9628(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105951c: 0x105951c: lw    s0, 9176(a1)
+// 0x0105952c: 0x105952c: lw    s0, 9640(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 9
-// 0x01059520: 0x1059520: addu  s4, v0, s4
+// 0x01059530: 0x1059530: addu  s4, v0, s4
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x01059524: 0x1059524: slt   a1, v1, v0
+// 0x01059534: 0x1059534: slt   a1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc.2
-// 0x01059528: 0x1059528: beq   a1, zero, 0x105954c subu  s4, s4, s0
+// 0x01059538: 0x1059538: beq   a1, zero, 0x105955c subu  s4, s4, s0
 	ldloc.2
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 8
-	brfalse L_105954c
+	brfalse L_105955c
 // --- basic block ---
-// 0x01059530: 0x1059530: addiu s0, zero, 56
+// 0x01059540: 0x1059540: addiu s0, zero, 56
 	ldc.i4.s 56
 	stloc 9
-// 0x01059534: 0x1059534: mult  v1, s0
+// 0x01059544: 0x1059544: mult  v1, s0
 	ldloc 6
 	ldloc 9
 	mul
 	stloc 13
-// 0x01059538: 0x1059538: lui   v0, 0x70000
+// 0x01059548: 0x1059548: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105953c: 0x105953c: lw    s0, 10724(v0)
+// 0x0105954c: 0x105954c: lw    s0, 11188(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 9
-// 0x01059540: 0x1059540: mflo  lo
+// 0x01059550: 0x1059550: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x01059544: 0x1059544: j	 0x105956c addu  s0, s0, v1
+// 0x01059554: 0x1059554: j	 0x105957c addu  s0, s0, v1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-	br L_105956c
+	br L_105957c
 // --- basic block ---
-L_105954c:
-// 0x0105954c: 0x105954c: addu  s0, s0, v1
+L_105955c:
+// 0x0105955c: 0x105955c: addu  s0, s0, v1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01059550: 0x1059550: subu  v0, s0, v0
+// 0x01059560: 0x1059560: subu  v0, s0, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 5
-// 0x01059554: 0x1059554: addiu a1, zero, 56
+// 0x01059564: 0x1059564: addiu a1, zero, 56
 	ldc.i4.s 56
 	stloc.2
-// 0x01059558: 0x1059558: mult  v0, a1
+// 0x01059568: 0x1059568: mult  v0, a1
 	ldloc 5
 	ldloc.2
 	mul
 	stloc 13
-// 0x0105955c: 0x105955c: lui   v1, 0x70000
+// 0x0105956c: 0x105956c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059560: 0x1059560: lw    s0, 10720(v1)
+// 0x01059570: 0x1059570: lw    s0, 11184(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 9
-// 0x01059564: 0x1059564: mflo  lo
+// 0x01059574: 0x1059574: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x01059568: 0x1059568: addu  s0, s0, v0
+// 0x01059578: 0x1059578: addu  s0, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-L_105956c:
-// 0x0105956c: 0x105956c: lb    v0, 55(s0)
+L_105957c:
+// 0x0105957c: 0x105957c: lb    v0, 55(s0)
 	ldloc 9
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01059570: 0x1059570: lh    s6, 44(s0)
+// 0x01059580: 0x1059580: lh    s6, 44(s0)
 	ldloc 9
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 15
-// 0x01059574: 0x1059574: bne   v0, zero, 0x10595bc addiu v0, zero, 1
+// 0x01059584: 0x1059584: bne   v0, zero, 0x10595cc addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_10595bc
+	brtrue L_10595cc
 // --- basic block ---
-// 0x0105957c: 0x105957c: lui   v0, 0x0
+// 0x0105958c: 0x105958c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01059580: 0x1059580: lw    v0, 576(v0)
+// 0x01059590: 0x1059590: lw    v0, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4451,7 +4451,7 @@ L_105956c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059584: 0x1059584: lw    a0, 24(s0)
+// 0x01059594: 0x1059594: lw    a0, 24(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -4460,36 +4460,36 @@ L_105956c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01059588: 0x1059588: sll   zero, zero, 0
-// 0x0105958c: 0x105958c: beq   a0, v0, 0x10595a4 sll   zero, zero, 0
+// 0x01059598: 0x1059598: sll   zero, zero, 0
+// 0x0105959c: 0x105959c: beq   a0, v0, 0x10595b4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10595a4
+	beq  L_10595b4
 // --- basic block ---
-// 0x01059594: 0x1059594: bltz  a0, 0x10595a4 sll   zero, zero, 0
+// 0x010595a4: 0x10595a4: bltz  a0, 0x10595b4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10595a4
+	blt L_10595b4
 // --- basic block ---
-// 0x0105959c: 0x105959c: jal   0x100b164 sll   zero, zero, 0
+// 0x010595ac: 0x10595ac: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10595a4:
-// 0x010595a4: 0x10595a4: lh    a0, 36(s0)
+L_10595b4:
+// 0x010595b4: 0x10595b4: lh    a0, 36(s0)
 	ldloc 9
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x010595a8: 0x10595a8: jal   0x100405c sll   zero, zero, 0
+// 0x010595b8: 0x10595b8: jal   0x100405c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4500,287 +4500,287 @@ L_10595a4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010595b0: 0x10595b0: lui   v1, 0x70000
+// 0x010595c0: 0x10595c0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010595b4: 0x10595b4: j	 0x10595ec sw    v0, 10692(v1)
+// 0x010595c4: 0x10595c4: j	 0x10595fc sw    v0, 11156(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldloc 5
 	stelem.i4
-	br L_10595ec
+	br L_10595fc
 // --- basic block ---
-L_10595bc:
-// 0x010595bc: 0x10595bc: lb    v1, 50(s0)
+L_10595cc:
+// 0x010595cc: 0x10595cc: lb    v1, 50(s0)
 	ldloc 9
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010595c0: 0x10595c0: sll   zero, zero, 0
-// 0x010595c4: 0x10595c4: bne   v1, v0, 0x10595d8 lui   s1, 0x70000
+// 0x010595d0: 0x10595d0: sll   zero, zero, 0
+// 0x010595d4: 0x10595d4: bne   v1, v0, 0x10595e8 lui   s1, 0x70000
 	ldloc 6
 	ldloc 5
 	ldc.i4 458752
 	stloc 11
-	bne.un L_10595d8
+	bne.un L_10595e8
 // --- basic block ---
-// 0x010595cc: 0x10595cc: addu  a1, s0, zero
+// 0x010595dc: 0x10595dc: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010595d0: 0x10595d0: j	 0x10595e0 addiu a2, zero, 1
+// 0x010595e0: 0x10595e0: j	 0x10595f0 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-	br L_10595e0
+	br L_10595f0
 // --- basic block ---
-L_10595d8:
-// 0x010595d8: 0x10595d8: addu  a1, s0, zero
+L_10595e8:
+// 0x010595e8: 0x10595e8: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x010595dc: 0x10595dc: addu  a2, zero, zero
+// 0x010595ec: 0x10595ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_10595e0:
-// 0x010595e0: 0x10595e0: jal   0x105d454 sll   zero, zero, 0
+L_10595f0:
+// 0x010595f0: 0x10595f0: jal   0x105d464 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_length_105d454(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_length_105d464(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010595e8: 0x10595e8: sw    v0, 10692(s1)
+// 0x010595f8: 0x10595f8: sw    v0, 11156(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldloc 5
 	stelem.i4
-L_10595ec:
-// 0x010595ec: 0x10595ec: lui   v1, 0x70000
+L_10595fc:
+// 0x010595fc: 0x10595fc: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010595f0: 0x10595f0: lui   v0, 0x70000
+// 0x01059600: 0x1059600: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010595f4: 0x10595f4: lw    v0, 9164(v0)
+// 0x01059604: 0x1059604: lw    v0, 9628(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 5
-// 0x010595f8: 0x10595f8: lw    a2, 9176(v1)
+// 0x01059608: 0x1059608: lw    a2, 9640(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.3
-// 0x010595fc: 0x10595fc: lui   v1, 0x70000
+// 0x0105960c: 0x105960c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059600: 0x1059600: addu  a2, v0, a2
+// 0x01059610: 0x1059610: addu  a2, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc.3
-// 0x01059604: 0x1059604: lw    s2, 9172(v1)
+// 0x01059614: 0x1059614: lw    s2, 9636(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 10
-// 0x01059608: 0x1059608: addiu a2, a2, -1
+// 0x01059618: 0x1059618: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x0105960c: 0x105960c: addiu v1, zero, 56
+// 0x0105961c: 0x105961c: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 6
-// 0x01059610: 0x1059610: subu  a2, a2, s2
+// 0x01059620: 0x1059620: subu  a2, a2, s2
 	ldloc.3
 	ldloc 10
 	sub
 	stloc.3
-// 0x01059614: 0x1059614: mult  a2, v1
+// 0x01059624: 0x1059624: mult  a2, v1
 	ldloc.3
 	ldloc 6
 	mul
 	stloc 13
-// 0x01059618: 0x1059618: addiu v0, v0, -1
+// 0x01059628: 0x1059628: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0105961c: 0x105961c: lui   a0, 0x70000
+// 0x0105962c: 0x105962c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01059620: 0x1059620: lui   a1, 0x70000
+// 0x01059630: 0x1059630: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01059624: 0x1059624: lui   a3, 0x70000
+// 0x01059634: 0x1059634: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01059628: 0x1059628: lw    a0, 10692(a0)
+// 0x01059638: 0x1059638: lw    a0, 11156(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105962c: 0x105962c: lw    a1, 10724(a1)
+// 0x0105963c: 0x105963c: lw    a1, 11188(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.2
-// 0x01059630: 0x1059630: lw    a3, 10720(a3)
+// 0x01059640: 0x1059640: lw    a3, 11184(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 4
-// 0x01059634: 0x1059634: lh    s5, 46(s0)
+// 0x01059644: 0x1059644: lh    s5, 46(s0)
 	ldloc 9
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 12
-// 0x01059638: 0x1059638: sll   zero, zero, 0
-// 0x0105963c: 0x105963c: subu  s3, s5, a0
+// 0x01059648: 0x1059648: sll   zero, zero, 0
+// 0x0105964c: 0x105964c: subu  s3, s5, a0
 	ldloc 12
 	ldloc.1
 	sub
 	stloc 14
-// 0x01059640: 0x1059640: mflo  lo
+// 0x01059650: 0x1059650: mflo  lo
 	ldloc 13
 	stloc.3
-// 0x01059644: 0x1059644: addu  a2, a3, a2
+// 0x01059654: 0x1059654: addu  a2, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x01059648: 0x1059648: sll   zero, zero, 0
-// 0x0105964c: 0x105964c: mult  v0, v1
+// 0x01059658: 0x1059658: sll   zero, zero, 0
+// 0x0105965c: 0x105965c: mult  v0, v1
 	ldloc 5
 	ldloc 6
 	mul
 	stloc 13
-// 0x01059650: 0x1059650: mflo  lo
+// 0x01059660: 0x1059660: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x01059654: 0x1059654: j	 0x1059688 addu  a1, a1, v1
+// 0x01059664: 0x1059664: j	 0x1059698 addu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc.2
-	br L_1059688
+	br L_1059698
 // --- basic block ---
-L_105965c:
-// 0x0105965c: 0x105965c: slt   a3, v0, s2
+L_105966c:
+// 0x0105966c: 0x105966c: slt   a3, v0, s2
 	ldloc 5
 	ldloc 10
 	clt
 	stloc 4
-// 0x01059660: 0x1059660: beq   a3, zero, 0x105966c addu  v1, a2, zero
+// 0x01059670: 0x1059670: beq   a3, zero, 0x105967c addu  v1, a2, zero
 	ldloc 4
 	ldloc.3
 	stloc 6
-	brfalse L_105966c
+	brfalse L_105967c
 // --- basic block ---
-// 0x01059668: 0x1059668: addu  v1, a1, zero
+// 0x01059678: 0x1059678: addu  v1, a1, zero
 	ldloc.2
 	stloc 6
-L_105966c:
-// 0x0105966c: 0x105966c: lh    a3, 44(v1)
+L_105967c:
+// 0x0105967c: 0x105967c: lh    a3, 44(v1)
 	ldloc 6
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x01059670: 0x1059670: addiu a1, a1, -56
+// 0x01059680: 0x1059680: addiu a1, a1, -56
 	ldloc.2
 	ldc.i4.s -56
 	add
 	stloc.2
-// 0x01059674: 0x1059674: bne   a3, s6, 0x1059690 addiu a2, a2, -56
+// 0x01059684: 0x1059684: bne   a3, s6, 0x10596a0 addiu a2, a2, -56
 	ldloc 4
 	ldloc 15
 	ldloc.3
 	ldc.i4.s -56
 	add
 	stloc.3
-	bne.un L_1059690
+	bne.un L_10596a0
 // --- basic block ---
-// 0x0105967c: 0x105967c: lh    v1, 46(v1)
+// 0x0105968c: 0x105968c: lh    v1, 46(v1)
 	ldloc 6
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x01059680: 0x1059680: addiu v0, v0, -1
+// 0x01059690: 0x1059690: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01059684: 0x1059684: addu  s3, s3, v1
+// 0x01059694: 0x1059694: addu  s3, s3, v1
 	ldloc 14
 	ldloc 6
 	add
 	stloc 14
-L_1059688:
-// 0x01059688: 0x1059688: bgez  v0, 0x105965c sll   zero, zero, 0
+L_1059698:
+// 0x01059698: 0x1059698: bgez  v0, 0x105966c sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_105965c
+	bge L_105966c
 // --- basic block ---
-L_1059690:
-// 0x01059690: 0x1059690: jal   0x10c09c0 addu  s1, zero, zero
+L_10596a0:
+// 0x010596a0: 0x10596a0: jal   0x10c1000 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059698: 0x1059698: lh    a0, 48(s0)
+// 0x010596a8: 0x10596a8: lh    a0, 48(s0)
 	ldloc 9
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105969c: 0x105969c: addu  a2, v0, zero
+// 0x010596ac: 0x10596ac: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010596a0: 0x10596a0: sw    a2, 208(sp)
+// 0x010596b0: 0x10596b0: sw    a2, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4789,7 +4789,7 @@ L_1059690:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010596a4: 0x10596a4: jal   0x10c09c0 sw    v1, 212(sp)
+// 0x010596b4: 0x10596b4: jal   0x10c1000 sw    v1, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4800,12 +4800,12 @@ L_1059690:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010596ac: 0x10596ac: lw    a2, 208(sp)
+// 0x010596bc: 0x10596bc: lw    a2, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4814,7 +4814,7 @@ L_1059690:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010596b0: 0x10596b0: lw    a3, 212(sp)
+// 0x010596c0: 0x10596c0: lw    a3, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4823,16 +4823,16 @@ L_1059690:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010596b4: 0x10596b4: addu  a0, a2, zero
+// 0x010596c4: 0x10596c4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010596b8: 0x10596b8: addu  a1, a3, zero
+// 0x010596c8: 0x10596c8: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010596bc: 0x10596bc: addu  a2, v0, zero
+// 0x010596cc: 0x10596cc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010596c0: 0x10596c0: jal   0x10c0798 addu  a3, v1, zero
+// 0x010596d0: 0x10596d0: jal   0x10c0dd8 addu  a3, v1, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -4840,20 +4840,20 @@ L_1059690:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010596c8: 0x10596c8: addu  a2, v0, zero
+// 0x010596d8: 0x10596d8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010596cc: 0x10596cc: addiu a0, s5, 1
+// 0x010596dc: 0x10596dc: addiu a0, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc.1
-// 0x010596d0: 0x10596d0: sw    a2, 208(sp)
+// 0x010596e0: 0x10596e0: sw    a2, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ L_1059690:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010596d4: 0x10596d4: jal   0x10c09c0 sw    v1, 212(sp)
+// 0x010596e4: 0x10596e4: jal   0x10c1000 sw    v1, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4873,12 +4873,12 @@ L_1059690:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010596dc: 0x10596dc: lw    a2, 208(sp)
+// 0x010596ec: 0x10596ec: lw    a2, 208(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4887,7 +4887,7 @@ L_1059690:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010596e0: 0x10596e0: lw    a3, 212(sp)
+// 0x010596f0: 0x10596f0: lw    a3, 212(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4896,16 +4896,16 @@ L_1059690:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010596e4: 0x10596e4: addu  a0, a2, zero
+// 0x010596f4: 0x10596f4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x010596e8: 0x10596e8: addu  a1, a3, zero
+// 0x010596f8: 0x10596f8: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010596ec: 0x10596ec: addu  a2, v0, zero
+// 0x010596fc: 0x10596fc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x010596f0: 0x10596f0: jal   0x10c07f0 addu  a3, v1, zero
+// 0x01059700: 0x1059700: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 6
 	stloc 4
 	ldloc.0
@@ -4913,324 +4913,324 @@ L_1059690:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010596f8: 0x10596f8: addu  a1, v1, zero
+// 0x01059708: 0x1059708: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x010596fc: 0x10596fc: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0105970c: 0x105970c: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059704: 0x1059704: lui   v1, 0x70000
+// 0x01059714: 0x1059714: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059708: 0x1059708: lw    s5, 9164(v1)
+// 0x01059718: 0x1059718: lw    s5, 9628(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105970c: 0x105970c: lui   v1, 0x70000
+// 0x0105971c: 0x105971c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059710: 0x1059710: lw    a2, 9176(v1)
+// 0x01059720: 0x1059720: lw    a2, 9640(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.3
-// 0x01059714: 0x1059714: addiu a0, zero, 56
+// 0x01059724: 0x1059724: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.1
-// 0x01059718: 0x1059718: addu  a2, s5, a2
+// 0x01059728: 0x1059728: addu  a2, s5, a2
 	ldloc 12
 	ldloc.3
 	add
 	stloc.3
-// 0x0105971c: 0x105971c: addiu a2, a2, 1
+// 0x0105972c: 0x105972c: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01059720: 0x1059720: subu  a2, a2, s2
+// 0x01059730: 0x1059730: subu  a2, a2, s2
 	ldloc.3
 	ldloc 10
 	sub
 	stloc.3
-// 0x01059724: 0x1059724: mult  a2, a0
+// 0x01059734: 0x1059734: mult  a2, a0
 	ldloc.3
 	ldloc.1
 	mul
 	stloc 13
-// 0x01059728: 0x1059728: addiu s5, s5, 1
+// 0x01059738: 0x1059738: addiu s5, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x0105972c: 0x105972c: lui   v1, 0x70000
+// 0x0105973c: 0x105973c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059730: 0x1059730: lui   a1, 0x70000
+// 0x01059740: 0x1059740: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01059734: 0x1059734: lui   a3, 0x70000
+// 0x01059744: 0x1059744: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01059738: 0x1059738: lui   t0, 0x70000
+// 0x01059748: 0x1059748: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 17
-// 0x0105973c: 0x105973c: lw    v1, 10692(v1)
+// 0x0105974c: 0x105974c: lw    v1, 11156(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldelem.i4
 	stloc 6
-// 0x01059740: 0x1059740: lw    a1, 10724(a1)
+// 0x01059750: 0x1059750: lw    a1, 11188(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.2
-// 0x01059744: 0x1059744: lw    a3, 10720(a3)
+// 0x01059754: 0x1059754: lw    a3, 11184(a3)
 	ldloc 7
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 4
-// 0x01059748: 0x1059748: sw    v0, 10696(t0)
+// 0x01059758: 0x1059758: sw    v0, 11160(t0)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105974c: 0x105974c: lui   t0, 0x70000
+// 0x0105975c: 0x105975c: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 17
-// 0x01059750: 0x1059750: sw    v1, 10688(t0)
+// 0x01059760: 0x1059760: sw    v1, 11152(t0)
 	ldloc 7
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldloc 6
 	stelem.i4
-// 0x01059754: 0x1059754: mflo  lo
+// 0x01059764: 0x1059764: mflo  lo
 	ldloc 13
 	stloc.3
-// 0x01059758: 0x1059758: addu  a2, a3, a2
+// 0x01059768: 0x1059768: addu  a2, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x0105975c: 0x105975c: sll   zero, zero, 0
-// 0x01059760: 0x1059760: mult  s5, a0
+// 0x0105976c: 0x105976c: sll   zero, zero, 0
+// 0x01059770: 0x1059770: mult  s5, a0
 	ldloc 12
 	ldloc.1
 	mul
 	stloc 13
-// 0x01059764: 0x1059764: mflo  lo
+// 0x01059774: 0x1059774: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x01059768: 0x1059768: j	 0x10597a4 addu  a1, a1, a0
+// 0x01059778: 0x1059778: j	 0x10597b4 addu  a1, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.2
-	br L_10597a4
+	br L_10597b4
 // --- basic block ---
-L_1059770:
-// 0x01059770: 0x1059770: beq   a0, zero, 0x105977c addu  s1, a2, zero
+L_1059780:
+// 0x01059780: 0x1059780: beq   a0, zero, 0x105978c addu  s1, a2, zero
 	ldloc.1
 	ldloc.3
 	stloc 11
-	brfalse L_105977c
+	brfalse L_105978c
 // --- basic block ---
-// 0x01059778: 0x1059778: addu  s1, a1, zero
+// 0x01059788: 0x1059788: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-L_105977c:
-// 0x0105977c: 0x105977c: lh    a0, 44(s1)
+L_105978c:
+// 0x0105978c: 0x105978c: lh    a0, 44(s1)
 	ldloc 11
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01059780: 0x1059780: addiu a1, a1, 56
+// 0x01059790: 0x1059790: addiu a1, a1, 56
 	ldloc.2
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x01059784: 0x1059784: bne   a0, s6, 0x10597b0 addiu a2, a2, 56
+// 0x01059794: 0x1059794: bne   a0, s6, 0x10597c0 addiu a2, a2, 56
 	ldloc.1
 	ldloc 15
 	ldloc.3
 	ldc.i4.s 56
 	add
 	stloc.3
-	bne.un L_10597b0
+	bne.un L_10597c0
 // --- basic block ---
-// 0x0105978c: 0x105978c: lh    a3, 46(s1)
+// 0x0105979c: 0x105979c: lh    a3, 46(s1)
 	ldloc 11
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x01059790: 0x1059790: lh    a0, 48(s1)
+// 0x010597a0: 0x10597a0: lh    a0, 48(s1)
 	ldloc 11
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01059794: 0x1059794: addu  v1, v1, a3
+// 0x010597a4: 0x10597a4: addu  v1, v1, a3
 	ldloc 6
 	ldloc 4
 	add
 	stloc 6
-// 0x01059798: 0x1059798: addu  v0, v0, a0
+// 0x010597a8: 0x10597a8: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x0105979c: 0x105979c: addiu s5, s5, 1
+// 0x010597ac: 0x10597ac: addiu s5, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010597a0: 0x10597a0: addu  s0, s1, zero
+// 0x010597b0: 0x10597b0: addu  s0, s1, zero
 	ldloc 11
 	stloc 9
-L_10597a4:
-// 0x010597a4: 0x10597a4: slt   a0, s5, s4
+L_10597b4:
+// 0x010597b4: 0x10597b4: slt   a0, s5, s4
 	ldloc 12
 	ldloc 8
 	clt
 	stloc.1
-// 0x010597a8: 0x10597a8: bne   a0, zero, 0x1059770 slt   a0, s5, s2
+// 0x010597b8: 0x10597b8: bne   a0, zero, 0x1059780 slt   a0, s5, s2
 	ldloc.1
 	ldloc 12
 	ldloc 10
 	clt
 	stloc.1
-	brtrue L_1059770
+	brtrue L_1059780
 // --- basic block ---
-L_10597b0:
-// 0x010597b0: 0x10597b0: lui   a0, 0x70000
+L_10597c0:
+// 0x010597c0: 0x10597c0: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010597b4: 0x10597b4: sw    v1, 10688(a0)
+// 0x010597c4: 0x10597c4: sw    v1, 11152(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldloc 6
 	stelem.i4
-// 0x010597b8: 0x10597b8: lui   v1, 0x70000
+// 0x010597c8: 0x10597c8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010597bc: 0x10597bc: sw    v0, 10696(v1)
+// 0x010597cc: 0x10597cc: sw    v0, 11160(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldloc 5
 	stelem.i4
-// 0x010597c0: 0x10597c0: lui   v0, 0x70000
+// 0x010597d0: 0x10597d0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010597c4: 0x10597c4: lw    a0, 10708(v0)
+// 0x010597d4: 0x10597d4: lw    a0, 11172(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2677
+	ldc.i4 2793
 	add
 	ldelem.i4
 	stloc.1
-// 0x010597c8: 0x10597c8: addu  v1, zero, zero
+// 0x010597d8: 0x10597d8: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010597cc: 0x10597cc: addiu a0, a0, 60
+// 0x010597dc: 0x10597dc: addiu a0, a0, 60
 	ldloc.1
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x010597d0: 0x10597d0: cibyl_sysc_arg 0x3
+// 0x010597e0: 0x10597e0: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x010597d4: 0x10597d4: cibyl_sysc 0x2073
+// 0x010597e4: 0x10597e4: cibyl_sysc 0x2073
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x010597d8: 0x10597d8: addu  v1, v0, zero
+// 0x010597e8: 0x10597e8: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010597dc: 0x10597dc: slt   v1, v1, a0
+// 0x010597ec: 0x10597ec: slt   v1, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc 6
-// 0x010597e0: 0x10597e0: bne   v1, zero, 0x1059808 slt   v0, s5, s4
+// 0x010597f0: 0x10597f0: bne   v1, zero, 0x1059818 slt   v0, s5, s4
 	ldloc 6
 	ldloc 12
 	ldloc 8
 	clt
 	stloc 5
-	brtrue L_1059808
+	brtrue L_1059818
 // --- basic block ---
-// 0x010597e8: 0x10597e8: lui   v0, 0x70000
+// 0x010597f8: 0x10597f8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010597ec: 0x10597ec: lw    v0, 9188(v0)
+// 0x010597fc: 0x10597fc: lw    v0, 9652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldelem.i4
 	stloc 5
-// 0x010597f0: 0x10597f0: sll   zero, zero, 0
-// 0x010597f4: 0x10597f4: bne   v0, zero, 0x1059808 slt   v0, s5, s4
+// 0x01059800: 0x1059800: sll   zero, zero, 0
+// 0x01059804: 0x1059804: bne   v0, zero, 0x1059818 slt   v0, s5, s4
 	ldloc 5
 	ldloc 12
 	ldloc 8
 	clt
 	stloc 5
-	brtrue L_1059808
+	brtrue L_1059818
 // --- basic block ---
-// 0x010597fc: 0x10597fc: jal   0x1056a18 addu  a0, zero, zero
+// 0x0105980c: 0x105980c: jal   0x1056a28 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5238,210 +5238,210 @@ L_10597b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::refresh_eta_1056a18(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::refresh_eta_1056a28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059804: 0x1059804: slt   v0, s5, s4
+// 0x01059814: 0x1059814: slt   v0, s5, s4
 	ldloc 12
 	ldloc 8
 	clt
 	stloc 5
-L_1059808:
-// 0x01059808: 0x1059808: beq   v0, zero, 0x10598a4 addu  s2, zero, zero
+L_1059818:
+// 0x01059818: 0x1059818: beq   v0, zero, 0x10598b4 addu  s2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_10598a4
+	brfalse L_10598b4
 // --- basic block ---
-// 0x01059810: 0x1059810: lui   v0, 0x70000
+// 0x01059820: 0x1059820: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059814: 0x1059814: lw    a1, 9176(v0)
+// 0x01059824: 0x1059824: lw    a1, 9640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.2
-// 0x01059818: 0x1059818: lui   v0, 0x70000
+// 0x01059828: 0x1059828: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105981c: 0x105981c: lw    v1, 9172(v0)
+// 0x0105982c: 0x105982c: lw    v1, 9636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 6
-// 0x01059820: 0x1059820: addiu a1, a1, 1
+// 0x01059830: 0x1059830: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01059824: 0x1059824: subu  a1, a1, v1
+// 0x01059834: 0x1059834: subu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-// 0x01059828: 0x1059828: addiu v0, zero, 56
+// 0x01059838: 0x1059838: addiu v0, zero, 56
 	ldc.i4.s 56
 	stloc 5
-// 0x0105982c: 0x105982c: addu  a1, a1, s5
+// 0x0105983c: 0x105983c: addu  a1, a1, s5
 	ldloc.2
 	ldloc 12
 	add
 	stloc.2
-// 0x01059830: 0x1059830: mult  a1, v0
+// 0x01059840: 0x1059840: mult  a1, v0
 	ldloc.2
 	ldloc 5
 	mul
 	stloc 13
-// 0x01059834: 0x1059834: addiu a3, s5, 1
+// 0x01059844: 0x1059844: addiu a3, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01059838: 0x1059838: lui   a0, 0x70000
+// 0x01059848: 0x1059848: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105983c: 0x105983c: lui   a2, 0x70000
+// 0x0105984c: 0x105984c: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01059840: 0x1059840: lw    a0, 10724(a0)
+// 0x01059850: 0x1059850: lw    a0, 11188(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.1
-// 0x01059844: 0x1059844: lw    a2, 10720(a2)
+// 0x01059854: 0x1059854: lw    a2, 11184(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.3
-// 0x01059848: 0x1059848: lh    s2, 46(s1)
+// 0x01059858: 0x1059858: lh    s2, 46(s1)
 	ldloc 11
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 10
-// 0x0105984c: 0x105984c: lh    t0, 44(s1)
+// 0x0105985c: 0x105985c: lh    t0, 44(s1)
 	ldloc 11
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 17
-// 0x01059850: 0x1059850: mflo  lo
+// 0x01059860: 0x1059860: mflo  lo
 	ldloc 13
 	stloc.2
-// 0x01059854: 0x1059854: addu  a1, a2, a1
+// 0x01059864: 0x1059864: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x01059858: 0x1059858: sll   zero, zero, 0
-// 0x0105985c: 0x105985c: mult  a3, v0
+// 0x01059868: 0x1059868: sll   zero, zero, 0
+// 0x0105986c: 0x105986c: mult  a3, v0
 	ldloc 4
 	ldloc 5
 	mul
 	stloc 13
-// 0x01059860: 0x1059860: mflo  lo
+// 0x01059870: 0x1059870: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x01059864: 0x1059864: j	 0x1059894 addu  a0, a0, v0
+// 0x01059874: 0x1059874: j	 0x10598a4 addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-	br L_1059894
+	br L_10598a4
 // --- basic block ---
-L_105986c:
-// 0x0105986c: 0x105986c: beq   a2, zero, 0x1059878 addu  v0, a1, zero
+L_105987c:
+// 0x0105987c: 0x105987c: beq   a2, zero, 0x1059888 addu  v0, a1, zero
 	ldloc.3
 	ldloc.2
 	stloc 5
-	brfalse L_1059878
+	brfalse L_1059888
 // --- basic block ---
-// 0x01059874: 0x1059874: addu  v0, a0, zero
+// 0x01059884: 0x1059884: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-L_1059878:
-// 0x01059878: 0x1059878: lh    a2, 44(v0)
+L_1059888:
+// 0x01059888: 0x1059888: lh    a2, 44(v0)
 	ldloc 5
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x0105987c: 0x105987c: addiu a0, a0, 56
+// 0x0105988c: 0x105988c: addiu a0, a0, 56
 	ldloc.1
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x01059880: 0x1059880: bne   a2, t0, 0x10598a4 addiu a1, a1, 56
+// 0x01059890: 0x1059890: bne   a2, t0, 0x10598b4 addiu a1, a1, 56
 	ldloc.3
 	ldloc 17
 	ldloc.2
 	ldc.i4.s 56
 	add
 	stloc.2
-	bne.un L_10598a4
+	bne.un L_10598b4
 // --- basic block ---
-// 0x01059888: 0x1059888: lh    v0, 46(v0)
+// 0x01059898: 0x1059898: lh    v0, 46(v0)
 	ldloc 5
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105988c: 0x105988c: sll   zero, zero, 0
-// 0x01059890: 0x1059890: addu  s2, s2, v0
+// 0x0105989c: 0x105989c: sll   zero, zero, 0
+// 0x010598a0: 0x10598a0: addu  s2, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-L_1059894:
-// 0x01059894: 0x1059894: addiu s5, s5, 1
+L_10598a4:
+// 0x010598a4: 0x10598a4: addiu s5, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x01059898: 0x1059898: slt   v0, s5, s4
+// 0x010598a8: 0x10598a8: slt   v0, s5, s4
 	ldloc 12
 	ldloc 8
 	clt
 	stloc 5
-// 0x0105989c: 0x105989c: bne   v0, zero, 0x105986c slt   a2, s5, v1
+// 0x010598ac: 0x10598ac: bne   v0, zero, 0x105987c slt   a2, s5, v1
 	ldloc 5
 	ldloc 12
 	ldloc 6
 	clt
 	stloc.3
-	brtrue L_105986c
+	brtrue L_105987c
 // --- basic block ---
-L_10598a4:
-// 0x010598a4: 0x10598a4: lui   a0, 0x0
+L_10598b4:
+// 0x010598b4: 0x10598b4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010598a8: 0x10598a8: lui   a1, 0x0
+// 0x010598b8: 0x10598b8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010598ac: 0x10598ac: addiu a0, a0, 14100
+// 0x010598bc: 0x10598bc: addiu a0, a0, 14100
 	ldloc.1
 	ldc.i4 14100
 	add
 	stloc.1
-// 0x010598b0: 0x10598b0: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010598c0: 0x10598c0: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5451,33 +5451,33 @@ L_10598a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010598b8: 0x10598b8: beq   v0, zero, 0x10598fc lui   v0, 0x70000
+// 0x010598c8: 0x10598c8: beq   v0, zero, 0x105990c lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10598fc
+	brfalse L_105990c
 // --- basic block ---
-// 0x010598c0: 0x10598c0: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x010598d0: 0x10598d0: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010598c8: 0x10598c8: beq   v0, zero, 0x10598f8 lui   a1, 0x10000
+// 0x010598d8: 0x10598d8: beq   v0, zero, 0x1059908 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_10598f8
+	brfalse L_1059908
 // --- basic block ---
-// 0x010598d0: 0x10598d0: addu  a0, v0, zero
+// 0x010598e0: 0x10598e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010598d4: 0x10598d4: jal   0x1001b14 addiu a1, a1, -31052
+// 0x010598e4: 0x10598e4: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -5487,22 +5487,22 @@ L_10598a4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010598dc: 0x10598dc: bne   v0, zero, 0x10598fc lui   v0, 0x70000
+// 0x010598ec: 0x10598ec: bne   v0, zero, 0x105990c lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_10598fc
+	brtrue L_105990c
 // --- basic block ---
-// 0x010598e4: 0x10598e4: lw    a0, 10688(v0)
+// 0x010598f4: 0x10598f4: lw    a0, 11152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc.1
-// 0x010598e8: 0x10598e8: lw    a3, 8(s7)
+// 0x010598f8: 0x10598f8: lw    a3, 8(s7)
 	ldloc 7
 	ldloc 16
 	ldc.i4.2
@@ -5511,362 +5511,362 @@ L_10598a4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010598ec: 0x10598ec: addu  a1, s3, zero
+// 0x010598fc: 0x10598fc: addu  a1, s3, zero
 	ldloc 14
 	stloc.2
-// 0x010598f0: 0x10598f0: jal   0x105fdf0 addu  a2, s2, zero
+// 0x01059900: 0x1059900: jal   0x105fe00 addu  a2, s2, zero
 	ldloc 10
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_zoom_update_105fdf0(int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_zoom_update_105fe00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10598f8:
-// 0x010598f8: 0x10598f8: lui   v0, 0x70000
+L_1059908:
+// 0x01059908: 0x1059908: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_10598fc:
-// 0x010598fc: 0x10598fc: lw    a0, 10688(v0)
+L_105990c:
+// 0x0105990c: 0x105990c: lw    a0, 11152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc.1
-// 0x01059900: 0x1059900: jal   0x105e2cc sll   zero, zero, 0
+// 0x01059910: 0x1059910: jal   0x105e2dc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_distance_105e2cc(int32)
+	call int32 Cibyl70::navigate_bar_set_distance_105e2dc(int32)
 	stloc 5
 // --- basic block ---
-// 0x01059908: 0x1059908: lbu   v0, 54(s0)
+// 0x01059918: 0x1059918: lbu   v0, 54(s0)
 	ldloc 9
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0105990c: 0x105990c: sll   zero, zero, 0
-// 0x01059910: 0x1059910: sltiu v1, v0, 16
+// 0x0105991c: 0x105991c: sll   zero, zero, 0
+// 0x01059920: 0x1059920: sltiu v1, v0, 16
 	ldloc 5
 	ldc.i4.s 16
 	clt.un
 	stloc 6
-// 0x01059914: 0x1059914: beq   v1, zero, 0x105994c lui   v1, 0x20000
+// 0x01059924: 0x1059924: beq   v1, zero, 0x105995c lui   v1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_105994c
+	brfalse L_105995c
 // --- basic block ---
-// 0x0105991c: 0x105991c: sll   v0, v0, 2
+// 0x0105992c: 0x105992c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01059920: 0x1059920: addiu v1, v1, 27896
+// 0x01059930: 0x1059930: addiu v1, v1, 28360
 	ldloc 6
-	ldc.i4 27896
+	ldc.i4 28360
 	add
 	stloc 6
-// 0x01059924: 0x1059924: addu  v0, v1, v0
+// 0x01059934: 0x1059934: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01059928: 0x1059928: lw    v0, 0(v0)
+// 0x01059938: 0x1059938: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105992c: 0x105992c: sll   zero, zero, 0
-// 0x01059930: 0x1059930: jr    v0 sll   zero, zero, 0
+// 0x0105993c: 0x105993c: sll   zero, zero, 0
+// 0x01059940: 0x1059940: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1059938:
-// 0x01059938: 0x1059938: lui   s2, 0x10000
+L_1059948:
+// 0x01059948: 0x1059948: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0105993c: 0x105993c: lui   s4, 0x10000
+// 0x0105994c: 0x105994c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01059940: 0x1059940: addiu s2, s2, 9576
+// 0x01059950: 0x1059950: addiu s2, s2, 9572
 	ldloc 10
-	ldc.i4 9576
+	ldc.i4 9572
 	add
 	stloc 10
-// 0x01059944: 0x1059944: j	 0x1059984 addiu s4, s4, 8640
+// 0x01059954: 0x1059954: j	 0x1059994 addiu s4, s4, 8636
 	ldloc 8
-	ldc.i4 8640
+	ldc.i4 8636
 	add
 	stloc 8
-	br L_1059984
+	br L_1059994
 // --- basic block ---
-L_105994c:
-// 0x0105994c: 0x105994c: lui   s4, 0x10000
+L_105995c:
+// 0x0105995c: 0x105995c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01059950: 0x1059950: j	 0x10599dc addiu s4, s4, 18500
+// 0x01059960: 0x1059960: j	 0x10599ec addiu s4, s4, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 8
-	br L_10599dc
+	br L_10599ec
 // --- basic block ---
-L_1059958:
-// 0x01059958: 0x1059958: lui   s1, 0x10000
+L_1059968:
+// 0x01059968: 0x1059968: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0105995c: 0x105995c: lui   s2, 0x10000
+// 0x0105996c: 0x105996c: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01059960: 0x1059960: lui   s4, 0x10000
+// 0x01059970: 0x1059970: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01059964: 0x1059964: addiu s1, s1, 9588
+// 0x01059974: 0x1059974: addiu s1, s1, 9584
 	ldloc 11
-	ldc.i4 9588
+	ldc.i4 9584
 	add
 	stloc 11
-// 0x01059968: 0x1059968: addiu s2, s2, 9576
+// 0x01059978: 0x1059978: addiu s2, s2, 9572
 	ldloc 10
-	ldc.i4 9576
+	ldc.i4 9572
 	add
 	stloc 10
-// 0x0105996c: 0x105996c: j	 0x1059a18 addiu s4, s4, 8652
+// 0x0105997c: 0x105997c: j	 0x1059a28 addiu s4, s4, 8648
 	ldloc 8
-	ldc.i4 8652
+	ldc.i4 8648
 	add
 	stloc 8
-	br L_1059a18
+	br L_1059a28
 // --- basic block ---
-L_1059974:
-// 0x01059974: 0x1059974: lui   s2, 0x10000
+L_1059984:
+// 0x01059984: 0x1059984: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01059978: 0x1059978: lui   s4, 0x10000
+// 0x01059988: 0x1059988: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0105997c: 0x105997c: addiu s2, s2, 9600
+// 0x0105998c: 0x105998c: addiu s2, s2, 9596
 	ldloc 10
-	ldc.i4 9600
+	ldc.i4 9596
 	add
 	stloc 10
-// 0x01059980: 0x1059980: addiu s4, s4, 8684
+// 0x01059990: 0x1059990: addiu s4, s4, 8680
 	ldloc 8
-	ldc.i4 8684
+	ldc.i4 8680
 	add
 	stloc 8
-L_1059984:
-// 0x01059984: 0x1059984: addu  s3, zero, zero
+L_1059994:
+// 0x01059994: 0x1059994: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x01059988: 0x1059988: j	 0x1059a50 addu  s1, zero, zero
+// 0x01059998: 0x1059998: j	 0x1059a60 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_1059a50
+	br L_1059a60
 // --- basic block ---
-L_1059990:
-// 0x01059990: 0x1059990: lui   s2, 0x10000
+L_10599a0:
+// 0x010599a0: 0x10599a0: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01059994: 0x1059994: lui   s4, 0x10000
+// 0x010599a4: 0x10599a4: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01059998: 0x1059998: addiu s2, s2, 9612
+// 0x010599a8: 0x10599a8: addiu s2, s2, 9608
 	ldloc 10
-	ldc.i4 9612
+	ldc.i4 9608
 	add
 	stloc 10
-// 0x0105999c: 0x105999c: j	 0x1059984 addiu s4, s4, 8696
+// 0x010599ac: 0x10599ac: j	 0x1059994 addiu s4, s4, 8692
 	ldloc 8
-	ldc.i4 8696
+	ldc.i4 8692
 	add
 	stloc 8
-	br L_1059984
+	br L_1059994
 // --- basic block ---
-L_10599a4:
-// 0x010599a4: 0x10599a4: lui   s1, 0x10000
+L_10599b4:
+// 0x010599b4: 0x10599b4: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x010599a8: 0x10599a8: lui   s2, 0x10000
+// 0x010599b8: 0x10599b8: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010599ac: 0x10599ac: lui   s4, 0x10000
+// 0x010599bc: 0x10599bc: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010599b0: 0x10599b0: addiu s1, s1, 9588
+// 0x010599c0: 0x10599c0: addiu s1, s1, 9584
 	ldloc 11
-	ldc.i4 9588
+	ldc.i4 9584
 	add
 	stloc 11
-// 0x010599b4: 0x10599b4: addiu s2, s2, 9612
+// 0x010599c4: 0x10599c4: addiu s2, s2, 9608
 	ldloc 10
-	ldc.i4 9612
+	ldc.i4 9608
 	add
 	stloc 10
-// 0x010599b8: 0x10599b8: j	 0x1059a18 addiu s4, s4, 8708
+// 0x010599c8: 0x10599c8: j	 0x1059a28 addiu s4, s4, 8704
 	ldloc 8
-	ldc.i4 8708
+	ldc.i4 8704
 	add
 	stloc 8
-	br L_1059a18
+	br L_1059a28
 // --- basic block ---
-L_10599c0:
-// 0x010599c0: 0x10599c0: lui   s2, 0x10000
+L_10599d0:
+// 0x010599d0: 0x10599d0: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010599c4: 0x10599c4: lui   s4, 0x10000
+// 0x010599d4: 0x10599d4: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010599c8: 0x10599c8: addiu s2, s2, 9624
+// 0x010599d8: 0x10599d8: addiu s2, s2, 9620
 	ldloc 10
-	ldc.i4 9624
+	ldc.i4 9620
 	add
 	stloc 10
-// 0x010599cc: 0x10599cc: j	 0x1059984 addiu s4, s4, 8740
+// 0x010599dc: 0x10599dc: j	 0x1059994 addiu s4, s4, 8736
 	ldloc 8
-	ldc.i4 8740
+	ldc.i4 8736
 	add
 	stloc 8
-	br L_1059984
+	br L_1059994
 // --- basic block ---
-L_10599d4:
-// 0x010599d4: 0x10599d4: lui   s4, 0x10000
+L_10599e4:
+// 0x010599e4: 0x10599e4: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010599d8: 0x10599d8: addiu s4, s4, 8752
+// 0x010599e8: 0x10599e8: addiu s4, s4, 8748
 	ldloc 8
-	ldc.i4 8752
+	ldc.i4 8748
 	add
 	stloc 8
-L_10599dc:
-// 0x010599dc: 0x10599dc: addu  s3, zero, zero
+L_10599ec:
+// 0x010599ec: 0x10599ec: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x010599e0: 0x10599e0: addu  s1, zero, zero
+// 0x010599f0: 0x10599f0: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x010599e4: 0x10599e4: j	 0x1059a50 addu  s2, zero, zero
+// 0x010599f4: 0x10599f4: j	 0x1059a60 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1059a50
+	br L_1059a60
 // --- basic block ---
-L_10599ec:
-// 0x010599ec: 0x10599ec: lui   s2, 0x10000
+L_10599fc:
+// 0x010599fc: 0x10599fc: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x010599f0: 0x10599f0: lui   s4, 0x10000
+// 0x01059a00: 0x1059a00: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x010599f4: 0x10599f4: addiu s2, s2, 9636
+// 0x01059a04: 0x1059a04: addiu s2, s2, 9632
 	ldloc 10
-	ldc.i4 9636
+	ldc.i4 9632
 	add
 	stloc 10
-// 0x010599f8: 0x10599f8: j	 0x1059984 addiu s4, s4, 8776
+// 0x01059a08: 0x1059a08: j	 0x1059994 addiu s4, s4, 8772
 	ldloc 8
-	ldc.i4 8776
+	ldc.i4 8772
 	add
 	stloc 8
-	br L_1059984
+	br L_1059994
 // --- basic block ---
-L_1059a00:
-// 0x01059a00: 0x1059a00: lui   s1, 0x10000
+L_1059a10:
+// 0x01059a10: 0x1059a10: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01059a04: 0x1059a04: lui   s2, 0x10000
+// 0x01059a14: 0x1059a14: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01059a08: 0x1059a08: lui   s4, 0x10000
+// 0x01059a18: 0x1059a18: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01059a0c: 0x1059a0c: addiu s1, s1, 9588
+// 0x01059a1c: 0x1059a1c: addiu s1, s1, 9584
 	ldloc 11
-	ldc.i4 9588
+	ldc.i4 9584
 	add
 	stloc 11
-// 0x01059a10: 0x1059a10: addiu s2, s2, 9636
+// 0x01059a20: 0x1059a20: addiu s2, s2, 9632
 	ldloc 10
-	ldc.i4 9636
+	ldc.i4 9632
 	add
 	stloc 10
-// 0x01059a14: 0x1059a14: addiu s4, s4, 8796
+// 0x01059a24: 0x1059a24: addiu s4, s4, 8792
 	ldloc 8
-	ldc.i4 8796
+	ldc.i4 8792
 	add
 	stloc 8
-L_1059a18:
-// 0x01059a18: 0x1059a18: j	 0x1059a50 addu  s3, zero, zero
+L_1059a28:
+// 0x01059a28: 0x1059a28: j	 0x1059a60 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 14
-	br L_1059a50
+	br L_1059a60
 // --- basic block ---
-L_1059a20:
-// 0x01059a20: 0x1059a20: lb    s3, 53(s0)
+L_1059a30:
+// 0x01059a30: 0x1059a30: lb    s3, 53(s0)
 	ldloc 9
 	ldc.i4.s 53
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 14
-// 0x01059a24: 0x1059a24: lui   s1, 0x10000
+// 0x01059a34: 0x1059a34: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01059a28: 0x1059a28: jal   0x101cc04 lui   s4, 0x10000
+// 0x01059a38: 0x1059a38: jal   0x101cc14 lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 8
-	call int32 Cibyl21::roadmap_lang_rtl_101cc04()
+	call int32 Cibyl21::roadmap_lang_rtl_101cc14()
 	stloc 5
 // --- basic block ---
-// 0x01059a30: 0x1059a30: addiu s1, s1, 9588
+// 0x01059a40: 0x1059a40: addiu s1, s1, 9584
 	ldloc 11
-	ldc.i4 9588
+	ldc.i4 9584
 	add
 	stloc 11
-// 0x01059a34: 0x1059a34: bne   v0, zero, 0x1059a48 addiu s4, s4, 8868
+// 0x01059a44: 0x1059a44: bne   v0, zero, 0x1059a58 addiu s4, s4, 8864
 	ldloc 5
 	ldloc 8
-	ldc.i4 8868
+	ldc.i4 8864
 	add
 	stloc 8
-	brtrue L_1059a48
+	brtrue L_1059a58
 // --- basic block ---
-// 0x01059a3c: 0x1059a3c: lui   s2, 0x10000
+// 0x01059a4c: 0x1059a4c: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01059a40: 0x1059a40: j	 0x1059a50 addiu s2, s2, 18500
+// 0x01059a50: 0x1059a50: j	 0x1059a60 addiu s2, s2, 18768
 	ldloc 10
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 10
-	br L_1059a50
+	br L_1059a60
 // --- basic block ---
-L_1059a48:
-// 0x01059a48: 0x1059a48: lui   s2, 0x0
+L_1059a58:
+// 0x01059a58: 0x1059a58: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01059a4c: 0x1059a4c: addiu s2, s2, 27464
+// 0x01059a5c: 0x1059a5c: addiu s2, s2, 27464
 	ldloc 10
 	ldc.i4 27464
 	add
 	stloc 10
-L_1059a50:
-// 0x01059a50: 0x1059a50: addiu a0, sp, 40
+L_1059a60:
+// 0x01059a60: 0x1059a60: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x01059a54: 0x1059a54: addu  a1, zero, zero
+// 0x01059a64: 0x1059a64: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01059a58: 0x1059a58: jal   0x1029da8 addu  a2, zero, zero
+// 0x01059a68: 0x1059a68: jal   0x1029db8 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5874,40 +5874,40 @@ L_1059a50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059a60: 0x1059a60: lb    v1, 54(s0)
+// 0x01059a70: 0x1059a70: lb    v1, 54(s0)
 	ldloc 9
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01059a64: 0x1059a64: addiu v0, zero, 15
+// 0x01059a74: 0x1059a74: addiu v0, zero, 15
 	ldc.i4.s 15
 	stloc 5
-// 0x01059a68: 0x1059a68: bne   v1, v0, 0x1059b38 addu  a1, s4, zero
+// 0x01059a78: 0x1059a78: bne   v1, v0, 0x1059b48 addu  a1, s4, zero
 	ldloc 6
 	ldloc 5
 	ldloc 8
 	stloc.2
-	bne.un L_1059b38
+	bne.un L_1059b48
 // --- basic block ---
-// 0x01059a70: 0x1059a70: lui   v0, 0x70000
+// 0x01059a80: 0x1059a80: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059a74: 0x1059a74: lw    v1, 10688(v0)
+// 0x01059a84: 0x1059a84: lw    v1, 11152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc 6
-// 0x01059a78: 0x1059a78: lw    v0, 52(sp)
+// 0x01059a88: 0x1059a88: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5916,80 +5916,80 @@ L_1059a50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059a7c: 0x1059a7c: sll   zero, zero, 0
-// 0x01059a80: 0x1059a80: addiu v0, v0, 20
+// 0x01059a8c: 0x1059a8c: sll   zero, zero, 0
+// 0x01059a90: 0x1059a90: addiu v0, v0, 20
 	ldloc 5
 	ldc.i4.s 20
 	add
 	stloc 5
-// 0x01059a84: 0x1059a84: slt   v0, v0, v1
+// 0x01059a94: 0x1059a94: slt   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	clt
 	stloc 5
-// 0x01059a88: 0x1059a88: bne   v0, zero, 0x1059b38 sll   zero, zero, 0
+// 0x01059a98: 0x1059a98: bne   v0, zero, 0x1059b48 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1059b38
+	brtrue L_1059b48
 // --- basic block ---
-// 0x01059a90: 0x1059a90: jal   0x10518a8 addu  a0, zero, zero
+// 0x01059aa0: 0x1059aa0: jal   0x10518b8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059a98: 0x1059a98: lui   a1, 0x10000
+// 0x01059aa8: 0x1059aa8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01059a9c: 0x1059a9c: addu  a0, v0, zero
+// 0x01059aac: 0x1059aac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01059aa0: 0x1059aa0: addiu a1, a1, 9648
+// 0x01059ab0: 0x1059ab0: addiu a1, a1, 9644
 	ldloc.2
-	ldc.i4 9648
+	ldc.i4 9644
 	add
 	stloc.2
-// 0x01059aa4: 0x1059aa4: jal   0x10518cc addu  s0, v0, zero
+// 0x01059ab4: 0x1059ab4: jal   0x10518dc addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059aac: 0x1059aac: jal   0x1057460 sll   zero, zero, 0
+// 0x01059abc: 0x1059abc: jal   0x1057470 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navgiate_main_voice_guidance_enabled_1057460(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navgiate_main_voice_guidance_enabled_1057470(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059ab4: 0x1059ab4: beq   v0, zero, 0x1059ae4 lui   a0, 0x0
+// 0x01059ac4: 0x1059ac4: beq   v0, zero, 0x1059af4 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1059ae4
+	brfalse L_1059af4
 // --- basic block ---
-// 0x01059abc: 0x1059abc: lui   a0, 0x0
+// 0x01059acc: 0x1059acc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01059ac0: 0x1059ac0: lui   a1, 0x0
+// 0x01059ad0: 0x1059ad0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01059ac4: 0x1059ac4: addiu a0, a0, 14116
+// 0x01059ad4: 0x1059ad4: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x01059ac8: 0x1059ac8: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01059ad8: 0x1059ad8: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5999,18 +5999,18 @@ L_1059a50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059ad0: 0x1059ad0: beq   v0, zero, 0x1059ae4 lui   a0, 0x0
+// 0x01059ae0: 0x1059ae0: beq   v0, zero, 0x1059af4 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1059ae4
+	brfalse L_1059af4
 // --- basic block ---
-// 0x01059ad8: 0x1059ad8: jal   0x105195c addu  a0, s0, zero
+// 0x01059ae8: 0x1059ae8: jal   0x105196c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6018,24 +6018,24 @@ L_1059a50:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059ae0: 0x1059ae0: lui   a0, 0x0
+// 0x01059af0: 0x1059af0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-L_1059ae4:
-// 0x01059ae4: 0x1059ae4: lui   a1, 0x0
+L_1059af4:
+// 0x01059af4: 0x1059af4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01059ae8: 0x1059ae8: addiu a0, a0, 14100
+// 0x01059af8: 0x1059af8: addiu a0, a0, 14100
 	ldloc.1
 	ldc.i4 14100
 	add
 	stloc.1
-// 0x01059aec: 0x1059aec: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01059afc: 0x1059afc: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6045,31 +6045,31 @@ L_1059ae4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059af4: 0x1059af4: beq   v0, zero, 0x1059b28 sll   zero, zero, 0
+// 0x01059b04: 0x1059b04: beq   v0, zero, 0x1059b38 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1059b28
+	brfalse L_1059b38
 // --- basic block ---
-// 0x01059afc: 0x1059afc: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x01059b0c: 0x1059b0c: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059b04: 0x1059b04: beq   v0, zero, 0x1059b28 lui   a1, 0x10000
+// 0x01059b14: 0x1059b14: beq   v0, zero, 0x1059b38 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1059b28
+	brfalse L_1059b38
 // --- basic block ---
-// 0x01059b0c: 0x1059b0c: addu  a0, v0, zero
+// 0x01059b1c: 0x1059b1c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01059b10: 0x1059b10: jal   0x1001b14 addiu a1, a1, -31052
+// 0x01059b20: 0x1059b20: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -6079,38 +6079,38 @@ L_1059ae4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01059b18: 0x1059b18: bne   v0, zero, 0x1059b28 sll   zero, zero, 0
+// 0x01059b28: 0x1059b28: bne   v0, zero, 0x1059b38 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1059b28
+	brtrue L_1059b38
 // --- basic block ---
-// 0x01059b20: 0x1059b20: jal   0x1021004 sll   zero, zero, 0
+// 0x01059b30: 0x1059b30: jal   0x1021014 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_zoom_reset_1021004(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_zoom_reset_1021014(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1059b28:
-// 0x01059b28: 0x1059b28: jal   0x105944c sll   zero, zero, 0
+L_1059b38:
+// 0x01059b38: 0x1059b38: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059b30: 0x1059b30: j	 0x1059f3c sll   zero, zero, 0
-	br L_1059f3c
+// 0x01059b40: 0x1059b40: j	 0x1059f4c sll   zero, zero, 0
+	br L_1059f4c
 // --- basic block ---
-L_1059b38:
-// 0x01059b38: 0x1059b38: jal   0x101aec4 addiu a0, zero, 73
+L_1059b48:
+// 0x01059b48: 0x1059b48: jal   0x101aed4 addiu a0, zero, 73
 	ldc.i4.s 73
 	stloc.1
 	ldloc.0
@@ -6118,36 +6118,36 @@ L_1059b38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059b40: 0x1059b40: lui   v0, 0x70000
+// 0x01059b50: 0x1059b50: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059b44: 0x1059b44: lw    v0, 10688(v0)
+// 0x01059b54: 0x1059b54: lw    v0, 11152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059b48: 0x1059b48: sll   zero, zero, 0
-// 0x01059b4c: 0x1059b4c: slti  v0, v0, 800
+// 0x01059b58: 0x1059b58: sll   zero, zero, 0
+// 0x01059b5c: 0x1059b5c: slti  v0, v0, 800
 	ldloc 5
 	ldc.i4 800
 	clt
 	stloc 5
-// 0x01059b50: 0x1059b50: beq   v0, zero, 0x1059b68 lui   v0, 0x0
+// 0x01059b60: 0x1059b60: beq   v0, zero, 0x1059b78 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1059b68
+	brfalse L_1059b78
 // --- basic block ---
-// 0x01059b58: 0x1059b58: lw    a0, 14324(v0)
+// 0x01059b68: 0x1059b68: lw    a0, 14324(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6156,179 +6156,179 @@ L_1059b38:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01059b5c: 0x1059b5c: addiu v0, zero, 16
+// 0x01059b6c: 0x1059b6c: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x01059b60: 0x1059b60: bne   a0, v0, 0x1059b6c sll   zero, zero, 0
+// 0x01059b70: 0x1059b70: bne   a0, v0, 0x1059b7c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_1059b6c
+	bne.un L_1059b7c
 // --- basic block ---
-L_1059b68:
-// 0x01059b68: 0x1059b68: addiu a0, zero, 16
+L_1059b78:
+// 0x01059b78: 0x1059b78: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-L_1059b6c:
-// 0x01059b6c: 0x1059b6c: jal   0x105e2a8 sll   zero, zero, 0
+L_1059b7c:
+// 0x01059b7c: 0x1059b7c: jal   0x105e2b8 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_next_instruction_105e2a8(int32)
+	call int32 Cibyl70::navigate_bar_set_next_instruction_105e2b8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01059b74: 0x1059b74: lui   v0, 0x70000
+// 0x01059b84: 0x1059b84: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059b78: 0x1059b78: lw    v1, 10748(v0)
+// 0x01059b88: 0x1059b88: lw    v1, 11212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldelem.i4
 	stloc 6
-// 0x01059b7c: 0x1059b7c: addiu v0, zero, -1
+// 0x01059b8c: 0x1059b8c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01059b80: 0x1059b80: bne   v1, v0, 0x1059bd8 lui   a0, 0x70000
+// 0x01059b90: 0x1059b90: bne   v1, v0, 0x1059be8 lui   a0, 0x70000
 	ldloc 6
 	ldloc 5
 	ldc.i4 458752
 	stloc.1
-	bne.un L_1059bd8
+	bne.un L_1059be8
 // --- basic block ---
-// 0x01059b88: 0x1059b88: lui   v0, 0x70000
+// 0x01059b98: 0x1059b98: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059b8c: 0x1059b8c: lw    v1, 10688(v0)
+// 0x01059b9c: 0x1059b9c: lw    v1, 11152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc 6
-// 0x01059b90: 0x1059b90: sll   zero, zero, 0
-// 0x01059b94: 0x1059b94: slti  a0, v1, 801
+// 0x01059ba0: 0x1059ba0: sll   zero, zero, 0
+// 0x01059ba4: 0x1059ba4: slti  a0, v1, 801
 	ldloc 6
 	ldc.i4 801
 	clt
 	stloc.1
-// 0x01059b98: 0x1059b98: beq   a0, zero, 0x1059bb0 addu  v0, zero, zero
+// 0x01059ba8: 0x1059ba8: beq   a0, zero, 0x1059bc0 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1059bb0
+	brfalse L_1059bc0
 // --- basic block ---
-// 0x01059ba0: 0x1059ba0: slti  v1, v1, 201
+// 0x01059bb0: 0x1059bb0: slti  v1, v1, 201
 	ldloc 6
 	ldc.i4 201
 	clt
 	stloc 6
-// 0x01059ba4: 0x1059ba4: bne   v1, zero, 0x1059bc0 lui   v0, 0x70000
+// 0x01059bb4: 0x1059bb4: bne   v1, zero, 0x1059bd0 lui   v0, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1059bc0
+	brtrue L_1059bd0
 // --- basic block ---
-// 0x01059bac: 0x1059bac: addiu v0, zero, 1
+// 0x01059bbc: 0x1059bbc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1059bb0:
-// 0x01059bb0: 0x1059bb0: addiu v0, v0, 1
+L_1059bc0:
+// 0x01059bc0: 0x1059bc0: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01059bb4: 0x1059bb4: lui   v1, 0x70000
+// 0x01059bc4: 0x1059bc4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01059bb8: 0x1059bb8: sw    v0, 10748(v1)
+// 0x01059bc8: 0x1059bc8: sw    v0, 11212(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldloc 5
 	stelem.i4
-// 0x01059bbc: 0x1059bbc: lui   v0, 0x70000
+// 0x01059bcc: 0x1059bcc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1059bc0:
-// 0x01059bc0: 0x1059bc0: lw    a0, 10748(v0)
+L_1059bd0:
+// 0x01059bd0: 0x1059bd0: lw    a0, 11212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldelem.i4
 	stloc.1
-// 0x01059bc4: 0x1059bc4: addiu v1, zero, -1
+// 0x01059bd4: 0x1059bd4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01059bc8: 0x1059bc8: bne   a0, v1, 0x1059bd8 lui   a0, 0x70000
+// 0x01059bd8: 0x1059bd8: bne   a0, v1, 0x1059be8 lui   a0, 0x70000
 	ldloc.1
 	ldloc 6
 	ldc.i4 458752
 	stloc.1
-	bne.un L_1059bd8
+	bne.un L_1059be8
 // --- basic block ---
-// 0x01059bd0: 0x1059bd0: addiu v1, zero, 3
+// 0x01059be0: 0x1059be0: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x01059bd4: 0x1059bd4: sw    v1, 10748(v0)
+// 0x01059be4: 0x1059be4: sw    v1, 11212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldloc 6
 	stelem.i4
-L_1059bd8:
-// 0x01059bd8: 0x1059bd8: lw    a1, 10748(a0)
+L_1059be8:
+// 0x01059be8: 0x1059be8: lw    a1, 11212(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldelem.i4
 	stloc.2
-// 0x01059bdc: 0x1059bdc: sll   zero, zero, 0
-// 0x01059be0: 0x1059be0: blez  a1, 0x1059f3c addiu a1, a1, -1
+// 0x01059bec: 0x1059bec: sll   zero, zero, 0
+// 0x01059bf0: 0x1059bf0: blez  a1, 0x1059f4c addiu a1, a1, -1
 	ldloc.2
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
 	ldc.i4.s 0
-	ble L_1059f3c
+	ble L_1059f4c
 // --- basic block ---
-// 0x01059be8: 0x1059be8: addiu v0, zero, 200
+// 0x01059bf8: 0x1059bf8: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x01059bec: 0x1059bec: addiu v1, zero, 100
+// 0x01059bfc: 0x1059bfc: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 6
-// 0x01059bf0: 0x1059bf0: addiu a2, sp, 16
+// 0x01059c00: 0x1059c00: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x01059bf4: 0x1059bf4: sll   a1, a1, 2
+// 0x01059c04: 0x1059c04: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01059bf8: 0x1059bf8: addu  a1, a2, a1
+// 0x01059c08: 0x1059c08: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x01059bfc: 0x1059bfc: sw    v0, 32(sp)
+// 0x01059c0c: 0x1059c0c: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6337,7 +6337,7 @@ L_1059bd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01059c00: 0x1059c00: sw    v0, 28(sp)
+// 0x01059c10: 0x1059c10: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6346,7 +6346,7 @@ L_1059bd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01059c04: 0x1059c04: sw    v1, 36(sp)
+// 0x01059c14: 0x1059c14: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6355,7 +6355,7 @@ L_1059bd8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01059c08: 0x1059c08: lw    a2, 12(a1)
+// 0x01059c18: 0x1059c18: lw    a2, 12(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -6364,7 +6364,7 @@ L_1059bd8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01059c0c: 0x1059c0c: lw    a3, 52(sp)
+// 0x01059c1c: 0x1059c1c: lw    a3, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6373,7 +6373,7 @@ L_1059bd8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01059c10: 0x1059c10: sw    v0, 20(sp)
+// 0x01059c20: 0x1059c20: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6382,15 +6382,15 @@ L_1059bd8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01059c14: 0x1059c14: mult  a3, a2
+// 0x01059c24: 0x1059c24: mult  a3, a2
 	ldloc 4
 	ldloc.3
 	mul
 	stloc 13
-// 0x01059c18: 0x1059c18: addiu a2, zero, 800
+// 0x01059c28: 0x1059c28: addiu a2, zero, 800
 	ldc.i4 800
 	stloc.3
-// 0x01059c1c: 0x1059c1c: sw    a2, 16(sp)
+// 0x01059c2c: 0x1059c2c: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6399,10 +6399,10 @@ L_1059bd8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01059c20: 0x1059c20: addiu a2, zero, 40
+// 0x01059c30: 0x1059c30: addiu a2, zero, 40
 	ldc.i4.s 40
 	stloc.3
-// 0x01059c24: 0x1059c24: sw    a2, 24(sp)
+// 0x01059c34: 0x1059c34: sw    a2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6411,162 +6411,162 @@ L_1059bd8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01059c28: 0x1059c28: lw    s4, 0(a1)
+// 0x01059c38: 0x1059c38: lw    s4, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01059c2c: 0x1059c2c: lui   v0, 0x70000
+// 0x01059c3c: 0x1059c3c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059c30: 0x1059c30: lw    v0, 10688(v0)
+// 0x01059c40: 0x1059c40: lw    v0, 11152(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059c34: 0x1059c34: mflo  lo
+// 0x01059c44: 0x1059c44: mflo  lo
 	ldloc 13
 	stloc 4
-// 0x01059c38: 0x1059c38: sll   zero, zero, 0
-// 0x01059c3c: 0x1059c3c: sll   zero, zero, 0
-// 0x01059c40: 0x1059c40: div   a3, v1
+// 0x01059c48: 0x1059c48: sll   zero, zero, 0
+// 0x01059c4c: 0x1059c4c: sll   zero, zero, 0
+// 0x01059c50: 0x1059c50: div   a3, v1
 	ldloc 4
 	ldloc 6
 	div
 	stloc 13
-// 0x01059c44: 0x1059c44: mflo  lo
+// 0x01059c54: 0x1059c54: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x01059c48: 0x1059c48: addu  v1, v1, s4
+// 0x01059c58: 0x1059c58: addu  v1, v1, s4
 	ldloc 6
 	ldloc 8
 	add
 	stloc 6
-// 0x01059c4c: 0x1059c4c: slt   v1, v1, v0
+// 0x01059c5c: 0x1059c5c: slt   v1, v1, v0
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 6
-// 0x01059c50: 0x1059c50: bne   v1, zero, 0x1059f3c slti  v1, s4, 801
+// 0x01059c60: 0x1059c60: bne   v1, zero, 0x1059f4c slti  v1, s4, 801
 	ldloc 6
 	ldloc 8
 	ldc.i4 801
 	clt
 	stloc 6
-	brtrue L_1059f3c
+	brtrue L_1059f4c
 // --- basic block ---
-// 0x01059c58: 0x1059c58: bne   v1, zero, 0x1059c74 sw    zero, 10748(a0)
+// 0x01059c68: 0x1059c68: bne   v1, zero, 0x1059c84 sw    zero, 11212(a0)
 	ldloc 6
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_1059c74
+	brtrue L_1059c84
 // --- basic block ---
-// 0x01059c60: 0x1059c60: slti  a0, v0, 801
+// 0x01059c70: 0x1059c70: slti  a0, v0, 801
 	ldloc 5
 	ldc.i4 801
 	clt
 	stloc.1
-// 0x01059c64: 0x1059c64: bne   a0, zero, 0x1059c80 addu  v1, zero, zero
+// 0x01059c74: 0x1059c74: bne   a0, zero, 0x1059c90 addu  v1, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1059c80
+	brtrue L_1059c90
 // --- basic block ---
-// 0x01059c6c: 0x1059c6c: j	 0x1059cac addiu v1, v1, 1
+// 0x01059c7c: 0x1059c7c: j	 0x1059cbc addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	br L_1059cac
+	br L_1059cbc
 // --- basic block ---
-L_1059c74:
-// 0x01059c74: 0x1059c74: slti  v1, s4, 201
+L_1059c84:
+// 0x01059c84: 0x1059c84: slti  v1, s4, 201
 	ldloc 8
 	ldc.i4 201
 	clt
 	stloc 6
-// 0x01059c78: 0x1059c78: bne   v1, zero, 0x1059c94 slti  v1, s4, 41
+// 0x01059c88: 0x1059c88: bne   v1, zero, 0x1059ca4 slti  v1, s4, 41
 	ldloc 6
 	ldloc 8
 	ldc.i4.s 41
 	clt
 	stloc 6
-	brtrue L_1059c94
+	brtrue L_1059ca4
 // --- basic block ---
-L_1059c80:
-// 0x01059c80: 0x1059c80: slti  a0, v0, 201
+L_1059c90:
+// 0x01059c90: 0x1059c90: slti  a0, v0, 201
 	ldloc 5
 	ldc.i4 201
 	clt
 	stloc.1
-// 0x01059c84: 0x1059c84: bne   a0, zero, 0x1059c9c addiu v1, zero, 1
+// 0x01059c94: 0x1059c94: bne   a0, zero, 0x1059cac addiu v1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 6
-	brtrue L_1059c9c
+	brtrue L_1059cac
 // --- basic block ---
-// 0x01059c8c: 0x1059c8c: j	 0x1059cac addiu v1, v1, 1
+// 0x01059c9c: 0x1059c9c: j	 0x1059cbc addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	br L_1059cac
+	br L_1059cbc
 // --- basic block ---
-L_1059c94:
-// 0x01059c94: 0x1059c94: bne   v1, zero, 0x1059cb4 sll   zero, zero, 0
+L_1059ca4:
+// 0x01059ca4: 0x1059ca4: bne   v1, zero, 0x1059cc4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1059cb4
+	brtrue L_1059cc4
 // --- basic block ---
-L_1059c9c:
-// 0x01059c9c: 0x1059c9c: slti  v0, v0, 41
+L_1059cac:
+// 0x01059cac: 0x1059cac: slti  v0, v0, 41
 	ldloc 5
 	ldc.i4.s 41
 	clt
 	stloc 5
-// 0x01059ca0: 0x1059ca0: bne   v0, zero, 0x1059cb4 addiu v1, zero, 2
+// 0x01059cb0: 0x1059cb0: bne   v0, zero, 0x1059cc4 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brtrue L_1059cb4
+	brtrue L_1059cc4
 // --- basic block ---
-// 0x01059ca8: 0x1059ca8: addiu v1, v1, 1
+// 0x01059cb8: 0x1059cb8: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_1059cac:
-// 0x01059cac: 0x1059cac: lui   v0, 0x70000
+L_1059cbc:
+// 0x01059cbc: 0x1059cbc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059cb0: 0x1059cb0: sw    v1, 10748(v0)
+// 0x01059cc0: 0x1059cc0: sw    v1, 11212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldloc 6
 	stelem.i4
-L_1059cb4:
-// 0x01059cb4: 0x1059cb4: beq   s2, zero, 0x1059f3c lui   v0, 0x0
+L_1059cc4:
+// 0x01059cc4: 0x1059cc4: beq   s2, zero, 0x1059f4c lui   v0, 0x0
 	ldloc 10
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1059f3c
+	brfalse L_1059f4c
 // --- basic block ---
-// 0x01059cbc: 0x1059cbc: lw    v0, 1816(v0)
+// 0x01059ccc: 0x1059ccc: lw    v0, 1816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6575,7 +6575,7 @@ L_1059cb4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059cc0: 0x1059cc0: sw    zero, 60(sp)
+// 0x01059cd0: 0x1059cd0: sw    zero, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6584,7 +6584,7 @@ L_1059cb4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01059cc4: 0x1059cc4: sw    v0, 76(sp)
+// 0x01059cd4: 0x1059cd4: sw    v0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6593,7 +6593,7 @@ L_1059cb4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01059cc8: 0x1059cc8: lw    v1, 24(s0)
+// 0x01059cd8: 0x1059cd8: lw    v1, 24(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6602,13 +6602,13 @@ L_1059cb4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01059ccc: 0x1059ccc: lh    v0, 36(s0)
+// 0x01059cdc: 0x1059cdc: lh    v0, 36(s0)
 	ldloc 9
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01059cd0: 0x1059cd0: sw    v1, 72(sp)
+// 0x01059ce0: 0x1059ce0: sw    v1, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6617,7 +6617,7 @@ L_1059cb4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01059cd4: 0x1059cd4: sw    v0, 64(sp)
+// 0x01059ce4: 0x1059ce4: sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6626,26 +6626,26 @@ L_1059cb4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01059cd8: 0x1059cd8: lb    v0, 51(s0)
+// 0x01059ce8: 0x1059ce8: lb    v0, 51(s0)
 	ldloc 9
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01059cdc: 0x1059cdc: addu  a2, zero, zero
+// 0x01059cec: 0x1059cec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01059ce0: 0x1059ce0: addiu a0, sp, 60
+// 0x01059cf0: 0x1059cf0: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x01059ce4: 0x1059ce4: addiu a1, sp, 80
+// 0x01059cf4: 0x1059cf4: addiu a1, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.2
-// 0x01059ce8: 0x1059ce8: jal   0x1015174 sw    v0, 68(sp)
+// 0x01059cf8: 0x1059cf8: jal   0x1015184 sw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6659,12 +6659,12 @@ L_1059cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015174(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_street_properties_1015184(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059cf0: 0x1059cf0: lw    a1, 80(sp)
+// 0x01059d00: 0x1059d00: lw    a1, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6673,7 +6673,7 @@ L_1059cb4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01059cf4: 0x1059cf4: jal   0x101aec4 addiu a0, zero, 35
+// 0x01059d04: 0x1059d04: jal   0x101aed4 addiu a0, zero, 35
 	ldc.i4.s 35
 	stloc.1
 	ldloc.0
@@ -6681,12 +6681,12 @@ L_1059cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059cfc: 0x1059cfc: lw    a1, 84(sp)
+// 0x01059d0c: 0x1059d0c: lw    a1, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6695,7 +6695,7 @@ L_1059cb4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01059d00: 0x1059d00: jal   0x101aec4 addiu a0, zero, 78
+// 0x01059d10: 0x1059d10: jal   0x101aed4 addiu a0, zero, 78
 	ldc.i4.s 78
 	stloc.1
 	ldloc.0
@@ -6703,12 +6703,12 @@ L_1059cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059d08: 0x1059d08: lw    a1, 92(sp)
+// 0x01059d18: 0x1059d18: lw    a1, 92(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6717,7 +6717,7 @@ L_1059cb4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01059d0c: 0x1059d0c: jal   0x101aec4 addiu a0, zero, 67
+// 0x01059d1c: 0x1059d1c: jal   0x101aed4 addiu a0, zero, 67
 	ldc.i4.s 67
 	stloc.1
 	ldloc.0
@@ -6725,37 +6725,37 @@ L_1059cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059d14: 0x1059d14: jal   0x1057460 sll   zero, zero, 0
+// 0x01059d24: 0x1059d24: jal   0x1057470 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navgiate_main_voice_guidance_enabled_1057460(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navgiate_main_voice_guidance_enabled_1057470(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059d1c: 0x1059d1c: beq   v0, zero, 0x1059f3c lui   a1, 0x0
+// 0x01059d2c: 0x1059d2c: beq   v0, zero, 0x1059f4c lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_1059f3c
+	brfalse L_1059f4c
 // --- basic block ---
-// 0x01059d24: 0x1059d24: lui   a0, 0x0
+// 0x01059d34: 0x1059d34: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01059d28: 0x1059d28: addiu a0, a0, 14116
+// 0x01059d38: 0x1059d38: addiu a0, a0, 14116
 	ldloc.1
 	ldc.i4 14116
 	add
 	stloc.1
-// 0x01059d2c: 0x1059d2c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01059d3c: 0x1059d3c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -6765,45 +6765,45 @@ L_1059cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059d34: 0x1059d34: beq   v0, zero, 0x1059f3c sll   zero, zero, 0
+// 0x01059d44: 0x1059d44: beq   v0, zero, 0x1059f4c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1059f3c
+	brfalse L_1059f4c
 // --- basic block ---
-// 0x01059d3c: 0x1059d3c: jal   0x10518a8 addu  a0, zero, zero
+// 0x01059d4c: 0x1059d4c: jal   0x10518b8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059d44: 0x1059d44: addu  s0, v0, zero
+// 0x01059d54: 0x1059d54: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01059d48: 0x1059d48: lui   v0, 0x70000
+// 0x01059d58: 0x1059d58: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059d4c: 0x1059d4c: lw    v0, 10748(v0)
+// 0x01059d5c: 0x1059d5c: lw    v0, 11212(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059d50: 0x1059d50: sll   zero, zero, 0
-// 0x01059d54: 0x1059d54: bne   v0, zero, 0x1059d6c sll   zero, zero, 0
+// 0x01059d60: 0x1059d60: sll   zero, zero, 0
+// 0x01059d64: 0x1059d64: bne   v0, zero, 0x1059d7c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1059d6c
+	brtrue L_1059d7c
 // --- basic block ---
-// 0x01059d5c: 0x1059d5c: jal   0x101ae54 addiu a0, zero, 116
+// 0x01059d6c: 0x1059d6c: jal   0x101ae64 addiu a0, zero, 116
 	ldc.i4.s 116
 	stloc.1
 	ldloc.0
@@ -6811,77 +6811,77 @@ L_1059cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059d64: 0x1059d64: j	 0x1059ec8 sll   zero, zero, 0
-	br L_1059ec8
+// 0x01059d74: 0x1059d74: j	 0x1059ed8 sll   zero, zero, 0
+	br L_1059ed8
 // --- basic block ---
-L_1059d6c:
-// 0x01059d6c: 0x1059d6c: jal   0x1007df4 addu  a0, s4, zero
+L_1059d7c:
+// 0x01059d7c: 0x1059d7c: jal   0x1007e04 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x01059d74: 0x1059d74: lui   a1, 0x10000
+// 0x01059d84: 0x1059d84: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01059d78: 0x1059d78: addu  s6, v0, zero
+// 0x01059d88: 0x1059d88: addu  s6, v0, zero
 	ldloc 5
 	stloc 15
-// 0x01059d7c: 0x1059d7c: addu  a0, s0, zero
+// 0x01059d8c: 0x1059d8c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01059d80: 0x1059d80: jal   0x10518cc addiu a1, a1, 9656
+// 0x01059d90: 0x1059d90: jal   0x10518dc addiu a1, a1, 9652
 	ldloc.2
-	ldc.i4 9656
+	ldc.i4 9652
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059d88: 0x1059d88: addiu s5, sp, 108
+// 0x01059d98: 0x1059d98: addiu s5, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc 12
-// 0x01059d8c: 0x1059d8c: lui   s8, 0x20000
-	ldc.i4 131072
+// 0x01059d9c: 0x1059d9c: lui   s8, 0x10000
+	ldc.i4 65536
 	stloc 18
-// 0x01059d90: 0x1059d90: blez  s6, 0x1059e2c lui   s7, 0x10000
+// 0x01059da0: 0x1059da0: blez  s6, 0x1059e3c lui   s7, 0x10000
 	ldloc 15
 	ldc.i4 65536
 	stloc 16
 	ldc.i4.s 0
-	ble L_1059e2c
+	ble L_1059e3c
 // --- basic block ---
-// 0x01059d98: 0x1059d98: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x01059da8: 0x1059da8: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x01059da0: 0x1059da0: addu  a3, v0, zero
+// 0x01059db0: 0x1059db0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01059da4: 0x1059da4: lui   v0, 0x20000
+// 0x01059db4: 0x1059db4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01059da8: 0x1059da8: addiu a1, v0, 22696
+// 0x01059db8: 0x1059db8: addiu a1, v0, 23156
 	ldloc 5
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.2
-// 0x01059dac: 0x1059dac: addu  a2, s6, zero
+// 0x01059dbc: 0x1059dbc: addu  a2, s6, zero
 	ldloc 15
 	stloc.3
-// 0x01059db0: 0x1059db0: jal   0x101aec4 addiu a0, zero, 116
+// 0x01059dc0: 0x1059dc0: jal   0x101aed4 addiu a0, zero, 116
 	ldc.i4.s 116
 	stloc.1
 	ldloc.0
@@ -6889,20 +6889,20 @@ L_1059d6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059db8: 0x1059db8: addu  a0, s5, zero
+// 0x01059dc8: 0x1059dc8: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01059dbc: 0x1059dbc: addiu a1, s8, -13884
+// 0x01059dcc: 0x1059dcc: addiu a1, s8, 19088
 	ldloc 18
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01059dc0: 0x1059dc0: jal   0x1000f64 addu  a2, s6, zero
+// 0x01059dd0: 0x1059dd0: jal   0x1000f64 addu  a2, s6, zero
 	ldloc 15
 	stloc.3
 	ldloc.0
@@ -6915,16 +6915,16 @@ L_1059d6c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059dc8: 0x1059dc8: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x01059dd8: 0x1059dd8: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x01059dd0: 0x1059dd0: addu  a0, v0, zero
+// 0x01059de0: 0x1059de0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01059dd4: 0x1059dd4: jal   0x1001b14 addiu a1, s7, 1988
+// 0x01059de4: 0x1059de4: jal   0x1001b14 addiu a1, s7, 1984
 	ldloc 16
-	ldc.i4 1988
+	ldc.i4 1984
 	add
 	stloc.2
 	ldloc.1
@@ -6932,32 +6932,32 @@ L_1059d6c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01059ddc: 0x1059ddc: bne   v0, zero, 0x1059e14 addu  a0, s0, zero
+// 0x01059dec: 0x1059dec: bne   v0, zero, 0x1059e24 addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_1059e14
+	brtrue L_1059e24
 // --- basic block ---
-// 0x01059de4: 0x1059de4: jal   0x1044134 sll   zero, zero, 0
+// 0x01059df4: 0x1059df4: jal   0x1044144 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059dec: 0x1059dec: lui   a1, 0x10000
+// 0x01059dfc: 0x1059dfc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01059df0: 0x1059df0: addu  a0, v0, zero
+// 0x01059e00: 0x1059e00: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01059df4: 0x1059df4: jal   0x1001b14 addiu a1, a1, -7400
+// 0x01059e04: 0x1059e04: jal   0x1001b14 addiu a1, a1, -7404
 	ldloc.2
-	ldc.i4 -7400
+	ldc.i4 -7404
 	add
 	stloc.2
 	ldloc.1
@@ -6965,18 +6965,18 @@ L_1059d6c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01059dfc: 0x1059dfc: beq   v0, zero, 0x1059e10 lui   a1, 0x20000
+// 0x01059e0c: 0x1059e0c: beq   v0, zero, 0x1059e20 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1059e10
+	brfalse L_1059e20
 // --- basic block ---
-// 0x01059e04: 0x1059e04: addu  a0, s5, zero
+// 0x01059e14: 0x1059e14: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01059e08: 0x1059e08: jal   0x1001ac4 addiu a1, a1, -14128
+// 0x01059e18: 0x1059e18: jal   0x1001ac4 addiu a1, a1, -13664
 	ldloc.2
-	ldc.i4 -14128
+	ldc.i4 -13664
 	add
 	stloc.2
 	ldloc.1
@@ -6984,52 +6984,52 @@ L_1059d6c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-L_1059e10:
-// 0x01059e10: 0x1059e10: addu  a0, s0, zero
+L_1059e20:
+// 0x01059e20: 0x1059e20: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-L_1059e14:
-// 0x01059e14: 0x1059e14: jal   0x10518cc addiu a1, sp, 108
+L_1059e24:
+// 0x01059e24: 0x1059e24: jal   0x10518dc addiu a1, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059e1c: 0x1059e1c: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x01059e2c: 0x1059e2c: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x01059e24: 0x1059e24: j	 0x1059ec0 addu  a0, s0, zero
+// 0x01059e34: 0x1059e34: j	 0x1059ed0 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-	br L_1059ec0
+	br L_1059ed0
 // --- basic block ---
-L_1059e2c:
-// 0x01059e2c: 0x1059e2c: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+L_1059e3c:
+// 0x01059e3c: 0x1059e3c: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x01059e34: 0x1059e34: lui   a2, 0x20000
+// 0x01059e44: 0x1059e44: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01059e38: 0x1059e38: addu  a3, v0, zero
+// 0x01059e48: 0x1059e48: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01059e3c: 0x1059e3c: addiu a1, a2, 22696
+// 0x01059e4c: 0x1059e4c: addiu a1, a2, 23156
 	ldloc.3
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.2
-// 0x01059e40: 0x1059e40: addiu a0, zero, 116
+// 0x01059e50: 0x1059e50: addiu a0, zero, 116
 	ldc.i4.s 116
 	stloc.1
-// 0x01059e44: 0x1059e44: jal   0x101aec4 addu  a2, s4, zero
+// 0x01059e54: 0x1059e54: jal   0x101aed4 addu  a2, s4, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -7037,20 +7037,20 @@ L_1059e2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059e4c: 0x1059e4c: addu  a0, s5, zero
+// 0x01059e5c: 0x1059e5c: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01059e50: 0x1059e50: addiu a1, s8, -13884
+// 0x01059e60: 0x1059e60: addiu a1, s8, 19088
 	ldloc 18
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01059e54: 0x1059e54: jal   0x1000f64 addu  a2, s4, zero
+// 0x01059e64: 0x1059e64: jal   0x1000f64 addu  a2, s4, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -7063,16 +7063,16 @@ L_1059e2c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059e5c: 0x1059e5c: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x01059e6c: 0x1059e6c: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x01059e64: 0x1059e64: addu  a0, v0, zero
+// 0x01059e74: 0x1059e74: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01059e68: 0x1059e68: jal   0x1001b14 addiu a1, s7, 1988
+// 0x01059e78: 0x1059e78: jal   0x1001b14 addiu a1, s7, 1984
 	ldloc 16
-	ldc.i4 1988
+	ldc.i4 1984
 	add
 	stloc.2
 	ldloc.1
@@ -7080,32 +7080,32 @@ L_1059e2c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01059e70: 0x1059e70: bne   v0, zero, 0x1059eac addu  a0, s0, zero
+// 0x01059e80: 0x1059e80: bne   v0, zero, 0x1059ebc addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_1059eac
+	brtrue L_1059ebc
 // --- basic block ---
-// 0x01059e78: 0x1059e78: jal   0x1044134 sll   zero, zero, 0
+// 0x01059e88: 0x1059e88: jal   0x1044144 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl50::roadmap_prompts_get_name_1044134(int32,int32,int32,int32,int32)
+	call int32 Cibyl50::roadmap_prompts_get_name_1044144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059e80: 0x1059e80: lui   a1, 0x10000
+// 0x01059e90: 0x1059e90: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01059e84: 0x1059e84: addu  a0, v0, zero
+// 0x01059e94: 0x1059e94: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01059e88: 0x1059e88: jal   0x1001b14 addiu a1, a1, -7400
+// 0x01059e98: 0x1059e98: jal   0x1001b14 addiu a1, a1, -7404
 	ldloc.2
-	ldc.i4 -7400
+	ldc.i4 -7404
 	add
 	stloc.2
 	ldloc.1
@@ -7113,21 +7113,21 @@ L_1059e2c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01059e90: 0x1059e90: beq   v0, zero, 0x1059eac addu  a0, s0, zero
+// 0x01059ea0: 0x1059ea0: beq   v0, zero, 0x1059ebc addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_1059eac
+	brfalse L_1059ebc
 // --- basic block ---
-// 0x01059e98: 0x1059e98: lui   a1, 0x20000
+// 0x01059ea8: 0x1059ea8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01059e9c: 0x1059e9c: addu  a0, s5, zero
+// 0x01059eac: 0x1059eac: addu  a0, s5, zero
 	ldloc 12
 	stloc.1
-// 0x01059ea0: 0x1059ea0: jal   0x1001ac4 addiu a1, a1, -14128
+// 0x01059eb0: 0x1059eb0: jal   0x1001ac4 addiu a1, a1, -13664
 	ldloc.2
-	ldc.i4 -14128
+	ldc.i4 -13664
 	add
 	stloc.2
 	ldloc.1
@@ -7135,153 +7135,153 @@ L_1059e2c:
 	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01059ea8: 0x1059ea8: addu  a0, s0, zero
+// 0x01059eb8: 0x1059eb8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-L_1059eac:
-// 0x01059eac: 0x1059eac: jal   0x10518cc addiu a1, sp, 108
+L_1059ebc:
+// 0x01059ebc: 0x1059ebc: jal   0x10518dc addiu a1, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059eb4: 0x1059eb4: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x01059ec4: 0x1059ec4: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-// 0x01059ebc: 0x1059ebc: addu  a0, s0, zero
+// 0x01059ecc: 0x1059ecc: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-L_1059ec0:
-// 0x01059ec0: 0x1059ec0: jal   0x10518cc addu  a1, v0, zero
+L_1059ed0:
+// 0x01059ed0: 0x1059ed0: jal   0x10518dc addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1059ec8:
-// 0x01059ec8: 0x1059ec8: beq   s1, zero, 0x1059ed8 addu  a0, s0, zero
+L_1059ed8:
+// 0x01059ed8: 0x1059ed8: beq   s1, zero, 0x1059ee8 addu  a0, s0, zero
 	ldloc 11
 	ldloc 9
 	stloc.1
-	brfalse L_1059ed8
+	brfalse L_1059ee8
 // --- basic block ---
-// 0x01059ed0: 0x1059ed0: jal   0x10518cc addu  a1, s1, zero
+// 0x01059ee0: 0x1059ee0: jal   0x10518dc addu  a1, s1, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1059ed8:
-// 0x01059ed8: 0x1059ed8: lb    v0, 0(s2)
+L_1059ee8:
+// 0x01059ee8: 0x1059ee8: lb    v0, 0(s2)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01059edc: 0x1059edc: sll   zero, zero, 0
-// 0x01059ee0: 0x1059ee0: beq   v0, zero, 0x1059ef0 addu  a1, s2, zero
+// 0x01059eec: 0x1059eec: sll   zero, zero, 0
+// 0x01059ef0: 0x1059ef0: beq   v0, zero, 0x1059f00 addu  a1, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brfalse L_1059ef0
+	brfalse L_1059f00
 // --- basic block ---
-// 0x01059ee8: 0x1059ee8: jal   0x10518cc addu  a0, s0, zero
+// 0x01059ef8: 0x1059ef8: jal   0x10518dc addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1059ef0:
-// 0x01059ef0: 0x1059ef0: beq   s1, zero, 0x1059f34 addiu v0, s3, -1
+L_1059f00:
+// 0x01059f00: 0x1059f00: beq   s1, zero, 0x1059f44 addiu v0, s3, -1
 	ldloc 11
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 5
-	brfalse L_1059f34
+	brfalse L_1059f44
 // --- basic block ---
-// 0x01059ef8: 0x1059ef8: sltiu v1, v0, 7
+// 0x01059f08: 0x1059f08: sltiu v1, v0, 7
 	ldloc 5
 	ldc.i4.7
 	clt.un
 	stloc 6
-// 0x01059efc: 0x1059efc: beq   v1, zero, 0x1059f1c lui   v1, 0x20000
+// 0x01059f0c: 0x1059f0c: beq   v1, zero, 0x1059f2c lui   v1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_1059f1c
+	brfalse L_1059f2c
 // --- basic block ---
-// 0x01059f04: 0x1059f04: sll   v0, v0, 2
+// 0x01059f14: 0x1059f14: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01059f08: 0x1059f08: addiu v1, v1, 27964
+// 0x01059f18: 0x1059f18: addiu v1, v1, 28428
 	ldloc 6
-	ldc.i4 27964
+	ldc.i4 28428
 	add
 	stloc 6
-// 0x01059f0c: 0x1059f0c: addu  v0, v0, v1
+// 0x01059f1c: 0x1059f1c: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01059f10: 0x1059f10: lw    a1, 0(v0)
+// 0x01059f20: 0x1059f20: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01059f14: 0x1059f14: j	 0x1059f2c sll   zero, zero, 0
-	br L_1059f2c
+// 0x01059f24: 0x1059f24: j	 0x1059f3c sll   zero, zero, 0
+	br L_1059f3c
 // --- basic block ---
-L_1059f1c:
-// 0x01059f1c: 0x1059f1c: addiu v0, zero, -1
+L_1059f2c:
+// 0x01059f2c: 0x1059f2c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01059f20: 0x1059f20: bne   s3, v0, 0x1059f34 lui   a1, 0x10000
+// 0x01059f30: 0x1059f30: bne   s3, v0, 0x1059f44 lui   a1, 0x10000
 	ldloc 14
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1059f34
+	bne.un L_1059f44
 // --- basic block ---
-// 0x01059f28: 0x1059f28: addiu a1, a1, 9664
+// 0x01059f38: 0x1059f38: addiu a1, a1, 9660
 	ldloc.2
-	ldc.i4 9664
+	ldc.i4 9660
 	add
 	stloc.2
-L_1059f2c:
-// 0x01059f2c: 0x1059f2c: jal   0x10518cc addu  a0, s0, zero
+L_1059f3c:
+// 0x01059f3c: 0x1059f3c: jal   0x10518dc addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1059f34:
-// 0x01059f34: 0x1059f34: jal   0x105195c addu  a0, s0, zero
+L_1059f44:
+// 0x01059f44: 0x1059f44: jal   0x105196c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7289,14 +7289,14 @@ L_1059f34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1059f3c:
-// 0x01059f3c: 0x1059f3c: lw    ra, 252(sp)
-// 0x01059f40: 0x1059f40: lw    s8, 248(sp)
+L_1059f4c:
+// 0x01059f4c: 0x1059f4c: lw    ra, 252(sp)
+// 0x01059f50: 0x1059f50: lw    s8, 248(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7305,7 +7305,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01059f44: 0x1059f44: lw    s7, 244(sp)
+// 0x01059f54: 0x1059f54: lw    s7, 244(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7314,7 +7314,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01059f48: 0x1059f48: lw    s6, 240(sp)
+// 0x01059f58: 0x1059f58: lw    s6, 240(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7323,7 +7323,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01059f4c: 0x1059f4c: lw    s5, 236(sp)
+// 0x01059f5c: 0x1059f5c: lw    s5, 236(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7332,7 +7332,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01059f50: 0x1059f50: lw    s4, 232(sp)
+// 0x01059f60: 0x1059f60: lw    s4, 232(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7341,7 +7341,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01059f54: 0x1059f54: lw    s3, 228(sp)
+// 0x01059f64: 0x1059f64: lw    s3, 228(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7350,7 +7350,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01059f58: 0x1059f58: lw    s2, 224(sp)
+// 0x01059f68: 0x1059f68: lw    s2, 224(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7359,7 +7359,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01059f5c: 0x1059f5c: lw    s1, 220(sp)
+// 0x01059f6c: 0x1059f6c: lw    s1, 220(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7368,7 +7368,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01059f60: 0x1059f60: lw    s0, 216(sp)
+// 0x01059f70: 0x1059f70: lw    s0, 216(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7377,7 +7377,7 @@ L_1059f3c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01059f64: 0x1059f64: jr    ra addiu sp, sp, 256
+// 0x01059f74: 0x1059f74: jr    ra addiu sp, sp, 256
 	ldloc.0
 	ldc.i4 256
 	add
@@ -7387,41 +7387,41 @@ L_1059f3c:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17142980
-	beq  L_10594c4
+	ldc.i4 17142996
+	beq  L_10594d4
 	ldloc 5
-	ldc.i4 17144120
-	beq  L_1059938
+	ldc.i4 17144136
+	beq  L_1059948
 	ldloc 5
-	ldc.i4 17144140
-	beq  L_105994c
+	ldc.i4 17144156
+	beq  L_105995c
 	ldloc 5
-	ldc.i4 17144152
-	beq  L_1059958
+	ldc.i4 17144168
+	beq  L_1059968
 	ldloc 5
-	ldc.i4 17144180
-	beq  L_1059974
+	ldc.i4 17144196
+	beq  L_1059984
 	ldloc 5
-	ldc.i4 17144208
-	beq  L_1059990
+	ldc.i4 17144224
+	beq  L_10599a0
 	ldloc 5
-	ldc.i4 17144228
-	beq  L_10599a4
+	ldc.i4 17144244
+	beq  L_10599b4
 	ldloc 5
-	ldc.i4 17144256
-	beq  L_10599c0
+	ldc.i4 17144272
+	beq  L_10599d0
 	ldloc 5
-	ldc.i4 17144276
-	beq  L_10599d4
+	ldc.i4 17144292
+	beq  L_10599e4
 	ldloc 5
-	ldc.i4 17144300
-	beq  L_10599ec
+	ldc.i4 17144316
+	beq  L_10599fc
 	ldloc 5
-	ldc.i4 17144320
-	beq  L_1059a00
+	ldc.i4 17144336
+	beq  L_1059a10
 	ldloc 5
-	ldc.i4 17144352
-	beq  L_1059a20
+	ldc.i4 17144368
+	beq  L_1059a30
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
diff --git a/converted/Cibyl67.j b/converted/Cibyl67.j
index a31d7d1..a34199e 100644
--- a/converted/Cibyl67.j
+++ b/converted/Cibyl67.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl67::.ctor
 
-.method public static int32 navigate_main_stop_navigation_menu_1059f6c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_stop_navigation_menu_1059f7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -76,25 +76,25 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1059f6c:
-// 0x01059f6c: 0x1059f6c: addiu sp, sp, -24
+L_1059f7c:
+// 0x01059f7c: 0x1059f7c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01059f70: 0x1059f70: sw    ra, 20(sp)
-// 0x01059f74: 0x1059f74: jal   0x105944c sll   zero, zero, 0
+// 0x01059f80: 0x1059f80: sw    ra, 20(sp)
+// 0x01059f84: 0x1059f84: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059f7c: 0x1059f7c: jal   0x1094a94 addu  a0, zero, zero
+// 0x01059f8c: 0x1059f8c: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -102,17 +102,17 @@ L_1059f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059f84: 0x1059f84: lui   a0, 0x1050000
+// 0x01059f94: 0x1059f94: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x01059f88: 0x1059f88: jal   0x104fd00 addiu a0, a0, 26780
+// 0x01059f98: 0x1059f98: jal   0x104fd10 addiu a0, a0, 26796
 	ldloc.1
-	ldc.i4 26780
+	ldc.i4 26796
 	add
 	stloc.1
 	ldloc.0
@@ -120,25 +120,25 @@ L_1059f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01059f90: 0x1059f90: lw    ra, 20(sp)
-// 0x01059f94: 0x1059f94: lui   v0, 0x70000
+// 0x01059fa0: 0x1059fa0: lw    ra, 20(sp)
+// 0x01059fa4: 0x1059fa4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059f98: 0x1059f98: sw    zero, 10360(v0)
+// 0x01059fa8: 0x1059fa8: sw    zero, 10824(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2590
+	ldc.i4 2706
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01059f9c: 0x1059f9c: jr    ra addiu sp, sp, 24
+// 0x01059fac: 0x1059fac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -150,7 +150,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_update_route_1059fa4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_update_route_1059fb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -185,35 +185,35 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1059fa4:
-// 0x01059fa4: 0x1059fa4: lui   v0, 0x70000
+L_1059fb4:
+// 0x01059fb4: 0x1059fb4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059fa8: 0x1059fa8: lw    v0, 9156(v0)
+// 0x01059fb8: 0x1059fb8: lw    v0, 9620(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2289
+	ldc.i4 2405
 	add
 	ldelem.i4
 	stloc 5
-// 0x01059fac: 0x1059fac: addiu sp, sp, -24
+// 0x01059fbc: 0x1059fbc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01059fb0: 0x1059fb0: sw    ra, 20(sp)
-// 0x01059fb4: 0x1059fb4: beq   v0, zero, 0x1059fe8 addu  v1, a0, zero
+// 0x01059fc0: 0x1059fc0: sw    ra, 20(sp)
+// 0x01059fc4: 0x1059fc4: beq   v0, zero, 0x1059ff8 addu  v1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_1059fe8
+	brfalse L_1059ff8
 // --- basic block ---
-// 0x01059fbc: 0x1059fbc: lui   v0, 0x0
+// 0x01059fcc: 0x1059fcc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01059fc0: 0x1059fc0: lw    a0, 14320(v0)
+// 0x01059fd0: 0x1059fd0: lw    a0, 14320(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -222,53 +222,53 @@ L_1059fa4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01059fc4: 0x1059fc4: lui   v0, 0x70000
+// 0x01059fd4: 0x1059fd4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059fc8: 0x1059fc8: sw    v1, 10288(v0)
+// 0x01059fd8: 0x1059fd8: sw    v1, 10752(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2572
+	ldc.i4 2688
 	add
 	ldloc 7
 	stelem.i4
-// 0x01059fcc: 0x1059fcc: addiu v0, zero, -1
+// 0x01059fdc: 0x1059fdc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01059fd0: 0x1059fd0: beq   a0, v0, 0x1059fe0 sll   zero, zero, 0
+// 0x01059fe0: 0x1059fe0: beq   a0, v0, 0x1059ff0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1059fe0
+	beq  L_1059ff0
 // --- basic block ---
-// 0x01059fd8: 0x1059fd8: jal   0x1057214 sll   zero, zero, 0
+// 0x01059fe8: 0x1059fe8: jal   0x1057224 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_display_street_1057214(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_display_street_1057224(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1059fe0:
-// 0x01059fe0: 0x1059fe0: jal   0x1021900 sll   zero, zero, 0
+L_1059ff0:
+// 0x01059ff0: 0x1059ff0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1059fe8:
-// 0x01059fe8: 0x1059fe8: lw    ra, 20(sp)
-// 0x01059fec: 0x1059fec: sll   zero, zero, 0
-// 0x01059ff0: 0x1059ff0: jr    ra addiu sp, sp, 24
+L_1059ff8:
+// 0x01059ff8: 0x1059ff8: lw    ra, 20(sp)
+// 0x01059ffc: 0x1059ffc: sll   zero, zero, 0
+// 0x0105a000: 0x105a000: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -280,7 +280,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_update_next_1059ff8(int32,int32,int32,int32,int32)
+.method public static int32 navigate_update_next_105a008(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 t4,int32 t2,int32 v1,int32 t3,int32 lo,int32 s0,int32 t6,int32 t0,int32 t1,int32 t7,int32 t5,int32 ra,int32 t8)
@@ -348,131 +348,131 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01059ff8: 0x1059ff8: lui   v0, 0x70000
+// 0x0105a008: 0x105a008: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01059ffc: 0x1059ffc: lw    a0, 9164(v0)
+// 0x0105a00c: 0x105a00c: lw    a0, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a000: 0x105a000: lui   v0, 0x70000
+// 0x0105a010: 0x105a010: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a004: 0x105a004: lw    a1, 9176(v0)
+// 0x0105a014: 0x105a014: lw    a1, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a008: 0x105a008: lui   v0, 0x70000
+// 0x0105a018: 0x105a018: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a00c: 0x105a00c: lw    v1, 9172(v0)
+// 0x0105a01c: 0x105a01c: lw    v1, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105a010: 0x105a010: addu  t3, a1, a0
+// 0x0105a020: 0x105a020: addu  t3, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc 10
-// 0x0105a014: 0x105a014: addiu a3, zero, 56
+// 0x0105a024: 0x105a024: addiu a3, zero, 56
 	ldc.i4.s 56
 	stloc 4
-// 0x0105a018: 0x105a018: addiu t2, t3, 1
+// 0x0105a028: 0x105a028: addiu t2, t3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0105a01c: 0x105a01c: subu  t3, t3, v1
+// 0x0105a02c: 0x105a02c: subu  t3, t3, v1
 	ldloc 10
 	ldloc 9
 	sub
 	stloc 10
-// 0x0105a020: 0x105a020: mult  t3, a3
+// 0x0105a030: 0x105a030: mult  t3, a3
 	ldloc 10
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a024: 0x105a024: subu  t2, t2, v1
+// 0x0105a034: 0x105a034: subu  t2, t2, v1
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 8
-// 0x0105a028: 0x105a028: addiu v0, a0, 1
+// 0x0105a038: 0x105a038: addiu v0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0105a02c: 0x105a02c: lui   a2, 0x70000
+// 0x0105a03c: 0x105a03c: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x0105a030: 0x105a030: lw    t1, 9168(a2)
+// 0x0105a040: 0x105a040: lw    t1, 9632(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105a034: 0x105a034: lui   t0, 0x70000
+// 0x0105a044: 0x105a044: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 14
-// 0x0105a038: 0x105a038: lui   a2, 0x70000
+// 0x0105a048: 0x105a048: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x0105a03c: 0x105a03c: lw    a2, 10724(a2)
+// 0x0105a04c: 0x105a04c: lw    a2, 11188(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105a040: 0x105a040: lw    t0, 10720(t0)
+// 0x0105a050: 0x105a050: lw    t0, 11184(t0)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105a044: 0x105a044: addu  t1, v1, t1
+// 0x0105a054: 0x105a054: addu  t1, v1, t1
 	ldloc 9
 	ldloc 15
 	add
 	stloc 15
-// 0x0105a048: 0x105a048: addiu sp, sp, -24
+// 0x0105a058: 0x105a058: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105a04c: 0x105a04c: subu  t1, t1, a1
+// 0x0105a05c: 0x105a05c: subu  t1, t1, a1
 	ldloc 15
 	ldloc.2
 	sub
 	stloc 15
-// 0x0105a050: 0x105a050: sw    ra, 20(sp)
-// 0x0105a054: 0x105a054: mflo  lo
+// 0x0105a060: 0x105a060: sw    ra, 20(sp)
+// 0x0105a064: 0x105a064: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x0105a058: 0x105a058: sw    s0, 16(sp)
+// 0x0105a068: 0x105a068: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -481,407 +481,407 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105a05c: 0x105a05c: addiu t1, t1, -1
+// 0x0105a06c: 0x105a06c: addiu t1, t1, -1
 	ldloc 15
 	ldc.i4.m1
 	add
 	stloc 15
-// 0x0105a060: 0x105a060: addiu t5, zero, 1
+// 0x0105a070: 0x105a070: addiu t5, zero, 1
 	ldc.i4.1
 	stloc 17
-// 0x0105a064: 0x105a064: mult  t2, a3
+// 0x0105a074: 0x105a074: mult  t2, a3
 	ldloc 8
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a068: 0x105a068: addu  t3, t0, t3
+// 0x0105a078: 0x105a078: addu  t3, t0, t3
 	ldloc 14
 	ldloc 10
 	add
 	stloc 10
-// 0x0105a06c: 0x105a06c: mflo  lo
+// 0x0105a07c: 0x105a07c: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x0105a070: 0x105a070: addu  t2, t0, t2
+// 0x0105a080: 0x105a080: addu  t2, t0, t2
 	ldloc 14
 	ldloc 8
 	add
 	stloc 8
-// 0x0105a074: 0x105a074: sll   zero, zero, 0
-// 0x0105a078: 0x105a078: mult  v0, a3
+// 0x0105a084: 0x105a084: sll   zero, zero, 0
+// 0x0105a088: 0x105a088: mult  v0, a3
 	ldloc 5
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a07c: 0x105a07c: mflo  lo
+// 0x0105a08c: 0x105a08c: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0105a080: 0x105a080: addu  t4, a2, t4
+// 0x0105a090: 0x105a090: addu  t4, a2, t4
 	ldloc.3
 	ldloc 7
 	add
 	stloc 7
-// 0x0105a084: 0x105a084: sll   zero, zero, 0
-// 0x0105a088: 0x105a088: mult  a0, a3
+// 0x0105a094: 0x105a094: sll   zero, zero, 0
+// 0x0105a098: 0x105a098: mult  a0, a3
 	ldloc.1
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a08c: 0x105a08c: mflo  lo
+// 0x0105a09c: 0x105a09c: mflo  lo
 	ldloc 11
 	stloc 4
-// 0x0105a090: 0x105a090: j	 0x105a0e8 addu  a3, a2, a3
+// 0x0105a0a0: 0x105a0a0: j	 0x105a0f8 addu  a3, a2, a3
 	ldloc.3
 	ldloc 4
 	add
 	stloc 4
-	br L_105a0e8
+	br L_105a0f8
 // --- basic block ---
-L_105a098:
-// 0x0105a098: 0x105a098: addiu a0, a0, 1
+L_105a0a8:
+// 0x0105a0a8: 0x105a0a8: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0105a09c: 0x105a09c: beq   t8, zero, 0x105a0a8 addu  s0, t3, zero
+// 0x0105a0ac: 0x105a0ac: beq   t8, zero, 0x105a0b8 addu  s0, t3, zero
 	ldloc 19
 	ldloc 10
 	stloc 12
-	brfalse L_105a0a8
+	brfalse L_105a0b8
 // --- basic block ---
-// 0x0105a0a4: 0x105a0a4: addu  s0, a3, zero
+// 0x0105a0b4: 0x105a0b4: addu  s0, a3, zero
 	ldloc 4
 	stloc 12
-L_105a0a8:
-// 0x0105a0a8: 0x105a0a8: lb    t6, 52(s0)
+L_105a0b8:
+// 0x0105a0b8: 0x105a0b8: lb    t6, 52(s0)
 	ldloc 12
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 13
-// 0x0105a0ac: 0x105a0ac: sll   zero, zero, 0
-// 0x0105a0b0: 0x105a0b0: beq   t6, t5, 0x105a0d8 addiu a3, a3, 56
+// 0x0105a0bc: 0x105a0bc: sll   zero, zero, 0
+// 0x0105a0c0: 0x105a0c0: beq   t6, t5, 0x105a0e8 addiu a3, a3, 56
 	ldloc 13
 	ldloc 17
 	ldloc 4
 	ldc.i4.s 56
 	add
 	stloc 4
-	beq  L_105a0d8
+	beq  L_105a0e8
 // --- basic block ---
-// 0x0105a0b8: 0x105a0b8: beq   t7, zero, 0x105a0c4 addu  t6, t2, zero
+// 0x0105a0c8: 0x105a0c8: beq   t7, zero, 0x105a0d4 addu  t6, t2, zero
 	ldloc 16
 	ldloc 8
 	stloc 13
-	brfalse L_105a0c4
+	brfalse L_105a0d4
 // --- basic block ---
-// 0x0105a0c0: 0x105a0c0: addu  t6, t4, zero
+// 0x0105a0d0: 0x105a0d0: addu  t6, t4, zero
 	ldloc 7
 	stloc 13
-L_105a0c4:
-// 0x0105a0c4: 0x105a0c4: lh    t6, 44(t6)
+L_105a0d4:
+// 0x0105a0d4: 0x105a0d4: lh    t6, 44(t6)
 	ldloc 13
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 13
-// 0x0105a0c8: 0x105a0c8: lh    t7, 44(s0)
+// 0x0105a0d8: 0x105a0d8: lh    t7, 44(s0)
 	ldloc 12
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 16
-// 0x0105a0cc: 0x105a0cc: sll   zero, zero, 0
-// 0x0105a0d0: 0x105a0d0: bne   t7, t6, 0x105a100 sll   zero, zero, 0
+// 0x0105a0dc: 0x105a0dc: sll   zero, zero, 0
+// 0x0105a0e0: 0x105a0e0: bne   t7, t6, 0x105a110 sll   zero, zero, 0
 	ldloc 16
 	ldloc 13
-	bne.un L_105a100
+	bne.un L_105a110
 // --- basic block ---
-L_105a0d8:
-// 0x0105a0d8: 0x105a0d8: addiu v0, v0, 1
+L_105a0e8:
+// 0x0105a0e8: 0x105a0e8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0105a0dc: 0x105a0dc: addiu t4, t4, 56
+// 0x0105a0ec: 0x105a0ec: addiu t4, t4, 56
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc 7
-// 0x0105a0e0: 0x105a0e0: addiu t2, t2, 56
+// 0x0105a0f0: 0x105a0f0: addiu t2, t2, 56
 	ldloc 8
 	ldc.i4.s 56
 	add
 	stloc 8
-// 0x0105a0e4: 0x105a0e4: addiu t3, t3, 56
+// 0x0105a0f4: 0x105a0f4: addiu t3, t3, 56
 	ldloc 10
 	ldc.i4.s 56
 	add
 	stloc 10
-L_105a0e8:
-// 0x0105a0e8: 0x105a0e8: slt   t6, a0, t1
+L_105a0f8:
+// 0x0105a0f8: 0x105a0f8: slt   t6, a0, t1
 	ldloc.1
 	ldloc 15
 	clt
 	stloc 13
-// 0x0105a0ec: 0x105a0ec: slt   t8, a0, v1
+// 0x0105a0fc: 0x105a0fc: slt   t8, a0, v1
 	ldloc.1
 	ldloc 9
 	clt
 	stloc 19
-// 0x0105a0f0: 0x105a0f0: bne   t6, zero, 0x105a098 slt   t7, v0, v1
+// 0x0105a100: 0x105a100: bne   t6, zero, 0x105a0a8 slt   t7, v0, v1
 	ldloc 13
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 16
-	brtrue L_105a098
+	brtrue L_105a0a8
 // --- basic block ---
-// 0x0105a0f8: 0x105a0f8: j	 0x105a224 addiu v1, zero, 16
+// 0x0105a108: 0x105a108: j	 0x105a234 addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 9
-	br L_105a224
+	br L_105a234
 // --- basic block ---
-L_105a100:
-// 0x0105a100: 0x105a100: subu  t2, a1, v1
+L_105a110:
+// 0x0105a110: 0x105a110: subu  t2, a1, v1
 	ldloc.2
 	ldloc 9
 	sub
 	stloc 8
-// 0x0105a104: 0x105a104: addiu a3, zero, 56
+// 0x0105a114: 0x105a114: addiu a3, zero, 56
 	ldc.i4.s 56
 	stloc 4
-// 0x0105a108: 0x105a108: addu  t2, t2, v0
+// 0x0105a118: 0x105a118: addu  t2, t2, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0105a10c: 0x105a10c: mult  t2, a3
+// 0x0105a11c: 0x105a11c: mult  t2, a3
 	ldloc 8
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a110: 0x105a110: addiu t4, a1, 1
+// 0x0105a120: 0x105a120: addiu t4, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0105a114: 0x105a114: subu  t4, t4, v1
+// 0x0105a124: 0x105a124: subu  t4, t4, v1
 	ldloc 7
 	ldloc 9
 	sub
 	stloc 7
-// 0x0105a118: 0x105a118: addu  t4, t4, v0
+// 0x0105a128: 0x105a128: addu  t4, t4, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0105a11c: 0x105a11c: addiu a1, v0, 1
+// 0x0105a12c: 0x105a12c: addiu a1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0105a120: 0x105a120: addu  a0, zero, zero
+// 0x0105a130: 0x105a130: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105a124: 0x105a124: addiu t5, zero, 1
+// 0x0105a134: 0x105a134: addiu t5, zero, 1
 	ldc.i4.1
 	stloc 17
-// 0x0105a128: 0x105a128: mflo  lo
+// 0x0105a138: 0x105a138: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x0105a12c: 0x105a12c: addu  t2, t0, t2
+// 0x0105a13c: 0x105a13c: addu  t2, t0, t2
 	ldloc 14
 	ldloc 8
 	add
 	stloc 8
-// 0x0105a130: 0x105a130: sll   zero, zero, 0
-// 0x0105a134: 0x105a134: mult  t4, a3
+// 0x0105a140: 0x105a140: sll   zero, zero, 0
+// 0x0105a144: 0x105a144: mult  t4, a3
 	ldloc 7
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a138: 0x105a138: mflo  lo
+// 0x0105a148: 0x105a148: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0105a13c: 0x105a13c: addu  t0, t0, t4
+// 0x0105a14c: 0x105a14c: addu  t0, t0, t4
 	ldloc 14
 	ldloc 7
 	add
 	stloc 14
-// 0x0105a140: 0x105a140: sll   zero, zero, 0
-// 0x0105a144: 0x105a144: mult  a1, a3
+// 0x0105a150: 0x105a150: sll   zero, zero, 0
+// 0x0105a154: 0x105a154: mult  a1, a3
 	ldloc.2
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a148: 0x105a148: mflo  lo
+// 0x0105a158: 0x105a158: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x0105a14c: 0x105a14c: addu  t3, a2, t3
+// 0x0105a15c: 0x105a15c: addu  t3, a2, t3
 	ldloc.3
 	ldloc 10
 	add
 	stloc 10
-// 0x0105a150: 0x105a150: sll   zero, zero, 0
-// 0x0105a154: 0x105a154: mult  v0, a3
+// 0x0105a160: 0x105a160: sll   zero, zero, 0
+// 0x0105a164: 0x105a164: mult  v0, a3
 	ldloc 5
 	ldloc 4
 	mul
 	stloc 11
-// 0x0105a158: 0x105a158: mflo  lo
+// 0x0105a168: 0x105a168: mflo  lo
 	ldloc 11
 	stloc 4
-// 0x0105a15c: 0x105a15c: j	 0x105a1bc addu  a2, a2, a3
+// 0x0105a16c: 0x105a16c: j	 0x105a1cc addu  a2, a2, a3
 	ldloc.3
 	ldloc 4
 	add
 	stloc.3
-	br L_105a1bc
+	br L_105a1cc
 // --- basic block ---
-L_105a164:
-// 0x0105a164: 0x105a164: addiu v0, v0, 1
+L_105a174:
+// 0x0105a174: 0x105a174: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0105a168: 0x105a168: beq   t7, zero, 0x105a174 addu  s0, t2, zero
+// 0x0105a178: 0x105a178: beq   t7, zero, 0x105a184 addu  s0, t2, zero
 	ldloc 16
 	ldloc 8
 	stloc 12
-	brfalse L_105a174
+	brfalse L_105a184
 // --- basic block ---
-// 0x0105a170: 0x105a170: addu  s0, a2, zero
+// 0x0105a180: 0x105a180: addu  s0, a2, zero
 	ldloc.3
 	stloc 12
-L_105a174:
-// 0x0105a174: 0x105a174: lb    a3, 52(s0)
+L_105a184:
+// 0x0105a184: 0x105a184: lb    a3, 52(s0)
 	ldloc 12
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x0105a178: 0x105a178: sll   zero, zero, 0
-// 0x0105a17c: 0x105a17c: beq   a3, t5, 0x105a1ac addiu a2, a2, 56
+// 0x0105a188: 0x105a188: sll   zero, zero, 0
+// 0x0105a18c: 0x105a18c: beq   a3, t5, 0x105a1bc addiu a2, a2, 56
 	ldloc 4
 	ldloc 17
 	ldloc.3
 	ldc.i4.s 56
 	add
 	stloc.3
-	beq  L_105a1ac
+	beq  L_105a1bc
 // --- basic block ---
-// 0x0105a184: 0x105a184: addu  t4, t0, zero
+// 0x0105a194: 0x105a194: addu  t4, t0, zero
 	ldloc 14
 	stloc 7
-// 0x0105a188: 0x105a188: beq   t6, zero, 0x105a194 addu  a3, a1, zero
+// 0x0105a198: 0x105a198: beq   t6, zero, 0x105a1a4 addu  a3, a1, zero
 	ldloc 13
 	ldloc.2
 	stloc 4
-	brfalse L_105a194
+	brfalse L_105a1a4
 // --- basic block ---
-// 0x0105a190: 0x105a190: addu  t4, t3, zero
+// 0x0105a1a0: 0x105a1a0: addu  t4, t3, zero
 	ldloc 10
 	stloc 7
-L_105a194:
-// 0x0105a194: 0x105a194: lh    t7, 46(s0)
+L_105a1a4:
+// 0x0105a1a4: 0x105a1a4: lh    t7, 46(s0)
 	ldloc 12
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 16
-// 0x0105a198: 0x105a198: lh    t4, 44(t4)
+// 0x0105a1a8: 0x105a1a8: lh    t4, 44(t4)
 	ldloc 7
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x0105a19c: 0x105a19c: lh    t6, 44(s0)
+// 0x0105a1ac: 0x105a1ac: lh    t6, 44(s0)
 	ldloc 12
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 13
-// 0x0105a1a0: 0x105a1a0: sll   zero, zero, 0
-// 0x0105a1a4: 0x105a1a4: bne   t6, t4, 0x105a1d0 addu  a0, a0, t7
+// 0x0105a1b0: 0x105a1b0: sll   zero, zero, 0
+// 0x0105a1b4: 0x105a1b4: bne   t6, t4, 0x105a1e0 addu  a0, a0, t7
 	ldloc 13
 	ldloc 7
 	ldloc.1
 	ldloc 16
 	add
 	stloc.1
-	bne.un L_105a1d0
+	bne.un L_105a1e0
 // --- basic block ---
-L_105a1ac:
-// 0x0105a1ac: 0x105a1ac: addiu a1, a1, 1
+L_105a1bc:
+// 0x0105a1bc: 0x105a1bc: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0105a1b0: 0x105a1b0: addiu t3, t3, 56
+// 0x0105a1c0: 0x105a1c0: addiu t3, t3, 56
 	ldloc 10
 	ldc.i4.s 56
 	add
 	stloc 10
-// 0x0105a1b4: 0x105a1b4: addiu t0, t0, 56
+// 0x0105a1c4: 0x105a1c4: addiu t0, t0, 56
 	ldloc 14
 	ldc.i4.s 56
 	add
 	stloc 14
-// 0x0105a1b8: 0x105a1b8: addiu t2, t2, 56
+// 0x0105a1c8: 0x105a1c8: addiu t2, t2, 56
 	ldloc 8
 	ldc.i4.s 56
 	add
 	stloc 8
-L_105a1bc:
-// 0x0105a1bc: 0x105a1bc: slt   t4, v0, t1
+L_105a1cc:
+// 0x0105a1cc: 0x105a1cc: slt   t4, v0, t1
 	ldloc 5
 	ldloc 15
 	clt
 	stloc 7
-// 0x0105a1c0: 0x105a1c0: slt   t7, v0, v1
+// 0x0105a1d0: 0x105a1d0: slt   t7, v0, v1
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 16
-// 0x0105a1c4: 0x105a1c4: slt   t6, a1, v1
+// 0x0105a1d4: 0x105a1d4: slt   t6, a1, v1
 	ldloc.2
 	ldloc 9
 	clt
 	stloc 13
-// 0x0105a1c8: 0x105a1c8: bne   t4, zero, 0x105a164 addu  a3, v0, zero
+// 0x0105a1d8: 0x105a1d8: bne   t4, zero, 0x105a174 addu  a3, v0, zero
 	ldloc 7
 	ldloc 5
 	stloc 4
-	brtrue L_105a164
+	brtrue L_105a174
 // --- basic block ---
-L_105a1d0:
-// 0x0105a1d0: 0x105a1d0: slti  v0, a0, 200
+L_105a1e0:
+// 0x0105a1e0: 0x105a1e0: slti  v0, a0, 200
 	ldloc.1
 	ldc.i4 200
 	clt
 	stloc 5
-// 0x0105a1d4: 0x105a1d4: beq   v0, zero, 0x105a220 lui   v0, 0x0
+// 0x0105a1e4: 0x105a1e4: beq   v0, zero, 0x105a230 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_105a220
+	brfalse L_105a230
 // --- basic block ---
-// 0x0105a1dc: 0x105a1dc: beq   a3, t1, 0x105a1e8 addiu v1, zero, 16
+// 0x0105a1ec: 0x105a1ec: beq   a3, t1, 0x105a1f8 addiu v1, zero, 16
 	ldloc 4
 	ldloc 15
 	ldc.i4.s 16
 	stloc 9
-	beq  L_105a1e8
+	beq  L_105a1f8
 // --- basic block ---
-// 0x0105a1e4: 0x105a1e4: lb    v1, 54(s0)
+// 0x0105a1f4: 0x105a1f4: lb    v1, 54(s0)
 	ldloc 12
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-L_105a1e8:
-// 0x0105a1e8: 0x105a1e8: jal   0x105e2d8 sw    v1, 14324(v0)
+L_105a1f8:
+// 0x0105a1f8: 0x105a1f8: jal   0x105e2e8 sw    v1, 14324(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -891,61 +891,61 @@ L_105a1e8:
 	ldloc 9
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_next_distance_105e2d8(int32)
+	call int32 Cibyl70::navigate_bar_set_next_distance_105e2e8(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105a1f0: 0x105a1f0: lbu   v0, 54(s0)
+// 0x0105a200: 0x105a200: lbu   v0, 54(s0)
 	ldloc 12
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0105a1f4: 0x105a1f4: sll   zero, zero, 0
-// 0x0105a1f8: 0x105a1f8: addiu v0, v0, -5
+// 0x0105a204: 0x105a204: sll   zero, zero, 0
+// 0x0105a208: 0x105a208: addiu v0, v0, -5
 	ldloc 5
 	ldc.i4.s -5
 	add
 	stloc 5
-// 0x0105a1fc: 0x105a1fc: andi  v0, v0, 255
+// 0x0105a20c: 0x105a20c: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x0105a200: 0x105a200: sltiu v0, v0, 2
+// 0x0105a210: 0x105a210: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x0105a204: 0x105a204: beq   v0, zero, 0x105a210 addiu a0, zero, -1
+// 0x0105a214: 0x105a214: beq   v0, zero, 0x105a220 addiu a0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc.1
-	brfalse L_105a210
+	brfalse L_105a220
 // --- basic block ---
-// 0x0105a20c: 0x105a20c: lb    a0, 53(s0)
+// 0x0105a21c: 0x105a21c: lb    a0, 53(s0)
 	ldloc 12
 	ldc.i4.s 53
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-L_105a210:
-// 0x0105a210: 0x105a210: jal   0x105e2c0 sll   zero, zero, 0
+L_105a220:
+// 0x0105a220: 0x105a220: jal   0x105e2d0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_next_exit_105e2c0(int32)
+	call int32 Cibyl70::navigate_bar_set_next_exit_105e2d0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105a218: 0x105a218: j	 0x105a22c sll   zero, zero, 0
-	br L_105a22c
+// 0x0105a228: 0x105a228: j	 0x105a23c sll   zero, zero, 0
+	br L_105a23c
 // --- basic block ---
-L_105a220:
-// 0x0105a220: 0x105a220: addiu v1, zero, 16
+L_105a230:
+// 0x0105a230: 0x105a230: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 9
-L_105a224:
-// 0x0105a224: 0x105a224: lui   v0, 0x0
+L_105a234:
+// 0x0105a234: 0x105a234: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105a228: 0x105a228: sw    v1, 14324(v0)
+// 0x0105a238: 0x105a238: sw    v1, 14324(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -954,9 +954,9 @@ L_105a224:
 	add
 	ldloc 9
 	stelem.i4
-L_105a22c:
-// 0x0105a22c: 0x105a22c: lw    ra, 20(sp)
-// 0x0105a230: 0x105a230: lw    s0, 16(sp)
+L_105a23c:
+// 0x0105a23c: 0x105a23c: lw    ra, 20(sp)
+// 0x0105a240: 0x105a240: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -965,7 +965,7 @@ L_105a22c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105a234: 0x105a234: jr    ra addiu sp, sp, 24
+// 0x0105a244: 0x105a244: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -977,7 +977,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_get_distance_str_105a23c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_get_distance_str_105a24c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s4,int32 hi,int32 lo,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -1033,12 +1033,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105a23c: 0x105a23c: addiu sp, sp, -56
+// 0x0105a24c: 0x105a24c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0105a240: 0x105a240: sw    s4, 48(sp)
+// 0x0105a250: 0x105a250: sw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1047,7 +1047,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105a244: 0x105a244: sw    s2, 40(sp)
+// 0x0105a254: 0x105a254: sw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1056,7 +1056,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105a248: 0x105a248: sw    s1, 36(sp)
+// 0x0105a258: 0x105a258: sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1065,7 +1065,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105a24c: 0x105a24c: sw    s0, 32(sp)
+// 0x0105a25c: 0x105a25c: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1074,11 +1074,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105a250: 0x105a250: sw    ra, 52(sp)
-// 0x0105a254: 0x105a254: addu  s0, a1, zero
+// 0x0105a260: 0x105a260: sw    ra, 52(sp)
+// 0x0105a264: 0x105a264: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0105a258: 0x105a258: sw    s3, 44(sp)
+// 0x0105a268: 0x105a268: sw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1087,13 +1087,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105a25c: 0x105a25c: addu  s2, a3, zero
+// 0x0105a26c: 0x105a26c: addu  s2, a3, zero
 	ldloc 4
 	stloc 13
-// 0x0105a260: 0x105a260: addu  s4, a0, zero
+// 0x0105a270: 0x105a270: addu  s4, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0105a264: 0x105a264: lw    s1, 72(sp)
+// 0x0105a274: 0x105a274: lw    s1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1102,7 +1102,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105a268: 0x105a268: jal   0x1007df4 sw    a2, 28(sp)
+// 0x0105a278: 0x105a278: jal   0x1007e04 sw    a2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1112,10 +1112,10 @@ __CIBYL_javamethod_begin:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105a270: 0x105a270: lw    a1, 28(sp)
+// 0x0105a280: 0x105a280: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1124,14 +1124,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a274: 0x105a274: blez  v0, 0x105a2dc addu  a0, s4, zero
+// 0x0105a284: 0x105a284: blez  v0, 0x105a2ec addu  a0, s4, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
 	ldc.i4.s 0
-	ble L_105a2dc
+	ble L_105a2ec
 // --- basic block ---
-// 0x0105a27c: 0x105a27c: jal   0x1007e18 sw    v0, 24(sp)
+// 0x0105a28c: 0x105a28c: jal   0x1007e28 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1141,12 +1141,12 @@ __CIBYL_javamethod_begin:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a284: 0x105a284: lw    a3, 24(sp)
+// 0x0105a294: 0x105a294: lw    a3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1155,7 +1155,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105a288: 0x105a288: lw    a1, 28(sp)
+// 0x0105a298: 0x105a298: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1164,21 +1164,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a28c: 0x105a28c: slti  v1, a3, 10
+// 0x0105a29c: 0x105a29c: slti  v1, a3, 10
 	ldloc 4
 	ldc.i4.s 10
 	clt
 	stloc 7
-// 0x0105a290: 0x105a290: beq   v1, zero, 0x105a2c0 lui   a2, 0x20000
+// 0x0105a2a0: 0x105a2a0: beq   v1, zero, 0x105a2d0 lui   a2, 0x10000
 	ldloc 7
-	ldc.i4 131072
+	ldc.i4 65536
 	stloc.3
-	brfalse L_105a2c0
+	brfalse L_105a2d0
 // --- basic block ---
-// 0x0105a298: 0x105a298: addiu v1, zero, 10
+// 0x0105a2a8: 0x105a2a8: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 7
-// 0x0105a29c: 0x105a29c: div   v0, v1
+// 0x0105a2ac: 0x105a2ac: div   v0, v1
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -1187,21 +1187,21 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	rem
 	stloc 10
-// 0x0105a2a0: 0x105a2a0: lui   a2, 0x10000
+// 0x0105a2b0: 0x105a2b0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105a2a4: 0x105a2a4: addu  a0, s0, zero
+// 0x0105a2b4: 0x105a2b4: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a2a8: 0x105a2a8: addiu a2, a2, 8928
+// 0x0105a2b8: 0x105a2b8: addiu a2, a2, 8924
 	ldloc.3
-	ldc.i4 8928
+	ldc.i4 8924
 	add
 	stloc.3
-// 0x0105a2ac: 0x105a2ac: mfhi  hi
+// 0x0105a2bc: 0x105a2bc: mfhi  hi
 	ldloc 10
 	stloc 5
-// 0x0105a2b0: 0x105a2b0: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0105a2c0: 0x105a2c0: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1220,16 +1220,16 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a2b8: 0x105a2b8: j	 0x105a2cc sll   zero, zero, 0
-	br L_105a2cc
+// 0x0105a2c8: 0x105a2c8: j	 0x105a2dc sll   zero, zero, 0
+	br L_105a2dc
 // --- basic block ---
-L_105a2c0:
-// 0x0105a2c0: 0x105a2c0: addu  a0, s0, zero
+L_105a2d0:
+// 0x0105a2d0: 0x105a2d0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a2c4: 0x105a2c4: jal   0x1000f9c addiu a2, a2, -13884
+// 0x0105a2d4: 0x105a2d4: jal   0x1000f9c addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
 	ldloc.0
@@ -1242,16 +1242,16 @@ L_105a2c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105a2cc:
-// 0x0105a2cc: 0x105a2cc: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+L_105a2dc:
+// 0x0105a2dc: 0x105a2dc: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0105a2d4: 0x105a2d4: j	 0x105a3b4 sll   zero, zero, 0
-	br L_105a3b4
+// 0x0105a2e4: 0x105a2e4: j	 0x105a3c4 sll   zero, zero, 0
+	br L_105a3c4
 // --- basic block ---
-L_105a2dc:
-// 0x0105a2dc: 0x105a2dc: jal   0x1008478 sw    a1, 28(sp)
+L_105a2ec:
+// 0x0105a2ec: 0x105a2ec: jal   0x1008488 sw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1260,10 +1260,10 @@ L_105a2dc:
 	add
 	ldloc.2
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_is_metric_1008478()
+	call int32 Cibyl5::roadmap_math_is_metric_1008488()
 	stloc 5
 // --- basic block ---
-// 0x0105a2e4: 0x105a2e4: lw    a1, 28(sp)
+// 0x0105a2f4: 0x105a2f4: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1272,22 +1272,22 @@ L_105a2dc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a2e8: 0x105a2e8: bne   v0, zero, 0x105a38c addu  a0, s4, zero
+// 0x0105a2f8: 0x105a2f8: bne   v0, zero, 0x105a39c addu  a0, s4, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_105a38c
+	brtrue L_105a39c
 // --- basic block ---
-// 0x0105a2f0: 0x105a2f0: jal   0x1007e18 addu  a0, s4, zero
+// 0x0105a300: 0x105a300: jal   0x1007e28 addu  a0, s4, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a2f8: 0x105a2f8: lw    a1, 28(sp)
+// 0x0105a308: 0x105a308: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1296,17 +1296,17 @@ L_105a2dc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a2fc: 0x105a2fc: blez  v0, 0x105a330 lui   s3, 0x10000
+// 0x0105a30c: 0x105a30c: blez  v0, 0x105a340 lui   s3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 14
 	ldc.i4.s 0
-	ble L_105a330
+	ble L_105a340
 // --- basic block ---
-// 0x0105a304: 0x105a304: addiu a3, zero, 10
+// 0x0105a314: 0x105a314: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x0105a308: 0x105a308: div   v0, a3
+// 0x0105a318: 0x105a318: div   v0, a3
 	ldloc 5
 	ldloc 4
 	ldloc 5
@@ -1315,18 +1315,18 @@ L_105a2dc:
 	stloc 11
 	rem
 	stloc 10
-// 0x0105a30c: 0x105a30c: lui   a2, 0x10000
+// 0x0105a31c: 0x105a31c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105a310: 0x105a310: addiu a2, a2, 9672
+// 0x0105a320: 0x105a320: addiu a2, a2, 9668
 	ldloc.3
-	ldc.i4 9672
+	ldc.i4 9668
 	add
 	stloc.3
-// 0x0105a314: 0x105a314: mfhi  hi
+// 0x0105a324: 0x105a324: mfhi  hi
 	ldloc 10
 	stloc 4
-// 0x0105a318: 0x105a318: jal   0x1000f9c addu  a0, s0, zero
+// 0x0105a328: 0x105a328: jal   0x1000f9c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1339,18 +1339,18 @@ L_105a2dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a320: 0x105a320: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x0105a330: 0x105a330: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0105a328: 0x105a328: j	 0x105a374 sll   zero, zero, 0
-	br L_105a374
+// 0x0105a338: 0x105a338: j	 0x105a384 sll   zero, zero, 0
+	br L_105a384
 // --- basic block ---
-L_105a330:
-// 0x0105a330: 0x105a330: addu  a0, s4, zero
+L_105a340:
+// 0x0105a340: 0x105a340: addu  a0, s4, zero
 	ldloc 9
 	stloc.1
-// 0x0105a334: 0x105a334: jal   0x1007db4 sw    a1, 28(sp)
+// 0x0105a344: 0x105a344: jal   0x1007dc4 sw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1364,15 +1364,15 @@ L_105a330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a33c: 0x105a33c: addiu v1, zero, 25
+// 0x0105a34c: 0x105a34c: addiu v1, zero, 25
 	ldc.i4.s 25
 	stloc 7
-// 0x0105a340: 0x105a340: div   v0, v1
+// 0x0105a350: 0x105a350: div   v0, v1
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -1381,10 +1381,10 @@ L_105a330:
 	stloc 11
 	rem
 	stloc 10
-// 0x0105a344: 0x105a344: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x0105a354: 0x105a354: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0105a348: 0x105a348: lw    a1, 28(sp)
+// 0x0105a358: 0x105a358: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1393,25 +1393,25 @@ L_105a330:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a34c: 0x105a34c: addiu a2, a2, -13884
+// 0x0105a35c: 0x105a35c: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0105a350: 0x105a350: mflo  lo
+// 0x0105a360: 0x105a360: mflo  lo
 	ldloc 11
 	stloc 4
-// 0x0105a354: 0x105a354: sll   zero, zero, 0
-// 0x0105a358: 0x105a358: sll   zero, zero, 0
-// 0x0105a35c: 0x105a35c: mult  a3, v1
+// 0x0105a364: 0x105a364: sll   zero, zero, 0
+// 0x0105a368: 0x105a368: sll   zero, zero, 0
+// 0x0105a36c: 0x105a36c: mult  a3, v1
 	ldloc 4
 	ldloc 7
 	mul
 	stloc 11
-// 0x0105a360: 0x105a360: mflo  lo
+// 0x0105a370: 0x105a370: mflo  lo
 	ldloc 11
 	stloc 4
-// 0x0105a364: 0x105a364: jal   0x1000f9c addu  a0, s0, zero
+// 0x0105a374: 0x105a374: jal   0x1000f9c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1424,12 +1424,12 @@ L_105a330:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a36c: 0x105a36c: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x0105a37c: 0x105a37c: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-L_105a374:
-// 0x0105a374: 0x105a374: jal   0x101cd60 addu  a0, v0, zero
+L_105a384:
+// 0x0105a384: 0x105a384: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1437,26 +1437,26 @@ L_105a374:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a37c: 0x105a37c: addu  a0, s2, zero
+// 0x0105a38c: 0x105a38c: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0105a380: 0x105a380: addu  a1, s1, zero
+// 0x0105a390: 0x105a390: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x0105a384: 0x105a384: j	 0x105a3cc addiu a2, s3, 19912
+// 0x0105a394: 0x105a394: j	 0x105a3dc addiu a2, s3, 20332
 	ldloc 14
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-	br L_105a3cc
+	br L_105a3dc
 // --- basic block ---
-L_105a38c:
-// 0x0105a38c: 0x105a38c: jal   0x1007db4 sw    a1, 28(sp)
+L_105a39c:
+// 0x0105a39c: 0x105a39c: jal   0x1007dc4 sw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1470,12 +1470,12 @@ L_105a38c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a394: 0x105a394: lw    a1, 28(sp)
+// 0x0105a3a4: 0x105a3a4: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1484,18 +1484,18 @@ L_105a38c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a398: 0x105a398: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x0105a3a8: 0x105a3a8: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0105a39c: 0x105a39c: addu  a0, s0, zero
+// 0x0105a3ac: 0x105a3ac: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a3a0: 0x105a3a0: addiu a2, a2, -13884
+// 0x0105a3b0: 0x105a3b0: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0105a3a4: 0x105a3a4: jal   0x1000f9c addu  a3, v0, zero
+// 0x0105a3b4: 0x105a3b4: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -1508,12 +1508,12 @@ L_105a38c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a3ac: 0x105a3ac: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x0105a3bc: 0x105a3bc: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-L_105a3b4:
-// 0x0105a3b4: 0x105a3b4: jal   0x101cd60 addu  a0, v0, zero
+L_105a3c4:
+// 0x0105a3c4: 0x105a3c4: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1521,27 +1521,27 @@ L_105a3b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a3bc: 0x105a3bc: lui   a2, 0x10000
+// 0x0105a3cc: 0x105a3cc: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105a3c0: 0x105a3c0: addu  a0, s2, zero
+// 0x0105a3d0: 0x105a3d0: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0105a3c4: 0x105a3c4: addu  a1, s1, zero
+// 0x0105a3d4: 0x105a3d4: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x0105a3c8: 0x105a3c8: addiu a2, a2, 19912
+// 0x0105a3d8: 0x105a3d8: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-L_105a3cc:
-// 0x0105a3cc: 0x105a3cc: jal   0x1000f9c addu  a3, v0, zero
+L_105a3dc:
+// 0x0105a3dc: 0x105a3dc: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -1554,8 +1554,8 @@ L_105a3cc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a3d4: 0x105a3d4: lw    ra, 52(sp)
-// 0x0105a3d8: 0x105a3d8: lw    s4, 48(sp)
+// 0x0105a3e4: 0x105a3e4: lw    ra, 52(sp)
+// 0x0105a3e8: 0x105a3e8: lw    s4, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1564,7 +1564,7 @@ L_105a3cc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105a3dc: 0x105a3dc: lw    s3, 44(sp)
+// 0x0105a3ec: 0x105a3ec: lw    s3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1573,7 +1573,7 @@ L_105a3cc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105a3e0: 0x105a3e0: lw    s2, 40(sp)
+// 0x0105a3f0: 0x105a3f0: lw    s2, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1582,7 +1582,7 @@ L_105a3cc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105a3e4: 0x105a3e4: lw    s1, 36(sp)
+// 0x0105a3f4: 0x105a3f4: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1591,7 +1591,7 @@ L_105a3cc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105a3e8: 0x105a3e8: lw    s0, 32(sp)
+// 0x0105a3f8: 0x105a3f8: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1600,7 +1600,7 @@ L_105a3cc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105a3ec: 0x105a3ec: jr    ra addiu sp, sp, 56
+// 0x0105a3fc: 0x105a3fc: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1612,7 +1612,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_format_messages_105a3f4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_format_messages_105a404(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 t0,int32 lo,int32 hi,int32 s2,int32 t1,int32 ra)
@@ -1668,25 +1668,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105a3f4: 0x105a3f4: lui   v0, 0x70000
+// 0x0105a404: 0x105a404: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a3f8: 0x105a3f8: addiu sp, sp, -232
+// 0x0105a408: 0x105a408: addiu sp, sp, -232
 	ldloc.0
 	ldc.i4 -232
 	add
 	stloc.0
-// 0x0105a3fc: 0x105a3fc: lw    v0, 10676(v0)
+// 0x0105a40c: 0x105a40c: lw    v0, 11140(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2669
+	ldc.i4 2785
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a400: 0x105a400: sw    ra, 228(sp)
-// 0x0105a404: 0x105a404: sw    s2, 224(sp)
+// 0x0105a410: 0x105a410: sw    ra, 228(sp)
+// 0x0105a414: 0x105a414: sw    s2, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1695,7 +1695,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105a408: 0x105a408: sw    s1, 220(sp)
+// 0x0105a418: 0x105a418: sw    s1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1704,7 +1704,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105a40c: 0x105a40c: jalr  v0 sw    s0, 216(sp)
+// 0x0105a41c: 0x105a41c: jalr  v0 sw    s0, 216(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1724,34 +1724,34 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a414: 0x105a414: lui   v0, 0x70000
+// 0x0105a424: 0x105a424: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a418: 0x105a418: lw    v0, 9160(v0)
+// 0x0105a428: 0x105a428: lw    v0, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a41c: 0x105a41c: sll   zero, zero, 0
-// 0x0105a420: 0x105a420: beq   v0, zero, 0x105a5f8 sll   zero, zero, 0
+// 0x0105a42c: 0x105a42c: sll   zero, zero, 0
+// 0x0105a430: 0x105a430: beq   v0, zero, 0x105a608 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105a5f8
+	brfalse L_105a608
 // --- basic block ---
-// 0x0105a428: 0x105a428: jal   0x105e28c sll   zero, zero, 0
-	call int32 Cibyl70::navigate_bar_is_hidden_105e28c()
+// 0x0105a438: 0x105a438: jal   0x105e29c sll   zero, zero, 0
+	call int32 Cibyl70::navigate_bar_is_hidden_105e29c()
 	stloc 5
 // --- basic block ---
-// 0x0105a430: 0x105a430: beq   v0, zero, 0x105a460 lui   v0, 0x70000
+// 0x0105a440: 0x105a440: beq   v0, zero, 0x105a470 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105a460
+	brfalse L_105a470
 // --- basic block ---
-// 0x0105a438: 0x105a438: jal   0x101ae54 addiu a0, zero, 68
+// 0x0105a448: 0x105a448: jal   0x101ae64 addiu a0, zero, 68
 	ldc.i4.s 68
 	stloc.1
 	ldloc.0
@@ -1759,12 +1759,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a440: 0x105a440: jal   0x101ae54 addiu a0, zero, 83
+// 0x0105a450: 0x105a450: jal   0x101ae64 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -1772,12 +1772,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a448: 0x105a448: jal   0x101ae54 addiu a0, zero, 64
+// 0x0105a458: 0x105a458: jal   0x101ae64 addiu a0, zero, 64
 	ldc.i4.s 64
 	stloc.1
 	ldloc.0
@@ -1785,12 +1785,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a450: 0x105a450: jal   0x101ae54 addiu a0, zero, 84
+// 0x0105a460: 0x105a460: jal   0x101ae64 addiu a0, zero, 84
 	ldc.i4.s 84
 	stloc.1
 	ldloc.0
@@ -1798,93 +1798,93 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a458: 0x105a458: j	 0x105a5f8 sll   zero, zero, 0
-	br L_105a5f8
+// 0x0105a468: 0x105a468: j	 0x105a608 sll   zero, zero, 0
+	br L_105a608
 // --- basic block ---
-L_105a460:
-// 0x0105a460: 0x105a460: lw    s1, 10684(v0)
+L_105a470:
+// 0x0105a470: 0x105a470: lw    s1, 11148(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2671
+	ldc.i4 2787
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105a464: 0x105a464: lui   v0, 0x70000
+// 0x0105a474: 0x105a474: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a468: 0x105a468: lw    v1, 10696(v0)
+// 0x0105a478: 0x105a478: lw    v1, 11160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105a46c: 0x105a46c: lui   v0, 0x70000
+// 0x0105a47c: 0x105a47c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a470: 0x105a470: lw    a0, 10688(v0)
+// 0x0105a480: 0x105a480: lw    a0, 11152(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a474: 0x105a474: lui   v0, 0x70000
+// 0x0105a484: 0x105a484: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a478: 0x105a478: lw    v0, 10680(v0)
+// 0x0105a488: 0x105a488: lw    v0, 11144(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2670
+	ldc.i4 2786
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a47c: 0x105a47c: addiu s0, sp, 108
+// 0x0105a48c: 0x105a48c: addiu s0, sp, 108
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc 9
-// 0x0105a480: 0x105a480: addiu s2, sp, 68
+// 0x0105a490: 0x105a490: addiu s2, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 13
-// 0x0105a484: 0x105a484: addu  a0, a0, v0
+// 0x0105a494: 0x105a494: addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-// 0x0105a488: 0x105a488: addu  a1, s0, zero
+// 0x0105a498: 0x105a498: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0105a48c: 0x105a48c: addiu v0, zero, 20
+// 0x0105a49c: 0x105a49c: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x0105a490: 0x105a490: addiu a2, zero, 100
+// 0x0105a4a0: 0x105a4a0: addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
-// 0x0105a494: 0x105a494: addu  a3, s2, zero
+// 0x0105a4a4: 0x105a4a4: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0105a498: 0x105a498: addu  s1, s1, v1
+// 0x0105a4a8: 0x105a4a8: addu  s1, s1, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x0105a49c: 0x105a49c: jal   0x105a23c sw    v0, 16(sp)
+// 0x0105a4ac: 0x105a4ac: jal   0x105a24c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1898,26 +1898,26 @@ L_105a460:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_get_distance_str_105a23c(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_get_distance_str_105a24c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a4a4: 0x105a4a4: lui   a1, 0x20000
+// 0x0105a4b4: 0x105a4b4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0105a4a8: 0x105a4a8: addiu a1, a1, -6888
+// 0x0105a4b8: 0x105a4b8: addiu a1, a1, -6424
 	ldloc.2
-	ldc.i4 -6888
+	ldc.i4 -6424
 	add
 	stloc.2
-// 0x0105a4ac: 0x105a4ac: addu  a3, s2, zero
+// 0x0105a4bc: 0x105a4bc: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x0105a4b0: 0x105a4b0: addiu a0, zero, 68
+// 0x0105a4c0: 0x105a4c0: addiu a0, zero, 68
 	ldc.i4.s 68
 	stloc.1
-// 0x0105a4b4: 0x105a4b4: jal   0x101aec4 addu  a2, s0, zero
+// 0x0105a4c4: 0x105a4c4: jal   0x101aed4 addu  a2, s0, zero
 	ldloc 9
 	stloc.3
 	ldloc.0
@@ -1925,38 +1925,38 @@ L_105a460:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a4bc: 0x105a4bc: lui   v0, 0x70000
+// 0x0105a4cc: 0x105a4cc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a4c0: 0x105a4c0: lw    v0, 10364(v0)
+// 0x0105a4d0: 0x105a4d0: lw    v0, 10828(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2591
+	ldc.i4 2707
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a4c4: 0x105a4c4: sll   zero, zero, 0
-// 0x0105a4c8: 0x105a4c8: bne   v0, zero, 0x105a510 addiu s1, s1, 60
+// 0x0105a4d4: 0x105a4d4: sll   zero, zero, 0
+// 0x0105a4d8: 0x105a4d8: bne   v0, zero, 0x105a520 addiu s1, s1, 60
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 60
 	add
 	stloc 8
-	brtrue L_105a510
+	brtrue L_105a520
 // --- basic block ---
-// 0x0105a4d0: 0x105a4d0: lui   a0, 0x10000
+// 0x0105a4e0: 0x105a4e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105a4d4: 0x105a4d4: jal   0x101cd60 addiu a0, a0, -32
+// 0x0105a4e4: 0x105a4e4: jal   0x101cd70 addiu a0, a0, -36
 	ldloc.1
-	ldc.i4.s -32
+	ldc.i4.s -36
 	add
 	stloc.1
 	ldloc.0
@@ -1964,15 +1964,15 @@ L_105a460:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a4dc: 0x105a4dc: addiu a2, zero, 60
+// 0x0105a4ec: 0x105a4ec: addiu a2, zero, 60
 	ldc.i4.s 60
 	stloc.3
-// 0x0105a4e0: 0x105a4e0: div   s1, a2
+// 0x0105a4f0: 0x105a4f0: div   s1, a2
 	ldloc 8
 	ldloc.3
 	ldloc 8
@@ -1981,21 +1981,21 @@ L_105a460:
 	stloc 11
 	rem
 	stloc 12
-// 0x0105a4e4: 0x105a4e4: lui   a1, 0x20000
+// 0x0105a4f4: 0x105a4f4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0105a4e8: 0x105a4e8: addiu a1, a1, 22696
+// 0x0105a4f8: 0x105a4f8: addiu a1, a1, 23156
 	ldloc.2
-	ldc.i4 22696
+	ldc.i4 23156
 	add
 	stloc.2
-// 0x0105a4ec: 0x105a4ec: addu  a3, v0, zero
+// 0x0105a4fc: 0x105a4fc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105a4f0: 0x105a4f0: mflo  lo
+// 0x0105a500: 0x105a500: mflo  lo
 	ldloc 11
 	stloc.3
-// 0x0105a4f4: 0x105a4f4: jal   0x1000f64 addu  a0, s0, zero
+// 0x0105a504: 0x105a504: jal   0x1000f64 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2008,7 +2008,7 @@ L_105a460:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a4fc: 0x105a4fc: jal   0x101ae54 addiu a0, zero, 64
+// 0x0105a50c: 0x105a50c: jal   0x101ae64 addiu a0, zero, 64
 	ldc.i4.s 64
 	stloc.1
 	ldloc.0
@@ -2016,21 +2016,21 @@ L_105a460:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a504: 0x105a504: addu  a1, s0, zero
+// 0x0105a514: 0x105a514: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0105a508: 0x105a508: j	 0x105a5ac addiu a0, zero, 84
+// 0x0105a518: 0x105a518: j	 0x105a5bc addiu a0, zero, 84
 	ldc.i4.s 84
 	stloc.1
-	br L_105a5ac
+	br L_105a5bc
 // --- basic block ---
-L_105a510:
-// 0x0105a510: 0x105a510: jal   0x10574f8 addiu a0, sp, 44
+L_105a520:
+// 0x0105a520: 0x105a520: jal   0x1057508 addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
@@ -2040,15 +2040,15 @@ L_105a510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_get_current_time_10574f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_get_current_time_1057508(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a518: 0x105a518: addiu t0, zero, 3600
+// 0x0105a528: 0x105a528: addiu t0, zero, 3600
 	ldc.i4 3600
 	stloc 10
-// 0x0105a51c: 0x105a51c: div   s1, t0
+// 0x0105a52c: 0x105a52c: div   s1, t0
 	ldloc 8
 	ldloc 10
 	ldloc 8
@@ -2057,10 +2057,10 @@ L_105a510:
 	stloc 11
 	rem
 	stloc 12
-// 0x0105a520: 0x105a520: addiu v0, zero, 60
+// 0x0105a530: 0x105a530: addiu v0, zero, 60
 	ldc.i4.s 60
 	stloc 5
-// 0x0105a524: 0x105a524: lw    a1, 44(sp)
+// 0x0105a534: 0x105a534: lw    a1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2069,7 +2069,7 @@ L_105a510:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105a528: 0x105a528: lw    a2, 48(sp)
+// 0x0105a538: 0x105a538: lw    a2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2078,7 +2078,7 @@ L_105a510:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105a52c: 0x105a52c: lw    a3, 52(sp)
+// 0x0105a53c: 0x105a53c: lw    a3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2087,15 +2087,15 @@ L_105a510:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105a530: 0x105a530: addiu a0, sp, 32
+// 0x0105a540: 0x105a540: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0105a534: 0x105a534: mflo  lo
+// 0x0105a544: 0x105a544: mflo  lo
 	ldloc 11
 	stloc 14
-// 0x0105a538: 0x105a538: sw    t1, 16(sp)
+// 0x0105a548: 0x105a548: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2104,7 +2104,7 @@ L_105a510:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105a53c: 0x105a53c: sw    t1, 56(sp)
+// 0x0105a54c: 0x105a54c: sw    t1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2113,12 +2113,12 @@ L_105a510:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105a540: 0x105a540: mfhi  hi
+// 0x0105a550: 0x105a550: mfhi  hi
 	ldloc 12
 	stloc 10
-// 0x0105a544: 0x105a544: sll   zero, zero, 0
-// 0x0105a548: 0x105a548: sll   zero, zero, 0
-// 0x0105a54c: 0x105a54c: div   s1, v0
+// 0x0105a554: 0x105a554: sll   zero, zero, 0
+// 0x0105a558: 0x105a558: sll   zero, zero, 0
+// 0x0105a55c: 0x105a55c: div   s1, v0
 	ldloc 8
 	ldloc 5
 	ldloc 8
@@ -2127,10 +2127,10 @@ L_105a510:
 	stloc 11
 	rem
 	stloc 12
-// 0x0105a550: 0x105a550: mfhi  hi
+// 0x0105a560: 0x105a560: mfhi  hi
 	ldloc 12
 	stloc 7
-// 0x0105a554: 0x105a554: sw    v1, 24(sp)
+// 0x0105a564: 0x105a564: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2139,7 +2139,7 @@ L_105a510:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105a558: 0x105a558: sw    v1, 64(sp)
+// 0x0105a568: 0x105a568: sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2148,7 +2148,7 @@ L_105a510:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105a55c: 0x105a55c: div   t0, v0
+// 0x0105a56c: 0x105a56c: div   t0, v0
 	ldloc 10
 	ldloc 5
 	ldloc 10
@@ -2157,10 +2157,10 @@ L_105a510:
 	stloc 11
 	rem
 	stloc 12
-// 0x0105a560: 0x105a560: mflo  lo
+// 0x0105a570: 0x105a570: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x0105a564: 0x105a564: sw    t0, 20(sp)
+// 0x0105a574: 0x105a574: sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2169,7 +2169,7 @@ L_105a510:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105a568: 0x105a568: jal   0x105753c sw    t0, 60(sp)
+// 0x0105a578: 0x105a578: jal   0x105754c sw    t0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2183,17 +2183,17 @@ L_105a510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_calculate_eta_105753c(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_calculate_eta_105754c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a570: 0x105a570: lui   a0, 0x10000
+// 0x0105a580: 0x105a580: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105a574: 0x105a574: jal   0x101cd60 addiu a0, a0, 7896
+// 0x0105a584: 0x105a584: jal   0x101cd70 addiu a0, a0, 7892
 	ldloc.1
-	ldc.i4 7896
+	ldc.i4 7892
 	add
 	stloc.1
 	ldloc.0
@@ -2201,15 +2201,15 @@ L_105a510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a57c: 0x105a57c: addu  a2, v0, zero
+// 0x0105a58c: 0x105a58c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0105a580: 0x105a580: lw    a3, 32(sp)
+// 0x0105a590: 0x105a590: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2218,7 +2218,7 @@ L_105a510:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105a584: 0x105a584: lw    v0, 36(sp)
+// 0x0105a594: 0x105a594: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2227,18 +2227,18 @@ L_105a510:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a588: 0x105a588: lui   a1, 0x10000
+// 0x0105a598: 0x105a598: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105a58c: 0x105a58c: addiu a1, a1, 9680
+// 0x0105a59c: 0x105a59c: addiu a1, a1, 9676
 	ldloc.2
-	ldc.i4 9680
+	ldc.i4 9676
 	add
 	stloc.2
-// 0x0105a590: 0x105a590: addu  a0, s0, zero
+// 0x0105a5a0: 0x105a5a0: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0105a594: 0x105a594: jal   0x1000f64 sw    v0, 16(sp)
+// 0x0105a5a4: 0x105a5a4: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2257,7 +2257,7 @@ L_105a510:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a59c: 0x105a59c: jal   0x101ae54 addiu a0, zero, 84
+// 0x0105a5ac: 0x105a5ac: jal   0x101ae64 addiu a0, zero, 84
 	ldc.i4.s 84
 	stloc.1
 	ldloc.0
@@ -2265,36 +2265,36 @@ L_105a510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_unset_101ae54(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_unset_101ae64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a5a4: 0x105a5a4: addu  a1, s0, zero
+// 0x0105a5b4: 0x105a5b4: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0105a5a8: 0x105a5a8: addiu a0, zero, 64
+// 0x0105a5b8: 0x105a5b8: addiu a0, zero, 64
 	ldc.i4.s 64
 	stloc.1
-L_105a5ac:
-// 0x0105a5ac: 0x105a5ac: jal   0x101aec4 sll   zero, zero, 0
+L_105a5bc:
+// 0x0105a5bc: 0x105a5bc: jal   0x101aed4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a5b4: 0x105a5b4: addu  a1, zero, zero
+// 0x0105a5c4: 0x105a5c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105a5b8: 0x105a5b8: addu  a2, zero, zero
+// 0x0105a5c8: 0x105a5c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105a5bc: 0x105a5bc: jal   0x1029da8 addiu a0, sp, 88
+// 0x0105a5cc: 0x105a5cc: jal   0x1029db8 addiu a0, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -2304,12 +2304,12 @@ L_105a5ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a5c4: 0x105a5c4: lw    a0, 100(sp)
+// 0x0105a5d4: 0x105a5d4: lw    a0, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2318,18 +2318,18 @@ L_105a5ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a5c8: 0x105a5c8: jal   0x1007e4c sll   zero, zero, 0
+// 0x0105a5d8: 0x105a5d8: jal   0x1007e5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_speed_unit_1007e5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a5d0: 0x105a5d0: jal   0x1007d9c sw    v0, 208(sp)
+// 0x0105a5e0: 0x105a5e0: jal   0x1007dac sw    v0, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2338,10 +2338,10 @@ L_105a5ac:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_speed_unit_1007d9c()
+	call int32 Cibyl5::roadmap_math_speed_unit_1007dac()
 	stloc 5
 // --- basic block ---
-// 0x0105a5d8: 0x105a5d8: jal   0x101cd60 addu  a0, v0, zero
+// 0x0105a5e8: 0x105a5e8: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2349,15 +2349,15 @@ L_105a5ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a5e0: 0x105a5e0: lui   a1, 0x10000
+// 0x0105a5f0: 0x105a5f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105a5e4: 0x105a5e4: lw    a2, 208(sp)
+// 0x0105a5f4: 0x105a5f4: lw    a2, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2366,15 +2366,15 @@ L_105a5ac:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105a5e8: 0x105a5e8: addiu a1, a1, -29864
+// 0x0105a5f8: 0x105a5f8: addiu a1, a1, -29864
 	ldloc.2
 	ldc.i4 -29864
 	add
 	stloc.2
-// 0x0105a5ec: 0x105a5ec: addu  a3, v0, zero
+// 0x0105a5fc: 0x105a5fc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105a5f0: 0x105a5f0: jal   0x101aec4 addiu a0, zero, 83
+// 0x0105a600: 0x105a600: jal   0x101aed4 addiu a0, zero, 83
 	ldc.i4.s 83
 	stloc.1
 	ldloc.0
@@ -2382,14 +2382,14 @@ L_105a5ac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_set_101aec4(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_set_101aed4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105a5f8:
-// 0x0105a5f8: 0x105a5f8: lw    ra, 228(sp)
-// 0x0105a5fc: 0x105a5fc: lw    s2, 224(sp)
+L_105a608:
+// 0x0105a608: 0x105a608: lw    ra, 228(sp)
+// 0x0105a60c: 0x105a60c: lw    s2, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2398,7 +2398,7 @@ L_105a5f8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105a600: 0x105a600: lw    s1, 220(sp)
+// 0x0105a610: 0x105a610: lw    s1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2407,7 +2407,7 @@ L_105a5f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105a604: 0x105a604: lw    s0, 216(sp)
+// 0x0105a614: 0x105a614: lw    s0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2416,7 +2416,7 @@ L_105a5f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105a608: 0x105a608: jr    ra addiu sp, sp, 232
+// 0x0105a618: 0x105a618: jr    ra addiu sp, sp, 232
 	ldloc.0
 	ldc.i4 232
 	add
@@ -2428,7 +2428,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_391_105a610(int32,int32,int32,int32,int32)
+.method public static int32 T_391_105a620(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s6,int32 s5,int32 ra)
@@ -2484,15 +2484,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105a610: 0x105a610: addiu sp, sp, -136
+// 0x0105a620: 0x105a620: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x0105a614: 0x105a614: lui   v0, 0x20000
+// 0x0105a624: 0x105a624: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0105a618: 0x105a618: sw    s2, 112(sp)
+// 0x0105a628: 0x105a628: sw    s2, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2501,13 +2501,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105a61c: 0x105a61c: addu  s2, a0, zero
+// 0x0105a62c: 0x105a62c: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0105a620: 0x105a620: addu  a0, zero, zero
+// 0x0105a630: 0x105a630: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105a624: 0x105a624: sw    s5, 124(sp)
+// 0x0105a634: 0x105a634: sw    s5, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2516,7 +2516,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105a628: 0x105a628: sw    s3, 116(sp)
+// 0x0105a638: 0x105a638: sw    s3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2525,7 +2525,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105a62c: 0x105a62c: sw    s1, 108(sp)
+// 0x0105a63c: 0x105a63c: sw    s1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2534,19 +2534,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105a630: 0x105a630: lw    s5, 31248(v0)
+// 0x0105a640: 0x105a640: lw    s5, 31712(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105a634: 0x105a634: addu  s1, a1, zero
+// 0x0105a644: 0x105a644: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0105a638: 0x105a638: sw    a3, 96(sp)
+// 0x0105a648: 0x105a648: sw    a3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2555,8 +2555,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105a63c: 0x105a63c: sw    ra, 132(sp)
-// 0x0105a640: 0x105a640: sw    s6, 128(sp)
+// 0x0105a64c: 0x105a64c: sw    ra, 132(sp)
+// 0x0105a650: 0x105a650: sw    s6, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2565,7 +2565,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105a644: 0x105a644: sw    s4, 120(sp)
+// 0x0105a654: 0x105a654: sw    s4, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2574,7 +2574,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105a648: 0x105a648: sw    s0, 104(sp)
+// 0x0105a658: 0x105a658: sw    s0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2583,7 +2583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105a64c: 0x105a64c: jal   0x100b020 addu  s3, a2, zero
+// 0x0105a65c: 0x105a65c: jal   0x100b030 addu  s3, a2, zero
 	ldloc.3
 	stloc 11
 	ldloc.0
@@ -2591,12 +2591,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_screen_scale_100b020(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_screen_scale_100b030(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a654: 0x105a654: lw    a3, 96(sp)
+// 0x0105a664: 0x105a664: lw    a3, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2605,17 +2605,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105a658: 0x105a658: addiu v0, zero, -1
+// 0x0105a668: 0x105a668: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105a65c: 0x105a65c: sw    v0, 0(s1)
+// 0x0105a66c: 0x105a66c: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0105a660: 0x105a660: bne   a3, zero, 0x105a67c sw    zero, 36(sp)
+// 0x0105a670: 0x105a670: bne   a3, zero, 0x105a68c sw    zero, 36(sp)
 	ldloc 4
 	ldloc 6
 	ldloc.0
@@ -2625,42 +2625,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brtrue L_105a67c
+	brtrue L_105a68c
 // --- basic block ---
-// 0x0105a668: 0x105a668: lui   v0, 0x70000
+// 0x0105a678: 0x105a678: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a66c: 0x105a66c: lw    v0, 10020(v0)
+// 0x0105a67c: 0x105a67c: lw    v0, 10484(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a670: 0x105a670: sll   zero, zero, 0
-// 0x0105a674: 0x105a674: beq   v0, zero, 0x105a76c lui   a0, 0x10000
+// 0x0105a680: 0x105a680: sll   zero, zero, 0
+// 0x0105a684: 0x105a684: beq   v0, zero, 0x105a77c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_105a76c
+	brfalse L_105a77c
 // --- basic block ---
-L_105a67c:
-// 0x0105a67c: 0x105a67c: addiu s0, sp, 76
+L_105a68c:
+// 0x0105a68c: 0x105a68c: addiu s0, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 8
-// 0x0105a680: 0x105a680: addu  a0, s0, zero
+// 0x0105a690: 0x105a690: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a684: 0x105a684: addiu a1, sp, 56
+// 0x0105a694: 0x105a694: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x0105a688: 0x105a688: jal   0x1029da8 addiu a2, sp, 36
+// 0x0105a698: 0x105a698: jal   0x1029db8 addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
@@ -2670,20 +2670,20 @@ L_105a67c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a690: 0x105a690: addiu v1, zero, -1
+// 0x0105a6a0: 0x105a6a0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0105a694: 0x105a694: beq   v0, v1, 0x105a71c sll   zero, zero, 0
+// 0x0105a6a4: 0x105a6a4: beq   v0, v1, 0x105a72c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_105a71c
+	beq  L_105a72c
 // --- basic block ---
-// 0x0105a69c: 0x105a69c: lw    v0, 56(sp)
+// 0x0105a6ac: 0x105a6ac: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2692,19 +2692,19 @@ L_105a67c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a6a0: 0x105a6a0: sll   zero, zero, 0
-// 0x0105a6a4: 0x105a6a4: bne   v0, zero, 0x105a71c lui   a1, 0x70000
+// 0x0105a6b0: 0x105a6b0: sll   zero, zero, 0
+// 0x0105a6b4: 0x105a6b4: bne   v0, zero, 0x105a72c lui   a1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc.2
-	brtrue L_105a71c
+	brtrue L_105a72c
 // --- basic block ---
-// 0x0105a6ac: 0x105a6ac: addu  a0, s0, zero
+// 0x0105a6bc: 0x105a6bc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a6b0: 0x105a6b0: jal   0x101db84 addiu a1, a1, 10740
+// 0x0105a6c0: 0x105a6c0: jal   0x101db94 addiu a1, a1, 11204
 	ldloc.2
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc.2
 	ldloc.0
@@ -2712,15 +2712,15 @@ L_105a67c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_adjust_position_101db84(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_adjust_position_101db94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a6b8: 0x105a6b8: lui   v0, 0x0
+// 0x0105a6c8: 0x105a6c8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105a6bc: 0x105a6bc: lw    v0, 576(v0)
+// 0x0105a6cc: 0x105a6cc: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2729,7 +2729,7 @@ L_105a67c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a6c0: 0x105a6c0: lw    a0, 68(sp)
+// 0x0105a6d0: 0x105a6d0: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2738,30 +2738,30 @@ L_105a67c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a6c4: 0x105a6c4: sll   zero, zero, 0
-// 0x0105a6c8: 0x105a6c8: beq   a0, v0, 0x105a6e0 sll   zero, zero, 0
+// 0x0105a6d4: 0x105a6d4: sll   zero, zero, 0
+// 0x0105a6d8: 0x105a6d8: beq   a0, v0, 0x105a6f0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_105a6e0
+	beq  L_105a6f0
 // --- basic block ---
-// 0x0105a6d0: 0x105a6d0: bltz  a0, 0x105a6e0 sll   zero, zero, 0
+// 0x0105a6e0: 0x105a6e0: bltz  a0, 0x105a6f0 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105a6e0
+	blt L_105a6f0
 // --- basic block ---
-// 0x0105a6d8: 0x105a6d8: jal   0x100b164 sll   zero, zero, 0
+// 0x0105a6e8: 0x105a6e8: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105a6e0:
-// 0x0105a6e0: 0x105a6e0: lw    a0, 60(sp)
+L_105a6f0:
+// 0x0105a6f0: 0x105a6f0: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2770,12 +2770,12 @@ L_105a6e0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a6e4: 0x105a6e4: addiu a1, sp, 28
+// 0x0105a6f4: 0x105a6f4: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x0105a6e8: 0x105a6e8: jal   0x1003adc addiu a2, sp, 32
+// 0x0105a6f8: 0x105a6f8: jal   0x1003adc addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2788,7 +2788,7 @@ L_105a6e0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a6f0: 0x105a6f0: lw    v1, 36(sp)
+// 0x0105a700: 0x105a700: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2797,15 +2797,15 @@ L_105a6e0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105a6f4: 0x105a6f4: addiu v0, zero, 1
+// 0x0105a704: 0x105a704: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105a6f8: 0x105a6f8: bne   v1, v0, 0x105a70c sll   zero, zero, 0
+// 0x0105a708: 0x105a708: bne   v1, v0, 0x105a71c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_105a70c
+	bne.un L_105a71c
 // --- basic block ---
-// 0x0105a700: 0x105a700: lw    v0, 32(sp)
+// 0x0105a710: 0x105a710: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2814,13 +2814,13 @@ L_105a6e0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a704: 0x105a704: j	 0x105a714 addu  s0, zero, zero
+// 0x0105a714: 0x105a714: j	 0x105a724 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_105a714
+	br L_105a724
 // --- basic block ---
-L_105a70c:
-// 0x0105a70c: 0x105a70c: lw    v0, 28(sp)
+L_105a71c:
+// 0x0105a71c: 0x105a71c: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2829,84 +2829,84 @@ L_105a70c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a710: 0x105a710: addu  s0, zero, zero
+// 0x0105a720: 0x105a720: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_105a714:
-// 0x0105a714: 0x105a714: j	 0x105a790 sw    v0, 0(s1)
+L_105a724:
+// 0x0105a724: 0x105a724: j	 0x105a7a0 sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_105a790
+	br L_105a7a0
 // --- basic block ---
-L_105a71c:
-// 0x0105a71c: 0x105a71c: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+L_105a72c:
+// 0x0105a72c: 0x105a72c: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
 // --- basic block ---
-// 0x0105a724: 0x105a724: beq   v0, zero, 0x105a734 lui   a0, 0x10000
+// 0x0105a734: 0x105a734: beq   v0, zero, 0x105a744 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_105a734
+	brfalse L_105a744
 // --- basic block ---
-// 0x0105a72c: 0x105a72c: j	 0x105a73c addiu a0, a0, -31052
+// 0x0105a73c: 0x105a73c: j	 0x105a74c addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
 	stloc.1
-	br L_105a73c
+	br L_105a74c
 // --- basic block ---
-L_105a734:
-// 0x0105a734: 0x105a734: lui   a0, 0x20000
+L_105a744:
+// 0x0105a744: 0x105a744: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0105a738: 0x105a738: addiu a0, a0, 6792
+// 0x0105a748: 0x105a748: addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
-L_105a73c:
-// 0x0105a73c: 0x105a73c: jal   0x101df50 sll   zero, zero, 0
+L_105a74c:
+// 0x0105a74c: 0x105a74c: jal   0x101df60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a744: 0x105a744: beq   v0, zero, 0x105a764 addu  s0, v0, zero
+// 0x0105a754: 0x105a754: beq   v0, zero, 0x105a774 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_105a764
+	brfalse L_105a774
 // --- basic block ---
-// 0x0105a74c: 0x105a74c: lw    v1, 0(v0)
+// 0x0105a75c: 0x105a75c: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105a750: 0x105a750: lui   v0, 0x70000
+// 0x0105a760: 0x105a760: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a754: 0x105a754: sw    v1, 10740(v0)
+// 0x0105a764: 0x105a764: sw    v1, 11204(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2685
+	ldc.i4 2801
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105a758: 0x105a758: lw    v1, 4(s0)
+// 0x0105a768: 0x105a768: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2915,12 +2915,12 @@ L_105a73c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105a75c: 0x105a75c: addiu v0, v0, 10740
+// 0x0105a76c: 0x105a76c: addiu v0, v0, 11204
 	ldloc 5
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc 5
-// 0x0105a760: 0x105a760: sw    v1, 4(v0)
+// 0x0105a770: 0x105a770: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2929,8 +2929,8 @@ L_105a73c:
 	add
 	ldloc 7
 	stelem.i4
-L_105a764:
-// 0x0105a764: 0x105a764: j	 0x105a790 sw    zero, 36(sp)
+L_105a774:
+// 0x0105a774: 0x105a774: j	 0x105a7a0 sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2939,10 +2939,10 @@ L_105a764:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_105a790
+	br L_105a7a0
 // --- basic block ---
-L_105a76c:
-// 0x0105a76c: 0x105a76c: jal   0x101df50 addiu a0, a0, -29760
+L_105a77c:
+// 0x0105a77c: 0x105a77c: jal   0x101df60 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -2952,34 +2952,34 @@ L_105a76c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a774: 0x105a774: lw    v1, 0(v0)
+// 0x0105a784: 0x105a784: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105a778: 0x105a778: addu  s0, v0, zero
+// 0x0105a788: 0x105a788: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0105a77c: 0x105a77c: lui   v0, 0x70000
+// 0x0105a78c: 0x105a78c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a780: 0x105a780: sw    v1, 10740(v0)
+// 0x0105a790: 0x105a790: sw    v1, 11204(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2685
+	ldc.i4 2801
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105a784: 0x105a784: lw    v1, 4(s0)
+// 0x0105a794: 0x105a794: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2988,12 +2988,12 @@ L_105a76c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105a788: 0x105a788: addiu v0, v0, 10740
+// 0x0105a798: 0x105a798: addiu v0, v0, 11204
 	ldloc 5
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc 5
-// 0x0105a78c: 0x105a78c: sw    v1, 4(v0)
+// 0x0105a79c: 0x105a79c: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3002,41 +3002,41 @@ L_105a76c:
 	add
 	ldloc 7
 	stelem.i4
-L_105a790:
-// 0x0105a790: 0x105a790: lw    s4, 0(s1)
+L_105a7a0:
+// 0x0105a7a0: 0x105a7a0: lw    s4, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x0105a794: 0x105a794: addiu v0, zero, -1
+// 0x0105a7a4: 0x105a7a4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105a798: 0x105a798: bne   s4, v0, 0x105a834 addu  a0, s2, zero
+// 0x0105a7a8: 0x105a7a8: bne   s4, v0, 0x105a844 addu  a0, s2, zero
 	ldloc 12
 	ldloc 5
 	ldloc 10
 	stloc.1
-	bne.un L_105a834
+	bne.un L_105a844
 // --- basic block ---
-// 0x0105a7a0: 0x105a7a0: bne   s0, zero, 0x105a7c0 lui   a0, 0x0
+// 0x0105a7b0: 0x105a7b0: bne   s0, zero, 0x105a7d0 lui   a0, 0x0
 	ldloc 8
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_105a7c0
+	brtrue L_105a7d0
 // --- basic block ---
-// 0x0105a7a8: 0x105a7a8: lui   a1, 0x10000
+// 0x0105a7b8: 0x105a7b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105a7ac: 0x105a7ac: addiu a0, a0, 30152
+// 0x0105a7bc: 0x105a7bc: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x0105a7b0: 0x105a7b0: jal   0x104c148 addiu a1, a1, 9692
+// 0x0105a7c0: 0x105a7c0: jal   0x104c158 addiu a1, a1, 9688
 	ldloc.2
-	ldc.i4 9692
+	ldc.i4 9688
 	add
 	stloc.2
 	ldloc.0
@@ -3044,23 +3044,23 @@ L_105a790:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a7b8: 0x105a7b8: j	 0x105ab80 addiu v0, zero, -1
+// 0x0105a7c8: 0x105a7c8: j	 0x105ab90 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_105ab80
+	br L_105ab90
 // --- basic block ---
-L_105a7c0:
-// 0x0105a7c0: 0x105a7c0: addiu v0, sp, 24
+L_105a7d0:
+// 0x0105a7d0: 0x105a7d0: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x0105a7c4: 0x105a7c4: sw    v0, 16(sp)
+// 0x0105a7d4: 0x105a7d4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3069,24 +3069,24 @@ L_105a7c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105a7c8: 0x105a7c8: addu  a0, s0, zero
+// 0x0105a7d8: 0x105a7d8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a7cc: 0x105a7cc: addiu v0, zero, 2
+// 0x0105a7dc: 0x105a7dc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0105a7d0: 0x105a7d0: addu  a1, zero, zero
+// 0x0105a7e0: 0x105a7e0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105a7d4: 0x105a7d4: addiu a2, zero, 300
+// 0x0105a7e4: 0x105a7e4: addiu a2, zero, 300
 	ldc.i4 300
 	stloc.3
-// 0x0105a7d8: 0x105a7d8: addiu a3, sp, 56
+// 0x0105a7e8: 0x105a7e8: addiu a3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x0105a7dc: 0x105a7dc: jal   0x102ac0c sw    v0, 20(sp)
+// 0x0105a7ec: 0x105a7ec: jal   0x102ac1c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3100,17 +3100,17 @@ L_105a7c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a7e4: 0x105a7e4: beq   v0, s4, 0x105a7fc sll   zero, zero, 0
+// 0x0105a7f4: 0x105a7f4: beq   v0, s4, 0x105a80c sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	beq  L_105a7fc
+	beq  L_105a80c
 // --- basic block ---
-// 0x0105a7ec: 0x105a7ec: lw    v0, 56(sp)
+// 0x0105a7fc: 0x105a7fc: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3119,25 +3119,25 @@ L_105a7c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a7f0: 0x105a7f0: sll   zero, zero, 0
-// 0x0105a7f4: 0x105a7f4: beq   v0, zero, 0x105a834 addu  a0, s2, zero
+// 0x0105a800: 0x105a800: sll   zero, zero, 0
+// 0x0105a804: 0x105a804: beq   v0, zero, 0x105a844 addu  a0, s2, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brfalse L_105a834
+	brfalse L_105a844
 // --- basic block ---
-L_105a7fc:
-// 0x0105a7fc: 0x105a7fc: lw    v0, 0(s0)
+L_105a80c:
+// 0x0105a80c: 0x105a80c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105a800: 0x105a800: lui   a1, 0x10000
+// 0x0105a810: 0x105a810: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105a804: 0x105a804: sw    v0, 16(sp)
+// 0x0105a814: 0x105a814: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3146,7 +3146,7 @@ L_105a7fc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105a808: 0x105a808: lw    v0, 4(s0)
+// 0x0105a818: 0x105a818: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3155,26 +3155,26 @@ L_105a7fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a80c: 0x105a80c: lui   a3, 0x10000
+// 0x0105a81c: 0x105a81c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105a810: 0x105a810: addiu a1, a1, 8052
+// 0x0105a820: 0x105a820: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105a814: 0x105a814: addiu a3, a3, 9720
+// 0x0105a824: 0x105a824: addiu a3, a3, 9716
 	ldloc 4
-	ldc.i4 9720
+	ldc.i4 9716
 	add
 	stloc 4
-// 0x0105a818: 0x105a818: addiu a0, zero, 4
+// 0x0105a828: 0x105a828: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105a81c: 0x105a81c: addiu a2, zero, 430
+// 0x0105a82c: 0x105a82c: addiu a2, zero, 430
 	ldc.i4 430
 	stloc.3
-// 0x0105a820: 0x105a820: jal   0x100449c sw    v0, 20(sp)
+// 0x0105a830: 0x105a830: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3193,10 +3193,10 @@ L_105a7fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a828: 0x105a828: addiu v0, zero, -1
+// 0x0105a838: 0x105a838: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105a82c: 0x105a82c: j	 0x105a9a4 sw    v0, 4(s2)
+// 0x0105a83c: 0x105a83c: j	 0x105a9b4 sw    v0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3205,15 +3205,15 @@ L_105a7fc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_105a9a4
+	br L_105a9b4
 // --- basic block ---
-L_105a834:
-// 0x0105a834: 0x105a834: addiu a1, sp, 56
+L_105a844:
+// 0x0105a844: 0x105a844: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x0105a838: 0x105a838: jal   0x1001800 addiu a2, zero, 20
+// 0x0105a848: 0x105a848: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -3225,7 +3225,7 @@ L_105a834:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a840: 0x105a840: lw    v0, 36(sp)
+// 0x0105a850: 0x105a850: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3234,14 +3234,14 @@ L_105a834:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a844: 0x105a844: sll   zero, zero, 0
-// 0x0105a848: 0x105a848: bne   v0, zero, 0x105a990 lui   v0, 0x0
+// 0x0105a854: 0x105a854: sll   zero, zero, 0
+// 0x0105a858: 0x105a858: bne   v0, zero, 0x105a9a0 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_105a990
+	brtrue L_105a9a0
 // --- basic block ---
-// 0x0105a850: 0x105a850: lw    v0, 576(v0)
+// 0x0105a860: 0x105a860: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3250,7 +3250,7 @@ L_105a834:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a854: 0x105a854: lw    a0, 68(sp)
+// 0x0105a864: 0x105a864: lw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3259,33 +3259,33 @@ L_105a834:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a858: 0x105a858: sll   zero, zero, 0
-// 0x0105a85c: 0x105a85c: beq   a0, v0, 0x105a874 sll   zero, zero, 0
+// 0x0105a868: 0x105a868: sll   zero, zero, 0
+// 0x0105a86c: 0x105a86c: beq   a0, v0, 0x105a884 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_105a874
+	beq  L_105a884
 // --- basic block ---
-// 0x0105a864: 0x105a864: bltz  a0, 0x105a874 sll   zero, zero, 0
+// 0x0105a874: 0x105a874: bltz  a0, 0x105a884 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105a874
+	blt L_105a884
 // --- basic block ---
-// 0x0105a86c: 0x105a86c: jal   0x100b164 sll   zero, zero, 0
+// 0x0105a87c: 0x105a87c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105a874:
-// 0x0105a874: 0x105a874: addu  a0, s2, zero
+L_105a884:
+// 0x0105a884: 0x105a884: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0105a878: 0x105a878: jal   0x1014c00 addiu a1, zero, 1
+// 0x0105a888: 0x105a888: jal   0x1014c10 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3293,43 +3293,43 @@ L_105a874:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_direction_1014c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_direction_1014c10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a880: 0x105a880: beq   v0, zero, 0x105a8a4 addu  s4, v0, zero
+// 0x0105a890: 0x105a890: beq   v0, zero, 0x105a8b4 addu  s4, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
-	brfalse L_105a8a4
+	brfalse L_105a8b4
 // --- basic block ---
-// 0x0105a888: 0x105a888: addiu s6, zero, 1
+// 0x0105a898: 0x105a898: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 13
-// 0x0105a88c: 0x105a88c: beq   v0, s6, 0x105a954 addiu v0, zero, 2
+// 0x0105a89c: 0x105a89c: beq   v0, s6, 0x105a964 addiu v0, zero, 2
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	stloc 5
-	beq  L_105a954
+	beq  L_105a964
 // --- basic block ---
-// 0x0105a894: 0x105a894: beq   s4, v0, 0x105a964 addiu v0, zero, 3
+// 0x0105a8a4: 0x105a8a4: beq   s4, v0, 0x105a974 addiu v0, zero, 3
 	ldloc 12
 	ldloc 5
 	ldc.i4.3
 	stloc 5
-	beq  L_105a964
+	beq  L_105a974
 // --- basic block ---
-// 0x0105a89c: 0x105a89c: bne   s4, v0, 0x105a980 addu  a2, s1, zero
+// 0x0105a8ac: 0x105a8ac: bne   s4, v0, 0x105a990 addu  a2, s1, zero
 	ldloc 12
 	ldloc 5
 	ldloc 9
 	stloc.3
-	bne.un L_105a980
+	bne.un L_105a990
 // --- basic block ---
-L_105a8a4:
-// 0x0105a8a4: 0x105a8a4: lw    a0, 4(s2)
+L_105a8b4:
+// 0x0105a8b4: 0x105a8b4: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3338,12 +3338,12 @@ L_105a8a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a8a8: 0x105a8a8: addiu a2, sp, 32
+// 0x0105a8b8: 0x105a8b8: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0105a8ac: 0x105a8ac: jal   0x1003adc addiu a1, sp, 28
+// 0x0105a8bc: 0x105a8bc: jal   0x1003adc addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -3356,19 +3356,19 @@ L_105a8a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a8b4: 0x105a8b4: lui   v0, 0x20000
+// 0x0105a8c4: 0x105a8c4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0105a8b8: 0x105a8b8: lw    v1, 31228(v0)
+// 0x0105a8c8: 0x105a8c8: lw    v1, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105a8bc: 0x105a8bc: lw    v0, 28(sp)
+// 0x0105a8cc: 0x105a8cc: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3377,35 +3377,35 @@ L_105a8a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a8c0: 0x105a8c0: addiu a1, sp, 40
+// 0x0105a8d0: 0x105a8d0: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x0105a8c4: 0x105a8c4: andi  v0, v0, 32767
+// 0x0105a8d4: 0x105a8d4: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x0105a8c8: 0x105a8c8: sll   v0, v0, 3
+// 0x0105a8d8: 0x105a8d8: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0105a8cc: 0x105a8cc: addu  v0, v1, v0
+// 0x0105a8dc: 0x105a8dc: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0105a8d0: 0x105a8d0: lw    a0, 0(v0)
+// 0x0105a8e0: 0x105a8e0: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0105a8d4: 0x105a8d4: sll   zero, zero, 0
-// 0x0105a8d8: 0x105a8d8: sw    a0, 40(sp)
+// 0x0105a8e4: 0x105a8e4: sll   zero, zero, 0
+// 0x0105a8e8: 0x105a8e8: sw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3414,7 +3414,7 @@ L_105a8a4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105a8dc: 0x105a8dc: lw    a0, 4(v0)
+// 0x0105a8ec: 0x105a8ec: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3423,7 +3423,7 @@ L_105a8a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a8e0: 0x105a8e0: lw    v0, 32(sp)
+// 0x0105a8f0: 0x105a8f0: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3432,7 +3432,7 @@ L_105a8a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a8e4: 0x105a8e4: sw    a0, 44(sp)
+// 0x0105a8f4: 0x105a8f4: sw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3441,32 +3441,32 @@ L_105a8a4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105a8e8: 0x105a8e8: andi  v0, v0, 32767
+// 0x0105a8f8: 0x105a8f8: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x0105a8ec: 0x105a8ec: sll   v0, v0, 3
+// 0x0105a8fc: 0x105a8fc: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0105a8f0: 0x105a8f0: addu  v0, v1, v0
+// 0x0105a900: 0x105a900: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0105a8f4: 0x105a8f4: lw    v1, 0(v0)
+// 0x0105a904: 0x105a904: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105a8f8: 0x105a8f8: addu  a0, s0, zero
+// 0x0105a908: 0x105a908: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a8fc: 0x105a8fc: sw    v1, 48(sp)
+// 0x0105a90c: 0x105a90c: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3475,7 +3475,7 @@ L_105a8a4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105a900: 0x105a900: lw    v0, 4(v0)
+// 0x0105a910: 0x105a910: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3484,7 +3484,7 @@ L_105a8a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a904: 0x105a904: jal   0x1008eb0 sw    v0, 52(sp)
+// 0x0105a914: 0x105a914: jal   0x1008ec0 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3498,20 +3498,20 @@ L_105a8a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a90c: 0x105a90c: addu  a0, s0, zero
+// 0x0105a91c: 0x105a91c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a910: 0x105a910: addiu a1, sp, 48
+// 0x0105a920: 0x105a920: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x0105a914: 0x105a914: jal   0x1008eb0 addu  s2, v0, zero
+// 0x0105a924: 0x105a924: jal   0x1008ec0 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -3519,21 +3519,21 @@ L_105a8a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a91c: 0x105a91c: slt   v0, s2, v0
+// 0x0105a92c: 0x105a92c: slt   v0, s2, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x0105a920: 0x105a920: beq   v0, zero, 0x105a93c sll   zero, zero, 0
+// 0x0105a930: 0x105a930: beq   v0, zero, 0x105a94c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105a93c
+	brfalse L_105a94c
 // --- basic block ---
-// 0x0105a928: 0x105a928: lw    v0, 28(sp)
+// 0x0105a938: 0x105a938: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3542,21 +3542,21 @@ L_105a8a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a92c: 0x105a92c: sll   zero, zero, 0
-// 0x0105a930: 0x105a930: sw    v0, 0(s1)
+// 0x0105a93c: 0x105a93c: sll   zero, zero, 0
+// 0x0105a940: 0x105a940: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0105a934: 0x105a934: j	 0x105a94c addiu v0, zero, 2
+// 0x0105a944: 0x105a944: j	 0x105a95c addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-	br L_105a94c
+	br L_105a95c
 // --- basic block ---
-L_105a93c:
-// 0x0105a93c: 0x105a93c: lw    v0, 32(sp)
+L_105a94c:
+// 0x0105a94c: 0x105a94c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3565,19 +3565,19 @@ L_105a93c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a940: 0x105a940: sll   zero, zero, 0
-// 0x0105a944: 0x105a944: sw    v0, 0(s1)
+// 0x0105a950: 0x105a950: sll   zero, zero, 0
+// 0x0105a954: 0x105a954: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0105a948: 0x105a948: addiu v0, zero, 1
+// 0x0105a958: 0x105a958: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_105a94c:
-// 0x0105a94c: 0x105a94c: j	 0x105a990 sw    v0, 36(sp)
+L_105a95c:
+// 0x0105a95c: 0x105a95c: j	 0x105a9a0 sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3586,10 +3586,10 @@ L_105a94c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_105a990
+	br L_105a9a0
 // --- basic block ---
-L_105a954:
-// 0x0105a954: 0x105a954: lw    a0, 4(s2)
+L_105a964:
+// 0x0105a964: 0x105a964: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3598,18 +3598,18 @@ L_105a954:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a958: 0x105a958: addu  a2, s1, zero
+// 0x0105a968: 0x105a968: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0105a95c: 0x105a95c: j	 0x105a970 addiu a1, sp, 28
+// 0x0105a96c: 0x105a96c: j	 0x105a980 addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-	br L_105a970
+	br L_105a980
 // --- basic block ---
-L_105a964:
-// 0x0105a964: 0x105a964: lw    a0, 4(s2)
+L_105a974:
+// 0x0105a974: 0x105a974: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3618,16 +3618,16 @@ L_105a964:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a968: 0x105a968: addu  a1, s1, zero
+// 0x0105a978: 0x105a978: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0105a96c: 0x105a96c: addiu a2, sp, 28
+// 0x0105a97c: 0x105a97c: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-L_105a970:
-// 0x0105a970: 0x105a970: jal   0x1003adc sll   zero, zero, 0
+L_105a980:
+// 0x0105a980: 0x105a980: jal   0x1003adc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -3636,7 +3636,7 @@ L_105a970:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a978: 0x105a978: j	 0x105a990 sw    s4, 36(sp)
+// 0x0105a988: 0x105a988: j	 0x105a9a0 sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3645,10 +3645,10 @@ L_105a970:
 	add
 	ldloc 12
 	stelem.i4
-	br L_105a990
+	br L_105a9a0
 // --- basic block ---
-L_105a980:
-// 0x0105a980: 0x105a980: lw    a0, 4(s2)
+L_105a990:
+// 0x0105a990: 0x105a990: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3657,7 +3657,7 @@ L_105a980:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105a984: 0x105a984: jal   0x1003adc addiu a1, sp, 28
+// 0x0105a994: 0x105a994: jal   0x1003adc addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -3670,7 +3670,7 @@ L_105a980:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a98c: 0x105a98c: sw    s6, 36(sp)
+// 0x0105a99c: 0x105a99c: sw    s6, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3679,12 +3679,12 @@ L_105a980:
 	add
 	ldloc 13
 	stelem.i4
-L_105a990:
-// 0x0105a990: 0x105a990: beq   s3, zero, 0x105a9a4 sll   zero, zero, 0
+L_105a9a0:
+// 0x0105a9a0: 0x105a9a0: beq   s3, zero, 0x105a9b4 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_105a9a4
+	brfalse L_105a9b4
 // --- basic block ---
-// 0x0105a998: 0x105a998: lw    v0, 36(sp)
+// 0x0105a9a8: 0x105a9a8: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3693,19 +3693,19 @@ L_105a990:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105a99c: 0x105a99c: sll   zero, zero, 0
-// 0x0105a9a0: 0x105a9a0: sw    v0, 0(s3)
+// 0x0105a9ac: 0x105a9ac: sll   zero, zero, 0
+// 0x0105a9b0: 0x105a9b0: sw    v0, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_105a9a4:
-// 0x0105a9a4: 0x105a9a4: lui   s3, 0x0
+L_105a9b4:
+// 0x0105a9b4: 0x105a9b4: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0105a9a8: 0x105a9a8: lw    s4, 14228(s3)
+// 0x0105a9b8: 0x105a9b8: lw    s4, 14228(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -3714,20 +3714,20 @@ L_105a9a4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105a9ac: 0x105a9ac: addiu v1, zero, -1
+// 0x0105a9bc: 0x105a9bc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0105a9b0: 0x105a9b0: bne   s4, v1, 0x105ab80 addu  v0, zero, zero
+// 0x0105a9c0: 0x105a9c0: bne   s4, v1, 0x105ab90 addu  v0, zero, zero
 	ldloc 12
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_105ab80
+	bne.un L_105ab90
 // --- basic block ---
-// 0x0105a9b8: 0x105a9b8: lui   a0, 0x10000
+// 0x0105a9c8: 0x105a9c8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105a9bc: 0x105a9bc: jal   0x101df50 addiu a0, a0, -29748
+// 0x0105a9cc: 0x105a9cc: jal   0x101df60 addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
@@ -3737,40 +3737,40 @@ L_105a9a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105a9c4: 0x105a9c4: addu  s0, v0, zero
+// 0x0105a9d4: 0x105a9d4: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0105a9c8: 0x105a9c8: beq   s0, zero, 0x105ab80 addiu v0, zero, -1
+// 0x0105a9d8: 0x105a9d8: beq   s0, zero, 0x105ab90 addiu v0, zero, -1
 	ldloc 8
 	ldc.i4.m1
 	stloc 5
-	brfalse L_105ab80
+	brfalse L_105ab90
 // --- basic block ---
-// 0x0105a9d0: 0x105a9d0: lw    v1, 0(s0)
+// 0x0105a9e0: 0x105a9e0: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105a9d4: 0x105a9d4: lui   v0, 0x70000
+// 0x0105a9e4: 0x105a9e4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105a9d8: 0x105a9d8: sw    v1, 10732(v0)
+// 0x0105a9e8: 0x105a9e8: sw    v1, 11196(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2683
+	ldc.i4 2799
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105a9dc: 0x105a9dc: lw    v1, 4(s0)
+// 0x0105a9ec: 0x105a9ec: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3779,17 +3779,17 @@ L_105a9a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105a9e0: 0x105a9e0: addiu v0, v0, 10732
+// 0x0105a9f0: 0x105a9f0: addiu v0, v0, 11196
 	ldloc 5
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc 5
-// 0x0105a9e4: 0x105a9e4: addiu s2, sp, 56
+// 0x0105a9f4: 0x105a9f4: addiu s2, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 10
-// 0x0105a9e8: 0x105a9e8: sw    v1, 4(v0)
+// 0x0105a9f8: 0x105a9f8: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3798,27 +3798,27 @@ L_105a9a4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105a9ec: 0x105a9ec: addiu s1, zero, 2
+// 0x0105a9fc: 0x105a9fc: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 9
-// 0x0105a9f0: 0x105a9f0: addiu v0, sp, 24
+// 0x0105aa00: 0x105aa00: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x0105a9f4: 0x105a9f4: addu  a0, s0, zero
+// 0x0105aa04: 0x105aa04: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105a9f8: 0x105a9f8: addu  a1, zero, zero
+// 0x0105aa08: 0x105aa08: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105a9fc: 0x105a9fc: addiu a2, zero, 600
+// 0x0105aa0c: 0x105aa0c: addiu a2, zero, 600
 	ldc.i4 600
 	stloc.3
-// 0x0105aa00: 0x105aa00: addu  a3, s2, zero
+// 0x0105aa10: 0x105aa10: addu  a3, s2, zero
 	ldloc 10
 	stloc 4
-// 0x0105aa04: 0x105aa04: sw    v0, 16(sp)
+// 0x0105aa14: 0x105aa14: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3827,7 +3827,7 @@ L_105a9a4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105aa08: 0x105aa08: jal   0x102ac0c sw    s1, 20(sp)
+// 0x0105aa18: 0x105aa18: jal   0x102ac1c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3841,17 +3841,17 @@ L_105a9a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_retrieve_line_102ac1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aa10: 0x105aa10: beq   v0, s4, 0x105aa28 sll   zero, zero, 0
+// 0x0105aa20: 0x105aa20: beq   v0, s4, 0x105aa38 sll   zero, zero, 0
 	ldloc 5
 	ldloc 12
-	beq  L_105aa28
+	beq  L_105aa38
 // --- basic block ---
-// 0x0105aa18: 0x105aa18: lw    v0, 56(sp)
+// 0x0105aa28: 0x105aa28: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3860,27 +3860,27 @@ L_105a9a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105aa1c: 0x105aa1c: sll   zero, zero, 0
-// 0x0105aa20: 0x105aa20: beq   v0, zero, 0x105aa6c addiu s3, s3, 14228
+// 0x0105aa2c: 0x105aa2c: sll   zero, zero, 0
+// 0x0105aa30: 0x105aa30: beq   v0, zero, 0x105aa7c addiu s3, s3, 14228
 	ldloc 5
 	ldloc 11
 	ldc.i4 14228
 	add
 	stloc 11
-	brfalse L_105aa6c
+	brfalse L_105aa7c
 // --- basic block ---
-L_105aa28:
-// 0x0105aa28: 0x105aa28: lw    v0, 0(s0)
+L_105aa38:
+// 0x0105aa38: 0x105aa38: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105aa2c: 0x105aa2c: lui   a1, 0x10000
+// 0x0105aa3c: 0x105aa3c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105aa30: 0x105aa30: sw    v0, 16(sp)
+// 0x0105aa40: 0x105aa40: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3889,7 +3889,7 @@ L_105aa28:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105aa34: 0x105aa34: lw    v0, 4(s0)
+// 0x0105aa44: 0x105aa44: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3898,26 +3898,26 @@ L_105aa28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105aa38: 0x105aa38: lui   a3, 0x10000
+// 0x0105aa48: 0x105aa48: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105aa3c: 0x105aa3c: addiu a1, a1, 8052
+// 0x0105aa4c: 0x105aa4c: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105aa40: 0x105aa40: addiu a3, a3, 9768
+// 0x0105aa50: 0x105aa50: addiu a3, a3, 9764
 	ldloc 4
-	ldc.i4 9768
+	ldc.i4 9764
 	add
 	stloc 4
-// 0x0105aa44: 0x105aa44: addiu a0, zero, 4
+// 0x0105aa54: 0x105aa54: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105aa48: 0x105aa48: addiu a2, zero, 508
+// 0x0105aa58: 0x105aa58: addiu a2, zero, 508
 	ldc.i4 508
 	stloc.3
-// 0x0105aa4c: 0x105aa4c: jal   0x100449c sw    v0, 20(sp)
+// 0x0105aa5c: 0x105aa5c: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3936,13 +3936,13 @@ L_105aa28:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aa54: 0x105aa54: lui   v0, 0x0
+// 0x0105aa64: 0x105aa64: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105aa58: 0x105aa58: addiu v1, zero, -1
+// 0x0105aa68: 0x105aa68: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0105aa5c: 0x105aa5c: sw    v1, 14228(v0)
+// 0x0105aa6c: 0x105aa6c: sw    v1, 14228(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3951,28 +3951,28 @@ L_105aa28:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105aa60: 0x105aa60: lui   v0, 0x70000
+// 0x0105aa70: 0x105aa70: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105aa64: 0x105aa64: j	 0x105ab7c sw    zero, 10728(v0)
+// 0x0105aa74: 0x105aa74: j	 0x105ab8c sw    zero, 11192(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2682
+	ldc.i4 2798
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_105ab7c
+	br L_105ab8c
 // --- basic block ---
-L_105aa6c:
-// 0x0105aa6c: 0x105aa6c: addu  a1, s2, zero
+L_105aa7c:
+// 0x0105aa7c: 0x105aa7c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x0105aa70: 0x105aa70: addu  a0, s3, zero
+// 0x0105aa80: 0x105aa80: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0105aa74: 0x105aa74: jal   0x1001800 addiu a2, zero, 20
+// 0x0105aa84: 0x105aa84: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -3984,10 +3984,10 @@ L_105aa6c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aa7c: 0x105aa7c: addu  a0, s3, zero
+// 0x0105aa8c: 0x105aa8c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0105aa80: 0x105aa80: jal   0x1014c00 addiu a1, zero, 1
+// 0x0105aa90: 0x105aa90: jal   0x1014c10 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3995,42 +3995,42 @@ L_105aa6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_plugin_get_direction_1014c00(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_plugin_get_direction_1014c10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aa88: 0x105aa88: beq   v0, zero, 0x105aaac sll   zero, zero, 0
+// 0x0105aa98: 0x105aa98: beq   v0, zero, 0x105aabc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105aaac
+	brfalse L_105aabc
 // --- basic block ---
-// 0x0105aa90: 0x105aa90: addiu v1, zero, 1
+// 0x0105aaa0: 0x105aaa0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105aa94: 0x105aa94: beq   v0, v1, 0x105ab50 sll   zero, zero, 0
+// 0x0105aaa4: 0x105aaa4: beq   v0, v1, 0x105ab60 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_105ab50
+	beq  L_105ab60
 // --- basic block ---
-// 0x0105aa9c: 0x105aa9c: beq   v0, s1, 0x105ab64 addiu v1, zero, 3
+// 0x0105aaac: 0x105aaac: beq   v0, s1, 0x105ab74 addiu v1, zero, 3
 	ldloc 5
 	ldloc 9
 	ldc.i4.3
 	stloc 7
-	beq  L_105ab64
+	beq  L_105ab74
 // --- basic block ---
-// 0x0105aaa4: 0x105aaa4: bne   v0, v1, 0x105ab68 lui   a2, 0x70000
+// 0x0105aab4: 0x105aab4: bne   v0, v1, 0x105ab78 lui   a2, 0x70000
 	ldloc 5
 	ldloc 7
 	ldc.i4 458752
 	stloc.3
-	bne.un L_105ab68
+	bne.un L_105ab78
 // --- basic block ---
-L_105aaac:
-// 0x0105aaac: 0x105aaac: lui   v0, 0x0
+L_105aabc:
+// 0x0105aabc: 0x105aabc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105aab0: 0x105aab0: lw    a0, 14232(v0)
+// 0x0105aac0: 0x105aac0: lw    a0, 14232(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4039,12 +4039,12 @@ L_105aaac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105aab4: 0x105aab4: addiu a2, sp, 32
+// 0x0105aac4: 0x105aac4: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0105aab8: 0x105aab8: jal   0x1003adc addiu a1, sp, 28
+// 0x0105aac8: 0x105aac8: jal   0x1003adc addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -4057,19 +4057,19 @@ L_105aaac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aac0: 0x105aac0: lui   v0, 0x20000
+// 0x0105aad0: 0x105aad0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0105aac4: 0x105aac4: lw    v1, 31228(v0)
+// 0x0105aad4: 0x105aad4: lw    v1, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105aac8: 0x105aac8: lw    v0, 28(sp)
+// 0x0105aad8: 0x105aad8: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4078,35 +4078,35 @@ L_105aaac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105aacc: 0x105aacc: addiu a1, sp, 40
+// 0x0105aadc: 0x105aadc: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x0105aad0: 0x105aad0: andi  v0, v0, 32767
+// 0x0105aae0: 0x105aae0: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x0105aad4: 0x105aad4: sll   v0, v0, 3
+// 0x0105aae4: 0x105aae4: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0105aad8: 0x105aad8: addu  v0, v1, v0
+// 0x0105aae8: 0x105aae8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0105aadc: 0x105aadc: lw    a0, 0(v0)
+// 0x0105aaec: 0x105aaec: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0105aae0: 0x105aae0: sll   zero, zero, 0
-// 0x0105aae4: 0x105aae4: sw    a0, 40(sp)
+// 0x0105aaf0: 0x105aaf0: sll   zero, zero, 0
+// 0x0105aaf4: 0x105aaf4: sw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4115,7 +4115,7 @@ L_105aaac:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105aae8: 0x105aae8: lw    a0, 4(v0)
+// 0x0105aaf8: 0x105aaf8: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4124,7 +4124,7 @@ L_105aaac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105aaec: 0x105aaec: lw    v0, 32(sp)
+// 0x0105aafc: 0x105aafc: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4133,7 +4133,7 @@ L_105aaac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105aaf0: 0x105aaf0: sw    a0, 44(sp)
+// 0x0105ab00: 0x105ab00: sw    a0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4142,32 +4142,32 @@ L_105aaac:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105aaf4: 0x105aaf4: andi  v0, v0, 32767
+// 0x0105ab04: 0x105ab04: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x0105aaf8: 0x105aaf8: sll   v0, v0, 3
+// 0x0105ab08: 0x105ab08: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0105aafc: 0x105aafc: addu  v0, v1, v0
+// 0x0105ab0c: 0x105ab0c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0105ab00: 0x105ab00: lw    v1, 0(v0)
+// 0x0105ab10: 0x105ab10: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105ab04: 0x105ab04: addu  a0, s0, zero
+// 0x0105ab14: 0x105ab14: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105ab08: 0x105ab08: sw    v1, 48(sp)
+// 0x0105ab18: 0x105ab18: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4176,7 +4176,7 @@ L_105aaac:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105ab0c: 0x105ab0c: lw    v0, 4(v0)
+// 0x0105ab1c: 0x105ab1c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4185,7 +4185,7 @@ L_105aaac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ab10: 0x105ab10: jal   0x1008eb0 sw    v0, 52(sp)
+// 0x0105ab20: 0x105ab20: jal   0x1008ec0 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4199,20 +4199,20 @@ L_105aaac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ab18: 0x105ab18: addu  a0, s0, zero
+// 0x0105ab28: 0x105ab28: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105ab1c: 0x105ab1c: addiu a1, sp, 48
+// 0x0105ab2c: 0x105ab2c: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x0105ab20: 0x105ab20: jal   0x1008eb0 addu  s1, v0, zero
+// 0x0105ab30: 0x105ab30: jal   0x1008ec0 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -4220,23 +4220,23 @@ L_105aaac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ab28: 0x105ab28: slt   v0, s1, v0
+// 0x0105ab38: 0x105ab38: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x0105ab2c: 0x105ab2c: beq   v0, zero, 0x105ab40 lui   v1, 0x70000
+// 0x0105ab3c: 0x105ab3c: beq   v0, zero, 0x105ab50 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 7
-	brfalse L_105ab40
+	brfalse L_105ab50
 // --- basic block ---
-// 0x0105ab34: 0x105ab34: lw    a0, 28(sp)
+// 0x0105ab44: 0x105ab44: lw    a0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4245,13 +4245,13 @@ L_105aaac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ab38: 0x105ab38: j	 0x105ab48 addu  v0, zero, zero
+// 0x0105ab48: 0x105ab48: j	 0x105ab58 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_105ab48
+	br L_105ab58
 // --- basic block ---
-L_105ab40:
-// 0x0105ab40: 0x105ab40: lw    a0, 32(sp)
+L_105ab50:
+// 0x0105ab50: 0x105ab50: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4260,26 +4260,26 @@ L_105ab40:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ab44: 0x105ab44: addu  v0, zero, zero
+// 0x0105ab54: 0x105ab54: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_105ab48:
-// 0x0105ab48: 0x105ab48: j	 0x105ab80 sw    a0, 10728(v1)
+L_105ab58:
+// 0x0105ab58: 0x105ab58: j	 0x105ab90 sw    a0, 11192(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2682
+	ldc.i4 2798
 	add
 	ldloc.1
 	stelem.i4
-	br L_105ab80
+	br L_105ab90
 // --- basic block ---
-L_105ab50:
-// 0x0105ab50: 0x105ab50: lui   a1, 0x70000
+L_105ab60:
+// 0x0105ab60: 0x105ab60: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0105ab54: 0x105ab54: lw    a0, 4(s3)
+// 0x0105ab64: 0x105ab64: lw    a0, 4(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4288,24 +4288,24 @@ L_105ab50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ab58: 0x105ab58: addiu a1, a1, 10728
+// 0x0105ab68: 0x105ab68: addiu a1, a1, 11192
 	ldloc.2
-	ldc.i4 10728
+	ldc.i4 11192
 	add
 	stloc.2
-// 0x0105ab5c: 0x105ab5c: j	 0x105ab74 addiu a2, sp, 32
+// 0x0105ab6c: 0x105ab6c: j	 0x105ab84 addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-	br L_105ab74
+	br L_105ab84
 // --- basic block ---
-L_105ab64:
-// 0x0105ab64: 0x105ab64: lui   a2, 0x70000
+L_105ab74:
+// 0x0105ab74: 0x105ab74: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-L_105ab68:
-// 0x0105ab68: 0x105ab68: lw    a0, 4(s3)
+L_105ab78:
+// 0x0105ab78: 0x105ab78: lw    a0, 4(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4314,18 +4314,18 @@ L_105ab68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ab6c: 0x105ab6c: addiu a2, a2, 10728
+// 0x0105ab7c: 0x105ab7c: addiu a2, a2, 11192
 	ldloc.3
-	ldc.i4 10728
+	ldc.i4 11192
 	add
 	stloc.3
-// 0x0105ab70: 0x105ab70: addiu a1, sp, 32
+// 0x0105ab80: 0x105ab80: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-L_105ab74:
-// 0x0105ab74: 0x105ab74: jal   0x1003adc sll   zero, zero, 0
+L_105ab84:
+// 0x0105ab84: 0x105ab84: jal   0x1003adc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -4334,15 +4334,15 @@ L_105ab74:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105ab7c:
-// 0x0105ab7c: 0x105ab7c: addu  v0, zero, zero
+L_105ab8c:
+// 0x0105ab8c: 0x105ab8c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_105ab80:
-// 0x0105ab80: 0x105ab80: addu  a0, s5, zero
+L_105ab90:
+// 0x0105ab90: 0x105ab90: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x0105ab84: 0x105ab84: jal   0x100b020 sw    v0, 96(sp)
+// 0x0105ab94: 0x105ab94: jal   0x100b030 sw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4356,13 +4356,13 @@ L_105ab80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_screen_scale_100b020(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_screen_scale_100b030(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ab8c: 0x105ab8c: lw    ra, 132(sp)
-// 0x0105ab90: 0x105ab90: lw    v0, 96(sp)
+// 0x0105ab9c: 0x105ab9c: lw    ra, 132(sp)
+// 0x0105aba0: 0x105aba0: lw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4371,7 +4371,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ab94: 0x105ab94: lw    s6, 128(sp)
+// 0x0105aba4: 0x105aba4: lw    s6, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4380,7 +4380,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105ab98: 0x105ab98: lw    s5, 124(sp)
+// 0x0105aba8: 0x105aba8: lw    s5, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4389,7 +4389,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105ab9c: 0x105ab9c: lw    s4, 120(sp)
+// 0x0105abac: 0x105abac: lw    s4, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4398,7 +4398,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105aba0: 0x105aba0: lw    s3, 116(sp)
+// 0x0105abb0: 0x105abb0: lw    s3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4407,7 +4407,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105aba4: 0x105aba4: lw    s2, 112(sp)
+// 0x0105abb4: 0x105abb4: lw    s2, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4416,7 +4416,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105aba8: 0x105aba8: lw    s1, 108(sp)
+// 0x0105abb8: 0x105abb8: lw    s1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4425,7 +4425,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105abac: 0x105abac: lw    s0, 104(sp)
+// 0x0105abbc: 0x105abbc: lw    s0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4434,7 +4434,7 @@ L_105ab80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105abb0: 0x105abb0: jr    ra addiu sp, sp, 136
+// 0x0105abc0: 0x105abc0: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -4446,7 +4446,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_recalc_route_105abb8(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_recalc_route_105abc8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 t0,int32 s1,int32 s0,int32 t1,int32 s3,int32 ra,int32 lo)
@@ -4502,12 +4502,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105abb8: 0x105abb8: addiu sp, sp, -136
+// 0x0105abc8: 0x105abc8: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x0105abbc: 0x105abbc: sw    s2, 124(sp)
+// 0x0105abcc: 0x105abcc: sw    s2, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4516,7 +4516,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105abc0: 0x105abc0: sw    s0, 116(sp)
+// 0x0105abd0: 0x105abd0: sw    s0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4525,8 +4525,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105abc4: 0x105abc4: sw    ra, 132(sp)
-// 0x0105abc8: 0x105abc8: sw    s3, 128(sp)
+// 0x0105abd4: 0x105abd4: sw    ra, 132(sp)
+// 0x0105abd8: 0x105abd8: sw    s3, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4535,7 +4535,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105abcc: 0x105abcc: sw    s1, 120(sp)
+// 0x0105abdc: 0x105abdc: sw    s1, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4544,43 +4544,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105abd0: 0x105abd0: addu  s0, a0, zero
+// 0x0105abe0: 0x105abe0: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0105abd4: 0x105abd4: addu  s2, zero, zero
+// 0x0105abe4: 0x105abe4: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0105abd8: 0x105abd8: cibyl_sysc_arg 0x12
+// 0x0105abe8: 0x105abe8: cibyl_sysc_arg 0x12
 	ldloc 8
-// 0x0105abdc: 0x105abdc: cibyl_sysc 0x2078
+// 0x0105abec: 0x105abec: cibyl_sysc 0x2078
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0105abe0: 0x105abe0: addu  s1, v0, zero
+// 0x0105abf0: 0x105abf0: addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0105abe4: 0x105abe4: lui   a1, 0x10000
+// 0x0105abf4: 0x105abf4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105abe8: 0x105abe8: lui   a3, 0x10000
+// 0x0105abf8: 0x105abf8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105abec: 0x105abec: addiu a1, a1, 8052
+// 0x0105abfc: 0x105abfc: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105abf0: 0x105abf0: addiu a3, a3, 9820
+// 0x0105ac00: 0x105ac00: addiu a3, a3, 9816
 	ldloc 4
-	ldc.i4 9820
+	ldc.i4 9816
 	add
 	stloc 4
-// 0x0105abf4: 0x105abf4: addiu a0, zero, 1
+// 0x0105ac04: 0x105ac04: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105abf8: 0x105abf8: addiu a2, zero, 1021
+// 0x0105ac08: 0x105ac08: addiu a2, zero, 1021
 	ldc.i4 1021
 	stloc.3
-// 0x0105abfc: 0x105abfc: jal   0x100449c sw    s0, 16(sp)
+// 0x0105ac0c: 0x105ac0c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4599,94 +4599,94 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ac04: 0x105ac04: cibyl_sysc_arg 0x12
+// 0x0105ac14: 0x105ac14: cibyl_sysc_arg 0x12
 	ldloc 8
-// 0x0105ac08: 0x105ac08: cibyl_sysc 0x207d
+// 0x0105ac18: 0x105ac18: cibyl_sysc 0x207d
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0105ac0c: 0x105ac0c: addu  s2, v0, zero
+// 0x0105ac1c: 0x105ac1c: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0105ac10: 0x105ac10: lui   v0, 0x70000
+// 0x0105ac20: 0x105ac20: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ac14: 0x105ac14: lw    v0, 9184(v0)
+// 0x0105ac24: 0x105ac24: lw    v0, 9648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2296
+	ldc.i4 2412
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ac18: 0x105ac18: addiu s2, s2, -59
+// 0x0105ac28: 0x105ac28: addiu s2, s2, -59
 	ldloc 8
 	ldc.i4.s -59
 	add
 	stloc 8
-// 0x0105ac1c: 0x105ac1c: slt   s2, v0, s2
+// 0x0105ac2c: 0x105ac2c: slt   s2, v0, s2
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 8
-// 0x0105ac20: 0x105ac20: beq   s2, zero, 0x105b158 addiu v0, zero, -1
+// 0x0105ac30: 0x105ac30: beq   s2, zero, 0x105b168 addiu v0, zero, -1
 	ldloc 8
 	ldc.i4.m1
 	stloc 5
-	brfalse L_105b158
+	brfalse L_105b168
 // --- basic block ---
-// 0x0105ac28: 0x105ac28: lui   v0, 0x70000
+// 0x0105ac38: 0x105ac38: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ac2c: 0x105ac2c: lw    v1, 9180(v0)
+// 0x0105ac3c: 0x105ac3c: lw    v1, 9644(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2295
+	ldc.i4 2411
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ac30: 0x105ac30: sll   zero, zero, 0
-// 0x0105ac34: 0x105ac34: bne   v1, zero, 0x105ac40 sll   zero, zero, 0
+// 0x0105ac40: 0x105ac40: sll   zero, zero, 0
+// 0x0105ac44: 0x105ac44: bne   v1, zero, 0x105ac50 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_105ac40
+	brtrue L_105ac50
 // --- basic block ---
-// 0x0105ac3c: 0x105ac3c: sw    s1, 9180(v0)
+// 0x0105ac4c: 0x105ac4c: sw    s1, 9644(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2295
+	ldc.i4 2411
 	add
 	ldloc 10
 	stelem.i4
-L_105ac40:
-// 0x0105ac40: 0x105ac40: jal   0x10629a4 sll   zero, zero, 0
-	call int32 Cibyl73::navigate_route_load_data_10629a4()
+L_105ac50:
+// 0x0105ac50: 0x105ac50: jal   0x10629b4 sll   zero, zero, 0
+	call int32 Cibyl73::navigate_route_load_data_10629b4()
 	stloc 5
 // --- basic block ---
-// 0x0105ac48: 0x105ac48: bltz  v0, 0x105b158 addiu v0, zero, -1
+// 0x0105ac58: 0x105ac58: bltz  v0, 0x105b168 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
 	ldc.i4.s 0
-	blt L_105b158
+	blt L_105b168
 // --- basic block ---
-// 0x0105ac50: 0x105ac50: addiu a0, sp, 80
+// 0x0105ac60: 0x105ac60: addiu a0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x0105ac54: 0x105ac54: addiu a1, sp, 64
+// 0x0105ac64: 0x105ac64: addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x0105ac58: 0x105ac58: addu  a2, zero, zero
+// 0x0105ac68: 0x105ac68: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105ac5c: 0x105ac5c: jal   0x105a610 addiu a3, zero, 1
+// 0x0105ac6c: 0x105ac6c: jal   0x105a620 addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
 	ldloc.0
@@ -4694,19 +4694,19 @@ L_105ac40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::T_391_105a610(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::T_391_105a620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ac64: 0x105ac64: bltz  v0, 0x105b154 lui   v0, 0x0
+// 0x0105ac74: 0x105ac74: bltz  v0, 0x105b164 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_105b154
+	blt L_105b164
 // --- basic block ---
-// 0x0105ac6c: 0x105ac6c: lw    v1, 80(sp)
+// 0x0105ac7c: 0x105ac7c: lw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4715,7 +4715,7 @@ L_105ac40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ac70: 0x105ac70: lw    a0, 14248(v0)
+// 0x0105ac80: 0x105ac80: lw    a0, 14248(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4724,24 +4724,24 @@ L_105ac40:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ac74: 0x105ac74: sll   zero, zero, 0
-// 0x0105ac78: 0x105ac78: bne   v1, a0, 0x105ad0c sll   zero, zero, 0
+// 0x0105ac84: 0x105ac84: sll   zero, zero, 0
+// 0x0105ac88: 0x105ac88: bne   v1, a0, 0x105ad1c sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_105ad0c
+	bne.un L_105ad1c
 // --- basic block ---
-// 0x0105ac80: 0x105ac80: bne   v1, zero, 0x105aca0 lui   v1, 0x0
+// 0x0105ac90: 0x105ac90: bne   v1, zero, 0x105acb0 lui   v1, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	brtrue L_105aca0
+	brtrue L_105acb0
 // --- basic block ---
-// 0x0105ac88: 0x105ac88: addiu v0, v0, 14248
+// 0x0105ac98: 0x105ac98: addiu v0, v0, 14248
 	ldloc 5
 	ldc.i4 14248
 	add
 	stloc 5
-// 0x0105ac8c: 0x105ac8c: lw    v0, 12(v0)
+// 0x0105ac9c: 0x105ac9c: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4750,7 +4750,7 @@ L_105ac40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ac90: 0x105ac90: lw    v1, 92(sp)
+// 0x0105aca0: 0x105aca0: lw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4759,21 +4759,21 @@ L_105ac40:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ac94: 0x105ac94: sll   zero, zero, 0
-// 0x0105ac98: 0x105ac98: bne   v1, v0, 0x105ad0c lui   v1, 0x0
+// 0x0105aca4: 0x105aca4: sll   zero, zero, 0
+// 0x0105aca8: 0x105aca8: bne   v1, v0, 0x105ad1c lui   v1, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	bne.un L_105ad0c
+	bne.un L_105ad1c
 // --- basic block ---
-L_105aca0:
-// 0x0105aca0: 0x105aca0: addiu v1, v1, 14248
+L_105acb0:
+// 0x0105acb0: 0x105acb0: addiu v1, v1, 14248
 	ldloc 7
 	ldc.i4 14248
 	add
 	stloc 7
-// 0x0105aca4: 0x105aca4: lw    v0, 84(sp)
+// 0x0105acb4: 0x105acb4: lw    v0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4782,7 +4782,7 @@ L_105aca0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105aca8: 0x105aca8: lw    a0, 4(v1)
+// 0x0105acb8: 0x105acb8: lw    a0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4791,13 +4791,13 @@ L_105aca0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105acac: 0x105acac: sll   zero, zero, 0
-// 0x0105acb0: 0x105acb0: bne   v0, a0, 0x105ad0c sll   zero, zero, 0
+// 0x0105acbc: 0x105acbc: sll   zero, zero, 0
+// 0x0105acc0: 0x105acc0: bne   v0, a0, 0x105ad1c sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_105ad0c
+	bne.un L_105ad1c
 // --- basic block ---
-// 0x0105acb8: 0x105acb8: lw    v1, 16(v1)
+// 0x0105acc8: 0x105acc8: lw    v1, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4806,7 +4806,7 @@ L_105aca0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105acbc: 0x105acbc: lw    a0, 96(sp)
+// 0x0105accc: 0x105accc: lw    a0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4815,15 +4815,15 @@ L_105aca0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105acc0: 0x105acc0: sll   zero, zero, 0
-// 0x0105acc4: 0x105acc4: bne   a0, v1, 0x105ad0c lui   v1, 0x0
+// 0x0105acd0: 0x105acd0: sll   zero, zero, 0
+// 0x0105acd4: 0x105acd4: bne   a0, v1, 0x105ad1c lui   v1, 0x0
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 0
 	stloc 7
-	bne.un L_105ad0c
+	bne.un L_105ad1c
 // --- basic block ---
-// 0x0105accc: 0x105accc: lw    v1, 14268(v1)
+// 0x0105acdc: 0x105acdc: lw    v1, 14268(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4832,7 +4832,7 @@ L_105aca0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105acd0: 0x105acd0: lw    a0, 64(sp)
+// 0x0105ace0: 0x105ace0: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4841,15 +4841,15 @@ L_105aca0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105acd4: 0x105acd4: sll   zero, zero, 0
-// 0x0105acd8: 0x105acd8: bne   a0, v1, 0x105ad0c lui   a1, 0x10000
+// 0x0105ace4: 0x105ace4: sll   zero, zero, 0
+// 0x0105ace8: 0x105ace8: bne   a0, v1, 0x105ad1c lui   a1, 0x10000
 	ldloc.1
 	ldloc 7
 	ldc.i4 65536
 	stloc.2
-	bne.un L_105ad0c
+	bne.un L_105ad1c
 // --- basic block ---
-// 0x0105ace0: 0x105ace0: lw    v1, 92(sp)
+// 0x0105acf0: 0x105acf0: lw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4858,26 +4858,26 @@ L_105aca0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ace4: 0x105ace4: lui   a3, 0x10000
+// 0x0105acf4: 0x105acf4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105ace8: 0x105ace8: addiu a1, a1, 8052
+// 0x0105acf8: 0x105acf8: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105acec: 0x105acec: addiu a3, a3, 9852
+// 0x0105acfc: 0x105acfc: addiu a3, a3, 9848
 	ldloc 4
-	ldc.i4 9852
+	ldc.i4 9848
 	add
 	stloc 4
-// 0x0105acf0: 0x105acf0: addiu a0, zero, 4
+// 0x0105ad00: 0x105ad00: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105acf4: 0x105acf4: addiu a2, zero, 1042
+// 0x0105ad04: 0x105ad04: addiu a2, zero, 1042
 	ldc.i4 1042
 	stloc.3
-// 0x0105acf8: 0x105acf8: sw    v1, 16(sp)
+// 0x0105ad08: 0x105ad08: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4886,7 +4886,7 @@ L_105aca0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105acfc: 0x105acfc: jal   0x100449c sw    v0, 20(sp)
+// 0x0105ad0c: 0x105ad0c: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4905,23 +4905,23 @@ L_105aca0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ad04: 0x105ad04: j	 0x105b158 addiu v0, zero, -1
+// 0x0105ad14: 0x105ad14: j	 0x105b168 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_105b158
+	br L_105b168
 // --- basic block ---
-L_105ad0c:
-// 0x0105ad0c: 0x105ad0c: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
+L_105ad1c:
+// 0x0105ad1c: 0x105ad1c: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
 // --- basic block ---
-// 0x0105ad14: 0x105ad14: beq   v0, zero, 0x105b158 addiu v0, zero, -1
+// 0x0105ad24: 0x105ad24: beq   v0, zero, 0x105b168 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_105b158
+	brfalse L_105b168
 // --- basic block ---
-// 0x0105ad1c: 0x105ad1c: jal   0x1057080 addiu s3, sp, 80
+// 0x0105ad2c: 0x105ad2c: jal   0x1057090 addiu s3, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -4931,23 +4931,23 @@ L_105ad0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_main_suspend_navigation_1057080(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_main_suspend_navigation_1057090(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ad24: 0x105ad24: lui   a0, 0x0
+// 0x0105ad34: 0x105ad34: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105ad28: 0x105ad28: addiu a0, a0, 14272
+// 0x0105ad38: 0x105ad38: addiu a0, a0, 14272
 	ldloc.1
 	ldc.i4 14272
 	add
 	stloc.1
-// 0x0105ad2c: 0x105ad2c: addu  a1, s3, zero
+// 0x0105ad3c: 0x105ad3c: addu  a1, s3, zero
 	ldloc 13
 	stloc.2
-// 0x0105ad30: 0x105ad30: jal   0x1001800 addiu a2, zero, 20
+// 0x0105ad40: 0x105ad40: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -4959,7 +4959,7 @@ L_105ad0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ad38: 0x105ad38: lw    v1, 64(sp)
+// 0x0105ad48: 0x105ad48: lw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4968,13 +4968,13 @@ L_105ad0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ad3c: 0x105ad3c: lui   v0, 0x0
+// 0x0105ad4c: 0x105ad4c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105ad40: 0x105ad40: addiu a0, zero, 2
+// 0x0105ad50: 0x105ad50: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105ad44: 0x105ad44: jal   0x1050ad4 sw    v1, 14292(v0)
+// 0x0105ad54: 0x105ad54: jal   0x1050ae4 sw    v1, 14292(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4988,41 +4988,41 @@ L_105ad0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ad4c: 0x105ad4c: lui   v0, 0x70000
+// 0x0105ad5c: 0x105ad5c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ad50: 0x105ad50: lw    v1, 10700(v0)
+// 0x0105ad60: 0x105ad60: lw    v1, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ad54: 0x105ad54: lui   v0, 0x70000
+// 0x0105ad64: 0x105ad64: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ad58: 0x105ad58: lw    v0, 9188(v0)
+// 0x0105ad68: 0x105ad68: lw    v0, 9652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ad5c: 0x105ad5c: ori   v1, v1, 2
+// 0x0105ad6c: 0x105ad6c: ori   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	or
 	stloc 7
-// 0x0105ad60: 0x105ad60: beq   v0, zero, 0x105ae68 sw    v1, 68(sp)
+// 0x0105ad70: 0x105ad70: beq   v0, zero, 0x105ae78 sw    v1, 68(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5032,53 +5032,53 @@ L_105ad0c:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_105ae68
+	brfalse L_105ae78
 // --- basic block ---
-// 0x0105ad68: 0x105ad68: lui   v0, 0x70000
+// 0x0105ad78: 0x105ad78: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ad6c: 0x105ad6c: lw    v0, 9180(v0)
+// 0x0105ad7c: 0x105ad7c: lw    v0, 9644(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2295
+	ldc.i4 2411
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ad70: 0x105ad70: sll   zero, zero, 0
-// 0x0105ad74: 0x105ad74: addiu v0, v0, 59
+// 0x0105ad80: 0x105ad80: sll   zero, zero, 0
+// 0x0105ad84: 0x105ad84: addiu v0, v0, 59
 	ldloc 5
 	ldc.i4.s 59
 	add
 	stloc 5
-// 0x0105ad78: 0x105ad78: slt   s1, v0, s1
+// 0x0105ad88: 0x105ad88: slt   s1, v0, s1
 	ldloc 5
 	ldloc 10
 	clt
 	stloc 10
-// 0x0105ad7c: 0x105ad7c: bne   s1, zero, 0x105ae68 sll   zero, zero, 0
+// 0x0105ad8c: 0x105ad8c: bne   s1, zero, 0x105ae78 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_105ae68
+	brtrue L_105ae78
 // --- basic block ---
-// 0x0105ad84: 0x105ad84: jal   0x106c170 sll   zero, zero, 0
+// 0x0105ad94: 0x105ad94: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ad8c: 0x105ad8c: bne   v0, zero, 0x105ae68 addiu s2, zero, -13
+// 0x0105ad9c: 0x105ad9c: bne   v0, zero, 0x105ae78 addiu s2, zero, -13
 	ldloc 5
 	ldc.i4.s -13
 	stloc 8
-	brtrue L_105ae68
+	brtrue L_105ae78
 // --- basic block ---
-// 0x0105ad94: 0x105ad94: lw    v0, 68(sp)
+// 0x0105ada4: 0x105ada4: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5087,18 +5087,18 @@ L_105ad0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ad98: 0x105ad98: sll   zero, zero, 0
-// 0x0105ad9c: 0x105ad9c: and   v0, v0, s2
+// 0x0105ada8: 0x105ada8: sll   zero, zero, 0
+// 0x0105adac: 0x105adac: and   v0, v0, s2
 	ldloc 5
 	ldloc 8
 	and
 	stloc 5
-// 0x0105ada0: 0x105ada0: ori   v0, v0, 4
+// 0x0105adb0: 0x105adb0: ori   v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	or
 	stloc 5
-// 0x0105ada4: 0x105ada4: jal   0x1061324 sw    v0, 68(sp)
+// 0x0105adb4: 0x105adb4: jal   0x1061334 sw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5107,31 +5107,31 @@ L_105ad0c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl72::navigate_cost_reset_1061324()
+	call int32 Cibyl72::navigate_cost_reset_1061334()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105adac: 0x105adac: lui   a1, 0x10000
+// 0x0105adbc: 0x105adbc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105adb0: 0x105adb0: lui   a3, 0x10000
+// 0x0105adc0: 0x105adc0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105adb4: 0x105adb4: addiu a1, a1, 8052
+// 0x0105adc4: 0x105adc4: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105adb8: 0x105adb8: addiu a3, a3, 9896
+// 0x0105adc8: 0x105adc8: addiu a3, a3, 9892
 	ldloc 4
-	ldc.i4 9896
+	ldc.i4 9892
 	add
 	stloc 4
-// 0x0105adbc: 0x105adbc: addiu a0, zero, 4
+// 0x0105adcc: 0x105adcc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105adc0: 0x105adc0: jal   0x100449c addiu a2, zero, 1070
+// 0x0105add0: 0x105add0: jal   0x100449c addiu a2, zero, 1070
 	ldc.i4 1070
 	stloc.3
 	ldloc.0
@@ -5144,18 +5144,18 @@ L_105ad0c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105adc8: 0x105adc8: lui   t0, 0x70000
+// 0x0105add8: 0x105add8: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0105adcc: 0x105adcc: addiu t0, t0, 10724
+// 0x0105addc: 0x105addc: addiu t0, t0, 11188
 	ldloc 9
-	ldc.i4 10724
+	ldc.i4 11188
 	add
 	stloc 9
-// 0x0105add0: 0x105add0: lui   v0, 0x70000
+// 0x0105ade0: 0x105ade0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105add4: 0x105add4: sw    t0, 16(sp)
+// 0x0105ade4: 0x105ade4: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5164,24 +5164,24 @@ L_105ad0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105add8: 0x105add8: lui   s1, 0x70000
+// 0x0105ade8: 0x105ade8: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105addc: 0x105addc: addiu t0, sp, 76
+// 0x0105adec: 0x105adec: addiu t0, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 9
-// 0x0105ade0: 0x105ade0: lw    v1, 10720(v0)
+// 0x0105adf0: 0x105adf0: lw    v1, 11184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ade4: 0x105ade4: sw    t0, 20(sp)
+// 0x0105adf4: 0x105adf4: sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5190,21 +5190,21 @@ L_105ad0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105ade8: 0x105ade8: lw    v0, 9168(s1)
+// 0x0105adf8: 0x105adf8: lw    v0, 9632(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105adec: 0x105adec: addiu t0, sp, 72
+// 0x0105adfc: 0x105adfc: addiu t0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 9
-// 0x0105adf0: 0x105adf0: lw    a1, 64(sp)
+// 0x0105ae00: 0x105ae00: lw    a1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5213,13 +5213,13 @@ L_105ad0c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105adf4: 0x105adf4: lui   a2, 0x0
+// 0x0105ae04: 0x105ae04: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0105adf8: 0x105adf8: lui   a3, 0x70000
+// 0x0105ae08: 0x105ae08: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105adfc: 0x105adfc: sw    t0, 24(sp)
+// 0x0105ae0c: 0x105ae0c: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5228,25 +5228,25 @@ L_105ad0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105ae00: 0x105ae00: addu  a0, s3, zero
+// 0x0105ae10: 0x105ae10: addu  a0, s3, zero
 	ldloc 13
 	stloc.1
-// 0x0105ae04: 0x105ae04: addiu t0, sp, 68
+// 0x0105ae14: 0x105ae14: addiu t0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 9
-// 0x0105ae08: 0x105ae08: addiu a2, a2, 14228
+// 0x0105ae18: 0x105ae18: addiu a2, a2, 14228
 	ldloc.3
 	ldc.i4 14228
 	add
 	stloc.3
-// 0x0105ae0c: 0x105ae0c: addiu a3, a3, 10728
+// 0x0105ae1c: 0x105ae1c: addiu a3, a3, 11192
 	ldloc 4
-	ldc.i4 10728
+	ldc.i4 11192
 	add
 	stloc 4
-// 0x0105ae10: 0x105ae10: sw    v1, 32(sp)
+// 0x0105ae20: 0x105ae20: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5255,7 +5255,7 @@ L_105ad0c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105ae14: 0x105ae14: sw    t0, 28(sp)
+// 0x0105ae24: 0x105ae24: sw    t0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5264,7 +5264,7 @@ L_105ad0c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105ae18: 0x105ae18: jal   0x106354c sw    v0, 36(sp)
+// 0x0105ae28: 0x105ae28: jal   0x106355c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5278,12 +5278,12 @@ L_105ad0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_get_segments_106354c(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_get_segments_106355c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ae20: 0x105ae20: lw    v1, 68(sp)
+// 0x0105ae30: 0x105ae30: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5292,18 +5292,18 @@ L_105ad0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ae24: 0x105ae24: sll   zero, zero, 0
-// 0x0105ae28: 0x105ae28: and   s2, v1, s2
+// 0x0105ae34: 0x105ae34: sll   zero, zero, 0
+// 0x0105ae38: 0x105ae38: and   s2, v1, s2
 	ldloc 7
 	ldloc 8
 	and
 	stloc 8
-// 0x0105ae2c: 0x105ae2c: ori   s2, s2, 8
+// 0x0105ae3c: 0x105ae3c: ori   s2, s2, 8
 	ldloc 8
 	ldc.i4.8
 	or
 	stloc 8
-// 0x0105ae30: 0x105ae30: blez  v0, 0x105ae60 sw    s2, 68(sp)
+// 0x0105ae40: 0x105ae40: blez  v0, 0x105ae70 sw    s2, 68(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5314,9 +5314,9 @@ L_105ad0c:
 	ldloc 8
 	stelem.i4
 	ldc.i4.s 0
-	ble L_105ae60
+	ble L_105ae70
 // --- basic block ---
-// 0x0105ae38: 0x105ae38: lw    v1, 72(sp)
+// 0x0105ae48: 0x105ae48: lw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5325,16 +5325,16 @@ L_105ad0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ae3c: 0x105ae3c: lw    a1, 9168(s1)
+// 0x0105ae4c: 0x105ae4c: lw    a1, 9632(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105ae40: 0x105ae40: lw    a0, 76(sp)
+// 0x0105ae50: 0x105ae50: lw    a0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5343,113 +5343,113 @@ L_105ad0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ae44: 0x105ae44: addu  a1, v1, a1
+// 0x0105ae54: 0x105ae54: addu  a1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc.2
-// 0x0105ae48: 0x105ae48: subu  a1, a1, a0
+// 0x0105ae58: 0x105ae58: subu  a1, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.2
-// 0x0105ae4c: 0x105ae4c: lui   a0, 0x70000
+// 0x0105ae5c: 0x105ae5c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105ae50: 0x105ae50: sw    a1, 9176(a0)
+// 0x0105ae60: 0x105ae60: sw    a1, 9640(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105ae54: 0x105ae54: lui   a0, 0x70000
+// 0x0105ae64: 0x105ae64: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105ae58: 0x105ae58: j	 0x105b08c sw    v1, 9172(a0)
+// 0x0105ae68: 0x105ae68: j	 0x105b09c sw    v1, 9636(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldloc 7
 	stelem.i4
-	br L_105b08c
+	br L_105b09c
 // --- basic block ---
-L_105ae60:
-// 0x0105ae60: 0x105ae60: beq   v0, zero, 0x105b090 addiu a0, zero, 1
+L_105ae70:
+// 0x0105ae70: 0x105ae70: beq   v0, zero, 0x105b0a0 addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brfalse L_105b090
+	brfalse L_105b0a0
 // --- basic block ---
-L_105ae68:
-// 0x0105ae68: 0x105ae68: jal   0x106c170 sll   zero, zero, 0
+L_105ae78:
+// 0x0105ae78: 0x105ae78: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ae70: 0x105ae70: beq   v0, zero, 0x105afdc addiu v1, zero, 1
+// 0x0105ae80: 0x105ae80: beq   v0, zero, 0x105afec addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brfalse L_105afdc
+	brfalse L_105afec
 // --- basic block ---
-// 0x0105ae78: 0x105ae78: lui   v0, 0x70000
+// 0x0105ae88: 0x105ae88: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ae7c: 0x105ae7c: lui   a1, 0x10000
+// 0x0105ae8c: 0x105ae8c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105ae80: 0x105ae80: lui   a3, 0x10000
+// 0x0105ae90: 0x105ae90: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105ae84: 0x105ae84: sw    v1, 9188(v0)
+// 0x0105ae94: 0x105ae94: sw    v1, 9652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105ae88: 0x105ae88: addiu a1, a1, 8052
+// 0x0105ae98: 0x105ae98: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105ae8c: 0x105ae8c: lui   v0, 0x70000
+// 0x0105ae9c: 0x105ae9c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ae90: 0x105ae90: addiu a3, a3, 9924
+// 0x0105aea0: 0x105aea0: addiu a3, a3, 9920
 	ldloc 4
-	ldc.i4 9924
+	ldc.i4 9920
 	add
 	stloc 4
-// 0x0105ae94: 0x105ae94: addiu a0, zero, 4
+// 0x0105aea4: 0x105aea4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105ae98: 0x105ae98: addiu a2, zero, 1090
+// 0x0105aea8: 0x105aea8: addiu a2, zero, 1090
 	ldc.i4 1090
 	stloc.3
-// 0x0105ae9c: 0x105ae9c: lui   s1, 0x70000
+// 0x0105aeac: 0x105aeac: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105aea0: 0x105aea0: jal   0x100449c sw    zero, 9192(v0)
+// 0x0105aeb0: 0x105aeb0: jal   0x100449c sw    zero, 9656(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2298
+	ldc.i4 2414
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5463,34 +5463,34 @@ L_105ae68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aea8: 0x105aea8: lw    v0, 9996(s1)
+// 0x0105aeb8: 0x105aeb8: lw    v0, 10460(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2499
+	ldc.i4 2615
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105aeac: 0x105aeac: sll   zero, zero, 0
-// 0x0105aeb0: 0x105aeb0: blez  v0, 0x105aee8 sll   a0, v0, 3
+// 0x0105aebc: 0x105aebc: sll   zero, zero, 0
+// 0x0105aec0: 0x105aec0: blez  v0, 0x105aef8 sll   a0, v0, 3
 	ldloc 5
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc.1
 	ldc.i4.s 0
-	ble L_105aee8
+	ble L_105aef8
 // --- basic block ---
-// 0x0105aeb8: 0x105aeb8: lui   s2, 0x70000
+// 0x0105aec8: 0x105aec8: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105aebc: 0x105aebc: jal   0x1000910 sw    v0, 10024(s2)
+// 0x0105aecc: 0x105aecc: jal   0x1000910 sw    v0, 10488(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldloc 5
 	stelem.i4
@@ -5504,40 +5504,40 @@ L_105ae68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aec4: 0x105aec4: lw    a2, 10024(s2)
+// 0x0105aed4: 0x105aed4: lw    a2, 10488(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105aec8: 0x105aec8: lui   a1, 0x70000
+// 0x0105aed8: 0x105aed8: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0105aecc: 0x105aecc: lui   v1, 0x70000
+// 0x0105aedc: 0x105aedc: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105aed0: 0x105aed0: addu  a0, v0, zero
+// 0x0105aee0: 0x105aee0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105aed4: 0x105aed4: addiu a1, a1, 10752
+// 0x0105aee4: 0x105aee4: addiu a1, a1, 11216
 	ldloc.2
-	ldc.i4 10752
+	ldc.i4 11216
 	add
 	stloc.2
-// 0x0105aed8: 0x105aed8: sll   a2, a2, 3
+// 0x0105aee8: 0x105aee8: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x0105aedc: 0x105aedc: jal   0x1001800 sw    v0, 10028(v1)
+// 0x0105aeec: 0x105aeec: jal   0x1001800 sw    v0, 10492(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldloc 5
 	stelem.i4
@@ -5550,66 +5550,66 @@ L_105ae68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105aee4: 0x105aee4: sw    zero, 9996(s1)
+// 0x0105aef4: 0x105aef4: sw    zero, 10460(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2499
+	ldc.i4 2615
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_105aee8:
-// 0x0105aee8: 0x105aee8: lui   v0, 0x70000
+L_105aef8:
+// 0x0105aef8: 0x105aef8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105aeec: 0x105aeec: lw    v0, 9200(v0)
+// 0x0105aefc: 0x105aefc: lw    v0, 9664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2300
+	ldc.i4 2416
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105aef0: 0x105aef0: addiu a0, zero, 1
+// 0x0105af00: 0x105af00: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105aef4: 0x105aef4: lui   v1, 0x70000
+// 0x0105af04: 0x105af04: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105aef8: 0x105aef8: beq   v0, zero, 0x105af1c sw    a0, 9196(v1)
+// 0x0105af08: 0x105af08: beq   v0, zero, 0x105af2c sw    a0, 9660(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2299
+	ldc.i4 2415
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_105af1c
+	brfalse L_105af2c
 // --- basic block ---
-// 0x0105af00: 0x105af00: addiu v0, zero, 1000
+// 0x0105af10: 0x105af10: addiu v0, zero, 1000
 	ldc.i4 1000
 	stloc 5
-// 0x0105af04: 0x105af04: mult  s0, v0
+// 0x0105af14: 0x105af14: mult  s0, v0
 	ldloc 11
 	ldloc 5
 	mul
 	stloc 15
-// 0x0105af08: 0x105af08: lui   a1, 0x1050000
+// 0x0105af18: 0x105af18: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0105af0c: 0x105af0c: addiu a1, a1, 29052
+// 0x0105af1c: 0x105af1c: addiu a1, a1, 29068
 	ldloc.2
-	ldc.i4 29052
+	ldc.i4 29068
 	add
 	stloc.2
-// 0x0105af10: 0x105af10: mflo  lo
+// 0x0105af20: 0x105af20: mflo  lo
 	ldloc 15
 	stloc 11
-// 0x0105af14: 0x105af14: jal   0x104fe98 addiu a0, s0, 300
+// 0x0105af24: 0x105af24: jal   0x104fea8 addiu a0, s0, 300
 	ldloc 11
 	ldc.i4 300
 	add
@@ -5619,21 +5619,21 @@ L_105aee8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105af1c:
-// 0x0105af1c: 0x105af1c: lui   a1, 0x1050000
+L_105af2c:
+// 0x0105af2c: 0x105af2c: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0105af20: 0x105af20: addiu a1, a1, 28868
+// 0x0105af30: 0x105af30: addiu a1, a1, 28884
 	ldloc.2
-	ldc.i4 28868
+	ldc.i4 28884
 	add
 	stloc.2
-// 0x0105af24: 0x105af24: jal   0x104fe98 addiu a0, zero, 30000
+// 0x0105af34: 0x105af34: jal   0x104fea8 addiu a0, zero, 30000
 	ldc.i4 30000
 	stloc.1
 	ldloc.0
@@ -5641,20 +5641,20 @@ L_105af1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105af2c: 0x105af2c: lui   v0, 0x70000
+// 0x0105af3c: 0x105af3c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105af30: 0x105af30: addiu v0, v0, 10732
+// 0x0105af40: 0x105af40: addiu v0, v0, 11196
 	ldloc 5
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc 5
-// 0x0105af34: 0x105af34: sw    v0, 16(sp)
+// 0x0105af44: 0x105af44: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5663,15 +5663,15 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af38: 0x105af38: lui   v0, 0x70000
+// 0x0105af48: 0x105af48: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105af3c: 0x105af3c: addiu v0, v0, 9204
+// 0x0105af4c: 0x105af4c: addiu v0, v0, 9668
 	ldloc 5
-	ldc.i4 9204
+	ldc.i4 9668
 	add
 	stloc 5
-// 0x0105af40: 0x105af40: sw    v0, 20(sp)
+// 0x0105af50: 0x105af50: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5680,15 +5680,15 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af44: 0x105af44: lui   v0, 0x70000
+// 0x0105af54: 0x105af54: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105af48: 0x105af48: addiu v0, v0, 9460
+// 0x0105af58: 0x105af58: addiu v0, v0, 9924
 	ldloc 5
-	ldc.i4 9460
+	ldc.i4 9924
 	add
 	stloc 5
-// 0x0105af4c: 0x105af4c: sw    v0, 24(sp)
+// 0x0105af5c: 0x105af5c: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5697,15 +5697,15 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af50: 0x105af50: lui   v0, 0x70000
+// 0x0105af60: 0x105af60: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105af54: 0x105af54: addiu v0, v0, 9484
+// 0x0105af64: 0x105af64: addiu v0, v0, 9948
 	ldloc 5
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	stloc 5
-// 0x0105af58: 0x105af58: sw    v0, 28(sp)
+// 0x0105af68: 0x105af68: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5714,15 +5714,15 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af5c: 0x105af5c: lui   v0, 0x70000
+// 0x0105af6c: 0x105af6c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105af60: 0x105af60: addiu v0, v0, 9740
+// 0x0105af70: 0x105af70: addiu v0, v0, 10204
 	ldloc 5
-	ldc.i4 9740
+	ldc.i4 10204
 	add
 	stloc 5
-// 0x0105af64: 0x105af64: sw    v0, 32(sp)
+// 0x0105af74: 0x105af74: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5731,7 +5731,7 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af68: 0x105af68: lw    v0, 68(sp)
+// 0x0105af78: 0x105af78: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5740,7 +5740,7 @@ L_105af1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105af6c: 0x105af6c: lw    a1, 64(sp)
+// 0x0105af7c: 0x105af7c: lw    a1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5749,7 +5749,7 @@ L_105af1c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105af70: 0x105af70: sw    v0, 44(sp)
+// 0x0105af80: 0x105af80: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5758,10 +5758,10 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af74: 0x105af74: addiu v0, zero, -1
+// 0x0105af84: 0x105af84: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105af78: 0x105af78: sw    v0, 48(sp)
+// 0x0105af88: 0x105af88: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5770,10 +5770,10 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af7c: 0x105af7c: addiu v0, zero, 1
+// 0x0105af8c: 0x105af8c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105af80: 0x105af80: sw    v0, 52(sp)
+// 0x0105af90: 0x105af90: sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5782,31 +5782,31 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105af84: 0x105af84: lui   a3, 0x70000
+// 0x0105af94: 0x105af94: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105af88: 0x105af88: lui   v0, 0x0
+// 0x0105af98: 0x105af98: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105af8c: 0x105af8c: addiu v0, v0, 14296
+// 0x0105af9c: 0x105af9c: addiu v0, v0, 14296
 	ldloc 5
 	ldc.i4 14296
 	add
 	stloc 5
-// 0x0105af90: 0x105af90: addiu a3, a3, 10740
+// 0x0105afa0: 0x105afa0: addiu a3, a3, 11204
 	ldloc 4
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc 4
-// 0x0105af94: 0x105af94: addiu a0, sp, 80
+// 0x0105afa4: 0x105afa4: addiu a0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x0105af98: 0x105af98: addu  a2, zero, zero
+// 0x0105afa8: 0x105afa8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105af9c: 0x105af9c: sw    v0, 56(sp)
+// 0x0105afac: 0x105afac: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5815,7 +5815,7 @@ L_105af1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105afa0: 0x105afa0: sw    zero, 36(sp)
+// 0x0105afb0: 0x105afb0: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5824,7 +5824,7 @@ L_105af1c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105afa4: 0x105afa4: jal   0x1064224 sw    zero, 40(sp)
+// 0x0105afb4: 0x105afb4: jal   0x1064234 sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5838,40 +5838,40 @@ L_105af1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_request_1064224(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_request_1064234(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105afac: 0x105afac: jal   0x1029d84 sll   zero, zero, 0
-	call int32 Cibyl31::roadmap_navigate_resume_route_1029d84()
+// 0x0105afbc: 0x105afbc: jal   0x1029d94 sll   zero, zero, 0
+	call int32 Cibyl31::roadmap_navigate_resume_route_1029d94()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105afb4: 0x105afb4: addu  v1, zero, zero
+// 0x0105afc4: 0x105afc4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0105afb8: 0x105afb8: cibyl_sysc_arg 0x3
+// 0x0105afc8: 0x105afc8: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0105afbc: 0x105afbc: cibyl_sysc 0x2082
+// 0x0105afcc: 0x105afcc: cibyl_sysc 0x2082
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0105afc0: 0x105afc0: addu  v1, v0, zero
+// 0x0105afd0: 0x105afd0: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0105afc4: 0x105afc4: lui   v0, 0x70000
+// 0x0105afd4: 0x105afd4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105afc8: 0x105afc8: addiu a0, zero, 1
+// 0x0105afd8: 0x105afd8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105afcc: 0x105afcc: jal   0x1050ad4 sw    v1, 9184(v0)
+// 0x0105afdc: 0x105afdc: jal   0x1050ae4 sw    v1, 9648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2296
+	ldc.i4 2412
 	add
 	ldloc 7
 	stelem.i4
@@ -5880,18 +5880,18 @@ L_105af1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105afd4: 0x105afd4: j	 0x105b158 addiu v0, zero, -1
+// 0x0105afe4: 0x105afe4: j	 0x105b168 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_105b158
+	br L_105b168
 // --- basic block ---
-L_105afdc:
-// 0x0105afdc: 0x105afdc: jal   0x1057434 lui   s0, 0x10000
+L_105afec:
+// 0x0105afec: 0x105afec: jal   0x1057444 lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 11
 	ldloc.0
@@ -5899,63 +5899,63 @@ L_105afdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_local_calc_enabled_1057434(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_local_calc_enabled_1057444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105afe4: 0x105afe4: beq   v0, zero, 0x105b074 lui   a3, 0x10000
+// 0x0105aff4: 0x105aff4: beq   v0, zero, 0x105b084 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brfalse L_105b074
+	brfalse L_105b084
 // --- basic block ---
-// 0x0105afec: 0x105afec: lui   v0, 0x70000
+// 0x0105affc: 0x105affc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105aff0: 0x105aff0: sw    zero, 9188(v0)
+// 0x0105b000: 0x105b000: sw    zero, 9652(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105aff4: 0x105aff4: lui   v0, 0x70000
+// 0x0105b004: 0x105b004: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105aff8: 0x105aff8: jal   0x1061324 sw    zero, 9996(v0)
+// 0x0105b008: 0x105b008: jal   0x1061334 sw    zero, 10460(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2499
+	ldc.i4 2615
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl72::navigate_cost_reset_1061324()
+	call int32 Cibyl72::navigate_cost_reset_1061334()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b000: 0x105b000: lui   a3, 0x10000
+// 0x0105b010: 0x105b010: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b004: 0x105b004: addiu a1, s0, 8052
+// 0x0105b014: 0x105b014: addiu a1, s0, 8048
 	ldloc 11
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b008: 0x105b008: addiu a3, a3, 9948
+// 0x0105b018: 0x105b018: addiu a3, a3, 9944
 	ldloc 4
-	ldc.i4 9948
+	ldc.i4 9944
 	add
 	stloc 4
-// 0x0105b00c: 0x105b00c: addiu a0, zero, 4
+// 0x0105b01c: 0x105b01c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105b010: 0x105b010: jal   0x100449c addiu a2, zero, 1111
+// 0x0105b020: 0x105b020: jal   0x100449c addiu a2, zero, 1111
 	ldc.i4 1111
 	stloc.3
 	ldloc.0
@@ -5968,36 +5968,36 @@ L_105afdc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b018: 0x105b018: lui   t0, 0x70000
+// 0x0105b028: 0x105b028: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0105b01c: 0x105b01c: lui   t1, 0x70000
+// 0x0105b02c: 0x105b02c: lui   t1, 0x70000
 	ldc.i4 458752
 	stloc 12
-// 0x0105b020: 0x105b020: lw    v0, 9168(t0)
+// 0x0105b030: 0x105b030: lw    v0, 9632(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b024: 0x105b024: addiu t0, t0, 9168
+// 0x0105b034: 0x105b034: addiu t0, t0, 9632
 	ldloc 9
-	ldc.i4 9168
+	ldc.i4 9632
 	add
 	stloc 9
-// 0x0105b028: 0x105b028: lw    v1, 10720(t1)
+// 0x0105b038: 0x105b038: lw    v1, 11184(t1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b02c: 0x105b02c: sw    t0, 20(sp)
+// 0x0105b03c: 0x105b03c: sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6006,7 +6006,7 @@ L_105afdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105b030: 0x105b030: lw    a1, 64(sp)
+// 0x0105b040: 0x105b040: lw    a1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6015,23 +6015,23 @@ L_105afdc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b034: 0x105b034: addiu t0, sp, 72
+// 0x0105b044: 0x105b044: addiu t0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 9
-// 0x0105b038: 0x105b038: lui   a2, 0x0
+// 0x0105b048: 0x105b048: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0105b03c: 0x105b03c: lui   a3, 0x70000
+// 0x0105b04c: 0x105b04c: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105b040: 0x105b040: addiu t1, t1, 10720
+// 0x0105b050: 0x105b050: addiu t1, t1, 11184
 	ldloc 12
-	ldc.i4 10720
+	ldc.i4 11184
 	add
 	stloc 12
-// 0x0105b044: 0x105b044: sw    t0, 24(sp)
+// 0x0105b054: 0x105b054: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6040,27 +6040,27 @@ L_105afdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105b048: 0x105b048: addiu a2, a2, 14228
+// 0x0105b058: 0x105b058: addiu a2, a2, 14228
 	ldloc.3
 	ldc.i4 14228
 	add
 	stloc.3
-// 0x0105b04c: 0x105b04c: addiu t0, sp, 68
+// 0x0105b05c: 0x105b05c: addiu t0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 9
-// 0x0105b050: 0x105b050: addiu a3, a3, 10728
+// 0x0105b060: 0x105b060: addiu a3, a3, 11192
 	ldloc 4
-	ldc.i4 10728
+	ldc.i4 11192
 	add
 	stloc 4
-// 0x0105b054: 0x105b054: addiu a0, sp, 80
+// 0x0105b064: 0x105b064: addiu a0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.1
-// 0x0105b058: 0x105b058: sw    t1, 16(sp)
+// 0x0105b068: 0x105b068: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6069,7 +6069,7 @@ L_105afdc:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105b05c: 0x105b05c: sw    t0, 28(sp)
+// 0x0105b06c: 0x105b06c: sw    t0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6078,7 +6078,7 @@ L_105afdc:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105b060: 0x105b060: sw    v1, 32(sp)
+// 0x0105b070: 0x105b070: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6087,7 +6087,7 @@ L_105afdc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105b064: 0x105b064: jal   0x106354c sw    v0, 36(sp)
+// 0x0105b074: 0x105b074: jal   0x106355c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6101,31 +6101,31 @@ L_105afdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_get_segments_106354c(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_get_segments_106355c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b06c: 0x105b06c: j	 0x105b090 addiu a0, zero, 1
+// 0x0105b07c: 0x105b07c: j	 0x105b0a0 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-	br L_105b090
+	br L_105b0a0
 // --- basic block ---
-L_105b074:
-// 0x0105b074: 0x105b074: addiu a1, s0, 8052
+L_105b084:
+// 0x0105b084: 0x105b084: addiu a1, s0, 8048
 	ldloc 11
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b078: 0x105b078: addiu a3, a3, 9976
+// 0x0105b088: 0x105b088: addiu a3, a3, 9972
 	ldloc 4
-	ldc.i4 9976
+	ldc.i4 9972
 	add
 	stloc 4
-// 0x0105b07c: 0x105b07c: addiu a0, zero, 4
+// 0x0105b08c: 0x105b08c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105b080: 0x105b080: jal   0x100449c addiu a2, zero, 1119
+// 0x0105b090: 0x105b090: jal   0x100449c addiu a2, zero, 1119
 	ldc.i4 1119
 	stloc.3
 	ldloc.0
@@ -6138,15 +6138,15 @@ L_105b074:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b088: 0x105b088: addiu v0, zero, -1
+// 0x0105b098: 0x105b098: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_105b08c:
-// 0x0105b08c: 0x105b08c: addiu a0, zero, 1
+L_105b09c:
+// 0x0105b09c: 0x105b09c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_105b090:
-// 0x0105b090: 0x105b090: jal   0x1050ad4 sw    v0, 104(sp)
+L_105b0a0:
+// 0x0105b0a0: 0x105b0a0: jal   0x1050ae4 sw    v0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6160,12 +6160,12 @@ L_105b090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_cursor_1050ad4(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_cursor_1050ae4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b098: 0x105b098: lw    v0, 104(sp)
+// 0x0105b0a8: 0x105b0a8: lw    v0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6174,71 +6174,71 @@ L_105b090:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b09c: 0x105b09c: sll   zero, zero, 0
-// 0x0105b0a0: 0x105b0a0: blez  v0, 0x105b154 sll   zero, zero, 0
+// 0x0105b0ac: 0x105b0ac: sll   zero, zero, 0
+// 0x0105b0b0: 0x105b0b0: blez  v0, 0x105b164 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_105b154
+	ble L_105b164
 // --- basic block ---
-// 0x0105b0a8: 0x105b0a8: jal   0x1029d84 sll   zero, zero, 0
-	call int32 Cibyl31::roadmap_navigate_resume_route_1029d84()
+// 0x0105b0b8: 0x105b0b8: jal   0x1029d94 sll   zero, zero, 0
+	call int32 Cibyl31::roadmap_navigate_resume_route_1029d94()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b0b0: 0x105b0b0: jal   0x105f3a4 sll   zero, zero, 0
+// 0x0105b0c0: 0x105b0c0: jal   0x105f3b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_initialize_105f3a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_initialize_105f3b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b0b8: 0x105b0b8: lui   v0, 0x70000
+// 0x0105b0c8: 0x105b0c8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b0bc: 0x105b0bc: lw    a1, 9172(v0)
+// 0x0105b0cc: 0x105b0cc: lw    a1, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b0c0: 0x105b0c0: lui   v0, 0x70000
+// 0x0105b0d0: 0x105b0d0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b0c4: 0x105b0c4: lw    v1, 9168(v0)
+// 0x0105b0d4: 0x105b0d4: lw    v1, 9632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b0c8: 0x105b0c8: lui   v0, 0x70000
+// 0x0105b0d8: 0x105b0d8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b0cc: 0x105b0cc: lw    v0, 9176(v0)
+// 0x0105b0dc: 0x105b0dc: lw    v0, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b0d0: 0x105b0d0: addu  a1, a1, v1
+// 0x0105b0e0: 0x105b0e0: addu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc.2
-// 0x0105b0d4: 0x105b0d4: lw    v1, 68(sp)
+// 0x0105b0e4: 0x105b0e4: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6247,15 +6247,15 @@ L_105b090:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b0d8: 0x105b0d8: subu  a1, a1, v0
+// 0x0105b0e8: 0x105b0e8: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0105b0dc: 0x105b0dc: lui   v0, 0x70000
+// 0x0105b0ec: 0x105b0ec: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b0e0: 0x105b0e0: lw    a2, 72(sp)
+// 0x0105b0f0: 0x105b0f0: lw    a2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6264,40 +6264,40 @@ L_105b090:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105b0e4: 0x105b0e4: sw    v1, 10700(v0)
+// 0x0105b0f4: 0x105b0f4: sw    v1, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105b0e8: 0x105b0e8: lui   a3, 0x70000
+// 0x0105b0f8: 0x105b0f8: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105b0ec: 0x105b0ec: lui   a0, 0x1050000
+// 0x0105b0fc: 0x105b0fc: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0105b0f0: 0x105b0f0: lui   v0, 0x70000
+// 0x0105b100: 0x105b100: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b0f4: 0x105b0f4: addiu a3, a3, 10740
+// 0x0105b104: 0x105b104: addiu a3, a3, 11204
 	ldloc 4
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc 4
-// 0x0105b0f8: 0x105b0f8: addiu a0, a0, 25676
+// 0x0105b108: 0x105b108: addiu a0, a0, 25692
 	ldloc.1
-	ldc.i4 25676
+	ldc.i4 25692
 	add
 	stloc.1
-// 0x0105b0fc: 0x105b0fc: addiu v0, v0, 10732
+// 0x0105b10c: 0x105b10c: addiu v0, v0, 11196
 	ldloc 5
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc 5
-// 0x0105b100: 0x105b100: jal   0x105d848 sw    v0, 16(sp)
+// 0x0105b110: 0x105b110: jal   0x105d858 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6311,82 +6311,82 @@ L_105b090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_prepare_segments_105d848(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_prepare_segments_105d858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b108: 0x105b108: addiu v1, zero, 1
+// 0x0105b118: 0x105b118: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105b10c: 0x105b10c: lui   v0, 0x70000
+// 0x0105b11c: 0x105b11c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b110: 0x105b110: addiu a0, zero, 1
+// 0x0105b120: 0x105b120: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105b114: 0x105b114: jal   0x105e2e4 sw    v1, 9160(v0)
+// 0x0105b124: 0x105b124: jal   0x105e2f4 sw    v1, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldloc 7
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_mode_105e2e4(int32)
+	call int32 Cibyl70::navigate_bar_set_mode_105e2f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b11c: 0x105b11c: lui   v0, 0x70000
+// 0x0105b12c: 0x105b12c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b120: 0x105b120: lui   a1, 0x10000
+// 0x0105b130: 0x105b130: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105b124: 0x105b124: lui   a3, 0x10000
+// 0x0105b134: 0x105b134: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b128: 0x105b128: sw    zero, 9164(v0)
+// 0x0105b138: 0x105b138: sw    zero, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105b12c: 0x105b12c: addiu a1, a1, 8052
+// 0x0105b13c: 0x105b13c: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b130: 0x105b130: lui   v0, 0x70000
+// 0x0105b140: 0x105b140: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b134: 0x105b134: addiu a3, a3, 10020
+// 0x0105b144: 0x105b144: addiu a3, a3, 10016
 	ldloc 4
-	ldc.i4 10020
+	ldc.i4 10016
 	add
 	stloc 4
-// 0x0105b138: 0x105b138: addiu a0, zero, 1
+// 0x0105b148: 0x105b148: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105b13c: 0x105b13c: addiu a2, zero, 1144
+// 0x0105b14c: 0x105b14c: addiu a2, zero, 1144
 	ldc.i4 1144
 	stloc.3
-// 0x0105b140: 0x105b140: sw    zero, 10008(v0)
+// 0x0105b150: 0x105b150: sw    zero, 10472(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105b144: 0x105b144: jal   0x100449c sw    zero, 16(sp)
+// 0x0105b154: 0x105b154: jal   0x100449c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6405,18 +6405,18 @@ L_105b090:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b14c: 0x105b14c: j	 0x105b158 addu  v0, zero, zero
+// 0x0105b15c: 0x105b15c: j	 0x105b168 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_105b158
+	br L_105b168
 // --- basic block ---
-L_105b154:
-// 0x0105b154: 0x105b154: addiu v0, zero, -1
+L_105b164:
+// 0x0105b164: 0x105b164: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_105b158:
-// 0x0105b158: 0x105b158: lw    ra, 132(sp)
-// 0x0105b15c: 0x105b15c: lw    s3, 128(sp)
+L_105b168:
+// 0x0105b168: 0x105b168: lw    ra, 132(sp)
+// 0x0105b16c: 0x105b16c: lw    s3, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6425,7 +6425,7 @@ L_105b158:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105b160: 0x105b160: lw    s2, 124(sp)
+// 0x0105b170: 0x105b170: lw    s2, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6434,7 +6434,7 @@ L_105b158:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105b164: 0x105b164: lw    s1, 120(sp)
+// 0x0105b174: 0x105b174: lw    s1, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6443,7 +6443,7 @@ L_105b158:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105b168: 0x105b168: lw    s0, 116(sp)
+// 0x0105b178: 0x105b178: lw    s0, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6452,7 +6452,7 @@ L_105b158:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105b16c: 0x105b16c: jr    ra addiu sp, sp, 136
+// 0x0105b17c: 0x105b17c: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -6464,7 +6464,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_on_segment_ver_mismatch_105b174(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_on_segment_ver_mismatch_105b184(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 t0,int32[] mem,int32 s0,int32 ra,int32 lo)
@@ -6508,26 +6508,26 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105b174:
-// 0x0105b174: 0x105b174: lui   v0, 0x70000
+L_105b184:
+// 0x0105b184: 0x105b184: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b178: 0x105b178: lw    v0, 9160(v0)
+// 0x0105b188: 0x105b188: lw    v0, 9624(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b17c: 0x105b17c: addiu sp, sp, -1032
+// 0x0105b18c: 0x105b18c: addiu sp, sp, -1032
 	ldloc.0
 	ldc.i4 -1032
 	add
 	stloc.0
-// 0x0105b180: 0x105b180: sw    ra, 1028(sp)
-// 0x0105b184: 0x105b184: bne   v0, zero, 0x105b1b0 sw    s0, 1024(sp)
+// 0x0105b190: 0x105b190: sw    ra, 1028(sp)
+// 0x0105b194: 0x105b194: bne   v0, zero, 0x105b1c0 sw    s0, 1024(sp)
 	ldloc 5
 	ldloc 8
 	ldloc.0
@@ -6537,28 +6537,28 @@ L_105b174:
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_105b1b0
+	brtrue L_105b1c0
 // --- basic block ---
-// 0x0105b18c: 0x105b18c: lui   a1, 0x10000
+// 0x0105b19c: 0x105b19c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105b190: 0x105b190: lui   a3, 0x10000
+// 0x0105b1a0: 0x105b1a0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b194: 0x105b194: addiu a1, a1, 8052
+// 0x0105b1a4: 0x105b1a4: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b198: 0x105b198: addiu a3, a3, 10048
+// 0x0105b1a8: 0x105b1a8: addiu a3, a3, 10044
 	ldloc 4
-	ldc.i4 10048
+	ldc.i4 10044
 	add
 	stloc 4
-// 0x0105b19c: 0x105b19c: addiu a0, zero, 3
+// 0x0105b1ac: 0x105b1ac: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105b1a0: 0x105b1a0: jal   0x100449c addiu a2, zero, 1184
+// 0x0105b1b0: 0x105b1b0: jal   0x100449c addiu a2, zero, 1184
 	ldc.i4 1184
 	stloc.3
 	ldloc.0
@@ -6571,88 +6571,88 @@ L_105b174:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105b1a8: 0x105b1a8: j	 0x105b294 sll   zero, zero, 0
-	br L_105b294
+// 0x0105b1b8: 0x105b1b8: j	 0x105b2a4 sll   zero, zero, 0
+	br L_105b2a4
 // --- basic block ---
-L_105b1b0:
-// 0x0105b1b0: 0x105b1b0: addu  t0, zero, zero
+L_105b1c0:
+// 0x0105b1c0: 0x105b1c0: addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0105b1b4: 0x105b1b4: cibyl_sysc_arg 0x8
+// 0x0105b1c4: 0x105b1c4: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x0105b1b8: 0x105b1b8: cibyl_sysc 0x2087
+// 0x0105b1c8: 0x105b1c8: cibyl_sysc 0x2087
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0105b1bc: 0x105b1bc: addu  a0, v0, zero
+// 0x0105b1cc: 0x105b1cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105b1c0: 0x105b1c0: lui   v1, 0x70000
+// 0x0105b1d0: 0x105b1d0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105b1c4: 0x105b1c4: lw    v0, 10376(v1)
+// 0x0105b1d4: 0x105b1d4: lw    v0, 10840(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2594
+	ldc.i4 2710
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b1c8: 0x105b1c8: sll   zero, zero, 0
-// 0x0105b1cc: 0x105b1cc: subu  a0, a0, v0
+// 0x0105b1d8: 0x105b1d8: sll   zero, zero, 0
+// 0x0105b1dc: 0x105b1dc: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-// 0x0105b1d0: 0x105b1d0: ori   v0, zero, 43201
+// 0x0105b1e0: 0x105b1e0: ori   v0, zero, 43201
 	ldc.i4.s 0
 	ldc.i4 43201
 	or
 	stloc 5
-// 0x0105b1d4: 0x105b1d4: slt   a0, a0, v0
+// 0x0105b1e4: 0x105b1e4: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x0105b1d8: 0x105b1d8: bne   a0, zero, 0x105b258 lui   a1, 0x10000
+// 0x0105b1e8: 0x105b1e8: bne   a0, zero, 0x105b268 lui   a1, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc.2
-	brtrue L_105b258
+	brtrue L_105b268
 // --- basic block ---
-// 0x0105b1e0: 0x105b1e0: cibyl_sysc_arg 0x8
+// 0x0105b1f0: 0x105b1f0: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x0105b1e4: 0x105b1e4: cibyl_sysc 0x208c
+// 0x0105b1f4: 0x105b1f4: cibyl_sysc 0x208c
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0105b1e8: 0x105b1e8: addu  t0, v0, zero
+// 0x0105b1f8: 0x105b1f8: addu  t0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0105b1ec: 0x105b1ec: lui   a3, 0x10000
+// 0x0105b1fc: 0x105b1fc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b1f0: 0x105b1f0: addiu a1, a1, 8052
+// 0x0105b200: 0x105b200: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b1f4: 0x105b1f4: addiu a3, a3, 10128
+// 0x0105b204: 0x105b204: addiu a3, a3, 10124
 	ldloc 4
-	ldc.i4 10128
+	ldc.i4 10124
 	add
 	stloc 4
-// 0x0105b1f8: 0x105b1f8: addiu a2, zero, 1197
+// 0x0105b208: 0x105b208: addiu a2, zero, 1197
 	ldc.i4 1197
 	stloc.3
-// 0x0105b1fc: 0x105b1fc: addiu a0, zero, 3
+// 0x0105b20c: 0x105b20c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105b200: 0x105b200: jal   0x100449c sw    t0, 10376(v1)
+// 0x0105b210: 0x105b210: jal   0x100449c sw    t0, 10840(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2594
+	ldc.i4 2710
 	add
 	ldloc 7
 	stelem.i4
@@ -6666,7 +6666,7 @@ L_105b1b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105b208: 0x105b208: jal   0x10569ac addiu s0, sp, 24
+// 0x0105b218: 0x105b218: jal   0x10569bc addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6676,17 +6676,17 @@ L_105b1b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_play_sound_10569ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_play_sound_10569bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105b210: 0x105b210: lui   a0, 0x10000
+// 0x0105b220: 0x105b220: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105b214: 0x105b214: jal   0x101cd60 addiu a0, a0, 10180
+// 0x0105b224: 0x105b224: jal   0x101cd70 addiu a0, a0, 10176
 	ldloc.1
-	ldc.i4 10180
+	ldc.i4 10176
 	add
 	stloc.1
 	ldloc.0
@@ -6694,26 +6694,26 @@ L_105b1b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105b21c: 0x105b21c: lui   a2, 0x10000
+// 0x0105b22c: 0x105b22c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105b220: 0x105b220: addu  a3, v0, zero
+// 0x0105b230: 0x105b230: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105b224: 0x105b224: addu  a0, s0, zero
+// 0x0105b234: 0x105b234: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0105b228: 0x105b228: addiu a2, a2, 19912
+// 0x0105b238: 0x105b238: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0105b22c: 0x105b22c: jal   0x1000f9c addiu a1, zero, 1000
+// 0x0105b23c: 0x105b23c: jal   0x1000f9c addiu a1, zero, 1000
 	ldc.i4 1000
 	stloc.2
 	ldloc.0
@@ -6726,18 +6726,18 @@ L_105b1b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105b234: 0x105b234: lui   a0, 0x10000
+// 0x0105b244: 0x105b244: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105b238: 0x105b238: addiu a0, a0, 10220
+// 0x0105b248: 0x105b248: addiu a0, a0, 10216
 	ldloc.1
-	ldc.i4 10220
+	ldc.i4 10216
 	add
 	stloc.1
-// 0x0105b23c: 0x105b23c: addu  a1, s0, zero
+// 0x0105b24c: 0x105b24c: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0105b240: 0x105b240: jal   0x104bfe4 addiu a2, zero, 5
+// 0x0105b250: 0x105b250: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -6745,12 +6745,12 @@ L_105b1b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105b248: 0x105b248: jal   0x105abb8 addiu a0, zero, 5
+// 0x0105b258: 0x105b258: jal   0x105abc8 addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
 	ldloc.0
@@ -6758,68 +6758,68 @@ L_105b1b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_recalc_route_105abb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_recalc_route_105abc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105b250: 0x105b250: j	 0x105b294 sll   zero, zero, 0
-	br L_105b294
+// 0x0105b260: 0x105b260: j	 0x105b2a4 sll   zero, zero, 0
+	br L_105b2a4
 // --- basic block ---
-L_105b258:
-// 0x0105b258: 0x105b258: cibyl_sysc_arg 0x8
+L_105b268:
+// 0x0105b268: 0x105b268: cibyl_sysc_arg 0x8
 	ldloc 7
-// 0x0105b25c: 0x105b25c: cibyl_sysc 0x2091
+// 0x0105b26c: 0x105b26c: cibyl_sysc 0x2091
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0105b260: 0x105b260: addu  t0, v0, zero
+// 0x0105b270: 0x105b270: addu  t0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0105b264: 0x105b264: lw    v1, 10376(v1)
+// 0x0105b274: 0x105b274: lw    v1, 10840(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2594
+	ldc.i4 2710
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105b268: 0x105b268: addiu v0, zero, 3600
+// 0x0105b278: 0x105b278: addiu v0, zero, 3600
 	ldc.i4 3600
 	stloc 5
-// 0x0105b26c: 0x105b26c: subu  t0, t0, v1
+// 0x0105b27c: 0x105b27c: subu  t0, t0, v1
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 7
-// 0x0105b270: 0x105b270: div   t0, v0
+// 0x0105b280: 0x105b280: div   t0, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 11
-// 0x0105b274: 0x105b274: lui   a3, 0x10000
+// 0x0105b284: 0x105b284: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b278: 0x105b278: addiu a1, a1, 8052
+// 0x0105b288: 0x105b288: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b27c: 0x105b27c: addiu a3, a3, 10232
+// 0x0105b28c: 0x105b28c: addiu a3, a3, 10228
 	ldloc 4
-	ldc.i4 10232
+	ldc.i4 10228
 	add
 	stloc 4
-// 0x0105b280: 0x105b280: addiu a0, zero, 3
+// 0x0105b290: 0x105b290: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105b284: 0x105b284: addiu a2, zero, 1191
+// 0x0105b294: 0x105b294: addiu a2, zero, 1191
 	ldc.i4 1191
 	stloc.3
-// 0x0105b288: 0x105b288: mflo  lo
+// 0x0105b298: 0x105b298: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0105b28c: 0x105b28c: jal   0x100449c sw    v0, 16(sp)
+// 0x0105b29c: 0x105b29c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6838,9 +6838,9 @@ L_105b258:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105b294:
-// 0x0105b294: 0x105b294: lw    ra, 1028(sp)
-// 0x0105b298: 0x105b298: lw    s0, 1024(sp)
+L_105b2a4:
+// 0x0105b2a4: 0x105b2a4: lw    ra, 1028(sp)
+// 0x0105b2a8: 0x105b2a8: lw    s0, 1024(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6849,7 +6849,7 @@ L_105b294:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105b29c: 0x105b29c: jr    ra addiu sp, sp, 1032
+// 0x0105b2ac: 0x105b2ac: jr    ra addiu sp, sp, 1032
 	ldloc.0
 	ldc.i4 1032
 	add
diff --git a/converted/Cibyl68.j b/converted/Cibyl68.j
index b3dbdf7..da15082 100644
--- a/converted/Cibyl68.j
+++ b/converted/Cibyl68.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl68::.ctor
 
-.method public static int32 navigate_main_on_suggest_reroute_105b2a4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_on_suggest_reroute_105b2b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 lo,int32 ra,int32 t0,int32 t1)
@@ -97,26 +97,26 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105b2a4:
-// 0x0105b2a4: 0x105b2a4: lui   v0, 0x70000
+L_105b2b4:
+// 0x0105b2b4: 0x105b2b4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105b2a8: 0x105b2a8: lw    v1, 9160(v0)
+// 0x0105b2b8: 0x105b2b8: lw    v1, 9624(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105b2ac: 0x105b2ac: addiu sp, sp, -1080
+// 0x0105b2bc: 0x105b2bc: addiu sp, sp, -1080
 	ldloc.0
 	ldc.i4 -1080
 	add
 	stloc.0
-// 0x0105b2b0: 0x105b2b0: sw    ra, 1076(sp)
-// 0x0105b2b4: 0x105b2b4: sw    s3, 1072(sp)
+// 0x0105b2c0: 0x105b2c0: sw    ra, 1076(sp)
+// 0x0105b2c4: 0x105b2c4: sw    s3, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -125,7 +125,7 @@ L_105b2a4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105b2b8: 0x105b2b8: sw    s2, 1068(sp)
+// 0x0105b2c8: 0x105b2c8: sw    s2, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -134,7 +134,7 @@ L_105b2a4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105b2bc: 0x105b2bc: sw    s1, 1064(sp)
+// 0x0105b2cc: 0x105b2cc: sw    s1, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -143,7 +143,7 @@ L_105b2a4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105b2c0: 0x105b2c0: sw    s0, 1060(sp)
+// 0x0105b2d0: 0x105b2d0: sw    s0, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -152,32 +152,32 @@ L_105b2a4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105b2c4: 0x105b2c4: bne   v1, zero, 0x105b2f0 addu  v0, a0, zero
+// 0x0105b2d4: 0x105b2d4: bne   v1, zero, 0x105b300 addu  v0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brtrue L_105b2f0
+	brtrue L_105b300
 // --- basic block ---
-// 0x0105b2cc: 0x105b2cc: lui   a1, 0x10000
+// 0x0105b2dc: 0x105b2dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105b2d0: 0x105b2d0: lui   a3, 0x10000
+// 0x0105b2e0: 0x105b2e0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b2d4: 0x105b2d4: addiu a1, a1, 8052
+// 0x0105b2e4: 0x105b2e4: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b2d8: 0x105b2d8: addiu a3, a3, 10320
+// 0x0105b2e8: 0x105b2e8: addiu a3, a3, 10316
 	ldloc 4
-	ldc.i4 10320
+	ldc.i4 10316
 	add
 	stloc 4
-// 0x0105b2dc: 0x105b2dc: addiu a0, zero, 3
+// 0x0105b2ec: 0x105b2ec: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105b2e0: 0x105b2e0: jal   0x100449c addiu a2, zero, 1155
+// 0x0105b2f0: 0x105b2f0: jal   0x100449c addiu a2, zero, 1155
 	ldc.i4 1155
 	stloc.3
 	ldloc.0
@@ -190,54 +190,54 @@ L_105b2a4:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b2e8: 0x105b2e8: j	 0x105b408 sll   zero, zero, 0
-	br L_105b408
+// 0x0105b2f8: 0x105b2f8: j	 0x105b418 sll   zero, zero, 0
+	br L_105b418
 // --- basic block ---
-L_105b2f0:
-// 0x0105b2f0: 0x105b2f0: lui   v1, 0x70000
+L_105b300:
+// 0x0105b300: 0x105b300: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105b2f4: 0x105b2f4: lw    v1, 9164(v1)
+// 0x0105b304: 0x105b304: lw    v1, 9628(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105b2f8: 0x105b2f8: sll   zero, zero, 0
-// 0x0105b2fc: 0x105b2fc: slt   a0, v1, a0
+// 0x0105b308: 0x105b308: sll   zero, zero, 0
+// 0x0105b30c: 0x105b30c: slt   a0, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc.1
-// 0x0105b300: 0x105b300: bne   a0, zero, 0x105b330 lui   a3, 0x10000
+// 0x0105b310: 0x105b310: bne   a0, zero, 0x105b340 lui   a3, 0x10000
 	ldloc.1
 	ldc.i4 65536
 	stloc 4
-	brtrue L_105b330
+	brtrue L_105b340
 // --- basic block ---
-// 0x0105b308: 0x105b308: lui   a1, 0x10000
+// 0x0105b318: 0x105b318: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105b30c: 0x105b30c: addiu a1, a1, 8052
+// 0x0105b31c: 0x105b31c: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b310: 0x105b310: addiu a3, a3, 10368
+// 0x0105b320: 0x105b320: addiu a3, a3, 10364
 	ldloc 4
-	ldc.i4 10368
+	ldc.i4 10364
 	add
 	stloc 4
-// 0x0105b314: 0x105b314: addiu a0, zero, 3
+// 0x0105b324: 0x105b324: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105b318: 0x105b318: addiu a2, zero, 1160
+// 0x0105b328: 0x105b328: addiu a2, zero, 1160
 	ldc.i4 1160
 	stloc.3
-// 0x0105b31c: 0x105b31c: sw    v1, 16(sp)
+// 0x0105b32c: 0x105b32c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -246,7 +246,7 @@ L_105b2f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105b320: 0x105b320: jal   0x100449c sw    v0, 20(sp)
+// 0x0105b330: 0x105b330: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -265,11 +265,11 @@ L_105b2f0:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b328: 0x105b328: j	 0x105b408 sll   zero, zero, 0
-	br L_105b408
+// 0x0105b338: 0x105b338: j	 0x105b418 sll   zero, zero, 0
+	br L_105b418
 // --- basic block ---
-L_105b330:
-// 0x0105b330: 0x105b330: sw    a1, 1044(sp)
+L_105b340:
+// 0x0105b340: 0x105b340: sw    a1, 1044(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -278,7 +278,7 @@ L_105b330:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105b334: 0x105b334: jal   0x10569ac sw    a2, 1048(sp)
+// 0x0105b344: 0x105b344: jal   0x10569bc sw    a2, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -292,17 +292,17 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_play_sound_10569ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_play_sound_10569bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b33c: 0x105b33c: lui   a0, 0x10000
+// 0x0105b34c: 0x105b34c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105b340: 0x105b340: jal   0x101cd60 addiu a0, a0, 10440
+// 0x0105b350: 0x105b350: jal   0x101cd70 addiu a0, a0, 10436
 	ldloc.1
-	ldc.i4 10440
+	ldc.i4 10436
 	add
 	stloc.1
 	ldloc.0
@@ -310,23 +310,23 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b348: 0x105b348: lui   a0, 0x10000
+// 0x0105b358: 0x105b358: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105b34c: 0x105b34c: lui   s0, 0x10000
+// 0x0105b35c: 0x105b35c: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0105b350: 0x105b350: addiu a0, a0, 10484
+// 0x0105b360: 0x105b360: addiu a0, a0, 10480
 	ldloc.1
-	ldc.i4 10484
+	ldc.i4 10480
 	add
 	stloc.1
-// 0x0105b354: 0x105b354: jal   0x101cd60 sw    v0, 1040(sp)
+// 0x0105b364: 0x105b364: jal   0x101cd70 sw    v0, 1040(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -340,17 +340,17 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b35c: 0x105b35c: addiu a0, s0, 8416
+// 0x0105b36c: 0x105b36c: addiu a0, s0, 8412
 	ldloc 8
-	ldc.i4 8416
+	ldc.i4 8412
 	add
 	stloc.1
-// 0x0105b360: 0x105b360: jal   0x101cd60 addu  s3, v0, zero
+// 0x0105b370: 0x105b370: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 7
 	stloc 11
 	ldloc.0
@@ -358,20 +358,20 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b368: 0x105b368: lui   a0, 0x10000
+// 0x0105b378: 0x105b378: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105b36c: 0x105b36c: addiu a0, a0, 10500
+// 0x0105b37c: 0x105b37c: addiu a0, a0, 10496
 	ldloc.1
-	ldc.i4 10500
+	ldc.i4 10496
 	add
 	stloc.1
-// 0x0105b370: 0x105b370: jal   0x101cd60 addu  s2, v0, zero
+// 0x0105b380: 0x105b380: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 7
 	stloc 10
 	ldloc.0
@@ -379,17 +379,17 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b378: 0x105b378: addiu a0, s0, 8416
+// 0x0105b388: 0x105b388: addiu a0, s0, 8412
 	ldloc 8
-	ldc.i4 8416
+	ldc.i4 8412
 	add
 	stloc.1
-// 0x0105b37c: 0x105b37c: jal   0x101cd60 addu  s1, v0, zero
+// 0x0105b38c: 0x105b38c: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 7
 	stloc 9
 	ldloc.0
@@ -397,12 +397,12 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b384: 0x105b384: lw    a2, 1048(sp)
+// 0x0105b394: 0x105b394: lw    a2, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -411,20 +411,20 @@ L_105b330:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105b388: 0x105b388: addiu v1, zero, 60
+// 0x0105b398: 0x105b398: addiu v1, zero, 60
 	ldc.i4.s 60
 	stloc 6
-// 0x0105b38c: 0x105b38c: addiu a2, a2, 30
+// 0x0105b39c: 0x105b39c: addiu a2, a2, 30
 	ldloc.3
 	ldc.i4.s 30
 	add
 	stloc.3
-// 0x0105b390: 0x105b390: div   a2, v1
+// 0x0105b3a0: 0x105b3a0: div   a2, v1
 	ldloc.3
 	ldloc 6
 	div
 	stloc 12
-// 0x0105b394: 0x105b394: lw    a1, 1044(sp)
+// 0x0105b3a4: 0x105b3a4: lw    a1, 1044(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -433,17 +433,17 @@ L_105b330:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b398: 0x105b398: addiu s0, sp, 40
+// 0x0105b3a8: 0x105b3a8: addiu s0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x0105b39c: 0x105b39c: addiu t0, a1, 30
+// 0x0105b3ac: 0x105b3ac: addiu t0, a1, 30
 	ldloc.2
 	ldc.i4.s 30
 	add
 	stloc 14
-// 0x0105b3a0: 0x105b3a0: lw    a3, 1040(sp)
+// 0x0105b3b0: 0x105b3b0: lw    a3, 1040(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -452,21 +452,21 @@ L_105b330:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105b3a4: 0x105b3a4: lui   a2, 0x10000
+// 0x0105b3b4: 0x105b3b4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105b3a8: 0x105b3a8: addiu a2, a2, 10520
+// 0x0105b3b8: 0x105b3b8: addiu a2, a2, 10516
 	ldloc.3
-	ldc.i4 10520
+	ldc.i4 10516
 	add
 	stloc.3
-// 0x0105b3ac: 0x105b3ac: addu  a0, s0, zero
+// 0x0105b3bc: 0x105b3bc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105b3b0: 0x105b3b0: addiu a1, zero, 1000
+// 0x0105b3c0: 0x105b3c0: addiu a1, zero, 1000
 	ldc.i4 1000
 	stloc.2
-// 0x0105b3b4: 0x105b3b4: sw    s3, 16(sp)
+// 0x0105b3c4: 0x105b3c4: sw    s3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -475,7 +475,7 @@ L_105b330:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105b3b8: 0x105b3b8: sw    s2, 24(sp)
+// 0x0105b3c8: 0x105b3c8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -484,7 +484,7 @@ L_105b330:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105b3bc: 0x105b3bc: sw    s1, 28(sp)
+// 0x0105b3cc: 0x105b3cc: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -493,7 +493,7 @@ L_105b330:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105b3c0: 0x105b3c0: sw    v0, 36(sp)
+// 0x0105b3d0: 0x105b3d0: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -502,10 +502,10 @@ L_105b330:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105b3c4: 0x105b3c4: mflo  lo
+// 0x0105b3d4: 0x105b3d4: mflo  lo
 	ldloc 12
 	stloc 15
-// 0x0105b3c8: 0x105b3c8: sw    t1, 32(sp)
+// 0x0105b3d8: 0x105b3d8: sw    t1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -514,16 +514,16 @@ L_105b330:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105b3cc: 0x105b3cc: sll   zero, zero, 0
-// 0x0105b3d0: 0x105b3d0: div   t0, v1
+// 0x0105b3dc: 0x105b3dc: sll   zero, zero, 0
+// 0x0105b3e0: 0x105b3e0: div   t0, v1
 	ldloc 14
 	ldloc 6
 	div
 	stloc 12
-// 0x0105b3d4: 0x105b3d4: mflo  lo
+// 0x0105b3e4: 0x105b3e4: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x0105b3d8: 0x105b3d8: jal   0x1000f9c sw    v1, 20(sp)
+// 0x0105b3e8: 0x105b3e8: jal   0x1000f9c sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -542,18 +542,18 @@ L_105b330:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b3e0: 0x105b3e0: lui   a0, 0x10000
+// 0x0105b3f0: 0x105b3f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105b3e4: 0x105b3e4: addiu a0, a0, 10544
+// 0x0105b3f4: 0x105b3f4: addiu a0, a0, 10540
 	ldloc.1
-	ldc.i4 10544
+	ldc.i4 10540
 	add
 	stloc.1
-// 0x0105b3e8: 0x105b3e8: addu  a1, s0, zero
+// 0x0105b3f8: 0x105b3f8: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0105b3ec: 0x105b3ec: jal   0x104bfe4 addiu a2, zero, 15
+// 0x0105b3fc: 0x105b3fc: jal   0x104bff4 addiu a2, zero, 15
 	ldc.i4.s 15
 	stloc.3
 	ldloc.0
@@ -561,21 +561,21 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105b3f4: 0x105b3f4: addiu v1, zero, -1
+// 0x0105b404: 0x105b404: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0105b3f8: 0x105b3f8: lui   v0, 0x0
+// 0x0105b408: 0x105b408: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0105b3fc: 0x105b3fc: addiu a0, zero, 15
+// 0x0105b40c: 0x105b40c: addiu a0, zero, 15
 	ldc.i4.s 15
 	stloc.1
-// 0x0105b400: 0x105b400: jal   0x105abb8 sw    v1, 14260(v0)
+// 0x0105b410: 0x105b410: jal   0x105abc8 sw    v1, 14260(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -589,14 +589,14 @@ L_105b330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_recalc_route_105abb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_recalc_route_105abc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_105b408:
-// 0x0105b408: 0x105b408: lw    ra, 1076(sp)
-// 0x0105b40c: 0x105b40c: lw    s3, 1072(sp)
+L_105b418:
+// 0x0105b418: 0x105b418: lw    ra, 1076(sp)
+// 0x0105b41c: 0x105b41c: lw    s3, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -605,7 +605,7 @@ L_105b408:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105b410: 0x105b410: lw    s2, 1068(sp)
+// 0x0105b420: 0x105b420: lw    s2, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -614,7 +614,7 @@ L_105b408:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105b414: 0x105b414: lw    s1, 1064(sp)
+// 0x0105b424: 0x105b424: lw    s1, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -623,7 +623,7 @@ L_105b408:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105b418: 0x105b418: lw    s0, 1060(sp)
+// 0x0105b428: 0x105b428: lw    s0, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -632,7 +632,7 @@ L_105b408:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105b41c: 0x105b41c: jr    ra addiu sp, sp, 1080
+// 0x0105b42c: 0x105b42c: jr    ra addiu sp, sp, 1080
 	ldloc.0
 	ldc.i4 1080
 	add
@@ -644,7 +644,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_get_next_line_105b424(int32,int32,int32,int32,int32)
+.method public static int32 navigate_get_next_line_105b434(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s2,int32 s0,int32 lo,int32 s1,int32 s4,int32 s6,int32 s5,int32 t0,int32 s8,int32 s7,int32 t1,int32 ra)
@@ -715,13 +715,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105b424:
-// 0x0105b424: 0x105b424: addiu sp, sp, -80
+L_105b434:
+// 0x0105b434: 0x105b434: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0105b428: 0x105b428: lw    v0, 4(a0)
+// 0x0105b438: 0x105b438: lw    v0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -730,7 +730,7 @@ L_105b424:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b42c: 0x105b42c: lw    v1, 12(a0)
+// 0x0105b43c: 0x105b43c: lw    v1, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -739,13 +739,13 @@ L_105b424:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b430: 0x105b430: lui   a1, 0x10000
+// 0x0105b440: 0x105b440: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105b434: 0x105b434: lui   a3, 0x10000
+// 0x0105b444: 0x105b444: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b438: 0x105b438: sw    s2, 48(sp)
+// 0x0105b448: 0x105b448: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -754,7 +754,7 @@ L_105b424:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105b43c: 0x105b43c: sw    s0, 40(sp)
+// 0x0105b44c: 0x105b44c: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -763,29 +763,29 @@ L_105b424:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105b440: 0x105b440: addu  s2, a0, zero
+// 0x0105b450: 0x105b450: addu  s2, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0105b444: 0x105b444: addu  s0, a2, zero
+// 0x0105b454: 0x105b454: addu  s0, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0105b448: 0x105b448: addiu a1, a1, 8052
+// 0x0105b458: 0x105b458: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b44c: 0x105b44c: addiu a3, a3, 10560
+// 0x0105b45c: 0x105b45c: addiu a3, a3, 10556
 	ldloc 4
-	ldc.i4 10560
+	ldc.i4 10556
 	add
 	stloc 4
-// 0x0105b450: 0x105b450: addiu a0, zero, 1
+// 0x0105b460: 0x105b460: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105b454: 0x105b454: addiu a2, zero, 1761
+// 0x0105b464: 0x105b464: addiu a2, zero, 1761
 	ldc.i4 1761
 	stloc.3
-// 0x0105b458: 0x105b458: sw    v0, 20(sp)
+// 0x0105b468: 0x105b468: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -794,8 +794,8 @@ L_105b424:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105b45c: 0x105b45c: sw    ra, 76(sp)
-// 0x0105b460: 0x105b460: sw    s8, 72(sp)
+// 0x0105b46c: 0x105b46c: sw    ra, 76(sp)
+// 0x0105b470: 0x105b470: sw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -804,7 +804,7 @@ L_105b424:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0105b464: 0x105b464: sw    s7, 68(sp)
+// 0x0105b474: 0x105b474: sw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -813,7 +813,7 @@ L_105b424:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0105b468: 0x105b468: sw    s6, 64(sp)
+// 0x0105b478: 0x105b478: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -822,7 +822,7 @@ L_105b424:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105b46c: 0x105b46c: sw    s5, 60(sp)
+// 0x0105b47c: 0x105b47c: sw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -831,7 +831,7 @@ L_105b424:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105b470: 0x105b470: sw    s4, 56(sp)
+// 0x0105b480: 0x105b480: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -840,7 +840,7 @@ L_105b424:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105b474: 0x105b474: sw    s3, 52(sp)
+// 0x0105b484: 0x105b484: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -849,7 +849,7 @@ L_105b424:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105b478: 0x105b478: sw    s1, 44(sp)
+// 0x0105b488: 0x105b488: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -858,7 +858,7 @@ L_105b424:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105b47c: 0x105b47c: jal   0x100449c sw    v1, 16(sp)
+// 0x0105b48c: 0x105b48c: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -877,26 +877,26 @@ L_105b424:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b484: 0x105b484: lui   v0, 0x70000
+// 0x0105b494: 0x105b494: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b488: 0x105b488: lw    v0, 9160(v0)
+// 0x0105b498: 0x105b498: lw    v0, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b48c: 0x105b48c: sll   zero, zero, 0
-// 0x0105b490: 0x105b490: bne   v0, zero, 0x105b4bc lui   v0, 0x70000
+// 0x0105b49c: 0x105b49c: sll   zero, zero, 0
+// 0x0105b4a0: 0x105b4a0: bne   v0, zero, 0x105b4cc lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_105b4bc
+	brtrue L_105b4cc
 // --- basic block ---
-// 0x0105b498: 0x105b498: jal   0x105abb8 addu  a0, zero, zero
+// 0x0105b4a8: 0x105b4a8: jal   0x105abc8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -904,177 +904,177 @@ L_105b424:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_recalc_route_105abb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_recalc_route_105abc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b4a0: 0x105b4a0: addiu v1, zero, -1
+// 0x0105b4b0: 0x105b4b0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0105b4a4: 0x105b4a4: beq   v0, v1, 0x105bd28 sll   zero, zero, 0
+// 0x0105b4b4: 0x105b4b4: beq   v0, v1, 0x105bd38 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_105bd28
+	beq  L_105bd38
 // --- basic block ---
-// 0x0105b4ac: 0x105b4ac: jal   0x101ebac sll   zero, zero, 0
+// 0x0105b4bc: 0x105b4bc: jal   0x101ebbc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_stop_101ebac(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_stop_101ebbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b4b4: 0x105b4b4: j	 0x105bd28 sll   zero, zero, 0
-	br L_105bd28
+// 0x0105b4c4: 0x105b4c4: j	 0x105bd38 sll   zero, zero, 0
+	br L_105bd38
 // --- basic block ---
-L_105b4bc:
-// 0x0105b4bc: 0x105b4bc: lw    s6, 9168(v0)
+L_105b4cc:
+// 0x0105b4cc: 0x105b4cc: lw    s6, 9632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105b4c0: 0x105b4c0: lw    v1, 0(s2)
+// 0x0105b4d0: 0x105b4d0: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105b4c4: 0x105b4c4: lui   v0, 0x70000
+// 0x0105b4d4: 0x105b4d4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b4c8: 0x105b4c8: lw    a1, 9176(v0)
+// 0x0105b4d8: 0x105b4d8: lw    a1, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b4cc: 0x105b4cc: lui   v0, 0x70000
+// 0x0105b4dc: 0x105b4dc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b4d0: 0x105b4d0: lw    a0, 9172(v0)
+// 0x0105b4e0: 0x105b4e0: lw    a0, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105b4d4: 0x105b4d4: beq   v1, zero, 0x105b558 lui   v0, 0x70000
+// 0x0105b4e4: 0x105b4e4: beq   v1, zero, 0x105b568 lui   v0, 0x70000
 	ldloc 7
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105b558
+	brfalse L_105b568
 // --- basic block ---
-// 0x0105b4dc: 0x105b4dc: lw    v0, 9164(v0)
+// 0x0105b4ec: 0x105b4ec: lw    v0, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b4e0: 0x105b4e0: sll   zero, zero, 0
-// 0x0105b4e4: 0x105b4e4: addiu v0, v0, 1
+// 0x0105b4f0: 0x105b4f0: sll   zero, zero, 0
+// 0x0105b4f4: 0x105b4f4: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0105b4e8: 0x105b4e8: slt   v1, v0, a0
+// 0x0105b4f8: 0x105b4f8: slt   v1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 7
-// 0x0105b4ec: 0x105b4ec: beq   v1, zero, 0x105b510 addiu v1, zero, 56
+// 0x0105b4fc: 0x105b4fc: beq   v1, zero, 0x105b520 addiu v1, zero, 56
 	ldloc 7
 	ldc.i4.s 56
 	stloc 7
-	brfalse L_105b510
+	brfalse L_105b520
 // --- basic block ---
-// 0x0105b4f4: 0x105b4f4: addiu a1, zero, 56
+// 0x0105b504: 0x105b504: addiu a1, zero, 56
 	ldc.i4.s 56
 	stloc.2
-// 0x0105b4f8: 0x105b4f8: mult  v0, a1
+// 0x0105b508: 0x105b508: mult  v0, a1
 	ldloc 5
 	ldloc.2
 	mul
 	stloc 11
-// 0x0105b4fc: 0x105b4fc: lui   v1, 0x70000
+// 0x0105b50c: 0x105b50c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105b500: 0x105b500: lw    a1, 10724(v1)
+// 0x0105b510: 0x105b510: lw    a1, 11188(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b504: 0x105b504: mflo  lo
+// 0x0105b514: 0x105b514: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0105b508: 0x105b508: j	 0x105b52c addu  a1, a1, v0
+// 0x0105b518: 0x105b518: j	 0x105b53c addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-	br L_105b52c
+	br L_105b53c
 // --- basic block ---
-L_105b510:
-// 0x0105b510: 0x105b510: subu  a0, v0, a0
+L_105b520:
+// 0x0105b520: 0x105b520: subu  a0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc.1
-// 0x0105b514: 0x105b514: addu  a1, a0, a1
+// 0x0105b524: 0x105b524: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-// 0x0105b518: 0x105b518: mult  a1, v1
+// 0x0105b528: 0x105b528: mult  a1, v1
 	ldloc.2
 	ldloc 7
 	mul
 	stloc 11
-// 0x0105b51c: 0x105b51c: lui   v0, 0x70000
+// 0x0105b52c: 0x105b52c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b520: 0x105b520: lw    a0, 10720(v0)
+// 0x0105b530: 0x105b530: lw    a0, 11184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105b524: 0x105b524: mflo  lo
+// 0x0105b534: 0x105b534: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x0105b528: 0x105b528: addu  a1, a0, a1
+// 0x0105b538: 0x105b538: addu  a1, a0, a1
 	ldloc.1
 	ldloc.2
 	add
 	stloc.2
-L_105b52c:
-// 0x0105b52c: 0x105b52c: lui   v0, 0x0
+L_105b53c:
+// 0x0105b53c: 0x105b53c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105b530: 0x105b530: lw    v0, 1816(v0)
+// 0x0105b540: 0x105b540: lw    v0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1083,14 +1083,14 @@ L_105b52c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b534: 0x105b534: sw    zero, 0(s0)
+// 0x0105b544: 0x105b544: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105b538: 0x105b538: sw    v0, 16(s0)
+// 0x0105b548: 0x105b548: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1099,7 +1099,7 @@ L_105b52c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105b53c: 0x105b53c: lw    v1, 24(a1)
+// 0x0105b54c: 0x105b54c: lw    v1, 24(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -1108,13 +1108,13 @@ L_105b52c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b540: 0x105b540: lh    v0, 36(a1)
+// 0x0105b550: 0x105b550: lh    v0, 36(a1)
 	ldloc.2
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105b544: 0x105b544: sw    v1, 12(s0)
+// 0x0105b554: 0x105b554: sw    v1, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1123,7 +1123,7 @@ L_105b52c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105b548: 0x105b548: sw    v0, 4(s0)
+// 0x0105b558: 0x105b558: sw    v0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1132,13 +1132,13 @@ L_105b52c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105b54c: 0x105b54c: lb    v0, 51(a1)
+// 0x0105b55c: 0x105b55c: lb    v0, 51(a1)
 	ldloc.2
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105b550: 0x105b550: j	 0x105bd28 sw    v0, 8(s0)
+// 0x0105b560: 0x105b560: j	 0x105bd38 sw    v0, 8(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -1147,106 +1147,106 @@ L_105b52c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_105bd28
+	br L_105bd38
 // --- basic block ---
-L_105b558:
-// 0x0105b558: 0x105b558: lw    s4, 9164(v0)
+L_105b568:
+// 0x0105b568: 0x105b568: lw    s4, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105b55c: 0x105b55c: sll   zero, zero, 0
-// 0x0105b560: 0x105b560: slt   v0, s4, a0
+// 0x0105b56c: 0x105b56c: sll   zero, zero, 0
+// 0x0105b570: 0x105b570: slt   v0, s4, a0
 	ldloc 13
 	ldloc.1
 	clt
 	stloc 5
-// 0x0105b564: 0x105b564: beq   v0, zero, 0x105b588 sltiu s1, s4, 1
+// 0x0105b574: 0x105b574: beq   v0, zero, 0x105b598 sltiu s1, s4, 1
 	ldloc 5
 	ldloc 13
 	ldc.i4.1
 	clt.un
 	stloc 12
-	brfalse L_105b588
+	brfalse L_105b598
 // --- basic block ---
-// 0x0105b56c: 0x105b56c: addiu s3, zero, 56
+// 0x0105b57c: 0x105b57c: addiu s3, zero, 56
 	ldc.i4.s 56
 	stloc 8
-// 0x0105b570: 0x105b570: mult  s4, s3
+// 0x0105b580: 0x105b580: mult  s4, s3
 	ldloc 13
 	ldloc 8
 	mul
 	stloc 11
-// 0x0105b574: 0x105b574: lui   v0, 0x70000
+// 0x0105b584: 0x105b584: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b578: 0x105b578: lw    v0, 10724(v0)
+// 0x0105b588: 0x105b588: lw    v0, 11188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b57c: 0x105b57c: mflo  lo
+// 0x0105b58c: 0x105b58c: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x0105b580: 0x105b580: j	 0x105b5a8 addu  s3, v0, s3
+// 0x0105b590: 0x105b590: j	 0x105b5b8 addu  s3, v0, s3
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-	br L_105b5a8
+	br L_105b5b8
 // --- basic block ---
-L_105b588:
-// 0x0105b588: 0x105b588: addu  s3, a1, s4
+L_105b598:
+// 0x0105b598: 0x105b598: addu  s3, a1, s4
 	ldloc.2
 	ldloc 13
 	add
 	stloc 8
-// 0x0105b58c: 0x105b58c: subu  s3, s3, a0
+// 0x0105b59c: 0x105b59c: subu  s3, s3, a0
 	ldloc 8
 	ldloc.1
 	sub
 	stloc 8
-// 0x0105b590: 0x105b590: addiu v0, zero, 56
+// 0x0105b5a0: 0x105b5a0: addiu v0, zero, 56
 	ldc.i4.s 56
 	stloc 5
-// 0x0105b594: 0x105b594: mult  s3, v0
+// 0x0105b5a4: 0x105b5a4: mult  s3, v0
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 11
-// 0x0105b598: 0x105b598: lui   v0, 0x70000
+// 0x0105b5a8: 0x105b5a8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b59c: 0x105b59c: lw    v0, 10720(v0)
+// 0x0105b5ac: 0x105b5ac: lw    v0, 11184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b5a0: 0x105b5a0: mflo  lo
+// 0x0105b5b0: 0x105b5b0: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x0105b5a4: 0x105b5a4: addu  s3, v0, s3
+// 0x0105b5b4: 0x105b5b4: addu  s3, v0, s3
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-L_105b5a8:
-// 0x0105b5a8: 0x105b5a8: lui   v0, 0x0
+L_105b5b8:
+// 0x0105b5b8: 0x105b5b8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105b5ac: 0x105b5ac: lw    v0, 1816(v0)
+// 0x0105b5bc: 0x105b5bc: lw    v0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1255,7 +1255,7 @@ L_105b5a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b5b0: 0x105b5b0: lw    s8, 24(s3)
+// 0x0105b5c0: 0x105b5c0: lw    s8, 24(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1264,7 +1264,7 @@ L_105b5a8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105b5b4: 0x105b5b4: lw    v1, 12(s2)
+// 0x0105b5c4: 0x105b5c4: lw    v1, 12(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1273,12 +1273,12 @@ L_105b5a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b5b8: 0x105b5b8: addu  s6, a0, s6
+// 0x0105b5c8: 0x105b5c8: addu  s6, a0, s6
 	ldloc.1
 	ldloc 14
 	add
 	stloc 14
-// 0x0105b5bc: 0x105b5bc: sw    v0, 32(sp)
+// 0x0105b5cc: 0x105b5cc: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1287,22 +1287,22 @@ L_105b5a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105b5c0: 0x105b5c0: lh    v0, 36(s3)
+// 0x0105b5d0: 0x105b5d0: lh    v0, 36(s3)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105b5c4: 0x105b5c4: bne   v1, s8, 0x105b5f0 subu  s6, s6, a1
+// 0x0105b5d4: 0x105b5d4: bne   v1, s8, 0x105b600 subu  s6, s6, a1
 	ldloc 7
 	ldloc 17
 	ldloc 14
 	ldloc.2
 	sub
 	stloc 14
-	bne.un L_105b5f0
+	bne.un L_105b600
 // --- basic block ---
-// 0x0105b5cc: 0x105b5cc: lw    s7, 4(s2)
+// 0x0105b5dc: 0x105b5dc: lw    s7, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1311,17 +1311,17 @@ L_105b5a8:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0105b5d0: 0x105b5d0: sll   zero, zero, 0
-// 0x0105b5d4: 0x105b5d4: bne   s7, v0, 0x105b5f4 slti  a2, s4, 11
+// 0x0105b5e0: 0x105b5e0: sll   zero, zero, 0
+// 0x0105b5e4: 0x105b5e4: bne   s7, v0, 0x105b604 slti  a2, s4, 11
 	ldloc 18
 	ldloc 5
 	ldloc 13
 	ldc.i4.s 11
 	clt
 	stloc.3
-	bne.un L_105b5f4
+	bne.un L_105b604
 // --- basic block ---
-// 0x0105b5dc: 0x105b5dc: lw    a2, 16(s2)
+// 0x0105b5ec: 0x105b5ec: lw    a2, 16(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1330,7 +1330,7 @@ L_105b5a8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105b5e0: 0x105b5e0: lw    a3, 32(sp)
+// 0x0105b5f0: 0x105b5f0: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1339,131 +1339,131 @@ L_105b5a8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105b5e4: 0x105b5e4: sll   zero, zero, 0
-// 0x0105b5e8: 0x105b5e8: beq   a2, a3, 0x105b794 sll   zero, zero, 0
+// 0x0105b5f4: 0x105b5f4: sll   zero, zero, 0
+// 0x0105b5f8: 0x105b5f8: beq   a2, a3, 0x105b7a4 sll   zero, zero, 0
 	ldloc.3
 	ldloc 4
-	beq  L_105b794
+	beq  L_105b7a4
 // --- basic block ---
-L_105b5f0:
-// 0x0105b5f0: 0x105b5f0: slti  a2, s4, 11
+L_105b600:
+// 0x0105b600: 0x105b600: slti  a2, s4, 11
 	ldloc 13
 	ldc.i4.s 11
 	clt
 	stloc.3
-L_105b5f4:
-// 0x0105b5f4: 0x105b5f4: sltiu a2, a2, 1
+L_105b604:
+// 0x0105b604: 0x105b604: sltiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x0105b5f8: 0x105b5f8: subu  a2, zero, a2
+// 0x0105b608: 0x105b608: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x0105b5fc: 0x105b5fc: addiu s4, s4, -10
+// 0x0105b60c: 0x105b60c: addiu s4, s4, -10
 	ldloc 13
 	ldc.i4.s -10
 	add
 	stloc 13
-// 0x0105b600: 0x105b600: and   s4, s4, a2
+// 0x0105b610: 0x105b610: and   s4, s4, a2
 	ldloc 13
 	ldloc.3
 	and
 	stloc 13
-// 0x0105b604: 0x105b604: subu  a1, a1, a0
+// 0x0105b614: 0x105b614: subu  a1, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.2
-// 0x0105b608: 0x105b608: addiu a2, zero, 56
+// 0x0105b618: 0x105b618: addiu a2, zero, 56
 	ldc.i4.s 56
 	stloc.3
-// 0x0105b60c: 0x105b60c: addu  a1, a1, s4
+// 0x0105b61c: 0x105b61c: addu  a1, a1, s4
 	ldloc.2
 	ldloc 13
 	add
 	stloc.2
-// 0x0105b610: 0x105b610: mult  a1, a2
+// 0x0105b620: 0x105b620: mult  a1, a2
 	ldloc.2
 	ldloc.3
 	mul
 	stloc 11
-// 0x0105b614: 0x105b614: lui   a3, 0x70000
+// 0x0105b624: 0x105b624: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105b618: 0x105b618: lui   t0, 0x70000
+// 0x0105b628: 0x105b628: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 16
-// 0x0105b61c: 0x105b61c: lw    a3, 10724(a3)
+// 0x0105b62c: 0x105b62c: lw    a3, 11188(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105b620: 0x105b620: lw    t0, 10720(t0)
+// 0x0105b630: 0x105b630: lw    t0, 11184(t0)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105b624: 0x105b624: mflo  lo
+// 0x0105b634: 0x105b634: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x0105b628: 0x105b628: addu  a1, t0, a1
+// 0x0105b638: 0x105b638: addu  a1, t0, a1
 	ldloc 16
 	ldloc.2
 	add
 	stloc.2
-// 0x0105b62c: 0x105b62c: sll   zero, zero, 0
-// 0x0105b630: 0x105b630: mult  s4, a2
+// 0x0105b63c: 0x105b63c: sll   zero, zero, 0
+// 0x0105b640: 0x105b640: mult  s4, a2
 	ldloc 13
 	ldloc.3
 	mul
 	stloc 11
-// 0x0105b634: 0x105b634: mflo  lo
+// 0x0105b644: 0x105b644: mflo  lo
 	ldloc 11
 	stloc.3
-// 0x0105b638: 0x105b638: j	 0x105b778 addu  a3, a3, a2
+// 0x0105b648: 0x105b648: j	 0x105b788 addu  a3, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc 4
-	br L_105b778
+	br L_105b788
 // --- basic block ---
-L_105b640:
-// 0x0105b640: 0x105b640: beq   t0, zero, 0x105b64c addu  s5, a1, zero
+L_105b650:
+// 0x0105b650: 0x105b650: beq   t0, zero, 0x105b65c addu  s5, a1, zero
 	ldloc 16
 	ldloc.2
 	stloc 15
-	brfalse L_105b64c
+	brfalse L_105b65c
 // --- basic block ---
-// 0x0105b648: 0x105b648: addu  s5, a3, zero
+// 0x0105b658: 0x105b658: addu  s5, a3, zero
 	ldloc 4
 	stloc 15
-L_105b64c:
-// 0x0105b64c: 0x105b64c: lb    a2, 55(s5)
+L_105b65c:
+// 0x0105b65c: 0x105b65c: lb    a2, 55(s5)
 	ldloc 15
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0105b650: 0x105b650: sll   zero, zero, 0
-// 0x0105b654: 0x105b654: bne   a2, zero, 0x105b69c addiu a3, a3, 56
+// 0x0105b660: 0x105b660: sll   zero, zero, 0
+// 0x0105b664: 0x105b664: bne   a2, zero, 0x105b6ac addiu a3, a3, 56
 	ldloc.3
 	ldloc 4
 	ldc.i4.s 56
 	add
 	stloc 4
-	brtrue L_105b69c
+	brtrue L_105b6ac
 // --- basic block ---
-// 0x0105b65c: 0x105b65c: sw    s4, 16(sp)
+// 0x0105b66c: 0x105b66c: sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1472,7 +1472,7 @@ L_105b64c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105b660: 0x105b660: lw    v1, 24(s5)
+// 0x0105b670: 0x105b670: lw    v1, 24(s5)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -1481,10 +1481,10 @@ L_105b64c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b664: 0x105b664: lui   a1, 0x10000
+// 0x0105b674: 0x105b674: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105b668: 0x105b668: sw    v1, 20(sp)
+// 0x0105b678: 0x105b678: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1493,32 +1493,32 @@ L_105b64c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105b66c: 0x105b66c: lh    v1, 36(s5)
+// 0x0105b67c: 0x105b67c: lh    v1, 36(s5)
 	ldloc 15
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x0105b670: 0x105b670: lui   a3, 0x10000
+// 0x0105b680: 0x105b680: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b674: 0x105b674: addiu a1, a1, 8052
+// 0x0105b684: 0x105b684: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b678: 0x105b678: addiu a3, a3, 10604
+// 0x0105b688: 0x105b688: addiu a3, a3, 10600
 	ldloc 4
-	ldc.i4 10604
+	ldc.i4 10600
 	add
 	stloc 4
-// 0x0105b67c: 0x105b67c: addiu a0, zero, 3
+// 0x0105b68c: 0x105b68c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105b680: 0x105b680: addiu a2, zero, 1800
+// 0x0105b690: 0x105b690: addiu a2, zero, 1800
 	ldc.i4 1800
 	stloc.3
-// 0x0105b684: 0x105b684: sw    v0, 36(sp)
+// 0x0105b694: 0x105b694: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1527,7 +1527,7 @@ L_105b64c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105b688: 0x105b688: jal   0x100449c sw    v1, 24(sp)
+// 0x0105b698: 0x105b698: jal   0x100449c sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1546,7 +1546,7 @@ L_105b64c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b690: 0x105b690: lw    v0, 36(sp)
+// 0x0105b6a0: 0x105b6a0: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1555,13 +1555,13 @@ L_105b64c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b694: 0x105b694: j	 0x105b794 addu  s7, v0, zero
+// 0x0105b6a4: 0x105b6a4: j	 0x105b7a4 addu  s7, v0, zero
 	ldloc 5
 	stloc 18
-	br L_105b794
+	br L_105b7a4
 // --- basic block ---
-L_105b69c:
-// 0x0105b69c: 0x105b69c: lw    s8, 24(s5)
+L_105b6ac:
+// 0x0105b6ac: 0x105b6ac: lw    s8, 24(s5)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -1570,22 +1570,22 @@ L_105b69c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105b6a0: 0x105b6a0: lh    v0, 36(s5)
+// 0x0105b6b0: 0x105b6b0: lh    v0, 36(s5)
 	ldloc 15
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105b6a4: 0x105b6a4: bne   v1, s8, 0x105b6d0 addiu a1, a1, 56
+// 0x0105b6b4: 0x105b6b4: bne   v1, s8, 0x105b6e0 addiu a1, a1, 56
 	ldloc 7
 	ldloc 17
 	ldloc.2
 	ldc.i4.s 56
 	add
 	stloc.2
-	bne.un L_105b6d0
+	bne.un L_105b6e0
 // --- basic block ---
-// 0x0105b6ac: 0x105b6ac: lw    s7, 4(s2)
+// 0x0105b6bc: 0x105b6bc: lw    s7, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1594,13 +1594,13 @@ L_105b69c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0105b6b0: 0x105b6b0: sll   zero, zero, 0
-// 0x0105b6b4: 0x105b6b4: bne   s7, v0, 0x105b6d0 sll   zero, zero, 0
+// 0x0105b6c0: 0x105b6c0: sll   zero, zero, 0
+// 0x0105b6c4: 0x105b6c4: bne   s7, v0, 0x105b6e0 sll   zero, zero, 0
 	ldloc 18
 	ldloc 5
-	bne.un L_105b6d0
+	bne.un L_105b6e0
 // --- basic block ---
-// 0x0105b6bc: 0x105b6bc: lw    a2, 16(s2)
+// 0x0105b6cc: 0x105b6cc: lw    a2, 16(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1609,7 +1609,7 @@ L_105b69c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105b6c0: 0x105b6c0: lw    t0, 32(sp)
+// 0x0105b6d0: 0x105b6d0: lw    t0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1618,77 +1618,77 @@ L_105b69c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105b6c4: 0x105b6c4: sll   zero, zero, 0
-// 0x0105b6c8: 0x105b6c8: beq   a2, t0, 0x105b6d8 sll   zero, zero, 0
+// 0x0105b6d4: 0x105b6d4: sll   zero, zero, 0
+// 0x0105b6d8: 0x105b6d8: beq   a2, t0, 0x105b6e8 sll   zero, zero, 0
 	ldloc.3
 	ldloc 16
-	beq  L_105b6d8
+	beq  L_105b6e8
 // --- basic block ---
-L_105b6d0:
-// 0x0105b6d0: 0x105b6d0: j	 0x105b778 addiu s4, s4, 1
+L_105b6e0:
+// 0x0105b6e0: 0x105b6e0: j	 0x105b788 addiu s4, s4, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	br L_105b778
+	br L_105b788
 // --- basic block ---
-L_105b6d8:
-// 0x0105b6d8: 0x105b6d8: lh    v0, 44(s3)
+L_105b6e8:
+// 0x0105b6e8: 0x105b6e8: lh    v0, 44(s3)
 	ldloc 8
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105b6dc: 0x105b6dc: lh    a0, 44(s5)
+// 0x0105b6ec: 0x105b6ec: lh    a0, 44(s5)
 	ldloc 15
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105b6e0: 0x105b6e0: sll   zero, zero, 0
-// 0x0105b6e4: 0x105b6e4: beq   a0, v0, 0x105b6f0 lui   s8, 0x10000
+// 0x0105b6f0: 0x105b6f0: sll   zero, zero, 0
+// 0x0105b6f4: 0x105b6f4: beq   a0, v0, 0x105b700 lui   s8, 0x10000
 	ldloc.1
 	ldloc 5
 	ldc.i4 65536
 	stloc 17
-	beq  L_105b6f0
+	beq  L_105b700
 // --- basic block ---
-// 0x0105b6ec: 0x105b6ec: addiu s1, zero, 1
+// 0x0105b6fc: 0x105b6fc: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 12
-L_105b6f0:
-// 0x0105b6f0: 0x105b6f0: lui   a3, 0x10000
+L_105b700:
+// 0x0105b700: 0x105b700: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b6f4: 0x105b6f4: lui   v0, 0x70000
+// 0x0105b704: 0x105b704: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b6f8: 0x105b6f8: addiu a0, zero, 1
+// 0x0105b708: 0x105b708: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105b6fc: 0x105b6fc: addiu a1, s8, 8052
+// 0x0105b70c: 0x105b70c: addiu a1, s8, 8048
 	ldloc 17
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b700: 0x105b700: addiu a2, zero, 1815
+// 0x0105b710: 0x105b710: addiu a2, zero, 1815
 	ldc.i4 1815
 	stloc.3
-// 0x0105b704: 0x105b704: addiu a3, a3, 10020
+// 0x0105b714: 0x105b714: addiu a3, a3, 10016
 	ldloc 4
-	ldc.i4 10020
+	ldc.i4 10016
 	add
 	stloc 4
-// 0x0105b708: 0x105b708: sw    s4, 9164(v0)
+// 0x0105b718: 0x105b718: sw    s4, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105b70c: 0x105b70c: sw    s4, 16(sp)
+// 0x0105b71c: 0x105b71c: sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1697,7 +1697,7 @@ L_105b6f0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105b710: 0x105b710: jal   0x100449c sw    v1, 36(sp)
+// 0x0105b720: 0x105b720: jal   0x100449c sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1716,53 +1716,53 @@ L_105b6f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b718: 0x105b718: lui   v0, 0x70000
+// 0x0105b728: 0x105b728: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b71c: 0x105b71c: lui   a0, 0x70000
+// 0x0105b72c: 0x105b72c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105b720: 0x105b720: lw    a1, 9172(a0)
+// 0x0105b730: 0x105b730: lw    a1, 9636(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b724: 0x105b724: lw    a2, 10700(v0)
+// 0x0105b734: 0x105b734: lw    a2, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105b728: 0x105b728: addiu a0, zero, -257
+// 0x0105b738: 0x105b738: addiu a0, zero, -257
 	ldc.i4 -257
 	stloc.1
-// 0x0105b72c: 0x105b72c: and   a0, a2, a0
+// 0x0105b73c: 0x105b73c: and   a0, a2, a0
 	ldloc.3
 	ldloc.1
 	and
 	stloc.1
-// 0x0105b730: 0x105b730: slt   s4, s4, a1
+// 0x0105b740: 0x105b740: slt   s4, s4, a1
 	ldloc 13
 	ldloc.2
 	clt
 	stloc 13
-// 0x0105b734: 0x105b734: sw    a0, 10700(v0)
+// 0x0105b744: 0x105b744: sw    a0, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105b738: 0x105b738: lw    v1, 36(sp)
+// 0x0105b748: 0x105b748: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1771,42 +1771,42 @@ L_105b6f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b73c: 0x105b73c: bne   s4, zero, 0x105b78c lui   s3, 0x70000
+// 0x0105b74c: 0x105b74c: bne   s4, zero, 0x105b79c lui   s3, 0x70000
 	ldloc 13
 	ldc.i4 458752
 	stloc 8
-	brtrue L_105b78c
+	brtrue L_105b79c
 // --- basic block ---
-// 0x0105b744: 0x105b744: lw    v0, 9180(s3)
+// 0x0105b754: 0x105b754: lw    v0, 9644(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2295
+	ldc.i4 2411
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b748: 0x105b748: sll   zero, zero, 0
-// 0x0105b74c: 0x105b74c: beq   v0, zero, 0x105b78c lui   a3, 0x10000
+// 0x0105b758: 0x105b758: sll   zero, zero, 0
+// 0x0105b75c: 0x105b75c: beq   v0, zero, 0x105b79c lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brfalse L_105b78c
+	brfalse L_105b79c
 // --- basic block ---
-// 0x0105b754: 0x105b754: addiu a1, s8, 8052
+// 0x0105b764: 0x105b764: addiu a1, s8, 8048
 	ldloc 17
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b758: 0x105b758: addiu a3, a3, 10684
+// 0x0105b768: 0x105b768: addiu a3, a3, 10680
 	ldloc 4
-	ldc.i4 10684
+	ldc.i4 10680
 	add
 	stloc 4
-// 0x0105b75c: 0x105b75c: addiu a0, zero, 2
+// 0x0105b76c: 0x105b76c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105b760: 0x105b760: jal   0x100449c addiu a2, zero, 1818
+// 0x0105b770: 0x105b770: jal   0x100449c addiu a2, zero, 1818
 	ldc.i4 1818
 	stloc.3
 	ldloc.0
@@ -1819,16 +1819,16 @@ L_105b6f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b768: 0x105b768: sw    zero, 9180(s3)
+// 0x0105b778: 0x105b778: sw    zero, 9644(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2295
+	ldc.i4 2411
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105b76c: 0x105b76c: lw    v1, 36(sp)
+// 0x0105b77c: 0x105b77c: lw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1837,78 +1837,78 @@ L_105b6f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b770: 0x105b770: j	 0x105b790 addu  s8, v1, zero
+// 0x0105b780: 0x105b780: j	 0x105b7a0 addu  s8, v1, zero
 	ldloc 7
 	stloc 17
-	br L_105b790
+	br L_105b7a0
 // --- basic block ---
-L_105b778:
-// 0x0105b778: 0x105b778: slt   a2, s4, s6
+L_105b788:
+// 0x0105b788: 0x105b788: slt   a2, s4, s6
 	ldloc 13
 	ldloc 14
 	clt
 	stloc.3
-// 0x0105b77c: 0x105b77c: bne   a2, zero, 0x105b640 slt   t0, s4, a0
+// 0x0105b78c: 0x105b78c: bne   a2, zero, 0x105b650 slt   t0, s4, a0
 	ldloc.3
 	ldloc 13
 	ldloc.1
 	clt
 	stloc 16
-	brtrue L_105b640
+	brtrue L_105b650
 // --- basic block ---
-// 0x0105b784: 0x105b784: j	 0x105b794 addu  s7, v0, zero
+// 0x0105b794: 0x105b794: j	 0x105b7a4 addu  s7, v0, zero
 	ldloc 5
 	stloc 18
-	br L_105b794
+	br L_105b7a4
 // --- basic block ---
-L_105b78c:
-// 0x0105b78c: 0x105b78c: addu  s8, v1, zero
+L_105b79c:
+// 0x0105b79c: 0x105b79c: addu  s8, v1, zero
 	ldloc 7
 	stloc 17
-L_105b790:
-// 0x0105b790: 0x105b790: addu  s3, s5, zero
+L_105b7a0:
+// 0x0105b7a0: 0x105b7a0: addu  s3, s5, zero
 	ldloc 15
 	stloc 8
-L_105b794:
-// 0x0105b794: 0x105b794: lui   v0, 0x70000
+L_105b7a4:
+// 0x0105b7a4: 0x105b7a4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b798: 0x105b798: lw    v0, 9164(v0)
+// 0x0105b7a8: 0x105b7a8: lw    v0, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b79c: 0x105b79c: sll   zero, zero, 0
-// 0x0105b7a0: 0x105b7a0: slt   v0, v0, s6
+// 0x0105b7ac: 0x105b7ac: sll   zero, zero, 0
+// 0x0105b7b0: 0x105b7b0: slt   v0, v0, s6
 	ldloc 5
 	ldloc 14
 	clt
 	stloc 5
-// 0x0105b7a4: 0x105b7a4: beq   v0, zero, 0x105b890 lui   v0, 0x70000
+// 0x0105b7b4: 0x105b7b4: beq   v0, zero, 0x105b8a0 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105b890
+	brfalse L_105b8a0
 // --- basic block ---
-// 0x0105b7ac: 0x105b7ac: lw    v0, 0(s2)
+// 0x0105b7bc: 0x105b7bc: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105b7b0: 0x105b7b0: sll   zero, zero, 0
-// 0x0105b7b4: 0x105b7b4: bne   v0, zero, 0x105b7f0 lui   a1, 0x10000
+// 0x0105b7c0: 0x105b7c0: sll   zero, zero, 0
+// 0x0105b7c4: 0x105b7c4: bne   v0, zero, 0x105b800 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_105b7f0
+	brtrue L_105b800
 // --- basic block ---
-// 0x0105b7bc: 0x105b7bc: lw    v0, 12(s2)
+// 0x0105b7cc: 0x105b7cc: lw    v0, 12(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1917,15 +1917,15 @@ L_105b794:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b7c0: 0x105b7c0: sll   zero, zero, 0
-// 0x0105b7c4: 0x105b7c4: bne   v0, s8, 0x105b7f4 lui   a3, 0x10000
+// 0x0105b7d0: 0x105b7d0: sll   zero, zero, 0
+// 0x0105b7d4: 0x105b7d4: bne   v0, s8, 0x105b804 lui   a3, 0x10000
 	ldloc 5
 	ldloc 17
 	ldc.i4 65536
 	stloc 4
-	bne.un L_105b7f4
+	bne.un L_105b804
 // --- basic block ---
-// 0x0105b7cc: 0x105b7cc: lw    v0, 4(s2)
+// 0x0105b7dc: 0x105b7dc: lw    v0, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1934,13 +1934,13 @@ L_105b794:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b7d0: 0x105b7d0: sll   zero, zero, 0
-// 0x0105b7d4: 0x105b7d4: bne   v0, s7, 0x105b7f4 sll   zero, zero, 0
+// 0x0105b7e0: 0x105b7e0: sll   zero, zero, 0
+// 0x0105b7e4: 0x105b7e4: bne   v0, s7, 0x105b804 sll   zero, zero, 0
 	ldloc 5
 	ldloc 18
-	bne.un L_105b7f4
+	bne.un L_105b804
 // --- basic block ---
-// 0x0105b7dc: 0x105b7dc: lw    v0, 16(s2)
+// 0x0105b7ec: 0x105b7ec: lw    v0, 16(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1949,7 +1949,7 @@ L_105b794:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b7e0: 0x105b7e0: lw    v1, 32(sp)
+// 0x0105b7f0: 0x105b7f0: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1958,47 +1958,47 @@ L_105b794:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b7e4: 0x105b7e4: sll   zero, zero, 0
-// 0x0105b7e8: 0x105b7e8: beq   v0, v1, 0x105b890 lui   v0, 0x70000
+// 0x0105b7f4: 0x105b7f4: sll   zero, zero, 0
+// 0x0105b7f8: 0x105b7f8: beq   v0, v1, 0x105b8a0 lui   v0, 0x70000
 	ldloc 5
 	ldloc 7
 	ldc.i4 458752
 	stloc 5
-	beq  L_105b890
+	beq  L_105b8a0
 // --- basic block ---
-L_105b7f0:
-// 0x0105b7f0: 0x105b7f0: lui   a3, 0x10000
+L_105b800:
+// 0x0105b800: 0x105b800: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-L_105b7f4:
-// 0x0105b7f4: 0x105b7f4: addiu s2, zero, -1
+L_105b804:
+// 0x0105b804: 0x105b804: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 9
-// 0x0105b7f8: 0x105b7f8: addiu a0, zero, 2
+// 0x0105b808: 0x105b808: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105b7fc: 0x105b7fc: lui   v0, 0x70000
+// 0x0105b80c: 0x105b80c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b800: 0x105b800: addiu a1, a1, 8052
+// 0x0105b810: 0x105b810: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b804: 0x105b804: addiu a3, a3, 8616
+// 0x0105b814: 0x105b814: addiu a3, a3, 8612
 	ldloc 4
-	ldc.i4 8616
+	ldc.i4 8612
 	add
 	stloc 4
-// 0x0105b808: 0x105b808: addiu a2, zero, 1832
+// 0x0105b818: 0x105b818: addiu a2, zero, 1832
 	ldc.i4 1832
 	stloc.3
-// 0x0105b80c: 0x105b80c: jal   0x100449c sw    s2, 10748(v0)
+// 0x0105b81c: 0x105b81c: jal   0x100449c sw    s2, 11212(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldloc 9
 	stelem.i4
@@ -2012,7 +2012,7 @@ L_105b7f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b814: 0x105b814: jal   0x105abb8 addu  a0, zero, zero
+// 0x0105b824: 0x105b824: jal   0x105abc8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2020,298 +2020,298 @@ L_105b7f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_recalc_route_105abb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_recalc_route_105abc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105b81c: 0x105b81c: beq   v0, s2, 0x105bd28 lui   v1, 0x70000
+// 0x0105b82c: 0x105b82c: beq   v0, s2, 0x105bd38 lui   v1, 0x70000
 	ldloc 5
 	ldloc 9
 	ldc.i4 458752
 	stloc 7
-	beq  L_105bd28
+	beq  L_105bd38
 // --- basic block ---
-// 0x0105b824: 0x105b824: lw    s6, 9168(v1)
+// 0x0105b834: 0x105b834: lw    s6, 9632(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105b828: 0x105b828: lui   v0, 0x70000
+// 0x0105b838: 0x105b838: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b82c: 0x105b82c: lui   v1, 0x70000
+// 0x0105b83c: 0x105b83c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105b830: 0x105b830: lw    v0, 9172(v0)
+// 0x0105b840: 0x105b840: lw    v0, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b834: 0x105b834: lui   a0, 0x70000
+// 0x0105b844: 0x105b844: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105b838: 0x105b838: lw    v1, 9164(v1)
+// 0x0105b848: 0x105b848: lw    v1, 9628(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b83c: 0x105b83c: lw    s3, 9176(a0)
+// 0x0105b84c: 0x105b84c: lw    s3, 9640(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105b840: 0x105b840: addu  s6, v0, s6
+// 0x0105b850: 0x105b850: addu  s6, v0, s6
 	ldloc 5
 	ldloc 14
 	add
 	stloc 14
-// 0x0105b844: 0x105b844: slt   a0, v1, v0
+// 0x0105b854: 0x105b854: slt   a0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc.1
-// 0x0105b848: 0x105b848: beq   a0, zero, 0x105b86c subu  s6, s6, s3
+// 0x0105b858: 0x105b858: beq   a0, zero, 0x105b87c subu  s6, s6, s3
 	ldloc.1
 	ldloc 14
 	ldloc 8
 	sub
 	stloc 14
-	brfalse L_105b86c
+	brfalse L_105b87c
 // --- basic block ---
-// 0x0105b850: 0x105b850: addiu s3, zero, 56
+// 0x0105b860: 0x105b860: addiu s3, zero, 56
 	ldc.i4.s 56
 	stloc 8
-// 0x0105b854: 0x105b854: mult  v1, s3
+// 0x0105b864: 0x105b864: mult  v1, s3
 	ldloc 7
 	ldloc 8
 	mul
 	stloc 11
-// 0x0105b858: 0x105b858: lui   v0, 0x70000
+// 0x0105b868: 0x105b868: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105b85c: 0x105b85c: lw    s3, 10724(v0)
+// 0x0105b86c: 0x105b86c: lw    s3, 11188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105b860: 0x105b860: mflo  lo
+// 0x0105b870: 0x105b870: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0105b864: 0x105b864: j	 0x105b88c addu  s3, s3, v1
+// 0x0105b874: 0x105b874: j	 0x105b89c addu  s3, s3, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-	br L_105b88c
+	br L_105b89c
 // --- basic block ---
-L_105b86c:
-// 0x0105b86c: 0x105b86c: addu  s3, s3, v1
+L_105b87c:
+// 0x0105b87c: 0x105b87c: addu  s3, s3, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x0105b870: 0x105b870: subu  v0, s3, v0
+// 0x0105b880: 0x105b880: subu  v0, s3, v0
 	ldloc 8
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105b874: 0x105b874: addiu a0, zero, 56
+// 0x0105b884: 0x105b884: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.1
-// 0x0105b878: 0x105b878: mult  v0, a0
+// 0x0105b888: 0x105b888: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 11
-// 0x0105b87c: 0x105b87c: lui   v1, 0x70000
+// 0x0105b88c: 0x105b88c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105b880: 0x105b880: lw    s3, 10720(v1)
+// 0x0105b890: 0x105b890: lw    s3, 11184(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105b884: 0x105b884: mflo  lo
+// 0x0105b894: 0x105b894: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0105b888: 0x105b888: addu  s3, s3, v0
+// 0x0105b898: 0x105b898: addu  s3, s3, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-L_105b88c:
-// 0x0105b88c: 0x105b88c: lui   v0, 0x70000
+L_105b89c:
+// 0x0105b89c: 0x105b89c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_105b890:
-// 0x0105b890: 0x105b890: lw    v0, 9164(v0)
+L_105b8a0:
+// 0x0105b8a0: 0x105b8a0: lw    v0, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105b894: 0x105b894: sll   zero, zero, 0
-// 0x0105b898: 0x105b898: addiu s2, v0, 1
+// 0x0105b8a4: 0x105b8a4: sll   zero, zero, 0
+// 0x0105b8a8: 0x105b8a8: addiu s2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0105b89c: 0x105b89c: slt   v1, s2, s6
+// 0x0105b8ac: 0x105b8ac: slt   v1, s2, s6
 	ldloc 9
 	ldloc 14
 	clt
 	stloc 7
-// 0x0105b8a0: 0x105b8a0: bne   v1, zero, 0x105b8b4 lui   v1, 0x70000
+// 0x0105b8b0: 0x105b8b0: bne   v1, zero, 0x105b8c4 lui   v1, 0x70000
 	ldloc 7
 	ldc.i4 458752
 	stloc 7
-	brtrue L_105b8b4
+	brtrue L_105b8c4
 // --- basic block ---
-// 0x0105b8a8: 0x105b8a8: addiu v1, zero, -1
+// 0x0105b8b8: 0x105b8b8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0105b8ac: 0x105b8ac: j	 0x105b934 sw    v1, 0(s0)
+// 0x0105b8bc: 0x105b8bc: j	 0x105b944 sw    v1, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-	br L_105b934
+	br L_105b944
 // --- basic block ---
-L_105b8b4:
-// 0x0105b8b4: 0x105b8b4: lw    a0, 9172(v1)
+L_105b8c4:
+// 0x0105b8c4: 0x105b8c4: lw    a0, 9636(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105b8b8: 0x105b8b8: sll   zero, zero, 0
-// 0x0105b8bc: 0x105b8bc: slt   v1, s2, a0
+// 0x0105b8c8: 0x105b8c8: sll   zero, zero, 0
+// 0x0105b8cc: 0x105b8cc: slt   v1, s2, a0
 	ldloc 9
 	ldloc.1
 	clt
 	stloc 7
-// 0x0105b8c0: 0x105b8c0: beq   v1, zero, 0x105b8e0 addiu v1, zero, 56
+// 0x0105b8d0: 0x105b8d0: beq   v1, zero, 0x105b8f0 addiu v1, zero, 56
 	ldloc 7
 	ldc.i4.s 56
 	stloc 7
-	brfalse L_105b8e0
+	brfalse L_105b8f0
 // --- basic block ---
-// 0x0105b8c8: 0x105b8c8: mult  s2, v1
+// 0x0105b8d8: 0x105b8d8: mult  s2, v1
 	ldloc 9
 	ldloc 7
 	mul
 	stloc 11
-// 0x0105b8cc: 0x105b8cc: lui   a0, 0x70000
+// 0x0105b8dc: 0x105b8dc: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105b8d0: 0x105b8d0: lw    a0, 10724(a0)
+// 0x0105b8e0: 0x105b8e0: lw    a0, 11188(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105b8d4: 0x105b8d4: mflo  lo
+// 0x0105b8e4: 0x105b8e4: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0105b8d8: 0x105b8d8: j	 0x105b908 addu  v1, a0, v1
+// 0x0105b8e8: 0x105b8e8: j	 0x105b918 addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-	br L_105b908
+	br L_105b918
 // --- basic block ---
-L_105b8e0:
-// 0x0105b8e0: 0x105b8e0: lui   v1, 0x70000
+L_105b8f0:
+// 0x0105b8f0: 0x105b8f0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105b8e4: 0x105b8e4: lw    a1, 9176(v1)
+// 0x0105b8f4: 0x105b8f4: lw    a1, 9640(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b8e8: 0x105b8e8: subu  v1, s2, a0
+// 0x0105b8f8: 0x105b8f8: subu  v1, s2, a0
 	ldloc 9
 	ldloc.1
 	sub
 	stloc 7
-// 0x0105b8ec: 0x105b8ec: addu  v1, v1, a1
+// 0x0105b8fc: 0x105b8fc: addu  v1, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc 7
-// 0x0105b8f0: 0x105b8f0: addiu a1, zero, 56
+// 0x0105b900: 0x105b900: addiu a1, zero, 56
 	ldc.i4.s 56
 	stloc.2
-// 0x0105b8f4: 0x105b8f4: mult  v1, a1
+// 0x0105b904: 0x105b904: mult  v1, a1
 	ldloc 7
 	ldloc.2
 	mul
 	stloc 11
-// 0x0105b8f8: 0x105b8f8: lui   a0, 0x70000
+// 0x0105b908: 0x105b908: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105b8fc: 0x105b8fc: lw    a0, 10720(a0)
+// 0x0105b90c: 0x105b90c: lw    a0, 11184(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105b900: 0x105b900: mflo  lo
+// 0x0105b910: 0x105b910: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0105b904: 0x105b904: addu  v1, a0, v1
+// 0x0105b914: 0x105b914: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-L_105b908:
-// 0x0105b908: 0x105b908: lui   a0, 0x0
+L_105b918:
+// 0x0105b918: 0x105b918: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105b90c: 0x105b90c: lw    a0, 1816(a0)
+// 0x0105b91c: 0x105b91c: lw    a0, 1816(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2320,14 +2320,14 @@ L_105b908:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105b910: 0x105b910: sw    zero, 0(s0)
+// 0x0105b920: 0x105b920: sw    zero, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105b914: 0x105b914: sw    a0, 16(s0)
+// 0x0105b924: 0x105b924: sw    a0, 16(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2336,7 +2336,7 @@ L_105b908:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105b918: 0x105b918: lw    a1, 24(v1)
+// 0x0105b928: 0x105b928: lw    a1, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2345,13 +2345,13 @@ L_105b908:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b91c: 0x105b91c: lh    a0, 36(v1)
+// 0x0105b92c: 0x105b92c: lh    a0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105b920: 0x105b920: sw    a1, 12(s0)
+// 0x0105b930: 0x105b930: sw    a1, 12(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2360,7 +2360,7 @@ L_105b908:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105b924: 0x105b924: sw    a0, 4(s0)
+// 0x0105b934: 0x105b934: sw    a0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2369,14 +2369,14 @@ L_105b908:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105b928: 0x105b928: lb    v1, 51(v1)
+// 0x0105b938: 0x105b938: lb    v1, 51(v1)
 	ldloc 7
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105b92c: 0x105b92c: sll   zero, zero, 0
-// 0x0105b930: 0x105b930: sw    v1, 8(s0)
+// 0x0105b93c: 0x105b93c: sll   zero, zero, 0
+// 0x0105b940: 0x105b940: sw    v1, 8(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2385,222 +2385,222 @@ L_105b908:
 	add
 	ldloc 7
 	stelem.i4
-L_105b934:
-// 0x0105b934: 0x105b934: bne   s1, zero, 0x105b944 lui   v1, 0x70000
+L_105b944:
+// 0x0105b944: 0x105b944: bne   s1, zero, 0x105b954 lui   v1, 0x70000
 	ldloc 12
 	ldc.i4 458752
 	stloc 7
-	brtrue L_105b944
+	brtrue L_105b954
 // --- basic block ---
-// 0x0105b93c: 0x105b93c: bne   v0, zero, 0x105bc18 sll   zero, zero, 0
+// 0x0105b94c: 0x105b94c: bne   v0, zero, 0x105bc28 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_105bc18
+	brtrue L_105bc28
 // --- basic block ---
-L_105b944:
-// 0x0105b944: 0x105b944: lw    v1, 9176(v1)
+L_105b954:
+// 0x0105b954: 0x105b954: lw    v1, 9640(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b948: 0x105b948: addiu a0, zero, 56
+// 0x0105b958: 0x105b958: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.1
-// 0x0105b94c: 0x105b94c: addu  v0, v0, v1
+// 0x0105b95c: 0x105b95c: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0105b950: 0x105b950: lui   v1, 0x70000
+// 0x0105b960: 0x105b960: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105b954: 0x105b954: lw    a1, 9172(v1)
+// 0x0105b964: 0x105b964: lw    a1, 9636(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105b958: 0x105b958: addiu v0, v0, 1
+// 0x0105b968: 0x105b968: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0105b95c: 0x105b95c: subu  v0, v0, a1
+// 0x0105b96c: 0x105b96c: subu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	sub
 	stloc 5
-// 0x0105b960: 0x105b960: mult  v0, a0
+// 0x0105b970: 0x105b970: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 11
-// 0x0105b964: 0x105b964: lui   v1, 0x70000
+// 0x0105b974: 0x105b974: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105b968: 0x105b968: lui   a2, 0x70000
+// 0x0105b978: 0x105b978: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x0105b96c: 0x105b96c: lw    v1, 10720(v1)
+// 0x0105b97c: 0x105b97c: lw    v1, 11184(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105b970: 0x105b970: lw    a2, 10724(a2)
+// 0x0105b980: 0x105b980: lw    a2, 11188(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105b974: 0x105b974: mflo  lo
+// 0x0105b984: 0x105b984: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0105b978: 0x105b978: addu  v0, v1, v0
+// 0x0105b988: 0x105b988: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0105b97c: 0x105b97c: sll   zero, zero, 0
-// 0x0105b980: 0x105b980: mult  s2, a0
+// 0x0105b98c: 0x105b98c: sll   zero, zero, 0
+// 0x0105b990: 0x105b990: mult  s2, a0
 	ldloc 9
 	ldloc.1
 	mul
 	stloc 11
-// 0x0105b984: 0x105b984: mflo  lo
+// 0x0105b994: 0x105b994: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x0105b988: 0x105b988: j	 0x105b9b8 addu  a2, a2, a0
+// 0x0105b998: 0x105b998: j	 0x105b9c8 addu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.3
-	br L_105b9b8
+	br L_105b9c8
 // --- basic block ---
-L_105b990:
-// 0x0105b990: 0x105b990: beq   a3, zero, 0x105b99c addu  a0, v0, zero
+L_105b9a0:
+// 0x0105b9a0: 0x105b9a0: beq   a3, zero, 0x105b9ac addu  a0, v0, zero
 	ldloc 4
 	ldloc 5
 	stloc.1
-	brfalse L_105b99c
+	brfalse L_105b9ac
 // --- basic block ---
-// 0x0105b998: 0x105b998: addu  a0, a2, zero
+// 0x0105b9a8: 0x105b9a8: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-L_105b99c:
-// 0x0105b99c: 0x105b99c: lh    a3, 44(s3)
+L_105b9ac:
+// 0x0105b9ac: 0x105b9ac: lh    a3, 44(s3)
 	ldloc 8
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x0105b9a0: 0x105b9a0: lh    t0, 44(a0)
+// 0x0105b9b0: 0x105b9b0: lh    t0, 44(a0)
 	ldloc.1
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 16
-// 0x0105b9a4: 0x105b9a4: addiu a2, a2, 56
+// 0x0105b9b4: 0x105b9b4: addiu a2, a2, 56
 	ldloc.3
 	ldc.i4.s 56
 	add
 	stloc.3
-// 0x0105b9a8: 0x105b9a8: bne   t0, a3, 0x105b9c4 addiu v0, v0, 56
+// 0x0105b9b8: 0x105b9b8: bne   t0, a3, 0x105b9d4 addiu v0, v0, 56
 	ldloc 16
 	ldloc 4
 	ldloc 5
 	ldc.i4.s 56
 	add
 	stloc 5
-	bne.un L_105b9c4
+	bne.un L_105b9d4
 // --- basic block ---
-// 0x0105b9b0: 0x105b9b0: addiu s2, s2, 1
+// 0x0105b9c0: 0x105b9c0: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0105b9b4: 0x105b9b4: addu  s3, a0, zero
+// 0x0105b9c4: 0x105b9c4: addu  s3, a0, zero
 	ldloc.1
 	stloc 8
-L_105b9b8:
-// 0x0105b9b8: 0x105b9b8: slt   a0, s2, s6
+L_105b9c8:
+// 0x0105b9c8: 0x105b9c8: slt   a0, s2, s6
 	ldloc 9
 	ldloc 14
 	clt
 	stloc.1
-// 0x0105b9bc: 0x105b9bc: bne   a0, zero, 0x105b990 slt   a3, s2, a1
+// 0x0105b9cc: 0x105b9cc: bne   a0, zero, 0x105b9a0 slt   a3, s2, a1
 	ldloc.1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc 4
-	brtrue L_105b990
+	brtrue L_105b9a0
 // --- basic block ---
-L_105b9c4:
-// 0x0105b9c4: 0x105b9c4: subu  v1, s3, v1
+L_105b9d4:
+// 0x0105b9d4: 0x105b9d4: subu  v1, s3, v1
 	ldloc 8
 	ldloc 7
 	sub
 	stloc 7
-// 0x0105b9c8: 0x105b9c8: lui   v0, 0xb6db0000
+// 0x0105b9d8: 0x105b9d8: lui   v0, 0xb6db0000
 	ldc.i4 3067805696
 	stloc 5
-// 0x0105b9cc: 0x105b9cc: sra   v1, v1, 3
+// 0x0105b9dc: 0x105b9dc: sra   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shr
 	stloc 7
-// 0x0105b9d0: 0x105b9d0: ori   v0, v0, 28087
+// 0x0105b9e0: 0x105b9e0: ori   v0, v0, 28087
 	ldloc 5
 	ldc.i4 28087
 	or
 	stloc 5
-// 0x0105b9d4: 0x105b9d4: mult  v1, v0
+// 0x0105b9e4: 0x105b9e4: mult  v1, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 11
-// 0x0105b9d8: 0x105b9d8: lh    v0, 44(s3)
+// 0x0105b9e8: 0x105b9e8: lh    v0, 44(s3)
 	ldloc 8
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105b9dc: 0x105b9dc: lui   a1, 0x10000
+// 0x0105b9ec: 0x105b9ec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105b9e0: 0x105b9e0: lui   a3, 0x10000
+// 0x0105b9f0: 0x105b9f0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105b9e4: 0x105b9e4: addiu a1, a1, 8052
+// 0x0105b9f4: 0x105b9f4: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105b9e8: 0x105b9e8: addiu a3, a3, 10700
+// 0x0105b9f8: 0x105b9f8: addiu a3, a3, 10696
 	ldloc 4
-	ldc.i4 10700
+	ldc.i4 10696
 	add
 	stloc 4
-// 0x0105b9ec: 0x105b9ec: addiu a2, zero, 1862
+// 0x0105b9fc: 0x105b9fc: addiu a2, zero, 1862
 	ldc.i4 1862
 	stloc.3
-// 0x0105b9f0: 0x105b9f0: addiu a0, zero, 1
+// 0x0105ba00: 0x105ba00: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105b9f4: 0x105b9f4: sw    v0, 16(sp)
+// 0x0105ba04: 0x105ba04: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2609,16 +2609,16 @@ L_105b9c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105b9f8: 0x105b9f8: addu  s0, s3, zero
+// 0x0105ba08: 0x105ba08: addu  s0, s3, zero
 	ldloc 8
 	stloc 10
-// 0x0105b9fc: 0x105b9fc: addu  s1, s2, zero
+// 0x0105ba0c: 0x105ba0c: addu  s1, s2, zero
 	ldloc 9
 	stloc 12
-// 0x0105ba00: 0x105ba00: mflo  lo
+// 0x0105ba10: 0x105ba10: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0105ba04: 0x105ba04: jal   0x100449c sw    v0, 20(sp)
+// 0x0105ba14: 0x105ba14: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2637,342 +2637,342 @@ L_105b9c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ba0c: 0x105ba0c: lb    a0, 54(s3)
+// 0x0105ba1c: 0x105ba1c: lb    a0, 54(s3)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0105ba10: 0x105ba10: jal   0x105e29c sll   zero, zero, 0
+// 0x0105ba20: 0x105ba20: jal   0x105e2ac sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_instruction_105e29c(int32)
+	call int32 Cibyl70::navigate_bar_set_instruction_105e2ac(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105ba18: 0x105ba18: jal   0x1059ff8 sll   zero, zero, 0
+// 0x0105ba28: 0x105ba28: jal   0x105a008 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_update_next_1059ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_update_next_105a008(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ba20: 0x105ba20: lbu   v0, 54(s3)
+// 0x0105ba30: 0x105ba30: lbu   v0, 54(s3)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x0105ba24: 0x105ba24: sll   zero, zero, 0
-// 0x0105ba28: 0x105ba28: addiu v0, v0, -5
+// 0x0105ba34: 0x105ba34: sll   zero, zero, 0
+// 0x0105ba38: 0x105ba38: addiu v0, v0, -5
 	ldloc 5
 	ldc.i4.s -5
 	add
 	stloc 5
-// 0x0105ba2c: 0x105ba2c: andi  v0, v0, 255
+// 0x0105ba3c: 0x105ba3c: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x0105ba30: 0x105ba30: sltiu v0, v0, 2
+// 0x0105ba40: 0x105ba40: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x0105ba34: 0x105ba34: beq   v0, zero, 0x105ba40 addiu a0, zero, -1
+// 0x0105ba44: 0x105ba44: beq   v0, zero, 0x105ba50 addiu a0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc.1
-	brfalse L_105ba40
+	brfalse L_105ba50
 // --- basic block ---
-// 0x0105ba3c: 0x105ba3c: lb    a0, 53(s3)
+// 0x0105ba4c: 0x105ba4c: lb    a0, 53(s3)
 	ldloc 8
 	ldc.i4.s 53
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-L_105ba40:
-// 0x0105ba40: 0x105ba40: jal   0x105e2b4 sll   zero, zero, 0
+L_105ba50:
+// 0x0105ba50: 0x105ba50: jal   0x105e2c4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_exit_105e2b4(int32)
+	call int32 Cibyl70::navigate_bar_set_exit_105e2c4(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105ba48: 0x105ba48: slt   v0, s2, s6
+// 0x0105ba58: 0x105ba58: slt   v0, s2, s6
 	ldloc 9
 	ldloc 14
 	clt
 	stloc 5
-// 0x0105ba4c: 0x105ba4c: lh    s3, 44(s3)
+// 0x0105ba5c: 0x105ba5c: lh    s3, 44(s3)
 	ldloc 8
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 8
-// 0x0105ba50: 0x105ba50: beq   v0, zero, 0x105bab4 lui   v0, 0x70000
+// 0x0105ba60: 0x105ba60: beq   v0, zero, 0x105bac4 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105bab4
+	brfalse L_105bac4
 // --- basic block ---
-// 0x0105ba58: 0x105ba58: lw    v0, 9172(v0)
+// 0x0105ba68: 0x105ba68: lw    v0, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ba5c: 0x105ba5c: sll   zero, zero, 0
-// 0x0105ba60: 0x105ba60: slt   v1, s1, v0
+// 0x0105ba6c: 0x105ba6c: sll   zero, zero, 0
+// 0x0105ba70: 0x105ba70: slt   v1, s1, v0
 	ldloc 12
 	ldloc 5
 	clt
 	stloc 7
-// 0x0105ba64: 0x105ba64: beq   v1, zero, 0x105ba88 addiu s2, s2, 1
+// 0x0105ba74: 0x105ba74: beq   v1, zero, 0x105ba98 addiu s2, s2, 1
 	ldloc 7
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	brfalse L_105ba88
+	brfalse L_105ba98
 // --- basic block ---
-// 0x0105ba6c: 0x105ba6c: addiu s0, zero, 56
+// 0x0105ba7c: 0x105ba7c: addiu s0, zero, 56
 	ldc.i4.s 56
 	stloc 10
-// 0x0105ba70: 0x105ba70: mult  s1, s0
+// 0x0105ba80: 0x105ba80: mult  s1, s0
 	ldloc 12
 	ldloc 10
 	mul
 	stloc 11
-// 0x0105ba74: 0x105ba74: lui   v0, 0x70000
+// 0x0105ba84: 0x105ba84: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ba78: 0x105ba78: lw    s0, 10724(v0)
+// 0x0105ba88: 0x105ba88: lw    s0, 11188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105ba7c: 0x105ba7c: mflo  lo
+// 0x0105ba8c: 0x105ba8c: mflo  lo
 	ldloc 11
 	stloc 12
-// 0x0105ba80: 0x105ba80: j	 0x105bab0 addu  s0, s0, s1
+// 0x0105ba90: 0x105ba90: j	 0x105bac0 addu  s0, s0, s1
 	ldloc 10
 	ldloc 12
 	add
 	stloc 10
-	br L_105bab0
+	br L_105bac0
 // --- basic block ---
-L_105ba88:
-// 0x0105ba88: 0x105ba88: lui   v1, 0x70000
+L_105ba98:
+// 0x0105ba98: 0x105ba98: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105ba8c: 0x105ba8c: lw    s0, 9176(v1)
+// 0x0105ba9c: 0x105ba9c: lw    s0, 9640(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105ba90: 0x105ba90: addiu v1, zero, 56
+// 0x0105baa0: 0x105baa0: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x0105ba94: 0x105ba94: subu  v0, s0, v0
+// 0x0105baa4: 0x105baa4: subu  v0, s0, v0
 	ldloc 10
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105ba98: 0x105ba98: addu  s1, v0, s1
+// 0x0105baa8: 0x105baa8: addu  s1, v0, s1
 	ldloc 5
 	ldloc 12
 	add
 	stloc 12
-// 0x0105ba9c: 0x105ba9c: mult  s1, v1
+// 0x0105baac: 0x105baac: mult  s1, v1
 	ldloc 12
 	ldloc 7
 	mul
 	stloc 11
-// 0x0105baa0: 0x105baa0: lui   v0, 0x70000
+// 0x0105bab0: 0x105bab0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105baa4: 0x105baa4: lw    s0, 10720(v0)
+// 0x0105bab4: 0x105bab4: lw    s0, 11184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105baa8: 0x105baa8: mflo  lo
+// 0x0105bab8: 0x105bab8: mflo  lo
 	ldloc 11
 	stloc 12
-// 0x0105baac: 0x105baac: addu  s0, s0, s1
+// 0x0105babc: 0x105babc: addu  s0, s0, s1
 	ldloc 10
 	ldloc 12
 	add
 	stloc 10
-L_105bab0:
-// 0x0105bab0: 0x105bab0: lui   v0, 0x70000
+L_105bac0:
+// 0x0105bac0: 0x105bac0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_105bab4:
-// 0x0105bab4: 0x105bab4: lw    v1, 9172(v0)
+L_105bac4:
+// 0x0105bac4: 0x105bac4: lw    v1, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105bab8: 0x105bab8: lui   v0, 0x70000
+// 0x0105bac8: 0x105bac8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105babc: 0x105babc: lw    a0, 9176(v0)
+// 0x0105bacc: 0x105bacc: lw    a0, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105bac0: 0x105bac0: addiu v0, zero, 56
+// 0x0105bad0: 0x105bad0: addiu v0, zero, 56
 	ldc.i4.s 56
 	stloc 5
-// 0x0105bac4: 0x105bac4: mult  s2, v0
+// 0x0105bad4: 0x105bad4: mult  s2, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 11
-// 0x0105bac8: 0x105bac8: subu  a0, a0, v1
+// 0x0105bad8: 0x105bad8: subu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc.1
-// 0x0105bacc: 0x105bacc: addu  t0, a0, s2
+// 0x0105badc: 0x105badc: addu  t0, a0, s2
 	ldloc.1
 	ldloc 9
 	add
 	stloc 16
-// 0x0105bad0: 0x105bad0: lui   a0, 0x70000
+// 0x0105bae0: 0x105bae0: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105bad4: 0x105bad4: lw    a2, 10724(a0)
+// 0x0105bae4: 0x105bae4: lw    a2, 11188(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105bad8: 0x105bad8: lui   a0, 0x70000
+// 0x0105bae8: 0x105bae8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105badc: 0x105badc: lw    a0, 10720(a0)
+// 0x0105baec: 0x105baec: lw    a0, 11184(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105bae0: 0x105bae0: addiu a3, zero, 1
+// 0x0105baf0: 0x105baf0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0105bae4: 0x105bae4: mflo  lo
+// 0x0105baf4: 0x105baf4: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x0105bae8: 0x105bae8: addu  a1, a2, a1
+// 0x0105baf8: 0x105baf8: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x0105baec: 0x105baec: sll   zero, zero, 0
-// 0x0105baf0: 0x105baf0: mult  t0, v0
+// 0x0105bafc: 0x105bafc: sll   zero, zero, 0
+// 0x0105bb00: 0x105bb00: mult  t0, v0
 	ldloc 16
 	ldloc 5
 	mul
 	stloc 11
-// 0x0105baf4: 0x105baf4: mflo  lo
+// 0x0105bb04: 0x105bb04: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0105baf8: 0x105baf8: j	 0x105bb14 addu  a0, a0, v0
+// 0x0105bb08: 0x105bb08: j	 0x105bb24 addu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc.1
-	br L_105bb14
+	br L_105bb24
 // --- basic block ---
-L_105bb00:
-// 0x0105bb00: 0x105bb00: beq   a2, zero, 0x105bb0c addu  s0, a0, zero
+L_105bb10:
+// 0x0105bb10: 0x105bb10: beq   a2, zero, 0x105bb1c addu  s0, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 10
-	brfalse L_105bb0c
+	brfalse L_105bb1c
 // --- basic block ---
-// 0x0105bb08: 0x105bb08: addu  s0, a1, zero
+// 0x0105bb18: 0x105bb18: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-L_105bb0c:
-// 0x0105bb0c: 0x105bb0c: addiu a1, a1, 56
+L_105bb1c:
+// 0x0105bb1c: 0x105bb1c: addiu a1, a1, 56
 	ldloc.2
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x0105bb10: 0x105bb10: addiu a0, a0, 56
+// 0x0105bb20: 0x105bb20: addiu a0, a0, 56
 	ldloc.1
 	ldc.i4.s 56
 	add
 	stloc.1
-L_105bb14:
-// 0x0105bb14: 0x105bb14: slt   v0, s2, s6
+L_105bb24:
+// 0x0105bb24: 0x105bb24: slt   v0, s2, s6
 	ldloc 9
 	ldloc 14
 	clt
 	stloc 5
-// 0x0105bb18: 0x105bb18: beq   v0, zero, 0x105bb34 slt   a2, s2, v1
+// 0x0105bb28: 0x105bb28: beq   v0, zero, 0x105bb44 slt   a2, s2, v1
 	ldloc 5
 	ldloc 9
 	ldloc 7
 	clt
 	stloc.3
-	brfalse L_105bb34
+	brfalse L_105bb44
 // --- basic block ---
-// 0x0105bb20: 0x105bb20: lb    v0, 52(s0)
+// 0x0105bb30: 0x105bb30: lb    v0, 52(s0)
 	ldloc 10
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105bb24: 0x105bb24: sll   zero, zero, 0
-// 0x0105bb28: 0x105bb28: beq   v0, a3, 0x105bb00 addiu s2, s2, 1
+// 0x0105bb34: 0x105bb34: sll   zero, zero, 0
+// 0x0105bb38: 0x105bb38: beq   v0, a3, 0x105bb10 addiu s2, s2, 1
 	ldloc 5
 	ldloc 4
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	beq  L_105bb00
+	beq  L_105bb10
 // --- basic block ---
-// 0x0105bb30: 0x105bb30: addiu s2, s2, -1
+// 0x0105bb40: 0x105bb40: addiu s2, s2, -1
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 9
-L_105bb34:
-// 0x0105bb34: 0x105bb34: jal   0x1057214 addiu a0, s2, -1
+L_105bb44:
+// 0x0105bb44: 0x105bb44: jal   0x1057224 addiu a0, s2, -1
 	ldloc 9
 	ldc.i4.m1
 	add
@@ -2982,497 +2982,497 @@ L_105bb34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_display_street_1057214(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_display_street_1057224(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bb3c: 0x105bb3c: lui   v1, 0x70000
+// 0x0105bb4c: 0x105bb4c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105bb40: 0x105bb40: addiu a0, zero, -1
+// 0x0105bb50: 0x105bb50: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0105bb44: 0x105bb44: sw    a0, 10748(v1)
+// 0x0105bb54: 0x105bb54: sw    a0, 11212(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2687
+	ldc.i4 2803
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105bb48: 0x105bb48: lui   v1, 0x70000
+// 0x0105bb58: 0x105bb58: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105bb4c: 0x105bb4c: sw    zero, 10680(v1)
+// 0x0105bb5c: 0x105bb5c: sw    zero, 11144(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2670
+	ldc.i4 2786
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bb50: 0x105bb50: lh    v0, 44(s0)
+// 0x0105bb60: 0x105bb60: lh    v0, 44(s0)
 	ldloc 10
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105bb54: 0x105bb54: lui   v1, 0x70000
+// 0x0105bb64: 0x105bb64: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105bb58: 0x105bb58: sw    zero, 10684(v1)
+// 0x0105bb68: 0x105bb68: sw    zero, 11148(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2671
+	ldc.i4 2787
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bb5c: 0x105bb5c: lui   v1, 0x70000
+// 0x0105bb6c: 0x105bb6c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105bb60: 0x105bb60: beq   v0, s3, 0x105bc18 sw    zero, 10704(v1)
+// 0x0105bb70: 0x105bb70: beq   v0, s3, 0x105bc28 sw    zero, 11168(v1)
 	ldloc 5
 	ldloc 8
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2676
+	ldc.i4 2792
 	add
 	ldc.i4.s 0
 	stelem.i4
-	beq  L_105bc18
+	beq  L_105bc28
 // --- basic block ---
-// 0x0105bb68: 0x105bb68: addiu a0, zero, 56
+// 0x0105bb78: 0x105bb78: addiu a0, zero, 56
 	ldc.i4.s 56
 	stloc.1
-// 0x0105bb6c: 0x105bb6c: mult  s2, a0
+// 0x0105bb7c: 0x105bb7c: mult  s2, a0
 	ldloc 9
 	ldloc.1
 	mul
 	stloc 11
-// 0x0105bb70: 0x105bb70: lui   v0, 0x70000
+// 0x0105bb80: 0x105bb80: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bb74: 0x105bb74: lw    a1, 9172(v0)
+// 0x0105bb84: 0x105bb84: lw    a1, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105bb78: 0x105bb78: lui   v0, 0x70000
+// 0x0105bb88: 0x105bb88: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bb7c: 0x105bb7c: lw    a2, 9176(v0)
+// 0x0105bb8c: 0x105bb8c: lw    a2, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105bb80: 0x105bb80: lui   v0, 0x70000
+// 0x0105bb90: 0x105bb90: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bb84: 0x105bb84: subu  a2, a2, a1
+// 0x0105bb94: 0x105bb94: subu  a2, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.3
-// 0x0105bb88: 0x105bb88: addu  t1, a2, s2
+// 0x0105bb98: 0x105bb98: addu  t1, a2, s2
 	ldloc.3
 	ldloc 9
 	add
 	stloc 19
-// 0x0105bb8c: 0x105bb8c: lw    t0, 10724(v0)
+// 0x0105bb9c: 0x105bb9c: lw    t0, 11188(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105bb90: 0x105bb90: lui   v0, 0x70000
+// 0x0105bba0: 0x105bba0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bb94: 0x105bb94: lw    a2, 10720(v0)
+// 0x0105bba4: 0x105bba4: lw    a2, 11184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105bb98: 0x105bb98: addu  v1, zero, zero
+// 0x0105bba8: 0x105bba8: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0105bb9c: 0x105bb9c: addu  v0, zero, zero
+// 0x0105bbac: 0x105bbac: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0105bba0: 0x105bba0: mflo  lo
+// 0x0105bbb0: 0x105bbb0: mflo  lo
 	ldloc 11
 	stloc 4
-// 0x0105bba4: 0x105bba4: addu  a3, t0, a3
+// 0x0105bbb4: 0x105bbb4: addu  a3, t0, a3
 	ldloc 16
 	ldloc 4
 	add
 	stloc 4
-// 0x0105bba8: 0x105bba8: sll   zero, zero, 0
-// 0x0105bbac: 0x105bbac: mult  t1, a0
+// 0x0105bbb8: 0x105bbb8: sll   zero, zero, 0
+// 0x0105bbbc: 0x105bbbc: mult  t1, a0
 	ldloc 19
 	ldloc.1
 	mul
 	stloc 11
-// 0x0105bbb0: 0x105bbb0: mflo  lo
+// 0x0105bbc0: 0x105bbc0: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x0105bbb4: 0x105bbb4: j	 0x105bbe4 addu  a2, a2, a0
+// 0x0105bbc4: 0x105bbc4: j	 0x105bbf4 addu  a2, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.3
-	br L_105bbe4
+	br L_105bbf4
 // --- basic block ---
-L_105bbbc:
-// 0x0105bbbc: 0x105bbbc: lh    t1, 48(s0)
+L_105bbcc:
+// 0x0105bbcc: 0x105bbcc: lh    t1, 48(s0)
 	ldloc 10
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 19
-// 0x0105bbc0: 0x105bbc0: lh    a0, 46(s0)
+// 0x0105bbd0: 0x105bbd0: lh    a0, 46(s0)
 	ldloc 10
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105bbc4: 0x105bbc4: addu  v0, v0, t1
+// 0x0105bbd4: 0x105bbd4: addu  v0, v0, t1
 	ldloc 5
 	ldloc 19
 	add
 	stloc 5
-// 0x0105bbc8: 0x105bbc8: addu  v1, v1, a0
+// 0x0105bbd8: 0x105bbd8: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x0105bbcc: 0x105bbcc: addiu s2, s2, 1
+// 0x0105bbdc: 0x105bbdc: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0105bbd0: 0x105bbd0: beq   t0, zero, 0x105bbdc addu  s0, a2, zero
+// 0x0105bbe0: 0x105bbe0: beq   t0, zero, 0x105bbec addu  s0, a2, zero
 	ldloc 16
 	ldloc.3
 	stloc 10
-	brfalse L_105bbdc
+	brfalse L_105bbec
 // --- basic block ---
-// 0x0105bbd8: 0x105bbd8: addu  s0, a3, zero
+// 0x0105bbe8: 0x105bbe8: addu  s0, a3, zero
 	ldloc 4
 	stloc 10
-L_105bbdc:
-// 0x0105bbdc: 0x105bbdc: addiu a3, a3, 56
+L_105bbec:
+// 0x0105bbec: 0x105bbec: addiu a3, a3, 56
 	ldloc 4
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x0105bbe0: 0x105bbe0: addiu a2, a2, 56
+// 0x0105bbf0: 0x105bbf0: addiu a2, a2, 56
 	ldloc.3
 	ldc.i4.s 56
 	add
 	stloc.3
-L_105bbe4:
-// 0x0105bbe4: 0x105bbe4: slt   a0, s6, s2
+L_105bbf4:
+// 0x0105bbf4: 0x105bbf4: slt   a0, s6, s2
 	ldloc 14
 	ldloc 9
 	clt
 	stloc.1
-// 0x0105bbe8: 0x105bbe8: beq   a0, zero, 0x105bbbc slt   t0, s2, a1
+// 0x0105bbf8: 0x105bbf8: beq   a0, zero, 0x105bbcc slt   t0, s2, a1
 	ldloc.1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc 16
-	brfalse L_105bbbc
+	brfalse L_105bbcc
 // --- basic block ---
-// 0x0105bbf0: 0x105bbf0: lui   a0, 0x70000
+// 0x0105bc00: 0x105bc00: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105bbf4: 0x105bbf4: sw    v1, 10680(a0)
+// 0x0105bc04: 0x105bc04: sw    v1, 11144(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2670
+	ldc.i4 2786
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105bbf8: 0x105bbf8: lui   v1, 0x70000
+// 0x0105bc08: 0x105bc08: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105bbfc: 0x105bbfc: sw    v0, 10684(v1)
+// 0x0105bc0c: 0x105bc0c: sw    v0, 11148(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2671
+	ldc.i4 2787
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105bc00: 0x105bc00: addu  v1, zero, zero
+// 0x0105bc10: 0x105bc10: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0105bc04: 0x105bc04: cibyl_sysc_arg 0x3
+// 0x0105bc14: 0x105bc14: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0105bc08: 0x105bc08: cibyl_sysc 0x2096
+// 0x0105bc18: 0x105bc18: cibyl_sysc 0x2096
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0105bc0c: 0x105bc0c: addu  v1, v0, zero
+// 0x0105bc1c: 0x105bc1c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0105bc10: 0x105bc10: lui   v0, 0x70000
+// 0x0105bc20: 0x105bc20: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bc14: 0x105bc14: sw    v1, 10708(v0)
+// 0x0105bc24: 0x105bc24: sw    v1, 11172(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2677
+	ldc.i4 2793
 	add
 	ldloc 7
 	stelem.i4
-L_105bc18:
-// 0x0105bc18: 0x105bc18: lui   v0, 0x70000
+L_105bc28:
+// 0x0105bc28: 0x105bc28: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bc1c: 0x105bc1c: lui   v1, 0x70000
+// 0x0105bc2c: 0x105bc2c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105bc20: 0x105bc20: lw    a0, 9168(v0)
+// 0x0105bc30: 0x105bc30: lw    a0, 9632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105bc24: 0x105bc24: lw    s5, 9172(v1)
+// 0x0105bc34: 0x105bc34: lw    s5, 9636(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105bc28: 0x105bc28: lui   v0, 0x70000
+// 0x0105bc38: 0x105bc38: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bc2c: 0x105bc2c: lw    a1, 9176(v0)
+// 0x0105bc3c: 0x105bc3c: lw    a1, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105bc30: 0x105bc30: lui   s4, 0x70000
+// 0x0105bc40: 0x105bc40: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 13
-// 0x0105bc34: 0x105bc34: addu  s5, s5, a0
+// 0x0105bc44: 0x105bc44: addu  s5, s5, a0
 	ldloc 15
 	ldloc.1
 	add
 	stloc 15
-// 0x0105bc38: 0x105bc38: lw    a0, 10008(s4)
+// 0x0105bc48: 0x105bc48: lw    a0, 10472(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105bc3c: 0x105bc3c: subu  s5, s5, a1
+// 0x0105bc4c: 0x105bc4c: subu  s5, s5, a1
 	ldloc 15
 	ldloc.2
 	sub
 	stloc 15
-// 0x0105bc40: 0x105bc40: slt   a0, a0, s5
+// 0x0105bc50: 0x105bc50: slt   a0, a0, s5
 	ldloc.1
 	ldloc 15
 	clt
 	stloc.1
-// 0x0105bc44: 0x105bc44: beq   a0, zero, 0x105bd28 lui   a0, 0x70000
+// 0x0105bc54: 0x105bc54: beq   a0, zero, 0x105bd38 lui   a0, 0x70000
 	ldloc.1
 	ldc.i4 458752
 	stloc.1
-	brfalse L_105bd28
+	brfalse L_105bd38
 // --- basic block ---
-// 0x0105bc4c: 0x105bc4c: lw    s0, 9164(a0)
+// 0x0105bc5c: 0x105bc5c: lw    s0, 9628(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105bc50: 0x105bc50: addiu s3, zero, 56
+// 0x0105bc60: 0x105bc60: addiu s3, zero, 56
 	ldc.i4.s 56
 	stloc 8
-// 0x0105bc54: 0x105bc54: mult  s0, s3
+// 0x0105bc64: 0x105bc64: mult  s0, s3
 	ldloc 10
 	ldloc 8
 	mul
 	stloc 11
-// 0x0105bc58: 0x105bc58: addu  s2, zero, zero
+// 0x0105bc68: 0x105bc68: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0105bc5c: 0x105bc5c: lui   s8, 0x70000
+// 0x0105bc6c: 0x105bc6c: lui   s8, 0x70000
 	ldc.i4 458752
 	stloc 17
-// 0x0105bc60: 0x105bc60: addiu s7, zero, 56
+// 0x0105bc70: 0x105bc70: addiu s7, zero, 56
 	ldc.i4.s 56
 	stloc 18
-// 0x0105bc64: 0x105bc64: mflo  lo
+// 0x0105bc74: 0x105bc74: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x0105bc68: 0x105bc68: j	 0x105bd1c lui   s6, 0x70000
+// 0x0105bc78: 0x105bc78: j	 0x105bd2c lui   s6, 0x70000
 	ldc.i4 458752
 	stloc 14
-	br L_105bd1c
+	br L_105bd2c
 // --- basic block ---
-L_105bc70:
-// 0x0105bc70: 0x105bc70: lw    v1, 9172(v0)
+L_105bc80:
+// 0x0105bc80: 0x105bc80: lw    v1, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105bc74: 0x105bc74: sll   zero, zero, 0
-// 0x0105bc78: 0x105bc78: slt   v0, s0, v1
+// 0x0105bc84: 0x105bc84: sll   zero, zero, 0
+// 0x0105bc88: 0x105bc88: slt   v0, s0, v1
 	ldloc 10
 	ldloc 7
 	clt
 	stloc 5
-// 0x0105bc7c: 0x105bc7c: beq   v0, zero, 0x105bc90 lui   a3, 0x70000
+// 0x0105bc8c: 0x105bc8c: beq   v0, zero, 0x105bca0 lui   a3, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 4
-	brfalse L_105bc90
+	brfalse L_105bca0
 // --- basic block ---
-// 0x0105bc84: 0x105bc84: lw    s1, 10724(s6)
+// 0x0105bc94: 0x105bc94: lw    s1, 11188(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 2681
+	ldc.i4 2797
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105bc88: 0x105bc88: j	 0x105bcac addu  s1, s1, s3
+// 0x0105bc98: 0x105bc98: j	 0x105bcbc addu  s1, s1, s3
 	ldloc 12
 	ldloc 8
 	add
 	stloc 12
-	br L_105bcac
+	br L_105bcbc
 // --- basic block ---
-L_105bc90:
-// 0x0105bc90: 0x105bc90: lw    s1, 9176(a3)
+L_105bca0:
+// 0x0105bca0: 0x105bca0: lw    s1, 9640(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105bc94: 0x105bc94: lw    v0, 10720(s8)
+// 0x0105bca4: 0x105bca4: lw    v0, 11184(s8)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105bc98: 0x105bc98: subu  s1, s1, v1
+// 0x0105bca8: 0x105bca8: subu  s1, s1, v1
 	ldloc 12
 	ldloc 7
 	sub
 	stloc 12
-// 0x0105bc9c: 0x105bc9c: addu  s1, s1, s0
+// 0x0105bcac: 0x105bcac: addu  s1, s1, s0
 	ldloc 12
 	ldloc 10
 	add
 	stloc 12
-// 0x0105bca0: 0x105bca0: mult  s1, s7
+// 0x0105bcb0: 0x105bcb0: mult  s1, s7
 	ldloc 12
 	ldloc 18
 	mul
 	stloc 11
-// 0x0105bca4: 0x105bca4: mflo  lo
+// 0x0105bcb4: 0x105bcb4: mflo  lo
 	ldloc 11
 	stloc 12
-// 0x0105bca8: 0x105bca8: addu  s1, v0, s1
+// 0x0105bcb8: 0x105bcb8: addu  s1, v0, s1
 	ldloc 5
 	ldloc 12
 	add
 	stloc 12
-L_105bcac:
-// 0x0105bcac: 0x105bcac: lw    v0, 10008(s4)
+L_105bcbc:
+// 0x0105bcbc: 0x105bcbc: lw    v0, 10472(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105bcb0: 0x105bcb0: sll   zero, zero, 0
-// 0x0105bcb4: 0x105bcb4: slt   v0, v0, s0
+// 0x0105bcc0: 0x105bcc0: sll   zero, zero, 0
+// 0x0105bcc4: 0x105bcc4: slt   v0, v0, s0
 	ldloc 5
 	ldloc 10
 	clt
 	stloc 5
-// 0x0105bcb8: 0x105bcb8: beq   v0, zero, 0x105bd04 addiu s3, s3, 56
+// 0x0105bcc8: 0x105bcc8: beq   v0, zero, 0x105bd14 addiu s3, s3, 56
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 56
 	add
 	stloc 8
-	brfalse L_105bd04
+	brfalse L_105bd14
 // --- basic block ---
-// 0x0105bcc0: 0x105bcc0: lb    v0, 55(s1)
+// 0x0105bcd0: 0x105bcd0: lb    v0, 55(s1)
 	ldloc 12
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105bcc4: 0x105bcc4: sll   zero, zero, 0
-// 0x0105bcc8: 0x105bcc8: bne   v0, zero, 0x105bd04 sll   zero, zero, 0
+// 0x0105bcd4: 0x105bcd4: sll   zero, zero, 0
+// 0x0105bcd8: 0x105bcd8: bne   v0, zero, 0x105bd14 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_105bd04
+	brtrue L_105bd14
 // --- basic block ---
-// 0x0105bcd0: 0x105bcd0: lw    a0, 24(s1)
+// 0x0105bce0: 0x105bce0: lw    a0, 24(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3481,18 +3481,18 @@ L_105bcac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105bcd4: 0x105bcd4: jal   0x100b50c sll   zero, zero, 0
+// 0x0105bce4: 0x105bce4: jal   0x100b51c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bcdc: 0x105bcdc: lw    v1, 28(s1)
+// 0x0105bcec: 0x105bcec: lw    v1, 28(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3501,19 +3501,19 @@ L_105bcac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105bce0: 0x105bce0: sll   zero, zero, 0
-// 0x0105bce4: 0x105bce4: slt   v0, v0, v1
+// 0x0105bcf0: 0x105bcf0: sll   zero, zero, 0
+// 0x0105bcf4: 0x105bcf4: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x0105bce8: 0x105bce8: beq   v0, zero, 0x105bd04 lui   a1, 0x300000
+// 0x0105bcf8: 0x105bcf8: beq   v0, zero, 0x105bd14 lui   a1, 0x300000
 	ldloc 5
 	ldc.i4 3145728
 	stloc.2
-	brfalse L_105bd04
+	brfalse L_105bd14
 // --- basic block ---
-// 0x0105bcf0: 0x105bcf0: lw    a0, 24(s1)
+// 0x0105bd00: 0x105bd00: lw    a0, 24(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -3522,10 +3522,10 @@ L_105bcac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105bcf4: 0x105bcf4: addiu a2, zero, 1
+// 0x0105bd04: 0x105bd04: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0105bcf8: 0x105bcf8: jal   0x100d384 addu  a3, zero, zero
+// 0x0105bd08: 0x105bd08: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -3533,61 +3533,61 @@ L_105bcac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bd00: 0x105bd00: sw    s0, 10008(s4)
+// 0x0105bd10: 0x105bd10: sw    s0, 10472(s4)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldloc 10
 	stelem.i4
-L_105bd04:
-// 0x0105bd04: 0x105bd04: lh    v0, 46(s1)
+L_105bd14:
+// 0x0105bd14: 0x105bd14: lh    v0, 46(s1)
 	ldloc 12
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105bd08: 0x105bd08: sll   zero, zero, 0
-// 0x0105bd0c: 0x105bd0c: addu  s2, s2, v0
+// 0x0105bd18: 0x105bd18: sll   zero, zero, 0
+// 0x0105bd1c: 0x105bd1c: addu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x0105bd10: 0x105bd10: slti  v0, s2, 10001
+// 0x0105bd20: 0x105bd20: slti  v0, s2, 10001
 	ldloc 9
 	ldc.i4 10001
 	clt
 	stloc 5
-// 0x0105bd14: 0x105bd14: beq   v0, zero, 0x105bd28 addiu s0, s0, 1
+// 0x0105bd24: 0x105bd24: beq   v0, zero, 0x105bd38 addiu s0, s0, 1
 	ldloc 5
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	brfalse L_105bd28
+	brfalse L_105bd38
 // --- basic block ---
-L_105bd1c:
-// 0x0105bd1c: 0x105bd1c: slt   v0, s0, s5
+L_105bd2c:
+// 0x0105bd2c: 0x105bd2c: slt   v0, s0, s5
 	ldloc 10
 	ldloc 15
 	clt
 	stloc 5
-// 0x0105bd20: 0x105bd20: bne   v0, zero, 0x105bc70 lui   v0, 0x70000
+// 0x0105bd30: 0x105bd30: bne   v0, zero, 0x105bc80 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_105bc70
+	brtrue L_105bc80
 // --- basic block ---
-L_105bd28:
-// 0x0105bd28: 0x105bd28: lw    ra, 76(sp)
-// 0x0105bd2c: 0x105bd2c: lw    s8, 72(sp)
+L_105bd38:
+// 0x0105bd38: 0x105bd38: lw    ra, 76(sp)
+// 0x0105bd3c: 0x105bd3c: lw    s8, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3596,7 +3596,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105bd30: 0x105bd30: lw    s7, 68(sp)
+// 0x0105bd40: 0x105bd40: lw    s7, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3605,7 +3605,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0105bd34: 0x105bd34: lw    s6, 64(sp)
+// 0x0105bd44: 0x105bd44: lw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3614,7 +3614,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105bd38: 0x105bd38: lw    s5, 60(sp)
+// 0x0105bd48: 0x105bd48: lw    s5, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3623,7 +3623,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105bd3c: 0x105bd3c: lw    s4, 56(sp)
+// 0x0105bd4c: 0x105bd4c: lw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3632,7 +3632,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105bd40: 0x105bd40: lw    s3, 52(sp)
+// 0x0105bd50: 0x105bd50: lw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3641,7 +3641,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105bd44: 0x105bd44: lw    s2, 48(sp)
+// 0x0105bd54: 0x105bd54: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3650,7 +3650,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105bd48: 0x105bd48: lw    s1, 44(sp)
+// 0x0105bd58: 0x105bd58: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3659,7 +3659,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105bd4c: 0x105bd4c: lw    s0, 40(sp)
+// 0x0105bd5c: 0x105bd5c: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3668,7 +3668,7 @@ L_105bd28:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105bd50: 0x105bd50: jr    ra addiu sp, sp, 80
+// 0x0105bd60: 0x105bd60: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -3680,7 +3680,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_on_route_105bd58(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_on_route_105bd68(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s3,int32 s2,int32 s4,int32 ra)
@@ -3730,12 +3730,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105bd58: 0x105bd58: addiu sp, sp, -384
+// 0x0105bd68: 0x105bd68: addiu sp, sp, -384
 	ldloc.0
 	ldc.i4 -384
 	add
 	stloc.0
-// 0x0105bd5c: 0x105bd5c: sw    s2, 368(sp)
+// 0x0105bd6c: 0x105bd6c: sw    s2, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3744,7 +3744,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105bd60: 0x105bd60: sw    s0, 360(sp)
+// 0x0105bd70: 0x105bd70: sw    s0, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3753,19 +3753,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105bd64: 0x105bd64: addu  s2, a0, zero
+// 0x0105bd74: 0x105bd74: addu  s2, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0105bd68: 0x105bd68: addu  s0, a1, zero
+// 0x0105bd78: 0x105bd78: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0105bd6c: 0x105bd6c: lui   a0, 0x0
+// 0x0105bd7c: 0x105bd7c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105bd70: 0x105bd70: lui   a1, 0x0
+// 0x0105bd80: 0x105bd80: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105bd74: 0x105bd74: sw    s1, 364(sp)
+// 0x0105bd84: 0x105bd84: sw    s1, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3774,20 +3774,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105bd78: 0x105bd78: addiu a0, a0, 14248
+// 0x0105bd88: 0x105bd88: addiu a0, a0, 14248
 	ldloc.1
 	ldc.i4 14248
 	add
 	stloc.1
-// 0x0105bd7c: 0x105bd7c: addu  s1, a2, zero
+// 0x0105bd8c: 0x105bd8c: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0105bd80: 0x105bd80: addiu a1, a1, 14272
+// 0x0105bd90: 0x105bd90: addiu a1, a1, 14272
 	ldloc.2
 	ldc.i4 14272
 	add
 	stloc.2
-// 0x0105bd84: 0x105bd84: sw    s4, 376(sp)
+// 0x0105bd94: 0x105bd94: sw    s4, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3796,7 +3796,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105bd88: 0x105bd88: sw    s3, 372(sp)
+// 0x0105bd98: 0x105bd98: sw    s3, 372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3805,7 +3805,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105bd8c: 0x105bd8c: sw    a3, 352(sp)
+// 0x0105bd9c: 0x105bd9c: sw    a3, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3814,8 +3814,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105bd90: 0x105bd90: sw    ra, 380(sp)
-// 0x0105bd94: 0x105bd94: lw    s4, 416(sp)
+// 0x0105bda0: 0x105bda0: sw    ra, 380(sp)
+// 0x0105bda4: 0x105bda4: lw    s4, 416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3824,7 +3824,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105bd98: 0x105bd98: jal   0x1001800 addiu a2, zero, 20
+// 0x0105bda8: 0x105bda8: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -3836,10 +3836,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bda0: 0x105bda0: lui   v0, 0x0
+// 0x0105bdb0: 0x105bdb0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105bda4: 0x105bda4: lw    v1, 14292(v0)
+// 0x0105bdb4: 0x105bdb4: lw    v1, 14292(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3848,7 +3848,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105bda8: 0x105bda8: lw    a3, 352(sp)
+// 0x0105bdb8: 0x105bdb8: lw    a3, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3857,10 +3857,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105bdac: 0x105bdac: lui   v0, 0x0
+// 0x0105bdbc: 0x105bdbc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105bdb0: 0x105bdb0: sw    v1, 14268(v0)
+// 0x0105bdc0: 0x105bdc0: sw    v1, 14268(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3869,10 +3869,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105bdb4: 0x105bdb4: lui   v0, 0x70000
+// 0x0105bdc4: 0x105bdc4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bdb8: 0x105bdb8: lw    v1, 400(sp)
+// 0x0105bdc8: 0x105bdc8: lw    v1, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3881,28 +3881,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105bdbc: 0x105bdbc: sw    a3, 10720(v0)
+// 0x0105bdcc: 0x105bdcc: sw    a3, 11184(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105bdc0: 0x105bdc0: lui   v0, 0x70000
+// 0x0105bdd0: 0x105bdd0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bdc4: 0x105bdc4: sw    v1, 9168(v0)
+// 0x0105bdd4: 0x105bdd4: sw    v1, 9632(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105bdc8: 0x105bdc8: lw    v1, 404(sp)
+// 0x0105bdd8: 0x105bdd8: lw    v1, 404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3911,98 +3911,98 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105bdcc: 0x105bdcc: lui   v0, 0x70000
+// 0x0105bddc: 0x105bddc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bdd0: 0x105bdd0: sw    v1, 10288(v0)
+// 0x0105bde0: 0x105bde0: sw    v1, 10752(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2572
+	ldc.i4 2688
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105bdd4: 0x105bdd4: lui   v0, 0x70000
+// 0x0105bde4: 0x105bde4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bdd8: 0x105bdd8: sw    zero, 9184(v0)
+// 0x0105bde8: 0x105bde8: sw    zero, 9648(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2296
+	ldc.i4 2412
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bddc: 0x105bddc: lui   v0, 0x70000
+// 0x0105bdec: 0x105bdec: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bde0: 0x105bde0: sw    zero, 9172(v0)
+// 0x0105bdf0: 0x105bdf0: sw    zero, 9636(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bde4: 0x105bde4: lui   v0, 0x70000
+// 0x0105bdf4: 0x105bdf4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bde8: 0x105bde8: sw    zero, 9176(v0)
+// 0x0105bdf8: 0x105bdf8: sw    zero, 9640(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bdec: 0x105bdec: lui   v0, 0x70000
+// 0x0105bdfc: 0x105bdfc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bdf0: 0x105bdf0: sw    zero, 9164(v0)
+// 0x0105be00: 0x105be00: sw    zero, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bdf4: 0x105bdf4: lui   v0, 0x70000
+// 0x0105be04: 0x105be04: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bdf8: 0x105bdf8: sw    zero, 10008(v0)
+// 0x0105be08: 0x105be08: sw    zero, 10472(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2502
+	ldc.i4 2618
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bdfc: 0x105bdfc: beq   s4, zero, 0x105be20 lui   s3, 0x70000
+// 0x0105be0c: 0x105be0c: beq   s4, zero, 0x105be30 lui   s3, 0x70000
 	ldloc 12
 	ldc.i4 458752
 	stloc 10
-	brfalse L_105be20
+	brfalse L_105be30
 // --- basic block ---
-// 0x0105be04: 0x105be04: addiu a0, s3, 10380
+// 0x0105be14: 0x105be14: addiu a0, s3, 10844
 	ldloc 10
-	ldc.i4 10380
+	ldc.i4 10844
 	add
 	stloc.1
-// 0x0105be08: 0x105be08: addu  a1, s4, zero
+// 0x0105be18: 0x105be18: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x0105be0c: 0x105be0c: addiu a2, zero, 256
+// 0x0105be1c: 0x105be1c: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0105be10: 0x105be10: jal   0x1001af8 addiu s3, s3, 10380
+// 0x0105be20: 0x105be20: jal   0x1001af8 addiu s3, s3, 10844
 	ldloc 10
-	ldc.i4 10380
+	ldc.i4 10844
 	add
 	stloc 10
 	ldloc.1
@@ -4011,60 +4011,60 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0105be18: 0x105be18: j	 0x105be24 sb    zero, 255(s3)
+// 0x0105be28: 0x105be28: j	 0x105be34 sb    zero, 255(s3)
 	ldloc 10
 	ldc.i4 255
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_105be24
+	br L_105be34
 // --- basic block ---
-L_105be20:
-// 0x0105be20: 0x105be20: sb    zero, 10380(s3)
+L_105be30:
+// 0x0105be30: 0x105be30: sb    zero, 10844(s3)
 	ldloc 10
-	ldc.i4 10380
+	ldc.i4 10844
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_105be24:
-// 0x0105be24: 0x105be24: lui   v0, 0x70000
+L_105be34:
+// 0x0105be34: 0x105be34: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105be28: 0x105be28: lw    v0, 9164(v0)
+// 0x0105be38: 0x105be38: lw    v0, 9628(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2291
+	ldc.i4 2407
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105be2c: 0x105be2c: lui   a1, 0x10000
+// 0x0105be3c: 0x105be3c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105be30: 0x105be30: lui   a3, 0x10000
+// 0x0105be40: 0x105be40: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105be34: 0x105be34: addiu a0, zero, 1
+// 0x0105be44: 0x105be44: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105be38: 0x105be38: addiu a1, a1, 8052
+// 0x0105be48: 0x105be48: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105be3c: 0x105be3c: addiu a3, a3, 10020
+// 0x0105be4c: 0x105be4c: addiu a3, a3, 10016
 	ldloc 4
-	ldc.i4 10020
+	ldc.i4 10016
 	add
 	stloc 4
-// 0x0105be40: 0x105be40: addiu a2, zero, 866
+// 0x0105be50: 0x105be50: addiu a2, zero, 866
 	ldc.i4 866
 	stloc.3
-// 0x0105be44: 0x105be44: lui   s3, 0x70000
+// 0x0105be54: 0x105be54: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105be48: 0x105be48: jal   0x100449c sw    v0, 16(sp)
+// 0x0105be58: 0x105be58: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4083,21 +4083,21 @@ L_105be24:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105be50: 0x105be50: lw    a0, 10028(s3)
+// 0x0105be60: 0x105be60: lw    a0, 10492(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105be54: 0x105be54: sll   zero, zero, 0
-// 0x0105be58: 0x105be58: beq   a0, zero, 0x105be6c sll   zero, zero, 0
+// 0x0105be64: 0x105be64: sll   zero, zero, 0
+// 0x0105be68: 0x105be68: beq   a0, zero, 0x105be7c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_105be6c
+	brfalse L_105be7c
 // --- basic block ---
-// 0x0105be60: 0x105be60: jal   0x1000930 sll   zero, zero, 0
+// 0x0105be70: 0x105be70: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4108,17 +4108,17 @@ L_105be24:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105be68: 0x105be68: sw    zero, 10028(s3)
+// 0x0105be78: 0x105be78: sw    zero, 10492(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2507
+	ldc.i4 2623
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_105be6c:
-// 0x0105be6c: 0x105be6c: lw    v1, 408(sp)
+L_105be7c:
+// 0x0105be7c: 0x105be7c: lw    v1, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4127,19 +4127,19 @@ L_105be6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105be70: 0x105be70: lui   v0, 0x70000
+// 0x0105be80: 0x105be80: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105be74: 0x105be74: sw    v1, 10752(v0)
+// 0x0105be84: 0x105be84: sw    v1, 11216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2688
+	ldc.i4 2804
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105be78: 0x105be78: lw    v1, 412(sp)
+// 0x0105be88: 0x105be88: lw    v1, 412(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4148,30 +4148,30 @@ L_105be6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105be7c: 0x105be7c: lui   v0, 0x70000
+// 0x0105be8c: 0x105be8c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105be80: 0x105be80: sw    v1, 9996(v0)
+// 0x0105be90: 0x105be90: sw    v1, 10460(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2499
+	ldc.i4 2615
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105be84: 0x105be84: lui   s3, 0x70000
+// 0x0105be94: 0x105be94: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105be88: 0x105be88: lui   v0, 0x70000
+// 0x0105be98: 0x105be98: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105be8c: 0x105be8c: jal   0x105f3a4 sw    zero, 10024(v0)
+// 0x0105be9c: 0x105be9c: jal   0x105f3b4 sw    zero, 10488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2506
+	ldc.i4 2622
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4180,36 +4180,36 @@ L_105be6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_initialize_105f3a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_initialize_105f3b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105be94: 0x105be94: lw    v0, 10360(s3)
+// 0x0105bea4: 0x105bea4: lw    v0, 10824(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2590
+	ldc.i4 2706
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105be98: 0x105be98: sll   zero, zero, 0
-// 0x0105be9c: 0x105be9c: bne   v0, zero, 0x105bec0 lui   a0, 0x10000
+// 0x0105bea8: 0x105bea8: sll   zero, zero, 0
+// 0x0105beac: 0x105beac: bne   v0, zero, 0x105bed0 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brtrue L_105bec0
+	brtrue L_105bed0
 // --- basic block ---
-// 0x0105bea4: 0x105bea4: lui   a1, 0x1050000
+// 0x0105beb4: 0x105beb4: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0105bea8: 0x105bea8: addiu a1, a1, 26780
+// 0x0105beb8: 0x105beb8: addiu a1, a1, 26796
 	ldloc.2
-	ldc.i4 26780
+	ldc.i4 26796
 	add
 	stloc.2
-// 0x0105beac: 0x105beac: jal   0x104fe98 addiu a0, zero, 10000
+// 0x0105bebc: 0x105bebc: jal   0x104fea8 addiu a0, zero, 10000
 	ldc.i4 10000
 	stloc.1
 	ldloc.0
@@ -4217,33 +4217,33 @@ L_105be6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105beb4: 0x105beb4: addiu v0, zero, 1
+// 0x0105bec4: 0x105bec4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105beb8: 0x105beb8: sw    v0, 10360(s3)
+// 0x0105bec8: 0x105bec8: sw    v0, 10824(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 2590
+	ldc.i4 2706
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105bebc: 0x105bebc: lui   a0, 0x10000
+// 0x0105becc: 0x105becc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_105bec0:
-// 0x0105bec0: 0x105bec0: addiu a0, a0, 10736
+L_105bed0:
+// 0x0105bed0: 0x105bed0: addiu a0, a0, 10732
 	ldloc.1
-	ldc.i4 10736
+	ldc.i4 10732
 	add
 	stloc.1
-// 0x0105bec4: 0x105bec4: jal   0x1094884 addu  a1, zero, zero
+// 0x0105bed4: 0x105bed4: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4251,123 +4251,123 @@ L_105bec0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105becc: 0x105becc: lui   v0, 0x70000
+// 0x0105bedc: 0x105bedc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bed0: 0x105bed0: sw    s2, 10700(v0)
+// 0x0105bee0: 0x105bee0: sw    s2, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105bed4: 0x105bed4: lui   v0, 0x70000
+// 0x0105bee4: 0x105bee4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bed8: 0x105bed8: sw    s1, 10716(v0)
+// 0x0105bee8: 0x105bee8: sw    s1, 11180(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2679
+	ldc.i4 2795
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105bedc: 0x105bedc: addiu v1, zero, 1
+// 0x0105beec: 0x105beec: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105bee0: 0x105bee0: lui   v0, 0x70000
+// 0x0105bef0: 0x105bef0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bee4: 0x105bee4: sw    v1, 9160(v0)
+// 0x0105bef4: 0x105bef4: sw    v1, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105bee8: 0x105bee8: lui   v0, 0x70000
+// 0x0105bef8: 0x105bef8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105beec: 0x105beec: sw    s0, 10712(v0)
+// 0x0105befc: 0x105befc: sw    s0, 11176(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2678
+	ldc.i4 2794
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105bef0: 0x105bef0: addiu a0, zero, 1
+// 0x0105bf00: 0x105bf00: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105bef4: 0x105bef4: lui   v0, 0x70000
+// 0x0105bf04: 0x105bf04: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bef8: 0x105bef8: jal   0x105e2e4 sw    zero, 10348(v0)
+// 0x0105bf08: 0x105bf08: jal   0x105e2f4 sw    zero, 10812(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2587
+	ldc.i4 2703
 	add
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl70::navigate_bar_set_mode_105e2e4(int32)
+	call int32 Cibyl70::navigate_bar_set_mode_105e2f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bf00: 0x105bf00: lui   v0, 0x70000
+// 0x0105bf10: 0x105bf10: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bf04: 0x105bf04: lw    v0, 9192(v0)
+// 0x0105bf14: 0x105bf14: lw    v0, 9656(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2298
+	ldc.i4 2414
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105bf08: 0x105bf08: sll   zero, zero, 0
-// 0x0105bf0c: 0x105bf0c: beq   v0, zero, 0x105bf1c addiu s2, sp, 36
+// 0x0105bf18: 0x105bf18: sll   zero, zero, 0
+// 0x0105bf1c: 0x105bf1c: beq   v0, zero, 0x105bf2c addiu s2, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 11
-	brfalse L_105bf1c
+	brfalse L_105bf2c
 // --- basic block ---
-// 0x0105bf14: 0x105bf14: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x0105bf24: 0x105bf24: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105bf1c:
-// 0x0105bf1c: 0x105bf1c: addiu s1, sp, 56
+L_105bf2c:
+// 0x0105bf2c: 0x105bf2c: addiu s1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 8
-// 0x0105bf20: 0x105bf20: addu  a0, s2, zero
+// 0x0105bf30: 0x105bf30: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0105bf24: 0x105bf24: addu  a1, s1, zero
+// 0x0105bf34: 0x105bf34: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0105bf28: 0x105bf28: jal   0x1029da8 addiu a2, sp, 32
+// 0x0105bf38: 0x105bf38: jal   0x1029db8 addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4377,18 +4377,18 @@ L_105bf1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bf30: 0x105bf30: bne   v0, zero, 0x105bf58 lui   v0, 0x70000
+// 0x0105bf40: 0x105bf40: bne   v0, zero, 0x105bf68 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_105bf58
+	brtrue L_105bf68
 // --- basic block ---
-// 0x0105bf38: 0x105bf38: lw    a1, 32(sp)
+// 0x0105bf48: 0x105bf48: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4397,10 +4397,10 @@ L_105bf1c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105bf3c: 0x105bf3c: addu  a0, s1, zero
+// 0x0105bf4c: 0x105bf4c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0105bf40: 0x105bf40: jal   0x105b424 addiu a2, sp, 76
+// 0x0105bf50: 0x105bf50: jal   0x105b434 addiu a2, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
@@ -4410,15 +4410,15 @@ L_105bf1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_get_next_line_105b424(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_get_next_line_105b434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bf48: 0x105bf48: addu  a0, s2, zero
+// 0x0105bf58: 0x105bf58: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0105bf4c: 0x105bf4c: jal   0x10594c4 addu  a1, s1, zero
+// 0x0105bf5c: 0x105bf5c: jal   0x10594d4 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -4426,49 +4426,49 @@ L_105bf1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_update_10594c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_update_10594d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bf54: 0x105bf54: lui   v0, 0x70000
+// 0x0105bf64: 0x105bf64: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_105bf58:
-// 0x0105bf58: 0x105bf58: lw    v0, 10020(v0)
+L_105bf68:
+// 0x0105bf68: 0x105bf68: lw    v0, 10484(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105bf5c: 0x105bf5c: sll   zero, zero, 0
-// 0x0105bf60: 0x105bf60: beq   v0, zero, 0x105bf8c sll   zero, zero, 0
+// 0x0105bf6c: 0x105bf6c: sll   zero, zero, 0
+// 0x0105bf70: 0x105bf70: beq   v0, zero, 0x105bf9c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105bf8c
+	brfalse L_105bf9c
 // --- basic block ---
-// 0x0105bf68: 0x105bf68: jal   0x101ebac sll   zero, zero, 0
+// 0x0105bf78: 0x105bf78: jal   0x101ebbc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_stop_101ebac(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_stop_101ebbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bf70: 0x105bf70: lui   v1, 0x0
+// 0x0105bf80: 0x105bf80: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0105bf74: 0x105bf74: addiu v0, v1, 14216
+// 0x0105bf84: 0x105bf84: addiu v0, v1, 14216
 	ldloc 7
 	ldc.i4 14216
 	add
 	stloc 5
-// 0x0105bf78: 0x105bf78: lw    a2, 8(v0)
+// 0x0105bf88: 0x105bf88: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4477,7 +4477,7 @@ L_105bf58:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105bf7c: 0x105bf7c: lw    a0, 14216(v1)
+// 0x0105bf8c: 0x105bf8c: lw    a0, 14216(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4486,7 +4486,7 @@ L_105bf58:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105bf80: 0x105bf80: lw    a1, 4(v0)
+// 0x0105bf90: 0x105bf90: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4495,97 +4495,97 @@ L_105bf58:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105bf84: 0x105bf84: jal   0x1029e68 sll   zero, zero, 0
+// 0x0105bf94: 0x105bf94: jal   0x1029e78 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_route_1029e68(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_route_1029e78(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105bf8c:
-// 0x0105bf8c: 0x105bf8c: jal   0x1030c08 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+L_105bf9c:
+// 0x0105bf9c: 0x105bf9c: jal   0x1030c18 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x0105bf94: 0x105bf94: sltiu v0, v0, 2
+// 0x0105bfa4: 0x105bfa4: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x0105bf98: 0x105bf98: bne   v0, zero, 0x105bfb0 lui   v1, 0x70000
+// 0x0105bfa8: 0x105bfa8: bne   v0, zero, 0x105bfc0 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 7
-	brtrue L_105bfb0
+	brtrue L_105bfc0
 // --- basic block ---
-// 0x0105bfa0: 0x105bfa0: lui   v0, 0x70000
+// 0x0105bfb0: 0x105bfb0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bfa4: 0x105bfa4: lw    v0, 10688(v0)
+// 0x0105bfb4: 0x105bfb4: lw    v0, 11152(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105bfa8: 0x105bfa8: sll   zero, zero, 0
-// 0x0105bfac: 0x105bfac: subu  s0, s0, v0
+// 0x0105bfb8: 0x105bfb8: sll   zero, zero, 0
+// 0x0105bfbc: 0x105bfbc: subu  s0, s0, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 9
-L_105bfb0:
-// 0x0105bfb0: 0x105bfb0: lui   v0, 0x70000
+L_105bfc0:
+// 0x0105bfc0: 0x105bfc0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bfb4: 0x105bfb4: sw    zero, 10688(v0)
+// 0x0105bfc4: 0x105bfc4: sw    zero, 11152(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2672
+	ldc.i4 2788
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bfb8: 0x105bfb8: lui   v0, 0x70000
+// 0x0105bfc8: 0x105bfc8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bfbc: 0x105bfbc: addiu a0, zero, 1
+// 0x0105bfcc: 0x105bfcc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105bfc0: 0x105bfc0: sw    zero, 10692(v0)
+// 0x0105bfd0: 0x105bfd0: sw    zero, 11156(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2673
+	ldc.i4 2789
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bfc4: 0x105bfc4: lui   v0, 0x70000
+// 0x0105bfd4: 0x105bfd4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105bfc8: 0x105bfc8: sw    zero, 10696(v0)
+// 0x0105bfd8: 0x105bfd8: sw    zero, 11160(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2674
+	ldc.i4 2790
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105bfcc: 0x105bfcc: jal   0x1056a18 sw    s0, 10680(v1)
+// 0x0105bfdc: 0x105bfdc: jal   0x1056a28 sw    s0, 11144(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2670
+	ldc.i4 2786
 	add
 	ldloc 9
 	stelem.i4
@@ -4594,47 +4594,47 @@ L_105bfb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::refresh_eta_1056a18(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::refresh_eta_1056a28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bfd4: 0x105bfd4: jal   0x105a3f4 sll   zero, zero, 0
+// 0x0105bfe4: 0x105bfe4: jal   0x105a404 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::navigate_main_format_messages_105a3f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::navigate_main_format_messages_105a404(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bfdc: 0x105bfdc: jal   0x1021900 sll   zero, zero, 0
+// 0x0105bfec: 0x105bfec: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bfe4: 0x105bfe4: lui   a0, 0x0
+// 0x0105bff4: 0x105bff4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105bfe8: 0x105bfe8: lui   a1, 0x70000
+// 0x0105bff8: 0x105bff8: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0105bfec: 0x105bfec: addiu a0, a0, 14164
+// 0x0105bffc: 0x105bffc: addiu a0, a0, 14164
 	ldloc.1
 	ldc.i4 14164
 	add
 	stloc.1
-// 0x0105bff0: 0x105bff0: jal   0x100e50c addiu a1, a1, 10732
+// 0x0105c000: 0x105c000: jal   0x100e51c addiu a1, a1, 11196
 	ldloc.2
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc.2
 	ldloc.0
@@ -4642,20 +4642,20 @@ L_105bfb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_position_100e50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_position_100e51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105bff8: 0x105bff8: lui   a0, 0x0
+// 0x0105c008: 0x105c008: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105bffc: 0x105bffc: addiu a0, a0, 14180
+// 0x0105c00c: 0x105c00c: addiu a0, a0, 14180
 	ldloc.1
 	ldc.i4 14180
 	add
 	stloc.1
-// 0x0105c000: 0x105c000: jal   0x100e610 addiu a1, zero, 1
+// 0x0105c010: 0x105c010: jal   0x100e620 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4663,12 +4663,12 @@ L_105bfb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c008: 0x105c008: jal   0x100ea50 addu  a0, zero, zero
+// 0x0105c018: 0x105c018: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4676,12 +4676,12 @@ L_105bfb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c010: 0x105c010: lw    v0, 420(sp)
+// 0x0105c020: 0x105c020: lw    v0, 420(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4690,74 +4690,74 @@ L_105bfb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c014: 0x105c014: sll   zero, zero, 0
-// 0x0105c018: 0x105c018: bne   v0, zero, 0x105c02c lui   v0, 0x70000
+// 0x0105c024: 0x105c024: sll   zero, zero, 0
+// 0x0105c028: 0x105c028: bne   v0, zero, 0x105c03c lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_105c02c
+	brtrue L_105c03c
 // --- basic block ---
-// 0x0105c020: 0x105c020: addiu v1, zero, 1
+// 0x0105c030: 0x105c030: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105c024: 0x105c024: sw    v1, 9200(v0)
+// 0x0105c034: 0x105c034: sw    v1, 9664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2300
+	ldc.i4 2416
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105c028: 0x105c028: lui   v0, 0x70000
+// 0x0105c038: 0x105c038: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_105c02c:
-// 0x0105c02c: 0x105c02c: lw    v0, 9200(v0)
+L_105c03c:
+// 0x0105c03c: 0x105c03c: lw    v0, 9664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2300
+	ldc.i4 2416
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c030: 0x105c030: sll   zero, zero, 0
-// 0x0105c034: 0x105c034: bne   v0, zero, 0x105c184 lui   s1, 0x70000
+// 0x0105c040: 0x105c040: sll   zero, zero, 0
+// 0x0105c044: 0x105c044: bne   v0, zero, 0x105c194 lui   s1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 8
-	brtrue L_105c184
+	brtrue L_105c194
 // --- basic block ---
-// 0x0105c03c: 0x105c03c: lb    v0, 9204(s1)
+// 0x0105c04c: 0x105c04c: lb    v0, 9668(s1)
 	ldloc 8
-	ldc.i4 9204
+	ldc.i4 9668
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105c040: 0x105c040: sll   zero, zero, 0
-// 0x0105c044: 0x105c044: beq   v0, zero, 0x105c08c lui   s0, 0x70000
+// 0x0105c050: 0x105c050: sll   zero, zero, 0
+// 0x0105c054: 0x105c054: beq   v0, zero, 0x105c09c lui   s0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 9
-	brfalse L_105c08c
+	brfalse L_105c09c
 // --- basic block ---
-// 0x0105c04c: 0x105c04c: lb    v0, 9484(s0)
+// 0x0105c05c: 0x105c05c: lb    v0, 9948(s0)
 	ldloc 9
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105c050: 0x105c050: sll   zero, zero, 0
-// 0x0105c054: 0x105c054: beq   v0, zero, 0x105c08c lui   a0, 0x10000
+// 0x0105c060: 0x105c060: sll   zero, zero, 0
+// 0x0105c064: 0x105c064: beq   v0, zero, 0x105c09c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_105c08c
+	brfalse L_105c09c
 // --- basic block ---
-// 0x0105c05c: 0x105c05c: jal   0x101cd60 addiu a0, a0, 10748
+// 0x0105c06c: 0x105c06c: jal   0x101cd70 addiu a0, a0, 10744
 	ldloc.1
-	ldc.i4 10748
+	ldc.i4 10744
 	add
 	stloc.1
 	ldloc.0
@@ -4765,41 +4765,41 @@ L_105c02c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c064: 0x105c064: addiu s1, s1, 9204
+// 0x0105c074: 0x105c074: addiu s1, s1, 9668
 	ldloc 8
-	ldc.i4 9204
+	ldc.i4 9668
 	add
 	stloc 8
-// 0x0105c068: 0x105c068: addiu s0, s0, 9484
+// 0x0105c078: 0x105c078: addiu s0, s0, 9948
 	ldloc 9
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	stloc 9
-// 0x0105c06c: 0x105c06c: lui   a2, 0x10000
+// 0x0105c07c: 0x105c07c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105c070: 0x105c070: addiu a2, a2, 10752
+// 0x0105c080: 0x105c080: addiu a2, a2, 10748
 	ldloc.3
-	ldc.i4 10752
+	ldc.i4 10748
 	add
 	stloc.3
-// 0x0105c074: 0x105c074: addu  a3, v0, zero
+// 0x0105c084: 0x105c084: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105c078: 0x105c078: addiu a0, sp, 96
+// 0x0105c088: 0x105c088: addiu a0, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc.1
-// 0x0105c07c: 0x105c07c: addiu a1, zero, 256
+// 0x0105c08c: 0x105c08c: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0105c080: 0x105c080: sw    s1, 16(sp)
+// 0x0105c090: 0x105c090: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4808,7 +4808,7 @@ L_105c02c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105c084: 0x105c084: j	 0x105c0c8 sw    s0, 20(sp)
+// 0x0105c094: 0x105c094: j	 0x105c0d8 sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4817,33 +4817,33 @@ L_105c02c:
 	add
 	ldloc 9
 	stelem.i4
-	br L_105c0c8
+	br L_105c0d8
 // --- basic block ---
-L_105c08c:
-// 0x0105c08c: 0x105c08c: lui   s1, 0x70000
+L_105c09c:
+// 0x0105c09c: 0x105c09c: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105c090: 0x105c090: lb    v0, 9484(s1)
+// 0x0105c0a0: 0x105c0a0: lb    v0, 9948(s1)
 	ldloc 8
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105c094: 0x105c094: sll   zero, zero, 0
-// 0x0105c098: 0x105c098: beq   v0, zero, 0x105c0d8 addiu s0, sp, 96
+// 0x0105c0a4: 0x105c0a4: sll   zero, zero, 0
+// 0x0105c0a8: 0x105c0a8: beq   v0, zero, 0x105c0e8 addiu s0, sp, 96
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 9
-	brfalse L_105c0d8
+	brfalse L_105c0e8
 // --- basic block ---
-// 0x0105c0a0: 0x105c0a0: lui   a0, 0x10000
+// 0x0105c0b0: 0x105c0b0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c0a4: 0x105c0a4: jal   0x101cd60 addiu a0, a0, 10748
+// 0x0105c0b4: 0x105c0b4: jal   0x101cd70 addiu a0, a0, 10744
 	ldloc.1
-	ldc.i4 10748
+	ldc.i4 10744
 	add
 	stloc.1
 	ldloc.0
@@ -4851,34 +4851,34 @@ L_105c08c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c0ac: 0x105c0ac: addiu s1, s1, 9484
+// 0x0105c0bc: 0x105c0bc: addiu s1, s1, 9948
 	ldloc 8
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	stloc 8
-// 0x0105c0b0: 0x105c0b0: lui   a2, 0x10000
+// 0x0105c0c0: 0x105c0c0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105c0b4: 0x105c0b4: addu  a0, s0, zero
+// 0x0105c0c4: 0x105c0c4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0105c0b8: 0x105c0b8: addiu a2, a2, -20
+// 0x0105c0c8: 0x105c0c8: addiu a2, a2, -24
 	ldloc.3
-	ldc.i4.s -20
+	ldc.i4.s -24
 	add
 	stloc.3
-// 0x0105c0bc: 0x105c0bc: addu  a3, v0, zero
+// 0x0105c0cc: 0x105c0cc: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105c0c0: 0x105c0c0: addiu a1, zero, 256
+// 0x0105c0d0: 0x105c0d0: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0105c0c4: 0x105c0c4: sw    s1, 16(sp)
+// 0x0105c0d4: 0x105c0d4: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4887,8 +4887,8 @@ L_105c08c:
 	add
 	ldloc 8
 	stelem.i4
-L_105c0c8:
-// 0x0105c0c8: 0x105c0c8: jal   0x1000f9c sll   zero, zero, 0
+L_105c0d8:
+// 0x0105c0d8: 0x105c0d8: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4899,18 +4899,18 @@ L_105c0c8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c0d0: 0x105c0d0: j	 0x105c100 lui   v0, 0x70000
+// 0x0105c0e0: 0x105c0e0: j	 0x105c110 lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-	br L_105c100
+	br L_105c110
 // --- basic block ---
-L_105c0d8:
-// 0x0105c0d8: 0x105c0d8: lui   a0, 0x10000
+L_105c0e8:
+// 0x0105c0e8: 0x105c0e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c0dc: 0x105c0dc: jal   0x101cd60 addiu a0, a0, 10764
+// 0x0105c0ec: 0x105c0ec: jal   0x101cd70 addiu a0, a0, 10760
 	ldloc.1
-	ldc.i4 10764
+	ldc.i4 10760
 	add
 	stloc.1
 	ldloc.0
@@ -4918,26 +4918,26 @@ L_105c0d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c0e4: 0x105c0e4: lui   a2, 0x10000
+// 0x0105c0f4: 0x105c0f4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105c0e8: 0x105c0e8: addu  a0, s0, zero
+// 0x0105c0f8: 0x105c0f8: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0105c0ec: 0x105c0ec: addiu a2, a2, 19912
+// 0x0105c0fc: 0x105c0fc: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0105c0f0: 0x105c0f0: addu  a3, v0, zero
+// 0x0105c100: 0x105c100: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105c0f4: 0x105c0f4: jal   0x1000f9c addiu a1, zero, 256
+// 0x0105c104: 0x105c104: jal   0x1000f9c addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -4950,72 +4950,72 @@ L_105c0d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c0fc: 0x105c0fc: lui   v0, 0x70000
+// 0x0105c10c: 0x105c10c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_105c100:
-// 0x0105c100: 0x105c100: lw    s2, 10700(v0)
+L_105c110:
+// 0x0105c110: 0x105c110: lw    s2, 11164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2675
+	ldc.i4 2791
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105c104: 0x105c104: lui   v0, 0x70000
+// 0x0105c114: 0x105c114: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c108: 0x105c108: lw    s1, 10712(v0)
+// 0x0105c118: 0x105c118: lw    s1, 11176(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2678
+	ldc.i4 2794
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105c10c: 0x105c10c: lui   v0, 0x70000
+// 0x0105c11c: 0x105c11c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c110: 0x105c110: lw    s0, 10716(v0)
+// 0x0105c120: 0x105c120: lw    s0, 11180(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2679
+	ldc.i4 2795
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105c114: 0x105c114: jal   0x10613dc sll   zero, zero, 0
+// 0x0105c124: 0x105c124: jal   0x10613ec sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_allow_unknowns_10613dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_allow_unknowns_10613ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c11c: 0x105c11c: beq   v0, zero, 0x105c144 addu  v1, zero, zero
+// 0x0105c12c: 0x105c12c: beq   v0, zero, 0x105c154 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_105c144
+	brfalse L_105c154
 // --- basic block ---
-// 0x0105c124: 0x105c124: lui   a0, 0x0
+// 0x0105c134: 0x105c134: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105c128: 0x105c128: lui   a1, 0x0
+// 0x0105c138: 0x105c138: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105c12c: 0x105c12c: addiu a0, a0, 14472
+// 0x0105c13c: 0x105c13c: addiu a0, a0, 14472
 	ldloc.1
 	ldc.i4 14472
 	add
 	stloc.1
-// 0x0105c130: 0x105c130: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x0105c140: 0x105c140: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5025,44 +5025,44 @@ L_105c100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c138: 0x105c138: bne   v0, zero, 0x105c144 addiu v1, zero, 1
+// 0x0105c148: 0x105c148: bne   v0, zero, 0x105c154 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brtrue L_105c144
+	brtrue L_105c154
 // --- basic block ---
-// 0x0105c140: 0x105c140: addu  v1, zero, zero
+// 0x0105c150: 0x105c150: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_105c144:
-// 0x0105c144: 0x105c144: lui   v0, 0x70000
+L_105c154:
+// 0x0105c154: 0x105c154: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c148: 0x105c148: addiu v0, v0, 10380
+// 0x0105c158: 0x105c158: addiu v0, v0, 10844
 	ldloc 5
-	ldc.i4 10380
+	ldc.i4 10844
 	add
 	stloc 5
-// 0x0105c14c: 0x105c14c: addu  a0, s2, zero
+// 0x0105c15c: 0x105c15c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0105c150: 0x105c150: addu  a2, s1, zero
+// 0x0105c160: 0x105c160: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x0105c154: 0x105c154: addu  a3, s0, zero
+// 0x0105c164: 0x105c164: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x0105c158: 0x105c158: addiu a1, sp, 96
+// 0x0105c168: 0x105c168: addiu a1, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc.2
-// 0x0105c15c: 0x105c15c: sw    v0, 16(sp)
+// 0x0105c16c: 0x105c16c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5071,10 +5071,10 @@ L_105c144:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c160: 0x105c160: addiu v0, zero, 10000
+// 0x0105c170: 0x105c170: addiu v0, zero, 10000
 	ldc.i4 10000
 	stloc 5
-// 0x0105c164: 0x105c164: sw    v0, 20(sp)
+// 0x0105c174: 0x105c174: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5083,7 +5083,7 @@ L_105c144:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c168: 0x105c168: jal   0x1055b78 sw    v1, 24(sp)
+// 0x0105c178: 0x105c178: jal   0x1055b88 sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5097,40 +5097,40 @@ L_105c144:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl63::navigate_res_dlg_1055b78(int32,int32,int32,int32,int32)
+	call int32 Cibyl63::navigate_res_dlg_1055b88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c170: 0x105c170: jal   0x102178c sll   zero, zero, 0
+// 0x0105c180: 0x105c180: jal   0x102179c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::focus_on_me_102178c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::focus_on_me_102179c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c178: 0x105c178: addiu v1, zero, 1
+// 0x0105c188: 0x105c188: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105c17c: 0x105c17c: lui   v0, 0x70000
+// 0x0105c18c: 0x105c18c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c180: 0x105c180: sw    v1, 9200(v0)
+// 0x0105c190: 0x105c190: sw    v1, 9664(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2300
+	ldc.i4 2416
 	add
 	ldloc 7
 	stelem.i4
-L_105c184:
-// 0x0105c184: 0x105c184: lw    ra, 380(sp)
-// 0x0105c188: 0x105c188: lw    s4, 376(sp)
+L_105c194:
+// 0x0105c194: 0x105c194: lw    ra, 380(sp)
+// 0x0105c198: 0x105c198: lw    s4, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5139,7 +5139,7 @@ L_105c184:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105c18c: 0x105c18c: lw    s3, 372(sp)
+// 0x0105c19c: 0x105c19c: lw    s3, 372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5148,7 +5148,7 @@ L_105c184:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105c190: 0x105c190: lw    s2, 368(sp)
+// 0x0105c1a0: 0x105c1a0: lw    s2, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5157,7 +5157,7 @@ L_105c184:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105c194: 0x105c194: lw    s1, 364(sp)
+// 0x0105c1a4: 0x105c1a4: lw    s1, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5166,7 +5166,7 @@ L_105c184:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105c198: 0x105c198: lw    s0, 360(sp)
+// 0x0105c1a8: 0x105c1a8: lw    s0, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5175,7 +5175,7 @@ L_105c184:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105c19c: 0x105c19c: jr    ra addiu sp, sp, 384
+// 0x0105c1ac: 0x105c1ac: jr    ra addiu sp, sp, 384
 	ldloc.0
 	ldc.i4 384
 	add
@@ -5187,7 +5187,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_on_segments_105c1a4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_on_segments_105c1b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 ra,int32 t0,int32 t1,int32 t2,int32 t3)
@@ -5243,16 +5243,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105c1a4:
-// 0x0105c1a4: 0x105c1a4: addiu sp, sp, -192
+L_105c1b4:
+// 0x0105c1b4: 0x105c1b4: addiu sp, sp, -192
 	ldloc.0
 	ldc.i4 -192
 	add
 	stloc.0
-// 0x0105c1a8: 0x105c1a8: lui   v0, 0x70000
+// 0x0105c1b8: 0x105c1b8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105c1ac: 0x105c1ac: sw    s0, 176(sp)
+// 0x0105c1bc: 0x105c1bc: sw    s0, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5261,22 +5261,22 @@ L_105c1a4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105c1b0: 0x105c1b0: sw    zero, 10012(v0)
+// 0x0105c1c0: 0x105c1c0: sw    zero, 10476(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c1b4: 0x105c1b4: addu  s0, a0, zero
+// 0x0105c1c4: 0x105c1c4: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0105c1b8: 0x105c1b8: lui   v0, 0x70000
+// 0x0105c1c8: 0x105c1c8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105c1bc: 0x105c1bc: sw    s2, 184(sp)
+// 0x0105c1cc: 0x105c1cc: sw    s2, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5285,7 +5285,7 @@ L_105c1a4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105c1c0: 0x105c1c0: sw    s1, 180(sp)
+// 0x0105c1d0: 0x105c1d0: sw    s1, 180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5294,20 +5294,20 @@ L_105c1a4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105c1c4: 0x105c1c4: sw    ra, 188(sp)
-// 0x0105c1c8: 0x105c1c8: sw    zero, 9196(v0)
+// 0x0105c1d4: 0x105c1d4: sw    ra, 188(sp)
+// 0x0105c1d8: 0x105c1d8: sw    zero, 9660(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2299
+	ldc.i4 2415
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c1cc: 0x105c1cc: addu  s1, a1, zero
+// 0x0105c1dc: 0x105c1dc: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0105c1d0: 0x105c1d0: jal   0x10570c4 addu  s2, a2, zero
+// 0x0105c1e0: 0x105c1e0: jal   0x10570d4 addu  s2, a2, zero
 	ldloc.3
 	stloc 10
 	ldloc.0
@@ -5315,27 +5315,27 @@ L_105c1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_progress_message_hide_delayed_10570c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_progress_message_hide_delayed_10570d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c1d8: 0x105c1d8: beq   s0, zero, 0x105c258 addiu v0, zero, 1
+// 0x0105c1e8: 0x105c1e8: beq   s0, zero, 0x105c268 addiu v0, zero, 1
 	ldloc 9
 	ldc.i4.1
 	stloc 6
-	brfalse L_105c258
+	brfalse L_105c268
 // --- basic block ---
-// 0x0105c1e0: 0x105c1e0: beq   s0, v0, 0x105c330 lui   a0, 0x10000
+// 0x0105c1f0: 0x105c1f0: beq   s0, v0, 0x105c340 lui   a0, 0x10000
 	ldloc 9
 	ldloc 6
 	ldc.i4 65536
 	stloc.1
-	beq  L_105c330
+	beq  L_105c340
 // --- basic block ---
-// 0x0105c1e8: 0x105c1e8: jal   0x101cd60 addiu a0, a0, 10776
+// 0x0105c1f8: 0x105c1f8: jal   0x101cd70 addiu a0, a0, 10772
 	ldloc.1
-	ldc.i4 10776
+	ldc.i4 10772
 	add
 	stloc.1
 	ldloc.0
@@ -5343,25 +5343,25 @@ L_105c1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c1f0: 0x105c1f0: lui   a0, 0x10000
+// 0x0105c200: 0x105c200: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c1f4: 0x105c1f4: addiu a0, a0, -2068
+// 0x0105c204: 0x105c204: addiu a0, a0, -2072
 	ldloc.1
-	ldc.i4 -2068
+	ldc.i4 -2072
 	add
 	stloc.1
-// 0x0105c1f8: 0x105c1f8: addiu s1, sp, 40
+// 0x0105c208: 0x105c208: addiu s1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 8
-// 0x0105c1fc: 0x105c1fc: jal   0x101cd60 sw    v0, 168(sp)
+// 0x0105c20c: 0x105c20c: jal   0x101cd70 sw    v0, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5375,12 +5375,12 @@ L_105c1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c204: 0x105c204: lw    a3, 168(sp)
+// 0x0105c214: 0x105c214: lw    a3, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5389,21 +5389,21 @@ L_105c1a4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105c208: 0x105c208: lui   a2, 0x10000
+// 0x0105c218: 0x105c218: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105c20c: 0x105c20c: addu  a0, s1, zero
+// 0x0105c21c: 0x105c21c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0105c210: 0x105c210: addiu a2, a2, 8572
+// 0x0105c220: 0x105c220: addiu a2, a2, 8568
 	ldloc.3
-	ldc.i4 8572
+	ldc.i4 8568
 	add
 	stloc.3
-// 0x0105c214: 0x105c214: addiu a1, zero, 128
+// 0x0105c224: 0x105c224: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0105c218: 0x105c218: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0105c228: 0x105c228: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5422,29 +5422,29 @@ L_105c1a4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c220: 0x105c220: lui   a1, 0x10000
+// 0x0105c230: 0x105c230: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c224: 0x105c224: lui   a3, 0x10000
+// 0x0105c234: 0x105c234: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105c228: 0x105c228: addiu a1, a1, 8052
+// 0x0105c238: 0x105c238: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105c22c: 0x105c22c: addiu a3, a3, 10820
+// 0x0105c23c: 0x105c23c: addiu a3, a3, 10816
 	ldloc 4
-	ldc.i4 10820
+	ldc.i4 10816
 	add
 	stloc 4
-// 0x0105c230: 0x105c230: addiu a0, zero, 4
+// 0x0105c240: 0x105c240: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105c234: 0x105c234: addiu a2, zero, 978
+// 0x0105c244: 0x105c244: addiu a2, zero, 978
 	ldc.i4 978
 	stloc.3
-// 0x0105c238: 0x105c238: jal   0x100449c sw    s0, 16(sp)
+// 0x0105c248: 0x105c248: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5463,15 +5463,15 @@ L_105c1a4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c240: 0x105c240: lui   a0, 0x0
+// 0x0105c250: 0x105c250: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105c244: 0x105c244: addiu a0, a0, 30092
+// 0x0105c254: 0x105c254: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x0105c248: 0x105c248: jal   0x104c148 addu  a1, s1, zero
+// 0x0105c258: 0x105c258: jal   0x104c158 addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5479,22 +5479,22 @@ L_105c1a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c250: 0x105c250: j	 0x105c330 sll   zero, zero, 0
-	br L_105c330
+// 0x0105c260: 0x105c260: j	 0x105c340 sll   zero, zero, 0
+	br L_105c340
 // --- basic block ---
-L_105c258:
-// 0x0105c258: 0x105c258: beq   s1, zero, 0x105c314 addiu v1, zero, 1
+L_105c268:
+// 0x0105c268: 0x105c268: beq   s1, zero, 0x105c324 addiu v1, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc 7
-	brfalse L_105c314
+	brfalse L_105c324
 // --- basic block ---
-// 0x0105c260: 0x105c260: lw    v0, 24(s1)
+// 0x0105c270: 0x105c270: lw    v0, 24(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5503,22 +5503,22 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105c264: 0x105c264: sll   zero, zero, 0
-// 0x0105c268: 0x105c268: bne   v0, v1, 0x105c2bc addiu v1, zero, 2
+// 0x0105c274: 0x105c274: sll   zero, zero, 0
+// 0x0105c278: 0x105c278: bne   v0, v1, 0x105c2cc addiu v1, zero, 2
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	bne.un L_105c2bc
+	bne.un L_105c2cc
 // --- basic block ---
-// 0x0105c270: 0x105c270: lw    a0, 0(s1)
+// 0x0105c280: 0x105c280: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0105c274: 0x105c274: lw    a1, 4(s1)
+// 0x0105c284: 0x105c284: lw    a1, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5527,7 +5527,7 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105c278: 0x105c278: lw    a2, 8(s1)
+// 0x0105c288: 0x105c288: lw    a2, 8(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5536,7 +5536,7 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105c27c: 0x105c27c: lw    a3, 28(s2)
+// 0x0105c28c: 0x105c28c: lw    a3, 28(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5545,7 +5545,7 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105c280: 0x105c280: lw    t2, 12(s2)
+// 0x0105c290: 0x105c290: lw    t2, 12(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5554,7 +5554,7 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105c284: 0x105c284: lw    v1, 20(s1)
+// 0x0105c294: 0x105c294: lw    v1, 20(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5563,14 +5563,14 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105c288: 0x105c288: lw    t3, 0(s2)
+// 0x0105c298: 0x105c298: lw    t3, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x0105c28c: 0x105c28c: lw    t1, 40(s1)
+// 0x0105c29c: 0x105c29c: lw    t1, 40(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5579,7 +5579,7 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105c290: 0x105c290: lw    t0, 32(s1)
+// 0x0105c2a0: 0x105c2a0: lw    t0, 32(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5588,7 +5588,7 @@ L_105c258:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105c294: 0x105c294: sw    v0, 36(sp)
+// 0x0105c2a4: 0x105c2a4: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5597,7 +5597,7 @@ L_105c258:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105c298: 0x105c298: sw    t3, 16(sp)
+// 0x0105c2a8: 0x105c2a8: sw    t3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5606,7 +5606,7 @@ L_105c258:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105c29c: 0x105c29c: sw    t2, 20(sp)
+// 0x0105c2ac: 0x105c2ac: sw    t2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5615,7 +5615,7 @@ L_105c258:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105c2a0: 0x105c2a0: sw    t1, 24(sp)
+// 0x0105c2b0: 0x105c2b0: sw    t1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5624,7 +5624,7 @@ L_105c258:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105c2a4: 0x105c2a4: sw    t0, 28(sp)
+// 0x0105c2b4: 0x105c2b4: sw    t0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5633,7 +5633,7 @@ L_105c258:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105c2a8: 0x105c2a8: jal   0x105bd58 sw    v1, 32(sp)
+// 0x0105c2b8: 0x105c2b8: jal   0x105bd68 sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5647,32 +5647,32 @@ L_105c258:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_on_route_105bd58(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_on_route_105bd68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c2b0: 0x105c2b0: lui   v0, 0x70000
+// 0x0105c2c0: 0x105c2c0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105c2b4: 0x105c2b4: j	 0x105c330 sw    zero, 9180(v0)
+// 0x0105c2c4: 0x105c2c4: j	 0x105c340 sw    zero, 9644(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2295
+	ldc.i4 2411
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_105c330
+	br L_105c340
 // --- basic block ---
-L_105c2bc:
-// 0x0105c2bc: 0x105c2bc: bne   v0, v1, 0x105c330 sll   zero, zero, 0
+L_105c2cc:
+// 0x0105c2cc: 0x105c2cc: bne   v0, v1, 0x105c340 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_105c330
+	bne.un L_105c340
 // --- basic block ---
-// 0x0105c2c4: 0x105c2c4: jal   0x1056a18 addiu a0, zero, 1
+// 0x0105c2d4: 0x105c2d4: jal   0x1056a28 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -5680,70 +5680,70 @@ L_105c2bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::refresh_eta_1056a18(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::refresh_eta_1056a28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c2cc: 0x105c2cc: jal   0x105748c sll   zero, zero, 0
+// 0x0105c2dc: 0x105c2dc: jal   0x105749c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_ETA_enabled_105748c(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_ETA_enabled_105749c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c2d4: 0x105c2d4: beq   v0, zero, 0x105c330 lui   v0, 0x70000
+// 0x0105c2e4: 0x105c2e4: beq   v0, zero, 0x105c340 lui   v0, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 6
-	brfalse L_105c330
+	brfalse L_105c340
 // --- basic block ---
-// 0x0105c2dc: 0x105c2dc: lw    v0, 9160(v0)
+// 0x0105c2ec: 0x105c2ec: lw    v0, 9624(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105c2e0: 0x105c2e0: sll   zero, zero, 0
-// 0x0105c2e4: 0x105c2e4: beq   v0, zero, 0x105c330 sll   zero, zero, 0
+// 0x0105c2f0: 0x105c2f0: sll   zero, zero, 0
+// 0x0105c2f4: 0x105c2f4: beq   v0, zero, 0x105c340 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_105c330
+	brfalse L_105c340
 // --- basic block ---
-// 0x0105c2ec: 0x105c2ec: jal   0x10569ac sll   zero, zero, 0
+// 0x0105c2fc: 0x105c2fc: jal   0x10569bc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_play_sound_10569ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_play_sound_10569bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c2f4: 0x105c2f4: lui   a0, 0x10000
+// 0x0105c304: 0x105c304: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c2f8: 0x105c2f8: lui   a1, 0x10000
+// 0x0105c308: 0x105c308: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c2fc: 0x105c2fc: addiu a0, a0, 10872
+// 0x0105c30c: 0x105c30c: addiu a0, a0, 10868
 	ldloc.1
-	ldc.i4 10872
+	ldc.i4 10868
 	add
 	stloc.1
-// 0x0105c300: 0x105c300: addiu a1, a1, 10884
+// 0x0105c310: 0x105c310: addiu a1, a1, 10880
 	ldloc.2
-	ldc.i4 10884
+	ldc.i4 10880
 	add
 	stloc.2
-// 0x0105c304: 0x105c304: jal   0x104bfe4 addiu a2, zero, 5
+// 0x0105c314: 0x105c314: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -5751,35 +5751,35 @@ L_105c2bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105c30c: 0x105c30c: j	 0x105c330 sll   zero, zero, 0
-	br L_105c330
+// 0x0105c31c: 0x105c31c: j	 0x105c340 sll   zero, zero, 0
+	br L_105c340
 // --- basic block ---
-L_105c314:
-// 0x0105c314: 0x105c314: lui   a1, 0x10000
+L_105c324:
+// 0x0105c324: 0x105c324: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c318: 0x105c318: lui   a3, 0x10000
+// 0x0105c328: 0x105c328: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105c31c: 0x105c31c: addiu a1, a1, 8052
+// 0x0105c32c: 0x105c32c: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105c320: 0x105c320: addiu a3, a3, 10936
+// 0x0105c330: 0x105c330: addiu a3, a3, 10932
 	ldloc 4
-	ldc.i4 10936
+	ldc.i4 10932
 	add
 	stloc 4
-// 0x0105c324: 0x105c324: addiu a0, zero, 4
+// 0x0105c334: 0x105c334: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105c328: 0x105c328: jal   0x100449c addiu a2, zero, 1004
+// 0x0105c338: 0x105c338: jal   0x100449c addiu a2, zero, 1004
 	ldc.i4 1004
 	stloc.3
 	ldloc.0
@@ -5792,9 +5792,9 @@ L_105c314:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_105c330:
-// 0x0105c330: 0x105c330: lw    ra, 188(sp)
-// 0x0105c334: 0x105c334: lw    s2, 184(sp)
+L_105c340:
+// 0x0105c340: 0x105c340: lw    ra, 188(sp)
+// 0x0105c344: 0x105c344: lw    s2, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5803,7 +5803,7 @@ L_105c330:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105c338: 0x105c338: lw    s1, 180(sp)
+// 0x0105c348: 0x105c348: lw    s1, 180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5812,7 +5812,7 @@ L_105c330:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105c33c: 0x105c33c: lw    s0, 176(sp)
+// 0x0105c34c: 0x105c34c: lw    s0, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5821,7 +5821,7 @@ L_105c330:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105c340: 0x105c340: jr    ra addiu sp, sp, 192
+// 0x0105c350: 0x105c350: jr    ra addiu sp, sp, 192
 	ldloc.0
 	ldc.i4 192
 	add
@@ -5833,7 +5833,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_main_calc_route_105c348(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_calc_route_105c358(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 t0,int32 s2,int32 s3,int32 s4,int32 ra,int32 t1)
@@ -5889,24 +5889,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105c348: 0x105c348: lui   v0, 0x20000
+// 0x0105c358: 0x105c358: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0105c34c: 0x105c34c: addiu sp, sp, -144
+// 0x0105c35c: 0x105c35c: addiu sp, sp, -144
 	ldloc.0
 	ldc.i4 -144
 	add
 	stloc.0
-// 0x0105c350: 0x105c350: lw    a0, 27992(v0)
+// 0x0105c360: 0x105c360: lw    a0, 28456(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6998
+	ldc.i4 7114
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105c354: 0x105c354: sw    s0, 120(sp)
+// 0x0105c364: 0x105c364: sw    s0, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5915,29 +5915,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105c358: 0x105c358: lui   v0, 0x70000
+// 0x0105c368: 0x105c368: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c35c: 0x105c35c: addu  a1, zero, zero
+// 0x0105c36c: 0x105c36c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105c360: 0x105c360: addu  a2, zero, zero
+// 0x0105c370: 0x105c370: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105c364: 0x105c364: lui   s0, 0x70000
+// 0x0105c374: 0x105c374: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105c368: 0x105c368: sw    zero, 9192(v0)
+// 0x0105c378: 0x105c378: sw    zero, 9656(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2298
+	ldc.i4 2414
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c36c: 0x105c36c: sw    ra, 140(sp)
-// 0x0105c370: 0x105c370: sw    s4, 136(sp)
+// 0x0105c37c: 0x105c37c: sw    ra, 140(sp)
+// 0x0105c380: 0x105c380: sw    s4, 136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5946,7 +5946,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105c374: 0x105c374: sw    s3, 132(sp)
+// 0x0105c384: 0x105c384: sw    s3, 132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5955,7 +5955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105c378: 0x105c378: sw    s2, 128(sp)
+// 0x0105c388: 0x105c388: sw    s2, 128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5964,7 +5964,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105c37c: 0x105c37c: jal   0x104bfdc sw    s1, 124(sp)
+// 0x0105c38c: 0x105c38c: jal   0x104bfec sw    s1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5973,30 +5973,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
 // --- basic block ---
-// 0x0105c384: 0x105c384: lw    v0, 10360(s0)
+// 0x0105c394: 0x105c394: lw    v0, 10824(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2590
+	ldc.i4 2706
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c388: 0x105c388: sll   zero, zero, 0
-// 0x0105c38c: 0x105c38c: bne   v0, zero, 0x105c3a8 lui   a1, 0x1050000
+// 0x0105c398: 0x105c398: sll   zero, zero, 0
+// 0x0105c39c: 0x105c39c: bne   v0, zero, 0x105c3b8 lui   a1, 0x1050000
 	ldloc 5
 	ldc.i4 17104896
 	stloc.2
-	brtrue L_105c3a8
+	brtrue L_105c3b8
 // --- basic block ---
-// 0x0105c394: 0x105c394: addiu a1, a1, 26780
+// 0x0105c3a4: 0x105c3a4: addiu a1, a1, 26796
 	ldloc.2
-	ldc.i4 26780
+	ldc.i4 26796
 	add
 	stloc.2
-// 0x0105c398: 0x105c398: jal   0x104fe98 addiu a0, zero, 10000
+// 0x0105c3a8: 0x105c3a8: jal   0x104fea8 addiu a0, zero, 10000
 	ldc.i4 10000
 	stloc.1
 	ldloc.0
@@ -6004,45 +6004,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c3a0: 0x105c3a0: addiu v0, zero, 1
+// 0x0105c3b0: 0x105c3b0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105c3a4: 0x105c3a4: sw    v0, 10360(s0)
+// 0x0105c3b4: 0x105c3b4: sw    v0, 10824(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2590
+	ldc.i4 2706
 	add
 	ldloc 5
 	stelem.i4
-L_105c3a8:
-// 0x0105c3a8: 0x105c3a8: jal   0x10574b8 sll   zero, zero, 0
+L_105c3b8:
+// 0x0105c3b8: 0x105c3b8: jal   0x10574c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_get_follow_gps_10574b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_get_follow_gps_10574c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c3b0: 0x105c3b0: beq   v0, zero, 0x105c3d8 lui   a0, 0x10000
+// 0x0105c3c0: 0x105c3c0: beq   v0, zero, 0x105c3e8 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_105c3d8
+	brfalse L_105c3e8
 // --- basic block ---
-// 0x0105c3b8: 0x105c3b8: lui   s0, 0x10000
+// 0x0105c3c8: 0x105c3c8: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0105c3bc: 0x105c3bc: jal   0x101df50 addiu a0, s0, -29760
+// 0x0105c3cc: 0x105c3cc: jal   0x101df60 addiu a0, s0, -29760
 	ldloc 8
 	ldc.i4 -29760
 	add
@@ -6052,16 +6052,16 @@ L_105c3a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c3c4: 0x105c3c4: beq   v0, zero, 0x105c3d4 sll   zero, zero, 0
+// 0x0105c3d4: 0x105c3d4: beq   v0, zero, 0x105c3e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105c3d4
+	brfalse L_105c3e4
 // --- basic block ---
-// 0x0105c3cc: 0x105c3cc: jal   0x101f044 addiu a0, s0, -29760
+// 0x0105c3dc: 0x105c3dc: jal   0x101f054 addiu a0, s0, -29760
 	ldloc 8
 	ldc.i4 -29760
 	add
@@ -6071,17 +6071,17 @@ L_105c3a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_remove_point_101f044(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_remove_point_101f054(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105c3d4:
-// 0x0105c3d4: 0x105c3d4: lui   a0, 0x10000
+L_105c3e4:
+// 0x0105c3e4: 0x105c3e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_105c3d8:
-// 0x0105c3d8: 0x105c3d8: jal   0x101df50 addiu a0, a0, -29760
+L_105c3e8:
+// 0x0105c3e8: 0x105c3e8: jal   0x101df60 addiu a0, a0, -29760
 	ldloc.1
 	ldc.i4 -29760
 	add
@@ -6091,35 +6091,35 @@ L_105c3d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c3e0: 0x105c3e0: lui   v1, 0x70000
+// 0x0105c3f0: 0x105c3f0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105c3e4: 0x105c3e4: lw    v1, 10020(v1)
+// 0x0105c3f4: 0x105c3f4: lw    v1, 10484(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105c3e8: 0x105c3e8: sll   zero, zero, 0
-// 0x0105c3ec: 0x105c3ec: bne   v1, zero, 0x105c428 sll   zero, zero, 0
+// 0x0105c3f8: 0x105c3f8: sll   zero, zero, 0
+// 0x0105c3fc: 0x105c3fc: bne   v1, zero, 0x105c438 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_105c428
+	brtrue L_105c438
 // --- basic block ---
-// 0x0105c3f4: 0x105c3f4: beq   v0, zero, 0x105c420 addiu v1, zero, 1
+// 0x0105c404: 0x105c404: beq   v0, zero, 0x105c430 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 6
-	brfalse L_105c420
+	brfalse L_105c430
 // --- basic block ---
-// 0x0105c3fc: 0x105c3fc: lw    v1, 4(v0)
+// 0x0105c40c: 0x105c40c: lw    v1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6128,50 +6128,50 @@ L_105c3d8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105c400: 0x105c400: sll   zero, zero, 0
-// 0x0105c404: 0x105c404: bne   v1, zero, 0x105c428 sll   zero, zero, 0
+// 0x0105c410: 0x105c410: sll   zero, zero, 0
+// 0x0105c414: 0x105c414: bne   v1, zero, 0x105c438 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_105c428
+	brtrue L_105c438
 // --- basic block ---
-// 0x0105c40c: 0x105c40c: lw    v0, 0(v0)
+// 0x0105c41c: 0x105c41c: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0105c410: 0x105c410: sll   zero, zero, 0
-// 0x0105c414: 0x105c414: bne   v0, zero, 0x105c42c addiu v0, zero, -1
+// 0x0105c420: 0x105c420: sll   zero, zero, 0
+// 0x0105c424: 0x105c424: bne   v0, zero, 0x105c43c addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_105c42c
+	brtrue L_105c43c
 // --- basic block ---
-// 0x0105c41c: 0x105c41c: addiu v1, zero, 1
+// 0x0105c42c: 0x105c42c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-L_105c420:
-// 0x0105c420: 0x105c420: lui   v0, 0x70000
+L_105c430:
+// 0x0105c430: 0x105c430: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c424: 0x105c424: sw    v1, 10020(v0)
+// 0x0105c434: 0x105c434: sw    v1, 10484(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2505
+	ldc.i4 2621
 	add
 	ldloc 6
 	stelem.i4
-L_105c428:
-// 0x0105c428: 0x105c428: addiu v0, zero, -1
+L_105c438:
+// 0x0105c438: 0x105c438: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_105c42c:
-// 0x0105c42c: 0x105c42c: lui   s0, 0x0
+L_105c43c:
+// 0x0105c43c: 0x105c43c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0105c430: 0x105c430: jal   0x1057080 sw    v0, 14228(s0)
+// 0x0105c440: 0x105c440: jal   0x1057090 sw    v0, 14228(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6185,57 +6185,57 @@ L_105c42c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl64::navigate_main_suspend_navigation_1057080(int32,int32,int32,int32,int32)
+	call int32 Cibyl64::navigate_main_suspend_navigation_1057090(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c438: 0x105c438: jal   0x10629a4 sll   zero, zero, 0
-	call int32 Cibyl73::navigate_route_load_data_10629a4()
+// 0x0105c448: 0x105c448: jal   0x10629b4 sll   zero, zero, 0
+	call int32 Cibyl73::navigate_route_load_data_10629b4()
 	stloc 5
 // --- basic block ---
-// 0x0105c440: 0x105c440: bgez  v0, 0x105c45c addiu s1, sp, 88
+// 0x0105c450: 0x105c450: bgez  v0, 0x105c46c addiu s1, sp, 88
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc 9
 	ldc.i4.s 0
-	bge L_105c45c
+	bge L_105c46c
 // --- basic block ---
-// 0x0105c448: 0x105c448: lui   a0, 0x0
+// 0x0105c458: 0x105c458: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105c44c: 0x105c44c: lui   a1, 0x10000
+// 0x0105c45c: 0x105c45c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c450: 0x105c450: addiu a0, a0, 30152
+// 0x0105c460: 0x105c460: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x0105c454: 0x105c454: j	 0x105c870 addiu a1, a1, 10972
+// 0x0105c464: 0x105c464: j	 0x105c880 addiu a1, a1, 10968
 	ldloc.2
-	ldc.i4 10972
+	ldc.i4 10968
 	add
 	stloc.2
-	br L_105c870
+	br L_105c880
 // --- basic block ---
-L_105c45c:
-// 0x0105c45c: 0x105c45c: addu  a0, s1, zero
+L_105c46c:
+// 0x0105c46c: 0x105c46c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0105c460: 0x105c460: addiu a1, sp, 64
+// 0x0105c470: 0x105c470: addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x0105c464: 0x105c464: addiu a2, sp, 72
+// 0x0105c474: 0x105c474: addiu a2, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.3
-// 0x0105c468: 0x105c468: jal   0x105a610 addu  a3, zero, zero
+// 0x0105c478: 0x105c478: jal   0x105a620 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6243,29 +6243,29 @@ L_105c45c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl67::T_391_105a610(int32,int32,int32,int32,int32)
+	call int32 Cibyl67::T_391_105a620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c470: 0x105c470: bne   v0, zero, 0x105c93c addiu v1, zero, -1
+// 0x0105c480: 0x105c480: bne   v0, zero, 0x105c94c addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
-	brtrue L_105c93c
+	brtrue L_105c94c
 // --- basic block ---
-// 0x0105c478: 0x105c478: lui   a0, 0x0
+// 0x0105c488: 0x105c488: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105c47c: 0x105c47c: addiu a0, a0, 14272
+// 0x0105c48c: 0x105c48c: addiu a0, a0, 14272
 	ldloc.1
 	ldc.i4 14272
 	add
 	stloc.1
-// 0x0105c480: 0x105c480: addu  a1, s1, zero
+// 0x0105c490: 0x105c490: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x0105c484: 0x105c484: jal   0x1001800 addiu a2, zero, 20
+// 0x0105c494: 0x105c494: jal   0x1001800 addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
 	ldloc.1
@@ -6277,7 +6277,7 @@ L_105c45c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c48c: 0x105c48c: lw    v1, 64(sp)
+// 0x0105c49c: 0x105c49c: lw    v1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6286,10 +6286,10 @@ L_105c45c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105c490: 0x105c490: lui   v0, 0x0
+// 0x0105c4a0: 0x105c4a0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105c494: 0x105c494: sw    v1, 14292(v0)
+// 0x0105c4a4: 0x105c4a4: sw    v1, 14292(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6298,10 +6298,10 @@ L_105c45c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105c498: 0x105c498: addiu v0, zero, 25
+// 0x0105c4a8: 0x105c4a8: addiu v0, zero, 25
 	ldc.i4.s 25
 	stloc 5
-// 0x0105c49c: 0x105c49c: jal   0x1061324 sw    v0, 68(sp)
+// 0x0105c4ac: 0x105c4ac: jal   0x1061334 sw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6310,20 +6310,20 @@ L_105c45c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl72::navigate_cost_reset_1061324()
+	call int32 Cibyl72::navigate_cost_reset_1061334()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c4a4: 0x105c4a4: lui   v1, 0x70000
+// 0x0105c4b4: 0x105c4b4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105c4a8: 0x105c4a8: addiu v0, v1, 9996
+// 0x0105c4b8: 0x105c4b8: addiu v0, v1, 10460
 	ldloc 6
-	ldc.i4 9996
+	ldc.i4 10460
 	add
 	stloc 5
-// 0x0105c4ac: 0x105c4ac: sw    zero, 8(v0)
+// 0x0105c4bc: 0x105c4bc: sw    zero, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6332,7 +6332,7 @@ L_105c45c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c4b0: 0x105c4b0: sw    zero, 4(v0)
+// 0x0105c4c0: 0x105c4c0: sw    zero, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6341,12 +6341,12 @@ L_105c45c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c4b4: 0x105c4b4: jal   0x106c170 sw    zero, 9996(v1)
+// 0x0105c4c4: 0x105c4c4: jal   0x106c794 sw    zero, 10460(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2499
+	ldc.i4 2615
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6355,60 +6355,60 @@ L_105c45c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c4bc: 0x105c4bc: beq   v0, zero, 0x105c5fc lui   v0, 0x70000
+// 0x0105c4cc: 0x105c4cc: beq   v0, zero, 0x105c60c lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105c5fc
+	brfalse L_105c60c
 // --- basic block ---
-// 0x0105c4c4: 0x105c4c4: addiu s0, zero, 1
+// 0x0105c4d4: 0x105c4d4: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0105c4c8: 0x105c4c8: lui   a1, 0x10000
+// 0x0105c4d8: 0x105c4d8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c4cc: 0x105c4cc: lui   a3, 0x10000
+// 0x0105c4dc: 0x105c4dc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105c4d0: 0x105c4d0: addiu a0, zero, 4
+// 0x0105c4e0: 0x105c4e0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105c4d4: 0x105c4d4: sw    s0, 9188(v0)
+// 0x0105c4e4: 0x105c4e4: sw    s0, 9652(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105c4d8: 0x105c4d8: addiu a1, a1, 8052
+// 0x0105c4e8: 0x105c4e8: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105c4dc: 0x105c4dc: lui   v0, 0x70000
+// 0x0105c4ec: 0x105c4ec: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c4e0: 0x105c4e0: addiu a3, a3, 11004
+// 0x0105c4f0: 0x105c4f0: addiu a3, a3, 11000
 	ldloc 4
-	ldc.i4 11004
+	ldc.i4 11000
 	add
 	stloc 4
-// 0x0105c4e4: 0x105c4e4: addiu a2, zero, 2513
+// 0x0105c4f4: 0x105c4f4: addiu a2, zero, 2513
 	ldc.i4 2513
 	stloc.3
-// 0x0105c4e8: 0x105c4e8: jal   0x100449c sw    zero, 9200(v0)
+// 0x0105c4f8: 0x105c4f8: jal   0x100449c sw    zero, 9664(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2300
+	ldc.i4 2416
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6422,13 +6422,13 @@ L_105c45c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c4f0: 0x105c4f0: lui   v0, 0x0
+// 0x0105c500: 0x105c500: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105c4f4: 0x105c4f4: lui   a0, 0x70000
+// 0x0105c504: 0x105c504: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105c4f8: 0x105c4f8: lw    v1, 14372(v0)
+// 0x0105c508: 0x105c508: lw    v1, 14372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6437,31 +6437,31 @@ L_105c45c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105c4fc: 0x105c4fc: sw    s0, 10012(a0)
+// 0x0105c50c: 0x105c50c: sw    s0, 10476(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2503
+	ldc.i4 2619
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105c500: 0x105c500: lui   a0, 0x70000
+// 0x0105c510: 0x105c510: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105c504: 0x105c504: beq   v1, zero, 0x105c548 sw    zero, 9184(a0)
+// 0x0105c514: 0x105c514: beq   v1, zero, 0x105c558 sw    zero, 9648(a0)
 	ldloc 6
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2296
+	ldc.i4 2412
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_105c548
+	brfalse L_105c558
 // --- basic block ---
-// 0x0105c50c: 0x105c50c: jal   0x1026edc addu  s1, zero, zero
+// 0x0105c51c: 0x105c51c: jal   0x1026eec addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -6469,31 +6469,31 @@ L_105c45c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c514: 0x105c514: beq   v0, zero, 0x105c528 sll   zero, zero, 0
+// 0x0105c524: 0x105c524: beq   v0, zero, 0x105c538 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105c528
+	brfalse L_105c538
 // --- basic block ---
-// 0x0105c51c: 0x105c51c: jal   0x1026c80 sll   zero, zero, 0
+// 0x0105c52c: 0x105c52c: jal   0x1026c90 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c80(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_destination_mode_1026c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c524: 0x105c524: addu  s1, v0, zero
+// 0x0105c534: 0x105c534: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-L_105c528:
-// 0x0105c528: 0x105c528: jal   0x1026d94 addu  s0, zero, zero
+L_105c538:
+// 0x0105c538: 0x105c538: jal   0x1026da4 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.0
@@ -6501,35 +6501,35 @@ L_105c528:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c530: 0x105c530: beq   v0, zero, 0x105c558 lui   a1, 0x1050000
+// 0x0105c540: 0x105c540: beq   v0, zero, 0x105c568 lui   a1, 0x1050000
 	ldloc 5
 	ldc.i4 17104896
 	stloc.2
-	brfalse L_105c558
+	brfalse L_105c568
 // --- basic block ---
-// 0x0105c538: 0x105c538: jal   0x1026c5c sll   zero, zero, 0
+// 0x0105c548: 0x105c548: jal   0x1026c6c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_destination_mode_1026c5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_destination_mode_1026c6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c540: 0x105c540: j	 0x105c554 addu  s0, v0, zero
+// 0x0105c550: 0x105c550: j	 0x105c564 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	br L_105c554
+	br L_105c564
 // --- basic block ---
-L_105c548:
-// 0x0105c548: 0x105c548: sw    s0, 14372(v0)
+L_105c558:
+// 0x0105c558: 0x105c558: sw    s0, 14372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6538,23 +6538,23 @@ L_105c548:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105c54c: 0x105c54c: addu  s1, zero, zero
+// 0x0105c55c: 0x105c55c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0105c550: 0x105c550: addu  s0, zero, zero
+// 0x0105c560: 0x105c560: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-L_105c554:
-// 0x0105c554: 0x105c554: lui   a1, 0x1050000
+L_105c564:
+// 0x0105c564: 0x105c564: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-L_105c558:
-// 0x0105c558: 0x105c558: addiu a1, a1, 29052
+L_105c568:
+// 0x0105c568: 0x105c568: addiu a1, a1, 29068
 	ldloc.2
-	ldc.i4 29052
+	ldc.i4 29068
 	add
 	stloc.2
-// 0x0105c55c: 0x105c55c: jal   0x104fe98 addiu a0, zero, 300
+// 0x0105c56c: 0x105c56c: jal   0x104fea8 addiu a0, zero, 300
 	ldc.i4 300
 	stloc.1
 	ldloc.0
@@ -6562,20 +6562,20 @@ L_105c558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c564: 0x105c564: lui   a1, 0x1050000
+// 0x0105c574: 0x105c574: lui   a1, 0x1050000
 	ldc.i4 17104896
 	stloc.2
-// 0x0105c568: 0x105c568: addiu a1, a1, 28868
+// 0x0105c578: 0x105c578: addiu a1, a1, 28884
 	ldloc.2
-	ldc.i4 28868
+	ldc.i4 28884
 	add
 	stloc.2
-// 0x0105c56c: 0x105c56c: jal   0x104fe98 addiu a0, zero, 30000
+// 0x0105c57c: 0x105c57c: jal   0x104fea8 addiu a0, zero, 30000
 	ldc.i4 30000
 	stloc.1
 	ldloc.0
@@ -6583,20 +6583,20 @@ L_105c558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c574: 0x105c574: lui   v0, 0x70000
+// 0x0105c584: 0x105c584: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c578: 0x105c578: addiu v0, v0, 10732
+// 0x0105c588: 0x105c588: addiu v0, v0, 11196
 	ldloc 5
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc 5
-// 0x0105c57c: 0x105c57c: sw    v0, 16(sp)
+// 0x0105c58c: 0x105c58c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6605,15 +6605,15 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c580: 0x105c580: lui   v0, 0x70000
+// 0x0105c590: 0x105c590: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c584: 0x105c584: addiu v0, v0, 9204
+// 0x0105c594: 0x105c594: addiu v0, v0, 9668
 	ldloc 5
-	ldc.i4 9204
+	ldc.i4 9668
 	add
 	stloc 5
-// 0x0105c588: 0x105c588: sw    v0, 20(sp)
+// 0x0105c598: 0x105c598: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6622,15 +6622,15 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c58c: 0x105c58c: lui   v0, 0x70000
+// 0x0105c59c: 0x105c59c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c590: 0x105c590: addiu v0, v0, 9460
+// 0x0105c5a0: 0x105c5a0: addiu v0, v0, 9924
 	ldloc 5
-	ldc.i4 9460
+	ldc.i4 9924
 	add
 	stloc 5
-// 0x0105c594: 0x105c594: sw    v0, 24(sp)
+// 0x0105c5a4: 0x105c5a4: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6639,15 +6639,15 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c598: 0x105c598: lui   v0, 0x70000
+// 0x0105c5a8: 0x105c5a8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c59c: 0x105c59c: addiu v0, v0, 9484
+// 0x0105c5ac: 0x105c5ac: addiu v0, v0, 9948
 	ldloc 5
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	stloc 5
-// 0x0105c5a0: 0x105c5a0: sw    v0, 28(sp)
+// 0x0105c5b0: 0x105c5b0: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6656,15 +6656,15 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c5a4: 0x105c5a4: lui   v0, 0x70000
+// 0x0105c5b4: 0x105c5b4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c5a8: 0x105c5a8: addiu v0, v0, 9740
+// 0x0105c5b8: 0x105c5b8: addiu v0, v0, 10204
 	ldloc 5
-	ldc.i4 9740
+	ldc.i4 10204
 	add
 	stloc 5
-// 0x0105c5ac: 0x105c5ac: sw    v0, 32(sp)
+// 0x0105c5bc: 0x105c5bc: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6673,7 +6673,7 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c5b0: 0x105c5b0: lw    v0, 68(sp)
+// 0x0105c5c0: 0x105c5c0: lw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6682,7 +6682,7 @@ L_105c558:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c5b4: 0x105c5b4: lw    a1, 64(sp)
+// 0x0105c5c4: 0x105c5c4: lw    a1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6691,7 +6691,7 @@ L_105c558:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105c5b8: 0x105c5b8: sw    v0, 44(sp)
+// 0x0105c5c8: 0x105c5c8: sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6700,10 +6700,10 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c5bc: 0x105c5bc: addiu v0, zero, -1
+// 0x0105c5cc: 0x105c5cc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105c5c0: 0x105c5c0: sw    v0, 48(sp)
+// 0x0105c5d0: 0x105c5d0: sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6712,10 +6712,10 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c5c4: 0x105c5c4: addiu v0, zero, 1
+// 0x0105c5d4: 0x105c5d4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105c5c8: 0x105c5c8: sw    v0, 52(sp)
+// 0x0105c5d8: 0x105c5d8: sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6724,31 +6724,31 @@ L_105c558:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c5cc: 0x105c5cc: lui   a3, 0x70000
+// 0x0105c5dc: 0x105c5dc: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105c5d0: 0x105c5d0: lui   v0, 0x0
+// 0x0105c5e0: 0x105c5e0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105c5d4: 0x105c5d4: addiu v0, v0, 14296
+// 0x0105c5e4: 0x105c5e4: addiu v0, v0, 14296
 	ldloc 5
 	ldc.i4 14296
 	add
 	stloc 5
-// 0x0105c5d8: 0x105c5d8: addiu a3, a3, 10740
+// 0x0105c5e8: 0x105c5e8: addiu a3, a3, 11204
 	ldloc 4
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc 4
-// 0x0105c5dc: 0x105c5dc: addiu a0, sp, 88
+// 0x0105c5ec: 0x105c5ec: addiu a0, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc.1
-// 0x0105c5e0: 0x105c5e0: addu  a2, zero, zero
+// 0x0105c5f0: 0x105c5f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105c5e4: 0x105c5e4: sw    s1, 36(sp)
+// 0x0105c5f4: 0x105c5f4: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6757,7 +6757,7 @@ L_105c558:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105c5e8: 0x105c5e8: sw    s0, 40(sp)
+// 0x0105c5f8: 0x105c5f8: sw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6766,7 +6766,7 @@ L_105c558:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105c5ec: 0x105c5ec: jal   0x1064224 sw    v0, 56(sp)
+// 0x0105c5fc: 0x105c5fc: jal   0x1064234 sw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6780,35 +6780,35 @@ L_105c558:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_request_1064224(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_request_1064234(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c5f4: 0x105c5f4: j	 0x105c93c addu  v1, zero, zero
+// 0x0105c604: 0x105c604: j	 0x105c94c addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_105c93c
+	br L_105c94c
 // --- basic block ---
-L_105c5fc:
-// 0x0105c5fc: 0x105c5fc: jal   0x1057434 sll   zero, zero, 0
+L_105c60c:
+// 0x0105c60c: 0x105c60c: jal   0x1057444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_local_calc_enabled_1057434(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_local_calc_enabled_1057444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c604: 0x105c604: beq   v0, zero, 0x105c810 lui   v1, 0x70000
+// 0x0105c614: 0x105c614: beq   v0, zero, 0x105c820 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_105c810
+	brfalse L_105c820
 // --- basic block ---
-// 0x0105c60c: 0x105c60c: lw    v0, 14228(s0)
+// 0x0105c61c: 0x105c61c: lw    v0, 14228(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -6817,33 +6817,33 @@ L_105c5fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c610: 0x105c610: sll   zero, zero, 0
-// 0x0105c614: 0x105c614: beq   v0, zero, 0x105c630 sw    zero, 9188(v1)
+// 0x0105c620: 0x105c620: sll   zero, zero, 0
+// 0x0105c624: 0x105c624: beq   v0, zero, 0x105c640 sw    zero, 9652(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2297
+	ldc.i4 2413
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_105c630
+	brfalse L_105c640
 // --- basic block ---
-// 0x0105c61c: 0x105c61c: lui   a0, 0x0
+// 0x0105c62c: 0x105c62c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105c620: 0x105c620: lui   a1, 0x10000
+// 0x0105c630: 0x105c630: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c624: 0x105c624: addiu a0, a0, 30152
+// 0x0105c634: 0x105c634: addiu a0, a0, 30152
 	ldloc.1
 	ldc.i4 30152
 	add
 	stloc.1
-// 0x0105c628: 0x105c628: jal   0x104c148 addiu a1, a1, 11028
+// 0x0105c638: 0x105c638: jal   0x104c158 addiu a1, a1, 11024
 	ldloc.2
-	ldc.i4 11028
+	ldc.i4 11024
 	add
 	stloc.2
 	ldloc.0
@@ -6851,21 +6851,21 @@ L_105c5fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105c630:
-// 0x0105c630: 0x105c630: lui   s2, 0x10000
+L_105c640:
+// 0x0105c640: 0x105c640: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x0105c634: 0x105c634: addiu a0, s2, 10736
+// 0x0105c644: 0x105c644: addiu a0, s2, 10732
 	ldloc 11
-	ldc.i4 10736
+	ldc.i4 10732
 	add
 	stloc.1
-// 0x0105c638: 0x105c638: jal   0x1095eec addu  a1, zero, zero
+// 0x0105c648: 0x105c648: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6873,23 +6873,23 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c640: 0x105c640: bne   v0, zero, 0x105c780 addu  s1, v0, zero
+// 0x0105c650: 0x105c650: bne   v0, zero, 0x105c790 addu  s1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brtrue L_105c780
+	brtrue L_105c790
 // --- basic block ---
-// 0x0105c648: 0x105c648: lui   a0, 0x10000
+// 0x0105c658: 0x105c658: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c64c: 0x105c64c: jal   0x101cd60 addiu a0, a0, 11072
+// 0x0105c65c: 0x105c65c: jal   0x101cd70 addiu a0, a0, 11068
 	ldloc.1
-	ldc.i4 11072
+	ldc.i4 11068
 	add
 	stloc.1
 	ldloc.0
@@ -6897,28 +6897,28 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c654: 0x105c654: lui   a3, 0x10010000
+// 0x0105c664: 0x105c664: lui   a3, 0x10010000
 	ldc.i4 268500992
 	stloc 4
-// 0x0105c658: 0x105c658: addu  a1, v0, zero
+// 0x0105c668: 0x105c668: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105c65c: 0x105c65c: ori   a3, a3, 28689
+// 0x0105c66c: 0x105c66c: ori   a3, a3, 28689
 	ldloc 4
 	ldc.i4 28689
 	or
 	stloc 4
-// 0x0105c660: 0x105c660: addiu a0, s2, 10736
+// 0x0105c670: 0x105c670: addiu a0, s2, 10732
 	ldloc 11
-	ldc.i4 10736
+	ldc.i4 10732
 	add
 	stloc.1
-// 0x0105c664: 0x105c664: jal   0x1095a08 addu  a2, zero, zero
+// 0x0105c674: 0x105c674: jal   0x1096050 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6926,35 +6926,35 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c66c: 0x105c66c: lui   a0, 0x10000
+// 0x0105c67c: 0x105c67c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c670: 0x105c670: addiu a3, zero, -1
+// 0x0105c680: 0x105c680: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0105c674: 0x105c674: addu  s1, v0, zero
+// 0x0105c684: 0x105c684: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0105c678: 0x105c678: addiu a0, a0, 11092
+// 0x0105c688: 0x105c688: addiu a0, a0, 11088
 	ldloc.1
-	ldc.i4 11092
+	ldc.i4 11088
 	add
 	stloc.1
-// 0x0105c67c: 0x105c67c: addu  a1, zero, zero
+// 0x0105c68c: 0x105c68c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105c680: 0x105c680: addiu a2, zero, -1
+// 0x0105c690: 0x105c690: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0105c684: 0x105c684: addiu v0, zero, 136
+// 0x0105c694: 0x105c694: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x0105c688: 0x105c688: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0105c698: 0x105c698: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6968,34 +6968,34 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c690: 0x105c690: addu  a0, v0, zero
+// 0x0105c6a0: 0x105c6a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105c694: 0x105c694: addu  a1, zero, zero
+// 0x0105c6a4: 0x105c6a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105c698: 0x105c698: addu  a2, zero, zero
+// 0x0105c6a8: 0x105c6a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105c69c: 0x105c69c: jal   0x1098fe0 addu  s0, v0, zero
+// 0x0105c6ac: 0x105c6ac: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0105c6a4: 0x105c6a4: lui   a0, 0x10000
+// 0x0105c6b4: 0x105c6b4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c6a8: 0x105c6a8: jal   0x101cd60 addiu a0, a0, 8580
+// 0x0105c6b8: 0x105c6b8: jal   0x101cd70 addiu a0, a0, 8576
 	ldloc.1
-	ldc.i4 8580
+	ldc.i4 8576
 	add
 	stloc.1
 	ldloc.0
@@ -7003,26 +7003,26 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c6b0: 0x105c6b0: lui   s4, 0x20000
+// 0x0105c6c0: 0x105c6c0: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x0105c6b4: 0x105c6b4: addiu a2, zero, -1
+// 0x0105c6c4: 0x105c6c4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0105c6b8: 0x105c6b8: addiu a3, zero, 8
+// 0x0105c6c8: 0x105c6c8: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0105c6bc: 0x105c6bc: addu  a1, v0, zero
+// 0x0105c6cc: 0x105c6cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105c6c0: 0x105c6c0: jal   0x1098d10 addiu a0, s4, 9016
+// 0x0105c6d0: 0x105c6d0: jal   0x1099358 addiu a0, s4, 9480
 	ldloc 13
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -7030,23 +7030,23 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c6c8: 0x105c6c8: lui   s3, 0x0
+// 0x0105c6d8: 0x105c6d8: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x0105c6cc: 0x105c6cc: addu  a0, v0, zero
+// 0x0105c6dc: 0x105c6dc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105c6d0: 0x105c6d0: addiu a1, s3, 23008
+// 0x0105c6e0: 0x105c6e0: addiu a1, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0105c6d4: 0x105c6d4: jal   0x1097af8 sw    v0, 112(sp)
+// 0x0105c6e4: 0x105c6e4: jal   0x1098140 sw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7057,9 +7057,9 @@ L_105c630:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0105c6dc: 0x105c6dc: lw    v0, 112(sp)
+// 0x0105c6ec: 0x105c6ec: lw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7068,36 +7068,36 @@ L_105c630:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c6e0: 0x105c6e0: addu  a0, s0, zero
+// 0x0105c6f0: 0x105c6f0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105c6e4: 0x105c6e4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0105c6f4: 0x105c6f4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c6ec: 0x105c6ec: lui   a1, 0x20000
+// 0x0105c6fc: 0x105c6fc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0105c6f0: 0x105c6f0: addiu a2, zero, -1
+// 0x0105c700: 0x105c700: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0105c6f4: 0x105c6f4: addu  a3, zero, zero
+// 0x0105c704: 0x105c704: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0105c6f8: 0x105c6f8: addiu a1, a1, 22740
+// 0x0105c708: 0x105c708: addiu a1, a1, 23200
 	ldloc.2
-	ldc.i4 22740
+	ldc.i4 23200
 	add
 	stloc.2
-// 0x0105c6fc: 0x105c6fc: jal   0x1098d10 addiu a0, s4, 9016
+// 0x0105c70c: 0x105c70c: jal   0x1099358 addiu a0, s4, 9480
 	ldloc 13
-	ldc.i4 9016
+	ldc.i4 9480
 	add
 	stloc.1
 	ldloc.0
@@ -7105,20 +7105,20 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c704: 0x105c704: addu  a0, v0, zero
+// 0x0105c714: 0x105c714: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105c708: 0x105c708: addiu a1, s3, 23008
+// 0x0105c718: 0x105c718: addiu a1, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0105c70c: 0x105c70c: jal   0x1097af8 sw    v0, 112(sp)
+// 0x0105c71c: 0x105c71c: jal   0x1098140 sw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7129,9 +7129,9 @@ L_105c630:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0105c714: 0x105c714: lw    v0, 112(sp)
+// 0x0105c724: 0x105c724: lw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7140,39 +7140,39 @@ L_105c630:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c718: 0x105c718: addu  a0, s0, zero
+// 0x0105c728: 0x105c728: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105c71c: 0x105c71c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0105c72c: 0x105c72c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c724: 0x105c724: lui   a1, 0x10000
+// 0x0105c734: 0x105c734: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c728: 0x105c728: lui   a0, 0x10000
+// 0x0105c738: 0x105c738: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105c72c: 0x105c72c: addiu a2, zero, -1
+// 0x0105c73c: 0x105c73c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0105c730: 0x105c730: addu  a3, zero, zero
+// 0x0105c740: 0x105c740: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0105c734: 0x105c734: addiu a1, a1, 18500
+// 0x0105c744: 0x105c744: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0105c738: 0x105c738: jal   0x1098d10 addiu a0, a0, 11108
+// 0x0105c748: 0x105c748: jal   0x1099358 addiu a0, a0, 11104
 	ldloc.1
-	ldc.i4 11108
+	ldc.i4 11104
 	add
 	stloc.1
 	ldloc.0
@@ -7180,20 +7180,20 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c740: 0x105c740: addu  a0, v0, zero
+// 0x0105c750: 0x105c750: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105c744: 0x105c744: addiu a1, s3, 23008
+// 0x0105c754: 0x105c754: addiu a1, s3, 23008
 	ldloc 12
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0105c748: 0x105c748: jal   0x1097af8 sw    v0, 112(sp)
+// 0x0105c758: 0x105c758: jal   0x1098140 sw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7204,9 +7204,9 @@ L_105c630:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x0105c750: 0x105c750: lw    v0, 112(sp)
+// 0x0105c760: 0x105c760: lw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7215,38 +7215,38 @@ L_105c630:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c754: 0x105c754: addu  a0, s0, zero
+// 0x0105c764: 0x105c764: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105c758: 0x105c758: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0105c768: 0x105c768: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c760: 0x105c760: addu  a0, s1, zero
+// 0x0105c770: 0x105c770: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0105c764: 0x105c764: jal   0x1098ec4 addu  a1, s0, zero
+// 0x0105c774: 0x105c774: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c76c: 0x105c76c: addiu a0, s2, 10736
+// 0x0105c77c: 0x105c77c: addiu a0, s2, 10732
 	ldloc 11
-	ldc.i4 10736
+	ldc.i4 10732
 	add
 	stloc.1
-// 0x0105c770: 0x105c770: jal   0x1095eec addu  a1, zero, zero
+// 0x0105c780: 0x105c780: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7254,40 +7254,40 @@ L_105c630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c778: 0x105c778: jal   0x109483c sll   zero, zero, 0
+// 0x0105c788: 0x105c788: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105c780:
-// 0x0105c780: 0x105c780: lui   a1, 0x10000
+L_105c790:
+// 0x0105c790: 0x105c790: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c784: 0x105c784: lui   a2, 0x10000
+// 0x0105c794: 0x105c794: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105c788: 0x105c788: addu  a0, s1, zero
+// 0x0105c798: 0x105c798: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0105c78c: 0x105c78c: addiu a1, a1, 11108
+// 0x0105c79c: 0x105c79c: addiu a1, a1, 11104
 	ldloc.2
-	ldc.i4 11108
+	ldc.i4 11104
 	add
 	stloc.2
-// 0x0105c790: 0x105c790: jal   0x109b3e0 addiu a2, a2, -48
+// 0x0105c7a0: 0x105c7a0: jal   0x109ba28 addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
 	ldloc.0
@@ -7295,42 +7295,42 @@ L_105c780:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c798: 0x105c798: jal   0x109483c sll   zero, zero, 0
+// 0x0105c7a8: 0x105c7a8: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c7a0: 0x105c7a0: lui   a1, 0x10000
+// 0x0105c7b0: 0x105c7b0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c7a4: 0x105c7a4: lui   a3, 0x10000
+// 0x0105c7b4: 0x105c7b4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105c7a8: 0x105c7a8: addiu a1, a1, 8052
+// 0x0105c7b8: 0x105c7b8: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105c7ac: 0x105c7ac: addiu a3, a3, 11120
+// 0x0105c7bc: 0x105c7bc: addiu a3, a3, 11116
 	ldloc 4
-	ldc.i4 11120
+	ldc.i4 11116
 	add
 	stloc 4
-// 0x0105c7b0: 0x105c7b0: addiu a0, zero, 4
+// 0x0105c7c0: 0x105c7c0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105c7b4: 0x105c7b4: jal   0x100449c addiu a2, zero, 2544
+// 0x0105c7c4: 0x105c7c4: jal   0x100449c addiu a2, zero, 2544
 	ldc.i4 2544
 	stloc.3
 	ldloc.0
@@ -7343,12 +7343,12 @@ L_105c780:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c7bc: 0x105c7bc: addiu v0, sp, 76
+// 0x0105c7cc: 0x105c7cc: addiu v0, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc 5
-// 0x0105c7c0: 0x105c7c0: sw    v0, 16(sp)
+// 0x0105c7d0: 0x105c7d0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7357,18 +7357,18 @@ L_105c780:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c7c4: 0x105c7c4: addiu v0, sp, 80
+// 0x0105c7d4: 0x105c7d4: addiu v0, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 5
-// 0x0105c7c8: 0x105c7c8: lui   a2, 0x0
+// 0x0105c7d8: 0x105c7d8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0105c7cc: 0x105c7cc: lui   a3, 0x70000
+// 0x0105c7dc: 0x105c7dc: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105c7d0: 0x105c7d0: sw    v0, 20(sp)
+// 0x0105c7e0: 0x105c7e0: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7377,7 +7377,7 @@ L_105c780:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c7d4: 0x105c7d4: lw    a1, 64(sp)
+// 0x0105c7e4: 0x105c7e4: lw    a1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7386,12 +7386,12 @@ L_105c780:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105c7d8: 0x105c7d8: addiu v0, sp, 84
+// 0x0105c7e8: 0x105c7e8: addiu v0, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc 5
-// 0x0105c7dc: 0x105c7dc: sw    v0, 24(sp)
+// 0x0105c7ec: 0x105c7ec: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7400,27 +7400,27 @@ L_105c780:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c7e0: 0x105c7e0: addiu a2, a2, 14228
+// 0x0105c7f0: 0x105c7f0: addiu a2, a2, 14228
 	ldloc.3
 	ldc.i4 14228
 	add
 	stloc.3
-// 0x0105c7e4: 0x105c7e4: addiu v0, sp, 68
+// 0x0105c7f4: 0x105c7f4: addiu v0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 5
-// 0x0105c7e8: 0x105c7e8: addiu a3, a3, 10728
+// 0x0105c7f8: 0x105c7f8: addiu a3, a3, 11192
 	ldloc 4
-	ldc.i4 10728
+	ldc.i4 11192
 	add
 	stloc 4
-// 0x0105c7ec: 0x105c7ec: addiu a0, sp, 88
+// 0x0105c7fc: 0x105c7fc: addiu a0, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
 	stloc.1
-// 0x0105c7f0: 0x105c7f0: sw    v0, 28(sp)
+// 0x0105c800: 0x105c800: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7429,7 +7429,7 @@ L_105c780:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c7f4: 0x105c7f4: sw    zero, 32(sp)
+// 0x0105c804: 0x105c804: sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7438,7 +7438,7 @@ L_105c780:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c7f8: 0x105c7f8: jal   0x106354c sw    zero, 36(sp)
+// 0x0105c808: 0x105c808: jal   0x106355c sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7452,42 +7452,42 @@ L_105c780:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_get_segments_106354c(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_get_segments_106355c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c800: 0x105c800: bgtz  v0, 0x105c880 sll   zero, zero, 0
+// 0x0105c810: 0x105c810: bgtz  v0, 0x105c890 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_105c880
+	bgt L_105c890
 // --- basic block ---
-// 0x0105c808: 0x105c808: j	 0x105c834 lui   a0, 0x10000
+// 0x0105c818: 0x105c818: j	 0x105c844 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_105c834
+	br L_105c844
 // --- basic block ---
-L_105c810:
-// 0x0105c810: 0x105c810: lui   a1, 0x10000
+L_105c820:
+// 0x0105c820: 0x105c820: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c814: 0x105c814: lui   a3, 0x10000
+// 0x0105c824: 0x105c824: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105c818: 0x105c818: addiu a1, a1, 8052
+// 0x0105c828: 0x105c828: addiu a1, a1, 8048
 	ldloc.2
-	ldc.i4 8052
+	ldc.i4 8048
 	add
 	stloc.2
-// 0x0105c81c: 0x105c81c: addiu a3, a3, 11144
+// 0x0105c82c: 0x105c82c: addiu a3, a3, 11140
 	ldloc 4
-	ldc.i4 11144
+	ldc.i4 11140
 	add
 	stloc 4
-// 0x0105c820: 0x105c820: addiu a0, zero, 4
+// 0x0105c830: 0x105c830: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105c824: 0x105c824: jal   0x100449c addiu a2, zero, 2552
+// 0x0105c834: 0x105c834: jal   0x100449c addiu a2, zero, 2552
 	ldc.i4 2552
 	stloc.3
 	ldloc.0
@@ -7500,22 +7500,22 @@ L_105c810:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c82c: 0x105c82c: addiu v0, zero, -1
+// 0x0105c83c: 0x105c83c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105c830: 0x105c830: lui   a0, 0x10000
+// 0x0105c840: 0x105c840: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_105c834:
-// 0x0105c834: 0x105c834: addiu a0, a0, 10736
+L_105c844:
+// 0x0105c844: 0x105c844: addiu a0, a0, 10732
 	ldloc.1
-	ldc.i4 10736
+	ldc.i4 10732
 	add
 	stloc.1
-// 0x0105c838: 0x105c838: addu  a1, zero, zero
+// 0x0105c848: 0x105c848: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105c83c: 0x105c83c: jal   0x1094884 sw    v0, 112(sp)
+// 0x0105c84c: 0x105c84c: jal   0x1094ff4 sw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7529,12 +7529,12 @@ L_105c834:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c844: 0x105c844: lw    v0, 112(sp)
+// 0x0105c854: 0x105c854: lw    v0, 112(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7543,72 +7543,72 @@ L_105c834:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c848: 0x105c848: sll   zero, zero, 0
-// 0x0105c84c: 0x105c84c: beq   v0, zero, 0x105c864 lui   a0, 0x0
+// 0x0105c858: 0x105c858: sll   zero, zero, 0
+// 0x0105c85c: 0x105c85c: beq   v0, zero, 0x105c874 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_105c864
+	brfalse L_105c874
 // --- basic block ---
-// 0x0105c854: 0x105c854: lui   a1, 0x10000
+// 0x0105c864: 0x105c864: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c858: 0x105c858: addiu a0, a0, 30092
+// 0x0105c868: 0x105c868: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x0105c85c: 0x105c85c: j	 0x105c870 addiu a1, a1, 11188
+// 0x0105c86c: 0x105c86c: j	 0x105c880 addiu a1, a1, 11184
 	ldloc.2
-	ldc.i4 11188
+	ldc.i4 11184
 	add
 	stloc.2
-	br L_105c870
+	br L_105c880
 // --- basic block ---
-L_105c864:
-// 0x0105c864: 0x105c864: lui   a1, 0x10000
+L_105c874:
+// 0x0105c874: 0x105c874: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105c868: 0x105c868: addiu a0, a0, 30092
+// 0x0105c878: 0x105c878: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x0105c86c: 0x105c86c: addiu a1, a1, 11216
+// 0x0105c87c: 0x105c87c: addiu a1, a1, 11212
 	ldloc.2
-	ldc.i4 11216
+	ldc.i4 11212
 	add
 	stloc.2
-L_105c870:
-// 0x0105c870: 0x105c870: jal   0x104c148 sll   zero, zero, 0
+L_105c880:
+// 0x0105c880: 0x105c880: jal   0x104c158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c878: 0x105c878: j	 0x105c93c addiu v1, zero, -1
+// 0x0105c888: 0x105c888: j	 0x105c94c addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-	br L_105c93c
+	br L_105c94c
 // --- basic block ---
-L_105c880:
-// 0x0105c880: 0x105c880: jal   0x105f3a4 sll   zero, zero, 0
+L_105c890:
+// 0x0105c890: 0x105c890: jal   0x105f3b4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_initialize_105f3a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_initialize_105f3b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c888: 0x105c888: lw    t0, 76(sp)
+// 0x0105c898: 0x105c898: lw    t0, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7617,7 +7617,7 @@ L_105c880:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105c88c: 0x105c88c: lw    v0, 80(sp)
+// 0x0105c89c: 0x105c89c: lw    v0, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7626,49 +7626,49 @@ L_105c880:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c890: 0x105c890: lui   v1, 0x70000
+// 0x0105c8a0: 0x105c8a0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105c894: 0x105c894: sw    t0, 10720(v1)
+// 0x0105c8a4: 0x105c8a4: sw    t0, 11184(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2680
+	ldc.i4 2796
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105c898: 0x105c898: lui   v1, 0x70000
+// 0x0105c8a8: 0x105c8a8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105c89c: 0x105c89c: addu  a1, v0, zero
+// 0x0105c8ac: 0x105c8ac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105c8a0: 0x105c8a0: sw    v0, 9168(v1)
+// 0x0105c8b0: 0x105c8b0: sw    v0, 9632(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 2292
+	ldc.i4 2408
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c8a4: 0x105c8a4: lui   v0, 0x70000
+// 0x0105c8b4: 0x105c8b4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c8a8: 0x105c8a8: sw    zero, 9172(v0)
+// 0x0105c8b8: 0x105c8b8: sw    zero, 9636(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2293
+	ldc.i4 2409
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c8ac: 0x105c8ac: lui   v0, 0x70000
+// 0x0105c8bc: 0x105c8bc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c8b0: 0x105c8b0: lw    a2, 84(sp)
+// 0x0105c8c0: 0x105c8c0: lw    a2, 84(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7677,40 +7677,40 @@ L_105c880:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105c8b4: 0x105c8b4: sw    zero, 9176(v0)
+// 0x0105c8c4: 0x105c8c4: sw    zero, 9640(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2294
+	ldc.i4 2410
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c8b8: 0x105c8b8: lui   a0, 0x1050000
+// 0x0105c8c8: 0x105c8c8: lui   a0, 0x1050000
 	ldc.i4 17104896
 	stloc.1
-// 0x0105c8bc: 0x105c8bc: lui   a3, 0x70000
+// 0x0105c8cc: 0x105c8cc: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105c8c0: 0x105c8c0: lui   v0, 0x70000
+// 0x0105c8d0: 0x105c8d0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c8c4: 0x105c8c4: addiu a0, a0, 25676
+// 0x0105c8d4: 0x105c8d4: addiu a0, a0, 25692
 	ldloc.1
-	ldc.i4 25676
+	ldc.i4 25692
 	add
 	stloc.1
-// 0x0105c8c8: 0x105c8c8: addiu a3, a3, 10740
+// 0x0105c8d8: 0x105c8d8: addiu a3, a3, 11204
 	ldloc 4
-	ldc.i4 10740
+	ldc.i4 11204
 	add
 	stloc 4
-// 0x0105c8cc: 0x105c8cc: addiu v0, v0, 10732
+// 0x0105c8dc: 0x105c8dc: addiu v0, v0, 11196
 	ldloc 5
-	ldc.i4 10732
+	ldc.i4 11196
 	add
 	stloc 5
-// 0x0105c8d0: 0x105c8d0: jal   0x105d848 sw    v0, 16(sp)
+// 0x0105c8e0: 0x105c8e0: jal   0x105d858 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7724,12 +7724,12 @@ L_105c880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_prepare_segments_105d848(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_prepare_segments_105d858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c8d8: 0x105c8d8: lw    a3, 76(sp)
+// 0x0105c8e8: 0x105c8e8: lw    a3, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7738,7 +7738,7 @@ L_105c880:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105c8dc: 0x105c8dc: lw    v0, 80(sp)
+// 0x0105c8ec: 0x105c8ec: lw    v0, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7747,63 +7747,63 @@ L_105c880:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c8e0: 0x105c8e0: addu  v1, a3, zero
+// 0x0105c8f0: 0x105c8f0: addu  v1, a3, zero
 	ldloc 4
 	stloc 6
-// 0x0105c8e4: 0x105c8e4: addu  a1, zero, zero
+// 0x0105c8f4: 0x105c8f4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105c8e8: 0x105c8e8: addu  a0, zero, zero
+// 0x0105c8f8: 0x105c8f8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105c8ec: 0x105c8ec: j	 0x105c908 addu  a2, zero, zero
+// 0x0105c8fc: 0x105c8fc: j	 0x105c918 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_105c908
+	br L_105c918
 // --- basic block ---
-L_105c8f4:
-// 0x0105c8f4: 0x105c8f4: lh    t1, -10(v1)
+L_105c904:
+// 0x0105c904: 0x105c904: lh    t1, -10(v1)
 	ldloc 6
 	ldc.i4.s -10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 15
-// 0x0105c8f8: 0x105c8f8: lh    t0, -8(v1)
+// 0x0105c908: 0x105c908: lh    t0, -8(v1)
 	ldloc 6
 	ldc.i4.s -8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 10
-// 0x0105c8fc: 0x105c8fc: addu  a1, a1, t1
+// 0x0105c90c: 0x105c90c: addu  a1, a1, t1
 	ldloc.2
 	ldloc 15
 	add
 	stloc.2
-// 0x0105c900: 0x105c900: addu  a2, a2, t0
+// 0x0105c910: 0x105c910: addu  a2, a2, t0
 	ldloc.3
 	ldloc 10
 	add
 	stloc.3
-// 0x0105c904: 0x105c904: addiu a0, a0, 1
+// 0x0105c914: 0x105c914: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-L_105c908:
-// 0x0105c908: 0x105c908: slt   t0, a0, v0
+L_105c918:
+// 0x0105c918: 0x105c918: slt   t0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 10
-// 0x0105c90c: 0x105c90c: bne   t0, zero, 0x105c8f4 addiu v1, v1, 56
+// 0x0105c91c: 0x105c91c: bne   t0, zero, 0x105c904 addiu v1, v1, 56
 	ldloc 10
 	ldloc 6
 	ldc.i4.s 56
 	add
 	stloc 6
-	brtrue L_105c8f4
+	brtrue L_105c904
 // --- basic block ---
-// 0x0105c914: 0x105c914: lw    a0, 68(sp)
+// 0x0105c924: 0x105c924: lw    a0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7812,10 +7812,10 @@ L_105c908:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105c918: 0x105c918: addiu v1, zero, 1
+// 0x0105c928: 0x105c928: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0105c91c: 0x105c91c: sw    v0, 20(sp)
+// 0x0105c92c: 0x105c92c: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7824,7 +7824,7 @@ L_105c908:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c920: 0x105c920: sw    v1, 36(sp)
+// 0x0105c930: 0x105c930: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7833,7 +7833,7 @@ L_105c908:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105c924: 0x105c924: sw    v0, 16(sp)
+// 0x0105c934: 0x105c934: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7842,7 +7842,7 @@ L_105c908:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105c928: 0x105c928: sw    zero, 24(sp)
+// 0x0105c938: 0x105c938: sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7851,7 +7851,7 @@ L_105c908:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c92c: 0x105c92c: sw    zero, 28(sp)
+// 0x0105c93c: 0x105c93c: sw    zero, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7860,7 +7860,7 @@ L_105c908:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105c930: 0x105c930: jal   0x105bd58 sw    zero, 32(sp)
+// 0x0105c940: 0x105c940: jal   0x105bd68 sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7874,20 +7874,20 @@ L_105c908:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_on_route_105bd58(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_on_route_105bd68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105c938: 0x105c938: addu  v1, zero, zero
+// 0x0105c948: 0x105c948: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_105c93c:
-// 0x0105c93c: 0x105c93c: lw    ra, 140(sp)
-// 0x0105c940: 0x105c940: addu  v0, v1, zero
+L_105c94c:
+// 0x0105c94c: 0x105c94c: lw    ra, 140(sp)
+// 0x0105c950: 0x105c950: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x0105c944: 0x105c944: lw    s4, 136(sp)
+// 0x0105c954: 0x105c954: lw    s4, 136(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7896,7 +7896,7 @@ L_105c93c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105c948: 0x105c948: lw    s3, 132(sp)
+// 0x0105c958: 0x105c958: lw    s3, 132(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7905,7 +7905,7 @@ L_105c93c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105c94c: 0x105c94c: lw    s2, 128(sp)
+// 0x0105c95c: 0x105c95c: lw    s2, 128(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7914,7 +7914,7 @@ L_105c93c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105c950: 0x105c950: lw    s1, 124(sp)
+// 0x0105c960: 0x105c960: lw    s1, 124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7923,7 +7923,7 @@ L_105c93c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105c954: 0x105c954: lw    s0, 120(sp)
+// 0x0105c964: 0x105c964: lw    s0, 120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7932,7 +7932,7 @@ L_105c93c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105c958: 0x105c958: jr    ra addiu sp, sp, 144
+// 0x0105c968: 0x105c968: jr    ra addiu sp, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
diff --git a/converted/Cibyl69.j b/converted/Cibyl69.j
index 686e502..4b5aea2 100644
--- a/converted/Cibyl69.j
+++ b/converted/Cibyl69.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl69::.ctor
 
-.method public static int32 navigate_main_route_105c960(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_route_105c970(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -76,45 +76,45 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105c960: 0x105c960: lui   v0, 0x70000
+// 0x0105c970: 0x105c970: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c964: 0x105c964: sb    zero, 9204(v0)
+// 0x0105c974: 0x105c974: sb    zero, 9668(v0)
 	ldloc 5
-	ldc.i4 9204
+	ldc.i4 9668
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105c968: 0x105c968: lui   v0, 0x70000
+// 0x0105c978: 0x105c978: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c96c: 0x105c96c: sb    zero, 9460(v0)
+// 0x0105c97c: 0x105c97c: sb    zero, 9924(v0)
 	ldloc 5
-	ldc.i4 9460
+	ldc.i4 9924
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105c970: 0x105c970: lui   v0, 0x70000
+// 0x0105c980: 0x105c980: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c974: 0x105c974: addiu sp, sp, -24
+// 0x0105c984: 0x105c984: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105c978: 0x105c978: sb    zero, 9484(v0)
+// 0x0105c988: 0x105c988: sb    zero, 9948(v0)
 	ldloc 5
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105c97c: 0x105c97c: lui   v0, 0x70000
+// 0x0105c98c: 0x105c98c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c980: 0x105c980: sw    ra, 20(sp)
-// 0x0105c984: 0x105c984: jal   0x105c348 sb    zero, 9740(v0)
+// 0x0105c990: 0x105c990: sw    ra, 20(sp)
+// 0x0105c994: 0x105c994: jal   0x105c358 sb    zero, 10204(v0)
 	ldloc 5
-	ldc.i4 9740
+	ldc.i4 10204
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -123,14 +123,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_calc_route_105c348(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_calc_route_105c358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0105c98c: 0x105c98c: lw    ra, 20(sp)
-// 0x0105c990: 0x105c990: sll   zero, zero, 0
-// 0x0105c994: 0x105c994: jr    ra addiu sp, sp, 24
+// 0x0105c99c: 0x105c99c: lw    ra, 20(sp)
+// 0x0105c9a0: 0x105c9a0: sll   zero, zero, 0
+// 0x0105c9a4: 0x105c9a4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -142,7 +142,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_resume_navigation_105c99c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_resume_navigation_105c9ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -180,16 +180,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105c99c: 0x105c99c: addiu sp, sp, -24
+// 0x0105c9ac: 0x105c9ac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105c9a0: 0x105c9a0: addiu v0, zero, 6
+// 0x0105c9b0: 0x105c9b0: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x0105c9a4: 0x105c9a4: sw    ra, 20(sp)
-// 0x0105c9a8: 0x105c9a8: beq   a0, v0, 0x105c9f0 sw    s0, 16(sp)
+// 0x0105c9b4: 0x105c9b4: sw    ra, 20(sp)
+// 0x0105c9b8: 0x105c9b8: beq   a0, v0, 0x105ca00 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -200,24 +200,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	beq  L_105c9f0
+	beq  L_105ca00
 // --- basic block ---
-// 0x0105c9b0: 0x105c9b0: addiu v0, zero, 3
+// 0x0105c9c0: 0x105c9c0: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0105c9b4: 0x105c9b4: beq   a0, v0, 0x105c9d8 lui   a0, 0x0
+// 0x0105c9c4: 0x105c9c4: beq   a0, v0, 0x105c9e8 lui   a0, 0x0
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	beq  L_105c9d8
+	beq  L_105c9e8
 // --- basic block ---
-// 0x0105c9bc: 0x105c9bc: addiu a0, a0, 14180
+// 0x0105c9cc: 0x105c9cc: addiu a0, a0, 14180
 	ldloc.1
 	ldc.i4 14180
 	add
 	stloc.1
-// 0x0105c9c0: 0x105c9c0: jal   0x100e610 addu  a1, zero, zero
+// 0x0105c9d0: 0x105c9d0: jal   0x100e620 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -225,12 +225,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c9c8: 0x105c9c8: jal   0x100ea50 addu  a0, zero, zero
+// 0x0105c9d8: 0x105c9d8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -238,36 +238,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105c9d0: 0x105c9d0: j	 0x105c9f4 lui   s0, 0x70000
+// 0x0105c9e0: 0x105c9e0: j	 0x105ca04 lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-	br L_105c9f4
+	br L_105ca04
 // --- basic block ---
-L_105c9d8:
-// 0x0105c9d8: 0x105c9d8: lui   v0, 0x70000
+L_105c9e8:
+// 0x0105c9e8: 0x105c9e8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105c9dc: 0x105c9dc: addiu v1, zero, 1
+// 0x0105c9ec: 0x105c9ec: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105c9e0: 0x105c9e0: sw    v1, 10372(v0)
+// 0x0105c9f0: 0x105c9f0: sw    v1, 10836(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2593
+	ldc.i4 2709
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105c9e4: 0x105c9e4: lui   v0, 0x0
+// 0x0105c9f4: 0x105c9f4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105c9e8: 0x105c9e8: jal   0x105c348 sw    zero, 14372(v0)
+// 0x0105c9f8: 0x105c9f8: jal   0x105c358 sw    zero, 14372(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -281,31 +281,31 @@ L_105c9d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_calc_route_105c348(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_calc_route_105c358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105c9f0:
-// 0x0105c9f0: 0x105c9f0: lui   s0, 0x70000
+L_105ca00:
+// 0x0105ca00: 0x105ca00: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-L_105c9f4:
-// 0x0105c9f4: 0x105c9f4: lw    v0, 10368(s0)
+L_105ca04:
+// 0x0105ca04: 0x105ca04: lw    v0, 10832(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2592
+	ldc.i4 2708
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105c9f8: 0x105c9f8: sll   zero, zero, 0
-// 0x0105c9fc: 0x105c9fc: beq   v0, zero, 0x105ca10 sll   zero, zero, 0
+// 0x0105ca08: 0x105ca08: sll   zero, zero, 0
+// 0x0105ca0c: 0x105ca0c: beq   v0, zero, 0x105ca20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105ca10
+	brfalse L_105ca20
 // --- basic block ---
-// 0x0105ca04: 0x105ca04: jalr  v0 sll   zero, zero, 0
+// 0x0105ca14: 0x105ca14: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -317,18 +317,18 @@ L_105c9f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ca0c: 0x105ca0c: sw    zero, 10368(s0)
+// 0x0105ca1c: 0x105ca1c: sw    zero, 10832(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 2592
+	ldc.i4 2708
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_105ca10:
-// 0x0105ca10: 0x105ca10: lw    ra, 20(sp)
-// 0x0105ca14: 0x105ca14: lw    s0, 16(sp)
+L_105ca20:
+// 0x0105ca20: 0x105ca20: lw    ra, 20(sp)
+// 0x0105ca24: 0x105ca24: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -337,7 +337,7 @@ L_105ca10:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105ca18: 0x105ca18: jr    ra addiu sp, sp, 24
+// 0x0105ca28: 0x105ca28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -349,7 +349,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_main_login_cb_105ca20(int32,int32,int32,int32,int32)
+.method public static int32 navigate_main_login_cb_105ca30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -384,31 +384,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105ca20: 0x105ca20: lui   v0, 0x70000
+// 0x0105ca30: 0x105ca30: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ca24: 0x105ca24: lw    v0, 9160(v0)
+// 0x0105ca34: 0x105ca34: lw    v0, 9624(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2290
+	ldc.i4 2406
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ca28: 0x105ca28: addiu sp, sp, -32
+// 0x0105ca38: 0x105ca38: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0105ca2c: 0x105ca2c: beq   v0, zero, 0x105ca40 sw    ra, 28(sp)
+// 0x0105ca3c: 0x105ca3c: beq   v0, zero, 0x105ca50 sw    ra, 28(sp)
 	ldloc 5
-	brfalse L_105ca40
+	brfalse L_105ca50
 // --- basic block ---
-// 0x0105ca34: 0x105ca34: addiu a0, zero, 6
+// 0x0105ca44: 0x105ca44: addiu a0, zero, 6
 	ldc.i4.6
 	stloc.1
-// 0x0105ca38: 0x105ca38: jal   0x105c99c addu  a1, zero, zero
+// 0x0105ca48: 0x105ca48: jal   0x105c9ac addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -416,18 +416,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_resume_navigation_105c99c(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_resume_navigation_105c9ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105ca40:
-// 0x0105ca40: 0x105ca40: lui   a0, 0x10000
+L_105ca50:
+// 0x0105ca50: 0x105ca50: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105ca44: 0x105ca44: jal   0x101cd60 addiu a0, a0, 11236
+// 0x0105ca54: 0x105ca54: jal   0x101cd70 addiu a0, a0, 11232
 	ldloc.1
-	ldc.i4 11236
+	ldc.i4 11232
 	add
 	stloc.1
 	ldloc.0
@@ -435,37 +435,37 @@ L_105ca40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ca4c: 0x105ca4c: lui   a0, 0x10000
+// 0x0105ca5c: 0x105ca5c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105ca50: 0x105ca50: lui   a3, 0x1060000
+// 0x0105ca60: 0x105ca60: lui   a3, 0x1060000
 	ldc.i4 17170432
 	stloc 4
-// 0x0105ca54: 0x105ca54: addu  a1, v0, zero
+// 0x0105ca64: 0x105ca64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105ca58: 0x105ca58: addiu a0, a0, 11332
+// 0x0105ca68: 0x105ca68: addiu a0, a0, 11328
 	ldloc.1
-	ldc.i4 11332
+	ldc.i4 11328
 	add
 	stloc.1
-// 0x0105ca5c: 0x105ca5c: addiu v0, zero, 5
+// 0x0105ca6c: 0x105ca6c: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x0105ca60: 0x105ca60: addiu a3, a3, -13924
+// 0x0105ca70: 0x105ca70: addiu a3, a3, -13908
 	ldloc 4
-	ldc.i4 -13924
+	ldc.i4 -13908
 	add
 	stloc 4
-// 0x0105ca64: 0x105ca64: addiu a2, zero, 1
+// 0x0105ca74: 0x105ca74: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0105ca68: 0x105ca68: sw    v0, 20(sp)
+// 0x0105ca78: 0x105ca78: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -474,7 +474,7 @@ L_105ca40:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ca6c: 0x105ca6c: jal   0x104c2dc sw    zero, 16(sp)
+// 0x0105ca7c: 0x105ca7c: jal   0x104c2ec sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -488,14 +488,14 @@ L_105ca40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_timeout_104c2dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_timeout_104c2ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ca74: 0x105ca74: lw    ra, 28(sp)
-// 0x0105ca78: 0x105ca78: sll   zero, zero, 0
-// 0x0105ca7c: 0x105ca7c: jr    ra addiu sp, sp, 32
+// 0x0105ca84: 0x105ca84: lw    ra, 28(sp)
+// 0x0105ca88: 0x105ca88: sll   zero, zero, 0
+// 0x0105ca8c: 0x105ca8c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -507,7 +507,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 main_navigator_105ca84(int32,int32,int32,int32,int32)
+.method public static int32 main_navigator_105ca94(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s2,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 ra)
@@ -551,12 +551,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105ca84: 0x105ca84: addiu sp, sp, -32
+// 0x0105ca94: 0x105ca94: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0105ca88: 0x105ca88: sw    s1, 20(sp)
+// 0x0105ca98: 0x105ca98: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -565,13 +565,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105ca8c: 0x105ca8c: addu  s1, a0, zero
+// 0x0105ca9c: 0x105ca9c: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0105ca90: 0x105ca90: lui   a0, 0x10000
+// 0x0105caa0: 0x105caa0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105ca94: 0x105ca94: sw    s0, 16(sp)
+// 0x0105caa4: 0x105caa4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -580,19 +580,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105ca98: 0x105ca98: addiu a0, a0, -29748
+// 0x0105caa8: 0x105caa8: addiu a0, a0, -29748
 	ldloc.1
 	ldc.i4 -29748
 	add
 	stloc.1
-// 0x0105ca9c: 0x105ca9c: addu  s0, a1, zero
+// 0x0105caac: 0x105caac: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0105caa0: 0x105caa0: addu  a1, s1, zero
+// 0x0105cab0: 0x105cab0: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0105caa4: 0x105caa4: sw    ra, 28(sp)
-// 0x0105caa8: 0x105caa8: jal   0x101f76c sw    s2, 24(sp)
+// 0x0105cab4: 0x105cab4: sw    ra, 28(sp)
+// 0x0105cab8: 0x105cab8: jal   0x101f77c sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -606,15 +606,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x0105cab0: 0x105cab0: lui   s2, 0x70000
+// 0x0105cac0: 0x105cac0: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105cab4: 0x105cab4: lw    a1, 12(s0)
+// 0x0105cac4: 0x105cac4: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -623,17 +623,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105cab8: 0x105cab8: addiu a0, s2, 9204
+// 0x0105cac8: 0x105cac8: addiu a0, s2, 9668
 	ldloc 5
-	ldc.i4 9204
+	ldc.i4 9668
 	add
 	stloc.1
-// 0x0105cabc: 0x105cabc: addiu a2, zero, 256
+// 0x0105cacc: 0x105cacc: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0105cac0: 0x105cac0: jal   0x1001af8 addiu s2, s2, 9204
+// 0x0105cad0: 0x105cad0: jal   0x1001af8 addiu s2, s2, 9668
 	ldloc 5
-	ldc.i4 9204
+	ldc.i4 9668
 	add
 	stloc 5
 	ldloc.1
@@ -642,13 +642,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 8
 // --- basic block ---
-// 0x0105cac8: 0x105cac8: sb    zero, 255(s2)
+// 0x0105cad8: 0x105cad8: sb    zero, 255(s2)
 	ldloc 5
 	ldc.i4 255
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105cacc: 0x105cacc: lw    a1, 16(s0)
+// 0x0105cadc: 0x105cadc: lw    a1, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -657,20 +657,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105cad0: 0x105cad0: lui   s2, 0x70000
+// 0x0105cae0: 0x105cae0: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105cad4: 0x105cad4: addiu a0, s2, 9460
+// 0x0105cae4: 0x105cae4: addiu a0, s2, 9924
 	ldloc 5
-	ldc.i4 9460
+	ldc.i4 9924
 	add
 	stloc.1
-// 0x0105cad8: 0x105cad8: addiu a2, zero, 24
+// 0x0105cae8: 0x105cae8: addiu a2, zero, 24
 	ldc.i4.s 24
 	stloc.3
-// 0x0105cadc: 0x105cadc: jal   0x1001af8 addiu s2, s2, 9460
+// 0x0105caec: 0x105caec: jal   0x1001af8 addiu s2, s2, 9924
 	ldloc 5
-	ldc.i4 9460
+	ldc.i4 9924
 	add
 	stloc 5
 	ldloc.1
@@ -679,13 +679,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 8
 // --- basic block ---
-// 0x0105cae4: 0x105cae4: sb    zero, 23(s2)
+// 0x0105caf4: 0x105caf4: sb    zero, 23(s2)
 	ldloc 5
 	ldc.i4.s 23
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105cae8: 0x105cae8: lw    a1, 8(s0)
+// 0x0105caf8: 0x105caf8: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -694,20 +694,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105caec: 0x105caec: lui   s2, 0x70000
+// 0x0105cafc: 0x105cafc: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105caf0: 0x105caf0: addiu a0, s2, 9484
+// 0x0105cb00: 0x105cb00: addiu a0, s2, 9948
 	ldloc 5
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	stloc.1
-// 0x0105caf4: 0x105caf4: addiu a2, zero, 256
+// 0x0105cb04: 0x105cb04: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0105caf8: 0x105caf8: jal   0x1001af8 addiu s2, s2, 9484
+// 0x0105cb08: 0x105cb08: jal   0x1001af8 addiu s2, s2, 9948
 	ldloc 5
-	ldc.i4 9484
+	ldc.i4 9948
 	add
 	stloc 5
 	ldloc.1
@@ -716,33 +716,33 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 8
 // --- basic block ---
-// 0x0105cb00: 0x105cb00: sb    zero, 255(s2)
+// 0x0105cb10: 0x105cb10: sb    zero, 255(s2)
 	ldloc 5
 	ldc.i4 255
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105cb04: 0x105cb04: lw    a1, 0(s0)
+// 0x0105cb14: 0x105cb14: lw    a1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0105cb08: 0x105cb08: lui   s2, 0x70000
+// 0x0105cb18: 0x105cb18: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105cb0c: 0x105cb0c: addiu a0, s2, 9740
+// 0x0105cb1c: 0x105cb1c: addiu a0, s2, 10204
 	ldloc 5
-	ldc.i4 9740
+	ldc.i4 10204
 	add
 	stloc.1
-// 0x0105cb10: 0x105cb10: addiu a2, zero, 256
+// 0x0105cb20: 0x105cb20: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0105cb14: 0x105cb14: jal   0x1001af8 addiu s2, s2, 9740
+// 0x0105cb24: 0x105cb24: jal   0x1001af8 addiu s2, s2, 10204
 	ldloc 5
-	ldc.i4 9740
+	ldc.i4 10204
 	add
 	stloc 5
 	ldloc.1
@@ -751,7 +751,7 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 8
 // --- basic block ---
-// 0x0105cb1c: 0x105cb1c: jal   0x105c348 sb    zero, 255(s2)
+// 0x0105cb2c: 0x105cb2c: jal   0x105c358 sb    zero, 255(s2)
 	ldloc 5
 	ldc.i4 255
 	add
@@ -762,25 +762,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_calc_route_105c348(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_calc_route_105c358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x0105cb24: 0x105cb24: addiu a0, zero, -1
+// 0x0105cb34: 0x105cb34: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0105cb28: 0x105cb28: beq   v0, a0, 0x105cb40 addiu v1, zero, -1
+// 0x0105cb38: 0x105cb38: beq   v0, a0, 0x105cb50 addiu v1, zero, -1
 	ldloc 8
 	ldloc.1
 	ldc.i4.m1
 	stloc 7
-	beq  L_105cb40
+	beq  L_105cb50
 // --- basic block ---
-// 0x0105cb30: 0x105cb30: addu  a0, s1, zero
+// 0x0105cb40: 0x105cb40: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0105cb34: 0x105cb34: jal   0x106b848 addu  a1, s0, zero
+// 0x0105cb44: 0x105cb44: jal   0x106be6c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -788,20 +788,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_ReportOnNavigation_106b848(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ReportOnNavigation_106be6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 8
 // --- basic block ---
-// 0x0105cb3c: 0x105cb3c: addu  v1, zero, zero
+// 0x0105cb4c: 0x105cb4c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_105cb40:
-// 0x0105cb40: 0x105cb40: lw    ra, 28(sp)
-// 0x0105cb44: 0x105cb44: addu  v0, v1, zero
+L_105cb50:
+// 0x0105cb50: 0x105cb50: lw    ra, 28(sp)
+// 0x0105cb54: 0x105cb54: addu  v0, v1, zero
 	ldloc 7
 	stloc 8
-// 0x0105cb48: 0x105cb48: lw    s2, 24(sp)
+// 0x0105cb58: 0x105cb58: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -810,7 +810,7 @@ L_105cb40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105cb4c: 0x105cb4c: lw    s1, 20(sp)
+// 0x0105cb5c: 0x105cb5c: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -819,7 +819,7 @@ L_105cb40:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105cb50: 0x105cb50: lw    s0, 16(sp)
+// 0x0105cb60: 0x105cb60: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -828,7 +828,7 @@ L_105cb40:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105cb54: 0x105cb54: jr    ra addiu sp, sp, 32
+// 0x0105cb64: 0x105cb64: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -840,7 +840,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 navigate_instr_has_more_connections_105cb5c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_has_more_connections_105cb6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -881,15 +881,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105cb5c: 0x105cb5c: addiu sp, sp, -312
+// 0x0105cb6c: 0x105cb6c: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x0105cb60: 0x105cb60: lui   v0, 0x0
+// 0x0105cb70: 0x105cb70: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0105cb64: 0x105cb64: sw    s0, 300(sp)
+// 0x0105cb74: 0x105cb74: sw    s0, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -898,7 +898,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105cb68: 0x105cb68: lw    v0, 576(v0)
+// 0x0105cb78: 0x105cb78: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -907,10 +907,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105cb6c: 0x105cb6c: addu  s0, a0, zero
+// 0x0105cb7c: 0x105cb7c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0105cb70: 0x105cb70: lw    a0, 24(a0)
+// 0x0105cb80: 0x105cb80: lw    a0, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -919,7 +919,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105cb74: 0x105cb74: sw    s1, 304(sp)
+// 0x0105cb84: 0x105cb84: sw    s1, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -928,74 +928,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105cb78: 0x105cb78: sw    ra, 308(sp)
-// 0x0105cb7c: 0x105cb7c: beq   a0, v0, 0x105cb94 addu  s1, a1, zero
+// 0x0105cb88: 0x105cb88: sw    ra, 308(sp)
+// 0x0105cb8c: 0x105cb8c: beq   a0, v0, 0x105cba4 addu  s1, a1, zero
 	ldloc.1
 	ldloc 6
 	ldloc.2
 	stloc 9
-	beq  L_105cb94
+	beq  L_105cba4
 // --- basic block ---
-// 0x0105cb84: 0x105cb84: bltz  a0, 0x105cb94 sll   zero, zero, 0
+// 0x0105cb94: 0x105cb94: bltz  a0, 0x105cba4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105cb94
+	blt L_105cba4
 // --- basic block ---
-// 0x0105cb8c: 0x105cb8c: jal   0x100b164 sll   zero, zero, 0
+// 0x0105cb9c: 0x105cb9c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_105cb94:
-// 0x0105cb94: 0x105cb94: lb    a1, 50(s0)
+L_105cba4:
+// 0x0105cba4: 0x105cba4: lb    a1, 50(s0)
 	ldloc 8
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0105cb98: 0x105cb98: addiu v1, zero, 1
+// 0x0105cba8: 0x105cba8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105cb9c: 0x105cb9c: lh    a0, 36(s0)
+// 0x0105cbac: 0x105cbac: lh    a0, 36(s0)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105cba0: 0x105cba0: addiu a2, sp, 36
+// 0x0105cbb0: 0x105cbb0: addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.3
-// 0x0105cba4: 0x105cba4: bne   a1, v1, 0x105cbb4 addiu v0, sp, 32
+// 0x0105cbb4: 0x105cbb4: bne   a1, v1, 0x105cbc4 addiu v0, sp, 32
 	ldloc.2
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-	bne.un L_105cbb4
+	bne.un L_105cbc4
 // --- basic block ---
-// 0x0105cbac: 0x105cbac: j	 0x105cbbc addu  a1, v0, zero
+// 0x0105cbbc: 0x105cbbc: j	 0x105cbcc addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-	br L_105cbbc
+	br L_105cbcc
 // --- basic block ---
-L_105cbb4:
-// 0x0105cbb4: 0x105cbb4: addu  a1, a2, zero
+L_105cbc4:
+// 0x0105cbc4: 0x105cbc4: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x0105cbb8: 0x105cbb8: addu  a2, v0, zero
+// 0x0105cbc8: 0x105cbc8: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-L_105cbbc:
-// 0x0105cbbc: 0x105cbbc: jal   0x1003adc sll   zero, zero, 0
+L_105cbcc:
+// 0x0105cbcc: 0x105cbcc: jal   0x1003adc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -1004,13 +1004,13 @@ L_105cbbc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105cbc4: 0x105cbc4: lb    a2, 50(s0)
+// 0x0105cbd4: 0x105cbd4: lb    a2, 50(s0)
 	ldloc 8
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0105cbc8: 0x105cbc8: lw    a0, 24(s0)
+// 0x0105cbd8: 0x105cbd8: lw    a0, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1019,23 +1019,23 @@ L_105cbbc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105cbcc: 0x105cbcc: lh    a1, 36(s0)
+// 0x0105cbdc: 0x105cbdc: lh    a1, 36(s0)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.2
-// 0x0105cbd0: 0x105cbd0: addiu v0, sp, 40
+// 0x0105cbe0: 0x105cbe0: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 6
-// 0x0105cbd4: 0x105cbd4: xori  a2, a2, 1
+// 0x0105cbe4: 0x105cbe4: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x0105cbd8: 0x105cbd8: lw    a3, 36(sp)
+// 0x0105cbe8: 0x105cbe8: lw    a3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1044,7 +1044,7 @@ L_105cbbc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105cbdc: 0x105cbdc: sw    v0, 16(sp)
+// 0x0105cbec: 0x105cbec: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1053,15 +1053,15 @@ L_105cbbc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105cbe0: 0x105cbe0: sltu  a2, zero, a2
+// 0x0105cbf0: 0x105cbf0: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x0105cbe4: 0x105cbe4: addiu v0, zero, 16
+// 0x0105cbf4: 0x105cbf4: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 6
-// 0x0105cbe8: 0x105cbe8: sw    v0, 20(sp)
+// 0x0105cbf8: 0x105cbf8: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1070,7 +1070,7 @@ L_105cbbc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105cbec: 0x105cbec: sw    zero, 24(sp)
+// 0x0105cbfc: 0x105cbfc: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1079,7 +1079,7 @@ L_105cbbc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105cbf0: 0x105cbf0: jal   0x106104c sw    zero, 28(sp)
+// 0x0105cc00: 0x105cc00: jal   0x106105c sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1093,23 +1093,23 @@ L_105cbbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::get_connected_segments_106104c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::get_connected_segments_106105c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105cbf8: 0x105cbf8: addiu v1, sp, 44
+// 0x0105cc08: 0x105cc08: addiu v1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 7
-// 0x0105cbfc: 0x105cbfc: j	 0x105cc54 addu  a0, zero, zero
+// 0x0105cc0c: 0x105cc0c: j	 0x105cc64 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_105cc54
+	br L_105cc64
 // --- basic block ---
-L_105cc04:
-// 0x0105cc04: 0x105cc04: lw    a1, -4(v1)
+L_105cc14:
+// 0x0105cc14: 0x105cc14: lw    a1, -4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1118,7 +1118,7 @@ L_105cc04:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105cc08: 0x105cc08: lw    a2, 24(s0)
+// 0x0105cc18: 0x105cc18: lw    a2, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1127,37 +1127,37 @@ L_105cc04:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105cc0c: 0x105cc0c: sll   zero, zero, 0
-// 0x0105cc10: 0x105cc10: bne   a1, a2, 0x105cc2c addiu a0, a0, 1
+// 0x0105cc1c: 0x105cc1c: sll   zero, zero, 0
+// 0x0105cc20: 0x105cc20: bne   a1, a2, 0x105cc3c addiu a0, a0, 1
 	ldloc.2
 	ldloc.3
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	bne.un L_105cc2c
+	bne.un L_105cc3c
 // --- basic block ---
-// 0x0105cc18: 0x105cc18: lw    a3, 0(v1)
+// 0x0105cc28: 0x105cc28: lw    a3, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0105cc1c: 0x105cc1c: lh    a2, 36(s0)
+// 0x0105cc2c: 0x105cc2c: lh    a2, 36(s0)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x0105cc20: 0x105cc20: sll   zero, zero, 0
-// 0x0105cc24: 0x105cc24: beq   a3, a2, 0x105cc50 sll   zero, zero, 0
+// 0x0105cc30: 0x105cc30: sll   zero, zero, 0
+// 0x0105cc34: 0x105cc34: beq   a3, a2, 0x105cc60 sll   zero, zero, 0
 	ldloc 4
 	ldloc.3
-	beq  L_105cc50
+	beq  L_105cc60
 // --- basic block ---
-L_105cc2c:
-// 0x0105cc2c: 0x105cc2c: lw    a2, 24(s1)
+L_105cc3c:
+// 0x0105cc3c: 0x105cc3c: lw    a2, 24(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1166,59 +1166,59 @@ L_105cc2c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105cc30: 0x105cc30: sll   zero, zero, 0
-// 0x0105cc34: 0x105cc34: bne   a1, a2, 0x105cc68 sll   zero, zero, 0
+// 0x0105cc40: 0x105cc40: sll   zero, zero, 0
+// 0x0105cc44: 0x105cc44: bne   a1, a2, 0x105cc78 sll   zero, zero, 0
 	ldloc.2
 	ldloc.3
-	bne.un L_105cc68
+	bne.un L_105cc78
 // --- basic block ---
-// 0x0105cc3c: 0x105cc3c: lw    a2, 0(v1)
+// 0x0105cc4c: 0x105cc4c: lw    a2, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0105cc40: 0x105cc40: lh    a1, 36(s1)
+// 0x0105cc50: 0x105cc50: lh    a1, 36(s1)
 	ldloc 9
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.2
-// 0x0105cc44: 0x105cc44: sll   zero, zero, 0
-// 0x0105cc48: 0x105cc48: bne   a2, a1, 0x105cc68 sll   zero, zero, 0
+// 0x0105cc54: 0x105cc54: sll   zero, zero, 0
+// 0x0105cc58: 0x105cc58: bne   a2, a1, 0x105cc78 sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	bne.un L_105cc68
+	bne.un L_105cc78
 // --- basic block ---
-L_105cc50:
-// 0x0105cc50: 0x105cc50: addiu v1, v1, 16
+L_105cc60:
+// 0x0105cc60: 0x105cc60: addiu v1, v1, 16
 	ldloc 7
 	ldc.i4.s 16
 	add
 	stloc 7
-L_105cc54:
-// 0x0105cc54: 0x105cc54: slt   a1, a0, v0
+L_105cc64:
+// 0x0105cc64: 0x105cc64: slt   a1, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.2
-// 0x0105cc58: 0x105cc58: bne   a1, zero, 0x105cc04 sll   zero, zero, 0
+// 0x0105cc68: 0x105cc68: bne   a1, zero, 0x105cc14 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_105cc04
+	brtrue L_105cc14
 // --- basic block ---
-// 0x0105cc60: 0x105cc60: j	 0x105cc6c addu  v0, zero, zero
+// 0x0105cc70: 0x105cc70: j	 0x105cc7c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_105cc6c
+	br L_105cc7c
 // --- basic block ---
-L_105cc68:
-// 0x0105cc68: 0x105cc68: addiu v0, zero, 1
+L_105cc78:
+// 0x0105cc78: 0x105cc78: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_105cc6c:
-// 0x0105cc6c: 0x105cc6c: lw    ra, 308(sp)
-// 0x0105cc70: 0x105cc70: lw    s1, 304(sp)
+L_105cc7c:
+// 0x0105cc7c: 0x105cc7c: lw    ra, 308(sp)
+// 0x0105cc80: 0x105cc80: lw    s1, 304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1227,7 +1227,7 @@ L_105cc6c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105cc74: 0x105cc74: lw    s0, 300(sp)
+// 0x0105cc84: 0x105cc84: lw    s0, 300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1236,7 +1236,7 @@ L_105cc6c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105cc78: 0x105cc78: jr    ra addiu sp, sp, 312
+// 0x0105cc88: 0x105cc88: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
@@ -1248,7 +1248,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 lo,int32 ra,int32 t0)
@@ -1316,22 +1316,22 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105cc80: 0x105cc80: addiu sp, sp, -80
+// 0x0105cc90: 0x105cc90: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0105cc84: 0x105cc84: lui   v0, 0x0
+// 0x0105cc94: 0x105cc94: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0105cc88: 0x105cc88: lw    t0, 0(a0)
+// 0x0105cc98: 0x105cc98: lw    t0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 19
-// 0x0105cc8c: 0x105cc8c: lw    a3, 4(a0)
+// 0x0105cc9c: 0x105cc9c: lw    a3, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1340,7 +1340,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105cc90: 0x105cc90: lw    a2, 8(a0)
+// 0x0105cca0: 0x105cca0: lw    a2, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1349,7 +1349,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105cc94: 0x105cc94: lw    v1, 12(a0)
+// 0x0105cca4: 0x105cca4: lw    v1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1358,7 +1358,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105cc98: 0x105cc98: sw    s0, 40(sp)
+// 0x0105cca8: 0x105cca8: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1367,7 +1367,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105cc9c: 0x105cc9c: lw    v0, 576(v0)
+// 0x0105ccac: 0x105ccac: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1376,10 +1376,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105cca0: 0x105cca0: addu  s0, a0, zero
+// 0x0105ccb0: 0x105ccb0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0105cca4: 0x105cca4: lw    a0, 24(a0)
+// 0x0105ccb4: 0x105ccb4: lw    a0, 24(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -1388,8 +1388,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105cca8: 0x105cca8: sw    ra, 76(sp)
-// 0x0105ccac: 0x105ccac: sw    s8, 72(sp)
+// 0x0105ccb8: 0x105ccb8: sw    ra, 76(sp)
+// 0x0105ccbc: 0x105ccbc: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1398,7 +1398,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105ccb0: 0x105ccb0: sw    s7, 68(sp)
+// 0x0105ccc0: 0x105ccc0: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1407,7 +1407,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105ccb4: 0x105ccb4: sw    s6, 64(sp)
+// 0x0105ccc4: 0x105ccc4: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1416,7 +1416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105ccb8: 0x105ccb8: sw    s5, 60(sp)
+// 0x0105ccc8: 0x105ccc8: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1425,7 +1425,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105ccbc: 0x105ccbc: sw    s4, 56(sp)
+// 0x0105cccc: 0x105cccc: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1434,7 +1434,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105ccc0: 0x105ccc0: sw    s3, 52(sp)
+// 0x0105ccd0: 0x105ccd0: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1443,7 +1443,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105ccc4: 0x105ccc4: sw    s2, 48(sp)
+// 0x0105ccd4: 0x105ccd4: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1452,7 +1452,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105ccc8: 0x105ccc8: sw    s1, 44(sp)
+// 0x0105ccd8: 0x105ccd8: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1461,7 +1461,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105cccc: 0x105cccc: sw    t0, 16(sp)
+// 0x0105ccdc: 0x105ccdc: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1470,7 +1470,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0105ccd0: 0x105ccd0: sw    a3, 20(sp)
+// 0x0105cce0: 0x105cce0: sw    a3, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1479,7 +1479,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105ccd4: 0x105ccd4: sw    a2, 24(sp)
+// 0x0105cce4: 0x105cce4: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1488,7 +1488,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105ccd8: 0x105ccd8: beq   a0, v0, 0x105ccf4 sw    v1, 28(sp)
+// 0x0105cce8: 0x105cce8: beq   a0, v0, 0x105cd04 sw    v1, 28(sp)
 	ldloc.1
 	ldloc 6
 	ldloc 5
@@ -1499,14 +1499,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	beq  L_105ccf4
+	beq  L_105cd04
 // --- basic block ---
-// 0x0105cce0: 0x105cce0: bltz  a0, 0x105ccf4 sll   zero, zero, 0
+// 0x0105ccf0: 0x105ccf0: bltz  a0, 0x105cd04 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105ccf4
+	blt L_105cd04
 // --- basic block ---
-// 0x0105cce8: 0x105cce8: jal   0x100b164 sw    a1, 32(sp)
+// 0x0105ccf8: 0x105ccf8: jal   0x100b174 sw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1520,12 +1520,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105ccf0: 0x105ccf0: lw    a1, 32(sp)
+// 0x0105cd00: 0x105cd00: lw    a1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1534,24 +1534,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_105ccf4:
-// 0x0105ccf4: 0x105ccf4: lh    s1, 40(s0)
+L_105cd04:
+// 0x0105cd04: 0x105cd04: lh    s1, 40(s0)
 	ldloc 8
 	ldc.i4.s 40
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 9
-// 0x0105ccf8: 0x105ccf8: sll   zero, zero, 0
-// 0x0105ccfc: 0x105ccfc: bltz  s1, 0x105cdc4 addiu a0, sp, 16
+// 0x0105cd08: 0x105cd08: sll   zero, zero, 0
+// 0x0105cd0c: 0x105cd0c: bltz  s1, 0x105cdd4 addiu a0, sp, 16
 	ldloc 9
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
 	ldc.i4.s 0
-	blt L_105cdc4
+	blt L_105cdd4
 // --- basic block ---
-// 0x0105cd04: 0x105cd04: lw    v1, 16(s0)
+// 0x0105cd14: 0x105cd14: lw    v1, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1560,7 +1560,7 @@ L_105ccf4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105cd08: 0x105cd08: lw    v0, 20(s0)
+// 0x0105cd18: 0x105cd18: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1569,11 +1569,11 @@ L_105ccf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105cd0c: 0x105cd0c: bne   a1, zero, 0x105cd28 sll   zero, zero, 0
+// 0x0105cd1c: 0x105cd1c: bne   a1, zero, 0x105cd38 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_105cd28
+	brtrue L_105cd38
 // --- basic block ---
-// 0x0105cd14: 0x105cd14: sw    v1, 24(sp)
+// 0x0105cd24: 0x105cd24: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1582,7 +1582,7 @@ L_105ccf4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105cd18: 0x105cd18: sw    v0, 28(sp)
+// 0x0105cd28: 0x105cd28: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1591,24 +1591,24 @@ L_105ccf4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105cd1c: 0x105cd1c: addu  s6, s1, zero
+// 0x0105cd2c: 0x105cd2c: addu  s6, s1, zero
 	ldloc 9
 	stloc 14
-// 0x0105cd20: 0x105cd20: j	 0x105cd38 addiu s0, sp, 24
+// 0x0105cd30: 0x105cd30: j	 0x105cd48 addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-	br L_105cd38
+	br L_105cd48
 // --- basic block ---
-L_105cd28:
-// 0x0105cd28: 0x105cd28: lh    s6, 42(s0)
+L_105cd38:
+// 0x0105cd38: 0x105cd38: lh    s6, 42(s0)
 	ldloc 8
 	ldc.i4.s 42
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 14
-// 0x0105cd2c: 0x105cd2c: sw    v1, 16(sp)
+// 0x0105cd3c: 0x105cd3c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1617,7 +1617,7 @@ L_105cd28:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105cd30: 0x105cd30: sw    v0, 20(sp)
+// 0x0105cd40: 0x105cd40: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1626,36 +1626,36 @@ L_105cd28:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105cd34: 0x105cd34: addiu s0, sp, 16
+// 0x0105cd44: 0x105cd44: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-L_105cd38:
-// 0x0105cd38: 0x105cd38: sll   s3, s1, 2
+L_105cd48:
+// 0x0105cd48: 0x105cd48: sll   s3, s1, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 11
-// 0x0105cd3c: 0x105cd3c: addu  s2, zero, zero
+// 0x0105cd4c: 0x105cd4c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0105cd40: 0x105cd40: lui   s8, 0x0
+// 0x0105cd50: 0x105cd50: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x0105cd44: 0x105cd44: lui   s5, 0x0
+// 0x0105cd54: 0x105cd54: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x0105cd48: 0x105cd48: lui   s4, 0x0
+// 0x0105cd58: 0x105cd58: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x0105cd4c: 0x105cd4c: j	 0x105cdb4 lui   s7, 0x20000
+// 0x0105cd5c: 0x105cd5c: j	 0x105cdc4 lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 15
-	br L_105cdb4
+	br L_105cdc4
 // --- basic block ---
-L_105cd54:
-// 0x0105cd54: 0x105cd54: lw    v0, 576(s8)
+L_105cd64:
+// 0x0105cd64: 0x105cd64: lw    v0, 576(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -1664,7 +1664,7 @@ L_105cd54:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105cd58: 0x105cd58: lw    v1, 548(s5)
+// 0x0105cd68: 0x105cd68: lw    v1, 548(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -1673,17 +1673,17 @@ L_105cd54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105cd5c: 0x105cd5c: sll   zero, zero, 0
-// 0x0105cd60: 0x105cd60: beq   v0, v1, 0x105cd74 addiu s2, s2, 1
+// 0x0105cd6c: 0x105cd6c: sll   zero, zero, 0
+// 0x0105cd70: 0x105cd70: beq   v0, v1, 0x105cd84 addiu s2, s2, 1
 	ldloc 6
 	ldloc 7
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	beq  L_105cd74
+	beq  L_105cd84
 // --- basic block ---
-// 0x0105cd68: 0x105cd68: jal   0x100ae78 sw    v0, 548(s5)
+// 0x0105cd78: 0x105cd78: jal   0x100ae88 sw    v0, 548(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -1697,12 +1697,12 @@ L_105cd54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105cd70: 0x105cd70: sw    v0, 552(s4)
+// 0x0105cd80: 0x105cd80: sw    v0, 552(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -1711,17 +1711,17 @@ L_105cd54:
 	add
 	ldloc 6
 	stelem.i4
-L_105cd74:
-// 0x0105cd74: 0x105cd74: lw    v1, 31240(s7)
+L_105cd84:
+// 0x0105cd84: 0x105cd84: lw    v1, 31704(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105cd78: 0x105cd78: lw    v0, 552(s4)
+// 0x0105cd88: 0x105cd88: lw    v0, 552(s4)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -1730,34 +1730,34 @@ L_105cd74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105cd7c: 0x105cd7c: addu  v1, v1, s3
+// 0x0105cd8c: 0x105cd8c: addu  v1, v1, s3
 	ldloc 7
 	ldloc 11
 	add
 	stloc 7
-// 0x0105cd80: 0x105cd80: lh    a0, 2(v1)
+// 0x0105cd90: 0x105cd90: lh    a0, 2(v1)
 	ldloc 7
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105cd84: 0x105cd84: lh    a2, 0(v1)
+// 0x0105cd94: 0x105cd94: lh    a2, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x0105cd88: 0x105cd88: mult  a0, v0
+// 0x0105cd98: 0x105cd98: mult  a0, v0
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 17
-// 0x0105cd8c: 0x105cd8c: lw    v1, 0(s0)
+// 0x0105cd9c: 0x105cd9c: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105cd90: 0x105cd90: lw    a1, 4(s0)
+// 0x0105cda0: 0x105cda0: lw    a1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1766,20 +1766,20 @@ L_105cd74:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105cd94: 0x105cd94: addiu s3, s3, 4
+// 0x0105cda4: 0x105cda4: addiu s3, s3, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-// 0x0105cd98: 0x105cd98: mflo  lo
+// 0x0105cda8: 0x105cda8: mflo  lo
 	ldloc 17
 	stloc.1
-// 0x0105cd9c: 0x105cd9c: addu  a0, a1, a0
+// 0x0105cdac: 0x105cdac: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0105cda0: 0x105cda0: sw    a0, 4(s0)
+// 0x0105cdb0: 0x105cdb0: sw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1788,47 +1788,47 @@ L_105cd74:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105cda4: 0x105cda4: mult  a2, v0
+// 0x0105cdb4: 0x105cdb4: mult  a2, v0
 	ldloc.3
 	ldloc 6
 	mul
 	stloc 17
-// 0x0105cda8: 0x105cda8: mflo  lo
+// 0x0105cdb8: 0x105cdb8: mflo  lo
 	ldloc 17
 	stloc 6
-// 0x0105cdac: 0x105cdac: addu  v1, v1, v0
+// 0x0105cdbc: 0x105cdbc: addu  v1, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0105cdb0: 0x105cdb0: sw    v1, 0(s0)
+// 0x0105cdc0: 0x105cdc0: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_105cdb4:
-// 0x0105cdb4: 0x105cdb4: addu  v0, s2, s1
+L_105cdc4:
+// 0x0105cdc4: 0x105cdc4: addu  v0, s2, s1
 	ldloc 10
 	ldloc 9
 	add
 	stloc 6
-// 0x0105cdb8: 0x105cdb8: slt   v0, s6, v0
+// 0x0105cdc8: 0x105cdc8: slt   v0, s6, v0
 	ldloc 14
 	ldloc 6
 	clt
 	stloc 6
-// 0x0105cdbc: 0x105cdbc: beq   v0, zero, 0x105cd54 addiu a0, sp, 16
+// 0x0105cdcc: 0x105cdcc: beq   v0, zero, 0x105cd64 addiu a0, sp, 16
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	brfalse L_105cd54
+	brfalse L_105cd64
 // --- basic block ---
-L_105cdc4:
-// 0x0105cdc4: 0x105cdc4: jal   0x1009824 addiu a1, sp, 24
+L_105cdd4:
+// 0x0105cdd4: 0x105cdd4: jal   0x1009834 addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1838,13 +1838,13 @@ L_105cdc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105cdcc: 0x105cdcc: lw    ra, 76(sp)
-// 0x0105cdd0: 0x105cdd0: lw    s8, 72(sp)
+// 0x0105cddc: 0x105cddc: lw    ra, 76(sp)
+// 0x0105cde0: 0x105cde0: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1853,7 +1853,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105cdd4: 0x105cdd4: lw    s7, 68(sp)
+// 0x0105cde4: 0x105cde4: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1862,7 +1862,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105cdd8: 0x105cdd8: lw    s6, 64(sp)
+// 0x0105cde8: 0x105cde8: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1871,7 +1871,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105cddc: 0x105cddc: lw    s5, 60(sp)
+// 0x0105cdec: 0x105cdec: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1880,7 +1880,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105cde0: 0x105cde0: lw    s4, 56(sp)
+// 0x0105cdf0: 0x105cdf0: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1889,7 +1889,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105cde4: 0x105cde4: lw    s3, 52(sp)
+// 0x0105cdf4: 0x105cdf4: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1898,7 +1898,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105cde8: 0x105cde8: lw    s2, 48(sp)
+// 0x0105cdf8: 0x105cdf8: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1907,7 +1907,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105cdec: 0x105cdec: lw    s1, 44(sp)
+// 0x0105cdfc: 0x105cdfc: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1916,7 +1916,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105cdf0: 0x105cdf0: lw    s0, 40(sp)
+// 0x0105ce00: 0x105ce00: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1925,7 +1925,7 @@ L_105cdc4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105cdf4: 0x105cdf4: jr    ra addiu sp, sp, 80
+// 0x0105ce04: 0x105ce04: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -1937,7 +1937,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_instr_fill_segment_105cdfc(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_fill_segment_105ce0c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s3,int32 s2,int32 s1,int32 s0,int32 ra)
@@ -1984,10 +1984,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105cdfc: 0x105cdfc: lui   v0, 0x0
+// 0x0105ce0c: 0x105ce0c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0105ce00: 0x105ce00: lw    v0, 576(v0)
+// 0x0105ce10: 0x105ce10: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1996,12 +1996,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ce04: 0x105ce04: addiu sp, sp, -48
+// 0x0105ce14: 0x105ce14: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0105ce08: 0x105ce08: sw    s3, 40(sp)
+// 0x0105ce18: 0x105ce18: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2010,7 +2010,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105ce0c: 0x105ce0c: sw    s2, 36(sp)
+// 0x0105ce1c: 0x105ce1c: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2019,7 +2019,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105ce10: 0x105ce10: sw    s0, 28(sp)
+// 0x0105ce20: 0x105ce20: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2028,8 +2028,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105ce14: 0x105ce14: sw    ra, 44(sp)
-// 0x0105ce18: 0x105ce18: sw    s1, 32(sp)
+// 0x0105ce24: 0x105ce24: sw    ra, 44(sp)
+// 0x0105ce28: 0x105ce28: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2038,25 +2038,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105ce1c: 0x105ce1c: addu  s0, a0, zero
+// 0x0105ce2c: 0x105ce2c: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0105ce20: 0x105ce20: addu  s2, a1, zero
+// 0x0105ce30: 0x105ce30: addu  s2, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0105ce24: 0x105ce24: beq   a0, v0, 0x105ce44 addu  s3, a3, zero
+// 0x0105ce34: 0x105ce34: beq   a0, v0, 0x105ce54 addu  s3, a3, zero
 	ldloc.1
 	ldloc 7
 	ldloc 4
 	stloc 8
-	beq  L_105ce44
+	beq  L_105ce54
 // --- basic block ---
-// 0x0105ce2c: 0x105ce2c: bltz  a0, 0x105ce44 sll   zero, zero, 0
+// 0x0105ce3c: 0x105ce3c: bltz  a0, 0x105ce54 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105ce44
+	blt L_105ce54
 // --- basic block ---
-// 0x0105ce34: 0x105ce34: jal   0x100b164 sw    a2, 16(sp)
+// 0x0105ce44: 0x105ce44: jal   0x100b174 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2070,12 +2070,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105ce3c: 0x105ce3c: lw    a2, 16(sp)
+// 0x0105ce4c: 0x105ce4c: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2084,28 +2084,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105ce40: 0x105ce40: sll   zero, zero, 0
-L_105ce44:
-// 0x0105ce44: 0x105ce44: sltu  a2, zero, a2
+// 0x0105ce50: 0x105ce50: sll   zero, zero, 0
+L_105ce54:
+// 0x0105ce54: 0x105ce54: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x0105ce48: 0x105ce48: addiu a2, a2, 1
+// 0x0105ce58: 0x105ce58: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0105ce4c: 0x105ce4c: addu  a0, s2, zero
+// 0x0105ce5c: 0x105ce5c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0105ce50: 0x105ce50: sh    s2, 36(s3)
+// 0x0105ce60: 0x105ce60: sh    s2, 36(s3)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105ce54: 0x105ce54: sw    s0, 24(s3)
+// 0x0105ce64: 0x105ce64: sw    s0, 24(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2114,7 +2114,7 @@ L_105ce44:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105ce58: 0x105ce58: jal   0x1003b50 sb    a2, 50(s3)
+// 0x0105ce68: 0x105ce68: jal   0x1003b50 sb    a2, 50(s3)
 	ldloc 8
 	ldc.i4.s 50
 	add
@@ -2128,156 +2128,156 @@ L_105ce44:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0105ce60: 0x105ce60: sb    v0, 51(s3)
+// 0x0105ce70: 0x105ce70: sb    v0, 51(s3)
 	ldloc 8
 	ldc.i4.s 51
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105ce64: 0x105ce64: lui   v0, 0x20000
+// 0x0105ce74: 0x105ce74: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0105ce68: 0x105ce68: lw    v0, 31152(v0)
+// 0x0105ce78: 0x105ce78: lw    v0, 31616(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ce6c: 0x105ce6c: sll   s2, s2, 3
+// 0x0105ce7c: 0x105ce7c: sll   s2, s2, 3
 	ldloc 9
 	ldc.i4.3
 	shl
 	stloc 9
-// 0x0105ce70: 0x105ce70: addu  s2, v0, s2
+// 0x0105ce80: 0x105ce80: addu  s2, v0, s2
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-// 0x0105ce74: 0x105ce74: lhu   v0, 4(s2)
+// 0x0105ce84: 0x105ce84: lhu   v0, 4(s2)
 	ldloc 9
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x0105ce78: 0x105ce78: ori   a0, zero, 65535
+// 0x0105ce88: 0x105ce88: ori   a0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc.1
-// 0x0105ce7c: 0x105ce7c: beq   v0, a0, 0x105cea0 addiu v1, zero, -1
+// 0x0105ce8c: 0x105ce8c: beq   v0, a0, 0x105ceb0 addiu v1, zero, -1
 	ldloc 7
 	ldloc.1
 	ldc.i4.m1
 	stloc 6
-	beq  L_105cea0
+	beq  L_105ceb0
 // --- basic block ---
-// 0x0105ce84: 0x105ce84: lui   v1, 0x20000
+// 0x0105ce94: 0x105ce94: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0105ce88: 0x105ce88: lw    a0, 31240(v1)
+// 0x0105ce98: 0x105ce98: lw    a0, 31704(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ce8c: 0x105ce8c: sll   v1, v0, 2
+// 0x0105ce9c: 0x105ce9c: sll   v1, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0105ce90: 0x105ce90: addu  v1, a0, v1
+// 0x0105cea0: 0x105cea0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 6
 	add
 	stloc 6
-// 0x0105ce94: 0x105ce94: lw    s1, 0(v1)
+// 0x0105cea4: 0x105cea4: lw    s1, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0105ce98: 0x105ce98: addiu v1, v0, 1
+// 0x0105cea8: 0x105cea8: addiu v1, v0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0105ce9c: 0x105ce9c: addu  s1, v0, s1
+// 0x0105ceac: 0x105ceac: addu  s1, v0, s1
 	ldloc 7
 	ldloc 10
 	add
 	stloc 10
-L_105cea0:
-// 0x0105cea0: 0x105cea0: sh    s1, 42(s3)
+L_105ceb0:
+// 0x0105ceb0: 0x105ceb0: sh    s1, 42(s3)
 	ldloc 8
 	ldc.i4.s 42
 	add
 	ldloc 10
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105cea4: 0x105cea4: sh    v1, 40(s3)
+// 0x0105ceb4: 0x105ceb4: sh    v1, 40(s3)
 	ldloc 8
 	ldc.i4.s 40
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105cea8: 0x105cea8: lhu   v1, 0(s2)
+// 0x0105ceb8: 0x105ceb8: lhu   v1, 0(s2)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x0105ceac: 0x105ceac: lui   v0, 0x20000
+// 0x0105cebc: 0x105cebc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0105ceb0: 0x105ceb0: lw    a1, 31228(v0)
+// 0x0105cec0: 0x105cec0: lw    a1, 31692(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105ceb4: 0x105ceb4: andi  v1, v1, 32767
+// 0x0105cec4: 0x105cec4: andi  v1, v1, 32767
 	ldloc 6
 	ldc.i4 32767
 	and
 	stloc 6
-// 0x0105ceb8: 0x105ceb8: sll   v1, v1, 3
+// 0x0105cec8: 0x105cec8: sll   v1, v1, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x0105cebc: 0x105cebc: addu  v1, a1, v1
+// 0x0105cecc: 0x105cecc: addu  v1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x0105cec0: 0x105cec0: lw    v0, 0(v1)
+// 0x0105ced0: 0x105ced0: lw    v0, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105cec4: 0x105cec4: lhu   a0, 2(s2)
+// 0x0105ced4: 0x105ced4: lhu   a0, 2(s2)
 	ldloc 9
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x0105cec8: 0x105cec8: sw    v0, 0(s3)
+// 0x0105ced8: 0x105ced8: sw    v0, 0(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0105cecc: 0x105cecc: lw    v1, 4(v1)
+// 0x0105cedc: 0x105cedc: lw    v1, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2286,17 +2286,17 @@ L_105cea0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ced0: 0x105ced0: andi  a0, a0, 32767
+// 0x0105cee0: 0x105cee0: andi  a0, a0, 32767
 	ldloc.1
 	ldc.i4 32767
 	and
 	stloc.1
-// 0x0105ced4: 0x105ced4: sll   a0, a0, 3
+// 0x0105cee4: 0x105cee4: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0105ced8: 0x105ced8: sw    v1, 4(s3)
+// 0x0105cee8: 0x105cee8: sw    v1, 4(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2305,20 +2305,20 @@ L_105cea0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105cedc: 0x105cedc: addu  a0, a1, a0
+// 0x0105ceec: 0x105ceec: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0105cee0: 0x105cee0: lw    a1, 0(a0)
+// 0x0105cef0: 0x105cef0: lw    a1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0105cee4: 0x105cee4: lw    ra, 44(sp)
-// 0x0105cee8: 0x105cee8: sw    a1, 8(s3)
+// 0x0105cef4: 0x105cef4: lw    ra, 44(sp)
+// 0x0105cef8: 0x105cef8: sw    a1, 8(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2327,7 +2327,7 @@ L_105cea0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105ceec: 0x105ceec: lw    a0, 4(a0)
+// 0x0105cefc: 0x105cefc: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2336,7 +2336,7 @@ L_105cea0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105cef0: 0x105cef0: lw    s2, 36(sp)
+// 0x0105cf00: 0x105cf00: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2345,7 +2345,7 @@ L_105cea0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105cef4: 0x105cef4: sw    v1, 20(s3)
+// 0x0105cf04: 0x105cf04: sw    v1, 20(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2354,7 +2354,7 @@ L_105cea0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105cef8: 0x105cef8: sw    a0, 12(s3)
+// 0x0105cf08: 0x105cf08: sw    a0, 12(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2363,7 +2363,7 @@ L_105cea0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105cefc: 0x105cefc: sw    v0, 16(s3)
+// 0x0105cf0c: 0x105cf0c: sw    v0, 16(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2372,7 +2372,7 @@ L_105cea0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105cf00: 0x105cf00: lw    s1, 32(sp)
+// 0x0105cf10: 0x105cf10: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2381,7 +2381,7 @@ L_105cea0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105cf04: 0x105cf04: lw    s3, 40(sp)
+// 0x0105cf14: 0x105cf14: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2390,7 +2390,7 @@ L_105cea0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105cf08: 0x105cf08: lw    s0, 28(sp)
+// 0x0105cf18: 0x105cf18: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2399,7 +2399,7 @@ L_105cea0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105cf0c: 0x105cf0c: jr    ra addiu sp, sp, 48
+// 0x0105cf1c: 0x105cf1c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2411,7 +2411,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_instr_check_neighbours_105cf14(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_check_neighbours_105cf24(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s5,int32 s0,int32 s3,int32 s2,int32 s4,int32 s6,int32 s8,int32 s7,int32 ra,int32 t0,int32 t1)
@@ -2479,12 +2479,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105cf14: 0x105cf14: addiu sp, sp, -416
+// 0x0105cf24: 0x105cf24: addiu sp, sp, -416
 	ldloc.0
 	ldc.i4 -416
 	add
 	stloc.0
-// 0x0105cf18: 0x105cf18: sw    s3, 388(sp)
+// 0x0105cf28: 0x105cf28: sw    s3, 388(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2493,7 +2493,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105cf1c: 0x105cf1c: sw    s2, 384(sp)
+// 0x0105cf2c: 0x105cf2c: sw    s2, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2502,7 +2502,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105cf20: 0x105cf20: sw    s1, 380(sp)
+// 0x0105cf30: 0x105cf30: sw    s1, 380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2511,7 +2511,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105cf24: 0x105cf24: sw    s0, 376(sp)
+// 0x0105cf34: 0x105cf34: sw    s0, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2520,8 +2520,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105cf28: 0x105cf28: sw    ra, 412(sp)
-// 0x0105cf2c: 0x105cf2c: sw    s8, 408(sp)
+// 0x0105cf38: 0x105cf38: sw    ra, 412(sp)
+// 0x0105cf3c: 0x105cf3c: sw    s8, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2530,7 +2530,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105cf30: 0x105cf30: sw    s7, 404(sp)
+// 0x0105cf40: 0x105cf40: sw    s7, 404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2539,7 +2539,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105cf34: 0x105cf34: sw    s6, 400(sp)
+// 0x0105cf44: 0x105cf44: sw    s6, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2548,7 +2548,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105cf38: 0x105cf38: sw    s5, 396(sp)
+// 0x0105cf48: 0x105cf48: sw    s5, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2557,7 +2557,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105cf3c: 0x105cf3c: sw    s4, 392(sp)
+// 0x0105cf4c: 0x105cf4c: sw    s4, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2566,36 +2566,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105cf40: 0x105cf40: lb    v0, 50(a0)
+// 0x0105cf50: 0x105cf50: lb    v0, 50(a0)
 	ldloc.1
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105cf44: 0x105cf44: addiu v1, zero, 1
+// 0x0105cf54: 0x105cf54: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0105cf48: 0x105cf48: addu  s0, a0, zero
+// 0x0105cf58: 0x105cf58: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0105cf4c: 0x105cf4c: addu  s2, a1, zero
+// 0x0105cf5c: 0x105cf5c: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0105cf50: 0x105cf50: addiu s1, sp, 36
+// 0x0105cf60: 0x105cf60: addiu s1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-// 0x0105cf54: 0x105cf54: bne   v0, v1, 0x105cf78 addiu s3, sp, 32
+// 0x0105cf64: 0x105cf64: bne   v0, v1, 0x105cf88 addiu s3, sp, 32
 	ldloc 5
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 11
-	bne.un L_105cf78
+	bne.un L_105cf88
 // --- basic block ---
-// 0x0105cf5c: 0x105cf5c: jal   0x105cc80 addiu a1, zero, 1
+// 0x0105cf6c: 0x105cf6c: jal   0x105cc90 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2603,30 +2603,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105cf64: 0x105cf64: addu  s8, v0, zero
+// 0x0105cf74: 0x105cf74: addu  s8, v0, zero
 	ldloc 5
 	stloc 15
-// 0x0105cf68: 0x105cf68: lh    a0, 36(s0)
+// 0x0105cf78: 0x105cf78: lh    a0, 36(s0)
 	ldloc 10
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105cf6c: 0x105cf6c: addu  a1, s1, zero
+// 0x0105cf7c: 0x105cf7c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0105cf70: 0x105cf70: j	 0x105cf90 addu  a2, s3, zero
+// 0x0105cf80: 0x105cf80: j	 0x105cfa0 addu  a2, s3, zero
 	ldloc 11
 	stloc.3
-	br L_105cf90
+	br L_105cfa0
 // --- basic block ---
-L_105cf78:
-// 0x0105cf78: 0x105cf78: jal   0x105cc80 addu  a1, zero, zero
+L_105cf88:
+// 0x0105cf88: 0x105cf88: jal   0x105cc90 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2634,30 +2634,30 @@ L_105cf78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105cf80: 0x105cf80: lh    a0, 36(s0)
+// 0x0105cf90: 0x105cf90: lh    a0, 36(s0)
 	ldloc 10
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105cf84: 0x105cf84: addu  a1, s3, zero
+// 0x0105cf94: 0x105cf94: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0105cf88: 0x105cf88: addu  a2, s1, zero
+// 0x0105cf98: 0x105cf98: addu  a2, s1, zero
 	ldloc 8
 	stloc.3
-// 0x0105cf8c: 0x105cf8c: addiu s8, v0, 180
+// 0x0105cf9c: 0x105cf9c: addiu s8, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 15
-L_105cf90:
-// 0x0105cf90: 0x105cf90: jal   0x1003adc sll   zero, zero, 0
+L_105cfa0:
+// 0x0105cfa0: 0x105cfa0: jal   0x1003adc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -2666,23 +2666,23 @@ L_105cf90:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105cf98: 0x105cf98: lb    v1, 50(s2)
+// 0x0105cfa8: 0x105cfa8: lb    v1, 50(s2)
 	ldloc 12
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105cf9c: 0x105cf9c: addiu v0, zero, 1
+// 0x0105cfac: 0x105cfac: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105cfa0: 0x105cfa0: bne   v1, v0, 0x105cfb8 addu  a0, s2, zero
+// 0x0105cfb0: 0x105cfb0: bne   v1, v0, 0x105cfc8 addu  a0, s2, zero
 	ldloc 7
 	ldloc 5
 	ldloc 12
 	stloc.1
-	bne.un L_105cfb8
+	bne.un L_105cfc8
 // --- basic block ---
-// 0x0105cfa8: 0x105cfa8: jal   0x105cc80 addu  a1, zero, zero
+// 0x0105cfb8: 0x105cfb8: jal   0x105cc90 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2690,20 +2690,20 @@ L_105cf90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105cfb0: 0x105cfb0: j	 0x105cfc8 subu  s1, s8, v0
+// 0x0105cfc0: 0x105cfc0: j	 0x105cfd8 subu  s1, s8, v0
 	ldloc 15
 	ldloc 5
 	sub
 	stloc 8
-	br L_105cfc8
+	br L_105cfd8
 // --- basic block ---
-L_105cfb8:
-// 0x0105cfb8: 0x105cfb8: jal   0x105cc80 addiu a1, zero, 1
+L_105cfc8:
+// 0x0105cfc8: 0x105cfc8: jal   0x105cc90 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2711,134 +2711,134 @@ L_105cfb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105cfc0: 0x105cfc0: addiu v0, v0, 180
+// 0x0105cfd0: 0x105cfd0: addiu v0, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-// 0x0105cfc4: 0x105cfc4: subu  s1, s8, v0
+// 0x0105cfd4: 0x105cfd4: subu  s1, s8, v0
 	ldloc 15
 	ldloc 5
 	sub
 	stloc 8
-L_105cfc8:
-// 0x0105cfc8: 0x105cfc8: slti  v0, s1, 181
+L_105cfd8:
+// 0x0105cfd8: 0x105cfd8: slti  v0, s1, 181
 	ldloc 8
 	ldc.i4 181
 	clt
 	stloc 5
-// 0x0105cfcc: 0x105cfcc: beq   v0, zero, 0x105cfc8 addiu s1, s1, -360
+// 0x0105cfdc: 0x105cfdc: beq   v0, zero, 0x105cfd8 addiu s1, s1, -360
 	ldloc 5
 	ldloc 8
 	ldc.i4 -360
 	add
 	stloc 8
-	brfalse L_105cfc8
+	brfalse L_105cfd8
 // --- basic block ---
-// 0x0105cfd4: 0x105cfd4: addiu s1, s1, 360
+// 0x0105cfe4: 0x105cfe4: addiu s1, s1, 360
 	ldloc 8
 	ldc.i4 360
 	add
 	stloc 8
-// 0x0105cfd8: 0x105cfd8: j	 0x105cfe4 slti  v0, s1, -180
+// 0x0105cfe8: 0x105cfe8: j	 0x105cff4 slti  v0, s1, -180
 	ldloc 8
 	ldc.i4 -180
 	clt
 	stloc 5
-	br L_105cfe4
+	br L_105cff4
 // --- basic block ---
-L_105cfe0:
-// 0x0105cfe0: 0x105cfe0: slti  v0, s1, -180
+L_105cff0:
+// 0x0105cff0: 0x105cff0: slti  v0, s1, -180
 	ldloc 8
 	ldc.i4 -180
 	clt
 	stloc 5
-L_105cfe4:
-// 0x0105cfe4: 0x105cfe4: bne   v0, zero, 0x105cfe0 addiu s1, s1, 360
+L_105cff4:
+// 0x0105cff4: 0x105cff4: bne   v0, zero, 0x105cff0 addiu s1, s1, 360
 	ldloc 5
 	ldloc 8
 	ldc.i4 360
 	add
 	stloc 8
-	brtrue L_105cfe0
+	brtrue L_105cff0
 // --- basic block ---
-// 0x0105cfec: 0x105cfec: lh    a0, 38(s0)
+// 0x0105cffc: 0x105cffc: lh    a0, 38(s0)
 	ldloc 10
 	ldc.i4.s 38
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105cff0: 0x105cff0: lh    v1, 38(s2)
+// 0x0105d000: 0x105d000: lh    v1, 38(s2)
 	ldloc 12
 	ldc.i4.s 38
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x0105cff4: 0x105cff4: lb    s5, 51(s0)
+// 0x0105d004: 0x105d004: lb    s5, 51(s0)
 	ldloc 10
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 9
-// 0x0105cff8: 0x105cff8: lb    v0, 51(s2)
+// 0x0105d008: 0x105d008: lb    v0, 51(s2)
 	ldloc 12
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105cffc: 0x105cffc: beq   a0, v1, 0x105d010 addiu s1, s1, -360
+// 0x0105d00c: 0x105d00c: beq   a0, v1, 0x105d020 addiu s1, s1, -360
 	ldloc.1
 	ldloc 7
 	ldloc 8
 	ldc.i4 -360
 	add
 	stloc 8
-	beq  L_105d010
+	beq  L_105d020
 // --- basic block ---
-// 0x0105d004: 0x105d004: xor   s5, s5, v0
+// 0x0105d014: 0x105d014: xor   s5, s5, v0
 	ldloc 9
 	ldloc 5
 	xor
 	stloc 9
-// 0x0105d008: 0x105d008: j	 0x105d020 sltiu s5, s5, 1
+// 0x0105d018: 0x105d018: j	 0x105d030 sltiu s5, s5, 1
 	ldloc 9
 	ldc.i4.1
 	clt.un
 	stloc 9
-	br L_105d020
+	br L_105d030
 // --- basic block ---
-L_105d010:
-// 0x0105d010: 0x105d010: xor   s5, s5, v0
+L_105d020:
+// 0x0105d020: 0x105d020: xor   s5, s5, v0
 	ldloc 9
 	ldloc 5
 	xor
 	stloc 9
-// 0x0105d014: 0x105d014: sltu  s5, zero, s5
+// 0x0105d024: 0x105d024: sltu  s5, zero, s5
 	ldc.i4.s 0
 	ldloc 9
 	clt.un
 	stloc 9
-// 0x0105d018: 0x105d018: addiu v0, zero, 3
+// 0x0105d028: 0x105d028: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0105d01c: 0x105d01c: subu  s5, v0, s5
+// 0x0105d02c: 0x105d02c: subu  s5, v0, s5
 	ldloc 5
 	ldloc 9
 	sub
 	stloc 9
-L_105d020:
-// 0x0105d020: 0x105d020: lb    a2, 50(s0)
+L_105d030:
+// 0x0105d030: 0x105d030: lb    a2, 50(s0)
 	ldloc 10
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0105d024: 0x105d024: lw    a0, 24(s0)
+// 0x0105d034: 0x105d034: lw    a0, 24(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2847,23 +2847,23 @@ L_105d020:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105d028: 0x105d028: lh    a1, 36(s0)
+// 0x0105d038: 0x105d038: lh    a1, 36(s0)
 	ldloc 10
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.2
-// 0x0105d02c: 0x105d02c: addiu v1, sp, 96
+// 0x0105d03c: 0x105d03c: addiu v1, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 7
-// 0x0105d030: 0x105d030: xori  a2, a2, 1
+// 0x0105d040: 0x105d040: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x0105d034: 0x105d034: lw    a3, 32(sp)
+// 0x0105d044: 0x105d044: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2872,10 +2872,10 @@ L_105d020:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105d038: 0x105d038: addiu v0, zero, 1
+// 0x0105d048: 0x105d048: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105d03c: 0x105d03c: sw    v1, 16(sp)
+// 0x0105d04c: 0x105d04c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2884,15 +2884,15 @@ L_105d020:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d040: 0x105d040: sltu  a2, zero, a2
+// 0x0105d050: 0x105d050: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x0105d044: 0x105d044: addiu v1, zero, 16
+// 0x0105d054: 0x105d054: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 7
-// 0x0105d048: 0x105d048: sw    v1, 20(sp)
+// 0x0105d058: 0x105d058: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2901,7 +2901,7 @@ L_105d020:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d04c: 0x105d04c: sw    v0, 28(sp)
+// 0x0105d05c: 0x105d05c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2910,7 +2910,7 @@ L_105d020:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105d050: 0x105d050: jal   0x106104c sw    v0, 24(sp)
+// 0x0105d060: 0x105d060: jal   0x106105c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2924,12 +2924,12 @@ L_105d020:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::get_connected_segments_106104c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::get_connected_segments_106105c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d058: 0x105d058: sw    v0, 352(sp)
+// 0x0105d068: 0x105d068: sw    v0, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2938,7 +2938,7 @@ L_105d020:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105d05c: 0x105d05c: sw    zero, 36(sp)
+// 0x0105d06c: 0x105d06c: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2947,36 +2947,36 @@ L_105d020:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105d060: 0x105d060: addu  s3, s1, zero
+// 0x0105d070: 0x105d070: addu  s3, s1, zero
 	ldloc 8
 	stloc 11
-// 0x0105d064: 0x105d064: addu  s4, s1, zero
+// 0x0105d074: 0x105d074: addu  s4, s1, zero
 	ldloc 8
 	stloc 13
-// 0x0105d068: 0x105d068: j	 0x105d238 addiu s7, sp, 40
+// 0x0105d078: 0x105d078: j	 0x105d248 addiu s7, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 16
-	br L_105d238
+	br L_105d248
 // --- basic block ---
-L_105d070:
-// 0x0105d070: 0x105d070: sll   a0, v0, 4
+L_105d080:
+// 0x0105d080: 0x105d080: sll   a0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	shl
 	stloc.1
-// 0x0105d074: 0x105d074: addiu v1, sp, 32
+// 0x0105d084: 0x105d084: addiu v1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 7
-// 0x0105d078: 0x105d078: addu  a0, v1, a0
+// 0x0105d088: 0x105d088: addu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x0105d07c: 0x105d07c: lw    v1, 64(a0)
+// 0x0105d08c: 0x105d08c: lw    v1, 64(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2985,7 +2985,7 @@ L_105d070:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d080: 0x105d080: lw    v0, 24(s2)
+// 0x0105d090: 0x105d090: lw    v0, 24(s2)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2994,13 +2994,13 @@ L_105d070:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105d084: 0x105d084: lbu   a2, 72(a0)
+// 0x0105d094: 0x105d094: lbu   a2, 72(a0)
 	ldloc.1
 	ldc.i4.s 72
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x0105d088: 0x105d088: lw    s6, 68(a0)
+// 0x0105d098: 0x105d098: lw    s6, 68(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3009,20 +3009,20 @@ L_105d070:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105d08c: 0x105d08c: beq   v1, v0, 0x105d0d4 lui   a0, 0x0
+// 0x0105d09c: 0x105d09c: beq   v1, v0, 0x105d0e4 lui   a0, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	beq  L_105d0d4
+	beq  L_105d0e4
 // --- basic block ---
-// 0x0105d094: 0x105d094: lh    v1, 36(s2)
+// 0x0105d0a4: 0x105d0a4: lh    v1, 36(s2)
 	ldloc 12
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x0105d098: 0x105d098: lw    t1, 24(s0)
+// 0x0105d0a8: 0x105d0a8: lw    t1, 24(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3031,35 +3031,35 @@ L_105d070:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0105d09c: 0x105d09c: lh    t0, 36(s0)
+// 0x0105d0ac: 0x105d0ac: lh    t0, 36(s0)
 	ldloc 10
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 18
-// 0x0105d0a0: 0x105d0a0: lui   a1, 0x10000
+// 0x0105d0b0: 0x105d0b0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105d0a4: 0x105d0a4: lui   a3, 0x10000
+// 0x0105d0b4: 0x105d0b4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105d0a8: 0x105d0a8: addiu a1, a1, 11676
+// 0x0105d0b8: 0x105d0b8: addiu a1, a1, 11672
 	ldloc.2
-	ldc.i4 11676
+	ldc.i4 11672
 	add
 	stloc.2
-// 0x0105d0ac: 0x105d0ac: addiu a3, a3, 11712
+// 0x0105d0bc: 0x105d0bc: addiu a3, a3, 11708
 	ldloc 4
-	ldc.i4 11712
+	ldc.i4 11708
 	add
 	stloc 4
-// 0x0105d0b0: 0x105d0b0: addiu a0, zero, 4
+// 0x0105d0c0: 0x105d0c0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105d0b4: 0x105d0b4: addiu a2, zero, 353
+// 0x0105d0c4: 0x105d0c4: addiu a2, zero, 353
 	ldc.i4 353
 	stloc.3
-// 0x0105d0b8: 0x105d0b8: sw    t1, 16(sp)
+// 0x0105d0c8: 0x105d0c8: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3068,7 +3068,7 @@ L_105d070:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0105d0bc: 0x105d0bc: sw    t0, 20(sp)
+// 0x0105d0cc: 0x105d0cc: sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3077,7 +3077,7 @@ L_105d070:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0105d0c0: 0x105d0c0: sw    v0, 24(sp)
+// 0x0105d0d0: 0x105d0d0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3086,7 +3086,7 @@ L_105d070:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105d0c4: 0x105d0c4: jal   0x100449c sw    v1, 28(sp)
+// 0x0105d0d4: 0x105d0d4: jal   0x100449c sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3105,13 +3105,13 @@ L_105d070:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d0cc: 0x105d0cc: j	 0x105d28c addiu v0, zero, 4
+// 0x0105d0dc: 0x105d0dc: j	 0x105d29c addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-	br L_105d28c
+	br L_105d29c
 // --- basic block ---
-L_105d0d4:
-// 0x0105d0d4: 0x105d0d4: lw    v0, 576(a0)
+L_105d0e4:
+// 0x0105d0e4: 0x105d0e4: lw    v0, 576(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3120,20 +3120,20 @@ L_105d0d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105d0d8: 0x105d0d8: sll   zero, zero, 0
-// 0x0105d0dc: 0x105d0dc: beq   v1, v0, 0x105d100 sll   zero, zero, 0
+// 0x0105d0e8: 0x105d0e8: sll   zero, zero, 0
+// 0x0105d0ec: 0x105d0ec: beq   v1, v0, 0x105d110 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_105d100
+	beq  L_105d110
 // --- basic block ---
-// 0x0105d0e4: 0x105d0e4: bltz  v1, 0x105d100 addu  a0, v1, zero
+// 0x0105d0f4: 0x105d0f4: bltz  v1, 0x105d110 addu  a0, v1, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
 	ldc.i4.s 0
-	blt L_105d100
+	blt L_105d110
 // --- basic block ---
-// 0x0105d0ec: 0x105d0ec: sw    v1, 368(sp)
+// 0x0105d0fc: 0x105d0fc: sw    v1, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3142,7 +3142,7 @@ L_105d0d4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d0f0: 0x105d0f0: jal   0x100b164 sw    a2, 356(sp)
+// 0x0105d100: 0x105d100: jal   0x100b174 sw    a2, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3156,12 +3156,12 @@ L_105d0d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d0f8: 0x105d0f8: lw    a2, 356(sp)
+// 0x0105d108: 0x105d108: lw    a2, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3170,7 +3170,7 @@ L_105d0d4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105d0fc: 0x105d0fc: lw    v1, 368(sp)
+// 0x0105d10c: 0x105d10c: lw    v1, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3179,37 +3179,37 @@ L_105d0d4:
 	add
 	ldelem.i4
 	stloc 7
-L_105d100:
-// 0x0105d100: 0x105d100: lh    v0, 36(s0)
+L_105d110:
+// 0x0105d110: 0x105d110: lh    v0, 36(s0)
 	ldloc 10
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105d104: 0x105d104: sll   zero, zero, 0
-// 0x0105d108: 0x105d108: beq   s6, v0, 0x105d228 sll   zero, zero, 0
+// 0x0105d114: 0x105d114: sll   zero, zero, 0
+// 0x0105d118: 0x105d118: beq   s6, v0, 0x105d238 sll   zero, zero, 0
 	ldloc 14
 	ldloc 5
-	beq  L_105d228
+	beq  L_105d238
 // --- basic block ---
-// 0x0105d110: 0x105d110: lh    v0, 36(s2)
+// 0x0105d120: 0x105d120: lh    v0, 36(s2)
 	ldloc 12
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105d114: 0x105d114: sll   zero, zero, 0
-// 0x0105d118: 0x105d118: beq   s6, v0, 0x105d228 addu  a0, v1, zero
+// 0x0105d124: 0x105d124: sll   zero, zero, 0
+// 0x0105d128: 0x105d128: beq   s6, v0, 0x105d238 addu  a0, v1, zero
 	ldloc 14
 	ldloc 5
 	ldloc 7
 	stloc.1
-	beq  L_105d228
+	beq  L_105d238
 // --- basic block ---
-// 0x0105d120: 0x105d120: addu  a1, s6, zero
+// 0x0105d130: 0x105d130: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x0105d124: 0x105d124: jal   0x105cdfc addu  a3, s7, zero
+// 0x0105d134: 0x105d134: jal   0x105ce0c addu  a3, s7, zero
 	ldloc 16
 	stloc 4
 	ldloc.0
@@ -3217,28 +3217,28 @@ L_105d100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_fill_segment_105cdfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_fill_segment_105ce0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d12c: 0x105d12c: lb    v0, 90(sp)
+// 0x0105d13c: 0x105d13c: lb    v0, 90(sp)
 	ldloc.0
 	ldc.i4.s 90
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105d130: 0x105d130: addiu a2, zero, 1
+// 0x0105d140: 0x105d140: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0105d134: 0x105d134: bne   v0, a2, 0x105d14c addu  a0, s7, zero
+// 0x0105d144: 0x105d144: bne   v0, a2, 0x105d15c addu  a0, s7, zero
 	ldloc 5
 	ldloc.3
 	ldloc 16
 	stloc.1
-	bne.un L_105d14c
+	bne.un L_105d15c
 // --- basic block ---
-// 0x0105d13c: 0x105d13c: jal   0x105cc80 addu  a1, zero, zero
+// 0x0105d14c: 0x105d14c: jal   0x105cc90 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3246,20 +3246,20 @@ L_105d100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d144: 0x105d144: j	 0x105d15c subu  v1, s8, v0
+// 0x0105d154: 0x105d154: j	 0x105d16c subu  v1, s8, v0
 	ldloc 15
 	ldloc 5
 	sub
 	stloc 7
-	br L_105d15c
+	br L_105d16c
 // --- basic block ---
-L_105d14c:
-// 0x0105d14c: 0x105d14c: jal   0x105cc80 addiu a1, zero, 1
+L_105d15c:
+// 0x0105d15c: 0x105d15c: jal   0x105cc90 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3267,96 +3267,96 @@ L_105d14c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d154: 0x105d154: addiu v0, v0, 180
+// 0x0105d164: 0x105d164: addiu v0, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-// 0x0105d158: 0x105d158: subu  v1, s8, v0
+// 0x0105d168: 0x105d168: subu  v1, s8, v0
 	ldloc 15
 	ldloc 5
 	sub
 	stloc 7
-L_105d15c:
-// 0x0105d15c: 0x105d15c: slti  v0, v1, 181
+L_105d16c:
+// 0x0105d16c: 0x105d16c: slti  v0, v1, 181
 	ldloc 7
 	ldc.i4 181
 	clt
 	stloc 5
-// 0x0105d160: 0x105d160: beq   v0, zero, 0x105d15c addiu v1, v1, -360
+// 0x0105d170: 0x105d170: beq   v0, zero, 0x105d16c addiu v1, v1, -360
 	ldloc 5
 	ldloc 7
 	ldc.i4 -360
 	add
 	stloc 7
-	brfalse L_105d15c
+	brfalse L_105d16c
 // --- basic block ---
-// 0x0105d168: 0x105d168: addiu v1, v1, 360
+// 0x0105d178: 0x105d178: addiu v1, v1, 360
 	ldloc 7
 	ldc.i4 360
 	add
 	stloc 7
-// 0x0105d16c: 0x105d16c: j	 0x105d178 slti  v0, v1, -180
+// 0x0105d17c: 0x105d17c: j	 0x105d188 slti  v0, v1, -180
 	ldloc 7
 	ldc.i4 -180
 	clt
 	stloc 5
-	br L_105d178
+	br L_105d188
 // --- basic block ---
-L_105d174:
-// 0x0105d174: 0x105d174: slti  v0, v1, -180
+L_105d184:
+// 0x0105d184: 0x105d184: slti  v0, v1, -180
 	ldloc 7
 	ldc.i4 -180
 	clt
 	stloc 5
-L_105d178:
-// 0x0105d178: 0x105d178: bne   v0, zero, 0x105d174 addiu v1, v1, 360
+L_105d188:
+// 0x0105d188: 0x105d188: bne   v0, zero, 0x105d184 addiu v1, v1, 360
 	ldloc 5
 	ldloc 7
 	ldc.i4 360
 	add
 	stloc 7
-	brtrue L_105d174
+	brtrue L_105d184
 // --- basic block ---
-// 0x0105d180: 0x105d180: addiu v1, v1, -360
+// 0x0105d190: 0x105d190: addiu v1, v1, -360
 	ldloc 7
 	ldc.i4 -360
 	add
 	stloc 7
-// 0x0105d184: 0x105d184: addiu v0, v1, 45
+// 0x0105d194: 0x105d194: addiu v0, v1, 45
 	ldloc 7
 	ldc.i4.s 45
 	add
 	stloc 5
-// 0x0105d188: 0x105d188: sltiu v0, v0, 91
+// 0x0105d198: 0x105d198: sltiu v0, v0, 91
 	ldloc 5
 	ldc.i4.s 91
 	clt.un
 	stloc 5
-// 0x0105d18c: 0x105d18c: beq   v0, zero, 0x105d228 addu  a0, s6, zero
+// 0x0105d19c: 0x105d19c: beq   v0, zero, 0x105d238 addu  a0, s6, zero
 	ldloc 5
 	ldloc 14
 	stloc.1
-	brfalse L_105d228
+	brfalse L_105d238
 // --- basic block ---
-// 0x0105d194: 0x105d194: lb    a1, 51(s0)
+// 0x0105d1a4: 0x105d1a4: lb    a1, 51(s0)
 	ldloc 10
 	ldc.i4.s 51
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0105d198: 0x105d198: lh    a3, 38(s0)
+// 0x0105d1a8: 0x105d1a8: lh    a3, 38(s0)
 	ldloc 10
 	ldc.i4.s 38
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x0105d19c: 0x105d19c: sw    v1, 368(sp)
+// 0x0105d1ac: 0x105d1ac: sw    v1, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3365,7 +3365,7 @@ L_105d178:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d1a0: 0x105d1a0: sw    a1, 360(sp)
+// 0x0105d1b0: 0x105d1b0: sw    a1, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3374,7 +3374,7 @@ L_105d178:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105d1a4: 0x105d1a4: jal   0x1004034 sw    a3, 364(sp)
+// 0x0105d1b4: 0x105d1b4: jal   0x1004034 sw    a3, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3393,10 +3393,10 @@ L_105d178:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d1ac: 0x105d1ac: addu  a0, s6, zero
+// 0x0105d1bc: 0x105d1bc: addu  a0, s6, zero
 	ldloc 14
 	stloc.1
-// 0x0105d1b0: 0x105d1b0: jal   0x1003b50 sw    v0, 356(sp)
+// 0x0105d1c0: 0x105d1c0: jal   0x1003b50 sw    v0, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3413,7 +3413,7 @@ L_105d178:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d1b8: 0x105d1b8: lw    a2, 356(sp)
+// 0x0105d1c8: 0x105d1c8: lw    a2, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3422,7 +3422,7 @@ L_105d178:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105d1bc: 0x105d1bc: lw    a3, 364(sp)
+// 0x0105d1cc: 0x105d1cc: lw    a3, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3431,7 +3431,7 @@ L_105d178:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105d1c0: 0x105d1c0: lw    v1, 368(sp)
+// 0x0105d1d0: 0x105d1d0: lw    v1, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3440,7 +3440,7 @@ L_105d178:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d1c4: 0x105d1c4: lw    a1, 360(sp)
+// 0x0105d1d4: 0x105d1d4: lw    a1, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3449,96 +3449,96 @@ L_105d178:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105d1c8: 0x105d1c8: beq   a3, a2, 0x105d1dc sll   zero, zero, 0
+// 0x0105d1d8: 0x105d1d8: beq   a3, a2, 0x105d1ec sll   zero, zero, 0
 	ldloc 4
 	ldloc.3
-	beq  L_105d1dc
+	beq  L_105d1ec
 // --- basic block ---
-// 0x0105d1d0: 0x105d1d0: xor   a1, a1, v0
+// 0x0105d1e0: 0x105d1e0: xor   a1, a1, v0
 	ldloc.2
 	ldloc 5
 	xor
 	stloc.2
-// 0x0105d1d4: 0x105d1d4: j	 0x105d1ec sltiu a1, a1, 1
+// 0x0105d1e4: 0x105d1e4: j	 0x105d1fc sltiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.2
-	br L_105d1ec
+	br L_105d1fc
 // --- basic block ---
-L_105d1dc:
-// 0x0105d1dc: 0x105d1dc: xor   a1, a1, v0
+L_105d1ec:
+// 0x0105d1ec: 0x105d1ec: xor   a1, a1, v0
 	ldloc.2
 	ldloc 5
 	xor
 	stloc.2
-// 0x0105d1e0: 0x105d1e0: sltu  a1, zero, a1
+// 0x0105d1f0: 0x105d1f0: sltu  a1, zero, a1
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
-// 0x0105d1e4: 0x105d1e4: addiu v0, zero, 3
+// 0x0105d1f4: 0x105d1f4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0105d1e8: 0x105d1e8: subu  a1, v0, a1
+// 0x0105d1f8: 0x105d1f8: subu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	sub
 	stloc.2
-L_105d1ec:
-// 0x0105d1ec: 0x105d1ec: slt   v0, s5, a1
+L_105d1fc:
+// 0x0105d1fc: 0x105d1fc: slt   v0, s5, a1
 	ldloc 9
 	ldloc.2
 	clt
 	stloc 5
-// 0x0105d1f0: 0x105d1f0: beq   v0, zero, 0x105d208 sll   zero, zero, 0
+// 0x0105d200: 0x105d200: beq   v0, zero, 0x105d218 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105d208
+	brfalse L_105d218
 // --- basic block ---
-// 0x0105d1f8: 0x105d1f8: addu  s3, v1, zero
+// 0x0105d208: 0x105d208: addu  s3, v1, zero
 	ldloc 7
 	stloc 11
-// 0x0105d1fc: 0x105d1fc: addu  s5, a1, zero
+// 0x0105d20c: 0x105d20c: addu  s5, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0105d200: 0x105d200: j	 0x105d228 addu  s4, v1, zero
+// 0x0105d210: 0x105d210: j	 0x105d238 addu  s4, v1, zero
 	ldloc 7
 	stloc 13
-	br L_105d228
+	br L_105d238
 // --- basic block ---
-L_105d208:
-// 0x0105d208: 0x105d208: bne   a1, s5, 0x105d228 slt   v0, s4, v1
+L_105d218:
+// 0x0105d218: 0x105d218: bne   a1, s5, 0x105d238 slt   v0, s4, v1
 	ldloc.2
 	ldloc 9
 	ldloc 13
 	ldloc 7
 	clt
 	stloc 5
-	bne.un L_105d228
+	bne.un L_105d238
 // --- basic block ---
-// 0x0105d210: 0x105d210: beq   v0, zero, 0x105d21c slt   v0, v1, s3
+// 0x0105d220: 0x105d220: beq   v0, zero, 0x105d22c slt   v0, v1, s3
 	ldloc 5
 	ldloc 7
 	ldloc 11
 	clt
 	stloc 5
-	brfalse L_105d21c
+	brfalse L_105d22c
 // --- basic block ---
-// 0x0105d218: 0x105d218: addu  s4, v1, zero
+// 0x0105d228: 0x105d228: addu  s4, v1, zero
 	ldloc 7
 	stloc 13
-L_105d21c:
-// 0x0105d21c: 0x105d21c: beq   v0, zero, 0x105d228 addu  s5, a1, zero
+L_105d22c:
+// 0x0105d22c: 0x105d22c: beq   v0, zero, 0x105d238 addu  s5, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 9
-	brfalse L_105d228
+	brfalse L_105d238
 // --- basic block ---
-// 0x0105d224: 0x105d224: addu  s3, v1, zero
+// 0x0105d234: 0x105d234: addu  s3, v1, zero
 	ldloc 7
 	stloc 11
-L_105d228:
-// 0x0105d228: 0x105d228: lw    v0, 36(sp)
+L_105d238:
+// 0x0105d238: 0x105d238: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3547,13 +3547,13 @@ L_105d228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105d22c: 0x105d22c: sll   zero, zero, 0
-// 0x0105d230: 0x105d230: addiu v0, v0, 1
+// 0x0105d23c: 0x105d23c: sll   zero, zero, 0
+// 0x0105d240: 0x105d240: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0105d234: 0x105d234: sw    v0, 36(sp)
+// 0x0105d244: 0x105d244: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3562,8 +3562,8 @@ L_105d228:
 	add
 	ldloc 5
 	stelem.i4
-L_105d238:
-// 0x0105d238: 0x105d238: lw    v0, 36(sp)
+L_105d248:
+// 0x0105d248: 0x105d248: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3572,7 +3572,7 @@ L_105d238:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105d23c: 0x105d23c: lw    a0, 352(sp)
+// 0x0105d24c: 0x105d24c: lw    a0, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3581,80 +3581,80 @@ L_105d238:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105d240: 0x105d240: sll   zero, zero, 0
-// 0x0105d244: 0x105d244: slt   v1, v0, a0
+// 0x0105d250: 0x105d250: sll   zero, zero, 0
+// 0x0105d254: 0x105d254: slt   v1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 7
-// 0x0105d248: 0x105d248: bne   v1, zero, 0x105d070 sll   zero, zero, 0
+// 0x0105d258: 0x105d258: bne   v1, zero, 0x105d080 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_105d070
+	brtrue L_105d080
 // --- basic block ---
-// 0x0105d250: 0x105d250: slt   v0, s1, s4
+// 0x0105d260: 0x105d260: slt   v0, s1, s4
 	ldloc 8
 	ldloc 13
 	clt
 	stloc 5
-// 0x0105d254: 0x105d254: beq   v0, zero, 0x105d264 slt   v0, s3, s1
+// 0x0105d264: 0x105d264: beq   v0, zero, 0x105d274 slt   v0, s3, s1
 	ldloc 5
 	ldloc 11
 	ldloc 8
 	clt
 	stloc 5
-	brfalse L_105d264
+	brfalse L_105d274
 // --- basic block ---
-// 0x0105d25c: 0x105d25c: bne   v0, zero, 0x105d28c addiu v0, zero, 4
+// 0x0105d26c: 0x105d26c: bne   v0, zero, 0x105d29c addiu v0, zero, 4
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	brtrue L_105d28c
+	brtrue L_105d29c
 // --- basic block ---
-L_105d264:
-// 0x0105d264: 0x105d264: bne   s1, s4, 0x105d27c sll   zero, zero, 0
+L_105d274:
+// 0x0105d274: 0x105d274: bne   s1, s4, 0x105d28c sll   zero, zero, 0
 	ldloc 8
 	ldloc 13
-	bne.un L_105d27c
+	bne.un L_105d28c
 // --- basic block ---
-// 0x0105d26c: 0x105d26c: bne   s1, s3, 0x105d280 slt   s1, s3, s1
+// 0x0105d27c: 0x105d27c: bne   s1, s3, 0x105d290 slt   s1, s3, s1
 	ldloc 8
 	ldloc 11
 	ldloc 11
 	ldloc 8
 	clt
 	stloc 8
-	bne.un L_105d280
+	bne.un L_105d290
 // --- basic block ---
-// 0x0105d274: 0x105d274: j	 0x105d28c addiu v0, zero, 4
+// 0x0105d284: 0x105d284: j	 0x105d29c addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-	br L_105d28c
+	br L_105d29c
 // --- basic block ---
-L_105d27c:
-// 0x0105d27c: 0x105d27c: slt   s1, s3, s1
+L_105d28c:
+// 0x0105d28c: 0x105d28c: slt   s1, s3, s1
 	ldloc 11
 	ldloc 8
 	clt
 	stloc 8
-L_105d280:
-// 0x0105d280: 0x105d280: bne   s1, zero, 0x105d28c addiu v0, zero, 2
+L_105d290:
+// 0x0105d290: 0x105d290: bne   s1, zero, 0x105d29c addiu v0, zero, 2
 	ldloc 8
 	ldc.i4.2
 	stloc 5
-	brtrue L_105d28c
+	brtrue L_105d29c
 // --- basic block ---
-// 0x0105d288: 0x105d288: addiu v0, zero, 3
+// 0x0105d298: 0x105d298: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-L_105d28c:
-// 0x0105d28c: 0x105d28c: sb    v0, 54(s0)
+L_105d29c:
+// 0x0105d29c: 0x105d29c: sb    v0, 54(s0)
 	ldloc 10
 	ldc.i4.s 54
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105d290: 0x105d290: lw    ra, 412(sp)
-// 0x0105d294: 0x105d294: lw    s8, 408(sp)
+// 0x0105d2a0: 0x105d2a0: lw    ra, 412(sp)
+// 0x0105d2a4: 0x105d2a4: lw    s8, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3663,7 +3663,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105d298: 0x105d298: lw    s7, 404(sp)
+// 0x0105d2a8: 0x105d2a8: lw    s7, 404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3672,7 +3672,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105d29c: 0x105d29c: lw    s6, 400(sp)
+// 0x0105d2ac: 0x105d2ac: lw    s6, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3681,7 +3681,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105d2a0: 0x105d2a0: lw    s5, 396(sp)
+// 0x0105d2b0: 0x105d2b0: lw    s5, 396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3690,7 +3690,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105d2a4: 0x105d2a4: lw    s4, 392(sp)
+// 0x0105d2b4: 0x105d2b4: lw    s4, 392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3699,7 +3699,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105d2a8: 0x105d2a8: lw    s3, 388(sp)
+// 0x0105d2b8: 0x105d2b8: lw    s3, 388(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3708,7 +3708,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105d2ac: 0x105d2ac: lw    s2, 384(sp)
+// 0x0105d2bc: 0x105d2bc: lw    s2, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3717,7 +3717,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105d2b0: 0x105d2b0: lw    s1, 380(sp)
+// 0x0105d2c0: 0x105d2c0: lw    s1, 380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3726,7 +3726,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d2b4: 0x105d2b4: lw    s0, 376(sp)
+// 0x0105d2c4: 0x105d2c4: lw    s0, 376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3735,7 +3735,7 @@ L_105d28c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105d2b8: 0x105d2b8: jr    ra addiu sp, sp, 416
+// 0x0105d2c8: 0x105d2c8: jr    ra addiu sp, sp, 416
 	ldloc.0
 	ldc.i4 416
 	add
@@ -3747,7 +3747,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_instr_calc_cross_time_105d2c0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_calc_cross_time_105d2d0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s4,int32 s6,int32 s2,int32 s3,int32 s1,int32 s5,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -3812,12 +3812,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105d2c0: 0x105d2c0: addiu sp, sp, -72
+// 0x0105d2d0: 0x105d2d0: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0105d2c4: 0x105d2c4: sw    s4, 48(sp)
+// 0x0105d2d4: 0x105d2d4: sw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3826,20 +3826,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105d2c8: 0x105d2c8: addiu v0, zero, 56
+// 0x0105d2d8: 0x105d2d8: addiu v0, zero, 56
 	ldc.i4.s 56
 	stloc 6
-// 0x0105d2cc: 0x105d2cc: addiu s4, a1, -1
+// 0x0105d2dc: 0x105d2dc: addiu s4, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x0105d2d0: 0x105d2d0: mult  s4, v0
+// 0x0105d2e0: 0x105d2e0: mult  s4, v0
 	ldloc 9
 	ldloc 6
 	mul
 	stloc 18
-// 0x0105d2d4: 0x105d2d4: sw    s6, 56(sp)
+// 0x0105d2e4: 0x105d2e4: sw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3848,7 +3848,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105d2d8: 0x105d2d8: sw    s5, 52(sp)
+// 0x0105d2e8: 0x105d2e8: sw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3857,7 +3857,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105d2dc: 0x105d2dc: sw    s3, 44(sp)
+// 0x0105d2ec: 0x105d2ec: sw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3866,7 +3866,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105d2e0: 0x105d2e0: sw    s2, 40(sp)
+// 0x0105d2f0: 0x105d2f0: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3875,7 +3875,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105d2e4: 0x105d2e4: sw    s1, 36(sp)
+// 0x0105d2f4: 0x105d2f4: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3884,7 +3884,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105d2e8: 0x105d2e8: sw    s0, 32(sp)
+// 0x0105d2f8: 0x105d2f8: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3893,8 +3893,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d2ec: 0x105d2ec: sw    ra, 68(sp)
-// 0x0105d2f0: 0x105d2f0: sw    s8, 64(sp)
+// 0x0105d2fc: 0x105d2fc: sw    ra, 68(sp)
+// 0x0105d300: 0x105d300: sw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3903,7 +3903,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105d2f4: 0x105d2f4: sw    s7, 60(sp)
+// 0x0105d304: 0x105d304: sw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3912,46 +3912,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105d2f8: 0x105d2f8: addu  s1, a0, zero
+// 0x0105d308: 0x105d308: addu  s1, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0105d2fc: 0x105d2fc: addu  s0, a0, zero
+// 0x0105d30c: 0x105d30c: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0105d300: 0x105d300: addu  s3, zero, zero
+// 0x0105d310: 0x105d310: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x0105d304: 0x105d304: mflo  lo
+// 0x0105d314: 0x105d314: mflo  lo
 	ldloc 18
 	stloc 9
-// 0x0105d308: 0x105d308: addu  s6, zero, zero
+// 0x0105d318: 0x105d318: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0105d30c: 0x105d30c: addiu s2, zero, -1
+// 0x0105d31c: 0x105d31c: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x0105d310: 0x105d310: lui   s5, 0x0
+// 0x0105d320: 0x105d320: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x0105d314: 0x105d314: jal   0x1061324 addu  s4, a0, s4
+// 0x0105d324: 0x105d324: jal   0x1061334 addu  s4, a0, s4
 	ldloc.1
 	ldloc 9
 	add
 	stloc 9
-	call int32 Cibyl72::navigate_cost_reset_1061324()
+	call int32 Cibyl72::navigate_cost_reset_1061334()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d31c: 0x105d31c: j	 0x105d41c sltu  v0, s4, s0
+// 0x0105d32c: 0x105d32c: j	 0x105d42c sltu  v0, s4, s0
 	ldloc 9
 	ldloc 7
 	clt.un
 	stloc 6
-	br L_105d41c
+	br L_105d42c
 // --- basic block ---
-L_105d324:
-// 0x0105d324: 0x105d324: lw    v0, 24(s0)
+L_105d334:
+// 0x0105d334: 0x105d334: lw    v0, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3960,7 +3960,7 @@ L_105d324:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d328: 0x105d328: lw    v1, 576(s5)
+// 0x0105d338: 0x105d338: lw    v1, 576(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -3969,60 +3969,60 @@ L_105d324:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d32c: 0x105d32c: sll   zero, zero, 0
-// 0x0105d330: 0x105d330: beq   v0, v1, 0x105d348 sll   zero, zero, 0
+// 0x0105d33c: 0x105d33c: sll   zero, zero, 0
+// 0x0105d340: 0x105d340: beq   v0, v1, 0x105d358 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	beq  L_105d348
+	beq  L_105d358
 // --- basic block ---
-// 0x0105d338: 0x105d338: bltz  v0, 0x105d348 addu  a0, v0, zero
+// 0x0105d348: 0x105d348: bltz  v0, 0x105d358 addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
 	ldc.i4.s 0
-	blt L_105d348
+	blt L_105d358
 // --- basic block ---
-// 0x0105d340: 0x105d340: jal   0x100b164 sll   zero, zero, 0
+// 0x0105d350: 0x105d350: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_105d348:
-// 0x0105d348: 0x105d348: lb    a1, 50(s0)
+L_105d358:
+// 0x0105d358: 0x105d358: lb    a1, 50(s0)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0105d34c: 0x105d34c: lh    a0, 36(s0)
+// 0x0105d35c: 0x105d35c: lh    a0, 36(s0)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105d350: 0x105d350: xori  a1, a1, 1
+// 0x0105d360: 0x105d360: xori  a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	xor
 	stloc.2
-// 0x0105d354: 0x105d354: addu  a3, s2, zero
+// 0x0105d364: 0x105d364: addu  a3, s2, zero
 	ldloc 11
 	stloc 4
-// 0x0105d358: 0x105d358: sltu  a1, zero, a1
+// 0x0105d368: 0x105d368: sltu  a1, zero, a1
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
-// 0x0105d35c: 0x105d35c: addu  a2, s3, zero
+// 0x0105d36c: 0x105d36c: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x0105d360: 0x105d360: jal   0x1061d20 sw    s6, 16(sp)
+// 0x0105d370: 0x105d370: jal   0x1061d30 sw    s6, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4036,73 +4036,73 @@ L_105d348:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::navigate_cost_time_1061d20(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::navigate_cost_time_1061d30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d368: 0x105d368: sll   a0, v0, 16
+// 0x0105d378: 0x105d378: sll   a0, v0, 16
 	ldloc 6
 	ldc.i4.s 16
 	shl
 	stloc.1
-// 0x0105d36c: 0x105d36c: sra   a0, a0, 16
+// 0x0105d37c: 0x105d37c: sra   a0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shr
 	stloc.1
-// 0x0105d370: 0x105d370: sh    a0, 48(s0)
+// 0x0105d380: 0x105d380: sh    a0, 48(s0)
 	ldloc 7
 	ldc.i4.s 48
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105d374: 0x105d374: lh    s2, 36(s0)
+// 0x0105d384: 0x105d384: lh    s2, 36(s0)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 11
-// 0x0105d378: 0x105d378: lb    s6, 50(s0)
+// 0x0105d388: 0x105d388: lb    s6, 50(s0)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x0105d37c: 0x105d37c: beq   s0, s1, 0x105d38c sll   zero, zero, 0
+// 0x0105d38c: 0x105d38c: beq   s0, s1, 0x105d39c sll   zero, zero, 0
 	ldloc 7
 	ldloc 13
-	beq  L_105d38c
+	beq  L_105d39c
 // --- basic block ---
-// 0x0105d384: 0x105d384: bne   s0, s4, 0x105d404 sll   zero, zero, 0
+// 0x0105d394: 0x105d394: bne   s0, s4, 0x105d414 sll   zero, zero, 0
 	ldloc 7
 	ldloc 9
-	bne.un L_105d404
+	bne.un L_105d414
 // --- basic block ---
-L_105d38c:
-// 0x0105d38c: 0x105d38c: jal   0x10c09c0 sll   zero, zero, 0
+L_105d39c:
+// 0x0105d39c: 0x105d39c: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d394: 0x105d394: lh    a0, 46(s0)
+// 0x0105d3a4: 0x105d3a4: lh    a0, 46(s0)
 	ldloc 7
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105d398: 0x105d398: addu  a2, v0, zero
+// 0x0105d3a8: 0x105d3a8: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0105d39c: 0x105d39c: addiu a0, a0, 1
+// 0x0105d3ac: 0x105d3ac: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0105d3a0: 0x105d3a0: sw    a2, 24(sp)
+// 0x0105d3b0: 0x105d3b0: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4111,7 +4111,7 @@ L_105d38c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105d3a4: 0x105d3a4: jal   0x10c09c0 sw    v1, 28(sp)
+// 0x0105d3b4: 0x105d3b4: jal   0x10c1000 sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4122,12 +4122,12 @@ L_105d38c:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d3ac: 0x105d3ac: lw    a2, 24(sp)
+// 0x0105d3bc: 0x105d3bc: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4136,7 +4136,7 @@ L_105d38c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105d3b0: 0x105d3b0: lw    a3, 28(sp)
+// 0x0105d3c0: 0x105d3c0: lw    a3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4145,16 +4145,16 @@ L_105d38c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105d3b4: 0x105d3b4: addu  a0, a2, zero
+// 0x0105d3c4: 0x105d3c4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x0105d3b8: 0x105d3b8: addu  a1, a3, zero
+// 0x0105d3c8: 0x105d3c8: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x0105d3bc: 0x105d3bc: addu  a2, v0, zero
+// 0x0105d3cc: 0x105d3cc: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0105d3c0: 0x105d3c0: jal   0x10c0798 addu  a3, v1, zero
+// 0x0105d3d0: 0x105d3d0: jal   0x10c0dd8 addu  a3, v1, zero
 	ldloc 8
 	stloc 4
 	ldloc.0
@@ -4162,18 +4162,18 @@ L_105d38c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d3c8: 0x105d3c8: addu  a0, s2, zero
+// 0x0105d3d8: 0x105d3d8: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0105d3cc: 0x105d3cc: addu  s7, v1, zero
+// 0x0105d3dc: 0x105d3dc: addu  s7, v1, zero
 	ldloc 8
 	stloc 15
-// 0x0105d3d0: 0x105d3d0: jal   0x100405c addu  s8, v0, zero
+// 0x0105d3e0: 0x105d3e0: jal   0x100405c addu  s8, v0, zero
 	ldloc 6
 	stloc 16
 	ldloc.0
@@ -4186,28 +4186,28 @@ L_105d38c:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d3d8: 0x105d3d8: jal   0x10c09c0 addiu a0, v0, 1
+// 0x0105d3e8: 0x105d3e8: jal   0x10c1000 addiu a0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d3e0: 0x105d3e0: addu  a3, v1, zero
+// 0x0105d3f0: 0x105d3f0: addu  a3, v1, zero
 	ldloc 8
 	stloc 4
-// 0x0105d3e4: 0x105d3e4: addu  a0, s8, zero
+// 0x0105d3f4: 0x105d3f4: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x0105d3e8: 0x105d3e8: addu  a1, s7, zero
+// 0x0105d3f8: 0x105d3f8: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x0105d3ec: 0x105d3ec: jal   0x10c07f0 addu  a2, v0, zero
+// 0x0105d3fc: 0x105d3fc: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -4215,70 +4215,70 @@ L_105d38c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d3f4: 0x105d3f4: addu  a1, v1, zero
+// 0x0105d404: 0x105d404: addu  a1, v1, zero
 	ldloc 8
 	stloc.2
-// 0x0105d3f8: 0x105d3f8: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0105d408: 0x105d408: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d400: 0x105d400: sh    v0, 48(s0)
+// 0x0105d410: 0x105d410: sh    v0, 48(s0)
 	ldloc 7
 	ldc.i4.s 48
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_105d404:
-// 0x0105d404: 0x105d404: lh    v0, 48(s0)
+L_105d414:
+// 0x0105d414: 0x105d414: lh    v0, 48(s0)
 	ldloc 7
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x0105d408: 0x105d408: xori  s6, s6, 1
+// 0x0105d418: 0x105d418: xori  s6, s6, 1
 	ldloc 10
 	ldc.i4.1
 	xor
 	stloc 10
-// 0x0105d40c: 0x105d40c: addu  s3, s3, v0
+// 0x0105d41c: 0x105d41c: addu  s3, s3, v0
 	ldloc 12
 	ldloc 6
 	add
 	stloc 12
-// 0x0105d410: 0x105d410: sltu  s6, zero, s6
+// 0x0105d420: 0x105d420: sltu  s6, zero, s6
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 10
-// 0x0105d414: 0x105d414: addiu s0, s0, 56
+// 0x0105d424: 0x105d424: addiu s0, s0, 56
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc 7
-// 0x0105d418: 0x105d418: sltu  v0, s4, s0
+// 0x0105d428: 0x105d428: sltu  v0, s4, s0
 	ldloc 9
 	ldloc 7
 	clt.un
 	stloc 6
-L_105d41c:
-// 0x0105d41c: 0x105d41c: beq   v0, zero, 0x105d324 sll   zero, zero, 0
+L_105d42c:
+// 0x0105d42c: 0x105d42c: beq   v0, zero, 0x105d334 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_105d324
+	brfalse L_105d334
 // --- basic block ---
-// 0x0105d424: 0x105d424: lw    ra, 68(sp)
-// 0x0105d428: 0x105d428: lw    s8, 64(sp)
+// 0x0105d434: 0x105d434: lw    ra, 68(sp)
+// 0x0105d438: 0x105d438: lw    s8, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4287,7 +4287,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105d42c: 0x105d42c: lw    s7, 60(sp)
+// 0x0105d43c: 0x105d43c: lw    s7, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4296,7 +4296,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105d430: 0x105d430: lw    s6, 56(sp)
+// 0x0105d440: 0x105d440: lw    s6, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4305,7 +4305,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105d434: 0x105d434: lw    s5, 52(sp)
+// 0x0105d444: 0x105d444: lw    s5, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4314,7 +4314,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105d438: 0x105d438: lw    s4, 48(sp)
+// 0x0105d448: 0x105d448: lw    s4, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4323,7 +4323,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105d43c: 0x105d43c: lw    s3, 44(sp)
+// 0x0105d44c: 0x105d44c: lw    s3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4332,7 +4332,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105d440: 0x105d440: lw    s2, 40(sp)
+// 0x0105d450: 0x105d450: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4341,7 +4341,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105d444: 0x105d444: lw    s1, 36(sp)
+// 0x0105d454: 0x105d454: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4350,7 +4350,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105d448: 0x105d448: lw    s0, 32(sp)
+// 0x0105d458: 0x105d458: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4359,7 +4359,7 @@ L_105d41c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d44c: 0x105d44c: jr    ra addiu sp, sp, 72
+// 0x0105d45c: 0x105d45c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -4371,7 +4371,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_instr_calc_length_105d454(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_calc_length_105d464(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s0,int32 s2,int32 ra)
@@ -4415,10 +4415,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105d454: 0x105d454: lui   v0, 0x0
+// 0x0105d464: 0x105d464: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0105d458: 0x105d458: lw    v1, 576(v0)
+// 0x0105d468: 0x105d468: lw    v1, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4427,7 +4427,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d45c: 0x105d45c: lw    v0, 24(a1)
+// 0x0105d46c: 0x105d46c: lw    v0, 24(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4436,12 +4436,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d460: 0x105d460: addiu sp, sp, -56
+// 0x0105d470: 0x105d470: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0105d464: 0x105d464: sw    s2, 48(sp)
+// 0x0105d474: 0x105d474: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4450,7 +4450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105d468: 0x105d468: sw    s1, 44(sp)
+// 0x0105d478: 0x105d478: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4459,7 +4459,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d46c: 0x105d46c: sw    s0, 40(sp)
+// 0x0105d47c: 0x105d47c: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4468,17 +4468,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105d470: 0x105d470: sw    ra, 52(sp)
-// 0x0105d474: 0x105d474: addu  s1, a1, zero
+// 0x0105d480: 0x105d480: sw    ra, 52(sp)
+// 0x0105d484: 0x105d484: addu  s1, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0105d478: 0x105d478: addu  s2, a0, zero
+// 0x0105d488: 0x105d488: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0105d47c: 0x105d47c: addu  s0, a2, zero
+// 0x0105d48c: 0x105d48c: addu  s0, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0105d480: 0x105d480: beq   v0, v1, 0x105d498 sw    zero, 32(sp)
+// 0x0105d490: 0x105d490: beq   v0, v1, 0x105d4a8 sw    zero, 32(sp)
 	ldloc 6
 	ldloc 8
 	ldloc 5
@@ -4489,14 +4489,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	beq  L_105d498
+	beq  L_105d4a8
 // --- basic block ---
-// 0x0105d488: 0x105d488: bltz  v0, 0x105d498 sll   zero, zero, 0
+// 0x0105d498: 0x105d498: bltz  v0, 0x105d4a8 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	blt L_105d498
+	blt L_105d4a8
 // --- basic block ---
-// 0x0105d490: 0x105d490: jal   0x100b164 addu  a0, v0, zero
+// 0x0105d4a0: 0x105d4a0: jal   0x100b174 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4504,28 +4504,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_105d498:
-// 0x0105d498: 0x105d498: lh    v0, 42(s1)
+L_105d4a8:
+// 0x0105d4a8: 0x105d4a8: lh    v0, 42(s1)
 	ldloc 7
 	ldc.i4.s 42
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x0105d49c: 0x105d49c: lh    a3, 40(s1)
+// 0x0105d4ac: 0x105d4ac: lh    a3, 40(s1)
 	ldloc 7
 	ldc.i4.s 40
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x0105d4a0: 0x105d4a0: addu  a1, s1, zero
+// 0x0105d4b0: 0x105d4b0: addu  a1, s1, zero
 	ldloc 7
 	stloc.2
-// 0x0105d4a4: 0x105d4a4: sw    v0, 16(sp)
+// 0x0105d4b4: 0x105d4b4: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4534,20 +4534,20 @@ L_105d498:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d4a8: 0x105d4a8: addu  a0, s2, zero
+// 0x0105d4b8: 0x105d4b8: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0105d4ac: 0x105d4ac: addiu v0, sp, 32
+// 0x0105d4bc: 0x105d4bc: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-// 0x0105d4b0: 0x105d4b0: addiu a2, s1, 8
+// 0x0105d4c0: 0x105d4c0: addiu a2, s1, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc.3
-// 0x0105d4b4: 0x105d4b4: sw    v0, 24(sp)
+// 0x0105d4c4: 0x105d4c4: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4556,7 +4556,7 @@ L_105d498:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d4b8: 0x105d4b8: jal   0x1009db4 sw    zero, 20(sp)
+// 0x0105d4c8: 0x105d4c8: jal   0x1009dc4 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4570,16 +4570,16 @@ L_105d498:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_calc_line_length_1009db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_calc_line_length_1009dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d4c0: 0x105d4c0: beq   s0, zero, 0x105d4d4 sll   zero, zero, 0
+// 0x0105d4d0: 0x105d4d0: beq   s0, zero, 0x105d4e4 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_105d4d4
+	brfalse L_105d4e4
 // --- basic block ---
-// 0x0105d4c8: 0x105d4c8: lw    v1, 32(sp)
+// 0x0105d4d8: 0x105d4d8: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4588,15 +4588,15 @@ L_105d498:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d4cc: 0x105d4cc: sll   zero, zero, 0
-// 0x0105d4d0: 0x105d4d0: subu  v0, v1, v0
+// 0x0105d4dc: 0x105d4dc: sll   zero, zero, 0
+// 0x0105d4e0: 0x105d4e0: subu  v0, v1, v0
 	ldloc 8
 	ldloc 6
 	sub
 	stloc 6
-L_105d4d4:
-// 0x0105d4d4: 0x105d4d4: lw    ra, 52(sp)
-// 0x0105d4d8: 0x105d4d8: lw    s2, 48(sp)
+L_105d4e4:
+// 0x0105d4e4: 0x105d4e4: lw    ra, 52(sp)
+// 0x0105d4e8: 0x105d4e8: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4605,7 +4605,7 @@ L_105d4d4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105d4dc: 0x105d4dc: lw    s1, 44(sp)
+// 0x0105d4ec: 0x105d4ec: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4614,7 +4614,7 @@ L_105d4d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d4e0: 0x105d4e0: lw    s0, 40(sp)
+// 0x0105d4f0: 0x105d4f0: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4623,7 +4623,7 @@ L_105d4d4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105d4e4: 0x105d4e4: jr    ra addiu sp, sp, 56
+// 0x0105d4f4: 0x105d4f4: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4635,7 +4635,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_instr_fix_line_end_105d4ec(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_fix_line_end_105d4fc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 t6,int32 s3,int32 t5,int32 s6,int32 s1,int32 s5,int32 s4,int32 s7,int32 s8,int32 s2,int32 t0,int32 t1,int32 t2,int32 t3,int32 t4,int32 t7,int32 lo,int32 ra,int32 t8)
@@ -4727,10 +4727,10 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105d4ec: 0x105d4ec: lui   v0, 0x0
+// 0x0105d4fc: 0x105d4fc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0105d4f0: 0x105d4f0: lw    v1, 576(v0)
+// 0x0105d500: 0x105d500: lw    v1, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4739,7 +4739,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d4f4: 0x105d4f4: lw    v0, 24(a1)
+// 0x0105d504: 0x105d504: lw    v0, 24(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -4748,12 +4748,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d4f8: 0x105d4f8: addiu sp, sp, -136
+// 0x0105d508: 0x105d508: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x0105d4fc: 0x105d4fc: sw    s2, 104(sp)
+// 0x0105d50c: 0x105d50c: sw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4762,7 +4762,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0105d500: 0x105d500: sw    s1, 100(sp)
+// 0x0105d510: 0x105d510: sw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4771,7 +4771,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105d504: 0x105d504: sw    s0, 96(sp)
+// 0x0105d514: 0x105d514: sw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4780,8 +4780,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d508: 0x105d508: sw    ra, 132(sp)
-// 0x0105d50c: 0x105d50c: sw    s8, 128(sp)
+// 0x0105d518: 0x105d518: sw    ra, 132(sp)
+// 0x0105d51c: 0x105d51c: sw    s8, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4790,7 +4790,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0105d510: 0x105d510: sw    s7, 124(sp)
+// 0x0105d520: 0x105d520: sw    s7, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4799,7 +4799,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105d514: 0x105d514: sw    s6, 120(sp)
+// 0x0105d524: 0x105d524: sw    s6, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4808,7 +4808,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105d518: 0x105d518: sw    s5, 116(sp)
+// 0x0105d528: 0x105d528: sw    s5, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4817,7 +4817,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105d51c: 0x105d51c: sw    s4, 112(sp)
+// 0x0105d52c: 0x105d52c: sw    s4, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4826,7 +4826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105d520: 0x105d520: sw    s3, 108(sp)
+// 0x0105d530: 0x105d530: sw    s3, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4835,25 +4835,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105d524: 0x105d524: addu  s0, a1, zero
+// 0x0105d534: 0x105d534: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0105d528: 0x105d528: addu  s1, a0, zero
+// 0x0105d538: 0x105d538: addu  s1, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0105d52c: 0x105d52c: beq   v0, v1, 0x105d544 addu  s2, a2, zero
+// 0x0105d53c: 0x105d53c: beq   v0, v1, 0x105d554 addu  s2, a2, zero
 	ldloc 6
 	ldloc 8
 	ldloc.3
 	stloc 18
-	beq  L_105d544
+	beq  L_105d554
 // --- basic block ---
-// 0x0105d534: 0x105d534: bltz  v0, 0x105d544 sll   zero, zero, 0
+// 0x0105d544: 0x105d544: bltz  v0, 0x105d554 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	blt L_105d544
+	blt L_105d554
 // --- basic block ---
-// 0x0105d53c: 0x105d53c: jal   0x100b164 addu  a0, v0, zero
+// 0x0105d54c: 0x105d54c: jal   0x100b174 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4861,26 +4861,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_105d544:
-// 0x0105d544: 0x105d544: lh    v1, 40(s0)
+L_105d554:
+// 0x0105d554: 0x105d554: lh    v1, 40(s0)
 	ldloc 7
 	ldc.i4.s 40
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 8
-// 0x0105d548: 0x105d548: lw    a0, 0(s0)
+// 0x0105d558: 0x105d558: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0105d54c: 0x105d54c: lw    v0, 4(s0)
+// 0x0105d55c: 0x105d55c: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4889,16 +4889,16 @@ L_105d544:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d550: 0x105d550: bgez  v1, 0x105d590 addiu t6, sp, 32
+// 0x0105d560: 0x105d560: bgez  v1, 0x105d5a0 addiu t6, sp, 32
 	ldloc 8
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 9
 	ldc.i4.s 0
-	bge L_105d590
+	bge L_105d5a0
 // --- basic block ---
-// 0x0105d558: 0x105d558: lw    a1, 8(s0)
+// 0x0105d568: 0x105d568: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4907,7 +4907,7 @@ L_105d544:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105d55c: 0x105d55c: lw    v1, 12(s0)
+// 0x0105d56c: 0x105d56c: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4916,10 +4916,10 @@ L_105d544:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d560: 0x105d560: lui   s6, 0x7fff0000
+// 0x0105d570: 0x105d570: lui   s6, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 12
-// 0x0105d564: 0x105d564: sw    a0, 16(sp)
+// 0x0105d574: 0x105d574: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4928,7 +4928,7 @@ L_105d544:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105d568: 0x105d568: sw    v0, 20(sp)
+// 0x0105d578: 0x105d578: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4937,7 +4937,7 @@ L_105d544:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d56c: 0x105d56c: sw    a1, 24(sp)
+// 0x0105d57c: 0x105d57c: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4946,7 +4946,7 @@ L_105d544:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105d570: 0x105d570: sw    v1, 28(sp)
+// 0x0105d580: 0x105d580: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4955,30 +4955,30 @@ L_105d544:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105d574: 0x105d574: ori   s6, s6, 65535
+// 0x0105d584: 0x105d584: ori   s6, s6, 65535
 	ldloc 12
 	ldc.i4 65535
 	or
 	stloc 12
-// 0x0105d578: 0x105d578: addu  s7, zero, zero
+// 0x0105d588: 0x105d588: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 16
-// 0x0105d57c: 0x105d57c: addu  s8, zero, zero
+// 0x0105d58c: 0x105d58c: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 17
-// 0x0105d580: 0x105d580: addu  s4, zero, zero
+// 0x0105d590: 0x105d590: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x0105d584: 0x105d584: addu  s5, zero, zero
+// 0x0105d594: 0x105d594: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x0105d588: 0x105d588: j	 0x105d748 addiu s3, zero, -1
+// 0x0105d598: 0x105d598: j	 0x105d758 addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 10
-	br L_105d748
+	br L_105d758
 // --- basic block ---
-L_105d590:
-// 0x0105d590: 0x105d590: sw    v0, 28(sp)
+L_105d5a0:
+// 0x0105d5a0: 0x105d5a0: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4987,7 +4987,7 @@ L_105d590:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d594: 0x105d594: sw    v0, 20(sp)
+// 0x0105d5a4: 0x105d5a4: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4996,20 +4996,20 @@ L_105d590:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d598: 0x105d598: lui   s6, 0x7fff0000
+// 0x0105d5a8: 0x105d5a8: lui   s6, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 12
-// 0x0105d59c: 0x105d59c: addiu v0, sp, 24
+// 0x0105d5ac: 0x105d5ac: addiu v0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 6
-// 0x0105d5a0: 0x105d5a0: addiu t7, sp, 16
+// 0x0105d5b0: 0x105d5b0: addiu t7, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 24
-// 0x0105d5a4: 0x105d5a4: sw    a0, 24(sp)
+// 0x0105d5b4: 0x105d5b4: sw    a0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5018,7 +5018,7 @@ L_105d590:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105d5a8: 0x105d5a8: sw    a0, 16(sp)
+// 0x0105d5b8: 0x105d5b8: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5027,47 +5027,47 @@ L_105d590:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105d5ac: 0x105d5ac: ori   s6, s6, 65535
+// 0x0105d5bc: 0x105d5bc: ori   s6, s6, 65535
 	ldloc 12
 	ldc.i4 65535
 	or
 	stloc 12
-// 0x0105d5b0: 0x105d5b0: sll   a1, v1, 2
+// 0x0105d5c0: 0x105d5c0: sll   a1, v1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0105d5b4: 0x105d5b4: addu  a0, zero, zero
+// 0x0105d5c4: 0x105d5c4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105d5b8: 0x105d5b8: addu  s7, zero, zero
+// 0x0105d5c8: 0x105d5c8: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 16
-// 0x0105d5bc: 0x105d5bc: addu  s8, zero, zero
+// 0x0105d5cc: 0x105d5cc: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 17
-// 0x0105d5c0: 0x105d5c0: addu  s4, zero, zero
+// 0x0105d5d0: 0x105d5d0: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x0105d5c4: 0x105d5c4: addu  s5, zero, zero
+// 0x0105d5d4: 0x105d5d4: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x0105d5c8: 0x105d5c8: addiu s3, zero, -1
+// 0x0105d5d8: 0x105d5d8: addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x0105d5cc: 0x105d5cc: lui   t4, 0x0
+// 0x0105d5dc: 0x105d5dc: lui   t4, 0x0
 	ldc.i4.s 0
 	stloc 23
-// 0x0105d5d0: 0x105d5d0: lui   a3, 0x0
+// 0x0105d5e0: 0x105d5e0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0105d5d4: 0x105d5d4: lui   a2, 0x0
+// 0x0105d5e4: 0x105d5e4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0105d5d8: 0x105d5d8: lui   t3, 0x20000
+// 0x0105d5e8: 0x105d5e8: lui   t3, 0x20000
 	ldc.i4 131072
 	stloc 22
-// 0x0105d5dc: 0x105d5dc: sw    v0, 84(sp)
+// 0x0105d5ec: 0x105d5ec: sw    v0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5076,7 +5076,7 @@ L_105d590:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d5e0: 0x105d5e0: sw    t6, 88(sp)
+// 0x0105d5f0: 0x105d5f0: sw    t6, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5085,10 +5085,10 @@ L_105d590:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105d5e4: 0x105d5e4: addu  t2, zero, zero
+// 0x0105d5f4: 0x105d5f4: addu  t2, zero, zero
 	ldc.i4.s 0
 	stloc 21
-// 0x0105d5e8: 0x105d5e8: sw    t7, 80(sp)
+// 0x0105d5f8: 0x105d5f8: sw    t7, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5097,15 +5097,15 @@ L_105d590:
 	add
 	ldloc 24
 	stelem.i4
-// 0x0105d5ec: 0x105d5ec: j	 0x105d724 addiu t1, v1, -1
+// 0x0105d5fc: 0x105d5fc: j	 0x105d734 addiu t1, v1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 20
-	br L_105d724
+	br L_105d734
 // --- basic block ---
-L_105d5f4:
-// 0x0105d5f4: 0x105d5f4: lw    v0, 576(t4)
+L_105d604:
+// 0x0105d604: 0x105d604: lw    v0, 576(t4)
 	ldloc 5
 	ldloc 23
 	ldc.i4.2
@@ -5114,7 +5114,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d5f8: 0x105d5f8: lw    t5, 548(a3)
+// 0x0105d608: 0x105d608: lw    t5, 548(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -5123,13 +5123,13 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105d5fc: 0x105d5fc: sll   zero, zero, 0
-// 0x0105d600: 0x105d600: beq   v0, t5, 0x105d664 sll   zero, zero, 0
+// 0x0105d60c: 0x105d60c: sll   zero, zero, 0
+// 0x0105d610: 0x105d610: beq   v0, t5, 0x105d674 sll   zero, zero, 0
 	ldloc 6
 	ldloc 11
-	beq  L_105d664
+	beq  L_105d674
 // --- basic block ---
-// 0x0105d608: 0x105d608: sw    v0, 548(a3)
+// 0x0105d618: 0x105d618: sw    v0, 548(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -5138,7 +5138,7 @@ L_105d5f4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d60c: 0x105d60c: sw    v1, 52(sp)
+// 0x0105d61c: 0x105d61c: sw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5147,7 +5147,7 @@ L_105d5f4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105d610: 0x105d610: sw    a0, 44(sp)
+// 0x0105d620: 0x105d620: sw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5156,7 +5156,7 @@ L_105d5f4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105d614: 0x105d614: sw    a1, 40(sp)
+// 0x0105d624: 0x105d624: sw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5165,7 +5165,7 @@ L_105d5f4:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105d618: 0x105d618: sw    a2, 64(sp)
+// 0x0105d628: 0x105d628: sw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5174,7 +5174,7 @@ L_105d5f4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105d61c: 0x105d61c: sw    a3, 60(sp)
+// 0x0105d62c: 0x105d62c: sw    a3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5183,7 +5183,7 @@ L_105d5f4:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105d620: 0x105d620: sw    t0, 48(sp)
+// 0x0105d630: 0x105d630: sw    t0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5192,7 +5192,7 @@ L_105d5f4:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0105d624: 0x105d624: sw    t1, 76(sp)
+// 0x0105d634: 0x105d634: sw    t1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5201,7 +5201,7 @@ L_105d5f4:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0105d628: 0x105d628: sw    t2, 72(sp)
+// 0x0105d638: 0x105d638: sw    t2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5210,7 +5210,7 @@ L_105d5f4:
 	add
 	ldloc 21
 	stelem.i4
-// 0x0105d62c: 0x105d62c: sw    t3, 68(sp)
+// 0x0105d63c: 0x105d63c: sw    t3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5219,7 +5219,7 @@ L_105d5f4:
 	add
 	ldloc 22
 	stelem.i4
-// 0x0105d630: 0x105d630: jal   0x100ae78 sw    t4, 56(sp)
+// 0x0105d640: 0x105d640: jal   0x100ae88 sw    t4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5233,12 +5233,12 @@ L_105d5f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105d638: 0x105d638: lw    a2, 64(sp)
+// 0x0105d648: 0x105d648: lw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5247,7 +5247,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105d63c: 0x105d63c: lw    t4, 56(sp)
+// 0x0105d64c: 0x105d64c: lw    t4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5256,7 +5256,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 23
-// 0x0105d640: 0x105d640: lw    t3, 68(sp)
+// 0x0105d650: 0x105d650: lw    t3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5265,7 +5265,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 22
-// 0x0105d644: 0x105d644: lw    t2, 72(sp)
+// 0x0105d654: 0x105d654: lw    t2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5274,7 +5274,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 21
-// 0x0105d648: 0x105d648: lw    t1, 76(sp)
+// 0x0105d658: 0x105d658: lw    t1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5283,7 +5283,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 20
-// 0x0105d64c: 0x105d64c: lw    t0, 48(sp)
+// 0x0105d65c: 0x105d65c: lw    t0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5292,7 +5292,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0105d650: 0x105d650: lw    a3, 60(sp)
+// 0x0105d660: 0x105d660: lw    a3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5301,7 +5301,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105d654: 0x105d654: lw    a1, 40(sp)
+// 0x0105d664: 0x105d664: lw    a1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5310,7 +5310,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105d658: 0x105d658: lw    a0, 44(sp)
+// 0x0105d668: 0x105d668: lw    a0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5319,7 +5319,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105d65c: 0x105d65c: lw    v1, 52(sp)
+// 0x0105d66c: 0x105d66c: lw    v1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5328,7 +5328,7 @@ L_105d5f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d660: 0x105d660: sw    v0, 552(a2)
+// 0x0105d670: 0x105d670: sw    v0, 552(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5337,17 +5337,17 @@ L_105d5f4:
 	add
 	ldloc 6
 	stelem.i4
-L_105d664:
-// 0x0105d664: 0x105d664: lw    t6, 31240(t3)
+L_105d674:
+// 0x0105d674: 0x105d674: lw    t6, 31704(t3)
 	ldloc 5
 	ldloc 22
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105d668: 0x105d668: lw    v0, 552(a2)
+// 0x0105d678: 0x105d678: lw    v0, 552(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -5356,27 +5356,27 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d66c: 0x105d66c: addu  t6, t6, a1
+// 0x0105d67c: 0x105d67c: addu  t6, t6, a1
 	ldloc 9
 	ldloc.2
 	add
 	stloc 9
-// 0x0105d670: 0x105d670: lh    t5, 2(t6)
+// 0x0105d680: 0x105d680: lh    t5, 2(t6)
 	ldloc 9
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 11
-// 0x0105d674: 0x105d674: lh    t6, 0(t6)
+// 0x0105d684: 0x105d684: lh    t6, 0(t6)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 9
-// 0x0105d678: 0x105d678: mult  t5, v0
+// 0x0105d688: 0x105d688: mult  t5, v0
 	ldloc 11
 	ldloc 6
 	mul
 	stloc 25
-// 0x0105d67c: 0x105d67c: lw    t7, 84(sp)
+// 0x0105d68c: 0x105d68c: lw    t7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5385,7 +5385,7 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 24
-// 0x0105d680: 0x105d680: lw    t8, 88(sp)
+// 0x0105d690: 0x105d690: lw    t8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5394,17 +5394,17 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 27
-// 0x0105d684: 0x105d684: mflo  lo
+// 0x0105d694: 0x105d694: mflo  lo
 	ldloc 25
 	stloc 11
-// 0x0105d688: 0x105d688: sll   zero, zero, 0
-// 0x0105d68c: 0x105d68c: sll   zero, zero, 0
-// 0x0105d690: 0x105d690: mult  t6, v0
+// 0x0105d698: 0x105d698: sll   zero, zero, 0
+// 0x0105d69c: 0x105d69c: sll   zero, zero, 0
+// 0x0105d6a0: 0x105d6a0: mult  t6, v0
 	ldloc 9
 	ldloc 6
 	mul
 	stloc 25
-// 0x0105d694: 0x105d694: lw    t6, 28(sp)
+// 0x0105d6a4: 0x105d6a4: lw    t6, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5413,13 +5413,13 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105d698: 0x105d698: sll   zero, zero, 0
-// 0x0105d69c: 0x105d69c: addu  t5, t6, t5
+// 0x0105d6a8: 0x105d6a8: sll   zero, zero, 0
+// 0x0105d6ac: 0x105d6ac: addu  t5, t6, t5
 	ldloc 9
 	ldloc 11
 	add
 	stloc 11
-// 0x0105d6a0: 0x105d6a0: lw    t6, 24(sp)
+// 0x0105d6b0: 0x105d6b0: lw    t6, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5428,7 +5428,7 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105d6a4: 0x105d6a4: sw    t5, 28(sp)
+// 0x0105d6b4: 0x105d6b4: sw    t5, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5437,15 +5437,15 @@ L_105d664:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105d6a8: 0x105d6a8: mflo  lo
+// 0x0105d6b8: 0x105d6b8: mflo  lo
 	ldloc 25
 	stloc 6
-// 0x0105d6ac: 0x105d6ac: addu  v0, t6, v0
+// 0x0105d6bc: 0x105d6bc: addu  v0, t6, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 6
-// 0x0105d6b0: 0x105d6b0: sw    v0, 24(sp)
+// 0x0105d6c0: 0x105d6c0: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5454,7 +5454,7 @@ L_105d664:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d6b4: 0x105d6b4: lw    t6, 80(sp)
+// 0x0105d6c4: 0x105d6c4: lw    t6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5463,36 +5463,36 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105d6b8: 0x105d6b8: sll   zero, zero, 0
-// 0x0105d6bc: 0x105d6bc: cibyl_sysc_arg 0x11
+// 0x0105d6c8: 0x105d6c8: sll   zero, zero, 0
+// 0x0105d6cc: 0x105d6cc: cibyl_sysc_arg 0x11
 	ldloc 13
-// 0x0105d6c0: 0x105d6c0: cibyl_sysc_arg 0xe
+// 0x0105d6d0: 0x105d6d0: cibyl_sysc_arg 0xe
 	ldloc 9
-// 0x0105d6c4: 0x105d6c4: cibyl_sysc_arg 0xf
+// 0x0105d6d4: 0x105d6d4: cibyl_sysc_arg 0xf
 	ldloc 24
-// 0x0105d6c8: 0x105d6c8: cibyl_sysc_arg 0x18
+// 0x0105d6d8: 0x105d6d8: cibyl_sysc_arg 0x18
 	ldloc 27
-// 0x0105d6cc: 0x105d6cc: cibyl_sysc_arg 0xa
+// 0x0105d6dc: 0x105d6dc: cibyl_sysc_arg 0xa
 	ldloc 21
-// 0x0105d6d0: 0x105d6d0: cibyl_sysc 0x209b
+// 0x0105d6e0: 0x105d6e0: cibyl_sysc 0x209b
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 6
-// 0x0105d6d4: 0x105d6d4: addu  t5, v0, zero
+// 0x0105d6e4: 0x105d6e4: addu  t5, v0, zero
 	ldloc 6
 	stloc 11
-// 0x0105d6d8: 0x105d6d8: slt   v0, t5, s6
+// 0x0105d6e8: 0x105d6e8: slt   v0, t5, s6
 	ldloc 11
 	ldloc 12
 	clt
 	stloc 6
-// 0x0105d6dc: 0x105d6dc: beq   v0, zero, 0x105d70c sll   zero, zero, 0
+// 0x0105d6ec: 0x105d6ec: beq   v0, zero, 0x105d71c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_105d70c
+	brfalse L_105d71c
 // --- basic block ---
-// 0x0105d6e4: 0x105d6e4: addu  s3, t0, zero
+// 0x0105d6f4: 0x105d6f4: addu  s3, t0, zero
 	ldloc 19
 	stloc 10
-// 0x0105d6e8: 0x105d6e8: lw    s5, 36(sp)
+// 0x0105d6f8: 0x105d6f8: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5501,7 +5501,7 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105d6ec: 0x105d6ec: lw    s4, 32(sp)
+// 0x0105d6fc: 0x105d6fc: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5510,13 +5510,13 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105d6f0: 0x105d6f0: bne   s2, zero, 0x105d708 addu  s6, t5, zero
+// 0x0105d700: 0x105d700: bne   s2, zero, 0x105d718 addu  s6, t5, zero
 	ldloc 18
 	ldloc 11
 	stloc 12
-	brtrue L_105d708
+	brtrue L_105d718
 // --- basic block ---
-// 0x0105d6f8: 0x105d6f8: lw    s8, 20(sp)
+// 0x0105d708: 0x105d708: lw    s8, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5525,7 +5525,7 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105d6fc: 0x105d6fc: lw    s7, 16(sp)
+// 0x0105d70c: 0x105d70c: lw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5534,17 +5534,17 @@ L_105d664:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105d700: 0x105d700: j	 0x105d70c sll   zero, zero, 0
-	br L_105d70c
+// 0x0105d710: 0x105d710: j	 0x105d71c sll   zero, zero, 0
+	br L_105d71c
 // --- basic block ---
-L_105d708:
-// 0x0105d708: 0x105d708: addu  s3, t1, a0
+L_105d718:
+// 0x0105d718: 0x105d718: addu  s3, t1, a0
 	ldloc 20
 	ldloc.1
 	add
 	stloc 10
-L_105d70c:
-// 0x0105d70c: 0x105d70c: lw    v0, 24(sp)
+L_105d71c:
+// 0x0105d71c: 0x105d71c: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5553,12 +5553,12 @@ L_105d70c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d710: 0x105d710: addiu a0, a0, 1
+// 0x0105d720: 0x105d720: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0105d714: 0x105d714: sw    v0, 16(sp)
+// 0x0105d724: 0x105d724: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5567,7 +5567,7 @@ L_105d70c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105d718: 0x105d718: lw    v0, 28(sp)
+// 0x0105d728: 0x105d728: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5576,12 +5576,12 @@ L_105d70c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d71c: 0x105d71c: addiu a1, a1, 4
+// 0x0105d72c: 0x105d72c: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-// 0x0105d720: 0x105d720: sw    v0, 20(sp)
+// 0x0105d730: 0x105d730: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5590,28 +5590,28 @@ L_105d70c:
 	add
 	ldloc 6
 	stelem.i4
-L_105d724:
-// 0x0105d724: 0x105d724: lh    v0, 42(s0)
+L_105d734:
+// 0x0105d734: 0x105d734: lh    v0, 42(s0)
 	ldloc 7
 	ldc.i4.s 42
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x0105d728: 0x105d728: addu  t0, a0, v1
+// 0x0105d738: 0x105d738: addu  t0, a0, v1
 	ldloc.1
 	ldloc 8
 	add
 	stloc 19
-// 0x0105d72c: 0x105d72c: slt   v0, v0, t0
+// 0x0105d73c: 0x105d73c: slt   v0, v0, t0
 	ldloc 6
 	ldloc 19
 	clt
 	stloc 6
-// 0x0105d730: 0x105d730: beq   v0, zero, 0x105d5f4 sll   zero, zero, 0
+// 0x0105d740: 0x105d740: beq   v0, zero, 0x105d604 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_105d5f4
+	brfalse L_105d604
 // --- basic block ---
-// 0x0105d738: 0x105d738: lw    v1, 8(s0)
+// 0x0105d748: 0x105d748: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5620,7 +5620,7 @@ L_105d724:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105d73c: 0x105d73c: lw    v0, 12(s0)
+// 0x0105d74c: 0x105d74c: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5629,7 +5629,7 @@ L_105d724:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105d740: 0x105d740: sw    v1, 24(sp)
+// 0x0105d750: 0x105d750: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5638,7 +5638,7 @@ L_105d724:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105d744: 0x105d744: sw    v0, 28(sp)
+// 0x0105d754: 0x105d754: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5647,51 +5647,51 @@ L_105d724:
 	add
 	ldloc 6
 	stelem.i4
-L_105d748:
-// 0x0105d748: 0x105d748: addiu v1, sp, 16
+L_105d758:
+// 0x0105d758: 0x105d758: addiu v1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 8
-// 0x0105d74c: 0x105d74c: addu  a2, zero, zero
+// 0x0105d75c: 0x105d75c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105d750: 0x105d750: addiu a1, sp, 32
+// 0x0105d760: 0x105d760: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0105d754: 0x105d754: addiu a0, sp, 24
+// 0x0105d764: 0x105d764: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x0105d758: 0x105d758: cibyl_sysc_arg 0x11
+// 0x0105d768: 0x105d768: cibyl_sysc_arg 0x11
 	ldloc 13
-// 0x0105d75c: 0x105d75c: cibyl_sysc_arg 0x3
+// 0x0105d76c: 0x105d76c: cibyl_sysc_arg 0x3
 	ldloc 8
-// 0x0105d760: 0x105d760: cibyl_sysc_arg 0x4
+// 0x0105d770: 0x105d770: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0105d764: 0x105d764: cibyl_sysc_arg 0x5
+// 0x0105d774: 0x105d774: cibyl_sysc_arg 0x5
 	ldloc.2
-// 0x0105d768: 0x105d768: cibyl_sysc_arg 0x6
+// 0x0105d778: 0x105d778: cibyl_sysc_arg 0x6
 	ldloc.3
-// 0x0105d76c: 0x105d76c: cibyl_sysc 0x20b8
+// 0x0105d77c: 0x105d77c: cibyl_sysc 0x20b8
 	call int32 [WazeWP7]Syscalls::NOPH_RoadMapMath_distFromSeg(int32,int32,int32,int32,int32)
 	stloc 6
-// 0x0105d770: 0x105d770: addu  s1, v0, zero
+// 0x0105d780: 0x105d780: addu  s1, v0, zero
 	ldloc 6
 	stloc 13
-// 0x0105d774: 0x105d774: slt   s1, s1, s6
+// 0x0105d784: 0x105d784: slt   s1, s1, s6
 	ldloc 13
 	ldloc 12
 	clt
 	stloc 13
-// 0x0105d778: 0x105d778: beq   s1, zero, 0x105d7ac sll   zero, zero, 0
+// 0x0105d788: 0x105d788: beq   s1, zero, 0x105d7bc sll   zero, zero, 0
 	ldloc 13
-	brfalse L_105d7ac
+	brfalse L_105d7bc
 // --- basic block ---
-// 0x0105d780: 0x105d780: lw    s5, 36(sp)
+// 0x0105d790: 0x105d790: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5700,7 +5700,7 @@ L_105d748:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105d784: 0x105d784: lw    s4, 32(sp)
+// 0x0105d794: 0x105d794: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5709,11 +5709,11 @@ L_105d748:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105d788: 0x105d788: bne   s2, zero, 0x105d7a0 sll   zero, zero, 0
+// 0x0105d798: 0x105d798: bne   s2, zero, 0x105d7b0 sll   zero, zero, 0
 	ldloc 18
-	brtrue L_105d7a0
+	brtrue L_105d7b0
 // --- basic block ---
-// 0x0105d790: 0x105d790: lw    s8, 20(sp)
+// 0x0105d7a0: 0x105d7a0: lw    s8, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5722,7 +5722,7 @@ L_105d748:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105d794: 0x105d794: lw    s7, 16(sp)
+// 0x0105d7a4: 0x105d7a4: lw    s7, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5731,19 +5731,19 @@ L_105d748:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105d798: 0x105d798: j	 0x105d7b4 addiu s3, zero, -1
+// 0x0105d7a8: 0x105d7a8: j	 0x105d7c4 addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 10
-	br L_105d7b4
+	br L_105d7c4
 // --- basic block ---
-L_105d7a0:
-// 0x0105d7a0: 0x105d7a0: lh    s3, 42(s0)
+L_105d7b0:
+// 0x0105d7b0: 0x105d7b0: lh    s3, 42(s0)
 	ldloc 7
 	ldc.i4.s 42
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 10
-// 0x0105d7a4: 0x105d7a4: j	 0x105d7e8 sw    s5, 12(s0)
+// 0x0105d7b4: 0x105d7b4: j	 0x105d7f8 sw    s5, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5752,15 +5752,15 @@ L_105d7a0:
 	add
 	ldloc 14
 	stelem.i4
-	br L_105d7e8
+	br L_105d7f8
 // --- basic block ---
-L_105d7ac:
-// 0x0105d7ac: 0x105d7ac: bne   s2, zero, 0x105d7e4 sll   zero, zero, 0
+L_105d7bc:
+// 0x0105d7bc: 0x105d7bc: bne   s2, zero, 0x105d7f4 sll   zero, zero, 0
 	ldloc 18
-	brtrue L_105d7e4
+	brtrue L_105d7f4
 // --- basic block ---
-L_105d7b4:
-// 0x0105d7b4: 0x105d7b4: sw    s5, 4(s0)
+L_105d7c4:
+// 0x0105d7c4: 0x105d7c4: sw    s5, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5769,14 +5769,14 @@ L_105d7b4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105d7b8: 0x105d7b8: sw    s4, 0(s0)
+// 0x0105d7c8: 0x105d7c8: sw    s4, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 15
 	stelem.i4
-// 0x0105d7bc: 0x105d7bc: sw    s8, 20(s0)
+// 0x0105d7cc: 0x105d7cc: sw    s8, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5785,7 +5785,7 @@ L_105d7b4:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0105d7c0: 0x105d7c0: bltz  s3, 0x105d804 sw    s7, 16(s0)
+// 0x0105d7d0: 0x105d7d0: bltz  s3, 0x105d814 sw    s7, 16(s0)
 	ldloc 10
 	ldloc 5
 	ldloc 7
@@ -5796,36 +5796,36 @@ L_105d7b4:
 	ldloc 16
 	stelem.i4
 	ldc.i4.s 0
-	blt L_105d804
+	blt L_105d814
 // --- basic block ---
-// 0x0105d7c8: 0x105d7c8: lh    v0, 42(s0)
+// 0x0105d7d8: 0x105d7d8: lh    v0, 42(s0)
 	ldloc 7
 	ldc.i4.s 42
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x0105d7cc: 0x105d7cc: sll   zero, zero, 0
-// 0x0105d7d0: 0x105d7d0: slt   v0, v0, s3
+// 0x0105d7dc: 0x105d7dc: sll   zero, zero, 0
+// 0x0105d7e0: 0x105d7e0: slt   v0, v0, s3
 	ldloc 6
 	ldloc 10
 	clt
 	stloc 6
-// 0x0105d7d4: 0x105d7d4: bne   v0, zero, 0x105d808 addiu v0, zero, -1
+// 0x0105d7e4: 0x105d7e4: bne   v0, zero, 0x105d818 addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brtrue L_105d808
+	brtrue L_105d818
 // --- basic block ---
-// 0x0105d7dc: 0x105d7dc: j	 0x105d818 sh    s3, 40(s0)
+// 0x0105d7ec: 0x105d7ec: j	 0x105d828 sh    s3, 40(s0)
 	ldloc 7
 	ldc.i4.s 40
 	add
 	ldloc 10
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_105d818
+	br L_105d828
 // --- basic block ---
-L_105d7e4:
-// 0x0105d7e4: 0x105d7e4: sw    s5, 12(s0)
+L_105d7f4:
+// 0x0105d7f4: 0x105d7f4: sw    s5, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5834,8 +5834,8 @@ L_105d7e4:
 	add
 	ldloc 14
 	stelem.i4
-L_105d7e8:
-// 0x0105d7e8: 0x105d7e8: bltz  s3, 0x105d804 sw    s4, 8(s0)
+L_105d7f8:
+// 0x0105d7f8: 0x105d7f8: bltz  s3, 0x105d814 sw    s4, 8(s0)
 	ldloc 10
 	ldloc 5
 	ldloc 7
@@ -5846,53 +5846,53 @@ L_105d7e8:
 	ldloc 15
 	stelem.i4
 	ldc.i4.s 0
-	blt L_105d804
+	blt L_105d814
 // --- basic block ---
-// 0x0105d7f0: 0x105d7f0: lh    v0, 40(s0)
+// 0x0105d800: 0x105d800: lh    v0, 40(s0)
 	ldloc 7
 	ldc.i4.s 40
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 6
-// 0x0105d7f4: 0x105d7f4: sll   zero, zero, 0
-// 0x0105d7f8: 0x105d7f8: slt   v0, s3, v0
+// 0x0105d804: 0x105d804: sll   zero, zero, 0
+// 0x0105d808: 0x105d808: slt   v0, s3, v0
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 6
-// 0x0105d7fc: 0x105d7fc: beq   v0, zero, 0x105d814 sll   zero, zero, 0
+// 0x0105d80c: 0x105d80c: beq   v0, zero, 0x105d824 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_105d814
+	brfalse L_105d824
 // --- basic block ---
-L_105d804:
-// 0x0105d804: 0x105d804: addiu v0, zero, -1
+L_105d814:
+// 0x0105d814: 0x105d814: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_105d808:
-// 0x0105d808: 0x105d808: sh    v0, 40(s0)
+L_105d818:
+// 0x0105d818: 0x105d818: sh    v0, 40(s0)
 	ldloc 7
 	ldc.i4.s 40
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105d80c: 0x105d80c: j	 0x105d818 sh    v0, 42(s0)
+// 0x0105d81c: 0x105d81c: j	 0x105d828 sh    v0, 42(s0)
 	ldloc 7
 	ldc.i4.s 42
 	add
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_105d818
+	br L_105d828
 // --- basic block ---
-L_105d814:
-// 0x0105d814: 0x105d814: sh    s3, 42(s0)
+L_105d824:
+// 0x0105d824: 0x105d824: sh    s3, 42(s0)
 	ldloc 7
 	ldc.i4.s 42
 	add
 	ldloc 10
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_105d818:
-// 0x0105d818: 0x105d818: lw    ra, 132(sp)
-// 0x0105d81c: 0x105d81c: lw    s8, 128(sp)
+L_105d828:
+// 0x0105d828: 0x105d828: lw    ra, 132(sp)
+// 0x0105d82c: 0x105d82c: lw    s8, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5901,7 +5901,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105d820: 0x105d820: lw    s7, 124(sp)
+// 0x0105d830: 0x105d830: lw    s7, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5910,7 +5910,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105d824: 0x105d824: lw    s6, 120(sp)
+// 0x0105d834: 0x105d834: lw    s6, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5919,7 +5919,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105d828: 0x105d828: lw    s5, 116(sp)
+// 0x0105d838: 0x105d838: lw    s5, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5928,7 +5928,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105d82c: 0x105d82c: lw    s4, 112(sp)
+// 0x0105d83c: 0x105d83c: lw    s4, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5937,7 +5937,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105d830: 0x105d830: lw    s3, 108(sp)
+// 0x0105d840: 0x105d840: lw    s3, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5946,7 +5946,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105d834: 0x105d834: lw    s2, 104(sp)
+// 0x0105d844: 0x105d844: lw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5955,7 +5955,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0105d838: 0x105d838: lw    s1, 100(sp)
+// 0x0105d848: 0x105d848: lw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5964,7 +5964,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105d83c: 0x105d83c: lw    s0, 96(sp)
+// 0x0105d84c: 0x105d84c: lw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5973,7 +5973,7 @@ L_105d818:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d840: 0x105d840: jr    ra addiu sp, sp, 136
+// 0x0105d850: 0x105d850: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -5985,7 +5985,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_instr_prepare_segments_105d848(int32,int32,int32,int32,int32)
+.method public static int32 navigate_instr_prepare_segments_105d858(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 s5,int32 s6,int32 s3,int32 s7,int32 s8,int32 ra)
@@ -6047,12 +6047,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105d848: 0x105d848: addiu sp, sp, -280
+// 0x0105d858: 0x105d858: addiu sp, sp, -280
 	ldloc.0
 	ldc.i4 -280
 	add
 	stloc.0
-// 0x0105d84c: 0x105d84c: sw    s8, 272(sp)
+// 0x0105d85c: 0x105d85c: sw    s8, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6061,7 +6061,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105d850: 0x105d850: sw    s7, 268(sp)
+// 0x0105d860: 0x105d860: sw    s7, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6070,7 +6070,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105d854: 0x105d854: sw    s6, 264(sp)
+// 0x0105d864: 0x105d864: sw    s6, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6079,7 +6079,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105d858: 0x105d858: sw    s5, 260(sp)
+// 0x0105d868: 0x105d868: sw    s5, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6088,7 +6088,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105d85c: 0x105d85c: sw    s4, 256(sp)
+// 0x0105d86c: 0x105d86c: sw    s4, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6097,7 +6097,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105d860: 0x105d860: sw    s3, 252(sp)
+// 0x0105d870: 0x105d870: sw    s3, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6106,7 +6106,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105d864: 0x105d864: sw    s1, 244(sp)
+// 0x0105d874: 0x105d874: sw    s1, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6115,8 +6115,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105d868: 0x105d868: sw    ra, 276(sp)
-// 0x0105d86c: 0x105d86c: sw    s2, 248(sp)
+// 0x0105d878: 0x105d878: sw    ra, 276(sp)
+// 0x0105d87c: 0x105d87c: sw    s2, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6125,7 +6125,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105d870: 0x105d870: sw    s0, 240(sp)
+// 0x0105d880: 0x105d880: sw    s0, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6134,10 +6134,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105d874: 0x105d874: addu  s3, a0, zero
+// 0x0105d884: 0x105d884: addu  s3, a0, zero
 	ldloc.1
 	stloc 14
-// 0x0105d878: 0x105d878: sw    a1, 284(sp)
+// 0x0105d888: 0x105d888: sw    a1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6146,13 +6146,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105d87c: 0x105d87c: addu  s6, a2, zero
+// 0x0105d88c: 0x105d88c: addu  s6, a2, zero
 	ldloc.3
 	stloc 13
-// 0x0105d880: 0x105d880: addu  s8, a3, zero
+// 0x0105d890: 0x105d890: addu  s8, a3, zero
 	ldloc 4
 	stloc 16
-// 0x0105d884: 0x105d884: lw    s1, 296(sp)
+// 0x0105d894: 0x105d894: lw    s1, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6161,19 +6161,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105d888: 0x105d888: addu  s4, zero, zero
+// 0x0105d898: 0x105d898: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0105d88c: 0x105d88c: lui   s5, 0x20000
+// 0x0105d89c: 0x105d89c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x0105d890: 0x105d890: j	 0x105d984 lui   s7, 0x20000
+// 0x0105d8a0: 0x105d8a0: j	 0x105d994 lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 15
-	br L_105d984
+	br L_105d994
 // --- basic block ---
-L_105d898:
-// 0x0105d898: 0x105d898: jalr  s3 addiu s4, s4, 1
+L_105d8a8:
+// 0x0105d8a8: 0x105d8a8: jalr  s3 addiu s4, s4, 1
 	ldloc 14
 	ldloc 10
 	ldc.i4.1
@@ -6189,13 +6189,13 @@ L_105d898:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d8a0: 0x105d8a0: addu  s2, v0, zero
+// 0x0105d8b0: 0x105d8b0: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0105d8a4: 0x105d8a4: lui   v0, 0x0
+// 0x0105d8b4: 0x105d8b4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105d8a8: 0x105d8a8: lw    v1, 576(v0)
+// 0x0105d8b8: 0x105d8b8: lw    v1, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6204,7 +6204,7 @@ L_105d898:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d8ac: 0x105d8ac: lw    v0, 24(s2)
+// 0x0105d8bc: 0x105d8bc: lw    v0, 24(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6213,197 +6213,197 @@ L_105d898:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105d8b0: 0x105d8b0: sll   zero, zero, 0
-// 0x0105d8b4: 0x105d8b4: beq   v0, v1, 0x105d8cc sll   zero, zero, 0
+// 0x0105d8c0: 0x105d8c0: sll   zero, zero, 0
+// 0x0105d8c4: 0x105d8c4: beq   v0, v1, 0x105d8dc sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_105d8cc
+	beq  L_105d8dc
 // --- basic block ---
-// 0x0105d8bc: 0x105d8bc: bltz  v0, 0x105d8cc addu  a0, v0, zero
+// 0x0105d8cc: 0x105d8cc: bltz  v0, 0x105d8dc addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
 	ldc.i4.s 0
-	blt L_105d8cc
+	blt L_105d8dc
 // --- basic block ---
-// 0x0105d8c4: 0x105d8c4: jal   0x100b164 sll   zero, zero, 0
+// 0x0105d8d4: 0x105d8d4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105d8cc:
-// 0x0105d8cc: 0x105d8cc: lh    v0, 36(s2)
+L_105d8dc:
+// 0x0105d8dc: 0x105d8dc: lh    v0, 36(s2)
 	ldloc 9
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105d8d0: 0x105d8d0: lw    v1, 31152(s5)
+// 0x0105d8e0: 0x105d8e0: lw    v1, 31616(s5)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d8d4: 0x105d8d4: sll   v0, v0, 3
+// 0x0105d8e4: 0x105d8e4: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0105d8d8: 0x105d8d8: addu  v0, v1, v0
+// 0x0105d8e8: 0x105d8e8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0105d8dc: 0x105d8dc: lhu   v0, 4(v0)
+// 0x0105d8ec: 0x105d8ec: lhu   v0, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x0105d8e0: 0x105d8e0: ori   a3, zero, 65535
+// 0x0105d8f0: 0x105d8f0: ori   a3, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc 4
-// 0x0105d8e4: 0x105d8e4: lw    a2, 31228(s7)
+// 0x0105d8f4: 0x105d8f4: lw    a2, 31692(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105d8e8: 0x105d8e8: addiu a1, zero, -1
+// 0x0105d8f8: 0x105d8f8: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0105d8ec: 0x105d8ec: beq   v0, a3, 0x105d910 sll   a0, v0, 2
+// 0x0105d8fc: 0x105d8fc: beq   v0, a3, 0x105d920 sll   a0, v0, 2
 	ldloc 5
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.1
-	beq  L_105d910
+	beq  L_105d920
 // --- basic block ---
-// 0x0105d8f4: 0x105d8f4: lui   a1, 0x20000
+// 0x0105d904: 0x105d904: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0105d8f8: 0x105d8f8: lw    a3, 31240(a1)
+// 0x0105d908: 0x105d908: lw    a3, 31704(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105d8fc: 0x105d8fc: addiu a1, v0, 1
+// 0x0105d90c: 0x105d90c: addiu a1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0105d900: 0x105d900: addu  a0, a3, a0
+// 0x0105d910: 0x105d910: addu  a0, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc.1
-// 0x0105d904: 0x105d904: lw    s0, 0(a0)
+// 0x0105d914: 0x105d914: lw    s0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0105d908: 0x105d908: sll   zero, zero, 0
-// 0x0105d90c: 0x105d90c: addu  s0, v0, s0
+// 0x0105d918: 0x105d918: sll   zero, zero, 0
+// 0x0105d91c: 0x105d91c: addu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-L_105d910:
-// 0x0105d910: 0x105d910: lh    a0, 36(s2)
+L_105d920:
+// 0x0105d920: 0x105d920: lh    a0, 36(s2)
 	ldloc 9
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105d914: 0x105d914: sh    a1, 40(s2)
+// 0x0105d924: 0x105d924: sh    a1, 40(s2)
 	ldloc 9
 	ldc.i4.s 40
 	add
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105d918: 0x105d918: sll   v0, a0, 3
+// 0x0105d928: 0x105d928: sll   v0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0105d91c: 0x105d91c: addu  v1, v1, v0
+// 0x0105d92c: 0x105d92c: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0105d920: 0x105d920: sh    s0, 42(s2)
+// 0x0105d930: 0x105d930: sh    s0, 42(s2)
 	ldloc 9
 	ldc.i4.s 42
 	add
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105d924: 0x105d924: lhu   v0, 0(v1)
+// 0x0105d934: 0x105d934: lhu   v0, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x0105d928: 0x105d928: lhu   a1, 2(v1)
+// 0x0105d938: 0x105d938: lhu   a1, 2(v1)
 	ldloc 7
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x0105d92c: 0x105d92c: andi  v0, v0, 32767
+// 0x0105d93c: 0x105d93c: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x0105d930: 0x105d930: sll   v0, v0, 3
+// 0x0105d940: 0x105d940: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0105d934: 0x105d934: addu  v0, a2, v0
+// 0x0105d944: 0x105d944: addu  v0, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc 5
-// 0x0105d938: 0x105d938: lw    v1, 0(v0)
+// 0x0105d948: 0x105d948: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0105d93c: 0x105d93c: andi  a1, a1, 32767
+// 0x0105d94c: 0x105d94c: andi  a1, a1, 32767
 	ldloc.2
 	ldc.i4 32767
 	and
 	stloc.2
-// 0x0105d940: 0x105d940: sw    v1, 0(s2)
+// 0x0105d950: 0x105d950: sw    v1, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0105d944: 0x105d944: lw    v0, 4(v0)
+// 0x0105d954: 0x105d954: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6412,12 +6412,12 @@ L_105d910:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105d948: 0x105d948: sll   a1, a1, 3
+// 0x0105d958: 0x105d958: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x0105d94c: 0x105d94c: sw    v0, 4(s2)
+// 0x0105d95c: 0x105d95c: sw    v0, 4(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6426,20 +6426,20 @@ L_105d910:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105d950: 0x105d950: addu  a1, a2, a1
+// 0x0105d960: 0x105d960: addu  a1, a2, a1
 	ldloc.3
 	ldloc.2
 	add
 	stloc.2
-// 0x0105d954: 0x105d954: lw    a2, 0(a1)
+// 0x0105d964: 0x105d964: lw    a2, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0105d958: 0x105d958: sll   zero, zero, 0
-// 0x0105d95c: 0x105d95c: sw    a2, 8(s2)
+// 0x0105d968: 0x105d968: sll   zero, zero, 0
+// 0x0105d96c: 0x105d96c: sw    a2, 8(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6448,7 +6448,7 @@ L_105d910:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105d960: 0x105d960: lw    a1, 4(a1)
+// 0x0105d970: 0x105d970: lw    a1, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6457,7 +6457,7 @@ L_105d910:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105d964: 0x105d964: sw    v1, 16(s2)
+// 0x0105d974: 0x105d974: sw    v1, 16(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6466,7 +6466,7 @@ L_105d910:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105d968: 0x105d968: sw    a1, 12(s2)
+// 0x0105d978: 0x105d978: sw    a1, 12(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6475,7 +6475,7 @@ L_105d910:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105d96c: 0x105d96c: jal   0x1004034 sw    v0, 20(s2)
+// 0x0105d97c: 0x105d97c: jal   0x1004034 sw    v0, 20(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6494,13 +6494,13 @@ L_105d910:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d974: 0x105d974: lh    a0, 36(s2)
+// 0x0105d984: 0x105d984: lh    a0, 36(s2)
 	ldloc 9
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105d978: 0x105d978: jal   0x1003c30 sh    v0, 38(s2)
+// 0x0105d988: 0x105d988: jal   0x1003c30 sh    v0, 38(s2)
 	ldloc 9
 	ldc.i4.s 38
 	add
@@ -6515,25 +6515,25 @@ L_105d910:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d980: 0x105d980: sb    v0, 52(s2)
+// 0x0105d990: 0x105d990: sb    v0, 52(s2)
 	ldloc 9
 	ldc.i4.s 52
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_105d984:
-// 0x0105d984: 0x105d984: slt   v0, s4, s6
+L_105d994:
+// 0x0105d994: 0x105d994: slt   v0, s4, s6
 	ldloc 10
 	ldloc 13
 	clt
 	stloc 5
-// 0x0105d988: 0x105d988: bne   v0, zero, 0x105d898 addu  a0, s4, zero
+// 0x0105d998: 0x105d998: bne   v0, zero, 0x105d8a8 addu  a0, s4, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_105d898
+	brtrue L_105d8a8
 // --- basic block ---
-// 0x0105d990: 0x105d990: lw    a3, 284(sp)
+// 0x0105d9a0: 0x105d9a0: lw    a3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6542,15 +6542,15 @@ L_105d984:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105d994: 0x105d994: addu  s4, zero, zero
+// 0x0105d9a4: 0x105d9a4: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x0105d998: 0x105d998: addiu a3, a3, -1
+// 0x0105d9a8: 0x105d9a8: addiu a3, a3, -1
 	ldloc 4
 	ldc.i4.m1
 	add
 	stloc 4
-// 0x0105d99c: 0x105d99c: sw    a3, 168(sp)
+// 0x0105d9ac: 0x105d9ac: sw    a3, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6559,16 +6559,16 @@ L_105d984:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105d9a0: 0x105d9a0: addiu s5, zero, 1
+// 0x0105d9b0: 0x105d9b0: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x0105d9a4: 0x105d9a4: j	 0x105dae4 addiu s7, zero, 4
+// 0x0105d9b4: 0x105d9b4: j	 0x105daf4 addiu s7, zero, 4
 	ldc.i4.4
 	stloc 15
-	br L_105dae4
+	br L_105daf4
 // --- basic block ---
-L_105d9ac:
-// 0x0105d9ac: 0x105d9ac: jalr  s3 addiu s4, s4, 1
+L_105d9bc:
+// 0x0105d9bc: 0x105d9bc: jalr  s3 addiu s4, s4, 1
 	ldloc 14
 	ldloc 10
 	ldc.i4.1
@@ -6584,10 +6584,10 @@ L_105d9ac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d9b4: 0x105d9b4: addu  a0, s4, zero
+// 0x0105d9c4: 0x105d9c4: addu  a0, s4, zero
 	ldloc 10
 	stloc.1
-// 0x0105d9b8: 0x105d9b8: jalr  s3 addu  s0, v0, zero
+// 0x0105d9c8: 0x105d9c8: jalr  s3 addu  s0, v0, zero
 	ldloc 14
 	ldloc 5
 	stloc 8
@@ -6601,10 +6601,10 @@ L_105d9ac:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105d9c0: 0x105d9c0: addu  s2, v0, zero
+// 0x0105d9d0: 0x105d9d0: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0105d9c4: 0x105d9c4: lw    v1, 24(s0)
+// 0x0105d9d4: 0x105d9d4: lw    v1, 24(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6613,7 +6613,7 @@ L_105d9ac:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105d9c8: 0x105d9c8: lw    v0, 24(v0)
+// 0x0105d9d8: 0x105d9d8: lw    v0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6622,65 +6622,65 @@ L_105d9ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105d9cc: 0x105d9cc: sll   zero, zero, 0
-// 0x0105d9d0: 0x105d9d0: bne   v1, v0, 0x105da1c sll   zero, zero, 0
+// 0x0105d9dc: 0x105d9dc: sll   zero, zero, 0
+// 0x0105d9e0: 0x105d9e0: bne   v1, v0, 0x105da2c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_105da1c
+	bne.un L_105da2c
 // --- basic block ---
-// 0x0105d9d8: 0x105d9d8: lb    v1, 52(s0)
+// 0x0105d9e8: 0x105d9e8: lb    v1, 52(s0)
 	ldloc 8
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105d9dc: 0x105d9dc: lb    v0, 52(s2)
+// 0x0105d9ec: 0x105d9ec: lb    v0, 52(s2)
 	ldloc 9
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105d9e0: 0x105d9e0: bne   v1, s5, 0x105d9f8 sll   zero, zero, 0
+// 0x0105d9f0: 0x105d9f0: bne   v1, s5, 0x105da08 sll   zero, zero, 0
 	ldloc 7
 	ldloc 12
-	bne.un L_105d9f8
+	bne.un L_105da08
 // --- basic block ---
-// 0x0105d9e8: 0x105d9e8: beq   v0, s5, 0x105da1c addiu v0, zero, 6
+// 0x0105d9f8: 0x105d9f8: beq   v0, s5, 0x105da2c addiu v0, zero, 6
 	ldloc 5
 	ldloc 12
 	ldc.i4.6
 	stloc 5
-	beq  L_105da1c
+	beq  L_105da2c
 // --- basic block ---
-// 0x0105d9f0: 0x105d9f0: j	 0x105dae4 sb    v0, 54(s0)
+// 0x0105da00: 0x105da00: j	 0x105daf4 sb    v0, 54(s0)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_105dae4
+	br L_105daf4
 // --- basic block ---
-L_105d9f8:
-// 0x0105d9f8: 0x105d9f8: bne   v0, s5, 0x105da0c addu  a0, s0, zero
+L_105da08:
+// 0x0105da08: 0x105da08: bne   v0, s5, 0x105da1c addu  a0, s0, zero
 	ldloc 5
 	ldloc 12
 	ldloc 8
 	stloc.1
-	bne.un L_105da0c
+	bne.un L_105da1c
 // --- basic block ---
-// 0x0105da00: 0x105da00: addiu v1, zero, 5
+// 0x0105da10: 0x105da10: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-// 0x0105da04: 0x105da04: j	 0x105dae4 sb    v1, 54(s0)
+// 0x0105da14: 0x105da14: j	 0x105daf4 sb    v1, 54(s0)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_105dae4
+	br L_105daf4
 // --- basic block ---
-L_105da0c:
-// 0x0105da0c: 0x105da0c: jal   0x105cb5c addu  a1, s2, zero
+L_105da1c:
+// 0x0105da1c: 0x105da1c: jal   0x105cb6c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6688,40 +6688,40 @@ L_105da0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_has_more_connections_105cb5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_has_more_connections_105cb6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105da14: 0x105da14: bne   v0, zero, 0x105da24 sll   zero, zero, 0
+// 0x0105da24: 0x105da24: bne   v0, zero, 0x105da34 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_105da24
+	brtrue L_105da34
 // --- basic block ---
-L_105da1c:
-// 0x0105da1c: 0x105da1c: j	 0x105dae4 sb    s7, 54(s0)
+L_105da2c:
+// 0x0105da2c: 0x105da2c: j	 0x105daf4 sb    s7, 54(s0)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	ldloc 15
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_105dae4
+	br L_105daf4
 // --- basic block ---
-L_105da24:
-// 0x0105da24: 0x105da24: lb    v0, 50(s0)
+L_105da34:
+// 0x0105da34: 0x105da34: lb    v0, 50(s0)
 	ldloc 8
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105da28: 0x105da28: sll   zero, zero, 0
-// 0x0105da2c: 0x105da2c: bne   v0, s5, 0x105da44 addu  a0, s0, zero
+// 0x0105da38: 0x105da38: sll   zero, zero, 0
+// 0x0105da3c: 0x105da3c: bne   v0, s5, 0x105da54 addu  a0, s0, zero
 	ldloc 5
 	ldloc 12
 	ldloc 8
 	stloc.1
-	bne.un L_105da44
+	bne.un L_105da54
 // --- basic block ---
-// 0x0105da34: 0x105da34: jal   0x105cc80 addiu a1, zero, 1
+// 0x0105da44: 0x105da44: jal   0x105cc90 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6729,12 +6729,12 @@ L_105da24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105da3c: 0x105da3c: j	 0x105da54 sw    v0, 160(sp)
+// 0x0105da4c: 0x105da4c: j	 0x105da64 sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6743,10 +6743,10 @@ L_105da24:
 	add
 	ldloc 5
 	stelem.i4
-	br L_105da54
+	br L_105da64
 // --- basic block ---
-L_105da44:
-// 0x0105da44: 0x105da44: jal   0x105cc80 addu  a1, zero, zero
+L_105da54:
+// 0x0105da54: 0x105da54: jal   0x105cc90 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6754,17 +6754,17 @@ L_105da44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105da4c: 0x105da4c: addiu v0, v0, 180
+// 0x0105da5c: 0x105da5c: addiu v0, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-// 0x0105da50: 0x105da50: sw    v0, 160(sp)
+// 0x0105da60: 0x105da60: sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6773,22 +6773,22 @@ L_105da44:
 	add
 	ldloc 5
 	stelem.i4
-L_105da54:
-// 0x0105da54: 0x105da54: lb    v0, 50(s2)
+L_105da64:
+// 0x0105da64: 0x105da64: lb    v0, 50(s2)
 	ldloc 9
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105da58: 0x105da58: sll   zero, zero, 0
-// 0x0105da5c: 0x105da5c: bne   v0, s5, 0x105da74 addu  a0, s2, zero
+// 0x0105da68: 0x105da68: sll   zero, zero, 0
+// 0x0105da6c: 0x105da6c: bne   v0, s5, 0x105da84 addu  a0, s2, zero
 	ldloc 5
 	ldloc 12
 	ldloc 9
 	stloc.1
-	bne.un L_105da74
+	bne.un L_105da84
 // --- basic block ---
-// 0x0105da64: 0x105da64: jal   0x105cc80 addu  a1, zero, zero
+// 0x0105da74: 0x105da74: jal   0x105cc90 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6796,16 +6796,16 @@ L_105da54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105da6c: 0x105da6c: j	 0x105da80 sll   zero, zero, 0
-	br L_105da80
+// 0x0105da7c: 0x105da7c: j	 0x105da90 sll   zero, zero, 0
+	br L_105da90
 // --- basic block ---
-L_105da74:
-// 0x0105da74: 0x105da74: jal   0x105cc80 addiu a1, zero, 1
+L_105da84:
+// 0x0105da84: 0x105da84: jal   0x105cc90 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -6813,18 +6813,18 @@ L_105da74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105da7c: 0x105da7c: addiu v0, v0, 180
+// 0x0105da8c: 0x105da8c: addiu v0, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-L_105da80:
-// 0x0105da80: 0x105da80: lw    a0, 160(sp)
+L_105da90:
+// 0x0105da90: 0x105da90: lw    a0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6833,99 +6833,99 @@ L_105da80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105da84: 0x105da84: sll   zero, zero, 0
-// 0x0105da88: 0x105da88: subu  v0, a0, v0
+// 0x0105da94: 0x105da94: sll   zero, zero, 0
+// 0x0105da98: 0x105da98: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-L_105da8c:
-// 0x0105da8c: 0x105da8c: slti  v1, v0, 181
+L_105da9c:
+// 0x0105da9c: 0x105da9c: slti  v1, v0, 181
 	ldloc 5
 	ldc.i4 181
 	clt
 	stloc 7
-// 0x0105da90: 0x105da90: beq   v1, zero, 0x105da8c addiu v0, v0, -360
+// 0x0105daa0: 0x105daa0: beq   v1, zero, 0x105da9c addiu v0, v0, -360
 	ldloc 7
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-	brfalse L_105da8c
+	brfalse L_105da9c
 // --- basic block ---
-// 0x0105da98: 0x105da98: addiu v0, v0, 360
+// 0x0105daa8: 0x105daa8: addiu v0, v0, 360
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-// 0x0105da9c: 0x105da9c: j	 0x105daa8 slti  v1, v0, -180
+// 0x0105daac: 0x105daac: j	 0x105dab8 slti  v1, v0, -180
 	ldloc 5
 	ldc.i4 -180
 	clt
 	stloc 7
-	br L_105daa8
+	br L_105dab8
 // --- basic block ---
-L_105daa4:
-// 0x0105daa4: 0x105daa4: slti  v1, v0, -180
+L_105dab4:
+// 0x0105dab4: 0x105dab4: slti  v1, v0, -180
 	ldloc 5
 	ldc.i4 -180
 	clt
 	stloc 7
-L_105daa8:
-// 0x0105daa8: 0x105daa8: bne   v1, zero, 0x105daa4 addiu v0, v0, 360
+L_105dab8:
+// 0x0105dab8: 0x105dab8: bne   v1, zero, 0x105dab4 addiu v0, v0, 360
 	ldloc 7
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-	brtrue L_105daa4
+	brtrue L_105dab4
 // --- basic block ---
-// 0x0105dab0: 0x105dab0: addiu v0, v0, -360
+// 0x0105dac0: 0x105dac0: addiu v0, v0, -360
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-// 0x0105dab4: 0x105dab4: slti  v1, v0, -45
+// 0x0105dac4: 0x105dac4: slti  v1, v0, -45
 	ldloc 5
 	ldc.i4.s -45
 	clt
 	stloc 7
-// 0x0105dab8: 0x105dab8: beq   v1, zero, 0x105dacc slti  v0, v0, 46
+// 0x0105dac8: 0x105dac8: beq   v1, zero, 0x105dadc slti  v0, v0, 46
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 46
 	clt
 	stloc 5
-	brfalse L_105dacc
+	brfalse L_105dadc
 // --- basic block ---
-// 0x0105dac0: 0x105dac0: addiu a1, zero, 1
+// 0x0105dad0: 0x105dad0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0105dac4: 0x105dac4: j	 0x105dae4 sb    a1, 54(s0)
+// 0x0105dad4: 0x105dad4: j	 0x105daf4 sb    a1, 54(s0)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_105dae4
+	br L_105daf4
 // --- basic block ---
-L_105dacc:
-// 0x0105dacc: 0x105dacc: bne   v0, zero, 0x105dadc addu  a0, s0, zero
+L_105dadc:
+// 0x0105dadc: 0x105dadc: bne   v0, zero, 0x105daec addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_105dadc
+	brtrue L_105daec
 // --- basic block ---
-// 0x0105dad4: 0x105dad4: j	 0x105dae4 sb    zero, 54(s0)
+// 0x0105dae4: 0x105dae4: j	 0x105daf4 sb    zero, 54(s0)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_105dae4
+	br L_105daf4
 // --- basic block ---
-L_105dadc:
-// 0x0105dadc: 0x105dadc: jal   0x105cf14 addu  a1, s2, zero
+L_105daec:
+// 0x0105daec: 0x105daec: jal   0x105cf24 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -6933,13 +6933,13 @@ L_105dadc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_check_neighbours_105cf14(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_check_neighbours_105cf24(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105dae4:
-// 0x0105dae4: 0x105dae4: lw    a3, 168(sp)
+L_105daf4:
+// 0x0105daf4: 0x105daf4: lw    a3, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6948,28 +6948,28 @@ L_105dae4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105dae8: 0x105dae8: sll   zero, zero, 0
-// 0x0105daec: 0x105daec: slt   v0, s4, a3
+// 0x0105daf8: 0x105daf8: sll   zero, zero, 0
+// 0x0105dafc: 0x105dafc: slt   v0, s4, a3
 	ldloc 10
 	ldloc 4
 	clt
 	stloc 5
-// 0x0105daf0: 0x105daf0: beq   v0, zero, 0x105db00 slt   v0, s4, s6
+// 0x0105db00: 0x105db00: beq   v0, zero, 0x105db10 slt   v0, s4, s6
 	ldloc 5
 	ldloc 10
 	ldloc 13
 	clt
 	stloc 5
-	brfalse L_105db00
+	brfalse L_105db10
 // --- basic block ---
-// 0x0105daf8: 0x105daf8: bne   v0, zero, 0x105d9ac addu  a0, s4, zero
+// 0x0105db08: 0x105db08: bne   v0, zero, 0x105d9bc addu  a0, s4, zero
 	ldloc 5
 	ldloc 10
 	stloc.1
-	brtrue L_105d9ac
+	brtrue L_105d9bc
 // --- basic block ---
-L_105db00:
-// 0x0105db00: 0x105db00: lw    v0, 284(sp)
+L_105db10:
+// 0x0105db10: 0x105db10: lw    v0, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6978,13 +6978,13 @@ L_105db00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105db04: 0x105db04: sll   zero, zero, 0
-// 0x0105db08: 0x105db08: bne   v0, s6, 0x105db24 sll   zero, zero, 0
+// 0x0105db14: 0x105db14: sll   zero, zero, 0
+// 0x0105db18: 0x105db18: bne   v0, s6, 0x105db34 sll   zero, zero, 0
 	ldloc 5
 	ldloc 13
-	bne.un L_105db24
+	bne.un L_105db34
 // --- basic block ---
-// 0x0105db10: 0x105db10: lw    a0, 168(sp)
+// 0x0105db20: 0x105db20: lw    a0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6993,7 +6993,7 @@ L_105db00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105db14: 0x105db14: jalr  s3 sll   zero, zero, 0
+// 0x0105db24: 0x105db24: jalr  s3 sll   zero, zero, 0
 	ldloc 14
 	ldloc.0
 	ldloc.1
@@ -7005,22 +7005,22 @@ L_105db00:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105db1c: 0x105db1c: addiu v1, zero, 15
+// 0x0105db2c: 0x105db2c: addiu v1, zero, 15
 	ldc.i4.s 15
 	stloc 7
-// 0x0105db20: 0x105db20: sb    v1, 54(v0)
+// 0x0105db30: 0x105db30: sb    v1, 54(v0)
 	ldloc 5
 	ldc.i4.s 54
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_105db24:
-// 0x0105db24: 0x105db24: blez  s6, 0x105db5c sll   zero, zero, 0
+L_105db34:
+// 0x0105db34: 0x105db34: blez  s6, 0x105db6c sll   zero, zero, 0
 	ldloc 13
 	ldc.i4.s 0
-	ble L_105db5c
+	ble L_105db6c
 // --- basic block ---
-// 0x0105db2c: 0x105db2c: jalr  s3 addu  a0, zero, zero
+// 0x0105db3c: 0x105db3c: jalr  s3 addu  a0, zero, zero
 	ldloc 14
 	ldc.i4.s 0
 	stloc.1
@@ -7034,48 +7034,48 @@ L_105db24:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105db34: 0x105db34: lb    v1, 50(v0)
+// 0x0105db44: 0x105db44: lb    v1, 50(v0)
 	ldloc 5
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105db38: 0x105db38: addu  a1, v0, zero
+// 0x0105db48: 0x105db48: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105db3c: 0x105db3c: addiu v0, zero, 1
+// 0x0105db4c: 0x105db4c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105db40: 0x105db40: bne   v1, v0, 0x105db50 addu  a0, s8, zero
+// 0x0105db50: 0x105db50: bne   v1, v0, 0x105db60 addu  a0, s8, zero
 	ldloc 7
 	ldloc 5
 	ldloc 16
 	stloc.1
-	bne.un L_105db50
+	bne.un L_105db60
 // --- basic block ---
-// 0x0105db48: 0x105db48: j	 0x105db54 addu  a2, zero, zero
+// 0x0105db58: 0x105db58: j	 0x105db64 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_105db54
+	br L_105db64
 // --- basic block ---
-L_105db50:
-// 0x0105db50: 0x105db50: addiu a2, zero, 1
+L_105db60:
+// 0x0105db60: 0x105db60: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-L_105db54:
-// 0x0105db54: 0x105db54: jal   0x105d4ec sll   zero, zero, 0
+L_105db64:
+// 0x0105db64: 0x105db64: jal   0x105d4fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_fix_line_end_105d4ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_fix_line_end_105d4fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105db5c:
-// 0x0105db5c: 0x105db5c: lw    v1, 284(sp)
+L_105db6c:
+// 0x0105db6c: 0x105db6c: lw    v1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7084,17 +7084,17 @@ L_105db5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105db60: 0x105db60: sll   zero, zero, 0
-// 0x0105db64: 0x105db64: bne   v1, s6, 0x105db9c addiu a0, s6, -1
+// 0x0105db70: 0x105db70: sll   zero, zero, 0
+// 0x0105db74: 0x105db74: bne   v1, s6, 0x105dbac addiu a0, s6, -1
 	ldloc 7
 	ldloc 13
 	ldloc 13
 	ldc.i4.m1
 	add
 	stloc.1
-	bne.un L_105db9c
+	bne.un L_105dbac
 // --- basic block ---
-// 0x0105db6c: 0x105db6c: lw    a0, 168(sp)
+// 0x0105db7c: 0x105db7c: lw    a0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7103,7 +7103,7 @@ L_105db5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105db70: 0x105db70: jalr  s3 sll   zero, zero, 0
+// 0x0105db80: 0x105db80: jalr  s3 sll   zero, zero, 0
 	ldloc 14
 	ldloc.0
 	ldloc.1
@@ -7115,47 +7115,47 @@ L_105db5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105db78: 0x105db78: lb    v1, 50(v0)
+// 0x0105db88: 0x105db88: lb    v1, 50(v0)
 	ldloc 5
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105db7c: 0x105db7c: addu  a1, v0, zero
+// 0x0105db8c: 0x105db8c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105db80: 0x105db80: addiu v0, zero, 1
+// 0x0105db90: 0x105db90: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105db84: 0x105db84: bne   v1, v0, 0x105dbb8 addu  a0, s1, zero
+// 0x0105db94: 0x105db94: bne   v1, v0, 0x105dbc8 addu  a0, s1, zero
 	ldloc 7
 	ldloc 5
 	ldloc 11
 	stloc.1
-	bne.un L_105dbb8
+	bne.un L_105dbc8
 // --- basic block ---
-// 0x0105db8c: 0x105db8c: addiu a2, zero, 1
+// 0x0105db9c: 0x105db9c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-L_105db90:
-// 0x0105db90: 0x105db90: jal   0x105d4ec sll   zero, zero, 0
+L_105dba0:
+// 0x0105dba0: 0x105dba0: jal   0x105d4fc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_fix_line_end_105d4ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_fix_line_end_105d4fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105db98: 0x105db98: addiu a0, s6, -1
+// 0x0105dba8: 0x105dba8: addiu a0, s6, -1
 	ldloc 13
 	ldc.i4.m1
 	add
 	stloc.1
-L_105db9c:
-// 0x0105db9c: 0x105db9c: sw    zero, 164(sp)
+L_105dbac:
+// 0x0105dbac: 0x105dbac: sw    zero, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7164,7 +7164,7 @@ L_105db9c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dba0: 0x105dba0: sw    zero, 200(sp)
+// 0x0105dbb0: 0x105dbb0: sw    zero, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7173,10 +7173,10 @@ L_105db9c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dba4: 0x105dba4: addu  s7, zero, zero
+// 0x0105dbb4: 0x105dbb4: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x0105dba8: 0x105dba8: sw    a0, 224(sp)
+// 0x0105dbb8: 0x105dbb8: sw    a0, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7185,7 +7185,7 @@ L_105db9c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105dbac: 0x105dbac: sw    s3, 172(sp)
+// 0x0105dbbc: 0x105dbbc: sw    s3, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7194,7 +7194,7 @@ L_105db9c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105dbb0: 0x105dbb0: j	 0x105e178 sw    s6, 228(sp)
+// 0x0105dbc0: 0x105dbc0: j	 0x105e188 sw    s6, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7203,16 +7203,16 @@ L_105db9c:
 	add
 	ldloc 13
 	stelem.i4
-	br L_105e178
+	br L_105e188
 // --- basic block ---
-L_105dbb8:
-// 0x0105dbb8: 0x105dbb8: j	 0x105db90 addu  a2, zero, zero
+L_105dbc8:
+// 0x0105dbc8: 0x105dbc8: j	 0x105dba0 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_105db90
+	br L_105dba0
 // --- basic block ---
-L_105dbc0:
-// 0x0105dbc0: 0x105dbc0: lw    a1, 172(sp)
+L_105dbd0:
+// 0x0105dbd0: 0x105dbd0: lw    a1, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7221,8 +7221,8 @@ L_105dbc0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105dbc4: 0x105dbc4: sll   zero, zero, 0
-// 0x0105dbc8: 0x105dbc8: jalr  a1 addu  a0, s7, zero
+// 0x0105dbd4: 0x105dbd4: sll   zero, zero, 0
+// 0x0105dbd8: 0x105dbd8: jalr  a1 addu  a0, s7, zero
 	ldloc.2
 	ldloc 15
 	stloc.1
@@ -7236,7 +7236,7 @@ L_105dbc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105dbd0: 0x105dbd0: sw    v0, 176(sp)
+// 0x0105dbe0: 0x105dbe0: sw    v0, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7245,7 +7245,7 @@ L_105dbc0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105dbd4: 0x105dbd4: lw    a3, 200(sp)
+// 0x0105dbe4: 0x105dbe4: lw    a3, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7254,27 +7254,27 @@ L_105dbc0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105dbd8: 0x105dbd8: lb    v1, 54(v0)
+// 0x0105dbe8: 0x105dbe8: lb    v1, 54(v0)
 	ldloc 5
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105dbdc: 0x105dbdc: sh    a3, 44(v0)
+// 0x0105dbec: 0x105dbec: sh    a3, 44(v0)
 	ldloc 5
 	ldc.i4.s 44
 	add
 	ldloc 4
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x0105dbe0: 0x105dbe0: addiu v0, zero, 6
+// 0x0105dbf0: 0x105dbf0: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x0105dbe4: 0x105dbe4: bne   v1, v0, 0x105e140 sll   zero, zero, 0
+// 0x0105dbf4: 0x105dbf4: bne   v1, v0, 0x105e150 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_105e140
+	bne.un L_105e150
 // --- basic block ---
-// 0x0105dbec: 0x105dbec: lw    v1, 224(sp)
+// 0x0105dbfc: 0x105dbfc: lw    v1, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7283,17 +7283,17 @@ L_105dbc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105dbf0: 0x105dbf0: sll   zero, zero, 0
-// 0x0105dbf4: 0x105dbf4: slt   v0, s7, v1
+// 0x0105dc00: 0x105dc00: sll   zero, zero, 0
+// 0x0105dc04: 0x105dc04: slt   v0, s7, v1
 	ldloc 15
 	ldloc 7
 	clt
 	stloc 5
-// 0x0105dbf8: 0x105dbf8: beq   v0, zero, 0x105e140 sll   zero, zero, 0
+// 0x0105dc08: 0x105dc08: beq   v0, zero, 0x105e150 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105e140
+	brfalse L_105e150
 // --- basic block ---
-// 0x0105dc00: 0x105dc00: lw    a1, 164(sp)
+// 0x0105dc10: 0x105dc10: lw    a1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7302,7 +7302,7 @@ L_105dbc0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105dc04: 0x105dc04: lw    a3, 172(sp)
+// 0x0105dc14: 0x105dc14: lw    a3, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7311,8 +7311,8 @@ L_105dbc0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105dc08: 0x105dc08: sll   zero, zero, 0
-// 0x0105dc0c: 0x105dc0c: jalr  a3 subu  a0, s7, a1
+// 0x0105dc18: 0x105dc18: sll   zero, zero, 0
+// 0x0105dc1c: 0x105dc1c: jalr  a3 subu  a0, s7, a1
 	ldloc 4
 	ldloc 15
 	ldloc.2
@@ -7328,7 +7328,7 @@ L_105dbc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105dc14: 0x105dc14: lw    v1, 172(sp)
+// 0x0105dc24: 0x105dc24: lw    v1, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7337,10 +7337,10 @@ L_105dbc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105dc18: 0x105dc18: addu  s1, v0, zero
+// 0x0105dc28: 0x105dc28: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0105dc1c: 0x105dc1c: jalr  v1 addiu a0, s7, 1
+// 0x0105dc2c: 0x105dc2c: jalr  v1 addiu a0, s7, 1
 	ldloc 7
 	ldloc 15
 	ldc.i4.1
@@ -7356,24 +7356,24 @@ L_105dbc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105dc24: 0x105dc24: lb    v1, 52(s1)
+// 0x0105dc34: 0x105dc34: lb    v1, 52(s1)
 	ldloc 11
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105dc28: 0x105dc28: addu  s4, v0, zero
+// 0x0105dc38: 0x105dc38: addu  s4, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0105dc2c: 0x105dc2c: addiu a0, s1, 53
+// 0x0105dc3c: 0x105dc3c: addiu a0, s1, 53
 	ldloc 11
 	ldc.i4.s 53
 	add
 	stloc.1
-// 0x0105dc30: 0x105dc30: addiu v0, zero, 1
+// 0x0105dc40: 0x105dc40: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105dc34: 0x105dc34: bne   v1, v0, 0x105dc48 sw    a0, 220(sp)
+// 0x0105dc44: 0x105dc44: bne   v1, v0, 0x105dc58 sw    a0, 220(sp)
 	ldloc 7
 	ldloc 5
 	ldloc 6
@@ -7384,12 +7384,12 @@ L_105dbc0:
 	add
 	ldloc.1
 	stelem.i4
-	bne.un L_105dc48
+	bne.un L_105dc58
 // --- basic block ---
-// 0x0105dc3c: 0x105dc3c: addu  s6, s1, zero
+// 0x0105dc4c: 0x105dc4c: addu  s6, s1, zero
 	ldloc 11
 	stloc 13
-// 0x0105dc40: 0x105dc40: j	 0x105dc54 sw    zero, 216(sp)
+// 0x0105dc50: 0x105dc50: j	 0x105dc64 sw    zero, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7398,18 +7398,18 @@ L_105dbc0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_105dc54
+	br L_105dc64
 // --- basic block ---
-L_105dc48:
-// 0x0105dc48: 0x105dc48: addiu a1, zero, 1
+L_105dc58:
+// 0x0105dc58: 0x105dc58: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0105dc4c: 0x105dc4c: addiu s6, s1, 56
+// 0x0105dc5c: 0x105dc5c: addiu s6, s1, 56
 	ldloc 11
 	ldc.i4.s 56
 	add
 	stloc 13
-// 0x0105dc50: 0x105dc50: sw    a1, 216(sp)
+// 0x0105dc60: 0x105dc60: sw    a1, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7418,33 +7418,33 @@ L_105dc48:
 	add
 	ldloc.2
 	stelem.i4
-L_105dc54:
-// 0x0105dc54: 0x105dc54: addiu v0, zero, -1
+L_105dc64:
+// 0x0105dc64: 0x105dc64: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105dc58: 0x105dc58: lb    v1, 50(s1)
+// 0x0105dc68: 0x105dc68: lb    v1, 50(s1)
 	ldloc 11
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105dc5c: 0x105dc5c: sb    v0, 53(s1)
+// 0x0105dc6c: 0x105dc6c: sb    v0, 53(s1)
 	ldloc 11
 	ldc.i4.s 53
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105dc60: 0x105dc60: addiu v0, zero, 1
+// 0x0105dc70: 0x105dc70: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105dc64: 0x105dc64: bne   v1, v0, 0x105dc7c addu  a0, s1, zero
+// 0x0105dc74: 0x105dc74: bne   v1, v0, 0x105dc8c addu  a0, s1, zero
 	ldloc 7
 	ldloc 5
 	ldloc 11
 	stloc.1
-	bne.un L_105dc7c
+	bne.un L_105dc8c
 // --- basic block ---
-// 0x0105dc6c: 0x105dc6c: jal   0x105cc80 addiu a1, zero, 1
+// 0x0105dc7c: 0x105dc7c: jal   0x105cc90 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -7452,12 +7452,12 @@ L_105dc54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105dc74: 0x105dc74: j	 0x105dc8c sw    zero, 36(sp)
+// 0x0105dc84: 0x105dc84: j	 0x105dc9c sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7466,10 +7466,10 @@ L_105dc54:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_105dc8c
+	br L_105dc9c
 // --- basic block ---
-L_105dc7c:
-// 0x0105dc7c: 0x105dc7c: jal   0x105cc80 addu  a1, zero, zero
+L_105dc8c:
+// 0x0105dc8c: 0x105dc8c: jal   0x105cc90 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -7477,17 +7477,17 @@ L_105dc7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105dc84: 0x105dc84: addiu v0, v0, 180
+// 0x0105dc94: 0x105dc94: addiu v0, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-// 0x0105dc88: 0x105dc88: sw    zero, 36(sp)
+// 0x0105dc98: 0x105dc98: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7496,8 +7496,8 @@ L_105dc7c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_105dc8c:
-// 0x0105dc8c: 0x105dc8c: sw    zero, 40(sp)
+L_105dc9c:
+// 0x0105dc9c: 0x105dc9c: sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7506,7 +7506,7 @@ L_105dc8c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dc90: 0x105dc90: sw    zero, 44(sp)
+// 0x0105dca0: 0x105dca0: sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7515,7 +7515,7 @@ L_105dc8c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dc94: 0x105dc94: sw    zero, 48(sp)
+// 0x0105dca4: 0x105dca4: sw    zero, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7524,7 +7524,7 @@ L_105dc8c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dc98: 0x105dc98: sw    v0, 204(sp)
+// 0x0105dca8: 0x105dca8: sw    v0, 204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7533,26 +7533,26 @@ L_105dc8c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105dc9c: 0x105dc9c: lb    v0, 50(s6)
+// 0x0105dcac: 0x105dcac: lb    v0, 50(s6)
 	ldloc 13
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105dca0: 0x105dca0: addiu a3, zero, 1
+// 0x0105dcb0: 0x105dcb0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0105dca4: 0x105dca4: xori  v0, v0, 1
+// 0x0105dcb4: 0x105dcb4: xori  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	xor
 	stloc 5
-// 0x0105dca8: 0x105dca8: sltu  v0, zero, v0
+// 0x0105dcb8: 0x105dcb8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0105dcac: 0x105dcac: lw    s2, 24(s6)
+// 0x0105dcbc: 0x105dcbc: lw    s2, 24(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -7561,13 +7561,13 @@ L_105dc8c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105dcb0: 0x105dcb0: lh    s5, 36(s6)
+// 0x0105dcc0: 0x105dcc0: lh    s5, 36(s6)
 	ldloc 13
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 12
-// 0x0105dcb4: 0x105dcb4: sw    v0, 188(sp)
+// 0x0105dcc4: 0x105dcc4: sw    v0, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7576,12 +7576,12 @@ L_105dc8c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105dcb8: 0x105dcb8: addiu s8, s6, 56
+// 0x0105dcc8: 0x105dcc8: addiu s8, s6, 56
 	ldloc 13
 	ldc.i4.s 56
 	add
 	stloc 16
-// 0x0105dcbc: 0x105dcbc: sw    a3, 160(sp)
+// 0x0105dccc: 0x105dccc: sw    a3, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7590,7 +7590,7 @@ L_105dc8c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105dcc0: 0x105dcc0: sw    zero, 196(sp)
+// 0x0105dcd0: 0x105dcd0: sw    zero, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7599,7 +7599,7 @@ L_105dc8c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dcc4: 0x105dcc4: sw    zero, 192(sp)
+// 0x0105dcd4: 0x105dcd4: sw    zero, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7608,15 +7608,15 @@ L_105dc8c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dcc8: 0x105dcc8: addiu s3, zero, -1
+// 0x0105dcd8: 0x105dcd8: addiu s3, zero, -1
 	ldc.i4.m1
 	stloc 14
-L_105dccc:
-// 0x0105dccc: 0x105dccc: lui   v1, 0x0
+L_105dcdc:
+// 0x0105dcdc: 0x105dcdc: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-L_105dcd0:
-// 0x0105dcd0: 0x105dcd0: lw    v0, 576(v1)
+L_105dce0:
+// 0x0105dce0: 0x105dce0: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7625,18 +7625,18 @@ L_105dcd0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105dcd4: 0x105dcd4: sll   zero, zero, 0
-// 0x0105dcd8: 0x105dcd8: beq   s2, v0, 0x105dcf0 sll   zero, zero, 0
+// 0x0105dce4: 0x105dce4: sll   zero, zero, 0
+// 0x0105dce8: 0x105dce8: beq   s2, v0, 0x105dd00 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	beq  L_105dcf0
+	beq  L_105dd00
 // --- basic block ---
-// 0x0105dce0: 0x105dce0: bltz  s2, 0x105dcf0 sll   zero, zero, 0
+// 0x0105dcf0: 0x105dcf0: bltz  s2, 0x105dd00 sll   zero, zero, 0
 	ldloc 9
 	ldc.i4.s 0
-	blt L_105dcf0
+	blt L_105dd00
 // --- basic block ---
-// 0x0105dce8: 0x105dce8: jal   0x100b164 addu  a0, s2, zero
+// 0x0105dcf8: 0x105dcf8: jal   0x100b174 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7644,13 +7644,13 @@ L_105dcd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105dcf0:
-// 0x0105dcf0: 0x105dcf0: lw    a0, 188(sp)
+L_105dd00:
+// 0x0105dd00: 0x105dd00: lw    a0, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7659,14 +7659,14 @@ L_105dcf0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105dcf4: 0x105dcf4: sll   zero, zero, 0
-// 0x0105dcf8: 0x105dcf8: beq   a0, zero, 0x105dd10 addu  a0, s5, zero
+// 0x0105dd04: 0x105dd04: sll   zero, zero, 0
+// 0x0105dd08: 0x105dd08: beq   a0, zero, 0x105dd20 addu  a0, s5, zero
 	ldloc.1
 	ldloc 12
 	stloc.1
-	brfalse L_105dd10
+	brfalse L_105dd20
 // --- basic block ---
-// 0x0105dd00: 0x105dd00: jal   0x1003b08 addiu a1, sp, 32
+// 0x0105dd10: 0x105dd10: jal   0x1003b08 addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -7676,15 +7676,15 @@ L_105dcf0:
 	call int32 Cibyl2::roadmap_line_from_point_1003b08(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0105dd08: 0x105dd08: j	 0x105dd1c addiu v1, sp, 52
+// 0x0105dd18: 0x105dd18: j	 0x105dd2c addiu v1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 7
-	br L_105dd1c
+	br L_105dd2c
 // --- basic block ---
-L_105dd10:
-// 0x0105dd10: 0x105dd10: jal   0x1003b2c addiu a1, sp, 32
+L_105dd20:
+// 0x0105dd20: 0x105dd20: jal   0x1003b2c addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -7694,13 +7694,13 @@ L_105dd10:
 	call int32 Cibyl2::roadmap_line_to_point_1003b2c(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0105dd18: 0x105dd18: addiu v1, sp, 52
+// 0x0105dd28: 0x105dd28: addiu v1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 7
-L_105dd1c:
-// 0x0105dd1c: 0x105dd1c: lw    a3, 32(sp)
+L_105dd2c:
+// 0x0105dd2c: 0x105dd2c: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7709,7 +7709,7 @@ L_105dd1c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105dd20: 0x105dd20: lw    a2, 188(sp)
+// 0x0105dd30: 0x105dd30: lw    a2, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7718,10 +7718,10 @@ L_105dd1c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105dd24: 0x105dd24: addiu v0, zero, 1
+// 0x0105dd34: 0x105dd34: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105dd28: 0x105dd28: sw    v1, 16(sp)
+// 0x0105dd38: 0x105dd38: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7730,16 +7730,16 @@ L_105dd1c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105dd2c: 0x105dd2c: addu  a0, s2, zero
+// 0x0105dd3c: 0x105dd3c: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0105dd30: 0x105dd30: addiu v1, zero, 3
+// 0x0105dd40: 0x105dd40: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x0105dd34: 0x105dd34: addu  a1, s5, zero
+// 0x0105dd44: 0x105dd44: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x0105dd38: 0x105dd38: sw    v0, 28(sp)
+// 0x0105dd48: 0x105dd48: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7748,7 +7748,7 @@ L_105dd1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105dd3c: 0x105dd3c: sw    v1, 20(sp)
+// 0x0105dd4c: 0x105dd4c: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7757,7 +7757,7 @@ L_105dd1c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105dd40: 0x105dd40: jal   0x106104c sw    v0, 24(sp)
+// 0x0105dd50: 0x105dd50: jal   0x106105c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7771,12 +7771,12 @@ L_105dd1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::get_connected_segments_106104c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::get_connected_segments_106105c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105dd48: 0x105dd48: sw    v0, 180(sp)
+// 0x0105dd58: 0x105dd58: sw    v0, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7785,25 +7785,25 @@ L_105dd1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105dd4c: 0x105dd4c: addiu v0, v0, -1
+// 0x0105dd5c: 0x105dd5c: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0105dd50: 0x105dd50: sltiu v0, v0, 2
+// 0x0105dd60: 0x105dd60: sltiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt.un
 	stloc 5
-// 0x0105dd54: 0x105dd54: bne   v0, zero, 0x105dd90 addiu s0, sp, 52
+// 0x0105dd64: 0x105dd64: bne   v0, zero, 0x105dda0 addiu s0, sp, 52
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 8
-	brtrue L_105dd90
+	brtrue L_105dda0
 // --- basic block ---
-// 0x0105dd5c: 0x105dd5c: lw    v0, 180(sp)
+// 0x0105dd6c: 0x105dd6c: lw    v0, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7812,29 +7812,29 @@ L_105dd1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105dd60: 0x105dd60: lui   a1, 0x10000
+// 0x0105dd70: 0x105dd70: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105dd64: 0x105dd64: lui   a3, 0x10000
+// 0x0105dd74: 0x105dd74: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105dd68: 0x105dd68: addiu a0, zero, 3
+// 0x0105dd78: 0x105dd78: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105dd6c: 0x105dd6c: addiu a1, a1, 11676
+// 0x0105dd7c: 0x105dd7c: addiu a1, a1, 11672
 	ldloc.2
-	ldc.i4 11676
+	ldc.i4 11672
 	add
 	stloc.2
-// 0x0105dd70: 0x105dd70: addiu a2, zero, 619
+// 0x0105dd80: 0x105dd80: addiu a2, zero, 619
 	ldc.i4 619
 	stloc.3
-// 0x0105dd74: 0x105dd74: addiu a3, a3, 11764
+// 0x0105dd84: 0x105dd84: addiu a3, a3, 11760
 	ldloc 4
-	ldc.i4 11764
+	ldc.i4 11760
 	add
 	stloc 4
-// 0x0105dd78: 0x105dd78: sw    s2, 16(sp)
+// 0x0105dd88: 0x105dd88: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7843,7 +7843,7 @@ L_105dd1c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105dd7c: 0x105dd7c: sw    s5, 20(sp)
+// 0x0105dd8c: 0x105dd8c: sw    s5, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7852,7 +7852,7 @@ L_105dd1c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105dd80: 0x105dd80: jal   0x100449c sw    v0, 24(sp)
+// 0x0105dd90: 0x105dd90: jal   0x100449c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7871,14 +7871,14 @@ L_105dd1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105dd88: 0x105dd88: j	 0x105e140 sll   zero, zero, 0
-	br L_105e140
+// 0x0105dd98: 0x105dd98: j	 0x105e150 sll   zero, zero, 0
+	br L_105e150
 // --- basic block ---
-L_105dd90:
-// 0x0105dd90: 0x105dd90: addu  v1, zero, zero
+L_105dda0:
+// 0x0105dda0: 0x105dda0: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0105dd94: 0x105dd94: sw    zero, 212(sp)
+// 0x0105dda4: 0x105dda4: sw    zero, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7887,7 +7887,7 @@ L_105dd90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dd98: 0x105dd98: sw    zero, 184(sp)
+// 0x0105dda8: 0x105dda8: sw    zero, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7896,18 +7896,18 @@ L_105dd90:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105dd9c: 0x105dd9c: lui   a1, 0x0
+// 0x0105ddac: 0x105ddac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-L_105dda0:
-// 0x0105dda0: 0x105dda0: lw    a0, 0(s0)
+L_105ddb0:
+// 0x0105ddb0: 0x105ddb0: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0105dda4: 0x105dda4: lw    v0, 576(a1)
+// 0x0105ddb4: 0x105ddb4: lw    v0, 576(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -7916,18 +7916,18 @@ L_105dda0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105dda8: 0x105dda8: sll   zero, zero, 0
-// 0x0105ddac: 0x105ddac: beq   a0, v0, 0x105ddc8 sll   zero, zero, 0
+// 0x0105ddb8: 0x105ddb8: sll   zero, zero, 0
+// 0x0105ddbc: 0x105ddbc: beq   a0, v0, 0x105ddd8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_105ddc8
+	beq  L_105ddd8
 // --- basic block ---
-// 0x0105ddb4: 0x105ddb4: bltz  a0, 0x105ddc8 sll   zero, zero, 0
+// 0x0105ddc4: 0x105ddc4: bltz  a0, 0x105ddd8 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105ddc8
+	blt L_105ddd8
 // --- basic block ---
-// 0x0105ddbc: 0x105ddbc: jal   0x100b164 sw    v1, 232(sp)
+// 0x0105ddcc: 0x105ddcc: jal   0x100b174 sw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7941,12 +7941,12 @@ L_105dda0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ddc4: 0x105ddc4: lw    v1, 232(sp)
+// 0x0105ddd4: 0x105ddd4: lw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7955,8 +7955,8 @@ L_105dda0:
 	add
 	ldelem.i4
 	stloc 7
-L_105ddc8:
-// 0x0105ddc8: 0x105ddc8: lw    a0, 4(s0)
+L_105ddd8:
+// 0x0105ddd8: 0x105ddd8: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7965,7 +7965,7 @@ L_105ddc8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ddcc: 0x105ddcc: jal   0x1003c30 sw    v1, 232(sp)
+// 0x0105dddc: 0x105dddc: jal   0x1003c30 sw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7983,10 +7983,10 @@ L_105ddc8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ddd4: 0x105ddd4: addiu a3, zero, 1
+// 0x0105dde4: 0x105dde4: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0105ddd8: 0x105ddd8: lw    v1, 232(sp)
+// 0x0105dde8: 0x105dde8: lw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7995,16 +7995,16 @@ L_105ddc8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105dddc: 0x105dddc: bne   v0, a3, 0x105de90 addiu a3, v1, 1
+// 0x0105ddec: 0x105ddec: bne   v0, a3, 0x105dea0 addiu a3, v1, 1
 	ldloc 5
 	ldloc 4
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 4
-	bne.un L_105de90
+	bne.un L_105dea0
 // --- basic block ---
-// 0x0105dde4: 0x105dde4: lw    a0, 212(sp)
+// 0x0105ddf4: 0x105ddf4: lw    a0, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8013,38 +8013,38 @@ L_105ddc8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105dde8: 0x105dde8: sll   zero, zero, 0
-// 0x0105ddec: 0x105ddec: beq   a0, zero, 0x105de28 sltu  v0, s8, s4
+// 0x0105ddf8: 0x105ddf8: sll   zero, zero, 0
+// 0x0105ddfc: 0x105ddfc: beq   a0, zero, 0x105de38 sltu  v0, s8, s4
 	ldloc.1
 	ldloc 16
 	ldloc 10
 	clt.un
 	stloc 5
-	brfalse L_105de28
+	brfalse L_105de38
 // --- basic block ---
-// 0x0105ddf4: 0x105ddf4: lui   a1, 0x10000
+// 0x0105de04: 0x105de04: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105ddf8: 0x105ddf8: lui   a3, 0x10000
+// 0x0105de08: 0x105de08: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105ddfc: 0x105ddfc: addiu a0, zero, 3
+// 0x0105de0c: 0x105de0c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105de00: 0x105de00: addiu a1, a1, 11676
+// 0x0105de10: 0x105de10: addiu a1, a1, 11672
 	ldloc.2
-	ldc.i4 11676
+	ldc.i4 11672
 	add
 	stloc.2
-// 0x0105de04: 0x105de04: addiu a2, zero, 636
+// 0x0105de14: 0x105de14: addiu a2, zero, 636
 	ldc.i4 636
 	stloc.3
-// 0x0105de08: 0x105de08: addiu a3, a3, 11824
+// 0x0105de18: 0x105de18: addiu a3, a3, 11820
 	ldloc 4
-	ldc.i4 11824
+	ldc.i4 11820
 	add
 	stloc 4
-// 0x0105de0c: 0x105de0c: sw    v0, 232(sp)
+// 0x0105de1c: 0x105de1c: sw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8053,7 +8053,7 @@ L_105ddc8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105de10: 0x105de10: sw    s2, 16(sp)
+// 0x0105de20: 0x105de20: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8062,7 +8062,7 @@ L_105ddc8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105de14: 0x105de14: jal   0x100449c sw    s5, 20(sp)
+// 0x0105de24: 0x105de24: jal   0x100449c sw    s5, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8081,7 +8081,7 @@ L_105ddc8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105de1c: 0x105de1c: lw    v0, 232(sp)
+// 0x0105de2c: 0x105de2c: lw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8090,11 +8090,11 @@ L_105ddc8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105de20: 0x105de20: j	 0x105dec0 sll   zero, zero, 0
-	br L_105dec0
+// 0x0105de30: 0x105de30: j	 0x105ded0 sll   zero, zero, 0
+	br L_105ded0
 // --- basic block ---
-L_105de28:
-// 0x0105de28: 0x105de28: lw    a1, 12(s0)
+L_105de38:
+// 0x0105de38: 0x105de38: lw    a1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8103,14 +8103,14 @@ L_105de28:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105de2c: 0x105de2c: lw    s2, 0(s0)
+// 0x0105de3c: 0x105de3c: lw    s2, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0105de30: 0x105de30: lw    s5, 4(s0)
+// 0x0105de40: 0x105de40: lw    s5, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8119,13 +8119,13 @@ L_105de28:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105de34: 0x105de34: lbu   a0, 8(s0)
+// 0x0105de44: 0x105de44: lbu   a0, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x0105de38: 0x105de38: beq   v0, zero, 0x105de78 sw    a1, 32(sp)
+// 0x0105de48: 0x105de48: beq   v0, zero, 0x105de88 sw    a1, 32(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -8135,9 +8135,9 @@ L_105de28:
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_105de78
+	brfalse L_105de88
 // --- basic block ---
-// 0x0105de40: 0x105de40: lw    v0, 24(s8)
+// 0x0105de50: 0x105de50: lw    v0, 24(s8)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -8146,53 +8146,53 @@ L_105de28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105de44: 0x105de44: sll   zero, zero, 0
-// 0x0105de48: 0x105de48: bne   s2, v0, 0x105de60 lui   a1, 0x10000
+// 0x0105de54: 0x105de54: sll   zero, zero, 0
+// 0x0105de58: 0x105de58: bne   s2, v0, 0x105de70 lui   a1, 0x10000
 	ldloc 9
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	bne.un L_105de60
+	bne.un L_105de70
 // --- basic block ---
-// 0x0105de50: 0x105de50: lh    v0, 36(s8)
+// 0x0105de60: 0x105de60: lh    v0, 36(s8)
 	ldloc 16
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105de54: 0x105de54: sll   zero, zero, 0
-// 0x0105de58: 0x105de58: beq   s5, v0, 0x105de78 sll   zero, zero, 0
+// 0x0105de64: 0x105de64: sll   zero, zero, 0
+// 0x0105de68: 0x105de68: beq   s5, v0, 0x105de88 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	beq  L_105de78
+	beq  L_105de88
 // --- basic block ---
-L_105de60:
-// 0x0105de60: 0x105de60: lui   a3, 0x10000
+L_105de70:
+// 0x0105de70: 0x105de70: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105de64: 0x105de64: addiu a0, zero, 3
+// 0x0105de74: 0x105de74: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105de68: 0x105de68: addiu a1, a1, 11676
+// 0x0105de78: 0x105de78: addiu a1, a1, 11672
 	ldloc.2
-	ldc.i4 11676
+	ldc.i4 11672
 	add
 	stloc.2
-// 0x0105de6c: 0x105de6c: addiu a2, zero, 655
+// 0x0105de7c: 0x105de7c: addiu a2, zero, 655
 	ldc.i4 655
 	stloc.3
-// 0x0105de70: 0x105de70: j	 0x105e094 addiu a3, a3, 11900
+// 0x0105de80: 0x105de80: j	 0x105e0a4 addiu a3, a3, 11896
 	ldloc 4
-	ldc.i4 11900
+	ldc.i4 11896
 	add
 	stloc 4
-	br L_105e094
+	br L_105e0a4
 // --- basic block ---
-L_105de78:
-// 0x0105de78: 0x105de78: addiu a1, zero, 1
+L_105de88:
+// 0x0105de88: 0x105de88: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0105de7c: 0x105de7c: sw    a0, 188(sp)
+// 0x0105de8c: 0x105de8c: sw    a0, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8201,12 +8201,12 @@ L_105de78:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105de80: 0x105de80: addiu s8, s8, 56
+// 0x0105de90: 0x105de90: addiu s8, s8, 56
 	ldloc 16
 	ldc.i4.s 56
 	add
 	stloc 16
-// 0x0105de84: 0x105de84: sw    v1, 208(sp)
+// 0x0105de94: 0x105de94: sw    v1, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8215,7 +8215,7 @@ L_105de78:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105de88: 0x105de88: j	 0x105e034 sw    a1, 212(sp)
+// 0x0105de98: 0x105de98: j	 0x105e044 sw    a1, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8224,10 +8224,10 @@ L_105de78:
 	add
 	ldloc.2
 	stelem.i4
-	br L_105e034
+	br L_105e044
 // --- basic block ---
-L_105de90:
-// 0x0105de90: 0x105de90: beq   v1, zero, 0x105ded0 sw    a3, 208(sp)
+L_105dea0:
+// 0x0105dea0: 0x105dea0: beq   v1, zero, 0x105dee0 sw    a3, 208(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -8237,31 +8237,31 @@ L_105de90:
 	add
 	ldloc 4
 	stelem.i4
-	brfalse L_105ded0
+	brfalse L_105dee0
 // --- basic block ---
-// 0x0105de98: 0x105de98: lui   a1, 0x10000
+// 0x0105dea8: 0x105dea8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105de9c: 0x105de9c: lui   a3, 0x10000
+// 0x0105deac: 0x105deac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105dea0: 0x105dea0: addiu a0, zero, 3
+// 0x0105deb0: 0x105deb0: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105dea4: 0x105dea4: addiu a1, a1, 11676
+// 0x0105deb4: 0x105deb4: addiu a1, a1, 11672
 	ldloc.2
-	ldc.i4 11676
+	ldc.i4 11672
 	add
 	stloc.2
-// 0x0105dea8: 0x105dea8: addiu a2, zero, 663
+// 0x0105deb8: 0x105deb8: addiu a2, zero, 663
 	ldc.i4 663
 	stloc.3
-// 0x0105deac: 0x105deac: addiu a3, a3, 11952
+// 0x0105debc: 0x105debc: addiu a3, a3, 11948
 	ldloc 4
-	ldc.i4 11952
+	ldc.i4 11948
 	add
 	stloc 4
-// 0x0105deb0: 0x105deb0: sw    s2, 16(sp)
+// 0x0105dec0: 0x105dec0: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8270,7 +8270,7 @@ L_105de90:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105deb4: 0x105deb4: jal   0x100449c sw    s5, 20(sp)
+// 0x0105dec4: 0x105dec4: jal   0x100449c sw    s5, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8289,23 +8289,23 @@ L_105de90:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105debc: 0x105debc: sltu  v0, s8, s4
+// 0x0105decc: 0x105decc: sltu  v0, s8, s4
 	ldloc 16
 	ldloc 10
 	clt.un
 	stloc 5
-L_105dec0:
-// 0x0105dec0: 0x105dec0: beq   v0, zero, 0x105e064 addu  v0, zero, zero
+L_105ded0:
+// 0x0105ded0: 0x105ded0: beq   v0, zero, 0x105e074 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_105e064
+	brfalse L_105e074
 // --- basic block ---
-// 0x0105dec8: 0x105dec8: j	 0x105e140 sll   zero, zero, 0
-	br L_105e140
+// 0x0105ded8: 0x105ded8: j	 0x105e150 sll   zero, zero, 0
+	br L_105e150
 // --- basic block ---
-L_105ded0:
-// 0x0105ded0: 0x105ded0: lw    v1, 196(sp)
+L_105dee0:
+// 0x0105dee0: 0x105dee0: lw    v1, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8314,14 +8314,14 @@ L_105ded0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ded4: 0x105ded4: lw    a0, 0(s0)
+// 0x0105dee4: 0x105dee4: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0105ded8: 0x105ded8: lw    v0, 24(s4)
+// 0x0105dee8: 0x105dee8: lw    v0, 24(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -8330,12 +8330,12 @@ L_105ded0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105dedc: 0x105dedc: addiu v1, v1, 1
+// 0x0105deec: 0x105deec: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0105dee0: 0x105dee0: bne   a0, v0, 0x105df28 sw    v1, 196(sp)
+// 0x0105def0: 0x105def0: bne   a0, v0, 0x105df38 sw    v1, 196(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -8346,15 +8346,15 @@ L_105ded0:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_105df28
+	bne.un L_105df38
 // --- basic block ---
-// 0x0105dee8: 0x105dee8: lh    v0, 36(s4)
+// 0x0105def8: 0x105def8: lh    v0, 36(s4)
 	ldloc 10
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105deec: 0x105deec: lw    v1, 4(s0)
+// 0x0105defc: 0x105defc: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8363,51 +8363,51 @@ L_105ded0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105def0: 0x105def0: sll   zero, zero, 0
-// 0x0105def4: 0x105def4: bne   v1, v0, 0x105df28 sll   zero, zero, 0
+// 0x0105df00: 0x105df00: sll   zero, zero, 0
+// 0x0105df04: 0x105df04: bne   v1, v0, 0x105df38 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_105df28
+	bne.un L_105df38
 // --- basic block ---
-// 0x0105defc: 0x105defc: lbu   v1, 8(s0)
+// 0x0105df0c: 0x105df0c: lbu   v1, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 7
-// 0x0105df00: 0x105df00: lb    v0, 50(s4)
+// 0x0105df10: 0x105df10: lb    v0, 50(s4)
 	ldloc 10
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105df04: 0x105df04: beq   v1, zero, 0x105df20 addiu a3, zero, 1
+// 0x0105df14: 0x105df14: beq   v1, zero, 0x105df30 addiu a3, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 4
-	brfalse L_105df20
+	brfalse L_105df30
 // --- basic block ---
-// 0x0105df0c: 0x105df0c: addiu a1, zero, 2
+// 0x0105df1c: 0x105df1c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105df10: 0x105df10: bne   v0, a1, 0x105df28 sll   zero, zero, 0
+// 0x0105df20: 0x105df20: bne   v0, a1, 0x105df38 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	bne.un L_105df28
+	bne.un L_105df38
 // --- basic block ---
-// 0x0105df18: 0x105df18: j	 0x105df44 addu  v1, s4, zero
+// 0x0105df28: 0x105df28: j	 0x105df54 addu  v1, s4, zero
 	ldloc 10
 	stloc 7
-	br L_105df44
+	br L_105df54
 // --- basic block ---
-L_105df20:
-// 0x0105df20: 0x105df20: beq   v0, a3, 0x105df40 sll   zero, zero, 0
+L_105df30:
+// 0x0105df30: 0x105df30: beq   v0, a3, 0x105df50 sll   zero, zero, 0
 	ldloc 5
 	ldloc 4
-	beq  L_105df40
+	beq  L_105df50
 // --- basic block ---
-L_105df28:
-// 0x0105df28: 0x105df28: lw    a1, 4(s0)
+L_105df38:
+// 0x0105df38: 0x105df38: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -8416,13 +8416,13 @@ L_105df28:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105df2c: 0x105df2c: lbu   a2, 8(s0)
+// 0x0105df3c: 0x105df3c: lbu   a2, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.3
-// 0x0105df30: 0x105df30: jal   0x105cdfc addiu a3, sp, 100
+// 0x0105df40: 0x105df40: jal   0x105ce0c addiu a3, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
@@ -8432,24 +8432,24 @@ L_105df28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_fill_segment_105cdfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_fill_segment_105ce0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105df38: 0x105df38: j	 0x105df44 addiu v1, sp, 100
+// 0x0105df48: 0x105df48: j	 0x105df54 addiu v1, sp, 100
 	ldloc.0
 	ldc.i4.s 100
 	add
 	stloc 7
-	br L_105df44
+	br L_105df54
 // --- basic block ---
-L_105df40:
-// 0x0105df40: 0x105df40: addu  v1, s4, zero
+L_105df50:
+// 0x0105df50: 0x105df50: addu  v1, s4, zero
 	ldloc 10
 	stloc 7
-L_105df44:
-// 0x0105df44: 0x105df44: lw    v0, 216(sp)
+L_105df54:
+// 0x0105df54: 0x105df54: lw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8458,33 +8458,33 @@ L_105df44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105df48: 0x105df48: sll   zero, zero, 0
-// 0x0105df4c: 0x105df4c: beq   v0, zero, 0x105e01c addiu a0, zero, -1
+// 0x0105df58: 0x105df58: sll   zero, zero, 0
+// 0x0105df5c: 0x105df5c: beq   v0, zero, 0x105e02c addiu a0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc.1
-	brfalse L_105e01c
+	brfalse L_105e02c
 // --- basic block ---
-// 0x0105df54: 0x105df54: lb    v0, 50(v1)
+// 0x0105df64: 0x105df64: lb    v0, 50(v1)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105df58: 0x105df58: addiu a0, zero, 1
+// 0x0105df68: 0x105df68: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0105df5c: 0x105df5c: bne   v0, a0, 0x105df78 addu  a0, v1, zero
+// 0x0105df6c: 0x105df6c: bne   v0, a0, 0x105df88 addu  a0, v1, zero
 	ldloc 5
 	ldloc.1
 	ldloc 7
 	stloc.1
-	bne.un L_105df78
+	bne.un L_105df88
 // --- basic block ---
-// 0x0105df64: 0x105df64: addu  a1, zero, zero
+// 0x0105df74: 0x105df74: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105df68: 0x105df68: jal   0x105cc80 sw    v1, 232(sp)
+// 0x0105df78: 0x105df78: jal   0x105cc90 sw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8498,19 +8498,19 @@ L_105df44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105df70: 0x105df70: j	 0x105df88 sll   zero, zero, 0
-	br L_105df88
+// 0x0105df80: 0x105df80: j	 0x105df98 sll   zero, zero, 0
+	br L_105df98
 // --- basic block ---
-L_105df78:
-// 0x0105df78: 0x105df78: addiu a1, zero, 1
+L_105df88:
+// 0x0105df88: 0x105df88: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0105df7c: 0x105df7c: jal   0x105cc80 sw    v1, 232(sp)
+// 0x0105df8c: 0x105df8c: jal   0x105cc90 sw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8524,18 +8524,18 @@ L_105df78:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc80(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_azymuth_105cc90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105df84: 0x105df84: addiu v0, v0, 180
+// 0x0105df94: 0x105df94: addiu v0, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-L_105df88:
-// 0x0105df88: 0x105df88: lw    a1, 204(sp)
+L_105df98:
+// 0x0105df98: 0x105df98: lw    a1, 204(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8544,7 +8544,7 @@ L_105df88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105df8c: 0x105df8c: lw    v1, 232(sp)
+// 0x0105df9c: 0x105df9c: lw    v1, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8553,119 +8553,119 @@ L_105df88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105df90: 0x105df90: subu  v0, a1, v0
+// 0x0105dfa0: 0x105dfa0: subu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc 5
-L_105df94:
-// 0x0105df94: 0x105df94: slti  a0, v0, 181
+L_105dfa4:
+// 0x0105dfa4: 0x105dfa4: slti  a0, v0, 181
 	ldloc 5
 	ldc.i4 181
 	clt
 	stloc.1
-// 0x0105df98: 0x105df98: beq   a0, zero, 0x105df94 addiu v0, v0, -360
+// 0x0105dfa8: 0x105dfa8: beq   a0, zero, 0x105dfa4 addiu v0, v0, -360
 	ldloc.1
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-	brfalse L_105df94
+	brfalse L_105dfa4
 // --- basic block ---
-// 0x0105dfa0: 0x105dfa0: addiu v0, v0, 360
+// 0x0105dfb0: 0x105dfb0: addiu v0, v0, 360
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-// 0x0105dfa4: 0x105dfa4: j	 0x105dfb0 slti  a0, v0, -180
+// 0x0105dfb4: 0x105dfb4: j	 0x105dfc0 slti  a0, v0, -180
 	ldloc 5
 	ldc.i4 -180
 	clt
 	stloc.1
-	br L_105dfb0
+	br L_105dfc0
 // --- basic block ---
-L_105dfac:
-// 0x0105dfac: 0x105dfac: slti  a0, v0, -180
+L_105dfbc:
+// 0x0105dfbc: 0x105dfbc: slti  a0, v0, -180
 	ldloc 5
 	ldc.i4 -180
 	clt
 	stloc.1
-L_105dfb0:
-// 0x0105dfb0: 0x105dfb0: bne   a0, zero, 0x105dfac addiu v0, v0, 360
+L_105dfc0:
+// 0x0105dfc0: 0x105dfc0: bne   a0, zero, 0x105dfbc addiu v0, v0, 360
 	ldloc.1
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-	brtrue L_105dfac
+	brtrue L_105dfbc
 // --- basic block ---
-// 0x0105dfb8: 0x105dfb8: addiu v0, v0, -360
+// 0x0105dfc8: 0x105dfc8: addiu v0, v0, -360
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-// 0x0105dfbc: 0x105dfbc: slti  a0, v0, -164
+// 0x0105dfcc: 0x105dfcc: slti  a0, v0, -164
 	ldloc 5
 	ldc.i4 -164
 	clt
 	stloc.1
-// 0x0105dfc0: 0x105dfc0: bne   a0, zero, 0x105dfe8 slti  a1, v0, -29
+// 0x0105dfd0: 0x105dfd0: bne   a0, zero, 0x105dff8 slti  a1, v0, -29
 	ldloc.1
 	ldloc 5
 	ldc.i4.s -29
 	clt
 	stloc.2
-	brtrue L_105dfe8
+	brtrue L_105dff8
 // --- basic block ---
-// 0x0105dfc8: 0x105dfc8: bne   a1, zero, 0x105dfec addiu a0, zero, 1
+// 0x0105dfd8: 0x105dfd8: bne   a1, zero, 0x105dffc addiu a0, zero, 1
 	ldloc.2
 	ldc.i4.1
 	stloc.1
-	brtrue L_105dfec
+	brtrue L_105dffc
 // --- basic block ---
-// 0x0105dfd0: 0x105dfd0: slti  a1, v0, 30
+// 0x0105dfe0: 0x105dfe0: slti  a1, v0, 30
 	ldloc 5
 	ldc.i4.s 30
 	clt
 	stloc.2
-// 0x0105dfd4: 0x105dfd4: bne   a1, zero, 0x105dfec addiu a0, zero, 2
+// 0x0105dfe4: 0x105dfe4: bne   a1, zero, 0x105dffc addiu a0, zero, 2
 	ldloc.2
 	ldc.i4.2
 	stloc.1
-	brtrue L_105dfec
+	brtrue L_105dffc
 // --- basic block ---
-// 0x0105dfdc: 0x105dfdc: slti  v0, v0, 165
+// 0x0105dfec: 0x105dfec: slti  v0, v0, 165
 	ldloc 5
 	ldc.i4 165
 	clt
 	stloc 5
-// 0x0105dfe0: 0x105dfe0: bne   v0, zero, 0x105dfec addiu a0, zero, 3
+// 0x0105dff0: 0x105dff0: bne   v0, zero, 0x105dffc addiu a0, zero, 3
 	ldloc 5
 	ldc.i4.3
 	stloc.1
-	brtrue L_105dfec
+	brtrue L_105dffc
 // --- basic block ---
-L_105dfe8:
-// 0x0105dfe8: 0x105dfe8: addu  a0, zero, zero
+L_105dff8:
+// 0x0105dff8: 0x105dff8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_105dfec:
-// 0x0105dfec: 0x105dfec: sll   v0, a0, 2
+L_105dffc:
+// 0x0105dffc: 0x105dffc: sll   v0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0105dff0: 0x105dff0: addiu a3, sp, 32
+// 0x0105e000: 0x105e000: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x0105dff4: 0x105dff4: addu  v0, a3, v0
+// 0x0105e004: 0x105e004: addu  v0, a3, v0
 	ldloc 4
 	ldloc 5
 	add
 	stloc 5
-// 0x0105dff8: 0x105dff8: lw    a1, 4(v0)
+// 0x0105e008: 0x105e008: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8674,18 +8674,18 @@ L_105dfec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105dffc: 0x105dffc: sll   zero, zero, 0
-// 0x0105e000: 0x105e000: sltiu a2, a1, 1
+// 0x0105e00c: 0x105e00c: sll   zero, zero, 0
+// 0x0105e010: 0x105e010: sltiu a2, a1, 1
 	ldloc.2
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x0105e004: 0x105e004: addiu a1, a1, 1
+// 0x0105e014: 0x105e014: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0105e008: 0x105e008: sw    a1, 4(v0)
+// 0x0105e018: 0x105e018: sw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8694,7 +8694,7 @@ L_105dfec:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0105e00c: 0x105e00c: lw    v0, 160(sp)
+// 0x0105e01c: 0x105e01c: lw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8703,16 +8703,16 @@ L_105dfec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e010: 0x105e010: subu  a2, zero, a2
+// 0x0105e020: 0x105e020: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x0105e014: 0x105e014: and   v0, v0, a2
+// 0x0105e024: 0x105e024: and   v0, v0, a2
 	ldloc 5
 	ldloc.3
 	and
 	stloc 5
-// 0x0105e018: 0x105e018: sw    v0, 160(sp)
+// 0x0105e028: 0x105e028: sw    v0, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8721,13 +8721,13 @@ L_105dfec:
 	add
 	ldloc 5
 	stelem.i4
-L_105e01c:
-// 0x0105e01c: 0x105e01c: bne   v1, s4, 0x105e034 sll   zero, zero, 0
+L_105e02c:
+// 0x0105e02c: 0x105e02c: bne   v1, s4, 0x105e044 sll   zero, zero, 0
 	ldloc 7
 	ldloc 10
-	bne.un L_105e034
+	bne.un L_105e044
 // --- basic block ---
-// 0x0105e024: 0x105e024: lw    a1, 196(sp)
+// 0x0105e034: 0x105e034: lw    a1, 196(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8736,7 +8736,7 @@ L_105e01c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105e028: 0x105e028: lw    v1, 220(sp)
+// 0x0105e038: 0x105e038: lw    v1, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8745,15 +8745,15 @@ L_105e01c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e02c: 0x105e02c: addu  s3, a0, zero
+// 0x0105e03c: 0x105e03c: addu  s3, a0, zero
 	ldloc.1
 	stloc 14
-// 0x0105e030: 0x105e030: sb    a1, 0(v1)
+// 0x0105e040: 0x105e040: sb    a1, 0(v1)
 	ldloc 7
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_105e034:
-// 0x0105e034: 0x105e034: lw    a3, 184(sp)
+L_105e044:
+// 0x0105e044: 0x105e044: lw    a3, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8762,7 +8762,7 @@ L_105e034:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105e038: 0x105e038: lw    v1, 180(sp)
+// 0x0105e048: 0x105e048: lw    v1, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8771,17 +8771,17 @@ L_105e034:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e03c: 0x105e03c: addiu a3, a3, 1
+// 0x0105e04c: 0x105e04c: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x0105e040: 0x105e040: slt   v0, a3, v1
+// 0x0105e050: 0x105e050: slt   v0, a3, v1
 	ldloc 4
 	ldloc 7
 	clt
 	stloc 5
-// 0x0105e044: 0x105e044: sw    a3, 184(sp)
+// 0x0105e054: 0x105e054: sw    a3, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8790,21 +8790,21 @@ L_105e034:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0105e048: 0x105e048: bne   v0, zero, 0x105e058 addiu s0, s0, 16
+// 0x0105e058: 0x105e058: bne   v0, zero, 0x105e068 addiu s0, s0, 16
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 8
-	brtrue L_105e058
+	brtrue L_105e068
 // --- basic block ---
-// 0x0105e050: 0x105e050: j	 0x105e068 addiu v0, zero, 1
+// 0x0105e060: 0x105e060: j	 0x105e078 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_105e068
+	br L_105e078
 // --- basic block ---
-L_105e058:
-// 0x0105e058: 0x105e058: lw    v1, 208(sp)
+L_105e068:
+// 0x0105e068: 0x105e068: lw    v1, 208(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8813,13 +8813,13 @@ L_105e058:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e05c: 0x105e05c: j	 0x105dda0 lui   a1, 0x0
+// 0x0105e06c: 0x105e06c: j	 0x105ddb0 lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-	br L_105dda0
+	br L_105ddb0
 // --- basic block ---
-L_105e064:
-// 0x0105e064: 0x105e064: sw    zero, 160(sp)
+L_105e074:
+// 0x0105e074: 0x105e074: sw    zero, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8828,8 +8828,8 @@ L_105e064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_105e068:
-// 0x0105e068: 0x105e068: lw    a0, 192(sp)
+L_105e078:
+// 0x0105e078: 0x105e078: lw    a0, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8838,15 +8838,15 @@ L_105e068:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e06c: 0x105e06c: addiu v1, zero, 18
+// 0x0105e07c: 0x105e07c: addiu v1, zero, 18
 	ldc.i4.s 18
 	stloc 7
-// 0x0105e070: 0x105e070: addiu a0, a0, 1
+// 0x0105e080: 0x105e080: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0105e074: 0x105e074: bne   a0, v1, 0x105e0a8 sw    a0, 192(sp)
+// 0x0105e084: 0x105e084: bne   a0, v1, 0x105e0b8 sw    a0, 192(sp)
 	ldloc.1
 	ldloc 7
 	ldloc 6
@@ -8857,32 +8857,32 @@ L_105e068:
 	add
 	ldloc.1
 	stelem.i4
-	bne.un L_105e0a8
+	bne.un L_105e0b8
 // --- basic block ---
-// 0x0105e07c: 0x105e07c: lui   a1, 0x10000
+// 0x0105e08c: 0x105e08c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105e080: 0x105e080: lui   a3, 0x10000
+// 0x0105e090: 0x105e090: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105e084: 0x105e084: addiu a0, zero, 3
+// 0x0105e094: 0x105e094: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0105e088: 0x105e088: addiu a1, a1, 11676
+// 0x0105e098: 0x105e098: addiu a1, a1, 11672
 	ldloc.2
-	ldc.i4 11676
+	ldc.i4 11672
 	add
 	stloc.2
-// 0x0105e08c: 0x105e08c: addiu a2, zero, 715
+// 0x0105e09c: 0x105e09c: addiu a2, zero, 715
 	ldc.i4 715
 	stloc.3
-// 0x0105e090: 0x105e090: addiu a3, a3, 12036
+// 0x0105e0a0: 0x105e0a0: addiu a3, a3, 12032
 	ldloc 4
-	ldc.i4 12036
+	ldc.i4 12032
 	add
 	stloc 4
-L_105e094:
-// 0x0105e094: 0x105e094: sw    s2, 16(sp)
+L_105e0a4:
+// 0x0105e0a4: 0x105e0a4: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8891,7 +8891,7 @@ L_105e094:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105e098: 0x105e098: jal   0x100449c sw    s5, 20(sp)
+// 0x0105e0a8: 0x105e0a8: jal   0x100449c sw    s5, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8910,15 +8910,15 @@ L_105e094:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e0a0: 0x105e0a0: j	 0x105e140 sll   zero, zero, 0
-	br L_105e140
+// 0x0105e0b0: 0x105e0b0: j	 0x105e150 sll   zero, zero, 0
+	br L_105e150
 // --- basic block ---
-L_105e0a8:
-// 0x0105e0a8: 0x105e0a8: beq   v0, zero, 0x105e0d0 sll   zero, zero, 0
+L_105e0b8:
+// 0x0105e0b8: 0x105e0b8: beq   v0, zero, 0x105e0e0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105e0d0
+	brfalse L_105e0e0
 // --- basic block ---
-// 0x0105e0b0: 0x105e0b0: lw    v0, 24(s6)
+// 0x0105e0c0: 0x105e0c0: lw    v0, 24(s6)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -8927,28 +8927,28 @@ L_105e0a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e0b4: 0x105e0b4: sll   zero, zero, 0
-// 0x0105e0b8: 0x105e0b8: bne   s2, v0, 0x105dcd0 lui   v1, 0x0
+// 0x0105e0c4: 0x105e0c4: sll   zero, zero, 0
+// 0x0105e0c8: 0x105e0c8: bne   s2, v0, 0x105dce0 lui   v1, 0x0
 	ldloc 9
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	bne.un L_105dcd0
+	bne.un L_105dce0
 // --- basic block ---
-// 0x0105e0c0: 0x105e0c0: lh    v0, 36(s6)
+// 0x0105e0d0: 0x105e0d0: lh    v0, 36(s6)
 	ldloc 13
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x0105e0c4: 0x105e0c4: sll   zero, zero, 0
-// 0x0105e0c8: 0x105e0c8: bne   s5, v0, 0x105dccc sll   zero, zero, 0
+// 0x0105e0d4: 0x105e0d4: sll   zero, zero, 0
+// 0x0105e0d8: 0x105e0d8: bne   s5, v0, 0x105dcdc sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	bne.un L_105dccc
+	bne.un L_105dcdc
 // --- basic block ---
-L_105e0d0:
-// 0x0105e0d0: 0x105e0d0: lw    a1, 160(sp)
+L_105e0e0:
+// 0x0105e0e0: 0x105e0e0: lw    a1, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8957,104 +8957,104 @@ L_105e0d0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105e0d4: 0x105e0d4: sll   zero, zero, 0
-// 0x0105e0d8: 0x105e0d8: beq   a1, zero, 0x105e140 sll   zero, zero, 0
+// 0x0105e0e4: 0x105e0e4: sll   zero, zero, 0
+// 0x0105e0e8: 0x105e0e8: beq   a1, zero, 0x105e150 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_105e140
+	brfalse L_105e150
 // --- basic block ---
-// 0x0105e0e0: 0x105e0e0: beq   s3, zero, 0x105e114 addiu v0, zero, 13
+// 0x0105e0f0: 0x105e0f0: beq   s3, zero, 0x105e124 addiu v0, zero, 13
 	ldloc 14
 	ldc.i4.s 13
 	stloc 5
-	brfalse L_105e114
+	brfalse L_105e124
 // --- basic block ---
-// 0x0105e0e8: 0x105e0e8: addiu v0, zero, 1
+// 0x0105e0f8: 0x105e0f8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105e0ec: 0x105e0ec: beq   s3, v0, 0x105e120 addiu v0, zero, 11
+// 0x0105e0fc: 0x105e0fc: beq   s3, v0, 0x105e130 addiu v0, zero, 11
 	ldloc 14
 	ldloc 5
 	ldc.i4.s 11
 	stloc 5
-	beq  L_105e120
+	beq  L_105e130
 // --- basic block ---
-// 0x0105e0f4: 0x105e0f4: addiu v0, zero, 2
+// 0x0105e104: 0x105e104: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0105e0f8: 0x105e0f8: beq   s3, v0, 0x105e12c addiu v0, zero, 9
+// 0x0105e108: 0x105e108: beq   s3, v0, 0x105e13c addiu v0, zero, 9
 	ldloc 14
 	ldloc 5
 	ldc.i4.s 9
 	stloc 5
-	beq  L_105e12c
+	beq  L_105e13c
 // --- basic block ---
-// 0x0105e100: 0x105e100: addiu v0, zero, 3
+// 0x0105e110: 0x105e110: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0105e104: 0x105e104: bne   s3, v0, 0x105e140 addiu v0, zero, 7
+// 0x0105e114: 0x105e114: bne   s3, v0, 0x105e150 addiu v0, zero, 7
 	ldloc 14
 	ldloc 5
 	ldc.i4.7
 	stloc 5
-	bne.un L_105e140
+	bne.un L_105e150
 // --- basic block ---
-// 0x0105e10c: 0x105e10c: j	 0x105e138 sb    v0, 54(s1)
+// 0x0105e11c: 0x105e11c: j	 0x105e148 sb    v0, 54(s1)
 	ldloc 11
 	ldc.i4.s 54
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_105e138
+	br L_105e148
 // --- basic block ---
-L_105e114:
-// 0x0105e114: 0x105e114: sb    v0, 54(s1)
+L_105e124:
+// 0x0105e124: 0x105e124: sb    v0, 54(s1)
 	ldloc 11
 	ldc.i4.s 54
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105e118: 0x105e118: j	 0x105e13c addiu v0, zero, 14
+// 0x0105e128: 0x105e128: j	 0x105e14c addiu v0, zero, 14
 	ldc.i4.s 14
 	stloc 5
-	br L_105e13c
+	br L_105e14c
 // --- basic block ---
-L_105e120:
-// 0x0105e120: 0x105e120: sb    v0, 54(s1)
+L_105e130:
+// 0x0105e130: 0x105e130: sb    v0, 54(s1)
 	ldloc 11
 	ldc.i4.s 54
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105e124: 0x105e124: j	 0x105e13c addiu v0, zero, 12
+// 0x0105e134: 0x105e134: j	 0x105e14c addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-	br L_105e13c
+	br L_105e14c
 // --- basic block ---
-L_105e12c:
-// 0x0105e12c: 0x105e12c: sb    v0, 54(s1)
+L_105e13c:
+// 0x0105e13c: 0x105e13c: sb    v0, 54(s1)
 	ldloc 11
 	ldc.i4.s 54
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105e130: 0x105e130: j	 0x105e13c addiu v0, zero, 10
+// 0x0105e140: 0x105e140: j	 0x105e14c addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-	br L_105e13c
+	br L_105e14c
 // --- basic block ---
-L_105e138:
-// 0x0105e138: 0x105e138: addiu v0, zero, 8
+L_105e148:
+// 0x0105e148: 0x105e148: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-L_105e13c:
-// 0x0105e13c: 0x105e13c: sb    v0, -2(s4)
+L_105e14c:
+// 0x0105e14c: 0x105e14c: sb    v0, -2(s4)
 	ldloc 10
 	ldc.i4.s -2
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_105e140:
-// 0x0105e140: 0x105e140: lw    a3, 176(sp)
+L_105e150:
+// 0x0105e150: 0x105e150: lw    a3, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9063,22 +9063,22 @@ L_105e140:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105e144: 0x105e144: addiu v0, zero, 4
+// 0x0105e154: 0x105e154: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0105e148: 0x105e148: lb    v1, 54(a3)
+// 0x0105e158: 0x105e158: lb    v1, 54(a3)
 	ldloc 4
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x0105e14c: 0x105e14c: sll   zero, zero, 0
-// 0x0105e150: 0x105e150: beq   v1, v0, 0x105e168 sll   zero, zero, 0
+// 0x0105e15c: 0x105e15c: sll   zero, zero, 0
+// 0x0105e160: 0x105e160: beq   v1, v0, 0x105e178 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_105e168
+	beq  L_105e178
 // --- basic block ---
-// 0x0105e158: 0x105e158: lw    v0, 200(sp)
+// 0x0105e168: 0x105e168: lw    v0, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9087,7 +9087,7 @@ L_105e140:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e15c: 0x105e15c: sw    zero, 164(sp)
+// 0x0105e16c: 0x105e16c: sw    zero, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9096,12 +9096,12 @@ L_105e140:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105e160: 0x105e160: addiu v0, v0, 1
+// 0x0105e170: 0x105e170: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0105e164: 0x105e164: sw    v0, 200(sp)
+// 0x0105e174: 0x105e174: sw    v0, 200(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9110,8 +9110,8 @@ L_105e140:
 	add
 	ldloc 5
 	stelem.i4
-L_105e168:
-// 0x0105e168: 0x105e168: lw    v1, 164(sp)
+L_105e178:
+// 0x0105e178: 0x105e178: lw    v1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9120,17 +9120,17 @@ L_105e168:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e16c: 0x105e16c: addiu s7, s7, 1
+// 0x0105e17c: 0x105e17c: addiu s7, s7, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x0105e170: 0x105e170: addiu v1, v1, 1
+// 0x0105e180: 0x105e180: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0105e174: 0x105e174: sw    v1, 164(sp)
+// 0x0105e184: 0x105e184: sw    v1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9139,8 +9139,8 @@ L_105e168:
 	add
 	ldloc 7
 	stelem.i4
-L_105e178:
-// 0x0105e178: 0x105e178: lw    a0, 284(sp)
+L_105e188:
+// 0x0105e188: 0x105e188: lw    a0, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9149,19 +9149,19 @@ L_105e178:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e17c: 0x105e17c: sll   zero, zero, 0
-// 0x0105e180: 0x105e180: slt   v0, s7, a0
+// 0x0105e18c: 0x105e18c: sll   zero, zero, 0
+// 0x0105e190: 0x105e190: slt   v0, s7, a0
 	ldloc 15
 	ldloc.1
 	clt
 	stloc 5
-// 0x0105e184: 0x105e184: bne   v0, zero, 0x105dbc0 addu  s1, zero, zero
+// 0x0105e194: 0x105e194: bne   v0, zero, 0x105dbd0 addu  s1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	brtrue L_105dbc0
+	brtrue L_105dbd0
 // --- basic block ---
-// 0x0105e18c: 0x105e18c: lw    s3, 172(sp)
+// 0x0105e19c: 0x105e19c: lw    s3, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9170,7 +9170,7 @@ L_105e178:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105e190: 0x105e190: lw    s6, 228(sp)
+// 0x0105e1a0: 0x105e1a0: lw    s6, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9179,19 +9179,19 @@ L_105e178:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105e194: 0x105e194: addiu s5, zero, 1
+// 0x0105e1a4: 0x105e1a4: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
-// 0x0105e198: 0x105e198: lui   s4, 0x0
+// 0x0105e1a8: 0x105e1a8: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0105e19c: 0x105e19c: j	 0x105e238 addiu s2, zero, 1
+// 0x0105e1ac: 0x105e1ac: j	 0x105e248 addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-	br L_105e238
+	br L_105e248
 // --- basic block ---
-L_105e1a4:
-// 0x0105e1a4: 0x105e1a4: jalr  s3 addu  a0, s1, zero
+L_105e1b4:
+// 0x0105e1b4: 0x105e1b4: jalr  s3 addu  a0, s1, zero
 	ldloc 14
 	ldloc 11
 	stloc.1
@@ -9205,13 +9205,13 @@ L_105e1a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e1ac: 0x105e1ac: beq   s1, zero, 0x105e1c4 addu  s0, v0, zero
+// 0x0105e1bc: 0x105e1bc: beq   s1, zero, 0x105e1d4 addu  s0, v0, zero
 	ldloc 11
 	ldloc 5
 	stloc 8
-	brfalse L_105e1c4
+	brfalse L_105e1d4
 // --- basic block ---
-// 0x0105e1b4: 0x105e1b4: lw    a1, 168(sp)
+// 0x0105e1c4: 0x105e1c4: lw    a1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9220,69 +9220,69 @@ L_105e1a4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105e1b8: 0x105e1b8: sll   zero, zero, 0
-// 0x0105e1bc: 0x105e1bc: bne   s1, a1, 0x105e1fc sll   zero, zero, 0
+// 0x0105e1c8: 0x105e1c8: sll   zero, zero, 0
+// 0x0105e1cc: 0x105e1cc: bne   s1, a1, 0x105e20c sll   zero, zero, 0
 	ldloc 11
 	ldloc.2
-	bne.un L_105e1fc
+	bne.un L_105e20c
 // --- basic block ---
-L_105e1c4:
-// 0x0105e1c4: 0x105e1c4: lb    v0, 50(s0)
+L_105e1d4:
+// 0x0105e1d4: 0x105e1d4: lb    v0, 50(s0)
 	ldloc 8
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105e1c8: 0x105e1c8: sll   zero, zero, 0
-// 0x0105e1cc: 0x105e1cc: bne   v0, s5, 0x105e1e0 addu  a0, s0, zero
+// 0x0105e1d8: 0x105e1d8: sll   zero, zero, 0
+// 0x0105e1dc: 0x105e1dc: bne   v0, s5, 0x105e1f0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 12
 	ldloc 8
 	stloc.1
-	bne.un L_105e1e0
+	bne.un L_105e1f0
 // --- basic block ---
-// 0x0105e1d4: 0x105e1d4: addu  a1, s0, zero
+// 0x0105e1e4: 0x105e1e4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0105e1d8: 0x105e1d8: j	 0x105e1ec addiu a2, zero, 1
+// 0x0105e1e8: 0x105e1e8: j	 0x105e1fc addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-	br L_105e1ec
+	br L_105e1fc
 // --- basic block ---
-L_105e1e0:
-// 0x0105e1e0: 0x105e1e0: addiu a0, s0, 8
+L_105e1f0:
+// 0x0105e1f0: 0x105e1f0: addiu a0, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc.1
-// 0x0105e1e4: 0x105e1e4: addu  a1, s0, zero
+// 0x0105e1f4: 0x105e1f4: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0105e1e8: 0x105e1e8: addu  a2, zero, zero
+// 0x0105e1f8: 0x105e1f8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_105e1ec:
-// 0x0105e1ec: 0x105e1ec: jal   0x105d454 sll   zero, zero, 0
+L_105e1fc:
+// 0x0105e1fc: 0x105e1fc: jal   0x105d464 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_length_105d454(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_length_105d464(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e1f4: 0x105e1f4: j	 0x105e230 sh    v0, 46(s0)
+// 0x0105e204: 0x105e204: j	 0x105e240 sh    v0, 46(s0)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_105e230
+	br L_105e240
 // --- basic block ---
-L_105e1fc:
-// 0x0105e1fc: 0x105e1fc: lw    a0, 24(v0)
+L_105e20c:
+// 0x0105e20c: 0x105e20c: lw    a0, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9291,7 +9291,7 @@ L_105e1fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e200: 0x105e200: lw    v0, 576(s4)
+// 0x0105e210: 0x105e210: lw    v0, 576(s4)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -9300,36 +9300,36 @@ L_105e1fc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e204: 0x105e204: sll   zero, zero, 0
-// 0x0105e208: 0x105e208: beq   a0, v0, 0x105e220 sll   zero, zero, 0
+// 0x0105e214: 0x105e214: sll   zero, zero, 0
+// 0x0105e218: 0x105e218: beq   a0, v0, 0x105e230 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_105e220
+	beq  L_105e230
 // --- basic block ---
-// 0x0105e210: 0x105e210: bltz  a0, 0x105e220 sll   zero, zero, 0
+// 0x0105e220: 0x105e220: bltz  a0, 0x105e230 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_105e220
+	blt L_105e230
 // --- basic block ---
-// 0x0105e218: 0x105e218: jal   0x100b164 sll   zero, zero, 0
+// 0x0105e228: 0x105e228: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105e220:
-// 0x0105e220: 0x105e220: lh    a0, 36(s0)
+L_105e230:
+// 0x0105e230: 0x105e230: lh    a0, 36(s0)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0105e224: 0x105e224: jal   0x100405c sll   zero, zero, 0
+// 0x0105e234: 0x105e234: jal   0x100405c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -9340,35 +9340,35 @@ L_105e220:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e22c: 0x105e22c: sh    v0, 46(s0)
+// 0x0105e23c: 0x105e23c: sh    v0, 46(s0)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_105e230:
-// 0x0105e230: 0x105e230: sb    s2, 55(s0)
+L_105e240:
+// 0x0105e240: 0x105e240: sb    s2, 55(s0)
 	ldloc 8
 	ldc.i4.s 55
 	add
 	ldloc 9
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105e234: 0x105e234: addiu s1, s1, 1
+// 0x0105e244: 0x105e244: addiu s1, s1, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_105e238:
-// 0x0105e238: 0x105e238: slt   v0, s1, s6
+L_105e248:
+// 0x0105e248: 0x105e248: slt   v0, s1, s6
 	ldloc 11
 	ldloc 13
 	clt
 	stloc 5
-// 0x0105e23c: 0x105e23c: bne   v0, zero, 0x105e1a4 sll   zero, zero, 0
+// 0x0105e24c: 0x105e24c: bne   v0, zero, 0x105e1b4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_105e1a4
+	brtrue L_105e1b4
 // --- basic block ---
-// 0x0105e244: 0x105e244: jalr  s3 addu  a0, zero, zero
+// 0x0105e254: 0x105e254: jalr  s3 addu  a0, zero, zero
 	ldloc 14
 	ldc.i4.s 0
 	stloc.1
@@ -9382,10 +9382,10 @@ L_105e238:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e24c: 0x105e24c: addu  a0, v0, zero
+// 0x0105e25c: 0x105e25c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105e250: 0x105e250: jal   0x105d2c0 addu  a1, s6, zero
+// 0x0105e260: 0x105e260: jal   0x105d2d0 addu  a1, s6, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -9393,16 +9393,16 @@ L_105e238:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_calc_cross_time_105d2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_calc_cross_time_105d2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e258: 0x105e258: lw    ra, 276(sp)
-// 0x0105e25c: 0x105e25c: addu  v0, zero, zero
+// 0x0105e268: 0x105e268: lw    ra, 276(sp)
+// 0x0105e26c: 0x105e26c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0105e260: 0x105e260: lw    s8, 272(sp)
+// 0x0105e270: 0x105e270: lw    s8, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9411,7 +9411,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105e264: 0x105e264: lw    s7, 268(sp)
+// 0x0105e274: 0x105e274: lw    s7, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9420,7 +9420,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105e268: 0x105e268: lw    s6, 264(sp)
+// 0x0105e278: 0x105e278: lw    s6, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9429,7 +9429,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105e26c: 0x105e26c: lw    s5, 260(sp)
+// 0x0105e27c: 0x105e27c: lw    s5, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9438,7 +9438,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105e270: 0x105e270: lw    s4, 256(sp)
+// 0x0105e280: 0x105e280: lw    s4, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9447,7 +9447,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105e274: 0x105e274: lw    s3, 252(sp)
+// 0x0105e284: 0x105e284: lw    s3, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9456,7 +9456,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105e278: 0x105e278: lw    s2, 248(sp)
+// 0x0105e288: 0x105e288: lw    s2, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9465,7 +9465,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105e27c: 0x105e27c: lw    s1, 244(sp)
+// 0x0105e28c: 0x105e28c: lw    s1, 244(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9474,7 +9474,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105e280: 0x105e280: lw    s0, 240(sp)
+// 0x0105e290: 0x105e290: lw    s0, 240(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9483,7 +9483,7 @@ L_105e238:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105e284: 0x105e284: jr    ra addiu sp, sp, 280
+// 0x0105e294: 0x105e294: jr    ra addiu sp, sp, 280
 	ldloc.0
 	ldc.i4 280
 	add
diff --git a/converted/Cibyl7.j b/converted/Cibyl7.j
index 0bd1056..60824ba 100644
--- a/converted/Cibyl7.j
+++ b/converted/Cibyl7.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl7::.ctor
 
-.method public static int32 roadmap_point_db_id_100a028(int32)
+.method public static int32 roadmap_point_db_id_100a038(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -61,24 +61,24 @@
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a028: 0x100a028: lui   v0, 0x20000
+// 0x0100a038: 0x100a038: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0100a02c: 0x100a02c: lw    v0, 31224(v0)
+// 0x0100a03c: 0x100a03c: lw    v0, 31688(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7806
+	ldc.i4 7922
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a030: 0x100a030: sll   zero, zero, 0
-// 0x0100a034: 0x100a034: beq   v0, zero, 0x100a05c sll   zero, zero, 0
+// 0x0100a040: 0x100a040: sll   zero, zero, 0
+// 0x0100a044: 0x100a044: beq   v0, zero, 0x100a06c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_100a05c
+	brfalse L_100a06c
 // --- basic block ---
-// 0x0100a03c: 0x100a03c: lw    v0, 12(v0)
+// 0x0100a04c: 0x100a04c: lw    v0, 12(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -87,32 +87,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a040: 0x100a040: sll   zero, zero, 0
-// 0x0100a044: 0x100a044: beq   v0, zero, 0x100a05c sll   a0, a0, 2
+// 0x0100a050: 0x100a050: sll   zero, zero, 0
+// 0x0100a054: 0x100a054: beq   v0, zero, 0x100a06c sll   a0, a0, 2
 	ldloc.1
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-	brfalse L_100a05c
+	brfalse L_100a06c
 // --- basic block ---
-// 0x0100a04c: 0x100a04c: addu  v0, v0, a0
+// 0x0100a05c: 0x100a05c: addu  v0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.1
-// 0x0100a050: 0x100a050: lw    v0, 0(v0)
+// 0x0100a060: 0x100a060: lw    v0, 0(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100a054: 0x100a054: jr    ra sll   zero, zero, 0
+// 0x0100a064: 0x100a064: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_100a05c:
-// 0x0100a05c: 0x100a05c: jr    ra addiu v0, zero, -1
+L_100a06c:
+// 0x0100a06c: 0x100a06c: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	br __CIBYL_function_return
@@ -120,7 +120,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_point_count_100a064()
+.method public static int32 roadmap_point_count_100a074()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -140,26 +140,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a064: 0x100a064: lui   v0, 0x20000
+// 0x0100a074: 0x100a074: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.0
-// 0x0100a068: 0x100a068: lw    v1, 31224(v0)
+// 0x0100a078: 0x100a078: lw    v1, 31688(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7806
+	ldc.i4 7922
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a06c: 0x100a06c: sll   zero, zero, 0
-// 0x0100a070: 0x100a070: beq   v1, zero, 0x100a07c addu  v0, zero, zero
+// 0x0100a07c: 0x100a07c: sll   zero, zero, 0
+// 0x0100a080: 0x100a080: beq   v1, zero, 0x100a08c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_100a07c
+	brfalse L_100a08c
 // --- basic block ---
-// 0x0100a078: 0x100a078: lw    v0, 8(v1)
+// 0x0100a088: 0x100a088: lw    v0, 8(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -168,8 +168,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-L_100a07c:
-// 0x0100a07c: 0x100a07c: jr    ra sll   zero, zero, 0
+L_100a08c:
+// 0x0100a08c: 0x100a08c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -177,7 +177,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_point_unmap_100a084(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_point_unmap_100a094(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -212,40 +212,40 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a084:
-// 0x0100a084: 0x100a084: lui   v0, 0x20000
+L_100a094:
+// 0x0100a094: 0x100a094: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a088: 0x100a088: lw    v1, 31224(v0)
+// 0x0100a098: 0x100a098: lw    v1, 31688(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7806
+	ldc.i4 7922
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a08c: 0x100a08c: addiu sp, sp, -24
+// 0x0100a09c: 0x100a09c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a090: 0x100a090: bne   a0, v1, 0x100a09c sw    ra, 20(sp)
+// 0x0100a0a0: 0x100a0a0: bne   a0, v1, 0x100a0ac sw    ra, 20(sp)
 	ldloc.1
 	ldloc 7
-	bne.un L_100a09c
+	bne.un L_100a0ac
 // --- basic block ---
-// 0x0100a098: 0x100a098: sw    zero, 31224(v0)
+// 0x0100a0a8: 0x100a0a8: sw    zero, 31688(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7806
+	ldc.i4 7922
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100a09c:
-// 0x0100a09c: 0x100a09c: jal   0x1000930 sll   zero, zero, 0
+L_100a0ac:
+// 0x0100a0ac: 0x100a0ac: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -256,9 +256,9 @@ L_100a09c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a0a4: 0x100a0a4: lw    ra, 20(sp)
-// 0x0100a0a8: 0x100a0a8: sll   zero, zero, 0
-// 0x0100a0ac: 0x100a0ac: jr    ra addiu sp, sp, 24
+// 0x0100a0b4: 0x100a0b4: lw    ra, 20(sp)
+// 0x0100a0b8: 0x100a0b8: sll   zero, zero, 0
+// 0x0100a0bc: 0x100a0bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -270,7 +270,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_point_activate_100a0b4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_point_activate_100a0c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -308,13 +308,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a0b4:
-// 0x0100a0b4: 0x100a0b4: addiu sp, sp, -24
+L_100a0c4:
+// 0x0100a0c4: 0x100a0c4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a0b8: 0x100a0b8: sw    s0, 16(sp)
+// 0x0100a0c8: 0x100a0c8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -323,57 +323,57 @@ L_100a0b4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a0bc: 0x100a0bc: sw    ra, 20(sp)
-// 0x0100a0c0: 0x100a0c0: beq   a0, zero, 0x100a0f8 addu  s0, a0, zero
+// 0x0100a0cc: 0x100a0cc: sw    ra, 20(sp)
+// 0x0100a0d0: 0x100a0d0: beq   a0, zero, 0x100a108 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_100a0f8
+	brfalse L_100a108
 // --- basic block ---
-// 0x0100a0c8: 0x100a0c8: lui   v0, 0x20000
+// 0x0100a0d8: 0x100a0d8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a0cc: 0x100a0cc: lw    v1, 0(a0)
+// 0x0100a0dc: 0x100a0dc: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100a0d0: 0x100a0d0: lw    v0, 24744(v0)
+// 0x0100a0e0: 0x100a0e0: lw    v0, 25208(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6186
+	ldc.i4 6302
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a0d4: 0x100a0d4: sll   zero, zero, 0
-// 0x0100a0d8: 0x100a0d8: beq   v1, v0, 0x100a0f8 lui   a1, 0x0
+// 0x0100a0e4: 0x100a0e4: sll   zero, zero, 0
+// 0x0100a0e8: 0x100a0e8: beq   v1, v0, 0x100a108 lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_100a0f8
+	beq  L_100a108
 // --- basic block ---
-// 0x0100a0e0: 0x100a0e0: lui   a3, 0x0
+// 0x0100a0f0: 0x100a0f0: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a0e4: 0x100a0e4: addiu a1, a1, 24208
+// 0x0100a0f4: 0x100a0f4: addiu a1, a1, 24208
 	ldloc.2
 	ldc.i4 24208
 	add
 	stloc.2
-// 0x0100a0e8: 0x100a0e8: addiu a3, a3, 24236
+// 0x0100a0f8: 0x100a0f8: addiu a3, a3, 24236
 	ldloc 4
 	ldc.i4 24236
 	add
 	stloc 4
-// 0x0100a0ec: 0x100a0ec: addiu a0, zero, 5
+// 0x0100a0fc: 0x100a0fc: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a0f0: 0x100a0f0: jal   0x100449c addiu a2, zero, 94
+// 0x0100a100: 0x100a100: jal   0x100449c addiu a2, zero, 94
 	ldc.i4.s 94
 	stloc.3
 	ldloc.0
@@ -386,23 +386,23 @@ L_100a0b4:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_100a0f8:
-// 0x0100a0f8: 0x100a0f8: lui   v0, 0x20000
+L_100a108:
+// 0x0100a108: 0x100a108: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a0fc: 0x100a0fc: beq   s0, zero, 0x100a110 sw    s0, 31224(v0)
+// 0x0100a10c: 0x100a10c: beq   s0, zero, 0x100a120 sw    s0, 31688(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7806
+	ldc.i4 7922
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_100a110
+	brfalse L_100a120
 // --- basic block ---
-// 0x0100a104: 0x100a104: lw    v1, 4(s0)
+// 0x0100a114: 0x100a114: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -411,21 +411,21 @@ L_100a0f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a108: 0x100a108: lui   v0, 0x20000
+// 0x0100a118: 0x100a118: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a10c: 0x100a10c: sw    v1, 31228(v0)
+// 0x0100a11c: 0x100a11c: sw    v1, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldloc 8
 	stelem.i4
-L_100a110:
-// 0x0100a110: 0x100a110: lw    ra, 20(sp)
-// 0x0100a114: 0x100a114: lw    s0, 16(sp)
+L_100a120:
+// 0x0100a120: 0x100a120: lw    ra, 20(sp)
+// 0x0100a124: 0x100a124: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -434,7 +434,7 @@ L_100a110:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a118: 0x100a118: jr    ra addiu sp, sp, 24
+// 0x0100a128: 0x100a128: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -446,7 +446,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_point_map_100a120(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_point_map_100a130(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -490,13 +490,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a120:
-// 0x0100a120: 0x100a120: addiu sp, sp, -40
+L_100a130:
+// 0x0100a130: 0x100a130: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100a124: 0x100a124: sw    s1, 28(sp)
+// 0x0100a134: 0x100a134: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -505,14 +505,14 @@ L_100a120:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100a128: 0x100a128: addu  s1, a0, zero
+// 0x0100a138: 0x100a138: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100a12c: 0x100a12c: addiu a0, zero, 20
+// 0x0100a13c: 0x100a13c: addiu a0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0100a130: 0x100a130: sw    ra, 36(sp)
-// 0x0100a134: 0x100a134: sw    s2, 32(sp)
+// 0x0100a140: 0x100a140: sw    ra, 36(sp)
+// 0x0100a144: 0x100a144: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -521,7 +521,7 @@ L_100a120:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100a138: 0x100a138: sw    s0, 24(sp)
+// 0x0100a148: 0x100a148: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -530,7 +530,7 @@ L_100a120:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a13c: 0x100a13c: jal   0x1000910 lui   s2, 0x0
+// 0x0100a14c: 0x100a14c: jal   0x1000910 lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -543,18 +543,18 @@ L_100a120:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a144: 0x100a144: addu  a2, v0, zero
+// 0x0100a154: 0x100a154: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0100a148: 0x100a148: addiu a0, s2, 24208
+// 0x0100a158: 0x100a158: addiu a0, s2, 24208
 	ldloc 10
 	ldc.i4 24208
 	add
 	stloc.1
-// 0x0100a14c: 0x100a14c: addiu a1, zero, 66
+// 0x0100a15c: 0x100a15c: addiu a1, zero, 66
 	ldc.i4.s 66
 	stloc.2
-// 0x0100a150: 0x100a150: jal   0x1004a38 addu  s0, v0, zero
+// 0x0100a160: 0x100a160: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -562,50 +562,50 @@ L_100a120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a158: 0x100a158: lui   v1, 0x20000
+// 0x0100a168: 0x100a168: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0100a15c: 0x100a15c: lw    v1, 24744(v1)
+// 0x0100a16c: 0x100a16c: lw    v1, 25208(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6186
+	ldc.i4 6302
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a160: 0x100a160: addiu v0, s0, 8
+// 0x0100a170: 0x100a170: addiu v0, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0100a164: 0x100a164: addu  a0, s1, zero
+// 0x0100a174: 0x100a174: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100a168: 0x100a168: addiu a1, zero, 13
+// 0x0100a178: 0x100a178: addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
-// 0x0100a16c: 0x100a16c: addiu a2, zero, 8
+// 0x0100a17c: 0x100a17c: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x0100a170: 0x100a170: addiu a3, s0, 4
+// 0x0100a180: 0x100a180: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0100a174: 0x100a174: sw    v1, 0(s0)
+// 0x0100a184: 0x100a184: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0100a178: 0x100a178: jal   0x10031b0 sw    v0, 16(sp)
+// 0x0100a188: 0x100a188: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -624,31 +624,31 @@ L_100a120:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a180: 0x100a180: bne   v0, zero, 0x100a1a4 addiu v0, s0, 16
+// 0x0100a190: 0x100a190: bne   v0, zero, 0x100a1b4 addiu v0, s0, 16
 	ldloc 5
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 5
-	brtrue L_100a1a4
+	brtrue L_100a1b4
 // --- basic block ---
-// 0x0100a188: 0x100a188: lui   a3, 0x0
+// 0x0100a198: 0x100a198: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a18c: 0x100a18c: addiu a1, s2, 24208
+// 0x0100a19c: 0x100a19c: addiu a1, s2, 24208
 	ldloc 10
 	ldc.i4 24208
 	add
 	stloc.2
-// 0x0100a190: 0x100a190: addiu a3, a3, 24276
+// 0x0100a1a0: 0x100a1a0: addiu a3, a3, 24276
 	ldloc 4
 	ldc.i4 24276
 	add
 	stloc 4
-// 0x0100a194: 0x100a194: addiu a0, zero, 5
+// 0x0100a1a4: 0x100a1a4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a198: 0x100a198: jal   0x100449c addiu a2, zero, 74
+// 0x0100a1a8: 0x100a1a8: jal   0x100449c addiu a2, zero, 74
 	ldc.i4.s 74
 	stloc.3
 	ldloc.0
@@ -661,27 +661,27 @@ L_100a120:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a1a0: 0x100a1a0: addiu v0, s0, 16
+// 0x0100a1b0: 0x100a1b0: addiu v0, s0, 16
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 5
-L_100a1a4:
-// 0x0100a1a4: 0x100a1a4: addu  a0, s1, zero
+L_100a1b4:
+// 0x0100a1b4: 0x100a1b4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100a1a8: 0x100a1a8: addiu a1, zero, 14
+// 0x0100a1b8: 0x100a1b8: addiu a1, zero, 14
 	ldc.i4.s 14
 	stloc.2
-// 0x0100a1ac: 0x100a1ac: addiu a2, zero, 4
+// 0x0100a1bc: 0x100a1bc: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0100a1b0: 0x100a1b0: addiu a3, s0, 12
+// 0x0100a1c0: 0x100a1c0: addiu a3, s0, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 4
-// 0x0100a1b4: 0x100a1b4: jal   0x10031b0 sw    v0, 16(sp)
+// 0x0100a1c4: 0x100a1c4: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -700,29 +700,29 @@ L_100a1a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a1bc: 0x100a1bc: bne   v0, zero, 0x100a1dc lui   a1, 0x0
+// 0x0100a1cc: 0x100a1cc: bne   v0, zero, 0x100a1ec lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_100a1dc
+	brtrue L_100a1ec
 // --- basic block ---
-// 0x0100a1c4: 0x100a1c4: lui   a3, 0x0
+// 0x0100a1d4: 0x100a1d4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a1c8: 0x100a1c8: addiu a1, a1, 24208
+// 0x0100a1d8: 0x100a1d8: addiu a1, a1, 24208
 	ldloc.2
 	ldc.i4 24208
 	add
 	stloc.2
-// 0x0100a1cc: 0x100a1cc: addiu a3, a3, 24308
+// 0x0100a1dc: 0x100a1dc: addiu a3, a3, 24308
 	ldloc 4
 	ldc.i4 24308
 	add
 	stloc 4
-// 0x0100a1d0: 0x100a1d0: addiu a0, zero, 5
+// 0x0100a1e0: 0x100a1e0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a1d4: 0x100a1d4: jal   0x100449c addiu a2, zero, 82
+// 0x0100a1e4: 0x100a1e4: jal   0x100449c addiu a2, zero, 82
 	ldc.i4.s 82
 	stloc.3
 	ldloc.0
@@ -735,12 +735,12 @@ L_100a1a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100a1dc:
-// 0x0100a1dc: 0x100a1dc: lw    ra, 36(sp)
-// 0x0100a1e0: 0x100a1e0: addu  v0, s0, zero
+L_100a1ec:
+// 0x0100a1ec: 0x100a1ec: lw    ra, 36(sp)
+// 0x0100a1f0: 0x100a1f0: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0100a1e4: 0x100a1e4: lw    s2, 32(sp)
+// 0x0100a1f4: 0x100a1f4: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -749,7 +749,7 @@ L_100a1dc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100a1e8: 0x100a1e8: lw    s1, 28(sp)
+// 0x0100a1f8: 0x100a1f8: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -758,7 +758,7 @@ L_100a1dc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100a1ec: 0x100a1ec: lw    s0, 24(sp)
+// 0x0100a1fc: 0x100a1fc: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -767,7 +767,7 @@ L_100a1dc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a1f0: 0x100a1f0: jr    ra addiu sp, sp, 40
+// 0x0100a200: 0x100a200: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -779,7 +779,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_polygon_count_100a1f8()
+.method public static int32 roadmap_polygon_count_100a208()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -799,26 +799,26 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a1f8: 0x100a1f8: lui   v0, 0x20000
+// 0x0100a208: 0x100a208: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.0
-// 0x0100a1fc: 0x100a1fc: lw    v1, 31232(v0)
+// 0x0100a20c: 0x100a20c: lw    v1, 31696(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a200: 0x100a200: sll   zero, zero, 0
-// 0x0100a204: 0x100a204: beq   v1, zero, 0x100a210 addu  v0, zero, zero
+// 0x0100a210: 0x100a210: sll   zero, zero, 0
+// 0x0100a214: 0x100a214: beq   v1, zero, 0x100a220 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.0
-	brfalse L_100a210
+	brfalse L_100a220
 // --- basic block ---
-// 0x0100a20c: 0x100a20c: lw    v0, 8(v1)
+// 0x0100a21c: 0x100a21c: lw    v0, 8(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -827,8 +827,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-L_100a210:
-// 0x0100a210: 0x100a210: jr    ra sll   zero, zero, 0
+L_100a220:
+// 0x0100a220: 0x100a220: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -836,7 +836,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 roadmap_polygon_category_100a218(int32)
+.method public static int32 roadmap_polygon_category_100a228(int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 v0,int32[] mem,int32 ra)
@@ -856,24 +856,24 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a218: 0x100a218: lui   v0, 0x20000
+// 0x0100a228: 0x100a228: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0100a21c: 0x100a21c: lw    v0, 31232(v0)
+// 0x0100a22c: 0x100a22c: lw    v0, 31696(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a220: 0x100a220: sll   a0, a0, 4
+// 0x0100a230: 0x100a230: sll   a0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	shl
 	stloc.0
-// 0x0100a224: 0x100a224: lw    v0, 4(v0)
+// 0x0100a234: 0x100a234: lw    v0, 4(v0)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
@@ -882,25 +882,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a228: 0x100a228: sll   zero, zero, 0
-// 0x0100a22c: 0x100a22c: addu  a0, v0, a0
+// 0x0100a238: 0x100a238: sll   zero, zero, 0
+// 0x0100a23c: 0x100a23c: addu  a0, v0, a0
 	ldloc.1
 	ldloc.0
 	add
 	stloc.0
-// 0x0100a230: 0x100a230: lb    v0, 6(a0)
+// 0x0100a240: 0x100a240: lb    v0, 6(a0)
 	ldloc.0
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0100a234: 0x100a234: jr    ra sll   zero, zero, 0
+// 0x0100a244: 0x100a244: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_polygon_points_100a23c(int32,int32,int32)
+.method public static int32 roadmap_polygon_points_100a24c(int32,int32,int32)
 {
 .maxstack 7
 .locals init (int32 a0,int32 a1,int32 a2,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -929,24 +929,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a23c: 0x100a23c: lui   v0, 0x20000
+// 0x0100a24c: 0x100a24c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0100a240: 0x100a240: lw    v1, 31232(v0)
+// 0x0100a250: 0x100a250: lw    v1, 31696(v0)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100a244: 0x100a244: sll   a0, a0, 4
+// 0x0100a254: 0x100a254: sll   a0, a0, 4
 	ldloc.0
 	ldc.i4.4
 	shl
 	stloc.0
-// 0x0100a248: 0x100a248: lw    v0, 4(v1)
+// 0x0100a258: 0x100a258: lw    v0, 4(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -955,7 +955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100a24c: 0x100a24c: lw    v1, 12(v1)
+// 0x0100a25c: 0x100a25c: lw    v1, 12(v1)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
@@ -964,83 +964,83 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100a250: 0x100a250: addu  a0, v0, a0
+// 0x0100a260: 0x100a260: addu  a0, v0, a0
 	ldloc 4
 	ldloc.0
 	add
 	stloc.0
-// 0x0100a254: 0x100a254: lhu   v0, 2(a0)
+// 0x0100a264: 0x100a264: lhu   v0, 2(a0)
 	ldloc.0
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x0100a258: 0x100a258: lhu   a0, 0(a0)
+// 0x0100a268: 0x100a268: lhu   a0, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.0
-// 0x0100a25c: 0x100a25c: slt   a2, a2, v0
+// 0x0100a26c: 0x100a26c: slt   a2, a2, v0
 	ldloc.2
 	ldloc 4
 	clt
 	stloc.2
-// 0x0100a260: 0x100a260: beq   a2, zero, 0x100a270 sll   a0, a0, 1
+// 0x0100a270: 0x100a270: beq   a2, zero, 0x100a280 sll   a0, a0, 1
 	ldloc.2
 	ldloc.0
 	ldc.i4.1
 	shl
 	stloc.0
-	brfalse L_100a270
+	brfalse L_100a280
 // --- basic block ---
-// 0x0100a268: 0x100a268: jr    ra addiu v0, zero, -1
+// 0x0100a278: 0x100a278: jr    ra addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_100a270:
-// 0x0100a270: 0x100a270: addu  v1, v1, a0
+L_100a280:
+// 0x0100a280: 0x100a280: addu  v1, v1, a0
 	ldloc.3
 	ldloc.0
 	add
 	stloc.3
-// 0x0100a274: 0x100a274: j	 0x100a290 addu  a0, v0, zero
+// 0x0100a284: 0x100a284: j	 0x100a2a0 addu  a0, v0, zero
 	ldloc 4
 	stloc.0
-	br L_100a290
+	br L_100a2a0
 // --- basic block ---
-L_100a27c:
-// 0x0100a27c: 0x100a27c: lhu   a2, 0(v1)
+L_100a28c:
+// 0x0100a28c: 0x100a28c: lhu   a2, 0(v1)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x0100a280: 0x100a280: sll   zero, zero, 0
-// 0x0100a284: 0x100a284: sw    a2, 0(a1)
+// 0x0100a290: 0x100a290: sll   zero, zero, 0
+// 0x0100a294: 0x100a294: sw    a2, 0(a1)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0100a288: 0x100a288: addiu v1, v1, 2
+// 0x0100a298: 0x100a298: addiu v1, v1, 2
 	ldloc.3
 	ldc.i4.2
 	add
 	stloc.3
-// 0x0100a28c: 0x100a28c: addiu a1, a1, 4
+// 0x0100a29c: 0x100a29c: addiu a1, a1, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-L_100a290:
-// 0x0100a290: 0x100a290: bne   a0, zero, 0x100a27c addiu a0, a0, -1
+L_100a2a0:
+// 0x0100a2a0: 0x100a2a0: bne   a0, zero, 0x100a28c addiu a0, a0, -1
 	ldloc.0
 	ldloc.0
 	ldc.i4.m1
 	add
 	stloc.0
-	brtrue L_100a27c
+	brtrue L_100a28c
 // --- basic block ---
-// 0x0100a298: 0x100a298: jr    ra sll   zero, zero, 0
+// 0x0100a2a8: 0x100a2a8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.3
@@ -1048,7 +1048,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_polygon_unmap_100a2a0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_polygon_unmap_100a2b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1086,32 +1086,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a2a0:
-// 0x0100a2a0: 0x100a2a0: lui   v0, 0x20000
+L_100a2b0:
+// 0x0100a2b0: 0x100a2b0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a2a4: 0x100a2a4: lw    v1, 0(a0)
+// 0x0100a2b4: 0x100a2b4: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100a2a8: 0x100a2a8: lw    v0, 24748(v0)
+// 0x0100a2b8: 0x100a2b8: lw    v0, 25212(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6187
+	ldc.i4 6303
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a2ac: 0x100a2ac: addiu sp, sp, -24
+// 0x0100a2bc: 0x100a2bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a2b0: 0x100a2b0: sw    s0, 16(sp)
+// 0x0100a2c0: 0x100a2c0: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1120,34 +1120,34 @@ L_100a2a0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a2b4: 0x100a2b4: sw    ra, 20(sp)
-// 0x0100a2b8: 0x100a2b8: beq   v1, v0, 0x100a2dc addu  s0, a0, zero
+// 0x0100a2c4: 0x100a2c4: sw    ra, 20(sp)
+// 0x0100a2c8: 0x100a2c8: beq   v1, v0, 0x100a2ec addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_100a2dc
+	beq  L_100a2ec
 // --- basic block ---
-// 0x0100a2c0: 0x100a2c0: lui   a1, 0x0
+// 0x0100a2d0: 0x100a2d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100a2c4: 0x100a2c4: lui   a3, 0x0
+// 0x0100a2d4: 0x100a2d4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a2c8: 0x100a2c8: addiu a1, a1, 24356
+// 0x0100a2d8: 0x100a2d8: addiu a1, a1, 24356
 	ldloc.2
 	ldc.i4 24356
 	add
 	stloc.2
-// 0x0100a2cc: 0x100a2cc: addiu a3, a3, 24236
+// 0x0100a2dc: 0x100a2dc: addiu a3, a3, 24236
 	ldloc 4
 	ldc.i4 24236
 	add
 	stloc 4
-// 0x0100a2d0: 0x100a2d0: addiu a0, zero, 5
+// 0x0100a2e0: 0x100a2e0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a2d4: 0x100a2d4: jal   0x100449c addiu a2, zero, 117
+// 0x0100a2e4: 0x100a2e4: jal   0x100449c addiu a2, zero, 117
 	ldc.i4.s 117
 	stloc.3
 	ldloc.0
@@ -1160,36 +1160,36 @@ L_100a2a0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100a2dc:
-// 0x0100a2dc: 0x100a2dc: lui   v0, 0x20000
+L_100a2ec:
+// 0x0100a2ec: 0x100a2ec: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a2e0: 0x100a2e0: lw    v1, 31232(v0)
+// 0x0100a2f0: 0x100a2f0: lw    v1, 31696(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a2e4: 0x100a2e4: sll   zero, zero, 0
-// 0x0100a2e8: 0x100a2e8: bne   v1, s0, 0x100a2f4 sll   zero, zero, 0
+// 0x0100a2f4: 0x100a2f4: sll   zero, zero, 0
+// 0x0100a2f8: 0x100a2f8: bne   v1, s0, 0x100a304 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_100a2f4
+	bne.un L_100a304
 // --- basic block ---
-// 0x0100a2f0: 0x100a2f0: sw    zero, 31232(v0)
+// 0x0100a300: 0x100a300: sw    zero, 31696(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100a2f4:
-// 0x0100a2f4: 0x100a2f4: jal   0x1000930 addu  a0, s0, zero
+L_100a304:
+// 0x0100a304: 0x100a304: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1202,8 +1202,8 @@ L_100a2f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a2fc: 0x100a2fc: lw    ra, 20(sp)
-// 0x0100a300: 0x100a300: lw    s0, 16(sp)
+// 0x0100a30c: 0x100a30c: lw    ra, 20(sp)
+// 0x0100a310: 0x100a310: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1212,7 +1212,7 @@ L_100a2f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a304: 0x100a304: jr    ra addiu sp, sp, 24
+// 0x0100a314: 0x100a314: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1224,7 +1224,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_polygon_activate_100a30c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_polygon_activate_100a31c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -1262,13 +1262,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a30c:
-// 0x0100a30c: 0x100a30c: addiu sp, sp, -24
+L_100a31c:
+// 0x0100a31c: 0x100a31c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a310: 0x100a310: sw    s0, 16(sp)
+// 0x0100a320: 0x100a320: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1277,57 +1277,57 @@ L_100a30c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a314: 0x100a314: sw    ra, 20(sp)
-// 0x0100a318: 0x100a318: beq   a0, zero, 0x100a364 addu  s0, a0, zero
+// 0x0100a324: 0x100a324: sw    ra, 20(sp)
+// 0x0100a328: 0x100a328: beq   a0, zero, 0x100a374 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_100a364
+	brfalse L_100a374
 // --- basic block ---
-// 0x0100a320: 0x100a320: lui   v0, 0x20000
+// 0x0100a330: 0x100a330: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a324: 0x100a324: lw    v1, 0(a0)
+// 0x0100a334: 0x100a334: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100a328: 0x100a328: lw    v0, 24748(v0)
+// 0x0100a338: 0x100a338: lw    v0, 25212(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6187
+	ldc.i4 6303
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a32c: 0x100a32c: sll   zero, zero, 0
-// 0x0100a330: 0x100a330: beq   v1, v0, 0x100a37c lui   a1, 0x0
+// 0x0100a33c: 0x100a33c: sll   zero, zero, 0
+// 0x0100a340: 0x100a340: beq   v1, v0, 0x100a38c lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_100a37c
+	beq  L_100a38c
 // --- basic block ---
-// 0x0100a338: 0x100a338: lui   a3, 0x0
+// 0x0100a348: 0x100a348: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a33c: 0x100a33c: addiu a1, a1, 24356
+// 0x0100a34c: 0x100a34c: addiu a1, a1, 24356
 	ldloc.2
 	ldc.i4 24356
 	add
 	stloc.2
-// 0x0100a340: 0x100a340: addiu a3, a3, 24236
+// 0x0100a350: 0x100a350: addiu a3, a3, 24236
 	ldloc 4
 	ldc.i4 24236
 	add
 	stloc 4
-// 0x0100a344: 0x100a344: addiu a0, zero, 5
+// 0x0100a354: 0x100a354: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a348: 0x100a348: jal   0x100449c addiu a2, zero, 101
+// 0x0100a358: 0x100a358: jal   0x100449c addiu a2, zero, 101
 	ldc.i4.s 101
 	stloc.3
 	ldloc.0
@@ -1340,11 +1340,11 @@ L_100a30c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a350: 0x100a350: j	 0x100a37c sll   zero, zero, 0
-	br L_100a37c
+// 0x0100a360: 0x100a360: j	 0x100a38c sll   zero, zero, 0
+	br L_100a38c
 // --- basic block ---
-L_100a358:
-// 0x0100a358: 0x100a358: jal   0x1006ba0 addiu a0, a0, 23752
+L_100a368:
+// 0x0100a368: 0x100a368: jal   0x1006bb0 addiu a0, a0, 23752
 	ldloc.1
 	ldc.i4 23752
 	add
@@ -1354,12 +1354,12 @@ L_100a358:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_dictionary_open_1006ba0(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_open_1006bb0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a360: 0x100a360: sw    v0, 20(s0)
+// 0x0100a370: 0x100a370: sw    v0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1368,21 +1368,21 @@ L_100a358:
 	add
 	ldloc 5
 	stelem.i4
-L_100a364:
-// 0x0100a364: 0x100a364: lw    ra, 20(sp)
-// 0x0100a368: 0x100a368: lui   v0, 0x20000
+L_100a374:
+// 0x0100a374: 0x100a374: lw    ra, 20(sp)
+// 0x0100a378: 0x100a378: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a36c: 0x100a36c: sw    s0, 31232(v0)
+// 0x0100a37c: 0x100a37c: sw    s0, 31696(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a370: 0x100a370: lw    s0, 16(sp)
+// 0x0100a380: 0x100a380: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1391,15 +1391,15 @@ L_100a364:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a374: 0x100a374: jr    ra addiu sp, sp, 24
+// 0x0100a384: 0x100a384: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_100a37c:
-// 0x0100a37c: 0x100a37c: lw    v0, 20(s0)
+L_100a38c:
+// 0x0100a38c: 0x100a38c: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1408,22 +1408,22 @@ L_100a37c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a380: 0x100a380: sll   zero, zero, 0
-// 0x0100a384: 0x100a384: bne   v0, zero, 0x100a364 sll   zero, zero, 0
+// 0x0100a390: 0x100a390: sll   zero, zero, 0
+// 0x0100a394: 0x100a394: bne   v0, zero, 0x100a374 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100a364
+	brtrue L_100a374
 // --- basic block ---
-// 0x0100a38c: 0x100a38c: j	 0x100a358 lui   a0, 0x0
+// 0x0100a39c: 0x100a39c: j	 0x100a368 lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	br L_100a358
+	br L_100a368
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_polygon_map_100a394(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_polygon_map_100a3a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
@@ -1467,13 +1467,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a394:
-// 0x0100a394: 0x100a394: addiu sp, sp, -40
+L_100a3a4:
+// 0x0100a3a4: 0x100a3a4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100a398: 0x100a398: sw    s1, 28(sp)
+// 0x0100a3a8: 0x100a3a8: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1482,14 +1482,14 @@ L_100a394:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100a39c: 0x100a39c: addu  s1, a0, zero
+// 0x0100a3ac: 0x100a3ac: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0100a3a0: 0x100a3a0: addiu a0, zero, 24
+// 0x0100a3b0: 0x100a3b0: addiu a0, zero, 24
 	ldc.i4.s 24
 	stloc.1
-// 0x0100a3a4: 0x100a3a4: sw    ra, 36(sp)
-// 0x0100a3a8: 0x100a3a8: sw    s2, 32(sp)
+// 0x0100a3b4: 0x100a3b4: sw    ra, 36(sp)
+// 0x0100a3b8: 0x100a3b8: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1498,7 +1498,7 @@ L_100a394:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100a3ac: 0x100a3ac: sw    s0, 24(sp)
+// 0x0100a3bc: 0x100a3bc: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1507,7 +1507,7 @@ L_100a394:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a3b0: 0x100a3b0: jal   0x1000910 lui   s2, 0x0
+// 0x0100a3c0: 0x100a3c0: jal   0x1000910 lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -1520,18 +1520,18 @@ L_100a394:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a3b8: 0x100a3b8: addu  a2, v0, zero
+// 0x0100a3c8: 0x100a3c8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0100a3bc: 0x100a3bc: addiu a0, s2, 24356
+// 0x0100a3cc: 0x100a3cc: addiu a0, s2, 24356
 	ldloc 10
 	ldc.i4 24356
 	add
 	stloc.1
-// 0x0100a3c0: 0x100a3c0: addiu a1, zero, 70
+// 0x0100a3d0: 0x100a3d0: addiu a1, zero, 70
 	ldc.i4.s 70
 	stloc.2
-// 0x0100a3c4: 0x100a3c4: jal   0x1004a38 addu  s0, v0, zero
+// 0x0100a3d4: 0x100a3d4: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -1539,50 +1539,50 @@ L_100a394:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a3cc: 0x100a3cc: lui   v1, 0x20000
+// 0x0100a3dc: 0x100a3dc: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100a3d0: 0x100a3d0: lw    v1, 24748(v1)
+// 0x0100a3e0: 0x100a3e0: lw    v1, 25212(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 6187
+	ldc.i4 6303
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a3d4: 0x100a3d4: addiu v0, s0, 8
+// 0x0100a3e4: 0x100a3e4: addiu v0, s0, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 5
-// 0x0100a3d8: 0x100a3d8: addu  a0, s1, zero
+// 0x0100a3e8: 0x100a3e8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100a3dc: 0x100a3dc: addiu a1, zero, 18
+// 0x0100a3ec: 0x100a3ec: addiu a1, zero, 18
 	ldc.i4.s 18
 	stloc.2
-// 0x0100a3e0: 0x100a3e0: addiu a2, zero, 16
+// 0x0100a3f0: 0x100a3f0: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0100a3e4: 0x100a3e4: addiu a3, s0, 4
+// 0x0100a3f4: 0x100a3f4: addiu a3, s0, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0100a3e8: 0x100a3e8: sw    v1, 0(s0)
+// 0x0100a3f8: 0x100a3f8: sw    v1, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0100a3ec: 0x100a3ec: jal   0x10031b0 sw    v0, 16(sp)
+// 0x0100a3fc: 0x100a3fc: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1601,31 +1601,31 @@ L_100a394:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a3f4: 0x100a3f4: bne   v0, zero, 0x100a418 addiu v0, s0, 16
+// 0x0100a404: 0x100a404: bne   v0, zero, 0x100a428 addiu v0, s0, 16
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 16
 	add
 	stloc 5
-	brtrue L_100a418
+	brtrue L_100a428
 // --- basic block ---
-// 0x0100a3fc: 0x100a3fc: lui   a3, 0x0
+// 0x0100a40c: 0x100a40c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a400: 0x100a400: addiu a1, s2, 24356
+// 0x0100a410: 0x100a410: addiu a1, s2, 24356
 	ldloc 10
 	ldc.i4 24356
 	add
 	stloc.2
-// 0x0100a404: 0x100a404: addiu a3, a3, 24384
+// 0x0100a414: 0x100a414: addiu a3, a3, 24384
 	ldloc 4
 	ldc.i4 24384
 	add
 	stloc 4
-// 0x0100a408: 0x100a408: addiu a0, zero, 5
+// 0x0100a418: 0x100a418: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a40c: 0x100a40c: jal   0x100449c addiu a2, zero, 79
+// 0x0100a41c: 0x100a41c: jal   0x100449c addiu a2, zero, 79
 	ldc.i4.s 79
 	stloc.3
 	ldloc.0
@@ -1638,27 +1638,27 @@ L_100a394:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a414: 0x100a414: addiu v0, s0, 16
+// 0x0100a424: 0x100a424: addiu v0, s0, 16
 	ldloc 7
 	ldc.i4.s 16
 	add
 	stloc 5
-L_100a418:
-// 0x0100a418: 0x100a418: addu  a0, s1, zero
+L_100a428:
+// 0x0100a428: 0x100a428: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100a41c: 0x100a41c: addiu a1, zero, 19
+// 0x0100a42c: 0x100a42c: addiu a1, zero, 19
 	ldc.i4.s 19
 	stloc.2
-// 0x0100a420: 0x100a420: addiu a2, zero, 2
+// 0x0100a430: 0x100a430: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0100a424: 0x100a424: addiu a3, s0, 12
+// 0x0100a434: 0x100a434: addiu a3, s0, 12
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 4
-// 0x0100a428: 0x100a428: jal   0x10031b0 sw    v0, 16(sp)
+// 0x0100a438: 0x100a438: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1677,29 +1677,29 @@ L_100a418:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a430: 0x100a430: bne   v0, zero, 0x100a450 lui   a1, 0x0
+// 0x0100a440: 0x100a440: bne   v0, zero, 0x100a460 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_100a450
+	brtrue L_100a460
 // --- basic block ---
-// 0x0100a438: 0x100a438: lui   a3, 0x0
+// 0x0100a448: 0x100a448: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a43c: 0x100a43c: addiu a1, a1, 24356
+// 0x0100a44c: 0x100a44c: addiu a1, a1, 24356
 	ldloc.2
 	ldc.i4 24356
 	add
 	stloc.2
-// 0x0100a440: 0x100a440: addiu a3, a3, 24416
+// 0x0100a450: 0x100a450: addiu a3, a3, 24416
 	ldloc 4
 	ldc.i4 24416
 	add
 	stloc 4
-// 0x0100a444: 0x100a444: addiu a0, zero, 5
+// 0x0100a454: 0x100a454: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a448: 0x100a448: jal   0x100449c addiu a2, zero, 87
+// 0x0100a458: 0x100a458: jal   0x100449c addiu a2, zero, 87
 	ldc.i4.s 87
 	stloc.3
 	ldloc.0
@@ -1712,12 +1712,12 @@ L_100a418:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_100a450:
-// 0x0100a450: 0x100a450: lw    ra, 36(sp)
-// 0x0100a454: 0x100a454: addu  v0, s0, zero
+L_100a460:
+// 0x0100a460: 0x100a460: lw    ra, 36(sp)
+// 0x0100a464: 0x100a464: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0100a458: 0x100a458: sw    zero, 20(s0)
+// 0x0100a468: 0x100a468: sw    zero, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1726,7 +1726,7 @@ L_100a450:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100a45c: 0x100a45c: lw    s2, 32(sp)
+// 0x0100a46c: 0x100a46c: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1735,7 +1735,7 @@ L_100a450:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100a460: 0x100a460: lw    s1, 28(sp)
+// 0x0100a470: 0x100a470: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1744,7 +1744,7 @@ L_100a450:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100a464: 0x100a464: lw    s0, 24(sp)
+// 0x0100a474: 0x100a474: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1753,7 +1753,7 @@ L_100a450:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a468: 0x100a468: jr    ra addiu sp, sp, 40
+// 0x0100a478: 0x100a478: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1765,7 +1765,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_polygon_edges_100a470(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_polygon_edges_100a480(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 lo,int32 s0,int32 t0,int32 ra)
@@ -1812,27 +1812,27 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a470: 0x100a470: lui   v0, 0x20000
+// 0x0100a480: 0x100a480: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100a474: 0x100a474: lw    v0, 31232(v0)
+// 0x0100a484: 0x100a484: lw    v0, 31696(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100a478: 0x100a478: addiu sp, sp, -40
+// 0x0100a488: 0x100a488: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100a47c: 0x100a47c: lui   v1, 0x0
+// 0x0100a48c: 0x100a48c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0100a480: 0x100a480: sw    s1, 32(sp)
+// 0x0100a490: 0x100a490: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1841,7 +1841,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a484: 0x100a484: lw    s1, 4(v0)
+// 0x0100a494: 0x100a494: lw    s1, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1850,12 +1850,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a488: 0x100a488: sll   v0, a0, 4
+// 0x0100a498: 0x100a498: sll   v0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	shl
 	stloc 6
-// 0x0100a48c: 0x100a48c: lw    a0, 576(v1)
+// 0x0100a49c: 0x100a49c: lw    a0, 576(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -1864,12 +1864,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a490: 0x100a490: addu  s1, s1, v0
+// 0x0100a4a0: 0x100a4a0: addu  s1, s1, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x0100a494: 0x100a494: sw    s0, 28(sp)
+// 0x0100a4a4: 0x100a4a4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1878,11 +1878,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100a498: 0x100a498: addu  s0, a1, zero
+// 0x0100a4a8: 0x100a4a8: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0100a49c: 0x100a49c: sw    ra, 36(sp)
-// 0x0100a4a0: 0x100a4a0: jal   0x100b3fc addiu a1, sp, 16
+// 0x0100a4ac: 0x100a4ac: sw    ra, 36(sp)
+// 0x0100a4b0: 0x100a4b0: jal   0x100b40c addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -1892,52 +1892,52 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_min_100b3fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_min_100b40c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100a4a8: 0x100a4a8: jal   0x100ae78 sll   zero, zero, 0
+// 0x0100a4b8: 0x100a4b8: jal   0x100ae88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100a4b0: 0x100a4b0: lhu   t0, 14(s1)
+// 0x0100a4c0: 0x100a4c0: lhu   t0, 14(s1)
 	ldloc 8
 	ldc.i4.s 14
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 11
-// 0x0100a4b4: 0x100a4b4: lhu   a3, 10(s1)
+// 0x0100a4c4: 0x100a4c4: lhu   a3, 10(s1)
 	ldloc 8
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 4
-// 0x0100a4b8: 0x100a4b8: mult  v0, t0
+// 0x0100a4c8: 0x100a4c8: mult  v0, t0
 	ldloc 6
 	ldloc 11
 	mul
 	stloc 9
-// 0x0100a4bc: 0x100a4bc: lhu   a1, 12(s1)
+// 0x0100a4cc: 0x100a4cc: lhu   a1, 12(s1)
 	ldloc 8
 	ldc.i4.s 12
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x0100a4c0: 0x100a4c0: lhu   a2, 8(s1)
+// 0x0100a4d0: 0x100a4d0: lhu   a2, 8(s1)
 	ldloc 8
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x0100a4c4: 0x100a4c4: lw    a0, 16(sp)
+// 0x0100a4d4: 0x100a4d4: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1946,7 +1946,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a4c8: 0x100a4c8: lw    v1, 20(sp)
+// 0x0100a4d8: 0x100a4d8: lw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1955,8 +1955,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a4cc: 0x100a4cc: lw    ra, 36(sp)
-// 0x0100a4d0: 0x100a4d0: lw    s1, 32(sp)
+// 0x0100a4dc: 0x100a4dc: lw    ra, 36(sp)
+// 0x0100a4e0: 0x100a4e0: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1965,15 +1965,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a4d4: 0x100a4d4: mflo  lo
+// 0x0100a4e4: 0x100a4e4: mflo  lo
 	ldloc 9
 	stloc 11
-// 0x0100a4d8: 0x100a4d8: addu  t0, t0, v1
+// 0x0100a4e8: 0x100a4e8: addu  t0, t0, v1
 	ldloc 11
 	ldloc 7
 	add
 	stloc 11
-// 0x0100a4dc: 0x100a4dc: sw    t0, 12(s0)
+// 0x0100a4ec: 0x100a4ec: sw    t0, 12(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -1982,20 +1982,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100a4e0: 0x100a4e0: mult  v0, a3
+// 0x0100a4f0: 0x100a4f0: mult  v0, a3
 	ldloc 6
 	ldloc 4
 	mul
 	stloc 9
-// 0x0100a4e4: 0x100a4e4: mflo  lo
+// 0x0100a4f4: 0x100a4f4: mflo  lo
 	ldloc 9
 	stloc 4
-// 0x0100a4e8: 0x100a4e8: addu  a3, a3, a0
+// 0x0100a4f8: 0x100a4f8: addu  a3, a3, a0
 	ldloc 4
 	ldloc.1
 	add
 	stloc 4
-// 0x0100a4ec: 0x100a4ec: sw    a3, 8(s0)
+// 0x0100a4fc: 0x100a4fc: sw    a3, 8(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2004,40 +2004,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100a4f0: 0x100a4f0: mult  v0, a1
+// 0x0100a500: 0x100a500: mult  v0, a1
 	ldloc 6
 	ldloc.2
 	mul
 	stloc 9
-// 0x0100a4f4: 0x100a4f4: mflo  lo
+// 0x0100a504: 0x100a504: mflo  lo
 	ldloc 9
 	stloc.2
-// 0x0100a4f8: 0x100a4f8: addu  a0, a1, a0
+// 0x0100a508: 0x100a508: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0100a4fc: 0x100a4fc: sw    a0, 0(s0)
+// 0x0100a50c: 0x100a50c: sw    a0, 0(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0100a500: 0x100a500: mult  v0, a2
+// 0x0100a510: 0x100a510: mult  v0, a2
 	ldloc 6
 	ldloc.3
 	mul
 	stloc 9
-// 0x0100a504: 0x100a504: mflo  lo
+// 0x0100a514: 0x100a514: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0100a508: 0x100a508: addu  v1, v0, v1
+// 0x0100a518: 0x100a518: addu  v1, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x0100a50c: 0x100a50c: sw    v1, 4(s0)
+// 0x0100a51c: 0x100a51c: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -2046,7 +2046,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a510: 0x100a510: lw    s0, 28(sp)
+// 0x0100a520: 0x100a520: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2055,7 +2055,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100a514: 0x100a514: jr    ra addiu sp, sp, 40
+// 0x0100a524: 0x100a524: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2067,7 +2067,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_polygon_name_100a51c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_polygon_name_100a52c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2102,24 +2102,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a51c: 0x100a51c: lui   v0, 0x20000
+// 0x0100a52c: 0x100a52c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a520: 0x100a520: lw    v0, 31232(v0)
+// 0x0100a530: 0x100a530: lw    v0, 31696(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7808
+	ldc.i4 7924
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a524: 0x100a524: sll   v1, a0, 4
+// 0x0100a534: 0x100a534: sll   v1, a0, 4
 	ldloc.1
 	ldc.i4.4
 	shl
 	stloc 7
-// 0x0100a528: 0x100a528: lw    a1, 4(v0)
+// 0x0100a538: 0x100a538: lw    a1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2128,7 +2128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100a52c: 0x100a52c: lw    a0, 20(v0)
+// 0x0100a53c: 0x100a53c: lw    a0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2137,32 +2137,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a530: 0x100a530: addu  v0, a1, v1
+// 0x0100a540: 0x100a540: addu  v0, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 5
-// 0x0100a534: 0x100a534: lhu   a1, 4(v0)
+// 0x0100a544: 0x100a544: lhu   a1, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x0100a538: 0x100a538: addiu sp, sp, -24
+// 0x0100a548: 0x100a548: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a53c: 0x100a53c: sw    ra, 20(sp)
-// 0x0100a540: 0x100a540: jal   0x10057e8 sll   zero, zero, 0
+// 0x0100a54c: 0x100a54c: sw    ra, 20(sp)
+// 0x0100a550: 0x100a550: jal   0x10057f8 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl4::roadmap_dictionary_get_10057e8(int32,int32)
+	call int32 Cibyl4::roadmap_dictionary_get_10057f8(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0100a548: 0x100a548: lw    ra, 20(sp)
-// 0x0100a54c: 0x100a54c: sll   zero, zero, 0
-// 0x0100a550: 0x100a550: jr    ra addiu sp, sp, 24
+// 0x0100a558: 0x100a558: lw    ra, 20(sp)
+// 0x0100a55c: 0x100a55c: sll   zero, zero, 0
+// 0x0100a560: 0x100a560: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2174,7 +2174,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_shape_activate_100a558(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_shape_activate_100a568(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -2212,13 +2212,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a558:
-// 0x0100a558: 0x100a558: addiu sp, sp, -24
+L_100a568:
+// 0x0100a568: 0x100a568: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a55c: 0x100a55c: sw    s0, 16(sp)
+// 0x0100a56c: 0x100a56c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2227,57 +2227,57 @@ L_100a558:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a560: 0x100a560: sw    ra, 20(sp)
-// 0x0100a564: 0x100a564: beq   a0, zero, 0x100a59c addu  s0, a0, zero
+// 0x0100a570: 0x100a570: sw    ra, 20(sp)
+// 0x0100a574: 0x100a574: beq   a0, zero, 0x100a5ac addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 7
-	brfalse L_100a59c
+	brfalse L_100a5ac
 // --- basic block ---
-// 0x0100a56c: 0x100a56c: lui   v0, 0x20000
+// 0x0100a57c: 0x100a57c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a570: 0x100a570: lw    v1, 0(a0)
+// 0x0100a580: 0x100a580: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100a574: 0x100a574: lw    v0, 24752(v0)
+// 0x0100a584: 0x100a584: lw    v0, 25216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6188
+	ldc.i4 6304
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a578: 0x100a578: sll   zero, zero, 0
-// 0x0100a57c: 0x100a57c: beq   v1, v0, 0x100a59c lui   a1, 0x0
+// 0x0100a588: 0x100a588: sll   zero, zero, 0
+// 0x0100a58c: 0x100a58c: beq   v1, v0, 0x100a5ac lui   a1, 0x0
 	ldloc 8
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_100a59c
+	beq  L_100a5ac
 // --- basic block ---
-// 0x0100a584: 0x100a584: lui   a3, 0x0
+// 0x0100a594: 0x100a594: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a588: 0x100a588: addiu a1, a1, 24480
+// 0x0100a598: 0x100a598: addiu a1, a1, 24480
 	ldloc.2
 	ldc.i4 24480
 	add
 	stloc.2
-// 0x0100a58c: 0x100a58c: addiu a3, a3, 24508
+// 0x0100a59c: 0x100a59c: addiu a3, a3, 24508
 	ldloc 4
 	ldc.i4 24508
 	add
 	stloc 4
-// 0x0100a590: 0x100a590: addiu a0, zero, 5
+// 0x0100a5a0: 0x100a5a0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a594: 0x100a594: jal   0x100449c addiu a2, zero, 86
+// 0x0100a5a4: 0x100a5a4: jal   0x100449c addiu a2, zero, 86
 	ldc.i4.s 86
 	stloc.3
 	ldloc.0
@@ -2290,23 +2290,23 @@ L_100a558:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_100a59c:
-// 0x0100a59c: 0x100a59c: lui   v0, 0x20000
+L_100a5ac:
+// 0x0100a5ac: 0x100a5ac: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a5a0: 0x100a5a0: beq   s0, zero, 0x100a5b4 sw    s0, 31236(v0)
+// 0x0100a5b0: 0x100a5b0: beq   s0, zero, 0x100a5c4 sw    s0, 31700(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7809
+	ldc.i4 7925
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_100a5b4
+	brfalse L_100a5c4
 // --- basic block ---
-// 0x0100a5a8: 0x100a5a8: lw    v1, 4(s0)
+// 0x0100a5b8: 0x100a5b8: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2315,21 +2315,21 @@ L_100a59c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a5ac: 0x100a5ac: lui   v0, 0x20000
+// 0x0100a5bc: 0x100a5bc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a5b0: 0x100a5b0: sw    v1, 31240(v0)
+// 0x0100a5c0: 0x100a5c0: sw    v1, 31704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldloc 8
 	stelem.i4
-L_100a5b4:
-// 0x0100a5b4: 0x100a5b4: lw    ra, 20(sp)
-// 0x0100a5b8: 0x100a5b8: lw    s0, 16(sp)
+L_100a5c4:
+// 0x0100a5c4: 0x100a5c4: lw    ra, 20(sp)
+// 0x0100a5c8: 0x100a5c8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2338,7 +2338,7 @@ L_100a5b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a5bc: 0x100a5bc: jr    ra addiu sp, sp, 24
+// 0x0100a5cc: 0x100a5cc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2350,7 +2350,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_shape_unmap_100a5c4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_shape_unmap_100a5d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2388,32 +2388,32 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a5c4:
-// 0x0100a5c4: 0x100a5c4: lui   v0, 0x20000
+L_100a5d4:
+// 0x0100a5d4: 0x100a5d4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a5c8: 0x100a5c8: lw    v1, 0(a0)
+// 0x0100a5d8: 0x100a5d8: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100a5cc: 0x100a5cc: lw    v0, 24752(v0)
+// 0x0100a5dc: 0x100a5dc: lw    v0, 25216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6188
+	ldc.i4 6304
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a5d0: 0x100a5d0: addiu sp, sp, -24
+// 0x0100a5e0: 0x100a5e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a5d4: 0x100a5d4: sw    s0, 16(sp)
+// 0x0100a5e4: 0x100a5e4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2422,34 +2422,34 @@ L_100a5c4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a5d8: 0x100a5d8: sw    ra, 20(sp)
-// 0x0100a5dc: 0x100a5dc: beq   v1, v0, 0x100a600 addu  s0, a0, zero
+// 0x0100a5e8: 0x100a5e8: sw    ra, 20(sp)
+// 0x0100a5ec: 0x100a5ec: beq   v1, v0, 0x100a610 addu  s0, a0, zero
 	ldloc 7
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_100a600
+	beq  L_100a610
 // --- basic block ---
-// 0x0100a5e4: 0x100a5e4: lui   a1, 0x0
+// 0x0100a5f4: 0x100a5f4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100a5e8: 0x100a5e8: lui   a3, 0x0
+// 0x0100a5f8: 0x100a5f8: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a5ec: 0x100a5ec: addiu a1, a1, 24480
+// 0x0100a5fc: 0x100a5fc: addiu a1, a1, 24480
 	ldloc.2
 	ldc.i4 24480
 	add
 	stloc.2
-// 0x0100a5f0: 0x100a5f0: addiu a3, a3, 24508
+// 0x0100a600: 0x100a600: addiu a3, a3, 24508
 	ldloc 4
 	ldc.i4 24508
 	add
 	stloc 4
-// 0x0100a5f4: 0x100a5f4: addiu a0, zero, 5
+// 0x0100a604: 0x100a604: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a5f8: 0x100a5f8: jal   0x100449c addiu a2, zero, 99
+// 0x0100a608: 0x100a608: jal   0x100449c addiu a2, zero, 99
 	ldc.i4.s 99
 	stloc.3
 	ldloc.0
@@ -2462,36 +2462,36 @@ L_100a5c4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100a600:
-// 0x0100a600: 0x100a600: lui   v0, 0x20000
+L_100a610:
+// 0x0100a610: 0x100a610: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a604: 0x100a604: lw    v1, 31236(v0)
+// 0x0100a614: 0x100a614: lw    v1, 31700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7809
+	ldc.i4 7925
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a608: 0x100a608: sll   zero, zero, 0
-// 0x0100a60c: 0x100a60c: bne   v1, s0, 0x100a618 sll   zero, zero, 0
+// 0x0100a618: 0x100a618: sll   zero, zero, 0
+// 0x0100a61c: 0x100a61c: bne   v1, s0, 0x100a628 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_100a618
+	bne.un L_100a628
 // --- basic block ---
-// 0x0100a614: 0x100a614: sw    zero, 31236(v0)
+// 0x0100a624: 0x100a624: sw    zero, 31700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7809
+	ldc.i4 7925
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100a618:
-// 0x0100a618: 0x100a618: jal   0x1000930 addu  a0, s0, zero
+L_100a628:
+// 0x0100a628: 0x100a628: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2504,8 +2504,8 @@ L_100a618:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100a620: 0x100a620: lw    ra, 20(sp)
-// 0x0100a624: 0x100a624: lw    s0, 16(sp)
+// 0x0100a630: 0x100a630: lw    ra, 20(sp)
+// 0x0100a634: 0x100a634: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2514,7 +2514,7 @@ L_100a618:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a628: 0x100a628: jr    ra addiu sp, sp, 24
+// 0x0100a638: 0x100a638: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2526,7 +2526,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_shape_map_100a630(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_shape_map_100a640(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2570,13 +2570,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a630:
-// 0x0100a630: 0x100a630: addiu sp, sp, -40
+L_100a640:
+// 0x0100a640: 0x100a640: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100a634: 0x100a634: sw    s2, 32(sp)
+// 0x0100a644: 0x100a644: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2585,14 +2585,14 @@ L_100a630:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100a638: 0x100a638: addu  s2, a0, zero
+// 0x0100a648: 0x100a648: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0100a63c: 0x100a63c: addiu a0, zero, 12
+// 0x0100a64c: 0x100a64c: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0100a640: 0x100a640: sw    ra, 36(sp)
-// 0x0100a644: 0x100a644: sw    s1, 28(sp)
+// 0x0100a650: 0x100a650: sw    ra, 36(sp)
+// 0x0100a654: 0x100a654: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2601,7 +2601,7 @@ L_100a630:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100a648: 0x100a648: sw    s0, 24(sp)
+// 0x0100a658: 0x100a658: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2610,7 +2610,7 @@ L_100a630:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a64c: 0x100a64c: jal   0x1000910 lui   s1, 0x0
+// 0x0100a65c: 0x100a65c: jal   0x1000910 lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -2623,18 +2623,18 @@ L_100a630:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100a654: 0x100a654: addu  a2, v0, zero
+// 0x0100a664: 0x100a664: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0100a658: 0x100a658: addiu a0, s1, 24480
+// 0x0100a668: 0x100a668: addiu a0, s1, 24480
 	ldloc 9
 	ldc.i4 24480
 	add
 	stloc.1
-// 0x0100a65c: 0x100a65c: addiu a1, zero, 64
+// 0x0100a66c: 0x100a66c: addiu a1, zero, 64
 	ldc.i4.s 64
 	stloc.2
-// 0x0100a660: 0x100a660: jal   0x1004a38 addu  s0, v0, zero
+// 0x0100a670: 0x100a670: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -2642,50 +2642,50 @@ L_100a630:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100a668: 0x100a668: lui   v1, 0x20000
+// 0x0100a678: 0x100a678: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0100a66c: 0x100a66c: lw    v1, 24752(v1)
+// 0x0100a67c: 0x100a67c: lw    v1, 25216(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 6188
+	ldc.i4 6304
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a670: 0x100a670: addiu v0, s0, 8
+// 0x0100a680: 0x100a680: addiu v0, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 6
-// 0x0100a674: 0x100a674: addu  a0, s2, zero
+// 0x0100a684: 0x100a684: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0100a678: 0x100a678: addiu a1, zero, 8
+// 0x0100a688: 0x100a688: addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
-// 0x0100a67c: 0x100a67c: addiu a2, zero, 4
+// 0x0100a68c: 0x100a68c: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0100a680: 0x100a680: addiu a3, s0, 4
+// 0x0100a690: 0x100a690: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0100a684: 0x100a684: sw    v1, 0(s0)
+// 0x0100a694: 0x100a694: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0100a688: 0x100a688: jal   0x10031b0 sw    v0, 16(sp)
+// 0x0100a698: 0x100a698: jal   0x10031b0 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2704,26 +2704,26 @@ L_100a630:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100a690: 0x100a690: bne   v0, zero, 0x100a6ac lui   a3, 0x0
+// 0x0100a6a0: 0x100a6a0: bne   v0, zero, 0x100a6bc lui   a3, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_100a6ac
+	brtrue L_100a6bc
 // --- basic block ---
-// 0x0100a698: 0x100a698: addiu a1, s1, 24480
+// 0x0100a6a8: 0x100a6a8: addiu a1, s1, 24480
 	ldloc 9
 	ldc.i4 24480
 	add
 	stloc.2
-// 0x0100a69c: 0x100a69c: addiu a3, a3, 24544
+// 0x0100a6ac: 0x100a6ac: addiu a3, a3, 24544
 	ldloc 4
 	ldc.i4 24544
 	add
 	stloc 4
-// 0x0100a6a0: 0x100a6a0: addiu a0, zero, 5
+// 0x0100a6b0: 0x100a6b0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a6a4: 0x100a6a4: jal   0x100449c addiu a2, zero, 73
+// 0x0100a6b4: 0x100a6b4: jal   0x100449c addiu a2, zero, 73
 	ldc.i4.s 73
 	stloc.3
 	ldloc.0
@@ -2736,12 +2736,12 @@ L_100a630:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100a6ac:
-// 0x0100a6ac: 0x100a6ac: lw    ra, 36(sp)
-// 0x0100a6b0: 0x100a6b0: addu  v0, s0, zero
+L_100a6bc:
+// 0x0100a6bc: 0x100a6bc: lw    ra, 36(sp)
+// 0x0100a6c0: 0x100a6c0: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x0100a6b4: 0x100a6b4: lw    s2, 32(sp)
+// 0x0100a6c4: 0x100a6c4: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2750,7 +2750,7 @@ L_100a6ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100a6b8: 0x100a6b8: lw    s1, 28(sp)
+// 0x0100a6c8: 0x100a6c8: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2759,7 +2759,7 @@ L_100a6ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100a6bc: 0x100a6bc: lw    s0, 24(sp)
+// 0x0100a6cc: 0x100a6cc: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2768,7 +2768,7 @@ L_100a6ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a6c0: 0x100a6c0: jr    ra addiu sp, sp, 40
+// 0x0100a6d0: 0x100a6d0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2780,7 +2780,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_shape_set_square_100a6c8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_shape_set_square_100a6d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 ra,int32[] mem,int32 v0)
@@ -2815,28 +2815,28 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a6c8: 0x100a6c8: addiu sp, sp, -24
+// 0x0100a6d8: 0x100a6d8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a6cc: 0x100a6cc: sw    ra, 20(sp)
-// 0x0100a6d0: 0x100a6d0: jal   0x100ae20 sll   zero, zero, 0
+// 0x0100a6dc: 0x100a6dc: sw    ra, 20(sp)
+// 0x0100a6e0: 0x100a6e0: jal   0x100ae30 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_shift_100ae20(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_shift_100ae30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 8
 // --- basic block ---
-// 0x0100a6d8: 0x100a6d8: lw    ra, 20(sp)
-// 0x0100a6dc: 0x100a6dc: lui   v1, 0x0
+// 0x0100a6e8: 0x100a6e8: lw    ra, 20(sp)
+// 0x0100a6ec: 0x100a6ec: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100a6e0: 0x100a6e0: sw    v0, 556(v1)
+// 0x0100a6f0: 0x100a6f0: sw    v0, 556(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2845,7 +2845,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a6e4: 0x100a6e4: jr    ra addiu sp, sp, 24
+// 0x0100a6f4: 0x100a6f4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2857,7 +2857,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static void roadmap_square_activate_one_100a714()
+.method public static void roadmap_square_activate_one_100a724()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2868,13 +2868,13 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a714:
-// 0x0100a714: 0x100a714: jr    ra sll   zero, zero, 0
+L_100a724:
+// 0x0100a724: 0x100a724: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_square_force_next_update_100a71c()
+.method public static int32 roadmap_square_force_next_update_100a72c()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -2894,18 +2894,18 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a71c: 0x100a71c: addiu v1, zero, 1
+// 0x0100a72c: 0x100a72c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100a720: 0x100a720: lui   v0, 0x20000
+// 0x0100a730: 0x100a730: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc.0
-// 0x0100a724: 0x100a724: jr    ra sw    v1, 31252(v0)
+// 0x0100a734: 0x100a734: jr    ra sw    v1, 31716(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7813
+	ldc.i4 7929
 	add
 	ldloc.1
 	stelem.i4
@@ -2916,7 +2916,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static void roadmap_square_load_index_100a72c()
+.method public static void roadmap_square_load_index_100a73c()
 {
 .maxstack 4
 .locals init (int32 ra)
@@ -2927,12 +2927,12 @@ __CIBYL_function_return:
 	stloc.0
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100a72c: 0x100a72c: jr    ra sll   zero, zero, 0
+// 0x0100a73c: 0x100a73c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 roadmap_square_activate_100a734(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_activate_100a744(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2970,13 +2970,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a734:
-// 0x0100a734: 0x100a734: addiu sp, sp, -24
+L_100a744:
+// 0x0100a744: 0x100a744: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100a738: 0x100a738: sw    s0, 16(sp)
+// 0x0100a748: 0x100a748: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2985,57 +2985,57 @@ L_100a734:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a73c: 0x100a73c: sw    ra, 20(sp)
-// 0x0100a740: 0x100a740: beq   a0, zero, 0x100a778 addu  s0, a0, zero
+// 0x0100a74c: 0x100a74c: sw    ra, 20(sp)
+// 0x0100a750: 0x100a750: beq   a0, zero, 0x100a788 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_100a778
+	brfalse L_100a788
 // --- basic block ---
-// 0x0100a748: 0x100a748: lui   v0, 0x20000
+// 0x0100a758: 0x100a758: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a74c: 0x100a74c: lw    v1, 0(a0)
+// 0x0100a75c: 0x100a75c: lw    v1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100a750: 0x100a750: lw    v0, 24756(v0)
+// 0x0100a760: 0x100a760: lw    v0, 25220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6189
+	ldc.i4 6305
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a754: 0x100a754: sll   zero, zero, 0
-// 0x0100a758: 0x100a758: beq   v1, v0, 0x100a778 lui   a1, 0x0
+// 0x0100a764: 0x100a764: sll   zero, zero, 0
+// 0x0100a768: 0x100a768: beq   v1, v0, 0x100a788 lui   a1, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	beq  L_100a778
+	beq  L_100a788
 // --- basic block ---
-// 0x0100a760: 0x100a760: lui   a3, 0x0
+// 0x0100a770: 0x100a770: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100a764: 0x100a764: addiu a1, a1, 24604
+// 0x0100a774: 0x100a774: addiu a1, a1, 24604
 	ldloc.2
 	ldc.i4 24604
 	add
 	stloc.2
-// 0x0100a768: 0x100a768: addiu a3, a3, 24632
+// 0x0100a778: 0x100a778: addiu a3, a3, 24632
 	ldloc 4
 	ldc.i4 24632
 	add
 	stloc 4
-// 0x0100a76c: 0x100a76c: addiu a0, zero, 5
+// 0x0100a77c: 0x100a77c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a770: 0x100a770: jal   0x100449c addiu a2, zero, 182
+// 0x0100a780: 0x100a780: jal   0x100449c addiu a2, zero, 182
 	ldc.i4 182
 	stloc.3
 	ldloc.0
@@ -3048,27 +3048,27 @@ L_100a734:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100a778:
-// 0x0100a778: 0x100a778: lui   v0, 0x20000
+L_100a788:
+// 0x0100a788: 0x100a788: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a77c: 0x100a77c: lw    ra, 20(sp)
-// 0x0100a780: 0x100a780: sw    s0, 31244(v0)
+// 0x0100a78c: 0x100a78c: lw    ra, 20(sp)
+// 0x0100a790: 0x100a790: sw    s0, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a784: 0x100a784: addiu v1, zero, -2
+// 0x0100a794: 0x100a794: addiu v1, zero, -2
 	ldc.i4.s -2
 	stloc 7
-// 0x0100a788: 0x100a788: lui   v0, 0x0
+// 0x0100a798: 0x100a798: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100a78c: 0x100a78c: lw    s0, 16(sp)
+// 0x0100a79c: 0x100a79c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3077,7 +3077,7 @@ L_100a778:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a790: 0x100a790: sw    v1, 576(v0)
+// 0x0100a7a0: 0x100a7a0: sw    v1, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3086,7 +3086,7 @@ L_100a778:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a794: 0x100a794: jr    ra addiu sp, sp, 24
+// 0x0100a7a4: 0x100a7a4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3098,7 +3098,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_map_one_100a79c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_map_one_100a7ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s3,int32 s2,int32 s5,int32 lo,int32 s6,int32 s4,int32 s7,int32 ra)
@@ -3160,13 +3160,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100a79c:
-// 0x0100a79c: 0x100a79c: addiu sp, sp, -64
+L_100a7ac:
+// 0x0100a7ac: 0x100a7ac: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0100a7a0: 0x100a7a0: sw    s4, 44(sp)
+// 0x0100a7b0: 0x100a7b0: sw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3175,14 +3175,14 @@ L_100a79c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100a7a4: 0x100a7a4: addu  s4, a0, zero
+// 0x0100a7b4: 0x100a7b4: addu  s4, a0, zero
 	ldloc.1
 	stloc 15
-// 0x0100a7a8: 0x100a7a8: addiu a0, zero, 68
+// 0x0100a7b8: 0x100a7b8: addiu a0, zero, 68
 	ldc.i4.s 68
 	stloc.1
-// 0x0100a7ac: 0x100a7ac: sw    ra, 60(sp)
-// 0x0100a7b0: 0x100a7b0: sw    s1, 32(sp)
+// 0x0100a7bc: 0x100a7bc: sw    ra, 60(sp)
+// 0x0100a7c0: 0x100a7c0: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3191,7 +3191,7 @@ L_100a79c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100a7b4: 0x100a7b4: sw    s0, 28(sp)
+// 0x0100a7c4: 0x100a7c4: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3200,7 +3200,7 @@ L_100a79c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a7b8: 0x100a7b8: sw    s7, 56(sp)
+// 0x0100a7c8: 0x100a7c8: sw    s7, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3209,7 +3209,7 @@ L_100a79c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100a7bc: 0x100a7bc: sw    s6, 52(sp)
+// 0x0100a7cc: 0x100a7cc: sw    s6, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3218,7 +3218,7 @@ L_100a79c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100a7c0: 0x100a7c0: sw    s5, 48(sp)
+// 0x0100a7d0: 0x100a7d0: sw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3227,7 +3227,7 @@ L_100a79c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100a7c4: 0x100a7c4: sw    s3, 40(sp)
+// 0x0100a7d4: 0x100a7d4: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3236,7 +3236,7 @@ L_100a79c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100a7c8: 0x100a7c8: sw    s2, 36(sp)
+// 0x0100a7d8: 0x100a7d8: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3245,7 +3245,7 @@ L_100a79c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100a7cc: 0x100a7cc: jal   0x1000910 lui   s0, 0x0
+// 0x0100a7dc: 0x100a7dc: jal   0x1000910 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
 	ldloc.0
@@ -3258,18 +3258,18 @@ L_100a79c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a7d4: 0x100a7d4: addu  s1, v0, zero
+// 0x0100a7e4: 0x100a7e4: addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0100a7d8: 0x100a7d8: addiu a0, s0, 24604
+// 0x0100a7e8: 0x100a7e8: addiu a0, s0, 24604
 	ldloc 7
 	ldc.i4 24604
 	add
 	stloc.1
-// 0x0100a7dc: 0x100a7dc: addiu a1, zero, 377
+// 0x0100a7ec: 0x100a7ec: addiu a1, zero, 377
 	ldc.i4 377
 	stloc.2
-// 0x0100a7e0: 0x100a7e0: jal   0x1004a38 addu  a2, v0, zero
+// 0x0100a7f0: 0x100a7f0: jal   0x1004a48 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3277,24 +3277,24 @@ L_100a79c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a7e8: 0x100a7e8: addu  a0, s4, zero
+// 0x0100a7f8: 0x100a7f8: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x0100a7ec: 0x100a7ec: addiu a1, zero, 26
+// 0x0100a7fc: 0x100a7fc: addiu a1, zero, 26
 	ldc.i4.s 26
 	stloc.2
-// 0x0100a7f0: 0x100a7f0: addiu a2, zero, 12
+// 0x0100a800: 0x100a800: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0100a7f4: 0x100a7f4: addu  a3, s1, zero
+// 0x0100a804: 0x100a804: addu  a3, s1, zero
 	ldloc 9
 	stloc 4
-// 0x0100a7f8: 0x100a7f8: jal   0x10031b0 sw    zero, 16(sp)
+// 0x0100a808: 0x100a808: jal   0x10031b0 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3313,26 +3313,26 @@ L_100a79c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a800: 0x100a800: bne   v0, zero, 0x100a81c lui   a3, 0x0
+// 0x0100a810: 0x100a810: bne   v0, zero, 0x100a82c lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_100a81c
+	brtrue L_100a82c
 // --- basic block ---
-// 0x0100a808: 0x100a808: addiu a1, s0, 24604
+// 0x0100a818: 0x100a818: addiu a1, s0, 24604
 	ldloc 7
 	ldc.i4 24604
 	add
 	stloc.2
-// 0x0100a80c: 0x100a80c: addiu a3, a3, 24664
+// 0x0100a81c: 0x100a81c: addiu a3, a3, 24664
 	ldloc 4
 	ldc.i4 24664
 	add
 	stloc 4
-// 0x0100a810: 0x100a810: addiu a0, zero, 5
+// 0x0100a820: 0x100a820: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100a814: 0x100a814: jal   0x100449c addiu a2, zero, 384
+// 0x0100a824: 0x100a824: jal   0x100449c addiu a2, zero, 384
 	ldc.i4 384
 	stloc.3
 	ldloc.0
@@ -3345,45 +3345,45 @@ L_100a79c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_100a81c:
-// 0x0100a81c: 0x100a81c: lw    v1, 0(s1)
+L_100a82c:
+// 0x0100a82c: 0x100a82c: lw    v1, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100a820: 0x100a820: addiu v0, s1, 56
+// 0x0100a830: 0x100a830: addiu v0, s1, 56
 	ldloc 9
 	ldc.i4.s 56
 	add
 	stloc 5
-// 0x0100a824: 0x100a824: lw    s2, 0(v1)
+// 0x0100a834: 0x100a834: lw    s2, 0(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0100a828: 0x100a828: addiu a1, s1, 60
+// 0x0100a838: 0x100a838: addiu a1, s1, 60
 	ldloc 9
 	ldc.i4.s 60
 	add
 	stloc.2
-// 0x0100a82c: 0x100a82c: addu  a0, s2, zero
+// 0x0100a83c: 0x100a83c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0100a830: 0x100a830: addiu a2, s1, 52
+// 0x0100a840: 0x100a840: addiu a2, s1, 52
 	ldloc 9
 	ldc.i4.s 52
 	add
 	stloc.3
-// 0x0100a834: 0x100a834: addiu a3, s1, 64
+// 0x0100a844: 0x100a844: addiu a3, s1, 64
 	ldloc 9
 	ldc.i4.s 64
 	add
 	stloc 4
-// 0x0100a838: 0x100a838: jal   0x100c85c sw    v0, 16(sp)
+// 0x0100a848: 0x100a848: jal   0x100c86c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3397,18 +3397,18 @@ L_100a81c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_edges_100c85c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_edges_100c86c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a840: 0x100a840: lui   v0, 0x0
+// 0x0100a850: 0x100a850: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100a844: 0x100a844: lui   v1, 0x0
+// 0x0100a854: 0x100a854: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0100a848: 0x100a848: lw    s0, 748(v0)
+// 0x0100a858: 0x100a858: lw    s0, 748(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3417,7 +3417,7 @@ L_100a81c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a84c: 0x100a84c: sw    s2, 576(v1)
+// 0x0100a85c: 0x100a85c: sw    s2, 576(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3426,28 +3426,28 @@ L_100a81c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100a850: 0x100a850: lui   v1, 0x20000
+// 0x0100a860: 0x100a860: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100a854: 0x100a854: lw    s3, 31244(v1)
+// 0x0100a864: 0x100a864: lw    s3, 31708(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100a858: 0x100a858: bgez  s0, 0x100a86c addiu v1, s0, -1
+// 0x0100a868: 0x100a868: bgez  s0, 0x100a87c addiu v1, s0, -1
 	ldloc 7
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 8
 	ldc.i4.s 0
-	bge L_100a86c
+	bge L_100a87c
 // --- basic block ---
-// 0x0100a860: 0x100a860: lw    s0, 3092(s3)
+// 0x0100a870: 0x100a870: lw    s0, 3092(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3456,13 +3456,13 @@ L_100a81c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a864: 0x100a864: j	 0x100a874 lui   v0, 0x0
+// 0x0100a874: 0x100a874: j	 0x100a884 lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-	br L_100a874
+	br L_100a884
 // --- basic block ---
-L_100a86c:
-// 0x0100a86c: 0x100a86c: sw    v1, 748(v0)
+L_100a87c:
+// 0x0100a87c: 0x100a87c: sw    v1, 748(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3471,11 +3471,11 @@ L_100a86c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100a870: 0x100a870: lui   v0, 0x0
+// 0x0100a880: 0x100a880: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_100a874:
-// 0x0100a874: 0x100a874: lw    v0, 744(v0)
+L_100a884:
+// 0x0100a884: 0x100a884: lw    v0, 744(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3484,28 +3484,28 @@ L_100a874:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a878: 0x100a878: sll   zero, zero, 0
-// 0x0100a87c: 0x100a87c: bne   s0, v0, 0x100a898 addiu v0, zero, 12
+// 0x0100a888: 0x100a888: sll   zero, zero, 0
+// 0x0100a88c: 0x100a88c: bne   s0, v0, 0x100a8a8 addiu v0, zero, 12
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 12
 	stloc 5
-	bne.un L_100a898
+	bne.un L_100a8a8
 // --- basic block ---
-// 0x0100a884: 0x100a884: mult  s0, v0
+// 0x0100a894: 0x100a894: mult  s0, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 13
-// 0x0100a888: 0x100a888: mflo  lo
+// 0x0100a898: 0x100a898: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x0100a88c: 0x100a88c: addu  s0, s3, s0
+// 0x0100a89c: 0x100a89c: addu  s0, s3, s0
 	ldloc 10
 	ldloc 7
 	add
 	stloc 7
-// 0x0100a890: 0x100a890: lw    s0, 20(s0)
+// 0x0100a8a0: 0x100a8a0: lw    s0, 20(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3514,24 +3514,24 @@ L_100a874:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100a894: 0x100a894: addiu v0, zero, 12
+// 0x0100a8a4: 0x100a8a4: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-L_100a898:
-// 0x0100a898: 0x100a898: mult  s0, v0
+L_100a8a8:
+// 0x0100a8a8: 0x100a8a8: mult  s0, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 13
-// 0x0100a89c: 0x100a89c: mflo  lo
+// 0x0100a8ac: 0x100a8ac: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0100a8a0: 0x100a8a0: addu  v0, s3, v0
+// 0x0100a8b0: 0x100a8b0: addu  v0, s3, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x0100a8a4: 0x100a8a4: lw    v0, 12(v0)
+// 0x0100a8b4: 0x100a8b4: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3540,34 +3540,34 @@ L_100a898:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a8a8: 0x100a8a8: sll   zero, zero, 0
-// 0x0100a8ac: 0x100a8ac: bltz  v0, 0x100a90c lui   a3, 0x0
+// 0x0100a8b8: 0x100a8b8: sll   zero, zero, 0
+// 0x0100a8bc: 0x100a8bc: bltz  v0, 0x100a91c lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
 	ldc.i4.s 0
-	blt L_100a90c
+	blt L_100a91c
 // --- basic block ---
-// 0x0100a8b4: 0x100a8b4: lui   a1, 0x0
+// 0x0100a8c4: 0x100a8c4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100a8b8: 0x100a8b8: addiu a1, a1, 24604
+// 0x0100a8c8: 0x100a8c8: addiu a1, a1, 24604
 	ldloc.2
 	ldc.i4 24604
 	add
 	stloc.2
-// 0x0100a8bc: 0x100a8bc: addiu a3, a3, 24696
+// 0x0100a8cc: 0x100a8cc: addiu a3, a3, 24696
 	ldloc 4
 	ldc.i4 24696
 	add
 	stloc 4
-// 0x0100a8c0: 0x100a8c0: addiu a0, zero, 2
+// 0x0100a8d0: 0x100a8d0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0100a8c4: 0x100a8c4: addiu a2, zero, 356
+// 0x0100a8d4: 0x100a8d4: addiu a2, zero, 356
 	ldc.i4 356
 	stloc.3
-// 0x0100a8c8: 0x100a8c8: jal   0x100449c sw    s0, 16(sp)
+// 0x0100a8d8: 0x100a8d8: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3586,24 +3586,24 @@ L_100a898:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a8d0: 0x100a8d0: lui   v0, 0x20000
+// 0x0100a8e0: 0x100a8e0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a8d4: 0x100a8d4: lw    v1, 31244(v0)
+// 0x0100a8e4: 0x100a8e4: lw    v1, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a8d8: 0x100a8d8: sll   v0, s0, 2
+// 0x0100a8e8: 0x100a8e8: sll   v0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100a8dc: 0x100a8dc: lw    v1, 8(v1)
+// 0x0100a8ec: 0x100a8ec: lw    v1, 8(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3612,77 +3612,77 @@ L_100a898:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a8e0: 0x100a8e0: sll   zero, zero, 0
-// 0x0100a8e4: 0x100a8e4: addu  v0, v1, v0
+// 0x0100a8f0: 0x100a8f0: sll   zero, zero, 0
+// 0x0100a8f4: 0x100a8f4: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x0100a8e8: 0x100a8e8: lw    v0, 0(v0)
+// 0x0100a8f8: 0x100a8f8: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100a8ec: 0x100a8ec: sll   zero, zero, 0
-// 0x0100a8f0: 0x100a8f0: beq   v0, zero, 0x100a90c sll   zero, zero, 0
+// 0x0100a8fc: 0x100a8fc: sll   zero, zero, 0
+// 0x0100a900: 0x100a900: beq   v0, zero, 0x100a91c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100a90c
+	brfalse L_100a91c
 // --- basic block ---
-// 0x0100a8f8: 0x100a8f8: lw    v0, 0(v0)
+// 0x0100a908: 0x100a908: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100a8fc: 0x100a8fc: sll   zero, zero, 0
-// 0x0100a900: 0x100a900: lw    a0, 0(v0)
+// 0x0100a90c: 0x100a90c: sll   zero, zero, 0
+// 0x0100a910: 0x100a910: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100a904: 0x100a904: jal   0x10137c0 sll   zero, zero, 0
+// 0x0100a914: 0x100a914: jal   0x10137d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_unload_tile_10137c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_unload_tile_10137d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_100a90c:
-// 0x0100a90c: 0x100a90c: addiu v0, zero, 12
+L_100a91c:
+// 0x0100a91c: 0x100a91c: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x0100a910: 0x100a910: mult  s0, v0
+// 0x0100a920: 0x100a920: mult  s0, v0
 	ldloc 7
 	ldloc 5
 	mul
 	stloc 13
-// 0x0100a914: 0x100a914: lui   v0, 0x20000
+// 0x0100a924: 0x100a924: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100a918: 0x100a918: lw    a0, 31244(v0)
+// 0x0100a928: 0x100a928: lw    a0, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a91c: 0x100a91c: sll   v0, s0, 2
+// 0x0100a92c: 0x100a92c: sll   v0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100a920: 0x100a920: lw    v1, 8(a0)
+// 0x0100a930: 0x100a930: lw    v1, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3691,7 +3691,7 @@ L_100a90c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a924: 0x100a924: lw    a0, 3096(a0)
+// 0x0100a934: 0x100a934: lw    a0, 3096(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -3700,50 +3700,50 @@ L_100a90c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100a928: 0x100a928: addu  v0, v1, v0
+// 0x0100a938: 0x100a938: addu  v0, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x0100a92c: 0x100a92c: sw    s1, 0(v0)
+// 0x0100a93c: 0x100a93c: sw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x0100a930: 0x100a930: addu  a1, s2, zero
+// 0x0100a940: 0x100a940: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x0100a934: 0x100a934: addu  a2, s0, zero
+// 0x0100a944: 0x100a944: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x0100a938: 0x100a938: lui   s7, 0x0
+// 0x0100a948: 0x100a948: lui   s7, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x0100a93c: 0x100a93c: addu  s6, s1, zero
+// 0x0100a94c: 0x100a94c: addu  s6, s1, zero
 	ldloc 9
 	stloc 14
-// 0x0100a940: 0x100a940: addu  s5, zero, zero
+// 0x0100a950: 0x100a950: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x0100a944: 0x100a944: mflo  lo
+// 0x0100a954: 0x100a954: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0100a948: 0x100a948: addiu s7, s7, 612
+// 0x0100a958: 0x100a958: addiu s7, s7, 612
 	ldloc 16
 	ldc.i4 612
 	add
 	stloc 16
-// 0x0100a94c: 0x100a94c: addu  s3, s3, v0
+// 0x0100a95c: 0x100a95c: addu  s3, s3, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x0100a950: 0x100a950: lui   v0, 0x0
+// 0x0100a960: 0x100a960: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100a954: 0x100a954: sw    s2, 12(s3)
+// 0x0100a964: 0x100a964: sw    s2, 12(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3752,7 +3752,7 @@ L_100a90c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100a958: 0x100a958: sw    s0, 744(v0)
+// 0x0100a968: 0x100a968: sw    s0, 744(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3761,7 +3761,7 @@ L_100a90c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100a95c: 0x100a95c: jal   0x10157cc lui   s0, 0x0
+// 0x0100a96c: 0x100a96c: jal   0x10157dc lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
 	ldloc.0
@@ -3769,35 +3769,35 @@ L_100a90c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a964: 0x100a964: addiu s0, s0, 620
+// 0x0100a974: 0x100a974: addiu s0, s0, 620
 	ldloc 7
 	ldc.i4 620
 	add
 	stloc 7
-// 0x0100a968: 0x100a968: addiu s3, zero, 12
+// 0x0100a978: 0x100a978: addiu s3, zero, 12
 	ldc.i4.s 12
 	stloc 10
-// 0x0100a96c: 0x100a96c: addiu s2, zero, 11
+// 0x0100a97c: 0x100a97c: addiu s2, zero, 11
 	ldc.i4.s 11
 	stloc 11
-L_100a970:
-// 0x0100a970: 0x100a970: mult  s5, s3
+L_100a980:
+// 0x0100a980: 0x100a980: mult  s5, s3
 	ldloc 12
 	ldloc 10
 	mul
 	stloc 13
-// 0x0100a974: 0x100a974: addu  a0, s4, zero
+// 0x0100a984: 0x100a984: addu  a0, s4, zero
 	ldloc 15
 	stloc.1
-// 0x0100a978: 0x100a978: mflo  lo
+// 0x0100a988: 0x100a988: mflo  lo
 	ldloc 13
 	stloc.2
-// 0x0100a97c: 0x100a97c: jal   0x1002f28 addu  a1, s7, a1
+// 0x0100a98c: 0x100a98c: jal   0x1002f28 addu  a1, s7, a1
 	ldloc 16
 	ldloc.2
 	add
@@ -3810,19 +3810,19 @@ L_100a970:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a984: 0x100a984: beq   v0, zero, 0x100a9c4 sll   zero, zero, 0
+// 0x0100a994: 0x100a994: beq   v0, zero, 0x100a9d4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100a9c4
+	brfalse L_100a9d4
 // --- basic block ---
-// 0x0100a98c: 0x100a98c: lw    v0, 0(s0)
+// 0x0100a99c: 0x100a99c: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100a990: 0x100a990: sll   zero, zero, 0
-// 0x0100a994: 0x100a994: lw    v0, 4(v0)
+// 0x0100a9a0: 0x100a9a0: sll   zero, zero, 0
+// 0x0100a9a4: 0x100a9a4: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3831,8 +3831,8 @@ L_100a970:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100a998: 0x100a998: sll   zero, zero, 0
-// 0x0100a99c: 0x100a99c: jalr  v0 addu  a0, s4, zero
+// 0x0100a9a8: 0x100a9a8: sll   zero, zero, 0
+// 0x0100a9ac: 0x100a9ac: jalr  v0 addu  a0, s4, zero
 	ldloc 5
 	ldloc 15
 	stloc.1
@@ -3846,14 +3846,14 @@ L_100a970:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a9a4: 0x100a9a4: lw    v1, 0(s0)
+// 0x0100a9b4: 0x100a9b4: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100a9a8: 0x100a9a8: sw    v0, 4(s6)
+// 0x0100a9b8: 0x100a9b8: sw    v0, 4(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -3862,7 +3862,7 @@ L_100a970:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100a9ac: 0x100a9ac: lw    v1, 8(v1)
+// 0x0100a9bc: 0x100a9bc: lw    v1, 8(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3871,8 +3871,8 @@ L_100a970:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100a9b0: 0x100a9b0: sll   zero, zero, 0
-// 0x0100a9b4: 0x100a9b4: jalr  v1 addu  a0, v0, zero
+// 0x0100a9c0: 0x100a9c0: sll   zero, zero, 0
+// 0x0100a9c4: 0x100a9c4: jalr  v1 addu  a0, v0, zero
 	ldloc 8
 	ldloc 5
 	stloc.1
@@ -3886,15 +3886,15 @@ L_100a970:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100a9bc: 0x100a9bc: j	 0x100a9cc addiu s5, s5, 1
+// 0x0100a9cc: 0x100a9cc: j	 0x100a9dc addiu s5, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-	br L_100a9cc
+	br L_100a9dc
 // --- basic block ---
-L_100a9c4:
-// 0x0100a9c4: 0x100a9c4: sw    zero, 4(s6)
+L_100a9d4:
+// 0x0100a9d4: 0x100a9d4: sw    zero, 4(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -3903,31 +3903,31 @@ L_100a9c4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100a9c8: 0x100a9c8: addiu s5, s5, 1
+// 0x0100a9d8: 0x100a9d8: addiu s5, s5, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-L_100a9cc:
-// 0x0100a9cc: 0x100a9cc: addiu s0, s0, 12
+L_100a9dc:
+// 0x0100a9dc: 0x100a9dc: addiu s0, s0, 12
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 7
-// 0x0100a9d0: 0x100a9d0: bne   s5, s2, 0x100a970 addiu s6, s6, 4
+// 0x0100a9e0: 0x100a9e0: bne   s5, s2, 0x100a980 addiu s6, s6, 4
 	ldloc 12
 	ldloc 11
 	ldloc 14
 	ldc.i4.4
 	add
 	stloc 14
-	bne.un L_100a970
+	bne.un L_100a980
 // --- basic block ---
-// 0x0100a9d8: 0x100a9d8: lw    ra, 60(sp)
-// 0x0100a9dc: 0x100a9dc: addu  v0, s1, zero
+// 0x0100a9e8: 0x100a9e8: lw    ra, 60(sp)
+// 0x0100a9ec: 0x100a9ec: addu  v0, s1, zero
 	ldloc 9
 	stloc 5
-// 0x0100a9e0: 0x100a9e0: sw    zero, 48(s1)
+// 0x0100a9f0: 0x100a9f0: sw    zero, 48(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3936,7 +3936,7 @@ L_100a9cc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100a9e4: 0x100a9e4: lw    s7, 56(sp)
+// 0x0100a9f4: 0x100a9f4: lw    s7, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3945,7 +3945,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100a9e8: 0x100a9e8: lw    s6, 52(sp)
+// 0x0100a9f8: 0x100a9f8: lw    s6, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3954,7 +3954,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100a9ec: 0x100a9ec: lw    s5, 48(sp)
+// 0x0100a9fc: 0x100a9fc: lw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3963,7 +3963,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100a9f0: 0x100a9f0: lw    s4, 44(sp)
+// 0x0100aa00: 0x100aa00: lw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3972,7 +3972,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100a9f4: 0x100a9f4: lw    s3, 40(sp)
+// 0x0100aa04: 0x100aa04: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3981,7 +3981,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100a9f8: 0x100a9f8: lw    s2, 36(sp)
+// 0x0100aa08: 0x100aa08: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3990,7 +3990,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100a9fc: 0x100a9fc: lw    s1, 32(sp)
+// 0x0100aa0c: 0x100aa0c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3999,7 +3999,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100aa00: 0x100aa00: lw    s0, 28(sp)
+// 0x0100aa10: 0x100aa10: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4008,7 +4008,7 @@ L_100a9cc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100aa04: 0x100aa04: jr    ra addiu sp, sp, 64
+// 0x0100aa14: 0x100aa14: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4020,7 +4020,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_unload_all_100aa0c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_unload_all_100aa1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 lo,int32 hi,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4076,12 +4076,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100aa0c: 0x100aa0c: addiu sp, sp, -40
+// 0x0100aa1c: 0x100aa1c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100aa10: 0x100aa10: sw    s4, 32(sp)
+// 0x0100aa20: 0x100aa20: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4090,7 +4090,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100aa14: 0x100aa14: sw    s3, 28(sp)
+// 0x0100aa24: 0x100aa24: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4099,7 +4099,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100aa18: 0x100aa18: sw    s2, 24(sp)
+// 0x0100aa28: 0x100aa28: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4108,7 +4108,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100aa1c: 0x100aa1c: sw    s1, 20(sp)
+// 0x0100aa2c: 0x100aa2c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4117,7 +4117,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100aa20: 0x100aa20: sw    s0, 16(sp)
+// 0x0100aa30: 0x100aa30: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4126,46 +4126,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100aa24: 0x100aa24: sw    ra, 36(sp)
-// 0x0100aa28: 0x100aa28: addiu s0, zero, 1
+// 0x0100aa34: 0x100aa34: sw    ra, 36(sp)
+// 0x0100aa38: 0x100aa38: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0100aa2c: 0x100aa2c: lui   s3, 0x20000
+// 0x0100aa3c: 0x100aa3c: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x0100aa30: 0x100aa30: addiu s2, zero, 12
+// 0x0100aa40: 0x100aa40: addiu s2, zero, 12
 	ldc.i4.s 12
 	stloc 12
-// 0x0100aa34: 0x100aa34: addiu s4, zero, -1
+// 0x0100aa44: 0x100aa44: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 14
-// 0x0100aa38: 0x100aa38: addiu s1, zero, 257
+// 0x0100aa48: 0x100aa48: addiu s1, zero, 257
 	ldc.i4 257
 	stloc 11
-L_100aa3c:
-// 0x0100aa3c: 0x100aa3c: mult  s0, s2
+L_100aa4c:
+// 0x0100aa4c: 0x100aa4c: mult  s0, s2
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 9
-// 0x0100aa40: 0x100aa40: lw    v0, 31244(s3)
+// 0x0100aa50: 0x100aa50: lw    v0, 31708(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100aa44: 0x100aa44: mflo  lo
+// 0x0100aa54: 0x100aa54: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0100aa48: 0x100aa48: addu  a0, v0, a0
+// 0x0100aa58: 0x100aa58: addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc.1
-// 0x0100aa4c: 0x100aa4c: lw    a0, 12(a0)
+// 0x0100aa5c: 0x100aa5c: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4174,17 +4174,17 @@ L_100aa3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100aa50: 0x100aa50: sll   zero, zero, 0
-// 0x0100aa54: 0x100aa54: bltz  a0, 0x100aaa4 sll   v1, s0, 2
+// 0x0100aa60: 0x100aa60: sll   zero, zero, 0
+// 0x0100aa64: 0x100aa64: bltz  a0, 0x100aab4 sll   v1, s0, 2
 	ldloc.1
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 7
 	ldc.i4.s 0
-	blt L_100aaa4
+	blt L_100aab4
 // --- basic block ---
-// 0x0100aa5c: 0x100aa5c: lw    v0, 8(v0)
+// 0x0100aa6c: 0x100aa6c: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4193,74 +4193,74 @@ L_100aa3c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100aa60: 0x100aa60: sll   zero, zero, 0
-// 0x0100aa64: 0x100aa64: addu  v0, v0, v1
+// 0x0100aa70: 0x100aa70: sll   zero, zero, 0
+// 0x0100aa74: 0x100aa74: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0100aa68: 0x100aa68: lw    v0, 0(v0)
+// 0x0100aa78: 0x100aa78: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100aa6c: 0x100aa6c: sll   zero, zero, 0
-// 0x0100aa70: 0x100aa70: beq   v0, zero, 0x100aa90 sll   zero, zero, 0
+// 0x0100aa7c: 0x100aa7c: sll   zero, zero, 0
+// 0x0100aa80: 0x100aa80: beq   v0, zero, 0x100aaa0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_100aa90
+	brfalse L_100aaa0
 // --- basic block ---
-// 0x0100aa78: 0x100aa78: lw    v0, 0(v0)
+// 0x0100aa88: 0x100aa88: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100aa7c: 0x100aa7c: sll   zero, zero, 0
-// 0x0100aa80: 0x100aa80: lw    a0, 0(v0)
+// 0x0100aa8c: 0x100aa8c: sll   zero, zero, 0
+// 0x0100aa90: 0x100aa90: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100aa84: 0x100aa84: jal   0x10137c0 sll   zero, zero, 0
+// 0x0100aa94: 0x100aa94: jal   0x10137d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_unload_tile_10137c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_unload_tile_10137d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100aa8c: 0x100aa8c: mult  s0, s2
+// 0x0100aa9c: 0x100aa9c: mult  s0, s2
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 9
-L_100aa90:
-// 0x0100aa90: 0x100aa90: lw    v0, 31244(s3)
+L_100aaa0:
+// 0x0100aaa0: 0x100aaa0: lw    v0, 31708(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100aa94: 0x100aa94: mflo  lo
+// 0x0100aaa4: 0x100aaa4: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0100aa98: 0x100aa98: addu  v0, v0, v1
+// 0x0100aaa8: 0x100aaa8: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0100aa9c: 0x100aa9c: sw    s4, 12(v0)
+// 0x0100aaac: 0x100aaac: sw    s4, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4269,44 +4269,44 @@ L_100aa90:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100aaa0: 0x100aaa0: mult  s0, s2
+// 0x0100aab0: 0x100aab0: mult  s0, s2
 	ldloc 8
 	ldloc 12
 	mul
 	stloc 9
-L_100aaa4:
-// 0x0100aaa4: 0x100aaa4: addiu a0, s0, 256
+L_100aab4:
+// 0x0100aab4: 0x100aab4: addiu a0, s0, 256
 	ldloc 8
 	ldc.i4 256
 	add
 	stloc.1
-// 0x0100aaa8: 0x100aaa8: addiu v0, s0, 1
+// 0x0100aab8: 0x100aab8: addiu v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0100aaac: 0x100aaac: lw    a1, 31244(s3)
+// 0x0100aabc: 0x100aabc: lw    a1, 31708(s3)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100aab0: 0x100aab0: addu  s0, v0, zero
+// 0x0100aac0: 0x100aac0: addu  s0, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0100aab4: 0x100aab4: mflo  lo
+// 0x0100aac4: 0x100aac4: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0100aab8: 0x100aab8: addu  v1, a1, v1
+// 0x0100aac8: 0x100aac8: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x0100aabc: 0x100aabc: sll   zero, zero, 0
-// 0x0100aac0: 0x100aac0: div   a0, s1
+// 0x0100aacc: 0x100aacc: sll   zero, zero, 0
+// 0x0100aad0: 0x100aad0: div   a0, s1
 	ldloc.1
 	ldloc 11
 	ldloc.1
@@ -4315,10 +4315,10 @@ L_100aaa4:
 	stloc 9
 	rem
 	stloc 10
-// 0x0100aac4: 0x100aac4: mfhi  hi
+// 0x0100aad4: 0x100aad4: mfhi  hi
 	ldloc 10
 	stloc.1
-// 0x0100aac8: 0x100aac8: sw    a0, 20(v1)
+// 0x0100aad8: 0x100aad8: sw    a0, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4327,8 +4327,8 @@ L_100aaa4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100aacc: 0x100aacc: sll   zero, zero, 0
-// 0x0100aad0: 0x100aad0: div   v0, s1
+// 0x0100aadc: 0x100aadc: sll   zero, zero, 0
+// 0x0100aae0: 0x100aae0: div   v0, s1
 	ldloc 6
 	ldloc 11
 	ldloc 6
@@ -4337,10 +4337,10 @@ L_100aaa4:
 	stloc 9
 	rem
 	stloc 10
-// 0x0100aad4: 0x100aad4: mfhi  hi
+// 0x0100aae4: 0x100aae4: mfhi  hi
 	ldloc 10
 	stloc.2
-// 0x0100aad8: 0x100aad8: bne   v0, s1, 0x100aa3c sw    a1, 16(v1)
+// 0x0100aae8: 0x100aae8: bne   v0, s1, 0x100aa4c sw    a1, 16(v1)
 	ldloc 6
 	ldloc 11
 	ldloc 5
@@ -4351,10 +4351,10 @@ L_100aaa4:
 	add
 	ldloc.2
 	stelem.i4
-	bne.un L_100aa3c
+	bne.un L_100aa4c
 // --- basic block ---
-// 0x0100aae0: 0x100aae0: lw    ra, 36(sp)
-// 0x0100aae4: 0x100aae4: lw    s4, 32(sp)
+// 0x0100aaf0: 0x100aaf0: lw    ra, 36(sp)
+// 0x0100aaf4: 0x100aaf4: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4363,7 +4363,7 @@ L_100aaa4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100aae8: 0x100aae8: lw    s3, 28(sp)
+// 0x0100aaf8: 0x100aaf8: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4372,7 +4372,7 @@ L_100aaa4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100aaec: 0x100aaec: lw    s2, 24(sp)
+// 0x0100aafc: 0x100aafc: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4381,7 +4381,7 @@ L_100aaa4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100aaf0: 0x100aaf0: lw    s1, 20(sp)
+// 0x0100ab00: 0x100ab00: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4390,7 +4390,7 @@ L_100aaa4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100aaf4: 0x100aaf4: lw    s0, 16(sp)
+// 0x0100ab04: 0x100ab04: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4399,7 +4399,7 @@ L_100aaa4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100aaf8: 0x100aaf8: jr    ra addiu sp, sp, 40
+// 0x0100ab08: 0x100ab08: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4411,7 +4411,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_unmap_100ab00(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_unmap_100ab10(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -4449,32 +4449,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100ab00:
-// 0x0100ab00: 0x100ab00: lui   v0, 0x20000
+L_100ab10:
+// 0x0100ab10: 0x100ab10: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100ab04: 0x100ab04: lw    v1, 0(a0)
+// 0x0100ab14: 0x100ab14: lw    v1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100ab08: 0x100ab08: lw    v0, 24756(v0)
+// 0x0100ab18: 0x100ab18: lw    v0, 25220(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6189
+	ldc.i4 6305
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ab0c: 0x100ab0c: addiu sp, sp, -24
+// 0x0100ab1c: 0x100ab1c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100ab10: 0x100ab10: sw    s0, 16(sp)
+// 0x0100ab20: 0x100ab20: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4483,34 +4483,34 @@ L_100ab00:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100ab14: 0x100ab14: sw    ra, 20(sp)
-// 0x0100ab18: 0x100ab18: beq   v1, v0, 0x100ab3c addu  s0, a0, zero
+// 0x0100ab24: 0x100ab24: sw    ra, 20(sp)
+// 0x0100ab28: 0x100ab28: beq   v1, v0, 0x100ab4c addu  s0, a0, zero
 	ldloc 6
 	ldloc 5
 	ldloc.1
 	stloc 8
-	beq  L_100ab3c
+	beq  L_100ab4c
 // --- basic block ---
-// 0x0100ab20: 0x100ab20: lui   a1, 0x0
+// 0x0100ab30: 0x100ab30: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100ab24: 0x100ab24: lui   a3, 0x0
+// 0x0100ab34: 0x100ab34: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100ab28: 0x100ab28: addiu a1, a1, 24604
+// 0x0100ab38: 0x100ab38: addiu a1, a1, 24604
 	ldloc.2
 	ldc.i4 24604
 	add
 	stloc.2
-// 0x0100ab2c: 0x100ab2c: addiu a3, a3, 24632
+// 0x0100ab3c: 0x100ab3c: addiu a3, a3, 24632
 	ldloc 4
 	ldc.i4 24632
 	add
 	stloc 4
-// 0x0100ab30: 0x100ab30: addiu a0, zero, 5
+// 0x0100ab40: 0x100ab40: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100ab34: 0x100ab34: jal   0x100449c addiu a2, zero, 193
+// 0x0100ab44: 0x100ab44: jal   0x100449c addiu a2, zero, 193
 	ldc.i4 193
 	stloc.3
 	ldloc.0
@@ -4523,58 +4523,58 @@ L_100ab00:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_100ab3c:
-// 0x0100ab3c: 0x100ab3c: jal   0x10415d8 sll   zero, zero, 0
+L_100ab4c:
+// 0x0100ab4c: 0x100ab4c: jal   0x10415e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_free_10415d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_free_10415e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ab44: 0x100ab44: jal   0x100aa0c sll   zero, zero, 0
+// 0x0100ab54: 0x100ab54: jal   0x100aa1c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_unload_all_100aa0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_unload_all_100aa1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ab4c: 0x100ab4c: lui   v0, 0x20000
+// 0x0100ab5c: 0x100ab5c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100ab50: 0x100ab50: lw    v1, 31244(v0)
+// 0x0100ab60: 0x100ab60: lw    v1, 31708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ab54: 0x100ab54: sll   zero, zero, 0
-// 0x0100ab58: 0x100ab58: bne   v1, s0, 0x100ab64 sll   zero, zero, 0
+// 0x0100ab64: 0x100ab64: sll   zero, zero, 0
+// 0x0100ab68: 0x100ab68: bne   v1, s0, 0x100ab74 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	bne.un L_100ab64
+	bne.un L_100ab74
 // --- basic block ---
-// 0x0100ab60: 0x100ab60: sw    zero, 31244(v0)
+// 0x0100ab70: 0x100ab70: sw    zero, 31708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100ab64:
-// 0x0100ab64: 0x100ab64: lw    a0, 3096(s0)
+L_100ab74:
+// 0x0100ab74: 0x100ab74: lw    a0, 3096(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4583,18 +4583,18 @@ L_100ab64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100ab68: 0x100ab68: jal   0x1015a90 sll   zero, zero, 0
+// 0x0100ab78: 0x100ab78: jal   0x1015aa0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_free_1015a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_free_1015aa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ab70: 0x100ab70: lw    a0, 8(s0)
+// 0x0100ab80: 0x100ab80: lw    a0, 8(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4603,7 +4603,7 @@ L_100ab64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100ab74: 0x100ab74: jal   0x1000930 sll   zero, zero, 0
+// 0x0100ab84: 0x100ab84: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4614,7 +4614,7 @@ L_100ab64:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ab7c: 0x100ab7c: jal   0x1000930 addu  a0, s0, zero
+// 0x0100ab8c: 0x100ab8c: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4627,8 +4627,8 @@ L_100ab64:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ab84: 0x100ab84: lw    ra, 20(sp)
-// 0x0100ab88: 0x100ab88: lw    s0, 16(sp)
+// 0x0100ab94: 0x100ab94: lw    ra, 20(sp)
+// 0x0100ab98: 0x100ab98: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4637,7 +4637,7 @@ L_100ab64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100ab8c: 0x100ab8c: jr    ra addiu sp, sp, 24
+// 0x0100ab9c: 0x100ab9c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4649,7 +4649,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_map_100ab94(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_map_100aba4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 hi,int32 ra,int32 lo)
@@ -4699,14 +4699,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100ab94:
-// 0x0100ab94: 0x100ab94: addiu sp, sp, -40
+L_100aba4:
+// 0x0100aba4: 0x100aba4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100ab98: 0x100ab98: sw    ra, 36(sp)
-// 0x0100ab9c: 0x100ab9c: sw    s2, 32(sp)
+// 0x0100aba8: 0x100aba8: sw    ra, 36(sp)
+// 0x0100abac: 0x100abac: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4715,7 +4715,7 @@ L_100ab94:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100aba0: 0x100aba0: sw    s1, 28(sp)
+// 0x0100abb0: 0x100abb0: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4724,10 +4724,10 @@ L_100ab94:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100aba4: 0x100aba4: addu  s2, a0, zero
+// 0x0100abb4: 0x100abb4: addu  s2, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0100aba8: 0x100aba8: jal   0x10416bc sw    s0, 24(sp)
+// 0x0100abb8: 0x100abb8: jal   0x10416cc sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4741,12 +4741,12 @@ L_100ab94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl48::roadmap_city_init_10416bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl48::roadmap_city_init_10416cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100abb0: 0x100abb0: jal   0x1000910 addiu a0, zero, 3100
+// 0x0100abc0: 0x100abc0: jal   0x1000910 addiu a0, zero, 3100
 	ldc.i4 3100
 	stloc.1
 	ldloc.0
@@ -4759,21 +4759,21 @@ L_100ab94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100abb8: 0x100abb8: lui   s1, 0x0
+// 0x0100abc8: 0x100abc8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0100abbc: 0x100abbc: addu  a2, v0, zero
+// 0x0100abcc: 0x100abcc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0100abc0: 0x100abc0: addiu a0, s1, 24604
+// 0x0100abd0: 0x100abd0: addiu a0, s1, 24604
 	ldloc 9
 	ldc.i4 24604
 	add
 	stloc.1
-// 0x0100abc4: 0x100abc4: addiu a1, zero, 145
+// 0x0100abd4: 0x100abd4: addiu a1, zero, 145
 	ldc.i4 145
 	stloc.2
-// 0x0100abc8: 0x100abc8: jal   0x1004a38 addu  s0, v0, zero
+// 0x0100abd8: 0x100abd8: jal   0x1004a48 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4781,57 +4781,57 @@ L_100ab94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100abd0: 0x100abd0: lui   v0, 0x20000
+// 0x0100abe0: 0x100abe0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100abd4: 0x100abd4: sw    s0, 31244(v0)
+// 0x0100abe4: 0x100abe4: sw    s0, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100abd8: 0x100abd8: lui   v0, 0x20000
+// 0x0100abe8: 0x100abe8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100abdc: 0x100abdc: lw    v0, 24756(v0)
+// 0x0100abec: 0x100abec: lw    v0, 25220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 6189
+	ldc.i4 6305
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100abe0: 0x100abe0: addu  a0, s2, zero
+// 0x0100abf0: 0x100abf0: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0100abe4: 0x100abe4: addu  a1, zero, zero
+// 0x0100abf4: 0x100abf4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0100abe8: 0x100abe8: addiu a2, zero, 4
+// 0x0100abf8: 0x100abf8: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0100abec: 0x100abec: addiu a3, s0, 4
+// 0x0100abfc: 0x100abfc: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x0100abf0: 0x100abf0: sw    v0, 0(s0)
+// 0x0100ac00: 0x100ac00: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0100abf4: 0x100abf4: jal   0x10031b0 sw    zero, 16(sp)
+// 0x0100ac04: 0x100ac04: jal   0x10031b0 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4850,26 +4850,26 @@ L_100ab94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100abfc: 0x100abfc: bne   v0, zero, 0x100ac18 lui   a3, 0x0
+// 0x0100ac0c: 0x100ac0c: bne   v0, zero, 0x100ac28 lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_100ac18
+	brtrue L_100ac28
 // --- basic block ---
-// 0x0100ac04: 0x100ac04: addiu a1, s1, 24604
+// 0x0100ac14: 0x100ac14: addiu a1, s1, 24604
 	ldloc 9
 	ldc.i4 24604
 	add
 	stloc.2
-// 0x0100ac08: 0x100ac08: addiu a3, a3, 24744
+// 0x0100ac18: 0x100ac18: addiu a3, a3, 24744
 	ldloc 4
 	ldc.i4 24744
 	add
 	stloc 4
-// 0x0100ac0c: 0x100ac0c: addiu a0, zero, 5
+// 0x0100ac1c: 0x100ac1c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100ac10: 0x100ac10: jal   0x100449c addiu a2, zero, 156
+// 0x0100ac20: 0x100ac20: jal   0x100449c addiu a2, zero, 156
 	ldc.i4 156
 	stloc.3
 	ldloc.0
@@ -4882,8 +4882,8 @@ L_100ab94:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100ac18:
-// 0x0100ac18: 0x100ac18: jal   0x1000910 addiu a0, zero, 1024
+L_100ac28:
+// 0x0100ac28: 0x100ac28: jal   0x1000910 addiu a0, zero, 1024
 	ldc.i4 1024
 	stloc.1
 	ldloc.0
@@ -4896,16 +4896,16 @@ L_100ac18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ac20: 0x100ac20: addu  a0, v0, zero
+// 0x0100ac30: 0x100ac30: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100ac24: 0x100ac24: addu  a1, zero, zero
+// 0x0100ac34: 0x100ac34: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0100ac28: 0x100ac28: addiu a2, zero, 1024
+// 0x0100ac38: 0x100ac38: addiu a2, zero, 1024
 	ldc.i4 1024
 	stloc.3
-// 0x0100ac2c: 0x100ac2c: jal   0x100177c addu  s1, v0, zero
+// 0x0100ac3c: 0x100ac3c: jal   0x100177c addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
@@ -4917,21 +4917,21 @@ L_100ac18:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ac34: 0x100ac34: lui   a0, 0x0
+// 0x0100ac44: 0x100ac44: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100ac38: 0x100ac38: addiu a0, a0, 24604
+// 0x0100ac48: 0x100ac48: addiu a0, a0, 24604
 	ldloc.1
 	ldc.i4 24604
 	add
 	stloc.1
-// 0x0100ac3c: 0x100ac3c: addu  a2, s1, zero
+// 0x0100ac4c: 0x100ac4c: addu  a2, s1, zero
 	ldloc 9
 	stloc.3
-// 0x0100ac40: 0x100ac40: addiu a1, zero, 160
+// 0x0100ac50: 0x100ac50: addiu a1, zero, 160
 	ldc.i4 160
 	stloc.2
-// 0x0100ac44: 0x100ac44: jal   0x1004a38 sw    s1, 8(s0)
+// 0x0100ac54: 0x100ac54: jal   0x1004a48 sw    s1, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4945,30 +4945,30 @@ L_100ac18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ac4c: 0x100ac4c: addu  a0, s0, zero
+// 0x0100ac5c: 0x100ac5c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100ac50: 0x100ac50: addu  v0, zero, zero
+// 0x0100ac60: 0x100ac60: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0100ac54: 0x100ac54: addiu a2, zero, -1
+// 0x0100ac64: 0x100ac64: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0100ac58: 0x100ac58: addiu v1, zero, 257
+// 0x0100ac68: 0x100ac68: addiu v1, zero, 257
 	ldc.i4 257
 	stloc 7
-L_100ac5c:
-// 0x0100ac5c: 0x100ac5c: addiu v0, v0, 1
+L_100ac6c:
+// 0x0100ac6c: 0x100ac6c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0100ac60: 0x100ac60: div   v0, v1
+// 0x0100ac70: 0x100ac70: div   v0, v1
 	ldloc 5
 	ldloc 7
 	ldloc 5
@@ -4977,12 +4977,12 @@ L_100ac5c:
 	stloc 13
 	rem
 	stloc 11
-// 0x0100ac64: 0x100ac64: addiu a1, v0, 255
+// 0x0100ac74: 0x100ac74: addiu a1, v0, 255
 	ldloc 5
 	ldc.i4 255
 	add
 	stloc.2
-// 0x0100ac68: 0x100ac68: sw    a2, 12(a0)
+// 0x0100ac78: 0x100ac78: sw    a2, 12(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4991,10 +4991,10 @@ L_100ac5c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0100ac6c: 0x100ac6c: mfhi  hi
+// 0x0100ac7c: 0x100ac7c: mfhi  hi
 	ldloc 11
 	stloc 4
-// 0x0100ac70: 0x100ac70: sw    a3, 16(a0)
+// 0x0100ac80: 0x100ac80: sw    a3, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5003,8 +5003,8 @@ L_100ac5c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100ac74: 0x100ac74: sll   zero, zero, 0
-// 0x0100ac78: 0x100ac78: div   a1, v1
+// 0x0100ac84: 0x100ac84: sll   zero, zero, 0
+// 0x0100ac88: 0x100ac88: div   a1, v1
 	ldloc.2
 	ldloc 7
 	ldloc.2
@@ -5013,10 +5013,10 @@ L_100ac5c:
 	stloc 13
 	rem
 	stloc 11
-// 0x0100ac7c: 0x100ac7c: mfhi  hi
+// 0x0100ac8c: 0x100ac8c: mfhi  hi
 	ldloc 11
 	stloc.2
-// 0x0100ac80: 0x100ac80: sw    a1, 20(a0)
+// 0x0100ac90: 0x100ac90: sw    a1, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5025,24 +5025,24 @@ L_100ac5c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100ac84: 0x100ac84: bne   v0, v1, 0x100ac5c addiu a0, a0, 12
+// 0x0100ac94: 0x100ac94: bne   v0, v1, 0x100ac6c addiu a0, a0, 12
 	ldloc 5
 	ldloc 7
 	ldloc.1
 	ldc.i4.s 12
 	add
 	stloc.1
-	bne.un L_100ac5c
+	bne.un L_100ac6c
 // --- basic block ---
-// 0x0100ac8c: 0x100ac8c: lui   a0, 0x0
+// 0x0100ac9c: 0x100ac9c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100ac90: 0x100ac90: addiu a0, a0, 24776
+// 0x0100aca0: 0x100aca0: addiu a0, a0, 24776
 	ldloc.1
 	ldc.i4 24776
 	add
 	stloc.1
-// 0x0100ac94: 0x100ac94: jal   0x10158bc addiu a1, zero, 256
+// 0x0100aca4: 0x100aca4: jal   0x10158cc addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -5050,13 +5050,13 @@ L_100ac5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_new_10158bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_new_10158cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100ac9c: 0x100ac9c: lw    ra, 36(sp)
-// 0x0100aca0: 0x100aca0: sw    v0, 3096(s0)
+// 0x0100acac: 0x100acac: lw    ra, 36(sp)
+// 0x0100acb0: 0x100acb0: sw    v0, 3096(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5065,25 +5065,25 @@ L_100ac5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100aca4: 0x100aca4: addiu a0, zero, -2
+// 0x0100acb4: 0x100acb4: addiu a0, zero, -2
 	ldc.i4.s -2
 	stloc.1
-// 0x0100aca8: 0x100aca8: lui   v0, 0x20000
+// 0x0100acb8: 0x100acb8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100acac: 0x100acac: lui   v1, 0x0
+// 0x0100acbc: 0x100acbc: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0100acb0: 0x100acb0: sw    zero, 31244(v0)
+// 0x0100acc0: 0x100acc0: sw    zero, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100acb4: 0x100acb4: lw    s2, 32(sp)
+// 0x0100acc4: 0x100acc4: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5092,10 +5092,10 @@ L_100ac5c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100acb8: 0x100acb8: addu  v0, s0, zero
+// 0x0100acc8: 0x100acc8: addu  v0, s0, zero
 	ldloc 8
 	stloc 5
-// 0x0100acbc: 0x100acbc: lw    s1, 28(sp)
+// 0x0100accc: 0x100accc: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5104,7 +5104,7 @@ L_100ac5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100acc0: 0x100acc0: lw    s0, 24(sp)
+// 0x0100acd0: 0x100acd0: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5113,7 +5113,7 @@ L_100ac5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100acc4: 0x100acc4: sw    a0, 576(v1)
+// 0x0100acd4: 0x100acd4: sw    a0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5122,7 +5122,7 @@ L_100ac5c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100acc8: 0x100acc8: jr    ra addiu sp, sp, 40
+// 0x0100acd8: 0x100acd8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5134,7 +5134,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_refresh_100acd0(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_refresh_100ace0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 s8,int32 s4,int32 s2,int32 s3,int32 s5,int32 s6,int32 s7,int32 ra,int32 lo)
@@ -5199,12 +5199,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100acd0: 0x100acd0: addiu sp, sp, -56
+// 0x0100ace0: 0x100ace0: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0100acd4: 0x100acd4: sw    s7, 44(sp)
+// 0x0100ace4: 0x100ace4: sw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5213,7 +5213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100acd8: 0x100acd8: sw    s6, 40(sp)
+// 0x0100ace8: 0x100ace8: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5222,7 +5222,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100acdc: 0x100acdc: sw    s5, 36(sp)
+// 0x0100acec: 0x100acec: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5231,7 +5231,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100ace0: 0x100ace0: sw    s4, 32(sp)
+// 0x0100acf0: 0x100acf0: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5240,7 +5240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100ace4: 0x100ace4: sw    s3, 28(sp)
+// 0x0100acf4: 0x100acf4: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5249,7 +5249,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100ace8: 0x100ace8: sw    s2, 24(sp)
+// 0x0100acf8: 0x100acf8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5258,7 +5258,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100acec: 0x100acec: sw    s1, 20(sp)
+// 0x0100acfc: 0x100acfc: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5267,7 +5267,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100acf0: 0x100acf0: sw    s0, 16(sp)
+// 0x0100ad00: 0x100ad00: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5276,8 +5276,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100acf4: 0x100acf4: sw    ra, 52(sp)
-// 0x0100acf8: 0x100acf8: sw    s8, 48(sp)
+// 0x0100ad04: 0x100ad04: sw    ra, 52(sp)
+// 0x0100ad08: 0x100ad08: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5286,64 +5286,64 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100acfc: 0x100acfc: addu  s7, a1, zero
+// 0x0100ad0c: 0x100ad0c: addu  s7, a1, zero
 	ldloc.2
 	stloc 16
-// 0x0100ad00: 0x100ad00: addu  s6, a2, zero
+// 0x0100ad10: 0x100ad10: addu  s6, a2, zero
 	ldloc.3
 	stloc 15
-// 0x0100ad04: 0x100ad04: addu  s1, zero, zero
+// 0x0100ad14: 0x100ad14: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0100ad08: 0x100ad08: addiu s0, zero, 1
+// 0x0100ad18: 0x100ad18: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0100ad0c: 0x100ad0c: lui   s5, 0x20000
+// 0x0100ad1c: 0x100ad1c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x0100ad10: 0x100ad10: addiu s4, zero, 12
+// 0x0100ad20: 0x100ad20: addiu s4, zero, 12
 	ldc.i4.s 12
 	stloc 11
-// 0x0100ad14: 0x100ad14: addiu s3, zero, -5
+// 0x0100ad24: 0x100ad24: addiu s3, zero, -5
 	ldc.i4.s -5
 	stloc 13
-// 0x0100ad18: 0x100ad18: addiu s2, zero, 257
+// 0x0100ad28: 0x100ad28: addiu s2, zero, 257
 	ldc.i4 257
 	stloc 12
-// 0x0100ad1c: 0x100ad1c: mult  s0, s4
+// 0x0100ad2c: 0x100ad2c: mult  s0, s4
 	ldloc 7
 	ldloc 11
 	mul
 	stloc 18
-L_100ad20:
-// 0x0100ad20: 0x100ad20: lw    v0, 31244(s5)
+L_100ad30:
+// 0x0100ad30: 0x100ad30: lw    v0, 31708(s5)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ad24: 0x100ad24: sll   v1, s0, 2
+// 0x0100ad34: 0x100ad34: sll   v1, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x0100ad28: 0x100ad28: addiu s0, s0, 1
+// 0x0100ad38: 0x100ad38: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0100ad2c: 0x100ad2c: mflo  lo
+// 0x0100ad3c: 0x100ad3c: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x0100ad30: 0x100ad30: addu  a0, v0, a0
+// 0x0100ad40: 0x100ad40: addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc.1
-// 0x0100ad34: 0x100ad34: lw    s8, 12(a0)
+// 0x0100ad44: 0x100ad44: lw    s8, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -5352,15 +5352,15 @@ L_100ad20:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100ad38: 0x100ad38: sll   zero, zero, 0
-// 0x0100ad3c: 0x100ad3c: bltz  s8, 0x100ad98 addu  a0, s8, zero
+// 0x0100ad48: 0x100ad48: sll   zero, zero, 0
+// 0x0100ad4c: 0x100ad4c: bltz  s8, 0x100ada8 addu  a0, s8, zero
 	ldloc 10
 	ldloc 10
 	stloc.1
 	ldc.i4.s 0
-	blt L_100ad98
+	blt L_100ada8
 // --- basic block ---
-// 0x0100ad44: 0x100ad44: lw    v0, 8(v0)
+// 0x0100ad54: 0x100ad54: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5369,32 +5369,32 @@ L_100ad20:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ad48: 0x100ad48: sll   zero, zero, 0
-// 0x0100ad4c: 0x100ad4c: addu  v0, v0, v1
+// 0x0100ad58: 0x100ad58: sll   zero, zero, 0
+// 0x0100ad5c: 0x100ad5c: addu  v0, v0, v1
 	ldloc 6
 	ldloc 9
 	add
 	stloc 6
-// 0x0100ad50: 0x100ad50: lw    v0, 0(v0)
+// 0x0100ad60: 0x100ad60: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100ad54: 0x100ad54: sll   zero, zero, 0
-// 0x0100ad58: 0x100ad58: beq   v0, zero, 0x100ad98 sll   zero, zero, 0
+// 0x0100ad64: 0x100ad64: sll   zero, zero, 0
+// 0x0100ad68: 0x100ad68: beq   v0, zero, 0x100ada8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_100ad98
+	brfalse L_100ada8
 // --- basic block ---
-// 0x0100ad60: 0x100ad60: lw    v0, 0(v0)
+// 0x0100ad70: 0x100ad70: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100ad64: 0x100ad64: jal   0x100db90 sw    zero, 8(v0)
+// 0x0100ad74: 0x100ad74: jal   0x100dba0 sw    zero, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5408,29 +5408,29 @@ L_100ad20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0100ad6c: 0x100ad6c: lw    a0, 0(v0)
+// 0x0100ad7c: 0x100ad7c: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100ad70: 0x100ad70: slt   v1, s1, s7
+// 0x0100ad80: 0x100ad80: slt   v1, s1, s7
 	ldloc 8
 	ldloc 16
 	clt
 	stloc 9
-// 0x0100ad74: 0x100ad74: and   a0, a0, s3
+// 0x0100ad84: 0x100ad84: and   a0, a0, s3
 	ldloc.1
 	ldloc 13
 	and
 	stloc.1
-// 0x0100ad78: 0x100ad78: beq   v1, zero, 0x100ad98 sw    a0, 0(v0)
+// 0x0100ad88: 0x100ad88: beq   v1, zero, 0x100ada8 sw    a0, 0(v0)
 	ldloc 9
 	ldloc 5
 	ldloc 6
@@ -5438,18 +5438,18 @@ L_100ad20:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_100ad98
+	brfalse L_100ada8
 // --- basic block ---
-// 0x0100ad80: 0x100ad80: addu  a0, s8, zero
+// 0x0100ad90: 0x100ad90: addu  a0, s8, zero
 	ldloc 10
 	stloc.1
-// 0x0100ad84: 0x100ad84: lui   a1, 0x700000
+// 0x0100ad94: 0x100ad94: lui   a1, 0x700000
 	ldc.i4 7340032
 	stloc.2
-// 0x0100ad88: 0x100ad88: addiu a2, zero, 1
+// 0x0100ad98: 0x100ad98: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0100ad8c: 0x100ad8c: jal   0x100d384 addu  a3, s6, zero
+// 0x0100ad9c: 0x100ad9c: jal   0x100d394 addu  a3, s6, zero
 	ldloc 15
 	stloc 4
 	ldloc.0
@@ -5457,31 +5457,31 @@ L_100ad20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x0100ad94: 0x100ad94: addiu s1, s1, 1
+// 0x0100ada4: 0x100ada4: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100ad98:
-// 0x0100ad98: 0x100ad98: bne   s0, s2, 0x100ad20 mult  s0, s4
+L_100ada8:
+// 0x0100ada8: 0x100ada8: bne   s0, s2, 0x100ad30 mult  s0, s4
 	ldloc 7
 	ldloc 12
 	ldloc 7
 	ldloc 11
 	mul
 	stloc 18
-	bne.un L_100ad20
+	bne.un L_100ad30
 // --- basic block ---
-// 0x0100ada0: 0x100ada0: lw    ra, 52(sp)
-// 0x0100ada4: 0x100ada4: addu  v0, s1, zero
+// 0x0100adb0: 0x100adb0: lw    ra, 52(sp)
+// 0x0100adb4: 0x100adb4: addu  v0, s1, zero
 	ldloc 8
 	stloc 6
-// 0x0100ada8: 0x100ada8: lw    s8, 48(sp)
+// 0x0100adb8: 0x100adb8: lw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5490,7 +5490,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100adac: 0x100adac: lw    s7, 44(sp)
+// 0x0100adbc: 0x100adbc: lw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5499,7 +5499,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100adb0: 0x100adb0: lw    s6, 40(sp)
+// 0x0100adc0: 0x100adc0: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5508,7 +5508,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100adb4: 0x100adb4: lw    s5, 36(sp)
+// 0x0100adc4: 0x100adc4: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5517,7 +5517,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100adb8: 0x100adb8: lw    s4, 32(sp)
+// 0x0100adc8: 0x100adc8: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5526,7 +5526,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100adbc: 0x100adbc: lw    s3, 28(sp)
+// 0x0100adcc: 0x100adcc: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5535,7 +5535,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100adc0: 0x100adc0: lw    s2, 24(sp)
+// 0x0100add0: 0x100add0: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5544,7 +5544,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100adc4: 0x100adc4: lw    s1, 20(sp)
+// 0x0100add4: 0x100add4: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5553,7 +5553,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100adc8: 0x100adc8: lw    s0, 16(sp)
+// 0x0100add8: 0x100add8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5562,7 +5562,7 @@ L_100ad98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100adcc: 0x100adcc: jr    ra addiu sp, sp, 56
+// 0x0100addc: 0x100addc: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5574,7 +5574,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_scale_100add4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_scale_100ade4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5609,26 +5609,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100add4: 0x100add4: addiu sp, sp, -24
+// 0x0100ade4: 0x100ade4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100add8: 0x100add8: sw    ra, 20(sp)
-// 0x0100addc: 0x100addc: jal   0x100c800 sll   zero, zero, 0
+// 0x0100ade8: 0x100ade8: sw    ra, 20(sp)
+// 0x0100adec: 0x100adec: jal   0x100c810 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_scale_100c800(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_scale_100c810(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0100ade4: 0x100ade4: lw    ra, 20(sp)
-// 0x0100ade8: 0x100ade8: sll   zero, zero, 0
-// 0x0100adec: 0x100adec: jr    ra addiu sp, sp, 24
+// 0x0100adf4: 0x100adf4: lw    ra, 20(sp)
+// 0x0100adf8: 0x100adf8: sll   zero, zero, 0
+// 0x0100adfc: 0x100adfc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5640,7 +5640,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_square_at_current_scale_100adf4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_at_current_scale_100ae04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5675,47 +5675,47 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100adf4: 0x100adf4: addiu sp, sp, -24
+// 0x0100ae04: 0x100ae04: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100adf8: 0x100adf8: sw    ra, 20(sp)
-// 0x0100adfc: 0x100adfc: jal   0x100c800 sll   zero, zero, 0
+// 0x0100ae08: 0x100ae08: sw    ra, 20(sp)
+// 0x0100ae0c: 0x100ae0c: jal   0x100c810 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_scale_100c800(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_scale_100c810(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ae04: 0x100ae04: lui   v1, 0x20000
+// 0x0100ae14: 0x100ae14: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100ae08: 0x100ae08: lw    v1, 31248(v1)
+// 0x0100ae18: 0x100ae18: lw    v1, 31712(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ae0c: 0x100ae0c: lw    ra, 20(sp)
-// 0x0100ae10: 0x100ae10: xor   v0, v0, v1
+// 0x0100ae1c: 0x100ae1c: lw    ra, 20(sp)
+// 0x0100ae20: 0x100ae20: xor   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	xor
 	stloc 5
-// 0x0100ae14: 0x100ae14: sltiu v0, v0, 1
+// 0x0100ae24: 0x100ae24: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0100ae18: 0x100ae18: jr    ra addiu sp, sp, 24
+// 0x0100ae28: 0x100ae28: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5727,7 +5727,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_current_scale_shift_100ae20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_current_scale_shift_100ae30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5762,34 +5762,34 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100ae20: 0x100ae20: lui   v0, 0x20000
+// 0x0100ae30: 0x100ae30: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100ae24: 0x100ae24: lw    v1, 31244(v0)
+// 0x0100ae34: 0x100ae34: lw    v1, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ae28: 0x100ae28: addiu sp, sp, -24
+// 0x0100ae38: 0x100ae38: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100ae2c: 0x100ae2c: sw    ra, 20(sp)
-// 0x0100ae30: 0x100ae30: beq   v1, zero, 0x100ae68 addiu v0, zero, 1
+// 0x0100ae3c: 0x100ae3c: sw    ra, 20(sp)
+// 0x0100ae40: 0x100ae40: beq   v1, zero, 0x100ae78 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 5
-	brfalse L_100ae68
+	brfalse L_100ae78
 // --- basic block ---
-// 0x0100ae38: 0x100ae38: lui   v0, 0x0
+// 0x0100ae48: 0x100ae48: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100ae3c: 0x100ae3c: lw    v0, 744(v0)
+// 0x0100ae4c: 0x100ae4c: lw    v0, 744(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5798,7 +5798,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ae40: 0x100ae40: lw    v1, 8(v1)
+// 0x0100ae50: 0x100ae50: lw    v1, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5807,33 +5807,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ae44: 0x100ae44: sll   v0, v0, 2
+// 0x0100ae54: 0x100ae54: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100ae48: 0x100ae48: addu  v0, v1, v0
+// 0x0100ae58: 0x100ae58: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0100ae4c: 0x100ae4c: lw    v0, 0(v0)
+// 0x0100ae5c: 0x100ae5c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100ae50: 0x100ae50: sll   zero, zero, 0
-// 0x0100ae54: 0x100ae54: lw    v0, 0(v0)
+// 0x0100ae60: 0x100ae60: sll   zero, zero, 0
+// 0x0100ae64: 0x100ae64: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100ae58: 0x100ae58: sll   zero, zero, 0
-// 0x0100ae5c: 0x100ae5c: lw    a0, 4(v0)
+// 0x0100ae68: 0x100ae68: sll   zero, zero, 0
+// 0x0100ae6c: 0x100ae6c: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5842,15 +5842,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100ae60: 0x100ae60: jal   0x100c4f8 sll   zero, zero, 0
+// 0x0100ae70: 0x100ae70: jal   0x100c508 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl8::roadmap_tile_get_scale_shift_100c4f8(int32)
+	call int32 Cibyl8::roadmap_tile_get_scale_shift_100c508(int32)
 	stloc 5
 // --- basic block ---
-L_100ae68:
-// 0x0100ae68: 0x100ae68: lw    ra, 20(sp)
-// 0x0100ae6c: 0x100ae6c: sll   zero, zero, 0
-// 0x0100ae70: 0x100ae70: jr    ra addiu sp, sp, 24
+L_100ae78:
+// 0x0100ae78: 0x100ae78: lw    ra, 20(sp)
+// 0x0100ae7c: 0x100ae7c: sll   zero, zero, 0
+// 0x0100ae80: 0x100ae80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5862,7 +5862,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5897,31 +5897,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100ae78: 0x100ae78: lui   v0, 0x20000
+// 0x0100ae88: 0x100ae88: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100ae7c: 0x100ae7c: lw    v1, 31244(v0)
+// 0x0100ae8c: 0x100ae8c: lw    v1, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ae80: 0x100ae80: addiu sp, sp, -24
+// 0x0100ae90: 0x100ae90: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100ae84: 0x100ae84: beq   v1, zero, 0x100aed0 sw    ra, 20(sp)
+// 0x0100ae94: 0x100ae94: beq   v1, zero, 0x100aee0 sw    ra, 20(sp)
 	ldloc 7
-	brfalse L_100aed0
+	brfalse L_100aee0
 // --- basic block ---
-// 0x0100ae8c: 0x100ae8c: lui   v0, 0x0
+// 0x0100ae9c: 0x100ae9c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100ae90: 0x100ae90: lw    v0, 744(v0)
+// 0x0100aea0: 0x100aea0: lw    v0, 744(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5930,17 +5930,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ae94: 0x100ae94: sll   zero, zero, 0
-// 0x0100ae98: 0x100ae98: bltz  v0, 0x100aed0 sll   v0, v0, 2
+// 0x0100aea4: 0x100aea4: sll   zero, zero, 0
+// 0x0100aea8: 0x100aea8: bltz  v0, 0x100aee0 sll   v0, v0, 2
 	ldloc 5
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
 	ldc.i4.s 0
-	blt L_100aed0
+	blt L_100aee0
 // --- basic block ---
-// 0x0100aea0: 0x100aea0: lw    v1, 8(v1)
+// 0x0100aeb0: 0x100aeb0: lw    v1, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5949,29 +5949,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100aea4: 0x100aea4: sll   zero, zero, 0
-// 0x0100aea8: 0x100aea8: addu  v0, v1, v0
+// 0x0100aeb4: 0x100aeb4: sll   zero, zero, 0
+// 0x0100aeb8: 0x100aeb8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0100aeac: 0x100aeac: lw    v0, 0(v0)
+// 0x0100aebc: 0x100aebc: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100aeb0: 0x100aeb0: sll   zero, zero, 0
-// 0x0100aeb4: 0x100aeb4: lw    v0, 0(v0)
+// 0x0100aec0: 0x100aec0: sll   zero, zero, 0
+// 0x0100aec4: 0x100aec4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100aeb8: 0x100aeb8: sll   zero, zero, 0
-// 0x0100aebc: 0x100aebc: lw    a0, 4(v0)
+// 0x0100aec8: 0x100aec8: sll   zero, zero, 0
+// 0x0100aecc: 0x100aecc: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5980,24 +5980,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100aec0: 0x100aec0: jal   0x100c4d4 sll   zero, zero, 0
+// 0x0100aed0: 0x100aed0: jal   0x100c4e4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl8::roadmap_tile_get_scale_factor_100c4d4(int32)
+	call int32 Cibyl8::roadmap_tile_get_scale_factor_100c4e4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100aec8: 0x100aec8: j	 0x100aed4 sll   zero, zero, 0
-	br L_100aed4
+// 0x0100aed8: 0x100aed8: j	 0x100aee4 sll   zero, zero, 0
+	br L_100aee4
 // --- basic block ---
-L_100aed0:
-// 0x0100aed0: 0x100aed0: addiu v0, zero, 1
+L_100aee0:
+// 0x0100aee0: 0x100aee0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_100aed4:
-// 0x0100aed4: 0x100aed4: lw    ra, 20(sp)
-// 0x0100aed8: 0x100aed8: sll   zero, zero, 0
-// 0x0100aedc: 0x100aedc: jr    ra addiu sp, sp, 24
+L_100aee4:
+// 0x0100aee4: 0x100aee4: lw    ra, 20(sp)
+// 0x0100aee8: 0x100aee8: sll   zero, zero, 0
+// 0x0100aeec: 0x100aeec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6009,7 +6009,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_cross_pos_100aee4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_cross_pos_100aef4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -6044,12 +6044,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100aee4: 0x100aee4: addiu sp, sp, -32
+// 0x0100aef4: 0x100aef4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100aee8: 0x100aee8: sw    a0, 16(sp)
+// 0x0100aef8: 0x100aef8: sw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6058,34 +6058,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100aeec: 0x100aeec: sw    ra, 28(sp)
-// 0x0100aef0: 0x100aef0: jal   0x100ae78 sll   zero, zero, 0
+// 0x0100aefc: 0x100aefc: sw    ra, 28(sp)
+// 0x0100af00: 0x100af00: jal   0x100ae88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100aef8: 0x100aef8: lui   v1, 0x20000
+// 0x0100af08: 0x100af08: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100aefc: 0x100aefc: lw    a1, 31244(v1)
+// 0x0100af0c: 0x100af0c: lw    a1, 31708(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100af00: 0x100af00: lui   v1, 0x0
+// 0x0100af10: 0x100af10: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100af04: 0x100af04: lw    v1, 744(v1)
+// 0x0100af14: 0x100af14: lw    v1, 744(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6094,7 +6094,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100af08: 0x100af08: lw    a1, 8(a1)
+// 0x0100af18: 0x100af18: lw    a1, 8(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -6103,24 +6103,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100af0c: 0x100af0c: sll   v1, v1, 2
+// 0x0100af1c: 0x100af1c: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100af10: 0x100af10: addu  v1, a1, v1
+// 0x0100af20: 0x100af20: addu  v1, a1, v1
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x0100af14: 0x100af14: lw    v1, 0(v1)
+// 0x0100af24: 0x100af24: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100af18: 0x100af18: lw    a0, 16(sp)
+// 0x0100af28: 0x100af28: lw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6129,7 +6129,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100af1c: 0x100af1c: lw    a2, 64(v1)
+// 0x0100af2c: 0x100af2c: lw    a2, 64(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6138,7 +6138,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100af20: 0x100af20: lw    a1, 4(a0)
+// 0x0100af30: 0x100af30: lw    a1, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6147,26 +6147,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100af24: 0x100af24: addu  a2, v0, a2
+// 0x0100af34: 0x100af34: addu  a2, v0, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc.3
-// 0x0100af28: 0x100af28: slt   a2, a1, a2
+// 0x0100af38: 0x100af38: slt   a2, a1, a2
 	ldloc.2
 	ldloc.3
 	clt
 	stloc.3
-// 0x0100af2c: 0x100af2c: beq   a2, zero, 0x100af44 sll   zero, zero, 0
+// 0x0100af3c: 0x100af3c: beq   a2, zero, 0x100af54 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_100af44
+	brfalse L_100af54
 // --- basic block ---
-// 0x0100af34: 0x100af34: subu  v0, a1, v0
+// 0x0100af44: 0x100af44: subu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	sub
 	stloc 6
-// 0x0100af38: 0x100af38: sw    v0, 4(a0)
+// 0x0100af48: 0x100af48: sw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6175,13 +6175,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100af3c: 0x100af3c: j	 0x100afb8 addiu v1, zero, 1
+// 0x0100af4c: 0x100af4c: j	 0x100afc8 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_100afb8
+	br L_100afc8
 // --- basic block ---
-L_100af44:
-// 0x0100af44: 0x100af44: lw    a2, 56(v1)
+L_100af54:
+// 0x0100af54: 0x100af54: lw    a2, 56(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6190,27 +6190,27 @@ L_100af44:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100af48: 0x100af48: sll   zero, zero, 0
-// 0x0100af4c: 0x100af4c: subu  a2, a2, v0
+// 0x0100af58: 0x100af58: sll   zero, zero, 0
+// 0x0100af5c: 0x100af5c: subu  a2, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-// 0x0100af50: 0x100af50: slt   a2, a2, a1
+// 0x0100af60: 0x100af60: slt   a2, a2, a1
 	ldloc.3
 	ldloc.2
 	clt
 	stloc.3
-// 0x0100af54: 0x100af54: beq   a2, zero, 0x100af6c sll   zero, zero, 0
+// 0x0100af64: 0x100af64: beq   a2, zero, 0x100af7c sll   zero, zero, 0
 	ldloc.3
-	brfalse L_100af6c
+	brfalse L_100af7c
 // --- basic block ---
-// 0x0100af5c: 0x100af5c: addu  v0, v0, a1
+// 0x0100af6c: 0x100af6c: addu  v0, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x0100af60: 0x100af60: sw    v0, 4(a0)
+// 0x0100af70: 0x100af70: sw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -6219,13 +6219,13 @@ L_100af44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100af64: 0x100af64: j	 0x100afb8 addiu v1, zero, 3
+// 0x0100af74: 0x100af74: j	 0x100afc8 addiu v1, zero, 3
 	ldc.i4.3
 	stloc 5
-	br L_100afb8
+	br L_100afc8
 // --- basic block ---
-L_100af6c:
-// 0x0100af6c: 0x100af6c: lw    a2, 60(v1)
+L_100af7c:
+// 0x0100af7c: 0x100af7c: lw    a2, 60(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6234,46 +6234,46 @@ L_100af6c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100af70: 0x100af70: lw    a1, 0(a0)
+// 0x0100af80: 0x100af80: lw    a1, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0100af74: 0x100af74: addu  a2, v0, a2
+// 0x0100af84: 0x100af84: addu  a2, v0, a2
 	ldloc 6
 	ldloc.3
 	add
 	stloc.3
-// 0x0100af78: 0x100af78: slt   a2, a1, a2
+// 0x0100af88: 0x100af88: slt   a2, a1, a2
 	ldloc.2
 	ldloc.3
 	clt
 	stloc.3
-// 0x0100af7c: 0x100af7c: beq   a2, zero, 0x100af94 sll   zero, zero, 0
+// 0x0100af8c: 0x100af8c: beq   a2, zero, 0x100afa4 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_100af94
+	brfalse L_100afa4
 // --- basic block ---
-// 0x0100af84: 0x100af84: subu  v0, a1, v0
+// 0x0100af94: 0x100af94: subu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	sub
 	stloc 6
-// 0x0100af88: 0x100af88: sw    v0, 0(a0)
+// 0x0100af98: 0x100af98: sw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100af8c: 0x100af8c: j	 0x100afb8 addu  v1, zero, zero
+// 0x0100af9c: 0x100af9c: j	 0x100afc8 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_100afb8
+	br L_100afc8
 // --- basic block ---
-L_100af94:
-// 0x0100af94: 0x100af94: lw    a2, 52(v1)
+L_100afa4:
+// 0x0100afa4: 0x100afa4: lw    a2, 52(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6282,44 +6282,44 @@ L_100af94:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100af98: 0x100af98: sll   zero, zero, 0
-// 0x0100af9c: 0x100af9c: subu  a2, a2, v0
+// 0x0100afa8: 0x100afa8: sll   zero, zero, 0
+// 0x0100afac: 0x100afac: subu  a2, a2, v0
 	ldloc.3
 	ldloc 6
 	sub
 	stloc.3
-// 0x0100afa0: 0x100afa0: slt   a2, a2, a1
+// 0x0100afb0: 0x100afb0: slt   a2, a2, a1
 	ldloc.3
 	ldloc.2
 	clt
 	stloc.3
-// 0x0100afa4: 0x100afa4: beq   a2, zero, 0x100afb8 addiu v1, zero, -1
+// 0x0100afb4: 0x100afb4: beq   a2, zero, 0x100afc8 addiu v1, zero, -1
 	ldloc.3
 	ldc.i4.m1
 	stloc 5
-	brfalse L_100afb8
+	brfalse L_100afc8
 // --- basic block ---
-// 0x0100afac: 0x100afac: addu  v0, v0, a1
+// 0x0100afbc: 0x100afbc: addu  v0, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x0100afb0: 0x100afb0: sw    v0, 0(a0)
+// 0x0100afc0: 0x100afc0: sw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100afb4: 0x100afb4: addiu v1, zero, 2
+// 0x0100afc4: 0x100afc4: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 5
-L_100afb8:
-// 0x0100afb8: 0x100afb8: lw    ra, 28(sp)
-// 0x0100afbc: 0x100afbc: addu  v0, v1, zero
+L_100afc8:
+// 0x0100afc8: 0x100afc8: lw    ra, 28(sp)
+// 0x0100afcc: 0x100afcc: addu  v0, v1, zero
 	ldloc 5
 	stloc 6
-// 0x0100afc0: 0x100afc0: jr    ra addiu sp, sp, 32
+// 0x0100afd0: 0x100afd0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6331,7 +6331,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_set_screen_scale_100b020(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_set_screen_scale_100b030(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6366,27 +6366,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b020: 0x100b020: nor   v0, zero, a0
+// 0x0100b030: 0x100b030: nor   v0, zero, a0
 	ldloc.1
 	ldc.i4.m1
 	xor
 	stloc 5
-// 0x0100b024: 0x100b024: sra   v0, v0, 31
+// 0x0100b034: 0x100b034: sra   v0, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x0100b028: 0x100b028: addiu sp, sp, -32
+// 0x0100b038: 0x100b038: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100b02c: 0x100b02c: and   a0, a0, v0
+// 0x0100b03c: 0x100b03c: and   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	and
 	stloc.1
-// 0x0100b030: 0x100b030: sw    a0, 16(sp)
+// 0x0100b040: 0x100b040: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6395,19 +6395,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100b034: 0x100b034: sw    ra, 28(sp)
-// 0x0100b038: 0x100b038: jal   0x100c730 sll   zero, zero, 0
+// 0x0100b044: 0x100b044: sw    ra, 28(sp)
+// 0x0100b048: 0x100b048: jal   0x100c740 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_max_scale_100c730(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_max_scale_100c740(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100b040: 0x100b040: lw    a0, 16(sp)
+// 0x0100b050: 0x100b050: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6416,45 +6416,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b044: 0x100b044: sll   zero, zero, 0
-// 0x0100b048: 0x100b048: slt   v0, v0, a0
+// 0x0100b054: 0x100b054: sll   zero, zero, 0
+// 0x0100b058: 0x100b058: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x0100b04c: 0x100b04c: beq   v0, zero, 0x100b060 sll   zero, zero, 0
+// 0x0100b05c: 0x100b05c: beq   v0, zero, 0x100b070 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100b060
+	brfalse L_100b070
 // --- basic block ---
-// 0x0100b054: 0x100b054: jal   0x100c730 sll   zero, zero, 0
+// 0x0100b064: 0x100b064: jal   0x100c740 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_max_scale_100c730(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_max_scale_100c740(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100b05c: 0x100b05c: addu  a0, v0, zero
+// 0x0100b06c: 0x100b06c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-L_100b060:
-// 0x0100b060: 0x100b060: lw    ra, 28(sp)
-// 0x0100b064: 0x100b064: lui   v0, 0x20000
+L_100b070:
+// 0x0100b070: 0x100b070: lw    ra, 28(sp)
+// 0x0100b074: 0x100b074: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100b068: 0x100b068: sw    a0, 31248(v0)
+// 0x0100b078: 0x100b078: sw    a0, 31712(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100b06c: 0x100b06c: jr    ra addiu sp, sp, 32
+// 0x0100b07c: 0x100b07c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6466,7 +6466,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_adjust_scale_100b074(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_adjust_scale_100b084(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32[] mem,int32 s1,int32 s2,int32 v1,int32 ra)
@@ -6510,12 +6510,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b074: 0x100b074: addiu sp, sp, -32
+// 0x0100b084: 0x100b084: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100b078: 0x100b078: sw    s2, 24(sp)
+// 0x0100b088: 0x100b088: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6524,7 +6524,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100b07c: 0x100b07c: sw    s1, 20(sp)
+// 0x0100b08c: 0x100b08c: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6533,7 +6533,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100b080: 0x100b080: sw    s0, 16(sp)
+// 0x0100b090: 0x100b090: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6542,8 +6542,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100b084: 0x100b084: sw    ra, 28(sp)
-// 0x0100b088: 0x100b088: jal   0x100c730 addu  s2, a0, zero
+// 0x0100b094: 0x100b094: sw    ra, 28(sp)
+// 0x0100b098: 0x100b098: jal   0x100c740 addu  s2, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.0
@@ -6551,56 +6551,56 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_max_scale_100c730(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_max_scale_100c740(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0100b090: 0x100b090: addiu s0, zero, 1
+// 0x0100b0a0: 0x100b0a0: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0100b094: 0x100b094: addu  s1, v0, zero
+// 0x0100b0a4: 0x100b0a4: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-L_100b098:
-// 0x0100b098: 0x100b098: slt   v0, s1, s0
+L_100b0a8:
+// 0x0100b0a8: 0x100b0a8: slt   v0, s1, s0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 6
-// 0x0100b09c: 0x100b09c: bne   v0, zero, 0x100b0bc addu  a0, s0, zero
+// 0x0100b0ac: 0x100b0ac: bne   v0, zero, 0x100b0cc addu  a0, s0, zero
 	ldloc 6
 	ldloc 5
 	stloc.1
-	brtrue L_100b0bc
+	brtrue L_100b0cc
 // --- basic block ---
-// 0x0100b0a4: 0x100b0a4: jal   0x100c4d4 sll   zero, zero, 0
+// 0x0100b0b4: 0x100b0b4: jal   0x100c4e4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl8::roadmap_tile_get_scale_factor_100c4d4(int32)
+	call int32 Cibyl8::roadmap_tile_get_scale_factor_100c4e4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0100b0ac: 0x100b0ac: slt   v0, s2, v0
+// 0x0100b0bc: 0x100b0bc: slt   v0, s2, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x0100b0b0: 0x100b0b0: beq   v0, zero, 0x100b098 addiu s0, s0, 1
+// 0x0100b0c0: 0x100b0c0: beq   v0, zero, 0x100b0a8 addiu s0, s0, 1
 	ldloc 6
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	brfalse L_100b098
+	brfalse L_100b0a8
 // --- basic block ---
-// 0x0100b0b8: 0x100b0b8: addiu s0, s0, -1
+// 0x0100b0c8: 0x100b0c8: addiu s0, s0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-L_100b0bc:
-// 0x0100b0bc: 0x100b0bc: jal   0x100b020 addiu a0, s0, -1
+L_100b0cc:
+// 0x0100b0cc: 0x100b0cc: jal   0x100b030 addiu a0, s0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
@@ -6610,13 +6610,13 @@ L_100b0bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_screen_scale_100b020(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_screen_scale_100b030(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0100b0c4: 0x100b0c4: lw    ra, 28(sp)
-// 0x0100b0c8: 0x100b0c8: lw    s2, 24(sp)
+// 0x0100b0d4: 0x100b0d4: lw    ra, 28(sp)
+// 0x0100b0d8: 0x100b0d8: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6625,7 +6625,7 @@ L_100b0bc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100b0cc: 0x100b0cc: lw    s1, 20(sp)
+// 0x0100b0dc: 0x100b0dc: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6634,7 +6634,7 @@ L_100b0bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100b0d0: 0x100b0d0: lw    s0, 16(sp)
+// 0x0100b0e0: 0x100b0e0: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6643,7 +6643,7 @@ L_100b0bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b0d4: 0x100b0d4: jr    ra addiu sp, sp, 32
+// 0x0100b0e4: 0x100b0e4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6655,7 +6655,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra,int32 lo)
@@ -6702,12 +6702,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b0dc: 0x100b0dc: addiu sp, sp, -32
+// 0x0100b0ec: 0x100b0ec: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100b0e0: 0x100b0e0: sw    s0, 16(sp)
+// 0x0100b0f0: 0x100b0f0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6716,19 +6716,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100b0e4: 0x100b0e4: lui   s0, 0x20000
+// 0x0100b0f4: 0x100b0f4: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100b0e8: 0x100b0e8: lw    v0, 31244(s0)
+// 0x0100b0f8: 0x100b0f8: lw    v0, 31708(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b0ec: 0x100b0ec: sw    s1, 20(sp)
+// 0x0100b0fc: 0x100b0fc: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6737,8 +6737,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100b0f0: 0x100b0f0: sw    ra, 28(sp)
-// 0x0100b0f4: 0x100b0f4: sw    s2, 24(sp)
+// 0x0100b100: 0x100b100: sw    ra, 28(sp)
+// 0x0100b104: 0x100b104: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6747,13 +6747,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100b0f8: 0x100b0f8: beq   v0, zero, 0x100b148 addu  s1, a0, zero
+// 0x0100b108: 0x100b108: beq   v0, zero, 0x100b158 addu  s1, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 9
-	brfalse L_100b148
+	brfalse L_100b158
 // --- basic block ---
-// 0x0100b100: 0x100b100: lw    a0, 3096(v0)
+// 0x0100b110: 0x100b110: lw    a0, 3096(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6762,43 +6762,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b104: 0x100b104: jal   0x1015518 addu  a1, s1, zero
+// 0x0100b114: 0x100b114: jal   0x1015528 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_get_first_1015518(int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_first_1015528(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0100b10c: 0x100b10c: j	 0x100b140 addiu s2, zero, 12
+// 0x0100b11c: 0x100b11c: j	 0x100b150 addiu s2, zero, 12
 	ldc.i4.s 12
 	stloc 10
-	br L_100b140
+	br L_100b150
 // --- basic block ---
-L_100b114:
-// 0x0100b114: 0x100b114: mult  v0, s2
+L_100b124:
+// 0x0100b124: 0x100b124: mult  v0, s2
 	ldloc 6
 	ldloc 10
 	mul
 	stloc 12
-// 0x0100b118: 0x100b118: lw    v1, 31244(s0)
+// 0x0100b128: 0x100b128: lw    v1, 31708(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b11c: 0x100b11c: mflo  lo
+// 0x0100b12c: 0x100b12c: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x0100b120: 0x100b120: addu  a0, v1, a0
+// 0x0100b130: 0x100b130: addu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x0100b124: 0x100b124: lw    a0, 12(a0)
+// 0x0100b134: 0x100b134: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6807,13 +6807,13 @@ L_100b114:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b128: 0x100b128: sll   zero, zero, 0
-// 0x0100b12c: 0x100b12c: beq   a0, s1, 0x100b14c sll   zero, zero, 0
+// 0x0100b138: 0x100b138: sll   zero, zero, 0
+// 0x0100b13c: 0x100b13c: beq   a0, s1, 0x100b15c sll   zero, zero, 0
 	ldloc.1
 	ldloc 9
-	beq  L_100b14c
+	beq  L_100b15c
 // --- basic block ---
-// 0x0100b134: 0x100b134: lw    a0, 3096(v1)
+// 0x0100b144: 0x100b144: lw    a0, 3096(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6822,32 +6822,32 @@ L_100b114:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b138: 0x100b138: jal   0x1015744 sll   zero, zero, 0
+// 0x0100b148: 0x100b148: jal   0x1015754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100b140:
-// 0x0100b140: 0x100b140: bgez  v0, 0x100b114 addu  a1, v0, zero
+L_100b150:
+// 0x0100b150: 0x100b150: bgez  v0, 0x100b124 addu  a1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.2
 	ldc.i4.s 0
-	bge L_100b114
+	bge L_100b124
 // --- basic block ---
-L_100b148:
-// 0x0100b148: 0x100b148: addiu v0, zero, -1
+L_100b158:
+// 0x0100b158: 0x100b158: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_100b14c:
-// 0x0100b14c: 0x100b14c: lw    ra, 28(sp)
-// 0x0100b150: 0x100b150: lw    s2, 24(sp)
+L_100b15c:
+// 0x0100b15c: 0x100b15c: lw    ra, 28(sp)
+// 0x0100b160: 0x100b160: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6856,7 +6856,7 @@ L_100b14c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100b154: 0x100b154: lw    s1, 20(sp)
+// 0x0100b164: 0x100b164: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6865,7 +6865,7 @@ L_100b14c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100b158: 0x100b158: lw    s0, 16(sp)
+// 0x0100b168: 0x100b168: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6874,7 +6874,7 @@ L_100b14c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100b15c: 0x100b15c: jr    ra addiu sp, sp, 32
+// 0x0100b16c: 0x100b16c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6886,7 +6886,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 s1,int32 s0,int32 t0,int32 lo,int32 t1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -6945,12 +6945,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b164: 0x100b164: addiu sp, sp, -48
+// 0x0100b174: 0x100b174: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0100b168: 0x100b168: sw    s1, 28(sp)
+// 0x0100b178: 0x100b178: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6959,8 +6959,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100b16c: 0x100b16c: sw    ra, 44(sp)
-// 0x0100b170: 0x100b170: sw    s4, 40(sp)
+// 0x0100b17c: 0x100b17c: sw    ra, 44(sp)
+// 0x0100b180: 0x100b180: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6969,7 +6969,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100b174: 0x100b174: sw    s3, 36(sp)
+// 0x0100b184: 0x100b184: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6978,7 +6978,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100b178: 0x100b178: sw    s2, 32(sp)
+// 0x0100b188: 0x100b188: sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6987,7 +6987,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100b17c: 0x100b17c: sw    s0, 24(sp)
+// 0x0100b18c: 0x100b18c: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6996,7 +6996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100b180: 0x100b180: jal   0x100b0dc addu  s1, a0, zero
+// 0x0100b190: 0x100b190: jal   0x100b0ec addu  s1, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -7004,19 +7004,19 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100b188: 0x100b188: bgez  v0, 0x100b240 lui   v1, 0x20000
+// 0x0100b198: 0x100b198: bgez  v0, 0x100b250 lui   v1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	bge L_100b240
+	bge L_100b250
 // --- basic block ---
-// 0x0100b190: 0x100b190: jal   0x100db90 addu  a0, s1, zero
+// 0x0100b1a0: 0x100b1a0: jal   0x100dba0 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7024,57 +7024,57 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100b198: 0x100b198: beq   v0, zero, 0x100b1c4 addu  s0, v0, zero
+// 0x0100b1a8: 0x100b1a8: beq   v0, zero, 0x100b1d4 addu  s0, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc 9
-	brfalse L_100b1c4
+	brfalse L_100b1d4
 // --- basic block ---
-// 0x0100b1a0: 0x100b1a0: lw    v0, 0(v0)
+// 0x0100b1b0: 0x100b1b0: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100b1a4: 0x100b1a4: sll   zero, zero, 0
-// 0x0100b1a8: 0x100b1a8: andi  v1, v0, 16
+// 0x0100b1b4: 0x100b1b4: sll   zero, zero, 0
+// 0x0100b1b8: 0x100b1b8: andi  v1, v0, 16
 	ldloc 7
 	ldc.i4.s 16
 	and
 	stloc 5
-// 0x0100b1ac: 0x100b1ac: beq   v1, zero, 0x100b1bc andi  v1, v0, 2
+// 0x0100b1bc: 0x100b1bc: beq   v1, zero, 0x100b1cc andi  v1, v0, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	and
 	stloc 5
-	brfalse L_100b1bc
+	brfalse L_100b1cc
 // --- basic block ---
-// 0x0100b1b4: 0x100b1b4: beq   v1, zero, 0x100b324 sll   zero, zero, 0
+// 0x0100b1c4: 0x100b1c4: beq   v1, zero, 0x100b334 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100b324
+	brfalse L_100b334
 // --- basic block ---
-L_100b1bc:
-// 0x0100b1bc: 0x100b1bc: ori   v0, v0, 16
+L_100b1cc:
+// 0x0100b1cc: 0x100b1cc: ori   v0, v0, 16
 	ldloc 7
 	ldc.i4.s 16
 	or
 	stloc 7
-// 0x0100b1c0: 0x100b1c0: sw    v0, 0(s0)
+// 0x0100b1d0: 0x100b1d0: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_100b1c4:
-// 0x0100b1c4: 0x100b1c4: jal   0x1013848 addu  a0, s1, zero
+L_100b1d4:
+// 0x0100b1d4: 0x100b1d4: jal   0x1013858 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7082,38 +7082,38 @@ L_100b1c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_load_tile_1013848(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_load_tile_1013858(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100b1cc: 0x100b1cc: slti  v1, v0, -4
+// 0x0100b1dc: 0x100b1dc: slti  v1, v0, -4
 	ldloc 7
 	ldc.i4.s -4
 	clt
 	stloc 5
-// 0x0100b1d0: 0x100b1d0: bne   v1, zero, 0x100b210 lui   a1, 0x0
+// 0x0100b1e0: 0x100b1e0: bne   v1, zero, 0x100b220 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brtrue L_100b210
+	brtrue L_100b220
 // --- basic block ---
-// 0x0100b1d8: 0x100b1d8: slti  v1, v0, -2
+// 0x0100b1e8: 0x100b1e8: slti  v1, v0, -2
 	ldloc 7
 	ldc.i4.s -2
 	clt
 	stloc 5
-// 0x0100b1dc: 0x100b1dc: bne   v1, zero, 0x100b324 sll   zero, zero, 0
+// 0x0100b1ec: 0x100b1ec: bne   v1, zero, 0x100b334 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100b324
+	brtrue L_100b334
 // --- basic block ---
-// 0x0100b1e4: 0x100b1e4: bne   v0, zero, 0x100b214 lui   a3, 0x0
+// 0x0100b1f4: 0x100b1f4: bne   v0, zero, 0x100b224 lui   a3, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_100b214
+	brtrue L_100b224
 // --- basic block ---
-// 0x0100b1ec: 0x100b1ec: jal   0x100b0dc addu  a0, s1, zero
+// 0x0100b1fc: 0x100b1fc: jal   0x100b0ec addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7121,59 +7121,59 @@ L_100b1c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100b1f4: 0x100b1f4: beq   s0, zero, 0x100b238 sll   zero, zero, 0
+// 0x0100b204: 0x100b204: beq   s0, zero, 0x100b248 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_100b238
+	brfalse L_100b248
 // --- basic block ---
-// 0x0100b1fc: 0x100b1fc: lw    v1, 0(s0)
+// 0x0100b20c: 0x100b20c: lw    v1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100b200: 0x100b200: sll   zero, zero, 0
-// 0x0100b204: 0x100b204: ori   v1, v1, 2
+// 0x0100b210: 0x100b210: sll   zero, zero, 0
+// 0x0100b214: 0x100b214: ori   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	or
 	stloc 5
-// 0x0100b208: 0x100b208: j	 0x100b238 sw    v1, 0(s0)
+// 0x0100b218: 0x100b218: j	 0x100b248 sw    v1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_100b238
+	br L_100b248
 // --- basic block ---
-L_100b210:
-// 0x0100b210: 0x100b210: lui   a3, 0x0
+L_100b220:
+// 0x0100b220: 0x100b220: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-L_100b214:
-// 0x0100b214: 0x100b214: addiu a1, a1, 24604
+L_100b224:
+// 0x0100b224: 0x100b224: addiu a1, a1, 24604
 	ldloc.2
 	ldc.i4 24604
 	add
 	stloc.2
-// 0x0100b218: 0x100b218: addiu a3, a3, 24784
+// 0x0100b228: 0x100b228: addiu a3, a3, 24784
 	ldloc 4
 	ldc.i4 24784
 	add
 	stloc 4
-// 0x0100b21c: 0x100b21c: addiu a0, zero, 5
+// 0x0100b22c: 0x100b22c: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x0100b220: 0x100b220: addiu a2, zero, 1024
+// 0x0100b230: 0x100b230: addiu a2, zero, 1024
 	ldc.i4 1024
 	stloc.3
-// 0x0100b224: 0x100b224: sw    s0, 16(sp)
+// 0x0100b234: 0x100b234: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7182,7 +7182,7 @@ L_100b214:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100b228: 0x100b228: jal   0x100449c sw    s1, 20(sp)
+// 0x0100b238: 0x100b238: jal   0x100449c sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7201,36 +7201,36 @@ L_100b214:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100b230: 0x100b230: j	 0x100b328 addu  v0, zero, zero
+// 0x0100b240: 0x100b240: j	 0x100b338 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_100b328
+	br L_100b338
 // --- basic block ---
-L_100b238:
-// 0x0100b238: 0x100b238: bltz  v0, 0x100b324 lui   v1, 0x20000
+L_100b248:
+// 0x0100b248: 0x100b248: bltz  v0, 0x100b334 lui   v1, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 5
 	ldc.i4.s 0
-	blt L_100b324
+	blt L_100b334
 // --- basic block ---
-L_100b240:
-// 0x0100b240: 0x100b240: lw    v1, 31244(v1)
+L_100b250:
+// 0x0100b250: 0x100b250: lw    v1, 31708(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b244: 0x100b244: sll   zero, zero, 0
-// 0x0100b248: 0x100b248: addiu a2, v1, 3084
+// 0x0100b254: 0x100b254: sll   zero, zero, 0
+// 0x0100b258: 0x100b258: addiu a2, v1, 3084
 	ldloc 5
 	ldc.i4 3084
 	add
 	stloc.3
-// 0x0100b24c: 0x100b24c: lw    a0, 4(a2)
+// 0x0100b25c: 0x100b25c: lw    a0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -7239,28 +7239,28 @@ L_100b240:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b250: 0x100b250: sll   zero, zero, 0
-// 0x0100b254: 0x100b254: beq   a0, v0, 0x100b2c0 addiu a1, zero, 12
+// 0x0100b260: 0x100b260: sll   zero, zero, 0
+// 0x0100b264: 0x100b264: beq   a0, v0, 0x100b2d0 addiu a1, zero, 12
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 12
 	stloc.2
-	beq  L_100b2c0
+	beq  L_100b2d0
 // --- basic block ---
-// 0x0100b25c: 0x100b25c: mult  v0, a1
+// 0x0100b26c: 0x100b26c: mult  v0, a1
 	ldloc 7
 	ldloc.2
 	mul
 	stloc 11
-// 0x0100b260: 0x100b260: mflo  lo
+// 0x0100b270: 0x100b270: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x0100b264: 0x100b264: addu  a0, v1, a0
+// 0x0100b274: 0x100b274: addu  a0, v1, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x0100b268: 0x100b268: lw    a3, 16(a0)
+// 0x0100b278: 0x100b278: lw    a3, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7269,7 +7269,7 @@ L_100b240:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100b26c: 0x100b26c: lw    t0, 20(a0)
+// 0x0100b27c: 0x100b27c: lw    t0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7278,20 +7278,20 @@ L_100b240:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100b270: 0x100b270: mult  a3, a1
+// 0x0100b280: 0x100b280: mult  a3, a1
 	ldloc 4
 	ldloc.2
 	mul
 	stloc 11
-// 0x0100b274: 0x100b274: mflo  lo
+// 0x0100b284: 0x100b284: mflo  lo
 	ldloc 11
 	stloc 12
-// 0x0100b278: 0x100b278: addu  t1, v1, t1
+// 0x0100b288: 0x100b288: addu  t1, v1, t1
 	ldloc 5
 	ldloc 12
 	add
 	stloc 12
-// 0x0100b27c: 0x100b27c: sw    t0, 20(t1)
+// 0x0100b28c: 0x100b28c: sw    t0, 20(t1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -7300,7 +7300,7 @@ L_100b240:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100b280: 0x100b280: lw    t0, 20(a0)
+// 0x0100b290: 0x100b290: lw    t0, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7309,15 +7309,15 @@ L_100b240:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100b284: 0x100b284: addiu t1, zero, 256
+// 0x0100b294: 0x100b294: addiu t1, zero, 256
 	ldc.i4 256
 	stloc 12
-// 0x0100b288: 0x100b288: mult  t0, a1
+// 0x0100b298: 0x100b298: mult  t0, a1
 	ldloc 10
 	ldloc.2
 	mul
 	stloc 11
-// 0x0100b28c: 0x100b28c: sw    t1, 20(a0)
+// 0x0100b29c: 0x100b29c: sw    t1, 20(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7326,15 +7326,15 @@ L_100b240:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100b290: 0x100b290: mflo  lo
+// 0x0100b2a0: 0x100b2a0: mflo  lo
 	ldloc 11
 	stloc 10
-// 0x0100b294: 0x100b294: addu  t0, v1, t0
+// 0x0100b2a4: 0x100b2a4: addu  t0, v1, t0
 	ldloc 5
 	ldloc 10
 	add
 	stloc 10
-// 0x0100b298: 0x100b298: sw    a3, 16(t0)
+// 0x0100b2a8: 0x100b2a8: sw    a3, 16(t0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -7343,7 +7343,7 @@ L_100b240:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100b29c: 0x100b29c: lw    a3, 4(a2)
+// 0x0100b2ac: 0x100b2ac: lw    a3, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -7352,8 +7352,8 @@ L_100b240:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100b2a0: 0x100b2a0: sll   zero, zero, 0
-// 0x0100b2a4: 0x100b2a4: sw    a3, 16(a0)
+// 0x0100b2b0: 0x100b2b0: sll   zero, zero, 0
+// 0x0100b2b4: 0x100b2b4: sw    a3, 16(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -7362,7 +7362,7 @@ L_100b240:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100b2a8: 0x100b2a8: lw    a0, 4(a2)
+// 0x0100b2b8: 0x100b2b8: lw    a0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -7371,7 +7371,7 @@ L_100b240:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b2ac: 0x100b2ac: sw    v0, 4(a2)
+// 0x0100b2bc: 0x100b2bc: sw    v0, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -7380,20 +7380,20 @@ L_100b240:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100b2b0: 0x100b2b0: mult  a0, a1
+// 0x0100b2c0: 0x100b2c0: mult  a0, a1
 	ldloc.1
 	ldloc.2
 	mul
 	stloc 11
-// 0x0100b2b4: 0x100b2b4: mflo  lo
+// 0x0100b2c4: 0x100b2c4: mflo  lo
 	ldloc 11
 	stloc.2
-// 0x0100b2b8: 0x100b2b8: addu  v1, v1, a1
+// 0x0100b2c8: 0x100b2c8: addu  v1, v1, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-// 0x0100b2bc: 0x100b2bc: sw    v0, 20(v1)
+// 0x0100b2cc: 0x100b2cc: sw    v0, 20(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7402,11 +7402,11 @@ L_100b240:
 	add
 	ldloc 7
 	stelem.i4
-L_100b2c0:
-// 0x0100b2c0: 0x100b2c0: lui   v1, 0x0
+L_100b2d0:
+// 0x0100b2d0: 0x100b2d0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b2c4: 0x100b2c4: sw    s1, 576(v1)
+// 0x0100b2d4: 0x100b2d4: sw    s1, 576(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7415,13 +7415,13 @@ L_100b2c0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100b2c8: 0x100b2c8: lui   v1, 0x0
+// 0x0100b2d8: 0x100b2d8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b2cc: 0x100b2cc: lui   s1, 0x0
+// 0x0100b2dc: 0x100b2dc: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0100b2d0: 0x100b2d0: sw    v0, 744(v1)
+// 0x0100b2e0: 0x100b2e0: sw    v0, 744(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7430,43 +7430,43 @@ L_100b2c0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100b2d4: 0x100b2d4: sll   s4, v0, 2
+// 0x0100b2e4: 0x100b2e4: sll   s4, v0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 15
-// 0x0100b2d8: 0x100b2d8: addiu s1, s1, 620
+// 0x0100b2e8: 0x100b2e8: addiu s1, s1, 620
 	ldloc 8
 	ldc.i4 620
 	add
 	stloc 8
-// 0x0100b2dc: 0x100b2dc: addu  s0, zero, zero
+// 0x0100b2ec: 0x100b2ec: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0100b2e0: 0x100b2e0: lui   s3, 0x20000
+// 0x0100b2f0: 0x100b2f0: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x0100b2e4: 0x100b2e4: addiu s2, zero, 11
+// 0x0100b2f4: 0x100b2f4: addiu s2, zero, 11
 	ldc.i4.s 11
 	stloc 13
-L_100b2e8:
-// 0x0100b2e8: 0x100b2e8: lw    v1, 31244(s3)
+L_100b2f8:
+// 0x0100b2f8: 0x100b2f8: lw    v1, 31708(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b2ec: 0x100b2ec: lw    v0, 0(s1)
+// 0x0100b2fc: 0x100b2fc: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100b2f0: 0x100b2f0: lw    a0, 8(v1)
+// 0x0100b300: 0x100b300: lw    a0, 8(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7475,24 +7475,24 @@ L_100b2e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b2f4: 0x100b2f4: sll   v1, s0, 2
+// 0x0100b304: 0x100b304: sll   v1, s0, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100b2f8: 0x100b2f8: addu  a0, a0, s4
+// 0x0100b308: 0x100b308: addu  a0, a0, s4
 	ldloc.1
 	ldloc 15
 	add
 	stloc.1
-// 0x0100b2fc: 0x100b2fc: lw    a0, 0(a0)
+// 0x0100b30c: 0x100b30c: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100b300: 0x100b300: lw    v0, 8(v0)
+// 0x0100b310: 0x100b310: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7501,12 +7501,12 @@ L_100b2e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b304: 0x100b304: addu  v1, a0, v1
+// 0x0100b314: 0x100b314: addu  v1, a0, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x0100b308: 0x100b308: lw    a0, 4(v1)
+// 0x0100b318: 0x100b318: lw    a0, 4(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7515,7 +7515,7 @@ L_100b2e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b30c: 0x100b30c: jalr  v0 addiu s0, s0, 1
+// 0x0100b31c: 0x100b31c: jalr  v0 addiu s0, s0, 1
 	ldloc 7
 	ldloc 9
 	ldc.i4.1
@@ -7531,27 +7531,27 @@ L_100b2e8:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100b314: 0x100b314: bne   s0, s2, 0x100b2e8 addiu s1, s1, 12
+// 0x0100b324: 0x100b324: bne   s0, s2, 0x100b2f8 addiu s1, s1, 12
 	ldloc 9
 	ldloc 13
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 8
-	bne.un L_100b2e8
+	bne.un L_100b2f8
 // --- basic block ---
-// 0x0100b31c: 0x100b31c: j	 0x100b328 addiu v0, zero, 1
+// 0x0100b32c: 0x100b32c: j	 0x100b338 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_100b328
+	br L_100b338
 // --- basic block ---
-L_100b324:
-// 0x0100b324: 0x100b324: addu  v0, zero, zero
+L_100b334:
+// 0x0100b334: 0x100b334: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_100b328:
-// 0x0100b328: 0x100b328: lw    ra, 44(sp)
-// 0x0100b32c: 0x100b32c: lw    s4, 40(sp)
+L_100b338:
+// 0x0100b338: 0x100b338: lw    ra, 44(sp)
+// 0x0100b33c: 0x100b33c: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7560,7 +7560,7 @@ L_100b328:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100b330: 0x100b330: lw    s3, 36(sp)
+// 0x0100b340: 0x100b340: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7569,7 +7569,7 @@ L_100b328:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100b334: 0x100b334: lw    s2, 32(sp)
+// 0x0100b344: 0x100b344: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7578,7 +7578,7 @@ L_100b328:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100b338: 0x100b338: lw    s1, 28(sp)
+// 0x0100b348: 0x100b348: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7587,7 +7587,7 @@ L_100b328:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100b33c: 0x100b33c: lw    s0, 24(sp)
+// 0x0100b34c: 0x100b34c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7596,7 +7596,7 @@ L_100b328:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100b340: 0x100b340: jr    ra addiu sp, sp, 48
+// 0x0100b350: 0x100b350: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
diff --git a/converted/Cibyl70.j b/converted/Cibyl70.j
index 5b6bcba..ba74d97 100644
--- a/converted/Cibyl70.j
+++ b/converted/Cibyl70.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl70::.ctor
 
-.method public static int32 navigate_bar_is_hidden_105e28c()
+.method public static int32 navigate_bar_is_hidden_105e29c()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -58,19 +58,19 @@
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e28c: 0x105e28c: lui   v0, 0x70000
+// 0x0105e29c: 0x105e29c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0105e290: 0x105e290: lw    v0, 11976(v0)
+// 0x0105e2a0: 0x105e2a0: lw    v0, 12440(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 2994
+	ldc.i4 3110
 	add
 	ldelem.i4
 	stloc.0
-// 0x0105e294: 0x105e294: jr    ra sltiu v0, v0, 1
+// 0x0105e2a4: 0x105e2a4: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -80,7 +80,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_bar_set_instruction_105e29c(int32)
+.method public static int32 navigate_bar_set_instruction_105e2ac(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -100,10 +100,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e29c: 0x105e29c: lui   v0, 0x0
+// 0x0105e2ac: 0x105e2ac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e2a0: 0x105e2a0: jr    ra sw    a0, 14508(v0)
+// 0x0105e2b0: 0x105e2b0: jr    ra sw    a0, 14508(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -117,7 +117,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_bar_set_next_instruction_105e2a8(int32)
+.method public static int32 navigate_bar_set_next_instruction_105e2b8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -137,10 +137,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e2a8: 0x105e2a8: lui   v0, 0x0
+// 0x0105e2b8: 0x105e2b8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e2ac: 0x105e2ac: jr    ra sw    a0, 14488(v0)
+// 0x0105e2bc: 0x105e2bc: jr    ra sw    a0, 14488(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -154,7 +154,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_bar_set_exit_105e2b4(int32)
+.method public static int32 navigate_bar_set_exit_105e2c4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -174,10 +174,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e2b4: 0x105e2b4: lui   v0, 0x0
+// 0x0105e2c4: 0x105e2c4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e2b8: 0x105e2b8: jr    ra sw    a0, 14504(v0)
+// 0x0105e2c8: 0x105e2c8: jr    ra sw    a0, 14504(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -191,7 +191,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_bar_set_next_exit_105e2c0(int32)
+.method public static int32 navigate_bar_set_next_exit_105e2d0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -211,10 +211,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e2c0: 0x105e2c0: lui   v0, 0x0
+// 0x0105e2d0: 0x105e2d0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e2c4: 0x105e2c4: jr    ra sw    a0, 14500(v0)
+// 0x0105e2d4: 0x105e2d4: jr    ra sw    a0, 14500(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -228,7 +228,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_bar_set_distance_105e2cc(int32)
+.method public static int32 navigate_bar_set_distance_105e2dc(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -248,10 +248,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e2cc: 0x105e2cc: lui   v0, 0x0
+// 0x0105e2dc: 0x105e2dc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e2d0: 0x105e2d0: jr    ra sw    a0, 14496(v0)
+// 0x0105e2e0: 0x105e2e0: jr    ra sw    a0, 14496(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -265,7 +265,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_bar_set_next_distance_105e2d8(int32)
+.method public static int32 navigate_bar_set_next_distance_105e2e8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -285,10 +285,10 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e2d8: 0x105e2d8: lui   v0, 0x0
+// 0x0105e2e8: 0x105e2e8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e2dc: 0x105e2dc: jr    ra sw    a0, 14492(v0)
+// 0x0105e2ec: 0x105e2ec: jr    ra sw    a0, 14492(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -302,7 +302,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_bar_set_mode_105e2e4(int32)
+.method public static int32 navigate_bar_set_mode_105e2f4(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -325,35 +325,35 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e2e4: 0x105e2e4: lui   v0, 0x70000
+// 0x0105e2f4: 0x105e2f4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105e2e8: 0x105e2e8: lw    v1, 11976(v0)
+// 0x0105e2f8: 0x105e2f8: lw    v1, 12440(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2994
+	ldc.i4 3110
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105e2ec: 0x105e2ec: sll   zero, zero, 0
-// 0x0105e2f0: 0x105e2f0: beq   v1, a0, 0x105e2fc sll   zero, zero, 0
+// 0x0105e2fc: 0x105e2fc: sll   zero, zero, 0
+// 0x0105e300: 0x105e300: beq   v1, a0, 0x105e30c sll   zero, zero, 0
 	ldloc.2
 	ldloc.0
-	beq  L_105e2fc
+	beq  L_105e30c
 // --- basic block ---
-// 0x0105e2f8: 0x105e2f8: sw    a0, 11976(v0)
+// 0x0105e308: 0x105e308: sw    a0, 12440(v0)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 2994
+	ldc.i4 3110
 	add
 	ldloc.0
 	stelem.i4
-L_105e2fc:
-// 0x0105e2fc: 0x105e2fc: jr    ra sll   zero, zero, 0
+L_105e30c:
+// 0x0105e30c: 0x105e30c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -361,7 +361,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 navigate_bar_draw_105e304(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_draw_105e314(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -414,28 +414,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e304: 0x105e304: lui   v0, 0x70000
+// 0x0105e314: 0x105e314: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105e308: 0x105e308: lw    v1, 11972(v0)
+// 0x0105e318: 0x105e318: lw    v1, 12436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e30c: 0x105e30c: addiu sp, sp, -56
+// 0x0105e31c: 0x105e31c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0105e310: 0x105e310: addiu v0, zero, 1
+// 0x0105e320: 0x105e320: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105e314: 0x105e314: sw    ra, 52(sp)
-// 0x0105e318: 0x105e318: sw    s5, 48(sp)
+// 0x0105e324: 0x105e324: sw    ra, 52(sp)
+// 0x0105e328: 0x105e328: sw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -444,7 +444,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105e31c: 0x105e31c: sw    s4, 44(sp)
+// 0x0105e32c: 0x105e32c: sw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -453,7 +453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105e320: 0x105e320: sw    s3, 40(sp)
+// 0x0105e330: 0x105e330: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -462,7 +462,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105e324: 0x105e324: sw    s2, 36(sp)
+// 0x0105e334: 0x105e334: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -471,7 +471,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105e328: 0x105e328: sw    s1, 32(sp)
+// 0x0105e338: 0x105e338: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -480,7 +480,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105e32c: 0x105e32c: bne   v1, v0, 0x105e4fc sw    s0, 28(sp)
+// 0x0105e33c: 0x105e33c: bne   v1, v0, 0x105e50c sw    s0, 28(sp)
 	ldloc 7
 	ldloc 5
 	ldloc 6
@@ -491,38 +491,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	bne.un L_105e4fc
+	bne.un L_105e50c
 // --- basic block ---
-// 0x0105e334: 0x105e334: jal   0x101fad4 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+// 0x0105e344: 0x105e344: jal   0x101fae4 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105e33c: 0x105e33c: beq   v0, zero, 0x105e368 lui   v0, 0x70000
+// 0x0105e34c: 0x105e34c: beq   v0, zero, 0x105e378 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105e368
+	brfalse L_105e378
 // --- basic block ---
-// 0x0105e344: 0x105e344: lui   a1, 0x10000
+// 0x0105e354: 0x105e354: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105e348: 0x105e348: lui   a3, 0x10000
+// 0x0105e358: 0x105e358: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105e34c: 0x105e34c: addiu a1, a1, 12092
+// 0x0105e35c: 0x105e35c: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105e350: 0x105e350: addiu a3, a3, 12128
+// 0x0105e360: 0x105e360: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105e354: 0x105e354: addiu a0, zero, 2
+// 0x0105e364: 0x105e364: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105e358: 0x105e358: jal   0x100449c addiu a2, zero, 837
+// 0x0105e368: 0x105e368: jal   0x100449c addiu a2, zero, 837
 	ldc.i4 837
 	stloc.3
 	ldloc.0
@@ -535,88 +535,88 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e360: 0x105e360: j	 0x105e4fc sll   zero, zero, 0
-	br L_105e4fc
+// 0x0105e370: 0x105e370: j	 0x105e50c sll   zero, zero, 0
+	br L_105e50c
 // --- basic block ---
-L_105e368:
-// 0x0105e368: 0x105e368: lw    a0, 12248(v0)
+L_105e378:
+// 0x0105e378: 0x105e378: lw    a0, 12712(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e36c: 0x105e36c: lui   v0, 0xf0000
+// 0x0105e37c: 0x105e37c: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105e370: 0x105e370: lw    s0, -30072(v0)
+// 0x0105e380: 0x105e380: lw    s0, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105e374: 0x105e374: jal   0x104e020 sll   zero, zero, 0
+// 0x0105e384: 0x105e384: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e37c: 0x105e37c: addu  s1, v0, zero
+// 0x0105e38c: 0x105e38c: addu  s1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0105e380: 0x105e380: jal   0x1042430 subu  s0, s0, s1
+// 0x0105e390: 0x105e390: jal   0x1042440 subu  s0, s0, s1
 	ldloc 10
 	ldloc 8
 	sub
 	stloc 10
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e388: 0x105e388: lui   v1, 0x70000
+// 0x0105e398: 0x105e398: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105e38c: 0x105e38c: lw    a0, 12244(v1)
+// 0x0105e39c: 0x105e39c: lw    a0, 12708(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3061
+	ldc.i4 3177
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e390: 0x105e390: subu  v0, s0, v0
+// 0x0105e3a0: 0x105e3a0: subu  v0, s0, v0
 	ldloc 10
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105e394: 0x105e394: addiu s0, sp, 16
+// 0x0105e3a4: 0x105e3a4: addiu s0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-// 0x0105e398: 0x105e398: addiu v0, v0, 3
+// 0x0105e3a8: 0x105e3a8: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x0105e39c: 0x105e39c: addu  a1, s0, zero
+// 0x0105e3ac: 0x105e3ac: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0105e3a0: 0x105e3a0: addu  a2, zero, zero
+// 0x0105e3b0: 0x105e3b0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105e3a4: 0x105e3a4: addu  a3, zero, zero
+// 0x0105e3b4: 0x105e3b4: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0105e3a8: 0x105e3a8: sw    v0, 20(sp)
+// 0x0105e3b8: 0x105e3b8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -625,7 +625,7 @@ L_105e368:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105e3ac: 0x105e3ac: jal   0x104f4a8 sw    zero, 16(sp)
+// 0x0105e3bc: 0x105e3bc: jal   0x104f4b8 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -639,15 +639,15 @@ L_105e368:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e3b4: 0x105e3b4: lui   v0, 0x0
+// 0x0105e3c4: 0x105e3c4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105e3b8: 0x105e3b8: lw    a0, 14488(v0)
+// 0x0105e3c8: 0x105e3c8: lw    a0, 14488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -656,22 +656,22 @@ L_105e368:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e3bc: 0x105e3bc: addiu v1, zero, 16
+// 0x0105e3cc: 0x105e3cc: addiu v1, zero, 16
 	ldc.i4.s 16
 	stloc 7
-// 0x0105e3c0: 0x105e3c0: lui   v0, 0x70000
+// 0x0105e3d0: 0x105e3d0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105e3c4: 0x105e3c4: bne   a0, v1, 0x105e400 addiu v0, v0, 12264
+// 0x0105e3d4: 0x105e3d4: bne   a0, v1, 0x105e410 addiu v0, v0, 12728
 	ldloc.1
 	ldloc 7
 	ldloc 5
-	ldc.i4 12264
+	ldc.i4 12728
 	add
 	stloc 5
-	bne.un L_105e400
+	bne.un L_105e410
 // --- basic block ---
-// 0x0105e3cc: 0x105e3cc: lw    s1, 4(v0)
+// 0x0105e3dc: 0x105e3dc: lw    s1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -680,47 +680,47 @@ L_105e368:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105e3d0: 0x105e3d0: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0105e3e0: 0x105e3e0: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105e3d8: 0x105e3d8: sltu  v0, zero, v0
+// 0x0105e3e8: 0x105e3e8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0105e3dc: 0x105e3dc: addiu v0, v0, 2
+// 0x0105e3ec: 0x105e3ec: addiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 5
-// 0x0105e3e0: 0x105e3e0: lui   v1, 0x70000
+// 0x0105e3f0: 0x105e3f0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105e3e4: 0x105e3e4: addu  s1, v0, s1
+// 0x0105e3f4: 0x105e3f4: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0105e3e8: 0x105e3e8: lw    a0, 12256(v1)
+// 0x0105e3f8: 0x105e3f8: lw    a0, 12720(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3064
+	ldc.i4 3180
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e3ec: 0x105e3ec: addu  a1, s0, zero
+// 0x0105e3fc: 0x105e3fc: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0105e3f0: 0x105e3f0: addu  a2, zero, zero
+// 0x0105e400: 0x105e400: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105e3f4: 0x105e3f4: addu  a3, zero, zero
+// 0x0105e404: 0x105e404: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0105e3f8: 0x105e3f8: j	 0x105e450 sw    s1, 20(sp)
+// 0x0105e408: 0x105e408: j	 0x105e460 sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -729,22 +729,22 @@ L_105e368:
 	add
 	ldloc 8
 	stelem.i4
-	br L_105e450
+	br L_105e460
 // --- basic block ---
-L_105e400:
-// 0x0105e400: 0x105e400: lui   v1, 0x70000
+L_105e410:
+// 0x0105e410: 0x105e410: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105e404: 0x105e404: lw    a0, 12256(v1)
+// 0x0105e414: 0x105e414: lw    a0, 12720(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3064
+	ldc.i4 3180
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e408: 0x105e408: lw    s2, 4(v0)
+// 0x0105e418: 0x105e418: lw    s2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -753,83 +753,83 @@ L_105e400:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105e40c: 0x105e40c: jal   0x104e020 lui   s1, 0x70000
+// 0x0105e41c: 0x105e41c: jal   0x104e030 lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e414: 0x105e414: lw    a0, 12260(s1)
+// 0x0105e424: 0x105e424: lw    a0, 12724(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3065
+	ldc.i4 3181
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e418: 0x105e418: jal   0x104e020 addu  s3, v0, zero
+// 0x0105e428: 0x105e428: jal   0x104e030 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e420: 0x105e420: jal   0x101fa28 addu  s4, v0, zero
+// 0x0105e430: 0x105e430: jal   0x101fa38 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105e428: 0x105e428: addu  s2, s3, s2
+// 0x0105e438: 0x105e438: addu  s2, s3, s2
 	ldloc 11
 	ldloc 9
 	add
 	stloc 9
-// 0x0105e42c: 0x105e42c: sltu  v0, zero, v0
+// 0x0105e43c: 0x105e43c: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0105e430: 0x105e430: subu  s2, s2, s4
+// 0x0105e440: 0x105e440: subu  s2, s2, s4
 	ldloc 9
 	ldloc 12
 	sub
 	stloc 9
-// 0x0105e434: 0x105e434: addiu v0, v0, 2
+// 0x0105e444: 0x105e444: addiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 5
-// 0x0105e438: 0x105e438: addu  s2, s2, v0
+// 0x0105e448: 0x105e448: addu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x0105e43c: 0x105e43c: lw    a0, 12260(s1)
+// 0x0105e44c: 0x105e44c: lw    a0, 12724(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3065
+	ldc.i4 3181
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e440: 0x105e440: addu  a1, s0, zero
+// 0x0105e450: 0x105e450: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0105e444: 0x105e444: addu  a2, zero, zero
+// 0x0105e454: 0x105e454: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105e448: 0x105e448: addu  a3, zero, zero
+// 0x0105e458: 0x105e458: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0105e44c: 0x105e44c: sw    s2, 20(sp)
+// 0x0105e45c: 0x105e45c: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -838,11 +838,11 @@ L_105e400:
 	add
 	ldloc 9
 	stelem.i4
-L_105e450:
-// 0x0105e450: 0x105e450: lui   s1, 0x70000
+L_105e460:
+// 0x0105e460: 0x105e460: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105e454: 0x105e454: jal   0x104f4a8 sw    zero, 16(sp)
+// 0x0105e464: 0x105e464: jal   0x104f4b8 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -856,125 +856,125 @@ L_105e450:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e45c: 0x105e45c: lw    a0, 12248(s1)
+// 0x0105e46c: 0x105e46c: lw    a0, 12712(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e460: 0x105e460: lui   v0, 0xf0000
+// 0x0105e470: 0x105e470: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105e464: 0x105e464: lw    s4, -30072(v0)
+// 0x0105e474: 0x105e474: lw    s4, -29608(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105e468: 0x105e468: jal   0x104e020 lui   s0, 0x70000
+// 0x0105e478: 0x105e478: jal   0x104e030 lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e470: 0x105e470: jal   0x1042430 addu  s3, v0, zero
+// 0x0105e480: 0x105e480: jal   0x1042440 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e478: 0x105e478: lw    a0, 12252(s0)
+// 0x0105e488: 0x105e488: lw    a0, 12716(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3063
+	ldc.i4 3179
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e47c: 0x105e47c: jal   0x104e020 addu  s2, v0, zero
+// 0x0105e48c: 0x105e48c: jal   0x104e030 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e484: 0x105e484: addu  s5, v0, zero
+// 0x0105e494: 0x105e494: addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0105e488: 0x105e488: jal   0x101fa28 subu  s3, s4, s3
+// 0x0105e498: 0x105e498: jal   0x101fa38 subu  s3, s4, s3
 	ldloc 12
 	ldloc 11
 	sub
 	stloc 11
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105e490: 0x105e490: subu  s2, s3, s2
+// 0x0105e4a0: 0x105e4a0: subu  s2, s3, s2
 	ldloc 11
 	ldloc 9
 	sub
 	stloc 9
-// 0x0105e494: 0x105e494: sltu  v0, zero, v0
+// 0x0105e4a4: 0x105e4a4: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0105e498: 0x105e498: lui   v1, 0xf0000
+// 0x0105e4a8: 0x105e4a8: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0105e49c: 0x105e49c: subu  s5, s2, s5
+// 0x0105e4ac: 0x105e4ac: subu  s5, s2, s5
 	ldloc 9
 	ldloc 13
 	sub
 	stloc 13
-// 0x0105e4a0: 0x105e4a0: lw    a0, 12252(s0)
+// 0x0105e4b0: 0x105e4b0: lw    a0, 12716(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3063
+	ldc.i4 3179
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e4a4: 0x105e4a4: addiu v0, v0, 2
+// 0x0105e4b4: 0x105e4b4: addiu v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 5
-// 0x0105e4a8: 0x105e4a8: lw    s2, -30068(v1)
+// 0x0105e4b8: 0x105e4b8: lw    s2, -29604(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105e4ac: 0x105e4ac: addu  v0, s5, v0
+// 0x0105e4bc: 0x105e4bc: addu  v0, s5, v0
 	ldloc 13
 	ldloc 5
 	add
 	stloc 5
-// 0x0105e4b0: 0x105e4b0: jal   0x104dffc sw    v0, 20(sp)
+// 0x0105e4c0: 0x105e4c0: jal   0x104e00c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -984,37 +984,37 @@ L_105e450:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e4b8: 0x105e4b8: lw    a0, 12252(s0)
+// 0x0105e4c8: 0x105e4c8: lw    a0, 12716(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3063
+	ldc.i4 3179
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e4bc: 0x105e4bc: subu  v0, s2, v0
+// 0x0105e4cc: 0x105e4cc: subu  v0, s2, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105e4c0: 0x105e4c0: addiu a1, sp, 16
+// 0x0105e4d0: 0x105e4d0: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0105e4c4: 0x105e4c4: addu  a2, zero, zero
+// 0x0105e4d4: 0x105e4d4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105e4c8: 0x105e4c8: addu  a3, zero, zero
+// 0x0105e4d8: 0x105e4d8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0105e4cc: 0x105e4cc: jal   0x104f4a8 sw    v0, 16(sp)
+// 0x0105e4dc: 0x105e4dc: jal   0x104f4b8 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1028,70 +1028,70 @@ L_105e450:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e4d4: 0x105e4d4: lw    a0, 12248(s1)
+// 0x0105e4e4: 0x105e4e4: lw    a0, 12712(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e4d8: 0x105e4d8: jal   0x104e020 sll   zero, zero, 0
+// 0x0105e4e8: 0x105e4e8: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e4e0: 0x105e4e0: lw    a0, 12252(s0)
+// 0x0105e4f0: 0x105e4f0: lw    a0, 12716(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3063
+	ldc.i4 3179
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e4e4: 0x105e4e4: jal   0x104e020 addu  s1, v0, zero
+// 0x0105e4f4: 0x105e4f4: jal   0x104e030 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e4ec: 0x105e4ec: addu  s1, s1, v0
+// 0x0105e4fc: 0x105e4fc: addu  s1, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0105e4f0: 0x105e4f0: addiu s1, s1, -2
+// 0x0105e500: 0x105e500: addiu s1, s1, -2
 	ldloc 8
 	ldc.i4.s -2
 	add
 	stloc 8
-// 0x0105e4f4: 0x105e4f4: lui   v1, 0x70000
+// 0x0105e504: 0x105e504: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105e4f8: 0x105e4f8: sw    s1, 12272(v1)
+// 0x0105e508: 0x105e508: sw    s1, 12736(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3068
+	ldc.i4 3184
 	add
 	ldloc 8
 	stelem.i4
-L_105e4fc:
-// 0x0105e4fc: 0x105e4fc: lw    ra, 52(sp)
-// 0x0105e500: 0x105e500: lw    s5, 48(sp)
+L_105e50c:
+// 0x0105e50c: 0x105e50c: lw    ra, 52(sp)
+// 0x0105e510: 0x105e510: lw    s5, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1100,7 +1100,7 @@ L_105e4fc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105e504: 0x105e504: lw    s4, 44(sp)
+// 0x0105e514: 0x105e514: lw    s4, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1109,7 +1109,7 @@ L_105e4fc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105e508: 0x105e508: lw    s3, 40(sp)
+// 0x0105e518: 0x105e518: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1118,7 +1118,7 @@ L_105e4fc:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105e50c: 0x105e50c: lw    s2, 36(sp)
+// 0x0105e51c: 0x105e51c: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1127,7 +1127,7 @@ L_105e4fc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105e510: 0x105e510: lw    s1, 32(sp)
+// 0x0105e520: 0x105e520: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1136,7 +1136,7 @@ L_105e4fc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105e514: 0x105e514: lw    s0, 28(sp)
+// 0x0105e524: 0x105e524: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1145,7 +1145,7 @@ L_105e4fc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105e518: 0x105e518: jr    ra addiu sp, sp, 56
+// 0x0105e528: 0x105e528: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -1157,7 +1157,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_bar_set_street_105e520(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_set_street_105e530(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -1195,28 +1195,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e520: 0x105e520: lui   v0, 0x70000
+// 0x0105e530: 0x105e530: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105e524: 0x105e524: lw    v0, 11972(v0)
+// 0x0105e534: 0x105e534: lw    v0, 12436(v0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e528: 0x105e528: addiu sp, sp, -24
+// 0x0105e538: 0x105e538: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105e52c: 0x105e52c: addiu v1, zero, 1
+// 0x0105e53c: 0x105e53c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0105e530: 0x105e530: sw    ra, 20(sp)
-// 0x0105e534: 0x105e534: bne   v0, v1, 0x105e55c sw    s0, 16(sp)
+// 0x0105e540: 0x105e540: sw    ra, 20(sp)
+// 0x0105e544: 0x105e544: bne   v0, v1, 0x105e56c sw    s0, 16(sp)
 	ldloc 7
 	ldloc 8
 	ldloc 6
@@ -1227,28 +1227,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_105e55c
+	bne.un L_105e56c
 // --- basic block ---
-// 0x0105e53c: 0x105e53c: beq   a0, zero, 0x105e55c lui   s0, 0x70000
+// 0x0105e54c: 0x105e54c: beq   a0, zero, 0x105e56c lui   s0, 0x70000
 	ldloc.1
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105e55c
+	brfalse L_105e56c
 // --- basic block ---
-// 0x0105e544: 0x105e544: addu  a1, a0, zero
+// 0x0105e554: 0x105e554: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0105e548: 0x105e548: addiu a2, zero, 256
+// 0x0105e558: 0x105e558: addiu a2, zero, 256
 	ldc.i4 256
 	stloc.3
-// 0x0105e54c: 0x105e54c: addiu a0, s0, 11980
+// 0x0105e55c: 0x105e55c: addiu a0, s0, 12444
 	ldloc 5
-	ldc.i4 11980
+	ldc.i4 12444
 	add
 	stloc.1
-// 0x0105e550: 0x105e550: jal   0x1001af8 addiu s0, s0, 11980
+// 0x0105e560: 0x105e560: jal   0x1001af8 addiu s0, s0, 12444
 	ldloc 5
-	ldc.i4 11980
+	ldc.i4 12444
 	add
 	stloc 5
 	ldloc.1
@@ -1257,15 +1257,15 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 7
 // --- basic block ---
-// 0x0105e558: 0x105e558: sb    zero, 255(s0)
+// 0x0105e568: 0x105e568: sb    zero, 255(s0)
 	ldloc 5
 	ldc.i4 255
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_105e55c:
-// 0x0105e55c: 0x105e55c: lw    ra, 20(sp)
-// 0x0105e560: 0x105e560: lw    s0, 16(sp)
+L_105e56c:
+// 0x0105e56c: 0x105e56c: lw    ra, 20(sp)
+// 0x0105e570: 0x105e570: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1274,7 +1274,7 @@ L_105e55c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e564: 0x105e564: jr    ra addiu sp, sp, 24
+// 0x0105e574: 0x105e574: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1286,7 +1286,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_bar_draw_instruction_105e56c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_draw_instruction_105e57c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 lo)
@@ -1324,34 +1324,34 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e56c: 0x105e56c: lui   v0, 0x70000
+// 0x0105e57c: 0x105e57c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105e570: 0x105e570: lw    v0, 12240(v0)
+// 0x0105e580: 0x105e580: lw    v0, 12704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e574: 0x105e574: addiu sp, sp, -40
+// 0x0105e584: 0x105e584: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0105e578: 0x105e578: lw    a2, 0(v0)
+// 0x0105e588: 0x105e588: lw    a2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0105e57c: 0x105e57c: lui   v1, 0x70000
+// 0x0105e58c: 0x105e58c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105e580: 0x105e580: sw    a2, 16(sp)
+// 0x0105e590: 0x105e590: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1360,7 +1360,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105e584: 0x105e584: lw    v0, 4(v0)
+// 0x0105e594: 0x105e594: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1369,16 +1369,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e588: 0x105e588: lw    v1, 11972(v1)
+// 0x0105e598: 0x105e598: lw    v1, 12436(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e58c: 0x105e58c: sw    v0, 20(sp)
+// 0x0105e59c: 0x105e59c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1387,15 +1387,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105e590: 0x105e590: addiu v0, zero, 1
+// 0x0105e5a0: 0x105e5a0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105e594: 0x105e594: bne   v1, v0, 0x105e628 sw    ra, 36(sp)
+// 0x0105e5a4: 0x105e5a4: bne   v1, v0, 0x105e638 sw    ra, 36(sp)
 	ldloc 7
 	ldloc 5
-	bne.un L_105e628
+	bne.un L_105e638
 // --- basic block ---
-// 0x0105e59c: 0x105e59c: sw    a0, 24(sp)
+// 0x0105e5ac: 0x105e5ac: sw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1404,7 +1404,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0105e5a0: 0x105e5a0: jal   0x101fad4 sw    a1, 28(sp)
+// 0x0105e5b0: 0x105e5b0: jal   0x101fae4 sw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1413,10 +1413,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105e5a8: 0x105e5a8: lw    a0, 24(sp)
+// 0x0105e5b8: 0x105e5b8: lw    a0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1425,7 +1425,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e5ac: 0x105e5ac: lw    a1, 28(sp)
+// 0x0105e5bc: 0x105e5bc: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1434,32 +1434,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105e5b0: 0x105e5b0: beq   v0, zero, 0x105e5dc addiu v1, zero, 16
+// 0x0105e5c0: 0x105e5c0: beq   v0, zero, 0x105e5ec addiu v1, zero, 16
 	ldloc 5
 	ldc.i4.s 16
 	stloc 7
-	brfalse L_105e5dc
+	brfalse L_105e5ec
 // --- basic block ---
-// 0x0105e5b8: 0x105e5b8: lui   a1, 0x10000
+// 0x0105e5c8: 0x105e5c8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105e5bc: 0x105e5bc: lui   a3, 0x10000
+// 0x0105e5cc: 0x105e5cc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105e5c0: 0x105e5c0: addiu a1, a1, 12092
+// 0x0105e5d0: 0x105e5d0: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105e5c4: 0x105e5c4: addiu a3, a3, 12128
+// 0x0105e5d4: 0x105e5d4: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105e5c8: 0x105e5c8: addiu a0, zero, 2
+// 0x0105e5d8: 0x105e5d8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105e5cc: 0x105e5cc: jal   0x100449c addiu a2, zero, 548
+// 0x0105e5dc: 0x105e5dc: jal   0x100449c addiu a2, zero, 548
 	ldc.i4 548
 	stloc.3
 	ldloc.0
@@ -1472,11 +1472,11 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e5d4: 0x105e5d4: j	 0x105e628 sll   zero, zero, 0
-	br L_105e628
+// 0x0105e5e4: 0x105e5e4: j	 0x105e638 sll   zero, zero, 0
+	br L_105e638
 // --- basic block ---
-L_105e5dc:
-// 0x0105e5dc: 0x105e5dc: lw    v0, 20(sp)
+L_105e5ec:
+// 0x0105e5ec: 0x105e5ec: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1485,27 +1485,27 @@ L_105e5dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e5e0: 0x105e5e0: beq   a0, v1, 0x105e628 addiu v1, zero, 40
+// 0x0105e5f0: 0x105e5f0: beq   a0, v1, 0x105e638 addiu v1, zero, 40
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 40
 	stloc 7
-	beq  L_105e628
+	beq  L_105e638
 // --- basic block ---
-// 0x0105e5e8: 0x105e5e8: mult  a0, v1
+// 0x0105e5f8: 0x105e5f8: mult  a0, v1
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 9
-// 0x0105e5ec: 0x105e5ec: addu  v0, a1, v0
+// 0x0105e5fc: 0x105e5fc: addu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x0105e5f0: 0x105e5f0: lui   a2, 0x20000
+// 0x0105e600: 0x105e600: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0105e5f4: 0x105e5f4: sw    v0, 20(sp)
+// 0x0105e604: 0x105e604: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1514,21 +1514,21 @@ L_105e5dc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105e5f8: 0x105e5f8: addiu a2, a2, 27996
+// 0x0105e608: 0x105e608: addiu a2, a2, 28460
 	ldloc.3
-	ldc.i4 27996
+	ldc.i4 28460
 	add
 	stloc.3
-// 0x0105e5fc: 0x105e5fc: addu  a0, zero, zero
+// 0x0105e60c: 0x105e60c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e600: 0x105e600: addiu a1, zero, 1
+// 0x0105e610: 0x105e610: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0105e604: 0x105e604: mflo  lo
+// 0x0105e614: 0x105e614: mflo  lo
 	ldloc 9
 	stloc 5
-// 0x0105e608: 0x105e608: jal   0x10a1918 addu  a2, a2, v0
+// 0x0105e618: 0x105e618: jal   0x10a1f60 addu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	add
@@ -1538,26 +1538,26 @@ L_105e5dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e610: 0x105e610: beq   v0, zero, 0x105e628 addu  a0, v0, zero
+// 0x0105e620: 0x105e620: beq   v0, zero, 0x105e638 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_105e628
+	brfalse L_105e638
 // --- basic block ---
-// 0x0105e618: 0x105e618: addiu a1, sp, 16
+// 0x0105e628: 0x105e628: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0105e61c: 0x105e61c: addu  a2, zero, zero
+// 0x0105e62c: 0x105e62c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0105e620: 0x105e620: jal   0x104f4a8 addu  a3, zero, zero
+// 0x0105e630: 0x105e630: jal   0x104f4b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1565,15 +1565,15 @@ L_105e5dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_image_104f4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_image_104f4b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105e628:
-// 0x0105e628: 0x105e628: lw    ra, 36(sp)
-// 0x0105e62c: 0x105e62c: sll   zero, zero, 0
-// 0x0105e630: 0x105e630: jr    ra addiu sp, sp, 40
+L_105e638:
+// 0x0105e638: 0x105e638: lw    ra, 36(sp)
+// 0x0105e63c: 0x105e63c: sll   zero, zero, 0
+// 0x0105e640: 0x105e640: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1585,7 +1585,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_bar_align_text_105e638(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_align_text_105e648(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s4,int32 s1,int32 s2,int32 s5,int32 s6,int32 s7,int32 s8,int32 s3,int32 ra)
@@ -1647,17 +1647,17 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e638: 0x105e638: addiu sp, sp, -88
+// 0x0105e648: 0x105e648: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x0105e63c: 0x105e63c: addiu v0, sp, 32
+// 0x0105e64c: 0x105e64c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 6
-// 0x0105e640: 0x105e640: sw    s3, 60(sp)
+// 0x0105e650: 0x105e650: sw    s3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1666,7 +1666,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105e644: 0x105e644: sw    s2, 56(sp)
+// 0x0105e654: 0x105e654: sw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1675,7 +1675,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105e648: 0x105e648: sw    s1, 52(sp)
+// 0x0105e658: 0x105e658: sw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1684,29 +1684,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105e64c: 0x105e64c: addu  s2, a1, zero
+// 0x0105e65c: 0x105e65c: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x0105e650: 0x105e650: addu  s1, a3, zero
+// 0x0105e660: 0x105e660: addu  s1, a3, zero
 	ldloc 4
 	stloc 10
-// 0x0105e654: 0x105e654: addu  a1, a3, zero
+// 0x0105e664: 0x105e664: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x0105e658: 0x105e658: addu  s3, a2, zero
+// 0x0105e668: 0x105e668: addu  s3, a2, zero
 	ldloc.3
 	stloc 16
-// 0x0105e65c: 0x105e65c: addiu a3, sp, 28
+// 0x0105e66c: 0x105e66c: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0105e660: 0x105e660: addiu a2, sp, 24
+// 0x0105e670: 0x105e670: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0105e664: 0x105e664: sw    s0, 48(sp)
+// 0x0105e674: 0x105e674: sw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1715,7 +1715,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105e668: 0x105e668: sw    v0, 16(sp)
+// 0x0105e678: 0x105e678: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1724,11 +1724,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105e66c: 0x105e66c: addu  s0, a0, zero
+// 0x0105e67c: 0x105e67c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0105e670: 0x105e670: sw    ra, 84(sp)
-// 0x0105e674: 0x105e674: sw    s8, 80(sp)
+// 0x0105e680: 0x105e680: sw    ra, 84(sp)
+// 0x0105e684: 0x105e684: sw    s8, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1737,7 +1737,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105e678: 0x105e678: sw    s7, 76(sp)
+// 0x0105e688: 0x105e688: sw    s7, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1746,7 +1746,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105e67c: 0x105e67c: sw    s6, 72(sp)
+// 0x0105e68c: 0x105e68c: sw    s6, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1755,7 +1755,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105e680: 0x105e680: sw    s5, 68(sp)
+// 0x0105e690: 0x105e690: sw    s5, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1764,7 +1764,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105e684: 0x105e684: sw    s4, 64(sp)
+// 0x0105e694: 0x105e694: sw    s4, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1773,7 +1773,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105e688: 0x105e688: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105e698: 0x105e698: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1787,24 +1787,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105e690: 0x105e690: lui   v0, 0x70000
+// 0x0105e6a0: 0x105e6a0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105e694: 0x105e694: lw    v0, 12240(v0)
+// 0x0105e6a4: 0x105e6a4: lw    v0, 12704(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105e698: 0x105e698: lw    v1, 24(sp)
+// 0x0105e6a8: 0x105e6a8: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1813,7 +1813,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e69c: 0x105e69c: lw    v0, 36(v0)
+// 0x0105e6ac: 0x105e6ac: lw    v0, 36(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1822,43 +1822,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105e6a0: 0x105e6a0: sll   zero, zero, 0
-// 0x0105e6a4: 0x105e6a4: sll   a0, v0, 1
+// 0x0105e6b0: 0x105e6b0: sll   zero, zero, 0
+// 0x0105e6b4: 0x105e6b4: sll   a0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	shl
 	stloc.1
-// 0x0105e6a8: 0x105e6a8: slt   a0, v1, a0
+// 0x0105e6b8: 0x105e6b8: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x0105e6ac: 0x105e6ac: beq   a0, zero, 0x105e804 slt   v0, v1, v0
+// 0x0105e6bc: 0x105e6bc: beq   a0, zero, 0x105e814 slt   v0, v1, v0
 	ldloc.1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-	brfalse L_105e804
+	brfalse L_105e814
 // --- basic block ---
-// 0x0105e6b4: 0x105e6b4: beq   v0, zero, 0x105e6c8 sll   zero, zero, 0
+// 0x0105e6c4: 0x105e6c4: beq   v0, zero, 0x105e6d8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_105e6c8
+	brfalse L_105e6d8
 // --- basic block ---
-// 0x0105e6bc: 0x105e6bc: sw    s0, 0(s2)
+// 0x0105e6cc: 0x105e6cc: sw    s0, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0105e6c0: 0x105e6c0: j	 0x105e808 addiu v0, zero, 1
+// 0x0105e6d0: 0x105e6d0: j	 0x105e818 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_105e808
+	br L_105e818
 // --- basic block ---
-L_105e6c8:
-// 0x0105e6c8: 0x105e6c8: jal   0x1001b48 addu  a0, s0, zero
+L_105e6d8:
+// 0x0105e6d8: 0x105e6d8: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -1867,154 +1867,154 @@ L_105e6c8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105e6d0: 0x105e6d0: srl   v1, v0, 1
+// 0x0105e6e0: 0x105e6e0: srl   v1, v0, 1
 	ldloc 6
 	ldc.i4.1
 	shr.un
 	stloc 7
-// 0x0105e6d4: 0x105e6d4: addu  v1, s0, v1
+// 0x0105e6e4: 0x105e6e4: addu  v1, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x0105e6d8: 0x105e6d8: addu  v0, s0, v0
+// 0x0105e6e8: 0x105e6e8: addu  v0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-// 0x0105e6dc: 0x105e6dc: addu  a0, v1, zero
+// 0x0105e6ec: 0x105e6ec: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0105e6e0: 0x105e6e0: j	 0x105e708 addiu a1, zero, 32
+// 0x0105e6f0: 0x105e6f0: j	 0x105e718 addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.2
-	br L_105e708
+	br L_105e718
 // --- basic block ---
-L_105e6e8:
-// 0x0105e6e8: 0x105e6e8: lb    a2, 0(a0)
+L_105e6f8:
+// 0x0105e6f8: 0x105e6f8: lb    a2, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0105e6ec: 0x105e6ec: sll   zero, zero, 0
-// 0x0105e6f0: 0x105e6f0: bne   a2, a1, 0x105e708 addiu a0, a0, -1
+// 0x0105e6fc: 0x105e6fc: sll   zero, zero, 0
+// 0x0105e700: 0x105e700: bne   a2, a1, 0x105e718 addiu a0, a0, -1
 	ldloc.3
 	ldloc.2
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-	bne.un L_105e708
+	bne.un L_105e718
 // --- basic block ---
-// 0x0105e6f8: 0x105e6f8: addiu a0, a0, 1
+// 0x0105e708: 0x105e708: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0105e6fc: 0x105e6fc: addu  s4, a0, zero
+// 0x0105e70c: 0x105e70c: addu  s4, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0105e700: 0x105e700: j	 0x105e730 addiu a1, zero, 32
+// 0x0105e710: 0x105e710: j	 0x105e740 addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.2
-	br L_105e730
+	br L_105e740
 // --- basic block ---
-L_105e708:
-// 0x0105e708: 0x105e708: sltu  a2, s0, a0
+L_105e718:
+// 0x0105e718: 0x105e718: sltu  a2, s0, a0
 	ldloc 8
 	ldloc.1
 	clt.un
 	stloc.3
-// 0x0105e70c: 0x105e70c: bne   a2, zero, 0x105e6e8 addu  s4, a0, zero
+// 0x0105e71c: 0x105e71c: bne   a2, zero, 0x105e6f8 addu  s4, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 9
-	brtrue L_105e6e8
+	brtrue L_105e6f8
 // --- basic block ---
-// 0x0105e714: 0x105e714: j	 0x105e730 addiu a1, zero, 32
+// 0x0105e724: 0x105e724: j	 0x105e740 addiu a1, zero, 32
 	ldc.i4.s 32
 	stloc.2
-	br L_105e730
+	br L_105e740
 // --- basic block ---
-L_105e71c:
-// 0x0105e71c: 0x105e71c: lb    a2, 0(v1)
+L_105e72c:
+// 0x0105e72c: 0x105e72c: lb    a2, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0105e720: 0x105e720: sll   zero, zero, 0
-// 0x0105e724: 0x105e724: beq   a2, a1, 0x105e73c sll   zero, zero, 0
+// 0x0105e730: 0x105e730: sll   zero, zero, 0
+// 0x0105e734: 0x105e734: beq   a2, a1, 0x105e74c sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	beq  L_105e73c
+	beq  L_105e74c
 // --- basic block ---
-// 0x0105e72c: 0x105e72c: addiu v1, v1, 1
+// 0x0105e73c: 0x105e73c: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_105e730:
-// 0x0105e730: 0x105e730: sltu  a2, v1, v0
+L_105e740:
+// 0x0105e740: 0x105e740: sltu  a2, v1, v0
 	ldloc 7
 	ldloc 6
 	clt.un
 	stloc.3
-// 0x0105e734: 0x105e734: bne   a2, zero, 0x105e71c sll   zero, zero, 0
+// 0x0105e744: 0x105e744: bne   a2, zero, 0x105e72c sll   zero, zero, 0
 	ldloc.3
-	brtrue L_105e71c
+	brtrue L_105e72c
 // --- basic block ---
-L_105e73c:
-// 0x0105e73c: 0x105e73c: subu  a0, v0, a0
+L_105e74c:
+// 0x0105e74c: 0x105e74c: subu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	sub
 	stloc.1
-// 0x0105e740: 0x105e740: subu  a1, v1, s0
+// 0x0105e750: 0x105e750: subu  a1, v1, s0
 	ldloc 7
 	ldloc 8
 	sub
 	stloc.2
-// 0x0105e744: 0x105e744: slt   a0, a1, a0
+// 0x0105e754: 0x105e754: slt   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.1
-// 0x0105e748: 0x105e748: beq   a0, zero, 0x105e758 sltu  v0, s0, s4
+// 0x0105e758: 0x105e758: beq   a0, zero, 0x105e768 sltu  v0, s0, s4
 	ldloc.1
 	ldloc 8
 	ldloc 9
 	clt.un
 	stloc 6
-	brfalse L_105e758
+	brfalse L_105e768
 // --- basic block ---
-// 0x0105e750: 0x105e750: addu  s4, v1, zero
+// 0x0105e760: 0x105e760: addu  s4, v1, zero
 	ldloc 7
 	stloc 9
-// 0x0105e754: 0x105e754: sltu  v0, s0, s4
+// 0x0105e764: 0x105e764: sltu  v0, s0, s4
 	ldloc 8
 	ldloc 9
 	clt.un
 	stloc 6
-L_105e758:
-// 0x0105e758: 0x105e758: beq   v0, zero, 0x105e808 addiu v0, zero, -1
+L_105e768:
+// 0x0105e768: 0x105e768: beq   v0, zero, 0x105e818 addiu v0, zero, -1
 	ldloc 6
 	ldc.i4.m1
 	stloc 6
-	brfalse L_105e808
+	brfalse L_105e818
 // --- basic block ---
-// 0x0105e760: 0x105e760: lb    v0, 0(s4)
+// 0x0105e770: 0x105e770: lb    v0, 0(s4)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0105e764: 0x105e764: addiu s7, sp, 28
+// 0x0105e774: 0x105e774: addiu s7, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 14
-// 0x0105e768: 0x105e768: addiu s8, sp, 24
+// 0x0105e778: 0x105e778: addiu s8, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 15
-// 0x0105e76c: 0x105e76c: sw    v0, 40(sp)
+// 0x0105e77c: 0x105e77c: sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2023,31 +2023,31 @@ L_105e758:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105e770: 0x105e770: addiu s6, sp, 32
+// 0x0105e780: 0x105e780: addiu s6, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 13
-// 0x0105e774: 0x105e774: sb    zero, 0(s4)
+// 0x0105e784: 0x105e784: sb    zero, 0(s4)
 	ldloc 9
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105e778: 0x105e778: addu  a0, s0, zero
+// 0x0105e788: 0x105e788: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105e77c: 0x105e77c: addu  a1, s1, zero
+// 0x0105e78c: 0x105e78c: addu  a1, s1, zero
 	ldloc 10
 	stloc.2
-// 0x0105e780: 0x105e780: addu  a2, s8, zero
+// 0x0105e790: 0x105e790: addu  a2, s8, zero
 	ldloc 15
 	stloc.3
-// 0x0105e784: 0x105e784: addu  a3, s7, zero
+// 0x0105e794: 0x105e794: addu  a3, s7, zero
 	ldloc 14
 	stloc 4
-// 0x0105e788: 0x105e788: lui   s5, 0x70000
+// 0x0105e798: 0x105e798: lui   s5, 0x70000
 	ldc.i4 458752
 	stloc 12
-// 0x0105e78c: 0x105e78c: sw    s6, 16(sp)
+// 0x0105e79c: 0x105e79c: sw    s6, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2056,7 +2056,7 @@ L_105e758:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105e790: 0x105e790: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105e7a0: 0x105e7a0: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2070,21 +2070,21 @@ L_105e758:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105e798: 0x105e798: lw    v0, 12240(s5)
+// 0x0105e7a8: 0x105e7a8: lw    v0, 12704(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105e79c: 0x105e79c: lw    v1, 24(sp)
+// 0x0105e7ac: 0x105e7ac: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2093,7 +2093,7 @@ L_105e758:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e7a0: 0x105e7a0: lw    v0, 36(v0)
+// 0x0105e7b0: 0x105e7b0: lw    v0, 36(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2102,28 +2102,28 @@ L_105e758:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105e7a4: 0x105e7a4: sll   zero, zero, 0
-// 0x0105e7a8: 0x105e7a8: slt   v0, v1, v0
+// 0x0105e7b4: 0x105e7b4: sll   zero, zero, 0
+// 0x0105e7b8: 0x105e7b8: slt   v0, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x0105e7ac: 0x105e7ac: beq   v0, zero, 0x105e7f8 addu  a1, s1, zero
+// 0x0105e7bc: 0x105e7bc: beq   v0, zero, 0x105e808 addu  a1, s1, zero
 	ldloc 6
 	ldloc 10
 	stloc.2
-	brfalse L_105e7f8
+	brfalse L_105e808
 // --- basic block ---
-// 0x0105e7b4: 0x105e7b4: addu  a2, s8, zero
+// 0x0105e7c4: 0x105e7c4: addu  a2, s8, zero
 	ldloc 15
 	stloc.3
-// 0x0105e7b8: 0x105e7b8: addu  a3, s7, zero
+// 0x0105e7c8: 0x105e7c8: addu  a3, s7, zero
 	ldloc 14
 	stloc 4
-// 0x0105e7bc: 0x105e7bc: addu  a0, s0, zero
+// 0x0105e7cc: 0x105e7cc: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105e7c0: 0x105e7c0: sw    s6, 16(sp)
+// 0x0105e7d0: 0x105e7d0: sw    s6, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2132,7 +2132,7 @@ L_105e758:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105e7c4: 0x105e7c4: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105e7d4: 0x105e7d4: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2146,21 +2146,21 @@ L_105e758:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0105e7cc: 0x105e7cc: lw    v0, 12240(s5)
+// 0x0105e7dc: 0x105e7dc: lw    v0, 12704(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105e7d0: 0x105e7d0: lw    v1, 24(sp)
+// 0x0105e7e0: 0x105e7e0: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2169,7 +2169,7 @@ L_105e758:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e7d4: 0x105e7d4: lw    v0, 36(v0)
+// 0x0105e7e4: 0x105e7e4: lw    v0, 36(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2178,41 +2178,41 @@ L_105e758:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105e7d8: 0x105e7d8: sll   zero, zero, 0
-// 0x0105e7dc: 0x105e7dc: slt   v0, v1, v0
+// 0x0105e7e8: 0x105e7e8: sll   zero, zero, 0
+// 0x0105e7ec: 0x105e7ec: slt   v0, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x0105e7e0: 0x105e7e0: beq   v0, zero, 0x105e7f8 addiu v0, zero, 2
+// 0x0105e7f0: 0x105e7f0: beq   v0, zero, 0x105e808 addiu v0, zero, 2
 	ldloc 6
 	ldc.i4.2
 	stloc 6
-	brfalse L_105e7f8
+	brfalse L_105e808
 // --- basic block ---
-// 0x0105e7e8: 0x105e7e8: addiu s4, s4, 1
+// 0x0105e7f8: 0x105e7f8: addiu s4, s4, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0105e7ec: 0x105e7ec: sw    s0, 0(s2)
+// 0x0105e7fc: 0x105e7fc: sw    s0, 0(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x0105e7f0: 0x105e7f0: j	 0x105e808 sw    s4, 0(s3)
+// 0x0105e800: 0x105e800: j	 0x105e818 sw    s4, 0(s3)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-	br L_105e808
+	br L_105e818
 // --- basic block ---
-L_105e7f8:
-// 0x0105e7f8: 0x105e7f8: lw    v0, 40(sp)
+L_105e808:
+// 0x0105e808: 0x105e808: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2221,18 +2221,18 @@ L_105e7f8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105e7fc: 0x105e7fc: sll   zero, zero, 0
-// 0x0105e800: 0x105e800: sb    v0, 0(s4)
+// 0x0105e80c: 0x105e80c: sll   zero, zero, 0
+// 0x0105e810: 0x105e810: sb    v0, 0(s4)
 	ldloc 9
 	ldloc 6
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_105e804:
-// 0x0105e804: 0x105e804: addiu v0, zero, -1
+L_105e814:
+// 0x0105e814: 0x105e814: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-L_105e808:
-// 0x0105e808: 0x105e808: lw    ra, 84(sp)
-// 0x0105e80c: 0x105e80c: lw    s8, 80(sp)
+L_105e818:
+// 0x0105e818: 0x105e818: lw    ra, 84(sp)
+// 0x0105e81c: 0x105e81c: lw    s8, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2241,7 +2241,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105e810: 0x105e810: lw    s7, 76(sp)
+// 0x0105e820: 0x105e820: lw    s7, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2250,7 +2250,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105e814: 0x105e814: lw    s6, 72(sp)
+// 0x0105e824: 0x105e824: lw    s6, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2259,7 +2259,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105e818: 0x105e818: lw    s5, 68(sp)
+// 0x0105e828: 0x105e828: lw    s5, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2268,7 +2268,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105e81c: 0x105e81c: lw    s4, 64(sp)
+// 0x0105e82c: 0x105e82c: lw    s4, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2277,7 +2277,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105e820: 0x105e820: lw    s3, 60(sp)
+// 0x0105e830: 0x105e830: lw    s3, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2286,7 +2286,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105e824: 0x105e824: lw    s2, 56(sp)
+// 0x0105e834: 0x105e834: lw    s2, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2295,7 +2295,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105e828: 0x105e828: lw    s1, 52(sp)
+// 0x0105e838: 0x105e838: lw    s1, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2304,7 +2304,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105e82c: 0x105e82c: lw    s0, 48(sp)
+// 0x0105e83c: 0x105e83c: lw    s0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2313,7 +2313,7 @@ L_105e808:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105e830: 0x105e830: jr    ra addiu sp, sp, 88
+// 0x0105e840: 0x105e840: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -2325,7 +2325,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_bar_draw_exit_105e838(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_draw_exit_105e848(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2363,24 +2363,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e838: 0x105e838: lui   v0, 0x70000
+// 0x0105e848: 0x105e848: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105e83c: 0x105e83c: lw    v0, 12240(v0)
+// 0x0105e84c: 0x105e84c: lw    v0, 12704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e840: 0x105e840: addiu sp, sp, -48
+// 0x0105e850: 0x105e850: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0105e844: 0x105e844: lw    a2, 8(v0)
+// 0x0105e854: 0x105e854: lw    a2, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2389,12 +2389,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105e848: 0x105e848: sltiu v1, a0, 10
+// 0x0105e858: 0x105e858: sltiu v1, a0, 10
 	ldloc.1
 	ldc.i4.s 10
 	clt.un
 	stloc 7
-// 0x0105e84c: 0x105e84c: sw    a2, 20(sp)
+// 0x0105e85c: 0x105e85c: sw    a2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2403,7 +2403,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0105e850: 0x105e850: lw    v0, 12(v0)
+// 0x0105e860: 0x105e860: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2412,7 +2412,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e854: 0x105e854: sw    s0, 40(sp)
+// 0x0105e864: 0x105e864: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2421,11 +2421,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105e858: 0x105e858: sw    ra, 44(sp)
-// 0x0105e85c: 0x105e85c: addu  s0, a1, zero
+// 0x0105e868: 0x105e868: sw    ra, 44(sp)
+// 0x0105e86c: 0x105e86c: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0105e860: 0x105e860: beq   v1, zero, 0x105e908 sw    v0, 24(sp)
+// 0x0105e870: 0x105e870: beq   v1, zero, 0x105e918 sw    v0, 24(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -2435,29 +2435,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_105e908
+	brfalse L_105e918
 // --- basic block ---
-// 0x0105e868: 0x105e868: lui   v0, 0x70000
+// 0x0105e878: 0x105e878: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105e86c: 0x105e86c: lw    v1, 11972(v0)
+// 0x0105e87c: 0x105e87c: lw    v1, 12436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105e870: 0x105e870: addiu v0, zero, 1
+// 0x0105e880: 0x105e880: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105e874: 0x105e874: bne   v1, v0, 0x105e908 sll   zero, zero, 0
+// 0x0105e884: 0x105e884: bne   v1, v0, 0x105e918 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_105e908
+	bne.un L_105e918
 // --- basic block ---
-// 0x0105e87c: 0x105e87c: jal   0x101fad4 sw    a0, 32(sp)
+// 0x0105e88c: 0x105e88c: jal   0x101fae4 sw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2466,10 +2466,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105e884: 0x105e884: lw    a0, 32(sp)
+// 0x0105e894: 0x105e894: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2478,34 +2478,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105e888: 0x105e888: beq   v0, zero, 0x105e8b4 addiu a3, sp, 16
+// 0x0105e898: 0x105e898: beq   v0, zero, 0x105e8c4 addiu a3, sp, 16
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 4
-	brfalse L_105e8b4
+	brfalse L_105e8c4
 // --- basic block ---
-// 0x0105e890: 0x105e890: lui   a1, 0x10000
+// 0x0105e8a0: 0x105e8a0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105e894: 0x105e894: lui   a3, 0x10000
+// 0x0105e8a4: 0x105e8a4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105e898: 0x105e898: addiu a1, a1, 12092
+// 0x0105e8a8: 0x105e8a8: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105e89c: 0x105e89c: addiu a3, a3, 12128
+// 0x0105e8ac: 0x105e8ac: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105e8a0: 0x105e8a0: addiu a0, zero, 2
+// 0x0105e8b0: 0x105e8b0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105e8a4: 0x105e8a4: jal   0x100449c addiu a2, zero, 582
+// 0x0105e8b4: 0x105e8b4: jal   0x100449c addiu a2, zero, 582
 	ldc.i4 582
 	stloc.3
 	ldloc.0
@@ -2518,25 +2518,25 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e8ac: 0x105e8ac: j	 0x105e908 sll   zero, zero, 0
-	br L_105e908
+// 0x0105e8bc: 0x105e8bc: j	 0x105e918 sll   zero, zero, 0
+	br L_105e918
 // --- basic block ---
-L_105e8b4:
-// 0x0105e8b4: 0x105e8b4: lui   a1, 0x20000
-	ldc.i4 131072
+L_105e8c4:
+// 0x0105e8c4: 0x105e8c4: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0105e8b8: 0x105e8b8: addu  a2, a0, zero
+// 0x0105e8c8: 0x105e8c8: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x0105e8bc: 0x105e8bc: addiu a1, a1, -13884
+// 0x0105e8cc: 0x105e8cc: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x0105e8c0: 0x105e8c0: addu  a0, a3, zero
+// 0x0105e8d0: 0x105e8d0: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x0105e8c4: 0x105e8c4: jal   0x1000f64 sw    a3, 32(sp)
+// 0x0105e8d4: 0x105e8d4: jal   0x1000f64 sw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2555,7 +2555,7 @@ L_105e8b4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e8cc: 0x105e8cc: lw    v0, 24(sp)
+// 0x0105e8dc: 0x105e8dc: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2564,23 +2564,23 @@ L_105e8b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105e8d0: 0x105e8d0: lui   a0, 0x10000
+// 0x0105e8e0: 0x105e8e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105e8d4: 0x105e8d4: addu  a1, zero, zero
+// 0x0105e8e4: 0x105e8e4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105e8d8: 0x105e8d8: addu  s0, v0, s0
+// 0x0105e8e8: 0x105e8e8: addu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0105e8dc: 0x105e8dc: addiu a0, a0, 12184
+// 0x0105e8ec: 0x105e8ec: addiu a0, a0, 12180
 	ldloc.1
-	ldc.i4 12184
+	ldc.i4 12180
 	add
 	stloc.1
-// 0x0105e8e0: 0x105e8e0: jal   0x104ef00 sw    s0, 24(sp)
+// 0x0105e8f0: 0x105e8f0: jal   0x104ef10 sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2594,17 +2594,17 @@ L_105e8b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e8e8: 0x105e8e8: lui   a0, 0x10000
+// 0x0105e8f8: 0x105e8f8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105e8ec: 0x105e8ec: jal   0x104edb0 addiu a0, a0, 2416
+// 0x0105e8fc: 0x105e8fc: jal   0x104edc0 addiu a0, a0, 2412
 	ldloc.1
-	ldc.i4 2416
+	ldc.i4 2412
 	add
 	stloc.1
 	ldloc.0
@@ -2612,12 +2612,12 @@ L_105e8b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105e8f4: 0x105e8f4: lw    a3, 32(sp)
+// 0x0105e904: 0x105e904: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2626,15 +2626,15 @@ L_105e8b4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105e8f8: 0x105e8f8: addiu a0, sp, 20
+// 0x0105e908: 0x105e908: addiu a0, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.1
-// 0x0105e8fc: 0x105e8fc: addiu a1, zero, 12
+// 0x0105e90c: 0x105e90c: addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.2
-// 0x0105e900: 0x105e900: jal   0x104ea60 addiu a2, zero, 18
+// 0x0105e910: 0x105e910: jal   0x104ea70 addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
 	ldloc.0
@@ -2642,14 +2642,14 @@ L_105e8b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105e908:
-// 0x0105e908: 0x105e908: lw    ra, 44(sp)
-// 0x0105e90c: 0x105e90c: lw    s0, 40(sp)
+L_105e918:
+// 0x0105e918: 0x105e918: lw    ra, 44(sp)
+// 0x0105e91c: 0x105e91c: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2658,7 +2658,7 @@ L_105e908:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105e910: 0x105e910: jr    ra addiu sp, sp, 48
+// 0x0105e920: 0x105e920: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2670,7 +2670,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_bar_draw_ETA_105e918(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_draw_ETA_105e928(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s3,int32 s1,int32 ra)
@@ -2717,12 +2717,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105e918: 0x105e918: addiu sp, sp, -832
+// 0x0105e928: 0x105e928: addiu sp, sp, -832
 	ldloc.0
 	ldc.i4 -832
 	add
 	stloc.0
-// 0x0105e91c: 0x105e91c: sw    s2, 820(sp)
+// 0x0105e92c: 0x105e92c: sw    s2, 820(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2731,8 +2731,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105e920: 0x105e920: sw    ra, 828(sp)
-// 0x0105e924: 0x105e924: sw    s3, 824(sp)
+// 0x0105e930: 0x105e930: sw    ra, 828(sp)
+// 0x0105e934: 0x105e934: sw    s3, 824(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2741,7 +2741,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105e928: 0x105e928: sw    s1, 816(sp)
+// 0x0105e938: 0x105e938: sw    s1, 816(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2750,7 +2750,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105e92c: 0x105e92c: sw    s0, 812(sp)
+// 0x0105e93c: 0x105e93c: sw    s0, 812(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2759,7 +2759,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105e930: 0x105e930: sw    zero, 32(sp)
+// 0x0105e940: 0x105e940: sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2768,7 +2768,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105e934: 0x105e934: jal   0x101fa28 sw    zero, 36(sp)
+// 0x0105e944: 0x105e944: jal   0x101fa38 sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2777,23 +2777,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105e93c: 0x105e93c: bne   v0, zero, 0x105e948 addiu s2, zero, 6
+// 0x0105e94c: 0x105e94c: bne   v0, zero, 0x105e958 addiu s2, zero, 6
 	ldloc 5
 	ldc.i4.6
 	stloc 9
-	brtrue L_105e948
+	brtrue L_105e958
 // --- basic block ---
-// 0x0105e944: 0x105e944: addiu s2, zero, 4
+// 0x0105e954: 0x105e954: addiu s2, zero, 4
 	ldc.i4.4
 	stloc 9
-L_105e948:
-// 0x0105e948: 0x105e948: lui   a0, 0x0
+L_105e958:
+// 0x0105e958: 0x105e958: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e94c: 0x105e94c: jal   0x100e788 addiu a0, a0, 14528
+// 0x0105e95c: 0x105e95c: jal   0x100e798 addiu a0, a0, 14528
 	ldloc.1
 	ldc.i4 14528
 	add
@@ -2803,61 +2803,61 @@ L_105e948:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105e954: 0x105e954: addu  s1, v0, zero
+// 0x0105e964: 0x105e964: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0105e958: 0x105e958: lui   v0, 0x70000
+// 0x0105e968: 0x105e968: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105e95c: 0x105e95c: lw    s0, 11972(v0)
+// 0x0105e96c: 0x105e96c: lw    s0, 12436(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105e960: 0x105e960: addiu v0, zero, 1
+// 0x0105e970: 0x105e970: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105e964: 0x105e964: bne   s0, v0, 0x105eae8 sll   zero, zero, 0
+// 0x0105e974: 0x105e974: bne   s0, v0, 0x105eaf8 sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_105eae8
+	bne.un L_105eaf8
 // --- basic block ---
-// 0x0105e96c: 0x105e96c: jal   0x101fad4 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+// 0x0105e97c: 0x105e97c: jal   0x101fae4 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105e974: 0x105e974: beq   v0, zero, 0x105e99c lui   a1, 0x10000
+// 0x0105e984: 0x105e984: beq   v0, zero, 0x105e9ac lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_105e99c
+	brfalse L_105e9ac
 // --- basic block ---
-// 0x0105e97c: 0x105e97c: lui   a3, 0x10000
+// 0x0105e98c: 0x105e98c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105e980: 0x105e980: addiu a1, a1, 12092
+// 0x0105e990: 0x105e990: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105e984: 0x105e984: addiu a3, a3, 12128
+// 0x0105e994: 0x105e994: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105e988: 0x105e988: addiu a0, zero, 2
+// 0x0105e998: 0x105e998: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105e98c: 0x105e98c: jal   0x100449c addiu a2, zero, 968
+// 0x0105e99c: 0x105e99c: jal   0x100449c addiu a2, zero, 968
 	ldc.i4 968
 	stloc.3
 	ldloc.0
@@ -2870,38 +2870,38 @@ L_105e948:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105e994: 0x105e994: j	 0x105eae8 sll   zero, zero, 0
-	br L_105eae8
+// 0x0105e9a4: 0x105e9a4: j	 0x105eaf8 sll   zero, zero, 0
+	br L_105eaf8
 // --- basic block ---
-L_105e99c:
-// 0x0105e99c: 0x105e99c: jal   0x105748c sll   zero, zero, 0
+L_105e9ac:
+// 0x0105e9ac: 0x105e9ac: jal   0x105749c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_ETA_enabled_105748c(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_ETA_enabled_105749c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105e9a4: 0x105e9a4: beq   v0, zero, 0x105eae8 lui   a2, 0x10000
+// 0x0105e9b4: 0x105e9b4: beq   v0, zero, 0x105eaf8 lui   a2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	brfalse L_105eae8
+	brfalse L_105eaf8
 // --- basic block ---
-// 0x0105e9ac: 0x105e9ac: addiu a2, a2, 12196
+// 0x0105e9bc: 0x105e9bc: addiu a2, a2, 12192
 	ldloc.3
-	ldc.i4 12196
+	ldc.i4 12192
 	add
 	stloc.3
-// 0x0105e9b0: 0x105e9b0: addiu a0, sp, 40
+// 0x0105e9c0: 0x105e9c0: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0105e9b4: 0x105e9b4: jal   0x101afb8 addiu a1, zero, 256
+// 0x0105e9c4: 0x105e9c4: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -2909,23 +2909,23 @@ L_105e99c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105e9bc: 0x105e9bc: beq   v0, zero, 0x105eae8 lui   a0, 0x10000
+// 0x0105e9cc: 0x105e9cc: beq   v0, zero, 0x105eaf8 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_105eae8
+	brfalse L_105eaf8
 // --- basic block ---
-// 0x0105e9c4: 0x105e9c4: addiu a0, a0, 12184
+// 0x0105e9d4: 0x105e9d4: addiu a0, a0, 12180
 	ldloc.1
-	ldc.i4 12184
+	ldc.i4 12180
 	add
 	stloc.1
-// 0x0105e9c8: 0x105e9c8: jal   0x104ef00 addu  a1, zero, zero
+// 0x0105e9d8: 0x105e9d8: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2933,48 +2933,48 @@ L_105e99c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105e9d0: 0x105e9d0: jal   0x1014194 sll   zero, zero, 0
+// 0x0105e9e0: 0x105e9e0: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105e9d8: 0x105e9d8: bne   v0, s0, 0x105e9ec sll   zero, zero, 0
+// 0x0105e9e8: 0x105e9e8: bne   v0, s0, 0x105e9fc sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_105e9ec
+	bne.un L_105e9fc
 // --- basic block ---
-// 0x0105e9e0: 0x105e9e0: lui   a0, 0x10000
+// 0x0105e9f0: 0x105e9f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105e9e4: 0x105e9e4: j	 0x105e9f4 addiu a0, a0, 2416
+// 0x0105e9f4: 0x105e9f4: j	 0x105ea04 addiu a0, a0, 2412
 	ldloc.1
-	ldc.i4 2416
+	ldc.i4 2412
 	add
 	stloc.1
-	br L_105e9f4
+	br L_105ea04
 // --- basic block ---
-L_105e9ec:
-// 0x0105e9ec: 0x105e9ec: lui   a0, 0x0
+L_105e9fc:
+// 0x0105e9fc: 0x105e9fc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105e9f0: 0x105e9f0: addiu a0, a0, 23008
+// 0x0105ea00: 0x105ea00: addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
 	stloc.1
-L_105e9f4:
-// 0x0105e9f4: 0x105e9f4: jal   0x104edb0 lui   s3, 0x20000
+L_105ea04:
+// 0x0105ea04: 0x105ea04: jal   0x104edc0 lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 10
 	ldloc.0
@@ -2982,17 +2982,17 @@ L_105e9f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105e9fc: 0x105e9fc: addiu a1, s3, 48
+// 0x0105ea0c: 0x105ea0c: addiu a1, s3, 512
 	ldloc 10
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
-// 0x0105ea00: 0x105ea00: jal   0x1001984 addiu a0, sp, 40
+// 0x0105ea10: 0x105ea10: jal   0x1001984 addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3007,15 +3007,15 @@ L_105e9f4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ea08: 0x105ea08: addiu s0, sp, 296
+// 0x0105ea18: 0x105ea18: addiu s0, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
 	stloc 8
-// 0x0105ea0c: 0x105ea0c: addu  a1, v0, zero
+// 0x0105ea1c: 0x105ea1c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105ea10: 0x105ea10: jal   0x1001b68 addu  a0, s0, zero
+// 0x0105ea20: 0x105ea20: jal   0x1001b68 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -3025,12 +3025,12 @@ L_105e9f4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ea18: 0x105ea18: addiu a1, s3, 48
+// 0x0105ea28: 0x105ea28: addiu a1, s3, 512
 	ldloc 10
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
-// 0x0105ea1c: 0x105ea1c: jal   0x1001984 addu  a0, zero, zero
+// 0x0105ea2c: 0x105ea2c: jal   0x1001984 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3043,10 +3043,10 @@ L_105e9f4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ea24: 0x105ea24: addu  a1, v0, zero
+// 0x0105ea34: 0x105ea34: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105ea28: 0x105ea28: jal   0x1001b68 addiu a0, sp, 552
+// 0x0105ea38: 0x105ea38: jal   0x1001b68 addiu a0, sp, 552
 	ldloc.0
 	ldc.i4 552
 	add
@@ -3058,24 +3058,24 @@ L_105e9f4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ea30: 0x105ea30: lui   v0, 0x70000
+// 0x0105ea40: 0x105ea40: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ea34: 0x105ea34: lw    v1, 12240(v0)
+// 0x0105ea44: 0x105ea44: lw    v1, 12704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ea38: 0x105ea38: addiu s3, s1, -6
+// 0x0105ea48: 0x105ea48: addiu s3, s1, -6
 	ldloc 11
 	ldc.i4.s -6
 	add
 	stloc 10
-// 0x0105ea3c: 0x105ea3c: lw    v0, 48(v1)
+// 0x0105ea4c: 0x105ea4c: lw    v0, 48(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3084,12 +3084,12 @@ L_105e9f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ea40: 0x105ea40: addiu a0, sp, 32
+// 0x0105ea50: 0x105ea50: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0105ea44: 0x105ea44: sw    v0, 32(sp)
+// 0x0105ea54: 0x105ea54: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3098,7 +3098,7 @@ L_105e9f4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ea48: 0x105ea48: lw    v1, 52(v1)
+// 0x0105ea58: 0x105ea58: lw    v1, 52(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3107,24 +3107,24 @@ L_105e9f4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ea4c: 0x105ea4c: addu  v0, v0, s2
+// 0x0105ea5c: 0x105ea5c: addu  v0, v0, s2
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x0105ea50: 0x105ea50: addiu a1, zero, 2
+// 0x0105ea60: 0x105ea60: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105ea54: 0x105ea54: addu  a2, s3, zero
+// 0x0105ea64: 0x105ea64: addu  a2, s3, zero
 	ldloc 10
 	stloc.3
-// 0x0105ea58: 0x105ea58: addu  a3, s0, zero
+// 0x0105ea68: 0x105ea68: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x0105ea5c: 0x105ea5c: lui   s2, 0x0
+// 0x0105ea6c: 0x105ea6c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0105ea60: 0x105ea60: sw    v1, 36(sp)
+// 0x0105ea70: 0x105ea70: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3133,7 +3133,7 @@ L_105e9f4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105ea64: 0x105ea64: jal   0x104ea60 sw    v0, 32(sp)
+// 0x0105ea74: 0x105ea74: jal   0x104ea70 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3147,12 +3147,12 @@ L_105e9f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ea6c: 0x105ea6c: lw    v1, 14576(s2)
+// 0x0105ea7c: 0x105ea7c: lw    v1, 14576(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3161,38 +3161,38 @@ L_105e9f4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ea70: 0x105ea70: addiu v0, zero, -1
+// 0x0105ea80: 0x105ea80: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105ea74: 0x105ea74: bne   v1, v0, 0x105eac4 lui   v0, 0x0
+// 0x0105ea84: 0x105ea84: bne   v1, v0, 0x105ead4 lui   v0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_105eac4
+	bne.un L_105ead4
 // --- basic block ---
-// 0x0105ea7c: 0x105ea7c: addu  a0, s0, zero
+// 0x0105ea8c: 0x105ea8c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0105ea80: 0x105ea80: addiu v0, sp, 28
+// 0x0105ea90: 0x105ea90: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x0105ea84: 0x105ea84: addu  a1, s3, zero
+// 0x0105ea94: 0x105ea94: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x0105ea88: 0x105ea88: addiu a2, s2, 14576
+// 0x0105ea98: 0x105ea98: addiu a2, s2, 14576
 	ldloc 9
 	ldc.i4 14576
 	add
 	stloc.3
-// 0x0105ea8c: 0x105ea8c: addiu a3, sp, 24
+// 0x0105ea9c: 0x105ea9c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x0105ea90: 0x105ea90: sw    v0, 16(sp)
+// 0x0105eaa0: 0x105eaa0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3201,7 +3201,7 @@ L_105e9f4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ea94: 0x105ea94: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105eaa4: 0x105eaa4: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3215,12 +3215,12 @@ L_105e9f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ea9c: 0x105ea9c: lw    s0, 14576(s2)
+// 0x0105eaac: 0x105eaac: lw    s0, 14576(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3229,29 +3229,29 @@ L_105e9f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105eaa0: 0x105eaa0: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0105eab0: 0x105eab0: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105eaa8: 0x105eaa8: bne   v0, zero, 0x105eab4 addiu v1, zero, 7
+// 0x0105eab8: 0x105eab8: bne   v0, zero, 0x105eac4 addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 6
-	brtrue L_105eab4
+	brtrue L_105eac4
 // --- basic block ---
-// 0x0105eab0: 0x105eab0: addiu v1, zero, 5
+// 0x0105eac0: 0x105eac0: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 6
-L_105eab4:
-// 0x0105eab4: 0x105eab4: addu  s0, v1, s0
+L_105eac4:
+// 0x0105eac4: 0x105eac4: addu  s0, v1, s0
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x0105eab8: 0x105eab8: lui   v0, 0x0
+// 0x0105eac8: 0x105eac8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105eabc: 0x105eabc: sw    s0, 14576(v0)
+// 0x0105eacc: 0x105eacc: sw    s0, 14576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3260,11 +3260,11 @@ L_105eab4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105eac0: 0x105eac0: lui   v0, 0x0
+// 0x0105ead0: 0x105ead0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_105eac4:
-// 0x0105eac4: 0x105eac4: lw    v1, 32(sp)
+L_105ead4:
+// 0x0105ead4: 0x105ead4: lw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3273,7 +3273,7 @@ L_105eac4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105eac8: 0x105eac8: lw    v0, 14576(v0)
+// 0x0105ead8: 0x105ead8: lw    v0, 14576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3282,28 +3282,28 @@ L_105eac4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105eacc: 0x105eacc: addu  a2, s1, zero
+// 0x0105eadc: 0x105eadc: addu  a2, s1, zero
 	ldloc 11
 	stloc.3
-// 0x0105ead0: 0x105ead0: addu  v0, v1, v0
+// 0x0105eae0: 0x105eae0: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0105ead4: 0x105ead4: addiu a0, sp, 32
+// 0x0105eae4: 0x105eae4: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0105ead8: 0x105ead8: addiu a1, zero, 2
+// 0x0105eae8: 0x105eae8: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105eadc: 0x105eadc: addiu a3, sp, 552
+// 0x0105eaec: 0x105eaec: addiu a3, sp, 552
 	ldloc.0
 	ldc.i4 552
 	add
 	stloc 4
-// 0x0105eae0: 0x105eae0: jal   0x104ea60 sw    v0, 32(sp)
+// 0x0105eaf0: 0x105eaf0: jal   0x104ea70 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3317,14 +3317,14 @@ L_105eac4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105eae8:
-// 0x0105eae8: 0x105eae8: lw    ra, 828(sp)
-// 0x0105eaec: 0x105eaec: lw    s3, 824(sp)
+L_105eaf8:
+// 0x0105eaf8: 0x105eaf8: lw    ra, 828(sp)
+// 0x0105eafc: 0x105eafc: lw    s3, 824(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3333,7 +3333,7 @@ L_105eae8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105eaf0: 0x105eaf0: lw    s2, 820(sp)
+// 0x0105eb00: 0x105eb00: lw    s2, 820(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3342,7 +3342,7 @@ L_105eae8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105eaf4: 0x105eaf4: lw    s1, 816(sp)
+// 0x0105eb04: 0x105eb04: lw    s1, 816(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3351,7 +3351,7 @@ L_105eae8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105eaf8: 0x105eaf8: lw    s0, 812(sp)
+// 0x0105eb08: 0x105eb08: lw    s0, 812(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3360,7 +3360,7 @@ L_105eae8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105eafc: 0x105eafc: jr    ra addiu sp, sp, 832
+// 0x0105eb0c: 0x105eb0c: jr    ra addiu sp, sp, 832
 	ldloc.0
 	ldc.i4 832
 	add
@@ -3372,7 +3372,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_bar_draw_distance_to_destination_105eb04(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_draw_distance_to_destination_105eb14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 s4,int32 s1,int32 s5,int32 s6,int32 ra)
@@ -3428,21 +3428,21 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105eb04: 0x105eb04: lui   a0, 0x0
+// 0x0105eb14: 0x105eb14: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105eb08: 0x105eb08: addiu sp, sp, -432
+// 0x0105eb18: 0x105eb18: addiu sp, sp, -432
 	ldloc.0
 	ldc.i4 -432
 	add
 	stloc.0
-// 0x0105eb0c: 0x105eb0c: addiu a0, a0, 14512
+// 0x0105eb1c: 0x105eb1c: addiu a0, a0, 14512
 	ldloc.1
 	ldc.i4 14512
 	add
 	stloc.1
-// 0x0105eb10: 0x105eb10: sw    ra, 428(sp)
-// 0x0105eb14: 0x105eb14: sw    s4, 416(sp)
+// 0x0105eb20: 0x105eb20: sw    ra, 428(sp)
+// 0x0105eb24: 0x105eb24: sw    s4, 416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3451,7 +3451,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105eb18: 0x105eb18: sw    s1, 404(sp)
+// 0x0105eb28: 0x105eb28: sw    s1, 404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3460,7 +3460,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105eb1c: 0x105eb1c: sw    s6, 424(sp)
+// 0x0105eb2c: 0x105eb2c: sw    s6, 424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3469,7 +3469,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105eb20: 0x105eb20: sw    s5, 420(sp)
+// 0x0105eb30: 0x105eb30: sw    s5, 420(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3478,7 +3478,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105eb24: 0x105eb24: sw    s3, 412(sp)
+// 0x0105eb34: 0x105eb34: sw    s3, 412(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3487,7 +3487,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105eb28: 0x105eb28: sw    s2, 408(sp)
+// 0x0105eb38: 0x105eb38: sw    s2, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3496,7 +3496,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105eb2c: 0x105eb2c: sw    s0, 400(sp)
+// 0x0105eb3c: 0x105eb3c: sw    s0, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3505,7 +3505,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105eb30: 0x105eb30: sw    zero, 36(sp)
+// 0x0105eb40: 0x105eb40: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3514,7 +3514,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105eb34: 0x105eb34: jal   0x100e788 sw    zero, 40(sp)
+// 0x0105eb44: 0x105eb44: jal   0x100e798 sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3528,77 +3528,77 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105eb3c: 0x105eb3c: jal   0x101fa28 addu  s1, v0, zero
+// 0x0105eb4c: 0x105eb4c: jal   0x101fa38 addu  s1, v0, zero
 	ldloc 5
 	stloc 12
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105eb44: 0x105eb44: bne   v0, zero, 0x105eb50 addiu s4, zero, 9
+// 0x0105eb54: 0x105eb54: bne   v0, zero, 0x105eb60 addiu s4, zero, 9
 	ldloc 5
 	ldc.i4.s 9
 	stloc 11
-	brtrue L_105eb50
+	brtrue L_105eb60
 // --- basic block ---
-// 0x0105eb4c: 0x105eb4c: addiu s4, zero, 6
+// 0x0105eb5c: 0x105eb5c: addiu s4, zero, 6
 	ldc.i4.6
 	stloc 11
-L_105eb50:
-// 0x0105eb50: 0x105eb50: lui   v0, 0x70000
+L_105eb60:
+// 0x0105eb60: 0x105eb60: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105eb54: 0x105eb54: lw    s0, 11972(v0)
+// 0x0105eb64: 0x105eb64: lw    s0, 12436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105eb58: 0x105eb58: addiu v0, zero, 1
+// 0x0105eb68: 0x105eb68: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105eb5c: 0x105eb5c: bne   s0, v0, 0x105ed68 sll   zero, zero, 0
+// 0x0105eb6c: 0x105eb6c: bne   s0, v0, 0x105ed78 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	bne.un L_105ed68
+	bne.un L_105ed78
 // --- basic block ---
-// 0x0105eb64: 0x105eb64: jal   0x101fad4 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+// 0x0105eb74: 0x105eb74: jal   0x101fae4 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105eb6c: 0x105eb6c: beq   v0, zero, 0x105eb98 lui   v0, 0x70000
+// 0x0105eb7c: 0x105eb7c: beq   v0, zero, 0x105eba8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_105eb98
+	brfalse L_105eba8
 // --- basic block ---
-// 0x0105eb74: 0x105eb74: lui   a1, 0x10000
+// 0x0105eb84: 0x105eb84: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105eb78: 0x105eb78: lui   a3, 0x10000
+// 0x0105eb88: 0x105eb88: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105eb7c: 0x105eb7c: addiu a1, a1, 12092
+// 0x0105eb8c: 0x105eb8c: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105eb80: 0x105eb80: addiu a3, a3, 12128
+// 0x0105eb90: 0x105eb90: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105eb84: 0x105eb84: addiu a0, zero, 2
+// 0x0105eb94: 0x105eb94: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105eb88: 0x105eb88: jal   0x100449c addiu a2, zero, 1018
+// 0x0105eb98: 0x105eb98: jal   0x100449c addiu a2, zero, 1018
 	ldc.i4 1018
 	stloc.3
 	ldloc.0
@@ -3611,21 +3611,21 @@ L_105eb50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105eb90: 0x105eb90: j	 0x105ed68 sll   zero, zero, 0
-	br L_105ed68
+// 0x0105eba0: 0x105eba0: j	 0x105ed78 sll   zero, zero, 0
+	br L_105ed78
 // --- basic block ---
-L_105eb98:
-// 0x0105eb98: 0x105eb98: lw    v0, 12240(v0)
+L_105eba8:
+// 0x0105eba8: 0x105eba8: lw    v0, 12704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105eb9c: 0x105eb9c: sll   zero, zero, 0
-// 0x0105eba0: 0x105eba0: lw    v1, 40(v0)
+// 0x0105ebac: 0x105ebac: sll   zero, zero, 0
+// 0x0105ebb0: 0x105ebb0: lw    v1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3634,30 +3634,30 @@ L_105eb98:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105eba4: 0x105eba4: addiu v0, zero, -1
+// 0x0105ebb4: 0x105ebb4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105eba8: 0x105eba8: beq   v1, v0, 0x105ed68 addiu s2, sp, 44
+// 0x0105ebb8: 0x105ebb8: beq   v1, v0, 0x105ed78 addiu s2, sp, 44
 	ldloc 7
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 8
-	beq  L_105ed68
+	beq  L_105ed78
 // --- basic block ---
-// 0x0105ebb0: 0x105ebb0: lui   a2, 0x10000
+// 0x0105ebc0: 0x105ebc0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105ebb4: 0x105ebb4: addiu a2, a2, -31404
+// 0x0105ebc4: 0x105ebc4: addiu a2, a2, -31404
 	ldloc.3
 	ldc.i4 -31404
 	add
 	stloc.3
-// 0x0105ebb8: 0x105ebb8: addu  a0, s2, zero
+// 0x0105ebc8: 0x105ebc8: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105ebbc: 0x105ebbc: jal   0x101afb8 addiu a1, zero, 100
+// 0x0105ebcc: 0x105ebcc: jal   0x101afc8 addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -3665,23 +3665,23 @@ L_105eb98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ebc4: 0x105ebc4: beq   v0, zero, 0x105ed68 lui   a1, 0x20000
+// 0x0105ebd4: 0x105ebd4: beq   v0, zero, 0x105ed78 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_105ed68
+	brfalse L_105ed78
 // --- basic block ---
-// 0x0105ebcc: 0x105ebcc: addu  a0, s2, zero
+// 0x0105ebdc: 0x105ebdc: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105ebd0: 0x105ebd0: jal   0x1001984 addiu a1, a1, 48
+// 0x0105ebe0: 0x105ebe0: jal   0x1001984 addiu a1, a1, 512
 	ldloc.2
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
 	ldloc.0
@@ -3694,15 +3694,15 @@ L_105eb98:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ebd8: 0x105ebd8: addiu s2, sp, 144
+// 0x0105ebe8: 0x105ebe8: addiu s2, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
 	stloc 8
-// 0x0105ebdc: 0x105ebdc: addu  a1, v0, zero
+// 0x0105ebec: 0x105ebec: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105ebe0: 0x105ebe0: jal   0x1001b68 addu  a0, s2, zero
+// 0x0105ebf0: 0x105ebf0: jal   0x1001b68 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -3712,28 +3712,28 @@ L_105eb98:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ebe8: 0x105ebe8: addu  a0, s2, zero
+// 0x0105ebf8: 0x105ebf8: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105ebec: 0x105ebec: addu  a1, s1, zero
+// 0x0105ebfc: 0x105ebfc: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x0105ebf0: 0x105ebf0: addiu a2, sp, 24
+// 0x0105ec00: 0x105ec00: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0105ebf4: 0x105ebf4: addiu a3, sp, 28
+// 0x0105ec04: 0x105ec04: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0105ebf8: 0x105ebf8: addiu v0, sp, 32
+// 0x0105ec08: 0x105ec08: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0105ebfc: 0x105ebfc: sw    v0, 16(sp)
+// 0x0105ec0c: 0x105ec0c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3742,7 +3742,7 @@ L_105eb98:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ec00: 0x105ec00: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105ec10: 0x105ec10: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3756,20 +3756,20 @@ L_105eb98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ec08: 0x105ec08: lui   a0, 0x10000
+// 0x0105ec18: 0x105ec18: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105ec0c: 0x105ec0c: addiu a0, a0, 12184
+// 0x0105ec1c: 0x105ec1c: addiu a0, a0, 12180
 	ldloc.1
-	ldc.i4 12184
+	ldc.i4 12180
 	add
 	stloc.1
-// 0x0105ec10: 0x105ec10: jal   0x104ef00 addu  a1, zero, zero
+// 0x0105ec20: 0x105ec20: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3777,48 +3777,48 @@ L_105eb98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ec18: 0x105ec18: jal   0x1014194 sll   zero, zero, 0
+// 0x0105ec28: 0x105ec28: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ec20: 0x105ec20: bne   v0, s0, 0x105ec34 sll   zero, zero, 0
+// 0x0105ec30: 0x105ec30: bne   v0, s0, 0x105ec44 sll   zero, zero, 0
 	ldloc 5
 	ldloc 9
-	bne.un L_105ec34
+	bne.un L_105ec44
 // --- basic block ---
-// 0x0105ec28: 0x105ec28: lui   a0, 0x10000
+// 0x0105ec38: 0x105ec38: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105ec2c: 0x105ec2c: j	 0x105ec3c addiu a0, a0, 2416
+// 0x0105ec3c: 0x105ec3c: j	 0x105ec4c addiu a0, a0, 2412
 	ldloc.1
-	ldc.i4 2416
+	ldc.i4 2412
 	add
 	stloc.1
-	br L_105ec3c
+	br L_105ec4c
 // --- basic block ---
-L_105ec34:
-// 0x0105ec34: 0x105ec34: lui   a0, 0x0
+L_105ec44:
+// 0x0105ec44: 0x105ec44: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105ec38: 0x105ec38: addiu a0, a0, 23008
+// 0x0105ec48: 0x105ec48: addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
 	stloc.1
-L_105ec3c:
-// 0x0105ec3c: 0x105ec3c: jal   0x104edb0 lui   s3, 0x70000
+L_105ec4c:
+// 0x0105ec4c: 0x105ec4c: jal   0x104edc0 lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 10
 	ldloc.0
@@ -3826,12 +3826,12 @@ L_105ec3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ec44: 0x105ec44: jal   0x109a424 addu  a0, zero, zero
+// 0x0105ec54: 0x105ec54: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3839,49 +3839,49 @@ L_105ec3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ec4c: 0x105ec4c: lui   s6, 0x20000
+// 0x0105ec5c: 0x105ec5c: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 14
-// 0x0105ec50: 0x105ec50: addiu s0, sp, 144
+// 0x0105ec60: 0x105ec60: addiu s0, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
 	stloc 9
-// 0x0105ec54: 0x105ec54: lui   s5, 0xf0000
+// 0x0105ec64: 0x105ec64: lui   s5, 0xf0000
 	ldc.i4 983040
 	stloc 13
-// 0x0105ec58: 0x105ec58: beq   v0, zero, 0x105ecf0 addiu s2, sp, 36
+// 0x0105ec68: 0x105ec68: beq   v0, zero, 0x105ed00 addiu s2, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 8
-	brfalse L_105ecf0
+	brfalse L_105ed00
 // --- basic block ---
-// 0x0105ec60: 0x105ec60: lw    v0, 12240(s3)
+// 0x0105ec70: 0x105ec70: lw    v0, 12704(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ec64: 0x105ec64: lw    a0, -30068(s5)
+// 0x0105ec74: 0x105ec74: lw    a0, -29604(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ec68: 0x105ec68: lw    v1, 40(v0)
+// 0x0105ec78: 0x105ec78: lw    v1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3890,10 +3890,10 @@ L_105ec3c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ec6c: 0x105ec6c: addu  a2, s1, zero
+// 0x0105ec7c: 0x105ec7c: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x0105ec70: 0x105ec70: sw    v1, 36(sp)
+// 0x0105ec80: 0x105ec80: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3902,7 +3902,7 @@ L_105ec3c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105ec74: 0x105ec74: lw    v0, 44(v0)
+// 0x0105ec84: 0x105ec84: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3911,21 +3911,21 @@ L_105ec3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ec78: 0x105ec78: addu  a3, s0, zero
+// 0x0105ec88: 0x105ec88: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x0105ec7c: 0x105ec7c: subu  s4, a0, s4
+// 0x0105ec8c: 0x105ec8c: subu  s4, a0, s4
 	ldloc.1
 	ldloc 11
 	sub
 	stloc 11
-// 0x0105ec80: 0x105ec80: addiu a1, zero, 3
+// 0x0105ec90: 0x105ec90: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0105ec84: 0x105ec84: addu  a0, s2, zero
+// 0x0105ec94: 0x105ec94: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105ec88: 0x105ec88: sw    v0, 40(sp)
+// 0x0105ec98: 0x105ec98: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3934,7 +3934,7 @@ L_105ec3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ec8c: 0x105ec8c: jal   0x104ea60 sw    s4, 36(sp)
+// 0x0105ec9c: 0x105ec9c: jal   0x104ea70 sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3948,17 +3948,17 @@ L_105ec3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ec94: 0x105ec94: addiu a1, s6, 48
+// 0x0105eca4: 0x105eca4: addiu a1, s6, 512
 	ldloc 14
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
-// 0x0105ec98: 0x105ec98: jal   0x1001984 addu  a0, zero, zero
+// 0x0105eca8: 0x105eca8: jal   0x1001984 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -3971,10 +3971,10 @@ L_105ec3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105eca0: 0x105eca0: addu  a1, v0, zero
+// 0x0105ecb0: 0x105ecb0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105eca4: 0x105eca4: jal   0x1001b68 addu  a0, s0, zero
+// 0x0105ecb4: 0x105ecb4: jal   0x1001b68 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -3984,17 +3984,17 @@ L_105ec3c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ecac: 0x105ecac: lw    v0, 12240(s3)
+// 0x0105ecbc: 0x105ecbc: lw    v0, 12704(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ecb0: 0x105ecb0: sll   zero, zero, 0
-// 0x0105ecb4: 0x105ecb4: lw    s3, 40(v0)
+// 0x0105ecc0: 0x105ecc0: sll   zero, zero, 0
+// 0x0105ecc4: 0x105ecc4: lw    s3, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4003,8 +4003,8 @@ L_105ec3c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105ecb8: 0x105ecb8: sll   zero, zero, 0
-// 0x0105ecbc: 0x105ecbc: sw    s3, 36(sp)
+// 0x0105ecc8: 0x105ecc8: sll   zero, zero, 0
+// 0x0105eccc: 0x105eccc: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4013,7 +4013,7 @@ L_105ec3c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105ecc0: 0x105ecc0: lw    v0, 44(v0)
+// 0x0105ecd0: 0x105ecd0: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4022,7 +4022,7 @@ L_105ec3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ecc4: 0x105ecc4: jal   0x101fa28 sw    v0, 40(sp)
+// 0x0105ecd4: 0x105ecd4: jal   0x101fa38 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4031,39 +4031,39 @@ L_105ec3c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105eccc: 0x105eccc: sltu  v0, zero, v0
+// 0x0105ecdc: 0x105ecdc: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0105ecd0: 0x105ecd0: addiu v0, v0, 3
+// 0x0105ece0: 0x105ece0: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x0105ecd4: 0x105ecd4: subu  s3, s3, v0
+// 0x0105ece4: 0x105ece4: subu  s3, s3, v0
 	ldloc 10
 	ldloc 5
 	sub
 	stloc 10
-// 0x0105ecd8: 0x105ecd8: addu  a0, s2, zero
+// 0x0105ece8: 0x105ece8: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105ecdc: 0x105ecdc: addiu a2, s1, -7
+// 0x0105ecec: 0x105ecec: addiu a2, s1, -7
 	ldloc 12
 	ldc.i4.s -7
 	add
 	stloc.3
-// 0x0105ece0: 0x105ece0: addu  a3, s0, zero
+// 0x0105ecf0: 0x105ecf0: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x0105ece4: 0x105ece4: addiu a1, zero, 2
+// 0x0105ecf4: 0x105ecf4: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105ece8: 0x105ece8: j	 0x105ed60 sw    s3, 36(sp)
+// 0x0105ecf8: 0x105ecf8: j	 0x105ed70 sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4072,22 +4072,22 @@ L_105ec3c:
 	add
 	ldloc 10
 	stelem.i4
-	br L_105ed60
+	br L_105ed70
 // --- basic block ---
-L_105ecf0:
-// 0x0105ecf0: 0x105ecf0: lw    v0, 12240(s3)
+L_105ed00:
+// 0x0105ed00: 0x105ed00: lw    v0, 12704(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ecf4: 0x105ecf4: addu  a2, s1, zero
+// 0x0105ed04: 0x105ed04: addu  a2, s1, zero
 	ldloc 12
 	stloc.3
-// 0x0105ecf8: 0x105ecf8: lw    v1, 40(v0)
+// 0x0105ed08: 0x105ed08: lw    v1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4096,10 +4096,10 @@ L_105ecf0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ecfc: 0x105ecfc: addu  a3, s0, zero
+// 0x0105ed0c: 0x105ed0c: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x0105ed00: 0x105ed00: sw    v1, 36(sp)
+// 0x0105ed10: 0x105ed10: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4108,7 +4108,7 @@ L_105ecf0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105ed04: 0x105ed04: lw    v0, 44(v0)
+// 0x0105ed14: 0x105ed14: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4117,13 +4117,13 @@ L_105ecf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ed08: 0x105ed08: addu  a0, s2, zero
+// 0x0105ed18: 0x105ed18: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105ed0c: 0x105ed0c: addiu a1, zero, 2
+// 0x0105ed1c: 0x105ed1c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105ed10: 0x105ed10: jal   0x104ea60 sw    v0, 40(sp)
+// 0x0105ed20: 0x105ed20: jal   0x104ea70 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4137,17 +4137,17 @@ L_105ecf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ed18: 0x105ed18: addiu a1, s6, 48
+// 0x0105ed28: 0x105ed28: addiu a1, s6, 512
 	ldloc 14
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
-// 0x0105ed1c: 0x105ed1c: jal   0x1001984 addu  a0, zero, zero
+// 0x0105ed2c: 0x105ed2c: jal   0x1001984 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4160,10 +4160,10 @@ L_105ecf0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ed24: 0x105ed24: addu  a1, v0, zero
+// 0x0105ed34: 0x105ed34: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105ed28: 0x105ed28: jal   0x1001b68 addu  a0, s0, zero
+// 0x0105ed38: 0x105ed38: jal   0x1001b68 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -4173,25 +4173,25 @@ L_105ecf0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105ed30: 0x105ed30: lw    v0, 12240(s3)
+// 0x0105ed40: 0x105ed40: lw    v0, 12704(s3)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ed34: 0x105ed34: lw    a0, -30068(s5)
+// 0x0105ed44: 0x105ed44: lw    a0, -29604(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ed38: 0x105ed38: lw    v1, 40(v0)
+// 0x0105ed48: 0x105ed48: lw    v1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4200,12 +4200,12 @@ L_105ecf0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105ed3c: 0x105ed3c: subu  s4, a0, s4
+// 0x0105ed4c: 0x105ed4c: subu  s4, a0, s4
 	ldloc.1
 	ldloc 11
 	sub
 	stloc 11
-// 0x0105ed40: 0x105ed40: sw    v1, 36(sp)
+// 0x0105ed50: 0x105ed50: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4214,7 +4214,7 @@ L_105ecf0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105ed44: 0x105ed44: lw    v0, 44(v0)
+// 0x0105ed54: 0x105ed54: lw    v0, 44(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4223,21 +4223,21 @@ L_105ecf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ed48: 0x105ed48: addu  a0, s2, zero
+// 0x0105ed58: 0x105ed58: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0105ed4c: 0x105ed4c: addiu a2, s1, -7
+// 0x0105ed5c: 0x105ed5c: addiu a2, s1, -7
 	ldloc 12
 	ldc.i4.s -7
 	add
 	stloc.3
-// 0x0105ed50: 0x105ed50: addu  a3, s0, zero
+// 0x0105ed60: 0x105ed60: addu  a3, s0, zero
 	ldloc 9
 	stloc 4
-// 0x0105ed54: 0x105ed54: addiu a1, zero, 3
+// 0x0105ed64: 0x105ed64: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0105ed58: 0x105ed58: sw    v0, 40(sp)
+// 0x0105ed68: 0x105ed68: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4246,7 +4246,7 @@ L_105ecf0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ed5c: 0x105ed5c: sw    s4, 36(sp)
+// 0x0105ed6c: 0x105ed6c: sw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4255,21 +4255,21 @@ L_105ecf0:
 	add
 	ldloc 11
 	stelem.i4
-L_105ed60:
-// 0x0105ed60: 0x105ed60: jal   0x104ea60 sll   zero, zero, 0
+L_105ed70:
+// 0x0105ed70: 0x105ed70: jal   0x104ea70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105ed68:
-// 0x0105ed68: 0x105ed68: lw    ra, 428(sp)
-// 0x0105ed6c: 0x105ed6c: lw    s6, 424(sp)
+L_105ed78:
+// 0x0105ed78: 0x105ed78: lw    ra, 428(sp)
+// 0x0105ed7c: 0x105ed7c: lw    s6, 424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4278,7 +4278,7 @@ L_105ed68:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105ed70: 0x105ed70: lw    s5, 420(sp)
+// 0x0105ed80: 0x105ed80: lw    s5, 420(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4287,7 +4287,7 @@ L_105ed68:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105ed74: 0x105ed74: lw    s4, 416(sp)
+// 0x0105ed84: 0x105ed84: lw    s4, 416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4296,7 +4296,7 @@ L_105ed68:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105ed78: 0x105ed78: lw    s3, 412(sp)
+// 0x0105ed88: 0x105ed88: lw    s3, 412(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4305,7 +4305,7 @@ L_105ed68:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105ed7c: 0x105ed7c: lw    s2, 408(sp)
+// 0x0105ed8c: 0x105ed8c: lw    s2, 408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4314,7 +4314,7 @@ L_105ed68:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105ed80: 0x105ed80: lw    s1, 404(sp)
+// 0x0105ed90: 0x105ed90: lw    s1, 404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4323,7 +4323,7 @@ L_105ed68:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105ed84: 0x105ed84: lw    s0, 400(sp)
+// 0x0105ed94: 0x105ed94: lw    s0, 400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4332,7 +4332,7 @@ L_105ed68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105ed88: 0x105ed88: jr    ra addiu sp, sp, 432
+// 0x0105ed98: 0x105ed98: jr    ra addiu sp, sp, 432
 	ldloc.0
 	ldc.i4 432
 	add
@@ -4344,7 +4344,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_bar_draw_time_to_destination_105ed90(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_draw_time_to_destination_105eda0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -4388,20 +4388,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105ed90: 0x105ed90: lui   a0, 0x0
+// 0x0105eda0: 0x105eda0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105ed94: 0x105ed94: addiu sp, sp, -824
+// 0x0105eda4: 0x105eda4: addiu sp, sp, -824
 	ldloc.0
 	ldc.i4 -824
 	add
 	stloc.0
-// 0x0105ed98: 0x105ed98: addiu a0, a0, 14528
+// 0x0105eda8: 0x105eda8: addiu a0, a0, 14528
 	ldloc.1
 	ldc.i4 14528
 	add
 	stloc.1
-// 0x0105ed9c: 0x105ed9c: sw    s1, 812(sp)
+// 0x0105edac: 0x105edac: sw    s1, 812(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4410,7 +4410,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105eda0: 0x105eda0: sw    s0, 808(sp)
+// 0x0105edb0: 0x105edb0: sw    s0, 808(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4419,8 +4419,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105eda4: 0x105eda4: sw    ra, 820(sp)
-// 0x0105eda8: 0x105eda8: sw    s2, 816(sp)
+// 0x0105edb4: 0x105edb4: sw    ra, 820(sp)
+// 0x0105edb8: 0x105edb8: sw    s2, 816(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4429,7 +4429,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105edac: 0x105edac: sw    zero, 32(sp)
+// 0x0105edbc: 0x105edbc: sw    zero, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4438,7 +4438,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105edb0: 0x105edb0: jal   0x100e788 sw    zero, 36(sp)
+// 0x0105edc0: 0x105edc0: jal   0x100e798 sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4452,61 +4452,61 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105edb8: 0x105edb8: addu  s0, v0, zero
+// 0x0105edc8: 0x105edc8: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0105edbc: 0x105edbc: lui   v0, 0x70000
+// 0x0105edcc: 0x105edcc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105edc0: 0x105edc0: lw    s1, 11972(v0)
+// 0x0105edd0: 0x105edd0: lw    s1, 12436(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105edc4: 0x105edc4: addiu v0, zero, 1
+// 0x0105edd4: 0x105edd4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105edc8: 0x105edc8: bne   s1, v0, 0x105efdc sll   zero, zero, 0
+// 0x0105edd8: 0x105edd8: bne   s1, v0, 0x105efec sll   zero, zero, 0
 	ldloc 8
 	ldloc 5
-	bne.un L_105efdc
+	bne.un L_105efec
 // --- basic block ---
-// 0x0105edd0: 0x105edd0: jal   0x101fad4 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+// 0x0105ede0: 0x105ede0: jal   0x101fae4 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105edd8: 0x105edd8: beq   v0, zero, 0x105ee00 lui   a1, 0x10000
+// 0x0105ede8: 0x105ede8: beq   v0, zero, 0x105ee10 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_105ee00
+	brfalse L_105ee10
 // --- basic block ---
-// 0x0105ede0: 0x105ede0: lui   a3, 0x10000
+// 0x0105edf0: 0x105edf0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105ede4: 0x105ede4: addiu a1, a1, 12092
+// 0x0105edf4: 0x105edf4: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105ede8: 0x105ede8: addiu a3, a3, 12128
+// 0x0105edf8: 0x105edf8: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105edec: 0x105edec: addiu a0, zero, 2
+// 0x0105edfc: 0x105edfc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105edf0: 0x105edf0: jal   0x100449c addiu a2, zero, 904
+// 0x0105ee00: 0x105ee00: jal   0x100449c addiu a2, zero, 904
 	ldc.i4 904
 	stloc.3
 	ldloc.0
@@ -4519,38 +4519,38 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105edf8: 0x105edf8: j	 0x105efdc sll   zero, zero, 0
-	br L_105efdc
+// 0x0105ee08: 0x105ee08: j	 0x105efec sll   zero, zero, 0
+	br L_105efec
 // --- basic block ---
-L_105ee00:
-// 0x0105ee00: 0x105ee00: jal   0x105748c sll   zero, zero, 0
+L_105ee10:
+// 0x0105ee10: 0x105ee10: jal   0x105749c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl65::navigate_main_ETA_enabled_105748c(int32,int32,int32,int32,int32)
+	call int32 Cibyl65::navigate_main_ETA_enabled_105749c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee08: 0x105ee08: beq   v0, zero, 0x105efdc lui   a2, 0x10000
+// 0x0105ee18: 0x105ee18: beq   v0, zero, 0x105efec lui   a2, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.3
-	brfalse L_105efdc
+	brfalse L_105efec
 // --- basic block ---
-// 0x0105ee10: 0x105ee10: addiu a2, a2, 12204
+// 0x0105ee20: 0x105ee20: addiu a2, a2, 12200
 	ldloc.3
-	ldc.i4 12204
+	ldc.i4 12200
 	add
 	stloc.3
-// 0x0105ee14: 0x105ee14: addiu a0, sp, 40
+// 0x0105ee24: 0x105ee24: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0105ee18: 0x105ee18: jal   0x101afb8 addiu a1, zero, 256
+// 0x0105ee28: 0x105ee28: jal   0x101afc8 addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
 	ldloc.0
@@ -4558,23 +4558,23 @@ L_105ee00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl19::roadmap_message_format_101afb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl19::roadmap_message_format_101afc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee20: 0x105ee20: beq   v0, zero, 0x105efdc lui   a0, 0x10000
+// 0x0105ee30: 0x105ee30: beq   v0, zero, 0x105efec lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_105efdc
+	brfalse L_105efec
 // --- basic block ---
-// 0x0105ee28: 0x105ee28: addiu a0, a0, 12184
+// 0x0105ee38: 0x105ee38: addiu a0, a0, 12180
 	ldloc.1
-	ldc.i4 12184
+	ldc.i4 12180
 	add
 	stloc.1
-// 0x0105ee2c: 0x105ee2c: jal   0x104ef00 addu  a1, zero, zero
+// 0x0105ee3c: 0x105ee3c: jal   0x104ef10 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4582,48 +4582,48 @@ L_105ee00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee34: 0x105ee34: jal   0x1014194 sll   zero, zero, 0
+// 0x0105ee44: 0x105ee44: jal   0x10141a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_skin_state_1014194(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_state_10141a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee3c: 0x105ee3c: bne   v0, s1, 0x105ee50 sll   zero, zero, 0
+// 0x0105ee4c: 0x105ee4c: bne   v0, s1, 0x105ee60 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_105ee50
+	bne.un L_105ee60
 // --- basic block ---
-// 0x0105ee44: 0x105ee44: lui   a0, 0x10000
+// 0x0105ee54: 0x105ee54: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105ee48: 0x105ee48: j	 0x105ee58 addiu a0, a0, 2416
+// 0x0105ee58: 0x105ee58: j	 0x105ee68 addiu a0, a0, 2412
 	ldloc.1
-	ldc.i4 2416
+	ldc.i4 2412
 	add
 	stloc.1
-	br L_105ee58
+	br L_105ee68
 // --- basic block ---
-L_105ee50:
-// 0x0105ee50: 0x105ee50: lui   a0, 0x0
+L_105ee60:
+// 0x0105ee60: 0x105ee60: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105ee54: 0x105ee54: addiu a0, a0, 23008
+// 0x0105ee64: 0x105ee64: addiu a0, a0, 23008
 	ldloc.1
 	ldc.i4 23008
 	add
 	stloc.1
-L_105ee58:
-// 0x0105ee58: 0x105ee58: jal   0x104edb0 lui   s1, 0x20000
+L_105ee68:
+// 0x0105ee68: 0x105ee68: jal   0x104edc0 lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
 	ldloc.0
@@ -4631,19 +4631,19 @@ L_105ee58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee60: 0x105ee60: addiu a0, sp, 40
+// 0x0105ee70: 0x105ee70: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x0105ee64: 0x105ee64: jal   0x1001984 addiu a1, s1, 48
+// 0x0105ee74: 0x105ee74: jal   0x1001984 addiu a1, s1, 512
 	ldloc 8
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
 	ldloc.0
@@ -4656,10 +4656,10 @@ L_105ee58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee6c: 0x105ee6c: addu  a1, v0, zero
+// 0x0105ee7c: 0x105ee7c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0105ee70: 0x105ee70: jal   0x1001b68 addiu a0, sp, 296
+// 0x0105ee80: 0x105ee80: jal   0x1001b68 addiu a0, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
@@ -4671,12 +4671,12 @@ L_105ee58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee78: 0x105ee78: addiu a1, s1, 48
+// 0x0105ee88: 0x105ee88: addiu a1, s1, 512
 	ldloc 8
-	ldc.i4.s 48
+	ldc.i4 512
 	add
 	stloc.2
-// 0x0105ee7c: 0x105ee7c: jal   0x1001984 addu  a0, zero, zero
+// 0x0105ee8c: 0x105ee8c: jal   0x1001984 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -4689,15 +4689,15 @@ L_105ee58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee84: 0x105ee84: addiu s2, sp, 552
+// 0x0105ee94: 0x105ee94: addiu s2, sp, 552
 	ldloc.0
 	ldc.i4 552
 	add
 	stloc 10
-// 0x0105ee88: 0x105ee88: addu  a0, s2, zero
+// 0x0105ee98: 0x105ee98: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0105ee8c: 0x105ee8c: jal   0x1001b68 addu  a1, v0, zero
+// 0x0105ee9c: 0x105ee9c: jal   0x1001b68 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -4707,22 +4707,22 @@ L_105ee58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ee94: 0x105ee94: lui   v0, 0x70000
+// 0x0105eea4: 0x105eea4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ee98: 0x105ee98: lw    v1, 12240(v0)
+// 0x0105eea8: 0x105eea8: lw    v1, 12704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ee9c: 0x105ee9c: addu  a0, zero, zero
+// 0x0105eeac: 0x105eeac: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105eea0: 0x105eea0: lw    v0, 48(v1)
+// 0x0105eeb0: 0x105eeb0: lw    v0, 48(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4731,8 +4731,8 @@ L_105ee58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105eea4: 0x105eea4: sll   zero, zero, 0
-// 0x0105eea8: 0x105eea8: sw    v0, 32(sp)
+// 0x0105eeb4: 0x105eeb4: sll   zero, zero, 0
+// 0x0105eeb8: 0x105eeb8: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4741,7 +4741,7 @@ L_105ee58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105eeac: 0x105eeac: lw    v1, 52(v1)
+// 0x0105eebc: 0x105eebc: lw    v1, 52(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4750,12 +4750,12 @@ L_105ee58:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105eeb0: 0x105eeb0: addiu v0, v0, 10
+// 0x0105eec0: 0x105eec0: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x0105eeb4: 0x105eeb4: sw    v1, 36(sp)
+// 0x0105eec4: 0x105eec4: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4764,7 +4764,7 @@ L_105ee58:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105eeb8: 0x105eeb8: jal   0x109a424 sw    v0, 32(sp)
+// 0x0105eec8: 0x105eec8: jal   0x109aa6c sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4778,23 +4778,23 @@ L_105ee58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105eec0: 0x105eec0: beq   v0, zero, 0x105ef2c addiu s1, sp, 296
+// 0x0105eed0: 0x105eed0: beq   v0, zero, 0x105ef3c addiu s1, sp, 296
 	ldloc 5
 	ldloc.0
 	ldc.i4 296
 	add
 	stloc 8
-	brfalse L_105ef2c
+	brfalse L_105ef3c
 // --- basic block ---
-// 0x0105eec8: 0x105eec8: lui   s1, 0x0
+// 0x0105eed8: 0x105eed8: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0105eecc: 0x105eecc: lw    v1, 14580(s1)
+// 0x0105eedc: 0x105eedc: lw    v1, 14580(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4803,40 +4803,40 @@ L_105ee58:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105eed0: 0x105eed0: addiu v0, zero, -1
+// 0x0105eee0: 0x105eee0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105eed4: 0x105eed4: bne   v1, v0, 0x105ef10 lui   v0, 0x0
+// 0x0105eee4: 0x105eee4: bne   v1, v0, 0x105ef20 lui   v0, 0x0
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_105ef10
+	bne.un L_105ef20
 // --- basic block ---
-// 0x0105eedc: 0x105eedc: addiu v0, sp, 28
+// 0x0105eeec: 0x105eeec: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x0105eee0: 0x105eee0: addu  a0, s2, zero
+// 0x0105eef0: 0x105eef0: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0105eee4: 0x105eee4: addiu a1, s0, -7
+// 0x0105eef4: 0x105eef4: addiu a1, s0, -7
 	ldloc 9
 	ldc.i4.s -7
 	add
 	stloc.2
-// 0x0105eee8: 0x105eee8: addiu a2, s1, 14580
+// 0x0105eef8: 0x105eef8: addiu a2, s1, 14580
 	ldloc 8
 	ldc.i4 14580
 	add
 	stloc.3
-// 0x0105eeec: 0x105eeec: addiu a3, sp, 24
+// 0x0105eefc: 0x105eefc: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x0105eef0: 0x105eef0: sw    v0, 16(sp)
+// 0x0105ef00: 0x105ef00: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4845,7 +4845,7 @@ L_105ee58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105eef4: 0x105eef4: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105ef04: 0x105ef04: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4859,12 +4859,12 @@ L_105ee58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105eefc: 0x105eefc: lw    v0, 14580(s1)
+// 0x0105ef0c: 0x105ef0c: lw    v0, 14580(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4873,13 +4873,13 @@ L_105ee58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ef00: 0x105ef00: sll   zero, zero, 0
-// 0x0105ef04: 0x105ef04: addiu v0, v0, 3
+// 0x0105ef10: 0x105ef10: sll   zero, zero, 0
+// 0x0105ef14: 0x105ef14: addiu v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	add
 	stloc 5
-// 0x0105ef08: 0x105ef08: sw    v0, 14580(s1)
+// 0x0105ef18: 0x105ef18: sw    v0, 14580(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4888,11 +4888,11 @@ L_105ee58:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ef0c: 0x105ef0c: lui   v0, 0x0
+// 0x0105ef1c: 0x105ef1c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_105ef10:
-// 0x0105ef10: 0x105ef10: lw    v1, 32(sp)
+L_105ef20:
+// 0x0105ef20: 0x105ef20: lw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4901,7 +4901,7 @@ L_105ef10:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ef14: 0x105ef14: lw    v0, 14580(v0)
+// 0x0105ef24: 0x105ef24: lw    v0, 14580(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4910,18 +4910,18 @@ L_105ef10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ef18: 0x105ef18: sll   zero, zero, 0
-// 0x0105ef1c: 0x105ef1c: addu  v0, v1, v0
+// 0x0105ef28: 0x105ef28: sll   zero, zero, 0
+// 0x0105ef2c: 0x105ef2c: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0105ef20: 0x105ef20: addiu v0, v0, 7
+// 0x0105ef30: 0x105ef30: addiu v0, v0, 7
 	ldloc 5
 	ldc.i4.7
 	add
 	stloc 5
-// 0x0105ef24: 0x105ef24: sw    v0, 32(sp)
+// 0x0105ef34: 0x105ef34: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4930,24 +4930,24 @@ L_105ef10:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ef28: 0x105ef28: addiu s1, sp, 296
+// 0x0105ef38: 0x105ef38: addiu s1, sp, 296
 	ldloc.0
 	ldc.i4 296
 	add
 	stloc 8
-L_105ef2c:
-// 0x0105ef2c: 0x105ef2c: addiu a0, sp, 32
+L_105ef3c:
+// 0x0105ef3c: 0x105ef3c: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0105ef30: 0x105ef30: addiu a1, zero, 2
+// 0x0105ef40: 0x105ef40: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105ef34: 0x105ef34: addu  a2, s0, zero
+// 0x0105ef44: 0x105ef44: addu  a2, s0, zero
 	ldloc 9
 	stloc.3
-// 0x0105ef38: 0x105ef38: jal   0x104ea60 addu  a3, s1, zero
+// 0x0105ef48: 0x105ef48: jal   0x104ea70 addu  a3, s1, zero
 	ldloc 8
 	stloc 4
 	ldloc.0
@@ -4955,27 +4955,27 @@ L_105ef2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ef40: 0x105ef40: lui   v0, 0x70000
+// 0x0105ef50: 0x105ef50: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ef44: 0x105ef44: lw    v1, 12240(v0)
+// 0x0105ef54: 0x105ef54: lw    v1, 12704(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ef48: 0x105ef48: addu  a0, zero, zero
+// 0x0105ef58: 0x105ef58: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105ef4c: 0x105ef4c: lw    v0, 48(v1)
+// 0x0105ef5c: 0x105ef5c: lw    v0, 48(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4984,8 +4984,8 @@ L_105ef2c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ef50: 0x105ef50: sll   zero, zero, 0
-// 0x0105ef54: 0x105ef54: sw    v0, 32(sp)
+// 0x0105ef60: 0x105ef60: sll   zero, zero, 0
+// 0x0105ef64: 0x105ef64: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4994,7 +4994,7 @@ L_105ef2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ef58: 0x105ef58: lw    v1, 52(v1)
+// 0x0105ef68: 0x105ef68: lw    v1, 52(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5003,12 +5003,12 @@ L_105ef2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105ef5c: 0x105ef5c: addiu v0, v0, 10
+// 0x0105ef6c: 0x105ef6c: addiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	add
 	stloc 5
-// 0x0105ef60: 0x105ef60: sw    v1, 36(sp)
+// 0x0105ef70: 0x105ef70: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5017,7 +5017,7 @@ L_105ef2c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105ef64: 0x105ef64: jal   0x109a424 sw    v0, 32(sp)
+// 0x0105ef74: 0x105ef74: jal   0x109aa6c sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5031,44 +5031,44 @@ L_105ef2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ef6c: 0x105ef6c: bne   v0, zero, 0x105efcc addiu a2, s0, -7
+// 0x0105ef7c: 0x105ef7c: bne   v0, zero, 0x105efdc addiu a2, s0, -7
 	ldloc 5
 	ldloc 9
 	ldc.i4.s -7
 	add
 	stloc.3
-	brtrue L_105efcc
+	brtrue L_105efdc
 // --- basic block ---
-// 0x0105ef74: 0x105ef74: lui   s2, 0x0
+// 0x0105ef84: 0x105ef84: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0105ef78: 0x105ef78: addu  a0, s1, zero
+// 0x0105ef88: 0x105ef88: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0105ef7c: 0x105ef7c: addiu v0, sp, 28
+// 0x0105ef8c: 0x105ef8c: addiu v0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 5
-// 0x0105ef80: 0x105ef80: addu  a1, s0, zero
+// 0x0105ef90: 0x105ef90: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0105ef84: 0x105ef84: addiu a2, s2, 14580
+// 0x0105ef94: 0x105ef94: addiu a2, s2, 14580
 	ldloc 10
 	ldc.i4 14580
 	add
 	stloc.3
-// 0x0105ef88: 0x105ef88: addiu a3, sp, 24
+// 0x0105ef98: 0x105ef98: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x0105ef8c: 0x105ef8c: sw    v0, 16(sp)
+// 0x0105ef9c: 0x105ef9c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5077,7 +5077,7 @@ L_105ef2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105ef90: 0x105ef90: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105efa0: 0x105efa0: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5091,12 +5091,12 @@ L_105ef2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ef98: 0x105ef98: lw    s1, 14580(s2)
+// 0x0105efa8: 0x105efa8: lw    s1, 14580(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5105,21 +5105,21 @@ L_105ef2c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105ef9c: 0x105ef9c: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0105efac: 0x105efac: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105efa4: 0x105efa4: bne   v0, zero, 0x105efb0 addiu v1, zero, 7
+// 0x0105efb4: 0x105efb4: bne   v0, zero, 0x105efc0 addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 6
-	brtrue L_105efb0
+	brtrue L_105efc0
 // --- basic block ---
-// 0x0105efac: 0x105efac: addiu v1, zero, 5
+// 0x0105efbc: 0x105efbc: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 6
-L_105efb0:
-// 0x0105efb0: 0x105efb0: lw    v0, 32(sp)
+L_105efc0:
+// 0x0105efc0: 0x105efc0: lw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5128,20 +5128,20 @@ L_105efb0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105efb4: 0x105efb4: addu  s1, v1, s1
+// 0x0105efc4: 0x105efc4: addu  s1, v1, s1
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x0105efb8: 0x105efb8: addu  v0, v0, s1
+// 0x0105efc8: 0x105efc8: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0105efbc: 0x105efbc: lui   v1, 0x0
+// 0x0105efcc: 0x105efcc: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0105efc0: 0x105efc0: sw    s1, 14580(v1)
+// 0x0105efd0: 0x105efd0: sw    s1, 14580(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5150,7 +5150,7 @@ L_105efb0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105efc4: 0x105efc4: sw    v0, 32(sp)
+// 0x0105efd4: 0x105efd4: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5159,21 +5159,21 @@ L_105efb0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105efc8: 0x105efc8: addiu a2, s0, -7
+// 0x0105efd8: 0x105efd8: addiu a2, s0, -7
 	ldloc 9
 	ldc.i4.s -7
 	add
 	stloc.3
-L_105efcc:
-// 0x0105efcc: 0x105efcc: addiu a0, sp, 32
+L_105efdc:
+// 0x0105efdc: 0x105efdc: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0105efd0: 0x105efd0: addiu a1, zero, 2
+// 0x0105efe0: 0x105efe0: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105efd4: 0x105efd4: jal   0x104ea60 addiu a3, sp, 552
+// 0x0105efe4: 0x105efe4: jal   0x104ea70 addiu a3, sp, 552
 	ldloc.0
 	ldc.i4 552
 	add
@@ -5183,14 +5183,14 @@ L_105efcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105efdc:
-// 0x0105efdc: 0x105efdc: lw    ra, 820(sp)
-// 0x0105efe0: 0x105efe0: lw    s2, 816(sp)
+L_105efec:
+// 0x0105efec: 0x105efec: lw    ra, 820(sp)
+// 0x0105eff0: 0x105eff0: lw    s2, 816(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5199,7 +5199,7 @@ L_105efdc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105efe4: 0x105efe4: lw    s1, 812(sp)
+// 0x0105eff4: 0x105eff4: lw    s1, 812(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5208,7 +5208,7 @@ L_105efdc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105efe8: 0x105efe8: lw    s0, 808(sp)
+// 0x0105eff8: 0x105eff8: lw    s0, 808(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5217,7 +5217,7 @@ L_105efdc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105efec: 0x105efec: jr    ra addiu sp, sp, 824
+// 0x0105effc: 0x105effc: jr    ra addiu sp, sp, 824
 	ldloc.0
 	ldc.i4 824
 	add
@@ -5229,7 +5229,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 CreateBgImage_105eff4(int32,int32,int32,int32,int32)
+.method public static int32 CreateBgImage_105f004(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s1,int32 s0,int32 s3,int32 ra,int32 lo)
@@ -5279,12 +5279,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105eff4: 0x105eff4: addiu sp, sp, -56
+// 0x0105f004: 0x105f004: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0105eff8: 0x105eff8: sw    s1, 40(sp)
+// 0x0105f008: 0x105f008: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5293,22 +5293,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105effc: 0x105effc: lui   s1, 0x70000
+// 0x0105f00c: 0x105f00c: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0105f000: 0x105f000: lw    a0, 12248(s1)
+// 0x0105f010: 0x105f010: lw    a0, 12712(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f004: 0x105f004: lui   v0, 0xf0000
+// 0x0105f014: 0x105f014: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x0105f008: 0x105f008: sw    s2, 44(sp)
+// 0x0105f018: 0x105f018: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5317,17 +5317,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105f00c: 0x105f00c: lw    s2, -30068(v0)
+// 0x0105f01c: 0x105f01c: lw    s2, -29604(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105f010: 0x105f010: sw    ra, 52(sp)
-// 0x0105f014: 0x105f014: sw    s3, 48(sp)
+// 0x0105f020: 0x105f020: sw    ra, 52(sp)
+// 0x0105f024: 0x105f024: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5336,7 +5336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105f018: 0x105f018: jal   0x104e020 sw    s0, 36(sp)
+// 0x0105f028: 0x105f028: jal   0x104e030 sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5346,15 +5346,15 @@ __CIBYL_javamethod_begin:
 	ldloc 10
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105f020: 0x105f020: addu  a1, v0, zero
+// 0x0105f030: 0x105f030: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x0105f024: 0x105f024: jal   0x104e170 addu  a0, s2, zero
+// 0x0105f034: 0x105f034: jal   0x104e180 addu  a0, s2, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5362,36 +5362,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_new_image_104e170(int32,int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_new_image_104e180(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105f02c: 0x105f02c: lw    a0, 12248(s1)
+// 0x0105f03c: 0x105f03c: lw    a0, 12712(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f030: 0x105f030: jal   0x104dffc addu  s0, v0, zero
+// 0x0105f040: 0x105f040: jal   0x104e00c addu  s0, v0, zero
 	ldloc 6
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105f038: 0x105f038: addu  s3, v0, zero
+// 0x0105f048: 0x105f048: addu  s3, v0, zero
 	ldloc 6
 	stloc 11
-// 0x0105f03c: 0x105f03c: addiu a0, zero, 16
+// 0x0105f04c: 0x105f04c: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-// 0x0105f040: 0x105f040: jal   0x1000910 sw    zero, 28(sp)
+// 0x0105f050: 0x105f050: jal   0x1000910 sw    zero, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5410,38 +5410,38 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105f048: 0x105f048: div   s2, s3
+// 0x0105f058: 0x105f058: div   s2, s3
 	ldloc 7
 	ldloc 11
 	div
 	stloc 13
-// 0x0105f04c: 0x105f04c: lw    a3, 12248(s1)
+// 0x0105f05c: 0x105f05c: lw    a3, 12712(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105f050: 0x105f050: addu  v1, v0, zero
+// 0x0105f060: 0x105f060: addu  v1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x0105f054: 0x105f054: addu  a2, v0, zero
+// 0x0105f064: 0x105f064: addu  a2, v0, zero
 	ldloc 6
 	stloc.3
-// 0x0105f058: 0x105f058: addu  a0, s0, zero
+// 0x0105f068: 0x105f068: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0105f05c: 0x105f05c: addiu v0, zero, 1
+// 0x0105f06c: 0x105f06c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0105f060: 0x105f060: addiu a1, sp, 24
+// 0x0105f070: 0x105f070: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0105f064: 0x105f064: sw    v0, 16(sp)
+// 0x0105f074: 0x105f074: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5450,7 +5450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105f068: 0x105f068: sw    zero, 24(sp)
+// 0x0105f078: 0x105f078: sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5459,7 +5459,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105f06c: 0x105f06c: sw    zero, 4(v1)
+// 0x0105f07c: 0x105f07c: sw    zero, 4(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5468,15 +5468,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105f070: 0x105f070: mflo  lo
+// 0x0105f080: 0x105f080: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x0105f074: 0x105f074: addiu s2, s2, 1
+// 0x0105f084: 0x105f084: addiu s2, s2, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0105f078: 0x105f078: jal   0x104def0 sw    s2, 0(v1)
+// 0x0105f088: 0x105f088: jal   0x104df00 sw    s2, 0(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5487,16 +5487,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl57::roadmap_canvas_copy_image_104def0(int32,int32,int32,int32)
+	call int32 Cibyl57::roadmap_canvas_copy_image_104df00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0105f080: 0x105f080: lw    ra, 52(sp)
-// 0x0105f084: 0x105f084: addu  v0, s0, zero
+// 0x0105f090: 0x105f090: lw    ra, 52(sp)
+// 0x0105f094: 0x105f094: addu  v0, s0, zero
 	ldloc 10
 	stloc 6
-// 0x0105f088: 0x105f088: lw    s3, 48(sp)
+// 0x0105f098: 0x105f098: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5505,7 +5505,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105f08c: 0x105f08c: lw    s2, 44(sp)
+// 0x0105f09c: 0x105f09c: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5514,7 +5514,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105f090: 0x105f090: lw    s1, 40(sp)
+// 0x0105f0a0: 0x105f0a0: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5523,7 +5523,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105f094: 0x105f094: lw    s0, 36(sp)
+// 0x0105f0a4: 0x105f0a4: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5532,7 +5532,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105f098: 0x105f098: jr    ra addiu sp, sp, 56
+// 0x0105f0a8: 0x105f0a8: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5544,7 +5544,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_bar_resize_105f0a0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_resize_105f0b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 s5,int32 s3,int32 s7,int32 s6,int32 s8,int32 lo,int32 s4,int32 ra)
@@ -5609,36 +5609,36 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105f0a0: 0x105f0a0: lui   v0, 0x70000
+// 0x0105f0b0: 0x105f0b0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f0a4: 0x105f0a4: lw    a0, 12244(v0)
+// 0x0105f0b4: 0x105f0b4: lw    a0, 12708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3061
+	ldc.i4 3177
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f0a8: 0x105f0a8: lui   v1, 0x0
+// 0x0105f0b8: 0x105f0b8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0105f0ac: 0x105f0ac: addiu sp, sp, -56
+// 0x0105f0bc: 0x105f0bc: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0105f0b0: 0x105f0b0: addiu v1, v1, 14584
+// 0x0105f0c0: 0x105f0c0: addiu v1, v1, 14584
 	ldloc 7
 	ldc.i4 14584
 	add
 	stloc 7
-// 0x0105f0b4: 0x105f0b4: lui   v0, 0x70000
+// 0x0105f0c4: 0x105f0c4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f0b8: 0x105f0b8: sw    ra, 52(sp)
-// 0x0105f0bc: 0x105f0bc: sw    s8, 48(sp)
+// 0x0105f0c8: 0x105f0c8: sw    ra, 52(sp)
+// 0x0105f0cc: 0x105f0cc: sw    s8, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5647,7 +5647,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105f0c0: 0x105f0c0: sw    s7, 44(sp)
+// 0x0105f0d0: 0x105f0d0: sw    s7, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5656,7 +5656,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105f0c4: 0x105f0c4: sw    s6, 40(sp)
+// 0x0105f0d4: 0x105f0d4: sw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5665,7 +5665,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105f0c8: 0x105f0c8: sw    s5, 36(sp)
+// 0x0105f0d8: 0x105f0d8: sw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5674,7 +5674,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105f0cc: 0x105f0cc: sw    s4, 32(sp)
+// 0x0105f0dc: 0x105f0dc: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5683,7 +5683,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0105f0d0: 0x105f0d0: sw    s3, 28(sp)
+// 0x0105f0e0: 0x105f0e0: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5692,7 +5692,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105f0d4: 0x105f0d4: sw    s2, 24(sp)
+// 0x0105f0e4: 0x105f0e4: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5701,7 +5701,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105f0d8: 0x105f0d8: sw    s1, 20(sp)
+// 0x0105f0e8: 0x105f0e8: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5710,7 +5710,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105f0dc: 0x105f0dc: sw    s0, 16(sp)
+// 0x0105f0ec: 0x105f0ec: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5719,31 +5719,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105f0e0: 0x105f0e0: beq   a0, zero, 0x105f0f0 sw    v1, 12240(v0)
+// 0x0105f0f0: 0x105f0f0: beq   a0, zero, 0x105f100 sw    v1, 12704(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_105f0f0
+	brfalse L_105f100
 // --- basic block ---
-// 0x0105f0e8: 0x105f0e8: jal   0x104ec70 sll   zero, zero, 0
+// 0x0105f0f8: 0x105f0f8: jal   0x104ec80 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105f0f0:
-// 0x0105f0f0: 0x105f0f0: jal   0x105eff4 lui   s3, 0x70000
+L_105f100:
+// 0x0105f100: 0x105f100: jal   0x105f004 lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 12
 	ldloc.0
@@ -5751,153 +5751,153 @@ L_105f0f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::CreateBgImage_105eff4(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::CreateBgImage_105f004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f0f8: 0x105f0f8: lw    a0, 12248(s3)
+// 0x0105f108: 0x105f108: lw    a0, 12712(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f0fc: 0x105f0fc: lui   s2, 0x70000
+// 0x0105f10c: 0x105f10c: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0105f100: 0x105f100: lui   v1, 0x70000
+// 0x0105f110: 0x105f110: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105f104: 0x105f104: lui   s4, 0x70000
+// 0x0105f114: 0x105f114: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 17
-// 0x0105f108: 0x105f108: lui   s1, 0x70000
+// 0x0105f118: 0x105f118: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105f10c: 0x105f10c: sw    v0, 12244(v1)
+// 0x0105f11c: 0x105f11c: sw    v0, 12708(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3061
+	ldc.i4 3177
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105f110: 0x105f110: lw    s6, 12276(s2)
+// 0x0105f120: 0x105f120: lw    s6, 12740(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105f114: 0x105f114: jal   0x104e020 sw    zero, 12264(s1)
+// 0x0105f124: 0x105f124: jal   0x104e030 sw    zero, 12728(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3066
+	ldc.i4 3182
 	add
 	ldc.i4.s 0
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f11c: 0x105f11c: lw    a0, 12256(s4)
+// 0x0105f12c: 0x105f12c: lw    a0, 12720(s4)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 3064
+	ldc.i4 3180
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f120: 0x105f120: jal   0x104e020 addu  s5, v0, zero
+// 0x0105f130: 0x105f130: jal   0x104e030 addu  s5, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f128: 0x105f128: jal   0x1042430 addu  s7, v0, zero
+// 0x0105f138: 0x105f138: jal   0x1042440 addu  s7, v0, zero
 	ldloc 5
 	stloc 13
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f130: 0x105f130: lui   v1, 0xf0000
+// 0x0105f140: 0x105f140: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0105f134: 0x105f134: lui   s0, 0x70000
+// 0x0105f144: 0x105f144: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105f138: 0x105f138: lw    v1, -30068(v1)
+// 0x0105f148: 0x105f148: lw    v1, -29604(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105f13c: 0x105f13c: subu  s5, s6, s5
+// 0x0105f14c: 0x105f14c: subu  s5, s6, s5
 	ldloc 14
 	ldloc 11
 	sub
 	stloc 11
-// 0x0105f140: 0x105f140: subu  v0, s5, v0
+// 0x0105f150: 0x105f150: subu  v0, s5, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105f144: 0x105f144: lw    s5, 12240(s0)
+// 0x0105f154: 0x105f154: lw    s5, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105f148: 0x105f148: addiu v1, v1, -10
+// 0x0105f158: 0x105f158: addiu v1, v1, -10
 	ldloc 7
 	ldc.i4.s -10
 	add
 	stloc 7
-// 0x0105f14c: 0x105f14c: lw    a0, 12248(s3)
+// 0x0105f15c: 0x105f15c: lw    a0, 12712(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f150: 0x105f150: subu  s7, v0, s7
+// 0x0105f160: 0x105f160: subu  s7, v0, s7
 	ldloc 5
 	ldloc 13
 	sub
 	stloc 13
-// 0x0105f154: 0x105f154: addiu s1, s1, 12264
+// 0x0105f164: 0x105f164: addiu s1, s1, 12728
 	ldloc 8
-	ldc.i4 12264
+	ldc.i4 12728
 	add
 	stloc 8
-// 0x0105f158: 0x105f158: addiu v0, zero, 5
+// 0x0105f168: 0x105f168: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x0105f15c: 0x105f15c: sw    s7, 4(s1)
+// 0x0105f16c: 0x105f16c: sw    s7, 4(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5906,7 +5906,7 @@ L_105f0f0:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105f160: 0x105f160: sw    v1, 36(s5)
+// 0x0105f170: 0x105f170: sw    v1, 36(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5915,7 +5915,7 @@ L_105f0f0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105f164: 0x105f164: sw    v0, 32(s5)
+// 0x0105f174: 0x105f174: sw    v0, 32(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5924,85 +5924,85 @@ L_105f0f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105f168: 0x105f168: lw    s6, 12276(s2)
+// 0x0105f178: 0x105f178: lw    s6, 12740(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105f16c: 0x105f16c: jal   0x104e020 addiu s1, zero, 2
+// 0x0105f17c: 0x105f17c: jal   0x104e030 addiu s1, zero, 2
 	ldc.i4.2
 	stloc 8
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f174: 0x105f174: jal   0x1042430 addu  s7, v0, zero
+// 0x0105f184: 0x105f184: jal   0x1042440 addu  s7, v0, zero
 	ldloc 5
 	stloc 13
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f17c: 0x105f17c: div   s7, s1
+// 0x0105f18c: 0x105f18c: div   s7, s1
 	ldloc 13
 	ldloc 8
 	div
 	stloc 16
-// 0x0105f180: 0x105f180: subu  v0, s6, v0
+// 0x0105f190: 0x105f190: subu  v0, s6, v0
 	ldloc 14
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105f184: 0x105f184: lw    s6, 12240(s0)
+// 0x0105f194: 0x105f194: lw    s6, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105f188: 0x105f188: lw    a0, 12248(s3)
+// 0x0105f198: 0x105f198: lw    a0, 12712(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f18c: 0x105f18c: lw    s7, 12276(s2)
+// 0x0105f19c: 0x105f19c: lw    s7, 12740(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105f190: 0x105f190: sw    zero, 0(s6)
+// 0x0105f1a0: 0x105f1a0: sw    zero, 0(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105f194: 0x105f194: mflo  lo
+// 0x0105f1a4: 0x105f1a4: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x0105f198: 0x105f198: subu  v0, v0, v1
+// 0x0105f1a8: 0x105f1a8: subu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 5
-// 0x0105f19c: 0x105f19c: jal   0x104e020 sw    v0, 24(s5)
+// 0x0105f1ac: 0x105f1ac: jal   0x104e030 sw    v0, 24(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6012,69 +6012,69 @@ L_105f0f0:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f1a4: 0x105f1a4: lw    a0, 12256(s4)
+// 0x0105f1b4: 0x105f1b4: lw    a0, 12720(s4)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 3064
+	ldc.i4 3180
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f1a8: 0x105f1a8: jal   0x104e020 addu  s5, v0, zero
+// 0x0105f1b8: 0x105f1b8: jal   0x104e030 addu  s5, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f1b0: 0x105f1b0: addu  s8, v0, zero
+// 0x0105f1c0: 0x105f1c0: addu  s8, v0, zero
 	ldloc 5
 	stloc 15
-// 0x0105f1b4: 0x105f1b4: jal   0x1042430 subu  s5, s7, s5
+// 0x0105f1c4: 0x105f1c4: jal   0x1042440 subu  s5, s7, s5
 	ldloc 13
 	ldloc 11
 	sub
 	stloc 11
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f1bc: 0x105f1bc: subu  s5, s5, v0
+// 0x0105f1cc: 0x105f1cc: subu  s5, s5, v0
 	ldloc 11
 	ldloc 5
 	sub
 	stloc 11
-// 0x0105f1c0: 0x105f1c0: addiu s5, s5, 2
+// 0x0105f1d0: 0x105f1d0: addiu s5, s5, 2
 	ldloc 11
 	ldc.i4.2
 	add
 	stloc 11
-// 0x0105f1c4: 0x105f1c4: subu  s8, s5, s8
+// 0x0105f1d4: 0x105f1d4: subu  s8, s5, s8
 	ldloc 11
 	ldloc 15
 	sub
 	stloc 15
-// 0x0105f1c8: 0x105f1c8: lui   a2, 0x10000
+// 0x0105f1d8: 0x105f1d8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f1cc: 0x105f1cc: addiu a2, a2, 12212
+// 0x0105f1dc: 0x105f1dc: addiu a2, a2, 12208
 	ldloc.3
-	ldc.i4 12212
+	ldc.i4 12208
 	add
 	stloc.3
-// 0x0105f1d0: 0x105f1d0: addiu a1, zero, 1
+// 0x0105f1e0: 0x105f1e0: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0105f1d4: 0x105f1d4: sw    s8, 4(s6)
+// 0x0105f1e4: 0x105f1e4: sw    s8, 4(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -6083,7 +6083,7 @@ L_105f0f0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105f1d8: 0x105f1d8: jal   0x10a1918 addu  a0, zero, zero
+// 0x0105f1e8: 0x105f1e8: jal   0x10a1f60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6091,57 +6091,57 @@ L_105f0f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f1e0: 0x105f1e0: lw    s6, 12240(s0)
+// 0x0105f1f0: 0x105f1f0: lw    s6, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105f1e4: 0x105f1e4: addu  a0, v0, zero
+// 0x0105f1f4: 0x105f1f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105f1e8: 0x105f1e8: lw    s8, 0(s6)
+// 0x0105f1f8: 0x105f1f8: lw    s8, 0(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 15
-// 0x0105f1ec: 0x105f1ec: jal   0x104dffc addu  s7, v0, zero
+// 0x0105f1fc: 0x105f1fc: jal   0x104e00c addu  s7, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f1f4: 0x105f1f4: div   v0, s1
+// 0x0105f204: 0x105f204: div   v0, s1
 	ldloc 5
 	ldloc 8
 	div
 	stloc 16
-// 0x0105f1f8: 0x105f1f8: lw    s5, 12240(s0)
+// 0x0105f208: 0x105f208: lw    s5, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105f1fc: 0x105f1fc: addu  a0, s7, zero
+// 0x0105f20c: 0x105f20c: addu  a0, s7, zero
 	ldloc 13
 	stloc.1
-// 0x0105f200: 0x105f200: lw    s7, 4(s5)
+// 0x0105f210: 0x105f210: lw    s7, 4(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6150,15 +6150,15 @@ L_105f0f0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105f204: 0x105f204: mflo  lo
+// 0x0105f214: 0x105f214: mflo  lo
 	ldloc 16
 	stloc 5
-// 0x0105f208: 0x105f208: addu  s8, v0, s8
+// 0x0105f218: 0x105f218: addu  s8, v0, s8
 	ldloc 5
 	ldloc 15
 	add
 	stloc 15
-// 0x0105f20c: 0x105f20c: jal   0x104e020 sw    s8, 8(s6)
+// 0x0105f21c: 0x105f21c: jal   0x104e030 sw    s8, 8(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -6168,43 +6168,43 @@ L_105f0f0:
 	ldloc 15
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f214: 0x105f214: div   v0, s1
+// 0x0105f224: 0x105f224: div   v0, s1
 	ldloc 5
 	ldloc 8
 	div
 	stloc 16
-// 0x0105f218: 0x105f218: lw    a0, 12256(s4)
+// 0x0105f228: 0x105f228: lw    a0, 12720(s4)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 3064
+	ldc.i4 3180
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f21c: 0x105f21c: lw    s4, 12240(s0)
+// 0x0105f22c: 0x105f22c: lw    s4, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105f220: 0x105f220: mflo  lo
+// 0x0105f230: 0x105f230: mflo  lo
 	ldloc 16
 	stloc 8
-// 0x0105f224: 0x105f224: addu  s7, s1, s7
+// 0x0105f234: 0x105f234: addu  s7, s1, s7
 	ldloc 8
 	ldloc 13
 	add
 	stloc 13
-// 0x0105f228: 0x105f228: jal   0x104dffc sw    s7, 12(s5)
+// 0x0105f238: 0x105f238: jal   0x104e00c sw    s7, 12(s5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6214,26 +6214,26 @@ L_105f0f0:
 	ldloc 13
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f230: 0x105f230: addiu v0, v0, -3
+// 0x0105f240: 0x105f240: addiu v0, v0, -3
 	ldloc 5
 	ldc.i4.s -3
 	add
 	stloc 5
-// 0x0105f234: 0x105f234: lw    a0, 12248(s3)
+// 0x0105f244: 0x105f244: lw    a0, 12712(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f238: 0x105f238: sw    v0, 16(s4)
+// 0x0105f248: 0x105f248: sw    v0, 16(s4)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
@@ -6242,95 +6242,95 @@ L_105f0f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105f23c: 0x105f23c: lw    s1, 12276(s2)
+// 0x0105f24c: 0x105f24c: lw    s1, 12740(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f240: 0x105f240: lw    s0, 12240(s0)
+// 0x0105f250: 0x105f250: lw    s0, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105f244: 0x105f244: jal   0x104e020 sll   zero, zero, 0
+// 0x0105f254: 0x105f254: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f24c: 0x105f24c: jal   0x1042430 addu  s3, v0, zero
+// 0x0105f25c: 0x105f25c: jal   0x1042440 addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f254: 0x105f254: jal   0x101fa28 addu  s2, v0, zero
+// 0x0105f264: 0x105f264: jal   0x101fa38 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105f25c: 0x105f25c: bne   v0, zero, 0x105f268 addiu v1, zero, 7
+// 0x0105f26c: 0x105f26c: bne   v0, zero, 0x105f278 addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 7
-	brtrue L_105f268
+	brtrue L_105f278
 // --- basic block ---
-// 0x0105f264: 0x105f264: addiu v1, zero, 5
+// 0x0105f274: 0x105f274: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-L_105f268:
-// 0x0105f268: 0x105f268: subu  s1, s1, s3
+L_105f278:
+// 0x0105f278: 0x105f278: subu  s1, s1, s3
 	ldloc 8
 	ldloc 12
 	sub
 	stloc 8
-// 0x0105f26c: 0x105f26c: subu  s2, s1, s2
+// 0x0105f27c: 0x105f27c: subu  s2, s1, s2
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 9
-// 0x0105f270: 0x105f270: lui   v0, 0xf0000
+// 0x0105f280: 0x105f280: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105f274: 0x105f274: subu  v1, s2, v1
+// 0x0105f284: 0x105f284: subu  v1, s2, v1
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 7
-// 0x0105f278: 0x105f278: lw    s2, -30068(v0)
+// 0x0105f288: 0x105f288: lw    s2, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105f27c: 0x105f27c: lui   v0, 0x70000
+// 0x0105f28c: 0x105f28c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f280: 0x105f280: lw    a0, 12252(v0)
+// 0x0105f290: 0x105f290: lw    a0, 12716(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3063
+	ldc.i4 3179
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f284: 0x105f284: sw    v1, 20(s0)
+// 0x0105f294: 0x105f294: sw    v1, 20(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6339,47 +6339,47 @@ L_105f268:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105f288: 0x105f288: lui   s0, 0x70000
+// 0x0105f298: 0x105f298: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105f28c: 0x105f28c: lw    s1, 12240(s0)
+// 0x0105f29c: 0x105f29c: lw    s1, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f290: 0x105f290: jal   0x104dffc addiu s2, s2, 3
+// 0x0105f2a0: 0x105f2a0: jal   0x104e00c addiu s2, s2, 3
 	ldloc 9
 	ldc.i4.3
 	add
 	stloc 9
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f298: 0x105f298: lui   v1, 0x70000
+// 0x0105f2a8: 0x105f2a8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105f29c: 0x105f29c: lw    a0, 12248(v1)
+// 0x0105f2ac: 0x105f2ac: lw    a0, 12712(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f2a0: 0x105f2a0: subu  v0, s2, v0
+// 0x0105f2b0: 0x105f2b0: subu  v0, s2, v0
 	ldloc 9
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105f2a4: 0x105f2a4: sw    v0, 48(s1)
+// 0x0105f2b4: 0x105f2b4: sw    v0, 48(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6388,86 +6388,86 @@ L_105f268:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105f2a8: 0x105f2a8: lui   v0, 0x70000
+// 0x0105f2b8: 0x105f2b8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f2ac: 0x105f2ac: lw    s0, 12240(s0)
+// 0x0105f2bc: 0x105f2bc: lw    s0, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105f2b0: 0x105f2b0: lw    s1, 12276(v0)
+// 0x0105f2c0: 0x105f2c0: lw    s1, 12740(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f2b4: 0x105f2b4: jal   0x104e020 sll   zero, zero, 0
+// 0x0105f2c4: 0x105f2c4: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f2bc: 0x105f2bc: jal   0x1042430 addu  s3, v0, zero
+// 0x0105f2cc: 0x105f2cc: jal   0x1042440 addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f2c4: 0x105f2c4: jal   0x101fa28 addu  s2, v0, zero
+// 0x0105f2d4: 0x105f2d4: jal   0x101fa38 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105f2cc: 0x105f2cc: bne   v0, zero, 0x105f2d8 addiu v1, zero, 7
+// 0x0105f2dc: 0x105f2dc: bne   v0, zero, 0x105f2e8 addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 7
-	brtrue L_105f2d8
+	brtrue L_105f2e8
 // --- basic block ---
-// 0x0105f2d4: 0x105f2d4: addiu v1, zero, 5
+// 0x0105f2e4: 0x105f2e4: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-L_105f2d8:
-// 0x0105f2d8: 0x105f2d8: subu  s1, s1, s3
+L_105f2e8:
+// 0x0105f2e8: 0x105f2e8: subu  s1, s1, s3
 	ldloc 8
 	ldloc 12
 	sub
 	stloc 8
-// 0x0105f2dc: 0x105f2dc: subu  s2, s1, s2
+// 0x0105f2ec: 0x105f2ec: subu  s2, s1, s2
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 9
-// 0x0105f2e0: 0x105f2e0: lui   v0, 0x70000
+// 0x0105f2f0: 0x105f2f0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f2e4: 0x105f2e4: subu  v1, s2, v1
+// 0x0105f2f4: 0x105f2f4: subu  v1, s2, v1
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 7
-// 0x0105f2e8: 0x105f2e8: lw    a0, 12252(v0)
+// 0x0105f2f8: 0x105f2f8: lw    a0, 12716(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3063
+	ldc.i4 3179
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f2ec: 0x105f2ec: sw    v1, 52(s0)
+// 0x0105f2fc: 0x105f2fc: sw    v1, 52(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6476,100 +6476,100 @@ L_105f2d8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105f2f0: 0x105f2f0: lui   v0, 0xf0000
+// 0x0105f300: 0x105f300: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105f2f4: 0x105f2f4: lui   s0, 0x70000
+// 0x0105f304: 0x105f304: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x0105f2f8: 0x105f2f8: lw    s2, 12240(s0)
+// 0x0105f308: 0x105f308: lw    s2, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105f2fc: 0x105f2fc: lw    s3, -30068(v0)
+// 0x0105f30c: 0x105f30c: lw    s3, -29604(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105f300: 0x105f300: jal   0x104dffc sll   zero, zero, 0
+// 0x0105f310: 0x105f310: jal   0x104e00c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f308: 0x105f308: addiu v1, zero, 366
+// 0x0105f318: 0x105f318: addiu v1, zero, 366
 	ldc.i4 366
 	stloc 7
-// 0x0105f30c: 0x105f30c: mult  v0, v1
+// 0x0105f31c: 0x105f31c: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 16
-// 0x0105f310: 0x105f310: addiu v1, zero, -1000
+// 0x0105f320: 0x105f320: addiu v1, zero, -1000
 	ldc.i4 -1000
 	stloc 7
-// 0x0105f314: 0x105f314: lui   a0, 0x70000
+// 0x0105f324: 0x105f324: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105f318: 0x105f318: lui   a1, 0x70000
+// 0x0105f328: 0x105f328: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x0105f31c: 0x105f31c: lw    a0, 12248(a0)
+// 0x0105f32c: 0x105f32c: lw    a0, 12712(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f320: 0x105f320: lw    s1, 12276(a1)
+// 0x0105f330: 0x105f330: lw    s1, 12740(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f324: 0x105f324: lw    s0, 12240(s0)
+// 0x0105f334: 0x105f334: lw    s0, 12704(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105f328: 0x105f328: mflo  lo
+// 0x0105f338: 0x105f338: mflo  lo
 	ldloc 16
 	stloc 5
-// 0x0105f32c: 0x105f32c: sll   zero, zero, 0
-// 0x0105f330: 0x105f330: sll   zero, zero, 0
-// 0x0105f334: 0x105f334: div   v0, v1
+// 0x0105f33c: 0x105f33c: sll   zero, zero, 0
+// 0x0105f340: 0x105f340: sll   zero, zero, 0
+// 0x0105f344: 0x105f344: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 16
-// 0x0105f338: 0x105f338: mflo  lo
+// 0x0105f348: 0x105f348: mflo  lo
 	ldloc 16
 	stloc 7
-// 0x0105f33c: 0x105f33c: addu  s3, v1, s3
+// 0x0105f34c: 0x105f34c: addu  s3, v1, s3
 	ldloc 7
 	ldloc 12
 	add
 	stloc 12
-// 0x0105f340: 0x105f340: jal   0x104e020 sw    s3, 40(s2)
+// 0x0105f350: 0x105f350: jal   0x104e030 sw    s3, 40(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -6579,52 +6579,52 @@ L_105f2d8:
 	ldloc 12
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f348: 0x105f348: jal   0x1042430 addu  s3, v0, zero
+// 0x0105f358: 0x105f358: jal   0x1042440 addu  s3, v0, zero
 	ldloc 5
 	stloc 12
-	call int32 Cibyl48::roadmap_bar_bottom_height_1042430()
+	call int32 Cibyl48::roadmap_bar_bottom_height_1042440()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f350: 0x105f350: jal   0x101fa28 addu  s2, v0, zero
+// 0x0105f360: 0x105f360: jal   0x101fa38 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105f358: 0x105f358: bne   v0, zero, 0x105f364 addiu v1, zero, 7
+// 0x0105f368: 0x105f368: bne   v0, zero, 0x105f374 addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 7
-	brtrue L_105f364
+	brtrue L_105f374
 // --- basic block ---
-// 0x0105f360: 0x105f360: addiu v1, zero, 5
+// 0x0105f370: 0x105f370: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-L_105f364:
-// 0x0105f364: 0x105f364: subu  s1, s1, s3
+L_105f374:
+// 0x0105f374: 0x105f374: subu  s1, s1, s3
 	ldloc 8
 	ldloc 12
 	sub
 	stloc 8
-// 0x0105f368: 0x105f368: subu  s2, s1, s2
+// 0x0105f378: 0x105f378: subu  s2, s1, s2
 	ldloc 8
 	ldloc 9
 	sub
 	stloc 9
-// 0x0105f36c: 0x105f36c: lw    ra, 52(sp)
-// 0x0105f370: 0x105f370: subu  v1, s2, v1
+// 0x0105f37c: 0x105f37c: lw    ra, 52(sp)
+// 0x0105f380: 0x105f380: subu  v1, s2, v1
 	ldloc 9
 	ldloc 7
 	sub
 	stloc 7
-// 0x0105f374: 0x105f374: sw    v1, 44(s0)
+// 0x0105f384: 0x105f384: sw    v1, 44(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6633,7 +6633,7 @@ L_105f364:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105f378: 0x105f378: lw    s8, 48(sp)
+// 0x0105f388: 0x105f388: lw    s8, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6642,7 +6642,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105f37c: 0x105f37c: lw    s7, 44(sp)
+// 0x0105f38c: 0x105f38c: lw    s7, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6651,7 +6651,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105f380: 0x105f380: lw    s6, 40(sp)
+// 0x0105f390: 0x105f390: lw    s6, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6660,7 +6660,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105f384: 0x105f384: lw    s5, 36(sp)
+// 0x0105f394: 0x105f394: lw    s5, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6669,7 +6669,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105f388: 0x105f388: lw    s4, 32(sp)
+// 0x0105f398: 0x105f398: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6678,7 +6678,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105f38c: 0x105f38c: lw    s3, 28(sp)
+// 0x0105f39c: 0x105f39c: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6687,7 +6687,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105f390: 0x105f390: lw    s2, 24(sp)
+// 0x0105f3a0: 0x105f3a0: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6696,7 +6696,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105f394: 0x105f394: lw    s1, 20(sp)
+// 0x0105f3a4: 0x105f3a4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6705,7 +6705,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f398: 0x105f398: lw    s0, 16(sp)
+// 0x0105f3a8: 0x105f3a8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6714,7 +6714,7 @@ L_105f364:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105f39c: 0x105f39c: jr    ra addiu sp, sp, 56
+// 0x0105f3ac: 0x105f3ac: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -6726,7 +6726,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_bar_initialize_105f3a4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_initialize_105f3b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -6770,13 +6770,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105f3a4: 0x105f3a4: addiu sp, sp, -32
+// 0x0105f3b4: 0x105f3b4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0105f3a8: 0x105f3a8: sw    ra, 28(sp)
-// 0x0105f3ac: 0x105f3ac: sw    s2, 24(sp)
+// 0x0105f3b8: 0x105f3b8: sw    ra, 28(sp)
+// 0x0105f3bc: 0x105f3bc: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6785,7 +6785,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105f3b0: 0x105f3b0: sw    s1, 20(sp)
+// 0x0105f3c0: 0x105f3c0: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6794,7 +6794,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105f3b4: 0x105f3b4: jal   0x101fad4 sw    s0, 16(sp)
+// 0x0105f3c4: 0x105f3c4: jal   0x101fae4 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6803,35 +6803,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105f3bc: 0x105f3bc: beq   v0, zero, 0x105f3e8 lui   s0, 0x70000
+// 0x0105f3cc: 0x105f3cc: beq   v0, zero, 0x105f3f8 lui   s0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 9
-	brfalse L_105f3e8
+	brfalse L_105f3f8
 // --- basic block ---
-// 0x0105f3c4: 0x105f3c4: lui   a1, 0x10000
+// 0x0105f3d4: 0x105f3d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105f3c8: 0x105f3c8: lui   a3, 0x10000
+// 0x0105f3d8: 0x105f3d8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105f3cc: 0x105f3cc: addiu a1, a1, 12092
+// 0x0105f3dc: 0x105f3dc: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105f3d0: 0x105f3d0: addiu a3, a3, 12128
+// 0x0105f3e0: 0x105f3e0: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105f3d4: 0x105f3d4: addiu a0, zero, 2
+// 0x0105f3e4: 0x105f3e4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105f3d8: 0x105f3d8: jal   0x100449c addiu a2, zero, 486
+// 0x0105f3e8: 0x105f3e8: jal   0x100449c addiu a2, zero, 486
 	ldc.i4 486
 	stloc.3
 	ldloc.0
@@ -6844,48 +6844,48 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f3e0: 0x105f3e0: j	 0x105f504 sll   zero, zero, 0
-	br L_105f504
+// 0x0105f3f0: 0x105f3f0: j	 0x105f514 sll   zero, zero, 0
+	br L_105f514
 // --- basic block ---
-L_105f3e8:
-// 0x0105f3e8: 0x105f3e8: lw    v0, 11972(s0)
+L_105f3f8:
+// 0x0105f3f8: 0x105f3f8: lw    v0, 12436(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f3ec: 0x105f3ec: sll   zero, zero, 0
-// 0x0105f3f0: 0x105f3f0: bne   v0, zero, 0x105f504 lui   s1, 0x10000
+// 0x0105f3fc: 0x105f3fc: sll   zero, zero, 0
+// 0x0105f400: 0x105f400: bne   v0, zero, 0x105f514 lui   s1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
-	brtrue L_105f504
+	brtrue L_105f514
 // --- basic block ---
-// 0x0105f3f8: 0x105f3f8: lui   s2, 0x10000
+// 0x0105f408: 0x105f408: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x0105f3fc: 0x105f3fc: lui   a1, 0x0
+// 0x0105f40c: 0x105f40c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105f400: 0x105f400: addiu a1, a1, 14512
+// 0x0105f410: 0x105f410: addiu a1, a1, 14512
 	ldloc.2
 	ldc.i4 14512
 	add
 	stloc.2
-// 0x0105f404: 0x105f404: addiu a0, s1, 12560
+// 0x0105f414: 0x105f414: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105f408: 0x105f408: addiu a2, s2, 12232
+// 0x0105f418: 0x105f418: addiu a2, s2, 12228
 	ldloc 10
-	ldc.i4 12232
+	ldc.i4 12228
 	add
 	stloc.3
-// 0x0105f40c: 0x105f40c: jal   0x100edb0 addu  a3, zero, zero
+// 0x0105f41c: 0x105f41c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6893,30 +6893,30 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f414: 0x105f414: lui   a1, 0x0
+// 0x0105f424: 0x105f424: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105f418: 0x105f418: addiu a1, a1, 14528
+// 0x0105f428: 0x105f428: addiu a1, a1, 14528
 	ldloc.2
 	ldc.i4 14528
 	add
 	stloc.2
-// 0x0105f41c: 0x105f41c: addiu a2, s2, 12232
+// 0x0105f42c: 0x105f42c: addiu a2, s2, 12228
 	ldloc 10
-	ldc.i4 12232
+	ldc.i4 12228
 	add
 	stloc.3
-// 0x0105f420: 0x105f420: addiu a0, s1, 12560
+// 0x0105f430: 0x105f430: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105f424: 0x105f424: jal   0x100edb0 addu  a3, zero, zero
+// 0x0105f434: 0x105f434: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6924,33 +6924,33 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f42c: 0x105f42c: lui   a1, 0x0
+// 0x0105f43c: 0x105f43c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105f430: 0x105f430: lui   a2, 0x0
+// 0x0105f440: 0x105f440: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0105f434: 0x105f434: addiu a1, a1, 14544
+// 0x0105f444: 0x105f444: addiu a1, a1, 14544
 	ldloc.2
 	ldc.i4 14544
 	add
 	stloc.2
-// 0x0105f438: 0x105f438: addiu a2, a2, 24152
+// 0x0105f448: 0x105f448: addiu a2, a2, 24152
 	ldloc.3
 	ldc.i4 24152
 	add
 	stloc.3
-// 0x0105f43c: 0x105f43c: addiu a0, s1, 12560
+// 0x0105f44c: 0x105f44c: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105f440: 0x105f440: jal   0x100edb0 addu  a3, zero, zero
+// 0x0105f450: 0x105f450: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6958,33 +6958,33 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f448: 0x105f448: lui   a1, 0x0
+// 0x0105f458: 0x105f458: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0105f44c: 0x105f44c: lui   a2, 0x10000
+// 0x0105f45c: 0x105f45c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f450: 0x105f450: addu  a3, zero, zero
+// 0x0105f460: 0x105f460: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0105f454: 0x105f454: addiu a0, s1, 12560
+// 0x0105f464: 0x105f464: addiu a0, s1, 12556
 	ldloc 8
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0105f458: 0x105f458: addiu a1, a1, 14560
+// 0x0105f468: 0x105f468: addiu a1, a1, 14560
 	ldloc.2
 	ldc.i4 14560
 	add
 	stloc.2
-// 0x0105f45c: 0x105f45c: jal   0x100edb0 addiu a2, a2, 12236
+// 0x0105f46c: 0x105f46c: jal   0x100edc0 addiu a2, a2, 12232
 	ldloc.3
-	ldc.i4 12236
+	ldc.i4 12232
 	add
 	stloc.3
 	ldloc.0
@@ -6992,46 +6992,46 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f464: 0x105f464: lui   v0, 0xf0000
+// 0x0105f474: 0x105f474: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0105f468: 0x105f468: lw    v1, -30072(v0)
+// 0x0105f478: 0x105f478: lw    v1, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105f46c: 0x105f46c: lui   a2, 0x10000
+// 0x0105f47c: 0x105f47c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f470: 0x105f470: addiu a2, a2, 12240
+// 0x0105f480: 0x105f480: addiu a2, a2, 12236
 	ldloc.3
-	ldc.i4 12240
+	ldc.i4 12236
 	add
 	stloc.3
-// 0x0105f474: 0x105f474: addu  a0, zero, zero
+// 0x0105f484: 0x105f484: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105f478: 0x105f478: addiu a1, zero, 3
+// 0x0105f488: 0x105f488: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0105f47c: 0x105f47c: lui   v0, 0x70000
+// 0x0105f48c: 0x105f48c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f480: 0x105f480: jal   0x10a1918 sw    v1, 12276(v0)
+// 0x0105f490: 0x105f490: jal   0x10a1f60 sw    v1, 12740(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldloc 6
 	stelem.i4
@@ -7040,34 +7040,34 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f488: 0x105f488: lui   a2, 0x10000
+// 0x0105f498: 0x105f498: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f48c: 0x105f48c: lui   v1, 0x70000
+// 0x0105f49c: 0x105f49c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105f490: 0x105f490: addiu a2, a2, 12256
+// 0x0105f4a0: 0x105f4a0: addiu a2, a2, 12252
 	ldloc.3
-	ldc.i4 12256
+	ldc.i4 12252
 	add
 	stloc.3
-// 0x0105f494: 0x105f494: addu  a0, zero, zero
+// 0x0105f4a4: 0x105f4a4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105f498: 0x105f498: addiu a1, zero, 3
+// 0x0105f4a8: 0x105f4a8: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0105f49c: 0x105f49c: jal   0x10a1918 sw    v0, 12248(v1)
+// 0x0105f4ac: 0x105f4ac: jal   0x10a1f60 sw    v0, 12712(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3062
+	ldc.i4 3178
 	add
 	ldloc 5
 	stelem.i4
@@ -7076,34 +7076,34 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f4a4: 0x105f4a4: lui   a2, 0x10000
+// 0x0105f4b4: 0x105f4b4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f4a8: 0x105f4a8: lui   v1, 0x70000
+// 0x0105f4b8: 0x105f4b8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105f4ac: 0x105f4ac: addiu a2, a2, 12268
+// 0x0105f4bc: 0x105f4bc: addiu a2, a2, 12264
 	ldloc.3
-	ldc.i4 12268
+	ldc.i4 12264
 	add
 	stloc.3
-// 0x0105f4b0: 0x105f4b0: addu  a0, zero, zero
+// 0x0105f4c0: 0x105f4c0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105f4b4: 0x105f4b4: addiu a1, zero, 3
+// 0x0105f4c4: 0x105f4c4: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0105f4b8: 0x105f4b8: jal   0x10a1918 sw    v0, 12252(v1)
+// 0x0105f4c8: 0x105f4c8: jal   0x10a1f60 sw    v0, 12716(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3063
+	ldc.i4 3179
 	add
 	ldloc 5
 	stelem.i4
@@ -7112,34 +7112,34 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f4c0: 0x105f4c0: lui   a2, 0x10000
+// 0x0105f4d0: 0x105f4d0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f4c4: 0x105f4c4: addiu a2, a2, 12292
+// 0x0105f4d4: 0x105f4d4: addiu a2, a2, 12288
 	ldloc.3
-	ldc.i4 12292
+	ldc.i4 12288
 	add
 	stloc.3
-// 0x0105f4c8: 0x105f4c8: addu  a0, zero, zero
+// 0x0105f4d8: 0x105f4d8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0105f4cc: 0x105f4cc: addiu a1, zero, 3
+// 0x0105f4dc: 0x105f4dc: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0105f4d0: 0x105f4d0: lui   v1, 0x70000
+// 0x0105f4e0: 0x105f4e0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105f4d4: 0x105f4d4: jal   0x10a1918 sw    v0, 12256(v1)
+// 0x0105f4e4: 0x105f4e4: jal   0x10a1f60 sw    v0, 12720(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3064
+	ldc.i4 3180
 	add
 	ldloc 5
 	stelem.i4
@@ -7148,20 +7148,20 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f4dc: 0x105f4dc: lui   v1, 0x70000
+// 0x0105f4ec: 0x105f4ec: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105f4e0: 0x105f4e0: jal   0x105f0a0 sw    v0, 12260(v1)
+// 0x0105f4f0: 0x105f4f0: jal   0x105f0b0 sw    v0, 12724(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3065
+	ldc.i4 3181
 	add
 	ldloc 5
 	stelem.i4
@@ -7170,52 +7170,52 @@ L_105f3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_resize_105f0a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_resize_105f0b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f4e8: 0x105f4e8: lui   a0, 0x1060000
+// 0x0105f4f8: 0x105f4f8: lui   a0, 0x1060000
 	ldc.i4 17170432
 	stloc.1
-// 0x0105f4ec: 0x105f4ec: addiu v0, zero, 1
+// 0x0105f4fc: 0x105f4fc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105f4f0: 0x105f4f0: addiu a0, a0, -1964
+// 0x0105f500: 0x105f500: addiu a0, a0, -1948
 	ldloc.1
-	ldc.i4 -1964
+	ldc.i4 -1948
 	add
 	stloc.1
-// 0x0105f4f4: 0x105f4f4: jal   0x101f970 sw    v0, 11972(s0)
+// 0x0105f504: 0x105f504: jal   0x101f980 sw    v0, 12436(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f4fc: 0x105f4fc: lui   v1, 0x70000
+// 0x0105f50c: 0x105f50c: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105f500: 0x105f500: sw    v0, 12236(v1)
+// 0x0105f510: 0x105f510: sw    v0, 12700(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3059
+	ldc.i4 3175
 	add
 	ldloc 5
 	stelem.i4
-L_105f504:
-// 0x0105f504: 0x105f504: lw    ra, 28(sp)
-// 0x0105f508: 0x105f508: lw    s2, 24(sp)
+L_105f514:
+// 0x0105f514: 0x105f514: lw    ra, 28(sp)
+// 0x0105f518: 0x105f518: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7224,7 +7224,7 @@ L_105f504:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105f50c: 0x105f50c: lw    s1, 20(sp)
+// 0x0105f51c: 0x105f51c: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7233,7 +7233,7 @@ L_105f504:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f510: 0x105f510: lw    s0, 16(sp)
+// 0x0105f520: 0x105f520: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7242,7 +7242,7 @@ L_105f504:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105f514: 0x105f514: jr    ra addiu sp, sp, 32
+// 0x0105f524: 0x105f524: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl71.j b/converted/Cibyl71.j
index 65fcd3d..2e8db80 100644
--- a/converted/Cibyl71.j
+++ b/converted/Cibyl71.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl71::.ctor
 
-.method public static int32 T_159_105f51c(int32,int32,int32,int32,int32)
+.method public static int32 T_159_105f52c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 lo,int32 s3,int32 hi,int32 s1,int32 ra)
@@ -94,27 +94,27 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105f51c: 0x105f51c: lui   v0, 0x70000
+// 0x0105f52c: 0x105f52c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f520: 0x105f520: lw    v0, 11972(v0)
+// 0x0105f530: 0x105f530: lw    v0, 12436(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f524: 0x105f524: addiu sp, sp, -200
+// 0x0105f534: 0x105f534: addiu sp, sp, -200
 	ldloc.0
 	ldc.i4 -200
 	add
 	stloc.0
-// 0x0105f528: 0x105f528: addiu v1, zero, 1
+// 0x0105f538: 0x105f538: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0105f52c: 0x105f52c: sw    s3, 192(sp)
+// 0x0105f53c: 0x105f53c: sw    s3, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -123,8 +123,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105f530: 0x105f530: sw    ra, 196(sp)
-// 0x0105f534: 0x105f534: sw    s2, 188(sp)
+// 0x0105f540: 0x105f540: sw    ra, 196(sp)
+// 0x0105f544: 0x105f544: sw    s2, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -133,7 +133,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105f538: 0x105f538: sw    s1, 184(sp)
+// 0x0105f548: 0x105f548: sw    s1, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -142,7 +142,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105f53c: 0x105f53c: sw    s0, 180(sp)
+// 0x0105f54c: 0x105f54c: sw    s0, 180(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -151,14 +151,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105f540: 0x105f540: bne   v0, v1, 0x105f838 addu  s3, a0, zero
+// 0x0105f550: 0x105f550: bne   v0, v1, 0x105f848 addu  s3, a0, zero
 	ldloc 5
 	ldloc 6
 	ldloc.1
 	stloc 11
-	bne.un L_105f838
+	bne.un L_105f848
 // --- basic block ---
-// 0x0105f548: 0x105f548: sw    zero, 36(sp)
+// 0x0105f558: 0x105f558: sw    zero, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -167,7 +167,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105f54c: 0x105f54c: jal   0x101fad4 sw    zero, 40(sp)
+// 0x0105f55c: 0x105f55c: jal   0x101fae4 sw    zero, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -176,32 +176,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105f554: 0x105f554: beq   v0, zero, 0x105f57c lui   a1, 0x10000
+// 0x0105f564: 0x105f564: beq   v0, zero, 0x105f58c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_105f57c
+	brfalse L_105f58c
 // --- basic block ---
-// 0x0105f55c: 0x105f55c: lui   a3, 0x10000
+// 0x0105f56c: 0x105f56c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105f560: 0x105f560: addiu a1, a1, 12092
+// 0x0105f570: 0x105f570: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105f564: 0x105f564: addiu a3, a3, 12128
+// 0x0105f574: 0x105f574: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105f568: 0x105f568: addiu a0, zero, 2
+// 0x0105f578: 0x105f578: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105f56c: 0x105f56c: jal   0x100449c addiu a2, zero, 623
+// 0x0105f57c: 0x105f57c: jal   0x100449c addiu a2, zero, 623
 	ldc.i4 623
 	stloc.3
 	ldloc.0
@@ -214,30 +214,30 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f574: 0x105f574: j	 0x105f838 sll   zero, zero, 0
-	br L_105f838
+// 0x0105f584: 0x105f584: j	 0x105f848 sll   zero, zero, 0
+	br L_105f848
 // --- basic block ---
-L_105f57c:
-// 0x0105f57c: 0x105f57c: bltz  s3, 0x105f838 sll   zero, zero, 0
+L_105f58c:
+// 0x0105f58c: 0x105f58c: bltz  s3, 0x105f848 sll   zero, zero, 0
 	ldloc 11
 	ldc.i4.s 0
-	blt L_105f838
+	blt L_105f848
 // --- basic block ---
-// 0x0105f584: 0x105f584: jal   0x1007df4 addu  a0, s3, zero
+// 0x0105f594: 0x105f594: jal   0x1007e04 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105f58c: 0x105f58c: blez  v0, 0x105f600 addu  a0, s3, zero
+// 0x0105f59c: 0x105f59c: blez  v0, 0x105f610 addu  a0, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
 	ldc.i4.s 0
-	ble L_105f600
+	ble L_105f610
 // --- basic block ---
-// 0x0105f594: 0x105f594: jal   0x1007e18 sw    v0, 168(sp)
+// 0x0105f5a4: 0x105f5a4: jal   0x1007e28 sw    v0, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -247,12 +247,12 @@ L_105f57c:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f59c: 0x105f59c: lw    a3, 168(sp)
+// 0x0105f5ac: 0x105f5ac: lw    a3, 168(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -261,24 +261,24 @@ L_105f57c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0105f5a0: 0x105f5a0: sll   zero, zero, 0
-// 0x0105f5a4: 0x105f5a4: slti  v1, a3, 10
+// 0x0105f5b0: 0x105f5b0: sll   zero, zero, 0
+// 0x0105f5b4: 0x105f5b4: slti  v1, a3, 10
 	ldloc 4
 	ldc.i4.s 10
 	clt
 	stloc 6
-// 0x0105f5a8: 0x105f5a8: beq   v1, zero, 0x105f5dc addiu s2, sp, 64
+// 0x0105f5b8: 0x105f5b8: beq   v1, zero, 0x105f5ec addiu s2, sp, 64
 	ldloc 6
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 9
-	brfalse L_105f5dc
+	brfalse L_105f5ec
 // --- basic block ---
-// 0x0105f5b0: 0x105f5b0: addiu v1, zero, 10
+// 0x0105f5c0: 0x105f5c0: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x0105f5b4: 0x105f5b4: div   v0, v1
+// 0x0105f5c4: 0x105f5c4: div   v0, v1
 	ldloc 5
 	ldloc 6
 	ldloc 5
@@ -287,24 +287,24 @@ L_105f57c:
 	stloc 10
 	rem
 	stloc 12
-// 0x0105f5b8: 0x105f5b8: lui   a2, 0x10000
+// 0x0105f5c8: 0x105f5c8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f5bc: 0x105f5bc: addu  a0, s2, zero
+// 0x0105f5cc: 0x105f5cc: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0105f5c0: 0x105f5c0: addiu a2, a2, 8928
+// 0x0105f5d0: 0x105f5d0: addiu a2, a2, 8924
 	ldloc.3
-	ldc.i4 8928
+	ldc.i4 8924
 	add
 	stloc.3
-// 0x0105f5c4: 0x105f5c4: addiu a1, zero, 100
+// 0x0105f5d4: 0x105f5d4: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0105f5c8: 0x105f5c8: mfhi  hi
+// 0x0105f5d8: 0x105f5d8: mfhi  hi
 	ldloc 12
 	stloc 5
-// 0x0105f5cc: 0x105f5cc: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0105f5dc: 0x105f5dc: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -323,22 +323,22 @@ L_105f57c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f5d4: 0x105f5d4: j	 0x105f5f0 sll   zero, zero, 0
-	br L_105f5f0
+// 0x0105f5e4: 0x105f5e4: j	 0x105f600 sll   zero, zero, 0
+	br L_105f600
 // --- basic block ---
-L_105f5dc:
-// 0x0105f5dc: 0x105f5dc: lui   a2, 0x20000
-	ldc.i4 131072
+L_105f5ec:
+// 0x0105f5ec: 0x105f5ec: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0105f5e0: 0x105f5e0: addu  a0, s2, zero
+// 0x0105f5f0: 0x105f5f0: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0105f5e4: 0x105f5e4: addiu a2, a2, -13884
+// 0x0105f5f4: 0x105f5f4: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0105f5e8: 0x105f5e8: jal   0x1000f9c addiu a1, zero, 100
+// 0x0105f5f8: 0x105f5f8: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -351,53 +351,53 @@ L_105f5dc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105f5f0:
-// 0x0105f5f0: 0x105f5f0: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+L_105f600:
+// 0x0105f600: 0x105f600: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0105f5f8: 0x105f5f8: j	 0x105f6d8 sll   zero, zero, 0
-	br L_105f6d8
+// 0x0105f608: 0x105f608: j	 0x105f6e8 sll   zero, zero, 0
+	br L_105f6e8
 // --- basic block ---
-L_105f600:
-// 0x0105f600: 0x105f600: jal   0x1008478 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_is_metric_1008478()
+L_105f610:
+// 0x0105f610: 0x105f610: jal   0x1008488 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_is_metric_1008488()
 	stloc 5
 // --- basic block ---
-// 0x0105f608: 0x105f608: bne   v0, zero, 0x105f6b0 sll   zero, zero, 0
+// 0x0105f618: 0x105f618: bne   v0, zero, 0x105f6c0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_105f6b0
+	brtrue L_105f6c0
 // --- basic block ---
-// 0x0105f610: 0x105f610: jal   0x1007e18 addu  a0, s3, zero
+// 0x0105f620: 0x105f620: jal   0x1007e28 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f618: 0x105f618: addiu s2, sp, 64
+// 0x0105f628: 0x105f628: addiu s2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 9
-// 0x0105f61c: 0x105f61c: addiu s1, sp, 44
+// 0x0105f62c: 0x105f62c: addiu s1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 13
-// 0x0105f620: 0x105f620: blez  v0, 0x105f658 lui   s0, 0x10000
+// 0x0105f630: 0x105f630: blez  v0, 0x105f668 lui   s0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
 	ldc.i4.s 0
-	ble L_105f658
+	ble L_105f668
 // --- basic block ---
-// 0x0105f628: 0x105f628: addiu a3, zero, 10
+// 0x0105f638: 0x105f638: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x0105f62c: 0x105f62c: div   v0, a3
+// 0x0105f63c: 0x105f63c: div   v0, a3
 	ldloc 5
 	ldloc 4
 	ldloc 5
@@ -406,21 +406,21 @@ L_105f600:
 	stloc 10
 	rem
 	stloc 12
-// 0x0105f630: 0x105f630: lui   a2, 0x10000
+// 0x0105f640: 0x105f640: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f634: 0x105f634: addiu a2, a2, 9672
+// 0x0105f644: 0x105f644: addiu a2, a2, 9668
 	ldloc.3
-	ldc.i4 9672
+	ldc.i4 9668
 	add
 	stloc.3
-// 0x0105f638: 0x105f638: addu  a0, s2, zero
+// 0x0105f648: 0x105f648: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0105f63c: 0x105f63c: mfhi  hi
+// 0x0105f64c: 0x105f64c: mfhi  hi
 	ldloc 12
 	stloc 4
-// 0x0105f640: 0x105f640: jal   0x1000f9c addiu a1, zero, 100
+// 0x0105f650: 0x105f650: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -433,15 +433,15 @@ L_105f600:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f648: 0x105f648: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x0105f658: 0x105f658: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0105f650: 0x105f650: j	 0x105f698 sll   zero, zero, 0
-	br L_105f698
+// 0x0105f660: 0x105f660: j	 0x105f6a8 sll   zero, zero, 0
+	br L_105f6a8
 // --- basic block ---
-L_105f658:
-// 0x0105f658: 0x105f658: jal   0x1007db4 addu  a0, s3, zero
+L_105f668:
+// 0x0105f668: 0x105f668: jal   0x1007dc4 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -449,15 +449,15 @@ L_105f658:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f660: 0x105f660: addiu v1, zero, 25
+// 0x0105f670: 0x105f670: addiu v1, zero, 25
 	ldc.i4.s 25
 	stloc 6
-// 0x0105f664: 0x105f664: div   v0, v1
+// 0x0105f674: 0x105f674: div   v0, v1
 	ldloc 5
 	ldloc 6
 	ldloc 5
@@ -466,31 +466,31 @@ L_105f658:
 	stloc 10
 	rem
 	stloc 12
-// 0x0105f668: 0x105f668: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x0105f678: 0x105f678: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0105f66c: 0x105f66c: addiu a2, a2, -13884
+// 0x0105f67c: 0x105f67c: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0105f670: 0x105f670: addu  a0, s2, zero
+// 0x0105f680: 0x105f680: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x0105f674: 0x105f674: mflo  lo
+// 0x0105f684: 0x105f684: mflo  lo
 	ldloc 10
 	stloc 4
-// 0x0105f678: 0x105f678: sll   zero, zero, 0
-// 0x0105f67c: 0x105f67c: sll   zero, zero, 0
-// 0x0105f680: 0x105f680: mult  a3, v1
+// 0x0105f688: 0x105f688: sll   zero, zero, 0
+// 0x0105f68c: 0x105f68c: sll   zero, zero, 0
+// 0x0105f690: 0x105f690: mult  a3, v1
 	ldloc 4
 	ldloc 6
 	mul
 	stloc 10
-// 0x0105f684: 0x105f684: mflo  lo
+// 0x0105f694: 0x105f694: mflo  lo
 	ldloc 10
 	stloc 4
-// 0x0105f688: 0x105f688: jal   0x1000f9c addiu a1, zero, 100
+// 0x0105f698: 0x105f698: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -503,12 +503,12 @@ L_105f658:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f690: 0x105f690: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x0105f6a0: 0x105f6a0: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-L_105f698:
-// 0x0105f698: 0x105f698: jal   0x101cd60 addu  a0, v0, zero
+L_105f6a8:
+// 0x0105f6a8: 0x105f6a8: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -516,26 +516,26 @@ L_105f698:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f6a0: 0x105f6a0: addu  a3, v0, zero
+// 0x0105f6b0: 0x105f6b0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105f6a4: 0x105f6a4: addu  a0, s1, zero
+// 0x0105f6b4: 0x105f6b4: addu  a0, s1, zero
 	ldloc 13
 	stloc.1
-// 0x0105f6a8: 0x105f6a8: j	 0x105f6f0 addiu a2, s0, 19912
+// 0x0105f6b8: 0x105f6b8: j	 0x105f700 addiu a2, s0, 20332
 	ldloc 8
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-	br L_105f6f0
+	br L_105f700
 // --- basic block ---
-L_105f6b0:
-// 0x0105f6b0: 0x105f6b0: jal   0x1007db4 addu  a0, s3, zero
+L_105f6c0:
+// 0x0105f6c0: 0x105f6c0: jal   0x1007dc4 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -543,26 +543,26 @@ L_105f6b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f6b8: 0x105f6b8: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x0105f6c8: 0x105f6c8: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0105f6bc: 0x105f6bc: addiu a2, a2, -13884
+// 0x0105f6cc: 0x105f6cc: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0105f6c0: 0x105f6c0: addu  a3, v0, zero
+// 0x0105f6d0: 0x105f6d0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105f6c4: 0x105f6c4: addiu a1, zero, 100
+// 0x0105f6d4: 0x105f6d4: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x0105f6c8: 0x105f6c8: jal   0x1000f9c addiu a0, sp, 64
+// 0x0105f6d8: 0x105f6d8: jal   0x1000f9c addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -577,12 +577,12 @@ L_105f6b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f6d0: 0x105f6d0: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x0105f6e0: 0x105f6e0: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-L_105f6d8:
-// 0x0105f6d8: 0x105f6d8: jal   0x101cd60 addu  a0, v0, zero
+L_105f6e8:
+// 0x0105f6e8: 0x105f6e8: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -590,29 +590,29 @@ L_105f6d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f6e0: 0x105f6e0: lui   a2, 0x10000
+// 0x0105f6f0: 0x105f6f0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0105f6e4: 0x105f6e4: addiu a2, a2, 19912
+// 0x0105f6f4: 0x105f6f4: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0105f6e8: 0x105f6e8: addu  a3, v0, zero
+// 0x0105f6f8: 0x105f6f8: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105f6ec: 0x105f6ec: addiu a0, sp, 44
+// 0x0105f6fc: 0x105f6fc: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-L_105f6f0:
-// 0x0105f6f0: 0x105f6f0: jal   0x1000f9c addiu a1, zero, 20
+L_105f700:
+// 0x0105f700: 0x105f700: jal   0x1000f9c addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -625,15 +625,15 @@ L_105f6f0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f6f8: 0x105f6f8: lui   a0, 0x10000
+// 0x0105f708: 0x105f708: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105f6fc: 0x105f6fc: addu  a1, zero, zero
+// 0x0105f70c: 0x105f70c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105f700: 0x105f700: jal   0x104ef00 addiu a0, a0, 12184
+// 0x0105f710: 0x105f710: jal   0x104ef10 addiu a0, a0, 12180
 	ldloc.1
-	ldc.i4 12184
+	ldc.i4 12180
 	add
 	stloc.1
 	ldloc.0
@@ -641,17 +641,17 @@ L_105f6f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f708: 0x105f708: lui   a0, 0x10000
+// 0x0105f718: 0x105f718: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105f70c: 0x105f70c: jal   0x104edb0 addiu a0, a0, 2416
+// 0x0105f71c: 0x105f71c: jal   0x104edc0 addiu a0, a0, 2412
 	ldloc.1
-	ldc.i4 2416
+	ldc.i4 2412
 	add
 	stloc.1
 	ldloc.0
@@ -659,35 +659,35 @@ L_105f6f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f714: 0x105f714: addiu a1, zero, 12
+// 0x0105f724: 0x105f724: addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.2
-// 0x0105f718: 0x105f718: addiu v0, sp, 32
+// 0x0105f728: 0x105f728: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0105f71c: 0x105f71c: addiu a0, sp, 44
+// 0x0105f72c: 0x105f72c: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x0105f720: 0x105f720: addiu a2, sp, 24
+// 0x0105f730: 0x105f730: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0105f724: 0x105f724: addiu a3, sp, 28
+// 0x0105f734: 0x105f734: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0105f728: 0x105f728: sw    v0, 16(sp)
+// 0x0105f738: 0x105f738: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -696,7 +696,7 @@ L_105f6f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105f72c: 0x105f72c: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105f73c: 0x105f73c: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -710,12 +710,12 @@ L_105f6f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f734: 0x105f734: jal   0x109a424 addu  a0, zero, zero
+// 0x0105f744: 0x105f744: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -723,20 +723,20 @@ L_105f6f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f73c: 0x105f73c: addiu s2, sp, 64
+// 0x0105f74c: 0x105f74c: addiu s2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc 9
-// 0x0105f740: 0x105f740: lui   s0, 0x70000
+// 0x0105f750: 0x105f750: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x0105f744: 0x105f744: lw    a1, 24(sp)
+// 0x0105f754: 0x105f754: lw    a1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -745,27 +745,27 @@ L_105f6f0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0105f748: 0x105f748: beq   v0, zero, 0x105f7b4 addiu a0, sp, 36
+// 0x0105f758: 0x105f758: beq   v0, zero, 0x105f7c4 addiu a0, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-	brfalse L_105f7b4
+	brfalse L_105f7c4
 // --- basic block ---
-// 0x0105f750: 0x105f750: lw    v0, 12240(s0)
+// 0x0105f760: 0x105f760: lw    v0, 12704(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f754: 0x105f754: addiu a2, zero, 2
+// 0x0105f764: 0x105f764: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0105f758: 0x105f758: lw    v1, 16(v0)
+// 0x0105f768: 0x105f768: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -774,15 +774,15 @@ L_105f6f0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105f75c: 0x105f75c: addu  a3, s2, zero
+// 0x0105f76c: 0x105f76c: addu  a3, s2, zero
 	ldloc 9
 	stloc 4
-// 0x0105f760: 0x105f760: addu  a1, a1, v1
+// 0x0105f770: 0x105f770: addu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	add
 	stloc.2
-// 0x0105f764: 0x105f764: div   a1, a2
+// 0x0105f774: 0x105f774: div   a1, a2
 	ldloc.2
 	ldloc.3
 	ldloc.2
@@ -791,7 +791,7 @@ L_105f6f0:
 	stloc 10
 	rem
 	stloc 12
-// 0x0105f768: 0x105f768: sw    v1, 36(sp)
+// 0x0105f778: 0x105f778: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -800,7 +800,7 @@ L_105f6f0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105f76c: 0x105f76c: lw    v0, 20(v0)
+// 0x0105f77c: 0x105f77c: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -809,13 +809,13 @@ L_105f6f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f770: 0x105f770: addiu a1, zero, 10
+// 0x0105f780: 0x105f780: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0105f774: 0x105f774: addiu a2, zero, 22
+// 0x0105f784: 0x105f784: addiu a2, zero, 22
 	ldc.i4.s 22
 	stloc.3
-// 0x0105f778: 0x105f778: sw    v0, 40(sp)
+// 0x0105f788: 0x105f788: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -824,10 +824,10 @@ L_105f6f0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105f77c: 0x105f77c: mflo  lo
+// 0x0105f78c: 0x105f78c: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0105f780: 0x105f780: jal   0x104ea60 sw    v0, 36(sp)
+// 0x0105f790: 0x105f790: jal   0x104ea70 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -841,42 +841,42 @@ L_105f6f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f788: 0x105f788: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0105f798: 0x105f798: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105f790: 0x105f790: bne   v0, zero, 0x105f79c addiu v1, zero, 7
+// 0x0105f7a0: 0x105f7a0: bne   v0, zero, 0x105f7ac addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 6
-	brtrue L_105f79c
+	brtrue L_105f7ac
 // --- basic block ---
-// 0x0105f798: 0x105f798: addiu v1, zero, 5
+// 0x0105f7a8: 0x105f7a8: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 6
-L_105f79c:
-// 0x0105f79c: 0x105f79c: addiu a0, sp, 36
+L_105f7ac:
+// 0x0105f7ac: 0x105f7ac: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x0105f7a0: 0x105f7a0: addiu a1, zero, 2
+// 0x0105f7b0: 0x105f7b0: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0105f7a4: 0x105f7a4: addiu a2, zero, 12
+// 0x0105f7b4: 0x105f7b4: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0105f7a8: 0x105f7a8: addiu a3, sp, 44
+// 0x0105f7b8: 0x105f7b8: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x0105f7ac: 0x105f7ac: j	 0x105f830 sw    v1, 36(sp)
+// 0x0105f7bc: 0x105f7bc: j	 0x105f840 sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -885,22 +885,22 @@ L_105f79c:
 	add
 	ldloc 6
 	stelem.i4
-	br L_105f830
+	br L_105f840
 // --- basic block ---
-L_105f7b4:
-// 0x0105f7b4: 0x105f7b4: lw    v0, 12240(s0)
+L_105f7c4:
+// 0x0105f7c4: 0x105f7c4: lw    v0, 12704(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f7b8: 0x105f7b8: addiu a2, zero, 2
+// 0x0105f7c8: 0x105f7c8: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0105f7bc: 0x105f7bc: lw    v1, 16(v0)
+// 0x0105f7cc: 0x105f7cc: lw    v1, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -909,15 +909,15 @@ L_105f7b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0105f7c0: 0x105f7c0: addu  a3, s2, zero
+// 0x0105f7d0: 0x105f7d0: addu  a3, s2, zero
 	ldloc 9
 	stloc 4
-// 0x0105f7c4: 0x105f7c4: subu  a1, v1, a1
+// 0x0105f7d4: 0x105f7d4: subu  a1, v1, a1
 	ldloc 6
 	ldloc.2
 	sub
 	stloc.2
-// 0x0105f7c8: 0x105f7c8: div   a1, a2
+// 0x0105f7d8: 0x105f7d8: div   a1, a2
 	ldloc.2
 	ldloc.3
 	ldloc.2
@@ -926,7 +926,7 @@ L_105f7b4:
 	stloc 10
 	rem
 	stloc 12
-// 0x0105f7cc: 0x105f7cc: sw    v1, 36(sp)
+// 0x0105f7dc: 0x105f7dc: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -935,7 +935,7 @@ L_105f7b4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0105f7d0: 0x105f7d0: lw    v0, 20(v0)
+// 0x0105f7e0: 0x105f7e0: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -944,13 +944,13 @@ L_105f7b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f7d4: 0x105f7d4: addiu a1, zero, 10
+// 0x0105f7e4: 0x105f7e4: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0105f7d8: 0x105f7d8: addiu a2, zero, 22
+// 0x0105f7e8: 0x105f7e8: addiu a2, zero, 22
 	ldc.i4.s 22
 	stloc.3
-// 0x0105f7dc: 0x105f7dc: sw    v0, 40(sp)
+// 0x0105f7ec: 0x105f7ec: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -959,10 +959,10 @@ L_105f7b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105f7e0: 0x105f7e0: mflo  lo
+// 0x0105f7f0: 0x105f7f0: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0105f7e4: 0x105f7e4: jal   0x104ea60 sw    v0, 36(sp)
+// 0x0105f7f4: 0x105f7f4: jal   0x104ea70 sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -976,22 +976,22 @@ L_105f7b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105f7ec: 0x105f7ec: lw    v0, 12240(s0)
+// 0x0105f7fc: 0x105f7fc: lw    v0, 12704(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f7f0: 0x105f7f0: sll   zero, zero, 0
-// 0x0105f7f4: 0x105f7f4: lw    s0, 16(v0)
+// 0x0105f800: 0x105f800: sll   zero, zero, 0
+// 0x0105f804: 0x105f804: lw    s0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1000,8 +1000,8 @@ L_105f7b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f7f8: 0x105f7f8: sll   zero, zero, 0
-// 0x0105f7fc: 0x105f7fc: sw    s0, 36(sp)
+// 0x0105f808: 0x105f808: sll   zero, zero, 0
+// 0x0105f80c: 0x105f80c: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1010,7 +1010,7 @@ L_105f7b4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105f800: 0x105f800: lw    v0, 20(v0)
+// 0x0105f810: 0x105f810: lw    v0, 20(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1019,7 +1019,7 @@ L_105f7b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f804: 0x105f804: jal   0x101fa28 sw    v0, 40(sp)
+// 0x0105f814: 0x105f814: jal   0x101fa38 sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1028,41 +1028,41 @@ L_105f7b4:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105f80c: 0x105f80c: bne   v0, zero, 0x105f818 addiu v1, zero, 7
+// 0x0105f81c: 0x105f81c: bne   v0, zero, 0x105f828 addiu v1, zero, 7
 	ldloc 5
 	ldc.i4.7
 	stloc 6
-	brtrue L_105f818
+	brtrue L_105f828
 // --- basic block ---
-// 0x0105f814: 0x105f814: addiu v1, zero, 5
+// 0x0105f824: 0x105f824: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 6
-L_105f818:
-// 0x0105f818: 0x105f818: subu  s0, s0, v1
+L_105f828:
+// 0x0105f828: 0x105f828: subu  s0, s0, v1
 	ldloc 8
 	ldloc 6
 	sub
 	stloc 8
-// 0x0105f81c: 0x105f81c: addiu a0, sp, 36
+// 0x0105f82c: 0x105f82c: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x0105f820: 0x105f820: addiu a1, zero, 3
+// 0x0105f830: 0x105f830: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0105f824: 0x105f824: addiu a2, zero, 12
+// 0x0105f834: 0x105f834: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x0105f828: 0x105f828: addiu a3, sp, 44
+// 0x0105f838: 0x105f838: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x0105f82c: 0x105f82c: sw    s0, 36(sp)
+// 0x0105f83c: 0x105f83c: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1071,21 +1071,21 @@ L_105f818:
 	add
 	ldloc 8
 	stelem.i4
-L_105f830:
-// 0x0105f830: 0x105f830: jal   0x104ea60 sll   zero, zero, 0
+L_105f840:
+// 0x0105f840: 0x105f840: jal   0x104ea70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105f838:
-// 0x0105f838: 0x105f838: lw    ra, 196(sp)
-// 0x0105f83c: 0x105f83c: lw    s3, 192(sp)
+L_105f848:
+// 0x0105f848: 0x105f848: lw    ra, 196(sp)
+// 0x0105f84c: 0x105f84c: lw    s3, 192(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1094,7 +1094,7 @@ L_105f838:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105f840: 0x105f840: lw    s2, 188(sp)
+// 0x0105f850: 0x105f850: lw    s2, 188(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1103,7 +1103,7 @@ L_105f838:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105f844: 0x105f844: lw    s1, 184(sp)
+// 0x0105f854: 0x105f854: lw    s1, 184(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1112,7 +1112,7 @@ L_105f838:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0105f848: 0x105f848: lw    s0, 180(sp)
+// 0x0105f858: 0x105f858: lw    s0, 180(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1121,7 +1121,7 @@ L_105f838:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105f84c: 0x105f84c: jr    ra addiu sp, sp, 200
+// 0x0105f85c: 0x105f85c: jr    ra addiu sp, sp, 200
 	ldloc.0
 	ldc.i4 200
 	add
@@ -1133,7 +1133,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_bar_after_refresh_105f854(int32,int32,int32,int32,int32)
+.method public static int32 navigate_bar_after_refresh_105f864(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 s4,int32 lo,int32 s6,int32 s7,int32 s5,int32 s8,int32 ra)
@@ -1198,25 +1198,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105f854: 0x105f854: lui   v0, 0x70000
+// 0x0105f864: 0x105f864: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f858: 0x105f858: lw    v0, 11976(v0)
+// 0x0105f868: 0x105f868: lw    v0, 12440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2994
+	ldc.i4 3110
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f85c: 0x105f85c: addiu sp, sp, -96
+// 0x0105f86c: 0x105f86c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0105f860: 0x105f860: sw    ra, 92(sp)
-// 0x0105f864: 0x105f864: sw    s8, 88(sp)
+// 0x0105f870: 0x105f870: sw    ra, 92(sp)
+// 0x0105f874: 0x105f874: sw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1225,7 +1225,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0105f868: 0x105f868: sw    s7, 84(sp)
+// 0x0105f878: 0x105f878: sw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1234,7 +1234,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105f86c: 0x105f86c: sw    s6, 80(sp)
+// 0x0105f87c: 0x105f87c: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1243,7 +1243,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105f870: 0x105f870: sw    s5, 76(sp)
+// 0x0105f880: 0x105f880: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1252,7 +1252,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105f874: 0x105f874: sw    s4, 72(sp)
+// 0x0105f884: 0x105f884: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1261,7 +1261,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105f878: 0x105f878: sw    s3, 68(sp)
+// 0x0105f888: 0x105f888: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1270,7 +1270,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105f87c: 0x105f87c: sw    s2, 64(sp)
+// 0x0105f88c: 0x105f88c: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1279,7 +1279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105f880: 0x105f880: sw    s1, 60(sp)
+// 0x0105f890: 0x105f890: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1288,7 +1288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105f884: 0x105f884: beq   v0, zero, 0x105fd9c sw    s0, 56(sp)
+// 0x0105f894: 0x105f894: beq   v0, zero, 0x105fdac sw    s0, 56(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1298,44 +1298,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_105fd9c
+	brfalse L_105fdac
 // --- basic block ---
-// 0x0105f88c: 0x105f88c: lui   v0, 0x70000
+// 0x0105f89c: 0x105f89c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f890: 0x105f890: lui   v1, 0xf0000
+// 0x0105f8a0: 0x105f8a0: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 7
-// 0x0105f894: 0x105f894: lw    v1, -30072(v1)
+// 0x0105f8a4: 0x105f8a4: lw    v1, -29608(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105f898: 0x105f898: lw    a0, 12276(v0)
+// 0x0105f8a8: 0x105f8a8: lw    a0, 12740(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f89c: 0x105f89c: sll   zero, zero, 0
-// 0x0105f8a0: 0x105f8a0: beq   v1, a0, 0x105f8b8 sll   zero, zero, 0
+// 0x0105f8ac: 0x105f8ac: sll   zero, zero, 0
+// 0x0105f8b0: 0x105f8b0: beq   v1, a0, 0x105f8c8 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	beq  L_105f8b8
+	beq  L_105f8c8
 // --- basic block ---
-// 0x0105f8a8: 0x105f8a8: jal   0x105f0a0 sw    v1, 12276(v0)
+// 0x0105f8b8: 0x105f8b8: jal   0x105f0b0 sw    v1, 12740(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3069
+	ldc.i4 3185
 	add
 	ldloc 7
 	stelem.i4
@@ -1344,60 +1344,60 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_resize_105f0a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_resize_105f0b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f8b0: 0x105f8b0: jal   0x102146c sll   zero, zero, 0
+// 0x0105f8c0: 0x105f8c0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105f8b8:
-// 0x0105f8b8: 0x105f8b8: lui   v0, 0x70000
+L_105f8c8:
+// 0x0105f8c8: 0x105f8c8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f8bc: 0x105f8bc: lw    a0, 12272(v0)
+// 0x0105f8cc: 0x105f8cc: lw    a0, 12736(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3068
+	ldc.i4 3184
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105f8c0: 0x105f8c0: jal   0x104aa08 sll   zero, zero, 0
+// 0x0105f8d0: 0x105f8d0: jal   0x104aa18 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl55::roadmap_speedometer_set_offset_104aa08(int32)
+	call int32 Cibyl55::roadmap_speedometer_set_offset_104aa18(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105f8c8: 0x105f8c8: jal   0x105e304 sll   zero, zero, 0
+// 0x0105f8d8: 0x105f8d8: jal   0x105e314 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_105e304(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_105e314(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f8d0: 0x105f8d0: lui   a0, 0x0
+// 0x0105f8e0: 0x105f8e0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105f8d4: 0x105f8d4: addiu a0, a0, 14544
+// 0x0105f8e4: 0x105f8e4: addiu a0, a0, 14544
 	ldloc.1
 	ldc.i4 14544
 	add
 	stloc.1
-// 0x0105f8d8: 0x105f8d8: sw    zero, 36(sp)
+// 0x0105f8e8: 0x105f8e8: sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1406,7 +1406,7 @@ L_105f8b8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105f8dc: 0x105f8dc: jal   0x100e788 sw    zero, 40(sp)
+// 0x0105f8ec: 0x105f8ec: jal   0x100e798 sw    zero, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1420,20 +1420,20 @@ L_105f8b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f8e4: 0x105f8e4: lui   a0, 0x0
+// 0x0105f8f4: 0x105f8f4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105f8e8: 0x105f8e8: addiu a0, a0, 14560
+// 0x0105f8f8: 0x105f8f8: addiu a0, a0, 14560
 	ldloc.1
 	ldc.i4 14560
 	add
 	stloc.1
-// 0x0105f8ec: 0x105f8ec: jal   0x100e788 addu  s3, v0, zero
+// 0x0105f8fc: 0x105f8fc: jal   0x100e798 addu  s3, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -1441,66 +1441,66 @@ L_105f8b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f8f4: 0x105f8f4: addu  s2, v0, zero
+// 0x0105f904: 0x105f904: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x0105f8f8: 0x105f8f8: lui   v0, 0x70000
+// 0x0105f908: 0x105f908: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105f8fc: 0x105f8fc: lw    v1, 11972(v0)
+// 0x0105f90c: 0x105f90c: lw    v1, 12436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105f900: 0x105f900: addiu v0, zero, 1
+// 0x0105f910: 0x105f910: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105f904: 0x105f904: bne   v1, v0, 0x105fc20 lui   v0, 0x0
+// 0x0105f914: 0x105f914: bne   v1, v0, 0x105fc30 lui   v0, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_105fc20
+	bne.un L_105fc30
 // --- basic block ---
-// 0x0105f90c: 0x105f90c: jal   0x101fad4 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+// 0x0105f91c: 0x105f91c: jal   0x101fae4 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105f914: 0x105f914: beq   v0, zero, 0x105f940 lui   a0, 0x70000
+// 0x0105f924: 0x105f924: beq   v0, zero, 0x105f950 lui   a0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc.1
-	brfalse L_105f940
+	brfalse L_105f950
 // --- basic block ---
-// 0x0105f91c: 0x105f91c: lui   a1, 0x10000
+// 0x0105f92c: 0x105f92c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105f920: 0x105f920: lui   a3, 0x10000
+// 0x0105f930: 0x105f930: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105f924: 0x105f924: addiu a1, a1, 12092
+// 0x0105f934: 0x105f934: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105f928: 0x105f928: addiu a3, a3, 12128
+// 0x0105f938: 0x105f938: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105f92c: 0x105f92c: addiu a0, zero, 2
+// 0x0105f93c: 0x105f93c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105f930: 0x105f930: jal   0x100449c addiu a2, zero, 741
+// 0x0105f940: 0x105f940: jal   0x100449c addiu a2, zero, 741
 	ldc.i4 741
 	stloc.3
 	ldloc.0
@@ -1513,15 +1513,15 @@ L_105f8b8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f938: 0x105f938: j	 0x105fc20 lui   v0, 0x0
+// 0x0105f948: 0x105f948: j	 0x105fc30 lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-	br L_105fc20
+	br L_105fc30
 // --- basic block ---
-L_105f940:
-// 0x0105f940: 0x105f940: jal   0x1001ba8 addiu a0, a0, 11980
+L_105f950:
+// 0x0105f950: 0x105f950: jal   0x1001ba8 addiu a0, a0, 12444
 	ldloc.1
-	ldc.i4 11980
+	ldc.i4 12444
 	add
 	stloc.1
 	ldloc.0
@@ -1534,23 +1534,23 @@ L_105f940:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f948: 0x105f948: addu  a0, v0, zero
+// 0x0105f958: 0x105f958: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105f94c: 0x105f94c: addiu a1, sp, 36
+// 0x0105f95c: 0x105f95c: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0105f950: 0x105f950: addiu a2, sp, 40
+// 0x0105f960: 0x105f960: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x0105f954: 0x105f954: addu  a3, s3, zero
+// 0x0105f964: 0x105f964: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x0105f958: 0x105f958: jal   0x105e638 addu  s1, v0, zero
+// 0x0105f968: 0x105f968: jal   0x105e648 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -1558,40 +1558,40 @@ L_105f940:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_align_text_105e638(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_align_text_105e648(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f960: 0x105f960: bltz  v0, 0x105f98c addu  s0, v0, zero
+// 0x0105f970: 0x105f970: bltz  v0, 0x105f99c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
 	ldc.i4.s 0
-	blt L_105f98c
+	blt L_105f99c
 // --- basic block ---
-// 0x0105f968: 0x105f968: slti  v0, v0, 2
+// 0x0105f978: 0x105f978: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0105f96c: 0x105f96c: bne   v0, zero, 0x105f9b8 lui   v0, 0x70000
+// 0x0105f97c: 0x105f97c: bne   v0, zero, 0x105f9c8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_105f9b8
+	brtrue L_105f9c8
 // --- basic block ---
-// 0x0105f974: 0x105f974: lw    v0, 12240(v0)
+// 0x0105f984: 0x105f984: lw    v0, 12704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105f978: 0x105f978: sll   zero, zero, 0
-// 0x0105f97c: 0x105f97c: lw    v1, 28(v0)
+// 0x0105f988: 0x105f988: sll   zero, zero, 0
+// 0x0105f98c: 0x105f98c: lw    v1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1600,21 +1600,21 @@ L_105f940:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105f980: 0x105f980: addiu v0, zero, -1
+// 0x0105f990: 0x105f990: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105f984: 0x105f984: bne   v1, v0, 0x105f9b8 sll   zero, zero, 0
+// 0x0105f994: 0x105f994: bne   v1, v0, 0x105f9c8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_105f9b8
+	bne.un L_105f9c8
 // --- basic block ---
-L_105f98c:
-// 0x0105f98c: 0x105f98c: lui   a0, 0x70000
+L_105f99c:
+// 0x0105f99c: 0x105f99c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105f990: 0x105f990: jal   0x1001ba8 addiu a0, a0, 11980
+// 0x0105f9a0: 0x105f9a0: jal   0x1001ba8 addiu a0, a0, 12444
 	ldloc.1
-	ldc.i4 11980
+	ldc.i4 12444
 	add
 	stloc.1
 	ldloc.0
@@ -1627,23 +1627,23 @@ L_105f98c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f998: 0x105f998: addu  a0, v0, zero
+// 0x0105f9a8: 0x105f9a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0105f99c: 0x105f99c: addiu a1, sp, 36
+// 0x0105f9ac: 0x105f9ac: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x0105f9a0: 0x105f9a0: addiu a2, sp, 40
+// 0x0105f9b0: 0x105f9b0: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x0105f9a4: 0x105f9a4: addu  a3, s2, zero
+// 0x0105f9b4: 0x105f9b4: addu  a3, s2, zero
 	ldloc 11
 	stloc 4
-// 0x0105f9a8: 0x105f9a8: jal   0x105e638 addu  s1, v0, zero
+// 0x0105f9b8: 0x105f9b8: jal   0x105e648 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -1651,93 +1651,93 @@ L_105f98c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_align_text_105e638(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_align_text_105e648(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105f9b0: 0x105f9b0: j	 0x105f9bc addu  s0, v0, zero
+// 0x0105f9c0: 0x105f9c0: j	 0x105f9cc addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	br L_105f9bc
+	br L_105f9cc
 // --- basic block ---
-L_105f9b8:
-// 0x0105f9b8: 0x105f9b8: addu  s2, s3, zero
+L_105f9c8:
+// 0x0105f9c8: 0x105f9c8: addu  s2, s3, zero
 	ldloc 9
 	stloc 11
-L_105f9bc:
-// 0x0105f9bc: 0x105f9bc: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+L_105f9cc:
+// 0x0105f9cc: 0x105f9cc: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0105f9c4: 0x105f9c4: beq   v0, zero, 0x105f9f8 slti  v0, s0, 2
+// 0x0105f9d4: 0x105f9d4: beq   v0, zero, 0x105fa08 slti  v0, s0, 2
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	clt
 	stloc 5
-	brfalse L_105f9f8
+	brfalse L_105fa08
 // --- basic block ---
-// 0x0105f9cc: 0x105f9cc: bne   v0, zero, 0x105f9f8 addiu v0, zero, 10
+// 0x0105f9dc: 0x105f9dc: bne   v0, zero, 0x105fa08 addiu v0, zero, 10
 	ldloc 5
 	ldc.i4.s 10
 	stloc 5
-	brtrue L_105f9f8
+	brtrue L_105fa08
 // --- basic block ---
-// 0x0105f9d4: 0x105f9d4: addiu s2, zero, 7
+// 0x0105f9e4: 0x105f9e4: addiu s2, zero, 7
 	ldc.i4.7
 	stloc 11
-// 0x0105f9d8: 0x105f9d8: mult  s3, s2
+// 0x0105f9e8: 0x105f9e8: mult  s3, s2
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 13
-// 0x0105f9dc: 0x105f9dc: mflo  lo
+// 0x0105f9ec: 0x105f9ec: mflo  lo
 	ldloc 13
 	stloc 9
-// 0x0105f9e0: 0x105f9e0: sll   zero, zero, 0
-// 0x0105f9e4: 0x105f9e4: sll   zero, zero, 0
-// 0x0105f9e8: 0x105f9e8: div   s3, v0
+// 0x0105f9f0: 0x105f9f0: sll   zero, zero, 0
+// 0x0105f9f4: 0x105f9f4: sll   zero, zero, 0
+// 0x0105f9f8: 0x105f9f8: div   s3, v0
 	ldloc 9
 	ldloc 5
 	div
 	stloc 13
-// 0x0105f9ec: 0x105f9ec: mflo  lo
+// 0x0105f9fc: 0x105f9fc: mflo  lo
 	ldloc 13
 	stloc 11
-// 0x0105f9f0: 0x105f9f0: j	 0x105fa08 lui   v0, 0x70000
+// 0x0105fa00: 0x105fa00: j	 0x105fa18 lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-	br L_105fa08
+	br L_105fa18
 // --- basic block ---
-L_105f9f8:
-// 0x0105f9f8: 0x105f9f8: bltz  s0, 0x105fa20 slti  v0, s0, 2
+L_105fa08:
+// 0x0105fa08: 0x105fa08: bltz  s0, 0x105fa30 slti  v0, s0, 2
 	ldloc 8
 	ldloc 8
 	ldc.i4.2
 	clt
 	stloc 5
 	ldc.i4.s 0
-	blt L_105fa20
+	blt L_105fa30
 // --- basic block ---
-// 0x0105fa00: 0x105fa00: bne   v0, zero, 0x105fab8 lui   v0, 0x70000
+// 0x0105fa10: 0x105fa10: bne   v0, zero, 0x105fac8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_105fab8
+	brtrue L_105fac8
 // --- basic block ---
-L_105fa08:
-// 0x0105fa08: 0x105fa08: lw    v0, 12240(v0)
+L_105fa18:
+// 0x0105fa18: 0x105fa18: lw    v0, 12704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fa0c: 0x105fa0c: sll   zero, zero, 0
-// 0x0105fa10: 0x105fa10: lw    v1, 28(v0)
+// 0x0105fa1c: 0x105fa1c: sll   zero, zero, 0
+// 0x0105fa20: 0x105fa20: lw    v1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1746,23 +1746,23 @@ L_105fa08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105fa14: 0x105fa14: addiu v0, zero, -1
+// 0x0105fa24: 0x105fa24: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0105fa18: 0x105fa18: bne   v1, v0, 0x105fabc lui   s7, 0x70000
+// 0x0105fa28: 0x105fa28: bne   v1, v0, 0x105facc lui   s7, 0x70000
 	ldloc 7
 	ldloc 5
 	ldc.i4 458752
 	stloc 15
-	bne.un L_105fabc
+	bne.un L_105facc
 // --- basic block ---
-L_105fa20:
-// 0x0105fa20: 0x105fa20: lui   a0, 0x70000
+L_105fa30:
+// 0x0105fa30: 0x105fa30: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0105fa24: 0x105fa24: jal   0x1001ba8 addiu a0, a0, 11980
+// 0x0105fa34: 0x105fa34: jal   0x1001ba8 addiu a0, a0, 12444
 	ldloc.1
-	ldc.i4 11980
+	ldc.i4 12444
 	add
 	stloc.1
 	ldloc.0
@@ -1775,13 +1775,13 @@ L_105fa20:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fa2c: 0x105fa2c: j	 0x105fab8 addu  s1, v0, zero
+// 0x0105fa3c: 0x105fa3c: j	 0x105fac8 addu  s1, v0, zero
 	ldloc 5
 	stloc 10
-	br L_105fab8
+	br L_105fac8
 // --- basic block ---
-L_105fa34:
-// 0x0105fa34: 0x105fa34: jal   0x1001b48 addu  a0, s1, zero
+L_105fa44:
+// 0x0105fa44: 0x105fa44: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
@@ -1790,84 +1790,84 @@ L_105fa34:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fa3c: 0x105fa3c: addiu v0, v0, -1
+// 0x0105fa4c: 0x105fa4c: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x0105fa40: 0x105fa40: addu  s0, s1, v0
+// 0x0105fa50: 0x105fa50: addu  s0, s1, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 8
-L_105fa44:
-// 0x0105fa44: 0x105fa44: sltu  v0, s1, s0
+L_105fa54:
+// 0x0105fa54: 0x105fa54: sltu  v0, s1, s0
 	ldloc 10
 	ldloc 8
 	clt.un
 	stloc 5
-// 0x0105fa48: 0x105fa48: beq   v0, zero, 0x105fa64 sll   zero, zero, 0
+// 0x0105fa58: 0x105fa58: beq   v0, zero, 0x105fa74 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105fa64
+	brfalse L_105fa74
 // --- basic block ---
-// 0x0105fa50: 0x105fa50: lb    v0, 0(s0)
+// 0x0105fa60: 0x105fa60: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0105fa54: 0x105fa54: sll   zero, zero, 0
-// 0x0105fa58: 0x105fa58: bne   v0, s5, 0x105fa44 addiu s0, s0, -1
+// 0x0105fa64: 0x105fa64: sll   zero, zero, 0
+// 0x0105fa68: 0x105fa68: bne   v0, s5, 0x105fa54 addiu s0, s0, -1
 	ldloc 5
 	ldloc 16
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-	bne.un L_105fa44
+	bne.un L_105fa54
 // --- basic block ---
-// 0x0105fa60: 0x105fa60: addiu s0, s0, 1
+// 0x0105fa70: 0x105fa70: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_105fa64:
-// 0x0105fa64: 0x105fa64: bne   s0, s1, 0x105fa9c addu  a1, s4, zero
+L_105fa74:
+// 0x0105fa74: 0x105fa74: bne   s0, s1, 0x105faac addu  a1, s4, zero
 	ldloc 8
 	ldloc 10
 	ldloc 12
 	stloc.2
-	bne.un L_105fa9c
+	bne.un L_105faac
 // --- basic block ---
-// 0x0105fa6c: 0x105fa6c: lui   a1, 0x10000
+// 0x0105fa7c: 0x105fa7c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105fa70: 0x105fa70: lui   a3, 0x10000
+// 0x0105fa80: 0x105fa80: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0105fa74: 0x105fa74: lui   v0, 0x70000
+// 0x0105fa84: 0x105fa84: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105fa78: 0x105fa78: addiu a0, zero, 4
+// 0x0105fa88: 0x105fa88: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0105fa7c: 0x105fa7c: addiu v0, v0, 11980
+// 0x0105fa8c: 0x105fa8c: addiu v0, v0, 12444
 	ldloc 5
-	ldc.i4 11980
+	ldc.i4 12444
 	add
 	stloc 5
-// 0x0105fa80: 0x105fa80: addiu a1, a1, 12092
+// 0x0105fa90: 0x105fa90: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105fa84: 0x105fa84: addiu a3, a3, 12316
+// 0x0105fa94: 0x105fa94: addiu a3, a3, 12312
 	ldloc 4
-	ldc.i4 12316
+	ldc.i4 12312
 	add
 	stloc 4
-// 0x0105fa88: 0x105fa88: addiu a2, zero, 777
+// 0x0105fa98: 0x105fa98: addiu a2, zero, 777
 	ldc.i4 777
 	stloc.3
-// 0x0105fa8c: 0x105fa8c: jal   0x100449c sw    v0, 16(sp)
+// 0x0105fa9c: 0x105fa9c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1886,23 +1886,23 @@ L_105fa64:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fa94: 0x105fa94: j	 0x105fc14 addu  a0, s0, zero
+// 0x0105faa4: 0x105faa4: j	 0x105fc24 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-	br L_105fc14
+	br L_105fc24
 // --- basic block ---
-L_105fa9c:
-// 0x0105fa9c: 0x105fa9c: sb    zero, 0(s0)
+L_105faac:
+// 0x0105faac: 0x105faac: sb    zero, 0(s0)
 	ldloc 8
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0105faa0: 0x105faa0: addu  a0, s1, zero
+// 0x0105fab0: 0x105fab0: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x0105faa4: 0x105faa4: addu  a2, s3, zero
+// 0x0105fab4: 0x105fab4: addu  a2, s3, zero
 	ldloc 9
 	stloc.3
-// 0x0105faa8: 0x105faa8: jal   0x105e638 addu  a3, s2, zero
+// 0x0105fab8: 0x105fab8: jal   0x105e648 addu  a3, s2, zero
 	ldloc 11
 	stloc 4
 	ldloc.0
@@ -1910,62 +1910,62 @@ L_105fa9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_align_text_105e638(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_align_text_105e648(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fab0: 0x105fab0: j	 0x105facc addu  s0, v0, zero
+// 0x0105fac0: 0x105fac0: j	 0x105fadc addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-	br L_105facc
+	br L_105fadc
 // --- basic block ---
-L_105fab8:
-// 0x0105fab8: 0x105fab8: lui   s7, 0x70000
+L_105fac8:
+// 0x0105fac8: 0x105fac8: lui   s7, 0x70000
 	ldc.i4 458752
 	stloc 15
-L_105fabc:
-// 0x0105fabc: 0x105fabc: addiu s6, zero, -1
+L_105facc:
+// 0x0105facc: 0x105facc: addiu s6, zero, -1
 	ldc.i4.m1
 	stloc 14
-// 0x0105fac0: 0x105fac0: addiu s5, zero, 32
+// 0x0105fad0: 0x105fad0: addiu s5, zero, 32
 	ldc.i4.s 32
 	stloc 16
-// 0x0105fac4: 0x105fac4: addiu s4, sp, 36
+// 0x0105fad4: 0x105fad4: addiu s4, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 12
-// 0x0105fac8: 0x105fac8: addiu s3, sp, 40
+// 0x0105fad8: 0x105fad8: addiu s3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 9
-L_105facc:
-// 0x0105facc: 0x105facc: bltz  s0, 0x105fa34 slti  v0, s0, 2
+L_105fadc:
+// 0x0105fadc: 0x105fadc: bltz  s0, 0x105fa44 slti  v0, s0, 2
 	ldloc 8
 	ldloc 8
 	ldc.i4.2
 	clt
 	stloc 5
 	ldc.i4.s 0
-	blt L_105fa34
+	blt L_105fa44
 // --- basic block ---
-// 0x0105fad4: 0x105fad4: bne   v0, zero, 0x105faf4 sll   zero, zero, 0
+// 0x0105fae4: 0x105fae4: bne   v0, zero, 0x105fb04 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_105faf4
+	brtrue L_105fb04
 // --- basic block ---
-// 0x0105fadc: 0x105fadc: lw    v0, 12240(s7)
+// 0x0105faec: 0x105faec: lw    v0, 12704(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fae0: 0x105fae0: sll   zero, zero, 0
-// 0x0105fae4: 0x105fae4: lw    v0, 28(v0)
+// 0x0105faf0: 0x105faf0: sll   zero, zero, 0
+// 0x0105faf4: 0x105faf4: lw    v0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1974,42 +1974,42 @@ L_105facc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fae8: 0x105fae8: sll   zero, zero, 0
-// 0x0105faec: 0x105faec: beq   v0, s6, 0x105fa34 sll   zero, zero, 0
+// 0x0105faf8: 0x105faf8: sll   zero, zero, 0
+// 0x0105fafc: 0x105fafc: beq   v0, s6, 0x105fa44 sll   zero, zero, 0
 	ldloc 5
 	ldloc 14
-	beq  L_105fa34
+	beq  L_105fa44
 // --- basic block ---
-L_105faf4:
-// 0x0105faf4: 0x105faf4: addu  s3, zero, zero
+L_105fb04:
+// 0x0105fb04: 0x105fb04: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0105faf8: 0x105faf8: lui   s6, 0x70000
+// 0x0105fb08: 0x105fb08: lui   s6, 0x70000
 	ldc.i4 458752
 	stloc 14
-// 0x0105fafc: 0x105fafc: addiu s8, zero, -1
+// 0x0105fb0c: 0x105fb0c: addiu s8, zero, -1
 	ldc.i4.m1
 	stloc 17
-// 0x0105fb00: 0x105fb00: addiu s5, zero, 2
+// 0x0105fb10: 0x105fb10: addiu s5, zero, 2
 	ldc.i4.2
 	stloc 16
-// 0x0105fb04: 0x105fb04: j	 0x105fc04 lui   s7, 0xf0000
+// 0x0105fb14: 0x105fb14: j	 0x105fc14 lui   s7, 0xf0000
 	ldc.i4 983040
 	stloc 15
-	br L_105fc04
+	br L_105fc14
 // --- basic block ---
-L_105fb0c:
-// 0x0105fb0c: 0x105fb0c: lw    v0, 12240(s6)
+L_105fb1c:
+// 0x0105fb1c: 0x105fb1c: lw    v0, 12704(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fb10: 0x105fb10: sll   zero, zero, 0
-// 0x0105fb14: 0x105fb14: lw    v1, 32(v0)
+// 0x0105fb20: 0x105fb20: sll   zero, zero, 0
+// 0x0105fb24: 0x105fb24: lw    v1, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2018,8 +2018,8 @@ L_105fb0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105fb18: 0x105fb18: sll   zero, zero, 0
-// 0x0105fb1c: 0x105fb1c: sw    v1, 44(sp)
+// 0x0105fb28: 0x105fb28: sll   zero, zero, 0
+// 0x0105fb2c: 0x105fb2c: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2028,7 +2028,7 @@ L_105fb0c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0105fb20: 0x105fb20: lw    v1, 24(v0)
+// 0x0105fb30: 0x105fb30: lw    v1, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2037,7 +2037,7 @@ L_105fb0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105fb24: 0x105fb24: bne   s0, a0, 0x105fb48 sw    v1, 48(sp)
+// 0x0105fb34: 0x105fb34: bne   s0, a0, 0x105fb58 sw    v1, 48(sp)
 	ldloc 8
 	ldloc.1
 	ldloc 6
@@ -2048,9 +2048,9 @@ L_105fb0c:
 	add
 	ldloc 7
 	stelem.i4
-	bne.un L_105fb48
+	bne.un L_105fb58
 // --- basic block ---
-// 0x0105fb2c: 0x105fb2c: lw    a0, 28(v0)
+// 0x0105fb3c: 0x105fb3c: lw    a0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2059,25 +2059,25 @@ L_105fb0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fb30: 0x105fb30: sll   zero, zero, 0
-// 0x0105fb34: 0x105fb34: beq   a0, s8, 0x105fb48 addu  v1, a0, v1
+// 0x0105fb40: 0x105fb40: sll   zero, zero, 0
+// 0x0105fb44: 0x105fb44: beq   a0, s8, 0x105fb58 addu  v1, a0, v1
 	ldloc.1
 	ldloc 17
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-	beq  L_105fb48
+	beq  L_105fb58
 // --- basic block ---
-// 0x0105fb3c: 0x105fb3c: div   v1, s5
+// 0x0105fb4c: 0x105fb4c: div   v1, s5
 	ldloc 7
 	ldloc 16
 	div
 	stloc 13
-// 0x0105fb40: 0x105fb40: mflo  lo
+// 0x0105fb50: 0x105fb50: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x0105fb44: 0x105fb44: sw    v1, 48(sp)
+// 0x0105fb54: 0x105fb54: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2086,12 +2086,12 @@ L_105fb0c:
 	add
 	ldloc 7
 	stelem.i4
-L_105fb48:
-// 0x0105fb48: 0x105fb48: bne   s3, zero, 0x105fb5c sll   zero, zero, 0
+L_105fb58:
+// 0x0105fb58: 0x105fb58: bne   s3, zero, 0x105fb6c sll   zero, zero, 0
 	ldloc 9
-	brtrue L_105fb5c
+	brtrue L_105fb6c
 // --- basic block ---
-// 0x0105fb50: 0x105fb50: lw    s4, 36(sp)
+// 0x0105fb60: 0x105fb60: lw    s4, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2100,13 +2100,13 @@ L_105fb48:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105fb54: 0x105fb54: j	 0x105fb6c addu  a0, s4, zero
+// 0x0105fb64: 0x105fb64: j	 0x105fb7c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-	br L_105fb6c
+	br L_105fb7c
 // --- basic block ---
-L_105fb5c:
-// 0x0105fb5c: 0x105fb5c: lw    v0, 28(v0)
+L_105fb6c:
+// 0x0105fb6c: 0x105fb6c: lw    v0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2115,7 +2115,7 @@ L_105fb5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fb60: 0x105fb60: lw    s4, 40(sp)
+// 0x0105fb70: 0x105fb70: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2124,7 +2124,7 @@ L_105fb5c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105fb64: 0x105fb64: sw    v0, 48(sp)
+// 0x0105fb74: 0x105fb74: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2133,29 +2133,29 @@ L_105fb5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105fb68: 0x105fb68: addu  a0, s4, zero
+// 0x0105fb78: 0x105fb78: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-L_105fb6c:
-// 0x0105fb6c: 0x105fb6c: addiu v0, sp, 32
+L_105fb7c:
+// 0x0105fb7c: 0x105fb7c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x0105fb70: 0x105fb70: addu  a1, s2, zero
+// 0x0105fb80: 0x105fb80: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x0105fb74: 0x105fb74: addiu a2, sp, 24
+// 0x0105fb84: 0x105fb84: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0105fb78: 0x105fb78: addiu a3, sp, 28
+// 0x0105fb88: 0x105fb88: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x0105fb7c: 0x105fb7c: sw    v0, 16(sp)
+// 0x0105fb8c: 0x105fb8c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2164,7 +2164,7 @@ L_105fb6c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105fb80: 0x105fb80: jal   0x104e968 sw    zero, 20(sp)
+// 0x0105fb90: 0x105fb90: jal   0x104e978 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2178,12 +2178,12 @@ L_105fb6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e968(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_get_text_extents_104e978(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fb88: 0x105fb88: jal   0x109a424 addu  a0, zero, zero
+// 0x0105fb98: 0x105fb98: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -2191,36 +2191,36 @@ L_105fb6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fb90: 0x105fb90: beq   v0, zero, 0x105fbc0 addiu v1, zero, 5
+// 0x0105fba0: 0x105fba0: beq   v0, zero, 0x105fbd0 addiu v1, zero, 5
 	ldloc 5
 	ldc.i4.5
 	stloc 7
-	brfalse L_105fbc0
+	brfalse L_105fbd0
 // --- basic block ---
-// 0x0105fb98: 0x105fb98: lw    v0, 12240(s6)
+// 0x0105fba8: 0x105fba8: lw    v0, 12704(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fb9c: 0x105fb9c: lw    a0, -30068(s7)
+// 0x0105fbac: 0x105fbac: lw    a0, -29604(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fba0: 0x105fba0: lw    v1, 32(v0)
+// 0x0105fbb0: 0x105fbb0: lw    v1, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2229,7 +2229,7 @@ L_105fb6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105fba4: 0x105fba4: lw    v0, 24(sp)
+// 0x0105fbb4: 0x105fbb4: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2238,23 +2238,23 @@ L_105fb6c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fba8: 0x105fba8: sll   zero, zero, 0
-// 0x0105fbac: 0x105fbac: subu  v0, a0, v0
+// 0x0105fbb8: 0x105fbb8: sll   zero, zero, 0
+// 0x0105fbbc: 0x105fbbc: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x0105fbb0: 0x105fbb0: subu  v0, v0, v1
+// 0x0105fbc0: 0x105fbc0: subu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	sub
 	stloc 5
-// 0x0105fbb4: 0x105fbb4: addiu v0, v0, -40
+// 0x0105fbc4: 0x105fbc4: addiu v0, v0, -40
 	ldloc 5
 	ldc.i4.s -40
 	add
 	stloc 5
-// 0x0105fbb8: 0x105fbb8: j	 0x105fbc4 sw    v0, 44(sp)
+// 0x0105fbc8: 0x105fbc8: j	 0x105fbd4 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2263,10 +2263,10 @@ L_105fb6c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_105fbc4
+	br L_105fbd4
 // --- basic block ---
-L_105fbc0:
-// 0x0105fbc0: 0x105fbc0: sw    v1, 44(sp)
+L_105fbd0:
+// 0x0105fbd0: 0x105fbd0: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2275,16 +2275,16 @@ L_105fbc0:
 	add
 	ldloc 7
 	stelem.i4
-L_105fbc4:
-// 0x0105fbc4: 0x105fbc4: lui   a0, 0x10000
+L_105fbd4:
+// 0x0105fbd4: 0x105fbd4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105fbc8: 0x105fbc8: addu  a1, zero, zero
+// 0x0105fbd8: 0x105fbd8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105fbcc: 0x105fbcc: jal   0x104ef00 addiu a0, a0, 12184
+// 0x0105fbdc: 0x105fbdc: jal   0x104ef10 addiu a0, a0, 12180
 	ldloc.1
-	ldc.i4 12184
+	ldc.i4 12180
 	add
 	stloc.1
 	ldloc.0
@@ -2292,15 +2292,15 @@ L_105fbc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fbd4: 0x105fbd4: lui   a0, 0x0
+// 0x0105fbe4: 0x105fbe4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105fbd8: 0x105fbd8: jal   0x104edb0 addiu a0, a0, 31980
+// 0x0105fbe8: 0x105fbe8: jal   0x104edc0 addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
@@ -2310,12 +2310,12 @@ L_105fbc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fbe0: 0x105fbe0: lw    v0, 48(sp)
+// 0x0105fbf0: 0x105fbf0: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2324,26 +2324,26 @@ L_105fbc4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fbe4: 0x105fbe4: addu  a3, s4, zero
+// 0x0105fbf4: 0x105fbf4: addu  a3, s4, zero
 	ldloc 12
 	stloc 4
-// 0x0105fbe8: 0x105fbe8: addiu v0, v0, -6
+// 0x0105fbf8: 0x105fbf8: addiu v0, v0, -6
 	ldloc 5
 	ldc.i4.s -6
 	add
 	stloc 5
-// 0x0105fbec: 0x105fbec: addiu a0, sp, 44
+// 0x0105fbfc: 0x105fbfc: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x0105fbf0: 0x105fbf0: addiu a1, zero, 4
+// 0x0105fc00: 0x105fc00: addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
-// 0x0105fbf4: 0x105fbf4: addu  a2, s2, zero
+// 0x0105fc04: 0x105fc04: addu  a2, s2, zero
 	ldloc 11
 	stloc.3
-// 0x0105fbf8: 0x105fbf8: sw    v0, 48(sp)
+// 0x0105fc08: 0x105fc08: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2352,7 +2352,7 @@ L_105fbc4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105fbfc: 0x105fbfc: jal   0x104ea60 addiu s3, s3, 1
+// 0x0105fc0c: 0x105fc0c: jal   0x104ea70 addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -2362,28 +2362,28 @@ L_105fbc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105fc04:
-// 0x0105fc04: 0x105fc04: slt   v0, s3, s0
+L_105fc14:
+// 0x0105fc14: 0x105fc14: slt   v0, s3, s0
 	ldloc 9
 	ldloc 8
 	clt
 	stloc 5
-// 0x0105fc08: 0x105fc08: bne   v0, zero, 0x105fb0c addiu a0, zero, 1
+// 0x0105fc18: 0x105fc18: bne   v0, zero, 0x105fb1c addiu a0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.1
-	brtrue L_105fb0c
+	brtrue L_105fb1c
 // --- basic block ---
-// 0x0105fc10: 0x105fc10: addu  a0, s1, zero
+// 0x0105fc20: 0x105fc20: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-L_105fc14:
-// 0x0105fc14: 0x105fc14: jal   0x1000930 sll   zero, zero, 0
+L_105fc24:
+// 0x0105fc24: 0x105fc24: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2394,11 +2394,11 @@ L_105fc14:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fc1c: 0x105fc1c: lui   v0, 0x0
+// 0x0105fc2c: 0x105fc2c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_105fc20:
-// 0x0105fc20: 0x105fc20: lw    v1, 14488(v0)
+L_105fc30:
+// 0x0105fc30: 0x105fc30: lw    v1, 14488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2407,23 +2407,23 @@ L_105fc20:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105fc24: 0x105fc24: addiu v0, zero, 16
+// 0x0105fc34: 0x105fc34: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0105fc28: 0x105fc28: lui   s3, 0x0
+// 0x0105fc38: 0x105fc38: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0105fc2c: 0x105fc2c: lui   s2, 0x0
+// 0x0105fc3c: 0x105fc3c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x0105fc30: 0x105fc30: bne   v1, v0, 0x105fc5c lui   s1, 0x0
+// 0x0105fc40: 0x105fc40: bne   v1, v0, 0x105fc6c lui   s1, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	bne.un L_105fc5c
+	bne.un L_105fc6c
 // --- basic block ---
-// 0x0105fc38: 0x105fc38: lw    a0, 14496(s3)
+// 0x0105fc48: 0x105fc48: lw    a0, 14496(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2432,18 +2432,18 @@ L_105fc20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc3c: 0x105fc3c: jal   0x105f51c sll   zero, zero, 0
+// 0x0105fc4c: 0x105fc4c: jal   0x105f52c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::T_159_105f51c(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::T_159_105f52c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fc44: 0x105fc44: lw    a0, 14508(s2)
+// 0x0105fc54: 0x105fc54: lw    a0, 14508(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2452,7 +2452,7 @@ L_105fc20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc48: 0x105fc48: jal   0x105e56c addu  a1, zero, zero
+// 0x0105fc58: 0x105fc58: jal   0x105e57c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2460,12 +2460,12 @@ L_105fc20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_instruction_105e56c(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_instruction_105e57c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fc50: 0x105fc50: lw    a0, 14504(s1)
+// 0x0105fc60: 0x105fc60: lw    a0, 14504(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2474,54 +2474,54 @@ L_105fc20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc54: 0x105fc54: j	 0x105fd74 addu  a1, zero, zero
+// 0x0105fc64: 0x105fc64: j	 0x105fd84 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_105fd74
+	br L_105fd84
 // --- basic block ---
-L_105fc5c:
-// 0x0105fc5c: 0x105fc5c: lui   v0, 0x70000
+L_105fc6c:
+// 0x0105fc6c: 0x105fc6c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105fc60: 0x105fc60: lw    a0, 12256(v0)
+// 0x0105fc70: 0x105fc70: lw    a0, 12720(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3064
+	ldc.i4 3180
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc64: 0x105fc64: jal   0x104e020 sll   zero, zero, 0
+// 0x0105fc74: 0x105fc74: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fc6c: 0x105fc6c: addu  s0, v0, zero
+// 0x0105fc7c: 0x105fc7c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0105fc70: 0x105fc70: lui   v0, 0x70000
+// 0x0105fc80: 0x105fc80: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105fc74: 0x105fc74: lw    a0, 12260(v0)
+// 0x0105fc84: 0x105fc84: lw    a0, 12724(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3065
+	ldc.i4 3181
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc78: 0x105fc78: jal   0x104e020 sll   zero, zero, 0
+// 0x0105fc88: 0x105fc88: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fc80: 0x105fc80: lw    a0, 14496(s3)
+// 0x0105fc90: 0x105fc90: lw    a0, 14496(s3)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2530,7 +2530,7 @@ L_105fc5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc84: 0x105fc84: jal   0x105f51c subu  s0, s0, v0
+// 0x0105fc94: 0x105fc94: jal   0x105f52c subu  s0, s0, v0
 	ldloc 8
 	ldloc 5
 	sub
@@ -2540,12 +2540,12 @@ L_105fc5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::T_159_105f51c(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::T_159_105f52c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fc8c: 0x105fc8c: lw    a0, 14508(s2)
+// 0x0105fc9c: 0x105fc9c: lw    a0, 14508(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -2554,7 +2554,7 @@ L_105fc5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc90: 0x105fc90: jal   0x105e56c addu  a1, zero, zero
+// 0x0105fca0: 0x105fca0: jal   0x105e57c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2562,12 +2562,12 @@ L_105fc5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_instruction_105e56c(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_instruction_105e57c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fc98: 0x105fc98: lw    a0, 14504(s1)
+// 0x0105fca8: 0x105fca8: lw    a0, 14504(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -2576,7 +2576,7 @@ L_105fc5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fc9c: 0x105fc9c: jal   0x105e838 addu  a1, zero, zero
+// 0x0105fcac: 0x105fcac: jal   0x105e848 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2584,27 +2584,27 @@ L_105fc5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_exit_105e838(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_exit_105e848(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fca4: 0x105fca4: lui   v0, 0x70000
+// 0x0105fcb4: 0x105fcb4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105fca8: 0x105fca8: lw    v1, 11972(v0)
+// 0x0105fcb8: 0x105fcb8: lw    v1, 12436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 2993
+	ldc.i4 3109
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105fcac: 0x105fcac: addiu v0, zero, 1
+// 0x0105fcbc: 0x105fcbc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0105fcb0: 0x105fcb0: sw    zero, 44(sp)
+// 0x0105fcc0: 0x105fcc0: sw    zero, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2613,7 +2613,7 @@ L_105fc5c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0105fcb4: 0x105fcb4: bne   v1, v0, 0x105fd58 sw    zero, 48(sp)
+// 0x0105fcc4: 0x105fcc4: bne   v1, v0, 0x105fd68 sw    zero, 48(sp)
 	ldloc 7
 	ldloc 5
 	ldloc 6
@@ -2624,35 +2624,35 @@ L_105fc5c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_105fd58
+	bne.un L_105fd68
 // --- basic block ---
-// 0x0105fcbc: 0x105fcbc: jal   0x101fad4 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_get_background_run_101fad4()
+// 0x0105fccc: 0x105fccc: jal   0x101fae4 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_get_background_run_101fae4()
 	stloc 5
 // --- basic block ---
-// 0x0105fcc4: 0x105fcc4: beq   v0, zero, 0x105fcec lui   a3, 0x10000
+// 0x0105fcd4: 0x105fcd4: beq   v0, zero, 0x105fcfc lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brfalse L_105fcec
+	brfalse L_105fcfc
 // --- basic block ---
-// 0x0105fccc: 0x105fccc: lui   a1, 0x10000
+// 0x0105fcdc: 0x105fcdc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0105fcd0: 0x105fcd0: addiu a1, a1, 12092
+// 0x0105fce0: 0x105fce0: addiu a1, a1, 12088
 	ldloc.2
-	ldc.i4 12092
+	ldc.i4 12088
 	add
 	stloc.2
-// 0x0105fcd4: 0x105fcd4: addiu a3, a3, 12128
+// 0x0105fce4: 0x105fce4: addiu a3, a3, 12124
 	ldloc 4
-	ldc.i4 12128
+	ldc.i4 12124
 	add
 	stloc 4
-// 0x0105fcd8: 0x105fcd8: addiu a0, zero, 2
+// 0x0105fce8: 0x105fce8: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105fcdc: 0x105fcdc: jal   0x100449c addiu a2, zero, 697
+// 0x0105fcec: 0x105fcec: jal   0x100449c addiu a2, zero, 697
 	ldc.i4 697
 	stloc.3
 	ldloc.0
@@ -2665,28 +2665,28 @@ L_105fc5c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fce4: 0x105fce4: j	 0x105fd5c lui   v0, 0x0
+// 0x0105fcf4: 0x105fcf4: j	 0x105fd6c lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-	br L_105fd5c
+	br L_105fd6c
 // --- basic block ---
-L_105fcec:
-// 0x0105fcec: 0x105fcec: lui   v0, 0x70000
+L_105fcfc:
+// 0x0105fcfc: 0x105fcfc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105fcf0: 0x105fcf0: lw    v1, 12240(v0)
+// 0x0105fd00: 0x105fd00: lw    v1, 12704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3060
+	ldc.i4 3176
 	add
 	ldelem.i4
 	stloc 7
-// 0x0105fcf4: 0x105fcf4: addiu a0, zero, 2
+// 0x0105fd04: 0x105fd04: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0105fcf8: 0x105fcf8: lw    v0, 16(v1)
+// 0x0105fd08: 0x105fd08: lw    v0, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2695,15 +2695,15 @@ L_105fcec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fcfc: 0x105fcfc: addu  a1, zero, zero
+// 0x0105fd0c: 0x105fd0c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0105fd00: 0x105fd00: div   v0, a0
+// 0x0105fd10: 0x105fd10: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 13
-// 0x0105fd04: 0x105fd04: sw    v0, 44(sp)
+// 0x0105fd14: 0x105fd14: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2712,7 +2712,7 @@ L_105fcec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105fd08: 0x105fd08: lw    v0, 20(v1)
+// 0x0105fd18: 0x105fd18: lw    v0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2721,25 +2721,25 @@ L_105fcec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fd0c: 0x105fd0c: lui   a0, 0x10000
+// 0x0105fd1c: 0x105fd1c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105fd10: 0x105fd10: addiu v0, v0, -5
+// 0x0105fd20: 0x105fd20: addiu v0, v0, -5
 	ldloc 5
 	ldc.i4.s -5
 	add
 	stloc 5
-// 0x0105fd14: 0x105fd14: addu  v0, v0, s0
+// 0x0105fd24: 0x105fd24: addu  v0, v0, s0
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0105fd18: 0x105fd18: addiu a0, a0, 12184
+// 0x0105fd28: 0x105fd28: addiu a0, a0, 12180
 	ldloc.1
-	ldc.i4 12184
+	ldc.i4 12180
 	add
 	stloc.1
-// 0x0105fd1c: 0x105fd1c: sw    v0, 48(sp)
+// 0x0105fd2c: 0x105fd2c: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2748,10 +2748,10 @@ L_105fcec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0105fd20: 0x105fd20: mflo  lo
+// 0x0105fd30: 0x105fd30: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x0105fd24: 0x105fd24: jal   0x104ef00 sw    v0, 44(sp)
+// 0x0105fd34: 0x105fd34: jal   0x104ef10 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2765,17 +2765,17 @@ L_105fcec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd2c: 0x105fd2c: lui   a0, 0x10000
+// 0x0105fd3c: 0x105fd3c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105fd30: 0x105fd30: jal   0x104edb0 addiu a0, a0, 2416
+// 0x0105fd40: 0x105fd40: jal   0x104edc0 addiu a0, a0, 2412
 	ldloc.1
-	ldc.i4 2416
+	ldc.i4 2412
 	add
 	stloc.1
 	ldloc.0
@@ -2783,17 +2783,17 @@ L_105fcec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd38: 0x105fd38: lui   a0, 0x10000
+// 0x0105fd48: 0x105fd48: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0105fd3c: 0x105fd3c: jal   0x101cd60 addiu a0, a0, 12352
+// 0x0105fd4c: 0x105fd4c: jal   0x101cd70 addiu a0, a0, 12348
 	ldloc.1
-	ldc.i4 12352
+	ldc.i4 12348
 	add
 	stloc.1
 	ldloc.0
@@ -2801,23 +2801,23 @@ L_105fcec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd44: 0x105fd44: addu  a3, v0, zero
+// 0x0105fd54: 0x105fd54: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0105fd48: 0x105fd48: addiu a0, sp, 44
+// 0x0105fd58: 0x105fd58: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x0105fd4c: 0x105fd4c: addiu a1, zero, 10
+// 0x0105fd5c: 0x105fd5c: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0105fd50: 0x105fd50: jal   0x104ea60 addiu a2, zero, 14
+// 0x0105fd60: 0x105fd60: jal   0x104ea70 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -2825,17 +2825,17 @@ L_105fcec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea60(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_draw_string_size_104ea70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105fd58:
-// 0x0105fd58: 0x105fd58: lui   v0, 0x0
+L_105fd68:
+// 0x0105fd68: 0x105fd68: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_105fd5c:
-// 0x0105fd5c: 0x105fd5c: lw    a0, 14488(v0)
+L_105fd6c:
+// 0x0105fd6c: 0x105fd6c: lw    a0, 14488(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2844,7 +2844,7 @@ L_105fd5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fd60: 0x105fd60: jal   0x105e56c addu  a1, s0, zero
+// 0x0105fd70: 0x105fd70: jal   0x105e57c addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -2852,15 +2852,15 @@ L_105fd5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_instruction_105e56c(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_instruction_105e57c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd68: 0x105fd68: lui   v0, 0x0
+// 0x0105fd78: 0x105fd78: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0105fd6c: 0x105fd6c: lw    a0, 14500(v0)
+// 0x0105fd7c: 0x105fd7c: lw    a0, 14500(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2869,86 +2869,86 @@ L_105fd5c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fd70: 0x105fd70: addu  a1, s0, zero
+// 0x0105fd80: 0x105fd80: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-L_105fd74:
-// 0x0105fd74: 0x105fd74: jal   0x105e838 sll   zero, zero, 0
+L_105fd84:
+// 0x0105fd84: 0x105fd84: jal   0x105e848 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_exit_105e838(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_exit_105e848(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd7c: 0x105fd7c: jal   0x105e918 sll   zero, zero, 0
+// 0x0105fd8c: 0x105fd8c: jal   0x105e928 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_ETA_105e918(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_ETA_105e928(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd84: 0x105fd84: jal   0x105eb04 sll   zero, zero, 0
+// 0x0105fd94: 0x105fd94: jal   0x105eb14 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_distance_to_destination_105eb04(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_distance_to_destination_105eb14(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd8c: 0x105fd8c: jal   0x105ed90 sll   zero, zero, 0
+// 0x0105fd9c: 0x105fd9c: jal   0x105eda0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl70::navigate_bar_draw_time_to_destination_105ed90(int32,int32,int32,int32,int32)
+	call int32 Cibyl70::navigate_bar_draw_time_to_destination_105eda0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0105fd94: 0x105fd94: j	 0x105fda8 lui   v0, 0x70000
+// 0x0105fda4: 0x105fda4: j	 0x105fdb8 lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-	br L_105fda8
+	br L_105fdb8
 // --- basic block ---
-L_105fd9c:
-// 0x0105fd9c: 0x105fd9c: jal   0x104aa08 addu  a0, zero, zero
+L_105fdac:
+// 0x0105fdac: 0x105fdac: jal   0x104aa18 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl55::roadmap_speedometer_set_offset_104aa08(int32)
+	call int32 Cibyl55::roadmap_speedometer_set_offset_104aa18(int32)
 	stloc 5
 // --- basic block ---
-// 0x0105fda4: 0x105fda4: lui   v0, 0x70000
+// 0x0105fdb4: 0x105fdb4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_105fda8:
-// 0x0105fda8: 0x105fda8: lw    v0, 12236(v0)
+L_105fdb8:
+// 0x0105fdb8: 0x105fdb8: lw    v0, 12700(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3059
+	ldc.i4 3175
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105fdac: 0x105fdac: sll   zero, zero, 0
-// 0x0105fdb0: 0x105fdb0: beq   v0, zero, 0x105fdc0 sll   zero, zero, 0
+// 0x0105fdbc: 0x105fdbc: sll   zero, zero, 0
+// 0x0105fdc0: 0x105fdc0: beq   v0, zero, 0x105fdd0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_105fdc0
+	brfalse L_105fdd0
 // --- basic block ---
-// 0x0105fdb8: 0x105fdb8: jalr  v0 sll   zero, zero, 0
+// 0x0105fdc8: 0x105fdc8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2960,9 +2960,9 @@ L_105fda8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_105fdc0:
-// 0x0105fdc0: 0x105fdc0: lw    ra, 92(sp)
-// 0x0105fdc4: 0x105fdc4: lw    s8, 88(sp)
+L_105fdd0:
+// 0x0105fdd0: 0x105fdd0: lw    ra, 92(sp)
+// 0x0105fdd4: 0x105fdd4: lw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2971,7 +2971,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0105fdc8: 0x105fdc8: lw    s7, 84(sp)
+// 0x0105fdd8: 0x105fdd8: lw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2980,7 +2980,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105fdcc: 0x105fdcc: lw    s6, 80(sp)
+// 0x0105fddc: 0x105fddc: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2989,7 +2989,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0105fdd0: 0x105fdd0: lw    s5, 76(sp)
+// 0x0105fde0: 0x105fde0: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2998,7 +2998,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0105fdd4: 0x105fdd4: lw    s4, 72(sp)
+// 0x0105fde4: 0x105fde4: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3007,7 +3007,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0105fdd8: 0x105fdd8: lw    s3, 68(sp)
+// 0x0105fde8: 0x105fde8: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3016,7 +3016,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0105fddc: 0x105fddc: lw    s2, 64(sp)
+// 0x0105fdec: 0x105fdec: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3025,7 +3025,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0105fde0: 0x105fde0: lw    s1, 60(sp)
+// 0x0105fdf0: 0x105fdf0: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3034,7 +3034,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0105fde4: 0x105fde4: lw    s0, 56(sp)
+// 0x0105fdf4: 0x105fdf4: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3043,7 +3043,7 @@ L_105fdc0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0105fde8: 0x105fde8: jr    ra addiu sp, sp, 96
+// 0x0105fdf8: 0x105fdf8: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -3055,7 +3055,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_zoom_update_105fdf0(int32,int32,int32,int32)
+.method public static int32 navigate_zoom_update_105fe00(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 lo,int32 ra,int32[] mem)
@@ -3090,193 +3090,193 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105fdf0: 0x105fdf0: slt   v0, a1, a0
+// 0x0105fe00: 0x105fe00: slt   v0, a1, a0
 	ldloc.1
 	ldloc.0
 	clt
 	stloc 4
-// 0x0105fdf4: 0x105fdf4: beq   v0, zero, 0x105fe3c slti  v0, a2, 151
+// 0x0105fe04: 0x105fe04: beq   v0, zero, 0x105fe4c slti  v0, a2, 151
 	ldloc 4
 	ldloc.2
 	ldc.i4 151
 	clt
 	stloc 4
-	brfalse L_105fe3c
+	brfalse L_105fe4c
 // --- basic block ---
-// 0x0105fdfc: 0x105fdfc: slti  v0, a0, 201
+// 0x0105fe0c: 0x105fe0c: slti  v0, a0, 201
 	ldloc.0
 	ldc.i4 201
 	clt
 	stloc 4
-// 0x0105fe00: 0x105fe00: bne   v0, zero, 0x105fe3c slti  v0, a2, 151
+// 0x0105fe10: 0x105fe10: bne   v0, zero, 0x105fe4c slti  v0, a2, 151
 	ldloc 4
 	ldloc.2
 	ldc.i4 151
 	clt
 	stloc 4
-	brtrue L_105fe3c
+	brtrue L_105fe4c
 // --- basic block ---
-// 0x0105fe08: 0x105fe08: slti  v0, a1, 200
+// 0x0105fe18: 0x105fe18: slti  v0, a1, 200
 	ldloc.1
 	ldc.i4 200
 	clt
 	stloc 4
-// 0x0105fe0c: 0x105fe0c: beq   v0, zero, 0x105fe3c slti  v0, a2, 151
+// 0x0105fe1c: 0x105fe1c: beq   v0, zero, 0x105fe4c slti  v0, a2, 151
 	ldloc 4
 	ldloc.2
 	ldc.i4 151
 	clt
 	stloc 4
-	brfalse L_105fe3c
+	brfalse L_105fe4c
 // --- basic block ---
-// 0x0105fe14: 0x105fe14: addiu a0, a0, 200
+// 0x0105fe24: 0x105fe24: addiu a0, a0, 200
 	ldloc.0
 	ldc.i4 200
 	add
 	stloc.0
-// 0x0105fe18: 0x105fe18: subu  a0, a0, a1
+// 0x0105fe28: 0x105fe28: subu  a0, a0, a1
 	ldloc.0
 	ldloc.1
 	sub
 	stloc.0
-// 0x0105fe1c: 0x105fe1c: mult  a0, a1
+// 0x0105fe2c: 0x105fe2c: mult  a0, a1
 	ldloc.0
 	ldloc.1
 	mul
 	stloc 6
-// 0x0105fe20: 0x105fe20: addiu v0, zero, 200
+// 0x0105fe30: 0x105fe30: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 4
-// 0x0105fe24: 0x105fe24: mflo  lo
+// 0x0105fe34: 0x105fe34: mflo  lo
 	ldloc 6
 	stloc.1
-// 0x0105fe28: 0x105fe28: sll   zero, zero, 0
-// 0x0105fe2c: 0x105fe2c: sll   zero, zero, 0
-// 0x0105fe30: 0x105fe30: div   a1, v0
+// 0x0105fe38: 0x105fe38: sll   zero, zero, 0
+// 0x0105fe3c: 0x105fe3c: sll   zero, zero, 0
+// 0x0105fe40: 0x105fe40: div   a1, v0
 	ldloc.1
 	ldloc 4
 	div
 	stloc 6
-// 0x0105fe34: 0x105fe34: mflo  lo
+// 0x0105fe44: 0x105fe44: mflo  lo
 	ldloc 6
 	stloc.0
-// 0x0105fe38: 0x105fe38: slti  v0, a2, 151
+// 0x0105fe48: 0x105fe48: slti  v0, a2, 151
 	ldloc.2
 	ldc.i4 151
 	clt
 	stloc 4
-L_105fe3c:
-// 0x0105fe3c: 0x105fe3c: beq   v0, zero, 0x105fe58 slti  v0, a0, 100
+L_105fe4c:
+// 0x0105fe4c: 0x105fe4c: beq   v0, zero, 0x105fe68 slti  v0, a0, 100
 	ldloc 4
 	ldloc.0
 	ldc.i4.s 100
 	clt
 	stloc 4
-	brfalse L_105fe58
+	brfalse L_105fe68
 // --- basic block ---
-// 0x0105fe44: 0x105fe44: slt   v0, a0, a2
+// 0x0105fe54: 0x105fe54: slt   v0, a0, a2
 	ldloc.0
 	ldloc.2
 	clt
 	stloc 4
-// 0x0105fe48: 0x105fe48: beq   v0, zero, 0x105fe58 slti  v0, a0, 100
+// 0x0105fe58: 0x105fe58: beq   v0, zero, 0x105fe68 slti  v0, a0, 100
 	ldloc 4
 	ldloc.0
 	ldc.i4.s 100
 	clt
 	stloc 4
-	brfalse L_105fe58
+	brfalse L_105fe68
 // --- basic block ---
-// 0x0105fe50: 0x105fe50: addu  a0, a2, zero
+// 0x0105fe60: 0x105fe60: addu  a0, a2, zero
 	ldloc.2
 	stloc.0
-// 0x0105fe54: 0x105fe54: slti  v0, a0, 100
+// 0x0105fe64: 0x105fe64: slti  v0, a0, 100
 	ldloc.0
 	ldc.i4.s 100
 	clt
 	stloc 4
-L_105fe58:
-// 0x0105fe58: 0x105fe58: beq   v0, zero, 0x105fe64 addiu v0, zero, 4
+L_105fe68:
+// 0x0105fe68: 0x105fe68: beq   v0, zero, 0x105fe74 addiu v0, zero, 4
 	ldloc 4
 	ldc.i4.4
 	stloc 4
-	brfalse L_105fe64
+	brfalse L_105fe74
 // --- basic block ---
-// 0x0105fe60: 0x105fe60: addiu a0, zero, 100
+// 0x0105fe70: 0x105fe70: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.0
-L_105fe64:
-// 0x0105fe64: 0x105fe64: beq   a3, v0, 0x105fe90 addiu v1, zero, 500
+L_105fe74:
+// 0x0105fe74: 0x105fe74: beq   a3, v0, 0x105fea0 addiu v1, zero, 500
 	ldloc.3
 	ldloc 4
 	ldc.i4 500
 	stloc 5
-	beq  L_105fe90
+	beq  L_105fea0
 // --- basic block ---
-// 0x0105fe6c: 0x105fe6c: slti  v0, a0, 151
+// 0x0105fe7c: 0x105fe7c: slti  v0, a0, 151
 	ldloc.0
 	ldc.i4 151
 	clt
 	stloc 4
-// 0x0105fe70: 0x105fe70: bne   v0, zero, 0x105fe90 addiu v1, zero, 450
+// 0x0105fe80: 0x105fe80: bne   v0, zero, 0x105fea0 addiu v1, zero, 450
 	ldloc 4
 	ldc.i4 450
 	stloc 5
-	brtrue L_105fe90
+	brtrue L_105fea0
 // --- basic block ---
-// 0x0105fe78: 0x105fe78: slti  v0, a0, 501
+// 0x0105fe88: 0x105fe88: slti  v0, a0, 501
 	ldloc.0
 	ldc.i4 501
 	clt
 	stloc 4
-// 0x0105fe7c: 0x105fe7c: bne   v0, zero, 0x105fe90 addiu v1, zero, 600
+// 0x0105fe8c: 0x105fe8c: bne   v0, zero, 0x105fea0 addiu v1, zero, 600
 	ldloc 4
 	ldc.i4 600
 	stloc 5
-	brtrue L_105fe90
+	brtrue L_105fea0
 // --- basic block ---
-// 0x0105fe84: 0x105fe84: slti  v0, a0, 1001
+// 0x0105fe94: 0x105fe94: slti  v0, a0, 1001
 	ldloc.0
 	ldc.i4 1001
 	clt
 	stloc 4
-// 0x0105fe88: 0x105fe88: beq   v0, zero, 0x105fe98 addiu v1, zero, 745
+// 0x0105fe98: 0x105fe98: beq   v0, zero, 0x105fea8 addiu v1, zero, 745
 	ldloc 4
 	ldc.i4 745
 	stloc 5
-	brfalse L_105fe98
+	brfalse L_105fea8
 // --- basic block ---
-L_105fe90:
-// 0x0105fe90: 0x105fe90: j	 0x105feac lui   v0, 0x70000
+L_105fea0:
+// 0x0105fea0: 0x105fea0: j	 0x105febc lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 4
-	br L_105feac
+	br L_105febc
 // --- basic block ---
-L_105fe98:
-// 0x0105fe98: 0x105fe98: slti  a0, a0, 5001
+L_105fea8:
+// 0x0105fea8: 0x105fea8: slti  a0, a0, 5001
 	ldloc.0
 	ldc.i4 5001
 	clt
 	stloc.0
-// 0x0105fe9c: 0x105fe9c: lui   v0, 0x70000
+// 0x0105feac: 0x105feac: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0105fea0: 0x105fea0: beq   a0, zero, 0x105feac addiu v1, zero, 2000
+// 0x0105feb0: 0x105feb0: beq   a0, zero, 0x105febc addiu v1, zero, 2000
 	ldloc.0
 	ldc.i4 2000
 	stloc 5
-	brfalse L_105feac
+	brfalse L_105febc
 // --- basic block ---
-// 0x0105fea8: 0x105fea8: addiu v1, zero, 1000
+// 0x0105feb8: 0x105feb8: addiu v1, zero, 1000
 	ldc.i4 1000
 	stloc 5
-L_105feac:
-// 0x0105feac: 0x105feac: jr    ra sw    v1, 12280(v0)
+L_105febc:
+// 0x0105febc: 0x105febc: jr    ra sw    v1, 12744(v0)
 	ldloc 8
 	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 3070
+	ldc.i4 3186
 	add
 	ldloc 5
 	stelem.i4
@@ -3287,7 +3287,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 navigate_zoom_get_scale_105feb4()
+.method public static int32 navigate_zoom_get_scale_105fec4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -3304,25 +3304,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105feb4: 0x105feb4: lui   v0, 0x70000
+// 0x0105fec4: 0x105fec4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x0105feb8: 0x105feb8: lw    v0, 12280(v0)
+// 0x0105fec8: 0x105fec8: lw    v0, 12744(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3070
+	ldc.i4 3186
 	add
 	ldelem.i4
 	stloc.0
-// 0x0105febc: 0x105febc: jr    ra sll   zero, zero, 0
+// 0x0105fecc: 0x105fecc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_plugin_register_105fee4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_plugin_register_105fef4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3357,16 +3357,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105fee4: 0x105fee4: lui   a0, 0x0
+// 0x0105fef4: 0x105fef4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0105fee8: 0x105fee8: addiu sp, sp, -24
+// 0x0105fef8: 0x105fef8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105feec: 0x105feec: sw    ra, 20(sp)
-// 0x0105fef0: 0x105fef0: jal   0x10146b8 addiu a0, a0, 14640
+// 0x0105fefc: 0x105fefc: sw    ra, 20(sp)
+// 0x0105ff00: 0x105ff00: jal   0x10146c8 addiu a0, a0, 14640
 	ldloc.1
 	ldc.i4 14640
 	add
@@ -3375,14 +3375,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_plugin_register_10146b8(int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_plugin_register_10146c8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0105fef8: 0x105fef8: lw    ra, 20(sp)
-// 0x0105fefc: 0x105fefc: sll   zero, zero, 0
-// 0x0105ff00: 0x105ff00: jr    ra addiu sp, sp, 24
+// 0x0105ff08: 0x105ff08: lw    ra, 20(sp)
+// 0x0105ff0c: 0x105ff0c: sll   zero, zero, 0
+// 0x0105ff10: 0x105ff10: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3394,7 +3394,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_traffic_refresh_105ff08(int32,int32,int32,int32,int32)
+.method public static int32 navigate_traffic_refresh_105ff18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -3429,15 +3429,15 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0105ff08: 0x105ff08: lui   v1, 0x70000
+// 0x0105ff18: 0x105ff18: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0105ff0c: 0x105ff0c: addiu v0, v1, 12384
+// 0x0105ff1c: 0x105ff1c: addiu v0, v1, 12848
 	ldloc 7
-	ldc.i4 12384
+	ldc.i4 12848
 	add
 	stloc 6
-// 0x0105ff10: 0x105ff10: lw    a2, 8(v0)
+// 0x0105ff20: 0x105ff20: lw    a2, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3446,33 +3446,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0105ff14: 0x105ff14: addiu sp, sp, -24
+// 0x0105ff24: 0x105ff24: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0105ff18: 0x105ff18: addiu a0, zero, -1
+// 0x0105ff28: 0x105ff28: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0105ff1c: 0x105ff1c: sw    ra, 20(sp)
-// 0x0105ff20: 0x105ff20: beq   a2, zero, 0x105ff3c sw    a0, 12384(v1)
+// 0x0105ff2c: 0x105ff2c: sw    ra, 20(sp)
+// 0x0105ff30: 0x105ff30: beq   a2, zero, 0x105ff4c sw    a0, 12848(v1)
 	ldloc.3
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3096
+	ldc.i4 3212
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_105ff3c
+	brfalse L_105ff4c
 // --- basic block ---
-// 0x0105ff28: 0x105ff28: srl   a2, a2, 4
+// 0x0105ff38: 0x105ff38: srl   a2, a2, 4
 	ldloc.3
 	ldc.i4.4
 	shr.un
 	stloc.3
-// 0x0105ff2c: 0x105ff2c: lw    a0, 4(v0)
+// 0x0105ff3c: 0x105ff3c: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3481,12 +3481,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105ff30: 0x105ff30: sll   a2, a2, 2
+// 0x0105ff40: 0x105ff40: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x0105ff34: 0x105ff34: jal   0x100177c addu  a1, zero, zero
+// 0x0105ff44: 0x105ff44: jal   0x100177c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
@@ -3498,10 +3498,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_105ff3c:
-// 0x0105ff3c: 0x105ff3c: lw    ra, 20(sp)
-// 0x0105ff40: 0x105ff40: sll   zero, zero, 0
-// 0x0105ff44: 0x105ff44: jr    ra addiu sp, sp, 24
+L_105ff4c:
+// 0x0105ff4c: 0x105ff4c: lw    ra, 20(sp)
+// 0x0105ff50: 0x105ff50: sll   zero, zero, 0
+// 0x0105ff54: 0x105ff54: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3513,7 +3513,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_traffic_override_pen_105ff4c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_traffic_override_pen_105ff5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s4,int32 s5,int32 s2,int32 s0,int32 s6,int32 s1,int32 s8,int32 s3,int32 s7,int32 lo,int32 ra)
@@ -3578,25 +3578,25 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_105ff4c:
-// 0x0105ff4c: 0x105ff4c: lui   v0, 0x70000
+L_105ff5c:
+// 0x0105ff5c: 0x105ff5c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0105ff50: 0x105ff50: lw    v0, 12284(v0)
+// 0x0105ff60: 0x105ff60: lw    v0, 12748(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3071
+	ldc.i4 3187
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ff54: 0x105ff54: addiu sp, sp, -64
+// 0x0105ff64: 0x105ff64: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0105ff58: 0x105ff58: sw    s4, 40(sp)
+// 0x0105ff68: 0x105ff68: sw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3605,7 +3605,7 @@ L_105ff4c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0105ff5c: 0x105ff5c: sw    s3, 36(sp)
+// 0x0105ff6c: 0x105ff6c: sw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3614,7 +3614,7 @@ L_105ff4c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0105ff60: 0x105ff60: sw    s2, 32(sp)
+// 0x0105ff70: 0x105ff70: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3623,7 +3623,7 @@ L_105ff4c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0105ff64: 0x105ff64: sw    s1, 28(sp)
+// 0x0105ff74: 0x105ff74: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3632,7 +3632,7 @@ L_105ff4c:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0105ff68: 0x105ff68: sw    s0, 24(sp)
+// 0x0105ff78: 0x105ff78: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3641,8 +3641,8 @@ L_105ff4c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0105ff6c: 0x105ff6c: sw    ra, 60(sp)
-// 0x0105ff70: 0x105ff70: sw    s8, 56(sp)
+// 0x0105ff7c: 0x105ff7c: sw    ra, 60(sp)
+// 0x0105ff80: 0x105ff80: sw    s8, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3651,7 +3651,7 @@ L_105ff4c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0105ff74: 0x105ff74: sw    s7, 52(sp)
+// 0x0105ff84: 0x105ff84: sw    s7, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3660,7 +3660,7 @@ L_105ff4c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0105ff78: 0x105ff78: sw    s6, 48(sp)
+// 0x0105ff88: 0x105ff88: sw    s6, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3669,7 +3669,7 @@ L_105ff4c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0105ff7c: 0x105ff7c: sw    s5, 44(sp)
+// 0x0105ff8c: 0x105ff8c: sw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3678,16 +3678,16 @@ L_105ff4c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0105ff80: 0x105ff80: addu  s0, a0, zero
+// 0x0105ff90: 0x105ff90: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0105ff84: 0x105ff84: addu  s1, a1, zero
+// 0x0105ff94: 0x105ff94: addu  s1, a1, zero
 	ldloc.2
 	stloc 13
-// 0x0105ff88: 0x105ff88: addu  s4, a2, zero
+// 0x0105ff98: 0x105ff98: addu  s4, a2, zero
 	ldloc.3
 	stloc 8
-// 0x0105ff8c: 0x105ff8c: lw    s3, 80(sp)
+// 0x0105ff9c: 0x105ff9c: lw    s3, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3696,35 +3696,35 @@ L_105ff4c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0105ff90: 0x105ff90: beq   v0, zero, 0x106024c addu  s2, a3, zero
+// 0x0105ffa0: 0x105ffa0: beq   v0, zero, 0x106025c addu  s2, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 10
-	brfalse L_106024c
+	brfalse L_106025c
 // --- basic block ---
-// 0x0105ff98: 0x105ff98: slti  v0, a3, 2
+// 0x0105ffa8: 0x105ffa8: slti  v0, a3, 2
 	ldloc 4
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0105ff9c: 0x105ff9c: beq   v0, zero, 0x1060250 addu  v0, zero, zero
+// 0x0105ffac: 0x105ffac: beq   v0, zero, 0x1060260 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1060250
+	brfalse L_1060260
 // --- basic block ---
-// 0x0105ffa4: 0x105ffa4: slti  v0, a1, 6
+// 0x0105ffb4: 0x105ffb4: slti  v0, a1, 6
 	ldloc.2
 	ldc.i4.6
 	clt
 	stloc 5
-// 0x0105ffa8: 0x105ffa8: beq   v0, zero, 0x1060250 addu  v0, zero, zero
+// 0x0105ffb8: 0x105ffb8: beq   v0, zero, 0x1060260 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1060250
+	brfalse L_1060260
 // --- basic block ---
-// 0x0105ffb0: 0x105ffb0: jal   0x1013c44 addu  a0, a2, zero
+// 0x0105ffc0: 0x105ffc0: jal   0x1013c54 addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -3732,67 +3732,67 @@ L_105ff4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ffb8: 0x105ffb8: bltz  v0, 0x1060220 lui   v0, 0x70000
+// 0x0105ffc8: 0x105ffc8: bltz  v0, 0x1060230 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
 	ldc.i4.s 0
-	blt L_1060220
+	blt L_1060230
 // --- basic block ---
-// 0x0105ffc0: 0x105ffc0: lw    v0, 12384(v0)
+// 0x0105ffd0: 0x105ffd0: lw    v0, 12848(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3096
+	ldc.i4 3212
 	add
 	ldelem.i4
 	stloc 5
-// 0x0105ffc4: 0x105ffc4: sll   zero, zero, 0
-// 0x0105ffc8: 0x105ffc8: beq   v0, s4, 0x1060074 addiu v1, zero, -1
+// 0x0105ffd4: 0x105ffd4: sll   zero, zero, 0
+// 0x0105ffd8: 0x105ffd8: beq   v0, s4, 0x1060084 addiu v1, zero, -1
 	ldloc 5
 	ldloc 8
 	ldc.i4.m1
 	stloc 6
-	beq  L_1060074
+	beq  L_1060084
 // --- basic block ---
-// 0x0105ffd0: 0x105ffd0: beq   v0, v1, 0x105ffe0 sll   zero, zero, 0
+// 0x0105ffe0: 0x105ffe0: beq   v0, v1, 0x105fff0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	beq  L_105ffe0
+	beq  L_105fff0
 // --- basic block ---
-// 0x0105ffd8: 0x105ffd8: jal   0x105ff08 sll   zero, zero, 0
+// 0x0105ffe8: 0x105ffe8: jal   0x105ff18 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_traffic_refresh_105ff08(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_traffic_refresh_105ff18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_105ffe0:
-// 0x0105ffe0: 0x105ffe0: jal   0x1003abc sll   zero, zero, 0
+L_105fff0:
+// 0x0105fff0: 0x105fff0: jal   0x1003abc sll   zero, zero, 0
 	call int32 Cibyl2::roadmap_line_count_1003abc()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0105ffe8: 0x105ffe8: lui   v1, 0x70000
+// 0x0105fff8: 0x105fff8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0105ffec: 0x105ffec: addiu v1, v1, 12384
+// 0x0105fffc: 0x105fffc: addiu v1, v1, 12848
 	ldloc 6
-	ldc.i4 12384
+	ldc.i4 12848
 	add
 	stloc 6
-// 0x0105fff0: 0x105fff0: lw    a0, 8(v1)
+// 0x01060000: 0x1060000: lw    a0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3801,27 +3801,27 @@ L_105ffe0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0105fff4: 0x105fff4: sll   zero, zero, 0
-// 0x0105fff8: 0x105fff8: slt   a1, a0, v0
+// 0x01060004: 0x1060004: sll   zero, zero, 0
+// 0x01060008: 0x1060008: slt   a1, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.2
-// 0x0105fffc: 0x105fffc: beq   a1, zero, 0x1060078 lui   s6, 0x70000
+// 0x0106000c: 0x106000c: beq   a1, zero, 0x1060088 lui   s6, 0x70000
 	ldloc.2
 	ldc.i4 458752
 	stloc 12
-	brfalse L_1060078
+	brfalse L_1060088
 // --- basic block ---
-// 0x01060004: 0x1060004: beq   a0, zero, 0x1060024 srl   a2, v0, 4
+// 0x01060014: 0x1060014: beq   a0, zero, 0x1060034 srl   a2, v0, 4
 	ldloc.1
 	ldloc 5
 	ldc.i4.4
 	shr.un
 	stloc.3
-	brfalse L_1060024
+	brfalse L_1060034
 // --- basic block ---
-// 0x0106000c: 0x106000c: lw    a0, 4(v1)
+// 0x0106001c: 0x106001c: lw    a0, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3830,7 +3830,7 @@ L_105ffe0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060010: 0x1060010: jal   0x1000930 sw    v0, 16(sp)
+// 0x01060020: 0x1060020: jal   0x1000930 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3849,7 +3849,7 @@ L_105ffe0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01060018: 0x1060018: lw    v0, 16(sp)
+// 0x01060028: 0x1060028: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3858,35 +3858,35 @@ L_105ffe0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106001c: 0x106001c: sll   zero, zero, 0
-// 0x01060020: 0x1060020: srl   a2, v0, 4
+// 0x0106002c: 0x106002c: sll   zero, zero, 0
+// 0x01060030: 0x1060030: srl   a2, v0, 4
 	ldloc 5
 	ldc.i4.4
 	shr.un
 	stloc.3
-L_1060024:
-// 0x01060024: 0x1060024: lui   v1, 0x70000
+L_1060034:
+// 0x01060034: 0x1060034: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01060028: 0x1060028: addiu a2, a2, 1
+// 0x01060038: 0x1060038: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x0106002c: 0x106002c: sll   a2, a2, 2
+// 0x0106003c: 0x106003c: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01060030: 0x1060030: addiu s5, v1, 12384
+// 0x01060040: 0x1060040: addiu s5, v1, 12848
 	ldloc 6
-	ldc.i4 12384
+	ldc.i4 12848
 	add
 	stloc 9
-// 0x01060034: 0x1060034: addu  a0, a2, zero
+// 0x01060044: 0x1060044: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01060038: 0x1060038: sw    v0, 8(s5)
+// 0x01060048: 0x1060048: sw    v0, 8(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3895,16 +3895,16 @@ L_1060024:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106003c: 0x106003c: sw    s4, 12384(v1)
+// 0x0106004c: 0x106004c: sw    s4, 12848(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3096
+	ldc.i4 3212
 	add
 	ldloc 8
 	stelem.i4
-// 0x01060040: 0x1060040: jal   0x1000910 sw    a2, 16(sp)
+// 0x01060050: 0x1060050: jal   0x1000910 sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3923,7 +3923,7 @@ L_1060024:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01060048: 0x1060048: lw    a2, 16(sp)
+// 0x01060058: 0x1060058: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3932,13 +3932,13 @@ L_1060024:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0106004c: 0x106004c: addu  a0, v0, zero
+// 0x0106005c: 0x106005c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01060050: 0x1060050: addu  a1, zero, zero
+// 0x01060060: 0x1060060: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01060054: 0x1060054: jal   0x100177c addu  s4, v0, zero
+// 0x01060064: 0x1060064: jal   0x100177c addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
@@ -3950,21 +3950,21 @@ L_1060024:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106005c: 0x106005c: lui   a0, 0x10000
+// 0x0106006c: 0x106006c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01060060: 0x1060060: addiu a0, a0, 12472
+// 0x01060070: 0x1060070: addiu a0, a0, 12468
 	ldloc.1
-	ldc.i4 12472
+	ldc.i4 12468
 	add
 	stloc.1
-// 0x01060064: 0x1060064: addu  a2, s4, zero
+// 0x01060074: 0x1060074: addu  a2, s4, zero
 	ldloc 8
 	stloc.3
-// 0x01060068: 0x1060068: addiu a1, zero, 238
+// 0x01060078: 0x1060078: addiu a1, zero, 238
 	ldc.i4 238
 	stloc.2
-// 0x0106006c: 0x106006c: jal   0x1004a38 sw    s4, 4(s5)
+// 0x0106007c: 0x106007c: jal   0x1004a48 sw    s4, 4(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3978,27 +3978,27 @@ L_1060024:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_check_allocated_with_source_line_1004a48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1060074:
-// 0x01060074: 0x1060074: lui   s6, 0x70000
+L_1060084:
+// 0x01060084: 0x1060084: lui   s6, 0x70000
 	ldc.i4 458752
 	stloc 12
-L_1060078:
-// 0x01060078: 0x1060078: addiu s6, s6, 12384
+L_1060088:
+// 0x01060088: 0x1060088: addiu s6, s6, 12848
 	ldloc 12
-	ldc.i4 12384
+	ldc.i4 12848
 	add
 	stloc 12
-// 0x0106007c: 0x106007c: srl   s5, s0, 4
+// 0x0106008c: 0x106008c: srl   s5, s0, 4
 	ldloc 11
 	ldc.i4.4
 	shr.un
 	stloc 9
-// 0x01060080: 0x1060080: lw    v0, 4(s6)
+// 0x01060090: 0x1060090: lw    v0, 4(s6)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -4007,121 +4007,121 @@ L_1060078:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060084: 0x1060084: sll   s5, s5, 2
+// 0x01060094: 0x1060094: sll   s5, s5, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x01060088: 0x1060088: addu  v0, v0, s5
+// 0x01060098: 0x1060098: addu  v0, v0, s5
 	ldloc 5
 	ldloc 9
 	add
 	stloc 5
-// 0x0106008c: 0x106008c: lw    v0, 0(v0)
+// 0x0106009c: 0x106009c: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01060090: 0x1060090: andi  s4, s0, 15
+// 0x010600a0: 0x10600a0: andi  s4, s0, 15
 	ldloc 11
 	ldc.i4.s 15
 	and
 	stloc 8
-// 0x01060094: 0x1060094: lui   v1, 0x70000
+// 0x010600a4: 0x10600a4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01060098: 0x1060098: lw    v1, 12396(v1)
+// 0x010600a8: 0x10600a8: lw    v1, 12860(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3099
+	ldc.i4 3215
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106009c: 0x106009c: sll   s4, s4, 1
+// 0x010600ac: 0x10600ac: sll   s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	shl
 	stloc 8
-// 0x010600a0: 0x10600a0: srav  v0, s4, v0
+// 0x010600b0: 0x10600b0: srav  v0, s4, v0
 	ldloc 5
 	ldloc 8
 	shr
 	stloc 5
-// 0x010600a4: 0x10600a4: and   v0, v0, v1
+// 0x010600b4: 0x10600b4: and   v0, v0, v1
 	ldloc 5
 	ldloc 6
 	and
 	stloc 5
-// 0x010600a8: 0x10600a8: addiu v1, zero, 1
+// 0x010600b8: 0x10600b8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010600ac: 0x10600ac: beq   v0, v1, 0x106024c addiu s7, zero, 2
+// 0x010600bc: 0x10600bc: beq   v0, v1, 0x106025c addiu s7, zero, 2
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	stloc 16
-	beq  L_106024c
+	beq  L_106025c
 // --- basic block ---
-// 0x010600b4: 0x10600b4: bne   v0, s7, 0x10600e4 addu  a0, s0, zero
+// 0x010600c4: 0x10600c4: bne   v0, s7, 0x10600f4 addu  a0, s0, zero
 	ldloc 5
 	ldloc 16
 	ldloc 11
 	stloc.1
-	bne.un L_10600e4
+	bne.un L_10600f4
 // --- basic block ---
-// 0x010600bc: 0x10600bc: sll   s1, s1, 1
+// 0x010600cc: 0x10600cc: sll   s1, s1, 1
 	ldloc 13
 	ldc.i4.1
 	shl
 	stloc 13
-// 0x010600c0: 0x10600c0: addu  s2, s1, s2
+// 0x010600d0: 0x10600d0: addu  s2, s1, s2
 	ldloc 13
 	ldloc 10
 	add
 	stloc 10
-// 0x010600c4: 0x10600c4: lui   v0, 0x70000
+// 0x010600d4: 0x10600d4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010600c8: 0x10600c8: addiu v0, v0, 12288
+// 0x010600d8: 0x10600d8: addiu v0, v0, 12752
 	ldloc 5
-	ldc.i4 12288
+	ldc.i4 12752
 	add
 	stloc 5
-// 0x010600cc: 0x10600cc: sll   s2, s2, 2
+// 0x010600dc: 0x10600dc: sll   s2, s2, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x010600d0: 0x10600d0: addu  s2, s2, v0
+// 0x010600e0: 0x10600e0: addu  s2, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x010600d4: 0x10600d4: lw    v1, 0(s2)
+// 0x010600e4: 0x10600e4: lw    v1, 0(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010600d8: 0x10600d8: addiu v0, zero, 1
+// 0x010600e8: 0x10600e8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010600dc: 0x10600dc: j	 0x1060250 sw    v1, 0(s3)
+// 0x010600ec: 0x10600ec: j	 0x1060260 sw    v1, 0(s3)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_1060250
+	br L_1060260
 // --- basic block ---
-L_10600e4:
-// 0x010600e4: 0x10600e4: jal   0x1004f48 addu  a1, zero, zero
+L_10600f4:
+// 0x010600f4: 0x10600f4: jal   0x1004f58 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4129,21 +4129,21 @@ L_10600e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_speed_1004f48(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_speed_1004f58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010600ec: 0x10600ec: beq   v0, zero, 0x1060174 addu  s8, v0, zero
+// 0x010600fc: 0x10600fc: beq   v0, zero, 0x1060184 addu  s8, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 14
-	brfalse L_1060174
+	brfalse L_1060184
 // --- basic block ---
-// 0x010600f4: 0x10600f4: addu  a0, s0, zero
+// 0x01060104: 0x1060104: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x010600f8: 0x10600f8: jal   0x1005078 addu  a1, zero, zero
+// 0x01060108: 0x1060108: jal   0x1005088 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -4151,23 +4151,23 @@ L_10600e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_avg_speed_1005078(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_avg_speed_1005088(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01060100: 0x1060100: slti  v1, v0, 15
+// 0x01060110: 0x1060110: slti  v1, v0, 15
 	ldloc 5
 	ldc.i4.s 15
 	clt
 	stloc 6
-// 0x01060104: 0x1060104: beq   v1, zero, 0x1060130 addiu v1, zero, 3
+// 0x01060114: 0x1060114: beq   v1, zero, 0x1060140 addiu v1, zero, 3
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	brfalse L_1060130
+	brfalse L_1060140
 // --- basic block ---
-// 0x0106010c: 0x106010c: lw    v0, 4(s6)
+// 0x0106011c: 0x106011c: lw    v0, 4(s6)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -4176,69 +4176,69 @@ L_10600e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060110: 0x1060110: addiu v1, zero, 1
+// 0x01060120: 0x1060120: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01060114: 0x1060114: addu  s5, v0, s5
+// 0x01060124: 0x1060124: addu  s5, v0, s5
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x01060118: 0x1060118: sllv  s4, s4, v1
+// 0x01060128: 0x1060128: sllv  s4, s4, v1
 	ldloc 6
 	ldloc 8
 	shl
 	stloc 8
-// 0x0106011c: 0x106011c: lw    v1, 0(s5)
+// 0x0106012c: 0x106012c: lw    v1, 0(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01060120: 0x1060120: addu  v0, zero, zero
+// 0x01060130: 0x1060130: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01060124: 0x1060124: or    s4, v1, s4
+// 0x01060134: 0x1060134: or    s4, v1, s4
 	ldloc 6
 	ldloc 8
 	or
 	stloc 8
-// 0x01060128: 0x1060128: j	 0x1060250 sw    s4, 0(s5)
+// 0x01060138: 0x1060138: j	 0x1060260 sw    s4, 0(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-	br L_1060250
+	br L_1060260
 // --- basic block ---
-L_1060130:
-// 0x01060130: 0x1060130: sll   v0, v0, 1
+L_1060140:
+// 0x01060140: 0x1060140: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x01060134: 0x1060134: div   v0, v1
+// 0x01060144: 0x1060144: div   v0, v1
 	ldloc 5
 	ldloc 6
 	div
 	stloc 17
-// 0x01060138: 0x1060138: mflo  lo
+// 0x01060148: 0x1060148: mflo  lo
 	ldloc 17
 	stloc 6
-// 0x0106013c: 0x106013c: slt   s8, s8, v1
+// 0x0106014c: 0x106014c: slt   s8, s8, v1
 	ldloc 14
 	ldloc 6
 	clt
 	stloc 14
-// 0x01060140: 0x1060140: beq   s8, zero, 0x1060178 addu  a0, s0, zero
+// 0x01060150: 0x1060150: beq   s8, zero, 0x1060188 addu  a0, s0, zero
 	ldloc 14
 	ldloc 11
 	stloc.1
-	brfalse L_1060178
+	brfalse L_1060188
 // --- basic block ---
-// 0x01060148: 0x1060148: lw    v0, 4(s6)
+// 0x01060158: 0x1060158: lw    v0, 4(s6)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -4247,59 +4247,59 @@ L_1060130:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106014c: 0x106014c: sll   s1, s1, 1
+// 0x0106015c: 0x106015c: sll   s1, s1, 1
 	ldloc 13
 	ldc.i4.1
 	shl
 	stloc 13
-// 0x01060150: 0x1060150: addu  s5, v0, s5
+// 0x01060160: 0x1060160: addu  s5, v0, s5
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x01060154: 0x1060154: addu  s2, s1, s2
+// 0x01060164: 0x1060164: addu  s2, s1, s2
 	ldloc 13
 	ldloc 10
 	add
 	stloc 10
-// 0x01060158: 0x1060158: lui   v0, 0x70000
+// 0x01060168: 0x1060168: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106015c: 0x106015c: sll   s2, s2, 2
+// 0x0106016c: 0x106016c: sll   s2, s2, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x01060160: 0x1060160: addiu v0, v0, 12288
+// 0x01060170: 0x1060170: addiu v0, v0, 12752
 	ldloc 5
-	ldc.i4 12288
+	ldc.i4 12752
 	add
 	stloc 5
-// 0x01060164: 0x1060164: addu  s2, s2, v0
+// 0x01060174: 0x1060174: addu  s2, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x01060168: 0x1060168: lw    v1, 0(s5)
+// 0x01060178: 0x1060178: lw    v1, 0(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0106016c: 0x106016c: j	 0x1060208 sllv  s4, s4, s7
+// 0x0106017c: 0x106017c: j	 0x1060218 sllv  s4, s4, s7
 	ldloc 16
 	ldloc 8
 	shl
 	stloc 8
-	br L_1060208
+	br L_1060218
 // --- basic block ---
-L_1060174:
-// 0x01060174: 0x1060174: addu  a0, s0, zero
+L_1060184:
+// 0x01060184: 0x1060184: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-L_1060178:
-// 0x01060178: 0x1060178: jal   0x1004f48 addiu a1, zero, 1
+L_1060188:
+// 0x01060188: 0x1060188: jal   0x1004f58 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4307,21 +4307,21 @@ L_1060178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_speed_1004f48(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_speed_1004f58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01060180: 0x1060180: beq   v0, zero, 0x1060220 addu  s6, v0, zero
+// 0x01060190: 0x1060190: beq   v0, zero, 0x1060230 addu  s6, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 12
-	brfalse L_1060220
+	brfalse L_1060230
 // --- basic block ---
-// 0x01060188: 0x1060188: addu  a0, s0, zero
+// 0x01060198: 0x1060198: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x0106018c: 0x106018c: jal   0x1005078 addiu a1, zero, 1
+// 0x0106019c: 0x106019c: jal   0x1005088 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4329,249 +4329,249 @@ L_1060178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_avg_speed_1005078(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_avg_speed_1005088(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01060194: 0x1060194: slti  v1, v0, 15
+// 0x010601a4: 0x10601a4: slti  v1, v0, 15
 	ldloc 5
 	ldc.i4.s 15
 	clt
 	stloc 6
-// 0x01060198: 0x1060198: beq   v1, zero, 0x10601c4 addiu v1, zero, 3
+// 0x010601a8: 0x10601a8: beq   v1, zero, 0x10601d4 addiu v1, zero, 3
 	ldloc 6
 	ldc.i4.3
 	stloc 6
-	brfalse L_10601c4
+	brfalse L_10601d4
 // --- basic block ---
-// 0x010601a0: 0x10601a0: lui   v0, 0x70000
+// 0x010601b0: 0x10601b0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010601a4: 0x10601a4: lw    v0, 12388(v0)
+// 0x010601b4: 0x10601b4: lw    v0, 12852(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3097
+	ldc.i4 3213
 	add
 	ldelem.i4
 	stloc 5
-// 0x010601a8: 0x10601a8: addiu v1, zero, 1
+// 0x010601b8: 0x10601b8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010601ac: 0x10601ac: addu  s5, v0, s5
+// 0x010601bc: 0x10601bc: addu  s5, v0, s5
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x010601b0: 0x10601b0: lw    v0, 0(s5)
+// 0x010601c0: 0x10601c0: lw    v0, 0(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010601b4: 0x10601b4: sllv  s4, s4, v1
+// 0x010601c4: 0x10601c4: sllv  s4, s4, v1
 	ldloc 6
 	ldloc 8
 	shl
 	stloc 8
-// 0x010601b8: 0x10601b8: or    s4, v0, s4
+// 0x010601c8: 0x10601c8: or    s4, v0, s4
 	ldloc 5
 	ldloc 8
 	or
 	stloc 8
-// 0x010601bc: 0x10601bc: j	 0x106024c sw    s4, 0(s5)
+// 0x010601cc: 0x10601cc: j	 0x106025c sw    s4, 0(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-	br L_106024c
+	br L_106025c
 // --- basic block ---
-L_10601c4:
-// 0x010601c4: 0x10601c4: sll   v0, v0, 1
+L_10601d4:
+// 0x010601d4: 0x10601d4: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x010601c8: 0x10601c8: div   v0, v1
+// 0x010601d8: 0x10601d8: div   v0, v1
 	ldloc 5
 	ldloc 6
 	div
 	stloc 17
-// 0x010601cc: 0x10601cc: mflo  lo
+// 0x010601dc: 0x10601dc: mflo  lo
 	ldloc 17
 	stloc 6
-// 0x010601d0: 0x10601d0: slt   s6, s6, v1
+// 0x010601e0: 0x10601e0: slt   s6, s6, v1
 	ldloc 12
 	ldloc 6
 	clt
 	stloc 12
-// 0x010601d4: 0x10601d4: beq   s6, zero, 0x1060220 lui   v0, 0x70000
+// 0x010601e4: 0x10601e4: beq   s6, zero, 0x1060230 lui   v0, 0x70000
 	ldloc 12
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1060220
+	brfalse L_1060230
 // --- basic block ---
-// 0x010601dc: 0x10601dc: lw    v0, 12388(v0)
+// 0x010601ec: 0x10601ec: lw    v0, 12852(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3097
+	ldc.i4 3213
 	add
 	ldelem.i4
 	stloc 5
-// 0x010601e0: 0x10601e0: sll   s1, s1, 1
+// 0x010601f0: 0x10601f0: sll   s1, s1, 1
 	ldloc 13
 	ldc.i4.1
 	shl
 	stloc 13
-// 0x010601e4: 0x10601e4: addu  s5, v0, s5
+// 0x010601f4: 0x10601f4: addu  s5, v0, s5
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x010601e8: 0x10601e8: addu  s2, s1, s2
+// 0x010601f8: 0x10601f8: addu  s2, s1, s2
 	ldloc 13
 	ldloc 10
 	add
 	stloc 10
-// 0x010601ec: 0x10601ec: lui   v0, 0x70000
+// 0x010601fc: 0x10601fc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010601f0: 0x10601f0: addiu v0, v0, 12288
+// 0x01060200: 0x1060200: addiu v0, v0, 12752
 	ldloc 5
-	ldc.i4 12288
+	ldc.i4 12752
 	add
 	stloc 5
-// 0x010601f4: 0x10601f4: sll   s2, s2, 2
+// 0x01060204: 0x1060204: sll   s2, s2, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x010601f8: 0x10601f8: addu  s2, s2, v0
+// 0x01060208: 0x1060208: addu  s2, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 10
-// 0x010601fc: 0x10601fc: lw    v1, 0(s5)
+// 0x0106020c: 0x106020c: lw    v1, 0(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01060200: 0x1060200: addiu v0, zero, 2
+// 0x01060210: 0x1060210: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01060204: 0x1060204: sllv  s4, s4, v0
+// 0x01060214: 0x1060214: sllv  s4, s4, v0
 	ldloc 5
 	ldloc 8
 	shl
 	stloc 8
-L_1060208:
-// 0x01060208: 0x1060208: lw    v0, 0(s2)
+L_1060218:
+// 0x01060218: 0x1060218: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0106020c: 0x106020c: or    s4, v1, s4
+// 0x0106021c: 0x106021c: or    s4, v1, s4
 	ldloc 6
 	ldloc 8
 	or
 	stloc 8
-// 0x01060210: 0x1060210: sw    v0, 0(s3)
+// 0x01060220: 0x1060220: sw    v0, 0(s3)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01060214: 0x1060214: sw    s4, 0(s5)
+// 0x01060224: 0x1060224: sw    s4, 0(s5)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01060218: 0x1060218: j	 0x1060250 addiu v0, zero, 1
+// 0x01060228: 0x1060228: j	 0x1060260 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1060250
+	br L_1060260
 // --- basic block ---
-L_1060220:
-// 0x01060220: 0x1060220: lui   v0, 0x70000
+L_1060230:
+// 0x01060230: 0x1060230: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060224: 0x1060224: lw    v1, 12388(v0)
+// 0x01060234: 0x1060234: lw    v1, 12852(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3097
+	ldc.i4 3213
 	add
 	ldelem.i4
 	stloc 6
-// 0x01060228: 0x1060228: srl   v0, s0, 4
+// 0x01060238: 0x1060238: srl   v0, s0, 4
 	ldloc 11
 	ldc.i4.4
 	shr.un
 	stloc 5
-// 0x0106022c: 0x106022c: sll   v0, v0, 2
+// 0x0106023c: 0x106023c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01060230: 0x1060230: addu  v0, v1, v0
+// 0x01060240: 0x1060240: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01060234: 0x1060234: lw    v1, 0(v0)
+// 0x01060244: 0x1060244: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01060238: 0x1060238: sll   s0, s0, 1
+// 0x01060248: 0x1060248: sll   s0, s0, 1
 	ldloc 11
 	ldc.i4.1
 	shl
 	stloc 11
-// 0x0106023c: 0x106023c: addiu a0, zero, 1
+// 0x0106024c: 0x106024c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01060240: 0x1060240: sllv  s0, s0, a0
+// 0x01060250: 0x1060250: sllv  s0, s0, a0
 	ldloc.1
 	ldloc 11
 	shl
 	stloc 11
-// 0x01060244: 0x1060244: or    s0, v1, s0
+// 0x01060254: 0x1060254: or    s0, v1, s0
 	ldloc 6
 	ldloc 11
 	or
 	stloc 11
-// 0x01060248: 0x1060248: sw    s0, 0(v0)
+// 0x01060258: 0x1060258: sw    s0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-L_106024c:
-// 0x0106024c: 0x106024c: addu  v0, zero, zero
+L_106025c:
+// 0x0106025c: 0x106025c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1060250:
-// 0x01060250: 0x1060250: lw    ra, 60(sp)
-// 0x01060254: 0x1060254: lw    s8, 56(sp)
+L_1060260:
+// 0x01060260: 0x1060260: lw    ra, 60(sp)
+// 0x01060264: 0x1060264: lw    s8, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4580,7 +4580,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01060258: 0x1060258: lw    s7, 52(sp)
+// 0x01060268: 0x1060268: lw    s7, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4589,7 +4589,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0106025c: 0x106025c: lw    s6, 48(sp)
+// 0x0106026c: 0x106026c: lw    s6, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4598,7 +4598,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01060260: 0x1060260: lw    s5, 44(sp)
+// 0x01060270: 0x1060270: lw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4607,7 +4607,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01060264: 0x1060264: lw    s4, 40(sp)
+// 0x01060274: 0x1060274: lw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4616,7 +4616,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01060268: 0x1060268: lw    s3, 36(sp)
+// 0x01060278: 0x1060278: lw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4625,7 +4625,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0106026c: 0x106026c: lw    s2, 32(sp)
+// 0x0106027c: 0x106027c: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4634,7 +4634,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01060270: 0x1060270: lw    s1, 28(sp)
+// 0x01060280: 0x1060280: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4643,7 +4643,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01060274: 0x1060274: lw    s0, 24(sp)
+// 0x01060284: 0x1060284: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4652,7 +4652,7 @@ L_1060250:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01060278: 0x1060278: jr    ra addiu sp, sp, 64
+// 0x01060288: 0x1060288: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -4664,7 +4664,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_traffic_display_1060280(int32,int32,int32,int32,int32)
+.method public static int32 navigate_traffic_display_1060290(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4699,82 +4699,82 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01060280: 0x1060280: addiu sp, sp, -24
+// 0x01060290: 0x1060290: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01060284: 0x1060284: sw    ra, 20(sp)
-// 0x01060288: 0x1060288: beq   a0, zero, 0x10602a8 lui   v0, 0x70000
+// 0x01060294: 0x1060294: sw    ra, 20(sp)
+// 0x01060298: 0x1060298: beq   a0, zero, 0x10602b8 lui   v0, 0x70000
 	ldloc.1
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10602a8
+	brfalse L_10602b8
 // --- basic block ---
-// 0x01060290: 0x1060290: lw    v0, 12284(v0)
+// 0x010602a0: 0x10602a0: lw    v0, 12748(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3071
+	ldc.i4 3187
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060294: 0x1060294: sll   zero, zero, 0
-// 0x01060298: 0x1060298: beq   v0, zero, 0x10602b8 lui   v0, 0x70000
+// 0x010602a4: 0x10602a4: sll   zero, zero, 0
+// 0x010602a8: 0x10602a8: beq   v0, zero, 0x10602c8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10602b8
+	brfalse L_10602c8
 // --- basic block ---
-// 0x010602a0: 0x10602a0: j	 0x10602c8 sll   zero, zero, 0
-	br L_10602c8
+// 0x010602b0: 0x10602b0: j	 0x10602d8 sll   zero, zero, 0
+	br L_10602d8
 // --- basic block ---
-L_10602a8:
-// 0x010602a8: 0x10602a8: lw    v0, 12284(v0)
+L_10602b8:
+// 0x010602b8: 0x10602b8: lw    v0, 12748(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3071
+	ldc.i4 3187
 	add
 	ldelem.i4
 	stloc 5
-// 0x010602ac: 0x10602ac: sll   zero, zero, 0
-// 0x010602b0: 0x10602b0: beq   v0, zero, 0x10602c8 lui   v0, 0x70000
+// 0x010602bc: 0x10602bc: sll   zero, zero, 0
+// 0x010602c0: 0x10602c0: beq   v0, zero, 0x10602d8 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10602c8
+	brfalse L_10602d8
 // --- basic block ---
-L_10602b8:
-// 0x010602b8: 0x10602b8: beq   a0, zero, 0x10602c8 sw    a0, 12284(v0)
+L_10602c8:
+// 0x010602c8: 0x10602c8: beq   a0, zero, 0x10602d8 sw    a0, 12748(v0)
 	ldloc.1
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3071
+	ldc.i4 3187
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_10602c8
+	brfalse L_10602d8
 // --- basic block ---
-// 0x010602c0: 0x10602c0: jal   0x1010a4c sll   zero, zero, 0
+// 0x010602d0: 0x10602d0: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10602c8:
-// 0x010602c8: 0x10602c8: lw    ra, 20(sp)
-// 0x010602cc: 0x10602cc: sll   zero, zero, 0
-// 0x010602d0: 0x10602d0: jr    ra addiu sp, sp, 24
+L_10602d8:
+// 0x010602d8: 0x10602d8: lw    ra, 20(sp)
+// 0x010602dc: 0x10602dc: sll   zero, zero, 0
+// 0x010602e0: 0x10602e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4786,7 +4786,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_pens_10602d8(int32,int32,int32,int32,int32)
+.method public static int32 create_pens_10602e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 s0,int32 s1,int32 v0,int32 s3,int32 s4,int32 s8,int32 s5,int32 v1,int32 s6,int32 s7,int32 ra)
@@ -4848,12 +4848,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010602d8: 0x10602d8: addiu sp, sp, -136
+// 0x010602e8: 0x10602e8: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x010602dc: 0x10602dc: sw    s8, 128(sp)
+// 0x010602ec: 0x10602ec: sw    s8, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010602e0: 0x10602e0: sw    s2, 104(sp)
+// 0x010602f0: 0x10602f0: sw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4871,13 +4871,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010602e4: 0x10602e4: lui   s8, 0x0
+// 0x010602f4: 0x10602f4: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x010602e8: 0x10602e8: lui   s2, 0x70000
+// 0x010602f8: 0x10602f8: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010602ec: 0x10602ec: sw    s7, 124(sp)
+// 0x010602fc: 0x10602fc: sw    s7, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4886,7 +4886,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010602f0: 0x10602f0: sw    s6, 120(sp)
+// 0x01060300: 0x1060300: sw    s6, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4895,7 +4895,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010602f4: 0x10602f4: sw    s5, 116(sp)
+// 0x01060304: 0x1060304: sw    s5, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4904,7 +4904,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010602f8: 0x10602f8: sw    s0, 96(sp)
+// 0x01060308: 0x1060308: sw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4913,8 +4913,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010602fc: 0x10602fc: sw    ra, 132(sp)
-// 0x01060300: 0x1060300: sw    s4, 112(sp)
+// 0x0106030c: 0x106030c: sw    ra, 132(sp)
+// 0x01060310: 0x1060310: sw    s4, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4923,7 +4923,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01060304: 0x1060304: sw    s3, 108(sp)
+// 0x01060314: 0x1060314: sw    s3, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4932,7 +4932,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01060308: 0x1060308: sw    s1, 100(sp)
+// 0x01060318: 0x1060318: sw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4941,48 +4941,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0106030c: 0x106030c: addiu s2, s2, 12296
+// 0x0106031c: 0x106031c: addiu s2, s2, 12760
 	ldloc 6
-	ldc.i4 12296
+	ldc.i4 12760
 	add
 	stloc 6
-// 0x01060310: 0x1060310: addiu s8, s8, 31980
+// 0x01060320: 0x1060320: addiu s8, s8, 31980
 	ldloc 12
 	ldc.i4 31980
 	add
 	stloc 12
-// 0x01060314: 0x1060314: addiu s0, zero, 100
+// 0x01060324: 0x1060324: addiu s0, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x01060318: 0x1060318: addiu s5, sp, 16
+// 0x01060328: 0x1060328: addiu s5, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 13
-// 0x0106031c: 0x106031c: addiu s7, zero, 2
+// 0x0106032c: 0x106032c: addiu s7, zero, 2
 	ldc.i4.2
 	stloc 16
-// 0x01060320: 0x1060320: j	 0x1060390 addiu s6, zero, 1200
+// 0x01060330: 0x1060330: j	 0x10603a0 addiu s6, zero, 1200
 	ldc.i4 1200
 	stloc 15
-	br L_1060390
+	br L_10603a0
 // --- basic block ---
-L_1060328:
-// 0x01060328: 0x1060328: lui   a2, 0x10000
+L_1060338:
+// 0x01060338: 0x1060338: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0106032c: 0x106032c: addu  a3, s3, zero
+// 0x0106033c: 0x106033c: addu  a3, s3, zero
 	ldloc 10
 	stloc 4
-// 0x01060330: 0x1060330: addiu a2, a2, 12512
+// 0x01060340: 0x1060340: addiu a2, a2, 12508
 	ldloc.3
-	ldc.i4 12512
+	ldc.i4 12508
 	add
 	stloc.3
-// 0x01060334: 0x1060334: addu  a0, s5, zero
+// 0x01060344: 0x1060344: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01060338: 0x1060338: jal   0x1000f9c addiu a1, zero, 80
+// 0x01060348: 0x1060348: jal   0x1000f9c addiu a1, zero, 80
 	ldc.i4.s 80
 	stloc.2
 	ldloc.0
@@ -4995,10 +4995,10 @@ L_1060328:
 	stloc 14
 	stloc 9
 // --- basic block ---
-// 0x01060340: 0x1060340: addu  a0, s5, zero
+// 0x01060350: 0x1060350: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x01060344: 0x1060344: jal   0x104ef00 addiu a1, zero, 1
+// 0x01060354: 0x1060354: jal   0x104ef10 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -5006,20 +5006,20 @@ L_1060328:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 14
 	stloc 9
 // --- basic block ---
-// 0x0106034c: 0x106034c: lui   a0, 0x0
+// 0x0106035c: 0x106035c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01060350: 0x1060350: addiu a0, a0, 14700
+// 0x01060360: 0x1060360: addiu a0, a0, 14700
 	ldloc.1
 	ldc.i4 14700
 	add
 	stloc.1
-// 0x01060354: 0x1060354: bne   s1, zero, 0x1060364 sw    v0, 0(s4)
+// 0x01060364: 0x1060364: bne   s1, zero, 0x1060374 sw    v0, 0(s4)
 	ldloc 8
 	ldloc 5
 	ldloc 11
@@ -5027,30 +5027,30 @@ L_1060328:
 	shr.un
 	ldloc 9
 	stelem.i4
-	brtrue L_1060364
+	brtrue L_1060374
 // --- basic block ---
-// 0x0106035c: 0x106035c: j	 0x1060370 addu  a0, s8, zero
+// 0x0106036c: 0x106036c: j	 0x1060380 addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-	br L_1060370
+	br L_1060380
 // --- basic block ---
-L_1060364:
-// 0x01060364: 0x1060364: jal   0x100e348 sll   zero, zero, 0
+L_1060374:
+// 0x01060374: 0x1060374: jal   0x100e358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 14
 	stloc 9
 // --- basic block ---
-// 0x0106036c: 0x106036c: addu  a0, v0, zero
+// 0x0106037c: 0x106037c: addu  a0, v0, zero
 	ldloc 9
 	stloc.1
-L_1060370:
-// 0x01060370: 0x1060370: jal   0x104edb0 addiu s1, s1, 1
+L_1060380:
+// 0x01060380: 0x1060380: jal   0x104edc0 addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
@@ -5060,54 +5060,54 @@ L_1060370:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 14
 	stloc 9
 // --- basic block ---
-// 0x01060378: 0x1060378: addiu s3, s3, 10
+// 0x01060388: 0x1060388: addiu s3, s3, 10
 	ldloc 10
 	ldc.i4.s 10
 	add
 	stloc 10
-// 0x0106037c: 0x106037c: bne   s1, s7, 0x1060328 addiu s4, s4, 4
+// 0x0106038c: 0x106038c: bne   s1, s7, 0x1060338 addiu s4, s4, 4
 	ldloc 8
 	ldloc 16
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc 11
-	bne.un L_1060328
+	bne.un L_1060338
 // --- basic block ---
-// 0x01060384: 0x1060384: addiu s0, s0, 100
+// 0x01060394: 0x1060394: addiu s0, s0, 100
 	ldloc 7
 	ldc.i4.s 100
 	add
 	stloc 7
-// 0x01060388: 0x1060388: beq   s0, s6, 0x10603a0 addiu s2, s2, 8
+// 0x01060398: 0x1060398: beq   s0, s6, 0x10603b0 addiu s2, s2, 8
 	ldloc 7
 	ldloc 15
 	ldloc 6
 	ldc.i4.8
 	add
 	stloc 6
-	beq  L_10603a0
+	beq  L_10603b0
 // --- basic block ---
-L_1060390:
-// 0x01060390: 0x1060390: addu  s4, s2, zero
+L_10603a0:
+// 0x010603a0: 0x10603a0: addu  s4, s2, zero
 	ldloc 6
 	stloc 11
-// 0x01060394: 0x1060394: addu  s3, s0, zero
+// 0x010603a4: 0x10603a4: addu  s3, s0, zero
 	ldloc 7
 	stloc 10
-// 0x01060398: 0x1060398: j	 0x1060328 addu  s1, zero, zero
+// 0x010603a8: 0x10603a8: j	 0x1060338 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1060328
+	br L_1060338
 // --- basic block ---
-L_10603a0:
-// 0x010603a0: 0x10603a0: lw    ra, 132(sp)
-// 0x010603a4: 0x10603a4: lw    s8, 128(sp)
+L_10603b0:
+// 0x010603b0: 0x10603b0: lw    ra, 132(sp)
+// 0x010603b4: 0x10603b4: lw    s8, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5116,7 +5116,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010603a8: 0x10603a8: lw    s7, 124(sp)
+// 0x010603b8: 0x10603b8: lw    s7, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5125,7 +5125,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010603ac: 0x10603ac: lw    s6, 120(sp)
+// 0x010603bc: 0x10603bc: lw    s6, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5134,7 +5134,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010603b0: 0x10603b0: lw    s5, 116(sp)
+// 0x010603c0: 0x10603c0: lw    s5, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5143,7 +5143,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010603b4: 0x10603b4: lw    s4, 112(sp)
+// 0x010603c4: 0x10603c4: lw    s4, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5152,7 +5152,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010603b8: 0x10603b8: lw    s3, 108(sp)
+// 0x010603c8: 0x10603c8: lw    s3, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5161,7 +5161,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010603bc: 0x10603bc: lw    s2, 104(sp)
+// 0x010603cc: 0x10603cc: lw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5170,7 +5170,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010603c0: 0x10603c0: lw    s1, 100(sp)
+// 0x010603d0: 0x10603d0: lw    s1, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5179,7 +5179,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010603c4: 0x10603c4: lw    s0, 96(sp)
+// 0x010603d4: 0x10603d4: lw    s0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5188,7 +5188,7 @@ L_10603a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010603c8: 0x10603c8: jr    ra addiu sp, sp, 136
+// 0x010603d8: 0x10603d8: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
@@ -5200,7 +5200,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 navigate_traffic_initialize_10603d0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_traffic_initialize_10603e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
@@ -5247,43 +5247,43 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010603d0: 0x10603d0: lui   v0, 0x70000
+// 0x010603e0: 0x10603e0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x010603d4: 0x10603d4: lw    v1, 12396(v0)
+// 0x010603e4: 0x10603e4: lw    v1, 12860(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3099
+	ldc.i4 3215
 	add
 	ldelem.i4
 	stloc 6
-// 0x010603d8: 0x10603d8: addiu sp, sp, -48
+// 0x010603e8: 0x10603e8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010603dc: 0x10603dc: sll   v1, v1, 2
+// 0x010603ec: 0x10603ec: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010603e0: 0x10603e0: lui   a0, 0x0
+// 0x010603f0: 0x10603f0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010603e4: 0x10603e4: lui   a1, 0x0
+// 0x010603f4: 0x10603f4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010603e8: 0x10603e8: lui   a2, 0x10000
+// 0x010603f8: 0x10603f8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010603ec: 0x10603ec: ori   v1, v1, 3
+// 0x010603fc: 0x10603fc: ori   v1, v1, 3
 	ldloc 6
 	ldc.i4.3
 	or
 	stloc 6
-// 0x010603f0: 0x10603f0: sw    s3, 40(sp)
+// 0x01060400: 0x1060400: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5292,7 +5292,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010603f4: 0x10603f4: sw    s2, 36(sp)
+// 0x01060404: 0x1060404: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5301,7 +5301,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010603f8: 0x10603f8: sw    s1, 32(sp)
+// 0x01060408: 0x1060408: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5310,7 +5310,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010603fc: 0x10603fc: sw    s0, 28(sp)
+// 0x0106040c: 0x106040c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5319,47 +5319,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01060400: 0x1060400: lui   s3, 0x10000
+// 0x01060410: 0x1060410: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01060404: 0x1060404: lui   s1, 0x0
+// 0x01060414: 0x1060414: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01060408: 0x1060408: addiu a0, a0, 26236
+// 0x01060418: 0x1060418: addiu a0, a0, 26236
 	ldloc.1
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x0106040c: 0x106040c: addiu a1, a1, 14700
+// 0x0106041c: 0x106041c: addiu a1, a1, 14700
 	ldloc.2
 	ldc.i4 14700
 	add
 	stloc.2
-// 0x01060410: 0x1060410: addiu a2, a2, 12528
+// 0x01060420: 0x1060420: addiu a2, a2, 12524
 	ldloc.3
-	ldc.i4 12528
+	ldc.i4 12524
 	add
 	stloc.3
-// 0x01060414: 0x1060414: addu  a3, zero, zero
+// 0x01060424: 0x1060424: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01060418: 0x1060418: lui   s2, 0x20000
+// 0x01060428: 0x1060428: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x0106041c: 0x106041c: lui   s0, 0x0
+// 0x0106042c: 0x106042c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01060420: 0x1060420: sw    ra, 44(sp)
-// 0x01060424: 0x1060424: sw    v1, 12396(v0)
+// 0x01060430: 0x1060430: sw    ra, 44(sp)
+// 0x01060434: 0x1060434: sw    v1, 12860(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3099
+	ldc.i4 3215
 	add
 	ldloc 6
 	stelem.i4
-// 0x01060428: 0x1060428: jal   0x100edb0 addiu s0, s0, 20820
+// 0x01060438: 0x1060438: jal   0x100edc0 addiu s0, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
@@ -5369,30 +5369,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01060430: 0x1060430: addiu a0, s3, 12560
+// 0x01060440: 0x1060440: addiu a0, s3, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01060434: 0x1060434: addiu a1, s1, 14716
+// 0x01060444: 0x1060444: addiu a1, s1, 14716
 	ldloc 10
 	ldc.i4 14716
 	add
 	stloc.2
-// 0x01060438: 0x1060438: addiu a3, s2, 9464
+// 0x01060448: 0x1060448: addiu a3, s2, 9928
 	ldloc 9
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x0106043c: 0x106043c: addu  a2, zero, zero
+// 0x0106044c: 0x106044c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01060440: 0x1060440: sw    s0, 16(sp)
+// 0x01060450: 0x1060450: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5401,7 +5401,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01060444: 0x1060444: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01060454: 0x1060454: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5415,36 +5415,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0106044c: 0x106044c: lui   a1, 0x0
+// 0x0106045c: 0x106045c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01060450: 0x1060450: addu  a3, s0, zero
+// 0x01060460: 0x1060460: addu  a3, s0, zero
 	ldloc 8
 	stloc 4
-// 0x01060454: 0x1060454: addu  a2, zero, zero
+// 0x01060464: 0x1060464: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01060458: 0x1060458: addiu a1, a1, 14732
+// 0x01060468: 0x1060468: addiu a1, a1, 14732
 	ldloc.2
 	ldc.i4 14732
 	add
 	stloc.2
-// 0x0106045c: 0x106045c: addiu a0, s3, 12560
+// 0x0106046c: 0x106046c: addiu a0, s3, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01060460: 0x1060460: addiu s2, s2, 9464
+// 0x01060470: 0x1060470: addiu s2, s2, 9928
 	ldloc 9
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 9
-// 0x01060464: 0x1060464: sw    s2, 16(sp)
+// 0x01060474: 0x1060474: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5453,7 +5453,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01060468: 0x1060468: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01060478: 0x1060478: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5467,12 +5467,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01060470: 0x1060470: jal   0x10602d8 addiu a0, zero, 1
+// 0x01060480: 0x1060480: jal   0x10602e8 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -5480,33 +5480,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::create_pens_10602d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::create_pens_10602e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01060478: 0x1060478: lui   a0, 0x1060000
+// 0x01060488: 0x1060488: lui   a0, 0x1060000
 	ldc.i4 17170432
 	stloc.1
-// 0x0106047c: 0x106047c: jal   0x1014064 addiu a0, a0, 1204
+// 0x0106048c: 0x106048c: jal   0x1014074 addiu a0, a0, 1220
 	ldloc.1
-	ldc.i4 1204
+	ldc.i4 1220
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl14::roadmap_skin_register_1014064(int32,int32,int32)
+	call int32 Cibyl14::roadmap_skin_register_1014074(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01060484: 0x1060484: addiu a0, s1, 14716
+// 0x01060494: 0x1060494: addiu a0, s1, 14716
 	ldloc 10
 	ldc.i4 14716
 	add
 	stloc.1
-// 0x01060488: 0x1060488: jal   0x100e7f4 addu  a1, s0, zero
+// 0x01060498: 0x1060498: jal   0x100e804 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -5514,12 +5514,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01060490: 0x1060490: jal   0x1060280 addu  a0, v0, zero
+// 0x010604a0: 0x10604a0: jal   0x1060290 addu  a0, v0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5527,13 +5527,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_traffic_display_1060280(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_traffic_display_1060290(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01060498: 0x1060498: lw    ra, 44(sp)
-// 0x0106049c: 0x106049c: lw    s3, 40(sp)
+// 0x010604a8: 0x10604a8: lw    ra, 44(sp)
+// 0x010604ac: 0x10604ac: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5542,7 +5542,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010604a0: 0x10604a0: lw    s2, 36(sp)
+// 0x010604b0: 0x10604b0: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5551,7 +5551,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010604a4: 0x10604a4: lw    s1, 32(sp)
+// 0x010604b4: 0x10604b4: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5560,7 +5560,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010604a8: 0x10604a8: lw    s0, 28(sp)
+// 0x010604b8: 0x10604b8: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5569,7 +5569,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010604ac: 0x10604ac: jr    ra addiu sp, sp, 48
+// 0x010604bc: 0x10604bc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5581,7 +5581,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 create_pens_cb_10604b4(int32,int32,int32,int32,int32)
+.method public static int32 create_pens_cb_10604c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5616,13 +5616,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010604b4: 0x10604b4: addiu sp, sp, -24
+// 0x010604c4: 0x10604c4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010604b8: 0x10604b8: sw    ra, 20(sp)
-// 0x010604bc: 0x10604bc: jal   0x10602d8 addu  a0, zero, zero
+// 0x010604c8: 0x10604c8: sw    ra, 20(sp)
+// 0x010604cc: 0x10604cc: jal   0x10602e8 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5630,14 +5630,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::create_pens_10602d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::create_pens_10602e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010604c4: 0x10604c4: lw    ra, 20(sp)
-// 0x010604c8: 0x10604c8: sll   zero, zero, 0
-// 0x010604cc: 0x10604cc: jr    ra addiu sp, sp, 24
+// 0x010604d4: 0x10604d4: lw    ra, 20(sp)
+// 0x010604d8: 0x10604d8: sll   zero, zero, 0
+// 0x010604dc: 0x10604dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5649,7 +5649,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_traffic_adjust_layer_10604d4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_traffic_adjust_layer_10604e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 s0,int32 s1,int32 v0,int32 s3,int32 s4,int32 ra,int32 v1)
@@ -5699,18 +5699,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10604d4:
-// 0x010604d4: 0x10604d4: addiu sp, sp, -40
+L_10604e4:
+// 0x010604e4: 0x10604e4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010604d8: 0x10604d8: slti  v0, a0, 12
+// 0x010604e8: 0x10604e8: slti  v0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	clt
 	stloc 9
-// 0x010604dc: 0x10604dc: sw    s0, 16(sp)
+// 0x010604ec: 0x10604ec: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5719,8 +5719,8 @@ L_10604d4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010604e0: 0x10604e0: sw    ra, 36(sp)
-// 0x010604e4: 0x10604e4: sw    s4, 32(sp)
+// 0x010604f0: 0x10604f0: sw    ra, 36(sp)
+// 0x010604f4: 0x10604f4: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5729,7 +5729,7 @@ L_10604d4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010604e8: 0x10604e8: sw    s3, 28(sp)
+// 0x010604f8: 0x10604f8: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5738,7 +5738,7 @@ L_10604d4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010604ec: 0x10604ec: sw    s2, 24(sp)
+// 0x010604fc: 0x10604fc: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5747,7 +5747,7 @@ L_10604d4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010604f0: 0x10604f0: sw    s1, 20(sp)
+// 0x01060500: 0x1060500: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5756,118 +5756,118 @@ L_10604d4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010604f4: 0x10604f4: beq   v0, zero, 0x1060558 addu  s0, a1, zero
+// 0x01060504: 0x1060504: beq   v0, zero, 0x1060568 addu  s0, a1, zero
 	ldloc 9
 	ldloc.2
 	stloc 7
-	brfalse L_1060558
+	brfalse L_1060568
 // --- basic block ---
-// 0x010604fc: 0x10604fc: bgtz  a1, 0x1060508 lui   s2, 0x70000
+// 0x0106050c: 0x106050c: bgtz  a1, 0x1060518 lui   s2, 0x70000
 	ldloc.2
 	ldc.i4 458752
 	stloc 6
 	ldc.i4.s 0
-	bgt L_1060508
+	bgt L_1060518
 // --- basic block ---
-// 0x01060504: 0x1060504: addiu s0, zero, 1
+// 0x01060514: 0x1060514: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1060508:
-// 0x01060508: 0x1060508: sll   a0, a0, 3
+L_1060518:
+// 0x01060518: 0x1060518: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0106050c: 0x106050c: addiu s2, s2, 12288
+// 0x0106051c: 0x106051c: addiu s2, s2, 12752
 	ldloc 6
-	ldc.i4 12288
+	ldc.i4 12752
 	add
 	stloc 6
-// 0x01060510: 0x1060510: addu  s2, s2, a0
+// 0x01060520: 0x1060520: addu  s2, s2, a0
 	ldloc 6
 	ldloc.1
 	add
 	stloc 6
-// 0x01060514: 0x1060514: addu  s1, zero, zero
+// 0x01060524: 0x1060524: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01060518: 0x1060518: addiu s4, zero, 1
+// 0x01060528: 0x1060528: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x0106051c: 0x106051c: addiu s3, zero, 2
+// 0x0106052c: 0x106052c: addiu s3, zero, 2
 	ldc.i4.2
 	stloc 10
-L_1060520:
-// 0x01060520: 0x1060520: lw    a0, 0(s2)
+L_1060530:
+// 0x01060530: 0x1060530: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01060524: 0x1060524: jal   0x104e35c sll   zero, zero, 0
+// 0x01060534: 0x1060534: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 9
 // --- basic block ---
-// 0x0106052c: 0x106052c: addu  a0, s0, zero
+// 0x0106053c: 0x106053c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01060530: 0x1060530: bne   s1, s4, 0x1060548 slti  v0, s0, 3
+// 0x01060540: 0x1060540: bne   s1, s4, 0x1060558 slti  v0, s0, 3
 	ldloc 8
 	ldloc 11
 	ldloc 7
 	ldc.i4.3
 	clt
 	stloc 9
-	bne.un L_1060548
+	bne.un L_1060558
 // --- basic block ---
-// 0x01060538: 0x1060538: beq   v0, zero, 0x1060548 addiu a0, s0, -2
+// 0x01060548: 0x1060548: beq   v0, zero, 0x1060558 addiu a0, s0, -2
 	ldloc 9
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc.1
-	brfalse L_1060548
+	brfalse L_1060558
 // --- basic block ---
-// 0x01060540: 0x1060540: addiu s0, zero, 3
+// 0x01060550: 0x1060550: addiu s0, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x01060544: 0x1060544: addiu a0, s0, -2
+// 0x01060554: 0x1060554: addiu a0, s0, -2
 	ldloc 7
 	ldc.i4.s -2
 	add
 	stloc.1
-L_1060548:
-// 0x01060548: 0x1060548: jal   0x104dd5c addiu s1, s1, 1
+L_1060558:
+// 0x01060558: 0x1060558: jal   0x104dd6c addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 13
 	stloc 9
 // --- basic block ---
-// 0x01060550: 0x1060550: bne   s1, s3, 0x1060520 addiu s2, s2, 4
+// 0x01060560: 0x1060560: bne   s1, s3, 0x1060530 addiu s2, s2, 4
 	ldloc 8
 	ldloc 10
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-	bne.un L_1060520
+	bne.un L_1060530
 // --- basic block ---
-L_1060558:
-// 0x01060558: 0x1060558: lw    ra, 36(sp)
-// 0x0106055c: 0x106055c: lw    s4, 32(sp)
+L_1060568:
+// 0x01060568: 0x1060568: lw    ra, 36(sp)
+// 0x0106056c: 0x106056c: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5876,7 +5876,7 @@ L_1060558:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01060560: 0x1060560: lw    s3, 28(sp)
+// 0x01060570: 0x1060570: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5885,7 +5885,7 @@ L_1060558:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01060564: 0x1060564: lw    s2, 24(sp)
+// 0x01060574: 0x1060574: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5894,7 +5894,7 @@ L_1060558:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01060568: 0x1060568: lw    s1, 20(sp)
+// 0x01060578: 0x1060578: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5903,7 +5903,7 @@ L_1060558:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106056c: 0x106056c: lw    s0, 16(sp)
+// 0x0106057c: 0x106057c: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5912,7 +5912,7 @@ L_1060558:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060570: 0x1060570: jr    ra addiu sp, sp, 40
+// 0x01060580: 0x1060580: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5924,7 +5924,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 button_callback_1060888(int32,int32,int32,int32,int32)
+.method public static int32 button_callback_1060898(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -5962,7 +5962,7 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01060888: 0x1060888: lw    a0, 16(a0)
+// 0x01060898: 0x1060898: lw    a0, 16(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -5971,21 +5971,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106088c: 0x106088c: lui   a1, 0x10000
+// 0x0106089c: 0x106089c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01060890: 0x1060890: addiu sp, sp, -24
+// 0x010608a0: 0x10608a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01060894: 0x1060894: addiu a1, a1, 12704
+// 0x010608a4: 0x10608a4: addiu a1, a1, 12700
 	ldloc.2
-	ldc.i4 12704
+	ldc.i4 12700
 	add
 	stloc.2
-// 0x01060898: 0x1060898: sw    ra, 20(sp)
-// 0x0106089c: 0x106089c: jal   0x1001b14 sw    s0, 16(sp)
+// 0x010608a8: 0x10608a8: sw    ra, 20(sp)
+// 0x010608ac: 0x10608ac: jal   0x1001b14 sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5999,16 +5999,16 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010608a4: 0x10608a4: bne   v0, zero, 0x1060900 addu  a0, zero, zero
+// 0x010608b4: 0x10608b4: bne   v0, zero, 0x1060910 addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_1060900
+	brtrue L_1060910
 // --- basic block ---
-// 0x010608ac: 0x10608ac: lui   a0, 0x10000
+// 0x010608bc: 0x10608bc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010608b0: 0x10608b0: jal   0x10947ac addiu a0, a0, -20588
+// 0x010608c0: 0x10608c0: jal   0x1094dd0 addiu a0, a0, -20588
 	ldloc.1
 	ldc.i4 -20588
 	add
@@ -6018,18 +6018,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010608b8: 0x10608b8: lui   a0, 0x0
+// 0x010608c8: 0x10608c8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010608bc: 0x10608bc: addu  a1, v0, zero
+// 0x010608cc: 0x10608cc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010608c0: 0x10608c0: jal   0x100e5c0 addiu a0, a0, 14732
+// 0x010608d0: 0x10608d0: jal   0x100e5d0 addiu a0, a0, 14732
 	ldloc.1
 	ldc.i4 14732
 	add
@@ -6039,17 +6039,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010608c8: 0x10608c8: lui   a0, 0x10000
+// 0x010608d8: 0x10608d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010608cc: 0x10608cc: jal   0x10947ac addiu a0, a0, -15148
+// 0x010608dc: 0x10608dc: jal   0x1094dd0 addiu a0, a0, -15152
 	ldloc.1
-	ldc.i4 -15148
+	ldc.i4 -15152
 	add
 	stloc.1
 	ldloc.0
@@ -6057,18 +6057,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010608d4: 0x10608d4: lui   s0, 0x0
+// 0x010608e4: 0x10608e4: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010608d8: 0x10608d8: addu  a1, v0, zero
+// 0x010608e8: 0x10608e8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010608dc: 0x10608dc: jal   0x100e5c0 addiu a0, s0, 14716
+// 0x010608ec: 0x10608ec: jal   0x100e5d0 addiu a0, s0, 14716
 	ldloc 7
 	ldc.i4 14716
 	add
@@ -6078,20 +6078,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010608e4: 0x10608e4: lui   a1, 0x0
+// 0x010608f4: 0x10608f4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010608e8: 0x10608e8: addiu a1, a1, 20820
+// 0x010608f8: 0x10608f8: addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
 	stloc.2
-// 0x010608ec: 0x10608ec: jal   0x100e7f4 addiu a0, s0, 14716
+// 0x010608fc: 0x10608fc: jal   0x100e804 addiu a0, s0, 14716
 	ldloc 7
 	ldc.i4 14716
 	add
@@ -6101,12 +6101,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010608f4: 0x10608f4: jal   0x1060280 addu  a0, v0, zero
+// 0x01060904: 0x1060904: jal   0x1060290 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6114,31 +6114,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_traffic_display_1060280(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_traffic_display_1060290(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010608fc: 0x10608fc: addiu a0, zero, 1
+// 0x0106090c: 0x106090c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_1060900:
-// 0x01060900: 0x1060900: jal   0x1094b64 sll   zero, zero, 0
+L_1060910:
+// 0x01060910: 0x1060910: jal   0x10951ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01060908: 0x1060908: lw    ra, 20(sp)
-// 0x0106090c: 0x106090c: addiu v0, zero, 1
+// 0x01060918: 0x1060918: lw    ra, 20(sp)
+// 0x0106091c: 0x106091c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01060910: 0x1060910: lw    s0, 16(sp)
+// 0x01060920: 0x1060920: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6147,7 +6147,7 @@ L_1060900:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060914: 0x1060914: jr    ra addiu sp, sp, 24
+// 0x01060924: 0x1060924: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6159,7 +6159,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 free_cache_slot_106091c(int32,int32,int32,int32,int32)
+.method public static int32 free_cache_slot_106092c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -6197,12 +6197,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106091c: 0x106091c: addiu sp, sp, -24
+// 0x0106092c: 0x106092c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01060920: 0x1060920: sw    s0, 16(sp)
+// 0x01060930: 0x1060930: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6211,33 +6211,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01060924: 0x1060924: lui   s0, 0x70000
+// 0x01060934: 0x1060934: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01060928: 0x1060928: sll   a0, a0, 2
+// 0x01060938: 0x1060938: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0106092c: 0x106092c: addiu s0, s0, 12452
+// 0x0106093c: 0x106093c: addiu s0, s0, 12916
 	ldloc 7
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 7
-// 0x01060930: 0x1060930: addu  s0, a0, s0
+// 0x01060940: 0x1060940: addu  s0, a0, s0
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01060934: 0x1060934: lw    v0, 0(s0)
+// 0x01060944: 0x1060944: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01060938: 0x1060938: sw    ra, 20(sp)
-// 0x0106093c: 0x106093c: lw    a0, 8(v0)
+// 0x01060948: 0x1060948: sw    ra, 20(sp)
+// 0x0106094c: 0x106094c: lw    a0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6246,7 +6246,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060940: 0x1060940: jal   0x1000930 sll   zero, zero, 0
+// 0x01060950: 0x1060950: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6257,15 +6257,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01060948: 0x1060948: lw    v0, 0(s0)
+// 0x01060958: 0x1060958: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0106094c: 0x106094c: sll   zero, zero, 0
-// 0x01060950: 0x1060950: lw    a0, 12(v0)
+// 0x0106095c: 0x106095c: sll   zero, zero, 0
+// 0x01060960: 0x1060960: lw    a0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6274,7 +6274,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060954: 0x1060954: jal   0x1000930 sll   zero, zero, 0
+// 0x01060964: 0x1060964: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6285,15 +6285,15 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0106095c: 0x106095c: lw    v0, 0(s0)
+// 0x0106096c: 0x106096c: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01060960: 0x1060960: sll   zero, zero, 0
-// 0x01060964: 0x1060964: lw    a0, 16(v0)
+// 0x01060970: 0x1060970: sll   zero, zero, 0
+// 0x01060974: 0x1060974: lw    a0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6302,7 +6302,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060968: 0x1060968: jal   0x1000930 sll   zero, zero, 0
+// 0x01060978: 0x1060978: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6313,17 +6313,17 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01060970: 0x1060970: lw    v1, 0(s0)
+// 0x01060980: 0x1060980: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01060974: 0x1060974: lui   v0, 0x70000
+// 0x01060984: 0x1060984: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01060978: 0x1060978: lw    v1, 20(v1)
+// 0x01060988: 0x1060988: lw    v1, 20(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6332,22 +6332,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106097c: 0x106097c: lw    a0, 12752(v0)
+// 0x0106098c: 0x106098c: lw    a0, 13216(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3188
+	ldc.i4 3304
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060980: 0x1060980: lw    ra, 20(sp)
-// 0x01060984: 0x1060984: subu  v1, a0, v1
+// 0x01060990: 0x1060990: lw    ra, 20(sp)
+// 0x01060994: 0x1060994: subu  v1, a0, v1
 	ldloc.1
 	ldloc 8
 	sub
 	stloc 8
-// 0x01060988: 0x1060988: lw    s0, 16(sp)
+// 0x01060998: 0x1060998: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6356,16 +6356,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106098c: 0x106098c: sw    v1, 12752(v0)
+// 0x0106099c: 0x106099c: sw    v1, 13216(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3188
+	ldc.i4 3304
 	add
 	ldloc 8
 	stelem.i4
-// 0x01060990: 0x1060990: jr    ra addiu sp, sp, 24
+// 0x010609a0: 0x10609a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6377,7 +6377,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_graph_clear_1060998(int32,int32,int32,int32,int32)
+.method public static int32 navigate_graph_clear_10609a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s1,int32 ra)
@@ -6418,16 +6418,16 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01060998: 0x1060998: addiu sp, sp, -32
+// 0x010609a8: 0x10609a8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106099c: 0x106099c: addiu v1, zero, -1
+// 0x010609ac: 0x10609ac: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x010609a0: 0x10609a0: sw    ra, 28(sp)
-// 0x010609a4: 0x10609a4: sw    s1, 24(sp)
+// 0x010609b0: 0x10609b0: sw    ra, 28(sp)
+// 0x010609b4: 0x10609b4: sw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6436,7 +6436,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010609a8: 0x10609a8: sw    s0, 20(sp)
+// 0x010609b8: 0x10609b8: sw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6445,31 +6445,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010609ac: 0x10609ac: bne   a0, v1, 0x10609dc lui   v0, 0x70000
+// 0x010609bc: 0x10609bc: bne   a0, v1, 0x10609ec lui   v0, 0x70000
 	ldloc.1
 	ldloc 6
 	ldc.i4 458752
 	stloc 5
-	bne.un L_10609dc
+	bne.un L_10609ec
 // --- basic block ---
-// 0x010609b4: 0x10609b4: lw    s0, 12416(v0)
+// 0x010609c4: 0x10609c4: lw    s0, 12880(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc 7
-// 0x010609b8: 0x10609b8: j	 0x10609c8 addiu s0, s0, -1
+// 0x010609c8: 0x10609c8: j	 0x10609d8 addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-	br L_10609c8
+	br L_10609d8
 // --- basic block ---
-L_10609c0:
-// 0x010609c0: 0x10609c0: jal   0x106091c addiu s0, s0, -1
+L_10609d0:
+// 0x010609d0: 0x10609d0: jal   0x106092c addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
@@ -6479,123 +6479,123 @@ L_10609c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::free_cache_slot_106091c(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::free_cache_slot_106092c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10609c8:
-// 0x010609c8: 0x10609c8: bgez  s0, 0x10609c0 addu  a0, s0, zero
+L_10609d8:
+// 0x010609d8: 0x10609d8: bgez  s0, 0x10609d0 addu  a0, s0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
 	ldc.i4.s 0
-	bge L_10609c0
+	bge L_10609d0
 // --- basic block ---
-// 0x010609d0: 0x10609d0: lui   v0, 0x70000
+// 0x010609e0: 0x10609e0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010609d4: 0x10609d4: j	 0x1060a78 sw    zero, 12416(v0)
+// 0x010609e4: 0x10609e4: j	 0x1060a88 sw    zero, 12880(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1060a78
+	br L_1060a88
 // --- basic block ---
-L_10609dc:
-// 0x010609dc: 0x10609dc: lw    v0, 12416(v0)
+L_10609ec:
+// 0x010609ec: 0x10609ec: lw    v0, 12880(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc 5
-// 0x010609e0: 0x10609e0: lui   v1, 0x70000
+// 0x010609f0: 0x10609f0: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010609e4: 0x10609e4: addiu v0, v0, -1
+// 0x010609f4: 0x10609f4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010609e8: 0x10609e8: sll   a1, v0, 2
+// 0x010609f8: 0x10609f8: sll   a1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x010609ec: 0x10609ec: addiu v1, v1, 12452
+// 0x010609fc: 0x10609fc: addiu v1, v1, 12916
 	ldloc 6
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 6
-// 0x010609f0: 0x10609f0: addu  v1, v1, a1
+// 0x01060a00: 0x1060a00: addu  v1, v1, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x010609f4: 0x10609f4: j	 0x1060a00 addu  s0, v0, zero
+// 0x01060a04: 0x1060a04: j	 0x1060a10 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-	br L_1060a00
+	br L_1060a10
 // --- basic block ---
-L_10609fc:
-// 0x010609fc: 0x10609fc: addiu s0, s0, -1
+L_1060a0c:
+// 0x01060a0c: 0x1060a0c: addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-L_1060a00:
-// 0x01060a00: 0x1060a00: bltz  s0, 0x1060a78 sll   zero, zero, 0
+L_1060a10:
+// 0x01060a10: 0x1060a10: bltz  s0, 0x1060a88 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	blt L_1060a78
+	blt L_1060a88
 // --- basic block ---
-// 0x01060a08: 0x1060a08: lw    a1, 0(v1)
+// 0x01060a18: 0x1060a18: lw    a1, 0(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01060a0c: 0x1060a0c: sll   zero, zero, 0
-// 0x01060a10: 0x1060a10: lw    a1, 0(a1)
+// 0x01060a1c: 0x1060a1c: sll   zero, zero, 0
+// 0x01060a20: 0x1060a20: lw    a1, 0(a1)
 	ldloc 8
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01060a14: 0x1060a14: sll   zero, zero, 0
-// 0x01060a18: 0x1060a18: bne   a1, a0, 0x10609fc addiu v1, v1, -4
+// 0x01060a24: 0x1060a24: sll   zero, zero, 0
+// 0x01060a28: 0x1060a28: bne   a1, a0, 0x1060a0c addiu v1, v1, -4
 	ldloc.2
 	ldloc.1
 	ldloc 6
 	ldc.i4.s -4
 	add
 	stloc 6
-	bne.un L_10609fc
+	bne.un L_1060a0c
 // --- basic block ---
-// 0x01060a20: 0x1060a20: j	 0x1060a4c lui   s1, 0x70000
+// 0x01060a30: 0x1060a30: j	 0x1060a5c lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-	br L_1060a4c
+	br L_1060a5c
 // --- basic block ---
-L_1060a28:
-// 0x01060a28: 0x1060a28: lw    a0, 0(v0)
+L_1060a38:
+// 0x01060a38: 0x1060a38: lw    a0, 0(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01060a2c: 0x1060a2c: sll   zero, zero, 0
-// 0x01060a30: 0x1060a30: sw    a0, -4(v0)
+// 0x01060a3c: 0x1060a3c: sll   zero, zero, 0
+// 0x01060a40: 0x1060a40: sw    a0, -4(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -6604,38 +6604,38 @@ L_1060a28:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01060a34: 0x1060a34: addiu v0, v0, 4
+// 0x01060a44: 0x1060a44: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01060a38: 0x1060a38: slt   a0, s0, v1
+// 0x01060a48: 0x1060a48: slt   a0, s0, v1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc.1
-L_1060a3c:
-// 0x01060a3c: 0x1060a3c: bne   a0, zero, 0x1060a28 addiu s0, s0, 1
+L_1060a4c:
+// 0x01060a4c: 0x1060a4c: bne   a0, zero, 0x1060a38 addiu s0, s0, 1
 	ldloc.1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brtrue L_1060a28
+	brtrue L_1060a38
 // --- basic block ---
-// 0x01060a44: 0x1060a44: j	 0x1060a78 sll   zero, zero, 0
-	br L_1060a78
+// 0x01060a54: 0x1060a54: j	 0x1060a88 sll   zero, zero, 0
+	br L_1060a88
 // --- basic block ---
-L_1060a4c:
-// 0x01060a4c: 0x1060a4c: addu  a0, s0, zero
+L_1060a5c:
+// 0x01060a5c: 0x1060a5c: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01060a50: 0x1060a50: jal   0x106091c sw    v0, 12416(s1)
+// 0x01060a60: 0x1060a60: jal   0x106092c sw    v0, 12880(s1)
 	ldloc 8
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldloc 5
 	stelem.i4
@@ -6644,53 +6644,53 @@ L_1060a4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::free_cache_slot_106091c(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::free_cache_slot_106092c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01060a58: 0x1060a58: addiu v1, s0, 1
+// 0x01060a68: 0x1060a68: addiu v1, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01060a5c: 0x1060a5c: lui   v0, 0x70000
+// 0x01060a6c: 0x1060a6c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060a60: 0x1060a60: sll   v1, v1, 2
+// 0x01060a70: 0x1060a70: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01060a64: 0x1060a64: addiu v0, v0, 12452
+// 0x01060a74: 0x1060a74: addiu v0, v0, 12916
 	ldloc 5
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 5
-// 0x01060a68: 0x1060a68: addu  v0, v0, v1
+// 0x01060a78: 0x1060a78: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01060a6c: 0x1060a6c: lw    v1, 12416(s1)
+// 0x01060a7c: 0x1060a7c: lw    v1, 12880(s1)
 	ldloc 8
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc 6
-// 0x01060a70: 0x1060a70: j	 0x1060a3c slt   a0, s0, v1
+// 0x01060a80: 0x1060a80: j	 0x1060a4c slt   a0, s0, v1
 	ldloc 7
 	ldloc 6
 	clt
 	stloc.1
-	br L_1060a3c
+	br L_1060a4c
 // --- basic block ---
-L_1060a78:
-// 0x01060a78: 0x1060a78: lw    ra, 28(sp)
-// 0x01060a7c: 0x1060a7c: lw    s1, 24(sp)
+L_1060a88:
+// 0x01060a88: 0x1060a88: lw    ra, 28(sp)
+// 0x01060a8c: 0x1060a8c: lw    s1, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6699,7 +6699,7 @@ L_1060a78:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01060a80: 0x1060a80: lw    s0, 20(sp)
+// 0x01060a90: 0x1060a90: lw    s0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -6708,7 +6708,7 @@ L_1060a78:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060a84: 0x1060a84: jr    ra addiu sp, sp, 32
+// 0x01060a94: 0x1060a94: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl72.j b/converted/Cibyl72.j
index 6fef57c..a176e22 100644
--- a/converted/Cibyl72.j
+++ b/converted/Cibyl72.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl72::.ctor
 
-.method public static int32 extend_segment_1060a8c(int32,int32,int32,int32,int32)
+.method public static int32 extend_segment_1060a9c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -79,7 +79,7 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01060a8c: 0x1060a8c: lw    v0, 12(a0)
+// 0x01060a9c: 0x1060a9c: lw    v0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -88,17 +88,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01060a90: 0x1060a90: lui   v1, 0x0
+// 0x01060aa0: 0x1060aa0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01060a94: 0x1060a94: sw    v0, 0(a1)
+// 0x01060aa4: 0x1060aa4: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01060a98: 0x1060a98: lw    a0, 4(a0)
+// 0x01060aa8: 0x1060aa8: lw    a0, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -107,7 +107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060a9c: 0x1060a9c: lw    v1, 576(v1)
+// 0x01060aac: 0x1060aac: lw    v1, 576(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -116,12 +116,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060aa0: 0x1060aa0: addiu sp, sp, -32
+// 0x01060ab0: 0x1060ab0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01060aa4: 0x1060aa4: sw    s0, 24(sp)
+// 0x01060ab4: 0x1060ab4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -130,11 +130,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01060aa8: 0x1060aa8: sw    ra, 28(sp)
-// 0x01060aac: 0x1060aac: addu  s0, a1, zero
+// 0x01060ab8: 0x1060ab8: sw    ra, 28(sp)
+// 0x01060abc: 0x1060abc: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01060ab0: 0x1060ab0: beq   v0, v1, 0x1060acc sw    a0, 4(a1)
+// 0x01060ac0: 0x1060ac0: beq   v0, v1, 0x1060adc sw    a0, 4(a1)
 	ldloc 6
 	ldloc 7
 	ldloc 5
@@ -145,16 +145,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-	beq  L_1060acc
+	beq  L_1060adc
 // --- basic block ---
-// 0x01060ab8: 0x1060ab8: bltz  v0, 0x1060acc addu  a0, v0, zero
+// 0x01060ac8: 0x1060ac8: bltz  v0, 0x1060adc addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
 	ldc.i4.s 0
-	blt L_1060acc
+	blt L_1060adc
 // --- basic block ---
-// 0x01060ac0: 0x1060ac0: jal   0x100b164 sw    a2, 16(sp)
+// 0x01060ad0: 0x1060ad0: jal   0x100b174 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -168,12 +168,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01060ac8: 0x1060ac8: lw    a2, 16(sp)
+// 0x01060ad8: 0x1060ad8: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -182,11 +182,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-L_1060acc:
-// 0x01060acc: 0x1060acc: addiu v0, zero, 2
+L_1060adc:
+// 0x01060adc: 0x1060adc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01060ad0: 0x1060ad0: lw    a0, 4(s0)
+// 0x01060ae0: 0x1060ae0: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -195,16 +195,16 @@ L_1060acc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060ad4: 0x1060ad4: bne   a2, v0, 0x1060aec addiu a1, s0, 12
+// 0x01060ae4: 0x1060ae4: bne   a2, v0, 0x1060afc addiu a1, s0, 12
 	ldloc.3
 	ldloc 6
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc.2
-	bne.un L_1060aec
+	bne.un L_1060afc
 // --- basic block ---
-// 0x01060adc: 0x1060adc: jal   0x1003b2c sb    zero, 8(s0)
+// 0x01060aec: 0x1060aec: jal   0x1003b2c sb    zero, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
@@ -215,14 +215,14 @@ L_1060acc:
 	call int32 Cibyl2::roadmap_line_to_point_1003b2c(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01060ae4: 0x1060ae4: j	 0x1060af8 sll   zero, zero, 0
-	br L_1060af8
+// 0x01060af4: 0x1060af4: j	 0x1060b08 sll   zero, zero, 0
+	br L_1060b08
 // --- basic block ---
-L_1060aec:
-// 0x01060aec: 0x1060aec: addiu v0, zero, 1
+L_1060afc:
+// 0x01060afc: 0x1060afc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01060af0: 0x1060af0: jal   0x1003b08 sb    v0, 8(s0)
+// 0x01060b00: 0x1060b00: jal   0x1003b08 sb    v0, 8(s0)
 	ldloc 8
 	ldc.i4.8
 	add
@@ -233,12 +233,12 @@ L_1060aec:
 	call int32 Cibyl2::roadmap_line_from_point_1003b08(int32,int32)
 	stloc 6
 // --- basic block ---
-L_1060af8:
-// 0x01060af8: 0x1060af8: lw    ra, 28(sp)
-// 0x01060afc: 0x1060afc: addiu v0, zero, 1
+L_1060b08:
+// 0x01060b08: 0x1060b08: lw    ra, 28(sp)
+// 0x01060b0c: 0x1060b0c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01060b00: 0x1060b00: lw    s0, 24(sp)
+// 0x01060b10: 0x1060b10: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -247,7 +247,7 @@ L_1060af8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01060b04: 0x1060b04: jr    ra addiu sp, sp, 32
+// 0x01060b14: 0x1060b14: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -259,7 +259,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 T_88_1060b0c(int32,int32,int32,int32,int32)
+.method public static int32 T_88_1060b1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -297,21 +297,21 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01060b0c: 0x1060b0c: sll   a2, a0, 1
+// 0x01060b1c: 0x1060b1c: sll   a2, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x01060b10: 0x1060b10: addiu sp, sp, -32
+// 0x01060b20: 0x1060b20: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01060b14: 0x1060b14: addu  a0, a2, zero
+// 0x01060b24: 0x1060b24: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01060b18: 0x1060b18: sw    ra, 28(sp)
-// 0x01060b1c: 0x1060b1c: sw    s0, 24(sp)
+// 0x01060b28: 0x1060b28: sw    ra, 28(sp)
+// 0x01060b2c: 0x1060b2c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -320,7 +320,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01060b20: 0x1060b20: jal   0x1000910 sw    a2, 16(sp)
+// 0x01060b30: 0x1060b30: jal   0x1000910 sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -339,7 +339,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01060b28: 0x1060b28: lw    a2, 16(sp)
+// 0x01060b38: 0x1060b38: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -348,13 +348,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01060b2c: 0x1060b2c: addu  a0, v0, zero
+// 0x01060b3c: 0x1060b3c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01060b30: 0x1060b30: addu  a1, zero, zero
+// 0x01060b40: 0x1060b40: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01060b34: 0x1060b34: jal   0x100177c addu  s0, v0, zero
+// 0x01060b44: 0x1060b44: jal   0x100177c addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.1
@@ -366,11 +366,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01060b3c: 0x1060b3c: lw    ra, 28(sp)
-// 0x01060b40: 0x1060b40: addu  v0, s0, zero
+// 0x01060b4c: 0x1060b4c: lw    ra, 28(sp)
+// 0x01060b50: 0x1060b50: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01060b44: 0x1060b44: lw    s0, 24(sp)
+// 0x01060b54: 0x1060b54: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -379,7 +379,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060b48: 0x1060b48: jr    ra addiu sp, sp, 32
+// 0x01060b58: 0x1060b58: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -391,7 +391,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 get_square_graph_1060b50(int32,int32,int32,int32,int32)
+.method public static int32 get_square_graph_1060b60(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 t5,int32 s1,int32 s5,int32 s7,int32 t4,int32 s6,int32 s8,int32 t0,int32 t1,int32 s4,int32 t2,int32 t3,int32 t6,int32 ra,int32 t7,int32 t8,int32 t9,int32 lo)
@@ -486,27 +486,27 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01060b50: 0x1060b50: lui   v0, 0x70000
+// 0x01060b60: 0x1060b60: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060b54: 0x1060b54: addiu sp, sp, -96
+// 0x01060b64: 0x1060b64: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01060b58: 0x1060b58: lw    v1, 12416(v0)
+// 0x01060b68: 0x1060b68: lw    v1, 12880(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060b5c: 0x1060b5c: lui   v0, 0x70000
+// 0x01060b6c: 0x1060b6c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060b60: 0x1060b60: sw    s2, 64(sp)
+// 0x01060b70: 0x1060b70: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -515,7 +515,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01060b64: 0x1060b64: sw    s1, 60(sp)
+// 0x01060b74: 0x1060b74: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -524,8 +524,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01060b68: 0x1060b68: sw    ra, 92(sp)
-// 0x01060b6c: 0x1060b6c: sw    s8, 88(sp)
+// 0x01060b78: 0x1060b78: sw    ra, 92(sp)
+// 0x01060b7c: 0x1060b7c: sw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -534,7 +534,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01060b70: 0x1060b70: sw    s7, 84(sp)
+// 0x01060b80: 0x1060b80: sw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -543,7 +543,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01060b74: 0x1060b74: sw    s6, 80(sp)
+// 0x01060b84: 0x1060b84: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -552,7 +552,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01060b78: 0x1060b78: sw    s5, 76(sp)
+// 0x01060b88: 0x1060b88: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -561,7 +561,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01060b7c: 0x1060b7c: sw    s4, 72(sp)
+// 0x01060b8c: 0x1060b8c: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -570,7 +570,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x01060b80: 0x1060b80: sw    s3, 68(sp)
+// 0x01060b90: 0x1060b90: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -579,7 +579,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01060b84: 0x1060b84: sw    s0, 56(sp)
+// 0x01060b94: 0x1060b94: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -588,98 +588,98 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01060b88: 0x1060b88: addu  s1, a0, zero
+// 0x01060b98: 0x1060b98: addu  s1, a0, zero
 	ldloc.1
 	stloc 12
-// 0x01060b8c: 0x1060b8c: addiu v0, v0, 12452
+// 0x01060b9c: 0x1060b9c: addiu v0, v0, 12916
 	ldloc 5
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 5
-// 0x01060b90: 0x1060b90: j	 0x1060bb4 addu  s2, zero, zero
+// 0x01060ba0: 0x1060ba0: j	 0x1060bc4 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1060bb4
+	br L_1060bc4
 // --- basic block ---
-L_1060b98:
-// 0x01060b98: 0x1060b98: lw    a0, 0(v0)
+L_1060ba8:
+// 0x01060ba8: 0x1060ba8: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01060b9c: 0x1060b9c: sll   zero, zero, 0
-// 0x01060ba0: 0x1060ba0: lw    a0, 0(a0)
+// 0x01060bac: 0x1060bac: sll   zero, zero, 0
+// 0x01060bb0: 0x1060bb0: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01060ba4: 0x1060ba4: sll   zero, zero, 0
-// 0x01060ba8: 0x1060ba8: beq   a0, s1, 0x1060bc8 addiu v0, v0, 4
+// 0x01060bb4: 0x1060bb4: sll   zero, zero, 0
+// 0x01060bb8: 0x1060bb8: beq   a0, s1, 0x1060bd8 addiu v0, v0, 4
 	ldloc.1
 	ldloc 12
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	beq  L_1060bc8
+	beq  L_1060bd8
 // --- basic block ---
-// 0x01060bb0: 0x1060bb0: addiu s2, s2, 1
+// 0x01060bc0: 0x1060bc0: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1060bb4:
-// 0x01060bb4: 0x1060bb4: slt   a0, s2, v1
+L_1060bc4:
+// 0x01060bc4: 0x1060bc4: slt   a0, s2, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc.1
-// 0x01060bb8: 0x1060bb8: bne   a0, zero, 0x1060b98 sll   zero, zero, 0
+// 0x01060bc8: 0x1060bc8: bne   a0, zero, 0x1060ba8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1060b98
+	brtrue L_1060ba8
 // --- basic block ---
-// 0x01060bc0: 0x1060bc0: j	 0x1060fbc addiu v0, zero, 75
+// 0x01060bd0: 0x1060bd0: j	 0x1060fcc addiu v0, zero, 75
 	ldc.i4.s 75
 	stloc 5
-	br L_1060fbc
+	br L_1060fcc
 // --- basic block ---
-L_1060bc8:
-// 0x01060bc8: 0x1060bc8: lui   v0, 0x70000
+L_1060bd8:
+// 0x01060bd8: 0x1060bd8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060bcc: 0x1060bcc: sll   v1, s2, 2
+// 0x01060bdc: 0x1060bdc: sll   v1, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01060bd0: 0x1060bd0: addiu v0, v0, 12452
+// 0x01060be0: 0x1060be0: addiu v0, v0, 12916
 	ldloc 5
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 5
-// 0x01060bd4: 0x1060bd4: addu  v0, v1, v0
+// 0x01060be4: 0x1060be4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01060bd8: 0x1060bd8: lw    s0, 0(v0)
+// 0x01060be8: 0x1060be8: lw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01060bdc: 0x1060bdc: j	 0x1060c28 addiu v1, zero, 1
+// 0x01060bec: 0x1060bec: j	 0x1060c38 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1060c28
+	br L_1060c38
 // --- basic block ---
-L_1060be4:
-// 0x01060be4: 0x1060be4: jal   0x106091c addu  a0, s2, zero
+L_1060bf4:
+// 0x01060bf4: 0x1060bf4: jal   0x106092c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -687,43 +687,43 @@ L_1060be4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::free_cache_slot_106091c(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::free_cache_slot_106092c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060bec: 0x1060bec: lui   v0, 0x70000
+// 0x01060bfc: 0x1060bfc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060bf0: 0x1060bf0: sll   v1, s2, 2
+// 0x01060c00: 0x1060c00: sll   v1, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01060bf4: 0x1060bf4: addiu v0, v0, 12452
+// 0x01060c04: 0x1060c04: addiu v0, v0, 12916
 	ldloc 5
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 5
-// 0x01060bf8: 0x1060bf8: addu  v0, v1, v0
+// 0x01060c08: 0x1060c08: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01060bfc: 0x1060bfc: lw    s0, 0(v0)
+// 0x01060c0c: 0x1060c0c: lw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01060c00: 0x1060c00: j	 0x1060c28 addu  v1, zero, zero
+// 0x01060c10: 0x1060c10: j	 0x1060c38 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1060c28
+	br L_1060c38
 // --- basic block ---
-L_1060c08:
-// 0x01060c08: 0x1060c08: jal   0x1000910 addiu a0, zero, 24
+L_1060c18:
+// 0x01060c18: 0x1060c18: jal   0x1000910 addiu a0, zero, 24
 	ldc.i4.s 24
 	stloc.1
 	ldloc.0
@@ -736,74 +736,74 @@ L_1060c08:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060c10: 0x1060c10: addu  s0, v0, zero
+// 0x01060c20: 0x1060c20: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01060c14: 0x1060c14: lui   v0, 0x70000
+// 0x01060c24: 0x1060c24: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060c18: 0x1060c18: lw    a0, 12416(v0)
+// 0x01060c28: 0x1060c28: lw    a0, 12880(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060c1c: 0x1060c1c: addu  v1, zero, zero
+// 0x01060c2c: 0x1060c2c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01060c20: 0x1060c20: addiu a0, a0, 1
+// 0x01060c30: 0x1060c30: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01060c24: 0x1060c24: sw    a0, 12416(v0)
+// 0x01060c34: 0x1060c34: sw    a0, 12880(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldloc.1
 	stelem.i4
-L_1060c28:
-// 0x01060c28: 0x1060c28: addiu a0, s2, -1
+L_1060c38:
+// 0x01060c38: 0x1060c38: addiu a0, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01060c2c: 0x1060c2c: lui   v0, 0x70000
+// 0x01060c3c: 0x1060c3c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060c30: 0x1060c30: sll   a0, a0, 2
+// 0x01060c40: 0x1060c40: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01060c34: 0x1060c34: addiu v0, v0, 12452
+// 0x01060c44: 0x1060c44: addiu v0, v0, 12916
 	ldloc 5
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 5
-// 0x01060c38: 0x1060c38: j	 0x1060c50 addu  v0, v0, a0
+// 0x01060c48: 0x1060c48: j	 0x1060c60 addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-	br L_1060c50
+	br L_1060c60
 // --- basic block ---
-L_1060c40:
-// 0x01060c40: 0x1060c40: lw    a0, 0(v0)
+L_1060c50:
+// 0x01060c50: 0x1060c50: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01060c44: 0x1060c44: sll   zero, zero, 0
-// 0x01060c48: 0x1060c48: sw    a0, 4(v0)
+// 0x01060c54: 0x1060c54: sll   zero, zero, 0
+// 0x01060c58: 0x1060c58: sw    a0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -812,75 +812,75 @@ L_1060c40:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01060c4c: 0x1060c4c: addiu v0, v0, -4
+// 0x01060c5c: 0x1060c5c: addiu v0, v0, -4
 	ldloc 5
 	ldc.i4.s -4
 	add
 	stloc 5
-L_1060c50:
-// 0x01060c50: 0x1060c50: bgtz  s2, 0x1060c40 addiu s2, s2, -1
+L_1060c60:
+// 0x01060c60: 0x1060c60: bgtz  s2, 0x1060c50 addiu s2, s2, -1
 	ldloc 8
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
 	ldc.i4.s 0
-	bgt L_1060c40
+	bgt L_1060c50
 // --- basic block ---
-// 0x01060c58: 0x1060c58: lui   v0, 0x70000
+// 0x01060c68: 0x1060c68: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01060c5c: 0x1060c5c: bne   v1, zero, 0x1060f88 sw    s0, 12452(v0)
+// 0x01060c6c: 0x1060c6c: bne   v1, zero, 0x1060f98 sw    s0, 12916(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3113
+	ldc.i4 3229
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_1060f88
+	brtrue L_1060f98
 // --- basic block ---
-// 0x01060c64: 0x1060c64: lui   s7, 0x7fff0000
+// 0x01060c74: 0x1060c74: lui   s7, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 14
-// 0x01060c68: 0x1060c68: sw    s1, 0(s0)
+// 0x01060c78: 0x1060c78: sw    s1, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-// 0x01060c6c: 0x1060c6c: ori   s7, s7, 65535
+// 0x01060c7c: 0x1060c7c: ori   s7, s7, 65535
 	ldloc 14
 	ldc.i4 65535
 	or
 	stloc 14
-// 0x01060c70: 0x1060c70: addu  s3, zero, zero
+// 0x01060c80: 0x1060c80: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01060c74: 0x1060c74: addiu s2, zero, 1
+// 0x01060c84: 0x1060c84: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01060c78: 0x1060c78: lui   s6, 0x0
+// 0x01060c88: 0x1060c88: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x01060c7c: 0x1060c7c: lui   s5, 0x20000
+// 0x01060c8c: 0x1060c8c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x01060c80: 0x1060c80: addiu s4, zero, 12
+// 0x01060c90: 0x1060c90: addiu s4, zero, 12
 	ldc.i4.s 12
 	stloc 20
-L_1060c84:
-// 0x01060c84: 0x1060c84: bltz  s1, 0x1060cec addu  a0, s1, zero
+L_1060c94:
+// 0x01060c94: 0x1060c94: bltz  s1, 0x1060cfc addu  a0, s1, zero
 	ldloc 12
 	ldloc 12
 	stloc.1
 	ldc.i4.s 0
-	blt L_1060cec
+	blt L_1060cfc
 // --- basic block ---
-// 0x01060c8c: 0x1060c8c: lw    v0, 576(s6)
+// 0x01060c9c: 0x1060c9c: lw    v0, 576(s6)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -889,57 +889,57 @@ L_1060c84:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060c90: 0x1060c90: sll   zero, zero, 0
-// 0x01060c94: 0x1060c94: beq   s1, v0, 0x1060ca4 sll   zero, zero, 0
+// 0x01060ca0: 0x1060ca0: sll   zero, zero, 0
+// 0x01060ca4: 0x1060ca4: beq   s1, v0, 0x1060cb4 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	beq  L_1060ca4
+	beq  L_1060cb4
 // --- basic block ---
-// 0x01060c9c: 0x1060c9c: jal   0x100b164 sll   zero, zero, 0
+// 0x01060cac: 0x1060cac: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1060ca4:
-// 0x01060ca4: 0x1060ca4: lw    v1, 31148(s5)
+L_1060cb4:
+// 0x01060cb4: 0x1060cb4: lw    v1, 31612(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060ca8: 0x1060ca8: addu  a1, s2, s7
+// 0x01060cb8: 0x1060cb8: addu  a1, s2, s7
 	ldloc 8
 	ldloc 14
 	add
 	stloc.2
-// 0x01060cac: 0x1060cac: sll   a2, s2, 1
+// 0x01060cbc: 0x1060cbc: sll   a2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	shl
 	stloc.3
-// 0x01060cb0: 0x1060cb0: sll   a1, a1, 1
+// 0x01060cc0: 0x1060cc0: sll   a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	shl
 	stloc.2
-// 0x01060cb4: 0x1060cb4: beq   v1, zero, 0x1060cec addiu a0, s3, 1
+// 0x01060cc4: 0x1060cc4: beq   v1, zero, 0x1060cfc addiu a0, s3, 1
 	ldloc 7
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc.1
-	brfalse L_1060cec
+	brfalse L_1060cfc
 // --- basic block ---
-// 0x01060cbc: 0x1060cbc: lw    v0, 12(v1)
+// 0x01060ccc: 0x1060ccc: lw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -948,72 +948,72 @@ L_1060ca4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060cc0: 0x1060cc0: sll   zero, zero, 0
-// 0x01060cc4: 0x1060cc4: addu  v1, v0, a2
+// 0x01060cd0: 0x1060cd0: sll   zero, zero, 0
+// 0x01060cd4: 0x1060cd4: addu  v1, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc 7
-// 0x01060cc8: 0x1060cc8: lhu   v1, 0(v1)
+// 0x01060cd8: 0x1060cd8: lhu   v1, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01060ccc: 0x1060ccc: addu  v0, v0, a1
+// 0x01060cdc: 0x1060cdc: addu  v0, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc 5
-// 0x01060cd0: 0x1060cd0: lhu   v0, 0(v0)
+// 0x01060ce0: 0x1060ce0: lhu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01060cd4: 0x1060cd4: addiu v1, v1, -1
+// 0x01060ce4: 0x1060ce4: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01060cd8: 0x1060cd8: addu  a0, a0, v1
+// 0x01060ce8: 0x1060ce8: addu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-// 0x01060cdc: 0x1060cdc: slt   v1, v1, v0
+// 0x01060cec: 0x1060cec: slt   v1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 7
-// 0x01060ce0: 0x1060ce0: bne   v1, zero, 0x1060cec sll   zero, zero, 0
+// 0x01060cf0: 0x1060cf0: bne   v1, zero, 0x1060cfc sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1060cec
+	brtrue L_1060cfc
 // --- basic block ---
-// 0x01060ce8: 0x1060ce8: subu  s3, a0, v0
+// 0x01060cf8: 0x1060cf8: subu  s3, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 10
-L_1060cec:
-// 0x01060cec: 0x1060cec: addiu s2, s2, 1
+L_1060cfc:
+// 0x01060cfc: 0x1060cfc: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01060cf0: 0x1060cf0: bne   s2, s4, 0x1060c84 sll   zero, zero, 0
+// 0x01060d00: 0x1060d00: bne   s2, s4, 0x1060c94 sll   zero, zero, 0
 	ldloc 8
 	ldloc 20
-	bne.un L_1060c84
+	bne.un L_1060c94
 // --- basic block ---
-// 0x01060cf8: 0x1060cf8: sll   s3, s3, 1
+// 0x01060d08: 0x1060d08: sll   s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	shl
 	stloc 10
-// 0x01060cfc: 0x1060cfc: sh    s3, 4(s0)
+// 0x01060d0c: 0x1060d0c: sh    s3, 4(s0)
 	ldloc 9
 	ldc.i4.4
 	add
 	ldloc 10
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01060d00: 0x1060d00: jal   0x100b76c addu  a0, s1, zero
+// 0x01060d10: 0x1060d10: jal   0x100b77c addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -1021,72 +1021,72 @@ L_1060cec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_points_count_100b76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_points_count_100b77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060d08: 0x1060d08: lhu   a0, 4(s0)
+// 0x01060d18: 0x1060d18: lhu   a0, 4(s0)
 	ldloc 9
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01060d0c: 0x1060d0c: addiu v1, zero, 3
+// 0x01060d1c: 0x1060d1c: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x01060d10: 0x1060d10: mult  a0, v1
+// 0x01060d20: 0x1060d20: mult  a0, v1
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 28
-// 0x01060d14: 0x1060d14: andi  v0, v0, 65535
+// 0x01060d24: 0x1060d24: andi  v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	and
 	stloc 5
-// 0x01060d18: 0x1060d18: sh    v0, 6(s0)
+// 0x01060d28: 0x1060d28: sh    v0, 6(s0)
 	ldloc 9
 	ldc.i4.6
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01060d1c: 0x1060d1c: lui   s5, 0x20000
+// 0x01060d2c: 0x1060d2c: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x01060d20: 0x1060d20: lui   s3, 0x70000
+// 0x01060d30: 0x1060d30: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x01060d24: 0x1060d24: ori   s5, s5, 18929
+// 0x01060d34: 0x1060d34: ori   s5, s5, 18929
 	ldloc 13
 	ldc.i4 18929
 	or
 	stloc 13
-// 0x01060d28: 0x1060d28: addiu s3, s3, 12452
+// 0x01060d38: 0x1060d38: addiu s3, s3, 12916
 	ldloc 10
-	ldc.i4 12452
+	ldc.i4 12916
 	add
 	stloc 10
-// 0x01060d2c: 0x1060d2c: lui   s4, 0x70000
+// 0x01060d3c: 0x1060d3c: lui   s4, 0x70000
 	ldc.i4 458752
 	stloc 20
-// 0x01060d30: 0x1060d30: lui   s2, 0x70000
+// 0x01060d40: 0x1060d40: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01060d34: 0x1060d34: mflo  lo
+// 0x01060d44: 0x1060d44: mflo  lo
 	ldloc 28
 	stloc 7
-// 0x01060d38: 0x1060d38: addu  v0, v0, v1
+// 0x01060d48: 0x1060d48: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01060d3c: 0x1060d3c: sll   v0, v0, 1
+// 0x01060d4c: 0x1060d4c: sll   v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-// 0x01060d40: 0x1060d40: j	 0x1060d80 sw    v0, 20(s0)
+// 0x01060d50: 0x1060d50: j	 0x1060d90 sw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1095,15 +1095,15 @@ L_1060cec:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1060d80
+	br L_1060d90
 // --- basic block ---
-L_1060d48:
-// 0x01060d48: 0x1060d48: jal   0x106091c sw    v1, 12416(s2)
+L_1060d58:
+// 0x01060d58: 0x1060d58: jal   0x106092c sw    v1, 12880(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldloc 7
 	stelem.i4
@@ -1112,39 +1112,39 @@ L_1060d48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::free_cache_slot_106091c(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::free_cache_slot_106092c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060d50: 0x1060d50: lw    v0, 12416(s2)
+// 0x01060d60: 0x1060d60: lw    v0, 12880(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060d54: 0x1060d54: sll   zero, zero, 0
-// 0x01060d58: 0x1060d58: sll   v0, v0, 2
+// 0x01060d64: 0x1060d64: sll   zero, zero, 0
+// 0x01060d68: 0x1060d68: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01060d5c: 0x1060d5c: addu  v0, v0, s3
+// 0x01060d6c: 0x1060d6c: addu  v0, v0, s3
 	ldloc 5
 	ldloc 10
 	add
 	stloc 5
-// 0x01060d60: 0x1060d60: lw    a0, 0(v0)
+// 0x01060d70: 0x1060d70: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01060d64: 0x1060d64: jal   0x1000930 sll   zero, zero, 0
+// 0x01060d74: 0x1060d74: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1155,49 +1155,49 @@ L_1060d48:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060d6c: 0x1060d6c: lw    v0, 12416(s2)
+// 0x01060d7c: 0x1060d7c: lw    v0, 12880(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060d70: 0x1060d70: sll   zero, zero, 0
-// 0x01060d74: 0x1060d74: sll   v0, v0, 2
+// 0x01060d80: 0x1060d80: sll   zero, zero, 0
+// 0x01060d84: 0x1060d84: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01060d78: 0x1060d78: addu  v0, v0, s3
+// 0x01060d88: 0x1060d88: addu  v0, v0, s3
 	ldloc 5
 	ldloc 10
 	add
 	stloc 5
-// 0x01060d7c: 0x1060d7c: sw    zero, 0(v0)
+// 0x01060d8c: 0x1060d8c: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1060d80:
-// 0x01060d80: 0x1060d80: lw    v0, 12752(s4)
+L_1060d90:
+// 0x01060d90: 0x1060d90: lw    v0, 13216(s4)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
 	shr.un
-	ldc.i4 3188
+	ldc.i4 3304
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060d84: 0x1060d84: sll   zero, zero, 0
-// 0x01060d88: 0x1060d88: beq   v0, zero, 0x1060dc0 sll   zero, zero, 0
+// 0x01060d94: 0x1060d94: sll   zero, zero, 0
+// 0x01060d98: 0x1060d98: beq   v0, zero, 0x1060dd0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1060dc0
+	brfalse L_1060dd0
 // --- basic block ---
-// 0x01060d90: 0x1060d90: lw    v1, 20(s0)
+// 0x01060da0: 0x1060da0: lw    v1, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1206,58 +1206,58 @@ L_1060d80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060d94: 0x1060d94: sll   zero, zero, 0
-// 0x01060d98: 0x1060d98: addu  v0, v0, v1
+// 0x01060da4: 0x1060da4: sll   zero, zero, 0
+// 0x01060da8: 0x1060da8: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01060d9c: 0x1060d9c: slt   v0, v0, s5
+// 0x01060dac: 0x1060dac: slt   v0, v0, s5
 	ldloc 5
 	ldloc 13
 	clt
 	stloc 5
-// 0x01060da0: 0x1060da0: bne   v0, zero, 0x1060dc0 sll   zero, zero, 0
+// 0x01060db0: 0x1060db0: bne   v0, zero, 0x1060dd0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1060dc0
+	brtrue L_1060dd0
 // --- basic block ---
-// 0x01060da8: 0x1060da8: lw    v0, 12416(s2)
+// 0x01060db8: 0x1060db8: lw    v0, 12880(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3104
+	ldc.i4 3220
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060dac: 0x1060dac: sll   zero, zero, 0
-// 0x01060db0: 0x1060db0: addiu v1, v0, -1
+// 0x01060dbc: 0x1060dbc: sll   zero, zero, 0
+// 0x01060dc0: 0x1060dc0: addiu v1, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01060db4: 0x1060db4: slti  v0, v0, 2
+// 0x01060dc4: 0x1060dc4: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01060db8: 0x1060db8: beq   v0, zero, 0x1060d48 addu  a0, v1, zero
+// 0x01060dc8: 0x1060dc8: beq   v0, zero, 0x1060d58 addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_1060d48
+	brfalse L_1060d58
 // --- basic block ---
-L_1060dc0:
-// 0x01060dc0: 0x1060dc0: lhu   a0, 4(s0)
+L_1060dd0:
+// 0x01060dd0: 0x1060dd0: lhu   a0, 4(s0)
 	ldloc 9
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01060dc4: 0x1060dc4: lui   s5, 0x7fff0000
+// 0x01060dd4: 0x1060dd4: lui   s5, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 13
-// 0x01060dc8: 0x1060dc8: jal   0x1000910 sll   a0, a0, 2
+// 0x01060dd8: 0x1060dd8: jal   0x1000910 sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
@@ -1272,13 +1272,13 @@ L_1060dc0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060dd0: 0x1060dd0: lhu   a0, 4(s0)
+// 0x01060de0: 0x1060de0: lhu   a0, 4(s0)
 	ldloc 9
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01060dd4: 0x1060dd4: jal   0x1060b0c sw    v0, 12(s0)
+// 0x01060de4: 0x1060de4: jal   0x1060b1c sw    v0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1292,18 +1292,18 @@ L_1060dc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::T_88_1060b0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::T_88_1060b1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060ddc: 0x1060ddc: lhu   a0, 6(s0)
+// 0x01060dec: 0x1060dec: lhu   a0, 6(s0)
 	ldloc 9
 	ldc.i4.6
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01060de0: 0x1060de0: jal   0x1060b0c sw    v0, 16(s0)
+// 0x01060df0: 0x1060df0: jal   0x1060b1c sw    v0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1317,15 +1317,15 @@ L_1060dc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::T_88_1060b0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::T_88_1060b1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060de8: 0x1060de8: lui   v1, 0x70000
+// 0x01060df8: 0x1060df8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01060dec: 0x1060dec: lw    a1, 20(s0)
+// 0x01060dfc: 0x1060dfc: lw    a1, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1334,33 +1334,33 @@ L_1060dc0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01060df0: 0x1060df0: lw    a0, 12752(v1)
+// 0x01060e00: 0x1060e00: lw    a0, 13216(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3188
+	ldc.i4 3304
 	add
 	ldelem.i4
 	stloc.1
-// 0x01060df4: 0x1060df4: addu  s2, zero, zero
+// 0x01060e04: 0x1060e04: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01060df8: 0x1060df8: addu  a0, a1, a0
+// 0x01060e08: 0x1060e08: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01060dfc: 0x1060dfc: sw    a0, 12752(v1)
+// 0x01060e0c: 0x1060e0c: sw    a0, 13216(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3188
+	ldc.i4 3304
 	add
 	ldloc.1
 	stelem.i4
-// 0x01060e00: 0x1060e00: sw    v0, 8(s0)
+// 0x01060e10: 0x1060e10: sw    v0, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1369,24 +1369,24 @@ L_1060dc0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01060e04: 0x1060e04: ori   s5, s5, 65535
+// 0x01060e14: 0x1060e14: ori   s5, s5, 65535
 	ldloc 13
 	ldc.i4 65535
 	or
 	stloc 13
-// 0x01060e08: 0x1060e08: addiu s3, zero, 11
+// 0x01060e18: 0x1060e18: addiu s3, zero, 11
 	ldc.i4.s 11
 	stloc 10
-// 0x01060e0c: 0x1060e0c: lui   s4, 0x0
+// 0x01060e1c: 0x1060e1c: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 20
-L_1060e10:
-// 0x01060e10: 0x1060e10: bltz  s1, 0x1060f7c sll   zero, zero, 0
+L_1060e20:
+// 0x01060e20: 0x1060e20: bltz  s1, 0x1060f8c sll   zero, zero, 0
 	ldloc 12
 	ldc.i4.s 0
-	blt L_1060f7c
+	blt L_1060f8c
 // --- basic block ---
-// 0x01060e18: 0x1060e18: lw    v0, 576(s4)
+// 0x01060e28: 0x1060e28: lw    v0, 576(s4)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
@@ -1395,15 +1395,15 @@ L_1060e10:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060e1c: 0x1060e1c: sll   zero, zero, 0
-// 0x01060e20: 0x1060e20: beq   s1, v0, 0x1060e34 lui   t5, 0x20000
+// 0x01060e2c: 0x1060e2c: sll   zero, zero, 0
+// 0x01060e30: 0x1060e30: beq   s1, v0, 0x1060e44 lui   t5, 0x20000
 	ldloc 12
 	ldloc 5
 	ldc.i4 131072
 	stloc 11
-	beq  L_1060e34
+	beq  L_1060e44
 // --- basic block ---
-// 0x01060e28: 0x1060e28: jal   0x100b164 addu  a0, s1, zero
+// 0x01060e38: 0x1060e38: jal   0x100b174 addu  a0, s1, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -1411,30 +1411,30 @@ L_1060e10:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060e30: 0x1060e30: lui   t5, 0x20000
+// 0x01060e40: 0x1060e40: lui   t5, 0x20000
 	ldc.i4 131072
 	stloc 11
-L_1060e34:
-// 0x01060e34: 0x1060e34: lw    v0, 31148(t5)
+L_1060e44:
+// 0x01060e44: 0x1060e44: lw    v0, 31612(t5)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7787
+	ldc.i4 7903
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060e38: 0x1060e38: sll   zero, zero, 0
-// 0x01060e3c: 0x1060e3c: beq   v0, zero, 0x1060f7c sll   zero, zero, 0
+// 0x01060e48: 0x1060e48: sll   zero, zero, 0
+// 0x01060e4c: 0x1060e4c: beq   v0, zero, 0x1060f8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1060f7c
+	brfalse L_1060f8c
 // --- basic block ---
-// 0x01060e44: 0x1060e44: lw    v0, 12(v0)
+// 0x01060e54: 0x1060e54: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1443,96 +1443,96 @@ L_1060e34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060e48: 0x1060e48: addu  a0, s3, s5
+// 0x01060e58: 0x1060e58: addu  a0, s3, s5
 	ldloc 10
 	ldloc 13
 	add
 	stloc.1
-// 0x01060e4c: 0x1060e4c: sll   a0, a0, 1
+// 0x01060e5c: 0x1060e5c: sll   a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
 	stloc.1
-// 0x01060e50: 0x1060e50: sll   v1, s3, 1
+// 0x01060e60: 0x1060e60: sll   v1, s3, 1
 	ldloc 10
 	ldc.i4.1
 	shl
 	stloc 7
-// 0x01060e54: 0x1060e54: addu  v1, v0, v1
+// 0x01060e64: 0x1060e64: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01060e58: 0x1060e58: addu  v0, v0, a0
+// 0x01060e68: 0x1060e68: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01060e5c: 0x1060e5c: lhu   t2, 0(v0)
+// 0x01060e6c: 0x1060e6c: lhu   t2, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 21
-// 0x01060e60: 0x1060e60: lhu   s7, 0(v1)
+// 0x01060e70: 0x1060e70: lhu   s7, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 14
-// 0x01060e64: 0x1060e64: sll   zero, zero, 0
-// 0x01060e68: 0x1060e68: slt   v0, t2, s7
+// 0x01060e74: 0x1060e74: sll   zero, zero, 0
+// 0x01060e78: 0x1060e78: slt   v0, t2, s7
 	ldloc 21
 	ldloc 14
 	clt
 	stloc 5
-// 0x01060e6c: 0x1060e6c: beq   v0, zero, 0x1060f7c sll   zero, zero, 0
+// 0x01060e7c: 0x1060e7c: beq   v0, zero, 0x1060f8c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1060f7c
+	brfalse L_1060f8c
 // --- basic block ---
-// 0x01060e74: 0x1060e74: addiu s8, s2, 1
+// 0x01060e84: 0x1060e84: addiu s8, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 17
-// 0x01060e78: 0x1060e78: addiu t0, s2, 2
+// 0x01060e88: 0x1060e88: addiu t0, s2, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 18
-// 0x01060e7c: 0x1060e7c: sll   a3, s8, 2
+// 0x01060e8c: 0x1060e8c: sll   a3, s8, 2
 	ldloc 17
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x01060e80: 0x1060e80: andi  t0, t0, 65535
+// 0x01060e90: 0x1060e90: andi  t0, t0, 65535
 	ldloc 18
 	ldc.i4 65535
 	and
 	stloc 18
-// 0x01060e84: 0x1060e84: sll   v1, s2, 1
+// 0x01060e94: 0x1060e94: sll   v1, s2, 1
 	ldloc 8
 	ldc.i4.1
 	shl
 	stloc 7
-// 0x01060e88: 0x1060e88: sll   v0, s2, 2
+// 0x01060e98: 0x1060e98: sll   v0, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01060e8c: 0x1060e8c: sll   s8, s8, 1
+// 0x01060e9c: 0x1060e9c: sll   s8, s8, 1
 	ldloc 17
 	ldc.i4.1
 	shl
 	stloc 17
-// 0x01060e90: 0x1060e90: addu  s6, zero, zero
+// 0x01060ea0: 0x1060ea0: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 16
-// 0x01060e94: 0x1060e94: j	 0x1060f5c addiu t3, s7, -1
+// 0x01060ea4: 0x1060ea4: j	 0x1060f6c addiu t3, s7, -1
 	ldloc 14
 	ldc.i4.m1
 	add
 	stloc 22
-	br L_1060f5c
+	br L_1060f6c
 // --- basic block ---
-L_1060e9c:
-// 0x01060e9c: 0x1060e9c: sw    v0, 36(sp)
+L_1060eac:
+// 0x01060eac: 0x1060eac: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1541,7 +1541,7 @@ L_1060e9c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01060ea0: 0x1060ea0: sw    v1, 40(sp)
+// 0x01060eb0: 0x1060eb0: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1550,7 +1550,7 @@ L_1060e9c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01060ea4: 0x1060ea4: sw    a3, 28(sp)
+// 0x01060eb4: 0x1060eb4: sw    a3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1559,7 +1559,7 @@ L_1060e9c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01060ea8: 0x1060ea8: sw    t0, 32(sp)
+// 0x01060eb8: 0x1060eb8: sw    t0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1568,7 +1568,7 @@ L_1060e9c:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01060eac: 0x1060eac: sw    t1, 24(sp)
+// 0x01060ebc: 0x1060ebc: sw    t1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1577,7 +1577,7 @@ L_1060e9c:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01060eb0: 0x1060eb0: sw    t2, 44(sp)
+// 0x01060ec0: 0x1060ec0: sw    t2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1586,7 +1586,7 @@ L_1060e9c:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01060eb4: 0x1060eb4: jal   0x1003adc sw    t3, 48(sp)
+// 0x01060ec4: 0x1060ec4: jal   0x1003adc sw    t3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1603,7 +1603,7 @@ L_1060e9c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01060ebc: 0x1060ebc: lw    a2, 12(s0)
+// 0x01060ecc: 0x1060ecc: lw    a2, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1612,7 +1612,7 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01060ec0: 0x1060ec0: lw    v0, 36(sp)
+// 0x01060ed0: 0x1060ed0: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1621,13 +1621,13 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01060ec4: 0x1060ec4: lhu   t5, 18(sp)
+// 0x01060ed4: 0x1060ed4: lhu   t5, 18(sp)
 	ldloc.0
 	ldc.i4.s 18
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 11
-// 0x01060ec8: 0x1060ec8: lw    t1, 24(sp)
+// 0x01060ed8: 0x1060ed8: lw    t1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1636,12 +1636,12 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01060ecc: 0x1060ecc: addu  a0, a2, v0
+// 0x01060edc: 0x1060edc: addu  a0, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc.1
-// 0x01060ed0: 0x1060ed0: lw    a1, 8(s0)
+// 0x01060ee0: 0x1060ee0: lw    a1, 8(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1650,7 +1650,7 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01060ed4: 0x1060ed4: sw    t5, 16(sp)
+// 0x01060ee4: 0x1060ee4: sw    t5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1659,30 +1659,30 @@ L_1060e9c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01060ed8: 0x1060ed8: sw    t1, 0(a0)
+// 0x01060ee8: 0x1060ee8: sw    t1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 19
 	stelem.i4
-// 0x01060edc: 0x1060edc: sll   t5, t5, 1
+// 0x01060eec: 0x1060eec: sll   t5, t5, 1
 	ldloc 11
 	ldc.i4.1
 	shl
 	stloc 11
-// 0x01060ee0: 0x1060ee0: addu  t5, a1, t5
+// 0x01060ef0: 0x1060ef0: addu  t5, a1, t5
 	ldloc.2
 	ldloc 11
 	add
 	stloc 11
-// 0x01060ee4: 0x1060ee4: lhu   a0, 22(sp)
+// 0x01060ef4: 0x1060ef4: lhu   a0, 22(sp)
 	ldloc.0
 	ldc.i4.s 22
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01060ee8: 0x1060ee8: lw    t4, 16(s0)
+// 0x01060ef8: 0x1060ef8: lw    t4, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1691,7 +1691,7 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01060eec: 0x1060eec: lw    v1, 40(sp)
+// 0x01060efc: 0x1060efc: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1700,30 +1700,30 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01060ef0: 0x1060ef0: lhu   t8, 0(t5)
+// 0x01060f00: 0x1060f00: lhu   t8, 0(t5)
 	ldloc 11
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 26
-// 0x01060ef4: 0x1060ef4: addu  t7, t4, v1
+// 0x01060f04: 0x1060f04: addu  t7, t4, v1
 	ldloc 15
 	ldloc 7
 	add
 	stloc 25
-// 0x01060ef8: 0x1060ef8: sll   t6, a0, 1
+// 0x01060f08: 0x1060f08: sll   t6, a0, 1
 	ldloc.1
 	ldc.i4.1
 	shl
 	stloc 23
-// 0x01060efc: 0x1060efc: addiu t9, s2, 1
+// 0x01060f0c: 0x1060f0c: addiu t9, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 27
-// 0x01060f00: 0x1060f00: sh    t9, 0(t5)
+// 0x01060f10: 0x1060f10: sh    t9, 0(t5)
 	ldloc 11
 	ldloc 27
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01060f04: 0x1060f04: lw    t0, 32(sp)
+// 0x01060f14: 0x1060f14: lw    t0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1732,16 +1732,16 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01060f08: 0x1060f08: sh    t8, 0(t7)
+// 0x01060f18: 0x1060f18: sh    t8, 0(t7)
 	ldloc 25
 	ldloc 26
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01060f0c: 0x1060f0c: addu  a1, a1, t6
+// 0x01060f1c: 0x1060f1c: addu  a1, a1, t6
 	ldloc.2
 	ldloc 23
 	add
 	stloc.2
-// 0x01060f10: 0x1060f10: lw    a3, 28(sp)
+// 0x01060f20: 0x1060f20: lw    a3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1750,29 +1750,29 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01060f14: 0x1060f14: lhu   t6, 0(a1)
+// 0x01060f24: 0x1060f24: lhu   t6, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 23
-// 0x01060f18: 0x1060f18: lui   t5, 0x80000000
+// 0x01060f28: 0x1060f28: lui   t5, 0x80000000
 	ldc.i4 2147483648
 	stloc 11
-// 0x01060f1c: 0x1060f1c: addu  t4, t4, s8
+// 0x01060f2c: 0x1060f2c: addu  t4, t4, s8
 	ldloc 15
 	ldloc 17
 	add
 	stloc 15
-// 0x01060f20: 0x1060f20: addu  a2, a2, a3
+// 0x01060f30: 0x1060f30: addu  a2, a2, a3
 	ldloc.3
 	ldloc 4
 	add
 	stloc.3
-// 0x01060f24: 0x1060f24: or    t1, t1, t5
+// 0x01060f34: 0x1060f34: or    t1, t1, t5
 	ldloc 19
 	ldloc 11
 	or
 	stloc 19
-// 0x01060f28: 0x1060f28: lw    t3, 48(sp)
+// 0x01060f38: 0x1060f38: lw    t3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1781,12 +1781,12 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 22
-// 0x01060f2c: 0x1060f2c: addiu t5, t0, 2
+// 0x01060f3c: 0x1060f3c: addiu t5, t0, 2
 	ldloc 18
 	ldc.i4.2
 	add
 	stloc 11
-// 0x01060f30: 0x1060f30: lw    t2, 44(sp)
+// 0x01060f40: 0x1060f40: lw    t2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1795,11 +1795,11 @@ L_1060e9c:
 	add
 	ldelem.i4
 	stloc 21
-// 0x01060f34: 0x1060f34: sh    t0, 0(a1)
+// 0x01060f44: 0x1060f44: sh    t0, 0(a1)
 	ldloc.2
 	ldloc 18
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01060f38: 0x1060f38: sw    a0, 20(sp)
+// 0x01060f48: 0x1060f48: sw    a0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1808,100 +1808,100 @@ L_1060e9c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01060f3c: 0x1060f3c: sh    t6, 0(t4)
+// 0x01060f4c: 0x1060f4c: sh    t6, 0(t4)
 	ldloc 15
 	ldloc 23
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01060f40: 0x1060f40: sw    t1, 0(a2)
+// 0x01060f50: 0x1060f50: sw    t1, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 19
 	stelem.i4
-// 0x01060f44: 0x1060f44: addiu s2, s2, 2
+// 0x01060f54: 0x1060f54: addiu s2, s2, 2
 	ldloc 8
 	ldc.i4.2
 	add
 	stloc 8
-// 0x01060f48: 0x1060f48: addiu v1, v1, 4
+// 0x01060f58: 0x1060f58: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x01060f4c: 0x1060f4c: addiu v0, v0, 8
+// 0x01060f5c: 0x1060f5c: addiu v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	add
 	stloc 5
-// 0x01060f50: 0x1060f50: andi  t0, t5, 65535
+// 0x01060f60: 0x1060f60: andi  t0, t5, 65535
 	ldloc 11
 	ldc.i4 65535
 	and
 	stloc 18
-// 0x01060f54: 0x1060f54: addiu s8, s8, 4
+// 0x01060f64: 0x1060f64: addiu s8, s8, 4
 	ldloc 17
 	ldc.i4.4
 	add
 	stloc 17
-// 0x01060f58: 0x1060f58: addiu a3, a3, 8
+// 0x01060f68: 0x1060f68: addiu a3, a3, 8
 	ldloc 4
 	ldc.i4.8
 	add
 	stloc 4
-L_1060f5c:
-// 0x01060f5c: 0x1060f5c: subu  t1, t3, s6
+L_1060f6c:
+// 0x01060f6c: 0x1060f6c: subu  t1, t3, s6
 	ldloc 22
 	ldloc 16
 	sub
 	stloc 19
-// 0x01060f60: 0x1060f60: addiu s6, s6, 1
+// 0x01060f70: 0x1060f70: addiu s6, s6, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x01060f64: 0x1060f64: subu  t4, s7, s6
+// 0x01060f74: 0x1060f74: subu  t4, s7, s6
 	ldloc 14
 	ldloc 16
 	sub
 	stloc 15
-// 0x01060f68: 0x1060f68: slt   t4, t4, t2
+// 0x01060f78: 0x1060f78: slt   t4, t4, t2
 	ldloc 15
 	ldloc 21
 	clt
 	stloc 15
-// 0x01060f6c: 0x1060f6c: addiu a1, sp, 16
+// 0x01060f7c: 0x1060f7c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01060f70: 0x1060f70: addiu a2, sp, 20
+// 0x01060f80: 0x1060f80: addiu a2, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc.3
-// 0x01060f74: 0x1060f74: beq   t4, zero, 0x1060e9c addu  a0, t1, zero
+// 0x01060f84: 0x1060f84: beq   t4, zero, 0x1060eac addu  a0, t1, zero
 	ldloc 15
 	ldloc 19
 	stloc.1
-	brfalse L_1060e9c
+	brfalse L_1060eac
 // --- basic block ---
-L_1060f7c:
-// 0x01060f7c: 0x1060f7c: addiu s3, s3, -1
+L_1060f8c:
+// 0x01060f8c: 0x1060f8c: addiu s3, s3, -1
 	ldloc 10
 	ldc.i4.m1
 	add
 	stloc 10
-// 0x01060f80: 0x1060f80: bne   s3, zero, 0x1060e10 sll   zero, zero, 0
+// 0x01060f90: 0x1060f90: bne   s3, zero, 0x1060e20 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_1060e10
+	brtrue L_1060e20
 // --- basic block ---
-L_1060f88:
-// 0x01060f88: 0x1060f88: lw    ra, 92(sp)
-// 0x01060f8c: 0x1060f8c: addu  v0, s0, zero
+L_1060f98:
+// 0x01060f98: 0x1060f98: lw    ra, 92(sp)
+// 0x01060f9c: 0x1060f9c: addu  v0, s0, zero
 	ldloc 9
 	stloc 5
-// 0x01060f90: 0x1060f90: lw    s8, 88(sp)
+// 0x01060fa0: 0x1060fa0: lw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1910,7 +1910,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01060f94: 0x1060f94: lw    s7, 84(sp)
+// 0x01060fa4: 0x1060fa4: lw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1919,7 +1919,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01060f98: 0x1060f98: lw    s6, 80(sp)
+// 0x01060fa8: 0x1060fa8: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1928,7 +1928,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01060f9c: 0x1060f9c: lw    s5, 76(sp)
+// 0x01060fac: 0x1060fac: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1937,7 +1937,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01060fa0: 0x1060fa0: lw    s4, 72(sp)
+// 0x01060fb0: 0x1060fb0: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1946,7 +1946,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01060fa4: 0x1060fa4: lw    s3, 68(sp)
+// 0x01060fb4: 0x1060fb4: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1955,7 +1955,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01060fa8: 0x1060fa8: lw    s2, 64(sp)
+// 0x01060fb8: 0x1060fb8: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1964,7 +1964,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01060fac: 0x1060fac: lw    s1, 60(sp)
+// 0x01060fbc: 0x1060fbc: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1973,7 +1973,7 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01060fb0: 0x1060fb0: lw    s0, 56(sp)
+// 0x01060fc0: 0x1060fc0: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1982,32 +1982,32 @@ L_1060f88:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01060fb4: 0x1060fb4: jr    ra addiu sp, sp, 96
+// 0x01060fc4: 0x1060fc4: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1060fbc:
-// 0x01060fbc: 0x1060fbc: bne   v1, v0, 0x1060c08 sll   zero, zero, 0
+L_1060fcc:
+// 0x01060fcc: 0x1060fcc: bne   v1, v0, 0x1060c18 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1060c08
+	bne.un L_1060c18
 // --- basic block ---
-// 0x01060fc4: 0x1060fc4: j	 0x1060be4 addiu s2, s2, -1
+// 0x01060fd4: 0x1060fd4: j	 0x1060bf4 addiu s2, s2, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-	br L_1060be4
+	br L_1060bf4
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 get_connected_segments_106104c(int32,int32,int32,int32,int32)
+.method public static int32 get_connected_segments_106105c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s6,int32 s0,int32 s7,int32 s8,int32 s1,int32 s3,int32 s4,int32 s5,int32 ra)
@@ -2069,12 +2069,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106104c: 0x106104c: addiu sp, sp, -96
+// 0x0106105c: 0x106105c: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01061050: 0x1061050: sw    s4, 72(sp)
+// 0x01061060: 0x1061060: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2083,7 +2083,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01061054: 0x1061054: lw    s4, 116(sp)
+// 0x01061064: 0x1061064: lw    s4, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2092,7 +2092,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01061058: 0x1061058: sw    s6, 80(sp)
+// 0x01061068: 0x1061068: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2101,7 +2101,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106105c: 0x106105c: sw    s5, 76(sp)
+// 0x0106106c: 0x106106c: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2110,7 +2110,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01061060: 0x1061060: sw    s2, 64(sp)
+// 0x01061070: 0x1061070: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2119,7 +2119,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01061064: 0x1061064: sw    s1, 60(sp)
+// 0x01061074: 0x1061074: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2128,7 +2128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01061068: 0x1061068: sw    s0, 56(sp)
+// 0x01061078: 0x1061078: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2137,8 +2137,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0106106c: 0x106106c: sw    ra, 92(sp)
-// 0x01061070: 0x1061070: sw    s8, 88(sp)
+// 0x0106107c: 0x106107c: sw    ra, 92(sp)
+// 0x01061080: 0x1061080: sw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2147,7 +2147,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01061074: 0x1061074: sw    s7, 84(sp)
+// 0x01061084: 0x1061084: sw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2156,7 +2156,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01061078: 0x1061078: sw    s3, 68(sp)
+// 0x01061088: 0x1061088: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2165,16 +2165,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0106107c: 0x106107c: addu  s0, a0, zero
+// 0x0106108c: 0x106108c: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01061080: 0x1061080: addu  s1, a1, zero
+// 0x01061090: 0x1061090: addu  s1, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01061084: 0x1061084: addu  s6, a2, zero
+// 0x01061094: 0x1061094: addu  s6, a2, zero
 	ldloc.3
 	stloc 9
-// 0x01061088: 0x1061088: lw    s5, 120(sp)
+// 0x01061098: 0x1061098: lw    s5, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2183,35 +2183,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0106108c: 0x106108c: blez  s4, 0x10610d8 addu  s2, a3, zero
+// 0x0106109c: 0x106109c: blez  s4, 0x10610e8 addu  s2, a3, zero
 	ldloc 15
 	ldloc 4
 	stloc 8
 	ldc.i4.s 0
-	ble L_10610d8
+	ble L_10610e8
 // --- basic block ---
-// 0x01061094: 0x1061094: sltu  v0, zero, a2
+// 0x010610a4: 0x10610a4: sltu  v0, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc 5
-// 0x01061098: 0x1061098: addiu a3, zero, 2
+// 0x010610a8: 0x10610a8: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x0106109c: 0x106109c: subu  a3, a3, v0
+// 0x010610ac: 0x10610ac: subu  a3, a3, v0
 	ldloc 4
 	ldloc 5
 	sub
 	stloc 4
-// 0x010610a0: 0x10610a0: lui   v0, 0x1060000
+// 0x010610b0: 0x10610b0: lui   v0, 0x1060000
 	ldc.i4 17170432
 	stloc 5
-// 0x010610a4: 0x10610a4: addiu v0, v0, 2700
+// 0x010610b4: 0x10610b4: addiu v0, v0, 2716
 	ldloc 5
-	ldc.i4 2700
+	ldc.i4 2716
 	add
 	stloc 5
-// 0x010610a8: 0x10610a8: sw    v0, 16(sp)
+// 0x010610b8: 0x10610b8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2220,7 +2220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010610ac: 0x10610ac: lw    v0, 112(sp)
+// 0x010610bc: 0x10610bc: lw    v0, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2229,18 +2229,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010610b0: 0x10610b0: addiu a0, sp, 28
+// 0x010610c0: 0x10610c0: addiu a0, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.1
-// 0x010610b4: 0x10610b4: addu  a1, zero, zero
+// 0x010610c4: 0x10610c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010610b8: 0x10610b8: addu  a2, zero, zero
+// 0x010610c8: 0x10610c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010610bc: 0x10610bc: sw    s0, 40(sp)
+// 0x010610cc: 0x10610cc: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2249,7 +2249,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010610c0: 0x10610c0: sw    s1, 32(sp)
+// 0x010610d0: 0x10610d0: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2258,7 +2258,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010610c4: 0x10610c4: sw    zero, 28(sp)
+// 0x010610d4: 0x10610d4: sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2267,7 +2267,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010610c8: 0x10610c8: jal   0x1012790 sw    v0, 20(sp)
+// 0x010610d8: 0x10610d8: jal   0x10127a0 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2281,78 +2281,78 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010610d0: 0x10610d0: bne   v0, zero, 0x10612e8 addiu s7, zero, 1
+// 0x010610e0: 0x10610e0: bne   v0, zero, 0x10612f8 addiu s7, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 11
-	brtrue L_10612e8
+	brtrue L_10612f8
 // --- basic block ---
-L_10610d8:
-// 0x010610d8: 0x10610d8: lui   v1, 0x70000
+L_10610e8:
+// 0x010610e8: 0x10610e8: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x010610dc: 0x10610dc: lw    v0, 12420(v1)
+// 0x010610ec: 0x10610ec: lw    v0, 12884(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3105
+	ldc.i4 3221
 	add
 	ldelem.i4
 	stloc 5
-// 0x010610e0: 0x10610e0: sll   zero, zero, 0
-// 0x010610e4: 0x10610e4: bne   v0, zero, 0x106110c sll   zero, zero, 0
+// 0x010610f0: 0x10610f0: sll   zero, zero, 0
+// 0x010610f4: 0x10610f4: bne   v0, zero, 0x106111c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_106110c
+	brtrue L_106111c
 // --- basic block ---
-// 0x010610ec: 0x10610ec: addiu v1, v1, 12420
+// 0x010610fc: 0x10610fc: addiu v1, v1, 12884
 	ldloc 7
-	ldc.i4 12420
+	ldc.i4 12884
 	add
 	stloc 7
-// 0x010610f0: 0x10610f0: addiu a1, zero, 1
+// 0x01061100: 0x1061100: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010610f4: 0x10610f4: addiu a0, zero, 8
+// 0x01061104: 0x1061104: addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
-L_10610f8:
-// 0x010610f8: 0x10610f8: sllv  a2, v0, a1
+L_1061108:
+// 0x01061108: 0x1061108: sllv  a2, v0, a1
 	ldloc.2
 	ldloc 5
 	shl
 	stloc.3
-// 0x010610fc: 0x10610fc: addiu v0, v0, 1
+// 0x0106110c: 0x106110c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01061100: 0x1061100: sw    a2, 0(v1)
+// 0x01061110: 0x1061110: sw    a2, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01061104: 0x1061104: bne   v0, a0, 0x10610f8 addiu v1, v1, 4
+// 0x01061114: 0x1061114: bne   v0, a0, 0x1061108 addiu v1, v1, 4
 	ldloc 5
 	ldloc.1
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	bne.un L_10610f8
+	bne.un L_1061108
 // --- basic block ---
-L_106110c:
-// 0x0106110c: 0x106110c: lui   v0, 0x0
+L_106111c:
+// 0x0106111c: 0x106111c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01061110: 0x1061110: lw    v0, 576(v0)
+// 0x01061120: 0x1061120: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2361,18 +2361,18 @@ L_106110c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061114: 0x1061114: sll   zero, zero, 0
-// 0x01061118: 0x1061118: beq   s0, v0, 0x1061130 sll   zero, zero, 0
+// 0x01061124: 0x1061124: sll   zero, zero, 0
+// 0x01061128: 0x1061128: beq   s0, v0, 0x1061140 sll   zero, zero, 0
 	ldloc 10
 	ldloc 5
-	beq  L_1061130
+	beq  L_1061140
 // --- basic block ---
-// 0x01061120: 0x1061120: bltz  s0, 0x1061130 sll   zero, zero, 0
+// 0x01061130: 0x1061130: bltz  s0, 0x1061140 sll   zero, zero, 0
 	ldloc 10
 	ldc.i4.s 0
-	blt L_1061130
+	blt L_1061140
 // --- basic block ---
-// 0x01061128: 0x1061128: jal   0x100b164 addu  a0, s0, zero
+// 0x01061138: 0x1061138: jal   0x100b174 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2380,13 +2380,13 @@ L_106110c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1061130:
-// 0x01061130: 0x1061130: jal   0x1060b50 addu  a0, s0, zero
+L_1061140:
+// 0x01061140: 0x1061140: jal   0x1060b60 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2394,15 +2394,15 @@ L_1061130:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::get_square_graph_1060b50(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::get_square_graph_1060b60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061138: 0x1061138: addu  s3, v0, zero
+// 0x01061148: 0x1061148: addu  s3, v0, zero
 	ldloc 5
 	stloc 14
-// 0x0106113c: 0x106113c: lw    a0, 8(s3)
+// 0x0106114c: 0x106114c: lw    a0, 8(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -2411,52 +2411,52 @@ L_1061130:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061140: 0x1061140: andi  v0, s2, 65535
+// 0x01061150: 0x1061150: andi  v0, s2, 65535
 	ldloc 8
 	ldc.i4 65535
 	and
 	stloc 5
-// 0x01061144: 0x1061144: sll   v1, v0, 1
+// 0x01061154: 0x1061154: sll   v1, v0, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 7
-// 0x01061148: 0x1061148: addu  v1, a0, v1
+// 0x01061158: 0x1061158: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0106114c: 0x106114c: lhu   s2, 0(v1)
+// 0x0106115c: 0x106115c: lhu   s2, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 8
-// 0x01061150: 0x1061150: sll   zero, zero, 0
-// 0x01061154: 0x1061154: bne   s2, zero, 0x106117c lui   a1, 0x10000
+// 0x01061160: 0x1061160: sll   zero, zero, 0
+// 0x01061164: 0x1061164: bne   s2, zero, 0x106118c lui   a1, 0x10000
 	ldloc 8
 	ldc.i4 65536
 	stloc.2
-	brtrue L_106117c
+	brtrue L_106118c
 // --- basic block ---
-// 0x0106115c: 0x106115c: lui   a3, 0x10000
+// 0x0106116c: 0x106116c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01061160: 0x1061160: addiu a1, a1, 12724
+// 0x01061170: 0x1061170: addiu a1, a1, 12720
 	ldloc.2
-	ldc.i4 12724
+	ldc.i4 12720
 	add
 	stloc.2
-// 0x01061164: 0x1061164: addiu a3, a3, 12760
+// 0x01061174: 0x1061174: addiu a3, a3, 12756
 	ldloc 4
-	ldc.i4 12760
+	ldc.i4 12756
 	add
 	stloc 4
-// 0x01061168: 0x1061168: addiu a0, zero, 4
+// 0x01061178: 0x1061178: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106116c: 0x106116c: addiu a2, zero, 296
+// 0x0106117c: 0x106117c: addiu a2, zero, 296
 	ldc.i4 296
 	stloc.3
-// 0x01061170: 0x1061170: sw    v0, 16(sp)
+// 0x01061180: 0x1061180: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2465,7 +2465,7 @@ L_1061130:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061174: 0x1061174: jal   0x100449c sw    s0, 20(sp)
+// 0x01061184: 0x1061184: jal   0x100449c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2484,8 +2484,8 @@ L_1061130:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106117c:
-// 0x0106117c: 0x106117c: beq   s5, zero, 0x10611a4 sw    zero, 48(sp)
+L_106118c:
+// 0x0106118c: 0x106118c: beq   s5, zero, 0x10611b4 sw    zero, 48(sp)
 	ldloc 16
 	ldloc 6
 	ldloc.0
@@ -2495,36 +2495,36 @@ L_106117c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10611a4
+	brfalse L_10611b4
 // --- basic block ---
-// 0x01061184: 0x1061184: beq   s6, zero, 0x1061194 addu  a0, s1, zero
+// 0x01061194: 0x1061194: beq   s6, zero, 0x10611a4 addu  a0, s1, zero
 	ldloc 9
 	ldloc 13
 	stloc.1
-	brfalse L_1061194
+	brfalse L_10611a4
 // --- basic block ---
-// 0x0106118c: 0x106118c: j	 0x1061198 addiu a1, zero, 1
+// 0x0106119c: 0x106119c: j	 0x10611a8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-	br L_1061198
+	br L_10611a8
 // --- basic block ---
-L_1061194:
-// 0x01061194: 0x1061194: addu  a1, zero, zero
+L_10611a4:
+// 0x010611a4: 0x10611a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_1061198:
-// 0x01061198: 0x1061198: jal   0x1004c38 sll   zero, zero, 0
+L_10611a8:
+// 0x010611a8: 0x10611a8: jal   0x1004c48 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_route_get_restrictions_1004c38(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_restrictions_1004c48(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010611a0: 0x10611a0: sw    v0, 48(sp)
+// 0x010611b0: 0x10611b0: sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2533,17 +2533,17 @@ L_1061198:
 	add
 	ldloc 5
 	stelem.i4
-L_10611a4:
-// 0x010611a4: 0x10611a4: addu  s8, zero, zero
+L_10611b4:
+// 0x010611b4: 0x10611b4: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010611a8: 0x10611a8: j	 0x10612d8 addu  s7, zero, zero
+// 0x010611b8: 0x10611b8: j	 0x10612e8 addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_10612d8
+	br L_10612e8
 // --- basic block ---
-L_10611b0:
-// 0x010611b0: 0x10611b0: lw    v1, 12(s3)
+L_10611c0:
+// 0x010611c0: 0x10611c0: lw    v1, 12(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -2552,20 +2552,20 @@ L_10611b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010611b4: 0x10611b4: sll   v0, s2, 2
+// 0x010611c4: 0x10611c4: sll   v0, s2, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010611b8: 0x10611b8: addu  v0, v1, v0
+// 0x010611c8: 0x10611c8: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010611bc: 0x10611bc: addiu v1, zero, -1
+// 0x010611cc: 0x10611cc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010611c0: 0x10611c0: sw    v1, 24(sp)
+// 0x010611d0: 0x10611d0: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2574,14 +2574,14 @@ L_10611b0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010611c4: 0x10611c4: lw    s6, 0(v0)
+// 0x010611d4: 0x10611d4: lw    s6, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010611c8: 0x10611c8: lw    v0, 16(s3)
+// 0x010611d8: 0x10611d8: lw    v0, 16(s3)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -2590,29 +2590,29 @@ L_10611b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010611cc: 0x10611cc: sll   s2, s2, 1
+// 0x010611dc: 0x10611dc: sll   s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	shl
 	stloc 8
-// 0x010611d0: 0x10611d0: addu  v0, v0, s2
+// 0x010611e0: 0x10611e0: addu  v0, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x010611d4: 0x10611d4: lui   v1, 0x80000000
+// 0x010611e4: 0x10611e4: lui   v1, 0x80000000
 	ldc.i4 2147483648
 	stloc 7
-// 0x010611d8: 0x10611d8: lhu   v0, 0(v0)
+// 0x010611e8: 0x10611e8: lhu   v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010611dc: 0x10611dc: and   s2, s6, v1
+// 0x010611ec: 0x10611ec: and   s2, s6, v1
 	ldloc 9
 	ldloc 7
 	and
 	stloc 8
-// 0x010611e0: 0x10611e0: beq   s2, zero, 0x10611f4 sw    v0, 52(sp)
+// 0x010611f0: 0x10611f0: beq   s2, zero, 0x1061204 sw    v0, 52(sp)
 	ldloc 8
 	ldloc 6
 	ldloc.0
@@ -2622,58 +2622,58 @@ L_10611b0:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_10611f4
+	brfalse L_1061204
 // --- basic block ---
-// 0x010611e8: 0x10611e8: lui   v0, 0x7fff0000
+// 0x010611f8: 0x10611f8: lui   v0, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 5
-// 0x010611ec: 0x10611ec: ori   v0, v0, 65535
+// 0x010611fc: 0x10611fc: ori   v0, v0, 65535
 	ldloc 5
 	ldc.i4 65535
 	or
 	stloc 5
-// 0x010611f0: 0x10611f0: and   s6, s6, v0
+// 0x01061200: 0x1061200: and   s6, s6, v0
 	ldloc 9
 	ldloc 5
 	and
 	stloc 9
-L_10611f4:
-// 0x010611f4: 0x10611f4: bne   s6, s1, 0x1061214 addu  a0, s1, zero
+L_1061204:
+// 0x01061204: 0x1061204: bne   s6, s1, 0x1061224 addu  a0, s1, zero
 	ldloc 9
 	ldloc 13
 	ldloc 13
 	stloc.1
-	bne.un L_1061214
+	bne.un L_1061224
 // --- basic block ---
-// 0x010611fc: 0x10611fc: jal   0x1004a70 addiu a1, zero, 1
+// 0x0106120c: 0x106120c: jal   0x1004a80 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061204: 0x1061204: xori  v0, v0, 3
+// 0x01061214: 0x1061214: xori  v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	xor
 	stloc 5
-// 0x01061208: 0x1061208: sltiu v0, v0, 1
+// 0x01061218: 0x1061218: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x0106120c: 0x106120c: j	 0x10612d0 addu  s8, s8, v0
+// 0x0106121c: 0x106121c: j	 0x10612e0 addu  s8, s8, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 12
-	br L_10612d0
+	br L_10612e0
 // --- basic block ---
-L_1061214:
-// 0x01061214: 0x1061214: lw    v1, 124(sp)
+L_1061224:
+// 0x01061224: 0x1061224: lw    v1, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2682,21 +2682,21 @@ L_1061214:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061218: 0x1061218: sll   zero, zero, 0
-// 0x0106121c: 0x106121c: beq   v1, zero, 0x1061270 sll   zero, zero, 0
+// 0x01061228: 0x1061228: sll   zero, zero, 0
+// 0x0106122c: 0x106122c: beq   v1, zero, 0x1061280 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1061270
+	brfalse L_1061280
 // --- basic block ---
-// 0x01061224: 0x1061224: bne   s2, zero, 0x106124c sll   zero, zero, 0
+// 0x01061234: 0x1061234: bne   s2, zero, 0x106125c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_106124c
+	brtrue L_106125c
 // --- basic block ---
-// 0x0106122c: 0x106122c: addiu a1, sp, 24
+// 0x0106123c: 0x106123c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01061230: 0x1061230: jal   0x1003b2c addu  a0, s6, zero
+// 0x01061240: 0x1061240: jal   0x1003b2c addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -2704,33 +2704,33 @@ L_1061214:
 	call int32 Cibyl2::roadmap_line_to_point_1003b2c(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01061238: 0x1061238: addu  a0, s6, zero
+// 0x01061248: 0x1061248: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x0106123c: 0x106123c: jal   0x1004a70 addiu a1, zero, 1
+// 0x0106124c: 0x106124c: jal   0x1004a80 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061244: 0x1061244: j	 0x1061268 andi  v0, v0, 1
+// 0x01061254: 0x1061254: j	 0x1061278 andi  v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	and
 	stloc 5
-	br L_1061268
+	br L_1061278
 // --- basic block ---
-L_106124c:
-// 0x0106124c: 0x106124c: addiu a1, sp, 24
+L_106125c:
+// 0x0106125c: 0x106125c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01061250: 0x1061250: jal   0x1003b08 addu  a0, s6, zero
+// 0x01061260: 0x1061260: jal   0x1003b08 addu  a0, s6, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -2738,67 +2738,67 @@ L_106124c:
 	call int32 Cibyl2::roadmap_line_from_point_1003b08(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01061258: 0x1061258: addu  a0, s6, zero
+// 0x01061268: 0x1061268: addu  a0, s6, zero
 	ldloc 9
 	stloc.1
-// 0x0106125c: 0x106125c: jal   0x1004a70 addiu a1, zero, 1
+// 0x0106126c: 0x106126c: jal   0x1004a80 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061264: 0x1061264: andi  v0, v0, 2
+// 0x01061274: 0x1061274: andi  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	and
 	stloc 5
-L_1061268:
-// 0x01061268: 0x1061268: beq   v0, zero, 0x10612d0 sll   zero, zero, 0
+L_1061278:
+// 0x01061278: 0x1061278: beq   v0, zero, 0x10612e0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10612d0
+	brfalse L_10612e0
 // --- basic block ---
-L_1061270:
-// 0x01061270: 0x1061270: beq   s5, zero, 0x10612a4 slti  v0, s8, 8
+L_1061280:
+// 0x01061280: 0x1061280: beq   s5, zero, 0x10612b4 slti  v0, s8, 8
 	ldloc 16
 	ldloc 12
 	ldc.i4.8
 	clt
 	stloc 5
-	brfalse L_10612a4
+	brfalse L_10612b4
 // --- basic block ---
-// 0x01061278: 0x1061278: beq   v0, zero, 0x10612a4 lui   v1, 0x70000
+// 0x01061288: 0x1061288: beq   v0, zero, 0x10612b4 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 7
-	brfalse L_10612a4
+	brfalse L_10612b4
 // --- basic block ---
-// 0x01061280: 0x1061280: addiu v1, v1, 12420
+// 0x01061290: 0x1061290: addiu v1, v1, 12884
 	ldloc 7
-	ldc.i4 12420
+	ldc.i4 12884
 	add
 	stloc 7
-// 0x01061284: 0x1061284: sll   v0, s8, 2
+// 0x01061294: 0x1061294: sll   v0, s8, 2
 	ldloc 12
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01061288: 0x1061288: addu  v0, v0, v1
+// 0x01061298: 0x1061298: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0106128c: 0x106128c: lw    v0, 0(v0)
+// 0x0106129c: 0x106129c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01061290: 0x1061290: lw    v1, 48(sp)
+// 0x010612a0: 0x10612a0: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2807,18 +2807,18 @@ L_1061270:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061294: 0x1061294: sll   zero, zero, 0
-// 0x01061298: 0x1061298: and   v0, v1, v0
+// 0x010612a4: 0x10612a4: sll   zero, zero, 0
+// 0x010612a8: 0x10612a8: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x0106129c: 0x106129c: bne   v0, zero, 0x10612cc sll   zero, zero, 0
+// 0x010612ac: 0x10612ac: bne   v0, zero, 0x10612dc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10612cc
+	brtrue L_10612dc
 // --- basic block ---
-L_10612a4:
-// 0x010612a4: 0x10612a4: lw    v1, 112(sp)
+L_10612b4:
+// 0x010612b4: 0x10612b4: lw    v1, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2827,17 +2827,17 @@ L_10612a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010612a8: 0x10612a8: sll   v0, s7, 4
+// 0x010612b8: 0x10612b8: sll   v0, s7, 4
 	ldloc 11
 	ldc.i4.4
 	shl
 	stloc 5
-// 0x010612ac: 0x10612ac: addu  v0, v1, v0
+// 0x010612bc: 0x10612bc: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x010612b0: 0x10612b0: lw    v1, 24(sp)
+// 0x010612c0: 0x10612c0: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2846,12 +2846,12 @@ L_10612a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010612b4: 0x10612b4: sltu  s2, zero, s2
+// 0x010612c4: 0x10612c4: sltu  s2, zero, s2
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
-// 0x010612b8: 0x10612b8: sw    v1, 12(v0)
+// 0x010612c8: 0x10612c8: sw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2860,7 +2860,7 @@ L_10612a4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010612bc: 0x10612bc: sw    s6, 4(v0)
+// 0x010612cc: 0x10612cc: sw    s6, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2869,32 +2869,32 @@ L_10612a4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010612c0: 0x10612c0: sb    s2, 8(v0)
+// 0x010612d0: 0x10612d0: sb    s2, 8(v0)
 	ldloc 5
 	ldc.i4.8
 	add
 	ldloc 8
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010612c4: 0x10612c4: sw    s0, 0(v0)
+// 0x010612d4: 0x10612d4: sw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x010612c8: 0x10612c8: addiu s7, s7, 1
+// 0x010612d8: 0x10612d8: addiu s7, s7, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_10612cc:
-// 0x010612cc: 0x10612cc: addiu s8, s8, 1
+L_10612dc:
+// 0x010612dc: 0x10612dc: addiu s8, s8, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-L_10612d0:
-// 0x010612d0: 0x10612d0: lw    s2, 52(sp)
+L_10612e0:
+// 0x010612e0: 0x10612e0: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2903,30 +2903,30 @@ L_10612d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010612d4: 0x10612d4: sll   zero, zero, 0
-L_10612d8:
-// 0x010612d8: 0x10612d8: beq   s2, zero, 0x10612e8 slt   v0, s7, s4
+// 0x010612e4: 0x10612e4: sll   zero, zero, 0
+L_10612e8:
+// 0x010612e8: 0x10612e8: beq   s2, zero, 0x10612f8 slt   v0, s7, s4
 	ldloc 8
 	ldloc 11
 	ldloc 15
 	clt
 	stloc 5
-	brfalse L_10612e8
+	brfalse L_10612f8
 // --- basic block ---
-// 0x010612e0: 0x10612e0: bne   v0, zero, 0x10611b0 addiu s2, s2, -1
+// 0x010612f0: 0x10612f0: bne   v0, zero, 0x10611c0 addiu s2, s2, -1
 	ldloc 5
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-	brtrue L_10611b0
+	brtrue L_10611c0
 // --- basic block ---
-L_10612e8:
-// 0x010612e8: 0x10612e8: lw    ra, 92(sp)
-// 0x010612ec: 0x10612ec: addu  v0, s7, zero
+L_10612f8:
+// 0x010612f8: 0x10612f8: lw    ra, 92(sp)
+// 0x010612fc: 0x10612fc: addu  v0, s7, zero
 	ldloc 11
 	stloc 5
-// 0x010612f0: 0x10612f0: lw    s8, 88(sp)
+// 0x01061300: 0x1061300: lw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2935,7 +2935,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010612f4: 0x10612f4: lw    s7, 84(sp)
+// 0x01061304: 0x1061304: lw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2944,7 +2944,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010612f8: 0x10612f8: lw    s6, 80(sp)
+// 0x01061308: 0x1061308: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2953,7 +2953,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010612fc: 0x10612fc: lw    s5, 76(sp)
+// 0x0106130c: 0x106130c: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2962,7 +2962,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01061300: 0x1061300: lw    s4, 72(sp)
+// 0x01061310: 0x1061310: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2971,7 +2971,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01061304: 0x1061304: lw    s3, 68(sp)
+// 0x01061314: 0x1061314: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2980,7 +2980,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01061308: 0x1061308: lw    s2, 64(sp)
+// 0x01061318: 0x1061318: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2989,7 +2989,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106130c: 0x106130c: lw    s1, 60(sp)
+// 0x0106131c: 0x106131c: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2998,7 +2998,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01061310: 0x1061310: lw    s0, 56(sp)
+// 0x01061320: 0x1061320: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3007,7 +3007,7 @@ L_10612e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01061314: 0x1061314: jr    ra addiu sp, sp, 96
+// 0x01061324: 0x1061324: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -3019,7 +3019,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_cost_use_traffic_106131c()
+.method public static int32 navigate_cost_use_traffic_106132c()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -3033,7 +3033,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106131c: 0x106131c: jr    ra addiu v0, zero, 1
+// 0x0106132c: 0x106132c: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc.0
 	br __CIBYL_function_return
@@ -3041,7 +3041,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_cost_reset_1061324()
+.method public static int32 navigate_cost_reset_1061334()
 {
 .maxstack 5
 .locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3061,26 +3061,26 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061324: 0x1061324: addu  v1, zero, zero
+// 0x01061334: 0x1061334: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01061328: 0x1061328: cibyl_sysc_arg 0x3
+// 0x01061338: 0x1061338: cibyl_sysc_arg 0x3
 	ldloc.1
-// 0x0106132c: 0x106132c: cibyl_sysc 0x20d5
+// 0x0106133c: 0x106133c: cibyl_sysc 0x20d5
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc.0
-// 0x01061330: 0x1061330: addu  v1, v0, zero
+// 0x01061340: 0x1061340: addu  v1, v0, zero
 	ldloc.0
 	stloc.1
-// 0x01061334: 0x1061334: lui   v0, 0x70000
+// 0x01061344: 0x1061344: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc.0
-// 0x01061338: 0x1061338: jr    ra sw    v1, 12756(v0)
+// 0x01061348: 0x1061348: jr    ra sw    v1, 13220(v0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3189
+	ldc.i4 3305
 	add
 	ldloc.1
 	stelem.i4
@@ -3091,7 +3091,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_cost_isPalestinianOptionEnabled_1061340(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_isPalestinianOptionEnabled_1061350(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3126,24 +3126,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061340: 0x1061340: lui   a0, 0x0
+// 0x01061350: 0x1061350: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061344: 0x1061344: lui   a1, 0x0
+// 0x01061354: 0x1061354: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061348: 0x1061348: addiu sp, sp, -24
+// 0x01061358: 0x1061358: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106134c: 0x106134c: addiu a0, a0, 14876
+// 0x0106135c: 0x106135c: addiu a0, a0, 14876
 	ldloc.1
 	ldc.i4 14876
 	add
 	stloc.1
-// 0x01061350: 0x1061350: sw    ra, 20(sp)
-// 0x01061354: 0x1061354: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01061360: 0x1061360: sw    ra, 20(sp)
+// 0x01061364: 0x1061364: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3153,14 +3153,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0106135c: 0x106135c: lw    ra, 20(sp)
-// 0x01061360: 0x1061360: sll   zero, zero, 0
-// 0x01061364: 0x1061364: jr    ra addiu sp, sp, 24
+// 0x0106136c: 0x106136c: lw    ra, 20(sp)
+// 0x01061370: 0x1061370: sll   zero, zero, 0
+// 0x01061374: 0x1061374: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3172,7 +3172,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_cost_type_106136c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_type_106137c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3207,26 +3207,26 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106136c: 0x106136c: lui   a0, 0x0
+// 0x0106137c: 0x106137c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061370: 0x1061370: lui   a1, 0x10000
+// 0x01061380: 0x1061380: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01061374: 0x1061374: addiu sp, sp, -24
+// 0x01061384: 0x1061384: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01061378: 0x1061378: addiu a0, a0, 14748
+// 0x01061388: 0x1061388: addiu a0, a0, 14748
 	ldloc.1
 	ldc.i4 14748
 	add
 	stloc.1
-// 0x0106137c: 0x106137c: sw    ra, 20(sp)
-// 0x01061380: 0x1061380: jal   0x100e7f4 addiu a1, a1, 12800
+// 0x0106138c: 0x106138c: sw    ra, 20(sp)
+// 0x01061390: 0x1061390: jal   0x100e804 addiu a1, a1, 12796
 	ldloc.2
-	ldc.i4 12800
+	ldc.i4 12796
 	add
 	stloc.2
 	ldloc.0
@@ -3234,26 +3234,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061388: 0x1061388: lw    ra, 20(sp)
-// 0x0106138c: 0x106138c: sltu  v0, zero, v0
+// 0x01061398: 0x1061398: lw    ra, 20(sp)
+// 0x0106139c: 0x106139c: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01061390: 0x1061390: addiu v1, zero, 2
+// 0x010613a0: 0x10613a0: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01061394: 0x1061394: subu  v0, v1, v0
+// 0x010613a4: 0x10613a4: subu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 5
-// 0x01061398: 0x1061398: jr    ra addiu sp, sp, 24
+// 0x010613a8: 0x10613a8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3265,7 +3265,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_cost_get_10613a0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_get_10613b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -3300,53 +3300,53 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010613a0: 0x10613a0: addiu sp, sp, -24
+// 0x010613b0: 0x10613b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010613a4: 0x10613a4: sw    ra, 20(sp)
-// 0x010613a8: 0x10613a8: jal   0x106136c sll   zero, zero, 0
+// 0x010613b4: 0x10613b4: sw    ra, 20(sp)
+// 0x010613b8: 0x10613b8: jal   0x106137c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_type_106136c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_type_106137c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010613b0: 0x10613b0: addiu v1, zero, 1
+// 0x010613c0: 0x10613c0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010613b4: 0x10613b4: beq   v0, v1, 0x10613c4 lui   v0, 0x1060000
+// 0x010613c4: 0x10613c4: beq   v0, v1, 0x10613d4 lui   v0, 0x1060000
 	ldloc 5
 	ldloc 6
 	ldc.i4 17170432
 	stloc 5
-	beq  L_10613c4
+	beq  L_10613d4
 // --- basic block ---
-// 0x010613bc: 0x10613bc: j	 0x10613cc addiu v0, v0, 7500
+// 0x010613cc: 0x10613cc: j	 0x10613dc addiu v0, v0, 7516
 	ldloc 5
-	ldc.i4 7500
+	ldc.i4 7516
 	add
 	stloc 5
-	br L_10613cc
+	br L_10613dc
 // --- basic block ---
-L_10613c4:
-// 0x010613c4: 0x10613c4: lui   v0, 0x1060000
+L_10613d4:
+// 0x010613d4: 0x10613d4: lui   v0, 0x1060000
 	ldc.i4 17170432
 	stloc 5
-// 0x010613c8: 0x10613c8: addiu v0, v0, 6588
+// 0x010613d8: 0x10613d8: addiu v0, v0, 6604
 	ldloc 5
-	ldc.i4 6588
+	ldc.i4 6604
 	add
 	stloc 5
-L_10613cc:
-// 0x010613cc: 0x10613cc: lw    ra, 20(sp)
-// 0x010613d0: 0x10613d0: sll   zero, zero, 0
-// 0x010613d4: 0x10613d4: jr    ra addiu sp, sp, 24
+L_10613dc:
+// 0x010613dc: 0x10613dc: lw    ra, 20(sp)
+// 0x010613e0: 0x10613e0: sll   zero, zero, 0
+// 0x010613e4: 0x10613e4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3358,7 +3358,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_cost_allow_unknowns_10613dc(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_allow_unknowns_10613ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -3393,26 +3393,26 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010613dc: 0x10613dc: lui   a0, 0x0
+// 0x010613ec: 0x10613ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010613e0: 0x10613e0: lui   a1, 0x20000
+// 0x010613f0: 0x10613f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010613e4: 0x10613e4: addiu sp, sp, -24
+// 0x010613f4: 0x10613f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010613e8: 0x10613e8: addiu a0, a0, 14844
+// 0x010613f8: 0x10613f8: addiu a0, a0, 14844
 	ldloc.1
 	ldc.i4 14844
 	add
 	stloc.1
-// 0x010613ec: 0x10613ec: sw    ra, 20(sp)
-// 0x010613f0: 0x10613f0: jal   0x100e7f4 addiu a1, a1, 9464
+// 0x010613fc: 0x10613fc: sw    ra, 20(sp)
+// 0x01061400: 0x1061400: jal   0x100e804 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -3420,18 +3420,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010613f8: 0x10613f8: lw    ra, 20(sp)
-// 0x010613fc: 0x10613fc: sltiu v0, v0, 1
+// 0x01061408: 0x1061408: lw    ra, 20(sp)
+// 0x0106140c: 0x106140c: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01061400: 0x1061400: jr    ra addiu sp, sp, 24
+// 0x01061410: 0x1061410: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3443,7 +3443,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_cost_avoid_palestinian_roads_1061408(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_avoid_palestinian_roads_1061418(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3478,24 +3478,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061408: 0x1061408: lui   a0, 0x0
+// 0x01061418: 0x1061418: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106140c: 0x106140c: lui   a1, 0x0
+// 0x0106141c: 0x106141c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061410: 0x1061410: addiu sp, sp, -24
+// 0x01061420: 0x1061420: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01061414: 0x1061414: addiu a0, a0, 14860
+// 0x01061424: 0x1061424: addiu a0, a0, 14860
 	ldloc.1
 	ldc.i4 14860
 	add
 	stloc.1
-// 0x01061418: 0x1061418: sw    ra, 20(sp)
-// 0x0106141c: 0x106141c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01061428: 0x1061428: sw    ra, 20(sp)
+// 0x0106142c: 0x106142c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3505,14 +3505,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01061424: 0x1061424: lw    ra, 20(sp)
-// 0x01061428: 0x1061428: sll   zero, zero, 0
-// 0x0106142c: 0x106142c: jr    ra addiu sp, sp, 24
+// 0x01061434: 0x1061434: lw    ra, 20(sp)
+// 0x01061438: 0x1061438: sll   zero, zero, 0
+// 0x0106143c: 0x106143c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3524,7 +3524,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_cost_avoid_trails_1061434(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_avoid_trails_1061444(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 s0,int32[] mem,int32 ra)
@@ -3562,12 +3562,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061434: 0x1061434: addiu sp, sp, -24
+// 0x01061444: 0x1061444: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01061438: 0x1061438: sw    s0, 16(sp)
+// 0x01061448: 0x1061448: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3576,19 +3576,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106143c: 0x106143c: lui   a1, 0x10000
+// 0x0106144c: 0x106144c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01061440: 0x1061440: lui   s0, 0x0
+// 0x01061450: 0x1061450: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x01061444: 0x1061444: addiu a1, a1, 12808
+// 0x01061454: 0x1061454: addiu a1, a1, 12804
 	ldloc.2
-	ldc.i4 12808
+	ldc.i4 12804
 	add
 	stloc.2
-// 0x01061448: 0x1061448: sw    ra, 20(sp)
-// 0x0106144c: 0x106144c: jal   0x100e7f4 addiu a0, s0, 14828
+// 0x01061458: 0x1061458: sw    ra, 20(sp)
+// 0x0106145c: 0x106145c: jal   0x100e804 addiu a0, s0, 14828
 	ldloc 7
 	ldc.i4 14828
 	add
@@ -3598,28 +3598,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01061454: 0x1061454: bne   v0, zero, 0x1061474 addiu v1, zero, 1
+// 0x01061464: 0x1061464: bne   v0, zero, 0x1061484 addiu v1, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brtrue L_1061474
+	brtrue L_1061484
 // --- basic block ---
-// 0x0106145c: 0x106145c: lui   a1, 0x10000
+// 0x0106146c: 0x106146c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01061460: 0x1061460: addiu a0, s0, 14828
+// 0x01061470: 0x1061470: addiu a0, s0, 14828
 	ldloc 7
 	ldc.i4 14828
 	add
 	stloc.1
-// 0x01061464: 0x1061464: jal   0x100e7f4 addiu a1, a1, 12816
+// 0x01061474: 0x1061474: jal   0x100e804 addiu a1, a1, 12812
 	ldloc.2
-	ldc.i4 12816
+	ldc.i4 12812
 	add
 	stloc.2
 	ldloc.0
@@ -3627,27 +3627,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0106146c: 0x106146c: sltiu v1, v0, 1
+// 0x0106147c: 0x106147c: sltiu v1, v0, 1
 	ldloc 6
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x01061470: 0x1061470: sll   v1, v1, 1
+// 0x01061480: 0x1061480: sll   v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	shl
 	stloc 5
-L_1061474:
-// 0x01061474: 0x1061474: lw    ra, 20(sp)
-// 0x01061478: 0x1061478: addu  v0, v1, zero
+L_1061484:
+// 0x01061484: 0x1061484: lw    ra, 20(sp)
+// 0x01061488: 0x1061488: addu  v0, v1, zero
 	ldloc 5
 	stloc 6
-// 0x0106147c: 0x106147c: lw    s0, 16(sp)
+// 0x0106148c: 0x106148c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -3656,7 +3656,7 @@ L_1061474:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061480: 0x1061480: jr    ra addiu sp, sp, 24
+// 0x01061490: 0x1061490: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3668,7 +3668,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_cost_prefer_unknown_directions_1061488(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_prefer_unknown_directions_1061498(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3703,24 +3703,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061488: 0x1061488: lui   a0, 0x0
+// 0x01061498: 0x1061498: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106148c: 0x106148c: lui   a1, 0x0
+// 0x0106149c: 0x106149c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061490: 0x1061490: addiu sp, sp, -24
+// 0x010614a0: 0x10614a0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01061494: 0x1061494: addiu a0, a0, 14812
+// 0x010614a4: 0x10614a4: addiu a0, a0, 14812
 	ldloc.1
 	ldc.i4 14812
 	add
 	stloc.1
-// 0x01061498: 0x1061498: sw    ra, 20(sp)
-// 0x0106149c: 0x106149c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010614a8: 0x10614a8: sw    ra, 20(sp)
+// 0x010614ac: 0x10614ac: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3730,14 +3730,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010614a4: 0x10614a4: lw    ra, 20(sp)
-// 0x010614a8: 0x10614a8: sll   zero, zero, 0
-// 0x010614ac: 0x10614ac: jr    ra addiu sp, sp, 24
+// 0x010614b4: 0x10614b4: lw    ra, 20(sp)
+// 0x010614b8: 0x10614b8: sll   zero, zero, 0
+// 0x010614bc: 0x10614bc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3749,7 +3749,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_cost_avoid_toll_roads_10614b4(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_avoid_toll_roads_10614c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3784,24 +3784,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010614b4: 0x10614b4: lui   a0, 0x0
+// 0x010614c4: 0x10614c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010614b8: 0x10614b8: lui   a1, 0x0
+// 0x010614c8: 0x10614c8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010614bc: 0x10614bc: addiu sp, sp, -24
+// 0x010614cc: 0x10614cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010614c0: 0x10614c0: addiu a0, a0, 14796
+// 0x010614d0: 0x10614d0: addiu a0, a0, 14796
 	ldloc.1
 	ldc.i4 14796
 	add
 	stloc.1
-// 0x010614c4: 0x10614c4: sw    ra, 20(sp)
-// 0x010614c8: 0x10614c8: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010614d4: 0x10614d4: sw    ra, 20(sp)
+// 0x010614d8: 0x10614d8: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3811,14 +3811,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010614d0: 0x10614d0: lw    ra, 20(sp)
-// 0x010614d4: 0x10614d4: sll   zero, zero, 0
-// 0x010614d8: 0x10614d8: jr    ra addiu sp, sp, 24
+// 0x010614e0: 0x10614e0: lw    ra, 20(sp)
+// 0x010614e4: 0x10614e4: sll   zero, zero, 0
+// 0x010614e8: 0x10614e8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3830,7 +3830,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_cost_avoid_primaries_10614e0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_avoid_primaries_10614f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3865,24 +3865,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010614e0: 0x10614e0: lui   a0, 0x0
+// 0x010614f0: 0x10614f0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010614e4: 0x10614e4: lui   a1, 0x0
+// 0x010614f4: 0x10614f4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010614e8: 0x10614e8: addiu sp, sp, -24
+// 0x010614f8: 0x10614f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010614ec: 0x10614ec: addiu a0, a0, 14780
+// 0x010614fc: 0x10614fc: addiu a0, a0, 14780
 	ldloc.1
 	ldc.i4 14780
 	add
 	stloc.1
-// 0x010614f0: 0x10614f0: sw    ra, 20(sp)
-// 0x010614f4: 0x10614f4: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x01061500: 0x1061500: sw    ra, 20(sp)
+// 0x01061504: 0x1061504: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3892,14 +3892,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010614fc: 0x10614fc: lw    ra, 20(sp)
-// 0x01061500: 0x1061500: sll   zero, zero, 0
-// 0x01061504: 0x1061504: jr    ra addiu sp, sp, 24
+// 0x0106150c: 0x106150c: lw    ra, 20(sp)
+// 0x01061510: 0x1061510: sll   zero, zero, 0
+// 0x01061514: 0x1061514: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3911,7 +3911,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_cost_prefer_same_street_106150c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_prefer_same_street_106151c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -3946,24 +3946,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106150c: 0x106150c: lui   a0, 0x0
+// 0x0106151c: 0x106151c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061510: 0x1061510: lui   a1, 0x0
+// 0x01061520: 0x1061520: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061514: 0x1061514: addiu sp, sp, -24
+// 0x01061524: 0x1061524: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01061518: 0x1061518: addiu a0, a0, 14764
+// 0x01061528: 0x1061528: addiu a0, a0, 14764
 	ldloc.1
 	ldc.i4 14764
 	add
 	stloc.1
-// 0x0106151c: 0x106151c: sw    ra, 20(sp)
-// 0x01061520: 0x1061520: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x0106152c: 0x106152c: sw    ra, 20(sp)
+// 0x01061530: 0x1061530: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3973,14 +3973,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01061528: 0x1061528: lw    ra, 20(sp)
-// 0x0106152c: 0x106152c: sll   zero, zero, 0
-// 0x01061530: 0x1061530: jr    ra addiu sp, sp, 24
+// 0x01061538: 0x1061538: lw    ra, 20(sp)
+// 0x0106153c: 0x106153c: sll   zero, zero, 0
+// 0x01061540: 0x1061540: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -3992,7 +3992,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 navigate_cost_initialize_1061538(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_initialize_1061548(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 v1,int32 s1,int32 s3,int32 ra)
@@ -4039,12 +4039,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061538: 0x1061538: addiu sp, sp, -56
+// 0x01061548: 0x1061548: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0106153c: 0x106153c: sw    s1, 40(sp)
+// 0x0106154c: 0x106154c: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4053,43 +4053,43 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01061540: 0x1061540: lui   a1, 0x0
+// 0x01061550: 0x1061550: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061544: 0x1061544: lui   s1, 0x20000
+// 0x01061554: 0x1061554: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 10
-// 0x01061548: 0x1061548: lui   a3, 0x10000
+// 0x01061558: 0x1061558: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106154c: 0x106154c: lui   v0, 0x10000
+// 0x0106155c: 0x106155c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01061550: 0x1061550: addiu a0, s1, -26888
+// 0x01061560: 0x1061560: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01061554: 0x1061554: addiu a1, a1, 14748
+// 0x01061564: 0x1061564: addiu a1, a1, 14748
 	ldloc.2
 	ldc.i4 14748
 	add
 	stloc.2
-// 0x01061558: 0x1061558: addiu a3, a3, 12800
+// 0x01061568: 0x1061568: addiu a3, a3, 12796
 	ldloc 4
-	ldc.i4 12800
+	ldc.i4 12796
 	add
 	stloc 4
-// 0x0106155c: 0x106155c: addu  a2, zero, zero
+// 0x0106156c: 0x106156c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01061560: 0x1061560: addiu v0, v0, 12828
+// 0x01061570: 0x1061570: addiu v0, v0, 12824
 	ldloc 6
-	ldc.i4 12828
+	ldc.i4 12824
 	add
 	stloc 6
-// 0x01061564: 0x1061564: sw    ra, 52(sp)
-// 0x01061568: 0x1061568: sw    s3, 48(sp)
+// 0x01061574: 0x1061574: sw    ra, 52(sp)
+// 0x01061578: 0x1061578: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4098,7 +4098,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0106156c: 0x106156c: sw    s2, 44(sp)
+// 0x0106157c: 0x106157c: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4107,7 +4107,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01061570: 0x1061570: sw    s0, 36(sp)
+// 0x01061580: 0x1061580: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4116,10 +4116,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061574: 0x1061574: lui   s2, 0x20000
+// 0x01061584: 0x1061584: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01061578: 0x1061578: sw    v0, 16(sp)
+// 0x01061588: 0x1061588: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4128,7 +4128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106157c: 0x106157c: sw    zero, 20(sp)
+// 0x0106158c: 0x106158c: sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4137,7 +4137,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01061580: 0x1061580: jal   0x100edf8 lui   s0, 0x0
+// 0x01061590: 0x1061590: jal   0x100ee08 lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
 	ldloc.0
@@ -4145,38 +4145,38 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01061588: 0x1061588: lui   a1, 0x0
+// 0x01061598: 0x1061598: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0106158c: 0x106158c: addiu s0, s0, 20820
+// 0x0106159c: 0x106159c: addiu s0, s0, 20820
 	ldloc 7
 	ldc.i4 20820
 	add
 	stloc 7
-// 0x01061590: 0x1061590: addiu a0, s1, -26888
+// 0x010615a0: 0x10615a0: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01061594: 0x1061594: addiu a3, s2, 9464
+// 0x010615a4: 0x10615a4: addiu a3, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01061598: 0x1061598: addiu a1, a1, 14780
+// 0x010615a8: 0x10615a8: addiu a1, a1, 14780
 	ldloc.2
 	ldc.i4 14780
 	add
 	stloc.2
-// 0x0106159c: 0x106159c: addu  a2, zero, zero
+// 0x010615ac: 0x10615ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010615a0: 0x10615a0: sw    s0, 16(sp)
+// 0x010615b0: 0x10615b0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4185,7 +4185,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010615a4: 0x10615a4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010615b4: 0x10615b4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4199,33 +4199,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010615ac: 0x10615ac: lui   a1, 0x0
+// 0x010615bc: 0x10615bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010615b0: 0x10615b0: addiu a0, s1, -26888
+// 0x010615c0: 0x10615c0: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010615b4: 0x10615b4: addiu a3, s2, 9464
+// 0x010615c4: 0x10615c4: addiu a3, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010615b8: 0x10615b8: addiu a1, a1, 14796
+// 0x010615c8: 0x10615c8: addiu a1, a1, 14796
 	ldloc.2
 	ldc.i4 14796
 	add
 	stloc.2
-// 0x010615bc: 0x10615bc: addu  a2, zero, zero
+// 0x010615cc: 0x10615cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010615c0: 0x10615c0: sw    s0, 16(sp)
+// 0x010615d0: 0x10615d0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4234,7 +4234,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010615c4: 0x10615c4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010615d4: 0x10615d4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4248,36 +4248,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010615cc: 0x10615cc: lui   a1, 0x0
+// 0x010615dc: 0x10615dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010615d0: 0x10615d0: addiu a0, s1, -26888
+// 0x010615e0: 0x10615e0: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010615d4: 0x10615d4: addiu a3, s2, 9464
+// 0x010615e4: 0x10615e4: addiu a3, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010615d8: 0x10615d8: addiu a1, a1, 14812
+// 0x010615e8: 0x10615e8: addiu a1, a1, 14812
 	ldloc.2
 	ldc.i4 14812
 	add
 	stloc.2
-// 0x010615dc: 0x10615dc: addu  a2, zero, zero
+// 0x010615ec: 0x10615ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010615e0: 0x10615e0: lui   s3, 0x10000
+// 0x010615f0: 0x10615f0: lui   s3, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x010615e4: 0x10615e4: sw    s0, 16(sp)
+// 0x010615f4: 0x10615f4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4286,7 +4286,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010615e8: 0x10615e8: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010615f8: 0x10615f8: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4300,33 +4300,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010615f0: 0x10615f0: lui   a1, 0x0
+// 0x01061600: 0x1061600: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010615f4: 0x10615f4: addiu a0, s3, 12560
+// 0x01061604: 0x1061604: addiu a0, s3, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010615f8: 0x10615f8: addiu a3, s2, 9464
+// 0x01061608: 0x1061608: addiu a3, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x010615fc: 0x10615fc: addiu a1, a1, 14764
+// 0x0106160c: 0x106160c: addiu a1, a1, 14764
 	ldloc.2
 	ldc.i4 14764
 	add
 	stloc.2
-// 0x01061600: 0x1061600: addu  a2, zero, zero
+// 0x01061610: 0x1061610: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01061604: 0x1061604: sw    s0, 16(sp)
+// 0x01061614: 0x1061614: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4335,7 +4335,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061608: 0x1061608: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01061618: 0x1061618: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4349,20 +4349,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01061610: 0x1061610: lui   v0, 0x10000
+// 0x01061620: 0x1061620: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01061614: 0x1061614: addiu v0, v0, 12808
+// 0x01061624: 0x1061624: addiu v0, v0, 12804
 	ldloc 6
-	ldc.i4 12808
+	ldc.i4 12804
 	add
 	stloc 6
-// 0x01061618: 0x1061618: sw    v0, 16(sp)
+// 0x01061628: 0x1061628: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4371,39 +4371,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106161c: 0x106161c: lui   a1, 0x0
+// 0x0106162c: 0x106162c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061620: 0x1061620: lui   a3, 0x10000
+// 0x01061630: 0x1061630: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01061624: 0x1061624: lui   v0, 0x10000
+// 0x01061634: 0x1061634: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01061628: 0x1061628: addiu a0, s1, -26888
+// 0x01061638: 0x1061638: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x0106162c: 0x106162c: addiu a1, a1, 14828
+// 0x0106163c: 0x106163c: addiu a1, a1, 14828
 	ldloc.2
 	ldc.i4 14828
 	add
 	stloc.2
-// 0x01061630: 0x1061630: addiu a3, a3, 12816
+// 0x01061640: 0x1061640: addiu a3, a3, 12812
 	ldloc 4
-	ldc.i4 12816
+	ldc.i4 12812
 	add
 	stloc 4
-// 0x01061634: 0x1061634: addu  a2, zero, zero
+// 0x01061644: 0x1061644: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01061638: 0x1061638: addiu v0, v0, 12840
+// 0x01061648: 0x1061648: addiu v0, v0, 12836
 	ldloc 6
-	ldc.i4 12840
+	ldc.i4 12836
 	add
 	stloc 6
-// 0x0106163c: 0x106163c: sw    v0, 20(sp)
+// 0x0106164c: 0x106164c: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4412,7 +4412,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01061640: 0x1061640: jal   0x100edf8 sw    zero, 24(sp)
+// 0x01061650: 0x1061650: jal   0x100ee08 sw    zero, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4426,33 +4426,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01061648: 0x1061648: lui   a1, 0x0
+// 0x01061658: 0x1061658: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0106164c: 0x106164c: addiu a0, s3, 12560
+// 0x0106165c: 0x106165c: addiu a0, s3, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01061650: 0x1061650: addiu a3, s2, 9464
+// 0x01061660: 0x1061660: addiu a3, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01061654: 0x1061654: addiu a1, a1, 14892
+// 0x01061664: 0x1061664: addiu a1, a1, 14892
 	ldloc.2
 	ldc.i4 14892
 	add
 	stloc.2
-// 0x01061658: 0x1061658: addu  a2, zero, zero
+// 0x01061668: 0x1061668: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0106165c: 0x106165c: sw    s0, 16(sp)
+// 0x0106166c: 0x106166c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4461,7 +4461,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061660: 0x1061660: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01061670: 0x1061670: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4475,33 +4475,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01061668: 0x1061668: lui   a1, 0x0
+// 0x01061678: 0x1061678: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0106166c: 0x106166c: addiu a0, s3, 12560
+// 0x0106167c: 0x106167c: addiu a0, s3, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01061670: 0x1061670: addiu a3, s2, 9464
+// 0x01061680: 0x1061680: addiu a3, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 4
-// 0x01061674: 0x1061674: addiu a1, a1, 14876
+// 0x01061684: 0x1061684: addiu a1, a1, 14876
 	ldloc.2
 	ldc.i4 14876
 	add
 	stloc.2
-// 0x01061678: 0x1061678: addu  a2, zero, zero
+// 0x01061688: 0x1061688: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0106167c: 0x106167c: sw    s0, 16(sp)
+// 0x0106168c: 0x106168c: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4510,7 +4510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061680: 0x1061680: jal   0x100edf8 sw    zero, 20(sp)
+// 0x01061690: 0x1061690: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4524,36 +4524,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01061688: 0x1061688: lui   a1, 0x0
+// 0x01061698: 0x1061698: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0106168c: 0x106168c: addiu s2, s2, 9464
+// 0x0106169c: 0x106169c: addiu s2, s2, 9928
 	ldloc 8
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 8
-// 0x01061690: 0x1061690: addiu a0, s1, -26888
+// 0x010616a0: 0x10616a0: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x01061694: 0x1061694: addu  a3, s0, zero
+// 0x010616a4: 0x10616a4: addu  a3, s0, zero
 	ldloc 7
 	stloc 4
-// 0x01061698: 0x1061698: addiu a1, a1, 14844
+// 0x010616a8: 0x10616a8: addiu a1, a1, 14844
 	ldloc.2
 	ldc.i4 14844
 	add
 	stloc.2
-// 0x0106169c: 0x106169c: addu  a2, zero, zero
+// 0x010616ac: 0x10616ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010616a0: 0x10616a0: sw    s2, 16(sp)
+// 0x010616b0: 0x10616b0: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4562,7 +4562,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010616a4: 0x10616a4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010616b4: 0x10616b4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4576,31 +4576,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010616ac: 0x10616ac: lui   a1, 0x0
+// 0x010616bc: 0x10616bc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010616b0: 0x10616b0: addiu a0, s3, 12560
+// 0x010616c0: 0x10616c0: addiu a0, s3, 12556
 	ldloc 11
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x010616b4: 0x10616b4: addu  a3, s2, zero
+// 0x010616c4: 0x10616c4: addu  a3, s2, zero
 	ldloc 8
 	stloc 4
-// 0x010616b8: 0x10616b8: addiu a1, a1, 14908
+// 0x010616c8: 0x10616c8: addiu a1, a1, 14908
 	ldloc.2
 	ldc.i4 14908
 	add
 	stloc.2
-// 0x010616bc: 0x10616bc: addu  a2, zero, zero
+// 0x010616cc: 0x10616cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010616c0: 0x10616c0: sw    s0, 16(sp)
+// 0x010616d0: 0x10616d0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4609,7 +4609,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010616c4: 0x10616c4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010616d4: 0x10616d4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4623,31 +4623,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010616cc: 0x10616cc: lui   a1, 0x0
+// 0x010616dc: 0x10616dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010616d0: 0x10616d0: addiu a0, s1, -26888
+// 0x010616e0: 0x10616e0: addiu a0, s1, -26424
 	ldloc 10
-	ldc.i4 -26888
+	ldc.i4 -26424
 	add
 	stloc.1
-// 0x010616d4: 0x10616d4: addu  a3, s0, zero
+// 0x010616e4: 0x10616e4: addu  a3, s0, zero
 	ldloc 7
 	stloc 4
-// 0x010616d8: 0x10616d8: addiu a1, a1, 14860
+// 0x010616e8: 0x10616e8: addiu a1, a1, 14860
 	ldloc.2
 	ldc.i4 14860
 	add
 	stloc.2
-// 0x010616dc: 0x10616dc: addu  a2, zero, zero
+// 0x010616ec: 0x10616ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010616e0: 0x10616e0: sw    s2, 16(sp)
+// 0x010616f0: 0x10616f0: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4656,7 +4656,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010616e4: 0x10616e4: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010616f4: 0x10616f4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4670,20 +4670,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010616ec: 0x10616ec: lui   v0, 0x10000
+// 0x010616fc: 0x10616fc: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010616f0: 0x10616f0: addiu v0, v0, 12884
+// 0x01061700: 0x1061700: addiu v0, v0, 12880
 	ldloc 6
-	ldc.i4 12884
+	ldc.i4 12880
 	add
 	stloc 6
-// 0x010616f4: 0x10616f4: sw    v0, 16(sp)
+// 0x01061704: 0x1061704: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4692,37 +4692,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010616f8: 0x10616f8: lui   a0, 0x10000
+// 0x01061708: 0x1061708: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010616fc: 0x10616fc: lui   a1, 0x10000
+// 0x0106170c: 0x106170c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01061700: 0x1061700: lui   v0, 0x1060000
+// 0x01061710: 0x1061710: lui   v0, 0x1060000
 	ldc.i4 17170432
 	stloc 6
-// 0x01061704: 0x1061704: addiu v0, v0, 7948
+// 0x01061714: 0x1061714: addiu v0, v0, 7964
 	ldloc 6
-	ldc.i4 7948
+	ldc.i4 7964
 	add
 	stloc 6
-// 0x01061708: 0x1061708: addiu a0, a0, 12856
+// 0x01061718: 0x1061718: addiu a0, a0, 12852
 	ldloc.1
-	ldc.i4 12856
+	ldc.i4 12852
 	add
 	stloc.1
-// 0x0106170c: 0x106170c: addiu a1, a1, 12864
+// 0x0106171c: 0x106171c: addiu a1, a1, 12860
 	ldloc.2
-	ldc.i4 12864
+	ldc.i4 12860
 	add
 	stloc.2
-// 0x01061710: 0x1061710: addu  a2, zero, zero
+// 0x01061720: 0x1061720: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01061714: 0x1061714: addu  a3, zero, zero
+// 0x01061724: 0x1061724: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01061718: 0x1061718: jal   0x102ceb0 sw    v0, 20(sp)
+// 0x01061728: 0x1061728: jal   0x102cec0 sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4736,13 +4736,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_add_action_102ceb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl32::roadmap_start_add_action_102cec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01061720: 0x1061720: lw    ra, 52(sp)
-// 0x01061724: 0x1061724: lw    s3, 48(sp)
+// 0x01061730: 0x1061730: lw    ra, 52(sp)
+// 0x01061734: 0x1061734: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4751,7 +4751,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01061728: 0x1061728: lw    s2, 44(sp)
+// 0x01061738: 0x1061738: lw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4760,7 +4760,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106172c: 0x106172c: lw    s1, 40(sp)
+// 0x0106173c: 0x106173c: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4769,7 +4769,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01061730: 0x1061730: lw    s0, 36(sp)
+// 0x01061740: 0x1061740: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4778,7 +4778,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061734: 0x1061734: jr    ra addiu sp, sp, 56
+// 0x01061744: 0x1061744: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4790,7 +4790,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 save_changes_106173c(int32,int32,int32,int32,int32)
+.method public static int32 save_changes_106174c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4825,18 +4825,18 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106173c: 0x106173c: lui   a0, 0x20000
+// 0x0106174c: 0x106174c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01061740: 0x1061740: addiu sp, sp, -24
+// 0x01061750: 0x1061750: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01061744: 0x1061744: sw    ra, 20(sp)
-// 0x01061748: 0x1061748: jal   0x10947ac addiu a0, a0, -11180
+// 0x01061754: 0x1061754: sw    ra, 20(sp)
+// 0x01061758: 0x1061758: jal   0x1094dd0 addiu a0, a0, -10716
 	ldloc.1
-	ldc.i4 -11180
+	ldc.i4 -10716
 	add
 	stloc.1
 	ldloc.0
@@ -4844,20 +4844,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061750: 0x1061750: lui   a0, 0x0
+// 0x01061760: 0x1061760: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061754: 0x1061754: addiu a0, a0, 14748
+// 0x01061764: 0x1061764: addiu a0, a0, 14748
 	ldloc.1
 	ldc.i4 14748
 	add
 	stloc.1
-// 0x01061758: 0x1061758: jal   0x100e5c0 addu  a1, v0, zero
+// 0x01061768: 0x1061768: jal   0x100e5d0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4865,23 +4865,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061760: 0x1061760: lui   a0, 0x0
+// 0x01061770: 0x1061770: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061764: 0x1061764: lui   a1, 0x0
+// 0x01061774: 0x1061774: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061768: 0x1061768: addiu a0, a0, 14892
+// 0x01061778: 0x1061778: addiu a0, a0, 14892
 	ldloc.1
 	ldc.i4 14892
 	add
 	stloc.1
-// 0x0106176c: 0x106176c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x0106177c: 0x106177c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4891,20 +4891,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061774: 0x1061774: beq   v0, zero, 0x1061794 lui   a0, 0x10000
+// 0x01061784: 0x1061784: beq   v0, zero, 0x10617a4 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1061794
+	brfalse L_10617a4
 // --- basic block ---
-// 0x0106177c: 0x106177c: jal   0x10947ac addiu a0, a0, 12912
+// 0x0106178c: 0x106178c: jal   0x1094dd0 addiu a0, a0, 12908
 	ldloc.1
-	ldc.i4 12912
+	ldc.i4 12908
 	add
 	stloc.1
 	ldloc.0
@@ -4912,20 +4912,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061784: 0x1061784: lui   a0, 0x0
+// 0x01061794: 0x1061794: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061788: 0x1061788: addiu a0, a0, 14796
+// 0x01061798: 0x1061798: addiu a0, a0, 14796
 	ldloc.1
 	ldc.i4 14796
 	add
 	stloc.1
-// 0x0106178c: 0x106178c: jal   0x100e5c0 addu  a1, v0, zero
+// 0x0106179c: 0x106179c: jal   0x100e5d0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4933,24 +4933,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1061794:
-// 0x01061794: 0x1061794: lui   a0, 0x0
+L_10617a4:
+// 0x010617a4: 0x10617a4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061798: 0x1061798: lui   a1, 0x0
+// 0x010617a8: 0x10617a8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0106179c: 0x106179c: addiu a0, a0, 14908
+// 0x010617ac: 0x10617ac: addiu a0, a0, 14908
 	ldloc.1
 	ldc.i4 14908
 	add
 	stloc.1
-// 0x010617a0: 0x10617a0: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010617b0: 0x10617b0: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4960,20 +4960,20 @@ L_1061794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010617a8: 0x10617a8: beq   v0, zero, 0x10617c8 lui   a0, 0x10000
+// 0x010617b8: 0x10617b8: beq   v0, zero, 0x10617d8 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_10617c8
+	brfalse L_10617d8
 // --- basic block ---
-// 0x010617b0: 0x10617b0: jal   0x10947ac addiu a0, a0, 12924
+// 0x010617c0: 0x10617c0: jal   0x1094dd0 addiu a0, a0, 12920
 	ldloc.1
-	ldc.i4 12924
+	ldc.i4 12920
 	add
 	stloc.1
 	ldloc.0
@@ -4981,20 +4981,20 @@ L_1061794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010617b8: 0x10617b8: lui   a0, 0x0
+// 0x010617c8: 0x10617c8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010617bc: 0x10617bc: addiu a0, a0, 14812
+// 0x010617cc: 0x10617cc: addiu a0, a0, 14812
 	ldloc.1
 	ldc.i4 14812
 	add
 	stloc.1
-// 0x010617c0: 0x10617c0: jal   0x100e5c0 addu  a1, v0, zero
+// 0x010617d0: 0x10617d0: jal   0x100e5d0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5002,24 +5002,24 @@ L_1061794:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10617c8:
-// 0x010617c8: 0x10617c8: lui   a0, 0x0
+L_10617d8:
+// 0x010617d8: 0x10617d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010617cc: 0x10617cc: lui   a1, 0x0
+// 0x010617dc: 0x10617dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010617d0: 0x10617d0: addiu a0, a0, 14876
+// 0x010617e0: 0x10617e0: addiu a0, a0, 14876
 	ldloc.1
 	ldc.i4 14876
 	add
 	stloc.1
-// 0x010617d4: 0x10617d4: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010617e4: 0x10617e4: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -5029,21 +5029,21 @@ L_10617c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010617dc: 0x10617dc: beq   v0, zero, 0x1061800 sll   zero, zero, 0
+// 0x010617ec: 0x10617ec: beq   v0, zero, 0x1061810 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1061800
+	brfalse L_1061810
 // --- basic block ---
-// 0x010617e4: 0x10617e4: lui   a0, 0x10000
+// 0x010617f4: 0x10617f4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010617e8: 0x10617e8: jal   0x10947ac addiu a0, a0, 12944
+// 0x010617f8: 0x10617f8: jal   0x1094dd0 addiu a0, a0, 12940
 	ldloc.1
-	ldc.i4 12944
+	ldc.i4 12940
 	add
 	stloc.1
 	ldloc.0
@@ -5051,20 +5051,20 @@ L_10617c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010617f0: 0x10617f0: lui   a0, 0x0
+// 0x01061800: 0x1061800: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010617f4: 0x10617f4: addiu a0, a0, 14860
+// 0x01061804: 0x1061804: addiu a0, a0, 14860
 	ldloc.1
 	ldc.i4 14860
 	add
 	stloc.1
-// 0x010617f8: 0x10617f8: jal   0x100e5c0 addu  a1, v0, zero
+// 0x01061808: 0x1061808: jal   0x100e5d0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5072,18 +5072,18 @@ L_10617c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1061800:
-// 0x01061800: 0x1061800: lui   a0, 0x10000
+L_1061810:
+// 0x01061810: 0x1061810: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01061804: 0x1061804: jal   0x10947ac addiu a0, a0, 12968
+// 0x01061814: 0x1061814: jal   0x1094dd0 addiu a0, a0, 12964
 	ldloc.1
-	ldc.i4 12968
+	ldc.i4 12964
 	add
 	stloc.1
 	ldloc.0
@@ -5091,18 +5091,18 @@ L_1061800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106180c: 0x106180c: lui   a0, 0x0
+// 0x0106181c: 0x106181c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061810: 0x1061810: addu  a1, v0, zero
+// 0x01061820: 0x1061820: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01061814: 0x1061814: jal   0x100e5c0 addiu a0, a0, 14780
+// 0x01061824: 0x1061824: jal   0x100e5d0 addiu a0, a0, 14780
 	ldloc.1
 	ldc.i4 14780
 	add
@@ -5112,17 +5112,17 @@ L_1061800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106181c: 0x106181c: lui   a0, 0x10000
+// 0x0106182c: 0x106182c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01061820: 0x1061820: jal   0x10947ac addiu a0, a0, 12980
+// 0x01061830: 0x1061830: jal   0x1094dd0 addiu a0, a0, 12976
 	ldloc.1
-	ldc.i4 12980
+	ldc.i4 12976
 	add
 	stloc.1
 	ldloc.0
@@ -5130,18 +5130,18 @@ L_1061800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061828: 0x1061828: lui   a0, 0x0
+// 0x01061838: 0x1061838: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106182c: 0x106182c: addu  a1, v0, zero
+// 0x0106183c: 0x106183c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01061830: 0x1061830: jal   0x100e5c0 addiu a0, a0, 14764
+// 0x01061840: 0x1061840: jal   0x100e5d0 addiu a0, a0, 14764
 	ldloc.1
 	ldc.i4 14764
 	add
@@ -5151,17 +5151,17 @@ L_1061800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061838: 0x1061838: lui   a0, 0x10000
+// 0x01061848: 0x1061848: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0106183c: 0x106183c: jal   0x10947ac addiu a0, a0, 12992
+// 0x0106184c: 0x106184c: jal   0x1094dd0 addiu a0, a0, 12988
 	ldloc.1
-	ldc.i4 12992
+	ldc.i4 12988
 	add
 	stloc.1
 	ldloc.0
@@ -5169,20 +5169,20 @@ L_1061800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061844: 0x1061844: lui   a0, 0x0
+// 0x01061854: 0x1061854: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061848: 0x1061848: addiu a0, a0, 14828
+// 0x01061858: 0x1061858: addiu a0, a0, 14828
 	ldloc.1
 	ldc.i4 14828
 	add
 	stloc.1
-// 0x0106184c: 0x106184c: jal   0x100e5c0 addu  a1, v0, zero
+// 0x0106185c: 0x106185c: jal   0x100e5d0 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5190,14 +5190,14 @@ L_1061800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061854: 0x1061854: lw    ra, 20(sp)
-// 0x01061858: 0x1061858: sll   zero, zero, 0
-// 0x0106185c: 0x106185c: jr    ra addiu sp, sp, 24
+// 0x01061864: 0x1061864: lw    ra, 20(sp)
+// 0x01061868: 0x1061868: sll   zero, zero, 0
+// 0x0106186c: 0x106186c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5209,7 +5209,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_save_1061864(int32,int32,int32,int32,int32)
+.method public static int32 on_save_1061874(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5244,24 +5244,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061864: 0x1061864: addiu sp, sp, -24
+// 0x01061874: 0x1061874: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01061868: 0x1061868: sw    ra, 20(sp)
-// 0x0106186c: 0x106186c: jal   0x106173c sll   zero, zero, 0
+// 0x01061878: 0x1061878: sw    ra, 20(sp)
+// 0x0106187c: 0x106187c: jal   0x106174c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::save_changes_106173c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::save_changes_106174c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061874: 0x1061874: jal   0x1094a94 addu  a0, zero, zero
+// 0x01061884: 0x1061884: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5269,34 +5269,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106187c: 0x106187c: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x0106188c: 0x106188c: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x01061884: 0x1061884: bne   v0, zero, 0x1061894 sll   zero, zero, 0
+// 0x01061894: 0x1061894: bne   v0, zero, 0x10618a4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1061894
+	brtrue L_10618a4
 // --- basic block ---
-// 0x0106188c: 0x106188c: jal   0x105c348 sll   zero, zero, 0
+// 0x0106189c: 0x106189c: jal   0x105c358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_calc_route_105c348(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_calc_route_105c358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1061894:
-// 0x01061894: 0x1061894: lw    ra, 20(sp)
-// 0x01061898: 0x1061898: sll   zero, zero, 0
-// 0x0106189c: 0x106189c: jr    ra addiu sp, sp, 24
+L_10618a4:
+// 0x010618a4: 0x10618a4: lw    ra, 20(sp)
+// 0x010618a8: 0x10618a8: sll   zero, zero, 0
+// 0x010618ac: 0x10618ac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5308,7 +5308,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_close_dialog_10618a4(int32,int32,int32,int32,int32)
+.method public static int32 on_close_dialog_10618b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -5343,53 +5343,53 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010618a4: 0x10618a4: addiu sp, sp, -24
+// 0x010618b4: 0x10618b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010618a8: 0x10618a8: addiu v0, zero, 1
+// 0x010618b8: 0x10618b8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010618ac: 0x10618ac: bne   a0, v0, 0x10618d4 sw    ra, 20(sp)
+// 0x010618bc: 0x10618bc: bne   a0, v0, 0x10618e4 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_10618d4
+	bne.un L_10618e4
 // --- basic block ---
-// 0x010618b4: 0x10618b4: jal   0x106173c sll   zero, zero, 0
+// 0x010618c4: 0x10618c4: jal   0x106174c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::save_changes_106173c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::save_changes_106174c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010618bc: 0x10618bc: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x010618cc: 0x10618cc: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x010618c4: 0x10618c4: bne   v0, zero, 0x10618d4 sll   zero, zero, 0
+// 0x010618d4: 0x10618d4: bne   v0, zero, 0x10618e4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10618d4
+	brtrue L_10618e4
 // --- basic block ---
-// 0x010618cc: 0x10618cc: jal   0x105c348 sll   zero, zero, 0
+// 0x010618dc: 0x10618dc: jal   0x105c358 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl68::navigate_main_calc_route_105c348(int32,int32,int32,int32,int32)
+	call int32 Cibyl68::navigate_main_calc_route_105c358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10618d4:
-// 0x010618d4: 0x10618d4: lw    ra, 20(sp)
-// 0x010618d8: 0x10618d8: sll   zero, zero, 0
-// 0x010618dc: 0x10618dc: jr    ra addiu sp, sp, 24
+L_10618e4:
+// 0x010618e4: 0x10618e4: lw    ra, 20(sp)
+// 0x010618e8: 0x10618e8: sll   zero, zero, 0
+// 0x010618ec: 0x10618ec: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5401,7 +5401,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 calc_penalty_10618e4(int32,int32,int32,int32,int32)
+.method public static int32 calc_penalty_10618f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s2,int32 s1,int32 ra)
@@ -5445,17 +5445,17 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010618e4: 0x10618e4: addiu sp, sp, -32
+// 0x010618f4: 0x10618f4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010618e8: 0x10618e8: sltiu v0, a1, 12
+// 0x010618f8: 0x10618f8: sltiu v0, a1, 12
 	ldloc.2
 	ldc.i4.s 12
 	clt.un
 	stloc 5
-// 0x010618ec: 0x10618ec: sw    s1, 20(sp)
+// 0x010618fc: 0x10618fc: sw    s1, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5464,7 +5464,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010618f0: 0x10618f0: sw    s0, 16(sp)
+// 0x01061900: 0x1061900: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5473,8 +5473,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010618f4: 0x10618f4: sw    ra, 28(sp)
-// 0x010618f8: 0x10618f8: sw    s2, 24(sp)
+// 0x01061904: 0x1061904: sw    ra, 28(sp)
+// 0x01061908: 0x1061908: sw    s2, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5483,96 +5483,96 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010618fc: 0x10618fc: addu  s0, a0, zero
+// 0x0106190c: 0x106190c: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01061900: 0x1061900: beq   v0, zero, 0x1061974 addu  s1, a2, zero
+// 0x01061910: 0x1061910: beq   v0, zero, 0x1061984 addu  s1, a2, zero
 	ldloc 5
 	ldloc.3
 	stloc 10
-	brfalse L_1061974
+	brfalse L_1061984
 // --- basic block ---
-// 0x01061908: 0x1061908: addiu s2, zero, 1
+// 0x01061918: 0x1061918: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x0106190c: 0x106190c: sllv  a1, a1, s2
+// 0x0106191c: 0x106191c: sllv  a1, a1, s2
 	ldloc 9
 	ldloc.2
 	shl
 	stloc.2
-// 0x01061910: 0x1061910: andi  v0, a1, 2304
+// 0x01061920: 0x1061920: andi  v0, a1, 2304
 	ldloc.2
 	ldc.i4 2304
 	and
 	stloc 5
-// 0x01061914: 0x1061914: bne   v0, zero, 0x10619a0 addiu v1, zero, 2
+// 0x01061924: 0x1061924: bne   v0, zero, 0x10619b0 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brtrue L_10619a0
+	brtrue L_10619b0
 // --- basic block ---
-// 0x0106191c: 0x106191c: andi  v0, a1, 1536
+// 0x0106192c: 0x106192c: andi  v0, a1, 1536
 	ldloc.2
 	ldc.i4 1536
 	and
 	stloc 5
-// 0x01061920: 0x1061920: bne   v0, zero, 0x1061948 andi  a1, a1, 14
+// 0x01061930: 0x1061930: bne   v0, zero, 0x1061958 andi  a1, a1, 14
 	ldloc 5
 	ldloc.2
 	ldc.i4.s 14
 	and
 	stloc.2
-	brtrue L_1061948
+	brtrue L_1061958
 // --- basic block ---
-// 0x01061928: 0x1061928: beq   a1, zero, 0x1061974 sll   zero, zero, 0
+// 0x01061938: 0x1061938: beq   a1, zero, 0x1061984 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1061974
+	brfalse L_1061984
 // --- basic block ---
-// 0x01061930: 0x1061930: jal   0x10614e0 sll   zero, zero, 0
+// 0x01061940: 0x1061940: jal   0x10614f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_primaries_10614e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_primaries_10614f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061938: 0x1061938: beq   v0, zero, 0x1061974 addiu v1, zero, 2
+// 0x01061948: 0x1061948: beq   v0, zero, 0x1061984 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_1061974
+	brfalse L_1061984
 // --- basic block ---
-// 0x01061940: 0x1061940: j	 0x10619a0 sll   zero, zero, 0
-	br L_10619a0
+// 0x01061950: 0x1061950: j	 0x10619b0 sll   zero, zero, 0
+	br L_10619b0
 // --- basic block ---
-L_1061948:
-// 0x01061948: 0x1061948: jal   0x1061434 sll   zero, zero, 0
+L_1061958:
+// 0x01061958: 0x1061958: jal   0x1061444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_trails_1061434(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_trails_1061444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061950: 0x1061950: beq   v0, s2, 0x10619a0 addiu v1, zero, 2
+// 0x01061960: 0x1061960: beq   v0, s2, 0x10619b0 addiu v1, zero, 2
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	stloc 6
-	beq  L_10619a0
+	beq  L_10619b0
 // --- basic block ---
-// 0x01061958: 0x1061958: bne   v0, v1, 0x1061974 sll   zero, zero, 0
+// 0x01061968: 0x1061968: bne   v0, v1, 0x1061984 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1061974
+	bne.un L_1061984
 // --- basic block ---
-// 0x01061960: 0x1061960: jal   0x100405c addu  a0, s0, zero
+// 0x01061970: 0x1061970: jal   0x100405c addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5585,36 +5585,36 @@ L_1061948:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061968: 0x1061968: slti  v0, v0, 301
+// 0x01061978: 0x1061978: slti  v0, v0, 301
 	ldloc 5
 	ldc.i4 301
 	clt
 	stloc 5
-// 0x0106196c: 0x106196c: beq   v0, zero, 0x10619a0 addiu v1, zero, 2
+// 0x0106197c: 0x106197c: beq   v0, zero, 0x10619b0 addiu v1, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 6
-	brfalse L_10619a0
+	brfalse L_10619b0
 // --- basic block ---
-L_1061974:
-// 0x01061974: 0x1061974: jal   0x106150c sll   zero, zero, 0
+L_1061984:
+// 0x01061984: 0x1061984: jal   0x106151c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_prefer_same_street_106150c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_prefer_same_street_106151c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106197c: 0x106197c: beq   v0, zero, 0x10619a0 addu  v1, zero, zero
+// 0x0106198c: 0x106198c: beq   v0, zero, 0x10619b0 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_10619a0
+	brfalse L_10619b0
 // --- basic block ---
-// 0x01061984: 0x1061984: jal   0x1004034 addu  a0, s0, zero
+// 0x01061994: 0x1061994: jal   0x1004034 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5627,10 +5627,10 @@ L_1061974:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106198c: 0x106198c: addu  a0, s1, zero
+// 0x0106199c: 0x106199c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01061990: 0x1061990: jal   0x1004034 addu  s0, v0, zero
+// 0x010619a0: 0x10619a0: jal   0x1004034 addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -5643,22 +5643,22 @@ L_1061974:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061998: 0x1061998: xor   s0, s0, v0
+// 0x010619a8: 0x10619a8: xor   s0, s0, v0
 	ldloc 7
 	ldloc 5
 	xor
 	stloc 7
-// 0x0106199c: 0x106199c: sltu  v1, zero, s0
+// 0x010619ac: 0x10619ac: sltu  v1, zero, s0
 	ldc.i4.s 0
 	ldloc 7
 	clt.un
 	stloc 6
-L_10619a0:
-// 0x010619a0: 0x10619a0: lw    ra, 28(sp)
-// 0x010619a4: 0x10619a4: addu  v0, v1, zero
+L_10619b0:
+// 0x010619b0: 0x10619b0: lw    ra, 28(sp)
+// 0x010619b4: 0x10619b4: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x010619a8: 0x10619a8: lw    s2, 24(sp)
+// 0x010619b8: 0x10619b8: lw    s2, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5667,7 +5667,7 @@ L_10619a0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010619ac: 0x10619ac: lw    s1, 20(sp)
+// 0x010619bc: 0x10619bc: lw    s1, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5676,7 +5676,7 @@ L_10619a0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010619b0: 0x10619b0: lw    s0, 16(sp)
+// 0x010619c0: 0x10619c0: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -5685,7 +5685,7 @@ L_10619a0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010619b4: 0x10619b4: jr    ra addiu sp, sp, 32
+// 0x010619c4: 0x10619c4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5697,7 +5697,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 cost_fastest_traffic_10619bc(int32,int32,int32,int32,int32)
+.method public static int32 cost_fastest_traffic_10619cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -5762,13 +5762,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010619bc: 0x10619bc: addiu sp, sp, -144
+// 0x010619cc: 0x10619cc: addiu sp, sp, -144
 	ldloc.0
 	ldc.i4 -144
 	add
 	stloc.0
-// 0x010619c0: 0x10619c0: sw    ra, 140(sp)
-// 0x010619c4: 0x10619c4: sw    s4, 120(sp)
+// 0x010619d0: 0x10619d0: sw    ra, 140(sp)
+// 0x010619d4: 0x10619d4: sw    s4, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5777,7 +5777,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010619c8: 0x10619c8: sw    s1, 108(sp)
+// 0x010619d8: 0x10619d8: sw    s1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5786,7 +5786,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010619cc: 0x10619cc: sw    s0, 104(sp)
+// 0x010619dc: 0x10619dc: sw    s0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5795,13 +5795,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010619d0: 0x10619d0: addu  s1, a1, zero
+// 0x010619e0: 0x10619e0: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x010619d4: 0x10619d4: addu  s0, a0, zero
+// 0x010619e4: 0x10619e4: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010619d8: 0x10619d8: sw    a2, 152(sp)
+// 0x010619e8: 0x10619e8: sw    a2, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5810,7 +5810,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010619dc: 0x10619dc: sw    a3, 156(sp)
+// 0x010619ec: 0x10619ec: sw    a3, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5819,7 +5819,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010619e0: 0x10619e0: sw    s8, 136(sp)
+// 0x010619f0: 0x10619f0: sw    s8, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5828,7 +5828,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010619e4: 0x10619e4: sw    s7, 132(sp)
+// 0x010619f4: 0x10619f4: sw    s7, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5837,7 +5837,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010619e8: 0x10619e8: sw    s6, 128(sp)
+// 0x010619f8: 0x10619f8: sw    s6, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5846,7 +5846,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010619ec: 0x10619ec: sw    s5, 124(sp)
+// 0x010619fc: 0x10619fc: sw    s5, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5855,7 +5855,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010619f0: 0x10619f0: sw    s3, 116(sp)
+// 0x01061a00: 0x1061a00: sw    s3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5864,7 +5864,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010619f4: 0x10619f4: jal   0x1003b50 sw    s2, 112(sp)
+// 0x01061a04: 0x1061a04: jal   0x1003b50 sw    s2, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5881,7 +5881,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010619fc: 0x10619fc: sw    v0, 92(sp)
+// 0x01061a0c: 0x1061a0c: sw    v0, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5890,10 +5890,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061a00: 0x1061a00: lui   v0, 0x0
+// 0x01061a10: 0x1061a10: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01061a04: 0x1061a04: lw    s4, 576(v0)
+// 0x01061a14: 0x1061a14: lw    s4, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5902,13 +5902,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01061a08: 0x1061a08: addu  a0, s0, zero
+// 0x01061a18: 0x1061a18: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01061a0c: 0x1061a0c: addu  a1, s4, zero
+// 0x01061a1c: 0x1061a1c: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x01061a10: 0x1061a10: jal   0x1082f0c addu  a2, s1, zero
+// 0x01061a20: 0x1061a20: jal   0x1083530 addu  a2, s1, zero
 	ldloc 10
 	stloc.3
 	ldloc.0
@@ -5916,12 +5916,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_Get_Avg_Cross_Time_1082f0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_Get_Avg_Cross_Time_1083530(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061a18: 0x1061a18: sw    v0, 88(sp)
+// 0x01061a28: 0x1061a28: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5930,113 +5930,113 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061a1c: 0x1061a1c: lui   a0, 0x20000
+// 0x01061a2c: 0x1061a2c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01061a20: 0x1061a20: lui   v0, 0x20000
+// 0x01061a30: 0x1061a30: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01061a24: 0x1061a24: beq   s1, zero, 0x1061a48 sll   v1, s0, 3
+// 0x01061a34: 0x1061a34: beq   s1, zero, 0x1061a58 sll   v1, s0, 3
 	ldloc 10
 	ldloc 8
 	ldc.i4.3
 	shl
 	stloc 7
-	brfalse L_1061a48
+	brfalse L_1061a58
 // --- basic block ---
-// 0x01061a2c: 0x1061a2c: lw    a1, 31152(a0)
+// 0x01061a3c: 0x1061a3c: lw    a1, 31616(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.2
-// 0x01061a30: 0x1061a30: sll   zero, zero, 0
-// 0x01061a34: 0x1061a34: addu  v1, a1, v1
+// 0x01061a40: 0x1061a40: sll   zero, zero, 0
+// 0x01061a44: 0x1061a44: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x01061a38: 0x1061a38: lw    a0, 31228(v0)
+// 0x01061a48: 0x1061a48: lw    a0, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061a3c: 0x1061a3c: lhu   v0, 2(v1)
+// 0x01061a4c: 0x1061a4c: lhu   v0, 2(v1)
 	ldloc 7
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01061a40: 0x1061a40: j	 0x1061a5c addu  s5, s1, zero
+// 0x01061a50: 0x1061a50: j	 0x1061a6c addu  s5, s1, zero
 	ldloc 10
 	stloc 13
-	br L_1061a5c
+	br L_1061a6c
 // --- basic block ---
-L_1061a48:
-// 0x01061a48: 0x1061a48: lw    a1, 31152(a0)
+L_1061a58:
+// 0x01061a58: 0x1061a58: lw    a1, 31616(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.2
-// 0x01061a4c: 0x1061a4c: lw    a0, 31228(v0)
+// 0x01061a5c: 0x1061a5c: lw    a0, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061a50: 0x1061a50: addu  v1, a1, v1
+// 0x01061a60: 0x1061a60: addu  v1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc 7
-// 0x01061a54: 0x1061a54: lhu   v0, 0(v1)
+// 0x01061a64: 0x1061a64: lhu   v0, 0(v1)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01061a58: 0x1061a58: addu  s5, zero, zero
+// 0x01061a68: 0x1061a68: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-L_1061a5c:
-// 0x01061a5c: 0x1061a5c: andi  v0, v0, 32767
+L_1061a6c:
+// 0x01061a6c: 0x1061a6c: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01061a60: 0x1061a60: sll   v0, v0, 3
+// 0x01061a70: 0x1061a70: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01061a64: 0x1061a64: addu  v0, a0, v0
+// 0x01061a74: 0x1061a74: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01061a68: 0x1061a68: lw    v1, 0(v0)
+// 0x01061a78: 0x1061a78: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01061a6c: 0x1061a6c: addu  s3, s0, zero
+// 0x01061a7c: 0x1061a7c: addu  s3, s0, zero
 	ldloc 8
 	stloc 11
-// 0x01061a70: 0x1061a70: sw    v1, 40(sp)
+// 0x01061a80: 0x1061a80: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6045,7 +6045,7 @@ L_1061a5c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061a74: 0x1061a74: lw    v0, 4(v0)
+// 0x01061a84: 0x1061a84: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6054,10 +6054,10 @@ L_1061a5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061a78: 0x1061a78: addu  s2, s4, zero
+// 0x01061a88: 0x1061a88: addu  s2, s4, zero
 	ldloc 12
 	stloc 9
-// 0x01061a7c: 0x1061a7c: sw    v0, 44(sp)
+// 0x01061a8c: 0x1061a8c: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6066,16 +6066,16 @@ L_1061a5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061a80: 0x1061a80: addu  s7, zero, zero
+// 0x01061a90: 0x1061a90: addu  s7, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01061a84: 0x1061a84: j	 0x1061c0c addiu s6, zero, 1
+// 0x01061a94: 0x1061a94: j	 0x1061c1c addiu s6, zero, 1
 	ldc.i4.1
 	stloc 14
-	br L_1061c0c
+	br L_1061c1c
 // --- basic block ---
-L_1061a8c:
-// 0x01061a8c: 0x1061a8c: lw    v0, 576(v1)
+L_1061a9c:
+// 0x01061a9c: 0x1061a9c: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6084,18 +6084,18 @@ L_1061a8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061a90: 0x1061a90: sll   zero, zero, 0
-// 0x01061a94: 0x1061a94: beq   s2, v0, 0x1061aac sll   zero, zero, 0
+// 0x01061aa0: 0x1061aa0: sll   zero, zero, 0
+// 0x01061aa4: 0x1061aa4: beq   s2, v0, 0x1061abc sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	beq  L_1061aac
+	beq  L_1061abc
 // --- basic block ---
-// 0x01061a9c: 0x1061a9c: bltz  s2, 0x1061aac sll   zero, zero, 0
+// 0x01061aac: 0x1061aac: bltz  s2, 0x1061abc sll   zero, zero, 0
 	ldloc 9
 	ldc.i4.s 0
-	blt L_1061aac
+	blt L_1061abc
 // --- basic block ---
-// 0x01061aa4: 0x1061aa4: jal   0x100b164 addu  a0, s2, zero
+// 0x01061ab4: 0x1061ab4: jal   0x100b174 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -6103,43 +6103,43 @@ L_1061a8c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1061aac:
-// 0x01061aac: 0x1061aac: beq   s5, zero, 0x1061ac0 addu  a0, s3, zero
+L_1061abc:
+// 0x01061abc: 0x1061abc: beq   s5, zero, 0x1061ad0 addu  a0, s3, zero
 	ldloc 13
 	ldloc 11
 	stloc.1
-	brfalse L_1061ac0
+	brfalse L_1061ad0
 // --- basic block ---
-// 0x01061ab4: 0x1061ab4: addiu a1, sp, 36
+// 0x01061ac4: 0x1061ac4: addiu a1, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.2
-// 0x01061ab8: 0x1061ab8: j	 0x1061ac8 addiu a2, sp, 32
+// 0x01061ac8: 0x1061ac8: j	 0x1061ad8 addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-	br L_1061ac8
+	br L_1061ad8
 // --- basic block ---
-L_1061ac0:
-// 0x01061ac0: 0x1061ac0: addiu a1, sp, 32
+L_1061ad0:
+// 0x01061ad0: 0x1061ad0: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x01061ac4: 0x1061ac4: addiu a2, sp, 36
+// 0x01061ad4: 0x1061ad4: addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.3
-L_1061ac8:
-// 0x01061ac8: 0x1061ac8: jal   0x1003adc sll   zero, zero, 0
+L_1061ad8:
+// 0x01061ad8: 0x1061ad8: jal   0x1003adc sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -6148,7 +6148,7 @@ L_1061ac8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061ad0: 0x1061ad0: lw    v0, 36(sp)
+// 0x01061ae0: 0x1061ae0: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6157,46 +6157,46 @@ L_1061ac8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061ad4: 0x1061ad4: lui   a0, 0x20000
+// 0x01061ae4: 0x1061ae4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01061ad8: 0x1061ad8: lw    v1, 31228(a0)
+// 0x01061ae8: 0x1061ae8: lw    v1, 31692(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061adc: 0x1061adc: andi  v0, v0, 32767
+// 0x01061aec: 0x1061aec: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01061ae0: 0x1061ae0: sll   v0, v0, 3
+// 0x01061af0: 0x1061af0: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01061ae4: 0x1061ae4: addu  v0, v1, v0
+// 0x01061af4: 0x1061af4: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01061ae8: 0x1061ae8: lw    v1, 0(v0)
+// 0x01061af8: 0x1061af8: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01061aec: 0x1061aec: addiu a0, sp, 40
+// 0x01061afc: 0x1061afc: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x01061af0: 0x1061af0: sw    v1, 48(sp)
+// 0x01061b00: 0x1061b00: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6205,7 +6205,7 @@ L_1061ac8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061af4: 0x1061af4: lw    v0, 4(v0)
+// 0x01061b04: 0x1061b04: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6214,12 +6214,12 @@ L_1061ac8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061af8: 0x1061af8: addiu a1, sp, 48
+// 0x01061b08: 0x1061b08: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x01061afc: 0x1061afc: jal   0x1008eb0 sw    v0, 52(sp)
+// 0x01061b0c: 0x1061b0c: jal   0x1008ec0 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6233,25 +6233,25 @@ L_1061ac8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061b04: 0x1061b04: slti  v0, v0, 1001
+// 0x01061b14: 0x1061b14: slti  v0, v0, 1001
 	ldloc 5
 	ldc.i4 1001
 	clt
 	stloc 5
-// 0x01061b08: 0x1061b08: beq   v0, zero, 0x1061c1c addiu v0, sp, 56
+// 0x01061b18: 0x1061b18: beq   v0, zero, 0x1061c2c addiu v0, sp, 56
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 5
-	brfalse L_1061c1c
+	brfalse L_1061c2c
 // --- basic block ---
-// 0x01061b10: 0x1061b10: lw    a3, 36(sp)
+// 0x01061b20: 0x1061b20: lw    a3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6260,19 +6260,19 @@ L_1061ac8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01061b14: 0x1061b14: addiu v1, zero, 2
+// 0x01061b24: 0x1061b24: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01061b18: 0x1061b18: addu  a0, s2, zero
+// 0x01061b28: 0x1061b28: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01061b1c: 0x1061b1c: addu  a1, s3, zero
+// 0x01061b2c: 0x1061b2c: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x01061b20: 0x1061b20: addu  a2, s5, zero
+// 0x01061b30: 0x1061b30: addu  a2, s5, zero
 	ldloc 13
 	stloc.3
-// 0x01061b24: 0x1061b24: sw    v0, 16(sp)
+// 0x01061b34: 0x1061b34: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6281,7 +6281,7 @@ L_1061ac8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061b28: 0x1061b28: sw    v1, 20(sp)
+// 0x01061b38: 0x1061b38: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6290,7 +6290,7 @@ L_1061ac8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061b2c: 0x1061b2c: sw    s6, 24(sp)
+// 0x01061b3c: 0x1061b3c: sw    s6, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6299,7 +6299,7 @@ L_1061ac8:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01061b30: 0x1061b30: jal   0x106104c sw    s6, 28(sp)
+// 0x01061b40: 0x1061b40: jal   0x106105c sw    s6, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6313,17 +6313,17 @@ L_1061ac8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::get_connected_segments_106104c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::get_connected_segments_106105c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061b38: 0x1061b38: bne   v0, s6, 0x1061c1c sll   zero, zero, 0
+// 0x01061b48: 0x1061b48: bne   v0, s6, 0x1061c2c sll   zero, zero, 0
 	ldloc 5
 	ldloc 14
-	bne.un L_1061c1c
+	bne.un L_1061c2c
 // --- basic block ---
-// 0x01061b40: 0x1061b40: lw    s2, 56(sp)
+// 0x01061b50: 0x1061b50: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6332,7 +6332,7 @@ L_1061ac8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01061b44: 0x1061b44: lw    s3, 60(sp)
+// 0x01061b54: 0x1061b54: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6341,57 +6341,57 @@ L_1061ac8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01061b48: 0x1061b48: lbu   s5, 64(sp)
+// 0x01061b58: 0x1061b58: lbu   s5, 64(sp)
 	ldloc.0
 	ldc.i4.s 64
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 13
-// 0x01061b4c: 0x1061b4c: bne   s2, s4, 0x1061b64 addu  a0, s3, zero
+// 0x01061b5c: 0x1061b5c: bne   s2, s4, 0x1061b74 addu  a0, s3, zero
 	ldloc 9
 	ldloc 12
 	ldloc 11
 	stloc.1
-	bne.un L_1061b64
+	bne.un L_1061b74
 // --- basic block ---
-// 0x01061b54: 0x1061b54: bne   s3, s0, 0x1061b68 addu  a1, s2, zero
+// 0x01061b64: 0x1061b64: bne   s3, s0, 0x1061b78 addu  a1, s2, zero
 	ldloc 11
 	ldloc 8
 	ldloc 9
 	stloc.2
-	bne.un L_1061b68
+	bne.un L_1061b78
 // --- basic block ---
-// 0x01061b5c: 0x1061b5c: beq   s5, s1, 0x1061c20 lui   v0, 0x0
+// 0x01061b6c: 0x1061b6c: beq   s5, s1, 0x1061c30 lui   v0, 0x0
 	ldloc 13
 	ldloc 10
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1061c20
+	beq  L_1061c30
 // --- basic block ---
-L_1061b64:
-// 0x01061b64: 0x1061b64: addu  a1, s2, zero
+L_1061b74:
+// 0x01061b74: 0x1061b74: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-L_1061b68:
-// 0x01061b68: 0x1061b68: jal   0x1082a24 addu  a2, s5, zero
+L_1061b78:
+// 0x01061b78: 0x1061b78: jal   0x1083048 addu  a2, s5, zero
 	ldloc 13
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_Get_Avg_Speed_1082a24(int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_Get_Avg_Speed_1083048(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061b70: 0x1061b70: beq   v0, zero, 0x1061bfc addu  s8, v0, zero
+// 0x01061b80: 0x1061b80: beq   v0, zero, 0x1061c0c addu  s8, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 16
-	brfalse L_1061bfc
+	brfalse L_1061c0c
 // --- basic block ---
-// 0x01061b78: 0x1061b78: jal   0x100405c addu  a0, s3, zero
+// 0x01061b88: 0x1061b88: jal   0x100405c addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -6404,7 +6404,7 @@ L_1061b68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061b80: 0x1061b80: jal   0x1007eb8 addu  a0, v0, zero
+// 0x01061b90: 0x1061b90: jal   0x1007ec8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6412,42 +6412,42 @@ L_1061b68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_cm_1007eb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_cm_1007ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061b88: 0x1061b88: addiu v1, zero, 100
+// 0x01061b98: 0x1061b98: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x01061b8c: 0x1061b8c: div   v0, v1
+// 0x01061b9c: 0x1061b9c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 18
-// 0x01061b90: 0x1061b90: mflo  lo
+// 0x01061ba0: 0x1061ba0: mflo  lo
 	ldloc 18
 	stloc.1
-// 0x01061b94: 0x1061b94: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01061ba4: 0x1061ba4: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061b9c: 0x1061b9c: addu  a0, v0, zero
+// 0x01061bac: 0x1061bac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01061ba0: 0x1061ba0: lui   v0, 0x20000
+// 0x01061bb0: 0x1061bb0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01061ba4: 0x1061ba4: addiu v0, v0, 23696
+// 0x01061bb4: 0x1061bb4: addiu v0, v0, 24160
 	ldloc 5
-	ldc.i4 23696
+	ldc.i4 24160
 	add
 	stloc 5
-// 0x01061ba8: 0x1061ba8: lw    a3, 4(v0)
+// 0x01061bb8: 0x1061bb8: lw    a3, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6456,14 +6456,14 @@ L_1061b68:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01061bac: 0x1061bac: lw    a2, 0(v0)
+// 0x01061bbc: 0x1061bbc: lw    a2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01061bb0: 0x1061bb0: jal   0x10c0798 addu  a1, v1, zero
+// 0x01061bc0: 0x1061bc0: jal   0x10c0dd8 addu  a1, v1, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -6471,18 +6471,18 @@ L_1061b68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061bb8: 0x1061bb8: addu  a2, v0, zero
+// 0x01061bc8: 0x1061bc8: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01061bbc: 0x1061bbc: addu  a0, s8, zero
+// 0x01061bcc: 0x1061bcc: addu  a0, s8, zero
 	ldloc 16
 	stloc.1
-// 0x01061bc0: 0x1061bc0: sw    a2, 96(sp)
+// 0x01061bd0: 0x1061bd0: sw    a2, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6491,7 +6491,7 @@ L_1061b68:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01061bc4: 0x1061bc4: jal   0x10c09c0 sw    v1, 100(sp)
+// 0x01061bd4: 0x1061bd4: jal   0x10c1000 sw    v1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6502,12 +6502,12 @@ L_1061b68:
 	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061bcc: 0x1061bcc: lw    a2, 96(sp)
+// 0x01061bdc: 0x1061bdc: lw    a2, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6516,7 +6516,7 @@ L_1061b68:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01061bd0: 0x1061bd0: lw    a3, 100(sp)
+// 0x01061be0: 0x1061be0: lw    a3, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6525,16 +6525,16 @@ L_1061b68:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01061bd4: 0x1061bd4: addu  a0, a2, zero
+// 0x01061be4: 0x1061be4: addu  a0, a2, zero
 	ldloc.3
 	stloc.1
-// 0x01061bd8: 0x1061bd8: addu  a1, a3, zero
+// 0x01061be8: 0x1061be8: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01061bdc: 0x1061bdc: addu  a2, v0, zero
+// 0x01061bec: 0x1061bec: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01061be0: 0x1061be0: jal   0x10c07f0 addu  a3, v1, zero
+// 0x01061bf0: 0x1061bf0: jal   0x10c0e30 addu  a3, v1, zero
 	ldloc 7
 	stloc 4
 	ldloc.0
@@ -6542,31 +6542,31 @@ L_1061b68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061be8: 0x1061be8: addu  a1, v1, zero
+// 0x01061bf8: 0x1061bf8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01061bec: 0x1061bec: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01061bfc: 0x1061bfc: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061bf4: 0x1061bf4: addiu v0, v0, 1
+// 0x01061c04: 0x1061c04: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01061bf8: 0x1061bf8: sw    v0, 88(sp)
+// 0x01061c08: 0x1061c08: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6575,24 +6575,24 @@ L_1061b68:
 	add
 	ldloc 5
 	stelem.i4
-L_1061bfc:
-// 0x01061bfc: 0x1061bfc: addiu s7, s7, 1
+L_1061c0c:
+// 0x01061c0c: 0x1061c0c: addiu s7, s7, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x01061c00: 0x1061c00: addiu v1, zero, 3
+// 0x01061c10: 0x1061c10: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x01061c04: 0x1061c04: beq   s7, v1, 0x1061c20 lui   v0, 0x0
+// 0x01061c14: 0x1061c14: beq   s7, v1, 0x1061c30 lui   v0, 0x0
 	ldloc 15
 	ldloc 7
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1061c20
+	beq  L_1061c30
 // --- basic block ---
-L_1061c0c:
-// 0x01061c0c: 0x1061c0c: lw    a0, 88(sp)
+L_1061c1c:
+// 0x01061c1c: 0x1061c1c: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6601,19 +6601,19 @@ L_1061c0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061c10: 0x1061c10: sll   zero, zero, 0
-// 0x01061c14: 0x1061c14: beq   a0, zero, 0x1061a8c lui   v1, 0x0
+// 0x01061c20: 0x1061c20: sll   zero, zero, 0
+// 0x01061c24: 0x1061c24: beq   a0, zero, 0x1061a9c lui   v1, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1061a8c
+	brfalse L_1061a9c
 // --- basic block ---
-L_1061c1c:
-// 0x01061c1c: 0x1061c1c: lui   v0, 0x0
+L_1061c2c:
+// 0x01061c2c: 0x1061c2c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-L_1061c20:
-// 0x01061c20: 0x1061c20: lw    v0, 576(v0)
+L_1061c30:
+// 0x01061c30: 0x1061c30: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6622,18 +6622,18 @@ L_1061c20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061c24: 0x1061c24: sll   zero, zero, 0
-// 0x01061c28: 0x1061c28: beq   s4, v0, 0x1061c40 sll   zero, zero, 0
+// 0x01061c34: 0x1061c34: sll   zero, zero, 0
+// 0x01061c38: 0x1061c38: beq   s4, v0, 0x1061c50 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	beq  L_1061c40
+	beq  L_1061c50
 // --- basic block ---
-// 0x01061c30: 0x1061c30: bltz  s4, 0x1061c40 sll   zero, zero, 0
+// 0x01061c40: 0x1061c40: bltz  s4, 0x1061c50 sll   zero, zero, 0
 	ldloc 12
 	ldc.i4.s 0
-	blt L_1061c40
+	blt L_1061c50
 // --- basic block ---
-// 0x01061c38: 0x1061c38: jal   0x100b164 addu  a0, s4, zero
+// 0x01061c48: 0x1061c48: jal   0x100b174 addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -6641,13 +6641,13 @@ L_1061c20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1061c40:
-// 0x01061c40: 0x1061c40: lw    a1, 88(sp)
+L_1061c50:
+// 0x01061c50: 0x1061c50: lw    a1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6656,23 +6656,23 @@ L_1061c40:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01061c44: 0x1061c44: sll   zero, zero, 0
-// 0x01061c48: 0x1061c48: bne   a1, zero, 0x1061c80 lui   v0, 0x70000
+// 0x01061c54: 0x1061c54: sll   zero, zero, 0
+// 0x01061c58: 0x1061c58: bne   a1, zero, 0x1061c90 lui   v0, 0x70000
 	ldloc.2
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1061c80
+	brtrue L_1061c90
 // --- basic block ---
-// 0x01061c50: 0x1061c50: lw    a2, 12756(v0)
+// 0x01061c60: 0x1061c60: lw    a2, 13220(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3189
+	ldc.i4 3305
 	add
 	ldelem.i4
 	stloc.3
-// 0x01061c54: 0x1061c54: lw    v0, 152(sp)
+// 0x01061c64: 0x1061c64: lw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6681,15 +6681,15 @@ L_1061c40:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061c58: 0x1061c58: addu  a0, s0, zero
+// 0x01061c68: 0x1061c68: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01061c5c: 0x1061c5c: addu  a2, v0, a2
+// 0x01061c6c: 0x1061c6c: addu  a2, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc.3
-// 0x01061c60: 0x1061c60: jal   0x1005678 addu  a1, s1, zero
+// 0x01061c70: 0x1061c70: jal   0x1005688 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -6697,12 +6697,12 @@ L_1061c40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_line_speed_get_cross_time_at_1005678(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_line_speed_get_cross_time_at_1005688(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061c68: 0x1061c68: bne   v0, zero, 0x1061c80 sw    v0, 88(sp)
+// 0x01061c78: 0x1061c78: bne   v0, zero, 0x1061c90 sw    v0, 88(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6712,12 +6712,12 @@ L_1061c40:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1061c80
+	brtrue L_1061c90
 // --- basic block ---
-// 0x01061c70: 0x1061c70: addu  a0, s0, zero
+// 0x01061c80: 0x1061c80: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01061c74: 0x1061c74: jal   0x10052c8 addu  a1, s1, zero
+// 0x01061c84: 0x1061c84: jal   0x10052d8 addu  a1, s1, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -6725,12 +6725,12 @@ L_1061c40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_speed_get_avg_cross_time_10052c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_speed_get_avg_cross_time_10052d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061c7c: 0x1061c7c: sw    v0, 88(sp)
+// 0x01061c8c: 0x1061c8c: sw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6739,8 +6739,8 @@ L_1061c40:
 	add
 	ldloc 5
 	stelem.i4
-L_1061c80:
-// 0x01061c80: 0x1061c80: lw    v1, 164(sp)
+L_1061c90:
+// 0x01061c90: 0x1061c90: lw    v1, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6749,23 +6749,23 @@ L_1061c80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061c84: 0x1061c84: addiu v0, zero, -1
+// 0x01061c94: 0x1061c94: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01061c88: 0x1061c88: beq   v1, v0, 0x1061cec addu  a1, s1, zero
+// 0x01061c98: 0x1061c98: beq   v1, v0, 0x1061cfc addu  a1, s1, zero
 	ldloc 7
 	ldloc 5
 	ldloc 10
 	stloc.2
-	beq  L_1061cec
+	beq  L_1061cfc
 // --- basic block ---
-// 0x01061c90: 0x1061c90: jal   0x1077b1c addu  a0, s0, zero
+// 0x01061ca0: 0x1061ca0: jal   0x1078140 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-	call int32 Cibyl89::RTAlerts_Penalty_1077b1c()
+	call int32 Cibyl90::RTAlerts_Penalty_1078140()
 	stloc 5
 // --- basic block ---
-// 0x01061c98: 0x1061c98: lw    v1, 88(sp)
+// 0x01061ca8: 0x1061ca8: lw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6774,7 +6774,7 @@ L_1061c80:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061c9c: 0x1061c9c: lw    a1, 92(sp)
+// 0x01061cac: 0x1061cac: lw    a1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6783,7 +6783,7 @@ L_1061c80:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01061ca0: 0x1061ca0: lw    a2, 156(sp)
+// 0x01061cb0: 0x1061cb0: lw    a2, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6792,15 +6792,15 @@ L_1061c80:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01061ca4: 0x1061ca4: addu  v1, v1, v0
+// 0x01061cb4: 0x1061cb4: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x01061ca8: 0x1061ca8: addu  a0, s0, zero
+// 0x01061cb8: 0x1061cb8: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01061cac: 0x1061cac: jal   0x10618e4 sw    v1, 88(sp)
+// 0x01061cbc: 0x1061cbc: jal   0x10618f4 sw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6814,27 +6814,27 @@ L_1061c80:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::calc_penalty_10618e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::calc_penalty_10618f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01061cb4: 0x1061cb4: addiu v1, zero, 1
+// 0x01061cc4: 0x1061cc4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01061cb8: 0x1061cb8: beq   v0, v1, 0x1061cdc addiu v1, zero, 2
+// 0x01061cc8: 0x1061cc8: beq   v0, v1, 0x1061cec addiu v1, zero, 2
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	beq  L_1061cdc
+	beq  L_1061cec
 // --- basic block ---
-// 0x01061cc0: 0x1061cc0: bne   v0, v1, 0x1061cec sll   zero, zero, 0
+// 0x01061cd0: 0x1061cd0: bne   v0, v1, 0x1061cfc sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1061cec
+	bne.un L_1061cfc
 // --- basic block ---
-// 0x01061cc8: 0x1061cc8: lw    a0, 88(sp)
+// 0x01061cd8: 0x1061cd8: lw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6843,13 +6843,13 @@ L_1061c80:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061ccc: 0x1061ccc: sll   zero, zero, 0
-// 0x01061cd0: 0x1061cd0: addiu a0, a0, 3600
+// 0x01061cdc: 0x1061cdc: sll   zero, zero, 0
+// 0x01061ce0: 0x1061ce0: addiu a0, a0, 3600
 	ldloc.1
 	ldc.i4 3600
 	add
 	stloc.1
-// 0x01061cd4: 0x1061cd4: j	 0x1061cec sw    a0, 88(sp)
+// 0x01061ce4: 0x1061ce4: j	 0x1061cfc sw    a0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6858,10 +6858,10 @@ L_1061c80:
 	add
 	ldloc.1
 	stelem.i4
-	br L_1061cec
+	br L_1061cfc
 // --- basic block ---
-L_1061cdc:
-// 0x01061cdc: 0x1061cdc: lw    a1, 88(sp)
+L_1061cec:
+// 0x01061cec: 0x1061cec: lw    a1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6870,13 +6870,13 @@ L_1061cdc:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01061ce0: 0x1061ce0: sll   zero, zero, 0
-// 0x01061ce4: 0x1061ce4: addiu a1, a1, 60
+// 0x01061cf0: 0x1061cf0: sll   zero, zero, 0
+// 0x01061cf4: 0x1061cf4: addiu a1, a1, 60
 	ldloc.2
 	ldc.i4.s 60
 	add
 	stloc.2
-// 0x01061ce8: 0x1061ce8: sw    a1, 88(sp)
+// 0x01061cf8: 0x1061cf8: sw    a1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6885,9 +6885,9 @@ L_1061cdc:
 	add
 	ldloc.2
 	stelem.i4
-L_1061cec:
-// 0x01061cec: 0x1061cec: lw    ra, 140(sp)
-// 0x01061cf0: 0x1061cf0: lw    v0, 88(sp)
+L_1061cfc:
+// 0x01061cfc: 0x1061cfc: lw    ra, 140(sp)
+// 0x01061d00: 0x1061d00: lw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6896,7 +6896,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061cf4: 0x1061cf4: lw    s8, 136(sp)
+// 0x01061d04: 0x1061d04: lw    s8, 136(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6905,7 +6905,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01061cf8: 0x1061cf8: lw    s7, 132(sp)
+// 0x01061d08: 0x1061d08: lw    s7, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6914,7 +6914,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01061cfc: 0x1061cfc: lw    s6, 128(sp)
+// 0x01061d0c: 0x1061d0c: lw    s6, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6923,7 +6923,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01061d00: 0x1061d00: lw    s5, 124(sp)
+// 0x01061d10: 0x1061d10: lw    s5, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6932,7 +6932,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01061d04: 0x1061d04: lw    s4, 120(sp)
+// 0x01061d14: 0x1061d14: lw    s4, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6941,7 +6941,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01061d08: 0x1061d08: lw    s3, 116(sp)
+// 0x01061d18: 0x1061d18: lw    s3, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6950,7 +6950,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01061d0c: 0x1061d0c: lw    s2, 112(sp)
+// 0x01061d1c: 0x1061d1c: lw    s2, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6959,7 +6959,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01061d10: 0x1061d10: lw    s1, 108(sp)
+// 0x01061d20: 0x1061d20: lw    s1, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6968,7 +6968,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01061d14: 0x1061d14: lw    s0, 104(sp)
+// 0x01061d24: 0x1061d24: lw    s0, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6977,7 +6977,7 @@ L_1061cec:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01061d18: 0x1061d18: jr    ra addiu sp, sp, 144
+// 0x01061d28: 0x1061d28: jr    ra addiu sp, sp, 144
 	ldloc.0
 	ldc.i4 144
 	add
diff --git a/converted/Cibyl73.j b/converted/Cibyl73.j
index 0cef105..7724220 100644
--- a/converted/Cibyl73.j
+++ b/converted/Cibyl73.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl73::.ctor
 
-.method public static int32 navigate_cost_time_1061d20(int32,int32,int32,int32,int32)
+.method public static int32 navigate_cost_time_1061d30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -76,12 +76,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061d20: 0x1061d20: addiu sp, sp, -32
+// 0x01061d30: 0x1061d30: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01061d24: 0x1061d24: lw    v0, 48(sp)
+// 0x01061d34: 0x1061d34: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -90,8 +90,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061d28: 0x1061d28: sw    ra, 28(sp)
-// 0x01061d2c: 0x1061d2c: sw    v0, 16(sp)
+// 0x01061d38: 0x1061d38: sw    ra, 28(sp)
+// 0x01061d3c: 0x1061d3c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -100,10 +100,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061d30: 0x1061d30: addiu v0, zero, -1
+// 0x01061d40: 0x1061d40: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01061d34: 0x1061d34: jal   0x10619bc sw    v0, 20(sp)
+// 0x01061d44: 0x1061d44: jal   0x10619cc sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -117,14 +117,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::cost_fastest_traffic_10619bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::cost_fastest_traffic_10619cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01061d3c: 0x1061d3c: lw    ra, 28(sp)
-// 0x01061d40: 0x1061d40: sll   zero, zero, 0
-// 0x01061d44: 0x1061d44: jr    ra addiu sp, sp, 32
+// 0x01061d4c: 0x1061d4c: lw    ra, 28(sp)
+// 0x01061d50: 0x1061d50: sll   zero, zero, 0
+// 0x01061d54: 0x1061d54: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -136,7 +136,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 cost_shortest_1061d4c(int32,int32,int32,int32,int32)
+.method public static int32 cost_shortest_1061d5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -177,12 +177,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061d4c: 0x1061d4c: addiu sp, sp, -40
+// 0x01061d5c: 0x1061d5c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01061d50: 0x1061d50: sw    s1, 32(sp)
+// 0x01061d60: 0x1061d60: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -191,7 +191,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01061d54: 0x1061d54: sw    s0, 28(sp)
+// 0x01061d64: 0x1061d64: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -200,11 +200,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01061d58: 0x1061d58: sw    ra, 36(sp)
-// 0x01061d5c: 0x1061d5c: addu  s0, a0, zero
+// 0x01061d68: 0x1061d68: sw    ra, 36(sp)
+// 0x01061d6c: 0x1061d6c: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01061d60: 0x1061d60: jal   0x1003b50 sw    a3, 16(sp)
+// 0x01061d70: 0x1061d70: jal   0x1003b50 sw    a3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -221,7 +221,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01061d68: 0x1061d68: lw    a0, 60(sp)
+// 0x01061d78: 0x1061d78: lw    a0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -230,10 +230,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061d6c: 0x1061d6c: addiu v1, zero, -1
+// 0x01061d7c: 0x1061d7c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x01061d70: 0x1061d70: lw    a2, 16(sp)
+// 0x01061d80: 0x1061d80: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -242,17 +242,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01061d74: 0x1061d74: beq   a0, v1, 0x1061db0 addu  s1, zero, zero
+// 0x01061d84: 0x1061d84: beq   a0, v1, 0x1061dc0 addu  s1, zero, zero
 	ldloc.1
 	ldloc 8
 	ldc.i4.s 0
 	stloc 6
-	beq  L_1061db0
+	beq  L_1061dc0
 // --- basic block ---
-// 0x01061d7c: 0x1061d7c: addu  a1, v0, zero
+// 0x01061d8c: 0x1061d8c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01061d80: 0x1061d80: jal   0x10618e4 addu  a0, s0, zero
+// 0x01061d90: 0x1061d90: jal   0x10618f4 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -260,45 +260,45 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::calc_penalty_10618e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::calc_penalty_10618f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01061d88: 0x1061d88: addu  s1, v0, zero
+// 0x01061d98: 0x1061d98: addu  s1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01061d8c: 0x1061d8c: addiu v0, zero, 1
+// 0x01061d9c: 0x1061d9c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01061d90: 0x1061d90: beq   s1, v0, 0x1061dac addiu v0, zero, 2
+// 0x01061da0: 0x1061da0: beq   s1, v0, 0x1061dbc addiu v0, zero, 2
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	beq  L_1061dac
+	beq  L_1061dbc
 // --- basic block ---
-// 0x01061d98: 0x1061d98: bne   s1, v0, 0x1061db0 sll   zero, zero, 0
+// 0x01061da8: 0x1061da8: bne   s1, v0, 0x1061dc0 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_1061db0
+	bne.un L_1061dc0
 // --- basic block ---
-// 0x01061da0: 0x1061da0: lui   s1, 0x10000
+// 0x01061db0: 0x1061db0: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01061da4: 0x1061da4: j	 0x1061db0 ori   s1, s1, 34464
+// 0x01061db4: 0x1061db4: j	 0x1061dc0 ori   s1, s1, 34464
 	ldloc 6
 	ldc.i4 34464
 	or
 	stloc 6
-	br L_1061db0
+	br L_1061dc0
 // --- basic block ---
-L_1061dac:
-// 0x01061dac: 0x1061dac: addiu s1, zero, 500
+L_1061dbc:
+// 0x01061dbc: 0x1061dbc: addiu s1, zero, 500
 	ldc.i4 500
 	stloc 6
-L_1061db0:
-// 0x01061db0: 0x1061db0: jal   0x100405c addu  a0, s0, zero
+L_1061dc0:
+// 0x01061dc0: 0x1061dc0: jal   0x100405c addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -311,13 +311,13 @@ L_1061db0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01061db8: 0x1061db8: lw    ra, 36(sp)
-// 0x01061dbc: 0x1061dbc: addu  v0, v0, s1
+// 0x01061dc8: 0x1061dc8: lw    ra, 36(sp)
+// 0x01061dcc: 0x1061dcc: addu  v0, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01061dc0: 0x1061dc0: lw    s1, 32(sp)
+// 0x01061dd0: 0x1061dd0: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -326,7 +326,7 @@ L_1061db0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01061dc4: 0x1061dc4: lw    s0, 28(sp)
+// 0x01061dd4: 0x1061dd4: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -335,7 +335,7 @@ L_1061db0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01061dc8: 0x1061dc8: jr    ra addiu sp, sp, 40
+// 0x01061dd8: 0x1061dd8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -347,7 +347,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 cost_fastest_1061dd0(int32,int32,int32,int32,int32)
+.method public static int32 cost_fastest_1061de0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s2,int32 s1,int32 ra,int32 lo)
@@ -394,12 +394,12 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061dd0: 0x1061dd0: addiu sp, sp, -40
+// 0x01061de0: 0x1061de0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01061dd4: 0x1061dd4: sw    s2, 32(sp)
+// 0x01061de4: 0x1061de4: sw    s2, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -408,7 +408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01061dd8: 0x1061dd8: sw    s1, 28(sp)
+// 0x01061de8: 0x1061de8: sw    s1, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -417,7 +417,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01061ddc: 0x1061ddc: sw    s0, 24(sp)
+// 0x01061dec: 0x1061dec: sw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -426,11 +426,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01061de0: 0x1061de0: sw    ra, 36(sp)
-// 0x01061de4: 0x1061de4: addu  s1, a0, zero
+// 0x01061df0: 0x1061df0: sw    ra, 36(sp)
+// 0x01061df4: 0x1061df4: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01061de8: 0x1061de8: jal   0x1003b50 sw    a3, 16(sp)
+// 0x01061df8: 0x1061df8: jal   0x1003b50 sw    a3, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -447,7 +447,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061df0: 0x1061df0: lw    v1, 60(sp)
+// 0x01061e00: 0x1061e00: lw    v1, 60(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -456,13 +456,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01061df4: 0x1061df4: addu  s0, v0, zero
+// 0x01061e04: 0x1061e04: addu  s0, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01061df8: 0x1061df8: addiu v0, zero, -1
+// 0x01061e08: 0x1061e08: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01061dfc: 0x1061dfc: lw    a2, 16(sp)
+// 0x01061e0c: 0x1061e0c: lw    a2, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -471,17 +471,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01061e00: 0x1061e00: beq   v1, v0, 0x1061e3c addu  s2, zero, zero
+// 0x01061e10: 0x1061e10: beq   v1, v0, 0x1061e4c addu  s2, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 9
-	beq  L_1061e3c
+	beq  L_1061e4c
 // --- basic block ---
-// 0x01061e08: 0x1061e08: addu  a0, s1, zero
+// 0x01061e18: 0x1061e18: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x01061e0c: 0x1061e0c: jal   0x10618e4 addu  a1, s0, zero
+// 0x01061e1c: 0x1061e1c: jal   0x10618f4 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -489,51 +489,51 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::calc_penalty_10618e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::calc_penalty_10618f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061e14: 0x1061e14: addu  s2, v0, zero
+// 0x01061e24: 0x1061e24: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01061e18: 0x1061e18: addiu v0, zero, 1
+// 0x01061e28: 0x1061e28: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01061e1c: 0x1061e1c: beq   s2, v0, 0x1061e38 addiu v0, zero, 2
+// 0x01061e2c: 0x1061e2c: beq   s2, v0, 0x1061e48 addiu v0, zero, 2
 	ldloc 9
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	beq  L_1061e38
+	beq  L_1061e48
 // --- basic block ---
-// 0x01061e24: 0x1061e24: bne   s2, v0, 0x1061e40 addu  a0, s1, zero
+// 0x01061e34: 0x1061e34: bne   s2, v0, 0x1061e50 addu  a0, s1, zero
 	ldloc 9
 	ldloc 5
 	ldloc 10
 	stloc.1
-	bne.un L_1061e40
+	bne.un L_1061e50
 // --- basic block ---
-// 0x01061e2c: 0x1061e2c: lui   s2, 0x10000
+// 0x01061e3c: 0x1061e3c: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01061e30: 0x1061e30: j	 0x1061e40 ori   s2, s2, 34464
+// 0x01061e40: 0x1061e40: j	 0x1061e50 ori   s2, s2, 34464
 	ldloc 9
 	ldc.i4 34464
 	or
 	stloc 9
-	br L_1061e40
+	br L_1061e50
 // --- basic block ---
-L_1061e38:
-// 0x01061e38: 0x1061e38: addiu s2, zero, 500
+L_1061e48:
+// 0x01061e48: 0x1061e48: addiu s2, zero, 500
 	ldc.i4 500
 	stloc 9
-L_1061e3c:
-// 0x01061e3c: 0x1061e3c: addu  a0, s1, zero
+L_1061e4c:
+// 0x01061e4c: 0x1061e4c: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-L_1061e40:
-// 0x01061e40: 0x1061e40: jal   0x100405c addiu s0, s0, -1
+L_1061e50:
+// 0x01061e50: 0x1061e50: jal   0x100405c addiu s0, s0, -1
 	ldloc 7
 	ldc.i4.m1
 	add
@@ -548,57 +548,57 @@ L_1061e40:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061e48: 0x1061e48: sltiu v1, s0, 5
+// 0x01061e58: 0x1061e58: sltiu v1, s0, 5
 	ldloc 7
 	ldc.i4.5
 	clt.un
 	stloc 6
-// 0x01061e4c: 0x1061e4c: bne   v1, zero, 0x1061e64 lui   v1, 0x20000
+// 0x01061e5c: 0x1061e5c: bne   v1, zero, 0x1061e74 lui   v1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brtrue L_1061e64
+	brtrue L_1061e74
 // --- basic block ---
-// 0x01061e54: 0x1061e54: lui   v1, 0x20000
+// 0x01061e64: 0x1061e64: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01061e58: 0x1061e58: lw    s0, 23648(v1)
+// 0x01061e68: 0x1061e68: lw    s0, 24108(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 5912
+	ldc.i4 6027
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061e5c: 0x1061e5c: j	 0x1061e74 sll   zero, zero, 0
-	br L_1061e74
+// 0x01061e6c: 0x1061e6c: j	 0x1061e84 sll   zero, zero, 0
+	br L_1061e84
 // --- basic block ---
-L_1061e64:
-// 0x01061e64: 0x1061e64: sll   s0, s0, 2
+L_1061e74:
+// 0x01061e74: 0x1061e74: sll   s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01061e68: 0x1061e68: addiu v1, v1, 28636
+// 0x01061e78: 0x1061e78: addiu v1, v1, 29100
 	ldloc 6
-	ldc.i4 28636
+	ldc.i4 29100
 	add
 	stloc 6
-// 0x01061e6c: 0x1061e6c: addu  s0, s0, v1
+// 0x01061e7c: 0x1061e7c: addu  s0, s0, v1
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x01061e70: 0x1061e70: lw    s0, 0(s0)
+// 0x01061e80: 0x1061e80: lw    s0, 0(s0)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-L_1061e74:
-// 0x01061e74: 0x1061e74: jal   0x1007eb8 addu  a0, v0, s2
+L_1061e84:
+// 0x01061e84: 0x1061e84: jal   0x1007ec8 addu  a0, v0, s2
 	ldloc 5
 	ldloc 9
 	add
@@ -608,40 +608,40 @@ L_1061e74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_cm_1007eb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_cm_1007ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061e7c: 0x1061e7c: addiu a0, zero, 100
+// 0x01061e8c: 0x1061e8c: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x01061e80: 0x1061e80: div   v0, a0
+// 0x01061e90: 0x1061e90: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 12
-// 0x01061e84: 0x1061e84: mflo  lo
+// 0x01061e94: 0x1061e94: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x01061e88: 0x1061e88: jal   0x10c09ac sll   zero, zero, 0
+// 0x01061e98: 0x1061e98: jal   0x10c0fec sll   zero, zero, 0
 	ldloc.1
 	conv.r4
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01061e90: 0x1061e90: addu  a0, v0, zero
+// 0x01061ea0: 0x1061ea0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01061e94: 0x1061e94: jal   0x10c07d8 addu  a1, s0, zero
+// 0x01061ea4: 0x1061ea4: jal   0x10c0e18 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01061e9c: 0x1061e9c: jal   0x10c08bc addu  a0, v0, zero
+// 0x01061eac: 0x1061eac: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -649,13 +649,13 @@ L_1061e74:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01061ea4: 0x1061ea4: lw    ra, 36(sp)
-// 0x01061ea8: 0x1061ea8: addiu v0, v0, 1
+// 0x01061eb4: 0x1061eb4: lw    ra, 36(sp)
+// 0x01061eb8: 0x1061eb8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01061eac: 0x1061eac: lw    s2, 32(sp)
+// 0x01061ebc: 0x1061ebc: lw    s2, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -664,7 +664,7 @@ L_1061e74:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01061eb0: 0x1061eb0: lw    s1, 28(sp)
+// 0x01061ec0: 0x1061ec0: lw    s1, 28(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -673,7 +673,7 @@ L_1061e74:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01061eb4: 0x1061eb4: lw    s0, 24(sp)
+// 0x01061ec4: 0x1061ec4: lw    s0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -682,7 +682,7 @@ L_1061e74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01061eb8: 0x1061eb8: jr    ra addiu sp, sp, 40
+// 0x01061ec8: 0x1061ec8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -694,7 +694,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 T_82_1061ec0(int32,int32,int32,int32,int32)
+.method public static int32 T_82_1061ed0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -729,33 +729,33 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061ec0: 0x1061ec0: lui   a0, 0x0
+// 0x01061ed0: 0x1061ed0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01061ec4: 0x1061ec4: addiu sp, sp, -40
+// 0x01061ed4: 0x1061ed4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01061ec8: 0x1061ec8: addiu a0, a0, 32124
+// 0x01061ed8: 0x1061ed8: addiu a0, a0, 32124
 	ldloc.1
 	ldc.i4 32124
 	add
 	stloc.1
-// 0x01061ecc: 0x1061ecc: addu  a1, zero, zero
+// 0x01061edc: 0x1061edc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01061ed0: 0x1061ed0: addiu a2, zero, -2
+// 0x01061ee0: 0x1061ee0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01061ed4: 0x1061ed4: addiu a3, zero, 1
+// 0x01061ee4: 0x1061ee4: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01061ed8: 0x1061ed8: addiu v0, zero, 136
+// 0x01061ee8: 0x1061ee8: addiu v0, zero, 136
 	ldc.i4 136
 	stloc 5
-// 0x01061edc: 0x1061edc: sw    ra, 36(sp)
-// 0x01061ee0: 0x1061ee0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01061eec: 0x1061eec: sw    ra, 36(sp)
+// 0x01061ef0: 0x1061ef0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -769,21 +769,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01061ee8: 0x1061ee8: addu  a0, v0, zero
+// 0x01061ef8: 0x1061ef8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01061eec: 0x1061eec: addu  a1, zero, zero
+// 0x01061efc: 0x1061efc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01061ef0: 0x1061ef0: addu  a2, zero, zero
+// 0x01061f00: 0x1061f00: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01061ef4: 0x1061ef4: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01061f04: 0x1061f04: jal   0x1099628 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -795,10 +795,10 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01061efc: 0x1061efc: lw    ra, 36(sp)
-// 0x01061f00: 0x1061f00: lw    v0, 24(sp)
+// 0x01061f0c: 0x1061f0c: lw    ra, 36(sp)
+// 0x01061f10: 0x1061f10: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -807,7 +807,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01061f04: 0x1061f04: jr    ra addiu sp, sp, 40
+// 0x01061f14: 0x1061f14: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -819,7 +819,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 cost_preferences_1061f0c(int32,int32,int32,int32,int32)
+.method public static int32 cost_preferences_1061f1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s5,int32 s1,int32 s2,int32 s7,int32 s4,int32 s0,int32 s3,int32 t1,int32 t0,int32 s6,int32 lo,int32 t2,int32 s8,int32 ra)
@@ -893,12 +893,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01061f0c: 0x1061f0c: addiu sp, sp, -88
+// 0x01061f1c: 0x1061f1c: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01061f10: 0x1061f10: sw    s0, 48(sp)
+// 0x01061f20: 0x1061f20: sw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -907,19 +907,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01061f14: 0x1061f14: lui   s0, 0x10000
+// 0x01061f24: 0x1061f24: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x01061f18: 0x1061f18: addiu a0, s0, 13004
+// 0x01061f28: 0x1061f28: addiu a0, s0, 13000
 	ldloc 13
-	ldc.i4 13004
+	ldc.i4 13000
 	add
 	stloc.1
-// 0x01061f1c: 0x1061f1c: addu  a1, zero, zero
+// 0x01061f2c: 0x1061f2c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01061f20: 0x1061f20: sw    ra, 84(sp)
-// 0x01061f24: 0x1061f24: sw    s8, 80(sp)
+// 0x01061f30: 0x1061f30: sw    ra, 84(sp)
+// 0x01061f34: 0x1061f34: sw    s8, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -928,7 +928,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x01061f28: 0x1061f28: sw    s7, 76(sp)
+// 0x01061f38: 0x1061f38: sw    s7, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -937,7 +937,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01061f2c: 0x1061f2c: sw    s6, 72(sp)
+// 0x01061f3c: 0x1061f3c: sw    s6, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -946,7 +946,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01061f30: 0x1061f30: sw    s5, 68(sp)
+// 0x01061f40: 0x1061f40: sw    s5, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -955,7 +955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01061f34: 0x1061f34: sw    s4, 64(sp)
+// 0x01061f44: 0x1061f44: sw    s4, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -964,7 +964,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01061f38: 0x1061f38: sw    s3, 60(sp)
+// 0x01061f48: 0x1061f48: sw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -973,7 +973,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01061f3c: 0x1061f3c: sw    s2, 56(sp)
+// 0x01061f4c: 0x1061f4c: sw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -982,7 +982,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01061f40: 0x1061f40: jal   0x1095eec sw    s1, 52(sp)
+// 0x01061f50: 0x1061f50: jal   0x1096534 sw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -996,23 +996,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061f48: 0x1061f48: bne   v0, zero, 0x10627d4 lui   v0, 0x70000
+// 0x01061f58: 0x1061f58: bne   v0, zero, 0x10627e4 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_10627d4
+	brtrue L_10627e4
 // --- basic block ---
-// 0x01061f50: 0x1061f50: lui   a0, 0x10000
+// 0x01061f60: 0x1061f60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01061f54: 0x1061f54: jal   0x101cd60 addiu a0, a0, 12864
+// 0x01061f64: 0x1061f64: jal   0x101cd70 addiu a0, a0, 12860
 	ldloc.1
-	ldc.i4 12864
+	ldc.i4 12860
 	add
 	stloc.1
 	ldloc.0
@@ -1020,28 +1020,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061f5c: 0x1061f5c: lui   a2, 0x1060000
+// 0x01061f6c: 0x1061f6c: lui   a2, 0x1060000
 	ldc.i4 17170432
 	stloc.3
-// 0x01061f60: 0x1061f60: addiu a0, s0, 13004
+// 0x01061f70: 0x1061f70: addiu a0, s0, 13000
 	ldloc 13
-	ldc.i4 13004
+	ldc.i4 13000
 	add
 	stloc.1
-// 0x01061f64: 0x1061f64: addu  a1, v0, zero
+// 0x01061f74: 0x1061f74: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01061f68: 0x1061f68: addiu a2, a2, 6308
+// 0x01061f78: 0x1061f78: addiu a2, a2, 6324
 	ldloc.3
-	ldc.i4 6308
+	ldc.i4 6324
 	add
 	stloc.3
-// 0x01061f6c: 0x1061f6c: jal   0x1095a08 addiu a3, zero, 8192
+// 0x01061f7c: 0x1061f7c: jal   0x1096050 addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
 	ldloc.0
@@ -1049,58 +1049,58 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061f74: 0x1061f74: addu  s0, v0, zero
+// 0x01061f84: 0x1061f84: addu  s0, v0, zero
 	ldloc 5
 	stloc 13
-// 0x01061f78: 0x1061f78: lui   v0, 0x70000
+// 0x01061f88: 0x1061f88: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01061f7c: 0x1061f7c: lw    v1, 12768(v0)
+// 0x01061f8c: 0x1061f8c: lw    v1, 13232(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldelem.i4
 	stloc 6
-// 0x01061f80: 0x1061f80: sll   zero, zero, 0
-// 0x01061f84: 0x1061f84: bne   v1, zero, 0x1062064 lui   t0, 0x20000
+// 0x01061f90: 0x1061f90: sll   zero, zero, 0
+// 0x01061f94: 0x1061f94: bne   v1, zero, 0x1062074 lui   t0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 16
-	brtrue L_1062064
+	brtrue L_1062074
 // --- basic block ---
-// 0x01061f8c: 0x1061f8c: lui   v1, 0x0
+// 0x01061f9c: 0x1061f9c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01061f90: 0x1061f90: lui   a1, 0x0
+// 0x01061fa0: 0x1061fa0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01061f94: 0x1061f94: addiu v1, v1, 32116
+// 0x01061fa4: 0x1061fa4: addiu v1, v1, 32116
 	ldloc 6
 	ldc.i4 32116
 	add
 	stloc 6
-// 0x01061f98: 0x1061f98: addiu s1, v0, 12768
+// 0x01061fa8: 0x1061fa8: addiu s1, v0, 13232
 	ldloc 5
-	ldc.i4 12768
+	ldc.i4 13232
 	add
 	stloc 9
-// 0x01061f9c: 0x1061f9c: addiu a1, a1, 32120
+// 0x01061fac: 0x1061fac: addiu a1, a1, 32120
 	ldloc.2
 	ldc.i4 32120
 	add
 	stloc.2
-// 0x01061fa0: 0x1061fa0: addu  a0, v1, zero
+// 0x01061fb0: 0x1061fb0: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01061fa4: 0x1061fa4: sw    a1, 4(s1)
+// 0x01061fb4: 0x1061fb4: sw    a1, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1109,12 +1109,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01061fa8: 0x1061fa8: jal   0x101cd60 sw    v1, 12768(v0)
+// 0x01061fb8: 0x1061fb8: jal   0x101cd70 sw    v1, 13232(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldloc 6
 	stelem.i4
@@ -1123,12 +1123,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061fb0: 0x1061fb0: lw    a0, 4(s1)
+// 0x01061fc0: 0x1061fc0: lw    a0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1137,15 +1137,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061fb4: 0x1061fb4: lui   s2, 0x70000
+// 0x01061fc4: 0x1061fc4: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x01061fb8: 0x1061fb8: jal   0x101cd60 sw    v0, 12760(s2)
+// 0x01061fc8: 0x1061fc8: jal   0x101cd70 sw    v0, 13224(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3190
+	ldc.i4 3306
 	add
 	ldloc 5
 	stelem.i4
@@ -1154,20 +1154,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061fc0: 0x1061fc0: addiu s2, s2, 12760
+// 0x01061fd0: 0x1061fd0: addiu s2, s2, 13224
 	ldloc 10
-	ldc.i4 12760
+	ldc.i4 13224
 	add
 	stloc 10
-// 0x01061fc4: 0x1061fc4: lui   v1, 0x70000
+// 0x01061fd4: 0x1061fd4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01061fc8: 0x1061fc8: sw    v0, 4(s2)
+// 0x01061fd8: 0x1061fd8: sw    v0, 4(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -1176,31 +1176,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061fcc: 0x1061fcc: lui   a1, 0x10000
+// 0x01061fdc: 0x1061fdc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01061fd0: 0x1061fd0: lui   v0, 0x10000
+// 0x01061fe0: 0x1061fe0: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01061fd4: 0x1061fd4: addiu s1, v1, 12784
+// 0x01061fe4: 0x1061fe4: addiu s1, v1, 13248
 	ldloc 6
-	ldc.i4 12784
+	ldc.i4 13248
 	add
 	stloc 9
-// 0x01061fd8: 0x1061fd8: addiu a1, a1, 12800
+// 0x01061fe8: 0x1061fe8: addiu a1, a1, 12796
 	ldloc.2
-	ldc.i4 12800
+	ldc.i4 12796
 	add
 	stloc.2
-// 0x01061fdc: 0x1061fdc: addiu v0, v0, 12828
+// 0x01061fec: 0x1061fec: addiu v0, v0, 12824
 	ldloc 5
-	ldc.i4 12828
+	ldc.i4 12824
 	add
 	stloc 5
-// 0x01061fe0: 0x1061fe0: addu  a0, a1, zero
+// 0x01061ff0: 0x1061ff0: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01061fe4: 0x1061fe4: sw    v0, 4(s1)
+// 0x01061ff4: 0x1061ff4: sw    v0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1209,12 +1209,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01061fe8: 0x1061fe8: jal   0x101cd60 sw    a1, 12784(v1)
+// 0x01061ff8: 0x1061ff8: jal   0x101cd70 sw    a1, 13248(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3196
+	ldc.i4 3312
 	add
 	ldloc.2
 	stelem.i4
@@ -1223,12 +1223,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01061ff0: 0x1061ff0: lw    a0, 4(s1)
+// 0x01062000: 0x1062000: lw    a0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1237,15 +1237,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01061ff4: 0x1061ff4: lui   s2, 0x70000
+// 0x01062004: 0x1062004: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x01061ff8: 0x1061ff8: jal   0x101cd60 sw    v0, 12776(s2)
+// 0x01062008: 0x1062008: jal   0x101cd70 sw    v0, 13240(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3194
+	ldc.i4 3310
 	add
 	ldloc 5
 	stelem.i4
@@ -1254,20 +1254,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062000: 0x1062000: addiu s2, s2, 12776
+// 0x01062010: 0x1062010: addiu s2, s2, 13240
 	ldloc 10
-	ldc.i4 12776
+	ldc.i4 13240
 	add
 	stloc 10
-// 0x01062004: 0x1062004: lui   v1, 0x70000
+// 0x01062014: 0x1062014: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01062008: 0x1062008: sw    v0, 4(s2)
+// 0x01062018: 0x1062018: sw    v0, 4(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -1276,20 +1276,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106200c: 0x106200c: lui   v0, 0x10000
+// 0x0106201c: 0x106201c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01062010: 0x1062010: addiu s1, v1, 12804
+// 0x01062020: 0x1062020: addiu s1, v1, 13268
 	ldloc 6
-	ldc.i4 12804
+	ldc.i4 13268
 	add
 	stloc 9
-// 0x01062014: 0x1062014: addiu v0, v0, 12816
+// 0x01062024: 0x1062024: addiu v0, v0, 12812
 	ldloc 5
-	ldc.i4 12816
+	ldc.i4 12812
 	add
 	stloc 5
-// 0x01062018: 0x1062018: sw    v0, 4(s1)
+// 0x01062028: 0x1062028: sw    v0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1298,26 +1298,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106201c: 0x106201c: lui   a1, 0x10000
+// 0x0106202c: 0x106202c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01062020: 0x1062020: lui   v0, 0x10000
+// 0x01062030: 0x1062030: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01062024: 0x1062024: addiu a1, a1, 12808
+// 0x01062034: 0x1062034: addiu a1, a1, 12804
 	ldloc.2
-	ldc.i4 12808
+	ldc.i4 12804
 	add
 	stloc.2
-// 0x01062028: 0x1062028: addiu v0, v0, 12840
+// 0x01062038: 0x1062038: addiu v0, v0, 12836
 	ldloc 5
-	ldc.i4 12840
+	ldc.i4 12836
 	add
 	stloc 5
-// 0x0106202c: 0x106202c: addu  a0, a1, zero
+// 0x0106203c: 0x106203c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01062030: 0x1062030: sw    v0, 8(s1)
+// 0x01062040: 0x1062040: sw    v0, 8(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1326,12 +1326,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062034: 0x1062034: jal   0x101cd60 sw    a1, 12804(v1)
+// 0x01062044: 0x1062044: jal   0x101cd70 sw    a1, 13268(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3201
+	ldc.i4 3317
 	add
 	ldloc.2
 	stelem.i4
@@ -1340,12 +1340,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106203c: 0x106203c: lw    a0, 4(s1)
+// 0x0106204c: 0x106204c: lw    a0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1354,15 +1354,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062040: 0x1062040: lui   s2, 0x70000
+// 0x01062050: 0x1062050: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x01062044: 0x1062044: jal   0x101cd60 sw    v0, 12792(s2)
+// 0x01062054: 0x1062054: jal   0x101cd70 sw    v0, 13256(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3198
+	ldc.i4 3314
 	add
 	ldloc 5
 	stelem.i4
@@ -1371,12 +1371,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106204c: 0x106204c: lw    a0, 8(s1)
+// 0x0106205c: 0x106205c: lw    a0, 8(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1385,12 +1385,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062050: 0x1062050: addiu s1, s2, 12792
+// 0x01062060: 0x1062060: addiu s1, s2, 13256
 	ldloc 10
-	ldc.i4 12792
+	ldc.i4 13256
 	add
 	stloc 9
-// 0x01062054: 0x1062054: jal   0x101cd60 sw    v0, 4(s1)
+// 0x01062064: 0x1062064: jal   0x101cd70 sw    v0, 4(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1404,12 +1404,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106205c: 0x106205c: sw    v0, 8(s1)
+// 0x0106206c: 0x106206c: sw    v0, 8(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1418,33 +1418,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062060: 0x1062060: lui   t0, 0x20000
+// 0x01062070: 0x1062070: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 16
-L_1062064:
-// 0x01062064: 0x1062064: lui   t1, 0x41000000
+L_1062074:
+// 0x01062074: 0x1062074: lui   t1, 0x41000000
 	ldc.i4 1090519040
 	stloc 15
-// 0x01062068: 0x1062068: ori   t1, t1, 20616
+// 0x01062078: 0x1062078: ori   t1, t1, 20616
 	ldloc 15
 	ldc.i4 20616
 	or
 	stloc 15
-// 0x0106206c: 0x106206c: addiu a0, t0, 1288
+// 0x0106207c: 0x106207c: addiu a0, t0, 1752
 	ldloc 16
-	ldc.i4 1288
+	ldc.i4 1752
 	add
 	stloc.1
-// 0x01062070: 0x1062070: addu  a1, zero, zero
+// 0x01062080: 0x1062080: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01062074: 0x1062074: addiu a2, zero, -2
+// 0x01062084: 0x1062084: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01062078: 0x1062078: addiu a3, zero, -1
+// 0x01062088: 0x1062088: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0106207c: 0x106207c: sw    t1, 16(sp)
+// 0x0106208c: 0x106208c: sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1453,7 +1453,7 @@ L_1062064:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01062080: 0x1062080: sw    t0, 40(sp)
+// 0x01062090: 0x1062090: sw    t0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1462,7 +1462,7 @@ L_1062064:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01062084: 0x1062084: sw    t1, 36(sp)
+// 0x01062094: 0x1062094: sw    t1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1471,7 +1471,7 @@ L_1062064:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01062088: 0x1062088: jal   0x1093a24 lui   s3, 0x100000
+// 0x01062098: 0x1062098: jal   0x1094048 lui   s3, 0x100000
 	ldc.i4 1048576
 	stloc 14
 	ldloc.0
@@ -1479,43 +1479,43 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062090: 0x1062090: lui   a0, 0x10000
+// 0x010620a0: 0x10620a0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062094: 0x1062094: ori   s3, s3, 136
+// 0x010620a4: 0x10620a4: ori   s3, s3, 136
 	ldloc 14
 	ldc.i4 136
 	or
 	stloc 14
-// 0x01062098: 0x1062098: addiu a3, zero, -1
+// 0x010620a8: 0x10620a8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0106209c: 0x106209c: addiu a0, a0, 13016
+// 0x010620ac: 0x10620ac: addiu a0, a0, 13012
 	ldloc.1
-	ldc.i4 13016
+	ldc.i4 13012
 	add
 	stloc.1
-// 0x010620a0: 0x10620a0: addu  a1, zero, zero
+// 0x010620b0: 0x10620b0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010620a4: 0x10620a4: addiu a2, zero, -2
+// 0x010620b4: 0x10620b4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010620a8: 0x10620a8: addu  s7, v0, zero
+// 0x010620b8: 0x10620b8: addu  s7, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010620ac: 0x10620ac: lui   s2, 0x0
+// 0x010620bc: 0x10620bc: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x010620b0: 0x10620b0: lui   s1, 0x0
+// 0x010620c0: 0x10620c0: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010620b4: 0x10620b4: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010620c4: 0x10620c4: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1529,38 +1529,38 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010620bc: 0x10620bc: addu  a0, v0, zero
+// 0x010620cc: 0x10620cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010620c0: 0x10620c0: addiu a1, s2, 31980
+// 0x010620d0: 0x10620d0: addiu a1, s2, 31980
 	ldloc 10
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010620c4: 0x10620c4: addiu a2, s1, 23008
+// 0x010620d4: 0x10620d4: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010620c8: 0x10620c8: lui   s4, 0x10000
+// 0x010620d8: 0x10620d8: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x010620cc: 0x10620cc: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010620dc: 0x10620dc: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010620d4: 0x10620d4: jal   0x101cd60 addiu a0, s4, 13028
+// 0x010620e4: 0x10620e4: jal   0x101cd70 addiu a0, s4, 13024
 	ldloc 12
-	ldc.i4 13028
+	ldc.i4 13024
 	add
 	stloc.1
 	ldloc.0
@@ -1568,26 +1568,26 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010620dc: 0x10620dc: lui   a0, 0x10000
+// 0x010620ec: 0x10620ec: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010620e0: 0x10620e0: addiu a2, zero, -1
+// 0x010620f0: 0x10620f0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010620e4: 0x10620e4: addiu a3, zero, 4240
+// 0x010620f4: 0x10620f4: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010620e8: 0x10620e8: addiu a0, a0, 13048
+// 0x010620f8: 0x10620f8: addiu a0, a0, 13044
 	ldloc.1
-	ldc.i4 13048
+	ldc.i4 13044
 	add
 	stloc.1
-// 0x010620ec: 0x10620ec: jal   0x1098d10 addu  a1, v0, zero
+// 0x010620fc: 0x10620fc: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1595,27 +1595,27 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010620f4: 0x10620f4: addu  a1, v0, zero
+// 0x01062104: 0x1062104: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010620f8: 0x10620f8: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01062108: 0x1062108: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062100: 0x1062100: jal   0x101cd60 addiu a0, s4, 13028
+// 0x01062110: 0x1062110: jal   0x101cd70 addiu a0, s4, 13024
 	ldloc 12
-	ldc.i4 13028
+	ldc.i4 13024
 	add
 	stloc.1
 	ldloc.0
@@ -1623,45 +1623,45 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062108: 0x1062108: addu  a1, v0, zero
+// 0x01062118: 0x1062118: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106210c: 0x106210c: lui   a3, 0x70000
+// 0x0106211c: 0x106211c: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01062110: 0x1062110: lui   a0, 0x20000
+// 0x01062120: 0x1062120: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01062114: 0x1062114: lui   v0, 0x70000
+// 0x01062124: 0x1062124: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01062118: 0x1062118: addiu a3, a3, 12776
+// 0x01062128: 0x1062128: addiu a3, a3, 13240
 	ldloc 4
-	ldc.i4 12776
+	ldc.i4 13240
 	add
 	stloc 4
-// 0x0106211c: 0x106211c: addiu a2, zero, 2
+// 0x0106212c: 0x106212c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01062120: 0x1062120: addiu s4, zero, 2
+// 0x01062130: 0x1062130: addiu s4, zero, 2
 	ldc.i4.2
 	stloc 12
-// 0x01062124: 0x1062124: addiu a0, a0, -11180
+// 0x01062134: 0x1062134: addiu a0, a0, -10716
 	ldloc.1
-	ldc.i4 -11180
+	ldc.i4 -10716
 	add
 	stloc.1
-// 0x01062128: 0x1062128: addiu v0, v0, 12784
+// 0x01062138: 0x1062138: addiu v0, v0, 13248
 	ldloc 5
-	ldc.i4 12784
+	ldc.i4 13248
 	add
 	stloc 5
-// 0x0106212c: 0x106212c: sw    s4, 20(sp)
+// 0x0106213c: 0x106213c: sw    s4, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1670,7 +1670,7 @@ L_1062064:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01062130: 0x1062130: sw    v0, 16(sp)
+// 0x01062140: 0x1062140: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1679,7 +1679,7 @@ L_1062064:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062134: 0x1062134: jal   0x10929e0 sw    zero, 24(sp)
+// 0x01062144: 0x1062144: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1693,25 +1693,25 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106213c: 0x106213c: addu  a1, v0, zero
+// 0x0106214c: 0x106214c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062140: 0x1062140: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01062150: 0x1062150: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062148: 0x1062148: jal   0x1061ec0 lui   s6, 0x0
+// 0x01062158: 0x1062158: jal   0x1061ed0 lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 17
 	ldloc.0
@@ -1719,30 +1719,30 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::T_82_1061ec0(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::T_82_1061ed0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062150: 0x1062150: addu  a1, v0, zero
+// 0x01062160: 0x1062160: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062154: 0x1062154: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01062164: 0x1062164: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106215c: 0x106215c: addiu a0, s6, 32244
+// 0x0106216c: 0x106216c: addiu a0, s6, 32244
 	ldloc 17
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01062160: 0x1062160: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01062170: 0x1062170: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -1750,55 +1750,55 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062168: 0x1062168: addu  a1, v0, zero
+// 0x01062178: 0x1062178: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106216c: 0x106216c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106217c: 0x106217c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062174: 0x1062174: addu  a0, s7, zero
+// 0x01062184: 0x1062184: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x01062178: 0x1062178: jal   0x1098ec4 addu  a1, s5, zero
+// 0x01062188: 0x1062188: jal   0x109950c addu  a1, s5, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062180: 0x1062180: lui   a0, 0x10000
+// 0x01062190: 0x1062190: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062184: 0x1062184: addiu a3, zero, -1
+// 0x01062194: 0x1062194: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01062188: 0x1062188: addiu a0, a0, 13060
+// 0x01062198: 0x1062198: addiu a0, a0, 13056
 	ldloc.1
-	ldc.i4 13060
+	ldc.i4 13056
 	add
 	stloc.1
-// 0x0106218c: 0x106218c: addu  a1, zero, zero
+// 0x0106219c: 0x106219c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01062190: 0x1062190: addiu a2, zero, -2
+// 0x010621a0: 0x10621a0: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01062194: 0x1062194: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010621a4: 0x10621a4: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1812,31 +1812,31 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106219c: 0x106219c: addu  a0, v0, zero
+// 0x010621ac: 0x10621ac: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010621a0: 0x10621a0: lui   v1, 0xf0000
+// 0x010621b0: 0x10621b0: lui   v1, 0xf0000
 	ldc.i4 983040
 	stloc 6
-// 0x010621a4: 0x10621a4: addiu a1, s2, 31980
+// 0x010621b4: 0x10621b4: addiu a1, s2, 31980
 	ldloc 10
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010621a8: 0x10621a8: addiu a2, s1, 23008
+// 0x010621b8: 0x10621b8: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010621ac: 0x10621ac: addu  s5, v0, zero
+// 0x010621bc: 0x10621bc: addu  s5, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010621b0: 0x10621b0: jal   0x1098fe0 sw    v1, 44(sp)
+// 0x010621c0: 0x10621c0: jal   0x1099628 sw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1848,9 +1848,9 @@ L_1062064:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010621b8: 0x10621b8: lw    v1, 44(sp)
+// 0x010621c8: 0x10621c8: lw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1859,41 +1859,41 @@ L_1062064:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010621bc: 0x10621bc: addiu v0, zero, 3
+// 0x010621cc: 0x10621cc: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010621c0: 0x10621c0: lw    a2, -30068(v1)
+// 0x010621d0: 0x10621d0: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010621c4: 0x10621c4: lui   a0, 0x10000
+// 0x010621d4: 0x10621d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010621c8: 0x10621c8: div   a2, v0
+// 0x010621d8: 0x10621d8: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 18
-// 0x010621cc: 0x10621cc: addiu t2, zero, 16
+// 0x010621dc: 0x10621dc: addiu t2, zero, 16
 	ldc.i4.s 16
 	stloc 19
-// 0x010621d0: 0x10621d0: addiu a3, zero, -1
+// 0x010621e0: 0x10621e0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010621d4: 0x10621d4: addiu a0, a0, -32632
+// 0x010621e4: 0x10621e4: addiu a0, a0, -32632
 	ldloc.1
 	ldc.i4 -32632
 	add
 	stloc.1
-// 0x010621d8: 0x10621d8: addu  a1, zero, zero
+// 0x010621e8: 0x10621e8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010621dc: 0x10621dc: sw    t2, 16(sp)
+// 0x010621ec: 0x10621ec: sw    t2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1902,10 +1902,10 @@ L_1062064:
 	add
 	ldloc 19
 	stelem.i4
-// 0x010621e0: 0x10621e0: mflo  lo
+// 0x010621f0: 0x10621f0: mflo  lo
 	ldloc 18
 	stloc.3
-// 0x010621e4: 0x10621e4: jal   0x1093a24 sw    t2, 32(sp)
+// 0x010621f4: 0x10621f4: jal   0x1094048 sw    t2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1919,34 +1919,34 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010621ec: 0x10621ec: addu  a0, v0, zero
+// 0x010621fc: 0x10621fc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010621f0: 0x10621f0: addu  a1, zero, zero
+// 0x01062200: 0x1062200: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010621f4: 0x10621f4: addu  a2, zero, zero
+// 0x01062204: 0x1062204: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010621f8: 0x10621f8: jal   0x1098fe0 addu  s8, v0, zero
+// 0x01062208: 0x1062208: jal   0x1099628 addu  s8, v0, zero
 	ldloc 5
 	stloc 20
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01062200: 0x1062200: lui   v0, 0x10000
+// 0x01062210: 0x1062210: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01062204: 0x1062204: jal   0x101cd60 addiu a0, v0, 13080
+// 0x01062214: 0x1062214: jal   0x101cd70 addiu a0, v0, 13076
 	ldloc 5
-	ldc.i4 13080
+	ldc.i4 13076
 	add
 	stloc.1
 	ldloc.0
@@ -1954,26 +1954,26 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106220c: 0x106220c: lui   a0, 0x10000
+// 0x0106221c: 0x106221c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062210: 0x1062210: addiu a2, zero, -1
+// 0x01062220: 0x1062220: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01062214: 0x1062214: addiu a3, zero, 4240
+// 0x01062224: 0x1062224: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01062218: 0x1062218: addiu a0, a0, 13092
+// 0x01062228: 0x1062228: addiu a0, a0, 13088
 	ldloc.1
-	ldc.i4 13092
+	ldc.i4 13088
 	add
 	stloc.1
-// 0x0106221c: 0x106221c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0106222c: 0x106222c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1981,43 +1981,43 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062224: 0x1062224: addu  a1, v0, zero
+// 0x01062234: 0x1062234: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062228: 0x1062228: jal   0x1098ec4 addu  a0, s8, zero
+// 0x01062238: 0x1062238: jal   0x109950c addu  a0, s8, zero
 	ldloc 20
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062230: 0x1062230: addu  a0, s5, zero
+// 0x01062240: 0x1062240: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x01062234: 0x1062234: jal   0x1098ec4 addu  a1, s8, zero
+// 0x01062244: 0x1062244: jal   0x109950c addu  a1, s8, zero
 	ldloc 20
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106223c: 0x106223c: lui   v0, 0x10000
+// 0x0106224c: 0x106224c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01062240: 0x1062240: jal   0x101cd60 addiu a0, v0, 13080
+// 0x01062250: 0x1062250: jal   0x101cd70 addiu a0, v0, 13076
 	ldloc 5
-	ldc.i4 13080
+	ldc.i4 13076
 	add
 	stloc.1
 	ldloc.0
@@ -2025,42 +2025,42 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062248: 0x1062248: addu  a1, v0, zero
+// 0x01062258: 0x1062258: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106224c: 0x106224c: lui   a3, 0x70000
+// 0x0106225c: 0x106225c: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01062250: 0x1062250: lui   a0, 0x10000
+// 0x01062260: 0x1062260: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062254: 0x1062254: lui   v0, 0x70000
+// 0x01062264: 0x1062264: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01062258: 0x1062258: addiu a3, a3, 12792
+// 0x01062268: 0x1062268: addiu a3, a3, 13256
 	ldloc 4
-	ldc.i4 12792
+	ldc.i4 13256
 	add
 	stloc 4
-// 0x0106225c: 0x106225c: addiu a2, zero, 3
+// 0x0106226c: 0x106226c: addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
-// 0x01062260: 0x1062260: addiu a0, a0, 12992
+// 0x01062270: 0x1062270: addiu a0, a0, 12988
 	ldloc.1
-	ldc.i4 12992
+	ldc.i4 12988
 	add
 	stloc.1
-// 0x01062264: 0x1062264: addiu v0, v0, 12804
+// 0x01062274: 0x1062274: addiu v0, v0, 13268
 	ldloc 5
-	ldc.i4 12804
+	ldc.i4 13268
 	add
 	stloc 5
-// 0x01062268: 0x1062268: sw    s4, 20(sp)
+// 0x01062278: 0x1062278: sw    s4, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2069,7 +2069,7 @@ L_1062064:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0106226c: 0x106226c: sw    v0, 16(sp)
+// 0x0106227c: 0x106227c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2078,7 +2078,7 @@ L_1062064:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062270: 0x1062270: jal   0x10929e0 sw    zero, 24(sp)
+// 0x01062280: 0x1062280: jal   0x1093004 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2092,51 +2092,51 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_choice_new_10929e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_choice_new_1093004(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062278: 0x1062278: addu  a1, v0, zero
+// 0x01062288: 0x1062288: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106227c: 0x106227c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106228c: 0x106228c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062284: 0x1062284: addu  a0, s7, zero
+// 0x01062294: 0x1062294: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x01062288: 0x1062288: jal   0x1098ec4 addu  a1, s5, zero
+// 0x01062298: 0x1062298: jal   0x109950c addu  a1, s5, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062290: 0x1062290: addu  a1, s7, zero
+// 0x010622a0: 0x10622a0: addu  a1, s7, zero
 	ldloc 11
 	stloc.2
-// 0x01062294: 0x1062294: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010622a4: 0x10622a4: jal   0x109950c addu  a0, s0, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106229c: 0x106229c: lw    t0, 40(sp)
+// 0x010622ac: 0x10622ac: lw    t0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2145,7 +2145,7 @@ L_1062064:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010622a0: 0x10622a0: lw    t1, 36(sp)
+// 0x010622b0: 0x10622b0: lw    t1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2154,21 +2154,21 @@ L_1062064:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010622a4: 0x10622a4: addiu a0, t0, 1288
+// 0x010622b4: 0x10622b4: addiu a0, t0, 1752
 	ldloc 16
-	ldc.i4 1288
+	ldc.i4 1752
 	add
 	stloc.1
-// 0x010622a8: 0x10622a8: addu  a1, zero, zero
+// 0x010622b8: 0x10622b8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010622ac: 0x10622ac: addiu a2, zero, -2
+// 0x010622bc: 0x10622bc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010622b0: 0x10622b0: addiu a3, zero, -1
+// 0x010622c0: 0x10622c0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010622b4: 0x10622b4: jal   0x1093a24 sw    t1, 16(sp)
+// 0x010622c4: 0x10622c4: jal   0x1094048 sw    t1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2182,32 +2182,32 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010622bc: 0x10622bc: lui   a0, 0x10000
+// 0x010622cc: 0x10622cc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010622c0: 0x10622c0: addiu a3, zero, -1
+// 0x010622d0: 0x10622d0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010622c4: 0x10622c4: addiu a0, a0, 13112
+// 0x010622d4: 0x10622d4: addiu a0, a0, 13108
 	ldloc.1
-	ldc.i4 13112
+	ldc.i4 13108
 	add
 	stloc.1
-// 0x010622c8: 0x10622c8: addu  a1, zero, zero
+// 0x010622d8: 0x10622d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010622cc: 0x10622cc: addiu a2, zero, -2
+// 0x010622dc: 0x10622dc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010622d0: 0x10622d0: addu  s7, v0, zero
+// 0x010622e0: 0x10622e0: addu  s7, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010622d4: 0x10622d4: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010622e4: 0x10622e4: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2221,38 +2221,38 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010622dc: 0x10622dc: addu  a0, v0, zero
+// 0x010622ec: 0x10622ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010622e0: 0x10622e0: addiu a1, s2, 31980
+// 0x010622f0: 0x10622f0: addiu a1, s2, 31980
 	ldloc 10
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010622e4: 0x10622e4: addiu a2, s1, 23008
+// 0x010622f4: 0x10622f4: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010622e8: 0x10622e8: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010622f8: 0x10622f8: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010622f0: 0x10622f0: lui   a0, 0x10000
+// 0x01062300: 0x1062300: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010622f4: 0x10622f4: jal   0x101cd60 addiu a0, a0, 13132
+// 0x01062304: 0x1062304: jal   0x101cd70 addiu a0, a0, 13128
 	ldloc.1
-	ldc.i4 13132
+	ldc.i4 13128
 	add
 	stloc.1
 	ldloc.0
@@ -2260,26 +2260,26 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010622fc: 0x10622fc: lui   a0, 0x10000
+// 0x0106230c: 0x106230c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062300: 0x1062300: addiu a2, zero, -1
+// 0x01062310: 0x1062310: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01062304: 0x1062304: addiu a3, zero, 4240
+// 0x01062314: 0x1062314: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01062308: 0x1062308: addiu a0, a0, 13148
+// 0x01062318: 0x1062318: addiu a0, a0, 13144
 	ldloc.1
-	ldc.i4 13148
+	ldc.i4 13144
 	add
 	stloc.1
-// 0x0106230c: 0x106230c: jal   0x1098d10 addu  a1, v0, zero
+// 0x0106231c: 0x106231c: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2287,42 +2287,42 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062314: 0x1062314: addu  a1, v0, zero
+// 0x01062324: 0x1062324: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062318: 0x1062318: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01062328: 0x1062328: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062320: 0x1062320: lui   a0, 0x10000
+// 0x01062330: 0x1062330: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062324: 0x1062324: addiu a2, zero, 2
+// 0x01062334: 0x1062334: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01062328: 0x1062328: addu  a3, zero, zero
+// 0x01062338: 0x1062338: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0106232c: 0x106232c: addiu a0, a0, 12980
+// 0x0106233c: 0x106233c: addiu a0, a0, 12976
 	ldloc.1
-	ldc.i4 12980
+	ldc.i4 12976
 	add
 	stloc.1
-// 0x01062330: 0x1062330: addu  a1, zero, zero
+// 0x01062340: 0x1062340: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01062334: 0x1062334: sw    zero, 16(sp)
+// 0x01062344: 0x1062344: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2331,7 +2331,7 @@ L_1062064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062338: 0x1062338: sw    zero, 20(sp)
+// 0x01062348: 0x1062348: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2340,7 +2340,7 @@ L_1062064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106233c: 0x106233c: jal   0x109c14c sw    zero, 24(sp)
+// 0x0106234c: 0x106234c: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2354,54 +2354,54 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062344: 0x1062344: addu  a1, v0, zero
+// 0x01062354: 0x1062354: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062348: 0x1062348: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01062358: 0x1062358: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062350: 0x1062350: jal   0x1061ec0 sll   zero, zero, 0
+// 0x01062360: 0x1062360: jal   0x1061ed0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::T_82_1061ec0(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::T_82_1061ed0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062358: 0x1062358: addu  a1, v0, zero
+// 0x01062368: 0x1062368: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106235c: 0x106235c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106236c: 0x106236c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062364: 0x1062364: addiu a0, s6, 32244
+// 0x01062374: 0x1062374: addiu a0, s6, 32244
 	ldloc 17
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01062368: 0x1062368: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01062378: 0x1062378: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -2409,55 +2409,55 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062370: 0x1062370: addu  a1, v0, zero
+// 0x01062380: 0x1062380: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062374: 0x1062374: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01062384: 0x1062384: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106237c: 0x106237c: addu  a1, s5, zero
+// 0x0106238c: 0x106238c: addu  a1, s5, zero
 	ldloc 8
 	stloc.2
-// 0x01062380: 0x1062380: jal   0x1098ec4 addu  a0, s7, zero
+// 0x01062390: 0x1062390: jal   0x109950c addu  a0, s7, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062388: 0x1062388: lui   a0, 0x10000
+// 0x01062398: 0x1062398: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0106238c: 0x106238c: addiu a3, zero, -1
+// 0x0106239c: 0x106239c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01062390: 0x1062390: addiu a0, a0, 13168
+// 0x010623a0: 0x10623a0: addiu a0, a0, 13164
 	ldloc.1
-	ldc.i4 13168
+	ldc.i4 13164
 	add
 	stloc.1
-// 0x01062394: 0x1062394: addu  a1, zero, zero
+// 0x010623a4: 0x10623a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01062398: 0x1062398: addiu a2, zero, -2
+// 0x010623a8: 0x10623a8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0106239c: 0x106239c: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010623ac: 0x10623ac: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2471,33 +2471,33 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010623a4: 0x10623a4: addu  a0, v0, zero
+// 0x010623b4: 0x10623b4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010623a8: 0x10623a8: addiu a1, s2, 31980
+// 0x010623b8: 0x10623b8: addiu a1, s2, 31980
 	ldloc 10
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010623ac: 0x10623ac: addiu a2, s1, 23008
+// 0x010623bc: 0x10623bc: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010623b0: 0x10623b0: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010623c0: 0x10623c0: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010623b8: 0x10623b8: lw    v1, 44(sp)
+// 0x010623c8: 0x10623c8: lw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2506,7 +2506,7 @@ L_1062064:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010623bc: 0x10623bc: lw    t2, 32(sp)
+// 0x010623cc: 0x10623cc: lw    t2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2515,38 +2515,38 @@ L_1062064:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010623c0: 0x10623c0: lw    a2, -30068(v1)
+// 0x010623d0: 0x10623d0: lw    a2, -29604(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010623c4: 0x10623c4: lui   a0, 0x10000
+// 0x010623d4: 0x10623d4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010623c8: 0x10623c8: div   a2, s4
+// 0x010623d8: 0x10623d8: div   a2, s4
 	ldloc.3
 	ldloc 12
 	div
 	stloc 18
-// 0x010623cc: 0x10623cc: addiu a3, zero, -1
+// 0x010623dc: 0x10623dc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010623d0: 0x10623d0: addiu a0, a0, 13188
+// 0x010623e0: 0x10623e0: addiu a0, a0, 13184
 	ldloc.1
-	ldc.i4 13188
+	ldc.i4 13184
 	add
 	stloc.1
-// 0x010623d4: 0x10623d4: addu  a1, zero, zero
+// 0x010623e4: 0x10623e4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010623d8: 0x10623d8: mflo  lo
+// 0x010623e8: 0x10623e8: mflo  lo
 	ldloc 18
 	stloc.3
-// 0x010623dc: 0x10623dc: jal   0x1093a24 sw    t2, 16(sp)
+// 0x010623ec: 0x10623ec: jal   0x1094048 sw    t2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2560,34 +2560,34 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010623e4: 0x10623e4: addu  a0, v0, zero
+// 0x010623f4: 0x10623f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010623e8: 0x10623e8: addu  a1, zero, zero
+// 0x010623f8: 0x10623f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010623ec: 0x10623ec: addu  a2, zero, zero
+// 0x010623fc: 0x10623fc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010623f0: 0x10623f0: jal   0x1098fe0 addu  s4, v0, zero
+// 0x01062400: 0x1062400: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010623f8: 0x10623f8: lui   a0, 0x10000
+// 0x01062408: 0x1062408: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010623fc: 0x10623fc: jal   0x101cd60 addiu a0, a0, 13208
+// 0x0106240c: 0x106240c: jal   0x101cd70 addiu a0, a0, 13204
 	ldloc.1
-	ldc.i4 13208
+	ldc.i4 13204
 	add
 	stloc.1
 	ldloc.0
@@ -2595,26 +2595,26 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062404: 0x1062404: lui   a0, 0x10000
+// 0x01062414: 0x1062414: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062408: 0x1062408: addiu a2, zero, -1
+// 0x01062418: 0x1062418: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0106240c: 0x106240c: addiu a3, zero, 4240
+// 0x0106241c: 0x106241c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01062410: 0x1062410: addiu a0, a0, 13224
+// 0x01062420: 0x1062420: addiu a0, a0, 13220
 	ldloc.1
-	ldc.i4 13224
+	ldc.i4 13220
 	add
 	stloc.1
-// 0x01062414: 0x1062414: jal   0x1098d10 addu  a1, v0, zero
+// 0x01062424: 0x1062424: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2622,55 +2622,55 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106241c: 0x106241c: addu  a1, v0, zero
+// 0x0106242c: 0x106242c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062420: 0x1062420: jal   0x1098ec4 addu  a0, s4, zero
+// 0x01062430: 0x1062430: jal   0x109950c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062428: 0x1062428: addu  a0, s5, zero
+// 0x01062438: 0x1062438: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0106242c: 0x106242c: jal   0x1098ec4 addu  a1, s4, zero
+// 0x0106243c: 0x106243c: jal   0x109950c addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062434: 0x1062434: lui   a0, 0x10000
+// 0x01062444: 0x1062444: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062438: 0x1062438: addiu a2, zero, 2
+// 0x01062448: 0x1062448: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x0106243c: 0x106243c: addu  a3, zero, zero
+// 0x0106244c: 0x106244c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01062440: 0x1062440: addiu a0, a0, 12968
+// 0x01062450: 0x1062450: addiu a0, a0, 12964
 	ldloc.1
-	ldc.i4 12968
+	ldc.i4 12964
 	add
 	stloc.1
-// 0x01062444: 0x1062444: addiu a1, zero, 1
+// 0x01062454: 0x1062454: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01062448: 0x1062448: sw    zero, 16(sp)
+// 0x01062458: 0x1062458: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2679,7 +2679,7 @@ L_1062064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106244c: 0x106244c: sw    zero, 20(sp)
+// 0x0106245c: 0x106245c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2688,7 +2688,7 @@ L_1062064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062450: 0x1062450: jal   0x109c14c sw    zero, 24(sp)
+// 0x01062460: 0x1062460: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2702,73 +2702,73 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062458: 0x1062458: addu  a1, v0, zero
+// 0x01062468: 0x1062468: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106245c: 0x106245c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106246c: 0x106246c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062464: 0x1062464: jal   0x1061ec0 sll   zero, zero, 0
+// 0x01062474: 0x1062474: jal   0x1061ed0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::T_82_1061ec0(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::T_82_1061ed0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106246c: 0x106246c: addu  a1, v0, zero
+// 0x0106247c: 0x106247c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062470: 0x1062470: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01062480: 0x1062480: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062478: 0x1062478: addu  a0, s7, zero
+// 0x01062488: 0x1062488: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x0106247c: 0x106247c: jal   0x1098ec4 addu  a1, s5, zero
+// 0x0106248c: 0x106248c: jal   0x109950c addu  a1, s5, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062484: 0x1062484: lui   a0, 0x0
+// 0x01062494: 0x1062494: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01062488: 0x1062488: lui   a1, 0x0
+// 0x01062498: 0x1062498: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0106248c: 0x106248c: addiu a0, a0, 14892
+// 0x0106249c: 0x106249c: addiu a0, a0, 14892
 	ldloc.1
 	ldc.i4 14892
 	add
 	stloc.1
-// 0x01062490: 0x1062490: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010624a0: 0x10624a0: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2778,20 +2778,20 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062498: 0x1062498: beq   v0, zero, 0x1062550 addiu a0, s6, 32244
+// 0x010624a8: 0x10624a8: beq   v0, zero, 0x1062560 addiu a0, s6, 32244
 	ldloc 5
 	ldloc 17
 	ldc.i4 32244
 	add
 	stloc.1
-	brfalse L_1062550
+	brfalse L_1062560
 // --- basic block ---
-// 0x010624a0: 0x10624a0: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010624b0: 0x10624b0: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -2799,42 +2799,42 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010624a8: 0x10624a8: addu  a1, v0, zero
+// 0x010624b8: 0x10624b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010624ac: 0x10624ac: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010624bc: 0x10624bc: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010624b4: 0x10624b4: lui   a0, 0x10000
+// 0x010624c4: 0x10624c4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010624b8: 0x10624b8: addiu a3, zero, -1
+// 0x010624c8: 0x10624c8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010624bc: 0x10624bc: addiu a0, a0, 13244
+// 0x010624cc: 0x10624cc: addiu a0, a0, 13240
 	ldloc.1
-	ldc.i4 13244
+	ldc.i4 13240
 	add
 	stloc.1
-// 0x010624c0: 0x10624c0: addu  a1, zero, zero
+// 0x010624d0: 0x10624d0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010624c4: 0x10624c4: addiu a2, zero, -2
+// 0x010624d4: 0x10624d4: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010624c8: 0x10624c8: jal   0x1093a24 sw    s3, 16(sp)
+// 0x010624d8: 0x10624d8: jal   0x1094048 sw    s3, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2848,38 +2848,38 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010624d0: 0x10624d0: addu  a0, v0, zero
+// 0x010624e0: 0x10624e0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010624d4: 0x10624d4: addiu a1, s2, 31980
+// 0x010624e4: 0x10624e4: addiu a1, s2, 31980
 	ldloc 10
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010624d8: 0x10624d8: addiu a2, s1, 23008
+// 0x010624e8: 0x10624e8: addiu a2, s1, 23008
 	ldloc 9
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010624dc: 0x10624dc: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010624ec: 0x10624ec: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010624e4: 0x10624e4: lui   a0, 0x10000
+// 0x010624f4: 0x10624f4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010624e8: 0x10624e8: jal   0x101cd60 addiu a0, a0, 13264
+// 0x010624f8: 0x10624f8: jal   0x101cd70 addiu a0, a0, 13260
 	ldloc.1
-	ldc.i4 13264
+	ldc.i4 13260
 	add
 	stloc.1
 	ldloc.0
@@ -2887,26 +2887,26 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010624f0: 0x10624f0: lui   a0, 0x10000
+// 0x01062500: 0x1062500: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010624f4: 0x10624f4: addiu a2, zero, -1
+// 0x01062504: 0x1062504: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010624f8: 0x10624f8: addiu a3, zero, 4240
+// 0x01062508: 0x1062508: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x010624fc: 0x10624fc: addiu a0, a0, 13284
+// 0x0106250c: 0x106250c: addiu a0, a0, 13280
 	ldloc.1
-	ldc.i4 13284
+	ldc.i4 13280
 	add
 	stloc.1
-// 0x01062500: 0x1062500: jal   0x1098d10 addu  a1, v0, zero
+// 0x01062510: 0x1062510: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -2914,42 +2914,42 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062508: 0x1062508: addu  a1, v0, zero
+// 0x01062518: 0x1062518: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106250c: 0x106250c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106251c: 0x106251c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062514: 0x1062514: lui   a0, 0x10000
+// 0x01062524: 0x1062524: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062518: 0x1062518: addiu a0, a0, 12912
+// 0x01062528: 0x1062528: addiu a0, a0, 12908
 	ldloc.1
-	ldc.i4 12912
+	ldc.i4 12908
 	add
 	stloc.1
-// 0x0106251c: 0x106251c: addiu a2, zero, 2
+// 0x0106252c: 0x106252c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01062520: 0x1062520: addu  a3, zero, zero
+// 0x01062530: 0x1062530: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01062524: 0x1062524: addiu a1, zero, 1
+// 0x01062534: 0x1062534: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01062528: 0x1062528: sw    zero, 16(sp)
+// 0x01062538: 0x1062538: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2958,7 +2958,7 @@ L_1062064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106252c: 0x106252c: sw    zero, 20(sp)
+// 0x0106253c: 0x106253c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2967,7 +2967,7 @@ L_1062064:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062530: 0x1062530: jal   0x109c14c sw    zero, 24(sp)
+// 0x01062540: 0x1062540: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2981,50 +2981,50 @@ L_1062064:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062538: 0x1062538: addu  a1, v0, zero
+// 0x01062548: 0x1062548: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106253c: 0x106253c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106254c: 0x106254c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062544: 0x1062544: addu  a0, s7, zero
+// 0x01062554: 0x1062554: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x01062548: 0x1062548: jal   0x1098ec4 addu  a1, s5, zero
+// 0x01062558: 0x1062558: jal   0x109950c addu  a1, s5, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1062550:
-// 0x01062550: 0x1062550: lui   a0, 0x0
+L_1062560:
+// 0x01062560: 0x1062560: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01062554: 0x1062554: lui   a1, 0x0
+// 0x01062564: 0x1062564: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01062558: 0x1062558: addiu a0, a0, 14876
+// 0x01062568: 0x1062568: addiu a0, a0, 14876
 	ldloc.1
 	ldc.i4 14876
 	add
 	stloc.1
-// 0x0106255c: 0x106255c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x0106256c: 0x106256c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3034,23 +3034,23 @@ L_1062550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062564: 0x1062564: beq   v0, zero, 0x1062680 lui   a0, 0x0
+// 0x01062574: 0x1062574: beq   v0, zero, 0x1062690 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1062680
+	brfalse L_1062690
 // --- basic block ---
-// 0x0106256c: 0x106256c: addiu a0, a0, 32244
+// 0x0106257c: 0x106257c: addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x01062570: 0x1062570: jal   0x109e6d0 addiu a1, zero, 512
+// 0x01062580: 0x1062580: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3058,50 +3058,50 @@ L_1062550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062578: 0x1062578: addu  a1, v0, zero
+// 0x01062588: 0x1062588: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106257c: 0x106257c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106258c: 0x106258c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062584: 0x1062584: lui   a0, 0x10000
+// 0x01062594: 0x1062594: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062588: 0x1062588: lui   v0, 0x100000
+// 0x01062598: 0x1062598: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x0106258c: 0x106258c: addiu a3, zero, -1
+// 0x0106259c: 0x106259c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01062590: 0x1062590: addiu a0, a0, 13304
+// 0x010625a0: 0x10625a0: addiu a0, a0, 13300
 	ldloc.1
-	ldc.i4 13304
+	ldc.i4 13300
 	add
 	stloc.1
-// 0x01062594: 0x1062594: addu  a1, zero, zero
+// 0x010625a4: 0x10625a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01062598: 0x1062598: addiu a2, zero, -2
+// 0x010625a8: 0x10625a8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0106259c: 0x106259c: ori   v0, v0, 136
+// 0x010625ac: 0x10625ac: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010625a0: 0x10625a0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010625b0: 0x10625b0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3115,79 +3115,79 @@ L_1062550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010625a8: 0x10625a8: lui   a1, 0x0
+// 0x010625b8: 0x10625b8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010625ac: 0x10625ac: lui   a2, 0x0
+// 0x010625bc: 0x10625bc: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010625b0: 0x10625b0: addu  a0, v0, zero
+// 0x010625c0: 0x10625c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010625b4: 0x10625b4: addiu a1, a1, 31980
+// 0x010625c4: 0x10625c4: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010625b8: 0x10625b8: addiu a2, a2, 23008
+// 0x010625c8: 0x10625c8: addiu a2, a2, 23008
 	ldloc.3
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010625bc: 0x10625bc: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010625cc: 0x10625cc: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010625c4: 0x10625c4: lui   v0, 0xf0000
+// 0x010625d4: 0x10625d4: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010625c8: 0x10625c8: lw    a2, -30068(v0)
+// 0x010625d8: 0x10625d8: lw    a2, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc.3
-// 0x010625cc: 0x10625cc: addiu v0, zero, 2
+// 0x010625dc: 0x10625dc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010625d0: 0x10625d0: div   a2, v0
+// 0x010625e0: 0x10625e0: div   a2, v0
 	ldloc.3
 	ldloc 5
 	div
 	stloc 18
-// 0x010625d4: 0x10625d4: lui   a0, 0x10000
+// 0x010625e4: 0x10625e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010625d8: 0x10625d8: addiu a3, zero, -1
+// 0x010625e8: 0x10625e8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010625dc: 0x10625dc: addiu a0, a0, 13328
+// 0x010625ec: 0x10625ec: addiu a0, a0, 13324
 	ldloc.1
-	ldc.i4 13328
+	ldc.i4 13324
 	add
 	stloc.1
-// 0x010625e0: 0x10625e0: addu  a1, zero, zero
+// 0x010625f0: 0x10625f0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010625e4: 0x10625e4: addiu v0, zero, 16
+// 0x010625f4: 0x10625f4: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x010625e8: 0x10625e8: mflo  lo
+// 0x010625f8: 0x10625f8: mflo  lo
 	ldloc 18
 	stloc.3
-// 0x010625ec: 0x10625ec: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010625fc: 0x10625fc: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3201,34 +3201,34 @@ L_1062550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010625f4: 0x10625f4: addu  a0, v0, zero
+// 0x01062604: 0x1062604: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010625f8: 0x10625f8: addu  a1, zero, zero
+// 0x01062608: 0x1062608: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010625fc: 0x10625fc: addu  a2, zero, zero
+// 0x0106260c: 0x106260c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01062600: 0x1062600: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01062610: 0x1062610: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01062608: 0x1062608: lui   a0, 0x10000
+// 0x01062618: 0x1062618: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0106260c: 0x106260c: jal   0x101cd60 addiu a0, a0, 13356
+// 0x0106261c: 0x106261c: jal   0x101cd70 addiu a0, a0, 13352
 	ldloc.1
-	ldc.i4 13356
+	ldc.i4 13352
 	add
 	stloc.1
 	ldloc.0
@@ -3236,26 +3236,26 @@ L_1062550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062614: 0x1062614: lui   a0, 0x10000
+// 0x01062624: 0x1062624: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062618: 0x1062618: addiu a2, zero, -1
+// 0x01062628: 0x1062628: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0106261c: 0x106261c: addiu a3, zero, 4240
+// 0x0106262c: 0x106262c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01062620: 0x1062620: addiu a0, a0, 13408
+// 0x01062630: 0x1062630: addiu a0, a0, 13404
 	ldloc.1
-	ldc.i4 13408
+	ldc.i4 13404
 	add
 	stloc.1
-// 0x01062624: 0x1062624: jal   0x1098d10 addu  a1, v0, zero
+// 0x01062634: 0x1062634: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3263,55 +3263,55 @@ L_1062550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106262c: 0x106262c: addu  a1, v0, zero
+// 0x0106263c: 0x106263c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062630: 0x1062630: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01062640: 0x1062640: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062638: 0x1062638: addu  a0, s5, zero
+// 0x01062648: 0x1062648: addu  a0, s5, zero
 	ldloc 8
 	stloc.1
-// 0x0106263c: 0x106263c: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0106264c: 0x106264c: jal   0x109950c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062644: 0x1062644: lui   a0, 0x10000
+// 0x01062654: 0x1062654: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062648: 0x1062648: addiu a0, a0, 12944
+// 0x01062658: 0x1062658: addiu a0, a0, 12940
 	ldloc.1
-	ldc.i4 12944
+	ldc.i4 12940
 	add
 	stloc.1
-// 0x0106264c: 0x106264c: addiu a2, zero, 2
+// 0x0106265c: 0x106265c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01062650: 0x1062650: addu  a3, zero, zero
+// 0x01062660: 0x1062660: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01062654: 0x1062654: addiu a1, zero, 1
+// 0x01062664: 0x1062664: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01062658: 0x1062658: sw    zero, 16(sp)
+// 0x01062668: 0x1062668: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3320,7 +3320,7 @@ L_1062550:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106265c: 0x106265c: sw    zero, 20(sp)
+// 0x0106266c: 0x106266c: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3329,7 +3329,7 @@ L_1062550:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062660: 0x1062660: jal   0x109c14c sw    zero, 24(sp)
+// 0x01062670: 0x1062670: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3343,50 +3343,50 @@ L_1062550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062668: 0x1062668: addu  a1, v0, zero
+// 0x01062678: 0x1062678: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0106266c: 0x106266c: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0106267c: 0x106267c: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062674: 0x1062674: addu  a0, s7, zero
+// 0x01062684: 0x1062684: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x01062678: 0x1062678: jal   0x1098ec4 addu  a1, s5, zero
+// 0x01062688: 0x1062688: jal   0x109950c addu  a1, s5, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1062680:
-// 0x01062680: 0x1062680: lui   a0, 0x0
+L_1062690:
+// 0x01062690: 0x1062690: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01062684: 0x1062684: lui   a1, 0x0
+// 0x01062694: 0x1062694: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01062688: 0x1062688: addiu a0, a0, 14908
+// 0x01062698: 0x1062698: addiu a0, a0, 14908
 	ldloc.1
 	ldc.i4 14908
 	add
 	stloc.1
-// 0x0106268c: 0x106268c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x0106269c: 0x106269c: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -3396,24 +3396,24 @@ L_1062680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062694: 0x1062694: beq   v0, zero, 0x1062764 sll   zero, zero, 0
+// 0x010626a4: 0x10626a4: beq   v0, zero, 0x1062774 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1062764
+	brfalse L_1062774
 // --- basic block ---
-// 0x0106269c: 0x106269c: lui   a0, 0x0
+// 0x010626ac: 0x10626ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010626a0: 0x10626a0: addiu a0, a0, 32244
+// 0x010626b0: 0x10626b0: addiu a0, a0, 32244
 	ldloc.1
 	ldc.i4 32244
 	add
 	stloc.1
-// 0x010626a4: 0x10626a4: jal   0x109e6d0 addiu a1, zero, 512
+// 0x010626b4: 0x10626b4: jal   0x109ed18 addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -3421,50 +3421,50 @@ L_1062680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_separator_new_109e6d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_separator_new_109ed18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010626ac: 0x10626ac: addu  a1, v0, zero
+// 0x010626bc: 0x10626bc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010626b0: 0x10626b0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x010626c0: 0x10626c0: jal   0x109950c addu  a0, s5, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010626b8: 0x10626b8: lui   a0, 0x10000
+// 0x010626c8: 0x10626c8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010626bc: 0x10626bc: lui   v0, 0x100000
+// 0x010626cc: 0x10626cc: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010626c0: 0x10626c0: addiu a3, zero, -1
+// 0x010626d0: 0x10626d0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010626c4: 0x10626c4: addiu a0, a0, 13436
+// 0x010626d4: 0x10626d4: addiu a0, a0, 13432
 	ldloc.1
-	ldc.i4 13436
+	ldc.i4 13432
 	add
 	stloc.1
-// 0x010626c8: 0x10626c8: addu  a1, zero, zero
+// 0x010626d8: 0x10626d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010626cc: 0x10626cc: addiu a2, zero, -2
+// 0x010626dc: 0x10626dc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010626d0: 0x10626d0: ori   v0, v0, 136
+// 0x010626e0: 0x10626e0: ori   v0, v0, 136
 	ldloc 5
 	ldc.i4 136
 	or
 	stloc 5
-// 0x010626d4: 0x10626d4: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010626e4: 0x10626e4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3478,44 +3478,44 @@ L_1062680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010626dc: 0x10626dc: lui   a1, 0x0
+// 0x010626ec: 0x10626ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010626e0: 0x10626e0: lui   a2, 0x0
+// 0x010626f0: 0x10626f0: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x010626e4: 0x10626e4: addu  a0, v0, zero
+// 0x010626f4: 0x10626f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010626e8: 0x10626e8: addiu a1, a1, 31980
+// 0x010626f8: 0x10626f8: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x010626ec: 0x10626ec: addiu a2, a2, 23008
+// 0x010626fc: 0x10626fc: addiu a2, a2, 23008
 	ldloc.3
 	ldc.i4 23008
 	add
 	stloc.3
-// 0x010626f0: 0x10626f0: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01062700: 0x1062700: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010626f8: 0x10626f8: lui   a0, 0x10000
+// 0x01062708: 0x1062708: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010626fc: 0x10626fc: jal   0x101cd60 addiu a0, a0, 13460
+// 0x0106270c: 0x106270c: jal   0x101cd70 addiu a0, a0, 13456
 	ldloc.1
-	ldc.i4 13460
+	ldc.i4 13456
 	add
 	stloc.1
 	ldloc.0
@@ -3523,26 +3523,26 @@ L_1062680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062704: 0x1062704: lui   a0, 0x10000
+// 0x01062714: 0x1062714: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062708: 0x1062708: addiu a2, zero, -1
+// 0x01062718: 0x1062718: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0106270c: 0x106270c: addiu a3, zero, 4240
+// 0x0106271c: 0x106271c: addiu a3, zero, 4240
 	ldc.i4 4240
 	stloc 4
-// 0x01062710: 0x1062710: addiu a0, a0, 13484
+// 0x01062720: 0x1062720: addiu a0, a0, 13480
 	ldloc.1
-	ldc.i4 13484
+	ldc.i4 13480
 	add
 	stloc.1
-// 0x01062714: 0x1062714: jal   0x1098d10 addu  a1, v0, zero
+// 0x01062724: 0x1062724: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -3550,42 +3550,42 @@ L_1062680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106271c: 0x106271c: addu  a1, v0, zero
+// 0x0106272c: 0x106272c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062720: 0x1062720: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01062730: 0x1062730: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062728: 0x1062728: lui   a0, 0x10000
+// 0x01062738: 0x1062738: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0106272c: 0x106272c: addiu a0, a0, 12924
+// 0x0106273c: 0x106273c: addiu a0, a0, 12920
 	ldloc.1
-	ldc.i4 12924
+	ldc.i4 12920
 	add
 	stloc.1
-// 0x01062730: 0x1062730: addiu a2, zero, 2
+// 0x01062740: 0x1062740: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01062734: 0x1062734: addu  a3, zero, zero
+// 0x01062744: 0x1062744: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01062738: 0x1062738: addiu a1, zero, 1
+// 0x01062748: 0x1062748: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0106273c: 0x106273c: sw    zero, 16(sp)
+// 0x0106274c: 0x106274c: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3594,7 +3594,7 @@ L_1062680:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062740: 0x1062740: sw    zero, 20(sp)
+// 0x01062750: 0x1062750: sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3603,7 +3603,7 @@ L_1062680:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062744: 0x1062744: jal   0x109c14c sw    zero, 24(sp)
+// 0x01062754: 0x1062754: jal   0x109c794 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3617,76 +3617,76 @@ L_1062680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106274c: 0x106274c: addu  a1, v0, zero
+// 0x0106275c: 0x106275c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062750: 0x1062750: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01062760: 0x1062760: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062758: 0x1062758: addu  a0, s7, zero
+// 0x01062768: 0x1062768: addu  a0, s7, zero
 	ldloc 11
 	stloc.1
-// 0x0106275c: 0x106275c: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0106276c: 0x106276c: jal   0x109950c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1062764:
-// 0x01062764: 0x1062764: addu  a1, s7, zero
+L_1062774:
+// 0x01062774: 0x1062774: addu  a1, s7, zero
 	ldloc 11
 	stloc.2
-// 0x01062768: 0x1062768: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01062778: 0x1062778: jal   0x109950c addu  a0, s0, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062770: 0x1062770: lui   a0, 0x10000
+// 0x01062780: 0x1062780: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01062774: 0x1062774: addiu a0, a0, -21272
+// 0x01062784: 0x1062784: addiu a0, a0, -21272
 	ldloc.1
 	ldc.i4 -21272
 	add
 	stloc.1
-// 0x01062778: 0x1062778: lui   s1, 0x1060000
+// 0x01062788: 0x1062788: lui   s1, 0x1060000
 	ldc.i4 17170432
 	stloc 9
-// 0x0106277c: 0x106277c: lui   a2, 0x300000
+// 0x0106278c: 0x106278c: lui   a2, 0x300000
 	ldc.i4 3145728
 	stloc.3
-// 0x01062780: 0x1062780: ori   a2, a2, 26
+// 0x01062790: 0x1062790: ori   a2, a2, 26
 	ldloc.3
 	ldc.i4.s 26
 	or
 	stloc.3
-// 0x01062784: 0x1062784: addiu a3, s1, 6244
+// 0x01062794: 0x1062794: addiu a3, s1, 6260
 	ldloc 9
-	ldc.i4 6244
+	ldc.i4 6260
 	add
 	stloc 4
-// 0x01062788: 0x1062788: jal   0x1091088 addu  a1, a0, zero
+// 0x01062798: 0x1062798: jal   0x10916ac addu  a1, a0, zero
 	ldloc.1
 	stloc.2
 	ldloc.0
@@ -3694,28 +3694,28 @@ L_1062764:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062790: 0x1062790: addu  a1, v0, zero
+// 0x010627a0: 0x10627a0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01062794: 0x1062794: jal   0x1098ec4 addu  a0, s0, zero
+// 0x010627a4: 0x10627a4: jal   0x109950c addu  a0, s0, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106279c: 0x106279c: lui   a0, 0x0
+// 0x010627ac: 0x10627ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010627a0: 0x10627a0: jal   0x101cd60 addiu a0, a0, 32524
+// 0x010627b0: 0x10627b0: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -3725,15 +3725,15 @@ L_1062764:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010627a8: 0x10627a8: addu  a1, v0, zero
+// 0x010627b8: 0x10627b8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010627ac: 0x10627ac: jal   0x109b434 addu  a0, s0, zero
+// 0x010627bc: 0x10627bc: jal   0x109ba7c addu  a0, s0, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -3741,32 +3741,32 @@ L_1062764:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010627b4: 0x10627b4: addu  a0, s0, zero
+// 0x010627c4: 0x10627c4: addu  a0, s0, zero
 	ldloc 13
 	stloc.1
-// 0x010627b8: 0x10627b8: jal   0x1099174 addiu a1, s1, 6244
+// 0x010627c8: 0x10627c8: jal   0x10997bc addiu a1, s1, 6260
 	ldloc 9
-	ldc.i4 6244
+	ldc.i4 6260
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x010627c0: 0x10627c0: lui   a0, 0x10000
+// 0x010627d0: 0x10627d0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010627c4: 0x10627c4: addiu a0, a0, 13004
+// 0x010627d4: 0x10627d4: addiu a0, a0, 13000
 	ldloc.1
-	ldc.i4 13004
+	ldc.i4 13000
 	add
 	stloc.1
-// 0x010627c8: 0x10627c8: jal   0x1095eec addu  a1, zero, zero
+// 0x010627d8: 0x10627d8: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3774,30 +3774,30 @@ L_1062764:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010627d0: 0x10627d0: lui   v0, 0x70000
+// 0x010627e0: 0x10627e0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_10627d4:
-// 0x010627d4: 0x10627d4: lw    a1, 12768(v0)
+L_10627e4:
+// 0x010627e4: 0x10627e4: lw    a1, 13232(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldelem.i4
 	stloc.2
-// 0x010627d8: 0x10627d8: lui   a0, 0x10000
+// 0x010627e8: 0x10627e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010627dc: 0x10627dc: jal   0x1094734 addiu a0, a0, 12856
+// 0x010627ec: 0x10627ec: jal   0x1094d58 addiu a0, a0, 12852
 	ldloc.1
-	ldc.i4 12856
+	ldc.i4 12852
 	add
 	stloc.1
 	ldloc.0
@@ -3805,53 +3805,53 @@ L_10627d4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010627e4: 0x10627e4: jal   0x106136c sll   zero, zero, 0
+// 0x010627f4: 0x10627f4: jal   0x106137c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_type_106136c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_type_106137c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010627ec: 0x10627ec: addiu a0, zero, 1
+// 0x010627fc: 0x10627fc: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010627f0: 0x10627f0: bne   v0, a0, 0x1062804 lui   v1, 0x70000
+// 0x01062800: 0x1062800: bne   v0, a0, 0x1062814 lui   v1, 0x70000
 	ldloc 5
 	ldloc.1
 	ldc.i4 458752
 	stloc 6
-	bne.un L_1062804
+	bne.un L_1062814
 // --- basic block ---
-// 0x010627f8: 0x10627f8: lw    a1, 12784(v1)
+// 0x01062808: 0x1062808: lw    a1, 13248(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3196
+	ldc.i4 3312
 	add
 	ldelem.i4
 	stloc.2
-// 0x010627fc: 0x10627fc: j	 0x1062810 lui   a0, 0x20000
+// 0x0106280c: 0x106280c: j	 0x1062820 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_1062810
+	br L_1062820
 // --- basic block ---
-L_1062804:
-// 0x01062804: 0x1062804: addiu v1, v1, 12784
+L_1062814:
+// 0x01062814: 0x1062814: addiu v1, v1, 13248
 	ldloc 6
-	ldc.i4 12784
+	ldc.i4 13248
 	add
 	stloc 6
-// 0x01062808: 0x1062808: lw    a1, 4(v1)
+// 0x01062818: 0x1062818: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3860,13 +3860,13 @@ L_1062804:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106280c: 0x106280c: lui   a0, 0x20000
+// 0x0106281c: 0x106281c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_1062810:
-// 0x01062810: 0x1062810: jal   0x1094734 addiu a0, a0, -11180
+L_1062820:
+// 0x01062820: 0x1062820: jal   0x1094d58 addiu a0, a0, -10716
 	ldloc.1
-	ldc.i4 -11180
+	ldc.i4 -10716
 	add
 	stloc.1
 	ldloc.0
@@ -3874,49 +3874,49 @@ L_1062810:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062818: 0x1062818: jal   0x10614e0 sll   zero, zero, 0
+// 0x01062828: 0x1062828: jal   0x10614f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_primaries_10614e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_primaries_10614f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062820: 0x1062820: beq   v0, zero, 0x1062834 lui   v1, 0x70000
+// 0x01062830: 0x1062830: beq   v0, zero, 0x1062844 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_1062834
+	brfalse L_1062844
 // --- basic block ---
-// 0x01062828: 0x1062828: lw    a1, 12768(v1)
+// 0x01062838: 0x1062838: lw    a1, 13232(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106282c: 0x106282c: j	 0x1062840 lui   a0, 0x10000
+// 0x0106283c: 0x106283c: j	 0x1062850 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1062840
+	br L_1062850
 // --- basic block ---
-L_1062834:
-// 0x01062834: 0x1062834: addiu v1, v1, 12768
+L_1062844:
+// 0x01062844: 0x1062844: addiu v1, v1, 13232
 	ldloc 6
-	ldc.i4 12768
+	ldc.i4 13232
 	add
 	stloc 6
-// 0x01062838: 0x1062838: lw    a1, 4(v1)
+// 0x01062848: 0x1062848: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3925,13 +3925,13 @@ L_1062834:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106283c: 0x106283c: lui   a0, 0x10000
+// 0x0106284c: 0x106284c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1062840:
-// 0x01062840: 0x1062840: jal   0x1094734 addiu a0, a0, 12968
+L_1062850:
+// 0x01062850: 0x1062850: jal   0x1094d58 addiu a0, a0, 12964
 	ldloc.1
-	ldc.i4 12968
+	ldc.i4 12964
 	add
 	stloc.1
 	ldloc.0
@@ -3939,49 +3939,49 @@ L_1062840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062848: 0x1062848: jal   0x10614b4 sll   zero, zero, 0
+// 0x01062858: 0x1062858: jal   0x10614c4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_toll_roads_10614b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_toll_roads_10614c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062850: 0x1062850: beq   v0, zero, 0x1062864 lui   v1, 0x70000
+// 0x01062860: 0x1062860: beq   v0, zero, 0x1062874 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_1062864
+	brfalse L_1062874
 // --- basic block ---
-// 0x01062858: 0x1062858: lw    a1, 12768(v1)
+// 0x01062868: 0x1062868: lw    a1, 13232(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106285c: 0x106285c: j	 0x1062870 lui   a0, 0x10000
+// 0x0106286c: 0x106286c: j	 0x1062880 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1062870
+	br L_1062880
 // --- basic block ---
-L_1062864:
-// 0x01062864: 0x1062864: addiu v1, v1, 12768
+L_1062874:
+// 0x01062874: 0x1062874: addiu v1, v1, 13232
 	ldloc 6
-	ldc.i4 12768
+	ldc.i4 13232
 	add
 	stloc 6
-// 0x01062868: 0x1062868: lw    a1, 4(v1)
+// 0x01062878: 0x1062878: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3990,13 +3990,13 @@ L_1062864:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106286c: 0x106286c: lui   a0, 0x10000
+// 0x0106287c: 0x106287c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1062870:
-// 0x01062870: 0x1062870: jal   0x1094734 addiu a0, a0, 12912
+L_1062880:
+// 0x01062880: 0x1062880: jal   0x1094d58 addiu a0, a0, 12908
 	ldloc.1
-	ldc.i4 12912
+	ldc.i4 12908
 	add
 	stloc.1
 	ldloc.0
@@ -4004,49 +4004,49 @@ L_1062870:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062878: 0x1062878: jal   0x1061488 sll   zero, zero, 0
+// 0x01062888: 0x1062888: jal   0x1061498 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_prefer_unknown_directions_1061488(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_prefer_unknown_directions_1061498(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01062880: 0x1062880: beq   v0, zero, 0x1062894 lui   v1, 0x70000
+// 0x01062890: 0x1062890: beq   v0, zero, 0x10628a4 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_1062894
+	brfalse L_10628a4
 // --- basic block ---
-// 0x01062888: 0x1062888: lw    a1, 12768(v1)
+// 0x01062898: 0x1062898: lw    a1, 13232(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106288c: 0x106288c: j	 0x10628a0 lui   a0, 0x10000
+// 0x0106289c: 0x106289c: j	 0x10628b0 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_10628a0
+	br L_10628b0
 // --- basic block ---
-L_1062894:
-// 0x01062894: 0x1062894: addiu v1, v1, 12768
+L_10628a4:
+// 0x010628a4: 0x10628a4: addiu v1, v1, 13232
 	ldloc 6
-	ldc.i4 12768
+	ldc.i4 13232
 	add
 	stloc 6
-// 0x01062898: 0x1062898: lw    a1, 4(v1)
+// 0x010628a8: 0x10628a8: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4055,13 +4055,13 @@ L_1062894:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106289c: 0x106289c: lui   a0, 0x10000
+// 0x010628ac: 0x10628ac: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10628a0:
-// 0x010628a0: 0x10628a0: jal   0x1094734 addiu a0, a0, 12924
+L_10628b0:
+// 0x010628b0: 0x10628b0: jal   0x1094d58 addiu a0, a0, 12920
 	ldloc.1
-	ldc.i4 12924
+	ldc.i4 12920
 	add
 	stloc.1
 	ldloc.0
@@ -4069,49 +4069,49 @@ L_10628a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010628a8: 0x10628a8: jal   0x106150c sll   zero, zero, 0
+// 0x010628b8: 0x10628b8: jal   0x106151c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_prefer_same_street_106150c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_prefer_same_street_106151c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010628b0: 0x10628b0: beq   v0, zero, 0x10628c4 lui   v1, 0x70000
+// 0x010628c0: 0x10628c0: beq   v0, zero, 0x10628d4 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_10628c4
+	brfalse L_10628d4
 // --- basic block ---
-// 0x010628b8: 0x10628b8: lw    a1, 12768(v1)
+// 0x010628c8: 0x10628c8: lw    a1, 13232(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldelem.i4
 	stloc.2
-// 0x010628bc: 0x10628bc: j	 0x10628d0 lui   a0, 0x10000
+// 0x010628cc: 0x10628cc: j	 0x10628e0 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_10628d0
+	br L_10628e0
 // --- basic block ---
-L_10628c4:
-// 0x010628c4: 0x10628c4: addiu v1, v1, 12768
+L_10628d4:
+// 0x010628d4: 0x10628d4: addiu v1, v1, 13232
 	ldloc 6
-	ldc.i4 12768
+	ldc.i4 13232
 	add
 	stloc 6
-// 0x010628c8: 0x10628c8: lw    a1, 4(v1)
+// 0x010628d8: 0x10628d8: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4120,13 +4120,13 @@ L_10628c4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010628cc: 0x10628cc: lui   a0, 0x10000
+// 0x010628dc: 0x10628dc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_10628d0:
-// 0x010628d0: 0x10628d0: jal   0x1094734 addiu a0, a0, 12980
+L_10628e0:
+// 0x010628e0: 0x10628e0: jal   0x1094d58 addiu a0, a0, 12976
 	ldloc.1
-	ldc.i4 12980
+	ldc.i4 12976
 	add
 	stloc.1
 	ldloc.0
@@ -4134,23 +4134,23 @@ L_10628d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010628d8: 0x10628d8: lui   a0, 0x0
+// 0x010628e8: 0x10628e8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010628dc: 0x10628dc: lui   a1, 0x0
+// 0x010628ec: 0x10628ec: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x010628e0: 0x10628e0: addiu a0, a0, 14876
+// 0x010628f0: 0x10628f0: addiu a0, a0, 14876
 	ldloc.1
 	ldc.i4 14876
 	add
 	stloc.1
-// 0x010628e4: 0x10628e4: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010628f4: 0x10628f4: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -4160,53 +4160,53 @@ L_10628d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010628ec: 0x10628ec: beq   v0, zero, 0x1062924 sll   zero, zero, 0
+// 0x010628fc: 0x10628fc: beq   v0, zero, 0x1062934 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1062924
+	brfalse L_1062934
 // --- basic block ---
-// 0x010628f4: 0x10628f4: jal   0x1061408 sll   zero, zero, 0
+// 0x01062904: 0x1062904: jal   0x1061418 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_palestinian_roads_1061408(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_palestinian_roads_1061418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010628fc: 0x10628fc: beq   v0, zero, 0x1062910 lui   v1, 0x70000
+// 0x0106290c: 0x106290c: beq   v0, zero, 0x1062920 lui   v1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 6
-	brfalse L_1062910
+	brfalse L_1062920
 // --- basic block ---
-// 0x01062904: 0x1062904: lw    a1, 12768(v1)
+// 0x01062914: 0x1062914: lw    a1, 13232(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3192
+	ldc.i4 3308
 	add
 	ldelem.i4
 	stloc.2
-// 0x01062908: 0x1062908: j	 0x106291c lui   a0, 0x10000
+// 0x01062918: 0x1062918: j	 0x106292c lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_106291c
+	br L_106292c
 // --- basic block ---
-L_1062910:
-// 0x01062910: 0x1062910: addiu v1, v1, 12768
+L_1062920:
+// 0x01062920: 0x1062920: addiu v1, v1, 13232
 	ldloc 6
-	ldc.i4 12768
+	ldc.i4 13232
 	add
 	stloc 6
-// 0x01062914: 0x1062914: lw    a1, 4(v1)
+// 0x01062924: 0x1062924: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4215,13 +4215,13 @@ L_1062910:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01062918: 0x1062918: lui   a0, 0x10000
+// 0x01062928: 0x1062928: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_106291c:
-// 0x0106291c: 0x106291c: jal   0x1094734 addiu a0, a0, 12944
+L_106292c:
+// 0x0106292c: 0x106292c: jal   0x1094d58 addiu a0, a0, 12940
 	ldloc.1
-	ldc.i4 12944
+	ldc.i4 12940
 	add
 	stloc.1
 	ldloc.0
@@ -4229,60 +4229,60 @@ L_106291c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1062924:
-// 0x01062924: 0x1062924: jal   0x1061434 sll   zero, zero, 0
+L_1062934:
+// 0x01062934: 0x1062934: jal   0x1061444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_trails_1061434(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_trails_1061444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106292c: 0x106292c: addiu v1, zero, 1
+// 0x0106293c: 0x106293c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01062930: 0x1062930: bne   v0, v1, 0x1062948 lui   v1, 0x70000
+// 0x01062940: 0x1062940: bne   v0, v1, 0x1062958 lui   v1, 0x70000
 	ldloc 5
 	ldloc 6
 	ldc.i4 458752
 	stloc 6
-	bne.un L_1062948
+	bne.un L_1062958
 // --- basic block ---
-// 0x01062938: 0x1062938: lui   v0, 0x70000
+// 0x01062948: 0x1062948: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106293c: 0x106293c: lw    a1, 12804(v0)
+// 0x0106294c: 0x106294c: lw    a1, 13268(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3201
+	ldc.i4 3317
 	add
 	ldelem.i4
 	stloc.2
-// 0x01062940: 0x1062940: j	 0x1062964 lui   a0, 0x10000
+// 0x01062950: 0x1062950: j	 0x1062974 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1062964
+	br L_1062974
 // --- basic block ---
-L_1062948:
-// 0x01062948: 0x1062948: bne   v0, zero, 0x106295c addiu v1, v1, 12804
+L_1062958:
+// 0x01062958: 0x1062958: bne   v0, zero, 0x106296c addiu v1, v1, 13268
 	ldloc 5
 	ldloc 6
-	ldc.i4 12804
+	ldc.i4 13268
 	add
 	stloc 6
-	brtrue L_106295c
+	brtrue L_106296c
 // --- basic block ---
-// 0x01062950: 0x1062950: lw    a1, 4(v1)
+// 0x01062960: 0x1062960: lw    a1, 4(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4291,13 +4291,13 @@ L_1062948:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01062954: 0x1062954: j	 0x1062964 lui   a0, 0x10000
+// 0x01062964: 0x1062964: j	 0x1062974 lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-	br L_1062964
+	br L_1062974
 // --- basic block ---
-L_106295c:
-// 0x0106295c: 0x106295c: lw    a1, 8(v1)
+L_106296c:
+// 0x0106296c: 0x106296c: lw    a1, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4306,13 +4306,13 @@ L_106295c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01062960: 0x1062960: lui   a0, 0x10000
+// 0x01062970: 0x1062970: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-L_1062964:
-// 0x01062964: 0x1062964: jal   0x1094734 addiu a0, a0, 12992
+L_1062974:
+// 0x01062974: 0x1062974: jal   0x1094d58 addiu a0, a0, 12988
 	ldloc.1
-	ldc.i4 12992
+	ldc.i4 12988
 	add
 	stloc.1
 	ldloc.0
@@ -4320,13 +4320,13 @@ L_1062964:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_data_1094734(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_data_1094d58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106296c: 0x106296c: lw    ra, 84(sp)
-// 0x01062970: 0x1062970: lw    s8, 80(sp)
+// 0x0106297c: 0x106297c: lw    ra, 84(sp)
+// 0x01062980: 0x1062980: lw    s8, 80(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4335,7 +4335,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01062974: 0x1062974: lw    s7, 76(sp)
+// 0x01062984: 0x1062984: lw    s7, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4344,7 +4344,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01062978: 0x1062978: lw    s6, 72(sp)
+// 0x01062988: 0x1062988: lw    s6, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4353,7 +4353,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0106297c: 0x106297c: lw    s5, 68(sp)
+// 0x0106298c: 0x106298c: lw    s5, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4362,7 +4362,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01062980: 0x1062980: lw    s4, 64(sp)
+// 0x01062990: 0x1062990: lw    s4, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4371,7 +4371,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01062984: 0x1062984: lw    s3, 60(sp)
+// 0x01062994: 0x1062994: lw    s3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4380,7 +4380,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01062988: 0x1062988: lw    s2, 56(sp)
+// 0x01062998: 0x1062998: lw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4389,7 +4389,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0106298c: 0x106298c: lw    s1, 52(sp)
+// 0x0106299c: 0x106299c: lw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4398,7 +4398,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01062990: 0x1062990: lw    s0, 48(sp)
+// 0x010629a0: 0x10629a0: lw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4407,7 +4407,7 @@ L_1062964:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01062994: 0x1062994: jr    ra addiu sp, sp, 88
+// 0x010629a4: 0x10629a4: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -4419,7 +4419,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_route_reload_data_106299c()
+.method public static int32 navigate_route_reload_data_10629ac()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4433,7 +4433,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106299c: 0x106299c: jr    ra addu  v0, zero, zero
+// 0x010629ac: 0x10629ac: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -4441,7 +4441,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 navigate_route_load_data_10629a4()
+.method public static int32 navigate_route_load_data_10629b4()
 {
 .maxstack 4
 .locals init (int32 v0,int32 ra)
@@ -4455,7 +4455,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010629a4: 0x10629a4: jr    ra addu  v0, zero, zero
+// 0x010629b4: 0x10629b4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc.0
 	br __CIBYL_function_return
@@ -4463,7 +4463,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 make_path_10629ac(int32,int32,int32,int32,int32)
+.method public static int32 make_path_10629bc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s3,int32 t0,int32 s1,int32 s2,int32 s4,int32 lo,int32 s0,int32 hi,int32 ra)
@@ -4522,37 +4522,37 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010629ac: 0x10629ac: lui   v0, 0x70000
+// 0x010629bc: 0x10629bc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010629b0: 0x10629b0: lw    v0, 12820(v0)
+// 0x010629c0: 0x10629c0: lw    v0, 13284(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldelem.i4
 	stloc 6
-// 0x010629b4: 0x10629b4: lui   v1, 0x20000
+// 0x010629c4: 0x10629c4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010629b8: 0x10629b8: ori   v1, v1, 32768
+// 0x010629c8: 0x10629c8: ori   v1, v1, 32768
 	ldloc 5
 	ldc.i4 32768
 	or
 	stloc 5
-// 0x010629bc: 0x10629bc: addiu sp, sp, -48
+// 0x010629cc: 0x10629cc: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010629c0: 0x10629c0: slt   v1, v0, v1
+// 0x010629d0: 0x10629d0: slt   v1, v0, v1
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x010629c4: 0x10629c4: sw    s4, 40(sp)
+// 0x010629d4: 0x10629d4: sw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4561,7 +4561,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010629c8: 0x10629c8: sw    s2, 32(sp)
+// 0x010629d8: 0x10629d8: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4570,7 +4570,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010629cc: 0x10629cc: sw    s1, 28(sp)
+// 0x010629dc: 0x10629dc: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4579,7 +4579,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010629d0: 0x10629d0: sw    s0, 24(sp)
+// 0x010629e0: 0x10629e0: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4588,8 +4588,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010629d4: 0x10629d4: sw    ra, 44(sp)
-// 0x010629d8: 0x10629d8: sw    s3, 36(sp)
+// 0x010629e4: 0x10629e4: sw    ra, 44(sp)
+// 0x010629e8: 0x10629e8: sw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4598,41 +4598,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010629dc: 0x10629dc: addu  s1, a0, zero
+// 0x010629ec: 0x10629ec: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010629e0: 0x10629e0: addu  s0, a1, zero
+// 0x010629f0: 0x10629f0: addu  s0, a1, zero
 	ldloc.2
 	stloc 14
-// 0x010629e4: 0x10629e4: addu  s2, a2, zero
+// 0x010629f4: 0x10629f4: addu  s2, a2, zero
 	ldloc.3
 	stloc 11
-// 0x010629e8: 0x10629e8: bne   v1, zero, 0x1062a14 addu  s4, a3, zero
+// 0x010629f8: 0x10629f8: bne   v1, zero, 0x1062a24 addu  s4, a3, zero
 	ldloc 5
 	ldloc 4
 	stloc 12
-	brtrue L_1062a14
+	brtrue L_1062a24
 // --- basic block ---
-// 0x010629f0: 0x10629f0: lui   a1, 0x10000
+// 0x01062a00: 0x1062a00: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010629f4: 0x10629f4: lui   a3, 0x10000
+// 0x01062a04: 0x1062a04: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010629f8: 0x10629f8: addiu a1, a1, 13708
+// 0x01062a08: 0x1062a08: addiu a1, a1, 13704
 	ldloc.2
-	ldc.i4 13708
+	ldc.i4 13704
 	add
 	stloc.2
-// 0x010629fc: 0x10629fc: addiu a3, a3, 13752
+// 0x01062a0c: 0x1062a0c: addiu a3, a3, 13748
 	ldloc 4
-	ldc.i4 13752
+	ldc.i4 13748
 	add
 	stloc 4
-// 0x01062a00: 0x1062a00: addiu a0, zero, 4
+// 0x01062a10: 0x1062a10: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01062a04: 0x1062a04: jal   0x100449c addiu a2, zero, 134
+// 0x01062a14: 0x1062a14: jal   0x100449c addiu a2, zero, 134
 	ldc.i4 134
 	stloc.3
 	ldloc.0
@@ -4645,39 +4645,39 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01062a0c: 0x1062a0c: j	 0x1062b14 addu  v0, zero, zero
+// 0x01062a1c: 0x1062a1c: j	 0x1062b24 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1062b14
+	br L_1062b24
 // --- basic block ---
-L_1062a14:
-// 0x01062a14: 0x1062a14: andi  v1, v0, 4095
+L_1062a24:
+// 0x01062a24: 0x1062a24: andi  v1, v0, 4095
 	ldloc 6
 	ldc.i4 4095
 	and
 	stloc 5
-// 0x01062a18: 0x1062a18: bne   v1, zero, 0x1062a68 lui   s3, 0x70000
+// 0x01062a28: 0x1062a28: bne   v1, zero, 0x1062a78 lui   s3, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 8
-	brtrue L_1062a68
+	brtrue L_1062a78
 // --- basic block ---
-// 0x01062a20: 0x1062a20: beq   v0, zero, 0x1062a34 lui   v1, 0x70000
+// 0x01062a30: 0x1062a30: beq   v0, zero, 0x1062a44 lui   v1, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1062a34
+	brfalse L_1062a44
 // --- basic block ---
-// 0x01062a28: 0x1062a28: lw    a0, 12824(v1)
+// 0x01062a38: 0x1062a38: lw    a0, 13288(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3206
+	ldc.i4 3322
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062a2c: 0x1062a2c: jal   0x1015b18 addiu a1, v0, 4096
+// 0x01062a3c: 0x1062a3c: jal   0x1015b28 addiu a1, v0, 4096
 	ldloc 6
 	ldc.i4 4096
 	add
@@ -4687,28 +4687,28 @@ L_1062a14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_resize_1015b18(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_resize_1015b28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_1062a34:
-// 0x01062a34: 0x1062a34: lui   v0, 0x70000
+L_1062a44:
+// 0x01062a44: 0x1062a44: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01062a38: 0x1062a38: lw    s3, 12820(v0)
+// 0x01062a48: 0x1062a48: lw    s3, 13284(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldelem.i4
 	stloc 8
-// 0x01062a3c: 0x1062a3c: addiu v0, zero, 4096
+// 0x01062a4c: 0x1062a4c: addiu v0, zero, 4096
 	ldc.i4 4096
 	stloc 6
-// 0x01062a40: 0x1062a40: div   s3, v0
+// 0x01062a50: 0x1062a50: div   s3, v0
 	ldloc 8
 	ldloc 6
 	ldloc 8
@@ -4717,10 +4717,10 @@ L_1062a34:
 	stloc 13
 	rem
 	stloc 15
-// 0x01062a44: 0x1062a44: mflo  lo
+// 0x01062a54: 0x1062a54: mflo  lo
 	ldloc 13
 	stloc 8
-// 0x01062a48: 0x1062a48: jal   0x1000910 ori   a0, zero, 49152
+// 0x01062a58: 0x1062a58: jal   0x1000910 ori   a0, zero, 49152
 	ldc.i4.s 0
 	ldc.i4 49152
 	or
@@ -4735,48 +4735,48 @@ L_1062a34:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01062a50: 0x1062a50: lui   v1, 0x70000
+// 0x01062a60: 0x1062a60: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01062a54: 0x1062a54: sll   s3, s3, 2
+// 0x01062a64: 0x1062a64: sll   s3, s3, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x01062a58: 0x1062a58: addiu v1, v1, 12836
+// 0x01062a68: 0x1062a68: addiu v1, v1, 13300
 	ldloc 5
-	ldc.i4 12836
+	ldc.i4 13300
 	add
 	stloc 5
-// 0x01062a5c: 0x1062a5c: addu  s3, s3, v1
+// 0x01062a6c: 0x1062a6c: addu  s3, s3, v1
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x01062a60: 0x1062a60: sw    v0, 0(s3)
+// 0x01062a70: 0x1062a70: sw    v0, 0(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01062a64: 0x1062a64: lui   s3, 0x70000
+// 0x01062a74: 0x1062a74: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 8
-L_1062a68:
-// 0x01062a68: 0x1062a68: lw    a2, 12820(s3)
+L_1062a78:
+// 0x01062a78: 0x1062a78: lw    a2, 13284(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldelem.i4
 	stloc.3
-// 0x01062a6c: 0x1062a6c: addiu v0, zero, 4096
+// 0x01062a7c: 0x1062a7c: addiu v0, zero, 4096
 	ldc.i4 4096
 	stloc 6
-// 0x01062a70: 0x1062a70: div   a2, v0
+// 0x01062a80: 0x1062a80: div   a2, v0
 	ldloc.3
 	ldloc 6
 	ldloc.3
@@ -4785,7 +4785,7 @@ L_1062a68:
 	stloc 13
 	rem
 	stloc 15
-// 0x01062a74: 0x1062a74: lw    t0, 68(sp)
+// 0x01062a84: 0x1062a84: lw    t0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4794,131 +4794,131 @@ L_1062a68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01062a78: 0x1062a78: lui   a3, 0x80000000
+// 0x01062a88: 0x1062a88: lui   a3, 0x80000000
 	ldc.i4 2147483648
 	stloc 4
-// 0x01062a7c: 0x1062a7c: sltu  t0, zero, t0
+// 0x01062a8c: 0x1062a8c: sltu  t0, zero, t0
 	ldc.i4.s 0
 	ldloc 9
 	clt.un
 	stloc 9
-// 0x01062a80: 0x1062a80: subu  t0, zero, t0
+// 0x01062a90: 0x1062a90: subu  t0, zero, t0
 	ldloc 9
 	neg
 	stloc 9
-// 0x01062a84: 0x1062a84: and   a3, a3, t0
+// 0x01062a94: 0x1062a94: and   a3, a3, t0
 	ldloc 4
 	ldloc 9
 	and
 	stloc 4
-// 0x01062a88: 0x1062a88: or    s4, a3, s4
+// 0x01062a98: 0x1062a98: or    s4, a3, s4
 	ldloc 4
 	ldloc 12
 	or
 	stloc 12
-// 0x01062a8c: 0x1062a8c: addiu a3, zero, 12
+// 0x01062a9c: 0x1062a9c: addiu a3, zero, 12
 	ldc.i4.s 12
 	stloc 4
-// 0x01062a90: 0x1062a90: sltu  s2, zero, s2
+// 0x01062aa0: 0x1062aa0: sltu  s2, zero, s2
 	ldc.i4.s 0
 	ldloc 11
 	clt.un
 	stloc 11
-// 0x01062a94: 0x1062a94: subu  a1, zero, s2
+// 0x01062aa4: 0x1062aa4: subu  a1, zero, s2
 	ldloc 11
 	neg
 	stloc.2
-// 0x01062a98: 0x1062a98: lui   a0, 0x80000000
+// 0x01062aa8: 0x1062aa8: lui   a0, 0x80000000
 	ldc.i4 2147483648
 	stloc.1
-// 0x01062a9c: 0x1062a9c: and   a0, a0, a1
+// 0x01062aac: 0x1062aac: and   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	and
 	stloc.1
-// 0x01062aa0: 0x1062aa0: sll   t0, s0, 1
+// 0x01062ab0: 0x1062ab0: sll   t0, s0, 1
 	ldloc 14
 	ldc.i4.1
 	shl
 	stloc 9
-// 0x01062aa4: 0x1062aa4: sll   a1, s1, 16
+// 0x01062ab4: 0x1062ab4: sll   a1, s1, 16
 	ldloc 10
 	ldc.i4.s 16
 	shl
 	stloc.2
-// 0x01062aa8: 0x1062aa8: or    s1, a0, s1
+// 0x01062ab8: 0x1062ab8: or    s1, a0, s1
 	ldloc.1
 	ldloc 10
 	or
 	stloc 10
-// 0x01062aac: 0x1062aac: lui   a0, 0x70000
+// 0x01062abc: 0x1062abc: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01062ab0: 0x1062ab0: addu  a1, t0, a1
+// 0x01062ac0: 0x1062ac0: addu  a1, t0, a1
 	ldloc 9
 	ldloc.2
 	add
 	stloc.2
-// 0x01062ab4: 0x1062ab4: lw    a0, 12824(a0)
+// 0x01062ac4: 0x1062ac4: lw    a0, 13288(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3206
+	ldc.i4 3322
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062ab8: 0x1062ab8: addu  a1, a1, s2
+// 0x01062ac8: 0x1062ac8: addu  a1, a1, s2
 	ldloc.2
 	ldloc 11
 	add
 	stloc.2
-// 0x01062abc: 0x1062abc: mfhi  hi
+// 0x01062acc: 0x1062acc: mfhi  hi
 	ldloc 15
 	stloc 6
-// 0x01062ac0: 0x1062ac0: mflo  lo
+// 0x01062ad0: 0x1062ad0: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x01062ac4: 0x1062ac4: sll   v1, v1, 2
+// 0x01062ad4: 0x1062ad4: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01062ac8: 0x1062ac8: sll   zero, zero, 0
-// 0x01062acc: 0x1062acc: mult  v0, a3
+// 0x01062ad8: 0x1062ad8: sll   zero, zero, 0
+// 0x01062adc: 0x1062adc: mult  v0, a3
 	ldloc 6
 	ldloc 4
 	mul
 	stloc 13
-// 0x01062ad0: 0x1062ad0: lui   a3, 0x70000
+// 0x01062ae0: 0x1062ae0: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x01062ad4: 0x1062ad4: addiu a3, a3, 12836
+// 0x01062ae4: 0x1062ae4: addiu a3, a3, 13300
 	ldloc 4
-	ldc.i4 12836
+	ldc.i4 13300
 	add
 	stloc 4
-// 0x01062ad8: 0x1062ad8: addu  v1, v1, a3
+// 0x01062ae8: 0x1062ae8: addu  v1, v1, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
-// 0x01062adc: 0x1062adc: lw    v1, 0(v1)
+// 0x01062aec: 0x1062aec: lw    v1, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01062ae0: 0x1062ae0: mflo  lo
+// 0x01062af0: 0x1062af0: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x01062ae4: 0x1062ae4: addu  v0, v1, v0
+// 0x01062af4: 0x1062af4: addu  v0, v1, v0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01062ae8: 0x1062ae8: sw    s4, 4(v0)
+// 0x01062af8: 0x1062af8: sw    s4, 4(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4927,7 +4927,7 @@ L_1062a68:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01062aec: 0x1062aec: lw    v1, 64(sp)
+// 0x01062afc: 0x1062afc: lw    v1, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4936,26 +4936,26 @@ L_1062a68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062af0: 0x1062af0: sh    s0, 8(v0)
+// 0x01062b00: 0x1062b00: sh    s0, 8(v0)
 	ldloc 6
 	ldc.i4.8
 	add
 	ldloc 14
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01062af4: 0x1062af4: sh    v1, 10(v0)
+// 0x01062b04: 0x1062b04: sh    v1, 10(v0)
 	ldloc 6
 	ldc.i4.s 10
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01062af8: 0x1062af8: sw    s1, 0(v0)
+// 0x01062b08: 0x1062b08: sw    s1, 0(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x01062afc: 0x1062afc: jal   0x10157cc sw    v0, 16(sp)
+// 0x01062b0c: 0x1062b0c: jal   0x10157dc sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4969,21 +4969,21 @@ L_1062a68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01062b04: 0x1062b04: lw    v1, 12820(s3)
+// 0x01062b14: 0x1062b14: lw    v1, 13284(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062b08: 0x1062b08: lw    v0, 16(sp)
+// 0x01062b18: 0x1062b18: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4992,23 +4992,23 @@ L_1062a68:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01062b0c: 0x1062b0c: addiu v1, v1, 1
+// 0x01062b1c: 0x1062b1c: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01062b10: 0x1062b10: sw    v1, 12820(s3)
+// 0x01062b20: 0x1062b20: sw    v1, 13284(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldloc 5
 	stelem.i4
-L_1062b14:
-// 0x01062b14: 0x1062b14: lw    ra, 44(sp)
-// 0x01062b18: 0x1062b18: lw    s4, 40(sp)
+L_1062b24:
+// 0x01062b24: 0x1062b24: lw    ra, 44(sp)
+// 0x01062b28: 0x1062b28: lw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5017,7 +5017,7 @@ L_1062b14:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01062b1c: 0x1062b1c: lw    s3, 36(sp)
+// 0x01062b2c: 0x1062b2c: lw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5026,7 +5026,7 @@ L_1062b14:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01062b20: 0x1062b20: lw    s2, 32(sp)
+// 0x01062b30: 0x1062b30: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5035,7 +5035,7 @@ L_1062b14:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01062b24: 0x1062b24: lw    s1, 28(sp)
+// 0x01062b34: 0x1062b34: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5044,7 +5044,7 @@ L_1062b14:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01062b28: 0x1062b28: lw    s0, 24(sp)
+// 0x01062b38: 0x1062b38: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5053,7 +5053,7 @@ L_1062b14:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01062b2c: 0x1062b2c: jr    ra addiu sp, sp, 48
+// 0x01062b3c: 0x1062b3c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5065,7 +5065,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 find_prev_1062b34(int32,int32,int32,int32,int32)
+.method public static int32 find_prev_1062b44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s4,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -5118,17 +5118,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01062b34: 0x1062b34: addiu sp, sp, -48
+// 0x01062b44: 0x1062b44: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01062b38: 0x1062b38: sll   v0, a0, 16
+// 0x01062b48: 0x1062b48: sll   v0, a0, 16
 	ldloc.1
 	ldc.i4.s 16
 	shl
 	stloc 5
-// 0x01062b3c: 0x1062b3c: sw    s1, 28(sp)
+// 0x01062b4c: 0x1062b4c: sw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5137,23 +5137,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01062b40: 0x1062b40: addu  s1, a1, zero
+// 0x01062b50: 0x1062b50: addu  s1, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01062b44: 0x1062b44: sll   a1, a1, 1
+// 0x01062b54: 0x1062b54: sll   a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	shl
 	stloc.2
-// 0x01062b48: 0x1062b48: addu  a1, a1, v0
+// 0x01062b58: 0x1062b58: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x01062b4c: 0x1062b4c: lui   v0, 0x70000
+// 0x01062b5c: 0x1062b5c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01062b50: 0x1062b50: sw    s0, 24(sp)
+// 0x01062b60: 0x1062b60: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5162,29 +5162,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01062b54: 0x1062b54: addu  s0, a0, zero
+// 0x01062b64: 0x1062b64: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01062b58: 0x1062b58: lw    a0, 12824(v0)
+// 0x01062b68: 0x1062b68: lw    a0, 13288(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3206
+	ldc.i4 3322
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062b5c: 0x1062b5c: sltu  v0, zero, a2
+// 0x01062b6c: 0x1062b6c: sltu  v0, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc 5
-// 0x01062b60: 0x1062b60: addu  a1, a1, v0
+// 0x01062b70: 0x1062b70: addu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc.2
-// 0x01062b64: 0x1062b64: sw    a2, 16(sp)
+// 0x01062b74: 0x1062b74: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5193,8 +5193,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01062b68: 0x1062b68: sw    ra, 44(sp)
-// 0x01062b6c: 0x1062b6c: sw    s4, 40(sp)
+// 0x01062b78: 0x1062b78: sw    ra, 44(sp)
+// 0x01062b7c: 0x1062b7c: sw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5203,7 +5203,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01062b70: 0x1062b70: sw    s3, 36(sp)
+// 0x01062b80: 0x1062b80: sw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5212,7 +5212,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01062b74: 0x1062b74: jal   0x1015518 sw    s2, 32(sp)
+// 0x01062b84: 0x1062b84: jal   0x1015528 sw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5223,10 +5223,10 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl15::roadmap_hash_get_first_1015518(int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_first_1015528(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01062b7c: 0x1062b7c: lw    a2, 16(sp)
+// 0x01062b8c: 0x1062b8c: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5235,143 +5235,143 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01062b80: 0x1062b80: sll   zero, zero, 0
-// 0x01062b84: 0x1062b84: beq   a2, zero, 0x1062bdc lui   s4, 0x70000
+// 0x01062b90: 0x1062b90: sll   zero, zero, 0
+// 0x01062b94: 0x1062b94: beq   a2, zero, 0x1062bec lui   s4, 0x70000
 	ldloc.3
 	ldc.i4 458752
 	stloc 9
-	brfalse L_1062bdc
+	brfalse L_1062bec
 // --- basic block ---
-// 0x01062b8c: 0x1062b8c: lui   v1, 0x80000000
+// 0x01062b9c: 0x1062b9c: lui   v1, 0x80000000
 	ldc.i4 2147483648
 	stloc 7
-// 0x01062b90: 0x1062b90: j	 0x1062bdc or    s0, s0, v1
+// 0x01062ba0: 0x1062ba0: j	 0x1062bec or    s0, s0, v1
 	ldloc 8
 	ldloc 7
 	or
 	stloc 8
-	br L_1062bdc
+	br L_1062bec
 // --- basic block ---
-L_1062b98:
-// 0x01062b98: 0x1062b98: mult  a0, s3
+L_1062ba8:
+// 0x01062ba8: 0x1062ba8: mult  a0, s3
 	ldloc.1
 	ldloc 12
 	mul
 	stloc 14
-// 0x01062b9c: 0x1062b9c: lw    v0, 0(v1)
+// 0x01062bac: 0x1062bac: lw    v0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01062ba0: 0x1062ba0: mflo  lo
+// 0x01062bb0: 0x1062bb0: mflo  lo
 	ldloc 14
 	stloc.1
-// 0x01062ba4: 0x1062ba4: addu  v0, v0, a0
+// 0x01062bb4: 0x1062bb4: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01062ba8: 0x1062ba8: lw    v1, 0(v0)
+// 0x01062bb8: 0x1062bb8: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01062bac: 0x1062bac: sll   zero, zero, 0
-// 0x01062bb0: 0x1062bb0: bne   v1, s0, 0x1062bc8 sll   zero, zero, 0
+// 0x01062bbc: 0x1062bbc: sll   zero, zero, 0
+// 0x01062bc0: 0x1062bc0: bne   v1, s0, 0x1062bd8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 8
-	bne.un L_1062bc8
+	bne.un L_1062bd8
 // --- basic block ---
-// 0x01062bb8: 0x1062bb8: lhu   v1, 8(v0)
+// 0x01062bc8: 0x1062bc8: lhu   v1, 8(v0)
 	ldloc 5
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 7
-// 0x01062bbc: 0x1062bbc: sll   zero, zero, 0
-// 0x01062bc0: 0x1062bc0: beq   v1, s1, 0x1062c04 sll   zero, zero, 0
+// 0x01062bcc: 0x1062bcc: sll   zero, zero, 0
+// 0x01062bd0: 0x1062bd0: beq   v1, s1, 0x1062c14 sll   zero, zero, 0
 	ldloc 7
 	ldloc 10
-	beq  L_1062c04
+	beq  L_1062c14
 // --- basic block ---
-L_1062bc8:
-// 0x01062bc8: 0x1062bc8: lw    a0, 12824(s2)
+L_1062bd8:
+// 0x01062bd8: 0x1062bd8: lw    a0, 13288(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 3206
+	ldc.i4 3322
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062bcc: 0x1062bcc: jal   0x1015744 sll   zero, zero, 0
+// 0x01062bdc: 0x1062bdc: jal   0x1015754 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_get_next_1015744(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_get_next_1015754(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062bd4: 0x1062bd4: j	 0x1062bec sra   v1, v0, 12
+// 0x01062be4: 0x1062be4: j	 0x1062bfc sra   v1, v0, 12
 	ldloc 5
 	ldc.i4.s 12
 	shr
 	stloc 7
-	br L_1062bec
+	br L_1062bfc
 // --- basic block ---
-L_1062bdc:
-// 0x01062bdc: 0x1062bdc: addiu s4, s4, 12836
+L_1062bec:
+// 0x01062bec: 0x1062bec: addiu s4, s4, 13300
 	ldloc 9
-	ldc.i4 12836
+	ldc.i4 13300
 	add
 	stloc 9
-// 0x01062be0: 0x1062be0: addiu s3, zero, 12
+// 0x01062bf0: 0x1062bf0: addiu s3, zero, 12
 	ldc.i4.s 12
 	stloc 12
-// 0x01062be4: 0x1062be4: lui   s2, 0x70000
+// 0x01062bf4: 0x1062bf4: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x01062be8: 0x1062be8: sra   v1, v0, 12
+// 0x01062bf8: 0x1062bf8: sra   v1, v0, 12
 	ldloc 5
 	ldc.i4.s 12
 	shr
 	stloc 7
-L_1062bec:
-// 0x01062bec: 0x1062bec: sll   v1, v1, 2
+L_1062bfc:
+// 0x01062bfc: 0x1062bfc: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01062bf0: 0x1062bf0: andi  a0, v0, 4095
+// 0x01062c00: 0x1062c00: andi  a0, v0, 4095
 	ldloc 5
 	ldc.i4 4095
 	and
 	stloc.1
-// 0x01062bf4: 0x1062bf4: addu  v1, v1, s4
+// 0x01062c04: 0x1062c04: addu  v1, v1, s4
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-// 0x01062bf8: 0x1062bf8: bgez  v0, 0x1062b98 addu  a1, v0, zero
+// 0x01062c08: 0x1062c08: bgez  v0, 0x1062ba8 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
 	ldc.i4.s 0
-	bge L_1062b98
+	bge L_1062ba8
 // --- basic block ---
-// 0x01062c00: 0x1062c00: addu  v0, zero, zero
+// 0x01062c10: 0x1062c10: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1062c04:
-// 0x01062c04: 0x1062c04: lw    ra, 44(sp)
-// 0x01062c08: 0x1062c08: lw    s4, 40(sp)
+L_1062c14:
+// 0x01062c14: 0x1062c14: lw    ra, 44(sp)
+// 0x01062c18: 0x1062c18: lw    s4, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5380,7 +5380,7 @@ L_1062c04:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01062c0c: 0x1062c0c: lw    s3, 36(sp)
+// 0x01062c1c: 0x1062c1c: lw    s3, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5389,7 +5389,7 @@ L_1062c04:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01062c10: 0x1062c10: lw    s2, 32(sp)
+// 0x01062c20: 0x1062c20: lw    s2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5398,7 +5398,7 @@ L_1062c04:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01062c14: 0x1062c14: lw    s1, 28(sp)
+// 0x01062c24: 0x1062c24: lw    s1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5407,7 +5407,7 @@ L_1062c04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01062c18: 0x1062c18: lw    s0, 24(sp)
+// 0x01062c28: 0x1062c28: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5416,7 +5416,7 @@ L_1062c04:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01062c1c: 0x1062c1c: jr    ra addiu sp, sp, 48
+// 0x01062c2c: 0x1062c2c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5428,7 +5428,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 make_queue_1062c24(int32,int32,int32,int32,int32)
+.method public static int32 make_queue_1062c34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
@@ -5466,16 +5466,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01062c24: 0x1062c24: addiu sp, sp, -40
+// 0x01062c34: 0x1062c34: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01062c28: 0x1062c28: addu  a3, a0, zero
+// 0x01062c38: 0x1062c38: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01062c2c: 0x1062c2c: sw    ra, 36(sp)
-// 0x01062c30: 0x1062c30: sw    a1, 16(sp)
+// 0x01062c3c: 0x1062c3c: sw    ra, 36(sp)
+// 0x01062c40: 0x1062c40: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5484,7 +5484,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01062c34: 0x1062c34: sw    a2, 20(sp)
+// 0x01062c44: 0x1062c44: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5493,7 +5493,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01062c38: 0x1062c38: jal   0x10629ac sw    s0, 32(sp)
+// 0x01062c48: 0x1062c48: jal   0x10629bc sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5507,12 +5507,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::make_path_10629ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::make_path_10629bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01062c40: 0x1062c40: jal   0x1067274 sw    v0, 24(sp)
+// 0x01062c50: 0x1062c50: jal   0x1067284 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5526,12 +5526,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_makekeyheap_1067274(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_makekeyheap_1067284(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01062c48: 0x1062c48: lw    a2, 24(sp)
+// 0x01062c58: 0x1062c58: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5540,13 +5540,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01062c4c: 0x1062c4c: addu  a0, v0, zero
+// 0x01062c5c: 0x1062c5c: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01062c50: 0x1062c50: addu  a1, zero, zero
+// 0x01062c60: 0x1062c60: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01062c54: 0x1062c54: jal   0x10671c4 addu  s0, v0, zero
+// 0x01062c64: 0x1062c64: jal   0x10671d4 addu  s0, v0, zero
 	ldloc 6
 	stloc 7
 	ldloc.0
@@ -5554,16 +5554,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_insertkey_10671c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_insertkey_10671d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01062c5c: 0x1062c5c: lw    ra, 36(sp)
-// 0x01062c60: 0x1062c60: addu  v0, s0, zero
+// 0x01062c6c: 0x1062c6c: lw    ra, 36(sp)
+// 0x01062c70: 0x1062c70: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01062c64: 0x1062c64: lw    s0, 32(sp)
+// 0x01062c74: 0x1062c74: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5572,7 +5572,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01062c68: 0x1062c68: jr    ra addiu sp, sp, 40
+// 0x01062c78: 0x1062c78: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5584,7 +5584,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 astar_1062c70(int32,int32,int32,int32,int32)
+.method public static int32 astar_1062c80(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t3,int32 t0,int32 s0,int32 s1,int32 s3,int32 s2,int32 lo,int32 s4,int32 s5,int32 s6,int32 s8,int32 s7,int32 t4,int32 ra,int32 t1,int32 t2)
@@ -5664,12 +5664,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01062c70: 0x1062c70: addiu sp, sp, -2416
+// 0x01062c80: 0x1062c80: addiu sp, sp, -2416
 	ldloc.0
 	ldc.i4 -2416
 	add
 	stloc.0
-// 0x01062c74: 0x1062c74: sw    s4, 2392(sp)
+// 0x01062c84: 0x1062c84: sw    s4, 2392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5678,7 +5678,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01062c78: 0x1062c78: lw    s4, 2444(sp)
+// 0x01062c88: 0x1062c88: lw    s4, 2444(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5687,7 +5687,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01062c7c: 0x1062c7c: sw    a0, 2416(sp)
+// 0x01062c8c: 0x1062c8c: sw    a0, 2416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5696,35 +5696,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01062c80: 0x1062c80: lw    v0, 0(s4)
+// 0x01062c90: 0x1062c90: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01062c84: 0x1062c84: sw    ra, 2412(sp)
-// 0x01062c88: 0x1062c88: sll   v1, v0, 27
+// 0x01062c94: 0x1062c94: sw    ra, 2412(sp)
+// 0x01062c98: 0x1062c98: sll   v1, v0, 27
 	ldloc 5
 	ldc.i4.s 27
 	shl
 	stloc 7
-// 0x01062c8c: 0x1062c8c: sra   v1, v1, 31
+// 0x01062c9c: 0x1062c9c: sra   v1, v1, 31
 	ldloc 7
 	ldc.i4.s 31
 	shr
 	stloc 7
-// 0x01062c90: 0x1062c90: andi  v1, v1, 5
+// 0x01062ca0: 0x1062ca0: andi  v1, v1, 5
 	ldloc 7
 	ldc.i4.5
 	and
 	stloc 7
-// 0x01062c94: 0x1062c94: andi  v0, v0, 2
+// 0x01062ca4: 0x1062ca4: andi  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	and
 	stloc 5
-// 0x01062c98: 0x1062c98: sw    v1, 2348(sp)
+// 0x01062ca8: 0x1062ca8: sw    v1, 2348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5733,7 +5733,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01062c9c: 0x1062c9c: sw    v0, 2356(sp)
+// 0x01062cac: 0x1062cac: sw    v0, 2356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5742,7 +5742,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062ca0: 0x1062ca0: lw    v1, 2432(sp)
+// 0x01062cb0: 0x1062cb0: lw    v1, 2432(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5751,7 +5751,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01062ca4: 0x1062ca4: lw    v0, 2432(sp)
+// 0x01062cb4: 0x1062cb4: lw    v0, 2432(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5760,7 +5760,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062ca8: 0x1062ca8: lw    v1, 4(v1)
+// 0x01062cb8: 0x1062cb8: lw    v1, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5769,7 +5769,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01062cac: 0x1062cac: lw    v0, 12(v0)
+// 0x01062cbc: 0x1062cbc: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5778,7 +5778,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062cb0: 0x1062cb0: sw    s0, 2376(sp)
+// 0x01062cc0: 0x1062cc0: sw    s0, 2376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5787,7 +5787,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01062cb4: 0x1062cb4: sw    a2, 2424(sp)
+// 0x01062cc4: 0x1062cc4: sw    a2, 2424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5796,10 +5796,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01062cb8: 0x1062cb8: addu  s0, a1, zero
+// 0x01062cc8: 0x1062cc8: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01062cbc: 0x1062cbc: sw    a3, 2428(sp)
+// 0x01062ccc: 0x1062ccc: sw    a3, 2428(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5808,7 +5808,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01062cc0: 0x1062cc0: sw    v1, 2352(sp)
+// 0x01062cd0: 0x1062cd0: sw    v1, 2352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5817,7 +5817,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01062cc4: 0x1062cc4: sw    s8, 2408(sp)
+// 0x01062cd4: 0x1062cd4: sw    s8, 2408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5826,7 +5826,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01062cc8: 0x1062cc8: sw    s7, 2404(sp)
+// 0x01062cd8: 0x1062cd8: sw    s7, 2404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5835,7 +5835,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01062ccc: 0x1062ccc: sw    s6, 2400(sp)
+// 0x01062cdc: 0x1062cdc: sw    s6, 2400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5844,7 +5844,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01062cd0: 0x1062cd0: sw    s5, 2396(sp)
+// 0x01062ce0: 0x1062ce0: sw    s5, 2396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5853,7 +5853,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01062cd4: 0x1062cd4: sw    s3, 2388(sp)
+// 0x01062ce4: 0x1062ce4: sw    s3, 2388(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5862,7 +5862,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01062cd8: 0x1062cd8: sw    s2, 2384(sp)
+// 0x01062ce8: 0x1062ce8: sw    s2, 2384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5871,7 +5871,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01062cdc: 0x1062cdc: sw    s1, 2380(sp)
+// 0x01062cec: 0x1062cec: sw    s1, 2380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5880,7 +5880,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01062ce0: 0x1062ce0: jal   0x10613a0 sw    v0, 2280(sp)
+// 0x01062cf0: 0x1062cf0: jal   0x10613b0 sw    v0, 2280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5894,12 +5894,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_get_10613a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_get_10613b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062ce8: 0x1062ce8: jal   0x106136c sw    v0, 2344(sp)
+// 0x01062cf8: 0x1062cf8: jal   0x106137c sw    v0, 2344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5913,12 +5913,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_type_106136c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_type_106137c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062cf0: 0x1062cf0: lw    a0, 2448(sp)
+// 0x01062d00: 0x1062d00: lw    a0, 2448(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5927,7 +5927,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062cf4: 0x1062cf4: sw    v0, 2312(sp)
+// 0x01062d04: 0x1062d04: sw    v0, 2312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5936,20 +5936,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062cf8: 0x1062cf8: addiu v0, zero, -1
+// 0x01062d08: 0x1062d08: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01062cfc: 0x1062cfc: sw    v0, 0(a0)
+// 0x01062d0c: 0x1062d0c: sw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01062d00: 0x1062d00: lui   v0, 0x0
+// 0x01062d10: 0x1062d10: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01062d04: 0x1062d04: lw    v0, 576(v0)
+// 0x01062d14: 0x1062d14: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5958,7 +5958,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062d08: 0x1062d08: lw    a1, 2280(sp)
+// 0x01062d18: 0x1062d18: lw    a1, 2280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5967,18 +5967,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01062d0c: 0x1062d0c: sll   zero, zero, 0
-// 0x01062d10: 0x1062d10: beq   a1, v0, 0x1062d28 sll   zero, zero, 0
+// 0x01062d1c: 0x1062d1c: sll   zero, zero, 0
+// 0x01062d20: 0x1062d20: beq   a1, v0, 0x1062d38 sll   zero, zero, 0
 	ldloc.2
 	ldloc 5
-	beq  L_1062d28
+	beq  L_1062d38
 // --- basic block ---
-// 0x01062d18: 0x1062d18: bltz  a1, 0x1062d28 sll   zero, zero, 0
+// 0x01062d28: 0x1062d28: bltz  a1, 0x1062d38 sll   zero, zero, 0
 	ldloc.2
 	ldc.i4.s 0
-	blt L_1062d28
+	blt L_1062d38
 // --- basic block ---
-// 0x01062d20: 0x1062d20: jal   0x100b164 addu  a0, a1, zero
+// 0x01062d30: 0x1062d30: jal   0x100b174 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -5986,13 +5986,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1062d28:
-// 0x01062d28: 0x1062d28: lw    a2, 2436(sp)
+L_1062d38:
+// 0x01062d38: 0x1062d38: lw    a2, 2436(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6001,60 +6001,60 @@ L_1062d28:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01062d2c: 0x1062d2c: lui   v0, 0x20000
+// 0x01062d3c: 0x1062d3c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01062d30: 0x1062d30: lw    v1, 0(a2)
+// 0x01062d40: 0x1062d40: lw    v1, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01062d34: 0x1062d34: lw    v0, 31228(v0)
+// 0x01062d44: 0x1062d44: lw    v0, 31692(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062d38: 0x1062d38: andi  v1, v1, 32767
+// 0x01062d48: 0x1062d48: andi  v1, v1, 32767
 	ldloc 7
 	ldc.i4 32767
 	and
 	stloc 7
-// 0x01062d3c: 0x1062d3c: sll   v1, v1, 3
+// 0x01062d4c: 0x1062d4c: sll   v1, v1, 3
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 7
-// 0x01062d40: 0x1062d40: addu  v1, v0, v1
+// 0x01062d50: 0x1062d50: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01062d44: 0x1062d44: lw    a0, 0(v1)
+// 0x01062d54: 0x1062d54: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01062d48: 0x1062d48: lui   v0, 0x70000
+// 0x01062d58: 0x1062d58: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01062d4c: 0x1062d4c: sw    a0, 12828(v0)
+// 0x01062d5c: 0x1062d5c: sw    a0, 13292(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3207
+	ldc.i4 3323
 	add
 	ldloc.1
 	stelem.i4
-// 0x01062d50: 0x1062d50: lw    v1, 4(v1)
+// 0x01062d60: 0x1062d60: lw    v1, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6063,12 +6063,12 @@ L_1062d28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01062d54: 0x1062d54: addiu v0, v0, 12828
+// 0x01062d64: 0x1062d64: addiu v0, v0, 13292
 	ldloc 5
-	ldc.i4 12828
+	ldc.i4 13292
 	add
 	stloc 5
-// 0x01062d58: 0x1062d58: lw    t0, 2416(sp)
+// 0x01062d68: 0x1062d68: lw    t0, 2416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6077,7 +6077,7 @@ L_1062d28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01062d5c: 0x1062d5c: sw    v1, 4(v0)
+// 0x01062d6c: 0x1062d6c: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6086,10 +6086,10 @@ L_1062d28:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01062d60: 0x1062d60: lui   v0, 0x0
+// 0x01062d70: 0x1062d70: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01062d64: 0x1062d64: lw    v0, 576(v0)
+// 0x01062d74: 0x1062d74: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6098,73 +6098,73 @@ L_1062d28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062d68: 0x1062d68: lw    a0, 0(t0)
+// 0x01062d78: 0x1062d78: lw    a0, 0(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01062d6c: 0x1062d6c: sll   zero, zero, 0
-// 0x01062d70: 0x1062d70: beq   a0, v0, 0x1062d88 lui   s2, 0x20000
+// 0x01062d7c: 0x1062d7c: sll   zero, zero, 0
+// 0x01062d80: 0x1062d80: beq   a0, v0, 0x1062d98 lui   s2, 0x20000
 	ldloc.1
 	ldloc 5
 	ldc.i4 131072
 	stloc 13
-	beq  L_1062d88
+	beq  L_1062d98
 // --- basic block ---
-// 0x01062d78: 0x1062d78: bltz  a0, 0x1062d88 sll   zero, zero, 0
+// 0x01062d88: 0x1062d88: bltz  a0, 0x1062d98 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1062d88
+	blt L_1062d98
 // --- basic block ---
-// 0x01062d80: 0x1062d80: jal   0x100b164 sll   zero, zero, 0
+// 0x01062d90: 0x1062d90: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1062d88:
-// 0x01062d88: 0x1062d88: lw    v0, 31228(s2)
+L_1062d98:
+// 0x01062d98: 0x1062d98: lw    v0, 31692(s2)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062d8c: 0x1062d8c: andi  s0, s0, 32767
+// 0x01062d9c: 0x1062d9c: andi  s0, s0, 32767
 	ldloc 10
 	ldc.i4 32767
 	and
 	stloc 10
-// 0x01062d90: 0x1062d90: sll   s0, s0, 3
+// 0x01062da0: 0x1062da0: sll   s0, s0, 3
 	ldloc 10
 	ldc.i4.3
 	shl
 	stloc 10
-// 0x01062d94: 0x1062d94: addu  s0, v0, s0
+// 0x01062da4: 0x1062da4: addu  s0, v0, s0
 	ldloc 5
 	ldloc 10
 	add
 	stloc 10
-// 0x01062d98: 0x1062d98: lw    v0, 0(s0)
+// 0x01062da8: 0x1062da8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01062d9c: 0x1062d9c: lui   s1, 0x70000
+// 0x01062dac: 0x1062dac: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 11
-// 0x01062da0: 0x1062da0: sw    v0, 36(sp)
+// 0x01062db0: 0x1062db0: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6173,7 +6173,7 @@ L_1062d88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062da4: 0x1062da4: lw    v0, 4(s0)
+// 0x01062db4: 0x1062db4: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6182,17 +6182,17 @@ L_1062d88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062da8: 0x1062da8: addiu a1, s1, 12828
+// 0x01062db8: 0x1062db8: addiu a1, s1, 13292
 	ldloc 11
-	ldc.i4 12828
+	ldc.i4 13292
 	add
 	stloc.2
-// 0x01062dac: 0x1062dac: addiu a0, sp, 36
+// 0x01062dbc: 0x1062dbc: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x01062db0: 0x1062db0: jal   0x1008eb0 sw    v0, 40(sp)
+// 0x01062dc0: 0x1062dc0: jal   0x1008ec0 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6206,15 +6206,15 @@ L_1062d88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062db8: 0x1062db8: addu  a0, v0, zero
+// 0x01062dc8: 0x1062dc8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01062dbc: 0x1062dbc: lw    v0, 36(sp)
+// 0x01062dcc: 0x1062dcc: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6223,10 +6223,10 @@ L_1062d88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062dc0: 0x1062dc0: addu  s0, zero, zero
+// 0x01062dd0: 0x1062dd0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x01062dc4: 0x1062dc4: sw    v0, 44(sp)
+// 0x01062dd4: 0x1062dd4: sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6235,7 +6235,7 @@ L_1062d88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062dc8: 0x1062dc8: lw    v0, 40(sp)
+// 0x01062dd8: 0x1062dd8: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6244,7 +6244,7 @@ L_1062d88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062dcc: 0x1062dcc: jal   0x10c09ac sw    v0, 48(sp)
+// 0x01062ddc: 0x1062ddc: jal   0x10c0fec sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6258,30 +6258,30 @@ L_1062d88:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01062dd4: 0x1062dd4: lui   v1, 0x20000
+// 0x01062de4: 0x1062de4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01062dd8: 0x1062dd8: lw    a0, 23628(v1)
+// 0x01062de8: 0x1062de8: lw    a0, 24088(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 5907
+	ldc.i4 6022
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062ddc: 0x1062ddc: jal   0x10c07d8 addu  a1, v0, zero
+// 0x01062dec: 0x1062dec: jal   0x10c0e18 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__divsf3_10c07d8(int32,int32)
+	call int32 Cibyl143::__divsf3_10c0e18(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01062de4: 0x1062de4: addiu t3, zero, 301
+// 0x01062df4: 0x1062df4: addiu t3, zero, 301
 	ldc.i4 301
 	stloc 8
-// 0x01062de8: 0x1062de8: sw    v0, 2340(sp)
+// 0x01062df8: 0x1062df8: sw    v0, 2340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6290,7 +6290,7 @@ L_1062d88:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062dec: 0x1062dec: sw    zero, 2304(sp)
+// 0x01062dfc: 0x1062dfc: sw    zero, 2304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6299,7 +6299,7 @@ L_1062d88:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062df0: 0x1062df0: sw    t3, 2296(sp)
+// 0x01062e00: 0x1062e00: sw    t3, 2296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6308,7 +6308,7 @@ L_1062d88:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01062df4: 0x1062df4: sw    zero, 2328(sp)
+// 0x01062e04: 0x1062e04: sw    zero, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6317,7 +6317,7 @@ L_1062d88:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062df8: 0x1062df8: sw    zero, 2292(sp)
+// 0x01062e08: 0x1062e08: sw    zero, 2292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6326,7 +6326,7 @@ L_1062d88:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062dfc: 0x1062dfc: sw    zero, 2320(sp)
+// 0x01062e0c: 0x1062e0c: sw    zero, 2320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6335,7 +6335,7 @@ L_1062d88:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062e00: 0x1062e00: sw    zero, 2324(sp)
+// 0x01062e10: 0x1062e10: sw    zero, 2324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6344,7 +6344,7 @@ L_1062d88:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01062e04: 0x1062e04: j	 0x1062f54 sw    zero, 2332(sp)
+// 0x01062e14: 0x1062e14: j	 0x1062f64 sw    zero, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6353,23 +6353,23 @@ L_1062d88:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1062f54
+	br L_1062f64
 // --- basic block ---
-L_1062e0c:
-// 0x01062e0c: 0x1062e0c: beq   v0, zero, 0x10634b4 addiu v0, s0, 1
+L_1062e1c:
+// 0x01062e1c: 0x1062e1c: beq   v0, zero, 0x10634c4 addiu v0, s0, 1
 	ldloc 5
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 5
-	brfalse L_10634b4
+	brfalse L_10634c4
 // --- basic block ---
-// 0x01062e14: 0x1062e14: addiu a0, sp, 44
+// 0x01062e24: 0x1062e24: addiu a0, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.1
-// 0x01062e18: 0x1062e18: sw    v0, 20(sp)
+// 0x01062e28: 0x1062e28: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6378,24 +6378,24 @@ L_1062e0c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062e1c: 0x1062e1c: addiu s1, sp, 192
+// 0x01062e2c: 0x1062e2c: addiu s1, sp, 192
 	ldloc.0
 	ldc.i4 192
 	add
 	stloc 11
-// 0x01062e20: 0x1062e20: addiu v0, zero, 2
+// 0x01062e30: 0x1062e30: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01062e24: 0x1062e24: addu  a1, zero, zero
+// 0x01062e34: 0x1062e34: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01062e28: 0x1062e28: addiu a2, zero, 300
+// 0x01062e38: 0x1062e38: addiu a2, zero, 300
 	ldc.i4 300
 	stloc.3
-// 0x01062e2c: 0x1062e2c: addiu a3, zero, 1
+// 0x01062e3c: 0x1062e3c: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01062e30: 0x1062e30: sw    v0, 24(sp)
+// 0x01062e40: 0x1062e40: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6404,7 +6404,7 @@ L_1062e0c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01062e34: 0x1062e34: jal   0x102a6ec sw    s1, 16(sp)
+// 0x01062e44: 0x1062e44: jal   0x102a6fc sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6418,61 +6418,61 @@ L_1062e0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_neighbours_102a6ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_neighbours_102a6fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062e3c: 0x1062e3c: addu  a0, zero, zero
+// 0x01062e4c: 0x1062e4c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01062e40: 0x1062e40: addu  v1, zero, zero
+// 0x01062e50: 0x1062e50: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01062e44: 0x1062e44: addiu t2, sp, 72
+// 0x01062e54: 0x1062e54: addiu t2, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 23
-// 0x01062e48: 0x1062e48: addiu t1, zero, 1
+// 0x01062e58: 0x1062e58: addiu t1, zero, 1
 	ldc.i4.1
 	stloc 22
-// 0x01062e4c: 0x1062e4c: j	 0x1062ed4 addiu t0, sp, 152
+// 0x01062e5c: 0x1062e5c: j	 0x1062ee4 addiu t0, sp, 152
 	ldloc.0
 	ldc.i4 152
 	add
 	stloc 9
-	br L_1062ed4
+	br L_1062ee4
 // --- basic block ---
-L_1062e54:
-// 0x01062e54: 0x1062e54: lw    a1, 0(s1)
+L_1062e64:
+// 0x01062e64: 0x1062e64: lw    a1, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01062e58: 0x1062e58: sll   zero, zero, 0
-// 0x01062e5c: 0x1062e5c: bne   a1, zero, 0x1062ecc addu  a2, zero, zero
+// 0x01062e68: 0x1062e68: sll   zero, zero, 0
+// 0x01062e6c: 0x1062e6c: bne   a1, zero, 0x1062edc addu  a2, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_1062ecc
+	brtrue L_1062edc
 // --- basic block ---
-// 0x01062e64: 0x1062e64: j	 0x1062eb0 addu  a3, zero, zero
+// 0x01062e74: 0x1062e74: j	 0x1062ec0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_1062eb0
+	br L_1062ec0
 // --- basic block ---
-L_1062e6c:
-// 0x01062e6c: 0x1062e6c: lw    t3, 0(t4)
+L_1062e7c:
+// 0x01062e7c: 0x1062e7c: lw    t3, 0(t4)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01062e70: 0x1062e70: lw    t4, 12(s1)
+// 0x01062e80: 0x1062e80: lw    t4, 12(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6481,24 +6481,24 @@ L_1062e6c:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01062e74: 0x1062e74: sll   zero, zero, 0
-// 0x01062e78: 0x1062e78: bne   t4, t3, 0x1062ea8 addu  t3, t2, a1
+// 0x01062e84: 0x1062e84: sll   zero, zero, 0
+// 0x01062e88: 0x1062e88: bne   t4, t3, 0x1062eb8 addu  t3, t2, a1
 	ldloc 20
 	ldloc 8
 	ldloc 23
 	ldloc.2
 	add
 	stloc 8
-	bne.un L_1062ea8
+	bne.un L_1062eb8
 // --- basic block ---
-// 0x01062e80: 0x1062e80: lw    t3, 0(t3)
+// 0x01062e90: 0x1062e90: lw    t3, 0(t3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01062e84: 0x1062e84: lw    t4, 4(s1)
+// 0x01062e94: 0x1062e94: lw    t4, 4(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -6507,126 +6507,126 @@ L_1062e6c:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01062e88: 0x1062e88: sll   zero, zero, 0
-// 0x01062e8c: 0x1062e8c: bne   t4, t3, 0x1062ea8 sll   zero, zero, 0
+// 0x01062e98: 0x1062e98: sll   zero, zero, 0
+// 0x01062e9c: 0x1062e9c: bne   t4, t3, 0x1062eb8 sll   zero, zero, 0
 	ldloc 20
 	ldloc 8
-	bne.un L_1062ea8
+	bne.un L_1062eb8
 // --- basic block ---
-// 0x01062e94: 0x1062e94: beq   a3, t1, 0x1062ec4 addu  t3, t0, a1
+// 0x01062ea4: 0x1062ea4: beq   a3, t1, 0x1062ed4 addu  t3, t0, a1
 	ldloc 4
 	ldloc 22
 	ldloc 9
 	ldloc.2
 	add
 	stloc 8
-	beq  L_1062ec4
+	beq  L_1062ed4
 // --- basic block ---
-// 0x01062e9c: 0x1062e9c: lw    a0, 0(t3)
+// 0x01062eac: 0x1062eac: lw    a0, 0(t3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01062ea0: 0x1062ea0: addiu a3, zero, 1
+// 0x01062eb0: 0x1062eb0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01062ea4: 0x1062ea4: sltiu a0, a0, 1
+// 0x01062eb4: 0x1062eb4: sltiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
 	stloc.1
-L_1062ea8:
-// 0x01062ea8: 0x1062ea8: addiu a2, a2, 1
+L_1062eb8:
+// 0x01062eb8: 0x1062eb8: addiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01062eac: 0x1062eac: addiu a1, a1, 4
+// 0x01062ebc: 0x1062ebc: addiu a1, a1, 4
 	ldloc.2
 	ldc.i4.4
 	add
 	stloc.2
-L_1062eb0:
-// 0x01062eb0: 0x1062eb0: addiu t3, sp, 112
+L_1062ec0:
+// 0x01062ec0: 0x1062ec0: addiu t3, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
 	stloc 8
-// 0x01062eb4: 0x1062eb4: addu  t4, t3, a1
+// 0x01062ec4: 0x1062ec4: addu  t4, t3, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc 20
-// 0x01062eb8: 0x1062eb8: slt   t3, a2, s0
+// 0x01062ec8: 0x1062ec8: slt   t3, a2, s0
 	ldloc.3
 	ldloc 10
 	clt
 	stloc 8
-// 0x01062ebc: 0x1062ebc: bne   t3, zero, 0x1062e6c sll   zero, zero, 0
+// 0x01062ecc: 0x1062ecc: bne   t3, zero, 0x1062e7c sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1062e6c
+	brtrue L_1062e7c
 // --- basic block ---
-L_1062ec4:
-// 0x01062ec4: 0x1062ec4: beq   a2, s0, 0x1062ee8 addiu a1, zero, 6
+L_1062ed4:
+// 0x01062ed4: 0x1062ed4: beq   a2, s0, 0x1062ef8 addiu a1, zero, 6
 	ldloc.3
 	ldloc 10
 	ldc.i4.6
 	stloc.2
-	beq  L_1062ee8
+	beq  L_1062ef8
 // --- basic block ---
-L_1062ecc:
-// 0x01062ecc: 0x1062ecc: addiu v1, v1, 1
+L_1062edc:
+// 0x01062edc: 0x1062edc: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01062ed0: 0x1062ed0: addiu s1, s1, 48
+// 0x01062ee0: 0x1062ee0: addiu s1, s1, 48
 	ldloc 11
 	ldc.i4.s 48
 	add
 	stloc 11
-L_1062ed4:
-// 0x01062ed4: 0x1062ed4: slt   a1, v1, v0
+L_1062ee4:
+// 0x01062ee4: 0x1062ee4: slt   a1, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc.2
-// 0x01062ed8: 0x1062ed8: bne   a1, zero, 0x1062e54 sll   zero, zero, 0
+// 0x01062ee8: 0x1062ee8: bne   a1, zero, 0x1062e64 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1062e54
+	brtrue L_1062e64
 // --- basic block ---
-// 0x01062ee0: 0x1062ee0: j	 0x1062f54 sll   zero, zero, 0
-	br L_1062f54
+// 0x01062ef0: 0x1062ef0: j	 0x1062f64 sll   zero, zero, 0
+	br L_1062f64
 // --- basic block ---
-L_1062ee8:
-// 0x01062ee8: 0x1062ee8: mult  v1, a1
+L_1062ef8:
+// 0x01062ef8: 0x1062ef8: mult  v1, a1
 	ldloc 7
 	ldloc.2
 	mul
 	stloc 14
-// 0x01062eec: 0x1062eec: subu  a0, zero, a0
+// 0x01062efc: 0x1062efc: subu  a0, zero, a0
 	ldloc.1
 	neg
 	stloc.1
-// 0x01062ef0: 0x1062ef0: lui   a2, 0x80000000
+// 0x01062f00: 0x1062f00: lui   a2, 0x80000000
 	ldc.i4 2147483648
 	stloc.3
-// 0x01062ef4: 0x1062ef4: and   a2, a2, a0
+// 0x01062f04: 0x1062f04: and   a2, a2, a0
 	ldloc.3
 	ldloc.1
 	and
 	stloc.3
-// 0x01062ef8: 0x1062ef8: addiu a0, zero, 48
+// 0x01062f08: 0x1062f08: addiu a0, zero, 48
 	ldc.i4.s 48
 	stloc.1
-// 0x01062efc: 0x1062efc: addiu v0, sp, 32
+// 0x01062f0c: 0x1062f0c: addiu v0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01062f00: 0x1062f00: lw    t0, 2424(sp)
+// 0x01062f10: 0x1062f10: lw    t0, 2424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6635,7 +6635,7 @@ L_1062ee8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01062f04: 0x1062f04: lw    t3, 2428(sp)
+// 0x01062f14: 0x1062f14: lw    t3, 2428(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6644,30 +6644,30 @@ L_1062ee8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01062f08: 0x1062f08: mflo  lo
+// 0x01062f18: 0x1062f18: mflo  lo
 	ldloc 14
 	stloc.2
-// 0x01062f0c: 0x1062f0c: addiu a1, a1, 1
+// 0x01062f1c: 0x1062f1c: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01062f10: 0x1062f10: sll   a1, a1, 3
+// 0x01062f20: 0x1062f20: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x01062f14: 0x1062f14: mult  v1, a0
+// 0x01062f24: 0x1062f24: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 14
-// 0x01062f18: 0x1062f18: addu  a1, v0, a1
+// 0x01062f28: 0x1062f28: addu  a1, v0, a1
 	ldloc 5
 	ldloc.2
 	add
 	stloc.2
-// 0x01062f1c: 0x1062f1c: lw    a0, 164(a1)
+// 0x01062f2c: 0x1062f2c: lw    a0, 164(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6676,7 +6676,7 @@ L_1062ee8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01062f20: 0x1062f20: lw    a1, 2416(sp)
+// 0x01062f30: 0x1062f30: lw    a1, 2416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6685,23 +6685,23 @@ L_1062ee8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01062f24: 0x1062f24: sll   zero, zero, 0
-// 0x01062f28: 0x1062f28: sw    a0, 0(a1)
+// 0x01062f34: 0x1062f34: sll   zero, zero, 0
+// 0x01062f38: 0x1062f38: sw    a0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01062f2c: 0x1062f2c: mflo  lo
+// 0x01062f3c: 0x1062f3c: mflo  lo
 	ldloc 14
 	stloc 7
-// 0x01062f30: 0x1062f30: addu  v0, v0, v1
+// 0x01062f40: 0x1062f40: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01062f34: 0x1062f34: lw    v0, 164(v0)
+// 0x01062f44: 0x1062f44: lw    v0, 164(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6710,43 +6710,43 @@ L_1062ee8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062f38: 0x1062f38: sll   zero, zero, 0
-// 0x01062f3c: 0x1062f3c: sw    v0, 0(t0)
+// 0x01062f48: 0x1062f48: sll   zero, zero, 0
+// 0x01062f4c: 0x1062f4c: sw    v0, 0(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01062f40: 0x1062f40: sw    a2, 0(t3)
+// 0x01062f50: 0x1062f50: sw    a2, 0(t3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.3
 	stelem.i4
-// 0x01062f44: 0x1062f44: lw    v0, 0(s4)
+// 0x01062f54: 0x1062f54: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01062f48: 0x1062f48: sll   zero, zero, 0
-// 0x01062f4c: 0x1062f4c: ori   v0, v0, 256
+// 0x01062f58: 0x1062f58: sll   zero, zero, 0
+// 0x01062f5c: 0x1062f5c: ori   v0, v0, 256
 	ldloc 5
 	ldc.i4 256
 	or
 	stloc 5
-// 0x01062f50: 0x1062f50: sw    v0, 0(s4)
+// 0x01062f60: 0x1062f60: sw    v0, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-L_1062f54:
-// 0x01062f54: 0x1062f54: lw    v0, 2416(sp)
+L_1062f64:
+// 0x01062f64: 0x1062f64: lw    v0, 2416(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6755,7 +6755,7 @@ L_1062f54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01062f58: 0x1062f58: lw    v1, 2424(sp)
+// 0x01062f68: 0x1062f68: lw    v1, 2424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6764,7 +6764,7 @@ L_1062f54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01062f5c: 0x1062f5c: lw    t0, 2428(sp)
+// 0x01062f6c: 0x1062f6c: lw    t0, 2428(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6773,28 +6773,28 @@ L_1062f54:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01062f60: 0x1062f60: lw    a0, 0(v0)
+// 0x01062f70: 0x1062f70: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01062f64: 0x1062f64: lw    a1, 0(v1)
+// 0x01062f74: 0x1062f74: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01062f68: 0x1062f68: lw    a2, 0(t0)
+// 0x01062f78: 0x1062f78: lw    a2, 0(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01062f6c: 0x1062f6c: jal   0x1062c24 sw    zero, 2316(sp)
+// 0x01062f7c: 0x1062f7c: jal   0x1062c34 sw    zero, 2316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6808,15 +6808,15 @@ L_1062f54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::make_queue_1062c24(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::make_queue_1062c34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062f74: 0x1062f74: addu  s5, v0, zero
+// 0x01062f84: 0x1062f84: addu  s5, v0, zero
 	ldloc 5
 	stloc 16
-// 0x01062f78: 0x1062f78: j	 0x1063468 sw    zero, 2300(sp)
+// 0x01062f88: 0x1062f88: j	 0x1063478 sw    zero, 2300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6825,27 +6825,27 @@ L_1062f54:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1063468
+	br L_1063478
 // --- basic block ---
-L_1062f80:
-// 0x01062f80: 0x1062f80: lw    v0, 0(s4)
+L_1062f90:
+// 0x01062f90: 0x1062f90: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01062f84: 0x1062f84: sll   zero, zero, 0
-// 0x01062f88: 0x1062f88: andi  v0, v0, 4
+// 0x01062f94: 0x1062f94: sll   zero, zero, 0
+// 0x01062f98: 0x1062f98: andi  v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	and
 	stloc 5
-// 0x01062f8c: 0x1062f8c: beq   v0, zero, 0x1062fa8 sll   zero, zero, 0
+// 0x01062f9c: 0x1062f9c: beq   v0, zero, 0x1062fb8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1062fa8
+	brfalse L_1062fb8
 // --- basic block ---
-// 0x01062f94: 0x1062f94: lw    t3, 2300(sp)
+// 0x01062fa4: 0x1062fa4: lw    t3, 2300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6854,30 +6854,30 @@ L_1062f80:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01062f98: 0x1062f98: sll   zero, zero, 0
-// 0x01062f9c: 0x1062f9c: slti  v0, t3, 100
+// 0x01062fa8: 0x1062fa8: sll   zero, zero, 0
+// 0x01062fac: 0x1062fac: slti  v0, t3, 100
 	ldloc 8
 	ldc.i4.s 100
 	clt
 	stloc 5
-// 0x01062fa0: 0x1062fa0: beq   v0, zero, 0x1063488 sll   zero, zero, 0
+// 0x01062fb0: 0x1062fb0: beq   v0, zero, 0x1063498 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1063488
+	brfalse L_1063498
 // --- basic block ---
-L_1062fa8:
-// 0x01062fa8: 0x1062fa8: jal   0x106674c addu  a0, s5, zero
+L_1062fb8:
+// 0x01062fb8: 0x1062fb8: jal   0x106675c addu  a0, s5, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
-	call int32 Cibyl76::fh_minkey_106674c(int32)
+	call int32 Cibyl76::fh_minkey_106675c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062fb0: 0x1062fb0: addu  a0, s5, zero
+// 0x01062fc0: 0x1062fc0: addu  a0, s5, zero
 	ldloc 16
 	stloc.1
-// 0x01062fb4: 0x1062fb4: jal   0x1066ed8 addu  s7, v0, zero
+// 0x01062fc4: 0x1062fc4: jal   0x1066ee8 addu  s7, v0, zero
 	ldloc 5
 	stloc 19
 	ldloc.0
@@ -6885,30 +6885,30 @@ L_1062fa8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_extractmin_1066ed8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_extractmin_1066ee8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01062fbc: 0x1062fbc: lw    a0, 0(v0)
+// 0x01062fcc: 0x1062fcc: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01062fc0: 0x1062fc0: lui   a1, 0x0
+// 0x01062fd0: 0x1062fd0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01062fc4: 0x1062fc4: lui   a2, 0x7fff0000
+// 0x01062fd4: 0x1062fd4: lui   a2, 0x7fff0000
 	ldc.i4 2147418112
 	stloc.3
-// 0x01062fc8: 0x1062fc8: ori   a2, a2, 65535
+// 0x01062fd8: 0x1062fd8: ori   a2, a2, 65535
 	ldloc.3
 	ldc.i4 65535
 	or
 	stloc.3
-// 0x01062fcc: 0x1062fcc: lw    v1, 576(a1)
+// 0x01062fdc: 0x1062fdc: lw    v1, 576(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6917,30 +6917,30 @@ L_1062fa8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01062fd0: 0x1062fd0: lui   s3, 0x80000000
+// 0x01062fe0: 0x1062fe0: lui   s3, 0x80000000
 	ldc.i4 2147483648
 	stloc 12
-// 0x01062fd4: 0x1062fd4: and   s2, a0, a2
+// 0x01062fe4: 0x1062fe4: and   s2, a0, a2
 	ldloc.1
 	ldloc.3
 	and
 	stloc 13
-// 0x01062fd8: 0x1062fd8: lhu   s1, 8(v0)
+// 0x01062fe8: 0x1062fe8: lhu   s1, 8(v0)
 	ldloc 5
 	ldc.i4.8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 11
-// 0x01062fdc: 0x1062fdc: beq   s2, v1, 0x1062fec and   s3, a0, s3
+// 0x01062fec: 0x1062fec: beq   s2, v1, 0x1062ffc and   s3, a0, s3
 	ldloc 13
 	ldloc 7
 	ldloc.1
 	ldloc 12
 	and
 	stloc 12
-	beq  L_1062fec
+	beq  L_1062ffc
 // --- basic block ---
-// 0x01062fe4: 0x1062fe4: jal   0x100b164 addu  a0, s2, zero
+// 0x01062ff4: 0x1062ff4: jal   0x100b174 addu  a0, s2, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -6948,19 +6948,19 @@ L_1062fa8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1062fec:
-// 0x01062fec: 0x1062fec: beq   s3, zero, 0x1063004 addu  a0, s1, zero
+L_1062ffc:
+// 0x01062ffc: 0x1062ffc: beq   s3, zero, 0x1063014 addu  a0, s1, zero
 	ldloc 12
 	ldloc 11
 	stloc.1
-	brfalse L_1063004
+	brfalse L_1063014
 // --- basic block ---
-// 0x01062ff4: 0x1062ff4: jal   0x1003b08 addiu a1, sp, 32
+// 0x01063004: 0x1063004: jal   0x1003b08 addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6970,11 +6970,11 @@ L_1062fec:
 	call int32 Cibyl2::roadmap_line_from_point_1003b08(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01062ffc: 0x1062ffc: j	 0x106300c sll   zero, zero, 0
-	br L_106300c
+// 0x0106300c: 0x106300c: j	 0x106301c sll   zero, zero, 0
+	br L_106301c
 // --- basic block ---
-L_1063004:
-// 0x01063004: 0x1063004: jal   0x1003b2c addiu a1, sp, 32
+L_1063014:
+// 0x01063014: 0x1063014: jal   0x1003b2c addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6984,8 +6984,8 @@ L_1063004:
 	call int32 Cibyl2::roadmap_line_to_point_1003b2c(int32,int32)
 	stloc 5
 // --- basic block ---
-L_106300c:
-// 0x0106300c: 0x106300c: lw    v0, 32(sp)
+L_106301c:
+// 0x0106301c: 0x106301c: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6994,41 +6994,41 @@ L_106300c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063010: 0x1063010: lui   t0, 0x20000
+// 0x01063020: 0x1063020: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01063014: 0x1063014: lw    v1, 31228(t0)
+// 0x01063024: 0x1063024: lw    v1, 31692(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063018: 0x1063018: andi  v0, v0, 32767
+// 0x01063028: 0x1063028: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x0106301c: 0x106301c: sll   v0, v0, 3
+// 0x0106302c: 0x106302c: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01063020: 0x1063020: addu  v0, v1, v0
+// 0x01063030: 0x1063030: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01063024: 0x1063024: lw    v1, 0(v0)
+// 0x01063034: 0x1063034: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01063028: 0x1063028: sw    zero, 2284(sp)
+// 0x01063038: 0x1063038: sw    zero, 2284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7037,7 +7037,7 @@ L_106300c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106302c: 0x106302c: sw    v1, 36(sp)
+// 0x0106303c: 0x106303c: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7046,7 +7046,7 @@ L_106300c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01063030: 0x1063030: lw    v0, 4(v0)
+// 0x01063040: 0x1063040: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7055,7 +7055,7 @@ L_106300c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063034: 0x1063034: beq   s7, zero, 0x106306c sw    v0, 40(sp)
+// 0x01063044: 0x1063044: beq   s7, zero, 0x106307c sw    v0, 40(sp)
 	ldloc 19
 	ldloc 6
 	ldloc.0
@@ -7065,19 +7065,19 @@ L_106300c:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_106306c
+	brfalse L_106307c
 // --- basic block ---
-// 0x0106303c: 0x106303c: lui   a1, 0x70000
+// 0x0106304c: 0x106304c: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01063040: 0x1063040: addiu a0, sp, 36
+// 0x01063050: 0x1063050: addiu a0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x01063044: 0x1063044: jal   0x1008eb0 addiu a1, a1, 12828
+// 0x01063054: 0x1063054: jal   0x1008ec0 addiu a1, a1, 13292
 	ldloc.2
-	ldc.i4 12828
+	ldc.i4 13292
 	add
 	stloc.2
 	ldloc.0
@@ -7085,12 +7085,12 @@ L_106300c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106304c: 0x106304c: lw    t3, 2312(sp)
+// 0x0106305c: 0x106305c: lw    t3, 2312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7099,31 +7099,31 @@ L_106300c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063050: 0x1063050: addiu v1, zero, 1
+// 0x01063060: 0x1063060: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01063054: 0x1063054: bne   t3, v1, 0x1063064 addiu v1, zero, 28
+// 0x01063064: 0x1063064: bne   t3, v1, 0x1063074 addiu v1, zero, 28
 	ldloc 8
 	ldloc 7
 	ldc.i4.s 28
 	stloc 7
-	bne.un L_1063064
+	bne.un L_1063074
 // --- basic block ---
-// 0x0106305c: 0x106305c: div   v0, v1
+// 0x0106306c: 0x106306c: div   v0, v1
 	ldloc 5
 	ldloc 7
 	div
 	stloc 14
-// 0x01063060: 0x1063060: mflo  lo
+// 0x01063070: 0x1063070: mflo  lo
 	ldloc 14
 	stloc 5
-L_1063064:
-// 0x01063064: 0x1063064: subu  v0, s7, v0
+L_1063074:
+// 0x01063074: 0x1063074: subu  v0, s7, v0
 	ldloc 19
 	ldloc 5
 	sub
 	stloc 5
-// 0x01063068: 0x1063068: sw    v0, 2284(sp)
+// 0x01063078: 0x1063078: sw    v0, 2284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7132,8 +7132,8 @@ L_1063064:
 	add
 	ldloc 5
 	stelem.i4
-L_106306c:
-// 0x0106306c: 0x106306c: lw    v0, 2280(sp)
+L_106307c:
+// 0x0106307c: 0x106307c: lw    v0, 2280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7142,13 +7142,13 @@ L_106306c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063070: 0x1063070: sll   zero, zero, 0
-// 0x01063074: 0x1063074: bne   s2, v0, 0x10630b0 sll   zero, zero, 0
+// 0x01063080: 0x1063080: sll   zero, zero, 0
+// 0x01063084: 0x1063084: bne   s2, v0, 0x10630c0 sll   zero, zero, 0
 	ldloc 13
 	ldloc 5
-	bne.un L_10630b0
+	bne.un L_10630c0
 // --- basic block ---
-// 0x0106307c: 0x106307c: lw    v1, 2352(sp)
+// 0x0106308c: 0x106308c: lw    v1, 2352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7157,13 +7157,13 @@ L_106306c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063080: 0x1063080: sll   zero, zero, 0
-// 0x01063084: 0x1063084: bne   s1, v1, 0x10630b0 sll   zero, zero, 0
+// 0x01063090: 0x1063090: sll   zero, zero, 0
+// 0x01063094: 0x1063094: bne   s1, v1, 0x10630c0 sll   zero, zero, 0
 	ldloc 11
 	ldloc 7
-	bne.un L_10630b0
+	bne.un L_10630c0
 // --- basic block ---
-// 0x0106308c: 0x106308c: lw    a0, 2284(sp)
+// 0x0106309c: 0x106309c: lw    a0, 2284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7172,7 +7172,7 @@ L_106306c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063090: 0x1063090: lw    v0, 2440(sp)
+// 0x010630a0: 0x10630a0: lw    v0, 2440(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7181,15 +7181,15 @@ L_106306c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063094: 0x1063094: sll   zero, zero, 0
-// 0x01063098: 0x1063098: sw    a0, 0(v0)
+// 0x010630a4: 0x10630a4: sll   zero, zero, 0
+// 0x010630a8: 0x10630a8: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0106309c: 0x106309c: jal   0x10673e8 addu  a0, s5, zero
+// 0x010630ac: 0x10630ac: jal   0x10673f8 addu  a0, s5, zero
 	ldloc 16
 	stloc.1
 	ldloc.0
@@ -7197,12 +7197,12 @@ L_106306c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_deleteheap_10673e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_deleteheap_10673f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010630a4: 0x10630a4: lw    a1, 2452(sp)
+// 0x010630b4: 0x10630b4: lw    a1, 2452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7211,146 +7211,146 @@ L_106306c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010630a8: 0x10630a8: j	 0x10631f0 sw    s3, 0(a1)
+// 0x010630b8: 0x10630b8: j	 0x1063200 sw    s3, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 12
 	stelem.i4
-	br L_10631f0
+	br L_1063200
 // --- basic block ---
-L_10630b0:
-// 0x010630b0: 0x10630b0: slti  v0, s0, 10
+L_10630c0:
+// 0x010630c0: 0x10630c0: slti  v0, s0, 10
 	ldloc 10
 	ldc.i4.s 10
 	clt
 	stloc 5
-// 0x010630b4: 0x10630b4: beq   v0, zero, 0x1063138 addu  v0, zero, zero
+// 0x010630c4: 0x10630c4: beq   v0, zero, 0x1063148 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1063138
+	brfalse L_1063148
 // --- basic block ---
-// 0x010630bc: 0x10630bc: addu  v1, zero, zero
+// 0x010630cc: 0x10630cc: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010630c0: 0x10630c0: j	 0x1063104 addiu a0, sp, 152
+// 0x010630d0: 0x10630d0: j	 0x1063114 addiu a0, sp, 152
 	ldloc.0
 	ldc.i4 152
 	add
 	stloc.1
-	br L_1063104
+	br L_1063114
 // --- basic block ---
-L_10630c8:
-// 0x010630c8: 0x10630c8: lw    a1, 0(a2)
+L_10630d8:
+// 0x010630d8: 0x10630d8: lw    a1, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010630cc: 0x10630cc: sll   zero, zero, 0
-// 0x010630d0: 0x10630d0: bne   a1, s2, 0x10630fc addiu a2, sp, 72
+// 0x010630dc: 0x10630dc: sll   zero, zero, 0
+// 0x010630e0: 0x10630e0: bne   a1, s2, 0x106310c addiu a2, sp, 72
 	ldloc.2
 	ldloc 13
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.3
-	bne.un L_10630fc
+	bne.un L_106310c
 // --- basic block ---
-// 0x010630d8: 0x10630d8: addu  a1, a2, v0
+// 0x010630e8: 0x10630e8: addu  a1, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc.2
-// 0x010630dc: 0x10630dc: lw    a1, 0(a1)
+// 0x010630ec: 0x10630ec: lw    a1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010630e0: 0x10630e0: sll   zero, zero, 0
-// 0x010630e4: 0x10630e4: bne   a1, s1, 0x10630fc addu  a1, a0, v0
+// 0x010630f0: 0x10630f0: sll   zero, zero, 0
+// 0x010630f4: 0x10630f4: bne   a1, s1, 0x106310c addu  a1, a0, v0
 	ldloc.2
 	ldloc 11
 	ldloc.1
 	ldloc 5
 	add
 	stloc.2
-	bne.un L_10630fc
+	bne.un L_106310c
 // --- basic block ---
-// 0x010630ec: 0x10630ec: lw    a1, 0(a1)
+// 0x010630fc: 0x10630fc: lw    a1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010630f0: 0x10630f0: sll   zero, zero, 0
-// 0x010630f4: 0x10630f4: beq   a1, s3, 0x1063114 sll   zero, zero, 0
+// 0x01063100: 0x1063100: sll   zero, zero, 0
+// 0x01063104: 0x1063104: beq   a1, s3, 0x1063124 sll   zero, zero, 0
 	ldloc.2
 	ldloc 12
-	beq  L_1063114
+	beq  L_1063124
 // --- basic block ---
-L_10630fc:
-// 0x010630fc: 0x10630fc: addiu v1, v1, 1
+L_106310c:
+// 0x0106310c: 0x106310c: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01063100: 0x1063100: addiu v0, v0, 4
+// 0x01063110: 0x1063110: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-L_1063104:
-// 0x01063104: 0x1063104: addiu t0, sp, 112
+L_1063114:
+// 0x01063114: 0x1063114: addiu t0, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
 	stloc 9
-// 0x01063108: 0x1063108: slt   a1, v1, s0
+// 0x01063118: 0x1063118: slt   a1, v1, s0
 	ldloc 7
 	ldloc 10
 	clt
 	stloc.2
-// 0x0106310c: 0x106310c: bne   a1, zero, 0x10630c8 addu  a2, t0, v0
+// 0x0106311c: 0x106311c: bne   a1, zero, 0x10630d8 addu  a2, t0, v0
 	ldloc.2
 	ldloc 9
 	ldloc 5
 	add
 	stloc.3
-	brtrue L_10630c8
+	brtrue L_10630d8
 // --- basic block ---
-L_1063114:
-// 0x01063114: 0x1063114: bne   v1, s0, 0x106313c addiu v1, sp, 672
+L_1063124:
+// 0x01063124: 0x1063124: bne   v1, s0, 0x106314c addiu v1, sp, 672
 	ldloc 7
 	ldloc 10
 	ldloc.0
 	ldc.i4 672
 	add
 	stloc 7
-	bne.un L_106313c
+	bne.un L_106314c
 // --- basic block ---
-// 0x0106311c: 0x106311c: sll   v0, s0, 2
+// 0x0106312c: 0x106312c: sll   v0, s0, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01063120: 0x1063120: addiu t3, sp, 32
+// 0x01063130: 0x1063130: addiu t3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 8
-// 0x01063124: 0x1063124: addu  v0, t3, v0
+// 0x01063134: 0x1063134: addu  v0, t3, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 5
-// 0x01063128: 0x1063128: sw    s3, 120(v0)
+// 0x01063138: 0x1063138: sw    s3, 120(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7359,7 +7359,7 @@ L_1063114:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0106312c: 0x106312c: sw    s2, 80(v0)
+// 0x0106313c: 0x106313c: sw    s2, 80(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7368,7 +7368,7 @@ L_1063114:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01063130: 0x1063130: sw    s1, 40(v0)
+// 0x01063140: 0x1063140: sw    s1, 40(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7377,19 +7377,19 @@ L_1063114:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01063134: 0x1063134: addiu s0, s0, 1
+// 0x01063144: 0x1063144: addiu s0, s0, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_1063138:
-// 0x01063138: 0x1063138: addiu v1, sp, 672
+L_1063148:
+// 0x01063148: 0x1063148: addiu v1, sp, 672
 	ldloc.0
 	ldc.i4 672
 	add
 	stloc 7
-L_106313c:
-// 0x0106313c: 0x106313c: lw    a3, 32(sp)
+L_106314c:
+// 0x0106314c: 0x106314c: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7398,10 +7398,10 @@ L_106313c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01063140: 0x1063140: addiu v0, zero, 1
+// 0x01063150: 0x1063150: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01063144: 0x1063144: sw    v1, 16(sp)
+// 0x01063154: 0x1063154: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7410,19 +7410,19 @@ L_106313c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01063148: 0x1063148: addu  a0, s2, zero
+// 0x01063158: 0x1063158: addu  a0, s2, zero
 	ldloc 13
 	stloc.1
-// 0x0106314c: 0x106314c: addiu v1, zero, 100
+// 0x0106315c: 0x106315c: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 7
-// 0x01063150: 0x1063150: addu  a1, s1, zero
+// 0x01063160: 0x1063160: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01063154: 0x1063154: addu  a2, s3, zero
+// 0x01063164: 0x1063164: addu  a2, s3, zero
 	ldloc 12
 	stloc.3
-// 0x01063158: 0x1063158: sw    v1, 20(sp)
+// 0x01063168: 0x1063168: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7431,7 +7431,7 @@ L_106313c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106315c: 0x106315c: sw    v0, 28(sp)
+// 0x0106316c: 0x106316c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7440,7 +7440,7 @@ L_106313c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063160: 0x1063160: jal   0x106104c sw    v0, 24(sp)
+// 0x01063170: 0x1063170: jal   0x106105c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7454,12 +7454,12 @@ L_106313c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::get_connected_segments_106104c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::get_connected_segments_106105c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063168: 0x1063168: beq   v0, zero, 0x1063458 sw    v0, 2336(sp)
+// 0x01063178: 0x1063178: beq   v0, zero, 0x1063468 sw    v0, 2336(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7469,9 +7469,9 @@ L_106313c:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_1063458
+	brfalse L_1063468
 // --- basic block ---
-// 0x01063170: 0x1063170: lw    v0, 2284(sp)
+// 0x01063180: 0x1063180: lw    v0, 2284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7480,17 +7480,17 @@ L_106313c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063174: 0x1063174: addiu s6, sp, 684
+// 0x01063184: 0x1063184: addiu s6, sp, 684
 	ldloc.0
 	ldc.i4 684
 	add
 	stloc 17
-// 0x01063178: 0x1063178: addiu v0, v0, 1
+// 0x01063188: 0x1063188: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0106317c: 0x106317c: sw    zero, 2288(sp)
+// 0x0106318c: 0x106318c: sw    zero, 2288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7499,7 +7499,7 @@ L_106313c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063180: 0x1063180: j	 0x1063440 sw    v0, 2360(sp)
+// 0x01063190: 0x1063190: j	 0x1063450 sw    v0, 2360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7508,10 +7508,10 @@ L_106313c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1063440
+	br L_1063450
 // --- basic block ---
-L_1063188:
-// 0x01063188: 0x1063188: lw    v1, -8(s6)
+L_1063198:
+// 0x01063198: 0x1063198: lw    v1, -8(s6)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
@@ -7520,7 +7520,7 @@ L_1063188:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106318c: 0x106318c: lw    s8, -12(s6)
+// 0x0106319c: 0x106319c: lw    s8, -12(s6)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
@@ -7529,7 +7529,7 @@ L_1063188:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01063190: 0x1063190: sw    v1, 2276(sp)
+// 0x010631a0: 0x10631a0: sw    v1, 2276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7538,16 +7538,16 @@ L_1063188:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01063194: 0x1063194: lbu   a0, -4(s6)
+// 0x010631a4: 0x10631a4: lbu   a0, -4(s6)
 	ldloc 17
 	ldc.i4.s -4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc.1
-// 0x01063198: 0x1063198: addu  a1, v1, zero
+// 0x010631a8: 0x10631a8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0106319c: 0x106319c: sw    a0, 2272(sp)
+// 0x010631ac: 0x10631ac: sw    a0, 2272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7556,7 +7556,7 @@ L_1063188:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010631a0: 0x10631a0: lw    a2, 2272(sp)
+// 0x010631b0: 0x10631b0: lw    a2, 2272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7565,7 +7565,7 @@ L_1063188:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010631a4: 0x10631a4: jal   0x1062b34 addu  a0, s8, zero
+// 0x010631b4: 0x10631b4: jal   0x1062b44 addu  a0, s8, zero
 	ldloc 18
 	stloc.1
 	ldloc.0
@@ -7573,18 +7573,18 @@ L_1063188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::find_prev_1062b34(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::find_prev_1062b44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010631ac: 0x10631ac: beq   v0, zero, 0x10631f8 addiu a1, zero, -1
+// 0x010631bc: 0x10631bc: beq   v0, zero, 0x1063208 addiu a1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc.2
-	brfalse L_10631f8
+	brfalse L_1063208
 // --- basic block ---
-// 0x010631b4: 0x10631b4: lw    v1, 4(v0)
+// 0x010631c4: 0x10631c4: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7593,35 +7593,35 @@ L_1063188:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010631b8: 0x10631b8: sll   zero, zero, 0
-// 0x010631bc: 0x10631bc: bne   v1, a1, 0x1063430 lui   v1, 0x80000000
+// 0x010631c8: 0x10631c8: sll   zero, zero, 0
+// 0x010631cc: 0x10631cc: bne   v1, a1, 0x1063440 lui   v1, 0x80000000
 	ldloc 7
 	ldloc.2
 	ldc.i4 2147483648
 	stloc 7
-	bne.un L_1063430
+	bne.un L_1063440
 // --- basic block ---
-// 0x010631c4: 0x10631c4: sltu  s3, zero, s3
+// 0x010631d4: 0x10631d4: sltu  s3, zero, s3
 	ldc.i4.s 0
 	ldloc 12
 	clt.un
 	stloc 12
-// 0x010631c8: 0x10631c8: subu  s3, zero, s3
+// 0x010631d8: 0x10631d8: subu  s3, zero, s3
 	ldloc 12
 	neg
 	stloc 12
-// 0x010631cc: 0x10631cc: lhu   a0, 10(v0)
+// 0x010631dc: 0x10631dc: lhu   a0, 10(v0)
 	ldloc 5
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x010631d0: 0x10631d0: and   v1, v1, s3
+// 0x010631e0: 0x10631e0: and   v1, v1, s3
 	ldloc 7
 	ldloc 12
 	and
 	stloc 7
-// 0x010631d4: 0x10631d4: lw    a2, 2448(sp)
+// 0x010631e4: 0x10631e4: lw    a2, 2448(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7630,25 +7630,25 @@ L_1063188:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010631d8: 0x10631d8: or    s2, v1, s2
+// 0x010631e8: 0x10631e8: or    s2, v1, s2
 	ldloc 7
 	ldloc 13
 	or
 	stloc 13
-// 0x010631dc: 0x10631dc: sw    a0, 0(a2)
+// 0x010631ec: 0x10631ec: sw    a0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x010631e0: 0x10631e0: sh    s1, 10(v0)
+// 0x010631f0: 0x10631f0: sh    s1, 10(v0)
 	ldloc 5
 	ldc.i4.s 10
 	add
 	ldloc 11
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010631e4: 0x10631e4: sw    s2, 4(v0)
+// 0x010631f4: 0x10631f4: sw    s2, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7657,7 +7657,7 @@ L_1063188:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010631e8: 0x10631e8: jal   0x10673e8 addu  a0, s5, zero
+// 0x010631f8: 0x10631f8: jal   0x10673f8 addu  a0, s5, zero
 	ldloc 16
 	stloc.1
 	ldloc.0
@@ -7665,22 +7665,22 @@ L_1063188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_deleteheap_10673e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_deleteheap_10673f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10631f0:
-// 0x010631f0: 0x10631f0: j	 0x106351c addu  v0, zero, zero
+L_1063200:
+// 0x01063200: 0x1063200: j	 0x106352c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_106351c
+	br L_106352c
 // --- basic block ---
-L_10631f8:
-// 0x010631f8: 0x10631f8: lui   t0, 0x0
+L_1063208:
+// 0x01063208: 0x1063208: lui   t0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x010631fc: 0x10631fc: lw    v0, 576(t0)
+// 0x0106320c: 0x106320c: lw    v0, 576(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7689,18 +7689,18 @@ L_10631f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063200: 0x1063200: sll   zero, zero, 0
-// 0x01063204: 0x1063204: beq   s8, v0, 0x106321c sll   zero, zero, 0
+// 0x01063210: 0x1063210: sll   zero, zero, 0
+// 0x01063214: 0x1063214: beq   s8, v0, 0x106322c sll   zero, zero, 0
 	ldloc 18
 	ldloc 5
-	beq  L_106321c
+	beq  L_106322c
 // --- basic block ---
-// 0x0106320c: 0x106320c: bltz  s8, 0x106321c sll   zero, zero, 0
+// 0x0106321c: 0x106321c: bltz  s8, 0x106322c sll   zero, zero, 0
 	ldloc 18
 	ldc.i4.s 0
-	blt L_106321c
+	blt L_106322c
 // --- basic block ---
-// 0x01063214: 0x1063214: jal   0x100b164 addu  a0, s8, zero
+// 0x01063224: 0x1063224: jal   0x100b174 addu  a0, s8, zero
 	ldloc 18
 	stloc.1
 	ldloc.0
@@ -7708,20 +7708,20 @@ L_10631f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106321c:
-// 0x0106321c: 0x106321c: bne   s8, s2, 0x1063228 addiu v0, zero, -1
+L_106322c:
+// 0x0106322c: 0x106322c: bne   s8, s2, 0x1063238 addiu v0, zero, -1
 	ldloc 18
 	ldloc 13
 	ldc.i4.m1
 	stloc 5
-	bne.un L_1063228
+	bne.un L_1063238
 // --- basic block ---
-// 0x01063224: 0x1063224: lw    v0, 32(sp)
+// 0x01063234: 0x1063234: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7730,8 +7730,8 @@ L_106321c:
 	add
 	ldelem.i4
 	stloc 5
-L_1063228:
-// 0x01063228: 0x1063228: lw    a0, 2276(sp)
+L_1063238:
+// 0x01063238: 0x1063238: lw    a0, 2276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7740,7 +7740,7 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106322c: 0x106322c: lw    a1, 2272(sp)
+// 0x0106323c: 0x106323c: lw    a1, 2272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7749,7 +7749,7 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01063230: 0x1063230: lw    a2, 2284(sp)
+// 0x01063240: 0x1063240: lw    a2, 2284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7758,7 +7758,7 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01063234: 0x1063234: lw    t3, 2344(sp)
+// 0x01063244: 0x1063244: lw    t3, 2344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7767,7 +7767,7 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063238: 0x1063238: sw    v0, 20(sp)
+// 0x01063248: 0x1063248: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7776,7 +7776,7 @@ L_1063228:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106323c: 0x106323c: sw    s3, 16(sp)
+// 0x0106324c: 0x106324c: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7785,7 +7785,7 @@ L_1063228:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01063240: 0x1063240: jalr  t3 addu  a3, s1, zero
+// 0x01063250: 0x1063250: jalr  t3 addu  a3, s1, zero
 	ldloc 8
 	ldloc 11
 	stloc 4
@@ -7799,7 +7799,7 @@ L_1063228:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063248: 0x1063248: bltz  v0, 0x1063430 sw    v0, 2308(sp)
+// 0x01063258: 0x1063258: bltz  v0, 0x1063440 sw    v0, 2308(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7810,53 +7810,53 @@ L_1063228:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	blt L_1063430
+	blt L_1063440
 // --- basic block ---
-// 0x01063250: 0x1063250: lw    v0, 0(s6)
+// 0x01063260: 0x1063260: lw    v0, 0(s6)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01063254: 0x1063254: lui   a0, 0x20000
+// 0x01063264: 0x1063264: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01063258: 0x1063258: lw    v1, 31228(a0)
+// 0x01063268: 0x1063268: lw    v1, 31692(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106325c: 0x106325c: andi  v0, v0, 32767
+// 0x0106326c: 0x106326c: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x01063260: 0x1063260: sll   v0, v0, 3
+// 0x01063270: 0x1063270: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01063264: 0x1063264: addu  v0, v1, v0
+// 0x01063274: 0x1063274: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x01063268: 0x1063268: lw    v1, 0(v0)
+// 0x01063278: 0x1063278: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0106326c: 0x106326c: lui   a1, 0x70000
+// 0x0106327c: 0x106327c: lui   a1, 0x70000
 	ldc.i4 458752
 	stloc.2
-// 0x01063270: 0x1063270: sw    v1, 52(sp)
+// 0x01063280: 0x1063280: sw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7865,7 +7865,7 @@ L_1063228:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01063274: 0x1063274: lw    v0, 4(v0)
+// 0x01063284: 0x1063284: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7874,17 +7874,17 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063278: 0x1063278: addiu a1, a1, 12828
+// 0x01063288: 0x1063288: addiu a1, a1, 13292
 	ldloc.2
-	ldc.i4 12828
+	ldc.i4 13292
 	add
 	stloc.2
-// 0x0106327c: 0x106327c: addiu a0, sp, 52
+// 0x0106328c: 0x106328c: addiu a0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.1
-// 0x01063280: 0x1063280: jal   0x1008eb0 sw    v0, 56(sp)
+// 0x01063290: 0x1063290: jal   0x1008ec0 sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7898,12 +7898,12 @@ L_1063228:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063288: 0x1063288: lw    a1, 2296(sp)
+// 0x01063298: 0x1063298: lw    a1, 2296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7912,26 +7912,26 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106328c: 0x106328c: addu  v1, v0, zero
+// 0x0106329c: 0x106329c: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x01063290: 0x1063290: slt   v0, v0, a1
+// 0x010632a0: 0x10632a0: slt   v0, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x01063294: 0x1063294: beq   v0, zero, 0x10632bc sll   zero, zero, 0
+// 0x010632a4: 0x10632a4: beq   v0, zero, 0x10632cc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10632bc
+	brfalse L_10632cc
 // --- basic block ---
-// 0x0106329c: 0x106329c: lw    a2, 0(s6)
+// 0x010632ac: 0x10632ac: lw    a2, 0(s6)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010632a0: 0x10632a0: lw    t0, 2272(sp)
+// 0x010632b0: 0x10632b0: lw    t0, 2272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7940,7 +7940,7 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010632a4: 0x10632a4: lw    t3, 2276(sp)
+// 0x010632b4: 0x10632b4: lw    t3, 2276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7949,7 +7949,7 @@ L_1063228:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010632a8: 0x10632a8: sw    a2, 2320(sp)
+// 0x010632b8: 0x10632b8: sw    a2, 2320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7958,7 +7958,7 @@ L_1063228:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010632ac: 0x10632ac: sw    t0, 2324(sp)
+// 0x010632bc: 0x10632bc: sw    t0, 2324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7967,7 +7967,7 @@ L_1063228:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010632b0: 0x10632b0: sw    t3, 2328(sp)
+// 0x010632c0: 0x10632c0: sw    t3, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7976,7 +7976,7 @@ L_1063228:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010632b4: 0x10632b4: sw    s8, 2332(sp)
+// 0x010632c4: 0x10632c4: sw    s8, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7985,7 +7985,7 @@ L_1063228:
 	add
 	ldloc 18
 	stelem.i4
-// 0x010632b8: 0x10632b8: sw    v1, 2296(sp)
+// 0x010632c8: 0x10632c8: sw    v1, 2296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7994,8 +7994,8 @@ L_1063228:
 	add
 	ldloc 7
 	stelem.i4
-L_10632bc:
-// 0x010632bc: 0x10632bc: lw    v0, 2312(sp)
+L_10632cc:
+// 0x010632cc: 0x10632cc: lw    v0, 2312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8004,29 +8004,29 @@ L_10632bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010632c0: 0x10632c0: addiu a0, zero, 1
+// 0x010632d0: 0x10632d0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010632c4: 0x10632c4: bne   v0, a0, 0x10632d8 addu  t0, v1, zero
+// 0x010632d4: 0x10632d4: bne   v0, a0, 0x10632e8 addu  t0, v1, zero
 	ldloc 5
 	ldloc.1
 	ldloc 7
 	stloc 9
-	bne.un L_10632d8
+	bne.un L_10632e8
 // --- basic block ---
-// 0x010632cc: 0x10632cc: addiu a0, zero, 28
+// 0x010632dc: 0x10632dc: addiu a0, zero, 28
 	ldc.i4.s 28
 	stloc.1
-// 0x010632d0: 0x10632d0: div   v1, a0
+// 0x010632e0: 0x10632e0: div   v1, a0
 	ldloc 7
 	ldloc.1
 	div
 	stloc 14
-// 0x010632d4: 0x10632d4: mflo  lo
+// 0x010632e4: 0x10632e4: mflo  lo
 	ldloc 14
 	stloc 9
-L_10632d8:
-// 0x010632d8: 0x10632d8: lw    a1, 2276(sp)
+L_10632e8:
+// 0x010632e8: 0x10632e8: lw    a1, 2276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8035,7 +8035,7 @@ L_10632d8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010632dc: 0x10632dc: lw    a2, 2272(sp)
+// 0x010632ec: 0x10632ec: lw    a2, 2272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8044,13 +8044,13 @@ L_10632d8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010632e0: 0x10632e0: addu  a0, s8, zero
+// 0x010632f0: 0x10632f0: addu  a0, s8, zero
 	ldloc 18
 	stloc.1
-// 0x010632e4: 0x10632e4: addu  a3, s2, zero
+// 0x010632f4: 0x10632f4: addu  a3, s2, zero
 	ldloc 13
 	stloc 4
-// 0x010632e8: 0x10632e8: sw    v1, 2368(sp)
+// 0x010632f8: 0x10632f8: sw    v1, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8059,7 +8059,7 @@ L_10632d8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010632ec: 0x10632ec: sw    t0, 2364(sp)
+// 0x010632fc: 0x10632fc: sw    t0, 2364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8068,7 +8068,7 @@ L_10632d8:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010632f0: 0x10632f0: sw    s1, 16(sp)
+// 0x01063300: 0x1063300: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8077,7 +8077,7 @@ L_10632d8:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010632f4: 0x10632f4: jal   0x10629ac sw    s3, 20(sp)
+// 0x01063304: 0x1063304: jal   0x10629bc sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8091,12 +8091,12 @@ L_10632d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::make_path_10629ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::make_path_10629bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010632fc: 0x10632fc: lw    v1, 2368(sp)
+// 0x0106330c: 0x106330c: lw    v1, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8105,7 +8105,7 @@ L_10632d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063300: 0x1063300: lw    t0, 2364(sp)
+// 0x01063310: 0x1063310: lw    t0, 2364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8114,13 +8114,13 @@ L_10632d8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01063304: 0x1063304: bne   v0, zero, 0x1063314 addiu a1, zero, 1
+// 0x01063314: 0x1063314: bne   v0, zero, 0x1063324 addiu a1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc.2
-	brtrue L_1063314
+	brtrue L_1063324
 // --- basic block ---
-// 0x0106330c: 0x106330c: j	 0x1063458 sw    a1, 2316(sp)
+// 0x0106331c: 0x106331c: j	 0x1063468 sw    a1, 2316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8129,10 +8129,10 @@ L_10632d8:
 	add
 	ldloc.2
 	stelem.i4
-	br L_1063458
+	br L_1063468
 // --- basic block ---
-L_1063314:
-// 0x01063314: 0x1063314: lw    a2, 2360(sp)
+L_1063324:
+// 0x01063324: 0x1063324: lw    a2, 2360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8141,7 +8141,7 @@ L_1063314:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01063318: 0x1063318: lw    t3, 2308(sp)
+// 0x01063328: 0x1063328: lw    t3, 2308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8150,37 +8150,37 @@ L_1063314:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106331c: 0x106331c: sll   zero, zero, 0
-// 0x01063320: 0x1063320: addu  a1, a2, t3
+// 0x0106332c: 0x106332c: sll   zero, zero, 0
+// 0x01063330: 0x1063330: addu  a1, a2, t3
 	ldloc.3
 	ldloc 8
 	add
 	stloc.2
-// 0x01063324: 0x1063324: addu  a1, a1, t0
+// 0x01063334: 0x1063334: addu  a1, a1, t0
 	ldloc.2
 	ldloc 9
 	add
 	stloc.2
-// 0x01063328: 0x1063328: slt   a0, a1, s7
+// 0x01063338: 0x1063338: slt   a0, a1, s7
 	ldloc.2
 	ldloc 19
 	clt
 	stloc.1
-// 0x0106332c: 0x106332c: beq   a0, zero, 0x1063338 sll   zero, zero, 0
+// 0x0106333c: 0x106333c: beq   a0, zero, 0x1063348 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1063338
+	brfalse L_1063348
 // --- basic block ---
-// 0x01063334: 0x1063334: addu  a1, s7, zero
+// 0x01063344: 0x1063344: addu  a1, s7, zero
 	ldloc 19
 	stloc.2
-L_1063338:
-// 0x01063338: 0x1063338: addu  a2, v0, zero
+L_1063348:
+// 0x01063348: 0x1063348: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0106333c: 0x106333c: addu  a0, s5, zero
+// 0x0106334c: 0x106334c: addu  a0, s5, zero
 	ldloc 16
 	stloc.1
-// 0x01063340: 0x1063340: jal   0x10671c4 sw    v1, 2368(sp)
+// 0x01063350: 0x1063350: jal   0x10671d4 sw    v1, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8194,12 +8194,12 @@ L_1063338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_insertkey_10671c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_insertkey_10671d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063348: 0x1063348: lw    v1, 2368(sp)
+// 0x01063358: 0x1063358: lw    v1, 2368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8208,7 +8208,7 @@ L_1063338:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106334c: 0x106334c: jal   0x10c09ac addu  a0, v1, zero
+// 0x0106335c: 0x106335c: jal   0x10c0fec addu  a0, v1, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -8216,7 +8216,7 @@ L_1063338:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01063354: 0x1063354: lw    a1, 2340(sp)
+// 0x01063364: 0x1063364: lw    a1, 2340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8225,47 +8225,47 @@ L_1063338:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01063358: 0x1063358: jal   0x10c0780 addu  a0, v0, zero
+// 0x01063368: 0x1063368: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01063360: 0x1063360: jal   0x10c0874 addu  a0, v0, zero
+// 0x01063370: 0x1063370: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063368: 0x1063368: addu  a1, v1, zero
+// 0x01063378: 0x1063378: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0106336c: 0x106336c: jal   0x10c1fe4 addu  a0, v0, zero
+// 0x0106337c: 0x106337c: jal   0x10c2624 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl144::sqrt_10c1fe4(int32,int32,int32)
+	call int32 Cibyl144::sqrt_10c2624(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063374: 0x1063374: lui   a2, 0x20000
+// 0x01063384: 0x1063384: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01063378: 0x1063378: addiu a2, a2, 23760
+// 0x01063388: 0x1063388: addiu a2, a2, 24224
 	ldloc.3
-	ldc.i4 23760
+	ldc.i4 24224
 	add
 	stloc.3
-// 0x0106337c: 0x106337c: lw    a1, 4(a2)
+// 0x0106338c: 0x106338c: lw    a1, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -8274,17 +8274,17 @@ L_1063338:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01063380: 0x1063380: lw    a0, 0(a2)
+// 0x01063390: 0x1063390: lw    a0, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01063384: 0x1063384: addu  a3, v1, zero
+// 0x01063394: 0x1063394: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01063388: 0x1063388: jal   0x10c0740 addu  a2, v0, zero
+// 0x01063398: 0x1063398: jal   0x10c0d80 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -8292,20 +8292,20 @@ L_1063338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__subdf3_10c0740(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__subdf3_10c0d80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063390: 0x1063390: lui   t0, 0x20000
+// 0x010633a0: 0x10633a0: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 9
-// 0x01063394: 0x1063394: addiu t0, t0, 23896
+// 0x010633a4: 0x10633a4: addiu t0, t0, 24360
 	ldloc 9
-	ldc.i4 23896
+	ldc.i4 24360
 	add
 	stloc 9
-// 0x01063398: 0x1063398: lw    a3, 4(t0)
+// 0x010633a8: 0x10633a8: lw    a3, 4(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8314,17 +8314,17 @@ L_1063338:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0106339c: 0x106339c: lw    a2, 0(t0)
+// 0x010633ac: 0x10633ac: lw    a2, 0(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010633a0: 0x10633a0: addu  a1, v1, zero
+// 0x010633b0: 0x10633b0: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010633a4: 0x10633a4: jal   0x10c0798 addu  a0, v0, zero
+// 0x010633b4: 0x10633b4: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -8332,26 +8332,26 @@ L_1063338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010633ac: 0x10633ac: addu  a1, v1, zero
+// 0x010633bc: 0x10633bc: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010633b0: 0x10633b0: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010633c0: 0x10633c0: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010633b8: 0x10633b8: lw    t3, 2304(sp)
+// 0x010633c8: 0x10633c8: lw    t3, 2304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8360,26 +8360,26 @@ L_1063338:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010633bc: 0x10633bc: sra   a0, v0, 2
+// 0x010633cc: 0x10633cc: sra   a0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shr
 	stloc.1
-// 0x010633c0: 0x10633c0: sra   v1, t3, 2
+// 0x010633d0: 0x10633d0: sra   v1, t3, 2
 	ldloc 8
 	ldc.i4.2
 	shr
 	stloc 7
-// 0x010633c4: 0x10633c4: slt   v1, v1, a0
+// 0x010633d4: 0x10633d4: slt   v1, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x010633c8: 0x10633c8: beq   v1, zero, 0x1063430 sll   zero, zero, 0
+// 0x010633d8: 0x10633d8: beq   v1, zero, 0x1063440 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1063430
+	brfalse L_1063440
 // --- basic block ---
-// 0x010633d0: 0x10633d0: lw    v1, 2356(sp)
+// 0x010633e0: 0x10633e0: lw    v1, 2356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8388,8 +8388,8 @@ L_1063338:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010633d4: 0x10633d4: sll   zero, zero, 0
-// 0x010633d8: 0x10633d8: bne   v1, zero, 0x1063430 sw    v0, 2304(sp)
+// 0x010633e4: 0x10633e4: sll   zero, zero, 0
+// 0x010633e8: 0x10633e8: bne   v1, zero, 0x1063440 sw    v0, 2304(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -8399,41 +8399,41 @@ L_1063338:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1063430
+	brtrue L_1063440
 // --- basic block ---
-// 0x010633e0: 0x10633e0: addiu v1, zero, 9
+// 0x010633f0: 0x10633f0: addiu v1, zero, 9
 	ldc.i4.s 9
 	stloc 7
-// 0x010633e4: 0x10633e4: mult  v0, v1
+// 0x010633f4: 0x10633f4: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 14
-// 0x010633e8: 0x10633e8: addiu a1, zero, 10
+// 0x010633f8: 0x10633f8: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x010633ec: 0x10633ec: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x010633fc: 0x10633fc: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x010633f0: 0x10633f0: addiu a2, a2, -13884
+// 0x01063400: 0x1063400: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x010633f4: 0x10633f4: mflo  lo
+// 0x01063404: 0x1063404: mflo  lo
 	ldloc 14
 	stloc 4
-// 0x010633f8: 0x10633f8: sll   zero, zero, 0
-// 0x010633fc: 0x10633fc: sll   zero, zero, 0
-// 0x01063400: 0x1063400: div   a3, a1
+// 0x01063408: 0x1063408: sll   zero, zero, 0
+// 0x0106340c: 0x106340c: sll   zero, zero, 0
+// 0x01063410: 0x1063410: div   a3, a1
 	ldloc 4
 	ldloc.2
 	div
 	stloc 14
-// 0x01063404: 0x1063404: mflo  lo
+// 0x01063414: 0x1063414: mflo  lo
 	ldloc 14
 	stloc 4
-// 0x01063408: 0x1063408: jal   0x1000f9c addiu a0, sp, 60
+// 0x01063418: 0x1063418: jal   0x1000f9c addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
@@ -8448,15 +8448,15 @@ L_1063338:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063410: 0x1063410: lui   a0, 0x10000
+// 0x01063420: 0x1063420: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01063414: 0x1063414: addiu a0, a0, 11108
+// 0x01063424: 0x1063424: addiu a0, a0, 11104
 	ldloc.1
-	ldc.i4 11108
+	ldc.i4 11104
 	add
 	stloc.1
-// 0x01063418: 0x1063418: jal   0x1094770 addiu a1, sp, 60
+// 0x01063428: 0x1063428: jal   0x1094d94 addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
@@ -8466,27 +8466,27 @@ L_1063338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_set_value_1094770(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_set_value_1094d94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063420: 0x1063420: jal   0x109483c sll   zero, zero, 0
+// 0x01063430: 0x1063430: jal   0x1094e60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063428: 0x1063428: jal   0x104fc04 sll   zero, zero, 0
-	call void Cibyl59::roadmap_main_flush_104fc04()
+// 0x01063438: 0x1063438: jal   0x104fc14 sll   zero, zero, 0
+	call void Cibyl59::roadmap_main_flush_104fc14()
 // --- basic block ---
-L_1063430:
-// 0x01063430: 0x1063430: lw    v0, 2288(sp)
+L_1063440:
+// 0x01063440: 0x1063440: lw    v0, 2288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8495,17 +8495,17 @@ L_1063430:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063434: 0x1063434: addiu s6, s6, 16
+// 0x01063444: 0x1063444: addiu s6, s6, 16
 	ldloc 17
 	ldc.i4.s 16
 	add
 	stloc 17
-// 0x01063438: 0x1063438: addiu v0, v0, 1
+// 0x01063448: 0x1063448: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0106343c: 0x106343c: sw    v0, 2288(sp)
+// 0x0106344c: 0x106344c: sw    v0, 2288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8514,8 +8514,8 @@ L_1063430:
 	add
 	ldloc 5
 	stelem.i4
-L_1063440:
-// 0x01063440: 0x1063440: lw    v1, 2288(sp)
+L_1063450:
+// 0x01063450: 0x1063450: lw    v1, 2288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8524,7 +8524,7 @@ L_1063440:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063444: 0x1063444: lw    a0, 2336(sp)
+// 0x01063454: 0x1063454: lw    a0, 2336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8533,18 +8533,18 @@ L_1063440:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063448: 0x1063448: sll   zero, zero, 0
-// 0x0106344c: 0x106344c: slt   v0, v1, a0
+// 0x01063458: 0x1063458: sll   zero, zero, 0
+// 0x0106345c: 0x106345c: slt   v0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 5
-// 0x01063450: 0x1063450: bne   v0, zero, 0x1063188 sll   zero, zero, 0
+// 0x01063460: 0x1063460: bne   v0, zero, 0x1063198 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1063188
+	brtrue L_1063198
 // --- basic block ---
-L_1063458:
-// 0x01063458: 0x1063458: lw    a1, 2300(sp)
+L_1063468:
+// 0x01063468: 0x1063468: lw    a1, 2300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8553,13 +8553,13 @@ L_1063458:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106345c: 0x106345c: sll   zero, zero, 0
-// 0x01063460: 0x1063460: addiu a1, a1, 1
+// 0x0106346c: 0x106346c: sll   zero, zero, 0
+// 0x01063470: 0x1063470: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01063464: 0x1063464: sw    a1, 2300(sp)
+// 0x01063474: 0x1063474: sw    a1, 2300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8568,21 +8568,21 @@ L_1063458:
 	add
 	ldloc.2
 	stelem.i4
-L_1063468:
-// 0x01063468: 0x1063468: jal   0x1066768 addu  a0, s5, zero
+L_1063478:
+// 0x01063478: 0x1063478: jal   0x1066778 addu  a0, s5, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
-	call int32 Cibyl76::fh_min_1066768(int32)
+	call int32 Cibyl76::fh_min_1066778(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063470: 0x1063470: beq   v0, zero, 0x1063488 sll   zero, zero, 0
+// 0x01063480: 0x1063480: beq   v0, zero, 0x1063498 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1063488
+	brfalse L_1063498
 // --- basic block ---
-// 0x01063478: 0x1063478: lw    a2, 2316(sp)
+// 0x01063488: 0x1063488: lw    a2, 2316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8591,13 +8591,13 @@ L_1063468:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0106347c: 0x106347c: sll   zero, zero, 0
-// 0x01063480: 0x1063480: beq   a2, zero, 0x1062f80 sll   zero, zero, 0
+// 0x0106348c: 0x106348c: sll   zero, zero, 0
+// 0x01063490: 0x1063490: beq   a2, zero, 0x1062f90 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1062f80
+	brfalse L_1062f90
 // --- basic block ---
-L_1063488:
-// 0x01063488: 0x1063488: lw    t0, 2292(sp)
+L_1063498:
+// 0x01063498: 0x1063498: lw    t0, 2292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8606,15 +8606,15 @@ L_1063488:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106348c: 0x106348c: addu  a0, s5, zero
+// 0x0106349c: 0x106349c: addu  a0, s5, zero
 	ldloc 16
 	stloc.1
-// 0x01063490: 0x1063490: addiu t0, t0, 1
+// 0x010634a0: 0x10634a0: addiu t0, t0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01063494: 0x1063494: jal   0x10673e8 sw    t0, 2292(sp)
+// 0x010634a4: 0x10634a4: jal   0x10673f8 sw    t0, 2292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8628,12 +8628,12 @@ L_1063488:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_deleteheap_10673e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_deleteheap_10673f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106349c: 0x106349c: lw    t3, 2292(sp)
+// 0x010634ac: 0x10634ac: lw    t3, 2292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8642,7 +8642,7 @@ L_1063488:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010634a0: 0x10634a0: lw    v1, 2348(sp)
+// 0x010634b0: 0x10634b0: lw    v1, 2348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8651,41 +8651,41 @@ L_1063488:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010634a4: 0x10634a4: sll   zero, zero, 0
-// 0x010634a8: 0x10634a8: slt   v0, v1, t3
+// 0x010634b4: 0x10634b4: sll   zero, zero, 0
+// 0x010634b8: 0x10634b8: slt   v0, v1, t3
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 5
-// 0x010634ac: 0x10634ac: beq   v0, zero, 0x1062e0c slti  v0, s0, 10
+// 0x010634bc: 0x10634bc: beq   v0, zero, 0x1062e1c slti  v0, s0, 10
 	ldloc 5
 	ldloc 10
 	ldc.i4.s 10
 	clt
 	stloc 5
-	brfalse L_1062e0c
+	brfalse L_1062e1c
 // --- basic block ---
-L_10634b4:
-// 0x010634b4: 0x10634b4: lw    v0, 0(s4)
+L_10634c4:
+// 0x010634c4: 0x10634c4: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010634b8: 0x10634b8: sll   zero, zero, 0
-// 0x010634bc: 0x10634bc: andi  v0, v0, 8
+// 0x010634c8: 0x10634c8: sll   zero, zero, 0
+// 0x010634cc: 0x10634cc: andi  v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	and
 	stloc 5
-// 0x010634c0: 0x10634c0: beq   v0, zero, 0x106351c addiu v0, zero, -1
+// 0x010634d0: 0x10634d0: beq   v0, zero, 0x106352c addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brfalse L_106351c
+	brfalse L_106352c
 // --- basic block ---
-// 0x010634c8: 0x10634c8: lw    a0, 2296(sp)
+// 0x010634d8: 0x10634d8: lw    a0, 2296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8694,19 +8694,19 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010634cc: 0x10634cc: sll   zero, zero, 0
-// 0x010634d0: 0x10634d0: slti  v0, a0, 301
+// 0x010634dc: 0x10634dc: sll   zero, zero, 0
+// 0x010634e0: 0x10634e0: slti  v0, a0, 301
 	ldloc.1
 	ldc.i4 301
 	clt
 	stloc 5
-// 0x010634d4: 0x10634d4: beq   v0, zero, 0x1063518 addu  v0, zero, zero
+// 0x010634e4: 0x10634e4: beq   v0, zero, 0x1063528 addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1063518
+	brfalse L_1063528
 // --- basic block ---
-// 0x010634dc: 0x10634dc: lw    a1, 2432(sp)
+// 0x010634ec: 0x10634ec: lw    a1, 2432(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8715,7 +8715,7 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010634e0: 0x10634e0: lw    a2, 2328(sp)
+// 0x010634f0: 0x10634f0: lw    a2, 2328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8724,7 +8724,7 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010634e4: 0x10634e4: lw    t0, 2332(sp)
+// 0x010634f4: 0x10634f4: lw    t0, 2332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8733,7 +8733,7 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010634e8: 0x10634e8: sw    a2, 4(a1)
+// 0x010634f8: 0x10634f8: sw    a2, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -8742,7 +8742,7 @@ L_10634b4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010634ec: 0x10634ec: sw    t0, 12(a1)
+// 0x010634fc: 0x10634fc: sw    t0, 12(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -8751,14 +8751,14 @@ L_10634b4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010634f0: 0x10634f0: lw    v1, 0(s4)
+// 0x01063500: 0x1063500: lw    v1, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010634f4: 0x10634f4: lw    t3, 2436(sp)
+// 0x01063504: 0x1063504: lw    t3, 2436(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8767,19 +8767,19 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010634f8: 0x10634f8: ori   v1, v1, 128
+// 0x01063508: 0x1063508: ori   v1, v1, 128
 	ldloc 7
 	ldc.i4 128
 	or
 	stloc 7
-// 0x010634fc: 0x10634fc: sw    v1, 0(s4)
+// 0x0106350c: 0x106350c: sw    v1, 0(s4)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01063500: 0x1063500: lw    a1, 2324(sp)
+// 0x01063510: 0x1063510: lw    a1, 2324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8788,7 +8788,7 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01063504: 0x1063504: lw    v1, 2320(sp)
+// 0x01063514: 0x1063514: lw    v1, 2320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8797,7 +8797,7 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063508: 0x1063508: lw    a0, 2452(sp)
+// 0x01063518: 0x1063518: lw    a0, 2452(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8806,29 +8806,29 @@ L_10634b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106350c: 0x106350c: sw    v1, 0(t3)
+// 0x0106351c: 0x106351c: sw    v1, 0(t3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x01063510: 0x1063510: j	 0x106351c sw    a1, 0(a0)
+// 0x01063520: 0x1063520: j	 0x106352c sw    a1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-	br L_106351c
+	br L_106352c
 // --- basic block ---
-L_1063518:
-// 0x01063518: 0x1063518: addiu v0, zero, -1
+L_1063528:
+// 0x01063528: 0x1063528: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_106351c:
-// 0x0106351c: 0x106351c: lw    ra, 2412(sp)
-// 0x01063520: 0x1063520: lw    s8, 2408(sp)
+L_106352c:
+// 0x0106352c: 0x106352c: lw    ra, 2412(sp)
+// 0x01063530: 0x1063530: lw    s8, 2408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8837,7 +8837,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01063524: 0x1063524: lw    s7, 2404(sp)
+// 0x01063534: 0x1063534: lw    s7, 2404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8846,7 +8846,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01063528: 0x1063528: lw    s6, 2400(sp)
+// 0x01063538: 0x1063538: lw    s6, 2400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8855,7 +8855,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0106352c: 0x106352c: lw    s5, 2396(sp)
+// 0x0106353c: 0x106353c: lw    s5, 2396(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8864,7 +8864,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01063530: 0x1063530: lw    s4, 2392(sp)
+// 0x01063540: 0x1063540: lw    s4, 2392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8873,7 +8873,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01063534: 0x1063534: lw    s3, 2388(sp)
+// 0x01063544: 0x1063544: lw    s3, 2388(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8882,7 +8882,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01063538: 0x1063538: lw    s2, 2384(sp)
+// 0x01063548: 0x1063548: lw    s2, 2384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8891,7 +8891,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0106353c: 0x106353c: lw    s1, 2380(sp)
+// 0x0106354c: 0x106354c: lw    s1, 2380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8900,7 +8900,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01063540: 0x1063540: lw    s0, 2376(sp)
+// 0x01063550: 0x1063550: lw    s0, 2376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8909,7 +8909,7 @@ L_106351c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01063544: 0x1063544: jr    ra addiu sp, sp, 2416
+// 0x01063554: 0x1063554: jr    ra addiu sp, sp, 2416
 	ldloc.0
 	ldc.i4 2416
 	add
diff --git a/converted/Cibyl74.j b/converted/Cibyl74.j
index ecd8393..be96126 100644
--- a/converted/Cibyl74.j
+++ b/converted/Cibyl74.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl74::.ctor
 
-.method public static int32 navigate_route_get_segments_106354c(int32,int32,int32,int32,int32)
+.method public static int32 navigate_route_get_segments_106355c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s6,int32 s0,int32 s8,int32 s3,int32 s4,int32 s5,int32 s7,int32 lo,int32 ra)
@@ -106,12 +106,12 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106354c: 0x106354c: addiu sp, sp, -136
+// 0x0106355c: 0x106355c: addiu sp, sp, -136
 	ldloc.0
 	ldc.i4 -136
 	add
 	stloc.0
-// 0x01063550: 0x1063550: sw    s0, 96(sp)
+// 0x01063560: 0x1063560: sw    s0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -120,25 +120,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01063554: 0x1063554: lui   v0, 0x70000
+// 0x01063564: 0x1063564: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063558: 0x1063558: addu  s0, a0, zero
+// 0x01063568: 0x1063568: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x0106355c: 0x106355c: lui   a0, 0x20000
+// 0x0106356c: 0x106356c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01063560: 0x1063560: lw    a0, 31248(a0)
+// 0x01063570: 0x1063570: lw    a0, 31712(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063564: 0x1063564: sw    s4, 112(sp)
+// 0x01063574: 0x1063574: sw    s4, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -147,16 +147,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01063568: 0x1063568: lw    v1, 12816(v0)
+// 0x01063578: 0x1063578: lw    v1, 13280(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3204
+	ldc.i4 3320
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106356c: 0x106356c: lw    s4, 164(sp)
+// 0x0106357c: 0x106357c: lw    s4, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -165,7 +165,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01063570: 0x1063570: sw    s8, 128(sp)
+// 0x01063580: 0x1063580: sw    s8, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -174,7 +174,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01063574: 0x1063574: sw    s7, 124(sp)
+// 0x01063584: 0x1063584: sw    s7, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -183,7 +183,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01063578: 0x1063578: sw    s6, 120(sp)
+// 0x01063588: 0x1063588: sw    s6, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -192,7 +192,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0106357c: 0x106357c: sw    s5, 116(sp)
+// 0x0106358c: 0x106358c: sw    s5, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -201,7 +201,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01063580: 0x1063580: sw    s3, 108(sp)
+// 0x01063590: 0x1063590: sw    s3, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -210,7 +210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01063584: 0x1063584: sw    a0, 84(sp)
+// 0x01063594: 0x1063594: sw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -219,8 +219,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01063588: 0x1063588: sw    ra, 132(sp)
-// 0x0106358c: 0x106358c: sw    s2, 104(sp)
+// 0x01063598: 0x1063598: sw    ra, 132(sp)
+// 0x0106359c: 0x106359c: sw    s2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -229,7 +229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01063590: 0x1063590: sw    s1, 100(sp)
+// 0x010635a0: 0x10635a0: sw    s1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -238,10 +238,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01063594: 0x1063594: addu  s3, a1, zero
+// 0x010635a4: 0x10635a4: addu  s3, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01063598: 0x1063598: sw    a3, 148(sp)
+// 0x010635a8: 0x10635a8: sw    a3, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -250,7 +250,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0106359c: 0x106359c: lw    s5, 156(sp)
+// 0x010635ac: 0x10635ac: lw    s5, 156(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -259,7 +259,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010635a0: 0x10635a0: lw    s7, 160(sp)
+// 0x010635b0: 0x10635b0: lw    s7, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -268,7 +268,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010635a4: 0x10635a4: lw    s8, 168(sp)
+// 0x010635b4: 0x10635b4: lw    s8, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -277,39 +277,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010635a8: 0x10635a8: lw    a0, 0(s4)
+// 0x010635b8: 0x10635b8: lw    a0, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010635ac: 0x10635ac: beq   v1, zero, 0x10635d8 addu  s6, a2, zero
+// 0x010635bc: 0x10635bc: beq   v1, zero, 0x10635e8 addu  s6, a2, zero
 	ldloc 7
 	ldloc.3
 	stloc 10
-	brfalse L_10635d8
+	brfalse L_10635e8
 // --- basic block ---
-// 0x010635b4: 0x10635b4: lui   a1, 0x10000
+// 0x010635c4: 0x10635c4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010635b8: 0x10635b8: lui   a3, 0x10000
+// 0x010635c8: 0x10635c8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010635bc: 0x10635bc: addiu a1, a1, 13708
+// 0x010635cc: 0x10635cc: addiu a1, a1, 13704
 	ldloc.2
-	ldc.i4 13708
+	ldc.i4 13704
 	add
 	stloc.2
-// 0x010635c0: 0x10635c0: addiu a3, a3, 13788
+// 0x010635d0: 0x10635d0: addiu a3, a3, 13784
 	ldloc 4
-	ldc.i4 13788
+	ldc.i4 13784
 	add
 	stloc 4
-// 0x010635c4: 0x10635c4: addiu a0, zero, 4
+// 0x010635d4: 0x10635d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010635c8: 0x10635c8: jal   0x100449c addiu a2, zero, 699
+// 0x010635d8: 0x10635d8: jal   0x100449c addiu a2, zero, 699
 	ldc.i4 699
 	stloc.3
 	ldloc.0
@@ -322,30 +322,30 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010635d0: 0x10635d0: j	 0x1063aac addiu s0, zero, -1
+// 0x010635e0: 0x10635e0: j	 0x1063abc addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 11
-	br L_1063aac
+	br L_1063abc
 // --- basic block ---
-L_10635d8:
-// 0x010635d8: 0x10635d8: andi  v1, a0, 4
+L_10635e8:
+// 0x010635e8: 0x10635e8: andi  v1, a0, 4
 	ldloc.1
 	ldc.i4.4
 	and
 	stloc 7
-// 0x010635dc: 0x10635dc: addiu a0, zero, 1
+// 0x010635ec: 0x10635ec: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010635e0: 0x10635e0: sw    a0, 12816(v0)
+// 0x010635f0: 0x10635f0: sw    a0, 13280(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3204
+	ldc.i4 3320
 	add
 	ldloc.1
 	stelem.i4
-// 0x010635e4: 0x10635e4: beq   v1, zero, 0x10635f8 sw    zero, 80(sp)
+// 0x010635f4: 0x10635f4: beq   v1, zero, 0x1063608 sw    zero, 80(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -355,9 +355,9 @@ L_10635d8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10635f8
+	brfalse L_1063608
 // --- basic block ---
-// 0x010635ec: 0x10635ec: lw    v0, 172(sp)
+// 0x010635fc: 0x10635fc: lw    v0, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -366,8 +366,8 @@ L_10635d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010635f0: 0x10635f0: sll   zero, zero, 0
-// 0x010635f4: 0x10635f4: sw    v0, 80(sp)
+// 0x01063600: 0x1063600: sll   zero, zero, 0
+// 0x01063604: 0x1063604: sw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -376,16 +376,16 @@ L_10635d8:
 	add
 	ldloc 5
 	stelem.i4
-L_10635f8:
-// 0x010635f8: 0x10635f8: lui   a0, 0x10000
+L_1063608:
+// 0x01063608: 0x1063608: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010635fc: 0x10635fc: addiu a0, a0, 13828
+// 0x0106360c: 0x106360c: addiu a0, a0, 13824
 	ldloc.1
-	ldc.i4 13828
+	ldc.i4 13824
 	add
 	stloc.1
-// 0x01063600: 0x1063600: jal   0x10158bc addiu a1, zero, 4096
+// 0x01063610: 0x1063610: jal   0x10158cc addiu a1, zero, 4096
 	ldc.i4 4096
 	stloc.2
 	ldloc.0
@@ -393,83 +393,83 @@ L_10635f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_new_10158bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_new_10158cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063608: 0x1063608: lui   v1, 0x70000
+// 0x01063618: 0x1063618: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x0106360c: 0x106360c: sw    v0, 12824(v1)
+// 0x0106361c: 0x106361c: sw    v0, 13288(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3206
+	ldc.i4 3322
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063610: 0x1063610: lui   v0, 0x70000
+// 0x01063620: 0x1063620: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063614: 0x1063614: sw    zero, 12820(v0)
+// 0x01063624: 0x1063624: sw    zero, 13284(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063618: 0x1063618: addu  s1, s8, zero
+// 0x01063628: 0x1063628: addu  s1, s8, zero
 	ldloc 12
 	stloc 8
-// 0x0106361c: 0x106361c: addu  s2, zero, zero
+// 0x0106362c: 0x106362c: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01063620: 0x1063620: j	 0x1063680 addiu v1, zero, 1
+// 0x01063630: 0x1063630: j	 0x1063690 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-	br L_1063680
+	br L_1063690
 // --- basic block ---
-L_1063628:
-// 0x01063628: 0x1063628: lb    v0, 52(s1)
+L_1063638:
+// 0x01063638: 0x1063638: lb    v0, 52(s1)
 	ldloc 8
 	ldc.i4.s 52
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0106362c: 0x106362c: sll   zero, zero, 0
-// 0x01063630: 0x1063630: beq   v0, v1, 0x1063678 sll   zero, zero, 0
+// 0x0106363c: 0x106363c: sll   zero, zero, 0
+// 0x01063640: 0x1063640: beq   v0, v1, 0x1063688 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_1063678
+	beq  L_1063688
 // --- basic block ---
-// 0x01063638: 0x1063638: beq   s2, zero, 0x1063650 sll   zero, zero, 0
+// 0x01063648: 0x1063648: beq   s2, zero, 0x1063660 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_1063650
+	brfalse L_1063660
 // --- basic block ---
-// 0x01063640: 0x1063640: lb    v0, -4(s1)
+// 0x01063650: 0x1063650: lb    v0, -4(s1)
 	ldloc 8
 	ldc.i4.s -4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01063644: 0x1063644: sll   zero, zero, 0
-// 0x01063648: 0x1063648: beq   v0, v1, 0x1063678 sll   zero, zero, 0
+// 0x01063654: 0x1063654: sll   zero, zero, 0
+// 0x01063658: 0x1063658: beq   v0, v1, 0x1063688 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_1063678
+	beq  L_1063688
 // --- basic block ---
-L_1063650:
-// 0x01063650: 0x1063650: lb    a2, 50(s1)
+L_1063660:
+// 0x01063660: 0x1063660: lb    a2, 50(s1)
 	ldloc 8
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x01063654: 0x1063654: lw    a0, 24(s1)
+// 0x01063664: 0x1063664: lw    a0, 24(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -478,23 +478,23 @@ L_1063650:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063658: 0x1063658: lh    a1, 36(s1)
+// 0x01063668: 0x1063668: lh    a1, 36(s1)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.2
-// 0x0106365c: 0x106365c: xori  a2, a2, 1
+// 0x0106366c: 0x106366c: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x01063660: 0x1063660: sltu  a2, zero, a2
+// 0x01063670: 0x1063670: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x01063664: 0x1063664: sw    v1, 88(sp)
+// 0x01063674: 0x1063674: sw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -503,7 +503,7 @@ L_1063650:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01063668: 0x1063668: sw    s2, 16(sp)
+// 0x01063678: 0x1063678: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -512,7 +512,7 @@ L_1063650:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106366c: 0x106366c: jal   0x10629ac sw    zero, 20(sp)
+// 0x0106367c: 0x106367c: jal   0x10629bc sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -526,12 +526,12 @@ L_1063650:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::make_path_10629ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::make_path_10629bc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063674: 0x1063674: lw    v1, 88(sp)
+// 0x01063684: 0x1063684: lw    v1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -540,19 +540,19 @@ L_1063650:
 	add
 	ldelem.i4
 	stloc 7
-L_1063678:
-// 0x01063678: 0x1063678: addiu s2, s2, 1
+L_1063688:
+// 0x01063688: 0x1063688: addiu s2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0106367c: 0x106367c: addiu s1, s1, 56
+// 0x0106368c: 0x106368c: addiu s1, s1, 56
 	ldloc 8
 	ldc.i4.s 56
 	add
 	stloc 8
-L_1063680:
-// 0x01063680: 0x1063680: lw    a0, 80(sp)
+L_1063690:
+// 0x01063690: 0x1063690: lw    a0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -561,19 +561,19 @@ L_1063680:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063684: 0x1063684: sll   zero, zero, 0
-// 0x01063688: 0x1063688: slt   v0, s2, a0
+// 0x01063694: 0x1063694: sll   zero, zero, 0
+// 0x01063698: 0x1063698: slt   v0, s2, a0
 	ldloc 9
 	ldloc.1
 	clt
 	stloc 5
-// 0x0106368c: 0x106368c: bne   v0, zero, 0x1063628 addiu a3, zero, -1
+// 0x0106369c: 0x106369c: bne   v0, zero, 0x1063638 addiu a3, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 4
-	brtrue L_1063628
+	brtrue L_1063638
 // --- basic block ---
-// 0x01063694: 0x1063694: jal   0x100b020 addu  a0, zero, zero
+// 0x010636a4: 0x10636a4: jal   0x100b030 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -581,15 +581,15 @@ L_1063680:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_screen_scale_100b020(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_screen_scale_100b030(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106369c: 0x106369c: lui   v0, 0x0
+// 0x010636ac: 0x10636ac: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010636a0: 0x10636a0: lw    a0, 12(s0)
+// 0x010636b0: 0x10636b0: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -598,7 +598,7 @@ L_1063680:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010636a4: 0x10636a4: lw    v1, 4(s0)
+// 0x010636b4: 0x10636b4: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -607,7 +607,7 @@ L_1063680:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010636a8: 0x10636a8: lw    v0, 576(v0)
+// 0x010636b8: 0x10636b8: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -616,7 +616,7 @@ L_1063680:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010636ac: 0x10636ac: sw    a0, 60(sp)
+// 0x010636bc: 0x10636bc: sw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -625,7 +625,7 @@ L_1063680:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010636b0: 0x10636b0: beq   a0, v0, 0x10636c8 sw    v1, 64(sp)
+// 0x010636c0: 0x10636c0: beq   a0, v0, 0x10636d8 sw    v1, 64(sp)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -636,26 +636,26 @@ L_1063680:
 	add
 	ldloc 7
 	stelem.i4
-	beq  L_10636c8
+	beq  L_10636d8
 // --- basic block ---
-// 0x010636b8: 0x10636b8: bltz  a0, 0x10636c8 sll   zero, zero, 0
+// 0x010636c8: 0x10636c8: bltz  a0, 0x10636d8 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10636c8
+	blt L_10636d8
 // --- basic block ---
-// 0x010636c0: 0x10636c0: jal   0x100b164 sll   zero, zero, 0
+// 0x010636d0: 0x10636d0: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10636c8:
-// 0x010636c8: 0x10636c8: lw    a0, 64(sp)
+L_10636d8:
+// 0x010636d8: 0x10636d8: lw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -664,12 +664,12 @@ L_10636c8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010636cc: 0x10636cc: addiu a1, sp, 44
+// 0x010636dc: 0x10636dc: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x010636d0: 0x10636d0: jal   0x1003adc addiu a2, sp, 48
+// 0x010636e0: 0x10636e0: jal   0x1003adc addiu a2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -682,7 +682,7 @@ L_10636c8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010636d8: 0x10636d8: lw    v0, 48(sp)
+// 0x010636e8: 0x10636e8: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -691,13 +691,13 @@ L_10636c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010636dc: 0x10636dc: sll   zero, zero, 0
-// 0x010636e0: 0x10636e0: beq   s3, v0, 0x1063700 sll   zero, zero, 0
+// 0x010636ec: 0x10636ec: sll   zero, zero, 0
+// 0x010636f0: 0x10636f0: beq   s3, v0, 0x1063710 sll   zero, zero, 0
 	ldloc 13
 	ldloc 5
-	beq  L_1063700
+	beq  L_1063710
 // --- basic block ---
-// 0x010636e8: 0x10636e8: lw    v0, 44(sp)
+// 0x010636f8: 0x10636f8: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -706,15 +706,15 @@ L_10636c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010636ec: 0x10636ec: sll   zero, zero, 0
-// 0x010636f0: 0x10636f0: bne   s3, v0, 0x1063700 lui   v0, 0x80000000
+// 0x010636fc: 0x10636fc: sll   zero, zero, 0
+// 0x01063700: 0x1063700: bne   s3, v0, 0x1063710 lui   v0, 0x80000000
 	ldloc 13
 	ldloc 5
 	ldc.i4 2147483648
 	stloc 5
-	bne.un L_1063700
+	bne.un L_1063710
 // --- basic block ---
-// 0x010636f8: 0x10636f8: j	 0x1063704 sw    v0, 56(sp)
+// 0x01063708: 0x1063708: j	 0x1063714 sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -723,10 +723,10 @@ L_10636c8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1063704
+	br L_1063714
 // --- basic block ---
-L_1063700:
-// 0x01063700: 0x1063700: sw    zero, 56(sp)
+L_1063710:
+// 0x01063710: 0x1063710: sw    zero, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -735,8 +735,8 @@ L_1063700:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1063704:
-// 0x01063704: 0x1063704: lw    v0, 148(sp)
+L_1063714:
+// 0x01063714: 0x1063714: lw    v0, 148(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -745,12 +745,12 @@ L_1063704:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063708: 0x1063708: addiu a0, sp, 60
+// 0x01063718: 0x1063718: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x0106370c: 0x106370c: sw    v0, 20(sp)
+// 0x0106371c: 0x106371c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -759,12 +759,12 @@ L_1063704:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063710: 0x1063710: addiu v0, sp, 40
+// 0x01063720: 0x1063720: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x01063714: 0x1063714: sw    v0, 24(sp)
+// 0x01063724: 0x1063724: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -773,12 +773,12 @@ L_1063704:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063718: 0x1063718: addiu v0, sp, 68
+// 0x01063728: 0x1063728: addiu v0, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 5
-// 0x0106371c: 0x106371c: sw    v0, 32(sp)
+// 0x0106372c: 0x106372c: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -787,25 +787,25 @@ L_1063704:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063720: 0x1063720: addu  a1, s3, zero
+// 0x01063730: 0x1063730: addu  a1, s3, zero
 	ldloc 13
 	stloc.2
-// 0x01063724: 0x1063724: addiu v0, sp, 52
+// 0x01063734: 0x1063734: addiu v0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 5
-// 0x01063728: 0x1063728: addiu a2, sp, 64
+// 0x01063738: 0x1063738: addiu a2, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.3
-// 0x0106372c: 0x106372c: addiu a3, sp, 56
+// 0x0106373c: 0x106373c: addiu a3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x01063730: 0x1063730: sw    v0, 36(sp)
+// 0x01063740: 0x1063740: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -814,7 +814,7 @@ L_1063704:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063734: 0x1063734: sw    s6, 16(sp)
+// 0x01063744: 0x1063744: sw    s6, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -823,7 +823,7 @@ L_1063704:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01063738: 0x1063738: jal   0x1062c70 sw    s4, 28(sp)
+// 0x01063748: 0x1063748: jal   0x1062c80 sw    s4, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -837,20 +837,20 @@ L_1063704:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::astar_1062c70(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::astar_1062c80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063740: 0x1063740: addiu v1, zero, -1
+// 0x01063750: 0x1063750: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01063744: 0x1063744: beq   v0, v1, 0x1063ae0 sll   zero, zero, 0
+// 0x01063754: 0x1063754: beq   v0, v1, 0x1063af0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_1063ae0
+	beq  L_1063af0
 // --- basic block ---
-// 0x0106374c: 0x106374c: lw    v0, 68(sp)
+// 0x0106375c: 0x106375c: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -859,7 +859,7 @@ L_1063704:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063750: 0x1063750: lw    s2, 4(s6)
+// 0x01063760: 0x1063760: lw    s2, 4(s6)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -868,7 +868,7 @@ L_1063704:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01063754: 0x1063754: lw    s6, 12(s6)
+// 0x01063764: 0x1063764: lw    s6, 12(s6)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -877,44 +877,44 @@ L_1063704:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01063758: 0x1063758: bltz  v0, 0x10637c4 addiu v1, zero, 56
+// 0x01063768: 0x1063768: bltz  v0, 0x10637d4 addiu v1, zero, 56
 	ldloc 5
 	ldc.i4.s 56
 	stloc 7
 	ldc.i4.s 0
-	blt L_10637c4
+	blt L_10637d4
 // --- basic block ---
-// 0x01063760: 0x1063760: mult  v0, v1
+// 0x01063770: 0x1063770: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 17
-// 0x01063764: 0x1063764: mflo  lo
+// 0x01063774: 0x1063774: mflo  lo
 	ldloc 17
 	stloc 5
-// 0x01063768: 0x1063768: addu  s8, s8, v0
+// 0x01063778: 0x1063778: addu  s8, s8, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc 12
-// 0x0106376c: 0x106376c: lb    a2, 50(s8)
+// 0x0106377c: 0x106377c: lb    a2, 50(s8)
 	ldloc 12
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x01063770: 0x1063770: lh    a1, 36(s8)
+// 0x01063780: 0x1063780: lh    a1, 36(s8)
 	ldloc 12
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.2
-// 0x01063774: 0x1063774: xori  a2, a2, 1
+// 0x01063784: 0x1063784: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x01063778: 0x1063778: lw    a0, 24(s8)
+// 0x01063788: 0x1063788: lw    a0, 24(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -923,7 +923,7 @@ L_1063704:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106377c: 0x106377c: jal   0x1062b34 sltu  a2, zero, a2
+// 0x0106378c: 0x106378c: jal   0x1062b44 sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
@@ -933,40 +933,40 @@ L_1063704:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::find_prev_1062b34(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::find_prev_1062b44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063784: 0x1063784: bne   v0, zero, 0x10637a4 lui   a1, 0x10000
+// 0x01063794: 0x1063794: bne   v0, zero, 0x10637b4 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10637a4
+	brtrue L_10637b4
 // --- basic block ---
-// 0x0106378c: 0x106378c: lui   a3, 0x10000
+// 0x0106379c: 0x106379c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063790: 0x1063790: addiu a1, a1, 13708
+// 0x010637a0: 0x10637a0: addiu a1, a1, 13704
 	ldloc.2
-	ldc.i4 13708
+	ldc.i4 13704
 	add
 	stloc.2
-// 0x01063794: 0x1063794: addiu a3, a3, 13836
+// 0x010637a4: 0x10637a4: addiu a3, a3, 13832
 	ldloc 4
-	ldc.i4 13836
+	ldc.i4 13832
 	add
 	stloc 4
-// 0x01063798: 0x1063798: addiu a0, zero, 4
+// 0x010637a8: 0x10637a8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106379c: 0x106379c: j	 0x10638a4 addiu a2, zero, 580
+// 0x010637ac: 0x10637ac: j	 0x10638b4 addiu a2, zero, 580
 	ldc.i4 580
 	stloc.3
-	br L_10638a4
+	br L_10638b4
 // --- basic block ---
-L_10637a4:
-// 0x010637a4: 0x10637a4: lw    v1, 4(v0)
+L_10637b4:
+// 0x010637b4: 0x10637b4: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -975,29 +975,29 @@ L_10637a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010637a8: 0x10637a8: lui   a0, 0x80000000
+// 0x010637b8: 0x10637b8: lui   a0, 0x80000000
 	ldc.i4 2147483648
 	stloc.1
-// 0x010637ac: 0x10637ac: lui   s6, 0x7fff0000
+// 0x010637bc: 0x10637bc: lui   s6, 0x7fff0000
 	ldc.i4 2147418112
 	stloc 10
-// 0x010637b0: 0x10637b0: and   a0, v1, a0
+// 0x010637c0: 0x10637c0: and   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	and
 	stloc.1
-// 0x010637b4: 0x10637b4: ori   s6, s6, 65535
+// 0x010637c4: 0x10637c4: ori   s6, s6, 65535
 	ldloc 10
 	ldc.i4 65535
 	or
 	stloc 10
-// 0x010637b8: 0x10637b8: lhu   s2, 10(v0)
+// 0x010637c8: 0x10637c8: lhu   s2, 10(v0)
 	ldloc 5
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 9
-// 0x010637bc: 0x10637bc: sw    a0, 52(sp)
+// 0x010637cc: 0x10637cc: sw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1006,28 +1006,28 @@ L_10637a4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010637c0: 0x10637c0: and   s6, v1, s6
+// 0x010637d0: 0x10637d0: and   s6, v1, s6
 	ldloc 7
 	ldloc 10
 	and
 	stloc 10
-L_10637c4:
-// 0x010637c4: 0x10637c4: lui   s1, 0x70000
+L_10637d4:
+// 0x010637d4: 0x10637d4: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x010637c8: 0x10637c8: addiu s1, s1, 15796
+// 0x010637d8: 0x10637d8: addiu s1, s1, 16260
 	ldloc 8
-	ldc.i4 15796
+	ldc.i4 16260
 	add
 	stloc 8
-// 0x010637cc: 0x10637cc: addu  s8, zero, zero
+// 0x010637dc: 0x10637dc: addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 12
-L_10637d0:
-// 0x010637d0: 0x10637d0: lui   v1, 0x0
+L_10637e0:
+// 0x010637e0: 0x10637e0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x010637d4: 0x10637d4: lw    v0, 576(v1)
+// 0x010637e4: 0x10637e4: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1036,28 +1036,28 @@ L_10637d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010637d8: 0x10637d8: addiu s8, s8, 1
+// 0x010637e8: 0x10637e8: addiu s8, s8, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 12
-// 0x010637dc: 0x10637dc: beq   s6, v0, 0x10637f4 addiu s1, s1, -56
+// 0x010637ec: 0x10637ec: beq   s6, v0, 0x1063804 addiu s1, s1, -56
 	ldloc 10
 	ldloc 5
 	ldloc 8
 	ldc.i4.s -56
 	add
 	stloc 8
-	beq  L_10637f4
+	beq  L_1063804
 // --- basic block ---
-// 0x010637e4: 0x10637e4: bltz  s6, 0x10637f8 addu  a0, s2, zero
+// 0x010637f4: 0x10637f4: bltz  s6, 0x1063808 addu  a0, s2, zero
 	ldloc 10
 	ldloc 9
 	stloc.1
 	ldc.i4.s 0
-	blt L_10637f8
+	blt L_1063808
 // --- basic block ---
-// 0x010637ec: 0x10637ec: jal   0x100b164 addu  a0, s6, zero
+// 0x010637fc: 0x10637fc: jal   0x100b174 addu  a0, s6, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1065,23 +1065,23 @@ L_10637d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10637f4:
-// 0x010637f4: 0x10637f4: addu  a0, s2, zero
+L_1063804:
+// 0x01063804: 0x1063804: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-L_10637f8:
-// 0x010637f8: 0x10637f8: sb    zero, 55(s1)
+L_1063808:
+// 0x01063808: 0x1063808: sb    zero, 55(s1)
 	ldloc 8
 	ldc.i4.s 55
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010637fc: 0x10637fc: sw    s6, 24(s1)
+// 0x0106380c: 0x106380c: sw    s6, 24(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1090,7 +1090,7 @@ L_10637f8:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01063800: 0x1063800: jal   0x1003b50 sh    s2, 36(s1)
+// 0x01063810: 0x1063810: jal   0x1003b50 sh    s2, 36(s1)
 	ldloc 8
 	ldc.i4.s 36
 	add
@@ -1104,7 +1104,7 @@ L_10637f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063808: 0x1063808: lw    v1, 52(sp)
+// 0x01063818: 0x1063818: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1113,35 +1113,35 @@ L_10637f8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106380c: 0x106380c: sb    v0, 51(s1)
+// 0x0106381c: 0x106381c: sb    v0, 51(s1)
 	ldloc 8
 	ldc.i4.s 51
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01063810: 0x1063810: sltu  v0, zero, v1
+// 0x01063820: 0x1063820: sltu  v0, zero, v1
 	ldc.i4.s 0
 	ldloc 7
 	clt.un
 	stloc 5
-// 0x01063814: 0x1063814: addiu v0, v0, 1
+// 0x01063824: 0x1063824: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01063818: 0x1063818: beq   v1, zero, 0x1063834 sb    v0, 50(s1)
+// 0x01063828: 0x1063828: beq   v1, zero, 0x1063844 sb    v0, 50(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.s 50
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brfalse L_1063834
+	brfalse L_1063844
 // --- basic block ---
-// 0x01063820: 0x1063820: addu  a0, s2, zero
+// 0x01063830: 0x1063830: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01063824: 0x1063824: jal   0x1003b2c addiu a1, sp, 72
+// 0x01063834: 0x1063834: jal   0x1003b2c addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1151,14 +1151,14 @@ L_10637f8:
 	call int32 Cibyl2::roadmap_line_to_point_1003b2c(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0106382c: 0x106382c: j	 0x1063840 sll   zero, zero, 0
-	br L_1063840
+// 0x0106383c: 0x106383c: j	 0x1063850 sll   zero, zero, 0
+	br L_1063850
 // --- basic block ---
-L_1063834:
-// 0x01063834: 0x1063834: addu  a0, s2, zero
+L_1063844:
+// 0x01063844: 0x1063844: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01063838: 0x1063838: jal   0x1003b08 addiu a1, sp, 72
+// 0x01063848: 0x1063848: jal   0x1003b08 addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -1168,8 +1168,8 @@ L_1063834:
 	call int32 Cibyl2::roadmap_line_from_point_1003b08(int32,int32)
 	stloc 5
 // --- basic block ---
-L_1063840:
-// 0x01063840: 0x1063840: lw    v0, 64(sp)
+L_1063850:
+// 0x01063850: 0x1063850: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1178,13 +1178,13 @@ L_1063840:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063844: 0x1063844: sll   zero, zero, 0
-// 0x01063848: 0x1063848: bne   s2, v0, 0x1063874 sll   zero, zero, 0
+// 0x01063854: 0x1063854: sll   zero, zero, 0
+// 0x01063858: 0x1063858: bne   s2, v0, 0x1063884 sll   zero, zero, 0
 	ldloc 9
 	ldloc 5
-	bne.un L_1063874
+	bne.un L_1063884
 // --- basic block ---
-// 0x01063850: 0x1063850: lw    v0, 60(sp)
+// 0x01063860: 0x1063860: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1193,13 +1193,13 @@ L_1063840:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063854: 0x1063854: sll   zero, zero, 0
-// 0x01063858: 0x1063858: bne   s6, v0, 0x1063874 sll   zero, zero, 0
+// 0x01063864: 0x1063864: sll   zero, zero, 0
+// 0x01063868: 0x1063868: bne   s6, v0, 0x1063884 sll   zero, zero, 0
 	ldloc 10
 	ldloc 5
-	bne.un L_1063874
+	bne.un L_1063884
 // --- basic block ---
-// 0x01063860: 0x1063860: lw    v0, 56(sp)
+// 0x01063870: 0x1063870: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1208,7 +1208,7 @@ L_1063840:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063864: 0x1063864: lw    v1, 52(sp)
+// 0x01063874: 0x1063874: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1217,14 +1217,14 @@ L_1063840:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063868: 0x1063868: sll   zero, zero, 0
-// 0x0106386c: 0x106386c: beq   v1, v0, 0x10638f0 sll   zero, zero, 0
+// 0x01063878: 0x1063878: sll   zero, zero, 0
+// 0x0106387c: 0x106387c: beq   v1, v0, 0x1063900 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10638f0
+	beq  L_1063900
 // --- basic block ---
-L_1063874:
-// 0x01063874: 0x1063874: lw    a2, 52(sp)
+L_1063884:
+// 0x01063884: 0x1063884: lw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1233,10 +1233,10 @@ L_1063874:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01063878: 0x1063878: addu  a0, s6, zero
+// 0x01063888: 0x1063888: addu  a0, s6, zero
 	ldloc 10
 	stloc.1
-// 0x0106387c: 0x106387c: jal   0x1062b34 addu  a1, s2, zero
+// 0x0106388c: 0x106388c: jal   0x1062b44 addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -1244,41 +1244,41 @@ L_1063874:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl73::find_prev_1062b34(int32,int32,int32,int32,int32)
+	call int32 Cibyl73::find_prev_1062b44(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063884: 0x1063884: bne   v0, zero, 0x10638b4 lui   a0, 0x80000000
+// 0x01063894: 0x1063894: bne   v0, zero, 0x10638c4 lui   a0, 0x80000000
 	ldloc 5
 	ldc.i4 2147483648
 	stloc.1
-	brtrue L_10638b4
+	brtrue L_10638c4
 // --- basic block ---
-// 0x0106388c: 0x106388c: lui   a1, 0x10000
+// 0x0106389c: 0x106389c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01063890: 0x1063890: lui   a3, 0x10000
+// 0x010638a0: 0x10638a0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063894: 0x1063894: addiu a1, a1, 13708
+// 0x010638a4: 0x10638a4: addiu a1, a1, 13704
 	ldloc.2
-	ldc.i4 13708
+	ldc.i4 13704
 	add
 	stloc.2
-// 0x01063898: 0x1063898: addiu a3, a3, 13836
+// 0x010638a8: 0x10638a8: addiu a3, a3, 13832
 	ldloc 4
-	ldc.i4 13836
+	ldc.i4 13832
 	add
 	stloc 4
-// 0x0106389c: 0x106389c: addiu a0, zero, 4
+// 0x010638ac: 0x10638ac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010638a0: 0x10638a0: addiu a2, zero, 620
+// 0x010638b0: 0x10638b0: addiu a2, zero, 620
 	ldc.i4 620
 	stloc.3
-L_10638a4:
-// 0x010638a4: 0x10638a4: jal   0x100449c addiu s0, zero, -1
+L_10638b4:
+// 0x010638b4: 0x10638b4: jal   0x100449c addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 11
 	ldloc.0
@@ -1291,11 +1291,11 @@ L_10638a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010638ac: 0x10638ac: j	 0x1063a28 sll   zero, zero, 0
-	br L_1063a28
+// 0x010638bc: 0x10638bc: j	 0x1063a38 sll   zero, zero, 0
+	br L_1063a38
 // --- basic block ---
-L_10638b4:
-// 0x010638b4: 0x10638b4: lw    s6, 4(v0)
+L_10638c4:
+// 0x010638c4: 0x10638c4: lw    s6, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1304,18 +1304,18 @@ L_10638b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010638b8: 0x10638b8: lhu   s2, 10(v0)
+// 0x010638c8: 0x10638c8: lhu   s2, 10(v0)
 	ldloc 5
 	ldc.i4.s 10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 9
-// 0x010638bc: 0x10638bc: and   v0, s6, a0
+// 0x010638cc: 0x10638cc: and   v0, s6, a0
 	ldloc 10
 	ldloc.1
 	and
 	stloc 5
-// 0x010638c0: 0x10638c0: sw    v0, 52(sp)
+// 0x010638d0: 0x10638d0: sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1324,73 +1324,73 @@ L_10638b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010638c4: 0x10638c4: addiu v0, zero, 50
+// 0x010638d4: 0x10638d4: addiu v0, zero, 50
 	ldc.i4.s 50
 	stloc 5
-// 0x010638c8: 0x10638c8: beq   s8, v0, 0x10638dc lui   v1, 0x7fff0000
+// 0x010638d8: 0x10638d8: beq   s8, v0, 0x10638ec lui   v1, 0x7fff0000
 	ldloc 12
 	ldloc 5
 	ldc.i4 2147418112
 	stloc 7
-	beq  L_10638dc
+	beq  L_10638ec
 // --- basic block ---
-// 0x010638d0: 0x10638d0: ori   v1, v1, 65535
+// 0x010638e0: 0x10638e0: ori   v1, v1, 65535
 	ldloc 7
 	ldc.i4 65535
 	or
 	stloc 7
-// 0x010638d4: 0x10638d4: j	 0x10637d0 and   s6, s6, v1
+// 0x010638e4: 0x10638e4: j	 0x10637e0 and   s6, s6, v1
 	ldloc 10
 	ldloc 7
 	and
 	stloc 10
-	br L_10637d0
+	br L_10637e0
 // --- basic block ---
-L_10638dc:
-// 0x010638dc: 0x10638dc: lw    v0, 0(s4)
+L_10638ec:
+// 0x010638ec: 0x10638ec: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010638e0: 0x10638e0: sll   zero, zero, 0
-// 0x010638e4: 0x10638e4: andi  v0, v0, 256
+// 0x010638f0: 0x10638f0: sll   zero, zero, 0
+// 0x010638f4: 0x10638f4: andi  v0, v0, 256
 	ldloc 5
 	ldc.i4 256
 	and
 	stloc 5
-// 0x010638e8: 0x10638e8: beq   v0, zero, 0x1063ae0 sll   zero, zero, 0
+// 0x010638f8: 0x10638f8: beq   v0, zero, 0x1063af0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1063ae0
+	brfalse L_1063af0
 // --- basic block ---
-L_10638f0:
-// 0x010638f0: 0x10638f0: lw    v0, 0(s4)
+L_1063900:
+// 0x01063900: 0x1063900: lw    v0, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010638f4: 0x10638f4: sll   zero, zero, 0
-// 0x010638f8: 0x10638f8: andi  v0, v0, 256
+// 0x01063904: 0x1063904: sll   zero, zero, 0
+// 0x01063908: 0x1063908: andi  v0, v0, 256
 	ldloc 5
 	ldc.i4 256
 	and
 	stloc 5
-// 0x010638fc: 0x10638fc: bne   v0, zero, 0x10639c4 addu  s2, s8, zero
+// 0x0106390c: 0x106390c: bne   v0, zero, 0x10639d4 addu  s2, s8, zero
 	ldloc 5
 	ldloc 12
 	stloc 9
-	brtrue L_10639c4
+	brtrue L_10639d4
 // --- basic block ---
-// 0x01063904: 0x1063904: lh    v1, 36(s1)
+// 0x01063914: 0x1063914: lh    v1, 36(s1)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01063908: 0x1063908: lw    v0, 64(sp)
+// 0x01063918: 0x1063918: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1399,13 +1399,13 @@ L_10638f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106390c: 0x106390c: sll   zero, zero, 0
-// 0x01063910: 0x1063910: bne   v1, v0, 0x1063944 sll   zero, zero, 0
+// 0x0106391c: 0x106391c: sll   zero, zero, 0
+// 0x01063920: 0x1063920: bne   v1, v0, 0x1063954 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1063944
+	bne.un L_1063954
 // --- basic block ---
-// 0x01063918: 0x1063918: lw    v1, 24(s1)
+// 0x01063928: 0x1063928: lw    v1, 24(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1414,7 +1414,7 @@ L_10638f0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106391c: 0x106391c: lw    v0, 60(sp)
+// 0x0106392c: 0x106392c: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1423,13 +1423,13 @@ L_10638f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063920: 0x1063920: sll   zero, zero, 0
-// 0x01063924: 0x1063924: bne   v1, v0, 0x1063944 sll   zero, zero, 0
+// 0x01063930: 0x1063930: sll   zero, zero, 0
+// 0x01063934: 0x1063934: bne   v1, v0, 0x1063954 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1063944
+	bne.un L_1063954
 // --- basic block ---
-// 0x0106392c: 0x106392c: lw    v0, 56(sp)
+// 0x0106393c: 0x106393c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1438,45 +1438,45 @@ L_10638f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063930: 0x1063930: lb    v1, 50(s1)
+// 0x01063940: 0x1063940: lb    v1, 50(s1)
 	ldloc 8
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01063934: 0x1063934: sltu  v0, zero, v0
+// 0x01063944: 0x1063944: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01063938: 0x1063938: addiu v0, v0, 1
+// 0x01063948: 0x1063948: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0106393c: 0x106393c: beq   v1, v0, 0x10639c4 sll   zero, zero, 0
+// 0x0106394c: 0x106394c: beq   v1, v0, 0x10639d4 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10639c4
+	beq  L_10639d4
 // --- basic block ---
-L_1063944:
-// 0x01063944: 0x1063944: addiu s2, s8, 1
+L_1063954:
+// 0x01063954: 0x1063954: addiu s2, s8, 1
 	ldloc 12
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01063948: 0x1063948: slti  v0, s2, 51
+// 0x01063958: 0x1063958: slti  v0, s2, 51
 	ldloc 9
 	ldc.i4.s 51
 	clt
 	stloc 5
-// 0x0106394c: 0x106394c: beq   v0, zero, 0x1063ae0 lui   v0, 0x0
+// 0x0106395c: 0x106395c: beq   v0, zero, 0x1063af0 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1063ae0
+	brfalse L_1063af0
 // --- basic block ---
-// 0x01063954: 0x1063954: lw    v0, 576(v0)
+// 0x01063964: 0x1063964: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1485,7 +1485,7 @@ L_1063944:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063958: 0x1063958: lw    a0, 12(s0)
+// 0x01063968: 0x1063968: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1494,30 +1494,30 @@ L_1063944:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106395c: 0x106395c: sll   zero, zero, 0
-// 0x01063960: 0x1063960: beq   a0, v0, 0x1063978 sll   zero, zero, 0
+// 0x0106396c: 0x106396c: sll   zero, zero, 0
+// 0x01063970: 0x1063970: beq   a0, v0, 0x1063988 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1063978
+	beq  L_1063988
 // --- basic block ---
-// 0x01063968: 0x1063968: bltz  a0, 0x1063978 sll   zero, zero, 0
+// 0x01063978: 0x1063978: bltz  a0, 0x1063988 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1063978
+	blt L_1063988
 // --- basic block ---
-// 0x01063970: 0x1063970: jal   0x100b164 sll   zero, zero, 0
+// 0x01063980: 0x1063980: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1063978:
-// 0x01063978: 0x1063978: lw    a0, 4(s0)
+L_1063988:
+// 0x01063988: 0x1063988: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1526,17 +1526,17 @@ L_1063978:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106397c: 0x106397c: addiu s1, s1, -56
+// 0x0106398c: 0x106398c: addiu s1, s1, -56
 	ldloc 8
 	ldc.i4.s -56
 	add
 	stloc 8
-// 0x01063980: 0x1063980: addiu a1, sp, 72
+// 0x01063990: 0x1063990: addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x01063984: 0x1063984: jal   0x1003adc addiu a2, sp, 76
+// 0x01063994: 0x1063994: jal   0x1003adc addiu a2, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
@@ -1549,13 +1549,13 @@ L_1063978:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106398c: 0x106398c: sb    zero, 55(s1)
+// 0x0106399c: 0x106399c: sb    zero, 55(s1)
 	ldloc 8
 	ldc.i4.s 55
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01063990: 0x1063990: lw    v0, 12(s0)
+// 0x010639a0: 0x10639a0: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1564,8 +1564,8 @@ L_1063978:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063994: 0x1063994: sll   zero, zero, 0
-// 0x01063998: 0x1063998: sw    v0, 24(s1)
+// 0x010639a4: 0x10639a4: sll   zero, zero, 0
+// 0x010639a8: 0x10639a8: sw    v0, 24(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1574,7 +1574,7 @@ L_1063978:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106399c: 0x106399c: lw    v1, 8(s0)
+// 0x010639ac: 0x10639ac: lw    v1, 8(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1583,7 +1583,7 @@ L_1063978:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010639a0: 0x10639a0: lw    v0, 4(s0)
+// 0x010639b0: 0x10639b0: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -1592,19 +1592,19 @@ L_1063978:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010639a4: 0x10639a4: sb    v1, 51(s1)
+// 0x010639b4: 0x10639b4: sb    v1, 51(s1)
 	ldloc 8
 	ldc.i4.s 51
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010639a8: 0x10639a8: sh    v0, 36(s1)
+// 0x010639b8: 0x10639b8: sh    v0, 36(s1)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010639ac: 0x10639ac: lw    v0, 72(sp)
+// 0x010639bc: 0x10639bc: lw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1613,26 +1613,26 @@ L_1063978:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010639b0: 0x10639b0: sll   zero, zero, 0
-// 0x010639b4: 0x10639b4: beq   s3, v0, 0x10639c0 addiu v0, zero, 2
+// 0x010639c0: 0x10639c0: sll   zero, zero, 0
+// 0x010639c4: 0x10639c4: beq   s3, v0, 0x10639d0 addiu v0, zero, 2
 	ldloc 13
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	beq  L_10639c0
+	beq  L_10639d0
 // --- basic block ---
-// 0x010639bc: 0x10639bc: addiu v0, zero, 1
+// 0x010639cc: 0x10639cc: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_10639c0:
-// 0x010639c0: 0x10639c0: sb    v0, 50(s1)
+L_10639d0:
+// 0x010639d0: 0x10639d0: sb    v0, 50(s1)
 	ldloc 8
 	ldc.i4.s 50
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10639c4:
-// 0x010639c4: 0x10639c4: lw    v0, 68(sp)
+L_10639d4:
+// 0x010639d4: 0x10639d4: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1641,7 +1641,7 @@ L_10639c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010639c8: 0x10639c8: lw    v1, 152(sp)
+// 0x010639d8: 0x10639d8: lw    v1, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1650,14 +1650,14 @@ L_10639c4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010639cc: 0x10639cc: sw    s2, 0(s7)
+// 0x010639dc: 0x10639dc: sw    s2, 0(s7)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010639d0: 0x10639d0: bltz  v0, 0x10639e8 sw    s1, 0(v1)
+// 0x010639e0: 0x10639e0: bltz  v0, 0x10639f8 sw    s1, 0(v1)
 	ldloc 5
 	ldloc 6
 	ldloc 7
@@ -1666,9 +1666,9 @@ L_10639c4:
 	ldloc 8
 	stelem.i4
 	ldc.i4.s 0
-	blt L_10639e8
+	blt L_10639f8
 // --- basic block ---
-// 0x010639d8: 0x10639d8: lw    a0, 172(sp)
+// 0x010639e8: 0x10639e8: lw    a0, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1677,26 +1677,26 @@ L_10639c4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010639dc: 0x10639dc: sll   zero, zero, 0
-// 0x010639e0: 0x10639e0: subu  v0, a0, v0
+// 0x010639ec: 0x10639ec: sll   zero, zero, 0
+// 0x010639f0: 0x10639f0: subu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc 5
-// 0x010639e4: 0x10639e4: addu  s2, v0, s2
+// 0x010639f4: 0x10639f4: addu  s2, v0, s2
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-L_10639e8:
-// 0x010639e8: 0x10639e8: sw    s2, 0(s5)
+L_10639f8:
+// 0x010639f8: 0x10639f8: sw    s2, 0(s5)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010639ec: 0x10639ec: lw    s0, 40(sp)
+// 0x010639fc: 0x10639fc: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1705,53 +1705,53 @@ L_10639e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010639f0: 0x10639f0: sll   zero, zero, 0
-// 0x010639f4: 0x10639f4: addiu s0, s0, 1
+// 0x01063a00: 0x1063a00: sll   zero, zero, 0
+// 0x01063a04: 0x1063a04: addiu s0, s0, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x010639f8: 0x10639f8: blez  s0, 0x1063a28 lui   a1, 0x10000
+// 0x01063a08: 0x1063a08: blez  s0, 0x1063a38 lui   a1, 0x10000
 	ldloc 11
 	ldc.i4 65536
 	stloc.2
 	ldc.i4.s 0
-	ble L_1063a28
+	ble L_1063a38
 // --- basic block ---
-// 0x01063a00: 0x1063a00: lw    v1, 0(s5)
+// 0x01063a10: 0x1063a10: lw    v1, 0(s5)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01063a04: 0x1063a04: lw    v0, 0(s7)
+// 0x01063a14: 0x1063a14: lw    v0, 0(s7)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01063a08: 0x1063a08: lui   a3, 0x10000
+// 0x01063a18: 0x1063a18: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063a0c: 0x1063a0c: addiu a1, a1, 13708
+// 0x01063a1c: 0x1063a1c: addiu a1, a1, 13704
 	ldloc.2
-	ldc.i4 13708
+	ldc.i4 13704
 	add
 	stloc.2
-// 0x01063a10: 0x1063a10: addiu a3, a3, 13872
+// 0x01063a20: 0x1063a20: addiu a3, a3, 13868
 	ldloc 4
-	ldc.i4 13872
+	ldc.i4 13868
 	add
 	stloc 4
-// 0x01063a14: 0x1063a14: addiu a0, zero, 2
+// 0x01063a24: 0x1063a24: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01063a18: 0x1063a18: addiu a2, zero, 714
+// 0x01063a28: 0x1063a28: addiu a2, zero, 714
 	ldc.i4 714
 	stloc.3
-// 0x01063a1c: 0x1063a1c: sw    v1, 16(sp)
+// 0x01063a2c: 0x1063a2c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1760,7 +1760,7 @@ L_10639e8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01063a20: 0x1063a20: jal   0x100449c sw    v0, 20(sp)
+// 0x01063a30: 0x1063a30: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1779,8 +1779,8 @@ L_10639e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1063a28:
-// 0x01063a28: 0x1063a28: lw    a0, 84(sp)
+L_1063a38:
+// 0x01063a38: 0x1063a38: lw    a0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1789,7 +1789,7 @@ L_1063a28:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063a2c: 0x1063a2c: jal   0x100b020 lui   s1, 0x70000
+// 0x01063a3c: 0x1063a3c: jal   0x100b030 lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 8
 	ldloc.0
@@ -1797,112 +1797,112 @@ L_1063a28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_screen_scale_100b020(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_screen_scale_100b030(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063a34: 0x1063a34: lw    a0, 12824(s1)
+// 0x01063a44: 0x1063a44: lw    a0, 13288(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3206
+	ldc.i4 3322
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063a38: 0x1063a38: sll   zero, zero, 0
-// 0x01063a3c: 0x1063a3c: beq   a0, zero, 0x1063a54 lui   v0, 0x70000
+// 0x01063a48: 0x1063a48: sll   zero, zero, 0
+// 0x01063a4c: 0x1063a4c: beq   a0, zero, 0x1063a64 lui   v0, 0x70000
 	ldloc.1
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1063a54
+	brfalse L_1063a64
 // --- basic block ---
-// 0x01063a44: 0x1063a44: jal   0x1015a90 sll   zero, zero, 0
+// 0x01063a54: 0x1063a54: jal   0x1015aa0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_free_1015a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_free_1015aa0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063a4c: 0x1063a4c: sw    zero, 12824(s1)
+// 0x01063a5c: 0x1063a5c: sw    zero, 13288(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3206
+	ldc.i4 3322
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063a50: 0x1063a50: lui   v0, 0x70000
+// 0x01063a60: 0x1063a60: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1063a54:
-// 0x01063a54: 0x1063a54: lw    s1, 12820(v0)
+L_1063a64:
+// 0x01063a64: 0x1063a64: lw    s1, 13284(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063a58: 0x1063a58: sll   zero, zero, 0
-// 0x01063a5c: 0x1063a5c: beq   s1, zero, 0x1063aa8 lui   v0, 0x70000
+// 0x01063a68: 0x1063a68: sll   zero, zero, 0
+// 0x01063a6c: 0x1063a6c: beq   s1, zero, 0x1063ab8 lui   v0, 0x70000
 	ldloc 8
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1063aa8
+	brfalse L_1063ab8
 // --- basic block ---
-// 0x01063a64: 0x1063a64: addiu s1, s1, -1
+// 0x01063a74: 0x1063a74: addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01063a68: 0x1063a68: addiu v1, zero, 4096
+// 0x01063a78: 0x1063a78: addiu v1, zero, 4096
 	ldc.i4 4096
 	stloc 7
-// 0x01063a6c: 0x1063a6c: div   s1, v1
+// 0x01063a7c: 0x1063a7c: div   s1, v1
 	ldloc 8
 	ldloc 7
 	div
 	stloc 17
-// 0x01063a70: 0x1063a70: lui   s2, 0x70000
+// 0x01063a80: 0x1063a80: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01063a74: 0x1063a74: addiu s2, s2, 12836
+// 0x01063a84: 0x1063a84: addiu s2, s2, 13300
 	ldloc 9
-	ldc.i4 12836
+	ldc.i4 13300
 	add
 	stloc 9
-// 0x01063a78: 0x1063a78: mflo  lo
+// 0x01063a88: 0x1063a88: mflo  lo
 	ldloc 17
 	stloc 8
-// 0x01063a7c: 0x1063a7c: sll   v0, s1, 2
+// 0x01063a8c: 0x1063a8c: sll   v0, s1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01063a80: 0x1063a80: j	 0x1063a98 addu  s2, s2, v0
+// 0x01063a90: 0x1063a90: j	 0x1063aa8 addu  s2, s2, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-	br L_1063a98
+	br L_1063aa8
 // --- basic block ---
-L_1063a88:
-// 0x01063a88: 0x1063a88: lw    a0, 0(s2)
+L_1063a98:
+// 0x01063a98: 0x1063a98: lw    a0, 0(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01063a8c: 0x1063a8c: jal   0x1000930 addiu s1, s1, -1
+// 0x01063a9c: 0x1063a9c: jal   0x1000930 addiu s1, s1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
@@ -1917,47 +1917,47 @@ L_1063a88:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063a94: 0x1063a94: addiu s2, s2, -4
+// 0x01063aa4: 0x1063aa4: addiu s2, s2, -4
 	ldloc 9
 	ldc.i4.s -4
 	add
 	stloc 9
-L_1063a98:
-// 0x01063a98: 0x1063a98: bgez  s1, 0x1063a88 lui   v0, 0x70000
+L_1063aa8:
+// 0x01063aa8: 0x1063aa8: bgez  s1, 0x1063a98 lui   v0, 0x70000
 	ldloc 8
 	ldc.i4 458752
 	stloc 5
 	ldc.i4.s 0
-	bge L_1063a88
+	bge L_1063a98
 // --- basic block ---
-// 0x01063aa0: 0x1063aa0: sw    zero, 12820(v0)
+// 0x01063ab0: 0x1063ab0: sw    zero, 13284(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3205
+	ldc.i4 3321
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063aa4: 0x1063aa4: lui   v0, 0x70000
+// 0x01063ab4: 0x1063ab4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1063aa8:
-// 0x01063aa8: 0x1063aa8: sw    zero, 12816(v0)
+L_1063ab8:
+// 0x01063ab8: 0x1063ab8: sw    zero, 13280(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3204
+	ldc.i4 3320
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1063aac:
-// 0x01063aac: 0x1063aac: lw    ra, 132(sp)
-// 0x01063ab0: 0x1063ab0: addu  v0, s0, zero
+L_1063abc:
+// 0x01063abc: 0x1063abc: lw    ra, 132(sp)
+// 0x01063ac0: 0x1063ac0: addu  v0, s0, zero
 	ldloc 11
 	stloc 5
-// 0x01063ab4: 0x1063ab4: lw    s8, 128(sp)
+// 0x01063ac4: 0x1063ac4: lw    s8, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1966,7 +1966,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01063ab8: 0x1063ab8: lw    s7, 124(sp)
+// 0x01063ac8: 0x1063ac8: lw    s7, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1975,7 +1975,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01063abc: 0x1063abc: lw    s6, 120(sp)
+// 0x01063acc: 0x1063acc: lw    s6, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1984,7 +1984,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01063ac0: 0x1063ac0: lw    s5, 116(sp)
+// 0x01063ad0: 0x1063ad0: lw    s5, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1993,7 +1993,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01063ac4: 0x1063ac4: lw    s4, 112(sp)
+// 0x01063ad4: 0x1063ad4: lw    s4, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2002,7 +2002,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01063ac8: 0x1063ac8: lw    s3, 108(sp)
+// 0x01063ad8: 0x1063ad8: lw    s3, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2011,7 +2011,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01063acc: 0x1063acc: lw    s2, 104(sp)
+// 0x01063adc: 0x1063adc: lw    s2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2020,7 +2020,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01063ad0: 0x1063ad0: lw    s1, 100(sp)
+// 0x01063ae0: 0x1063ae0: lw    s1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2029,7 +2029,7 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063ad4: 0x1063ad4: lw    s0, 96(sp)
+// 0x01063ae4: 0x1063ae4: lw    s0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2038,25 +2038,25 @@ L_1063aac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01063ad8: 0x1063ad8: jr    ra addiu sp, sp, 136
+// 0x01063ae8: 0x1063ae8: jr    ra addiu sp, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1063ae0:
-// 0x01063ae0: 0x1063ae0: j	 0x1063a28 addiu s0, zero, -1
+L_1063af0:
+// 0x01063af0: 0x1063af0: j	 0x1063a38 addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 11
-	br L_1063a28
+	br L_1063a38
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 verify_route_id_1063ae8(int32,int32,int32,int32,int32)
+.method public static int32 verify_route_id_1063af8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 t0,int32 ra)
@@ -2100,12 +2100,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01063ae8: 0x1063ae8: addiu sp, sp, -48
+// 0x01063af8: 0x1063af8: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01063aec: 0x1063aec: sw    s1, 40(sp)
+// 0x01063afc: 0x1063afc: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2114,7 +2114,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01063af0: 0x1063af0: sw    s0, 36(sp)
+// 0x01063b00: 0x1063b00: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2123,40 +2123,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01063af4: 0x1063af4: addu  s1, a1, zero
+// 0x01063b04: 0x1063b04: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01063af8: 0x1063af8: addu  s0, a0, zero
+// 0x01063b08: 0x1063b08: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01063afc: 0x1063afc: lui   a1, 0x0
+// 0x01063b0c: 0x1063b0c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01063b00: 0x1063b00: lw    a0, 0(a0)
+// 0x01063b10: 0x1063b10: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01063b04: 0x1063b04: addiu v0, zero, 1
+// 0x01063b14: 0x1063b14: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01063b08: 0x1063b08: addiu a1, a1, 28076
+// 0x01063b18: 0x1063b18: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01063b0c: 0x1063b0c: addu  a2, zero, zero
+// 0x01063b1c: 0x1063b1c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01063b10: 0x1063b10: addiu a3, sp, 24
+// 0x01063b20: 0x1063b20: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01063b14: 0x1063b14: sw    ra, 44(sp)
-// 0x01063b18: 0x1063b18: jal   0x106855c sw    v0, 16(sp)
+// 0x01063b24: 0x1063b24: sw    ra, 44(sp)
+// 0x01063b28: 0x1063b28: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2170,12 +2170,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063b20: 0x1063b20: bne   v0, zero, 0x1063b4c sw    v0, 0(s0)
+// 0x01063b30: 0x1063b30: bne   v0, zero, 0x1063b5c sw    v0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -2183,28 +2183,28 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldloc 5
 	stelem.i4
-	brtrue L_1063b4c
+	brtrue L_1063b5c
 // --- basic block ---
-// 0x01063b28: 0x1063b28: lui   a1, 0x10000
+// 0x01063b38: 0x1063b38: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01063b2c: 0x1063b2c: lui   a3, 0x10000
+// 0x01063b3c: 0x1063b3c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063b30: 0x1063b30: addiu a1, a1, 13908
+// 0x01063b40: 0x1063b40: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063b34: 0x1063b34: addiu a3, a3, 13952
+// 0x01063b44: 0x1063b44: addiu a3, a3, 13948
 	ldloc 4
-	ldc.i4 13952
+	ldc.i4 13948
 	add
 	stloc 4
-// 0x01063b38: 0x1063b38: addiu a0, zero, 4
+// 0x01063b48: 0x1063b48: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01063b3c: 0x1063b3c: jal   0x100449c addiu a2, zero, 510
+// 0x01063b4c: 0x1063b4c: jal   0x100449c addiu a2, zero, 510
 	ldc.i4 510
 	stloc.3
 	ldloc.0
@@ -2217,25 +2217,25 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063b44: 0x1063b44: j	 0x1063bbc addu  v0, zero, zero
+// 0x01063b54: 0x1063b54: j	 0x1063bcc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1063bbc
+	br L_1063bcc
 // --- basic block ---
-L_1063b4c:
-// 0x01063b4c: 0x1063b4c: lui   v0, 0x70000
+L_1063b5c:
+// 0x01063b5c: 0x1063b5c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063b50: 0x1063b50: lw    t0, 15808(v0)
+// 0x01063b60: 0x1063b60: lw    t0, 16272(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldelem.i4
 	stloc 10
-// 0x01063b54: 0x1063b54: lw    v1, 24(sp)
+// 0x01063b64: 0x1063b64: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2244,40 +2244,40 @@ L_1063b4c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063b58: 0x1063b58: sll   zero, zero, 0
-// 0x01063b5c: 0x1063b5c: beq   v1, t0, 0x1063bbc addiu v0, zero, 1
+// 0x01063b68: 0x1063b68: sll   zero, zero, 0
+// 0x01063b6c: 0x1063b6c: beq   v1, t0, 0x1063bcc addiu v0, zero, 1
 	ldloc 7
 	ldloc 10
 	ldc.i4.1
 	stloc 5
-	beq  L_1063bbc
+	beq  L_1063bcc
 // --- basic block ---
-// 0x01063b64: 0x1063b64: lui   a1, 0x10000
+// 0x01063b74: 0x1063b74: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01063b68: 0x1063b68: lui   a3, 0x10000
+// 0x01063b78: 0x1063b78: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063b6c: 0x1063b6c: addiu v0, zero, 2000
+// 0x01063b7c: 0x1063b7c: addiu v0, zero, 2000
 	ldc.i4 2000
 	stloc 5
-// 0x01063b70: 0x1063b70: addiu a1, a1, 13908
+// 0x01063b80: 0x1063b80: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063b74: 0x1063b74: addiu a3, a3, 14000
+// 0x01063b84: 0x1063b84: addiu a3, a3, 13996
 	ldloc 4
-	ldc.i4 14000
+	ldc.i4 13996
 	add
 	stloc 4
-// 0x01063b78: 0x1063b78: addiu a0, zero, 4
+// 0x01063b88: 0x1063b88: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01063b7c: 0x1063b7c: addiu a2, zero, 517
+// 0x01063b8c: 0x1063b8c: addiu a2, zero, 517
 	ldc.i4 517
 	stloc.3
-// 0x01063b80: 0x1063b80: sw    v0, 28(sp)
+// 0x01063b90: 0x1063b90: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2286,7 +2286,7 @@ L_1063b4c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063b84: 0x1063b84: sw    t0, 16(sp)
+// 0x01063b94: 0x1063b94: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2295,7 +2295,7 @@ L_1063b4c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01063b88: 0x1063b88: jal   0x100449c sw    v1, 20(sp)
+// 0x01063b98: 0x1063b98: jal   0x100449c sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2314,33 +2314,33 @@ L_1063b4c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063b90: 0x1063b90: lw    a0, 0(s0)
+// 0x01063ba0: 0x1063ba0: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01063b94: 0x1063b94: lui   a3, 0x10000
+// 0x01063ba4: 0x1063ba4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063b98: 0x1063b98: addiu v0, zero, -1
+// 0x01063ba8: 0x1063ba8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01063b9c: 0x1063b9c: addiu a3, a3, 5360
+// 0x01063bac: 0x1063bac: addiu a3, a3, 5356
 	ldloc 4
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc 4
-// 0x01063ba0: 0x1063ba0: addu  a1, zero, zero
+// 0x01063bb0: 0x1063bb0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01063ba4: 0x1063ba4: addiu a2, sp, 28
+// 0x01063bb4: 0x1063bb4: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x01063ba8: 0x1063ba8: jal   0x1068434 sw    v0, 16(sp)
+// 0x01063bb8: 0x1063bb8: jal   0x1068444 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2354,31 +2354,31 @@ L_1063b4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063bb0: 0x1063bb0: sw    v0, 0(s0)
+// 0x01063bc0: 0x1063bc0: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01063bb4: 0x1063bb4: sw    zero, 0(s1)
+// 0x01063bc4: 0x1063bc4: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063bb8: 0x1063bb8: addu  v0, zero, zero
+// 0x01063bc8: 0x1063bc8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1063bbc:
-// 0x01063bbc: 0x1063bbc: lw    ra, 44(sp)
-// 0x01063bc0: 0x1063bc0: lw    s1, 40(sp)
+L_1063bcc:
+// 0x01063bcc: 0x1063bcc: lw    ra, 44(sp)
+// 0x01063bd0: 0x1063bd0: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2387,7 +2387,7 @@ L_1063bbc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01063bc4: 0x1063bc4: lw    s0, 36(sp)
+// 0x01063bd4: 0x1063bd4: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2396,7 +2396,7 @@ L_1063bbc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063bc8: 0x1063bc8: jr    ra addiu sp, sp, 48
+// 0x01063bd8: 0x1063bd8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -2408,7 +2408,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_suggest_reroute_1063bd0(int32,int32,int32,int32,int32)
+.method public static int32 on_suggest_reroute_1063be0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s0,int32 s3,int32 s1,int32 ra)
@@ -2455,16 +2455,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1063bd0:
-// 0x01063bd0: 0x1063bd0: addiu sp, sp, -72
+L_1063be0:
+// 0x01063be0: 0x1063be0: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01063bd4: 0x1063bd4: addiu v0, zero, 18
+// 0x01063be4: 0x1063be4: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x01063bd8: 0x1063bd8: sw    a0, 72(sp)
+// 0x01063be8: 0x1063be8: sw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2473,22 +2473,22 @@ L_1063bd0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01063bdc: 0x1063bdc: sw    v0, 0(a3)
+// 0x01063bec: 0x1063bec: sw    v0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01063be0: 0x1063be0: addiu a0, sp, 72
+// 0x01063bf0: 0x1063bf0: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x01063be4: 0x1063be4: addu  a1, a3, zero
+// 0x01063bf4: 0x1063bf4: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01063be8: 0x1063be8: sw    s1, 56(sp)
+// 0x01063bf8: 0x1063bf8: sw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2497,8 +2497,8 @@ L_1063bd0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01063bec: 0x1063bec: sw    ra, 68(sp)
-// 0x01063bf0: 0x1063bf0: sw    s3, 64(sp)
+// 0x01063bfc: 0x1063bfc: sw    ra, 68(sp)
+// 0x01063c00: 0x1063c00: sw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2507,7 +2507,7 @@ L_1063bd0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01063bf4: 0x1063bf4: sw    s2, 60(sp)
+// 0x01063c04: 0x1063c04: sw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2516,7 +2516,7 @@ L_1063bd0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01063bf8: 0x1063bf8: sw    s0, 52(sp)
+// 0x01063c08: 0x1063c08: sw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2525,7 +2525,7 @@ L_1063bd0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01063bfc: 0x1063bfc: jal   0x1063ae8 addu  s1, a3, zero
+// 0x01063c0c: 0x1063c0c: jal   0x1063af8 addu  s1, a3, zero
 	ldloc 4
 	stloc 11
 	ldloc.0
@@ -2533,12 +2533,12 @@ L_1063bd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::verify_route_id_1063ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::verify_route_id_1063af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01063c04: 0x1063c04: lw    v1, 72(sp)
+// 0x01063c14: 0x1063c14: lw    v1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2547,35 +2547,35 @@ L_1063bd0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063c08: 0x1063c08: beq   v0, zero, 0x1063d68 addu  a0, v1, zero
+// 0x01063c18: 0x1063c18: beq   v0, zero, 0x1063d78 addu  a0, v1, zero
 	ldloc 6
 	ldloc 7
 	stloc.1
-	brfalse L_1063d68
+	brfalse L_1063d78
 // --- basic block ---
-// 0x01063c10: 0x1063c10: lui   s0, 0x10000
+// 0x01063c20: 0x1063c20: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01063c14: 0x1063c14: lui   a3, 0x10000
+// 0x01063c24: 0x1063c24: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063c18: 0x1063c18: addiu a3, a3, 14064
+// 0x01063c28: 0x1063c28: addiu a3, a3, 14060
 	ldloc 4
-	ldc.i4 14064
+	ldc.i4 14060
 	add
 	stloc 4
-// 0x01063c1c: 0x1063c1c: addiu a0, zero, 1
+// 0x01063c2c: 0x1063c2c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01063c20: 0x1063c20: addiu a1, s0, 13908
+// 0x01063c30: 0x1063c30: addiu a1, s0, 13904
 	ldloc 9
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063c24: 0x1063c24: addiu a2, zero, 1565
+// 0x01063c34: 0x1063c34: addiu a2, zero, 1565
 	ldc.i4 1565
 	stloc.3
-// 0x01063c28: 0x1063c28: sw    v1, 16(sp)
+// 0x01063c38: 0x1063c38: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2584,7 +2584,7 @@ L_1063bd0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01063c2c: 0x1063c2c: jal   0x100449c lui   s3, 0x0
+// 0x01063c3c: 0x1063c3c: jal   0x100449c lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -2597,7 +2597,7 @@ L_1063bd0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01063c34: 0x1063c34: lw    a0, 72(sp)
+// 0x01063c44: 0x1063c44: lw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2606,23 +2606,23 @@ L_1063bd0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063c38: 0x1063c38: addiu s2, zero, 1
+// 0x01063c48: 0x1063c48: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01063c3c: 0x1063c3c: addiu a1, s3, 28076
+// 0x01063c4c: 0x1063c4c: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01063c40: 0x1063c40: addu  a2, zero, zero
+// 0x01063c50: 0x1063c50: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01063c44: 0x1063c44: addiu a3, sp, 32
+// 0x01063c54: 0x1063c54: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01063c48: 0x1063c48: jal   0x106855c sw    s2, 16(sp)
+// 0x01063c58: 0x1063c58: jal   0x106856c sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2636,12 +2636,12 @@ L_1063bd0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01063c50: 0x1063c50: bne   v0, zero, 0x1063c70 sw    v0, 72(sp)
+// 0x01063c60: 0x1063c60: bne   v0, zero, 0x1063c80 sw    v0, 72(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -2651,47 +2651,47 @@ L_1063bd0:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1063c70
+	brtrue L_1063c80
 // --- basic block ---
-// 0x01063c58: 0x1063c58: lui   a3, 0x10000
+// 0x01063c68: 0x1063c68: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063c5c: 0x1063c5c: addiu a1, s0, 13908
+// 0x01063c6c: 0x1063c6c: addiu a1, s0, 13904
 	ldloc 9
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063c60: 0x1063c60: addiu a3, a3, 14084
+// 0x01063c70: 0x1063c70: addiu a3, a3, 14080
 	ldloc 4
-	ldc.i4 14084
+	ldc.i4 14080
 	add
 	stloc 4
-// 0x01063c64: 0x1063c64: addiu a0, zero, 4
+// 0x01063c74: 0x1063c74: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01063c68: 0x1063c68: j	 0x1063ca4 addiu a2, zero, 1575
+// 0x01063c78: 0x1063c78: j	 0x1063cb4 addiu a2, zero, 1575
 	ldc.i4 1575
 	stloc.3
-	br L_1063ca4
+	br L_1063cb4
 // --- basic block ---
-L_1063c70:
-// 0x01063c70: 0x1063c70: addu  a0, v0, zero
+L_1063c80:
+// 0x01063c80: 0x1063c80: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01063c74: 0x1063c74: addiu a1, s3, 28076
+// 0x01063c84: 0x1063c84: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01063c78: 0x1063c78: addu  a2, zero, zero
+// 0x01063c88: 0x1063c88: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01063c7c: 0x1063c7c: addiu a3, sp, 36
+// 0x01063c8c: 0x1063c8c: addiu a3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 4
-// 0x01063c80: 0x1063c80: jal   0x106855c sw    s2, 16(sp)
+// 0x01063c90: 0x1063c90: jal   0x106856c sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2705,12 +2705,12 @@ L_1063c70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01063c88: 0x1063c88: bne   v0, zero, 0x1063cb4 sw    v0, 72(sp)
+// 0x01063c98: 0x1063c98: bne   v0, zero, 0x1063cc4 sw    v0, 72(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -2720,29 +2720,29 @@ L_1063c70:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1063cb4
+	brtrue L_1063cc4
 // --- basic block ---
-// 0x01063c90: 0x1063c90: lui   a3, 0x10000
+// 0x01063ca0: 0x1063ca0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063c94: 0x1063c94: addiu a1, s0, 13908
+// 0x01063ca4: 0x1063ca4: addiu a1, s0, 13904
 	ldloc 9
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063c98: 0x1063c98: addiu a3, a3, 14140
+// 0x01063ca8: 0x1063ca8: addiu a3, a3, 14136
 	ldloc 4
-	ldc.i4 14140
+	ldc.i4 14136
 	add
 	stloc 4
-// 0x01063c9c: 0x1063c9c: addiu a0, zero, 4
+// 0x01063cac: 0x1063cac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01063ca0: 0x1063ca0: addiu a2, zero, 1587
+// 0x01063cb0: 0x1063cb0: addiu a2, zero, 1587
 	ldc.i4 1587
 	stloc.3
-L_1063ca4:
-// 0x01063ca4: 0x1063ca4: jal   0x100449c sll   zero, zero, 0
+L_1063cb4:
+// 0x01063cb4: 0x1063cb4: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2753,35 +2753,35 @@ L_1063ca4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01063cac: 0x1063cac: j	 0x1063d68 addu  a0, zero, zero
+// 0x01063cbc: 0x1063cbc: j	 0x1063d78 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_1063d68
+	br L_1063d78
 // --- basic block ---
-L_1063cb4:
-// 0x01063cb4: 0x1063cb4: lui   a1, 0x0
+L_1063cc4:
+// 0x01063cc4: 0x1063cc4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01063cb8: 0x1063cb8: addu  a0, v0, zero
+// 0x01063cc8: 0x1063cc8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01063cbc: 0x1063cbc: addiu a1, a1, 30268
+// 0x01063ccc: 0x1063ccc: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01063cc0: 0x1063cc0: addiu v0, zero, -1
+// 0x01063cd0: 0x1063cd0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01063cc4: 0x1063cc4: addu  a2, zero, zero
+// 0x01063cd4: 0x1063cd4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01063cc8: 0x1063cc8: addiu a3, sp, 40
+// 0x01063cd8: 0x1063cd8: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x01063ccc: 0x1063ccc: jal   0x106855c sw    v0, 16(sp)
+// 0x01063cdc: 0x1063cdc: jal   0x106856c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2795,12 +2795,12 @@ L_1063cb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01063cd4: 0x1063cd4: bne   v0, zero, 0x1063cf4 sw    v0, 72(sp)
+// 0x01063ce4: 0x1063ce4: bne   v0, zero, 0x1063d04 sw    v0, 72(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -2810,46 +2810,46 @@ L_1063cb4:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1063cf4
+	brtrue L_1063d04
 // --- basic block ---
-// 0x01063cdc: 0x1063cdc: lui   a3, 0x10000
+// 0x01063cec: 0x1063cec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063ce0: 0x1063ce0: addiu a1, s0, 13908
+// 0x01063cf0: 0x1063cf0: addiu a1, s0, 13904
 	ldloc 9
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063ce4: 0x1063ce4: addiu a3, a3, 14192
+// 0x01063cf4: 0x1063cf4: addiu a3, a3, 14188
 	ldloc 4
-	ldc.i4 14192
+	ldc.i4 14188
 	add
 	stloc 4
-// 0x01063ce8: 0x1063ce8: addiu a0, zero, 4
+// 0x01063cf8: 0x1063cf8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01063cec: 0x1063cec: j	 0x1063ca4 addiu a2, zero, 1599
+// 0x01063cfc: 0x1063cfc: j	 0x1063cb4 addiu a2, zero, 1599
 	ldc.i4 1599
 	stloc.3
-	br L_1063ca4
+	br L_1063cb4
 // --- basic block ---
-L_1063cf4:
-// 0x01063cf4: 0x1063cf4: lui   s2, 0x70000
+L_1063d04:
+// 0x01063d04: 0x1063d04: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01063cf8: 0x1063cf8: lw    v0, 15808(s2)
+// 0x01063d08: 0x1063d08: lw    v0, 16272(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldelem.i4
 	stloc 6
-// 0x01063cfc: 0x1063cfc: lui   a3, 0x10000
+// 0x01063d0c: 0x1063d0c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063d00: 0x1063d00: sw    v0, 16(sp)
+// 0x01063d10: 0x1063d10: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2858,7 +2858,7 @@ L_1063cf4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01063d04: 0x1063d04: lw    v0, 32(sp)
+// 0x01063d14: 0x1063d14: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2867,12 +2867,12 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01063d08: 0x1063d08: addiu a1, s0, 13908
+// 0x01063d18: 0x1063d18: addiu a1, s0, 13904
 	ldloc 9
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063d0c: 0x1063d0c: sw    v0, 20(sp)
+// 0x01063d1c: 0x1063d1c: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2881,7 +2881,7 @@ L_1063cf4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01063d10: 0x1063d10: lw    v0, 36(sp)
+// 0x01063d20: 0x1063d20: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2890,12 +2890,12 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01063d14: 0x1063d14: addiu a3, a3, 14244
+// 0x01063d24: 0x1063d24: addiu a3, a3, 14240
 	ldloc 4
-	ldc.i4 14244
+	ldc.i4 14240
 	add
 	stloc 4
-// 0x01063d18: 0x1063d18: sw    v0, 24(sp)
+// 0x01063d28: 0x1063d28: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2904,7 +2904,7 @@ L_1063cf4:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01063d1c: 0x1063d1c: lw    v0, 40(sp)
+// 0x01063d2c: 0x1063d2c: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2913,18 +2913,18 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01063d20: 0x1063d20: addiu a0, zero, 1
+// 0x01063d30: 0x1063d30: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01063d24: 0x1063d24: addiu a2, zero, 1603
+// 0x01063d34: 0x1063d34: addiu a2, zero, 1603
 	ldc.i4 1603
 	stloc.3
-// 0x01063d28: 0x1063d28: addiu s2, s2, 15808
+// 0x01063d38: 0x1063d38: addiu s2, s2, 16272
 	ldloc 8
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 8
-// 0x01063d2c: 0x1063d2c: jal   0x100449c sw    v0, 28(sp)
+// 0x01063d3c: 0x1063d3c: jal   0x100449c sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2943,7 +2943,7 @@ L_1063cf4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01063d34: 0x1063d34: lw    v0, 524(s2)
+// 0x01063d44: 0x1063d44: lw    v0, 524(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2952,8 +2952,8 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01063d38: 0x1063d38: sll   zero, zero, 0
-// 0x01063d3c: 0x1063d3c: lw    v0, 16(v0)
+// 0x01063d48: 0x1063d48: sll   zero, zero, 0
+// 0x01063d4c: 0x1063d4c: lw    v0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2962,12 +2962,12 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01063d40: 0x1063d40: sll   zero, zero, 0
-// 0x01063d44: 0x1063d44: beq   v0, zero, 0x1063d60 sll   zero, zero, 0
+// 0x01063d50: 0x1063d50: sll   zero, zero, 0
+// 0x01063d54: 0x1063d54: beq   v0, zero, 0x1063d70 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1063d60
+	brfalse L_1063d70
 // --- basic block ---
-// 0x01063d4c: 0x1063d4c: lw    a0, 32(sp)
+// 0x01063d5c: 0x1063d5c: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2976,7 +2976,7 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063d50: 0x1063d50: lw    a1, 36(sp)
+// 0x01063d60: 0x1063d60: lw    a1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2985,7 +2985,7 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01063d54: 0x1063d54: lw    a2, 40(sp)
+// 0x01063d64: 0x1063d64: lw    a2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2994,7 +2994,7 @@ L_1063cf4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01063d58: 0x1063d58: jalr  v0 sll   zero, zero, 0
+// 0x01063d68: 0x1063d68: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -3006,8 +3006,8 @@ L_1063cf4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_1063d60:
-// 0x01063d60: 0x1063d60: lw    a0, 72(sp)
+L_1063d70:
+// 0x01063d70: 0x1063d70: lw    a0, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3016,19 +3016,19 @@ L_1063d60:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063d64: 0x1063d64: sw    zero, 0(s1)
+// 0x01063d74: 0x1063d74: sw    zero, 0(s1)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1063d68:
-// 0x01063d68: 0x1063d68: lw    ra, 68(sp)
-// 0x01063d6c: 0x1063d6c: addu  v0, a0, zero
+L_1063d78:
+// 0x01063d78: 0x1063d78: lw    ra, 68(sp)
+// 0x01063d7c: 0x1063d7c: addu  v0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01063d70: 0x1063d70: lw    s3, 64(sp)
+// 0x01063d80: 0x1063d80: lw    s3, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3037,7 +3037,7 @@ L_1063d68:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01063d74: 0x1063d74: lw    s2, 60(sp)
+// 0x01063d84: 0x1063d84: lw    s2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3046,7 +3046,7 @@ L_1063d68:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063d78: 0x1063d78: lw    s1, 56(sp)
+// 0x01063d88: 0x1063d88: lw    s1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3055,7 +3055,7 @@ L_1063d68:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01063d7c: 0x1063d7c: lw    s0, 52(sp)
+// 0x01063d8c: 0x1063d8c: lw    s0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3064,7 +3064,7 @@ L_1063d68:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01063d80: 0x1063d80: jr    ra addiu sp, sp, 72
+// 0x01063d90: 0x1063d90: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -3076,7 +3076,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 verify_alt_id_1063d88(int32,int32,int32,int32,int32)
+.method public static int32 verify_alt_id_1063d98(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3117,12 +3117,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01063d88: 0x1063d88: addiu sp, sp, -48
+// 0x01063d98: 0x1063d98: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01063d8c: 0x1063d8c: sw    s1, 40(sp)
+// 0x01063d9c: 0x1063d9c: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3131,7 +3131,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01063d90: 0x1063d90: sw    s0, 36(sp)
+// 0x01063da0: 0x1063da0: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3140,40 +3140,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01063d94: 0x1063d94: addu  s1, a1, zero
+// 0x01063da4: 0x1063da4: addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-// 0x01063d98: 0x1063d98: addu  s0, a0, zero
+// 0x01063da8: 0x1063da8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01063d9c: 0x1063d9c: lui   a1, 0x0
+// 0x01063dac: 0x1063dac: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01063da0: 0x1063da0: lw    a0, 0(a0)
+// 0x01063db0: 0x1063db0: lw    a0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01063da4: 0x1063da4: addiu v0, zero, 1
+// 0x01063db4: 0x1063db4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01063da8: 0x1063da8: addiu a1, a1, 28076
+// 0x01063db8: 0x1063db8: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01063dac: 0x1063dac: addu  a2, zero, zero
+// 0x01063dbc: 0x1063dbc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01063db0: 0x1063db0: addiu a3, sp, 24
+// 0x01063dc0: 0x1063dc0: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01063db4: 0x1063db4: sw    ra, 44(sp)
-// 0x01063db8: 0x1063db8: jal   0x106855c sw    v0, 16(sp)
+// 0x01063dc4: 0x1063dc4: sw    ra, 44(sp)
+// 0x01063dc8: 0x1063dc8: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3187,12 +3187,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063dc0: 0x1063dc0: bne   v0, zero, 0x1063dec sw    v0, 0(s0)
+// 0x01063dd0: 0x1063dd0: bne   v0, zero, 0x1063dfc sw    v0, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldloc 8
@@ -3200,28 +3200,28 @@ __CIBYL_javamethod_begin:
 	shr.un
 	ldloc 5
 	stelem.i4
-	brtrue L_1063dec
+	brtrue L_1063dfc
 // --- basic block ---
-// 0x01063dc8: 0x1063dc8: lui   a1, 0x10000
+// 0x01063dd8: 0x1063dd8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01063dcc: 0x1063dcc: lui   a3, 0x10000
+// 0x01063ddc: 0x1063ddc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063dd0: 0x1063dd0: addiu a1, a1, 13908
+// 0x01063de0: 0x1063de0: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063dd4: 0x1063dd4: addiu a3, a3, 14312
+// 0x01063de4: 0x1063de4: addiu a3, a3, 14308
 	ldloc 4
-	ldc.i4 14312
+	ldc.i4 14308
 	add
 	stloc 4
-// 0x01063dd8: 0x1063dd8: addiu a0, zero, 4
+// 0x01063de8: 0x1063de8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01063ddc: 0x1063ddc: jal   0x100449c addiu a2, zero, 556
+// 0x01063dec: 0x1063dec: jal   0x100449c addiu a2, zero, 556
 	ldc.i4 556
 	stloc.3
 	ldloc.0
@@ -3234,33 +3234,33 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063de4: 0x1063de4: j	 0x1063ea0 addiu v0, zero, -1
+// 0x01063df4: 0x1063df4: j	 0x1063eb0 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-	br L_1063ea0
+	br L_1063eb0
 // --- basic block ---
-L_1063dec:
-// 0x01063dec: 0x1063dec: lui   v0, 0x70000
+L_1063dfc:
+// 0x01063dfc: 0x1063dfc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063df0: 0x1063df0: lui   a0, 0x70000
+// 0x01063e00: 0x1063e00: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01063df4: 0x1063df4: lw    a1, 15820(v0)
+// 0x01063e04: 0x1063e04: lw    a1, 16284(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3955
+	ldc.i4 4071
 	add
 	ldelem.i4
 	stloc.2
-// 0x01063df8: 0x1063df8: addiu a0, a0, 15860
+// 0x01063e08: 0x1063e08: addiu a0, a0, 16324
 	ldloc.1
-	ldc.i4 15860
+	ldc.i4 16324
 	add
 	stloc.1
-// 0x01063dfc: 0x1063dfc: lw    v1, 24(sp)
+// 0x01063e0c: 0x1063e0c: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3269,80 +3269,80 @@ L_1063dec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063e00: 0x1063e00: j	 0x1063e0c addu  v0, zero, zero
+// 0x01063e10: 0x1063e10: j	 0x1063e1c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1063e0c
+	br L_1063e1c
 // --- basic block ---
-L_1063e08:
-// 0x01063e08: 0x1063e08: addiu v0, v0, 1
+L_1063e18:
+// 0x01063e18: 0x1063e18: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_1063e0c:
-// 0x01063e0c: 0x1063e0c: slt   a2, v0, a1
+L_1063e1c:
+// 0x01063e1c: 0x1063e1c: slt   a2, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-// 0x01063e10: 0x1063e10: bne   a2, zero, 0x1063e28 sll   zero, zero, 0
+// 0x01063e20: 0x1063e20: bne   a2, zero, 0x1063e38 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_1063e28
+	brtrue L_1063e38
 // --- basic block ---
-// 0x01063e18: 0x1063e18: bne   v0, a1, 0x1063e60 lui   a1, 0x10000
+// 0x01063e28: 0x1063e28: bne   v0, a1, 0x1063e70 lui   a1, 0x10000
 	ldloc 5
 	ldloc.2
 	ldc.i4 65536
 	stloc.2
-	bne.un L_1063e60
+	bne.un L_1063e70
 // --- basic block ---
-// 0x01063e20: 0x1063e20: j	 0x1063e40 lui   a3, 0x10000
+// 0x01063e30: 0x1063e30: j	 0x1063e50 lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-	br L_1063e40
+	br L_1063e50
 // --- basic block ---
-L_1063e28:
-// 0x01063e28: 0x1063e28: lw    a2, 0(a0)
+L_1063e38:
+// 0x01063e38: 0x1063e38: lw    a2, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01063e2c: 0x1063e2c: sll   zero, zero, 0
-// 0x01063e30: 0x1063e30: bne   a2, v1, 0x1063e08 addiu a0, a0, 44
+// 0x01063e3c: 0x1063e3c: sll   zero, zero, 0
+// 0x01063e40: 0x1063e40: bne   a2, v1, 0x1063e18 addiu a0, a0, 44
 	ldloc.3
 	ldloc 7
 	ldloc.1
 	ldc.i4.s 44
 	add
 	stloc.1
-	bne.un L_1063e08
+	bne.un L_1063e18
 // --- basic block ---
-// 0x01063e38: 0x1063e38: j	 0x1063e64 addiu v1, zero, -1
+// 0x01063e48: 0x1063e48: j	 0x1063e74 addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-	br L_1063e64
+	br L_1063e74
 // --- basic block ---
-L_1063e40:
-// 0x01063e40: 0x1063e40: addiu a1, a1, 13908
+L_1063e50:
+// 0x01063e50: 0x1063e50: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01063e44: 0x1063e44: addiu a3, a3, 14356
+// 0x01063e54: 0x1063e54: addiu a3, a3, 14352
 	ldloc 4
-	ldc.i4 14356
+	ldc.i4 14352
 	add
 	stloc 4
-// 0x01063e48: 0x1063e48: addiu a0, zero, 4
+// 0x01063e58: 0x1063e58: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01063e4c: 0x1063e4c: addiu a2, zero, 537
+// 0x01063e5c: 0x1063e5c: addiu a2, zero, 537
 	ldc.i4 537
 	stloc.3
-// 0x01063e50: 0x1063e50: jal   0x100449c sw    v1, 16(sp)
+// 0x01063e60: 0x1063e60: jal   0x100449c sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3361,34 +3361,34 @@ L_1063e40:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063e58: 0x1063e58: j	 0x1063e6c sll   zero, zero, 0
-	br L_1063e6c
+// 0x01063e68: 0x1063e68: j	 0x1063e7c sll   zero, zero, 0
+	br L_1063e7c
 // --- basic block ---
-L_1063e60:
-// 0x01063e60: 0x1063e60: addiu v1, zero, -1
+L_1063e70:
+// 0x01063e70: 0x1063e70: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-L_1063e64:
-// 0x01063e64: 0x1063e64: bne   v0, v1, 0x1063ea0 sll   zero, zero, 0
+L_1063e74:
+// 0x01063e74: 0x1063e74: bne   v0, v1, 0x1063eb0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1063ea0
+	bne.un L_1063eb0
 // --- basic block ---
-L_1063e6c:
-// 0x01063e6c: 0x1063e6c: lw    a0, 0(s0)
+L_1063e7c:
+// 0x01063e7c: 0x1063e7c: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01063e70: 0x1063e70: addiu v0, zero, 2000
+// 0x01063e80: 0x1063e80: addiu v0, zero, 2000
 	ldc.i4 2000
 	stloc 5
-// 0x01063e74: 0x1063e74: lui   a3, 0x10000
+// 0x01063e84: 0x1063e84: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01063e78: 0x1063e78: sw    v0, 28(sp)
+// 0x01063e88: 0x1063e88: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3397,23 +3397,23 @@ L_1063e6c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063e7c: 0x1063e7c: addiu a3, a3, 5360
+// 0x01063e8c: 0x1063e8c: addiu a3, a3, 5356
 	ldloc 4
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc 4
-// 0x01063e80: 0x1063e80: addiu v0, zero, -1
+// 0x01063e90: 0x1063e90: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01063e84: 0x1063e84: addu  a1, zero, zero
+// 0x01063e94: 0x1063e94: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01063e88: 0x1063e88: addiu a2, sp, 28
+// 0x01063e98: 0x1063e98: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x01063e8c: 0x1063e8c: jal   0x1068434 sw    v0, 16(sp)
+// 0x01063e9c: 0x1063e9c: jal   0x1068444 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3427,31 +3427,31 @@ L_1063e6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063e94: 0x1063e94: sw    v0, 0(s0)
+// 0x01063ea4: 0x1063ea4: sw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01063e98: 0x1063e98: sw    zero, 0(s1)
+// 0x01063ea8: 0x1063ea8: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063e9c: 0x1063e9c: addiu v0, zero, -1
+// 0x01063eac: 0x1063eac: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-L_1063ea0:
-// 0x01063ea0: 0x1063ea0: lw    ra, 44(sp)
-// 0x01063ea4: 0x1063ea4: lw    s1, 40(sp)
+L_1063eb0:
+// 0x01063eb0: 0x1063eb0: lw    ra, 44(sp)
+// 0x01063eb4: 0x1063eb4: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3460,7 +3460,7 @@ L_1063ea0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01063ea8: 0x1063ea8: lw    s0, 36(sp)
+// 0x01063eb8: 0x1063eb8: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3469,7 +3469,7 @@ L_1063ea0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063eac: 0x1063eac: jr    ra addiu sp, sp, 48
+// 0x01063ebc: 0x1063ebc: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -3481,7 +3481,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 free_result_1063eb4(int32,int32,int32,int32,int32)
+.method public static int32 free_result_1063ec4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s1,int32 v0,int32[] mem,int32 s0,int32 lo,int32 ra,int32 v1)
@@ -3525,12 +3525,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01063eb4: 0x1063eb4: addiu sp, sp, -32
+// 0x01063ec4: 0x1063ec4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01063eb8: 0x1063eb8: sw    s1, 24(sp)
+// 0x01063ec8: 0x1063ec8: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3539,23 +3539,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063ebc: 0x1063ebc: addiu s1, zero, 44
+// 0x01063ecc: 0x1063ecc: addiu s1, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x01063ec0: 0x1063ec0: mult  a0, s1
+// 0x01063ed0: 0x1063ed0: mult  a0, s1
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 9
-// 0x01063ec4: 0x1063ec4: lui   s1, 0x70000
+// 0x01063ed4: 0x1063ed4: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063ec8: 0x1063ec8: addiu s1, s1, 15808
+// 0x01063ed8: 0x1063ed8: addiu s1, s1, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01063ecc: 0x1063ecc: sw    s0, 20(sp)
+// 0x01063edc: 0x1063edc: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3564,19 +3564,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01063ed0: 0x1063ed0: addu  s0, a0, zero
+// 0x01063ee0: 0x1063ee0: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01063ed4: 0x1063ed4: sw    ra, 28(sp)
-// 0x01063ed8: 0x1063ed8: mflo  lo
+// 0x01063ee4: 0x1063ee4: sw    ra, 28(sp)
+// 0x01063ee8: 0x1063ee8: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x01063edc: 0x1063edc: addu  s1, s1, v0
+// 0x01063eec: 0x1063eec: addu  s1, s1, v0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01063ee0: 0x1063ee0: lw    a0, 76(s1)
+// 0x01063ef0: 0x1063ef0: lw    a0, 76(s1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3585,12 +3585,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063ee4: 0x1063ee4: sll   zero, zero, 0
-// 0x01063ee8: 0x1063ee8: beq   a0, zero, 0x1063efc sll   zero, zero, 0
+// 0x01063ef4: 0x1063ef4: sll   zero, zero, 0
+// 0x01063ef8: 0x1063ef8: beq   a0, zero, 0x1063f0c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1063efc
+	brfalse L_1063f0c
 // --- basic block ---
-// 0x01063ef0: 0x1063ef0: jal   0x1000930 sll   zero, zero, 0
+// 0x01063f00: 0x1063f00: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3601,7 +3601,7 @@ __CIBYL_javamethod_begin:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01063ef8: 0x1063ef8: sw    zero, 76(s1)
+// 0x01063f08: 0x1063f08: sw    zero, 76(s1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3610,32 +3610,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1063efc:
-// 0x01063efc: 0x1063efc: addiu s1, zero, 44
+L_1063f0c:
+// 0x01063f0c: 0x1063f0c: addiu s1, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x01063f00: 0x1063f00: mult  s0, s1
+// 0x01063f10: 0x1063f10: mult  s0, s1
 	ldloc 8
 	ldloc 5
 	mul
 	stloc 9
-// 0x01063f04: 0x1063f04: lui   s1, 0x70000
+// 0x01063f14: 0x1063f14: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063f08: 0x1063f08: addiu s1, s1, 15808
+// 0x01063f18: 0x1063f18: addiu s1, s1, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01063f0c: 0x1063f0c: mflo  lo
+// 0x01063f1c: 0x1063f1c: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x01063f10: 0x1063f10: addu  s1, s1, v0
+// 0x01063f20: 0x1063f20: addu  s1, s1, v0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01063f14: 0x1063f14: lw    a0, 56(s1)
+// 0x01063f24: 0x1063f24: lw    a0, 56(s1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3644,14 +3644,14 @@ L_1063efc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063f18: 0x1063f18: sll   zero, zero, 0
-// 0x01063f1c: 0x1063f1c: beq   a0, zero, 0x1063f34 addiu v0, zero, 44
+// 0x01063f28: 0x1063f28: sll   zero, zero, 0
+// 0x01063f2c: 0x1063f2c: beq   a0, zero, 0x1063f44 addiu v0, zero, 44
 	ldloc.1
 	ldc.i4.s 44
 	stloc 6
-	brfalse L_1063f34
+	brfalse L_1063f44
 // --- basic block ---
-// 0x01063f24: 0x1063f24: jal   0x1000930 sll   zero, zero, 0
+// 0x01063f34: 0x1063f34: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3662,7 +3662,7 @@ L_1063efc:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01063f2c: 0x1063f2c: sw    zero, 56(s1)
+// 0x01063f3c: 0x1063f3c: sw    zero, 56(s1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3671,25 +3671,25 @@ L_1063efc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063f30: 0x1063f30: addiu v0, zero, 44
+// 0x01063f40: 0x1063f40: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 6
-L_1063f34:
-// 0x01063f34: 0x1063f34: mult  s0, v0
+L_1063f44:
+// 0x01063f44: 0x1063f44: mult  s0, v0
 	ldloc 8
 	ldloc 6
 	mul
 	stloc 9
-// 0x01063f38: 0x1063f38: lui   v0, 0x70000
+// 0x01063f48: 0x1063f48: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01063f3c: 0x1063f3c: addiu v0, v0, 15808
+// 0x01063f4c: 0x1063f4c: addiu v0, v0, 16272
 	ldloc 6
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 6
-// 0x01063f40: 0x1063f40: lw    ra, 28(sp)
-// 0x01063f44: 0x1063f44: lw    s1, 24(sp)
+// 0x01063f50: 0x1063f50: lw    ra, 28(sp)
+// 0x01063f54: 0x1063f54: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3698,15 +3698,15 @@ L_1063f34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063f48: 0x1063f48: mflo  lo
+// 0x01063f58: 0x1063f58: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x01063f4c: 0x1063f4c: addu  s0, v0, s0
+// 0x01063f5c: 0x1063f5c: addu  s0, v0, s0
 	ldloc 6
 	ldloc 8
 	add
 	stloc 8
-// 0x01063f50: 0x1063f50: sw    zero, 52(s0)
+// 0x01063f60: 0x1063f60: sw    zero, 52(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3715,7 +3715,7 @@ L_1063f34:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063f54: 0x1063f54: sw    zero, 72(s0)
+// 0x01063f64: 0x1063f64: sw    zero, 72(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -3724,7 +3724,7 @@ L_1063f34:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01063f58: 0x1063f58: lw    s0, 20(sp)
+// 0x01063f68: 0x1063f68: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3733,7 +3733,7 @@ L_1063f34:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01063f5c: 0x1063f5c: jr    ra addiu sp, sp, 32
+// 0x01063f6c: 0x1063f6c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3745,7 +3745,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_route_free_context_1063f64(int32,int32,int32,int32,int32)
+.method public static int32 navigate_route_free_context_1063f74(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -3786,12 +3786,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01063f64: 0x1063f64: addiu sp, sp, -32
+// 0x01063f74: 0x1063f74: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01063f68: 0x1063f68: sw    s0, 20(sp)
+// 0x01063f78: 0x1063f78: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3800,15 +3800,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01063f6c: 0x1063f6c: lui   s0, 0x70000
+// 0x01063f7c: 0x1063f7c: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063f70: 0x1063f70: addiu s0, s0, 15808
+// 0x01063f80: 0x1063f80: addiu s0, s0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01063f74: 0x1063f74: lw    a0, 504(s0)
+// 0x01063f84: 0x1063f84: lw    a0, 504(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3817,8 +3817,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01063f78: 0x1063f78: sw    ra, 28(sp)
-// 0x01063f7c: 0x1063f7c: beq   a0, zero, 0x1063f90 sw    s1, 24(sp)
+// 0x01063f88: 0x1063f88: sw    ra, 28(sp)
+// 0x01063f8c: 0x1063f8c: beq   a0, zero, 0x1063fa0 sw    s1, 24(sp)
 	ldloc.1
 	ldloc 6
 	ldloc.0
@@ -3828,9 +3828,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1063f90
+	brfalse L_1063fa0
 // --- basic block ---
-// 0x01063f84: 0x1063f84: jal   0x1000930 sll   zero, zero, 0
+// 0x01063f94: 0x1063f94: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3841,7 +3841,7 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01063f8c: 0x1063f8c: sw    zero, 504(s0)
+// 0x01063f9c: 0x1063f9c: sw    zero, 504(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3850,18 +3850,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1063f90:
-// 0x01063f90: 0x1063f90: addu  s0, zero, zero
+L_1063fa0:
+// 0x01063fa0: 0x1063fa0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01063f94: 0x1063f94: addiu s1, zero, 10
+// 0x01063fa4: 0x1063fa4: addiu s1, zero, 10
 	ldc.i4.s 10
 	stloc 7
-// 0x01063f98: 0x1063f98: addu  a0, s0, zero
+// 0x01063fa8: 0x1063fa8: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-L_1063f9c:
-// 0x01063f9c: 0x1063f9c: jal   0x1063eb4 addiu s0, s0, 1
+L_1063fac:
+// 0x01063fac: 0x1063fac: jal   0x1063ec4 addiu s0, s0, 1
 	ldloc 5
 	ldc.i4.1
 	add
@@ -3871,20 +3871,20 @@ L_1063f9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::free_result_1063eb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::free_result_1063ec4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x01063fa4: 0x1063fa4: bne   s0, s1, 0x1063f9c addu  a0, s0, zero
+// 0x01063fb4: 0x1063fb4: bne   s0, s1, 0x1063fac addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	ldloc 5
 	stloc.1
-	bne.un L_1063f9c
+	bne.un L_1063fac
 // --- basic block ---
-// 0x01063fac: 0x1063fac: lw    ra, 28(sp)
-// 0x01063fb0: 0x1063fb0: lw    s1, 24(sp)
+// 0x01063fbc: 0x1063fbc: lw    ra, 28(sp)
+// 0x01063fc0: 0x1063fc0: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3893,7 +3893,7 @@ L_1063f9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01063fb4: 0x1063fb4: lw    s0, 20(sp)
+// 0x01063fc4: 0x1063fc4: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3902,7 +3902,7 @@ L_1063f9c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063fb8: 0x1063fb8: jr    ra addiu sp, sp, 32
+// 0x01063fc8: 0x1063fc8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3914,7 +3914,7 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 navigate_route_init_context_1063fc0(int32,int32,int32,int32,int32)
+.method public static int32 navigate_route_init_context_1063fd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -3952,25 +3952,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01063fc0: 0x1063fc0: lui   v0, 0x70000
+// 0x01063fd0: 0x1063fd0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01063fc4: 0x1063fc4: lw    v0, 15796(v0)
+// 0x01063fd4: 0x1063fd4: lw    v0, 16260(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3949
+	ldc.i4 4065
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063fc8: 0x1063fc8: addiu sp, sp, -32
+// 0x01063fd8: 0x1063fd8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01063fcc: 0x1063fcc: sw    ra, 28(sp)
-// 0x01063fd0: 0x1063fd0: blez  v0, 0x1063fe0 sw    s0, 24(sp)
+// 0x01063fdc: 0x1063fdc: sw    ra, 28(sp)
+// 0x01063fe0: 0x1063fe0: blez  v0, 0x1063ff0 sw    s0, 24(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -3981,32 +3981,32 @@ __CIBYL_javamethod_begin:
 	ldloc 8
 	stelem.i4
 	ldc.i4.s 0
-	ble L_1063fe0
+	ble L_1063ff0
 // --- basic block ---
-// 0x01063fd8: 0x1063fd8: jal   0x1063f64 sll   zero, zero, 0
+// 0x01063fe8: 0x1063fe8: jal   0x1063f74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_free_context_1063f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_free_context_1063f74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1063fe0:
-// 0x01063fe0: 0x1063fe0: lui   s0, 0x70000
+L_1063ff0:
+// 0x01063ff0: 0x1063ff0: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01063fe4: 0x1063fe4: addiu a0, s0, 15808
+// 0x01063ff4: 0x1063ff4: addiu a0, s0, 16272
 	ldloc 8
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc.1
-// 0x01063fe8: 0x1063fe8: addu  a1, zero, zero
+// 0x01063ff8: 0x1063ff8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01063fec: 0x1063fec: jal   0x100177c addiu a2, zero, 528
+// 0x01063ffc: 0x1063ffc: jal   0x100177c addiu a2, zero, 528
 	ldc.i4 528
 	stloc.3
 	ldloc.1
@@ -4018,55 +4018,55 @@ L_1063fe0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01063ff4: 0x1063ff4: lui   v1, 0x70000
+// 0x01064004: 0x1064004: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01063ff8: 0x1063ff8: lw    v0, 15796(v1)
+// 0x01064008: 0x1064008: lw    v0, 16260(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3949
+	ldc.i4 4065
 	add
 	ldelem.i4
 	stloc 5
-// 0x01063ffc: 0x1063ffc: lui   a1, 0x10000
+// 0x0106400c: 0x106400c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064000: 0x1064000: lui   a3, 0x10000
+// 0x01064010: 0x1064010: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064004: 0x1064004: addiu v0, v0, 1
+// 0x01064014: 0x1064014: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01064008: 0x1064008: addiu a1, a1, 13908
+// 0x01064018: 0x1064018: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x0106400c: 0x106400c: addiu a3, a3, 14392
+// 0x0106401c: 0x106401c: addiu a3, a3, 14388
 	ldloc 4
-	ldc.i4 14392
+	ldc.i4 14388
 	add
 	stloc 4
-// 0x01064010: 0x1064010: addiu a0, zero, 1
+// 0x01064020: 0x1064020: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01064014: 0x1064014: addiu a2, zero, 146
+// 0x01064024: 0x1064024: addiu a2, zero, 146
 	ldc.i4 146
 	stloc.3
-// 0x01064018: 0x1064018: sw    v0, 15808(s0)
+// 0x01064028: 0x1064028: sw    v0, 16272(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106401c: 0x106401c: sw    v0, 16(sp)
+// 0x0106402c: 0x106402c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4075,12 +4075,12 @@ L_1063fe0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01064020: 0x1064020: jal   0x100449c sw    v0, 15796(v1)
+// 0x01064030: 0x1064030: jal   0x100449c sw    v0, 16260(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 3949
+	ldc.i4 4065
 	add
 	ldloc 5
 	stelem.i4
@@ -4094,8 +4094,8 @@ L_1063fe0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064028: 0x1064028: lw    ra, 28(sp)
-// 0x0106402c: 0x106402c: lw    s0, 24(sp)
+// 0x01064038: 0x1064038: lw    ra, 28(sp)
+// 0x0106403c: 0x106403c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4104,7 +4104,7 @@ L_1063fe0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01064030: 0x1064030: jr    ra addiu sp, sp, 32
+// 0x01064040: 0x1064040: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4116,7 +4116,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_route_cancel_request_1064038(int32,int32,int32,int32,int32)
+.method public static int32 navigate_route_cancel_request_1064048(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -4151,32 +4151,32 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01064038: 0x1064038: lui   a1, 0x10000
+// 0x01064048: 0x1064048: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106403c: 0x106403c: lui   a3, 0x10000
+// 0x0106404c: 0x106404c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064040: 0x1064040: addiu sp, sp, -24
+// 0x01064050: 0x1064050: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01064044: 0x1064044: addiu a1, a1, 13908
+// 0x01064054: 0x1064054: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064048: 0x1064048: addiu a3, a3, 14420
+// 0x01064058: 0x1064058: addiu a3, a3, 14416
 	ldloc 4
-	ldc.i4 14420
+	ldc.i4 14416
 	add
 	stloc 4
-// 0x0106404c: 0x106404c: addiu a0, zero, 1
+// 0x0106405c: 0x106405c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01064050: 0x1064050: sw    ra, 20(sp)
-// 0x01064054: 0x1064054: jal   0x100449c addiu a2, zero, 1542
+// 0x01064060: 0x1064060: sw    ra, 20(sp)
+// 0x01064064: 0x1064064: jal   0x100449c addiu a2, zero, 1542
 	ldc.i4 1542
 	stloc.3
 	ldloc.0
@@ -4189,20 +4189,20 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106405c: 0x106405c: jal   0x1063fc0 sll   zero, zero, 0
+// 0x0106406c: 0x106406c: jal   0x1063fd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_init_context_1063fc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_init_context_1063fd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01064064: 0x1064064: lw    ra, 20(sp)
-// 0x01064068: 0x1064068: sll   zero, zero, 0
-// 0x0106406c: 0x106406c: jr    ra addiu sp, sp, 24
+// 0x01064074: 0x1064074: lw    ra, 20(sp)
+// 0x01064078: 0x1064078: sll   zero, zero, 0
+// 0x0106407c: 0x106407c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4214,7 +4214,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 navigate_route_select_1064074(int32,int32,int32,int32,int32)
+.method public static int32 navigate_route_select_1064084(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 s2,int32 v1,int32 s0,int32 s3,int32 ra,int32 lo)
@@ -4264,27 +4264,27 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01064074: 0x1064074: lui   v0, 0x70000
+// 0x01064084: 0x1064084: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064078: 0x1064078: addiu sp, sp, -48
+// 0x01064088: 0x1064088: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0106407c: 0x106407c: lw    v1, 15820(v0)
+// 0x0106408c: 0x106408c: lw    v1, 16284(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3955
+	ldc.i4 4071
 	add
 	ldelem.i4
 	stloc 9
-// 0x01064080: 0x1064080: lui   v0, 0x70000
+// 0x01064090: 0x1064090: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064084: 0x1064084: sw    s1, 32(sp)
+// 0x01064094: 0x1064094: sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4293,7 +4293,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01064088: 0x1064088: sw    s0, 28(sp)
+// 0x01064098: 0x1064098: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4302,8 +4302,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0106408c: 0x106408c: sw    ra, 44(sp)
-// 0x01064090: 0x1064090: sw    s3, 40(sp)
+// 0x0106409c: 0x106409c: sw    ra, 44(sp)
+// 0x010640a0: 0x10640a0: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4312,7 +4312,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01064094: 0x1064094: sw    s2, 36(sp)
+// 0x010640a4: 0x10640a4: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4321,91 +4321,91 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01064098: 0x1064098: addu  s0, a0, zero
+// 0x010640a8: 0x10640a8: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0106409c: 0x106409c: addiu v0, v0, 15860
+// 0x010640ac: 0x10640ac: addiu v0, v0, 16324
 	ldloc 5
-	ldc.i4 15860
+	ldc.i4 16324
 	add
 	stloc 5
-// 0x010640a0: 0x10640a0: j	 0x10640ac addu  s1, zero, zero
+// 0x010640b0: 0x10640b0: j	 0x10640bc addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_10640ac
+	br L_10640bc
 // --- basic block ---
-L_10640a8:
-// 0x010640a8: 0x10640a8: addiu s1, s1, 1
+L_10640b8:
+// 0x010640b8: 0x10640b8: addiu s1, s1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-L_10640ac:
-// 0x010640ac: 0x10640ac: slt   a0, s1, v1
+L_10640bc:
+// 0x010640bc: 0x10640bc: slt   a0, s1, v1
 	ldloc 6
 	ldloc 9
 	clt
 	stloc.1
-// 0x010640b0: 0x10640b0: bne   a0, zero, 0x10640c8 sll   zero, zero, 0
+// 0x010640c0: 0x10640c0: bne   a0, zero, 0x10640d8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10640c8
+	brtrue L_10640d8
 // --- basic block ---
-// 0x010640b8: 0x10640b8: bne   s1, v1, 0x1064104 addu  s2, zero, zero
+// 0x010640c8: 0x10640c8: bne   s1, v1, 0x1064114 addu  s2, zero, zero
 	ldloc 6
 	ldloc 9
 	ldc.i4.s 0
 	stloc 8
-	bne.un L_1064104
+	bne.un L_1064114
 // --- basic block ---
-// 0x010640c0: 0x10640c0: j	 0x10640e0 lui   a1, 0x10000
+// 0x010640d0: 0x10640d0: j	 0x10640f0 lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-	br L_10640e0
+	br L_10640f0
 // --- basic block ---
-L_10640c8:
-// 0x010640c8: 0x10640c8: lw    a0, 0(v0)
+L_10640d8:
+// 0x010640d8: 0x10640d8: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010640cc: 0x10640cc: sll   zero, zero, 0
-// 0x010640d0: 0x10640d0: bne   a0, s0, 0x10640a8 addiu v0, v0, 44
+// 0x010640dc: 0x10640dc: sll   zero, zero, 0
+// 0x010640e0: 0x10640e0: bne   a0, s0, 0x10640b8 addiu v0, v0, 44
 	ldloc.1
 	ldloc 10
 	ldloc 5
 	ldc.i4.s 44
 	add
 	stloc 5
-	bne.un L_10640a8
+	bne.un L_10640b8
 // --- basic block ---
-// 0x010640d8: 0x10640d8: j	 0x1064104 addu  s2, zero, zero
+// 0x010640e8: 0x10640e8: j	 0x1064114 addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 8
-	br L_1064104
+	br L_1064114
 // --- basic block ---
-L_10640e0:
-// 0x010640e0: 0x10640e0: lui   a3, 0x10000
+L_10640f0:
+// 0x010640f0: 0x10640f0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010640e4: 0x10640e4: addiu a1, a1, 13908
+// 0x010640f4: 0x10640f4: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010640e8: 0x10640e8: addiu a3, a3, 14356
+// 0x010640f8: 0x10640f8: addiu a3, a3, 14352
 	ldloc 4
-	ldc.i4 14356
+	ldc.i4 14352
 	add
 	stloc 4
-// 0x010640ec: 0x10640ec: addiu a0, zero, 4
+// 0x010640fc: 0x10640fc: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010640f0: 0x10640f0: addiu a2, zero, 537
+// 0x01064100: 0x1064100: addiu a2, zero, 537
 	ldc.i4 537
 	stloc.3
-// 0x010640f4: 0x10640f4: jal   0x100449c sw    s0, 16(sp)
+// 0x01064104: 0x1064104: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4424,43 +4424,43 @@ L_10640e0:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x010640fc: 0x10640fc: j	 0x1064110 lui   a1, 0x10000
+// 0x0106410c: 0x106410c: j	 0x1064120 lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-	br L_1064110
+	br L_1064120
 // --- basic block ---
-L_1064104:
-// 0x01064104: 0x1064104: bgez  s1, 0x1064134 addiu s3, zero, 10
+L_1064114:
+// 0x01064114: 0x1064114: bgez  s1, 0x1064144 addiu s3, zero, 10
 	ldloc 6
 	ldc.i4.s 10
 	stloc 11
 	ldc.i4.s 0
-	bge L_1064134
+	bge L_1064144
 // --- basic block ---
-// 0x0106410c: 0x106410c: lui   a1, 0x10000
+// 0x0106411c: 0x106411c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-L_1064110:
-// 0x01064110: 0x1064110: lui   a3, 0x10000
+L_1064120:
+// 0x01064120: 0x1064120: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064114: 0x1064114: addiu a1, a1, 13908
+// 0x01064124: 0x1064124: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064118: 0x1064118: addiu a3, a3, 14496
+// 0x01064128: 0x1064128: addiu a3, a3, 14492
 	ldloc 4
-	ldc.i4 14496
+	ldc.i4 14492
 	add
 	stloc 4
-// 0x0106411c: 0x106411c: addiu a0, zero, 4
+// 0x0106412c: 0x106412c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064120: 0x1064120: addiu a2, zero, 1519
+// 0x01064130: 0x1064130: addiu a2, zero, 1519
 	ldc.i4 1519
 	stloc.3
-// 0x01064124: 0x1064124: jal   0x100449c sw    s0, 16(sp)
+// 0x01064134: 0x1064134: jal   0x100449c sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4479,75 +4479,75 @@ L_1064110:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0106412c: 0x106412c: j	 0x106419c sll   zero, zero, 0
-	br L_106419c
+// 0x0106413c: 0x106413c: j	 0x10641ac sll   zero, zero, 0
+	br L_10641ac
 // --- basic block ---
-L_1064134:
-// 0x01064134: 0x1064134: beq   s2, s1, 0x1064144 addu  a0, s2, zero
+L_1064144:
+// 0x01064144: 0x1064144: beq   s2, s1, 0x1064154 addu  a0, s2, zero
 	ldloc 8
 	ldloc 6
 	ldloc 8
 	stloc.1
-	beq  L_1064144
+	beq  L_1064154
 // --- basic block ---
-// 0x0106413c: 0x106413c: jal   0x1063eb4 sll   zero, zero, 0
+// 0x0106414c: 0x106414c: jal   0x1063ec4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::free_result_1063eb4(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::free_result_1063ec4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1064144:
-// 0x01064144: 0x1064144: addiu s2, s2, 1
+L_1064154:
+// 0x01064154: 0x1064154: addiu s2, s2, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01064148: 0x1064148: bne   s2, s3, 0x1064134 sll   zero, zero, 0
+// 0x01064158: 0x1064158: bne   s2, s3, 0x1064144 sll   zero, zero, 0
 	ldloc 8
 	ldloc 11
-	bne.un L_1064134
+	bne.un L_1064144
 // --- basic block ---
-// 0x01064150: 0x1064150: beq   s1, zero, 0x106418c addiu v0, zero, 44
+// 0x01064160: 0x1064160: beq   s1, zero, 0x106419c addiu v0, zero, 44
 	ldloc 6
 	ldc.i4.s 44
 	stloc 5
-	brfalse L_106418c
+	brfalse L_106419c
 // --- basic block ---
-// 0x01064158: 0x1064158: mult  s1, v0
+// 0x01064168: 0x1064168: mult  s1, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 13
-// 0x0106415c: 0x106415c: lui   v0, 0x70000
+// 0x0106416c: 0x106416c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064160: 0x1064160: addiu v0, v0, 15808
+// 0x01064170: 0x1064170: addiu v0, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01064164: 0x1064164: addiu a0, v0, 36
+// 0x01064174: 0x1064174: addiu a0, v0, 36
 	ldloc 5
 	ldc.i4.s 36
 	add
 	stloc.1
-// 0x01064168: 0x1064168: addiu a2, zero, 44
+// 0x01064178: 0x1064178: addiu a2, zero, 44
 	ldc.i4.s 44
 	stloc.3
-// 0x0106416c: 0x106416c: mflo  lo
+// 0x0106417c: 0x106417c: mflo  lo
 	ldloc 13
 	stloc 6
-// 0x01064170: 0x1064170: addu  s1, s1, v0
+// 0x01064180: 0x1064180: addu  s1, s1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 6
-// 0x01064174: 0x1064174: jal   0x1001800 addiu a1, s1, 36
+// 0x01064184: 0x1064184: jal   0x1001800 addiu a1, s1, 36
 	ldloc 6
 	ldc.i4.s 36
 	add
@@ -4561,7 +4561,7 @@ L_1064144:
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0106417c: 0x106417c: sw    zero, 52(s1)
+// 0x0106418c: 0x106418c: sw    zero, 52(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4570,7 +4570,7 @@ L_1064144:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01064180: 0x1064180: sw    zero, 76(s1)
+// 0x01064190: 0x1064190: sw    zero, 76(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4579,7 +4579,7 @@ L_1064144:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01064184: 0x1064184: sw    zero, 56(s1)
+// 0x01064194: 0x1064194: sw    zero, 56(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4588,7 +4588,7 @@ L_1064144:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01064188: 0x1064188: sw    zero, 72(s1)
+// 0x01064198: 0x1064198: sw    zero, 72(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4597,20 +4597,20 @@ L_1064144:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_106418c:
-// 0x0106418c: 0x106418c: lui   v0, 0x70000
+L_106419c:
+// 0x0106419c: 0x106419c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064190: 0x1064190: lw    a0, 15808(v0)
+// 0x010641a0: 0x10641a0: lw    a0, 16272(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064194: 0x1064194: jal   0x106b618 addu  a1, s0, zero
+// 0x010641a4: 0x10641a4: jal   0x106bc3c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4618,14 +4618,14 @@ L_106418c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_SelectRoute_106b618(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_SelectRoute_106bc3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_106419c:
-// 0x0106419c: 0x106419c: lw    ra, 44(sp)
-// 0x010641a0: 0x10641a0: lw    s3, 40(sp)
+L_10641ac:
+// 0x010641ac: 0x10641ac: lw    ra, 44(sp)
+// 0x010641b0: 0x10641b0: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4634,7 +4634,7 @@ L_106419c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010641a4: 0x10641a4: lw    s2, 36(sp)
+// 0x010641b4: 0x10641b4: lw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4643,7 +4643,7 @@ L_106419c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010641a8: 0x10641a8: lw    s1, 32(sp)
+// 0x010641b8: 0x10641b8: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4652,7 +4652,7 @@ L_106419c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010641ac: 0x10641ac: lw    s0, 28(sp)
+// 0x010641bc: 0x10641bc: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4661,7 +4661,7 @@ L_106419c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010641b0: 0x10641b0: jr    ra addiu sp, sp, 48
+// 0x010641c0: 0x10641c0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4673,7 +4673,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 routing_error_10641b8(int32,int32,int32,int32,int32)
+.method public static int32 routing_error_10641c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -4708,24 +4708,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010641b8: 0x10641b8: addu  a1, a0, zero
+// 0x010641c8: 0x10641c8: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x010641bc: 0x10641bc: lui   a0, 0x0
+// 0x010641cc: 0x10641cc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010641c0: 0x10641c0: addiu sp, sp, -24
+// 0x010641d0: 0x10641d0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010641c4: 0x10641c4: addiu a0, a0, 30092
+// 0x010641d4: 0x10641d4: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x010641c8: 0x10641c8: sw    ra, 20(sp)
-// 0x010641cc: 0x10641cc: jal   0x104bfe4 addiu a2, zero, 5
+// 0x010641d8: 0x10641d8: sw    ra, 20(sp)
+// 0x010641dc: 0x10641dc: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -4733,20 +4733,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010641d4: 0x10641d4: lui   v1, 0x70000
+// 0x010641e4: 0x10641e4: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010641d8: 0x10641d8: addiu v1, v1, 15808
+// 0x010641e8: 0x10641e8: addiu v1, v1, 16272
 	ldloc 6
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 6
-// 0x010641dc: 0x10641dc: lw    a0, 524(v1)
+// 0x010641ec: 0x10641ec: lw    a0, 524(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4755,8 +4755,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010641e0: 0x10641e0: sll   zero, zero, 0
-// 0x010641e4: 0x10641e4: lw    v0, 4(a0)
+// 0x010641f0: 0x10641f0: sll   zero, zero, 0
+// 0x010641f4: 0x10641f4: lw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4765,12 +4765,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010641e8: 0x10641e8: sll   zero, zero, 0
-// 0x010641ec: 0x10641ec: bne   v0, zero, 0x1064204 sll   zero, zero, 0
+// 0x010641f8: 0x10641f8: sll   zero, zero, 0
+// 0x010641fc: 0x10641fc: bne   v0, zero, 0x1064214 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1064204
+	brtrue L_1064214
 // --- basic block ---
-// 0x010641f4: 0x10641f4: lw    v0, 8(a0)
+// 0x01064204: 0x1064204: lw    v0, 8(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -4779,13 +4779,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010641f8: 0x10641f8: sll   zero, zero, 0
-// 0x010641fc: 0x10641fc: beq   v0, zero, 0x1064214 sll   zero, zero, 0
+// 0x01064208: 0x1064208: sll   zero, zero, 0
+// 0x0106420c: 0x106420c: beq   v0, zero, 0x1064224 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1064214
+	brfalse L_1064224
 // --- basic block ---
-L_1064204:
-// 0x01064204: 0x1064204: lw    a0, 32(v1)
+L_1064214:
+// 0x01064214: 0x1064214: lw    a0, 32(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -4794,10 +4794,10 @@ L_1064204:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064208: 0x1064208: addu  a1, zero, zero
+// 0x01064218: 0x1064218: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0106420c: 0x106420c: jalr  v0 addu  a2, zero, zero
+// 0x0106421c: 0x106421c: jalr  v0 addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
@@ -4811,10 +4811,10 @@ L_1064204:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1064214:
-// 0x01064214: 0x1064214: lw    ra, 20(sp)
-// 0x01064218: 0x1064218: sll   zero, zero, 0
-// 0x0106421c: 0x106421c: jr    ra addiu sp, sp, 24
+L_1064224:
+// 0x01064224: 0x1064224: lw    ra, 20(sp)
+// 0x01064228: 0x1064228: sll   zero, zero, 0
+// 0x0106422c: 0x106422c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4826,7 +4826,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 navigate_route_request_1064224(int32,int32,int32,int32,int32)
+.method public static int32 navigate_route_request_1064234(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s7,int32 s0,int32 s8,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra,int32 t0,int32 t1,int32 t2,int32 t3)
@@ -4900,12 +4900,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01064224: 0x1064224: addiu sp, sp, -312
+// 0x01064234: 0x1064234: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x01064228: 0x1064228: sw    s5, 292(sp)
+// 0x01064238: 0x1064238: sw    s5, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4914,7 +4914,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0106422c: 0x106422c: lw    s5, 356(sp)
+// 0x0106423c: 0x106423c: lw    s5, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4923,7 +4923,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01064230: 0x1064230: sw    s6, 296(sp)
+// 0x01064240: 0x1064240: sw    s6, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4932,12 +4932,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01064234: 0x1064234: andi  s6, s5, 2
+// 0x01064244: 0x1064244: andi  s6, s5, 2
 	ldloc 15
 	ldc.i4.2
 	and
 	stloc 16
-// 0x01064238: 0x1064238: sw    s7, 300(sp)
+// 0x01064248: 0x1064248: sw    s7, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4946,7 +4946,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0106423c: 0x106423c: sw    s4, 288(sp)
+// 0x0106424c: 0x106424c: sw    s4, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4955,7 +4955,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01064240: 0x1064240: sw    s3, 284(sp)
+// 0x01064250: 0x1064250: sw    s3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4964,7 +4964,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01064244: 0x1064244: sw    s2, 280(sp)
+// 0x01064254: 0x1064254: sw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4973,7 +4973,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01064248: 0x1064248: sw    s1, 276(sp)
+// 0x01064258: 0x1064258: sw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4982,7 +4982,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106424c: 0x106424c: sw    s0, 272(sp)
+// 0x0106425c: 0x106425c: sw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4991,8 +4991,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01064250: 0x1064250: sw    ra, 308(sp)
-// 0x01064254: 0x1064254: sw    s8, 304(sp)
+// 0x01064260: 0x1064260: sw    ra, 308(sp)
+// 0x01064264: 0x1064264: sw    s8, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5001,16 +5001,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01064258: 0x1064258: addu  s1, a0, zero
+// 0x01064268: 0x1064268: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0106425c: 0x106425c: addu  s7, a1, zero
+// 0x0106426c: 0x106426c: addu  s7, a1, zero
 	ldloc.2
 	stloc 10
-// 0x01064260: 0x1064260: addu  s2, a2, zero
+// 0x01064270: 0x1064270: addu  s2, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01064264: 0x1064264: lw    s3, 328(sp)
+// 0x01064274: 0x1064274: lw    s3, 328(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5019,7 +5019,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01064268: 0x1064268: lw    s0, 332(sp)
+// 0x01064278: 0x1064278: lw    s0, 332(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5028,26 +5028,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0106426c: 0x106426c: beq   s6, zero, 0x10642b0 addu  s4, a3, zero
+// 0x0106427c: 0x106427c: beq   s6, zero, 0x10642c0 addu  s4, a3, zero
 	ldloc 16
 	ldloc 4
 	stloc 14
-	brfalse L_10642b0
+	brfalse L_10642c0
 // --- basic block ---
-// 0x01064274: 0x1064274: lui   v0, 0x70000
+// 0x01064284: 0x1064284: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064278: 0x1064278: lw    v0, 15808(v0)
+// 0x01064288: 0x1064288: lw    v0, 16272(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106427c: 0x106427c: sll   zero, zero, 0
-// 0x01064280: 0x1064280: blez  v0, 0x1064290 sw    v0, 264(sp)
+// 0x0106428c: 0x106428c: sll   zero, zero, 0
+// 0x01064290: 0x1064290: blez  v0, 0x10642a0 sw    v0, 264(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5058,32 +5058,32 @@ __CIBYL_javamethod_begin:
 	ldloc 5
 	stelem.i4
 	ldc.i4.s 0
-	ble L_1064290
+	ble L_10642a0
 // --- basic block ---
-// 0x01064288: 0x1064288: jal   0x1063f64 sll   zero, zero, 0
+// 0x01064298: 0x1064298: jal   0x1063f74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_free_context_1063f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_free_context_1063f74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1064290:
-// 0x01064290: 0x1064290: lui   s8, 0x70000
+L_10642a0:
+// 0x010642a0: 0x10642a0: lui   s8, 0x70000
 	ldc.i4 458752
 	stloc 12
-// 0x01064294: 0x1064294: addiu a0, s8, 15808
+// 0x010642a4: 0x10642a4: addiu a0, s8, 16272
 	ldloc 12
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc.1
-// 0x01064298: 0x1064298: addu  a1, zero, zero
+// 0x010642a8: 0x10642a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0106429c: 0x106429c: jal   0x100177c addiu a2, zero, 528
+// 0x010642ac: 0x10642ac: jal   0x100177c addiu a2, zero, 528
 	ldc.i4 528
 	stloc.3
 	ldloc.1
@@ -5095,7 +5095,7 @@ L_1064290:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010642a4: 0x10642a4: lw    v0, 264(sp)
+// 0x010642b4: 0x10642b4: lw    v0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5104,38 +5104,38 @@ L_1064290:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010642a8: 0x10642a8: j	 0x10642d4 sw    v0, 15808(s8)
+// 0x010642b8: 0x10642b8: j	 0x10642e4 sw    v0, 16272(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldloc 5
 	stelem.i4
-	br L_10642d4
+	br L_10642e4
 // --- basic block ---
-L_10642b0:
-// 0x010642b0: 0x10642b0: lui   a1, 0x10000
+L_10642c0:
+// 0x010642c0: 0x10642c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010642b4: 0x10642b4: lui   a3, 0x10000
+// 0x010642c4: 0x10642c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010642b8: 0x10642b8: addiu a1, a1, 13908
+// 0x010642c8: 0x10642c8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010642bc: 0x10642bc: addiu a3, a3, 14540
+// 0x010642cc: 0x10642cc: addiu a3, a3, 14536
 	ldloc 4
-	ldc.i4 14540
+	ldc.i4 14536
 	add
 	stloc 4
-// 0x010642c0: 0x10642c0: addiu a0, zero, 1
+// 0x010642d0: 0x10642d0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010642c4: 0x10642c4: jal   0x100449c addiu a2, zero, 1356
+// 0x010642d4: 0x10642d4: jal   0x100449c addiu a2, zero, 1356
 	ldc.i4 1356
 	stloc.3
 	ldloc.0
@@ -5148,34 +5148,34 @@ L_10642b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010642cc: 0x10642cc: jal   0x1063fc0 sll   zero, zero, 0
+// 0x010642dc: 0x10642dc: jal   0x1063fd0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::navigate_route_init_context_1063fc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::navigate_route_init_context_1063fd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10642d4:
-// 0x010642d4: 0x10642d4: lw    v1, 0(s4)
+L_10642e4:
+// 0x010642e4: 0x10642e4: lw    v1, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010642d8: 0x10642d8: lui   v0, 0x70000
+// 0x010642e8: 0x10642e8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010642dc: 0x10642dc: addiu v0, v0, 15808
+// 0x010642ec: 0x10642ec: addiu v0, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x010642e0: 0x10642e0: sw    v1, 508(v0)
+// 0x010642f0: 0x10642f0: sw    v1, 508(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5184,7 +5184,7 @@ L_10642d4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010642e4: 0x10642e4: lw    v1, 4(s4)
+// 0x010642f4: 0x10642f4: lw    v1, 4(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -5193,7 +5193,7 @@ L_10642d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010642e8: 0x10642e8: lw    a0, 368(sp)
+// 0x010642f8: 0x10642f8: lw    a0, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5202,7 +5202,7 @@ L_10642d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010642ec: 0x10642ec: sw    v1, 512(v0)
+// 0x010642fc: 0x10642fc: sw    v1, 512(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5211,14 +5211,14 @@ L_10642d4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010642f0: 0x10642f0: lw    v1, 0(s3)
+// 0x01064300: 0x1064300: lw    v1, 0(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010642f4: 0x10642f4: sw    a0, 524(v0)
+// 0x01064304: 0x1064304: sw    a0, 524(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5227,7 +5227,7 @@ L_10642d4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010642f8: 0x10642f8: sw    v1, 516(v0)
+// 0x01064308: 0x1064308: sw    v1, 516(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5236,7 +5236,7 @@ L_10642d4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010642fc: 0x10642fc: lw    v1, 4(s3)
+// 0x0106430c: 0x106430c: lw    v1, 4(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -5245,7 +5245,7 @@ L_10642d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064300: 0x1064300: beq   s1, zero, 0x1064394 sw    v1, 520(v0)
+// 0x01064310: 0x1064310: beq   s1, zero, 0x10643a4 sw    v1, 520(v0)
 	ldloc 9
 	ldloc 6
 	ldloc 5
@@ -5255,9 +5255,9 @@ L_10642d4:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1064394
+	brfalse L_10643a4
 // --- basic block ---
-// 0x01064308: 0x1064308: lw    v1, 4(s1)
+// 0x01064318: 0x1064318: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5266,17 +5266,17 @@ L_10642d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106430c: 0x106430c: addiu v0, zero, -1
+// 0x0106431c: 0x106431c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01064310: 0x1064310: beq   v1, v0, 0x1064394 lui   v0, 0x0
+// 0x01064320: 0x1064320: beq   v1, v0, 0x10643a4 lui   v0, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1064394
+	beq  L_10643a4
 // --- basic block ---
-// 0x01064318: 0x1064318: lw    v0, 576(v0)
+// 0x01064328: 0x1064328: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5285,7 +5285,7 @@ L_10642d4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106431c: 0x106431c: lw    a0, 12(s1)
+// 0x0106432c: 0x106432c: lw    a0, 12(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5294,30 +5294,30 @@ L_10642d4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064320: 0x1064320: sll   zero, zero, 0
-// 0x01064324: 0x1064324: beq   a0, v0, 0x106433c sll   zero, zero, 0
+// 0x01064330: 0x1064330: sll   zero, zero, 0
+// 0x01064334: 0x1064334: beq   a0, v0, 0x106434c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_106433c
+	beq  L_106434c
 // --- basic block ---
-// 0x0106432c: 0x106432c: bltz  a0, 0x106433c sll   zero, zero, 0
+// 0x0106433c: 0x106433c: bltz  a0, 0x106434c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_106433c
+	blt L_106434c
 // --- basic block ---
-// 0x01064334: 0x1064334: jal   0x100b164 sll   zero, zero, 0
+// 0x01064344: 0x1064344: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106433c:
-// 0x0106433c: 0x106433c: lw    a0, 4(s1)
+L_106434c:
+// 0x0106434c: 0x106434c: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5326,12 +5326,12 @@ L_106433c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064340: 0x1064340: addiu a1, sp, 112
+// 0x01064350: 0x1064350: addiu a1, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
 	stloc.2
-// 0x01064344: 0x1064344: jal   0x1003adc addiu a2, sp, 116
+// 0x01064354: 0x1064354: jal   0x1003adc addiu a2, sp, 116
 	ldloc.0
 	ldc.i4.s 116
 	add
@@ -5344,7 +5344,7 @@ L_106433c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106434c: 0x106434c: lw    v1, 116(sp)
+// 0x0106435c: 0x106435c: lw    v1, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5353,12 +5353,12 @@ L_106433c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064350: 0x1064350: addiu v0, sp, 120
+// 0x01064360: 0x1064360: addiu v0, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
 	stloc 5
-// 0x01064354: 0x1064354: lw    a0, 4(s1)
+// 0x01064364: 0x1064364: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5367,26 +5367,26 @@ L_106433c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064358: 0x1064358: addiu a2, sp, 124
+// 0x01064368: 0x1064368: addiu a2, sp, 124
 	ldloc.0
 	ldc.i4.s 124
 	add
 	stloc.3
-// 0x0106435c: 0x106435c: beq   v1, s7, 0x106436c addu  a1, v0, zero
+// 0x0106436c: 0x106436c: beq   v1, s7, 0x106437c addu  a1, v0, zero
 	ldloc 7
 	ldloc 10
 	ldloc 5
 	stloc.2
-	beq  L_106436c
+	beq  L_106437c
 // --- basic block ---
-// 0x01064364: 0x1064364: addu  a1, a2, zero
+// 0x01064374: 0x1064374: addu  a1, a2, zero
 	ldloc.3
 	stloc.2
-// 0x01064368: 0x1064368: addu  a2, v0, zero
+// 0x01064378: 0x1064378: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_106436c:
-// 0x0106436c: 0x106436c: jal   0x1003fc8 sll   zero, zero, 0
+L_106437c:
+// 0x0106437c: 0x106437c: jal   0x1003fc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5397,7 +5397,7 @@ L_106436c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064374: 0x1064374: lw    a0, 4(s1)
+// 0x01064384: 0x1064384: lw    a0, 4(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5406,12 +5406,12 @@ L_106436c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064378: 0x1064378: addiu s1, sp, 136
+// 0x01064388: 0x1064388: addiu s1, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
 	stloc 9
-// 0x0106437c: 0x106437c: jal   0x1011a4c addu  a1, s1, zero
+// 0x0106438c: 0x106438c: jal   0x1011a5c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.0
@@ -5419,12 +5419,12 @@ L_106436c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064384: 0x1064384: jal   0x10111fc addu  a0, s1, zero
+// 0x01064394: 0x1064394: jal   0x101120c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5432,24 +5432,24 @@ L_106436c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_fename_10111fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_fename_101120c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106438c: 0x106438c: j	 0x10643a8 addu  s1, v0, zero
+// 0x0106439c: 0x106439c: j	 0x10643b8 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
-	br L_10643a8
+	br L_10643b8
 // --- basic block ---
-L_1064394:
-// 0x01064394: 0x1064394: addiu v0, zero, -1
+L_10643a4:
+// 0x010643a4: 0x10643a4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01064398: 0x1064398: lui   s1, 0x10000
+// 0x010643a8: 0x10643a8: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x0106439c: 0x106439c: sw    v0, 124(sp)
+// 0x010643ac: 0x10643ac: sw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5458,7 +5458,7 @@ L_1064394:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010643a0: 0x10643a0: sw    v0, 120(sp)
+// 0x010643b0: 0x10643b0: sw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5467,13 +5467,13 @@ L_1064394:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010643a4: 0x10643a4: addiu s1, s1, 18500
+// 0x010643b4: 0x10643b4: addiu s1, s1, 18768
 	ldloc 9
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 9
-L_10643a8:
-// 0x010643a8: 0x10643a8: lw    v0, 120(sp)
+L_10643b8:
+// 0x010643b8: 0x10643b8: lw    v0, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5482,13 +5482,13 @@ L_10643a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010643ac: 0x10643ac: lui   a1, 0x10000
+// 0x010643bc: 0x10643bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010643b0: 0x10643b0: lui   a3, 0x10000
+// 0x010643c0: 0x10643c0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010643b4: 0x10643b4: sw    v0, 16(sp)
+// 0x010643c4: 0x10643c4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5497,7 +5497,7 @@ L_10643a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010643b8: 0x10643b8: lw    v0, 124(sp)
+// 0x010643c8: 0x10643c8: lw    v0, 124(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5506,23 +5506,23 @@ L_10643a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010643bc: 0x10643bc: addiu a1, a1, 13908
+// 0x010643cc: 0x10643cc: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010643c0: 0x10643c0: addiu a3, a3, 14608
+// 0x010643d0: 0x10643d0: addiu a3, a3, 14604
 	ldloc 4
-	ldc.i4 14608
+	ldc.i4 14604
 	add
 	stloc 4
-// 0x010643c4: 0x10643c4: addiu a0, zero, 1
+// 0x010643d4: 0x10643d4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010643c8: 0x10643c8: addiu a2, zero, 1383
+// 0x010643d8: 0x10643d8: addiu a2, zero, 1383
 	ldc.i4 1383
 	stloc.3
-// 0x010643cc: 0x10643cc: sw    v0, 20(sp)
+// 0x010643dc: 0x10643dc: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5531,7 +5531,7 @@ L_10643a8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010643d0: 0x10643d0: jal   0x100449c sw    s1, 24(sp)
+// 0x010643e0: 0x10643e0: jal   0x100449c sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5550,30 +5550,30 @@ L_10643a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010643d8: 0x10643d8: beq   s2, zero, 0x1064448 addiu v0, zero, -1
+// 0x010643e8: 0x10643e8: beq   s2, zero, 0x1064458 addiu v0, zero, -1
 	ldloc 8
 	ldc.i4.m1
 	stloc 5
-	brfalse L_1064448
+	brfalse L_1064458
 // --- basic block ---
-// 0x010643e0: 0x10643e0: lw    v0, 0(s2)
+// 0x010643f0: 0x10643f0: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010643e4: 0x10643e4: sll   zero, zero, 0
-// 0x010643e8: 0x10643e8: bne   v0, zero, 0x1064448 addiu v0, zero, -1
+// 0x010643f4: 0x10643f4: sll   zero, zero, 0
+// 0x010643f8: 0x10643f8: bne   v0, zero, 0x1064458 addiu v0, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1064448
+	brtrue L_1064458
 // --- basic block ---
-// 0x010643f0: 0x10643f0: lui   v0, 0x0
+// 0x01064400: 0x1064400: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x010643f4: 0x10643f4: lw    v0, 576(v0)
+// 0x01064404: 0x1064404: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5582,7 +5582,7 @@ L_10643a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010643f8: 0x10643f8: lw    a0, 12(s2)
+// 0x01064408: 0x1064408: lw    a0, 12(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5591,30 +5591,30 @@ L_10643a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010643fc: 0x10643fc: sll   zero, zero, 0
-// 0x01064400: 0x1064400: beq   a0, v0, 0x1064418 sll   zero, zero, 0
+// 0x0106440c: 0x106440c: sll   zero, zero, 0
+// 0x01064410: 0x1064410: beq   a0, v0, 0x1064428 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1064418
+	beq  L_1064428
 // --- basic block ---
-// 0x01064408: 0x1064408: bltz  a0, 0x1064418 sll   zero, zero, 0
+// 0x01064418: 0x1064418: bltz  a0, 0x1064428 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1064418
+	blt L_1064428
 // --- basic block ---
-// 0x01064410: 0x1064410: jal   0x100b164 sll   zero, zero, 0
+// 0x01064420: 0x1064420: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1064418:
-// 0x01064418: 0x1064418: lw    a0, 4(s2)
+L_1064428:
+// 0x01064428: 0x1064428: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5623,12 +5623,12 @@ L_1064418:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106441c: 0x106441c: addiu a2, sp, 132
+// 0x0106442c: 0x106442c: addiu a2, sp, 132
 	ldloc.0
 	ldc.i4 132
 	add
 	stloc.3
-// 0x01064420: 0x1064420: jal   0x1003fc8 addiu a1, sp, 128
+// 0x01064430: 0x1064430: jal   0x1003fc8 addiu a1, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
@@ -5643,12 +5643,12 @@ L_1064418:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064428: 0x1064428: addiu s0, sp, 136
+// 0x01064438: 0x1064438: addiu s0, sp, 136
 	ldloc.0
 	ldc.i4 136
 	add
 	stloc 11
-// 0x0106442c: 0x106442c: lw    a0, 4(s2)
+// 0x0106443c: 0x106443c: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5657,7 +5657,7 @@ L_1064418:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064430: 0x1064430: jal   0x1011a4c addu  a1, s0, zero
+// 0x01064440: 0x1064440: jal   0x1011a5c addu  a1, s0, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -5665,12 +5665,12 @@ L_1064418:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064438: 0x1064438: jal   0x10111fc addu  a0, s0, zero
+// 0x01064448: 0x1064448: jal   0x101120c addu  a0, s0, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -5678,18 +5678,18 @@ L_1064418:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_fename_10111fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_fename_101120c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064440: 0x1064440: j	 0x106445c addu  s0, v0, zero
+// 0x01064450: 0x1064450: j	 0x106446c addu  s0, v0, zero
 	ldloc 5
 	stloc 11
-	br L_106445c
+	br L_106446c
 // --- basic block ---
-L_1064448:
-// 0x01064448: 0x1064448: sw    v0, 132(sp)
+L_1064458:
+// 0x01064458: 0x1064458: sw    v0, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5698,7 +5698,7 @@ L_1064448:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106444c: 0x106444c: bne   s0, zero, 0x106445c sw    v0, 128(sp)
+// 0x0106445c: 0x106445c: bne   s0, zero, 0x106446c sw    v0, 128(sp)
 	ldloc 11
 	ldloc 6
 	ldloc.0
@@ -5708,18 +5708,18 @@ L_1064448:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_106445c
+	brtrue L_106446c
 // --- basic block ---
-// 0x01064454: 0x1064454: lui   s0, 0x10000
+// 0x01064464: 0x1064464: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01064458: 0x1064458: addiu s0, s0, 18500
+// 0x01064468: 0x1064468: addiu s0, s0, 18768
 	ldloc 11
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 11
-L_106445c:
-// 0x0106445c: 0x106445c: lw    v0, 128(sp)
+L_106446c:
+// 0x0106446c: 0x106446c: lw    v0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5728,10 +5728,10 @@ L_106445c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064460: 0x1064460: lui   a1, 0x10000
+// 0x01064470: 0x1064470: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064464: 0x1064464: sw    v0, 16(sp)
+// 0x01064474: 0x1064474: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5740,10 +5740,10 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01064468: 0x1064468: lui   a3, 0x10000
+// 0x01064478: 0x1064478: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106446c: 0x106446c: lw    v0, 132(sp)
+// 0x0106447c: 0x106447c: lw    v0, 132(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5752,26 +5752,26 @@ L_106445c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064470: 0x1064470: addiu a1, a1, 13908
+// 0x01064480: 0x1064480: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064474: 0x1064474: addiu a3, a3, 14628
+// 0x01064484: 0x1064484: addiu a3, a3, 14624
 	ldloc 4
-	ldc.i4 14628
+	ldc.i4 14624
 	add
 	stloc 4
-// 0x01064478: 0x1064478: addiu a0, zero, 1
+// 0x01064488: 0x1064488: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106447c: 0x106447c: addiu a2, zero, 1405
+// 0x0106448c: 0x106448c: addiu a2, zero, 1405
 	ldc.i4 1405
 	stloc.3
-// 0x01064480: 0x1064480: addiu s2, zero, 1
+// 0x01064490: 0x1064490: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01064484: 0x1064484: sw    v0, 20(sp)
+// 0x01064494: 0x1064494: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5780,7 +5780,7 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01064488: 0x1064488: jal   0x100449c sw    s0, 24(sp)
+// 0x01064498: 0x1064498: jal   0x100449c sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5799,7 +5799,7 @@ L_106445c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064490: 0x1064490: jal   0x10614e0 sw    s2, 160(sp)
+// 0x010644a0: 0x10644a0: jal   0x10614f0 sw    s2, 160(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5813,17 +5813,17 @@ L_106445c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_primaries_10614e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_primaries_10614f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064498: 0x1064498: sltu  v0, zero, v0
+// 0x010644a8: 0x10644a8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0106449c: 0x106449c: sw    v0, 212(sp)
+// 0x010644ac: 0x10644ac: sw    v0, 212(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5832,10 +5832,10 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010644a0: 0x10644a0: addiu v0, zero, 2
+// 0x010644b0: 0x10644b0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010644a4: 0x10644a4: jal   0x1061434 sw    v0, 164(sp)
+// 0x010644b4: 0x10644b4: jal   0x1061444 sw    v0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5849,17 +5849,17 @@ L_106445c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_trails_1061434(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_trails_1061444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010644ac: 0x10644ac: sltiu v0, v0, 1
+// 0x010644bc: 0x10644bc: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010644b0: 0x10644b0: sw    v0, 216(sp)
+// 0x010644c0: 0x10644c0: sw    v0, 216(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5868,10 +5868,10 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010644b4: 0x10644b4: addiu v0, zero, 3
+// 0x010644c4: 0x10644c4: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x010644b8: 0x10644b8: jal   0x1061434 sw    v0, 168(sp)
+// 0x010644c8: 0x10644c8: jal   0x1061444 sw    v0, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5885,22 +5885,22 @@ L_106445c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_trails_1061434(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_trails_1061444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010644c0: 0x10644c0: xori  v0, v0, 2
+// 0x010644d0: 0x10644d0: xori  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	xor
 	stloc 5
-// 0x010644c4: 0x10644c4: sltiu v0, v0, 1
+// 0x010644d4: 0x10644d4: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010644c8: 0x10644c8: sw    v0, 220(sp)
+// 0x010644d8: 0x10644d8: sw    v0, 220(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5909,10 +5909,10 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010644cc: 0x10644cc: addiu v0, zero, 4
+// 0x010644dc: 0x10644dc: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x010644d0: 0x10644d0: jal   0x106150c sw    v0, 172(sp)
+// 0x010644e0: 0x10644e0: jal   0x106151c sw    v0, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5926,17 +5926,17 @@ L_106445c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_prefer_same_street_106150c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_prefer_same_street_106151c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010644d8: 0x10644d8: sltu  v0, zero, v0
+// 0x010644e8: 0x10644e8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x010644dc: 0x10644dc: sw    v0, 224(sp)
+// 0x010644ec: 0x10644ec: sw    v0, 224(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5945,10 +5945,10 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010644e0: 0x10644e0: addiu v0, zero, 5
+// 0x010644f0: 0x10644f0: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x010644e4: 0x10644e4: jal   0x106131c sw    v0, 176(sp)
+// 0x010644f4: 0x10644f4: jal   0x106132c sw    v0, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5957,15 +5957,15 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl72::navigate_cost_use_traffic_106131c()
+	call int32 Cibyl72::navigate_cost_use_traffic_106132c()
 	stloc 5
 // --- basic block ---
-// 0x010644ec: 0x10644ec: sltiu v0, v0, 1
+// 0x010644fc: 0x10644fc: sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-// 0x010644f0: 0x10644f0: sw    v0, 228(sp)
+// 0x01064500: 0x1064500: sw    v0, 228(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5974,10 +5974,10 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010644f4: 0x10644f4: addiu v0, zero, 6
+// 0x01064504: 0x1064504: addiu v0, zero, 6
 	ldc.i4.6
 	stloc 5
-// 0x010644f8: 0x10644f8: jal   0x10613dc sw    v0, 180(sp)
+// 0x01064508: 0x1064508: jal   0x10613ec sw    v0, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5991,22 +5991,22 @@ L_106445c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_allow_unknowns_10613dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_allow_unknowns_10613ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064500: 0x1064500: sltu  v0, zero, v0
+// 0x01064510: 0x1064510: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01064504: 0x1064504: andi  v1, s5, 8
+// 0x01064514: 0x1064514: andi  v1, s5, 8
 	ldloc 15
 	ldc.i4.8
 	and
 	stloc 7
-// 0x01064508: 0x1064508: sw    v0, 232(sp)
+// 0x01064518: 0x1064518: sw    v0, 232(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6015,16 +6015,16 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106450c: 0x106450c: beq   v1, zero, 0x1064524 addiu s7, zero, 6
+// 0x0106451c: 0x106451c: beq   v1, zero, 0x1064534 addiu s7, zero, 6
 	ldloc 7
 	ldc.i4.6
 	stloc 10
-	brfalse L_1064524
+	brfalse L_1064534
 // --- basic block ---
-// 0x01064514: 0x1064514: addiu v0, zero, 7
+// 0x01064524: 0x1064524: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x01064518: 0x1064518: sw    v0, 184(sp)
+// 0x01064528: 0x1064528: sw    v0, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6033,7 +6033,7 @@ L_106445c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106451c: 0x106451c: sw    s2, 236(sp)
+// 0x0106452c: 0x106452c: sw    s2, 236(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6042,42 +6042,42 @@ L_106445c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01064520: 0x1064520: addiu s7, zero, 7
+// 0x01064530: 0x1064530: addiu s7, zero, 7
 	ldc.i4.7
 	stloc 10
-L_1064524:
-// 0x01064524: 0x1064524: andi  v0, s5, 16
+L_1064534:
+// 0x01064534: 0x1064534: andi  v0, s5, 16
 	ldloc 15
 	ldc.i4.s 16
 	and
 	stloc 5
-// 0x01064528: 0x1064528: beq   v0, zero, 0x1064550 addiu s2, sp, 112
+// 0x01064538: 0x1064538: beq   v0, zero, 0x1064560 addiu s2, sp, 112
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 112
 	add
 	stloc 8
-	brfalse L_1064550
+	brfalse L_1064560
 // --- basic block ---
-// 0x01064530: 0x1064530: sll   v0, s7, 2
+// 0x01064540: 0x1064540: sll   v0, s7, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01064534: 0x1064534: addiu v1, sp, 112
+// 0x01064544: 0x1064544: addiu v1, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
 	stloc 7
-// 0x01064538: 0x1064538: addu  v0, v1, v0
+// 0x01064548: 0x1064548: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0106453c: 0x106453c: addiu v1, zero, 1
+// 0x0106454c: 0x106454c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01064540: 0x1064540: sw    v1, 100(v0)
+// 0x01064550: 0x1064550: sw    v1, 100(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6086,10 +6086,10 @@ L_1064524:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064544: 0x1064544: addiu v1, zero, 8
+// 0x01064554: 0x1064554: addiu v1, zero, 8
 	ldc.i4.8
 	stloc 7
-// 0x01064548: 0x1064548: sw    v1, 48(v0)
+// 0x01064558: 0x1064558: sw    v1, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6098,26 +6098,26 @@ L_1064524:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106454c: 0x106454c: addiu s7, s7, 1
+// 0x0106455c: 0x106455c: addiu s7, s7, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_1064550:
-// 0x01064550: 0x1064550: sll   v1, s7, 2
+L_1064560:
+// 0x01064560: 0x1064560: sll   v1, s7, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01064554: 0x1064554: addu  v1, s2, v1
+// 0x01064564: 0x1064564: addu  v1, s2, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x01064558: 0x1064558: addiu v0, zero, 10
+// 0x01064568: 0x1064568: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x0106455c: 0x106455c: sw    v0, 48(v1)
+// 0x0106456c: 0x106456c: sw    v0, 48(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6126,7 +6126,7 @@ L_1064550:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01064560: 0x1064560: sw    v1, 268(sp)
+// 0x01064570: 0x1064570: sw    v1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6135,7 +6135,7 @@ L_1064550:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064564: 0x1064564: jal   0x10614b4 addiu s8, s7, 1
+// 0x01064574: 0x1064574: jal   0x10614c4 addiu s8, s7, 1
 	ldloc 10
 	ldc.i4.1
 	add
@@ -6145,12 +6145,12 @@ L_1064550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_toll_roads_10614b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_toll_roads_10614c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106456c: 0x106456c: lw    v1, 268(sp)
+// 0x0106457c: 0x106457c: lw    v1, 268(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6159,22 +6159,22 @@ L_1064550:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064570: 0x1064570: sltu  v0, zero, v0
+// 0x01064580: 0x1064580: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01064574: 0x1064574: sll   s8, s8, 2
+// 0x01064584: 0x1064584: sll   s8, s8, 2
 	ldloc 12
 	ldc.i4.2
 	shl
 	stloc 12
-// 0x01064578: 0x1064578: addu  s8, s2, s8
+// 0x01064588: 0x1064588: addu  s8, s2, s8
 	ldloc 8
 	ldloc 12
 	add
 	stloc 12
-// 0x0106457c: 0x106457c: sw    v0, 100(v1)
+// 0x0106458c: 0x106458c: sw    v0, 100(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -6183,10 +6183,10 @@ L_1064550:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01064580: 0x1064580: addiu v0, zero, 12
+// 0x01064590: 0x1064590: addiu v0, zero, 12
 	ldc.i4.s 12
 	stloc 5
-// 0x01064584: 0x1064584: jal   0x1061488 sw    v0, 48(s8)
+// 0x01064594: 0x1064594: jal   0x1061498 sw    v0, 48(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6200,32 +6200,32 @@ L_1064550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_prefer_unknown_directions_1061488(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_prefer_unknown_directions_1061498(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106458c: 0x106458c: addiu s7, s7, 2
+// 0x0106459c: 0x106459c: addiu s7, s7, 2
 	ldloc 10
 	ldc.i4.2
 	add
 	stloc 10
-// 0x01064590: 0x1064590: sltu  v0, zero, v0
+// 0x010645a0: 0x10645a0: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01064594: 0x1064594: sll   v1, s7, 2
+// 0x010645a4: 0x10645a4: sll   v1, s7, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01064598: 0x1064598: addu  s2, s2, v1
+// 0x010645a8: 0x10645a8: addu  s2, s2, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x0106459c: 0x106459c: sw    v0, 100(s8)
+// 0x010645ac: 0x10645ac: sw    v0, 100(s8)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -6234,10 +6234,10 @@ L_1064550:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010645a0: 0x10645a0: addiu v0, zero, 13
+// 0x010645b0: 0x10645b0: addiu v0, zero, 13
 	ldc.i4.s 13
 	stloc 5
-// 0x010645a4: 0x10645a4: jal   0x1061340 sw    v0, 48(s2)
+// 0x010645b4: 0x10645b4: jal   0x1061350 sw    v0, 48(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6251,49 +6251,49 @@ L_1064550:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_isPalestinianOptionEnabled_1061340(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_isPalestinianOptionEnabled_1061350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010645ac: 0x10645ac: beq   v0, zero, 0x10645c8 addu  v1, zero, zero
+// 0x010645bc: 0x10645bc: beq   v0, zero, 0x10645d8 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10645c8
+	brfalse L_10645d8
 // --- basic block ---
-// 0x010645b4: 0x10645b4: jal   0x1061408 sll   zero, zero, 0
+// 0x010645c4: 0x10645c4: jal   0x1061418 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_avoid_palestinian_roads_1061408(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_avoid_palestinian_roads_1061418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010645bc: 0x10645bc: bne   v0, zero, 0x10645c8 addiu v1, zero, 1
+// 0x010645cc: 0x10645cc: bne   v0, zero, 0x10645d8 addiu v1, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 7
-	brtrue L_10645c8
+	brtrue L_10645d8
 // --- basic block ---
-// 0x010645c4: 0x10645c4: addu  v1, zero, zero
+// 0x010645d4: 0x10645d4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_10645c8:
-// 0x010645c8: 0x10645c8: sll   v0, s7, 2
+L_10645d8:
+// 0x010645d8: 0x10645d8: sll   v0, s7, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010645cc: 0x10645cc: addu  v0, sp, v0
+// 0x010645dc: 0x10645dc: addu  v0, sp, v0
 	ldloc.0
 	ldloc 5
 	add
 	stloc 5
-// 0x010645d0: 0x10645d0: jal   0x106136c sw    v1, 212(v0)
+// 0x010645e0: 0x10645e0: jal   0x106137c sw    v1, 212(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6307,26 +6307,26 @@ L_10645c8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl72::navigate_cost_type_106136c(int32,int32,int32,int32,int32)
+	call int32 Cibyl72::navigate_cost_type_106137c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010645d8: 0x10645d8: addiu v1, zero, 1
+// 0x010645e8: 0x10645e8: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010645dc: 0x10645dc: beq   v0, v1, 0x10645e8 addiu a1, zero, 3
+// 0x010645ec: 0x10645ec: beq   v0, v1, 0x10645f8 addiu a1, zero, 3
 	ldloc 5
 	ldloc 7
 	ldc.i4.3
 	stloc.2
-	beq  L_10645e8
+	beq  L_10645f8
 // --- basic block ---
-// 0x010645e4: 0x10645e4: addiu a1, zero, 1
+// 0x010645f4: 0x10645f4: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-L_10645e8:
-// 0x010645e8: 0x10645e8: lw    v1, 364(sp)
+L_10645f8:
+// 0x010645f8: 0x10645f8: lw    v1, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6335,20 +6335,20 @@ L_10645e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010645ec: 0x10645ec: lui   a0, 0x70000
+// 0x010645fc: 0x10645fc: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010645f0: 0x10645f0: addiu v0, a0, 15808
+// 0x01064600: 0x1064600: addiu v0, a0, 16272
 	ldloc.1
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x010645f4: 0x10645f4: slti  a2, v1, 10
+// 0x01064604: 0x1064604: slti  a2, v1, 10
 	ldloc 7
 	ldc.i4.s 10
 	clt
 	stloc.3
-// 0x010645f8: 0x10645f8: sw    s5, 24(v0)
+// 0x01064608: 0x1064608: sw    s5, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6357,16 +6357,16 @@ L_10645e8:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010645fc: 0x10645fc: lw    a0, 15808(a0)
+// 0x0106460c: 0x106460c: lw    a0, 16272(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064600: 0x1064600: lw    a3, 28(v0)
+// 0x01064610: 0x1064610: lw    a3, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6375,15 +6375,15 @@ L_10645e8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01064604: 0x1064604: bne   a2, zero, 0x1064610 sll   zero, zero, 0
+// 0x01064614: 0x1064614: bne   a2, zero, 0x1064620 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_1064610
+	brtrue L_1064620
 // --- basic block ---
-// 0x0106460c: 0x106460c: addiu v1, zero, 9
+// 0x0106461c: 0x106461c: addiu v1, zero, 9
 	ldc.i4.s 9
 	stloc 7
-L_1064610:
-// 0x01064610: 0x1064610: lw    t2, 4(s4)
+L_1064620:
+// 0x01064620: 0x1064620: lw    t2, 4(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -6392,7 +6392,7 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01064614: 0x1064614: lw    t0, 4(s3)
+// 0x01064624: 0x1064624: lw    t0, 4(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -6401,21 +6401,21 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01064618: 0x1064618: lw    t3, 0(s4)
+// 0x01064628: 0x1064628: lw    t3, 0(s4)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 21
-// 0x0106461c: 0x106461c: lw    t1, 0(s3)
+// 0x0106462c: 0x106462c: lw    t1, 0(s3)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 19
-// 0x01064620: 0x1064620: sw    v1, 16(sp)
+// 0x01064630: 0x1064630: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6424,10 +6424,10 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064624: 0x1064624: addiu v1, zero, 1000
+// 0x01064634: 0x1064634: addiu v1, zero, 1000
 	ldc.i4 1000
 	stloc 7
-// 0x01064628: 0x1064628: sw    v1, 24(sp)
+// 0x01064638: 0x1064638: sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6436,12 +6436,12 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106462c: 0x106462c: addiu v1, sp, 120
+// 0x0106463c: 0x106463c: addiu v1, sp, 120
 	ldloc.0
 	ldc.i4.s 120
 	add
 	stloc 7
-// 0x01064630: 0x1064630: sw    v1, 40(sp)
+// 0x01064640: 0x1064640: sw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6450,12 +6450,12 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064634: 0x1064634: addiu v1, sp, 128
+// 0x01064644: 0x1064644: addiu v1, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
 	stloc 7
-// 0x01064638: 0x1064638: sw    v1, 64(sp)
+// 0x01064648: 0x1064648: sw    v1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6464,7 +6464,7 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106463c: 0x106463c: lw    v1, 336(sp)
+// 0x0106464c: 0x106464c: lw    v1, 336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6473,7 +6473,7 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064640: 0x1064640: lw    a2, 360(sp)
+// 0x01064650: 0x1064650: lw    a2, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6482,7 +6482,7 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01064644: 0x1064644: sw    v1, 72(sp)
+// 0x01064654: 0x1064654: sw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6491,7 +6491,7 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064648: 0x1064648: lw    v1, 340(sp)
+// 0x01064658: 0x1064658: lw    v1, 340(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6500,10 +6500,10 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106464c: 0x106464c: addiu v0, zero, -1
+// 0x0106465c: 0x106465c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01064650: 0x1064650: sw    v1, 76(sp)
+// 0x01064660: 0x1064660: sw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6512,7 +6512,7 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064654: 0x1064654: lw    v1, 344(sp)
+// 0x01064664: 0x1064664: lw    v1, 344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6521,12 +6521,12 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064658: 0x1064658: addiu s7, s7, 1
+// 0x01064668: 0x1064668: addiu s7, s7, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0106465c: 0x106465c: sw    v1, 80(sp)
+// 0x0106466c: 0x106466c: sw    v1, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6535,12 +6535,12 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064660: 0x1064660: addiu v1, sp, 160
+// 0x01064670: 0x1064670: addiu v1, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
 	stloc 7
-// 0x01064664: 0x1064664: sw    v1, 92(sp)
+// 0x01064674: 0x1064674: sw    v1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6549,12 +6549,12 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064668: 0x1064668: addiu v1, sp, 212
+// 0x01064678: 0x1064678: addiu v1, sp, 212
 	ldloc.0
 	ldc.i4 212
 	add
 	stloc 7
-// 0x0106466c: 0x106466c: sw    v1, 96(sp)
+// 0x0106467c: 0x106467c: sw    v1, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6563,7 +6563,7 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064670: 0x1064670: lw    v1, 348(sp)
+// 0x01064680: 0x1064680: lw    v1, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6572,12 +6572,12 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064674: 0x1064674: sltu  s6, zero, s6
+// 0x01064684: 0x1064684: sltu  s6, zero, s6
 	ldc.i4.s 0
 	ldloc 16
 	clt.un
 	stloc 16
-// 0x01064678: 0x1064678: sw    v1, 100(sp)
+// 0x01064688: 0x1064688: sw    v1, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6586,7 +6586,7 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106467c: 0x106467c: lw    v1, 352(sp)
+// 0x0106468c: 0x106468c: lw    v1, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6595,10 +6595,10 @@ L_1064610:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064680: 0x1064680: addiu s2, zero, 1
+// 0x01064690: 0x1064690: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01064684: 0x1064684: sw    t3, 28(sp)
+// 0x01064694: 0x1064694: sw    t3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6607,7 +6607,7 @@ L_1064610:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01064688: 0x1064688: sw    t2, 32(sp)
+// 0x01064698: 0x1064698: sw    t2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6616,7 +6616,7 @@ L_1064610:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0106468c: 0x106468c: sw    s1, 44(sp)
+// 0x0106469c: 0x106469c: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6625,7 +6625,7 @@ L_1064610:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01064690: 0x1064690: sw    t1, 52(sp)
+// 0x010646a0: 0x10646a0: sw    t1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6634,7 +6634,7 @@ L_1064610:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01064694: 0x1064694: sw    t0, 56(sp)
+// 0x010646a4: 0x10646a4: sw    t0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6643,7 +6643,7 @@ L_1064610:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01064698: 0x1064698: sw    v0, 60(sp)
+// 0x010646a8: 0x10646a8: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6652,7 +6652,7 @@ L_1064610:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106469c: 0x106469c: sw    s0, 68(sp)
+// 0x010646ac: 0x10646ac: sw    s0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6661,7 +6661,7 @@ L_1064610:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010646a0: 0x10646a0: sw    s7, 88(sp)
+// 0x010646b0: 0x10646b0: sw    s7, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6670,7 +6670,7 @@ L_1064610:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010646a4: 0x10646a4: sw    v1, 104(sp)
+// 0x010646b4: 0x10646b4: sw    v1, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6679,7 +6679,7 @@ L_1064610:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010646a8: 0x10646a8: sw    s6, 108(sp)
+// 0x010646b8: 0x10646b8: sw    s6, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6688,7 +6688,7 @@ L_1064610:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010646ac: 0x10646ac: sw    v0, 20(sp)
+// 0x010646bc: 0x10646bc: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6697,7 +6697,7 @@ L_1064610:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010646b0: 0x10646b0: sw    v0, 36(sp)
+// 0x010646c0: 0x10646c0: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6706,7 +6706,7 @@ L_1064610:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010646b4: 0x10646b4: sw    zero, 48(sp)
+// 0x010646c4: 0x10646c4: sw    zero, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6715,7 +6715,7 @@ L_1064610:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010646b8: 0x10646b8: jal   0x106b6cc sw    s2, 84(sp)
+// 0x010646c8: 0x10646c8: jal   0x106bcf0 sw    s2, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6729,34 +6729,34 @@ L_1064610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_RequestRoute_106b6cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_RequestRoute_106bcf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010646c0: 0x10646c0: bne   v0, zero, 0x10646e4 lui   v0, 0x70000
+// 0x010646d0: 0x10646d0: bne   v0, zero, 0x10646f4 lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_10646e4
+	brtrue L_10646f4
 // --- basic block ---
-// 0x010646c8: 0x10646c8: addiu v0, v0, 15808
+// 0x010646d8: 0x10646d8: addiu v0, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x010646cc: 0x10646cc: lui   a0, 0x10000
+// 0x010646dc: 0x10646dc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010646d0: 0x10646d0: addiu v1, zero, 500
+// 0x010646e0: 0x10646e0: addiu v1, zero, 500
 	ldc.i4 500
 	stloc 7
-// 0x010646d4: 0x10646d4: addiu a0, a0, 14648
+// 0x010646e4: 0x10646e4: addiu a0, a0, 14644
 	ldloc.1
-	ldc.i4 14648
+	ldc.i4 14644
 	add
 	stloc.1
-// 0x010646d8: 0x10646d8: sw    s2, 32(v0)
+// 0x010646e8: 0x10646e8: sw    s2, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6765,7 +6765,7 @@ L_1064610:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010646dc: 0x10646dc: jal   0x10641b8 sw    v1, 4(v0)
+// 0x010646ec: 0x10646ec: jal   0x10641c8 sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6779,14 +6779,14 @@ L_1064610:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::routing_error_10641b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::routing_error_10641c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10646e4:
-// 0x010646e4: 0x10646e4: lw    ra, 308(sp)
-// 0x010646e8: 0x10646e8: lw    s8, 304(sp)
+L_10646f4:
+// 0x010646f4: 0x10646f4: lw    ra, 308(sp)
+// 0x010646f8: 0x10646f8: lw    s8, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6795,7 +6795,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010646ec: 0x10646ec: lw    s7, 300(sp)
+// 0x010646fc: 0x10646fc: lw    s7, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6804,7 +6804,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010646f0: 0x10646f0: lw    s6, 296(sp)
+// 0x01064700: 0x1064700: lw    s6, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6813,7 +6813,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010646f4: 0x10646f4: lw    s5, 292(sp)
+// 0x01064704: 0x1064704: lw    s5, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6822,7 +6822,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010646f8: 0x10646f8: lw    s4, 288(sp)
+// 0x01064708: 0x1064708: lw    s4, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6831,7 +6831,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010646fc: 0x10646fc: lw    s3, 284(sp)
+// 0x0106470c: 0x106470c: lw    s3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6840,7 +6840,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01064700: 0x1064700: lw    s2, 280(sp)
+// 0x01064710: 0x1064710: lw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6849,7 +6849,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01064704: 0x1064704: lw    s1, 276(sp)
+// 0x01064714: 0x1064714: lw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6858,7 +6858,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01064708: 0x1064708: lw    s0, 272(sp)
+// 0x01064718: 0x1064718: lw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6867,7 +6867,7 @@ L_10646e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0106470c: 0x106470c: jr    ra addiu sp, sp, 312
+// 0x0106471c: 0x106471c: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
diff --git a/converted/Cibyl75.j b/converted/Cibyl75.j
index 436dc2e..dc503bc 100644
--- a/converted/Cibyl75.j
+++ b/converted/Cibyl75.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl75::.ctor
 
-.method public static int32 on_routing_response_code_1064714(int32,int32,int32,int32,int32)
+.method public static int32 on_routing_response_code_1064724(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s1,int32 ra)
@@ -91,16 +91,16 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1064714:
-// 0x01064714: 0x1064714: addiu sp, sp, -1064
+L_1064724:
+// 0x01064724: 0x1064724: addiu sp, sp, -1064
 	ldloc.0
 	ldc.i4 -1064
 	add
 	stloc.0
-// 0x01064718: 0x1064718: addiu v0, zero, 18
+// 0x01064728: 0x1064728: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x0106471c: 0x106471c: sw    a0, 1064(sp)
+// 0x0106472c: 0x106472c: sw    a0, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -109,25 +109,25 @@ L_1064714:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01064720: 0x1064720: sw    v0, 0(a3)
+// 0x01064730: 0x1064730: sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01064724: 0x1064724: addiu a0, sp, 1064
+// 0x01064734: 0x1064734: addiu a0, sp, 1064
 	ldloc.0
 	ldc.i4 1064
 	add
 	stloc.1
-// 0x01064728: 0x1064728: addiu v0, zero, 1000
+// 0x01064738: 0x1064738: addiu v0, zero, 1000
 	ldc.i4 1000
 	stloc 5
-// 0x0106472c: 0x106472c: addu  a1, a3, zero
+// 0x0106473c: 0x106473c: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01064730: 0x1064730: sw    s1, 1044(sp)
+// 0x01064740: 0x1064740: sw    s1, 1044(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -136,8 +136,8 @@ L_1064714:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01064734: 0x1064734: sw    ra, 1060(sp)
-// 0x01064738: 0x1064738: sw    s4, 1056(sp)
+// 0x01064744: 0x1064744: sw    ra, 1060(sp)
+// 0x01064748: 0x1064748: sw    s4, 1056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -146,7 +146,7 @@ L_1064714:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0106473c: 0x106473c: sw    s3, 1052(sp)
+// 0x0106474c: 0x106474c: sw    s3, 1052(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -155,7 +155,7 @@ L_1064714:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01064740: 0x1064740: sw    s2, 1048(sp)
+// 0x01064750: 0x1064750: sw    s2, 1048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -164,7 +164,7 @@ L_1064714:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01064744: 0x1064744: sw    s0, 1040(sp)
+// 0x01064754: 0x1064754: sw    s0, 1040(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -173,10 +173,10 @@ L_1064714:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01064748: 0x1064748: addu  s1, a3, zero
+// 0x01064758: 0x1064758: addu  s1, a3, zero
 	ldloc 4
 	stloc 12
-// 0x0106474c: 0x106474c: jal   0x1063ae8 sw    v0, 32(sp)
+// 0x0106475c: 0x106475c: jal   0x1063af8 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -190,12 +190,12 @@ L_1064714:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::verify_route_id_1063ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::verify_route_id_1063af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064754: 0x1064754: lw    v1, 1064(sp)
+// 0x01064764: 0x1064764: lw    v1, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -204,35 +204,35 @@ L_1064714:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064758: 0x1064758: beq   v0, zero, 0x10648f8 addu  a0, v1, zero
+// 0x01064768: 0x1064768: beq   v0, zero, 0x1064908 addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brfalse L_10648f8
+	brfalse L_1064908
 // --- basic block ---
-// 0x01064760: 0x1064760: lui   s0, 0x10000
+// 0x01064770: 0x1064770: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x01064764: 0x1064764: lui   a3, 0x10000
+// 0x01064774: 0x1064774: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064768: 0x1064768: addiu a3, a3, 14692
+// 0x01064778: 0x1064778: addiu a3, a3, 14688
 	ldloc 4
-	ldc.i4 14692
+	ldc.i4 14688
 	add
 	stloc 4
-// 0x0106476c: 0x106476c: addiu a0, zero, 1
+// 0x0106477c: 0x106477c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01064770: 0x1064770: addiu a1, s0, 13908
+// 0x01064780: 0x1064780: addiu a1, s0, 13904
 	ldloc 8
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064774: 0x1064774: addiu a2, zero, 603
+// 0x01064784: 0x1064784: addiu a2, zero, 603
 	ldc.i4 603
 	stloc.3
-// 0x01064778: 0x1064778: sw    v1, 16(sp)
+// 0x01064788: 0x1064788: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -241,7 +241,7 @@ L_1064714:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106477c: 0x106477c: jal   0x100449c lui   s3, 0x0
+// 0x0106478c: 0x106478c: jal   0x100449c lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
 	ldloc.0
@@ -254,7 +254,7 @@ L_1064714:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064784: 0x1064784: lw    a0, 1064(sp)
+// 0x01064794: 0x1064794: lw    a0, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -263,26 +263,26 @@ L_1064714:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064788: 0x1064788: lui   a3, 0x70000
+// 0x01064798: 0x1064798: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x0106478c: 0x106478c: addiu a3, a3, 15816
+// 0x0106479c: 0x106479c: addiu a3, a3, 16280
 	ldloc 4
-	ldc.i4 15816
+	ldc.i4 16280
 	add
 	stloc 4
-// 0x01064790: 0x1064790: addiu s2, zero, 1
+// 0x010647a0: 0x10647a0: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 9
-// 0x01064794: 0x1064794: addiu a1, s3, 28076
+// 0x010647a4: 0x10647a4: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01064798: 0x1064798: addu  a2, zero, zero
+// 0x010647a8: 0x10647a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0106479c: 0x106479c: jal   0x106855c sw    s2, 16(sp)
+// 0x010647ac: 0x10647ac: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -296,12 +296,12 @@ L_1064714:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010647a4: 0x10647a4: bne   v0, zero, 0x10647c4 sw    v0, 1064(sp)
+// 0x010647b4: 0x10647b4: bne   v0, zero, 0x10647d4 sw    v0, 1064(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -311,50 +311,50 @@ L_1064714:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10647c4
+	brtrue L_10647d4
 // --- basic block ---
-// 0x010647ac: 0x10647ac: lui   a3, 0x10000
+// 0x010647bc: 0x10647bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010647b0: 0x10647b0: addiu a1, s0, 13908
+// 0x010647c0: 0x10647c0: addiu a1, s0, 13904
 	ldloc 8
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010647b4: 0x10647b4: addiu a3, a3, 14716
+// 0x010647c4: 0x10647c4: addiu a3, a3, 14712
 	ldloc 4
-	ldc.i4 14716
+	ldc.i4 14712
 	add
 	stloc 4
-// 0x010647b8: 0x10647b8: addiu a0, zero, 4
+// 0x010647c8: 0x10647c8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010647bc: 0x10647bc: j	 0x10647fc addiu a2, zero, 613
+// 0x010647cc: 0x10647cc: j	 0x106480c addiu a2, zero, 613
 	ldc.i4 613
 	stloc.3
-	br L_10647fc
+	br L_106480c
 // --- basic block ---
-L_10647c4:
-// 0x010647c4: 0x10647c4: lui   a3, 0x70000
+L_10647d4:
+// 0x010647d4: 0x10647d4: lui   a3, 0x70000
 	ldc.i4 458752
 	stloc 4
-// 0x010647c8: 0x10647c8: addu  a0, v0, zero
+// 0x010647d8: 0x10647d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010647cc: 0x10647cc: addiu a1, s3, 28076
+// 0x010647dc: 0x10647dc: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010647d0: 0x10647d0: addiu a3, a3, 15812
+// 0x010647e0: 0x10647e0: addiu a3, a3, 16276
 	ldloc 4
-	ldc.i4 15812
+	ldc.i4 16276
 	add
 	stloc 4
-// 0x010647d4: 0x10647d4: addu  a2, zero, zero
+// 0x010647e4: 0x10647e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010647d8: 0x10647d8: jal   0x106855c sw    s2, 16(sp)
+// 0x010647e8: 0x10647e8: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -368,12 +368,12 @@ L_10647c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010647e0: 0x10647e0: bne   v0, zero, 0x106480c sw    v0, 1064(sp)
+// 0x010647f0: 0x10647f0: bne   v0, zero, 0x106481c sw    v0, 1064(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -383,29 +383,29 @@ L_10647c4:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_106480c
+	brtrue L_106481c
 // --- basic block ---
-// 0x010647e8: 0x10647e8: lui   a3, 0x10000
+// 0x010647f8: 0x10647f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010647ec: 0x10647ec: addiu a1, s0, 13908
+// 0x010647fc: 0x10647fc: addiu a1, s0, 13904
 	ldloc 8
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010647f0: 0x10647f0: addiu a3, a3, 14776
+// 0x01064800: 0x1064800: addiu a3, a3, 14772
 	ldloc 4
-	ldc.i4 14776
+	ldc.i4 14772
 	add
 	stloc 4
-// 0x010647f4: 0x10647f4: addiu a0, zero, 4
+// 0x01064804: 0x1064804: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010647f8: 0x10647f8: addiu a2, zero, 625
+// 0x01064808: 0x1064808: addiu a2, zero, 625
 	ldc.i4 625
 	stloc.3
-L_10647fc:
-// 0x010647fc: 0x10647fc: jal   0x100449c sll   zero, zero, 0
+L_106480c:
+// 0x0106480c: 0x106480c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -416,40 +416,40 @@ L_10647fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064804: 0x1064804: j	 0x10648f8 addu  a0, zero, zero
+// 0x01064814: 0x1064814: j	 0x1064908 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_10648f8
+	br L_1064908
 // --- basic block ---
-L_106480c:
-// 0x0106480c: 0x106480c: addiu s3, sp, 36
+L_106481c:
+// 0x0106481c: 0x106481c: addiu s3, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 10
-// 0x01064810: 0x1064810: lui   a3, 0x10000
+// 0x01064820: 0x1064820: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064814: 0x1064814: addu  a0, v0, zero
+// 0x01064824: 0x1064824: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01064818: 0x1064818: addiu a3, a3, 5360
+// 0x01064828: 0x1064828: addiu a3, a3, 5356
 	ldloc 4
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc 4
-// 0x0106481c: 0x106481c: addiu v0, zero, -1
+// 0x0106482c: 0x106482c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01064820: 0x1064820: addu  a1, s3, zero
+// 0x01064830: 0x1064830: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x01064824: 0x1064824: addiu a2, sp, 32
+// 0x01064834: 0x1064834: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x01064828: 0x1064828: jal   0x1068434 sw    v0, 16(sp)
+// 0x01064838: 0x1064838: jal   0x1068444 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -463,12 +463,12 @@ L_106480c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064830: 0x1064830: bne   v0, zero, 0x1064850 sw    v0, 1064(sp)
+// 0x01064840: 0x1064840: bne   v0, zero, 0x1064860 sw    v0, 1064(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -478,51 +478,51 @@ L_106480c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1064850
+	brtrue L_1064860
 // --- basic block ---
-// 0x01064838: 0x1064838: lui   a3, 0x10000
+// 0x01064848: 0x1064848: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106483c: 0x106483c: addiu a1, s0, 13908
+// 0x0106484c: 0x106484c: addiu a1, s0, 13904
 	ldloc 8
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064840: 0x1064840: addiu a3, a3, 14828
+// 0x01064850: 0x1064850: addiu a3, a3, 14824
 	ldloc 4
-	ldc.i4 14828
+	ldc.i4 14824
 	add
 	stloc 4
-// 0x01064844: 0x1064844: addiu a0, zero, 4
+// 0x01064854: 0x1064854: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064848: 0x1064848: j	 0x10647fc addiu a2, zero, 632
+// 0x01064858: 0x1064858: j	 0x106480c addiu a2, zero, 632
 	ldc.i4 632
 	stloc.3
-	br L_10647fc
+	br L_106480c
 // --- basic block ---
-L_1064850:
-// 0x01064850: 0x1064850: lui   v0, 0x70000
+L_1064860:
+// 0x01064860: 0x1064860: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064854: 0x1064854: addiu s4, v0, 15808
+// 0x01064864: 0x1064864: addiu s4, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 11
-// 0x01064858: 0x1064858: lw    v1, 15808(v0)
+// 0x01064868: 0x1064868: lw    v1, 16272(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3952
+	ldc.i4 4068
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106485c: 0x106485c: lui   a3, 0x10000
+// 0x0106486c: 0x106486c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064860: 0x1064860: lw    v0, 4(s4)
+// 0x01064870: 0x1064870: lw    v0, 4(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -531,23 +531,23 @@ L_1064850:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064864: 0x1064864: addiu a1, s0, 13908
+// 0x01064874: 0x1064874: addiu a1, s0, 13904
 	ldloc 8
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064868: 0x1064868: addiu a3, a3, 14888
+// 0x01064878: 0x1064878: addiu a3, a3, 14884
 	ldloc 4
-	ldc.i4 14888
+	ldc.i4 14884
 	add
 	stloc 4
-// 0x0106486c: 0x106486c: addiu a0, zero, 1
+// 0x0106487c: 0x106487c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01064870: 0x1064870: addiu a2, zero, 636
+// 0x01064880: 0x1064880: addiu a2, zero, 636
 	ldc.i4 636
 	stloc.3
-// 0x01064874: 0x1064874: sw    v1, 16(sp)
+// 0x01064884: 0x1064884: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -556,7 +556,7 @@ L_1064850:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064878: 0x1064878: sw    v0, 20(sp)
+// 0x01064888: 0x1064888: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -565,7 +565,7 @@ L_1064850:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106487c: 0x106487c: jal   0x100449c sw    s3, 24(sp)
+// 0x0106488c: 0x106488c: jal   0x100449c sw    s3, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -584,7 +584,7 @@ L_1064850:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064884: 0x1064884: lw    v1, 4(s4)
+// 0x01064894: 0x1064894: lw    v1, 4(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -593,17 +593,17 @@ L_1064850:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064888: 0x1064888: addiu v0, zero, 200
+// 0x01064898: 0x1064898: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x0106488c: 0x106488c: beq   v1, v0, 0x10648ac lui   s0, 0x70000
+// 0x0106489c: 0x106489c: beq   v1, v0, 0x10648bc lui   s0, 0x70000
 	ldloc 7
 	ldloc 5
 	ldc.i4 458752
 	stloc 8
-	beq  L_10648ac
+	beq  L_10648bc
 // --- basic block ---
-// 0x01064894: 0x1064894: lw    v0, 32(s4)
+// 0x010648a4: 0x10648a4: lw    v0, 32(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -612,16 +612,16 @@ L_1064850:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064898: 0x1064898: sll   zero, zero, 0
-// 0x0106489c: 0x106489c: bne   v0, zero, 0x10648b0 addiu s0, s0, 15808
+// 0x010648a8: 0x10648a8: sll   zero, zero, 0
+// 0x010648ac: 0x10648ac: bne   v0, zero, 0x10648c0 addiu s0, s0, 16272
 	ldloc 5
 	ldloc 8
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 8
-	brtrue L_10648b0
+	brtrue L_10648c0
 // --- basic block ---
-// 0x010648a4: 0x10648a4: sw    s2, 32(s4)
+// 0x010648b4: 0x10648b4: sw    s2, 32(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -630,17 +630,17 @@ L_1064850:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010648a8: 0x10648a8: lui   s0, 0x70000
+// 0x010648b8: 0x10648b8: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-L_10648ac:
-// 0x010648ac: 0x10648ac: addiu s0, s0, 15808
+L_10648bc:
+// 0x010648bc: 0x10648bc: addiu s0, s0, 16272
 	ldloc 8
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 8
-L_10648b0:
-// 0x010648b0: 0x10648b0: lw    v0, 524(s0)
+L_10648c0:
+// 0x010648c0: 0x10648c0: lw    v0, 524(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -649,24 +649,24 @@ L_10648b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010648b4: 0x10648b4: sll   zero, zero, 0
-// 0x010648b8: 0x10648b8: lw    v0, 0(v0)
+// 0x010648c4: 0x10648c4: sll   zero, zero, 0
+// 0x010648c8: 0x10648c8: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010648bc: 0x10648bc: sll   zero, zero, 0
-// 0x010648c0: 0x10648c0: beq   v0, zero, 0x10648f0 addiu s2, sp, 36
+// 0x010648cc: 0x10648cc: sll   zero, zero, 0
+// 0x010648d0: 0x10648d0: beq   v0, zero, 0x1064900 addiu s2, sp, 36
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 9
-	brfalse L_10648f0
+	brfalse L_1064900
 // --- basic block ---
-// 0x010648c8: 0x10648c8: lw    a0, 32(s0)
+// 0x010648d8: 0x10648d8: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -675,7 +675,7 @@ L_10648b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010648cc: 0x10648cc: lw    a1, 4(s0)
+// 0x010648dc: 0x10648dc: lw    a1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -684,7 +684,7 @@ L_10648b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010648d0: 0x10648d0: jalr  v0 addu  a2, s2, zero
+// 0x010648e0: 0x10648e0: jalr  v0 addu  a2, s2, zero
 	ldloc 5
 	ldloc 9
 	stloc.3
@@ -698,7 +698,7 @@ L_10648b0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010648d8: 0x10648d8: lw    v1, 4(s0)
+// 0x010648e8: 0x10648e8: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -707,15 +707,15 @@ L_10648b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010648dc: 0x10648dc: addiu v0, zero, 200
+// 0x010648ec: 0x10648ec: addiu v0, zero, 200
 	ldc.i4 200
 	stloc 5
-// 0x010648e0: 0x10648e0: beq   v1, v0, 0x10648f0 sll   zero, zero, 0
+// 0x010648f0: 0x10648f0: beq   v1, v0, 0x1064900 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10648f0
+	beq  L_1064900
 // --- basic block ---
-// 0x010648e8: 0x10648e8: jal   0x10641b8 addu  a0, s2, zero
+// 0x010648f8: 0x10648f8: jal   0x10641c8 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -723,13 +723,13 @@ L_10648b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::routing_error_10641b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::routing_error_10641c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10648f0:
-// 0x010648f0: 0x10648f0: lw    a0, 1064(sp)
+L_1064900:
+// 0x01064900: 0x1064900: lw    a0, 1064(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -738,19 +738,19 @@ L_10648f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010648f4: 0x10648f4: sw    zero, 0(s1)
+// 0x01064904: 0x1064904: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_10648f8:
-// 0x010648f8: 0x10648f8: lw    ra, 1060(sp)
-// 0x010648fc: 0x10648fc: addu  v0, a0, zero
+L_1064908:
+// 0x01064908: 0x1064908: lw    ra, 1060(sp)
+// 0x0106490c: 0x106490c: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x01064900: 0x1064900: lw    s4, 1056(sp)
+// 0x01064910: 0x1064910: lw    s4, 1056(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -759,7 +759,7 @@ L_10648f8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01064904: 0x1064904: lw    s3, 1052(sp)
+// 0x01064914: 0x1064914: lw    s3, 1052(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -768,7 +768,7 @@ L_10648f8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01064908: 0x1064908: lw    s2, 1048(sp)
+// 0x01064918: 0x1064918: lw    s2, 1048(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -777,7 +777,7 @@ L_10648f8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106490c: 0x106490c: lw    s1, 1044(sp)
+// 0x0106491c: 0x106491c: lw    s1, 1044(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -786,7 +786,7 @@ L_10648f8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01064910: 0x1064910: lw    s0, 1040(sp)
+// 0x01064920: 0x1064920: lw    s0, 1040(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -795,7 +795,7 @@ L_10648f8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01064914: 0x1064914: jr    ra addiu sp, sp, 1064
+// 0x01064924: 0x1064924: jr    ra addiu sp, sp, 1064
 	ldloc.0
 	ldc.i4 1064
 	add
@@ -807,7 +807,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_route_points_106491c(int32,int32,int32,int32,int32)
+.method public static int32 on_route_points_106492c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 lo,int32 s1,int32 ra)
@@ -863,16 +863,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_106491c:
-// 0x0106491c: 0x106491c: addiu sp, sp, -72
+L_106492c:
+// 0x0106492c: 0x106492c: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01064920: 0x1064920: addiu v0, zero, 18
+// 0x01064930: 0x1064930: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01064924: 0x1064924: sw    a0, 72(sp)
+// 0x01064934: 0x1064934: sw    a0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -881,22 +881,22 @@ L_106491c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01064928: 0x1064928: sw    v0, 0(a3)
+// 0x01064938: 0x1064938: sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0106492c: 0x106492c: addiu a0, sp, 72
+// 0x0106493c: 0x106493c: addiu a0, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-// 0x01064930: 0x1064930: addu  a1, a3, zero
+// 0x01064940: 0x1064940: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01064934: 0x1064934: sw    s1, 48(sp)
+// 0x01064944: 0x1064944: sw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -905,8 +905,8 @@ L_106491c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01064938: 0x1064938: sw    ra, 68(sp)
-// 0x0106493c: 0x106493c: sw    s5, 64(sp)
+// 0x01064948: 0x1064948: sw    ra, 68(sp)
+// 0x0106494c: 0x106494c: sw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -915,7 +915,7 @@ L_106491c:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01064940: 0x1064940: sw    s4, 60(sp)
+// 0x01064950: 0x1064950: sw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -924,7 +924,7 @@ L_106491c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01064944: 0x1064944: sw    s3, 56(sp)
+// 0x01064954: 0x1064954: sw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -933,7 +933,7 @@ L_106491c:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01064948: 0x1064948: sw    s2, 52(sp)
+// 0x01064958: 0x1064958: sw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -942,7 +942,7 @@ L_106491c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106494c: 0x106494c: sw    s0, 44(sp)
+// 0x0106495c: 0x106495c: sw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -951,7 +951,7 @@ L_106491c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01064950: 0x1064950: jal   0x1063ae8 addu  s1, a3, zero
+// 0x01064960: 0x1064960: jal   0x1063af8 addu  s1, a3, zero
 	ldloc 4
 	stloc 14
 	ldloc.0
@@ -959,20 +959,20 @@ L_106491c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::verify_route_id_1063ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::verify_route_id_1063af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064958: 0x1064958: bne   v0, zero, 0x106496c addiu a0, sp, 72
+// 0x01064968: 0x1064968: bne   v0, zero, 0x106497c addiu a0, sp, 72
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-	brtrue L_106496c
+	brtrue L_106497c
 // --- basic block ---
-// 0x01064960: 0x1064960: lw    v0, 72(sp)
+// 0x01064970: 0x1064970: lw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -981,11 +981,11 @@ L_106491c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064964: 0x1064964: j	 0x1064cd8 sll   zero, zero, 0
-	br L_1064cd8
+// 0x01064974: 0x1064974: j	 0x1064ce8 sll   zero, zero, 0
+	br L_1064ce8
 // --- basic block ---
-L_106496c:
-// 0x0106496c: 0x106496c: jal   0x1063d88 addu  a1, s1, zero
+L_106497c:
+// 0x0106497c: 0x106497c: jal   0x1063d98 addu  a1, s1, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -993,12 +993,12 @@ L_106496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::verify_alt_id_1063d88(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::verify_alt_id_1063d98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064974: 0x1064974: lw    a0, 72(sp)
+// 0x01064984: 0x1064984: lw    a0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1007,36 +1007,36 @@ L_106496c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064978: 0x1064978: addu  s2, v0, zero
+// 0x01064988: 0x1064988: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0106497c: 0x106497c: bltz  s2, 0x1064cd8 addu  v0, a0, zero
+// 0x0106498c: 0x106498c: bltz  s2, 0x1064ce8 addu  v0, a0, zero
 	ldloc 9
 	ldloc.1
 	stloc 5
 	ldc.i4.s 0
-	blt L_1064cd8
+	blt L_1064ce8
 // --- basic block ---
-// 0x01064984: 0x1064984: lui   s3, 0x0
+// 0x01064994: 0x1064994: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x01064988: 0x1064988: addiu s0, zero, 1
+// 0x01064998: 0x1064998: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0106498c: 0x106498c: addiu a1, s3, 28076
+// 0x0106499c: 0x106499c: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01064990: 0x1064990: addu  a2, zero, zero
+// 0x010649a0: 0x10649a0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01064994: 0x1064994: addiu a3, sp, 24
+// 0x010649a4: 0x10649a4: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01064998: 0x1064998: jal   0x106855c sw    s0, 16(sp)
+// 0x010649a8: 0x10649a8: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1050,12 +1050,12 @@ L_106496c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010649a0: 0x10649a0: bne   v0, zero, 0x10649c4 sw    v0, 72(sp)
+// 0x010649b0: 0x10649b0: bne   v0, zero, 0x10649d4 sw    v0, 72(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1065,50 +1065,50 @@ L_106496c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10649c4
+	brtrue L_10649d4
 // --- basic block ---
-// 0x010649a8: 0x10649a8: lui   a1, 0x10000
+// 0x010649b8: 0x10649b8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010649ac: 0x10649ac: lui   a3, 0x10000
+// 0x010649bc: 0x10649bc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010649b0: 0x10649b0: addiu a1, a1, 13908
+// 0x010649c0: 0x10649c0: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010649b4: 0x10649b4: addiu a3, a3, 14928
+// 0x010649c4: 0x10649c4: addiu a3, a3, 14924
 	ldloc 4
-	ldc.i4 14928
+	ldc.i4 14924
 	add
 	stloc 4
-// 0x010649b8: 0x10649b8: addiu a0, zero, 4
+// 0x010649c8: 0x10649c8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010649bc: 0x10649bc: j	 0x10649fc addiu a2, zero, 884
+// 0x010649cc: 0x10649cc: j	 0x1064a0c addiu a2, zero, 884
 	ldc.i4 884
 	stloc.3
-	br L_10649fc
+	br L_1064a0c
 // --- basic block ---
-L_10649c4:
-// 0x010649c4: 0x10649c4: addu  a0, v0, zero
+L_10649d4:
+// 0x010649d4: 0x10649d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010649c8: 0x10649c8: addiu a1, s3, 28076
+// 0x010649d8: 0x10649d8: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010649cc: 0x10649cc: addu  a2, zero, zero
+// 0x010649dc: 0x10649dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010649d0: 0x10649d0: addiu a3, sp, 28
+// 0x010649e0: 0x10649e0: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010649d4: 0x10649d4: jal   0x106855c sw    s0, 16(sp)
+// 0x010649e4: 0x10649e4: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1122,12 +1122,12 @@ L_10649c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010649dc: 0x10649dc: bne   v0, zero, 0x1064a0c sw    v0, 72(sp)
+// 0x010649ec: 0x10649ec: bne   v0, zero, 0x1064a1c sw    v0, 72(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1137,32 +1137,32 @@ L_10649c4:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1064a0c
+	brtrue L_1064a1c
 // --- basic block ---
-// 0x010649e4: 0x10649e4: lui   a1, 0x10000
+// 0x010649f4: 0x10649f4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010649e8: 0x10649e8: lui   a3, 0x10000
+// 0x010649f8: 0x10649f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010649ec: 0x10649ec: addiu a1, a1, 13908
+// 0x010649fc: 0x10649fc: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010649f0: 0x10649f0: addiu a3, a3, 14984
+// 0x01064a00: 0x1064a00: addiu a3, a3, 14980
 	ldloc 4
-	ldc.i4 14984
+	ldc.i4 14980
 	add
 	stloc 4
-// 0x010649f4: 0x10649f4: addiu a0, zero, 4
+// 0x01064a04: 0x1064a04: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010649f8: 0x10649f8: addiu a2, zero, 896
+// 0x01064a08: 0x1064a08: addiu a2, zero, 896
 	ldc.i4 896
 	stloc.3
-L_10649fc:
-// 0x010649fc: 0x10649fc: jal   0x100449c sll   zero, zero, 0
+L_1064a0c:
+// 0x01064a0c: 0x1064a0c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1173,29 +1173,29 @@ L_10649fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064a04: 0x1064a04: j	 0x1064cd8 addu  v0, zero, zero
+// 0x01064a14: 0x1064a14: j	 0x1064ce8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1064cd8
+	br L_1064ce8
 // --- basic block ---
-L_1064a0c:
-// 0x01064a0c: 0x1064a0c: addu  a0, v0, zero
+L_1064a1c:
+// 0x01064a1c: 0x1064a1c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01064a10: 0x1064a10: addiu a1, s3, 28076
+// 0x01064a20: 0x1064a20: addiu a1, s3, 28076
 	ldloc 10
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01064a14: 0x1064a14: addu  a2, zero, zero
+// 0x01064a24: 0x1064a24: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01064a18: 0x1064a18: addiu a3, sp, 32
+// 0x01064a28: 0x1064a28: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01064a1c: 0x1064a1c: jal   0x106855c sw    s0, 16(sp)
+// 0x01064a2c: 0x1064a2c: jal   0x106856c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1209,12 +1209,12 @@ L_1064a0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064a24: 0x1064a24: bne   v0, zero, 0x1064a48 sw    v0, 72(sp)
+// 0x01064a34: 0x1064a34: bne   v0, zero, 0x1064a58 sw    v0, 72(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1224,50 +1224,50 @@ L_1064a0c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1064a48
+	brtrue L_1064a58
 // --- basic block ---
-// 0x01064a2c: 0x1064a2c: lui   a1, 0x10000
+// 0x01064a3c: 0x1064a3c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064a30: 0x1064a30: lui   a3, 0x10000
+// 0x01064a40: 0x1064a40: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064a34: 0x1064a34: addiu a1, a1, 13908
+// 0x01064a44: 0x1064a44: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064a38: 0x1064a38: addiu a3, a3, 15036
+// 0x01064a48: 0x1064a48: addiu a3, a3, 15032
 	ldloc 4
-	ldc.i4 15036
+	ldc.i4 15032
 	add
 	stloc 4
-// 0x01064a3c: 0x1064a3c: addiu a0, zero, 4
+// 0x01064a4c: 0x1064a4c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064a40: 0x1064a40: j	 0x10649fc addiu a2, zero, 908
+// 0x01064a50: 0x1064a50: j	 0x1064a0c addiu a2, zero, 908
 	ldc.i4 908
 	stloc.3
-	br L_10649fc
+	br L_1064a0c
 // --- basic block ---
-L_1064a48:
-// 0x01064a48: 0x1064a48: addiu s0, zero, 44
+L_1064a58:
+// 0x01064a58: 0x1064a58: addiu s0, zero, 44
 	ldc.i4.s 44
 	stloc 8
-// 0x01064a4c: 0x1064a4c: mult  s2, s0
+// 0x01064a5c: 0x1064a5c: mult  s2, s0
 	ldloc 9
 	ldloc 8
 	mul
 	stloc 13
-// 0x01064a50: 0x1064a50: lui   s0, 0x70000
+// 0x01064a60: 0x1064a60: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01064a54: 0x1064a54: addiu s0, s0, 15808
+// 0x01064a64: 0x1064a64: addiu s0, s0, 16272
 	ldloc 8
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 8
-// 0x01064a58: 0x1064a58: lw    v0, 24(sp)
+// 0x01064a68: 0x1064a68: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1276,15 +1276,15 @@ L_1064a48:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064a5c: 0x1064a5c: mflo  lo
+// 0x01064a6c: 0x1064a6c: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x01064a60: 0x1064a60: addu  s0, s0, v1
+// 0x01064a70: 0x1064a70: addu  s0, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x01064a64: 0x1064a64: lw    v1, 68(s0)
+// 0x01064a74: 0x1064a74: lw    v1, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1293,16 +1293,16 @@ L_1064a48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064a68: 0x1064a68: sll   zero, zero, 0
-// 0x01064a6c: 0x1064a6c: bne   v1, zero, 0x1064a88 sll   a0, v0, 3
+// 0x01064a78: 0x1064a78: sll   zero, zero, 0
+// 0x01064a7c: 0x1064a7c: bne   v1, zero, 0x1064a98 sll   a0, v0, 3
 	ldloc 7
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc.1
-	brtrue L_1064a88
+	brtrue L_1064a98
 // --- basic block ---
-// 0x01064a74: 0x1064a74: sw    v0, 68(s0)
+// 0x01064a84: 0x1064a84: sw    v0, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1311,7 +1311,7 @@ L_1064a48:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01064a78: 0x1064a78: jal   0x1000910 sw    zero, 72(s0)
+// 0x01064a88: 0x1064a88: jal   0x1000910 sw    zero, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1330,7 +1330,7 @@ L_1064a48:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064a80: 0x1064a80: j	 0x1064aac sw    v0, 76(s0)
+// 0x01064a90: 0x1064a90: j	 0x1064abc sw    v0, 76(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1339,59 +1339,59 @@ L_1064a48:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1064aac
+	br L_1064abc
 // --- basic block ---
-L_1064a88:
-// 0x01064a88: 0x1064a88: beq   v1, v0, 0x1064ab0 addiu s0, zero, 44
+L_1064a98:
+// 0x01064a98: 0x1064a98: beq   v1, v0, 0x1064ac0 addiu s0, zero, 44
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 44
 	stloc 8
-	beq  L_1064ab0
+	beq  L_1064ac0
 // --- basic block ---
-// 0x01064a90: 0x1064a90: lui   a1, 0x10000
+// 0x01064aa0: 0x1064aa0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064a94: 0x1064a94: lui   a3, 0x10000
+// 0x01064aa4: 0x1064aa4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064a98: 0x1064a98: addiu a1, a1, 13908
+// 0x01064aa8: 0x1064aa8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064a9c: 0x1064a9c: addiu a3, a3, 15092
+// 0x01064aac: 0x1064aac: addiu a3, a3, 15088
 	ldloc 4
-	ldc.i4 15092
+	ldc.i4 15088
 	add
 	stloc 4
-// 0x01064aa0: 0x1064aa0: addiu a0, zero, 4
+// 0x01064ab0: 0x1064ab0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064aa4: 0x1064aa4: j	 0x1064af0 addiu a2, zero, 921
+// 0x01064ab4: 0x1064ab4: j	 0x1064b00 addiu a2, zero, 921
 	ldc.i4 921
 	stloc.3
-	br L_1064af0
+	br L_1064b00
 // --- basic block ---
-L_1064aac:
-// 0x01064aac: 0x1064aac: addiu s0, zero, 44
+L_1064abc:
+// 0x01064abc: 0x1064abc: addiu s0, zero, 44
 	ldc.i4.s 44
 	stloc 8
-L_1064ab0:
-// 0x01064ab0: 0x1064ab0: mult  s2, s0
+L_1064ac0:
+// 0x01064ac0: 0x1064ac0: mult  s2, s0
 	ldloc 9
 	ldloc 8
 	mul
 	stloc 13
-// 0x01064ab4: 0x1064ab4: lui   s0, 0x70000
+// 0x01064ac4: 0x1064ac4: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01064ab8: 0x1064ab8: addiu s0, s0, 15808
+// 0x01064ac8: 0x1064ac8: addiu s0, s0, 16272
 	ldloc 8
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 8
-// 0x01064abc: 0x1064abc: lw    v0, 28(sp)
+// 0x01064acc: 0x1064acc: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1400,15 +1400,15 @@ L_1064ab0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064ac0: 0x1064ac0: mflo  lo
+// 0x01064ad0: 0x1064ad0: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x01064ac4: 0x1064ac4: addu  s0, s0, v1
+// 0x01064ad4: 0x1064ad4: addu  s0, s0, v1
 	ldloc 8
 	ldloc 7
 	add
 	stloc 8
-// 0x01064ac8: 0x1064ac8: lw    v1, 72(s0)
+// 0x01064ad8: 0x1064ad8: lw    v1, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1417,38 +1417,38 @@ L_1064ab0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064acc: 0x1064acc: sll   zero, zero, 0
-// 0x01064ad0: 0x1064ad0: beq   v1, v0, 0x1064c10 lui   s4, 0x0
+// 0x01064adc: 0x1064adc: sll   zero, zero, 0
+// 0x01064ae0: 0x1064ae0: beq   v1, v0, 0x1064c20 lui   s4, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 11
-	beq  L_1064c10
+	beq  L_1064c20
 // --- basic block ---
-// 0x01064ad8: 0x1064ad8: lui   a1, 0x10000
+// 0x01064ae8: 0x1064ae8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064adc: 0x1064adc: lui   a3, 0x10000
+// 0x01064aec: 0x1064aec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064ae0: 0x1064ae0: addiu a1, a1, 13908
+// 0x01064af0: 0x1064af0: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064ae4: 0x1064ae4: addiu a3, a3, 15160
+// 0x01064af4: 0x1064af4: addiu a3, a3, 15156
 	ldloc 4
-	ldc.i4 15160
+	ldc.i4 15156
 	add
 	stloc 4
-// 0x01064ae8: 0x1064ae8: addiu a0, zero, 4
+// 0x01064af8: 0x1064af8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064aec: 0x1064aec: addiu a2, zero, 929
+// 0x01064afc: 0x1064afc: addiu a2, zero, 929
 	ldc.i4 929
 	stloc.3
-L_1064af0:
-// 0x01064af0: 0x1064af0: sw    v1, 16(sp)
+L_1064b00:
+// 0x01064b00: 0x1064b00: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1457,7 +1457,7 @@ L_1064af0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064af4: 0x1064af4: jal   0x100449c sw    v0, 20(sp)
+// 0x01064b04: 0x1064b04: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1476,13 +1476,13 @@ L_1064af0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064afc: 0x1064afc: j	 0x1064cd8 addu  v0, zero, zero
+// 0x01064b0c: 0x1064b0c: j	 0x1064ce8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1064cd8
+	br L_1064ce8
 // --- basic block ---
-L_1064b04:
-// 0x01064b04: 0x1064b04: lw    v1, 72(s0)
+L_1064b14:
+// 0x01064b14: 0x1064b14: lw    v1, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1491,7 +1491,7 @@ L_1064b04:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064b08: 0x1064b08: lw    a0, 68(s0)
+// 0x01064b18: 0x1064b18: lw    a0, 68(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1500,42 +1500,42 @@ L_1064b04:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064b0c: 0x1064b0c: sll   zero, zero, 0
-// 0x01064b10: 0x1064b10: bne   v1, a0, 0x1064b34 sll   v0, v1, 3
+// 0x01064b1c: 0x1064b1c: sll   zero, zero, 0
+// 0x01064b20: 0x1064b20: bne   v1, a0, 0x1064b44 sll   v0, v1, 3
 	ldloc 7
 	ldloc.1
 	ldloc 7
 	ldc.i4.3
 	shl
 	stloc 5
-	bne.un L_1064b34
+	bne.un L_1064b44
 // --- basic block ---
-// 0x01064b18: 0x1064b18: lui   a1, 0x10000
+// 0x01064b28: 0x1064b28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064b1c: 0x1064b1c: lui   a3, 0x10000
+// 0x01064b2c: 0x1064b2c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064b20: 0x1064b20: addiu a1, a1, 13908
+// 0x01064b30: 0x1064b30: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064b24: 0x1064b24: addiu a3, a3, 15224
+// 0x01064b34: 0x1064b34: addiu a3, a3, 15220
 	ldloc 4
-	ldc.i4 15224
+	ldc.i4 15220
 	add
 	stloc 4
-// 0x01064b28: 0x1064b28: addiu a0, zero, 4
+// 0x01064b38: 0x1064b38: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064b2c: 0x1064b2c: j	 0x10649fc addiu a2, zero, 938
+// 0x01064b3c: 0x1064b3c: j	 0x1064a0c addiu a2, zero, 938
 	ldc.i4 938
 	stloc.3
-	br L_10649fc
+	br L_1064a0c
 // --- basic block ---
-L_1064b34:
-// 0x01064b34: 0x1064b34: lw    a3, 76(s0)
+L_1064b44:
+// 0x01064b44: 0x1064b44: lw    a3, 76(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1544,7 +1544,7 @@ L_1064b34:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01064b38: 0x1064b38: lw    a0, 72(sp)
+// 0x01064b48: 0x1064b48: lw    a0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1553,12 +1553,12 @@ L_1064b34:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064b3c: 0x1064b3c: addu  a3, a3, v0
+// 0x01064b4c: 0x1064b4c: addu  a3, a3, v0
 	ldloc 4
 	ldloc 5
 	add
 	stloc 4
-// 0x01064b40: 0x1064b40: jal   0x106855c sw    s3, 16(sp)
+// 0x01064b50: 0x1064b50: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1572,18 +1572,18 @@ L_1064b34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064b48: 0x1064b48: addu  a0, v0, zero
+// 0x01064b58: 0x1064b58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01064b4c: 0x1064b4c: addu  a2, zero, zero
+// 0x01064b5c: 0x1064b5c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01064b50: 0x1064b50: bne   v0, zero, 0x1064b74 sw    v0, 72(sp)
+// 0x01064b60: 0x1064b60: bne   v0, zero, 0x1064b84 sw    v0, 72(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1593,34 +1593,34 @@ L_1064b34:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1064b74
+	brtrue L_1064b84
 // --- basic block ---
-// 0x01064b58: 0x1064b58: lui   a1, 0x10000
+// 0x01064b68: 0x1064b68: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064b5c: 0x1064b5c: lui   a3, 0x10000
+// 0x01064b6c: 0x1064b6c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064b60: 0x1064b60: addiu a1, a1, 13908
+// 0x01064b70: 0x1064b70: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064b64: 0x1064b64: addiu a3, a3, 15260
+// 0x01064b74: 0x1064b74: addiu a3, a3, 15256
 	ldloc 4
-	ldc.i4 15260
+	ldc.i4 15256
 	add
 	stloc 4
-// 0x01064b68: 0x1064b68: addiu a0, zero, 4
+// 0x01064b78: 0x1064b78: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064b6c: 0x1064b6c: j	 0x10649fc addiu a2, zero, 950
+// 0x01064b7c: 0x1064b7c: j	 0x1064a0c addiu a2, zero, 950
 	ldc.i4 950
 	stloc.3
-	br L_10649fc
+	br L_1064a0c
 // --- basic block ---
-L_1064b74:
-// 0x01064b74: 0x1064b74: lw    v0, 32(sp)
+L_1064b84:
+// 0x01064b84: 0x1064b84: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1629,20 +1629,20 @@ L_1064b74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064b78: 0x1064b78: addu  a1, s4, zero
+// 0x01064b88: 0x1064b88: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x01064b7c: 0x1064b7c: addiu v0, v0, -1
+// 0x01064b8c: 0x1064b8c: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01064b80: 0x1064b80: slti  v1, v0, 2
+// 0x01064b90: 0x1064b90: slti  v1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 7
-// 0x01064b84: 0x1064b84: bne   v0, zero, 0x1064ba8 sw    v0, 32(sp)
+// 0x01064b94: 0x1064b94: bne   v0, zero, 0x1064bb8 sw    v0, 32(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1652,42 +1652,42 @@ L_1064b74:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1064ba8
+	brtrue L_1064bb8
 // --- basic block ---
-// 0x01064b8c: 0x1064b8c: lui   a1, 0x10000
+// 0x01064b9c: 0x1064b9c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064b90: 0x1064b90: lui   a3, 0x10000
+// 0x01064ba0: 0x1064ba0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064b94: 0x1064b94: addiu a1, a1, 13908
+// 0x01064ba4: 0x1064ba4: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064b98: 0x1064b98: addiu a3, a3, 15308
+// 0x01064ba8: 0x1064ba8: addiu a3, a3, 15304
 	ldloc 4
-	ldc.i4 15308
+	ldc.i4 15304
 	add
 	stloc 4
-// 0x01064b9c: 0x1064b9c: addiu a0, zero, 4
+// 0x01064bac: 0x1064bac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064ba0: 0x1064ba0: j	 0x10649fc addiu a2, zero, 956
+// 0x01064bb0: 0x1064bb0: j	 0x1064a0c addiu a2, zero, 956
 	ldc.i4 956
 	stloc.3
-	br L_10649fc
+	br L_1064a0c
 // --- basic block ---
-L_1064ba8:
-// 0x01064ba8: 0x1064ba8: beq   v1, zero, 0x1064bb4 sll   zero, zero, 0
+L_1064bb8:
+// 0x01064bb8: 0x1064bb8: beq   v1, zero, 0x1064bc4 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1064bb4
+	brfalse L_1064bc4
 // --- basic block ---
-// 0x01064bb0: 0x1064bb0: addu  a1, s5, zero
+// 0x01064bc0: 0x1064bc0: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-L_1064bb4:
-// 0x01064bb4: 0x1064bb4: lw    a3, 72(s0)
+L_1064bc4:
+// 0x01064bc4: 0x1064bc4: lw    a3, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1696,7 +1696,7 @@ L_1064bb4:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01064bb8: 0x1064bb8: lw    v0, 76(s0)
+// 0x01064bc8: 0x1064bc8: lw    v0, 76(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1705,22 +1705,22 @@ L_1064bb4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064bbc: 0x1064bbc: sll   a3, a3, 3
+// 0x01064bcc: 0x1064bcc: sll   a3, a3, 3
 	ldloc 4
 	ldc.i4.3
 	shl
 	stloc 4
-// 0x01064bc0: 0x1064bc0: addu  a3, v0, a3
+// 0x01064bd0: 0x1064bd0: addu  a3, v0, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 4
-// 0x01064bc4: 0x1064bc4: addiu a3, a3, 4
+// 0x01064bd4: 0x1064bd4: addiu a3, a3, 4
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-// 0x01064bc8: 0x1064bc8: jal   0x106855c sw    s3, 16(sp)
+// 0x01064bd8: 0x1064bd8: jal   0x106856c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1734,12 +1734,12 @@ L_1064bb4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064bd0: 0x1064bd0: bne   v0, zero, 0x1064bf4 sw    v0, 72(sp)
+// 0x01064be0: 0x1064be0: bne   v0, zero, 0x1064c04 sw    v0, 72(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1749,34 +1749,34 @@ L_1064bb4:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1064bf4
+	brtrue L_1064c04
 // --- basic block ---
-// 0x01064bd8: 0x1064bd8: lui   a1, 0x10000
+// 0x01064be8: 0x1064be8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064bdc: 0x1064bdc: lui   a3, 0x10000
+// 0x01064bec: 0x1064bec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064be0: 0x1064be0: addiu a1, a1, 13908
+// 0x01064bf0: 0x1064bf0: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064be4: 0x1064be4: addiu a3, a3, 15356
+// 0x01064bf4: 0x1064bf4: addiu a3, a3, 15352
 	ldloc 4
-	ldc.i4 15356
+	ldc.i4 15352
 	add
 	stloc 4
-// 0x01064be8: 0x1064be8: addiu a0, zero, 4
+// 0x01064bf8: 0x1064bf8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064bec: 0x1064bec: j	 0x10649fc addiu a2, zero, 969
+// 0x01064bfc: 0x1064bfc: j	 0x1064a0c addiu a2, zero, 969
 	ldc.i4 969
 	stloc.3
-	br L_10649fc
+	br L_1064a0c
 // --- basic block ---
-L_1064bf4:
-// 0x01064bf4: 0x1064bf4: lw    v0, 72(s0)
+L_1064c04:
+// 0x01064c04: 0x1064c04: lw    v0, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1785,7 +1785,7 @@ L_1064bf4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064bf8: 0x1064bf8: lw    v1, 32(sp)
+// 0x01064c08: 0x1064c08: lw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1794,17 +1794,17 @@ L_1064bf4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064bfc: 0x1064bfc: addiu v0, v0, 1
+// 0x01064c0c: 0x1064c0c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01064c00: 0x1064c00: addiu v1, v1, -1
+// 0x01064c10: 0x1064c10: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01064c04: 0x1064c04: sw    v1, 32(sp)
+// 0x01064c14: 0x1064c14: sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1813,7 +1813,7 @@ L_1064bf4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064c08: 0x1064c08: j	 0x1064c20 sw    v0, 72(s0)
+// 0x01064c18: 0x1064c18: j	 0x1064c30 sw    v0, 72(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1822,27 +1822,27 @@ L_1064bf4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1064c20
+	br L_1064c30
 // --- basic block ---
-L_1064c10:
-// 0x01064c10: 0x1064c10: lui   s5, 0x10000
+L_1064c20:
+// 0x01064c20: 0x1064c20: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x01064c14: 0x1064c14: addiu s4, s4, 28076
+// 0x01064c24: 0x1064c24: addiu s4, s4, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc 11
-// 0x01064c18: 0x1064c18: addiu s5, s5, 5360
+// 0x01064c28: 0x1064c28: addiu s5, s5, 5356
 	ldloc 12
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc 12
-// 0x01064c1c: 0x1064c1c: addiu s3, zero, 1
+// 0x01064c2c: 0x1064c2c: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 10
-L_1064c20:
-// 0x01064c20: 0x1064c20: lw    v0, 32(sp)
+L_1064c30:
+// 0x01064c30: 0x1064c30: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1851,17 +1851,17 @@ L_1064c20:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064c24: 0x1064c24: addu  a1, s4, zero
+// 0x01064c34: 0x1064c34: addu  a1, s4, zero
 	ldloc 11
 	stloc.2
-// 0x01064c28: 0x1064c28: bgtz  v0, 0x1064b04 addu  a2, zero, zero
+// 0x01064c38: 0x1064c38: bgtz  v0, 0x1064b14 addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
 	ldc.i4.s 0
-	bgt L_1064b04
+	bgt L_1064b14
 // --- basic block ---
-// 0x01064c30: 0x1064c30: lw    a0, 72(sp)
+// 0x01064c40: 0x1064c40: lw    a0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1870,15 +1870,15 @@ L_1064c20:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064c34: 0x1064c34: lui   a1, 0x10000
+// 0x01064c44: 0x1064c44: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064c38: 0x1064c38: addiu a1, a1, 5360
+// 0x01064c48: 0x1064c48: addiu a1, a1, 5356
 	ldloc.2
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc.2
-// 0x01064c3c: 0x1064c3c: jal   0x10681a8 addiu a2, zero, -1
+// 0x01064c4c: 0x1064c4c: jal   0x10681b8 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -1886,12 +1886,12 @@ L_1064c20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064c44: 0x1064c44: bne   v0, zero, 0x1064c68 sw    v0, 72(sp)
+// 0x01064c54: 0x1064c54: bne   v0, zero, 0x1064c78 sw    v0, 72(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -1901,58 +1901,58 @@ L_1064c20:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1064c68
+	brtrue L_1064c78
 // --- basic block ---
-// 0x01064c4c: 0x1064c4c: lui   a1, 0x10000
+// 0x01064c5c: 0x1064c5c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064c50: 0x1064c50: lui   a3, 0x10000
+// 0x01064c60: 0x1064c60: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064c54: 0x1064c54: addiu a1, a1, 13908
+// 0x01064c64: 0x1064c64: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064c58: 0x1064c58: addiu a3, a3, 15400
+// 0x01064c68: 0x1064c68: addiu a3, a3, 15396
 	ldloc 4
-	ldc.i4 15400
+	ldc.i4 15396
 	add
 	stloc 4
-// 0x01064c5c: 0x1064c5c: addiu a0, zero, 4
+// 0x01064c6c: 0x1064c6c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01064c60: 0x1064c60: j	 0x10649fc addiu a2, zero, 979
+// 0x01064c70: 0x1064c70: j	 0x1064a0c addiu a2, zero, 979
 	ldc.i4 979
 	stloc.3
-	br L_10649fc
+	br L_1064a0c
 // --- basic block ---
-L_1064c68:
-// 0x01064c68: 0x1064c68: addiu v0, zero, 44
+L_1064c78:
+// 0x01064c78: 0x1064c78: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x01064c6c: 0x1064c6c: mult  s2, v0
+// 0x01064c7c: 0x1064c7c: mult  s2, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 13
-// 0x01064c70: 0x1064c70: lui   v1, 0x70000
+// 0x01064c80: 0x1064c80: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01064c74: 0x1064c74: addiu v1, v1, 15808
+// 0x01064c84: 0x1064c84: addiu v1, v1, 16272
 	ldloc 7
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 7
-// 0x01064c78: 0x1064c78: mflo  lo
+// 0x01064c88: 0x1064c88: mflo  lo
 	ldloc 13
 	stloc 9
-// 0x01064c7c: 0x1064c7c: addu  s2, v1, s2
+// 0x01064c8c: 0x1064c8c: addu  s2, v1, s2
 	ldloc 7
 	ldloc 9
 	add
 	stloc 9
-// 0x01064c80: 0x1064c80: lw    v0, 68(s2)
+// 0x01064c90: 0x1064c90: lw    v0, 68(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1961,7 +1961,7 @@ L_1064c68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064c84: 0x1064c84: lw    a0, 72(s2)
+// 0x01064c94: 0x1064c94: lw    a0, 72(s2)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1970,13 +1970,13 @@ L_1064c68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064c88: 0x1064c88: sll   zero, zero, 0
-// 0x01064c8c: 0x1064c8c: bne   a0, v0, 0x1064cd0 sll   zero, zero, 0
+// 0x01064c98: 0x1064c98: sll   zero, zero, 0
+// 0x01064c9c: 0x1064c9c: bne   a0, v0, 0x1064ce0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_1064cd0
+	bne.un L_1064ce0
 // --- basic block ---
-// 0x01064c94: 0x1064c94: lw    a1, 16(v1)
+// 0x01064ca4: 0x1064ca4: lw    a1, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1985,7 +1985,7 @@ L_1064c68:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01064c98: 0x1064c98: lw    v0, 8(v1)
+// 0x01064ca8: 0x1064ca8: lw    v0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1994,12 +1994,12 @@ L_1064c68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064c9c: 0x1064c9c: addiu a1, a1, 1
+// 0x01064cac: 0x1064cac: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01064ca0: 0x1064ca0: bne   a1, v0, 0x1064cd0 sw    a1, 16(v1)
+// 0x01064cb0: 0x1064cb0: bne   a1, v0, 0x1064ce0 sw    a1, 16(v1)
 	ldloc.2
 	ldloc 5
 	ldloc 6
@@ -2010,9 +2010,9 @@ L_1064c68:
 	add
 	ldloc.2
 	stelem.i4
-	bne.un L_1064cd0
+	bne.un L_1064ce0
 // --- basic block ---
-// 0x01064ca8: 0x1064ca8: lw    v0, 524(v1)
+// 0x01064cb8: 0x1064cb8: lw    v0, 524(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2021,8 +2021,8 @@ L_1064c68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064cac: 0x1064cac: sll   zero, zero, 0
-// 0x01064cb0: 0x1064cb0: lw    v0, 4(v0)
+// 0x01064cbc: 0x1064cbc: sll   zero, zero, 0
+// 0x01064cc0: 0x1064cc0: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2031,15 +2031,15 @@ L_1064c68:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064cb4: 0x1064cb4: sll   zero, zero, 0
-// 0x01064cb8: 0x1064cb8: beq   v0, zero, 0x1064cd0 sll   zero, zero, 0
+// 0x01064cc4: 0x1064cc4: sll   zero, zero, 0
+// 0x01064cc8: 0x1064cc8: beq   v0, zero, 0x1064ce0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1064cd0
+	brfalse L_1064ce0
 // --- basic block ---
-// 0x01064cc0: 0x1064cc0: lui   a2, 0x70000
+// 0x01064cd0: 0x1064cd0: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x01064cc4: 0x1064cc4: lw    a0, 32(v1)
+// 0x01064cd4: 0x1064cd4: lw    a0, 32(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -2048,10 +2048,10 @@ L_1064c68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064cc8: 0x1064cc8: jalr  v0 addiu a2, a2, 15844
+// 0x01064cd8: 0x1064cd8: jalr  v0 addiu a2, a2, 16308
 	ldloc 5
 	ldloc.3
-	ldc.i4 15844
+	ldc.i4 16308
 	add
 	stloc.3
 	ldloc.0
@@ -2064,8 +2064,8 @@ L_1064c68:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1064cd0:
-// 0x01064cd0: 0x1064cd0: lw    v0, 72(sp)
+L_1064ce0:
+// 0x01064ce0: 0x1064ce0: lw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2074,16 +2074,16 @@ L_1064cd0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064cd4: 0x1064cd4: sw    zero, 0(s1)
+// 0x01064ce4: 0x1064ce4: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1064cd8:
-// 0x01064cd8: 0x1064cd8: lw    ra, 68(sp)
-// 0x01064cdc: 0x1064cdc: lw    s5, 64(sp)
+L_1064ce8:
+// 0x01064ce8: 0x1064ce8: lw    ra, 68(sp)
+// 0x01064cec: 0x1064cec: lw    s5, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2092,7 +2092,7 @@ L_1064cd8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01064ce0: 0x1064ce0: lw    s4, 60(sp)
+// 0x01064cf0: 0x1064cf0: lw    s4, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2101,7 +2101,7 @@ L_1064cd8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01064ce4: 0x1064ce4: lw    s3, 56(sp)
+// 0x01064cf4: 0x1064cf4: lw    s3, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2110,7 +2110,7 @@ L_1064cd8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01064ce8: 0x1064ce8: lw    s2, 52(sp)
+// 0x01064cf8: 0x1064cf8: lw    s2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2119,7 +2119,7 @@ L_1064cd8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01064cec: 0x1064cec: lw    s1, 48(sp)
+// 0x01064cfc: 0x1064cfc: lw    s1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2128,7 +2128,7 @@ L_1064cd8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01064cf0: 0x1064cf0: lw    s0, 44(sp)
+// 0x01064d00: 0x1064d00: lw    s0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2137,7 +2137,7 @@ L_1064cd8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01064cf4: 0x1064cf4: jr    ra addiu sp, sp, 72
+// 0x01064d04: 0x1064d04: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -2149,7 +2149,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 request_tile_1064cfc(int32,int32,int32,int32,int32)
+.method public static int32 request_tile_1064d0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -2193,12 +2193,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01064cfc: 0x1064cfc: addiu sp, sp, -40
+// 0x01064d0c: 0x1064d0c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01064d00: 0x1064d00: sw    s1, 28(sp)
+// 0x01064d10: 0x1064d10: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2207,19 +2207,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01064d04: 0x1064d04: lui   s1, 0x70000
+// 0x01064d14: 0x1064d14: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01064d08: 0x1064d08: lw    v0, 15800(s1)
+// 0x01064d18: 0x1064d18: lw    v0, 16264(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3950
+	ldc.i4 4066
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064d0c: 0x1064d0c: sw    s2, 32(sp)
+// 0x01064d1c: 0x1064d1c: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2228,7 +2228,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01064d10: 0x1064d10: sw    s0, 24(sp)
+// 0x01064d20: 0x1064d20: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2237,56 +2237,56 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01064d14: 0x1064d14: sw    ra, 36(sp)
-// 0x01064d18: 0x1064d18: addu  s0, a0, zero
+// 0x01064d24: 0x1064d24: sw    ra, 36(sp)
+// 0x01064d28: 0x1064d28: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01064d1c: 0x1064d1c: bne   v0, zero, 0x1064d40 addu  s2, a1, zero
+// 0x01064d2c: 0x1064d2c: bne   v0, zero, 0x1064d50 addu  s2, a1, zero
 	ldloc 7
 	ldloc.2
 	stloc 10
-	brtrue L_1064d40
+	brtrue L_1064d50
 // --- basic block ---
-// 0x01064d24: 0x1064d24: lui   a0, 0x1060000
+// 0x01064d34: 0x1064d34: lui   a0, 0x1060000
 	ldc.i4 17170432
 	stloc.1
-// 0x01064d28: 0x1064d28: jal   0x100ca10 addiu a0, a0, 24932
+// 0x01064d38: 0x1064d38: jal   0x100ca20 addiu a0, a0, 24948
 	ldloc.1
-	ldc.i4 24932
+	ldc.i4 24948
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl9::roadmap_tile_register_callback_100ca10(int32)
+	call int32 Cibyl9::roadmap_tile_register_callback_100ca20(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01064d30: 0x1064d30: lui   v1, 0x70000
+// 0x01064d40: 0x1064d40: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x01064d34: 0x1064d34: sw    v0, 15804(v1)
+// 0x01064d44: 0x1064d44: sw    v0, 16268(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3951
+	ldc.i4 4067
 	add
 	ldloc 7
 	stelem.i4
-// 0x01064d38: 0x1064d38: addiu v0, zero, 1
+// 0x01064d48: 0x1064d48: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x01064d3c: 0x1064d3c: sw    v0, 15800(s1)
+// 0x01064d4c: 0x1064d4c: sw    v0, 16264(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 3950
+	ldc.i4 4066
 	add
 	ldloc 7
 	stelem.i4
-L_1064d40:
-// 0x01064d40: 0x1064d40: jal   0x100db90 addu  a0, s0, zero
+L_1064d50:
+// 0x01064d50: 0x1064d50: jal   0x100dba0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2294,32 +2294,32 @@ L_1064d40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01064d48: 0x1064d48: lw    a0, 0(v0)
+// 0x01064d58: 0x1064d58: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01064d4c: 0x1064d4c: addiu v1, zero, -293
+// 0x01064d5c: 0x1064d5c: addiu v1, zero, -293
 	ldc.i4 -293
 	stloc 6
-// 0x01064d50: 0x1064d50: and   v1, a0, v1
+// 0x01064d60: 0x1064d60: and   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	and
 	stloc 6
-// 0x01064d54: 0x1064d54: ori   v1, v1, 288
+// 0x01064d64: 0x1064d64: ori   v1, v1, 288
 	ldloc 6
 	ldc.i4 288
 	or
 	stloc 6
-// 0x01064d58: 0x1064d58: beq   s2, zero, 0x1064d94 sw    v1, 0(v0)
+// 0x01064d68: 0x1064d68: beq   s2, zero, 0x1064da4 sw    v1, 0(v0)
 	ldloc 10
 	ldloc 5
 	ldloc 7
@@ -2327,31 +2327,31 @@ L_1064d40:
 	shr.un
 	ldloc 6
 	stelem.i4
-	brfalse L_1064d94
+	brfalse L_1064da4
 // --- basic block ---
-// 0x01064d60: 0x1064d60: lui   a1, 0x10000
+// 0x01064d70: 0x1064d70: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064d64: 0x1064d64: lui   a3, 0x10000
+// 0x01064d74: 0x1064d74: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064d68: 0x1064d68: addiu a1, a1, 13908
+// 0x01064d78: 0x1064d78: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064d6c: 0x1064d6c: addiu a3, a3, 15456
+// 0x01064d7c: 0x1064d7c: addiu a3, a3, 15452
 	ldloc 4
-	ldc.i4 15456
+	ldc.i4 15452
 	add
 	stloc 4
-// 0x01064d70: 0x1064d70: addiu a2, zero, 198
+// 0x01064d80: 0x1064d80: addiu a2, zero, 198
 	ldc.i4 198
 	stloc.3
-// 0x01064d74: 0x1064d74: addiu a0, zero, 1
+// 0x01064d84: 0x1064d84: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01064d78: 0x1064d78: jal   0x100449c sw    s0, 16(sp)
+// 0x01064d88: 0x1064d88: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2370,16 +2370,16 @@ L_1064d40:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01064d80: 0x1064d80: addu  a0, s0, zero
+// 0x01064d90: 0x1064d90: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01064d84: 0x1064d84: lui   a1, 0x500000
+// 0x01064d94: 0x1064d94: lui   a1, 0x500000
 	ldc.i4 5242880
 	stloc.2
-// 0x01064d88: 0x1064d88: addiu a2, zero, 1
+// 0x01064d98: 0x1064d98: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01064d8c: 0x1064d8c: jal   0x100d384 addu  a3, zero, zero
+// 0x01064d9c: 0x1064d9c: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2387,14 +2387,14 @@ L_1064d40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_1064d94:
-// 0x01064d94: 0x1064d94: lw    ra, 36(sp)
-// 0x01064d98: 0x1064d98: lw    s2, 32(sp)
+L_1064da4:
+// 0x01064da4: 0x1064da4: lw    ra, 36(sp)
+// 0x01064da8: 0x1064da8: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2403,7 +2403,7 @@ L_1064d94:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01064d9c: 0x1064d9c: lw    s1, 28(sp)
+// 0x01064dac: 0x1064dac: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2412,7 +2412,7 @@ L_1064d94:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01064da0: 0x1064da0: lw    s0, 24(sp)
+// 0x01064db0: 0x1064db0: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2421,7 +2421,7 @@ L_1064d94:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01064da4: 0x1064da4: jr    ra addiu sp, sp, 40
+// 0x01064db4: 0x1064db4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2433,7 +2433,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 instrument_segments_1064dac(int32,int32,int32,int32,int32)
+.method public static int32 instrument_segments_1064dbc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s1,int32 s2,int32 s0,int32 t0,int32 lo,int32 s4,int32 t1,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 t2,int32 t3)
@@ -2510,12 +2510,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01064dac: 0x1064dac: addiu sp, sp, -312
+// 0x01064dbc: 0x1064dbc: addiu sp, sp, -312
 	ldloc.0
 	ldc.i4 -312
 	add
 	stloc.0
-// 0x01064db0: 0x1064db0: sw    s1, 276(sp)
+// 0x01064dc0: 0x1064dc0: sw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2524,15 +2524,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01064db4: 0x1064db4: lui   s1, 0x70000
+// 0x01064dc4: 0x1064dc4: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01064db8: 0x1064db8: addiu s1, s1, 15808
+// 0x01064dc8: 0x1064dc8: addiu s1, s1, 16272
 	ldloc 9
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 9
-// 0x01064dbc: 0x1064dbc: lw    v1, 480(s1)
+// 0x01064dcc: 0x1064dcc: lw    v1, 480(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2541,7 +2541,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064dc0: 0x1064dc0: lw    v0, 476(s1)
+// 0x01064dd0: 0x1064dd0: lw    v0, 476(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2550,7 +2550,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064dc4: 0x1064dc4: sw    s8, 304(sp)
+// 0x01064dd4: 0x1064dd4: sw    s8, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2559,12 +2559,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01064dc8: 0x1064dc8: slt   v0, v1, v0
+// 0x01064dd8: 0x1064dd8: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01064dcc: 0x1064dcc: lw    v1, 488(s1)
+// 0x01064ddc: 0x1064ddc: lw    v1, 488(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2573,8 +2573,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064dd0: 0x1064dd0: sw    ra, 308(sp)
-// 0x01064dd4: 0x1064dd4: sw    s7, 300(sp)
+// 0x01064de0: 0x1064de0: sw    ra, 308(sp)
+// 0x01064de4: 0x1064de4: sw    s7, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2583,7 +2583,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01064dd8: 0x1064dd8: sw    s6, 296(sp)
+// 0x01064de8: 0x1064de8: sw    s6, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2592,7 +2592,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01064ddc: 0x1064ddc: sw    s5, 292(sp)
+// 0x01064dec: 0x1064dec: sw    s5, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2601,7 +2601,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01064de0: 0x1064de0: sw    s4, 288(sp)
+// 0x01064df0: 0x1064df0: sw    s4, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2610,7 +2610,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01064de4: 0x1064de4: sw    s3, 284(sp)
+// 0x01064df4: 0x1064df4: sw    s3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2619,7 +2619,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01064de8: 0x1064de8: sw    s2, 280(sp)
+// 0x01064df8: 0x1064df8: sw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2628,7 +2628,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01064dec: 0x1064dec: sw    s0, 272(sp)
+// 0x01064dfc: 0x1064dfc: sw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2637,10 +2637,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01064df0: 0x1064df0: addu  s8, a0, zero
+// 0x01064e00: 0x1064e00: addu  s8, a0, zero
 	ldloc.1
 	stloc 19
-// 0x01064df4: 0x1064df4: beq   v0, zero, 0x1064e20 sw    v1, 252(sp)
+// 0x01064e04: 0x1064e04: beq   v0, zero, 0x1064e30 sw    v1, 252(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -2650,28 +2650,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-	brfalse L_1064e20
+	brfalse L_1064e30
 // --- basic block ---
-// 0x01064dfc: 0x1064dfc: lui   a1, 0x10000
+// 0x01064e0c: 0x1064e0c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01064e00: 0x1064e00: lui   a3, 0x10000
+// 0x01064e10: 0x1064e10: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01064e04: 0x1064e04: addiu a1, a1, 13908
+// 0x01064e14: 0x1064e14: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01064e08: 0x1064e08: addiu a3, a3, 15476
+// 0x01064e18: 0x1064e18: addiu a3, a3, 15472
 	ldloc 4
-	ldc.i4 15476
+	ldc.i4 15472
 	add
 	stloc 4
-// 0x01064e0c: 0x1064e0c: addiu a0, zero, 1
+// 0x01064e1c: 0x1064e1c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01064e10: 0x1064e10: jal   0x100449c addiu a2, zero, 250
+// 0x01064e20: 0x1064e20: jal   0x100449c addiu a2, zero, 250
 	ldc.i4 250
 	stloc.3
 	ldloc.0
@@ -2684,24 +2684,24 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064e18: 0x1064e18: j	 0x1065618 sll   zero, zero, 0
-	br L_1065618
+// 0x01064e28: 0x1064e28: j	 0x1065628 sll   zero, zero, 0
+	br L_1065628
 // --- basic block ---
-L_1064e20:
-// 0x01064e20: 0x1064e20: beq   a0, zero, 0x1064f54 sll   zero, zero, 0
+L_1064e30:
+// 0x01064e30: 0x1064e30: beq   a0, zero, 0x1064f64 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1064f54
+	brfalse L_1064f64
 // --- basic block ---
-// 0x01064e28: 0x1064e28: addu  s0, zero, zero
+// 0x01064e38: 0x1064e38: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 11
-// 0x01064e2c: 0x1064e2c: j	 0x1064e94 addiu s2, zero, 56
+// 0x01064e3c: 0x1064e3c: j	 0x1064ea4 addiu s2, zero, 56
 	ldc.i4.s 56
 	stloc 10
-	br L_1064e94
+	br L_1064ea4
 // --- basic block ---
-L_1064e34:
-// 0x01064e34: 0x1064e34: lw    s3, 504(s1)
+L_1064e44:
+// 0x01064e44: 0x1064e44: lw    s3, 504(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2710,31 +2710,31 @@ L_1064e34:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01064e38: 0x1064e38: mflo  lo
+// 0x01064e48: 0x1064e48: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x01064e3c: 0x1064e3c: beq   s0, zero, 0x1064e68 addu  s3, s3, a0
+// 0x01064e4c: 0x1064e4c: beq   s0, zero, 0x1064e78 addu  s3, s3, a0
 	ldloc 11
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-	brfalse L_1064e68
+	brfalse L_1064e78
 // --- basic block ---
-// 0x01064e44: 0x1064e44: lh    v0, 46(s3)
+// 0x01064e54: 0x1064e54: lh    v0, 46(s3)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01064e48: 0x1064e48: sll   zero, zero, 0
-// 0x01064e4c: 0x1064e4c: bne   v0, zero, 0x1064eac lui   v0, 0x70000
+// 0x01064e58: 0x1064e58: sll   zero, zero, 0
+// 0x01064e5c: 0x1064e5c: bne   v0, zero, 0x1064ebc lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brtrue L_1064eac
+	brtrue L_1064ebc
 // --- basic block ---
-// 0x01064e54: 0x1064e54: lw    v1, 24(s3)
+// 0x01064e64: 0x1064e64: lw    v1, 24(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2743,7 +2743,7 @@ L_1064e34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064e58: 0x1064e58: lw    v0, -32(s3)
+// 0x01064e68: 0x1064e68: lw    v0, -32(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2752,16 +2752,16 @@ L_1064e34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064e5c: 0x1064e5c: sll   zero, zero, 0
-// 0x01064e60: 0x1064e60: beq   v1, v0, 0x1064eac lui   v0, 0x70000
+// 0x01064e6c: 0x1064e6c: sll   zero, zero, 0
+// 0x01064e70: 0x1064e70: beq   v1, v0, 0x1064ebc lui   v0, 0x70000
 	ldloc 7
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	beq  L_1064eac
+	beq  L_1064ebc
 // --- basic block ---
-L_1064e68:
-// 0x01064e68: 0x1064e68: lw    a0, 24(s3)
+L_1064e78:
+// 0x01064e78: 0x1064e78: lw    a0, 24(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2770,7 +2770,7 @@ L_1064e68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064e6c: 0x1064e6c: jal   0x100b50c addiu s0, s0, 1
+// 0x01064e7c: 0x1064e7c: jal   0x100b51c addiu s0, s0, 1
 	ldloc 11
 	ldc.i4.1
 	add
@@ -2780,12 +2780,12 @@ L_1064e68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01064e74: 0x1064e74: lw    v1, 28(s3)
+// 0x01064e84: 0x1064e84: lw    v1, 28(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2794,17 +2794,17 @@ L_1064e68:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064e78: 0x1064e78: sll   zero, zero, 0
-// 0x01064e7c: 0x1064e7c: slt   v0, v0, v1
+// 0x01064e88: 0x1064e88: sll   zero, zero, 0
+// 0x01064e8c: 0x1064e8c: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01064e80: 0x1064e80: beq   v0, zero, 0x1064e94 sll   zero, zero, 0
+// 0x01064e90: 0x1064e90: beq   v0, zero, 0x1064ea4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1064e94
+	brfalse L_1064ea4
 // --- basic block ---
-// 0x01064e88: 0x1064e88: lw    a0, 24(s3)
+// 0x01064e98: 0x1064e98: lw    a0, 24(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2813,7 +2813,7 @@ L_1064e68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064e8c: 0x1064e8c: jal   0x1064cfc addiu a1, zero, 1
+// 0x01064e9c: 0x1064e9c: jal   0x1064d0c addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2821,13 +2821,13 @@ L_1064e68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl75::request_tile_1064cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl75::request_tile_1064d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1064e94:
-// 0x01064e94: 0x1064e94: lw    v0, 484(s1)
+L_1064ea4:
+// 0x01064ea4: 0x1064ea4: lw    v0, 484(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2836,35 +2836,35 @@ L_1064e94:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064e98: 0x1064e98: sll   zero, zero, 0
-// 0x01064e9c: 0x1064e9c: slt   v0, s0, v0
+// 0x01064ea8: 0x1064ea8: sll   zero, zero, 0
+// 0x01064eac: 0x1064eac: slt   v0, s0, v0
 	ldloc 11
 	ldloc 5
 	clt
 	stloc 5
-// 0x01064ea0: 0x1064ea0: bne   v0, zero, 0x1064e34 mult  s0, s2
+// 0x01064eb0: 0x1064eb0: bne   v0, zero, 0x1064e44 mult  s0, s2
 	ldloc 5
 	ldloc 11
 	ldloc 10
 	mul
 	stloc 13
-	brtrue L_1064e34
+	brtrue L_1064e44
 // --- basic block ---
-// 0x01064ea8: 0x1064ea8: lui   v0, 0x70000
+// 0x01064eb8: 0x1064eb8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_1064eac:
-// 0x01064eac: 0x1064eac: addiu v0, v0, 15808
+L_1064ebc:
+// 0x01064ebc: 0x1064ebc: addiu v0, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01064eb0: 0x1064eb0: slti  v1, s0, 2
+// 0x01064ec0: 0x1064ec0: slti  v1, s0, 2
 	ldloc 11
 	ldc.i4.2
 	clt
 	stloc 7
-// 0x01064eb4: 0x1064eb4: bne   v1, zero, 0x1064ef0 sw    s0, 496(v0)
+// 0x01064ec4: 0x1064ec4: bne   v1, zero, 0x1064f00 sw    s0, 496(v0)
 	ldloc 7
 	ldloc 6
 	ldloc 5
@@ -2874,22 +2874,22 @@ L_1064eac:
 	add
 	ldloc 11
 	stelem.i4
-	brtrue L_1064ef0
+	brtrue L_1064f00
 // --- basic block ---
-// 0x01064ebc: 0x1064ebc: addiu a0, s0, -1
+// 0x01064ecc: 0x1064ecc: addiu a0, s0, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01064ec0: 0x1064ec0: addiu v1, zero, 56
+// 0x01064ed0: 0x1064ed0: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x01064ec4: 0x1064ec4: mult  a0, v1
+// 0x01064ed4: 0x1064ed4: mult  a0, v1
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 13
-// 0x01064ec8: 0x1064ec8: lw    v0, 504(v0)
+// 0x01064ed8: 0x1064ed8: lw    v0, 504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2898,61 +2898,61 @@ L_1064eac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064ecc: 0x1064ecc: sll   zero, zero, 0
-// 0x01064ed0: 0x1064ed0: lhu   a0, 46(v0)
+// 0x01064edc: 0x1064edc: sll   zero, zero, 0
+// 0x01064ee0: 0x1064ee0: lhu   a0, 46(v0)
 	ldloc 5
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01064ed4: 0x1064ed4: lhu   a1, 48(v0)
+// 0x01064ee4: 0x1064ee4: lhu   a1, 48(v0)
 	ldloc 5
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01064ed8: 0x1064ed8: mflo  lo
+// 0x01064ee8: 0x1064ee8: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x01064edc: 0x1064edc: addu  v1, v0, v1
+// 0x01064eec: 0x1064eec: addu  v1, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x01064ee0: 0x1064ee0: sh    a1, 48(v1)
+// 0x01064ef0: 0x1064ef0: sh    a1, 48(v1)
 	ldloc 7
 	ldc.i4.s 48
 	add
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01064ee4: 0x1064ee4: sh    a0, 46(v1)
+// 0x01064ef4: 0x1064ef4: sh    a0, 46(v1)
 	ldloc 7
 	ldc.i4.s 46
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01064ee8: 0x1064ee8: sh    zero, 48(v0)
+// 0x01064ef8: 0x1064ef8: sh    zero, 48(v0)
 	ldloc 5
 	ldc.i4.s 48
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01064eec: 0x1064eec: sh    zero, 46(v0)
+// 0x01064efc: 0x1064efc: sh    zero, 46(v0)
 	ldloc 5
 	ldc.i4.s 46
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_1064ef0:
-// 0x01064ef0: 0x1064ef0: lui   v0, 0x70000
+L_1064f00:
+// 0x01064f00: 0x1064f00: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064ef4: 0x1064ef4: addiu v0, v0, 15808
+// 0x01064f04: 0x1064f04: addiu v0, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01064ef8: 0x1064ef8: lw    v1, 476(v0)
+// 0x01064f08: 0x1064f08: lw    v1, 476(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2961,7 +2961,7 @@ L_1064ef0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01064efc: 0x1064efc: lw    a0, 484(v0)
+// 0x01064f0c: 0x1064f0c: lw    a0, 484(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2970,25 +2970,25 @@ L_1064ef0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064f00: 0x1064f00: sll   zero, zero, 0
-// 0x01064f04: 0x1064f04: bne   v1, a0, 0x1064f4c addiu a0, zero, 56
+// 0x01064f10: 0x1064f10: sll   zero, zero, 0
+// 0x01064f14: 0x1064f14: bne   v1, a0, 0x1064f5c addiu a0, zero, 56
 	ldloc 7
 	ldloc.1
 	ldc.i4.s 56
 	stloc.1
-	bne.un L_1064f4c
+	bne.un L_1064f5c
 // --- basic block ---
-// 0x01064f0c: 0x1064f0c: addiu a1, v1, -1
+// 0x01064f1c: 0x1064f1c: addiu a1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01064f10: 0x1064f10: mult  a1, a0
+// 0x01064f20: 0x1064f20: mult  a1, a0
 	ldloc.2
 	ldloc.1
 	mul
 	stloc 13
-// 0x01064f14: 0x1064f14: lw    v0, 504(v0)
+// 0x01064f24: 0x1064f24: lw    v0, 504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2997,77 +2997,77 @@ L_1064ef0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064f18: 0x1064f18: addiu s0, zero, 1
+// 0x01064f28: 0x1064f28: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x01064f1c: 0x1064f1c: mflo  lo
+// 0x01064f2c: 0x1064f2c: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x01064f20: 0x1064f20: addu  v0, v0, a0
+// 0x01064f30: 0x1064f30: addu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc 5
-// 0x01064f24: 0x1064f24: j	 0x1064f40 addiu v0, v0, 46
+// 0x01064f34: 0x1064f34: j	 0x1064f50 addiu v0, v0, 46
 	ldloc 5
 	ldc.i4.s 46
 	add
 	stloc 5
-	br L_1064f40
+	br L_1064f50
 // --- basic block ---
-L_1064f2c:
-// 0x01064f2c: 0x1064f2c: lh    a0, 0(v0)
+L_1064f3c:
+// 0x01064f3c: 0x1064f3c: lh    a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01064f30: 0x1064f30: sll   zero, zero, 0
-// 0x01064f34: 0x1064f34: bgtz  a0, 0x1064f4c addiu v0, v0, -56
+// 0x01064f40: 0x1064f40: sll   zero, zero, 0
+// 0x01064f44: 0x1064f44: bgtz  a0, 0x1064f5c addiu v0, v0, -56
 	ldloc.1
 	ldloc 5
 	ldc.i4.s -56
 	add
 	stloc 5
 	ldc.i4.s 0
-	bgt L_1064f4c
+	bgt L_1064f5c
 // --- basic block ---
-// 0x01064f3c: 0x1064f3c: addiu s0, s0, 1
+// 0x01064f4c: 0x1064f4c: addiu s0, s0, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-L_1064f40:
-// 0x01064f40: 0x1064f40: slt   a0, v1, s0
+L_1064f50:
+// 0x01064f50: 0x1064f50: slt   a0, v1, s0
 	ldloc 7
 	ldloc 11
 	clt
 	stloc.1
-// 0x01064f44: 0x1064f44: beq   a0, zero, 0x1064f2c sll   zero, zero, 0
+// 0x01064f54: 0x1064f54: beq   a0, zero, 0x1064f3c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1064f2c
+	brfalse L_1064f3c
 // --- basic block ---
-L_1064f4c:
-// 0x01064f4c: 0x1064f4c: lui   v0, 0x70000
+L_1064f5c:
+// 0x01064f5c: 0x1064f5c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01064f50: 0x1064f50: sw    s0, 16308(v0)
+// 0x01064f60: 0x1064f60: sw    s0, 16772(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4077
+	ldc.i4 4193
 	add
 	ldloc 11
 	stelem.i4
-L_1064f54:
-// 0x01064f54: 0x1064f54: lui   s2, 0x70000
+L_1064f64:
+// 0x01064f64: 0x1064f64: lui   s2, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x01064f58: 0x1064f58: addiu s2, s2, 15808
+// 0x01064f68: 0x1064f68: addiu s2, s2, 16272
 	ldloc 10
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 10
-// 0x01064f5c: 0x1064f5c: lw    s1, 492(s2)
+// 0x01064f6c: 0x1064f6c: lw    s1, 492(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3076,15 +3076,15 @@ L_1064f54:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01064f60: 0x1064f60: addiu v1, zero, 56
+// 0x01064f70: 0x1064f70: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x01064f64: 0x1064f64: mult  s1, v1
+// 0x01064f74: 0x1064f74: mult  s1, v1
 	ldloc 9
 	ldloc 7
 	mul
 	stloc 13
-// 0x01064f68: 0x1064f68: lw    s6, 484(s2)
+// 0x01064f78: 0x1064f78: lw    s6, 484(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3093,7 +3093,7 @@ L_1064f54:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01064f6c: 0x1064f6c: lw    v0, 476(s2)
+// 0x01064f7c: 0x1064f7c: lw    v0, 476(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3102,30 +3102,30 @@ L_1064f54:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064f70: 0x1064f70: lui   s4, 0x10000
+// 0x01064f80: 0x1064f80: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 14
-// 0x01064f74: 0x1064f74: xor   v0, s6, v0
+// 0x01064f84: 0x1064f84: xor   v0, s6, v0
 	ldloc 17
 	ldloc 5
 	xor
 	stloc 5
-// 0x01064f78: 0x1064f78: sltu  v0, zero, v0
+// 0x01064f88: 0x1064f88: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01064f7c: 0x1064f7c: subu  s6, s6, v0
+// 0x01064f8c: 0x1064f8c: subu  s6, s6, v0
 	ldloc 17
 	ldloc 5
 	sub
 	stloc 17
-// 0x01064f80: 0x1064f80: addiu s4, s4, 13908
+// 0x01064f90: 0x1064f90: addiu s4, s4, 13904
 	ldloc 14
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc 14
-// 0x01064f84: 0x1064f84: sw    zero, 248(sp)
+// 0x01064f94: 0x1064f94: sw    zero, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3134,16 +3134,16 @@ L_1064f54:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01064f88: 0x1064f88: mflo  lo
+// 0x01064f98: 0x1064f98: mflo  lo
 	ldloc 13
 	stloc 11
-// 0x01064f8c: 0x1064f8c: j	 0x1065574 addu  s5, s2, zero
+// 0x01064f9c: 0x1064f9c: j	 0x1065584 addu  s5, s2, zero
 	ldloc 10
 	stloc 16
-	br L_1065574
+	br L_1065584
 // --- basic block ---
-L_1064f94:
-// 0x01064f94: 0x1064f94: lw    v0, 496(s5)
+L_1064fa4:
+// 0x01064fa4: 0x1064fa4: lw    v0, 496(s5)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -3152,34 +3152,34 @@ L_1064f94:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064f98: 0x1064f98: sll   zero, zero, 0
-// 0x01064f9c: 0x1064f9c: slt   v1, s1, v0
+// 0x01064fa8: 0x1064fa8: sll   zero, zero, 0
+// 0x01064fac: 0x1064fac: slt   v1, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 7
-// 0x01064fa0: 0x1064fa0: beq   v1, zero, 0x1064ff8 addiu v0, v0, -1
+// 0x01064fb0: 0x1064fb0: beq   v1, zero, 0x1065008 addiu v0, v0, -1
 	ldloc 7
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-	brfalse L_1064ff8
+	brfalse L_1065008
 // --- basic block ---
-// 0x01064fa8: 0x1064fa8: subu  a0, v0, s1
+// 0x01064fb8: 0x1064fb8: subu  a0, v0, s1
 	ldloc 5
 	ldloc 9
 	sub
 	stloc.1
-// 0x01064fac: 0x1064fac: addiu v1, zero, 56
+// 0x01064fbc: 0x1064fbc: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x01064fb0: 0x1064fb0: mult  a0, v1
+// 0x01064fc0: 0x1064fc0: mult  a0, v1
 	ldloc.1
 	ldloc 7
 	mul
 	stloc 13
-// 0x01064fb4: 0x1064fb4: lw    a0, 504(s5)
+// 0x01064fc4: 0x1064fc4: lw    a0, 504(s5)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -3188,43 +3188,43 @@ L_1064f94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01064fb8: 0x1064fb8: xor   v0, s1, v0
+// 0x01064fc8: 0x1064fc8: xor   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	xor
 	stloc 5
-// 0x01064fbc: 0x1064fbc: sltu  v0, zero, v0
+// 0x01064fcc: 0x1064fcc: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01064fc0: 0x1064fc0: subu  v0, zero, v0
+// 0x01064fd0: 0x1064fd0: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x01064fc4: 0x1064fc4: mflo  lo
+// 0x01064fd4: 0x1064fd4: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x01064fc8: 0x1064fc8: addu  v1, a0, v1
+// 0x01064fd8: 0x1064fd8: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x01064fcc: 0x1064fcc: addiu s3, v1, -56
+// 0x01064fdc: 0x1064fdc: addiu s3, v1, -56
 	ldloc 7
 	ldc.i4.s -56
 	add
 	stloc 8
-// 0x01064fd0: 0x1064fd0: blez  s1, 0x1065020 and   s3, s3, v0
+// 0x01064fe0: 0x1064fe0: blez  s1, 0x1065030 and   s3, s3, v0
 	ldloc 9
 	ldloc 8
 	ldloc 5
 	and
 	stloc 8
 	ldc.i4.s 0
-	ble L_1065020
+	ble L_1065030
 // --- basic block ---
-// 0x01064fd8: 0x1064fd8: lw    v0, 484(s2)
+// 0x01064fe8: 0x1064fe8: lw    v0, 484(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -3233,32 +3233,32 @@ L_1064f94:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064fdc: 0x1064fdc: sll   zero, zero, 0
-// 0x01064fe0: 0x1064fe0: addiu v0, v0, -1
+// 0x01064fec: 0x1064fec: sll   zero, zero, 0
+// 0x01064ff0: 0x1064ff0: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01064fe4: 0x1064fe4: slt   v0, s1, v0
+// 0x01064ff4: 0x1064ff4: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01064fe8: 0x1064fe8: bne   v0, zero, 0x1065024 addiu a1, v1, 56
+// 0x01064ff8: 0x1064ff8: bne   v0, zero, 0x1065034 addiu a1, v1, 56
 	ldloc 5
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc.2
-	brtrue L_1065024
+	brtrue L_1065034
 // --- basic block ---
-// 0x01064ff0: 0x1064ff0: j	 0x1065024 addu  a1, zero, zero
+// 0x01065000: 0x1065000: j	 0x1065034 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	br L_1065024
+	br L_1065034
 // --- basic block ---
-L_1064ff8:
-// 0x01064ff8: 0x1064ff8: lw    v0, 484(s5)
+L_1065008:
+// 0x01065008: 0x1065008: lw    v0, 484(s5)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -3267,7 +3267,7 @@ L_1064ff8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01064ffc: 0x1064ffc: lw    v1, 504(s5)
+// 0x0106500c: 0x106500c: lw    v1, 504(s5)
 	ldloc 6
 	ldloc 16
 	ldc.i4.2
@@ -3276,59 +3276,59 @@ L_1064ff8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065000: 0x1065000: addiu v0, v0, -1
+// 0x01065010: 0x1065010: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01065004: 0x1065004: addu  v1, v1, s0
+// 0x01065014: 0x1065014: addu  v1, v1, s0
 	ldloc 7
 	ldloc 11
 	add
 	stloc 7
-// 0x01065008: 0x1065008: slt   v0, s1, v0
+// 0x01065018: 0x1065018: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x0106500c: 0x106500c: subu  v0, zero, v0
+// 0x0106501c: 0x106501c: subu  v0, zero, v0
 	ldloc 5
 	neg
 	stloc 5
-// 0x01065010: 0x1065010: addiu s3, v1, 56
+// 0x01065020: 0x1065020: addiu s3, v1, 56
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc 8
-// 0x01065014: 0x1065014: and   s3, s3, v0
+// 0x01065024: 0x1065024: and   s3, s3, v0
 	ldloc 8
 	ldloc 5
 	and
 	stloc 8
-// 0x01065018: 0x1065018: j	 0x1065024 addiu a1, v1, -56
+// 0x01065028: 0x1065028: j	 0x1065034 addiu a1, v1, -56
 	ldloc 7
 	ldc.i4.s -56
 	add
 	stloc.2
-	br L_1065024
+	br L_1065034
 // --- basic block ---
-L_1065020:
-// 0x01065020: 0x1065020: addu  a1, zero, zero
+L_1065030:
+// 0x01065030: 0x1065030: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-L_1065024:
-// 0x01065024: 0x1065024: lb    v0, 55(v1)
+L_1065034:
+// 0x01065034: 0x1065034: lb    v0, 55(v1)
 	ldloc 7
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01065028: 0x1065028: sll   zero, zero, 0
-// 0x0106502c: 0x106502c: bne   v0, zero, 0x106556c sll   zero, zero, 0
+// 0x01065038: 0x1065038: sll   zero, zero, 0
+// 0x0106503c: 0x106503c: bne   v0, zero, 0x106557c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_106556c
+	brtrue L_106557c
 // --- basic block ---
-// 0x01065034: 0x1065034: lw    a0, 24(v1)
+// 0x01065044: 0x1065044: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3337,7 +3337,7 @@ L_1065024:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065038: 0x1065038: sw    v1, 264(sp)
+// 0x01065048: 0x1065048: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3346,7 +3346,7 @@ L_1065024:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106503c: 0x106503c: jal   0x100b50c sw    a1, 256(sp)
+// 0x0106504c: 0x106504c: jal   0x100b51c sw    a1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3360,12 +3360,12 @@ L_1065024:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065044: 0x1065044: lw    v1, 264(sp)
+// 0x01065054: 0x1065054: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3374,7 +3374,7 @@ L_1065024:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065048: 0x1065048: lw    a1, 256(sp)
+// 0x01065058: 0x1065058: lw    a1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3383,7 +3383,7 @@ L_1065024:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106504c: 0x106504c: lw    t0, 28(v1)
+// 0x0106505c: 0x106505c: lw    t0, 28(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3392,23 +3392,23 @@ L_1065024:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01065050: 0x1065050: sll   zero, zero, 0
-// 0x01065054: 0x1065054: slt   a0, v0, t0
+// 0x01065060: 0x1065060: sll   zero, zero, 0
+// 0x01065064: 0x1065064: slt   a0, v0, t0
 	ldloc 5
 	ldloc 12
 	clt
 	stloc.1
-// 0x01065058: 0x1065058: beq   a0, zero, 0x10650a8 sll   zero, zero, 0
+// 0x01065068: 0x1065068: beq   a0, zero, 0x10650b8 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_10650a8
+	brfalse L_10650b8
 // --- basic block ---
-// 0x01065060: 0x1065060: beq   s8, zero, 0x106556c lui   a3, 0x10000
+// 0x01065070: 0x1065070: beq   s8, zero, 0x106557c lui   a3, 0x10000
 	ldloc 19
 	ldc.i4 65536
 	stloc 4
-	brfalse L_106556c
+	brfalse L_106557c
 // --- basic block ---
-// 0x01065068: 0x1065068: lw    t1, 24(v1)
+// 0x01065078: 0x1065078: lw    t1, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3417,21 +3417,21 @@ L_1065024:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0106506c: 0x106506c: addu  a1, s4, zero
+// 0x0106507c: 0x106507c: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x01065070: 0x1065070: addiu a3, a3, 15560
+// 0x01065080: 0x1065080: addiu a3, a3, 15556
 	ldloc 4
-	ldc.i4 15560
+	ldc.i4 15556
 	add
 	stloc 4
-// 0x01065074: 0x1065074: addiu a0, zero, 1
+// 0x01065084: 0x1065084: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065078: 0x1065078: addiu a2, zero, 314
+// 0x01065088: 0x1065088: addiu a2, zero, 314
 	ldc.i4 314
 	stloc.3
-// 0x0106507c: 0x106507c: sw    t1, 16(sp)
+// 0x0106508c: 0x106508c: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3440,7 +3440,7 @@ L_1065024:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01065080: 0x1065080: sw    v0, 20(sp)
+// 0x01065090: 0x1065090: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3449,7 +3449,7 @@ L_1065024:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065084: 0x1065084: jal   0x100449c sw    t0, 24(sp)
+// 0x01065094: 0x1065094: jal   0x100449c sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3468,7 +3468,7 @@ L_1065024:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106508c: 0x106508c: lw    v1, 264(sp)
+// 0x0106509c: 0x106509c: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3477,8 +3477,8 @@ L_1065024:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065090: 0x1065090: sll   zero, zero, 0
-// 0x01065094: 0x1065094: lw    a0, 24(v1)
+// 0x010650a0: 0x10650a0: sll   zero, zero, 0
+// 0x010650a4: 0x10650a4: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3487,7 +3487,7 @@ L_1065024:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065098: 0x1065098: jal   0x1064cfc addu  a1, zero, zero
+// 0x010650a8: 0x10650a8: jal   0x1064d0c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -3495,20 +3495,20 @@ L_1065024:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl75::request_tile_1064cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl75::request_tile_1064d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010650a0: 0x10650a0: j	 0x1065570 addiu s1, s1, 1
+// 0x010650b0: 0x10650b0: j	 0x1065580 addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_1065570
+	br L_1065580
 // --- basic block ---
-L_10650a8:
-// 0x010650a8: 0x10650a8: lw    a0, 24(v1)
+L_10650b8:
+// 0x010650b8: 0x10650b8: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3517,7 +3517,7 @@ L_10650a8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010650ac: 0x10650ac: sw    v1, 264(sp)
+// 0x010650bc: 0x10650bc: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3526,7 +3526,7 @@ L_10650a8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010650b0: 0x10650b0: sw    a1, 256(sp)
+// 0x010650c0: 0x10650c0: sw    a1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3535,7 +3535,7 @@ L_10650a8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010650b4: 0x10650b4: jal   0x100b484 sw    t0, 260(sp)
+// 0x010650c4: 0x10650c4: jal   0x100b494 sw    t0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3549,12 +3549,12 @@ L_10650a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010650bc: 0x10650bc: lw    t0, 260(sp)
+// 0x010650cc: 0x10650cc: lw    t0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3563,7 +3563,7 @@ L_10650a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010650c0: 0x10650c0: lw    v1, 264(sp)
+// 0x010650d0: 0x10650d0: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3572,17 +3572,17 @@ L_10650a8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010650c4: 0x10650c4: addiu a0, t0, 3600
+// 0x010650d4: 0x10650d4: addiu a0, t0, 3600
 	ldloc 12
 	ldc.i4 3600
 	add
 	stloc.1
-// 0x010650c8: 0x10650c8: slt   v0, a0, v0
+// 0x010650d8: 0x10650d8: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010650cc: 0x10650cc: lw    a1, 256(sp)
+// 0x010650dc: 0x10650dc: lw    a1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3591,11 +3591,11 @@ L_10650a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010650d0: 0x10650d0: beq   v0, zero, 0x1065130 sll   zero, zero, 0
+// 0x010650e0: 0x10650e0: beq   v0, zero, 0x1065140 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1065130
+	brfalse L_1065140
 // --- basic block ---
-// 0x010650d8: 0x10650d8: lw    a3, 24(v1)
+// 0x010650e8: 0x10650e8: lw    a3, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3604,15 +3604,15 @@ L_10650a8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010650dc: 0x10650dc: addiu s3, sp, 48
+// 0x010650ec: 0x10650ec: addiu s3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 8
-// 0x010650e0: 0x10650e0: addu  a0, a3, zero
+// 0x010650f0: 0x10650f0: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x010650e4: 0x10650e4: jal   0x100b484 sw    a3, 256(sp)
+// 0x010650f4: 0x10650f4: jal   0x100b494 sw    a3, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3626,12 +3626,12 @@ L_10650a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010650ec: 0x10650ec: lw    t0, 260(sp)
+// 0x010650fc: 0x10650fc: lw    t0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3640,7 +3640,7 @@ L_10650a8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010650f0: 0x10650f0: lw    a3, 256(sp)
+// 0x01065100: 0x1065100: lw    a3, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3649,21 +3649,21 @@ L_10650a8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010650f4: 0x10650f4: lui   a2, 0x10000
+// 0x01065104: 0x1065104: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010650f8: 0x10650f8: addu  a0, s3, zero
+// 0x01065108: 0x1065108: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010650fc: 0x10650fc: addiu a1, zero, 200
+// 0x0106510c: 0x106510c: addiu a1, zero, 200
 	ldc.i4 200
 	stloc.2
-// 0x01065100: 0x1065100: addiu a2, a2, 15608
+// 0x01065110: 0x1065110: addiu a2, a2, 15604
 	ldloc.3
-	ldc.i4 15608
+	ldc.i4 15604
 	add
 	stloc.3
-// 0x01065104: 0x1065104: sw    t0, 16(sp)
+// 0x01065114: 0x1065114: sw    t0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3672,7 +3672,7 @@ L_10650a8:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01065108: 0x1065108: jal   0x1000f9c sw    v0, 20(sp)
+// 0x01065118: 0x1065118: jal   0x1000f9c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3691,16 +3691,16 @@ L_10650a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065110: 0x1065110: addu  a3, s3, zero
+// 0x01065120: 0x1065120: addu  a3, s3, zero
 	ldloc 8
 	stloc 4
-// 0x01065114: 0x1065114: addiu a0, zero, 4
+// 0x01065124: 0x1065124: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065118: 0x1065118: addu  a1, s4, zero
+// 0x01065128: 0x1065128: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x0106511c: 0x106511c: jal   0x100449c addiu a2, zero, 325
+// 0x0106512c: 0x106512c: jal   0x100449c addiu a2, zero, 325
 	ldc.i4 325
 	stloc.3
 	ldloc.0
@@ -3713,10 +3713,10 @@ L_10650a8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065124: 0x1065124: addiu v0, zero, 1
+// 0x01065134: 0x1065134: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01065128: 0x1065128: j	 0x106556c sw    v0, 248(sp)
+// 0x01065138: 0x1065138: j	 0x106557c sw    v0, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3725,14 +3725,14 @@ L_10650a8:
 	add
 	ldloc 5
 	stelem.i4
-	br L_106556c
+	br L_106557c
 // --- basic block ---
-L_1065130:
-// 0x01065130: 0x1065130: beq   a1, zero, 0x1065190 sll   zero, zero, 0
+L_1065140:
+// 0x01065140: 0x1065140: beq   a1, zero, 0x10651a0 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1065190
+	brfalse L_10651a0
 // --- basic block ---
-// 0x01065138: 0x1065138: lw    a0, 24(v1)
+// 0x01065148: 0x1065148: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3741,7 +3741,7 @@ L_1065130:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106513c: 0x106513c: lw    v0, 24(a1)
+// 0x0106514c: 0x106514c: lw    v0, 24(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -3750,26 +3750,26 @@ L_1065130:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065140: 0x1065140: sll   zero, zero, 0
-// 0x01065144: 0x1065144: beq   a0, v0, 0x1065190 sll   zero, zero, 0
+// 0x01065150: 0x1065150: sll   zero, zero, 0
+// 0x01065154: 0x1065154: beq   a0, v0, 0x10651a0 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1065190
+	beq  L_10651a0
 // --- basic block ---
-// 0x0106514c: 0x106514c: lb    a2, 55(a1)
+// 0x0106515c: 0x106515c: lb    a2, 55(a1)
 	ldloc.2
 	ldc.i4.s 55
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x01065150: 0x1065150: sll   zero, zero, 0
-// 0x01065154: 0x1065154: bne   a2, zero, 0x1065190 lui   a3, 0x10000
+// 0x01065160: 0x1065160: sll   zero, zero, 0
+// 0x01065164: 0x1065164: bne   a2, zero, 0x10651a0 lui   a3, 0x10000
 	ldloc.3
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1065190
+	brtrue L_10651a0
 // --- basic block ---
-// 0x0106515c: 0x106515c: sw    a0, 16(sp)
+// 0x0106516c: 0x106516c: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3778,13 +3778,13 @@ L_1065130:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01065160: 0x1065160: lh    v1, 36(v1)
+// 0x01065170: 0x1065170: lh    v1, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01065164: 0x1065164: sw    v0, 24(sp)
+// 0x01065174: 0x1065174: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3793,7 +3793,7 @@ L_1065130:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065168: 0x1065168: sw    v1, 20(sp)
+// 0x01065178: 0x1065178: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3802,27 +3802,27 @@ L_1065130:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106516c: 0x106516c: lh    v0, 36(a1)
+// 0x0106517c: 0x106517c: lh    v0, 36(a1)
 	ldloc.2
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065170: 0x1065170: addiu a0, zero, 1
+// 0x01065180: 0x1065180: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065174: 0x1065174: addu  a1, s4, zero
+// 0x01065184: 0x1065184: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x01065178: 0x1065178: addiu a2, zero, 337
+// 0x01065188: 0x1065188: addiu a2, zero, 337
 	ldc.i4 337
 	stloc.3
-// 0x0106517c: 0x106517c: addiu a3, a3, 15688
+// 0x0106518c: 0x106518c: addiu a3, a3, 15684
 	ldloc 4
-	ldc.i4 15688
+	ldc.i4 15684
 	add
 	stloc 4
-// 0x01065180: 0x1065180: jal   0x100449c sw    v0, 28(sp)
+// 0x01065190: 0x1065190: jal   0x100449c sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3841,27 +3841,27 @@ L_1065130:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065188: 0x1065188: j	 0x1065570 addiu s1, s1, 1
+// 0x01065198: 0x1065198: j	 0x1065580 addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-	br L_1065570
+	br L_1065580
 // --- basic block ---
-L_1065190:
-// 0x01065190: 0x1065190: lh    a0, 36(v1)
+L_10651a0:
+// 0x010651a0: 0x10651a0: lh    a0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01065194: 0x1065194: sll   zero, zero, 0
-// 0x01065198: 0x1065198: bltz  a0, 0x10651c0 sll   zero, zero, 0
+// 0x010651a4: 0x10651a4: sll   zero, zero, 0
+// 0x010651a8: 0x10651a8: bltz  a0, 0x10651d0 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10651c0
+	blt L_10651d0
 // --- basic block ---
-// 0x010651a0: 0x10651a0: sw    v1, 264(sp)
+// 0x010651b0: 0x10651b0: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3870,7 +3870,7 @@ L_1065190:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010651a4: 0x10651a4: jal   0x1003abc sw    a0, 256(sp)
+// 0x010651b4: 0x10651b4: jal   0x1003abc sw    a0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3884,7 +3884,7 @@ L_1065190:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010651ac: 0x10651ac: lw    a0, 256(sp)
+// 0x010651bc: 0x10651bc: lw    a0, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3893,7 +3893,7 @@ L_1065190:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010651b0: 0x10651b0: lw    v1, 264(sp)
+// 0x010651c0: 0x10651c0: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3902,17 +3902,17 @@ L_1065190:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010651b4: 0x10651b4: slt   v0, a0, v0
+// 0x010651c4: 0x10651c4: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010651b8: 0x10651b8: bne   v0, zero, 0x1065234 sll   zero, zero, 0
+// 0x010651c8: 0x10651c8: bne   v0, zero, 0x1065244 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1065234
+	brtrue L_1065244
 // --- basic block ---
-L_10651c0:
-// 0x010651c0: 0x10651c0: lw    s3, 24(v1)
+L_10651d0:
+// 0x010651d0: 0x10651d0: lw    s3, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3921,13 +3921,13 @@ L_10651c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010651c4: 0x10651c4: lh    t1, 36(v1)
+// 0x010651d4: 0x10651d4: lh    t1, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 15
-// 0x010651c8: 0x10651c8: lw    t0, 28(v1)
+// 0x010651d8: 0x10651d8: lw    t0, 28(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3936,10 +3936,10 @@ L_10651c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010651cc: 0x10651cc: addu  a0, s3, zero
+// 0x010651dc: 0x10651dc: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x010651d0: 0x10651d0: sw    t0, 260(sp)
+// 0x010651e0: 0x10651e0: sw    t0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3948,7 +3948,7 @@ L_10651c0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010651d4: 0x10651d4: jal   0x100b50c sw    t1, 256(sp)
+// 0x010651e4: 0x10651e4: jal   0x100b51c sw    t1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3962,12 +3962,12 @@ L_10651c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010651dc: 0x10651dc: jal   0x1003abc sw    v0, 264(sp)
+// 0x010651ec: 0x10651ec: jal   0x1003abc sw    v0, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3981,7 +3981,7 @@ L_10651c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010651e4: 0x10651e4: lw    t1, 256(sp)
+// 0x010651f4: 0x10651f4: lw    t1, 256(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3990,7 +3990,7 @@ L_10651c0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010651e8: 0x10651e8: lw    t0, 260(sp)
+// 0x010651f8: 0x10651f8: lw    t0, 260(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3999,7 +3999,7 @@ L_10651c0:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010651ec: 0x10651ec: lw    v1, 264(sp)
+// 0x010651fc: 0x10651fc: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4008,24 +4008,24 @@ L_10651c0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010651f0: 0x10651f0: lui   a3, 0x10000
+// 0x01065200: 0x1065200: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010651f4: 0x10651f4: addiu a0, zero, 4
+// 0x01065204: 0x1065204: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010651f8: 0x10651f8: addu  a1, s4, zero
+// 0x01065208: 0x1065208: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x010651fc: 0x10651fc: addiu a2, zero, 345
+// 0x0106520c: 0x106520c: addiu a2, zero, 345
 	ldc.i4 345
 	stloc.3
-// 0x01065200: 0x1065200: addiu a3, a3, 15760
+// 0x01065210: 0x1065210: addiu a3, a3, 15756
 	ldloc 4
-	ldc.i4 15760
+	ldc.i4 15756
 	add
 	stloc 4
-// 0x01065204: 0x1065204: sw    v0, 32(sp)
+// 0x01065214: 0x1065214: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4034,7 +4034,7 @@ L_10651c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065208: 0x1065208: sw    t1, 16(sp)
+// 0x01065218: 0x1065218: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4043,7 +4043,7 @@ L_10651c0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0106520c: 0x106520c: sw    s3, 20(sp)
+// 0x0106521c: 0x106521c: sw    s3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4052,7 +4052,7 @@ L_10651c0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01065210: 0x1065210: sw    t0, 24(sp)
+// 0x01065220: 0x1065220: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4061,7 +4061,7 @@ L_10651c0:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01065214: 0x1065214: jal   0x100449c sw    v1, 28(sp)
+// 0x01065224: 0x1065224: jal   0x100449c sw    v1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4080,7 +4080,7 @@ L_10651c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106521c: 0x106521c: lw    v0, 32(s2)
+// 0x0106522c: 0x106522c: lw    v0, 32(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4089,14 +4089,14 @@ L_10651c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065220: 0x1065220: sll   zero, zero, 0
-// 0x01065224: 0x1065224: bne   v0, zero, 0x106556c addiu v0, zero, 2
+// 0x01065230: 0x1065230: sll   zero, zero, 0
+// 0x01065234: 0x1065234: bne   v0, zero, 0x106557c addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brtrue L_106556c
+	brtrue L_106557c
 // --- basic block ---
-// 0x0106522c: 0x106522c: j	 0x106556c sw    v0, 32(s2)
+// 0x0106523c: 0x106523c: j	 0x106557c sw    v0, 32(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4105,16 +4105,16 @@ L_10651c0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_106556c
+	br L_106557c
 // --- basic block ---
-L_1065234:
-// 0x01065234: 0x1065234: lh    a0, 36(v1)
+L_1065244:
+// 0x01065244: 0x1065244: lh    a0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01065238: 0x1065238: jal   0x1003b50 sw    v1, 264(sp)
+// 0x01065248: 0x1065248: jal   0x1003b50 sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4131,7 +4131,7 @@ L_1065234:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065240: 0x1065240: lw    v1, 264(sp)
+// 0x01065250: 0x1065250: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4140,178 +4140,178 @@ L_1065234:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065244: 0x1065244: lui   a0, 0x20000
+// 0x01065254: 0x1065254: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01065248: 0x1065248: sb    v0, 51(v1)
+// 0x01065258: 0x1065258: sb    v0, 51(v1)
 	ldloc 7
 	ldc.i4.s 51
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106524c: 0x106524c: lh    v0, 36(v1)
+// 0x0106525c: 0x106525c: lh    v0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065250: 0x1065250: lw    a1, 31152(a0)
+// 0x01065260: 0x1065260: lw    a1, 31616(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc.2
-// 0x01065254: 0x1065254: sll   v0, v0, 3
+// 0x01065264: 0x1065264: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x01065258: 0x1065258: addu  v0, a1, v0
+// 0x01065268: 0x1065268: addu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	add
 	stloc 5
-// 0x0106525c: 0x106525c: lhu   v0, 4(v0)
+// 0x0106526c: 0x106526c: lhu   v0, 4(v0)
 	ldloc 5
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x01065260: 0x1065260: ori   a0, zero, 65535
+// 0x01065270: 0x1065270: ori   a0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc.1
-// 0x01065264: 0x1065264: beq   v0, a0, 0x1065288 addiu a2, zero, -1
+// 0x01065274: 0x1065274: beq   v0, a0, 0x1065298 addiu a2, zero, -1
 	ldloc 5
 	ldloc.1
 	ldc.i4.m1
 	stloc.3
-	beq  L_1065288
+	beq  L_1065298
 // --- basic block ---
-// 0x0106526c: 0x106526c: lui   a0, 0x20000
+// 0x0106527c: 0x106527c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01065270: 0x1065270: lw    a2, 31240(a0)
+// 0x01065280: 0x1065280: lw    a2, 31704(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.3
-// 0x01065274: 0x1065274: sll   a0, v0, 2
+// 0x01065284: 0x1065284: sll   a0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01065278: 0x1065278: addu  a0, a2, a0
+// 0x01065288: 0x1065288: addu  a0, a2, a0
 	ldloc.3
 	ldloc.1
 	add
 	stloc.1
-// 0x0106527c: 0x106527c: lw    s7, 0(a0)
+// 0x0106528c: 0x106528c: lw    s7, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 18
-// 0x01065280: 0x1065280: addiu a2, v0, 1
+// 0x01065290: 0x1065290: addiu a2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01065284: 0x1065284: addu  s7, v0, s7
+// 0x01065294: 0x1065294: addu  s7, v0, s7
 	ldloc 5
 	ldloc 18
 	add
 	stloc 18
-L_1065288:
-// 0x01065288: 0x1065288: lh    a0, 36(v1)
+L_1065298:
+// 0x01065298: 0x1065298: lh    a0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x0106528c: 0x106528c: sh    a2, 40(v1)
+// 0x0106529c: 0x106529c: sh    a2, 40(v1)
 	ldloc 7
 	ldc.i4.s 40
 	add
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01065290: 0x1065290: sll   a2, a0, 3
+// 0x010652a0: 0x10652a0: sll   a2, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x01065294: 0x1065294: sh    s7, 42(v1)
+// 0x010652a4: 0x10652a4: sh    s7, 42(v1)
 	ldloc 7
 	ldc.i4.s 42
 	add
 	ldloc 18
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01065298: 0x1065298: addu  a2, a1, a2
+// 0x010652a8: 0x10652a8: addu  a2, a1, a2
 	ldloc.2
 	ldloc.3
 	add
 	stloc.3
-// 0x0106529c: 0x106529c: lhu   v0, 0(a2)
+// 0x010652ac: 0x10652ac: lhu   v0, 0(a2)
 	ldloc.3
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x010652a0: 0x10652a0: lui   a1, 0x20000
+// 0x010652b0: 0x10652b0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010652a4: 0x10652a4: lw    a3, 31228(a1)
+// 0x010652b4: 0x10652b4: lw    a3, 31692(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 4
-// 0x010652a8: 0x10652a8: andi  v0, v0, 32767
+// 0x010652b8: 0x10652b8: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x010652ac: 0x10652ac: sll   v0, v0, 3
+// 0x010652bc: 0x10652bc: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x010652b0: 0x10652b0: addu  v0, a3, v0
+// 0x010652c0: 0x10652c0: addu  v0, a3, v0
 	ldloc 4
 	ldloc 5
 	add
 	stloc 5
-// 0x010652b4: 0x10652b4: lw    a1, 0(v0)
+// 0x010652c4: 0x10652c4: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010652b8: 0x10652b8: lhu   a2, 2(a2)
+// 0x010652c8: 0x10652c8: lhu   a2, 2(a2)
 	ldloc.3
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.3
-// 0x010652bc: 0x10652bc: sw    a1, 0(v1)
+// 0x010652cc: 0x10652cc: sw    a1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x010652c0: 0x10652c0: lw    v0, 4(v0)
+// 0x010652d0: 0x10652d0: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4320,17 +4320,17 @@ L_1065288:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010652c4: 0x10652c4: andi  a2, a2, 32767
+// 0x010652d4: 0x10652d4: andi  a2, a2, 32767
 	ldloc.3
 	ldc.i4 32767
 	and
 	stloc.3
-// 0x010652c8: 0x10652c8: sll   a2, a2, 3
+// 0x010652d8: 0x10652d8: sll   a2, a2, 3
 	ldloc.3
 	ldc.i4.3
 	shl
 	stloc.3
-// 0x010652cc: 0x10652cc: sw    v0, 4(v1)
+// 0x010652dc: 0x10652dc: sw    v0, 4(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4339,19 +4339,19 @@ L_1065288:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010652d0: 0x10652d0: addu  a2, a3, a2
+// 0x010652e0: 0x10652e0: addu  a2, a3, a2
 	ldloc 4
 	ldloc.3
 	add
 	stloc.3
-// 0x010652d4: 0x10652d4: lw    a3, 0(a2)
+// 0x010652e4: 0x10652e4: lw    a3, 0(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010652d8: 0x10652d8: sw    v1, 264(sp)
+// 0x010652e8: 0x10652e8: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4360,7 +4360,7 @@ L_1065288:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010652dc: 0x10652dc: sw    a3, 8(v1)
+// 0x010652ec: 0x10652ec: sw    a3, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4369,7 +4369,7 @@ L_1065288:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010652e0: 0x10652e0: lw    a2, 4(a2)
+// 0x010652f0: 0x10652f0: lw    a2, 4(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4378,7 +4378,7 @@ L_1065288:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010652e4: 0x10652e4: sw    a1, 16(v1)
+// 0x010652f4: 0x10652f4: sw    a1, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4387,7 +4387,7 @@ L_1065288:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010652e8: 0x10652e8: sw    a2, 12(v1)
+// 0x010652f8: 0x10652f8: sw    a2, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4396,7 +4396,7 @@ L_1065288:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010652ec: 0x10652ec: jal   0x1004034 sw    v0, 20(v1)
+// 0x010652fc: 0x10652fc: jal   0x1004034 sw    v0, 20(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4415,7 +4415,7 @@ L_1065288:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010652f4: 0x10652f4: lw    v1, 264(sp)
+// 0x01065304: 0x1065304: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4424,14 +4424,14 @@ L_1065288:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010652f8: 0x10652f8: sll   zero, zero, 0
-// 0x010652fc: 0x10652fc: lh    a0, 36(v1)
+// 0x01065308: 0x1065308: sll   zero, zero, 0
+// 0x0106530c: 0x106530c: lh    a0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01065300: 0x1065300: jal   0x1003c30 sh    v0, 38(v1)
+// 0x01065310: 0x1065310: jal   0x1003c30 sh    v0, 38(v1)
 	ldloc 7
 	ldc.i4.s 38
 	add
@@ -4446,7 +4446,7 @@ L_1065288:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065308: 0x1065308: lw    v1, 264(sp)
+// 0x01065318: 0x1065318: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4455,29 +4455,29 @@ L_1065288:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106530c: 0x106530c: addiu a1, sp, 40
+// 0x0106531c: 0x106531c: addiu a1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-// 0x01065310: 0x1065310: lh    a0, 36(v1)
+// 0x01065320: 0x1065320: lh    a0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01065314: 0x1065314: sb    v0, 52(v1)
+// 0x01065324: 0x1065324: sb    v0, 52(v1)
 	ldloc 7
 	ldc.i4.s 52
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01065318: 0x1065318: addiu a2, sp, 44
+// 0x01065328: 0x1065328: addiu a2, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.3
-// 0x0106531c: 0x106531c: jal   0x1003fc8 sw    v1, 264(sp)
+// 0x0106532c: 0x106532c: jal   0x1003fc8 sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4496,7 +4496,7 @@ L_1065288:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065324: 0x1065324: lw    v1, 264(sp)
+// 0x01065334: 0x1065334: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4505,7 +4505,7 @@ L_1065288:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065328: 0x1065328: lw    t0, 40(sp)
+// 0x01065338: 0x1065338: lw    t0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4514,7 +4514,7 @@ L_1065288:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0106532c: 0x106532c: lw    v0, 32(v1)
+// 0x0106533c: 0x106533c: lw    v0, 32(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4523,47 +4523,47 @@ L_1065288:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065330: 0x1065330: sll   zero, zero, 0
-// 0x01065334: 0x1065334: bne   t0, v0, 0x1065344 sll   zero, zero, 0
+// 0x01065340: 0x1065340: sll   zero, zero, 0
+// 0x01065344: 0x1065344: bne   t0, v0, 0x1065354 sll   zero, zero, 0
 	ldloc 12
 	ldloc 5
-	bne.un L_1065344
+	bne.un L_1065354
 // --- basic block ---
-// 0x0106533c: 0x106533c: j	 0x1065348 addiu v0, zero, 1
+// 0x0106534c: 0x106534c: j	 0x1065358 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1065348
+	br L_1065358
 // --- basic block ---
-L_1065344:
-// 0x01065344: 0x1065344: addiu v0, zero, 2
+L_1065354:
+// 0x01065354: 0x1065354: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-L_1065348:
-// 0x01065348: 0x1065348: sb    v0, 50(v1)
+L_1065358:
+// 0x01065358: 0x1065358: sb    v0, 50(v1)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106534c: 0x106534c: lb    a1, 50(v1)
+// 0x0106535c: 0x106535c: lb    a1, 50(v1)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x01065350: 0x1065350: lui   v0, 0x10000
+// 0x01065360: 0x1065360: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01065354: 0x1065354: addiu a0, zero, 1
+// 0x01065364: 0x1065364: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065358: 0x1065358: lh    t3, 44(v1)
+// 0x01065368: 0x1065368: lh    t3, 44(v1)
 	ldloc 7
 	ldc.i4.s 44
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 22
-// 0x0106535c: 0x106535c: lw    t2, 44(sp)
+// 0x0106536c: 0x106536c: lw    t2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4572,7 +4572,7 @@ L_1065348:
 	add
 	ldelem.i4
 	stloc 21
-// 0x01065360: 0x1065360: lw    t1, 32(v1)
+// 0x01065370: 0x1065370: lw    t1, 32(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4581,42 +4581,42 @@ L_1065348:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01065364: 0x1065364: bne   a1, a0, 0x1065374 addiu v0, v0, 15836
+// 0x01065374: 0x1065374: bne   a1, a0, 0x1065384 addiu v0, v0, 15832
 	ldloc.2
 	ldloc.1
 	ldloc 5
-	ldc.i4 15836
+	ldc.i4 15832
 	add
 	stloc 5
-	bne.un L_1065374
+	bne.un L_1065384
 // --- basic block ---
-// 0x0106536c: 0x106536c: lui   v0, 0x10000
+// 0x0106537c: 0x106537c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x01065370: 0x1065370: addiu v0, v0, 15840
+// 0x01065380: 0x1065380: addiu v0, v0, 15836
 	ldloc 5
-	ldc.i4 15840
+	ldc.i4 15836
 	add
 	stloc 5
-L_1065374:
-// 0x01065374: 0x1065374: lui   a3, 0x10000
+L_1065384:
+// 0x01065384: 0x1065384: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065378: 0x1065378: addiu a0, zero, 1
+// 0x01065388: 0x1065388: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106537c: 0x106537c: addu  a1, s4, zero
+// 0x0106538c: 0x106538c: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x01065380: 0x1065380: addiu a2, zero, 374
+// 0x01065390: 0x1065390: addiu a2, zero, 374
 	ldc.i4 374
 	stloc.3
-// 0x01065384: 0x1065384: addiu a3, a3, 15844
+// 0x01065394: 0x1065394: addiu a3, a3, 15840
 	ldloc 4
-	ldc.i4 15844
+	ldc.i4 15840
 	add
 	stloc 4
-// 0x01065388: 0x1065388: sw    v1, 264(sp)
+// 0x01065398: 0x1065398: sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4625,7 +4625,7 @@ L_1065374:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106538c: 0x106538c: sw    t3, 20(sp)
+// 0x0106539c: 0x106539c: sw    t3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4634,7 +4634,7 @@ L_1065374:
 	add
 	ldloc 22
 	stelem.i4
-// 0x01065390: 0x1065390: sw    t0, 24(sp)
+// 0x010653a0: 0x10653a0: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4643,7 +4643,7 @@ L_1065374:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01065394: 0x1065394: sw    t2, 28(sp)
+// 0x010653a4: 0x10653a4: sw    t2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4652,7 +4652,7 @@ L_1065374:
 	add
 	ldloc 21
 	stelem.i4
-// 0x01065398: 0x1065398: sw    t1, 32(sp)
+// 0x010653a8: 0x10653a8: sw    t1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4661,7 +4661,7 @@ L_1065374:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0106539c: 0x106539c: sw    v0, 36(sp)
+// 0x010653ac: 0x10653ac: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4670,7 +4670,7 @@ L_1065374:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010653a0: 0x10653a0: jal   0x100449c sw    s1, 16(sp)
+// 0x010653b0: 0x10653b0: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4689,7 +4689,7 @@ L_1065374:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010653a8: 0x10653a8: lw    v1, 264(sp)
+// 0x010653b8: 0x10653b8: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4698,22 +4698,22 @@ L_1065374:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010653ac: 0x10653ac: beq   s3, zero, 0x1065438 sll   zero, zero, 0
+// 0x010653bc: 0x10653bc: beq   s3, zero, 0x1065448 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1065438
+	brfalse L_1065448
 // --- basic block ---
-// 0x010653b4: 0x10653b4: lh    v0, 46(s3)
+// 0x010653c4: 0x10653c4: lh    v0, 46(s3)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x010653b8: 0x10653b8: sll   zero, zero, 0
-// 0x010653bc: 0x10653bc: bne   v0, zero, 0x1065438 sll   zero, zero, 0
+// 0x010653c8: 0x10653c8: sll   zero, zero, 0
+// 0x010653cc: 0x10653cc: bne   v0, zero, 0x1065448 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1065438
+	brtrue L_1065448
 // --- basic block ---
-// 0x010653c4: 0x10653c4: lw    a0, 24(s3)
+// 0x010653d4: 0x10653d4: lw    a0, 24(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4722,7 +4722,7 @@ L_1065374:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010653c8: 0x10653c8: lw    v0, 24(v1)
+// 0x010653d8: 0x10653d8: lw    v0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4731,19 +4731,19 @@ L_1065374:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010653cc: 0x10653cc: sll   zero, zero, 0
-// 0x010653d0: 0x10653d0: beq   a0, v0, 0x1065438 sll   zero, zero, 0
+// 0x010653dc: 0x10653dc: sll   zero, zero, 0
+// 0x010653e0: 0x10653e0: beq   a0, v0, 0x1065448 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_1065438
+	beq  L_1065448
 // --- basic block ---
-// 0x010653d8: 0x10653d8: lh    a0, 36(v1)
+// 0x010653e8: 0x10653e8: lh    a0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x010653dc: 0x10653dc: jal   0x100405c sll   zero, zero, 0
+// 0x010653ec: 0x10653ec: jal   0x100405c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4754,7 +4754,7 @@ L_1065374:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010653e4: 0x10653e4: lw    v1, 264(sp)
+// 0x010653f4: 0x10653f4: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4763,89 +4763,89 @@ L_1065374:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010653e8: 0x10653e8: sll   zero, zero, 0
-// 0x010653ec: 0x10653ec: lh    a0, 46(v1)
+// 0x010653f8: 0x10653f8: sll   zero, zero, 0
+// 0x010653fc: 0x10653fc: lh    a0, 46(v1)
 	ldloc 7
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x010653f0: 0x10653f0: sll   zero, zero, 0
-// 0x010653f4: 0x10653f4: slt   a1, v0, a0
+// 0x01065400: 0x1065400: sll   zero, zero, 0
+// 0x01065404: 0x1065404: slt   a1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.2
-// 0x010653f8: 0x10653f8: beq   a1, zero, 0x1065438 sll   zero, zero, 0
+// 0x01065408: 0x1065408: beq   a1, zero, 0x1065448 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1065438
+	brfalse L_1065448
 // --- basic block ---
-// 0x01065400: 0x1065400: lh    a2, 48(v1)
+// 0x01065410: 0x1065410: lh    a2, 48(v1)
 	ldloc 7
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x01065404: 0x1065404: lhu   a1, 48(v1)
+// 0x01065414: 0x1065414: lhu   a1, 48(v1)
 	ldloc 7
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01065408: 0x1065408: mult  v0, a2
+// 0x01065418: 0x1065418: mult  v0, a2
 	ldloc 5
 	ldloc.3
 	mul
 	stloc 13
-// 0x0106540c: 0x106540c: subu  a2, a0, v0
+// 0x0106541c: 0x106541c: subu  a2, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.3
-// 0x01065410: 0x1065410: sh    a2, 46(s3)
+// 0x01065420: 0x1065420: sh    a2, 46(s3)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	ldloc.3
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01065414: 0x1065414: sh    v0, 46(v1)
+// 0x01065424: 0x1065424: sh    v0, 46(v1)
 	ldloc 7
 	ldc.i4.s 46
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01065418: 0x1065418: mflo  lo
+// 0x01065428: 0x1065428: mflo  lo
 	ldloc 13
 	stloc 4
-// 0x0106541c: 0x106541c: sll   zero, zero, 0
-// 0x01065420: 0x1065420: sll   zero, zero, 0
-// 0x01065424: 0x1065424: div   a3, a0
+// 0x0106542c: 0x106542c: sll   zero, zero, 0
+// 0x01065430: 0x1065430: sll   zero, zero, 0
+// 0x01065434: 0x1065434: div   a3, a0
 	ldloc 4
 	ldloc.1
 	div
 	stloc 13
-// 0x01065428: 0x1065428: mflo  lo
+// 0x01065438: 0x1065438: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x0106542c: 0x106542c: subu  a1, a1, a0
+// 0x0106543c: 0x106543c: subu  a1, a1, a0
 	ldloc.2
 	ldloc.1
 	sub
 	stloc.2
-// 0x01065430: 0x1065430: sh    a1, 48(s3)
+// 0x01065440: 0x1065440: sh    a1, 48(s3)
 	ldloc 8
 	ldc.i4.s 48
 	add
 	ldloc.2
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01065434: 0x1065434: sh    a0, 48(v1)
+// 0x01065444: 0x1065444: sh    a0, 48(v1)
 	ldloc 7
 	ldc.i4.s 48
 	add
 	ldloc.1
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-L_1065438:
-// 0x01065438: 0x1065438: lw    v0, 496(s2)
+L_1065448:
+// 0x01065448: 0x1065448: lw    v0, 496(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4854,87 +4854,87 @@ L_1065438:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106543c: 0x106543c: sll   zero, zero, 0
-// 0x01065440: 0x1065440: slt   v0, s1, v0
+// 0x0106544c: 0x106544c: sll   zero, zero, 0
+// 0x01065450: 0x1065450: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01065444: 0x1065444: beq   v0, zero, 0x10654ac sll   zero, zero, 0
+// 0x01065454: 0x1065454: beq   v0, zero, 0x10654bc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10654ac
+	brfalse L_10654bc
 // --- basic block ---
-// 0x0106544c: 0x106544c: lh    v0, 46(v1)
+// 0x0106545c: 0x106545c: lh    v0, 46(v1)
 	ldloc 7
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065450: 0x1065450: sll   zero, zero, 0
-// 0x01065454: 0x1065454: blez  v0, 0x10654ac sll   zero, zero, 0
+// 0x01065460: 0x1065460: sll   zero, zero, 0
+// 0x01065464: 0x1065464: blez  v0, 0x10654bc sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	ble L_10654ac
+	ble L_10654bc
 // --- basic block ---
-// 0x0106545c: 0x106545c: beq   s3, zero, 0x1065474 sll   zero, zero, 0
+// 0x0106546c: 0x106546c: beq   s3, zero, 0x1065484 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1065474
+	brfalse L_1065484
 // --- basic block ---
-// 0x01065464: 0x1065464: lh    v0, 46(s3)
+// 0x01065474: 0x1065474: lh    v0, 46(s3)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065468: 0x1065468: sll   zero, zero, 0
-// 0x0106546c: 0x106546c: bne   v0, zero, 0x10654ac sll   zero, zero, 0
+// 0x01065478: 0x1065478: sll   zero, zero, 0
+// 0x0106547c: 0x106547c: bne   v0, zero, 0x10654bc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10654ac
+	brtrue L_10654bc
 // --- basic block ---
-L_1065474:
-// 0x01065474: 0x1065474: lb    a0, 50(v1)
+L_1065484:
+// 0x01065484: 0x1065484: lb    a0, 50(v1)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x01065478: 0x1065478: addiu v0, zero, 1
+// 0x01065488: 0x1065488: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0106547c: 0x106547c: bne   a0, v0, 0x1065494 lui   a0, 0x70000
+// 0x0106548c: 0x106548c: bne   a0, v0, 0x10654a4 lui   a0, 0x70000
 	ldloc.1
 	ldloc 5
 	ldc.i4 458752
 	stloc.1
-	bne.un L_1065494
+	bne.un L_10654a4
 // --- basic block ---
-// 0x01065484: 0x1065484: addiu a0, a0, 16316
+// 0x01065494: 0x1065494: addiu a0, a0, 16780
 	ldloc.1
-	ldc.i4 16316
+	ldc.i4 16780
 	add
 	stloc.1
-// 0x01065488: 0x1065488: addu  a1, v1, zero
+// 0x01065498: 0x1065498: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0106548c: 0x106548c: j	 0x10654a0 addu  a2, zero, zero
+// 0x0106549c: 0x106549c: j	 0x10654b0 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_10654a0
+	br L_10654b0
 // --- basic block ---
-L_1065494:
-// 0x01065494: 0x1065494: addiu a0, a0, 16316
+L_10654a4:
+// 0x010654a4: 0x10654a4: addiu a0, a0, 16780
 	ldloc.1
-	ldc.i4 16316
+	ldc.i4 16780
 	add
 	stloc.1
-// 0x01065498: 0x1065498: addu  a1, v1, zero
+// 0x010654a8: 0x10654a8: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x0106549c: 0x106549c: addiu a2, zero, 1
+// 0x010654ac: 0x10654ac: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-L_10654a0:
-// 0x010654a0: 0x10654a0: jal   0x105d4ec sw    v1, 264(sp)
+L_10654b0:
+// 0x010654b0: 0x10654b0: jal   0x105d4fc sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4948,12 +4948,12 @@ L_10654a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_fix_line_end_105d4ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_fix_line_end_105d4fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010654a8: 0x10654a8: lw    v1, 264(sp)
+// 0x010654b8: 0x10654b8: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4962,8 +4962,8 @@ L_10654a0:
 	add
 	ldelem.i4
 	stloc 7
-L_10654ac:
-// 0x010654ac: 0x10654ac: lw    v0, 476(s2)
+L_10654bc:
+// 0x010654bc: 0x10654bc: lw    v0, 476(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4972,7 +4972,7 @@ L_10654ac:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010654b0: 0x10654b0: lw    a0, 500(s2)
+// 0x010654c0: 0x10654c0: lw    a0, 500(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4981,88 +4981,88 @@ L_10654ac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010654b4: 0x10654b4: addiu v0, v0, -1
+// 0x010654c4: 0x10654c4: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x010654b8: 0x10654b8: subu  v0, v0, a0
+// 0x010654c8: 0x10654c8: subu  v0, v0, a0
 	ldloc 5
 	ldloc.1
 	sub
 	stloc 5
-// 0x010654bc: 0x10654bc: slt   v0, s1, v0
+// 0x010654cc: 0x10654cc: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x010654c0: 0x10654c0: bne   v0, zero, 0x106551c addiu v0, zero, 1
+// 0x010654d0: 0x10654d0: bne   v0, zero, 0x106552c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_106551c
+	brtrue L_106552c
 // --- basic block ---
-// 0x010654c8: 0x10654c8: beq   s3, zero, 0x10654e0 sll   zero, zero, 0
+// 0x010654d8: 0x10654d8: beq   s3, zero, 0x10654f0 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10654e0
+	brfalse L_10654f0
 // --- basic block ---
-// 0x010654d0: 0x10654d0: lh    v0, 46(s3)
+// 0x010654e0: 0x10654e0: lh    v0, 46(s3)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x010654d4: 0x10654d4: sll   zero, zero, 0
-// 0x010654d8: 0x10654d8: bne   v0, zero, 0x106551c addiu v0, zero, 1
+// 0x010654e4: 0x10654e4: sll   zero, zero, 0
+// 0x010654e8: 0x10654e8: bne   v0, zero, 0x106552c addiu v0, zero, 1
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	brtrue L_106551c
+	brtrue L_106552c
 // --- basic block ---
-L_10654e0:
-// 0x010654e0: 0x10654e0: lb    a0, 50(v1)
+L_10654f0:
+// 0x010654f0: 0x10654f0: lb    a0, 50(v1)
 	ldloc 7
 	ldc.i4.s 50
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010654e4: 0x10654e4: addiu v0, zero, 1
+// 0x010654f4: 0x10654f4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010654e8: 0x10654e8: bne   a0, v0, 0x1065500 lui   a0, 0x70000
+// 0x010654f8: 0x10654f8: bne   a0, v0, 0x1065510 lui   a0, 0x70000
 	ldloc.1
 	ldloc 5
 	ldc.i4 458752
 	stloc.1
-	bne.un L_1065500
+	bne.un L_1065510
 // --- basic block ---
-// 0x010654f0: 0x10654f0: addiu a0, a0, 16324
+// 0x01065500: 0x1065500: addiu a0, a0, 16788
 	ldloc.1
-	ldc.i4 16324
+	ldc.i4 16788
 	add
 	stloc.1
-// 0x010654f4: 0x10654f4: addu  a1, v1, zero
+// 0x01065504: 0x1065504: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x010654f8: 0x10654f8: j	 0x106550c addiu a2, zero, 1
+// 0x01065508: 0x1065508: j	 0x106551c addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-	br L_106550c
+	br L_106551c
 // --- basic block ---
-L_1065500:
-// 0x01065500: 0x1065500: addiu a0, a0, 16324
+L_1065510:
+// 0x01065510: 0x1065510: addiu a0, a0, 16788
 	ldloc.1
-	ldc.i4 16324
+	ldc.i4 16788
 	add
 	stloc.1
-// 0x01065504: 0x1065504: addu  a1, v1, zero
+// 0x01065514: 0x1065514: addu  a1, v1, zero
 	ldloc 7
 	stloc.2
-// 0x01065508: 0x1065508: addu  a2, zero, zero
+// 0x01065518: 0x1065518: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_106550c:
-// 0x0106550c: 0x106550c: jal   0x105d4ec sw    v1, 264(sp)
+L_106551c:
+// 0x0106551c: 0x106551c: jal   0x105d4fc sw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5076,12 +5076,12 @@ L_106550c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl69::navigate_instr_fix_line_end_105d4ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl69::navigate_instr_fix_line_end_105d4fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065514: 0x1065514: lw    v1, 264(sp)
+// 0x01065524: 0x1065524: lw    v1, 264(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5090,17 +5090,17 @@ L_106550c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065518: 0x1065518: addiu v0, zero, 1
+// 0x01065528: 0x1065528: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_106551c:
-// 0x0106551c: 0x106551c: sb    v0, 55(v1)
+L_106552c:
+// 0x0106552c: 0x106552c: sb    v0, 55(v1)
 	ldloc 7
 	ldc.i4.s 55
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01065520: 0x1065520: lw    v0, 488(s2)
+// 0x01065530: 0x1065530: lw    v0, 488(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5109,7 +5109,7 @@ L_106551c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065524: 0x1065524: sw    s1, 16(sp)
+// 0x01065534: 0x1065534: sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5118,12 +5118,12 @@ L_106551c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01065528: 0x1065528: addiu v0, v0, 1
+// 0x01065538: 0x1065538: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0106552c: 0x106552c: sw    v0, 488(s2)
+// 0x0106553c: 0x106553c: sw    v0, 488(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5132,7 +5132,7 @@ L_106551c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065530: 0x1065530: lw    v0, 24(v1)
+// 0x01065540: 0x1065540: lw    v0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5141,10 +5141,10 @@ L_106551c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065534: 0x1065534: lui   a3, 0x10000
+// 0x01065544: 0x1065544: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065538: 0x1065538: sw    v0, 20(sp)
+// 0x01065548: 0x1065548: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5153,27 +5153,27 @@ L_106551c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106553c: 0x106553c: lh    v0, 36(v1)
+// 0x0106554c: 0x106554c: lh    v0, 36(v1)
 	ldloc 7
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065540: 0x1065540: addiu a0, zero, 1
+// 0x01065550: 0x1065550: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065544: 0x1065544: addu  a1, s4, zero
+// 0x01065554: 0x1065554: addu  a1, s4, zero
 	ldloc 14
 	stloc.2
-// 0x01065548: 0x1065548: addiu a2, zero, 421
+// 0x01065558: 0x1065558: addiu a2, zero, 421
 	ldc.i4 421
 	stloc.3
-// 0x0106554c: 0x106554c: addiu a3, a3, 15904
+// 0x0106555c: 0x106555c: addiu a3, a3, 15900
 	ldloc 4
-	ldc.i4 15904
+	ldc.i4 15900
 	add
 	stloc 4
-// 0x01065550: 0x1065550: jal   0x100449c sw    v0, 24(sp)
+// 0x01065560: 0x1065560: jal   0x100449c sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5192,7 +5192,7 @@ L_106551c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065558: 0x1065558: lw    v0, 492(s2)
+// 0x01065568: 0x1065568: lw    v0, 492(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5201,17 +5201,17 @@ L_106551c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106555c: 0x106555c: sll   zero, zero, 0
-// 0x01065560: 0x1065560: bne   s1, v0, 0x106556c addiu v0, s1, 1
+// 0x0106556c: 0x106556c: sll   zero, zero, 0
+// 0x01065570: 0x1065570: bne   s1, v0, 0x106557c addiu v0, s1, 1
 	ldloc 9
 	ldloc 5
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 5
-	bne.un L_106556c
+	bne.un L_106557c
 // --- basic block ---
-// 0x01065568: 0x1065568: sw    v0, 492(s2)
+// 0x01065578: 0x1065578: sw    v0, 492(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5220,31 +5220,31 @@ L_106551c:
 	add
 	ldloc 5
 	stelem.i4
-L_106556c:
-// 0x0106556c: 0x106556c: addiu s1, s1, 1
+L_106557c:
+// 0x0106557c: 0x106557c: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1065570:
-// 0x01065570: 0x1065570: addiu s0, s0, 56
+L_1065580:
+// 0x01065580: 0x1065580: addiu s0, s0, 56
 	ldloc 11
 	ldc.i4.s 56
 	add
 	stloc 11
-L_1065574:
-// 0x01065574: 0x1065574: slt   v0, s1, s6
+L_1065584:
+// 0x01065584: 0x1065584: slt   v0, s1, s6
 	ldloc 9
 	ldloc 17
 	clt
 	stloc 5
-// 0x01065578: 0x1065578: bne   v0, zero, 0x1064f94 lui   a1, 0x10000
+// 0x01065588: 0x1065588: bne   v0, zero, 0x1064fa4 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1064f94
+	brtrue L_1064fa4
 // --- basic block ---
-// 0x01065580: 0x1065580: lw    v1, 488(s2)
+// 0x01065590: 0x1065590: lw    v1, 488(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5253,7 +5253,7 @@ L_1065574:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065584: 0x1065584: lw    v0, 476(s2)
+// 0x01065594: 0x1065594: lw    v0, 476(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5262,26 +5262,26 @@ L_1065574:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065588: 0x1065588: lui   a3, 0x10000
+// 0x01065598: 0x1065598: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106558c: 0x106558c: addiu a0, zero, 2
+// 0x0106559c: 0x106559c: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01065590: 0x1065590: addiu a1, a1, 13908
+// 0x010655a0: 0x10655a0: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065594: 0x1065594: addiu a3, a3, 15956
+// 0x010655a4: 0x10655a4: addiu a3, a3, 15952
 	ldloc 4
-	ldc.i4 15956
+	ldc.i4 15952
 	add
 	stloc 4
-// 0x01065598: 0x1065598: addiu a2, zero, 428
+// 0x010655a8: 0x10655a8: addiu a2, zero, 428
 	ldc.i4 428
 	stloc.3
-// 0x0106559c: 0x106559c: sw    v1, 16(sp)
+// 0x010655ac: 0x10655ac: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5290,7 +5290,7 @@ L_1065574:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010655a0: 0x10655a0: jal   0x100449c sw    v0, 20(sp)
+// 0x010655b0: 0x10655b0: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5309,7 +5309,7 @@ L_1065574:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010655a8: 0x10655a8: lw    a0, 488(s2)
+// 0x010655b8: 0x10655b8: lw    a0, 488(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5318,7 +5318,7 @@ L_1065574:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010655ac: 0x10655ac: lw    v1, 252(sp)
+// 0x010655bc: 0x10655bc: lw    v1, 252(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5327,17 +5327,17 @@ L_1065574:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010655b0: 0x10655b0: sll   zero, zero, 0
-// 0x010655b4: 0x10655b4: slt   v0, v1, a0
+// 0x010655c0: 0x10655c0: sll   zero, zero, 0
+// 0x010655c4: 0x10655c4: slt   v0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 5
-// 0x010655b8: 0x10655b8: beq   v0, zero, 0x10655e8 sll   zero, zero, 0
+// 0x010655c8: 0x10655c8: beq   v0, zero, 0x10655f8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10655e8
+	brfalse L_10655f8
 // --- basic block ---
-// 0x010655c0: 0x10655c0: lw    v0, 524(s2)
+// 0x010655d0: 0x10655d0: lw    v0, 524(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5346,8 +5346,8 @@ L_1065574:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010655c4: 0x10655c4: sll   zero, zero, 0
-// 0x010655c8: 0x10655c8: lw    v0, 12(v0)
+// 0x010655d4: 0x10655d4: sll   zero, zero, 0
+// 0x010655d8: 0x10655d8: lw    v0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5356,16 +5356,16 @@ L_1065574:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010655cc: 0x10655cc: sll   zero, zero, 0
-// 0x010655d0: 0x10655d0: beq   v0, zero, 0x10655e8 sll   zero, zero, 0
+// 0x010655dc: 0x10655dc: sll   zero, zero, 0
+// 0x010655e0: 0x10655e0: beq   v0, zero, 0x10655f8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10655e8
+	brfalse L_10655f8
 // --- basic block ---
-// 0x010655d8: 0x10655d8: bne   s8, zero, 0x10655e8 sll   zero, zero, 0
+// 0x010655e8: 0x10655e8: bne   s8, zero, 0x10655f8 sll   zero, zero, 0
 	ldloc 19
-	brtrue L_10655e8
+	brtrue L_10655f8
 // --- basic block ---
-// 0x010655e0: 0x10655e0: jalr  v0 sll   zero, zero, 0
+// 0x010655f0: 0x10655f0: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5377,8 +5377,8 @@ L_1065574:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10655e8:
-// 0x010655e8: 0x10655e8: lw    a0, 248(sp)
+L_10655f8:
+// 0x010655f8: 0x10655f8: lw    a0, 248(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5387,24 +5387,24 @@ L_10655e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010655ec: 0x10655ec: sll   zero, zero, 0
-// 0x010655f0: 0x10655f0: beq   a0, zero, 0x1065618 lui   v0, 0x70000
+// 0x010655fc: 0x10655fc: sll   zero, zero, 0
+// 0x01065600: 0x1065600: beq   a0, zero, 0x1065628 lui   v0, 0x70000
 	ldloc.1
 	ldc.i4 458752
 	stloc 5
-	brfalse L_1065618
+	brfalse L_1065628
 // --- basic block ---
-// 0x010655f8: 0x10655f8: lw    v0, 16332(v0)
+// 0x01065608: 0x1065608: lw    v0, 16796(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4083
+	ldc.i4 4199
 	add
 	ldelem.i4
 	stloc 5
-// 0x010655fc: 0x10655fc: sll   zero, zero, 0
-// 0x01065600: 0x1065600: lw    v0, 20(v0)
+// 0x0106560c: 0x106560c: sll   zero, zero, 0
+// 0x01065610: 0x1065610: lw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5413,12 +5413,12 @@ L_10655e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065604: 0x1065604: sll   zero, zero, 0
-// 0x01065608: 0x1065608: beq   v0, zero, 0x1065618 sll   zero, zero, 0
+// 0x01065614: 0x1065614: sll   zero, zero, 0
+// 0x01065618: 0x1065618: beq   v0, zero, 0x1065628 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1065618
+	brfalse L_1065628
 // --- basic block ---
-// 0x01065610: 0x1065610: jalr  v0 sll   zero, zero, 0
+// 0x01065620: 0x1065620: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5430,9 +5430,9 @@ L_10655e8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1065618:
-// 0x01065618: 0x1065618: lw    ra, 308(sp)
-// 0x0106561c: 0x106561c: lw    s8, 304(sp)
+L_1065628:
+// 0x01065628: 0x1065628: lw    ra, 308(sp)
+// 0x0106562c: 0x106562c: lw    s8, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5441,7 +5441,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01065620: 0x1065620: lw    s7, 300(sp)
+// 0x01065630: 0x1065630: lw    s7, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5450,7 +5450,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01065624: 0x1065624: lw    s6, 296(sp)
+// 0x01065634: 0x1065634: lw    s6, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5459,7 +5459,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01065628: 0x1065628: lw    s5, 292(sp)
+// 0x01065638: 0x1065638: lw    s5, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5468,7 +5468,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0106562c: 0x106562c: lw    s4, 288(sp)
+// 0x0106563c: 0x106563c: lw    s4, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5477,7 +5477,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01065630: 0x1065630: lw    s3, 284(sp)
+// 0x01065640: 0x1065640: lw    s3, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5486,7 +5486,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01065634: 0x1065634: lw    s2, 280(sp)
+// 0x01065644: 0x1065644: lw    s2, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5495,7 +5495,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01065638: 0x1065638: lw    s1, 276(sp)
+// 0x01065648: 0x1065648: lw    s1, 276(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5504,7 +5504,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106563c: 0x106563c: lw    s0, 272(sp)
+// 0x0106564c: 0x106564c: lw    s0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5513,7 +5513,7 @@ L_1065618:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01065640: 0x1065640: jr    ra addiu sp, sp, 312
+// 0x01065650: 0x1065650: jr    ra addiu sp, sp, 312
 	ldloc.0
 	ldc.i4 312
 	add
@@ -5525,7 +5525,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_route_segments_1065648(int32,int32,int32,int32,int32)
+.method public static int32 on_route_segments_1065658(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s0,int32 s1,int32 s2,int32 s5,int32 lo,int32 s6,int32 s4,int32 t1,int32 s8,int32 t0,int32 t3,int32 s7,int32 t2,int32 ra)
@@ -5602,16 +5602,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1065648:
-// 0x01065648: 0x1065648: addiu sp, sp, -128
+L_1065658:
+// 0x01065658: 0x1065658: addiu sp, sp, -128
 	ldloc.0
 	ldc.i4.s -128
 	add
 	stloc.0
-// 0x0106564c: 0x106564c: addiu v0, zero, 18
+// 0x0106565c: 0x106565c: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 5
-// 0x01065650: 0x1065650: sw    a0, 128(sp)
+// 0x01065660: 0x1065660: sw    a0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5620,22 +5620,22 @@ L_1065648:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01065654: 0x1065654: sw    v0, 0(a3)
+// 0x01065664: 0x1065664: sw    v0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01065658: 0x1065658: addiu a0, sp, 128
+// 0x01065668: 0x1065668: addiu a0, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
 	stloc.1
-// 0x0106565c: 0x106565c: addu  a1, a3, zero
+// 0x0106566c: 0x106566c: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01065660: 0x1065660: sw    s6, 112(sp)
+// 0x01065670: 0x1065670: sw    s6, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5644,8 +5644,8 @@ L_1065648:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01065664: 0x1065664: sw    ra, 124(sp)
-// 0x01065668: 0x1065668: sw    s8, 120(sp)
+// 0x01065674: 0x1065674: sw    ra, 124(sp)
+// 0x01065678: 0x1065678: sw    s8, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5654,7 +5654,7 @@ L_1065648:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0106566c: 0x106566c: sw    s7, 116(sp)
+// 0x0106567c: 0x106567c: sw    s7, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5663,7 +5663,7 @@ L_1065648:
 	add
 	ldloc 20
 	stelem.i4
-// 0x01065670: 0x1065670: sw    s5, 108(sp)
+// 0x01065680: 0x1065680: sw    s5, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5672,7 +5672,7 @@ L_1065648:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01065674: 0x1065674: sw    s4, 104(sp)
+// 0x01065684: 0x1065684: sw    s4, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5681,7 +5681,7 @@ L_1065648:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01065678: 0x1065678: sw    s3, 100(sp)
+// 0x01065688: 0x1065688: sw    s3, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5690,7 +5690,7 @@ L_1065648:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0106567c: 0x106567c: sw    s2, 96(sp)
+// 0x0106568c: 0x106568c: sw    s2, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5699,7 +5699,7 @@ L_1065648:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01065680: 0x1065680: sw    s1, 92(sp)
+// 0x01065690: 0x1065690: sw    s1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5708,7 +5708,7 @@ L_1065648:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01065684: 0x1065684: sw    s0, 88(sp)
+// 0x01065694: 0x1065694: sw    s0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5717,7 +5717,7 @@ L_1065648:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01065688: 0x1065688: jal   0x1063ae8 addu  s6, a3, zero
+// 0x01065698: 0x1065698: jal   0x1063af8 addu  s6, a3, zero
 	ldloc 4
 	stloc 14
 	ldloc.0
@@ -5725,20 +5725,20 @@ L_1065648:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::verify_route_id_1063ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::verify_route_id_1063af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065690: 0x1065690: bne   v0, zero, 0x10656a4 addiu a0, sp, 128
+// 0x010656a0: 0x10656a0: bne   v0, zero, 0x10656b4 addiu a0, sp, 128
 	ldloc 5
 	ldloc.0
 	ldc.i4 128
 	add
 	stloc.1
-	brtrue L_10656a4
+	brtrue L_10656b4
 // --- basic block ---
-// 0x01065698: 0x1065698: lw    v0, 128(sp)
+// 0x010656a8: 0x10656a8: lw    v0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5747,11 +5747,11 @@ L_1065648:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106569c: 0x106569c: j	 0x1066134 sll   zero, zero, 0
-	br L_1066134
+// 0x010656ac: 0x10656ac: j	 0x1066144 sll   zero, zero, 0
+	br L_1066144
 // --- basic block ---
-L_10656a4:
-// 0x010656a4: 0x10656a4: jal   0x1063d88 addu  a1, s6, zero
+L_10656b4:
+// 0x010656b4: 0x10656b4: jal   0x1063d98 addu  a1, s6, zero
 	ldloc 14
 	stloc.2
 	ldloc.0
@@ -5759,12 +5759,12 @@ L_10656a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::verify_alt_id_1063d88(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::verify_alt_id_1063d98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010656ac: 0x10656ac: lw    a0, 128(sp)
+// 0x010656bc: 0x10656bc: lw    a0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5773,36 +5773,36 @@ L_10656a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010656b0: 0x10656b0: addu  s0, v0, zero
+// 0x010656c0: 0x10656c0: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x010656b4: 0x10656b4: bltz  s0, 0x1066134 addu  v0, a0, zero
+// 0x010656c4: 0x10656c4: bltz  s0, 0x1066144 addu  v0, a0, zero
 	ldloc 9
 	ldloc.1
 	stloc 5
 	ldc.i4.s 0
-	blt L_1066134
+	blt L_1066144
 // --- basic block ---
-// 0x010656bc: 0x10656bc: lui   s2, 0x0
+// 0x010656cc: 0x10656cc: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x010656c0: 0x10656c0: addiu s1, zero, 1
+// 0x010656d0: 0x10656d0: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x010656c4: 0x10656c4: addiu a1, s2, 28076
+// 0x010656d4: 0x10656d4: addiu a1, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010656c8: 0x10656c8: addu  a2, zero, zero
+// 0x010656d8: 0x10656d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010656cc: 0x10656cc: addiu a3, sp, 48
+// 0x010656dc: 0x10656dc: addiu a3, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 4
-// 0x010656d0: 0x10656d0: jal   0x106855c sw    s1, 16(sp)
+// 0x010656e0: 0x10656e0: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5816,12 +5816,12 @@ L_10656a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010656d8: 0x10656d8: bne   v0, zero, 0x10656fc sw    v0, 128(sp)
+// 0x010656e8: 0x10656e8: bne   v0, zero, 0x106570c sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5831,50 +5831,50 @@ L_10656a4:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10656fc
+	brtrue L_106570c
 // --- basic block ---
-// 0x010656e0: 0x10656e0: lui   a1, 0x10000
+// 0x010656f0: 0x10656f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010656e4: 0x10656e4: lui   a3, 0x10000
+// 0x010656f4: 0x10656f4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010656e8: 0x10656e8: addiu a1, a1, 13908
+// 0x010656f8: 0x10656f8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010656ec: 0x10656ec: addiu a3, a3, 15988
+// 0x010656fc: 0x10656fc: addiu a3, a3, 15984
 	ldloc 4
-	ldc.i4 15988
+	ldc.i4 15984
 	add
 	stloc 4
-// 0x010656f0: 0x10656f0: addiu a0, zero, 4
+// 0x01065700: 0x1065700: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010656f4: 0x10656f4: j	 0x1065734 addiu a2, zero, 1061
+// 0x01065704: 0x1065704: j	 0x1065744 addiu a2, zero, 1061
 	ldc.i4 1061
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_10656fc:
-// 0x010656fc: 0x10656fc: addu  a0, v0, zero
+L_106570c:
+// 0x0106570c: 0x106570c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01065700: 0x1065700: addiu a1, s2, 28076
+// 0x01065710: 0x1065710: addiu a1, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01065704: 0x1065704: addu  a2, zero, zero
+// 0x01065714: 0x1065714: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01065708: 0x1065708: addiu a3, sp, 52
+// 0x01065718: 0x1065718: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x0106570c: 0x106570c: jal   0x106855c sw    s1, 16(sp)
+// 0x0106571c: 0x106571c: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5888,12 +5888,12 @@ L_10656fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065714: 0x1065714: bne   v0, zero, 0x1065744 sw    v0, 128(sp)
+// 0x01065724: 0x1065724: bne   v0, zero, 0x1065754 sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5903,32 +5903,32 @@ L_10656fc:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065744
+	brtrue L_1065754
 // --- basic block ---
-// 0x0106571c: 0x106571c: lui   a1, 0x10000
+// 0x0106572c: 0x106572c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065720: 0x1065720: lui   a3, 0x10000
+// 0x01065730: 0x1065730: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065724: 0x1065724: addiu a1, a1, 13908
+// 0x01065734: 0x1065734: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065728: 0x1065728: addiu a3, a3, 16036
+// 0x01065738: 0x1065738: addiu a3, a3, 16032
 	ldloc 4
-	ldc.i4 16036
+	ldc.i4 16032
 	add
 	stloc 4
-// 0x0106572c: 0x106572c: addiu a0, zero, 4
+// 0x0106573c: 0x106573c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065730: 0x1065730: addiu a2, zero, 1073
+// 0x01065740: 0x1065740: addiu a2, zero, 1073
 	ldc.i4 1073
 	stloc.3
-L_1065734:
-// 0x01065734: 0x1065734: jal   0x100449c sll   zero, zero, 0
+L_1065744:
+// 0x01065744: 0x1065744: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5939,29 +5939,29 @@ L_1065734:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106573c: 0x106573c: j	 0x1066134 addu  v0, zero, zero
+// 0x0106574c: 0x106574c: j	 0x1066144 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1066134
+	br L_1066144
 // --- basic block ---
-L_1065744:
-// 0x01065744: 0x1065744: addu  a0, v0, zero
+L_1065754:
+// 0x01065754: 0x1065754: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01065748: 0x1065748: addiu a1, s2, 28076
+// 0x01065758: 0x1065758: addiu a1, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0106574c: 0x106574c: addu  a2, zero, zero
+// 0x0106575c: 0x106575c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01065750: 0x1065750: addiu a3, sp, 56
+// 0x01065760: 0x1065760: addiu a3, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc 4
-// 0x01065754: 0x1065754: jal   0x106855c sw    s1, 16(sp)
+// 0x01065764: 0x1065764: jal   0x106856c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5975,12 +5975,12 @@ L_1065744:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106575c: 0x106575c: bne   v0, zero, 0x1065780 sw    v0, 128(sp)
+// 0x0106576c: 0x106576c: bne   v0, zero, 0x1065790 sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5990,42 +5990,42 @@ L_1065744:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065780
+	brtrue L_1065790
 // --- basic block ---
-// 0x01065764: 0x1065764: lui   a1, 0x10000
+// 0x01065774: 0x1065774: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065768: 0x1065768: lui   a3, 0x10000
+// 0x01065778: 0x1065778: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106576c: 0x106576c: addiu a1, a1, 13908
+// 0x0106577c: 0x106577c: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065770: 0x1065770: addiu a3, a3, 16088
+// 0x01065780: 0x1065780: addiu a3, a3, 16084
 	ldloc 4
-	ldc.i4 16088
+	ldc.i4 16084
 	add
 	stloc 4
-// 0x01065774: 0x1065774: addiu a0, zero, 4
+// 0x01065784: 0x1065784: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065778: 0x1065778: j	 0x1065734 addiu a2, zero, 1085
+// 0x01065788: 0x1065788: j	 0x1065744 addiu a2, zero, 1085
 	ldc.i4 1085
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065780:
-// 0x01065780: 0x1065780: lui   s1, 0x70000
+L_1065790:
+// 0x01065790: 0x1065790: lui   s1, 0x70000
 	ldc.i4 458752
 	stloc 10
-// 0x01065784: 0x1065784: addiu s1, s1, 15808
+// 0x01065794: 0x1065794: addiu s1, s1, 16272
 	ldloc 10
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 10
-// 0x01065788: 0x1065788: lw    v0, 504(s1)
+// 0x01065798: 0x1065798: lw    v0, 504(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6034,33 +6034,33 @@ L_1065780:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106578c: 0x106578c: sll   zero, zero, 0
-// 0x01065790: 0x1065790: bne   v0, zero, 0x1065f40 addiu s2, zero, 44
+// 0x0106579c: 0x106579c: sll   zero, zero, 0
+// 0x010657a0: 0x10657a0: bne   v0, zero, 0x1065f50 addiu s2, zero, 44
 	ldloc 5
 	ldc.i4.s 44
 	stloc 11
-	brtrue L_1065f40
+	brtrue L_1065f50
 // --- basic block ---
-// 0x01065798: 0x1065798: addiu v0, zero, 44
+// 0x010657a8: 0x10657a8: addiu v0, zero, 44
 	ldc.i4.s 44
 	stloc 5
-// 0x0106579c: 0x106579c: mult  s0, v0
+// 0x010657ac: 0x10657ac: mult  s0, v0
 	ldloc 9
 	ldloc 5
 	mul
 	stloc 13
-// 0x010657a0: 0x10657a0: addiu a2, zero, 56
+// 0x010657b0: 0x10657b0: addiu a2, zero, 56
 	ldc.i4.s 56
 	stloc.3
-// 0x010657a4: 0x10657a4: mflo  lo
+// 0x010657b4: 0x10657b4: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x010657a8: 0x10657a8: addu  v0, s1, v0
+// 0x010657b8: 0x10657b8: addu  v0, s1, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc 5
-// 0x010657ac: 0x10657ac: lw    v0, 48(v0)
+// 0x010657bc: 0x10657bc: lw    v0, 48(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6069,13 +6069,13 @@ L_1065780:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010657b0: 0x10657b0: sll   zero, zero, 0
-// 0x010657b4: 0x10657b4: mult  v0, a2
+// 0x010657c0: 0x10657c0: sll   zero, zero, 0
+// 0x010657c4: 0x10657c4: mult  v0, a2
 	ldloc 5
 	ldloc.3
 	mul
 	stloc 13
-// 0x010657b8: 0x10657b8: sw    v0, 476(s1)
+// 0x010657c8: 0x10657c8: sw    v0, 476(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6084,13 +6084,13 @@ L_1065780:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010657bc: 0x10657bc: mflo  lo
+// 0x010657cc: 0x10657cc: mflo  lo
 	ldloc 13
 	stloc.3
-// 0x010657c0: 0x10657c0: mflo  lo
+// 0x010657d0: 0x10657d0: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x010657c4: 0x10657c4: jal   0x1000910 sw    a2, 72(sp)
+// 0x010657d4: 0x10657d4: jal   0x1000910 sw    a2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6109,7 +6109,7 @@ L_1065780:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010657cc: 0x10657cc: lw    a2, 72(sp)
+// 0x010657dc: 0x10657dc: lw    a2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6118,13 +6118,13 @@ L_1065780:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010657d0: 0x10657d0: addu  s2, v0, zero
+// 0x010657e0: 0x10657e0: addu  s2, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010657d4: 0x10657d4: addu  a0, v0, zero
+// 0x010657e4: 0x10657e4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010657d8: 0x10657d8: jal   0x100177c addu  a1, zero, zero
+// 0x010657e8: 0x10657e8: jal   0x100177c addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
@@ -6136,7 +6136,7 @@ L_1065780:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010657e0: 0x10657e0: j	 0x1065f3c sw    s2, 504(s1)
+// 0x010657f0: 0x10657f0: j	 0x1065f4c sw    s2, 504(s1)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6145,10 +6145,10 @@ L_1065780:
 	add
 	ldloc 11
 	stelem.i4
-	br L_1065f3c
+	br L_1065f4c
 // --- basic block ---
-L_10657e8:
-// 0x010657e8: 0x10657e8: lw    v0, 480(s7)
+L_10657f8:
+// 0x010657f8: 0x10657f8: lw    v0, 480(s7)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
@@ -6157,7 +6157,7 @@ L_10657e8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010657ec: 0x10657ec: lw    a0, 476(s7)
+// 0x010657fc: 0x10657fc: lw    a0, 476(s7)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
@@ -6166,7 +6166,7 @@ L_10657e8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010657f0: 0x10657f0: lw    v1, 504(s7)
+// 0x01065800: 0x1065800: lw    v1, 504(s7)
 	ldloc 6
 	ldloc 20
 	ldc.i4.2
@@ -6175,48 +6175,48 @@ L_10657e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010657f4: 0x10657f4: slt   a0, v0, a0
+// 0x01065804: 0x1065804: slt   a0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.1
-// 0x010657f8: 0x10657f8: bne   a0, zero, 0x106581c addiu s3, zero, 56
+// 0x01065808: 0x1065808: bne   a0, zero, 0x106582c addiu s3, zero, 56
 	ldloc.1
 	ldc.i4.s 56
 	stloc 8
-	brtrue L_106581c
+	brtrue L_106582c
 // --- basic block ---
-// 0x01065800: 0x1065800: lui   a1, 0x10000
+// 0x01065810: 0x1065810: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065804: 0x1065804: lui   a3, 0x10000
+// 0x01065814: 0x1065814: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065808: 0x1065808: addiu a1, a1, 13908
+// 0x01065818: 0x1065818: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x0106580c: 0x106580c: addiu a3, a3, 16140
+// 0x0106581c: 0x106581c: addiu a3, a3, 16136
 	ldloc 4
-	ldc.i4 16140
+	ldc.i4 16136
 	add
 	stloc 4
-// 0x01065810: 0x1065810: addiu a0, zero, 4
+// 0x01065820: 0x1065820: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065814: 0x1065814: j	 0x1065734 addiu a2, zero, 1105
+// 0x01065824: 0x1065824: j	 0x1065744 addiu a2, zero, 1105
 	ldc.i4 1105
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_106581c:
-// 0x0106581c: 0x106581c: mult  v0, s3
+L_106582c:
+// 0x0106582c: 0x106582c: mult  v0, s3
 	ldloc 5
 	ldloc 8
 	mul
 	stloc 13
-// 0x01065820: 0x1065820: lw    v0, 68(sp)
+// 0x01065830: 0x1065830: lw    v0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6225,8 +6225,8 @@ L_106581c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065824: 0x1065824: sll   zero, zero, 0
-// 0x01065828: 0x1065828: lw    a0, 60(v0)
+// 0x01065834: 0x1065834: sll   zero, zero, 0
+// 0x01065838: 0x1065838: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6235,7 +6235,7 @@ L_106581c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106582c: 0x106582c: lw    v0, 48(sp)
+// 0x0106583c: 0x106583c: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6244,25 +6244,25 @@ L_106581c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065830: 0x1065830: mflo  lo
+// 0x01065840: 0x1065840: mflo  lo
 	ldloc 13
 	stloc 8
-// 0x01065834: 0x1065834: addu  s3, v1, s3
+// 0x01065844: 0x1065844: addu  s3, v1, s3
 	ldloc 7
 	ldloc 8
 	add
 	stloc 8
-// 0x01065838: 0x1065838: addiu v1, zero, 2
+// 0x01065848: 0x1065848: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0106583c: 0x106583c: beq   a0, v1, 0x106584c addu  s5, zero, zero
+// 0x0106584c: 0x106584c: beq   a0, v1, 0x106585c addu  s5, zero, zero
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 0
 	stloc 12
-	beq  L_106584c
+	beq  L_106585c
 // --- basic block ---
-// 0x01065844: 0x1065844: j	 0x106587c sw    v0, 24(s3)
+// 0x01065854: 0x1065854: j	 0x106588c sw    v0, 24(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6271,10 +6271,10 @@ L_106581c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_106587c
+	br L_106588c
 // --- basic block ---
-L_106584c:
-// 0x0106584c: 0x106584c: lw    v1, 24(s3)
+L_106585c:
+// 0x0106585c: 0x106585c: lw    v1, 24(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6283,31 +6283,31 @@ L_106584c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065850: 0x1065850: sll   zero, zero, 0
-// 0x01065854: 0x1065854: beq   v1, v0, 0x106587c lui   a3, 0x10000
+// 0x01065860: 0x1065860: sll   zero, zero, 0
+// 0x01065864: 0x1065864: beq   v1, v0, 0x106588c lui   a3, 0x10000
 	ldloc 7
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	beq  L_106587c
+	beq  L_106588c
 // --- basic block ---
-// 0x0106585c: 0x106585c: addiu a0, zero, 4
+// 0x0106586c: 0x106586c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065860: 0x1065860: addiu a1, s1, 13908
+// 0x01065870: 0x1065870: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065864: 0x1065864: addiu a2, zero, 1114
+// 0x01065874: 0x1065874: addiu a2, zero, 1114
 	ldc.i4 1114
 	stloc.3
-// 0x01065868: 0x1065868: addiu a3, a3, 16180
+// 0x01065878: 0x1065878: addiu a3, a3, 16176
 	ldloc 4
-	ldc.i4 16180
+	ldc.i4 16176
 	add
 	stloc 4
-// 0x0106586c: 0x106586c: sw    v1, 16(sp)
+// 0x0106587c: 0x106587c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6316,7 +6316,7 @@ L_106584c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01065870: 0x1065870: sw    v0, 20(sp)
+// 0x01065880: 0x1065880: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6325,7 +6325,7 @@ L_106584c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065874: 0x1065874: jal   0x100449c addiu s5, zero, 1
+// 0x01065884: 0x1065884: jal   0x100449c addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
 	ldloc.0
@@ -6338,13 +6338,13 @@ L_106584c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106587c:
-// 0x0106587c: 0x106587c: addu  v0, s0, s2
+L_106588c:
+// 0x0106588c: 0x106588c: addu  v0, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 5
-// 0x01065880: 0x1065880: lw    a0, 60(v0)
+// 0x01065890: 0x1065890: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6353,10 +6353,10 @@ L_106587c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065884: 0x1065884: addiu v1, zero, 2
+// 0x01065894: 0x1065894: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01065888: 0x1065888: lw    v0, 52(sp)
+// 0x01065898: 0x1065898: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6365,12 +6365,12 @@ L_106587c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106588c: 0x106588c: beq   a0, v1, 0x106589c sll   zero, zero, 0
+// 0x0106589c: 0x106589c: beq   a0, v1, 0x10658ac sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_106589c
+	beq  L_10658ac
 // --- basic block ---
-// 0x01065894: 0x1065894: j	 0x10658d0 sw    v0, 28(s3)
+// 0x010658a4: 0x10658a4: j	 0x10658e0 sw    v0, 28(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6379,10 +6379,10 @@ L_106587c:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10658d0
+	br L_10658e0
 // --- basic block ---
-L_106589c:
-// 0x0106589c: 0x106589c: lw    v1, 28(s3)
+L_10658ac:
+// 0x010658ac: 0x10658ac: lw    v1, 28(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6391,35 +6391,35 @@ L_106589c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010658a0: 0x10658a0: sll   zero, zero, 0
-// 0x010658a4: 0x10658a4: beq   v1, v0, 0x10658d0 sll   zero, zero, 0
+// 0x010658b0: 0x10658b0: sll   zero, zero, 0
+// 0x010658b4: 0x10658b4: beq   v1, v0, 0x10658e0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_10658d0
+	beq  L_10658e0
 // --- basic block ---
-// 0x010658ac: 0x10658ac: bne   s5, zero, 0x10658d0 lui   a3, 0x10000
+// 0x010658bc: 0x10658bc: bne   s5, zero, 0x10658e0 lui   a3, 0x10000
 	ldloc 12
 	ldc.i4 65536
 	stloc 4
-	brtrue L_10658d0
+	brtrue L_10658e0
 // --- basic block ---
-// 0x010658b4: 0x10658b4: addiu a0, zero, 4
+// 0x010658c4: 0x10658c4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010658b8: 0x10658b8: addiu a1, s1, 13908
+// 0x010658c8: 0x10658c8: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010658bc: 0x10658bc: addiu a2, zero, 1121
+// 0x010658cc: 0x10658cc: addiu a2, zero, 1121
 	ldc.i4 1121
 	stloc.3
-// 0x010658c0: 0x10658c0: addiu a3, a3, 16236
+// 0x010658d0: 0x10658d0: addiu a3, a3, 16232
 	ldloc 4
-	ldc.i4 16236
+	ldc.i4 16232
 	add
 	stloc 4
-// 0x010658c4: 0x10658c4: sw    v1, 16(sp)
+// 0x010658d4: 0x10658d4: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6428,7 +6428,7 @@ L_106589c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010658c8: 0x10658c8: jal   0x100449c sw    v0, 20(sp)
+// 0x010658d8: 0x10658d8: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6447,8 +6447,8 @@ L_106589c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10658d0:
-// 0x010658d0: 0x10658d0: lw    a0, 128(sp)
+L_10658e0:
+// 0x010658e0: 0x10658e0: lw    a0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6457,21 +6457,21 @@ L_10658d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010658d4: 0x10658d4: addiu v0, zero, 1
+// 0x010658e4: 0x10658e4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010658d8: 0x10658d8: addu  a1, s4, zero
+// 0x010658e8: 0x10658e8: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x010658dc: 0x10658dc: addu  a2, zero, zero
+// 0x010658ec: 0x10658ec: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010658e0: 0x10658e0: addiu a3, sp, 60
+// 0x010658f0: 0x10658f0: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x010658e4: 0x10658e4: jal   0x106855c sw    v0, 16(sp)
+// 0x010658f4: 0x10658f4: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6485,12 +6485,12 @@ L_10658d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010658ec: 0x10658ec: bne   v0, zero, 0x1065910 sw    v0, 128(sp)
+// 0x010658fc: 0x10658fc: bne   v0, zero, 0x1065920 sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6500,39 +6500,39 @@ L_10658d0:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065910
+	brtrue L_1065920
 // --- basic block ---
-// 0x010658f4: 0x10658f4: lui   a1, 0x10000
+// 0x01065904: 0x1065904: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010658f8: 0x10658f8: lui   a3, 0x10000
+// 0x01065908: 0x1065908: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010658fc: 0x10658fc: addiu a1, a1, 13908
+// 0x0106590c: 0x106590c: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065900: 0x1065900: addiu a3, a3, 16296
+// 0x01065910: 0x1065910: addiu a3, a3, 16292
 	ldloc 4
-	ldc.i4 16296
+	ldc.i4 16292
 	add
 	stloc 4
-// 0x01065904: 0x1065904: addiu a0, zero, 4
+// 0x01065914: 0x1065914: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065908: 0x1065908: j	 0x1065734 addiu a2, zero, 1133
+// 0x01065918: 0x1065918: j	 0x1065744 addiu a2, zero, 1133
 	ldc.i4 1133
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065910:
-// 0x01065910: 0x1065910: addu  v0, s0, s2
+L_1065920:
+// 0x01065920: 0x1065920: addu  v0, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 5
-// 0x01065914: 0x1065914: lw    a0, 60(v0)
+// 0x01065924: 0x1065924: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6541,10 +6541,10 @@ L_1065910:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065918: 0x1065918: addiu v1, zero, 2
+// 0x01065928: 0x1065928: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0106591c: 0x106591c: lw    v0, 60(sp)
+// 0x0106592c: 0x106592c: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6553,58 +6553,58 @@ L_1065910:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065920: 0x1065920: beq   a0, v1, 0x1065930 sll   zero, zero, 0
+// 0x01065930: 0x1065930: beq   a0, v1, 0x1065940 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_1065930
+	beq  L_1065940
 // --- basic block ---
-// 0x01065928: 0x1065928: j	 0x106596c sh    v0, 36(s3)
+// 0x01065938: 0x1065938: j	 0x106597c sh    v0, 36(s3)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_106596c
+	br L_106597c
 // --- basic block ---
-L_1065930:
-// 0x01065930: 0x1065930: lh    v1, 36(s3)
+L_1065940:
+// 0x01065940: 0x1065940: lh    v1, 36(s3)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 7
-// 0x01065934: 0x1065934: sll   zero, zero, 0
-// 0x01065938: 0x1065938: beq   v0, v1, 0x106596c sll   zero, zero, 0
+// 0x01065944: 0x1065944: sll   zero, zero, 0
+// 0x01065948: 0x1065948: beq   v0, v1, 0x106597c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_106596c
+	beq  L_106597c
 // --- basic block ---
-// 0x01065940: 0x1065940: bne   s5, zero, 0x106596c addiu s5, zero, 1
+// 0x01065950: 0x1065950: bne   s5, zero, 0x106597c addiu s5, zero, 1
 	ldloc 12
 	ldc.i4.1
 	stloc 12
-	brtrue L_106596c
+	brtrue L_106597c
 // --- basic block ---
-// 0x01065948: 0x1065948: lui   a3, 0x10000
+// 0x01065958: 0x1065958: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106594c: 0x106594c: addiu a0, zero, 4
+// 0x0106595c: 0x106595c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065950: 0x1065950: addiu a1, s1, 13908
+// 0x01065960: 0x1065960: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065954: 0x1065954: addiu a2, zero, 1139
+// 0x01065964: 0x1065964: addiu a2, zero, 1139
 	ldc.i4 1139
 	stloc.3
-// 0x01065958: 0x1065958: addiu a3, a3, 16348
+// 0x01065968: 0x1065968: addiu a3, a3, 16344
 	ldloc 4
-	ldc.i4 16348
+	ldc.i4 16344
 	add
 	stloc 4
-// 0x0106595c: 0x106595c: sw    v1, 16(sp)
+// 0x0106596c: 0x106596c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6613,7 +6613,7 @@ L_1065930:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01065960: 0x1065960: jal   0x100449c sw    v0, 20(sp)
+// 0x01065970: 0x1065970: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6632,11 +6632,11 @@ L_1065930:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065968: 0x1065968: addiu s5, zero, 1
+// 0x01065978: 0x1065978: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
-L_106596c:
-// 0x0106596c: 0x106596c: lw    v0, 56(sp)
+L_106597c:
+// 0x0106597c: 0x106597c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6645,13 +6645,13 @@ L_106596c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065970: 0x1065970: sll   zero, zero, 0
-// 0x01065974: 0x1065974: addiu v0, v0, -1
+// 0x01065980: 0x1065980: sll   zero, zero, 0
+// 0x01065984: 0x1065984: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01065978: 0x1065978: bne   v0, zero, 0x106599c sw    v0, 56(sp)
+// 0x01065988: 0x1065988: bne   v0, zero, 0x10659ac sw    v0, 56(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6661,34 +6661,34 @@ L_106596c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_106599c
+	brtrue L_10659ac
 // --- basic block ---
-// 0x01065980: 0x1065980: lui   a1, 0x10000
+// 0x01065990: 0x1065990: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065984: 0x1065984: lui   a3, 0x10000
+// 0x01065994: 0x1065994: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065988: 0x1065988: addiu a1, a1, 13908
+// 0x01065998: 0x1065998: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x0106598c: 0x106598c: addiu a3, a3, 16404
+// 0x0106599c: 0x106599c: addiu a3, a3, 16400
 	ldloc 4
-	ldc.i4 16404
+	ldc.i4 16400
 	add
 	stloc 4
-// 0x01065990: 0x1065990: addiu a0, zero, 4
+// 0x010659a0: 0x10659a0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065994: 0x1065994: j	 0x1065734 addiu a2, zero, 1146
+// 0x010659a4: 0x10659a4: j	 0x1065744 addiu a2, zero, 1146
 	ldc.i4 1146
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_106599c:
-// 0x0106599c: 0x106599c: lw    a0, 128(sp)
+L_10659ac:
+// 0x010659ac: 0x10659ac: lw    a0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6697,21 +6697,21 @@ L_106599c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010659a0: 0x10659a0: addiu v0, zero, 1
+// 0x010659b0: 0x10659b0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x010659a4: 0x10659a4: addu  a1, s4, zero
+// 0x010659b4: 0x10659b4: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x010659a8: 0x10659a8: addu  a2, zero, zero
+// 0x010659b8: 0x10659b8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010659ac: 0x10659ac: addiu a3, sp, 60
+// 0x010659bc: 0x10659bc: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x010659b0: 0x10659b0: jal   0x106855c sw    v0, 16(sp)
+// 0x010659c0: 0x10659c0: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6725,12 +6725,12 @@ L_106599c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010659b8: 0x10659b8: bne   v0, zero, 0x10659dc sw    v0, 128(sp)
+// 0x010659c8: 0x10659c8: bne   v0, zero, 0x10659ec sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6740,39 +6740,39 @@ L_106599c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_10659dc
+	brtrue L_10659ec
 // --- basic block ---
-// 0x010659c0: 0x10659c0: lui   a1, 0x10000
+// 0x010659d0: 0x10659d0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010659c4: 0x10659c4: lui   a3, 0x10000
+// 0x010659d4: 0x10659d4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010659c8: 0x10659c8: addiu a1, a1, 13908
+// 0x010659d8: 0x10659d8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010659cc: 0x10659cc: addiu a3, a3, 16456
+// 0x010659dc: 0x10659dc: addiu a3, a3, 16452
 	ldloc 4
-	ldc.i4 16456
+	ldc.i4 16452
 	add
 	stloc 4
-// 0x010659d0: 0x10659d0: addiu a0, zero, 4
+// 0x010659e0: 0x10659e0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010659d4: 0x10659d4: j	 0x1065734 addiu a2, zero, 1158
+// 0x010659e4: 0x10659e4: j	 0x1065744 addiu a2, zero, 1158
 	ldc.i4 1158
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_10659dc:
-// 0x010659dc: 0x10659dc: addu  v0, s0, s2
+L_10659ec:
+// 0x010659ec: 0x10659ec: addu  v0, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 5
-// 0x010659e0: 0x10659e0: lw    a0, 60(v0)
+// 0x010659f0: 0x10659f0: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6781,10 +6781,10 @@ L_10659dc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010659e4: 0x10659e4: addiu v1, zero, 2
+// 0x010659f4: 0x10659f4: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x010659e8: 0x10659e8: lw    v0, 60(sp)
+// 0x010659f8: 0x10659f8: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6793,12 +6793,12 @@ L_10659dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010659ec: 0x10659ec: beq   a0, v1, 0x10659fc sll   zero, zero, 0
+// 0x010659fc: 0x10659fc: beq   a0, v1, 0x1065a0c sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_10659fc
+	beq  L_1065a0c
 // --- basic block ---
-// 0x010659f4: 0x10659f4: j	 0x1065a38 sw    v0, 32(s3)
+// 0x01065a04: 0x1065a04: j	 0x1065a48 sw    v0, 32(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6807,10 +6807,10 @@ L_10659dc:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1065a38
+	br L_1065a48
 // --- basic block ---
-L_10659fc:
-// 0x010659fc: 0x10659fc: lw    v1, 32(s3)
+L_1065a0c:
+// 0x01065a0c: 0x1065a0c: lw    v1, 32(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6819,38 +6819,38 @@ L_10659fc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065a00: 0x1065a00: sll   zero, zero, 0
-// 0x01065a04: 0x1065a04: beq   v0, v1, 0x1065a38 sll   zero, zero, 0
+// 0x01065a10: 0x1065a10: sll   zero, zero, 0
+// 0x01065a14: 0x1065a14: beq   v0, v1, 0x1065a48 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_1065a38
+	beq  L_1065a48
 // --- basic block ---
-// 0x01065a0c: 0x1065a0c: bne   s5, zero, 0x1065a38 addiu s5, zero, 1
+// 0x01065a1c: 0x1065a1c: bne   s5, zero, 0x1065a48 addiu s5, zero, 1
 	ldloc 12
 	ldc.i4.1
 	stloc 12
-	brtrue L_1065a38
+	brtrue L_1065a48
 // --- basic block ---
-// 0x01065a14: 0x1065a14: lui   a3, 0x10000
+// 0x01065a24: 0x1065a24: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065a18: 0x1065a18: addiu a0, zero, 4
+// 0x01065a28: 0x1065a28: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065a1c: 0x1065a1c: addiu a1, s1, 13908
+// 0x01065a2c: 0x1065a2c: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065a20: 0x1065a20: addiu a2, zero, 1164
+// 0x01065a30: 0x1065a30: addiu a2, zero, 1164
 	ldc.i4 1164
 	stloc.3
-// 0x01065a24: 0x1065a24: addiu a3, a3, 16508
+// 0x01065a34: 0x1065a34: addiu a3, a3, 16504
 	ldloc 4
-	ldc.i4 16508
+	ldc.i4 16504
 	add
 	stloc 4
-// 0x01065a28: 0x1065a28: sw    v1, 16(sp)
+// 0x01065a38: 0x1065a38: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6859,7 +6859,7 @@ L_10659fc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01065a2c: 0x1065a2c: jal   0x100449c sw    v0, 20(sp)
+// 0x01065a3c: 0x1065a3c: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6878,11 +6878,11 @@ L_10659fc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065a34: 0x1065a34: addiu s5, zero, 1
+// 0x01065a44: 0x1065a44: addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
-L_1065a38:
-// 0x01065a38: 0x1065a38: lw    v0, 56(sp)
+L_1065a48:
+// 0x01065a48: 0x1065a48: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6891,13 +6891,13 @@ L_1065a38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065a3c: 0x1065a3c: sll   zero, zero, 0
-// 0x01065a40: 0x1065a40: addiu v0, v0, -1
+// 0x01065a4c: 0x1065a4c: sll   zero, zero, 0
+// 0x01065a50: 0x1065a50: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01065a44: 0x1065a44: bne   v0, zero, 0x1065a68 sw    v0, 56(sp)
+// 0x01065a54: 0x1065a54: bne   v0, zero, 0x1065a78 sw    v0, 56(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6907,34 +6907,34 @@ L_1065a38:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065a68
+	brtrue L_1065a78
 // --- basic block ---
-// 0x01065a4c: 0x1065a4c: lui   a1, 0x10000
+// 0x01065a5c: 0x1065a5c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065a50: 0x1065a50: lui   a3, 0x10000
+// 0x01065a60: 0x1065a60: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065a54: 0x1065a54: addiu a1, a1, 13908
+// 0x01065a64: 0x1065a64: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065a58: 0x1065a58: addiu a3, a3, 16404
+// 0x01065a68: 0x1065a68: addiu a3, a3, 16400
 	ldloc 4
-	ldc.i4 16404
+	ldc.i4 16400
 	add
 	stloc 4
-// 0x01065a5c: 0x1065a5c: addiu a0, zero, 4
+// 0x01065a6c: 0x1065a6c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065a60: 0x1065a60: j	 0x1065734 addiu a2, zero, 1171
+// 0x01065a70: 0x1065a70: j	 0x1065744 addiu a2, zero, 1171
 	ldc.i4 1171
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065a68:
-// 0x01065a68: 0x1065a68: lw    a0, 128(sp)
+L_1065a78:
+// 0x01065a78: 0x1065a78: lw    a0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6943,21 +6943,21 @@ L_1065a68:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065a6c: 0x1065a6c: addiu v0, zero, 1
+// 0x01065a7c: 0x1065a7c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01065a70: 0x1065a70: addu  a1, s4, zero
+// 0x01065a80: 0x1065a80: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x01065a74: 0x1065a74: addu  a2, zero, zero
+// 0x01065a84: 0x1065a84: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01065a78: 0x1065a78: addiu a3, sp, 60
+// 0x01065a88: 0x1065a88: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x01065a7c: 0x1065a7c: jal   0x106855c sw    v0, 16(sp)
+// 0x01065a8c: 0x1065a8c: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6971,12 +6971,12 @@ L_1065a68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065a84: 0x1065a84: bne   v0, zero, 0x1065aa8 sw    v0, 128(sp)
+// 0x01065a94: 0x1065a94: bne   v0, zero, 0x1065ab8 sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6986,39 +6986,39 @@ L_1065a68:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065aa8
+	brtrue L_1065ab8
 // --- basic block ---
-// 0x01065a8c: 0x1065a8c: lui   a1, 0x10000
+// 0x01065a9c: 0x1065a9c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065a90: 0x1065a90: lui   a3, 0x10000
+// 0x01065aa0: 0x1065aa0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065a94: 0x1065a94: addiu a1, a1, 13908
+// 0x01065aa4: 0x1065aa4: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065a98: 0x1065a98: addiu a3, a3, 16568
+// 0x01065aa8: 0x1065aa8: addiu a3, a3, 16564
 	ldloc 4
-	ldc.i4 16568
+	ldc.i4 16564
 	add
 	stloc 4
-// 0x01065a9c: 0x1065a9c: addiu a0, zero, 4
+// 0x01065aac: 0x1065aac: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065aa0: 0x1065aa0: j	 0x1065734 addiu a2, zero, 1183
+// 0x01065ab0: 0x1065ab0: j	 0x1065744 addiu a2, zero, 1183
 	ldc.i4 1183
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065aa8:
-// 0x01065aa8: 0x1065aa8: addu  v1, s0, s2
+L_1065ab8:
+// 0x01065ab8: 0x1065ab8: addu  v1, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 7
-// 0x01065aac: 0x1065aac: lw    a0, 60(v1)
+// 0x01065abc: 0x1065abc: lw    a0, 60(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7027,17 +7027,17 @@ L_1065aa8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065ab0: 0x1065ab0: addiu v1, zero, 2
+// 0x01065ac0: 0x1065ac0: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01065ab4: 0x1065ab4: beq   a0, v1, 0x1065ac8 addu  s6, zero, zero
+// 0x01065ac4: 0x1065ac4: beq   a0, v1, 0x1065ad8 addu  s6, zero, zero
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 0
 	stloc 14
-	beq  L_1065ac8
+	beq  L_1065ad8
 // --- basic block ---
-// 0x01065abc: 0x1065abc: lw    v1, 60(sp)
+// 0x01065acc: 0x1065acc: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7046,20 +7046,20 @@ L_1065aa8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065ac0: 0x1065ac0: j	 0x1065ad4 sh    v1, 46(s3)
+// 0x01065ad0: 0x1065ad0: j	 0x1065ae4 sh    v1, 46(s3)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_1065ad4
+	br L_1065ae4
 // --- basic block ---
-L_1065ac8:
-// 0x01065ac8: 0x1065ac8: bne   s5, zero, 0x1065ad4 sll   zero, zero, 0
+L_1065ad8:
+// 0x01065ad8: 0x1065ad8: bne   s5, zero, 0x1065ae4 sll   zero, zero, 0
 	ldloc 12
-	brtrue L_1065ad4
+	brtrue L_1065ae4
 // --- basic block ---
-// 0x01065ad0: 0x1065ad0: lw    s6, 60(sp)
+// 0x01065ae0: 0x1065ae0: lw    s6, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7068,8 +7068,8 @@ L_1065ac8:
 	add
 	ldelem.i4
 	stloc 14
-L_1065ad4:
-// 0x01065ad4: 0x1065ad4: lw    v1, 56(sp)
+L_1065ae4:
+// 0x01065ae4: 0x1065ae4: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7078,13 +7078,13 @@ L_1065ad4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065ad8: 0x1065ad8: sll   zero, zero, 0
-// 0x01065adc: 0x1065adc: addiu v1, v1, -1
+// 0x01065ae8: 0x1065ae8: sll   zero, zero, 0
+// 0x01065aec: 0x1065aec: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01065ae0: 0x1065ae0: bne   v1, zero, 0x1065b04 sw    v1, 56(sp)
+// 0x01065af0: 0x1065af0: bne   v1, zero, 0x1065b14 sw    v1, 56(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -7094,51 +7094,51 @@ L_1065ad4:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1065b04
+	brtrue L_1065b14
 // --- basic block ---
-// 0x01065ae8: 0x1065ae8: lui   a1, 0x10000
+// 0x01065af8: 0x1065af8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065aec: 0x1065aec: lui   a3, 0x10000
+// 0x01065afc: 0x1065afc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065af0: 0x1065af0: addiu a1, a1, 13908
+// 0x01065b00: 0x1065b00: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065af4: 0x1065af4: addiu a3, a3, 16404
+// 0x01065b04: 0x1065b04: addiu a3, a3, 16400
 	ldloc 4
-	ldc.i4 16404
+	ldc.i4 16400
 	add
 	stloc 4
-// 0x01065af8: 0x1065af8: addiu a0, zero, 4
+// 0x01065b08: 0x1065b08: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065afc: 0x1065afc: j	 0x1065734 addiu a2, zero, 1194
+// 0x01065b0c: 0x1065b0c: j	 0x1065744 addiu a2, zero, 1194
 	ldc.i4 1194
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065b04:
-// 0x01065b04: 0x1065b04: addu  a0, v0, zero
+L_1065b14:
+// 0x01065b14: 0x1065b14: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01065b08: 0x1065b08: addu  a1, s4, zero
+// 0x01065b18: 0x1065b18: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x01065b0c: 0x1065b0c: addiu v0, zero, 1
+// 0x01065b1c: 0x1065b1c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01065b10: 0x1065b10: addu  a2, zero, zero
+// 0x01065b20: 0x1065b20: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01065b14: 0x1065b14: addiu a3, sp, 60
+// 0x01065b24: 0x1065b24: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x01065b18: 0x1065b18: jal   0x106855c sw    v0, 16(sp)
+// 0x01065b28: 0x1065b28: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7152,12 +7152,12 @@ L_1065b04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065b20: 0x1065b20: bne   v0, zero, 0x1065b44 sw    v0, 128(sp)
+// 0x01065b30: 0x1065b30: bne   v0, zero, 0x1065b54 sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7167,39 +7167,39 @@ L_1065b04:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065b44
+	brtrue L_1065b54
 // --- basic block ---
-// 0x01065b28: 0x1065b28: lui   a1, 0x10000
+// 0x01065b38: 0x1065b38: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065b2c: 0x1065b2c: lui   a3, 0x10000
+// 0x01065b3c: 0x1065b3c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065b30: 0x1065b30: addiu a1, a1, 13908
+// 0x01065b40: 0x1065b40: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065b34: 0x1065b34: addiu a3, a3, 16616
+// 0x01065b44: 0x1065b44: addiu a3, a3, 16612
 	ldloc 4
-	ldc.i4 16616
+	ldc.i4 16612
 	add
 	stloc 4
-// 0x01065b38: 0x1065b38: addiu a0, zero, 4
+// 0x01065b48: 0x1065b48: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065b3c: 0x1065b3c: j	 0x1065734 addiu a2, zero, 1206
+// 0x01065b4c: 0x1065b4c: j	 0x1065744 addiu a2, zero, 1206
 	ldc.i4 1206
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065b44:
-// 0x01065b44: 0x1065b44: addu  v1, s0, s2
+L_1065b54:
+// 0x01065b54: 0x1065b54: addu  v1, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 7
-// 0x01065b48: 0x1065b48: lw    a0, 60(v1)
+// 0x01065b58: 0x1065b58: lw    a0, 60(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -7208,17 +7208,17 @@ L_1065b44:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065b4c: 0x1065b4c: addiu v1, zero, 2
+// 0x01065b5c: 0x1065b5c: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01065b50: 0x1065b50: beq   a0, v1, 0x1065b64 addu  s8, zero, zero
+// 0x01065b60: 0x1065b60: beq   a0, v1, 0x1065b74 addu  s8, zero, zero
 	ldloc.1
 	ldloc 7
 	ldc.i4.s 0
 	stloc 17
-	beq  L_1065b64
+	beq  L_1065b74
 // --- basic block ---
-// 0x01065b58: 0x1065b58: lw    v1, 60(sp)
+// 0x01065b68: 0x1065b68: lw    v1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7227,20 +7227,20 @@ L_1065b44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065b5c: 0x1065b5c: j	 0x1065b70 sh    v1, 48(s3)
+// 0x01065b6c: 0x1065b6c: j	 0x1065b80 sh    v1, 48(s3)
 	ldloc 8
 	ldc.i4.s 48
 	add
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-	br L_1065b70
+	br L_1065b80
 // --- basic block ---
-L_1065b64:
-// 0x01065b64: 0x1065b64: bne   s5, zero, 0x1065b70 sll   zero, zero, 0
+L_1065b74:
+// 0x01065b74: 0x1065b74: bne   s5, zero, 0x1065b80 sll   zero, zero, 0
 	ldloc 12
-	brtrue L_1065b70
+	brtrue L_1065b80
 // --- basic block ---
-// 0x01065b6c: 0x1065b6c: lw    s8, 60(sp)
+// 0x01065b7c: 0x1065b7c: lw    s8, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7249,8 +7249,8 @@ L_1065b64:
 	add
 	ldelem.i4
 	stloc 17
-L_1065b70:
-// 0x01065b70: 0x1065b70: lw    v1, 56(sp)
+L_1065b80:
+// 0x01065b80: 0x1065b80: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7259,13 +7259,13 @@ L_1065b70:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065b74: 0x1065b74: sll   zero, zero, 0
-// 0x01065b78: 0x1065b78: addiu v1, v1, -1
+// 0x01065b84: 0x1065b84: sll   zero, zero, 0
+// 0x01065b88: 0x1065b88: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01065b7c: 0x1065b7c: bne   v1, zero, 0x1065ba0 sw    v1, 56(sp)
+// 0x01065b8c: 0x1065b8c: bne   v1, zero, 0x1065bb0 sw    v1, 56(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -7275,51 +7275,51 @@ L_1065b70:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1065ba0
+	brtrue L_1065bb0
 // --- basic block ---
-// 0x01065b84: 0x1065b84: lui   a1, 0x10000
+// 0x01065b94: 0x1065b94: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065b88: 0x1065b88: lui   a3, 0x10000
+// 0x01065b98: 0x1065b98: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065b8c: 0x1065b8c: addiu a1, a1, 13908
+// 0x01065b9c: 0x1065b9c: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065b90: 0x1065b90: addiu a3, a3, 16404
+// 0x01065ba0: 0x1065ba0: addiu a3, a3, 16400
 	ldloc 4
-	ldc.i4 16404
+	ldc.i4 16400
 	add
 	stloc 4
-// 0x01065b94: 0x1065b94: addiu a0, zero, 4
+// 0x01065ba4: 0x1065ba4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065b98: 0x1065b98: j	 0x1065734 addiu a2, zero, 1217
+// 0x01065ba8: 0x1065ba8: j	 0x1065744 addiu a2, zero, 1217
 	ldc.i4 1217
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065ba0:
-// 0x01065ba0: 0x1065ba0: addu  a0, v0, zero
+L_1065bb0:
+// 0x01065bb0: 0x1065bb0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01065ba4: 0x1065ba4: addu  a1, s4, zero
+// 0x01065bb4: 0x1065bb4: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-// 0x01065ba8: 0x1065ba8: addiu v0, zero, 1
+// 0x01065bb8: 0x1065bb8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01065bac: 0x1065bac: addu  a2, zero, zero
+// 0x01065bbc: 0x1065bbc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01065bb0: 0x1065bb0: addiu a3, sp, 60
+// 0x01065bc0: 0x1065bc0: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x01065bb4: 0x1065bb4: jal   0x106855c sw    v0, 16(sp)
+// 0x01065bc4: 0x1065bc4: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7333,12 +7333,12 @@ L_1065ba0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065bbc: 0x1065bbc: bne   v0, zero, 0x1065be0 sw    v0, 128(sp)
+// 0x01065bcc: 0x1065bcc: bne   v0, zero, 0x1065bf0 sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7348,34 +7348,34 @@ L_1065ba0:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065be0
+	brtrue L_1065bf0
 // --- basic block ---
-// 0x01065bc4: 0x1065bc4: lui   a1, 0x10000
+// 0x01065bd4: 0x1065bd4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065bc8: 0x1065bc8: lui   a3, 0x10000
+// 0x01065bd8: 0x1065bd8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065bcc: 0x1065bcc: addiu a1, a1, 13908
+// 0x01065bdc: 0x1065bdc: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065bd0: 0x1065bd0: addiu a3, a3, 16668
+// 0x01065be0: 0x1065be0: addiu a3, a3, 16664
 	ldloc 4
-	ldc.i4 16668
+	ldc.i4 16664
 	add
 	stloc 4
-// 0x01065bd4: 0x1065bd4: addiu a0, zero, 4
+// 0x01065be4: 0x1065be4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065bd8: 0x1065bd8: j	 0x1065734 addiu a2, zero, 1229
+// 0x01065be8: 0x1065be8: j	 0x1065744 addiu a2, zero, 1229
 	ldc.i4 1229
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065be0:
-// 0x01065be0: 0x1065be0: lw    v0, 60(sp)
+L_1065bf0:
+// 0x01065bf0: 0x1065bf0: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7384,38 +7384,38 @@ L_1065be0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065be4: 0x1065be4: sll   zero, zero, 0
-// 0x01065be8: 0x1065be8: sltiu v1, v0, 17
+// 0x01065bf4: 0x1065bf4: sll   zero, zero, 0
+// 0x01065bf8: 0x1065bf8: sltiu v1, v0, 17
 	ldloc 5
 	ldc.i4.s 17
 	clt.un
 	stloc 7
-// 0x01065bec: 0x1065bec: bne   v1, zero, 0x1065c18 lui   a1, 0x10000
+// 0x01065bfc: 0x1065bfc: bne   v1, zero, 0x1065c28 lui   a1, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1065c18
+	brtrue L_1065c28
 // --- basic block ---
-// 0x01065bf4: 0x1065bf4: lui   a3, 0x10000
+// 0x01065c04: 0x1065c04: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065bf8: 0x1065bf8: addiu a1, a1, 13908
+// 0x01065c08: 0x1065c08: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065bfc: 0x1065bfc: addiu a3, a3, 16720
+// 0x01065c0c: 0x1065c0c: addiu a3, a3, 16716
 	ldloc 4
-	ldc.i4 16720
+	ldc.i4 16716
 	add
 	stloc 4
-// 0x01065c00: 0x1065c00: addiu a0, zero, 4
+// 0x01065c10: 0x1065c10: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065c04: 0x1065c04: addiu a2, zero, 1233
+// 0x01065c14: 0x1065c14: addiu a2, zero, 1233
 	ldc.i4 1233
 	stloc.3
-// 0x01065c08: 0x1065c08: jal   0x100449c sw    v0, 16(sp)
+// 0x01065c18: 0x1065c18: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7434,25 +7434,25 @@ L_1065be0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065c10: 0x1065c10: j	 0x1066134 addu  v0, zero, zero
+// 0x01065c20: 0x1065c20: j	 0x1066144 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1066134
+	br L_1066144
 // --- basic block ---
-L_1065c18:
-// 0x01065c18: 0x1065c18: bne   v0, zero, 0x1065c24 addiu v0, v0, -1
+L_1065c28:
+// 0x01065c28: 0x1065c28: bne   v0, zero, 0x1065c34 addiu v0, v0, -1
 	ldloc 5
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-	brtrue L_1065c24
+	brtrue L_1065c34
 // --- basic block ---
-// 0x01065c20: 0x1065c20: addiu v0, zero, 4
+// 0x01065c30: 0x1065c30: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-L_1065c24:
-// 0x01065c24: 0x1065c24: sw    v0, 60(sp)
+L_1065c34:
+// 0x01065c34: 0x1065c34: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7461,12 +7461,12 @@ L_1065c24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065c28: 0x1065c28: addu  v0, s0, s2
+// 0x01065c38: 0x1065c38: addu  v0, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 5
-// 0x01065c2c: 0x1065c2c: lw    a0, 60(v0)
+// 0x01065c3c: 0x1065c3c: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7475,10 +7475,10 @@ L_1065c24:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065c30: 0x1065c30: addiu v1, zero, 2
+// 0x01065c40: 0x1065c40: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01065c34: 0x1065c34: lw    v0, 60(sp)
+// 0x01065c44: 0x1065c44: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7487,55 +7487,55 @@ L_1065c24:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065c38: 0x1065c38: beq   a0, v1, 0x1065c48 sll   zero, zero, 0
+// 0x01065c48: 0x1065c48: beq   a0, v1, 0x1065c58 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_1065c48
+	beq  L_1065c58
 // --- basic block ---
-// 0x01065c40: 0x1065c40: j	 0x1065c7c sb    v0, 54(s3)
+// 0x01065c50: 0x1065c50: j	 0x1065c8c sb    v0, 54(s3)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1065c7c
+	br L_1065c8c
 // --- basic block ---
-L_1065c48:
-// 0x01065c48: 0x1065c48: lb    v1, 54(s3)
+L_1065c58:
+// 0x01065c58: 0x1065c58: lb    v1, 54(s3)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01065c4c: 0x1065c4c: sll   zero, zero, 0
-// 0x01065c50: 0x1065c50: beq   v1, v0, 0x1065c7c sll   zero, zero, 0
+// 0x01065c5c: 0x1065c5c: sll   zero, zero, 0
+// 0x01065c60: 0x1065c60: beq   v1, v0, 0x1065c8c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_1065c7c
+	beq  L_1065c8c
 // --- basic block ---
-// 0x01065c58: 0x1065c58: bne   s5, zero, 0x1065c7c lui   a3, 0x10000
+// 0x01065c68: 0x1065c68: bne   s5, zero, 0x1065c8c lui   a3, 0x10000
 	ldloc 12
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1065c7c
+	brtrue L_1065c8c
 // --- basic block ---
-// 0x01065c60: 0x1065c60: addiu a3, a3, 16772
+// 0x01065c70: 0x1065c70: addiu a3, a3, 16768
 	ldloc 4
-	ldc.i4 16772
+	ldc.i4 16768
 	add
 	stloc 4
-// 0x01065c64: 0x1065c64: addiu a0, zero, 1
+// 0x01065c74: 0x1065c74: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065c68: 0x1065c68: addiu a1, s1, 13908
+// 0x01065c78: 0x1065c78: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065c6c: 0x1065c6c: addiu a2, zero, 1246
+// 0x01065c7c: 0x1065c7c: addiu a2, zero, 1246
 	ldc.i4 1246
 	stloc.3
-// 0x01065c70: 0x1065c70: sw    v1, 16(sp)
+// 0x01065c80: 0x1065c80: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7544,7 +7544,7 @@ L_1065c48:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01065c74: 0x1065c74: jal   0x100449c sw    v0, 20(sp)
+// 0x01065c84: 0x1065c84: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7563,8 +7563,8 @@ L_1065c48:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1065c7c:
-// 0x01065c7c: 0x1065c7c: lw    v0, 56(sp)
+L_1065c8c:
+// 0x01065c8c: 0x1065c8c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7573,13 +7573,13 @@ L_1065c7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065c80: 0x1065c80: sll   zero, zero, 0
-// 0x01065c84: 0x1065c84: addiu v0, v0, -1
+// 0x01065c90: 0x1065c90: sll   zero, zero, 0
+// 0x01065c94: 0x1065c94: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01065c88: 0x1065c88: bne   v0, zero, 0x1065cac sw    v0, 56(sp)
+// 0x01065c98: 0x1065c98: bne   v0, zero, 0x1065cbc sw    v0, 56(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7589,42 +7589,42 @@ L_1065c7c:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065cac
+	brtrue L_1065cbc
 // --- basic block ---
-// 0x01065c90: 0x1065c90: lui   a1, 0x10000
+// 0x01065ca0: 0x1065ca0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065c94: 0x1065c94: lui   a3, 0x10000
+// 0x01065ca4: 0x1065ca4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065c98: 0x1065c98: addiu a1, a1, 13908
+// 0x01065ca8: 0x1065ca8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065c9c: 0x1065c9c: addiu a3, a3, 16404
+// 0x01065cac: 0x1065cac: addiu a3, a3, 16400
 	ldloc 4
-	ldc.i4 16404
+	ldc.i4 16400
 	add
 	stloc 4
-// 0x01065ca0: 0x1065ca0: addiu a0, zero, 4
+// 0x01065cb0: 0x1065cb0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065ca4: 0x1065ca4: j	 0x1065734 addiu a2, zero, 1252
+// 0x01065cb4: 0x1065cb4: j	 0x1065744 addiu a2, zero, 1252
 	ldc.i4 1252
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065cac:
-// 0x01065cac: 0x1065cac: lui   a1, 0x10000
+L_1065cbc:
+// 0x01065cbc: 0x1065cbc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065cb0: 0x1065cb0: slti  v0, v0, 2
+// 0x01065cc0: 0x1065cc0: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01065cb4: 0x1065cb4: lw    a0, 128(sp)
+// 0x01065cc4: 0x1065cc4: lw    a0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7633,30 +7633,30 @@ L_1065cac:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065cb8: 0x1065cb8: bne   v0, zero, 0x1065cc4 addiu a1, a1, 5360
+// 0x01065cc8: 0x1065cc8: bne   v0, zero, 0x1065cd4 addiu a1, a1, 5356
 	ldloc 5
 	ldloc.2
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc.2
-	brtrue L_1065cc4
+	brtrue L_1065cd4
 // --- basic block ---
-// 0x01065cc0: 0x1065cc0: addu  a1, s4, zero
+// 0x01065cd0: 0x1065cd0: addu  a1, s4, zero
 	ldloc 15
 	stloc.2
-L_1065cc4:
-// 0x01065cc4: 0x1065cc4: addiu v0, zero, 1
+L_1065cd4:
+// 0x01065cd4: 0x1065cd4: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01065cc8: 0x1065cc8: addu  a2, zero, zero
+// 0x01065cd8: 0x1065cd8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01065ccc: 0x1065ccc: addiu a3, sp, 60
+// 0x01065cdc: 0x1065cdc: addiu a3, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 4
-// 0x01065cd0: 0x1065cd0: jal   0x106855c sw    v0, 16(sp)
+// 0x01065ce0: 0x1065ce0: jal   0x106856c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7670,12 +7670,12 @@ L_1065cc4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065cd8: 0x1065cd8: bne   v0, zero, 0x1065cfc sw    v0, 128(sp)
+// 0x01065ce8: 0x1065ce8: bne   v0, zero, 0x1065d0c sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -7685,39 +7685,39 @@ L_1065cc4:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1065cfc
+	brtrue L_1065d0c
 // --- basic block ---
-// 0x01065ce0: 0x1065ce0: lui   a1, 0x10000
+// 0x01065cf0: 0x1065cf0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065ce4: 0x1065ce4: lui   a3, 0x10000
+// 0x01065cf4: 0x1065cf4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065ce8: 0x1065ce8: addiu a1, a1, 13908
+// 0x01065cf8: 0x1065cf8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065cec: 0x1065cec: addiu a3, a3, 16836
+// 0x01065cfc: 0x1065cfc: addiu a3, a3, 16832
 	ldloc 4
-	ldc.i4 16836
+	ldc.i4 16832
 	add
 	stloc 4
-// 0x01065cf0: 0x1065cf0: addiu a0, zero, 4
+// 0x01065d00: 0x1065d00: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065cf4: 0x1065cf4: j	 0x1065734 addiu a2, zero, 1265
+// 0x01065d04: 0x1065d04: j	 0x1065744 addiu a2, zero, 1265
 	ldc.i4 1265
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1065cfc:
-// 0x01065cfc: 0x1065cfc: addu  v0, s0, s2
+L_1065d0c:
+// 0x01065d0c: 0x1065d0c: addu  v0, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 5
-// 0x01065d00: 0x1065d00: lw    a0, 60(v0)
+// 0x01065d10: 0x1065d10: lw    a0, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -7726,10 +7726,10 @@ L_1065cfc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065d04: 0x1065d04: addiu v1, zero, 2
+// 0x01065d14: 0x1065d14: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01065d08: 0x1065d08: lw    v0, 60(sp)
+// 0x01065d18: 0x1065d18: lw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7738,55 +7738,55 @@ L_1065cfc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065d0c: 0x1065d0c: beq   a0, v1, 0x1065d1c sll   zero, zero, 0
+// 0x01065d1c: 0x1065d1c: beq   a0, v1, 0x1065d2c sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_1065d1c
+	beq  L_1065d2c
 // --- basic block ---
-// 0x01065d14: 0x1065d14: j	 0x1065d50 sb    v0, 53(s3)
+// 0x01065d24: 0x1065d24: j	 0x1065d60 sb    v0, 53(s3)
 	ldloc 8
 	ldc.i4.s 53
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1065d50
+	br L_1065d60
 // --- basic block ---
-L_1065d1c:
-// 0x01065d1c: 0x1065d1c: lb    v1, 53(s3)
+L_1065d2c:
+// 0x01065d2c: 0x1065d2c: lb    v1, 53(s3)
 	ldloc 8
 	ldc.i4.s 53
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01065d20: 0x1065d20: sll   zero, zero, 0
-// 0x01065d24: 0x1065d24: beq   v1, v0, 0x1065d50 sll   zero, zero, 0
+// 0x01065d30: 0x1065d30: sll   zero, zero, 0
+// 0x01065d34: 0x1065d34: beq   v1, v0, 0x1065d60 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_1065d50
+	beq  L_1065d60
 // --- basic block ---
-// 0x01065d2c: 0x1065d2c: bne   s5, zero, 0x1065d50 lui   a3, 0x10000
+// 0x01065d3c: 0x1065d3c: bne   s5, zero, 0x1065d60 lui   a3, 0x10000
 	ldloc 12
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1065d50
+	brtrue L_1065d60
 // --- basic block ---
-// 0x01065d34: 0x1065d34: addiu a3, a3, 16884
+// 0x01065d44: 0x1065d44: addiu a3, a3, 16880
 	ldloc 4
-	ldc.i4 16884
+	ldc.i4 16880
 	add
 	stloc 4
-// 0x01065d38: 0x1065d38: addiu a0, zero, 1
+// 0x01065d48: 0x1065d48: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065d3c: 0x1065d3c: addiu a1, s1, 13908
+// 0x01065d4c: 0x1065d4c: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065d40: 0x1065d40: addiu a2, zero, 1271
+// 0x01065d50: 0x1065d50: addiu a2, zero, 1271
 	ldc.i4 1271
 	stloc.3
-// 0x01065d44: 0x1065d44: sw    v1, 16(sp)
+// 0x01065d54: 0x1065d54: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7795,7 +7795,7 @@ L_1065d1c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01065d48: 0x1065d48: jal   0x100449c sw    v0, 20(sp)
+// 0x01065d58: 0x1065d58: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7814,8 +7814,8 @@ L_1065d1c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1065d50:
-// 0x01065d50: 0x1065d50: lw    v0, 48(sp)
+L_1065d60:
+// 0x01065d60: 0x1065d60: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7824,10 +7824,10 @@ L_1065d50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065d54: 0x1065d54: lui   a3, 0x10000
+// 0x01065d64: 0x1065d64: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065d58: 0x1065d58: sw    v0, 16(sp)
+// 0x01065d68: 0x1065d68: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7836,7 +7836,7 @@ L_1065d50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065d5c: 0x1065d5c: lw    v0, 28(s3)
+// 0x01065d6c: 0x1065d6c: lw    v0, 28(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7845,12 +7845,12 @@ L_1065d50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065d60: 0x1065d60: addiu a3, a3, 16940
+// 0x01065d70: 0x1065d70: addiu a3, a3, 16936
 	ldloc 4
-	ldc.i4 16940
+	ldc.i4 16936
 	add
 	stloc 4
-// 0x01065d64: 0x1065d64: sw    v0, 20(sp)
+// 0x01065d74: 0x1065d74: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7859,16 +7859,16 @@ L_1065d50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065d68: 0x1065d68: lh    v0, 36(s3)
+// 0x01065d78: 0x1065d78: lh    v0, 36(s3)
 	ldloc 8
 	ldc.i4.s 36
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065d6c: 0x1065d6c: addiu a0, zero, 1
+// 0x01065d7c: 0x1065d7c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065d70: 0x1065d70: sw    v0, 24(sp)
+// 0x01065d80: 0x1065d80: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7877,7 +7877,7 @@ L_1065d50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065d74: 0x1065d74: lw    v0, 32(s3)
+// 0x01065d84: 0x1065d84: lw    v0, 32(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -7886,12 +7886,12 @@ L_1065d50:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065d78: 0x1065d78: addiu a1, s1, 13908
+// 0x01065d88: 0x1065d88: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065d7c: 0x1065d7c: sw    v0, 28(sp)
+// 0x01065d8c: 0x1065d8c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7900,16 +7900,16 @@ L_1065d50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065d80: 0x1065d80: lh    v0, 46(s3)
+// 0x01065d90: 0x1065d90: lh    v0, 46(s3)
 	ldloc 8
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065d84: 0x1065d84: addiu a2, zero, 1274
+// 0x01065d94: 0x1065d94: addiu a2, zero, 1274
 	ldc.i4 1274
 	stloc.3
-// 0x01065d88: 0x1065d88: sw    v0, 32(sp)
+// 0x01065d98: 0x1065d98: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7918,14 +7918,14 @@ L_1065d50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065d8c: 0x1065d8c: lh    v0, 48(s3)
+// 0x01065d9c: 0x1065d9c: lh    v0, 48(s3)
 	ldloc 8
 	ldc.i4.s 48
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 5
-// 0x01065d90: 0x1065d90: sll   zero, zero, 0
-// 0x01065d94: 0x1065d94: sw    v0, 36(sp)
+// 0x01065da0: 0x1065da0: sll   zero, zero, 0
+// 0x01065da4: 0x1065da4: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7934,14 +7934,14 @@ L_1065d50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065d98: 0x1065d98: lb    v0, 54(s3)
+// 0x01065da8: 0x1065da8: lb    v0, 54(s3)
 	ldloc 8
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01065d9c: 0x1065d9c: sll   zero, zero, 0
-// 0x01065da0: 0x1065da0: sw    v0, 40(sp)
+// 0x01065dac: 0x1065dac: sll   zero, zero, 0
+// 0x01065db0: 0x1065db0: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7950,13 +7950,13 @@ L_1065d50:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065da4: 0x1065da4: lb    v0, 53(s3)
+// 0x01065db4: 0x1065db4: lb    v0, 53(s3)
 	ldloc 8
 	ldc.i4.s 53
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01065da8: 0x1065da8: jal   0x100449c sw    v0, 44(sp)
+// 0x01065db8: 0x1065db8: jal   0x100449c sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7975,12 +7975,12 @@ L_1065d50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065db0: 0x1065db0: blez  s8, 0x1065ef8 sll   zero, zero, 0
+// 0x01065dc0: 0x1065dc0: blez  s8, 0x1065f08 sll   zero, zero, 0
 	ldloc 17
 	ldc.i4.s 0
-	ble L_1065ef8
+	ble L_1065f08
 // --- basic block ---
-// 0x01065db8: 0x1065db8: lw    s3, 480(s0)
+// 0x01065dc8: 0x1065dc8: lw    s3, 480(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -7989,26 +7989,26 @@ L_1065d50:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01065dbc: 0x1065dbc: lui   a3, 0x10000
+// 0x01065dcc: 0x1065dcc: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065dc0: 0x1065dc0: addiu a3, a3, 17012
+// 0x01065dd0: 0x1065dd0: addiu a3, a3, 17008
 	ldloc 4
-	ldc.i4 17012
+	ldc.i4 17008
 	add
 	stloc 4
-// 0x01065dc4: 0x1065dc4: addiu a0, zero, 1
+// 0x01065dd4: 0x1065dd4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065dc8: 0x1065dc8: addiu a1, s1, 13908
+// 0x01065dd8: 0x1065dd8: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065dcc: 0x1065dcc: addiu a2, zero, 1003
+// 0x01065ddc: 0x1065ddc: addiu a2, zero, 1003
 	ldc.i4 1003
 	stloc.3
-// 0x01065dd0: 0x1065dd0: sw    s3, 16(sp)
+// 0x01065de0: 0x1065de0: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8017,7 +8017,7 @@ L_1065d50:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01065dd4: 0x1065dd4: jal   0x100449c addiu s5, zero, 1
+// 0x01065de4: 0x1065de4: jal   0x100449c addiu s5, zero, 1
 	ldc.i4.1
 	stloc 12
 	ldloc.0
@@ -8030,11 +8030,11 @@ L_1065d50:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065ddc: 0x1065ddc: bne   s3, zero, 0x1065df0 sll   zero, zero, 0
+// 0x01065dec: 0x1065dec: bne   s3, zero, 0x1065e00 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_1065df0
+	brtrue L_1065e00
 // --- basic block ---
-// 0x01065de4: 0x1065de4: lw    s3, 496(s0)
+// 0x01065df4: 0x1065df4: lw    s3, 496(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8043,50 +8043,50 @@ L_1065d50:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01065de8: 0x1065de8: addiu s5, zero, -1
+// 0x01065df8: 0x1065df8: addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 12
-// 0x01065dec: 0x1065dec: addiu s3, s3, -1
+// 0x01065dfc: 0x1065dfc: addiu s3, s3, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-L_1065df0:
-// 0x01065df0: 0x1065df0: addiu v1, zero, 56
+L_1065e00:
+// 0x01065e00: 0x1065e00: addiu v1, zero, 56
 	ldc.i4.s 56
 	stloc 7
-// 0x01065df4: 0x1065df4: mult  s3, v1
+// 0x01065e04: 0x1065e04: mult  s3, v1
 	ldloc 8
 	ldloc 7
 	mul
 	stloc 13
-// 0x01065df8: 0x1065df8: mflo  lo
+// 0x01065e08: 0x1065e08: mflo  lo
 	ldloc 13
 	stloc 5
-// 0x01065dfc: 0x1065dfc: sll   zero, zero, 0
-// 0x01065e00: 0x1065e00: sll   zero, zero, 0
-// 0x01065e04: 0x1065e04: mult  s5, v1
+// 0x01065e0c: 0x1065e0c: sll   zero, zero, 0
+// 0x01065e10: 0x1065e10: sll   zero, zero, 0
+// 0x01065e14: 0x1065e14: mult  s5, v1
 	ldloc 12
 	ldloc 7
 	mul
 	stloc 13
-// 0x01065e08: 0x1065e08: mflo  lo
+// 0x01065e18: 0x1065e18: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x01065e0c: 0x1065e0c: j	 0x1065ee0 addiu t0, s1, 13908
+// 0x01065e1c: 0x1065e1c: j	 0x1065ef0 addiu t0, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc 18
-	br L_1065ee0
+	br L_1065ef0
 // --- basic block ---
-L_1065e14:
-// 0x01065e14: 0x1065e14: bltz  s3, 0x1065e30 sll   zero, zero, 0
+L_1065e24:
+// 0x01065e24: 0x1065e24: bltz  s3, 0x1065e40 sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_1065e30
+	blt L_1065e40
 // --- basic block ---
-// 0x01065e1c: 0x1065e1c: lw    t1, 476(s0)
+// 0x01065e2c: 0x1065e2c: lw    t1, 476(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8095,40 +8095,40 @@ L_1065e14:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01065e20: 0x1065e20: sll   zero, zero, 0
-// 0x01065e24: 0x1065e24: slt   t1, s3, t1
+// 0x01065e30: 0x1065e30: sll   zero, zero, 0
+// 0x01065e34: 0x1065e34: slt   t1, s3, t1
 	ldloc 8
 	ldloc 16
 	clt
 	stloc 16
-// 0x01065e28: 0x1065e28: bne   t1, zero, 0x1065e48 sll   zero, zero, 0
+// 0x01065e38: 0x1065e38: bne   t1, zero, 0x1065e58 sll   zero, zero, 0
 	ldloc 16
-	brtrue L_1065e48
+	brtrue L_1065e58
 // --- basic block ---
-L_1065e30:
-// 0x01065e30: 0x1065e30: lui   a3, 0x10000
+L_1065e40:
+// 0x01065e40: 0x1065e40: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065e34: 0x1065e34: addiu a3, a3, 17044
+// 0x01065e44: 0x1065e44: addiu a3, a3, 17040
 	ldloc 4
-	ldc.i4 17044
+	ldc.i4 17040
 	add
 	stloc 4
-// 0x01065e38: 0x1065e38: addiu a0, zero, 4
+// 0x01065e48: 0x1065e48: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065e3c: 0x1065e3c: addiu a1, s1, 13908
+// 0x01065e4c: 0x1065e4c: addiu a1, s1, 13904
 	ldloc 10
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065e40: 0x1065e40: j	 0x1065e7c addiu a2, zero, 1013
+// 0x01065e50: 0x1065e50: j	 0x1065e8c addiu a2, zero, 1013
 	ldc.i4 1013
 	stloc.3
-	br L_1065e7c
+	br L_1065e8c
 // --- basic block ---
-L_1065e48:
-// 0x01065e48: 0x1065e48: lw    t2, 504(s0)
+L_1065e58:
+// 0x01065e58: 0x1065e58: lw    t2, 504(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8137,51 +8137,51 @@ L_1065e48:
 	add
 	ldelem.i4
 	stloc 21
-// 0x01065e4c: 0x1065e4c: sll   zero, zero, 0
-// 0x01065e50: 0x1065e50: addu  t2, t2, v0
+// 0x01065e5c: 0x1065e5c: sll   zero, zero, 0
+// 0x01065e60: 0x1065e60: addu  t2, t2, v0
 	ldloc 21
 	ldloc 5
 	add
 	stloc 21
-// 0x01065e54: 0x1065e54: lh    t1, 46(t2)
+// 0x01065e64: 0x1065e64: lh    t1, 46(t2)
 	ldloc 21
 	ldc.i4.s 46
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 16
-// 0x01065e58: 0x1065e58: sll   zero, zero, 0
-// 0x01065e5c: 0x1065e5c: bne   t1, zero, 0x1065e8c addu  v0, v0, v1
+// 0x01065e68: 0x1065e68: sll   zero, zero, 0
+// 0x01065e6c: 0x1065e6c: bne   t1, zero, 0x1065e9c addu  v0, v0, v1
 	ldloc 16
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-	brtrue L_1065e8c
+	brtrue L_1065e9c
 // --- basic block ---
-// 0x01065e64: 0x1065e64: lui   a3, 0x10000
+// 0x01065e74: 0x1065e74: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065e68: 0x1065e68: lui   a1, 0x10000
+// 0x01065e78: 0x1065e78: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065e6c: 0x1065e6c: addiu a3, a3, 17044
+// 0x01065e7c: 0x1065e7c: addiu a3, a3, 17040
 	ldloc 4
-	ldc.i4 17044
+	ldc.i4 17040
 	add
 	stloc 4
-// 0x01065e70: 0x1065e70: addiu a0, zero, 4
+// 0x01065e80: 0x1065e80: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01065e74: 0x1065e74: addiu a1, a1, 13908
+// 0x01065e84: 0x1065e84: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065e78: 0x1065e78: addiu a2, zero, 1018
+// 0x01065e88: 0x1065e88: addiu a2, zero, 1018
 	ldc.i4 1018
 	stloc.3
-L_1065e7c:
-// 0x01065e7c: 0x1065e7c: jal   0x100449c sll   zero, zero, 0
+L_1065e8c:
+// 0x01065e8c: 0x1065e8c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -8192,16 +8192,16 @@ L_1065e7c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065e84: 0x1065e84: j	 0x1065ef8 sll   zero, zero, 0
-	br L_1065ef8
+// 0x01065e94: 0x1065e94: j	 0x1065f08 sll   zero, zero, 0
+	br L_1065f08
 // --- basic block ---
-L_1065e8c:
-// 0x01065e8c: 0x1065e8c: mult  s8, t1
+L_1065e9c:
+// 0x01065e9c: 0x1065e9c: mult  s8, t1
 	ldloc 17
 	ldloc 16
 	mul
 	stloc 13
-// 0x01065e90: 0x1065e90: sw    v0, 80(sp)
+// 0x01065ea0: 0x1065ea0: sw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8210,7 +8210,7 @@ L_1065e8c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065e94: 0x1065e94: sw    v1, 76(sp)
+// 0x01065ea4: 0x1065ea4: sw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8219,7 +8219,7 @@ L_1065e8c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01065e98: 0x1065e98: sw    t0, 72(sp)
+// 0x01065ea8: 0x1065ea8: sw    t0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8228,46 +8228,46 @@ L_1065e8c:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01065e9c: 0x1065e9c: mflo  lo
+// 0x01065eac: 0x1065eac: mflo  lo
 	ldloc 13
 	stloc 19
-// 0x01065ea0: 0x1065ea0: sll   zero, zero, 0
-// 0x01065ea4: 0x1065ea4: sll   zero, zero, 0
-// 0x01065ea8: 0x1065ea8: div   t3, s6
+// 0x01065eb0: 0x1065eb0: sll   zero, zero, 0
+// 0x01065eb4: 0x1065eb4: sll   zero, zero, 0
+// 0x01065eb8: 0x1065eb8: div   t3, s6
 	ldloc 19
 	ldloc 14
 	div
 	stloc 13
-// 0x01065eac: 0x1065eac: subu  s6, s6, t1
+// 0x01065ebc: 0x1065ebc: subu  s6, s6, t1
 	ldloc 14
 	ldloc 16
 	sub
 	stloc 14
-// 0x01065eb0: 0x1065eb0: mflo  lo
+// 0x01065ec0: 0x1065ec0: mflo  lo
 	ldloc 13
 	stloc 16
-// 0x01065eb4: 0x1065eb4: sll   t3, t1, 16
+// 0x01065ec4: 0x1065ec4: sll   t3, t1, 16
 	ldloc 16
 	ldc.i4.s 16
 	shl
 	stloc 19
-// 0x01065eb8: 0x1065eb8: sra   t3, t3, 16
+// 0x01065ec8: 0x1065ec8: sra   t3, t3, 16
 	ldloc 19
 	ldc.i4.s 16
 	shr
 	stloc 19
-// 0x01065ebc: 0x1065ebc: sh    t3, 48(t2)
+// 0x01065ecc: 0x1065ecc: sh    t3, 48(t2)
 	ldloc 21
 	ldc.i4.s 48
 	add
 	ldloc 19
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x01065ec0: 0x1065ec0: subu  s8, s8, t3
+// 0x01065ed0: 0x1065ed0: subu  s8, s8, t3
 	ldloc 17
 	ldloc 19
 	sub
 	stloc 17
-// 0x01065ec4: 0x1065ec4: sw    s3, 16(sp)
+// 0x01065ed4: 0x1065ed4: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8276,7 +8276,7 @@ L_1065e8c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01065ec8: 0x1065ec8: jal   0x100449c sw    t3, 20(sp)
+// 0x01065ed8: 0x1065ed8: jal   0x100449c sw    t3, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8295,7 +8295,7 @@ L_1065e8c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065ed0: 0x1065ed0: lw    t0, 72(sp)
+// 0x01065ee0: 0x1065ee0: lw    t0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8304,7 +8304,7 @@ L_1065e8c:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01065ed4: 0x1065ed4: lw    v1, 76(sp)
+// 0x01065ee4: 0x1065ee4: lw    v1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8313,7 +8313,7 @@ L_1065e8c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065ed8: 0x1065ed8: lw    v0, 80(sp)
+// 0x01065ee8: 0x1065ee8: lw    v0, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8322,35 +8322,35 @@ L_1065e8c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065edc: 0x1065edc: addu  s3, s3, s5
+// 0x01065eec: 0x1065eec: addu  s3, s3, s5
 	ldloc 8
 	ldloc 12
 	add
 	stloc 8
-L_1065ee0:
-// 0x01065ee0: 0x1065ee0: lui   a3, 0x10000
+L_1065ef0:
+// 0x01065ef0: 0x1065ef0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065ee4: 0x1065ee4: addiu a0, zero, 1
+// 0x01065ef4: 0x1065ef4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065ee8: 0x1065ee8: addu  a1, t0, zero
+// 0x01065ef8: 0x1065ef8: addu  a1, t0, zero
 	ldloc 18
 	stloc.2
-// 0x01065eec: 0x1065eec: addiu a2, zero, 1024
+// 0x01065efc: 0x1065efc: addiu a2, zero, 1024
 	ldc.i4 1024
 	stloc.3
-// 0x01065ef0: 0x1065ef0: bgtz  s6, 0x1065e14 addiu a3, a3, 17088
+// 0x01065f00: 0x1065f00: bgtz  s6, 0x1065e24 addiu a3, a3, 17084
 	ldloc 14
 	ldloc 4
-	ldc.i4 17088
+	ldc.i4 17084
 	add
 	stloc 4
 	ldc.i4.s 0
-	bgt L_1065e14
+	bgt L_1065e24
 // --- basic block ---
-L_1065ef8:
-// 0x01065ef8: 0x1065ef8: lw    v1, 480(s0)
+L_1065f08:
+// 0x01065f08: 0x1065f08: lw    v1, 480(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8359,17 +8359,17 @@ L_1065ef8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065efc: 0x1065efc: addu  v0, s0, s2
+// 0x01065f0c: 0x1065f0c: addu  v0, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 5
-// 0x01065f00: 0x1065f00: addiu v1, v1, 1
+// 0x01065f10: 0x1065f10: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01065f04: 0x1065f04: sw    v1, 480(s0)
+// 0x01065f14: 0x1065f14: sw    v1, 480(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8378,7 +8378,7 @@ L_1065ef8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01065f08: 0x1065f08: lw    v1, 60(v0)
+// 0x01065f18: 0x1065f18: lw    v1, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8387,15 +8387,15 @@ L_1065ef8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01065f0c: 0x1065f0c: addiu v0, zero, 2
+// 0x01065f1c: 0x1065f1c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01065f10: 0x1065f10: beq   v1, v0, 0x1065f28 sll   zero, zero, 0
+// 0x01065f20: 0x1065f20: beq   v1, v0, 0x1065f38 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_1065f28
+	beq  L_1065f38
 // --- basic block ---
-// 0x01065f18: 0x1065f18: lw    v0, 484(s0)
+// 0x01065f28: 0x1065f28: lw    v0, 484(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8404,13 +8404,13 @@ L_1065ef8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065f1c: 0x1065f1c: sll   zero, zero, 0
-// 0x01065f20: 0x1065f20: addiu v0, v0, 1
+// 0x01065f2c: 0x1065f2c: sll   zero, zero, 0
+// 0x01065f30: 0x1065f30: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01065f24: 0x1065f24: sw    v0, 484(s0)
+// 0x01065f34: 0x1065f34: sw    v0, 484(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8419,8 +8419,8 @@ L_1065ef8:
 	add
 	ldloc 5
 	stelem.i4
-L_1065f28:
-// 0x01065f28: 0x1065f28: lw    v0, 56(sp)
+L_1065f38:
+// 0x01065f38: 0x1065f38: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8429,13 +8429,13 @@ L_1065f28:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065f2c: 0x1065f2c: sll   zero, zero, 0
-// 0x01065f30: 0x1065f30: addiu v0, v0, -1
+// 0x01065f3c: 0x1065f3c: sll   zero, zero, 0
+// 0x01065f40: 0x1065f40: addiu v0, v0, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 5
-// 0x01065f34: 0x1065f34: j	 0x1065f6c sw    v0, 56(sp)
+// 0x01065f44: 0x1065f44: j	 0x1065f7c sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8444,41 +8444,41 @@ L_1065f28:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1065f6c
+	br L_1065f7c
 // --- basic block ---
-L_1065f3c:
-// 0x01065f3c: 0x1065f3c: addiu s2, zero, 44
+L_1065f4c:
+// 0x01065f4c: 0x1065f4c: addiu s2, zero, 44
 	ldc.i4.s 44
 	stloc 11
-L_1065f40:
-// 0x01065f40: 0x1065f40: mult  s0, s2
+L_1065f50:
+// 0x01065f50: 0x1065f50: mult  s0, s2
 	ldloc 9
 	ldloc 11
 	mul
 	stloc 13
-// 0x01065f44: 0x1065f44: lui   s0, 0x70000
+// 0x01065f54: 0x1065f54: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x01065f48: 0x1065f48: addiu s0, s0, 15808
+// 0x01065f58: 0x1065f58: addiu s0, s0, 16272
 	ldloc 9
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 9
-// 0x01065f4c: 0x1065f4c: lui   s4, 0x0
+// 0x01065f5c: 0x1065f5c: lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x01065f50: 0x1065f50: lui   s1, 0x10000
+// 0x01065f60: 0x1065f60: lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 10
-// 0x01065f54: 0x1065f54: addiu s4, s4, 28076
+// 0x01065f64: 0x1065f64: addiu s4, s4, 28076
 	ldloc 15
 	ldc.i4 28076
 	add
 	stloc 15
-// 0x01065f58: 0x1065f58: addu  s7, s0, zero
+// 0x01065f68: 0x1065f68: addu  s7, s0, zero
 	ldloc 9
 	stloc 20
-// 0x01065f5c: 0x1065f5c: sw    s6, 64(sp)
+// 0x01065f6c: 0x1065f6c: sw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8487,15 +8487,15 @@ L_1065f40:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01065f60: 0x1065f60: mflo  lo
+// 0x01065f70: 0x1065f70: mflo  lo
 	ldloc 13
 	stloc 11
-// 0x01065f64: 0x1065f64: addu  s8, s0, s2
+// 0x01065f74: 0x1065f74: addu  s8, s0, s2
 	ldloc 9
 	ldloc 11
 	add
 	stloc 17
-// 0x01065f68: 0x1065f68: sw    s8, 68(sp)
+// 0x01065f78: 0x1065f78: sw    s8, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8504,8 +8504,8 @@ L_1065f40:
 	add
 	ldloc 17
 	stelem.i4
-L_1065f6c:
-// 0x01065f6c: 0x1065f6c: lw    v0, 56(sp)
+L_1065f7c:
+// 0x01065f7c: 0x1065f7c: lw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8514,13 +8514,13 @@ L_1065f6c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065f70: 0x1065f70: sll   zero, zero, 0
-// 0x01065f74: 0x1065f74: bgtz  v0, 0x10657e8 sll   zero, zero, 0
+// 0x01065f80: 0x1065f80: sll   zero, zero, 0
+// 0x01065f84: 0x1065f84: bgtz  v0, 0x10657f8 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_10657e8
+	bgt L_10657f8
 // --- basic block ---
-// 0x01065f7c: 0x1065f7c: lw    a1, 480(s0)
+// 0x01065f8c: 0x1065f8c: lw    a1, 480(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8529,7 +8529,7 @@ L_1065f6c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01065f80: 0x1065f80: lw    v0, 476(s0)
+// 0x01065f90: 0x1065f90: lw    v0, 476(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8538,7 +8538,7 @@ L_1065f6c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01065f84: 0x1065f84: lw    s6, 64(sp)
+// 0x01065f94: 0x1065f94: lw    s6, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8547,14 +8547,14 @@ L_1065f6c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01065f88: 0x1065f88: bne   a1, v0, 0x1065fe8 addu  v0, zero, zero
+// 0x01065f98: 0x1065f98: bne   a1, v0, 0x1065ff8 addu  v0, zero, zero
 	ldloc.2
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_1065fe8
+	bne.un L_1065ff8
 // --- basic block ---
-// 0x01065f90: 0x1065f90: lw    a0, 504(s0)
+// 0x01065fa0: 0x1065fa0: lw    a0, 504(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -8563,79 +8563,79 @@ L_1065f6c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065f94: 0x1065f94: addu  v1, zero, zero
+// 0x01065fa4: 0x1065fa4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01065f98: 0x1065f98: j	 0x1065fb4 addu  t0, zero, zero
+// 0x01065fa8: 0x1065fa8: j	 0x1065fc4 addu  t0, zero, zero
 	ldc.i4.s 0
 	stloc 18
-	br L_1065fb4
+	br L_1065fc4
 // --- basic block ---
-L_1065fa0:
-// 0x01065fa0: 0x1065fa0: lh    a3, -10(a0)
+L_1065fb0:
+// 0x01065fb0: 0x1065fb0: lh    a3, -10(a0)
 	ldloc.1
 	ldc.i4.s -10
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc 4
-// 0x01065fa4: 0x1065fa4: lh    a2, -8(a0)
+// 0x01065fb4: 0x1065fb4: lh    a2, -8(a0)
 	ldloc.1
 	ldc.i4.s -8
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.3
-// 0x01065fa8: 0x1065fa8: addu  t0, t0, a3
+// 0x01065fb8: 0x1065fb8: addu  t0, t0, a3
 	ldloc 18
 	ldloc 4
 	add
 	stloc 18
-// 0x01065fac: 0x1065fac: addu  v1, v1, a2
+// 0x01065fbc: 0x1065fbc: addu  v1, v1, a2
 	ldloc 7
 	ldloc.3
 	add
 	stloc 7
-// 0x01065fb0: 0x1065fb0: addiu v0, v0, 1
+// 0x01065fc0: 0x1065fc0: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_1065fb4:
-// 0x01065fb4: 0x1065fb4: slt   a2, v0, a1
+L_1065fc4:
+// 0x01065fc4: 0x1065fc4: slt   a2, v0, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.3
-// 0x01065fb8: 0x1065fb8: bne   a2, zero, 0x1065fa0 addiu a0, a0, 56
+// 0x01065fc8: 0x1065fc8: bne   a2, zero, 0x1065fb0 addiu a0, a0, 56
 	ldloc.3
 	ldloc.1
 	ldc.i4.s 56
 	add
 	stloc.1
-	brtrue L_1065fa0
+	brtrue L_1065fb0
 // --- basic block ---
-// 0x01065fc0: 0x1065fc0: lui   a1, 0x10000
+// 0x01065fd0: 0x1065fd0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065fc4: 0x1065fc4: lui   a3, 0x10000
+// 0x01065fd4: 0x1065fd4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01065fc8: 0x1065fc8: addiu a1, a1, 13908
+// 0x01065fd8: 0x1065fd8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01065fcc: 0x1065fcc: addiu a3, a3, 17124
+// 0x01065fdc: 0x1065fdc: addiu a3, a3, 17120
 	ldloc 4
-	ldc.i4 17124
+	ldc.i4 17120
 	add
 	stloc 4
-// 0x01065fd0: 0x1065fd0: addiu a0, zero, 1
+// 0x01065fe0: 0x1065fe0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01065fd4: 0x1065fd4: addiu a2, zero, 1307
+// 0x01065fe4: 0x1065fe4: addiu a2, zero, 1307
 	ldc.i4 1307
 	stloc.3
-// 0x01065fd8: 0x1065fd8: sw    v0, 16(sp)
+// 0x01065fe8: 0x1065fe8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8644,7 +8644,7 @@ L_1065fb4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01065fdc: 0x1065fdc: sw    t0, 20(sp)
+// 0x01065fec: 0x1065fec: sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8653,7 +8653,7 @@ L_1065fb4:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01065fe0: 0x1065fe0: jal   0x100449c sw    v1, 24(sp)
+// 0x01065ff0: 0x1065ff0: jal   0x100449c sw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8672,8 +8672,8 @@ L_1065fb4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1065fe8:
-// 0x01065fe8: 0x1065fe8: lw    a0, 128(sp)
+L_1065ff8:
+// 0x01065ff8: 0x1065ff8: lw    a0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8682,15 +8682,15 @@ L_1065fe8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01065fec: 0x1065fec: lui   a1, 0x10000
+// 0x01065ffc: 0x1065ffc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01065ff0: 0x1065ff0: addiu a1, a1, 5360
+// 0x01066000: 0x1066000: addiu a1, a1, 5356
 	ldloc.2
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc.2
-// 0x01065ff4: 0x1065ff4: jal   0x10681a8 addiu a2, zero, -1
+// 0x01066004: 0x1066004: jal   0x10681b8 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -8698,12 +8698,12 @@ L_1065fe8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01065ffc: 0x1065ffc: bne   v0, zero, 0x1066020 sw    v0, 128(sp)
+// 0x0106600c: 0x106600c: bne   v0, zero, 0x1066030 sw    v0, 128(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -8713,42 +8713,42 @@ L_1065fe8:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_1066020
+	brtrue L_1066030
 // --- basic block ---
-// 0x01066004: 0x1066004: lui   a1, 0x10000
+// 0x01066014: 0x1066014: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01066008: 0x1066008: lui   a3, 0x10000
+// 0x01066018: 0x1066018: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106600c: 0x106600c: addiu a1, a1, 13908
+// 0x0106601c: 0x106601c: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066010: 0x1066010: addiu a3, a3, 15400
+// 0x01066020: 0x1066020: addiu a3, a3, 15396
 	ldloc 4
-	ldc.i4 15400
+	ldc.i4 15396
 	add
 	stloc 4
-// 0x01066014: 0x1066014: addiu a0, zero, 4
+// 0x01066024: 0x1066024: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066018: 0x1066018: j	 0x1065734 addiu a2, zero, 1312
+// 0x01066028: 0x1066028: j	 0x1065744 addiu a2, zero, 1312
 	ldc.i4 1312
 	stloc.3
-	br L_1065734
+	br L_1065744
 // --- basic block ---
-L_1066020:
-// 0x01066020: 0x1066020: lui   v0, 0x70000
+L_1066030:
+// 0x01066030: 0x1066030: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01066024: 0x1066024: addiu v0, v0, 15808
+// 0x01066034: 0x1066034: addiu v0, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01066028: 0x1066028: lw    v1, 476(v0)
+// 0x01066038: 0x1066038: lw    v1, 476(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8757,12 +8757,12 @@ L_1066020:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106602c: 0x106602c: sll   zero, zero, 0
-// 0x01066030: 0x1066030: bne   v1, zero, 0x106604c sll   zero, zero, 0
+// 0x0106603c: 0x106603c: sll   zero, zero, 0
+// 0x01066040: 0x1066040: bne   v1, zero, 0x106605c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_106604c
+	brtrue L_106605c
 // --- basic block ---
-// 0x01066038: 0x1066038: lw    v1, 32(v0)
+// 0x01066048: 0x1066048: lw    v1, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8771,14 +8771,14 @@ L_1066020:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106603c: 0x106603c: sll   zero, zero, 0
-// 0x01066040: 0x1066040: bne   v1, zero, 0x106604c addiu v1, zero, 2
+// 0x0106604c: 0x106604c: sll   zero, zero, 0
+// 0x01066050: 0x1066050: bne   v1, zero, 0x106605c addiu v1, zero, 2
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	brtrue L_106604c
+	brtrue L_106605c
 // --- basic block ---
-// 0x01066048: 0x1066048: sw    v1, 32(v0)
+// 0x01066058: 0x1066058: sw    v1, 32(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8787,16 +8787,16 @@ L_1066020:
 	add
 	ldloc 7
 	stelem.i4
-L_106604c:
-// 0x0106604c: 0x106604c: lui   v0, 0x70000
+L_106605c:
+// 0x0106605c: 0x106605c: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01066050: 0x1066050: addiu v0, v0, 15808
+// 0x01066060: 0x1066060: addiu v0, v0, 16272
 	ldloc 5
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 5
-// 0x01066054: 0x1066054: lw    v1, 480(v0)
+// 0x01066064: 0x1066064: lw    v1, 480(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8805,7 +8805,7 @@ L_106604c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066058: 0x1066058: lw    a0, 476(v0)
+// 0x01066068: 0x1066068: lw    a0, 476(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8814,13 +8814,13 @@ L_106604c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106605c: 0x106605c: sll   zero, zero, 0
-// 0x01066060: 0x1066060: bne   v1, a0, 0x106612c sll   zero, zero, 0
+// 0x0106606c: 0x106606c: sll   zero, zero, 0
+// 0x01066070: 0x1066070: bne   v1, a0, 0x106613c sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_106612c
+	bne.un L_106613c
 // --- basic block ---
-// 0x01066068: 0x1066068: lw    a1, 484(v0)
+// 0x01066078: 0x1066078: lw    a1, 484(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8829,15 +8829,15 @@ L_106604c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106606c: 0x106606c: sll   zero, zero, 0
-// 0x01066070: 0x1066070: bne   a1, v1, 0x1066088 lui   a3, 0x10000
+// 0x0106607c: 0x106607c: sll   zero, zero, 0
+// 0x01066080: 0x1066080: bne   a1, v1, 0x1066098 lui   a3, 0x10000
 	ldloc.2
 	ldloc 7
 	ldc.i4 65536
 	stloc 4
-	bne.un L_1066088
+	bne.un L_1066098
 // --- basic block ---
-// 0x01066078: 0x1066078: lw    v1, 504(v0)
+// 0x01066088: 0x1066088: lw    v1, 504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -8846,32 +8846,32 @@ L_106604c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106607c: 0x106607c: addu  a0, zero, zero
+// 0x0106608c: 0x106608c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01066080: 0x1066080: j	 0x10660c0 addu  v0, zero, zero
+// 0x01066090: 0x1066090: j	 0x10660d0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10660c0
+	br L_10660d0
 // --- basic block ---
-L_1066088:
-// 0x01066088: 0x1066088: lui   a1, 0x10000
+L_1066098:
+// 0x01066098: 0x1066098: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106608c: 0x106608c: addiu a1, a1, 13908
+// 0x0106609c: 0x106609c: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066090: 0x1066090: addiu a3, a3, 17176
+// 0x010660a0: 0x10660a0: addiu a3, a3, 17172
 	ldloc 4
-	ldc.i4 17176
+	ldc.i4 17172
 	add
 	stloc 4
-// 0x01066094: 0x1066094: addiu a0, zero, 4
+// 0x010660a4: 0x10660a4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066098: 0x1066098: jal   0x100449c addiu a2, zero, 169
+// 0x010660a8: 0x10660a8: jal   0x100449c addiu a2, zero, 169
 	ldc.i4 169
 	stloc.3
 	ldloc.0
@@ -8884,81 +8884,81 @@ L_1066088:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010660a0: 0x10660a0: j	 0x10660f0 lui   s0, 0x70000
+// 0x010660b0: 0x10660b0: j	 0x1066100 lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 9
-	br L_10660f0
+	br L_1066100
 // --- basic block ---
-L_10660a8:
-// 0x010660a8: 0x10660a8: lb    a2, 54(v1)
+L_10660b8:
+// 0x010660b8: 0x10660b8: lb    a2, 54(v1)
 	ldloc 7
 	ldc.i4.s 54
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x010660ac: 0x10660ac: sh    v0, 44(v1)
+// 0x010660bc: 0x10660bc: sh    v0, 44(v1)
 	ldloc 7
 	ldc.i4.s 44
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteShort(int32, int32)
-// 0x010660b0: 0x10660b0: xori  a2, a2, 4
+// 0x010660c0: 0x10660c0: xori  a2, a2, 4
 	ldloc.3
 	ldc.i4.4
 	xor
 	stloc.3
-// 0x010660b4: 0x10660b4: sltu  a2, zero, a2
+// 0x010660c4: 0x10660c4: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x010660b8: 0x10660b8: addu  v0, v0, a2
+// 0x010660c8: 0x10660c8: addu  v0, v0, a2
 	ldloc 5
 	ldloc.3
 	add
 	stloc 5
-// 0x010660bc: 0x10660bc: addiu v1, v1, 56
+// 0x010660cc: 0x10660cc: addiu v1, v1, 56
 	ldloc 7
 	ldc.i4.s 56
 	add
 	stloc 7
-L_10660c0:
-// 0x010660c0: 0x10660c0: slt   a2, a0, a1
+L_10660d0:
+// 0x010660d0: 0x10660d0: slt   a2, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.3
-// 0x010660c4: 0x10660c4: bne   a2, zero, 0x10660a8 addiu a0, a0, 1
+// 0x010660d4: 0x10660d4: bne   a2, zero, 0x10660b8 addiu a0, a0, 1
 	ldloc.3
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brtrue L_10660a8
+	brtrue L_10660b8
 // --- basic block ---
-// 0x010660cc: 0x10660cc: lui   a1, 0x10000
+// 0x010660dc: 0x10660dc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010660d0: 0x10660d0: lui   a3, 0x10000
+// 0x010660e0: 0x10660e0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010660d4: 0x10660d4: addiu a1, a1, 13908
+// 0x010660e4: 0x10660e4: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010660d8: 0x10660d8: addiu a3, a3, 17216
+// 0x010660e8: 0x10660e8: addiu a3, a3, 17212
 	ldloc 4
-	ldc.i4 17216
+	ldc.i4 17212
 	add
 	stloc 4
-// 0x010660dc: 0x10660dc: addiu a0, zero, 1
+// 0x010660ec: 0x10660ec: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010660e0: 0x10660e0: addiu a2, zero, 181
+// 0x010660f0: 0x10660f0: addiu a2, zero, 181
 	ldc.i4 181
 	stloc.3
-// 0x010660e4: 0x10660e4: jal   0x100449c sw    v0, 16(sp)
+// 0x010660f4: 0x10660f4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -8977,16 +8977,16 @@ L_10660c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010660ec: 0x10660ec: lui   s0, 0x70000
+// 0x010660fc: 0x10660fc: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 9
-L_10660f0:
-// 0x010660f0: 0x10660f0: addiu a0, zero, 1
+L_1066100:
+// 0x01066100: 0x1066100: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010660f4: 0x10660f4: jal   0x1064dac addiu s0, s0, 15808
+// 0x01066104: 0x1066104: jal   0x1064dbc addiu s0, s0, 16272
 	ldloc 9
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 9
 	ldloc.0
@@ -8994,12 +8994,12 @@ L_10660f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl75::instrument_segments_1064dac(int32,int32,int32,int32,int32)
+	call int32 Cibyl75::instrument_segments_1064dbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010660fc: 0x10660fc: lw    v0, 524(s0)
+// 0x0106610c: 0x106610c: lw    v0, 524(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -9008,8 +9008,8 @@ L_10660f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01066100: 0x1066100: sll   zero, zero, 0
-// 0x01066104: 0x1066104: lw    v0, 8(v0)
+// 0x01066110: 0x1066110: sll   zero, zero, 0
+// 0x01066114: 0x1066114: lw    v0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -9018,14 +9018,14 @@ L_10660f0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01066108: 0x1066108: sll   zero, zero, 0
-// 0x0106610c: 0x106610c: beq   v0, zero, 0x106612c lui   a1, 0x70000
+// 0x01066118: 0x1066118: sll   zero, zero, 0
+// 0x0106611c: 0x106611c: beq   v0, zero, 0x106613c lui   a1, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc.2
-	brfalse L_106612c
+	brfalse L_106613c
 // --- basic block ---
-// 0x01066114: 0x1066114: lw    a0, 32(s0)
+// 0x01066124: 0x1066124: lw    a0, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -9034,18 +9034,18 @@ L_10660f0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066118: 0x1066118: lui   a2, 0x70000
+// 0x01066128: 0x1066128: lui   a2, 0x70000
 	ldc.i4 458752
 	stloc.3
-// 0x0106611c: 0x106611c: addiu a1, a1, 15844
+// 0x0106612c: 0x106612c: addiu a1, a1, 16308
 	ldloc.2
-	ldc.i4 15844
+	ldc.i4 16308
 	add
 	stloc.2
-// 0x01066120: 0x1066120: jalr  v0 addiu a2, a2, 16284
+// 0x01066130: 0x1066130: jalr  v0 addiu a2, a2, 16748
 	ldloc 5
 	ldloc.3
-	ldc.i4 16284
+	ldc.i4 16748
 	add
 	stloc.3
 	ldloc.0
@@ -9058,7 +9058,7 @@ L_10660f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01066128: 0x1066128: sw    zero, 32(s0)
+// 0x01066138: 0x1066138: sw    zero, 32(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -9067,8 +9067,8 @@ L_10660f0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_106612c:
-// 0x0106612c: 0x106612c: lw    v0, 128(sp)
+L_106613c:
+// 0x0106613c: 0x106613c: lw    v0, 128(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9077,16 +9077,16 @@ L_106612c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01066130: 0x1066130: sw    zero, 0(s6)
+// 0x01066140: 0x1066140: sw    zero, 0(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1066134:
-// 0x01066134: 0x1066134: lw    ra, 124(sp)
-// 0x01066138: 0x1066138: lw    s8, 120(sp)
+L_1066144:
+// 0x01066144: 0x1066144: lw    ra, 124(sp)
+// 0x01066148: 0x1066148: lw    s8, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9095,7 +9095,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0106613c: 0x106613c: lw    s7, 116(sp)
+// 0x0106614c: 0x106614c: lw    s7, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9104,7 +9104,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 20
-// 0x01066140: 0x1066140: lw    s6, 112(sp)
+// 0x01066150: 0x1066150: lw    s6, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9113,7 +9113,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01066144: 0x1066144: lw    s5, 108(sp)
+// 0x01066154: 0x1066154: lw    s5, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9122,7 +9122,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01066148: 0x1066148: lw    s4, 104(sp)
+// 0x01066158: 0x1066158: lw    s4, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9131,7 +9131,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0106614c: 0x106614c: lw    s3, 100(sp)
+// 0x0106615c: 0x106615c: lw    s3, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9140,7 +9140,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01066150: 0x1066150: lw    s2, 96(sp)
+// 0x01066160: 0x1066160: lw    s2, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9149,7 +9149,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01066154: 0x1066154: lw    s1, 92(sp)
+// 0x01066164: 0x1066164: lw    s1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9158,7 +9158,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01066158: 0x1066158: lw    s0, 88(sp)
+// 0x01066168: 0x1066168: lw    s0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -9167,7 +9167,7 @@ L_1066134:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106615c: 0x106615c: jr    ra addiu sp, sp, 128
+// 0x0106616c: 0x106616c: jr    ra addiu sp, sp, 128
 	ldloc.0
 	ldc.i4 128
 	add
diff --git a/converted/Cibyl76.j b/converted/Cibyl76.j
index 348cfbb..7f6edb7 100644
--- a/converted/Cibyl76.j
+++ b/converted/Cibyl76.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl76::.ctor
 
-.method public static int32 instrument_segments_cb_1066164(int32,int32,int32,int32,int32)
+.method public static int32 instrument_segments_cb_1066174(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -79,18 +79,18 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066164: 0x1066164: addiu sp, sp, -32
+// 0x01066174: 0x1066174: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01066168: 0x1066168: lui   a1, 0x10000
+// 0x01066178: 0x1066178: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106616c: 0x106616c: lui   a3, 0x10000
+// 0x0106617c: 0x106617c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066170: 0x1066170: sw    s0, 24(sp)
+// 0x01066180: 0x1066180: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -99,27 +99,27 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066174: 0x1066174: addiu a1, a1, 13908
+// 0x01066184: 0x1066184: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066178: 0x1066178: addu  s0, a0, zero
+// 0x01066188: 0x1066188: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0106617c: 0x106617c: addiu a3, a3, 17240
+// 0x0106618c: 0x106618c: addiu a3, a3, 17236
 	ldloc 4
-	ldc.i4 17240
+	ldc.i4 17236
 	add
 	stloc 4
-// 0x01066180: 0x1066180: addiu a2, zero, 443
+// 0x01066190: 0x1066190: addiu a2, zero, 443
 	ldc.i4 443
 	stloc.3
-// 0x01066184: 0x1066184: addiu a0, zero, 2
+// 0x01066194: 0x1066194: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01066188: 0x1066188: sw    ra, 28(sp)
-// 0x0106618c: 0x106618c: jal   0x100449c sw    s0, 16(sp)
+// 0x01066198: 0x1066198: sw    ra, 28(sp)
+// 0x0106619c: 0x106619c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -138,7 +138,7 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01066194: 0x1066194: jal   0x100db90 addu  a0, s0, zero
+// 0x010661a4: 0x10661a4: jal   0x100dba0 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -146,31 +146,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106619c: 0x106619c: lw    v0, 0(v0)
+// 0x010661ac: 0x10661ac: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010661a0: 0x10661a0: sll   zero, zero, 0
-// 0x010661a4: 0x10661a4: andi  v0, v0, 256
+// 0x010661b0: 0x10661b0: sll   zero, zero, 0
+// 0x010661b4: 0x10661b4: andi  v0, v0, 256
 	ldloc 5
 	ldc.i4 256
 	and
 	stloc 5
-// 0x010661a8: 0x10661a8: beq   v0, zero, 0x10661bc lui   v0, 0x70000
+// 0x010661b8: 0x10661b8: beq   v0, zero, 0x10661cc lui   v0, 0x70000
 	ldloc 5
 	ldc.i4 458752
 	stloc 5
-	brfalse L_10661bc
+	brfalse L_10661cc
 // --- basic block ---
-// 0x010661b0: 0x10661b0: jal   0x1064dac addu  a0, zero, zero
+// 0x010661c0: 0x10661c0: jal   0x1064dbc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -178,30 +178,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl75::instrument_segments_1064dac(int32,int32,int32,int32,int32)
+	call int32 Cibyl75::instrument_segments_1064dbc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010661b8: 0x10661b8: lui   v0, 0x70000
+// 0x010661c8: 0x10661c8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_10661bc:
-// 0x010661bc: 0x10661bc: lw    v0, 15804(v0)
+L_10661cc:
+// 0x010661cc: 0x10661cc: lw    v0, 16268(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3951
+	ldc.i4 4067
 	add
 	ldelem.i4
 	stloc 5
-// 0x010661c0: 0x10661c0: sll   zero, zero, 0
-// 0x010661c4: 0x10661c4: beq   v0, zero, 0x10661d4 sll   zero, zero, 0
+// 0x010661d0: 0x10661d0: sll   zero, zero, 0
+// 0x010661d4: 0x10661d4: beq   v0, zero, 0x10661e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10661d4
+	brfalse L_10661e4
 // --- basic block ---
-// 0x010661cc: 0x10661cc: jalr  v0 addu  a0, s0, zero
+// 0x010661dc: 0x10661dc: jalr  v0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
@@ -215,9 +215,9 @@ L_10661bc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_10661d4:
-// 0x010661d4: 0x10661d4: lw    ra, 28(sp)
-// 0x010661d8: 0x10661d8: lw    s0, 24(sp)
+L_10661e4:
+// 0x010661e4: 0x10661e4: lw    ra, 28(sp)
+// 0x010661e8: 0x10661e8: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -226,7 +226,7 @@ L_10661d4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010661dc: 0x10661dc: jr    ra addiu sp, sp, 32
+// 0x010661ec: 0x10661ec: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -238,7 +238,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_routing_response_10661e4(int32,int32,int32,int32,int32)
+.method public static int32 on_routing_response_10661f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s3,int32 s1,int32 s2,int32 s5,int32 s4,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -303,16 +303,16 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10661e4:
-// 0x010661e4: 0x10661e4: addiu sp, sp, -1088
+L_10661f4:
+// 0x010661f4: 0x10661f4: addiu sp, sp, -1088
 	ldloc.0
 	ldc.i4 -1088
 	add
 	stloc.0
-// 0x010661e8: 0x10661e8: addiu v0, zero, 18
+// 0x010661f8: 0x10661f8: addiu v0, zero, 18
 	ldc.i4.s 18
 	stloc 6
-// 0x010661ec: 0x10661ec: sw    a0, 1088(sp)
+// 0x010661fc: 0x10661fc: sw    a0, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -321,25 +321,25 @@ L_10661e4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010661f0: 0x10661f0: sw    v0, 0(a3)
+// 0x01066200: 0x1066200: sw    v0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010661f4: 0x10661f4: addiu a0, sp, 1088
+// 0x01066204: 0x1066204: addiu a0, sp, 1088
 	ldloc.0
 	ldc.i4 1088
 	add
 	stloc.1
-// 0x010661f8: 0x10661f8: addiu v0, zero, 1000
+// 0x01066208: 0x1066208: addiu v0, zero, 1000
 	ldc.i4 1000
 	stloc 6
-// 0x010661fc: 0x10661fc: addu  a1, a3, zero
+// 0x0106620c: 0x106620c: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x01066200: 0x1066200: sw    s4, 1064(sp)
+// 0x01066210: 0x1066210: sw    s4, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -348,8 +348,8 @@ L_10661e4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01066204: 0x1066204: sw    ra, 1084(sp)
-// 0x01066208: 0x1066208: sw    s8, 1080(sp)
+// 0x01066214: 0x1066214: sw    ra, 1084(sp)
+// 0x01066218: 0x1066218: sw    s8, 1080(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -358,7 +358,7 @@ L_10661e4:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0106620c: 0x106620c: sw    s7, 1076(sp)
+// 0x0106621c: 0x106621c: sw    s7, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -367,7 +367,7 @@ L_10661e4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01066210: 0x1066210: sw    s6, 1072(sp)
+// 0x01066220: 0x1066220: sw    s6, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -376,7 +376,7 @@ L_10661e4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01066214: 0x1066214: sw    s5, 1068(sp)
+// 0x01066224: 0x1066224: sw    s5, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -385,7 +385,7 @@ L_10661e4:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01066218: 0x1066218: sw    s3, 1060(sp)
+// 0x01066228: 0x1066228: sw    s3, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -394,7 +394,7 @@ L_10661e4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106621c: 0x106621c: sw    s2, 1056(sp)
+// 0x0106622c: 0x106622c: sw    s2, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -403,7 +403,7 @@ L_10661e4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01066220: 0x1066220: sw    s1, 1052(sp)
+// 0x01066230: 0x1066230: sw    s1, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -412,7 +412,7 @@ L_10661e4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01066224: 0x1066224: sw    s0, 1048(sp)
+// 0x01066234: 0x1066234: sw    s0, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -421,10 +421,10 @@ L_10661e4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01066228: 0x1066228: addu  s4, a3, zero
+// 0x01066238: 0x1066238: addu  s4, a3, zero
 	ldloc 4
 	stloc 13
-// 0x0106622c: 0x106622c: jal   0x1063ae8 sw    v0, 36(sp)
+// 0x0106623c: 0x106623c: jal   0x1063af8 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -438,12 +438,12 @@ L_10661e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl74::verify_route_id_1063ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl74::verify_route_id_1063af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066234: 0x1066234: lw    a0, 1088(sp)
+// 0x01066244: 0x1066244: lw    a0, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -452,32 +452,32 @@ L_10661e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066238: 0x1066238: beq   v0, zero, 0x1066700 addu  v1, a0, zero
+// 0x01066248: 0x1066248: beq   v0, zero, 0x1066710 addu  v1, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brfalse L_1066700
+	brfalse L_1066710
 // --- basic block ---
-// 0x01066240: 0x1066240: lui   a1, 0x0
+// 0x01066250: 0x1066250: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01066244: 0x1066244: addiu a1, a1, 28076
+// 0x01066254: 0x1066254: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01066248: 0x1066248: addiu s0, zero, 1
+// 0x01066258: 0x1066258: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x0106624c: 0x106624c: addu  a2, zero, zero
+// 0x0106625c: 0x106625c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01066250: 0x1066250: addiu a3, sp, 32
+// 0x01066260: 0x1066260: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x01066254: 0x1066254: jal   0x106855c sw    s0, 16(sp)
+// 0x01066264: 0x1066264: jal   0x106856c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -491,12 +491,12 @@ L_10661e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106625c: 0x106625c: bne   v0, zero, 0x1066280 sw    v0, 1088(sp)
+// 0x0106626c: 0x106626c: bne   v0, zero, 0x1066290 sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -506,34 +506,34 @@ L_10661e4:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1066280
+	brtrue L_1066290
 // --- basic block ---
-// 0x01066264: 0x1066264: lui   a1, 0x10000
+// 0x01066274: 0x1066274: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01066268: 0x1066268: lui   a3, 0x10000
+// 0x01066278: 0x1066278: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106626c: 0x106626c: addiu a1, a1, 13908
+// 0x0106627c: 0x106627c: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066270: 0x1066270: addiu a3, a3, 17260
+// 0x01066280: 0x1066280: addiu a3, a3, 17256
 	ldloc 4
-	ldc.i4 17260
+	ldc.i4 17256
 	add
 	stloc 4
-// 0x01066274: 0x1066274: addiu a0, zero, 4
+// 0x01066284: 0x1066284: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066278: 0x1066278: j	 0x10666c8 addiu a2, zero, 688
+// 0x01066288: 0x1066288: j	 0x10666d8 addiu a2, zero, 688
 	ldc.i4 688
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_1066280:
-// 0x01066280: 0x1066280: lw    v1, 32(sp)
+L_1066290:
+// 0x01066290: 0x1066290: lw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -542,43 +542,43 @@ L_1066280:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066284: 0x1066284: sll   zero, zero, 0
-// 0x01066288: 0x1066288: beq   v1, s0, 0x10662a8 addiu a1, zero, 2
+// 0x01066294: 0x1066294: sll   zero, zero, 0
+// 0x01066298: 0x1066298: beq   v1, s0, 0x10662b8 addiu a1, zero, 2
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	stloc.2
-	beq  L_10662a8
+	beq  L_10662b8
 // --- basic block ---
-// 0x01066290: 0x1066290: beq   v1, a1, 0x10662c8 addiu a0, zero, 3
+// 0x010662a0: 0x10662a0: beq   v1, a1, 0x10662d8 addiu a0, zero, 3
 	ldloc 7
 	ldloc.2
 	ldc.i4.3
 	stloc.1
-	beq  L_10662c8
+	beq  L_10662d8
 // --- basic block ---
-// 0x01066298: 0x1066298: bne   v1, a0, 0x10662f0 lui   a3, 0x10000
+// 0x010662a8: 0x10662a8: bne   v1, a0, 0x1066300 lui   a3, 0x10000
 	ldloc 7
 	ldloc.1
 	ldc.i4 65536
 	stloc 4
-	bne.un L_10662f0
+	bne.un L_1066300
 // --- basic block ---
-// 0x010662a0: 0x10662a0: j	 0x10662dc lui   a0, 0x70000
+// 0x010662b0: 0x10662b0: j	 0x10662ec lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-	br L_10662dc
+	br L_10662ec
 // --- basic block ---
-L_10662a8:
-// 0x010662a8: 0x10662a8: lui   a0, 0x70000
+L_10662b8:
+// 0x010662b8: 0x10662b8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010662ac: 0x10662ac: addiu a0, a0, 15808
+// 0x010662bc: 0x10662bc: addiu a0, a0, 16272
 	ldloc.1
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc.1
-// 0x010662b0: 0x10662b0: lw    a1, 12(a0)
+// 0x010662c0: 0x10662c0: lw    a1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -587,13 +587,13 @@ L_10662a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010662b4: 0x10662b4: sll   zero, zero, 0
-// 0x010662b8: 0x10662b8: addiu a2, a1, 1
+// 0x010662c4: 0x10662c4: sll   zero, zero, 0
+// 0x010662c8: 0x10662c8: addiu a2, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.3
-// 0x010662bc: 0x10662bc: sw    a2, 12(a0)
+// 0x010662cc: 0x10662cc: sw    a2, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -602,7 +602,7 @@ L_10662a8:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010662c0: 0x10662c0: j	 0x1066318 sw    a1, 20(a0)
+// 0x010662d0: 0x10662d0: j	 0x1066328 sw    a1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -611,18 +611,18 @@ L_10662a8:
 	add
 	ldloc.2
 	stelem.i4
-	br L_1066318
+	br L_1066328
 // --- basic block ---
-L_10662c8:
-// 0x010662c8: 0x10662c8: lui   a0, 0x70000
+L_10662d8:
+// 0x010662d8: 0x10662d8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x010662cc: 0x10662cc: addiu a0, a0, 15808
+// 0x010662dc: 0x10662dc: addiu a0, a0, 16272
 	ldloc.1
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc.1
-// 0x010662d0: 0x10662d0: sw    s0, 12(a0)
+// 0x010662e0: 0x10662e0: sw    s0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -631,7 +631,7 @@ L_10662c8:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010662d4: 0x10662d4: j	 0x1066318 sw    zero, 20(a0)
+// 0x010662e4: 0x10662e4: j	 0x1066328 sw    zero, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -640,15 +640,15 @@ L_10662c8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1066318
+	br L_1066328
 // --- basic block ---
-L_10662dc:
-// 0x010662dc: 0x10662dc: addiu a0, a0, 15808
+L_10662ec:
+// 0x010662ec: 0x10662ec: addiu a0, a0, 16272
 	ldloc.1
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc.1
-// 0x010662e0: 0x10662e0: sw    s0, 16(a0)
+// 0x010662f0: 0x10662f0: sw    s0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -657,7 +657,7 @@ L_10662dc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010662e4: 0x10662e4: sw    a1, 12(a0)
+// 0x010662f4: 0x10662f4: sw    a1, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -666,7 +666,7 @@ L_10662dc:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010662e8: 0x10662e8: j	 0x1066318 sw    s0, 20(a0)
+// 0x010662f8: 0x10662f8: j	 0x1066328 sw    s0, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -675,29 +675,29 @@ L_10662dc:
 	add
 	ldloc 8
 	stelem.i4
-	br L_1066318
+	br L_1066328
 // --- basic block ---
-L_10662f0:
-// 0x010662f0: 0x10662f0: lui   a1, 0x10000
+L_1066300:
+// 0x01066300: 0x1066300: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010662f4: 0x10662f4: addiu a1, a1, 13908
+// 0x01066304: 0x1066304: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010662f8: 0x10662f8: addiu a3, a3, 17308
+// 0x01066308: 0x1066308: addiu a3, a3, 17304
 	ldloc 4
-	ldc.i4 17308
+	ldc.i4 17304
 	add
 	stloc 4
-// 0x010662fc: 0x10662fc: addiu a0, zero, 4
+// 0x0106630c: 0x106630c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066300: 0x1066300: addiu a2, zero, 709
+// 0x01066310: 0x1066310: addiu a2, zero, 709
 	ldc.i4 709
 	stloc.3
-// 0x01066304: 0x1066304: sw    v1, 16(sp)
+// 0x01066314: 0x1066314: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -706,8 +706,8 @@ L_10662f0:
 	add
 	ldloc 7
 	stelem.i4
-L_1066308:
-// 0x01066308: 0x1066308: jal   0x100449c sll   zero, zero, 0
+L_1066318:
+// 0x01066318: 0x1066318: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -718,21 +718,21 @@ L_1066308:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066310: 0x1066310: j	 0x1066700 addu  v1, zero, zero
+// 0x01066320: 0x1066320: j	 0x1066710 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1066700
+	br L_1066710
 // --- basic block ---
-L_1066318:
-// 0x01066318: 0x1066318: lui   s3, 0x70000
+L_1066328:
+// 0x01066328: 0x1066328: lui   s3, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x0106631c: 0x106631c: addiu s3, s3, 15808
+// 0x0106632c: 0x106632c: addiu s3, s3, 16272
 	ldloc 9
-	ldc.i4 15808
+	ldc.i4 16272
 	add
 	stloc 9
-// 0x01066320: 0x1066320: lw    s0, 20(s3)
+// 0x01066330: 0x1066330: lw    s0, 20(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -741,29 +741,29 @@ L_1066318:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01066324: 0x1066324: addiu a0, zero, 44
+// 0x01066334: 0x1066334: addiu a0, zero, 44
 	ldc.i4.s 44
 	stloc.1
-// 0x01066328: 0x1066328: mult  s0, a0
+// 0x01066338: 0x1066338: mult  s0, a0
 	ldloc 8
 	ldloc.1
 	mul
 	stloc 18
-// 0x0106632c: 0x106632c: lui   s0, 0x70000
+// 0x0106633c: 0x106633c: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 8
-// 0x01066330: 0x1066330: addu  a0, v0, zero
+// 0x01066340: 0x1066340: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01066334: 0x1066334: addiu s0, s0, 15844
+// 0x01066344: 0x1066344: addiu s0, s0, 16308
 	ldloc 8
-	ldc.i4 15844
+	ldc.i4 16308
 	add
 	stloc 8
-// 0x01066338: 0x1066338: addiu s1, zero, 1
+// 0x01066348: 0x1066348: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x0106633c: 0x106633c: sw    s1, 16(sp)
+// 0x0106634c: 0x106634c: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -772,26 +772,26 @@ L_1066318:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01066340: 0x1066340: lui   s2, 0x0
+// 0x01066350: 0x1066350: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 11
-// 0x01066344: 0x1066344: addiu a1, s2, 28076
+// 0x01066354: 0x1066354: addiu a1, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01066348: 0x1066348: addu  a2, zero, zero
+// 0x01066358: 0x1066358: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0106634c: 0x106634c: mflo  lo
+// 0x0106635c: 0x106635c: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x01066350: 0x1066350: addu  s0, s0, v0
+// 0x01066360: 0x1066360: addu  s0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x01066354: 0x1066354: sw    v1, 24(s0)
+// 0x01066364: 0x1066364: sw    v1, 24(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -800,7 +800,7 @@ L_1066318:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066358: 0x1066358: lw    v0, 24(s3)
+// 0x01066368: 0x1066368: lw    v0, 24(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -809,12 +809,12 @@ L_1066318:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106635c: 0x106635c: addiu a3, s0, 16
+// 0x0106636c: 0x106636c: addiu a3, s0, 16
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 4
-// 0x01066360: 0x1066360: jal   0x106855c sw    v0, 0(s0)
+// 0x01066370: 0x1066370: jal   0x106856c sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -826,12 +826,12 @@ L_1066318:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066368: 0x1066368: bne   v0, zero, 0x106638c sw    v0, 1088(sp)
+// 0x01066378: 0x1066378: bne   v0, zero, 0x106639c sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -841,55 +841,55 @@ L_1066318:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_106638c
+	brtrue L_106639c
 // --- basic block ---
-// 0x01066370: 0x1066370: lui   a1, 0x10000
+// 0x01066380: 0x1066380: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01066374: 0x1066374: lui   a3, 0x10000
+// 0x01066384: 0x1066384: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066378: 0x1066378: addiu a1, a1, 13908
+// 0x01066388: 0x1066388: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x0106637c: 0x106637c: addiu a3, a3, 17360
+// 0x0106638c: 0x106638c: addiu a3, a3, 17356
 	ldloc 4
-	ldc.i4 17360
+	ldc.i4 17356
 	add
 	stloc 4
-// 0x01066380: 0x1066380: addiu a0, zero, 4
+// 0x01066390: 0x1066390: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066384: 0x1066384: j	 0x10666c8 addiu a2, zero, 726
+// 0x01066394: 0x1066394: j	 0x10666d8 addiu a2, zero, 726
 	ldc.i4 726
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_106638c:
-// 0x0106638c: 0x106638c: addiu s5, sp, 48
+L_106639c:
+// 0x0106639c: 0x106639c: addiu s5, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 12
-// 0x01066390: 0x1066390: addu  a0, v0, zero
+// 0x010663a0: 0x10663a0: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01066394: 0x1066394: addu  a1, s5, zero
+// 0x010663a4: 0x10663a4: addu  a1, s5, zero
 	ldloc 12
 	stloc.2
-// 0x01066398: 0x1066398: addiu a2, sp, 36
+// 0x010663a8: 0x10663a8: addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.3
-// 0x0106639c: 0x106639c: addiu a3, s2, 28076
+// 0x010663ac: 0x10663ac: addiu a3, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc 4
-// 0x010663a0: 0x10663a0: jal   0x1068250 sw    s1, 16(sp)
+// 0x010663b0: 0x10663b0: jal   0x1068260 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -903,12 +903,12 @@ L_106638c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010663a8: 0x10663a8: bne   v0, zero, 0x10663cc sw    v0, 1088(sp)
+// 0x010663b8: 0x10663b8: bne   v0, zero, 0x10663dc sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -918,34 +918,34 @@ L_106638c:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_10663cc
+	brtrue L_10663dc
 // --- basic block ---
-// 0x010663b0: 0x10663b0: lui   a1, 0x10000
+// 0x010663c0: 0x10663c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010663b4: 0x10663b4: lui   a3, 0x10000
+// 0x010663c4: 0x10663c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010663b8: 0x10663b8: addiu a1, a1, 13908
+// 0x010663c8: 0x10663c8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010663bc: 0x10663bc: addiu a3, a3, 17408
+// 0x010663cc: 0x10663cc: addiu a3, a3, 17404
 	ldloc 4
-	ldc.i4 17408
+	ldc.i4 17404
 	add
 	stloc 4
-// 0x010663c0: 0x10663c0: addiu a0, zero, 4
+// 0x010663d0: 0x10663d0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010663c4: 0x10663c4: j	 0x10666c8 addiu a2, zero, 733
+// 0x010663d4: 0x10663d4: j	 0x10666d8 addiu a2, zero, 733
 	ldc.i4 733
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_10663cc:
-// 0x010663cc: 0x10663cc: jal   0x1001ba8 addu  a0, s5, zero
+L_10663dc:
+// 0x010663dc: 0x10663dc: jal   0x1001ba8 addu  a0, s5, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -958,7 +958,7 @@ L_10663cc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010663d4: 0x10663d4: lw    a0, 1088(sp)
+// 0x010663e4: 0x10663e4: lw    a0, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -967,12 +967,12 @@ L_10663cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010663d8: 0x10663d8: addiu a1, s2, 28076
+// 0x010663e8: 0x10663e8: addiu a1, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x010663dc: 0x10663dc: sw    v0, 20(s0)
+// 0x010663ec: 0x10663ec: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -981,15 +981,15 @@ L_10663cc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010663e0: 0x10663e0: addu  a2, zero, zero
+// 0x010663f0: 0x10663f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010663e4: 0x10663e4: addiu a3, s0, 4
+// 0x010663f4: 0x10663f4: addiu a3, s0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 4
-// 0x010663e8: 0x10663e8: jal   0x106855c sw    s1, 16(sp)
+// 0x010663f8: 0x10663f8: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1003,12 +1003,12 @@ L_10663cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010663f0: 0x10663f0: bne   v0, zero, 0x1066414 sw    v0, 1088(sp)
+// 0x01066400: 0x1066400: bne   v0, zero, 0x1066424 sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1018,50 +1018,50 @@ L_10663cc:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1066414
+	brtrue L_1066424
 // --- basic block ---
-// 0x010663f8: 0x10663f8: lui   a1, 0x10000
+// 0x01066408: 0x1066408: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010663fc: 0x10663fc: lui   a3, 0x10000
+// 0x0106640c: 0x106640c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066400: 0x1066400: addiu a1, a1, 13908
+// 0x01066410: 0x1066410: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066404: 0x1066404: addiu a3, a3, 17468
+// 0x01066414: 0x1066414: addiu a3, a3, 17464
 	ldloc 4
-	ldc.i4 17468
+	ldc.i4 17464
 	add
 	stloc 4
-// 0x01066408: 0x1066408: addiu a0, zero, 4
+// 0x01066418: 0x1066418: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106640c: 0x106640c: j	 0x10666c8 addiu a2, zero, 746
+// 0x0106641c: 0x106641c: j	 0x10666d8 addiu a2, zero, 746
 	ldc.i4 746
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_1066414:
-// 0x01066414: 0x1066414: addu  a0, v0, zero
+L_1066424:
+// 0x01066424: 0x1066424: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01066418: 0x1066418: addiu a1, s2, 28076
+// 0x01066428: 0x1066428: addiu a1, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x0106641c: 0x106641c: addu  a2, zero, zero
+// 0x0106642c: 0x106642c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01066420: 0x1066420: addiu a3, s0, 8
+// 0x01066430: 0x1066430: addiu a3, s0, 8
 	ldloc 8
 	ldc.i4.8
 	add
 	stloc 4
-// 0x01066424: 0x1066424: jal   0x106855c sw    s1, 16(sp)
+// 0x01066434: 0x1066434: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1075,12 +1075,12 @@ L_1066414:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106642c: 0x106642c: bne   v0, zero, 0x1066450 sw    v0, 1088(sp)
+// 0x0106643c: 0x106643c: bne   v0, zero, 0x1066460 sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1090,50 +1090,50 @@ L_1066414:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1066450
+	brtrue L_1066460
 // --- basic block ---
-// 0x01066434: 0x1066434: lui   a1, 0x10000
+// 0x01066444: 0x1066444: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01066438: 0x1066438: lui   a3, 0x10000
+// 0x01066448: 0x1066448: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106643c: 0x106643c: addiu a1, a1, 13908
+// 0x0106644c: 0x106644c: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066440: 0x1066440: addiu a3, a3, 17524
+// 0x01066450: 0x1066450: addiu a3, a3, 17520
 	ldloc 4
-	ldc.i4 17524
+	ldc.i4 17520
 	add
 	stloc 4
-// 0x01066444: 0x1066444: addiu a0, zero, 4
+// 0x01066454: 0x1066454: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066448: 0x1066448: j	 0x10666c8 addiu a2, zero, 758
+// 0x01066458: 0x1066458: j	 0x10666d8 addiu a2, zero, 758
 	ldc.i4 758
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_1066450:
-// 0x01066450: 0x1066450: addu  a0, v0, zero
+L_1066460:
+// 0x01066460: 0x1066460: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01066454: 0x1066454: addiu a1, s2, 28076
+// 0x01066464: 0x1066464: addiu a1, s2, 28076
 	ldloc 11
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01066458: 0x1066458: addu  a2, zero, zero
+// 0x01066468: 0x1066468: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0106645c: 0x106645c: addiu a3, s0, 12
+// 0x0106646c: 0x106646c: addiu a3, s0, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
 	stloc 4
-// 0x01066460: 0x1066460: jal   0x106855c sw    s1, 16(sp)
+// 0x01066470: 0x1066470: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1147,12 +1147,12 @@ L_1066450:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066468: 0x1066468: bne   v0, zero, 0x106648c sw    v0, 1088(sp)
+// 0x01066478: 0x1066478: bne   v0, zero, 0x106649c sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1162,34 +1162,34 @@ L_1066450:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_106648c
+	brtrue L_106649c
 // --- basic block ---
-// 0x01066470: 0x1066470: lui   a1, 0x10000
+// 0x01066480: 0x1066480: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01066474: 0x1066474: lui   a3, 0x10000
+// 0x01066484: 0x1066484: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066478: 0x1066478: addiu a1, a1, 13908
+// 0x01066488: 0x1066488: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x0106647c: 0x106647c: addiu a3, a3, 17576
+// 0x0106648c: 0x106648c: addiu a3, a3, 17572
 	ldloc 4
-	ldc.i4 17576
+	ldc.i4 17572
 	add
 	stloc 4
-// 0x01066480: 0x1066480: addiu a0, zero, 4
+// 0x01066490: 0x1066490: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066484: 0x1066484: j	 0x10666c8 addiu a2, zero, 770
+// 0x01066494: 0x1066494: j	 0x10666d8 addiu a2, zero, 770
 	ldc.i4 770
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_106648c:
-// 0x0106648c: 0x106648c: lw    a0, 32(sp)
+L_106649c:
+// 0x0106649c: 0x106649c: lw    a0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1198,17 +1198,17 @@ L_106648c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066490: 0x1066490: addiu v1, zero, 2
+// 0x010664a0: 0x10664a0: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x01066494: 0x1066494: bne   a0, v1, 0x10664b0 lui   a1, 0x10000
+// 0x010664a4: 0x10664a4: bne   a0, v1, 0x10664c0 lui   a1, 0x10000
 	ldloc.1
 	ldloc 7
 	ldc.i4 65536
 	stloc.2
-	bne.un L_10664b0
+	bne.un L_10664c0
 // --- basic block ---
-// 0x0106649c: 0x106649c: lw    v1, 12(s0)
+// 0x010664ac: 0x10664ac: lw    v1, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1217,7 +1217,7 @@ L_106648c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010664a0: 0x10664a0: lw    a0, 476(s3)
+// 0x010664b0: 0x10664b0: lw    a0, 476(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1226,13 +1226,13 @@ L_106648c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010664a4: 0x10664a4: sll   zero, zero, 0
-// 0x010664a8: 0x10664a8: subu  v1, a0, v1
+// 0x010664b4: 0x10664b4: sll   zero, zero, 0
+// 0x010664b8: 0x10664b8: subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-// 0x010664ac: 0x10664ac: sw    v1, 480(s3)
+// 0x010664bc: 0x10664bc: sw    v1, 480(s3)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -1241,27 +1241,27 @@ L_106648c:
 	add
 	ldloc 7
 	stelem.i4
-L_10664b0:
-// 0x010664b0: 0x10664b0: addu  a0, v0, zero
+L_10664c0:
+// 0x010664c0: 0x10664c0: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x010664b4: 0x10664b4: addiu a1, a1, -7696
+// 0x010664c4: 0x10664c4: addiu a1, a1, -7700
 	ldloc.2
-	ldc.i4 -7696
+	ldc.i4 -7700
 	add
 	stloc.2
-// 0x010664b8: 0x10664b8: addiu v0, zero, 1
+// 0x010664c8: 0x10664c8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x010664bc: 0x10664bc: addu  a2, zero, zero
+// 0x010664cc: 0x10664cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010664c0: 0x10664c0: addiu a3, sp, 28
+// 0x010664d0: 0x10664d0: addiu a3, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x010664c4: 0x10664c4: jal   0x106855c sw    v0, 16(sp)
+// 0x010664d4: 0x10664d4: jal   0x106856c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1275,12 +1275,12 @@ L_10664b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010664cc: 0x10664cc: bne   v0, zero, 0x1066658 sw    v0, 1088(sp)
+// 0x010664dc: 0x10664dc: bne   v0, zero, 0x1066668 sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1290,40 +1290,40 @@ L_10664b0:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1066658
+	brtrue L_1066668
 // --- basic block ---
-// 0x010664d4: 0x10664d4: lui   a1, 0x10000
+// 0x010664e4: 0x10664e4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010664d8: 0x10664d8: lui   a3, 0x10000
+// 0x010664e8: 0x10664e8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010664dc: 0x10664dc: addiu a1, a1, 13908
+// 0x010664ec: 0x10664ec: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010664e0: 0x10664e0: addiu a3, a3, 17628
+// 0x010664f0: 0x10664f0: addiu a3, a3, 17624
 	ldloc 4
-	ldc.i4 17628
+	ldc.i4 17624
 	add
 	stloc 4
-// 0x010664e4: 0x10664e4: addiu a0, zero, 4
+// 0x010664f4: 0x10664f4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010664e8: 0x10664e8: j	 0x10666c8 addiu a2, zero, 787
+// 0x010664f8: 0x10664f8: j	 0x10666d8 addiu a2, zero, 787
 	ldc.i4 787
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_10664f0:
-// 0x010664f0: 0x10664f0: addu  a1, s3, zero
+L_1066500:
+// 0x01066500: 0x1066500: addu  a1, s3, zero
 	ldloc 9
 	stloc.2
-// 0x010664f4: 0x10664f4: addu  a3, s8, zero
+// 0x01066504: 0x1066504: addu  a3, s8, zero
 	ldloc 16
 	stloc 4
-// 0x010664f8: 0x10664f8: jal   0x106855c sw    s1, 16(sp)
+// 0x01066508: 0x1066508: jal   0x106856c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1337,12 +1337,12 @@ L_10664f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066500: 0x1066500: bne   v0, zero, 0x1066524 sw    v0, 1088(sp)
+// 0x01066510: 0x1066510: bne   v0, zero, 0x1066534 sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1352,34 +1352,34 @@ L_10664f0:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1066524
+	brtrue L_1066534
 // --- basic block ---
-// 0x01066508: 0x1066508: lui   a1, 0x10000
+// 0x01066518: 0x1066518: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106650c: 0x106650c: lui   a3, 0x10000
+// 0x0106651c: 0x106651c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066510: 0x1066510: addiu a1, a1, 13908
+// 0x01066520: 0x1066520: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066514: 0x1066514: addiu a3, a3, 17676
+// 0x01066524: 0x1066524: addiu a3, a3, 17672
 	ldloc 4
-	ldc.i4 17676
+	ldc.i4 17672
 	add
 	stloc 4
-// 0x01066518: 0x1066518: addiu a0, zero, 4
+// 0x01066528: 0x1066528: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106651c: 0x106651c: j	 0x10666c8 addiu a2, zero, 804
+// 0x0106652c: 0x106652c: j	 0x10666d8 addiu a2, zero, 804
 	ldc.i4 804
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_1066524:
-// 0x01066524: 0x1066524: lw    v1, 28(sp)
+L_1066534:
+// 0x01066534: 0x1066534: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1388,13 +1388,13 @@ L_1066524:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066528: 0x1066528: sll   zero, zero, 0
-// 0x0106652c: 0x106652c: addiu v1, v1, -1
+// 0x01066538: 0x1066538: sll   zero, zero, 0
+// 0x0106653c: 0x106653c: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01066530: 0x1066530: bne   v1, zero, 0x1066554 sw    v1, 28(sp)
+// 0x01066540: 0x1066540: bne   v1, zero, 0x1066564 sw    v1, 28(sp)
 	ldloc 7
 	ldloc 5
 	ldloc.0
@@ -1404,46 +1404,46 @@ L_1066524:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1066554
+	brtrue L_1066564
 // --- basic block ---
-// 0x01066538: 0x1066538: lui   a1, 0x10000
+// 0x01066548: 0x1066548: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106653c: 0x106653c: lui   a3, 0x10000
+// 0x0106654c: 0x106654c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066540: 0x1066540: addiu a1, a1, 13908
+// 0x01066550: 0x1066550: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066544: 0x1066544: addiu a3, a3, 17728
+// 0x01066554: 0x1066554: addiu a3, a3, 17724
 	ldloc 4
-	ldc.i4 17728
+	ldc.i4 17724
 	add
 	stloc 4
-// 0x01066548: 0x1066548: addiu a0, zero, 4
+// 0x01066558: 0x1066558: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106654c: 0x106654c: j	 0x10666c8 addiu a2, zero, 811
+// 0x0106655c: 0x106655c: j	 0x10666d8 addiu a2, zero, 811
 	ldc.i4 811
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_1066554:
-// 0x01066554: 0x1066554: addu  a0, v0, zero
+L_1066564:
+// 0x01066564: 0x1066564: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x01066558: 0x1066558: addu  a1, s6, zero
+// 0x01066568: 0x1066568: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x0106655c: 0x106655c: addu  a2, s7, zero
+// 0x0106656c: 0x106656c: addu  a2, s7, zero
 	ldloc 15
 	stloc.3
-// 0x01066560: 0x1066560: addu  a3, s3, zero
+// 0x01066570: 0x1066570: addu  a3, s3, zero
 	ldloc 9
 	stloc 4
-// 0x01066564: 0x1066564: sw    s2, 44(sp)
+// 0x01066574: 0x1066574: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1452,7 +1452,7 @@ L_1066554:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01066568: 0x1066568: jal   0x1068434 sw    s1, 16(sp)
+// 0x01066578: 0x1066578: jal   0x1068444 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1466,12 +1466,12 @@ L_1066554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractString_1068434(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractString_1068444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066570: 0x1066570: bne   v0, zero, 0x1066594 sw    v0, 1088(sp)
+// 0x01066580: 0x1066580: bne   v0, zero, 0x10665a4 sw    v0, 1088(sp)
 	ldloc 6
 	ldloc 5
 	ldloc.0
@@ -1481,40 +1481,40 @@ L_1066554:
 	add
 	ldloc 6
 	stelem.i4
-	brtrue L_1066594
+	brtrue L_10665a4
 // --- basic block ---
-// 0x01066578: 0x1066578: lui   a1, 0x10000
+// 0x01066588: 0x1066588: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106657c: 0x106657c: lui   a3, 0x10000
+// 0x0106658c: 0x106658c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066580: 0x1066580: addiu a1, a1, 13908
+// 0x01066590: 0x1066590: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x01066584: 0x1066584: addiu a3, a3, 17784
+// 0x01066594: 0x1066594: addiu a3, a3, 17780
 	ldloc 4
-	ldc.i4 17784
+	ldc.i4 17780
 	add
 	stloc 4
-// 0x01066588: 0x1066588: addiu a0, zero, 4
+// 0x01066598: 0x1066598: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106658c: 0x106658c: j	 0x10666c8 addiu a2, zero, 818
+// 0x0106659c: 0x106659c: j	 0x10666d8 addiu a2, zero, 818
 	ldc.i4 818
 	stloc.3
-	br L_10666c8
+	br L_10666d8
 // --- basic block ---
-L_1066594:
-// 0x01066594: 0x1066594: lb    v1, 24(sp)
+L_10665a4:
+// 0x010665a4: 0x10665a4: lb    v1, 24(sp)
 	ldloc.0
 	ldc.i4.s 24
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01066598: 0x1066598: lw    v0, 40(sp)
+// 0x010665a8: 0x10665a8: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1523,147 +1523,147 @@ L_1066594:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106659c: 0x106659c: xori  v1, v1, 84
+// 0x010665ac: 0x10665ac: xori  v1, v1, 84
 	ldloc 7
 	ldc.i4.s 84
 	xor
 	stloc 7
-// 0x010665a0: 0x10665a0: beq   v0, s1, 0x10665c0 sltiu v1, v1, 1
+// 0x010665b0: 0x10665b0: beq   v0, s1, 0x10665d0 sltiu v1, v1, 1
 	ldloc 6
 	ldloc 10
 	ldloc 7
 	ldc.i4.1
 	clt.un
 	stloc 7
-	beq  L_10665c0
+	beq  L_10665d0
 // --- basic block ---
-// 0x010665a8: 0x10665a8: beq   v0, s2, 0x10665d4 sll   zero, zero, 0
+// 0x010665b8: 0x10665b8: beq   v0, s2, 0x10665e4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 11
-	beq  L_10665d4
+	beq  L_10665e4
 // --- basic block ---
-// 0x010665b0: 0x10665b0: bne   v0, s5, 0x1066604 sll   zero, zero, 0
+// 0x010665c0: 0x10665c0: bne   v0, s5, 0x1066614 sll   zero, zero, 0
 	ldloc 6
 	ldloc 12
-	bne.un L_1066604
+	bne.un L_1066614
 // --- basic block ---
-// 0x010665b8: 0x10665b8: j	 0x10665e8 sll   zero, zero, 0
-	br L_10665e8
+// 0x010665c8: 0x10665c8: j	 0x10665f8 sll   zero, zero, 0
+	br L_10665f8
 // --- basic block ---
-L_10665c0:
-// 0x010665c0: 0x10665c0: beq   v1, zero, 0x1066644 sll   zero, zero, 0
+L_10665d0:
+// 0x010665d0: 0x10665d0: beq   v1, zero, 0x1066654 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1066644
+	brfalse L_1066654
 // --- basic block ---
-// 0x010665c8: 0x10665c8: lw    v0, 0(s0)
+// 0x010665d8: 0x10665d8: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010665cc: 0x10665cc: j	 0x10665fc ori   v0, v0, 256
+// 0x010665dc: 0x10665dc: j	 0x106660c ori   v0, v0, 256
 	ldloc 6
 	ldc.i4 256
 	or
 	stloc 6
-	br L_10665fc
+	br L_106660c
 // --- basic block ---
-L_10665d4:
-// 0x010665d4: 0x10665d4: beq   v1, zero, 0x1066644 sll   zero, zero, 0
+L_10665e4:
+// 0x010665e4: 0x10665e4: beq   v1, zero, 0x1066654 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1066644
+	brfalse L_1066654
 // --- basic block ---
-// 0x010665dc: 0x10665dc: lw    v0, 0(s0)
+// 0x010665ec: 0x10665ec: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010665e0: 0x10665e0: j	 0x10665fc ori   v0, v0, 128
+// 0x010665f0: 0x10665f0: j	 0x106660c ori   v0, v0, 128
 	ldloc 6
 	ldc.i4 128
 	or
 	stloc 6
-	br L_10665fc
+	br L_106660c
 // --- basic block ---
-L_10665e8:
-// 0x010665e8: 0x10665e8: beq   v1, zero, 0x1066644 sll   zero, zero, 0
+L_10665f8:
+// 0x010665f8: 0x10665f8: beq   v1, zero, 0x1066654 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1066644
+	brfalse L_1066654
 // --- basic block ---
-// 0x010665f0: 0x10665f0: lw    v0, 0(s0)
+// 0x01066600: 0x1066600: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010665f4: 0x10665f4: sll   zero, zero, 0
-// 0x010665f8: 0x10665f8: ori   v0, v0, 64
+// 0x01066604: 0x1066604: sll   zero, zero, 0
+// 0x01066608: 0x1066608: ori   v0, v0, 64
 	ldloc 6
 	ldc.i4.s 64
 	or
 	stloc 6
-L_10665fc:
-// 0x010665fc: 0x10665fc: j	 0x1066644 sw    v0, 0(s0)
+L_106660c:
+// 0x0106660c: 0x106660c: j	 0x1066654 sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_1066644
+	br L_1066654
 // --- basic block ---
-L_1066604:
-// 0x01066604: 0x1066604: bne   v1, zero, 0x1066618 sll   zero, zero, 0
+L_1066614:
+// 0x01066614: 0x1066614: bne   v1, zero, 0x1066628 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1066618
+	brtrue L_1066628
 // --- basic block ---
-// 0x0106660c: 0x106660c: lui   v1, 0x20000
+// 0x0106661c: 0x106661c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01066610: 0x1066610: j	 0x1066620 addiu v1, v1, 18636
+// 0x01066620: 0x1066620: j	 0x1066630 addiu v1, v1, 19096
 	ldloc 7
-	ldc.i4 18636
+	ldc.i4 19096
 	add
 	stloc 7
-	br L_1066620
+	br L_1066630
 // --- basic block ---
-L_1066618:
-// 0x01066618: 0x1066618: lui   v1, 0x10000
+L_1066628:
+// 0x01066628: 0x1066628: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x0106661c: 0x106661c: addiu v1, v1, 12208
+// 0x0106662c: 0x106662c: addiu v1, v1, 12204
 	ldloc 7
-	ldc.i4 12208
+	ldc.i4 12204
 	add
 	stloc 7
-L_1066620:
-// 0x01066620: 0x1066620: lui   a1, 0x10000
+L_1066630:
+// 0x01066630: 0x1066630: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01066624: 0x1066624: lui   a3, 0x10000
+// 0x01066634: 0x1066634: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01066628: 0x1066628: addiu a1, a1, 13908
+// 0x01066638: 0x1066638: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x0106662c: 0x106662c: addiu a3, a3, 17840
+// 0x0106663c: 0x106663c: addiu a3, a3, 17836
 	ldloc 4
-	ldc.i4 17840
+	ldc.i4 17836
 	add
 	stloc 4
-// 0x01066630: 0x1066630: addiu a0, zero, 4
+// 0x01066640: 0x1066640: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01066634: 0x1066634: addiu a2, zero, 491
+// 0x01066644: 0x1066644: addiu a2, zero, 491
 	ldc.i4 491
 	stloc.3
-// 0x01066638: 0x1066638: sw    v0, 16(sp)
+// 0x01066648: 0x1066648: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1672,7 +1672,7 @@ L_1066620:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106663c: 0x106663c: j	 0x1066308 sw    v1, 20(sp)
+// 0x0106664c: 0x106664c: j	 0x1066318 sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1681,10 +1681,10 @@ L_1066620:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1066308
+	br L_1066318
 // --- basic block ---
-L_1066644:
-// 0x01066644: 0x1066644: lw    v0, 28(sp)
+L_1066654:
+// 0x01066654: 0x1066654: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1693,13 +1693,13 @@ L_1066644:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066648: 0x1066648: sll   zero, zero, 0
-// 0x0106664c: 0x106664c: addiu v0, v0, -1
+// 0x01066658: 0x1066658: sll   zero, zero, 0
+// 0x0106665c: 0x106665c: addiu v0, v0, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x01066650: 0x1066650: j	 0x1066678 sw    v0, 28(sp)
+// 0x01066660: 0x1066660: j	 0x1066688 sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1708,43 +1708,43 @@ L_1066644:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1066678
+	br L_1066688
 // --- basic block ---
-L_1066658:
-// 0x01066658: 0x1066658: lui   s3, 0x0
+L_1066668:
+// 0x01066668: 0x1066668: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0106665c: 0x106665c: addiu s3, s3, 28076
+// 0x0106666c: 0x106666c: addiu s3, s3, 28076
 	ldloc 9
 	ldc.i4 28076
 	add
 	stloc 9
-// 0x01066660: 0x1066660: addiu s8, sp, 40
+// 0x01066670: 0x1066670: addiu s8, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 16
-// 0x01066664: 0x1066664: addiu s1, zero, 1
+// 0x01066674: 0x1066674: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 10
-// 0x01066668: 0x1066668: addiu s2, zero, 2
+// 0x01066678: 0x1066678: addiu s2, zero, 2
 	ldc.i4.2
 	stloc 11
-// 0x0106666c: 0x106666c: addiu s7, sp, 44
+// 0x0106667c: 0x106667c: addiu s7, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 15
-// 0x01066670: 0x1066670: addiu s6, sp, 24
+// 0x01066680: 0x1066680: addiu s6, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 14
-// 0x01066674: 0x1066674: addiu s5, zero, 3
+// 0x01066684: 0x1066684: addiu s5, zero, 3
 	ldc.i4.3
 	stloc 12
-L_1066678:
-// 0x01066678: 0x1066678: lw    v0, 28(sp)
+L_1066688:
+// 0x01066688: 0x1066688: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1753,7 +1753,7 @@ L_1066678:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106667c: 0x106667c: lw    a0, 1088(sp)
+// 0x0106668c: 0x106668c: lw    a0, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1762,30 +1762,30 @@ L_1066678:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066680: 0x1066680: bgtz  v0, 0x10664f0 addu  a2, zero, zero
+// 0x01066690: 0x1066690: bgtz  v0, 0x1066500 addu  a2, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc.3
 	ldc.i4.s 0
-	bgt L_10664f0
+	bgt L_1066500
 // --- basic block ---
-// 0x01066688: 0x1066688: lui   a1, 0x0
+// 0x01066698: 0x1066698: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0106668c: 0x106668c: addiu a1, a1, 30268
+// 0x0106669c: 0x106669c: addiu a1, a1, 30268
 	ldloc.2
 	ldc.i4 30268
 	add
 	stloc.2
-// 0x01066690: 0x1066690: addiu v0, zero, -1
+// 0x010666a0: 0x10666a0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01066694: 0x1066694: addiu a3, s0, 28
+// 0x010666a4: 0x10666a4: addiu a3, s0, 28
 	ldloc 8
 	ldc.i4.s 28
 	add
 	stloc 4
-// 0x01066698: 0x1066698: jal   0x106855c sw    v0, 16(sp)
+// 0x010666a8: 0x10666a8: jal   0x106856c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1799,15 +1799,15 @@ L_1066678:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010666a0: 0x10666a0: addiu v1, zero, 1
+// 0x010666b0: 0x10666b0: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x010666a4: 0x10666a4: sw    v1, 28(s0)
+// 0x010666b4: 0x10666b4: sw    v1, 28(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1816,7 +1816,7 @@ L_1066678:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010666a8: 0x10666a8: sw    v0, 1088(sp)
+// 0x010666b8: 0x10666b8: sw    v0, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1825,33 +1825,33 @@ L_1066678:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010666ac: 0x10666ac: bne   v0, zero, 0x10666d8 lui   a1, 0x10000
+// 0x010666bc: 0x10666bc: bne   v0, zero, 0x10666e8 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_10666d8
+	brtrue L_10666e8
 // --- basic block ---
-// 0x010666b4: 0x10666b4: lui   a3, 0x10000
+// 0x010666c4: 0x10666c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010666b8: 0x10666b8: addiu a1, a1, 13908
+// 0x010666c8: 0x10666c8: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010666bc: 0x10666bc: addiu a3, a3, 17892
+// 0x010666cc: 0x10666cc: addiu a3, a3, 17888
 	ldloc 4
-	ldc.i4 17892
+	ldc.i4 17888
 	add
 	stloc 4
-// 0x010666c0: 0x10666c0: addiu a0, zero, 4
+// 0x010666d0: 0x10666d0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010666c4: 0x10666c4: addiu a2, zero, 838
+// 0x010666d4: 0x10666d4: addiu a2, zero, 838
 	ldc.i4 838
 	stloc.3
-L_10666c8:
-// 0x010666c8: 0x10666c8: jal   0x100449c sll   zero, zero, 0
+L_10666d8:
+// 0x010666d8: 0x10666d8: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1862,13 +1862,13 @@ L_10666c8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010666d0: 0x10666d0: j	 0x1066700 addu  v1, zero, zero
+// 0x010666e0: 0x10666e0: j	 0x1066710 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1066700
+	br L_1066710
 // --- basic block ---
-L_10666d8:
-// 0x010666d8: 0x10666d8: lw    v0, 12(s0)
+L_10666e8:
+// 0x010666e8: 0x10666e8: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -1877,33 +1877,33 @@ L_10666d8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010666dc: 0x10666dc: lui   a3, 0x10000
+// 0x010666ec: 0x10666ec: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010666e0: 0x10666e0: sw    zero, 0(s4)
+// 0x010666f0: 0x10666f0: sw    zero, 0(s4)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010666e4: 0x10666e4: addiu a1, a1, 13908
+// 0x010666f4: 0x10666f4: addiu a1, a1, 13904
 	ldloc.2
-	ldc.i4 13908
+	ldc.i4 13904
 	add
 	stloc.2
-// 0x010666e8: 0x10666e8: addiu a3, a3, 17940
+// 0x010666f8: 0x10666f8: addiu a3, a3, 17936
 	ldloc 4
-	ldc.i4 17940
+	ldc.i4 17936
 	add
 	stloc 4
-// 0x010666ec: 0x10666ec: addiu a0, zero, 2
+// 0x010666fc: 0x10666fc: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x010666f0: 0x10666f0: addiu a2, zero, 845
+// 0x01066700: 0x1066700: addiu a2, zero, 845
 	ldc.i4 845
 	stloc.3
-// 0x010666f4: 0x10666f4: jal   0x100449c sw    v0, 16(sp)
+// 0x01066704: 0x1066704: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1922,7 +1922,7 @@ L_10666d8:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010666fc: 0x10666fc: lw    v1, 1088(sp)
+// 0x0106670c: 0x106670c: lw    v1, 1088(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1931,12 +1931,12 @@ L_10666d8:
 	add
 	ldelem.i4
 	stloc 7
-L_1066700:
-// 0x01066700: 0x1066700: lw    ra, 1084(sp)
-// 0x01066704: 0x1066704: addu  v0, v1, zero
+L_1066710:
+// 0x01066710: 0x1066710: lw    ra, 1084(sp)
+// 0x01066714: 0x1066714: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x01066708: 0x1066708: lw    s8, 1080(sp)
+// 0x01066718: 0x1066718: lw    s8, 1080(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1945,7 +1945,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0106670c: 0x106670c: lw    s7, 1076(sp)
+// 0x0106671c: 0x106671c: lw    s7, 1076(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1954,7 +1954,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01066710: 0x1066710: lw    s6, 1072(sp)
+// 0x01066720: 0x1066720: lw    s6, 1072(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1963,7 +1963,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01066714: 0x1066714: lw    s5, 1068(sp)
+// 0x01066724: 0x1066724: lw    s5, 1068(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1972,7 +1972,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01066718: 0x1066718: lw    s4, 1064(sp)
+// 0x01066728: 0x1066728: lw    s4, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1981,7 +1981,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0106671c: 0x106671c: lw    s3, 1060(sp)
+// 0x0106672c: 0x106672c: lw    s3, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1990,7 +1990,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01066720: 0x1066720: lw    s2, 1056(sp)
+// 0x01066730: 0x1066730: lw    s2, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1999,7 +1999,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01066724: 0x1066724: lw    s1, 1052(sp)
+// 0x01066734: 0x1066734: lw    s1, 1052(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2008,7 +2008,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01066728: 0x1066728: lw    s0, 1048(sp)
+// 0x01066738: 0x1066738: lw    s0, 1048(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2017,7 +2017,7 @@ L_1066700:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106672c: 0x106672c: jr    ra addiu sp, sp, 1088
+// 0x0106673c: 0x106673c: jr    ra addiu sp, sp, 1088
 	ldloc.0
 	ldc.i4 1088
 	add
@@ -2029,7 +2029,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 fh_minkey_106674c(int32)
+.method public static int32 fh_minkey_106675c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -2052,7 +2052,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106674c: 0x106674c: lw    v1, 16(a0)
+// 0x0106675c: 0x106675c: lw    v1, 16(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2061,14 +2061,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066750: 0x1066750: sll   zero, zero, 0
-// 0x01066754: 0x1066754: beq   v1, zero, 0x1066760 lui   v0, 0x80000000
+// 0x01066760: 0x1066760: sll   zero, zero, 0
+// 0x01066764: 0x1066764: beq   v1, zero, 0x1066770 lui   v0, 0x80000000
 	ldloc.1
 	ldc.i4 2147483648
 	stloc.2
-	brfalse L_1066760
+	brfalse L_1066770
 // --- basic block ---
-// 0x0106675c: 0x106675c: lw    v0, 24(v1)
+// 0x0106676c: 0x106676c: lw    v0, 24(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -2077,8 +2077,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_1066760:
-// 0x01066760: 0x1066760: jr    ra sll   zero, zero, 0
+L_1066770:
+// 0x01066770: 0x1066770: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -2086,7 +2086,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 fh_min_1066768(int32)
+.method public static int32 fh_min_1066778(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -2109,7 +2109,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066768: 0x1066768: lw    v1, 16(a0)
+// 0x01066778: 0x1066778: lw    v1, 16(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -2118,14 +2118,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106676c: 0x106676c: sll   zero, zero, 0
-// 0x01066770: 0x1066770: beq   v1, zero, 0x106677c addu  v0, zero, zero
+// 0x0106677c: 0x106677c: sll   zero, zero, 0
+// 0x01066780: 0x1066780: beq   v1, zero, 0x106678c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_106677c
+	brfalse L_106678c
 // --- basic block ---
-// 0x01066778: 0x1066778: lw    v0, 28(v1)
+// 0x01066788: 0x1066788: lw    v0, 28(v1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -2134,8 +2134,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_106677c:
-// 0x0106677c: 0x106677c: jr    ra sll   zero, zero, 0
+L_106678c:
+// 0x0106678c: 0x106678c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -2143,7 +2143,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 fh_find_data_el_1066790(int32,int32,int32,int32,int32)
+.method public static int32 fh_find_data_el_10667a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 s2,int32 s3,int32 ra,int32 v1)
@@ -2190,12 +2190,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066790: 0x1066790: addiu sp, sp, -40
+// 0x010667a0: 0x10667a0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01066794: 0x1066794: sw    s3, 32(sp)
+// 0x010667a4: 0x10667a4: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2204,7 +2204,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01066798: 0x1066798: sw    s2, 28(sp)
+// 0x010667a8: 0x10667a8: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2213,7 +2213,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106679c: 0x106679c: sw    s1, 24(sp)
+// 0x010667ac: 0x10667ac: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2222,8 +2222,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010667a0: 0x10667a0: sw    ra, 36(sp)
-// 0x010667a4: 0x10667a4: sw    s0, 20(sp)
+// 0x010667b0: 0x10667b0: sw    ra, 36(sp)
+// 0x010667b4: 0x10667b4: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2232,23 +2232,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010667a8: 0x10667a8: addu  s1, a1, zero
+// 0x010667b8: 0x10667b8: addu  s1, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010667ac: 0x10667ac: addu  s3, a0, zero
+// 0x010667bc: 0x10667bc: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010667b0: 0x10667b0: beq   a1, zero, 0x106682c addu  s2, a2, zero
+// 0x010667c0: 0x10667c0: beq   a1, zero, 0x106683c addu  s2, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 9
-	brfalse L_106682c
+	brfalse L_106683c
 // --- basic block ---
-// 0x010667b8: 0x10667b8: addu  s0, a1, zero
+// 0x010667c8: 0x10667c8: addu  s0, a1, zero
 	ldloc.2
 	stloc 5
-L_10667bc:
-// 0x010667bc: 0x10667bc: lw    v0, 28(s0)
+L_10667cc:
+// 0x010667cc: 0x10667cc: lw    v0, 28(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2257,13 +2257,13 @@ L_10667bc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010667c0: 0x10667c0: sll   zero, zero, 0
-// 0x010667c4: 0x10667c4: beq   v0, s2, 0x1066830 sll   zero, zero, 0
+// 0x010667d0: 0x10667d0: sll   zero, zero, 0
+// 0x010667d4: 0x10667d4: beq   v0, s2, 0x1066840 sll   zero, zero, 0
 	ldloc 7
 	ldloc 9
-	beq  L_1066830
+	beq  L_1066840
 // --- basic block ---
-// 0x010667cc: 0x10667cc: lw    s0, 20(s0)
+// 0x010667dc: 0x10667dc: lw    s0, 20(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2272,22 +2272,22 @@ L_10667bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010667d0: 0x10667d0: sll   zero, zero, 0
-// 0x010667d4: 0x10667d4: beq   s0, zero, 0x10667e4 sll   zero, zero, 0
+// 0x010667e0: 0x10667e0: sll   zero, zero, 0
+// 0x010667e4: 0x10667e4: beq   s0, zero, 0x10667f4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10667e4
+	brfalse L_10667f4
 // --- basic block ---
-// 0x010667dc: 0x10667dc: bne   s0, s1, 0x10667bc sll   zero, zero, 0
+// 0x010667ec: 0x10667ec: bne   s0, s1, 0x10667cc sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_10667bc
+	bne.un L_10667cc
 // --- basic block ---
-L_10667e4:
-// 0x010667e4: 0x10667e4: addu  s0, s1, zero
+L_10667f4:
+// 0x010667f4: 0x10667f4: addu  s0, s1, zero
 	ldloc 8
 	stloc 5
-L_10667e8:
-// 0x010667e8: 0x10667e8: lw    v0, 12(s0)
+L_10667f8:
+// 0x010667f8: 0x10667f8: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2296,40 +2296,40 @@ L_10667e8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010667ec: 0x10667ec: addu  a0, s3, zero
+// 0x010667fc: 0x10667fc: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x010667f0: 0x10667f0: addu  a1, v0, zero
+// 0x01066800: 0x1066800: addu  a1, v0, zero
 	ldloc 7
 	stloc.2
-// 0x010667f4: 0x10667f4: beq   v0, zero, 0x1066814 addu  a2, s2, zero
+// 0x01066804: 0x1066804: beq   v0, zero, 0x1066824 addu  a2, s2, zero
 	ldloc 7
 	ldloc 9
 	stloc.3
-	brfalse L_1066814
+	brfalse L_1066824
 // --- basic block ---
-// 0x010667fc: 0x10667fc: jal   0x1066790 sll   zero, zero, 0
+// 0x0106680c: 0x106680c: jal   0x10667a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_find_data_el_1066790(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_find_data_el_10667a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 7
 // --- basic block ---
-// 0x01066804: 0x1066804: beq   v0, zero, 0x1066814 sll   zero, zero, 0
+// 0x01066814: 0x1066814: beq   v0, zero, 0x1066824 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1066814
+	brfalse L_1066824
 // --- basic block ---
-// 0x0106680c: 0x106680c: j	 0x1066830 addu  s0, v0, zero
+// 0x0106681c: 0x106681c: j	 0x1066840 addu  s0, v0, zero
 	ldloc 7
 	stloc 5
-	br L_1066830
+	br L_1066840
 // --- basic block ---
-L_1066814:
-// 0x01066814: 0x1066814: lw    s0, 20(s0)
+L_1066824:
+// 0x01066824: 0x1066824: lw    s0, 20(s0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2338,26 +2338,26 @@ L_1066814:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01066818: 0x1066818: sll   zero, zero, 0
-// 0x0106681c: 0x106681c: beq   s0, zero, 0x1066830 sll   zero, zero, 0
+// 0x01066828: 0x1066828: sll   zero, zero, 0
+// 0x0106682c: 0x106682c: beq   s0, zero, 0x1066840 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1066830
+	brfalse L_1066840
 // --- basic block ---
-// 0x01066824: 0x1066824: bne   s0, s1, 0x10667e8 sll   zero, zero, 0
+// 0x01066834: 0x1066834: bne   s0, s1, 0x10667f8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_10667e8
+	bne.un L_10667f8
 // --- basic block ---
-L_106682c:
-// 0x0106682c: 0x106682c: addu  s0, zero, zero
+L_106683c:
+// 0x0106683c: 0x106683c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1066830:
-// 0x01066830: 0x1066830: lw    ra, 36(sp)
-// 0x01066834: 0x1066834: addu  v0, s0, zero
+L_1066840:
+// 0x01066840: 0x1066840: lw    ra, 36(sp)
+// 0x01066844: 0x1066844: addu  v0, s0, zero
 	ldloc 5
 	stloc 7
-// 0x01066838: 0x1066838: lw    s3, 32(sp)
+// 0x01066848: 0x1066848: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2366,7 +2366,7 @@ L_1066830:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0106683c: 0x106683c: lw    s2, 28(sp)
+// 0x0106684c: 0x106684c: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2375,7 +2375,7 @@ L_1066830:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01066840: 0x1066840: lw    s1, 24(sp)
+// 0x01066850: 0x1066850: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2384,7 +2384,7 @@ L_1066830:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01066844: 0x1066844: lw    s0, 20(sp)
+// 0x01066854: 0x1066854: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2393,7 +2393,7 @@ L_1066830:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01066848: 0x1066848: jr    ra addiu sp, sp, 40
+// 0x01066858: 0x1066858: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2405,7 +2405,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 fh_cut_1066880(int32,int32,int32,int32)
+.method public static int32 fh_cut_1066890(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
@@ -2437,7 +2437,7 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066880: 0x1066880: lw    v0, 16(a1)
+// 0x01066890: 0x1066890: lw    v0, 16(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2446,7 +2446,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01066884: 0x1066884: lw    v1, 8(a1)
+// 0x01066894: 0x1066894: lw    v1, 8(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2455,29 +2455,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066888: 0x1066888: xor   a3, a1, v0
+// 0x01066898: 0x1066898: xor   a3, a1, v0
 	ldloc.1
 	ldloc 5
 	xor
 	stloc.3
-// 0x0106688c: 0x106688c: sltu  a3, zero, a3
+// 0x0106689c: 0x106689c: sltu  a3, zero, a3
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x01066890: 0x1066890: subu  a3, zero, a3
+// 0x010668a0: 0x10668a0: subu  a3, zero, a3
 	ldloc.3
 	neg
 	stloc.3
-// 0x01066894: 0x1066894: beq   v1, zero, 0x10668b0 and   v0, v0, a3
+// 0x010668a4: 0x10668a4: beq   v1, zero, 0x10668c0 and   v0, v0, a3
 	ldloc 6
 	ldloc 5
 	ldloc.3
 	and
 	stloc 5
-	brfalse L_10668b0
+	brfalse L_10668c0
 // --- basic block ---
-// 0x0106689c: 0x106689c: lw    a3, 12(v1)
+// 0x010668ac: 0x10668ac: lw    a3, 12(v1)
 	ldloc 4
 	ldloc 6
 	ldc.i4.2
@@ -2486,13 +2486,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010668a0: 0x10668a0: sll   zero, zero, 0
-// 0x010668a4: 0x10668a4: bne   a3, a1, 0x10668b0 sll   zero, zero, 0
+// 0x010668b0: 0x10668b0: sll   zero, zero, 0
+// 0x010668b4: 0x10668b4: bne   a3, a1, 0x10668c0 sll   zero, zero, 0
 	ldloc.3
 	ldloc.1
-	bne.un L_10668b0
+	bne.un L_10668c0
 // --- basic block ---
-// 0x010668ac: 0x10668ac: sw    v0, 12(v1)
+// 0x010668bc: 0x10668bc: sw    v0, 12(v1)
 	ldloc 4
 	ldloc 6
 	ldc.i4.2
@@ -2501,8 +2501,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-L_10668b0:
-// 0x010668b0: 0x10668b0: lw    v0, 20(a1)
+L_10668c0:
+// 0x010668c0: 0x10668c0: lw    v0, 20(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2511,7 +2511,7 @@ L_10668b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010668b4: 0x10668b4: lw    v1, 16(a1)
+// 0x010668c4: 0x10668c4: lw    v1, 16(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2520,7 +2520,7 @@ L_10668b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010668b8: 0x10668b8: sw    zero, 8(a1)
+// 0x010668c8: 0x10668c8: sw    zero, 8(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2529,7 +2529,7 @@ L_10668b0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010668bc: 0x10668bc: sw    v1, 16(v0)
+// 0x010668cc: 0x10668cc: sw    v1, 16(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -2538,7 +2538,7 @@ L_10668b0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010668c0: 0x10668c0: lw    v1, 16(a1)
+// 0x010668d0: 0x10668d0: lw    v1, 16(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2547,7 +2547,7 @@ L_10668b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010668c4: 0x10668c4: sw    a1, 16(a1)
+// 0x010668d4: 0x10668d4: sw    a1, 16(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2556,7 +2556,7 @@ L_10668b0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010668c8: 0x10668c8: sw    v0, 20(v1)
+// 0x010668d8: 0x10668d8: sw    v0, 20(v1)
 	ldloc 4
 	ldloc 6
 	ldc.i4.2
@@ -2565,14 +2565,14 @@ L_10668b0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010668cc: 0x10668cc: lw    v1, 0(a2)
+// 0x010668dc: 0x10668dc: lw    v1, 0(a2)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010668d0: 0x10668d0: sw    a1, 20(a1)
+// 0x010668e0: 0x10668e0: sw    a1, 20(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2581,7 +2581,7 @@ L_10668b0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010668d4: 0x10668d4: lw    v0, 20(a0)
+// 0x010668e4: 0x10668e4: lw    v0, 20(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2590,12 +2590,12 @@ L_10668b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010668d8: 0x10668d8: addiu v1, v1, -1
+// 0x010668e8: 0x10668e8: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x010668dc: 0x10668dc: bne   v0, zero, 0x10668f4 sw    v1, 0(a2)
+// 0x010668ec: 0x10668ec: bne   v0, zero, 0x1066904 sw    v1, 0(a2)
 	ldloc 5
 	ldloc 4
 	ldloc.2
@@ -2603,9 +2603,9 @@ L_10668b0:
 	shr.un
 	ldloc 6
 	stelem.i4
-	brtrue L_10668f4
+	brtrue L_1066904
 // --- basic block ---
-// 0x010668e4: 0x10668e4: sw    a1, 20(a0)
+// 0x010668f4: 0x10668f4: sw    a1, 20(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
@@ -2614,7 +2614,7 @@ L_10668b0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010668e8: 0x10668e8: sw    a1, 16(a1)
+// 0x010668f8: 0x10668f8: sw    a1, 16(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2623,7 +2623,7 @@ L_10668b0:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010668ec: 0x10668ec: j	 0x106692c sw    a1, 20(a1)
+// 0x010668fc: 0x10668fc: j	 0x106693c sw    a1, 20(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2632,10 +2632,10 @@ L_10668b0:
 	add
 	ldloc.1
 	stelem.i4
-	br L_106692c
+	br L_106693c
 // --- basic block ---
-L_10668f4:
-// 0x010668f4: 0x10668f4: lw    v1, 20(v0)
+L_1066904:
+// 0x01066904: 0x1066904: lw    v1, 20(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -2644,13 +2644,13 @@ L_10668f4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010668f8: 0x10668f8: sll   zero, zero, 0
-// 0x010668fc: 0x10668fc: bne   v0, v1, 0x1066918 sll   zero, zero, 0
+// 0x01066908: 0x1066908: sll   zero, zero, 0
+// 0x0106690c: 0x106690c: bne   v0, v1, 0x1066928 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1066918
+	bne.un L_1066928
 // --- basic block ---
-// 0x01066904: 0x1066904: sw    a1, 20(v0)
+// 0x01066914: 0x1066914: sw    a1, 20(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -2659,7 +2659,7 @@ L_10668f4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01066908: 0x1066908: sw    a1, 16(v0)
+// 0x01066918: 0x1066918: sw    a1, 16(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -2668,7 +2668,7 @@ L_10668f4:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0106690c: 0x106690c: sw    v0, 20(a1)
+// 0x0106691c: 0x106691c: sw    v0, 20(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2677,7 +2677,7 @@ L_10668f4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01066910: 0x1066910: j	 0x106692c sw    v0, 16(a1)
+// 0x01066920: 0x1066920: j	 0x106693c sw    v0, 16(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2686,10 +2686,10 @@ L_10668f4:
 	add
 	ldloc 5
 	stelem.i4
-	br L_106692c
+	br L_106693c
 // --- basic block ---
-L_1066918:
-// 0x01066918: 0x1066918: sw    v1, 20(a1)
+L_1066928:
+// 0x01066928: 0x1066928: sw    v1, 20(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2698,7 +2698,7 @@ L_1066918:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106691c: 0x106691c: lw    v1, 20(v0)
+// 0x0106692c: 0x106692c: lw    v1, 20(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -2707,7 +2707,7 @@ L_1066918:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066920: 0x1066920: sw    a1, 20(v0)
+// 0x01066930: 0x1066930: sw    a1, 20(v0)
 	ldloc 4
 	ldloc 5
 	ldc.i4.2
@@ -2716,7 +2716,7 @@ L_1066918:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01066924: 0x1066924: sw    a1, 16(v1)
+// 0x01066934: 0x1066934: sw    a1, 16(v1)
 	ldloc 4
 	ldloc 6
 	ldc.i4.2
@@ -2725,7 +2725,7 @@ L_1066918:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01066928: 0x1066928: sw    v0, 16(a1)
+// 0x01066938: 0x1066938: sw    v0, 16(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2734,8 +2734,8 @@ L_1066918:
 	add
 	ldloc 5
 	stelem.i4
-L_106692c:
-// 0x0106692c: 0x106692c: sw    zero, 4(a1)
+L_106693c:
+// 0x0106693c: 0x106693c: sw    zero, 4(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2744,7 +2744,7 @@ L_106692c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01066930: 0x1066930: jr    ra sw    zero, 8(a1)
+// 0x01066940: 0x1066940: jr    ra sw    zero, 8(a1)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -2760,7 +2760,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 fh_compare_1066938(int32,int32,int32,int32,int32)
+.method public static int32 fh_compare_1066948(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2795,13 +2795,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066938: 0x1066938: addiu sp, sp, -24
+// 0x01066948: 0x1066948: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106693c: 0x106693c: sw    ra, 20(sp)
-// 0x01066940: 0x1066940: lw    v0, 28(a0)
+// 0x0106694c: 0x106694c: sw    ra, 20(sp)
+// 0x01066950: 0x1066950: lw    v0, 28(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -2810,13 +2810,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01066944: 0x1066944: sll   zero, zero, 0
-// 0x01066948: 0x1066948: bgez  v0, 0x1066974 sll   zero, zero, 0
+// 0x01066954: 0x1066954: sll   zero, zero, 0
+// 0x01066958: 0x1066958: bgez  v0, 0x1066984 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_1066974
+	bge L_1066984
 // --- basic block ---
-// 0x01066950: 0x1066950: lw    a0, 24(a1)
+// 0x01066960: 0x1066960: lw    a0, 24(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2825,7 +2825,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066954: 0x1066954: lw    v1, 24(a2)
+// 0x01066964: 0x1066964: lw    v1, 24(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2834,39 +2834,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066958: 0x1066958: sll   zero, zero, 0
-// 0x0106695c: 0x106695c: slt   a1, a0, v1
+// 0x01066968: 0x1066968: sll   zero, zero, 0
+// 0x0106696c: 0x106696c: slt   a1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc.2
-// 0x01066960: 0x1066960: bne   a1, zero, 0x1066988 addiu v0, zero, -1
+// 0x01066970: 0x1066970: bne   a1, zero, 0x1066998 addiu v0, zero, -1
 	ldloc.2
 	ldc.i4.m1
 	stloc 5
-	brtrue L_1066988
+	brtrue L_1066998
 // --- basic block ---
-// 0x01066968: 0x1066968: xor   v0, a0, v1
+// 0x01066978: 0x1066978: xor   v0, a0, v1
 	ldloc.1
 	ldloc 7
 	xor
 	stloc 5
-// 0x0106696c: 0x106696c: j	 0x1066988 sltu  v0, zero, v0
+// 0x0106697c: 0x106697c: j	 0x1066998 sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	br L_1066988
+	br L_1066998
 // --- basic block ---
-L_1066974:
-// 0x01066974: 0x1066974: lw    v0, 0(a0)
+L_1066984:
+// 0x01066984: 0x1066984: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01066978: 0x1066978: lw    a0, 28(a1)
+// 0x01066988: 0x1066988: lw    a0, 28(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -2875,7 +2875,7 @@ L_1066974:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106697c: 0x106697c: lw    a1, 28(a2)
+// 0x0106698c: 0x106698c: lw    a1, 28(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2884,7 +2884,7 @@ L_1066974:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01066980: 0x1066980: jalr  v0 sll   zero, zero, 0
+// 0x01066990: 0x1066990: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -2896,10 +2896,10 @@ L_1066974:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1066988:
-// 0x01066988: 0x1066988: lw    ra, 20(sp)
-// 0x0106698c: 0x106698c: sll   zero, zero, 0
-// 0x01066990: 0x1066990: jr    ra addiu sp, sp, 24
+L_1066998:
+// 0x01066998: 0x1066998: lw    ra, 20(sp)
+// 0x0106699c: 0x106699c: sll   zero, zero, 0
+// 0x010669a0: 0x10669a0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2911,7 +2911,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 fh_insertel_1066998(int32,int32,int32,int32,int32)
+.method public static int32 fh_insertel_10669a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 ra)
@@ -2952,7 +2952,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066998: 0x1066998: lw    v0, 20(a0)
+// 0x010669a8: 0x10669a8: lw    v0, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2961,12 +2961,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106699c: 0x106699c: addiu sp, sp, -32
+// 0x010669ac: 0x10669ac: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010669a0: 0x10669a0: sw    s1, 24(sp)
+// 0x010669b0: 0x10669b0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2975,7 +2975,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010669a4: 0x10669a4: sw    s0, 20(sp)
+// 0x010669b4: 0x10669b4: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2984,17 +2984,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010669a8: 0x10669a8: sw    ra, 28(sp)
-// 0x010669ac: 0x10669ac: addu  s1, a0, zero
+// 0x010669b8: 0x10669b8: sw    ra, 28(sp)
+// 0x010669bc: 0x10669bc: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010669b0: 0x10669b0: bne   v0, zero, 0x10669c8 addu  s0, a1, zero
+// 0x010669c0: 0x10669c0: bne   v0, zero, 0x10669d8 addu  s0, a1, zero
 	ldloc 6
 	ldloc.2
 	stloc 9
-	brtrue L_10669c8
+	brtrue L_10669d8
 // --- basic block ---
-// 0x010669b8: 0x10669b8: sw    a1, 20(s1)
+// 0x010669c8: 0x10669c8: sw    a1, 20(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3003,7 +3003,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010669bc: 0x10669bc: sw    a1, 16(s0)
+// 0x010669cc: 0x10669cc: sw    a1, 16(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3012,7 +3012,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010669c0: 0x10669c0: j	 0x1066a00 sw    a1, 20(s0)
+// 0x010669d0: 0x10669d0: j	 0x1066a10 sw    a1, 20(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3021,10 +3021,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-	br L_1066a00
+	br L_1066a10
 // --- basic block ---
-L_10669c8:
-// 0x010669c8: 0x10669c8: lw    v1, 20(v0)
+L_10669d8:
+// 0x010669d8: 0x10669d8: lw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3033,13 +3033,13 @@ L_10669c8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010669cc: 0x10669cc: sll   zero, zero, 0
-// 0x010669d0: 0x10669d0: bne   v0, v1, 0x10669ec sll   zero, zero, 0
+// 0x010669dc: 0x10669dc: sll   zero, zero, 0
+// 0x010669e0: 0x10669e0: bne   v0, v1, 0x10669fc sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_10669ec
+	bne.un L_10669fc
 // --- basic block ---
-// 0x010669d8: 0x10669d8: sw    a1, 20(v0)
+// 0x010669e8: 0x10669e8: sw    a1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3048,7 +3048,7 @@ L_10669c8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010669dc: 0x10669dc: sw    a1, 16(v0)
+// 0x010669ec: 0x10669ec: sw    a1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3057,7 +3057,7 @@ L_10669c8:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010669e0: 0x10669e0: sw    v0, 20(a1)
+// 0x010669f0: 0x10669f0: sw    v0, 20(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3066,7 +3066,7 @@ L_10669c8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010669e4: 0x10669e4: j	 0x1066a00 sw    v0, 16(a1)
+// 0x010669f4: 0x10669f4: j	 0x1066a10 sw    v0, 16(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3075,10 +3075,10 @@ L_10669c8:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1066a00
+	br L_1066a10
 // --- basic block ---
-L_10669ec:
-// 0x010669ec: 0x10669ec: sw    v1, 20(a1)
+L_10669fc:
+// 0x010669fc: 0x10669fc: sw    v1, 20(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3087,7 +3087,7 @@ L_10669ec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010669f0: 0x10669f0: lw    v1, 20(v0)
+// 0x01066a00: 0x1066a00: lw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3096,7 +3096,7 @@ L_10669ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010669f4: 0x10669f4: sw    a1, 20(v0)
+// 0x01066a04: 0x1066a04: sw    a1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3105,7 +3105,7 @@ L_10669ec:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010669f8: 0x10669f8: sw    a1, 16(v1)
+// 0x01066a08: 0x1066a08: sw    a1, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3114,7 +3114,7 @@ L_10669ec:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010669fc: 0x10669fc: sw    v0, 16(a1)
+// 0x01066a0c: 0x1066a0c: sw    v0, 16(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3123,8 +3123,8 @@ L_10669ec:
 	add
 	ldloc 6
 	stelem.i4
-L_1066a00:
-// 0x01066a00: 0x1066a00: lw    v0, 16(s1)
+L_1066a10:
+// 0x01066a10: 0x1066a10: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3133,12 +3133,12 @@ L_1066a00:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066a04: 0x1066a04: sll   zero, zero, 0
-// 0x01066a08: 0x1066a08: beq   v0, zero, 0x1066a60 sll   zero, zero, 0
+// 0x01066a14: 0x1066a14: sll   zero, zero, 0
+// 0x01066a18: 0x1066a18: beq   v0, zero, 0x1066a70 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1066a60
+	brfalse L_1066a70
 // --- basic block ---
-// 0x01066a10: 0x1066a10: lw    v1, 28(s1)
+// 0x01066a20: 0x1066a20: lw    v1, 28(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3147,13 +3147,13 @@ L_1066a00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066a14: 0x1066a14: sll   zero, zero, 0
-// 0x01066a18: 0x1066a18: bgez  v1, 0x1066a40 sll   zero, zero, 0
+// 0x01066a24: 0x1066a24: sll   zero, zero, 0
+// 0x01066a28: 0x1066a28: bgez  v1, 0x1066a50 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	bge L_1066a40
+	bge L_1066a50
 // --- basic block ---
-// 0x01066a20: 0x1066a20: lw    v0, 24(v0)
+// 0x01066a30: 0x1066a30: lw    v0, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3162,7 +3162,7 @@ L_1066a00:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066a24: 0x1066a24: lw    v1, 24(s0)
+// 0x01066a34: 0x1066a34: lw    v1, 24(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3171,21 +3171,21 @@ L_1066a00:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066a28: 0x1066a28: sll   zero, zero, 0
-// 0x01066a2c: 0x1066a2c: slt   v0, v1, v0
+// 0x01066a38: 0x1066a38: sll   zero, zero, 0
+// 0x01066a3c: 0x1066a3c: slt   v0, v1, v0
 	ldloc 7
 	ldloc 6
 	clt
 	stloc 6
-// 0x01066a30: 0x1066a30: bne   v0, zero, 0x1066a60 sll   zero, zero, 0
+// 0x01066a40: 0x1066a40: bne   v0, zero, 0x1066a70 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1066a60
+	brtrue L_1066a70
 // --- basic block ---
-// 0x01066a38: 0x1066a38: j	 0x1066a64 sll   zero, zero, 0
-	br L_1066a64
+// 0x01066a48: 0x1066a48: j	 0x1066a74 sll   zero, zero, 0
+	br L_1066a74
 // --- basic block ---
-L_1066a40:
-// 0x01066a40: 0x1066a40: lw    a1, 28(v0)
+L_1066a50:
+// 0x01066a50: 0x1066a50: lw    a1, 28(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3194,7 +3194,7 @@ L_1066a40:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01066a44: 0x1066a44: lw    a0, 28(s0)
+// 0x01066a54: 0x1066a54: lw    a0, 28(s0)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3203,15 +3203,15 @@ L_1066a40:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066a48: 0x1066a48: lw    v0, 0(s1)
+// 0x01066a58: 0x1066a58: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01066a4c: 0x1066a4c: sll   zero, zero, 0
-// 0x01066a50: 0x1066a50: jalr  v0 sll   zero, zero, 0
+// 0x01066a5c: 0x1066a5c: sll   zero, zero, 0
+// 0x01066a60: 0x1066a60: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -3223,13 +3223,13 @@ L_1066a40:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066a58: 0x1066a58: bgez  v0, 0x1066a64 sll   zero, zero, 0
+// 0x01066a68: 0x1066a68: bgez  v0, 0x1066a74 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_1066a64
+	bge L_1066a74
 // --- basic block ---
-L_1066a60:
-// 0x01066a60: 0x1066a60: sw    s0, 16(s1)
+L_1066a70:
+// 0x01066a70: 0x1066a70: sw    s0, 16(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3238,8 +3238,8 @@ L_1066a60:
 	add
 	ldloc 9
 	stelem.i4
-L_1066a64:
-// 0x01066a64: 0x1066a64: lw    v0, 4(s1)
+L_1066a74:
+// 0x01066a74: 0x1066a74: lw    v0, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3248,13 +3248,13 @@ L_1066a64:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066a68: 0x1066a68: lw    ra, 28(sp)
-// 0x01066a6c: 0x1066a6c: addiu v0, v0, 1
+// 0x01066a78: 0x1066a78: lw    ra, 28(sp)
+// 0x01066a7c: 0x1066a7c: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01066a70: 0x1066a70: sw    v0, 4(s1)
+// 0x01066a80: 0x1066a80: sw    v0, 4(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3263,7 +3263,7 @@ L_1066a64:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066a74: 0x1066a74: lw    s0, 20(sp)
+// 0x01066a84: 0x1066a84: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3272,7 +3272,7 @@ L_1066a64:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01066a78: 0x1066a78: lw    s1, 24(sp)
+// 0x01066a88: 0x1066a88: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3281,7 +3281,7 @@ L_1066a64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01066a7c: 0x1066a7c: jr    ra addiu sp, sp, 32
+// 0x01066a8c: 0x1066a8c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3293,7 +3293,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 fh_extractminel_1066a84(int32,int32,int32,int32,int32)
+.method public static int32 fh_extractminel_1066a94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s5,int32 t0,int32 s4,int32 s7,int32 s6,int32 ra,int32 t1,int32 t2)
@@ -3361,12 +3361,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066a84: 0x1066a84: addiu sp, sp, -56
+// 0x01066a94: 0x1066a94: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01066a88: 0x1066a88: sw    s2, 28(sp)
+// 0x01066a98: 0x1066a98: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3375,7 +3375,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01066a8c: 0x1066a8c: lw    s2, 16(a0)
+// 0x01066a9c: 0x1066a9c: lw    s2, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3384,7 +3384,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01066a90: 0x1066a90: sw    s0, 20(sp)
+// 0x01066aa0: 0x1066aa0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3393,11 +3393,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01066a94: 0x1066a94: sw    ra, 52(sp)
-// 0x01066a98: 0x1066a98: addu  s0, a0, zero
+// 0x01066aa4: 0x1066aa4: sw    ra, 52(sp)
+// 0x01066aa8: 0x1066aa8: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01066a9c: 0x1066a9c: sw    s7, 48(sp)
+// 0x01066aac: 0x1066aac: sw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3406,7 +3406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01066aa0: 0x1066aa0: sw    s6, 44(sp)
+// 0x01066ab0: 0x1066ab0: sw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3415,7 +3415,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01066aa4: 0x1066aa4: sw    s5, 40(sp)
+// 0x01066ab4: 0x1066ab4: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3424,7 +3424,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01066aa8: 0x1066aa8: sw    s4, 36(sp)
+// 0x01066ab8: 0x1066ab8: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3433,7 +3433,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01066aac: 0x1066aac: sw    s3, 32(sp)
+// 0x01066abc: 0x1066abc: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3442,7 +3442,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01066ab0: 0x1066ab0: sw    s1, 24(sp)
+// 0x01066ac0: 0x1066ac0: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3451,7 +3451,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01066ab4: 0x1066ab4: lw    v0, 12(s2)
+// 0x01066ac4: 0x1066ac4: lw    v0, 12(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3460,21 +3460,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066ab8: 0x1066ab8: j	 0x1066b2c addu  a0, zero, zero
+// 0x01066ac8: 0x1066ac8: j	 0x1066b3c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_1066b2c
+	br L_1066b3c
 // --- basic block ---
-L_1066ac0:
-// 0x01066ac0: 0x1066ac0: bne   a0, zero, 0x1066acc sll   zero, zero, 0
+L_1066ad0:
+// 0x01066ad0: 0x1066ad0: bne   a0, zero, 0x1066adc sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1066acc
+	brtrue L_1066adc
 // --- basic block ---
-// 0x01066ac8: 0x1066ac8: addu  a0, v0, zero
+// 0x01066ad8: 0x1066ad8: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-L_1066acc:
-// 0x01066acc: 0x1066acc: sw    zero, 8(v0)
+L_1066adc:
+// 0x01066adc: 0x1066adc: sw    zero, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3483,7 +3483,7 @@ L_1066acc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01066ad0: 0x1066ad0: lw    v1, 20(s0)
+// 0x01066ae0: 0x1066ae0: lw    v1, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3492,7 +3492,7 @@ L_1066acc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066ad4: 0x1066ad4: lw    a2, 20(v0)
+// 0x01066ae4: 0x1066ae4: lw    a2, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3501,11 +3501,11 @@ L_1066acc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01066ad8: 0x1066ad8: bne   v1, zero, 0x1066af0 sll   zero, zero, 0
+// 0x01066ae8: 0x1066ae8: bne   v1, zero, 0x1066b00 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1066af0
+	brtrue L_1066b00
 // --- basic block ---
-// 0x01066ae0: 0x1066ae0: sw    v0, 20(s0)
+// 0x01066af0: 0x1066af0: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3514,7 +3514,7 @@ L_1066acc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066ae4: 0x1066ae4: sw    v0, 20(v0)
+// 0x01066af4: 0x1066af4: sw    v0, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3523,7 +3523,7 @@ L_1066acc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066ae8: 0x1066ae8: j	 0x1066b28 sw    v0, 16(v0)
+// 0x01066af8: 0x1066af8: j	 0x1066b38 sw    v0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3532,10 +3532,10 @@ L_1066acc:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1066b28
+	br L_1066b38
 // --- basic block ---
-L_1066af0:
-// 0x01066af0: 0x1066af0: lw    a1, 20(v1)
+L_1066b00:
+// 0x01066b00: 0x1066b00: lw    a1, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3544,13 +3544,13 @@ L_1066af0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01066af4: 0x1066af4: sll   zero, zero, 0
-// 0x01066af8: 0x1066af8: bne   v1, a1, 0x1066b14 sll   zero, zero, 0
+// 0x01066b04: 0x1066b04: sll   zero, zero, 0
+// 0x01066b08: 0x1066b08: bne   v1, a1, 0x1066b24 sll   zero, zero, 0
 	ldloc 7
 	ldloc.2
-	bne.un L_1066b14
+	bne.un L_1066b24
 // --- basic block ---
-// 0x01066b00: 0x1066b00: sw    v0, 20(v1)
+// 0x01066b10: 0x1066b10: sw    v0, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3559,7 +3559,7 @@ L_1066af0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066b04: 0x1066b04: sw    v0, 16(v1)
+// 0x01066b14: 0x1066b14: sw    v0, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3568,7 +3568,7 @@ L_1066af0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066b08: 0x1066b08: sw    v1, 20(v0)
+// 0x01066b18: 0x1066b18: sw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3577,7 +3577,7 @@ L_1066af0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066b0c: 0x1066b0c: j	 0x1066b28 sw    v1, 16(v0)
+// 0x01066b1c: 0x1066b1c: j	 0x1066b38 sw    v1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3586,10 +3586,10 @@ L_1066af0:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1066b28
+	br L_1066b38
 // --- basic block ---
-L_1066b14:
-// 0x01066b14: 0x1066b14: sw    a1, 20(v0)
+L_1066b24:
+// 0x01066b24: 0x1066b24: sw    a1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3598,7 +3598,7 @@ L_1066b14:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01066b18: 0x1066b18: lw    a1, 20(v1)
+// 0x01066b28: 0x1066b28: lw    a1, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3607,7 +3607,7 @@ L_1066b14:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01066b1c: 0x1066b1c: sw    v0, 20(v1)
+// 0x01066b2c: 0x1066b2c: sw    v0, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3616,7 +3616,7 @@ L_1066b14:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066b20: 0x1066b20: sw    v0, 16(a1)
+// 0x01066b30: 0x1066b30: sw    v0, 16(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -3625,7 +3625,7 @@ L_1066b14:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066b24: 0x1066b24: sw    v1, 16(v0)
+// 0x01066b34: 0x1066b34: sw    v1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3634,22 +3634,22 @@ L_1066b14:
 	add
 	ldloc 7
 	stelem.i4
-L_1066b28:
-// 0x01066b28: 0x1066b28: addu  v0, a2, zero
+L_1066b38:
+// 0x01066b38: 0x1066b38: addu  v0, a2, zero
 	ldloc.3
 	stloc 6
-L_1066b2c:
-// 0x01066b2c: 0x1066b2c: beq   v0, a0, 0x1066b3c sll   zero, zero, 0
+L_1066b3c:
+// 0x01066b3c: 0x1066b3c: beq   v0, a0, 0x1066b4c sll   zero, zero, 0
 	ldloc 6
 	ldloc.1
-	beq  L_1066b3c
+	beq  L_1066b4c
 // --- basic block ---
-// 0x01066b34: 0x1066b34: bne   v0, zero, 0x1066ac0 sll   zero, zero, 0
+// 0x01066b44: 0x1066b44: bne   v0, zero, 0x1066ad0 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1066ac0
+	brtrue L_1066ad0
 // --- basic block ---
-L_1066b3c:
-// 0x01066b3c: 0x1066b3c: lw    v0, 16(s2)
+L_1066b4c:
+// 0x01066b4c: 0x1066b4c: lw    v0, 16(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3658,13 +3658,13 @@ L_1066b3c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066b40: 0x1066b40: sll   zero, zero, 0
-// 0x01066b44: 0x1066b44: bne   v0, s2, 0x1066b54 sll   zero, zero, 0
+// 0x01066b50: 0x1066b50: sll   zero, zero, 0
+// 0x01066b54: 0x1066b54: bne   v0, s2, 0x1066b64 sll   zero, zero, 0
 	ldloc 6
 	ldloc 10
-	bne.un L_1066b54
+	bne.un L_1066b64
 // --- basic block ---
-// 0x01066b4c: 0x1066b4c: j	 0x1066b9c sw    zero, 20(s0)
+// 0x01066b5c: 0x1066b5c: j	 0x1066bac sw    zero, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3673,10 +3673,10 @@ L_1066b3c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1066b9c
+	br L_1066bac
 // --- basic block ---
-L_1066b54:
-// 0x01066b54: 0x1066b54: lw    v1, 8(s2)
+L_1066b64:
+// 0x01066b64: 0x1066b64: lw    v1, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3685,12 +3685,12 @@ L_1066b54:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066b58: 0x1066b58: sll   zero, zero, 0
-// 0x01066b5c: 0x1066b5c: beq   v1, zero, 0x1066b78 sll   zero, zero, 0
+// 0x01066b68: 0x1066b68: sll   zero, zero, 0
+// 0x01066b6c: 0x1066b6c: beq   v1, zero, 0x1066b88 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1066b78
+	brfalse L_1066b88
 // --- basic block ---
-// 0x01066b64: 0x1066b64: lw    a0, 12(v1)
+// 0x01066b74: 0x1066b74: lw    a0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3699,13 +3699,13 @@ L_1066b54:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066b68: 0x1066b68: sll   zero, zero, 0
-// 0x01066b6c: 0x1066b6c: bne   a0, s2, 0x1066b78 sll   zero, zero, 0
+// 0x01066b78: 0x1066b78: sll   zero, zero, 0
+// 0x01066b7c: 0x1066b7c: bne   a0, s2, 0x1066b88 sll   zero, zero, 0
 	ldloc.1
 	ldloc 10
-	bne.un L_1066b78
+	bne.un L_1066b88
 // --- basic block ---
-// 0x01066b74: 0x1066b74: sw    v0, 12(v1)
+// 0x01066b84: 0x1066b84: sw    v0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3714,8 +3714,8 @@ L_1066b54:
 	add
 	ldloc 6
 	stelem.i4
-L_1066b78:
-// 0x01066b78: 0x1066b78: lw    v1, 20(s2)
+L_1066b88:
+// 0x01066b88: 0x1066b88: lw    v1, 20(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3724,7 +3724,7 @@ L_1066b78:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066b7c: 0x1066b7c: lw    a0, 16(s2)
+// 0x01066b8c: 0x1066b8c: lw    a0, 16(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3733,7 +3733,7 @@ L_1066b78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066b80: 0x1066b80: sw    zero, 8(s2)
+// 0x01066b90: 0x1066b90: sw    zero, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3742,7 +3742,7 @@ L_1066b78:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01066b84: 0x1066b84: sw    a0, 16(v1)
+// 0x01066b94: 0x1066b94: sw    a0, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3751,7 +3751,7 @@ L_1066b78:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01066b88: 0x1066b88: lw    a0, 16(s2)
+// 0x01066b98: 0x1066b98: lw    a0, 16(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3760,7 +3760,7 @@ L_1066b78:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066b8c: 0x1066b8c: sw    s2, 16(s2)
+// 0x01066b9c: 0x1066b9c: sw    s2, 16(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3769,7 +3769,7 @@ L_1066b78:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01066b90: 0x1066b90: sw    v1, 20(a0)
+// 0x01066ba0: 0x1066ba0: sw    v1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3778,7 +3778,7 @@ L_1066b78:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066b94: 0x1066b94: sw    s2, 20(s2)
+// 0x01066ba4: 0x1066ba4: sw    s2, 20(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3787,7 +3787,7 @@ L_1066b78:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01066b98: 0x1066b98: sw    v0, 20(s0)
+// 0x01066ba8: 0x1066ba8: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3796,8 +3796,8 @@ L_1066b78:
 	add
 	ldloc 6
 	stelem.i4
-L_1066b9c:
-// 0x01066b9c: 0x1066b9c: lw    v1, 4(s0)
+L_1066bac:
+// 0x01066bac: 0x1066bac: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3806,13 +3806,13 @@ L_1066b9c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066ba0: 0x1066ba0: sll   zero, zero, 0
-// 0x01066ba4: 0x1066ba4: addiu v1, v1, -1
+// 0x01066bb0: 0x1066bb0: sll   zero, zero, 0
+// 0x01066bb4: 0x1066bb4: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x01066ba8: 0x1066ba8: bne   v1, zero, 0x1066bb8 sw    v1, 4(s0)
+// 0x01066bb8: 0x1066bb8: bne   v1, zero, 0x1066bc8 sw    v1, 4(s0)
 	ldloc 7
 	ldloc 5
 	ldloc 8
@@ -3822,9 +3822,9 @@ L_1066b9c:
 	add
 	ldloc 7
 	stelem.i4
-	brtrue L_1066bb8
+	brtrue L_1066bc8
 // --- basic block ---
-// 0x01066bb0: 0x1066bb0: j	 0x1066ea8 sw    zero, 16(s0)
+// 0x01066bc0: 0x1066bc0: j	 0x1066eb8 sw    zero, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3833,10 +3833,10 @@ L_1066b9c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1066ea8
+	br L_1066eb8
 // --- basic block ---
-L_1066bb8:
-// 0x01066bb8: 0x1066bb8: lw    v0, 20(s2)
+L_1066bc8:
+// 0x01066bc8: 0x1066bc8: lw    v0, 20(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3845,7 +3845,7 @@ L_1066bb8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066bbc: 0x1066bbc: lw    a2, 8(s0)
+// 0x01066bcc: 0x1066bcc: lw    a2, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3854,7 +3854,7 @@ L_1066bb8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01066bc0: 0x1066bc0: sw    v0, 16(s0)
+// 0x01066bd0: 0x1066bd0: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3863,141 +3863,141 @@ L_1066bb8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066bc4: 0x1066bc4: addiu v0, zero, -1
+// 0x01066bd4: 0x1066bd4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01066bc8: 0x1066bc8: beq   a2, v0, 0x1066be4 addu  a3, v1, zero
+// 0x01066bd8: 0x1066bd8: beq   a2, v0, 0x1066bf4 addu  a3, v1, zero
 	ldloc.3
 	ldloc 6
 	ldloc 7
 	stloc 4
-	beq  L_1066be4
+	beq  L_1066bf4
 // --- basic block ---
-// 0x01066bd0: 0x1066bd0: addiu v0, zero, 1
+// 0x01066be0: 0x1066be0: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01066bd4: 0x1066bd4: sllv  v0, a2, v0
+// 0x01066be4: 0x1066be4: sllv  v0, a2, v0
 	ldloc 6
 	ldloc.3
 	shl
 	stloc 6
-// 0x01066bd8: 0x1066bd8: slt   v0, v0, v1
+// 0x01066be8: 0x1066be8: slt   v0, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x01066bdc: 0x1066bdc: beq   v0, zero, 0x1066c94 sll   zero, zero, 0
+// 0x01066bec: 0x1066bec: beq   v0, zero, 0x1066ca4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1066c94
+	brfalse L_1066ca4
 // --- basic block ---
-L_1066be4:
-// 0x01066be4: 0x1066be4: addu  a1, zero, zero
+L_1066bf4:
+// 0x01066bf4: 0x1066bf4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01066be8: 0x1066be8: addiu a0, zero, 16
+// 0x01066bf8: 0x1066bf8: addiu a0, zero, 16
 	ldc.i4.s 16
 	stloc.1
-// 0x01066bec: 0x1066bec: addu  v0, zero, zero
+// 0x01066bfc: 0x1066bfc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01066bf0: 0x1066bf0: addiu t2, zero, 1
+// 0x01066c00: 0x1066c00: addiu t2, zero, 1
 	ldc.i4.1
 	stloc 19
-// 0x01066bf4: 0x1066bf4: addiu t1, zero, 5
+// 0x01066c04: 0x1066c04: addiu t1, zero, 5
 	ldc.i4.5
 	stloc 18
-L_1066bf8:
-// 0x01066bf8: 0x1066bf8: srlv  t0, a0, a3
+L_1066c08:
+// 0x01066c08: 0x1066c08: srlv  t0, a0, a3
 	ldloc 4
 	ldloc.1
 	shr.un
 	stloc 13
-// 0x01066bfc: 0x1066bfc: beq   t0, zero, 0x1066c0c sll   v0, v0, 1
+// 0x01066c0c: 0x1066c0c: beq   t0, zero, 0x1066c1c sll   v0, v0, 1
 	ldloc 13
 	ldloc 6
 	ldc.i4.1
 	shl
 	stloc 6
-	brfalse L_1066c0c
+	brfalse L_1066c1c
 // --- basic block ---
-// 0x01066c04: 0x1066c04: j	 0x1066c18 ori   v0, v0, 1
+// 0x01066c14: 0x1066c14: j	 0x1066c28 ori   v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	or
 	stloc 6
-	br L_1066c18
+	br L_1066c28
 // --- basic block ---
-L_1066c0c:
-// 0x01066c0c: 0x1066c0c: sllv  t0, a0, t2
+L_1066c1c:
+// 0x01066c1c: 0x1066c1c: sllv  t0, a0, t2
 	ldloc 19
 	ldloc.1
 	shl
 	stloc 13
-// 0x01066c10: 0x1066c10: addiu t0, t0, -1
+// 0x01066c20: 0x1066c20: addiu t0, t0, -1
 	ldloc 13
 	ldc.i4.m1
 	add
 	stloc 13
-// 0x01066c14: 0x1066c14: and   t0, t0, a3
+// 0x01066c24: 0x1066c24: and   t0, t0, a3
 	ldloc 13
 	ldloc 4
 	and
 	stloc 13
-L_1066c18:
-// 0x01066c18: 0x1066c18: addiu a1, a1, 1
+L_1066c28:
+// 0x01066c28: 0x1066c28: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01066c1c: 0x1066c1c: beq   a1, t1, 0x1066c2c srl   a0, a0, 1
+// 0x01066c2c: 0x1066c2c: beq   a1, t1, 0x1066c3c srl   a0, a0, 1
 	ldloc.2
 	ldloc 18
 	ldloc.1
 	ldc.i4.1
 	shr.un
 	stloc.1
-	beq  L_1066c2c
+	beq  L_1066c3c
 // --- basic block ---
-// 0x01066c24: 0x1066c24: j	 0x1066bf8 addu  a3, t0, zero
+// 0x01066c34: 0x1066c34: j	 0x1066c08 addu  a3, t0, zero
 	ldloc 13
 	stloc 4
-	br L_1066bf8
+	br L_1066c08
 // --- basic block ---
-L_1066c2c:
-// 0x01066c2c: 0x1066c2c: addiu a0, zero, 1
+L_1066c3c:
+// 0x01066c3c: 0x1066c3c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01066c30: 0x1066c30: sllv  a0, v0, a0
+// 0x01066c40: 0x1066c40: sllv  a0, v0, a0
 	ldloc.1
 	ldloc 6
 	shl
 	stloc.1
-// 0x01066c34: 0x1066c34: xor   v1, a0, v1
+// 0x01066c44: 0x1066c44: xor   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	xor
 	stloc 7
-// 0x01066c38: 0x1066c38: sltu  v1, zero, v1
+// 0x01066c48: 0x1066c48: sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc 7
 	clt.un
 	stloc 7
-// 0x01066c3c: 0x1066c3c: addu  v0, v0, v1
+// 0x01066c4c: 0x1066c4c: addu  v0, v0, v1
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x01066c40: 0x1066c40: addiu v0, v0, 1
+// 0x01066c50: 0x1066c50: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01066c44: 0x1066c44: slti  v1, v0, 8
+// 0x01066c54: 0x1066c54: slti  v1, v0, 8
 	ldloc 6
 	ldc.i4.8
 	clt
 	stloc 7
-// 0x01066c48: 0x1066c48: beq   v1, zero, 0x1066c58 sw    v0, 8(s0)
+// 0x01066c58: 0x1066c58: beq   v1, zero, 0x1066c68 sw    v0, 8(s0)
 	ldloc 7
 	ldloc 5
 	ldloc 8
@@ -4007,12 +4007,12 @@ L_1066c2c:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_1066c58
+	brfalse L_1066c68
 // --- basic block ---
-// 0x01066c50: 0x1066c50: addiu v0, zero, 8
+// 0x01066c60: 0x1066c60: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 6
-// 0x01066c54: 0x1066c54: sw    v0, 8(s0)
+// 0x01066c64: 0x1066c64: sw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4021,8 +4021,8 @@ L_1066c2c:
 	add
 	ldloc 6
 	stelem.i4
-L_1066c58:
-// 0x01066c58: 0x1066c58: lw    a1, 8(s0)
+L_1066c68:
+// 0x01066c68: 0x1066c68: lw    a1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4031,18 +4031,18 @@ L_1066c58:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01066c5c: 0x1066c5c: sll   zero, zero, 0
-// 0x01066c60: 0x1066c60: beq   a2, a1, 0x1066c7c sll   zero, zero, 0
+// 0x01066c6c: 0x1066c6c: sll   zero, zero, 0
+// 0x01066c70: 0x1066c70: beq   a2, a1, 0x1066c8c sll   zero, zero, 0
 	ldloc.3
 	ldloc.2
-	beq  L_1066c7c
+	beq  L_1066c8c
 // --- basic block ---
-// 0x01066c68: 0x1066c68: addiu a1, a1, 1
+// 0x01066c78: 0x1066c78: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01066c6c: 0x1066c6c: lw    a0, 12(s0)
+// 0x01066c7c: 0x1066c7c: lw    a0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4051,7 +4051,7 @@ L_1066c58:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066c70: 0x1066c70: jal   0x1000a60 sll   a1, a1, 2
+// 0x01066c80: 0x1066c80: jal   0x1000a60 sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
@@ -4066,7 +4066,7 @@ L_1066c58:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066c78: 0x1066c78: sw    v0, 12(s0)
+// 0x01066c88: 0x1066c88: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4075,8 +4075,8 @@ L_1066c58:
 	add
 	ldloc 6
 	stelem.i4
-L_1066c7c:
-// 0x01066c7c: 0x1066c7c: lw    v0, 12(s0)
+L_1066c8c:
+// 0x01066c8c: 0x1066c8c: lw    v0, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4085,20 +4085,20 @@ L_1066c7c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066c80: 0x1066c80: sll   zero, zero, 0
-// 0x01066c84: 0x1066c84: bne   v0, zero, 0x1066c94 sll   zero, zero, 0
+// 0x01066c90: 0x1066c90: sll   zero, zero, 0
+// 0x01066c94: 0x1066c94: bne   v0, zero, 0x1066ca4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1066c94
+	brtrue L_1066ca4
 // --- basic block ---
-// 0x01066c8c: 0x1066c8c: jal   0x1000ac0 addiu a0, zero, -1
+// 0x01066c9c: 0x1066c9c: jal   0x1000ac0 addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
 	call int32 Cibyl::exit_1000ac0(int32)
 	stloc 6
 // --- basic block ---
-L_1066c94:
-// 0x01066c94: 0x1066c94: lw    s6, 12(s0)
+L_1066ca4:
+// 0x01066ca4: 0x1066ca4: lw    s6, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4107,7 +4107,7 @@ L_1066c94:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01066c98: 0x1066c98: lw    s7, 8(s0)
+// 0x01066ca8: 0x1066ca8: lw    s7, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4116,54 +4116,54 @@ L_1066c94:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01066c9c: 0x1066c9c: addu  s4, s6, zero
+// 0x01066cac: 0x1066cac: addu  s4, s6, zero
 	ldloc 16
 	stloc 14
-// 0x01066ca0: 0x1066ca0: addiu s7, s7, 1
+// 0x01066cb0: 0x1066cb0: addiu s7, s7, 1
 	ldloc 15
 	ldc.i4.1
 	add
 	stloc 15
-// 0x01066ca4: 0x1066ca4: addu  v1, s6, zero
+// 0x01066cb4: 0x1066cb4: addu  v1, s6, zero
 	ldloc 16
 	stloc 7
-// 0x01066ca8: 0x1066ca8: j	 0x1066cb8 addu  v0, zero, zero
+// 0x01066cb8: 0x1066cb8: j	 0x1066cc8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1066cb8
+	br L_1066cc8
 // --- basic block ---
-L_1066cb0:
-// 0x01066cb0: 0x1066cb0: sw    zero, 0(v1)
+L_1066cc0:
+// 0x01066cc0: 0x1066cc0: sw    zero, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01066cb4: 0x1066cb4: addiu v1, v1, 4
+// 0x01066cc4: 0x1066cc4: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-L_1066cb8:
-// 0x01066cb8: 0x1066cb8: slt   a0, v0, s7
+L_1066cc8:
+// 0x01066cc8: 0x1066cc8: slt   a0, v0, s7
 	ldloc 6
 	ldloc 15
 	clt
 	stloc.1
-// 0x01066cbc: 0x1066cbc: bne   a0, zero, 0x1066cb0 addiu v0, v0, 1
+// 0x01066ccc: 0x1066ccc: bne   a0, zero, 0x1066cc0 addiu v0, v0, 1
 	ldloc.1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_1066cb0
+	brtrue L_1066cc0
 // --- basic block ---
-// 0x01066cc4: 0x1066cc4: j	 0x1066de4 sll   zero, zero, 0
-	br L_1066de4
+// 0x01066cd4: 0x1066cd4: j	 0x1066df4 sll   zero, zero, 0
+	br L_1066df4
 // --- basic block ---
-L_1066ccc:
-// 0x01066ccc: 0x1066ccc: lw    v0, 16(s1)
+L_1066cdc:
+// 0x01066cdc: 0x1066cdc: lw    v0, 16(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4172,13 +4172,13 @@ L_1066ccc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066cd0: 0x1066cd0: sll   zero, zero, 0
-// 0x01066cd4: 0x1066cd4: bne   v0, s1, 0x1066ce4 sll   zero, zero, 0
+// 0x01066ce0: 0x1066ce0: sll   zero, zero, 0
+// 0x01066ce4: 0x1066ce4: bne   v0, s1, 0x1066cf4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 9
-	bne.un L_1066ce4
+	bne.un L_1066cf4
 // --- basic block ---
-// 0x01066cdc: 0x1066cdc: j	 0x1066d2c sw    zero, 20(s0)
+// 0x01066cec: 0x1066cec: j	 0x1066d3c sw    zero, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4187,10 +4187,10 @@ L_1066ccc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1066d2c
+	br L_1066d3c
 // --- basic block ---
-L_1066ce4:
-// 0x01066ce4: 0x1066ce4: lw    v1, 8(s1)
+L_1066cf4:
+// 0x01066cf4: 0x1066cf4: lw    v1, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4199,12 +4199,12 @@ L_1066ce4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066ce8: 0x1066ce8: sll   zero, zero, 0
-// 0x01066cec: 0x1066cec: beq   v1, zero, 0x1066d08 sll   zero, zero, 0
+// 0x01066cf8: 0x1066cf8: sll   zero, zero, 0
+// 0x01066cfc: 0x1066cfc: beq   v1, zero, 0x1066d18 sll   zero, zero, 0
 	ldloc 7
-	brfalse L_1066d08
+	brfalse L_1066d18
 // --- basic block ---
-// 0x01066cf4: 0x1066cf4: lw    a0, 12(v1)
+// 0x01066d04: 0x1066d04: lw    a0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4213,13 +4213,13 @@ L_1066ce4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066cf8: 0x1066cf8: sll   zero, zero, 0
-// 0x01066cfc: 0x1066cfc: bne   a0, s1, 0x1066d08 sll   zero, zero, 0
+// 0x01066d08: 0x1066d08: sll   zero, zero, 0
+// 0x01066d0c: 0x1066d0c: bne   a0, s1, 0x1066d18 sll   zero, zero, 0
 	ldloc.1
 	ldloc 9
-	bne.un L_1066d08
+	bne.un L_1066d18
 // --- basic block ---
-// 0x01066d04: 0x1066d04: sw    v0, 12(v1)
+// 0x01066d14: 0x1066d14: sw    v0, 12(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4228,8 +4228,8 @@ L_1066ce4:
 	add
 	ldloc 6
 	stelem.i4
-L_1066d08:
-// 0x01066d08: 0x1066d08: lw    v1, 20(s1)
+L_1066d18:
+// 0x01066d18: 0x1066d18: lw    v1, 20(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4238,7 +4238,7 @@ L_1066d08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066d0c: 0x1066d0c: lw    a0, 16(s1)
+// 0x01066d1c: 0x1066d1c: lw    a0, 16(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4247,7 +4247,7 @@ L_1066d08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066d10: 0x1066d10: sw    zero, 8(s1)
+// 0x01066d20: 0x1066d20: sw    zero, 8(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4256,7 +4256,7 @@ L_1066d08:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01066d14: 0x1066d14: sw    a0, 16(v1)
+// 0x01066d24: 0x1066d24: sw    a0, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4265,7 +4265,7 @@ L_1066d08:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01066d18: 0x1066d18: lw    a0, 16(s1)
+// 0x01066d28: 0x1066d28: lw    a0, 16(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4274,7 +4274,7 @@ L_1066d08:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066d1c: 0x1066d1c: sw    s1, 16(s1)
+// 0x01066d2c: 0x1066d2c: sw    s1, 16(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4283,7 +4283,7 @@ L_1066d08:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01066d20: 0x1066d20: sw    v1, 20(a0)
+// 0x01066d30: 0x1066d30: sw    v1, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4292,7 +4292,7 @@ L_1066d08:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066d24: 0x1066d24: sw    s1, 20(s1)
+// 0x01066d34: 0x1066d34: sw    s1, 20(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4301,7 +4301,7 @@ L_1066d08:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01066d28: 0x1066d28: sw    v0, 20(s0)
+// 0x01066d38: 0x1066d38: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4310,32 +4310,32 @@ L_1066d08:
 	add
 	ldloc 6
 	stelem.i4
-L_1066d2c:
-// 0x01066d2c: 0x1066d2c: lw    s5, 0(s1)
+L_1066d3c:
+// 0x01066d3c: 0x1066d3c: lw    s5, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x01066d30: 0x1066d30: sll   zero, zero, 0
-// 0x01066d34: 0x1066d34: sll   s5, s5, 2
+// 0x01066d40: 0x1066d40: sll   zero, zero, 0
+// 0x01066d44: 0x1066d44: sll   s5, s5, 2
 	ldloc 12
 	ldc.i4.2
 	shl
 	stloc 12
-// 0x01066d38: 0x1066d38: j	 0x1066dd0 addu  s5, s6, s5
+// 0x01066d48: 0x1066d48: j	 0x1066de0 addu  s5, s6, s5
 	ldloc 16
 	ldloc 12
 	add
 	stloc 12
-	br L_1066dd0
+	br L_1066de0
 // --- basic block ---
-L_1066d40:
-// 0x01066d40: 0x1066d40: addu  a1, s1, zero
+L_1066d50:
+// 0x01066d50: 0x1066d50: addu  a1, s1, zero
 	ldloc 9
 	stloc.2
-// 0x01066d44: 0x1066d44: jal   0x1066938 addu  a2, s3, zero
+// 0x01066d54: 0x1066d54: jal   0x1066948 addu  a2, s3, zero
 	ldloc 11
 	stloc.3
 	ldloc.0
@@ -4343,26 +4343,26 @@ L_1066d40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_compare_1066938(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_compare_1066948(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066d4c: 0x1066d4c: blez  v0, 0x1066d5c addu  v0, s3, zero
+// 0x01066d5c: 0x1066d5c: blez  v0, 0x1066d6c addu  v0, s3, zero
 	ldloc 6
 	ldloc 11
 	stloc 6
 	ldc.i4.s 0
-	ble L_1066d5c
+	ble L_1066d6c
 // --- basic block ---
-// 0x01066d54: 0x1066d54: addu  s3, s1, zero
+// 0x01066d64: 0x1066d64: addu  s3, s1, zero
 	ldloc 9
 	stloc 11
-// 0x01066d58: 0x1066d58: addu  s1, v0, zero
+// 0x01066d68: 0x1066d68: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-L_1066d5c:
-// 0x01066d5c: 0x1066d5c: lw    v0, 12(s1)
+L_1066d6c:
+// 0x01066d6c: 0x1066d6c: lw    v0, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4371,12 +4371,12 @@ L_1066d5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066d60: 0x1066d60: sll   zero, zero, 0
-// 0x01066d64: 0x1066d64: bne   v0, zero, 0x1066d74 sll   zero, zero, 0
+// 0x01066d70: 0x1066d70: sll   zero, zero, 0
+// 0x01066d74: 0x1066d74: bne   v0, zero, 0x1066d84 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1066d74
+	brtrue L_1066d84
 // --- basic block ---
-// 0x01066d6c: 0x1066d6c: j	 0x1066db4 sw    s3, 12(s1)
+// 0x01066d7c: 0x1066d7c: j	 0x1066dc4 sw    s3, 12(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -4385,10 +4385,10 @@ L_1066d5c:
 	add
 	ldloc 11
 	stelem.i4
-	br L_1066db4
+	br L_1066dc4
 // --- basic block ---
-L_1066d74:
-// 0x01066d74: 0x1066d74: lw    v0, 16(v0)
+L_1066d84:
+// 0x01066d84: 0x1066d84: lw    v0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4397,8 +4397,8 @@ L_1066d74:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066d78: 0x1066d78: sll   zero, zero, 0
-// 0x01066d7c: 0x1066d7c: lw    v1, 20(v0)
+// 0x01066d88: 0x1066d88: sll   zero, zero, 0
+// 0x01066d8c: 0x1066d8c: lw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4407,13 +4407,13 @@ L_1066d74:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066d80: 0x1066d80: sll   zero, zero, 0
-// 0x01066d84: 0x1066d84: bne   v0, v1, 0x1066da0 sll   zero, zero, 0
+// 0x01066d90: 0x1066d90: sll   zero, zero, 0
+// 0x01066d94: 0x1066d94: bne   v0, v1, 0x1066db0 sll   zero, zero, 0
 	ldloc 6
 	ldloc 7
-	bne.un L_1066da0
+	bne.un L_1066db0
 // --- basic block ---
-// 0x01066d8c: 0x1066d8c: sw    s3, 20(v0)
+// 0x01066d9c: 0x1066d9c: sw    s3, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4422,7 +4422,7 @@ L_1066d74:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01066d90: 0x1066d90: sw    s3, 16(v0)
+// 0x01066da0: 0x1066da0: sw    s3, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4431,7 +4431,7 @@ L_1066d74:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01066d94: 0x1066d94: sw    v0, 20(s3)
+// 0x01066da4: 0x1066da4: sw    v0, 20(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4440,7 +4440,7 @@ L_1066d74:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066d98: 0x1066d98: j	 0x1066db4 sw    v0, 16(s3)
+// 0x01066da8: 0x1066da8: j	 0x1066dc4 sw    v0, 16(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4449,10 +4449,10 @@ L_1066d74:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1066db4
+	br L_1066dc4
 // --- basic block ---
-L_1066da0:
-// 0x01066da0: 0x1066da0: sw    v1, 20(s3)
+L_1066db0:
+// 0x01066db0: 0x1066db0: sw    v1, 20(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4461,7 +4461,7 @@ L_1066da0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066da4: 0x1066da4: lw    v1, 20(v0)
+// 0x01066db4: 0x1066db4: lw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4470,7 +4470,7 @@ L_1066da0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066da8: 0x1066da8: sw    s3, 20(v0)
+// 0x01066db8: 0x1066db8: sw    s3, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4479,7 +4479,7 @@ L_1066da0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01066dac: 0x1066dac: sw    s3, 16(v1)
+// 0x01066dbc: 0x1066dbc: sw    s3, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4488,7 +4488,7 @@ L_1066da0:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01066db0: 0x1066db0: sw    v0, 16(s3)
+// 0x01066dc0: 0x1066dc0: sw    v0, 16(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4497,15 +4497,15 @@ L_1066da0:
 	add
 	ldloc 6
 	stelem.i4
-L_1066db4:
-// 0x01066db4: 0x1066db4: lw    v0, 0(s1)
+L_1066dc4:
+// 0x01066dc4: 0x1066dc4: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01066db8: 0x1066db8: sw    s1, 8(s3)
+// 0x01066dc8: 0x1066dc8: sw    s1, 8(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4514,19 +4514,19 @@ L_1066db4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01066dbc: 0x1066dbc: addiu v0, v0, 1
+// 0x01066dcc: 0x1066dcc: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01066dc0: 0x1066dc0: sw    zero, 0(s5)
+// 0x01066dd0: 0x1066dd0: sw    zero, 0(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01066dc4: 0x1066dc4: sw    zero, 4(s3)
+// 0x01066dd4: 0x1066dd4: sw    zero, 4(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -4535,42 +4535,42 @@ L_1066db4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01066dc8: 0x1066dc8: sw    v0, 0(s1)
+// 0x01066dd8: 0x1066dd8: sw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01066dcc: 0x1066dcc: addiu s5, s5, 4
+// 0x01066ddc: 0x1066ddc: addiu s5, s5, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-L_1066dd0:
-// 0x01066dd0: 0x1066dd0: lw    s3, 0(s5)
+L_1066de0:
+// 0x01066de0: 0x1066de0: lw    s3, 0(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01066dd4: 0x1066dd4: sll   zero, zero, 0
-// 0x01066dd8: 0x1066dd8: bne   s3, zero, 0x1066d40 addu  a0, s0, zero
+// 0x01066de4: 0x1066de4: sll   zero, zero, 0
+// 0x01066de8: 0x1066de8: bne   s3, zero, 0x1066d50 addu  a0, s0, zero
 	ldloc 11
 	ldloc 8
 	stloc.1
-	brtrue L_1066d40
+	brtrue L_1066d50
 // --- basic block ---
-// 0x01066de0: 0x1066de0: sw    s1, 0(s5)
+// 0x01066df0: 0x1066df0: sw    s1, 0(s5)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-L_1066de4:
-// 0x01066de4: 0x1066de4: lw    s1, 20(s0)
+L_1066df4:
+// 0x01066df4: 0x1066df4: lw    s1, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4579,12 +4579,12 @@ L_1066de4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01066de8: 0x1066de8: sll   zero, zero, 0
-// 0x01066dec: 0x1066dec: bne   s1, zero, 0x1066ccc sll   zero, zero, 0
+// 0x01066df8: 0x1066df8: sll   zero, zero, 0
+// 0x01066dfc: 0x1066dfc: bne   s1, zero, 0x1066cdc sll   zero, zero, 0
 	ldloc 9
-	brtrue L_1066ccc
+	brtrue L_1066cdc
 // --- basic block ---
-// 0x01066df4: 0x1066df4: j	 0x1066e9c sw    zero, 16(s0)
+// 0x01066e04: 0x1066e04: j	 0x1066eac sw    zero, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4593,22 +4593,22 @@ L_1066de4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1066e9c
+	br L_1066eac
 // --- basic block ---
-L_1066dfc:
-// 0x01066dfc: 0x1066dfc: lw    v0, 0(s4)
+L_1066e0c:
+// 0x01066e0c: 0x1066e0c: lw    v0, 0(s4)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01066e00: 0x1066e00: sll   zero, zero, 0
-// 0x01066e04: 0x1066e04: beq   v0, zero, 0x1066e94 sll   zero, zero, 0
+// 0x01066e10: 0x1066e10: sll   zero, zero, 0
+// 0x01066e14: 0x1066e14: beq   v0, zero, 0x1066ea4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1066e94
+	brfalse L_1066ea4
 // --- basic block ---
-// 0x01066e0c: 0x1066e0c: lw    v1, 20(s0)
+// 0x01066e1c: 0x1066e1c: lw    v1, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4617,12 +4617,12 @@ L_1066dfc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066e10: 0x1066e10: sll   zero, zero, 0
-// 0x01066e14: 0x1066e14: bne   v1, zero, 0x1066e2c sll   zero, zero, 0
+// 0x01066e20: 0x1066e20: sll   zero, zero, 0
+// 0x01066e24: 0x1066e24: bne   v1, zero, 0x1066e3c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_1066e2c
+	brtrue L_1066e3c
 // --- basic block ---
-// 0x01066e1c: 0x1066e1c: sw    v0, 20(s0)
+// 0x01066e2c: 0x1066e2c: sw    v0, 20(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4631,7 +4631,7 @@ L_1066dfc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066e20: 0x1066e20: sw    v0, 20(v0)
+// 0x01066e30: 0x1066e30: sw    v0, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4640,7 +4640,7 @@ L_1066dfc:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066e24: 0x1066e24: j	 0x1066e64 sw    v0, 16(v0)
+// 0x01066e34: 0x1066e34: j	 0x1066e74 sw    v0, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4649,10 +4649,10 @@ L_1066dfc:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1066e64
+	br L_1066e74
 // --- basic block ---
-L_1066e2c:
-// 0x01066e2c: 0x1066e2c: lw    a0, 20(v1)
+L_1066e3c:
+// 0x01066e3c: 0x1066e3c: lw    a0, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4661,13 +4661,13 @@ L_1066e2c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066e30: 0x1066e30: sll   zero, zero, 0
-// 0x01066e34: 0x1066e34: bne   v1, a0, 0x1066e50 sll   zero, zero, 0
+// 0x01066e40: 0x1066e40: sll   zero, zero, 0
+// 0x01066e44: 0x1066e44: bne   v1, a0, 0x1066e60 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_1066e50
+	bne.un L_1066e60
 // --- basic block ---
-// 0x01066e3c: 0x1066e3c: sw    v0, 20(v1)
+// 0x01066e4c: 0x1066e4c: sw    v0, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4676,7 +4676,7 @@ L_1066e2c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066e40: 0x1066e40: sw    v0, 16(v1)
+// 0x01066e50: 0x1066e50: sw    v0, 16(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4685,7 +4685,7 @@ L_1066e2c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066e44: 0x1066e44: sw    v1, 20(v0)
+// 0x01066e54: 0x1066e54: sw    v1, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4694,7 +4694,7 @@ L_1066e2c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066e48: 0x1066e48: j	 0x1066e64 sw    v1, 16(v0)
+// 0x01066e58: 0x1066e58: j	 0x1066e74 sw    v1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4703,10 +4703,10 @@ L_1066e2c:
 	add
 	ldloc 7
 	stelem.i4
-	br L_1066e64
+	br L_1066e74
 // --- basic block ---
-L_1066e50:
-// 0x01066e50: 0x1066e50: sw    a0, 20(v0)
+L_1066e60:
+// 0x01066e60: 0x1066e60: sw    a0, 20(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4715,7 +4715,7 @@ L_1066e50:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01066e54: 0x1066e54: lw    a0, 20(v1)
+// 0x01066e64: 0x1066e64: lw    a0, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4724,7 +4724,7 @@ L_1066e50:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01066e58: 0x1066e58: sw    v0, 20(v1)
+// 0x01066e68: 0x1066e68: sw    v0, 20(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4733,7 +4733,7 @@ L_1066e50:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066e5c: 0x1066e5c: sw    v0, 16(a0)
+// 0x01066e6c: 0x1066e6c: sw    v0, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4742,7 +4742,7 @@ L_1066e50:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01066e60: 0x1066e60: sw    v1, 16(v0)
+// 0x01066e70: 0x1066e70: sw    v1, 16(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4751,8 +4751,8 @@ L_1066e50:
 	add
 	ldloc 7
 	stelem.i4
-L_1066e64:
-// 0x01066e64: 0x1066e64: lw    a2, 16(s0)
+L_1066e74:
+// 0x01066e74: 0x1066e74: lw    a2, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4761,19 +4761,19 @@ L_1066e64:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01066e68: 0x1066e68: sll   zero, zero, 0
-// 0x01066e6c: 0x1066e6c: beq   a2, zero, 0x1066e88 sll   zero, zero, 0
+// 0x01066e78: 0x1066e78: sll   zero, zero, 0
+// 0x01066e7c: 0x1066e7c: beq   a2, zero, 0x1066e98 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1066e88
+	brfalse L_1066e98
 // --- basic block ---
-// 0x01066e74: 0x1066e74: lw    a1, 0(s4)
+// 0x01066e84: 0x1066e84: lw    a1, 0(s4)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01066e78: 0x1066e78: jal   0x1066938 addu  a0, s0, zero
+// 0x01066e88: 0x1066e88: jal   0x1066948 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4781,26 +4781,26 @@ L_1066e64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_compare_1066938(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_compare_1066948(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01066e80: 0x1066e80: bgez  v0, 0x1066e94 sll   zero, zero, 0
+// 0x01066e90: 0x1066e90: bgez  v0, 0x1066ea4 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_1066e94
+	bge L_1066ea4
 // --- basic block ---
-L_1066e88:
-// 0x01066e88: 0x1066e88: lw    v0, 0(s4)
+L_1066e98:
+// 0x01066e98: 0x1066e98: lw    v0, 0(s4)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01066e8c: 0x1066e8c: sll   zero, zero, 0
-// 0x01066e90: 0x1066e90: sw    v0, 16(s0)
+// 0x01066e9c: 0x1066e9c: sll   zero, zero, 0
+// 0x01066ea0: 0x1066ea0: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4809,33 +4809,33 @@ L_1066e88:
 	add
 	ldloc 6
 	stelem.i4
-L_1066e94:
-// 0x01066e94: 0x1066e94: addiu s1, s1, 1
+L_1066ea4:
+// 0x01066ea4: 0x1066ea4: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01066e98: 0x1066e98: addiu s4, s4, 4
+// 0x01066ea8: 0x1066ea8: addiu s4, s4, 4
 	ldloc 14
 	ldc.i4.4
 	add
 	stloc 14
-L_1066e9c:
-// 0x01066e9c: 0x1066e9c: slt   v0, s1, s7
+L_1066eac:
+// 0x01066eac: 0x1066eac: slt   v0, s1, s7
 	ldloc 9
 	ldloc 15
 	clt
 	stloc 6
-// 0x01066ea0: 0x1066ea0: bne   v0, zero, 0x1066dfc sll   zero, zero, 0
+// 0x01066eb0: 0x1066eb0: bne   v0, zero, 0x1066e0c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1066dfc
+	brtrue L_1066e0c
 // --- basic block ---
-L_1066ea8:
-// 0x01066ea8: 0x1066ea8: lw    ra, 52(sp)
-// 0x01066eac: 0x1066eac: addu  v0, s2, zero
+L_1066eb8:
+// 0x01066eb8: 0x1066eb8: lw    ra, 52(sp)
+// 0x01066ebc: 0x1066ebc: addu  v0, s2, zero
 	ldloc 10
 	stloc 6
-// 0x01066eb0: 0x1066eb0: lw    s7, 48(sp)
+// 0x01066ec0: 0x1066ec0: lw    s7, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4844,7 +4844,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01066eb4: 0x1066eb4: lw    s6, 44(sp)
+// 0x01066ec4: 0x1066ec4: lw    s6, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4853,7 +4853,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01066eb8: 0x1066eb8: lw    s5, 40(sp)
+// 0x01066ec8: 0x1066ec8: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01066ebc: 0x1066ebc: lw    s4, 36(sp)
+// 0x01066ecc: 0x1066ecc: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4871,7 +4871,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01066ec0: 0x1066ec0: lw    s3, 32(sp)
+// 0x01066ed0: 0x1066ed0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4880,7 +4880,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01066ec4: 0x1066ec4: lw    s2, 28(sp)
+// 0x01066ed4: 0x1066ed4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4889,7 +4889,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01066ec8: 0x1066ec8: lw    s1, 24(sp)
+// 0x01066ed8: 0x1066ed8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4898,7 +4898,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01066ecc: 0x1066ecc: lw    s0, 20(sp)
+// 0x01066edc: 0x1066edc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4907,7 +4907,7 @@ L_1066ea8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01066ed0: 0x1066ed0: jr    ra addiu sp, sp, 56
+// 0x01066ee0: 0x1066ee0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4919,7 +4919,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 fh_extractmin_1066ed8(int32,int32,int32,int32,int32)
+.method public static int32 fh_extractmin_1066ee8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -4954,7 +4954,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066ed8: 0x1066ed8: lw    v1, 16(a0)
+// 0x01066ee8: 0x1066ee8: lw    v1, 16(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4963,45 +4963,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066edc: 0x1066edc: addiu sp, sp, -24
+// 0x01066eec: 0x1066eec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01066ee0: 0x1066ee0: sw    ra, 20(sp)
-// 0x01066ee4: 0x1066ee4: beq   v1, zero, 0x1066f1c addu  v0, zero, zero
+// 0x01066ef0: 0x1066ef0: sw    ra, 20(sp)
+// 0x01066ef4: 0x1066ef4: beq   v1, zero, 0x1066f2c addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1066f1c
+	brfalse L_1066f2c
 // --- basic block ---
-// 0x01066eec: 0x1066eec: jal   0x1066a84 sll   zero, zero, 0
+// 0x01066efc: 0x1066efc: jal   0x1066a94 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_extractminel_1066a84(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_extractminel_1066a94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01066ef4: 0x1066ef4: lui   a0, 0x70000
+// 0x01066f04: 0x1066f04: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01066ef8: 0x1066ef8: lw    a1, 16336(a0)
+// 0x01066f08: 0x1066f08: lw    a1, 16800(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 4084
+	ldc.i4 4200
 	add
 	ldelem.i4
 	stloc.2
-// 0x01066efc: 0x1066efc: addu  v1, v0, zero
+// 0x01066f0c: 0x1066f0c: addu  v1, v0, zero
 	ldloc 7
 	stloc 6
-// 0x01066f00: 0x1066f00: lw    v0, 28(v0)
+// 0x01066f10: 0x1066f10: lw    v0, 28(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5010,11 +5010,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01066f04: 0x1066f04: bne   a1, zero, 0x1066f14 sll   zero, zero, 0
+// 0x01066f14: 0x1066f14: bne   a1, zero, 0x1066f24 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1066f14
+	brtrue L_1066f24
 // --- basic block ---
-// 0x01066f0c: 0x1066f0c: j	 0x1066f18 sw    zero, 12(v1)
+// 0x01066f1c: 0x1066f1c: j	 0x1066f28 sw    zero, 12(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5023,10 +5023,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1066f18
+	br L_1066f28
 // --- basic block ---
-L_1066f14:
-// 0x01066f14: 0x1066f14: sw    a1, 12(v1)
+L_1066f24:
+// 0x01066f24: 0x1066f24: sw    a1, 12(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5035,20 +5035,20 @@ L_1066f14:
 	add
 	ldloc.2
 	stelem.i4
-L_1066f18:
-// 0x01066f18: 0x1066f18: sw    v1, 16336(a0)
+L_1066f28:
+// 0x01066f28: 0x1066f28: sw    v1, 16800(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 4084
+	ldc.i4 4200
 	add
 	ldloc 6
 	stelem.i4
-L_1066f1c:
-// 0x01066f1c: 0x1066f1c: lw    ra, 20(sp)
-// 0x01066f20: 0x1066f20: sll   zero, zero, 0
-// 0x01066f24: 0x1066f24: jr    ra addiu sp, sp, 24
+L_1066f2c:
+// 0x01066f2c: 0x1066f2c: lw    ra, 20(sp)
+// 0x01066f30: 0x1066f30: sll   zero, zero, 0
+// 0x01066f34: 0x1066f34: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5060,7 +5060,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 fh_replacekeydata_1066f2c(int32,int32,int32,int32,int32)
+.method public static int32 fh_replacekeydata_1066f3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s1,int32 s3,int32 v1,int32 s4,int32 s5,int32 ra)
@@ -5113,12 +5113,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01066f2c: 0x1066f2c: addiu sp, sp, -88
+// 0x01066f3c: 0x1066f3c: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01066f30: 0x1066f30: sw    s1, 64(sp)
+// 0x01066f40: 0x1066f40: sw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5127,7 +5127,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01066f34: 0x1066f34: sw    s0, 60(sp)
+// 0x01066f44: 0x1066f44: sw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5136,13 +5136,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01066f38: 0x1066f38: addu  s1, a2, zero
+// 0x01066f48: 0x1066f48: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x01066f3c: 0x1066f3c: addu  s0, a1, zero
+// 0x01066f4c: 0x1066f4c: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x01066f40: 0x1066f40: sw    a3, 44(sp)
+// 0x01066f50: 0x1066f50: sw    a3, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5151,7 +5151,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01066f44: 0x1066f44: sw    s1, 40(sp)
+// 0x01066f54: 0x1066f54: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5160,15 +5160,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01066f48: 0x1066f48: addiu a1, sp, 16
+// 0x01066f58: 0x1066f58: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x01066f4c: 0x1066f4c: addu  a2, s0, zero
+// 0x01066f5c: 0x1066f5c: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x01066f50: 0x1066f50: sw    s5, 80(sp)
+// 0x01066f60: 0x1066f60: sw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5177,7 +5177,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01066f54: 0x1066f54: sw    s4, 76(sp)
+// 0x01066f64: 0x1066f64: sw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5186,7 +5186,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01066f58: 0x1066f58: sw    s3, 72(sp)
+// 0x01066f68: 0x1066f68: sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5195,7 +5195,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01066f5c: 0x1066f5c: sw    a3, 48(sp)
+// 0x01066f6c: 0x1066f6c: sw    a3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5204,8 +5204,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01066f60: 0x1066f60: sw    ra, 84(sp)
-// 0x01066f64: 0x1066f64: sw    s2, 68(sp)
+// 0x01066f70: 0x1066f70: sw    ra, 84(sp)
+// 0x01066f74: 0x1066f74: sw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5214,7 +5214,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01066f68: 0x1066f68: lw    s4, 28(s0)
+// 0x01066f78: 0x1066f78: lw    s4, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5223,7 +5223,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01066f6c: 0x1066f6c: lw    s5, 24(s0)
+// 0x01066f7c: 0x1066f7c: lw    s5, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5232,7 +5232,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01066f70: 0x1066f70: jal   0x1066938 addu  s3, a0, zero
+// 0x01066f80: 0x1066f80: jal   0x1066948 addu  s3, a0, zero
 	ldloc.1
 	stloc 10
 	ldloc.0
@@ -5240,12 +5240,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_compare_1066938(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_compare_1066948(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01066f78: 0x1066f78: lw    a3, 48(sp)
+// 0x01066f88: 0x1066f88: lw    a3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5254,20 +5254,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01066f7c: 0x1066f7c: blez  v0, 0x1066f8c sll   zero, zero, 0
+// 0x01066f8c: 0x1066f8c: blez  v0, 0x1066f9c sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	ble L_1066f8c
+	ble L_1066f9c
 // --- basic block ---
-// 0x01066f84: 0x1066f84: jal   0x1000ac0 addiu a0, zero, -1
+// 0x01066f94: 0x1066f94: jal   0x1000ac0 addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
 	ldloc.1
 	call int32 Cibyl::exit_1000ac0(int32)
 	stloc 6
 // --- basic block ---
-L_1066f8c:
-// 0x01066f8c: 0x1066f8c: sw    a3, 28(s0)
+L_1066f9c:
+// 0x01066f9c: 0x1066f9c: sw    a3, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5276,7 +5276,7 @@ L_1066f8c:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01066f90: 0x1066f90: beq   v0, zero, 0x1067038 sw    s1, 24(s0)
+// 0x01066fa0: 0x1066fa0: beq   v0, zero, 0x1067048 sw    s1, 24(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 7
@@ -5286,9 +5286,9 @@ L_1066f8c:
 	add
 	ldloc 9
 	stelem.i4
-	brfalse L_1067038
+	brfalse L_1067048
 // --- basic block ---
-// 0x01066f98: 0x1066f98: lw    v0, 28(s3)
+// 0x01066fa8: 0x1066fa8: lw    v0, 28(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5297,7 +5297,7 @@ L_1066f8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066f9c: 0x1066f9c: lw    s2, 8(s0)
+// 0x01066fac: 0x1066fac: lw    s2, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5306,27 +5306,27 @@ L_1066f8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01066fa0: 0x1066fa0: bgez  v0, 0x1066fb0 sll   zero, zero, 0
+// 0x01066fb0: 0x1066fb0: bgez  v0, 0x1066fc0 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bge L_1066fb0
+	bge L_1066fc0
 // --- basic block ---
-// 0x01066fa8: 0x1066fa8: beq   s5, s1, 0x1067038 sll   zero, zero, 0
+// 0x01066fb8: 0x1066fb8: beq   s5, s1, 0x1067048 sll   zero, zero, 0
 	ldloc 13
 	ldloc 9
-	beq  L_1067038
+	beq  L_1067048
 // --- basic block ---
-L_1066fb0:
-// 0x01066fb0: 0x1066fb0: beq   s2, zero, 0x106701c addu  a0, s3, zero
+L_1066fc0:
+// 0x01066fc0: 0x1066fc0: beq   s2, zero, 0x106702c addu  a0, s3, zero
 	ldloc 8
 	ldloc 10
 	stloc.1
-	brfalse L_106701c
+	brfalse L_106702c
 // --- basic block ---
-// 0x01066fb8: 0x1066fb8: addu  a1, s0, zero
+// 0x01066fc8: 0x1066fc8: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01066fbc: 0x1066fbc: jal   0x1066938 addu  a2, s2, zero
+// 0x01066fcc: 0x1066fcc: jal   0x1066948 addu  a2, s2, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -5334,38 +5334,38 @@ L_1066fb0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_compare_1066938(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_compare_1066948(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01066fc4: 0x1066fc4: bgtz  v0, 0x106701c addu  a0, s3, zero
+// 0x01066fd4: 0x1066fd4: bgtz  v0, 0x106702c addu  a0, s3, zero
 	ldloc 6
 	ldloc 10
 	stloc.1
 	ldc.i4.s 0
-	bgt L_106701c
+	bgt L_106702c
 // --- basic block ---
-// 0x01066fcc: 0x1066fcc: addu  a1, s0, zero
+// 0x01066fdc: 0x1066fdc: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01066fd0: 0x1066fd0: jal   0x1066880 addu  a2, s2, zero
+// 0x01066fe0: 0x1066fe0: jal   0x1066890 addu  a2, s2, zero
 	ldloc 8
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_cut_1066880(int32,int32,int32,int32)
+	call int32 Cibyl76::fh_cut_1066890(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01066fd8: 0x1066fd8: j	 0x106700c sll   zero, zero, 0
-	br L_106700c
+// 0x01066fe8: 0x1066fe8: j	 0x106701c sll   zero, zero, 0
+	br L_106701c
 // --- basic block ---
-L_1066fe0:
-// 0x01066fe0: 0x1066fe0: lw    v0, 4(s2)
+L_1066ff0:
+// 0x01066ff0: 0x1066ff0: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5374,17 +5374,17 @@ L_1066fe0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01066fe4: 0x1066fe4: sll   zero, zero, 0
-// 0x01066fe8: 0x1066fe8: bne   v0, zero, 0x1066ffc addu  a1, s2, zero
+// 0x01066ff4: 0x1066ff4: sll   zero, zero, 0
+// 0x01066ff8: 0x1066ff8: bne   v0, zero, 0x106700c addu  a1, s2, zero
 	ldloc 6
 	ldloc 8
 	stloc.2
-	brtrue L_1066ffc
+	brtrue L_106700c
 // --- basic block ---
-// 0x01066ff0: 0x1066ff0: addiu v0, zero, 1
+// 0x01067000: 0x1067000: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01066ff4: 0x1066ff4: j	 0x106701c sw    v0, 4(s2)
+// 0x01067004: 0x1067004: j	 0x106702c sw    v0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5393,29 +5393,29 @@ L_1066fe0:
 	add
 	ldloc 6
 	stelem.i4
-	br L_106701c
+	br L_106702c
 // --- basic block ---
-L_1066ffc:
-// 0x01066ffc: 0x1066ffc: addu  a0, s3, zero
+L_106700c:
+// 0x0106700c: 0x106700c: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01067000: 0x1067000: jal   0x1066880 addu  a2, s1, zero
+// 0x01067010: 0x1067010: jal   0x1066890 addu  a2, s1, zero
 	ldloc 9
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_cut_1066880(int32,int32,int32,int32)
+	call int32 Cibyl76::fh_cut_1066890(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01067008: 0x1067008: addu  s2, s1, zero
+// 0x01067018: 0x1067018: addu  s2, s1, zero
 	ldloc 9
 	stloc 8
-L_106700c:
-// 0x0106700c: 0x106700c: lw    s1, 8(s2)
+L_106701c:
+// 0x0106701c: 0x106701c: lw    s1, 8(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5424,13 +5424,13 @@ L_106700c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01067010: 0x1067010: sll   zero, zero, 0
-// 0x01067014: 0x1067014: bne   s1, zero, 0x1066fe0 sll   zero, zero, 0
+// 0x01067020: 0x1067020: sll   zero, zero, 0
+// 0x01067024: 0x1067024: bne   s1, zero, 0x1066ff0 sll   zero, zero, 0
 	ldloc 9
-	brtrue L_1066fe0
+	brtrue L_1066ff0
 // --- basic block ---
-L_106701c:
-// 0x0106701c: 0x106701c: lw    a2, 16(s3)
+L_106702c:
+// 0x0106702c: 0x106702c: lw    a2, 16(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5439,10 +5439,10 @@ L_106701c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01067020: 0x1067020: addu  a0, s3, zero
+// 0x01067030: 0x1067030: addu  a0, s3, zero
 	ldloc 10
 	stloc.1
-// 0x01067024: 0x1067024: jal   0x1066938 addu  a1, s0, zero
+// 0x01067034: 0x1067034: jal   0x1066948 addu  a1, s0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -5450,17 +5450,17 @@ L_106701c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_compare_1066938(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_compare_1066948(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0106702c: 0x106702c: bgtz  v0, 0x1067038 sll   zero, zero, 0
+// 0x0106703c: 0x106703c: bgtz  v0, 0x1067048 sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	bgt L_1067038
+	bgt L_1067048
 // --- basic block ---
-// 0x01067034: 0x1067034: sw    s0, 16(s3)
+// 0x01067044: 0x1067044: sw    s0, 16(s3)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -5469,12 +5469,12 @@ L_106701c:
 	add
 	ldloc 7
 	stelem.i4
-L_1067038:
-// 0x01067038: 0x1067038: lw    ra, 84(sp)
-// 0x0106703c: 0x106703c: addu  v0, s4, zero
+L_1067048:
+// 0x01067048: 0x1067048: lw    ra, 84(sp)
+// 0x0106704c: 0x106704c: addu  v0, s4, zero
 	ldloc 12
 	stloc 6
-// 0x01067040: 0x1067040: lw    s5, 80(sp)
+// 0x01067050: 0x1067050: lw    s5, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5483,7 +5483,7 @@ L_1067038:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01067044: 0x1067044: lw    s4, 76(sp)
+// 0x01067054: 0x1067054: lw    s4, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5492,7 +5492,7 @@ L_1067038:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01067048: 0x1067048: lw    s3, 72(sp)
+// 0x01067058: 0x1067058: lw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5501,7 +5501,7 @@ L_1067038:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0106704c: 0x106704c: lw    s2, 68(sp)
+// 0x0106705c: 0x106705c: lw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5510,7 +5510,7 @@ L_1067038:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01067050: 0x1067050: lw    s1, 64(sp)
+// 0x01067060: 0x1067060: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5519,7 +5519,7 @@ L_1067038:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01067054: 0x1067054: lw    s0, 60(sp)
+// 0x01067064: 0x1067064: lw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5528,7 +5528,7 @@ L_1067038:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01067058: 0x1067058: jr    ra addiu sp, sp, 88
+// 0x01067068: 0x1067068: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -5540,7 +5540,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 fh_replacedata_1067060(int32,int32,int32,int32,int32)
+.method public static int32 fh_replacedata_1067070(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5575,10 +5575,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067060: 0x1067060: addu  a3, a2, zero
+// 0x01067070: 0x1067070: addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-// 0x01067064: 0x1067064: lw    a2, 24(a1)
+// 0x01067074: 0x1067074: lw    a2, 24(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5587,26 +5587,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01067068: 0x1067068: addiu sp, sp, -24
+// 0x01067078: 0x1067078: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106706c: 0x106706c: sw    ra, 20(sp)
-// 0x01067070: 0x1067070: jal   0x1066f2c sll   zero, zero, 0
+// 0x0106707c: 0x106707c: sw    ra, 20(sp)
+// 0x01067080: 0x1067080: jal   0x1066f3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_replacekeydata_1066f2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_replacekeydata_1066f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01067078: 0x1067078: lw    ra, 20(sp)
-// 0x0106707c: 0x106707c: sll   zero, zero, 0
-// 0x01067080: 0x1067080: jr    ra addiu sp, sp, 24
+// 0x01067088: 0x1067088: lw    ra, 20(sp)
+// 0x0106708c: 0x106708c: sll   zero, zero, 0
+// 0x01067090: 0x1067090: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5618,7 +5618,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 fh_replacekey_1067088(int32,int32,int32,int32,int32)
+.method public static int32 fh_replacekey_1067098(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -5656,7 +5656,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067088: 0x1067088: lw    a3, 28(a1)
+// 0x01067098: 0x1067098: lw    a3, 28(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5665,13 +5665,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0106708c: 0x106708c: addiu sp, sp, -24
+// 0x0106709c: 0x106709c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01067090: 0x1067090: sw    ra, 20(sp)
-// 0x01067094: 0x1067094: sw    s0, 16(sp)
+// 0x010670a0: 0x10670a0: sw    ra, 20(sp)
+// 0x010670a4: 0x10670a4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5680,7 +5680,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01067098: 0x1067098: lw    s0, 24(a1)
+// 0x010670a8: 0x10670a8: lw    s0, 24(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -5689,22 +5689,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106709c: 0x106709c: jal   0x1066f2c sll   zero, zero, 0
+// 0x010670ac: 0x10670ac: jal   0x1066f3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_replacekeydata_1066f2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_replacekeydata_1066f3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x010670a4: 0x10670a4: lw    ra, 20(sp)
-// 0x010670a8: 0x10670a8: addu  v0, s0, zero
+// 0x010670b4: 0x10670b4: lw    ra, 20(sp)
+// 0x010670b8: 0x10670b8: addu  v0, s0, zero
 	ldloc 6
 	stloc 8
-// 0x010670ac: 0x10670ac: lw    s0, 16(sp)
+// 0x010670bc: 0x10670bc: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5713,7 +5713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010670b0: 0x10670b0: jr    ra addiu sp, sp, 24
+// 0x010670c0: 0x10670c0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5725,7 +5725,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 fhe_newelem_1067114(int32,int32,int32,int32,int32)
+.method public static int32 fhe_newelem_1067124(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -5760,28 +5760,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067114: 0x1067114: lui   v1, 0x70000
+// 0x01067124: 0x1067124: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01067118: 0x1067118: lw    v0, 16336(v1)
+// 0x01067128: 0x1067128: lw    v0, 16800(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 4084
+	ldc.i4 4200
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106711c: 0x106711c: addiu sp, sp, -24
+// 0x0106712c: 0x106712c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01067120: 0x1067120: bne   v0, zero, 0x1067140 sw    ra, 20(sp)
+// 0x01067130: 0x1067130: bne   v0, zero, 0x1067150 sw    ra, 20(sp)
 	ldloc 5
-	brtrue L_1067140
+	brtrue L_1067150
 // --- basic block ---
-// 0x01067128: 0x1067128: jal   0x1000910 addiu a0, zero, 32
+// 0x01067138: 0x1067138: jal   0x1000910 addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
 	ldloc.0
@@ -5794,21 +5794,21 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01067130: 0x1067130: beq   v0, zero, 0x1067168 sll   zero, zero, 0
+// 0x01067140: 0x1067140: beq   v0, zero, 0x1067178 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1067168
+	brfalse L_1067178
 // --- basic block ---
-// 0x01067138: 0x1067138: j	 0x1067150 sw    zero, 0(v0)
+// 0x01067148: 0x1067148: j	 0x1067160 sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-	br L_1067150
+	br L_1067160
 // --- basic block ---
-L_1067140:
-// 0x01067140: 0x1067140: lw    a0, 12(v0)
+L_1067150:
+// 0x01067150: 0x1067150: lw    a0, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5817,25 +5817,25 @@ L_1067140:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01067144: 0x1067144: sll   zero, zero, 0
-// 0x01067148: 0x1067148: sw    a0, 16336(v1)
+// 0x01067154: 0x1067154: sll   zero, zero, 0
+// 0x01067158: 0x1067158: sw    a0, 16800(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 4084
+	ldc.i4 4200
 	add
 	ldloc.1
 	stelem.i4
-// 0x0106714c: 0x106714c: sw    zero, 0(v0)
+// 0x0106715c: 0x106715c: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_1067150:
-// 0x01067150: 0x1067150: sw    zero, 4(v0)
+L_1067160:
+// 0x01067160: 0x1067160: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5844,7 +5844,7 @@ L_1067150:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01067154: 0x1067154: sw    zero, 8(v0)
+// 0x01067164: 0x1067164: sw    zero, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5853,7 +5853,7 @@ L_1067150:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01067158: 0x1067158: sw    zero, 12(v0)
+// 0x01067168: 0x1067168: sw    zero, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5862,7 +5862,7 @@ L_1067150:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106715c: 0x106715c: sw    v0, 16(v0)
+// 0x0106716c: 0x106716c: sw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5871,7 +5871,7 @@ L_1067150:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01067160: 0x1067160: sw    v0, 20(v0)
+// 0x01067170: 0x1067170: sw    v0, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5880,7 +5880,7 @@ L_1067150:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01067164: 0x1067164: sw    zero, 28(v0)
+// 0x01067174: 0x1067174: sw    zero, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5889,10 +5889,10 @@ L_1067150:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1067168:
-// 0x01067168: 0x1067168: lw    ra, 20(sp)
-// 0x0106716c: 0x106716c: sll   zero, zero, 0
-// 0x01067170: 0x1067170: jr    ra addiu sp, sp, 24
+L_1067178:
+// 0x01067178: 0x1067178: lw    ra, 20(sp)
+// 0x0106717c: 0x106717c: sll   zero, zero, 0
+// 0x01067180: 0x1067180: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5904,7 +5904,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 fh_insertkey_10671c4(int32,int32,int32,int32,int32)
+.method public static int32 fh_insertkey_10671d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 ra,int32 v1)
@@ -5939,12 +5939,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010671c4: 0x10671c4: addiu sp, sp, -40
+// 0x010671d4: 0x10671d4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010671c8: 0x10671c8: sw    a0, 16(sp)
+// 0x010671d8: 0x10671d8: sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5953,7 +5953,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010671cc: 0x10671cc: sw    a1, 20(sp)
+// 0x010671dc: 0x10671dc: sw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5962,7 +5962,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010671d0: 0x10671d0: sw    a2, 24(sp)
+// 0x010671e0: 0x10671e0: sw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5971,19 +5971,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010671d4: 0x10671d4: sw    ra, 36(sp)
-// 0x010671d8: 0x10671d8: jal   0x1067114 sll   zero, zero, 0
+// 0x010671e4: 0x10671e4: sw    ra, 36(sp)
+// 0x010671e8: 0x10671e8: jal   0x1067124 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fhe_newelem_1067114(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fhe_newelem_1067124(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x010671e0: 0x10671e0: lw    a0, 16(sp)
+// 0x010671f0: 0x10671f0: lw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5992,7 +5992,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010671e4: 0x10671e4: lw    a1, 20(sp)
+// 0x010671f4: 0x10671f4: lw    a1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6001,7 +6001,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010671e8: 0x10671e8: lw    a2, 24(sp)
+// 0x010671f8: 0x10671f8: lw    a2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6010,11 +6010,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010671ec: 0x10671ec: beq   v0, zero, 0x106720c sll   zero, zero, 0
+// 0x010671fc: 0x10671fc: beq   v0, zero, 0x106721c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_106720c
+	brfalse L_106721c
 // --- basic block ---
-// 0x010671f4: 0x10671f4: sw    a1, 24(v0)
+// 0x01067204: 0x1067204: sw    a1, 24(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6023,7 +6023,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x010671f8: 0x10671f8: sw    a2, 28(v0)
+// 0x01067208: 0x1067208: sw    a2, 28(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6032,10 +6032,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010671fc: 0x10671fc: addu  a1, v0, zero
+// 0x0106720c: 0x106720c: addu  a1, v0, zero
 	ldloc 6
 	stloc.2
-// 0x01067200: 0x1067200: jal   0x1066998 sw    v0, 16(sp)
+// 0x01067210: 0x1067210: jal   0x10669a8 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6049,12 +6049,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_insertel_1066998(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_insertel_10669a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01067208: 0x1067208: lw    v0, 16(sp)
+// 0x01067218: 0x1067218: lw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6063,10 +6063,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-L_106720c:
-// 0x0106720c: 0x106720c: lw    ra, 36(sp)
-// 0x01067210: 0x1067210: sll   zero, zero, 0
-// 0x01067214: 0x1067214: jr    ra addiu sp, sp, 40
+L_106721c:
+// 0x0106721c: 0x106721c: lw    ra, 36(sp)
+// 0x01067220: 0x1067220: sll   zero, zero, 0
+// 0x01067224: 0x1067224: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -6078,7 +6078,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 fh_makekeyheap_1067274(int32,int32,int32,int32,int32)
+.method public static int32 fh_makekeyheap_1067284(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6113,13 +6113,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067274: 0x1067274: addiu sp, sp, -24
+// 0x01067284: 0x1067284: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01067278: 0x1067278: sw    ra, 20(sp)
-// 0x0106727c: 0x106727c: jal   0x1000910 addiu a0, zero, 32
+// 0x01067288: 0x1067288: sw    ra, 20(sp)
+// 0x0106728c: 0x106728c: jal   0x1000910 addiu a0, zero, 32
 	ldc.i4.s 32
 	stloc.1
 	ldloc.0
@@ -6132,13 +6132,13 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01067284: 0x1067284: beq   v0, zero, 0x10672bc lui   v1, 0x80000000
+// 0x01067294: 0x1067294: beq   v0, zero, 0x10672cc lui   v1, 0x80000000
 	ldloc 5
 	ldc.i4 2147483648
 	stloc 7
-	brfalse L_10672bc
+	brfalse L_10672cc
 // --- basic block ---
-// 0x0106728c: 0x106728c: lw    a0, 28(v0)
+// 0x0106729c: 0x106729c: lw    a0, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6147,16 +6147,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01067290: 0x1067290: sll   zero, zero, 0
-// 0x01067294: 0x1067294: or    v1, a0, v1
+// 0x010672a0: 0x10672a0: sll   zero, zero, 0
+// 0x010672a4: 0x10672a4: or    v1, a0, v1
 	ldloc.1
 	ldloc 7
 	or
 	stloc 7
-// 0x01067298: 0x1067298: addiu a0, zero, -1
+// 0x010672a8: 0x10672a8: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0106729c: 0x106729c: sw    a0, 8(v0)
+// 0x010672ac: 0x10672ac: sw    a0, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6165,7 +6165,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x010672a0: 0x10672a0: sw    v1, 28(v0)
+// 0x010672b0: 0x10672b0: sw    v1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6174,14 +6174,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010672a4: 0x10672a4: sw    zero, 0(v0)
+// 0x010672b4: 0x10672b4: sw    zero, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010672a8: 0x10672a8: sw    zero, 24(v0)
+// 0x010672b8: 0x10672b8: sw    zero, 24(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6190,7 +6190,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010672ac: 0x10672ac: sw    zero, 4(v0)
+// 0x010672bc: 0x10672bc: sw    zero, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6199,7 +6199,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010672b0: 0x10672b0: sw    zero, 12(v0)
+// 0x010672c0: 0x10672c0: sw    zero, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6208,7 +6208,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010672b4: 0x10672b4: sw    zero, 16(v0)
+// 0x010672c4: 0x10672c4: sw    zero, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6217,7 +6217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010672b8: 0x10672b8: sw    zero, 20(v0)
+// 0x010672c8: 0x10672c8: sw    zero, 20(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6226,10 +6226,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10672bc:
-// 0x010672bc: 0x10672bc: lw    ra, 20(sp)
-// 0x010672c0: 0x10672c0: sll   zero, zero, 0
-// 0x010672c4: 0x10672c4: jr    ra addiu sp, sp, 24
+L_10672cc:
+// 0x010672cc: 0x10672cc: lw    ra, 20(sp)
+// 0x010672d0: 0x10672d0: sll   zero, zero, 0
+// 0x010672d4: 0x10672d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6241,7 +6241,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 fh_destroyheap_10672cc(int32,int32,int32,int32,int32)
+.method public static int32 fh_destroyheap_10672dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 ra)
@@ -6279,12 +6279,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010672cc: 0x10672cc: addiu sp, sp, -24
+// 0x010672dc: 0x10672dc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010672d0: 0x10672d0: sw    s0, 16(sp)
+// 0x010672e0: 0x10672e0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6293,10 +6293,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010672d4: 0x10672d4: addu  s0, a0, zero
+// 0x010672e4: 0x10672e4: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x010672d8: 0x10672d8: lw    a0, 12(a0)
+// 0x010672e8: 0x10672e8: lw    a0, 12(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6305,15 +6305,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010672dc: 0x10672dc: sw    ra, 20(sp)
-// 0x010672e0: 0x10672e0: sw    zero, 0(s0)
+// 0x010672ec: 0x10672ec: sw    ra, 20(sp)
+// 0x010672f0: 0x10672f0: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010672e4: 0x10672e4: beq   a0, zero, 0x10672f4 sw    zero, 24(s0)
+// 0x010672f4: 0x10672f4: beq   a0, zero, 0x1067304 sw    zero, 24(s0)
 	ldloc.1
 	ldloc 5
 	ldloc 6
@@ -6323,9 +6323,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_10672f4
+	brfalse L_1067304
 // --- basic block ---
-// 0x010672ec: 0x10672ec: jal   0x1000930 sll   zero, zero, 0
+// 0x010672fc: 0x10672fc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6336,8 +6336,8 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_10672f4:
-// 0x010672f4: 0x10672f4: sw    zero, 12(s0)
+L_1067304:
+// 0x01067304: 0x1067304: sw    zero, 12(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6346,7 +6346,7 @@ L_10672f4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010672f8: 0x10672f8: jal   0x1000930 addu  a0, s0, zero
+// 0x01067308: 0x1067308: jal   0x1000930 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6359,13 +6359,13 @@ L_10672f4:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01067300: 0x1067300: j	 0x1067314 lui   s0, 0x70000
+// 0x01067310: 0x1067310: j	 0x1067324 lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 6
-	br L_1067314
+	br L_1067324
 // --- basic block ---
-L_1067308:
-// 0x01067308: 0x1067308: lw    v0, 12(v0)
+L_1067318:
+// 0x01067318: 0x1067318: lw    v0, 12(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6374,12 +6374,12 @@ L_1067308:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106730c: 0x106730c: jal   0x1000930 sw    v0, 16336(s0)
+// 0x0106731c: 0x106731c: jal   0x1000930 sw    v0, 16800(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 4084
+	ldc.i4 4200
 	add
 	ldloc 7
 	stelem.i4
@@ -6393,25 +6393,25 @@ L_1067308:
 	stloc 8
 	stloc 7
 // --- basic block ---
-L_1067314:
-// 0x01067314: 0x1067314: lw    v0, 16336(s0)
+L_1067324:
+// 0x01067324: 0x1067324: lw    v0, 16800(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 4084
+	ldc.i4 4200
 	add
 	ldelem.i4
 	stloc 7
-// 0x01067318: 0x1067318: sll   zero, zero, 0
-// 0x0106731c: 0x106731c: bne   v0, zero, 0x1067308 addu  a0, v0, zero
+// 0x01067328: 0x1067328: sll   zero, zero, 0
+// 0x0106732c: 0x106732c: bne   v0, zero, 0x1067318 addu  a0, v0, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_1067308
+	brtrue L_1067318
 // --- basic block ---
-// 0x01067324: 0x1067324: lw    ra, 20(sp)
-// 0x01067328: 0x1067328: lw    s0, 16(sp)
+// 0x01067334: 0x1067334: lw    ra, 20(sp)
+// 0x01067338: 0x1067338: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6420,7 +6420,7 @@ L_1067314:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106732c: 0x106732c: jr    ra addiu sp, sp, 24
+// 0x0106733c: 0x106733c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6432,7 +6432,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 fh_deleteheap_10673e8(int32,int32,int32,int32,int32)
+.method public static int32 fh_deleteheap_10673f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
@@ -6470,12 +6470,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010673e8: 0x10673e8: addiu sp, sp, -24
+// 0x010673f8: 0x10673f8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010673ec: 0x10673ec: sw    s0, 16(sp)
+// 0x010673fc: 0x10673fc: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6484,25 +6484,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010673f0: 0x10673f0: sw    ra, 20(sp)
-// 0x010673f4: 0x10673f4: j	 0x106740c addu  s0, a0, zero
+// 0x01067400: 0x1067400: sw    ra, 20(sp)
+// 0x01067404: 0x1067404: j	 0x106741c addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-	br L_106740c
+	br L_106741c
 // --- basic block ---
-L_10673fc:
-// 0x010673fc: 0x10673fc: jal   0x1066a84 sll   zero, zero, 0
+L_106740c:
+// 0x0106740c: 0x106740c: jal   0x1066a94 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_extractminel_1066a84(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_extractminel_1066a94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01067404: 0x1067404: jal   0x1000930 addu  a0, v0, zero
+// 0x01067414: 0x1067414: jal   0x1000930 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6515,8 +6515,8 @@ L_10673fc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_106740c:
-// 0x0106740c: 0x106740c: lw    v0, 16(s0)
+L_106741c:
+// 0x0106741c: 0x106741c: lw    v0, 16(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6525,26 +6525,26 @@ L_106740c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01067410: 0x1067410: sll   zero, zero, 0
-// 0x01067414: 0x1067414: bne   v0, zero, 0x10673fc addu  a0, s0, zero
+// 0x01067420: 0x1067420: sll   zero, zero, 0
+// 0x01067424: 0x1067424: bne   v0, zero, 0x106740c addu  a0, s0, zero
 	ldloc 5
 	ldloc 6
 	stloc.1
-	brtrue L_10673fc
+	brtrue L_106740c
 // --- basic block ---
-// 0x0106741c: 0x106741c: jal   0x10672cc sll   zero, zero, 0
+// 0x0106742c: 0x106742c: jal   0x10672dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::fh_destroyheap_10672cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::fh_destroyheap_10672dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01067424: 0x1067424: lw    ra, 20(sp)
-// 0x01067428: 0x1067428: lw    s0, 16(sp)
+// 0x01067434: 0x1067434: lw    ra, 20(sp)
+// 0x01067438: 0x1067438: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6553,7 +6553,7 @@ L_106740c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106742c: 0x106742c: jr    ra addiu sp, sp, 24
+// 0x0106743c: 0x106743c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6565,7 +6565,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ebuffer_get_buffer_1067434(int32)
+.method public static int32 ebuffer_get_buffer_1067444(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6588,7 +6588,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067434: 0x1067434: lw    v1, 2240(a0)
+// 0x01067444: 0x1067444: lw    v1, 2240(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -6597,14 +6597,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01067438: 0x1067438: sll   zero, zero, 0
-// 0x0106743c: 0x106743c: beq   v1, zero, 0x1067458 addu  v0, zero, zero
+// 0x01067448: 0x1067448: sll   zero, zero, 0
+// 0x0106744c: 0x106744c: beq   v1, zero, 0x1067468 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1067458
+	brfalse L_1067468
 // --- basic block ---
-// 0x01067444: 0x1067444: lw    v0, 2236(a0)
+// 0x01067454: 0x1067454: lw    v0, 2236(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -6613,16 +6613,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01067448: 0x1067448: sll   zero, zero, 0
-// 0x0106744c: 0x106744c: bne   v0, zero, 0x1067458 sll   zero, zero, 0
+// 0x01067458: 0x1067458: sll   zero, zero, 0
+// 0x0106745c: 0x106745c: bne   v0, zero, 0x1067468 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1067458
+	brtrue L_1067468
 // --- basic block ---
-// 0x01067454: 0x1067454: addu  v0, a0, zero
+// 0x01067464: 0x1067464: addu  v0, a0, zero
 	ldloc.0
 	stloc.1
-L_1067458:
-// 0x01067458: 0x1067458: jr    ra sll   zero, zero, 0
+L_1067468:
+// 0x01067468: 0x1067468: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -6630,7 +6630,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 ebuffer_init_10674e4(int32,int32,int32,int32,int32)
+.method public static int32 ebuffer_init_10674f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -6665,16 +6665,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010674e4: 0x10674e4: addiu sp, sp, -24
+// 0x010674f4: 0x10674f4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010674e8: 0x10674e8: addu  a1, zero, zero
+// 0x010674f8: 0x10674f8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010674ec: 0x10674ec: sw    ra, 20(sp)
-// 0x010674f0: 0x10674f0: jal   0x100177c addiu a2, zero, 2244
+// 0x010674fc: 0x10674fc: sw    ra, 20(sp)
+// 0x01067500: 0x1067500: jal   0x100177c addiu a2, zero, 2244
 	ldc.i4 2244
 	stloc.3
 	ldloc.1
@@ -6686,9 +6686,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010674f8: 0x10674f8: lw    ra, 20(sp)
-// 0x010674fc: 0x10674fc: sll   zero, zero, 0
-// 0x01067500: 0x1067500: jr    ra addiu sp, sp, 24
+// 0x01067508: 0x1067508: lw    ra, 20(sp)
+// 0x0106750c: 0x106750c: sll   zero, zero, 0
+// 0x01067510: 0x1067510: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6700,7 +6700,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ebuffer_free_1067508(int32,int32,int32,int32,int32)
+.method public static int32 ebuffer_free_1067518(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
@@ -6738,7 +6738,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067508: 0x1067508: lw    v0, 2240(a0)
+// 0x01067518: 0x1067518: lw    v0, 2240(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6747,12 +6747,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106750c: 0x106750c: addiu sp, sp, -24
+// 0x0106751c: 0x106751c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01067510: 0x1067510: sw    s0, 16(sp)
+// 0x01067520: 0x1067520: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6761,14 +6761,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01067514: 0x1067514: sw    ra, 20(sp)
-// 0x01067518: 0x1067518: beq   v0, zero, 0x106754c addu  s0, a0, zero
+// 0x01067524: 0x1067524: sw    ra, 20(sp)
+// 0x01067528: 0x1067528: beq   v0, zero, 0x106755c addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 7
-	brfalse L_106754c
+	brfalse L_106755c
 // --- basic block ---
-// 0x01067520: 0x1067520: lw    v0, 2236(a0)
+// 0x01067530: 0x1067530: lw    v0, 2236(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -6777,12 +6777,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01067524: 0x1067524: sll   zero, zero, 0
-// 0x01067528: 0x1067528: beq   v0, zero, 0x1067544 sll   zero, zero, 0
+// 0x01067534: 0x1067534: sll   zero, zero, 0
+// 0x01067538: 0x1067538: beq   v0, zero, 0x1067554 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1067544
+	brfalse L_1067554
 // --- basic block ---
-// 0x01067530: 0x1067530: jal   0x1000930 addu  a0, v0, zero
+// 0x01067540: 0x1067540: jal   0x1000930 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6795,7 +6795,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01067538: 0x1067538: sw    zero, 2240(s0)
+// 0x01067548: 0x1067548: sw    zero, 2240(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6804,7 +6804,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106753c: 0x106753c: j	 0x106754c sw    zero, 2236(s0)
+// 0x0106754c: 0x106754c: j	 0x106755c sw    zero, 2236(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -6813,23 +6813,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_106754c
+	br L_106755c
 // --- basic block ---
-L_1067544:
-// 0x01067544: 0x1067544: jal   0x10674e4 sll   zero, zero, 0
+L_1067554:
+// 0x01067554: 0x1067554: jal   0x10674f4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-L_106754c:
-// 0x0106754c: 0x106754c: lw    ra, 20(sp)
-// 0x01067550: 0x1067550: lw    s0, 16(sp)
+L_106755c:
+// 0x0106755c: 0x106755c: lw    ra, 20(sp)
+// 0x01067560: 0x1067560: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6838,7 +6838,7 @@ L_106754c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01067554: 0x1067554: jr    ra addiu sp, sp, 24
+// 0x01067564: 0x1067564: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6850,7 +6850,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
+.method public static int32 ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -6891,12 +6891,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106755c: 0x106755c: addiu sp, sp, -32
+// 0x0106756c: 0x106756c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01067560: 0x1067560: sw    s1, 24(sp)
+// 0x01067570: 0x1067570: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6905,12 +6905,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01067564: 0x1067564: addiu s1, a1, 1
+// 0x01067574: 0x1067574: addiu s1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01067568: 0x1067568: sw    s0, 20(sp)
+// 0x01067578: 0x1067578: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6919,8 +6919,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0106756c: 0x106756c: sw    ra, 28(sp)
-// 0x01067570: 0x1067570: jal   0x1067508 addu  s0, a0, zero
+// 0x0106757c: 0x106757c: sw    ra, 28(sp)
+// 0x01067580: 0x1067580: jal   0x1067518 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -6928,49 +6928,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01067578: 0x1067578: slti  v0, s1, 2235
+// 0x01067588: 0x1067588: slti  v0, s1, 2235
 	ldloc 9
 	ldc.i4 2235
 	clt
 	stloc 6
-// 0x0106757c: 0x106757c: beq   v0, zero, 0x106759c lui   v1, 0x70000
+// 0x0106758c: 0x106758c: beq   v0, zero, 0x10675ac lui   v1, 0x70000
 	ldloc 6
 	ldc.i4 458752
 	stloc 7
-	brfalse L_106759c
+	brfalse L_10675ac
 // --- basic block ---
-// 0x01067584: 0x1067584: lw    a0, 16340(v1)
+// 0x01067594: 0x1067594: lw    a0, 16804(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 4085
+	ldc.i4 4201
 	add
 	ldelem.i4
 	stloc.1
-// 0x01067588: 0x1067588: addu  v0, s0, zero
+// 0x01067598: 0x1067598: addu  v0, s0, zero
 	ldloc 8
 	stloc 6
-// 0x0106758c: 0x106758c: addiu a0, a0, 1
+// 0x0106759c: 0x106759c: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01067590: 0x1067590: sw    a0, 16340(v1)
+// 0x010675a0: 0x10675a0: sw    a0, 16804(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 4085
+	ldc.i4 4201
 	add
 	ldloc.1
 	stelem.i4
-// 0x01067594: 0x1067594: j	 0x10675c4 sw    s1, 2240(s0)
+// 0x010675a4: 0x10675a4: j	 0x10675d4 sw    s1, 2240(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6979,35 +6979,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	br L_10675c4
+	br L_10675d4
 // --- basic block ---
-L_106759c:
-// 0x0106759c: 0x106759c: lui   v0, 0x70000
+L_10675ac:
+// 0x010675ac: 0x10675ac: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x010675a0: 0x10675a0: lw    v1, 16344(v0)
+// 0x010675b0: 0x10675b0: lw    v1, 16808(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 4086
+	ldc.i4 4202
 	add
 	ldelem.i4
 	stloc 7
-// 0x010675a4: 0x10675a4: addu  a0, s1, zero
+// 0x010675b4: 0x10675b4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010675a8: 0x10675a8: addiu v1, v1, 1
+// 0x010675b8: 0x10675b8: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010675ac: 0x10675ac: jal   0x1000910 sw    v1, 16344(v0)
+// 0x010675bc: 0x10675bc: jal   0x1000910 sw    v1, 16808(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 4086
+	ldc.i4 4202
 	add
 	ldloc 7
 	stelem.i4
@@ -7021,7 +7021,7 @@ L_106759c:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010675b4: 0x10675b4: beq   v0, zero, 0x10675c0 sw    v0, 2236(s0)
+// 0x010675c4: 0x10675c4: beq   v0, zero, 0x10675d0 sw    v0, 2236(s0)
 	ldloc 6
 	ldloc 5
 	ldloc 8
@@ -7031,9 +7031,9 @@ L_106759c:
 	add
 	ldloc 6
 	stelem.i4
-	brfalse L_10675c0
+	brfalse L_10675d0
 // --- basic block ---
-// 0x010675bc: 0x10675bc: sw    s1, 2240(s0)
+// 0x010675cc: 0x10675cc: sw    s1, 2240(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7042,8 +7042,8 @@ L_106759c:
 	add
 	ldloc 9
 	stelem.i4
-L_10675c0:
-// 0x010675c0: 0x10675c0: lw    v0, 2236(s0)
+L_10675d0:
+// 0x010675d0: 0x10675d0: lw    v0, 2236(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -7052,9 +7052,9 @@ L_10675c0:
 	add
 	ldelem.i4
 	stloc 6
-L_10675c4:
-// 0x010675c4: 0x10675c4: lw    ra, 28(sp)
-// 0x010675c8: 0x10675c8: lw    s1, 24(sp)
+L_10675d4:
+// 0x010675d4: 0x10675d4: lw    ra, 28(sp)
+// 0x010675d8: 0x10675d8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7063,7 +7063,7 @@ L_10675c4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010675cc: 0x10675cc: lw    s0, 20(sp)
+// 0x010675dc: 0x10675dc: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7072,7 +7072,7 @@ L_10675c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010675d0: 0x10675d0: jr    ra addiu sp, sp, 32
+// 0x010675e0: 0x10675e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl77.j b/converted/Cibyl77.j
index af78fda..5fea23c 100644
--- a/converted/Cibyl77.j
+++ b/converted/Cibyl77.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl77::.ctor
 
-.method public static int32 socket_async_receive_106762c(int32,int32,int32,int32,int32)
+.method public static int32 socket_async_receive_106763c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 t0,int32 v0,int32 v1,int32[] mem,int32 t1,int32 t2,int32 lo,int32 ra)
@@ -88,135 +88,135 @@
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106762c: 0x106762c: addiu sp, sp, -24
+// 0x0106763c: 0x106763c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01067630: 0x1067630: sw    ra, 20(sp)
-// 0x01067634: 0x1067634: beq   a0, zero, 0x1067750 addu  v0, a0, zero
+// 0x01067640: 0x1067640: sw    ra, 20(sp)
+// 0x01067644: 0x1067644: beq   a0, zero, 0x1067760 addu  v0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 6
-	brfalse L_1067750
+	brfalse L_1067760
 // --- basic block ---
-// 0x0106763c: 0x106763c: lui   a0, 0x70000
+// 0x0106764c: 0x106764c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01067640: 0x1067640: addiu a0, a0, 16356
+// 0x01067650: 0x1067650: addiu a0, a0, 16820
 	ldloc.1
-	ldc.i4 16356
+	ldc.i4 16820
 	add
 	stloc.1
-// 0x01067644: 0x1067644: addu  v1, zero, zero
+// 0x01067654: 0x1067654: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01067648: 0x1067648: addiu t0, zero, 20
+// 0x01067658: 0x1067658: addiu t0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-L_106764c:
-// 0x0106764c: 0x106764c: lw    t1, 0(a0)
+L_106765c:
+// 0x0106765c: 0x106765c: lw    t1, 0(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01067650: 0x1067650: sll   zero, zero, 0
-// 0x01067654: 0x1067654: bne   v0, t1, 0x1067678 addiu a0, a0, 60
+// 0x01067660: 0x1067660: sll   zero, zero, 0
+// 0x01067664: 0x1067664: bne   v0, t1, 0x1067688 addiu a0, a0, 60
 	ldloc 6
 	ldloc 9
 	ldloc.1
 	ldc.i4.s 60
 	add
 	stloc.1
-	bne.un L_1067678
+	bne.un L_1067688
 // --- basic block ---
-// 0x0106765c: 0x106765c: addiu a0, zero, 60
+// 0x0106766c: 0x106766c: addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
-// 0x01067660: 0x1067660: mult  v1, a0
+// 0x01067670: 0x1067670: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 11
-// 0x01067664: 0x1067664: lui   a0, 0x70000
+// 0x01067674: 0x1067674: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x01067668: 0x1067668: addiu a0, a0, 16348
+// 0x01067678: 0x1067678: addiu a0, a0, 16812
 	ldloc.1
-	ldc.i4 16348
+	ldc.i4 16812
 	add
 	stloc.1
-// 0x0106766c: 0x106766c: mflo  lo
+// 0x0106767c: 0x106767c: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x01067670: 0x1067670: j	 0x1067764 addu  v1, a0, v1
+// 0x01067680: 0x1067680: j	 0x1067774 addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-	br L_1067764
+	br L_1067774
 // --- basic block ---
-L_1067678:
-// 0x01067678: 0x1067678: addiu v1, v1, 1
+L_1067688:
+// 0x01067688: 0x1067688: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0106767c: 0x106767c: bne   v1, t0, 0x106764c sll   zero, zero, 0
+// 0x0106768c: 0x106768c: bne   v1, t0, 0x106765c sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_106764c
+	bne.un L_106765c
 // --- basic block ---
-// 0x01067684: 0x1067684: j	 0x1067764 addu  v1, zero, zero
+// 0x01067694: 0x1067694: j	 0x1067774 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1067764
+	br L_1067774
 // --- basic block ---
-L_106768c:
-// 0x0106768c: 0x106768c: beq   a2, zero, 0x1067750 sll   zero, zero, 0
+L_106769c:
+// 0x0106769c: 0x106769c: beq   a2, zero, 0x1067760 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1067750
+	brfalse L_1067760
 // --- basic block ---
-// 0x01067694: 0x1067694: beq   a3, zero, 0x1067750 sll   zero, zero, 0
+// 0x010676a4: 0x10676a4: beq   a3, zero, 0x1067760 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1067750
+	brfalse L_1067760
 // --- basic block ---
-// 0x0106769c: 0x106769c: bne   v1, zero, 0x1067714 addu  a0, v1, zero
+// 0x010676ac: 0x10676ac: bne   v1, zero, 0x1067724 addu  a0, v1, zero
 	ldloc 7
 	ldloc 7
 	stloc.1
-	brtrue L_1067714
+	brtrue L_1067724
 // --- basic block ---
-// 0x010676a4: 0x10676a4: lui   t0, 0x70000
+// 0x010676b4: 0x10676b4: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010676a8: 0x10676a8: addiu t0, t0, 16400
+// 0x010676b8: 0x10676b8: addiu t0, t0, 16864
 	ldloc 5
-	ldc.i4 16400
+	ldc.i4 16864
 	add
 	stloc 5
-// 0x010676ac: 0x10676ac: addu  a0, zero, zero
+// 0x010676bc: 0x10676bc: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010676b0: 0x10676b0: addiu t1, zero, 20
+// 0x010676c0: 0x10676c0: addiu t1, zero, 20
 	ldc.i4.s 20
 	stloc 9
-L_10676b4:
-// 0x010676b4: 0x10676b4: lw    t2, 0(t0)
+L_10676c4:
+// 0x010676c4: 0x10676c4: lw    t2, 0(t0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x010676b8: 0x10676b8: sll   zero, zero, 0
-// 0x010676bc: 0x10676bc: bne   t2, zero, 0x1067700 sll   zero, zero, 0
+// 0x010676c8: 0x10676c8: sll   zero, zero, 0
+// 0x010676cc: 0x10676cc: bne   t2, zero, 0x1067710 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_1067700
+	brtrue L_1067710
 // --- basic block ---
-// 0x010676c4: 0x10676c4: lw    t2, -44(t0)
+// 0x010676d4: 0x10676d4: lw    t2, -44(t0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -225,76 +225,76 @@ L_10676b4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010676c8: 0x10676c8: sll   zero, zero, 0
-// 0x010676cc: 0x10676cc: bne   t2, zero, 0x1067704 addiu a0, a0, 1
+// 0x010676d8: 0x10676d8: sll   zero, zero, 0
+// 0x010676dc: 0x10676dc: bne   t2, zero, 0x1067714 addiu a0, a0, 1
 	ldloc 10
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brtrue L_1067704
+	brtrue L_1067714
 // --- basic block ---
-// 0x010676d4: 0x10676d4: addiu a0, a0, -1
+// 0x010676e4: 0x10676e4: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x010676d8: 0x10676d8: addiu t0, zero, 60
+// 0x010676e8: 0x10676e8: addiu t0, zero, 60
 	ldc.i4.s 60
 	stloc 5
-// 0x010676dc: 0x10676dc: mult  a0, t0
+// 0x010676ec: 0x10676ec: mult  a0, t0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 11
-// 0x010676e0: 0x10676e0: lui   t0, 0x70000
+// 0x010676f0: 0x10676f0: lui   t0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x010676e4: 0x10676e4: addiu t0, t0, 16348
+// 0x010676f4: 0x10676f4: addiu t0, t0, 16812
 	ldloc 5
-	ldc.i4 16348
+	ldc.i4 16812
 	add
 	stloc 5
-// 0x010676e8: 0x10676e8: mflo  lo
+// 0x010676f8: 0x10676f8: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x010676ec: 0x10676ec: addu  a0, t0, a0
+// 0x010676fc: 0x10676fc: addu  a0, t0, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x010676f0: 0x10676f0: bne   a0, zero, 0x1067714 sll   zero, zero, 0
+// 0x01067700: 0x1067700: bne   a0, zero, 0x1067724 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1067714
+	brtrue L_1067724
 // --- basic block ---
-// 0x010676f8: 0x10676f8: j	 0x1067754 addu  v0, zero, zero
+// 0x01067708: 0x1067708: j	 0x1067764 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1067754
+	br L_1067764
 // --- basic block ---
-L_1067700:
-// 0x01067700: 0x1067700: addiu a0, a0, 1
+L_1067710:
+// 0x01067710: 0x1067710: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-L_1067704:
-// 0x01067704: 0x1067704: bne   a0, t1, 0x10676b4 addiu t0, t0, 60
+L_1067714:
+// 0x01067714: 0x1067714: bne   a0, t1, 0x10676c4 addiu t0, t0, 60
 	ldloc.1
 	ldloc 9
 	ldloc 5
 	ldc.i4.s 60
 	add
 	stloc 5
-	bne.un L_10676b4
+	bne.un L_10676c4
 // --- basic block ---
-// 0x0106770c: 0x106770c: j	 0x1067754 addu  v0, zero, zero
+// 0x0106771c: 0x106771c: j	 0x1067764 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1067754
+	br L_1067764
 // --- basic block ---
-L_1067714:
-// 0x01067714: 0x1067714: sw    v0, 8(a0)
+L_1067724:
+// 0x01067724: 0x1067724: sw    v0, 8(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -303,7 +303,7 @@ L_1067714:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01067718: 0x1067718: sw    a1, 44(a0)
+// 0x01067728: 0x1067728: sw    a1, 44(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -312,17 +312,17 @@ L_1067714:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0106771c: 0x106771c: addiu v0, zero, 2
+// 0x0106772c: 0x106772c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01067720: 0x1067720: sw    v0, 0(a0)
+// 0x01067730: 0x1067730: sw    v0, 0(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01067724: 0x1067724: lw    v0, 40(sp)
+// 0x01067734: 0x1067734: lw    v0, 40(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -331,7 +331,7 @@ L_1067714:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01067728: 0x1067728: sw    a2, 48(a0)
+// 0x01067738: 0x1067738: sw    a2, 48(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -340,7 +340,7 @@ L_1067714:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0106772c: 0x106772c: sw    v0, 56(a0)
+// 0x0106773c: 0x106773c: sw    v0, 56(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -349,7 +349,7 @@ L_1067714:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01067730: 0x1067730: sw    a3, 52(a0)
+// 0x01067740: 0x1067740: sw    a3, 52(a0)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -358,18 +358,18 @@ L_1067714:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01067734: 0x1067734: bne   v1, zero, 0x1067754 addiu v0, zero, 1
+// 0x01067744: 0x1067744: bne   v1, zero, 0x1067764 addiu v0, zero, 1
 	ldloc 7
 	ldc.i4.1
 	stloc 6
-	brtrue L_1067754
+	brtrue L_1067764
 // --- basic block ---
-// 0x0106773c: 0x106773c: lui   a1, 0x1060000
+// 0x0106774c: 0x106774c: lui   a1, 0x1060000
 	ldc.i4 17170432
 	stloc.2
-// 0x01067740: 0x1067740: jal   0x1050f84 addiu a1, a1, 30580
+// 0x01067750: 0x1067750: jal   0x1050f94 addiu a1, a1, 30596
 	ldloc.2
-	ldc.i4 30580
+	ldc.i4 30596
 	add
 	stloc.2
 	ldloc.0
@@ -377,46 +377,46 @@ L_1067714:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_set_input_1050f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_set_input_1050f94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01067748: 0x1067748: j	 0x1067754 addiu v0, zero, 1
+// 0x01067758: 0x1067758: j	 0x1067764 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_1067754
+	br L_1067764
 // --- basic block ---
-L_1067750:
-// 0x01067750: 0x1067750: addu  v0, zero, zero
+L_1067760:
+// 0x01067760: 0x1067760: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1067754:
-// 0x01067754: 0x1067754: lw    ra, 20(sp)
-// 0x01067758: 0x1067758: sll   zero, zero, 0
-// 0x0106775c: 0x106775c: jr    ra addiu sp, sp, 24
+L_1067764:
+// 0x01067764: 0x1067764: lw    ra, 20(sp)
+// 0x01067768: 0x1067768: sll   zero, zero, 0
+// 0x0106776c: 0x106776c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1067764:
-// 0x01067764: 0x1067764: bne   a1, zero, 0x106768c sll   zero, zero, 0
+L_1067774:
+// 0x01067774: 0x1067774: bne   a1, zero, 0x106769c sll   zero, zero, 0
 	ldloc.2
-	brtrue L_106768c
+	brtrue L_106769c
 // --- basic block ---
-// 0x0106776c: 0x106776c: j	 0x1067754 addu  v0, zero, zero
+// 0x0106777c: 0x106777c: j	 0x1067764 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1067754
+	br L_1067764
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 on_socket_has_data_1067774(int32,int32,int32,int32,int32)
+.method public static int32 on_socket_has_data_1067784(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 s5,int32 v1,int32 s2,int32 s4,int32 s3,int32 ra,int32 lo)
@@ -472,12 +472,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067774: 0x1067774: addiu sp, sp, -48
+// 0x01067784: 0x1067784: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01067778: 0x1067778: sw    s2, 28(sp)
+// 0x01067788: 0x1067788: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -486,8 +486,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0106777c: 0x106777c: sw    ra, 44(sp)
-// 0x01067780: 0x1067780: sw    s5, 40(sp)
+// 0x0106778c: 0x106778c: sw    ra, 44(sp)
+// 0x01067790: 0x1067790: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -496,7 +496,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01067784: 0x1067784: sw    s4, 36(sp)
+// 0x01067794: 0x1067794: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -505,7 +505,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01067788: 0x1067788: sw    s3, 32(sp)
+// 0x01067798: 0x1067798: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -514,7 +514,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0106778c: 0x106778c: sw    s1, 24(sp)
+// 0x0106779c: 0x106779c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -523,7 +523,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01067790: 0x1067790: sw    s0, 20(sp)
+// 0x010677a0: 0x10677a0: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -532,88 +532,88 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01067794: 0x1067794: beq   a0, zero, 0x1067820 addu  s2, a0, zero
+// 0x010677a4: 0x10677a4: beq   a0, zero, 0x1067830 addu  s2, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 11
-	brfalse L_1067820
+	brfalse L_1067830
 // --- basic block ---
-// 0x0106779c: 0x106779c: lui   s5, 0x70000
+// 0x010677ac: 0x10677ac: lui   s5, 0x70000
 	ldc.i4 458752
 	stloc 9
-// 0x010677a0: 0x10677a0: addiu s5, s5, 16348
+// 0x010677b0: 0x10677b0: addiu s5, s5, 16812
 	ldloc 9
-	ldc.i4 16348
+	ldc.i4 16812
 	add
 	stloc 9
-// 0x010677a4: 0x10677a4: addu  s1, zero, zero
+// 0x010677b4: 0x10677b4: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010677a8: 0x10677a8: addiu s4, zero, 60
+// 0x010677b8: 0x10677b8: addiu s4, zero, 60
 	ldc.i4.s 60
 	stloc 12
-// 0x010677ac: 0x10677ac: addiu s3, zero, 20
+// 0x010677bc: 0x10677bc: addiu s3, zero, 20
 	ldc.i4.s 20
 	stloc 13
-// 0x010677b0: 0x10677b0: mult  s1, s4
+// 0x010677c0: 0x10677c0: mult  s1, s4
 	ldloc 7
 	ldloc 12
 	mul
 	stloc 15
-L_10677b4:
-// 0x010677b4: 0x10677b4: addu  a1, s2, zero
+L_10677c4:
+// 0x010677c4: 0x10677c4: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x010677b8: 0x10677b8: addiu s1, s1, 1
+// 0x010677c8: 0x10677c8: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010677bc: 0x10677bc: mflo  lo
+// 0x010677cc: 0x10677cc: mflo  lo
 	ldloc 15
 	stloc 6
-// 0x010677c0: 0x10677c0: addu  s0, s5, s0
+// 0x010677d0: 0x10677d0: addu  s0, s5, s0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 6
-// 0x010677c4: 0x10677c4: jal   0x10371bc addu  a0, s0, zero
+// 0x010677d4: 0x10677d4: jal   0x10371cc addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl40::roadmap_io_same_10371bc(int32,int32,int32)
+	call int32 Cibyl40::roadmap_io_same_10371cc(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x010677cc: 0x10677cc: beq   v0, zero, 0x10677e4 sll   zero, zero, 0
+// 0x010677dc: 0x10677dc: beq   v0, zero, 0x10677f4 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_10677e4
+	brfalse L_10677f4
 // --- basic block ---
-// 0x010677d4: 0x10677d4: bne   s0, zero, 0x10677f4 sll   zero, zero, 0
+// 0x010677e4: 0x10677e4: bne   s0, zero, 0x1067804 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_10677f4
+	brtrue L_1067804
 // --- basic block ---
-// 0x010677dc: 0x10677dc: j	 0x1067820 sll   zero, zero, 0
-	br L_1067820
+// 0x010677ec: 0x10677ec: j	 0x1067830 sll   zero, zero, 0
+	br L_1067830
 // --- basic block ---
-L_10677e4:
-// 0x010677e4: 0x10677e4: bne   s1, s3, 0x10677b4 mult  s1, s4
+L_10677f4:
+// 0x010677f4: 0x10677f4: bne   s1, s3, 0x10677c4 mult  s1, s4
 	ldloc 7
 	ldloc 13
 	ldloc 7
 	ldloc 12
 	mul
 	stloc 15
-	bne.un L_10677b4
+	bne.un L_10677c4
 // --- basic block ---
-// 0x010677ec: 0x10677ec: j	 0x1067820 sll   zero, zero, 0
-	br L_1067820
+// 0x010677fc: 0x10677fc: j	 0x1067830 sll   zero, zero, 0
+	br L_1067830
 // --- basic block ---
-L_10677f4:
-// 0x010677f4: 0x10677f4: lw    a0, 8(s2)
+L_1067804:
+// 0x01067804: 0x1067804: lw    a0, 8(s2)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -622,7 +622,7 @@ L_10677f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010677f8: 0x10677f8: lw    a1, 44(s0)
+// 0x01067808: 0x1067808: lw    a1, 44(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -631,7 +631,7 @@ L_10677f4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010677fc: 0x10677fc: lw    a2, 48(s0)
+// 0x0106780c: 0x106780c: lw    a2, 48(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -640,18 +640,18 @@ L_10677f4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01067800: 0x1067800: jal   0x1051e64 sll   zero, zero, 0
+// 0x01067810: 0x1067810: jal   0x1051e74 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_receive_1051e64(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_receive_1051e74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 8
 // --- basic block ---
-// 0x01067808: 0x1067808: lw    a2, 56(s0)
+// 0x01067818: 0x1067818: lw    a2, 56(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -660,7 +660,7 @@ L_10677f4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0106780c: 0x106780c: lw    v1, 52(s0)
+// 0x0106781c: 0x106781c: lw    v1, 52(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -669,7 +669,7 @@ L_10677f4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01067810: 0x1067810: lw    a0, 44(s0)
+// 0x01067820: 0x1067820: lw    a0, 44(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -678,7 +678,7 @@ L_10677f4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01067814: 0x1067814: sw    v0, 48(s0)
+// 0x01067824: 0x1067824: sw    v0, 48(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -687,7 +687,7 @@ L_10677f4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01067818: 0x1067818: jalr  v1 addu  a1, v0, zero
+// 0x01067828: 0x1067828: jalr  v1 addu  a1, v0, zero
 	ldloc 10
 	ldloc 8
 	stloc.2
@@ -701,9 +701,9 @@ L_10677f4:
 	stloc 10
 	stloc 8
 // --- basic block ---
-L_1067820:
-// 0x01067820: 0x1067820: lw    ra, 44(sp)
-// 0x01067824: 0x1067824: lw    s5, 40(sp)
+L_1067830:
+// 0x01067830: 0x1067830: lw    ra, 44(sp)
+// 0x01067834: 0x1067834: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -712,7 +712,7 @@ L_1067820:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01067828: 0x1067828: lw    s4, 36(sp)
+// 0x01067838: 0x1067838: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -721,7 +721,7 @@ L_1067820:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0106782c: 0x106782c: lw    s3, 32(sp)
+// 0x0106783c: 0x106783c: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -730,7 +730,7 @@ L_1067820:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01067830: 0x1067830: lw    s2, 28(sp)
+// 0x01067840: 0x1067840: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -739,7 +739,7 @@ L_1067820:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01067834: 0x1067834: lw    s1, 24(sp)
+// 0x01067844: 0x1067844: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -748,7 +748,7 @@ L_1067820:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01067838: 0x1067838: lw    s0, 20(sp)
+// 0x01067848: 0x1067848: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -757,7 +757,7 @@ L_1067820:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106783c: 0x106783c: jr    ra addiu sp, sp, 48
+// 0x0106784c: 0x106784c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -769,7 +769,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 socket_async_receive_end_1067844(int32,int32,int32,int32,int32)
+.method public static int32 socket_async_receive_end_1067854(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32 v1,int32[] mem,int32 ra,int32 lo)
@@ -810,13 +810,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067844: 0x1067844: addiu sp, sp, -24
+// 0x01067854: 0x1067854: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01067848: 0x1067848: sw    ra, 20(sp)
-// 0x0106784c: 0x106784c: beq   a0, zero, 0x10678c8 sw    s0, 16(sp)
+// 0x01067858: 0x1067858: sw    ra, 20(sp)
+// 0x0106785c: 0x106785c: beq   a0, zero, 0x10678d8 sw    s0, 16(sp)
 	ldloc.1
 	ldloc 8
 	ldloc.0
@@ -826,87 +826,87 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	brfalse L_10678c8
+	brfalse L_10678d8
 // --- basic block ---
-// 0x01067854: 0x1067854: lui   v1, 0x70000
+// 0x01067864: 0x1067864: lui   v1, 0x70000
 	ldc.i4 458752
 	stloc 7
-// 0x01067858: 0x1067858: addiu v1, v1, 16356
+// 0x01067868: 0x1067868: addiu v1, v1, 16820
 	ldloc 7
-	ldc.i4 16356
+	ldc.i4 16820
 	add
 	stloc 7
-// 0x0106785c: 0x106785c: addu  v0, zero, zero
+// 0x0106786c: 0x106786c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01067860: 0x1067860: addiu a1, zero, 20
+// 0x01067870: 0x1067870: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-L_1067864:
-// 0x01067864: 0x1067864: lw    a2, 0(v1)
+L_1067874:
+// 0x01067874: 0x1067874: lw    a2, 0(v1)
 	ldloc 8
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01067868: 0x1067868: sll   zero, zero, 0
-// 0x0106786c: 0x106786c: bne   a0, a2, 0x106789c addiu v1, v1, 60
+// 0x01067878: 0x1067878: sll   zero, zero, 0
+// 0x0106787c: 0x106787c: bne   a0, a2, 0x10678ac addiu v1, v1, 60
 	ldloc.1
 	ldloc.3
 	ldloc 7
 	ldc.i4.s 60
 	add
 	stloc 7
-	bne.un L_106789c
+	bne.un L_10678ac
 // --- basic block ---
-// 0x01067874: 0x1067874: addiu s0, zero, 60
+// 0x01067884: 0x1067884: addiu s0, zero, 60
 	ldc.i4.s 60
 	stloc 5
-// 0x01067878: 0x1067878: mult  v0, s0
+// 0x01067888: 0x1067888: mult  v0, s0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 10
-// 0x0106787c: 0x106787c: lui   s0, 0x70000
+// 0x0106788c: 0x106788c: lui   s0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x01067880: 0x1067880: addiu s0, s0, 16348
+// 0x01067890: 0x1067890: addiu s0, s0, 16812
 	ldloc 5
-	ldc.i4 16348
+	ldc.i4 16812
 	add
 	stloc 5
-// 0x01067884: 0x1067884: mflo  lo
+// 0x01067894: 0x1067894: mflo  lo
 	ldloc 10
 	stloc 6
-// 0x01067888: 0x1067888: addu  s0, s0, v0
+// 0x01067898: 0x1067898: addu  s0, s0, v0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0106788c: 0x106788c: bne   s0, zero, 0x10678b0 sll   zero, zero, 0
+// 0x0106789c: 0x106789c: bne   s0, zero, 0x10678c0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10678b0
+	brtrue L_10678c0
 // --- basic block ---
-// 0x01067894: 0x1067894: j	 0x10678c8 sll   zero, zero, 0
-	br L_10678c8
+// 0x010678a4: 0x10678a4: j	 0x10678d8 sll   zero, zero, 0
+	br L_10678d8
 // --- basic block ---
-L_106789c:
-// 0x0106789c: 0x106789c: addiu v0, v0, 1
+L_10678ac:
+// 0x010678ac: 0x10678ac: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010678a0: 0x10678a0: bne   v0, a1, 0x1067864 sll   zero, zero, 0
+// 0x010678b0: 0x10678b0: bne   v0, a1, 0x1067874 sll   zero, zero, 0
 	ldloc 6
 	ldloc.2
-	bne.un L_1067864
+	bne.un L_1067874
 // --- basic block ---
-// 0x010678a8: 0x10678a8: j	 0x10678c8 sll   zero, zero, 0
-	br L_10678c8
+// 0x010678b8: 0x10678b8: j	 0x10678d8 sll   zero, zero, 0
+	br L_10678d8
 // --- basic block ---
-L_10678b0:
-// 0x010678b0: 0x10678b0: jal   0x1050eac addu  a0, s0, zero
+L_10678c0:
+// 0x010678c0: 0x10678c0: jal   0x1050ebc addu  a0, s0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -914,18 +914,18 @@ L_10678b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_main_remove_input_1050eac(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_main_remove_input_1050ebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010678b8: 0x10678b8: addu  a0, s0, zero
+// 0x010678c8: 0x10678c8: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010678bc: 0x10678bc: addu  a1, zero, zero
+// 0x010678cc: 0x10678cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010678c0: 0x10678c0: jal   0x100177c addiu a2, zero, 60
+// 0x010678d0: 0x10678d0: jal   0x100177c addiu a2, zero, 60
 	ldc.i4.s 60
 	stloc.3
 	ldloc.1
@@ -937,9 +937,9 @@ L_10678b0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10678c8:
-// 0x010678c8: 0x10678c8: lw    ra, 20(sp)
-// 0x010678cc: 0x10678cc: lw    s0, 16(sp)
+L_10678d8:
+// 0x010678d8: 0x10678d8: lw    ra, 20(sp)
+// 0x010678dc: 0x10678dc: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -948,7 +948,7 @@ L_10678c8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010678d0: 0x10678d0: jr    ra addiu sp, sp, 24
+// 0x010678e0: 0x10678e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -960,7 +960,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 PackNetworkString_1067b64(int32,int32,int32,int32)
+.method public static int32 PackNetworkString_1067b74(int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 t6,int32[] mem,int32 t7,int32 t0,int32 t1,int32 t2,int32 t3,int32 t4,int32 t5,int32 ra)
@@ -1016,211 +1016,211 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067b64: 0x1067b64: beq   a0, zero, 0x1067c34 sll   zero, zero, 0
+// 0x01067b74: 0x1067b74: beq   a0, zero, 0x1067c44 sll   zero, zero, 0
 	ldloc.0
-	brfalse L_1067c34
-// 0x01067b6c: 0x1067b6c: beq   a1, zero, 0x1067c34 sll   zero, zero, 0
+	brfalse L_1067c44
+// 0x01067b7c: 0x1067b7c: beq   a1, zero, 0x1067c44 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1067c34
+	brfalse L_1067c44
 // --- basic block ---
-// 0x01067b74: 0x1067b74: beq   a2, zero, 0x1067c34 sll   zero, zero, 0
+// 0x01067b84: 0x1067b84: beq   a2, zero, 0x1067c44 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1067c34
+	brfalse L_1067c44
 // --- basic block ---
-// 0x01067b7c: 0x1067b7c: beq   a0, a1, 0x1067c34 addu  v1, zero, zero
+// 0x01067b8c: 0x1067b8c: beq   a0, a1, 0x1067c44 addu  v1, zero, zero
 	ldloc.0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1067c34
+	beq  L_1067c44
 // --- basic block ---
-// 0x01067b84: 0x1067b84: sb    zero, 0(a1)
+// 0x01067b94: 0x1067b94: sb    zero, 0(a1)
 	ldloc.1
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01067b88: 0x1067b88: addiu t5, zero, 9
+// 0x01067b98: 0x1067b98: addiu t5, zero, 9
 	ldc.i4.s 9
 	stloc 14
-// 0x01067b8c: 0x1067b8c: addiu t4, zero, 92
+// 0x01067b9c: 0x1067b9c: addiu t4, zero, 92
 	ldc.i4.s 92
 	stloc 13
-// 0x01067b90: 0x1067b90: addiu t3, zero, 10
+// 0x01067ba0: 0x1067ba0: addiu t3, zero, 10
 	ldc.i4.s 10
 	stloc 12
-// 0x01067b94: 0x1067b94: addiu t2, zero, 13
+// 0x01067ba4: 0x1067ba4: addiu t2, zero, 13
 	ldc.i4.s 13
 	stloc 11
-// 0x01067b98: 0x1067b98: addiu t1, zero, 44
+// 0x01067ba8: 0x1067ba8: addiu t1, zero, 44
 	ldc.i4.s 44
 	stloc 10
-// 0x01067b9c: 0x1067b9c: j	 0x1067c1c addiu t0, zero, 92
+// 0x01067bac: 0x1067bac: j	 0x1067c2c addiu t0, zero, 92
 	ldc.i4.s 92
 	stloc 9
-	br L_1067c1c
+	br L_1067c2c
 // --- basic block ---
-L_1067ba4:
-// 0x01067ba4: 0x1067ba4: beq   v0, t5, 0x1067be4 sll   zero, zero, 0
+L_1067bb4:
+// 0x01067bb4: 0x1067bb4: beq   v0, t5, 0x1067bf4 sll   zero, zero, 0
 	ldloc 4
 	ldloc 14
-	beq  L_1067be4
+	beq  L_1067bf4
 // --- basic block ---
-// 0x01067bac: 0x1067bac: beq   v0, t3, 0x1067bd4 sll   zero, zero, 0
+// 0x01067bbc: 0x1067bbc: beq   v0, t3, 0x1067be4 sll   zero, zero, 0
 	ldloc 4
 	ldloc 12
-	beq  L_1067bd4
+	beq  L_1067be4
 // --- basic block ---
-// 0x01067bb4: 0x1067bb4: beq   v0, t2, 0x1067bdc sll   zero, zero, 0
+// 0x01067bc4: 0x1067bc4: beq   v0, t2, 0x1067bec sll   zero, zero, 0
 	ldloc 4
 	ldloc 11
-	beq  L_1067bdc
+	beq  L_1067bec
 // --- basic block ---
-// 0x01067bbc: 0x1067bbc: beq   v0, t1, 0x1067bec addiu a3, v1, 2
+// 0x01067bcc: 0x1067bcc: beq   v0, t1, 0x1067bfc addiu a3, v1, 2
 	ldloc 4
 	ldloc 10
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc.3
-	beq  L_1067bec
+	beq  L_1067bfc
 // --- basic block ---
-// 0x01067bc4: 0x1067bc4: bne   v0, t0, 0x1067c3c slt   t6, a3, a2
+// 0x01067bd4: 0x1067bd4: bne   v0, t0, 0x1067c4c slt   t6, a3, a2
 	ldloc 4
 	ldloc 9
 	ldloc.3
 	ldloc.2
 	clt
 	stloc 6
-	bne.un L_1067c3c
+	bne.un L_1067c4c
 // --- basic block ---
-// 0x01067bcc: 0x1067bcc: j	 0x1067bf0 sll   zero, zero, 0
-	br L_1067bf0
+// 0x01067bdc: 0x1067bdc: j	 0x1067c00 sll   zero, zero, 0
+	br L_1067c00
 // --- basic block ---
-L_1067bd4:
-// 0x01067bd4: 0x1067bd4: j	 0x1067be8 addiu v0, zero, 110
+L_1067be4:
+// 0x01067be4: 0x1067be4: j	 0x1067bf8 addiu v0, zero, 110
 	ldc.i4.s 110
 	stloc 4
-	br L_1067be8
+	br L_1067bf8
 // --- basic block ---
-L_1067bdc:
-// 0x01067bdc: 0x1067bdc: j	 0x1067be8 addiu v0, zero, 114
+L_1067bec:
+// 0x01067bec: 0x1067bec: j	 0x1067bf8 addiu v0, zero, 114
 	ldc.i4.s 114
 	stloc 4
-	br L_1067be8
+	br L_1067bf8
 // --- basic block ---
-L_1067be4:
-// 0x01067be4: 0x1067be4: addiu v0, zero, 116
+L_1067bf4:
+// 0x01067bf4: 0x1067bf4: addiu v0, zero, 116
 	ldc.i4.s 116
 	stloc 4
-L_1067be8:
-// 0x01067be8: 0x1067be8: addiu a3, v1, 2
+L_1067bf8:
+// 0x01067bf8: 0x1067bf8: addiu a3, v1, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc.3
-L_1067bec:
-// 0x01067bec: 0x1067bec: slt   t6, a3, a2
+L_1067bfc:
+// 0x01067bfc: 0x1067bfc: slt   t6, a3, a2
 	ldloc.3
 	ldloc.2
 	clt
 	stloc 6
-L_1067bf0:
-// 0x01067bf0: 0x1067bf0: beq   t6, zero, 0x1067c34 addu  t7, a1, v1
+L_1067c00:
+// 0x01067c00: 0x1067c00: beq   t6, zero, 0x1067c44 addu  t7, a1, v1
 	ldloc 6
 	ldloc.1
 	ldloc 5
 	add
 	stloc 8
-	brfalse L_1067c34
+	brfalse L_1067c44
 // --- basic block ---
-// 0x01067bf8: 0x1067bf8: addu  t6, a1, a3
+// 0x01067c08: 0x1067c08: addu  t6, a1, a3
 	ldloc.1
 	ldloc.3
 	add
 	stloc 6
-// 0x01067bfc: 0x1067bfc: sb    t4, 0(t7)
+// 0x01067c0c: 0x1067c0c: sb    t4, 0(t7)
 	ldloc 8
 	ldloc 13
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01067c00: 0x1067c00: j	 0x1067c10 sb    v0, 1(t7)
+// 0x01067c10: 0x1067c10: j	 0x1067c20 sb    v0, 1(t7)
 	ldloc 8
 	ldc.i4.1
 	add
 	ldloc 4
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1067c10
+	br L_1067c20
 // --- basic block ---
-L_1067c08:
-// 0x01067c08: 0x1067c08: addu  v1, a1, v1
+L_1067c18:
+// 0x01067c18: 0x1067c18: addu  v1, a1, v1
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01067c0c: 0x1067c0c: sb    v0, 0(v1)
+// 0x01067c1c: 0x1067c1c: sb    v0, 0(v1)
 	ldloc 5
 	ldloc 4
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1067c10:
-// 0x01067c10: 0x1067c10: sb    zero, 0(t6)
+L_1067c20:
+// 0x01067c20: 0x1067c20: sb    zero, 0(t6)
 	ldloc 6
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01067c14: 0x1067c14: addiu a0, a0, 1
+// 0x01067c24: 0x1067c24: addiu a0, a0, 1
 	ldloc.0
 	ldc.i4.1
 	add
 	stloc.0
-// 0x01067c18: 0x1067c18: addu  v1, a3, zero
+// 0x01067c28: 0x1067c28: addu  v1, a3, zero
 	ldloc.3
 	stloc 5
-L_1067c1c:
-// 0x01067c1c: 0x1067c1c: lb    v0, 0(a0)
+L_1067c2c:
+// 0x01067c2c: 0x1067c2c: lb    v0, 0(a0)
 	ldloc.0
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 4
-// 0x01067c20: 0x1067c20: sll   zero, zero, 0
-// 0x01067c24: 0x1067c24: bne   v0, zero, 0x1067ba4 sll   zero, zero, 0
+// 0x01067c30: 0x1067c30: sll   zero, zero, 0
+// 0x01067c34: 0x1067c34: bne   v0, zero, 0x1067bb4 sll   zero, zero, 0
 	ldloc 4
-	brtrue L_1067ba4
+	brtrue L_1067bb4
 // --- basic block ---
-// 0x01067c2c: 0x1067c2c: jr    ra addiu v0, zero, 1
+// 0x01067c3c: 0x1067c3c: jr    ra addiu v0, zero, 1
 	ldc.i4.1
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1067c34:
-// 0x01067c34: 0x1067c34: jr    ra addu  v0, zero, zero
+L_1067c44:
+// 0x01067c44: 0x1067c44: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1067c3c:
-// 0x01067c3c: 0x1067c3c: addiu a3, v1, 1
+L_1067c4c:
+// 0x01067c4c: 0x1067c4c: addiu a3, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc.3
-// 0x01067c40: 0x1067c40: slt   t6, a3, a2
+// 0x01067c50: 0x1067c50: slt   t6, a3, a2
 	ldloc.3
 	ldloc.2
 	clt
 	stloc 6
-// 0x01067c44: 0x1067c44: bne   t6, zero, 0x1067c08 addu  t6, a1, a3
+// 0x01067c54: 0x1067c54: bne   t6, zero, 0x1067c18 addu  t6, a1, a3
 	ldloc 6
 	ldloc.1
 	ldloc.3
 	add
 	stloc 6
-	brtrue L_1067c08
+	brtrue L_1067c18
 // --- basic block ---
-// 0x01067c4c: 0x1067c4c: j	 0x1067c34 sll   zero, zero, 0
-	br L_1067c34
+// 0x01067c5c: 0x1067c5c: j	 0x1067c44 sll   zero, zero, 0
+	br L_1067c44
 __CIBYL_function_return:
 	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 4
 	ret
 }
-.method public static int32 ToLowerN_1067cd0(int32,int32,int32,int32,int32)
+.method public static int32 ToLowerN_1067ce0(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -1258,12 +1258,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01067cd0: 0x1067cd0: addiu sp, sp, -32
+// 0x01067ce0: 0x1067ce0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01067cd4: 0x1067cd4: sw    s0, 24(sp)
+// 0x01067ce4: 0x1067ce4: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1272,7 +1272,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01067cd8: 0x1067cd8: sw    a1, 16(sp)
+// 0x01067ce8: 0x1067ce8: sw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1281,8 +1281,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01067cdc: 0x1067cdc: sw    ra, 28(sp)
-// 0x01067ce0: 0x1067ce0: jal   0x1001b48 addu  s0, a0, zero
+// 0x01067cec: 0x1067cec: sw    ra, 28(sp)
+// 0x01067cf0: 0x1067cf0: jal   0x1001b48 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.1
@@ -1291,7 +1291,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01067ce8: 0x1067ce8: lw    a1, 16(sp)
+// 0x01067cf8: 0x1067cf8: lw    a1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1300,155 +1300,155 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01067cec: 0x1067cec: sll   zero, zero, 0
-// 0x01067cf0: 0x1067cf0: sltu  v0, a1, v0
+// 0x01067cfc: 0x1067cfc: sll   zero, zero, 0
+// 0x01067d00: 0x1067d00: sltu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01067cf4: 0x1067cf4: bne   v0, zero, 0x1067d34 addu  v1, s0, a1
+// 0x01067d04: 0x1067d04: bne   v0, zero, 0x1067d44 addu  v1, s0, a1
 	ldloc 5
 	ldloc 8
 	ldloc.2
 	add
 	stloc 6
-	brtrue L_1067d34
+	brtrue L_1067d44
 // --- basic block ---
-// 0x01067cfc: 0x1067cfc: j	 0x1067d5c sll   zero, zero, 0
-	br L_1067d5c
+// 0x01067d0c: 0x1067d0c: j	 0x1067d6c sll   zero, zero, 0
+	br L_1067d6c
 // --- basic block ---
-L_1067d04:
-// 0x01067d04: 0x1067d04: lb    v0, -1(v1)
+L_1067d14:
+// 0x01067d14: 0x1067d14: lb    v0, -1(v1)
 	ldloc 6
 	ldc.i4.m1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01067d08: 0x1067d08: addiu a1, a1, -1
+// 0x01067d18: 0x1067d18: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x01067d0c: 0x1067d0c: andi  a0, v0, 255
+// 0x01067d1c: 0x1067d1c: andi  a0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc.1
-// 0x01067d10: 0x1067d10: addiu a2, a0, -65
+// 0x01067d20: 0x1067d20: addiu a2, a0, -65
 	ldloc.1
 	ldc.i4.s -65
 	add
 	stloc.3
-// 0x01067d14: 0x1067d14: andi  a2, a2, 255
+// 0x01067d24: 0x1067d24: andi  a2, a2, 255
 	ldloc.3
 	ldc.i4 255
 	and
 	stloc.3
-// 0x01067d18: 0x1067d18: sltiu a2, a2, 26
+// 0x01067d28: 0x1067d28: sltiu a2, a2, 26
 	ldloc.3
 	ldc.i4.s 26
 	clt.un
 	stloc.3
-// 0x01067d1c: 0x1067d1c: beq   a2, zero, 0x1067d2c addiu a0, a0, 32
+// 0x01067d2c: 0x1067d2c: beq   a2, zero, 0x1067d3c addiu a0, a0, 32
 	ldloc.3
 	ldloc.1
 	ldc.i4.s 32
 	add
 	stloc.1
-	brfalse L_1067d2c
+	brfalse L_1067d3c
 // --- basic block ---
-// 0x01067d24: 0x1067d24: sll   v0, a0, 24
+// 0x01067d34: 0x1067d34: sll   v0, a0, 24
 	ldloc.1
 	ldc.i4.s 24
 	shl
 	stloc 5
-// 0x01067d28: 0x1067d28: sra   v0, v0, 24
+// 0x01067d38: 0x1067d38: sra   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shr
 	stloc 5
-L_1067d2c:
-// 0x01067d2c: 0x1067d2c: sb    v0, -1(v1)
+L_1067d3c:
+// 0x01067d3c: 0x1067d3c: sb    v0, -1(v1)
 	ldloc 6
 	ldc.i4.m1
 	add
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01067d30: 0x1067d30: addiu v1, v1, -1
+// 0x01067d40: 0x1067d40: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-L_1067d34:
-// 0x01067d34: 0x1067d34: bne   a1, zero, 0x1067d04 sll   zero, zero, 0
+L_1067d44:
+// 0x01067d44: 0x1067d44: bne   a1, zero, 0x1067d14 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1067d04
+	brtrue L_1067d14
 // --- basic block ---
-// 0x01067d3c: 0x1067d3c: j	 0x1067d7c sll   zero, zero, 0
-	br L_1067d7c
+// 0x01067d4c: 0x1067d4c: j	 0x1067d8c sll   zero, zero, 0
+	br L_1067d8c
 // --- basic block ---
-L_1067d44:
-// 0x01067d44: 0x1067d44: beq   a0, zero, 0x1067d54 sll   zero, zero, 0
+L_1067d54:
+// 0x01067d54: 0x1067d54: beq   a0, zero, 0x1067d64 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1067d54
+	brfalse L_1067d64
 // --- basic block ---
-// 0x01067d4c: 0x1067d4c: sll   v0, v1, 24
+// 0x01067d5c: 0x1067d5c: sll   v0, v1, 24
 	ldloc 6
 	ldc.i4.s 24
 	shl
 	stloc 5
-// 0x01067d50: 0x1067d50: sra   v0, v0, 24
+// 0x01067d60: 0x1067d60: sra   v0, v0, 24
 	ldloc 5
 	ldc.i4.s 24
 	shr
 	stloc 5
-L_1067d54:
-// 0x01067d54: 0x1067d54: sb    v0, 0(s0)
+L_1067d64:
+// 0x01067d64: 0x1067d64: sb    v0, 0(s0)
 	ldloc 8
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01067d58: 0x1067d58: addiu s0, s0, 1
+// 0x01067d68: 0x1067d68: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1067d5c:
-// 0x01067d5c: 0x1067d5c: lb    v0, 0(s0)
+L_1067d6c:
+// 0x01067d6c: 0x1067d6c: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01067d60: 0x1067d60: sll   zero, zero, 0
-// 0x01067d64: 0x1067d64: andi  v1, v0, 255
+// 0x01067d70: 0x1067d70: sll   zero, zero, 0
+// 0x01067d74: 0x1067d74: andi  v1, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 6
-// 0x01067d68: 0x1067d68: addiu a0, v1, -65
+// 0x01067d78: 0x1067d78: addiu a0, v1, -65
 	ldloc 6
 	ldc.i4.s -65
 	add
 	stloc.1
-// 0x01067d6c: 0x1067d6c: andi  a0, a0, 255
+// 0x01067d7c: 0x1067d7c: andi  a0, a0, 255
 	ldloc.1
 	ldc.i4 255
 	and
 	stloc.1
-// 0x01067d70: 0x1067d70: sltiu a0, a0, 26
+// 0x01067d80: 0x1067d80: sltiu a0, a0, 26
 	ldloc.1
 	ldc.i4.s 26
 	clt.un
 	stloc.1
-// 0x01067d74: 0x1067d74: bne   v0, zero, 0x1067d44 addiu v1, v1, 32
+// 0x01067d84: 0x1067d84: bne   v0, zero, 0x1067d54 addiu v1, v1, 32
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 32
 	add
 	stloc 6
-	brtrue L_1067d44
+	brtrue L_1067d54
 // --- basic block ---
-L_1067d7c:
-// 0x01067d7c: 0x1067d7c: lw    ra, 28(sp)
-// 0x01067d80: 0x1067d80: lw    s0, 24(sp)
+L_1067d8c:
+// 0x01067d8c: 0x1067d8c: lw    ra, 28(sp)
+// 0x01067d90: 0x1067d90: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1457,7 +1457,7 @@ L_1067d7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01067d84: 0x1067d84: jr    ra addiu sp, sp, 32
+// 0x01067d94: 0x1067d94: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1469,7 +1469,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 AppendPrefix_ShiftOriginalRight_1068098(int32,int32,int32,int32,int32)
+.method public static int32 AppendPrefix_ShiftOriginalRight_10680a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 s1,int32 v1,int32 s2,int32 ra)
@@ -1513,12 +1513,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068098: 0x1068098: addiu sp, sp, -32
+// 0x010680a8: 0x10680a8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106809c: 0x106809c: sw    s0, 16(sp)
+// 0x010680ac: 0x10680ac: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1527,11 +1527,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010680a0: 0x10680a0: addu  s0, a1, zero
+// 0x010680b0: 0x10680b0: addu  s0, a1, zero
 	ldloc.2
 	stloc 5
-// 0x010680a4: 0x10680a4: sw    ra, 28(sp)
-// 0x010680a8: 0x10680a8: sw    s2, 24(sp)
+// 0x010680b4: 0x10680b4: sw    ra, 28(sp)
+// 0x010680b8: 0x10680b8: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1540,7 +1540,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010680ac: 0x10680ac: sw    s1, 20(sp)
+// 0x010680bc: 0x10680bc: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1549,7 +1549,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010680b0: 0x10680b0: jal   0x1001b48 addu  s2, a0, zero
+// 0x010680c0: 0x10680c0: jal   0x1001b48 addu  s2, a0, zero
 	ldloc.1
 	stloc 10
 	ldloc.1
@@ -1558,10 +1558,10 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010680b8: 0x10680b8: addu  a0, s0, zero
+// 0x010680c8: 0x10680c8: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010680bc: 0x10680bc: jal   0x1001b48 addu  s1, v0, zero
+// 0x010680cc: 0x10680cc: jal   0x1001b48 addu  s1, v0, zero
 	ldloc 7
 	stloc 8
 	ldloc.1
@@ -1570,17 +1570,17 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010680c4: 0x10680c4: addiu a2, v0, 1
+// 0x010680d4: 0x10680d4: addiu a2, v0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc.3
-// 0x010680c8: 0x10680c8: addu  a0, s0, s1
+// 0x010680d8: 0x10680d8: addu  a0, s0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc.1
-// 0x010680cc: 0x10680cc: jal   0x100186c addu  a1, s0, zero
+// 0x010680dc: 0x10680dc: jal   0x100186c addu  a1, s0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
@@ -1592,13 +1592,13 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010680d4: 0x10680d4: addu  a0, s0, zero
+// 0x010680e4: 0x10680e4: addu  a0, s0, zero
 	ldloc 5
 	stloc.1
-// 0x010680d8: 0x10680d8: addu  a1, s2, zero
+// 0x010680e8: 0x10680e8: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x010680dc: 0x10680dc: jal   0x1001800 addu  a2, s1, zero
+// 0x010680ec: 0x10680ec: jal   0x1001800 addu  a2, s1, zero
 	ldloc 8
 	stloc.3
 	ldloc.1
@@ -1610,11 +1610,11 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x010680e4: 0x10680e4: lw    ra, 28(sp)
-// 0x010680e8: 0x10680e8: addu  v0, s0, zero
+// 0x010680f4: 0x10680f4: lw    ra, 28(sp)
+// 0x010680f8: 0x10680f8: addu  v0, s0, zero
 	ldloc 5
 	stloc 7
-// 0x010680ec: 0x10680ec: lw    s2, 24(sp)
+// 0x010680fc: 0x10680fc: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1623,7 +1623,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010680f0: 0x10680f0: lw    s1, 20(sp)
+// 0x01068100: 0x1068100: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1632,7 +1632,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010680f4: 0x10680f4: lw    s0, 16(sp)
+// 0x01068104: 0x1068104: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1641,7 +1641,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010680f8: 0x10680f8: jr    ra addiu sp, sp, 32
+// 0x01068108: 0x1068108: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1653,7 +1653,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 SkipChars_1068100(int32,int32,int32,int32,int32)
+.method public static int32 SkipChars_1068110(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -1694,12 +1694,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068100: 0x1068100: addiu sp, sp, -40
+// 0x01068110: 0x1068110: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01068104: 0x1068104: sw    s1, 32(sp)
+// 0x01068114: 0x1068114: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1708,7 +1708,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068108: 0x1068108: sw    s0, 28(sp)
+// 0x01068118: 0x1068118: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1717,66 +1717,66 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106810c: 0x106810c: sw    ra, 36(sp)
-// 0x01068110: 0x1068110: addu  s0, a0, zero
+// 0x0106811c: 0x106811c: sw    ra, 36(sp)
+// 0x01068120: 0x1068120: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01068114: 0x1068114: beq   a0, zero, 0x1068190 addu  s1, a1, zero
+// 0x01068124: 0x1068124: beq   a0, zero, 0x10681a0 addu  s1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 9
-	brfalse L_1068190
+	brfalse L_10681a0
 // --- basic block ---
-// 0x0106811c: 0x106811c: lb    v0, 0(a0)
+// 0x0106812c: 0x106812c: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01068120: 0x1068120: sll   zero, zero, 0
-// 0x01068124: 0x1068124: beq   v0, zero, 0x1068190 sll   zero, zero, 0
+// 0x01068130: 0x1068130: sll   zero, zero, 0
+// 0x01068134: 0x1068134: beq   v0, zero, 0x10681a0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068190
+	brfalse L_10681a0
 // --- basic block ---
-// 0x0106812c: 0x106812c: beq   a1, zero, 0x1068190 sll   zero, zero, 0
+// 0x0106813c: 0x106813c: beq   a1, zero, 0x10681a0 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1068190
+	brfalse L_10681a0
 // --- basic block ---
-// 0x01068134: 0x1068134: lb    v0, 0(a1)
+// 0x01068144: 0x1068144: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01068138: 0x1068138: sll   zero, zero, 0
-// 0x0106813c: 0x106813c: beq   v0, zero, 0x1068190 sll   zero, zero, 0
+// 0x01068148: 0x1068148: sll   zero, zero, 0
+// 0x0106814c: 0x106814c: beq   v0, zero, 0x10681a0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068190
+	brfalse L_10681a0
 // --- basic block ---
-// 0x01068144: 0x1068144: bne   a2, zero, 0x1068158 sll   zero, zero, 0
+// 0x01068154: 0x1068154: bne   a2, zero, 0x1068168 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_1068158
+	brtrue L_1068168
 // --- basic block ---
-// 0x0106814c: 0x106814c: j	 0x1068190 sll   zero, zero, 0
-	br L_1068190
+// 0x0106815c: 0x106815c: j	 0x10681a0 sll   zero, zero, 0
+	br L_10681a0
 // --- basic block ---
-L_1068154:
-// 0x01068154: 0x1068154: addiu s0, s0, 1
+L_1068164:
+// 0x01068164: 0x1068164: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_1068158:
-// 0x01068158: 0x1068158: lb    v0, 0(s0)
+L_1068168:
+// 0x01068168: 0x1068168: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0106815c: 0x106815c: addu  a0, s1, zero
+// 0x0106816c: 0x106816c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01068160: 0x1068160: beq   v0, zero, 0x1068190 addu  a1, v0, zero
+// 0x01068170: 0x1068170: beq   v0, zero, 0x10681a0 addu  a1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.2
-	brfalse L_1068190
+	brfalse L_10681a0
 // --- basic block ---
-// 0x01068168: 0x1068168: jal   0x1001a5c sw    a2, 16(sp)
+// 0x01068178: 0x1068178: jal   0x1001a5c sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1792,7 +1792,7 @@ L_1068158:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01068170: 0x1068170: lw    a2, 16(sp)
+// 0x01068180: 0x1068180: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1801,39 +1801,39 @@ L_1068158:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01068174: 0x1068174: sll   zero, zero, 0
-// 0x01068178: 0x1068178: nor   v1, zero, a2
+// 0x01068184: 0x1068184: sll   zero, zero, 0
+// 0x01068188: 0x1068188: nor   v1, zero, a2
 	ldloc.3
 	ldc.i4.m1
 	xor
 	stloc 8
-// 0x0106817c: 0x106817c: bne   v0, zero, 0x1068190 sltu  v1, zero, v1
+// 0x0106818c: 0x106818c: bne   v0, zero, 0x10681a0 sltu  v1, zero, v1
 	ldloc 6
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
-	brtrue L_1068190
+	brtrue L_10681a0
 // --- basic block ---
-// 0x01068184: 0x1068184: bne   a2, zero, 0x1068154 subu  a2, a2, v1
+// 0x01068194: 0x1068194: bne   a2, zero, 0x1068164 subu  a2, a2, v1
 	ldloc.3
 	ldloc.3
 	ldloc 8
 	sub
 	stloc.3
-	brtrue L_1068154
+	brtrue L_1068164
 // --- basic block ---
-// 0x0106818c: 0x106818c: addu  a2, a2, v1
+// 0x0106819c: 0x106819c: addu  a2, a2, v1
 	ldloc.3
 	ldloc 8
 	add
 	stloc.3
-L_1068190:
-// 0x01068190: 0x1068190: lw    ra, 36(sp)
-// 0x01068194: 0x1068194: addu  v0, s0, zero
+L_10681a0:
+// 0x010681a0: 0x10681a0: lw    ra, 36(sp)
+// 0x010681a4: 0x10681a4: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01068198: 0x1068198: lw    s1, 32(sp)
+// 0x010681a8: 0x10681a8: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1842,7 +1842,7 @@ L_1068190:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106819c: 0x106819c: lw    s0, 28(sp)
+// 0x010681ac: 0x10681ac: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1851,7 +1851,7 @@ L_1068190:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010681a0: 0x10681a0: jr    ra addiu sp, sp, 40
+// 0x010681b0: 0x10681b0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1863,7 +1863,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 EatChars_10681a8(int32,int32,int32,int32,int32)
+.method public static int32 EatChars_10681b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 ra)
@@ -1904,12 +1904,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010681a8: 0x10681a8: addiu sp, sp, -40
+// 0x010681b8: 0x10681b8: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010681ac: 0x10681ac: sw    s1, 32(sp)
+// 0x010681bc: 0x10681bc: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1918,7 +1918,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010681b0: 0x10681b0: sw    s0, 28(sp)
+// 0x010681c0: 0x10681c0: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1927,66 +1927,66 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010681b4: 0x10681b4: sw    ra, 36(sp)
-// 0x010681b8: 0x10681b8: addu  s0, a0, zero
+// 0x010681c4: 0x10681c4: sw    ra, 36(sp)
+// 0x010681c8: 0x10681c8: addu  s0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010681bc: 0x10681bc: beq   a0, zero, 0x1068238 addu  s1, a1, zero
+// 0x010681cc: 0x10681cc: beq   a0, zero, 0x1068248 addu  s1, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 9
-	brfalse L_1068238
+	brfalse L_1068248
 // --- basic block ---
-// 0x010681c4: 0x10681c4: lb    v0, 0(a0)
+// 0x010681d4: 0x10681d4: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010681c8: 0x10681c8: sll   zero, zero, 0
-// 0x010681cc: 0x10681cc: beq   v0, zero, 0x1068238 sll   zero, zero, 0
+// 0x010681d8: 0x10681d8: sll   zero, zero, 0
+// 0x010681dc: 0x10681dc: beq   v0, zero, 0x1068248 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068238
+	brfalse L_1068248
 // --- basic block ---
-// 0x010681d4: 0x10681d4: beq   a1, zero, 0x1068238 sll   zero, zero, 0
+// 0x010681e4: 0x10681e4: beq   a1, zero, 0x1068248 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1068238
+	brfalse L_1068248
 // --- basic block ---
-// 0x010681dc: 0x10681dc: lb    v0, 0(a1)
+// 0x010681ec: 0x10681ec: lb    v0, 0(a1)
 	ldloc.2
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010681e0: 0x10681e0: sll   zero, zero, 0
-// 0x010681e4: 0x10681e4: beq   v0, zero, 0x1068238 sll   zero, zero, 0
+// 0x010681f0: 0x10681f0: sll   zero, zero, 0
+// 0x010681f4: 0x10681f4: beq   v0, zero, 0x1068248 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068238
+	brfalse L_1068248
 // --- basic block ---
-// 0x010681ec: 0x10681ec: bne   a2, zero, 0x1068200 sll   zero, zero, 0
+// 0x010681fc: 0x10681fc: bne   a2, zero, 0x1068210 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_1068200
+	brtrue L_1068210
 // --- basic block ---
-// 0x010681f4: 0x10681f4: j	 0x1068238 sll   zero, zero, 0
-	br L_1068238
+// 0x01068204: 0x1068204: j	 0x1068248 sll   zero, zero, 0
+	br L_1068248
 // --- basic block ---
-L_10681fc:
-// 0x010681fc: 0x10681fc: addiu s0, s0, 1
+L_106820c:
+// 0x0106820c: 0x106820c: addiu s0, s0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_1068200:
-// 0x01068200: 0x1068200: lb    v0, 0(s0)
+L_1068210:
+// 0x01068210: 0x1068210: lb    v0, 0(s0)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01068204: 0x1068204: addu  a0, s1, zero
+// 0x01068214: 0x1068214: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01068208: 0x1068208: beq   v0, zero, 0x1068238 addu  a1, v0, zero
+// 0x01068218: 0x1068218: beq   v0, zero, 0x1068248 addu  a1, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.2
-	brfalse L_1068238
+	brfalse L_1068248
 // --- basic block ---
-// 0x01068210: 0x1068210: jal   0x1001a5c sw    a2, 16(sp)
+// 0x01068220: 0x1068220: jal   0x1001a5c sw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2002,7 +2002,7 @@ L_1068200:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01068218: 0x1068218: lw    a2, 16(sp)
+// 0x01068228: 0x1068228: lw    a2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2011,39 +2011,39 @@ L_1068200:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0106821c: 0x106821c: sll   zero, zero, 0
-// 0x01068220: 0x1068220: nor   v1, zero, a2
+// 0x0106822c: 0x106822c: sll   zero, zero, 0
+// 0x01068230: 0x1068230: nor   v1, zero, a2
 	ldloc.3
 	ldc.i4.m1
 	xor
 	stloc 8
-// 0x01068224: 0x1068224: beq   v0, zero, 0x1068238 sltu  v1, zero, v1
+// 0x01068234: 0x1068234: beq   v0, zero, 0x1068248 sltu  v1, zero, v1
 	ldloc 6
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
-	brfalse L_1068238
+	brfalse L_1068248
 // --- basic block ---
-// 0x0106822c: 0x106822c: bne   a2, zero, 0x10681fc subu  a2, a2, v1
+// 0x0106823c: 0x106823c: bne   a2, zero, 0x106820c subu  a2, a2, v1
 	ldloc.3
 	ldloc.3
 	ldloc 8
 	sub
 	stloc.3
-	brtrue L_10681fc
+	brtrue L_106820c
 // --- basic block ---
-// 0x01068234: 0x1068234: addu  a2, a2, v1
+// 0x01068244: 0x1068244: addu  a2, a2, v1
 	ldloc.3
 	ldloc 8
 	add
 	stloc.3
-L_1068238:
-// 0x01068238: 0x1068238: lw    ra, 36(sp)
-// 0x0106823c: 0x106823c: addu  v0, s0, zero
+L_1068248:
+// 0x01068248: 0x1068248: lw    ra, 36(sp)
+// 0x0106824c: 0x106824c: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01068240: 0x1068240: lw    s1, 32(sp)
+// 0x01068250: 0x1068250: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2052,7 +2052,7 @@ L_1068238:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01068244: 0x1068244: lw    s0, 28(sp)
+// 0x01068254: 0x1068254: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2061,7 +2061,7 @@ L_1068238:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068248: 0x1068248: jr    ra addiu sp, sp, 40
+// 0x01068258: 0x1068258: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2073,7 +2073,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+.method public static int32 ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s4,int32 s1,int32 s3,int32 s5,int32 v1,int32 s0,int32 t0,int32 t1,int32 t2,int32 s6,int32 s7,int32 s8,int32 ra)
@@ -2144,12 +2144,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068250: 0x1068250: addiu sp, sp, -80
+// 0x01068260: 0x1068260: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01068254: 0x1068254: sw    s1, 44(sp)
+// 0x01068264: 0x1068264: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2158,7 +2158,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068258: 0x1068258: sw    s0, 40(sp)
+// 0x01068268: 0x1068268: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2167,11 +2167,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0106825c: 0x106825c: addu  s1, a2, zero
+// 0x0106826c: 0x106826c: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x01068260: 0x1068260: sw    ra, 76(sp)
-// 0x01068264: 0x1068264: sw    s8, 72(sp)
+// 0x01068270: 0x1068270: sw    ra, 76(sp)
+// 0x01068274: 0x1068274: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2180,7 +2180,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01068268: 0x1068268: sw    s7, 68(sp)
+// 0x01068278: 0x1068278: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2189,7 +2189,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0106826c: 0x106826c: sw    s6, 64(sp)
+// 0x0106827c: 0x106827c: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2198,7 +2198,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01068270: 0x1068270: sw    s5, 60(sp)
+// 0x01068280: 0x1068280: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2207,7 +2207,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01068274: 0x1068274: sw    s4, 56(sp)
+// 0x01068284: 0x1068284: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2216,7 +2216,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01068278: 0x1068278: sw    s3, 52(sp)
+// 0x01068288: 0x1068288: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2225,7 +2225,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0106827c: 0x106827c: sw    s2, 48(sp)
+// 0x0106828c: 0x106828c: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2234,7 +2234,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068280: 0x1068280: lw    a2, 96(sp)
+// 0x01068290: 0x1068290: lw    a2, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2243,149 +2243,149 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01068284: 0x1068284: beq   a0, zero, 0x10683fc addu  s0, a1, zero
+// 0x01068294: 0x1068294: beq   a0, zero, 0x106840c addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 13
-	brfalse L_10683fc
+	brfalse L_106840c
 // --- basic block ---
-// 0x0106828c: 0x106828c: beq   s1, zero, 0x10683fc sll   zero, zero, 0
+// 0x0106829c: 0x106829c: beq   s1, zero, 0x106840c sll   zero, zero, 0
 	ldloc 9
-	brfalse L_10683fc
+	brfalse L_106840c
 // --- basic block ---
-// 0x01068294: 0x1068294: lw    v0, 0(s1)
+// 0x010682a4: 0x10682a4: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01068298: 0x1068298: sll   zero, zero, 0
-// 0x0106829c: 0x106829c: beq   v0, zero, 0x10683fc sll   zero, zero, 0
+// 0x010682a8: 0x10682a8: sll   zero, zero, 0
+// 0x010682ac: 0x10682ac: beq   v0, zero, 0x106840c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10683fc
+	brfalse L_106840c
 // --- basic block ---
-// 0x010682a4: 0x10682a4: beq   a3, zero, 0x10683fc sll   zero, zero, 0
+// 0x010682b4: 0x10682b4: beq   a3, zero, 0x106840c sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10683fc
+	brfalse L_106840c
 // --- basic block ---
-// 0x010682ac: 0x10682ac: lb    v0, 0(a3)
+// 0x010682bc: 0x10682bc: lb    v0, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x010682b0: 0x10682b0: sll   zero, zero, 0
-// 0x010682b4: 0x10682b4: beq   v0, zero, 0x10683fc sll   zero, zero, 0
+// 0x010682c0: 0x10682c0: sll   zero, zero, 0
+// 0x010682c4: 0x10682c4: beq   v0, zero, 0x106840c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10683fc
+	brfalse L_106840c
 // --- basic block ---
-// 0x010682bc: 0x10682bc: beq   a1, zero, 0x10682c8 sll   zero, zero, 0
+// 0x010682cc: 0x10682cc: beq   a1, zero, 0x10682d8 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10682c8
+	brfalse L_10682d8
 // --- basic block ---
-// 0x010682c4: 0x10682c4: sb    zero, 0(a1)
+// 0x010682d4: 0x10682d4: sb    zero, 0(a1)
 	ldloc.2
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10682c8:
-// 0x010682c8: 0x10682c8: addu  s3, a0, zero
+L_10682d8:
+// 0x010682d8: 0x10682d8: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010682cc: 0x10682cc: addu  v0, zero, zero
+// 0x010682dc: 0x10682dc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010682d0: 0x10682d0: addu  s4, zero, zero
+// 0x010682e0: 0x10682e0: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x010682d4: 0x10682d4: addiu t2, zero, 92
+// 0x010682e4: 0x10682e4: addiu t2, zero, 92
 	ldc.i4.s 92
 	stloc 16
-// 0x010682d8: 0x10682d8: addiu t1, zero, 78
+// 0x010682e8: 0x10682e8: addiu t1, zero, 78
 	ldc.i4.s 78
 	stloc 15
-// 0x010682dc: 0x10682dc: addiu t0, zero, 82
+// 0x010682ec: 0x10682ec: addiu t0, zero, 82
 	ldc.i4.s 82
 	stloc 14
-// 0x010682e0: 0x10682e0: addiu v1, zero, 84
+// 0x010682f0: 0x10682f0: addiu v1, zero, 84
 	ldc.i4.s 84
 	stloc 12
-// 0x010682e4: 0x10682e4: addiu s8, zero, 110
+// 0x010682f4: 0x10682f4: addiu s8, zero, 110
 	ldc.i4.s 110
 	stloc 19
-// 0x010682e8: 0x10682e8: addiu s7, zero, 114
+// 0x010682f8: 0x10682f8: addiu s7, zero, 114
 	ldc.i4.s 114
 	stloc 18
-// 0x010682ec: 0x10682ec: j	 0x10683d0 addiu s6, zero, 116
+// 0x010682fc: 0x10682fc: j	 0x10683e0 addiu s6, zero, 116
 	ldc.i4.s 116
 	stloc 17
-	br L_10683d0
+	br L_10683e0
 // --- basic block ---
-L_10682f4:
-// 0x010682f4: 0x10682f4: beq   v0, zero, 0x1068344 sll   zero, zero, 0
+L_1068304:
+// 0x01068304: 0x1068304: beq   v0, zero, 0x1068354 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068344
+	brfalse L_1068354
 // --- basic block ---
-// 0x010682fc: 0x10682fc: beq   s2, t1, 0x1068334 sll   zero, zero, 0
+// 0x0106830c: 0x106830c: beq   s2, t1, 0x1068344 sll   zero, zero, 0
 	ldloc 7
 	ldloc 15
-	beq  L_1068334
+	beq  L_1068344
 // --- basic block ---
-// 0x01068304: 0x1068304: beq   s2, t0, 0x1068398 sll   zero, zero, 0
+// 0x01068314: 0x1068314: beq   s2, t0, 0x10683a8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 14
-	beq  L_1068398
+	beq  L_10683a8
 // --- basic block ---
-// 0x0106830c: 0x106830c: beq   s2, v1, 0x106833c sll   zero, zero, 0
+// 0x0106831c: 0x106831c: beq   s2, v1, 0x106834c sll   zero, zero, 0
 	ldloc 7
 	ldloc 12
-	beq  L_106833c
+	beq  L_106834c
 // --- basic block ---
-// 0x01068314: 0x1068314: beq   s2, s8, 0x1068334 sll   zero, zero, 0
+// 0x01068324: 0x1068324: beq   s2, s8, 0x1068344 sll   zero, zero, 0
 	ldloc 7
 	ldloc 19
-	beq  L_1068334
+	beq  L_1068344
 // --- basic block ---
-// 0x0106831c: 0x106831c: beq   s2, s7, 0x1068398 sll   zero, zero, 0
+// 0x0106832c: 0x106832c: beq   s2, s7, 0x10683a8 sll   zero, zero, 0
 	ldloc 7
 	ldloc 18
-	beq  L_1068398
+	beq  L_10683a8
 // --- basic block ---
-// 0x01068324: 0x1068324: bne   s2, s6, 0x106839c sll   zero, zero, 0
+// 0x01068334: 0x1068334: bne   s2, s6, 0x10683ac sll   zero, zero, 0
 	ldloc 7
 	ldloc 17
-	bne.un L_106839c
+	bne.un L_10683ac
 // --- basic block ---
-// 0x0106832c: 0x106832c: j	 0x106839c addiu s2, zero, 9
+// 0x0106833c: 0x106833c: j	 0x10683ac addiu s2, zero, 9
 	ldc.i4.s 9
 	stloc 7
-	br L_106839c
+	br L_10683ac
 // --- basic block ---
-L_1068334:
-// 0x01068334: 0x1068334: j	 0x106839c addiu s2, zero, 10
+L_1068344:
+// 0x01068344: 0x1068344: j	 0x10683ac addiu s2, zero, 10
 	ldc.i4.s 10
 	stloc 7
-	br L_106839c
+	br L_10683ac
 // --- basic block ---
-L_106833c:
-// 0x0106833c: 0x106833c: j	 0x106839c addiu s2, zero, 9
+L_106834c:
+// 0x0106834c: 0x106834c: j	 0x10683ac addiu s2, zero, 9
 	ldc.i4.s 9
 	stloc 7
-	br L_106839c
+	br L_10683ac
 // --- basic block ---
-L_1068344:
-// 0x01068344: 0x1068344: beq   s2, t2, 0x10683cc addiu v0, zero, 1
+L_1068354:
+// 0x01068354: 0x1068354: beq   s2, t2, 0x10683dc addiu v0, zero, 1
 	ldloc 7
 	ldloc 16
 	ldc.i4.1
 	stloc 6
-	beq  L_10683cc
+	beq  L_10683dc
 // --- basic block ---
-// 0x0106834c: 0x106834c: addu  a0, a3, zero
+// 0x0106835c: 0x106835c: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x01068350: 0x1068350: addu  a1, s2, zero
+// 0x01068360: 0x1068360: addu  a1, s2, zero
 	ldloc 7
 	stloc.2
-// 0x01068354: 0x1068354: sw    v1, 36(sp)
+// 0x01068364: 0x1068364: sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2394,7 +2394,7 @@ L_1068344:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01068358: 0x1068358: sw    a2, 20(sp)
+// 0x01068368: 0x1068368: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2403,7 +2403,7 @@ L_1068344:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0106835c: 0x106835c: sw    a3, 16(sp)
+// 0x0106836c: 0x106836c: sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2412,7 +2412,7 @@ L_1068344:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01068360: 0x1068360: sw    t0, 32(sp)
+// 0x01068370: 0x1068370: sw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2421,7 +2421,7 @@ L_1068344:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01068364: 0x1068364: sw    t1, 28(sp)
+// 0x01068374: 0x1068374: sw    t1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2430,7 +2430,7 @@ L_1068344:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01068368: 0x1068368: jal   0x1001a5c sw    t2, 24(sp)
+// 0x01068378: 0x1068378: jal   0x1001a5c sw    t2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2446,7 +2446,7 @@ L_1068344:
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x01068370: 0x1068370: lw    v1, 36(sp)
+// 0x01068380: 0x1068380: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2455,7 +2455,7 @@ L_1068344:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01068374: 0x1068374: lw    a2, 20(sp)
+// 0x01068384: 0x1068384: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2464,7 +2464,7 @@ L_1068344:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01068378: 0x1068378: lw    a3, 16(sp)
+// 0x01068388: 0x1068388: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2473,7 +2473,7 @@ L_1068344:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0106837c: 0x106837c: lw    t0, 32(sp)
+// 0x0106838c: 0x106838c: lw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2482,7 +2482,7 @@ L_1068344:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01068380: 0x1068380: lw    t1, 28(sp)
+// 0x01068390: 0x1068390: lw    t1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2491,7 +2491,7 @@ L_1068344:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01068384: 0x1068384: lw    t2, 24(sp)
+// 0x01068394: 0x1068394: lw    t2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2500,108 +2500,108 @@ L_1068344:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01068388: 0x1068388: beq   v0, zero, 0x106839c sll   zero, zero, 0
+// 0x01068398: 0x1068398: beq   v0, zero, 0x10683ac sll   zero, zero, 0
 	ldloc 6
-	brfalse L_106839c
+	brfalse L_10683ac
 // --- basic block ---
-// 0x01068390: 0x1068390: j	 0x10683e4 sw    s4, 0(s1)
+// 0x010683a0: 0x10683a0: j	 0x10683f4 sw    s4, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-	br L_10683e4
+	br L_10683f4
 // --- basic block ---
-L_1068398:
-// 0x01068398: 0x1068398: addiu s2, zero, 13
+L_10683a8:
+// 0x010683a8: 0x10683a8: addiu s2, zero, 13
 	ldc.i4.s 13
 	stloc 7
-L_106839c:
-// 0x0106839c: 0x106839c: lw    a0, 0(s1)
+L_10683ac:
+// 0x010683ac: 0x10683ac: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010683a0: 0x10683a0: addiu v0, s4, 1
+// 0x010683b0: 0x10683b0: addiu v0, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 6
-// 0x010683a4: 0x10683a4: slt   a0, v0, a0
+// 0x010683b4: 0x10683b4: slt   a0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc.1
-// 0x010683a8: 0x10683a8: beq   a0, zero, 0x1068400 addu  s5, zero, zero
+// 0x010683b8: 0x10683b8: beq   a0, zero, 0x1068410 addu  s5, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 11
-	brfalse L_1068400
+	brfalse L_1068410
 // --- basic block ---
-// 0x010683b0: 0x10683b0: beq   s0, zero, 0x10683c4 addu  s4, s0, s4
+// 0x010683c0: 0x10683c0: beq   s0, zero, 0x10683d4 addu  s4, s0, s4
 	ldloc 13
 	ldloc 13
 	ldloc 8
 	add
 	stloc 8
-	brfalse L_10683c4
+	brfalse L_10683d4
 // --- basic block ---
-// 0x010683b8: 0x10683b8: addu  a0, s0, v0
+// 0x010683c8: 0x10683c8: addu  a0, s0, v0
 	ldloc 13
 	ldloc 6
 	add
 	stloc.1
-// 0x010683bc: 0x10683bc: sb    s2, 0(s4)
+// 0x010683cc: 0x10683cc: sb    s2, 0(s4)
 	ldloc 8
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010683c0: 0x10683c0: sb    zero, 0(a0)
+// 0x010683d0: 0x10683d0: sb    zero, 0(a0)
 	ldloc.1
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10683c4:
-// 0x010683c4: 0x10683c4: addu  s4, v0, zero
+L_10683d4:
+// 0x010683d4: 0x10683d4: addu  s4, v0, zero
 	ldloc 6
 	stloc 8
-// 0x010683c8: 0x10683c8: addu  v0, zero, zero
+// 0x010683d8: 0x10683d8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_10683cc:
-// 0x010683cc: 0x10683cc: addiu s3, s3, 1
+L_10683dc:
+// 0x010683dc: 0x10683dc: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10683d0:
-// 0x010683d0: 0x10683d0: lb    s2, 0(s3)
+L_10683e0:
+// 0x010683e0: 0x10683e0: lb    s2, 0(s3)
 	ldloc 10
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010683d4: 0x10683d4: sll   zero, zero, 0
-// 0x010683d8: 0x10683d8: bne   s2, zero, 0x10682f4 addu  s5, s3, zero
+// 0x010683e4: 0x10683e4: sll   zero, zero, 0
+// 0x010683e8: 0x10683e8: bne   s2, zero, 0x1068304 addu  s5, s3, zero
 	ldloc 7
 	ldloc 10
 	stloc 11
-	brtrue L_10682f4
+	brtrue L_1068304
 // --- basic block ---
-// 0x010683e0: 0x10683e0: sw    s4, 0(s1)
+// 0x010683f0: 0x10683f0: sw    s4, 0(s1)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_10683e4:
-// 0x010683e4: 0x10683e4: beq   a2, zero, 0x1068400 addu  a0, s3, zero
+L_10683f4:
+// 0x010683f4: 0x10683f4: beq   a2, zero, 0x1068410 addu  a0, s3, zero
 	ldloc.3
 	ldloc 10
 	stloc.1
-	brfalse L_1068400
+	brfalse L_1068410
 // --- basic block ---
-// 0x010683ec: 0x10683ec: jal   0x10681a8 addu  a1, a3, zero
+// 0x010683fc: 0x10683fc: jal   0x10681b8 addu  a1, a3, zero
 	ldloc 4
 	stloc.2
 	ldloc.0
@@ -2609,26 +2609,26 @@ L_10683e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x010683f4: 0x10683f4: j	 0x1068400 addu  s5, v0, zero
+// 0x01068404: 0x1068404: j	 0x1068410 addu  s5, v0, zero
 	ldloc 6
 	stloc 11
-	br L_1068400
+	br L_1068410
 // --- basic block ---
-L_10683fc:
-// 0x010683fc: 0x10683fc: addu  s5, zero, zero
+L_106840c:
+// 0x0106840c: 0x106840c: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 11
-L_1068400:
-// 0x01068400: 0x1068400: lw    ra, 76(sp)
-// 0x01068404: 0x1068404: addu  v0, s5, zero
+L_1068410:
+// 0x01068410: 0x1068410: lw    ra, 76(sp)
+// 0x01068414: 0x1068414: addu  v0, s5, zero
 	ldloc 11
 	stloc 6
-// 0x01068408: 0x1068408: lw    s8, 72(sp)
+// 0x01068418: 0x1068418: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2637,7 +2637,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0106840c: 0x106840c: lw    s7, 68(sp)
+// 0x0106841c: 0x106841c: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2646,7 +2646,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01068410: 0x1068410: lw    s6, 64(sp)
+// 0x01068420: 0x1068420: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2655,7 +2655,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 17
-// 0x01068414: 0x1068414: lw    s5, 60(sp)
+// 0x01068424: 0x1068424: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2664,7 +2664,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01068418: 0x1068418: lw    s4, 56(sp)
+// 0x01068428: 0x1068428: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2673,7 +2673,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106841c: 0x106841c: lw    s3, 52(sp)
+// 0x0106842c: 0x106842c: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2682,7 +2682,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01068420: 0x1068420: lw    s2, 48(sp)
+// 0x01068430: 0x1068430: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2691,7 +2691,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068424: 0x1068424: lw    s1, 44(sp)
+// 0x01068434: 0x1068434: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2700,7 +2700,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01068428: 0x1068428: lw    s0, 40(sp)
+// 0x01068438: 0x1068438: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2709,7 +2709,7 @@ L_1068400:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0106842c: 0x106842c: jr    ra addiu sp, sp, 80
+// 0x0106843c: 0x106843c: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -2721,7 +2721,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ExtractString_1068434(int32,int32,int32,int32,int32)
+.method public static int32 ExtractString_1068444(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s0,int32 ra,int32 v1)
@@ -2777,12 +2777,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068434: 0x1068434: addiu sp, sp, -56
+// 0x01068444: 0x1068444: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01068438: 0x1068438: sw    s1, 28(sp)
+// 0x01068448: 0x1068448: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2791,7 +2791,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0106843c: 0x106843c: sw    s0, 24(sp)
+// 0x0106844c: 0x106844c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2800,11 +2800,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01068440: 0x1068440: addu  s1, a2, zero
+// 0x01068450: 0x1068450: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01068444: 0x1068444: sw    ra, 52(sp)
-// 0x01068448: 0x1068448: sw    s6, 48(sp)
+// 0x01068454: 0x1068454: sw    ra, 52(sp)
+// 0x01068458: 0x1068458: sw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2813,7 +2813,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0106844c: 0x106844c: sw    s5, 44(sp)
+// 0x0106845c: 0x106845c: sw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2822,7 +2822,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01068450: 0x1068450: sw    s4, 40(sp)
+// 0x01068460: 0x1068460: sw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2831,7 +2831,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01068454: 0x1068454: sw    s3, 36(sp)
+// 0x01068464: 0x1068464: sw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2840,7 +2840,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068458: 0x1068458: sw    s2, 32(sp)
+// 0x01068468: 0x1068468: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2849,7 +2849,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106845c: 0x106845c: lw    a2, 72(sp)
+// 0x0106846c: 0x106846c: lw    a2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2858,128 +2858,128 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01068460: 0x1068460: beq   a0, zero, 0x106852c addu  s0, a1, zero
+// 0x01068470: 0x1068470: beq   a0, zero, 0x106853c addu  s0, a1, zero
 	ldloc.1
 	ldloc.2
 	stloc 13
-	brfalse L_106852c
+	brfalse L_106853c
 // --- basic block ---
-// 0x01068468: 0x1068468: beq   s1, zero, 0x106852c sll   zero, zero, 0
+// 0x01068478: 0x1068478: beq   s1, zero, 0x106853c sll   zero, zero, 0
 	ldloc 8
-	brfalse L_106852c
+	brfalse L_106853c
 // --- basic block ---
-// 0x01068470: 0x1068470: lw    v0, 0(s1)
+// 0x01068480: 0x1068480: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01068474: 0x1068474: sll   zero, zero, 0
-// 0x01068478: 0x1068478: beq   v0, zero, 0x106852c sll   zero, zero, 0
+// 0x01068484: 0x1068484: sll   zero, zero, 0
+// 0x01068488: 0x1068488: beq   v0, zero, 0x106853c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_106852c
+	brfalse L_106853c
 // --- basic block ---
-// 0x01068480: 0x1068480: beq   a3, zero, 0x106852c sll   zero, zero, 0
+// 0x01068490: 0x1068490: beq   a3, zero, 0x106853c sll   zero, zero, 0
 	ldloc 4
-	brfalse L_106852c
+	brfalse L_106853c
 // --- basic block ---
-// 0x01068488: 0x1068488: lb    v0, 0(a3)
+// 0x01068498: 0x1068498: lb    v0, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0106848c: 0x106848c: sll   zero, zero, 0
-// 0x01068490: 0x1068490: beq   v0, zero, 0x106852c sll   zero, zero, 0
+// 0x0106849c: 0x106849c: sll   zero, zero, 0
+// 0x010684a0: 0x10684a0: beq   v0, zero, 0x106853c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_106852c
+	brfalse L_106853c
 // --- basic block ---
-// 0x01068498: 0x1068498: beq   a1, zero, 0x10684a4 sll   zero, zero, 0
+// 0x010684a8: 0x10684a8: beq   a1, zero, 0x10684b4 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_10684a4
+	brfalse L_10684b4
 // --- basic block ---
-// 0x010684a0: 0x10684a0: sb    zero, 0(a1)
+// 0x010684b0: 0x10684b0: sb    zero, 0(a1)
 	ldloc.2
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10684a4:
-// 0x010684a4: 0x10684a4: addu  s2, a0, zero
+L_10684b4:
+// 0x010684b4: 0x10684b4: addu  s2, a0, zero
 	ldloc.1
 	stloc 7
-// 0x010684a8: 0x10684a8: addu  s4, s0, zero
+// 0x010684b8: 0x10684b8: addu  s4, s0, zero
 	ldloc 13
 	stloc 10
-// 0x010684ac: 0x10684ac: j	 0x10684e0 addu  s3, zero, zero
+// 0x010684bc: 0x10684bc: j	 0x10684f0 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 9
-	br L_10684e0
+	br L_10684f0
 // --- basic block ---
-L_10684b4:
-// 0x010684b4: 0x10684b4: lw    v0, 0(s1)
+L_10684c4:
+// 0x010684c4: 0x10684c4: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010684b8: 0x10684b8: addiu s3, s3, 1
+// 0x010684c8: 0x10684c8: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x010684bc: 0x10684bc: slt   v0, s3, v0
+// 0x010684cc: 0x10684cc: slt   v0, s3, v0
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x010684c0: 0x10684c0: beq   v0, zero, 0x1068530 addu  s5, zero, zero
+// 0x010684d0: 0x10684d0: beq   v0, zero, 0x1068540 addu  s5, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 11
-	brfalse L_1068530
+	brfalse L_1068540
 // --- basic block ---
-// 0x010684c8: 0x10684c8: beq   s0, zero, 0x10684d8 sll   zero, zero, 0
+// 0x010684d8: 0x10684d8: beq   s0, zero, 0x10684e8 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_10684d8
+	brfalse L_10684e8
 // --- basic block ---
-// 0x010684d0: 0x10684d0: sb    s6, 0(s4)
+// 0x010684e0: 0x10684e0: sb    s6, 0(s4)
 	ldloc 10
 	ldloc 12
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010684d4: 0x10684d4: sb    zero, 1(s4)
+// 0x010684e4: 0x10684e4: sb    zero, 1(s4)
 	ldloc 10
 	ldc.i4.1
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_10684d8:
-// 0x010684d8: 0x10684d8: addiu s2, s2, 1
+L_10684e8:
+// 0x010684e8: 0x10684e8: addiu s2, s2, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x010684dc: 0x10684dc: addiu s4, s4, 1
+// 0x010684ec: 0x10684ec: addiu s4, s4, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_10684e0:
-// 0x010684e0: 0x10684e0: lb    s6, 0(s2)
+L_10684f0:
+// 0x010684f0: 0x10684f0: lb    s6, 0(s2)
 	ldloc 7
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 12
-// 0x010684e4: 0x10684e4: addu  a0, a3, zero
+// 0x010684f4: 0x10684f4: addu  a0, a3, zero
 	ldloc 4
 	stloc.1
-// 0x010684e8: 0x10684e8: addu  a1, s6, zero
+// 0x010684f8: 0x10684f8: addu  a1, s6, zero
 	ldloc 12
 	stloc.2
-// 0x010684ec: 0x10684ec: beq   s6, zero, 0x1068510 addu  s5, s2, zero
+// 0x010684fc: 0x10684fc: beq   s6, zero, 0x1068520 addu  s5, s2, zero
 	ldloc 12
 	ldloc 7
 	stloc 11
-	brfalse L_1068510
+	brfalse L_1068520
 // --- basic block ---
-// 0x010684f4: 0x10684f4: sw    a2, 20(sp)
+// 0x01068504: 0x1068504: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2988,7 +2988,7 @@ L_10684e0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010684f8: 0x10684f8: jal   0x1001a5c sw    a3, 16(sp)
+// 0x01068508: 0x1068508: jal   0x1001a5c sw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3004,7 +3004,7 @@ L_10684e0:
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x01068500: 0x1068500: lw    a2, 20(sp)
+// 0x01068510: 0x1068510: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3013,7 +3013,7 @@ L_10684e0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01068504: 0x1068504: lw    a3, 16(sp)
+// 0x01068514: 0x1068514: lw    a3, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3022,12 +3022,12 @@ L_10684e0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01068508: 0x1068508: beq   v0, zero, 0x10684b4 sll   zero, zero, 0
+// 0x01068518: 0x1068518: beq   v0, zero, 0x10684c4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_10684b4
+	brfalse L_10684c4
 // --- basic block ---
-L_1068510:
-// 0x01068510: 0x1068510: beq   a2, zero, 0x1068530 sw    s3, 0(s1)
+L_1068520:
+// 0x01068520: 0x1068520: beq   a2, zero, 0x1068540 sw    s3, 0(s1)
 	ldloc.3
 	ldloc 5
 	ldloc 8
@@ -3035,12 +3035,12 @@ L_1068510:
 	shr.un
 	ldloc 9
 	stelem.i4
-	brfalse L_1068530
+	brfalse L_1068540
 // --- basic block ---
-// 0x01068518: 0x1068518: addu  a0, s2, zero
+// 0x01068528: 0x1068528: addu  a0, s2, zero
 	ldloc 7
 	stloc.1
-// 0x0106851c: 0x106851c: jal   0x10681a8 addu  a1, a3, zero
+// 0x0106852c: 0x106852c: jal   0x10681b8 addu  a1, a3, zero
 	ldloc 4
 	stloc.2
 	ldloc.0
@@ -3048,26 +3048,26 @@ L_1068510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 15
 	stloc 6
 // --- basic block ---
-// 0x01068524: 0x1068524: j	 0x1068530 addu  s5, v0, zero
+// 0x01068534: 0x1068534: j	 0x1068540 addu  s5, v0, zero
 	ldloc 6
 	stloc 11
-	br L_1068530
+	br L_1068540
 // --- basic block ---
-L_106852c:
-// 0x0106852c: 0x106852c: addu  s5, zero, zero
+L_106853c:
+// 0x0106853c: 0x106853c: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 11
-L_1068530:
-// 0x01068530: 0x1068530: lw    ra, 52(sp)
-// 0x01068534: 0x1068534: addu  v0, s5, zero
+L_1068540:
+// 0x01068540: 0x1068540: lw    ra, 52(sp)
+// 0x01068544: 0x1068544: addu  v0, s5, zero
 	ldloc 11
 	stloc 6
-// 0x01068538: 0x1068538: lw    s6, 48(sp)
+// 0x01068548: 0x1068548: lw    s6, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3076,7 +3076,7 @@ L_1068530:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0106853c: 0x106853c: lw    s5, 44(sp)
+// 0x0106854c: 0x106854c: lw    s5, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3085,7 +3085,7 @@ L_1068530:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01068540: 0x1068540: lw    s4, 40(sp)
+// 0x01068550: 0x1068550: lw    s4, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3094,7 +3094,7 @@ L_1068530:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01068544: 0x1068544: lw    s3, 36(sp)
+// 0x01068554: 0x1068554: lw    s3, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3103,7 +3103,7 @@ L_1068530:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01068548: 0x1068548: lw    s2, 32(sp)
+// 0x01068558: 0x1068558: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3112,7 +3112,7 @@ L_1068530:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106854c: 0x106854c: lw    s1, 28(sp)
+// 0x0106855c: 0x106855c: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3121,7 +3121,7 @@ L_1068530:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01068550: 0x1068550: lw    s0, 24(sp)
+// 0x01068560: 0x1068560: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3130,7 +3130,7 @@ L_1068530:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01068554: 0x1068554: jr    ra addiu sp, sp, 56
+// 0x01068564: 0x1068564: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3142,7 +3142,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+.method public static int32 ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 s0,int32 s3,int32 s4,int32 v1,int32 s1,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
@@ -3207,12 +3207,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106855c: 0x106855c: addiu sp, sp, -56
+// 0x0106856c: 0x106856c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01068560: 0x1068560: sw    s8, 48(sp)
+// 0x01068570: 0x1068570: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3221,7 +3221,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01068564: 0x1068564: sw    s7, 44(sp)
+// 0x01068574: 0x1068574: sw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3230,7 +3230,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01068568: 0x1068568: sw    s6, 40(sp)
+// 0x01068578: 0x1068578: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3239,7 +3239,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0106856c: 0x106856c: sw    s5, 36(sp)
+// 0x0106857c: 0x106857c: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3248,7 +3248,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01068570: 0x1068570: sw    s3, 28(sp)
+// 0x01068580: 0x1068580: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3257,7 +3257,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068574: 0x1068574: sw    s1, 20(sp)
+// 0x01068584: 0x1068584: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3266,7 +3266,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01068578: 0x1068578: sw    s0, 16(sp)
+// 0x01068588: 0x1068588: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3275,8 +3275,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0106857c: 0x106857c: sw    ra, 52(sp)
-// 0x01068580: 0x1068580: sw    s4, 32(sp)
+// 0x0106858c: 0x106858c: sw    ra, 52(sp)
+// 0x01068590: 0x1068590: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3285,7 +3285,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01068584: 0x1068584: sw    s2, 24(sp)
+// 0x01068594: 0x1068594: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3294,28 +3294,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068588: 0x1068588: addu  s0, a3, zero
+// 0x01068598: 0x1068598: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x0106858c: 0x106858c: addu  s1, a1, zero
+// 0x0106859c: 0x106859c: addu  s1, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01068590: 0x1068590: addu  s7, a2, zero
+// 0x010685a0: 0x10685a0: addu  s7, a2, zero
 	ldloc.3
 	stloc 15
-// 0x01068594: 0x1068594: sw    zero, 0(a3)
+// 0x010685a4: 0x10685a4: sw    zero, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068598: 0x1068598: addiu s3, a0, 1
+// 0x010685a8: 0x10685a8: addiu s3, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0106859c: 0x106859c: lw    s5, 72(sp)
+// 0x010685ac: 0x10685ac: lw    s5, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3324,103 +3324,103 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010685a0: 0x10685a0: addu  s6, zero, zero
+// 0x010685b0: 0x10685b0: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 14
-// 0x010685a4: 0x10685a4: j	 0x1068634 addiu s8, zero, 10
+// 0x010685b4: 0x10685b4: j	 0x1068644 addiu s8, zero, 10
 	ldc.i4.s 10
 	stloc 16
-	br L_1068634
+	br L_1068644
 // --- basic block ---
-L_10685ac:
-// 0x010685ac: 0x10685ac: slti  v0, s2, 48
+L_10685bc:
+// 0x010685bc: 0x10685bc: slti  v0, s2, 48
 	ldloc 7
 	ldc.i4.s 48
 	clt
 	stloc 6
-// 0x010685b0: 0x10685b0: bne   v0, zero, 0x10685f0 addiu v0, zero, 45
+// 0x010685c0: 0x10685c0: bne   v0, zero, 0x1068600 addiu v0, zero, 45
 	ldloc 6
 	ldc.i4.s 45
 	stloc 6
-	brtrue L_10685f0
+	brtrue L_1068600
 // --- basic block ---
-// 0x010685b8: 0x10685b8: slti  v0, s2, 58
+// 0x010685c8: 0x10685c8: slti  v0, s2, 58
 	ldloc 7
 	ldc.i4.s 58
 	clt
 	stloc 6
-// 0x010685bc: 0x10685bc: beq   v0, zero, 0x1068600 sll   zero, zero, 0
+// 0x010685cc: 0x10685cc: beq   v0, zero, 0x1068610 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068600
+	brfalse L_1068610
 // --- basic block ---
-// 0x010685c4: 0x10685c4: lw    v0, 0(s0)
+// 0x010685d4: 0x10685d4: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x010685c8: 0x10685c8: sll   zero, zero, 0
-// 0x010685cc: 0x10685cc: mult  v0, s8
+// 0x010685d8: 0x10685d8: sll   zero, zero, 0
+// 0x010685dc: 0x10685dc: mult  v0, s8
 	ldloc 6
 	ldloc 16
 	mul
 	stloc 18
-// 0x010685d0: 0x10685d0: mflo  lo
+// 0x010685e0: 0x10685e0: mflo  lo
 	ldloc 18
 	stloc 6
-// 0x010685d4: 0x10685d4: sw    v0, 0(s0)
+// 0x010685e4: 0x10685e4: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x010685d8: 0x10685d8: lb    v1, -1(s3)
+// 0x010685e8: 0x10685e8: lb    v1, -1(s3)
 	ldloc 9
 	ldc.i4.m1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 11
-// 0x010685dc: 0x10685dc: sll   zero, zero, 0
-// 0x010685e0: 0x10685e0: addiu v1, v1, -48
+// 0x010685ec: 0x10685ec: sll   zero, zero, 0
+// 0x010685f0: 0x10685f0: addiu v1, v1, -48
 	ldloc 11
 	ldc.i4.s -48
 	add
 	stloc 11
-// 0x010685e4: 0x10685e4: addu  v0, v1, v0
+// 0x010685f4: 0x10685f4: addu  v0, v1, v0
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x010685e8: 0x10685e8: j	 0x1068630 sw    v0, 0(s0)
+// 0x010685f8: 0x10685f8: j	 0x1068640 sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-	br L_1068630
+	br L_1068640
 // --- basic block ---
-L_10685f0:
-// 0x010685f0: 0x10685f0: bne   s2, v0, 0x1068600 sll   zero, zero, 0
+L_1068600:
+// 0x01068600: 0x1068600: bne   s2, v0, 0x1068610 sll   zero, zero, 0
 	ldloc 7
 	ldloc 6
-	bne.un L_1068600
+	bne.un L_1068610
 // --- basic block ---
-// 0x010685f8: 0x10685f8: j	 0x1068630 addiu s6, zero, 1
+// 0x01068608: 0x1068608: j	 0x1068640 addiu s6, zero, 1
 	ldc.i4.1
 	stloc 14
-	br L_1068630
+	br L_1068640
 // --- basic block ---
-L_1068600:
-// 0x01068600: 0x1068600: beq   s1, zero, 0x1068618 addu  a0, s1, zero
+L_1068610:
+// 0x01068610: 0x1068610: beq   s1, zero, 0x1068628 addu  a0, s1, zero
 	ldloc 12
 	ldloc 12
 	stloc.1
-	brfalse L_1068618
+	brfalse L_1068628
 // --- basic block ---
-// 0x01068608: 0x1068608: jal   0x1001a5c addu  a1, s2, zero
+// 0x01068618: 0x1068618: jal   0x1001a5c addu  a1, s2, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -3430,18 +3430,18 @@ L_1068600:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01068610: 0x1068610: bne   v0, zero, 0x1068644 sll   zero, zero, 0
+// 0x01068620: 0x1068620: bne   v0, zero, 0x1068654 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1068644
+	brtrue L_1068654
 // --- basic block ---
-L_1068618:
-// 0x01068618: 0x1068618: beq   s7, zero, 0x1068680 addu  a1, s2, zero
+L_1068628:
+// 0x01068628: 0x1068628: beq   s7, zero, 0x1068690 addu  a1, s2, zero
 	ldloc 15
 	ldloc 7
 	stloc.2
-	brfalse L_1068680
+	brfalse L_1068690
 // --- basic block ---
-// 0x01068620: 0x1068620: jal   0x1001a5c addu  a0, s7, zero
+// 0x01068630: 0x1068630: jal   0x1001a5c addu  a0, s7, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
@@ -3451,73 +3451,73 @@ L_1068618:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01068628: 0x1068628: beq   v0, zero, 0x1068684 addu  s4, zero, zero
+// 0x01068638: 0x1068638: beq   v0, zero, 0x1068694 addu  s4, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_1068684
+	brfalse L_1068694
 // --- basic block ---
-L_1068630:
-// 0x01068630: 0x1068630: addiu s3, s3, 1
+L_1068640:
+// 0x01068640: 0x1068640: addiu s3, s3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1068634:
-// 0x01068634: 0x1068634: lb    s2, -1(s3)
+L_1068644:
+// 0x01068644: 0x1068644: lb    s2, -1(s3)
 	ldloc 9
 	ldc.i4.m1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01068638: 0x1068638: sll   zero, zero, 0
-// 0x0106863c: 0x106863c: bne   s2, zero, 0x10685ac addiu s4, s3, -1
+// 0x01068648: 0x1068648: sll   zero, zero, 0
+// 0x0106864c: 0x106864c: bne   s2, zero, 0x10685bc addiu s4, s3, -1
 	ldloc 7
 	ldloc 9
 	ldc.i4.m1
 	add
 	stloc 10
-	brtrue L_10685ac
+	brtrue L_10685bc
 // --- basic block ---
-L_1068644:
-// 0x01068644: 0x1068644: beq   s6, zero, 0x106865c sll   zero, zero, 0
+L_1068654:
+// 0x01068654: 0x1068654: beq   s6, zero, 0x106866c sll   zero, zero, 0
 	ldloc 14
-	brfalse L_106865c
+	brfalse L_106866c
 // --- basic block ---
-// 0x0106864c: 0x106864c: lw    v0, 0(s0)
+// 0x0106865c: 0x106865c: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01068650: 0x1068650: sll   zero, zero, 0
-// 0x01068654: 0x1068654: subu  v0, zero, v0
+// 0x01068660: 0x1068660: sll   zero, zero, 0
+// 0x01068664: 0x1068664: subu  v0, zero, v0
 	ldloc 6
 	neg
 	stloc 6
-// 0x01068658: 0x1068658: sw    v0, 0(s0)
+// 0x01068668: 0x1068668: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_106865c:
-// 0x0106865c: 0x106865c: beq   s1, zero, 0x1068684 sll   zero, zero, 0
+L_106866c:
+// 0x0106866c: 0x106866c: beq   s1, zero, 0x1068694 sll   zero, zero, 0
 	ldloc 12
-	brfalse L_1068684
+	brfalse L_1068694
 // --- basic block ---
-// 0x01068664: 0x1068664: beq   s5, zero, 0x1068684 addu  a0, s4, zero
+// 0x01068674: 0x1068674: beq   s5, zero, 0x1068694 addu  a0, s4, zero
 	ldloc 13
 	ldloc 10
 	stloc.1
-	brfalse L_1068684
+	brfalse L_1068694
 // --- basic block ---
-// 0x0106866c: 0x106866c: addu  a1, s1, zero
+// 0x0106867c: 0x106867c: addu  a1, s1, zero
 	ldloc 12
 	stloc.2
-// 0x01068670: 0x1068670: jal   0x10681a8 addu  a2, s5, zero
+// 0x01068680: 0x1068680: jal   0x10681b8 addu  a2, s5, zero
 	ldloc 13
 	stloc.3
 	ldloc.0
@@ -3525,26 +3525,26 @@ L_106865c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x01068678: 0x1068678: j	 0x1068684 addu  s4, v0, zero
+// 0x01068688: 0x1068688: j	 0x1068694 addu  s4, v0, zero
 	ldloc 6
 	stloc 10
-	br L_1068684
+	br L_1068694
 // --- basic block ---
-L_1068680:
-// 0x01068680: 0x1068680: addu  s4, zero, zero
+L_1068690:
+// 0x01068690: 0x1068690: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 10
-L_1068684:
-// 0x01068684: 0x1068684: lw    ra, 52(sp)
-// 0x01068688: 0x1068688: addu  v0, s4, zero
+L_1068694:
+// 0x01068694: 0x1068694: lw    ra, 52(sp)
+// 0x01068698: 0x1068698: addu  v0, s4, zero
 	ldloc 10
 	stloc 6
-// 0x0106868c: 0x106868c: lw    s8, 48(sp)
+// 0x0106869c: 0x106869c: lw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3553,7 +3553,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01068690: 0x1068690: lw    s7, 44(sp)
+// 0x010686a0: 0x10686a0: lw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3562,7 +3562,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01068694: 0x1068694: lw    s6, 40(sp)
+// 0x010686a4: 0x10686a4: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3571,7 +3571,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01068698: 0x1068698: lw    s5, 36(sp)
+// 0x010686a8: 0x10686a8: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3580,7 +3580,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0106869c: 0x106869c: lw    s4, 32(sp)
+// 0x010686ac: 0x10686ac: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3589,7 +3589,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010686a0: 0x10686a0: lw    s3, 28(sp)
+// 0x010686b0: 0x10686b0: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3598,7 +3598,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010686a4: 0x10686a4: lw    s2, 24(sp)
+// 0x010686b4: 0x10686b4: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3607,7 +3607,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010686a8: 0x10686a8: lw    s1, 20(sp)
+// 0x010686b8: 0x10686b8: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3616,7 +3616,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010686ac: 0x10686ac: lw    s0, 16(sp)
+// 0x010686bc: 0x10686bc: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3625,7 +3625,7 @@ L_1068684:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010686b0: 0x10686b0: jr    ra addiu sp, sp, 56
+// 0x010686c0: 0x10686c0: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3637,7 +3637,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ReadInt64FromString_10686b8(int32,int32,int32,int32,int32)
+.method public static int32 ReadInt64FromString_10686c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 lo,int32 ra,int32 hi)
@@ -3705,18 +3705,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010686b8: 0x10686b8: addiu sp, sp, -56
+// 0x010686c8: 0x10686c8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010686bc: 0x10686bc: addu  v1, zero, zero
+// 0x010686cc: 0x10686cc: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010686c0: 0x10686c0: addu  v0, zero, zero
+// 0x010686d0: 0x10686d0: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x010686c4: 0x10686c4: sw    s8, 48(sp)
+// 0x010686d4: 0x10686d4: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3725,7 +3725,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010686c8: 0x10686c8: sw    s7, 44(sp)
+// 0x010686d8: 0x10686d8: sw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3734,7 +3734,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010686cc: 0x10686cc: sw    s6, 40(sp)
+// 0x010686dc: 0x10686dc: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3743,7 +3743,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010686d0: 0x10686d0: sw    s5, 36(sp)
+// 0x010686e0: 0x10686e0: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3752,7 +3752,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x010686d4: 0x10686d4: sw    s4, 32(sp)
+// 0x010686e4: 0x10686e4: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3761,7 +3761,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010686d8: 0x10686d8: sw    s2, 24(sp)
+// 0x010686e8: 0x10686e8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3770,7 +3770,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010686dc: 0x10686dc: sw    s1, 20(sp)
+// 0x010686ec: 0x10686ec: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3779,7 +3779,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010686e0: 0x10686e0: sw    s0, 16(sp)
+// 0x010686f0: 0x10686f0: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3788,8 +3788,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010686e4: 0x10686e4: sw    ra, 52(sp)
-// 0x010686e8: 0x10686e8: sw    s3, 28(sp)
+// 0x010686f4: 0x10686f4: sw    ra, 52(sp)
+// 0x010686f8: 0x10686f8: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3798,19 +3798,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010686ec: 0x10686ec: addu  s0, a3, zero
+// 0x010686fc: 0x10686fc: addu  s0, a3, zero
 	ldloc 4
 	stloc 8
-// 0x010686f0: 0x10686f0: addu  s1, a0, zero
+// 0x01068700: 0x1068700: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x010686f4: 0x10686f4: addu  s2, a1, zero
+// 0x01068704: 0x1068704: addu  s2, a1, zero
 	ldloc.2
 	stloc 11
-// 0x010686f8: 0x10686f8: addu  s7, a2, zero
+// 0x01068708: 0x1068708: addu  s7, a2, zero
 	ldloc.3
 	stloc 15
-// 0x010686fc: 0x10686fc: sw    v1, 4(a3)
+// 0x0106870c: 0x106870c: sw    v1, 4(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
@@ -3819,14 +3819,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068700: 0x1068700: sw    v0, 0(a3)
+// 0x01068710: 0x1068710: sw    v0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01068704: 0x1068704: lw    s4, 72(sp)
+// 0x01068714: 0x1068714: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3835,40 +3835,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01068708: 0x1068708: addu  s5, zero, zero
+// 0x01068718: 0x1068718: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x0106870c: 0x106870c: addiu s8, zero, 45
+// 0x0106871c: 0x106871c: addiu s8, zero, 45
 	ldc.i4.s 45
 	stloc 16
-// 0x01068710: 0x1068710: j	 0x10687b0 addiu s6, zero, 10
+// 0x01068720: 0x1068720: j	 0x10687c0 addiu s6, zero, 10
 	ldc.i4.s 10
 	stloc 14
-	br L_10687b0
+	br L_10687c0
 // --- basic block ---
-L_1068718:
-// 0x01068718: 0x1068718: andi  v0, v0, 255
+L_1068728:
+// 0x01068728: 0x1068728: andi  v0, v0, 255
 	ldloc 6
 	ldc.i4 255
 	and
 	stloc 6
-// 0x0106871c: 0x106871c: sltiu v0, v0, 10
+// 0x0106872c: 0x106872c: sltiu v0, v0, 10
 	ldloc 6
 	ldc.i4.s 10
 	clt.un
 	stloc 6
-// 0x01068720: 0x1068720: beq   v0, zero, 0x1068784 sll   zero, zero, 0
+// 0x01068730: 0x1068730: beq   v0, zero, 0x1068794 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068784
+	brfalse L_1068794
 // --- basic block ---
-// 0x01068728: 0x1068728: lw    v1, 0(s0)
+// 0x01068738: 0x1068738: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0106872c: 0x106872c: lw    v0, 4(s0)
+// 0x0106873c: 0x106873c: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3877,40 +3877,40 @@ L_1068718:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01068730: 0x1068730: mult  v1, s6
+// 0x01068740: 0x1068740: mult  v1, s6
 	ldloc 7
 	ldloc 14
 	mul
 	stloc 17
-// 0x01068734: 0x1068734: mflo  lo
+// 0x01068744: 0x1068744: mflo  lo
 	ldloc 17
 	stloc.2
-// 0x01068738: 0x1068738: sll   zero, zero, 0
-// 0x0106873c: 0x106873c: sll   zero, zero, 0
-// 0x01068740: 0x1068740: multu v0, s6
+// 0x01068748: 0x1068748: sll   zero, zero, 0
+// 0x0106874c: 0x106874c: sll   zero, zero, 0
+// 0x01068750: 0x1068750: multu v0, s6
 	ldloc 6
 	ldloc 14
 	mul.ovf.un
 	stloc 17
-// 0x01068744: 0x1068744: mfhi  hi
+// 0x01068754: 0x1068754: mfhi  hi
 	ldloc 19
 	stloc 6
-// 0x01068748: 0x1068748: addu  v0, a1, v0
+// 0x01068758: 0x1068758: addu  v0, a1, v0
 	ldloc.2
 	ldloc 6
 	add
 	stloc 6
-// 0x0106874c: 0x106874c: sw    v0, 0(s0)
+// 0x0106875c: 0x106875c: sw    v0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x01068750: 0x1068750: mflo  lo
+// 0x01068760: 0x1068760: mflo  lo
 	ldloc 17
 	stloc 7
-// 0x01068754: 0x1068754: sw    v1, 4(s0)
+// 0x01068764: 0x1068764: sw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3919,49 +3919,49 @@ L_1068718:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068758: 0x1068758: lb    a1, 0(s1)
+// 0x01068768: 0x1068768: lb    a1, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.2
-// 0x0106875c: 0x106875c: sll   zero, zero, 0
-// 0x01068760: 0x1068760: addiu a1, a1, -48
+// 0x0106876c: 0x106876c: sll   zero, zero, 0
+// 0x01068770: 0x1068770: addiu a1, a1, -48
 	ldloc.2
 	ldc.i4.s -48
 	add
 	stloc.2
-// 0x01068764: 0x1068764: addu  a0, v1, a1
+// 0x01068774: 0x1068774: addu  a0, v1, a1
 	ldloc 7
 	ldloc.2
 	add
 	stloc.1
-// 0x01068768: 0x1068768: sra   a1, a1, 31
+// 0x01068778: 0x1068778: sra   a1, a1, 31
 	ldloc.2
 	ldc.i4.s 31
 	shr
 	stloc.2
-// 0x0106876c: 0x106876c: addu  a1, v0, a1
+// 0x0106877c: 0x106877c: addu  a1, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc.2
-// 0x01068770: 0x1068770: sltu  v0, a0, v1
+// 0x01068780: 0x1068780: sltu  v0, a0, v1
 	ldloc.1
 	ldloc 7
 	clt.un
 	stloc 6
-// 0x01068774: 0x1068774: addu  a1, v0, a1
+// 0x01068784: 0x1068784: addu  a1, v0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc.2
-// 0x01068778: 0x1068778: sw    a1, 0(s0)
+// 0x01068788: 0x1068788: sw    a1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0106877c: 0x106877c: j	 0x10687ac sw    a0, 4(s0)
+// 0x0106878c: 0x106878c: j	 0x10687bc sw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3970,29 +3970,29 @@ L_1068718:
 	add
 	ldloc.1
 	stelem.i4
-	br L_10687ac
+	br L_10687bc
 // --- basic block ---
-L_1068784:
-// 0x01068784: 0x1068784: bne   s3, s8, 0x1068794 addu  a1, s3, zero
+L_1068794:
+// 0x01068794: 0x1068794: bne   s3, s8, 0x10687a4 addu  a1, s3, zero
 	ldloc 10
 	ldloc 16
 	ldloc 10
 	stloc.2
-	bne.un L_1068794
+	bne.un L_10687a4
 // --- basic block ---
-// 0x0106878c: 0x106878c: j	 0x10687ac addiu s5, zero, 1
+// 0x0106879c: 0x106879c: j	 0x10687bc addiu s5, zero, 1
 	ldc.i4.1
 	stloc 13
-	br L_10687ac
+	br L_10687bc
 // --- basic block ---
-L_1068794:
-// 0x01068794: 0x1068794: beq   s7, zero, 0x1068824 addu  a0, s7, zero
+L_10687a4:
+// 0x010687a4: 0x10687a4: beq   s7, zero, 0x1068834 addu  a0, s7, zero
 	ldloc 15
 	ldloc 15
 	stloc.1
-	brfalse L_1068824
+	brfalse L_1068834
 // --- basic block ---
-// 0x0106879c: 0x106879c: jal   0x1001a5c sll   zero, zero, 0
+// 0x010687ac: 0x10687ac: jal   0x1001a5c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strchr_1001a5c(int32,int32)
@@ -4000,39 +4000,39 @@ L_1068794:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010687a4: 0x10687a4: beq   v0, zero, 0x1068824 sll   zero, zero, 0
+// 0x010687b4: 0x10687b4: beq   v0, zero, 0x1068834 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068824
+	brfalse L_1068834
 // --- basic block ---
-L_10687ac:
-// 0x010687ac: 0x10687ac: addiu s1, s1, 1
+L_10687bc:
+// 0x010687bc: 0x10687bc: addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_10687b0:
-// 0x010687b0: 0x10687b0: lb    s3, 0(s1)
+L_10687c0:
+// 0x010687c0: 0x10687c0: lb    s3, 0(s1)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 10
-// 0x010687b4: 0x10687b4: addu  a0, s2, zero
+// 0x010687c4: 0x10687c4: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010687b8: 0x10687b8: beq   s3, zero, 0x10687d8 addu  a1, s3, zero
+// 0x010687c8: 0x10687c8: beq   s3, zero, 0x10687e8 addu  a1, s3, zero
 	ldloc 10
 	ldloc 10
 	stloc.2
-	brfalse L_10687d8
+	brfalse L_10687e8
 // --- basic block ---
-// 0x010687c0: 0x10687c0: beq   s2, zero, 0x1068718 addiu v0, s3, -48
+// 0x010687d0: 0x10687d0: beq   s2, zero, 0x1068728 addiu v0, s3, -48
 	ldloc 11
 	ldloc 10
 	ldc.i4.s -48
 	add
 	stloc 6
-	brfalse L_1068718
+	brfalse L_1068728
 // --- basic block ---
-// 0x010687c8: 0x10687c8: jal   0x1001a5c sll   zero, zero, 0
+// 0x010687d8: 0x10687d8: jal   0x1001a5c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strchr_1001a5c(int32,int32)
@@ -4040,20 +4040,20 @@ L_10687b0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010687d0: 0x10687d0: beq   v0, zero, 0x1068718 addiu v0, s3, -48
+// 0x010687e0: 0x10687e0: beq   v0, zero, 0x1068728 addiu v0, s3, -48
 	ldloc 6
 	ldloc 10
 	ldc.i4.s -48
 	add
 	stloc 6
-	brfalse L_1068718
+	brfalse L_1068728
 // --- basic block ---
-L_10687d8:
-// 0x010687d8: 0x10687d8: beq   s5, zero, 0x1068800 sll   zero, zero, 0
+L_10687e8:
+// 0x010687e8: 0x10687e8: beq   s5, zero, 0x1068810 sll   zero, zero, 0
 	ldloc 13
-	brfalse L_1068800
+	brfalse L_1068810
 // --- basic block ---
-// 0x010687e0: 0x10687e0: lw    v0, 4(s0)
+// 0x010687f0: 0x10687f0: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4062,32 +4062,32 @@ L_10687d8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010687e4: 0x10687e4: lw    v1, 0(s0)
+// 0x010687f4: 0x10687f4: lw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010687e8: 0x10687e8: subu  v0, zero, v0
+// 0x010687f8: 0x10687f8: subu  v0, zero, v0
 	ldloc 6
 	neg
 	stloc 6
-// 0x010687ec: 0x10687ec: subu  v1, zero, v1
+// 0x010687fc: 0x10687fc: subu  v1, zero, v1
 	ldloc 7
 	neg
 	stloc 7
-// 0x010687f0: 0x10687f0: sltu  a0, zero, v0
+// 0x01068800: 0x1068800: sltu  a0, zero, v0
 	ldc.i4.s 0
 	ldloc 6
 	clt.un
 	stloc.1
-// 0x010687f4: 0x10687f4: subu  v1, v1, a0
+// 0x01068804: 0x1068804: subu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	sub
 	stloc 7
-// 0x010687f8: 0x10687f8: sw    v0, 4(s0)
+// 0x01068808: 0x1068808: sw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4096,28 +4096,28 @@ L_10687d8:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010687fc: 0x10687fc: sw    v1, 0(s0)
+// 0x0106880c: 0x106880c: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_1068800:
-// 0x01068800: 0x1068800: beq   s2, zero, 0x1068828 sll   zero, zero, 0
+L_1068810:
+// 0x01068810: 0x1068810: beq   s2, zero, 0x1068838 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_1068828
+	brfalse L_1068838
 // --- basic block ---
-// 0x01068808: 0x1068808: beq   s4, zero, 0x1068828 addu  a0, s1, zero
+// 0x01068818: 0x1068818: beq   s4, zero, 0x1068838 addu  a0, s1, zero
 	ldloc 12
 	ldloc 9
 	stloc.1
-	brfalse L_1068828
+	brfalse L_1068838
 // --- basic block ---
-// 0x01068810: 0x1068810: addu  a1, s2, zero
+// 0x01068820: 0x1068820: addu  a1, s2, zero
 	ldloc 11
 	stloc.2
-// 0x01068814: 0x1068814: jal   0x10681a8 addu  a2, s4, zero
+// 0x01068824: 0x1068824: jal   0x10681b8 addu  a2, s4, zero
 	ldloc 12
 	stloc.3
 	ldloc.0
@@ -4125,26 +4125,26 @@ L_1068800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106881c: 0x106881c: j	 0x1068828 addu  s1, v0, zero
+// 0x0106882c: 0x106882c: j	 0x1068838 addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-	br L_1068828
+	br L_1068838
 // --- basic block ---
-L_1068824:
-// 0x01068824: 0x1068824: addu  s1, zero, zero
+L_1068834:
+// 0x01068834: 0x1068834: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-L_1068828:
-// 0x01068828: 0x1068828: lw    ra, 52(sp)
-// 0x0106882c: 0x106882c: addu  v0, s1, zero
+L_1068838:
+// 0x01068838: 0x1068838: lw    ra, 52(sp)
+// 0x0106883c: 0x106883c: addu  v0, s1, zero
 	ldloc 9
 	stloc 6
-// 0x01068830: 0x1068830: lw    s8, 48(sp)
+// 0x01068840: 0x1068840: lw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4153,7 +4153,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01068834: 0x1068834: lw    s7, 44(sp)
+// 0x01068844: 0x1068844: lw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4162,7 +4162,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01068838: 0x1068838: lw    s6, 40(sp)
+// 0x01068848: 0x1068848: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4171,7 +4171,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0106883c: 0x106883c: lw    s5, 36(sp)
+// 0x0106884c: 0x106884c: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4180,7 +4180,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01068840: 0x1068840: lw    s4, 32(sp)
+// 0x01068850: 0x1068850: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4189,7 +4189,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01068844: 0x1068844: lw    s3, 28(sp)
+// 0x01068854: 0x1068854: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4198,7 +4198,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01068848: 0x1068848: lw    s2, 24(sp)
+// 0x01068858: 0x1068858: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4207,7 +4207,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0106884c: 0x106884c: lw    s1, 20(sp)
+// 0x0106885c: 0x106885c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4216,7 +4216,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01068850: 0x1068850: lw    s0, 16(sp)
+// 0x01068860: 0x1068860: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4225,7 +4225,7 @@ L_1068828:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01068854: 0x1068854: jr    ra addiu sp, sp, 56
+// 0x01068864: 0x1068864: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4237,7 +4237,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 ReadDoubleFromString_106885c(int32,int32,int32,int32,int32)
+.method public static int32 ReadDoubleFromString_106886c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s7,int32 s8,int32 s0,int32 v1,int32 s1,int32 s4,int32 s6,int32 s2,int32 s3,int32 s5,int32 ra)
@@ -4299,12 +4299,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106885c: 0x106885c: addiu sp, sp, -88
+// 0x0106886c: 0x106886c: addiu sp, sp, -88
 	ldloc.0
 	ldc.i4.s -88
 	add
 	stloc.0
-// 0x01068860: 0x1068860: sw    s6, 72(sp)
+// 0x01068870: 0x1068870: sw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4313,12 +4313,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01068864: 0x1068864: addiu s6, sp, 16
+// 0x01068874: 0x1068874: addiu s6, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 13
-// 0x01068868: 0x1068868: sw    s5, 68(sp)
+// 0x01068878: 0x1068878: sw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4327,7 +4327,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0106886c: 0x106886c: sw    s1, 52(sp)
+// 0x0106887c: 0x106887c: sw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4336,7 +4336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01068870: 0x1068870: sw    s0, 48(sp)
+// 0x01068880: 0x1068880: sw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4345,16 +4345,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068874: 0x1068874: addu  s1, a1, zero
+// 0x01068884: 0x1068884: addu  s1, a1, zero
 	ldloc.2
 	stloc 11
-// 0x01068878: 0x1068878: addu  s0, a0, zero
+// 0x01068888: 0x1068888: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0106887c: 0x106887c: addu  s5, a2, zero
+// 0x0106888c: 0x106888c: addu  s5, a2, zero
 	ldloc.3
 	stloc 16
-// 0x01068880: 0x1068880: sw    zero, 4(a3)
+// 0x01068890: 0x1068890: sw    zero, 4(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4363,23 +4363,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068884: 0x1068884: sw    zero, 0(a3)
+// 0x01068894: 0x1068894: sw    zero, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068888: 0x1068888: addu  a0, s6, zero
+// 0x01068898: 0x1068898: addu  a0, s6, zero
 	ldloc 13
 	stloc.1
-// 0x0106888c: 0x106888c: addu  a1, zero, zero
+// 0x0106889c: 0x106889c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01068890: 0x1068890: addiu a2, zero, 32
+// 0x010688a0: 0x10688a0: addiu a2, zero, 32
 	ldc.i4.s 32
 	stloc.3
-// 0x01068894: 0x1068894: sw    s8, 80(sp)
+// 0x010688a4: 0x10688a4: sw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4388,7 +4388,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01068898: 0x1068898: sw    s3, 60(sp)
+// 0x010688a8: 0x10688a8: sw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4397,7 +4397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0106889c: 0x106889c: sw    s2, 56(sp)
+// 0x010688ac: 0x10688ac: sw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4406,8 +4406,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x010688a0: 0x10688a0: sw    ra, 84(sp)
-// 0x010688a4: 0x10688a4: sw    s7, 76(sp)
+// 0x010688b0: 0x10688b0: sw    ra, 84(sp)
+// 0x010688b4: 0x10688b4: sw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4416,7 +4416,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010688a8: 0x10688a8: sw    s4, 64(sp)
+// 0x010688b8: 0x10688b8: sw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4425,10 +4425,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x010688ac: 0x10688ac: addu  s3, a3, zero
+// 0x010688bc: 0x10688bc: addu  s3, a3, zero
 	ldloc 4
 	stloc 15
-// 0x010688b0: 0x10688b0: lw    s2, 104(sp)
+// 0x010688c0: 0x10688c0: lw    s2, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4437,7 +4437,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010688b4: 0x10688b4: jal   0x100177c addu  s8, zero, zero
+// 0x010688c4: 0x10688c4: jal   0x100177c addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 8
 	ldloc.1
@@ -4449,77 +4449,77 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x010688bc: 0x10688bc: j	 0x1068920 sll   zero, zero, 0
-	br L_1068920
+// 0x010688cc: 0x10688cc: j	 0x1068930 sll   zero, zero, 0
+	br L_1068930
 // --- basic block ---
-L_10688c4:
-// 0x010688c4: 0x10688c4: addiu v0, zero, 32
+L_10688d4:
+// 0x010688d4: 0x10688d4: addiu v0, zero, 32
 	ldc.i4.s 32
 	stloc 5
-L_10688c8:
-// 0x010688c8: 0x10688c8: beq   s8, v0, 0x1068988 addiu v0, s7, -48
+L_10688d8:
+// 0x010688d8: 0x10688d8: beq   s8, v0, 0x1068998 addiu v0, s7, -48
 	ldloc 8
 	ldloc 5
 	ldloc 7
 	ldc.i4.s -48
 	add
 	stloc 5
-	beq  L_1068988
+	beq  L_1068998
 // --- basic block ---
-// 0x010688d0: 0x10688d0: andi  v0, v0, 255
+// 0x010688e0: 0x10688e0: andi  v0, v0, 255
 	ldloc 5
 	ldc.i4 255
 	and
 	stloc 5
-// 0x010688d4: 0x10688d4: sltiu v0, v0, 10
+// 0x010688e4: 0x10688e4: sltiu v0, v0, 10
 	ldloc 5
 	ldc.i4.s 10
 	clt.un
 	stloc 5
-// 0x010688d8: 0x10688d8: bne   v0, zero, 0x10688f8 addu  v0, s6, s8
+// 0x010688e8: 0x10688e8: bne   v0, zero, 0x1068908 addu  v0, s6, s8
 	ldloc 5
 	ldloc 13
 	ldloc 8
 	add
 	stloc 5
-	brtrue L_10688f8
+	brtrue L_1068908
 // --- basic block ---
-// 0x010688e0: 0x10688e0: addiu v0, zero, 46
+// 0x010688f0: 0x10688f0: addiu v0, zero, 46
 	ldc.i4.s 46
 	stloc 5
-// 0x010688e4: 0x10688e4: beq   s7, v0, 0x10688f4 addiu v0, zero, 45
+// 0x010688f4: 0x10688f4: beq   s7, v0, 0x1068904 addiu v0, zero, 45
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 45
 	stloc 5
-	beq  L_10688f4
+	beq  L_1068904
 // --- basic block ---
-// 0x010688ec: 0x10688ec: bne   s7, v0, 0x1068900 sll   zero, zero, 0
+// 0x010688fc: 0x10688fc: bne   s7, v0, 0x1068910 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1068900
+	bne.un L_1068910
 // --- basic block ---
-L_10688f4:
-// 0x010688f4: 0x10688f4: addu  v0, s6, s8
+L_1068904:
+// 0x01068904: 0x1068904: addu  v0, s6, s8
 	ldloc 13
 	ldloc 8
 	add
 	stloc 5
-L_10688f8:
-// 0x010688f8: 0x10688f8: j	 0x1068918 sb    s7, 0(v0)
+L_1068908:
+// 0x01068908: 0x1068908: j	 0x1068928 sb    s7, 0(v0)
 	ldloc 5
 	ldloc 7
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1068918
+	br L_1068928
 // --- basic block ---
-L_1068900:
-// 0x01068900: 0x1068900: beq   s5, zero, 0x1068988 addu  a1, s7, zero
+L_1068910:
+// 0x01068910: 0x1068910: beq   s5, zero, 0x1068998 addu  a1, s7, zero
 	ldloc 16
 	ldloc 7
 	stloc.2
-	brfalse L_1068988
+	brfalse L_1068998
 // --- basic block ---
-// 0x01068908: 0x1068908: jal   0x1001a5c addu  a0, s5, zero
+// 0x01068918: 0x1068918: jal   0x1001a5c addu  a0, s5, zero
 	ldloc 16
 	stloc.1
 	ldloc.1
@@ -4529,42 +4529,42 @@ L_1068900:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01068910: 0x1068910: beq   v0, zero, 0x106898c addu  s4, zero, zero
+// 0x01068920: 0x1068920: beq   v0, zero, 0x106899c addu  s4, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 12
-	brfalse L_106898c
+	brfalse L_106899c
 // --- basic block ---
-L_1068918:
-// 0x01068918: 0x1068918: addiu s8, s8, 1
+L_1068928:
+// 0x01068928: 0x1068928: addiu s8, s8, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x0106891c: 0x106891c: addiu s0, s0, 1
+// 0x0106892c: 0x106892c: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-L_1068920:
-// 0x01068920: 0x1068920: lb    s7, 0(s0)
+L_1068930:
+// 0x01068930: 0x1068930: lb    s7, 0(s0)
 	ldloc 9
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01068924: 0x1068924: sll   zero, zero, 0
-// 0x01068928: 0x1068928: beq   s7, zero, 0x1068948 addu  s4, s0, zero
+// 0x01068934: 0x1068934: sll   zero, zero, 0
+// 0x01068938: 0x1068938: beq   s7, zero, 0x1068958 addu  s4, s0, zero
 	ldloc 7
 	ldloc 9
 	stloc 12
-	brfalse L_1068948
+	brfalse L_1068958
 // --- basic block ---
-// 0x01068930: 0x1068930: beq   s1, zero, 0x10688c4 addu  a0, s1, zero
+// 0x01068940: 0x1068940: beq   s1, zero, 0x10688d4 addu  a0, s1, zero
 	ldloc 11
 	ldloc 11
 	stloc.1
-	brfalse L_10688c4
+	brfalse L_10688d4
 // --- basic block ---
-// 0x01068938: 0x1068938: jal   0x1001a5c addu  a1, s7, zero
+// 0x01068948: 0x1068948: jal   0x1001a5c addu  a1, s7, zero
 	ldloc 7
 	stloc.2
 	ldloc.1
@@ -4574,18 +4574,18 @@ L_1068920:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01068940: 0x1068940: beq   v0, zero, 0x10688c8 addiu v0, zero, 32
+// 0x01068950: 0x1068950: beq   v0, zero, 0x10688d8 addiu v0, zero, 32
 	ldloc 5
 	ldc.i4.s 32
 	stloc 5
-	brfalse L_10688c8
+	brfalse L_10688d8
 // --- basic block ---
-L_1068948:
-// 0x01068948: 0x1068948: beq   s8, zero, 0x1068988 sll   zero, zero, 0
+L_1068958:
+// 0x01068958: 0x1068958: beq   s8, zero, 0x1068998 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1068988
+	brfalse L_1068998
 // --- basic block ---
-// 0x01068950: 0x1068950: jal   0x10c1c60 addiu a0, sp, 16
+// 0x01068960: 0x1068960: jal   0x10c22a0 addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
@@ -4595,22 +4595,22 @@ L_1068948:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl144::atof_10c1c60(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::atof_10c22a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01068958: 0x1068958: jal   0x10c0874 addu  a0, v0, zero
+// 0x01068968: 0x1068968: jal   0x10c0eb4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01068960: 0x1068960: sw    v1, 4(s3)
+// 0x01068970: 0x1068970: sw    v1, 4(s3)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -4619,7 +4619,7 @@ L_1068948:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01068964: 0x1068964: beq   s1, zero, 0x106898c sw    v0, 0(s3)
+// 0x01068974: 0x1068974: beq   s1, zero, 0x106899c sw    v0, 0(s3)
 	ldloc 11
 	ldloc 6
 	ldloc 15
@@ -4627,18 +4627,18 @@ L_1068948:
 	shr.un
 	ldloc 5
 	stelem.i4
-	brfalse L_106898c
+	brfalse L_106899c
 // --- basic block ---
-// 0x0106896c: 0x106896c: beq   s2, zero, 0x106898c addu  a0, s0, zero
+// 0x0106897c: 0x106897c: beq   s2, zero, 0x106899c addu  a0, s0, zero
 	ldloc 14
 	ldloc 9
 	stloc.1
-	brfalse L_106898c
+	brfalse L_106899c
 // --- basic block ---
-// 0x01068974: 0x1068974: addu  a1, s1, zero
+// 0x01068984: 0x1068984: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01068978: 0x1068978: jal   0x10681a8 addu  a2, s2, zero
+// 0x01068988: 0x1068988: jal   0x10681b8 addu  a2, s2, zero
 	ldloc 14
 	stloc.3
 	ldloc.0
@@ -4646,26 +4646,26 @@ L_1068948:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01068980: 0x1068980: j	 0x106898c addu  s4, v0, zero
+// 0x01068990: 0x1068990: j	 0x106899c addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-	br L_106898c
+	br L_106899c
 // --- basic block ---
-L_1068988:
-// 0x01068988: 0x1068988: addu  s4, zero, zero
+L_1068998:
+// 0x01068998: 0x1068998: addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
-L_106898c:
-// 0x0106898c: 0x106898c: lw    ra, 84(sp)
-// 0x01068990: 0x1068990: addu  v0, s4, zero
+L_106899c:
+// 0x0106899c: 0x106899c: lw    ra, 84(sp)
+// 0x010689a0: 0x10689a0: addu  v0, s4, zero
 	ldloc 12
 	stloc 5
-// 0x01068994: 0x1068994: lw    s8, 80(sp)
+// 0x010689a4: 0x10689a4: lw    s8, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4674,7 +4674,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01068998: 0x1068998: lw    s7, 76(sp)
+// 0x010689a8: 0x10689a8: lw    s7, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4683,7 +4683,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106899c: 0x106899c: lw    s6, 72(sp)
+// 0x010689ac: 0x10689ac: lw    s6, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4692,7 +4692,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010689a0: 0x10689a0: lw    s5, 68(sp)
+// 0x010689b0: 0x10689b0: lw    s5, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4701,7 +4701,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010689a4: 0x10689a4: lw    s4, 64(sp)
+// 0x010689b4: 0x10689b4: lw    s4, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4710,7 +4710,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010689a8: 0x10689a8: lw    s3, 60(sp)
+// 0x010689b8: 0x10689b8: lw    s3, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4719,7 +4719,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010689ac: 0x10689ac: lw    s2, 56(sp)
+// 0x010689bc: 0x10689bc: lw    s2, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4728,7 +4728,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010689b0: 0x10689b0: lw    s1, 52(sp)
+// 0x010689c0: 0x10689c0: lw    s1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4737,7 +4737,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010689b4: 0x10689b4: lw    s0, 48(sp)
+// 0x010689c4: 0x10689c4: lw    s0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4746,7 +4746,7 @@ L_106898c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010689b8: 0x10689b8: jr    ra addiu sp, sp, 88
+// 0x010689c8: 0x10689c8: jr    ra addiu sp, sp, 88
 	ldloc.0
 	ldc.i4.s 88
 	add
@@ -4758,7 +4758,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 WSA_ExtractParams_1068a88(int32,int32,int32,int32,int32)
+.method public static int32 WSA_ExtractParams_1068a98(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s3,int32 v1,int32 s0,int32 s5,int32 s1,int32 s2,int32 s4,int32 ra)
@@ -4811,12 +4811,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068a88: 0x1068a88: addiu sp, sp, -648
+// 0x01068a98: 0x1068a98: addiu sp, sp, -648
 	ldloc.0
 	ldc.i4 -648
 	add
 	stloc.0
-// 0x01068a8c: 0x1068a8c: sw    s4, 636(sp)
+// 0x01068a9c: 0x1068a9c: sw    s4, 636(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4825,7 +4825,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01068a90: 0x1068a90: sw    s2, 628(sp)
+// 0x01068aa0: 0x1068aa0: sw    s2, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4834,7 +4834,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01068a94: 0x1068a94: sw    s1, 624(sp)
+// 0x01068aa4: 0x1068aa4: sw    s1, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4843,7 +4843,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01068a98: 0x1068a98: sw    s0, 620(sp)
+// 0x01068aa8: 0x1068aa8: sw    s0, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4852,8 +4852,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068a9c: 0x1068a9c: sw    ra, 644(sp)
-// 0x01068aa0: 0x1068aa0: sw    s5, 640(sp)
+// 0x01068aac: 0x1068aac: sw    ra, 644(sp)
+// 0x01068ab0: 0x1068ab0: sw    s5, 640(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4862,7 +4862,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01068aa4: 0x1068aa4: sw    s3, 632(sp)
+// 0x01068ab4: 0x1068ab4: sw    s3, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4871,81 +4871,81 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068aa8: 0x1068aa8: addu  s0, a0, zero
+// 0x01068ab8: 0x1068ab8: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x01068aac: 0x1068aac: addu  s2, a1, zero
+// 0x01068abc: 0x1068abc: addu  s2, a1, zero
 	ldloc.2
 	stloc 12
-// 0x01068ab0: 0x1068ab0: addu  s1, a2, zero
+// 0x01068ac0: 0x1068ac0: addu  s1, a2, zero
 	ldloc.3
 	stloc 11
-// 0x01068ab4: 0x1068ab4: beq   a0, zero, 0x1068c18 addu  s4, a3, zero
+// 0x01068ac4: 0x1068ac4: beq   a0, zero, 0x1068c28 addu  s4, a3, zero
 	ldloc.1
 	ldloc 4
 	stloc 13
-	brfalse L_1068c18
+	brfalse L_1068c28
 // --- basic block ---
-// 0x01068abc: 0x1068abc: lb    v0, 0(a0)
+// 0x01068acc: 0x1068acc: lb    v0, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01068ac0: 0x1068ac0: sll   zero, zero, 0
-// 0x01068ac4: 0x1068ac4: beq   v0, zero, 0x1068c1c addu  v0, zero, zero
+// 0x01068ad0: 0x1068ad0: sll   zero, zero, 0
+// 0x01068ad4: 0x1068ad4: beq   v0, zero, 0x1068c2c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1068c1c
+	brfalse L_1068c2c
 // --- basic block ---
-// 0x01068acc: 0x1068acc: jal   0x1001b48 sll   zero, zero, 0
+// 0x01068adc: 0x1068adc: jal   0x1001b48 sll   zero, zero, 0
 	ldloc.1
 	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068ad4: 0x1068ad4: sltiu v1, v0, 14
+// 0x01068ae4: 0x1068ae4: sltiu v1, v0, 14
 	ldloc 5
 	ldc.i4.s 14
 	clt.un
 	stloc 8
-// 0x01068ad8: 0x1068ad8: bne   v1, zero, 0x1068c18 sltiu v0, v0, 596
+// 0x01068ae8: 0x1068ae8: bne   v1, zero, 0x1068c28 sltiu v0, v0, 596
 	ldloc 8
 	ldloc 5
 	ldc.i4 596
 	clt.un
 	stloc 5
-	brtrue L_1068c18
+	brtrue L_1068c28
 // --- basic block ---
-// 0x01068ae0: 0x1068ae0: beq   v0, zero, 0x1068c18 addu  s3, zero, zero
+// 0x01068af0: 0x1068af0: beq   v0, zero, 0x1068c28 addu  s3, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_1068c18
+	brfalse L_1068c28
 // --- basic block ---
-// 0x01068ae8: 0x1068ae8: j	 0x1068afc addiu s5, sp, 16
+// 0x01068af8: 0x1068af8: j	 0x1068b0c addiu s5, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-	br L_1068afc
+	br L_1068b0c
 // --- basic block ---
-L_1068af0:
-// 0x01068af0: 0x1068af0: lbu   v0, 0(v1)
+L_1068b00:
+// 0x01068b00: 0x1068b00: lbu   v0, 0(v1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByteUnsigned(int32)
 	stloc 5
-// 0x01068af4: 0x1068af4: addiu s3, s3, 1
+// 0x01068b04: 0x1068b04: addiu s3, s3, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01068af8: 0x1068af8: sb    v0, 0(a0)
+// 0x01068b08: 0x1068b08: sb    v0, 0(a0)
 	ldloc.1
 	ldloc 5
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1068afc:
-// 0x01068afc: 0x1068afc: jal   0x1001b48 addu  a0, s0, zero
+L_1068b0c:
+// 0x01068b0c: 0x1068b0c: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -4954,42 +4954,42 @@ L_1068afc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068b04: 0x1068b04: sltu  v0, s3, v0
+// 0x01068b14: 0x1068b14: sltu  v0, s3, v0
 	ldloc 7
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01068b08: 0x1068b08: addu  v1, s0, s3
+// 0x01068b18: 0x1068b18: addu  v1, s0, s3
 	ldloc 9
 	ldloc 7
 	add
 	stloc 8
-// 0x01068b0c: 0x1068b0c: bne   v0, zero, 0x1068af0 addu  a0, s5, s3
+// 0x01068b1c: 0x1068b1c: bne   v0, zero, 0x1068b00 addu  a0, s5, s3
 	ldloc 5
 	ldloc 10
 	ldloc 7
 	add
 	stloc.1
-	brtrue L_1068af0
+	brtrue L_1068b00
 // --- basic block ---
-// 0x01068b14: 0x1068b14: addu  s3, a0, zero
+// 0x01068b24: 0x1068b24: addu  s3, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01068b18: 0x1068b18: lui   a1, 0x10000
+// 0x01068b28: 0x1068b28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01068b1c: 0x1068b1c: addu  a0, s5, zero
+// 0x01068b2c: 0x1068b2c: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-// 0x01068b20: 0x1068b20: addiu a1, a1, 17972
+// 0x01068b30: 0x1068b30: addiu a1, a1, 17968
 	ldloc.2
-	ldc.i4 17972
+	ldc.i4 17968
 	add
 	stloc.2
-// 0x01068b24: 0x1068b24: addiu a2, zero, 7
+// 0x01068b34: 0x1068b34: addiu a2, zero, 7
 	ldc.i4.7
 	stloc.3
-// 0x01068b28: 0x1068b28: jal   0x100039c sb    zero, 0(s3)
+// 0x01068b38: 0x1068b38: jal   0x100039c sb    zero, 0(s3)
 	ldloc 7
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
@@ -5002,18 +5002,18 @@ L_1068afc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068b30: 0x1068b30: bne   v0, zero, 0x1068c18 addiu s0, sp, 23
+// 0x01068b40: 0x1068b40: bne   v0, zero, 0x1068c28 addiu s0, sp, 23
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 23
 	add
 	stloc 9
-	brtrue L_1068c18
+	brtrue L_1068c28
 // --- basic block ---
-// 0x01068b38: 0x1068b38: addu  a0, s0, zero
+// 0x01068b48: 0x1068b48: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01068b3c: 0x1068b3c: jal   0x1001a5c addiu a1, zero, 58
+// 0x01068b4c: 0x1068b4c: jal   0x1001a5c addiu a1, zero, 58
 	ldc.i4.s 58
 	stloc.2
 	ldloc.1
@@ -5023,28 +5023,28 @@ L_1068afc:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068b44: 0x1068b44: bne   v0, zero, 0x1068b54 addu  a0, s0, zero
+// 0x01068b54: 0x1068b54: bne   v0, zero, 0x1068b64 addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brtrue L_1068b54
+	brtrue L_1068b64
 // --- basic block ---
-// 0x01068b4c: 0x1068b4c: j	 0x1068b5c addu  s5, zero, zero
+// 0x01068b5c: 0x1068b5c: j	 0x1068b6c addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1068b5c
+	br L_1068b6c
 // --- basic block ---
-L_1068b54:
-// 0x01068b54: 0x1068b54: addiu s5, v0, 1
+L_1068b64:
+// 0x01068b64: 0x1068b64: addiu s5, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 10
-// 0x01068b58: 0x1068b58: addu  a0, s5, zero
+// 0x01068b68: 0x1068b68: addu  a0, s5, zero
 	ldloc 10
 	stloc.1
-L_1068b5c:
-// 0x01068b5c: 0x1068b5c: jal   0x1001a5c addiu a1, zero, 47
+L_1068b6c:
+// 0x01068b6c: 0x1068b6c: jal   0x1001a5c addiu a1, zero, 47
 	ldc.i4.s 47
 	stloc.2
 	ldloc.1
@@ -5054,30 +5054,30 @@ L_1068b5c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068b64: 0x1068b64: beq   v0, zero, 0x1068c18 addu  s3, v0, zero
+// 0x01068b74: 0x1068b74: beq   v0, zero, 0x1068c28 addu  s3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 7
-	brfalse L_1068c18
+	brfalse L_1068c28
 // --- basic block ---
-// 0x01068b6c: 0x1068b6c: sb    zero, 0(v0)
+// 0x01068b7c: 0x1068b7c: sb    zero, 0(v0)
 	ldloc 5
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01068b70: 0x1068b70: lb    v0, 23(sp)
+// 0x01068b80: 0x1068b80: lb    v0, 23(sp)
 	ldloc.0
 	ldc.i4.s 23
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01068b74: 0x1068b74: sll   zero, zero, 0
-// 0x01068b78: 0x1068b78: beq   v0, zero, 0x1068c1c addu  v0, zero, zero
+// 0x01068b84: 0x1068b84: sll   zero, zero, 0
+// 0x01068b88: 0x1068b88: beq   v0, zero, 0x1068c2c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1068c1c
+	brfalse L_1068c2c
 // --- basic block ---
-// 0x01068b80: 0x1068b80: jal   0x1001b48 addiu a0, sp, 23
+// 0x01068b90: 0x1068b90: jal   0x1001b48 addiu a0, sp, 23
 	ldloc.0
 	ldc.i4.s 23
 	add
@@ -5088,24 +5088,24 @@ L_1068b5c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068b88: 0x1068b88: sltiu v0, v0, 65
+// 0x01068b98: 0x1068b98: sltiu v0, v0, 65
 	ldloc 5
 	ldc.i4.s 65
 	clt.un
 	stloc 5
-// 0x01068b8c: 0x1068b8c: beq   v0, zero, 0x1068c1c addu  v0, zero, zero
+// 0x01068b9c: 0x1068b9c: beq   v0, zero, 0x1068c2c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1068c1c
+	brfalse L_1068c2c
 // --- basic block ---
-// 0x01068b94: 0x1068b94: beq   s5, zero, 0x1068bac addiu s0, zero, 80
+// 0x01068ba4: 0x1068ba4: beq   s5, zero, 0x1068bbc addiu s0, zero, 80
 	ldloc 10
 	ldc.i4.s 80
 	stloc 9
-	brfalse L_1068bac
+	brfalse L_1068bbc
 // --- basic block ---
-// 0x01068b9c: 0x1068b9c: jal   0x1000d8c addu  a0, s5, zero
+// 0x01068bac: 0x1068bac: jal   0x1000d8c addu  a0, s5, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5118,29 +5118,29 @@ L_1068b5c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068ba4: 0x1068ba4: beq   v0, zero, 0x1068c18 addu  s0, v0, zero
+// 0x01068bb4: 0x1068bb4: beq   v0, zero, 0x1068c28 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 9
-	brfalse L_1068c18
+	brfalse L_1068c28
 // --- basic block ---
-L_1068bac:
-// 0x01068bac: 0x1068bac: lb    v0, 1(s3)
+L_1068bbc:
+// 0x01068bbc: 0x1068bbc: lb    v0, 1(s3)
 	ldloc 7
 	ldc.i4.1
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01068bb0: 0x1068bb0: sll   zero, zero, 0
-// 0x01068bb4: 0x1068bb4: beq   v0, zero, 0x1068c18 addiu s3, s3, 1
+// 0x01068bc0: 0x1068bc0: sll   zero, zero, 0
+// 0x01068bc4: 0x1068bc4: beq   v0, zero, 0x1068c28 addiu s3, s3, 1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brfalse L_1068c18
+	brfalse L_1068c28
 // --- basic block ---
-// 0x01068bbc: 0x1068bbc: jal   0x1001b48 addu  a0, s3, zero
+// 0x01068bcc: 0x1068bcc: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 7
 	stloc.1
 	ldloc.1
@@ -5149,29 +5149,29 @@ L_1068bac:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068bc4: 0x1068bc4: sltiu v0, v0, 513
+// 0x01068bd4: 0x1068bd4: sltiu v0, v0, 513
 	ldloc 5
 	ldc.i4 513
 	clt.un
 	stloc 5
-// 0x01068bc8: 0x1068bc8: beq   v0, zero, 0x1068c1c addu  v0, zero, zero
+// 0x01068bd8: 0x1068bd8: beq   v0, zero, 0x1068c2c addu  v0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1068c1c
+	brfalse L_1068c2c
 // --- basic block ---
-// 0x01068bd0: 0x1068bd0: beq   s2, zero, 0x1068be4 addu  a0, s2, zero
+// 0x01068be0: 0x1068be0: beq   s2, zero, 0x1068bf4 addu  a0, s2, zero
 	ldloc 12
 	ldloc 12
 	stloc.1
-	brfalse L_1068be4
+	brfalse L_1068bf4
 // --- basic block ---
-// 0x01068bd8: 0x1068bd8: addiu a1, sp, 23
+// 0x01068be8: 0x1068be8: addiu a1, sp, 23
 	ldloc.0
 	ldc.i4.s 23
 	add
 	stloc.2
-// 0x01068bdc: 0x1068bdc: jal   0x1001af8 addiu a2, zero, 64
+// 0x01068bec: 0x1068bec: jal   0x1001af8 addiu a2, zero, 64
 	ldc.i4.s 64
 	stloc.3
 	ldloc.1
@@ -5180,40 +5180,40 @@ L_1068bac:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-L_1068be4:
-// 0x01068be4: 0x1068be4: beq   s1, zero, 0x1068bf0 sll   zero, zero, 0
+L_1068bf4:
+// 0x01068bf4: 0x1068bf4: beq   s1, zero, 0x1068c00 sll   zero, zero, 0
 	ldloc 11
-	brfalse L_1068bf0
+	brfalse L_1068c00
 // --- basic block ---
-// 0x01068bec: 0x1068bec: sw    s0, 0(s1)
+// 0x01068bfc: 0x1068bfc: sw    s0, 0(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-L_1068bf0:
-// 0x01068bf0: 0x1068bf0: beq   s4, zero, 0x1068c1c addiu v0, zero, 1
+L_1068c00:
+// 0x01068c00: 0x1068c00: beq   s4, zero, 0x1068c2c addiu v0, zero, 1
 	ldloc 13
 	ldc.i4.1
 	stloc 5
-	brfalse L_1068c1c
+	brfalse L_1068c2c
 // --- basic block ---
-// 0x01068bf8: 0x1068bf8: lui   a2, 0x10000
+// 0x01068c08: 0x1068c08: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01068bfc: 0x1068bfc: addu  a0, s4, zero
+// 0x01068c0c: 0x1068c0c: addu  a0, s4, zero
 	ldloc 13
 	stloc.1
-// 0x01068c00: 0x1068c00: addiu a2, a2, 17980
+// 0x01068c10: 0x1068c10: addiu a2, a2, 17976
 	ldloc.3
-	ldc.i4 17980
+	ldc.i4 17976
 	add
 	stloc.3
-// 0x01068c04: 0x1068c04: addu  a3, s3, zero
+// 0x01068c14: 0x1068c14: addu  a3, s3, zero
 	ldloc 7
 	stloc 4
-// 0x01068c08: 0x1068c08: jal   0x1000f9c addiu a1, zero, 512
+// 0x01068c18: 0x1068c18: jal   0x1000f9c addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
 	ldloc.0
@@ -5226,18 +5226,18 @@ L_1068bf0:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01068c10: 0x1068c10: j	 0x1068c1c addiu v0, zero, 1
+// 0x01068c20: 0x1068c20: j	 0x1068c2c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1068c1c
+	br L_1068c2c
 // --- basic block ---
-L_1068c18:
-// 0x01068c18: 0x1068c18: addu  v0, zero, zero
+L_1068c28:
+// 0x01068c28: 0x1068c28: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_1068c1c:
-// 0x01068c1c: 0x1068c1c: lw    ra, 644(sp)
-// 0x01068c20: 0x1068c20: lw    s5, 640(sp)
+L_1068c2c:
+// 0x01068c2c: 0x1068c2c: lw    ra, 644(sp)
+// 0x01068c30: 0x1068c30: lw    s5, 640(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5246,7 +5246,7 @@ L_1068c1c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01068c24: 0x1068c24: lw    s4, 636(sp)
+// 0x01068c34: 0x1068c34: lw    s4, 636(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5255,7 +5255,7 @@ L_1068c1c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01068c28: 0x1068c28: lw    s3, 632(sp)
+// 0x01068c38: 0x1068c38: lw    s3, 632(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5264,7 +5264,7 @@ L_1068c1c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068c2c: 0x1068c2c: lw    s2, 628(sp)
+// 0x01068c3c: 0x1068c3c: lw    s2, 628(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5273,7 +5273,7 @@ L_1068c1c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01068c30: 0x1068c30: lw    s1, 624(sp)
+// 0x01068c40: 0x1068c40: lw    s1, 624(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5282,7 +5282,7 @@ L_1068c1c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01068c34: 0x1068c34: lw    s0, 620(sp)
+// 0x01068c44: 0x1068c44: lw    s0, 620(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ L_1068c1c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01068c38: 0x1068c38: jr    ra addiu sp, sp, 648
+// 0x01068c48: 0x1068c48: jr    ra addiu sp, sp, 648
 	ldloc.0
 	ldc.i4 648
 	add
@@ -5303,7 +5303,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 wstq_is_empty_1068c74(int32)
+.method public static int32 wstq_is_empty_1068c84(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -5323,7 +5323,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068c74: 0x1068c74: lw    v0, 124(a0)
+// 0x01068c84: 0x1068c84: lw    v0, 124(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -5332,7 +5332,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01068c78: 0x1068c78: jr    ra sltiu v0, v0, 1
+// 0x01068c88: 0x1068c88: jr    ra sltiu v0, v0, 1
 	ldloc.1
 	ldc.i4.1
 	clt.un
@@ -5342,7 +5342,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 wstq_enqueue_1068c80(int32,int32,int32,int32,int32)
+.method public static int32 wstq_enqueue_1068c90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 s0,int32 ra,int32 v1,int32 lo)
@@ -5386,12 +5386,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068c80: 0x1068c80: addiu sp, sp, -32
+// 0x01068c90: 0x1068c90: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01068c84: 0x1068c84: sw    s0, 20(sp)
+// 0x01068c94: 0x1068c94: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5400,8 +5400,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01068c88: 0x1068c88: sw    ra, 28(sp)
-// 0x01068c8c: 0x1068c8c: sw    s1, 24(sp)
+// 0x01068c98: 0x1068c98: sw    ra, 28(sp)
+// 0x01068c9c: 0x1068c9c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5410,38 +5410,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068c90: 0x1068c90: beq   a0, zero, 0x1068d10 addu  s0, a0, zero
+// 0x01068ca0: 0x1068ca0: beq   a0, zero, 0x1068d20 addu  s0, a0, zero
 	ldloc.1
 	ldloc.1
 	stloc 8
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068c98: 0x1068c98: beq   a1, zero, 0x1068d10 sll   zero, zero, 0
+// 0x01068ca8: 0x1068ca8: beq   a1, zero, 0x1068d20 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068ca0: 0x1068ca0: lw    v0, 0(a1)
+// 0x01068cb0: 0x1068cb0: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01068ca4: 0x1068ca4: sll   zero, zero, 0
-// 0x01068ca8: 0x1068ca8: beq   v0, zero, 0x1068d10 sll   zero, zero, 0
+// 0x01068cb4: 0x1068cb4: sll   zero, zero, 0
+// 0x01068cb8: 0x1068cb8: beq   v0, zero, 0x1068d20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068cb0: 0x1068cb0: lb    v0, 0(v0)
+// 0x01068cc0: 0x1068cc0: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01068cb4: 0x1068cb4: sll   zero, zero, 0
-// 0x01068cb8: 0x1068cb8: beq   v0, zero, 0x1068d10 sll   zero, zero, 0
+// 0x01068cc4: 0x1068cc4: sll   zero, zero, 0
+// 0x01068cc8: 0x1068cc8: beq   v0, zero, 0x1068d20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068cc0: 0x1068cc0: lw    v0, 20(a1)
+// 0x01068cd0: 0x1068cd0: lw    v0, 20(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5450,21 +5450,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01068cc4: 0x1068cc4: sll   zero, zero, 0
-// 0x01068cc8: 0x1068cc8: beq   v0, zero, 0x1068d10 sll   zero, zero, 0
+// 0x01068cd4: 0x1068cd4: sll   zero, zero, 0
+// 0x01068cd8: 0x1068cd8: beq   v0, zero, 0x1068d20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068cd0: 0x1068cd0: lb    v0, 0(v0)
+// 0x01068ce0: 0x1068ce0: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01068cd4: 0x1068cd4: sll   zero, zero, 0
-// 0x01068cd8: 0x1068cd8: beq   v0, zero, 0x1068d10 sll   zero, zero, 0
+// 0x01068ce4: 0x1068ce4: sll   zero, zero, 0
+// 0x01068ce8: 0x1068ce8: beq   v0, zero, 0x1068d20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068ce0: 0x1068ce0: lw    v0, 12(a1)
+// 0x01068cf0: 0x1068cf0: lw    v0, 12(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5473,12 +5473,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01068ce4: 0x1068ce4: sll   zero, zero, 0
-// 0x01068ce8: 0x1068ce8: beq   v0, zero, 0x1068d10 sll   zero, zero, 0
+// 0x01068cf4: 0x1068cf4: sll   zero, zero, 0
+// 0x01068cf8: 0x1068cf8: beq   v0, zero, 0x1068d20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068cf0: 0x1068cf0: lw    v0, 4(a1)
+// 0x01068d00: 0x1068d00: lw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5487,12 +5487,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01068cf4: 0x1068cf4: sll   zero, zero, 0
-// 0x01068cf8: 0x1068cf8: beq   v0, zero, 0x1068d10 sll   zero, zero, 0
+// 0x01068d04: 0x1068d04: sll   zero, zero, 0
+// 0x01068d08: 0x1068d08: beq   v0, zero, 0x1068d20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1068d10
+	brfalse L_1068d20
 // --- basic block ---
-// 0x01068d00: 0x1068d00: lw    v0, 8(a1)
+// 0x01068d10: 0x1068d10: lw    v0, 8(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -5501,38 +5501,38 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01068d04: 0x1068d04: sll   zero, zero, 0
-// 0x01068d08: 0x1068d08: bne   v0, zero, 0x1068d2c sll   zero, zero, 0
+// 0x01068d14: 0x1068d14: sll   zero, zero, 0
+// 0x01068d18: 0x1068d18: bne   v0, zero, 0x1068d3c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1068d2c
+	brtrue L_1068d3c
 // --- basic block ---
-L_1068d10:
-// 0x01068d10: 0x1068d10: lui   a1, 0x10000
+L_1068d20:
+// 0x01068d20: 0x1068d20: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01068d14: 0x1068d14: lui   a3, 0x10000
+// 0x01068d24: 0x1068d24: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01068d18: 0x1068d18: addiu a1, a1, 17984
+// 0x01068d28: 0x1068d28: addiu a1, a1, 17980
 	ldloc.2
-	ldc.i4 17984
+	ldc.i4 17980
 	add
 	stloc.2
-// 0x01068d1c: 0x1068d1c: addiu a3, a3, 18028
+// 0x01068d2c: 0x1068d2c: addiu a3, a3, 18024
 	ldloc 4
-	ldc.i4 18028
+	ldc.i4 18024
 	add
 	stloc 4
-// 0x01068d20: 0x1068d20: addiu a0, zero, 4
+// 0x01068d30: 0x1068d30: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01068d24: 0x1068d24: j	 0x1068d54 addiu a2, zero, 70
+// 0x01068d34: 0x1068d34: j	 0x1068d64 addiu a2, zero, 70
 	ldc.i4.s 70
 	stloc.3
-	br L_1068d54
+	br L_1068d64
 // --- basic block ---
-L_1068d2c:
-// 0x01068d2c: 0x1068d2c: lw    s1, 124(a0)
+L_1068d3c:
+// 0x01068d3c: 0x1068d3c: lw    s1, 124(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -5541,40 +5541,40 @@ L_1068d2c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068d30: 0x1068d30: addiu v0, zero, 5
+// 0x01068d40: 0x1068d40: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x01068d34: 0x1068d34: bne   s1, v0, 0x1068d64 addiu a2, zero, 24
+// 0x01068d44: 0x1068d44: bne   s1, v0, 0x1068d74 addiu a2, zero, 24
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 24
 	stloc.3
-	bne.un L_1068d64
+	bne.un L_1068d74
 // --- basic block ---
-// 0x01068d3c: 0x1068d3c: lui   a1, 0x10000
+// 0x01068d4c: 0x1068d4c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01068d40: 0x1068d40: lui   a3, 0x10000
+// 0x01068d50: 0x1068d50: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01068d44: 0x1068d44: addiu a1, a1, 17984
+// 0x01068d54: 0x1068d54: addiu a1, a1, 17980
 	ldloc.2
-	ldc.i4 17984
+	ldc.i4 17980
 	add
 	stloc.2
-// 0x01068d48: 0x1068d48: addiu a3, a3, 18064
+// 0x01068d58: 0x1068d58: addiu a3, a3, 18060
 	ldloc 4
-	ldc.i4 18064
+	ldc.i4 18060
 	add
 	stloc 4
-// 0x01068d4c: 0x1068d4c: addiu a0, zero, 4
+// 0x01068d5c: 0x1068d5c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01068d50: 0x1068d50: addiu a2, zero, 76
+// 0x01068d60: 0x1068d60: addiu a2, zero, 76
 	ldc.i4.s 76
 	stloc.3
-L_1068d54:
-// 0x01068d54: 0x1068d54: jal   0x100449c sll   zero, zero, 0
+L_1068d64:
+// 0x01068d64: 0x1068d64: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5585,34 +5585,34 @@ L_1068d54:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01068d5c: 0x1068d5c: j	 0x1068d88 addu  v0, zero, zero
+// 0x01068d6c: 0x1068d6c: j	 0x1068d98 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1068d88
+	br L_1068d98
 // --- basic block ---
-L_1068d64:
-// 0x01068d64: 0x1068d64: addiu a0, zero, 24
+L_1068d74:
+// 0x01068d74: 0x1068d74: addiu a0, zero, 24
 	ldc.i4.s 24
 	stloc.1
-// 0x01068d68: 0x1068d68: mult  s1, a0
+// 0x01068d78: 0x1068d78: mult  s1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 11
-// 0x01068d6c: 0x1068d6c: addiu s1, s1, 1
+// 0x01068d7c: 0x1068d7c: addiu s1, s1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x01068d70: 0x1068d70: mflo  lo
+// 0x01068d80: 0x1068d80: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01068d74: 0x1068d74: addu  a0, s0, a0
+// 0x01068d84: 0x1068d84: addu  a0, s0, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc.1
-// 0x01068d78: 0x1068d78: jal   0x1001800 addiu a0, a0, 4
+// 0x01068d88: 0x1068d88: jal   0x1001800 addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
@@ -5626,7 +5626,7 @@ L_1068d64:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x01068d80: 0x1068d80: sw    s1, 124(s0)
+// 0x01068d90: 0x1068d90: sw    s1, 124(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5635,12 +5635,12 @@ L_1068d64:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068d84: 0x1068d84: addiu v0, zero, 1
+// 0x01068d94: 0x1068d94: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1068d88:
-// 0x01068d88: 0x1068d88: lw    ra, 28(sp)
-// 0x01068d8c: 0x1068d8c: lw    s1, 24(sp)
+L_1068d98:
+// 0x01068d98: 0x1068d98: lw    ra, 28(sp)
+// 0x01068d9c: 0x1068d9c: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5649,7 +5649,7 @@ L_1068d88:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068d90: 0x1068d90: lw    s0, 20(sp)
+// 0x01068da0: 0x1068da0: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5658,7 +5658,7 @@ L_1068d88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01068d94: 0x1068d94: jr    ra addiu sp, sp, 32
+// 0x01068da4: 0x1068da4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5670,7 +5670,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 wstq_init_1068d9c(int32,int32,int32,int32,int32)
+.method public static int32 wstq_init_1068dac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5705,16 +5705,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068d9c: 0x1068d9c: addiu sp, sp, -24
+// 0x01068dac: 0x1068dac: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01068da0: 0x1068da0: addu  a1, zero, zero
+// 0x01068db0: 0x1068db0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01068da4: 0x1068da4: sw    ra, 20(sp)
-// 0x01068da8: 0x1068da8: jal   0x100177c addiu a2, zero, 128
+// 0x01068db4: 0x1068db4: sw    ra, 20(sp)
+// 0x01068db8: 0x1068db8: jal   0x100177c addiu a2, zero, 128
 	ldc.i4 128
 	stloc.3
 	ldloc.1
@@ -5726,9 +5726,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01068db0: 0x1068db0: lw    ra, 20(sp)
-// 0x01068db4: 0x1068db4: sll   zero, zero, 0
-// 0x01068db8: 0x1068db8: jr    ra addiu sp, sp, 24
+// 0x01068dc0: 0x1068dc0: lw    ra, 20(sp)
+// 0x01068dc4: 0x1068dc4: sll   zero, zero, 0
+// 0x01068dc8: 0x1068dc8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5740,7 +5740,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static void wstq_item_init_1068dc0(int32)
+.method public static void wstq_item_init_1068dd0(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32[] mem,int32 ra)
@@ -5757,7 +5757,7 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068dc0: 0x1068dc0: sw    zero, 20(a0)
+// 0x01068dd0: 0x1068dd0: sw    zero, 20(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -5766,14 +5766,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068dc4: 0x1068dc4: sw    zero, 0(a0)
+// 0x01068dd4: 0x1068dd4: sw    zero, 0(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068dc8: 0x1068dc8: sw    zero, 4(a0)
+// 0x01068dd8: 0x1068dd8: sw    zero, 4(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -5782,7 +5782,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068dcc: 0x1068dcc: sw    zero, 8(a0)
+// 0x01068ddc: 0x1068ddc: sw    zero, 8(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -5791,7 +5791,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068dd0: 0x1068dd0: sw    zero, 12(a0)
+// 0x01068de0: 0x1068de0: sw    zero, 12(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -5800,7 +5800,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068dd4: 0x1068dd4: jr    ra sw    zero, 16(a0)
+// 0x01068de4: 0x1068de4: jr    ra sw    zero, 16(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -5813,7 +5813,7 @@ __CIBYL_javamethod_begin:
 __CIBYL_function_return:
 	ret
 }
-.method public static int32 wstq_dequeue_1068ddc(int32,int32,int32,int32,int32)
+.method public static int32 wstq_dequeue_1068dec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s2,int32 s1,int32 v1,int32 lo,int32 ra)
@@ -5860,12 +5860,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068ddc: 0x1068ddc: addiu sp, sp, -40
+// 0x01068dec: 0x1068dec: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01068de0: 0x1068de0: sw    s0, 24(sp)
+// 0x01068df0: 0x1068df0: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5874,8 +5874,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01068de4: 0x1068de4: sw    ra, 36(sp)
-// 0x01068de8: 0x1068de8: sw    s2, 32(sp)
+// 0x01068df4: 0x1068df4: sw    ra, 36(sp)
+// 0x01068df8: 0x1068df8: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5884,7 +5884,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01068dec: 0x1068dec: sw    s1, 28(sp)
+// 0x01068dfc: 0x1068dfc: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5893,16 +5893,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068df0: 0x1068df0: beq   a1, zero, 0x1068e08 addu  s0, a0, zero
+// 0x01068e00: 0x1068e00: beq   a1, zero, 0x1068e18 addu  s0, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 6
-	brfalse L_1068e08
+	brfalse L_1068e18
 // --- basic block ---
-// 0x01068df8: 0x1068df8: addu  a0, a1, zero
+// 0x01068e08: 0x1068e08: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01068dfc: 0x1068dfc: jal   0x1068dc0 sw    a1, 16(sp)
+// 0x01068e0c: 0x1068e0c: jal   0x1068dd0 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5912,9 +5912,9 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	stelem.i4
 	ldloc.1
-	call void Cibyl77::wstq_item_init_1068dc0(int32)
+	call void Cibyl77::wstq_item_init_1068dd0(int32)
 // --- basic block ---
-// 0x01068e04: 0x1068e04: lw    a1, 16(sp)
+// 0x01068e14: 0x1068e14: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5923,42 +5923,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-L_1068e08:
-// 0x01068e08: 0x1068e08: beq   s0, zero, 0x1068e18 sll   zero, zero, 0
+L_1068e18:
+// 0x01068e18: 0x1068e18: beq   s0, zero, 0x1068e28 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1068e18
+	brfalse L_1068e28
 // --- basic block ---
-// 0x01068e10: 0x1068e10: bne   a1, zero, 0x1068e34 sll   zero, zero, 0
+// 0x01068e20: 0x1068e20: bne   a1, zero, 0x1068e44 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_1068e34
+	brtrue L_1068e44
 // --- basic block ---
-L_1068e18:
-// 0x01068e18: 0x1068e18: lui   a1, 0x10000
+L_1068e28:
+// 0x01068e28: 0x1068e28: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01068e1c: 0x1068e1c: lui   a3, 0x10000
+// 0x01068e2c: 0x1068e2c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01068e20: 0x1068e20: addiu a1, a1, 17984
+// 0x01068e30: 0x1068e30: addiu a1, a1, 17980
 	ldloc.2
-	ldc.i4 17984
+	ldc.i4 17980
 	add
 	stloc.2
-// 0x01068e24: 0x1068e24: addiu a3, a3, 18096
+// 0x01068e34: 0x1068e34: addiu a3, a3, 18092
 	ldloc 4
-	ldc.i4 18096
+	ldc.i4 18092
 	add
 	stloc 4
-// 0x01068e28: 0x1068e28: addiu a0, zero, 4
+// 0x01068e38: 0x1068e38: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01068e2c: 0x1068e2c: j	 0x1068e5c addiu a2, zero, 91
+// 0x01068e3c: 0x1068e3c: j	 0x1068e6c addiu a2, zero, 91
 	ldc.i4.s 91
 	stloc.3
-	br L_1068e5c
+	br L_1068e6c
 // --- basic block ---
-L_1068e34:
-// 0x01068e34: 0x1068e34: lw    v0, 124(s0)
+L_1068e44:
+// 0x01068e44: 0x1068e44: lw    v0, 124(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5967,39 +5967,39 @@ L_1068e34:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068e38: 0x1068e38: sll   zero, zero, 0
-// 0x01068e3c: 0x1068e3c: bne   v0, zero, 0x1068e6c addiu s1, s0, 4
+// 0x01068e48: 0x1068e48: sll   zero, zero, 0
+// 0x01068e4c: 0x1068e4c: bne   v0, zero, 0x1068e7c addiu s1, s0, 4
 	ldloc 7
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 9
-	brtrue L_1068e6c
+	brtrue L_1068e7c
 // --- basic block ---
-// 0x01068e44: 0x1068e44: lui   a1, 0x10000
+// 0x01068e54: 0x1068e54: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01068e48: 0x1068e48: lui   a3, 0x10000
+// 0x01068e58: 0x1068e58: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01068e4c: 0x1068e4c: addiu a1, a1, 17984
+// 0x01068e5c: 0x1068e5c: addiu a1, a1, 17980
 	ldloc.2
-	ldc.i4 17984
+	ldc.i4 17980
 	add
 	stloc.2
-// 0x01068e50: 0x1068e50: addiu a3, a3, 18132
+// 0x01068e60: 0x1068e60: addiu a3, a3, 18128
 	ldloc 4
-	ldc.i4 18132
+	ldc.i4 18128
 	add
 	stloc 4
-// 0x01068e54: 0x1068e54: addiu a0, zero, 1
+// 0x01068e64: 0x1068e64: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01068e58: 0x1068e58: addiu a2, zero, 97
+// 0x01068e68: 0x1068e68: addiu a2, zero, 97
 	ldc.i4.s 97
 	stloc.3
-L_1068e5c:
-// 0x01068e5c: 0x1068e5c: jal   0x100449c sll   zero, zero, 0
+L_1068e6c:
+// 0x01068e6c: 0x1068e6c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6010,19 +6010,19 @@ L_1068e5c:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01068e64: 0x1068e64: j	 0x1068ecc addu  v0, zero, zero
+// 0x01068e74: 0x1068e74: j	 0x1068edc addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1068ecc
+	br L_1068edc
 // --- basic block ---
-L_1068e6c:
-// 0x01068e6c: 0x1068e6c: addu  a0, a1, zero
+L_1068e7c:
+// 0x01068e7c: 0x1068e7c: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x01068e70: 0x1068e70: addiu a2, zero, 24
+// 0x01068e80: 0x1068e80: addiu a2, zero, 24
 	ldc.i4.s 24
 	stloc.3
-// 0x01068e74: 0x1068e74: jal   0x1001800 addu  a1, s1, zero
+// 0x01068e84: 0x1068e84: jal   0x1001800 addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
@@ -6034,7 +6034,7 @@ L_1068e6c:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01068e7c: 0x1068e7c: lw    a2, 124(s0)
+// 0x01068e8c: 0x1068e8c: lw    a2, 124(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6043,15 +6043,15 @@ L_1068e6c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01068e80: 0x1068e80: addiu s2, zero, 24
+// 0x01068e90: 0x1068e90: addiu s2, zero, 24
 	ldc.i4.s 24
 	stloc 8
-// 0x01068e84: 0x1068e84: addiu a2, a2, -1
+// 0x01068e94: 0x1068e94: addiu a2, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc.3
-// 0x01068e88: 0x1068e88: sw    a2, 124(s0)
+// 0x01068e98: 0x1068e98: sw    a2, 124(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6060,24 +6060,24 @@ L_1068e6c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01068e8c: 0x1068e8c: beq   a2, zero, 0x1068ec0 addu  a0, s1, zero
+// 0x01068e9c: 0x1068e9c: beq   a2, zero, 0x1068ed0 addu  a0, s1, zero
 	ldloc.3
 	ldloc 9
 	stloc.1
-	brfalse L_1068ec0
+	brfalse L_1068ed0
 // --- basic block ---
-// 0x01068e94: 0x1068e94: mult  a2, s2
+// 0x01068ea4: 0x1068ea4: mult  a2, s2
 	ldloc.3
 	ldloc 8
 	mul
 	stloc 11
-// 0x01068e98: 0x1068e98: addu  a0, s1, zero
+// 0x01068ea8: 0x1068ea8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01068e9c: 0x1068e9c: mflo  lo
+// 0x01068eac: 0x1068eac: mflo  lo
 	ldloc 11
 	stloc.3
-// 0x01068ea0: 0x1068ea0: jal   0x100186c addiu a1, s0, 28
+// 0x01068eb0: 0x1068eb0: jal   0x100186c addiu a1, s0, 28
 	ldloc 6
 	ldc.i4.s 28
 	add
@@ -6091,7 +6091,7 @@ L_1068e6c:
 	stloc 10
 	stloc 7
 // --- basic block ---
-// 0x01068ea8: 0x1068ea8: lw    v0, 124(s0)
+// 0x01068eb8: 0x1068eb8: lw    v0, 124(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6100,36 +6100,36 @@ L_1068e6c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068eac: 0x1068eac: sll   zero, zero, 0
-// 0x01068eb0: 0x1068eb0: mult  v0, s2
+// 0x01068ebc: 0x1068ebc: sll   zero, zero, 0
+// 0x01068ec0: 0x1068ec0: mult  v0, s2
 	ldloc 7
 	ldloc 8
 	mul
 	stloc 11
-// 0x01068eb4: 0x1068eb4: mflo  lo
+// 0x01068ec4: 0x1068ec4: mflo  lo
 	ldloc 11
 	stloc 8
-// 0x01068eb8: 0x1068eb8: addu  s0, s0, s2
+// 0x01068ec8: 0x1068ec8: addu  s0, s0, s2
 	ldloc 6
 	ldloc 8
 	add
 	stloc 6
-// 0x01068ebc: 0x1068ebc: addiu a0, s0, 4
+// 0x01068ecc: 0x1068ecc: addiu a0, s0, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc.1
-L_1068ec0:
-// 0x01068ec0: 0x1068ec0: jal   0x1068dc0 sll   zero, zero, 0
+L_1068ed0:
+// 0x01068ed0: 0x1068ed0: jal   0x1068dd0 sll   zero, zero, 0
 	ldloc.1
-	call void Cibyl77::wstq_item_init_1068dc0(int32)
+	call void Cibyl77::wstq_item_init_1068dd0(int32)
 // --- basic block ---
-// 0x01068ec8: 0x1068ec8: addiu v0, zero, 1
+// 0x01068ed8: 0x1068ed8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 7
-L_1068ecc:
-// 0x01068ecc: 0x1068ecc: lw    ra, 36(sp)
-// 0x01068ed0: 0x1068ed0: lw    s2, 32(sp)
+L_1068edc:
+// 0x01068edc: 0x1068edc: lw    ra, 36(sp)
+// 0x01068ee0: 0x1068ee0: lw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6138,7 +6138,7 @@ L_1068ecc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01068ed4: 0x1068ed4: lw    s1, 28(sp)
+// 0x01068ee4: 0x1068ee4: lw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6147,7 +6147,7 @@ L_1068ecc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01068ed8: 0x1068ed8: lw    s0, 24(sp)
+// 0x01068ee8: 0x1068ee8: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6156,7 +6156,7 @@ L_1068ecc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01068edc: 0x1068edc: jr    ra addiu sp, sp, 40
+// 0x01068eec: 0x1068eec: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
diff --git a/converted/Cibyl78.j b/converted/Cibyl78.j
index 6f59485..7b3bdf6 100644
--- a/converted/Cibyl78.j
+++ b/converted/Cibyl78.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl78::.ctor
 
-.method public static int32 wstq_item_release_1068ee4(int32,int32,int32,int32,int32)
+.method public static int32 wstq_item_release_1068ef4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
@@ -79,12 +79,12 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068ee4: 0x1068ee4: addiu sp, sp, -24
+// 0x01068ef4: 0x1068ef4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01068ee8: 0x1068ee8: sw    s0, 16(sp)
+// 0x01068ef8: 0x1068ef8: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -93,10 +93,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01068eec: 0x1068eec: addu  s0, a0, zero
+// 0x01068efc: 0x1068efc: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01068ef0: 0x1068ef0: lw    a0, 20(a0)
+// 0x01068f00: 0x1068f00: lw    a0, 20(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -105,12 +105,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01068ef4: 0x1068ef4: sll   zero, zero, 0
-// 0x01068ef8: 0x1068ef8: beq   a0, zero, 0x1068f0c sw    ra, 20(sp)
+// 0x01068f04: 0x1068f04: sll   zero, zero, 0
+// 0x01068f08: 0x1068f08: beq   a0, zero, 0x1068f1c sw    ra, 20(sp)
 	ldloc.1
-	brfalse L_1068f0c
+	brfalse L_1068f1c
 // --- basic block ---
-// 0x01068f00: 0x1068f00: jal   0x1000930 sll   zero, zero, 0
+// 0x01068f10: 0x1068f10: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -121,7 +121,7 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01068f08: 0x1068f08: sw    zero, 20(s0)
+// 0x01068f18: 0x1068f18: sw    zero, 20(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -130,15 +130,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_1068f0c:
-// 0x01068f0c: 0x1068f0c: jal   0x1068dc0 addu  a0, s0, zero
+L_1068f1c:
+// 0x01068f1c: 0x1068f1c: jal   0x1068dd0 addu  a0, s0, zero
 	ldloc 6
 	stloc.1
 	ldloc.1
-	call void Cibyl77::wstq_item_init_1068dc0(int32)
+	call void Cibyl77::wstq_item_init_1068dd0(int32)
 // --- basic block ---
-// 0x01068f14: 0x1068f14: lw    ra, 20(sp)
-// 0x01068f18: 0x1068f18: lw    s0, 16(sp)
+// 0x01068f24: 0x1068f24: lw    ra, 20(sp)
+// 0x01068f28: 0x1068f28: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -147,7 +147,7 @@ L_1068f0c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01068f1c: 0x1068f1c: jr    ra addiu sp, sp, 24
+// 0x01068f2c: 0x1068f2c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -159,7 +159,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 wstq_clear_1068f24(int32,int32,int32,int32,int32)
+.method public static int32 wstq_clear_1068f34(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 s2,int32 ra,int32 lo,int32 v1)
@@ -206,12 +206,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068f24: 0x1068f24: addiu sp, sp, -32
+// 0x01068f34: 0x1068f34: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01068f28: 0x1068f28: sw    s2, 24(sp)
+// 0x01068f38: 0x1068f38: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -220,7 +220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01068f2c: 0x1068f2c: sw    s1, 20(sp)
+// 0x01068f3c: 0x1068f3c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -229,7 +229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01068f30: 0x1068f30: sw    s0, 16(sp)
+// 0x01068f40: 0x1068f40: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -238,33 +238,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01068f34: 0x1068f34: sw    ra, 28(sp)
-// 0x01068f38: 0x1068f38: addu  s1, a0, zero
+// 0x01068f44: 0x1068f44: sw    ra, 28(sp)
+// 0x01068f48: 0x1068f48: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01068f3c: 0x1068f3c: addu  s0, zero, zero
+// 0x01068f4c: 0x1068f4c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01068f40: 0x1068f40: j	 0x1068f5c addiu s2, zero, 24
+// 0x01068f50: 0x1068f50: j	 0x1068f6c addiu s2, zero, 24
 	ldc.i4.s 24
 	stloc 9
-	br L_1068f5c
+	br L_1068f6c
 // --- basic block ---
-L_1068f48:
-// 0x01068f48: 0x1068f48: addiu s0, s0, 1
+L_1068f58:
+// 0x01068f58: 0x1068f58: addiu s0, s0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01068f4c: 0x1068f4c: mflo  lo
+// 0x01068f5c: 0x1068f5c: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01068f50: 0x1068f50: addu  a0, s1, a0
+// 0x01068f60: 0x1068f60: addu  a0, s1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x01068f54: 0x1068f54: jal   0x1068ee4 addiu a0, a0, 4
+// 0x01068f64: 0x1068f64: jal   0x1068ef4 addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
@@ -274,13 +274,13 @@ L_1068f48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wstq_item_release_1068ee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::wstq_item_release_1068ef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 8
 // --- basic block ---
-L_1068f5c:
-// 0x01068f5c: 0x1068f5c: lw    v0, 124(s1)
+L_1068f6c:
+// 0x01068f6c: 0x1068f6c: lw    v0, 124(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -289,22 +289,22 @@ L_1068f5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01068f60: 0x1068f60: sll   zero, zero, 0
-// 0x01068f64: 0x1068f64: slt   v0, s0, v0
+// 0x01068f70: 0x1068f70: sll   zero, zero, 0
+// 0x01068f74: 0x1068f74: slt   v0, s0, v0
 	ldloc 6
 	ldloc 8
 	clt
 	stloc 8
-// 0x01068f68: 0x1068f68: bne   v0, zero, 0x1068f48 mult  s0, s2
+// 0x01068f78: 0x1068f78: bne   v0, zero, 0x1068f58 mult  s0, s2
 	ldloc 8
 	ldloc 6
 	ldloc 9
 	mul
 	stloc 11
-	brtrue L_1068f48
+	brtrue L_1068f58
 // --- basic block ---
-// 0x01068f70: 0x1068f70: lw    ra, 28(sp)
-// 0x01068f74: 0x1068f74: sw    zero, 124(s1)
+// 0x01068f80: 0x1068f80: lw    ra, 28(sp)
+// 0x01068f84: 0x1068f84: sw    zero, 124(s1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -313,7 +313,7 @@ L_1068f5c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01068f78: 0x1068f78: lw    s2, 24(sp)
+// 0x01068f88: 0x1068f88: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -322,7 +322,7 @@ L_1068f5c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01068f7c: 0x1068f7c: lw    s1, 20(sp)
+// 0x01068f8c: 0x1068f8c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -331,7 +331,7 @@ L_1068f5c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01068f80: 0x1068f80: lw    s0, 16(sp)
+// 0x01068f90: 0x1068f90: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -340,7 +340,7 @@ L_1068f5c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01068f84: 0x1068f84: jr    ra addiu sp, sp, 32
+// 0x01068f94: 0x1068f94: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -352,7 +352,7 @@ __CIBYL_function_return:
 	ldloc 8
 	ret
 }
-.method public static int32 wst_get_trans_state_1068f8c(int32)
+.method public static int32 wst_get_trans_state_1068f9c(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
@@ -372,7 +372,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068f8c: 0x1068f8c: lw    v0, 16(a0)
+// 0x01068f9c: 0x1068f9c: lw    v0, 16(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -381,13 +381,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01068f90: 0x1068f90: jr    ra sll   zero, zero, 0
+// 0x01068fa0: 0x1068fa0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 wst_stop_trans_1068f98(int32)
+.method public static int32 wst_stop_trans_1068fa8(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -410,7 +410,7 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068f98: 0x1068f98: lw    v1, 16(a0)
+// 0x01068fa8: 0x1068fa8: lw    v1, 16(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -419,17 +419,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01068f9c: 0x1068f9c: addiu v0, zero, 1
+// 0x01068fac: 0x1068fac: addiu v0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01068fa0: 0x1068fa0: bne   v1, v0, 0x1068fac addiu v0, zero, 2
+// 0x01068fb0: 0x1068fb0: bne   v1, v0, 0x1068fbc addiu v0, zero, 2
 	ldloc.2
 	ldloc.1
 	ldc.i4.2
 	stloc.1
-	bne.un L_1068fac
+	bne.un L_1068fbc
 // --- basic block ---
-// 0x01068fa8: 0x1068fa8: sw    v0, 16(a0)
+// 0x01068fb8: 0x1068fb8: sw    v0, 16(a0)
 	ldloc 3
 	ldloc.0
 	ldc.i4.2
@@ -438,8 +438,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-L_1068fac:
-// 0x01068fac: 0x1068fac: jr    ra sll   zero, zero, 0
+L_1068fbc:
+// 0x01068fbc: 0x1068fbc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -447,7 +447,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 websvc_trans_getLastNetConnectRes_1068fb4()
+.method public static int32 websvc_trans_getLastNetConnectRes_1068fc4()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -464,10 +464,10 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068fb4: 0x1068fb4: lui   v0, 0x0
+// 0x01068fc4: 0x1068fc4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01068fb8: 0x1068fb8: lw    v0, 14924(v0)
+// 0x01068fc8: 0x1068fc8: lw    v0, 14924(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
@@ -476,13 +476,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x01068fbc: 0x1068fbc: jr    ra sll   zero, zero, 0
+// 0x01068fcc: 0x1068fcc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 http_response_status_init_1068fc4(int32,int32,int32,int32,int32)
+.method public static int32 http_response_status_init_1068fd4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -517,16 +517,16 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068fc4: 0x1068fc4: addiu sp, sp, -24
+// 0x01068fd4: 0x1068fd4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01068fc8: 0x1068fc8: addu  a1, zero, zero
+// 0x01068fd8: 0x1068fd8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01068fcc: 0x1068fcc: sw    ra, 20(sp)
-// 0x01068fd0: 0x1068fd0: jal   0x100177c addiu a2, zero, 68
+// 0x01068fdc: 0x1068fdc: sw    ra, 20(sp)
+// 0x01068fe0: 0x1068fe0: jal   0x100177c addiu a2, zero, 68
 	ldc.i4.s 68
 	stloc.3
 	ldloc.1
@@ -538,9 +538,9 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01068fd8: 0x1068fd8: lw    ra, 20(sp)
-// 0x01068fdc: 0x1068fdc: sll   zero, zero, 0
-// 0x01068fe0: 0x1068fe0: jr    ra addiu sp, sp, 24
+// 0x01068fe8: 0x1068fe8: lw    ra, 20(sp)
+// 0x01068fec: 0x1068fec: sll   zero, zero, 0
+// 0x01068ff0: 0x1068ff0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -552,7 +552,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 http_response_status_load_1068fe8(int32,int32,int32,int32,int32)
+.method public static int32 http_response_status_load_1068ff8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
@@ -599,12 +599,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01068fe8: 0x1068fe8: addiu sp, sp, -56
+// 0x01068ff8: 0x1068ff8: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01068fec: 0x1068fec: sw    s0, 36(sp)
+// 0x01068ffc: 0x1068ffc: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -613,10 +613,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01068ff0: 0x1068ff0: addu  s0, a1, zero
+// 0x01069000: 0x1069000: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x01068ff4: 0x1068ff4: sw    s3, 48(sp)
+// 0x01069004: 0x1069004: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -625,7 +625,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01068ff8: 0x1068ff8: sw    s2, 44(sp)
+// 0x01069008: 0x1069008: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -634,7 +634,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01068ffc: 0x1068ffc: sw    s1, 40(sp)
+// 0x0106900c: 0x106900c: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -643,14 +643,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01069000: 0x1069000: sw    ra, 52(sp)
-// 0x01069004: 0x1069004: addu  s2, a2, zero
+// 0x01069010: 0x1069010: sw    ra, 52(sp)
+// 0x01069014: 0x1069014: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01069008: 0x1069008: addu  s1, a3, zero
+// 0x01069018: 0x1069018: addu  s1, a3, zero
 	ldloc 4
 	stloc 9
-// 0x0106900c: 0x106900c: sw    zero, 24(sp)
+// 0x0106901c: 0x106901c: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -659,7 +659,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01069010: 0x1069010: jal   0x1068fc4 addu  s3, a0, zero
+// 0x01069020: 0x1069020: jal   0x1068fd4 addu  s3, a0, zero
 	ldloc.1
 	stloc 11
 	ldloc.0
@@ -667,40 +667,40 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::http_response_status_init_1068fc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::http_response_status_init_1068fd4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069018: 0x1069018: beq   s0, zero, 0x1069110 addiu v0, zero, 1
+// 0x01069028: 0x1069028: beq   s0, zero, 0x1069120 addiu v0, zero, 1
 	ldloc 8
 	ldc.i4.1
 	stloc 5
-	brfalse L_1069110
+	brfalse L_1069120
 // --- basic block ---
-// 0x01069020: 0x1069020: beq   s1, zero, 0x1069110 sll   zero, zero, 0
+// 0x01069030: 0x1069030: beq   s1, zero, 0x1069120 sll   zero, zero, 0
 	ldloc 9
-	brfalse L_1069110
+	brfalse L_1069120
 // --- basic block ---
-// 0x01069028: 0x1069028: sw    zero, 0(s1)
+// 0x01069038: 0x1069038: sw    zero, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106902c: 0x106902c: lb    v0, 0(s0)
+// 0x0106903c: 0x106903c: lb    v0, 0(s0)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01069030: 0x1069030: sll   zero, zero, 0
-// 0x01069034: 0x1069034: beq   v0, zero, 0x106910c addu  a0, s0, zero
+// 0x01069040: 0x1069040: sll   zero, zero, 0
+// 0x01069044: 0x1069044: beq   v0, zero, 0x106911c addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brfalse L_106910c
+	brfalse L_106911c
 // --- basic block ---
-// 0x0106903c: 0x106903c: jal   0x1001a5c addiu a1, zero, 10
+// 0x0106904c: 0x106904c: jal   0x1001a5c addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
 	ldloc.1
@@ -710,27 +710,27 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069044: 0x1069044: beq   v0, zero, 0x1069110 addiu v0, zero, 2
+// 0x01069054: 0x1069054: beq   v0, zero, 0x1069120 addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
 	stloc 5
-	brfalse L_1069110
+	brfalse L_1069120
 // --- basic block ---
-// 0x0106904c: 0x106904c: beq   s2, zero, 0x106906c addu  a0, s0, zero
+// 0x0106905c: 0x106905c: beq   s2, zero, 0x106907c addu  a0, s0, zero
 	ldloc 10
 	ldloc 8
 	stloc.1
-	brfalse L_106906c
+	brfalse L_106907c
 // --- basic block ---
-// 0x01069054: 0x1069054: lui   a1, 0x10000
+// 0x01069064: 0x1069064: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01069058: 0x1069058: addiu a1, a1, 18164
+// 0x01069068: 0x1069068: addiu a1, a1, 18160
 	ldloc.2
-	ldc.i4 18164
+	ldc.i4 18160
 	add
 	stloc.2
-// 0x0106905c: 0x106905c: jal   0x1001b2c addiu a2, zero, 3
+// 0x0106906c: 0x106906c: jal   0x1001b2c addiu a2, zero, 3
 	ldc.i4.3
 	stloc.3
 	ldloc.1
@@ -739,35 +739,35 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01069064: 0x1069064: bne   v0, zero, 0x1069104 addiu a0, s0, 3
+// 0x01069074: 0x1069074: bne   v0, zero, 0x1069114 addiu a0, s0, 3
 	ldloc 5
 	ldloc 8
 	ldc.i4.3
 	add
 	stloc.1
-	brtrue L_1069104
+	brtrue L_1069114
 // --- basic block ---
-L_106906c:
-// 0x0106906c: 0x106906c: lui   a1, 0x0
+L_106907c:
+// 0x0106907c: 0x106907c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01069070: 0x1069070: addiu s2, zero, -1
+// 0x01069080: 0x1069080: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x01069074: 0x1069074: addiu a1, a1, 28076
+// 0x01069084: 0x1069084: addiu a1, a1, 28076
 	ldloc.2
 	ldc.i4 28076
 	add
 	stloc.2
-// 0x01069078: 0x1069078: addu  a2, zero, zero
+// 0x01069088: 0x1069088: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0106907c: 0x106907c: addiu a3, sp, 24
+// 0x0106908c: 0x106908c: addiu a3, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 4
-// 0x01069080: 0x1069080: jal   0x106855c sw    s2, 16(sp)
+// 0x01069090: 0x1069090: jal   0x106856c sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -781,27 +781,27 @@ L_106906c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069088: 0x1069088: beq   v0, zero, 0x1069104 sll   zero, zero, 0
+// 0x01069098: 0x1069098: beq   v0, zero, 0x1069114 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1069104
+	brfalse L_1069114
 // --- basic block ---
-// 0x01069090: 0x1069090: lb    v1, 0(v0)
+// 0x010690a0: 0x10690a0: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x01069094: 0x1069094: sll   zero, zero, 0
-// 0x01069098: 0x1069098: beq   v1, zero, 0x1069104 lui   a3, 0x10000
+// 0x010690a4: 0x10690a4: sll   zero, zero, 0
+// 0x010690a8: 0x10690a8: beq   v1, zero, 0x1069114 lui   a3, 0x10000
 	ldloc 7
 	ldc.i4 65536
 	stloc 4
-	brfalse L_1069104
+	brfalse L_1069114
 // --- basic block ---
-// 0x010690a0: 0x10690a0: lw    v1, 24(sp)
+// 0x010690b0: 0x10690b0: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -810,36 +810,36 @@ L_106906c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010690a4: 0x10690a4: sll   zero, zero, 0
-// 0x010690a8: 0x10690a8: sw    v1, 0(s3)
+// 0x010690b4: 0x10690b4: sll   zero, zero, 0
+// 0x010690b8: 0x10690b8: sw    v1, 0(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x010690ac: 0x10690ac: addu  a0, v0, zero
+// 0x010690bc: 0x10690bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010690b0: 0x10690b0: addiu a1, s3, 4
+// 0x010690c0: 0x10690c0: addiu a1, s3, 4
 	ldloc 11
 	ldc.i4.4
 	add
 	stloc.2
-// 0x010690b4: 0x10690b4: addiu v0, zero, 63
+// 0x010690c4: 0x10690c4: addiu v0, zero, 63
 	ldc.i4.s 63
 	stloc 5
-// 0x010690b8: 0x10690b8: addiu a3, a3, 5360
+// 0x010690c8: 0x10690c8: addiu a3, a3, 5356
 	ldloc 4
-	ldc.i4 5360
+	ldc.i4 5356
 	add
 	stloc 4
-// 0x010690bc: 0x10690bc: addiu a2, sp, 28
+// 0x010690cc: 0x10690cc: addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.3
-// 0x010690c0: 0x10690c0: sw    v0, 28(sp)
+// 0x010690d0: 0x10690d0: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -848,7 +848,7 @@ L_106906c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010690c4: 0x10690c4: jal   0x1068250 sw    s2, 16(sp)
+// 0x010690d4: 0x10690d4: jal   0x1068260 sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -862,25 +862,25 @@ L_106906c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010690cc: 0x10690cc: beq   v0, zero, 0x1069104 sll   zero, zero, 0
+// 0x010690dc: 0x10690dc: beq   v0, zero, 0x1069114 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1069104
+	brfalse L_1069114
 // --- basic block ---
-// 0x010690d4: 0x10690d4: lb    v1, 0(v0)
+// 0x010690e4: 0x10690e4: lb    v1, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-// 0x010690d8: 0x10690d8: sll   zero, zero, 0
-// 0x010690dc: 0x10690dc: bne   v1, zero, 0x10690f4 sll   zero, zero, 0
+// 0x010690e8: 0x10690e8: sll   zero, zero, 0
+// 0x010690ec: 0x10690ec: bne   v1, zero, 0x1069104 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10690f4
+	brtrue L_1069104
 // --- basic block ---
-// 0x010690e4: 0x10690e4: jal   0x1001b48 addu  a0, s0, zero
+// 0x010690f4: 0x10690f4: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -889,47 +889,47 @@ L_106906c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010690ec: 0x10690ec: j	 0x10690fc sw    v0, 0(s1)
+// 0x010690fc: 0x10690fc: j	 0x106910c sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-	br L_10690fc
+	br L_106910c
 // --- basic block ---
-L_10690f4:
-// 0x010690f4: 0x10690f4: subu  s0, v0, s0
+L_1069104:
+// 0x01069104: 0x1069104: subu  s0, v0, s0
 	ldloc 5
 	ldloc 8
 	sub
 	stloc 8
-// 0x010690f8: 0x10690f8: sw    s0, 0(s1)
+// 0x01069108: 0x1069108: sw    s0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_10690fc:
-// 0x010690fc: 0x10690fc: j	 0x1069110 addu  v0, zero, zero
+L_106910c:
+// 0x0106910c: 0x106910c: j	 0x1069120 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1069110
+	br L_1069120
 // --- basic block ---
-L_1069104:
-// 0x01069104: 0x1069104: j	 0x1069110 addiu v0, zero, 1
+L_1069114:
+// 0x01069114: 0x1069114: j	 0x1069120 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1069110
+	br L_1069120
 // --- basic block ---
-L_106910c:
-// 0x0106910c: 0x106910c: addiu v0, zero, 2
+L_106911c:
+// 0x0106911c: 0x106911c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-L_1069110:
-// 0x01069110: 0x1069110: lw    ra, 52(sp)
-// 0x01069114: 0x1069114: lw    s3, 48(sp)
+L_1069120:
+// 0x01069120: 0x1069120: lw    ra, 52(sp)
+// 0x01069124: 0x1069124: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -938,7 +938,7 @@ L_1069110:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01069118: 0x1069118: lw    s2, 44(sp)
+// 0x01069128: 0x1069128: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -947,7 +947,7 @@ L_1069110:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0106911c: 0x106911c: lw    s1, 40(sp)
+// 0x0106912c: 0x106912c: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -956,7 +956,7 @@ L_1069110:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01069120: 0x1069120: lw    s0, 36(sp)
+// 0x01069130: 0x1069130: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -965,7 +965,7 @@ L_1069110:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01069124: 0x1069124: jr    ra addiu sp, sp, 56
+// 0x01069134: 0x1069134: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -977,10 +977,10 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_data_received__106912c(int32,int32,int32,int32,int32)
+.method public static int32 OnCustomResponse_106913c(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s3,int32 s6,int32 s4,int32 s1,int32 s5,int32 s7,int32 s2,int32 s8,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s5,int32 s0,int32 s1,int32 s2,int32 s6,int32 s3,int32 s4,int32 s7,int32 s8,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -988,14 +988,14 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local 12 is register s1
-// local 15 is register s2
-// local  9 is register s3
-// local 11 is register s4
-// local 13 is register s5
-// local 10 is register s6
-// local 14 is register s7
+// local  9 is register s0
+// local 10 is register s1
+// local 11 is register s2
+// local 13 is register s3
+// local 14 is register s4
+// local  8 is register s5
+// local 12 is register s6
+// local 15 is register s7
 // local  0 is register sp
 // local 16 is register s8
 // local 17 is register ra
@@ -1014,21 +1014,21 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
 	stloc 11
 	ldc.i4.s 0
 	stloc 13
 	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
 	stloc 14
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
@@ -1039,807 +1039,699 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106912c: 0x106912c: lw    v0, 16(a2)
+// 0x0106913c: 0x106913c: addiu sp, sp, -128
+	ldloc.0
+	ldc.i4.s -128
+	add
+	stloc.0
+// 0x01069140: 0x1069140: lw    v0, 4484(a0)
 	ldloc 6
-	ldloc.3
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 1121
 	add
 	ldelem.i4
 	stloc 5
-// 0x01069130: 0x1069130: addiu sp, sp, -128
+// 0x01069144: 0x1069144: sw    zero, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -128
-	add
-	stloc.0
-// 0x01069134: 0x1069134: addiu v1, zero, 2
 	ldc.i4.2
-	stloc 7
-// 0x01069138: 0x1069138: sw    s2, 96(sp)
+	shr.un
+	ldc.i4.6
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x01069148: 0x1069148: sw    s8, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.s 30
 	add
-	ldloc 15
+	ldloc 16
 	stelem.i4
-// 0x0106913c: 0x106913c: sw    s0, 88(sp)
+// 0x0106914c: 0x106914c: sw    s7, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.s 29
 	add
-	ldloc 8
+	ldloc 15
 	stelem.i4
-// 0x01069140: 0x1069140: sw    ra, 124(sp)
-// 0x01069144: 0x1069144: sw    s8, 120(sp)
+// 0x01069150: 0x1069150: sw    s2, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.s 24
 	add
-	ldloc 16
+	ldloc 11
 	stelem.i4
-// 0x01069148: 0x1069148: sw    s7, 116(sp)
+// 0x01069154: 0x1069154: sw    s0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 29
+	ldc.i4.s 22
 	add
-	ldloc 14
+	ldloc 9
 	stelem.i4
-// 0x0106914c: 0x106914c: sw    s6, 112(sp)
+// 0x01069158: 0x1069158: sw    ra, 124(sp)
+// 0x0106915c: 0x106915c: sw    s6, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 28
 	add
-	ldloc 10
+	ldloc 12
 	stelem.i4
-// 0x01069150: 0x1069150: sw    s5, 108(sp)
+// 0x01069160: 0x1069160: sw    s5, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 27
 	add
-	ldloc 13
+	ldloc 8
 	stelem.i4
-// 0x01069154: 0x1069154: sw    s4, 104(sp)
+// 0x01069164: 0x1069164: sw    s4, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 26
 	add
-	ldloc 11
+	ldloc 14
 	stelem.i4
-// 0x01069158: 0x1069158: sw    s3, 100(sp)
+// 0x01069168: 0x1069168: sw    s3, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 25
 	add
-	ldloc 9
+	ldloc 13
 	stelem.i4
-// 0x0106915c: 0x106915c: sw    s1, 92(sp)
+// 0x0106916c: 0x106916c: sw    s1, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 23
 	add
-	ldloc 12
+	ldloc 10
 	stelem.i4
-// 0x01069160: 0x1069160: addu  s0, a2, zero
-	ldloc.3
-	stloc 8
-// 0x01069164: 0x1069164: bne   v0, v1, 0x1069190 addu  s2, a1, zero
-	ldloc 5
-	ldloc 7
-	ldloc.2
-	stloc 15
-	bne.un L_1069190
-// --- basic block ---
-// 0x0106916c: 0x106916c: addiu v0, zero, 5
-	ldc.i4.5
-	stloc 5
-// 0x01069170: 0x1069170: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01069174: 0x1069174: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01069178: 0x1069178: sw    v0, 4500(a2)
+// 0x01069170: 0x1069170: addu  s0, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01069174: 0x1069174: sw    v0, 72(sp)
 	ldloc 6
-	ldloc.3
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4.s 18
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106917c: 0x106917c: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x01069180: 0x1069180: addiu a3, a3, 18208
-	ldloc 4
-	ldc.i4 18208
-	add
-	stloc 4
-// 0x01069184: 0x1069184: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01069188: 0x1069188: j	 0x10697f4 addiu a2, zero, 628
-	ldc.i4 628
-	stloc.3
-	br L_10697f4
-// --- basic block ---
-L_1069190:
-// 0x01069190: 0x1069190: bgez  a1, 0x10691bc lui   a3, 0x10000
-	ldloc.2
-	ldc.i4 65536
-	stloc 4
-	ldc.i4.s 0
-	bge L_10691bc
-// --- basic block ---
-// 0x01069198: 0x1069198: lw    v0, 12(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106919c: 0x106919c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010691a0: 0x10691a0: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x010691a4: 0x10691a4: addiu a3, a3, 18256
-	ldloc 4
-	ldc.i4 18256
-	add
-	stloc 4
-// 0x010691a8: 0x10691a8: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010691ac: 0x10691ac: addiu a2, zero, 634
-	ldc.i4 634
-	stloc.3
-// 0x010691b0: 0x10691b0: sw    v0, 16(sp)
+// 0x01069178: 0x1069178: sw    zero, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
-// 0x010691b4: 0x10691b4: j	 0x106983c sw    s2, 20(sp)
+// 0x0106917c: 0x106917c: addiu s2, a0, 2404
+	ldloc.1
+	ldc.i4 2404
+	add
+	stloc 11
+// 0x01069180: 0x1069180: lw    s8, 4488(a0)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 1122
 	add
-	ldloc 15
-	stelem.i4
-	br L_106983c
-// --- basic block ---
-L_10691bc:
-// 0x010691bc: 0x10691bc: beq   a1, zero, 0x10691e8 sll   zero, zero, 0
-	ldloc.2
-	brfalse L_10691e8
-// --- basic block ---
-// 0x010691c4: 0x10691c4: bne   a0, zero, 0x10691e8 lui   a1, 0x10000
-	ldloc.1
-	ldc.i4 65536
-	stloc.2
-	brtrue L_10691e8
+	ldelem.i4
+	stloc 16
+// 0x01069184: 0x1069184: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+// 0x01069188: 0x1069188: j	 0x10691c4 addu  s7, zero, zero
+	ldc.i4.s 0
+	stloc 15
+	br L_10691c4
 // --- basic block ---
-// 0x010691cc: 0x10691cc: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010691d0: 0x10691d0: lw    v0, 12(a2)
+L_1069190:
+// 0x01069190: 0x1069190: lw    a0, 0(v0)
 	ldloc 6
-	ldloc.3
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
-	add
 	ldelem.i4
-	stloc 5
-// 0x010691d4: 0x10691d4: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
+	stloc.1
+// 0x01069194: 0x1069194: sll   zero, zero, 0
+// 0x01069198: 0x1069198: beq   a0, zero, 0x10691b8 addu  a1, v0, zero
+	ldloc.1
+	ldloc 5
 	stloc.2
-// 0x010691d8: 0x10691d8: addiu a3, a3, 18332
-	ldloc 4
-	ldc.i4 18332
-	add
-	stloc 4
-// 0x010691dc: 0x10691dc: addiu a0, zero, 4
-	ldc.i4.4
+	brfalse L_10691b8
+// --- basic block ---
+// 0x010691a0: 0x10691a0: lb    a0, 0(a0)
+	ldloc.1
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010691e0: 0x10691e0: j	 0x1069838 addiu a2, zero, 640
-	ldc.i4 640
-	stloc.3
-	br L_1069838
+// 0x010691a4: 0x10691a4: sll   zero, zero, 0
+// 0x010691a8: 0x10691a8: beq   a0, zero, 0x10691b8 addiu v0, v0, 8
+	ldloc.1
+	ldloc 5
+	ldc.i4.8
+	add
+	stloc 5
+	brfalse L_10691b8
 // --- basic block ---
-L_10691e8:
-// 0x010691e8: 0x10691e8: lw    v0, 12(s0)
+// 0x010691b0: 0x10691b0: j	 0x10691c4 addiu s7, zero, 1
+	ldc.i4.1
+	stloc 15
+	br L_10691c4
+// --- basic block ---
+L_10691b8:
+// 0x010691b8: 0x10691b8: lw    s4, 4(a1)
 	ldloc 6
-	ldloc 8
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 5
-// 0x010691ec: 0x10691ec: lui   s5, 0x10000
-	ldc.i4 65536
-	stloc 13
-// 0x010691f0: 0x10691f0: lui   a3, 0x10000
+	stloc 14
+// 0x010691bc: 0x10691bc: j	 0x1069474 lui   s6, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x010691f4: 0x10691f4: addiu a3, a3, 18384
-	ldloc 4
-	ldc.i4 18384
-	add
-	stloc 4
-// 0x010691f8: 0x10691f8: addiu a0, zero, 1
-	ldc.i4.1
+	stloc 12
+	br L_1069474
+// --- basic block ---
+L_10691c4:
+// 0x010691c4: 0x10691c4: slt   a0, v1, s8
+	ldloc 7
+	ldloc 16
+	clt
 	stloc.1
-// 0x010691fc: 0x10691fc: addiu a1, s5, 18168
-	ldloc 13
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x01069200: 0x1069200: addiu a2, zero, 644
-	ldc.i4 644
-	stloc.3
-// 0x01069204: 0x1069204: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+// 0x010691c8: 0x10691c8: bne   a0, zero, 0x1069190 addiu v1, v1, 1
+	ldloc.1
+	ldloc 7
+	ldc.i4.1
 	add
-	ldloc 5
-	stelem.i4
-// 0x01069208: 0x1069208: jal   0x100449c sw    s2, 20(sp)
+	stloc 7
+	brtrue L_1069190
+// --- basic block ---
+// 0x010691d0: 0x10691d0: j	 0x1069470 addu  s4, zero, zero
+	ldc.i4.s 0
+	stloc 14
+	br L_1069470
+// --- basic block ---
+L_10691d8:
+// 0x010691d8: 0x10691d8: jal   0x106ac5c sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc 15
+	ldc.i4.s 0
 	stelem.i4
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	call int32 Cibyl79::cyclic_buffer_get_unprocessed_data_106ac5c(int32)
+	stloc 5
+// --- basic block ---
+// 0x010691e0: 0x10691e0: addu  s1, v0, zero
+	ldloc 5
+	stloc 10
+// 0x010691e4: 0x10691e4: lb    v0, 0(v0)
+	ldloc 5
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
+// 0x010691e8: 0x10691e8: sll   zero, zero, 0
+// 0x010691ec: 0x10691ec: bne   v0, zero, 0x106922c lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106922c
 // --- basic block ---
-// 0x01069210: 0x1069210: lw    v0, 4456(s0)
+// 0x010691f4: 0x10691f4: lw    v0, 4460(s0)
 	ldloc 6
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 1114
+	ldc.i4 1115
 	add
 	ldelem.i4
 	stloc 5
-// 0x01069214: 0x1069214: lw    s4, 4480(s0)
+// 0x010691f8: 0x10691f8: lw    a0, 4468(s0)
 	ldloc 6
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 1120
+	ldc.i4 1117
 	add
 	ldelem.i4
-	stloc 11
-// 0x01069218: 0x1069218: addu  v0, s2, v0
-	ldloc 15
-	ldloc 5
-	add
-	stloc 5
-// 0x0106921c: 0x106921c: addu  v1, s0, v0
-	ldloc 8
-	ldloc 5
-	add
-	stloc 7
-// 0x01069220: 0x1069220: sw    v0, 4456(s0)
+	stloc.1
+// 0x010691fc: 0x10691fc: lw    v1, 4464(s0)
 	ldloc 6
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 1114
+	ldc.i4 1116
 	add
+	ldelem.i4
+	stloc 7
+// 0x01069200: 0x1069200: subu  v0, zero, v0
 	ldloc 5
-	stelem.i4
-// 0x01069224: 0x1069224: addiu v0, zero, 2
-	ldc.i4.2
+	neg
 	stloc 5
-// 0x01069228: 0x1069228: sb    zero, 2404(v1)
-	ldloc 7
-	ldc.i4 2404
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106922c: 0x106922c: beq   s4, v0, 0x10693c0 addiu s1, s0, 2404
-	ldloc 11
+// 0x01069204: 0x1069204: subu  v0, v0, a0
 	ldloc 5
-	ldloc 8
-	ldc.i4 2404
-	add
-	stloc 12
-	beq  L_10693c0
-// --- basic block ---
-// 0x01069234: 0x1069234: jal   0x106a638 addu  a0, s1, zero
-	ldloc 12
-	stloc.1
 	ldloc.1
-	call int32 Cibyl79::cyclic_buffer_get_unprocessed_data_106a638(int32)
+	sub
 	stloc 5
-// --- basic block ---
-// 0x0106923c: 0x106923c: addu  s3, v0, zero
+// 0x01069208: 0x1069208: addu  v0, v0, v1
 	ldloc 5
-	stloc 9
-// 0x01069240: 0x1069240: bne   s4, zero, 0x1069298 sw    zero, 24(sp)
-	ldloc 11
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldc.i4.s 0
-	stelem.i4
-	brtrue L_1069298
-// --- basic block ---
-// 0x01069248: 0x1069248: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106924c: 0x106924c: addiu a1, a1, 5360
-	ldloc.2
-	ldc.i4 5360
+	ldloc 7
 	add
-	stloc.2
-// 0x01069250: 0x1069250: jal   0x1000420 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x01069258: 0x1069258: beq   v0, zero, 0x10693b0 subu  a1, v0, s3
-	ldloc 5
-	ldloc 5
-	ldloc 9
-	sub
-	stloc.2
-	brfalse L_10693b0
-// --- basic block ---
-// 0x01069260: 0x1069260: jal   0x1067cd0 addu  a0, s3, zero
-	ldloc 9
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::ToLowerN_1067cd0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x0106920c: 0x106920c: addiu v1, zero, 18
+	ldc.i4.s 18
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069268: 0x1069268: lui   a1, 0x10000
+// 0x01069210: 0x1069210: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc.2
-// 0x0106926c: 0x106926c: addu  a0, s3, zero
+	stloc 4
+// 0x01069214: 0x1069214: sw    v1, 4500(s0)
+	ldloc 6
 	ldloc 9
-	stloc.1
-// 0x01069270: 0x1069270: jal   0x1000420 addiu a1, a1, 18436
-	ldloc.2
-	ldc.i4 18436
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
 	add
-	stloc.2
-	ldloc.0
-	ldloc.1
+	ldloc 7
+	stelem.i4
+// 0x01069218: 0x1069218: addiu a1, a1, 18164
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069278: 0x1069278: bne   v0, zero, 0x1069294 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brtrue L_1069294
-// --- basic block ---
-// 0x01069280: 0x1069280: addiu a1, s5, 18168
-	ldloc 13
-	ldc.i4 18168
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x01069284: 0x1069284: addiu a3, a3, 18444
+// 0x0106921c: 0x106921c: addiu a3, a3, 18204
 	ldloc 4
-	ldc.i4 18444
+	ldc.i4 18204
 	add
 	stloc 4
-// 0x01069288: 0x1069288: addiu a0, zero, 4
+// 0x01069220: 0x1069220: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106928c: 0x106928c: j	 0x1069344 addiu a2, zero, 805
-	ldc.i4 805
+// 0x01069224: 0x1069224: j	 0x1069374 addiu a2, zero, 1023
+	ldc.i4 1023
 	stloc.3
-	br L_1069344
+	br L_1069374
 // --- basic block ---
-L_1069294:
-// 0x01069294: 0x1069294: addiu s4, zero, 1
-	ldc.i4.1
-	stloc 11
-L_1069298:
-// 0x01069298: 0x1069298: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106929c: 0x106929c: addiu a1, a1, 18496
-	ldloc.2
-	ldc.i4 18496
-	add
-	stloc.2
-// 0x010692a0: 0x10692a0: jal   0x1000420 addu  a0, s3, zero
-	ldloc 9
+L_106922c:
+// 0x0106922c: 0x106922c: addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-	ldloc.0
+// 0x01069230: 0x1069230: jal   0x1001a5c addiu a1, zero, 10
+	ldc.i4.s 10
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strchr_1001a5c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010692a8: 0x10692a8: beq   v0, zero, 0x10693b0 subu  v1, v0, s3
-	ldloc 5
+// 0x01069238: 0x1069238: beq   v0, zero, 0x10694a8 addiu v0, zero, 2
 	ldloc 5
-	ldloc 9
-	sub
-	stloc 7
-	brfalse L_10693b0
+	ldc.i4.2
+	stloc 5
+	brfalse L_10694a8
 // --- basic block ---
-// 0x010692b0: 0x10692b0: addiu v1, v1, 4
-	ldloc 7
-	ldc.i4.4
+// 0x01069240: 0x1069240: beq   s7, zero, 0x1069334 addiu v0, zero, 31
+	ldloc 15
+	ldc.i4.s 31
+	stloc 5
+	brfalse L_1069334
+// --- basic block ---
+// 0x01069248: 0x1069248: lui   a3, 0x0
+	ldc.i4.s 0
+	stloc 4
+// 0x0106924c: 0x106924c: addiu a2, sp, 28
+	ldloc.0
+	ldc.i4.s 28
 	add
-	stloc 7
-// 0x010692b4: 0x10692b4: sw    v1, 4460(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1115
+	stloc.3
+// 0x01069250: 0x1069250: addiu a3, a3, 30268
+	ldloc 4
+	ldc.i4 30268
 	add
-	ldloc 7
-	stelem.i4
-// 0x010692b8: 0x10692b8: lui   v1, 0x7fff0000
-	ldc.i4 2147418112
-	stloc 7
-// 0x010692bc: 0x10692bc: ori   v1, v1, 65535
-	ldloc 7
-	ldc.i4 65535
-	or
-	stloc 7
-// 0x010692c0: 0x10692c0: subu  a1, v0, s3
-	ldloc 5
-	ldloc 9
-	sub
-	stloc.2
-// 0x010692c4: 0x10692c4: addu  a0, s3, zero
-	ldloc 9
+	stloc 4
+// 0x01069254: 0x1069254: addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x010692c8: 0x10692c8: sw    v1, 4464(s0)
+// 0x01069258: 0x1069258: addu  a1, s3, zero
+	ldloc 13
+	stloc.2
+// 0x0106925c: 0x106925c: sw    v0, 28(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1116
+	ldc.i4.7
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
-// 0x010692cc: 0x10692cc: jal   0x1067cd0 sw    zero, 4468(s0)
+// 0x01069260: 0x1069260: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x01069264: 0x1069264: jal   0x1068260 sw    v0, 16(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1117
+	ldc.i4.4
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ToLowerN_1067cd0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010692d4: 0x10692d4: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010692d8: 0x10692d8: addu  a0, s3, zero
-	ldloc 9
-	stloc.1
-// 0x010692dc: 0x10692dc: jal   0x1000420 addiu a1, a1, 18504
-	ldloc.2
-	ldc.i4 18504
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ExtractNetworkString_1068260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010692e4: 0x10692e4: beq   v0, zero, 0x1069380 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_1069380
-// --- basic block ---
-// 0x010692ec: 0x10692ec: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x010692f0: 0x10692f0: addiu a0, v0, 15
+// 0x0106926c: 0x106926c: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4.s 15
-	add
 	stloc.1
-// 0x010692f4: 0x10692f4: addiu a1, a1, 5360
-	ldloc.2
-	ldc.i4 5360
-	add
+// 0x01069270: 0x1069270: addu  a1, s6, zero
+	ldloc 12
 	stloc.2
-// 0x010692f8: 0x10692f8: addiu a2, a2, 48
-	ldloc.3
-	ldc.i4.s 48
-	add
+// 0x01069274: 0x1069274: jal   0x10681b8 addiu a2, zero, -1
+	ldc.i4.m1
 	stloc.3
-// 0x010692fc: 0x10692fc: addiu a3, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 4
-// 0x01069300: 0x1069300: jal   0x106855c sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldc.i4.s 0
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ReadIntFromString_106855c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069308: 0x1069308: beq   v0, zero, 0x1069330 lui   a1, 0x10000
+// 0x0106927c: 0x106927c: beq   v0, zero, 0x10692a0 addu  v1, v0, zero
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_1069330
+	ldloc 5
+	stloc 7
+	brfalse L_10692a0
 // --- basic block ---
-// 0x01069310: 0x1069310: lb    v0, 0(v0)
+// 0x01069284: 0x1069284: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01069314: 0x1069314: sll   zero, zero, 0
-// 0x01069318: 0x1069318: beq   v0, zero, 0x1069334 lui   a3, 0x10000
+// 0x01069288: 0x1069288: sll   zero, zero, 0
+// 0x0106928c: 0x106928c: beq   v0, zero, 0x10692a4 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
-	stloc 4
-	brfalse L_1069334
+	stloc.2
+	brfalse L_10692a4
 // --- basic block ---
-// 0x01069320: 0x1069320: lw    v0, 24(sp)
+// 0x01069294: 0x1069294: lw    s5, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 18
 	add
 	ldelem.i4
-	stloc 5
-// 0x01069324: 0x1069324: sll   zero, zero, 0
-// 0x01069328: 0x1069328: bne   v0, zero, 0x1069354 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brtrue L_1069354
+	stloc 8
+// 0x01069298: 0x1069298: j	 0x106930c addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	br L_106930c
 // --- basic block ---
-L_1069330:
-// 0x01069330: 0x1069330: lui   a3, 0x10000
+L_10692a0:
+// 0x010692a0: 0x10692a0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+L_10692a4:
+// 0x010692a4: 0x10692a4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-L_1069334:
-// 0x01069334: 0x1069334: addiu a1, a1, 18168
+// 0x010692a8: 0x10692a8: addiu a1, a1, 18164
 	ldloc.2
-	ldc.i4 18168
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x01069338: 0x1069338: addiu a3, a3, 18520
+// 0x010692ac: 0x10692ac: addiu a3, a3, 18324
 	ldloc 4
-	ldc.i4 18520
+	ldc.i4 18324
 	add
 	stloc 4
-// 0x0106933c: 0x106933c: addiu a0, zero, 4
+// 0x010692b0: 0x10692b0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01069340: 0x1069340: addiu a2, zero, 841
-	ldc.i4 841
+// 0x010692b4: 0x10692b4: addiu a2, zero, 1051
+	ldc.i4 1051
 	stloc.3
-L_1069344:
-// 0x01069344: 0x1069344: jal   0x100449c sw    s3, 16(sp)
+// 0x010692b8: 0x10692b8: j	 0x1069378 sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 10
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106934c: 0x106934c: j	 0x10693b4 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_10693b4
+	br L_1069378
 // --- basic block ---
-L_1069354:
-// 0x01069354: 0x1069354: lw    v1, 4460(s0)
+L_10692c0:
+// 0x010692c0: 0x10692c0: lw    v0, 0(s5)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 1115
-	add
 	ldelem.i4
-	stloc 7
-// 0x01069358: 0x1069358: sll   zero, zero, 0
-// 0x0106935c: 0x106935c: addu  v1, v1, v0
-	ldloc 7
-	ldloc 5
+	stloc 5
+// 0x010692c4: 0x10692c4: addiu a2, a2, 1
+	ldloc.3
+	ldc.i4.1
 	add
-	stloc 7
-// 0x01069360: 0x1069360: sw    v1, 4464(s0)
+	stloc.3
+// 0x010692c8: 0x10692c8: beq   v0, zero, 0x1069308 addu  a1, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc.2
+	brfalse L_1069308
+// --- basic block ---
+// 0x010692d0: 0x10692d0: sw    v1, 76(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1116
+	ldc.i4.s 19
 	add
 	ldloc 7
 	stelem.i4
-// 0x01069364: 0x1069364: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+// 0x010692d4: 0x10692d4: jal   0x101c7f8 sw    a2, 80(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
 	add
-	stloc.2
-// 0x01069368: 0x1069368: addiu a3, a3, 18600
-	ldloc 4
-	ldc.i4 18600
+	ldloc.3
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl20::roadmap_string_compare_ignore_case_101c7f8(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010692dc: 0x10692dc: lw    v1, 76(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
 	add
-	stloc 4
-// 0x0106936c: 0x106936c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01069370: 0x1069370: addiu a2, zero, 849
-	ldc.i4 849
-	stloc.3
-// 0x01069374: 0x1069374: sw    v0, 16(sp)
+	ldelem.i4
+	stloc 7
+// 0x010692e0: 0x10692e0: lw    a2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 20
 	add
+	ldelem.i4
+	stloc.3
+// 0x010692e4: 0x10692e4: bne   v0, zero, 0x106930c addiu s5, s5, 8
 	ldloc 5
-	stelem.i4
-// 0x01069378: 0x1069378: j	 0x106939c sw    s3, 20(sp)
+	ldloc 8
+	ldc.i4.8
+	add
+	stloc 8
+	brtrue L_106930c
+// --- basic block ---
+// 0x010692ec: 0x10692ec: addiu s5, s5, -8
+	ldloc 8
+	ldc.i4.s -8
+	add
+	stloc 8
+// 0x010692f0: 0x10692f0: lw    s5, 4(s5)
 	ldloc 6
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.1
 	add
-	ldloc 9
-	stelem.i4
-	br L_106939c
+	ldelem.i4
+	stloc 8
+// 0x010692f4: 0x10692f4: sll   zero, zero, 0
+// 0x010692f8: 0x10692f8: bne   s5, zero, 0x1069320 addu  a1, v1, zero
+	ldloc 8
+	ldloc 7
+	stloc.2
+	brtrue L_1069320
+// --- basic block ---
+// 0x01069300: 0x1069300: j	 0x1069334 sll   zero, zero, 0
+	br L_1069334
+// --- basic block ---
+L_1069308:
+// 0x01069308: 0x1069308: addiu s5, s5, 8
+	ldloc 8
+	ldc.i4.8
+	add
+	stloc 8
+L_106930c:
+// 0x0106930c: 0x106930c: slt   v0, a2, s8
+	ldloc.3
+	ldloc 16
+	clt
+	stloc 5
+// 0x01069310: 0x1069310: bne   v0, zero, 0x10692c0 addu  a0, s3, zero
+	ldloc 5
+	ldloc 13
+	stloc.1
+	brtrue L_10692c0
+// --- basic block ---
+// 0x01069318: 0x1069318: j	 0x1069334 sll   zero, zero, 0
+	br L_1069334
+// --- basic block ---
+L_1069320:
+// 0x01069320: 0x1069320: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x01069324: 0x1069324: jal   0x106ac68 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::cyclic_buffer_update_processed_data_106ac68(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106932c: 0x106932c: j	 0x1069388 sll   zero, zero, 0
+	br L_1069388
 // --- basic block ---
-L_1069380:
-// 0x01069380: 0x1069380: lui   a1, 0x10000
+L_1069334:
+// 0x01069334: 0x1069334: beq   s4, zero, 0x1069350 addu  a0, s2, zero
+	ldloc 14
+	ldloc 11
+	stloc.1
+	brfalse L_1069350
+// --- basic block ---
+// 0x0106933c: 0x106933c: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x01069340: 0x1069340: jal   0x106ac68 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::cyclic_buffer_update_processed_data_106ac68(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069348: 0x1069348: j	 0x1069388 addu  s5, s4, zero
+	ldloc 14
+	stloc 8
+	br L_1069388
+// --- basic block ---
+L_1069350:
+// 0x01069350: 0x1069350: addiu v0, zero, 20
+	ldc.i4.s 20
+	stloc 5
+// 0x01069354: 0x1069354: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01069384: 0x1069384: lui   a3, 0x10000
+// 0x01069358: 0x1069358: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01069388: 0x1069388: addiu a1, a1, 18168
+// 0x0106935c: 0x106935c: sw    v0, 4500(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
+	add
+	ldloc 5
+	stelem.i4
+// 0x01069360: 0x1069360: addiu a1, a1, 18164
 	ldloc.2
-	ldc.i4 18168
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x0106938c: 0x106938c: addiu a3, a3, 18660
+// 0x01069364: 0x1069364: addiu a3, a3, 18412
 	ldloc 4
-	ldc.i4 18660
+	ldc.i4 18412
 	add
 	stloc 4
-// 0x01069390: 0x1069390: addiu a0, zero, 1
-	ldc.i4.1
+// 0x01069368: 0x1069368: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01069394: 0x1069394: addiu a2, zero, 851
-	ldc.i4 851
+// 0x0106936c: 0x106936c: addiu a2, zero, 1087
+	ldc.i4 1087
 	stloc.3
-// 0x01069398: 0x1069398: sw    s3, 16(sp)
+// 0x01069370: 0x1069370: addiu v0, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
+	stloc 5
+L_1069374:
+// 0x01069374: 0x1069374: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 5
 	stelem.i4
-L_106939c:
-// 0x0106939c: 0x106939c: jal   0x100449c sll   zero, zero, 0
+L_1069378:
+// 0x01069378: 0x1069378: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1850,354 +1742,250 @@ L_106939c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010693a4: 0x10693a4: addiu v0, zero, 2
-	ldc.i4.2
+// 0x01069380: 0x1069380: j	 0x10694a8 addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x010693a8: 0x10693a8: j	 0x10693c0 sw    v0, 4480(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1120
-	add
-	ldloc 5
-	stelem.i4
-	br L_10693c0
+	br L_10694a8
 // --- basic block ---
-L_10693b0:
-// 0x010693b0: 0x10693b0: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-L_10693b4:
-// 0x010693b4: 0x10693b4: addiu v1, zero, 2
-	ldc.i4.2
-	stloc 7
-// 0x010693b8: 0x10693b8: bne   s4, v1, 0x1069718 addiu s3, zero, 1
+L_1069388:
+// 0x01069388: 0x1069388: jal   0x106ac5c addu  a0, s2, zero
 	ldloc 11
-	ldloc 7
-	ldc.i4.1
-	stloc 9
-	bne.un L_1069718
+	stloc.1
+	ldloc.1
+	call int32 Cibyl79::cyclic_buffer_get_unprocessed_data_106ac5c(int32)
+	stloc 5
 // --- basic block ---
-L_10693c0:
-// 0x010693c0: 0x10693c0: sw    zero, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x010693c4: 0x10693c4: lw    v0, 4488(s0)
+// 0x01069390: 0x1069390: lw    a1, 156(s0)
 	ldloc 6
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 1122
+	ldc.i4.s 39
 	add
 	ldelem.i4
-	stloc 5
-// 0x010693c8: 0x10693c8: lw    s8, 4484(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1121
+	stloc.2
+// 0x01069394: 0x1069394: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01069398: 0x1069398: addiu a2, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc 16
-// 0x010693cc: 0x10693cc: sw    v0, 72(sp)
-	ldloc 6
+	stloc.3
+// 0x0106939c: 0x106939c: jalr  s5 addiu a3, sp, 32
+	ldloc 8
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 32
 	add
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010693a4: 0x10693a4: bne   v0, zero, 0x1069400 sll   zero, zero, 0
 	ldloc 5
-	stelem.i4
-// 0x010693d0: 0x10693d0: sw    zero, 32(sp)
+	brtrue L_1069400
+// --- basic block ---
+// 0x010693ac: 0x10693ac: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x010693d4: 0x10693d4: addu  v0, s8, zero
-	ldloc 16
+	ldelem.i4
 	stloc 5
-// 0x010693d8: 0x10693d8: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-// 0x010693dc: 0x10693dc: j	 0x106941c sw    zero, 76(sp)
+// 0x010693b0: 0x10693b0: sll   zero, zero, 0
+// 0x010693b4: 0x10693b4: bne   v0, zero, 0x10693c0 addiu v0, zero, 2
+	ldloc 5
+	ldc.i4.2
+	stloc 5
+	brtrue L_10693c0
+// --- basic block ---
+// 0x010693bc: 0x10693bc: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-	br L_106941c
-// --- basic block ---
-L_10693e4:
-// 0x010693e4: 0x10693e4: lw    a0, 0(v0)
+L_10693c0:
+// 0x010693c0: 0x10693c0: lw    a0, 32(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.8
+	add
 	ldelem.i4
 	stloc.1
-// 0x010693e8: 0x10693e8: sll   zero, zero, 0
-// 0x010693ec: 0x10693ec: beq   a0, zero, 0x1069410 addu  a1, v0, zero
-	ldloc.1
-	ldloc 5
-	stloc.2
-	brfalse L_1069410
-// --- basic block ---
-// 0x010693f4: 0x10693f4: lb    a0, 0(a0)
-	ldloc.1
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc.1
-// 0x010693f8: 0x10693f8: sll   zero, zero, 0
-// 0x010693fc: 0x10693fc: beq   a0, zero, 0x1069410 addiu v0, v0, 8
+// 0x010693c4: 0x10693c4: jal   0x10ac9b4 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
-	ldloc 5
-	ldc.i4.8
-	add
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	brfalse L_1069410
 // --- basic block ---
-// 0x01069404: 0x1069404: addiu a0, zero, 1
-	ldc.i4.1
+// 0x010693cc: 0x10693cc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010693d0: 0x10693d0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010693d4: 0x10693d4: addiu a2, zero, 1105
+	ldc.i4 1105
+	stloc.3
+// 0x010693d8: 0x10693d8: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01069408: 0x1069408: j	 0x106941c sw    a0, 76(sp)
+// 0x010693dc: 0x10693dc: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x010693e0: 0x10693e0: addiu a3, a3, 18472
+	ldloc 4
+	ldc.i4 18472
+	add
+	stloc 4
+// 0x010693e4: 0x10693e4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.5
 	add
-	ldloc.1
+	ldloc 5
 	stelem.i4
-	br L_106941c
-// --- basic block ---
-L_1069410:
-// 0x01069410: 0x1069410: lw    s5, 4(a1)
-	ldloc 6
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 13
-// 0x01069414: 0x1069414: j	 0x10696e0 lui   s7, 0x10000
-	ldc.i4 65536
-	stloc 14
-	br L_10696e0
-// --- basic block ---
-L_106941c:
-// 0x0106941c: 0x106941c: lw    a1, 72(sp)
+// 0x010693e8: 0x10693e8: jal   0x100449c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc.2
-// 0x01069420: 0x1069420: sll   zero, zero, 0
-// 0x01069424: 0x1069424: slt   a0, v1, a1
-	ldloc 7
-	ldloc.2
-	clt
-	stloc.1
-// 0x01069428: 0x1069428: bne   a0, zero, 0x10693e4 addiu v1, v1, 1
+	ldloc 13
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	ldloc 7
-	ldc.i4.1
-	add
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brtrue L_10693e4
-// --- basic block ---
-// 0x01069430: 0x1069430: j	 0x10696dc addu  s5, zero, zero
-	ldc.i4.s 0
-	stloc 13
-	br L_10696dc
+	stloc 5
 // --- basic block ---
-L_1069438:
-// 0x01069438: 0x1069438: jal   0x106a638 sw    zero, 24(sp)
-	ldloc 6
+// 0x010693f0: 0x10693f0: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x010693f4: 0x10693f4: addu  a1, s6, zero
+	ldloc 12
+	stloc.2
+// 0x010693f8: 0x10693f8: jal   0x1068110 addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldc.i4.s 0
-	stelem.i4
 	ldloc.1
-	call int32 Cibyl79::cyclic_buffer_get_unprocessed_data_106a638(int32)
-	stloc 5
-// --- basic block ---
-// 0x01069440: 0x1069440: addu  s3, v0, zero
-	ldloc 5
-	stloc 9
-// 0x01069444: 0x1069444: lb    v0, 0(v0)
-	ldloc 5
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::SkipChars_1068110(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x01069448: 0x1069448: sll   zero, zero, 0
-// 0x0106944c: 0x106944c: bne   v0, zero, 0x106948c lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106948c
 // --- basic block ---
-// 0x01069454: 0x1069454: lw    v0, 4460(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1115
-	add
-	ldelem.i4
-	stloc 5
-// 0x01069458: 0x1069458: lw    a0, 4468(s0)
+L_1069400:
+// 0x01069400: 0x1069400: lw    v1, 4500(s0)
 	ldloc 6
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 1117
+	ldc.i4 1125
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106945c: 0x106945c: lw    v1, 4464(s0)
+	stloc 7
+// 0x01069404: 0x1069404: sll   zero, zero, 0
+// 0x01069408: 0x1069408: bne   v1, zero, 0x106941c sll   zero, zero, 0
+	ldloc 7
+	brtrue L_106941c
+// --- basic block ---
+// 0x01069410: 0x1069410: lw    v1, 32(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1116
+	ldc.i4.8
 	add
 	ldelem.i4
 	stloc 7
-// 0x01069460: 0x1069460: subu  v0, zero, v0
-	ldloc 5
-	neg
-	stloc 5
-// 0x01069464: 0x1069464: subu  v0, v0, a0
-	ldloc 5
-	ldloc.1
-	sub
-	stloc 5
-// 0x01069468: 0x1069468: addu  v0, v0, v1
-	ldloc 5
-	ldloc 7
-	add
-	stloc 5
-// 0x0106946c: 0x106946c: addiu v1, zero, 18
-	ldc.i4.s 18
-	stloc 7
-// 0x01069470: 0x1069470: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01069474: 0x1069474: sw    v1, 4500(s0)
+// 0x01069414: 0x1069414: sll   zero, zero, 0
+// 0x01069418: 0x1069418: sw    v1, 4500(s0)
 	ldloc 6
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4 1125
 	add
 	ldloc 7
 	stelem.i4
-// 0x01069478: 0x1069478: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x0106947c: 0x106947c: addiu a3, a3, 18732
-	ldloc 4
-	ldc.i4 18732
-	add
-	stloc 4
-// 0x01069480: 0x1069480: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01069484: 0x1069484: j	 0x10695ec addiu a2, zero, 906
-	ldc.i4 906
-	stloc.3
-	br L_10695ec
-// --- basic block ---
-L_106948c:
-// 0x0106948c: 0x106948c: addu  a0, s3, zero
-	ldloc 9
-	stloc.1
-// 0x01069490: 0x1069490: jal   0x1001a5c addiu a1, zero, 10
-	ldc.i4.s 10
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strchr_1001a5c(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069498: 0x1069498: beq   v0, zero, 0x1069714 addiu v0, zero, 2
-	ldloc 5
-	ldc.i4.2
-	stloc 5
-	brfalse L_1069714
-// --- basic block ---
-// 0x010694a0: 0x10694a0: lw    v0, 76(sp)
+L_106941c:
+// 0x0106941c: 0x106941c: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x010694a4: 0x10694a4: sll   zero, zero, 0
-// 0x010694a8: 0x10694a8: beq   v0, zero, 0x10695ac addiu v0, zero, 31
-	ldloc 5
-	ldc.i4.s 31
-	stloc 5
-	brfalse L_10695ac
+	stloc 7
+// 0x01069420: 0x1069420: sll   zero, zero, 0
+// 0x01069424: 0x1069424: beq   v1, zero, 0x1069458 lui   a2, 0x10000
+	ldloc 7
+	ldc.i4 65536
+	stloc.3
+	brfalse L_1069458
 // --- basic block ---
-// 0x010694b0: 0x10694b0: lui   a3, 0x0
-	ldc.i4.s 0
+// 0x0106942c: 0x106942c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01069430: 0x1069430: lui   a3, 0x10000
+	ldc.i4 65536
 	stloc 4
-// 0x010694b4: 0x10694b4: addiu a2, sp, 28
+// 0x01069434: 0x1069434: addiu v0, sp, 36
 	ldloc.0
-	ldc.i4.s 28
+	ldc.i4.s 36
 	add
-	stloc.3
-// 0x010694b8: 0x10694b8: addiu a3, a3, 30268
-	ldloc 4
-	ldc.i4 30268
+	stloc 5
+// 0x01069438: 0x1069438: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
 	add
-	stloc 4
-// 0x010694bc: 0x10694bc: addu  a0, s3, zero
-	ldloc 9
-	stloc.1
-// 0x010694c0: 0x10694c0: addu  a1, s4, zero
-	ldloc 11
 	stloc.2
-// 0x010694c4: 0x10694c4: sw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+// 0x0106943c: 0x106943c: addiu a3, a3, 18552
+	ldloc 4
+	ldc.i4 18552
 	add
-	ldloc 5
-	stelem.i4
-// 0x010694c8: 0x10694c8: addiu v0, zero, 1
+	stloc 4
+// 0x01069440: 0x1069440: addiu a0, zero, 1
 	ldc.i4.1
-	stloc 5
-// 0x010694cc: 0x10694cc: jal   0x1068250 sw    v0, 16(sp)
+	stloc.1
+// 0x01069444: 0x1069444: addiu a2, zero, 1118
+	ldc.i4 1118
+	stloc.3
+// 0x01069448: 0x1069448: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2211,459 +1999,418 @@ L_106948c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::ExtractNetworkString_1068250(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010694d4: 0x10694d4: addu  a0, v0, zero
+// 0x01069450: 0x1069450: j	 0x10694a8 addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+	br L_10694a8
+// --- basic block ---
+L_1069458:
+// 0x01069458: 0x1069458: addu  a1, v0, zero
 	ldloc 5
-	stloc.1
-// 0x010694d8: 0x10694d8: addu  a1, s7, zero
-	ldloc 14
 	stloc.2
-// 0x010694dc: 0x10694dc: jal   0x10681a8 addiu a2, zero, -1
-	ldc.i4.m1
+// 0x0106945c: 0x106945c: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x01069460: 0x1069460: jal   0x106ac68 addiu a2, a2, 18628
+	ldloc.3
+	ldc.i4 18628
+	add
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::cyclic_buffer_update_processed_data_106ac68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010694e4: 0x10694e4: beq   v0, zero, 0x1069504 addu  v1, v0, zero
-	ldloc 5
-	ldloc 5
-	stloc 7
-	brfalse L_1069504
-// --- basic block ---
-// 0x010694ec: 0x10694ec: lb    v0, 0(v0)
-	ldloc 5
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x010694f0: 0x10694f0: sll   zero, zero, 0
-// 0x010694f4: 0x10694f4: beq   v0, zero, 0x1069504 addu  s6, s8, zero
-	ldloc 5
-	ldloc 16
-	stloc 10
-	brfalse L_1069504
-// --- basic block ---
-// 0x010694fc: 0x10694fc: j	 0x106957c addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-	br L_106957c
+// 0x01069468: 0x1069468: j	 0x106947c sll   zero, zero, 0
+	br L_106947c
 // --- basic block ---
-L_1069504:
-// 0x01069504: 0x1069504: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01069508: 0x1069508: lui   a3, 0x10000
+L_1069470:
+// 0x01069470: 0x1069470: lui   s6, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x0106950c: 0x106950c: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+	stloc 12
+L_1069474:
+// 0x01069474: 0x1069474: addiu s6, s6, 5356
+	ldloc 12
+	ldc.i4 5356
 	add
-	stloc.2
-// 0x01069510: 0x1069510: addiu a3, a3, 18852
-	ldloc 4
-	ldc.i4 18852
+	stloc 12
+// 0x01069478: 0x1069478: addiu s3, sp, 36
+	ldloc.0
+	ldc.i4.s 36
 	add
-	stloc 4
-// 0x01069514: 0x1069514: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01069518: 0x1069518: addiu a2, zero, 934
-	ldc.i4 934
-	stloc.3
-// 0x0106951c: 0x106951c: sw    s3, 16(sp)
+	stloc 13
+L_106947c:
+// 0x0106947c: 0x106947c: lw    v1, 4456(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 1114
 	add
-	ldloc 9
-	stelem.i4
-L_1069520:
-// 0x01069520: 0x1069520: jal   0x100449c addiu s3, zero, 1
-	ldc.i4.1
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldelem.i4
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069528: 0x1069528: j	 0x1069718 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_1069718
-// --- basic block ---
-L_1069530:
-// 0x01069530: 0x1069530: lw    v0, 0(s6)
+// 0x01069480: 0x1069480: lw    v0, 4460(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
+	ldc.i4 1115
+	add
 	ldelem.i4
 	stloc 5
-// 0x01069534: 0x1069534: addiu a2, a2, 1
-	ldloc.3
-	ldc.i4.1
-	add
-	stloc.3
-// 0x01069538: 0x1069538: beq   v0, zero, 0x1069578 addu  a1, v0, zero
+// 0x01069484: 0x1069484: sll   zero, zero, 0
+// 0x01069488: 0x1069488: slt   v0, v0, v1
 	ldloc 5
+	ldloc 7
+	clt
+	stloc 5
+// 0x0106948c: 0x106948c: bne   v0, zero, 0x10691d8 addu  a0, s2, zero
 	ldloc 5
-	stloc.2
-	brfalse L_1069578
+	ldloc 11
+	stloc.1
+	brtrue L_10691d8
 // --- basic block ---
-// 0x01069540: 0x1069540: sw    v1, 84(sp)
+// 0x01069494: 0x1069494: lw    v1, 4500(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4 1125
 	add
+	ldelem.i4
+	stloc 7
+// 0x01069498: 0x1069498: sll   zero, zero, 0
+// 0x0106949c: 0x106949c: bne   v1, zero, 0x10694a8 addiu v0, zero, 1
 	ldloc 7
-	stelem.i4
-// 0x01069544: 0x1069544: jal   0x101c7e8 sw    a2, 80(sp)
+	ldc.i4.1
+	stloc 5
+	brtrue L_10694a8
+// --- basic block ---
+// 0x010694a4: 0x10694a4: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+L_10694a8:
+// 0x010694a8: 0x10694a8: lw    ra, 124(sp)
+// 0x010694ac: 0x10694ac: lw    s8, 120(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 30
 	add
-	ldloc.3
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl20::roadmap_string_compare_ignore_case_101c7e8(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106954c: 0x106954c: lw    v1, 84(sp)
+	ldelem.i4
+	stloc 16
+// 0x010694b0: 0x10694b0: lw    s7, 116(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.s 29
 	add
 	ldelem.i4
-	stloc 7
-// 0x01069550: 0x1069550: lw    a2, 80(sp)
+	stloc 15
+// 0x010694b4: 0x10694b4: lw    s6, 112(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 28
 	add
 	ldelem.i4
-	stloc.3
-// 0x01069554: 0x1069554: bne   v0, zero, 0x106957c addiu s6, s6, 8
-	ldloc 5
-	ldloc 10
-	ldc.i4.8
+	stloc 12
+// 0x010694b8: 0x10694b8: lw    s5, 108(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 27
 	add
-	stloc 10
-	brtrue L_106957c
-// --- basic block ---
-// 0x0106955c: 0x106955c: addiu s6, s6, -8
-	ldloc 10
-	ldc.i4.s -8
+	ldelem.i4
+	stloc 8
+// 0x010694bc: 0x10694bc: lw    s4, 104(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 26
 	add
-	stloc 10
-// 0x01069560: 0x1069560: lw    s6, 4(s6)
+	ldelem.i4
+	stloc 14
+// 0x010694c0: 0x10694c0: lw    s3, 100(sp)
 	ldloc 6
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 25
 	add
 	ldelem.i4
-	stloc 10
-// 0x01069564: 0x1069564: sll   zero, zero, 0
-// 0x01069568: 0x1069568: bne   s6, zero, 0x1069598 addu  a1, v1, zero
-	ldloc 10
-	ldloc 7
-	stloc.2
-	brtrue L_1069598
-// --- basic block ---
-// 0x01069570: 0x1069570: j	 0x10695ac sll   zero, zero, 0
-	br L_10695ac
-// --- basic block ---
-L_1069578:
-// 0x01069578: 0x1069578: addiu s6, s6, 8
-	ldloc 10
-	ldc.i4.8
+	stloc 13
+// 0x010694c4: 0x10694c4: lw    s2, 96(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
+	ldelem.i4
+	stloc 11
+// 0x010694c8: 0x10694c8: lw    s1, 92(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
 	add
+	ldelem.i4
 	stloc 10
-L_106957c:
-// 0x0106957c: 0x106957c: lw    a1, 72(sp)
+// 0x010694cc: 0x10694cc: lw    s0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc.2
-// 0x01069580: 0x1069580: sll   zero, zero, 0
-// 0x01069584: 0x1069584: slt   v0, a2, a1
-	ldloc.3
-	ldloc.2
-	clt
-	stloc 5
-// 0x01069588: 0x1069588: bne   v0, zero, 0x1069530 addu  a0, s4, zero
+	stloc 9
+// 0x010694d0: 0x10694d0: jr    ra addiu sp, sp, 128
+	ldloc.0
+	ldc.i4 128
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldloc 11
-	stloc.1
-	brtrue L_1069530
-// --- basic block ---
-// 0x01069590: 0x1069590: j	 0x10695ac sll   zero, zero, 0
-	br L_10695ac
-// --- basic block ---
-L_1069598:
-// 0x01069598: 0x1069598: addu  a0, s1, zero
-	ldloc 12
-	stloc.1
-// 0x0106959c: 0x106959c: jal   0x106a644 addu  a2, zero, zero
+	ret
+}
+.method public static int32 OnHTTPHeader_10694d8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local  8 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local 12 is register s4
+// local  0 is register sp
+// local 13 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::cyclic_buffer_update_processed_data_106a644(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010695a4: 0x10695a4: j	 0x10695f4 sll   zero, zero, 0
-	br L_10695f4
-// --- basic block ---
-L_10695ac:
-// 0x010695ac: 0x10695ac: beq   s5, zero, 0x10695cc addiu v0, zero, 20
-	ldloc 13
-	ldc.i4.s 20
 	stloc 5
-	brfalse L_10695cc
-// --- basic block ---
-// 0x010695b4: 0x10695b4: addu  a0, s1, zero
-	ldloc 12
-	stloc.1
-// 0x010695b8: 0x10695b8: addu  a1, s3, zero
-	ldloc 9
-	stloc.2
-// 0x010695bc: 0x10695bc: jal   0x106a644 addu  a2, zero, zero
 	ldc.i4.s 0
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::cyclic_buffer_update_processed_data_106a644(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010695c4: 0x10695c4: j	 0x10695f4 addu  s6, s5, zero
-	ldloc 13
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 10
-	br L_10695f4
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 13
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_10695cc:
-// 0x010695cc: 0x10695cc: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010695d0: 0x10695d0: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010695d4: 0x10695d4: sw    v0, 4500(s0)
+// 0x010694d8: 0x10694d8: addiu sp, sp, -64
+	ldloc.0
+	ldc.i4.s -64
+	add
+	stloc.0
+// 0x010694dc: 0x10694dc: sw    s1, 44(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4.s 11
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
-// 0x010695d8: 0x10695d8: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x010695dc: 0x10695dc: addiu a3, a3, 18940
+// 0x010694e0: 0x10694e0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010694e4: 0x10694e4: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x010694e8: 0x10694e8: addiu a3, a3, 18636
 	ldloc 4
-	ldc.i4 18940
+	ldc.i4 18636
 	add
 	stloc 4
-// 0x010695e0: 0x10695e0: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010695e4: 0x10695e4: addiu a2, zero, 970
-	ldc.i4 970
+// 0x010694ec: 0x10694ec: addiu a2, zero, 862
+	ldc.i4 862
 	stloc.3
-// 0x010695e8: 0x10695e8: addiu v0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc 5
-L_10695ec:
-// 0x010695ec: 0x10695ec: j	 0x1069520 sw    v0, 16(sp)
+// 0x010694f0: 0x10694f0: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 13
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
-	br L_1069520
-// --- basic block ---
-L_10695f4:
-// 0x010695f4: 0x10695f4: jal   0x106a638 addu  a0, s1, zero
-	ldloc 12
-	stloc.1
-	ldloc.1
-	call int32 Cibyl79::cyclic_buffer_get_unprocessed_data_106a638(int32)
-	stloc 5
-// --- basic block ---
-// 0x010695fc: 0x10695fc: lw    a1, 156(s0)
+// 0x010694f4: 0x10694f4: sw    s2, 48(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 39
-	add
-	ldelem.i4
-	stloc.2
-// 0x01069600: 0x1069600: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01069604: 0x1069604: addiu a2, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 12
 	add
-	stloc.3
-// 0x01069608: 0x1069608: jalr  s6 addiu a3, sp, 32
 	ldloc 10
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 4
-	ldloc.0
-	ldloc.1
+	stelem.i4
+// 0x010694f8: 0x10694f8: addu  s3, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069610: 0x1069610: bne   v0, zero, 0x106966c sll   zero, zero, 0
-	ldloc 5
-	brtrue L_106966c
-// --- basic block ---
-// 0x01069618: 0x1069618: lw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	stloc 11
+// 0x010694fc: 0x10694fc: addu  s2, a0, zero
+	ldloc.1
+	stloc 10
+// 0x01069500: 0x1069500: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106961c: 0x106961c: sll   zero, zero, 0
-// 0x01069620: 0x1069620: bne   v0, zero, 0x106962c addiu v0, zero, 2
-	ldloc 5
-	ldc.i4.2
-	stloc 5
-	brtrue L_106962c
-// --- basic block ---
-// 0x01069628: 0x1069628: sw    v0, 32(sp)
+	stloc.2
+// 0x01069504: 0x1069504: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069508: 0x1069508: sw    ra, 60(sp)
+// 0x0106950c: 0x106950c: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 10
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-L_106962c:
-// 0x0106962c: 0x106962c: lw    a0, 32(sp)
+// 0x01069510: 0x1069510: jal   0x100449c sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 14
 	add
-	ldelem.i4
-	stloc.1
-// 0x01069630: 0x1069630: jal   0x10ac36c sll   zero, zero, 0
+	ldloc 12
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069638: 0x1069638: lui   a3, 0x10000
+// 0x01069518: 0x1069518: jal   0x106ac5c addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	call int32 Cibyl79::cyclic_buffer_get_unprocessed_data_106ac5c(int32)
+	stloc 5
+// --- basic block ---
+// 0x01069520: 0x1069520: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106963c: 0x106963c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01069640: 0x1069640: addiu a2, zero, 988
-	ldc.i4 988
-	stloc.3
-// 0x01069644: 0x1069644: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01069524: 0x1069524: addiu a3, a3, 18644
+	ldloc 4
+	ldc.i4 18644
+	add
+	stloc 4
+// 0x01069528: 0x1069528: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01069648: 0x1069648: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+// 0x0106952c: 0x106952c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x0106964c: 0x106964c: addiu a3, a3, 19000
+// 0x01069530: 0x1069530: addiu a2, zero, 866
+	ldc.i4 866
+	stloc.3
+// 0x01069534: 0x1069534: jal   0x100449c addu  s0, v0, zero
+	ldloc 5
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 19000
-	add
-	stloc 4
-// 0x01069650: 0x1069650: sw    v0, 20(sp)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106953c: 0x106953c: lw    v0, 0(s3)
 	ldloc 6
-	ldloc.0
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
+	ldelem.i4
+	stloc 5
+// 0x01069540: 0x1069540: sll   zero, zero, 0
+// 0x01069544: 0x1069544: bne   v0, zero, 0x106963c sw    zero, 24(sp)
 	ldloc 5
-	stelem.i4
-// 0x01069654: 0x1069654: jal   0x100449c sw    s4, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 11
+	ldc.i4.s 0
 	stelem.i4
+	brtrue L_106963c
+// --- basic block ---
+// 0x0106954c: 0x106954c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069550: 0x1069550: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069554: 0x1069554: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069558: 0x1069558: addiu a3, a3, 18652
+	ldloc 4
+	ldc.i4 18652
+	add
+	stloc 4
+// 0x0106955c: 0x106955c: jal   0x100449c addiu a2, zero, 873
+	ldc.i4 873
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2674,109 +2421,77 @@ L_106962c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106965c: 0x106965c: addu  a0, s3, zero
+// 0x01069564: 0x1069564: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01069568: 0x1069568: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01069660: 0x1069660: addu  a1, s7, zero
-	ldloc 14
+// 0x0106956c: 0x106956c: jal   0x1000420 addiu a1, a1, 5356
+	ldloc.2
+	ldc.i4 5356
+	add
 	stloc.2
-// 0x01069664: 0x1069664: jal   0x1068100 addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::SkipChars_1068100(int32,int32,int32,int32,int32)
+	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106966c:
-// 0x0106966c: 0x106966c: lw    v1, 4500(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1125
-	add
-	ldelem.i4
-	stloc 7
-// 0x01069670: 0x1069670: sll   zero, zero, 0
-// 0x01069674: 0x1069674: bne   v1, zero, 0x1069688 sll   zero, zero, 0
-	ldloc 7
-	brtrue L_1069688
+// 0x01069574: 0x1069574: bne   v0, zero, 0x1069590 lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brtrue L_1069590
 // --- basic block ---
-// 0x0106967c: 0x106967c: lw    v1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 7
-// 0x01069680: 0x1069680: sll   zero, zero, 0
-// 0x01069684: 0x1069684: sw    v1, 4500(s0)
-	ldloc 6
+// 0x0106957c: 0x106957c: addiu a1, s1, 18164
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1125
+	ldc.i4 18164
 	add
-	ldloc 7
-	stelem.i4
-L_1069688:
-// 0x01069688: 0x1069688: lw    v1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	stloc.2
+// 0x01069580: 0x1069580: addiu a3, a3, 18660
+	ldloc 4
+	ldc.i4 18660
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106968c: 0x106968c: sll   zero, zero, 0
-// 0x01069690: 0x1069690: beq   v1, zero, 0x10696c4 lui   a2, 0x10000
-	ldloc 7
-	ldc.i4 65536
+	stloc 4
+// 0x01069584: 0x1069584: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069588: 0x1069588: j	 0x106966c addiu a2, zero, 878
+	ldc.i4 878
 	stloc.3
-	brfalse L_10696c4
+	br L_106966c
 // --- basic block ---
-// 0x01069698: 0x1069698: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106969c: 0x106969c: lui   a3, 0x10000
+L_1069590:
+// 0x01069590: 0x1069590: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010696a0: 0x10696a0: addiu v0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc 5
-// 0x010696a4: 0x10696a4: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x010696a8: 0x10696a8: addiu a3, a3, 19080
+// 0x01069594: 0x1069594: addiu a3, a3, 18668
 	ldloc 4
-	ldc.i4 19080
+	ldc.i4 18668
 	add
 	stloc 4
-// 0x010696ac: 0x10696ac: addiu a0, zero, 1
+// 0x01069598: 0x1069598: addiu a2, zero, 883
+	ldc.i4 883
+	stloc.3
+// 0x0106959c: 0x106959c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x010695a0: 0x10695a0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010696b0: 0x10696b0: addiu a2, zero, 1001
-	ldc.i4 1001
-	stloc.3
-// 0x010696b4: 0x10696b4: jal   0x100449c sw    v0, 16(sp)
+// 0x010695a4: 0x10695a4: jal   0x100449c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
 	ldloc 5
 	stelem.i4
@@ -2790,148 +2505,135 @@ L_1069688:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010696bc: 0x10696bc: j	 0x1069714 addiu v0, zero, 2
+// 0x010695ac: 0x10695ac: lw    v0, 32(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
 	stloc 5
-	br L_1069714
-// --- basic block ---
-L_10696c4:
-// 0x010696c4: 0x10696c4: addu  a1, v0, zero
+// 0x010695b0: 0x10695b0: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x010695b4: 0x10695b4: jal   0x1067ce0 subu  a1, v0, s0
 	ldloc 5
+	ldloc 9
+	sub
 	stloc.2
-// 0x010696c8: 0x10696c8: addu  a0, s1, zero
-	ldloc 12
-	stloc.1
-// 0x010696cc: 0x10696cc: jal   0x106a644 addiu a2, a2, 19156
-	ldloc.3
-	ldc.i4 19156
-	add
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::cyclic_buffer_update_processed_data_106a644(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::ToLowerN_1067ce0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010696d4: 0x10696d4: j	 0x10696e8 sll   zero, zero, 0
-	br L_10696e8
-// --- basic block ---
-L_10696dc:
-// 0x010696dc: 0x10696dc: lui   s7, 0x10000
+// 0x010695bc: 0x10695bc: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc 14
-L_10696e0:
-// 0x010696e0: 0x10696e0: addiu s7, s7, 5360
-	ldloc 14
-	ldc.i4 5360
-	add
-	stloc 14
-// 0x010696e4: 0x10696e4: addiu s4, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc 11
-L_10696e8:
-// 0x010696e8: 0x10696e8: lw    v1, 4456(s0)
-	ldloc 6
+	stloc 4
+// 0x010695c0: 0x10695c0: addiu a1, s1, 18164
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1114
+	ldc.i4 18164
 	add
-	ldelem.i4
-	stloc 7
-// 0x010696ec: 0x10696ec: lw    v0, 4460(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1115
+	stloc.2
+// 0x010695c4: 0x10695c4: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010695c8: 0x10695c8: addiu a3, a3, 18676
+	ldloc 4
+	ldc.i4 18676
 	add
-	ldelem.i4
-	stloc 5
-// 0x010696f0: 0x10696f0: sll   zero, zero, 0
-// 0x010696f4: 0x10696f4: slt   v0, v0, v1
-	ldloc 5
-	ldloc 7
-	clt
+	stloc 4
+// 0x010695cc: 0x10695cc: jal   0x100449c addiu a2, zero, 888
+	ldc.i4 888
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x010696f8: 0x10696f8: bne   v0, zero, 0x1069438 addu  a0, s1, zero
-	ldloc 5
-	ldloc 12
-	stloc.1
-	brtrue L_1069438
 // --- basic block ---
-// 0x01069700: 0x1069700: lw    v1, 4500(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1125
+// 0x010695d4: 0x10695d4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010695d8: 0x10695d8: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x010695dc: 0x10695dc: jal   0x1000420 addiu a1, a1, 18684
+	ldloc.2
+	ldc.i4 18684
 	add
-	ldelem.i4
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x01069704: 0x1069704: sll   zero, zero, 0
-// 0x01069708: 0x1069708: bne   v1, zero, 0x1069714 addiu v0, zero, 1
-	ldloc 7
-	ldc.i4.1
 	stloc 5
-	brtrue L_1069714
 // --- basic block ---
-// 0x01069710: 0x1069710: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-L_1069714:
-// 0x01069714: 0x1069714: addiu s3, zero, 1
-	ldc.i4.1
-	stloc 9
-L_1069718:
-// 0x01069718: 0x1069718: bne   v0, s3, 0x1069760 lui   a1, 0x10000
+// 0x010695e4: 0x10695e4: bne   v0, zero, 0x1069600 lui   a3, 0x10000
 	ldloc 5
-	ldloc 9
 	ldc.i4 65536
+	stloc 4
+	brtrue L_1069600
+// --- basic block ---
+// 0x010695ec: 0x10695ec: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
 	stloc.2
-	bne.un L_1069760
+// 0x010695f0: 0x10695f0: addiu a3, a3, 18692
+	ldloc 4
+	ldc.i4 18692
+	add
+	stloc 4
+// 0x010695f4: 0x10695f4: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010695f8: 0x10695f8: j	 0x10697b4 addiu a2, zero, 893
+	ldc.i4 893
+	stloc.3
+	br L_10697b4
 // --- basic block ---
-// 0x01069720: 0x1069720: lui   a3, 0x10000
+L_1069600:
+// 0x01069600: 0x1069600: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01069724: 0x1069724: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01069728: 0x1069728: addiu v0, v0, 16348
-	ldloc 5
-	ldc.i4 16348
-	add
-	stloc 5
-// 0x0106972c: 0x106972c: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x01069730: 0x1069730: addiu a3, a3, 19164
+// 0x01069604: 0x1069604: addiu a3, a3, 18744
 	ldloc 4
-	ldc.i4 19164
+	ldc.i4 18744
 	add
 	stloc 4
-// 0x01069734: 0x1069734: addiu a0, zero, 1
+// 0x01069608: 0x1069608: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01069738: 0x1069738: addiu a2, zero, 671
-	ldc.i4 671
+// 0x0106960c: 0x106960c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069610: 0x1069610: addiu a2, zero, 897
+	ldc.i4 897
 	stloc.3
-// 0x0106973c: 0x106973c: jal   0x100449c sw    v0, 16(sp)
+// 0x01069614: 0x1069614: jal   0x100449c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -2943,145 +2645,35 @@ L_1069718:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069744: 0x1069744: lw    v0, 4500(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1125
-	add
-	ldelem.i4
-	stloc 5
-// 0x01069748: 0x1069748: sll   zero, zero, 0
-// 0x0106974c: 0x106974c: bne   v0, zero, 0x106985c addiu v0, zero, 1
-	ldloc 5
+// 0x0106961c: 0x106961c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	brtrue L_106985c
-// --- basic block ---
-// 0x01069754: 0x1069754: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x01069758: 0x1069758: j	 0x1069858 sw    v0, 4500(s0)
+// 0x01069620: 0x1069620: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069624: 0x1069624: sw    v0, 0(s3)
 	ldloc 6
-	ldloc 8
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
-	add
 	ldloc 5
 	stelem.i4
-	br L_1069858
-// --- basic block ---
-L_1069760:
-// 0x01069760: 0x1069760: beq   s2, zero, 0x1069784 sll   zero, zero, 0
-	ldloc 15
-	brfalse L_1069784
-// --- basic block ---
-// 0x01069768: 0x1069768: lw    a0, 4456(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1114
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106976c: 0x106976c: lw    v0, 4468(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1117
-	add
-	ldelem.i4
-	stloc 5
-// 0x01069770: 0x1069770: lw    v1, 4464(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1116
-	add
-	ldelem.i4
-	stloc 7
-// 0x01069774: 0x1069774: addu  v0, a0, v0
-	ldloc.1
-	ldloc 5
-	add
-	stloc 5
-// 0x01069778: 0x1069778: slt   v0, v0, v1
-	ldloc 5
-	ldloc 7
-	clt
-	stloc 5
-// 0x0106977c: 0x106977c: bne   v0, zero, 0x10697c4 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_10697c4
-// --- basic block ---
-L_1069784:
-// 0x01069784: 0x1069784: lw    v0, 4460(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1115
-	add
-	ldelem.i4
-	stloc 5
-// 0x01069788: 0x1069788: lw    v1, 4456(s0)
-	ldloc 6
+// 0x01069628: 0x1069628: addiu a1, s1, 18164
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1114
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106978c: 0x106978c: sll   zero, zero, 0
-// 0x01069790: 0x1069790: bne   v1, v0, 0x1069858 lui   a1, 0x10000
-	ldloc 7
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	bne.un L_1069858
-// --- basic block ---
-// 0x01069798: 0x1069798: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106979c: 0x106979c: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x010697a0: 0x10697a0: addiu v0, v0, 19224
-	ldloc 5
-	ldc.i4 19224
-	add
-	stloc 5
-// 0x010697a4: 0x10697a4: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x010697a8: 0x10697a8: addiu a3, a3, 19164
+// 0x0106962c: 0x106962c: addiu a3, a3, 18756
 	ldloc 4
-	ldc.i4 19164
+	ldc.i4 18756
 	add
 	stloc 4
-// 0x010697ac: 0x10697ac: addiu a0, zero, 1
+// 0x01069630: 0x1069630: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010697b0: 0x10697b0: addiu a2, zero, 690
-	ldc.i4 690
+// 0x01069634: 0x1069634: jal   0x100449c addiu a2, zero, 902
+	ldc.i4 902
 	stloc.3
-// 0x010697b4: 0x10697b4: jal   0x100449c sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3092,65 +2684,58 @@ L_1069784:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010697bc: 0x10697bc: j	 0x106985c addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_106985c
-// --- basic block ---
-L_10697c4:
-// 0x010697c4: 0x10697c4: jal   0x106a690 addu  a0, s1, zero
-	ldloc 12
+L_106963c:
+// 0x0106963c: 0x106963c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01069640: 0x1069640: addiu a1, a1, 18764
+	ldloc.2
+	ldc.i4 18764
+	add
+	stloc.2
+// 0x01069644: 0x1069644: jal   0x1000420 addu  a0, s0, zero
+	ldloc 9
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::cyclic_buffer_recycle_106a690(int32,int32,int32,int32,int32)
+	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010697cc: 0x10697cc: lw    a2, 4476(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 1119
-	add
-	ldelem.i4
-	stloc.3
-// 0x010697d0: 0x10697d0: sll   zero, zero, 0
-// 0x010697d4: 0x10697d4: bne   a2, zero, 0x1069804 lui   a3, 0x1070000
-	ldloc.3
-	ldc.i4 17235968
-	stloc 4
-	brtrue L_1069804
-// --- basic block ---
-// 0x010697dc: 0x10697dc: lui   a1, 0x10000
+// 0x0106964c: 0x106964c: addu  s4, v0, zero
+	ldloc 5
+	stloc 12
+// 0x01069650: 0x1069650: bne   v0, zero, 0x106967c lui   s1, 0x10000
+	ldloc 5
 	ldc.i4 65536
-	stloc.2
-// 0x010697e0: 0x10697e0: lui   a3, 0x10000
+	stloc 8
+	brtrue L_106967c
+// --- basic block ---
+// 0x01069658: 0x1069658: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010697e4: 0x10697e4: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+// 0x0106965c: 0x106965c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x010697e8: 0x10697e8: addiu a3, a3, 19236
+// 0x01069660: 0x1069660: addiu a3, a3, 18772
 	ldloc 4
-	ldc.i4 19236
+	ldc.i4 18772
 	add
 	stloc 4
-// 0x010697ec: 0x10697ec: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01069664: 0x1069664: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x010697f0: 0x10697f0: addiu a2, zero, 702
-	ldc.i4 702
+// 0x01069668: 0x1069668: addiu a2, zero, 910
+	ldc.i4 910
 	stloc.3
-L_10697f4:
-// 0x010697f4: 0x10697f4: jal   0x100449c sll   zero, zero, 0
+L_106966c:
+// 0x0106966c: 0x106966c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3161,100 +2746,205 @@ L_10697f4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010697fc: 0x10697fc: j	 0x106985c addiu v0, zero, 1
+// 0x01069674: 0x1069674: j	 0x1069884 addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+	br L_1069884
+// --- basic block ---
+L_106967c:
+// 0x0106967c: 0x106967c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069680: 0x1069680: addiu a3, a3, 18780
+	ldloc 4
+	ldc.i4 18780
+	add
+	stloc 4
+// 0x01069684: 0x1069684: addiu a0, zero, 1
 	ldc.i4.1
+	stloc.1
+// 0x01069688: 0x1069688: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x0106968c: 0x106968c: jal   0x100449c addiu a2, zero, 915
+	ldc.i4 915
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	br L_106985c
 // --- basic block ---
-L_1069804:
-// 0x01069804: 0x1069804: lw    a0, 12(s0)
+// 0x01069694: 0x1069694: subu  v0, s4, s0
+	ldloc 12
+	ldloc 9
+	sub
+	stloc 5
+// 0x01069698: 0x1069698: addiu v0, v0, 4
+	ldloc 5
+	ldc.i4.4
+	add
+	stloc 5
+// 0x0106969c: 0x106969c: sw    v0, 2056(s2)
 	ldloc 6
-	ldloc 8
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4 514
 	add
-	ldelem.i4
-	stloc.1
-// 0x01069808: 0x1069808: lw    a1, 4472(s0)
+	ldloc 5
+	stelem.i4
+// 0x010696a0: 0x10696a0: lui   v0, 0x7fff0000
+	ldc.i4 2147418112
+	stloc 5
+// 0x010696a4: 0x10696a4: ori   v0, v0, 65535
+	ldloc 5
+	ldc.i4 65535
+	or
+	stloc 5
+// 0x010696a8: 0x10696a8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010696ac: 0x10696ac: sw    v0, 2060(s2)
 	ldloc 6
-	ldloc 8
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 1118
+	ldc.i4 515
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106980c: 0x106980c: addiu a3, a3, -23716
+	ldloc 5
+	stelem.i4
+// 0x010696b0: 0x10696b0: addiu a3, a3, 18788
 	ldloc 4
-	ldc.i4 -23716
+	ldc.i4 18788
 	add
 	stloc 4
-// 0x01069810: 0x1069810: jal   0x106762c sw    s0, 16(sp)
+// 0x010696b4: 0x10696b4: addiu a2, zero, 922
+	ldc.i4 922
+	stloc.3
+// 0x010696b8: 0x10696b8: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x010696bc: 0x10696bc: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010696c0: 0x10696c0: jal   0x100449c sw    zero, 2064(s2)
 	ldloc 6
-	ldloc.0
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 516
 	add
-	ldloc 8
+	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::socket_async_receive_106762c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069818: 0x1069818: bne   v0, zero, 0x106984c lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x010696c8: 0x10696c8: subu  a1, s4, s0
+	ldloc 12
+	ldloc 9
+	sub
 	stloc.2
-	brtrue L_106984c
+// 0x010696cc: 0x10696cc: jal   0x1067ce0 addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::ToLowerN_1067ce0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01069820: 0x1069820: lui   a3, 0x10000
+// 0x010696d4: 0x10696d4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01069824: 0x1069824: lw    v0, 12(s0)
-	ldloc 6
+// 0x010696d8: 0x10696d8: addiu a3, a3, 18796
+	ldloc 4
+	ldc.i4 18796
+	add
+	stloc 4
+// 0x010696dc: 0x10696dc: addiu a2, zero, 927
+	ldc.i4 927
+	stloc.3
+// 0x010696e0: 0x10696e0: addiu a1, s1, 18164
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
+	ldc.i4 18164
 	add
-	ldelem.i4
+	stloc.2
+// 0x010696e4: 0x10696e4: jal   0x100449c addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x01069828: 0x1069828: addiu a1, a1, 18168
+// --- basic block ---
+// 0x010696ec: 0x10696ec: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010696f0: 0x10696f0: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x010696f4: 0x10696f4: jal   0x1000420 addiu a1, a1, 18804
 	ldloc.2
-	ldc.i4 18168
+	ldc.i4 18804
 	add
 	stloc.2
-// 0x0106982c: 0x106982c: addiu a3, a3, 19312
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::strstr_1000420(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010696fc: 0x10696fc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069700: 0x1069700: addu  s4, v0, zero
+	ldloc 5
+	stloc 12
+// 0x01069704: 0x1069704: addiu a3, a3, 18820
 	ldloc 4
-	ldc.i4 19312
+	ldc.i4 18820
 	add
 	stloc 4
-// 0x01069830: 0x1069830: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01069708: 0x1069708: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01069834: 0x1069834: addiu a2, zero, 722
-	ldc.i4 722
-	stloc.3
-L_1069838:
-// 0x01069838: 0x1069838: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+// 0x0106970c: 0x106970c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
-	ldloc 5
-	stelem.i4
-L_106983c:
-// 0x0106983c: 0x106983c: jal   0x100449c sll   zero, zero, 0
+	stloc.2
+// 0x01069710: 0x1069710: jal   0x100449c addiu a2, zero, 932
+	ldc.i4 932
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3265,334 +2955,327 @@ L_106983c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069844: 0x1069844: j	 0x106985c addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106985c
+// 0x01069718: 0x1069718: beq   s4, zero, 0x1069824 lui   a3, 0x10000
+	ldloc 12
+	ldc.i4 65536
+	stloc 4
+	brfalse L_1069824
 // --- basic block ---
-L_106984c:
-// 0x0106984c: 0x106984c: sw    s3, 20(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+// 0x01069720: 0x1069720: addiu a3, a3, 18828
+	ldloc 4
+	ldc.i4 18828
 	add
-	ldloc 9
-	stelem.i4
-// 0x01069850: 0x1069850: j	 0x106985c addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-	br L_106985c
-// --- basic block ---
-L_1069858:
-// 0x01069858: 0x1069858: addiu v0, zero, 1
+	stloc 4
+// 0x01069724: 0x1069724: addiu a0, zero, 1
 	ldc.i4.1
-	stloc 5
-L_106985c:
-// 0x0106985c: 0x106985c: lw    ra, 124(sp)
-// 0x01069860: 0x1069860: lw    s8, 120(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
+	stloc.1
+// 0x01069728: 0x1069728: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
-	ldelem.i4
-	stloc 16
-// 0x01069864: 0x1069864: lw    s7, 116(sp)
-	ldloc 6
+	stloc.2
+// 0x0106972c: 0x106972c: jal   0x100449c addiu a2, zero, 935
+	ldc.i4 935
+	stloc.3
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 29
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069734: 0x1069734: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01069738: 0x1069738: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0106973c: 0x106973c: addiu a0, s4, 15
+	ldloc 12
+	ldc.i4.s 15
 	add
-	ldelem.i4
-	stloc 14
-// 0x01069868: 0x1069868: lw    s6, 112(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 28
+	stloc.1
+// 0x01069740: 0x1069740: addiu a1, a1, 5356
+	ldloc.2
+	ldc.i4 5356
 	add
-	ldelem.i4
-	stloc 10
-// 0x0106986c: 0x106986c: lw    s5, 108(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
+	stloc.2
+// 0x01069744: 0x1069744: addiu a2, a2, 512
+	ldloc.3
+	ldc.i4 512
 	add
-	ldelem.i4
-	stloc 13
-// 0x01069870: 0x1069870: lw    s4, 104(sp)
-	ldloc 6
+	stloc.3
+// 0x01069748: 0x1069748: addiu a3, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc 11
-// 0x01069874: 0x1069874: lw    s3, 100(sp)
+	stloc 4
+// 0x0106974c: 0x106974c: jal   0x106856c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 9
-// 0x01069878: 0x1069878: lw    s2, 96(sp)
-	ldloc 6
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::ReadIntFromString_106856c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069754: 0x1069754: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069758: 0x1069758: addiu a3, a3, 18836
+	ldloc 4
+	ldc.i4 18836
 	add
-	ldelem.i4
-	stloc 15
-// 0x0106987c: 0x106987c: lw    s1, 92(sp)
+	stloc 4
+// 0x0106975c: 0x106975c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069760: 0x1069760: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069764: 0x1069764: addiu a2, zero, 946
+	ldc.i4 946
+	stloc.3
+// 0x01069768: 0x1069768: jal   0x100449c sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc 12
-// 0x01069880: 0x1069880: lw    s0, 88(sp)
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069770: 0x1069770: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 8
-// 0x01069884: 0x1069884: jr    ra addiu sp, sp, 128
-	ldloc.0
-	ldc.i4 128
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+// 0x01069774: 0x1069774: sll   zero, zero, 0
+// 0x01069778: 0x1069778: beq   v0, zero, 0x10697a0 lui   a1, 0x10000
 	ldloc 5
-	ret
-}
-.method public static int32 on_socket_connected__106988c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s3,int32 s2,int32 s4,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 11 is register s2
-// local 10 is register s3
-// local 12 is register s4
-// local  0 is register sp
-// local 13 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+	ldc.i4 65536
+	stloc.2
+	brfalse L_10697a0
+// --- basic block ---
+// 0x01069780: 0x1069780: lb    v0, 0(v0)
+	ldloc 5
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+// 0x01069784: 0x1069784: sll   zero, zero, 0
+// 0x01069788: 0x1069788: beq   v0, zero, 0x10697a4 lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 12
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 13
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	brfalse L_10697a4
 // --- basic block ---
-// 0x0106988c: 0x106988c: lw    v0, 16(a1)
+// 0x01069790: 0x1069790: lw    v0, 24(sp)
 	ldloc 6
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 5
-// 0x01069890: 0x1069890: addiu sp, sp, -48
-	ldloc.0
-	ldc.i4.s -48
+// 0x01069794: 0x1069794: sll   zero, zero, 0
+// 0x01069798: 0x1069798: bne   v0, zero, 0x10697c4 lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brtrue L_10697c4
+// --- basic block ---
+L_10697a0:
+// 0x010697a0: 0x10697a0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+L_10697a4:
+// 0x010697a4: 0x10697a4: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
 	add
-	stloc.0
-// 0x01069894: 0x1069894: addiu v1, zero, 2
-	ldc.i4.2
-	stloc 7
-// 0x01069898: 0x1069898: sw    s1, 28(sp)
+	stloc.2
+// 0x010697a8: 0x10697a8: addiu a3, a3, 18844
+	ldloc 4
+	ldc.i4 18844
+	add
+	stloc 4
+// 0x010697ac: 0x10697ac: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010697b0: 0x10697b0: addiu a2, zero, 950
+	ldc.i4 950
+	stloc.3
+L_10697b4:
+// 0x010697b4: 0x10697b4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106989c: 0x106989c: sw    s0, 24(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010697bc: 0x10697bc: j	 0x1069884 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_1069884
+// --- basic block ---
+L_10697c4:
+// 0x010697c4: 0x10697c4: addiu a3, a3, 18924
+	ldloc 4
+	ldc.i4 18924
 	add
+	stloc 4
+// 0x010697c8: 0x10697c8: addiu a1, s1, 18164
 	ldloc 8
-	stelem.i4
-// 0x010698a0: 0x10698a0: sw    ra, 44(sp)
-// 0x010698a4: 0x10698a4: sw    s4, 40(sp)
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x010697cc: 0x10697cc: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010697d0: 0x10697d0: jal   0x100449c addiu a2, zero, 954
+	ldc.i4 954
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010697d8: 0x10697d8: lw    v1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.6
 	add
-	ldloc 12
-	stelem.i4
-// 0x010698a8: 0x10698a8: sw    s3, 36(sp)
+	ldelem.i4
+	stloc 7
+// 0x010697dc: 0x10697dc: lw    v0, 2056(s2)
 	ldloc 6
-	ldloc.0
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 514
 	add
-	ldloc 10
-	stelem.i4
-// 0x010698ac: 0x10698ac: sw    s2, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 11
-	stelem.i4
-// 0x010698b0: 0x10698b0: addu  s0, a1, zero
-	ldloc.2
-	stloc 8
-// 0x010698b4: 0x10698b4: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x010698b8: 0x10698b8: bne   v0, v1, 0x10698e4 sw    a2, 4500(a1)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x010697e0: 0x10697e0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010697e4: 0x10697e4: addu  v0, v1, v0
 	ldloc 7
-	ldloc 6
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4 1125
+	ldloc 5
 	add
-	ldloc.3
-	stelem.i4
-	bne.un L_10698e4
-// --- basic block ---
-// 0x010698c0: 0x10698c0: addiu v0, zero, 5
-	ldc.i4.5
 	stloc 5
-// 0x010698c4: 0x10698c4: sw    v0, 4500(a1)
+// 0x010697e8: 0x10697e8: sw    v0, 2060(s2)
 	ldloc 6
-	ldloc.2
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4 515
 	add
 	ldloc 5
 	stelem.i4
-// 0x010698c8: 0x10698c8: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010698cc: 0x10698cc: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010698d0: 0x10698d0: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x010698d4: 0x10698d4: addiu a3, a3, 19380
+// 0x010697ec: 0x10697ec: addiu a3, a3, 18932
 	ldloc 4
-	ldc.i4 19380
+	ldc.i4 18932
 	add
 	stloc 4
-// 0x010698d8: 0x10698d8: addiu a0, zero, 4
-	ldc.i4.4
+// 0x010697f0: 0x10697f0: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x010697f4: 0x10697f4: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x010698dc: 0x10698dc: j	 0x1069a8c addiu a2, zero, 560
-	ldc.i4 560
+// 0x010697f8: 0x10697f8: jal   0x100449c addiu a2, zero, 959
+	ldc.i4 959
 	stloc.3
-	br L_1069a8c
-// --- basic block ---
-L_10698e4:
-// 0x010698e4: 0x10698e4: bne   a0, zero, 0x106991c sll   zero, zero, 0
-	ldloc.1
-	brtrue L_106991c
-// --- basic block ---
-// 0x010698ec: 0x10698ec: jal   0x10ac36c addu  a0, a2, zero
-	ldloc.3
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010698f4: 0x10698f4: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010698f8: 0x10698f8: lui   a3, 0x10000
+// 0x01069800: 0x1069800: lw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 5
+// 0x01069804: 0x1069804: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010698fc: 0x10698fc: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+// 0x01069808: 0x1069808: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x01069900: 0x1069900: addiu a3, a3, 19432
+// 0x0106980c: 0x106980c: addiu a3, a3, 18940
 	ldloc 4
-	ldc.i4 19432
+	ldc.i4 18940
 	add
 	stloc 4
-// 0x01069904: 0x1069904: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01069810: 0x1069810: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01069908: 0x1069908: addiu a2, zero, 569
-	ldc.i4 569
+// 0x01069814: 0x1069814: addiu a2, zero, 962
+	ldc.i4 962
 	stloc.3
-// 0x0106990c: 0x106990c: jal   0x100449c sw    v0, 16(sp)
+// 0x01069818: 0x1069818: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3601,148 +3284,38 @@ L_10698e4:
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069914: 0x1069914: j	 0x1069a98 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_1069a98
-// --- basic block ---
-L_106991c:
-// 0x0106991c: 0x106991c: jal   0x1067434 addiu a0, a1, 160
-	ldloc.2
-	ldc.i4 160
-	add
-	stloc.1
-	ldloc.1
-	call int32 Cibyl76::ebuffer_get_buffer_1067434(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069924: 0x1069924: addu  s2, v0, zero
-	ldloc 5
-	stloc 11
-// 0x01069928: 0x1069928: bne   v0, zero, 0x1069954 sw    s1, 12(s0)
-	ldloc 5
+// 0x0106981c: 0x106981c: j	 0x106983c sw    s0, 20(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.5
 	add
 	ldloc 9
 	stelem.i4
-	brtrue L_1069954
+	br L_106983c
 // --- basic block ---
-// 0x01069930: 0x1069930: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01069934: 0x1069934: lui   a3, 0x10000
+L_1069824:
+// 0x01069824: 0x1069824: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01069938: 0x1069938: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+// 0x01069828: 0x1069828: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x0106993c: 0x106993c: addiu a3, a3, 19512
+// 0x0106982c: 0x106982c: addiu a3, a3, 19000
 	ldloc 4
-	ldc.i4 19512
+	ldc.i4 19000
 	add
 	stloc 4
-// 0x01069940: 0x1069940: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01069944: 0x1069944: jal   0x100449c addiu a2, zero, 769
-	ldc.i4 769
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106994c: 0x106994c: j	 0x10699f0 sll   zero, zero, 0
-	br L_10699f0
-// --- basic block ---
-L_1069954:
-// 0x01069954: 0x1069954: jal   0x1001b48 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106995c: 0x106995c: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x01069960: 0x1069960: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x01069964: 0x1069964: addu  a1, s2, zero
-	ldloc 11
-	stloc.2
-// 0x01069968: 0x1069968: jal   0x1052018 addiu a3, zero, 1
+// 0x01069830: 0x1069830: addiu a0, zero, 1
 	ldc.i4.1
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl61::roadmap_net_send_1052018(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069970: 0x1069970: addu  s4, v0, zero
-	ldloc 5
-	stloc 12
-// 0x01069974: 0x1069974: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x01069978: 0x1069978: bne   s4, v0, 0x10699a4 lui   s3, 0x10000
-	ldloc 12
-	ldloc 5
-	ldc.i4 65536
-	stloc 10
-	bne.un L_10699a4
-// --- basic block ---
-// 0x01069980: 0x1069980: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01069984: 0x1069984: addiu a1, s3, 18168
-	ldloc 10
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x01069988: 0x1069988: addiu a3, a3, 19540
-	ldloc 4
-	ldc.i4 19540
-	add
-	stloc 4
-// 0x0106998c: 0x106998c: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x01069990: 0x1069990: addiu a2, zero, 776
-	ldc.i4 776
+// 0x01069834: 0x1069834: addiu a2, zero, 964
+	ldc.i4 964
 	stloc.3
-// 0x01069994: 0x1069994: jal   0x100449c sw    s1, 16(sp)
+// 0x01069838: 0x1069838: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3751,6 +3324,10 @@ L_1069954:
 	add
 	ldloc 9
 	stelem.i4
+L_106983c:
+// 0x0106983c: 0x106983c: jal   0x100449c lui   s0, 0x10000
+	ldc.i4 65536
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3761,56 +3338,25 @@ L_1069954:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106999c: 0x106999c: j	 0x10699f0 sll   zero, zero, 0
-	br L_10699f0
-// --- basic block ---
-L_10699a4:
-// 0x010699a4: 0x10699a4: jal   0x1001b48 addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010699ac: 0x10699ac: lui   a3, 0x10000
+// 0x01069844: 0x1069844: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010699b0: 0x10699b0: addiu a3, a3, 19600
+// 0x01069848: 0x1069848: addiu a3, a3, 19072
 	ldloc 4
-	ldc.i4 19600
+	ldc.i4 19072
 	add
 	stloc 4
-// 0x010699b4: 0x10699b4: addiu a0, zero, 1
+// 0x0106984c: 0x106984c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010699b8: 0x10699b8: addiu a1, s3, 18168
-	ldloc 10
-	ldc.i4 18168
+// 0x01069850: 0x1069850: addiu a1, s0, 18164
+	ldloc 9
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x010699bc: 0x10699bc: addiu a2, zero, 778
-	ldc.i4 778
+// 0x01069854: 0x1069854: jal   0x100449c addiu a2, zero, 967
+	ldc.i4 967
 	stloc.3
-// 0x010699c0: 0x10699c0: sw    s1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x010699c4: 0x10699c4: jal   0x100449c sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3821,81 +3367,44 @@ L_10699a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010699cc: 0x10699cc: bne   s4, zero, 0x10699f0 addiu v0, zero, 11
-	ldloc 12
-	ldc.i4.s 11
+// 0x0106985c: 0x106985c: addiu v0, zero, 2
+	ldc.i4.2
 	stloc 5
-	brtrue L_10699f0
-// --- basic block ---
-// 0x010699d4: 0x10699d4: lui   a3, 0x10000
+// 0x01069860: 0x1069860: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010699d8: 0x10699d8: sw    v0, 4500(s0)
+// 0x01069864: 0x1069864: sw    v0, 0(s3)
 	ldloc 6
-	ldloc 8
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
-	add
 	ldloc 5
 	stelem.i4
-// 0x010699dc: 0x10699dc: addiu a1, s3, 18168
-	ldloc 10
-	ldc.i4 18168
+// 0x01069868: 0x1069868: addiu a1, s0, 18164
+	ldloc 9
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x010699e0: 0x10699e0: addiu a3, a3, 19640
+// 0x0106986c: 0x106986c: addiu a3, a3, 19080
 	ldloc 4
-	ldc.i4 19640
+	ldc.i4 19080
 	add
 	stloc 4
-// 0x010699e4: 0x10699e4: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01069870: 0x1069870: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x010699e8: 0x10699e8: j	 0x1069a8c addiu a2, zero, 583
-	ldc.i4 583
+// 0x01069874: 0x1069874: addiu a2, zero, 971
+	ldc.i4 971
 	stloc.3
-	br L_1069a8c
-// --- basic block ---
-L_10699f0:
-// 0x010699f0: 0x10699f0: lw    a0, 12(s0)
+// 0x01069878: 0x1069878: jal   0x100449c sw    s3, 16(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc.1
-// 0x010699f4: 0x10699f4: sll   zero, zero, 0
-// 0x010699f8: 0x10699f8: bne   a0, zero, 0x1069a24 lui   a3, 0x1070000
-	ldloc.1
-	ldc.i4 17235968
-	stloc 4
-	brtrue L_1069a24
-// --- basic block ---
-// 0x01069a00: 0x1069a00: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01069a04: 0x1069a04: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01069a08: 0x1069a08: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x01069a0c: 0x1069a0c: addiu a3, a3, 19688
-	ldloc 4
-	ldc.i4 19688
-	add
-	stloc 4
-// 0x01069a10: 0x1069a10: addiu a0, zero, 4
 	ldc.i4.4
-	stloc.1
-// 0x01069a14: 0x1069a14: jal   0x100449c addiu a2, zero, 141
-	ldc.i4 141
-	stloc.3
+	add
+	ldloc 11
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3906,215 +3415,59 @@ L_10699f0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01069a1c: 0x1069a1c: j	 0x1069a78 lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-	br L_1069a78
-// --- basic block ---
-L_1069a24:
-// 0x01069a24: 0x1069a24: lw    a1, 4472(s0)
+// 0x01069880: 0x1069880: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_1069884:
+// 0x01069884: 0x1069884: lw    ra, 60(sp)
+// 0x01069888: 0x1069888: lw    s4, 56(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1118
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc.2
-// 0x01069a28: 0x1069a28: lw    a2, 4476(s0)
+	stloc 12
+// 0x0106988c: 0x106988c: lw    s3, 52(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1119
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc.3
-// 0x01069a2c: 0x1069a2c: addiu a3, a3, -23716
-	ldloc 4
-	ldc.i4 -23716
-	add
-	stloc 4
-// 0x01069a30: 0x1069a30: jal   0x106762c sw    s0, 16(sp)
+	stloc 11
+// 0x01069890: 0x1069890: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::socket_async_receive_106762c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069a38: 0x1069a38: bne   v0, zero, 0x1069a6c addiu v0, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 5
-	brtrue L_1069a6c
-// --- basic block ---
-// 0x01069a40: 0x1069a40: lw    v0, 12(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc 5
-// 0x01069a44: 0x1069a44: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01069a48: 0x1069a48: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01069a4c: 0x1069a4c: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x01069a50: 0x1069a50: addiu a3, a3, 19724
-	ldloc 4
-	ldc.i4 19724
-	add
-	stloc 4
-// 0x01069a54: 0x1069a54: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01069a58: 0x1069a58: addiu a2, zero, 152
-	ldc.i4 152
-	stloc.3
-// 0x01069a5c: 0x1069a5c: jal   0x100449c sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069a64: 0x1069a64: j	 0x1069a78 lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-	br L_1069a78
-// --- basic block ---
-L_1069a6c:
-// 0x01069a6c: 0x1069a6c: sw    v0, 20(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x01069a70: 0x1069a70: j	 0x1069a98 addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-	br L_1069a98
-// --- basic block ---
-L_1069a78:
-// 0x01069a78: 0x1069a78: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01069a7c: 0x1069a7c: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x01069a80: 0x1069a80: addiu a3, a3, 19788
-	ldloc 4
-	ldc.i4 19788
-	add
-	stloc 4
-// 0x01069a84: 0x1069a84: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01069a88: 0x1069a88: addiu a2, zero, 589
-	ldc.i4 589
-	stloc.3
-L_1069a8c:
-// 0x01069a8c: 0x1069a8c: jal   0x100449c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069a94: 0x1069a94: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-L_1069a98:
-// 0x01069a98: 0x1069a98: lw    ra, 44(sp)
-// 0x01069a9c: 0x1069a9c: lw    s4, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 12
-// 0x01069aa0: 0x1069aa0: lw    s3, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 12
 	add
 	ldelem.i4
 	stloc 10
-// 0x01069aa4: 0x1069aa4: lw    s2, 32(sp)
+// 0x01069894: 0x1069894: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 11
 	add
 	ldelem.i4
-	stloc 11
-// 0x01069aa8: 0x1069aa8: lw    s1, 28(sp)
+	stloc 8
+// 0x01069898: 0x1069898: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 10
 	add
 	ldelem.i4
 	stloc 9
-// 0x01069aac: 0x1069aac: lw    s0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x01069ab0: 0x1069ab0: jr    ra addiu sp, sp, 48
+// 0x0106989c: 0x106989c: jr    ra addiu sp, sp, 64
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -4124,21 +3477,21 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 wstq_Add_1069ab8(int32,int32,int32,int32,int32)
+.method public static int32 wst_Send_10698a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 s2,int32 s3,int32 ra)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 11 is register s0
+// local  7 is register s0
 // local  8 is register s1
-// local  9 is register s2
-// local 10 is register s3
+// local 10 is register s2
+// local 11 is register s3
 // local  0 is register sp
 // local 12 is register ra
 // local  5 is register mem
@@ -4146,7 +3499,7 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4156,13 +3509,13 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 11
+	stloc 7
 	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
 	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
@@ -4171,120 +3524,111 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01069ab8: 0x1069ab8: addiu sp, sp, -80
+// 0x010698a4: 0x10698a4: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.s -80
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01069abc: 0x1069abc: sw    s3, 72(sp)
+// 0x010698a8: 0x10698a8: sw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 9
 	add
 	ldloc 10
 	stelem.i4
-// 0x01069ac0: 0x1069ac0: sw    s2, 68(sp)
+// 0x010698ac: 0x10698ac: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.8
 	add
-	ldloc 9
+	ldloc 8
 	stelem.i4
-// 0x01069ac4: 0x1069ac4: sw    s0, 60(sp)
+// 0x010698b0: 0x10698b0: sw    ra, 44(sp)
+// 0x010698b4: 0x10698b4: sw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.s 10
 	add
 	ldloc 11
 	stelem.i4
-// 0x01069ac8: 0x1069ac8: sw    ra, 76(sp)
-// 0x01069acc: 0x1069acc: sw    s1, 64(sp)
+// 0x010698b8: 0x10698b8: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.7
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x01069ad0: 0x1069ad0: lw    s3, 96(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldelem.i4
-	stloc 10
-// 0x01069ad4: 0x1069ad4: lw    s2, 104(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
-	add
-	ldelem.i4
-	stloc 9
-// 0x01069ad8: 0x1069ad8: beq   a2, zero, 0x1069b08 addu  s0, a0, zero
-	ldloc.3
+// 0x010698bc: 0x10698bc: addu  s1, a0, zero
 	ldloc.1
-	stloc 11
-	brfalse L_1069b08
-// --- basic block ---
-// 0x01069ae0: 0x1069ae0: beq   a3, zero, 0x1069b08 sll   zero, zero, 0
-	ldloc 4
-	brfalse L_1069b08
-// --- basic block ---
-// 0x01069ae8: 0x1069ae8: beq   s3, zero, 0x1069b08 sll   zero, zero, 0
-	ldloc 10
-	brfalse L_1069b08
-// --- basic block ---
-// 0x01069af0: 0x1069af0: beq   s2, zero, 0x1069b08 sll   zero, zero, 0
-	ldloc 9
-	brfalse L_1069b08
-// --- basic block ---
-// 0x01069af8: 0x1069af8: lb    v0, 0(s2)
-	ldloc 9
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01069afc: 0x1069afc: sll   zero, zero, 0
-// 0x01069b00: 0x1069b00: bne   v0, zero, 0x1069b2c addiu s1, sp, 16
-	ldloc 6
-	ldloc.0
-	ldc.i4.s 16
-	add
 	stloc 8
-	brtrue L_1069b2c
+// 0x010698c0: 0x10698c0: bne   a0, zero, 0x10698e4 addu  s2, a1, zero
+	ldloc.1
+	ldloc.2
+	stloc 10
+	brtrue L_10698e4
 // --- basic block ---
-L_1069b08:
-// 0x01069b08: 0x1069b08: lui   a1, 0x10000
+// 0x010698c8: 0x10698c8: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010698cc: 0x10698cc: lui   a3, 0x10000
 	ldc.i4 65536
+	stloc 4
+// 0x010698d0: 0x10698d0: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
 	stloc.2
-// 0x01069b0c: 0x1069b0c: lui   a3, 0x10000
+// 0x010698d4: 0x10698d4: addiu a3, a3, 19092
+	ldloc 4
+	ldc.i4 19092
+	add
+	stloc 4
+// 0x010698d8: 0x10698d8: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010698dc: 0x10698dc: j	 0x1069900 addiu a2, zero, 835
+	ldc.i4 835
+	stloc.3
+	br L_1069900
+// --- basic block ---
+L_10698e4:
+// 0x010698e4: 0x10698e4: bne   a1, zero, 0x1069910 lui   a3, 0x10000
+	ldloc.2
 	ldc.i4 65536
 	stloc 4
-// 0x01069b10: 0x1069b10: addiu a1, a1, 18168
+	brtrue L_1069910
+// --- basic block ---
+// 0x010698ec: 0x10698ec: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010698f0: 0x10698f0: addiu a1, a1, 18164
 	ldloc.2
-	ldc.i4 18168
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x01069b14: 0x1069b14: addiu a3, a3, 19840
+// 0x010698f4: 0x10698f4: addiu a3, a3, 19124
 	ldloc 4
-	ldc.i4 19840
+	ldc.i4 19124
 	add
 	stloc 4
-// 0x01069b18: 0x1069b18: addiu a0, zero, 4
+// 0x010698f8: 0x10698f8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01069b1c: 0x1069b1c: jal   0x100449c addiu a2, zero, 338
-	ldc.i4 338
+// 0x010698fc: 0x10698fc: addiu a2, zero, 841
+	ldc.i4 841
 	stloc.3
+L_1069900:
+// 0x01069900: 0x1069900: jal   0x100449c addiu s0, zero, -1
+	ldc.i4.m1
+	stloc 7
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4292,263 +3636,224 @@ L_1069b08:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01069b24: 0x1069b24: j	 0x1069b90 addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-	br L_1069b90
+// 0x01069908: 0x1069908: j	 0x1069984 sll   zero, zero, 0
+	br L_1069984
+// --- basic block ---
+L_1069910:
+// 0x01069910: 0x1069910: jal   0x1001b48 addu  a0, a1, zero
+	ldloc.2
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
 // --- basic block ---
-L_1069b2c:
-// 0x01069b2c: 0x1069b2c: addu  a0, s1, zero
+// 0x01069918: 0x1069918: addu  a2, v0, zero
+	ldloc 6
+	stloc.3
+// 0x0106991c: 0x106991c: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01069b30: 0x1069b30: sw    a1, 40(sp)
-	ldloc 5
+// 0x01069920: 0x1069920: addu  a1, s2, zero
+	ldloc 10
+	stloc.2
+// 0x01069924: 0x1069924: jal   0x1052028 addiu a3, zero, 1
+	ldc.i4.1
+	stloc 4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
+	ldloc.1
 	ldloc.2
-	stelem.i4
-// 0x01069b34: 0x1069b34: sw    a2, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
 	ldloc.3
-	stelem.i4
-// 0x01069b38: 0x1069b38: jal   0x1068dc0 sw    a3, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
 	ldloc 4
-	stelem.i4
-	ldloc.1
-	call void Cibyl77::wstq_item_init_1068dc0(int32)
+	call int32 Cibyl61::roadmap_net_send_1052028(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
 // --- basic block ---
-// 0x01069b40: 0x1069b40: lw    a1, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+// 0x0106992c: 0x106992c: addu  s0, v0, zero
+	ldloc 6
+	stloc 7
+// 0x01069930: 0x1069930: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x01069934: 0x1069934: bne   s0, v0, 0x1069958 lui   s3, 0x10000
+	ldloc 7
+	ldloc 6
+	ldc.i4 65536
+	stloc 11
+	bne.un L_1069958
+// --- basic block ---
+// 0x0106993c: 0x106993c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069940: 0x1069940: addiu a1, s3, 18164
+	ldloc 11
+	ldc.i4 18164
 	add
-	ldelem.i4
 	stloc.2
-// 0x01069b44: 0x1069b44: lw    a2, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc.3
-// 0x01069b48: 0x1069b48: lw    a3, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+// 0x01069944: 0x1069944: addiu a3, a3, 19152
+	ldloc 4
+	ldc.i4 19152
 	add
-	ldelem.i4
 	stloc 4
-// 0x01069b4c: 0x1069b4c: lw    v0, 100(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldelem.i4
-	stloc 6
-// 0x01069b50: 0x1069b50: addu  a0, s2, zero
-	ldloc 9
+// 0x01069948: 0x1069948: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01069b54: 0x1069b54: sw    a1, 16(sp)
+// 0x0106994c: 0x106994c: addiu a2, zero, 848
+	ldc.i4 848
+	stloc.3
+// 0x01069950: 0x1069950: j	 0x106997c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc.2
-	stelem.i4
-// 0x01069b58: 0x1069b58: sw    a2, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc.3
-	stelem.i4
-// 0x01069b5c: 0x1069b5c: sw    a3, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 4
+	ldloc 8
 	stelem.i4
-// 0x01069b60: 0x1069b60: sw    s3, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
+	br L_106997c
+// --- basic block ---
+L_1069958:
+// 0x01069958: 0x1069958: jal   0x1001b48 addu  a0, s2, zero
 	ldloc 10
-	stelem.i4
-// 0x01069b64: 0x1069b64: jal   0x1001ba8 sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01069b6c: 0x1069b6c: addiu a0, s0, 28
+// 0x01069960: 0x1069960: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069964: 0x1069964: addiu a1, s3, 18164
 	ldloc 11
-	ldc.i4.s 28
+	ldc.i4 18164
 	add
-	stloc.1
-// 0x01069b70: 0x1069b70: addu  a1, s1, zero
-	ldloc 8
 	stloc.2
-// 0x01069b74: 0x1069b74: jal   0x1068c80 sw    v0, 36(sp)
+// 0x01069968: 0x1069968: addiu a3, a3, 19212
+	ldloc 4
+	ldc.i4 19212
+	add
+	stloc 4
+// 0x0106996c: 0x106996c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069970: 0x1069970: addiu a2, zero, 850
+	ldc.i4 850
+	stloc.3
+// 0x01069974: 0x1069974: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.4
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
+// 0x01069978: 0x1069978: sw    v0, 20(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::wstq_enqueue_1068c80(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01069b7c: 0x1069b7c: bne   v0, zero, 0x1069b90 addiu v1, zero, 1
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 6
-	ldc.i4.1
-	stloc 7
-	brtrue L_1069b90
-// --- basic block ---
-// 0x01069b84: 0x1069b84: jal   0x1068ee4 addu  a0, s1, zero
-	ldloc 8
-	stloc.1
+	stelem.i4
+L_106997c:
+// 0x0106997c: 0x106997c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wstq_item_release_1068ee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01069b8c: 0x1069b8c: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-L_1069b90:
-// 0x01069b90: 0x1069b90: lw    ra, 76(sp)
-// 0x01069b94: 0x1069b94: addu  v0, v1, zero
+L_1069984:
+// 0x01069984: 0x1069984: lw    ra, 44(sp)
+// 0x01069988: 0x1069988: addu  v0, s0, zero
 	ldloc 7
 	stloc 6
-// 0x01069b98: 0x1069b98: lw    s3, 72(sp)
+// 0x0106998c: 0x106998c: lw    s3, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 10
-// 0x01069b9c: 0x1069b9c: lw    s2, 68(sp)
+	stloc 11
+// 0x01069990: 0x1069990: lw    s2, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 9
-// 0x01069ba0: 0x1069ba0: lw    s1, 64(sp)
+	stloc 10
+// 0x01069994: 0x1069994: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.8
 	add
 	ldelem.i4
 	stloc 8
-// 0x01069ba4: 0x1069ba4: lw    s0, 60(sp)
+// 0x01069998: 0x1069998: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 11
-// 0x01069ba8: 0x1069ba8: jr    ra addiu sp, sp, 80
+	stloc 7
+// 0x0106999c: 0x106999c: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4.s 80
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 wst_queue_clear_1069bd0(int32,int32,int32,int32,int32)
+.method public static int32 cont_10699a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s5,int32 s3,int32 s4,int32 ra)
 
-// local  7 is register v0
-// local  8 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  9 is register s0
+// local  8 is register s1
+// local 10 is register s2
+// local 12 is register s3
+// local 13 is register s4
+// local 11 is register s5
 // local  0 is register sp
-// local  5 is register ra
+// local 14 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4557,623 +3862,1265 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01069bd0: 0x1069bd0: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01069bd4: 0x1069bd4: sw    ra, 20(sp)
-// 0x01069bd8: 0x1069bd8: jal   0x1068f24 addiu a0, a0, 28
-	ldloc.1
-	ldc.i4.s 28
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl78::wstq_clear_1068f24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	ldc.i4.s 0
 	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x01069be0: 0x1069be0: lw    ra, 20(sp)
-// 0x01069be4: 0x1069be4: sll   zero, zero, 0
-// 0x01069be8: 0x1069be8: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 wst_context_reset_1069bf0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra,int32 v0,int32 v1)
-
-// local 12 is register v0
-// local 13 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  8 is register s2
-// local  9 is register s3
-// local 10 is register s4
-// local  0 is register sp
-// local 11 is register ra
-// local  5 is register mem
-
+	ldc.i4.s 0
+	stloc 10
 	ldc.i4.s 0
 	stloc 12
 	ldc.i4.s 0
 	stloc 13
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
 	ldc.i4.s 0
-	stloc 10
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 14
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01069bf0: 0x1069bf0: addiu sp, sp, -40
+// 0x010699a4: 0x10699a4: addiu sp, sp, -64
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01069bf4: 0x1069bf4: sw    s4, 32(sp)
-	ldloc 5
+// 0x010699a8: 0x10699a8: sw    s1, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 10
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01069bf8: 0x1069bf8: sw    s3, 28(sp)
-	ldloc 5
+// 0x010699ac: 0x10699ac: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010699b0: 0x10699b0: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x010699b4: 0x10699b4: sw    s4, 52(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 13
 	add
-	ldloc 9
+	ldloc 13
 	stelem.i4
-// 0x01069bfc: 0x1069bfc: lw    s4, 12(a0)
-	ldloc 5
-	ldloc.1
+// 0x010699b8: 0x10699b8: sw    s0, 36(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc 10
-// 0x01069c00: 0x1069c00: lw    s3, 0(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+	ldloc 9
+	stelem.i4
+// 0x010699bc: 0x10699bc: addu  s4, a1, zero
+	ldloc.2
+	stloc 13
+// 0x010699c0: 0x10699c0: addu  s0, a2, zero
+	ldloc.3
 	stloc 9
-// 0x01069c04: 0x1069c04: sw    s2, 24(sp)
-	ldloc 5
+// 0x010699c4: 0x10699c4: addiu a3, a3, 19252
+	ldloc 4
+	ldc.i4 19252
+	add
+	stloc 4
+// 0x010699c8: 0x10699c8: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010699cc: 0x10699cc: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x010699d0: 0x10699d0: sw    s5, 56(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 14
 	add
-	ldloc 8
+	ldloc 11
 	stelem.i4
-// 0x01069c08: 0x1069c08: sw    s1, 20(sp)
-	ldloc 5
+// 0x010699d4: 0x10699d4: sw    s3, 48(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 12
 	add
-	ldloc 7
+	ldloc 12
 	stelem.i4
-// 0x01069c0c: 0x1069c0c: lw    s2, 4(a0)
-	ldloc 5
-	ldloc.1
+// 0x010699d8: 0x10699d8: sw    s2, 44(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 11
 	add
-	ldelem.i4
-	stloc 8
-// 0x01069c10: 0x1069c10: lw    s1, 8(a0)
-	ldloc 5
+	ldloc 10
+	stelem.i4
+// 0x010699dc: 0x10699dc: sw    ra, 60(sp)
+// 0x010699e0: 0x10699e0: jal   0x100449c addiu a2, zero, 682
+	ldc.i4 682
+	stloc.3
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010699e8: 0x10699e8: lw    v0, 4480(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4 1120
 	add
 	ldelem.i4
-	stloc 7
-// 0x01069c14: 0x1069c14: sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
+	stloc 5
+// 0x010699ec: 0x10699ec: addiu s2, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+	stloc 10
+// 0x010699f0: 0x10699f0: sw    v0, 24(sp)
 	ldloc 6
-	stelem.i4
-// 0x01069c18: 0x1069c18: sw    zero, 16(a0)
-	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01069c1c: 0x1069c1c: addu  s0, a0, zero
-	ldloc.1
-	stloc 6
-// 0x01069c20: 0x1069c20: sw    zero, 20(a0)
 	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldc.i4.s 0
 	stelem.i4
-// 0x01069c24: 0x1069c24: sw    zero, 24(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+// 0x010699f4: 0x10699f4: addiu s3, s0, 2404
+	ldloc 9
+	ldc.i4 2404
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01069c28: 0x1069c28: sw    zero, 156(a0)
+	stloc 12
+// 0x010699f8: 0x10699f8: beq   v0, s2, 0x1069a6c addiu s5, zero, 1
 	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 39
+	ldloc 10
+	ldc.i4.1
+	stloc 11
+	beq  L_1069a6c
+// --- basic block ---
+// 0x01069a00: 0x1069a00: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069a04: 0x1069a04: addiu a3, a3, 19260
+	ldloc 4
+	ldc.i4 19260
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01069c2c: 0x1069c2c: sw    ra, 36(sp)
-// 0x01069c30: 0x1069c30: jal   0x1067508 addiu a0, a0, 160
-	ldloc.1
-	ldc.i4 160
+	stloc 4
+// 0x01069a08: 0x1069a08: addiu a2, zero, 691
+	ldc.i4 691
+	stloc.3
+// 0x01069a0c: 0x1069a0c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
+	stloc.2
+// 0x01069a10: 0x1069a10: jal   0x100449c addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 13
-	stloc 12
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01069c38: 0x1069c38: jal   0x106a724 addiu a0, s0, 2404
-	ldloc 6
-	ldc.i4 2404
-	add
+// 0x01069a18: 0x1069a18: addu  a0, s3, zero
+	ldloc 12
 	stloc.1
+// 0x01069a1c: 0x1069a1c: jal   0x10694d8 addiu a1, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::cyclic_buffer_init_106a724(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::OnHTTPHeader_10694d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 13
-	stloc 12
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01069c40: 0x1069c40: lw    ra, 36(sp)
-// 0x01069c44: 0x1069c44: sw    s4, 12(s0)
+// 0x01069a24: 0x1069a24: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069a28: 0x1069a28: addu  s5, v0, zero
 	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
+	stloc 11
+// 0x01069a2c: 0x1069a2c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
 	add
-	ldloc 10
-	stelem.i4
-// 0x01069c48: 0x1069c48: sw    s3, 0(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldloc 9
-	stelem.i4
-// 0x01069c4c: 0x1069c4c: sw    s2, 4(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc.2
+// 0x01069a30: 0x1069a30: addiu a3, a3, 19268
+	ldloc 4
+	ldc.i4 19268
 	add
-	ldloc 8
-	stelem.i4
-// 0x01069c50: 0x1069c50: sw    s1, 8(s0)
-	ldloc 5
+	stloc 4
+// 0x01069a34: 0x1069a34: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069a38: 0x1069a38: addiu a2, zero, 695
+	ldc.i4 695
+	stloc.3
+// 0x01069a3c: 0x1069a3c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x01069c54: 0x1069c54: sw    zero, 4480(s0)
-	ldloc 5
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069a44: 0x1069a44: bne   s5, zero, 0x1069a50 lui   a1, 0x10000
+	ldloc 11
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1069a50
+// --- basic block ---
+// 0x01069a4c: 0x1069a4c: sw    s2, 4480(s0)
 	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4 1120
 	add
-	ldc.i4.s 0
+	ldloc 10
 	stelem.i4
-// 0x01069c58: 0x1069c58: sw    zero, 4484(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 1121
+L_1069a50:
+// 0x01069a50: 0x1069a50: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069a54: 0x1069a54: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01069c5c: 0x1069c5c: sw    zero, 4488(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 1122
+	stloc.2
+// 0x01069a58: 0x1069a58: addiu a3, a3, 19276
+	ldloc 4
+	ldc.i4 19276
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01069c60: 0x1069c60: sw    zero, 4492(s0)
-	ldloc 5
+	stloc 4
+// 0x01069a5c: 0x1069a5c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069a60: 0x1069a60: addiu a2, zero, 703
+	ldc.i4 703
+	stloc.3
+// 0x01069a64: 0x1069a64: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1123
+	ldc.i4.4
 	add
-	ldc.i4.s 0
+	ldloc 9
 	stelem.i4
-// 0x01069c64: 0x1069c64: sw    zero, 4496(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 1124
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_1069a6c:
+// 0x01069a6c: 0x1069a6c: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x01069a70: 0x1069a70: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069a74: 0x1069a74: addiu a3, a3, 19284
+	ldloc 4
+	ldc.i4 19284
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01069c68: 0x1069c68: sw    zero, 4500(s0)
-	ldloc 5
+	stloc 4
+// 0x01069a78: 0x1069a78: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069a7c: 0x1069a7c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069a80: 0x1069a80: jal   0x100449c addiu a2, zero, 706
+	ldc.i4 706
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069a88: 0x1069a88: lw    v1, 24(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4.6
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01069c6c: 0x1069c6c: lw    s4, 32(sp)
+	ldelem.i4
+	stloc 7
+// 0x01069a8c: 0x1069a8c: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x01069a90: 0x1069a90: bne   v1, v0, 0x1069ab8 lui   a3, 0x10000
+	ldloc 7
 	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	bne.un L_1069ab8
+// --- basic block ---
+// 0x01069a98: 0x1069a98: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069a9c: 0x1069a9c: addiu a3, a3, 19292
+	ldloc 4
+	ldc.i4 19292
+	add
+	stloc 4
+// 0x01069aa0: 0x1069aa0: addiu a2, zero, 711
+	ldc.i4 711
+	stloc.3
+// 0x01069aa4: 0x1069aa4: jal   0x100449c addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069aac: 0x1069aac: jal   0x106913c addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl78::OnCustomResponse_106913c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069ab4: 0x1069ab4: addu  s5, v0, zero
+	ldloc 5
+	stloc 11
+L_1069ab8:
+// 0x01069ab8: 0x1069ab8: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x01069abc: 0x1069abc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069ac0: 0x1069ac0: addiu s2, zero, 1
+	ldc.i4.1
+	stloc 10
+// 0x01069ac4: 0x1069ac4: addiu a3, a3, 19300
+	ldloc 4
+	ldc.i4 19300
+	add
+	stloc 4
+// 0x01069ac8: 0x1069ac8: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069acc: 0x1069acc: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069ad0: 0x1069ad0: jal   0x100449c addiu a2, zero, 715
+	ldc.i4 715
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069ad8: 0x1069ad8: bne   s5, s2, 0x1069b50 lui   a3, 0x10000
+	ldloc 11
+	ldloc 10
+	ldc.i4 65536
+	stloc 4
+	bne.un L_1069b50
+// --- basic block ---
+// 0x01069ae0: 0x1069ae0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069ae4: 0x1069ae4: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01069ae8: 0x1069ae8: addiu v0, v0, 16808
+	ldloc 5
+	ldc.i4 16808
+	add
+	stloc 5
+// 0x01069aec: 0x1069aec: addiu a3, a3, 19308
+	ldloc 4
+	ldc.i4 19308
+	add
+	stloc 4
+// 0x01069af0: 0x1069af0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069af4: 0x1069af4: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069af8: 0x1069af8: addiu a2, zero, 718
+	ldc.i4 718
+	stloc.3
+// 0x01069afc: 0x1069afc: jal   0x100449c sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 10
-// 0x01069c70: 0x1069c70: lw    s3, 28(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069b04: 0x1069b04: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069b08: 0x1069b08: addiu a3, a3, 19368
+	ldloc 4
+	ldc.i4 19368
+	add
+	stloc 4
+// 0x01069b0c: 0x1069b0c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069b10: 0x1069b10: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069b14: 0x1069b14: jal   0x100449c addiu a2, zero, 722
+	ldc.i4 722
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069b1c: 0x1069b1c: lw    v1, 4500(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 1125
 	add
 	ldelem.i4
-	stloc 9
-// 0x01069c74: 0x1069c74: lw    s2, 24(sp)
+	stloc 7
+// 0x01069b20: 0x1069b20: sll   zero, zero, 0
+// 0x01069b24: 0x1069b24: bne   v1, zero, 0x1069d34 addiu v0, zero, 1
+	ldloc 7
+	ldc.i4.1
+	stloc 5
+	brtrue L_1069d34
+// --- basic block ---
+// 0x01069b2c: 0x1069b2c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069b30: 0x1069b30: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069b34: 0x1069b34: addiu a3, a3, 19376
+	ldloc 4
+	ldc.i4 19376
+	add
+	stloc 4
+// 0x01069b38: 0x1069b38: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069b3c: 0x1069b3c: jal   0x100449c addiu a2, zero, 726
+	ldc.i4 726
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069b44: 0x1069b44: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x01069b48: 0x1069b48: j	 0x1069bd0 sw    v0, 4500(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
+	add
 	ldloc 5
+	stelem.i4
+	br L_1069bd0
+// --- basic block ---
+L_1069b50:
+// 0x01069b50: 0x1069b50: addiu a3, a3, 19384
+	ldloc 4
+	ldc.i4 19384
+	add
+	stloc 4
+// 0x01069b54: 0x1069b54: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069b58: 0x1069b58: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069b5c: 0x1069b5c: jal   0x100449c addiu a2, zero, 733
+	ldc.i4 733
+	stloc.3
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069b64: 0x1069b64: beq   s4, zero, 0x1069b88 sll   zero, zero, 0
+	ldloc 13
+	brfalse L_1069b88
+// --- basic block ---
+// 0x01069b6c: 0x1069b6c: lw    a0, 4456(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 1114
 	add
 	ldelem.i4
-	stloc 8
-// 0x01069c78: 0x1069c78: lw    s1, 20(sp)
+	stloc.1
+// 0x01069b70: 0x1069b70: lw    v0, 4468(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 1117
+	add
+	ldelem.i4
+	stloc 5
+// 0x01069b74: 0x1069b74: lw    v1, 4464(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 1116
+	add
+	ldelem.i4
+	stloc 7
+// 0x01069b78: 0x1069b78: addu  v0, a0, v0
+	ldloc.1
+	ldloc 5
+	add
+	stloc 5
+// 0x01069b7c: 0x1069b7c: slt   v0, v0, v1
 	ldloc 5
+	ldloc 7
+	clt
+	stloc 5
+// 0x01069b80: 0x1069b80: bne   v0, zero, 0x1069c04 lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brtrue L_1069c04
+// --- basic block ---
+L_1069b88:
+// 0x01069b88: 0x1069b88: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x01069b8c: 0x1069b8c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069b90: 0x1069b90: addiu a3, a3, 19392
+	ldloc 4
+	ldc.i4 19392
+	add
+	stloc 4
+// 0x01069b94: 0x1069b94: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069b98: 0x1069b98: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069b9c: 0x1069b9c: jal   0x100449c addiu a2, zero, 740
+	ldc.i4 740
+	stloc.3
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069ba4: 0x1069ba4: lw    v0, 4460(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 1115
+	add
+	ldelem.i4
+	stloc 5
+// 0x01069ba8: 0x1069ba8: lw    v1, 4456(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 1114
 	add
 	ldelem.i4
 	stloc 7
-// 0x01069c7c: 0x1069c7c: lw    s0, 16(sp)
+// 0x01069bac: 0x1069bac: sll   zero, zero, 0
+// 0x01069bb0: 0x1069bb0: beq   v1, v0, 0x1069bd8 lui   a3, 0x10000
+	ldloc 7
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	beq  L_1069bd8
+// --- basic block ---
+// 0x01069bb8: 0x1069bb8: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069bbc: 0x1069bbc: addiu a3, a3, 19400
+	ldloc 4
+	ldc.i4 19400
+	add
+	stloc 4
+// 0x01069bc0: 0x1069bc0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069bc4: 0x1069bc4: addiu a2, zero, 744
+	ldc.i4 744
+	stloc.3
+L_1069bc8:
+// 0x01069bc8: 0x1069bc8: jal   0x100449c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_1069bd0:
+// 0x01069bd0: 0x1069bd0: j	 0x1069d34 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_1069d34
+// --- basic block ---
+L_1069bd8:
+// 0x01069bd8: 0x1069bd8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069bdc: 0x1069bdc: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01069be0: 0x1069be0: addiu v0, v0, 19408
 	ldloc 5
+	ldc.i4 19408
+	add
+	stloc 5
+// 0x01069be4: 0x1069be4: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069be8: 0x1069be8: addiu a3, a3, 19308
+	ldloc 4
+	ldc.i4 19308
+	add
+	stloc 4
+// 0x01069bec: 0x1069bec: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069bf0: 0x1069bf0: addiu a2, zero, 748
+	ldc.i4 748
+	stloc.3
+// 0x01069bf4: 0x1069bf4: jal   0x100449c sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 6
-// 0x01069c80: 0x1069c80: jr    ra addiu sp, sp, 40
+	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.s 40
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069bfc: 0x1069bfc: j	 0x1069d34 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_1069d34
+// --- basic block ---
+L_1069c04:
+// 0x01069c04: 0x1069c04: addiu a3, a3, 19420
+	ldloc 4
+	ldc.i4 19420
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 13
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 4
+// 0x01069c08: 0x1069c08: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069c0c: 0x1069c0c: addiu a2, zero, 754
+	ldc.i4 754
+	stloc.3
+// 0x01069c10: 0x1069c10: jal   0x100449c addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069c18: 0x1069c18: jal   0x106acb4 addu  a0, s3, zero
 	ldloc 12
-	ret
-}
-.method public static int32 wst_context_load_1069c88(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
-
-// local  7 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::cyclic_buffer_recycle_106acb4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069c20: 0x1069c20: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069c24: 0x1069c24: addiu a3, a3, 19428
+	ldloc 4
+	ldc.i4 19428
+	add
+	stloc 4
+// 0x01069c28: 0x1069c28: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069c2c: 0x1069c2c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069c30: 0x1069c30: jal   0x100449c addiu a2, zero, 759
+	ldc.i4 759
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069c38: 0x1069c38: lw    v0, 4476(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 1119
+	add
+	ldelem.i4
+	stloc 5
+// 0x01069c3c: 0x1069c3c: sll   zero, zero, 0
+// 0x01069c40: 0x1069c40: bne   v0, zero, 0x1069c5c lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brtrue L_1069c5c
+// --- basic block ---
+// 0x01069c48: 0x1069c48: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069c4c: 0x1069c4c: addiu a3, a3, 19436
+	ldloc 4
+	ldc.i4 19436
+	add
+	stloc 4
+// 0x01069c50: 0x1069c50: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01069c54: 0x1069c54: j	 0x1069bc8 addiu a2, zero, 764
+	ldc.i4 764
+	stloc.3
+	br L_1069bc8
+// --- basic block ---
+L_1069c5c:
+// 0x01069c5c: 0x1069c5c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069c60: 0x1069c60: addiu a3, a3, 19512
+	ldloc 4
+	ldc.i4 19512
+	add
+	stloc 4
+// 0x01069c64: 0x1069c64: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069c68: 0x1069c68: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069c6c: 0x1069c6c: jal   0x100449c addiu a2, zero, 768
+	ldc.i4 768
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069c74: 0x1069c74: lw    v0, 4476(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 1119
+	add
+	ldelem.i4
+	stloc 5
+// 0x01069c78: 0x1069c78: ori   v1, zero, 32769
 	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	ldc.i4 32769
+	or
+	stloc 7
+// 0x01069c7c: 0x1069c7c: sltu  v1, v0, v1
+	ldloc 5
+	ldloc 7
+	clt.un
+	stloc 7
+// 0x01069c80: 0x1069c80: bne   v1, zero, 0x1069c9c lui   a3, 0x10000
+	ldloc 7
+	ldc.i4 65536
+	stloc 4
+	brtrue L_1069c9c
+// --- basic block ---
+// 0x01069c88: 0x1069c88: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069c8c: 0x1069c8c: addiu a3, a3, 19520
+	ldloc 4
+	ldc.i4 19520
+	add
 	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
+// 0x01069c90: 0x1069c90: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01069c94: 0x1069c94: j	 0x1069cf0 addiu a2, zero, 774
+	ldc.i4 774
+	stloc.3
+	br L_1069cf0
 // --- basic block ---
-// 0x01069c88: 0x1069c88: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
+L_1069c9c:
+// 0x01069c9c: 0x1069c9c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069ca0: 0x1069ca0: addiu a3, a3, 19580
+	ldloc 4
+	ldc.i4 19580
 	add
-	stloc.0
-// 0x01069c8c: 0x1069c8c: sw    ra, 36(sp)
-// 0x01069c90: 0x1069c90: sw    s0, 32(sp)
-	ldloc 5
+	stloc 4
+// 0x01069ca4: 0x1069ca4: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069ca8: 0x1069ca8: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069cac: 0x1069cac: jal   0x100449c addiu a2, zero, 780
+	ldc.i4 780
+	stloc.3
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069cb4: 0x1069cb4: lw    a0, 12(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.3
 	add
+	ldelem.i4
+	stloc.1
+// 0x01069cb8: 0x1069cb8: lw    a1, 4472(s0)
 	ldloc 6
-	stelem.i4
-// 0x01069c94: 0x1069c94: sw    a1, 16(sp)
-	ldloc 5
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 1118
 	add
-	ldloc.2
-	stelem.i4
-// 0x01069c98: 0x1069c98: addu  s0, a0, zero
-	ldloc.1
-	stloc 6
-// 0x01069c9c: 0x1069c9c: sw    a2, 20(sp)
-	ldloc 5
-	ldloc.0
+	ldelem.i4
+	stloc.2
+// 0x01069cbc: 0x1069cbc: lw    a2, 4476(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 1119
 	add
-	ldloc.3
-	stelem.i4
-// 0x01069ca0: 0x1069ca0: jal   0x1069bf0 sw    a3, 24(sp)
-	ldloc 5
+	ldelem.i4
+	stloc.3
+// 0x01069cc0: 0x1069cc0: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x01069cc4: 0x1069cc4: addiu a3, a3, -22172
+	ldloc 4
+	ldc.i4 -22172
+	add
+	stloc 4
+// 0x01069cc8: 0x1069cc8: jal   0x106763c sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc 4
+	ldloc 9
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_context_reset_1069bf0(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::socket_async_receive_106763c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01069ca8: 0x1069ca8: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 7
-// 0x01069cac: 0x1069cac: sw    v0, 16(s0)
+// 0x01069cd0: 0x1069cd0: bne   v0, zero, 0x1069d00 lui   a3, 0x10000
 	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brtrue L_1069d00
+// --- basic block ---
+// 0x01069cd8: 0x1069cd8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069cdc: 0x1069cdc: lw    v0, 12(s0)
 	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.3
 	add
-	ldloc 7
-	stelem.i4
-// 0x01069cb0: 0x1069cb0: lw    a1, 16(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x01069ce0: 0x1069ce0: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069ce4: 0x1069ce4: addiu a3, a3, 19588
+	ldloc 4
+	ldc.i4 19588
+	add
+	stloc 4
+// 0x01069ce8: 0x1069ce8: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01069cec: 0x1069cec: addiu a2, zero, 789
+	ldc.i4 789
+	stloc.3
+L_1069cf0:
+// 0x01069cf0: 0x1069cf0: jal   0x100449c sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc.2
-// 0x01069cb4: 0x1069cb4: lw    a2, 20(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069cf8: 0x1069cf8: j	 0x1069d34 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_1069d34
+// --- basic block ---
+L_1069d00:
+// 0x01069d00: 0x1069d00: addiu a3, a3, 19656
+	ldloc 4
+	ldc.i4 19656
 	add
-	ldelem.i4
+	stloc 4
+// 0x01069d04: 0x1069d04: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069d08: 0x1069d08: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069d0c: 0x1069d0c: jal   0x100449c addiu a2, zero, 793
+	ldc.i4 793
 	stloc.3
-// 0x01069cb8: 0x1069cb8: lw    a3, 24(sp)
-	ldloc 5
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069d14: 0x1069d14: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069d18: 0x1069d18: sw    s2, 20(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
+	add
+	ldloc 10
+	stelem.i4
+// 0x01069d1c: 0x1069d1c: addiu a1, s1, 18164
+	ldloc 8
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069d20: 0x1069d20: addiu a3, a3, 19664
+	ldloc 4
+	ldc.i4 19664
 	add
-	ldelem.i4
 	stloc 4
-// 0x01069cbc: 0x1069cbc: lw    v0, 56(sp)
-	ldloc 5
+// 0x01069d24: 0x1069d24: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069d28: 0x1069d28: jal   0x100449c addiu a2, zero, 797
+	ldc.i4 797
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01069d30: 0x1069d30: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+L_1069d34:
+// 0x01069d34: 0x1069d34: lw    ra, 60(sp)
+// 0x01069d38: 0x1069d38: lw    s5, 56(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 7
-// 0x01069cc0: 0x1069cc0: lw    ra, 36(sp)
-// 0x01069cc4: 0x1069cc4: sw    a1, 4484(s0)
-	ldloc 5
+	stloc 11
+// 0x01069d3c: 0x1069d3c: lw    s4, 52(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1121
+	ldc.i4.s 13
 	add
-	ldloc.2
-	stelem.i4
-// 0x01069cc8: 0x1069cc8: sw    a2, 4488(s0)
-	ldloc 5
+	ldelem.i4
+	stloc 13
+// 0x01069d40: 0x1069d40: lw    s3, 48(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1122
+	ldc.i4.s 12
 	add
-	ldloc.3
-	stelem.i4
-// 0x01069ccc: 0x1069ccc: sw    a3, 4492(s0)
-	ldloc 5
+	ldelem.i4
+	stloc 12
+// 0x01069d44: 0x1069d44: lw    s2, 44(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1123
+	ldc.i4.s 11
 	add
-	ldloc 4
-	stelem.i4
-// 0x01069cd0: 0x1069cd0: sw    v0, 156(s0)
-	ldloc 5
+	ldelem.i4
+	stloc 10
+// 0x01069d48: 0x1069d48: lw    s1, 40(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 39
+	ldc.i4.s 10
 	add
-	ldloc 7
-	stelem.i4
-// 0x01069cd4: 0x1069cd4: lw    s0, 32(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 8
+// 0x01069d4c: 0x1069d4c: lw    s0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 6
-// 0x01069cd8: 0x1069cd8: jr    ra addiu sp, sp, 40
+	stloc 9
+// 0x01069d50: 0x1069d50: jr    ra addiu sp, sp, 64
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 wst_start_trans__int_1069ce0(int32,int32,int32,int32,int32)
+.method public static int32 on_data_received__1069d58(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 t2,int32 s3,int32 s4,int32 s2,int32 s5,int32 ra,int32 t0)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
 
-// local  6 is register v0
+// local  5 is register v0
 // local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 16 is register t0
-// local 10 is register t2
-// local  9 is register s0
-// local  8 is register s1
-// local 13 is register s2
+// local  8 is register s0
+// local 10 is register s1
+// local  9 is register s2
 // local 11 is register s3
-// local 12 is register s4
-// local 14 is register s5
 // local  0 is register sp
-// local 15 is register ra
-// local  5 is register mem
+// local 12 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
 	stloc 7
 	ldarg 1
@@ -5185,517 +5132,498 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 16
+	stloc 8
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
 	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01069ce0: 0x1069ce0: addiu sp, sp, -320
+// 0x01069d58: 0x1069d58: lw    v0, 16(a2)
+	ldloc 6
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x01069d5c: 0x1069d5c: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4 -320
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01069ce4: 0x1069ce4: sw    s2, 300(sp)
-	ldloc 5
-	ldloc.0
+// 0x01069d60: 0x1069d60: addiu v1, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 75
-	add
-	ldloc 13
-	stelem.i4
-// 0x01069ce8: 0x1069ce8: sw    s1, 296(sp)
-	ldloc 5
+	stloc 7
+// 0x01069d64: 0x1069d64: sw    s3, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 74
+	ldc.i4.s 10
 	add
-	ldloc 8
+	ldloc 11
 	stelem.i4
-// 0x01069cec: 0x1069cec: sw    s0, 292(sp)
-	ldloc 5
+// 0x01069d68: 0x1069d68: sw    s1, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 73
+	ldc.i4.8
 	add
-	ldloc 9
+	ldloc 10
 	stelem.i4
-// 0x01069cf0: 0x1069cf0: sw    ra, 316(sp)
-// 0x01069cf4: 0x1069cf4: sw    s5, 312(sp)
-	ldloc 5
+// 0x01069d6c: 0x1069d6c: sw    s0, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 78
+	ldc.i4.7
 	add
-	ldloc 14
+	ldloc 8
 	stelem.i4
-// 0x01069cf8: 0x1069cf8: sw    s4, 308(sp)
-	ldloc 5
+// 0x01069d70: 0x1069d70: sw    ra, 44(sp)
+// 0x01069d74: 0x1069d74: sw    s2, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 77
+	ldc.i4.s 9
 	add
-	ldloc 12
+	ldloc 9
 	stelem.i4
-// 0x01069cfc: 0x1069cfc: sw    s3, 304(sp)
+// 0x01069d78: 0x1069d78: addu  s0, a2, zero
+	ldloc.3
+	stloc 8
+// 0x01069d7c: 0x1069d7c: addu  s3, a0, zero
+	ldloc.1
+	stloc 11
+// 0x01069d80: 0x1069d80: bne   v0, v1, 0x1069db4 addu  s1, a1, zero
 	ldloc 5
-	ldloc.0
+	ldloc 7
+	ldloc.2
+	stloc 10
+	bne.un L_1069db4
+// --- basic block ---
+// 0x01069d88: 0x1069d88: addiu v0, zero, 5
+	ldc.i4.5
+	stloc 5
+// 0x01069d8c: 0x1069d8c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01069d90: 0x1069d90: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069d94: 0x1069d94: sw    v0, 4500(a2)
+	ldloc 6
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 76
+	ldc.i4 1125
 	add
-	ldloc 11
+	ldloc 5
 	stelem.i4
-// 0x01069d00: 0x1069d00: addu  s0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x01069d04: 0x1069d04: addu  s2, a1, zero
+// 0x01069d98: 0x1069d98: addiu a1, a1, 18164
 	ldloc.2
-	stloc 13
-// 0x01069d08: 0x1069d08: lw    v0, 336(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 84
+	ldc.i4 18164
 	add
-	ldelem.i4
-	stloc 6
-// 0x01069d0c: 0x1069d0c: lw    v1, 340(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 85
+	stloc.2
+// 0x01069d9c: 0x1069d9c: addiu a3, a3, 19672
+	ldloc 4
+	ldc.i4 19672
 	add
-	ldelem.i4
-	stloc 7
-// 0x01069d10: 0x1069d10: lw    s1, 344(sp)
-	ldloc 5
+	stloc 4
+// 0x01069da0: 0x1069da0: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01069da4: 0x1069da4: jal   0x100449c addiu a2, zero, 632
+	ldc.i4 632
+	stloc.3
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 86
-	add
-	ldelem.i4
-	stloc 8
-// 0x01069d14: 0x1069d14: beq   a0, zero, 0x1069ea0 addu  t0, a2, zero
 	ldloc.1
-	ldloc.3
-	stloc 16
-	brfalse L_1069ea0
-// --- basic block ---
-// 0x01069d1c: 0x1069d1c: beq   a1, zero, 0x1069ea0 sll   zero, zero, 0
-	ldloc.2
-	brfalse L_1069ea0
-// --- basic block ---
-// 0x01069d24: 0x1069d24: lb    t2, 0(a1)
 	ldloc.2
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 10
-// 0x01069d28: 0x1069d28: sll   zero, zero, 0
-// 0x01069d2c: 0x1069d2c: beq   t2, zero, 0x1069ea0 sll   zero, zero, 0
-	ldloc 10
-	brfalse L_1069ea0
-// --- basic block ---
-// 0x01069d34: 0x1069d34: beq   a2, zero, 0x1069ea0 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1069ea0
-// --- basic block ---
-// 0x01069d3c: 0x1069d3c: beq   a3, zero, 0x1069ea0 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1069ea0
-// --- basic block ---
-// 0x01069d44: 0x1069d44: beq   v0, zero, 0x1069ea0 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1069ea0
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01069d4c: 0x1069d4c: beq   s1, zero, 0x1069ea0 sll   zero, zero, 0
-	ldloc 8
-	brfalse L_1069ea0
+// 0x01069dac: 0x1069dac: j	 0x1069ed8 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_1069ed8
 // --- basic block ---
-// 0x01069d54: 0x1069d54: lb    t2, 0(s1)
-	ldloc 8
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 10
-// 0x01069d58: 0x1069d58: sll   zero, zero, 0
-// 0x01069d5c: 0x1069d5c: beq   t2, zero, 0x1069ea0 sll   zero, zero, 0
-	ldloc 10
-	brfalse L_1069ea0
+L_1069db4:
+// 0x01069db4: 0x1069db4: bgez  a1, 0x1069dec lui   a3, 0x10000
+	ldloc.2
+	ldc.i4 65536
+	stloc 4
+	ldc.i4.s 0
+	bge L_1069dec
 // --- basic block ---
-// 0x01069d64: 0x1069d64: lw    t2, 16(a0)
-	ldloc 5
-	ldloc.1
+// 0x01069dbc: 0x1069dbc: lw    v0, 12(a2)
+	ldloc 6
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 10
-// 0x01069d68: 0x1069d68: sll   zero, zero, 0
-// 0x01069d6c: 0x1069d6c: beq   t2, zero, 0x1069d8c sll   zero, zero, 0
-	ldloc 10
-	brfalse L_1069d8c
-// --- basic block ---
-// 0x01069d74: 0x1069d74: sw    v0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc 5
+// 0x01069dc0: 0x1069dc0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01069dc4: 0x1069dc4: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069dc8: 0x1069dc8: addiu a3, a3, 19720
+	ldloc 4
+	ldc.i4 19720
 	add
+	stloc 4
+// 0x01069dcc: 0x1069dcc: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01069dd0: 0x1069dd0: addiu a2, zero, 638
+	ldc.i4 638
+	stloc.3
+// 0x01069dd4: 0x1069dd4: sw    v0, 16(sp)
 	ldloc 6
-	stelem.i4
-// 0x01069d78: 0x1069d78: sw    v1, 20(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
-	ldloc 7
-	stelem.i4
-// 0x01069d7c: 0x1069d7c: jal   0x1069ab8 sw    s1, 24(sp)
 	ldloc 5
+	stelem.i4
+// 0x01069dd8: 0x1069dd8: sw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
+L_1069ddc:
+// 0x01069ddc: 0x1069ddc: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wstq_Add_1069ab8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01069d84: 0x1069d84: j	 0x1069ea4 sll   zero, zero, 0
-	br L_1069ea4
+// 0x01069de4: 0x1069de4: j	 0x1069ed8 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_1069ed8
 // --- basic block ---
-L_1069d8c:
-// 0x01069d8c: 0x1069d8c: lw    a0, 12(a0)
-	ldloc 5
+L_1069dec:
+// 0x01069dec: 0x1069dec: beq   a1, zero, 0x1069e1c lui   s2, 0x10000
+	ldloc.2
+	ldc.i4 65536
+	stloc 9
+	brfalse L_1069e1c
+// --- basic block ---
+// 0x01069df4: 0x1069df4: bne   a0, zero, 0x1069e1c lui   a1, 0x10000
 	ldloc.1
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1069e1c
+// --- basic block ---
+// 0x01069dfc: 0x1069dfc: lw    v0, 12(a2)
+	ldloc 6
+	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldc.i4.3
 	add
 	ldelem.i4
-	stloc.1
-// 0x01069d90: 0x1069d90: sll   zero, zero, 0
-// 0x01069d94: 0x1069d94: bne   a0, zero, 0x1069ea0 addu  a1, t0, zero
-	ldloc.1
-	ldloc 16
+	stloc 5
+// 0x01069e00: 0x1069e00: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069e04: 0x1069e04: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
 	stloc.2
-	brtrue L_1069ea0
-// --- basic block ---
-// 0x01069d9c: 0x1069d9c: addu  a2, a3, zero
+// 0x01069e08: 0x1069e08: addiu a3, a3, 19796
 	ldloc 4
-	stloc.3
-// 0x01069da0: 0x1069da0: addu  a0, s0, zero
-	ldloc 9
+	ldc.i4 19796
+	add
+	stloc 4
+// 0x01069e0c: 0x1069e0c: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01069da4: 0x1069da4: addu  a3, v0, zero
+// 0x01069e10: 0x1069e10: addiu a2, zero, 644
+	ldc.i4 644
+	stloc.3
+// 0x01069e14: 0x1069e14: j	 0x1069ddc sw    v0, 16(sp)
 	ldloc 6
-	stloc 4
-// 0x01069da8: 0x1069da8: jal   0x1069c88 sw    v1, 16(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl78::wst_context_load_1069c88(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01069db0: 0x1069db0: jal   0x1001b48 addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	br L_1069ddc
 // --- basic block ---
-// 0x01069db8: 0x1069db8: addiu s4, v0, 410
+L_1069e1c:
+// 0x01069e1c: 0x1069e1c: lw    v0, 12(s0)
 	ldloc 6
-	ldc.i4 410
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
 	add
-	stloc 12
-// 0x01069dbc: 0x1069dbc: addiu a0, s0, 160
-	ldloc 9
-	ldc.i4 160
+	ldelem.i4
+	stloc 5
+// 0x01069e20: 0x1069e20: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069e24: 0x1069e24: addiu a3, a3, 19848
+	ldloc 4
+	ldc.i4 19848
 	add
+	stloc 4
+// 0x01069e28: 0x1069e28: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01069dc0: 0x1069dc0: jal   0x106755c addu  a1, s4, zero
-	ldloc 12
+// 0x01069e2c: 0x1069e2c: addiu a1, s2, 18164
+	ldloc 9
+	ldc.i4 18164
+	add
 	stloc.2
+// 0x01069e30: 0x1069e30: addiu a2, zero, 648
+	ldc.i4 648
+	stloc.3
+// 0x01069e34: 0x1069e34: sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x01069e38: 0x1069e38: jal   0x100449c sw    s1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 10
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01069dc8: 0x1069dc8: addiu s3, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 11
-// 0x01069dcc: 0x1069dcc: lw    a3, 0(s0)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+// 0x01069e40: 0x1069e40: lui   a3, 0x10000
+	ldc.i4 65536
 	stloc 4
-// 0x01069dd0: 0x1069dd0: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x01069dd4: 0x1069dd4: addiu a2, a2, 19856
-	ldloc.3
-	ldc.i4 19856
+// 0x01069e44: 0x1069e44: addiu a3, a3, 19252
+	ldloc 4
+	ldc.i4 19252
 	add
-	stloc.3
-// 0x01069dd8: 0x1069dd8: addiu a1, zero, 255
-	ldc.i4 255
-	stloc.2
-// 0x01069ddc: 0x1069ddc: addu  a0, s3, zero
-	ldloc 11
-	stloc.1
-// 0x01069de0: 0x1069de0: addu  s5, v0, zero
-	ldloc 6
-	stloc 14
-// 0x01069de4: 0x1069de4: jal   0x1000f9c sw    s2, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc 4
+// 0x01069e48: 0x1069e48: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069e4c: 0x1069e4c: addiu a1, s2, 18164
+	ldloc 9
+	ldc.i4 18164
 	add
-	ldloc 13
-	stelem.i4
+	stloc.2
+// 0x01069e50: 0x1069e50: jal   0x100449c addiu a2, zero, 652
+	ldc.i4 652
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01069dec: 0x1069dec: jal   0x1001b48 addu  a0, s1, zero
+// 0x01069e58: 0x1069e58: lw    v0, 4480(s0)
+	ldloc 6
 	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01069df4: 0x1069df4: lw    a3, 4(s0)
-	ldloc 5
-	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 1120
 	add
 	ldelem.i4
-	stloc 4
-// 0x01069df8: 0x1069df8: lui   a2, 0x10000
+	stloc 5
+// 0x01069e5c: 0x1069e5c: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc.3
-// 0x01069dfc: 0x1069dfc: addu  a0, s5, zero
-	ldloc 14
+	stloc 4
+// 0x01069e60: 0x1069e60: addiu v1, s0, 2404
+	ldloc 8
+	ldc.i4 2404
+	add
+	stloc 7
+// 0x01069e64: 0x1069e64: addiu a3, a3, 19900
+	ldloc 4
+	ldc.i4 19900
+	add
+	stloc 4
+// 0x01069e68: 0x1069e68: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01069e00: 0x1069e00: addu  a1, s4, zero
-	ldloc 12
-	stloc.2
-// 0x01069e04: 0x1069e04: addiu a2, a2, 19872
-	ldloc.3
-	ldc.i4 19872
+// 0x01069e6c: 0x1069e6c: addiu a1, s2, 18164
+	ldloc 9
+	ldc.i4 18164
 	add
+	stloc.2
+// 0x01069e70: 0x1069e70: addiu a2, zero, 657
+	ldc.i4 657
 	stloc.3
-// 0x01069e08: 0x1069e08: sw    s1, 20(sp)
-	ldloc 5
+// 0x01069e74: 0x1069e74: sw    v1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x01069e0c: 0x1069e0c: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 5
+// 0x01069e78: 0x1069e78: jal   0x100449c sw    v0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldloc 6
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01069e14: 0x1069e14: lw    a3, 8(s0)
-	ldloc 5
-	ldloc 9
+// 0x01069e80: 0x1069e80: lw    v0, 4456(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4 1114
 	add
 	ldelem.i4
-	stloc 4
-// 0x01069e18: 0x1069e18: lui   a0, 0x10000
+	stloc 5
+// 0x01069e84: 0x1069e84: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc.1
-// 0x01069e1c: 0x1069e1c: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 6
-// 0x01069e20: 0x1069e20: addiu a0, a0, 5456
-	ldloc.1
-	ldc.i4 5456
-	add
-	stloc.1
-// 0x01069e24: 0x1069e24: addiu v0, v0, -23608
-	ldloc 6
-	ldc.i4 -23608
-	add
-	stloc 6
-// 0x01069e28: 0x1069e28: addu  a1, s3, zero
-	ldloc 11
-	stloc.2
-// 0x01069e2c: 0x1069e2c: addiu s1, zero, 1
-	ldc.i4.1
-	stloc 8
-// 0x01069e30: 0x1069e30: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x01069e34: 0x1069e34: sw    v0, 20(sp)
+	stloc 4
+// 0x01069e88: 0x1069e88: addu  v0, v0, s1
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldloc 10
 	add
+	stloc 5
+// 0x01069e8c: 0x1069e8c: sw    v0, 4456(s0)
 	ldloc 6
-	stelem.i4
-// 0x01069e38: 0x1069e38: sw    s1, 16(sp)
-	ldloc 5
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 1114
 	add
-	ldloc 8
-	stelem.i4
-// 0x01069e3c: 0x1069e3c: jal   0x1052354 sw    s0, 24(sp)
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	stelem.i4
+// 0x01069e90: 0x1069e90: addiu a3, a3, 19912
+	ldloc 4
+	ldc.i4 19912
 	add
+	stloc 4
+// 0x01069e94: 0x1069e94: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01069e98: 0x1069e98: addiu a1, s2, 18164
 	ldloc 9
-	stelem.i4
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069e9c: 0x1069e9c: jal   0x100449c addiu a2, zero, 663
+	ldc.i4 663
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_net_connect_async_1052354(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01069e44: 0x1069e44: addiu a0, zero, -1
-	ldc.i4.m1
-	stloc.1
-// 0x01069e48: 0x1069e48: bne   v0, a0, 0x1069e80 lui   v1, 0x0
+// 0x01069ea4: 0x1069ea4: lw    v0, 4456(s0)
 	ldloc 6
-	ldloc.1
-	ldc.i4.s 0
-	stloc 7
-	bne.un L_1069e80
-// --- basic block ---
-// 0x01069e50: 0x1069e50: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01069e54: 0x1069e54: lui   a3, 0x10000
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 1114
+	add
+	ldelem.i4
+	stloc 5
+// 0x01069ea8: 0x1069ea8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01069e58: 0x1069e58: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
+// 0x01069eac: 0x1069eac: addu  v0, s0, v0
+	ldloc 8
+	ldloc 5
 	add
-	stloc.2
-// 0x01069e5c: 0x1069e5c: addiu a3, a3, 19916
-	ldloc 4
-	ldc.i4 19916
+	stloc 5
+// 0x01069eb0: 0x1069eb0: addiu a1, s2, 18164
+	ldloc 9
+	ldc.i4 18164
 	add
-	stloc 4
-// 0x01069e60: 0x1069e60: addiu a2, zero, 434
-	ldc.i4 434
-	stloc.3
-// 0x01069e64: 0x1069e64: addiu a0, zero, 4
-	ldc.i4.4
+	stloc.2
+// 0x01069eb4: 0x1069eb4: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01069e68: 0x1069e68: jal   0x100449c sw    zero, 14924(v1)
+// 0x01069eb8: 0x1069eb8: addiu a2, zero, 667
+	ldc.i4 667
+	stloc.3
+// 0x01069ebc: 0x1069ebc: sb    zero, 2404(v0)
 	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 3731
+	ldc.i4 2404
 	add
 	ldc.i4.s 0
-	stelem.i4
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01069ec0: 0x1069ec0: jal   0x100449c addiu a3, a3, 19920
+	ldloc 4
+	ldc.i4 19920
+	add
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5704,556 +5632,503 @@ L_1069d8c:
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01069e70: 0x1069e70: jal   0x1069bf0 addu  a0, s0, zero
-	ldloc 9
+// 0x01069ec8: 0x1069ec8: addu  a0, s3, zero
+	ldloc 11
 	stloc.1
+// 0x01069ecc: 0x1069ecc: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x01069ed0: 0x1069ed0: jal   0x10699a4 addu  a2, s0, zero
+	ldloc 8
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_context_reset_1069bf0(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::cont_10699a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01069e78: 0x1069e78: j	 0x1069ea4 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_1069ea4
+	stloc 5
 // --- basic block ---
-L_1069e80:
-// 0x01069e80: 0x1069e80: sw    s1, 14924(v1)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 3731
-	add
-	ldloc 8
-	stelem.i4
-// 0x01069e84: 0x1069e84: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-// 0x01069e88: 0x1069e88: cibyl_sysc_arg 0x3
-	ldloc 7
-// 0x01069e8c: 0x1069e8c: cibyl_sysc 0x20da
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 6
-// 0x01069e90: 0x1069e90: addu  v1, v0, zero
+L_1069ed8:
+// 0x01069ed8: 0x1069ed8: lw    ra, 44(sp)
+// 0x01069edc: 0x1069edc: lw    s3, 40(sp)
 	ldloc 6
-	stloc 7
-// 0x01069e94: 0x1069e94: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x01069e98: 0x1069e98: j	 0x1069ea4 sw    v1, 24(s0)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 7
-	stelem.i4
-	br L_1069ea4
-// --- basic block ---
-L_1069ea0:
-// 0x01069ea0: 0x1069ea0: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-L_1069ea4:
-// 0x01069ea4: 0x1069ea4: lw    ra, 316(sp)
-// 0x01069ea8: 0x1069ea8: lw    s5, 312(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 78
-	add
-	ldelem.i4
-	stloc 14
-// 0x01069eac: 0x1069eac: lw    s4, 308(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 77
-	add
-	ldelem.i4
-	stloc 12
-// 0x01069eb0: 0x1069eb0: lw    s3, 304(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 76
+	ldc.i4.s 10
 	add
 	ldelem.i4
 	stloc 11
-// 0x01069eb4: 0x1069eb4: lw    s2, 300(sp)
-	ldloc 5
+// 0x01069ee0: 0x1069ee0: lw    s2, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 75
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 13
-// 0x01069eb8: 0x1069eb8: lw    s1, 296(sp)
-	ldloc 5
+	stloc 9
+// 0x01069ee4: 0x1069ee4: lw    s1, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 74
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 8
-// 0x01069ebc: 0x1069ebc: lw    s0, 292(sp)
-	ldloc 5
+	stloc 10
+// 0x01069ee8: 0x1069ee8: lw    s0, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 73
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 9
-// 0x01069ec0: 0x1069ec0: jr    ra addiu sp, sp, 320
+	stloc 8
+// 0x01069eec: 0x1069eec: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4 320
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+.method public static int32 wst_Receive_1069ef4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 s5,int32 s6,int32 s8,int32 s3,int32 s4,int32 s7,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  6 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register s0
-// local  8 is register s1
-// local  9 is register s2
-// local 14 is register s3
-// local 15 is register s4
-// local 11 is register s5
-// local 12 is register s6
-// local 16 is register s7
+// local  7 is register s0
 // local  0 is register sp
-// local 13 is register s8
-// local 17 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc 16
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 17
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01069ec8: 0x1069ec8: addiu sp, sp, -2328
+// 0x01069ef4: 0x1069ef4: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4 -2328
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01069ecc: 0x1069ecc: sw    s7, 2316(sp)
-	ldloc 6
+// 0x01069ef8: 0x1069ef8: sw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 579
+	ldc.i4.6
 	add
-	ldloc 16
+	ldloc 7
 	stelem.i4
-// 0x01069ed0: 0x1069ed0: sw    s6, 2312(sp)
-	ldloc 6
-	ldloc.0
+// 0x01069efc: 0x1069efc: addu  s0, a0, zero
+	ldloc.1
+	stloc 7
+// 0x01069f00: 0x1069f00: lw    a0, 12(a0)
+	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.3
 	add
-	ldloc 12
-	stelem.i4
-// 0x01069ed4: 0x1069ed4: sw    s4, 2304(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 576
+	ldelem.i4
+	stloc.1
+// 0x01069f04: 0x1069f04: sll   zero, zero, 0
+// 0x01069f08: 0x1069f08: bne   a0, zero, 0x1069f34 sw    ra, 28(sp)
+	ldloc.1
+	brtrue L_1069f34
+// --- basic block ---
+// 0x01069f10: 0x1069f10: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01069f14: 0x1069f14: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069f18: 0x1069f18: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
 	add
-	ldloc 15
-	stelem.i4
-// 0x01069ed8: 0x1069ed8: sw    s3, 2300(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 575
+	stloc.2
+// 0x01069f1c: 0x1069f1c: addiu a3, a3, 19928
+	ldloc 4
+	ldc.i4 19928
 	add
-	ldloc 14
-	stelem.i4
-// 0x01069edc: 0x1069edc: sw    s1, 2292(sp)
-	ldloc 6
+	stloc 4
+// 0x01069f20: 0x1069f20: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01069f24: 0x1069f24: jal   0x100449c addiu a2, zero, 141
+	ldc.i4 141
+	stloc.3
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x01069f2c: 0x1069f2c: j	 0x1069f84 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1069f84
+// --- basic block ---
+L_1069f34:
+// 0x01069f34: 0x1069f34: lw    a1, 4472(s0)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 573
+	ldc.i4 1118
 	add
-	ldloc 8
-	stelem.i4
-// 0x01069ee0: 0x1069ee0: sw    s0, 2288(sp)
-	ldloc 6
-	ldloc.0
+	ldelem.i4
+	stloc.2
+// 0x01069f38: 0x1069f38: lw    a2, 4476(s0)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4 1119
 	add
-	ldloc 10
-	stelem.i4
-// 0x01069ee4: 0x1069ee4: sw    ra, 2324(sp)
-// 0x01069ee8: 0x1069ee8: sw    s8, 2320(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 580
+	ldelem.i4
+	stloc.3
+// 0x01069f3c: 0x1069f3c: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x01069f40: 0x1069f40: addiu a3, a3, -22172
+	ldloc 4
+	ldc.i4 -22172
 	add
-	ldloc 13
-	stelem.i4
-// 0x01069eec: 0x1069eec: sw    s5, 2308(sp)
-	ldloc 6
+	stloc 4
+// 0x01069f44: 0x1069f44: jal   0x106763c sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 577
+	ldc.i4.4
 	add
-	ldloc 11
+	ldloc 7
 	stelem.i4
-// 0x01069ef0: 0x1069ef0: sw    s2, 2296(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 574
-	add
-	ldloc 9
-	stelem.i4
-// 0x01069ef4: 0x1069ef4: addu  s7, a0, zero
 	ldloc.1
-	stloc 16
-// 0x01069ef8: 0x1069ef8: addu  s4, a1, zero
 	ldloc.2
-	stloc 15
-// 0x01069efc: 0x1069efc: addu  s3, a2, zero
 	ldloc.3
-	stloc 14
-// 0x01069f00: 0x1069f00: lw    s6, 2344(sp)
+	ldloc 4
+	call int32 Cibyl77::socket_async_receive_106763c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x01069f4c: 0x1069f4c: bne   v0, zero, 0x1069f7c lui   a1, 0x10000
 	ldloc 6
-	ldloc.0
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1069f7c
+// --- basic block ---
+// 0x01069f54: 0x1069f54: lw    v0, 12(s0)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 586
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 12
-// 0x01069f04: 0x1069f04: lw    s1, 2352(sp)
-	ldloc 6
+	stloc 6
+// 0x01069f58: 0x1069f58: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069f5c: 0x1069f5c: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x01069f60: 0x1069f60: addiu a3, a3, 19964
+	ldloc 4
+	ldc.i4 19964
+	add
+	stloc 4
+// 0x01069f64: 0x1069f64: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01069f68: 0x1069f68: addiu a2, zero, 152
+	ldc.i4 152
+	stloc.3
+// 0x01069f6c: 0x1069f6c: jal   0x100449c sw    v0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 588
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 8
-// 0x01069f08: 0x1069f08: beq   a0, zero, 0x106a058 addu  s0, a3, zero
+	ldloc 6
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	ldloc 4
-	stloc 10
-	brfalse L_106a058
-// --- basic block ---
-// 0x01069f10: 0x1069f10: beq   a1, zero, 0x106a05c addu  v0, zero, zero
-	ldloc.2
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_106a05c
-// --- basic block ---
-// 0x01069f18: 0x1069f18: lb    v0, 0(a1)
 	ldloc.2
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x01069f1c: 0x1069f1c: sll   zero, zero, 0
-// 0x01069f20: 0x1069f20: beq   v0, zero, 0x106a058 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106a058
-// --- basic block ---
-// 0x01069f28: 0x1069f28: beq   a2, zero, 0x106a058 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_106a058
-// --- basic block ---
-// 0x01069f30: 0x1069f30: beq   a3, zero, 0x106a05c addu  v0, zero, zero
 	ldloc 4
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_106a05c
-// --- basic block ---
-// 0x01069f38: 0x1069f38: beq   s6, zero, 0x106a05c sll   zero, zero, 0
-	ldloc 12
-	brfalse L_106a05c
-// --- basic block ---
-// 0x01069f40: 0x1069f40: beq   s1, zero, 0x106a05c sll   zero, zero, 0
-	ldloc 8
-	brfalse L_106a05c
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x01069f48: 0x1069f48: lb    v0, 0(s1)
-	ldloc 8
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x01069f4c: 0x1069f4c: sll   zero, zero, 0
-// 0x01069f50: 0x1069f50: beq   v0, zero, 0x106a058 addiu v0, a3, -1
-	ldloc 5
-	ldloc 4
-	ldc.i4.m1
-	add
-	stloc 5
-	brfalse L_106a058
+// 0x01069f74: 0x1069f74: j	 0x1069f84 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1069f84
 // --- basic block ---
-// 0x01069f58: 0x1069f58: sltiu v0, v0, 40
-	ldloc 5
-	ldc.i4.s 40
-	clt.un
-	stloc 5
-// 0x01069f5c: 0x1069f5c: beq   v0, zero, 0x106a058 addiu v0, zero, 1
-	ldloc 5
+L_1069f7c:
+// 0x01069f7c: 0x1069f7c: addiu v0, zero, 1
 	ldc.i4.1
-	stloc 5
-	brfalse L_106a058
-// --- basic block ---
-// 0x01069f64: 0x1069f64: beq   a3, v0, 0x1069fa4 addu  v1, a2, zero
-	ldloc 4
+	stloc 6
+// 0x01069f80: 0x1069f80: sw    v0, 20(s0)
 	ldloc 5
-	ldloc.3
-	stloc 7
-	beq  L_1069fa4
-// --- basic block ---
-// 0x01069f6c: 0x1069f6c: addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x01069f70: 0x1069f70: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_1069f74:
-// 0x01069f74: 0x1069f74: lw    a1, 0(v1)
-	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01069f78: 0x1069f78: addiu v0, v0, 1
+	ldc.i4.5
+	add
+	ldloc 6
+	stelem.i4
+L_1069f84:
+// 0x01069f84: 0x1069f84: lw    ra, 28(sp)
+// 0x01069f88: 0x1069f88: lw    s0, 24(sp)
 	ldloc 5
-	ldc.i4.1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 7
+// 0x01069f8c: 0x1069f8c: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 on_socket_connected__1069f94(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// 0x01069f7c: 0x1069f7c: beq   a1, zero, 0x1069f94 slt   a2, v0, s0
-	ldloc.2
-	ldloc 5
-	ldloc 10
-	clt
-	stloc.3
-	brfalse L_1069f94
-// --- basic block ---
-// 0x01069f84: 0x1069f84: lb    a1, 0(a1)
-	ldloc.2
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc.2
-// 0x01069f88: 0x1069f88: sll   zero, zero, 0
-// 0x01069f8c: 0x1069f8c: bne   a1, zero, 0x1069f9c sll   zero, zero, 0
-	ldloc.2
-	brtrue L_1069f9c
-// --- basic block ---
-L_1069f94:
-// 0x01069f94: 0x1069f94: bne   a0, zero, 0x106a058 addiu a0, zero, 1
-	ldloc.1
-	ldc.i4.1
-	stloc.1
-	brtrue L_106a058
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1069f9c:
-// 0x01069f9c: 0x1069f9c: bne   a2, zero, 0x1069f74 addiu v1, v1, 8
-	ldloc.3
+// 0x01069f94: 0x1069f94: lw    v0, 16(a1)
 	ldloc 7
-	ldc.i4.8
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc 7
-	brtrue L_1069f74
-// --- basic block ---
-L_1069fa4:
-// 0x01069fa4: 0x1069fa4: addiu s2, sp, 36
+	ldelem.i4
+	stloc 5
+// 0x01069f98: 0x1069f98: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s 36
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x01069f9c: 0x1069f9c: addiu v1, zero, 2
+	ldc.i4.2
+	stloc 6
+// 0x01069fa0: 0x1069fa0: sw    s1, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc 9
-// 0x01069fa8: 0x1069fa8: jal   0x10674e4 addu  a0, s2, zero
 	ldloc 9
-	stloc.1
+	stelem.i4
+// 0x01069fa4: 0x1069fa4: sw    s0, 28(sp)
+	ldloc 7
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 8
+	stelem.i4
+// 0x01069fa8: 0x1069fa8: sw    ra, 36(sp)
+// 0x01069fac: 0x1069fac: addu  s0, a1, zero
+	ldloc.2
+	stloc 8
+// 0x01069fb0: 0x1069fb0: addu  s1, a0, zero
 	ldloc.1
+	stloc 9
+// 0x01069fb4: 0x1069fb4: bne   v0, v1, 0x1069fe0 sw    a2, 4500(a1)
+	ldloc 5
+	ldloc 6
+	ldloc 7
 	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
+	add
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stelem.i4
+	bne.un L_1069fe0
 // --- basic block ---
-// 0x01069fb0: 0x1069fb0: jal   0x1001b48 addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x01069fbc: 0x1069fbc: addiu v0, zero, 5
+	ldc.i4.5
 	stloc 5
-// --- basic block ---
-// 0x01069fb8: 0x1069fb8: addiu s8, v0, 655
-	ldloc 5
-	ldc.i4 655
+// 0x01069fc0: 0x1069fc0: sw    v0, 4500(a1)
+	ldloc 7
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
 	add
-	stloc 13
-// 0x01069fbc: 0x1069fbc: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x01069fc0: 0x1069fc0: jal   0x106755c addu  a1, s8, zero
-	ldloc 13
+	ldloc 5
+	stelem.i4
+// 0x01069fc4: 0x1069fc4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01069fc8: 0x1069fc8: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-	ldloc.0
-	ldloc.1
+// 0x01069fcc: 0x1069fcc: addiu a1, a1, 18164
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01069fc8: 0x1069fc8: addu  s5, v0, zero
-	ldloc 5
-	stloc 11
-// 0x01069fcc: 0x1069fcc: addiu v0, sp, 2356
-	ldloc.0
-	ldc.i4 2356
+	ldc.i4 18164
 	add
-	stloc 5
-// 0x01069fd0: 0x1069fd0: addu  a1, s8, zero
-	ldloc 13
 	stloc.2
-// 0x01069fd4: 0x1069fd4: addu  a3, v0, zero
-	ldloc 5
+// 0x01069fd0: 0x1069fd0: addiu a3, a3, 20028
+	ldloc 4
+	ldc.i4 20028
+	add
 	stloc 4
-// 0x01069fd8: 0x1069fd8: addu  a0, s5, zero
-	ldloc 11
+// 0x01069fd4: 0x1069fd4: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01069fdc: 0x1069fdc: addu  a2, s1, zero
-	ldloc 8
+// 0x01069fd8: 0x1069fd8: j	 0x106a080 addiu a2, zero, 562
+	ldc.i4 562
 	stloc.3
-// 0x01069fe0: 0x1069fe0: jal   0x10c0a70 sw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 5
-	stelem.i4
+	br L_106a080
+// --- basic block ---
+L_1069fe0:
+// 0x01069fe0: 0x1069fe0: bne   a0, zero, 0x106a018 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106a018
+// --- basic block ---
+// 0x01069fe8: 0x1069fe8: jal   0x10ac9b4 addu  a0, a2, zero
+	ldloc.3
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01069fe8: 0x1069fe8: bgez  v0, 0x106a020 addu  a1, s4, zero
-	ldloc 5
-	ldloc 15
-	stloc.2
-	ldc.i4.s 0
-	bge L_106a020
-// --- basic block ---
 // 0x01069ff0: 0x1069ff0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
 // 0x01069ff4: 0x1069ff4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01069ff8: 0x1069ff8: addiu a1, a1, 18168
+// 0x01069ff8: 0x1069ff8: addiu a1, a1, 18164
 	ldloc.2
-	ldc.i4 18168
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x01069ffc: 0x1069ffc: addiu a3, a3, 20012
+// 0x01069ffc: 0x1069ffc: addiu a3, a3, 20080
 	ldloc 4
-	ldc.i4 20012
+	ldc.i4 20080
 	add
 	stloc 4
-// 0x0106a000: 0x106a000: addiu a2, zero, 530
-	ldc.i4 530
-	stloc.3
-// 0x0106a004: 0x106a004: addiu a0, zero, 4
+// 0x0106a000: 0x106a000: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106a008: 0x106a008: jal   0x100449c sw    s1, 16(sp)
-	ldloc 6
+// 0x0106a004: 0x106a004: addiu a2, zero, 571
+	ldc.i4 571
+	stloc.3
+// 0x0106a008: 0x106a008: jal   0x100449c sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -6262,240 +6137,205 @@ L_1069fa4:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106a010: 0x106a010: jal   0x1067508 addu  a0, s2, zero
-	ldloc 9
+// 0x0106a010: 0x106a010: j	 0x106a08c addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+	br L_106a08c
+// --- basic block ---
+L_106a018:
+// 0x0106a018: 0x106a018: jal   0x1067444 addiu a0, a1, 160
+	ldloc.2
+	ldc.i4 160
+	add
 	stloc.1
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_get_buffer_1067444(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106a018: 0x106a018: j	 0x106a05c addu  v0, zero, zero
-	ldc.i4.s 0
+	stloc 6
 	stloc 5
-	br L_106a05c
 // --- basic block ---
-L_106a020:
-// 0x0106a020: 0x106a020: lw    v0, 2348(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 587
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106a024: 0x106a024: addu  a0, s7, zero
-	ldloc 16
-	stloc.1
-// 0x0106a028: 0x106a028: addu  a2, s3, zero
-	ldloc 14
-	stloc.3
-// 0x0106a02c: 0x106a02c: addu  a3, s0, zero
-	ldloc 10
-	stloc 4
-// 0x0106a030: 0x106a030: sw    s6, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 12
-	stelem.i4
-// 0x0106a034: 0x106a034: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
+// 0x0106a020: 0x106a020: addu  a1, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0106a038: 0x106a038: jal   0x1069ce0 sw    s5, 24(sp)
-	ldloc 6
-	ldloc.0
+	stloc.2
+// 0x0106a024: 0x106a024: sw    s1, 12(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.3
 	add
-	ldloc 11
+	ldloc 9
 	stelem.i4
+// 0x0106a028: 0x106a028: jal   0x10698a4 addu  a0, s1, zero
+	ldloc 9
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans__int_1069ce0(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::wst_Send_10698a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106a040: 0x106a040: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x0106a044: 0x106a044: jal   0x1067508 sw    v0, 2280(sp)
-	ldloc 6
-	ldloc.0
+// 0x0106a030: 0x106a030: bne   v0, zero, 0x106a058 addiu v0, zero, 11
+	ldloc 5
+	ldc.i4.s 11
+	stloc 5
+	brtrue L_106a058
+// --- basic block ---
+// 0x0106a038: 0x106a038: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106a03c: 0x106a03c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106a040: 0x106a040: sw    v0, 4500(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 570
+	ldc.i4 1125
 	add
 	ldloc 5
 	stelem.i4
+// 0x0106a044: 0x106a044: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x0106a048: 0x106a048: addiu a3, a3, 20160
+	ldloc 4
+	ldc.i4 20160
+	add
+	stloc 4
+// 0x0106a04c: 0x106a04c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106a050: 0x106a050: j	 0x106a080 addiu a2, zero, 585
+	ldc.i4 585
+	stloc.3
+	br L_106a080
+// --- basic block ---
+L_106a058:
+// 0x0106a058: 0x106a058: jal   0x1069ef4 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::wst_Receive_1069ef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106a04c: 0x106a04c: lw    v0, 2280(sp)
-	ldloc 6
-	ldloc.0
+// 0x0106a060: 0x106a060: bne   v0, zero, 0x106a08c addiu v1, zero, 2
+	ldloc 5
 	ldc.i4.2
-	shr.un
-	ldc.i4 570
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106a050: 0x106a050: j	 0x106a05c sll   zero, zero, 0
-	br L_106a05c
+	stloc 6
+	brtrue L_106a08c
 // --- basic block ---
-L_106a058:
-// 0x0106a058: 0x106a058: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_106a05c:
-// 0x0106a05c: 0x106a05c: lw    ra, 2324(sp)
-// 0x0106a060: 0x106a060: lw    s8, 2320(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 580
-	add
-	ldelem.i4
-	stloc 13
-// 0x0106a064: 0x106a064: lw    s7, 2316(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 579
-	add
-	ldelem.i4
-	stloc 16
-// 0x0106a068: 0x106a068: lw    s6, 2312(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 578
-	add
-	ldelem.i4
-	stloc 12
-// 0x0106a06c: 0x106a06c: lw    s5, 2308(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 577
+// 0x0106a068: 0x106a068: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106a06c: 0x106a06c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106a070: 0x106a070: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
 	add
-	ldelem.i4
-	stloc 11
-// 0x0106a070: 0x106a070: lw    s4, 2304(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 576
+	stloc.2
+// 0x0106a074: 0x106a074: addiu a3, a3, 20208
+	ldloc 4
+	ldc.i4 20208
 	add
-	ldelem.i4
-	stloc 15
-// 0x0106a074: 0x106a074: lw    s3, 2300(sp)
-	ldloc 6
+	stloc 4
+// 0x0106a078: 0x106a078: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106a07c: 0x106a07c: addiu a2, zero, 591
+	ldc.i4 591
+	stloc.3
+L_106a080:
+// 0x0106a080: 0x106a080: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 575
-	add
-	ldelem.i4
-	stloc 14
-// 0x0106a078: 0x106a078: lw    s2, 2296(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106a088: 0x106a088: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+L_106a08c:
+// 0x0106a08c: 0x106a08c: lw    ra, 36(sp)
+// 0x0106a090: 0x106a090: addu  v0, v1, zero
 	ldloc 6
+	stloc 5
+// 0x0106a094: 0x106a094: lw    s1, 32(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 574
+	ldc.i4.8
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106a07c: 0x106a07c: lw    s1, 2292(sp)
-	ldloc 6
+// 0x0106a098: 0x106a098: lw    s0, 28(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 573
+	ldc.i4.7
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106a080: 0x106a080: lw    s0, 2288(sp)
-	ldloc 6
+// 0x0106a09c: 0x106a09c: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 572
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106a084: 0x106a084: jr    ra addiu sp, sp, 2328
-	ldloc.0
-	ldc.i4 2328
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 wst_process_queue_item_106a08c(int32,int32,int32,int32,int32)
+.method public static int32 wstq_Add_106a0a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s3,int32 v1,int32 s1,int32 s4,int32 s0,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s0,int32 ra)
 
 // local  6 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local 11 is register s0
-// local  9 is register s1
-// local 12 is register s2
-// local  7 is register s3
-// local 10 is register s4
+// local  8 is register s1
+// local  9 is register s2
+// local 10 is register s3
 // local  0 is register sp
-// local 13 is register ra
+// local 12 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6507,27 +6347,25 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 11
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 12
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldc.i4.s 0
 	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a08c: 0x106a08c: addiu sp, sp, -80
+// 0x0106a0a4: 0x106a0a4: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0106a090: 0x106a090: sw    s4, 72(sp)
+// 0x0106a0a8: 0x106a0a8: sw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6536,119 +6374,105 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0106a094: 0x106a094: addiu s4, a0, 28
-	ldloc.1
-	ldc.i4.s 28
-	add
-	stloc 10
-// 0x0106a098: 0x106a098: sw    s2, 64(sp)
+// 0x0106a0ac: 0x106a0ac: sw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 17
 	add
-	ldloc 12
+	ldloc 9
 	stelem.i4
-// 0x0106a09c: 0x106a09c: sw    zero, 0(a1)
+// 0x0106a0b0: 0x106a0b0: sw    s0, 60(sp)
 	ldloc 5
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 0
+	ldc.i4.s 15
+	add
+	ldloc 11
 	stelem.i4
-// 0x0106a0a0: 0x106a0a0: addu  s2, a0, zero
-	ldloc.1
-	stloc 12
-// 0x0106a0a4: 0x106a0a4: addu  a0, s4, zero
-	ldloc 10
-	stloc.1
-// 0x0106a0a8: 0x106a0a8: sw    s3, 68(sp)
+// 0x0106a0b4: 0x106a0b4: sw    ra, 76(sp)
+// 0x0106a0b8: 0x106a0b8: sw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 16
 	add
-	ldloc 7
+	ldloc 8
 	stelem.i4
-// 0x0106a0ac: 0x106a0ac: sw    s0, 56(sp)
+// 0x0106a0bc: 0x106a0bc: lw    s3, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 24
 	add
-	ldloc 11
-	stelem.i4
-// 0x0106a0b0: 0x106a0b0: sw    ra, 76(sp)
-// 0x0106a0b4: 0x106a0b4: sw    s1, 60(sp)
+	ldelem.i4
+	stloc 10
+// 0x0106a0c0: 0x106a0c0: lw    s2, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.s 26
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106a0b8: 0x106a0b8: jal   0x1068c74 addu  s0, a1, zero
-	ldloc.2
-	stloc 11
+	ldelem.i4
+	stloc 9
+// 0x0106a0c4: 0x106a0c4: beq   a2, zero, 0x106a0f4 addu  s0, a0, zero
+	ldloc.3
 	ldloc.1
-	call int32 Cibyl77::wstq_is_empty_1068c74(int32)
-	stloc 6
+	stloc 11
+	brfalse L_106a0f4
 // --- basic block ---
-// 0x0106a0c0: 0x106a0c0: bne   v0, zero, 0x106a144 addiu s3, zero, 1
-	ldloc 6
-	ldc.i4.1
-	stloc 7
-	brtrue L_106a144
+// 0x0106a0cc: 0x106a0cc: beq   a3, zero, 0x106a0f4 sll   zero, zero, 0
+	ldloc 4
+	brfalse L_106a0f4
 // --- basic block ---
-// 0x0106a0c8: 0x106a0c8: addiu s1, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 9
-// 0x0106a0cc: 0x106a0cc: addu  a0, s4, zero
+// 0x0106a0d4: 0x106a0d4: beq   s3, zero, 0x106a0f4 sll   zero, zero, 0
 	ldloc 10
-	stloc.1
-// 0x0106a0d0: 0x106a0d0: jal   0x1068ddc addu  a1, s1, zero
+	brfalse L_106a0f4
+// --- basic block ---
+// 0x0106a0dc: 0x106a0dc: beq   s2, zero, 0x106a0f4 sll   zero, zero, 0
 	ldloc 9
-	stloc.2
+	brfalse L_106a0f4
+// --- basic block ---
+// 0x0106a0e4: 0x106a0e4: lb    v0, 0(s2)
+	ldloc 9
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x0106a0e8: 0x106a0e8: sll   zero, zero, 0
+// 0x0106a0ec: 0x106a0ec: bne   v0, zero, 0x106a118 addiu s1, sp, 16
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::wstq_dequeue_1068ddc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 16
+	add
 	stloc 8
-	stloc 6
+	brtrue L_106a118
 // --- basic block ---
-// 0x0106a0d8: 0x106a0d8: bne   v0, zero, 0x106a100 lui   a1, 0x10000
-	ldloc 6
+L_106a0f4:
+// 0x0106a0f4: 0x106a0f4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-	brtrue L_106a100
-// --- basic block ---
-// 0x0106a0e0: 0x106a0e0: lui   a3, 0x10000
+// 0x0106a0f8: 0x106a0f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106a0e4: 0x106a0e4: addiu a1, a1, 18168
+// 0x0106a0fc: 0x106a0fc: addiu a1, a1, 18164
 	ldloc.2
-	ldc.i4 18168
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x0106a0e8: 0x106a0e8: addiu a3, a3, 20088
+// 0x0106a100: 0x106a100: addiu a3, a3, 20260
 	ldloc 4
-	ldc.i4 20088
+	ldc.i4 20260
 	add
 	stloc 4
-// 0x0106a0ec: 0x106a0ec: addiu a0, zero, 4
+// 0x0106a104: 0x106a104: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106a0f0: 0x106a0f0: jal   0x100449c addiu a2, zero, 257
-	ldc.i4 257
+// 0x0106a108: 0x106a108: jal   0x100449c addiu a2, zero, 340
+	ldc.i4 340
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -6657,43 +6481,67 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106a0f8: 0x106a0f8: j	 0x106a144 addu  s3, zero, zero
+// 0x0106a110: 0x106a110: j	 0x106a17c addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_106a144
+	br L_106a17c
 // --- basic block ---
-L_106a100:
-// 0x0106a100: 0x106a100: lw    v0, 44(sp)
+L_106a118:
+// 0x0106a118: 0x106a118: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x0106a11c: 0x106a11c: sw    a1, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc.2
+	stelem.i4
+// 0x0106a120: 0x106a120: sw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 11
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106a104: 0x106a104: lw    a1, 32(sp)
+	ldloc.3
+	stelem.i4
+// 0x0106a124: 0x106a124: jal   0x1068dd0 sw    a3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 12
+	add
+	ldloc 4
+	stelem.i4
+	ldloc.1
+	call void Cibyl77::wstq_item_init_1068dd0(int32)
+// --- basic block ---
+// 0x0106a12c: 0x106a12c: lw    a1, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106a108: 0x106a108: sw    v0, 16(sp)
+// 0x0106a130: 0x106a130: lw    a2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 11
 	add
-	ldloc 6
-	stelem.i4
-// 0x0106a10c: 0x106a10c: lw    v0, 48(sp)
+	ldelem.i4
+	stloc.3
+// 0x0106a134: 0x106a134: lw    a3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6701,52 +6549,88 @@ L_106a100:
 	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106a110: 0x106a110: lw    a2, 36(sp)
+	stloc 4
+// 0x0106a138: 0x106a138: lw    v0, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 25
 	add
 	ldelem.i4
-	stloc.3
-// 0x0106a114: 0x106a114: sw    v0, 20(sp)
+	stloc 6
+// 0x0106a13c: 0x106a13c: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x0106a140: 0x106a140: sw    a1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc.2
+	stelem.i4
+// 0x0106a144: 0x106a144: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 6
+	ldloc.3
 	stelem.i4
-// 0x0106a118: 0x106a118: lw    a3, 40(sp)
+// 0x0106a148: 0x106a148: sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 4
-// 0x0106a11c: 0x106a11c: lw    v0, 52(sp)
+	ldloc 4
+	stelem.i4
+// 0x0106a14c: 0x106a14c: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.7
 	add
-	ldelem.i4
+	ldloc 10
+	stelem.i4
+// 0x0106a150: 0x106a150: jal   0x1001ba8 sw    v0, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-// 0x0106a120: 0x106a120: addu  a0, s2, zero
-	ldloc 12
+// --- basic block ---
+// 0x0106a158: 0x106a158: addiu a0, s0, 28
+	ldloc 11
+	ldc.i4.s 28
+	add
 	stloc.1
-// 0x0106a124: 0x106a124: jal   0x1069ec8 sw    v0, 24(sp)
+// 0x0106a15c: 0x106a15c: addu  a1, s1, zero
+	ldloc 8
+	stloc.2
+// 0x0106a160: 0x106a160: jal   0x1068c90 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
 	ldloc 6
 	stelem.i4
@@ -6755,46 +6639,39 @@ L_106a100:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::wstq_enqueue_1068c90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106a12c: 0x106a12c: addu  s3, v0, zero
+// 0x0106a168: 0x106a168: bne   v0, zero, 0x106a17c addiu v1, zero, 1
 	ldloc 6
+	ldc.i4.1
 	stloc 7
-// 0x0106a130: 0x106a130: jal   0x1068ee4 addu  a0, s1, zero
-	ldloc 9
+	brtrue L_106a17c
+// --- basic block ---
+// 0x0106a170: 0x106a170: jal   0x1068ef4 addu  a0, s1, zero
+	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wstq_item_release_1068ee4(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::wstq_item_release_1068ef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0106a138: 0x106a138: beq   s3, zero, 0x106a144 addiu v0, zero, 1
-	ldloc 7
-	ldc.i4.1
+	stloc 7
 	stloc 6
-	brfalse L_106a144
 // --- basic block ---
-// 0x0106a140: 0x106a140: sw    v0, 0(s0)
-	ldloc 5
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldloc 6
-	stelem.i4
-L_106a144:
-// 0x0106a144: 0x106a144: lw    ra, 76(sp)
-// 0x0106a148: 0x106a148: addu  v0, s3, zero
+// 0x0106a178: 0x106a178: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+L_106a17c:
+// 0x0106a17c: 0x106a17c: lw    ra, 76(sp)
+// 0x0106a180: 0x106a180: addu  v0, v1, zero
 	ldloc 7
 	stloc 6
-// 0x0106a14c: 0x106a14c: lw    s4, 72(sp)
+// 0x0106a184: 0x106a184: lw    s3, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6803,7 +6680,7 @@ L_106a144:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0106a150: 0x106a150: lw    s3, 68(sp)
+// 0x0106a188: 0x106a188: lw    s2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6811,8 +6688,8 @@ L_106a144:
 	ldc.i4.s 17
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a154: 0x106a154: lw    s2, 64(sp)
+	stloc 9
+// 0x0106a18c: 0x106a18c: lw    s1, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6820,8 +6697,8 @@ L_106a144:
 	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc 12
-// 0x0106a158: 0x106a158: lw    s1, 60(sp)
+	stloc 8
+// 0x0106a190: 0x106a190: lw    s0, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6829,24 +6706,15 @@ L_106a144:
 	ldc.i4.s 15
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106a15c: 0x106a15c: lw    s0, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
 	stloc 11
-// 0x0106a160: 0x106a160: jr    ra addiu sp, sp, 80
+// 0x0106a194: 0x106a194: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
diff --git a/converted/Cibyl79.j b/converted/Cibyl79.j
index 1d1781b..d242ce3 100644
--- a/converted/Cibyl79.j
+++ b/converted/Cibyl79.j
@@ -41,26 +41,25 @@
     IL_0006:  ret
   } // end of method Cibyl79::.ctor
 
-.method public static int32 wst_context_init_106a168(int32,int32,int32,int32,int32)
+.method public static int32 wst_queue_clear_106a1bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32 v1,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  7 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
-// local  9 is register ra
-// local  8 is register mem
+// local  5 is register ra
+// local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 6
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -69,51 +68,22 @@
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a168: 0x106a168: addiu sp, sp, -24
+// 0x0106a1bc: 0x106a1bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106a16c: 0x106a16c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0106a170: 0x106a170: addiu a2, zero, 4508
-	ldc.i4 4508
-	stloc.3
-// 0x0106a174: 0x106a174: sw    s0, 16(sp)
-	ldloc 8
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106a178: 0x106a178: sw    ra, 20(sp)
-// 0x0106a17c: 0x106a17c: jal   0x100177c addu  s0, a0, zero
-	ldloc.1
-	stloc 5
+// 0x0106a1c0: 0x106a1c0: sw    ra, 20(sp)
+// 0x0106a1c4: 0x106a1c4: jal   0x1068f34 addiu a0, a0, 28
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106a184: 0x106a184: jal   0x1068d9c addiu a0, s0, 28
-	ldloc 5
 	ldc.i4.s 28
 	add
 	stloc.1
@@ -122,84 +92,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::wstq_init_1068d9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106a18c: 0x106a18c: jal   0x10674e4 addiu a0, s0, 160
-	ldloc 5
-	ldc.i4 160
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106a194: 0x106a194: jal   0x106a724 addiu a0, s0, 2404
-	ldloc 5
-	ldc.i4 2404
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::cyclic_buffer_init_106a724(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::wstq_clear_1068f34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 6
 // --- basic block ---
-// 0x0106a19c: 0x106a19c: lw    ra, 20(sp)
-// 0x0106a1a0: 0x106a1a0: lw    s0, 16(sp)
-	ldloc 8
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106a1a4: 0x106a1a4: jr    ra addiu sp, sp, 24
+// 0x0106a1cc: 0x106a1cc: lw    ra, 20(sp)
+// 0x0106a1d0: 0x106a1d0: sll   zero, zero, 0
+// 0x0106a1d4: 0x106a1d4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 7
 	ret
 }
-.method public static int32 wst_init_106a1ac(int32,int32,int32,int32,int32)
+.method public static int32 wst_context_reset_106a1dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local 12 is register v0
+// local 13 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
+// local  6 is register s0
+// local  7 is register s1
+// local  8 is register s2
+// local  9 is register s3
+// local 10 is register s4
 // local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
+// local 11 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 12
 	ldc.i4.s 0
-	stloc 7
+	stloc 13
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -209,422 +144,343 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a1ac: 0x106a1ac: addiu sp, sp, -48
+// 0x0106a1dc: 0x106a1dc: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106a1b0: 0x106a1b0: sw    s1, 40(sp)
-	ldloc 6
+// 0x0106a1e0: 0x106a1e0: sw    s4, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.8
 	add
-	ldloc 9
+	ldloc 10
 	stelem.i4
-// 0x0106a1b4: 0x106a1b4: sw    s0, 36(sp)
-	ldloc 6
+// 0x0106a1e4: 0x106a1e4: sw    s3, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.7
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x0106a1b8: 0x106a1b8: sw    ra, 44(sp)
-// 0x0106a1bc: 0x106a1bc: addu  s0, a0, zero
-	ldloc.1
-	stloc 8
-// 0x0106a1c0: 0x106a1c0: beq   a0, zero, 0x106a21c addu  s1, a1, zero
-	ldloc.1
-	ldloc.2
-	stloc 9
-	brfalse L_106a21c
-// --- basic block ---
-// 0x0106a1c8: 0x106a1c8: lb    v0, 0(a0)
-	ldloc.1
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x0106a1cc: 0x106a1cc: sll   zero, zero, 0
-// 0x0106a1d0: 0x106a1d0: beq   v0, zero, 0x106a220 addu  v0, zero, zero
+// 0x0106a1e8: 0x106a1e8: lw    s4, 12(a0)
 	ldloc 5
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_106a220
-// --- basic block ---
-// 0x0106a1d8: 0x106a1d8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0106a1dc: 0x106a1dc: addiu a2, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc.3
-// 0x0106a1e0: 0x106a1e0: jal   0x1068a88 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::WSA_ExtractParams_1068a88(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106a1e8: 0x106a1e8: beq   v0, zero, 0x106a21c sll   zero, zero, 0
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106a1ec: 0x106a1ec: lw    s3, 0(a0)
 	ldloc 5
-	brfalse L_106a21c
-// --- basic block ---
-// 0x0106a1f0: 0x106a1f0: jal   0x1000910 addiu a0, zero, 4508
-	ldc.i4 4508
-	stloc.1
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106a1f8: 0x106a1f8: addu  a0, v0, zero
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 9
+// 0x0106a1f0: 0x106a1f0: sw    s2, 24(sp)
 	ldloc 5
-	stloc.1
-// 0x0106a1fc: 0x106a1fc: jal   0x106a168 sw    v0, 24(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
+// 0x0106a1f4: 0x106a1f4: sw    s1, 20(sp)
+	ldloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106a1f8: 0x106a1f8: lw    s2, 4(a0)
+	ldloc 5
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::wst_context_init_106a168(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106a204: 0x106a204: lw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106a208: 0x106a208: lw    v1, 16(sp)
-	ldloc 6
-	ldloc.0
+	stloc 8
+// 0x0106a1fc: 0x106a1fc: lw    s1, 8(a0)
+	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.2
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106a20c: 0x106a20c: sw    s0, 0(v0)
-	ldloc 6
+// 0x0106a200: 0x106a200: sw    s0, 16(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldloc 8
-	stelem.i4
-// 0x0106a210: 0x106a210: sw    s1, 4(v0)
+	ldc.i4.4
+	add
 	ldloc 6
+	stelem.i4
+// 0x0106a204: 0x106a204: sw    zero, 16(a0)
 	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.4
 	add
-	ldloc 9
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106a214: 0x106a214: j	 0x106a220 sw    v1, 8(v0)
-	ldloc 6
+// 0x0106a208: 0x106a208: addu  s0, a0, zero
+	ldloc.1
+	stloc 6
+// 0x0106a20c: 0x106a20c: sw    zero, 20(a0)
 	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.5
 	add
-	ldloc 7
-	stelem.i4
-	br L_106a220
-// --- basic block ---
-L_106a21c:
-// 0x0106a21c: 0x106a21c: addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc 5
-L_106a220:
-// 0x0106a220: 0x106a220: lw    ra, 44(sp)
-// 0x0106a224: 0x106a224: lw    s1, 40(sp)
-	ldloc 6
-	ldloc.0
+	stelem.i4
+// 0x0106a210: 0x106a210: sw    zero, 24(a0)
+	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106a228: 0x106a228: lw    s0, 36(sp)
-	ldloc 6
-	ldloc.0
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106a214: 0x106a214: sw    zero, 156(a0)
+	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 39
 	add
-	ldelem.i4
-	stloc 8
-// 0x0106a22c: 0x106a22c: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106a218: 0x106a218: sw    ra, 36(sp)
+// 0x0106a21c: 0x106a21c: jal   0x1067518 addiu a0, a0, 160
+	ldloc.1
+	ldc.i4 160
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 wst_context_free_106a234(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  5 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 13
+	stloc 12
 // --- basic block ---
-// 0x0106a234: 0x106a234: lw    v0, 20(a0)
+// 0x0106a224: 0x106a224: jal   0x106ad48 addiu a0, s0, 2404
 	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4 2404
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106a238: 0x106a238: addiu sp, sp, -24
+	stloc.1
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106a23c: 0x106a23c: sw    s0, 16(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::cyclic_buffer_init_106ad48(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 13
+	stloc 12
+// --- basic block ---
+// 0x0106a22c: 0x106a22c: lw    ra, 36(sp)
+// 0x0106a230: 0x106a230: sw    s4, 12(s0)
+	ldloc 5
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.3
 	add
+	ldloc 10
+	stelem.i4
+// 0x0106a234: 0x106a234: sw    s3, 0(s0)
 	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldloc 9
 	stelem.i4
-// 0x0106a240: 0x106a240: sw    ra, 20(sp)
-// 0x0106a244: 0x106a244: beq   v0, zero, 0x106a25c addu  s0, a0, zero
-	ldloc 7
-	ldloc.1
-	stloc 5
-	brfalse L_106a25c
-// --- basic block ---
-// 0x0106a24c: 0x106a24c: lw    a0, 12(a0)
+// 0x0106a238: 0x106a238: sw    s2, 4(s0)
+	ldloc 5
 	ldloc 6
-	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.1
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106a250: 0x106a250: jal   0x1067844 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::socket_async_receive_end_1067844(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0106a258: 0x106a258: sw    zero, 20(s0)
+	ldloc 8
+	stelem.i4
+// 0x0106a23c: 0x106a23c: sw    s1, 8(s0)
+	ldloc 5
 	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106a240: 0x106a240: sw    zero, 4480(s0)
 	ldloc 5
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 1120
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_106a25c:
-// 0x0106a25c: 0x106a25c: lw    a0, 12(s0)
+// 0x0106a244: 0x106a244: sw    zero, 4484(s0)
+	ldloc 5
 	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 1121
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106a248: 0x106a248: sw    zero, 4488(s0)
 	ldloc 5
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4 1122
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106a260: 0x106a260: sll   zero, zero, 0
-// 0x0106a264: 0x106a264: beq   a0, zero, 0x106a278 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_106a278
-// --- basic block ---
-// 0x0106a26c: 0x106a26c: jal   0x1051af0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl60::roadmap_net_close_1051af0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0106a274: 0x106a274: sw    zero, 12(s0)
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106a24c: 0x106a24c: sw    zero, 4492(s0)
+	ldloc 5
 	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 1123
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106a250: 0x106a250: sw    zero, 4496(s0)
 	ldloc 5
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4 1124
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_106a278:
-// 0x0106a278: 0x106a278: jal   0x1067508 addiu a0, s0, 160
+// 0x0106a254: 0x106a254: sw    zero, 4500(s0)
 	ldloc 5
-	ldc.i4 160
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
 	add
-	stloc.1
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106a258: 0x106a258: lw    s4, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0106a280: 0x106a280: jal   0x1068f24 addiu a0, s0, 28
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106a25c: 0x106a25c: lw    s3, 28(sp)
 	ldloc 5
-	ldc.i4.s 28
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.1
+	ldelem.i4
+	stloc 9
+// 0x0106a260: 0x106a260: lw    s2, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl78::wstq_clear_1068f24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
 	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0106a288: 0x106a288: jal   0x106a168 addu  a0, s0, zero
+// 0x0106a264: 0x106a264: lw    s1, 20(sp)
 	ldloc 5
-	stloc.1
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::wst_context_init_106a168(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
 	stloc 7
-// --- basic block ---
-// 0x0106a290: 0x106a290: lw    ra, 20(sp)
-// 0x0106a294: 0x106a294: lw    s0, 16(sp)
-	ldloc 6
+// 0x0106a268: 0x106a268: lw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106a298: 0x106a298: jr    ra addiu sp, sp, 24
+	stloc 6
+// 0x0106a26c: 0x106a26c: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 13
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 12
 	ret
 }
-.method public static int32 wst_transaction_completed_106a2a0(int32,int32,int32,int32,int32)
+.method public static int32 wst_context_load_106a274(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
 
-// local  6 is register v0
-// local  8 is register v1
+// local  7 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  6 is register s0
 // local  0 is register sp
-// local 11 is register ra
+// local  8 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -634,156 +490,83 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
+	stloc 6
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a2a0: 0x106a2a0: lw    v0, 4504(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 1126
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106a2a4: 0x106a2a4: addiu sp, sp, -40
+// 0x0106a274: 0x106a274: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106a2a8: 0x106a2a8: sw    s2, 32(sp)
+// 0x0106a278: 0x106a278: sw    ra, 36(sp)
+// 0x0106a27c: 0x106a27c: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 10
+	ldloc 6
 	stelem.i4
-// 0x0106a2ac: 0x106a2ac: sw    s1, 28(sp)
+// 0x0106a280: 0x106a280: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldloc 9
+	ldloc.2
 	stelem.i4
-// 0x0106a2b0: 0x106a2b0: sw    s0, 24(sp)
+// 0x0106a284: 0x106a284: addu  s0, a0, zero
+	ldloc.1
+	stloc 6
+// 0x0106a288: 0x106a288: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
-	ldloc 7
+	ldloc.3
 	stelem.i4
-// 0x0106a2b4: 0x106a2b4: sw    ra, 36(sp)
-// 0x0106a2b8: 0x106a2b8: lw    s1, 4492(a0)
+// 0x0106a28c: 0x106a28c: jal   0x106a1dc sw    a3, 24(sp)
 	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1123
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106a2bc: 0x106a2bc: lw    s2, 156(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 39
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106a2c0: 0x106a2c0: beq   v0, zero, 0x106a2e0 addu  s0, a0, zero
-	ldloc 6
-	ldloc.1
-	stloc 7
-	brfalse L_106a2e0
-// --- basic block ---
-// 0x0106a2c8: 0x106a2c8: jal   0x106a234 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_context_free_106a234(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0106a2d0: 0x106a2d0: jal   0x1000930 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_context_reset_106a1dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0106a2d8: 0x106a2d8: j	 0x106a344 sll   zero, zero, 0
-	br L_106a344
+	stloc 9
+	stloc 7
 // --- basic block ---
-L_106a2e0:
-// 0x0106a2e0: 0x106a2e0: lw    v0, 20(a0)
+// 0x0106a294: 0x106a294: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 7
+// 0x0106a298: 0x106a298: sw    v0, 16(s0)
 	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106a2e4: 0x106a2e4: sll   zero, zero, 0
-// 0x0106a2e8: 0x106a2e8: beq   v0, zero, 0x106a304 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_106a304
-// --- basic block ---
-// 0x0106a2f0: 0x106a2f0: lw    a0, 12(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106a2f4: 0x106a2f4: jal   0x1067844 sw    a1, 16(sp)
-	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc.2
+	ldloc 7
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::socket_async_receive_end_1067844(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0106a2fc: 0x106a2fc: lw    a1, 16(sp)
+// 0x0106a29c: 0x106a29c: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -792,178 +575,118 @@ L_106a2e0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106a300: 0x106a300: sw    zero, 20(s0)
+// 0x0106a2a0: 0x106a2a0: lw    a2, 20(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldc.i4.s 0
-	stelem.i4
-L_106a304:
-// 0x0106a304: 0x106a304: lw    a0, 12(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
 	ldelem.i4
-	stloc.1
-// 0x0106a308: 0x106a308: sll   zero, zero, 0
-// 0x0106a30c: 0x106a30c: beq   a0, zero, 0x106a324 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_106a324
-// --- basic block ---
-// 0x0106a314: 0x106a314: jal   0x1051af0 sw    a1, 16(sp)
+	stloc.3
+// 0x0106a2a4: 0x106a2a4: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc.2
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl60::roadmap_net_close_1051af0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0106a31c: 0x106a31c: lw    a1, 16(sp)
+	ldelem.i4
+	stloc 4
+// 0x0106a2a8: 0x106a2a8: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc.2
-// 0x0106a320: 0x106a320: sw    zero, 12(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_106a324:
-// 0x0106a324: 0x106a324: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x0106a328: 0x106a328: jal   0x1069bf0 sw    a1, 16(sp)
+	stloc 7
+// 0x0106a2ac: 0x106a2ac: lw    ra, 36(sp)
+// 0x0106a2b0: 0x106a2b0: sw    a1, 4484(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 1121
 	add
 	ldloc.2
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl78::wst_context_reset_1069bf0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0106a330: 0x106a330: lw    a1, 16(sp)
+// 0x0106a2b4: 0x106a2b4: sw    a2, 4488(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 1122
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106a334: 0x106a334: beq   s1, zero, 0x106a344 sll   zero, zero, 0
-	ldloc 9
-	brfalse L_106a344
-// --- basic block ---
-// 0x0106a33c: 0x106a33c: jalr  s1 addu  a0, s2, zero
-	ldloc 9
-	ldloc 10
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-L_106a344:
-// 0x0106a344: 0x106a344: lw    ra, 36(sp)
-// 0x0106a348: 0x106a348: lw    s2, 32(sp)
+	stelem.i4
+// 0x0106a2b8: 0x106a2b8: sw    a3, 4492(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 1123
 	add
-	ldelem.i4
-	stloc 10
-// 0x0106a34c: 0x106a34c: lw    s1, 28(sp)
+	ldloc 4
+	stelem.i4
+// 0x0106a2bc: 0x106a2bc: sw    v0, 156(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 39
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106a350: 0x106a350: lw    s0, 24(sp)
+	ldloc 7
+	stelem.i4
+// 0x0106a2c0: 0x106a2c0: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a354: 0x106a354: jr    ra addiu sp, sp, 40
+	stloc 6
+// 0x0106a2c4: 0x106a2c4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 7
 	ret
 }
-.method public static int32 on_data_received_106a35c(int32,int32,int32,int32,int32)
+.method public static int32 wst_start_trans__int_106a2cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 t2,int32 s3,int32 s4,int32 s2,int32 s5,int32 ra,int32 t0)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local 16 is register t0
+// local 10 is register t2
+// local  9 is register s0
+// local  8 is register s1
+// local 13 is register s2
+// local 11 is register s3
+// local 12 is register s4
+// local 14 is register s5
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local 15 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -973,353 +696,200 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 16
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 15
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a35c: 0x106a35c: lw    v0, 4464(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4 1116
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106a360: 0x106a360: addiu sp, sp, -24
+// 0x0106a2cc: 0x106a2cc: addiu sp, sp, -320
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4 -320
 	add
 	stloc.0
-// 0x0106a364: 0x106a364: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 8
-// 0x0106a368: 0x106a368: sw    s0, 16(sp)
-	ldloc 6
+// 0x0106a2d0: 0x106a2d0: sw    s2, 300(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 75
 	add
-	ldloc 7
+	ldloc 13
 	stelem.i4
-// 0x0106a36c: 0x106a36c: sw    ra, 20(sp)
-// 0x0106a370: 0x106a370: bne   v0, v1, 0x106a37c addu  s0, a2, zero
+// 0x0106a2d4: 0x106a2d4: sw    s1, 296(sp)
 	ldloc 5
-	ldloc 8
-	ldloc.3
-	stloc 7
-	bne.un L_106a37c
-// --- basic block ---
-// 0x0106a378: 0x106a378: sw    a1, 4464(a2)
-	ldloc 6
-	ldloc.3
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1116
+	ldc.i4.s 74
 	add
-	ldloc.2
+	ldloc 8
 	stelem.i4
-L_106a37c:
-// 0x0106a37c: 0x106a37c: jal   0x106912c addu  a2, s0, zero
-	ldloc 7
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl78::on_data_received__106912c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106a384: 0x106a384: beq   v0, zero, 0x106a3ac sw    v0, 4496(s0)
+// 0x0106a2d8: 0x106a2d8: sw    s0, 292(sp)
 	ldloc 5
-	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1124
+	ldc.i4.s 73
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-	brfalse L_106a3ac
-// --- basic block ---
-// 0x0106a38c: 0x106a38c: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 8
-// 0x0106a390: 0x106a390: bne   v0, v1, 0x106a3b8 sll   zero, zero, 0
+// 0x0106a2dc: 0x106a2dc: sw    ra, 316(sp)
+// 0x0106a2e0: 0x106a2e0: sw    s5, 312(sp)
 	ldloc 5
-	ldloc 8
-	bne.un L_106a3b8
-// --- basic block ---
-// 0x0106a398: 0x106a398: lw    v0, 4500(s0)
-	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4.s 78
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106a39c: 0x106a39c: sll   zero, zero, 0
-// 0x0106a3a0: 0x106a3a0: bne   v0, zero, 0x106a3ac addiu v0, zero, 2
+	ldloc 14
+	stelem.i4
+// 0x0106a2e4: 0x106a2e4: sw    s4, 308(sp)
 	ldloc 5
-	ldc.i4.2
-	stloc 5
-	brtrue L_106a3ac
-// --- basic block ---
-// 0x0106a3a8: 0x106a3a8: sw    v0, 4500(s0)
-	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4.s 77
 	add
-	ldloc 5
+	ldloc 12
 	stelem.i4
-L_106a3ac:
-// 0x0106a3ac: 0x106a3ac: lw    a1, 4500(s0)
-	ldloc 6
-	ldloc 7
+// 0x0106a2e8: 0x106a2e8: sw    s3, 304(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4.s 76
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106a3b0: 0x106a3b0: jal   0x106a2a0 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.0
+	ldloc 11
+	stelem.i4
+// 0x0106a2ec: 0x106a2ec: addu  s0, a0, zero
 	ldloc.1
+	stloc 9
+// 0x0106a2f0: 0x106a2f0: addu  s2, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::wst_transaction_completed_106a2a0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-L_106a3b8:
-// 0x0106a3b8: 0x106a3b8: lw    ra, 20(sp)
-// 0x0106a3bc: 0x106a3bc: lw    s0, 16(sp)
-	ldloc 6
+	stloc 13
+// 0x0106a2f4: 0x106a2f4: lw    v0, 336(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 84
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a3c0: 0x106a3c0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 on_socket_connected_106a3c8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  5 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106a3c8: 0x106a3c8: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106a3cc: 0x106a3cc: sw    s0, 16(sp)
-	ldloc 6
+// 0x0106a2f8: 0x106a2f8: lw    v1, 340(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 85
 	add
+	ldelem.i4
+	stloc 7
+// 0x0106a2fc: 0x106a2fc: lw    s1, 344(sp)
 	ldloc 5
-	stelem.i4
-// 0x0106a3d0: 0x106a3d0: sw    ra, 20(sp)
-// 0x0106a3d4: 0x106a3d4: jal   0x106988c addu  s0, a1, zero
-	ldloc.2
-	stloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 86
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106a300: 0x106a300: beq   a0, zero, 0x106a48c addu  t0, a2, zero
 	ldloc.1
+	ldloc.3
+	stloc 16
+	brfalse L_106a48c
+// --- basic block ---
+// 0x0106a308: 0x106a308: beq   a1, zero, 0x106a48c sll   zero, zero, 0
+	ldloc.2
+	brfalse L_106a48c
+// --- basic block ---
+// 0x0106a310: 0x106a310: lb    t2, 0(a1)
 	ldloc.2
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 10
+// 0x0106a314: 0x106a314: sll   zero, zero, 0
+// 0x0106a318: 0x106a318: beq   t2, zero, 0x106a48c sll   zero, zero, 0
+	ldloc 10
+	brfalse L_106a48c
+// --- basic block ---
+// 0x0106a320: 0x106a320: beq   a2, zero, 0x106a48c sll   zero, zero, 0
 	ldloc.3
+	brfalse L_106a48c
+// --- basic block ---
+// 0x0106a328: 0x106a328: beq   a3, zero, 0x106a48c sll   zero, zero, 0
 	ldloc 4
-	call int32 Cibyl78::on_socket_connected__106988c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	brfalse L_106a48c
 // --- basic block ---
-// 0x0106a3dc: 0x106a3dc: beq   v0, zero, 0x106a3f8 sw    v0, 4496(s0)
-	ldloc 7
+// 0x0106a330: 0x106a330: beq   v0, zero, 0x106a48c sll   zero, zero, 0
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 1124
-	add
-	ldloc 7
-	stelem.i4
-	brfalse L_106a3f8
+	brfalse L_106a48c
 // --- basic block ---
-// 0x0106a3e4: 0x106a3e4: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 8
-// 0x0106a3e8: 0x106a3e8: bne   v0, v1, 0x106a410 addu  a0, s0, zero
-	ldloc 7
+// 0x0106a338: 0x106a338: beq   s1, zero, 0x106a48c sll   zero, zero, 0
 	ldloc 8
-	ldloc 5
-	stloc.1
-	bne.un L_106a410
+	brfalse L_106a48c
 // --- basic block ---
-// 0x0106a3f0: 0x106a3f0: j	 0x106a404 sll   zero, zero, 0
-	br L_106a404
-// --- basic block ---
-L_106a3f8:
-// 0x0106a3f8: 0x106a3f8: addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-// 0x0106a3fc: 0x106a3fc: j	 0x106a408 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-	br L_106a408
+// 0x0106a340: 0x106a340: lb    t2, 0(s1)
+	ldloc 8
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 10
+// 0x0106a344: 0x106a344: sll   zero, zero, 0
+// 0x0106a348: 0x106a348: beq   t2, zero, 0x106a48c sll   zero, zero, 0
+	ldloc 10
+	brfalse L_106a48c
 // --- basic block ---
-L_106a404:
-// 0x0106a404: 0x106a404: lw    a1, 4500(s0)
-	ldloc 6
+// 0x0106a350: 0x106a350: lw    t2, 16(a0)
 	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 1125
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc.2
-L_106a408:
-// 0x0106a408: 0x106a408: jal   0x106a2a0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::wst_transaction_completed_106a2a0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stloc 10
+// 0x0106a354: 0x106a354: sll   zero, zero, 0
+// 0x0106a358: 0x106a358: beq   t2, zero, 0x106a378 sll   zero, zero, 0
+	ldloc 10
+	brfalse L_106a378
 // --- basic block ---
-L_106a410:
-// 0x0106a410: 0x106a410: lw    ra, 20(sp)
-// 0x0106a414: 0x106a414: lw    s0, 16(sp)
-	ldloc 6
+// 0x0106a360: 0x106a360: sw    v0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106a418: 0x106a418: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 wst_watchdog_106a420(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106a420: 0x106a420: addiu sp, sp, -32
+	ldloc 6
+	stelem.i4
+// 0x0106a364: 0x106a364: sw    v1, 20(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.0
-// 0x0106a424: 0x106a424: sw    s0, 24(sp)
 	ldloc 7
+	stelem.i4
+// 0x0106a368: 0x106a368: jal   0x106a0a4 sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -1327,583 +897,479 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0106a428: 0x106a428: sw    ra, 28(sp)
-// 0x0106a42c: 0x106a42c: addu  s0, a0, zero
+	ldloc.0
 	ldloc.1
-	stloc 8
-// 0x0106a430: 0x106a430: addu  v1, zero, zero
-	ldc.i4.s 0
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl78::wstq_Add_106a0a4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-// 0x0106a434: 0x106a434: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x0106a438: 0x106a438: cibyl_sysc 0x20df
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x0106a43c: 0x106a43c: addu  v1, v0, zero
+// --- basic block ---
+// 0x0106a370: 0x106a370: j	 0x106a490 sll   zero, zero, 0
+	br L_106a490
+// --- basic block ---
+L_106a378:
+// 0x0106a378: 0x106a378: lw    a0, 12(a0)
 	ldloc 5
-	stloc 6
-// 0x0106a440: 0x106a440: lw    v0, 24(a0)
-	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106a444: 0x106a444: sll   zero, zero, 0
-// 0x0106a448: 0x106a448: beq   v0, zero, 0x106a484 subu  v0, v1, v0
-	ldloc 5
-	ldloc 6
-	ldloc 5
-	sub
-	stloc 5
-	brfalse L_106a484
-// --- basic block ---
-// 0x0106a450: 0x106a450: slti  v1, v0, 75
-	ldloc 5
-	ldc.i4.s 75
-	clt
-	stloc 6
-// 0x0106a454: 0x106a454: bne   v1, zero, 0x106a484 lui   a3, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc 4
-	brtrue L_106a484
-// --- basic block ---
-// 0x0106a45c: 0x106a45c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106a460: 0x106a460: addiu a1, a1, 18168
-	ldloc.2
-	ldc.i4 18168
-	add
-	stloc.2
-// 0x0106a464: 0x106a464: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0106a468: 0x106a468: addiu a3, a3, 20144
+// 0x0106a37c: 0x106a37c: sll   zero, zero, 0
+// 0x0106a380: 0x106a380: bne   a0, zero, 0x106a48c addu  a1, t0, zero
+	ldloc.1
+	ldloc 16
+	stloc.2
+	brtrue L_106a48c
+// --- basic block ---
+// 0x0106a388: 0x106a388: addu  a2, a3, zero
 	ldloc 4
-	ldc.i4 20144
-	add
-	stloc 4
-// 0x0106a46c: 0x106a46c: addiu a2, zero, 321
-	ldc.i4 321
 	stloc.3
-// 0x0106a470: 0x106a470: jal   0x100449c sw    v0, 16(sp)
-	ldloc 7
+// 0x0106a38c: 0x106a38c: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x0106a390: 0x106a390: addu  a3, v0, zero
+	ldloc 6
+	stloc 4
+// 0x0106a394: 0x106a394: jal   0x106a274 sw    v1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_context_load_106a274(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0106a478: 0x106a478: addu  a0, s0, zero
+// 0x0106a39c: 0x106a39c: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0106a47c: 0x106a47c: jal   0x106a2a0 addiu a1, zero, 7
-	ldc.i4.7
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106a3a4: 0x106a3a4: addiu s4, v0, 410
+	ldloc 6
+	ldc.i4 410
+	add
+	stloc 12
+// 0x0106a3a8: 0x106a3a8: addiu a0, s0, 160
+	ldloc 9
+	ldc.i4 160
+	add
+	stloc.1
+// 0x0106a3ac: 0x106a3ac: jal   0x106756c addu  a1, s4, zero
+	ldloc 12
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_transaction_completed_106a2a0(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_106a484:
-// 0x0106a484: 0x106a484: lw    ra, 28(sp)
-// 0x0106a488: 0x106a488: lw    s0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106a48c: 0x106a48c: jr    ra addiu sp, sp, 32
+// 0x0106a3b4: 0x106a3b4: addiu s3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
+// 0x0106a3b8: 0x106a3b8: lw    a3, 0(s0)
 	ldloc 5
-	ret
-}
-.method public static int32 wst_term_106a494(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106a494: 0x106a494: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x0106a3bc: 0x106a3bc: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0106a3c0: 0x106a3c0: addiu a2, a2, 20316
+	ldloc.3
+	ldc.i4 20316
 	add
-	stloc.0
-// 0x0106a498: 0x106a498: sw    s0, 16(sp)
+	stloc.3
+// 0x0106a3c4: 0x106a3c4: addiu a1, zero, 255
+	ldc.i4 255
+	stloc.2
+// 0x0106a3c8: 0x106a3c8: addu  a0, s3, zero
+	ldloc 11
+	stloc.1
+// 0x0106a3cc: 0x106a3cc: addu  s5, v0, zero
 	ldloc 6
+	stloc 14
+// 0x0106a3d0: 0x106a3d0: jal   0x1000f9c sw    s2, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 13
 	stelem.i4
-// 0x0106a49c: 0x106a49c: sw    ra, 20(sp)
-// 0x0106a4a0: 0x106a4a0: beq   a0, zero, 0x106a4e4 addu  s0, a0, zero
-	ldloc.1
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brfalse L_106a4e4
+	stloc 6
 // --- basic block ---
-// 0x0106a4a8: 0x106a4a8: lw    v0, 16(a0)
-	ldloc 6
+// 0x0106a3d8: 0x106a3d8: jal   0x1001b48 addu  a0, s1, zero
+	ldloc 8
+	stloc.1
 	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106a3e0: 0x106a3e0: lw    a3, 4(s0)
+	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106a4ac: 0x106a4ac: sll   zero, zero, 0
-// 0x0106a4b0: 0x106a4b0: beq   v0, zero, 0x106a4d4 addiu v1, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 8
-	brfalse L_106a4d4
-// --- basic block ---
-// 0x0106a4b8: 0x106a4b8: bne   v0, v1, 0x106a4cc addiu v0, zero, 1
+	stloc 4
+// 0x0106a3e4: 0x106a3e4: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0106a3e8: 0x106a3e8: addu  a0, s5, zero
+	ldloc 14
+	stloc.1
+// 0x0106a3ec: 0x106a3ec: addu  a1, s4, zero
+	ldloc 12
+	stloc.2
+// 0x0106a3f0: 0x106a3f0: addiu a2, a2, 20292
+	ldloc.3
+	ldc.i4 20292
+	add
+	stloc.3
+// 0x0106a3f4: 0x106a3f4: sw    s1, 20(sp)
 	ldloc 5
-	ldloc 8
-	ldc.i4.1
-	stloc 5
-	bne.un L_106a4cc
-// --- basic block ---
-// 0x0106a4c0: 0x106a4c0: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x0106a4c4: 0x106a4c4: sw    v0, 16(a0)
-	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
-// 0x0106a4c8: 0x106a4c8: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-L_106a4cc:
-// 0x0106a4cc: 0x106a4cc: j	 0x106a4e4 sw    v0, 4504(s0)
-	ldloc 6
-	ldloc 7
+// 0x0106a3f8: 0x106a3f8: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 1126
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 6
 	stelem.i4
-	br L_106a4e4
-// --- basic block ---
-L_106a4d4:
-// 0x0106a4d4: 0x106a4d4: jal   0x106a234 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_context_free_106a234(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106a4dc: 0x106a4dc: jal   0x1000930 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-L_106a4e4:
-// 0x0106a4e4: 0x106a4e4: lw    ra, 20(sp)
-// 0x0106a4e8: 0x106a4e8: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
+// 0x0106a400: 0x106a400: lw    a3, 8(s0)
+	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.2
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a4ec: 0x106a4ec: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 WDF_FormatHttpDate_106a4f4(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
-
-// local  7 is register v0
-// local  5 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 5
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x0106a404: 0x106a404: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106a408: 0x106a408: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106a4f4: 0x106a4f4: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
+// 0x0106a40c: 0x106a40c: addiu a0, a0, 5452
+	ldloc.1
+	ldc.i4 5452
 	add
-	stloc.0
-// 0x0106a4f8: 0x106a4f8: sw    a0, 56(sp)
+	stloc.1
+// 0x0106a410: 0x106a410: addiu v0, v0, -22064
 	ldloc 6
+	ldc.i4 -22064
+	add
+	stloc 6
+// 0x0106a414: 0x106a414: addu  a1, s3, zero
+	ldloc 11
+	stloc.2
+// 0x0106a418: 0x106a418: addiu s1, zero, 1
+	ldc.i4.1
+	stloc 8
+// 0x0106a41c: 0x106a41c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0106a420: 0x106a420: sw    v0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.5
 	add
-	ldloc.1
+	ldloc 6
 	stelem.i4
-// 0x0106a4fc: 0x106a4fc: addiu a0, sp, 56
+// 0x0106a424: 0x106a424: sw    s1, 16(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.1
-// 0x0106a500: 0x106a500: sw    ra, 52(sp)
-// 0x0106a504: 0x106a504: jal   0x10c34cc sw    a1, 40(sp)
-	ldloc 6
+	ldloc 8
+	stelem.i4
+// 0x0106a428: 0x106a428: jal   0x1052364 sw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.6
 	add
-	ldloc.2
+	ldloc 9
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::gmtime_10c34cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_net_connect_async_1052364(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
 	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x0106a50c: 0x106a50c: lw    a0, 16(v0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
+// 0x0106a430: 0x106a430: addiu a0, zero, -1
+	ldc.i4.m1
 	stloc.1
-// 0x0106a510: 0x106a510: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0106a514: 0x106a514: sll   a0, a0, 2
-	ldloc.1
-	ldc.i4.2
-	shl
-	stloc.1
-// 0x0106a518: 0x106a518: addiu v1, v1, 28656
-	ldloc 5
-	ldc.i4 28656
-	add
-	stloc 5
-// 0x0106a51c: 0x106a51c: addu  v1, a0, v1
+// 0x0106a434: 0x106a434: bne   v0, a0, 0x106a46c lui   v1, 0x0
+	ldloc 6
 	ldloc.1
-	ldloc 5
+	ldc.i4.s 0
+	stloc 7
+	bne.un L_106a46c
+// --- basic block ---
+// 0x0106a43c: 0x106a43c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106a440: 0x106a440: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106a444: 0x106a444: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
 	add
-	stloc 5
-// 0x0106a520: 0x106a520: lw    v1, 0(v1)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0106a524: 0x106a524: lw    a2, 24(v0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	stloc.2
+// 0x0106a448: 0x106a448: addiu a3, a3, 20336
+	ldloc 4
+	ldc.i4 20336
 	add
-	ldelem.i4
+	stloc 4
+// 0x0106a44c: 0x106a44c: addiu a2, zero, 436
+	ldc.i4 436
 	stloc.3
-// 0x0106a528: 0x106a528: lw    a3, 12(v0)
-	ldloc 6
+// 0x0106a450: 0x106a450: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106a454: 0x106a454: jal   0x100449c sw    zero, 14924(v1)
+	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4 3731
 	add
-	ldelem.i4
-	stloc 4
-// 0x0106a52c: 0x106a52c: sw    v1, 16(sp)
-	ldloc 6
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106a45c: 0x106a45c: jal   0x106a1dc addu  a0, s0, zero
+	ldloc 9
+	stloc.1
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_context_reset_106a1dc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106a464: 0x106a464: j	 0x106a490 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_106a490
+// --- basic block ---
+L_106a46c:
+// 0x0106a46c: 0x106a46c: sw    s1, 14924(v1)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 3731
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
-// 0x0106a530: 0x106a530: lw    v1, 20(v0)
-	ldloc 6
+// 0x0106a470: 0x106a470: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+// 0x0106a474: 0x106a474: cibyl_sysc_arg 0x3
 	ldloc 7
+// 0x0106a478: 0x106a478: cibyl_sysc 0x20da
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 6
+// 0x0106a47c: 0x106a47c: addu  v1, v0, zero
+	ldloc 6
+	stloc 7
+// 0x0106a480: 0x106a480: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106a484: 0x106a484: j	 0x106a490 sw    v1, 24(s0)
+	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106a534: 0x106a534: lw    a1, 40(sp)
-	ldloc 6
+	ldloc 7
+	stelem.i4
+	br L_106a490
+// --- basic block ---
+L_106a48c:
+// 0x0106a48c: 0x106a48c: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+L_106a490:
+// 0x0106a490: 0x106a490: lw    ra, 316(sp)
+// 0x0106a494: 0x106a494: lw    s5, 312(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 78
 	add
 	ldelem.i4
-	stloc.2
-// 0x0106a538: 0x106a538: addiu v1, v1, 1900
+	stloc 14
+// 0x0106a498: 0x106a498: lw    s4, 308(sp)
 	ldloc 5
-	ldc.i4 1900
-	add
-	stloc 5
-// 0x0106a53c: 0x106a53c: sw    v1, 20(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 77
 	add
+	ldelem.i4
+	stloc 12
+// 0x0106a49c: 0x106a49c: lw    s3, 304(sp)
 	ldloc 5
-	stelem.i4
-// 0x0106a540: 0x106a540: lw    a0, 8(v0)
-	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.s 76
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106a544: 0x106a544: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0106a548: 0x106a548: sw    a0, 24(sp)
-	ldloc 6
+	stloc 11
+// 0x0106a4a0: 0x106a4a0: lw    s2, 300(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
-	ldloc.1
-	stelem.i4
-// 0x0106a54c: 0x106a54c: lw    a0, 4(v0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	ldc.i4.s 75
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106a550: 0x106a550: sll   a2, a2, 2
-	ldloc.3
-	ldc.i4.2
-	shl
-	stloc.3
-// 0x0106a554: 0x106a554: addiu v1, v1, 28704
+	stloc 13
+// 0x0106a4a4: 0x106a4a4: lw    s1, 296(sp)
 	ldloc 5
-	ldc.i4 28704
-	add
-	stloc 5
-// 0x0106a558: 0x106a558: sw    a0, 28(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 74
 	add
-	ldloc.1
-	stelem.i4
-// 0x0106a55c: 0x106a55c: addu  v1, a2, v1
-	ldloc.3
-	ldloc 5
-	add
-	stloc 5
-// 0x0106a560: 0x106a560: lw    v0, 0(v0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
 	ldelem.i4
-	stloc 7
-// 0x0106a564: 0x106a564: addu  a0, a1, zero
-	ldloc.2
-	stloc.1
-// 0x0106a568: 0x106a568: lw    a2, 0(v1)
-	ldloc 6
+	stloc 8
+// 0x0106a4a8: 0x106a4a8: lw    s0, 292(sp)
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.3
-// 0x0106a56c: 0x106a56c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106a570: 0x106a570: addiu a1, a1, 20228
-	ldloc.2
-	ldc.i4 20228
-	add
-	stloc.2
-// 0x0106a574: 0x106a574: jal   0x1000f64 sw    v0, 32(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 73
 	add
-	ldloc 7
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 7
-// --- basic block ---
-// 0x0106a57c: 0x106a57c: lw    ra, 52(sp)
-// 0x0106a580: 0x106a580: sll   zero, zero, 0
-// 0x0106a584: 0x106a584: jr    ra addiu sp, sp, 56
+	ldelem.i4
+	stloc 9
+// 0x0106a4ac: 0x106a4ac: jr    ra addiu sp, sp, 320
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4 320
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
-.method public static int32 WDF_TimeFromModifiedSince_106a58c(int32,int32,int32,int32,int32)
+.method public static int32 wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s2,int32 s0,int32 s5,int32 s6,int32 s8,int32 s3,int32 s4,int32 s7,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local 10 is register s0
+// local  8 is register s1
+// local  9 is register s2
+// local 14 is register s3
+// local 15 is register s4
+// local 11 is register s5
+// local 12 is register s6
+// local 16 is register s7
 // local  0 is register sp
-// local  9 is register ra
+// local 13 is register s8
+// local 17 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1913,478 +1379,634 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 16
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 13
+	ldc.i4.s 0
+	stloc 17
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a58c: 0x106a58c: addiu sp, sp, -168
+// 0x0106a4b4: 0x106a4b4: addiu sp, sp, -2328
 	ldloc.0
-	ldc.i4 -168
+	ldc.i4 -2328
 	add
 	stloc.0
-// 0x0106a590: 0x106a590: sw    s0, 160(sp)
+// 0x0106a4b8: 0x106a4b8: sw    s7, 2316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4 579
 	add
-	ldloc 7
+	ldloc 16
 	stelem.i4
-// 0x0106a594: 0x106a594: addiu s0, sp, 16
+// 0x0106a4bc: 0x106a4bc: sw    s6, 2312(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.2
+	shr.un
+	ldc.i4 578
 	add
-	stloc 7
-// 0x0106a598: 0x106a598: sw    ra, 164(sp)
-// 0x0106a59c: 0x106a59c: jal   0x104f748 addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_time_parseGMTString_104f748(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106a5a4: 0x106a5a4: jal   0x106a770 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::mkgmtime_106a770(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106a5ac: 0x106a5ac: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0106a5b0: 0x106a5b0: addiu a1, sp, 52
+	ldloc 12
+	stelem.i4
+// 0x0106a4c0: 0x106a4c0: sw    s4, 2304(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 52
+	ldc.i4.2
+	shr.un
+	ldc.i4 576
 	add
-	stloc.2
-// 0x0106a5b4: 0x106a5b4: jal   0x106a4f4 sw    v0, 152(sp)
+	ldloc 15
+	stelem.i4
+// 0x0106a4c4: 0x106a4c4: sw    s3, 2300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 575
 	add
-	ldloc 5
+	ldloc 14
 	stelem.i4
+// 0x0106a4c8: 0x106a4c8: sw    s1, 2292(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 573
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106a4cc: 0x106a4cc: sw    s0, 2288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106a4d0: 0x106a4d0: sw    ra, 2324(sp)
+// 0x0106a4d4: 0x106a4d4: sw    s8, 2320(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 580
+	add
+	ldloc 13
+	stelem.i4
+// 0x0106a4d8: 0x106a4d8: sw    s5, 2308(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 577
+	add
+	ldloc 11
+	stelem.i4
+// 0x0106a4dc: 0x106a4dc: sw    s2, 2296(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 574
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106a4e0: 0x106a4e0: addu  s7, a0, zero
 	ldloc.1
+	stloc 16
+// 0x0106a4e4: 0x106a4e4: addu  s4, a1, zero
 	ldloc.2
+	stloc 15
+// 0x0106a4e8: 0x106a4e8: addu  s3, a2, zero
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::WDF_FormatHttpDate_106a4f4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106a5bc: 0x106a5bc: lw    ra, 164(sp)
-// 0x0106a5c0: 0x106a5c0: lw    v0, 152(sp)
+	stloc 14
+// 0x0106a4ec: 0x106a4ec: lw    s6, 2344(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 586
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106a5c4: 0x106a5c4: lw    s0, 160(sp)
+	stloc 12
+// 0x0106a4f0: 0x106a4f0: lw    s1, 2352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4 588
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a5c8: 0x106a5c8: jr    ra addiu sp, sp, 168
-	ldloc.0
-	ldc.i4 168
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 WDF_FormatHttpIfModifiedSince_106a5d0(int32,int32,int32,int32,int32)
-{
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
-
-// local  6 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
+	stloc 8
+// 0x0106a4f4: 0x106a4f4: beq   a0, zero, 0x106a644 addu  s0, a3, zero
+	ldloc.1
+	ldloc 4
+	stloc 10
+	brfalse L_106a644
+// --- basic block ---
+// 0x0106a4fc: 0x106a4fc: beq   a1, zero, 0x106a648 addu  v0, zero, zero
+	ldloc.2
 	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
+	stloc 5
+	brfalse L_106a648
+// --- basic block ---
+// 0x0106a504: 0x106a504: lb    v0, 0(a1)
+	ldloc.2
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0106a508: 0x106a508: sll   zero, zero, 0
+// 0x0106a50c: 0x106a50c: beq   v0, zero, 0x106a644 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106a644
+// --- basic block ---
+// 0x0106a514: 0x106a514: beq   a2, zero, 0x106a644 sll   zero, zero, 0
+	ldloc.3
+	brfalse L_106a644
+// --- basic block ---
+// 0x0106a51c: 0x106a51c: beq   a3, zero, 0x106a648 addu  v0, zero, zero
+	ldloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-__CIBYL_javamethod_begin:
+	brfalse L_106a648
 // --- basic block ---
-// 0x0106a5d0: 0x106a5d0: addiu sp, sp, -72
-	ldloc.0
-	ldc.i4.s -72
+// 0x0106a524: 0x106a524: beq   s6, zero, 0x106a648 sll   zero, zero, 0
+	ldloc 12
+	brfalse L_106a648
+// --- basic block ---
+// 0x0106a52c: 0x106a52c: beq   s1, zero, 0x106a648 sll   zero, zero, 0
+	ldloc 8
+	brfalse L_106a648
+// --- basic block ---
+// 0x0106a534: 0x106a534: lb    v0, 0(s1)
+	ldloc 8
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0106a538: 0x106a538: sll   zero, zero, 0
+// 0x0106a53c: 0x106a53c: beq   v0, zero, 0x106a644 addiu v0, a3, -1
+	ldloc 5
+	ldloc 4
+	ldc.i4.m1
 	add
-	stloc.0
-// 0x0106a5d4: 0x106a5d4: sw    s0, 64(sp)
+	stloc 5
+	brfalse L_106a644
+// --- basic block ---
+// 0x0106a544: 0x106a544: sltiu v0, v0, 40
 	ldloc 5
-	ldloc.0
+	ldc.i4.s 40
+	clt.un
+	stloc 5
+// 0x0106a548: 0x106a548: beq   v0, zero, 0x106a644 addiu v0, zero, 1
+	ldloc 5
+	ldc.i4.1
+	stloc 5
+	brfalse L_106a644
+// --- basic block ---
+// 0x0106a550: 0x106a550: beq   a3, v0, 0x106a590 addu  v1, a2, zero
+	ldloc 4
+	ldloc 5
+	ldloc.3
+	stloc 7
+	beq  L_106a590
+// --- basic block ---
+// 0x0106a558: 0x106a558: addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+// 0x0106a55c: 0x106a55c: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_106a560:
+// 0x0106a560: 0x106a560: lw    a1, 0(v1)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldelem.i4
+	stloc.2
+// 0x0106a564: 0x106a564: addiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
 	add
+	stloc 5
+// 0x0106a568: 0x106a568: beq   a1, zero, 0x106a580 slt   a2, v0, s0
+	ldloc.2
+	ldloc 5
+	ldloc 10
+	clt
+	stloc.3
+	brfalse L_106a580
+// --- basic block ---
+// 0x0106a570: 0x106a570: lb    a1, 0(a1)
+	ldloc.2
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc.2
+// 0x0106a574: 0x106a574: sll   zero, zero, 0
+// 0x0106a578: 0x106a578: bne   a1, zero, 0x106a588 sll   zero, zero, 0
+	ldloc.2
+	brtrue L_106a588
+// --- basic block ---
+L_106a580:
+// 0x0106a580: 0x106a580: bne   a0, zero, 0x106a644 addiu a0, zero, 1
+	ldloc.1
+	ldc.i4.1
+	stloc.1
+	brtrue L_106a644
+// --- basic block ---
+L_106a588:
+// 0x0106a588: 0x106a588: bne   a2, zero, 0x106a560 addiu v1, v1, 8
+	ldloc.3
 	ldloc 7
-	stelem.i4
-// 0x0106a5d8: 0x106a5d8: sw    ra, 68(sp)
-// 0x0106a5dc: 0x106a5dc: blez  a0, 0x106a624 addu  s0, a1, zero
+	ldc.i4.8
+	add
+	stloc 7
+	brtrue L_106a560
+// --- basic block ---
+L_106a590:
+// 0x0106a590: 0x106a590: addiu s2, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
+	stloc 9
+// 0x0106a594: 0x106a594: jal   0x10674f4 addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldc.i4.s 0
-	ble L_106a624
+	stloc 5
 // --- basic block ---
-// 0x0106a5e4: 0x106a5e4: addiu a3, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x0106a59c: 0x106a59c: jal   0x1001b48 addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106a5a4: 0x106a5a4: addiu s8, v0, 655
+	ldloc 5
+	ldc.i4 655
 	add
-	stloc 4
-// 0x0106a5e8: 0x106a5e8: addu  a1, a3, zero
+	stloc 13
+// 0x0106a5a8: 0x106a5a8: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x0106a5ac: 0x106a5ac: jal   0x106756c addu  a1, s8, zero
+	ldloc 13
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106a5b4: 0x106a5b4: addu  s5, v0, zero
+	ldloc 5
+	stloc 11
+// 0x0106a5b8: 0x106a5b8: addiu v0, sp, 2356
+	ldloc.0
+	ldc.i4 2356
+	add
+	stloc 5
+// 0x0106a5bc: 0x106a5bc: addu  a1, s8, zero
+	ldloc 13
 	stloc.2
-// 0x0106a5ec: 0x106a5ec: jal   0x106a4f4 sw    a3, 56(sp)
+// 0x0106a5c0: 0x106a5c0: addu  a3, v0, zero
 	ldloc 5
+	stloc 4
+// 0x0106a5c4: 0x106a5c4: addu  a0, s5, zero
+	ldloc 11
+	stloc.1
+// 0x0106a5c8: 0x106a5c8: addu  a2, s1, zero
+	ldloc 8
+	stloc.3
+// 0x0106a5cc: 0x106a5cc: jal   0x10c10b0 sw    v0, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.8
 	add
-	ldloc 4
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::WDF_FormatHttpDate_106a4f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106a5f4: 0x106a5f4: lui   a1, 0x0
+// 0x0106a5d4: 0x106a5d4: bgez  v0, 0x106a60c addu  a1, s4, zero
+	ldloc 5
+	ldloc 15
+	stloc.2
 	ldc.i4.s 0
+	bge L_106a60c
+// --- basic block ---
+// 0x0106a5dc: 0x106a5dc: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0106a5f8: 0x106a5f8: lui   a2, 0x10000
+// 0x0106a5e0: 0x106a5e0: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc.3
-// 0x0106a5fc: 0x106a5fc: lw    a3, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
 	stloc 4
-// 0x0106a600: 0x106a600: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x0106a604: 0x106a604: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x0106a608: 0x106a608: addiu a1, a1, 27816
+// 0x0106a5e4: 0x106a5e4: addiu a1, a1, 18164
 	ldloc.2
-	ldc.i4 27816
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x0106a60c: 0x106a60c: addiu a2, a2, 20264
-	ldloc.3
-	ldc.i4 20264
+// 0x0106a5e8: 0x106a5e8: addiu a3, a3, 20432
+	ldloc 4
+	ldc.i4 20432
 	add
+	stloc 4
+// 0x0106a5ec: 0x106a5ec: addiu a2, zero, 532
+	ldc.i4 532
 	stloc.3
-// 0x0106a610: 0x106a610: addiu v0, v0, 5360
+// 0x0106a5f0: 0x106a5f0: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106a5f4: 0x106a5f4: jal   0x100449c sw    s1, 16(sp)
 	ldloc 6
-	ldc.i4 5360
-	add
-	stloc 6
-// 0x0106a614: 0x106a614: jal   0x1000f64 sw    v0, 16(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x0106a61c: 0x106a61c: j	 0x106a628 sll   zero, zero, 0
-	br L_106a628
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_106a624:
-// 0x0106a624: 0x106a624: sb    zero, 0(a1)
+// 0x0106a5fc: 0x106a5fc: jal   0x1067518 addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106a604: 0x106a604: j	 0x106a648 addu  v0, zero, zero
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_106a628:
-// 0x0106a628: 0x106a628: lw    ra, 68(sp)
-// 0x0106a62c: 0x106a62c: lw    s0, 64(sp)
-	ldloc 5
+	stloc 5
+	br L_106a648
+// --- basic block ---
+L_106a60c:
+// 0x0106a60c: 0x106a60c: lw    v0, 2348(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4 587
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a630: 0x106a630: jr    ra addiu sp, sp, 72
-	ldloc.0
-	ldc.i4.s 72
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 cyclic_buffer_get_unprocessed_data_106a638(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
-
-// local  1 is register v0
-// local  0 is register a0
-// local  2 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
+	stloc 5
+// 0x0106a610: 0x106a610: addu  a0, s7, zero
+	ldloc 16
 	stloc.1
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc.2
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x0106a614: 0x106a614: addu  a2, s3, zero
+	ldloc 14
 	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106a638: 0x106a638: lw    v0, 2056(a0)
-	ldloc 3
+// 0x0106a618: 0x106a618: addu  a3, s0, zero
+	ldloc 10
+	stloc 4
+// 0x0106a61c: 0x106a61c: sw    s6, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 514
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106a63c: 0x106a63c: jr    ra addu  v0, a0, v0
-	ldloc.0
-	ldloc.1
+	ldc.i4.4
 	add
-	stloc.1
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.1
-	ret
-}
-.method public static int32 cyclic_buffer_update_processed_data_106a644(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
-
-// local  6 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106a644: 0x106a644: addiu sp, sp, -24
+	ldloc 12
+	stelem.i4
+// 0x0106a620: 0x106a620: sw    v0, 20(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.0
-// 0x0106a648: 0x106a648: sw    s0, 16(sp)
 	ldloc 5
+	stelem.i4
+// 0x0106a624: 0x106a624: jal   0x106a2cc sw    s5, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 7
+	ldloc 11
 	stelem.i4
-// 0x0106a64c: 0x106a64c: sw    ra, 20(sp)
-// 0x0106a650: 0x106a650: addu  s0, a0, zero
+	ldloc.0
 	ldloc.1
-	stloc 7
-// 0x0106a654: 0x106a654: beq   a2, zero, 0x106a678 addu  v0, a1, zero
-	ldloc.3
 	ldloc.2
-	stloc 6
-	brfalse L_106a678
-// --- basic block ---
-// 0x0106a65c: 0x106a65c: lb    v1, 0(a2)
 	ldloc.3
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 8
-// 0x0106a660: 0x106a660: sll   zero, zero, 0
-// 0x0106a664: 0x106a664: beq   v1, zero, 0x106a678 addu  a0, a1, zero
-	ldloc 8
-	ldloc.2
-	stloc.1
-	brfalse L_106a678
+	ldloc 4
+	call int32 Cibyl79::wst_start_trans__int_106a2cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106a66c: 0x106a66c: addu  a1, a2, zero
-	ldloc.3
-	stloc.2
-// 0x0106a670: 0x106a670: jal   0x10681a8 addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
+// 0x0106a62c: 0x106a62c: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x0106a630: 0x106a630: jal   0x1067518 sw    v0, 2280(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 570
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::EatChars_10681a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_106a678:
-// 0x0106a678: 0x106a678: lw    ra, 20(sp)
-// 0x0106a67c: 0x106a67c: subu  v0, v0, s0
+// 0x0106a638: 0x106a638: lw    v0, 2280(sp)
 	ldloc 6
-	ldloc 7
-	sub
-	stloc 6
-// 0x0106a680: 0x106a680: sw    v0, 2056(s0)
-	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 514
+	ldc.i4 570
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106a63c: 0x106a63c: j	 0x106a648 sll   zero, zero, 0
+	br L_106a648
+// --- basic block ---
+L_106a644:
+// 0x0106a644: 0x106a644: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_106a648:
+// 0x0106a648: 0x106a648: lw    ra, 2324(sp)
+// 0x0106a64c: 0x106a64c: lw    s8, 2320(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 580
 	add
+	ldelem.i4
+	stloc 13
+// 0x0106a650: 0x106a650: lw    s7, 2316(sp)
 	ldloc 6
-	stelem.i4
-// 0x0106a684: 0x106a684: lw    s0, 16(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 579
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a688: 0x106a688: jr    ra addiu sp, sp, 24
+	stloc 16
+// 0x0106a654: 0x106a654: lw    s6, 2312(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 578
+	add
+	ldelem.i4
+	stloc 12
+// 0x0106a658: 0x106a658: lw    s5, 2308(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 577
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106a65c: 0x106a65c: lw    s4, 2304(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 576
+	add
+	ldelem.i4
+	stloc 15
+// 0x0106a660: 0x106a660: lw    s3, 2300(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 575
+	add
+	ldelem.i4
+	stloc 14
+// 0x0106a664: 0x106a664: lw    s2, 2296(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 574
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106a668: 0x106a668: lw    s1, 2292(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 573
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106a66c: 0x106a66c: lw    s0, 2288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106a670: 0x106a670: jr    ra addiu sp, sp, 2328
+	ldloc.0
+	ldc.i4 2328
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 cyclic_buffer_recycle_106a690(int32,int32,int32,int32,int32)
+.method public static int32 wst_process_queue_item_106a678(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s3,int32 v1,int32 s1,int32 s4,int32 s0,int32 s2,int32 ra)
 
 // local  6 is register v0
-// local  9 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
+// local 11 is register s0
+// local  9 is register s1
+// local 12 is register s2
+// local  7 is register s3
+// local 10 is register s4
 // local  0 is register sp
-// local 10 is register ra
+// local 13 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2394,271 +2016,372 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a690: 0x106a690: addiu sp, sp, -32
+// 0x0106a678: 0x106a678: addiu sp, sp, -80
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -80
 	add
 	stloc.0
-// 0x0106a694: 0x106a694: lw    v0, 2064(a0)
+// 0x0106a67c: 0x106a67c: sw    s4, 72(sp)
 	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 516
+	ldc.i4.s 18
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106a698: 0x106a698: lw    a1, 2056(a0)
+	ldloc 10
+	stelem.i4
+// 0x0106a680: 0x106a680: addiu s4, a0, 28
+	ldloc.1
+	ldc.i4.s 28
+	add
+	stloc 10
+// 0x0106a684: 0x106a684: sw    s2, 64(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 12
+	stelem.i4
+// 0x0106a688: 0x106a688: sw    zero, 0(a1)
 	ldloc 5
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106a68c: 0x106a68c: addu  s2, a0, zero
 	ldloc.1
+	stloc 12
+// 0x0106a690: 0x106a690: addu  a0, s4, zero
+	ldloc 10
+	stloc.1
+// 0x0106a694: 0x106a694: sw    s3, 68(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 514
+	ldc.i4.s 17
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106a69c: 0x106a69c: sw    s1, 24(sp)
+	ldloc 7
+	stelem.i4
+// 0x0106a698: 0x106a698: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 14
 	add
-	ldloc 8
+	ldloc 11
 	stelem.i4
-// 0x0106a6a0: 0x106a6a0: lw    s1, 2052(a0)
+// 0x0106a69c: 0x106a69c: sw    ra, 76(sp)
+// 0x0106a6a0: 0x106a6a0: sw    s1, 60(sp)
 	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 513
+	ldc.i4.s 15
 	add
-	ldelem.i4
+	ldloc 9
+	stelem.i4
+// 0x0106a6a4: 0x106a6a4: jal   0x1068c84 addu  s0, a1, zero
+	ldloc.2
+	stloc 11
+	ldloc.1
+	call int32 Cibyl77::wstq_is_empty_1068c84(int32)
+	stloc 6
+// --- basic block ---
+// 0x0106a6ac: 0x106a6ac: bne   v0, zero, 0x106a730 addiu s3, zero, 1
+	ldloc 6
+	ldc.i4.1
+	stloc 7
+	brtrue L_106a730
+// --- basic block ---
+// 0x0106a6b4: 0x106a6b4: addiu s1, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 9
+// 0x0106a6b8: 0x106a6b8: addu  a0, s4, zero
+	ldloc 10
+	stloc.1
+// 0x0106a6bc: 0x106a6bc: jal   0x1068dec addu  a1, s1, zero
+	ldloc 9
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::wstq_dequeue_1068dec(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-// 0x0106a6a4: 0x106a6a4: addu  v0, v0, a1
+	stloc 6
+// --- basic block ---
+// 0x0106a6c4: 0x106a6c4: bne   v0, zero, 0x106a6ec lui   a1, 0x10000
 	ldloc 6
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106a6ec
+// --- basic block ---
+// 0x0106a6cc: 0x106a6cc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106a6d0: 0x106a6d0: addiu a1, a1, 18164
 	ldloc.2
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x0106a6d4: 0x106a6d4: addiu a3, a3, 20508
+	ldloc 4
+	ldc.i4 20508
 	add
+	stloc 4
+// 0x0106a6d8: 0x106a6d8: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106a6dc: 0x106a6dc: jal   0x100449c addiu a2, zero, 258
+	ldc.i4 258
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
-// 0x0106a6a8: 0x106a6a8: sw    s0, 20(sp)
+// --- basic block ---
+// 0x0106a6e4: 0x106a6e4: j	 0x106a730 addu  s3, zero, zero
+	ldc.i4.s 0
+	stloc 7
+	br L_106a730
+// --- basic block ---
+L_106a6ec:
+// 0x0106a6ec: 0x106a6ec: lw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 11
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106a6ac: 0x106a6ac: sw    ra, 28(sp)
-// 0x0106a6b0: 0x106a6b0: addu  s0, a0, zero
-	ldloc.1
-	stloc 7
-// 0x0106a6b4: 0x106a6b4: bne   a1, s1, 0x106a6d4 sw    v0, 2064(a0)
-	ldloc.2
-	ldloc 8
+	ldelem.i4
+	stloc 6
+// 0x0106a6f0: 0x106a6f0: lw    a1, 32(sp)
 	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 516
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106a6f4: 0x106a6f4: sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
 	ldloc 6
 	stelem.i4
-	bne.un L_106a6d4
-// --- basic block ---
-// 0x0106a6bc: 0x106a6bc: addiu v0, zero, 2048
-	ldc.i4 2048
+// 0x0106a6f8: 0x106a6f8: lw    v0, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
 	stloc 6
-// 0x0106a6c0: 0x106a6c0: sw    v0, 2072(a0)
+// 0x0106a6fc: 0x106a6fc: lw    a2, 36(sp)
 	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 518
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc.3
+// 0x0106a700: 0x106a700: sw    v0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106a6c4: 0x106a6c4: sw    zero, 2052(a0)
+// 0x0106a704: 0x106a704: lw    a3, 40(sp)
 	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 513
+	ldc.i4.s 10
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106a6c8: 0x106a6c8: sb    zero, 0(a0)
-	ldloc.1
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106a6cc: 0x106a6cc: j	 0x106a70c sw    a0, 2068(s0)
+	ldelem.i4
+	stloc 4
+// 0x0106a708: 0x106a708: lw    v0, 52(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 517
+	ldc.i4.s 13
 	add
-	ldloc.1
+	ldelem.i4
+	stloc 6
+// 0x0106a70c: 0x106a70c: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0106a710: 0x106a710: jal   0x106a4b4 sw    v0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 6
 	stelem.i4
-	br L_106a70c
-// --- basic block ---
-L_106a6d4:
-// 0x0106a6d4: 0x106a6d4: beq   a1, zero, 0x106a6f4 subu  s1, s1, a1
-	ldloc.2
-	ldloc 8
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	sub
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	brfalse L_106a6f4
+	stloc 6
 // --- basic block ---
-// 0x0106a6dc: 0x106a6dc: addu  a2, s1, zero
-	ldloc 8
-	stloc.3
-// 0x0106a6e0: 0x106a6e0: jal   0x100186c addu  a1, a0, a1
-	ldloc.1
-	ldloc.2
-	add
-	stloc.2
+// 0x0106a718: 0x106a718: addu  s3, v0, zero
+	ldloc 6
+	stloc 7
+// 0x0106a71c: 0x106a71c: jal   0x1068ef4 addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memmove_100186c(int32,int32,int32,int32)
+	call int32 Cibyl78::wstq_item_release_1068ef4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0106a6e8: 0x106a6e8: addu  v0, s0, s1
+// 0x0106a724: 0x106a724: beq   s3, zero, 0x106a730 addiu v0, zero, 1
 	ldloc 7
-	ldloc 8
-	add
+	ldc.i4.1
 	stloc 6
-// 0x0106a6ec: 0x106a6ec: sb    zero, 0(v0)
-	ldloc 6
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106a6f0: 0x106a6f0: sw    s1, 2052(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 513
-	add
-	ldloc 8
-	stelem.i4
-L_106a6f4:
-// 0x0106a6f4: 0x106a6f4: lw    v0, 2052(s0)
+	brfalse L_106a730
+// --- basic block ---
+// 0x0106a72c: 0x106a72c: sw    v0, 0(s0)
 	ldloc 5
-	ldloc 7
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 513
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106a6f8: 0x106a6f8: addiu v1, zero, 2048
-	ldc.i4 2048
-	stloc 9
-// 0x0106a6fc: 0x106a6fc: subu  v1, v1, v0
-	ldloc 9
 	ldloc 6
-	sub
-	stloc 9
-// 0x0106a700: 0x106a700: addu  v0, s0, v0
+	stelem.i4
+L_106a730:
+// 0x0106a730: 0x106a730: lw    ra, 76(sp)
+// 0x0106a734: 0x106a734: addu  v0, s3, zero
 	ldloc 7
-	ldloc 6
-	add
 	stloc 6
-// 0x0106a704: 0x106a704: sw    v0, 2068(s0)
+// 0x0106a738: 0x106a738: lw    s4, 72(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 517
+	ldc.i4.s 18
 	add
-	ldloc 6
-	stelem.i4
-// 0x0106a708: 0x106a708: sw    v1, 2072(s0)
+	ldelem.i4
+	stloc 10
+// 0x0106a73c: 0x106a73c: lw    s3, 68(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 518
+	ldc.i4.s 17
 	add
-	ldloc 9
-	stelem.i4
-L_106a70c:
-// 0x0106a70c: 0x106a70c: lw    ra, 28(sp)
-// 0x0106a710: 0x106a710: sw    zero, 2056(s0)
+	ldelem.i4
+	stloc 7
+// 0x0106a740: 0x106a740: lw    s2, 64(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 514
+	ldc.i4.s 16
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106a714: 0x106a714: lw    s1, 24(sp)
+	ldelem.i4
+	stloc 12
+// 0x0106a744: 0x106a744: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 15
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106a718: 0x106a718: lw    s0, 20(sp)
+	stloc 9
+// 0x0106a748: 0x106a748: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106a71c: 0x106a71c: jr    ra addiu sp, sp, 32
+	stloc 11
+// 0x0106a74c: 0x106a74c: jr    ra addiu sp, sp, 80
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 80
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 cyclic_buffer_init_106a724(int32,int32,int32,int32,int32)
+.method public static int32 wst_context_init_106a754(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  7 is register v0
-// local  9 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  5 is register s0
 // local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2672,25 +2395,24 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a724: 0x106a724: addiu sp, sp, -24
+// 0x0106a754: 0x106a754: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106a728: 0x106a728: addu  a1, zero, zero
+// 0x0106a758: 0x106a758: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0106a72c: 0x106a72c: addiu a2, zero, 2049
-	ldc.i4 2049
+// 0x0106a75c: 0x106a75c: addiu a2, zero, 4508
+	ldc.i4 4508
 	stloc.3
-// 0x0106a730: 0x106a730: sw    ra, 20(sp)
-// 0x0106a734: 0x106a734: sw    s0, 16(sp)
-	ldloc 6
+// 0x0106a760: 0x106a760: sw    s0, 16(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -2698,7 +2420,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106a738: 0x106a738: jal   0x100177c addu  s0, a0, zero
+// 0x0106a764: 0x106a764: sw    ra, 20(sp)
+// 0x0106a768: 0x106a768: jal   0x100177c addu  s0, a0, zero
 	ldloc.1
 	stloc 5
 	ldloc.1
@@ -2707,72 +2430,57 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x0106a740: 0x106a740: addiu v0, zero, 2048
-	ldc.i4 2048
-	stloc 7
-// 0x0106a744: 0x106a744: lw    ra, 20(sp)
-// 0x0106a748: 0x106a748: sw    v0, 2072(s0)
-	ldloc 6
+// 0x0106a770: 0x106a770: jal   0x1068dac addiu a0, s0, 28
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 518
+	ldc.i4.s 28
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106a74c: 0x106a74c: addiu v0, zero, -1
-	ldc.i4.m1
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::wstq_init_1068dac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x0106a750: 0x106a750: sw    v0, 2060(s0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 515
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106a754: 0x106a754: sw    zero, 2052(s0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 513
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106a758: 0x106a758: sw    zero, 2056(s0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 514
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106a75c: 0x106a75c: sw    zero, 2064(s0)
-	ldloc 6
+	stloc 6
+// --- basic block ---
+// 0x0106a778: 0x106a778: jal   0x10674f4 addiu a0, s0, 160
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 516
+	ldc.i4 160
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106a760: 0x106a760: sw    s0, 2068(s0)
-	ldloc 6
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106a780: 0x106a780: jal   0x106ad48 addiu a0, s0, 2404
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 517
+	ldc.i4 2404
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106a764: 0x106a764: lw    s0, 16(sp)
-	ldloc 6
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::cyclic_buffer_init_106ad48(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106a788: 0x106a788: lw    ra, 20(sp)
+// 0x0106a78c: 0x106a78c: lw    s0, 16(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -2780,46 +2488,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106a768: 0x106a768: jr    ra addiu sp, sp, 24
+// 0x0106a790: 0x106a790: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
-.method public static int32 mkgmtime_106a770(int32,int32,int32,int32,int32)
+.method public static int32 wst_init_106a798(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
 
-// local  6 is register v0
-// local  8 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local 10 is register s1
-// local  9 is register s2
-// local 11 is register s3
-// local 12 is register s4
-// local 13 is register s5
-// local 14 is register s6
-// local 15 is register s7
+// local  8 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local 16 is register s8
-// local 17 is register ra
-// local  5 is register mem
+// local 10 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2829,594 +2530,766 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 17
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a770: 0x106a770: addiu sp, sp, -104
+// 0x0106a798: 0x106a798: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.s -104
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0106a774: 0x106a774: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106a778: 0x106a778: addiu a2, zero, 36
-	ldc.i4.s 36
-	stloc.3
-// 0x0106a77c: 0x106a77c: addiu a0, sp, 20
-	ldloc.0
-	ldc.i4.s 20
-	add
-	stloc.1
-// 0x0106a780: 0x106a780: sw    s8, 96(sp)
-	ldloc 5
+// 0x0106a79c: 0x106a79c: sw    s1, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.s 10
 	add
-	ldloc 16
+	ldloc 9
 	stelem.i4
-// 0x0106a784: 0x106a784: sw    s7, 92(sp)
-	ldloc 5
+// 0x0106a7a0: 0x106a7a0: sw    s0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.s 9
 	add
-	ldloc 15
+	ldloc 8
 	stelem.i4
-// 0x0106a788: 0x106a788: sw    s6, 88(sp)
+// 0x0106a7a4: 0x106a7a4: sw    ra, 44(sp)
+// 0x0106a7a8: 0x106a7a8: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x0106a7ac: 0x106a7ac: beq   a0, zero, 0x106a808 addu  s1, a1, zero
+	ldloc.1
+	ldloc.2
+	stloc 9
+	brfalse L_106a808
+// --- basic block ---
+// 0x0106a7b4: 0x106a7b4: lb    v0, 0(a0)
+	ldloc.1
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0106a7b8: 0x106a7b8: sll   zero, zero, 0
+// 0x0106a7bc: 0x106a7bc: beq   v0, zero, 0x106a80c addu  v0, zero, zero
 	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_106a80c
+// --- basic block ---
+// 0x0106a7c4: 0x106a7c4: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0106a7c8: 0x106a7c8: addiu a2, sp, 16
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
+	ldc.i4.s 16
 	add
-	ldloc 14
-	stelem.i4
-// 0x0106a78c: 0x106a78c: sw    s5, 84(sp)
+	stloc.3
+// 0x0106a7cc: 0x106a7cc: jal   0x1068a98 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::WSA_ExtractParams_1068a98(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106a7d4: 0x106a7d4: beq   v0, zero, 0x106a808 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106a808
+// --- basic block ---
+// 0x0106a7dc: 0x106a7dc: jal   0x1000910 addiu a0, zero, 4508
+	ldc.i4 4508
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106a7e4: 0x106a7e4: addu  a0, v0, zero
 	ldloc 5
+	stloc.1
+// 0x0106a7e8: 0x106a7e8: jal   0x106a754 sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.6
 	add
-	ldloc 13
-	stelem.i4
-// 0x0106a790: 0x106a790: sw    s3, 76(sp)
 	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_context_init_106a754(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106a7f0: 0x106a7f0: lw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.6
 	add
-	ldloc 11
-	stelem.i4
-// 0x0106a794: 0x106a794: sw    s0, 64(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x0106a7f4: 0x106a7f4: lw    v1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.4
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106a798: 0x106a798: sw    ra, 100(sp)
-// 0x0106a79c: 0x106a79c: sw    s4, 80(sp)
+	ldelem.i4
+	stloc 7
+// 0x0106a7f8: 0x106a7f8: sw    s0, 0(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 12
+	ldloc 8
 	stelem.i4
-// 0x0106a7a0: 0x106a7a0: sw    s2, 72(sp)
+// 0x0106a7fc: 0x106a7fc: sw    s1, 4(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.1
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106a7a4: 0x106a7a4: sw    s1, 68(sp)
+// 0x0106a800: 0x106a800: j	 0x106a80c sw    v1, 8(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.2
 	add
-	ldloc 10
+	ldloc 7
 	stelem.i4
-// 0x0106a7a8: 0x106a7a8: jal   0x1001800 addu  s0, zero, zero
-	ldc.i4.s 0
-	stloc 7
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
+	br L_106a80c
 // --- basic block ---
-// 0x0106a7b0: 0x106a7b0: lw    s3, 20(sp)
-	ldloc 5
+L_106a808:
+// 0x0106a808: 0x106a808: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_106a80c:
+// 0x0106a80c: 0x106a80c: lw    ra, 44(sp)
+// 0x0106a810: 0x106a810: lw    s1, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 11
-// 0x0106a7b4: 0x106a7b4: lw    v1, 40(sp)
-	ldloc 5
+	stloc 9
+// 0x0106a814: 0x106a814: lw    s0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 9
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106a7b8: 0x106a7b8: lw    s8, 36(sp)
-	ldloc 5
+// 0x0106a818: 0x106a818: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 48
 	add
-	ldelem.i4
-	stloc 16
-// 0x0106a7bc: 0x106a7bc: lw    s7, 32(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldloc.0
+	ret
+}
+.method public static int32 wst_context_free_106a820(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  5 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 5
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106a820: 0x106a820: lw    v0, 20(a0)
+	ldloc 6
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 15
-// 0x0106a7c0: 0x106a7c0: lw    s6, 28(sp)
-	ldloc 5
+	stloc 7
+// 0x0106a824: 0x106a824: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 14
-// 0x0106a7c4: 0x106a7c4: lw    s5, 24(sp)
-	ldloc 5
+	stloc.0
+// 0x0106a828: 0x106a828: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 13
-// 0x0106a7c8: 0x106a7c8: j	 0x106a7d4 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-	br L_106a7d4
-// --- basic block ---
-L_106a7d0:
-// 0x0106a7d0: 0x106a7d0: sll   v0, v0, 1
-	ldloc 6
-	ldc.i4.1
-	shl
-	stloc 6
-L_106a7d4:
-// 0x0106a7d4: 0x106a7d4: bgtz  v0, 0x106a7d0 addiu s0, s0, 1
-	ldloc 6
+	ldloc 5
+	stelem.i4
+// 0x0106a82c: 0x106a82c: sw    ra, 20(sp)
+// 0x0106a830: 0x106a830: beq   v0, zero, 0x106a848 addu  s0, a0, zero
 	ldloc 7
-	ldc.i4.1
-	add
-	stloc 7
-	ldc.i4.s 0
-	bgt L_106a7d0
+	ldloc.1
+	stloc 5
+	brfalse L_106a848
 // --- basic block ---
-// 0x0106a7dc: 0x106a7dc: addiu s0, s0, -1
-	ldloc 7
-	ldc.i4.m1
-	add
-	stloc 7
-// 0x0106a7e0: 0x106a7e0: bne   v0, zero, 0x106a7f0 addu  a0, zero, zero
+// 0x0106a838: 0x106a838: lw    a0, 12(a0)
 	ldloc 6
-	ldc.i4.s 0
-	stloc.1
-	brtrue L_106a7f0
-// --- basic block ---
-// 0x0106a7e8: 0x106a7e8: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106a7ec: 0x106a7ec: sllv  a0, s0, a0
 	ldloc.1
-	ldloc 7
-	shl
-	stloc.1
-L_106a7f0:
-// 0x0106a7f0: 0x106a7f0: slti  v0, s0, 41
-	ldloc 7
-	ldc.i4.s 41
-	clt
-	stloc 6
-// 0x0106a7f4: 0x106a7f4: bne   v0, zero, 0x106a800 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_106a800
-// --- basic block ---
-// 0x0106a7fc: 0x106a7fc: addiu s0, zero, 40
-	ldc.i4.s 40
-	stloc 7
-L_106a800:
-// 0x0106a800: 0x106a800: sw    a0, 16(sp)
-	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc.1
-	stelem.i4
-// 0x0106a804: 0x106a804: addiu s4, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.3
 	add
-	stloc 12
-// 0x0106a808: 0x106a808: addiu s2, zero, -1
-	ldc.i4.m1
-	stloc 9
-// 0x0106a80c: 0x106a80c: addiu s1, zero, 1
-	ldc.i4.1
-	stloc 10
-L_106a810:
-// 0x0106a810: 0x106a810: addu  a0, s4, zero
-	ldloc 12
+	ldelem.i4
 	stloc.1
-// 0x0106a814: 0x106a814: jal   0x10c34cc sw    v1, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 8
-	stelem.i4
+// 0x0106a83c: 0x106a83c: jal   0x1067854 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::gmtime_10c34cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::socket_async_receive_end_1067854(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-// 0x0106a81c: 0x106a81c: lw    v1, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106a820: 0x106a820: beq   v0, zero, 0x106a8e4 sll   zero, zero, 0
+// 0x0106a844: 0x106a844: sw    zero, 20(s0)
 	ldloc 6
-	brfalse L_106a8e4
-// --- basic block ---
-// 0x0106a828: 0x106a828: lw    a0, 20(v0)
 	ldloc 5
-	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106a82c: 0x106a82c: sll   zero, zero, 0
-// 0x0106a830: 0x106a830: subu  a0, a0, v1
-	ldloc.1
-	ldloc 8
-	sub
-	stloc.1
-// 0x0106a834: 0x106a834: bne   a0, zero, 0x106a89c sll   zero, zero, 0
-	ldloc.1
-	brtrue L_106a89c
-// --- basic block ---
-// 0x0106a83c: 0x106a83c: lw    a0, 16(v0)
-	ldloc 5
+	ldc.i4.s 0
+	stelem.i4
+L_106a848:
+// 0x0106a848: 0x106a848: lw    a0, 12(s0)
 	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.3
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106a840: 0x106a840: sll   zero, zero, 0
-// 0x0106a844: 0x106a844: subu  a0, a0, s8
+// 0x0106a84c: 0x106a84c: sll   zero, zero, 0
+// 0x0106a850: 0x106a850: beq   a0, zero, 0x106a864 sll   zero, zero, 0
 	ldloc.1
-	ldloc 16
-	sub
-	stloc.1
-// 0x0106a848: 0x106a848: bne   a0, zero, 0x106a89c sll   zero, zero, 0
+	brfalse L_106a864
+// --- basic block ---
+// 0x0106a858: 0x106a858: jal   0x1051b00 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
-	brtrue L_106a89c
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl60::roadmap_net_close_1051b00(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0106a850: 0x106a850: lw    a0, 12(v0)
-	ldloc 5
+// 0x0106a860: 0x106a860: sw    zero, 12(s0)
 	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.3
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106a854: 0x106a854: sll   zero, zero, 0
-// 0x0106a858: 0x106a858: subu  a0, a0, s7
-	ldloc.1
-	ldloc 15
-	sub
-	stloc.1
-// 0x0106a85c: 0x106a85c: bne   a0, zero, 0x106a89c sll   zero, zero, 0
-	ldloc.1
-	brtrue L_106a89c
-// --- basic block ---
-// 0x0106a864: 0x106a864: lw    a0, 8(v0)
+	ldc.i4.s 0
+	stelem.i4
+L_106a864:
+// 0x0106a864: 0x106a864: jal   0x1067518 addiu a0, s0, 160
 	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
+	ldc.i4 160
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106a868: 0x106a868: sll   zero, zero, 0
-// 0x0106a86c: 0x106a86c: subu  a0, a0, s6
-	ldloc.1
-	ldloc 14
-	sub
 	stloc.1
-// 0x0106a870: 0x106a870: bne   a0, zero, 0x106a89c sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
-	brtrue L_106a89c
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0106a878: 0x106a878: lw    a0, 4(v0)
+// 0x0106a86c: 0x106a86c: jal   0x1068f34 addiu a0, s0, 28
 	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	ldc.i4.s 28
 	add
-	ldelem.i4
 	stloc.1
-// 0x0106a87c: 0x106a87c: sll   zero, zero, 0
-// 0x0106a880: 0x106a880: subu  a0, a0, s5
+	ldloc.0
 	ldloc.1
-	ldloc 13
-	sub
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl78::wstq_clear_1068f34(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x0106a874: 0x106a874: jal   0x106a754 addu  a0, s0, zero
+	ldloc 5
 	stloc.1
-// 0x0106a884: 0x106a884: bne   a0, zero, 0x106a89c sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
-	brtrue L_106a89c
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_context_init_106a754(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0106a88c: 0x106a88c: lw    a0, 0(v0)
-	ldloc 5
+// 0x0106a87c: 0x106a87c: lw    ra, 20(sp)
+// 0x0106a880: 0x106a880: lw    s0, 16(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0106a890: 0x106a890: sll   zero, zero, 0
-// 0x0106a894: 0x106a894: beq   a0, zero, 0x106a8d8 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_106a8d8
-// --- basic block ---
-L_106a89c:
-// 0x0106a89c: 0x106a89c: beq   s0, s2, 0x106a8e4 addiu s0, s0, -1
-	ldloc 7
-	ldloc 9
-	ldloc 7
-	ldc.i4.m1
+	ldc.i4.4
 	add
-	stloc 7
-	beq  L_106a8e4
-// --- basic block ---
-// 0x0106a8a4: 0x106a8a4: bne   s0, s2, 0x106a8b8 sll   zero, zero, 0
+	ldelem.i4
+	stloc 5
+// 0x0106a884: 0x106a884: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
-	ldloc 9
-	bne.un L_106a8b8
+	ret
+}
+.method public static int32 wst_transaction_completed_106a88c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 ra)
+
+// local  6 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a8ac: 0x106a8ac: lw    v0, 16(sp)
+// 0x0106a88c: 0x106a88c: lw    v0, 4504(a0)
 	ldloc 5
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 1126
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106a8b0: 0x106a8b0: j	 0x106a8d0 addiu v0, v0, -1
-	ldloc 6
-	ldc.i4.m1
+// 0x0106a890: 0x106a890: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
 	add
-	stloc 6
-	br L_106a8d0
-// --- basic block ---
-L_106a8b8:
-// 0x0106a8b8: 0x106a8b8: lw    v0, 16(sp)
+	stloc.0
+// 0x0106a894: 0x106a894: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106a8bc: 0x106a8bc: blez  a0, 0x106a8cc sllv  a0, s0, s1
-	ldloc.1
 	ldloc 10
-	ldloc 7
-	shl
-	stloc.1
-	ldc.i4.s 0
-	ble L_106a8cc
-// --- basic block ---
-// 0x0106a8c4: 0x106a8c4: j	 0x106a8d0 subu  v0, v0, a0
-	ldloc 6
-	ldloc.1
-	sub
-	stloc 6
-	br L_106a8d0
-// --- basic block ---
-L_106a8cc:
-// 0x0106a8cc: 0x106a8cc: addu  v0, v0, a0
-	ldloc 6
-	ldloc.1
-	add
-	stloc 6
-L_106a8d0:
-// 0x0106a8d0: 0x106a8d0: j	 0x106a810 sw    v0, 16(sp)
+	stelem.i4
+// 0x0106a898: 0x106a898: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldloc 6
+	ldloc 9
 	stelem.i4
-	br L_106a810
-// --- basic block ---
-L_106a8d8:
-// 0x0106a8d8: 0x106a8d8: lw    v0, 16(sp)
+// 0x0106a89c: 0x106a89c: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106a8a0: 0x106a8a0: sw    ra, 36(sp)
+// 0x0106a8a4: 0x106a8a4: lw    s1, 4492(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 1123
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106a8dc: 0x106a8dc: j	 0x106a8e8 addu  v0, s3, v0
-	ldloc 11
+	stloc 9
+// 0x0106a8a8: 0x106a8a8: lw    s2, 156(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 39
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106a8ac: 0x106a8ac: beq   v0, zero, 0x106a8e8 addu  s0, a0, zero
 	ldloc 6
+	ldloc.1
+	stloc 7
+	brfalse L_106a8e8
+// --- basic block ---
+// 0x0106a8b4: 0x106a8b4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106a8b8: 0x106a8b8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106a8bc: 0x106a8bc: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x0106a8c0: 0x106a8c0: addiu a3, a3, 20564
+	ldloc 4
+	ldc.i4 20564
 	add
+	stloc 4
+// 0x0106a8c4: 0x106a8c4: addiu a2, zero, 289
+	ldc.i4 289
+	stloc.3
+// 0x0106a8c8: 0x106a8c8: jal   0x100449c addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
-	br L_106a8e8
 // --- basic block ---
-L_106a8e4:
-// 0x0106a8e4: 0x106a8e4: addiu v0, zero, -1
-	ldc.i4.m1
+// 0x0106a8d0: 0x106a8d0: jal   0x106a820 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_context_free_106a820(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x0106a8d8: 0x106a8d8: jal   0x1000930 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
+// --- basic block ---
+// 0x0106a8e0: 0x106a8e0: j	 0x106a94c sll   zero, zero, 0
+	br L_106a94c
+// --- basic block ---
 L_106a8e8:
-// 0x0106a8e8: 0x106a8e8: lw    ra, 100(sp)
-// 0x0106a8ec: 0x106a8ec: lw    s8, 96(sp)
+// 0x0106a8e8: 0x106a8e8: lw    v0, 20(a0)
 	ldloc 5
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 16
-// 0x0106a8f0: 0x106a8f0: lw    s7, 92(sp)
+	stloc 6
+// 0x0106a8ec: 0x106a8ec: sll   zero, zero, 0
+// 0x0106a8f0: 0x106a8f0: beq   v0, zero, 0x106a90c sll   zero, zero, 0
+	ldloc 6
+	brfalse L_106a90c
+// --- basic block ---
+// 0x0106a8f8: 0x106a8f8: lw    a0, 12(a0)
 	ldloc 5
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 15
-// 0x0106a8f4: 0x106a8f4: lw    s6, 88(sp)
+	stloc.1
+// 0x0106a8fc: 0x106a8fc: jal   0x1067854 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 14
-// 0x0106a8f8: 0x106a8f8: lw    s5, 84(sp)
+	ldloc.2
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::socket_async_receive_end_1067854(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x0106a904: 0x106a904: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 13
-// 0x0106a8fc: 0x106a8fc: lw    s4, 80(sp)
+	stloc.2
+// 0x0106a908: 0x106a908: sw    zero, 20(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.5
+	add
+	ldc.i4.s 0
+	stelem.i4
+L_106a90c:
+// 0x0106a90c: 0x106a90c: lw    a0, 12(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 12
-// 0x0106a900: 0x106a900: lw    s3, 76(sp)
+	stloc.1
+// 0x0106a910: 0x106a910: sll   zero, zero, 0
+// 0x0106a914: 0x106a914: beq   a0, zero, 0x106a92c sll   zero, zero, 0
+	ldloc.1
+	brfalse L_106a92c
+// --- basic block ---
+// 0x0106a91c: 0x106a91c: jal   0x1051b00 sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 11
-// 0x0106a904: 0x106a904: lw    s2, 72(sp)
+	ldloc.2
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl60::roadmap_net_close_1051b00(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x0106a924: 0x106a924: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106a908: 0x106a908: lw    s1, 68(sp)
+	stloc.2
+// 0x0106a928: 0x106a928: sw    zero, 12(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldc.i4.s 0
+	stelem.i4
+L_106a92c:
+// 0x0106a92c: 0x106a92c: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x0106a930: 0x106a930: jal   0x106a1dc sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 10
-// 0x0106a90c: 0x106a90c: lw    s0, 64(sp)
+	ldloc.2
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_context_reset_106a1dc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x0106a938: 0x106a938: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106a93c: 0x106a93c: beq   s1, zero, 0x106a94c sll   zero, zero, 0
+	ldloc 9
+	brfalse L_106a94c
+// --- basic block ---
+// 0x0106a944: 0x106a944: jalr  s1 addu  a0, s2, zero
+	ldloc 9
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+L_106a94c:
+// 0x0106a94c: 0x106a94c: lw    ra, 36(sp)
+// 0x0106a950: 0x106a950: lw    s2, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106a954: 0x106a954: lw    s1, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106a958: 0x106a958: lw    s0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106a910: 0x106a910: jr    ra addiu sp, sp, 104
+// 0x0106a95c: 0x106a95c: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 104
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3426,353 +3299,357 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 Realtime_NotifyOnLoginChanged_106a9fc(int32)
+.method public static int32 on_data_received_106a964(int32,int32,int32,int32,int32)
 {
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
 
-// local  1 is register v0
-// local  2 is register v1
-// local  0 is register a0
-// local  3 is register ra
-// local  4 is register mem
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.1
+	stloc 5
 	ldc.i4.s 0
-	stloc.2
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc.3
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 4
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106a9fc: 0x106a9fc: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc.2
-// 0x0106aa00: 0x106aa00: lw    v0, 17580(v1)
-	ldloc 4
-	ldloc.2
+// 0x0106a964: 0x106a964: lw    v0, 4464(a2)
+	ldloc 6
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 4395
+	ldc.i4 1116
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106aa04: 0x106aa04: sll   zero, zero, 0
-// 0x0106aa08: 0x106aa08: bne   v0, a0, 0x106aa18 sll   zero, zero, 0
-	ldloc.1
+	stloc 5
+// 0x0106a968: 0x106a968: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106a96c: 0x106a96c: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 8
+// 0x0106a970: 0x106a970: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
-	bne.un L_106aa18
-// --- basic block ---
-// 0x0106aa10: 0x106aa10: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	br __CIBYL_function_return
-// --- basic block ---
-L_106aa18:
-// 0x0106aa18: 0x106aa18: jr    ra sw    a0, 17580(v1)
-	ldloc 4
-	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 4395
+	ldc.i4.4
 	add
-	ldloc.0
+	ldloc 7
 	stelem.i4
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x0106a974: 0x106a974: sw    ra, 20(sp)
+// 0x0106a978: 0x106a978: bne   v0, v1, 0x106a984 addu  s0, a2, zero
+	ldloc 5
+	ldloc 8
+	ldloc.3
+	stloc 7
+	bne.un L_106a984
+// --- basic block ---
+// 0x0106a980: 0x106a980: sw    a1, 4464(a2)
+	ldloc 6
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4 1116
+	add
 	ldloc.2
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stelem.i4
+L_106a984:
+// 0x0106a984: 0x106a984: jal   0x1069d58 addu  a2, s0, zero
+	ldloc 7
+	stloc.3
+	ldloc.0
 	ldloc.1
-	ret
-}
-.method public static int32 Realtime_WazerNearbyState_106aaa0()
-{
-.maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
-
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl78::on_data_received__1069d58(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106a98c: 0x106a98c: beq   v0, zero, 0x106a9b4 sw    v0, 4496(s0)
+	ldloc 5
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 1124
+	add
+	ldloc 5
+	stelem.i4
+	brfalse L_106a9b4
+// --- basic block ---
+// 0x0106a994: 0x106a994: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 8
+// 0x0106a998: 0x106a998: bne   v0, v1, 0x106a9c0 sll   zero, zero, 0
+	ldloc 5
+	ldloc 8
+	bne.un L_106a9c0
+// --- basic block ---
+// 0x0106a9a0: 0x106a9a0: lw    v0, 4500(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106a9a4: 0x106a9a4: sll   zero, zero, 0
+// 0x0106a9a8: 0x106a9a8: bne   v0, zero, 0x106a9b4 addiu v0, zero, 2
+	ldloc 5
+	ldc.i4.2
+	stloc 5
+	brtrue L_106a9b4
+// --- basic block ---
+// 0x0106a9b0: 0x106a9b0: sw    v0, 4500(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
+	add
+	ldloc 5
+	stelem.i4
+L_106a9b4:
+// 0x0106a9b4: 0x106a9b4: lw    a1, 4500(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 1125
+	add
+	ldelem.i4
 	stloc.2
-__CIBYL_javamethod_begin:
+// 0x0106a9b8: 0x106a9b8: jal   0x106a88c addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_transaction_completed_106a88c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x0106aaa0: 0x106aaa0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc.0
-// 0x0106aaa4: 0x106aaa4: lw    v0, 17632(v0)
-	ldloc 2
+L_106a9c0:
+// 0x0106a9c0: 0x106a9c0: lw    ra, 20(sp)
+// 0x0106a9c4: 0x106a9c4: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4408
+	ldc.i4.4
 	add
 	ldelem.i4
+	stloc 7
+// 0x0106a9c8: 0x106a9c8: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
 	stloc.0
-// 0x0106aaa8: 0x106aaa8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.0
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 Realtime_SendTrafficInfo_106aab0()
+.method public static int32 on_socket_connected_106a9d0(int32,int32,int32,int32,int32)
 {
-.maxstack 4
-.locals init (int32 v0,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 v1,int32 ra)
 
-// local  0 is register v0
-// local  1 is register ra
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  5 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.0
+	stloc 7
 	ldc.i4.s 0
-	stloc.1
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 5
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106aab0: 0x106aab0: jr    ra addiu v0, zero, 1
-	ldc.i4.1
+// 0x0106a9d0: 0x106a9d0: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
 	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 Realtime_IsLoggedIn_106aab8()
-{
-.maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
-
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.2
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106aab8: 0x106aab8: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc.0
-// 0x0106aabc: 0x106aabc: lw    v0, 17984(v0)
-	ldloc 2
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 4496
-	add
-	ldelem.i4
-	stloc.0
-// 0x0106aac0: 0x106aac0: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RealTime_GetMyRanking_106aad8()
-{
-.maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
-
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.2
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106aad8: 0x106aad8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.0
-// 0x0106aadc: 0x106aadc: lw    v0, -19108(v0)
-	ldloc 2
+// 0x0106a9d4: 0x106a9d4: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4777
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc.0
-// 0x0106aae0: 0x106aae0: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	ldloc 5
+	stelem.i4
+// 0x0106a9d8: 0x106a9d8: sw    ra, 20(sp)
+// 0x0106a9dc: 0x106a9dc: jal   0x1069f94 addu  s0, a1, zero
+	ldloc.2
+	stloc 5
 	ldloc.0
-	ret
-}
-.method public static int32 RealTime_SetMapDisplayed_106aae8(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
-
-// local  1 is register v0
-// local  0 is register a0
-// local  2 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
-	stloc.1
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc.2
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106aae8: 0x106aae8: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106aaec: 0x106aaec: jr    ra sw    a0, 14992(v0)
-	ldloc 3
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl78::on_socket_connected__1069f94(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x0106a9e4: 0x106a9e4: beq   v0, zero, 0x106aa00 sw    v0, 4496(s0)
+	ldloc 7
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3748
+	ldc.i4 1124
 	add
-	ldloc.0
+	ldloc 7
 	stelem.i4
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.1
-	ret
-}
-.method public static int32 Realtime_GetServerCookie_106ab10()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
+	brfalse L_106aa00
+// --- basic block ---
+// 0x0106a9ec: 0x106a9ec: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 8
+// 0x0106a9f0: 0x106a9f0: bne   v0, v1, 0x106aa18 addu  a0, s0, zero
+	ldloc 7
+	ldloc 8
+	ldloc 5
 	stloc.1
-__CIBYL_javamethod_begin:
+	bne.un L_106aa18
 // --- basic block ---
-// 0x0106ab10: 0x106ab10: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc.0
-// 0x0106ab14: 0x106ab14: jr    ra addiu v0, v0, 17920
-	ldloc.0
-	ldc.i4 17920
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 Realtime_GetServerId_106ab1c()
-{
-.maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
-
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
+// 0x0106a9f8: 0x106a9f8: j	 0x106aa0c sll   zero, zero, 0
+	br L_106aa0c
+// --- basic block ---
+L_106aa00:
+// 0x0106aa00: 0x106aa00: addu  a0, s0, zero
+	ldloc 5
 	stloc.1
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x0106aa04: 0x106aa04: j	 0x106aa10 addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-__CIBYL_javamethod_begin:
+	br L_106aa10
 // --- basic block ---
-// 0x0106ab1c: 0x106ab1c: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc.0
-// 0x0106ab20: 0x106ab20: lw    v0, 17988(v0)
-	ldloc 2
-	ldloc.0
+L_106aa0c:
+// 0x0106aa0c: 0x106aa0c: lw    a1, 4500(s0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4497
+	ldc.i4 1125
 	add
 	ldelem.i4
-	stloc.0
-// 0x0106ab24: 0x106ab24: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 Realtime_AddonState_106ab2c()
-{
-.maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
-
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc.2
-__CIBYL_javamethod_begin:
+L_106aa10:
+// 0x0106aa10: 0x106aa10: jal   0x106a88c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_transaction_completed_106a88c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0106ab2c: 0x106ab2c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.0
-// 0x0106ab30: 0x106ab30: lw    v0, -19092(v0)
-	ldloc 2
+L_106aa18:
+// 0x0106aa18: 0x106aa18: lw    ra, 20(sp)
+// 0x0106aa1c: 0x106aa1c: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4773
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc.0
-// 0x0106ab34: 0x106ab34: jr    ra addiu v0, v0, -1
+	stloc 5
+// 0x0106aa20: 0x106aa20: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.m1
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.0
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
 	ret
 }
-.method public static int32 onRandomConfirm_106ab48(int32,int32,int32,int32,int32)
+.method public static int32 wst_watchdog_106aa28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
 // local  0 is register sp
-// local  6 is register ra
+// local  9 is register ra
 // local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3781,153 +3658,171 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ab48: 0x106ab48: addiu sp, sp, -24
+// 0x0106aa28: 0x106aa28: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106ab4c: 0x106ab4c: addiu v0, zero, 3
-	ldc.i4.3
-	stloc 5
-// 0x0106ab50: 0x106ab50: bne   a0, v0, 0x106ab60 sw    ra, 20(sp)
-	ldloc.1
-	ldloc 5
-	bne.un L_106ab60
-// --- basic block ---
-// 0x0106ab58: 0x106ab58: jal   0x10a9854 sll   zero, zero, 0
+// 0x0106aa2c: 0x106aa2c: sw    s0, 24(sp)
+	ldloc 7
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106aa30: 0x106aa30: sw    ra, 28(sp)
+// 0x0106aa34: 0x106aa34: addu  s0, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl126::roadmap_login_details_dialog_show_10a9854(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
+// 0x0106aa38: 0x106aa38: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+// 0x0106aa3c: 0x106aa3c: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x0106aa40: 0x106aa40: cibyl_sysc 0x20df
+	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// --- basic block ---
-L_106ab60:
-// 0x0106ab60: 0x106ab60: lw    ra, 20(sp)
-// 0x0106ab64: 0x106ab64: sll   zero, zero, 0
-// 0x0106ab68: 0x106ab68: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x0106aa44: 0x106aa44: addu  v1, v0, zero
+	ldloc 5
+	stloc 6
+// 0x0106aa48: 0x106aa48: lw    v0, 24(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldelem.i4
+	stloc 5
+// 0x0106aa4c: 0x106aa4c: sll   zero, zero, 0
+// 0x0106aa50: 0x106aa50: beq   v0, zero, 0x106aa8c subu  v0, v1, v0
 	ldloc 5
-	ret
-}
-.method public static int32 Realtime_IsAnonymous_106ab70(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+	ldloc 6
+	ldloc 5
+	sub
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	brfalse L_106aa8c
+// --- basic block ---
+// 0x0106aa58: 0x106aa58: slti  v1, v0, 75
+	ldloc 5
+	ldc.i4.s 75
+	clt
 	stloc 6
-__CIBYL_javamethod_begin:
+// 0x0106aa5c: 0x106aa5c: bne   v1, zero, 0x106aa8c lui   a3, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc 4
+	brtrue L_106aa8c
 // --- basic block ---
-// 0x0106ab70: 0x106ab70: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ab74: 0x106ab74: lui   a1, 0x10000
+// 0x0106aa64: 0x106aa64: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106ab78: 0x106ab78: addiu sp, sp, -24
+// 0x0106aa68: 0x106aa68: addiu a1, a1, 18164
+	ldloc.2
+	ldc.i4 18164
+	add
+	stloc.2
+// 0x0106aa6c: 0x106aa6c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106aa70: 0x106aa70: addiu a3, a3, 20596
+	ldloc 4
+	ldc.i4 20596
+	add
+	stloc 4
+// 0x0106aa74: 0x106aa74: addiu a2, zero, 323
+	ldc.i4 323
+	stloc.3
+// 0x0106aa78: 0x106aa78: jal   0x100449c sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-// 0x0106ab7c: 0x106ab7c: addiu a0, a0, 14928
+	ldloc 5
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	ldc.i4 14928
-	add
-	stloc.1
-// 0x0106ab80: 0x106ab80: sw    ra, 20(sp)
-// 0x0106ab84: 0x106ab84: jal   0x100e7f4 addiu a1, a1, 20312
 	ldloc.2
-	ldc.i4 20312
-	add
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106aa80: 0x106aa80: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x0106aa84: 0x106aa84: jal   0x106a88c addiu a1, zero, 7
+	ldc.i4.7
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_transaction_completed_106a88c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106ab8c: 0x106ab8c: lw    ra, 20(sp)
-// 0x0106ab90: 0x106ab90: sll   zero, zero, 0
-// 0x0106ab94: 0x106ab94: jr    ra addiu sp, sp, 24
+L_106aa8c:
+// 0x0106aa8c: 0x106aa8c: lw    ra, 28(sp)
+// 0x0106aa90: 0x106aa90: lw    s0, 24(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106aa94: 0x106aa94: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 5
 	ret
 }
-.method public static int32 Realtime_AnonymousMsg_106ab9c(int32,int32,int32,int32,int32)
+.method public static int32 wst_term_106aa9c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
 
-// local  6 is register v0
-// local  5 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  9 is register ra
+// local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 6
 	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3936,105 +3831,188 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ab9c: 0x106ab9c: addiu sp, sp, -24
+// 0x0106aa9c: 0x106aa9c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106aba0: 0x106aba0: sw    ra, 20(sp)
-// 0x0106aba4: 0x106aba4: jal   0x106ab70 sll   zero, zero, 0
+// 0x0106aaa0: 0x106aaa0: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106aaa4: 0x106aaa4: sw    ra, 20(sp)
+// 0x0106aaa8: 0x106aaa8: beq   a0, zero, 0x106ab08 addu  s0, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_IsAnonymous_106ab70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.1
+	stloc 7
+	brfalse L_106ab08
+// --- basic block ---
+// 0x0106aab0: 0x106aab0: lw    v0, 16(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
 	stloc 5
-	stloc 6
+// 0x0106aab4: 0x106aab4: sll   zero, zero, 0
+// 0x0106aab8: 0x106aab8: beq   v0, zero, 0x106aadc addiu v1, zero, 1
+	ldloc 5
+	ldc.i4.1
+	stloc 8
+	brfalse L_106aadc
+// --- basic block ---
+// 0x0106aac0: 0x106aac0: bne   v0, v1, 0x106aad4 addiu v0, zero, 1
+	ldloc 5
+	ldloc 8
+	ldc.i4.1
+	stloc 5
+	bne.un L_106aad4
 // --- basic block ---
-// 0x0106abac: 0x106abac: beq   v0, zero, 0x106abd0 addu  v1, zero, zero
+// 0x0106aac8: 0x106aac8: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x0106aacc: 0x106aacc: sw    v0, 16(a0)
 	ldloc 6
-	ldc.i4.s 0
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106aad0: 0x106aad0: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-	brfalse L_106abd0
+L_106aad4:
+// 0x0106aad4: 0x106aad4: j	 0x106ab08 sw    v0, 4504(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 1126
+	add
+	ldloc 5
+	stelem.i4
+	br L_106ab08
 // --- basic block ---
-// 0x0106abb4: 0x106abb4: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106abb8: 0x106abb8: lui   a1, 0x10000
+L_106aadc:
+// 0x0106aadc: 0x106aadc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106abbc: 0x106abbc: addiu a0, a0, 20324
-	ldloc.1
-	ldc.i4 20324
-	add
-	stloc.1
-// 0x0106abc0: 0x106abc0: addiu a1, a1, 20336
+// 0x0106aae0: 0x106aae0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106aae4: 0x106aae4: addiu a1, a1, 18164
 	ldloc.2
-	ldc.i4 20336
+	ldc.i4 18164
 	add
 	stloc.2
-// 0x0106abc4: 0x106abc4: jal   0x104bfe4 addiu a2, zero, 8
-	ldc.i4.8
+// 0x0106aae8: 0x106aae8: addiu a3, a3, 20680
+	ldloc 4
+	ldc.i4 20680
+	add
+	stloc 4
+// 0x0106aaec: 0x106aaec: addiu a2, zero, 217
+	ldc.i4 217
 	stloc.3
+// 0x0106aaf0: 0x106aaf0: jal   0x100449c addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	stloc 6
 // --- basic block ---
-// 0x0106abcc: 0x106abcc: addiu v1, zero, 1
-	ldc.i4.1
+// 0x0106aaf8: 0x106aaf8: jal   0x106a820 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_context_free_106a820(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-L_106abd0:
-// 0x0106abd0: 0x106abd0: lw    ra, 20(sp)
-// 0x0106abd4: 0x106abd4: addu  v0, v1, zero
-	ldloc 5
-	stloc 6
-// 0x0106abd8: 0x106abd8: jr    ra addiu sp, sp, 24
+// --- basic block ---
+// 0x0106ab00: 0x106ab00: jal   0x1000930 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+L_106ab08:
+// 0x0106ab08: 0x106ab08: lw    ra, 20(sp)
+// 0x0106ab0c: 0x106ab0c: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106ab10: 0x106ab10: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 Realtime_GetNickName_106abe0(int32,int32,int32,int32,int32)
+.method public static int32 WDF_FormatHttpDate_106ab18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
 
 // local  7 is register v0
-// local  8 is register v1
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  5 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4046,139 +4024,273 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106abe0: 0x106abe0: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106abe4: 0x106abe4: addiu sp, sp, -24
+// 0x0106ab18: 0x106ab18: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0106abe8: 0x106abe8: sw    ra, 20(sp)
-// 0x0106abec: 0x106abec: jal   0x100e348 addiu a0, a0, 18684
+// 0x0106ab1c: 0x106ab1c: sw    a0, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
 	ldloc.1
-	ldc.i4 18684
+	stelem.i4
+// 0x0106ab20: 0x106ab20: addiu a0, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
 	stloc.1
+// 0x0106ab24: 0x106ab24: sw    ra, 52(sp)
+// 0x0106ab28: 0x106ab28: jal   0x10c3b0c sw    a1, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc.2
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl145::gmtime_10c3b0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0106abf4: 0x106abf4: lw    ra, 20(sp)
-// 0x0106abf8: 0x106abf8: sll   zero, zero, 0
-// 0x0106abfc: 0x106abfc: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x0106ab30: 0x106ab30: lw    a0, 16(v0)
+	ldloc 6
 	ldloc 7
-	ret
-}
-.method public static int32 RealTime_GetUserName_106ac04(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106ab34: 0x106ab34: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0106ab38: 0x106ab38: sll   a0, a0, 2
+	ldloc.1
+	ldc.i4.2
+	shl
+	stloc.1
+// 0x0106ab3c: 0x106ab3c: addiu v1, v1, 29120
+	ldloc 5
+	ldc.i4 29120
+	add
+	stloc 5
+// 0x0106ab40: 0x106ab40: addu  v1, a0, v1
+	ldloc.1
+	ldloc 5
+	add
+	stloc 5
+// 0x0106ab44: 0x106ab44: lw    v1, 0(v1)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 5
+// 0x0106ab48: 0x106ab48: lw    a2, 24(v0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc.3
+// 0x0106ab4c: 0x106ab4c: lw    a3, 12(v0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldelem.i4
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+// 0x0106ab50: 0x106ab50: sw    v1, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106ab54: 0x106ab54: lw    v1, 20(v0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106ac04: 0x106ac04: lui   a0, 0x0
-	ldc.i4.s 0
+// 0x0106ab58: 0x106ab58: lw    a1, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106ab5c: 0x106ab5c: addiu v1, v1, 1900
+	ldloc 5
+	ldc.i4 1900
+	add
+	stloc 5
+// 0x0106ab60: 0x106ab60: sw    v1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106ab64: 0x106ab64: lw    a0, 8(v0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldelem.i4
 	stloc.1
-// 0x0106ac08: 0x106ac08: addiu sp, sp, -24
+// 0x0106ab68: 0x106ab68: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0106ab6c: 0x106ab6c: sw    a0, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.0
-// 0x0106ac0c: 0x106ac0c: sw    ra, 20(sp)
-// 0x0106ac10: 0x106ac10: jal   0x100e348 addiu a0, a0, 18668
 	ldloc.1
-	ldc.i4 18668
+	stelem.i4
+// 0x0106ab70: 0x106ab70: lw    a0, 4(v0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106ab74: 0x106ab74: sll   a2, a2, 2
+	ldloc.3
+	ldc.i4.2
+	shl
+	stloc.3
+// 0x0106ab78: 0x106ab78: addiu v1, v1, 29168
+	ldloc 5
+	ldc.i4 29168
+	add
+	stloc 5
+// 0x0106ab7c: 0x106ab7c: sw    a0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc.1
+	stelem.i4
+// 0x0106ab80: 0x106ab80: addu  v1, a2, v1
+	ldloc.3
+	ldloc 5
 	add
+	stloc 5
+// 0x0106ab84: 0x106ab84: lw    v0, 0(v0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x0106ab88: 0x106ab88: addu  a0, a1, zero
+	ldloc.2
 	stloc.1
+// 0x0106ab8c: 0x106ab8c: lw    a2, 0(v1)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x0106ab90: 0x106ab90: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106ab94: 0x106ab94: addiu a1, a1, 20692
+	ldloc.2
+	ldc.i4 20692
+	add
+	stloc.2
+// 0x0106ab98: 0x106ab98: jal   0x1000f64 sw    v0, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0106ac18: 0x106ac18: lw    ra, 20(sp)
-// 0x0106ac1c: 0x106ac1c: sll   zero, zero, 0
-// 0x0106ac20: 0x106ac20: jr    ra addiu sp, sp, 24
+// 0x0106aba0: 0x106aba0: lw    ra, 52(sp)
+// 0x0106aba4: 0x106aba4: sll   zero, zero, 0
+// 0x0106aba8: 0x106aba8: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
 	ret
 }
-.method public static int32 RT_GetWebServiceAddress_106ac28(int32,int32,int32,int32,int32)
+.method public static int32 WDF_TimeFromModifiedSince_106abb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
 
-// local  7 is register v0
+// local  5 is register v0
 // local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
 // local  0 is register sp
-// local  5 is register ra
+// local  9 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
 	stloc 8
 	ldarg 1
@@ -4189,164 +4301,140 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ac28: 0x106ac28: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ac2c: 0x106ac2c: addiu sp, sp, -24
+// 0x0106abb0: 0x106abb0: addiu sp, sp, -168
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4 -168
 	add
 	stloc.0
-// 0x0106ac30: 0x106ac30: sw    ra, 20(sp)
-// 0x0106ac34: 0x106ac34: jal   0x100e348 addiu a0, a0, 15200
-	ldloc.1
-	ldc.i4 15200
+// 0x0106abb4: 0x106abb4: sw    s0, 160(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 40
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106abb8: 0x106abb8: addiu s0, sp, 16
+	ldloc.0
+	ldc.i4.s 16
 	add
+	stloc 7
+// 0x0106abbc: 0x106abbc: sw    ra, 164(sp)
+// 0x0106abc0: 0x106abc0: jal   0x104f758 addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_time_parseGMTString_104f758(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106abc8: 0x106abc8: jal   0x106ad94 addu  a0, s0, zero
+	ldloc 7
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::mkgmtime_106ad94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106ac3c: 0x106ac3c: lw    ra, 20(sp)
-// 0x0106ac40: 0x106ac40: sll   zero, zero, 0
-// 0x0106ac44: 0x106ac44: jr    ra addiu sp, sp, 24
+// 0x0106abd0: 0x106abd0: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0106abd4: 0x106abd4: addiu a1, sp, 52
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 52
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 Realtime_AllowPing_106ac4c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106ac4c: 0x106ac4c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ac50: 0x106ac50: addiu sp, sp, -24
+	stloc.2
+// 0x0106abd8: 0x106abd8: jal   0x106ab18 sw    v0, 152(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106ac54: 0x106ac54: sw    ra, 20(sp)
-// 0x0106ac58: 0x106ac58: jal   0x100e348 addiu a0, a0, 14976
-	ldloc.1
-	ldc.i4 14976
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
 	add
-	stloc.1
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::WDF_FormatHttpDate_106ab18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106ac60: 0x106ac60: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0106ac64: 0x106ac64: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0106ac68: 0x106ac68: jal   0x1001b14 addiu a1, a1, 20820
-	ldloc.2
-	ldc.i4 20820
+// 0x0106abe0: 0x106abe0: lw    ra, 164(sp)
+// 0x0106abe4: 0x106abe4: lw    v0, 152(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
 	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x0106ac70: 0x106ac70: lw    ra, 20(sp)
-// 0x0106ac74: 0x106ac74: sltiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	clt.un
+	ldelem.i4
 	stloc 5
-// 0x0106ac78: 0x106ac78: jr    ra addiu sp, sp, 24
+// 0x0106abe8: 0x106abe8: lw    s0, 160(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 40
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106abec: 0x106abec: jr    ra addiu sp, sp, 168
+	ldloc.0
+	ldc.i4 168
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 NameAndPasswordAlreadyFailedAuthentication_106ac80(int32,int32,int32,int32,int32)
+.method public static int32 WDF_FormatHttpIfModifiedSince_106abf4(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  8 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4355,221 +4443,210 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ac80: 0x106ac80: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106ac84: 0x106ac84: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x0106abf4: 0x106abf4: addiu sp, sp, -72
+	ldloc.0
+	ldc.i4.s -72
 	add
-	stloc.1
-// 0x0106ac88: 0x106ac88: lw    a1, 28696(a0)
-	ldloc 8
-	ldloc.1
+	stloc.0
+// 0x0106abf8: 0x106abf8: sw    s0, 64(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106ac8c: 0x106ac8c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s 16
 	add
-	stloc.0
-// 0x0106ac90: 0x106ac90: addiu v0, zero, 25
-	ldc.i4.s 25
-	stloc 5
-// 0x0106ac94: 0x106ac94: sw    ra, 20(sp)
-// 0x0106ac98: 0x106ac98: bne   a1, v0, 0x106accc addu  v1, zero, zero
+	ldloc 7
+	stelem.i4
+// 0x0106abfc: 0x106abfc: sw    ra, 68(sp)
+// 0x0106ac00: 0x106ac00: blez  a0, 0x106ac48 addu  s0, a1, zero
+	ldloc.1
 	ldloc.2
-	ldloc 5
+	stloc 7
 	ldc.i4.s 0
-	stloc 6
-	bne.un L_106accc
+	ble L_106ac48
 // --- basic block ---
-// 0x0106aca0: 0x106aca0: lui   a1, 0x80000
-	ldc.i4 524288
-	stloc.2
-// 0x0106aca4: 0x106aca4: jal   0x1001b14 addiu a1, a1, -19056
-	ldloc.2
-	ldc.i4 -19056
+// 0x0106ac08: 0x106ac08: addiu a3, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
+	stloc 4
+// 0x0106ac0c: 0x106ac0c: addu  a1, a3, zero
+	ldloc 4
 	stloc.2
+// 0x0106ac10: 0x106ac10: jal   0x106ab18 sw    a3, 56(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc 4
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x0106acac: 0x106acac: bne   v0, zero, 0x106accc addu  v1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::WDF_FormatHttpDate_106ab18(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	brtrue L_106accc
 // --- basic block ---
-// 0x0106acb4: 0x106acb4: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106acb8: 0x106acb8: lui   a1, 0x80000
-	ldc.i4 524288
+// 0x0106ac18: 0x106ac18: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-// 0x0106acbc: 0x106acbc: addiu a0, a0, 17792
-	ldloc.1
-	ldc.i4 17792
+// 0x0106ac1c: 0x106ac1c: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0106ac20: 0x106ac20: lw    a3, 56(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
 	add
+	ldelem.i4
+	stloc 4
+// 0x0106ac24: 0x106ac24: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x0106ac28: 0x106ac28: addu  a0, s0, zero
+	ldloc 7
 	stloc.1
-// 0x0106acc0: 0x106acc0: jal   0x1001b14 addiu a1, a1, -18992
+// 0x0106ac2c: 0x106ac2c: addiu a1, a1, 27816
 	ldloc.2
-	ldc.i4 -18992
+	ldc.i4 27816
 	add
 	stloc.2
+// 0x0106ac30: 0x106ac30: addiu a2, a2, 20728
+	ldloc.3
+	ldc.i4 20728
+	add
+	stloc.3
+// 0x0106ac34: 0x106ac34: addiu v0, v0, 5356
+	ldloc 6
+	ldc.i4 5356
+	add
+	stloc 6
+// 0x0106ac38: 0x106ac38: jal   0x1000f64 sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
+// --- basic block ---
+// 0x0106ac40: 0x106ac40: j	 0x106ac4c sll   zero, zero, 0
+	br L_106ac4c
 // --- basic block ---
-// 0x0106acc8: 0x106acc8: sltiu v1, v0, 1
+L_106ac48:
+// 0x0106ac48: 0x106ac48: sb    zero, 0(a1)
+	ldloc.2
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+L_106ac4c:
+// 0x0106ac4c: 0x106ac4c: lw    ra, 68(sp)
+// 0x0106ac50: 0x106ac50: lw    s0, 64(sp)
 	ldloc 5
-	ldc.i4.1
-	clt.un
-	stloc 6
-L_106accc:
-// 0x0106accc: 0x106accc: lw    ra, 20(sp)
-// 0x0106acd0: 0x106acd0: addu  v0, v1, zero
-	ldloc 6
-	stloc 5
-// 0x0106acd4: 0x106acd4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106ac54: 0x106ac54: jr    ra addiu sp, sp, 72
+	ldloc.0
+	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 GetEnableDisableState_106ad10(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_buffer_get_unprocessed_data_106ac5c(int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
 
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  8 is register mem
+// local  1 is register v0
+// local  0 is register a0
+// local  2 is register ra
+// local  3 is register mem
 
 	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
+	stloc.1
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
+	stloc.2
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ad10: 0x106ad10: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ad14: 0x106ad14: addiu sp, sp, -24
+// 0x0106ac5c: 0x106ac5c: lw    v0, 2056(a0)
+	ldloc 3
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4 514
 	add
-	stloc.0
-// 0x0106ad18: 0x106ad18: sw    ra, 20(sp)
-// 0x0106ad1c: 0x106ad1c: jal   0x100e348 addiu a0, a0, 15088
+	ldelem.i4
+	stloc.1
+// 0x0106ac60: 0x106ac60: jr    ra addu  v0, a0, v0
+	ldloc.0
 	ldloc.1
-	ldc.i4 15088
 	add
 	stloc.1
-	ldloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ad24: 0x106ad24: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0106ad28: 0x106ad28: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0106ad2c: 0x106ad2c: jal   0x1001b14 addiu a1, a1, 21112
-	ldloc.2
-	ldc.i4 21112
-	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x0106ad34: 0x106ad34: lw    ra, 20(sp)
-// 0x0106ad38: 0x106ad38: sltiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	clt.un
-	stloc 5
-// 0x0106ad3c: 0x106ad3c: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
 	ret
 }
-.method public static int32 Realtime_SaveLoginInfo_106ad64(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_buffer_update_processed_data_106ac68(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  9 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4578,132 +4655,125 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ad64: 0x106ad64: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ad68: 0x106ad68: lui   a1, 0x70000
-	ldc.i4 458752
-	stloc.2
-// 0x0106ad6c: 0x106ad6c: addiu sp, sp, -24
+// 0x0106ac68: 0x106ac68: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106ad70: 0x106ad70: addiu a0, a0, 18668
-	ldloc.1
-	ldc.i4 18668
-	add
-	stloc.1
-// 0x0106ad74: 0x106ad74: sw    ra, 20(sp)
-// 0x0106ad78: 0x106ad78: jal   0x100e5c0 addiu a1, a1, 17728
-	ldloc.2
-	ldc.i4 17728
-	add
-	stloc.2
+// 0x0106ac6c: 0x106ac6c: sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106ac70: 0x106ac70: sw    ra, 20(sp)
+// 0x0106ac74: 0x106ac74: addu  s0, a0, zero
 	ldloc.1
-	ldloc.2
+	stloc 7
+// 0x0106ac78: 0x106ac78: beq   a2, zero, 0x106ac9c addu  v0, a1, zero
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.2
 	stloc 6
-	stloc 5
+	brfalse L_106ac9c
 // --- basic block ---
-// 0x0106ad80: 0x106ad80: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ad84: 0x106ad84: lui   a1, 0x70000
-	ldc.i4 458752
-	stloc.2
-// 0x0106ad88: 0x106ad88: addiu a0, a0, 18700
-	ldloc.1
-	ldc.i4 18700
-	add
-	stloc.1
-// 0x0106ad8c: 0x106ad8c: jal   0x100e5c0 addiu a1, a1, 17792
+// 0x0106ac80: 0x106ac80: lb    v1, 0(a2)
+	ldloc.3
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 8
+// 0x0106ac84: 0x106ac84: sll   zero, zero, 0
+// 0x0106ac88: 0x106ac88: beq   v1, zero, 0x106ac9c addu  a0, a1, zero
+	ldloc 8
 	ldloc.2
-	ldc.i4 17792
-	add
+	stloc.1
+	brfalse L_106ac9c
+// --- basic block ---
+// 0x0106ac90: 0x106ac90: addu  a1, a2, zero
+	ldloc.3
 	stloc.2
+// 0x0106ac94: 0x106ac94: jal   0x10681b8 addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::EatChars_10681b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0106ad94: 0x106ad94: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ad98: 0x106ad98: lui   a1, 0x70000
-	ldc.i4 458752
-	stloc.2
-// 0x0106ad9c: 0x106ad9c: addiu a0, a0, 18684
-	ldloc.1
-	ldc.i4 18684
-	add
-	stloc.1
-// 0x0106ada0: 0x106ada0: jal   0x100e5c0 addiu a1, a1, 17856
-	ldloc.2
-	ldc.i4 17856
+L_106ac9c:
+// 0x0106ac9c: 0x106ac9c: lw    ra, 20(sp)
+// 0x0106aca0: 0x106aca0: subu  v0, v0, s0
+	ldloc 6
+	ldloc 7
+	sub
+	stloc 6
+// 0x0106aca4: 0x106aca4: sw    v0, 2056(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 514
 	add
-	stloc.2
+	ldloc 6
+	stelem.i4
+// 0x0106aca8: 0x106aca8: lw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ada8: 0x106ada8: lw    ra, 20(sp)
-// 0x0106adac: 0x106adac: sll   zero, zero, 0
-// 0x0106adb0: 0x106adb0: jr    ra addiu sp, sp, 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106acac: 0x106acac: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 Realtime_CheckDumpOfflineAfterCrash_106ade0(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_buffer_recycle_106acb4(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  7 is register s0
+// local  8 is register s1
 // local  0 is register sp
-// local  9 is register ra
-// local  8 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4714,276 +4784,270 @@ __CIBYL_function_return:
 	stloc 4
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ade0: 0x106ade0: addiu sp, sp, -24
+// 0x0106acb4: 0x106acb4: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106ade4: 0x106ade4: sw    s0, 16(sp)
-	ldloc 8
-	ldloc.0
+// 0x0106acb8: 0x106acb8: lw    v0, 2064(a0)
+	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106ade8: 0x106ade8: lui   s0, 0x0
-	ldc.i4.s 0
-	stloc 7
-// 0x0106adec: 0x106adec: sw    ra, 20(sp)
-// 0x0106adf0: 0x106adf0: jal   0x100e348 addiu a0, s0, 14960
-	ldloc 7
-	ldc.i4 14960
+	ldc.i4 516
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldelem.i4
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106adf8: 0x106adf8: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0106adfc: 0x106adfc: addu  a0, v0, zero
+// 0x0106acbc: 0x106acbc: lw    a1, 2056(a0)
 	ldloc 5
-	stloc.1
-// 0x0106ae00: 0x106ae00: jal   0x1001b14 addiu a1, a1, 20820
-	ldloc.2
-	ldc.i4 20820
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 514
 	add
+	ldelem.i4
 	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x0106ae08: 0x106ae08: bne   v0, zero, 0x106ae34 sll   zero, zero, 0
+// 0x0106acc0: 0x106acc0: sw    s1, 24(sp)
 	ldloc 5
-	brtrue L_106ae34
-// --- basic block ---
-// 0x0106ae10: 0x106ae10: addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x0106ae14: 0x106ae14: jal   0x10b98b4 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106acc4: 0x106acc4: lw    s1, 2052(a0)
+	ldloc 5
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl138::editor_cleanup_test_10b98b4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ae1c: 0x106ae1c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0106ae20: 0x106ae20: addiu a0, s0, 14960
-	ldloc 7
-	ldc.i4 14960
+	ldc.i4.2
+	shr.un
+	ldc.i4 513
 	add
-	stloc.1
-// 0x0106ae24: 0x106ae24: jal   0x100e5c0 addiu a1, a1, 9464
+	ldelem.i4
+	stloc 8
+// 0x0106acc8: 0x106acc8: addu  v0, v0, a1
+	ldloc 6
 	ldloc.2
-	ldc.i4 9464
 	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ae2c: 0x106ae2c: jal   0x100ea50 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 5
-// --- basic block ---
-L_106ae34:
-// 0x0106ae34: 0x106ae34: lw    ra, 20(sp)
-// 0x0106ae38: 0x106ae38: lw    s0, 16(sp)
-	ldloc 8
+// 0x0106accc: 0x106accc: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldelem.i4
+	ldloc 7
+	stelem.i4
+// 0x0106acd0: 0x106acd0: sw    ra, 28(sp)
+// 0x0106acd4: 0x106acd4: addu  s0, a0, zero
+	ldloc.1
 	stloc 7
-// 0x0106ae3c: 0x106ae3c: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x0106acd8: 0x106acd8: bne   a1, s1, 0x106acf8 sw    v0, 2064(a0)
+	ldloc.2
+	ldloc 8
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 516
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
 	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_Set_AllowPing_106ae44(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
-__CIBYL_javamethod_begin:
+	stelem.i4
+	bne.un L_106acf8
 // --- basic block ---
-// 0x0106ae44: 0x106ae44: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x0106ace0: 0x106ace0: addiu v0, zero, 2048
+	ldc.i4 2048
+	stloc 6
+// 0x0106ace4: 0x106ace4: sw    v0, 2072(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 518
 	add
-	stloc.0
-// 0x0106ae48: 0x106ae48: sw    ra, 20(sp)
-// 0x0106ae4c: 0x106ae4c: beq   a0, zero, 0x106ae64 lui   v0, 0x0
+	ldloc 6
+	stelem.i4
+// 0x0106ace8: 0x106ace8: sw    zero, 2052(a0)
+	ldloc 5
 	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 513
+	add
 	ldc.i4.s 0
-	stloc 5
-	brfalse L_106ae64
-// --- basic block ---
-// 0x0106ae54: 0x106ae54: lui   a1, 0x0
+	stelem.i4
+// 0x0106acec: 0x106acec: sb    zero, 0(a0)
+	ldloc.1
 	ldc.i4.s 0
-	stloc.2
-// 0x0106ae58: 0x106ae58: addiu a0, v0, 14976
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0106acf0: 0x106acf0: j	 0x106ad30 sw    a0, 2068(s0)
 	ldloc 5
-	ldc.i4 14976
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 517
 	add
-	stloc.1
-// 0x0106ae5c: 0x106ae5c: j	 0x106ae70 addiu a1, a1, 20820
+	ldloc.1
+	stelem.i4
+	br L_106ad30
+// --- basic block ---
+L_106acf8:
+// 0x0106acf8: 0x106acf8: beq   a1, zero, 0x106ad18 subu  s1, s1, a1
 	ldloc.2
-	ldc.i4 20820
-	add
-	stloc.2
-	br L_106ae70
+	ldloc 8
+	ldloc.2
+	sub
+	stloc 8
+	brfalse L_106ad18
 // --- basic block ---
-L_106ae64:
-// 0x0106ae64: 0x106ae64: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0106ae68: 0x106ae68: addiu a0, v0, 14976
-	ldloc 5
-	ldc.i4 14976
-	add
-	stloc.1
-// 0x0106ae6c: 0x106ae6c: addiu a1, a1, 9464
+// 0x0106ad00: 0x106ad00: addu  a2, s1, zero
+	ldloc 8
+	stloc.3
+// 0x0106ad04: 0x106ad04: jal   0x100186c addu  a1, a0, a1
+	ldloc.1
 	ldloc.2
-	ldc.i4 9464
 	add
 	stloc.2
-L_106ae70:
-// 0x0106ae70: 0x106ae70: jal   0x100e5c0 sll   zero, zero, 0
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memmove_100186c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 6
 // --- basic block ---
-// 0x0106ae78: 0x106ae78: jal   0x100ea50 addu  a0, zero, zero
+// 0x0106ad0c: 0x106ad0c: addu  v0, s0, s1
+	ldloc 7
+	ldloc 8
+	add
+	stloc 6
+// 0x0106ad10: 0x106ad10: sb    zero, 0(v0)
+	ldloc 6
 	ldc.i4.s 0
-	stloc.1
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0106ad14: 0x106ad14: sw    s1, 2052(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 513
+	add
+	ldloc 8
+	stelem.i4
+L_106ad18:
+// 0x0106ad18: 0x106ad18: lw    v0, 2052(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 513
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106ad1c: 0x106ad1c: addiu v1, zero, 2048
+	ldc.i4 2048
+	stloc 9
+// 0x0106ad20: 0x106ad20: subu  v1, v1, v0
+	ldloc 9
+	ldloc 6
+	sub
+	stloc 9
+// 0x0106ad24: 0x106ad24: addu  v0, s0, v0
+	ldloc 7
+	ldloc 6
+	add
+	stloc 6
+// 0x0106ad28: 0x106ad28: sw    v0, 2068(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 517
+	add
+	ldloc 6
+	stelem.i4
+// 0x0106ad2c: 0x106ad2c: sw    v1, 2072(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 518
+	add
+	ldloc 9
+	stelem.i4
+L_106ad30:
+// 0x0106ad30: 0x106ad30: lw    ra, 28(sp)
+// 0x0106ad34: 0x106ad34: sw    zero, 2056(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 514
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106ad38: 0x106ad38: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106ad3c: 0x106ad3c: lw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ae80: 0x106ae80: lw    ra, 20(sp)
-// 0x0106ae84: 0x106ae84: sll   zero, zero, 0
-// 0x0106ae88: 0x106ae88: jr    ra addiu sp, sp, 24
+// 0x0106ad40: 0x106ad40: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 Realtime_SetLoginNickname_106ae90(int32,int32,int32,int32,int32)
+.method public static int32 cyclic_buffer_init_106ad48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 v0,int32 ra,int32 v1)
 
 // local  7 is register v0
-// local  8 is register v1
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  5 is register s0
 // local  0 is register sp
-// local  5 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4992,424 +5056,1097 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ae90: 0x106ae90: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106ae94: 0x106ae94: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106ae98: 0x106ae98: addiu sp, sp, -24
+// 0x0106ad48: 0x106ad48: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
-	stloc.0
-// 0x0106ae9c: 0x106ae9c: sw    ra, 20(sp)
-// 0x0106aea0: 0x106aea0: jal   0x10a9158 addiu a0, a0, -19056
-	ldloc.1
-	ldc.i4 -19056
+	stloc.0
+// 0x0106ad4c: 0x106ad4c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0106ad50: 0x106ad50: addiu a2, zero, 2049
+	ldc.i4 2049
+	stloc.3
+// 0x0106ad54: 0x106ad54: sw    ra, 20(sp)
+// 0x0106ad58: 0x106ad58: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106ad5c: 0x106ad5c: jal   0x100177c addu  s0, a0, zero
+	ldloc.1
+	stloc 5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 7
+// --- basic block ---
+// 0x0106ad64: 0x106ad64: addiu v0, zero, 2048
+	ldc.i4 2048
+	stloc 7
+// 0x0106ad68: 0x106ad68: lw    ra, 20(sp)
+// 0x0106ad6c: 0x106ad6c: sw    v0, 2072(s0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 518
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106ad70: 0x106ad70: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 7
+// 0x0106ad74: 0x106ad74: sw    v0, 2060(s0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 515
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106ad78: 0x106ad78: sw    zero, 2052(s0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 513
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106ad7c: 0x106ad7c: sw    zero, 2056(s0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 514
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106ad80: 0x106ad80: sw    zero, 2064(s0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 516
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106ad84: 0x106ad84: sw    s0, 2068(s0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 517
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106ad88: 0x106ad88: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106ad8c: 0x106ad8c: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 mkgmtime_106ad94(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
+
+// local  6 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local 10 is register s1
+// local  9 is register s2
+// local 11 is register s3
+// local 12 is register s4
+// local 13 is register s5
+// local 14 is register s6
+// local 15 is register s7
+// local  0 is register sp
+// local 16 is register s8
+// local 17 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 16
+	ldc.i4.s 0
+	stloc 17
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106ad94: 0x106ad94: addiu sp, sp, -104
+	ldloc.0
+	ldc.i4.s -104
+	add
+	stloc.0
+// 0x0106ad98: 0x106ad98: addu  a1, a0, zero
+	ldloc.1
+	stloc.2
+// 0x0106ad9c: 0x106ad9c: addiu a2, zero, 36
+	ldc.i4.s 36
+	stloc.3
+// 0x0106ada0: 0x106ada0: addiu a0, sp, 20
+	ldloc.0
+	ldc.i4.s 20
+	add
+	stloc.1
+// 0x0106ada4: 0x106ada4: sw    s8, 96(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
+	ldloc 16
+	stelem.i4
+// 0x0106ada8: 0x106ada8: sw    s7, 92(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
+	add
+	ldloc 15
+	stelem.i4
+// 0x0106adac: 0x106adac: sw    s6, 88(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
+	add
+	ldloc 14
+	stelem.i4
+// 0x0106adb0: 0x106adb0: sw    s5, 84(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldloc 13
+	stelem.i4
+// 0x0106adb4: 0x106adb4: sw    s3, 76(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldloc 11
+	stelem.i4
+// 0x0106adb8: 0x106adb8: sw    s0, 64(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106adbc: 0x106adbc: sw    ra, 100(sp)
+// 0x0106adc0: 0x106adc0: sw    s4, 80(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
+	add
+	ldloc 12
+	stelem.i4
+// 0x0106adc4: 0x106adc4: sw    s2, 72(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106adc8: 0x106adc8: sw    s1, 68(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106adcc: 0x106adcc: jal   0x1001800 addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 7
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x0106add4: 0x106add4: lw    s3, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106add8: 0x106add8: lw    v1, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106addc: 0x106addc: lw    s8, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 16
+// 0x0106ade0: 0x106ade0: lw    s7, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 15
+// 0x0106ade4: 0x106ade4: lw    s6, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 14
+// 0x0106ade8: 0x106ade8: lw    s5, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 13
+// 0x0106adec: 0x106adec: j	 0x106adf8 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+	br L_106adf8
+// --- basic block ---
+L_106adf4:
+// 0x0106adf4: 0x106adf4: sll   v0, v0, 1
+	ldloc 6
+	ldc.i4.1
+	shl
+	stloc 6
+L_106adf8:
+// 0x0106adf8: 0x106adf8: bgtz  v0, 0x106adf4 addiu s0, s0, 1
+	ldloc 6
+	ldloc 7
+	ldc.i4.1
+	add
+	stloc 7
+	ldc.i4.s 0
+	bgt L_106adf4
+// --- basic block ---
+// 0x0106ae00: 0x106ae00: addiu s0, s0, -1
+	ldloc 7
+	ldc.i4.m1
+	add
+	stloc 7
+// 0x0106ae04: 0x106ae04: bne   v0, zero, 0x106ae14 addu  a0, zero, zero
+	ldloc 6
+	ldc.i4.s 0
+	stloc.1
+	brtrue L_106ae14
+// --- basic block ---
+// 0x0106ae0c: 0x106ae0c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106ae10: 0x106ae10: sllv  a0, s0, a0
+	ldloc.1
+	ldloc 7
+	shl
+	stloc.1
+L_106ae14:
+// 0x0106ae14: 0x106ae14: slti  v0, s0, 41
+	ldloc 7
+	ldc.i4.s 41
+	clt
+	stloc 6
+// 0x0106ae18: 0x106ae18: bne   v0, zero, 0x106ae24 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_106ae24
+// --- basic block ---
+// 0x0106ae20: 0x106ae20: addiu s0, zero, 40
+	ldc.i4.s 40
+	stloc 7
+L_106ae24:
+// 0x0106ae24: 0x106ae24: sw    a0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc.1
+	stelem.i4
+// 0x0106ae28: 0x106ae28: addiu s4, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc 12
+// 0x0106ae2c: 0x106ae2c: addiu s2, zero, -1
+	ldc.i4.m1
+	stloc 9
+// 0x0106ae30: 0x106ae30: addiu s1, zero, 1
+	ldc.i4.1
+	stloc 10
+L_106ae34:
+// 0x0106ae34: 0x106ae34: addu  a0, s4, zero
+	ldloc 12
+	stloc.1
+// 0x0106ae38: 0x106ae38: jal   0x10c3b0c sw    v1, 56(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc 8
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl145::gmtime_10c3b0c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x0106ae40: 0x106ae40: lw    v1, 56(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106ae44: 0x106ae44: beq   v0, zero, 0x106af08 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_106af08
+// --- basic block ---
+// 0x0106ae4c: 0x106ae4c: lw    a0, 20(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106ae50: 0x106ae50: sll   zero, zero, 0
+// 0x0106ae54: 0x106ae54: subu  a0, a0, v1
+	ldloc.1
+	ldloc 8
+	sub
+	stloc.1
+// 0x0106ae58: 0x106ae58: bne   a0, zero, 0x106aec0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106aec0
+// --- basic block ---
+// 0x0106ae60: 0x106ae60: lw    a0, 16(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106ae64: 0x106ae64: sll   zero, zero, 0
+// 0x0106ae68: 0x106ae68: subu  a0, a0, s8
+	ldloc.1
+	ldloc 16
+	sub
+	stloc.1
+// 0x0106ae6c: 0x106ae6c: bne   a0, zero, 0x106aec0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106aec0
+// --- basic block ---
+// 0x0106ae74: 0x106ae74: lw    a0, 12(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106ae78: 0x106ae78: sll   zero, zero, 0
+// 0x0106ae7c: 0x106ae7c: subu  a0, a0, s7
+	ldloc.1
+	ldloc 15
+	sub
+	stloc.1
+// 0x0106ae80: 0x106ae80: bne   a0, zero, 0x106aec0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106aec0
+// --- basic block ---
+// 0x0106ae88: 0x106ae88: lw    a0, 8(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106ae8c: 0x106ae8c: sll   zero, zero, 0
+// 0x0106ae90: 0x106ae90: subu  a0, a0, s6
+	ldloc.1
+	ldloc 14
+	sub
+	stloc.1
+// 0x0106ae94: 0x106ae94: bne   a0, zero, 0x106aec0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106aec0
+// --- basic block ---
+// 0x0106ae9c: 0x106ae9c: lw    a0, 4(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106aea0: 0x106aea0: sll   zero, zero, 0
+// 0x0106aea4: 0x106aea4: subu  a0, a0, s5
+	ldloc.1
+	ldloc 13
+	sub
+	stloc.1
+// 0x0106aea8: 0x106aea8: bne   a0, zero, 0x106aec0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106aec0
+// --- basic block ---
+// 0x0106aeb0: 0x106aeb0: lw    a0, 0(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0106aeb4: 0x106aeb4: sll   zero, zero, 0
+// 0x0106aeb8: 0x106aeb8: beq   a0, zero, 0x106aefc sll   zero, zero, 0
+	ldloc.1
+	brfalse L_106aefc
+// --- basic block ---
+L_106aec0:
+// 0x0106aec0: 0x106aec0: beq   s0, s2, 0x106af08 addiu s0, s0, -1
+	ldloc 7
+	ldloc 9
+	ldloc 7
+	ldc.i4.m1
+	add
+	stloc 7
+	beq  L_106af08
+// --- basic block ---
+// 0x0106aec8: 0x106aec8: bne   s0, s2, 0x106aedc sll   zero, zero, 0
+	ldloc 7
+	ldloc 9
+	bne.un L_106aedc
+// --- basic block ---
+// 0x0106aed0: 0x106aed0: lw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106aed4: 0x106aed4: j	 0x106aef4 addiu v0, v0, -1
+	ldloc 6
+	ldc.i4.m1
+	add
+	stloc 6
+	br L_106aef4
+// --- basic block ---
+L_106aedc:
+// 0x0106aedc: 0x106aedc: lw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106aee0: 0x106aee0: blez  a0, 0x106aef0 sllv  a0, s0, s1
+	ldloc.1
+	ldloc 10
+	ldloc 7
+	shl
+	stloc.1
+	ldc.i4.s 0
+	ble L_106aef0
+// --- basic block ---
+// 0x0106aee8: 0x106aee8: j	 0x106aef4 subu  v0, v0, a0
+	ldloc 6
+	ldloc.1
+	sub
+	stloc 6
+	br L_106aef4
+// --- basic block ---
+L_106aef0:
+// 0x0106aef0: 0x106aef0: addu  v0, v0, a0
+	ldloc 6
+	ldloc.1
+	add
+	stloc 6
+L_106aef4:
+// 0x0106aef4: 0x106aef4: j	 0x106ae34 sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+	br L_106ae34
+// --- basic block ---
+L_106aefc:
+// 0x0106aefc: 0x106aefc: lw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106af00: 0x106af00: j	 0x106af0c addu  v0, s3, v0
+	ldloc 11
+	ldloc 6
+	add
+	stloc 6
+	br L_106af0c
+// --- basic block ---
+L_106af08:
+// 0x0106af08: 0x106af08: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 6
+L_106af0c:
+// 0x0106af0c: 0x106af0c: lw    ra, 100(sp)
+// 0x0106af10: 0x106af10: lw    s8, 96(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
+	ldelem.i4
+	stloc 16
+// 0x0106af14: 0x106af14: lw    s7, 92(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
+	add
+	ldelem.i4
+	stloc 15
+// 0x0106af18: 0x106af18: lw    s6, 88(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
+	add
+	ldelem.i4
+	stloc 14
+// 0x0106af1c: 0x106af1c: lw    s5, 84(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldelem.i4
+	stloc 13
+// 0x0106af20: 0x106af20: lw    s4, 80(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
+	add
+	ldelem.i4
+	stloc 12
+// 0x0106af24: 0x106af24: lw    s3, 76(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106af28: 0x106af28: lw    s2, 72(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106af2c: 0x106af2c: lw    s1, 68(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
 	add
-	stloc.1
+	ldelem.i4
+	stloc 10
+// 0x0106af30: 0x106af30: lw    s0, 64(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl126::roadmap_login_set_nickname_10a9158(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
 	stloc 7
-// --- basic block ---
-// 0x0106aea8: 0x106aea8: lw    ra, 20(sp)
-// 0x0106aeac: 0x106aeac: sll   zero, zero, 0
-// 0x0106aeb0: 0x106aeb0: jr    ra addiu sp, sp, 24
+// 0x0106af34: 0x106af34: jr    ra addiu sp, sp, 104
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 104
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 6
 	ret
 }
-.method public static int32 Realtime_SetLoginPassword_106aeb8(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_NotifyOnLoginChanged_106b020(int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
 
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
+// local  1 is register v0
+// local  2 is register v1
+// local  0 is register a0
+// local  3 is register ra
+// local  4 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc.1
 	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
+	stloc.2
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc.3
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106aeb8: 0x106aeb8: addu  a1, a0, zero
-	ldloc.1
+// 0x0106b020: 0x106b020: lui   v1, 0x70000
+	ldc.i4 458752
 	stloc.2
-// 0x0106aebc: 0x106aebc: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106aec0: 0x106aec0: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106aec4: 0x106aec4: sw    ra, 20(sp)
-// 0x0106aec8: 0x106aec8: jal   0x10a917c addiu a0, a0, -19056
-	ldloc.1
-	ldc.i4 -19056
+// 0x0106b024: 0x106b024: lw    v0, 18044(v1)
+	ldloc 4
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4 4511
 	add
+	ldelem.i4
 	stloc.1
-	ldloc.0
+// 0x0106b028: 0x106b028: sll   zero, zero, 0
+// 0x0106b02c: 0x106b02c: bne   v0, a0, 0x106b03c sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl126::roadmap_login_set_pwd_10a917c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0106aed0: 0x106aed0: lw    ra, 20(sp)
-// 0x0106aed4: 0x106aed4: sll   zero, zero, 0
-// 0x0106aed8: 0x106aed8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 24
+	bne.un L_106b03c
+// --- basic block ---
+// 0x0106b034: 0x106b034: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	br __CIBYL_function_return
+// --- basic block ---
+L_106b03c:
+// 0x0106b03c: 0x106b03c: jr    ra sw    a0, 18044(v1)
+	ldloc 4
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4 4511
 	add
-	stloc.0
+	ldloc.0
+	stelem.i4
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc.2
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc.1
 	ret
 }
-.method public static int32 Realtime_SetLoginUsername_106aee0(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_WazerNearbyState_106b0c4()
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
 
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
 
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
+	stloc.0
 	ldc.i4.s 0
-	stloc 5
+	stloc.1
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106aee0: 0x106aee0: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106aee4: 0x106aee4: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106aee8: 0x106aee8: addiu sp, sp, -24
+// 0x0106b0c4: 0x106b0c4: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc.0
+// 0x0106b0c8: 0x106b0c8: lw    v0, 18096(v0)
+	ldloc 2
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4 4524
 	add
+	ldelem.i4
 	stloc.0
-// 0x0106aeec: 0x106aeec: sw    ra, 20(sp)
-// 0x0106aef0: 0x106aef0: jal   0x10a91a0 addiu a0, a0, -19056
-	ldloc.1
-	ldc.i4 -19056
-	add
+// 0x0106b0cc: 0x106b0cc: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 Realtime_SendTrafficInfo_106b0d4()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
 	stloc.1
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b0d4: 0x106b0d4: jr    ra addiu v0, zero, 1
+	ldc.i4.1
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl126::roadmap_login_set_username_10a91a0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	ret
+}
+.method public static int32 Realtime_IsLoggedIn_106b0dc()
+{
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
+
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.2
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106aef8: 0x106aef8: lw    ra, 20(sp)
-// 0x0106aefc: 0x106aefc: sll   zero, zero, 0
-// 0x0106af00: 0x106af00: jr    ra addiu sp, sp, 24
+// 0x0106b0dc: 0x106b0dc: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc.0
+// 0x0106b0e0: 0x106b0e0: lw    v0, 18448(v0)
+	ldloc 2
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 4612
 	add
+	ldelem.i4
 	stloc.0
+// 0x0106b0e4: 0x106b0e4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc.0
 	ret
 }
-.method public static int32 Realtime_LoginDetailsInit_106af08(int32,int32,int32,int32,int32)
+.method public static int32 RealTime_GetMyRanking_106b0fc()
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
 
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
 
 	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
+	stloc.0
 	ldc.i4.s 0
-	stloc 8
+	stloc.1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.2
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b0fc: 0x106b0fc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.0
+// 0x0106b100: 0x106b100: lw    v0, -18644(v0)
+	ldloc 2
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4661
+	add
+	ldelem.i4
+	stloc.0
+// 0x0106b104: 0x106b104: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RealTime_SetMapDisplayed_106b10c(int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
+
+// local  1 is register v0
+// local  0 is register a0
+// local  2 is register ra
+// local  3 is register mem
+
 	ldc.i4.s 0
-	stloc 9
+	stloc.1
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc.2
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106af08: 0x106af08: lui   a0, 0x0
+// 0x0106b10c: 0x106b10c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106af0c: 0x106af0c: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106af10: 0x106af10: addiu a0, a0, 18668
+// 0x0106b110: 0x106b110: jr    ra sw    a0, 14992(v0)
+	ldloc 3
 	ldloc.1
-	ldc.i4 18668
-	add
-	stloc.1
-// 0x0106af14: 0x106af14: sw    ra, 36(sp)
-// 0x0106af18: 0x106af18: sw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 3748
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106af1c: 0x106af1c: jal   0x100e348 sw    s0, 28(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 8
 	stelem.i4
-	ldloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106af24: 0x106af24: lui   a0, 0x0
+	ret
+}
+.method public static int32 Realtime_GetServerCookie_106b134()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
 	ldc.i4.s 0
-	stloc.1
-// 0x0106af28: 0x106af28: addiu a0, a0, 18700
-	ldloc.1
-	ldc.i4 18700
-	add
-	stloc.1
-// 0x0106af2c: 0x106af2c: jal   0x100e348 addu  s1, v0, zero
-	ldloc 5
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106af34: 0x106af34: lui   a0, 0x0
+	stloc.0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106af38: 0x106af38: addiu a0, a0, 18684
-	ldloc.1
-	ldc.i4 18684
-	add
-	stloc.1
-// 0x0106af3c: 0x106af3c: jal   0x100e348 addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106af44: 0x106af44: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x0106af48: 0x106af48: jal   0x106aee0 sw    v0, 16(sp)
-	ldloc 6
+// 0x0106b134: 0x106b134: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc.0
+// 0x0106b138: 0x106b138: jr    ra addiu v0, v0, 18384
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4 18384
 	add
-	ldloc 5
-	stelem.i4
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginUsername_106aee0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106af50: 0x106af50: jal   0x106aeb8 addu  a0, s0, zero
-	ldloc 8
+	ret
+}
+.method public static int32 Realtime_GetServerId_106b140()
+{
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
+
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginPassword_106aeb8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.2
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106af58: 0x106af58: lw    v0, 16(sp)
-	ldloc 6
+// 0x0106b140: 0x106b140: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc.0
+// 0x0106b144: 0x106b144: lw    v0, 18452(v0)
+	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4613
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106af5c: 0x106af5c: jal   0x106ae90 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
+	stloc.0
+// 0x0106b148: 0x106b148: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginNickname_106ae90(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	ret
+}
+.method public static int32 Realtime_AddonState_106b150()
+{
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
+
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.2
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106af64: 0x106af64: lw    ra, 36(sp)
-// 0x0106af68: 0x106af68: lw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106af6c: 0x106af6c: lw    s0, 28(sp)
-	ldloc 6
+// 0x0106b150: 0x106b150: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.0
+// 0x0106b154: 0x106b154: lw    v0, -18628(v0)
+	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 -4657
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106af70: 0x106af70: jr    ra addiu sp, sp, 40
+	stloc.0
+// 0x0106b158: 0x106b158: jr    ra addiu v0, v0, -1
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.m1
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc.0
 	ret
 }
-.method public static int32 Realtime_SetIsNewbieConfig_106af78(int32,int32,int32,int32,int32)
+.method public static int32 onRandomConfirm_106b16c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
 // local  5 is register v0
 // local  8 is register v1
@@ -5417,149 +6154,58 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local  6 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
 	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106af78: 0x106af78: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106af7c: 0x106af7c: lw    v0, 17556(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4389
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106af80: 0x106af80: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106af84: 0x106af84: sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106af88: 0x106af88: sw    ra, 20(sp)
-// 0x0106af8c: 0x106af8c: bne   v0, zero, 0x106afb4 addu  s0, a0, zero
-	ldloc 5
-	ldloc.1
-	stloc 7
-	brtrue L_106afb4
-// --- basic block ---
-// 0x0106af94: 0x106af94: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0106af98: 0x106af98: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0106af9c: 0x106af9c: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0106afa0: 0x106afa0: addiu a0, a0, -26888
-	ldloc.1
-	ldc.i4 -26888
-	add
-	stloc.1
-// 0x0106afa4: 0x106afa4: addiu a1, a1, 14996
-	ldloc.2
-	ldc.i4 14996
-	add
-	stloc.2
-// 0x0106afa8: 0x106afa8: addiu a2, a2, -16892
-	ldloc.3
-	ldc.i4 -16892
-	add
-	stloc.3
-// 0x0106afac: 0x106afac: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-L_106afb4:
-// 0x0106afb4: 0x106afb4: lui   a0, 0x0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
-	stloc.1
-// 0x0106afb8: 0x106afb8: addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-// 0x0106afbc: 0x106afbc: jal   0x100e610 addiu a0, a0, 14996
-	ldloc.1
-	ldc.i4 14996
-	add
-	stloc.1
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b16c: 0x106b16c: addiu sp, sp, -24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106b170: 0x106b170: addiu v0, zero, 3
+	ldc.i4.3
 	stloc 5
+// 0x0106b174: 0x106b174: bne   a0, v0, 0x106b184 sw    ra, 20(sp)
+	ldloc.1
+	ldloc 5
+	bne.un L_106b184
 // --- basic block ---
-// 0x0106afc4: 0x106afc4: jal   0x100ea50 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
+// 0x0106b17c: 0x106b17c: jal   0x10a9e9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_details_dialog_show_10a9e9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106afcc: 0x106afcc: lw    ra, 20(sp)
-// 0x0106afd0: 0x106afd0: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106afd4: 0x106afd4: jr    ra addiu sp, sp, 24
+L_106b184:
+// 0x0106b184: 0x106b184: lw    ra, 20(sp)
+// 0x0106b188: 0x106b188: sll   zero, zero, 0
+// 0x0106b18c: 0x106b18c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5571,26 +6217,25 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_SetIsNewbie_106afdc(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_IsAnonymous_106b194(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  7 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
-// local  7 is register ra
+// local  5 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5599,108 +6244,79 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106afdc: 0x106afdc: addiu sp, sp, -24
+// 0x0106b194: 0x106b194: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b198: 0x106b198: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106b19c: 0x106b19c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106afe0: 0x106afe0: sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106afe4: 0x106afe4: sw    ra, 20(sp)
-// 0x0106afe8: 0x106afe8: jal   0x106af78 addu  s0, a0, zero
+// 0x0106b1a0: 0x106b1a0: addiu a0, a0, 14928
 	ldloc.1
-	stloc 5
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_SetIsNewbieConfig_106af78(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0106aff0: 0x106aff0: bne   s0, zero, 0x106b004 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_106b004
-// --- basic block ---
-// 0x0106aff8: 0x106aff8: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106affc: 0x106affc: jal   0x1034ae8 addiu a0, a0, -14156
-	ldloc.1
-	ldc.i4 -14156
+	ldc.i4 14928
 	add
 	stloc.1
+// 0x0106b1a4: 0x106b1a4: sw    ra, 20(sp)
+// 0x0106b1a8: 0x106b1a8: jal   0x100e804 addiu a1, a1, 20776
+	ldloc.2
+	ldc.i4 20776
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_set_1034ae8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 8
+	stloc 7
 // --- basic block ---
-L_106b004:
-// 0x0106b004: 0x106b004: lw    ra, 20(sp)
-// 0x0106b008: 0x106b008: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b00c: 0x106b00c: jr    ra addiu sp, sp, 24
+// 0x0106b1b0: 0x106b1b0: lw    ra, 20(sp)
+// 0x0106b1b4: 0x106b1b4: sll   zero, zero, 0
+// 0x0106b1b8: 0x106b1b8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
 	ret
 }
-.method public static int32 Realtime_set_random_user_106b014(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_AnonymousMsg_106b1c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  5 is register ra
+// local  7 is register ra
 // local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5712,66 +6328,84 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b014: 0x106b014: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106b018: 0x106b018: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106b01c: 0x106b01c: addiu sp, sp, -24
+// 0x0106b1c0: 0x106b1c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b020: 0x106b020: sw    ra, 20(sp)
-// 0x0106b024: 0x106b024: jal   0x100e610 addiu a0, a0, 15072
-	ldloc.1
-	ldc.i4 15072
-	add
-	stloc.1
+// 0x0106b1c4: 0x106b1c4: sw    ra, 20(sp)
+// 0x0106b1c8: 0x106b1c8: jal   0x106b194 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_IsAnonymous_106b194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0106b02c: 0x106b02c: jal   0x100ea50 addu  a0, zero, zero
+// 0x0106b1d0: 0x106b1d0: beq   v0, zero, 0x106b1f4 addu  v1, zero, zero
+	ldloc 6
 	ldc.i4.s 0
+	stloc 5
+	brfalse L_106b1f4
+// --- basic block ---
+// 0x0106b1d8: 0x106b1d8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106b1dc: 0x106b1dc: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106b1e0: 0x106b1e0: addiu a0, a0, 20788
+	ldloc.1
+	ldc.i4 20788
+	add
 	stloc.1
+// 0x0106b1e4: 0x106b1e4: addiu a1, a1, 20800
+	ldloc.2
+	ldc.i4 20800
+	add
+	stloc.2
+// 0x0106b1e8: 0x106b1e8: jal   0x104bff4 addiu a2, zero, 8
+	ldc.i4.8
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0106b034: 0x106b034: lw    ra, 20(sp)
-// 0x0106b038: 0x106b038: sll   zero, zero, 0
-// 0x0106b03c: 0x106b03c: jr    ra addiu sp, sp, 24
+// 0x0106b1f0: 0x106b1f0: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 5
+L_106b1f4:
+// 0x0106b1f4: 0x106b1f4: lw    ra, 20(sp)
+// 0x0106b1f8: 0x106b1f8: addu  v0, v1, zero
+	ldloc 5
+	stloc 6
+// 0x0106b1fc: 0x106b1fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 Realtime_IsNewbie_106b044(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_GetNickName_106b204(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5806,18 +6440,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b044: 0x106b044: lui   a0, 0x0
+// 0x0106b204: 0x106b204: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106b048: 0x106b048: addiu sp, sp, -24
+// 0x0106b208: 0x106b208: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b04c: 0x106b04c: sw    ra, 20(sp)
-// 0x0106b050: 0x106b050: jal   0x100e788 addiu a0, a0, 14996
+// 0x0106b20c: 0x106b20c: sw    ra, 20(sp)
+// 0x0106b210: 0x106b210: jal   0x100e358 addiu a0, a0, 18684
 	ldloc.1
-	ldc.i4 14996
+	ldc.i4 18684
 	add
 	stloc.1
 	ldloc.0
@@ -5825,14 +6459,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0106b058: 0x106b058: lw    ra, 20(sp)
-// 0x0106b05c: 0x106b05c: sll   zero, zero, 0
-// 0x0106b060: 0x106b060: jr    ra addiu sp, sp, 24
+// 0x0106b218: 0x106b218: lw    ra, 20(sp)
+// 0x0106b21c: 0x106b21c: sll   zero, zero, 0
+// 0x0106b220: 0x106b220: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5844,7 +6478,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
+.method public static int32 RealTime_GetUserName_106b228(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -5879,18 +6513,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b068: 0x106b068: lui   a0, 0x0
+// 0x0106b228: 0x106b228: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106b06c: 0x106b06c: addiu sp, sp, -24
+// 0x0106b22c: 0x106b22c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b070: 0x106b070: sw    ra, 20(sp)
-// 0x0106b074: 0x106b074: jal   0x100e788 addiu a0, a0, 15072
+// 0x0106b230: 0x106b230: sw    ra, 20(sp)
+// 0x0106b234: 0x106b234: jal   0x100e358 addiu a0, a0, 18668
 	ldloc.1
-	ldc.i4 15072
+	ldc.i4 18668
 	add
 	stloc.1
 	ldloc.0
@@ -5898,14 +6532,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0106b07c: 0x106b07c: lw    ra, 20(sp)
-// 0x0106b080: 0x106b080: sll   zero, zero, 0
-// 0x0106b084: 0x106b084: jr    ra addiu sp, sp, 24
+// 0x0106b23c: 0x106b23c: lw    ra, 20(sp)
+// 0x0106b240: 0x106b240: sll   zero, zero, 0
+// 0x0106b244: 0x106b244: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5917,25 +6551,25 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 Realtime_RandomUserMsg_106b08c(int32,int32,int32,int32,int32)
+.method public static int32 RT_GetWebServiceAddress_106b24c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  7 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  8 is register ra
+// local  5 is register ra
 // local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5947,165 +6581,68 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b08c: 0x106b08c: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106b090: 0x106b090: sw    ra, 36(sp)
-// 0x0106b094: 0x106b094: jal   0x106b068 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106b09c: 0x106b09c: beq   v0, zero, 0x106b0ec addu  v1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 7
-	brfalse L_106b0ec
-// --- basic block ---
-// 0x0106b0a4: 0x106b0a4: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x0106b0a8: 0x106b0a8: addiu v0, v0, 20544
-	ldloc 5
-	ldc.i4 20544
-	add
-	stloc 5
-// 0x0106b0ac: 0x106b0ac: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b0b0: 0x106b0b0: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x0106b0b4: 0x106b0b4: addiu v0, v0, 20556
-	ldloc 5
-	ldc.i4 20556
-	add
-	stloc 5
-// 0x0106b0b8: 0x106b0b8: lui   a0, 0x0
+// 0x0106b24c: 0x106b24c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0106b0bc: 0x106b0bc: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106b0c0: 0x106b0c0: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106b0c4: 0x106b0c4: sw    v0, 24(sp)
-	ldloc 6
+// 0x0106b250: 0x106b250: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106b0c8: 0x106b0c8: addiu a0, a0, 30092
+	stloc.0
+// 0x0106b254: 0x106b254: sw    ra, 20(sp)
+// 0x0106b258: 0x106b258: jal   0x100e358 addiu a0, a0, 15200
 	ldloc.1
-	ldc.i4 30092
+	ldc.i4 15200
 	add
 	stloc.1
-// 0x0106b0cc: 0x106b0cc: addiu v0, zero, 8
-	ldc.i4.8
-	stloc 5
-// 0x0106b0d0: 0x106b0d0: addiu a1, a1, 20464
-	ldloc.2
-	ldc.i4 20464
-	add
-	stloc.2
-// 0x0106b0d4: 0x106b0d4: addiu a3, a3, -21688
-	ldloc 4
-	ldc.i4 -21688
-	add
-	stloc 4
-// 0x0106b0d8: 0x106b0d8: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0106b0dc: 0x106b0dc: sw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b0e0: 0x106b0e0: jal   0x104c1b8 sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldc.i4.s 0
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0106b0e8: 0x106b0e8: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-L_106b0ec:
-// 0x0106b0ec: 0x106b0ec: lw    ra, 36(sp)
-// 0x0106b0f0: 0x106b0f0: addu  v0, v1, zero
-	ldloc 7
-	stloc 5
-// 0x0106b0f4: 0x106b0f4: jr    ra addiu sp, sp, 40
+// 0x0106b260: 0x106b260: lw    ra, 20(sp)
+// 0x0106b264: 0x106b264: sll   zero, zero, 0
+// 0x0106b268: 0x106b268: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 7
 	ret
 }
-.method public static int32 RecommentToFriend_106b0fc(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_AllowPing_106b270(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
 
-// local  7 is register v0
-// local  8 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
+// local  6 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6117,98 +6654,88 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_106b0fc:
-// 0x0106b0fc: 0x106b0fc: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x0106b270: 0x106b270: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x0106b100: 0x106b100: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106b104: 0x106b104: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106b108: 0x106b108: addiu sp, sp, -32
+// 0x0106b274: 0x106b274: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b10c: 0x106b10c: addiu a0, a0, -18172
+// 0x0106b278: 0x106b278: sw    ra, 20(sp)
+// 0x0106b27c: 0x106b27c: jal   0x100e358 addiu a0, a0, 14976
 	ldloc.1
-	ldc.i4 -18172
+	ldc.i4 14976
 	add
 	stloc.1
-// 0x0106b110: 0x106b110: addiu a1, a1, 20564
-	ldloc.2
-	ldc.i4 20564
-	add
-	stloc.2
-// 0x0106b114: 0x106b114: addiu a3, a3, -20064
-	ldloc 4
-	ldc.i4 -20064
-	add
-	stloc 4
-// 0x0106b118: 0x106b118: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0106b11c: 0x106b11c: sw    ra, 28(sp)
-// 0x0106b120: 0x106b120: jal   0x104c320 sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldc.i4.s 0
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106b284: 0x106b284: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0106b288: 0x106b288: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0106b28c: 0x106b28c: jal   0x1001b14 addiu a1, a1, 20820
+	ldloc.2
+	ldc.i4 20820
+	add
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
 // --- basic block ---
-// 0x0106b128: 0x106b128: lw    ra, 28(sp)
-// 0x0106b12c: 0x106b12c: sll   zero, zero, 0
-// 0x0106b130: 0x106b130: jr    ra addiu sp, sp, 32
+// 0x0106b294: 0x106b294: lw    ra, 20(sp)
+// 0x0106b298: 0x106b298: sltiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	clt.un
+	stloc 5
+// 0x0106b29c: 0x106b29c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 UpgradeVersion_106b138(int32,int32,int32,int32,int32)
+.method public static int32 NameAndPasswordAlreadyFailedAuthentication_106b2a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6217,173 +6744,128 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b138: 0x106b138: lui   v0, 0xf0000
-	ldc.i4 983040
-	stloc 5
-// 0x0106b13c: 0x106b13c: lw    v0, -30056(v0)
-	ldloc 6
-	ldloc 5
+// 0x0106b2a4: 0x106b2a4: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106b2a8: 0x106b2a8: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106b2ac: 0x106b2ac: lw    a1, 28696(a0)
+	ldloc 8
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7514
+	ldc.i4 7174
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106b140: 0x106b140: addiu sp, sp, -32
+	stloc.2
+// 0x0106b2b0: 0x106b2b0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b144: 0x106b144: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x0106b148: 0x106b148: sltiu v0, v0, 3
-	ldloc 5
-	ldc.i4.3
-	clt.un
+// 0x0106b2b4: 0x106b2b4: addiu v0, zero, 25
+	ldc.i4.s 25
 	stloc 5
-// 0x0106b14c: 0x106b14c: sw    ra, 28(sp)
-// 0x0106b150: 0x106b150: beq   v0, zero, 0x106b190 sw    s0, 24(sp)
+// 0x0106b2b8: 0x106b2b8: sw    ra, 20(sp)
+// 0x0106b2bc: 0x106b2bc: bne   a1, v0, 0x106b2f0 addu  v1, zero, zero
+	ldloc.2
 	ldloc 5
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 7
-	stelem.i4
-	brfalse L_106b190
+	ldc.i4.s 0
+	stloc 6
+	bne.un L_106b2f0
 // --- basic block ---
-// 0x0106b158: 0x106b158: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106b15c: 0x106b15c: jal   0x101cd60 addiu a0, a0, 20632
-	ldloc.1
-	ldc.i4 20632
+// 0x0106b2c4: 0x106b2c4: lui   a1, 0x80000
+	ldc.i4 524288
+	stloc.2
+// 0x0106b2c8: 0x106b2c8: jal   0x1001b14 addiu a1, a1, -18592
+	ldloc.2
+	ldc.i4 -18592
 	add
-	stloc.1
-	ldloc.0
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0106b164: 0x106b164: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x0106b2d0: 0x106b2d0: bne   v0, zero, 0x106b2f0 addu  v1, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 6
+	brtrue L_106b2f0
+// --- basic block ---
+// 0x0106b2d8: 0x106b2d8: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106b168: 0x106b168: addiu a0, a0, 20648
+// 0x0106b2dc: 0x106b2dc: lui   a1, 0x80000
+	ldc.i4 524288
+	stloc.2
+// 0x0106b2e0: 0x106b2e0: addiu a0, a0, 18256
 	ldloc.1
-	ldc.i4 20648
+	ldc.i4 18256
 	add
 	stloc.1
-// 0x0106b16c: 0x106b16c: jal   0x101cd60 addu  s0, v0, zero
-	ldloc 5
-	stloc 7
-	ldloc.0
+// 0x0106b2e4: 0x106b2e4: jal   0x1001b14 addiu a1, a1, -18528
+	ldloc.2
+	ldc.i4 -18528
+	add
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0106b174: 0x106b174: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106b178: 0x106b178: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x0106b17c: 0x106b17c: addu  a1, v0, zero
+// 0x0106b2ec: 0x106b2ec: sltiu v1, v0, 1
 	ldloc 5
-	stloc.2
-// 0x0106b180: 0x106b180: addiu a3, a3, -5396
-	ldloc 4
-	ldc.i4 -5396
-	add
-	stloc 4
-// 0x0106b184: 0x106b184: addiu a2, zero, 1
 	ldc.i4.1
-	stloc.3
-// 0x0106b188: 0x106b188: jal   0x104c320 sw    zero, 16(sp)
+	clt.un
+	stloc 6
+L_106b2f0:
+// 0x0106b2f0: 0x106b2f0: lw    ra, 20(sp)
+// 0x0106b2f4: 0x106b2f4: addu  v0, v1, zero
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldc.i4.s 0
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 5
-// --- basic block ---
-L_106b190:
-// 0x0106b190: 0x106b190: lw    ra, 28(sp)
-// 0x0106b194: 0x106b194: lw    s0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106b198: 0x106b198: jr    ra addiu sp, sp, 32
+// 0x0106b2f8: 0x106b2f8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 recommend_waze_dialog_callbak_106b1a0(int32,int32,int32,int32,int32)
+.method public static int32 GetEnableDisableState_106b334(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
 // local  6 is register ra
-// local  7 is register mem
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6397,28 +6879,21 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 6
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b1a0: 0x106b1a0: addiu sp, sp, -32
+// 0x0106b334: 0x106b334: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b338: 0x106b338: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b1a4: 0x106b1a4: addiu v0, zero, 3
-	ldc.i4.3
-	stloc 5
-// 0x0106b1a8: 0x106b1a8: bne   a0, v0, 0x106b1e4 sw    ra, 28(sp)
-	ldloc.1
-	ldloc 5
-	bne.un L_106b1e4
-// --- basic block ---
-// 0x0106b1b0: 0x106b1b0: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106b1b4: 0x106b1b4: jal   0x101cd60 addiu a0, a0, 20716
+// 0x0106b33c: 0x106b33c: sw    ra, 20(sp)
+// 0x0106b340: 0x106b340: jal   0x100e358 addiu a0, a0, 15088
 	ldloc.1
-	ldc.i4 20716
+	ldc.i4 15088
 	add
 	stloc.1
 	ldloc.0
@@ -6426,94 +6901,64 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106b1bc: 0x106b1bc: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0106b1c0: 0x106b1c0: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x0106b348: 0x106b348: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-// 0x0106b1c4: 0x106b1c4: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106b1c8: 0x106b1c8: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0106b1cc: 0x106b1cc: ori   v0, v0, 8
+// 0x0106b34c: 0x106b34c: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4.8
-	or
-	stloc 5
-// 0x0106b1d0: 0x106b1d0: addiu a1, a1, 18500
+	stloc.1
+// 0x0106b350: 0x106b350: jal   0x1001b14 addiu a1, a1, 21112
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 21112
 	add
 	stloc.2
-// 0x0106b1d4: 0x106b1d4: addiu a2, a2, -12920
-	ldloc.3
-	ldc.i4 -12920
-	add
-	stloc.3
-// 0x0106b1d8: 0x106b1d8: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x0106b1dc: 0x106b1dc: jal   0x1052e08 sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-L_106b1e4:
-// 0x0106b1e4: 0x106b1e4: lw    ra, 28(sp)
-// 0x0106b1e8: 0x106b1e8: sll   zero, zero, 0
-// 0x0106b1ec: 0x106b1ec: jr    ra addiu sp, sp, 32
+// 0x0106b358: 0x106b358: lw    ra, 20(sp)
+// 0x0106b35c: 0x106b35c: sltiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	clt.un
+	stloc 5
+// 0x0106b360: 0x106b360: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_NotifySplashUpdateTime_106b1f4(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SaveLoginInfo_106b388(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
 // local  7 is register ra
-// local  6 is register mem
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6527,125 +6972,111 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b1f4: 0x106b1f4: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106b1f8: 0x106b1f8: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106b1fc: 0x106b1fc: lui   a0, 0x70000
-	ldc.i4 458752
+// 0x0106b388: 0x106b388: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x0106b200: 0x106b200: addiu sp, sp, -40
+// 0x0106b38c: 0x106b38c: lui   a1, 0x70000
+	ldc.i4 458752
+	stloc.2
+// 0x0106b390: 0x106b390: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b204: 0x106b204: addiu a0, a0, 17728
+// 0x0106b394: 0x106b394: addiu a0, a0, 18668
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18668
 	add
 	stloc.1
-// 0x0106b208: 0x106b208: sw    ra, 36(sp)
-// 0x0106b20c: 0x106b20c: jal   0x10736b0 addiu a2, a2, -1940
-	ldloc.3
-	ldc.i4 -1940
+// 0x0106b398: 0x106b398: sw    ra, 20(sp)
+// 0x0106b39c: 0x106b39c: jal   0x100e5d0 addiu a1, a1, 18192
+	ldloc.2
+	ldc.i4 18192
 	add
-	stloc.3
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_NotifySplashUpdateTime_10736b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106b214: 0x106b214: bne   v0, zero, 0x106b240 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x0106b3a4: 0x106b3a4: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b3a8: 0x106b3a8: lui   a1, 0x70000
+	ldc.i4 458752
 	stloc.2
-	brtrue L_106b240
-// --- basic block ---
-// 0x0106b21c: 0x106b21c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b220: 0x106b220: addiu a1, a1, 20732
+// 0x0106b3ac: 0x106b3ac: addiu a0, a0, 18700
+	ldloc.1
+	ldc.i4 18700
+	add
+	stloc.1
+// 0x0106b3b0: 0x106b3b0: jal   0x100e5d0 addiu a1, a1, 18256
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 18256
 	add
 	stloc.2
-// 0x0106b224: 0x106b224: addiu a3, a3, 20764
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 20764
-	add
-	stloc 4
-// 0x0106b228: 0x106b228: addiu a0, zero, 4
-	ldc.i4.4
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106b3b8: 0x106b3b8: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x0106b22c: 0x106b22c: addiu a2, zero, 4231
-	ldc.i4 4231
-	stloc.3
-// 0x0106b230: 0x106b230: sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+// 0x0106b3bc: 0x106b3bc: lui   a1, 0x70000
+	ldc.i4 458752
+	stloc.2
+// 0x0106b3c0: 0x106b3c0: addiu a0, a0, 18684
+	ldloc.1
+	ldc.i4 18684
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106b234: 0x106b234: jal   0x100449c sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc.1
+// 0x0106b3c4: 0x106b3c4: jal   0x100e5d0 addiu a1, a1, 18320
+	ldloc.2
+	ldc.i4 18320
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106b23c: 0x106b23c: lw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 5
-L_106b240:
-// 0x0106b240: 0x106b240: lw    ra, 36(sp)
-// 0x0106b244: 0x106b244: sll   zero, zero, 0
-// 0x0106b248: 0x106b248: jr    ra addiu sp, sp, 40
+// 0x0106b3cc: 0x106b3cc: lw    ra, 20(sp)
+// 0x0106b3d0: 0x106b3d0: sll   zero, zero, 0
+// 0x0106b3d4: 0x106b3d4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 ThereAreTooManyNetworkErrors_106b250(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_CheckDumpOfflineAfterCrash_106b404(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
 
 // local  5 is register v0
 // local  6 is register v1
@@ -6653,10 +7084,10 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
+// local  7 is register s0
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local  9 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -6671,202 +7102,134 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b250: 0x106b250: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0106b254: 0x106b254: addiu v0, v0, -19072
-	ldloc 5
-	ldc.i4 -19072
-	add
-	stloc 5
-// 0x0106b258: 0x106b258: lw    v1, 8(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106b25c: 0x106b25c: addiu sp, sp, -40
+// 0x0106b404: 0x106b404: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b260: 0x106b260: slti  v1, v1, 100
-	ldloc 6
-	ldc.i4.s 100
-	clt
-	stloc 6
-// 0x0106b264: 0x106b264: beq   v1, zero, 0x106b280 sw    ra, 36(sp)
-	ldloc 6
-	brfalse L_106b280
-// --- basic block ---
-// 0x0106b26c: 0x106b26c: lw    v0, 4(v0)
-	ldloc 7
-	ldloc 5
+// 0x0106b408: 0x106b408: sw    s0, 16(sp)
+	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106b270: 0x106b270: sll   zero, zero, 0
-// 0x0106b274: 0x106b274: slti  v0, v0, 1000
-	ldloc 5
-	ldc.i4 1000
-	clt
-	stloc 5
-// 0x0106b278: 0x106b278: bne   v0, zero, 0x106b2e8 addu  v0, zero, zero
-	ldloc 5
+	ldloc 7
+	stelem.i4
+// 0x0106b40c: 0x106b40c: lui   s0, 0x0
 	ldc.i4.s 0
+	stloc 7
+// 0x0106b410: 0x106b410: sw    ra, 20(sp)
+// 0x0106b414: 0x106b414: jal   0x100e358 addiu a0, s0, 14960
+	ldloc 7
+	ldc.i4 14960
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	brtrue L_106b2e8
 // --- basic block ---
-L_106b280:
-// 0x0106b280: 0x106b280: addu  v1, zero, zero
+// 0x0106b41c: 0x106b41c: lui   a1, 0x0
 	ldc.i4.s 0
-	stloc 6
-// 0x0106b284: 0x106b284: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x0106b288: 0x106b288: cibyl_sysc 0x20e4
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x0106b28c: 0x106b28c: addu  v1, v0, zero
+	stloc.2
+// 0x0106b420: 0x106b420: addu  a0, v0, zero
 	ldloc 5
-	stloc 6
-// 0x0106b290: 0x106b290: lui   a0, 0x80000
-	ldc.i4 524288
 	stloc.1
-// 0x0106b294: 0x106b294: lw    v0, -19072(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4768
+// 0x0106b424: 0x106b424: jal   0x1001b14 addiu a1, a1, 20820
+	ldloc.2
+	ldc.i4 20820
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106b298: 0x106b298: sll   zero, zero, 0
-// 0x0106b29c: 0x106b29c: subu  v0, v1, v0
-	ldloc 6
-	ldloc 5
-	sub
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
-// 0x0106b2a0: 0x106b2a0: slti  v1, v0, 1200
+// --- basic block ---
+// 0x0106b42c: 0x106b42c: bne   v0, zero, 0x106b458 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 1200
-	clt
-	stloc 6
-// 0x0106b2a4: 0x106b2a4: bne   v1, zero, 0x106b2e4 addiu a0, a0, -19072
-	ldloc 6
-	ldloc.1
-	ldc.i4 -19072
-	add
-	stloc.1
-	brtrue L_106b2e4
+	brtrue L_106b458
 // --- basic block ---
-// 0x0106b2ac: 0x106b2ac: lw    v1, 8(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106b2b0: 0x106b2b0: lw    t0, 4(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
+// 0x0106b434: 0x106b434: addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b438: 0x106b438: jal   0x10b9efc addiu a1, zero, 1
 	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106b2b4: 0x106b2b4: lui   a1, 0x10000
-	ldc.i4 65536
 	stloc.2
-// 0x0106b2b8: 0x106b2b8: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b2bc: 0x106b2bc: addiu a1, a1, 20732
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b2c0: 0x106b2c0: addiu a3, a3, 20816
+	ldloc.3
 	ldloc 4
-	ldc.i4 20816
-	add
-	stloc 4
-// 0x0106b2c4: 0x106b2c4: addiu a0, zero, 3
-	ldc.i4.3
-	stloc.1
-// 0x0106b2c8: 0x106b2c8: addiu a2, zero, 983
-	ldc.i4 983
-	stloc.3
-// 0x0106b2cc: 0x106b2cc: sw    v0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b2d0: 0x106b2d0: sw    t0, 16(sp)
+	call int32 Cibyl138::editor_cleanup_test_10b9efc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106b440: 0x106b440: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0106b444: 0x106b444: addiu a0, s0, 14960
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4 14960
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106b2d4: 0x106b2d4: jal   0x100449c sw    v1, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	stloc.1
+// 0x0106b448: 0x106b448: jal   0x100e5d0 addiu a1, a1, 9928
+	ldloc.2
+	ldc.i4 9928
 	add
-	ldloc 6
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106b2dc: 0x106b2dc: j	 0x106b2e8 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106b2e8
-// --- basic block ---
-L_106b2e4:
-// 0x0106b2e4: 0x106b2e4: addu  v0, zero, zero
+// 0x0106b450: 0x106b450: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-L_106b2e8:
-// 0x0106b2e8: 0x106b2e8: lw    ra, 36(sp)
-// 0x0106b2ec: 0x106b2ec: sll   zero, zero, 0
-// 0x0106b2f0: 0x106b2f0: jr    ra addiu sp, sp, 40
+// --- basic block ---
+L_106b458:
+// 0x0106b458: 0x106b458: lw    ra, 20(sp)
+// 0x0106b45c: 0x106b45c: lw    s0, 16(sp)
+	ldloc 8
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106b460: 0x106b460: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -6876,25 +7239,25 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_ExternalPoiNotifyOnNavigate_106b2f8(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Set_AllowPing_106b468(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
+// local  6 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6906,140 +7269,108 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b2f8: 0x106b2f8: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106b2fc: 0x106b2fc: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106b300: 0x106b300: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106b304: 0x106b304: addiu sp, sp, -40
+// 0x0106b468: 0x106b468: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b308: 0x106b308: addiu a0, a0, 17728
+// 0x0106b46c: 0x106b46c: sw    ra, 20(sp)
+// 0x0106b470: 0x106b470: beq   a0, zero, 0x106b488 lui   v0, 0x0
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_106b488
+// --- basic block ---
+// 0x0106b478: 0x106b478: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0106b47c: 0x106b47c: addiu a0, v0, 14976
+	ldloc 5
+	ldc.i4 14976
 	add
 	stloc.1
-// 0x0106b30c: 0x106b30c: sw    ra, 36(sp)
-// 0x0106b310: 0x106b310: jal   0x1073740 addiu a2, a2, -1848
-	ldloc.3
-	ldc.i4 -1848
+// 0x0106b480: 0x106b480: j	 0x106b494 addiu a1, a1, 20820
+	ldloc.2
+	ldc.i4 20820
 	add
-	stloc.3
+	stloc.2
+	br L_106b494
+// --- basic block ---
+L_106b488:
+// 0x0106b488: 0x106b488: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0106b48c: 0x106b48c: addiu a0, v0, 14976
+	ldloc 5
+	ldc.i4 14976
+	add
+	stloc.1
+// 0x0106b490: 0x106b490: addiu a1, a1, 9928
+	ldloc.2
+	ldc.i4 9928
+	add
+	stloc.2
+L_106b494:
+// 0x0106b494: 0x106b494: jal   0x100e5d0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_ExternalPoiNotifyOnNavigate_1073740(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106b318: 0x106b318: bne   v0, zero, 0x106b344 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106b344
-// --- basic block ---
-// 0x0106b320: 0x106b320: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b324: 0x106b324: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b328: 0x106b328: addiu a3, a3, 20948
-	ldloc 4
-	ldc.i4 20948
-	add
-	stloc 4
-// 0x0106b32c: 0x106b32c: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106b330: 0x106b330: addiu a2, zero, 4219
-	ldc.i4 4219
-	stloc.3
-// 0x0106b334: 0x106b334: sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b338: 0x106b338: jal   0x100449c sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+// 0x0106b49c: 0x106b49c: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106b340: 0x106b340: lw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 5
-L_106b344:
-// 0x0106b344: 0x106b344: lw    ra, 36(sp)
-// 0x0106b348: 0x106b348: sll   zero, zero, 0
-// 0x0106b34c: 0x106b34c: jr    ra addiu sp, sp, 40
+// 0x0106b4a4: 0x106b4a4: lw    ra, 20(sp)
+// 0x0106b4a8: 0x106b4a8: sll   zero, zero, 0
+// 0x0106b4ac: 0x106b4ac: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_ExternalPoiNotifyOnPopUp_106b354(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SetLoginNickname_106b4b4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  5 is register v0
+// local  7 is register v0
 // local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  7 is register ra
+// local  5 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 7
 	ldc.i4.s 0
 	stloc 8
 	ldarg 1
@@ -7053,143 +7384,71 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b354: 0x106b354: addu  a1, a0, zero
+// 0x0106b4b4: 0x106b4b4: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0106b358: 0x106b358: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106b35c: 0x106b35c: lui   a0, 0x70000
-	ldc.i4 458752
+// 0x0106b4b8: 0x106b4b8: lui   a0, 0x80000
+	ldc.i4 524288
 	stloc.1
-// 0x0106b360: 0x106b360: addiu sp, sp, -40
+// 0x0106b4bc: 0x106b4bc: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b364: 0x106b364: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106b368: 0x106b368: sw    ra, 36(sp)
-// 0x0106b36c: 0x106b36c: jal   0x107377c addiu a2, a2, -1756
-	ldloc.3
-	ldc.i4 -1756
-	add
-	stloc.3
-	ldloc.0
+// 0x0106b4c0: 0x106b4c0: sw    ra, 20(sp)
+// 0x0106b4c4: 0x106b4c4: jal   0x10a97a0 addiu a0, a0, -18592
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::RTNet_ExternalPoiNotifyOnPopUp_107377c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106b374: 0x106b374: bne   v0, zero, 0x106b3a0 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106b3a0
-// --- basic block ---
-// 0x0106b37c: 0x106b37c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b380: 0x106b380: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b384: 0x106b384: addiu a3, a3, 21004
-	ldloc 4
-	ldc.i4 21004
+	ldc.i4 -18592
 	add
-	stloc 4
-// 0x0106b388: 0x106b388: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0106b38c: 0x106b38c: addiu a2, zero, 4208
-	ldc.i4 4208
-	stloc.3
-// 0x0106b390: 0x106b390: sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b394: 0x106b394: jal   0x100449c sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldc.i4.s 0
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_set_nickname_10a97a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 5
+	stloc 7
 // --- basic block ---
-// 0x0106b39c: 0x106b39c: lw    v0, 24(sp)
-	ldloc 6
+// 0x0106b4cc: 0x106b4cc: lw    ra, 20(sp)
+// 0x0106b4d0: 0x106b4d0: sll   zero, zero, 0
+// 0x0106b4d4: 0x106b4d4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 5
-L_106b3a0:
-// 0x0106b3a0: 0x106b3a0: lw    ra, 36(sp)
-// 0x0106b3a4: 0x106b3a4: sll   zero, zero, 0
-// 0x0106b3a8: 0x106b3a8: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 7
 	ret
 }
-.method public static int32 Realtime_FacebookPermissions_106b3b0(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SetLoginPassword_106b4dc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  7 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
 // local  0 is register sp
-// local  8 is register ra
+// local  5 is register ra
 // local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -7198,182 +7457,74 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b3b0: 0x106b3b0: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106b3b4: 0x106b3b4: addu  v0, a2, zero
-	ldloc.3
-	stloc 5
-// 0x0106b3b8: 0x106b3b8: addu  t0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0106b3bc: 0x106b3bc: addu  v1, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106b3c0: 0x106b3c0: sw    a3, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 4
-	stelem.i4
-// 0x0106b3c4: 0x106b3c4: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106b3c8: 0x106b3c8: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x0106b3cc: 0x106b3cc: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106b3d0: 0x106b3d0: addiu v0, v0, -1664
-	ldloc 5
-	ldc.i4 -1664
-	add
-	stloc 5
-// 0x0106b3d4: 0x106b3d4: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106b3d8: 0x106b3d8: addu  a1, t0, zero
-	ldloc 9
-	stloc.2
-// 0x0106b3dc: 0x106b3dc: addu  a2, v1, zero
-	ldloc 7
-	stloc.3
-// 0x0106b3e0: 0x106b3e0: sw    ra, 36(sp)
-// 0x0106b3e4: 0x106b3e4: jal   0x10737b8 sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
+// 0x0106b4dc: 0x106b4dc: addu  a1, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::RTNet_FacebookPermissions_10737b8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106b3ec: 0x106b3ec: bne   v0, zero, 0x106b418 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106b418
-// --- basic block ---
-// 0x0106b3f4: 0x106b3f4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b3f8: 0x106b3f8: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x0106b3fc: 0x106b3fc: addiu a3, a3, 21056
-	ldloc 4
-	ldc.i4 21056
-	add
-	stloc 4
-// 0x0106b400: 0x106b400: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106b4e0: 0x106b4e0: lui   a0, 0x80000
+	ldc.i4 524288
 	stloc.1
-// 0x0106b404: 0x106b404: addiu a2, zero, 4196
-	ldc.i4 4196
-	stloc.3
-// 0x0106b408: 0x106b408: sw    v0, 24(sp)
-	ldloc 6
+// 0x0106b4e4: 0x106b4e4: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106b40c: 0x106b40c: jal   0x100449c sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc.0
+// 0x0106b4e8: 0x106b4e8: sw    ra, 20(sp)
+// 0x0106b4ec: 0x106b4ec: jal   0x10a97c4 addiu a0, a0, -18592
+	ldloc.1
+	ldc.i4 -18592
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_set_pwd_10a97c4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0106b414: 0x106b414: lw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 5
-L_106b418:
-// 0x0106b418: 0x106b418: lw    ra, 36(sp)
-// 0x0106b41c: 0x106b41c: sll   zero, zero, 0
-// 0x0106b420: 0x106b420: jr    ra addiu sp, sp, 40
+// 0x0106b4f4: 0x106b4f4: lw    ra, 20(sp)
+// 0x0106b4f8: 0x106b4f8: sll   zero, zero, 0
+// 0x0106b4fc: 0x106b4fc: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 7
 	ret
 }
-.method public static int32 Realtime_ReportAbuse_106b428(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SetLoginUsername_106b504(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  6 is register v0
-// local  9 is register v1
+// local  7 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  5 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -7382,303 +7533,59 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106b428: 0x106b428: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x0106b42c: 0x106b42c: sw    s1, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106b430: 0x106b430: sw    s0, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106b434: 0x106b434: addu  s1, a0, zero
-	ldloc.1
-	stloc 8
-// 0x0106b438: 0x106b438: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106b43c: 0x106b43c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106b440: 0x106b440: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106b444: 0x106b444: addu  a1, s1, zero
-	ldloc 8
-	stloc.2
-// 0x0106b448: 0x106b448: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106b44c: 0x106b44c: addiu a3, a3, -3480
-	ldloc 4
-	ldc.i4 -3480
-	add
-	stloc 4
-// 0x0106b450: 0x106b450: sw    ra, 52(sp)
-// 0x0106b454: 0x106b454: jal   0x10738c8 addu  a2, s0, zero
-	ldloc 7
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::RTNet_ReportAbuse_10738c8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b45c: 0x106b45c: beq   v0, zero, 0x106b490 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brfalse L_106b490
-// --- basic block ---
-// 0x0106b464: 0x106b464: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b468: 0x106b468: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b46c: 0x106b46c: addiu a3, a3, 21104
-	ldloc 4
-	ldc.i4 21104
-	add
-	stloc 4
-// 0x0106b470: 0x106b470: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106b474: 0x106b474: addiu a2, zero, 4173
-	ldc.i4 4173
-	stloc.3
-// 0x0106b478: 0x106b478: sw    s1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106b47c: 0x106b47c: sw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106b480: 0x106b480: jal   0x100449c sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
+// 0x0106b504: 0x106b504: addu  a1, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x0106b488: 0x106b488: j	 0x106b4b8 sll   zero, zero, 0
-	br L_106b4b8
-// --- basic block ---
-L_106b490:
-// 0x0106b490: 0x106b490: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b494: 0x106b494: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x0106b498: 0x106b498: addiu a3, a3, 21164
-	ldloc 4
-	ldc.i4 21164
-	add
-	stloc 4
-// 0x0106b49c: 0x106b49c: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106b508: 0x106b508: lui   a0, 0x80000
+	ldc.i4 524288
 	stloc.1
-// 0x0106b4a0: 0x106b4a0: addiu a2, zero, 4175
-	ldc.i4 4175
-	stloc.3
-// 0x0106b4a4: 0x106b4a4: sw    s1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106b4a8: 0x106b4a8: sw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106b4ac: 0x106b4ac: sw    zero, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106b4b0: 0x106b4b0: jal   0x100449c sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-L_106b4b8:
-// 0x0106b4b8: 0x106b4b8: lw    v0, 32(sp)
-	ldloc 5
+// 0x0106b50c: 0x106b50c: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106b4bc: 0x106b4bc: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106b4c0: 0x106b4c0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106b4c4: 0x106b4c4: addiu a0, a0, 18500
+	stloc.0
+// 0x0106b510: 0x106b510: sw    ra, 20(sp)
+// 0x0106b514: 0x106b514: jal   0x10a97e8 addiu a0, a0, -18592
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 -18592
 	add
 	stloc.1
-// 0x0106b4c8: 0x106b4c8: addiu a1, a1, -14252
-	ldloc.2
-	ldc.i4 -14252
-	add
-	stloc.2
-// 0x0106b4cc: 0x106b4cc: addiu a2, zero, 3
-	ldc.i4.3
-	stloc.3
-// 0x0106b4d0: 0x106b4d0: jal   0x104bfe4 sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_login_set_username_10a97e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x0106b4d8: 0x106b4d8: lw    ra, 52(sp)
-// 0x0106b4dc: 0x106b4dc: lw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106b4e0: 0x106b4e0: lw    s1, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
 	stloc 8
-// 0x0106b4e4: 0x106b4e4: lw    s0, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
 	stloc 7
-// 0x0106b4e8: 0x106b4e8: jr    ra addiu sp, sp, 56
+// --- basic block ---
+// 0x0106b51c: 0x106b51c: lw    ra, 20(sp)
+// 0x0106b520: 0x106b520: sll   zero, zero, 0
+// 0x0106b524: 0x106b524: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 7
 	ret
 }
-.method public static int32 Realtime_CollectCustomBonus_106b4f0(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_LoginDetailsInit_106b52c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -7686,8 +7593,10 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  8 is register ra
+// local 10 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -7702,101 +7611,111 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b4f0: 0x106b4f0: addu  v0, a1, zero
-	ldloc.2
-	stloc 5
-// 0x0106b4f4: 0x106b4f4: addu  v1, a0, zero
-	ldloc.1
-	stloc 7
-// 0x0106b4f8: 0x106b4f8: addu  a3, a2, zero
-	ldloc.3
-	stloc 4
-// 0x0106b4fc: 0x106b4fc: lui   a0, 0x70000
-	ldc.i4 458752
+// 0x0106b52c: 0x106b52c: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x0106b500: 0x106b500: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0106b504: 0x106b504: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106b508: 0x106b508: addiu sp, sp, -40
+// 0x0106b530: 0x106b530: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106b50c: 0x106b50c: addu  a1, v1, zero
-	ldloc 7
-	stloc.2
-// 0x0106b510: 0x106b510: addiu v0, v0, -3364
-	ldloc 5
-	ldc.i4 -3364
-	add
-	stloc 5
-// 0x0106b514: 0x106b514: addiu a0, a0, 17728
+// 0x0106b534: 0x106b534: addiu a0, a0, 18668
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18668
 	add
 	stloc.1
-// 0x0106b518: 0x106b518: sw    ra, 36(sp)
-// 0x0106b51c: 0x106b51c: jal   0x1073910 sw    v0, 16(sp)
+// 0x0106b538: 0x106b538: sw    ra, 36(sp)
+// 0x0106b53c: 0x106b53c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 5
+	ldloc 9
+	stelem.i4
+// 0x0106b540: 0x106b540: jal   0x100e358 sw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 8
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_CollectCustomBonus_1073910(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106b524: 0x106b524: beq   v0, zero, 0x106b550 lui   a1, 0x10000
+// 0x0106b548: 0x106b548: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b54c: 0x106b54c: addiu a0, a0, 18700
+	ldloc.1
+	ldc.i4 18700
+	add
+	stloc.1
+// 0x0106b550: 0x106b550: jal   0x100e358 addu  s1, v0, zero
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_106b550
-// --- basic block ---
-// 0x0106b52c: 0x106b52c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b530: 0x106b530: addiu a1, a1, 20732
+	stloc 9
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b534: 0x106b534: addiu a3, a3, 21232
+	ldloc.3
 	ldloc 4
-	ldc.i4 21232
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106b558: 0x106b558: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b55c: 0x106b55c: addiu a0, a0, 18684
+	ldloc.1
+	ldc.i4 18684
 	add
-	stloc 4
-// 0x0106b538: 0x106b538: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106b53c: 0x106b53c: addiu a2, zero, 4157
-	ldc.i4 4157
-	stloc.3
-// 0x0106b540: 0x106b540: jal   0x100449c sw    v0, 24(sp)
+// 0x0106b560: 0x106b560: jal   0x100e358 addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106b568: 0x106b568: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x0106b56c: 0x106b56c: jal   0x106b504 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldloc 5
 	stelem.i4
@@ -7805,74 +7724,66 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginUsername_106b504(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106b548: 0x106b548: j	 0x106b570 sll   zero, zero, 0
-	br L_106b570
-// --- basic block ---
-L_106b550:
-// 0x0106b550: 0x106b550: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b554: 0x106b554: addiu a1, a1, 20732
+// 0x0106b574: 0x106b574: jal   0x106b4dc addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b558: 0x106b558: addiu a3, a3, 21264
+	ldloc.3
 	ldloc 4
-	ldc.i4 21264
-	add
-	stloc 4
-// 0x0106b55c: 0x106b55c: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106b560: 0x106b560: addiu a2, zero, 4159
-	ldc.i4 4159
-	stloc.3
-// 0x0106b564: 0x106b564: sw    zero, 16(sp)
+	call int32 Cibyl79::Realtime_SetLoginPassword_106b4dc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106b57c: 0x106b57c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106b568: 0x106b568: jal   0x100449c sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
+	ldelem.i4
+	stloc 5
+// 0x0106b580: 0x106b580: jal   0x106b4b4 addu  a0, v0, zero
 	ldloc 5
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginNickname_106b4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106b570:
-// 0x0106b570: 0x106b570: lw    ra, 36(sp)
-// 0x0106b574: 0x106b574: lw    v0, 24(sp)
+// 0x0106b588: 0x106b588: lw    ra, 36(sp)
+// 0x0106b58c: 0x106b58c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106b578: 0x106b578: jr    ra addiu sp, sp, 40
+	stloc 9
+// 0x0106b590: 0x106b590: lw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106b594: 0x106b594: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -7884,26 +7795,26 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_CollectBonus_106b580(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SetIsNewbieConfig_106b59c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
+// local  7 is register s0
 // local  0 is register sp
-// local  8 is register ra
+// local  9 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -7913,197 +7824,138 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b580: 0x106b580: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106b584: 0x106b584: addu  v0, a2, zero
-	ldloc.3
+// 0x0106b59c: 0x106b59c: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x0106b588: 0x106b588: addu  t0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0106b58c: 0x106b58c: addu  v1, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106b590: 0x106b590: sw    a3, 16(sp)
+// 0x0106b5a0: 0x106b5a0: lw    v0, 18020(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 4
-	stelem.i4
-// 0x0106b594: 0x106b594: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106b598: 0x106b598: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x0106b59c: 0x106b59c: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106b5a0: 0x106b5a0: addu  a1, t0, zero
-	ldloc 9
-	stloc.2
-// 0x0106b5a4: 0x106b5a4: addiu v0, v0, -3364
-	ldloc 5
-	ldc.i4 -3364
+	ldc.i4 4505
 	add
+	ldelem.i4
 	stloc 5
-// 0x0106b5a8: 0x106b5a8: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x0106b5a4: 0x106b5a4: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.1
-// 0x0106b5ac: 0x106b5ac: addu  a2, v1, zero
-	ldloc 7
-	stloc.3
-// 0x0106b5b0: 0x106b5b0: sw    ra, 36(sp)
-// 0x0106b5b4: 0x106b5b4: jal   0x10739cc sw    v0, 20(sp)
+	stloc.0
+// 0x0106b5a8: 0x106b5a8: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
-	ldloc.0
+// 0x0106b5ac: 0x106b5ac: sw    ra, 20(sp)
+// 0x0106b5b0: 0x106b5b0: bne   v0, zero, 0x106b5d8 addu  s0, a0, zero
+	ldloc 5
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::RTNet_CollectBonus_10739cc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
+	brtrue L_106b5d8
 // --- basic block ---
-// 0x0106b5bc: 0x106b5bc: beq   v0, zero, 0x106b5e8 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x0106b5b8: 0x106b5b8: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0106b5bc: 0x106b5bc: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-	brfalse L_106b5e8
-// --- basic block ---
-// 0x0106b5c4: 0x106b5c4: lui   a3, 0x10000
+// 0x0106b5c0: 0x106b5c0: lui   a2, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x0106b5c8: 0x106b5c8: addiu a1, a1, 20732
+	stloc.3
+// 0x0106b5c4: 0x106b5c4: addiu a0, a0, -26424
+	ldloc.1
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x0106b5c8: 0x106b5c8: addiu a1, a1, 14996
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 14996
 	add
 	stloc.2
-// 0x0106b5cc: 0x106b5cc: addiu a3, a3, 21312
-	ldloc 4
-	ldc.i4 21312
+// 0x0106b5cc: 0x106b5cc: addiu a2, a2, 19396
+	ldloc.3
+	ldc.i4 19396
 	add
-	stloc 4
-// 0x0106b5d0: 0x106b5d0: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106b5d4: 0x106b5d4: addiu a2, zero, 4139
-	ldc.i4 4139
 	stloc.3
-// 0x0106b5d8: 0x106b5d8: jal   0x100449c sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
+// 0x0106b5d0: 0x106b5d0: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106b5e0: 0x106b5e0: j	 0x106b608 sll   zero, zero, 0
-	br L_106b608
-// --- basic block ---
-L_106b5e8:
-// 0x0106b5e8: 0x106b5e8: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b5ec: 0x106b5ec: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
+L_106b5d8:
+// 0x0106b5d8: 0x106b5d8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b5dc: 0x106b5dc: addu  a1, s0, zero
+	ldloc 7
 	stloc.2
-// 0x0106b5f0: 0x106b5f0: addiu a3, a3, 21336
-	ldloc 4
-	ldc.i4 21336
+// 0x0106b5e0: 0x106b5e0: jal   0x100e620 addiu a0, a0, 14996
+	ldloc.1
+	ldc.i4 14996
 	add
-	stloc 4
-// 0x0106b5f4: 0x106b5f4: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0106b5f8: 0x106b5f8: addiu a2, zero, 4141
-	ldc.i4 4141
-	stloc.3
-// 0x0106b5fc: 0x106b5fc: sw    zero, 16(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106b5e8: 0x106b5e8: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
-	stelem.i4
-// 0x0106b600: 0x106b600: jal   0x100449c sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-L_106b608:
-// 0x0106b608: 0x106b608: lw    ra, 36(sp)
-// 0x0106b60c: 0x106b60c: lw    v0, 24(sp)
+// 0x0106b5f0: 0x106b5f0: lw    ra, 20(sp)
+// 0x0106b5f4: 0x106b5f4: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106b610: 0x106b610: jr    ra addiu sp, sp, 40
+	stloc 7
+// 0x0106b5f8: 0x106b5f8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
diff --git a/converted/Cibyl8.j b/converted/Cibyl8.j
index dd24209..2d77d99 100644
--- a/converted/Cibyl8.j
+++ b/converted/Cibyl8.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl8::.ctor
 
-.method public static int32 roadmap_square_has_shapes_100b37c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_has_shapes_100b38c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,10 +76,10 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b37c: 0x100b37c: lui   v0, 0x0
+// 0x0100b38c: 0x100b38c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b380: 0x100b380: lw    v1, 576(v0)
+// 0x0100b390: 0x100b390: lw    v1, 576(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -88,53 +88,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b384: 0x100b384: addiu sp, sp, -24
+// 0x0100b394: 0x100b394: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100b388: 0x100b388: beq   a0, v1, 0x100b3a0 sw    ra, 20(sp)
+// 0x0100b398: 0x100b398: beq   a0, v1, 0x100b3b0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 6
-	beq  L_100b3a0
+	beq  L_100b3b0
 // --- basic block ---
-// 0x0100b390: 0x100b390: bltz  a0, 0x100b3a0 sll   zero, zero, 0
+// 0x0100b3a0: 0x100b3a0: bltz  a0, 0x100b3b0 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_100b3a0
+	blt L_100b3b0
 // --- basic block ---
-// 0x0100b398: 0x100b398: jal   0x100b164 sll   zero, zero, 0
+// 0x0100b3a8: 0x100b3a8: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_100b3a0:
-// 0x0100b3a0: 0x100b3a0: lui   v0, 0x20000
+L_100b3b0:
+// 0x0100b3b0: 0x100b3b0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100b3a4: 0x100b3a4: lw    v1, 31236(v0)
+// 0x0100b3b4: 0x100b3b4: lw    v1, 31700(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7809
+	ldc.i4 7925
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b3a8: 0x100b3a8: sll   zero, zero, 0
-// 0x0100b3ac: 0x100b3ac: beq   v1, zero, 0x100b3b8 addu  v0, zero, zero
+// 0x0100b3b8: 0x100b3b8: sll   zero, zero, 0
+// 0x0100b3bc: 0x100b3bc: beq   v1, zero, 0x100b3c8 addu  v0, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_100b3b8
+	brfalse L_100b3c8
 // --- basic block ---
-// 0x0100b3b4: 0x100b3b4: lw    v0, 8(v1)
+// 0x0100b3c4: 0x100b3c4: lw    v0, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -143,10 +143,10 @@ L_100b3a0:
 	add
 	ldelem.i4
 	stloc 5
-L_100b3b8:
-// 0x0100b3b8: 0x100b3b8: lw    ra, 20(sp)
-// 0x0100b3bc: 0x100b3bc: sll   zero, zero, 0
-// 0x0100b3c0: 0x100b3c0: jr    ra addiu sp, sp, 24
+L_100b3c8:
+// 0x0100b3c8: 0x100b3c8: lw    ra, 20(sp)
+// 0x0100b3cc: 0x100b3cc: sll   zero, zero, 0
+// 0x0100b3d0: 0x100b3d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -158,7 +158,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_min_100b3fc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_min_100b40c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -193,31 +193,31 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b3fc: 0x100b3fc: lui   v0, 0x20000
+// 0x0100b40c: 0x100b40c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100b400: 0x100b400: lw    v0, 31244(v0)
+// 0x0100b410: 0x100b410: lw    v0, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b404: 0x100b404: addiu sp, sp, -32
+// 0x0100b414: 0x100b414: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100b408: 0x100b408: beq   v0, zero, 0x100b474 sw    ra, 28(sp)
+// 0x0100b418: 0x100b418: beq   v0, zero, 0x100b484 sw    ra, 28(sp)
 	ldloc 5
-	brfalse L_100b474
+	brfalse L_100b484
 // --- basic block ---
-// 0x0100b410: 0x100b410: lui   v0, 0x0
+// 0x0100b420: 0x100b420: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b414: 0x100b414: lw    v0, 576(v0)
+// 0x0100b424: 0x100b424: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -226,20 +226,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b418: 0x100b418: sll   zero, zero, 0
-// 0x0100b41c: 0x100b41c: beq   a0, v0, 0x100b43c lui   v0, 0x20000
+// 0x0100b428: 0x100b428: sll   zero, zero, 0
+// 0x0100b42c: 0x100b42c: beq   a0, v0, 0x100b44c lui   v0, 0x20000
 	ldloc.1
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	beq  L_100b43c
+	beq  L_100b44c
 // --- basic block ---
-// 0x0100b424: 0x100b424: bltz  a0, 0x100b43c sll   zero, zero, 0
+// 0x0100b434: 0x100b434: bltz  a0, 0x100b44c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_100b43c
+	blt L_100b44c
 // --- basic block ---
-// 0x0100b42c: 0x100b42c: jal   0x100b164 sw    a1, 16(sp)
+// 0x0100b43c: 0x100b43c: jal   0x100b174 sw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -253,12 +253,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100b434: 0x100b434: lw    a1, 16(sp)
+// 0x0100b444: 0x100b444: lw    a1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -267,23 +267,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b438: 0x100b438: lui   v0, 0x20000
+// 0x0100b448: 0x100b448: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_100b43c:
-// 0x0100b43c: 0x100b43c: lw    v1, 31244(v0)
+L_100b44c:
+// 0x0100b44c: 0x100b44c: lw    v1, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b440: 0x100b440: lui   v0, 0x0
+// 0x0100b450: 0x100b450: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b444: 0x100b444: lw    v0, 744(v0)
+// 0x0100b454: 0x100b454: lw    v0, 744(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -292,7 +292,7 @@ L_100b43c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b448: 0x100b448: lw    v1, 8(v1)
+// 0x0100b458: 0x100b458: lw    v1, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -301,25 +301,25 @@ L_100b43c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b44c: 0x100b44c: sll   v0, v0, 2
+// 0x0100b45c: 0x100b45c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100b450: 0x100b450: addu  v0, v1, v0
+// 0x0100b460: 0x100b460: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0100b454: 0x100b454: lw    v0, 0(v0)
+// 0x0100b464: 0x100b464: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100b458: 0x100b458: sll   zero, zero, 0
-// 0x0100b45c: 0x100b45c: lw    v1, 60(v0)
+// 0x0100b468: 0x100b468: sll   zero, zero, 0
+// 0x0100b46c: 0x100b46c: lw    v1, 60(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -328,15 +328,15 @@ L_100b43c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b460: 0x100b460: sll   zero, zero, 0
-// 0x0100b464: 0x100b464: sw    v1, 0(a1)
+// 0x0100b470: 0x100b470: sll   zero, zero, 0
+// 0x0100b474: 0x100b474: sw    v1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0100b468: 0x100b468: lw    v0, 64(v0)
+// 0x0100b478: 0x100b478: lw    v0, 64(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -345,8 +345,8 @@ L_100b43c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b46c: 0x100b46c: sll   zero, zero, 0
-// 0x0100b470: 0x100b470: sw    v0, 4(a1)
+// 0x0100b47c: 0x100b47c: sll   zero, zero, 0
+// 0x0100b480: 0x100b480: sw    v0, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -355,10 +355,10 @@ L_100b43c:
 	add
 	ldloc 5
 	stelem.i4
-L_100b474:
-// 0x0100b474: 0x100b474: lw    ra, 28(sp)
-// 0x0100b478: 0x100b478: sll   zero, zero, 0
-// 0x0100b47c: 0x100b47c: jr    ra addiu sp, sp, 32
+L_100b484:
+// 0x0100b484: 0x100b484: lw    ra, 28(sp)
+// 0x0100b488: 0x100b488: sll   zero, zero, 0
+// 0x0100b48c: 0x100b48c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -370,7 +370,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -405,31 +405,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b484: 0x100b484: lui   v0, 0x20000
+// 0x0100b494: 0x100b494: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100b488: 0x100b488: lw    v1, 31244(v0)
+// 0x0100b498: 0x100b498: lw    v1, 31708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b48c: 0x100b48c: addiu sp, sp, -24
+// 0x0100b49c: 0x100b49c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100b490: 0x100b490: beq   v1, zero, 0x100b4f8 sw    ra, 20(sp)
+// 0x0100b4a0: 0x100b4a0: beq   v1, zero, 0x100b508 sw    ra, 20(sp)
 	ldloc 6
-	brfalse L_100b4f8
+	brfalse L_100b508
 // --- basic block ---
-// 0x0100b498: 0x100b498: lui   v1, 0x0
+// 0x0100b4a8: 0x100b4a8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0100b49c: 0x100b49c: lw    v1, 576(v1)
+// 0x0100b4ac: 0x100b4ac: lw    v1, 576(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -438,50 +438,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b4a0: 0x100b4a0: sll   zero, zero, 0
-// 0x0100b4a4: 0x100b4a4: beq   a0, v1, 0x100b4c4 sll   zero, zero, 0
+// 0x0100b4b0: 0x100b4b0: sll   zero, zero, 0
+// 0x0100b4b4: 0x100b4b4: beq   a0, v1, 0x100b4d4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_100b4c4
+	beq  L_100b4d4
 // --- basic block ---
-// 0x0100b4ac: 0x100b4ac: bltz  a0, 0x100b4fc addu  v0, zero, zero
+// 0x0100b4bc: 0x100b4bc: bltz  a0, 0x100b50c addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_100b4fc
+	blt L_100b50c
 // --- basic block ---
-// 0x0100b4b4: 0x100b4b4: jal   0x100b164 sll   zero, zero, 0
+// 0x0100b4c4: 0x100b4c4: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100b4bc: 0x100b4bc: beq   v0, zero, 0x100b4f8 lui   v0, 0x20000
+// 0x0100b4cc: 0x100b4cc: beq   v0, zero, 0x100b508 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_100b4f8
+	brfalse L_100b508
 // --- basic block ---
-L_100b4c4:
-// 0x0100b4c4: 0x100b4c4: lw    v1, 31244(v0)
+L_100b4d4:
+// 0x0100b4d4: 0x100b4d4: lw    v1, 31708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b4c8: 0x100b4c8: lui   v0, 0x0
+// 0x0100b4d8: 0x100b4d8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b4cc: 0x100b4cc: lw    v0, 744(v0)
+// 0x0100b4dc: 0x100b4dc: lw    v0, 744(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -490,7 +490,7 @@ L_100b4c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b4d0: 0x100b4d0: lw    v1, 8(v1)
+// 0x0100b4e0: 0x100b4e0: lw    v1, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -499,33 +499,33 @@ L_100b4c4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b4d4: 0x100b4d4: sll   v0, v0, 2
+// 0x0100b4e4: 0x100b4e4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100b4d8: 0x100b4d8: addu  v0, v1, v0
+// 0x0100b4e8: 0x100b4e8: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0100b4dc: 0x100b4dc: lw    v0, 0(v0)
+// 0x0100b4ec: 0x100b4ec: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100b4e0: 0x100b4e0: sll   zero, zero, 0
-// 0x0100b4e4: 0x100b4e4: lw    v0, 0(v0)
+// 0x0100b4f0: 0x100b4f0: sll   zero, zero, 0
+// 0x0100b4f4: 0x100b4f4: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100b4e8: 0x100b4e8: sll   zero, zero, 0
-// 0x0100b4ec: 0x100b4ec: lw    v0, 8(v0)
+// 0x0100b4f8: 0x100b4f8: sll   zero, zero, 0
+// 0x0100b4fc: 0x100b4fc: lw    v0, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -534,17 +534,17 @@ L_100b4c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b4f0: 0x100b4f0: j	 0x100b4fc sll   zero, zero, 0
-	br L_100b4fc
+// 0x0100b500: 0x100b500: j	 0x100b50c sll   zero, zero, 0
+	br L_100b50c
 // --- basic block ---
-L_100b4f8:
-// 0x0100b4f8: 0x100b4f8: addu  v0, zero, zero
+L_100b508:
+// 0x0100b508: 0x100b508: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_100b4fc:
-// 0x0100b4fc: 0x100b4fc: lw    ra, 20(sp)
-// 0x0100b500: 0x100b500: sll   zero, zero, 0
-// 0x0100b504: 0x100b504: jr    ra addiu sp, sp, 24
+L_100b50c:
+// 0x0100b50c: 0x100b50c: lw    ra, 20(sp)
+// 0x0100b510: 0x100b510: sll   zero, zero, 0
+// 0x0100b514: 0x100b514: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -556,7 +556,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -591,31 +591,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b50c: 0x100b50c: lui   v0, 0x20000
+// 0x0100b51c: 0x100b51c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100b510: 0x100b510: lw    v1, 31244(v0)
+// 0x0100b520: 0x100b520: lw    v1, 31708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b514: 0x100b514: addiu sp, sp, -24
+// 0x0100b524: 0x100b524: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100b518: 0x100b518: beq   v1, zero, 0x100b580 sw    ra, 20(sp)
+// 0x0100b528: 0x100b528: beq   v1, zero, 0x100b590 sw    ra, 20(sp)
 	ldloc 6
-	brfalse L_100b580
+	brfalse L_100b590
 // --- basic block ---
-// 0x0100b520: 0x100b520: lui   v1, 0x0
+// 0x0100b530: 0x100b530: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0100b524: 0x100b524: lw    v1, 576(v1)
+// 0x0100b534: 0x100b534: lw    v1, 576(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -624,50 +624,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b528: 0x100b528: sll   zero, zero, 0
-// 0x0100b52c: 0x100b52c: beq   a0, v1, 0x100b54c sll   zero, zero, 0
+// 0x0100b538: 0x100b538: sll   zero, zero, 0
+// 0x0100b53c: 0x100b53c: beq   a0, v1, 0x100b55c sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_100b54c
+	beq  L_100b55c
 // --- basic block ---
-// 0x0100b534: 0x100b534: bltz  a0, 0x100b584 addu  v0, zero, zero
+// 0x0100b544: 0x100b544: bltz  a0, 0x100b594 addu  v0, zero, zero
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	blt L_100b584
+	blt L_100b594
 // --- basic block ---
-// 0x0100b53c: 0x100b53c: jal   0x100b164 sll   zero, zero, 0
+// 0x0100b54c: 0x100b54c: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100b544: 0x100b544: beq   v0, zero, 0x100b580 lui   v0, 0x20000
+// 0x0100b554: 0x100b554: beq   v0, zero, 0x100b590 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_100b580
+	brfalse L_100b590
 // --- basic block ---
-L_100b54c:
-// 0x0100b54c: 0x100b54c: lw    v1, 31244(v0)
+L_100b55c:
+// 0x0100b55c: 0x100b55c: lw    v1, 31708(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b550: 0x100b550: lui   v0, 0x0
+// 0x0100b560: 0x100b560: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b554: 0x100b554: lw    v0, 744(v0)
+// 0x0100b564: 0x100b564: lw    v0, 744(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -676,7 +676,7 @@ L_100b54c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b558: 0x100b558: lw    v1, 8(v1)
+// 0x0100b568: 0x100b568: lw    v1, 8(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -685,33 +685,33 @@ L_100b54c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b55c: 0x100b55c: sll   v0, v0, 2
+// 0x0100b56c: 0x100b56c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100b560: 0x100b560: addu  v0, v1, v0
+// 0x0100b570: 0x100b570: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0100b564: 0x100b564: lw    v0, 0(v0)
+// 0x0100b574: 0x100b574: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100b568: 0x100b568: sll   zero, zero, 0
-// 0x0100b56c: 0x100b56c: lw    v0, 0(v0)
+// 0x0100b578: 0x100b578: sll   zero, zero, 0
+// 0x0100b57c: 0x100b57c: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100b570: 0x100b570: sll   zero, zero, 0
-// 0x0100b574: 0x100b574: lw    v0, 8(v0)
+// 0x0100b580: 0x100b580: sll   zero, zero, 0
+// 0x0100b584: 0x100b584: lw    v0, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -720,21 +720,21 @@ L_100b54c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b578: 0x100b578: j	 0x100b584 addiu v0, v0, 10800
+// 0x0100b588: 0x100b588: j	 0x100b594 addiu v0, v0, 10800
 	ldloc 5
 	ldc.i4 10800
 	add
 	stloc 5
-	br L_100b584
+	br L_100b594
 // --- basic block ---
-L_100b580:
-// 0x0100b580: 0x100b580: addu  v0, zero, zero
+L_100b590:
+// 0x0100b590: 0x100b590: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_100b584:
-// 0x0100b584: 0x100b584: lw    ra, 20(sp)
-// 0x0100b588: 0x100b588: sll   zero, zero, 0
-// 0x0100b58c: 0x100b58c: jr    ra addiu sp, sp, 24
+L_100b594:
+// 0x0100b594: 0x100b594: lw    ra, 20(sp)
+// 0x0100b598: 0x100b598: sll   zero, zero, 0
+// 0x0100b59c: 0x100b59c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -746,7 +746,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_edges_100b594(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_edges_100b5a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
@@ -784,12 +784,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b594: 0x100b594: addiu sp, sp, -32
+// 0x0100b5a4: 0x100b5a4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100b598: 0x100b598: sw    s0, 24(sp)
+// 0x0100b5a8: 0x100b5a8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -798,20 +798,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100b59c: 0x100b59c: lui   s0, 0x20000
+// 0x0100b5ac: 0x100b5ac: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100b5a0: 0x100b5a0: lw    v0, 31244(s0)
+// 0x0100b5b0: 0x100b5b0: lw    v0, 31708(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b5a4: 0x100b5a4: sw    ra, 28(sp)
-// 0x0100b5a8: 0x100b5a8: sw    zero, 8(a1)
+// 0x0100b5b4: 0x100b5b4: sw    ra, 28(sp)
+// 0x0100b5b8: 0x100b5b8: sw    zero, 8(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -820,14 +820,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100b5ac: 0x100b5ac: sw    zero, 0(a1)
+// 0x0100b5bc: 0x100b5bc: sw    zero, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100b5b0: 0x100b5b0: sw    zero, 4(a1)
+// 0x0100b5c0: 0x100b5c0: sw    zero, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -836,7 +836,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100b5b4: 0x100b5b4: beq   v0, zero, 0x100b5f4 sw    zero, 12(a1)
+// 0x0100b5c4: 0x100b5c4: beq   v0, zero, 0x100b604 sw    zero, 12(a1)
 	ldloc 6
 	ldloc 5
 	ldloc.2
@@ -846,9 +846,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_100b5f4
+	brfalse L_100b604
 // --- basic block ---
-// 0x0100b5bc: 0x100b5bc: jal   0x100b0dc sw    a1, 16(sp)
+// 0x0100b5cc: 0x100b5cc: jal   0x100b0ec sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -862,12 +862,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100b5c4: 0x100b5c4: lw    a1, 16(sp)
+// 0x0100b5d4: 0x100b5d4: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -876,26 +876,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b5c8: 0x100b5c8: bltz  v0, 0x100b5f4 sll   v0, v0, 2
+// 0x0100b5d8: 0x100b5d8: bltz  v0, 0x100b604 sll   v0, v0, 2
 	ldloc 6
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
 	ldc.i4.s 0
-	blt L_100b5f4
+	blt L_100b604
 // --- basic block ---
-// 0x0100b5d0: 0x100b5d0: lw    v1, 31244(s0)
+// 0x0100b5e0: 0x100b5e0: lw    v1, 31708(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b5d4: 0x100b5d4: sll   zero, zero, 0
-// 0x0100b5d8: 0x100b5d8: lw    v1, 8(v1)
+// 0x0100b5e4: 0x100b5e4: sll   zero, zero, 0
+// 0x0100b5e8: 0x100b5e8: lw    v1, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -904,25 +904,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b5dc: 0x100b5dc: addu  a0, a1, zero
+// 0x0100b5ec: 0x100b5ec: addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-// 0x0100b5e0: 0x100b5e0: addu  v0, v1, v0
+// 0x0100b5f0: 0x100b5f0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 6
 	add
 	stloc 6
-// 0x0100b5e4: 0x100b5e4: lw    a1, 0(v0)
+// 0x0100b5f4: 0x100b5f4: lw    a1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0100b5e8: 0x100b5e8: addiu a2, zero, 16
+// 0x0100b5f8: 0x100b5f8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0100b5ec: 0x100b5ec: jal   0x1001800 addiu a1, a1, 52
+// 0x0100b5fc: 0x100b5fc: jal   0x1001800 addiu a1, a1, 52
 	ldloc.2
 	ldc.i4.s 52
 	add
@@ -936,9 +936,9 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100b5f4:
-// 0x0100b5f4: 0x100b5f4: lw    ra, 28(sp)
-// 0x0100b5f8: 0x100b5f8: lw    s0, 24(sp)
+L_100b604:
+// 0x0100b604: 0x100b604: lw    ra, 28(sp)
+// 0x0100b608: 0x100b608: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -947,7 +947,7 @@ L_100b5f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100b5fc: 0x100b5fc: jr    ra addiu sp, sp, 32
+// 0x0100b60c: 0x100b60c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -959,7 +959,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_points_count_100b76c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_points_count_100b77c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -994,10 +994,10 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b76c: 0x100b76c: lui   v0, 0x0
+// 0x0100b77c: 0x100b77c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100b770: 0x100b770: lw    v1, 576(v0)
+// 0x0100b780: 0x100b780: lw    v1, 576(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -1006,42 +1006,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b774: 0x100b774: addiu sp, sp, -24
+// 0x0100b784: 0x100b784: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100b778: 0x100b778: beq   a0, v1, 0x100b790 sw    ra, 20(sp)
+// 0x0100b788: 0x100b788: beq   a0, v1, 0x100b7a0 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 6
-	beq  L_100b790
+	beq  L_100b7a0
 // --- basic block ---
-// 0x0100b780: 0x100b780: bltz  a0, 0x100b790 sll   zero, zero, 0
+// 0x0100b790: 0x100b790: bltz  a0, 0x100b7a0 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_100b790
+	blt L_100b7a0
 // --- basic block ---
-// 0x0100b788: 0x100b788: jal   0x100b164 sll   zero, zero, 0
+// 0x0100b798: 0x100b798: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_100b790:
-// 0x0100b790: 0x100b790: jal   0x100a064 sll   zero, zero, 0
-	call int32 Cibyl7::roadmap_point_count_100a064()
+L_100b7a0:
+// 0x0100b7a0: 0x100b7a0: jal   0x100a074 sll   zero, zero, 0
+	call int32 Cibyl7::roadmap_point_count_100a074()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100b798: 0x100b798: lw    ra, 20(sp)
-// 0x0100b79c: 0x100b79c: sll   zero, zero, 0
-// 0x0100b7a0: 0x100b7a0: jr    ra addiu sp, sp, 24
+// 0x0100b7a8: 0x100b7a8: lw    ra, 20(sp)
+// 0x0100b7ac: 0x100b7ac: sll   zero, zero, 0
+// 0x0100b7b0: 0x100b7b0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1053,7 +1053,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -1091,24 +1091,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b7a8: 0x100b7a8: lui   v0, 0x20000
+// 0x0100b7b8: 0x100b7b8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100b7ac: 0x100b7ac: lw    v1, 31244(v0)
+// 0x0100b7bc: 0x100b7bc: lw    v1, 31708(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b7b0: 0x100b7b0: addiu sp, sp, -24
+// 0x0100b7c0: 0x100b7c0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100b7b4: 0x100b7b4: sw    s0, 16(sp)
+// 0x0100b7c4: 0x100b7c4: sw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1117,40 +1117,40 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100b7b8: 0x100b7b8: sw    ra, 20(sp)
-// 0x0100b7bc: 0x100b7bc: addu  v0, a0, zero
+// 0x0100b7c8: 0x100b7c8: sw    ra, 20(sp)
+// 0x0100b7cc: 0x100b7cc: addu  v0, a0, zero
 	ldloc.1
 	stloc 5
-// 0x0100b7c0: 0x100b7c0: beq   v1, zero, 0x100b834 addiu s0, zero, -2
+// 0x0100b7d0: 0x100b7d0: beq   v1, zero, 0x100b844 addiu s0, zero, -2
 	ldloc 6
 	ldc.i4.s -2
 	stloc 7
-	brfalse L_100b834
+	brfalse L_100b844
 // --- basic block ---
-// 0x0100b7c8: 0x100b7c8: addiu v1, zero, -1
+// 0x0100b7d8: 0x100b7d8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0100b7cc: 0x100b7cc: bne   a1, v1, 0x100b7dc addu  a0, a1, zero
+// 0x0100b7dc: 0x100b7dc: bne   a1, v1, 0x100b7ec addu  a0, a1, zero
 	ldloc.2
 	ldloc 6
 	ldloc.2
 	stloc.1
-	bne.un L_100b7dc
+	bne.un L_100b7ec
 // --- basic block ---
-// 0x0100b7d4: 0x100b7d4: lui   v1, 0x20000
+// 0x0100b7e4: 0x100b7e4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100b7d8: 0x100b7d8: lw    a0, 31248(v1)
+// 0x0100b7e8: 0x100b7e8: lw    a0, 31712(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc.1
-L_100b7dc:
-// 0x0100b7dc: 0x100b7dc: jal   0x100c63c addu  a1, v0, zero
+L_100b7ec:
+// 0x0100b7ec: 0x100b7ec: jal   0x100c64c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -1158,15 +1158,15 @@ L_100b7dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100b7e4: 0x100b7e4: addu  a0, v0, zero
+// 0x0100b7f4: 0x100b7f4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0100b7e8: 0x100b7e8: jal   0x100b0dc addu  s0, v0, zero
+// 0x0100b7f8: 0x100b7f8: jal   0x100b0ec addu  s0, v0, zero
 	ldloc 5
 	stloc 7
 	ldloc.0
@@ -1174,19 +1174,19 @@ L_100b7dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100b7f0: 0x100b7f0: bgez  v0, 0x100b834 lui   v0, 0x0
+// 0x0100b800: 0x100b800: bgez  v0, 0x100b844 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	bge L_100b834
+	bge L_100b844
 // --- basic block ---
-// 0x0100b7f8: 0x100b7f8: lw    v0, 576(v0)
+// 0x0100b808: 0x100b808: lw    v0, 576(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -1195,18 +1195,18 @@ L_100b7dc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b7fc: 0x100b7fc: sll   zero, zero, 0
-// 0x0100b800: 0x100b800: beq   s0, v0, 0x100b820 sll   zero, zero, 0
+// 0x0100b80c: 0x100b80c: sll   zero, zero, 0
+// 0x0100b810: 0x100b810: beq   s0, v0, 0x100b830 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	beq  L_100b820
+	beq  L_100b830
 // --- basic block ---
-// 0x0100b808: 0x100b808: bltz  s0, 0x100b830 sll   zero, zero, 0
+// 0x0100b818: 0x100b818: bltz  s0, 0x100b840 sll   zero, zero, 0
 	ldloc 7
 	ldc.i4.s 0
-	blt L_100b830
+	blt L_100b840
 // --- basic block ---
-// 0x0100b810: 0x100b810: jal   0x100b164 addu  a0, s0, zero
+// 0x0100b820: 0x100b820: jal   0x100b174 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1214,17 +1214,17 @@ L_100b7dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100b818: 0x100b818: beq   v0, zero, 0x100b830 sll   zero, zero, 0
+// 0x0100b828: 0x100b828: beq   v0, zero, 0x100b840 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100b830
+	brfalse L_100b840
 // --- basic block ---
-L_100b820:
-// 0x0100b820: 0x100b820: jal   0x100b0dc addu  a0, s0, zero
+L_100b830:
+// 0x0100b830: 0x100b830: jal   0x100b0ec addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -1232,26 +1232,26 @@ L_100b820:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100b828: 0x100b828: bgez  v0, 0x100b834 sll   zero, zero, 0
+// 0x0100b838: 0x100b838: bgez  v0, 0x100b844 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bge L_100b834
+	bge L_100b844
 // --- basic block ---
-L_100b830:
-// 0x0100b830: 0x100b830: addiu s0, zero, -1
+L_100b840:
+// 0x0100b840: 0x100b840: addiu s0, zero, -1
 	ldc.i4.m1
 	stloc 7
-L_100b834:
-// 0x0100b834: 0x100b834: lw    ra, 20(sp)
-// 0x0100b838: 0x100b838: addu  v0, s0, zero
+L_100b844:
+// 0x0100b844: 0x100b844: lw    ra, 20(sp)
+// 0x0100b848: 0x100b848: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0100b83c: 0x100b83c: lw    s0, 16(sp)
+// 0x0100b84c: 0x100b84c: lw    s0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1260,7 +1260,7 @@ L_100b834:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100b840: 0x100b840: jr    ra addiu sp, sp, 24
+// 0x0100b850: 0x100b850: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1272,7 +1272,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_square_find_neighbours_100b848(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_find_neighbours_100b858(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s4,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
@@ -1322,12 +1322,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100b848: 0x100b848: addiu sp, sp, -56
+// 0x0100b858: 0x100b858: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0100b84c: 0x100b84c: sw    s3, 44(sp)
+// 0x0100b85c: 0x100b85c: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1336,7 +1336,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100b850: 0x100b850: sw    s2, 40(sp)
+// 0x0100b860: 0x100b860: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1345,7 +1345,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100b854: 0x100b854: sw    s0, 32(sp)
+// 0x0100b864: 0x100b864: sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1354,8 +1354,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100b858: 0x100b858: sw    ra, 52(sp)
-// 0x0100b85c: 0x100b85c: sw    s4, 48(sp)
+// 0x0100b868: 0x100b868: sw    ra, 52(sp)
+// 0x0100b86c: 0x100b86c: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1364,7 +1364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100b860: 0x100b860: sw    s1, 36(sp)
+// 0x0100b870: 0x100b870: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1373,80 +1373,80 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100b864: 0x100b864: addu  s0, a1, zero
+// 0x0100b874: 0x100b874: addu  s0, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0100b868: 0x100b868: addu  s3, a0, zero
+// 0x0100b878: 0x100b878: addu  s3, a0, zero
 	ldloc.1
 	stloc 12
-// 0x0100b86c: 0x100b86c: bgez  a1, 0x100b87c addu  s2, a2, zero
+// 0x0100b87c: 0x100b87c: bgez  a1, 0x100b88c addu  s2, a2, zero
 	ldloc.2
 	ldloc.3
 	stloc 11
 	ldc.i4.s 0
-	bge L_100b87c
+	bge L_100b88c
 // --- basic block ---
-// 0x0100b874: 0x100b874: lui   v0, 0x20000
+// 0x0100b884: 0x100b884: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100b878: 0x100b878: lw    s0, 31248(v0)
+// 0x0100b888: 0x100b888: lw    s0, 31712(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc 10
-L_100b87c:
-// 0x0100b87c: 0x100b87c: jal   0x100c500 addu  a0, s0, zero
+L_100b88c:
+// 0x0100b88c: 0x100b88c: jal   0x100c510 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
-	call int32 Cibyl8::roadmap_tile_get_size_100c500(int32)
+	call int32 Cibyl8::roadmap_tile_get_size_100c510(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100b884: 0x100b884: addu  s1, v0, zero
+// 0x0100b894: 0x100b894: addu  s1, v0, zero
 	ldloc 6
 	stloc 9
-// 0x0100b888: 0x100b888: lui   v0, 0x20000
+// 0x0100b898: 0x100b898: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100b88c: 0x100b88c: lw    a0, 31248(v0)
+// 0x0100b89c: 0x100b89c: lw    a0, 31712(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b890: 0x100b890: addiu s4, sp, 24
+// 0x0100b8a0: 0x100b8a0: addiu s4, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0100b894: 0x100b894: addu  a2, s4, zero
+// 0x0100b8a4: 0x100b8a4: addu  a2, s4, zero
 	ldloc 8
 	stloc.3
-// 0x0100b898: 0x100b898: jal   0x100c524 addu  a1, s3, zero
+// 0x0100b8a8: 0x100b8a8: jal   0x100c534 addu  a1, s3, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_origin_100c524(int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_origin_100c534(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100b8a0: 0x100b8a0: addu  a0, s4, zero
+// 0x0100b8b0: 0x100b8b0: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x0100b8a4: 0x100b8a4: jal   0x100b7a8 addu  a1, s0, zero
+// 0x0100b8b4: 0x100b8b4: jal   0x100b7b8 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -1454,48 +1454,48 @@ L_100b87c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100b8ac: 0x100b8ac: addiu v1, zero, -1
+// 0x0100b8bc: 0x100b8bc: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100b8b0: 0x100b8b0: beq   v0, v1, 0x100b8c0 addu  s4, zero, zero
+// 0x0100b8c0: 0x100b8c0: beq   v0, v1, 0x100b8d0 addu  s4, zero, zero
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 0
 	stloc 8
-	beq  L_100b8c0
+	beq  L_100b8d0
 // --- basic block ---
-// 0x0100b8b8: 0x100b8b8: sw    v0, 0(s2)
+// 0x0100b8c8: 0x100b8c8: sw    v0, 0(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100b8bc: 0x100b8bc: addiu s4, zero, 1
+// 0x0100b8cc: 0x100b8cc: addiu s4, zero, 1
 	ldc.i4.1
 	stloc 8
-L_100b8c0:
-// 0x0100b8c0: 0x100b8c0: lui   v1, 0xe0000
+L_100b8d0:
+// 0x0100b8d0: 0x100b8d0: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0100b8c4: 0x100b8c4: addiu v1, v1, 29604
+// 0x0100b8d4: 0x100b8d4: addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-// 0x0100b8c8: 0x100b8c8: lw    a0, 0(s3)
+// 0x0100b8d8: 0x100b8d8: lw    a0, 0(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100b8cc: 0x100b8cc: lw    a1, 56(v1)
+// 0x0100b8dc: 0x100b8dc: lw    a1, 56(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1504,7 +1504,7 @@ L_100b8c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b8d0: 0x100b8d0: lw    v0, 28(sp)
+// 0x0100b8e0: 0x100b8e0: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1513,16 +1513,16 @@ L_100b8c0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b8d4: 0x100b8d4: slt   a1, a1, a0
+// 0x0100b8e4: 0x100b8e4: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x0100b8d8: 0x100b8d8: bne   a1, zero, 0x100b930 sll   zero, zero, 0
+// 0x0100b8e8: 0x100b8e8: bne   a1, zero, 0x100b940 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100b930
+	brtrue L_100b940
 // --- basic block ---
-// 0x0100b8e0: 0x100b8e0: lw    a1, 64(v1)
+// 0x0100b8f0: 0x100b8f0: lw    a1, 64(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1531,17 +1531,17 @@ L_100b8c0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b8e4: 0x100b8e4: sll   zero, zero, 0
-// 0x0100b8e8: 0x100b8e8: slt   a0, a0, a1
+// 0x0100b8f4: 0x100b8f4: sll   zero, zero, 0
+// 0x0100b8f8: 0x100b8f8: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.1
-// 0x0100b8ec: 0x100b8ec: bne   a0, zero, 0x100b930 sll   zero, zero, 0
+// 0x0100b8fc: 0x100b8fc: bne   a0, zero, 0x100b940 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100b930
+	brtrue L_100b940
 // --- basic block ---
-// 0x0100b8f4: 0x100b8f4: lw    a0, 60(v1)
+// 0x0100b904: 0x100b904: lw    a0, 60(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1550,17 +1550,17 @@ L_100b8c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b8f8: 0x100b8f8: sll   zero, zero, 0
-// 0x0100b8fc: 0x100b8fc: slt   a0, a0, v0
+// 0x0100b908: 0x100b908: sll   zero, zero, 0
+// 0x0100b90c: 0x100b90c: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0100b900: 0x100b900: bne   a0, zero, 0x100b930 sll   zero, zero, 0
+// 0x0100b910: 0x100b910: bne   a0, zero, 0x100b940 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100b930
+	brtrue L_100b940
 // --- basic block ---
-// 0x0100b908: 0x100b908: lw    v1, 68(v1)
+// 0x0100b918: 0x100b918: lw    v1, 68(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1569,63 +1569,63 @@ L_100b8c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b90c: 0x100b90c: sll   zero, zero, 0
-// 0x0100b910: 0x100b910: slt   v1, v0, v1
+// 0x0100b91c: 0x100b91c: sll   zero, zero, 0
+// 0x0100b920: 0x100b920: slt   v1, v0, v1
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x0100b914: 0x100b914: bne   v1, zero, 0x100b930 subu  v0, v0, s1
+// 0x0100b924: 0x100b924: bne   v1, zero, 0x100b940 subu  v0, v0, s1
 	ldloc 5
 	ldloc 6
 	ldloc 9
 	sub
 	stloc 6
-	brtrue L_100b930
+	brtrue L_100b940
 // --- basic block ---
-// 0x0100b91c: 0x100b91c: j	 0x100bc90 addiu a0, sp, 16
+// 0x0100b92c: 0x100b92c: j	 0x100bca0 addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	br L_100bc90
+	br L_100bca0
 // --- basic block ---
-L_100b924:
-// 0x0100b924: 0x100b924: addu  v1, s2, v1
+L_100b934:
+// 0x0100b934: 0x100b934: addu  v1, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0100b928: 0x100b928: sw    v0, 0(v1)
+// 0x0100b938: 0x100b938: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100b92c: 0x100b92c: addiu s4, s4, 1
+// 0x0100b93c: 0x100b93c: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100b930:
-// 0x0100b930: 0x100b930: lui   v0, 0xe0000
+L_100b940:
+// 0x0100b940: 0x100b940: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-L_100b934:
-// 0x0100b934: 0x100b934: addiu v0, v0, 29604
+L_100b944:
+// 0x0100b944: 0x100b944: addiu v0, v0, 30068
 	ldloc 6
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 6
-// 0x0100b938: 0x100b938: lw    a0, 0(s3)
+// 0x0100b948: 0x100b948: lw    a0, 0(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100b93c: 0x100b93c: lw    a1, 56(v0)
+// 0x0100b94c: 0x100b94c: lw    a1, 56(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1634,7 +1634,7 @@ L_100b934:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b940: 0x100b940: lw    v1, 28(sp)
+// 0x0100b950: 0x100b950: lw    v1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1643,17 +1643,17 @@ L_100b934:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b944: 0x100b944: slt   a1, a1, a0
+// 0x0100b954: 0x100b954: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x0100b948: 0x100b948: addu  v1, s1, v1
+// 0x0100b958: 0x100b958: addu  v1, s1, v1
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x0100b94c: 0x100b94c: bne   a1, zero, 0x100b9a8 sw    v1, 20(sp)
+// 0x0100b95c: 0x100b95c: bne   a1, zero, 0x100b9b8 sw    v1, 20(sp)
 	ldloc.2
 	ldloc 7
 	ldloc.0
@@ -1663,9 +1663,9 @@ L_100b934:
 	add
 	ldloc 5
 	stelem.i4
-	brtrue L_100b9a8
+	brtrue L_100b9b8
 // --- basic block ---
-// 0x0100b954: 0x100b954: lw    a1, 64(v0)
+// 0x0100b964: 0x100b964: lw    a1, 64(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1674,17 +1674,17 @@ L_100b934:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b958: 0x100b958: sll   zero, zero, 0
-// 0x0100b95c: 0x100b95c: slt   a0, a0, a1
+// 0x0100b968: 0x100b968: sll   zero, zero, 0
+// 0x0100b96c: 0x100b96c: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.1
-// 0x0100b960: 0x100b960: bne   a0, zero, 0x100b9a8 sll   zero, zero, 0
+// 0x0100b970: 0x100b970: bne   a0, zero, 0x100b9b8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100b9a8
+	brtrue L_100b9b8
 // --- basic block ---
-// 0x0100b968: 0x100b968: lw    a0, 60(v0)
+// 0x0100b978: 0x100b978: lw    a0, 60(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1693,17 +1693,17 @@ L_100b934:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b96c: 0x100b96c: sll   zero, zero, 0
-// 0x0100b970: 0x100b970: slt   a0, a0, v1
+// 0x0100b97c: 0x100b97c: sll   zero, zero, 0
+// 0x0100b980: 0x100b980: slt   a0, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x0100b974: 0x100b974: bne   a0, zero, 0x100b9a8 sll   zero, zero, 0
+// 0x0100b984: 0x100b984: bne   a0, zero, 0x100b9b8 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100b9a8
+	brtrue L_100b9b8
 // --- basic block ---
-// 0x0100b97c: 0x100b97c: lw    v0, 68(v0)
+// 0x0100b98c: 0x100b98c: lw    v0, 68(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1712,60 +1712,60 @@ L_100b934:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b980: 0x100b980: sll   zero, zero, 0
-// 0x0100b984: 0x100b984: slt   v1, v1, v0
+// 0x0100b990: 0x100b990: sll   zero, zero, 0
+// 0x0100b994: 0x100b994: slt   v1, v1, v0
 	ldloc 5
 	ldloc 6
 	clt
 	stloc 5
-// 0x0100b988: 0x100b988: bne   v1, zero, 0x100b9ac lui   v1, 0xe0000
+// 0x0100b998: 0x100b998: bne   v1, zero, 0x100b9bc lui   v1, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brtrue L_100b9ac
+	brtrue L_100b9bc
 // --- basic block ---
-// 0x0100b990: 0x100b990: j	 0x100bcb8 addiu a0, sp, 16
+// 0x0100b9a0: 0x100b9a0: j	 0x100bcc8 addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	br L_100bcb8
+	br L_100bcc8
 // --- basic block ---
-L_100b998:
-// 0x0100b998: 0x100b998: sll   v1, s4, 2
+L_100b9a8:
+// 0x0100b9a8: 0x100b9a8: sll   v1, s4, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100b99c: 0x100b99c: addu  v1, s2, v1
+// 0x0100b9ac: 0x100b9ac: addu  v1, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0100b9a0: 0x100b9a0: sw    v0, 0(v1)
+// 0x0100b9b0: 0x100b9b0: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100b9a4: 0x100b9a4: addiu s4, s4, 1
+// 0x0100b9b4: 0x100b9b4: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100b9a8:
-// 0x0100b9a8: 0x100b9a8: lui   v1, 0xe0000
+L_100b9b8:
+// 0x0100b9b8: 0x100b9b8: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_100b9ac:
-// 0x0100b9ac: 0x100b9ac: addiu v1, v1, 29604
+L_100b9bc:
+// 0x0100b9bc: 0x100b9bc: addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-L_100b9b0:
-// 0x0100b9b0: 0x100b9b0: lw    v0, 24(sp)
+L_100b9c0:
+// 0x0100b9c0: 0x100b9c0: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1774,7 +1774,7 @@ L_100b9b0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100b9b4: 0x100b9b4: lw    a1, 56(v1)
+// 0x0100b9c4: 0x100b9c4: lw    a1, 56(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1783,7 +1783,7 @@ L_100b9b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b9b8: 0x100b9b8: lw    a0, 4(s3)
+// 0x0100b9c8: 0x100b9c8: lw    a0, 4(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -1792,16 +1792,16 @@ L_100b9b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100b9bc: 0x100b9bc: slt   a1, a1, v0
+// 0x0100b9cc: 0x100b9cc: slt   a1, a1, v0
 	ldloc.2
 	ldloc 6
 	clt
 	stloc.2
-// 0x0100b9c0: 0x100b9c0: bne   a1, zero, 0x100ba18 sll   zero, zero, 0
+// 0x0100b9d0: 0x100b9d0: bne   a1, zero, 0x100ba28 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100ba18
+	brtrue L_100ba28
 // --- basic block ---
-// 0x0100b9c8: 0x100b9c8: lw    a1, 64(v1)
+// 0x0100b9d8: 0x100b9d8: lw    a1, 64(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1810,17 +1810,17 @@ L_100b9b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b9cc: 0x100b9cc: sll   zero, zero, 0
-// 0x0100b9d0: 0x100b9d0: slt   a1, v0, a1
+// 0x0100b9dc: 0x100b9dc: sll   zero, zero, 0
+// 0x0100b9e0: 0x100b9e0: slt   a1, v0, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc.2
-// 0x0100b9d4: 0x100b9d4: bne   a1, zero, 0x100ba18 sll   zero, zero, 0
+// 0x0100b9e4: 0x100b9e4: bne   a1, zero, 0x100ba28 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100ba18
+	brtrue L_100ba28
 // --- basic block ---
-// 0x0100b9dc: 0x100b9dc: lw    a1, 60(v1)
+// 0x0100b9ec: 0x100b9ec: lw    a1, 60(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1829,17 +1829,17 @@ L_100b9b0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100b9e0: 0x100b9e0: sll   zero, zero, 0
-// 0x0100b9e4: 0x100b9e4: slt   a1, a1, a0
+// 0x0100b9f0: 0x100b9f0: sll   zero, zero, 0
+// 0x0100b9f4: 0x100b9f4: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x0100b9e8: 0x100b9e8: bne   a1, zero, 0x100ba18 sll   zero, zero, 0
+// 0x0100b9f8: 0x100b9f8: bne   a1, zero, 0x100ba28 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100ba18
+	brtrue L_100ba28
 // --- basic block ---
-// 0x0100b9f0: 0x100b9f0: lw    v1, 68(v1)
+// 0x0100ba00: 0x100ba00: lw    v1, 68(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1848,21 +1848,21 @@ L_100b9b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100b9f4: 0x100b9f4: sll   zero, zero, 0
-// 0x0100b9f8: 0x100b9f8: slt   a0, a0, v1
+// 0x0100ba04: 0x100ba04: sll   zero, zero, 0
+// 0x0100ba08: 0x100ba08: slt   a0, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x0100b9fc: 0x100b9fc: bne   a0, zero, 0x100ba18 subu  v0, v0, s1
+// 0x0100ba0c: 0x100ba0c: bne   a0, zero, 0x100ba28 subu  v0, v0, s1
 	ldloc.1
 	ldloc 6
 	ldloc 9
 	sub
 	stloc 6
-	brtrue L_100ba18
+	brtrue L_100ba28
 // --- basic block ---
-// 0x0100ba04: 0x100ba04: j	 0x100bcdc sw    v0, 16(sp)
+// 0x0100ba14: 0x100ba14: j	 0x100bcec sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1871,37 +1871,37 @@ L_100b9b0:
 	add
 	ldloc 6
 	stelem.i4
-	br L_100bcdc
+	br L_100bcec
 // --- basic block ---
-L_100ba0c:
-// 0x0100ba0c: 0x100ba0c: addu  v1, s2, v1
+L_100ba1c:
+// 0x0100ba1c: 0x100ba1c: addu  v1, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0100ba10: 0x100ba10: sw    v0, 0(v1)
+// 0x0100ba20: 0x100ba20: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100ba14: 0x100ba14: addiu s4, s4, 1
+// 0x0100ba24: 0x100ba24: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100ba18:
-// 0x0100ba18: 0x100ba18: lui   v0, 0xe0000
+L_100ba28:
+// 0x0100ba28: 0x100ba28: lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-L_100ba1c:
-// 0x0100ba1c: 0x100ba1c: addiu v0, v0, 29604
+L_100ba2c:
+// 0x0100ba2c: 0x100ba2c: addiu v0, v0, 30068
 	ldloc 6
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 6
-// 0x0100ba20: 0x100ba20: lw    v1, 24(sp)
+// 0x0100ba30: 0x100ba30: lw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1910,7 +1910,7 @@ L_100ba1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ba24: 0x100ba24: lw    a1, 56(v0)
+// 0x0100ba34: 0x100ba34: lw    a1, 56(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1919,17 +1919,17 @@ L_100ba1c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100ba28: 0x100ba28: addu  v1, s1, v1
+// 0x0100ba38: 0x100ba38: addu  v1, s1, v1
 	ldloc 9
 	ldloc 5
 	add
 	stloc 5
-// 0x0100ba2c: 0x100ba2c: slt   a1, a1, v1
+// 0x0100ba3c: 0x100ba3c: slt   a1, a1, v1
 	ldloc.2
 	ldloc 5
 	clt
 	stloc.2
-// 0x0100ba30: 0x100ba30: sw    v1, 16(sp)
+// 0x0100ba40: 0x100ba40: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1938,7 +1938,7 @@ L_100ba1c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100ba34: 0x100ba34: lw    a0, 4(s3)
+// 0x0100ba44: 0x100ba44: lw    a0, 4(s3)
 	ldloc 7
 	ldloc 12
 	ldc.i4.2
@@ -1947,11 +1947,11 @@ L_100ba1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100ba38: 0x100ba38: bne   a1, zero, 0x100ba90 sll   zero, zero, 0
+// 0x0100ba48: 0x100ba48: bne   a1, zero, 0x100baa0 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100ba90
+	brtrue L_100baa0
 // --- basic block ---
-// 0x0100ba40: 0x100ba40: lw    a1, 64(v0)
+// 0x0100ba50: 0x100ba50: lw    a1, 64(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1960,17 +1960,17 @@ L_100ba1c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100ba44: 0x100ba44: sll   zero, zero, 0
-// 0x0100ba48: 0x100ba48: slt   v1, v1, a1
+// 0x0100ba54: 0x100ba54: sll   zero, zero, 0
+// 0x0100ba58: 0x100ba58: slt   v1, v1, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 5
-// 0x0100ba4c: 0x100ba4c: bne   v1, zero, 0x100ba90 sll   zero, zero, 0
+// 0x0100ba5c: 0x100ba5c: bne   v1, zero, 0x100baa0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100ba90
+	brtrue L_100baa0
 // --- basic block ---
-// 0x0100ba54: 0x100ba54: lw    v1, 60(v0)
+// 0x0100ba64: 0x100ba64: lw    v1, 60(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1979,17 +1979,17 @@ L_100ba1c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ba58: 0x100ba58: sll   zero, zero, 0
-// 0x0100ba5c: 0x100ba5c: slt   v1, v1, a0
+// 0x0100ba68: 0x100ba68: sll   zero, zero, 0
+// 0x0100ba6c: 0x100ba6c: slt   v1, v1, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x0100ba60: 0x100ba60: bne   v1, zero, 0x100ba90 sll   zero, zero, 0
+// 0x0100ba70: 0x100ba70: bne   v1, zero, 0x100baa0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100ba90
+	brtrue L_100baa0
 // --- basic block ---
-// 0x0100ba68: 0x100ba68: lw    v0, 68(v0)
+// 0x0100ba78: 0x100ba78: lw    v0, 68(v0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -1998,54 +1998,54 @@ L_100ba1c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ba6c: 0x100ba6c: sll   zero, zero, 0
-// 0x0100ba70: 0x100ba70: slt   a0, a0, v0
+// 0x0100ba7c: 0x100ba7c: sll   zero, zero, 0
+// 0x0100ba80: 0x100ba80: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0100ba74: 0x100ba74: bne   a0, zero, 0x100ba90 addiu a0, sp, 16
+// 0x0100ba84: 0x100ba84: bne   a0, zero, 0x100baa0 addiu a0, sp, 16
 	ldloc.1
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	brtrue L_100ba90
+	brtrue L_100baa0
 // --- basic block ---
-// 0x0100ba7c: 0x100ba7c: j	 0x100bd04 addu  a1, s0, zero
+// 0x0100ba8c: 0x100ba8c: j	 0x100bd14 addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-	br L_100bd04
+	br L_100bd14
 // --- basic block ---
-L_100ba84:
-// 0x0100ba84: 0x100ba84: addu  v1, s2, v1
+L_100ba94:
+// 0x0100ba94: 0x100ba94: addu  v1, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0100ba88: 0x100ba88: sw    v0, 0(v1)
+// 0x0100ba98: 0x100ba98: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100ba8c: 0x100ba8c: addiu s4, s4, 1
+// 0x0100ba9c: 0x100ba9c: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100ba90:
-// 0x0100ba90: 0x100ba90: lui   a0, 0xe0000
+L_100baa0:
+// 0x0100baa0: 0x100baa0: lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-L_100ba94:
-// 0x0100ba94: 0x100ba94: addiu a0, a0, 29604
+L_100baa4:
+// 0x0100baa4: 0x100baa4: addiu a0, a0, 30068
 	ldloc.1
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc.1
-// 0x0100ba98: 0x100ba98: lw    v1, 24(sp)
+// 0x0100baa8: 0x100baa8: lw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2054,7 +2054,7 @@ L_100ba94:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ba9c: 0x100ba9c: lw    a1, 56(a0)
+// 0x0100baac: 0x100baac: lw    a1, 56(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2063,7 +2063,7 @@ L_100ba94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100baa0: 0x100baa0: lw    v0, 28(sp)
+// 0x0100bab0: 0x100bab0: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2072,16 +2072,16 @@ L_100ba94:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100baa4: 0x100baa4: slt   a1, a1, v1
+// 0x0100bab4: 0x100bab4: slt   a1, a1, v1
 	ldloc.2
 	ldloc 5
 	clt
 	stloc.2
-// 0x0100baa8: 0x100baa8: bne   a1, zero, 0x100bb04 sll   zero, zero, 0
+// 0x0100bab8: 0x100bab8: bne   a1, zero, 0x100bb14 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100bb04
+	brtrue L_100bb14
 // --- basic block ---
-// 0x0100bab0: 0x100bab0: lw    a1, 64(a0)
+// 0x0100bac0: 0x100bac0: lw    a1, 64(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2090,17 +2090,17 @@ L_100ba94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bab4: 0x100bab4: sll   zero, zero, 0
-// 0x0100bab8: 0x100bab8: slt   a1, v1, a1
+// 0x0100bac4: 0x100bac4: sll   zero, zero, 0
+// 0x0100bac8: 0x100bac8: slt   a1, v1, a1
 	ldloc 5
 	ldloc.2
 	clt
 	stloc.2
-// 0x0100babc: 0x100babc: bne   a1, zero, 0x100bb04 sll   zero, zero, 0
+// 0x0100bacc: 0x100bacc: bne   a1, zero, 0x100bb14 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100bb04
+	brtrue L_100bb14
 // --- basic block ---
-// 0x0100bac4: 0x100bac4: lw    a1, 60(a0)
+// 0x0100bad4: 0x100bad4: lw    a1, 60(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2109,17 +2109,17 @@ L_100ba94:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bac8: 0x100bac8: sll   zero, zero, 0
-// 0x0100bacc: 0x100bacc: slt   a1, a1, v0
+// 0x0100bad8: 0x100bad8: sll   zero, zero, 0
+// 0x0100badc: 0x100badc: slt   a1, a1, v0
 	ldloc.2
 	ldloc 6
 	clt
 	stloc.2
-// 0x0100bad0: 0x100bad0: bne   a1, zero, 0x100bb04 sll   zero, zero, 0
+// 0x0100bae0: 0x100bae0: bne   a1, zero, 0x100bb14 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100bb04
+	brtrue L_100bb14
 // --- basic block ---
-// 0x0100bad8: 0x100bad8: lw    a0, 68(a0)
+// 0x0100bae8: 0x100bae8: lw    a0, 68(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
@@ -2128,61 +2128,61 @@ L_100ba94:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100badc: 0x100badc: sll   zero, zero, 0
-// 0x0100bae0: 0x100bae0: slt   a0, v0, a0
+// 0x0100baec: 0x100baec: sll   zero, zero, 0
+// 0x0100baf0: 0x100baf0: slt   a0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc.1
-// 0x0100bae4: 0x100bae4: bne   a0, zero, 0x100bb04 subu  v1, v1, s1
+// 0x0100baf4: 0x100baf4: bne   a0, zero, 0x100bb14 subu  v1, v1, s1
 	ldloc.1
 	ldloc 5
 	ldloc 9
 	sub
 	stloc 5
-	brtrue L_100bb04
+	brtrue L_100bb14
 // --- basic block ---
-// 0x0100baec: 0x100baec: j	 0x100bd24 subu  v0, v0, s1
+// 0x0100bafc: 0x100bafc: j	 0x100bd34 subu  v0, v0, s1
 	ldloc 6
 	ldloc 9
 	sub
 	stloc 6
-	br L_100bd24
+	br L_100bd34
 // --- basic block ---
-L_100baf4:
-// 0x0100baf4: 0x100baf4: sll   v1, s4, 2
+L_100bb04:
+// 0x0100bb04: 0x100bb04: sll   v1, s4, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100baf8: 0x100baf8: addu  v1, s2, v1
+// 0x0100bb08: 0x100bb08: addu  v1, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0100bafc: 0x100bafc: sw    v0, 0(v1)
+// 0x0100bb0c: 0x100bb0c: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100bb00: 0x100bb00: addiu s4, s4, 1
+// 0x0100bb10: 0x100bb10: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100bb04:
-// 0x0100bb04: 0x100bb04: lui   v1, 0xe0000
+L_100bb14:
+// 0x0100bb14: 0x100bb14: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-// 0x0100bb08: 0x100bb08: addiu v1, v1, 29604
+// 0x0100bb18: 0x100bb18: addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-L_100bb0c:
-// 0x0100bb0c: 0x100bb0c: lw    a0, 24(sp)
+L_100bb1c:
+// 0x0100bb1c: 0x100bb1c: lw    a0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2191,7 +2191,7 @@ L_100bb0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bb10: 0x100bb10: lw    a1, 56(v1)
+// 0x0100bb20: 0x100bb20: lw    a1, 56(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2200,17 +2200,17 @@ L_100bb0c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bb14: 0x100bb14: addu  a0, s1, a0
+// 0x0100bb24: 0x100bb24: addu  a0, s1, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc.1
-// 0x0100bb18: 0x100bb18: slt   a1, a1, a0
+// 0x0100bb28: 0x100bb28: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x0100bb1c: 0x100bb1c: sw    a0, 16(sp)
+// 0x0100bb2c: 0x100bb2c: sw    a0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2219,7 +2219,7 @@ L_100bb0c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100bb20: 0x100bb20: lw    v0, 28(sp)
+// 0x0100bb30: 0x100bb30: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2228,11 +2228,11 @@ L_100bb0c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bb24: 0x100bb24: bne   a1, zero, 0x100bb80 sll   zero, zero, 0
+// 0x0100bb34: 0x100bb34: bne   a1, zero, 0x100bb90 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100bb80
+	brtrue L_100bb90
 // --- basic block ---
-// 0x0100bb2c: 0x100bb2c: lw    a1, 64(v1)
+// 0x0100bb3c: 0x100bb3c: lw    a1, 64(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2241,17 +2241,17 @@ L_100bb0c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bb30: 0x100bb30: sll   zero, zero, 0
-// 0x0100bb34: 0x100bb34: slt   a0, a0, a1
+// 0x0100bb40: 0x100bb40: sll   zero, zero, 0
+// 0x0100bb44: 0x100bb44: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.1
-// 0x0100bb38: 0x100bb38: bne   a0, zero, 0x100bb80 sll   zero, zero, 0
+// 0x0100bb48: 0x100bb48: bne   a0, zero, 0x100bb90 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100bb80
+	brtrue L_100bb90
 // --- basic block ---
-// 0x0100bb40: 0x100bb40: lw    a0, 60(v1)
+// 0x0100bb50: 0x100bb50: lw    a0, 60(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2260,17 +2260,17 @@ L_100bb0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bb44: 0x100bb44: sll   zero, zero, 0
-// 0x0100bb48: 0x100bb48: slt   a0, a0, v0
+// 0x0100bb54: 0x100bb54: sll   zero, zero, 0
+// 0x0100bb58: 0x100bb58: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0100bb4c: 0x100bb4c: bne   a0, zero, 0x100bb80 sll   zero, zero, 0
+// 0x0100bb5c: 0x100bb5c: bne   a0, zero, 0x100bb90 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100bb80
+	brtrue L_100bb90
 // --- basic block ---
-// 0x0100bb54: 0x100bb54: lw    v1, 68(v1)
+// 0x0100bb64: 0x100bb64: lw    v1, 68(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2279,60 +2279,60 @@ L_100bb0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100bb58: 0x100bb58: sll   zero, zero, 0
-// 0x0100bb5c: 0x100bb5c: slt   v1, v0, v1
+// 0x0100bb68: 0x100bb68: sll   zero, zero, 0
+// 0x0100bb6c: 0x100bb6c: slt   v1, v0, v1
 	ldloc 6
 	ldloc 5
 	clt
 	stloc 5
-// 0x0100bb60: 0x100bb60: bne   v1, zero, 0x100bb84 lui   v1, 0xe0000
+// 0x0100bb70: 0x100bb70: bne   v1, zero, 0x100bb94 lui   v1, 0xe0000
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	brtrue L_100bb84
+	brtrue L_100bb94
 // --- basic block ---
-// 0x0100bb68: 0x100bb68: j	 0x100bd4c subu  v0, v0, s1
+// 0x0100bb78: 0x100bb78: j	 0x100bd5c subu  v0, v0, s1
 	ldloc 6
 	ldloc 9
 	sub
 	stloc 6
-	br L_100bd4c
+	br L_100bd5c
 // --- basic block ---
-L_100bb70:
-// 0x0100bb70: 0x100bb70: sll   v1, s4, 2
+L_100bb80:
+// 0x0100bb80: 0x100bb80: sll   v1, s4, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100bb74: 0x100bb74: addu  v1, s2, v1
+// 0x0100bb84: 0x100bb84: addu  v1, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0100bb78: 0x100bb78: sw    v0, 0(v1)
+// 0x0100bb88: 0x100bb88: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100bb7c: 0x100bb7c: addiu s4, s4, 1
+// 0x0100bb8c: 0x100bb8c: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100bb80:
-// 0x0100bb80: 0x100bb80: lui   v1, 0xe0000
+L_100bb90:
+// 0x0100bb90: 0x100bb90: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_100bb84:
-// 0x0100bb84: 0x100bb84: addiu v1, v1, 29604
+L_100bb94:
+// 0x0100bb94: 0x100bb94: addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-L_100bb88:
-// 0x0100bb88: 0x100bb88: lw    v0, 24(sp)
+L_100bb98:
+// 0x0100bb98: 0x100bb98: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2341,7 +2341,7 @@ L_100bb88:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bb8c: 0x100bb8c: lw    a1, 56(v1)
+// 0x0100bb9c: 0x100bb9c: lw    a1, 56(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2350,7 +2350,7 @@ L_100bb88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bb90: 0x100bb90: lw    a0, 28(sp)
+// 0x0100bba0: 0x100bba0: lw    a0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2359,17 +2359,17 @@ L_100bb88:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bb94: 0x100bb94: slt   a1, a1, v0
+// 0x0100bba4: 0x100bba4: slt   a1, a1, v0
 	ldloc.2
 	ldloc 6
 	clt
 	stloc.2
-// 0x0100bb98: 0x100bb98: addu  a0, s1, a0
+// 0x0100bba8: 0x100bba8: addu  a0, s1, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc.1
-// 0x0100bb9c: 0x100bb9c: bne   a1, zero, 0x100bbf8 sw    a0, 20(sp)
+// 0x0100bbac: 0x100bbac: bne   a1, zero, 0x100bc08 sw    a0, 20(sp)
 	ldloc.2
 	ldloc 7
 	ldloc.0
@@ -2379,9 +2379,9 @@ L_100bb88:
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_100bbf8
+	brtrue L_100bc08
 // --- basic block ---
-// 0x0100bba4: 0x100bba4: lw    a1, 64(v1)
+// 0x0100bbb4: 0x100bbb4: lw    a1, 64(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2390,17 +2390,17 @@ L_100bb88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bba8: 0x100bba8: sll   zero, zero, 0
-// 0x0100bbac: 0x100bbac: slt   a1, v0, a1
+// 0x0100bbb8: 0x100bbb8: sll   zero, zero, 0
+// 0x0100bbbc: 0x100bbbc: slt   a1, v0, a1
 	ldloc 6
 	ldloc.2
 	clt
 	stloc.2
-// 0x0100bbb0: 0x100bbb0: bne   a1, zero, 0x100bbf8 sll   zero, zero, 0
+// 0x0100bbc0: 0x100bbc0: bne   a1, zero, 0x100bc08 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100bbf8
+	brtrue L_100bc08
 // --- basic block ---
-// 0x0100bbb8: 0x100bbb8: lw    a1, 60(v1)
+// 0x0100bbc8: 0x100bbc8: lw    a1, 60(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2409,17 +2409,17 @@ L_100bb88:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bbbc: 0x100bbbc: sll   zero, zero, 0
-// 0x0100bbc0: 0x100bbc0: slt   a1, a1, a0
+// 0x0100bbcc: 0x100bbcc: sll   zero, zero, 0
+// 0x0100bbd0: 0x100bbd0: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x0100bbc4: 0x100bbc4: bne   a1, zero, 0x100bbf8 sll   zero, zero, 0
+// 0x0100bbd4: 0x100bbd4: bne   a1, zero, 0x100bc08 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_100bbf8
+	brtrue L_100bc08
 // --- basic block ---
-// 0x0100bbcc: 0x100bbcc: lw    v1, 68(v1)
+// 0x0100bbdc: 0x100bbdc: lw    v1, 68(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2428,60 +2428,60 @@ L_100bb88:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100bbd0: 0x100bbd0: sll   zero, zero, 0
-// 0x0100bbd4: 0x100bbd4: slt   a0, a0, v1
+// 0x0100bbe0: 0x100bbe0: sll   zero, zero, 0
+// 0x0100bbe4: 0x100bbe4: slt   a0, a0, v1
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x0100bbd8: 0x100bbd8: bne   a0, zero, 0x100bbfc lui   v1, 0xe0000
+// 0x0100bbe8: 0x100bbe8: bne   a0, zero, 0x100bc0c lui   v1, 0xe0000
 	ldloc.1
 	ldc.i4 917504
 	stloc 5
-	brtrue L_100bbfc
+	brtrue L_100bc0c
 // --- basic block ---
-// 0x0100bbe0: 0x100bbe0: j	 0x100bd70 subu  v0, v0, s1
+// 0x0100bbf0: 0x100bbf0: j	 0x100bd80 subu  v0, v0, s1
 	ldloc 6
 	ldloc 9
 	sub
 	stloc 6
-	br L_100bd70
+	br L_100bd80
 // --- basic block ---
-L_100bbe8:
-// 0x0100bbe8: 0x100bbe8: sll   v1, s4, 2
+L_100bbf8:
+// 0x0100bbf8: 0x100bbf8: sll   v1, s4, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100bbec: 0x100bbec: addu  v1, s2, v1
+// 0x0100bbfc: 0x100bbfc: addu  v1, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 5
-// 0x0100bbf0: 0x100bbf0: sw    v0, 0(v1)
+// 0x0100bc00: 0x100bc00: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100bbf4: 0x100bbf4: addiu s4, s4, 1
+// 0x0100bc04: 0x100bc04: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100bbf8:
-// 0x0100bbf8: 0x100bbf8: lui   v1, 0xe0000
+L_100bc08:
+// 0x0100bc08: 0x100bc08: lui   v1, 0xe0000
 	ldc.i4 917504
 	stloc 5
-L_100bbfc:
-// 0x0100bbfc: 0x100bbfc: addiu v1, v1, 29604
+L_100bc0c:
+// 0x0100bc0c: 0x100bc0c: addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-L_100bc00:
-// 0x0100bc00: 0x100bc00: lw    v0, 24(sp)
+L_100bc10:
+// 0x0100bc10: 0x100bc10: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2490,7 +2490,7 @@ L_100bc00:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bc04: 0x100bc04: lw    a0, 56(v1)
+// 0x0100bc14: 0x100bc14: lw    a0, 56(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2499,17 +2499,17 @@ L_100bc00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bc08: 0x100bc08: addu  v0, s1, v0
+// 0x0100bc18: 0x100bc18: addu  v0, s1, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 6
-// 0x0100bc0c: 0x100bc0c: slt   a0, a0, v0
+// 0x0100bc1c: 0x100bc1c: slt   a0, a0, v0
 	ldloc.1
 	ldloc 6
 	clt
 	stloc.1
-// 0x0100bc10: 0x100bc10: lw    a1, 28(sp)
+// 0x0100bc20: 0x100bc20: lw    a1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2518,11 +2518,11 @@ L_100bc00:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bc14: 0x100bc14: bne   a0, zero, 0x100bc6c sll   zero, zero, 0
+// 0x0100bc24: 0x100bc24: bne   a0, zero, 0x100bc7c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100bc6c
+	brtrue L_100bc7c
 // --- basic block ---
-// 0x0100bc1c: 0x100bc1c: lw    a0, 64(v1)
+// 0x0100bc2c: 0x100bc2c: lw    a0, 64(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2531,21 +2531,21 @@ L_100bc00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bc20: 0x100bc20: sll   zero, zero, 0
-// 0x0100bc24: 0x100bc24: slt   a0, v0, a0
+// 0x0100bc30: 0x100bc30: sll   zero, zero, 0
+// 0x0100bc34: 0x100bc34: slt   a0, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc.1
-// 0x0100bc28: 0x100bc28: bne   a0, zero, 0x100bc6c addu  s1, s1, a1
+// 0x0100bc38: 0x100bc38: bne   a0, zero, 0x100bc7c addu  s1, s1, a1
 	ldloc.1
 	ldloc 9
 	ldloc.2
 	add
 	stloc 9
-	brtrue L_100bc6c
+	brtrue L_100bc7c
 // --- basic block ---
-// 0x0100bc30: 0x100bc30: lw    a0, 60(v1)
+// 0x0100bc40: 0x100bc40: lw    a0, 60(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2554,17 +2554,17 @@ L_100bc00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bc34: 0x100bc34: sll   zero, zero, 0
-// 0x0100bc38: 0x100bc38: slt   a0, a0, s1
+// 0x0100bc44: 0x100bc44: sll   zero, zero, 0
+// 0x0100bc48: 0x100bc48: slt   a0, a0, s1
 	ldloc.1
 	ldloc 9
 	clt
 	stloc.1
-// 0x0100bc3c: 0x100bc3c: bne   a0, zero, 0x100bc6c sll   zero, zero, 0
+// 0x0100bc4c: 0x100bc4c: bne   a0, zero, 0x100bc7c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_100bc6c
+	brtrue L_100bc7c
 // --- basic block ---
-// 0x0100bc44: 0x100bc44: lw    v1, 68(v1)
+// 0x0100bc54: 0x100bc54: lw    v1, 68(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -2573,49 +2573,49 @@ L_100bc00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100bc48: 0x100bc48: sll   zero, zero, 0
-// 0x0100bc4c: 0x100bc4c: slt   v1, s1, v1
+// 0x0100bc58: 0x100bc58: sll   zero, zero, 0
+// 0x0100bc5c: 0x100bc5c: slt   v1, s1, v1
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x0100bc50: 0x100bc50: bne   v1, zero, 0x100bc6c addu  a1, s0, zero
+// 0x0100bc60: 0x100bc60: bne   v1, zero, 0x100bc7c addu  a1, s0, zero
 	ldloc 5
 	ldloc 10
 	stloc.2
-	brtrue L_100bc6c
+	brtrue L_100bc7c
 // --- basic block ---
-// 0x0100bc58: 0x100bc58: j	 0x100bd94 addiu a0, sp, 16
+// 0x0100bc68: 0x100bc68: j	 0x100bda4 addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-	br L_100bd94
+	br L_100bda4
 // --- basic block ---
-L_100bc60:
-// 0x0100bc60: 0x100bc60: addu  s2, s2, v1
+L_100bc70:
+// 0x0100bc70: 0x100bc70: addu  s2, s2, v1
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x0100bc64: 0x100bc64: sw    v0, 0(s2)
+// 0x0100bc74: 0x100bc74: sw    v0, 0(s2)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100bc68: 0x100bc68: addiu s4, s4, 1
+// 0x0100bc78: 0x100bc78: addiu s4, s4, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_100bc6c:
-// 0x0100bc6c: 0x100bc6c: lw    ra, 52(sp)
-// 0x0100bc70: 0x100bc70: addu  v0, s4, zero
+L_100bc7c:
+// 0x0100bc7c: 0x100bc7c: lw    ra, 52(sp)
+// 0x0100bc80: 0x100bc80: addu  v0, s4, zero
 	ldloc 8
 	stloc 6
-// 0x0100bc74: 0x100bc74: lw    s4, 48(sp)
+// 0x0100bc84: 0x100bc84: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2624,7 +2624,7 @@ L_100bc6c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100bc78: 0x100bc78: lw    s3, 44(sp)
+// 0x0100bc88: 0x100bc88: lw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2633,7 +2633,7 @@ L_100bc6c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100bc7c: 0x100bc7c: lw    s2, 40(sp)
+// 0x0100bc8c: 0x100bc8c: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2642,7 +2642,7 @@ L_100bc6c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100bc80: 0x100bc80: lw    s1, 36(sp)
+// 0x0100bc90: 0x100bc90: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2651,7 +2651,7 @@ L_100bc6c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100bc84: 0x100bc84: lw    s0, 32(sp)
+// 0x0100bc94: 0x100bc94: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2660,15 +2660,15 @@ L_100bc6c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100bc88: 0x100bc88: jr    ra addiu sp, sp, 56
+// 0x0100bc98: 0x100bc98: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_100bc90:
-// 0x0100bc90: 0x100bc90: lw    v1, 24(sp)
+L_100bca0:
+// 0x0100bca0: 0x100bca0: lw    v1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2677,10 +2677,10 @@ L_100bc90:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100bc94: 0x100bc94: addu  a1, s0, zero
+// 0x0100bca4: 0x100bca4: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0100bc98: 0x100bc98: sw    v1, 16(sp)
+// 0x0100bca8: 0x100bca8: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2689,7 +2689,7 @@ L_100bc90:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100bc9c: 0x100bc9c: jal   0x100b7a8 sw    v0, 20(sp)
+// 0x0100bcac: 0x100bcac: jal   0x100b7b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2703,30 +2703,30 @@ L_100bc90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bca4: 0x100bca4: addiu v1, zero, -1
+// 0x0100bcb4: 0x100bcb4: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bca8: 0x100bca8: bne   v0, v1, 0x100b924 sll   v1, s4, 2
+// 0x0100bcb8: 0x100bcb8: bne   v0, v1, 0x100b934 sll   v1, s4, 2
 	ldloc 6
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-	bne.un L_100b924
+	bne.un L_100b934
 // --- basic block ---
-// 0x0100bcb0: 0x100bcb0: j	 0x100b934 lui   v0, 0xe0000
+// 0x0100bcc0: 0x100bcc0: j	 0x100b944 lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-	br L_100b934
+	br L_100b944
 // --- basic block ---
-L_100bcb8:
-// 0x0100bcb8: 0x100bcb8: lw    v0, 24(sp)
+L_100bcc8:
+// 0x0100bcc8: 0x100bcc8: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2735,10 +2735,10 @@ L_100bcb8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bcbc: 0x100bcbc: addu  a1, s0, zero
+// 0x0100bccc: 0x100bccc: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0100bcc0: 0x100bcc0: jal   0x100b7a8 sw    v0, 16(sp)
+// 0x0100bcd0: 0x100bcd0: jal   0x100b7b8 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2752,30 +2752,30 @@ L_100bcb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bcc8: 0x100bcc8: addiu v1, zero, -1
+// 0x0100bcd8: 0x100bcd8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bccc: 0x100bccc: bne   v0, v1, 0x100b998 lui   v1, 0xe0000
+// 0x0100bcdc: 0x100bcdc: bne   v0, v1, 0x100b9a8 lui   v1, 0xe0000
 	ldloc 6
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	bne.un L_100b998
+	bne.un L_100b9a8
 // --- basic block ---
-// 0x0100bcd4: 0x100bcd4: j	 0x100b9b0 addiu v1, v1, 29604
+// 0x0100bce4: 0x100bce4: j	 0x100b9c0 addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-	br L_100b9b0
+	br L_100b9c0
 // --- basic block ---
-L_100bcdc:
-// 0x0100bcdc: 0x100bcdc: lw    v0, 28(sp)
+L_100bcec:
+// 0x0100bcec: 0x100bcec: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2784,15 +2784,15 @@ L_100bcdc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bce0: 0x100bce0: addiu a0, sp, 16
+// 0x0100bcf0: 0x100bcf0: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0100bce4: 0x100bce4: addu  a1, s0, zero
+// 0x0100bcf4: 0x100bcf4: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0100bce8: 0x100bce8: jal   0x100b7a8 sw    v0, 20(sp)
+// 0x0100bcf8: 0x100bcf8: jal   0x100b7b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2806,30 +2806,30 @@ L_100bcdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bcf0: 0x100bcf0: addiu v1, zero, -1
+// 0x0100bd00: 0x100bd00: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bcf4: 0x100bcf4: bne   v0, v1, 0x100ba0c sll   v1, s4, 2
+// 0x0100bd04: 0x100bd04: bne   v0, v1, 0x100ba1c sll   v1, s4, 2
 	ldloc 6
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-	bne.un L_100ba0c
+	bne.un L_100ba1c
 // --- basic block ---
-// 0x0100bcfc: 0x100bcfc: j	 0x100ba1c lui   v0, 0xe0000
+// 0x0100bd0c: 0x100bd0c: j	 0x100ba2c lui   v0, 0xe0000
 	ldc.i4 917504
 	stloc 6
-	br L_100ba1c
+	br L_100ba2c
 // --- basic block ---
-L_100bd04:
-// 0x0100bd04: 0x100bd04: lw    v0, 28(sp)
+L_100bd14:
+// 0x0100bd14: 0x100bd14: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2838,7 +2838,7 @@ L_100bd04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bd08: 0x100bd08: jal   0x100b7a8 sw    v0, 20(sp)
+// 0x0100bd18: 0x100bd18: jal   0x100b7b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2852,38 +2852,38 @@ L_100bd04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bd10: 0x100bd10: addiu v1, zero, -1
+// 0x0100bd20: 0x100bd20: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bd14: 0x100bd14: bne   v0, v1, 0x100ba84 sll   v1, s4, 2
+// 0x0100bd24: 0x100bd24: bne   v0, v1, 0x100ba94 sll   v1, s4, 2
 	ldloc 6
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-	bne.un L_100ba84
+	bne.un L_100ba94
 // --- basic block ---
-// 0x0100bd1c: 0x100bd1c: j	 0x100ba94 lui   a0, 0xe0000
+// 0x0100bd2c: 0x100bd2c: j	 0x100baa4 lui   a0, 0xe0000
 	ldc.i4 917504
 	stloc.1
-	br L_100ba94
+	br L_100baa4
 // --- basic block ---
-L_100bd24:
-// 0x0100bd24: 0x100bd24: addiu a0, sp, 16
+L_100bd34:
+// 0x0100bd34: 0x100bd34: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0100bd28: 0x100bd28: addu  a1, s0, zero
+// 0x0100bd38: 0x100bd38: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0100bd2c: 0x100bd2c: sw    v1, 16(sp)
+// 0x0100bd3c: 0x100bd3c: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2892,7 +2892,7 @@ L_100bd24:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100bd30: 0x100bd30: jal   0x100b7a8 sw    v0, 20(sp)
+// 0x0100bd40: 0x100bd40: jal   0x100b7b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2906,38 +2906,38 @@ L_100bd24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bd38: 0x100bd38: addiu v1, zero, -1
+// 0x0100bd48: 0x100bd48: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bd3c: 0x100bd3c: bne   v0, v1, 0x100baf4 lui   v1, 0xe0000
+// 0x0100bd4c: 0x100bd4c: bne   v0, v1, 0x100bb04 lui   v1, 0xe0000
 	ldloc 6
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	bne.un L_100baf4
+	bne.un L_100bb04
 // --- basic block ---
-// 0x0100bd44: 0x100bd44: j	 0x100bb0c addiu v1, v1, 29604
+// 0x0100bd54: 0x100bd54: j	 0x100bb1c addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-	br L_100bb0c
+	br L_100bb1c
 // --- basic block ---
-L_100bd4c:
-// 0x0100bd4c: 0x100bd4c: addiu a0, sp, 16
+L_100bd5c:
+// 0x0100bd5c: 0x100bd5c: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0100bd50: 0x100bd50: addu  a1, s0, zero
+// 0x0100bd60: 0x100bd60: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0100bd54: 0x100bd54: jal   0x100b7a8 sw    v0, 20(sp)
+// 0x0100bd64: 0x100bd64: jal   0x100b7b8 sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2951,38 +2951,38 @@ L_100bd4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bd5c: 0x100bd5c: addiu v1, zero, -1
+// 0x0100bd6c: 0x100bd6c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bd60: 0x100bd60: bne   v0, v1, 0x100bb70 lui   v1, 0xe0000
+// 0x0100bd70: 0x100bd70: bne   v0, v1, 0x100bb80 lui   v1, 0xe0000
 	ldloc 6
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	bne.un L_100bb70
+	bne.un L_100bb80
 // --- basic block ---
-// 0x0100bd68: 0x100bd68: j	 0x100bb88 addiu v1, v1, 29604
+// 0x0100bd78: 0x100bd78: j	 0x100bb98 addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-	br L_100bb88
+	br L_100bb98
 // --- basic block ---
-L_100bd70:
-// 0x0100bd70: 0x100bd70: addiu a0, sp, 16
+L_100bd80:
+// 0x0100bd80: 0x100bd80: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0100bd74: 0x100bd74: addu  a1, s0, zero
+// 0x0100bd84: 0x100bd84: addu  a1, s0, zero
 	ldloc 10
 	stloc.2
-// 0x0100bd78: 0x100bd78: jal   0x100b7a8 sw    v0, 16(sp)
+// 0x0100bd88: 0x100bd88: jal   0x100b7b8 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2996,30 +2996,30 @@ L_100bd70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bd80: 0x100bd80: addiu v1, zero, -1
+// 0x0100bd90: 0x100bd90: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bd84: 0x100bd84: bne   v0, v1, 0x100bbe8 lui   v1, 0xe0000
+// 0x0100bd94: 0x100bd94: bne   v0, v1, 0x100bbf8 lui   v1, 0xe0000
 	ldloc 6
 	ldloc 5
 	ldc.i4 917504
 	stloc 5
-	bne.un L_100bbe8
+	bne.un L_100bbf8
 // --- basic block ---
-// 0x0100bd8c: 0x100bd8c: j	 0x100bc00 addiu v1, v1, 29604
+// 0x0100bd9c: 0x100bd9c: j	 0x100bc10 addiu v1, v1, 30068
 	ldloc 5
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 5
-	br L_100bc00
+	br L_100bc10
 // --- basic block ---
-L_100bd94:
-// 0x0100bd94: 0x100bd94: sw    v0, 16(sp)
+L_100bda4:
+// 0x0100bda4: 0x100bda4: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3028,7 +3028,7 @@ L_100bd94:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100bd98: 0x100bd98: jal   0x100b7a8 sw    s1, 20(sp)
+// 0x0100bda8: 0x100bda8: jal   0x100b7b8 sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3042,32 +3042,32 @@ L_100bd94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_search_100b7a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_search_100b7b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100bda0: 0x100bda0: addiu v1, zero, -1
+// 0x0100bdb0: 0x100bdb0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100bda4: 0x100bda4: bne   v0, v1, 0x100bc60 sll   v1, s4, 2
+// 0x0100bdb4: 0x100bdb4: bne   v0, v1, 0x100bc70 sll   v1, s4, 2
 	ldloc 6
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 5
-	bne.un L_100bc60
+	bne.un L_100bc70
 // --- basic block ---
-// 0x0100bdac: 0x100bdac: j	 0x100bc6c sll   zero, zero, 0
-	br L_100bc6c
+// 0x0100bdbc: 0x100bdbc: j	 0x100bc7c sll   zero, zero, 0
+	br L_100bc7c
 __CIBYL_function_return:
 	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_view_100bdb4(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_view_100bdc4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 lo,int32 t1,int32 s8,int32 s5,int32 t0,int32 s6,int32 s7,int32 ra)
@@ -3138,24 +3138,24 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100bdb4: 0x100bdb4: lui   v0, 0x20000
+// 0x0100bdc4: 0x100bdc4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100bdb8: 0x100bdb8: lw    v0, 31244(v0)
+// 0x0100bdc8: 0x100bdc8: lw    v0, 31708(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bdbc: 0x100bdbc: addiu sp, sp, -160
+// 0x0100bdcc: 0x100bdcc: addiu sp, sp, -160
 	ldloc.0
 	ldc.i4 -160
 	add
 	stloc.0
-// 0x0100bdc0: 0x100bdc0: sw    s4, 136(sp)
+// 0x0100bdd0: 0x100bdd0: sw    s4, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3164,7 +3164,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100bdc4: 0x100bdc4: sw    s2, 128(sp)
+// 0x0100bdd4: 0x100bdd4: sw    s2, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3173,7 +3173,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100bdc8: 0x100bdc8: sw    s1, 124(sp)
+// 0x0100bdd8: 0x100bdd8: sw    s1, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3182,8 +3182,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100bdcc: 0x100bdcc: sw    ra, 156(sp)
-// 0x0100bdd0: 0x100bdd0: sw    s8, 152(sp)
+// 0x0100bddc: 0x100bddc: sw    ra, 156(sp)
+// 0x0100bde0: 0x100bde0: sw    s8, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3192,7 +3192,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100bdd4: 0x100bdd4: sw    s7, 148(sp)
+// 0x0100bde4: 0x100bde4: sw    s7, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3201,7 +3201,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0100bdd8: 0x100bdd8: sw    s6, 144(sp)
+// 0x0100bde8: 0x100bde8: sw    s6, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3210,7 +3210,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0100bddc: 0x100bddc: sw    s5, 140(sp)
+// 0x0100bdec: 0x100bdec: sw    s5, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3219,7 +3219,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100bde0: 0x100bde0: sw    s3, 132(sp)
+// 0x0100bdf0: 0x100bdf0: sw    s3, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3228,7 +3228,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100bde4: 0x100bde4: sw    s0, 120(sp)
+// 0x0100bdf4: 0x100bdf4: sw    s0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3237,7 +3237,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100bde8: 0x100bde8: sw    a0, 160(sp)
+// 0x0100bdf8: 0x100bdf8: sw    a0, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3246,19 +3246,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100bdec: 0x100bdec: addu  s4, a1, zero
+// 0x0100bdfc: 0x100bdfc: addu  s4, a1, zero
 	ldloc.2
 	stloc 12
-// 0x0100bdf0: 0x100bdf0: addu  s2, a2, zero
+// 0x0100be00: 0x100be00: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x0100bdf4: 0x100bdf4: beq   v0, zero, 0x100c188 addu  s1, zero, zero
+// 0x0100be04: 0x100be04: beq   v0, zero, 0x100c198 addu  s1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 9
-	brfalse L_100c188
+	brfalse L_100c198
 // --- basic block ---
-// 0x0100bdfc: 0x100bdfc: jal   0x1007f28 addiu a0, sp, 40
+// 0x0100be0c: 0x100be0c: jal   0x1007f38 addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3268,24 +3268,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_screen_edges_1007f28(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_screen_edges_1007f38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100be04: 0x100be04: lui   v0, 0x20000
+// 0x0100be14: 0x100be14: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100be08: 0x100be08: lw    a0, 31248(v0)
+// 0x0100be18: 0x100be18: lw    a0, 31712(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100be0c: 0x100be0c: lw    v0, 48(sp)
+// 0x0100be1c: 0x100be1c: lw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3294,12 +3294,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100be10: 0x100be10: addiu a1, sp, 32
+// 0x0100be20: 0x100be20: addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-// 0x0100be14: 0x100be14: sw    v0, 32(sp)
+// 0x0100be24: 0x100be24: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3308,7 +3308,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100be18: 0x100be18: lw    v0, 52(sp)
+// 0x0100be28: 0x100be28: lw    v0, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3317,12 +3317,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100be1c: 0x100be1c: addiu a2, sp, 24
+// 0x0100be2c: 0x100be2c: addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.3
-// 0x0100be20: 0x100be20: jal   0x100c524 sw    v0, 36(sp)
+// 0x0100be30: 0x100be30: jal   0x100c534 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3335,18 +3335,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_origin_100c524(int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_origin_100c534(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100be28: 0x100be28: beq   s2, zero, 0x100be44 lui   v0, 0x20000
+// 0x0100be38: 0x100be38: beq   s2, zero, 0x100be54 lui   v0, 0x20000
 	ldloc 10
 	ldc.i4 131072
 	stloc 6
-	brfalse L_100be44
+	brfalse L_100be54
 // --- basic block ---
-// 0x0100be30: 0x100be30: lw    v0, 28(sp)
+// 0x0100be40: 0x100be40: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3355,7 +3355,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100be34: 0x100be34: lw    v1, 24(sp)
+// 0x0100be44: 0x100be44: lw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3364,7 +3364,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100be38: 0x100be38: sw    v0, 12(s2)
+// 0x0100be48: 0x100be48: sw    v0, 12(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3373,7 +3373,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100be3c: 0x100be3c: sw    v1, 8(s2)
+// 0x0100be4c: 0x100be4c: sw    v1, 8(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -3382,32 +3382,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100be40: 0x100be40: lui   v0, 0x20000
+// 0x0100be50: 0x100be50: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-L_100be44:
-// 0x0100be44: 0x100be44: lw    a0, 31248(v0)
+L_100be54:
+// 0x0100be54: 0x100be54: lw    a0, 31712(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100be48: 0x100be48: jal   0x100c500 lui   s3, 0xe0000
+// 0x0100be58: 0x100be58: jal   0x100c510 lui   s3, 0xe0000
 	ldc.i4 917504
 	stloc 11
 	ldloc.1
-	call int32 Cibyl8::roadmap_tile_get_size_100c500(int32)
+	call int32 Cibyl8::roadmap_tile_get_size_100c510(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100be50: 0x100be50: addu  s5, v0, zero
+// 0x0100be60: 0x100be60: addu  s5, v0, zero
 	ldloc 6
 	stloc 16
-// 0x0100be54: 0x100be54: lw    v0, 24(sp)
+// 0x0100be64: 0x100be64: lw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3416,10 +3416,10 @@ L_100be44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100be58: 0x100be58: lui   s8, 0x0
+// 0x0100be68: 0x100be68: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x0100be5c: 0x100be5c: sw    v0, 32(sp)
+// 0x0100be6c: 0x100be6c: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3428,29 +3428,29 @@ L_100be44:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100be60: 0x100be60: addiu s3, s3, 29604
+// 0x0100be70: 0x100be70: addiu s3, s3, 30068
 	ldloc 11
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 11
-// 0x0100be64: 0x100be64: addiu s8, s8, 24604
+// 0x0100be74: 0x100be74: addiu s8, s8, 24604
 	ldloc 15
 	ldc.i4 24604
 	add
 	stloc 15
-// 0x0100be68: 0x100be68: addu  s1, zero, zero
+// 0x0100be78: 0x100be78: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0100be6c: 0x100be6c: lui   s7, 0x20000
+// 0x0100be7c: 0x100be7c: lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 19
-// 0x0100be70: 0x100be70: j	 0x100c154 lui   s6, 0x0
+// 0x0100be80: 0x100be80: j	 0x100c164 lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 18
-	br L_100c154
+	br L_100c164
 // --- basic block ---
-L_100be78:
-// 0x0100be78: 0x100be78: lw    v0, 28(sp)
+L_100be88:
+// 0x0100be88: 0x100be88: lw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3459,8 +3459,8 @@ L_100be78:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100be7c: 0x100be7c: sll   zero, zero, 0
-// 0x0100be80: 0x100be80: sw    v0, 36(sp)
+// 0x0100be8c: 0x100be8c: sll   zero, zero, 0
+// 0x0100be90: 0x100be90: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3469,12 +3469,12 @@ L_100be78:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100be84: 0x100be84: addiu v0, sp, 104
+// 0x0100be94: 0x100be94: addiu v0, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
 	stloc 6
-// 0x0100be88: 0x100be88: j	 0x100c12c sw    v0, 112(sp)
+// 0x0100be98: 0x100be98: j	 0x100c13c sw    v0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3483,19 +3483,19 @@ L_100be78:
 	add
 	ldloc 6
 	stelem.i4
-	br L_100c12c
+	br L_100c13c
 // --- basic block ---
-L_100be90:
-// 0x0100be90: 0x100be90: lw    a0, 31248(v1)
+L_100bea0:
+// 0x0100bea0: 0x100bea0: lw    a0, 31712(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7812
+	ldc.i4 7928
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100be94: 0x100be94: jal   0x100c63c addiu a1, sp, 32
+// 0x0100bea4: 0x100bea4: jal   0x100c64c addiu a1, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3505,15 +3505,15 @@ L_100be90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100be9c: 0x100be9c: addu  a0, v0, zero
+// 0x0100beac: 0x100beac: addu  a0, v0, zero
 	ldloc 6
 	stloc.1
-// 0x0100bea0: 0x100bea0: jal   0x100b0dc addu  s0, v0, zero
+// 0x0100beb0: 0x100beb0: jal   0x100b0ec addu  s0, v0, zero
 	ldloc 6
 	stloc 8
 	ldloc.0
@@ -3521,24 +3521,24 @@ L_100be90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100bea8: 0x100bea8: bltz  v0, 0x100bec4 addu  a0, s0, zero
+// 0x0100beb8: 0x100beb8: bltz  v0, 0x100bed4 addu  a0, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
 	ldc.i4.s 0
-	blt L_100bec4
+	blt L_100bed4
 // --- basic block ---
-// 0x0100beb0: 0x100beb0: addiu a1, sp, 56
+// 0x0100bec0: 0x100bec0: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x0100beb4: 0x100beb4: jal   0x100b594 sw    v0, 108(sp)
+// 0x0100bec4: 0x100bec4: jal   0x100b5a4 sw    v0, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3552,36 +3552,36 @@ L_100be90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_edges_100b594(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_edges_100b5a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100bebc: 0x100bebc: j	 0x100bee0 sll   zero, zero, 0
-	br L_100bee0
+// 0x0100becc: 0x100becc: j	 0x100bef0 sll   zero, zero, 0
+	br L_100bef0
 // --- basic block ---
-L_100bec4:
-// 0x0100bec4: 0x100bec4: addiu v1, sp, 60
+L_100bed4:
+// 0x0100bed4: 0x100bed4: addiu v1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc 7
-// 0x0100bec8: 0x100bec8: addiu a1, sp, 64
+// 0x0100bed8: 0x100bed8: addiu a1, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.2
-// 0x0100becc: 0x100becc: addiu a2, sp, 56
+// 0x0100bedc: 0x100bedc: addiu a2, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.3
-// 0x0100bed0: 0x100bed0: addiu a3, sp, 68
+// 0x0100bee0: 0x100bee0: addiu a3, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc 4
-// 0x0100bed4: 0x100bed4: sw    v1, 16(sp)
+// 0x0100bee4: 0x100bee4: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3590,7 +3590,7 @@ L_100bec4:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100bed8: 0x100bed8: jal   0x100c85c sw    v0, 108(sp)
+// 0x0100bee8: 0x100bee8: jal   0x100c86c sw    v0, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3604,13 +3604,13 @@ L_100bec4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_edges_100c85c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_edges_100c86c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100bee0:
-// 0x0100bee0: 0x100bee0: lw    a2, 80(s3)
+L_100bef0:
+// 0x0100bef0: 0x100bef0: lw    a2, 80(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3619,7 +3619,7 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100bee4: 0x100bee4: lw    t1, 56(sp)
+// 0x0100bef4: 0x100bef4: lw    t1, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3628,7 +3628,7 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100bee8: 0x100bee8: lw    a1, 32(s3)
+// 0x0100bef8: 0x100bef8: lw    a1, 32(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3637,17 +3637,17 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100beec: 0x100beec: subu  t1, t1, a2
+// 0x0100befc: 0x100befc: subu  t1, t1, a2
 	ldloc 14
 	ldloc.3
 	sub
 	stloc 14
-// 0x0100bef0: 0x100bef0: div   t1, a1
+// 0x0100bf00: 0x100bf00: div   t1, a1
 	ldloc 14
 	ldloc.2
 	div
 	stloc 13
-// 0x0100bef4: 0x100bef4: lw    v1, 76(s3)
+// 0x0100bf04: 0x100bf04: lw    v1, 76(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3656,7 +3656,7 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100bef8: 0x100bef8: lw    a3, 68(sp)
+// 0x0100bf08: 0x100bf08: lw    a3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3665,7 +3665,7 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100befc: 0x100befc: lw    a0, 36(s3)
+// 0x0100bf0c: 0x100bf0c: lw    a0, 36(s3)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -3674,12 +3674,12 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bf00: 0x100bf00: subu  a3, v1, a3
+// 0x0100bf10: 0x100bf10: subu  a3, v1, a3
 	ldloc 7
 	ldloc 4
 	sub
 	stloc 4
-// 0x0100bf04: 0x100bf04: lw    t0, 64(sp)
+// 0x0100bf14: 0x100bf14: lw    t0, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3688,7 +3688,7 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0100bf08: 0x100bf08: lw    v0, 108(sp)
+// 0x0100bf18: 0x100bf18: lw    v0, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3697,12 +3697,12 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bf0c: 0x100bf0c: subu  t0, t0, a2
+// 0x0100bf1c: 0x100bf1c: subu  t0, t0, a2
 	ldloc 17
 	ldloc.3
 	sub
 	stloc 17
-// 0x0100bf10: 0x100bf10: lw    a2, 60(sp)
+// 0x0100bf20: 0x100bf20: lw    a2, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3711,21 +3711,21 @@ L_100bee0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100bf14: 0x100bf14: sll   zero, zero, 0
-// 0x0100bf18: 0x100bf18: subu  a2, v1, a2
+// 0x0100bf24: 0x100bf24: sll   zero, zero, 0
+// 0x0100bf28: 0x100bf28: subu  a2, v1, a2
 	ldloc 7
 	ldloc.3
 	sub
 	stloc.3
-// 0x0100bf1c: 0x100bf1c: addiu v1, sp, 72
+// 0x0100bf2c: 0x100bf2c: addiu v1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc 7
-// 0x0100bf20: 0x100bf20: mflo  lo
+// 0x0100bf30: 0x100bf30: mflo  lo
 	ldloc 13
 	stloc 14
-// 0x0100bf24: 0x100bf24: sw    t1, 88(sp)
+// 0x0100bf34: 0x100bf34: sw    t1, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3734,7 +3734,7 @@ L_100bee0:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100bf28: 0x100bf28: sw    t1, 80(sp)
+// 0x0100bf38: 0x100bf38: sw    t1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3743,15 +3743,15 @@ L_100bee0:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100bf2c: 0x100bf2c: div   a3, a0
+// 0x0100bf3c: 0x100bf3c: div   a3, a0
 	ldloc 4
 	ldloc.1
 	div
 	stloc 13
-// 0x0100bf30: 0x100bf30: mflo  lo
+// 0x0100bf40: 0x100bf40: mflo  lo
 	ldloc 13
 	stloc 4
-// 0x0100bf34: 0x100bf34: sw    a3, 100(sp)
+// 0x0100bf44: 0x100bf44: sw    a3, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3760,7 +3760,7 @@ L_100bee0:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100bf38: 0x100bf38: sw    a3, 84(sp)
+// 0x0100bf48: 0x100bf48: sw    a3, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3769,15 +3769,15 @@ L_100bee0:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100bf3c: 0x100bf3c: div   t0, a1
+// 0x0100bf4c: 0x100bf4c: div   t0, a1
 	ldloc 17
 	ldloc.2
 	div
 	stloc 13
-// 0x0100bf40: 0x100bf40: mflo  lo
+// 0x0100bf50: 0x100bf50: mflo  lo
 	ldloc 13
 	stloc.2
-// 0x0100bf44: 0x100bf44: sw    a1, 96(sp)
+// 0x0100bf54: 0x100bf54: sw    a1, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ L_100bee0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100bf48: 0x100bf48: sw    a1, 72(sp)
+// 0x0100bf58: 0x100bf58: sw    a1, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3795,15 +3795,15 @@ L_100bee0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100bf4c: 0x100bf4c: div   a2, a0
+// 0x0100bf5c: 0x100bf5c: div   a2, a0
 	ldloc.3
 	ldloc.1
 	div
 	stloc 13
-// 0x0100bf50: 0x100bf50: mflo  lo
+// 0x0100bf60: 0x100bf60: mflo  lo
 	ldloc 13
 	stloc.3
-// 0x0100bf54: 0x100bf54: sw    a2, 92(sp)
+// 0x0100bf64: 0x100bf64: sw    a2, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3812,7 +3812,7 @@ L_100bee0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0100bf58: 0x100bf58: sw    a2, 76(sp)
+// 0x0100bf68: 0x100bf68: sw    a2, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3821,16 +3821,16 @@ L_100bee0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0100bf5c: 0x100bf5c: addu  a0, v1, zero
+// 0x0100bf6c: 0x100bf6c: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-L_100bf60:
-// 0x0100bf60: 0x100bf60: addiu v1, v1, 8
+L_100bf70:
+// 0x0100bf70: 0x100bf70: addiu v1, v1, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 7
-// 0x0100bf64: 0x100bf64: sw    v0, 108(sp)
+// 0x0100bf74: 0x100bf74: sw    v0, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3839,7 +3839,7 @@ L_100bf60:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100bf68: 0x100bf68: jal   0x10073c4 sw    v1, 104(sp)
+// 0x0100bf78: 0x100bf78: jal   0x10073d4 sw    v1, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3853,12 +3853,12 @@ L_100bf60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_rotate_project_coordinate_10073d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100bf70: 0x100bf70: lw    v1, 104(sp)
+// 0x0100bf80: 0x100bf80: lw    v1, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3867,7 +3867,7 @@ L_100bf60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100bf74: 0x100bf74: lw    a0, 112(sp)
+// 0x0100bf84: 0x100bf84: lw    a0, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3876,7 +3876,7 @@ L_100bf60:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bf78: 0x100bf78: lw    v0, 108(sp)
+// 0x0100bf88: 0x100bf88: lw    v0, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3885,14 +3885,14 @@ L_100bf60:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100bf7c: 0x100bf7c: bne   v1, a0, 0x100bf60 addu  a0, v1, zero
+// 0x0100bf8c: 0x100bf8c: bne   v1, a0, 0x100bf70 addu  a0, v1, zero
 	ldloc 7
 	ldloc.1
 	ldloc 7
 	stloc.1
-	bne.un L_100bf60
+	bne.un L_100bf70
 // --- basic block ---
-// 0x0100bf84: 0x100bf84: lw    a2, 72(sp)
+// 0x0100bf94: 0x100bf94: lw    a2, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3901,7 +3901,7 @@ L_100bf60:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100bf88: 0x100bf88: lw    a1, 80(sp)
+// 0x0100bf98: 0x100bf98: lw    a1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3910,41 +3910,41 @@ L_100bf60:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100bf8c: 0x100bf8c: sll   zero, zero, 0
-// 0x0100bf90: 0x100bf90: subu  a0, a2, a1
+// 0x0100bf9c: 0x100bf9c: sll   zero, zero, 0
+// 0x0100bfa0: 0x100bfa0: subu  a0, a2, a1
 	ldloc.3
 	ldloc.2
 	sub
 	stloc.1
-// 0x0100bf94: 0x100bf94: sra   v1, a0, 31
+// 0x0100bfa4: 0x100bfa4: sra   v1, a0, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc 7
-// 0x0100bf98: 0x100bf98: xor   a0, v1, a0
+// 0x0100bfa8: 0x100bfa8: xor   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	xor
 	stloc.1
-// 0x0100bf9c: 0x100bf9c: subu  v1, a0, v1
+// 0x0100bfac: 0x100bfac: subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-// 0x0100bfa0: 0x100bfa0: slti  v1, v1, 30
+// 0x0100bfb0: 0x100bfb0: slti  v1, v1, 30
 	ldloc 7
 	ldc.i4.s 30
 	clt
 	stloc 7
-// 0x0100bfa4: 0x100bfa4: beq   v1, zero, 0x100bfd4 addiu a0, sp, 72
+// 0x0100bfb4: 0x100bfb4: beq   v1, zero, 0x100bfe4 addiu a0, sp, 72
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-	brfalse L_100bfd4
+	brfalse L_100bfe4
 // --- basic block ---
-// 0x0100bfac: 0x100bfac: lw    v1, 84(sp)
+// 0x0100bfbc: 0x100bfbc: lw    v1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3953,7 +3953,7 @@ L_100bf60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100bfb0: 0x100bfb0: lw    a0, 76(sp)
+// 0x0100bfc0: 0x100bfc0: lw    a0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3962,109 +3962,109 @@ L_100bf60:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100bfb4: 0x100bfb4: sll   zero, zero, 0
-// 0x0100bfb8: 0x100bfb8: subu  a0, a0, v1
+// 0x0100bfc4: 0x100bfc4: sll   zero, zero, 0
+// 0x0100bfc8: 0x100bfc8: subu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc.1
-// 0x0100bfbc: 0x100bfbc: sra   v1, a0, 31
+// 0x0100bfcc: 0x100bfcc: sra   v1, a0, 31
 	ldloc.1
 	ldc.i4.s 31
 	shr
 	stloc 7
-// 0x0100bfc0: 0x100bfc0: xor   a0, v1, a0
+// 0x0100bfd0: 0x100bfd0: xor   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	xor
 	stloc.1
-// 0x0100bfc4: 0x100bfc4: subu  v1, a0, v1
+// 0x0100bfd4: 0x100bfd4: subu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	sub
 	stloc 7
-// 0x0100bfc8: 0x100bfc8: slti  v1, v1, 30
+// 0x0100bfd8: 0x100bfd8: slti  v1, v1, 30
 	ldloc 7
 	ldc.i4.s 30
 	clt
 	stloc 7
-// 0x0100bfcc: 0x100bfcc: bne   v1, zero, 0x100c11c addiu a0, sp, 72
+// 0x0100bfdc: 0x100bfdc: bne   v1, zero, 0x100c12c addiu a0, sp, 72
 	ldloc 7
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.1
-	brtrue L_100c11c
+	brtrue L_100c12c
 // --- basic block ---
-L_100bfd4:
-// 0x0100bfd4: 0x100bfd4: addu  v1, zero, zero
+L_100bfe4:
+// 0x0100bfe4: 0x100bfe4: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_100bfd8:
-// 0x0100bfd8: 0x100bfd8: lw    a3, 0(a0)
+L_100bfe8:
+// 0x0100bfe8: 0x100bfe8: lw    a3, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0100bfdc: 0x100bfdc: sll   zero, zero, 0
-// 0x0100bfe0: 0x100bfe0: bgez  a3, 0x100bffc addiu v1, v1, 1
+// 0x0100bfec: 0x100bfec: sll   zero, zero, 0
+// 0x0100bff0: 0x100bff0: bgez  a3, 0x100c00c addiu v1, v1, 1
 	ldloc 4
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
 	ldc.i4.s 0
-	bge L_100bffc
+	bge L_100c00c
 // --- basic block ---
-// 0x0100bfe8: 0x100bfe8: addiu a3, zero, 4
+// 0x0100bff8: 0x100bff8: addiu a3, zero, 4
 	ldc.i4.4
 	stloc 4
-// 0x0100bfec: 0x100bfec: bne   v1, a3, 0x100bfd8 addiu a0, a0, 8
+// 0x0100bffc: 0x100bffc: bne   v1, a3, 0x100bfe8 addiu a0, a0, 8
 	ldloc 7
 	ldloc 4
 	ldloc.1
 	ldc.i4.8
 	add
 	stloc.1
-	bne.un L_100bfd8
+	bne.un L_100bfe8
 // --- basic block ---
-// 0x0100bff4: 0x100bff4: j	 0x100c11c sll   zero, zero, 0
-	br L_100c11c
+// 0x0100c004: 0x100c004: j	 0x100c12c sll   zero, zero, 0
+	br L_100c12c
 // --- basic block ---
-L_100bffc:
-// 0x0100bffc: 0x100bffc: lui   a0, 0xf0000
+L_100c00c:
+// 0x0100c00c: 0x100c00c: lui   a0, 0xf0000
 	ldc.i4 983040
 	stloc.1
-// 0x0100c000: 0x100c000: lw    v1, -30068(a0)
+// 0x0100c010: 0x100c010: lw    v1, -29604(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c004: 0x100c004: sll   zero, zero, 0
-// 0x0100c008: 0x100c008: slt   a2, v1, a2
+// 0x0100c014: 0x100c014: sll   zero, zero, 0
+// 0x0100c018: 0x100c018: slt   a2, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc.3
-// 0x0100c00c: 0x100c00c: beq   a2, zero, 0x100c044 slt   a1, v1, a1
+// 0x0100c01c: 0x100c01c: beq   a2, zero, 0x100c054 slt   a1, v1, a1
 	ldloc.3
 	ldloc 7
 	ldloc.2
 	clt
 	stloc.2
-	brfalse L_100c044
+	brfalse L_100c054
 // --- basic block ---
-// 0x0100c014: 0x100c014: beq   a1, zero, 0x100c044 sll   zero, zero, 0
+// 0x0100c024: 0x100c024: beq   a1, zero, 0x100c054 sll   zero, zero, 0
 	ldloc.2
-	brfalse L_100c044
+	brfalse L_100c054
 // --- basic block ---
-// 0x0100c01c: 0x100c01c: lw    a0, 88(sp)
+// 0x0100c02c: 0x100c02c: lw    a0, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4073,17 +4073,17 @@ L_100bffc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c020: 0x100c020: sll   zero, zero, 0
-// 0x0100c024: 0x100c024: slt   a0, v1, a0
+// 0x0100c030: 0x100c030: sll   zero, zero, 0
+// 0x0100c034: 0x100c034: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x0100c028: 0x100c028: beq   a0, zero, 0x100c044 sll   zero, zero, 0
+// 0x0100c038: 0x100c038: beq   a0, zero, 0x100c054 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_100c044
+	brfalse L_100c054
 // --- basic block ---
-// 0x0100c030: 0x100c030: lw    a0, 96(sp)
+// 0x0100c040: 0x100c040: lw    a0, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4092,31 +4092,31 @@ L_100bffc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c034: 0x100c034: sll   zero, zero, 0
-// 0x0100c038: 0x100c038: slt   v1, v1, a0
+// 0x0100c044: 0x100c044: sll   zero, zero, 0
+// 0x0100c048: 0x100c048: slt   v1, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc 7
-// 0x0100c03c: 0x100c03c: bne   v1, zero, 0x100c11c sll   zero, zero, 0
+// 0x0100c04c: 0x100c04c: bne   v1, zero, 0x100c12c sll   zero, zero, 0
 	ldloc 7
-	brtrue L_100c11c
+	brtrue L_100c12c
 // --- basic block ---
-L_100c044:
-// 0x0100c044: 0x100c044: bgez  v0, 0x100c094 addu  a0, s0, zero
+L_100c054:
+// 0x0100c054: 0x100c054: bgez  v0, 0x100c0a4 addu  a0, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
 	ldc.i4.s 0
-	bge L_100c094
+	bge L_100c0a4
 // --- basic block ---
-// 0x0100c04c: 0x100c04c: lui   a1, 0x100000
+// 0x0100c05c: 0x100c05c: lui   a1, 0x100000
 	ldc.i4 1048576
 	stloc.2
-// 0x0100c050: 0x100c050: addu  a2, zero, zero
+// 0x0100c060: 0x100c060: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0100c054: 0x100c054: jal   0x100d384 addu  a3, zero, zero
+// 0x0100c064: 0x100c064: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4124,12 +4124,12 @@ L_100c044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100c05c: 0x100c05c: lw    v0, 576(s6)
+// 0x0100c06c: 0x100c06c: lw    v0, 576(s6)
 	ldloc 5
 	ldloc 18
 	ldc.i4.2
@@ -4138,18 +4138,18 @@ L_100c044:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c060: 0x100c060: sll   zero, zero, 0
-// 0x0100c064: 0x100c064: beq   s0, v0, 0x100c084 sll   zero, zero, 0
+// 0x0100c070: 0x100c070: sll   zero, zero, 0
+// 0x0100c074: 0x100c074: beq   s0, v0, 0x100c094 sll   zero, zero, 0
 	ldloc 8
 	ldloc 6
-	beq  L_100c084
+	beq  L_100c094
 // --- basic block ---
-// 0x0100c06c: 0x100c06c: bltz  s0, 0x100c11c sll   zero, zero, 0
+// 0x0100c07c: 0x100c07c: bltz  s0, 0x100c12c sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	blt L_100c11c
+	blt L_100c12c
 // --- basic block ---
-// 0x0100c074: 0x100c074: jal   0x100b164 addu  a0, s0, zero
+// 0x0100c084: 0x100c084: jal   0x100b174 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4157,17 +4157,17 @@ L_100c044:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100c07c: 0x100c07c: beq   v0, zero, 0x100c11c sll   zero, zero, 0
+// 0x0100c08c: 0x100c08c: beq   v0, zero, 0x100c12c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_100c11c
+	brfalse L_100c12c
 // --- basic block ---
-L_100c084:
-// 0x0100c084: 0x100c084: jal   0x100b0dc addu  a0, s0, zero
+L_100c094:
+// 0x0100c094: 0x100c094: jal   0x100b0ec addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4175,34 +4175,34 @@ L_100c084:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100c08c: 0x100c08c: bltz  v0, 0x100c11c sll   zero, zero, 0
+// 0x0100c09c: 0x100c09c: bltz  v0, 0x100c12c sll   zero, zero, 0
 	ldloc 6
 	ldc.i4.s 0
-	blt L_100c11c
+	blt L_100c12c
 // --- basic block ---
-L_100c094:
-// 0x0100c094: 0x100c094: lw    v0, 31252(s7)
+L_100c0a4:
+// 0x0100c0a4: 0x100c0a4: lw    v0, 31716(s7)
 	ldloc 5
 	ldloc 19
 	ldc.i4.2
 	shr.un
-	ldc.i4 7813
+	ldc.i4 7929
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c098: 0x100c098: sll   zero, zero, 0
-// 0x0100c09c: 0x100c09c: bne   v0, zero, 0x100c0c4 addu  a0, s0, zero
+// 0x0100c0a8: 0x100c0a8: sll   zero, zero, 0
+// 0x0100c0ac: 0x100c0ac: bne   v0, zero, 0x100c0d4 addu  a0, s0, zero
 	ldloc 6
 	ldloc 8
 	stloc.1
-	brtrue L_100c0c4
+	brtrue L_100c0d4
 // --- basic block ---
-// 0x0100c0a4: 0x100c0a4: jal   0x100db90 addu  a0, s0, zero
+// 0x0100c0b4: 0x100c0b4: jal   0x100dba0 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4210,43 +4210,43 @@ L_100c094:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100c0ac: 0x100c0ac: lw    v0, 0(v0)
+// 0x0100c0bc: 0x100c0bc: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100c0b0: 0x100c0b0: sll   zero, zero, 0
-// 0x0100c0b4: 0x100c0b4: andi  v0, v0, 256
+// 0x0100c0c0: 0x100c0c0: sll   zero, zero, 0
+// 0x0100c0c4: 0x100c0c4: andi  v0, v0, 256
 	ldloc 6
 	ldc.i4 256
 	and
 	stloc 6
-// 0x0100c0b8: 0x100c0b8: beq   v0, zero, 0x100c0d8 slt   v0, s1, s4
+// 0x0100c0c8: 0x100c0c8: beq   v0, zero, 0x100c0e8 slt   v0, s1, s4
 	ldloc 6
 	ldloc 9
 	ldloc 12
 	clt
 	stloc 6
-	brfalse L_100c0d8
+	brfalse L_100c0e8
 // --- basic block ---
-// 0x0100c0c0: 0x100c0c0: addu  a0, s0, zero
+// 0x0100c0d0: 0x100c0d0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-L_100c0c4:
-// 0x0100c0c4: 0x100c0c4: lui   a1, 0x100000
+L_100c0d4:
+// 0x0100c0d4: 0x100c0d4: lui   a1, 0x100000
 	ldc.i4 1048576
 	stloc.2
-// 0x0100c0c8: 0x100c0c8: addiu a2, zero, 1
+// 0x0100c0d8: 0x100c0d8: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0100c0cc: 0x100c0cc: jal   0x100d384 addu  a3, zero, zero
+// 0x0100c0dc: 0x100c0dc: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4254,26 +4254,26 @@ L_100c0c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100c0d4: 0x100c0d4: slt   v0, s1, s4
+// 0x0100c0e4: 0x100c0e4: slt   v0, s1, s4
 	ldloc 9
 	ldloc 12
 	clt
 	stloc 6
-L_100c0d8:
-// 0x0100c0d8: 0x100c0d8: beq   v0, zero, 0x100c0f0 sll   v0, s1, 2
+L_100c0e8:
+// 0x0100c0e8: 0x100c0e8: beq   v0, zero, 0x100c100 sll   v0, s1, 2
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 6
-	brfalse L_100c0f0
+	brfalse L_100c100
 // --- basic block ---
-// 0x0100c0e0: 0x100c0e0: lw    a3, 160(sp)
+// 0x0100c0f0: 0x100c0f0: lw    a3, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4282,55 +4282,55 @@ L_100c0d8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100c0e4: 0x100c0e4: sll   zero, zero, 0
-// 0x0100c0e8: 0x100c0e8: addu  v0, a3, v0
+// 0x0100c0f4: 0x100c0f4: sll   zero, zero, 0
+// 0x0100c0f8: 0x100c0f8: addu  v0, a3, v0
 	ldloc 4
 	ldloc 6
 	add
 	stloc 6
-// 0x0100c0ec: 0x100c0ec: sw    s0, 0(v0)
+// 0x0100c0fc: 0x100c0fc: sw    s0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-L_100c0f0:
-// 0x0100c0f0: 0x100c0f0: blez  s4, 0x100c11c addiu s1, s1, 1
+L_100c100:
+// 0x0100c100: 0x100c100: blez  s4, 0x100c12c addiu s1, s1, 1
 	ldloc 12
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
 	ldc.i4.s 0
-	ble L_100c11c
+	ble L_100c12c
 // --- basic block ---
-// 0x0100c0f8: 0x100c0f8: slt   v0, s4, s1
+// 0x0100c108: 0x100c108: slt   v0, s4, s1
 	ldloc 12
 	ldloc 9
 	clt
 	stloc 6
-// 0x0100c0fc: 0x100c0fc: beq   v0, zero, 0x100c11c lui   a3, 0x0
+// 0x0100c10c: 0x100c10c: beq   v0, zero, 0x100c12c lui   a3, 0x0
 	ldloc 6
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_100c11c
+	brfalse L_100c12c
 // --- basic block ---
-// 0x0100c104: 0x100c104: addiu a0, zero, 4
+// 0x0100c114: 0x100c114: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100c108: 0x100c108: addu  a1, s8, zero
+// 0x0100c118: 0x100c118: addu  a1, s8, zero
 	ldloc 15
 	stloc.2
-// 0x0100c10c: 0x100c10c: addiu a2, zero, 893
+// 0x0100c11c: 0x100c11c: addiu a2, zero, 893
 	ldc.i4 893
 	stloc.3
-// 0x0100c110: 0x100c110: addiu a3, a3, 24848
+// 0x0100c120: 0x100c120: addiu a3, a3, 24848
 	ldloc 4
 	ldc.i4 24848
 	add
 	stloc 4
-// 0x0100c114: 0x100c114: jal   0x100449c sw    s4, 16(sp)
+// 0x0100c124: 0x100c124: jal   0x100449c sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4349,8 +4349,8 @@ L_100c0f0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100c11c:
-// 0x0100c11c: 0x100c11c: lw    v0, 36(sp)
+L_100c12c:
+// 0x0100c12c: 0x100c12c: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4359,13 +4359,13 @@ L_100c11c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c120: 0x100c120: sll   zero, zero, 0
-// 0x0100c124: 0x100c124: addu  v0, v0, s5
+// 0x0100c130: 0x100c130: sll   zero, zero, 0
+// 0x0100c134: 0x100c134: addu  v0, v0, s5
 	ldloc 6
 	ldloc 16
 	add
 	stloc 6
-// 0x0100c128: 0x100c128: sw    v0, 36(sp)
+// 0x0100c138: 0x100c138: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4374,8 +4374,8 @@ L_100c11c:
 	add
 	ldloc 6
 	stelem.i4
-L_100c12c:
-// 0x0100c12c: 0x100c12c: lw    v0, 44(sp)
+L_100c13c:
+// 0x0100c13c: 0x100c13c: lw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4384,7 +4384,7 @@ L_100c12c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c130: 0x100c130: lw    v1, 36(sp)
+// 0x0100c140: 0x100c140: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4393,19 +4393,19 @@ L_100c12c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c134: 0x100c134: sll   zero, zero, 0
-// 0x0100c138: 0x100c138: slt   v0, v0, v1
+// 0x0100c144: 0x100c144: sll   zero, zero, 0
+// 0x0100c148: 0x100c148: slt   v0, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 6
-// 0x0100c13c: 0x100c13c: beq   v0, zero, 0x100be90 lui   v1, 0x20000
+// 0x0100c14c: 0x100c14c: beq   v0, zero, 0x100bea0 lui   v1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 7
-	brfalse L_100be90
+	brfalse L_100bea0
 // --- basic block ---
-// 0x0100c144: 0x100c144: lw    v0, 32(sp)
+// 0x0100c154: 0x100c154: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4414,13 +4414,13 @@ L_100c12c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c148: 0x100c148: sll   zero, zero, 0
-// 0x0100c14c: 0x100c14c: addu  v0, v0, s5
+// 0x0100c158: 0x100c158: sll   zero, zero, 0
+// 0x0100c15c: 0x100c15c: addu  v0, v0, s5
 	ldloc 6
 	ldloc 16
 	add
 	stloc 6
-// 0x0100c150: 0x100c150: sw    v0, 32(sp)
+// 0x0100c160: 0x100c160: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4429,8 +4429,8 @@ L_100c12c:
 	add
 	ldloc 6
 	stelem.i4
-L_100c154:
-// 0x0100c154: 0x100c154: lw    v0, 32(sp)
+L_100c164:
+// 0x0100c164: 0x100c164: lw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4439,7 +4439,7 @@ L_100c154:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c158: 0x100c158: lw    v1, 40(sp)
+// 0x0100c168: 0x100c168: lw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4448,21 +4448,21 @@ L_100c154:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c15c: 0x100c15c: sll   zero, zero, 0
-// 0x0100c160: 0x100c160: slt   v1, v0, v1
+// 0x0100c16c: 0x100c16c: sll   zero, zero, 0
+// 0x0100c170: 0x100c170: slt   v1, v0, v1
 	ldloc 6
 	ldloc 7
 	clt
 	stloc 7
-// 0x0100c164: 0x100c164: bne   v1, zero, 0x100be78 sll   zero, zero, 0
+// 0x0100c174: 0x100c174: bne   v1, zero, 0x100be88 sll   zero, zero, 0
 	ldloc 7
-	brtrue L_100be78
+	brtrue L_100be88
 // --- basic block ---
-// 0x0100c16c: 0x100c16c: beq   s2, zero, 0x100c180 sll   zero, zero, 0
+// 0x0100c17c: 0x100c17c: beq   s2, zero, 0x100c190 sll   zero, zero, 0
 	ldloc 10
-	brfalse L_100c180
+	brfalse L_100c190
 // --- basic block ---
-// 0x0100c174: 0x100c174: lw    v1, 36(sp)
+// 0x0100c184: 0x100c184: lw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4471,14 +4471,14 @@ L_100c154:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c178: 0x100c178: sw    v0, 0(s2)
+// 0x0100c188: 0x100c188: sw    v0, 0(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100c17c: 0x100c17c: sw    v1, 4(s2)
+// 0x0100c18c: 0x100c18c: sw    v1, 4(s2)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
@@ -4487,25 +4487,25 @@ L_100c154:
 	add
 	ldloc 7
 	stelem.i4
-L_100c180:
-// 0x0100c180: 0x100c180: lui   v0, 0x20000
+L_100c190:
+// 0x0100c190: 0x100c190: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100c184: 0x100c184: sw    zero, 31252(v0)
+// 0x0100c194: 0x100c194: sw    zero, 31716(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7813
+	ldc.i4 7929
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100c188:
-// 0x0100c188: 0x100c188: lw    ra, 156(sp)
-// 0x0100c18c: 0x100c18c: addu  v0, s1, zero
+L_100c198:
+// 0x0100c198: 0x100c198: lw    ra, 156(sp)
+// 0x0100c19c: 0x100c19c: addu  v0, s1, zero
 	ldloc 9
 	stloc 6
-// 0x0100c190: 0x100c190: lw    s8, 152(sp)
+// 0x0100c1a0: 0x100c1a0: lw    s8, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4514,7 +4514,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100c194: 0x100c194: lw    s7, 148(sp)
+// 0x0100c1a4: 0x100c1a4: lw    s7, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4523,7 +4523,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0100c198: 0x100c198: lw    s6, 144(sp)
+// 0x0100c1a8: 0x100c1a8: lw    s6, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4532,7 +4532,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 18
-// 0x0100c19c: 0x100c19c: lw    s5, 140(sp)
+// 0x0100c1ac: 0x100c1ac: lw    s5, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4541,7 +4541,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100c1a0: 0x100c1a0: lw    s4, 136(sp)
+// 0x0100c1b0: 0x100c1b0: lw    s4, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4550,7 +4550,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100c1a4: 0x100c1a4: lw    s3, 132(sp)
+// 0x0100c1b4: 0x100c1b4: lw    s3, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4559,7 +4559,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100c1a8: 0x100c1a8: lw    s2, 128(sp)
+// 0x0100c1b8: 0x100c1b8: lw    s2, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4568,7 +4568,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100c1ac: 0x100c1ac: lw    s1, 124(sp)
+// 0x0100c1bc: 0x100c1bc: lw    s1, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4577,7 +4577,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100c1b0: 0x100c1b0: lw    s0, 120(sp)
+// 0x0100c1c0: 0x100c1c0: lw    s0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4586,7 +4586,7 @@ L_100c188:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c1b4: 0x100c1b4: jr    ra addiu sp, sp, 160
+// 0x0100c1c4: 0x100c1c4: jr    ra addiu sp, sp, 160
 	ldloc.0
 	ldc.i4 160
 	add
@@ -4598,7 +4598,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_delete_reference_100c1bc(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_delete_reference_100c1cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -4639,12 +4639,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c1bc: 0x100c1bc: addiu sp, sp, -40
+// 0x0100c1cc: 0x100c1cc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100c1c0: 0x100c1c0: sw    s0, 28(sp)
+// 0x0100c1d0: 0x100c1d0: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4653,8 +4653,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100c1c4: 0x100c1c4: sw    ra, 36(sp)
-// 0x0100c1c8: 0x100c1c8: sw    s1, 32(sp)
+// 0x0100c1d4: 0x100c1d4: sw    ra, 36(sp)
+// 0x0100c1d8: 0x100c1d8: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4663,7 +4663,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100c1cc: 0x100c1cc: jal   0x100b0dc sw    a0, 16(sp)
+// 0x0100c1dc: 0x100c1dc: jal   0x100b0ec sw    a0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4677,12 +4677,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0100c1d4: 0x100c1d4: lw    a1, 16(sp)
+// 0x0100c1e4: 0x100c1e4: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4691,29 +4691,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c1d8: 0x100c1d8: bltz  v0, 0x100c210 addu  s0, v0, zero
+// 0x0100c1e8: 0x100c1e8: bltz  v0, 0x100c220 addu  s0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc 7
 	ldc.i4.s 0
-	blt L_100c210
+	blt L_100c220
 // --- basic block ---
-// 0x0100c1e0: 0x100c1e0: lui   s1, 0x20000
+// 0x0100c1f0: 0x100c1f0: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100c1e4: 0x100c1e4: lw    v0, 31244(s1)
+// 0x0100c1f4: 0x100c1f4: lw    v0, 31708(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c1e8: 0x100c1e8: addu  a2, s0, zero
+// 0x0100c1f8: 0x100c1f8: addu  a2, s0, zero
 	ldloc 7
 	stloc.3
-// 0x0100c1ec: 0x100c1ec: lw    a0, 3096(v0)
+// 0x0100c1fc: 0x100c1fc: lw    a0, 3096(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4722,7 +4722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c1f0: 0x100c1f0: jal   0x1015668 sll   s0, s0, 2
+// 0x0100c200: 0x100c200: jal   0x1015678 sll   s0, s0, 2
 	ldloc 7
 	ldc.i4.2
 	shl
@@ -4732,22 +4732,22 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_remove_1015668(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_remove_1015678(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0100c1f8: 0x100c1f8: lw    v0, 31244(s1)
+// 0x0100c208: 0x100c208: lw    v0, 31708(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c1fc: 0x100c1fc: sll   zero, zero, 0
-// 0x0100c200: 0x100c200: lw    v0, 8(v0)
+// 0x0100c20c: 0x100c20c: sll   zero, zero, 0
+// 0x0100c210: 0x100c210: lw    v0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4756,22 +4756,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c204: 0x100c204: sll   zero, zero, 0
-// 0x0100c208: 0x100c208: addu  s0, v0, s0
+// 0x0100c214: 0x100c214: sll   zero, zero, 0
+// 0x0100c218: 0x100c218: addu  s0, v0, s0
 	ldloc 6
 	ldloc 7
 	add
 	stloc 7
-// 0x0100c20c: 0x100c20c: sw    zero, 0(s0)
+// 0x0100c21c: 0x100c21c: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_100c210:
-// 0x0100c210: 0x100c210: lw    ra, 36(sp)
-// 0x0100c214: 0x100c214: lw    s1, 32(sp)
+L_100c220:
+// 0x0100c220: 0x100c220: lw    ra, 36(sp)
+// 0x0100c224: 0x100c224: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4780,7 +4780,7 @@ L_100c210:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c218: 0x100c218: lw    s0, 28(sp)
+// 0x0100c228: 0x100c228: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4789,7 +4789,7 @@ L_100c210:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c21c: 0x100c21c: jr    ra addiu sp, sp, 40
+// 0x0100c22c: 0x100c22c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -4801,7 +4801,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_square_unmap_one_100c224(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_unmap_one_100c234(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s3,int32 s1,int32 v1,int32 ra)
@@ -4848,13 +4848,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100c224:
-// 0x0100c224: 0x100c224: addiu sp, sp, -40
+L_100c234:
+// 0x0100c234: 0x100c234: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100c228: 0x100c228: sw    s3, 32(sp)
+// 0x0100c238: 0x100c238: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4863,7 +4863,7 @@ L_100c224:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100c22c: 0x100c22c: sw    s0, 20(sp)
+// 0x0100c23c: 0x100c23c: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4872,13 +4872,13 @@ L_100c224:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100c230: 0x100c230: lui   s3, 0x0
+// 0x0100c240: 0x100c240: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0100c234: 0x100c234: lui   s0, 0x0
+// 0x0100c244: 0x100c244: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0100c238: 0x100c238: sw    s2, 28(sp)
+// 0x0100c248: 0x100c248: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4887,7 +4887,7 @@ L_100c224:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100c23c: 0x100c23c: sw    s1, 24(sp)
+// 0x0100c24c: 0x100c24c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4896,25 +4896,25 @@ L_100c224:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100c240: 0x100c240: sw    ra, 36(sp)
-// 0x0100c244: 0x100c244: addu  s1, a0, zero
+// 0x0100c250: 0x100c250: sw    ra, 36(sp)
+// 0x0100c254: 0x100c254: addu  s1, a0, zero
 	ldloc.1
 	stloc 10
-// 0x0100c248: 0x100c248: addiu s0, s0, 620
+// 0x0100c258: 0x100c258: addiu s0, s0, 620
 	ldloc 7
 	ldc.i4 620
 	add
 	stloc 7
-// 0x0100c24c: 0x100c24c: addiu s3, s3, 752
+// 0x0100c25c: 0x100c25c: addiu s3, s3, 752
 	ldloc 9
 	ldc.i4 752
 	add
 	stloc 9
-// 0x0100c250: 0x100c250: addu  s2, a0, zero
+// 0x0100c260: 0x100c260: addu  s2, a0, zero
 	ldloc.1
 	stloc 8
-L_100c254:
-// 0x0100c254: 0x100c254: lw    v0, 4(s2)
+L_100c264:
+// 0x0100c264: 0x100c264: lw    v0, 4(s2)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4923,26 +4923,26 @@ L_100c254:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c258: 0x100c258: addiu s2, s2, 4
+// 0x0100c268: 0x100c268: addiu s2, s2, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-// 0x0100c25c: 0x100c25c: beq   v0, zero, 0x100c27c addu  a0, v0, zero
+// 0x0100c26c: 0x100c26c: beq   v0, zero, 0x100c28c addu  a0, v0, zero
 	ldloc 6
 	ldloc 6
 	stloc.1
-	brfalse L_100c27c
+	brfalse L_100c28c
 // --- basic block ---
-// 0x0100c264: 0x100c264: lw    v0, 0(s0)
+// 0x0100c274: 0x100c274: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100c268: 0x100c268: sll   zero, zero, 0
-// 0x0100c26c: 0x100c26c: lw    v0, 12(v0)
+// 0x0100c278: 0x100c278: sll   zero, zero, 0
+// 0x0100c27c: 0x100c27c: lw    v0, 12(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -4951,8 +4951,8 @@ L_100c254:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c270: 0x100c270: sll   zero, zero, 0
-// 0x0100c274: 0x100c274: jalr  v0 sll   zero, zero, 0
+// 0x0100c280: 0x100c280: sll   zero, zero, 0
+// 0x0100c284: 0x100c284: jalr  v0 sll   zero, zero, 0
 	ldloc 6
 	ldloc.0
 	ldloc.1
@@ -4964,44 +4964,44 @@ L_100c254:
 	stloc 11
 	stloc 6
 // --- basic block ---
-L_100c27c:
-// 0x0100c27c: 0x100c27c: addiu s0, s0, 12
+L_100c28c:
+// 0x0100c28c: 0x100c28c: addiu s0, s0, 12
 	ldloc 7
 	ldc.i4.s 12
 	add
 	stloc 7
-// 0x0100c280: 0x100c280: bne   s0, s3, 0x100c254 sll   zero, zero, 0
+// 0x0100c290: 0x100c290: bne   s0, s3, 0x100c264 sll   zero, zero, 0
 	ldloc 7
 	ldloc 9
-	bne.un L_100c254
+	bne.un L_100c264
 // --- basic block ---
-// 0x0100c288: 0x100c288: lw    v0, 0(s1)
+// 0x0100c298: 0x100c298: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100c28c: 0x100c28c: sll   zero, zero, 0
-// 0x0100c290: 0x100c290: lw    a0, 0(v0)
+// 0x0100c29c: 0x100c29c: sll   zero, zero, 0
+// 0x0100c2a0: 0x100c2a0: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100c294: 0x100c294: jal   0x100c1bc sll   zero, zero, 0
+// 0x0100c2a4: 0x100c2a4: jal   0x100c1cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_delete_reference_100c1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_delete_reference_100c1cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0100c29c: 0x100c29c: jal   0x1000930 addu  a0, s1, zero
+// 0x0100c2ac: 0x100c2ac: jal   0x1000930 addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5014,8 +5014,8 @@ L_100c27c:
 	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x0100c2a4: 0x100c2a4: lw    ra, 36(sp)
-// 0x0100c2a8: 0x100c2a8: lw    s3, 32(sp)
+// 0x0100c2b4: 0x100c2b4: lw    ra, 36(sp)
+// 0x0100c2b8: 0x100c2b8: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5024,7 +5024,7 @@ L_100c27c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100c2ac: 0x100c2ac: lw    s2, 28(sp)
+// 0x0100c2bc: 0x100c2bc: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5033,7 +5033,7 @@ L_100c27c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c2b0: 0x100c2b0: lw    s1, 24(sp)
+// 0x0100c2c0: 0x100c2c0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5042,7 +5042,7 @@ L_100c27c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100c2b4: 0x100c2b4: lw    s0, 20(sp)
+// 0x0100c2c4: 0x100c2c4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5051,7 +5051,7 @@ L_100c27c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c2b8: 0x100c2b8: jr    ra addiu sp, sp, 40
+// 0x0100c2c8: 0x100c2c8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5063,7 +5063,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 T_174_100c2c0(int32,int32,int32,int32,int32)
+.method public static int32 T_174_100c2d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -5101,12 +5101,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c2c0: 0x100c2c0: addiu sp, sp, -32
+// 0x0100c2d0: 0x100c2d0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100c2c4: 0x100c2c4: sw    s0, 24(sp)
+// 0x0100c2d4: 0x100c2d4: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5115,7 +5115,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100c2c8: 0x100c2c8: sw    a1, 16(sp)
+// 0x0100c2d8: 0x100c2d8: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5124,8 +5124,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100c2cc: 0x100c2cc: sw    ra, 28(sp)
-// 0x0100c2d0: 0x100c2d0: jal   0x100b0dc addu  s0, a0, zero
+// 0x0100c2dc: 0x100c2dc: sw    ra, 28(sp)
+// 0x0100c2e0: 0x100c2e0: jal   0x100b0ec addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.0
@@ -5133,12 +5133,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_find_100b0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_find_100b0ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x0100c2d8: 0x100c2d8: lw    a1, 16(sp)
+// 0x0100c2e8: 0x100c2e8: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5147,17 +5147,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c2dc: 0x100c2dc: bgez  v0, 0x100c2f0 addu  a0, s0, zero
+// 0x0100c2ec: 0x100c2ec: bgez  v0, 0x100c300 addu  a0, s0, zero
 	ldloc 7
 	ldloc 6
 	stloc.1
 	ldc.i4.s 0
-	bge L_100c2f0
+	bge L_100c300
 // --- basic block ---
-// 0x0100c2e4: 0x100c2e4: addu  a2, zero, zero
+// 0x0100c2f4: 0x100c2f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0100c2e8: 0x100c2e8: jal   0x100d384 addu  a3, zero, zero
+// 0x0100c2f8: 0x100c2f8: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -5165,14 +5165,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-L_100c2f0:
-// 0x0100c2f0: 0x100c2f0: lw    ra, 28(sp)
-// 0x0100c2f4: 0x100c2f4: lw    s0, 24(sp)
+L_100c300:
+// 0x0100c300: 0x100c300: lw    ra, 28(sp)
+// 0x0100c304: 0x100c304: lw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5181,7 +5181,7 @@ L_100c2f0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c2f8: 0x100c2f8: jr    ra addiu sp, sp, 32
+// 0x0100c308: 0x100c308: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5193,7 +5193,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_square_request_location_100c300(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_square_request_location_100c310(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s0,int32 s2,int32 lo,int32 s3,int32 ra)
@@ -5243,24 +5243,24 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c300: 0x100c300: lui   v0, 0x20000
+// 0x0100c310: 0x100c310: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100c304: 0x100c304: lw    v0, 31244(v0)
+// 0x0100c314: 0x100c314: lw    v0, 31708(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7811
+	ldc.i4 7927
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c308: 0x100c308: addiu sp, sp, -56
+// 0x0100c318: 0x100c318: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0100c30c: 0x100c30c: sw    s1, 40(sp)
+// 0x0100c31c: 0x100c31c: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5269,8 +5269,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100c310: 0x100c310: sw    ra, 52(sp)
-// 0x0100c314: 0x100c314: sw    s3, 48(sp)
+// 0x0100c320: 0x100c320: sw    ra, 52(sp)
+// 0x0100c324: 0x100c324: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5279,7 +5279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100c318: 0x100c318: sw    s2, 44(sp)
+// 0x0100c328: 0x100c328: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5288,7 +5288,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100c31c: 0x100c31c: sw    s0, 36(sp)
+// 0x0100c32c: 0x100c32c: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5297,16 +5297,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100c320: 0x100c320: beq   v0, zero, 0x100c4b8 addu  s1, a0, zero
+// 0x0100c330: 0x100c330: beq   v0, zero, 0x100c4c8 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 7
-	brfalse L_100c4b8
+	brfalse L_100c4c8
 // --- basic block ---
-// 0x0100c328: 0x100c328: addu  a0, zero, zero
+// 0x0100c338: 0x100c338: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0100c32c: 0x100c32c: jal   0x100c63c addu  a1, s1, zero
+// 0x0100c33c: 0x100c33c: jal   0x100c64c addu  a1, s1, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -5314,30 +5314,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c334: 0x100c334: addu  a0, zero, zero
+// 0x0100c344: 0x100c344: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0100c338: 0x100c338: addu  s2, v0, zero
+// 0x0100c348: 0x100c348: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0100c33c: 0x100c33c: jal   0x100c500 lui   s3, 0x0
+// 0x0100c34c: 0x100c34c: jal   0x100c510 lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
 	ldloc.1
-	call int32 Cibyl8::roadmap_tile_get_size_100c500(int32)
+	call int32 Cibyl8::roadmap_tile_get_size_100c510(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c344: 0x100c344: addu  s0, v0, zero
+// 0x0100c354: 0x100c354: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0100c348: 0x100c348: lw    v0, 752(s3)
+// 0x0100c358: 0x100c358: lw    v0, 752(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -5346,15 +5346,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c34c: 0x100c34c: sll   zero, zero, 0
-// 0x0100c350: 0x100c350: beq   s2, v0, 0x100c364 addu  a0, s2, zero
+// 0x0100c35c: 0x100c35c: sll   zero, zero, 0
+// 0x0100c360: 0x100c360: beq   s2, v0, 0x100c374 addu  a0, s2, zero
 	ldloc 10
 	ldloc 5
 	ldloc 10
 	stloc.1
-	beq  L_100c364
+	beq  L_100c374
 // --- basic block ---
-// 0x0100c358: 0x100c358: jal   0x100c2c0 lui   a1, 0x700000
+// 0x0100c368: 0x100c368: jal   0x100c2d0 lui   a1, 0x700000
 	ldc.i4 7340032
 	stloc.2
 	ldloc.0
@@ -5362,12 +5362,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::T_174_100c2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::T_174_100c2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c360: 0x100c360: sw    s2, 752(s3)
+// 0x0100c370: 0x100c370: sw    s2, 752(s3)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -5376,16 +5376,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-L_100c364:
-// 0x0100c364: 0x100c364: addiu v0, zero, 4
+L_100c374:
+// 0x0100c374: 0x100c374: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0100c368: 0x100c368: div   s0, v0
+// 0x0100c378: 0x100c378: div   s0, v0
 	ldloc 9
 	ldloc 5
 	div
 	stloc 11
-// 0x0100c36c: 0x100c36c: lw    v1, 4(s1)
+// 0x0100c37c: 0x100c37c: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5394,43 +5394,43 @@ L_100c364:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c370: 0x100c370: lw    a2, 0(s1)
+// 0x0100c380: 0x100c380: lw    a2, 0(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0100c374: 0x100c374: lui   s1, 0x0
+// 0x0100c384: 0x100c384: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0100c378: 0x100c378: addu  a0, zero, zero
+// 0x0100c388: 0x100c388: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0100c37c: 0x100c37c: addiu a1, sp, 16
+// 0x0100c38c: 0x100c38c: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0100c380: 0x100c380: addiu s1, s1, 752
+// 0x0100c390: 0x100c390: addiu s1, s1, 752
 	ldloc 7
 	ldc.i4 752
 	add
 	stloc 7
-// 0x0100c384: 0x100c384: mflo  lo
+// 0x0100c394: 0x100c394: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0100c388: 0x100c388: addu  v1, v1, v0
+// 0x0100c398: 0x100c398: addu  v1, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0100c38c: 0x100c38c: addu  v0, a2, v0
+// 0x0100c39c: 0x100c39c: addu  v0, a2, v0
 	ldloc.3
 	ldloc 5
 	add
 	stloc 5
-// 0x0100c390: 0x100c390: sw    v1, 20(sp)
+// 0x0100c3a0: 0x100c3a0: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5439,7 +5439,7 @@ L_100c364:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100c394: 0x100c394: jal   0x100c63c sw    v0, 16(sp)
+// 0x0100c3a4: 0x100c3a4: jal   0x100c64c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5453,12 +5453,12 @@ L_100c364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c39c: 0x100c39c: lw    v1, 4(s1)
+// 0x0100c3ac: 0x100c3ac: lw    v1, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5467,18 +5467,18 @@ L_100c364:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c3a0: 0x100c3a0: sll   zero, zero, 0
-// 0x0100c3a4: 0x100c3a4: beq   v0, v1, 0x100c3c4 addu  a0, v0, zero
+// 0x0100c3b0: 0x100c3b0: sll   zero, zero, 0
+// 0x0100c3b4: 0x100c3b4: beq   v0, v1, 0x100c3d4 addu  a0, v0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 5
 	stloc.1
-	beq  L_100c3c4
+	beq  L_100c3d4
 // --- basic block ---
-// 0x0100c3ac: 0x100c3ac: lui   a1, 0x600000
+// 0x0100c3bc: 0x100c3bc: lui   a1, 0x600000
 	ldc.i4 6291456
 	stloc.2
-// 0x0100c3b0: 0x100c3b0: jal   0x100c2c0 sw    v0, 24(sp)
+// 0x0100c3c0: 0x100c3c0: jal   0x100c2d0 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5492,12 +5492,12 @@ L_100c364:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::T_174_100c2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::T_174_100c2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c3b8: 0x100c3b8: lw    v0, 24(sp)
+// 0x0100c3c8: 0x100c3c8: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5506,8 +5506,8 @@ L_100c364:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c3bc: 0x100c3bc: sll   zero, zero, 0
-// 0x0100c3c0: 0x100c3c0: sw    v0, 4(s1)
+// 0x0100c3cc: 0x100c3cc: sll   zero, zero, 0
+// 0x0100c3d0: 0x100c3d0: sw    v0, 4(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5516,16 +5516,16 @@ L_100c364:
 	add
 	ldloc 5
 	stelem.i4
-L_100c3c4:
-// 0x0100c3c4: 0x100c3c4: addiu s1, zero, 2
+L_100c3d4:
+// 0x0100c3d4: 0x100c3d4: addiu s1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0100c3c8: 0x100c3c8: div   s0, s1
+// 0x0100c3d8: 0x100c3d8: div   s0, s1
 	ldloc 9
 	ldloc 7
 	div
 	stloc 11
-// 0x0100c3cc: 0x100c3cc: lw    v0, 16(sp)
+// 0x0100c3dc: 0x100c3dc: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5534,35 +5534,35 @@ L_100c3c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c3d0: 0x100c3d0: lui   s2, 0x0
+// 0x0100c3e0: 0x100c3e0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0100c3d4: 0x100c3d4: addu  a0, zero, zero
+// 0x0100c3e4: 0x100c3e4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0100c3d8: 0x100c3d8: addiu a1, sp, 16
+// 0x0100c3e8: 0x100c3e8: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0100c3dc: 0x100c3dc: addiu s2, s2, 752
+// 0x0100c3ec: 0x100c3ec: addiu s2, s2, 752
 	ldloc 10
 	ldc.i4 752
 	add
 	stloc 10
-// 0x0100c3e0: 0x100c3e0: mflo  lo
+// 0x0100c3f0: 0x100c3f0: mflo  lo
 	ldloc 11
 	stloc 7
-// 0x0100c3e4: 0x100c3e4: subu  s1, zero, s1
+// 0x0100c3f4: 0x100c3f4: subu  s1, zero, s1
 	ldloc 7
 	neg
 	stloc 7
-// 0x0100c3e8: 0x100c3e8: addu  v0, v0, s1
+// 0x0100c3f8: 0x100c3f8: addu  v0, v0, s1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x0100c3ec: 0x100c3ec: jal   0x100c63c sw    v0, 16(sp)
+// 0x0100c3fc: 0x100c3fc: jal   0x100c64c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5576,12 +5576,12 @@ L_100c3c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c3f4: 0x100c3f4: lw    v1, 8(s2)
+// 0x0100c404: 0x100c404: lw    v1, 8(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5590,18 +5590,18 @@ L_100c3c4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c3f8: 0x100c3f8: sll   zero, zero, 0
-// 0x0100c3fc: 0x100c3fc: beq   v0, v1, 0x100c41c addu  a0, v0, zero
+// 0x0100c408: 0x100c408: sll   zero, zero, 0
+// 0x0100c40c: 0x100c40c: beq   v0, v1, 0x100c42c addu  a0, v0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 5
 	stloc.1
-	beq  L_100c41c
+	beq  L_100c42c
 // --- basic block ---
-// 0x0100c404: 0x100c404: lui   a1, 0x600000
+// 0x0100c414: 0x100c414: lui   a1, 0x600000
 	ldc.i4 6291456
 	stloc.2
-// 0x0100c408: 0x100c408: jal   0x100c2c0 sw    v0, 24(sp)
+// 0x0100c418: 0x100c418: jal   0x100c2d0 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5615,12 +5615,12 @@ L_100c3c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::T_174_100c2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::T_174_100c2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c410: 0x100c410: lw    v0, 24(sp)
+// 0x0100c420: 0x100c420: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5629,8 +5629,8 @@ L_100c3c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c414: 0x100c414: sll   zero, zero, 0
-// 0x0100c418: 0x100c418: sw    v0, 8(s2)
+// 0x0100c424: 0x100c424: sll   zero, zero, 0
+// 0x0100c428: 0x100c428: sw    v0, 8(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5639,8 +5639,8 @@ L_100c3c4:
 	add
 	ldloc 5
 	stelem.i4
-L_100c41c:
-// 0x0100c41c: 0x100c41c: lw    v0, 20(sp)
+L_100c42c:
+// 0x0100c42c: 0x100c42c: lw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5649,15 +5649,15 @@ L_100c41c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c420: 0x100c420: addu  a0, zero, zero
+// 0x0100c430: 0x100c430: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0100c424: 0x100c424: addu  s1, v0, s1
+// 0x0100c434: 0x100c434: addu  s1, v0, s1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 7
-// 0x0100c428: 0x100c428: sw    s1, 20(sp)
+// 0x0100c438: 0x100c438: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5666,15 +5666,15 @@ L_100c41c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100c42c: 0x100c42c: lui   s1, 0x0
+// 0x0100c43c: 0x100c43c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0100c430: 0x100c430: addiu a1, sp, 16
+// 0x0100c440: 0x100c440: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0100c434: 0x100c434: jal   0x100c63c addiu s1, s1, 752
+// 0x0100c444: 0x100c444: jal   0x100c64c addiu s1, s1, 752
 	ldloc 7
 	ldc.i4 752
 	add
@@ -5684,12 +5684,12 @@ L_100c41c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c43c: 0x100c43c: lw    v1, 12(s1)
+// 0x0100c44c: 0x100c44c: lw    v1, 12(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5698,18 +5698,18 @@ L_100c41c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c440: 0x100c440: sll   zero, zero, 0
-// 0x0100c444: 0x100c444: beq   v0, v1, 0x100c464 addu  a0, v0, zero
+// 0x0100c450: 0x100c450: sll   zero, zero, 0
+// 0x0100c454: 0x100c454: beq   v0, v1, 0x100c474 addu  a0, v0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 5
 	stloc.1
-	beq  L_100c464
+	beq  L_100c474
 // --- basic block ---
-// 0x0100c44c: 0x100c44c: lui   a1, 0x600000
+// 0x0100c45c: 0x100c45c: lui   a1, 0x600000
 	ldc.i4 6291456
 	stloc.2
-// 0x0100c450: 0x100c450: jal   0x100c2c0 sw    v0, 24(sp)
+// 0x0100c460: 0x100c460: jal   0x100c2d0 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5723,12 +5723,12 @@ L_100c41c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::T_174_100c2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::T_174_100c2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c458: 0x100c458: lw    v0, 24(sp)
+// 0x0100c468: 0x100c468: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5737,8 +5737,8 @@ L_100c41c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c45c: 0x100c45c: sll   zero, zero, 0
-// 0x0100c460: 0x100c460: sw    v0, 12(s1)
+// 0x0100c46c: 0x100c46c: sll   zero, zero, 0
+// 0x0100c470: 0x100c470: sw    v0, 12(s1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5747,16 +5747,16 @@ L_100c41c:
 	add
 	ldloc 5
 	stelem.i4
-L_100c464:
-// 0x0100c464: 0x100c464: addiu v0, zero, 2
+L_100c474:
+// 0x0100c474: 0x100c474: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0100c468: 0x100c468: div   s0, v0
+// 0x0100c478: 0x100c478: div   s0, v0
 	ldloc 9
 	ldloc 5
 	div
 	stloc 11
-// 0x0100c46c: 0x100c46c: lw    s0, 16(sp)
+// 0x0100c47c: 0x100c47c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5765,23 +5765,23 @@ L_100c464:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100c470: 0x100c470: addu  a0, zero, zero
+// 0x0100c480: 0x100c480: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0100c474: 0x100c474: addiu a1, sp, 16
+// 0x0100c484: 0x100c484: addiu a1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.2
-// 0x0100c478: 0x100c478: mflo  lo
+// 0x0100c488: 0x100c488: mflo  lo
 	ldloc 11
 	stloc 5
-// 0x0100c47c: 0x100c47c: addu  s0, s0, v0
+// 0x0100c48c: 0x100c48c: addu  s0, s0, v0
 	ldloc 9
 	ldloc 5
 	add
 	stloc 9
-// 0x0100c480: 0x100c480: sw    s0, 16(sp)
+// 0x0100c490: 0x100c490: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5790,10 +5790,10 @@ L_100c464:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100c484: 0x100c484: lui   s0, 0x0
+// 0x0100c494: 0x100c494: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0100c488: 0x100c488: jal   0x100c63c addiu s0, s0, 752
+// 0x0100c498: 0x100c498: jal   0x100c64c addiu s0, s0, 752
 	ldloc 9
 	ldc.i4 752
 	add
@@ -5803,12 +5803,12 @@ L_100c464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c490: 0x100c490: lw    v1, 16(s0)
+// 0x0100c4a0: 0x100c4a0: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5817,18 +5817,18 @@ L_100c464:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c494: 0x100c494: sll   zero, zero, 0
-// 0x0100c498: 0x100c498: beq   v0, v1, 0x100c4b8 addu  a0, v0, zero
+// 0x0100c4a4: 0x100c4a4: sll   zero, zero, 0
+// 0x0100c4a8: 0x100c4a8: beq   v0, v1, 0x100c4c8 addu  a0, v0, zero
 	ldloc 5
 	ldloc 8
 	ldloc 5
 	stloc.1
-	beq  L_100c4b8
+	beq  L_100c4c8
 // --- basic block ---
-// 0x0100c4a0: 0x100c4a0: lui   a1, 0x600000
+// 0x0100c4b0: 0x100c4b0: lui   a1, 0x600000
 	ldc.i4 6291456
 	stloc.2
-// 0x0100c4a4: 0x100c4a4: jal   0x100c2c0 sw    v0, 24(sp)
+// 0x0100c4b4: 0x100c4b4: jal   0x100c2d0 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5842,12 +5842,12 @@ L_100c464:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::T_174_100c2c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::T_174_100c2d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c4ac: 0x100c4ac: lw    v0, 24(sp)
+// 0x0100c4bc: 0x100c4bc: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5856,8 +5856,8 @@ L_100c464:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c4b0: 0x100c4b0: sll   zero, zero, 0
-// 0x0100c4b4: 0x100c4b4: sw    v0, 16(s0)
+// 0x0100c4c0: 0x100c4c0: sll   zero, zero, 0
+// 0x0100c4c4: 0x100c4c4: sw    v0, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -5866,9 +5866,9 @@ L_100c464:
 	add
 	ldloc 5
 	stelem.i4
-L_100c4b8:
-// 0x0100c4b8: 0x100c4b8: lw    ra, 52(sp)
-// 0x0100c4bc: 0x100c4bc: lw    s3, 48(sp)
+L_100c4c8:
+// 0x0100c4c8: 0x100c4c8: lw    ra, 52(sp)
+// 0x0100c4cc: 0x100c4cc: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5877,7 +5877,7 @@ L_100c4b8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100c4c0: 0x100c4c0: lw    s2, 44(sp)
+// 0x0100c4d0: 0x100c4d0: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5886,7 +5886,7 @@ L_100c4b8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100c4c4: 0x100c4c4: lw    s1, 40(sp)
+// 0x0100c4d4: 0x100c4d4: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5895,7 +5895,7 @@ L_100c4b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c4c8: 0x100c4c8: lw    s0, 36(sp)
+// 0x0100c4d8: 0x100c4d8: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5904,7 +5904,7 @@ L_100c4b8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100c4cc: 0x100c4cc: jr    ra addiu sp, sp, 56
+// 0x0100c4dc: 0x100c4dc: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -5916,7 +5916,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_get_scale_factor_100c4d4(int32)
+.method public static int32 roadmap_tile_get_scale_factor_100c4e4(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32 lo,int32[] mem,int32 ra)
@@ -5942,42 +5942,42 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c4d4: 0x100c4d4: addiu v0, zero, 20
+// 0x0100c4e4: 0x100c4e4: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0100c4d8: 0x100c4d8: mult  a0, v0
+// 0x0100c4e8: 0x100c4e8: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc.3
-// 0x0100c4dc: 0x100c4dc: lui   v1, 0x20000
+// 0x0100c4ec: 0x100c4ec: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0100c4e0: 0x100c4e0: lw    v1, 31256(v1)
+// 0x0100c4f0: 0x100c4f0: lw    v1, 31720(v1)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c4e4: 0x100c4e4: mflo  lo
+// 0x0100c4f4: 0x100c4f4: mflo  lo
 	ldloc.3
 	stloc.1
-// 0x0100c4e8: 0x100c4e8: addu  v0, v1, v0
+// 0x0100c4f8: 0x100c4f8: addu  v0, v1, v0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0100c4ec: 0x100c4ec: lw    v0, 0(v0)
+// 0x0100c4fc: 0x100c4fc: lw    v0, 0(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100c4f0: 0x100c4f0: jr    ra sll   zero, zero, 0
+// 0x0100c500: 0x100c500: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -5985,7 +5985,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_tile_get_scale_shift_100c4f8(int32)
+.method public static int32 roadmap_tile_get_scale_shift_100c508(int32)
 {
 .maxstack 4
 .locals init (int32 a0,int32 v0,int32 ra)
@@ -6002,7 +6002,7 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c4f8: 0x100c4f8: jr    ra sll   v0, a0, 1
+// 0x0100c508: 0x100c508: jr    ra sll   v0, a0, 1
 	ldloc.0
 	ldc.i4.1
 	shl
@@ -6012,7 +6012,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_tile_get_size_100c500(int32)
+.method public static int32 roadmap_tile_get_size_100c510(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32 lo,int32[] mem,int32 ra)
@@ -6038,35 +6038,35 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c500: 0x100c500: addiu v0, zero, 20
+// 0x0100c510: 0x100c510: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc.1
-// 0x0100c504: 0x100c504: mult  a0, v0
+// 0x0100c514: 0x100c514: mult  a0, v0
 	ldloc.0
 	ldloc.1
 	mul
 	stloc.3
-// 0x0100c508: 0x100c508: lui   v1, 0x20000
+// 0x0100c518: 0x100c518: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0100c50c: 0x100c50c: lw    v1, 31256(v1)
+// 0x0100c51c: 0x100c51c: lw    v1, 31720(v1)
 	ldloc 4
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c510: 0x100c510: mflo  lo
+// 0x0100c520: 0x100c520: mflo  lo
 	ldloc.3
 	stloc.1
-// 0x0100c514: 0x100c514: addu  v0, v1, v0
+// 0x0100c524: 0x100c524: addu  v0, v1, v0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x0100c518: 0x100c518: lw    v0, 4(v0)
+// 0x0100c528: 0x100c528: lw    v0, 4(v0)
 	ldloc 4
 	ldloc.1
 	ldc.i4.2
@@ -6075,7 +6075,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c51c: 0x100c51c: jr    ra sll   zero, zero, 0
+// 0x0100c52c: 0x100c52c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -6083,7 +6083,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 roadmap_tile_get_origin_100c524(int32,int32,int32,int32)
+.method public static int32 roadmap_tile_get_origin_100c534(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 lo,int32 v1,int32 t0,int32[] mem,int32 ra)
@@ -6121,47 +6121,47 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c524: 0x100c524: addiu v0, zero, 20
+// 0x0100c534: 0x100c534: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0100c528: 0x100c528: mult  a0, v0
+// 0x0100c538: 0x100c538: mult  a0, v0
 	ldloc.0
 	ldloc 4
 	mul
 	stloc 5
-// 0x0100c52c: 0x100c52c: lui   v1, 0x20000
+// 0x0100c53c: 0x100c53c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100c530: 0x100c530: lw    a0, 31256(v1)
+// 0x0100c540: 0x100c540: lw    a0, 31720(v1)
 	ldloc 8
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc.0
-// 0x0100c534: 0x100c534: lw    t0, 0(a1)
+// 0x0100c544: 0x100c544: lw    t0, 0(a1)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100c538: 0x100c538: lui   v1, 0xaba0000
+// 0x0100c548: 0x100c548: lui   v1, 0xaba0000
 	ldc.i4 179961856
 	stloc 6
-// 0x0100c53c: 0x100c53c: ori   v1, v1, 38144
+// 0x0100c54c: 0x100c54c: ori   v1, v1, 38144
 	ldloc 6
 	ldc.i4 38144
 	or
 	stloc 6
-// 0x0100c540: 0x100c540: addu  t0, t0, v1
+// 0x0100c550: 0x100c550: addu  t0, t0, v1
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0100c544: 0x100c544: lw    a3, 4(a1)
+// 0x0100c554: 0x100c554: lw    a3, 4(a1)
 	ldloc 8
 	ldloc.1
 	ldc.i4.2
@@ -6170,28 +6170,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100c548: 0x100c548: lui   a1, 0x55d0000
+// 0x0100c558: 0x100c558: lui   a1, 0x55d0000
 	ldc.i4 89980928
 	stloc.1
-// 0x0100c54c: 0x100c54c: ori   a1, a1, 19072
+// 0x0100c55c: 0x100c55c: ori   a1, a1, 19072
 	ldloc.1
 	ldc.i4 19072
 	or
 	stloc.1
-// 0x0100c550: 0x100c550: addu  a3, a3, a1
+// 0x0100c560: 0x100c560: addu  a3, a3, a1
 	ldloc.3
 	ldloc.1
 	add
 	stloc.3
-// 0x0100c554: 0x100c554: mflo  lo
+// 0x0100c564: 0x100c564: mflo  lo
 	ldloc 5
 	stloc 4
-// 0x0100c558: 0x100c558: addu  v0, a0, v0
+// 0x0100c568: 0x100c568: addu  v0, a0, v0
 	ldloc.0
 	ldloc 4
 	add
 	stloc 4
-// 0x0100c55c: 0x100c55c: lw    v0, 4(v0)
+// 0x0100c56c: 0x100c56c: lw    v0, 4(v0)
 	ldloc 8
 	ldloc 4
 	ldc.i4.2
@@ -6200,41 +6200,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100c560: 0x100c560: sll   zero, zero, 0
-// 0x0100c564: 0x100c564: div   t0, v0
+// 0x0100c570: 0x100c570: sll   zero, zero, 0
+// 0x0100c574: 0x100c574: div   t0, v0
 	ldloc 7
 	ldloc 4
 	div
 	stloc 5
-// 0x0100c568: 0x100c568: mflo  lo
+// 0x0100c578: 0x100c578: mflo  lo
 	ldloc 5
 	stloc 7
-// 0x0100c56c: 0x100c56c: sll   zero, zero, 0
-// 0x0100c570: 0x100c570: sll   zero, zero, 0
-// 0x0100c574: 0x100c574: div   a3, v0
+// 0x0100c57c: 0x100c57c: sll   zero, zero, 0
+// 0x0100c580: 0x100c580: sll   zero, zero, 0
+// 0x0100c584: 0x100c584: div   a3, v0
 	ldloc.3
 	ldloc 4
 	div
 	stloc 5
-// 0x0100c578: 0x100c578: mflo  lo
+// 0x0100c588: 0x100c588: mflo  lo
 	ldloc 5
 	stloc.3
-// 0x0100c57c: 0x100c57c: sll   zero, zero, 0
-// 0x0100c580: 0x100c580: sll   zero, zero, 0
-// 0x0100c584: 0x100c584: mult  a3, v0
+// 0x0100c58c: 0x100c58c: sll   zero, zero, 0
+// 0x0100c590: 0x100c590: sll   zero, zero, 0
+// 0x0100c594: 0x100c594: mult  a3, v0
 	ldloc.3
 	ldloc 4
 	mul
 	stloc 5
-// 0x0100c588: 0x100c588: mflo  lo
+// 0x0100c598: 0x100c598: mflo  lo
 	ldloc 5
 	stloc.3
-// 0x0100c58c: 0x100c58c: subu  a1, a3, a1
+// 0x0100c59c: 0x100c59c: subu  a1, a3, a1
 	ldloc.3
 	ldloc.1
 	sub
 	stloc.1
-// 0x0100c590: 0x100c590: sw    a1, 4(a2)
+// 0x0100c5a0: 0x100c5a0: sw    a1, 4(a2)
 	ldloc 8
 	ldloc.2
 	ldc.i4.2
@@ -6243,20 +6243,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100c594: 0x100c594: mult  t0, v0
+// 0x0100c5a4: 0x100c5a4: mult  t0, v0
 	ldloc 7
 	ldloc 4
 	mul
 	stloc 5
-// 0x0100c598: 0x100c598: mflo  lo
+// 0x0100c5a8: 0x100c5a8: mflo  lo
 	ldloc 5
 	stloc 7
-// 0x0100c59c: 0x100c59c: subu  v1, t0, v1
+// 0x0100c5ac: 0x100c5ac: subu  v1, t0, v1
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 6
-// 0x0100c5a0: 0x100c5a0: jr    ra sw    v1, 0(a2)
+// 0x0100c5b0: 0x100c5b0: jr    ra sw    v1, 0(a2)
 	ldloc 8
 	ldloc.2
 	ldc.i4.2
@@ -6270,7 +6270,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_tile_get_index_from_position_100c5dc(int32,int32,int32,int32)
+.method public static int32 roadmap_tile_get_index_from_position_100c5ec(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 t0,int32 lo,int32 ra)
@@ -6308,55 +6308,55 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c5dc: 0x100c5dc: addiu v0, zero, 20
+// 0x0100c5ec: 0x100c5ec: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0100c5e0: 0x100c5e0: mult  a0, v0
+// 0x0100c5f0: 0x100c5f0: mult  a0, v0
 	ldloc.0
 	ldloc 4
 	mul
 	stloc 8
-// 0x0100c5e4: 0x100c5e4: lui   v1, 0x20000
+// 0x0100c5f4: 0x100c5f4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100c5e8: 0x100c5e8: lw    v1, 31256(v1)
+// 0x0100c5f8: 0x100c5f8: lw    v1, 31720(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c5ec: 0x100c5ec: lw    a0, 0(a1)
+// 0x0100c5fc: 0x100c5fc: lw    a0, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.0
-// 0x0100c5f0: 0x100c5f0: lui   t0, 0xaba0000
+// 0x0100c600: 0x100c600: lui   t0, 0xaba0000
 	ldc.i4 179961856
 	stloc 7
-// 0x0100c5f4: 0x100c5f4: ori   t0, t0, 38144
+// 0x0100c604: 0x100c604: ori   t0, t0, 38144
 	ldloc 7
 	ldc.i4 38144
 	or
 	stloc 7
-// 0x0100c5f8: 0x100c5f8: addu  t0, a0, t0
+// 0x0100c608: 0x100c608: addu  t0, a0, t0
 	ldloc.0
 	ldloc 7
 	add
 	stloc 7
-// 0x0100c5fc: 0x100c5fc: mflo  lo
+// 0x0100c60c: 0x100c60c: mflo  lo
 	ldloc 8
 	stloc 4
-// 0x0100c600: 0x100c600: addu  v0, v1, v0
+// 0x0100c610: 0x100c610: addu  v0, v1, v0
 	ldloc 5
 	ldloc 4
 	add
 	stloc 4
-// 0x0100c604: 0x100c604: lw    a0, 4(v0)
+// 0x0100c614: 0x100c614: lw    a0, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -6365,23 +6365,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0100c608: 0x100c608: sll   zero, zero, 0
-// 0x0100c60c: 0x100c60c: div   t0, a0
+// 0x0100c618: 0x100c618: sll   zero, zero, 0
+// 0x0100c61c: 0x100c61c: div   t0, a0
 	ldloc 7
 	ldloc.0
 	div
 	stloc 8
-// 0x0100c610: 0x100c610: mflo  lo
+// 0x0100c620: 0x100c620: mflo  lo
 	ldloc 8
 	stloc.0
-// 0x0100c614: 0x100c614: sw    a0, 0(a2)
+// 0x0100c624: 0x100c624: sw    a0, 0(a2)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc.0
 	stelem.i4
-// 0x0100c618: 0x100c618: lw    v1, 4(v0)
+// 0x0100c628: 0x100c628: lw    v1, 4(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -6390,7 +6390,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c61c: 0x100c61c: lw    a0, 4(a1)
+// 0x0100c62c: 0x100c62c: lw    a0, 4(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -6399,28 +6399,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.0
-// 0x0100c620: 0x100c620: lui   v0, 0x55d0000
+// 0x0100c630: 0x100c630: lui   v0, 0x55d0000
 	ldc.i4 89980928
 	stloc 4
-// 0x0100c624: 0x100c624: ori   v0, v0, 19072
+// 0x0100c634: 0x100c634: ori   v0, v0, 19072
 	ldloc 4
 	ldc.i4 19072
 	or
 	stloc 4
-// 0x0100c628: 0x100c628: addu  v0, a0, v0
+// 0x0100c638: 0x100c638: addu  v0, a0, v0
 	ldloc.0
 	ldloc 4
 	add
 	stloc 4
-// 0x0100c62c: 0x100c62c: div   v0, v1
+// 0x0100c63c: 0x100c63c: div   v0, v1
 	ldloc 4
 	ldloc 5
 	div
 	stloc 8
-// 0x0100c630: 0x100c630: mflo  lo
+// 0x0100c640: 0x100c640: mflo  lo
 	ldloc 8
 	stloc 5
-// 0x0100c634: 0x100c634: jr    ra sw    v1, 0(a3)
+// 0x0100c644: 0x100c644: jr    ra sw    v1, 0(a3)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -6434,7 +6434,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 roadmap_tile_get_id_from_position_100c63c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_get_id_from_position_100c64c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 lo,int32 ra)
@@ -6475,23 +6475,23 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c63c: 0x100c63c: addiu sp, sp, -32
+// 0x0100c64c: 0x100c64c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100c640: 0x100c640: addiu a2, sp, 16
+// 0x0100c650: 0x100c650: addiu a2, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.3
-// 0x0100c644: 0x100c644: addiu a3, sp, 20
+// 0x0100c654: 0x100c654: addiu a3, sp, 20
 	ldloc.0
 	ldc.i4.s 20
 	add
 	stloc 4
-// 0x0100c648: 0x100c648: sw    ra, 28(sp)
-// 0x0100c64c: 0x100c64c: sw    s0, 24(sp)
+// 0x0100c658: 0x100c658: sw    ra, 28(sp)
+// 0x0100c65c: 0x100c65c: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6500,48 +6500,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100c650: 0x100c650: jal   0x100c5dc addu  s0, a0, zero
+// 0x0100c660: 0x100c660: jal   0x100c5ec addu  s0, a0, zero
 	ldloc.1
 	stloc 6
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_index_from_position_100c5dc(int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_index_from_position_100c5ec(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100c658: 0x100c658: addiu v0, zero, 20
+// 0x0100c668: 0x100c668: addiu v0, zero, 20
 	ldc.i4.s 20
 	stloc 5
-// 0x0100c65c: 0x100c65c: mult  s0, v0
+// 0x0100c66c: 0x100c66c: mult  s0, v0
 	ldloc 6
 	ldloc 5
 	mul
 	stloc 9
-// 0x0100c660: 0x100c660: lui   v0, 0x20000
+// 0x0100c670: 0x100c670: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100c664: 0x100c664: lw    v0, 31256(v0)
+// 0x0100c674: 0x100c674: lw    v0, 31720(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c668: 0x100c668: lw    ra, 28(sp)
-// 0x0100c66c: 0x100c66c: mflo  lo
+// 0x0100c678: 0x100c678: lw    ra, 28(sp)
+// 0x0100c67c: 0x100c67c: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0100c670: 0x100c670: addu  s0, v0, s0
+// 0x0100c680: 0x100c680: addu  s0, v0, s0
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x0100c674: 0x100c674: lw    a0, 12(s0)
+// 0x0100c684: 0x100c684: lw    a0, 12(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6550,7 +6550,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c678: 0x100c678: lw    v0, 16(sp)
+// 0x0100c688: 0x100c688: lw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6559,7 +6559,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c67c: 0x100c67c: lw    v1, 8(s0)
+// 0x0100c68c: 0x100c68c: lw    v1, 8(s0)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6568,12 +6568,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c680: 0x100c680: mult  a0, v0
+// 0x0100c690: 0x100c690: mult  a0, v0
 	ldloc.1
 	ldloc 5
 	mul
 	stloc 9
-// 0x0100c684: 0x100c684: lw    v0, 20(sp)
+// 0x0100c694: 0x100c694: lw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6582,7 +6582,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c688: 0x100c688: lw    s0, 24(sp)
+// 0x0100c698: 0x100c698: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6591,20 +6591,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c68c: 0x100c68c: addu  v1, v1, v0
+// 0x0100c69c: 0x100c69c: addu  v1, v1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc 8
-// 0x0100c690: 0x100c690: addiu sp, sp, 32
+// 0x0100c6a0: 0x100c6a0: addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
-// 0x0100c694: 0x100c694: mflo  lo
+// 0x0100c6a4: 0x100c6a4: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0100c698: 0x100c698: jr    ra addu  v0, v1, a0
+// 0x0100c6a8: 0x100c6a8: jr    ra addu  v0, v1, a0
 	ldloc 8
 	ldloc.1
 	add
@@ -6616,7 +6616,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_get_max_scale_100c730(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_get_max_scale_100c740(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 t3,int32 s0,int32 s1,int32 t0,int32 ra,int32 t1,int32 t2)
@@ -6672,12 +6672,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c730: 0x100c730: addiu sp, sp, -32
+// 0x0100c740: 0x100c740: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100c734: 0x100c734: sw    s1, 24(sp)
+// 0x0100c744: 0x100c744: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6686,20 +6686,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100c738: 0x100c738: lui   s1, 0x20000
+// 0x0100c748: 0x100c748: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x0100c73c: 0x100c73c: lw    v0, 31256(s1)
+// 0x0100c74c: 0x100c74c: lw    v0, 31720(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c740: 0x100c740: sw    ra, 28(sp)
-// 0x0100c744: 0x100c744: bne   v0, zero, 0x100c7e4 sw    s0, 20(sp)
+// 0x0100c750: 0x100c750: sw    ra, 28(sp)
+// 0x0100c754: 0x100c754: bne   v0, zero, 0x100c7f4 sw    s0, 20(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -6709,18 +6709,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	brtrue L_100c7e4
+	brtrue L_100c7f4
 // --- basic block ---
-// 0x0100c74c: 0x100c74c: lui   s0, 0x0
+// 0x0100c75c: 0x100c75c: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0100c750: 0x100c750: addiu a0, zero, 120
+// 0x0100c760: 0x100c760: addiu a0, zero, 120
 	ldc.i4.s 120
 	stloc.1
-// 0x0100c754: 0x100c754: addiu v0, zero, 5
+// 0x0100c764: 0x100c764: addiu v0, zero, 5
 	ldc.i4.5
 	stloc 5
-// 0x0100c758: 0x100c758: jal   0x1000910 sw    v0, 772(s0)
+// 0x0100c768: 0x100c768: jal   0x1000910 sw    v0, 772(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6739,22 +6739,22 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100c760: 0x100c760: lui   t0, 0xaba0000
+// 0x0100c770: 0x100c770: lui   t0, 0xaba0000
 	ldc.i4 179961856
 	stloc 12
-// 0x0100c764: 0x100c764: lui   a3, 0x15750000
+// 0x0100c774: 0x100c774: lui   a3, 0x15750000
 	ldc.i4 359989248
 	stloc 4
-// 0x0100c768: 0x100c768: sw    v0, 31256(s1)
+// 0x0100c778: 0x100c778: sw    v0, 31720(s1)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100c76c: 0x100c76c: lw    t2, 772(s0)
+// 0x0100c77c: 0x100c77c: lw    t2, 772(s0)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -6763,39 +6763,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100c770: 0x100c770: ori   t0, t0, 38143
+// 0x0100c780: 0x100c780: ori   t0, t0, 38143
 	ldloc 12
 	ldc.i4 38143
 	or
 	stloc 12
-// 0x0100c774: 0x100c774: ori   a3, a3, 10751
+// 0x0100c784: 0x100c784: ori   a3, a3, 10751
 	ldloc 4
 	ldc.i4 10751
 	or
 	stloc 4
-// 0x0100c778: 0x100c778: addu  a2, zero, zero
+// 0x0100c788: 0x100c788: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0100c77c: 0x100c77c: addiu a0, zero, 1
+// 0x0100c78c: 0x100c78c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100c780: 0x100c780: addu  a1, zero, zero
+// 0x0100c790: 0x100c790: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0100c784: 0x100c784: j	 0x100c7d8 addiu t1, zero, 10000
+// 0x0100c794: 0x100c794: j	 0x100c7e8 addiu t1, zero, 10000
 	ldc.i4 10000
 	stloc 14
-	br L_100c7d8
+	br L_100c7e8
 // --- basic block ---
-L_100c78c:
-// 0x0100c78c: 0x100c78c: sw    a0, 0(v0)
+L_100c79c:
+// 0x0100c79c: 0x100c79c: sw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x0100c790: 0x100c790: sw    a2, 8(v0)
+// 0x0100c7a0: 0x100c7a0: sw    a2, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6804,20 +6804,20 @@ L_100c78c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0100c794: 0x100c794: sll   a0, a0, 2
+// 0x0100c7a4: 0x100c7a4: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0100c798: 0x100c798: addiu a1, a1, 1
+// 0x0100c7a8: 0x100c7a8: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0100c79c: 0x100c79c: mflo  lo
+// 0x0100c7ac: 0x100c7ac: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0100c7a0: 0x100c7a0: sw    v1, 4(v0)
+// 0x0100c7b0: 0x100c7b0: sw    v1, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6826,21 +6826,21 @@ L_100c78c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100c7a4: 0x100c7a4: sll   zero, zero, 0
-// 0x0100c7a8: 0x100c7a8: div   a3, v1
+// 0x0100c7b4: 0x100c7b4: sll   zero, zero, 0
+// 0x0100c7b8: 0x100c7b8: div   a3, v1
 	ldloc 4
 	ldloc 7
 	div
 	stloc 8
-// 0x0100c7ac: 0x100c7ac: mflo  lo
+// 0x0100c7bc: 0x100c7bc: mflo  lo
 	ldloc 8
 	stloc 9
-// 0x0100c7b0: 0x100c7b0: addiu t3, t3, 1
+// 0x0100c7c0: 0x100c7c0: addiu t3, t3, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x0100c7b4: 0x100c7b4: sw    t3, 16(v0)
+// 0x0100c7c4: 0x100c7c4: sw    t3, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6849,20 +6849,20 @@ L_100c78c:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100c7b8: 0x100c7b8: div   t0, v1
+// 0x0100c7c8: 0x100c7c8: div   t0, v1
 	ldloc 12
 	ldloc 7
 	div
 	stloc 8
-// 0x0100c7bc: 0x100c7bc: mflo  lo
+// 0x0100c7cc: 0x100c7cc: mflo  lo
 	ldloc 8
 	stloc 7
-// 0x0100c7c0: 0x100c7c0: addiu v1, v1, 1
+// 0x0100c7d0: 0x100c7d0: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0100c7c4: 0x100c7c4: sw    v1, 12(v0)
+// 0x0100c7d4: 0x100c7d4: sw    v1, 12(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6871,44 +6871,44 @@ L_100c78c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100c7c8: 0x100c7c8: mult  t3, v1
+// 0x0100c7d8: 0x100c7d8: mult  t3, v1
 	ldloc 9
 	ldloc 7
 	mul
 	stloc 8
-// 0x0100c7cc: 0x100c7cc: addiu v0, v0, 20
+// 0x0100c7dc: 0x100c7dc: addiu v0, v0, 20
 	ldloc 5
 	ldc.i4.s 20
 	add
 	stloc 5
-// 0x0100c7d0: 0x100c7d0: mflo  lo
+// 0x0100c7e0: 0x100c7e0: mflo  lo
 	ldloc 8
 	stloc 9
-// 0x0100c7d4: 0x100c7d4: addu  a2, a2, t3
+// 0x0100c7e4: 0x100c7e4: addu  a2, a2, t3
 	ldloc.3
 	ldloc 9
 	add
 	stloc.3
-L_100c7d8:
-// 0x0100c7d8: 0x100c7d8: slt   v1, t2, a1
+L_100c7e8:
+// 0x0100c7e8: 0x100c7e8: slt   v1, t2, a1
 	ldloc 15
 	ldloc.2
 	clt
 	stloc 7
-// 0x0100c7dc: 0x100c7dc: beq   v1, zero, 0x100c78c mult  a0, t1
+// 0x0100c7ec: 0x100c7ec: beq   v1, zero, 0x100c79c mult  a0, t1
 	ldloc 7
 	ldloc.1
 	ldloc 14
 	mul
 	stloc 8
-	brfalse L_100c78c
+	brfalse L_100c79c
 // --- basic block ---
-L_100c7e4:
-// 0x0100c7e4: 0x100c7e4: lw    ra, 28(sp)
-// 0x0100c7e8: 0x100c7e8: lui   v0, 0x0
+L_100c7f4:
+// 0x0100c7f4: 0x100c7f4: lw    ra, 28(sp)
+// 0x0100c7f8: 0x100c7f8: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100c7ec: 0x100c7ec: lw    v0, 772(v0)
+// 0x0100c7fc: 0x100c7fc: lw    v0, 772(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -6917,7 +6917,7 @@ L_100c7e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c7f0: 0x100c7f0: lw    s1, 24(sp)
+// 0x0100c800: 0x100c800: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6926,7 +6926,7 @@ L_100c7e4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100c7f4: 0x100c7f4: lw    s0, 20(sp)
+// 0x0100c804: 0x100c804: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6935,7 +6935,7 @@ L_100c7e4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100c7f8: 0x100c7f8: jr    ra addiu sp, sp, 32
+// 0x0100c808: 0x100c808: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6947,7 +6947,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_get_scale_100c800(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_get_scale_100c810(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -6982,12 +6982,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c800: 0x100c800: addiu sp, sp, -32
+// 0x0100c810: 0x100c810: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100c804: 0x100c804: sw    a0, 16(sp)
+// 0x0100c814: 0x100c814: sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6996,31 +6996,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100c808: 0x100c808: sw    ra, 28(sp)
-// 0x0100c80c: 0x100c80c: jal   0x100c730 sll   zero, zero, 0
+// 0x0100c818: 0x100c818: sw    ra, 28(sp)
+// 0x0100c81c: 0x100c81c: jal   0x100c740 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_max_scale_100c730(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_max_scale_100c740(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x0100c814: 0x100c814: lui   v1, 0x20000
+// 0x0100c824: 0x100c824: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100c818: 0x100c818: lw    a1, 31256(v1)
+// 0x0100c828: 0x100c828: lw    a1, 31720(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c81c: 0x100c81c: lw    a0, 16(sp)
+// 0x0100c82c: 0x100c82c: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7029,13 +7029,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c820: 0x100c820: j	 0x100c840 addiu v1, zero, 1
+// 0x0100c830: 0x100c830: j	 0x100c850 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_100c840
+	br L_100c850
 // --- basic block ---
-L_100c828:
-// 0x0100c828: 0x100c828: lw    a2, 28(a1)
+L_100c838:
+// 0x0100c838: 0x100c838: lw    a2, 28(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -7044,43 +7044,43 @@ L_100c828:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100c82c: 0x100c82c: sll   zero, zero, 0
-// 0x0100c830: 0x100c830: slt   a2, a0, a2
+// 0x0100c83c: 0x100c83c: sll   zero, zero, 0
+// 0x0100c840: 0x100c840: slt   a2, a0, a2
 	ldloc.1
 	ldloc.3
 	clt
 	stloc.3
-// 0x0100c834: 0x100c834: bne   a2, zero, 0x100c84c addiu a1, a1, 20
+// 0x0100c844: 0x100c844: bne   a2, zero, 0x100c85c addiu a1, a1, 20
 	ldloc.3
 	ldloc.2
 	ldc.i4.s 20
 	add
 	stloc.2
-	brtrue L_100c84c
+	brtrue L_100c85c
 // --- basic block ---
-// 0x0100c83c: 0x100c83c: addiu v1, v1, 1
+// 0x0100c84c: 0x100c84c: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_100c840:
-// 0x0100c840: 0x100c840: slt   a2, v0, v1
+L_100c850:
+// 0x0100c850: 0x100c850: slt   a2, v0, v1
 	ldloc 7
 	ldloc 5
 	clt
 	stloc.3
-// 0x0100c844: 0x100c844: beq   a2, zero, 0x100c828 sll   zero, zero, 0
+// 0x0100c854: 0x100c854: beq   a2, zero, 0x100c838 sll   zero, zero, 0
 	ldloc.3
-	brfalse L_100c828
+	brfalse L_100c838
 // --- basic block ---
-L_100c84c:
-// 0x0100c84c: 0x100c84c: lw    ra, 28(sp)
-// 0x0100c850: 0x100c850: addiu v0, v1, -1
+L_100c85c:
+// 0x0100c85c: 0x100c85c: lw    ra, 28(sp)
+// 0x0100c860: 0x100c860: addiu v0, v1, -1
 	ldloc 5
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0100c854: 0x100c854: jr    ra addiu sp, sp, 32
+// 0x0100c864: 0x100c864: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl80.j b/converted/Cibyl80.j
index bfbb7bf..5b6353b 100644
--- a/converted/Cibyl80.j
+++ b/converted/Cibyl80.j
@@ -41,25 +41,26 @@
     IL_0006:  ret
   } // end of method Cibyl80::.ctor
 
-.method public static int32 Realtime_SelectRoute_106b618(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SetIsNewbie_106b600(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  5 is register s0
 // local  0 is register sp
 // local  7 is register ra
 // local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -68,6 +69,8 @@
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
@@ -76,116 +79,59 @@
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b618: 0x106b618: addu  v0, a0, zero
-	ldloc.1
-	stloc 5
-// 0x0106b61c: 0x106b61c: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106b620: 0x106b620: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106b624: 0x106b624: addiu sp, sp, -32
+// 0x0106b600: 0x106b600: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106b628: 0x106b628: addu  a2, a1, zero
-	ldloc.2
-	stloc.3
-// 0x0106b62c: 0x106b62c: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x0106b604: 0x106b604: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.1
-// 0x0106b630: 0x106b630: addu  a1, v0, zero
 	ldloc 5
-	stloc.2
-// 0x0106b634: 0x106b634: sw    ra, 28(sp)
-// 0x0106b638: 0x106b638: jal   0x1072eac addiu a3, a3, -3248
-	ldloc 4
-	ldc.i4 -3248
-	add
-	stloc 4
+	stelem.i4
+// 0x0106b608: 0x106b608: sw    ra, 20(sp)
+// 0x0106b60c: 0x106b60c: jal   0x106b59c addu  s0, a0, zero
+	ldloc.1
+	stloc 5
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_SelectRoute_1072eac(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetIsNewbieConfig_106b59c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 8
-	stloc 5
 // --- basic block ---
-// 0x0106b640: 0x106b640: beq   v0, zero, 0x106b660 lui   a1, 0x10000
+// 0x0106b614: 0x106b614: bne   s0, zero, 0x106b628 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_106b660
+	brtrue L_106b628
 // --- basic block ---
-// 0x0106b648: 0x106b648: lui   a3, 0x10000
+// 0x0106b61c: 0x106b61c: lui   a0, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x0106b64c: 0x106b64c: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b650: 0x106b650: addiu a3, a3, 21380
-	ldloc 4
-	ldc.i4 21380
-	add
-	stloc 4
-// 0x0106b654: 0x106b654: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106b658: 0x106b658: j	 0x106b674 addiu a2, zero, 4119
-	ldc.i4 4119
-	stloc.3
-	br L_106b674
-// --- basic block ---
-L_106b660:
-// 0x0106b660: 0x106b660: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b664: 0x106b664: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b668: 0x106b668: addiu a3, a3, 21404
-	ldloc 4
-	ldc.i4 21404
+// 0x0106b620: 0x106b620: jal   0x1034af8 addiu a0, a0, -14160
+	ldloc.1
+	ldc.i4 -14160
 	add
-	stloc 4
-// 0x0106b66c: 0x106b66c: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0106b670: 0x106b670: addiu a2, zero, 4121
-	ldc.i4 4121
-	stloc.3
-L_106b674:
-// 0x0106b674: 0x106b674: jal   0x100449c sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_set_1034af8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 8
-	stloc 5
 // --- basic block ---
-// 0x0106b67c: 0x106b67c: lw    ra, 28(sp)
-// 0x0106b680: 0x106b680: lw    v0, 16(sp)
+L_106b628:
+// 0x0106b628: 0x106b628: lw    ra, 20(sp)
+// 0x0106b62c: 0x106b62c: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -194,37 +140,37 @@ L_106b674:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106b684: 0x106b684: jr    ra addiu sp, sp, 32
+// 0x0106b630: 0x106b630: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 Realtime_GetGeoConfig_106b68c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_set_random_user_106b638(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
+// local  5 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -236,79 +182,212 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b68c: 0x106b68c: addu  v0, a0, zero
+// 0x0106b638: 0x106b638: addu  a1, a0, zero
+	ldloc.1
+	stloc.2
+// 0x0106b63c: 0x106b63c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b640: 0x106b640: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106b644: 0x106b644: sw    ra, 20(sp)
+// 0x0106b648: 0x106b648: jal   0x100e620 addiu a0, a0, 15072
+	ldloc.1
+	ldc.i4 15072
+	add
+	stloc.1
+	ldloc.0
 	ldloc.1
-	stloc 5
-// 0x0106b690: 0x106b690: addu  a3, a1, zero
 	ldloc.2
-	stloc 4
-// 0x0106b694: 0x106b694: lui   a0, 0x70000
-	ldc.i4 458752
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106b650: 0x106b650: jal   0x100ea60 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0106b698: 0x106b698: addu  a1, a2, zero
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	stloc.2
-// 0x0106b69c: 0x106b69c: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0106b6a0: 0x106b6a0: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106b6a4: 0x106b6a4: addiu sp, sp, -32
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106b658: 0x106b658: lw    ra, 20(sp)
+// 0x0106b65c: 0x106b65c: sll   zero, zero, 0
+// 0x0106b660: 0x106b660: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s 24
 	add
 	stloc.0
-// 0x0106b6a8: 0x106b6a8: addiu v0, v0, -9752
-	ldloc 5
-	ldc.i4 -9752
-	add
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 Realtime_IsNewbie_106b668(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
-// 0x0106b6ac: 0x106b6ac: addiu a0, a0, 17728
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b668: 0x106b668: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b66c: 0x106b66c: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106b670: 0x106b670: sw    ra, 20(sp)
+// 0x0106b674: 0x106b674: jal   0x100e798 addiu a0, a0, 14996
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 14996
 	add
 	stloc.1
-// 0x0106b6b0: 0x106b6b0: sw    ra, 28(sp)
-// 0x0106b6b4: 0x106b6b4: jal   0x1072b04 sw    v0, 16(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x0106b67c: 0x106b67c: lw    ra, 20(sp)
+// 0x0106b680: 0x106b680: sll   zero, zero, 0
+// 0x0106b684: 0x106b684: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
+	ret
+}
+.method public static int32 Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b68c: 0x106b68c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b690: 0x106b690: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
+	stloc.0
+// 0x0106b694: 0x106b694: sw    ra, 20(sp)
+// 0x0106b698: 0x106b698: jal   0x100e798 addiu a0, a0, 15072
+	ldloc.1
+	ldc.i4 15072
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_GetGeoConfig_1072b04(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 5
+	stloc 7
 // --- basic block ---
-// 0x0106b6bc: 0x106b6bc: lw    ra, 28(sp)
-// 0x0106b6c0: 0x106b6c0: sll   zero, zero, 0
-// 0x0106b6c4: 0x106b6c4: jr    ra addiu sp, sp, 32
+// 0x0106b6a0: 0x106b6a0: lw    ra, 20(sp)
+// 0x0106b6a4: 0x106b6a4: sll   zero, zero, 0
+// 0x0106b6a8: 0x106b6a8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 7
 	ret
 }
-.method public static int32 Realtime_RequestRoute_106b6cc(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_RandomUserMsg_106b6b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -343,30 +422,38 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b6cc: 0x106b6cc: addiu sp, sp, -136
+// 0x0106b6b0: 0x106b6b0: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4 -136
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106b6d0: 0x106b6d0: lw    v0, 152(sp)
-	ldloc 6
+// 0x0106b6b4: 0x106b6b4: sw    ra, 36(sp)
+// 0x0106b6b8: 0x106b6b8: jal   0x106b68c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 38
-	add
-	ldelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0106b6d4: 0x106b6d4: sw    a3, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+// --- basic block ---
+// 0x0106b6c0: 0x106b6c0: beq   v0, zero, 0x106b710 addu  v1, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 7
+	brfalse L_106b710
+// --- basic block ---
+// 0x0106b6c8: 0x106b6c8: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x0106b6cc: 0x106b6cc: addiu v0, v0, 21008
+	ldloc 5
+	ldc.i4 21008
 	add
-	ldloc 4
-	stelem.i4
-// 0x0106b6d8: 0x106b6d8: sw    v0, 20(sp)
+	stloc 5
+// 0x0106b6d0: 0x106b6d0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -375,19 +462,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106b6dc: 0x106b6dc: lw    v0, 156(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 39
+// 0x0106b6d4: 0x106b6d4: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x0106b6d8: 0x106b6d8: addiu v0, v0, 21020
+	ldloc 5
+	ldc.i4 21020
 	add
-	ldelem.i4
 	stloc 5
-// 0x0106b6e0: 0x106b6e0: addu  a3, a2, zero
-	ldloc.3
+// 0x0106b6dc: 0x106b6dc: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106b6e0: 0x106b6e0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106b6e4: 0x106b6e4: lui   a3, 0x1070000
+	ldc.i4 17235968
 	stloc 4
-// 0x0106b6e4: 0x106b6e4: sw    v0, 24(sp)
+// 0x0106b6e8: 0x106b6e8: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -396,19 +488,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106b6e8: 0x106b6e8: lw    v0, 160(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 40
+// 0x0106b6ec: 0x106b6ec: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	ldelem.i4
+	stloc.1
+// 0x0106b6f0: 0x106b6f0: addiu v0, zero, 8
+	ldc.i4.8
 	stloc 5
-// 0x0106b6ec: 0x106b6ec: addu  v1, a0, zero
-	ldloc.1
-	stloc 7
-// 0x0106b6f0: 0x106b6f0: sw    v0, 28(sp)
+// 0x0106b6f4: 0x106b6f4: addiu a1, a1, 20928
+	ldloc.2
+	ldc.i4 20928
+	add
+	stloc.2
+// 0x0106b6f8: 0x106b6f8: addiu a3, a3, -20116
+	ldloc 4
+	ldc.i4 -20116
+	add
+	stloc 4
+// 0x0106b6fc: 0x106b6fc: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0106b700: 0x106b700: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -417,552 +518,342 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106b6f4: 0x106b6f4: lw    v0, 164(sp)
+// 0x0106b704: 0x106b704: jal   0x104c1c8 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4.4
 	add
-	ldelem.i4
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::ssd_confirm_dialog_custom_timeout_104c1c8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0106b6f8: 0x106b6f8: lw    a0, 188(sp)
-	ldloc 6
+// --- basic block ---
+// 0x0106b70c: 0x106b70c: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+L_106b710:
+// 0x0106b710: 0x106b710: lw    ra, 36(sp)
+// 0x0106b714: 0x106b714: addu  v0, v1, zero
+	ldloc 7
+	stloc 5
+// 0x0106b718: 0x106b718: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 47
+	ldc.i4.s 40
 	add
-	ldelem.i4
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RecommentToFriend_106b720(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_106b720:
+// 0x0106b720: 0x106b720: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0106b6fc: 0x106b6fc: sw    v0, 32(sp)
-	ldloc 6
+// 0x0106b724: 0x106b724: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106b728: 0x106b728: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106b72c: 0x106b72c: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4.s -32
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106b700: 0x106b700: lw    v0, 168(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 42
+	stloc.0
+// 0x0106b730: 0x106b730: addiu a0, a0, -18172
+	ldloc.1
+	ldc.i4 -18172
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106b704: 0x106b704: sw    ra, 132(sp)
-// 0x0106b708: 0x106b708: sw    v0, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	stloc.1
+// 0x0106b734: 0x106b734: addiu a1, a1, 21028
+	ldloc.2
+	ldc.i4 21028
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106b70c: 0x106b70c: lw    v0, 172(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 43
+	stloc.2
+// 0x0106b738: 0x106b738: addiu a3, a3, -18492
+	ldloc 4
+	ldc.i4 -18492
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106b710: 0x106b710: sw    a0, 56(sp)
+	stloc 4
+// 0x0106b73c: 0x106b73c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0106b740: 0x106b740: sw    ra, 28(sp)
+// 0x0106b744: 0x106b744: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.4
 	add
-	ldloc.1
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106b714: 0x106b714: sw    v0, 40(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x0106b74c: 0x106b74c: lw    ra, 28(sp)
+// 0x0106b750: 0x106b750: sll   zero, zero, 0
+// 0x0106b754: 0x106b754: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106b718: 0x106b718: lw    v0, 176(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 UpgradeVersion_106b75c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b75c: 0x106b75c: lui   v0, 0xf0000
+	ldc.i4 983040
+	stloc 5
+// 0x0106b760: 0x106b760: lw    v0, -29592(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 44
+	ldc.i4 -7398
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106b71c: 0x106b71c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106b720: 0x106b720: sw    v0, 44(sp)
-	ldloc 6
+// 0x0106b764: 0x106b764: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	ldc.i4.s -32
 	add
+	stloc.0
+// 0x0106b768: 0x106b768: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
+	add
+	stloc 5
+// 0x0106b76c: 0x106b76c: sltiu v0, v0, 3
+	ldloc 5
+	ldc.i4.3
+	clt.un
+	stloc 5
+// 0x0106b770: 0x106b770: sw    ra, 28(sp)
+// 0x0106b774: 0x106b774: beq   v0, zero, 0x106b7b4 sw    s0, 24(sp)
 	ldloc 5
-	stelem.i4
-// 0x0106b724: 0x106b724: lw    v0, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 45
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106b728: 0x106b728: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106b72c: 0x106b72c: sw    v0, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b730: 0x106b730: lw    v0, 184(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 46
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b734: 0x106b734: sll   zero, zero, 0
-// 0x0106b738: 0x106b738: sw    v0, 52(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b73c: 0x106b73c: addu  v0, a1, zero
-	ldloc.2
-	stloc 5
-// 0x0106b740: 0x106b740: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0106b744: 0x106b744: lw    v0, 192(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 48
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b748: 0x106b748: addu  a1, v1, zero
 	ldloc 7
-	stloc.2
-// 0x0106b74c: 0x106b74c: sw    v0, 60(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
-	add
-	ldloc 5
 	stelem.i4
-// 0x0106b750: 0x106b750: lw    v0, 196(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 49
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b754: 0x106b754: sll   zero, zero, 0
-// 0x0106b758: 0x106b758: sw    v0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b75c: 0x106b75c: lw    v0, 200(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 50
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b760: 0x106b760: sll   zero, zero, 0
-// 0x0106b764: 0x106b764: sw    v0, 68(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b768: 0x106b768: lw    v0, 204(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 51
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b76c: 0x106b76c: sll   zero, zero, 0
-// 0x0106b770: 0x106b770: sw    v0, 72(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b774: 0x106b774: lw    v0, 208(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 52
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b778: 0x106b778: sll   zero, zero, 0
-// 0x0106b77c: 0x106b77c: sw    v0, 76(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b780: 0x106b780: lw    v0, 212(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 53
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b784: 0x106b784: sll   zero, zero, 0
-// 0x0106b788: 0x106b788: sw    v0, 80(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b78c: 0x106b78c: lw    v0, 216(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 54
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b790: 0x106b790: sll   zero, zero, 0
-// 0x0106b794: 0x106b794: sw    v0, 84(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b798: 0x106b798: lw    v0, 220(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 55
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b79c: 0x106b79c: sll   zero, zero, 0
-// 0x0106b7a0: 0x106b7a0: sw    v0, 88(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b7a4: 0x106b7a4: lw    v0, 224(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 56
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b7a8: 0x106b7a8: sll   zero, zero, 0
-// 0x0106b7ac: 0x106b7ac: sw    v0, 92(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b7b0: 0x106b7b0: lw    v0, 228(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 57
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b7b4: 0x106b7b4: sll   zero, zero, 0
-// 0x0106b7b8: 0x106b7b8: sw    v0, 96(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b7bc: 0x106b7bc: lw    v0, 232(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 58
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b7c0: 0x106b7c0: sll   zero, zero, 0
-// 0x0106b7c4: 0x106b7c4: sw    v0, 100(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b7c8: 0x106b7c8: lw    v0, 236(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 59
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b7cc: 0x106b7cc: sll   zero, zero, 0
-// 0x0106b7d0: 0x106b7d0: sw    v0, 104(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b7d4: 0x106b7d4: lw    v0, 240(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 60
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b7d8: 0x106b7d8: sll   zero, zero, 0
-// 0x0106b7dc: 0x106b7dc: sw    v0, 108(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b7e0: 0x106b7e0: lw    v0, 244(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 61
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b7e4: 0x106b7e4: sll   zero, zero, 0
-// 0x0106b7e8: 0x106b7e8: sw    v0, 112(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 28
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106b7ec: 0x106b7ec: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106b7f0: 0x106b7f0: addiu v0, v0, -3132
-	ldloc 5
-	ldc.i4 -3132
-	add
-	stloc 5
-// 0x0106b7f4: 0x106b7f4: jal   0x1072ef4 sw    v0, 116(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 29
+	brfalse L_106b7b4
+// --- basic block ---
+// 0x0106b77c: 0x106b77c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106b780: 0x106b780: jal   0x101cd70 addiu a0, a0, 21096
+	ldloc.1
+	ldc.i4 21096
 	add
-	ldloc 5
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_RequestRoute_1072ef4(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106b7fc: 0x106b7fc: beq   v0, zero, 0x106b81c lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_106b81c
-// --- basic block ---
-// 0x0106b804: 0x106b804: lui   a3, 0x10000
+// 0x0106b788: 0x106b788: lui   a0, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x0106b808: 0x106b808: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b80c: 0x106b80c: addiu a3, a3, 21436
-	ldloc 4
-	ldc.i4 21436
+	stloc.1
+// 0x0106b78c: 0x106b78c: addiu a0, a0, 21112
+	ldloc.1
+	ldc.i4 21112
 	add
-	stloc 4
-// 0x0106b810: 0x106b810: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106b814: 0x106b814: j	 0x106b830 addiu a2, zero, 4068
-	ldc.i4 4068
-	stloc.3
-	br L_106b830
+// 0x0106b790: 0x106b790: jal   0x101cd70 addu  s0, v0, zero
+	ldloc 5
+	stloc 7
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_106b81c:
-// 0x0106b81c: 0x106b81c: lui   a3, 0x10000
-	ldc.i4 65536
+// 0x0106b798: 0x106b798: lui   a3, 0x1070000
+	ldc.i4 17235968
 	stloc 4
-// 0x0106b820: 0x106b820: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
+// 0x0106b79c: 0x106b79c: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x0106b7a0: 0x106b7a0: addu  a1, v0, zero
+	ldloc 5
 	stloc.2
-// 0x0106b824: 0x106b824: addiu a3, a3, 21460
+// 0x0106b7a4: 0x106b7a4: addiu a3, a3, -3824
 	ldloc 4
-	ldc.i4 21460
+	ldc.i4 -3824
 	add
 	stloc 4
-// 0x0106b828: 0x106b828: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106b82c: 0x106b82c: addiu a2, zero, 4070
-	ldc.i4 4070
+// 0x0106b7a8: 0x106b7a8: addiu a2, zero, 1
+	ldc.i4.1
 	stloc.3
-L_106b830:
-// 0x0106b830: 0x106b830: jal   0x100449c sw    v0, 120(sp)
+// 0x0106b7ac: 0x106b7ac: jal   0x104c330 sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.4
 	add
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106b838: 0x106b838: lw    ra, 132(sp)
-// 0x0106b83c: 0x106b83c: lw    v0, 120(sp)
+L_106b7b4:
+// 0x0106b7b4: 0x106b7b4: lw    ra, 28(sp)
+// 0x0106b7b8: 0x106b7b8: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106b840: 0x106b840: jr    ra addiu sp, sp, 136
+	stloc 7
+// 0x0106b7bc: 0x106b7bc: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4 136
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_ReportOnNavigation_106b848(int32,int32,int32,int32,int32)
+.method public static int32 recommend_waze_dialog_callbak_106b7c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local  6 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -971,302 +862,167 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b848: 0x106b848: addiu sp, sp, -56
+// 0x0106b7c4: 0x106b7c4: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106b84c: 0x106b84c: sw    s0, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106b850: 0x106b850: addiu a2, zero, 20
-	ldc.i4.s 20
-	stloc.3
-// 0x0106b854: 0x106b854: addu  s0, a0, zero
+// 0x0106b7c8: 0x106b7c8: addiu v0, zero, 3
+	ldc.i4.3
+	stloc 5
+// 0x0106b7cc: 0x106b7cc: bne   a0, v0, 0x106b808 sw    ra, 28(sp)
 	ldloc.1
-	stloc 8
-// 0x0106b858: 0x106b858: sw    ra, 52(sp)
-// 0x0106b85c: 0x106b85c: jal   0x1001800 addiu a0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+	ldloc 5
+	bne.un L_106b808
+// --- basic block ---
+// 0x0106b7d4: 0x106b7d4: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106b7d8: 0x106b7d8: jal   0x101cd70 addiu a0, a0, 21180
+	ldloc.1
+	ldc.i4 21180
 	add
 	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106b864: 0x106b864: lw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b868: 0x106b868: sll   zero, zero, 0
-// 0x0106b86c: 0x106b86c: bne   v0, zero, 0x106b87c lui   v0, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 5
-	brtrue L_106b87c
-// --- basic block ---
-// 0x0106b874: 0x106b874: addiu v0, v0, 18500
-	ldloc 5
-	ldc.i4 18500
-	add
-	stloc 5
-// 0x0106b878: 0x106b878: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-L_106b87c:
-// 0x0106b87c: 0x106b87c: lw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b880: 0x106b880: sll   zero, zero, 0
-// 0x0106b884: 0x106b884: bne   v0, zero, 0x106b894 lui   v0, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 5
-	brtrue L_106b894
-// --- basic block ---
-// 0x0106b88c: 0x106b88c: addiu v0, v0, 18500
-	ldloc 5
-	ldc.i4 18500
-	add
-	stloc 5
-// 0x0106b890: 0x106b890: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-L_106b894:
-// 0x0106b894: 0x106b894: lw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b898: 0x106b898: sll   zero, zero, 0
-// 0x0106b89c: 0x106b89c: bne   v0, zero, 0x106b8ac lui   v0, 0x10000
-	ldloc 5
-	ldc.i4 65536
+	stloc 8
 	stloc 5
-	brtrue L_106b8ac
 // --- basic block ---
-// 0x0106b8a4: 0x106b8a4: addiu v0, v0, 18500
-	ldloc 5
-	ldc.i4 18500
-	add
-	stloc 5
-// 0x0106b8a8: 0x106b8a8: sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-L_106b8ac:
-// 0x0106b8ac: 0x106b8ac: lw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b8b0: 0x106b8b0: sll   zero, zero, 0
-// 0x0106b8b4: 0x106b8b4: bne   v0, zero, 0x106b8c4 lui   v0, 0x10000
+// 0x0106b7e0: 0x106b7e0: addu  a0, v0, zero
 	ldloc 5
+	stloc.1
+// 0x0106b7e4: 0x106b7e4: lui   a1, 0x10000
 	ldc.i4 65536
+	stloc.2
+// 0x0106b7e8: 0x106b7e8: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106b7ec: 0x106b7ec: lui   v0, 0x20000
+	ldc.i4 131072
 	stloc 5
-	brtrue L_106b8c4
-// --- basic block ---
-// 0x0106b8bc: 0x106b8bc: addiu v0, v0, 18500
-	ldloc 5
-	ldc.i4 18500
-	add
-	stloc 5
-// 0x0106b8c0: 0x106b8c0: sw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
+// 0x0106b7f0: 0x106b7f0: ori   v0, v0, 8
 	ldloc 5
-	stelem.i4
-L_106b8c4:
-// 0x0106b8c4: 0x106b8c4: lw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
 	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106b8c8: 0x106b8c8: sll   zero, zero, 0
-// 0x0106b8cc: 0x106b8cc: bne   v0, zero, 0x106b8e0 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_106b8e0
-// --- basic block ---
-// 0x0106b8d4: 0x106b8d4: lui   v0, 0x10000
-	ldc.i4 65536
+	or
 	stloc 5
-// 0x0106b8d8: 0x106b8d8: addiu v0, v0, 18500
-	ldloc 5
-	ldc.i4 18500
-	add
-	stloc 5
-// 0x0106b8dc: 0x106b8dc: sw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+// 0x0106b7f4: 0x106b7f4: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
-	ldloc 5
-	stelem.i4
-L_106b8e0:
-// 0x0106b8e0: 0x106b8e0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106b8e4: 0x106b8e4: lw    v1, 17556(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4389
+	stloc.2
+// 0x0106b7f8: 0x106b7f8: addiu a2, a2, -11348
+	ldloc.3
+	ldc.i4 -11348
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106b8e8: 0x106b8e8: sll   zero, zero, 0
-// 0x0106b8ec: 0x106b8ec: beq   v1, zero, 0x106b984 addu  v0, zero, zero
-	ldloc 7
+	stloc.3
+// 0x0106b7fc: 0x106b7fc: addu  a3, zero, zero
 	ldc.i4.s 0
-	stloc 5
-	brfalse L_106b984
-// --- basic block ---
-// 0x0106b8f4: 0x106b8f4: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106b8f8: 0x106b8f8: lw    v0, 17564(v0)
-	ldloc 6
-	ldloc 5
+	stloc 4
+// 0x0106b800: 0x106b800: jal   0x1052e18 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4391
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106b8fc: 0x106b8fc: sll   zero, zero, 0
-// 0x0106b900: 0x106b900: bne   v0, zero, 0x106b92c lui   a0, 0x70000
 	ldloc 5
-	ldc.i4 458752
-	stloc.1
-	brtrue L_106b92c
-// --- basic block ---
-// 0x0106b908: 0x106b908: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106b90c: 0x106b90c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b910: 0x106b910: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b914: 0x106b914: addiu a3, a3, 21496
-	ldloc 4
-	ldc.i4 21496
-	add
-	stloc 4
-// 0x0106b918: 0x106b918: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106b91c: 0x106b91c: jal   0x100449c addiu a2, zero, 3985
-	ldc.i4 3985
-	stloc.3
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106b924: 0x106b924: j	 0x106b984 addu  v0, zero, zero
+L_106b808:
+// 0x0106b808: 0x106b808: lw    ra, 28(sp)
+// 0x0106b80c: 0x106b80c: sll   zero, zero, 0
+// 0x0106b810: 0x106b810: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_NotifySplashUpdateTime_106b818(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
 	stloc 5
-	br L_106b984
-// --- basic block ---
-L_106b92c:
-// 0x0106b92c: 0x106b92c: lui   a3, 0x1070000
-	ldc.i4 17235968
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106b930: 0x106b930: addu  a1, s0, zero
-	ldloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b818: 0x106b818: addu  a1, a0, zero
+	ldloc.1
 	stloc.2
-// 0x0106b934: 0x106b934: addiu a0, a0, 17728
+// 0x0106b81c: 0x106b81c: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106b820: 0x106b820: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106b824: 0x106b824: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106b828: 0x106b828: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106b938: 0x106b938: addiu a3, a3, -3016
-	ldloc 4
-	ldc.i4 -3016
-	add
-	stloc 4
-// 0x0106b93c: 0x106b93c: jal   0x10751c0 addiu a2, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+// 0x0106b82c: 0x106b82c: sw    ra, 36(sp)
+// 0x0106b830: 0x106b830: jal   0x1073cd4 addiu a2, a2, -368
+	ldloc.3
+	ldc.i4 -368
 	add
 	stloc.3
 	ldloc.0
@@ -1274,68 +1030,54 @@ L_106b92c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RTNet_NavigateTo_10751c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_NotifySplashUpdateTime_1073cd4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106b944: 0x106b944: beq   v0, zero, 0x106b964 lui   a1, 0x10000
+// 0x0106b838: 0x106b838: bne   v0, zero, 0x106b864 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_106b964
-// --- basic block ---
-// 0x0106b94c: 0x106b94c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106b950: 0x106b950: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106b954: 0x106b954: addiu a3, a3, 21584
-	ldloc 4
-	ldc.i4 21584
-	add
-	stloc 4
-// 0x0106b958: 0x106b958: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106b95c: 0x106b95c: j	 0x106b978 addiu a2, zero, 3994
-	ldc.i4 3994
-	stloc.3
-	br L_106b978
+	brtrue L_106b864
 // --- basic block ---
-L_106b964:
-// 0x0106b964: 0x106b964: lui   a3, 0x10000
+// 0x0106b840: 0x106b840: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106b968: 0x106b968: addiu a1, a1, 20732
+// 0x0106b844: 0x106b844: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106b96c: 0x106b96c: addiu a3, a3, 21616
+// 0x0106b848: 0x106b848: addiu a3, a3, 21228
 	ldloc 4
-	ldc.i4 21616
+	ldc.i4 21228
 	add
 	stloc 4
-// 0x0106b970: 0x106b970: addiu a0, zero, 4
+// 0x0106b84c: 0x106b84c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106b974: 0x106b974: addiu a2, zero, 3996
-	ldc.i4 3996
+// 0x0106b850: 0x106b850: addiu a2, zero, 4231
+	ldc.i4 4231
 	stloc.3
-L_106b978:
-// 0x0106b978: 0x106b978: jal   0x100449c sw    v0, 40(sp)
+// 0x0106b854: 0x106b854: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.6
 	add
 	ldloc 5
 	stelem.i4
+// 0x0106b858: 0x106b858: jal   0x100449c sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1343,60 +1085,53 @@ L_106b978:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106b980: 0x106b980: lw    v0, 40(sp)
+// 0x0106b860: 0x106b860: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 5
-L_106b984:
-// 0x0106b984: 0x106b984: lw    ra, 52(sp)
-// 0x0106b988: 0x106b988: lw    s0, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106b98c: 0x106b98c: jr    ra addiu sp, sp, 56
+L_106b864:
+// 0x0106b864: 0x106b864: lw    ra, 36(sp)
+// 0x0106b868: 0x106b868: sll   zero, zero, 0
+// 0x0106b86c: 0x106b86c: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 LoginDetailsChanged_106b994(int32,int32,int32,int32,int32)
+.method public static int32 ThereAreTooManyNetworkErrors_106b874(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  9 is register t0
 // local  0 is register sp
 // local  8 is register ra
-// local  6 is register mem
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1405,294 +1140,231 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106b994: 0x106b994: lui   v0, 0x70000
-	ldc.i4 458752
+// 0x0106b874: 0x106b874: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0106b998: 0x106b998: lw    v1, 17984(v0)
-	ldloc 6
+// 0x0106b878: 0x106b878: addiu v0, v0, -18608
+	ldloc 5
+	ldc.i4 -18608
+	add
+	stloc 5
+// 0x0106b87c: 0x106b87c: lw    v1, 8(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4496
+	ldc.i4.2
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106b99c: 0x106b99c: addiu sp, sp, -408
+	stloc 6
+// 0x0106b880: 0x106b880: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4 -408
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106b9a0: 0x106b9a0: sw    ra, 404(sp)
-// 0x0106b9a4: 0x106b9a4: beq   v1, zero, 0x106ba7c addu  v0, zero, zero
-	ldloc 7
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_106ba7c
+// 0x0106b884: 0x106b884: slti  v1, v1, 100
+	ldloc 6
+	ldc.i4.s 100
+	clt
+	stloc 6
+// 0x0106b888: 0x106b888: beq   v1, zero, 0x106b8a4 sw    ra, 36(sp)
+	ldloc 6
+	brfalse L_106b8a4
 // --- basic block ---
-// 0x0106b9ac: 0x106b9ac: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106b9b0: 0x106b9b0: lb    v0, -19056(a0)
-	ldloc.1
-	ldc.i4 -19056
+// 0x0106b890: 0x106b890: lw    v0, 4(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	ldelem.i4
 	stloc 5
-// 0x0106b9b4: 0x106b9b4: sll   zero, zero, 0
-// 0x0106b9b8: 0x106b9b8: beq   v0, zero, 0x106b9d4 addiu a0, a0, -19056
+// 0x0106b894: 0x106b894: sll   zero, zero, 0
+// 0x0106b898: 0x106b898: slti  v0, v0, 1000
 	ldloc 5
-	ldloc.1
-	ldc.i4 -19056
-	add
-	stloc.1
-	brfalse L_106b9d4
-// --- basic block ---
-// 0x0106b9c0: 0x106b9c0: addiu a1, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc.2
-// 0x0106b9c4: 0x106b9c4: jal   0x1067b64 addiu a2, zero, 63
-	ldc.i4.s 63
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4 1000
+	clt
 	stloc 5
-// --- basic block ---
-// 0x0106b9cc: 0x106b9cc: j	 0x106b9dc lui   v0, 0x80000
-	ldc.i4 524288
+// 0x0106b89c: 0x106b89c: bne   v0, zero, 0x106b90c addu  v0, zero, zero
+	ldloc 5
+	ldc.i4.s 0
 	stloc 5
-	br L_106b9dc
+	brtrue L_106b90c
 // --- basic block ---
-L_106b9d4:
-// 0x0106b9d4: 0x106b9d4: sb    zero, 16(sp)
-	ldloc.0
-	ldc.i4.s 16
-	add
+L_106b8a4:
+// 0x0106b8a4: 0x106b8a4: addu  v1, zero, zero
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106b9d8: 0x106b9d8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_106b9dc:
-// 0x0106b9dc: 0x106b9dc: lb    v0, -18992(v0)
-	ldloc 5
-	ldc.i4 -18992
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x0106b8a8: 0x106b8a8: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x0106b8ac: 0x106b8ac: cibyl_sysc 0x20e4
+	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0106b9e0: 0x106b9e0: sll   zero, zero, 0
-// 0x0106b9e4: 0x106b9e4: beq   v0, zero, 0x106ba04 lui   a0, 0x80000
+// 0x0106b8b0: 0x106b8b0: addu  v1, v0, zero
 	ldloc 5
+	stloc 6
+// 0x0106b8b4: 0x106b8b4: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-	brfalse L_106ba04
-// --- basic block ---
-// 0x0106b9ec: 0x106b9ec: addiu a0, a0, -18992
-	ldloc.1
-	ldc.i4 -18992
-	add
-	stloc.1
-// 0x0106b9f0: 0x106b9f0: addiu a1, sp, 144
-	ldloc.0
-	ldc.i4 144
-	add
-	stloc.2
-// 0x0106b9f4: 0x106b9f4: jal   0x1067b64 addiu a2, zero, 63
-	ldc.i4.s 63
-	stloc.3
+// 0x0106b8b8: 0x106b8b8: lw    v0, -18608(a0)
+	ldloc 7
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106b9fc: 0x106b9fc: j	 0x106ba0c lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-	br L_106ba0c
-// --- basic block ---
-L_106ba04:
-// 0x0106ba04: 0x106ba04: sb    zero, 144(sp)
-	ldloc.0
-	ldc.i4 144
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4652
 	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106ba08: 0x106ba08: lui   v0, 0x80000
-	ldc.i4 524288
+	ldelem.i4
 	stloc 5
-L_106ba0c:
-// 0x0106ba0c: 0x106ba0c: lb    v0, -18928(v0)
+// 0x0106b8bc: 0x106b8bc: sll   zero, zero, 0
+// 0x0106b8c0: 0x106b8c0: subu  v0, v1, v0
+	ldloc 6
 	ldloc 5
-	ldc.i4 -18928
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	sub
 	stloc 5
-// 0x0106ba10: 0x106ba10: sll   zero, zero, 0
-// 0x0106ba14: 0x106ba14: beq   v0, zero, 0x106ba34 lui   a0, 0x80000
+// 0x0106b8c4: 0x106b8c4: slti  v1, v0, 1200
 	ldloc 5
-	ldc.i4 524288
-	stloc.1
-	brfalse L_106ba34
-// --- basic block ---
-// 0x0106ba1c: 0x106ba1c: addiu a0, a0, -18928
+	ldc.i4 1200
+	clt
+	stloc 6
+// 0x0106b8c8: 0x106b8c8: bne   v1, zero, 0x106b908 addiu a0, a0, -18608
+	ldloc 6
 	ldloc.1
-	ldc.i4 -18928
+	ldc.i4 -18608
 	add
 	stloc.1
-// 0x0106ba20: 0x106ba20: addiu a1, sp, 272
-	ldloc.0
-	ldc.i4 272
+	brtrue L_106b908
+// --- basic block ---
+// 0x0106b8d0: 0x106b8d0: lw    v1, 8(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
 	add
-	stloc.2
-// 0x0106ba24: 0x106ba24: jal   0x1067b64 addiu a2, zero, 63
-	ldc.i4.s 63
-	stloc.3
+	ldelem.i4
+	stloc 6
+// 0x0106b8d4: 0x106b8d4: lw    t0, 4(a0)
+	ldloc 7
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ba2c: 0x106ba2c: j	 0x106ba3c lui   a1, 0x70000
-	ldc.i4 458752
-	stloc.2
-	br L_106ba3c
-// --- basic block ---
-L_106ba34:
-// 0x0106ba34: 0x106ba34: sb    zero, 272(sp)
-	ldloc.0
-	ldc.i4 272
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106ba38: 0x106ba38: lui   a1, 0x70000
-	ldc.i4 458752
+	ldelem.i4
+	stloc 9
+// 0x0106b8d8: 0x106b8d8: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-L_106ba3c:
-// 0x0106ba3c: 0x106ba3c: addiu a1, a1, 17728
+// 0x0106b8dc: 0x106b8dc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106b8e0: 0x106b8e0: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 17728
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106ba40: 0x106ba40: jal   0x1001b14 addiu a0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+// 0x0106b8e4: 0x106b8e4: addiu a3, a3, 21280
+	ldloc 4
+	ldc.i4 21280
 	add
+	stloc 4
+// 0x0106b8e8: 0x106b8e8: addiu a0, zero, 3
+	ldc.i4.3
 	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x0106ba48: 0x106ba48: bne   v0, zero, 0x106ba78 lui   a1, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc.2
-	brtrue L_106ba78
-// --- basic block ---
-// 0x0106ba50: 0x106ba50: addiu a1, a1, 17792
-	ldloc.2
-	ldc.i4 17792
-	add
-	stloc.2
-// 0x0106ba54: 0x106ba54: jal   0x1001b14 addiu a0, sp, 144
+// 0x0106b8ec: 0x106b8ec: addiu a2, zero, 983
+	ldc.i4 983
+	stloc.3
+// 0x0106b8f0: 0x106b8f0: sw    v0, 24(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4 144
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x0106ba5c: 0x106ba5c: bne   v0, zero, 0x106ba78 lui   a1, 0x70000
 	ldloc 5
-	ldc.i4 458752
-	stloc.2
-	brtrue L_106ba78
-// --- basic block ---
-// 0x0106ba64: 0x106ba64: addiu a1, a1, 17856
-	ldloc.2
-	ldc.i4 17856
+	stelem.i4
+// 0x0106b8f4: 0x106b8f4: sw    t0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
-// 0x0106ba68: 0x106ba68: jal   0x1001b14 addiu a0, sp, 272
+	ldloc 9
+	stelem.i4
+// 0x0106b8f8: 0x106b8f8: jal   0x100449c sw    v1, 20(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4 272
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.1
+	ldloc 6
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ba70: 0x106ba70: j	 0x106ba7c sltu  v0, zero, v0
-	ldc.i4.s 0
-	ldloc 5
-	clt.un
+// 0x0106b900: 0x106b900: j	 0x106b90c addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-	br L_106ba7c
+	br L_106b90c
 // --- basic block ---
-L_106ba78:
-// 0x0106ba78: 0x106ba78: addiu v0, zero, 1
-	ldc.i4.1
+L_106b908:
+// 0x0106b908: 0x106b908: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-L_106ba7c:
-// 0x0106ba7c: 0x106ba7c: lw    ra, 404(sp)
-// 0x0106ba80: 0x106ba80: sll   zero, zero, 0
-// 0x0106ba84: 0x106ba84: jr    ra addiu sp, sp, 408
+L_106b90c:
+// 0x0106b90c: 0x106b90c: lw    ra, 36(sp)
+// 0x0106b910: 0x106b910: sll   zero, zero, 0
+// 0x0106b914: 0x106b914: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4 408
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_ResetLoginState_106ba8c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_ExternalPoiNotifyOnNavigate_106b91c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
 // local  0 is register sp
-// local  9 is register ra
-// local  8 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1701,227 +1373,293 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ba8c: 0x106ba8c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106ba90: 0x106ba90: sw    s0, 16(sp)
-	ldloc 8
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106ba94: 0x106ba94: addu  s0, a0, zero
+// 0x0106b91c: 0x106b91c: addu  a1, a0, zero
 	ldloc.1
-	stloc 7
-// 0x0106ba98: 0x106ba98: lui   a0, 0x70000
+	stloc.2
+// 0x0106b920: 0x106b920: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106b924: 0x106b924: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0106ba9c: 0x106ba9c: sw    ra, 20(sp)
-// 0x0106baa0: 0x106baa0: jal   0x1085ba4 addiu a0, a0, 17728
+// 0x0106b928: 0x106b928: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106b92c: 0x106b92c: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18192
 	add
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
+// 0x0106b930: 0x106b930: sw    ra, 36(sp)
+// 0x0106b934: 0x106b934: jal   0x1073d64 addiu a2, a2, -276
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl100::RTConnectionInfo_ResetLogin_1085ba4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106baa8: 0x106baa8: lui   a0, 0xf0000
-	ldc.i4 983040
-	stloc.1
-// 0x0106baac: 0x106baac: jal   0x108d0dc addiu a0, a0, -30056
-	ldloc.1
-	ldc.i4 -30056
+	ldc.i4 -276
 	add
-	stloc.1
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_ExternalPoiNotifyOnNavigate_1073d64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106bab4: 0x106bab4: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106bab8: 0x106bab8: jal   0x108d0c0 addiu a0, a0, -19072
-	ldloc.1
-	ldc.i4 -19072
+// 0x0106b93c: 0x106b93c: bne   v0, zero, 0x106b968 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106b968
+// --- basic block ---
+// 0x0106b944: 0x106b944: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106b948: 0x106b948: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106b94c: 0x106b94c: addiu a3, a3, 21412
+	ldloc 4
+	ldc.i4 21412
 	add
+	stloc 4
+// 0x0106b950: 0x106b950: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-	ldloc.1
-	call void Cibyl105::StatusStatistics_Reset_108d0c0(int32)
-// --- basic block ---
-// 0x0106bac0: 0x106bac0: jal   0x1071ff4 sll   zero, zero, 0
+// 0x0106b954: 0x106b954: addiu a2, zero, 4219
+	ldc.i4 4219
+	stloc.3
+// 0x0106b958: 0x106b958: sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106b95c: 0x106b95c: jal   0x100449c sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1071ff4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106bac8: 0x106bac8: jal   0x108d404 sll   zero, zero, 0
+// 0x0106b964: 0x106b964: lw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl105::RTSystemMessageQueue_Empty_108d404(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0106bad0: 0x106bad0: lui   a0, 0x0
+L_106b968:
+// 0x0106b968: 0x106b968: lw    ra, 36(sp)
+// 0x0106b96c: 0x106b96c: sll   zero, zero, 0
+// 0x0106b970: 0x106b970: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_ExternalPoiNotifyOnPopUp_106b978(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc.1
-// 0x0106bad4: 0x106bad4: lui   a1, 0x10000
-	ldc.i4 65536
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106b978: 0x106b978: addu  a1, a0, zero
+	ldloc.1
 	stloc.2
-// 0x0106bad8: 0x106bad8: addiu a0, a0, 15012
+// 0x0106b97c: 0x106b97c: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106b980: 0x106b980: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106b984: 0x106b984: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106b988: 0x106b988: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 15012
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106badc: 0x106badc: jal   0x100e5c0 addiu a1, a1, 9424
-	ldloc.2
-	ldc.i4 9424
+// 0x0106b98c: 0x106b98c: sw    ra, 36(sp)
+// 0x0106b990: 0x106b990: jal   0x1073da0 addiu a2, a2, -184
+	ldloc.3
+	ldc.i4 -184
 	add
-	stloc.2
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_ExternalPoiNotifyOnPopUp_1073da0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106bae4: 0x106bae4: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106bae8: 0x106bae8: lui   a1, 0x10000
+// 0x0106b998: 0x106b998: bne   v0, zero, 0x106b9c4 lui   a1, 0x10000
+	ldloc 5
 	ldc.i4 65536
 	stloc.2
-// 0x0106baec: 0x106baec: addiu a0, a0, 15028
-	ldloc.1
-	ldc.i4 15028
-	add
-	stloc.1
-// 0x0106baf0: 0x106baf0: jal   0x100e5c0 addiu a1, a1, 18500
+	brtrue L_106b9c4
+// --- basic block ---
+// 0x0106b9a0: 0x106b9a0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106b9a4: 0x106b9a4: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 21196
 	add
 	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x0106b9a8: 0x106b9a8: addiu a3, a3, 21468
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106baf8: 0x106baf8: jal   0x100ea50 addu  a0, zero, zero
-	ldc.i4.s 0
+	ldc.i4 21468
+	add
+	stloc 4
+// 0x0106b9ac: 0x106b9ac: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x0106b9b0: 0x106b9b0: addiu a2, zero, 4208
+	ldc.i4 4208
+	stloc.3
+// 0x0106b9b4: 0x106b9b4: sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106bb00: 0x106bb00: beq   s0, zero, 0x106bb10 sll   zero, zero, 0
-	ldloc 7
-	brfalse L_106bb10
-// --- basic block ---
-// 0x0106bb08: 0x106bb08: jal   0x1021900 sll   zero, zero, 0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106b9b8: 0x106b9b8: jal   0x100449c sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-L_106bb10:
-// 0x0106bb10: 0x106bb10: lw    ra, 20(sp)
-// 0x0106bb14: 0x106bb14: lw    s0, 16(sp)
-	ldloc 8
+// 0x0106b9c0: 0x106b9c0: lw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106bb18: 0x106bb18: jr    ra addiu sp, sp, 24
+	stloc 5
+L_106b9c4:
+// 0x0106b9c4: 0x106b9c4: lw    ra, 36(sp)
+// 0x0106b9c8: 0x106b9c8: sll   zero, zero, 0
+// 0x0106b9cc: 0x106b9cc: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Login_106bb20(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_FacebookPermissions_106b9d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
+// local  9 is register t0
 // local  0 is register sp
-// local 10 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1931,140 +1669,125 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
 	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106bb20: 0x106bb20: addiu sp, sp, -40
+// 0x0106b9d4: 0x106b9d4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106bb24: 0x106bb24: addiu v0, zero, 1
-	ldc.i4.1
+// 0x0106b9d8: 0x106b9d8: addu  v0, a2, zero
+	ldloc.3
 	stloc 5
-// 0x0106bb28: 0x106bb28: lui   a2, 0x0
-	ldc.i4.s 0
-	stloc.3
-// 0x0106bb2c: 0x106bb2c: sw    s0, 28(sp)
+// 0x0106b9dc: 0x106b9dc: addu  t0, a0, zero
+	ldloc.1
+	stloc 9
+// 0x0106b9e0: 0x106b9e0: addu  v1, a1, zero
+	ldloc.2
+	stloc 7
+// 0x0106b9e4: 0x106b9e4: sw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 4
 	stelem.i4
-// 0x0106bb30: 0x106bb30: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0106bb34: 0x106bb34: sw    v0, 15052(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4 3763
-	add
+// 0x0106b9e8: 0x106b9e8: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106b9ec: 0x106b9ec: addu  a3, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0106bb38: 0x106bb38: lb    v1, -19056(s0)
-	ldloc 7
-	ldc.i4 -19056
+	stloc 4
+// 0x0106b9f0: 0x106b9f0: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106b9f4: 0x106b9f4: addiu v0, v0, -92
+	ldloc 5
+	ldc.i4.s -92
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 8
-// 0x0106bb3c: 0x106bb3c: lui   a2, 0x0
-	ldc.i4.s 0
-	stloc.3
-// 0x0106bb40: 0x106bb40: sw    v0, 15044(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4 3761
+	stloc 5
+// 0x0106b9f8: 0x106b9f8: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106bb44: 0x106bb44: lui   a2, 0x0
-	ldc.i4.s 0
+	stloc.1
+// 0x0106b9fc: 0x106b9fc: addu  a1, t0, zero
+	ldloc 9
+	stloc.2
+// 0x0106ba00: 0x106ba00: addu  a2, v1, zero
+	ldloc 7
 	stloc.3
-// 0x0106bb48: 0x106bb48: sw    s1, 32(sp)
+// 0x0106ba04: 0x106ba04: sw    ra, 36(sp)
+// 0x0106ba08: 0x106ba08: jal   0x1073ddc sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106bb4c: 0x106bb4c: sw    ra, 36(sp)
-// 0x0106bb50: 0x106bb50: sw    v0, 15048(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4 3762
+	ldc.i4.5
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106bb54: 0x106bb54: beq   v1, zero, 0x106bbb8 addu  s1, a0, zero
-	ldloc 8
+	ldloc.0
 	ldloc.1
-	stloc 9
-	brfalse L_106bbb8
-// --- basic block ---
-// 0x0106bb5c: 0x106bb5c: addiu s0, s0, -19056
-	ldloc 7
-	ldc.i4 -19056
-	add
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::RTNet_FacebookPermissions_1073ddc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x0106bb60: 0x106bb60: lb    v0, 64(s0)
-	ldloc 7
-	ldc.i4.s 64
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0106bb64: 0x106bb64: sll   zero, zero, 0
-// 0x0106bb68: 0x106bb68: beq   v0, zero, 0x106bbb8 lui   a3, 0x10000
+// --- basic block ---
+// 0x0106ba10: 0x106ba10: bne   v0, zero, 0x106ba3c lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
-	stloc 4
-	brfalse L_106bbb8
+	stloc.2
+	brtrue L_106ba3c
 // --- basic block ---
-// 0x0106bb70: 0x106bb70: lui   a1, 0x10000
+// 0x0106ba18: 0x106ba18: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc.2
-// 0x0106bb74: 0x106bb74: addiu a1, a1, 20732
+	stloc 4
+// 0x0106ba1c: 0x106ba1c: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106bb78: 0x106bb78: addiu a3, a3, 21684
+// 0x0106ba20: 0x106ba20: addiu a3, a3, 21520
 	ldloc 4
-	ldc.i4 21684
+	ldc.i4 21520
 	add
 	stloc 4
-// 0x0106bb7c: 0x106bb7c: addiu a0, zero, 1
-	ldc.i4.1
+// 0x0106ba24: 0x106ba24: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0106bb80: 0x106bb80: addiu a2, zero, 2566
-	ldc.i4 2566
+// 0x0106ba28: 0x106ba28: addiu a2, zero, 4196
+	ldc.i4 4196
 	stloc.3
-// 0x0106bb84: 0x106bb84: jal   0x100449c sw    s0, 16(sp)
+// 0x0106ba2c: 0x106ba2c: sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106ba30: 0x106ba30: jal   0x100449c sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 7
+	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -2073,130 +1796,187 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106bb8c: 0x106bb8c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106bb90: 0x106bb90: lui   a2, 0x80000
-	ldc.i4 524288
-	stloc.3
-// 0x0106bb94: 0x106bb94: lui   a3, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x0106bb98: 0x106bb98: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106bb9c: 0x106bb9c: addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-// 0x0106bba0: 0x106bba0: addiu a2, a2, -18992
-	ldloc.3
-	ldc.i4 -18992
+// 0x0106ba38: 0x106ba38: lw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.3
-// 0x0106bba4: 0x106bba4: addiu a3, a3, -18928
-	ldloc 4
-	ldc.i4 -18928
+	ldelem.i4
+	stloc 5
+L_106ba3c:
+// 0x0106ba3c: 0x106ba3c: lw    ra, 36(sp)
+// 0x0106ba40: 0x106ba40: sll   zero, zero, 0
+// 0x0106ba44: 0x106ba44: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_ReportAbuse_106ba4c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+
+// local  6 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106bba8: 0x106bba8: jal   0x10753b4 sw    s1, 16(sp)
-	ldloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106ba4c: 0x106ba4c: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
+	add
+	stloc.0
+// 0x0106ba50: 0x106ba50: sw    s1, 48(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 12
 	add
-	ldloc 9
+	ldloc 8
 	stelem.i4
+// 0x0106ba54: 0x106ba54: sw    s0, 44(sp)
+	ldloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106ba58: 0x106ba58: addu  s1, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl88::RTNet_Login_10753b4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106bbb0: 0x106bbb0: j	 0x106bc0c sll   zero, zero, 0
-	br L_106bc0c
-// --- basic block ---
-L_106bbb8:
-// 0x0106bbb8: 0x106bbb8: bne   a1, zero, 0x106bbe0 lui   v0, 0x10000
+// 0x0106ba5c: 0x106ba5c: addu  s0, a1, zero
 	ldloc.2
-	ldc.i4 65536
-	stloc 5
-	brtrue L_106bbe0
-// --- basic block ---
-// 0x0106bbc0: 0x106bbc0: lui   a3, 0x10000
-	ldc.i4 65536
+	stloc 7
+// 0x0106ba60: 0x106ba60: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106ba64: 0x106ba64: lui   a3, 0x1070000
+	ldc.i4 17235968
 	stloc 4
-// 0x0106bbc4: 0x106bbc4: addiu a1, v0, 20732
-	ldloc 5
-	ldc.i4 20732
-	add
+// 0x0106ba68: 0x106ba68: addu  a1, s1, zero
+	ldloc 8
 	stloc.2
-// 0x0106bbc8: 0x106bbc8: addiu a3, a3, 21720
+// 0x0106ba6c: 0x106ba6c: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106ba70: 0x106ba70: addiu a3, a3, -1908
 	ldloc 4
-	ldc.i4 21720
+	ldc.i4 -1908
 	add
 	stloc 4
-// 0x0106bbcc: 0x106bbcc: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106bbd0: 0x106bbd0: jal   0x100449c addiu a2, zero, 2576
-	ldc.i4 2576
+// 0x0106ba74: 0x106ba74: sw    ra, 52(sp)
+// 0x0106ba78: 0x106ba78: jal   0x1073eec addu  a2, s0, zero
+	ldloc 7
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_ReportAbuse_1073eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 9
+	stloc 6
 // --- basic block ---
-// 0x0106bbd8: 0x106bbd8: j	 0x106bc0c addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106bc0c
+// 0x0106ba80: 0x106ba80: beq   v0, zero, 0x106bab4 lui   a1, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc.2
+	brfalse L_106bab4
 // --- basic block ---
-L_106bbe0:
-// 0x0106bbe0: 0x106bbe0: lui   a3, 0x10000
+// 0x0106ba88: 0x106ba88: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106bbe4: 0x106bbe4: addiu a1, v0, 20732
-	ldloc 5
-	ldc.i4 20732
+// 0x0106ba8c: 0x106ba8c: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106bbe8: 0x106bbe8: addiu a3, a3, 21816
+// 0x0106ba90: 0x106ba90: addiu a3, a3, 21568
 	ldloc 4
-	ldc.i4 21816
+	ldc.i4 21568
 	add
 	stloc 4
-// 0x0106bbec: 0x106bbec: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106bbf0: 0x106bbf0: addiu a0, zero, 1
+// 0x0106ba94: 0x106ba94: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106bbf4: 0x106bbf4: addiu a2, zero, 2582
-	ldc.i4 2582
+// 0x0106ba98: 0x106ba98: addiu a2, zero, 4173
+	ldc.i4 4173
 	stloc.3
-// 0x0106bbf8: 0x106bbf8: jal   0x100449c sw    s1, 17576(v0)
-	ldloc 6
+// 0x0106ba9c: 0x106ba9c: sw    s1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106baa0: 0x106baa0: sw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106baa4: 0x106baa4: jal   0x100449c sw    v0, 32(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4394
+	ldc.i4.8
 	add
-	ldloc 9
+	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -2205,158 +1985,170 @@ L_106bbe0:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 9
+	stloc 6
 // --- basic block ---
-// 0x0106bc00: 0x106bc00: jal   0x10a04e4 sll   zero, zero, 0
-	ldloc.1
+// 0x0106baac: 0x106baac: j	 0x106badc sll   zero, zero, 0
+	br L_106badc
+// --- basic block ---
+L_106bab4:
+// 0x0106bab4: 0x106bab4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106bab8: 0x106bab8: addiu a1, a1, 21196
 	ldloc.2
-	ldloc.3
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106babc: 0x106babc: addiu a3, a3, 21628
 	ldloc 4
-	call int32 Cibyl119::roadmap_login_new_existing_dlg_10a04e4(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106bc08: 0x106bc08: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-L_106bc0c:
-// 0x0106bc0c: 0x106bc0c: lw    ra, 36(sp)
-// 0x0106bc10: 0x106bc10: lw    s1, 32(sp)
-	ldloc 6
+	ldc.i4 21628
+	add
+	stloc 4
+// 0x0106bac0: 0x106bac0: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106bac4: 0x106bac4: addiu a2, zero, 4175
+	ldc.i4 4175
+	stloc.3
+// 0x0106bac8: 0x106bac8: sw    s1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106bc14: 0x106bc14: lw    s0, 28(sp)
-	ldloc 6
+	ldloc 8
+	stelem.i4
+// 0x0106bacc: 0x106bacc: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106bc18: 0x106bc18: jr    ra addiu sp, sp, 40
+	ldloc 7
+	stelem.i4
+// 0x0106bad0: 0x106bad0: sw    zero, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_Relogin_106bc20(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106bc20: 0x106bc20: addiu sp, sp, -24
+	stelem.i4
+// 0x0106bad4: 0x106bad4: jal   0x100449c sw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.0
-// 0x0106bc24: 0x106bc24: sw    ra, 20(sp)
-// 0x0106bc28: 0x106bc28: jal   0x106ba8c addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_ResetLoginState_106ba8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0106bc30: 0x106bc30: jal   0x106af08 sll   zero, zero, 0
+L_106badc:
+// 0x0106badc: 0x106badc: lw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_LoginDetailsInit_106af08(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106bc38: 0x106bc38: lui   a0, 0x1070000
-	ldc.i4 17235968
+// 0x0106bae0: 0x106bae0: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0106bc3c: 0x106bc3c: addiu a0, a0, 4000
+// 0x0106bae4: 0x106bae4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106bae8: 0x106bae8: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 4000
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x0106bc40: 0x106bc40: jal   0x106bb20 addiu a1, zero, 1
-	ldc.i4.1
+// 0x0106baec: 0x106baec: addiu a1, a1, -14256
+	ldloc.2
+	ldc.i4 -14256
+	add
 	stloc.2
+// 0x0106baf0: 0x106baf0: addiu a2, zero, 3
+	ldc.i4.3
+	stloc.3
+// 0x0106baf4: 0x106baf4: jal   0x104bff4 sw    v0, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Login_106bb20(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0106bc48: 0x106bc48: lw    ra, 20(sp)
-// 0x0106bc4c: 0x106bc4c: sll   zero, zero, 0
-// 0x0106bc50: 0x106bc50: jr    ra addiu sp, sp, 24
+// 0x0106bafc: 0x106bafc: lw    ra, 52(sp)
+// 0x0106bb00: 0x106bb00: lw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106bb04: 0x106bb04: lw    s1, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106bb08: 0x106bb08: lw    s0, 44(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106bb0c: 0x106bb0c: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 OnMapMoved_106bc58(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_CollectCustomBonus_106bb14(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -2364,9 +2156,8 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
 // local  0 is register sp
-// local  9 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -2381,198 +2172,179 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106bc58: 0x106bc58: lui   v0, 0x70000
-	ldc.i4 458752
+// 0x0106bb14: 0x106bb14: addu  v0, a1, zero
+	ldloc.2
 	stloc 5
-// 0x0106bc5c: 0x106bc5c: lw    v0, 17564(v0)
-	ldloc 6
+// 0x0106bb18: 0x106bb18: addu  v1, a0, zero
+	ldloc.1
+	stloc 7
+// 0x0106bb1c: 0x106bb1c: addu  a3, a2, zero
+	ldloc.3
+	stloc 4
+// 0x0106bb20: 0x106bb20: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106bb24: 0x106bb24: addu  a2, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
-	add
-	ldelem.i4
+	stloc.3
+// 0x0106bb28: 0x106bb28: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-// 0x0106bc60: 0x106bc60: addiu sp, sp, -24
+// 0x0106bb2c: 0x106bb2c: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106bc64: 0x106bc64: sw    ra, 20(sp)
-// 0x0106bc68: 0x106bc68: beq   v0, zero, 0x106bc84 sw    s0, 16(sp)
-	ldloc 5
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-	brfalse L_106bc84
-// --- basic block ---
-// 0x0106bc70: 0x106bc70: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106bc74: 0x106bc74: lw    v0, 17984(v0)
-	ldloc 6
+// 0x0106bb30: 0x106bb30: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x0106bb34: 0x106bb34: addiu v0, v0, -1792
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4496
+	ldc.i4 -1792
 	add
-	ldelem.i4
 	stloc 5
-// 0x0106bc78: 0x106bc78: sll   zero, zero, 0
-// 0x0106bc7c: 0x106bc7c: bne   v0, zero, 0x106bc94 lui   s0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 8
-	brtrue L_106bc94
-// --- basic block ---
-L_106bc84:
-// 0x0106bc84: 0x106bc84: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106bc88: 0x106bc88: lw    v0, 17600(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4400
+// 0x0106bb38: 0x106bb38: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106bc8c: 0x106bc8c: j	 0x106bcdc sll   zero, zero, 0
-	br L_106bcdc
-// --- basic block ---
-L_106bc94:
-// 0x0106bc94: 0x106bc94: lw    v0, 17604(s0)
+	stloc.1
+// 0x0106bb3c: 0x106bb3c: sw    ra, 36(sp)
+// 0x0106bb40: 0x106bb40: jal   0x1073f34 sw    v0, 16(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4401
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106bc98: 0x106bc98: sll   zero, zero, 0
-// 0x0106bc9c: 0x106bc9c: bne   v0, zero, 0x106bcc0 addu  v1, zero, zero
 	ldloc 5
-	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl87::RTNet_CollectCustomBonus_1073f34(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brtrue L_106bcc0
+	stloc 5
 // --- basic block ---
-// 0x0106bca4: 0x106bca4: lui   a1, 0x1070000
-	ldc.i4 17235968
+// 0x0106bb48: 0x106bb48: beq   v0, zero, 0x106bb74 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
 	stloc.2
-// 0x0106bca8: 0x106bca8: addiu a1, a1, -8780
+	brfalse L_106bb74
+// --- basic block ---
+// 0x0106bb50: 0x106bb50: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106bb54: 0x106bb54: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 -8780
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106bcac: 0x106bcac: jal   0x104fe98 addiu a0, zero, 1000
-	ldc.i4 1000
+// 0x0106bb58: 0x106bb58: addiu a3, a3, 21696
+	ldloc 4
+	ldc.i4 21696
+	add
+	stloc 4
+// 0x0106bb5c: 0x106bb5c: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x0106bb60: 0x106bb60: addiu a2, zero, 4157
+	ldc.i4 4157
+	stloc.3
+// 0x0106bb64: 0x106bb64: jal   0x100449c sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106bcb4: 0x106bcb4: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0106bcb8: 0x106bcb8: sw    v0, 17604(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 4401
+// 0x0106bb6c: 0x106bb6c: j	 0x106bb94 sll   zero, zero, 0
+	br L_106bb94
+// --- basic block ---
+L_106bb74:
+// 0x0106bb74: 0x106bb74: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106bb78: 0x106bb78: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106bcbc: 0x106bcbc: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-L_106bcc0:
-// 0x0106bcc0: 0x106bcc0: cibyl_sysc_arg 0x3
-	ldloc 7
-// 0x0106bcc4: 0x106bcc4: cibyl_sysc 0x20e9
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x0106bcc8: 0x106bcc8: addu  v1, v0, zero
-	ldloc 5
-	stloc 7
-// 0x0106bccc: 0x106bccc: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106bcd0: 0x106bcd0: lui   a0, 0x70000
-	ldc.i4 458752
+	stloc.2
+// 0x0106bb7c: 0x106bb7c: addiu a3, a3, 21728
+	ldloc 4
+	ldc.i4 21728
+	add
+	stloc 4
+// 0x0106bb80: 0x106bb80: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0106bcd4: 0x106bcd4: lw    v0, 17600(v0)
+// 0x0106bb84: 0x106bb84: addiu a2, zero, 4159
+	ldc.i4 4159
+	stloc.3
+// 0x0106bb88: 0x106bb88: sw    zero, 16(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4400
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106bcd8: 0x106bcd8: sw    v1, 17608(a0)
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106bb8c: 0x106bb8c: jal   0x100449c sw    v0, 24(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4402
+	ldc.i4.6
 	add
-	ldloc 7
-	stelem.i4
-L_106bcdc:
-// 0x0106bcdc: 0x106bcdc: beq   v0, zero, 0x106bcec sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106bcec
-// --- basic block ---
-// 0x0106bce4: 0x106bce4: jalr  v0 sll   zero, zero, 0
 	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106bcec:
-// 0x0106bcec: 0x106bcec: lw    ra, 20(sp)
-// 0x0106bcf0: 0x106bcf0: lw    s0, 16(sp)
+L_106bb94:
+// 0x0106bb94: 0x106bb94: lw    ra, 36(sp)
+// 0x0106bb98: 0x106bb98: lw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106bcf4: 0x106bcf4: jr    ra addiu sp, sp, 24
+	stloc 5
+// 0x0106bb9c: 0x106bb9c: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -2582,23 +2354,24 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_CollectBonus_106bba4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
 
-// local  6 is register v0
+// local  5 is register v0
 // local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  9 is register t0
 // local  0 is register sp
 // local  8 is register ra
-// local  5 is register mem
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
 	stloc 7
 	ldarg 1
@@ -2609,66 +2382,117 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106bcfc: 0x106bcfc: lui   v1, 0x70000
-	ldc.i4 458752
+// 0x0106bba4: 0x106bba4: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106bba8: 0x106bba8: addu  v0, a2, zero
+	ldloc.3
+	stloc 5
+// 0x0106bbac: 0x106bbac: addu  t0, a0, zero
+	ldloc.1
+	stloc 9
+// 0x0106bbb0: 0x106bbb0: addu  v1, a1, zero
+	ldloc.2
 	stloc 7
-// 0x0106bd00: 0x106bd00: lw    v0, 17584(v1)
+// 0x0106bbb4: 0x106bbb4: sw    a3, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 4
+	stelem.i4
+// 0x0106bbb8: 0x106bbb8: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106bbbc: 0x106bbbc: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x0106bbc0: 0x106bbc0: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106bbc4: 0x106bbc4: addu  a1, t0, zero
+	ldloc 9
+	stloc.2
+// 0x0106bbc8: 0x106bbc8: addiu v0, v0, -1792
 	ldloc 5
+	ldc.i4 -1792
+	add
+	stloc 5
+// 0x0106bbcc: 0x106bbcc: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106bbd0: 0x106bbd0: addu  a2, v1, zero
 	ldloc 7
+	stloc.3
+// 0x0106bbd4: 0x106bbd4: sw    ra, 36(sp)
+// 0x0106bbd8: 0x106bbd8: jal   0x1073ff0 sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4396
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106bd04: 0x106bd04: addiu sp, sp, -40
+	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106bd08: 0x106bd08: bne   v0, a0, 0x106bd38 sw    ra, 36(sp)
-	ldloc 6
 	ldloc.1
-	bne.un L_106bd38
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl87::RTNet_CollectBonus_1073ff0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106bd10: 0x106bd10: lui   a1, 0x10000
+// 0x0106bbe0: 0x106bbe0: beq   v0, zero, 0x106bc0c lui   a1, 0x10000
+	ldloc 5
 	ldc.i4 65536
 	stloc.2
-// 0x0106bd14: 0x106bd14: lui   a3, 0x10000
+	brfalse L_106bc0c
+// --- basic block ---
+// 0x0106bbe8: 0x106bbe8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106bd18: 0x106bd18: addiu a1, a1, 20732
+// 0x0106bbec: 0x106bbec: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106bd1c: 0x106bd1c: addiu a3, a3, 21888
+// 0x0106bbf0: 0x106bbf0: addiu a3, a3, 21776
 	ldloc 4
-	ldc.i4 21888
+	ldc.i4 21776
 	add
 	stloc 4
-// 0x0106bd20: 0x106bd20: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106bbf4: 0x106bbf4: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106bd24: 0x106bd24: addiu a2, zero, 816
-	ldc.i4 816
+// 0x0106bbf8: 0x106bbf8: addiu a2, zero, 4139
+	ldc.i4 4139
 	stloc.3
-// 0x0106bd28: 0x106bd28: jal   0x100449c sw    v0, 16(sp)
-	ldloc 5
+// 0x0106bbfc: 0x106bbfc: jal   0x100449c sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 6
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -2678,100 +2502,71 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106bd30: 0x106bd30: j	 0x106bd74 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_106bd74
+// 0x0106bc04: 0x106bc04: j	 0x106bc2c sll   zero, zero, 0
+	br L_106bc2c
 // --- basic block ---
-L_106bd38:
-// 0x0106bd38: 0x106bd38: lui   a1, 0x70000
-	ldc.i4 458752
-	stloc.2
-// 0x0106bd3c: 0x106bd3c: addiu a1, a1, 17728
+L_106bc0c:
+// 0x0106bc0c: 0x106bc0c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106bc10: 0x106bc10: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 17728
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106bd40: 0x106bd40: lw    a2, 28688(a1)
-	ldloc 5
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4 7172
+// 0x0106bc14: 0x106bc14: addiu a3, a3, 21800
+	ldloc 4
+	ldc.i4 21800
 	add
-	ldelem.i4
+	stloc 4
+// 0x0106bc18: 0x106bc18: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106bc1c: 0x106bc1c: addiu a2, zero, 4141
+	ldc.i4 4141
 	stloc.3
-// 0x0106bd44: 0x106bd44: sll   zero, zero, 0
-// 0x0106bd48: 0x106bd48: bne   a2, zero, 0x106bd74 sw    a0, 17584(v1)
-	ldloc.3
-	ldloc 5
-	ldloc 7
+// 0x0106bc20: 0x106bc20: sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4396
+	ldc.i4.4
 	add
-	ldloc.1
+	ldc.i4.s 0
 	stelem.i4
-	brtrue L_106bd74
-// --- basic block ---
-// 0x0106bd50: 0x106bd50: lw    v1, 256(a1)
-	ldloc 5
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 64
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106bd54: 0x106bd54: sll   zero, zero, 0
-// 0x0106bd58: 0x106bd58: beq   v1, zero, 0x106bd74 lui   a1, 0x1070000
-	ldloc 7
-	ldc.i4 17235968
-	stloc.2
-	brfalse L_106bd74
-// --- basic block ---
-// 0x0106bd60: 0x106bd60: addiu a1, a1, -16828
-	ldloc.2
-	ldc.i4 -16828
-	add
-	stloc.2
-// 0x0106bd64: 0x106bd64: addiu a0, zero, 10
-	ldc.i4.s 10
-	stloc.1
-// 0x0106bd68: 0x106bd68: jal   0x104fe98 sw    v0, 24(sp)
-	ldloc 5
+// 0x0106bc24: 0x106bc24: jal   0x100449c sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 6
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106bd70: 0x106bd70: lw    v0, 24(sp)
-	ldloc 5
+L_106bc2c:
+// 0x0106bc2c: 0x106bc2c: lw    ra, 36(sp)
+// 0x0106bc30: 0x106bc30: lw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 6
-L_106bd74:
-// 0x0106bd74: 0x106bd74: lw    ra, 36(sp)
-// 0x0106bd78: 0x106bd78: sll   zero, zero, 0
-// 0x0106bd7c: 0x106bd7c: jr    ra addiu sp, sp, 40
+	stloc 5
+// 0x0106bc34: 0x106bc34: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -2780,28 +2575,28 @@ L_106bd74:
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 Realtime_SessionDetailsSave_106bd84(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SelectRoute_106bc3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
 // local  7 is register ra
-// local  8 is register mem
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2815,107 +2610,140 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106bd84: 0x106bd84: lui   v0, 0x70000
-	ldc.i4 458752
+// 0x0106bc3c: 0x106bc3c: addu  v0, a0, zero
+	ldloc.1
 	stloc 5
-// 0x0106bd88: 0x106bd88: lw    a1, 17988(v0)
-	ldloc 8
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4497
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106bd8c: 0x106bd8c: lui   a0, 0x0
-	ldc.i4.s 0
+// 0x0106bc40: 0x106bc40: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106bc44: 0x106bc44: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106bd90: 0x106bd90: addiu sp, sp, -24
+// 0x0106bc48: 0x106bc48: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106bd94: 0x106bd94: sw    ra, 20(sp)
-// 0x0106bd98: 0x106bd98: jal   0x100e610 addiu a0, a0, 15012
+// 0x0106bc4c: 0x106bc4c: addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+// 0x0106bc50: 0x106bc50: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 15012
+	ldc.i4 18192
 	add
 	stloc.1
+// 0x0106bc54: 0x106bc54: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0106bc58: 0x106bc58: sw    ra, 28(sp)
+// 0x0106bc5c: 0x106bc5c: jal   0x10734d0 addiu a3, a3, -1676
+	ldloc 4
+	ldc.i4 -1676
+	add
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_SelectRoute_10734d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106bda0: 0x106bda0: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106bda4: 0x106bda4: lui   a1, 0x70000
-	ldc.i4 458752
+// 0x0106bc64: 0x106bc64: beq   v0, zero, 0x106bc84 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
 	stloc.2
-// 0x0106bda8: 0x106bda8: addiu a0, a0, 15028
-	ldloc.1
-	ldc.i4 15028
+	brfalse L_106bc84
+// --- basic block ---
+// 0x0106bc6c: 0x106bc6c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106bc70: 0x106bc70: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106bc74: 0x106bc74: addiu a3, a3, 21844
+	ldloc 4
+	ldc.i4 21844
 	add
+	stloc 4
+// 0x0106bc78: 0x106bc78: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106bdac: 0x106bdac: jal   0x100e5c0 addiu a1, a1, 17920
+// 0x0106bc7c: 0x106bc7c: j	 0x106bc98 addiu a2, zero, 4119
+	ldc.i4 4119
+	stloc.3
+	br L_106bc98
+// --- basic block ---
+L_106bc84:
+// 0x0106bc84: 0x106bc84: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106bc88: 0x106bc88: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 17920
+	ldc.i4 21196
 	add
 	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x0106bc8c: 0x106bc8c: addiu a3, a3, 21868
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106bdb4: 0x106bdb4: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0106bdb8: 0x106bdb8: addiu a0, a0, -26888
-	ldloc.1
-	ldc.i4 -26888
+	ldc.i4 21868
 	add
+	stloc 4
+// 0x0106bc90: 0x106bc90: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0106bdbc: 0x106bdbc: jal   0x100e9c4 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
+// 0x0106bc94: 0x106bc94: addiu a2, zero, 4121
+	ldc.i4 4121
+	stloc.3
+L_106bc98:
+// 0x0106bc98: 0x106bc98: jal   0x100449c sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_one_100e9c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106bdc4: 0x106bdc4: lw    ra, 20(sp)
-// 0x0106bdc8: 0x106bdc8: sll   zero, zero, 0
-// 0x0106bdcc: 0x106bdcc: jr    ra addiu sp, sp, 24
+// 0x0106bca0: 0x106bca0: lw    ra, 28(sp)
+// 0x0106bca4: 0x106bca4: lw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bca8: 0x106bca8: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RealTime_WarningInit_106bdd4(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_GetGeoConfig_106bcb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2950,46 +2778,64 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106bdd4: 0x106bdd4: lui   a0, 0x1070000
-	ldc.i4 17235968
+// 0x0106bcb0: 0x106bcb0: addu  v0, a0, zero
+	ldloc.1
+	stloc 5
+// 0x0106bcb4: 0x106bcb4: addu  a3, a1, zero
+	ldloc.2
+	stloc 4
+// 0x0106bcb8: 0x106bcb8: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106bdd8: 0x106bdd8: addiu sp, sp, -24
+// 0x0106bcbc: 0x106bcbc: addu  a1, a2, zero
+	ldloc.3
+	stloc.2
+// 0x0106bcc0: 0x106bcc0: addu  a2, v0, zero
+	ldloc 5
+	stloc.3
+// 0x0106bcc4: 0x106bcc4: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106bcc8: 0x106bcc8: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106bddc: 0x106bddc: sw    ra, 20(sp)
-// 0x0106bde0: 0x106bde0: jal   0x104fd00 addiu a0, a0, -16940
+// 0x0106bccc: 0x106bccc: addiu v0, v0, -8180
+	ldloc 5
+	ldc.i4 -8180
+	add
+	stloc 5
+// 0x0106bcd0: 0x106bcd0: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 -16940
+	ldc.i4 18192
 	add
 	stloc.1
+// 0x0106bcd4: 0x106bcd4: sw    ra, 28(sp)
+// 0x0106bcd8: 0x106bcd8: jal   0x1073128 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_GetGeoConfig_1073128(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106bde8: 0x106bde8: lw    ra, 20(sp)
-// 0x0106bdec: 0x106bdec: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0106bdf0: 0x106bdf0: sw    zero, 15216(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3804
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106bdf4: 0x106bdf4: jr    ra addiu sp, sp, 24
+// 0x0106bce0: 0x106bce0: lw    ra, 28(sp)
+// 0x0106bce4: 0x106bce4: sll   zero, zero, 0
+// 0x0106bce8: 0x106bce8: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -2999,26 +2845,25 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_LoginChangedCallback_106bdfc(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_RequestRoute_106bcf0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
 // local  0 is register sp
-// local  9 is register ra
-// local  7 is register mem
+// local  8 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3027,498 +2872,634 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 6
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106bdfc: 0x106bdfc: addiu sp, sp, -24
+// 0x0106bcf0: 0x106bcf0: addiu sp, sp, -136
+	ldloc.0
+	ldc.i4 -136
+	add
+	stloc.0
+// 0x0106bcf4: 0x106bcf4: lw    v0, 152(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bcf8: 0x106bcf8: sw    a3, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 4
+	stelem.i4
+// 0x0106bcfc: 0x106bcfc: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd00: 0x106bd00: lw    v0, 156(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 39
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bd04: 0x106bd04: addu  a3, a2, zero
+	ldloc.3
+	stloc 4
+// 0x0106bd08: 0x106bd08: sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd0c: 0x106bd0c: lw    v0, 160(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 40
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bd10: 0x106bd10: addu  v1, a0, zero
+	ldloc.1
+	stloc 7
+// 0x0106bd14: 0x106bd14: sw    v0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd18: 0x106bd18: lw    v0, 164(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 41
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bd1c: 0x106bd1c: lw    a0, 188(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 47
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106bd20: 0x106bd20: sw    v0, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd24: 0x106bd24: lw    v0, 168(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 42
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bd28: 0x106bd28: sw    ra, 132(sp)
+// 0x0106bd2c: 0x106bd2c: sw    v0, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd30: 0x106bd30: lw    v0, 172(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 43
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bd34: 0x106bd34: sw    a0, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc.1
+	stelem.i4
+// 0x0106bd38: 0x106bd38: sw    v0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd3c: 0x106bd3c: lw    v0, 176(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 44
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bd40: 0x106bd40: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106bd44: 0x106bd44: sw    v0, 44(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd48: 0x106bd48: lw    v0, 180(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 45
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106bd4c: 0x106bd4c: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106bd50: 0x106bd50: sw    v0, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd54: 0x106bd54: lw    v0, 184(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 46
 	add
-	stloc.0
-// 0x0106be00: 0x106be00: lui   v0, 0x70000
-	ldc.i4 458752
+	ldelem.i4
 	stloc 5
-// 0x0106be04: 0x106be04: sw    s0, 16(sp)
-	ldloc 7
+// 0x0106bd58: 0x106bd58: sll   zero, zero, 0
+// 0x0106bd5c: 0x106bd5c: sw    v0, 52(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 13
 	add
-	ldloc 6
+	ldloc 5
 	stelem.i4
-// 0x0106be08: 0x106be08: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106be0c: 0x106be0c: lw    s0, 17580(v0)
-	ldloc 7
+// 0x0106bd60: 0x106bd60: addu  v0, a1, zero
+	ldloc.2
+	stloc 5
+// 0x0106bd64: 0x106bd64: addu  a2, v0, zero
 	ldloc 5
+	stloc.3
+// 0x0106bd68: 0x106bd68: lw    v0, 192(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4395
+	ldc.i4.s 48
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106be10: 0x106be10: sw    ra, 20(sp)
-// 0x0106be14: 0x106be14: jal   0x104fd00 addiu a0, a0, -16900
-	ldloc.1
-	ldc.i4 -16900
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 5
-// --- basic block ---
-// 0x0106be1c: 0x106be1c: beq   s0, zero, 0x106be2c sll   zero, zero, 0
+// 0x0106bd6c: 0x106bd6c: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x0106bd70: 0x106bd70: sw    v0, 60(sp)
 	ldloc 6
-	brfalse L_106be2c
-// --- basic block ---
-// 0x0106be24: 0x106be24: jalr  s0 sll   zero, zero, 0
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd74: 0x106bd74: lw    v0, 196(sp)
 	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 49
+	add
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-L_106be2c:
-// 0x0106be2c: 0x106be2c: jal   0x102146c sll   zero, zero, 0
+// 0x0106bd78: 0x106bd78: sll   zero, zero, 0
+// 0x0106bd7c: 0x106bd7c: sw    v0, 64(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106be34: 0x106be34: lw    ra, 20(sp)
-// 0x0106be38: 0x106be38: lw    s0, 16(sp)
-	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106bd80: 0x106bd80: lw    v0, 200(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 50
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106be3c: 0x106be3c: jr    ra addiu sp, sp, 24
+	stloc 5
+// 0x0106bd84: 0x106bd84: sll   zero, zero, 0
+// 0x0106bd88: 0x106bd88: sw    v0, 68(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ret
-}
-.method public static int32 Realtime_LoginCallback_106be44(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
-
-// local  6 is register v0
-// local 10 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  9 is register s2
-// local  0 is register sp
-// local 11 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 10
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 11
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stelem.i4
+// 0x0106bd8c: 0x106bd8c: lw    v0, 204(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 51
+	add
+	ldelem.i4
 	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106be44: 0x106be44: addiu sp, sp, -32
+// 0x0106bd90: 0x106bd90: sll   zero, zero, 0
+// 0x0106bd94: 0x106bd94: sw    v0, 72(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
 	add
-	stloc.0
-// 0x0106be48: 0x106be48: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106be4c: 0x106be4c: sw    s2, 24(sp)
 	ldloc 5
+	stelem.i4
+// 0x0106bd98: 0x106bd98: lw    v0, 208(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 52
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106be50: 0x106be50: sw    s1, 20(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x0106bd9c: 0x106bd9c: sll   zero, zero, 0
+// 0x0106bda0: 0x106bda0: sw    v0, 76(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 19
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
-// 0x0106be54: 0x106be54: lui   s2, 0x70000
-	ldc.i4 458752
-	stloc 9
-// 0x0106be58: 0x106be58: addiu a0, a0, -16828
-	ldloc.1
-	ldc.i4 -16828
+// 0x0106bda4: 0x106bda4: lw    v0, 212(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 53
 	add
-	stloc.1
-// 0x0106be5c: 0x106be5c: sw    s0, 16(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x0106bda8: 0x106bda8: sll   zero, zero, 0
+// 0x0106bdac: 0x106bdac: sw    v0, 80(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 20
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106be60: 0x106be60: sw    ra, 28(sp)
-// 0x0106be64: 0x106be64: lw    s0, 17584(s2)
 	ldloc 5
-	ldloc 9
+	stelem.i4
+// 0x0106bdb0: 0x106bdb0: lw    v0, 216(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4396
+	ldc.i4.s 54
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106be68: 0x106be68: jal   0x104fd00 lui   s1, 0x70000
-	ldc.i4 458752
-	stloc 8
+	stloc 5
+// 0x0106bdb4: 0x106bdb4: sll   zero, zero, 0
+// 0x0106bdb8: 0x106bdb8: sw    v0, 84(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 6
-// --- basic block ---
-// 0x0106be70: 0x106be70: lw    v0, 17572(s1)
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
 	ldloc 5
-	ldloc 8
+	stelem.i4
+// 0x0106bdbc: 0x106bdbc: lw    v0, 220(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4393
+	ldc.i4.s 55
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106be74: 0x106be74: sll   zero, zero, 0
-// 0x0106be78: 0x106be78: beq   v0, zero, 0x106be8c sw    zero, 17584(s2)
+	stloc 5
+// 0x0106bdc0: 0x106bdc0: sll   zero, zero, 0
+// 0x0106bdc4: 0x106bdc4: sw    v0, 88(sp)
 	ldloc 6
-	ldloc 5
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4396
+	ldc.i4.s 22
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-	brfalse L_106be8c
-// --- basic block ---
-// 0x0106be80: 0x106be80: jal   0x106ad64 sll   zero, zero, 0
+// 0x0106bdc8: 0x106bdc8: lw    v0, 224(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_SaveLoginInfo_106ad64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 6
-// --- basic block ---
-// 0x0106be88: 0x106be88: sw    zero, 17572(s1)
-	ldloc 5
-	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 4393
+	ldc.i4.s 56
 	add
-	ldc.i4.s 0
-	stelem.i4
-L_106be8c:
-// 0x0106be8c: 0x106be8c: beq   s0, zero, 0x106be9c sll   zero, zero, 0
-	ldloc 7
-	brfalse L_106be9c
-// --- basic block ---
-// 0x0106be94: 0x106be94: jalr  s0 sll   zero, zero, 0
-	ldloc 7
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 6
-// --- basic block ---
-L_106be9c:
-// 0x0106be9c: 0x106be9c: jal   0x102146c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 6
-// --- basic block ---
-// 0x0106bea4: 0x106bea4: lw    ra, 28(sp)
-// 0x0106bea8: 0x106bea8: lw    s2, 24(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x0106bdcc: 0x106bdcc: sll   zero, zero, 0
+// 0x0106bdd0: 0x106bdd0: sw    v0, 92(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 23
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106beac: 0x106beac: lw    s1, 20(sp)
 	ldloc 5
+	stelem.i4
+// 0x0106bdd4: 0x106bdd4: lw    v0, 228(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 57
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106beb0: 0x106beb0: lw    s0, 16(sp)
+	stloc 5
+// 0x0106bdd8: 0x106bdd8: sll   zero, zero, 0
+// 0x0106bddc: 0x106bddc: sw    v0, 96(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
 	ldloc 5
+	stelem.i4
+// 0x0106bde0: 0x106bde0: lw    v0, 232(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 58
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106beb4: 0x106beb4: jr    ra addiu sp, sp, 32
+	stloc 5
+// 0x0106bde4: 0x106bde4: sll   zero, zero, 0
+// 0x0106bde8: 0x106bde8: sw    v0, 100(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 25
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 10
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	stelem.i4
+// 0x0106bdec: 0x106bdec: lw    v0, 236(sp)
 	ldloc 6
-	ret
-}
-.method public static int32 TestLoginDetailsCompleted_106bebc(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
-
-// local  6 is register v0
-// local  5 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 5
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106bebc: 0x106bebc: lui   a1, 0x70000
-	ldc.i4 458752
-	stloc.2
-// 0x0106bec0: 0x106bec0: lw    v0, 17568(a1)
-	ldloc 7
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4392
+	ldc.i4.s 59
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106bec4: 0x106bec4: lui   v1, 0x70000
-	ldc.i4 458752
 	stloc 5
-// 0x0106bec8: 0x106bec8: addiu sp, sp, -24
+// 0x0106bdf0: 0x106bdf0: sll   zero, zero, 0
+// 0x0106bdf4: 0x106bdf4: sw    v0, 104(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 26
 	add
-	stloc.0
-// 0x0106becc: 0x106becc: addiu v1, v1, 17728
 	ldloc 5
-	ldc.i4 17728
+	stelem.i4
+// 0x0106bdf8: 0x106bdf8: lw    v0, 240(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 60
 	add
+	ldelem.i4
 	stloc 5
-// 0x0106bed0: 0x106bed0: sw    ra, 20(sp)
-// 0x0106bed4: 0x106bed4: sw    zero, 17568(a1)
-	ldloc 7
-	ldloc.2
+// 0x0106bdfc: 0x106bdfc: sll   zero, zero, 0
+// 0x0106be00: 0x106be00: sw    v0, 108(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4392
+	ldc.i4.s 27
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-// 0x0106bed8: 0x106bed8: beq   v0, zero, 0x106beec sw    zero, 28688(v1)
+// 0x0106be04: 0x106be04: lw    v0, 244(sp)
 	ldloc 6
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4.s 61
 	add
-	ldc.i4.s 0
+	ldelem.i4
+	stloc 5
+// 0x0106be08: 0x106be08: sll   zero, zero, 0
+// 0x0106be0c: 0x106be0c: sw    v0, 112(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 28
+	add
+	ldloc 5
 	stelem.i4
-	brfalse L_106beec
-// --- basic block ---
-// 0x0106bee0: 0x106bee0: lw    a1, 28696(v1)
-	ldloc 7
+// 0x0106be10: 0x106be10: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106be14: 0x106be14: addiu v0, v0, -1560
 	ldloc 5
+	ldc.i4 -1560
+	add
+	stloc 5
+// 0x0106be18: 0x106be18: jal   0x1073518 sw    v0, 116(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4.s 29
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106bee4: 0x106bee4: jalr  v0 sll   zero, zero, 0
-	ldloc 6
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_RequestRoute_1073518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	stloc 6
 // --- basic block ---
-L_106beec:
-// 0x0106beec: 0x106beec: jal   0x102146c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
+// 0x0106be20: 0x106be20: beq   v0, zero, 0x106be40 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_106be40
+// --- basic block ---
+// 0x0106be28: 0x106be28: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106be2c: 0x106be2c: addiu a1, a1, 21196
 	ldloc.2
-	ldloc.3
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106be30: 0x106be30: addiu a3, a3, 21900
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 6
+	ldc.i4 21900
+	add
+	stloc 4
+// 0x0106be34: 0x106be34: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106be38: 0x106be38: j	 0x106be54 addiu a2, zero, 4068
+	ldc.i4 4068
+	stloc.3
+	br L_106be54
 // --- basic block ---
-// 0x0106bef4: 0x106bef4: bne   v0, zero, 0x106bf04 sll   zero, zero, 0
+L_106be40:
+// 0x0106be40: 0x106be40: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106be44: 0x106be44: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106be48: 0x106be48: addiu a3, a3, 21924
+	ldloc 4
+	ldc.i4 21924
+	add
+	stloc 4
+// 0x0106be4c: 0x106be4c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106be50: 0x106be50: addiu a2, zero, 4070
+	ldc.i4 4070
+	stloc.3
+L_106be54:
+// 0x0106be54: 0x106be54: jal   0x100449c sw    v0, 120(sp)
 	ldloc 6
-	brtrue L_106bf04
-// --- basic block ---
-// 0x0106befc: 0x106befc: jal   0x1021900 sll   zero, zero, 0
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	stloc 6
 // --- basic block ---
-L_106bf04:
-// 0x0106bf04: 0x106bf04: lw    ra, 20(sp)
-// 0x0106bf08: 0x106bf08: sll   zero, zero, 0
-// 0x0106bf0c: 0x106bf0c: jr    ra addiu sp, sp, 24
+// 0x0106be5c: 0x106be5c: lw    ra, 132(sp)
+// 0x0106be60: 0x106be60: lw    v0, 120(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106be64: 0x106be64: jr    ra addiu sp, sp, 136
+	ldloc.0
+	ldc.i4 136
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 TestLoginDetails_106bf14(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_ReportOnNavigation_106be6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
+// local  8 is register s0
 // local  0 is register sp
-// local 10 is register ra
+// local  9 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3528,468 +3509,370 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106bf14: 0x106bf14: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106bf18: 0x106bf18: lw    v0, 17984(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4496
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106bf1c: 0x106bf1c: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106bf20: 0x106bf20: sw    ra, 28(sp)
-// 0x0106bf24: 0x106bf24: sw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106bf28: 0x106bf28: beq   v0, zero, 0x106bf60 sw    s0, 20(sp)
-	ldloc 5
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-	brfalse L_106bf60
-// --- basic block ---
-// 0x0106bf30: 0x106bf30: jal   0x106b994 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::LoginDetailsChanged_106b994(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106bf38: 0x106bf38: bne   v0, zero, 0x106bf60 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106bf60
-// --- basic block ---
-// 0x0106bf40: 0x106bf40: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106bf44: 0x106bf44: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106be6c: 0x106be6c: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
 	add
-	stloc.2
-// 0x0106bf48: 0x106bf48: addiu a3, a3, 21928
-	ldloc 4
-	ldc.i4 21928
+	stloc.0
+// 0x0106be70: 0x106be70: sw    s0, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
 	add
-	stloc 4
-// 0x0106bf4c: 0x106bf4c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106bf50: 0x106bf50: jal   0x100449c addiu a2, zero, 3880
-	ldc.i4 3880
+	ldloc 8
+	stelem.i4
+// 0x0106be74: 0x106be74: addiu a2, zero, 20
+	ldc.i4.s 20
 	stloc.3
-	ldloc.0
+// 0x0106be78: 0x106be78: addu  s0, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106bf58: 0x106bf58: j	 0x106bfcc addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106bfcc
-// --- basic block ---
-L_106bf60:
-// 0x0106bf60: 0x106bf60: jal   0x106ac80 sll   zero, zero, 0
+// 0x0106be7c: 0x106be7c: sw    ra, 52(sp)
+// 0x0106be80: 0x106be80: jal   0x1001800 addiu a0, sp, 16
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::NameAndPasswordAlreadyFailedAuthentication_106ac80(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106bf68: 0x106bf68: beq   v0, zero, 0x106bf80 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106bf80
-// --- basic block ---
-// 0x0106bf70: 0x106bf70: jal   0x106bebc addu  a0, zero, zero
-	ldc.i4.s 0
+	ldc.i4.s 16
+	add
 	stloc.1
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::TestLoginDetailsCompleted_106bebc(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106bf78: 0x106bf78: j	 0x106bfe0 sll   zero, zero, 0
-	br L_106bfe0
-// --- basic block ---
-L_106bf80:
-// 0x0106bf80: 0x106bf80: jal   0x106ba8c addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
+// 0x0106be88: 0x106be88: lw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Realtime_ResetLoginState_106ba8c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106be8c: 0x106be8c: sll   zero, zero, 0
+// 0x0106be90: 0x106be90: bne   v0, zero, 0x106bea0 lui   v0, 0x10000
+	ldloc 5
+	ldc.i4 65536
 	stloc 5
+	brtrue L_106bea0
 // --- basic block ---
-// 0x0106bf88: 0x106bf88: lui   s0, 0x70000
-	ldc.i4 458752
-	stloc 7
-// 0x0106bf8c: 0x106bf8c: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106bf90: 0x106bf90: addiu s0, s0, 17728
-	ldloc 7
-	ldc.i4 17728
-	add
-	stloc 7
-// 0x0106bf94: 0x106bf94: addiu s1, zero, 1
-	ldc.i4.1
-	stloc 9
-// 0x0106bf98: 0x106bf98: addiu a0, a0, 2684
-	ldloc.1
-	ldc.i4 2684
+// 0x0106be98: 0x106be98: addiu v0, v0, 18768
+	ldloc 5
+	ldc.i4 18768
 	add
-	stloc.1
-// 0x0106bf9c: 0x106bf9c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0106bfa0: 0x106bfa0: sw    s1, 28688(s0)
+	stloc 5
+// 0x0106be9c: 0x106be9c: sw    v0, 16(sp)
 	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 5
 	stelem.i4
-// 0x0106bfa4: 0x106bfa4: jal   0x106bb20 sw    zero, 28696(s0)
+L_106bea0:
+// 0x0106bea0: 0x106bea0: lw    v0, 20(sp)
 	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4.5
 	add
-	ldc.i4.s 0
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Login_106bb20(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0106bfac: 0x106bfac: beq   v0, zero, 0x106bfc0 sll   zero, zero, 0
+// 0x0106bea4: 0x106bea4: sll   zero, zero, 0
+// 0x0106bea8: 0x106bea8: bne   v0, zero, 0x106beb8 lui   v0, 0x10000
 	ldloc 5
-	brfalse L_106bfc0
+	ldc.i4 65536
+	stloc 5
+	brtrue L_106beb8
 // --- basic block ---
-// 0x0106bfb4: 0x106bfb4: sw    s1, 28688(s0)
+// 0x0106beb0: 0x106beb0: addiu v0, v0, 18768
+	ldloc 5
+	ldc.i4 18768
+	add
+	stloc 5
+// 0x0106beb4: 0x106beb4: sw    v0, 20(sp)
 	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4.5
 	add
-	ldloc 9
+	ldloc 5
 	stelem.i4
-// 0x0106bfb8: 0x106bfb8: j	 0x106bfcc addiu v0, zero, 1
-	ldc.i4.1
+L_106beb8:
+// 0x0106beb8: 0x106beb8: lw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
 	stloc 5
-	br L_106bfcc
+// 0x0106bebc: 0x106bebc: sll   zero, zero, 0
+// 0x0106bec0: 0x106bec0: bne   v0, zero, 0x106bed0 lui   v0, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 5
+	brtrue L_106bed0
 // --- basic block ---
-L_106bfc0:
-// 0x0106bfc0: 0x106bfc0: addiu v0, zero, 2
-	ldc.i4.2
+// 0x0106bec8: 0x106bec8: addiu v0, v0, 18768
+	ldloc 5
+	ldc.i4 18768
+	add
 	stloc 5
-// 0x0106bfc4: 0x106bfc4: j	 0x106bfe0 sw    v0, 28696(s0)
+// 0x0106becc: 0x106becc: sw    v0, 24(sp)
 	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4.6
 	add
 	ldloc 5
 	stelem.i4
-	br L_106bfe0
-// --- basic block ---
-L_106bfcc:
-// 0x0106bfcc: 0x106bfcc: lw    ra, 28(sp)
-// 0x0106bfd0: 0x106bfd0: lw    s1, 24(sp)
+L_106bed0:
+// 0x0106bed0: 0x106bed0: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106bfd4: 0x106bfd4: lw    s0, 20(sp)
+	stloc 5
+// 0x0106bed4: 0x106bed4: sll   zero, zero, 0
+// 0x0106bed8: 0x106bed8: bne   v0, zero, 0x106bee8 lui   v0, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 5
+	brtrue L_106bee8
+// --- basic block ---
+// 0x0106bee0: 0x106bee0: addiu v0, v0, 18768
+	ldloc 5
+	ldc.i4 18768
+	add
+	stloc 5
+// 0x0106bee4: 0x106bee4: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106bfd8: 0x106bfd8: jr    ra addiu sp, sp, 32
+	ldloc 5
+	stelem.i4
+L_106bee8:
+// 0x0106bee8: 0x106bee8: lw    v0, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.0
-	br __CIBYL_function_return
-// --- basic block ---
-L_106bfe0:
-// 0x0106bfe0: 0x106bfe0: jal   0x106bebc addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::TestLoginDetailsCompleted_106bebc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldelem.i4
 	stloc 5
+// 0x0106beec: 0x106beec: sll   zero, zero, 0
+// 0x0106bef0: 0x106bef0: bne   v0, zero, 0x106bf04 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_106bf04
 // --- basic block ---
-// 0x0106bfe8: 0x106bfe8: j	 0x106bfcc addu  v0, zero, zero
-	ldc.i4.s 0
+// 0x0106bef8: 0x106bef8: lui   v0, 0x10000
+	ldc.i4 65536
 	stloc 5
-	br L_106bfcc
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x0106befc: 0x106befc: addiu v0, v0, 18768
 	ldloc 5
-	ret
-}
-.method public static int32 Realtime_VerifyLoginDetails_106bff0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register t0
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+	ldc.i4 18768
+	add
 	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106bff0: 0x106bff0: lui   v0, 0x70000
+// 0x0106bf00: 0x106bf00: sw    v0, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 5
+	stelem.i4
+L_106bf04:
+// 0x0106bf04: 0x106bf04: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106bff4: 0x106bff4: lw    v1, 17556(v0)
+// 0x0106bf08: 0x106bf08: lw    v1, 18020(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4389
+	ldc.i4 4505
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106bff8: 0x106bff8: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106bffc: 0x106bffc: sw    ra, 36(sp)
-// 0x0106c000: 0x106c000: beq   v1, zero, 0x106c03c addu  v0, a0, zero
+// 0x0106bf0c: 0x106bf0c: sll   zero, zero, 0
+// 0x0106bf10: 0x106bf10: beq   v1, zero, 0x106bfa8 addu  v0, zero, zero
 	ldloc 7
-	ldloc.1
+	ldc.i4.s 0
 	stloc 5
-	brfalse L_106c03c
+	brfalse L_106bfa8
 // --- basic block ---
-// 0x0106c008: 0x106c008: beq   a0, zero, 0x106c03c lui   a0, 0x70000
-	ldloc.1
+// 0x0106bf18: 0x106bf18: lui   v0, 0x70000
 	ldc.i4 458752
-	stloc.1
-	brfalse L_106c03c
-// --- basic block ---
-// 0x0106c010: 0x106c010: lw    a1, 17568(a0)
+	stloc 5
+// 0x0106bf1c: 0x106bf1c: lw    v0, 18028(v0)
 	ldloc 6
-	ldloc.1
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4392
+	ldc.i4 4507
 	add
 	ldelem.i4
+	stloc 5
+// 0x0106bf20: 0x106bf20: sll   zero, zero, 0
+// 0x0106bf24: 0x106bf24: bne   v0, zero, 0x106bf50 lui   a0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc.1
+	brtrue L_106bf50
+// --- basic block ---
+// 0x0106bf2c: 0x106bf2c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106bf30: 0x106bf30: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106bf34: 0x106bf34: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
 	stloc.2
-// 0x0106c014: 0x106c014: sll   zero, zero, 0
-// 0x0106c018: 0x106c018: bne   a1, zero, 0x106c03c sll   zero, zero, 0
+// 0x0106bf38: 0x106bf38: addiu a3, a3, 21960
+	ldloc 4
+	ldc.i4 21960
+	add
+	stloc 4
+// 0x0106bf3c: 0x106bf3c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106bf40: 0x106bf40: jal   0x100449c addiu a2, zero, 3985
+	ldc.i4 3985
+	stloc.3
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	brtrue L_106c03c
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106c020: 0x106c020: sw    v0, 17568(a0)
-	ldloc 6
+// 0x0106bf48: 0x106bf48: j	 0x106bfa8 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_106bfa8
+// --- basic block ---
+L_106bf50:
+// 0x0106bf50: 0x106bf50: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106bf54: 0x106bf54: addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+// 0x0106bf58: 0x106bf58: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 4392
+	ldc.i4 18192
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106c024: 0x106c024: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-// 0x0106c028: 0x106c028: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106c02c: 0x106c02c: jal   0x106bf14 sw    v1, 17572(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4393
+	stloc.1
+// 0x0106bf5c: 0x106bf5c: addiu a3, a3, -1444
+	ldloc 4
+	ldc.i4 -1444
 	add
-	ldloc 7
-	stelem.i4
+	stloc 4
+// 0x0106bf60: 0x106bf60: jal   0x10757e4 addiu a2, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::TestLoginDetails_106bf14(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RTNet_NavigateTo_10757e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106c034: 0x106c034: j	 0x106c06c sll   zero, zero, 0
-	br L_106c06c
+// 0x0106bf68: 0x106bf68: beq   v0, zero, 0x106bf88 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_106bf88
 // --- basic block ---
-L_106c03c:
-// 0x0106c03c: 0x106c03c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106c040: 0x106c040: lw    t0, 17568(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 4392
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106c044: 0x106c044: lui   a1, 0x10000
+// 0x0106bf70: 0x106bf70: lui   a3, 0x10000
 	ldc.i4 65536
+	stloc 4
+// 0x0106bf74: 0x106bf74: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
 	stloc.2
-// 0x0106c048: 0x106c048: lui   a3, 0x10000
+// 0x0106bf78: 0x106bf78: addiu a3, a3, 22048
+	ldloc 4
+	ldc.i4 22048
+	add
+	stloc 4
+// 0x0106bf7c: 0x106bf7c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106bf80: 0x106bf80: j	 0x106bf9c addiu a2, zero, 3994
+	ldc.i4 3994
+	stloc.3
+	br L_106bf9c
+// --- basic block ---
+L_106bf88:
+// 0x0106bf88: 0x106bf88: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106c04c: 0x106c04c: addiu a1, a1, 20732
+// 0x0106bf8c: 0x106bf8c: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106c050: 0x106c050: addiu a3, a3, 21996
+// 0x0106bf90: 0x106bf90: addiu a3, a3, 22080
 	ldloc 4
-	ldc.i4 21996
+	ldc.i4 22080
 	add
 	stloc 4
-// 0x0106c054: 0x106c054: addiu a0, zero, 4
+// 0x0106bf94: 0x106bf94: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106c058: 0x106c058: addiu a2, zero, 3949
-	ldc.i4 3949
+// 0x0106bf98: 0x106bf98: addiu a2, zero, 3996
+	ldc.i4 3996
 	stloc.3
-// 0x0106c05c: 0x106c05c: sw    v1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106c060: 0x106c060: sw    v0, 20(sp)
+L_106bf9c:
+// 0x0106bf9c: 0x106bf9c: jal   0x100449c sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 10
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106c064: 0x106c064: jal   0x100449c sw    t0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4000,14 +3883,29 @@ L_106c03c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106c06c:
-// 0x0106c06c: 0x106c06c: lw    ra, 36(sp)
-// 0x0106c070: 0x106c070: addiu v0, zero, 1
-	ldc.i4.1
+// 0x0106bfa4: 0x106bfa4: lw    v0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
 	stloc 5
-// 0x0106c074: 0x106c074: jr    ra addiu sp, sp, 40
+L_106bfa8:
+// 0x0106bfa8: 0x106bfa8: lw    ra, 52(sp)
+// 0x0106bfac: 0x106bfac: lw    s0, 48(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106bfb0: 0x106bfb0: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -4017,25 +3915,25 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RemoveWazerNearby_106c07c(int32,int32,int32,int32,int32)
+.method public static int32 LoginDetailsChanged_106bfb8(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
 // local  8 is register ra
-// local  7 is register mem
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4049,150 +3947,289 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c07c: 0x106c07c: lui   v0, 0x0
-	ldc.i4.s 0
+// 0x0106bfb8: 0x106bfb8: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x0106c080: 0x106c080: lw    a0, 15056(v0)
-	ldloc 7
+// 0x0106bfbc: 0x106bfbc: lw    v1, 18448(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3764
+	ldc.i4 4612
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106c084: 0x106c084: addiu sp, sp, -24
+	stloc 7
+// 0x0106bfc0: 0x106bfc0: addiu sp, sp, -408
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4 -408
 	add
 	stloc.0
-// 0x0106c088: 0x106c088: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x0106c08c: 0x106c08c: beq   a0, v1, 0x106c098 sw    ra, 20(sp)
+// 0x0106bfc4: 0x106bfc4: sw    ra, 404(sp)
+// 0x0106bfc8: 0x106bfc8: beq   v1, zero, 0x106c0a0 addu  v0, zero, zero
+	ldloc 7
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_106c0a0
+// --- basic block ---
+// 0x0106bfd0: 0x106bfd0: lui   a0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x0106bfd4: 0x106bfd4: lb    v0, -18592(a0)
 	ldloc.1
-	ldloc 6
-	beq  L_106c098
+	ldc.i4 -18592
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0106bfd8: 0x106bfd8: sll   zero, zero, 0
+// 0x0106bfdc: 0x106bfdc: beq   v0, zero, 0x106bff8 addiu a0, a0, -18592
+	ldloc 5
+	ldloc.1
+	ldc.i4 -18592
+	add
+	stloc.1
+	brfalse L_106bff8
 // --- basic block ---
-// 0x0106c094: 0x106c094: sw    v1, 15056(v0)
-	ldloc 7
+// 0x0106bfe4: 0x106bfe4: addiu a1, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.2
+// 0x0106bfe8: 0x106bfe8: jal   0x1067b74 addiu a2, zero, 63
+	ldc.i4.s 63
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106bff0: 0x106bff0: j	 0x106c000 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106c000
+// --- basic block ---
+L_106bff8:
+// 0x0106bff8: 0x106bff8: sb    zero, 16(sp)
+	ldloc.0
+	ldc.i4.s 16
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0106bffc: 0x106bffc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_106c000:
+// 0x0106c000: 0x106c000: lb    v0, -18528(v0)
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3764
+	ldc.i4 -18528
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0106c004: 0x106c004: sll   zero, zero, 0
+// 0x0106c008: 0x106c008: beq   v0, zero, 0x106c028 lui   a0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc.1
+	brfalse L_106c028
+// --- basic block ---
+// 0x0106c010: 0x106c010: addiu a0, a0, -18528
+	ldloc.1
+	ldc.i4 -18528
+	add
+	stloc.1
+// 0x0106c014: 0x106c014: addiu a1, sp, 144
+	ldloc.0
+	ldc.i4 144
+	add
+	stloc.2
+// 0x0106c018: 0x106c018: jal   0x1067b74 addiu a2, zero, 63
+	ldc.i4.s 63
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106c020: 0x106c020: j	 0x106c030 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106c030
+// --- basic block ---
+L_106c028:
+// 0x0106c028: 0x106c028: sb    zero, 144(sp)
+	ldloc.0
+	ldc.i4 144
 	add
-	ldloc 6
-	stelem.i4
-L_106c098:
-// 0x0106c098: 0x106c098: addu  v1, zero, zero
 	ldc.i4.s 0
-	stloc 6
-// 0x0106c09c: 0x106c09c: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x0106c0a0: 0x106c0a0: cibyl_sysc 0x20ee
-	call int32 [WazeWP7]Syscalls::time(int32)
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0106c02c: 0x106c02c: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0106c0a4: 0x106c0a4: addu  v1, v0, zero
+L_106c030:
+// 0x0106c030: 0x106c030: lb    v0, -18464(v0)
 	ldloc 5
-	stloc 6
-// 0x0106c0a8: 0x106c0a8: lui   v0, 0x70000
-	ldc.i4 458752
+	ldc.i4 -18464
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0106c0ac: 0x106c0ac: lw    a0, 17632(v0)
-	ldloc 7
+// 0x0106c034: 0x106c034: sll   zero, zero, 0
+// 0x0106c038: 0x106c038: beq   v0, zero, 0x106c058 lui   a0, 0x80000
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4408
+	ldc.i4 524288
+	stloc.1
+	brfalse L_106c058
+// --- basic block ---
+// 0x0106c040: 0x106c040: addiu a0, a0, -18464
+	ldloc.1
+	ldc.i4 -18464
 	add
-	ldelem.i4
 	stloc.1
-// 0x0106c0b0: 0x106c0b0: lui   a1, 0x70000
-	ldc.i4 458752
+// 0x0106c044: 0x106c044: addiu a1, sp, 272
+	ldloc.0
+	ldc.i4 272
+	add
 	stloc.2
-// 0x0106c0b4: 0x106c0b4: beq   a0, zero, 0x106c0d4 sw    v1, 17636(a1)
+// 0x0106c048: 0x106c048: jal   0x1067b74 addiu a2, zero, 63
+	ldc.i4.s 63
+	stloc.3
 	ldloc.1
-	ldloc 7
 	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4 4409
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106c050: 0x106c050: j	 0x106c060 lui   a1, 0x70000
+	ldc.i4 458752
+	stloc.2
+	br L_106c060
+// --- basic block ---
+L_106c058:
+// 0x0106c058: 0x106c058: sb    zero, 272(sp)
+	ldloc.0
+	ldc.i4 272
 	add
-	ldloc 6
-	stelem.i4
-	brfalse L_106c0d4
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0106c05c: 0x106c05c: lui   a1, 0x70000
+	ldc.i4 458752
+	stloc.2
+L_106c060:
+// 0x0106c060: 0x106c060: addiu a1, a1, 18192
+	ldloc.2
+	ldc.i4 18192
+	add
+	stloc.2
+// 0x0106c064: 0x106c064: jal   0x1001b14 addiu a0, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
 // --- basic block ---
-// 0x0106c0bc: 0x106c0bc: jal   0x102146c sw    zero, 17632(v0)
-	ldloc 7
+// 0x0106c06c: 0x106c06c: bne   v0, zero, 0x106c09c lui   a1, 0x70000
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4408
+	ldc.i4 458752
+	stloc.2
+	brtrue L_106c09c
+// --- basic block ---
+// 0x0106c074: 0x106c074: addiu a1, a1, 18256
+	ldloc.2
+	ldc.i4 18256
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc.2
+// 0x0106c078: 0x106c078: jal   0x1001b14 addiu a0, sp, 144
 	ldloc.0
+	ldc.i4 144
+	add
+	stloc.1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0106c0c4: 0x106c0c4: bne   v0, zero, 0x106c0d4 sll   zero, zero, 0
+// 0x0106c080: 0x106c080: bne   v0, zero, 0x106c09c lui   a1, 0x70000
 	ldloc 5
-	brtrue L_106c0d4
+	ldc.i4 458752
+	stloc.2
+	brtrue L_106c09c
 // --- basic block ---
-// 0x0106c0cc: 0x106c0cc: jal   0x1021900 sll   zero, zero, 0
+// 0x0106c088: 0x106c088: addiu a1, a1, 18320
+	ldloc.2
+	ldc.i4 18320
+	add
+	stloc.2
+// 0x0106c08c: 0x106c08c: jal   0x1001b14 addiu a0, sp, 272
 	ldloc.0
+	ldc.i4 272
+	add
+	stloc.1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x0106c094: 0x106c094: j	 0x106c0a0 sltu  v0, zero, v0
+	ldc.i4.s 0
+	ldloc 5
+	clt.un
 	stloc 5
+	br L_106c0a0
 // --- basic block ---
-L_106c0d4:
-// 0x0106c0d4: 0x106c0d4: lw    ra, 20(sp)
-// 0x0106c0d8: 0x106c0d8: sll   zero, zero, 0
-// 0x0106c0dc: 0x106c0dc: jr    ra addiu sp, sp, 24
+L_106c09c:
+// 0x0106c09c: 0x106c09c: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+L_106c0a0:
+// 0x0106c0a0: 0x106c0a0: lw    ra, 404(sp)
+// 0x0106c0a4: 0x106c0a4: sll   zero, zero, 0
+// 0x0106c0a8: 0x106c0a8: jr    ra addiu sp, sp, 408
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4 408
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 wazer_nearby_timeout_106c0e4(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_ResetLoginState_106c0b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
 // local  0 is register sp
-// local  5 is register ra
+// local  9 is register ra
 // local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4201,26 +4238,40 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c0e4: 0x106c0e4: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106c0e8: 0x106c0e8: addiu sp, sp, -24
+// 0x0106c0b0: 0x106c0b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c0ec: 0x106c0ec: sw    ra, 20(sp)
-// 0x0106c0f0: 0x106c0f0: jal   0x104fd00 addiu a0, a0, -16156
+// 0x0106c0b4: 0x106c0b4: sw    s0, 16(sp)
+	ldloc 8
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106c0b8: 0x106c0b8: addu  s0, a0, zero
 	ldloc.1
-	ldc.i4 -16156
+	stloc 7
+// 0x0106c0bc: 0x106c0bc: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106c0c0: 0x106c0c0: sw    ra, 20(sp)
+// 0x0106c0c4: 0x106c0c4: jal   0x10861c8 addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
 	add
 	stloc.1
 	ldloc.0
@@ -4228,56 +4279,186 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl100::RTConnectionInfo_ResetLogin_10861c8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c0cc: 0x106c0cc: lui   a0, 0xf0000
+	ldc.i4 983040
+	stloc.1
+// 0x0106c0d0: 0x106c0d0: jal   0x108d700 addiu a0, a0, -29592
+	ldloc.1
+	ldc.i4 -29592
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c0d8: 0x106c0d8: lui   a0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x0106c0dc: 0x106c0dc: jal   0x108d6e4 addiu a0, a0, -18608
+	ldloc.1
+	ldc.i4 -18608
+	add
+	stloc.1
+	ldloc.1
+	call void Cibyl105::StatusStatistics_Reset_108d6e4(int32)
+// --- basic block ---
+// 0x0106c0e4: 0x106c0e4: jal   0x1072618 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1072618(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106c0f8: 0x106c0f8: jal   0x106c07c sll   zero, zero, 0
+// 0x0106c0ec: 0x106c0ec: jal   0x108da28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RemoveWazerNearby_106c07c(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessageQueue_Empty_108da28(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c0f4: 0x106c0f4: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106c0f8: 0x106c0f8: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106c0fc: 0x106c0fc: addiu a0, a0, 15012
+	ldloc.1
+	ldc.i4 15012
+	add
+	stloc.1
+// 0x0106c100: 0x106c100: jal   0x100e5d0 addiu a1, a1, 9420
+	ldloc.2
+	ldc.i4 9420
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c108: 0x106c108: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106c10c: 0x106c10c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106c110: 0x106c110: addiu a0, a0, 15028
+	ldloc.1
+	ldc.i4 15028
+	add
+	stloc.1
+// 0x0106c114: 0x106c114: jal   0x100e5d0 addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c11c: 0x106c11c: jal   0x100ea60 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c124: 0x106c124: beq   s0, zero, 0x106c134 sll   zero, zero, 0
+	ldloc 7
+	brfalse L_106c134
+// --- basic block ---
+// 0x0106c12c: 0x106c12c: jal   0x1021910 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106c100: 0x106c100: lw    ra, 20(sp)
-// 0x0106c104: 0x106c104: sll   zero, zero, 0
-// 0x0106c108: 0x106c108: jr    ra addiu sp, sp, 24
+L_106c134:
+// 0x0106c134: 0x106c134: lw    ra, 20(sp)
+// 0x0106c138: 0x106c138: lw    s0, 16(sp)
+	ldloc 8
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106c13c: 0x106c13c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 RealTime_Auth_106c110(int32,int32,int32,int32,int32)
+.method public static int32 Login_106c144(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
+// local  7 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  9 is register ra
-// local  5 is register mem
+// local 10 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4287,164 +4468,332 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c110: 0x106c110: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x0106c114: 0x106c114: lw    a1, 17988(v0)
+// 0x0106c144: 0x106c144: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106c148: 0x106c148: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0106c14c: 0x106c14c: lui   a2, 0x0
+	ldc.i4.s 0
+	stloc.3
+// 0x0106c150: 0x106c150: sw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106c154: 0x106c154: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0106c158: 0x106c158: sw    v0, 15052(a2)
+	ldloc 6
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4 3763
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106c15c: 0x106c15c: lb    v1, -18592(s0)
+	ldloc 7
+	ldc.i4 -18592
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 8
+// 0x0106c160: 0x106c160: lui   a2, 0x0
+	ldc.i4.s 0
+	stloc.3
+// 0x0106c164: 0x106c164: sw    v0, 15044(a2)
+	ldloc 6
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4 3761
+	add
 	ldloc 5
+	stelem.i4
+// 0x0106c168: 0x106c168: lui   a2, 0x0
+	ldc.i4.s 0
+	stloc.3
+// 0x0106c16c: 0x106c16c: sw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106c170: 0x106c170: sw    ra, 36(sp)
+// 0x0106c174: 0x106c174: sw    v0, 15048(a2)
 	ldloc 6
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 4497
+	ldc.i4 3762
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106c178: 0x106c178: beq   v1, zero, 0x106c1dc addu  s1, a0, zero
+	ldloc 8
+	ldloc.1
+	stloc 9
+	brfalse L_106c1dc
+// --- basic block ---
+// 0x0106c180: 0x106c180: addiu s0, s0, -18592
+	ldloc 7
+	ldc.i4 -18592
+	add
+	stloc 7
+// 0x0106c184: 0x106c184: lb    v0, 64(s0)
+	ldloc 7
+	ldc.i4.s 64
 	add
-	ldelem.i4
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0106c188: 0x106c188: sll   zero, zero, 0
+// 0x0106c18c: 0x106c18c: beq   v0, zero, 0x106c1dc lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brfalse L_106c1dc
+// --- basic block ---
+// 0x0106c194: 0x106c194: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0106c118: 0x106c118: addiu sp, sp, -328
-	ldloc.0
-	ldc.i4 -328
+// 0x0106c198: 0x106c198: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	stloc.0
-// 0x0106c11c: 0x106c11c: sw    ra, 324(sp)
-// 0x0106c120: 0x106c120: sw    s0, 320(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 80
+	stloc.2
+// 0x0106c19c: 0x106c19c: addiu a3, a3, 22148
+	ldloc 4
+	ldc.i4 22148
 	add
-	ldloc 8
-	stelem.i4
-// 0x0106c124: 0x106c124: sw    a1, 312(sp)
-	ldloc 5
+	stloc 4
+// 0x0106c1a0: 0x106c1a0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106c1a4: 0x106c1a4: addiu a2, zero, 2566
+	ldc.i4 2566
+	stloc.3
+// 0x0106c1a8: 0x106c1a8: jal   0x100449c sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 78
+	ldc.i4.4
 	add
-	ldloc.2
+	ldloc 7
 	stelem.i4
-// 0x0106c128: 0x106c128: jal   0x102c3f0 addiu s0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x0106c130: 0x106c130: lw    a1, 312(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 78
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106c134: 0x106c134: lui   a2, 0x70000
+// 0x0106c1b0: 0x106c1b0: lui   a0, 0x70000
 	ldc.i4 458752
+	stloc.1
+// 0x0106c1b4: 0x106c1b4: lui   a2, 0x80000
+	ldc.i4 524288
 	stloc.3
-// 0x0106c138: 0x106c138: lui   a3, 0x80000
+// 0x0106c1b8: 0x106c1b8: lui   a3, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x0106c13c: 0x106c13c: addu  a0, s0, zero
-	ldloc 8
+// 0x0106c1bc: 0x106c1bc: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
 	stloc.1
-// 0x0106c140: 0x106c140: addiu v1, zero, 70
-	ldc.i4.s 70
-	stloc 7
-// 0x0106c144: 0x106c144: addiu a2, a2, 17920
+// 0x0106c1c0: 0x106c1c0: addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+// 0x0106c1c4: 0x106c1c4: addiu a2, a2, -18528
 	ldloc.3
-	ldc.i4 17920
+	ldc.i4 -18528
 	add
 	stloc.3
-// 0x0106c148: 0x106c148: addiu a3, a3, -19056
+// 0x0106c1c8: 0x106c1c8: addiu a3, a3, -18464
 	ldloc 4
-	ldc.i4 -19056
+	ldc.i4 -18464
 	add
 	stloc 4
-// 0x0106c14c: 0x106c14c: sw    v1, 16(sp)
-	ldloc 5
+// 0x0106c1cc: 0x106c1cc: jal   0x10759d8 sw    s1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x0106c150: 0x106c150: jal   0x1072020 sw    v0, 20(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RTNet_Login_10759d8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106c1d4: 0x106c1d4: j	 0x106c230 sll   zero, zero, 0
+	br L_106c230
+// --- basic block ---
+L_106c1dc:
+// 0x0106c1dc: 0x106c1dc: bne   a1, zero, 0x106c204 lui   v0, 0x10000
+	ldloc.2
+	ldc.i4 65536
+	stloc 5
+	brtrue L_106c204
+// --- basic block ---
+// 0x0106c1e4: 0x106c1e4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106c1e8: 0x106c1e8: addiu a1, v0, 21196
 	ldloc 5
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106c1ec: 0x106c1ec: addiu a3, a3, 22184
+	ldloc 4
+	ldc.i4 22184
+	add
+	stloc 4
+// 0x0106c1f0: 0x106c1f0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106c1f4: 0x106c1f4: jal   0x100449c addiu a2, zero, 2576
+	ldc.i4 2576
+	stloc.3
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106c1fc: 0x106c1fc: j	 0x106c230 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_106c230
+// --- basic block ---
+L_106c204:
+// 0x0106c204: 0x106c204: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106c208: 0x106c208: addiu a1, v0, 21196
+	ldloc 5
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106c20c: 0x106c20c: addiu a3, a3, 22280
+	ldloc 4
+	ldc.i4 22280
+	add
+	stloc 4
+// 0x0106c210: 0x106c210: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c214: 0x106c214: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106c218: 0x106c218: addiu a2, zero, 2582
+	ldc.i4 2582
+	stloc.3
+// 0x0106c21c: 0x106c21c: jal   0x100449c sw    s1, 18040(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4510
 	add
-	ldloc 6
+	ldloc 9
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_Auth_BuildCommand_1072020(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x0106c158: 0x106c158: jal   0x108e3a8 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-	ldloc.0
+// 0x0106c224: 0x106c224: jal   0x10a0b2c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl106::Realtime_OfflineWrite_108e3a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl119::roadmap_login_new_existing_dlg_10a0b2c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x0106c160: 0x106c160: lw    ra, 324(sp)
-// 0x0106c164: 0x106c164: lw    s0, 320(sp)
-	ldloc 5
+// 0x0106c22c: 0x106c22c: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+L_106c230:
+// 0x0106c230: 0x106c230: lw    ra, 36(sp)
+// 0x0106c234: 0x106c234: lw    s1, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 80
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106c168: 0x106c168: jr    ra addiu sp, sp, 328
+	stloc 9
+// 0x0106c238: 0x106c238: lw    s0, 28(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4 328
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106c23c: 0x106c23c: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Relogin_106c244(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
 // local  6 is register v1
@@ -4453,8 +4802,8 @@ __CIBYL_function_return:
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -4471,98 +4820,65 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c170: 0x106c170: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106c174: 0x106c174: addiu v0, v0, 17728
-	ldloc 5
-	ldc.i4 17728
-	add
-	stloc 5
-// 0x0106c178: 0x106c178: lw    v1, 256(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 64
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106c17c: 0x106c17c: addiu sp, sp, -24
+// 0x0106c244: 0x106c244: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c180: 0x106c180: beq   v1, zero, 0x106c1c0 sw    ra, 20(sp)
-	ldloc 6
-	brfalse L_106c1c0
-// --- basic block ---
-// 0x0106c188: 0x106c188: lw    v0, 28696(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 7174
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106c18c: 0x106c18c: sll   zero, zero, 0
-// 0x0106c190: 0x106c190: addiu v1, v0, -11
-	ldloc 5
-	ldc.i4.s -11
-	add
-	stloc 6
-// 0x0106c194: 0x106c194: sltiu v1, v1, 5
-	ldloc 6
-	ldc.i4.5
-	clt.un
+// 0x0106c248: 0x106c248: sw    ra, 20(sp)
+// 0x0106c24c: 0x106c24c: jal   0x106c0b0 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_ResetLoginState_106c0b0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x0106c198: 0x106c198: bne   v1, zero, 0x106c1c0 addiu v0, v0, -23
-	ldloc 6
-	ldloc 5
-	ldc.i4.s -23
-	add
-	stloc 5
-	brtrue L_106c1c0
-// --- basic block ---
-// 0x0106c1a0: 0x106c1a0: sltiu v0, v0, 5
-	ldloc 5
-	ldc.i4.5
-	clt.un
 	stloc 5
-// 0x0106c1a4: 0x106c1a4: bne   v0, zero, 0x106c1c0 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_106c1c0
 // --- basic block ---
-// 0x0106c1ac: 0x106c1ac: jal   0x1068fb4 sll   zero, zero, 0
-	call int32 Cibyl78::websvc_trans_getLastNetConnectRes_1068fb4()
+// 0x0106c254: 0x106c254: jal   0x106b52c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_LoginDetailsInit_106b52c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106c1b4: 0x106c1b4: xori  v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	xor
-	stloc 5
-// 0x0106c1b8: 0x106c1b8: j	 0x106c1c4 sltiu v0, v0, 1
-	ldloc 5
+// 0x0106c25c: 0x106c25c: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x0106c260: 0x106c260: addiu a0, a0, 5572
+	ldloc.1
+	ldc.i4 5572
+	add
+	stloc.1
+// 0x0106c264: 0x106c264: jal   0x106c144 addiu a1, zero, 1
 	ldc.i4.1
-	clt.un
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Login_106c144(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	br L_106c1c4
 // --- basic block ---
-L_106c1c0:
-// 0x0106c1c0: 0x106c1c0: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_106c1c4:
-// 0x0106c1c4: 0x106c1c4: lw    ra, 20(sp)
-// 0x0106c1c8: 0x106c1c8: sll   zero, zero, 0
-// 0x0106c1cc: 0x106c1cc: jr    ra addiu sp, sp, 24
+// 0x0106c26c: 0x106c26c: lw    ra, 20(sp)
+// 0x0106c270: 0x106c270: sll   zero, zero, 0
+// 0x0106c274: 0x106c274: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4574,27 +4890,26 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_UpdateProfile_106c1d4(int32,int32,int32,int32,int32)
+.method public static int32 OnMapMoved_106c27c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 t0,int32 t1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
 
-// local  6 is register v0
-// local  5 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
-// local 10 is register t1
+// local  8 is register s0
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local  9 is register ra
+// local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 6
 	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4604,144 +4919,225 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c1d4: 0x106c1d4: addiu sp, sp, -32
+// 0x0106c27c: 0x106c27c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c280: 0x106c280: lw    v0, 18028(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106c284: 0x106c284: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c1d8: 0x106c1d8: addu  v1, a2, zero
-	ldloc.3
-	stloc 5
-// 0x0106c1dc: 0x106c1dc: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x0106c1e0: 0x106c1e0: sw    a3, 16(sp)
-	ldloc 7
+// 0x0106c288: 0x106c288: sw    ra, 20(sp)
+// 0x0106c28c: 0x106c28c: beq   v0, zero, 0x106c2a8 sw    s0, 16(sp)
+	ldloc 5
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 4
+	ldloc 8
 	stelem.i4
-// 0x0106c1e4: 0x106c1e4: addiu v0, v0, 17728
+	brfalse L_106c2a8
+// --- basic block ---
+// 0x0106c294: 0x106c294: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c298: 0x106c298: lw    v0, 18448(v0)
 	ldloc 6
-	ldc.i4 17728
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4612
 	add
-	stloc 6
-// 0x0106c1e8: 0x106c1e8: addu  a3, v1, zero
+	ldelem.i4
+	stloc 5
+// 0x0106c29c: 0x106c29c: sll   zero, zero, 0
+// 0x0106c2a0: 0x106c2a0: bne   v0, zero, 0x106c2b8 lui   s0, 0x70000
 	ldloc 5
-	stloc 4
-// 0x0106c1ec: 0x106c1ec: addiu v1, zero, 1
-	ldc.i4.1
+	ldc.i4 458752
+	stloc 8
+	brtrue L_106c2b8
+// --- basic block ---
+L_106c2a8:
+// 0x0106c2a8: 0x106c2a8: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x0106c1f0: 0x106c1f0: sw    v1, 28688(v0)
-	ldloc 7
+// 0x0106c2ac: 0x106c2ac: lw    v0, 18064(v0)
 	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4 4516
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106c2b0: 0x106c2b0: j	 0x106c300 sll   zero, zero, 0
+	br L_106c300
+// --- basic block ---
+L_106c2b8:
+// 0x0106c2b8: 0x106c2b8: lw    v0, 18068(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4517
 	add
+	ldelem.i4
+	stloc 5
+// 0x0106c2bc: 0x106c2bc: sll   zero, zero, 0
+// 0x0106c2c0: 0x106c2c0: bne   v0, zero, 0x106c2e4 addu  v1, zero, zero
 	ldloc 5
-	stelem.i4
-// 0x0106c1f4: 0x106c1f4: lui   v1, 0x1070000
+	ldc.i4.s 0
+	stloc 7
+	brtrue L_106c2e4
+// --- basic block ---
+// 0x0106c2c8: 0x106c2c8: lui   a1, 0x1070000
 	ldc.i4 17235968
-	stloc 5
-// 0x0106c1f8: 0x106c1f8: addu  t1, a0, zero
-	ldloc.1
-	stloc 10
-// 0x0106c1fc: 0x106c1fc: addu  t0, a1, zero
+	stloc.2
+// 0x0106c2cc: 0x106c2cc: addiu a1, a1, -7208
 	ldloc.2
-	stloc 9
-// 0x0106c200: 0x106c200: addiu v1, v1, -684
-	ldloc 5
-	ldc.i4 -684
+	ldc.i4 -7208
 	add
-	stloc 5
-// 0x0106c204: 0x106c204: sw    v1, 20(sp)
-	ldloc 7
+	stloc.2
+// 0x0106c2d0: 0x106c2d0: jal   0x104fea8 addiu a0, zero, 1000
+	ldc.i4 1000
+	stloc.1
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106c2d8: 0x106c2d8: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0106c2dc: 0x106c2dc: sw    v0, 18068(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4517
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106c208: 0x106c208: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x0106c20c: 0x106c20c: addu  a1, t1, zero
-	ldloc 10
-	stloc.2
-// 0x0106c210: 0x106c210: sw    zero, 28696(v0)
+// 0x0106c2e0: 0x106c2e0: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+L_106c2e4:
+// 0x0106c2e4: 0x106c2e4: cibyl_sysc_arg 0x3
 	ldloc 7
+// 0x0106c2e8: 0x106c2e8: cibyl_sysc 0x20e9
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 5
+// 0x0106c2ec: 0x106c2ec: addu  v1, v0, zero
+	ldloc 5
+	stloc 7
+// 0x0106c2f0: 0x106c2f0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c2f4: 0x106c2f4: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106c2f8: 0x106c2f8: lw    v0, 18064(v0)
 	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4 4516
 	add
-	ldc.i4.s 0
+	ldelem.i4
+	stloc 5
+// 0x0106c2fc: 0x106c2fc: sw    v1, 18072(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 4518
+	add
+	ldloc 7
 	stelem.i4
-// 0x0106c214: 0x106c214: sw    ra, 28(sp)
-// 0x0106c218: 0x106c218: jal   0x1073ac0 addu  a2, t0, zero
-	ldloc 9
-	stloc.3
+L_106c300:
+// 0x0106c300: 0x106c300: beq   v0, zero, 0x106c310 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106c310
+// --- basic block ---
+// 0x0106c308: 0x106c308: jalr  v0 sll   zero, zero, 0
+	ldloc 5
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_UpdateProfile_1073ac0(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	stloc 6
 // --- basic block ---
-// 0x0106c220: 0x106c220: lw    ra, 28(sp)
-// 0x0106c224: 0x106c224: sll   zero, zero, 0
-// 0x0106c228: 0x106c228: jr    ra addiu sp, sp, 32
+L_106c310:
+// 0x0106c310: 0x106c310: lw    ra, 20(sp)
+// 0x0106c314: 0x106c314: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106c318: 0x106c318: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 Realtime_CreateAccount_106c230(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 t0,int32 t1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
 
 // local  6 is register v0
-// local  5 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
-// local 10 is register t1
 // local  0 is register sp
 // local  8 is register ra
-// local  7 is register mem
+// local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 5
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4750,143 +5146,199 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c230: 0x106c230: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106c234: 0x106c234: addu  v1, a2, zero
-	ldloc.3
-	stloc 5
-// 0x0106c238: 0x106c238: lui   v0, 0x70000
+// 0x0106c320: 0x106c320: lui   v1, 0x70000
 	ldc.i4 458752
-	stloc 6
-// 0x0106c23c: 0x106c23c: sw    a3, 16(sp)
+	stloc 7
+// 0x0106c324: 0x106c324: lw    v0, 18048(v1)
+	ldloc 5
 	ldloc 7
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4512
 	add
-	ldloc 4
-	stelem.i4
-// 0x0106c240: 0x106c240: addiu v0, v0, 17728
+	ldelem.i4
+	stloc 6
+// 0x0106c328: 0x106c328: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106c32c: 0x106c32c: bne   v0, a0, 0x106c35c sw    ra, 36(sp)
 	ldloc 6
-	ldc.i4 17728
+	ldloc.1
+	bne.un L_106c35c
+// --- basic block ---
+// 0x0106c334: 0x106c334: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106c338: 0x106c338: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106c33c: 0x106c33c: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106c340: 0x106c340: addiu a3, a3, 22352
+	ldloc 4
+	ldc.i4 22352
 	add
-	stloc 6
-// 0x0106c244: 0x106c244: addu  a3, v1, zero
-	ldloc 5
 	stloc 4
-// 0x0106c248: 0x106c248: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0106c24c: 0x106c24c: sw    v1, 28688(v0)
-	ldloc 7
-	ldloc 6
+// 0x0106c344: 0x106c344: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106c348: 0x106c348: addiu a2, zero, 816
+	ldc.i4 816
+	stloc.3
+// 0x0106c34c: 0x106c34c: jal   0x100449c sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 6
 	stelem.i4
-// 0x0106c250: 0x106c250: lui   v1, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106c254: 0x106c254: addu  t1, a0, zero
+	ldloc.0
 	ldloc.1
-	stloc 10
-// 0x0106c258: 0x106c258: addu  t0, a1, zero
 	ldloc.2
-	stloc 9
-// 0x0106c25c: 0x106c25c: addiu v1, v1, -684
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106c354: 0x106c354: j	 0x106c398 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_106c398
+// --- basic block ---
+L_106c35c:
+// 0x0106c35c: 0x106c35c: lui   a1, 0x70000
+	ldc.i4 458752
+	stloc.2
+// 0x0106c360: 0x106c360: addiu a1, a1, 18192
+	ldloc.2
+	ldc.i4 18192
+	add
+	stloc.2
+// 0x0106c364: 0x106c364: lw    a2, 28688(a1)
 	ldloc 5
-	ldc.i4 -684
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4 7172
 	add
-	stloc 5
-// 0x0106c260: 0x106c260: sw    v1, 20(sp)
+	ldelem.i4
+	stloc.3
+// 0x0106c368: 0x106c368: sll   zero, zero, 0
+// 0x0106c36c: 0x106c36c: bne   a2, zero, 0x106c398 sw    a0, 18048(v1)
+	ldloc.3
+	ldloc 5
 	ldloc 7
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4512
 	add
-	ldloc 5
+	ldloc.1
 	stelem.i4
-// 0x0106c264: 0x106c264: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x0106c268: 0x106c268: addu  a1, t1, zero
-	ldloc 10
-	stloc.2
-// 0x0106c26c: 0x106c26c: sw    zero, 28696(v0)
+	brtrue L_106c398
+// --- basic block ---
+// 0x0106c374: 0x106c374: lw    v1, 256(a1)
+	ldloc 5
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 64
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106c378: 0x106c378: sll   zero, zero, 0
+// 0x0106c37c: 0x106c37c: beq   v1, zero, 0x106c398 lui   a1, 0x1070000
 	ldloc 7
-	ldloc 6
+	ldc.i4 17235968
+	stloc.2
+	brfalse L_106c398
+// --- basic block ---
+// 0x0106c384: 0x106c384: addiu a1, a1, -15256
+	ldloc.2
+	ldc.i4 -15256
+	add
+	stloc.2
+// 0x0106c388: 0x106c388: addiu a0, zero, 10
+	ldc.i4.s 10
+	stloc.1
+// 0x0106c38c: 0x106c38c: jal   0x104fea8 sw    v0, 24(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4.6
 	add
-	ldc.i4.s 0
+	ldloc 6
 	stelem.i4
-// 0x0106c270: 0x106c270: sw    ra, 28(sp)
-// 0x0106c274: 0x106c274: jal   0x1071e5c addu  a2, t0, zero
-	ldloc 9
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_CreateAccount_1071e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106c27c: 0x106c27c: lw    ra, 28(sp)
-// 0x0106c280: 0x106c280: sll   zero, zero, 0
-// 0x0106c284: 0x106c284: jr    ra addiu sp, sp, 32
+// 0x0106c394: 0x106c394: lw    v0, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 6
+L_106c398:
+// 0x0106c398: 0x106c398: lw    ra, 36(sp)
+// 0x0106c39c: 0x106c39c: sll   zero, zero, 0
+// 0x0106c3a0: 0x106c3a0: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 Realtime_TrafficAlertFeedback_106c28c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SessionDetailsSave_106c3a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4898,90 +5350,127 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c28c: 0x106c28c: addu  v0, a0, zero
-	ldloc.1
-	stloc 5
-// 0x0106c290: 0x106c290: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106c294: 0x106c294: lui   a0, 0x70000
+// 0x0106c3a8: 0x106c3a8: lui   v0, 0x70000
 	ldc.i4 458752
+	stloc 5
+// 0x0106c3ac: 0x106c3ac: lw    a1, 18452(v0)
+	ldloc 8
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4613
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106c3b0: 0x106c3b0: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x0106c298: 0x106c298: addiu sp, sp, -24
+// 0x0106c3b4: 0x106c3b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c29c: 0x106c29c: addu  a2, a1, zero
+// 0x0106c3b8: 0x106c3b8: sw    ra, 20(sp)
+// 0x0106c3bc: 0x106c3bc: jal   0x100e620 addiu a0, a0, 15012
+	ldloc.1
+	ldc.i4 15012
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	stloc.3
-// 0x0106c2a0: 0x106c2a0: addiu a0, a0, 17728
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c3c4: 0x106c3c4: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106c3c8: 0x106c3c8: lui   a1, 0x70000
+	ldc.i4 458752
+	stloc.2
+// 0x0106c3cc: 0x106c3cc: addiu a0, a0, 15028
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 15028
 	add
 	stloc.1
-// 0x0106c2a4: 0x106c2a4: addu  a1, v0, zero
-	ldloc 5
+// 0x0106c3d0: 0x106c3d0: jal   0x100e5d0 addiu a1, a1, 18384
+	ldloc.2
+	ldc.i4 18384
+	add
 	stloc.2
-// 0x0106c2a8: 0x106c2a8: sw    ra, 20(sp)
-// 0x0106c2ac: 0x106c2ac: jal   0x1073b88 addiu a3, a3, -4752
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 -4752
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106c3d8: 0x106c3d8: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0106c3dc: 0x106c3dc: addiu a0, a0, -26424
+	ldloc.1
+	ldc.i4 -26424
 	add
-	stloc 4
+	stloc.1
+// 0x0106c3e0: 0x106c3e0: jal   0x100e9d4 addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_TrafficAlertFeedback_1073b88(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_one_100e9d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106c2b4: 0x106c2b4: lw    ra, 20(sp)
-// 0x0106c2b8: 0x106c2b8: sll   zero, zero, 0
-// 0x0106c2bc: 0x106c2bc: jr    ra addiu sp, sp, 24
+// 0x0106c3e8: 0x106c3e8: lw    ra, 20(sp)
+// 0x0106c3ec: 0x106c3ec: sll   zero, zero, 0
+// 0x0106c3f0: 0x106c3f0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_Report_Segments_106c2c4(int32,int32,int32,int32,int32)
+.method public static int32 RealTime_WarningInit_106c3f8(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 s0,int32 v1,int32 s2,int32 s3,int32 s4,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
 // local  5 is register v0
-// local  9 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  6 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local 12 is register s4
 // local  0 is register sp
-// local 13 is register ra
+// local  6 is register ra
 // local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4990,347 +5479,67 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
+	stloc 6
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c2c4: 0x106c2c4: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106c2c8: 0x106c2c8: sw    s4, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 12
-	stelem.i4
-// 0x0106c2cc: 0x106c2cc: sw    s1, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 6
-	stelem.i4
-// 0x0106c2d0: 0x106c2d0: sw    s0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106c2d4: 0x106c2d4: sw    ra, 36(sp)
-// 0x0106c2d8: 0x106c2d8: sw    s3, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 11
-	stelem.i4
-// 0x0106c2dc: 0x106c2dc: jal   0x10b5d08 sw    s2, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl135::editor_line_get_count_10b5d08(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106c2e4: 0x106c2e4: addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-// 0x0106c2e8: 0x106c2e8: addu  s0, zero, zero
-	ldc.i4.s 0
-	stloc 8
-// 0x0106c2ec: 0x106c2ec: j	 0x106c300 addu  s4, v0, zero
-	ldloc 5
-	stloc 12
-	br L_106c300
-// --- basic block ---
-L_106c2f4:
-// 0x0106c2f4: 0x106c2f4: jal   0x1072250 addiu s1, s1, 1
-	ldloc 6
-	ldc.i4.1
-	add
-	stloc 6
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::RTNet_ReportOneSegment_MaxLength_1072250(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106c2fc: 0x106c2fc: addu  s0, s0, v0
-	ldloc 8
-	ldloc 5
-	add
-	stloc 8
-L_106c300:
-// 0x0106c300: 0x106c300: slt   v0, s1, s4
-	ldloc 6
-	ldloc 12
-	clt
-	stloc 5
-// 0x0106c304: 0x106c304: bne   v0, zero, 0x106c2f4 addu  a0, s1, zero
-	ldloc 5
-	ldloc 6
-	stloc.1
-	brtrue L_106c2f4
-// --- basic block ---
-// 0x0106c30c: 0x106c30c: beq   s0, zero, 0x106c398 addu  s3, zero, zero
-	ldloc 8
-	ldc.i4.s 0
-	stloc 11
-	brfalse L_106c398
-// --- basic block ---
-// 0x0106c314: 0x106c314: jal   0x1000910 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106c31c: 0x106c31c: addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0106c320: 0x106c320: sb    zero, 0(v0)
-	ldloc 5
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106c324: 0x106c324: addu  s3, v0, zero
-	ldloc 5
-	stloc 11
-// 0x0106c328: 0x106c328: addu  s2, v0, zero
-	ldloc 5
-	stloc 10
-// 0x0106c32c: 0x106c32c: j	 0x106c38c addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_106c38c
-// --- basic block ---
-L_106c334:
-// 0x0106c334: 0x106c334: jal   0x10b57b4 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl135::editor_line_committed_10b57b4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106c33c: 0x106c33c: bne   v0, zero, 0x106c388 addu  a0, s2, zero
-	ldloc 5
-	ldloc 10
-	stloc.1
-	brtrue L_106c388
-// --- basic block ---
-// 0x0106c344: 0x106c344: jal   0x1072688 addu  a1, s1, zero
-	ldloc 6
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::RTNet_ReportOneSegment_Encode_1072688(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106c34c: 0x106c34c: bne   v0, zero, 0x106c37c addu  a0, s2, zero
-	ldloc 5
-	ldloc 10
-	stloc.1
-	brtrue L_106c37c
-// --- basic block ---
-// 0x0106c354: 0x106c354: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106c358: 0x106c358: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106c35c: 0x106c35c: addiu a1, a1, 22088
-	ldloc.2
-	ldc.i4 22088
-	add
-	stloc.2
-// 0x0106c360: 0x106c360: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
+// 0x0106c3f8: 0x106c3f8: lui   a0, 0x1070000
+	ldc.i4 17235968
 	stloc.1
-// 0x0106c364: 0x106c364: jal   0x104bfe4 addiu a2, zero, 5
-	ldc.i4.5
-	stloc.3
+// 0x0106c3fc: 0x106c3fc: addiu sp, sp, -24
 	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106c400: 0x106c400: sw    ra, 20(sp)
+// 0x0106c404: 0x106c404: jal   0x104fd10 addiu a0, a0, -15368
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106c36c: 0x106c36c: jal   0x1000930 addu  a0, s0, zero
-	ldloc 8
+	ldc.i4 -15368
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c374: 0x106c374: j	 0x106c398 addu  s3, zero, zero
+// 0x0106c40c: 0x106c40c: lw    ra, 20(sp)
+// 0x0106c410: 0x106c410: lui   v0, 0x0
 	ldc.i4.s 0
-	stloc 11
-	br L_106c398
-// --- basic block ---
-L_106c37c:
-// 0x0106c37c: 0x106c37c: jal   0x1001b48 sll   zero, zero, 0
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106c384: 0x106c384: addu  s2, s2, v0
-	ldloc 10
-	ldloc 5
-	add
-	stloc 10
-L_106c388:
-// 0x0106c388: 0x106c388: addiu s1, s1, 1
-	ldloc 6
-	ldc.i4.1
-	add
-	stloc 6
-L_106c38c:
-// 0x0106c38c: 0x106c38c: slt   v0, s1, s4
-	ldloc 6
-	ldloc 12
-	clt
-	stloc 5
-// 0x0106c390: 0x106c390: bne   v0, zero, 0x106c334 addu  a0, s1, zero
-	ldloc 5
-	ldloc 6
-	stloc.1
-	brtrue L_106c334
-// --- basic block ---
-L_106c398:
-// 0x0106c398: 0x106c398: lw    ra, 36(sp)
-// 0x0106c39c: 0x106c39c: addu  v0, s3, zero
-	ldloc 11
 	stloc 5
-// 0x0106c3a0: 0x106c3a0: lw    s4, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 12
-// 0x0106c3a4: 0x106c3a4: lw    s3, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 11
-// 0x0106c3a8: 0x106c3a8: lw    s2, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106c3ac: 0x106c3ac: lw    s1, 20(sp)
+// 0x0106c414: 0x106c414: sw    zero, 15216(v0)
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106c3b0: 0x106c3b0: lw    s0, 16(sp)
-	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 3804
 	add
-	ldelem.i4
-	stloc 8
-// 0x0106c3b4: 0x106c3b4: jr    ra addiu sp, sp, 40
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106c418: 0x106c418: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_Editor_ExportSegments_106c3bc(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_LoginChangedCallback_106c420(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 ra)
 
 // local  5 is register v0
 // local  8 is register v1
@@ -5338,11 +5547,10 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
+// local  6 is register s0
 // local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -5357,223 +5565,101 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c3bc: 0x106c3bc: addiu sp, sp, -40
+// 0x0106c420: 0x106c420: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c3c0: 0x106c3c0: sw    s1, 32(sp)
-	ldloc 6
+// 0x0106c424: 0x106c424: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c428: 0x106c428: sw    s0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106c3c4: 0x106c3c4: sw    s0, 28(sp)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 7
 	stelem.i4
-// 0x0106c3c8: 0x106c3c8: sw    ra, 36(sp)
-// 0x0106c3cc: 0x106c3cc: jal   0x106c2c4 addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Realtime_Report_Segments_106c2c4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106c3d4: 0x106c3d4: addu  s0, v0, zero
-	ldloc 5
-	stloc 7
-// 0x0106c3d8: 0x106c3d8: beq   s0, zero, 0x106c44c addu  v0, zero, zero
-	ldloc 7
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_106c44c
-// --- basic block ---
-// 0x0106c3e0: 0x106c3e0: lb    v1, 0(s0)
-	ldloc 7
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 8
-// 0x0106c3e4: 0x106c3e4: sll   zero, zero, 0
-// 0x0106c3e8: 0x106c3e8: beq   v1, zero, 0x106c440 addu  a0, s0, zero
-	ldloc 8
-	ldloc 7
+// 0x0106c42c: 0x106c42c: lui   a0, 0x1070000
+	ldc.i4 17235968
 	stloc.1
-	brfalse L_106c440
-// --- basic block ---
-// 0x0106c3f0: 0x106c3f0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106c3f4: 0x106c3f4: lw    v0, 17560(v0)
-	ldloc 6
+// 0x0106c430: 0x106c430: lw    s0, 18044(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4390
+	ldc.i4 4511
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106c3f8: 0x106c3f8: sll   zero, zero, 0
-// 0x0106c3fc: 0x106c3fc: beq   v0, zero, 0x106c420 lui   a0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc.1
-	brfalse L_106c420
-// --- basic block ---
-// 0x0106c404: 0x106c404: jal   0x108e3a8 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.0
+	stloc 6
+// 0x0106c434: 0x106c434: sw    ra, 20(sp)
+// 0x0106c438: 0x106c438: jal   0x104fd10 addiu a0, a0, -15328
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl106::Realtime_OfflineWrite_108e3a8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106c40c: 0x106c40c: addiu a0, zero, 1
-	ldc.i4.1
+	ldc.i4 -15328
+	add
 	stloc.1
-// 0x0106c410: 0x106c410: jalr  s1 addu  a1, zero, zero
-	ldloc 9
-	ldc.i4.s 0
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c418: 0x106c418: j	 0x106c43c addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106c43c
+// 0x0106c440: 0x106c440: beq   s0, zero, 0x106c450 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_106c450
 // --- basic block ---
-L_106c420:
-// 0x0106c420: 0x106c420: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106c424: 0x106c424: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106c428: 0x106c428: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106c42c: 0x106c42c: addiu a2, a2, -2900
-	ldloc.3
-	ldc.i4 -2900
-	add
-	stloc.3
-// 0x0106c430: 0x106c430: addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-// 0x0106c434: 0x106c434: jal   0x1073a90 sw    s1, 17612(v0)
+// 0x0106c448: 0x106c448: jalr  s0 sll   zero, zero, 0
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4403
-	add
-	ldloc 9
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_GeneralPacket_1073a90(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-L_106c43c:
-// 0x0106c43c: 0x106c43c: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-L_106c440:
-// 0x0106c440: 0x106c440: jal   0x1000930 sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
+L_106c450:
+// 0x0106c450: 0x106c450: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c448: 0x106c448: lw    v0, 16(sp)
-	ldloc 6
+// 0x0106c458: 0x106c458: lw    ra, 20(sp)
+// 0x0106c45c: 0x106c45c: lw    s0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 5
-L_106c44c:
-// 0x0106c44c: 0x106c44c: lw    ra, 36(sp)
-// 0x0106c450: 0x106c450: lw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106c454: 0x106c454: lw    s0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106c458: 0x106c458: jr    ra addiu sp, sp, 40
+	stloc 6
+// 0x0106c460: 0x106c460: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -5583,10 +5669,10 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 ReportOneMarker_106c460(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_LoginCallback_106c468(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 v1,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
 
 // local  6 is register v0
 // local 10 is register v1
@@ -5597,9 +5683,8 @@ __CIBYL_function_return:
 // local  7 is register s0
 // local  8 is register s1
 // local  9 is register s2
-// local 11 is register s3
 // local  0 is register sp
-// local 12 is register ra
+// local 11 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -5620,349 +5705,340 @@ __CIBYL_function_return:
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c460: 0x106c460: addiu sp, sp, -136
+// 0x0106c468: 0x106c468: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4 -136
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106c464: 0x106c464: sw    s0, 116(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 29
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106c468: 0x106c468: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106c46c: 0x106c46c: sw    s3, 128(sp)
+// 0x0106c46c: 0x106c46c: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x0106c470: 0x106c470: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4.6
 	add
-	ldloc 11
+	ldloc 9
 	stelem.i4
-// 0x0106c470: 0x106c470: sw    s2, 124(sp)
+// 0x0106c474: 0x106c474: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4.5
 	add
-	ldloc 9
+	ldloc 8
 	stelem.i4
-// 0x0106c474: 0x106c474: addu  s3, a0, zero
-	ldloc.1
-	stloc 11
-// 0x0106c478: 0x106c478: addiu s2, sp, 72
-	ldloc.0
-	ldc.i4.s 72
-	add
+// 0x0106c478: 0x106c478: lui   s2, 0x70000
+	ldc.i4 458752
 	stloc 9
-// 0x0106c47c: 0x106c47c: addiu a1, sp, 64
-	ldloc.0
-	ldc.i4.s 64
+// 0x0106c47c: 0x106c47c: addiu a0, a0, -15256
+	ldloc.1
+	ldc.i4 -15256
 	add
-	stloc.2
-// 0x0106c480: 0x106c480: addu  a0, s0, zero
-	ldloc 7
 	stloc.1
-// 0x0106c484: 0x106c484: addiu a2, sp, 60
-	ldloc.0
-	ldc.i4.s 60
-	add
-	stloc.3
-// 0x0106c488: 0x106c488: sw    ra, 132(sp)
-// 0x0106c48c: 0x106c48c: jal   0x10b3f00 sw    s1, 120(sp)
+// 0x0106c480: 0x106c480: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
+// 0x0106c484: 0x106c484: sw    ra, 28(sp)
+// 0x0106c488: 0x106c488: lw    s0, 18048(s2)
+	ldloc 5
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 4512
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106c48c: 0x106c48c: jal   0x104fd10 lui   s1, 0x70000
+	ldc.i4 458752
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_position_10b3f00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0106c494: 0x106c494: addiu s1, sp, 92
-	ldloc.0
-	ldc.i4.s 92
-	add
-	stloc 8
-// 0x0106c498: 0x106c498: addiu a1, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc.2
-// 0x0106c49c: 0x106c49c: addiu a2, sp, 52
-	ldloc.0
-	ldc.i4.s 52
-	add
-	stloc.3
-// 0x0106c4a0: 0x106c4a0: addu  a3, s2, zero
-	ldloc 9
-	stloc 4
-// 0x0106c4a4: 0x106c4a4: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x0106c4a8: 0x106c4a8: addiu v0, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+// 0x0106c494: 0x106c494: lw    v0, 18036(s1)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4509
 	add
+	ldelem.i4
 	stloc 6
-// 0x0106c4ac: 0x106c4ac: sw    s1, 16(sp)
+// 0x0106c498: 0x106c498: sll   zero, zero, 0
+// 0x0106c49c: 0x106c49c: beq   v0, zero, 0x106c4b0 sw    zero, 18048(s2)
+	ldloc 6
 	ldloc 5
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4512
 	add
-	ldloc 8
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106c4b0: 0x106c4b0: jal   0x10b3dbc sw    v0, 20(sp)
-	ldloc 5
+	brfalse L_106c4b0
+// --- basic block ---
+// 0x0106c4a4: 0x106c4a4: jal   0x106b388 sll   zero, zero, 0
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_SaveLoginInfo_106b388(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
+	stloc 6
+// --- basic block ---
+// 0x0106c4ac: 0x106c4ac: sw    zero, 18036(s1)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4509
 	add
-	ldloc 6
+	ldc.i4.s 0
 	stelem.i4
+L_106c4b0:
+// 0x0106c4b0: 0x106c4b0: beq   s0, zero, 0x106c4c0 sll   zero, zero, 0
+	ldloc 7
+	brfalse L_106c4c0
+// --- basic block ---
+// 0x0106c4b8: 0x106c4b8: jalr  s0 sll   zero, zero, 0
+	ldloc 7
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_export_10b3dbc(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0106c4b8: 0x106c4b8: jal   0x10b3eb8 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
+L_106c4c0:
+// 0x0106c4c0: 0x106c4c0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_type_10b3eb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 6
 // --- basic block ---
-// 0x0106c4c0: 0x106c4c0: addu  a1, v0, zero
-	ldloc 6
-	stloc.2
-// 0x0106c4c4: 0x106c4c4: lw    v0, 60(sp)
+// 0x0106c4c8: 0x106c4c8: lw    ra, 28(sp)
+// 0x0106c4cc: 0x106c4cc: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106c4c8: 0x106c4c8: lw    a2, 64(sp)
+	stloc 9
+// 0x0106c4d0: 0x106c4d0: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc.3
-// 0x0106c4cc: 0x106c4cc: sw    v0, 16(sp)
+	stloc 8
+// 0x0106c4d4: 0x106c4d4: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 6
-	stelem.i4
-// 0x0106c4d0: 0x106c4d0: lw    v0, 52(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106c4d4: 0x106c4d4: lw    a3, 68(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
 	ldelem.i4
-	stloc 4
-// 0x0106c4d8: 0x106c4d8: sw    v0, 20(sp)
-	ldloc 5
+	stloc 7
+// 0x0106c4d8: 0x106c4d8: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4.s 32
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 10
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
-	stelem.i4
-// 0x0106c4dc: 0x106c4dc: lw    v0, 56(sp)
-	ldloc 5
-	ldloc.0
+	ret
+}
+.method public static int32 TestLoginDetailsCompleted_106c4e0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
+
+// local  6 is register v0
+// local  5 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 5
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106c4e0: 0x106c4e0: lui   a1, 0x70000
+	ldc.i4 458752
+	stloc.2
+// 0x0106c4e4: 0x106c4e4: lw    v0, 18032(a1)
+	ldloc 7
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4 4508
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106c4e0: 0x106c4e0: lui   a0, 0x70000
+// 0x0106c4e8: 0x106c4e8: lui   v1, 0x70000
 	ldc.i4 458752
-	stloc.1
-// 0x0106c4e4: 0x106c4e4: sw    v0, 24(sp)
-	ldloc 5
+	stloc 5
+// 0x0106c4ec: 0x106c4ec: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 6
-	stelem.i4
-// 0x0106c4e8: 0x106c4e8: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 6
-// 0x0106c4ec: 0x106c4ec: addiu v0, v0, -2784
-	ldloc 6
-	ldc.i4 -2784
-	add
-	stloc 6
-// 0x0106c4f0: 0x106c4f0: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+	ldc.i4.s -24
 	add
-	stloc.1
-// 0x0106c4f4: 0x106c4f4: sw    s2, 28(sp)
+	stloc.0
+// 0x0106c4f0: 0x106c4f0: addiu v1, v1, 18192
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4 18192
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106c4f8: 0x106c4f8: sw    s1, 32(sp)
-	ldloc 5
-	ldloc.0
+	stloc 5
+// 0x0106c4f4: 0x106c4f4: sw    ra, 20(sp)
+// 0x0106c4f8: 0x106c4f8: sw    zero, 18032(a1)
+	ldloc 7
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 4508
 	add
-	ldloc 8
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106c4fc: 0x106c4fc: sw    s3, 40(sp)
+// 0x0106c4fc: 0x106c4fc: beq   v0, zero, 0x106c510 sw    zero, 28688(v1)
+	ldloc 6
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4 7172
 	add
-	ldloc 11
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106c500: 0x106c500: jal   0x1073ed0 sw    v0, 36(sp)
+	brfalse L_106c510
+// --- basic block ---
+// 0x0106c504: 0x106c504: lw    a1, 28696(v1)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 7174
 	add
+	ldelem.i4
+	stloc.2
+// 0x0106c508: 0x106c508: jalr  v0 sll   zero, zero, 0
 	ldloc 6
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_ReportMarker_1073ed0(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
+	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0106c508: 0x106c508: lw    ra, 132(sp)
-// 0x0106c50c: 0x106c50c: lw    s3, 128(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 32
-	add
-	ldelem.i4
-	stloc 11
-// 0x0106c510: 0x106c510: lw    s2, 124(sp)
-	ldloc 5
+L_106c510:
+// 0x0106c510: 0x106c510: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 31
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106c514: 0x106c514: lw    s1, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106c518: 0x106c518: lw    s0, 116(sp)
-	ldloc 5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 6
+// --- basic block ---
+// 0x0106c518: 0x106c518: bne   v0, zero, 0x106c528 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_106c528
+// --- basic block ---
+// 0x0106c520: 0x106c520: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 29
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106c51c: 0x106c51c: jr    ra addiu sp, sp, 136
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 6
+// --- basic block ---
+L_106c528:
+// 0x0106c528: 0x106c528: lw    ra, 20(sp)
+// 0x0106c52c: 0x106c52c: sll   zero, zero, 0
+// 0x0106c530: 0x106c530: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4 136
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 Realtime_Report_Markers_106c524(int32,int32,int32,int32,int32)
+.method public static int32 TestLoginDetails_106c538(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s2,int32 s3,int32 s0,int32 s4,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
 
 // local  5 is register v0
 // local  8 is register v1
@@ -5970,13 +6046,10 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 11 is register s0
-// local  7 is register s1
-// local  9 is register s2
-// local 10 is register s3
-// local 12 is register s4
+// local  7 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local 13 is register ra
+// local 10 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -5992,48 +6065,36 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c524: 0x106c524: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106c528: 0x106c528: sw    s4, 32(sp)
+// 0x0106c538: 0x106c538: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c53c: 0x106c53c: lw    v0, 18448(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 4612
 	add
-	ldloc 12
-	stelem.i4
-// 0x0106c52c: 0x106c52c: sw    s3, 28(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 5
+// 0x0106c540: 0x106c540: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4.s -32
 	add
-	ldloc 10
-	stelem.i4
-// 0x0106c530: 0x106c530: sw    ra, 36(sp)
-// 0x0106c534: 0x106c534: sw    s2, 24(sp)
+	stloc.0
+// 0x0106c544: 0x106c544: sw    ra, 28(sp)
+// 0x0106c548: 0x106c548: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6042,7 +6103,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0106c538: 0x106c538: sw    s1, 20(sp)
+// 0x0106c54c: 0x106c54c: beq   v0, zero, 0x106c584 sw    s0, 20(sp)
+	ldloc 5
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6051,265 +6113,466 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106c53c: 0x106c53c: jal   0x10b41f4 sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 11
-	stelem.i4
+	brfalse L_106c584
+// --- basic block ---
+// 0x0106c554: 0x106c554: jal   0x106bfb8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_count_10b41f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::LoginDetailsChanged_106bfb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c544: 0x106c544: addu  s4, v0, zero
+// 0x0106c55c: 0x106c55c: bne   v0, zero, 0x106c584 lui   a1, 0x10000
 	ldloc 5
-	stloc 12
-// 0x0106c548: 0x106c548: beq   v0, zero, 0x106c5d4 addu  s3, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 10
-	brfalse L_106c5d4
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106c584
 // --- basic block ---
-// 0x0106c550: 0x106c550: jal   0x1000910 sll   a0, v0, 10
-	ldloc 5
-	ldc.i4.s 10
-	shl
+// 0x0106c564: 0x106c564: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106c568: 0x106c568: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106c56c: 0x106c56c: addiu a3, a3, 22392
+	ldloc 4
+	ldc.i4 22392
+	add
+	stloc 4
+// 0x0106c570: 0x106c570: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x0106c574: 0x106c574: jal   0x100449c addiu a2, zero, 3880
+	ldc.i4 3880
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c558: 0x106c558: addu  s0, v0, zero
-	ldloc 5
-	stloc 11
-// 0x0106c55c: 0x106c55c: sb    zero, 0(v0)
-	ldloc 5
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0106c560: 0x106c560: addu  s3, v0, zero
-	ldloc 5
-	stloc 10
-// 0x0106c564: 0x106c564: addu  s2, v0, zero
-	ldloc 5
-	stloc 9
-// 0x0106c568: 0x106c568: j	 0x106c5c8 addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-	br L_106c5c8
+// 0x0106c57c: 0x106c57c: j	 0x106c5f0 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_106c5f0
 // --- basic block ---
-L_106c570:
-// 0x0106c570: 0x106c570: jal   0x10b3cc0 sll   zero, zero, 0
+L_106c584:
+// 0x0106c584: 0x106c584: jal   0x106b2a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_marker_committed_10b3cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::NameAndPasswordAlreadyFailedAuthentication_106b2a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c578: 0x106c578: bne   v0, zero, 0x106c5c4 addu  a0, s2, zero
+// 0x0106c58c: 0x106c58c: beq   v0, zero, 0x106c5a4 sll   zero, zero, 0
 	ldloc 5
-	ldloc 9
+	brfalse L_106c5a4
+// --- basic block ---
+// 0x0106c594: 0x106c594: jal   0x106c4e0 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::TestLoginDetailsCompleted_106c4e0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106c59c: 0x106c59c: j	 0x106c604 sll   zero, zero, 0
+	br L_106c604
+// --- basic block ---
+L_106c5a4:
+// 0x0106c5a4: 0x106c5a4: jal   0x106c0b0 addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-	brtrue L_106c5c4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_ResetLoginState_106c0b0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x0106c580: 0x106c580: jal   0x106c460 addu  a1, s1, zero
+// 0x0106c5ac: 0x106c5ac: lui   s0, 0x70000
+	ldc.i4 458752
+	stloc 7
+// 0x0106c5b0: 0x106c5b0: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x0106c5b4: 0x106c5b4: addiu s0, s0, 18192
 	ldloc 7
+	ldc.i4 18192
+	add
+	stloc 7
+// 0x0106c5b8: 0x106c5b8: addiu s1, zero, 1
+	ldc.i4.1
+	stloc 9
+// 0x0106c5bc: 0x106c5bc: addiu a0, a0, 4256
+	ldloc.1
+	ldc.i4 4256
+	add
+	stloc.1
+// 0x0106c5c0: 0x106c5c0: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
+// 0x0106c5c4: 0x106c5c4: sw    s1, 28688(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 7172
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106c5c8: 0x106c5c8: jal   0x106c144 sw    zero, 28696(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 7174
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::ReportOneMarker_106c460(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Login_106c144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c588: 0x106c588: bne   v0, zero, 0x106c5b8 addu  a0, s2, zero
+// 0x0106c5d0: 0x106c5d0: beq   v0, zero, 0x106c5e4 sll   zero, zero, 0
 	ldloc 5
+	brfalse L_106c5e4
+// --- basic block ---
+// 0x0106c5d8: 0x106c5d8: sw    s1, 28688(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 7172
+	add
 	ldloc 9
-	stloc.1
-	brtrue L_106c5b8
+	stelem.i4
+// 0x0106c5dc: 0x106c5dc: j	 0x106c5f0 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_106c5f0
 // --- basic block ---
-// 0x0106c590: 0x106c590: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106c594: 0x106c594: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106c598: 0x106c598: addiu a1, a1, 22112
-	ldloc.2
-	ldc.i4 22112
+L_106c5e4:
+// 0x0106c5e4: 0x106c5e4: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x0106c5e8: 0x106c5e8: j	 0x106c604 sw    v0, 28696(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 7174
 	add
-	stloc.2
-// 0x0106c59c: 0x106c59c: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
+	ldloc 5
+	stelem.i4
+	br L_106c604
+// --- basic block ---
+L_106c5f0:
+// 0x0106c5f0: 0x106c5f0: lw    ra, 28(sp)
+// 0x0106c5f4: 0x106c5f4: lw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.1
-// 0x0106c5a0: 0x106c5a0: jal   0x104bfe4 addiu a2, zero, 5
+	ldelem.i4
+	stloc 9
+// 0x0106c5f8: 0x106c5f8: lw    s0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
 	ldc.i4.5
-	stloc.3
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106c5fc: 0x106c5fc: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+// --- basic block ---
+L_106c604:
+// 0x0106c604: 0x106c604: jal   0x106c4e0 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::TestLoginDetailsCompleted_106c4e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c5a8: 0x106c5a8: jal   0x1000930 addu  a0, s0, zero
-	ldloc 11
+// 0x0106c60c: 0x106c60c: j	 0x106c5f0 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_106c5f0
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_VerifyLoginDetails_106c614(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register t0
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106c614: 0x106c614: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c618: 0x106c618: lw    v1, 18020(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4505
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106c61c: 0x106c61c: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106c620: 0x106c620: sw    ra, 36(sp)
+// 0x0106c624: 0x106c624: beq   v1, zero, 0x106c660 addu  v0, a0, zero
+	ldloc 7
+	ldloc.1
+	stloc 5
+	brfalse L_106c660
+// --- basic block ---
+// 0x0106c62c: 0x106c62c: beq   a0, zero, 0x106c660 lui   a0, 0x70000
+	ldloc.1
+	ldc.i4 458752
 	stloc.1
+	brfalse L_106c660
+// --- basic block ---
+// 0x0106c634: 0x106c634: lw    a1, 18032(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 4508
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106c638: 0x106c638: sll   zero, zero, 0
+// 0x0106c63c: 0x106c63c: bne   a1, zero, 0x106c660 sll   zero, zero, 0
+	ldloc.2
+	brtrue L_106c660
+// --- basic block ---
+// 0x0106c644: 0x106c644: sw    v0, 18032(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 4508
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106c648: 0x106c648: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+// 0x0106c64c: 0x106c64c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c650: 0x106c650: jal   0x106c538 sw    v1, 18036(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4509
+	add
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::TestLoginDetails_106c538(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106c5b0: 0x106c5b0: j	 0x106c5d4 addu  s3, zero, zero
-	ldc.i4.s 0
-	stloc 10
-	br L_106c5d4
-// --- basic block ---
-L_106c5b8:
-// 0x0106c5b8: 0x106c5b8: jal   0x1001b48 sll   zero, zero, 0
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+// 0x0106c658: 0x106c658: j	 0x106c690 sll   zero, zero, 0
+	br L_106c690
 // --- basic block ---
-// 0x0106c5c0: 0x106c5c0: addu  s2, s2, v0
-	ldloc 9
-	ldloc 5
-	add
-	stloc 9
-L_106c5c4:
-// 0x0106c5c4: 0x106c5c4: addiu s1, s1, 1
-	ldloc 7
-	ldc.i4.1
-	add
-	stloc 7
-L_106c5c8:
-// 0x0106c5c8: 0x106c5c8: slt   v0, s1, s4
-	ldloc 7
-	ldloc 12
-	clt
-	stloc 5
-// 0x0106c5cc: 0x106c5cc: bne   v0, zero, 0x106c570 addu  a0, s1, zero
-	ldloc 5
-	ldloc 7
+L_106c660:
+// 0x0106c660: 0x106c660: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-	brtrue L_106c570
-// --- basic block ---
-L_106c5d4:
-// 0x0106c5d4: 0x106c5d4: lw    ra, 36(sp)
-// 0x0106c5d8: 0x106c5d8: addu  v0, s3, zero
-	ldloc 10
-	stloc 5
-// 0x0106c5dc: 0x106c5dc: lw    s4, 32(sp)
+// 0x0106c664: 0x106c664: lw    t0, 18032(a0)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 4508
 	add
 	ldelem.i4
-	stloc 12
-// 0x0106c5e0: 0x106c5e0: lw    s3, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	stloc 9
+// 0x0106c668: 0x106c668: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106c66c: 0x106c66c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106c670: 0x106c670: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldelem.i4
-	stloc 10
-// 0x0106c5e4: 0x106c5e4: lw    s2, 24(sp)
+	stloc.2
+// 0x0106c674: 0x106c674: addiu a3, a3, 22460
+	ldloc 4
+	ldc.i4 22460
+	add
+	stloc 4
+// 0x0106c678: 0x106c678: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106c67c: 0x106c67c: addiu a2, zero, 3949
+	ldc.i4 3949
+	stloc.3
+// 0x0106c680: 0x106c680: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106c5e8: 0x106c5e8: lw    s1, 20(sp)
+	ldloc 7
+	stelem.i4
+// 0x0106c684: 0x106c684: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106c5ec: 0x106c5ec: lw    s0, 16(sp)
+	ldloc 5
+	stelem.i4
+// 0x0106c688: 0x106c688: jal   0x100449c sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 11
-// 0x0106c5f0: 0x106c5f0: jr    ra addiu sp, sp, 40
+	ldloc 9
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_106c690:
+// 0x0106c690: 0x106c690: lw    ra, 36(sp)
+// 0x0106c694: 0x106c694: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0106c698: 0x106c698: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_Editor_ExportMarkers_106c5f8(int32,int32,int32,int32,int32)
+.method public static int32 RemoveWazerNearby_106c6a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
+// local  8 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6318,252 +6581,155 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c5f8: 0x106c5f8: addiu sp, sp, -40
+// 0x0106c6a0: 0x106c6a0: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x0106c6a4: 0x106c6a4: lw    a0, 15056(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 3764
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106c6a8: 0x106c6a8: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c5fc: 0x106c5fc: sw    s1, 32(sp)
+// 0x0106c6ac: 0x106c6ac: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x0106c6b0: 0x106c6b0: beq   a0, v1, 0x106c6bc sw    ra, 20(sp)
+	ldloc.1
 	ldloc 6
-	ldloc.0
+	beq  L_106c6bc
+// --- basic block ---
+// 0x0106c6b8: 0x106c6b8: sw    v1, 15056(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 3764
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106c600: 0x106c600: sw    s0, 28(sp)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 7
 	stelem.i4
-// 0x0106c604: 0x106c604: sw    ra, 36(sp)
-// 0x0106c608: 0x106c608: jal   0x106c524 addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Realtime_Report_Markers_106c524(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106c610: 0x106c610: addu  s0, v0, zero
-	ldloc 5
-	stloc 7
-// 0x0106c614: 0x106c614: beq   s0, zero, 0x106c688 addu  v0, zero, zero
-	ldloc 7
+L_106c6bc:
+// 0x0106c6bc: 0x106c6bc: addu  v1, zero, zero
 	ldc.i4.s 0
+	stloc 6
+// 0x0106c6c0: 0x106c6c0: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x0106c6c4: 0x106c6c4: cibyl_sysc 0x20ee
+	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-	brfalse L_106c688
-// --- basic block ---
-// 0x0106c61c: 0x106c61c: lb    v1, 0(s0)
-	ldloc 7
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 8
-// 0x0106c620: 0x106c620: sll   zero, zero, 0
-// 0x0106c624: 0x106c624: beq   v1, zero, 0x106c67c addu  a0, s0, zero
-	ldloc 8
-	ldloc 7
-	stloc.1
-	brfalse L_106c67c
-// --- basic block ---
-// 0x0106c62c: 0x106c62c: lui   v0, 0x70000
+// 0x0106c6c8: 0x106c6c8: addu  v1, v0, zero
+	ldloc 5
+	stloc 6
+// 0x0106c6cc: 0x106c6cc: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106c630: 0x106c630: lw    v0, 17560(v0)
-	ldloc 6
+// 0x0106c6d0: 0x106c6d0: lw    a0, 18096(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4390
+	ldc.i4 4524
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106c634: 0x106c634: sll   zero, zero, 0
-// 0x0106c638: 0x106c638: beq   v0, zero, 0x106c65c lui   a0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc.1
-	brfalse L_106c65c
-// --- basic block ---
-// 0x0106c640: 0x106c640: jal   0x108e3a8 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl106::Realtime_OfflineWrite_108e3a8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106c648: 0x106c648: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106c64c: 0x106c64c: jalr  s1 addu  a1, zero, zero
-	ldloc 9
-	ldc.i4.s 0
+// 0x0106c6d4: 0x106c6d4: lui   a1, 0x70000
+	ldc.i4 458752
 	stloc.2
-	ldloc.0
+// 0x0106c6d8: 0x106c6d8: beq   a0, zero, 0x106c6f8 sw    v1, 18100(a1)
 	ldloc.1
+	ldloc 7
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106c654: 0x106c654: j	 0x106c678 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106c678
-// --- basic block ---
-L_106c65c:
-// 0x0106c65c: 0x106c65c: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106c660: 0x106c660: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106c664: 0x106c664: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106c668: 0x106c668: addiu a2, a2, -2784
-	ldloc.3
-	ldc.i4 -2784
+	ldc.i4.2
+	shr.un
+	ldc.i4 4525
 	add
-	stloc.3
-// 0x0106c66c: 0x106c66c: addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-// 0x0106c670: 0x106c670: jal   0x1073a90 sw    s1, 17616(v0)
 	ldloc 6
+	stelem.i4
+	brfalse L_106c6f8
+// --- basic block ---
+// 0x0106c6e0: 0x106c6e0: jal   0x102147c sw    zero, 18096(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4404
+	ldc.i4 4524
 	add
-	ldloc 9
+	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_GeneralPacket_1073a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_106c678:
-// 0x0106c678: 0x106c678: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-L_106c67c:
-// 0x0106c67c: 0x106c67c: jal   0x1000930 sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+// 0x0106c6e8: 0x106c6e8: bne   v0, zero, 0x106c6f8 sll   zero, zero, 0
 	ldloc 5
-	stelem.i4
+	brtrue L_106c6f8
+// --- basic block ---
+// 0x0106c6f0: 0x106c6f0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106c684: 0x106c684: lw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-L_106c688:
-// 0x0106c688: 0x106c688: lw    ra, 36(sp)
-// 0x0106c68c: 0x106c68c: lw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106c690: 0x106c690: lw    s0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106c694: 0x106c694: jr    ra addiu sp, sp, 40
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_106c6f8:
+// 0x0106c6f8: 0x106c6f8: lw    ra, 20(sp)
+// 0x0106c6fc: 0x106c6fc: sll   zero, zero, 0
+// 0x0106c700: 0x106c700: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_Remove_Alert_106c69c(int32,int32,int32,int32,int32)
+.method public static int32 wazer_nearby_timeout_106c708(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
 
-// local  7 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
 // local  5 is register ra
-// local  6 is register mem
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6577,85 +6743,78 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c69c: 0x106c69c: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106c6a0: 0x106c6a0: lui   a2, 0x1070000
+// 0x0106c708: 0x106c708: lui   a0, 0x1070000
 	ldc.i4 17235968
-	stloc.3
-// 0x0106c6a4: 0x106c6a4: lui   a0, 0x70000
-	ldc.i4 458752
 	stloc.1
-// 0x0106c6a8: 0x106c6a8: addiu sp, sp, -24
+// 0x0106c70c: 0x106c70c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c6ac: 0x106c6ac: addiu a0, a0, 17728
+// 0x0106c710: 0x106c710: sw    ra, 20(sp)
+// 0x0106c714: 0x106c714: jal   0x104fd10 addiu a0, a0, -14584
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 -14584
 	add
 	stloc.1
-// 0x0106c6b0: 0x106c6b0: sw    ra, 20(sp)
-// 0x0106c6b4: 0x106c6b4: jal   0x10741cc addiu a2, a2, -4752
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	ldc.i4 -4752
-	add
-	stloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106c71c: 0x106c71c: jal   0x106c6a0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_RemoveAlert_10741cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RemoveWazerNearby_106c6a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x0106c6bc: 0x106c6bc: lw    ra, 20(sp)
-// 0x0106c6c0: 0x106c6c0: sll   zero, zero, 0
-// 0x0106c6c4: 0x106c6c4: jr    ra addiu sp, sp, 24
+// 0x0106c724: 0x106c724: lw    ra, 20(sp)
+// 0x0106c728: 0x106c728: sll   zero, zero, 0
+// 0x0106c72c: 0x106c72c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
-.method public static int32 SendMessage_CachedMapProblems_106c6cc(int32,int32,int32,int32,int32)
+.method public static int32 RealTime_Auth_106c734(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s6,int32 s4,int32 s5,int32 s2,int32 s7,int32 v1,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
 
 // local  6 is register v0
-// local 14 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local 12 is register s2
-// local 15 is register s3
-// local 10 is register s4
-// local 11 is register s5
-// local  9 is register s6
-// local 13 is register s7
+// local  8 is register s0
 // local  0 is register sp
-// local 16 is register ra
+// local  9 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 14
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6665,362 +6824,98 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
 	stloc 8
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 16
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c6cc: 0x106c6cc: addiu sp, sp, -80
-	ldloc.0
-	ldc.i4.s -80
-	add
-	stloc.0
-// 0x0106c6d0: 0x106c6d0: lui   v0, 0x70000
+// 0x0106c734: 0x106c734: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 6
-// 0x0106c6d4: 0x106c6d4: sw    s0, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106c6d8: 0x106c6d8: lw    s0, 17620(v0)
+// 0x0106c738: 0x106c738: lw    a1, 18452(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 4405
+	ldc.i4 4613
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106c6dc: 0x106c6dc: sw    s1, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106c6e0: 0x106c6e0: addiu s0, s0, -1
-	ldloc 7
-	ldc.i4.m1
-	add
-	stloc 7
-// 0x0106c6e4: 0x106c6e4: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x0106c6e8: 0x106c6e8: sw    s6, 68(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106c6ec: 0x106c6ec: sw    s5, 64(sp)
-	ldloc 5
+	stloc.2
+// 0x0106c73c: 0x106c73c: addiu sp, sp, -328
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	ldc.i4 -328
 	add
-	ldloc 11
-	stelem.i4
-// 0x0106c6f0: 0x106c6f0: sw    s4, 60(sp)
+	stloc.0
+// 0x0106c740: 0x106c740: sw    ra, 324(sp)
+// 0x0106c744: 0x106c744: sw    s0, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.s 80
 	add
-	ldloc 10
-	stelem.i4
-// 0x0106c6f4: 0x106c6f4: sll   v0, s0, 2
-	ldloc 7
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x0106c6f8: 0x106c6f8: addiu s1, s1, -18544
 	ldloc 8
-	ldc.i4 -18544
-	add
-	stloc 8
-// 0x0106c6fc: 0x106c6fc: lui   s6, 0x70000
-	ldc.i4 458752
-	stloc 9
-// 0x0106c700: 0x106c700: lui   s5, 0x10000
-	ldc.i4 65536
-	stloc 11
-// 0x0106c704: 0x106c704: lui   s4, 0x10000
-	ldc.i4 65536
-	stloc 10
-// 0x0106c708: 0x106c708: sw    s7, 72(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
-	add
-	ldloc 13
-	stelem.i4
-// 0x0106c70c: 0x106c70c: sw    s3, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 15
 	stelem.i4
-// 0x0106c710: 0x106c710: sw    s2, 52(sp)
+// 0x0106c748: 0x106c748: sw    a1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 12
-	stelem.i4
-// 0x0106c714: 0x106c714: sw    ra, 76(sp)
-// 0x0106c718: 0x106c718: addu  s1, s1, v0
-	ldloc 8
-	ldloc 6
-	add
-	stloc 8
-// 0x0106c71c: 0x106c71c: addu  s7, a0, zero
-	ldloc.1
-	stloc 13
-// 0x0106c720: 0x106c720: addu  s2, a1, zero
-	ldloc.2
-	stloc 12
-// 0x0106c724: 0x106c724: addiu s6, s6, 17728
-	ldloc 9
-	ldc.i4 17728
-	add
-	stloc 9
-// 0x0106c728: 0x106c728: addiu s5, s5, 20732
-	ldloc 11
-	ldc.i4 20732
-	add
-	stloc 11
-// 0x0106c72c: 0x106c72c: addiu s4, s4, 22204
-	ldloc 10
-	ldc.i4 22204
-	add
-	stloc 10
-// 0x0106c730: 0x106c730: j	 0x106c7dc addiu s3, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 15
-	br L_106c7dc
-// --- basic block ---
-L_106c738:
-// 0x0106c738: 0x106c738: lw    v0, 0(s1)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 6
-// 0x0106c73c: 0x106c73c: addiu s1, s1, -4
-	ldloc 8
-	ldc.i4.s -4
+	ldc.i4.s 78
 	add
-	stloc 8
-// 0x0106c740: 0x106c740: bne   v0, zero, 0x106c764 addu  a1, v0, zero
-	ldloc 6
-	ldloc 6
-	stloc.2
-	brtrue L_106c764
-// --- basic block ---
-// 0x0106c748: 0x106c748: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106c74c: 0x106c74c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106c750: 0x106c750: addiu a1, a1, 20732
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106c754: 0x106c754: addiu a3, a3, 22136
-	ldloc 4
-	ldc.i4 22136
-	add
-	stloc 4
-// 0x0106c758: 0x106c758: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106c75c: 0x106c75c: j	 0x106c7cc addiu a2, zero, 1897
-	ldc.i4 1897
-	stloc.3
-	br L_106c7cc
-// --- basic block ---
-L_106c764:
-// 0x0106c764: 0x106c764: lw    a2, 4(v0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc.3
-// 0x0106c768: 0x106c768: lw    a3, 8(v0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc 4
-// 0x0106c76c: 0x106c76c: sw    s7, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 13
 	stelem.i4
-// 0x0106c770: 0x106c770: sw    s3, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 15
-	stelem.i4
-// 0x0106c774: 0x106c774: jal   0x1074070 sw    zero, 20(sp)
-	ldloc 5
+// 0x0106c74c: 0x106c74c: jal   0x102c400 addiu s0, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4.s 24
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_ReportMapProblem_1074070(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 14
-	stloc 6
-// --- basic block ---
-// 0x0106c77c: 0x106c77c: beq   v0, zero, 0x106c7b4 addu  a0, s2, zero
-	ldloc 6
-	ldloc 12
-	stloc.1
-	brfalse L_106c7b4
-// --- basic block ---
-// 0x0106c784: 0x106c784: jal   0x1001b48 sll   zero, zero, 0
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 14
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106c78c: 0x106c78c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106c790: 0x106c790: addu  a1, s5, zero
-	ldloc 11
-	stloc.2
-// 0x0106c794: 0x106c794: addiu a2, zero, 1903
-	ldc.i4 1903
-	stloc.3
-// 0x0106c798: 0x106c798: addu  a3, s4, zero
-	ldloc 10
-	stloc 4
-// 0x0106c79c: 0x106c79c: sw    s0, 16(sp)
+// 0x0106c754: 0x106c754: lw    a1, 312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106c7a0: 0x106c7a0: addu  s7, s2, v0
-	ldloc 12
-	ldloc 6
-	add
-	stloc 13
-// 0x0106c7a4: 0x106c7a4: jal   0x100449c addiu s0, s0, -1
-	ldloc 7
-	ldc.i4.m1
+	ldc.i4.s 78
 	add
-	stloc 7
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 14
-	stloc 6
-// --- basic block ---
-// 0x0106c7ac: 0x106c7ac: j	 0x106c7e0 addu  a0, s6, zero
-	ldloc 9
-	stloc.1
-	br L_106c7e0
-// --- basic block ---
-L_106c7b4:
-// 0x0106c7b4: 0x106c7b4: lui   a1, 0x10000
-	ldc.i4 65536
+	ldelem.i4
 	stloc.2
-// 0x0106c7b8: 0x106c7b8: lui   a3, 0x10000
-	ldc.i4 65536
+// 0x0106c758: 0x106c758: lui   a2, 0x70000
+	ldc.i4 458752
+	stloc.3
+// 0x0106c75c: 0x106c75c: lui   a3, 0x80000
+	ldc.i4 524288
 	stloc 4
-// 0x0106c7bc: 0x106c7bc: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x0106c760: 0x106c760: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x0106c764: 0x106c764: addiu v1, zero, 70
+	ldc.i4.s 70
+	stloc 7
+// 0x0106c768: 0x106c768: addiu a2, a2, 18384
+	ldloc.3
+	ldc.i4 18384
 	add
-	stloc.2
-// 0x0106c7c0: 0x106c7c0: addiu a3, a3, 22272
+	stloc.3
+// 0x0106c76c: 0x106c76c: addiu a3, a3, -18592
 	ldloc 4
-	ldc.i4 22272
+	ldc.i4 -18592
 	add
 	stloc 4
-// 0x0106c7c4: 0x106c7c4: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106c7c8: 0x106c7c8: addiu a2, zero, 1907
-	ldc.i4 1907
-	stloc.3
-L_106c7cc:
-// 0x0106c7cc: 0x106c7cc: jal   0x100449c sw    s0, 16(sp)
+// 0x0106c770: 0x106c770: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -7029,143 +6924,214 @@ L_106c7cc:
 	add
 	ldloc 7
 	stelem.i4
+// 0x0106c774: 0x106c774: jal   0x1072644 sw    v0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::RTNet_Auth_BuildCommand_1072644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 14
-	stloc 6
-// --- basic block ---
-// 0x0106c7d4: 0x106c7d4: j	 0x106c7e8 addu  v0, zero, zero
-	ldc.i4.s 0
+	stloc 7
 	stloc 6
-	br L_106c7e8
 // --- basic block ---
-L_106c7dc:
-// 0x0106c7dc: 0x106c7dc: addu  a0, s6, zero
-	ldloc 9
+// 0x0106c77c: 0x106c77c: jal   0x108e9cc addu  a0, s0, zero
+	ldloc 8
 	stloc.1
-L_106c7e0:
-// 0x0106c7e0: 0x106c7e0: bgez  s0, 0x106c738 addiu v0, zero, 1
-	ldloc 7
-	ldc.i4.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl106::Realtime_OfflineWrite_108e9cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	ldc.i4.s 0
-	bge L_106c738
 // --- basic block ---
-L_106c7e8:
-// 0x0106c7e8: 0x106c7e8: lw    ra, 76(sp)
-// 0x0106c7ec: 0x106c7ec: lw    s7, 72(sp)
+// 0x0106c784: 0x106c784: lw    ra, 324(sp)
+// 0x0106c788: 0x106c788: lw    s0, 320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 80
 	add
 	ldelem.i4
-	stloc 13
-// 0x0106c7f0: 0x106c7f0: lw    s6, 68(sp)
-	ldloc 5
+	stloc 8
+// 0x0106c78c: 0x106c78c: jr    ra addiu sp, sp, 328
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
+	ldc.i4 328
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106c7f4: 0x106c7f4: lw    s5, 64(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106c794: 0x106c794: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106c798: 0x106c798: addiu v0, v0, 18192
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	ldc.i4 18192
 	add
-	ldelem.i4
-	stloc 11
-// 0x0106c7f8: 0x106c7f8: lw    s4, 60(sp)
+	stloc 5
+// 0x0106c79c: 0x106c79c: lw    v1, 256(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.s 64
 	add
 	ldelem.i4
-	stloc 10
-// 0x0106c7fc: 0x106c7fc: lw    s3, 56(sp)
-	ldloc 5
+	stloc 6
+// 0x0106c7a0: 0x106c7a0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 15
-// 0x0106c800: 0x106c800: lw    s2, 52(sp)
+	stloc.0
+// 0x0106c7a4: 0x106c7a4: beq   v1, zero, 0x106c7e4 sw    ra, 20(sp)
+	ldloc 6
+	brfalse L_106c7e4
+// --- basic block ---
+// 0x0106c7ac: 0x106c7ac: lw    v0, 28696(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4 7174
 	add
 	ldelem.i4
-	stloc 12
-// 0x0106c804: 0x106c804: lw    s1, 48(sp)
+	stloc 5
+// 0x0106c7b0: 0x106c7b0: sll   zero, zero, 0
+// 0x0106c7b4: 0x106c7b4: addiu v1, v0, -11
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+	ldc.i4.s -11
 	add
-	ldelem.i4
-	stloc 8
-// 0x0106c808: 0x106c808: lw    s0, 44(sp)
+	stloc 6
+// 0x0106c7b8: 0x106c7b8: sltiu v1, v1, 5
+	ldloc 6
+	ldc.i4.5
+	clt.un
+	stloc 6
+// 0x0106c7bc: 0x106c7bc: bne   v1, zero, 0x106c7e4 addiu v0, v0, -23
+	ldloc 6
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	ldc.i4.s -23
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106c80c: 0x106c80c: jr    ra addiu sp, sp, 80
+	stloc 5
+	brtrue L_106c7e4
+// --- basic block ---
+// 0x0106c7c4: 0x106c7c4: sltiu v0, v0, 5
+	ldloc 5
+	ldc.i4.5
+	clt.un
+	stloc 5
+// 0x0106c7c8: 0x106c7c8: bne   v0, zero, 0x106c7e4 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_106c7e4
+// --- basic block ---
+// 0x0106c7d0: 0x106c7d0: jal   0x1068fc4 sll   zero, zero, 0
+	call int32 Cibyl78::websvc_trans_getLastNetConnectRes_1068fc4()
+	stloc 5
+// --- basic block ---
+// 0x0106c7d8: 0x106c7d8: xori  v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	xor
+	stloc 5
+// 0x0106c7dc: 0x106c7dc: j	 0x106c7e8 sltiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	clt.un
+	stloc 5
+	br L_106c7e8
+// --- basic block ---
+L_106c7e4:
+// 0x0106c7e4: 0x106c7e4: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_106c7e8:
+// 0x0106c7e8: 0x106c7e8: lw    ra, 20(sp)
+// 0x0106c7ec: 0x106c7ec: sll   zero, zero, 0
+// 0x0106c7f0: 0x106c7f0: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 80
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 14
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 Realtime_ReportMapProblem_106c814(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_UpdateProfile_106c7f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s0,int32 s1,int32 s2,int32 s4,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 t0,int32 t1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  6 is register v0
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local 10 is register s1
-// local 11 is register s2
-// local  8 is register s3
-// local 12 is register s4
+// local  9 is register t0
+// local 10 is register t1
 // local  0 is register sp
-// local 13 is register ra
-// local  6 is register mem
+// local  8 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -7178,121 +7144,70 @@ __CIBYL_function_return:
 	stloc 9
 	ldc.i4.s 0
 	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c814: 0x106c814: addiu sp, sp, -64
+// 0x0106c7f8: 0x106c7f8: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -64
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106c818: 0x106c818: addiu v0, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
+// 0x0106c7fc: 0x106c7fc: addu  v1, a2, zero
+	ldloc.3
 	stloc 5
-// 0x0106c81c: 0x106c81c: sw    s2, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 11
-	stelem.i4
-// 0x0106c820: 0x106c820: sw    s1, 44(sp)
-	ldloc 6
+// 0x0106c800: 0x106c800: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 6
+// 0x0106c804: 0x106c804: sw    a3, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.4
 	add
-	ldloc 10
+	ldloc 4
 	stelem.i4
-// 0x0106c824: 0x106c824: sw    s0, 40(sp)
+// 0x0106c808: 0x106c808: addiu v0, v0, 18192
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	ldc.i4 18192
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106c828: 0x106c828: addu  s1, a0, zero
-	ldloc.1
-	stloc 10
-// 0x0106c82c: 0x106c82c: addu  s2, a1, zero
-	ldloc.2
-	stloc 11
-// 0x0106c830: 0x106c830: addu  s0, a2, zero
-	ldloc.3
-	stloc 9
-// 0x0106c834: 0x106c834: sw    v0, 16(sp)
+	stloc 6
+// 0x0106c80c: 0x106c80c: addu  a3, v1, zero
+	ldloc 5
+	stloc 4
+// 0x0106c810: 0x106c810: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0106c814: 0x106c814: sw    v1, 28688(v0)
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 7172
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106c838: 0x106c838: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106c83c: 0x106c83c: lui   v0, 0x1070000
+// 0x0106c818: 0x106c818: lui   v1, 0x1070000
 	ldc.i4 17235968
 	stloc 5
-// 0x0106c840: 0x106c840: addiu v0, v0, -1492
-	ldloc 5
-	ldc.i4 -1492
-	add
-	stloc 5
-// 0x0106c844: 0x106c844: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106c848: 0x106c848: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x0106c84c: 0x106c84c: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106c850: 0x106c850: addu  a3, s0, zero
-	ldloc 9
-	stloc 4
-// 0x0106c854: 0x106c854: sw    s4, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 12
-	stelem.i4
-// 0x0106c858: 0x106c858: sw    ra, 60(sp)
-// 0x0106c85c: 0x106c85c: sw    s3, 52(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
+// 0x0106c81c: 0x106c81c: addu  t1, a0, zero
+	ldloc.1
+	stloc 10
+// 0x0106c820: 0x106c820: addu  t0, a1, zero
+	ldloc.2
+	stloc 9
+// 0x0106c824: 0x106c824: addiu v1, v1, 888
+	ldloc 5
+	ldc.i4 888
 	add
-	ldloc 8
-	stelem.i4
-// 0x0106c860: 0x106c860: sw    v0, 20(sp)
-	ldloc 6
+	stloc 5
+// 0x0106c828: 0x106c828: sw    v1, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -7300,282 +7215,194 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106c864: 0x106c864: jal   0x1074070 sw    zero, 24(sp)
+// 0x0106c82c: 0x106c82c: addu  a0, v0, zero
+	ldloc 6
+	stloc.1
+// 0x0106c830: 0x106c830: addu  a1, t1, zero
+	ldloc 10
+	stloc.2
+// 0x0106c834: 0x106c834: sw    zero, 28696(v0)
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 7174
 	add
 	ldc.i4.s 0
 	stelem.i4
+// 0x0106c838: 0x106c838: sw    ra, 28(sp)
+// 0x0106c83c: 0x106c83c: jal   0x10740e4 addu  a2, t0, zero
+	ldloc 9
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_ReportMapProblem_1074070(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_UpdateProfile_10740e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x0106c86c: 0x106c86c: bne   v0, zero, 0x106c904 addu  s4, v0, zero
-	ldloc 5
-	ldloc 5
-	stloc 12
-	brtrue L_106c904
-// --- basic block ---
-// 0x0106c874: 0x106c874: lw    v1, 32(sp)
-	ldloc 6
+// 0x0106c844: 0x106c844: lw    ra, 28(sp)
+// 0x0106c848: 0x106c848: sll   zero, zero, 0
+// 0x0106c84c: 0x106c84c: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106c878: 0x106c878: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0106c87c: 0x106c87c: bne   v1, v0, 0x106c8ec sll   zero, zero, 0
-	ldloc 7
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 5
-	bne.un L_106c8ec
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 Realtime_CreateAccount_106c854(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra,int32 t0,int32 t1)
+
+// local  6 is register v0
+// local  5 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register t0
+// local 10 is register t1
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 5
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c884: 0x106c884: jal   0x1000910 addiu a0, zero, 12
-	ldc.i4.s 12
-	stloc.1
+// 0x0106c854: 0x106c854: addiu sp, sp, -32
 	ldloc.0
-	ldloc.1
-	ldloc.2
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x0106c858: 0x106c858: addu  v1, a2, zero
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x0106c88c: 0x106c88c: addu  s3, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0106c890: 0x106c890: jal   0x1001ba8 addu  a0, s2, zero
-	ldloc 11
-	stloc.1
+// 0x0106c85c: 0x106c85c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 6
+// 0x0106c860: 0x106c860: sw    a3, 16(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stelem.i4
+// 0x0106c864: 0x106c864: addiu v0, v0, 18192
+	ldloc 6
+	ldc.i4 18192
+	add
+	stloc 6
+// 0x0106c868: 0x106c868: addu  a3, v1, zero
+	ldloc 5
+	stloc 4
+// 0x0106c86c: 0x106c86c: addiu v1, zero, 1
+	ldc.i4.1
 	stloc 5
-// --- basic block ---
-// 0x0106c898: 0x106c898: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x0106c89c: 0x106c89c: addiu a2, zero, 3
-	ldc.i4.3
-	stloc.3
-// 0x0106c8a0: 0x106c8a0: addu  a0, s3, zero
-	ldloc 8
-	stloc.1
-// 0x0106c8a4: 0x106c8a4: jal   0x1001af8 sw    v0, 4(s3)
+// 0x0106c870: 0x106c870: sw    v1, 28688(v0)
+	ldloc 7
 	ldloc 6
-	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 7172
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
+// 0x0106c874: 0x106c874: lui   v1, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-// --- basic block ---
-// 0x0106c8ac: 0x106c8ac: jal   0x1000910 addiu a0, zero, 20
-	ldc.i4.s 20
-	stloc.1
-	ldloc.0
+// 0x0106c878: 0x106c878: addu  t1, a0, zero
 	ldloc.1
+	stloc 10
+// 0x0106c87c: 0x106c87c: addu  t0, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106c8b4: 0x106c8b4: addu  a0, v0, zero
+	stloc 9
+// 0x0106c880: 0x106c880: addiu v1, v1, 888
 	ldloc 5
-	stloc.1
-// 0x0106c8b8: 0x106c8b8: addu  a1, s0, zero
-	ldloc 9
-	stloc.2
-// 0x0106c8bc: 0x106c8bc: addiu a2, zero, 20
-	ldc.i4.s 20
-	stloc.3
-// 0x0106c8c0: 0x106c8c0: jal   0x1001800 sw    v0, 8(s3)
-	ldloc 6
-	ldloc 8
+	ldc.i4 888
+	add
+	stloc 5
+// 0x0106c884: 0x106c884: sw    v1, 20(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.5
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106c8c8: 0x106c8c8: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106c8cc: 0x106c8cc: lw    v1, 17620(v0)
+// 0x0106c888: 0x106c888: addu  a0, v0, zero
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4405
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106c8d0: 0x106c8d0: lui   a0, 0x80000
-	ldc.i4 524288
 	stloc.1
-// 0x0106c8d4: 0x106c8d4: sll   a1, v1, 2
-	ldloc 7
-	ldc.i4.2
-	shl
+// 0x0106c88c: 0x106c88c: addu  a1, t1, zero
+	ldloc 10
 	stloc.2
-// 0x0106c8d8: 0x106c8d8: addiu a0, a0, -18544
-	ldloc.1
-	ldc.i4 -18544
-	add
-	stloc.1
-// 0x0106c8dc: 0x106c8dc: addu  a0, a1, a0
-	ldloc.2
-	ldloc.1
-	add
-	stloc.1
-// 0x0106c8e0: 0x106c8e0: addiu v1, v1, 1
+// 0x0106c890: 0x106c890: sw    zero, 28696(v0)
 	ldloc 7
-	ldc.i4.1
-	add
-	stloc 7
-// 0x0106c8e4: 0x106c8e4: sw    s3, 0(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldloc 8
-	stelem.i4
-// 0x0106c8e8: 0x106c8e8: sw    v1, 17620(v0)
 	ldloc 6
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4405
+	ldc.i4 7174
 	add
-	ldloc 7
-	stelem.i4
-L_106c8ec:
-// 0x0106c8ec: 0x106c8ec: lui   a0, 0x0
 	ldc.i4.s 0
-	stloc.1
-// 0x0106c8f0: 0x106c8f0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106c8f4: 0x106c8f4: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106c8f8: 0x106c8f8: addiu a1, a1, 22344
-	ldloc.2
-	ldc.i4 22344
-	add
-	stloc.2
-// 0x0106c8fc: 0x106c8fc: jal   0x104bfe4 addiu a2, zero, 5
-	ldc.i4.5
+	stelem.i4
+// 0x0106c894: 0x106c894: sw    ra, 28(sp)
+// 0x0106c898: 0x106c898: jal   0x1072480 addu  a2, t0, zero
+	ldloc 9
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::RTNet_CreateAccount_1072480(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
+	stloc 6
 // --- basic block ---
-L_106c904:
-// 0x0106c904: 0x106c904: lw    ra, 60(sp)
-// 0x0106c908: 0x106c908: addu  v0, s4, zero
-	ldloc 12
-	stloc 5
-// 0x0106c90c: 0x106c90c: lw    s4, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
-	stloc 12
-// 0x0106c910: 0x106c910: lw    s3, 52(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106c914: 0x106c914: lw    s2, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 11
-// 0x0106c918: 0x106c918: lw    s1, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106c91c: 0x106c91c: lw    s0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106c920: 0x106c920: jr    ra addiu sp, sp, 64
+// 0x0106c8a0: 0x106c8a0: lw    ra, 28(sp)
+// 0x0106c8a4: 0x106c8a4: sll   zero, zero, 0
+// 0x0106c8a8: 0x106c8a8: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 64
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
 }
diff --git a/converted/Cibyl81.j b/converted/Cibyl81.j
index ecae1b2..b044e5f 100644
--- a/converted/Cibyl81.j
+++ b/converted/Cibyl81.j
@@ -41,26 +41,25 @@
     IL_0006:  ret
   } // end of method Cibyl81::.ctor
 
-.method public static int32 Realtime_SessionDetailsInit_106c928(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_TrafficAlertFeedback_106c8b0(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
 // local  0 is register sp
-// local  9 is register ra
+// local  6 is register ra
 // local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -69,174 +68,93 @@
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c928: 0x106c928: lui   a0, 0x0
-	ldc.i4.s 0
+// 0x0106c8b0: 0x106c8b0: addu  v0, a0, zero
+	ldloc.1
+	stloc 5
+// 0x0106c8b4: 0x106c8b4: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106c8b8: 0x106c8b8: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106c92c: 0x106c92c: addiu sp, sp, -24
+// 0x0106c8bc: 0x106c8bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106c930: 0x106c930: addiu a0, a0, 15012
-	ldloc.1
-	ldc.i4 15012
-	add
-	stloc.1
-// 0x0106c934: 0x106c934: sw    ra, 20(sp)
-// 0x0106c938: 0x106c938: jal   0x100e788 sw    s0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
+// 0x0106c8c0: 0x106c8c0: addu  a2, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106c940: 0x106c940: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106c944: 0x106c944: addiu a0, a0, 15028
+	stloc.3
+// 0x0106c8c4: 0x106c8c4: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 15028
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106c948: 0x106c948: jal   0x100e348 addu  s0, v0, zero
+// 0x0106c8c8: 0x106c8c8: addu  a1, v0, zero
 	ldloc 5
-	stloc 8
+	stloc.2
+// 0x0106c8cc: 0x106c8cc: sw    ra, 20(sp)
+// 0x0106c8d0: 0x106c8d0: jal   0x10741ac addiu a3, a3, -3180
+	ldloc 4
+	ldc.i4 -3180
+	add
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_TrafficAlertFeedback_10741ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106c950: 0x106c950: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x0106c954: 0x106c954: beq   s0, v1, 0x106c960 lui   v1, 0x70000
-	ldloc 8
-	ldloc 6
-	ldc.i4 458752
-	stloc 6
-	beq  L_106c960
-// --- basic block ---
-// 0x0106c95c: 0x106c95c: sw    s0, 17988(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4497
-	add
-	ldloc 8
-	stelem.i4
-L_106c960:
-// 0x0106c960: 0x106c960: beq   v0, zero, 0x106c990 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106c990
-// --- basic block ---
-// 0x0106c968: 0x106c968: lb    v1, 0(v0)
-	ldloc 5
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x0106c96c: 0x106c96c: sll   zero, zero, 0
-// 0x0106c970: 0x106c970: beq   v1, zero, 0x106c990 lui   a0, 0x70000
-	ldloc 6
-	ldc.i4 458752
-	stloc.1
-	brfalse L_106c990
-// --- basic block ---
-// 0x0106c978: 0x106c978: addiu a0, a0, 17920
-	ldloc.1
-	ldc.i4 17920
-	add
-	stloc.1
-// 0x0106c97c: 0x106c97c: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0106c980: 0x106c980: jal   0x1001af8 addiu a2, zero, 64
-	ldc.i4.s 64
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106c988: 0x106c988: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106c98c: 0x106c98c: sb    zero, 17983(v0)
-	ldloc 5
-	ldc.i4 17983
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_106c990:
-// 0x0106c990: 0x106c990: lw    ra, 20(sp)
-// 0x0106c994: 0x106c994: lw    s0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106c998: 0x106c998: jr    ra addiu sp, sp, 24
+// 0x0106c8d8: 0x106c8d8: lw    ra, 20(sp)
+// 0x0106c8dc: 0x106c8dc: sll   zero, zero, 0
+// 0x0106c8e0: 0x106c8e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RealTime_Warning_106c9a0(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Report_Segments_106c8e8(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 s0,int32 v1,int32 s2,int32 s3,int32 s4,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local  8 is register s0
+// local  6 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local 12 is register s4
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local 13 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -246,406 +164,363 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106c9a0: 0x106c9a0: addiu sp, sp, -24
+// 0x0106c8e8: 0x106c8e8: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106c9a4: 0x106c9a4: sw    s0, 16(sp)
+// 0x0106c8ec: 0x106c8ec: sw    s4, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 12
+	stelem.i4
+// 0x0106c8f0: 0x106c8f0: sw    s1, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 6
+	stelem.i4
+// 0x0106c8f4: 0x106c8f4: sw    s0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
+	ldloc 8
+	stelem.i4
+// 0x0106c8f8: 0x106c8f8: sw    ra, 36(sp)
+// 0x0106c8fc: 0x106c8fc: sw    s3, 28(sp)
 	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 11
+	stelem.i4
+// 0x0106c900: 0x106c900: jal   0x10b6350 sw    s2, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 10
 	stelem.i4
-// 0x0106c9a8: 0x106c9a8: sw    ra, 20(sp)
-// 0x0106c9ac: 0x106c9ac: jal   0x106c170 addu  s0, a0, zero
-	ldloc.1
-	stloc 7
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_count_10b6350(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0106c9b4: 0x106c9b4: bne   v0, zero, 0x106c9ec lui   v0, 0x0
-	ldloc 5
+// 0x0106c908: 0x106c908: addu  s1, zero, zero
 	ldc.i4.s 0
-	stloc 5
-	brtrue L_106c9ec
+	stloc 6
+// 0x0106c90c: 0x106c90c: addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 8
+// 0x0106c910: 0x106c910: j	 0x106c924 addu  s4, v0, zero
+	ldloc 5
+	stloc 12
+	br L_106c924
 // --- basic block ---
-// 0x0106c9bc: 0x106c9bc: lw    v0, 15216(v0)
+L_106c918:
+// 0x0106c918: 0x106c918: jal   0x1072874 addiu s1, s1, 1
 	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::RTNet_ReportOneSegment_MaxLength_1072874(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
+// --- basic block ---
+// 0x0106c920: 0x106c920: addu  s0, s0, v0
+	ldloc 8
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3804
 	add
-	ldelem.i4
+	stloc 8
+L_106c924:
+// 0x0106c924: 0x106c924: slt   v0, s1, s4
+	ldloc 6
+	ldloc 12
+	clt
 	stloc 5
-// 0x0106c9c0: 0x106c9c0: sll   zero, zero, 0
-// 0x0106c9c4: 0x106c9c4: bne   v0, zero, 0x106c9ec lui   a0, 0x10000
+// 0x0106c928: 0x106c928: bne   v0, zero, 0x106c918 addu  a0, s1, zero
 	ldloc 5
-	ldc.i4 65536
+	ldloc 6
 	stloc.1
-	brtrue L_106c9ec
+	brtrue L_106c918
 // --- basic block ---
-// 0x0106c9cc: 0x106c9cc: jal   0x101cd60 addiu a0, a0, 22368
-	ldloc.1
-	ldc.i4 22368
-	add
+// 0x0106c930: 0x106c930: beq   s0, zero, 0x106c9bc addu  s3, zero, zero
+	ldloc 8
+	ldc.i4.s 0
+	stloc 11
+	brfalse L_106c9bc
+// --- basic block ---
+// 0x0106c938: 0x106c938: jal   0x1000910 addu  a0, s0, zero
+	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
+// --- basic block ---
+// 0x0106c940: 0x106c940: addu  s0, v0, zero
+	ldloc 5
 	stloc 8
+// 0x0106c944: 0x106c944: sb    zero, 0(v0)
+	ldloc 5
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0106c948: 0x106c948: addu  s3, v0, zero
+	ldloc 5
+	stloc 11
+// 0x0106c94c: 0x106c94c: addu  s2, v0, zero
+	ldloc 5
+	stloc 10
+// 0x0106c950: 0x106c950: j	 0x106c9b0 addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_106c9b0
+// --- basic block ---
+L_106c958:
+// 0x0106c958: 0x106c958: jal   0x10b5dfc sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl135::editor_line_committed_10b5dfc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0106c9d4: 0x106c9d4: addu  a1, v0, zero
+// 0x0106c960: 0x106c960: bne   v0, zero, 0x106c9ac addu  a0, s2, zero
 	ldloc 5
-	stloc.2
-// 0x0106c9d8: 0x106c9d8: addu  a0, s0, zero
-	ldloc 7
+	ldloc 10
 	stloc.1
-// 0x0106c9dc: 0x106c9dc: jal   0x1001af8 addiu a2, zero, 128
-	ldc.i4 128
-	stloc.3
+	brtrue L_106c9ac
+// --- basic block ---
+// 0x0106c968: 0x106c968: jal   0x1072cac addu  a1, s1, zero
+	ldloc 6
+	stloc.2
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl86::RTNet_ReportOneSegment_Encode_1072cac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0106c9e4: 0x106c9e4: j	 0x106c9f0 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106c9f0
+// 0x0106c970: 0x106c970: bne   v0, zero, 0x106c9a0 addu  a0, s2, zero
+	ldloc 5
+	ldloc 10
+	stloc.1
+	brtrue L_106c9a0
 // --- basic block ---
-L_106c9ec:
-// 0x0106c9ec: 0x106c9ec: addu  v0, zero, zero
+// 0x0106c978: 0x106c978: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106c97c: 0x106c97c: lui   a0, 0x0
 	ldc.i4.s 0
-	stloc 5
-L_106c9f0:
-// 0x0106c9f0: 0x106c9f0: lw    ra, 20(sp)
-// 0x0106c9f4: 0x106c9f4: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc.1
+// 0x0106c980: 0x106c980: addiu a1, a1, 22552
+	ldloc.2
+	ldc.i4 22552
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106c9f8: 0x106c9f8: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+	stloc.2
+// 0x0106c984: 0x106c984: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_Alert_ReportAtLocation_106ca00(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra,int32 t0)
-
-// local  7 is register v0
-// local  5 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register t0
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 5
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+	stloc.1
+// 0x0106c988: 0x106c988: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	stloc 5
 // --- basic block ---
-// 0x0106ca00: 0x106ca00: addu  v1, a1, zero
+// 0x0106c990: 0x106c990: jal   0x1000930 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	stloc 5
-// 0x0106ca04: 0x106ca04: addu  v0, a2, zero
 	ldloc.3
-	stloc 7
-// 0x0106ca08: 0x106ca08: addu  a2, v1, zero
-	ldloc 5
-	stloc.3
-// 0x0106ca0c: 0x106ca0c: lui   v1, 0x10000
-	ldc.i4 65536
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 5
-// 0x0106ca10: 0x106ca10: addiu sp, sp, -64
-	ldloc.0
-	ldc.i4.s -64
-	add
-	stloc.0
-// 0x0106ca14: 0x106ca14: addiu v1, v1, 18500
-	ldloc 5
-	ldc.i4 18500
-	add
+// --- basic block ---
+// 0x0106c998: 0x106c998: j	 0x106c9bc addu  s3, zero, zero
+	ldc.i4.s 0
+	stloc 11
+	br L_106c9bc
+// --- basic block ---
+L_106c9a0:
+// 0x0106c9a0: 0x106c9a0: jal   0x1001b48 sll   zero, zero, 0
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 5
-// 0x0106ca18: 0x106ca18: sw    v1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+// --- basic block ---
+// 0x0106c9a8: 0x106c9a8: addu  s2, s2, v0
+	ldloc 10
 	ldloc 5
-	stelem.i4
-// 0x0106ca1c: 0x106ca1c: addiu v1, sp, 76
-	ldloc.0
-	ldc.i4.s 76
 	add
-	stloc 5
-// 0x0106ca20: 0x106ca20: sw    v1, 28(sp)
+	stloc 10
+L_106c9ac:
+// 0x0106c9ac: 0x106c9ac: addiu s1, s1, 1
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4.1
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106ca24: 0x106ca24: lw    v1, 96(sp)
+	stloc 6
+L_106c9b0:
+// 0x0106c9b0: 0x106c9b0: slt   v0, s1, s4
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldelem.i4
+	ldloc 12
+	clt
 	stloc 5
-// 0x0106ca28: 0x106ca28: addu  t0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0106ca2c: 0x106ca2c: sw    v1, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
+// 0x0106c9b4: 0x106c9b4: bne   v0, zero, 0x106c958 addu  a0, s1, zero
 	ldloc 5
-	stelem.i4
-// 0x0106ca30: 0x106ca30: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106ca34: 0x106ca34: lui   v1, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106ca38: 0x106ca38: sw    a3, 76(sp)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldloc 4
-	stelem.i4
-// 0x0106ca3c: 0x106ca3c: addiu v1, v1, 4572
-	ldloc 5
-	ldc.i4 4572
-	add
+	stloc.1
+	brtrue L_106c958
+// --- basic block ---
+L_106c9bc:
+// 0x0106c9bc: 0x106c9bc: lw    ra, 36(sp)
+// 0x0106c9c0: 0x106c9c0: addu  v0, s3, zero
+	ldloc 11
 	stloc 5
-// 0x0106ca40: 0x106ca40: addu  a3, v0, zero
+// 0x0106c9c4: 0x106c9c4: lw    s4, 32(sp)
 	ldloc 7
-	stloc 4
-// 0x0106ca44: 0x106ca44: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106ca48: 0x106ca48: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 7
-// 0x0106ca4c: 0x106ca4c: addu  a1, t0, zero
-	ldloc 9
-	stloc.2
-// 0x0106ca50: 0x106ca50: sw    ra, 60(sp)
-// 0x0106ca54: 0x106ca54: sw    v0, 36(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.8
 	add
+	ldelem.i4
+	stloc 12
+// 0x0106c9c8: 0x106c9c8: lw    s3, 28(sp)
 	ldloc 7
-	stelem.i4
-// 0x0106ca58: 0x106ca58: sw    v1, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106ca5c: 0x106ca5c: sw    zero, 20(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106ca60: 0x106ca60: sw    zero, 24(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 11
+// 0x0106c9cc: 0x106c9cc: lw    s2, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106ca64: 0x106ca64: jal   0x1074358 sw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 7
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_ReportAlertAtPosition_1074358(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 7
-// --- basic block ---
-// 0x0106ca6c: 0x106ca6c: bne   v0, zero, 0x106ca90 lui   a0, 0x0
+	ldelem.i4
+	stloc 10
+// 0x0106c9d0: 0x106c9d0: lw    s1, 20(sp)
 	ldloc 7
-	ldc.i4.s 0
-	stloc.1
-	brtrue L_106ca90
-// --- basic block ---
-// 0x0106ca74: 0x106ca74: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106ca78: 0x106ca78: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106ca7c: 0x106ca7c: addiu a1, a1, 22344
-	ldloc.2
-	ldc.i4 22344
-	add
-	stloc.2
-// 0x0106ca80: 0x106ca80: addiu a2, zero, 5
-	ldc.i4.5
-	stloc.3
-// 0x0106ca84: 0x106ca84: jal   0x104bfe4 sw    v0, 48(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.5
 	add
+	ldelem.i4
+	stloc 6
+// 0x0106c9d4: 0x106c9d4: lw    s0, 16(sp)
 	ldloc 7
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 7
-// --- basic block ---
-// 0x0106ca8c: 0x106ca8c: lw    v0, 48(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 7
-L_106ca90:
-// 0x0106ca90: 0x106ca90: lw    ra, 60(sp)
-// 0x0106ca94: 0x106ca94: sll   zero, zero, 0
-// 0x0106ca98: 0x106ca98: jr    ra addiu sp, sp, 64
+	stloc 8
+// 0x0106c9d8: 0x106c9d8: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 64
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 5
 	ret
 }
-.method public static int32 Realtime_Post_Alert_Comment_106caa0(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Editor_ExportSegments_106c9e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
+// local  7 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  8 is register ra
+// local 10 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -655,111 +530,178 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
 	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106caa0: 0x106caa0: addiu sp, sp, -40
+// 0x0106c9e0: 0x106c9e0: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106caa4: 0x106caa4: addu  v0, a2, zero
-	ldloc.3
-	stloc 5
-// 0x0106caa8: 0x106caa8: addu  t0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0106caac: 0x106caac: addu  v1, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106cab0: 0x106cab0: sw    a3, 16(sp)
+// 0x0106c9e4: 0x106c9e4: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 4
+	ldloc 9
 	stelem.i4
-// 0x0106cab4: 0x106cab4: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106cab8: 0x106cab8: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x0106cabc: 0x106cabc: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106cac0: 0x106cac0: addiu v0, v0, -1408
-	ldloc 5
-	ldc.i4 -1408
-	add
-	stloc 5
-// 0x0106cac4: 0x106cac4: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106cac8: 0x106cac8: addu  a1, t0, zero
-	ldloc 9
-	stloc.2
-// 0x0106cacc: 0x106cacc: addu  a2, v1, zero
-	ldloc 7
-	stloc.3
-// 0x0106cad0: 0x106cad0: sw    ra, 36(sp)
-// 0x0106cad4: 0x106cad4: jal   0x10745c0 sw    v0, 20(sp)
+// 0x0106c9e8: 0x106c9e8: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
+// 0x0106c9ec: 0x106c9ec: sw    ra, 36(sp)
+// 0x0106c9f0: 0x106c9f0: jal   0x106c8e8 addu  s1, a0, zero
+	ldloc.1
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_PostAlertComment_10745c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_Report_Segments_106c8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106cadc: 0x106cadc: bne   v0, zero, 0x106cb00 lui   a0, 0x0
+// 0x0106c9f8: 0x106c9f8: addu  s0, v0, zero
 	ldloc 5
+	stloc 7
+// 0x0106c9fc: 0x106c9fc: beq   s0, zero, 0x106ca70 addu  v0, zero, zero
+	ldloc 7
 	ldc.i4.s 0
+	stloc 5
+	brfalse L_106ca70
+// --- basic block ---
+// 0x0106ca04: 0x106ca04: lb    v1, 0(s0)
+	ldloc 7
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 8
+// 0x0106ca08: 0x106ca08: sll   zero, zero, 0
+// 0x0106ca0c: 0x106ca0c: beq   v1, zero, 0x106ca64 addu  a0, s0, zero
+	ldloc 8
+	ldloc 7
 	stloc.1
-	brtrue L_106cb00
+	brfalse L_106ca64
 // --- basic block ---
-// 0x0106cae4: 0x106cae4: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x0106ca14: 0x106ca14: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106ca18: 0x106ca18: lw    v0, 18024(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4506
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106ca1c: 0x106ca1c: sll   zero, zero, 0
+// 0x0106ca20: 0x106ca20: beq   v0, zero, 0x106ca44 lui   a0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc.1
+	brfalse L_106ca44
+// --- basic block ---
+// 0x0106ca28: 0x106ca28: jal   0x108e9cc addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl106::Realtime_OfflineWrite_108e9cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106ca30: 0x106ca30: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106ca34: 0x106ca34: jalr  s1 addu  a1, zero, zero
+	ldloc 9
+	ldc.i4.s 0
 	stloc.2
-// 0x0106cae8: 0x106cae8: addiu a0, a0, 30092
+	ldloc.0
 	ldloc.1
-	ldc.i4 30092
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106ca3c: 0x106ca3c: j	 0x106ca60 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_106ca60
+// --- basic block ---
+L_106ca44:
+// 0x0106ca44: 0x106ca44: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106ca48: 0x106ca48: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106ca4c: 0x106ca4c: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106caec: 0x106caec: addiu a1, a1, 22396
-	ldloc.2
-	ldc.i4 22396
+// 0x0106ca50: 0x106ca50: addiu a2, a2, -1328
+	ldloc.3
+	ldc.i4 -1328
 	add
-	stloc.2
-// 0x0106caf0: 0x106caf0: addiu a2, zero, 5
-	ldc.i4.5
 	stloc.3
-// 0x0106caf4: 0x106caf4: jal   0x104bfe4 sw    v0, 24(sp)
+// 0x0106ca54: 0x106ca54: addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+// 0x0106ca58: 0x106ca58: jal   0x10740b4 sw    s1, 18076(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4519
+	add
+	ldloc 9
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl87::RTNet_GeneralPacket_10740b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+L_106ca60:
+// 0x0106ca60: 0x106ca60: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+L_106ca64:
+// 0x0106ca64: 0x106ca64: jal   0x1000930 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldloc 5
 	stelem.i4
@@ -768,54 +710,75 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106cafc: 0x106cafc: lw    v0, 24(sp)
+// 0x0106ca6c: 0x106ca6c: lw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldelem.i4
 	stloc 5
-L_106cb00:
-// 0x0106cb00: 0x106cb00: lw    ra, 36(sp)
-// 0x0106cb04: 0x106cb04: sll   zero, zero, 0
-// 0x0106cb08: 0x106cb08: jr    ra addiu sp, sp, 40
+L_106ca70:
+// 0x0106ca70: 0x106ca70: lw    ra, 36(sp)
+// 0x0106ca74: 0x106ca74: lw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106ca78: 0x106ca78: lw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106ca7c: 0x106ca7c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_TripServer_FindTrip_106cb10(int32,int32,int32,int32,int32)
+.method public static int32 ReportOneMarker_106ca84(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 v1,int32 s3,int32 ra)
 
-// local  7 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  9 is register s2
+// local 11 is register s3
 // local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
+// local 12 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -824,245 +787,373 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106cb10: 0x106cb10: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106cb14: 0x106cb14: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106cb18: 0x106cb18: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106cb1c: 0x106cb1c: addiu sp, sp, -24
+// 0x0106ca84: 0x106ca84: addiu sp, sp, -136
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4 -136
 	add
 	stloc.0
-// 0x0106cb20: 0x106cb20: addiu a0, a0, 17728
+// 0x0106ca88: 0x106ca88: sw    s0, 116(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 29
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106ca8c: 0x106ca8c: addu  s0, a1, zero
+	ldloc.2
+	stloc 7
+// 0x0106ca90: 0x106ca90: sw    s3, 128(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 32
+	add
+	ldloc 11
+	stelem.i4
+// 0x0106ca94: 0x106ca94: sw    s2, 124(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106ca98: 0x106ca98: addu  s3, a0, zero
 	ldloc.1
-	ldc.i4 17728
+	stloc 11
+// 0x0106ca9c: 0x106ca9c: addiu s2, sp, 72
+	ldloc.0
+	ldc.i4.s 72
+	add
+	stloc 9
+// 0x0106caa0: 0x106caa0: addiu a1, sp, 64
+	ldloc.0
+	ldc.i4.s 64
 	add
+	stloc.2
+// 0x0106caa4: 0x106caa4: addu  a0, s0, zero
+	ldloc 7
 	stloc.1
-// 0x0106cb24: 0x106cb24: sw    ra, 20(sp)
-// 0x0106cb28: 0x106cb28: jal   0x107346c addiu a2, a2, -1572
-	ldloc.3
-	ldc.i4 -1572
+// 0x0106caa8: 0x106caa8: addiu a2, sp, 60
+	ldloc.0
+	ldc.i4.s 60
 	add
 	stloc.3
+// 0x0106caac: 0x106caac: sw    ra, 132(sp)
+// 0x0106cab0: 0x106cab0: jal   0x10b4548 sw    s1, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_TripServer_FindTrip_107346c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_position_10b4548(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stloc 10
+	stloc 6
 // --- basic block ---
-// 0x0106cb30: 0x106cb30: lw    ra, 20(sp)
-// 0x0106cb34: 0x106cb34: sll   zero, zero, 0
-// 0x0106cb38: 0x106cb38: jr    ra addiu sp, sp, 24
+// 0x0106cab8: 0x106cab8: addiu s1, sp, 92
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 92
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 Realtime_TripServer_DeletePOI_106cb40(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
 	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106cb40: 0x106cb40: addu  a1, a0, zero
-	ldloc.1
+// 0x0106cabc: 0x106cabc: addiu a1, sp, 48
+	ldloc.0
+	ldc.i4.s 48
+	add
 	stloc.2
-// 0x0106cb44: 0x106cb44: lui   a2, 0x1070000
-	ldc.i4 17235968
+// 0x0106cac0: 0x106cac0: addiu a2, sp, 52
+	ldloc.0
+	ldc.i4.s 52
+	add
 	stloc.3
-// 0x0106cb48: 0x106cb48: lui   a0, 0x70000
-	ldc.i4 458752
+// 0x0106cac4: 0x106cac4: addu  a3, s2, zero
+	ldloc 9
+	stloc 4
+// 0x0106cac8: 0x106cac8: addu  a0, s0, zero
+	ldloc 7
 	stloc.1
-// 0x0106cb4c: 0x106cb4c: addiu sp, sp, -24
+// 0x0106cacc: 0x106cacc: addiu v0, sp, 56
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s 56
 	add
-	stloc.0
-// 0x0106cb50: 0x106cb50: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+	stloc 6
+// 0x0106cad0: 0x106cad0: sw    s1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.1
-// 0x0106cb54: 0x106cb54: sw    ra, 20(sp)
-// 0x0106cb58: 0x106cb58: jal   0x1073504 addiu a2, a2, -1572
-	ldloc.3
-	ldc.i4 -1572
+	ldloc 8
+	stelem.i4
+// 0x0106cad4: 0x106cad4: jal   0x10b4404 sw    v0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.3
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_TripServer_DeletePOI_1073504(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_export_10b4404(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stloc 10
+	stloc 6
+// --- basic block ---
+// 0x0106cadc: 0x106cadc: jal   0x10b4500 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl134::editor_marker_type_10b4500(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
+	stloc 6
 // --- basic block ---
-// 0x0106cb60: 0x106cb60: lw    ra, 20(sp)
-// 0x0106cb64: 0x106cb64: sll   zero, zero, 0
-// 0x0106cb68: 0x106cb68: jr    ra addiu sp, sp, 24
+// 0x0106cae4: 0x106cae4: addu  a1, v0, zero
+	ldloc 6
+	stloc.2
+// 0x0106cae8: 0x106cae8: lw    v0, 60(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 Realtime_TripServer_GetNumPOIs_106cb70(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	ldelem.i4
+	stloc 6
+// 0x0106caec: 0x106caec: lw    a2, 64(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
+	stloc.3
+// 0x0106caf0: 0x106caf0: sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+// 0x0106caf4: 0x106caf4: lw    v0, 52(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106caf8: 0x106caf8: lw    a3, 68(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldelem.i4
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x0106cafc: 0x106cafc: sw    v0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 6
+	stelem.i4
+// 0x0106cb00: 0x106cb00: lw    v0, 56(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106cb70: 0x106cb70: lui   a0, 0x70000
+// 0x0106cb04: 0x106cb04: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0106cb74: 0x106cb74: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x0106cb78: 0x106cb78: addiu sp, sp, -24
+// 0x0106cb08: 0x106cb08: sw    v0, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.0
-// 0x0106cb7c: 0x106cb7c: addiu a0, a0, 17728
+	ldloc 6
+	stelem.i4
+// 0x0106cb0c: 0x106cb0c: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 6
+// 0x0106cb10: 0x106cb10: addiu v0, v0, -1212
+	ldloc 6
+	ldc.i4 -1212
+	add
+	stloc 6
+// 0x0106cb14: 0x106cb14: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106cb80: 0x106cb80: sw    ra, 20(sp)
-// 0x0106cb84: 0x106cb84: jal   0x107356c addiu a1, a1, -1572
-	ldloc.2
-	ldc.i4 -1572
+// 0x0106cb18: 0x106cb18: sw    s2, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.2
+	ldloc 9
+	stelem.i4
+// 0x0106cb1c: 0x106cb1c: sw    s1, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106cb20: 0x106cb20: sw    s3, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 11
+	stelem.i4
+// 0x0106cb24: 0x106cb24: jal   0x10744f4 sw    v0, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_TripServer_GetNumPOIs_107356c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_ReportMarker_10744f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
+	stloc 6
+// --- basic block ---
+// 0x0106cb2c: 0x106cb2c: lw    ra, 132(sp)
+// 0x0106cb30: 0x106cb30: lw    s3, 128(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 32
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106cb34: 0x106cb34: lw    s2, 124(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106cb38: 0x106cb38: lw    s1, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldelem.i4
 	stloc 8
+// 0x0106cb3c: 0x106cb3c: lw    s0, 116(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 29
+	add
+	ldelem.i4
 	stloc 7
-// --- basic block ---
-// 0x0106cb8c: 0x106cb8c: lw    ra, 20(sp)
-// 0x0106cb90: 0x106cb90: sll   zero, zero, 0
-// 0x0106cb94: 0x106cb94: jr    ra addiu sp, sp, 24
+// 0x0106cb40: 0x106cb40: jr    ra addiu sp, sp, 136
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4 136
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 6
 	ret
 }
-.method public static int32 Realtime_TripServer_GetPOIs_106cb9c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Report_Markers_106cb48(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s1,int32 v1,int32 s2,int32 s3,int32 s0,int32 s4,int32 ra)
 
-// local  7 is register v0
+// local  5 is register v0
 // local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local 11 is register s0
+// local  7 is register s1
+// local  9 is register s2
+// local 10 is register s3
+// local 12 is register s4
 // local  0 is register sp
-// local  5 is register ra
+// local 13 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
 	stloc 8
 	ldarg 1
@@ -1073,184 +1164,308 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106cb9c: 0x106cb9c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106cba0: 0x106cba0: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x0106cba4: 0x106cba4: addiu sp, sp, -24
+// 0x0106cb48: 0x106cb48: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106cba8: 0x106cba8: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106cbac: 0x106cbac: sw    ra, 20(sp)
-// 0x0106cbb0: 0x106cbb0: jal   0x10735b4 addiu a1, a1, -1572
-	ldloc.2
-	ldc.i4 -1572
-	add
-	stloc.2
+// 0x0106cb4c: 0x106cb4c: sw    s4, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 12
+	stelem.i4
+// 0x0106cb50: 0x106cb50: sw    s3, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106cb54: 0x106cb54: sw    ra, 36(sp)
+// 0x0106cb58: 0x106cb58: sw    s2, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106cb5c: 0x106cb5c: sw    s1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106cb60: 0x106cb60: jal   0x10b483c sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 11
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_TripServer_GetPOIs_10735b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_marker_count_10b483c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106cbb8: 0x106cbb8: lw    ra, 20(sp)
-// 0x0106cbbc: 0x106cbbc: sll   zero, zero, 0
-// 0x0106cbc0: 0x106cbc0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 Realtime_TripServer_CreatePOI_106cbc8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register t0
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
+// 0x0106cb68: 0x106cb68: addu  s4, v0, zero
+	ldloc 5
+	stloc 12
+// 0x0106cb6c: 0x106cb6c: beq   v0, zero, 0x106cbf8 addu  s3, zero, zero
+	ldloc 5
 	ldc.i4.s 0
+	stloc 10
+	brfalse L_106cbf8
+// --- basic block ---
+// 0x0106cb74: 0x106cb74: jal   0x1000910 sll   a0, v0, 10
+	ldloc 5
+	ldc.i4.s 10
+	shl
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
+// --- basic block ---
+// 0x0106cb7c: 0x106cb7c: addu  s0, v0, zero
+	ldloc 5
+	stloc 11
+// 0x0106cb80: 0x106cb80: sb    zero, 0(v0)
+	ldloc 5
 	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0106cb84: 0x106cb84: addu  s3, v0, zero
+	ldloc 5
+	stloc 10
+// 0x0106cb88: 0x106cb88: addu  s2, v0, zero
+	ldloc 5
 	stloc 9
-	ldarg 0
-	stloc 0
+// 0x0106cb8c: 0x106cb8c: j	 0x106cbec addu  s1, zero, zero
 	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	stloc 7
+	br L_106cbec
 // --- basic block ---
-// 0x0106cbc8: 0x106cbc8: addiu sp, sp, -32
+L_106cb94:
+// 0x0106cb94: 0x106cb94: jal   0x10b4308 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106cbcc: 0x106cbcc: addu  v0, a2, zero
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl134::editor_marker_committed_10b4308(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x0106cbd0: 0x106cbd0: addu  t0, a0, zero
+// --- basic block ---
+// 0x0106cb9c: 0x106cb9c: bne   v0, zero, 0x106cbe8 addu  a0, s2, zero
+	ldloc 5
+	ldloc 9
+	stloc.1
+	brtrue L_106cbe8
+// --- basic block ---
+// 0x0106cba4: 0x106cba4: jal   0x106ca84 addu  a1, s1, zero
+	ldloc 7
+	stloc.2
+	ldloc.0
 	ldloc.1
-	stloc 9
-// 0x0106cbd4: 0x106cbd4: addu  v1, a1, zero
 	ldloc.2
-	stloc 7
-// 0x0106cbd8: 0x106cbd8: sw    a3, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+	ldloc.3
 	ldloc 4
-	stelem.i4
-// 0x0106cbdc: 0x106cbdc: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106cbe0: 0x106cbe0: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x0106cbe4: 0x106cbe4: lui   v0, 0x1070000
-	ldc.i4 17235968
+	call int32 Cibyl81::ReportOneMarker_106ca84(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x0106cbe8: 0x106cbe8: addiu v0, v0, -1572
+// --- basic block ---
+// 0x0106cbac: 0x106cbac: bne   v0, zero, 0x106cbdc addu  a0, s2, zero
 	ldloc 5
-	ldc.i4 -1572
+	ldloc 9
+	stloc.1
+	brtrue L_106cbdc
+// --- basic block ---
+// 0x0106cbb4: 0x106cbb4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106cbb8: 0x106cbb8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106cbbc: 0x106cbbc: addiu a1, a1, 22576
+	ldloc.2
+	ldc.i4 22576
 	add
-	stloc 5
-// 0x0106cbec: 0x106cbec: addiu a0, a0, 17728
+	stloc.2
+// 0x0106cbc0: 0x106cbc0: addiu a0, a0, 30092
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 30092
 	add
 	stloc.1
-// 0x0106cbf0: 0x106cbf0: addu  a1, t0, zero
-	ldloc 9
-	stloc.2
-// 0x0106cbf4: 0x106cbf4: addu  a2, v1, zero
-	ldloc 7
+// 0x0106cbc4: 0x106cbc4: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
 	stloc.3
-// 0x0106cbf8: 0x106cbf8: sw    ra, 28(sp)
-// 0x0106cbfc: 0x106cbfc: jal   0x10735fc sw    v0, 20(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106cbcc: 0x106cbcc: jal   0x1000930 addu  a0, s0, zero
+	ldloc 11
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_TripServer_CreatePOI_10735fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106cbd4: 0x106cbd4: j	 0x106cbf8 addu  s3, zero, zero
+	ldc.i4.s 0
+	stloc 10
+	br L_106cbf8
+// --- basic block ---
+L_106cbdc:
+// 0x0106cbdc: 0x106cbdc: jal   0x1001b48 sll   zero, zero, 0
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106cbe4: 0x106cbe4: addu  s2, s2, v0
+	ldloc 9
+	ldloc 5
+	add
+	stloc 9
+L_106cbe8:
+// 0x0106cbe8: 0x106cbe8: addiu s1, s1, 1
+	ldloc 7
+	ldc.i4.1
+	add
 	stloc 7
+L_106cbec:
+// 0x0106cbec: 0x106cbec: slt   v0, s1, s4
+	ldloc 7
+	ldloc 12
+	clt
 	stloc 5
+// 0x0106cbf0: 0x106cbf0: bne   v0, zero, 0x106cb94 addu  a0, s1, zero
+	ldloc 5
+	ldloc 7
+	stloc.1
+	brtrue L_106cb94
 // --- basic block ---
-// 0x0106cc04: 0x106cc04: lw    ra, 28(sp)
-// 0x0106cc08: 0x106cc08: sll   zero, zero, 0
-// 0x0106cc0c: 0x106cc0c: jr    ra addiu sp, sp, 32
+L_106cbf8:
+// 0x0106cbf8: 0x106cbf8: lw    ra, 36(sp)
+// 0x0106cbfc: 0x106cbfc: addu  v0, s3, zero
+	ldloc 10
+	stloc 5
+// 0x0106cc00: 0x106cc00: lw    s4, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 12
+// 0x0106cc04: 0x106cc04: lw    s3, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106cc08: 0x106cc08: lw    s2, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106cc0c: 0x106cc0c: lw    s1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106cc10: 0x106cc10: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106cc14: 0x106cc14: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_FoursquareCheckin_106cc60(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Editor_ExportMarkers_106cc1c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 ra)
 
 // local  5 is register v0
 // local  8 is register v1
@@ -1258,9 +1473,11 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
+// local 10 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -1274,60 +1491,224 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106cc60: 0x106cc60: addu  v0, a0, zero
+// 0x0106cc1c: 0x106cc1c: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106cc20: 0x106cc20: sw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106cc24: 0x106cc24: sw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106cc28: 0x106cc28: sw    ra, 36(sp)
+// 0x0106cc2c: 0x106cc2c: jal   0x106cb48 addu  s1, a0, zero
+	ldloc.1
+	stloc 9
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl81::Realtime_Report_Markers_106cb48(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x0106cc64: 0x106cc64: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106cc68: 0x106cc68: lui   a0, 0x70000
+// --- basic block ---
+// 0x0106cc34: 0x106cc34: addu  s0, v0, zero
+	ldloc 5
+	stloc 7
+// 0x0106cc38: 0x106cc38: beq   s0, zero, 0x106ccac addu  v0, zero, zero
+	ldloc 7
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_106ccac
+// --- basic block ---
+// 0x0106cc40: 0x106cc40: lb    v1, 0(s0)
+	ldloc 7
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 8
+// 0x0106cc44: 0x106cc44: sll   zero, zero, 0
+// 0x0106cc48: 0x106cc48: beq   v1, zero, 0x106cca0 addu  a0, s0, zero
+	ldloc 8
+	ldloc 7
+	stloc.1
+	brfalse L_106cca0
+// --- basic block ---
+// 0x0106cc50: 0x106cc50: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106cc54: 0x106cc54: lw    v0, 18024(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4506
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106cc58: 0x106cc58: sll   zero, zero, 0
+// 0x0106cc5c: 0x106cc5c: beq   v0, zero, 0x106cc80 lui   a0, 0x70000
+	ldloc 5
 	ldc.i4 458752
 	stloc.1
-// 0x0106cc6c: 0x106cc6c: addiu sp, sp, -24
+	brfalse L_106cc80
+// --- basic block ---
+// 0x0106cc64: 0x106cc64: jal   0x108e9cc addu  a0, s0, zero
+	ldloc 7
+	stloc.1
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106cc70: 0x106cc70: addu  a2, a1, zero
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl106::Realtime_OfflineWrite_108e9cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106cc6c: 0x106cc6c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106cc70: 0x106cc70: jalr  s1 addu  a1, zero, zero
+	ldloc 9
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0106cc78: 0x106cc78: j	 0x106cc9c addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_106cc9c
+// --- basic block ---
+L_106cc80:
+// 0x0106cc80: 0x106cc80: lui   a2, 0x1070000
+	ldc.i4 17235968
 	stloc.3
-// 0x0106cc74: 0x106cc74: addiu a0, a0, 17728
+// 0x0106cc84: 0x106cc84: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106cc88: 0x106cc88: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106cc78: 0x106cc78: addu  a1, v0, zero
-	ldloc 5
+// 0x0106cc8c: 0x106cc8c: addiu a2, a2, -1212
+	ldloc.3
+	ldc.i4 -1212
+	add
+	stloc.3
+// 0x0106cc90: 0x106cc90: addu  a1, s0, zero
+	ldloc 7
 	stloc.2
-// 0x0106cc7c: 0x106cc7c: sw    ra, 20(sp)
-// 0x0106cc80: 0x106cc80: jal   0x1074788 addiu a3, a3, -1264
+// 0x0106cc94: 0x106cc94: jal   0x10740b4 sw    s1, 18080(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4520
+	add
+	ldloc 9
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 -1264
+	call int32 Cibyl87::RTNet_GeneralPacket_10740b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+L_106cc9c:
+// 0x0106cc9c: 0x106cc9c: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+L_106cca0:
+// 0x0106cca0: 0x106cca0: jal   0x1000930 sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc 4
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_FoursquareCheckin_1074788(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106cc88: 0x106cc88: lw    ra, 20(sp)
-// 0x0106cc8c: 0x106cc8c: sll   zero, zero, 0
-// 0x0106cc90: 0x106cc90: jr    ra addiu sp, sp, 24
+// 0x0106cca8: 0x106cca8: lw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+L_106ccac:
+// 0x0106ccac: 0x106ccac: lw    ra, 36(sp)
+// 0x0106ccb0: 0x106ccb0: lw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106ccb4: 0x106ccb4: lw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106ccb8: 0x106ccb8: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -1337,7 +1718,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_FoursquareSearch_106cc98(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Remove_Alert_106ccc0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -1372,29 +1753,29 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106cc98: 0x106cc98: addu  a1, a0, zero
+// 0x0106ccc0: 0x106ccc0: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0106cc9c: 0x106cc9c: lui   a2, 0x1070000
+// 0x0106ccc4: 0x106ccc4: lui   a2, 0x1070000
 	ldc.i4 17235968
 	stloc.3
-// 0x0106cca0: 0x106cca0: lui   a0, 0x70000
+// 0x0106ccc8: 0x106ccc8: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0106cca4: 0x106cca4: addiu sp, sp, -24
+// 0x0106cccc: 0x106cccc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106cca8: 0x106cca8: addiu a0, a0, 17728
+// 0x0106ccd0: 0x106ccd0: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106ccac: 0x106ccac: sw    ra, 20(sp)
-// 0x0106ccb0: 0x106ccb0: jal   0x10747ec addiu a2, a2, -1264
+// 0x0106ccd4: 0x106ccd4: sw    ra, 20(sp)
+// 0x0106ccd8: 0x106ccd8: jal   0x10747f0 addiu a2, a2, -3180
 	ldloc.3
-	ldc.i4 -1264
+	ldc.i4 -3180
 	add
 	stloc.3
 	ldloc.0
@@ -1402,14 +1783,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_FoursquareSearch_10747ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_RemoveAlert_10747f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0106ccb8: 0x106ccb8: lw    ra, 20(sp)
-// 0x0106ccbc: 0x106ccbc: sll   zero, zero, 0
-// 0x0106ccc0: 0x106ccc0: jr    ra addiu sp, sp, 24
+// 0x0106cce0: 0x106cce0: lw    ra, 20(sp)
+// 0x0106cce4: 0x106cce4: sll   zero, zero, 0
+// 0x0106cce8: 0x106cce8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1421,25 +1802,33 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 Realtime_FoursquareConnect_106ccc8(int32,int32,int32,int32,int32)
+.method public static int32 SendMessage_CachedMapProblems_106ccf0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s6,int32 s4,int32 s5,int32 s2,int32 s7,int32 v1,int32 s3,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local 14 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local 12 is register s2
+// local 15 is register s3
+// local 10 is register s4
+// local 11 is register s5
+// local  9 is register s6
+// local 13 is register s7
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local 16 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 14
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1448,963 +1837,488 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 16
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ccc8: 0x106ccc8: addu  v0, a1, zero
-	ldloc.2
-	stloc 5
-// 0x0106cccc: 0x106cccc: addu  v1, a0, zero
-	ldloc.1
-	stloc 6
-// 0x0106ccd0: 0x106ccd0: addu  a3, a2, zero
-	ldloc.3
-	stloc 4
-// 0x0106ccd4: 0x106ccd4: lui   a0, 0x70000
+// 0x0106ccf0: 0x106ccf0: addiu sp, sp, -80
+	ldloc.0
+	ldc.i4.s -80
+	add
+	stloc.0
+// 0x0106ccf4: 0x106ccf4: lui   v0, 0x70000
 	ldc.i4 458752
-	stloc.1
-// 0x0106ccd8: 0x106ccd8: addu  a2, v0, zero
+	stloc 6
+// 0x0106ccf8: 0x106ccf8: sw    s0, 44(sp)
 	ldloc 5
-	stloc.3
-// 0x0106ccdc: 0x106ccdc: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106cce0: 0x106cce0: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc.0
-// 0x0106cce4: 0x106cce4: addiu v0, v0, -1264
+	ldloc 7
+	stelem.i4
+// 0x0106ccfc: 0x106ccfc: lw    s0, 18084(v0)
 	ldloc 5
-	ldc.i4 -1264
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 4521
 	add
-	stloc 5
-// 0x0106cce8: 0x106cce8: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+	ldelem.i4
+	stloc 7
+// 0x0106cd00: 0x106cd00: sw    s1, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
 	add
-	stloc.1
-// 0x0106ccec: 0x106ccec: addu  a1, v1, zero
-	ldloc 6
-	stloc.2
-// 0x0106ccf0: 0x106ccf0: sw    ra, 28(sp)
-// 0x0106ccf4: 0x106ccf4: jal   0x107486c sw    v0, 16(sp)
 	ldloc 8
+	stelem.i4
+// 0x0106cd04: 0x106cd04: addiu s0, s0, -1
+	ldloc 7
+	ldc.i4.m1
+	add
+	stloc 7
+// 0x0106cd08: 0x106cd08: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0106cd0c: 0x106cd0c: sw    s6, 68(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 17
 	add
+	ldloc 9
+	stelem.i4
+// 0x0106cd10: 0x106cd10: sw    s5, 64(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 11
 	stelem.i4
+// 0x0106cd14: 0x106cd14: sw    s4, 60(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_FoursquareConnect_107486c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106cd18: 0x106cd18: sll   v0, s0, 2
+	ldloc 7
+	ldc.i4.2
+	shl
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ccfc: 0x106ccfc: lw    ra, 28(sp)
-// 0x0106cd00: 0x106cd00: sll   zero, zero, 0
-// 0x0106cd04: 0x106cd04: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x0106cd1c: 0x106cd1c: addiu s1, s1, -18080
+	ldloc 8
+	ldc.i4 -18080
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_TwitterConnect_106cd0c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106cd0c: 0x106cd0c: addu  v0, a1, zero
-	ldloc.2
-	stloc 5
-// 0x0106cd10: 0x106cd10: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106cd14: 0x106cd14: addu  a3, a2, zero
-	ldloc.3
-	stloc 4
-// 0x0106cd18: 0x106cd18: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0106cd1c: 0x106cd1c: addiu v0, zero, 70
-	ldc.i4.s 70
-	stloc 5
-// 0x0106cd20: 0x106cd20: addu  v1, a0, zero
-	ldloc.1
-	stloc 7
-// 0x0106cd24: 0x106cd24: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106cd28: 0x106cd28: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106cd2c: 0x106cd2c: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106cd30: 0x106cd30: addiu v0, v0, -1204
-	ldloc 5
-	ldc.i4 -1204
-	add
-	stloc 5
-// 0x0106cd34: 0x106cd34: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106cd38: 0x106cd38: addu  a1, v1, zero
-	ldloc 7
-	stloc.2
-// 0x0106cd3c: 0x106cd3c: sw    ra, 28(sp)
-// 0x0106cd40: 0x106cd40: jal   0x10748e4 sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_TwitterConnect_10748e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106cd48: 0x106cd48: lw    ra, 28(sp)
-// 0x0106cd4c: 0x106cd4c: sll   zero, zero, 0
-// 0x0106cd50: 0x106cd50: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_SendSMS_106cd58(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106cd58: 0x106cd58: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x0106cd5c: 0x106cd5c: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106cd60: 0x106cd60: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106cd64: 0x106cd64: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106cd68: 0x106cd68: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106cd6c: 0x106cd6c: sw    ra, 20(sp)
-// 0x0106cd70: 0x106cd70: jal   0x1074964 addiu a2, a2, -1116
-	ldloc.3
-	ldc.i4 -1116
-	add
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_SendSMS_1074964(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0106cd78: 0x106cd78: lw    ra, 20(sp)
-// 0x0106cd7c: 0x106cd7c: sll   zero, zero, 0
-// 0x0106cd80: 0x106cd80: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 keyboard_callback_106cd88(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106cd88: 0x106cd88: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106cd8c: 0x106cd8c: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106cd90: 0x106cd90: sw    ra, 20(sp)
-// 0x0106cd94: 0x106cd94: bne   a0, v1, 0x106cdc8 addiu v0, zero, 1
-	ldloc.1
-	ldloc 6
-	ldc.i4.1
-	stloc 5
-	bne.un L_106cdc8
-// --- basic block ---
-// 0x0106cd9c: 0x106cd9c: beq   a1, zero, 0x106cdc8 addu  v0, zero, zero
-	ldloc.2
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_106cdc8
-// --- basic block ---
-// 0x0106cda4: 0x106cda4: lb    v0, 0(a1)
-	ldloc.2
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x0106cda8: 0x106cda8: sll   zero, zero, 0
-// 0x0106cdac: 0x106cdac: beq   v0, zero, 0x106cdc4 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106cdc4
-// --- basic block ---
-// 0x0106cdb4: 0x106cdb4: jal   0x106cd58 addu  a0, a1, zero
-	ldloc.2
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl81::Realtime_SendSMS_106cd58(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106cdbc: 0x106cdbc: j	 0x106cdc8 sll   zero, zero, 0
-	br L_106cdc8
-// --- basic block ---
-L_106cdc4:
-// 0x0106cdc4: 0x106cdc4: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_106cdc8:
-// 0x0106cdc8: 0x106cdc8: lw    ra, 20(sp)
-// 0x0106cdcc: 0x106cdcc: sll   zero, zero, 0
-// 0x0106cdd0: 0x106cdd0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_PinqWazer_106cdd8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register t0
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106cdd8: 0x106cdd8: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x0106cddc: 0x106cddc: addu  v0, a2, zero
-	ldloc.3
-	stloc 5
-// 0x0106cde0: 0x106cde0: sw    a3, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 4
-	stelem.i4
-// 0x0106cde4: 0x106cde4: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x0106cde8: 0x106cde8: lw    v0, 72(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106cdec: 0x106cdec: addu  t0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0106cdf0: 0x106cdf0: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106cdf4: 0x106cdf4: lw    v0, 76(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106cdf8: 0x106cdf8: addu  v1, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106cdfc: 0x106cdfc: sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106ce00: 0x106ce00: lw    v0, 80(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106ce04: 0x106ce04: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106ce08: 0x106ce08: sw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106ce0c: 0x106ce0c: lw    v0, 84(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106ce10: 0x106ce10: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106ce14: 0x106ce14: sw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106ce18: 0x106ce18: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106ce1c: 0x106ce1c: addiu v0, v0, -1004
-	ldloc 5
-	ldc.i4 -1004
-	add
-	stloc 5
-// 0x0106ce20: 0x106ce20: addu  a1, t0, zero
-	ldloc 9
-	stloc.2
-// 0x0106ce24: 0x106ce24: addu  a2, v1, zero
-	ldloc 7
-	stloc.3
-// 0x0106ce28: 0x106ce28: sw    ra, 52(sp)
-// 0x0106ce2c: 0x106ce2c: jal   0x1074208 sw    v0, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_PinqWazer_1074208(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ce34: 0x106ce34: bne   v0, zero, 0x106ce58 lui   a0, 0x0
-	ldloc 5
-	ldc.i4.s 0
-	stloc.1
-	brtrue L_106ce58
-// --- basic block ---
-// 0x0106ce3c: 0x106ce3c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106ce40: 0x106ce40: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106ce44: 0x106ce44: addiu a1, a1, 22420
-	ldloc.2
-	ldc.i4 22420
-	add
-	stloc.2
-// 0x0106ce48: 0x106ce48: addiu a2, zero, 5
-	ldc.i4.5
-	stloc.3
-// 0x0106ce4c: 0x106ce4c: jal   0x104bfe4 sw    v0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ce54: 0x106ce54: lw    v0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 5
-L_106ce58:
-// 0x0106ce58: 0x106ce58: lw    ra, 52(sp)
-// 0x0106ce5c: 0x106ce5c: sll   zero, zero, 0
-// 0x0106ce60: 0x106ce60: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_Report_Alert_106ce68(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local 10 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  9 is register s2
-// local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 10
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
 	stloc 8
-	ldc.i4.s 0
+// 0x0106cd20: 0x106cd20: lui   s6, 0x70000
+	ldc.i4 458752
 	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+// 0x0106cd24: 0x106cd24: lui   s5, 0x10000
+	ldc.i4 65536
 	stloc 11
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106ce68: 0x106ce68: addiu sp, sp, -72
-	ldloc.0
-	ldc.i4.s -72
-	add
-	stloc.0
-// 0x0106ce6c: 0x106ce6c: addu  v0, a2, zero
-	ldloc.3
-	stloc 5
-// 0x0106ce70: 0x106ce70: sw    a3, 16(sp)
-	ldloc 6
+// 0x0106cd28: 0x106cd28: lui   s4, 0x10000
+	ldc.i4 65536
+	stloc 10
+// 0x0106cd2c: 0x106cd2c: sw    s7, 72(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 18
 	add
-	ldloc 4
+	ldloc 13
 	stelem.i4
-// 0x0106ce74: 0x106ce74: addu  a3, v0, zero
+// 0x0106cd30: 0x106cd30: sw    s3, 56(sp)
 	ldloc 5
-	stloc 4
-// 0x0106ce78: 0x106ce78: lw    v0, 88(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106ce7c: 0x106ce7c: sw    s2, 64(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 14
 	add
-	ldloc 9
+	ldloc 15
 	stelem.i4
-// 0x0106ce80: 0x106ce80: sw    v0, 20(sp)
-	ldloc 6
+// 0x0106cd34: 0x106cd34: sw    s2, 52(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 13
 	add
-	ldloc 5
+	ldloc 12
 	stelem.i4
-// 0x0106ce84: 0x106ce84: lw    v0, 92(sp)
+// 0x0106cd38: 0x106cd38: sw    ra, 76(sp)
+// 0x0106cd3c: 0x106cd3c: addu  s1, s1, v0
+	ldloc 8
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106ce88: 0x106ce88: addu  s2, a0, zero
+	stloc 8
+// 0x0106cd40: 0x106cd40: addu  s7, a0, zero
 	ldloc.1
+	stloc 13
+// 0x0106cd44: 0x106cd44: addu  s2, a1, zero
+	ldloc.2
+	stloc 12
+// 0x0106cd48: 0x106cd48: addiu s6, s6, 18192
+	ldloc 9
+	ldc.i4 18192
+	add
 	stloc 9
-// 0x0106ce8c: 0x106ce8c: sw    v0, 24(sp)
-	ldloc 6
+// 0x0106cd4c: 0x106cd4c: addiu s5, s5, 21196
+	ldloc 11
+	ldc.i4 21196
+	add
+	stloc 11
+// 0x0106cd50: 0x106cd50: addiu s4, s4, 22668
+	ldloc 10
+	ldc.i4 22668
+	add
+	stloc 10
+// 0x0106cd54: 0x106cd54: j	 0x106ce00 addiu s3, sp, 32
 	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 15
+	br L_106ce00
+// --- basic block ---
+L_106cd5c:
+// 0x0106cd5c: 0x106cd5c: lw    v0, 0(s1)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldelem.i4
+	stloc 6
+// 0x0106cd60: 0x106cd60: addiu s1, s1, -4
+	ldloc 8
+	ldc.i4.s -4
+	add
+	stloc 8
+// 0x0106cd64: 0x106cd64: bne   v0, zero, 0x106cd88 addu  a1, v0, zero
+	ldloc 6
+	ldloc 6
+	stloc.2
+	brtrue L_106cd88
+// --- basic block ---
+// 0x0106cd6c: 0x106cd6c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106cd70: 0x106cd70: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106cd74: 0x106cd74: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106cd78: 0x106cd78: addiu a3, a3, 22600
+	ldloc 4
+	ldc.i4 22600
 	add
+	stloc 4
+// 0x0106cd7c: 0x106cd7c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106cd80: 0x106cd80: j	 0x106cdf0 addiu a2, zero, 1897
+	ldc.i4 1897
+	stloc.3
+	br L_106cdf0
+// --- basic block ---
+L_106cd88:
+// 0x0106cd88: 0x106cd88: lw    a2, 4(v0)
 	ldloc 5
-	stelem.i4
-// 0x0106ce90: 0x106ce90: lw    v0, 96(sp)
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106ce94: 0x106ce94: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106ce98: 0x106ce98: sw    v0, 28(sp)
+	stloc.3
+// 0x0106cd8c: 0x106cd8c: lw    a3, 8(v0)
+	ldloc 5
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106ce9c: 0x106ce9c: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106cea0: 0x106cea0: addu  a2, a1, zero
-	ldloc.2
-	stloc.3
-// 0x0106cea4: 0x106cea4: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+	ldc.i4.2
 	add
-	stloc.1
-// 0x0106cea8: 0x106cea8: addu  a1, s2, zero
-	ldloc 9
-	stloc.2
-// 0x0106ceac: 0x106ceac: addiu v0, v0, -912
+	ldelem.i4
+	stloc 4
+// 0x0106cd90: 0x106cd90: sw    s7, 24(sp)
 	ldloc 5
-	ldc.i4 -912
-	add
-	stloc 5
-// 0x0106ceb0: 0x106ceb0: sw    ra, 68(sp)
-// 0x0106ceb4: 0x106ceb4: sw    s1, 60(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 13
 	stelem.i4
-// 0x0106ceb8: 0x106ceb8: sw    s0, 56(sp)
-	ldloc 6
+// 0x0106cd94: 0x106cd94: sw    s3, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 15
 	stelem.i4
-// 0x0106cebc: 0x106cebc: addiu s1, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 8
-// 0x0106cec0: 0x106cec0: jal   0x10744e0 sw    v0, 32(sp)
-	ldloc 6
+// 0x0106cd98: 0x106cd98: jal   0x1074694 sw    zero, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_ReportAlert_10744e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_ReportMapProblem_1074694(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 5
+	stloc 14
+	stloc 6
 // --- basic block ---
-// 0x0106cec8: 0x106cec8: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0106cecc: 0x106cecc: addiu a2, a2, -13884
-	ldloc.3
-	ldc.i4 -13884
-	add
-	stloc.3
-// 0x0106ced0: 0x106ced0: addu  a0, s1, zero
-	ldloc 8
+// 0x0106cda0: 0x106cda0: beq   v0, zero, 0x106cdd8 addu  a0, s2, zero
+	ldloc 6
+	ldloc 12
 	stloc.1
-// 0x0106ced4: 0x106ced4: addiu a1, zero, 10
-	ldc.i4.s 10
+	brfalse L_106cdd8
+// --- basic block ---
+// 0x0106cda8: 0x106cda8: jal   0x1001b48 sll   zero, zero, 0
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 14
+	stloc 6
+// --- basic block ---
+// 0x0106cdb0: 0x106cdb0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106cdb4: 0x106cdb4: addu  a1, s5, zero
+	ldloc 11
 	stloc.2
-// 0x0106ced8: 0x106ced8: addu  a3, s2, zero
-	ldloc 9
+// 0x0106cdb8: 0x106cdb8: addiu a2, zero, 1903
+	ldc.i4 1903
+	stloc.3
+// 0x0106cdbc: 0x106cdbc: addu  a3, s4, zero
+	ldloc 10
 	stloc 4
-// 0x0106cedc: 0x106cedc: jal   0x1000f9c addu  s0, v0, zero
+// 0x0106cdc0: 0x106cdc0: sw    s0, 16(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x0106cdc4: 0x106cdc4: addu  s7, s2, v0
+	ldloc 12
+	ldloc 6
+	add
+	stloc 13
+// 0x0106cdc8: 0x106cdc8: jal   0x100449c addiu s0, s0, -1
+	ldloc 7
+	ldc.i4.m1
+	add
 	stloc 7
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 5
-// --- basic block ---
-// 0x0106cee4: 0x106cee4: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0106cee8: 0x106cee8: lw    a0, 28732(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 7183
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106ceec: 0x106ceec: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0106cef0: 0x106cef0: lw    a1, 28736(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 7184
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106cef4: 0x106cef4: jal   0x104bfdc addu  a2, s1, zero
-	ldloc 8
-	stloc.3
-	call void Cibyl56::roadmap_analytics_log_event_104bfdc()
+	stloc 14
+	stloc 6
 // --- basic block ---
-// 0x0106cefc: 0x106cefc: bne   s0, zero, 0x106cf18 lui   a0, 0x0
-	ldloc 7
-	ldc.i4.s 0
+// 0x0106cdd0: 0x106cdd0: j	 0x106ce04 addu  a0, s6, zero
+	ldloc 9
 	stloc.1
-	brtrue L_106cf18
+	br L_106ce04
 // --- basic block ---
-// 0x0106cf04: 0x106cf04: lui   a1, 0x10000
+L_106cdd8:
+// 0x0106cdd8: 0x106cdd8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106cf08: 0x106cf08: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106cf0c: 0x106cf0c: addiu a1, a1, 22344
+// 0x0106cddc: 0x106cddc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106cde0: 0x106cde0: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 22344
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106cf10: 0x106cf10: jal   0x104bfe4 addiu a2, zero, 5
-	ldc.i4.5
+// 0x0106cde4: 0x106cde4: addiu a3, a3, 22736
+	ldloc 4
+	ldc.i4 22736
+	add
+	stloc 4
+// 0x0106cde8: 0x106cde8: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106cdec: 0x106cdec: addiu a2, zero, 1907
+	ldc.i4 1907
 	stloc.3
+L_106cdf0:
+// 0x0106cdf0: 0x106cdf0: jal   0x100449c sw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 5
+	stloc 14
+	stloc 6
+// --- basic block ---
+// 0x0106cdf8: 0x106cdf8: j	 0x106ce0c addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_106ce0c
 // --- basic block ---
-L_106cf18:
-// 0x0106cf18: 0x106cf18: lw    ra, 68(sp)
-// 0x0106cf1c: 0x106cf1c: addu  v0, s0, zero
+L_106ce00:
+// 0x0106ce00: 0x106ce00: addu  a0, s6, zero
+	ldloc 9
+	stloc.1
+L_106ce04:
+// 0x0106ce04: 0x106ce04: bgez  s0, 0x106cd5c addiu v0, zero, 1
 	ldloc 7
-	stloc 5
-// 0x0106cf20: 0x106cf20: lw    s2, 64(sp)
-	ldloc 6
+	ldc.i4.1
+	stloc 6
+	ldc.i4.s 0
+	bge L_106cd5c
+// --- basic block ---
+L_106ce0c:
+// 0x0106ce0c: 0x106ce0c: lw    ra, 76(sp)
+// 0x0106ce10: 0x106ce10: lw    s7, 72(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldelem.i4
+	stloc 13
+// 0x0106ce14: 0x106ce14: lw    s6, 68(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106ce18: 0x106ce18: lw    s5, 64(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106cf24: 0x106cf24: lw    s1, 60(sp)
-	ldloc 6
+	stloc 11
+// 0x0106ce1c: 0x106ce1c: lw    s4, 60(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 15
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106cf28: 0x106cf28: lw    s0, 56(sp)
-	ldloc 6
+	stloc 10
+// 0x0106ce20: 0x106ce20: lw    s3, 56(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 14
 	add
 	ldelem.i4
+	stloc 15
+// 0x0106ce24: 0x106ce24: lw    s2, 52(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldelem.i4
+	stloc 12
+// 0x0106ce28: 0x106ce28: lw    s1, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106ce2c: 0x106ce2c: lw    s0, 44(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldelem.i4
 	stloc 7
-// 0x0106cf2c: 0x106cf2c: jr    ra addiu sp, sp, 72
+// 0x0106ce30: 0x106ce30: jr    ra addiu sp, sp, 80
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.s 80
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 14
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 OnRemoveUser_106cf34(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_ReportMapProblem_106ce38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s3,int32 s0,int32 s1,int32 s2,int32 s4,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -2412,11 +2326,11 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local 11 is register s1
-// local  9 is register s2
-// local 12 is register s3
-// local 10 is register s4
+// local  9 is register s0
+// local 10 is register s1
+// local 11 is register s2
+// local  8 is register s3
+// local 12 is register s4
 // local  0 is register sp
 // local 13 is register ra
 // local  6 is register mem
@@ -2434,15 +2348,15 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldc.i4.s 0
 	stloc 11
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldc.i4.s 0
 	stloc 12
-	ldc.i4.s 0
-	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
@@ -2451,542 +2365,738 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106cf34: 0x106cf34: addiu sp, sp, -304
+// 0x0106ce38: 0x106ce38: addiu sp, sp, -64
 	ldloc.0
-	ldc.i4 -304
+	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0106cf38: 0x106cf38: sw    s1, 284(sp)
+// 0x0106ce3c: 0x106ce3c: addiu v0, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 5
+// 0x0106ce40: 0x106ce40: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 71
+	ldc.i4.s 12
 	add
 	ldloc 11
 	stelem.i4
-// 0x0106cf3c: 0x106cf3c: addiu s1, a0, 68
-	ldloc.1
-	ldc.i4.s 68
+// 0x0106ce44: 0x106ce44: sw    s1, 44(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106ce48: 0x106ce48: sw    s0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
+	ldloc 9
+	stelem.i4
+// 0x0106ce4c: 0x106ce4c: addu  s1, a0, zero
+	ldloc.1
+	stloc 10
+// 0x0106ce50: 0x106ce50: addu  s2, a1, zero
+	ldloc.2
 	stloc 11
-// 0x0106cf40: 0x106cf40: sw    s0, 280(sp)
+// 0x0106ce54: 0x106ce54: addu  s0, a2, zero
+	ldloc.3
+	stloc 9
+// 0x0106ce58: 0x106ce58: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
-// 0x0106cf44: 0x106cf44: addu  s0, a0, zero
+// 0x0106ce5c: 0x106ce5c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106ce60: 0x106ce60: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106ce64: 0x106ce64: addiu v0, v0, 80
+	ldloc 5
+	ldc.i4.s 80
+	add
+	stloc 5
+// 0x0106ce68: 0x106ce68: addiu a0, a0, 18192
 	ldloc.1
-	stloc 8
-// 0x0106cf48: 0x106cf48: addu  a0, s1, zero
-	ldloc 11
+	ldc.i4 18192
+	add
 	stloc.1
-// 0x0106cf4c: 0x106cf4c: sw    ra, 300(sp)
-// 0x0106cf50: 0x106cf50: sw    s3, 292(sp)
+// 0x0106ce6c: 0x106ce6c: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x0106ce70: 0x106ce70: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106ce74: 0x106ce74: addu  a3, s0, zero
+	ldloc 9
+	stloc 4
+// 0x0106ce78: 0x106ce78: sw    s4, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 73
+	ldc.i4.s 14
 	add
 	ldloc 12
 	stelem.i4
-// 0x0106cf54: 0x106cf54: sw    s2, 288(sp)
+// 0x0106ce7c: 0x106ce7c: sw    ra, 60(sp)
+// 0x0106ce80: 0x106ce80: sw    s3, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 72
+	ldc.i4.s 13
 	add
-	ldloc 9
+	ldloc 8
 	stelem.i4
-// 0x0106cf58: 0x106cf58: sw    s4, 296(sp)
+// 0x0106ce84: 0x106ce84: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 74
+	ldc.i4.5
 	add
-	ldloc 10
+	ldloc 5
 	stelem.i4
-// 0x0106cf5c: 0x106cf5c: jal   0x101ca0c addiu s2, sp, 184
+// 0x0106ce88: 0x106ce88: jal   0x1074694 sw    zero, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4 184
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc 9
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_ReportMapProblem_1074694(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106cf64: 0x106cf64: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0106cf68: 0x106cf68: addiu a2, a2, 22464
-	ldloc.3
-	ldc.i4 22464
-	add
-	stloc.3
-// 0x0106cf6c: 0x106cf6c: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106cf70: 0x106cf70: addu  a3, s1, zero
-	ldloc 11
-	stloc 4
-// 0x0106cf74: 0x106cf74: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x0106cf78: 0x106cf78: jal   0x1000f9c addu  s3, v0, zero
+// 0x0106ce90: 0x106ce90: bne   v0, zero, 0x106cf28 addu  s4, v0, zero
+	ldloc 5
 	ldloc 5
 	stloc 12
+	brtrue L_106cf28
+// --- basic block ---
+// 0x0106ce98: 0x106ce98: lw    v1, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
 	stloc 7
+// 0x0106ce9c: 0x106ce9c: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
+// 0x0106cea0: 0x106cea0: bne   v1, v0, 0x106cf10 sll   zero, zero, 0
+	ldloc 7
+	ldloc 5
+	bne.un L_106cf10
 // --- basic block ---
-// 0x0106cf80: 0x106cf80: jal   0x101ca0c addu  a0, s2, zero
-	ldloc 9
+// 0x0106cea8: 0x106cea8: jal   0x1000910 addiu a0, zero, 12
+	ldc.i4.s 12
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106cf88: 0x106cf88: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x0106cf8c: 0x106cf8c: jal   0x101c14c addu  s2, v0, zero
+// 0x0106ceb0: 0x106ceb0: addu  s3, v0, zero
 	ldloc 5
-	stloc 9
+	stloc 8
+// 0x0106ceb4: 0x106ceb4: jal   0x1001ba8 addu  a0, s2, zero
+	ldloc 11
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106cf94: 0x106cf94: lw    v0, 352(s0)
+// 0x0106cebc: 0x106cebc: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x0106cec0: 0x106cec0: addiu a2, zero, 3
+	ldc.i4.3
+	stloc.3
+// 0x0106cec4: 0x106cec4: addu  a0, s3, zero
+	ldloc 8
+	stloc.1
+// 0x0106cec8: 0x106cec8: jal   0x1001af8 sw    v0, 4(s3)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 88
+	ldc.i4.1
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106cf98: 0x106cf98: sll   zero, zero, 0
-// 0x0106cf9c: 0x106cf9c: beq   v0, zero, 0x106cfdc lui   a2, 0x10000
 	ldloc 5
-	ldc.i4 65536
-	stloc.3
-	brfalse L_106cfdc
-// --- basic block ---
-// 0x0106cfa4: 0x106cfa4: addiu s4, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 10
-// 0x0106cfa8: 0x106cfa8: addiu a2, a2, 22476
-	ldloc.3
-	ldc.i4 22476
-	add
-	stloc.3
-// 0x0106cfac: 0x106cfac: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106cfb0: 0x106cfb0: addu  a3, s1, zero
-	ldloc 11
-	stloc 4
-// 0x0106cfb4: 0x106cfb4: jal   0x1000f9c addu  a0, s4, zero
-	ldloc 10
-	stloc.1
-	ldloc.0
+	stelem.i4
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0106cfbc: 0x106cfbc: jal   0x101ca0c addu  a0, s4, zero
-	ldloc 10
+// 0x0106ced0: 0x106ced0: jal   0x1000910 addiu a0, zero, 20
+	ldc.i4.s 20
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106cfc4: 0x106cfc4: addu  a0, v0, zero
+// 0x0106ced8: 0x106ced8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0106cfc8: 0x106cfc8: jal   0x101c14c sw    v0, 272(sp)
+// 0x0106cedc: 0x106cedc: addu  a1, s0, zero
+	ldloc 9
+	stloc.2
+// 0x0106cee0: 0x106cee0: addiu a2, zero, 20
+	ldc.i4.s 20
+	stloc.3
+// 0x0106cee4: 0x106cee4: jal   0x1001800 sw    v0, 8(s3)
 	ldloc 6
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 68
+	ldc.i4.2
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106cfd0: 0x106cfd0: lw    v0, 272(sp)
+// 0x0106ceec: 0x106ceec: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106cef0: 0x106cef0: lw    v1, 18084(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 68
+	ldc.i4 4521
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106cfd4: 0x106cfd4: jal   0x101c8f8 addu  a0, v0, zero
+	stloc 7
+// 0x0106cef4: 0x106cef4: lui   a0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x0106cef8: 0x106cef8: sll   a1, v1, 2
+	ldloc 7
+	ldc.i4.2
+	shl
+	stloc.2
+// 0x0106cefc: 0x106cefc: addiu a0, a0, -18080
+	ldloc.1
+	ldc.i4 -18080
+	add
+	stloc.1
+// 0x0106cf00: 0x106cf00: addu  a0, a1, a0
+	ldloc.2
+	ldloc.1
+	add
+	stloc.1
+// 0x0106cf04: 0x106cf04: addiu v1, v1, 1
+	ldloc 7
+	ldc.i4.1
+	add
+	stloc 7
+// 0x0106cf08: 0x106cf08: sw    s3, 0(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldloc 8
+	stelem.i4
+// 0x0106cf0c: 0x106cf0c: sw    v1, 18084(v0)
+	ldloc 6
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4521
+	add
+	ldloc 7
+	stelem.i4
+L_106cf10:
+// 0x0106cf10: 0x106cf10: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106cf14: 0x106cf14: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106cf18: 0x106cf18: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
 	stloc.1
+// 0x0106cf1c: 0x106cf1c: addiu a1, a1, 22808
+	ldloc.2
+	ldc.i4 22808
+	add
+	stloc.2
+// 0x0106cf20: 0x106cf20: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106cfdc:
-// 0x0106cfdc: 0x106cfdc: lw    v0, 564(s0)
+L_106cf28:
+// 0x0106cf28: 0x106cf28: lw    ra, 60(sp)
+// 0x0106cf2c: 0x106cf2c: addu  v0, s4, zero
+	ldloc 12
+	stloc 5
+// 0x0106cf30: 0x106cf30: lw    s4, 56(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 141
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106cfe0: 0x106cfe0: sll   zero, zero, 0
-// 0x0106cfe4: 0x106cfe4: beq   v0, zero, 0x106d024 lui   a2, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.3
-	brfalse L_106d024
-// --- basic block ---
-// 0x0106cfec: 0x106cfec: addiu s4, sp, 100
+	stloc 12
+// 0x0106cf34: 0x106cf34: lw    s3, 52(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 100
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106cf38: 0x106cf38: lw    s2, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106cf3c: 0x106cf3c: lw    s1, 44(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
+	ldelem.i4
 	stloc 10
-// 0x0106cff0: 0x106cff0: addiu a2, a2, 22488
-	ldloc.3
-	ldc.i4 22488
+// 0x0106cf40: 0x106cf40: lw    s0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
-	stloc.3
-// 0x0106cff4: 0x106cff4: addu  a3, s1, zero
-	ldloc 11
+	ldelem.i4
+	stloc 9
+// 0x0106cf44: 0x106cf44: jr    ra addiu sp, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_SessionDetailsInit_106cf4c(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106cff8: 0x106cff8: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106cffc: 0x106cffc: jal   0x1000f9c addu  a0, s4, zero
-	ldloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106cf4c: 0x106cf4c: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
+// 0x0106cf50: 0x106cf50: addiu sp, sp, -24
 	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106cf54: 0x106cf54: addiu a0, a0, 15012
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d004: 0x106d004: jal   0x101ca0c addu  a0, s4, zero
-	ldloc 10
+	ldc.i4 15012
+	add
 	stloc.1
+// 0x0106cf58: 0x106cf58: sw    ra, 20(sp)
+// 0x0106cf5c: 0x106cf5c: jal   0x100e798 sw    s0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106d00c: 0x106d00c: addu  a0, v0, zero
-	ldloc 5
+// 0x0106cf64: 0x106cf64: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x0106d010: 0x106d010: jal   0x101c14c sw    v0, 272(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 68
+// 0x0106cf68: 0x106cf68: addiu a0, a0, 15028
+	ldloc.1
+	ldc.i4 15028
 	add
+	stloc.1
+// 0x0106cf6c: 0x106cf6c: jal   0x100e358 addu  s0, v0, zero
 	ldloc 5
-	stelem.i4
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106d018: 0x106d018: lw    v0, 272(sp)
+// 0x0106cf74: 0x106cf74: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x0106cf78: 0x106cf78: beq   s0, v1, 0x106cf84 lui   v1, 0x70000
+	ldloc 8
+	ldloc 6
+	ldc.i4 458752
+	stloc 6
+	beq  L_106cf84
+// --- basic block ---
+// 0x0106cf80: 0x106cf80: sw    s0, 18452(v1)
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 68
+	ldc.i4 4613
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d01c: 0x106d01c: jal   0x101c8f8 addu  a0, v0, zero
+	ldloc 8
+	stelem.i4
+L_106cf84:
+// 0x0106cf84: 0x106cf84: beq   v0, zero, 0x106cfb4 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106cfb4
+// --- basic block ---
+// 0x0106cf8c: 0x106cf8c: lb    v1, 0(v0)
 	ldloc 5
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x0106cf90: 0x106cf90: sll   zero, zero, 0
+// 0x0106cf94: 0x106cf94: beq   v1, zero, 0x106cfb4 lui   a0, 0x70000
+	ldloc 6
+	ldc.i4 458752
 	stloc.1
-	ldloc.0
+	brfalse L_106cfb4
+// --- basic block ---
+// 0x0106cf9c: 0x106cf9c: addiu a0, a0, 18384
+	ldloc.1
+	ldc.i4 18384
+	add
+	stloc.1
+// 0x0106cfa0: 0x106cfa0: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0106cfa4: 0x106cfa4: jal   0x1001af8 addiu a2, zero, 64
+	ldc.i4.s 64
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-L_106d024:
-// 0x0106d024: 0x106d024: lw    v0, 224(s0)
-	ldloc 6
-	ldloc 8
+// 0x0106cfac: 0x106cfac: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106cfb0: 0x106cfb0: sb    zero, 18447(v0)
+	ldloc 5
+	ldc.i4 18447
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+L_106cfb4:
+// 0x0106cfb4: 0x106cfb4: lw    ra, 20(sp)
+// 0x0106cfb8: 0x106cfb8: lw    s0, 16(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 56
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106d028: 0x106d028: sll   zero, zero, 0
-// 0x0106d02c: 0x106d02c: bne   v0, zero, 0x106d044 addiu v0, zero, 1
+	stloc 8
+// 0x0106cfbc: 0x106cfbc: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4.1
+	ret
+}
+.method public static int32 RealTime_Warning_106cfc4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-	brtrue L_106d044
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d034: 0x106d034: lw    v1, 248(s0)
+// 0x0106cfc4: 0x106cfc4: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106cfc8: 0x106cfc8: sw    s0, 16(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 62
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106d038: 0x106d038: sll   zero, zero, 0
-// 0x0106d03c: 0x106d03c: bne   v1, v0, 0x106d050 lui   v0, 0x0
 	ldloc 7
-	ldloc 5
-	ldc.i4.s 0
-	stloc 5
-	bne.un L_106d050
-// --- basic block ---
-L_106d044:
-// 0x0106d044: 0x106d044: jal   0x101c14c addu  a0, s2, zero
-	ldloc 9
-	stloc.1
+	stelem.i4
+// 0x0106cfcc: 0x106cfcc: sw    ra, 20(sp)
+// 0x0106cfd0: 0x106cfd0: jal   0x106c794 addu  s0, a0, zero
+	ldloc.1
+	stloc 7
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106d04c: 0x106d04c: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-L_106d050:
-// 0x0106d050: 0x106d050: lw    v1, 0(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x0106d054: 0x106d054: lw    v0, 15056(v0)
+// 0x0106cfd8: 0x106cfd8: bne   v0, zero, 0x106d010 lui   v0, 0x0
+	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brtrue L_106d010
+// --- basic block ---
+// 0x0106cfe0: 0x106cfe0: lw    v0, 15216(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3764
+	ldc.i4 3804
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106d058: 0x106d058: sll   zero, zero, 0
-// 0x0106d05c: 0x106d05c: bne   v1, v0, 0x106d06c sll   zero, zero, 0
-	ldloc 7
+// 0x0106cfe4: 0x106cfe4: sll   zero, zero, 0
+// 0x0106cfe8: 0x106cfe8: bne   v0, zero, 0x106d010 lui   a0, 0x10000
 	ldloc 5
-	bne.un L_106d06c
+	ldc.i4 65536
+	stloc.1
+	brtrue L_106d010
 // --- basic block ---
-// 0x0106d064: 0x106d064: jal   0x106c07c sll   zero, zero, 0
-	ldloc.0
+// 0x0106cff0: 0x106cff0: jal   0x101cd70 addiu a0, a0, 22832
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::RemoveWazerNearby_106c07c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_106d06c:
-// 0x0106d06c: 0x106d06c: jal   0x101c8f8 addu  a0, s3, zero
-	ldloc 12
+	ldc.i4 22832
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106d074: 0x106d074: jal   0x101c8f8 addu  a0, s2, zero
-	ldloc 9
+// 0x0106cff8: 0x106cff8: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0106cffc: 0x106cffc: addu  a0, s0, zero
+	ldloc 7
 	stloc.1
-	ldloc.0
+// 0x0106d000: 0x106d000: jal   0x1001af8 addiu a2, zero, 128
+	ldc.i4 128
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0106d07c: 0x106d07c: lw    ra, 300(sp)
-// 0x0106d080: 0x106d080: lw    s4, 296(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 74
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106d084: 0x106d084: lw    s3, 292(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 73
-	add
-	ldelem.i4
-	stloc 12
-// 0x0106d088: 0x106d088: lw    s2, 288(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 72
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106d08c: 0x106d08c: lw    s1, 284(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 71
-	add
-	ldelem.i4
-	stloc 11
-// 0x0106d090: 0x106d090: lw    s0, 280(sp)
+// 0x0106d008: 0x106d008: j	 0x106d014 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_106d014
+// --- basic block ---
+L_106d010:
+// 0x0106d010: 0x106d010: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_106d014:
+// 0x0106d014: 0x106d014: lw    ra, 20(sp)
+// 0x0106d018: 0x106d018: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106d094: 0x106d094: jr    ra addiu sp, sp, 304
+	stloc 7
+// 0x0106d01c: 0x106d01c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4 304
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnMoveUser_106d09c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Alert_ReportAtLocation_106d024(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 s3,int32 s5,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 ra,int32 t0)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  7 is register v0
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local 11 is register s1
-// local  9 is register s2
-// local 12 is register s3
-// local 10 is register s4
-// local 13 is register s5
+// local  9 is register t0
 // local  0 is register sp
-// local 14 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2996,203 +3106,324 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d09c: 0x106d09c: addiu sp, sp, -328
+// 0x0106d024: 0x106d024: addu  v1, a1, zero
+	ldloc.2
+	stloc 5
+// 0x0106d028: 0x106d028: addu  v0, a2, zero
+	ldloc.3
+	stloc 7
+// 0x0106d02c: 0x106d02c: addu  a2, v1, zero
+	ldloc 5
+	stloc.3
+// 0x0106d030: 0x106d030: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x0106d034: 0x106d034: addiu sp, sp, -64
 	ldloc.0
-	ldc.i4 -328
+	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0106d0a0: 0x106d0a0: sw    s1, 304(sp)
+// 0x0106d038: 0x106d038: addiu v1, v1, 18768
+	ldloc 5
+	ldc.i4 18768
+	add
+	stloc 5
+// 0x0106d03c: 0x106d03c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106d040: 0x106d040: addiu v1, sp, 76
+	ldloc.0
 	ldc.i4.s 76
 	add
-	ldloc 11
+	stloc 5
+// 0x0106d044: 0x106d044: sw    v1, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 5
 	stelem.i4
-// 0x0106d0a4: 0x106d0a4: addiu s1, a0, 68
+// 0x0106d048: 0x106d048: lw    v1, 96(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106d04c: 0x106d04c: addu  t0, a0, zero
 	ldloc.1
-	ldc.i4.s 68
+	stloc 9
+// 0x0106d050: 0x106d050: sw    v1, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
-	stloc 11
-// 0x0106d0a8: 0x106d0a8: sw    s0, 300(sp)
+	ldloc 5
+	stelem.i4
+// 0x0106d054: 0x106d054: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d058: 0x106d058: lui   v1, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106d05c: 0x106d05c: sw    a3, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 75
+	ldc.i4.s 19
 	add
-	ldloc 8
+	ldloc 4
 	stelem.i4
-// 0x0106d0ac: 0x106d0ac: addu  s0, a0, zero
+// 0x0106d060: 0x106d060: addiu v1, v1, 6144
+	ldloc 5
+	ldc.i4 6144
+	add
+	stloc 5
+// 0x0106d064: 0x106d064: addu  a3, v0, zero
+	ldloc 7
+	stloc 4
+// 0x0106d068: 0x106d068: addiu a0, a0, 18192
 	ldloc.1
-	stloc 8
-// 0x0106d0b0: 0x106d0b0: addu  a0, s1, zero
-	ldloc 11
+	ldc.i4 18192
+	add
 	stloc.1
-// 0x0106d0b4: 0x106d0b4: sw    ra, 324(sp)
-// 0x0106d0b8: 0x106d0b8: sw    s4, 316(sp)
+// 0x0106d06c: 0x106d06c: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 7
+// 0x0106d070: 0x106d070: addu  a1, t0, zero
+	ldloc 9
+	stloc.2
+// 0x0106d074: 0x106d074: sw    ra, 60(sp)
+// 0x0106d078: 0x106d078: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 79
+	ldc.i4.s 9
 	add
-	ldloc 10
+	ldloc 7
 	stelem.i4
-// 0x0106d0bc: 0x106d0bc: sw    s3, 312(sp)
+// 0x0106d07c: 0x106d07c: sw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 78
+	ldc.i4.s 11
 	add
-	ldloc 12
+	ldloc 5
 	stelem.i4
-// 0x0106d0c0: 0x106d0c0: sw    s2, 308(sp)
+// 0x0106d080: 0x106d080: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 77
+	ldc.i4.5
 	add
-	ldloc 9
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106d0c4: 0x106d0c4: sw    s5, 320(sp)
+// 0x0106d084: 0x106d084: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 80
+	ldc.i4.6
 	add
-	ldloc 13
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106d0c8: 0x106d0c8: jal   0x101ca0c addiu s2, sp, 204
+// 0x0106d088: 0x106d088: jal   0x107497c sw    v0, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4 204
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc 9
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_ReportAlertAtPosition_107497c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
+	stloc 7
+// --- basic block ---
+// 0x0106d090: 0x106d090: bne   v0, zero, 0x106d0b4 lui   a0, 0x0
+	ldloc 7
+	ldc.i4.s 0
+	stloc.1
+	brtrue L_106d0b4
 // --- basic block ---
-// 0x0106d0d0: 0x106d0d0: lui   a2, 0x10000
+// 0x0106d098: 0x106d098: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc.3
-// 0x0106d0d4: 0x106d0d4: addiu a2, a2, 22464
-	ldloc.3
-	ldc.i4 22464
-	add
-	stloc.3
-// 0x0106d0d8: 0x106d0d8: addu  a3, s1, zero
-	ldloc 11
-	stloc 4
-// 0x0106d0dc: 0x106d0dc: addiu a1, zero, 83
-	ldc.i4.s 83
 	stloc.2
-// 0x0106d0e0: 0x106d0e0: addu  a0, s2, zero
-	ldloc 9
+// 0x0106d09c: 0x106d09c: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
 	stloc.1
-// 0x0106d0e4: 0x106d0e4: jal   0x1000f9c addu  s3, v0, zero
-	ldloc 5
-	stloc 12
+// 0x0106d0a0: 0x106d0a0: addiu a1, a1, 22808
+	ldloc.2
+	ldc.i4 22808
+	add
+	stloc.2
+// 0x0106d0a4: 0x106d0a4: addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
+// 0x0106d0a8: 0x106d0a8: jal   0x104bff4 sw    v0, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 7
+// --- basic block ---
+// 0x0106d0b0: 0x106d0b0: lw    v0, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
 	stloc 7
+L_106d0b4:
+// 0x0106d0b4: 0x106d0b4: lw    ra, 60(sp)
+// 0x0106d0b8: 0x106d0b8: sll   zero, zero, 0
+// 0x0106d0bc: 0x106d0bc: jr    ra addiu sp, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 Realtime_Post_Alert_Comment_106d0c4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register t0
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d0ec: 0x106d0ec: jal   0x101ca0c addu  a0, s2, zero
-	ldloc 9
-	stloc.1
+// 0x0106d0c4: 0x106d0c4: addiu sp, sp, -40
 	ldloc.0
-	ldloc.1
-	ldloc.2
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106d0c8: 0x106d0c8: addu  v0, a2, zero
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x0106d0f4: 0x106d0f4: addu  s2, v0, zero
-	ldloc 5
+// 0x0106d0cc: 0x106d0cc: addu  t0, a0, zero
+	ldloc.1
 	stloc 9
-// 0x0106d0f8: 0x106d0f8: lw    v1, 132(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 33
-	add
-	ldelem.i4
+// 0x0106d0d0: 0x106d0d0: addu  v1, a1, zero
+	ldloc.2
 	stloc 7
-// 0x0106d0fc: 0x106d0fc: lw    v0, 136(s0)
+// 0x0106d0d4: 0x106d0d4: sw    a3, 16(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4.4
 	add
-	ldelem.i4
+	ldloc 4
+	stelem.i4
+// 0x0106d0d8: 0x106d0d8: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d0dc: 0x106d0dc: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x0106d0e0: 0x106d0e0: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-// 0x0106d100: 0x106d100: lw    a1, 148(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 37
+// 0x0106d0e4: 0x106d0e4: addiu v0, v0, 164
+	ldloc 5
+	ldc.i4 164
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106d104: 0x106d104: lw    a0, 144(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 36
+	stloc 5
+// 0x0106d0e8: 0x106d0e8: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
 	add
-	ldelem.i4
 	stloc.1
-// 0x0106d108: 0x106d108: sw    v1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+// 0x0106d0ec: 0x106d0ec: addu  a1, t0, zero
+	ldloc 9
+	stloc.2
+// 0x0106d0f0: 0x106d0f0: addu  a2, v1, zero
 	ldloc 7
-	stelem.i4
-// 0x0106d10c: 0x106d10c: sw    v0, 20(sp)
+	stloc.3
+// 0x0106d0f4: 0x106d0f4: sw    ra, 36(sp)
+// 0x0106d0f8: 0x106d0f8: jal   0x1074be4 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3201,576 +3432,724 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d110: 0x106d110: sw    zero, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106d114: 0x106d114: jal   0x10c08d0 addiu s4, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl87::RTNet_PostAlertComment_1074be4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d11c: 0x106d11c: lw    v1, 140(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 35
+// 0x0106d100: 0x106d100: bne   v0, zero, 0x106d124 lui   a0, 0x0
+	ldloc 5
+	ldc.i4.s 0
+	stloc.1
+	brtrue L_106d124
+// --- basic block ---
+// 0x0106d108: 0x106d108: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106d10c: 0x106d10c: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106d120: 0x106d120: addu  a0, s3, zero
-	ldloc 12
 	stloc.1
-// 0x0106d124: 0x106d124: addu  a1, s4, zero
-	ldloc 10
+// 0x0106d110: 0x106d110: addiu a1, a1, 22860
+	ldloc.2
+	ldc.i4 22860
+	add
 	stloc.2
-// 0x0106d128: 0x106d128: sw    v0, 28(sp)
+// 0x0106d114: 0x106d114: addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
+// 0x0106d118: 0x106d118: jal   0x104bff4 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.6
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d12c: 0x106d12c: jal   0x101bd3c sw    v1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 7
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_move_101bd3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d134: 0x106d134: lw    v0, 352(s0)
+// 0x0106d120: 0x106d120: lw    v0, 24(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 88
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106d138: 0x106d138: sll   zero, zero, 0
-// 0x0106d13c: 0x106d13c: beq   v0, zero, 0x106d180 lui   a2, 0x10000
+L_106d124:
+// 0x0106d124: 0x106d124: lw    ra, 36(sp)
+// 0x0106d128: 0x106d128: sll   zero, zero, 0
+// 0x0106d12c: 0x106d12c: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4 65536
-	stloc.3
-	brfalse L_106d180
+	ret
+}
+.method public static int32 Realtime_TripServer_FindTrip_106d134(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d144: 0x106d144: addiu s5, sp, 36
+// 0x0106d134: 0x106d134: addu  a1, a0, zero
+	ldloc.1
+	stloc.2
+// 0x0106d138: 0x106d138: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106d13c: 0x106d13c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d140: 0x106d140: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 36
+	ldc.i4.s -24
 	add
-	stloc 13
-// 0x0106d148: 0x106d148: addiu a2, a2, 22476
+	stloc.0
+// 0x0106d144: 0x106d144: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106d148: 0x106d148: sw    ra, 20(sp)
+// 0x0106d14c: 0x106d14c: jal   0x1073a90 addiu a2, a2, 0
 	ldloc.3
-	ldc.i4 22476
+	ldc.i4.s 0
 	add
 	stloc.3
-// 0x0106d14c: 0x106d14c: addu  a3, s1, zero
-	ldloc 11
-	stloc 4
-// 0x0106d150: 0x106d150: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106d154: 0x106d154: jal   0x1000f9c addu  a0, s5, zero
-	ldloc 13
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_TripServer_FindTrip_1073a90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0106d15c: 0x106d15c: jal   0x101ca0c addu  a0, s5, zero
-	ldloc 13
-	stloc.1
+// 0x0106d154: 0x106d154: lw    ra, 20(sp)
+// 0x0106d158: 0x106d158: sll   zero, zero, 0
+// 0x0106d15c: 0x106d15c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 Realtime_TripServer_DeletePOI_106d164(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d164: 0x106d164: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0106d168: 0x106d168: addu  a1, s4, zero
-	ldloc 10
+// 0x0106d164: 0x106d164: addu  a1, a0, zero
+	ldloc.1
 	stloc.2
-// 0x0106d16c: 0x106d16c: jal   0x101bd3c sw    v0, 288(sp)
-	ldloc 6
+// 0x0106d168: 0x106d168: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106d16c: 0x106d16c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d170: 0x106d170: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 72
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
+	stloc.0
+// 0x0106d174: 0x106d174: addiu a0, a0, 18192
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_move_101bd3c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d174: 0x106d174: lw    v0, 288(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 72
+	ldc.i4 18192
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d178: 0x106d178: jal   0x101c8f8 addu  a0, v0, zero
-	ldloc 5
 	stloc.1
+// 0x0106d178: 0x106d178: sw    ra, 20(sp)
+// 0x0106d17c: 0x106d17c: jal   0x1073b28 addiu a2, a2, 0
+	ldloc.3
+	ldc.i4.s 0
+	add
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_TripServer_DeletePOI_1073b28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 5
 // --- basic block ---
-L_106d180:
-// 0x0106d180: 0x106d180: lw    v0, 564(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 141
+// 0x0106d184: 0x106d184: lw    ra, 20(sp)
+// 0x0106d188: 0x106d188: sll   zero, zero, 0
+// 0x0106d18c: 0x106d18c: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	ldelem.i4
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 Realtime_TripServer_GetNumPOIs_106d194(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
-// 0x0106d184: 0x106d184: sll   zero, zero, 0
-// 0x0106d188: 0x106d188: beq   v0, zero, 0x106d1cc lui   a2, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.3
-	brfalse L_106d1cc
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d190: 0x106d190: addiu s4, sp, 120
+// 0x0106d194: 0x106d194: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d198: 0x106d198: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0106d19c: 0x106d19c: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 120
+	ldc.i4.s -24
 	add
-	stloc 10
-// 0x0106d194: 0x106d194: addiu a2, a2, 22488
-	ldloc.3
-	ldc.i4 22488
+	stloc.0
+// 0x0106d1a0: 0x106d1a0: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
 	add
-	stloc.3
-// 0x0106d198: 0x106d198: addu  a3, s1, zero
-	ldloc 11
-	stloc 4
-// 0x0106d19c: 0x106d19c: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106d1a0: 0x106d1a0: jal   0x1000f9c addu  a0, s4, zero
-	ldloc 10
 	stloc.1
+// 0x0106d1a4: 0x106d1a4: sw    ra, 20(sp)
+// 0x0106d1a8: 0x106d1a8: jal   0x1073b90 addiu a1, a1, 0
+	ldloc.2
+	ldc.i4.s 0
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_TripServer_GetNumPOIs_1073b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0106d1a8: 0x106d1a8: jal   0x101ca0c addu  a0, s4, zero
-	ldloc 10
-	stloc.1
+// 0x0106d1b0: 0x106d1b0: lw    ra, 20(sp)
+// 0x0106d1b4: 0x106d1b4: sll   zero, zero, 0
+// 0x0106d1b8: 0x106d1b8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 Realtime_TripServer_GetPOIs_106d1c0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d1b0: 0x106d1b0: addu  a0, v0, zero
-	ldloc 5
+// 0x0106d1c0: 0x106d1c0: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106d1b4: 0x106d1b4: addiu a1, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
+// 0x0106d1c4: 0x106d1c4: lui   a1, 0x1070000
+	ldc.i4 17235968
 	stloc.2
-// 0x0106d1b8: 0x106d1b8: jal   0x101bd3c sw    v0, 288(sp)
-	ldloc 6
+// 0x0106d1c8: 0x106d1c8: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 72
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
+	stloc.0
+// 0x0106d1cc: 0x106d1cc: addiu a0, a0, 18192
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_move_101bd3c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d1c0: 0x106d1c0: lw    v0, 288(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 72
+	ldc.i4 18192
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d1c4: 0x106d1c4: jal   0x101c8f8 addu  a0, v0, zero
-	ldloc 5
 	stloc.1
+// 0x0106d1d0: 0x106d1d0: sw    ra, 20(sp)
+// 0x0106d1d4: 0x106d1d4: jal   0x1073bd8 addiu a1, a1, 0
+	ldloc.2
+	ldc.i4.s 0
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_TripServer_GetPOIs_1073bd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 5
 // --- basic block ---
-L_106d1cc:
-// 0x0106d1cc: 0x106d1cc: lw    v0, 224(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 56
+// 0x0106d1dc: 0x106d1dc: lw    ra, 20(sp)
+// 0x0106d1e0: 0x106d1e0: sll   zero, zero, 0
+// 0x0106d1e4: 0x106d1e4: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d1d0: 0x106d1d0: sll   zero, zero, 0
-// 0x0106d1d4: 0x106d1d4: bne   v0, zero, 0x106d1ec addiu v0, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 5
-	brtrue L_106d1ec
-// --- basic block ---
-// 0x0106d1dc: 0x106d1dc: lw    v1, 248(s0)
-	ldloc 6
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 62
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106d1e0: 0x106d1e0: sll   zero, zero, 0
-// 0x0106d1e4: 0x106d1e4: bne   v1, v0, 0x106d1fc lui   v0, 0xe0000
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
-	ldloc 5
-	ldc.i4 917504
+	ret
+}
+.method public static int32 Realtime_TripServer_CreatePOI_106d1ec(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register t0
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-	bne.un L_106d1fc
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_106d1ec:
-// 0x0106d1ec: 0x106d1ec: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x0106d1f0: 0x106d1f0: jal   0x101bd3c addiu a1, sp, 16
+// 0x0106d1ec: 0x106d1ec: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.s -32
 	add
-	stloc.2
-	ldloc.0
+	stloc.0
+// 0x0106d1f0: 0x106d1f0: addu  v0, a2, zero
+	ldloc.3
+	stloc 5
+// 0x0106d1f4: 0x106d1f4: addu  t0, a0, zero
 	ldloc.1
+	stloc 9
+// 0x0106d1f8: 0x106d1f8: addu  v1, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_move_101bd3c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d1f8: 0x106d1f8: lui   v0, 0xe0000
-	ldc.i4 917504
-	stloc 5
-L_106d1fc:
-// 0x0106d1fc: 0x106d1fc: addiu v0, v0, 29604
-	ldloc 5
-	ldc.i4 29604
-	add
-	stloc 5
-// 0x0106d200: 0x106d200: lw    a0, 16(sp)
+// 0x0106d1fc: 0x106d1fc: sw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
+	ldloc 4
+	stelem.i4
+// 0x0106d200: 0x106d200: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106d204: 0x106d204: lw    a1, 56(v0)
-	ldloc 6
+// 0x0106d204: 0x106d204: addu  a3, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
+	stloc 4
+// 0x0106d208: 0x106d208: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106d20c: 0x106d20c: addiu v0, v0, 0
+	ldloc 5
+	ldc.i4.s 0
 	add
-	ldelem.i4
+	stloc 5
+// 0x0106d210: 0x106d210: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106d214: 0x106d214: addu  a1, t0, zero
+	ldloc 9
 	stloc.2
-// 0x0106d208: 0x106d208: lw    v1, 20(sp)
+// 0x0106d218: 0x106d218: addu  a2, v1, zero
+	ldloc 7
+	stloc.3
+// 0x0106d21c: 0x106d21c: sw    ra, 28(sp)
+// 0x0106d220: 0x106d220: jal   0x1073c20 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106d20c: 0x106d20c: slt   a1, a1, a0
-	ldloc.2
-	ldloc.1
-	clt
-	stloc.2
-// 0x0106d210: 0x106d210: bne   a1, zero, 0x106d254 sll   zero, zero, 0
-	ldloc.2
-	brtrue L_106d254
-// --- basic block ---
-// 0x0106d218: 0x106d218: lw    a1, 64(v0)
-	ldloc 6
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106d21c: 0x106d21c: sll   zero, zero, 0
-// 0x0106d220: 0x106d220: slt   a0, a0, a1
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	clt
-	stloc.1
-// 0x0106d224: 0x106d224: bne   a0, zero, 0x106d254 sll   zero, zero, 0
-	ldloc.1
-	brtrue L_106d254
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::RTNet_TripServer_CreatePOI_1073c20(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106d22c: 0x106d22c: lw    a0, 60(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
+// 0x0106d228: 0x106d228: lw    ra, 28(sp)
+// 0x0106d22c: 0x106d22c: sll   zero, zero, 0
+// 0x0106d230: 0x106d230: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106d230: 0x106d230: sll   zero, zero, 0
-// 0x0106d234: 0x106d234: slt   a0, a0, v1
-	ldloc.1
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
-	clt
-	stloc.1
-// 0x0106d238: 0x106d238: bne   a0, zero, 0x106d254 sll   zero, zero, 0
-	ldloc.1
-	brtrue L_106d254
-// --- basic block ---
-// 0x0106d240: 0x106d240: lw    v0, 68(v0)
-	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldelem.i4
+	ret
+}
+.method public static int32 Realtime_FoursquareCheckin_106d284(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// 0x0106d244: 0x106d244: sll   zero, zero, 0
-// 0x0106d248: 0x106d248: slt   v1, v1, v0
-	ldloc 7
-	ldloc 5
-	clt
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
-// 0x0106d24c: 0x106d24c: beq   v1, zero, 0x106d288 sll   zero, zero, 0
-	ldloc 7
-	brfalse L_106d288
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_106d254:
-// 0x0106d254: 0x106d254: jal   0x101c8f8 addu  a0, s3, zero
-	ldloc 12
+// 0x0106d284: 0x106d284: addu  v0, a0, zero
+	ldloc.1
+	stloc 5
+// 0x0106d288: 0x106d288: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106d28c: 0x106d28c: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
+// 0x0106d290: 0x106d290: addiu sp, sp, -24
 	ldloc.0
-	ldloc.1
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106d294: 0x106d294: addu  a2, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d25c: 0x106d25c: jal   0x101c8f8 addu  a0, s2, zero
-	ldloc 9
+	stloc.3
+// 0x0106d298: 0x106d298: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
 	stloc.1
+// 0x0106d29c: 0x106d29c: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0106d2a0: 0x106d2a0: sw    ra, 20(sp)
+// 0x0106d2a4: 0x106d2a4: jal   0x1074dac addiu a3, a3, 308
+	ldloc 4
+	ldc.i4 308
+	add
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_FoursquareCheckin_1074dac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106d264: 0x106d264: lw    ra, 324(sp)
-// 0x0106d268: 0x106d268: lw    s5, 320(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 80
-	add
-	ldelem.i4
-	stloc 13
-// 0x0106d26c: 0x106d26c: lw    s4, 316(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 79
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106d270: 0x106d270: lw    s3, 312(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 78
-	add
-	ldelem.i4
-	stloc 12
-// 0x0106d274: 0x106d274: lw    s2, 308(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 77
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106d278: 0x106d278: lw    s1, 304(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 76
-	add
-	ldelem.i4
-	stloc 11
-// 0x0106d27c: 0x106d27c: lw    s0, 300(sp)
-	ldloc 6
+// 0x0106d2ac: 0x106d2ac: lw    ra, 20(sp)
+// 0x0106d2b0: 0x106d2b0: sll   zero, zero, 0
+// 0x0106d2b4: 0x106d2b4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 75
+	ldc.i4.s 24
 	add
-	ldelem.i4
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_FoursquareSearch_106d2bc(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
 	stloc 8
-// 0x0106d280: 0x106d280: jr    ra addiu sp, sp, 328
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106d2bc: 0x106d2bc: addu  a1, a0, zero
+	ldloc.1
+	stloc.2
+// 0x0106d2c0: 0x106d2c0: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106d2c4: 0x106d2c4: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d2c8: 0x106d2c8: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4 328
+	ldc.i4.s -24
 	add
 	stloc.0
-	br __CIBYL_function_return
-// --- basic block ---
-L_106d288:
-// 0x0106d288: 0x106d288: jal   0x106c07c sll   zero, zero, 0
+// 0x0106d2cc: 0x106d2cc: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106d2d0: 0x106d2d0: sw    ra, 20(sp)
+// 0x0106d2d4: 0x106d2d4: jal   0x1074e10 addiu a2, a2, 308
+	ldloc.3
+	ldc.i4 308
+	add
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RemoveWazerNearby_106c07c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_FoursquareSearch_1074e10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0106d290: 0x106d290: j	 0x106d254 sll   zero, zero, 0
-	br L_106d254
+// 0x0106d2dc: 0x106d2dc: lw    ra, 20(sp)
+// 0x0106d2e0: 0x106d2e0: sll   zero, zero, 0
+// 0x0106d2e4: 0x106d2e4: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 7
 	ret
 }
-.method public static int32 OnAddUser_106d298(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_FoursquareConnect_106d2ec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s4,int32 s1,int32 s2,int32 s3,int32 s8,int32 s7,int32 s6,int32 s5,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local 10 is register s1
-// local 11 is register s2
-// local 12 is register s3
-// local  9 is register s4
-// local 16 is register s5
-// local 15 is register s6
-// local 14 is register s7
 // local  0 is register sp
-// local 13 is register s8
-// local 17 is register ra
-// local  6 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3779,628 +4158,551 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 17
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d298: 0x106d298: addiu sp, sp, -392
-	ldloc.0
-	ldc.i4 -392
-	add
-	stloc.0
-// 0x0106d29c: 0x106d29c: sw    s0, 352(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 88
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106d2a0: 0x106d2a0: addu  s0, a0, zero
+// 0x0106d2ec: 0x106d2ec: addu  v0, a1, zero
+	ldloc.2
+	stloc 5
+// 0x0106d2f0: 0x106d2f0: addu  v1, a0, zero
 	ldloc.1
-	stloc 8
-// 0x0106d2a4: 0x106d2a4: lui   a0, 0x10000
-	ldc.i4 65536
+	stloc 6
+// 0x0106d2f4: 0x106d2f4: addu  a3, a2, zero
+	ldloc.3
+	stloc 4
+// 0x0106d2f8: 0x106d2f8: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106d2a8: 0x106d2a8: sw    s7, 380(sp)
-	ldloc 6
+// 0x0106d2fc: 0x106d2fc: addu  a2, v0, zero
+	ldloc 5
+	stloc.3
+// 0x0106d300: 0x106d300: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106d304: 0x106d304: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 95
+	ldc.i4.s -32
 	add
-	ldloc 14
-	stelem.i4
-// 0x0106d2ac: 0x106d2ac: addiu a0, a0, -28772
+	stloc.0
+// 0x0106d308: 0x106d308: addiu v0, v0, 308
+	ldloc 5
+	ldc.i4 308
+	add
+	stloc 5
+// 0x0106d30c: 0x106d30c: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 -28772
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106d2b0: 0x106d2b0: addiu s7, s0, 68
-	ldloc 8
-	ldc.i4.s 68
-	add
-	stloc 14
-// 0x0106d2b4: 0x106d2b4: sw    ra, 388(sp)
-// 0x0106d2b8: 0x106d2b8: sw    s6, 376(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 94
-	add
-	ldloc 15
-	stelem.i4
-// 0x0106d2bc: 0x106d2bc: sw    s4, 368(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 92
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106d2c0: 0x106d2c0: sw    s3, 364(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 91
-	add
-	ldloc 12
-	stelem.i4
-// 0x0106d2c4: 0x106d2c4: sw    s2, 360(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 90
-	add
-	ldloc 11
-	stelem.i4
-// 0x0106d2c8: 0x106d2c8: sw    s1, 356(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 89
-	add
-	ldloc 10
-	stelem.i4
-// 0x0106d2cc: 0x106d2cc: sw    s8, 384(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 96
-	add
-	ldloc 13
-	stelem.i4
-// 0x0106d2d0: 0x106d2d0: jal   0x101ca0c sw    s5, 372(sp)
+// 0x0106d310: 0x106d310: addu  a1, v1, zero
 	ldloc 6
+	stloc.2
+// 0x0106d314: 0x106d314: sw    ra, 28(sp)
+// 0x0106d318: 0x106d318: jal   0x1074e90 sw    v0, 16(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 93
+	ldc.i4.4
 	add
-	ldloc 16
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_FoursquareConnect_1074e90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106d2d8: 0x106d2d8: addu  a0, s7, zero
-	ldloc 14
-	stloc.1
-// 0x0106d2dc: 0x106d2dc: jal   0x101ca0c addu  s3, v0, zero
-	ldloc 5
-	stloc 12
+// 0x0106d320: 0x106d320: lw    ra, 28(sp)
+// 0x0106d324: 0x106d324: sll   zero, zero, 0
+// 0x0106d328: 0x106d328: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d2e4: 0x106d2e4: addiu a0, s0, 4
-	ldloc 8
-	ldc.i4.4
+	ldc.i4.s 32
 	add
-	stloc.1
-// 0x0106d2e8: 0x106d2e8: jal   0x101ca0c addu  s6, v0, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	stloc 15
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ret
+}
+.method public static int32 Realtime_TwitterConnect_106d330(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d2f0: 0x106d2f0: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d2f4: 0x106d2f4: addiu a0, a0, 22500
-	ldloc.1
-	ldc.i4 22500
-	add
-	stloc.1
-// 0x0106d2f8: 0x106d2f8: addu  s2, v0, zero
-	ldloc 5
-	stloc 11
-// 0x0106d2fc: 0x106d2fc: jal   0x101ca0c lui   s4, 0x70000
-	ldc.i4 458752
-	stloc 9
-	ldloc.0
-	ldloc.1
+// 0x0106d330: 0x106d330: addu  v0, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x0106d304: 0x106d304: addu  s1, v0, zero
-	ldloc 5
-	stloc 10
-// 0x0106d308: 0x106d308: lw    v0, 17628(s4)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 4407
+// 0x0106d334: 0x106d334: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d30c: 0x106d30c: sll   zero, zero, 0
-// 0x0106d310: 0x106d310: bne   v0, zero, 0x106d330 lui   a0, 0x1070000
+	stloc.0
+// 0x0106d338: 0x106d338: addu  a3, a2, zero
+	ldloc.3
+	stloc 4
+// 0x0106d33c: 0x106d33c: addu  a2, v0, zero
 	ldloc 5
-	ldc.i4 17235968
-	stloc.1
-	brtrue L_106d330
-// --- basic block ---
-// 0x0106d318: 0x106d318: jal   0x101f970 addiu a0, a0, -10304
-	ldloc.1
-	ldc.i4 -10304
-	add
-	stloc.1
-	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f970(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc.3
+// 0x0106d340: 0x106d340: addiu v0, zero, 70
+	ldc.i4.s 70
 	stloc 5
-// --- basic block ---
-// 0x0106d320: 0x106d320: lui   v1, 0x70000
-	ldc.i4 458752
+// 0x0106d344: 0x106d344: addu  v1, a0, zero
+	ldloc.1
 	stloc 7
-// 0x0106d324: 0x106d324: sw    v0, 17624(v1)
+// 0x0106d348: 0x106d348: sw    v0, 16(sp)
 	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4406
+	ldc.i4.4
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d328: 0x106d328: addiu v0, zero, 1
-	ldc.i4.1
+// 0x0106d34c: 0x106d34c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d350: 0x106d350: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-// 0x0106d32c: 0x106d32c: sw    v0, 17628(s4)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 4407
-	add
+// 0x0106d354: 0x106d354: addiu v0, v0, 368
 	ldloc 5
-	stelem.i4
-L_106d330:
-// 0x0106d330: 0x106d330: lw    a0, 156(s0)
+	ldc.i4 368
+	add
+	stloc 5
+// 0x0106d358: 0x106d358: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106d35c: 0x106d35c: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x0106d360: 0x106d360: sw    ra, 28(sp)
+// 0x0106d364: 0x106d364: jal   0x1074f08 sw    v0, 20(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 39
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106d334: 0x106d334: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x0106d338: 0x106d338: beq   a0, v0, 0x106d350 sll   zero, zero, 0
-	ldloc.1
 	ldloc 5
-	beq  L_106d350
-// --- basic block ---
-// 0x0106d340: 0x106d340: jal   0x103542c sll   zero, zero, 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_mood_to_string_103542c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_TwitterConnect_1074f08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d348: 0x106d348: j	 0x106d358 addu  a0, v0, zero
+// 0x0106d36c: 0x106d36c: lw    ra, 28(sp)
+// 0x0106d370: 0x106d370: sll   zero, zero, 0
+// 0x0106d374: 0x106d374: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	stloc.1
-	br L_106d358
+	ret
+}
+.method public static int32 Realtime_SendSMS_106d37c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_106d350:
-// 0x0106d350: 0x106d350: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d354: 0x106d354: addiu a0, a0, -14156
+// 0x0106d37c: 0x106d37c: addu  a1, a0, zero
 	ldloc.1
-	ldc.i4 -14156
-	add
+	stloc.2
+// 0x0106d380: 0x106d380: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106d384: 0x106d384: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-L_106d358:
-// 0x0106d358: 0x106d358: jal   0x101ca0c addiu s4, sp, 60
+// 0x0106d388: 0x106d388: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 60
+	ldc.i4.s -24
 	add
-	stloc 9
-	ldloc.0
+	stloc.0
+// 0x0106d38c: 0x106d38c: addiu a0, a0, 18192
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d360: 0x106d360: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0106d364: 0x106d364: addu  a0, s4, zero
-	ldloc 9
+	ldc.i4 18192
+	add
 	stloc.1
-// 0x0106d368: 0x106d368: addiu a2, a2, 22464
+// 0x0106d390: 0x106d390: sw    ra, 20(sp)
+// 0x0106d394: 0x106d394: jal   0x1074f88 addiu a2, a2, 456
 	ldloc.3
-	ldc.i4 22464
+	ldc.i4 456
 	add
 	stloc.3
-// 0x0106d36c: 0x106d36c: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106d370: 0x106d370: addu  a3, s7, zero
-	ldloc 14
-	stloc 4
-// 0x0106d374: 0x106d374: jal   0x1000f9c addu  s5, v0, zero
-	ldloc 5
-	stloc 16
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_SendSMS_1074f88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
+// --- basic block ---
+// 0x0106d39c: 0x106d39c: lw    ra, 20(sp)
+// 0x0106d3a0: 0x106d3a0: sll   zero, zero, 0
+// 0x0106d3a4: 0x106d3a4: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 keyboard_callback_106d3ac(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d37c: 0x106d37c: jal   0x101ca0c addu  a0, s4, zero
-	ldloc 9
-	stloc.1
+// 0x0106d3ac: 0x106d3ac: addiu sp, sp, -24
 	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106d3b0: 0x106d3b0: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106d3b4: 0x106d3b4: sw    ra, 20(sp)
+// 0x0106d3b8: 0x106d3b8: bne   a0, v1, 0x106d3ec addiu v0, zero, 1
 	ldloc.1
+	ldloc 6
+	ldc.i4.1
+	stloc 5
+	bne.un L_106d3ec
+// --- basic block ---
+// 0x0106d3c0: 0x106d3c0: beq   a1, zero, 0x106d3ec addu  v0, zero, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4.s 0
 	stloc 5
+	brfalse L_106d3ec
 // --- basic block ---
-// 0x0106d384: 0x106d384: addu  s4, v0, zero
-	ldloc 5
-	stloc 9
-// 0x0106d388: 0x106d388: lw    v0, 352(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 88
-	add
-	ldelem.i4
+// 0x0106d3c8: 0x106d3c8: lb    v0, 0(a1)
+	ldloc.2
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0106d38c: 0x106d38c: sll   zero, zero, 0
-// 0x0106d390: 0x106d390: beq   v0, zero, 0x106d3bc lui   a2, 0x10000
+// 0x0106d3cc: 0x106d3cc: sll   zero, zero, 0
+// 0x0106d3d0: 0x106d3d0: beq   v0, zero, 0x106d3e8 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 65536
-	stloc.3
-	brfalse L_106d3bc
+	brfalse L_106d3e8
 // --- basic block ---
-// 0x0106d398: 0x106d398: addiu s8, sp, 144
-	ldloc.0
-	ldc.i4 144
-	add
-	stloc 13
-// 0x0106d39c: 0x106d39c: addiu a2, a2, 22476
-	ldloc.3
-	ldc.i4 22476
-	add
-	stloc.3
-// 0x0106d3a0: 0x106d3a0: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106d3a4: 0x106d3a4: addu  a3, s7, zero
-	ldloc 14
-	stloc 4
-// 0x0106d3a8: 0x106d3a8: jal   0x1000f9c addu  a0, s8, zero
-	ldloc 13
+// 0x0106d3d8: 0x106d3d8: jal   0x106d37c addu  a0, a1, zero
+	ldloc.2
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_SendSMS_106d37c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106d3b0: 0x106d3b0: jal   0x101ca0c addu  a0, s8, zero
-	ldloc 13
-	stloc.1
+// 0x0106d3e0: 0x106d3e0: j	 0x106d3ec sll   zero, zero, 0
+	br L_106d3ec
+// --- basic block ---
+L_106d3e8:
+// 0x0106d3e8: 0x106d3e8: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_106d3ec:
+// 0x0106d3ec: 0x106d3ec: lw    ra, 20(sp)
+// 0x0106d3f0: 0x106d3f0: sll   zero, zero, 0
+// 0x0106d3f4: 0x106d3f4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_PinqWazer_106d3fc(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 t0)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register t0
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
 	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106d3fc: 0x106d3fc: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
+	add
+	stloc.0
+// 0x0106d400: 0x106d400: addu  v0, a2, zero
+	ldloc.3
 	stloc 5
-// --- basic block ---
-// 0x0106d3b8: 0x106d3b8: sw    v0, 344(sp)
+// 0x0106d404: 0x106d404: sw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 86
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 4
 	stelem.i4
-L_106d3bc:
-// 0x0106d3bc: 0x106d3bc: lw    v0, 564(s0)
+// 0x0106d408: 0x106d408: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x0106d40c: 0x106d40c: lw    v0, 72(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 141
+	ldc.i4.s 18
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106d3c0: 0x106d3c0: sll   zero, zero, 0
-// 0x0106d3c4: 0x106d3c4: beq   v0, zero, 0x106d3f0 addiu s8, sp, 228
-	ldloc 5
-	ldloc.0
-	ldc.i4 228
-	add
-	stloc 13
-	brfalse L_106d3f0
-// --- basic block ---
-// 0x0106d3cc: 0x106d3cc: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0106d3d0: 0x106d3d0: addiu a2, a2, 22488
-	ldloc.3
-	ldc.i4 22488
-	add
-	stloc.3
-// 0x0106d3d4: 0x106d3d4: addu  a3, s7, zero
-	ldloc 14
-	stloc 4
-// 0x0106d3d8: 0x106d3d8: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x0106d3dc: 0x106d3dc: jal   0x1000f9c addu  a0, s8, zero
-	ldloc 13
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d3e4: 0x106d3e4: jal   0x101ca0c addu  a0, s8, zero
-	ldloc 13
-	stloc.1
-	ldloc.0
+// 0x0106d410: 0x106d410: addu  t0, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d3ec: 0x106d3ec: sw    v0, 340(sp)
+	stloc 9
+// 0x0106d414: 0x106d414: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 85
+	ldc.i4.5
 	add
 	ldloc 5
 	stelem.i4
-L_106d3f0:
-// 0x0106d3f0: 0x106d3f0: lw    a1, 148(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 37
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106d3f4: 0x106d3f4: lw    v1, 132(s0)
+// 0x0106d418: 0x106d418: lw    v0, 76(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4.s 19
 	add
 	ldelem.i4
+	stloc 5
+// 0x0106d41c: 0x106d41c: addu  v1, a1, zero
+	ldloc.2
 	stloc 7
-// 0x0106d3f8: 0x106d3f8: lw    v0, 136(s0)
+// 0x0106d420: 0x106d420: sw    v0, 24(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d3fc: 0x106d3fc: lw    a0, 144(s0)
+	ldloc 5
+	stelem.i4
+// 0x0106d424: 0x106d424: lw    v0, 80(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 36
+	ldc.i4.s 20
 	add
 	ldelem.i4
+	stloc 5
+// 0x0106d428: 0x106d428: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106d400: 0x106d400: sw    v1, 40(sp)
+// 0x0106d42c: 0x106d42c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106d404: 0x106d404: sw    v0, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	ldc.i4.7
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d408: 0x106d408: jal   0x10c08d0 sw    zero, 48(sp)
+// 0x0106d430: 0x106d430: lw    v0, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
-	add
-	ldc.i4.s 0
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d410: 0x106d410: lw    v1, 140(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 35
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106d414: 0x106d414: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d418: 0x106d418: addiu a0, a0, 22508
+	stloc 5
+// 0x0106d434: 0x106d434: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 22508
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106d41c: 0x106d41c: sw    v1, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106d420: 0x106d420: jal   0x101ca0c sw    v0, 52(sp)
+// 0x0106d438: 0x106d438: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.8
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0106d43c: 0x106d43c: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-// --- basic block ---
-// 0x0106d428: 0x106d428: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106d42c: 0x106d42c: addiu a0, a0, 31388
-	ldloc.1
-	ldc.i4 31388
+// 0x0106d440: 0x106d440: addiu v0, v0, 568
+	ldloc 5
+	ldc.i4 568
 	add
-	stloc.1
-// 0x0106d430: 0x106d430: jal   0x101ca0c sw    v0, 320(sp)
+	stloc 5
+// 0x0106d444: 0x106d444: addu  a1, t0, zero
+	ldloc 9
+	stloc.2
+// 0x0106d448: 0x106d448: addu  a2, v1, zero
+	ldloc 7
+	stloc.3
+// 0x0106d44c: 0x106d44c: sw    ra, 52(sp)
+// 0x0106d450: 0x106d450: jal   0x107482c sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 80
+	ldc.i4.s 9
 	add
 	ldloc 5
 	stelem.i4
@@ -4409,25 +4711,39 @@ L_106d3f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_PinqWazer_107482c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d438: 0x106d438: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x0106d458: 0x106d458: bne   v0, zero, 0x106d47c lui   a0, 0x0
+	ldloc 5
+	ldc.i4.s 0
 	stloc.1
-// 0x0106d43c: 0x106d43c: addiu a0, a0, 22516
+	brtrue L_106d47c
+// --- basic block ---
+// 0x0106d460: 0x106d460: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106d464: 0x106d464: addiu a0, a0, 30092
 	ldloc.1
-	ldc.i4 22516
+	ldc.i4 30092
 	add
 	stloc.1
-// 0x0106d440: 0x106d440: jal   0x101ca0c sw    v0, 336(sp)
+// 0x0106d468: 0x106d468: addiu a1, a1, 22884
+	ldloc.2
+	ldc.i4 22884
+	add
+	stloc.2
+// 0x0106d46c: 0x106d46c: addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
+// 0x0106d470: 0x106d470: jal   0x104bff4 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 84
+	ldc.i4.s 10
 	add
 	ldloc 5
 	stelem.i4
@@ -4436,570 +4752,758 @@ L_106d3f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d448: 0x106d448: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d44c: 0x106d44c: addiu a0, a0, 22524
-	ldloc.1
-	ldc.i4 22524
-	add
-	stloc.1
-// 0x0106d450: 0x106d450: jal   0x101ca0c sw    v0, 332(sp)
+// 0x0106d478: 0x106d478: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 83
+	ldc.i4.s 10
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0106d458: 0x106d458: addiu a0, s0, 460
-	ldloc 8
-	ldc.i4 460
-	add
-	stloc.1
-// 0x0106d45c: 0x106d45c: jal   0x101ca0c addu  s8, v0, zero
-	ldloc 5
-	stloc 13
+L_106d47c:
+// 0x0106d47c: 0x106d47c: lw    ra, 52(sp)
+// 0x0106d480: 0x106d480: sll   zero, zero, 0
+// 0x0106d484: 0x106d484: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d464: 0x106d464: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d468: 0x106d468: addiu a0, a0, 22536
-	ldloc.1
-	ldc.i4 22536
+	ldc.i4.s 56
 	add
-	stloc.1
-// 0x0106d46c: 0x106d46c: jal   0x101ca0c addu  s7, v0, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	stloc 14
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ret
+}
+.method public static int32 Realtime_Report_Alert_106d48c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local 10 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  9 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 10
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d474: 0x106d474: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d478: 0x106d478: addiu a0, a0, 22548
-	ldloc.1
-	ldc.i4 22548
+// 0x0106d48c: 0x106d48c: addiu sp, sp, -72
+	ldloc.0
+	ldc.i4.s -72
 	add
-	stloc.1
-// 0x0106d47c: 0x106d47c: jal   0x101ca0c sw    v0, 316(sp)
+	stloc.0
+// 0x0106d490: 0x106d490: addu  v0, a2, zero
+	ldloc.3
+	stloc 5
+// 0x0106d494: 0x106d494: sw    a3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 79
+	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d484: 0x106d484: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d488: 0x106d488: addiu a0, a0, 22568
-	ldloc.1
-	ldc.i4 22568
-	add
-	stloc.1
-// 0x0106d48c: 0x106d48c: jal   0x101ca0c sw    v0, 312(sp)
+	stelem.i4
+// 0x0106d498: 0x106d498: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x0106d49c: 0x106d49c: lw    v0, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 78
+	ldc.i4.s 22
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0106d494: 0x106d494: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106d498: 0x106d498: addiu a0, a0, 22588
-	ldloc.1
-	ldc.i4 22588
-	add
-	stloc.1
-// 0x0106d49c: 0x106d49c: jal   0x101ca0c sw    v0, 328(sp)
+// 0x0106d4a0: 0x106d4a0: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 82
+	ldc.i4.s 16
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106d4a4: 0x106d4a4: sw    v0, 324(sp)
+// 0x0106d4a4: 0x106d4a4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 81
+	ldc.i4.5
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d4a8: 0x106d4a8: addiu v1, sp, 40
+// 0x0106d4a8: 0x106d4a8: lw    v0, 92(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
 	add
-	stloc 7
-// 0x0106d4ac: 0x106d4ac: addiu v0, zero, 12
-	ldc.i4.s 12
+	ldelem.i4
 	stloc 5
-// 0x0106d4b0: 0x106d4b0: addu  a1, s6, zero
-	ldloc 15
-	stloc.2
-// 0x0106d4b4: 0x106d4b4: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d4b8: 0x106d4b8: addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-// 0x0106d4bc: 0x106d4bc: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x0106d4c0: 0x106d4c0: sw    v0, 28(sp)
+// 0x0106d4ac: 0x106d4ac: addu  s2, a0, zero
+	ldloc.1
+	stloc 9
+// 0x0106d4b0: 0x106d4b0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.6
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d4c4: 0x106d4c4: sw    v1, 20(sp)
+// 0x0106d4b4: 0x106d4b4: lw    v0, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 24
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106d4c8: 0x106d4c8: sw    v1, 348(sp)
+	ldelem.i4
+	stloc 5
+// 0x0106d4b8: 0x106d4b8: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106d4bc: 0x106d4bc: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 87
+	ldc.i4.7
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
-// 0x0106d4cc: 0x106d4cc: sw    s5, 16(sp)
+// 0x0106d4c0: 0x106d4c0: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106d4c4: 0x106d4c4: addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+// 0x0106d4c8: 0x106d4c8: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106d4cc: 0x106d4cc: addu  a1, s2, zero
+	ldloc 9
+	stloc.2
+// 0x0106d4d0: 0x106d4d0: addiu v0, v0, 660
+	ldloc 5
+	ldc.i4 660
+	add
+	stloc 5
+// 0x0106d4d4: 0x106d4d4: sw    ra, 68(sp)
+// 0x0106d4d8: 0x106d4d8: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 15
 	add
-	ldloc 16
+	ldloc 8
 	stelem.i4
-// 0x0106d4d0: 0x106d4d0: sw    zero, 24(sp)
+// 0x0106d4dc: 0x106d4dc: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 14
 	add
-	ldc.i4.s 0
+	ldloc 7
 	stelem.i4
-// 0x0106d4d4: 0x106d4d4: jal   0x101c4fc sw    zero, 32(sp)
+// 0x0106d4e0: 0x106d4e0: addiu s1, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 8
+// 0x0106d4e4: 0x106d4e4: jal   0x1074b04 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_ReportAlert_1074b04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0106d4dc: 0x106d4dc: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x0106d4e0: 0x106d4e0: addu  a0, s6, zero
-	ldloc 15
-	stloc.1
-// 0x0106d4e4: 0x106d4e4: jal   0x101bed0 addiu a1, a1, -10424
-	ldloc.2
-	ldc.i4 -10424
+// 0x0106d4ec: 0x106d4ec: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0106d4f0: 0x106d4f0: addiu a2, a2, 19088
+	ldloc.3
+	ldc.i4 19088
 	add
+	stloc.3
+// 0x0106d4f4: 0x106d4f4: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x0106d4f8: 0x106d4f8: addiu a1, zero, 10
+	ldc.i4.s 10
 	stloc.2
+// 0x0106d4fc: 0x106d4fc: addu  a3, s2, zero
+	ldloc 9
+	stloc 4
+// 0x0106d500: 0x106d500: jal   0x1000f9c addu  s0, v0, zero
+	ldloc 5
+	stloc 7
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0106d4ec: 0x106d4ec: lw    v0, 224(s0)
+// 0x0106d508: 0x106d508: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0106d50c: 0x106d50c: lw    a0, 29196(v0)
 	ldloc 6
-	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 56
+	ldc.i4 7299
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106d4f0: 0x106d4f0: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106d4f4: 0x106d4f4: lw    v1, 348(sp)
+// 0x0106d510: 0x106d510: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0106d514: 0x106d514: lw    a1, 29200(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 87
+	ldc.i4 7300
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106d4f8: 0x106d4f8: bne   v0, a0, 0x106d554 sll   zero, zero, 0
-	ldloc 5
+	stloc.2
+// 0x0106d518: 0x106d518: jal   0x104bfec addu  a2, s1, zero
+	ldloc 8
+	stloc.3
+	call void Cibyl56::roadmap_analytics_log_event_104bfec()
+// --- basic block ---
+// 0x0106d520: 0x106d520: bne   s0, zero, 0x106d53c lui   a0, 0x0
+	ldloc 7
+	ldc.i4.s 0
+	stloc.1
+	brtrue L_106d53c
+// --- basic block ---
+// 0x0106d528: 0x106d528: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106d52c: 0x106d52c: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x0106d530: 0x106d530: addiu a1, a1, 22808
+	ldloc.2
+	ldc.i4 22808
+	add
+	stloc.2
+// 0x0106d534: 0x106d534: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
+	ldloc.0
 	ldloc.1
-	bne.un L_106d554
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
+	stloc 5
 // --- basic block ---
-// 0x0106d500: 0x106d500: lw    a0, 248(s0)
+L_106d53c:
+// 0x0106d53c: 0x106d53c: lw    ra, 68(sp)
+// 0x0106d540: 0x106d540: addu  v0, s0, zero
+	ldloc 7
+	stloc 5
+// 0x0106d544: 0x106d544: lw    s2, 64(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 62
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106d504: 0x106d504: sll   zero, zero, 0
-// 0x0106d508: 0x106d508: bne   a0, v0, 0x106d52c addu  a0, s3, zero
-	ldloc.1
-	ldloc 5
-	ldloc 12
-	stloc.1
-	bne.un L_106d52c
-// --- basic block ---
-// 0x0106d510: 0x106d510: lw    v0, 312(sp)
+	stloc 9
+// 0x0106d548: 0x106d548: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 78
+	ldc.i4.s 15
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106d514: 0x106d514: addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-// 0x0106d518: 0x106d518: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d51c: 0x106d51c: addu  a3, s1, zero
+	stloc 8
+// 0x0106d54c: 0x106d54c: lw    s0, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106d550: 0x106d550: jr    ra addiu sp, sp, 72
+	ldloc.0
+	ldc.i4.s 72
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 10
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 OnRemoveUser_106d558(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 s3,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local 11 is register s1
+// local  9 is register s2
+// local 12 is register s3
+// local 10 is register s4
+// local  0 is register sp
+// local 13 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106d520: 0x106d520: sw    v1, 20(sp)
-	ldloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 13
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106d558: 0x106d558: addiu sp, sp, -304
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4 -304
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106d524: 0x106d524: j	 0x106d544 sw    v0, 16(sp)
+	stloc.0
+// 0x0106d55c: 0x106d55c: sw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 71
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
-	br L_106d544
-// --- basic block ---
-L_106d52c:
-// 0x0106d52c: 0x106d52c: sw    v1, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+// 0x0106d560: 0x106d560: addiu s1, a0, 68
+	ldloc.1
+	ldc.i4.s 68
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106d530: 0x106d530: lw    v1, 320(sp)
+	stloc 11
+// 0x0106d564: 0x106d564: sw    s0, 280(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 80
+	ldc.i4.s 70
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106d534: 0x106d534: addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-// 0x0106d538: 0x106d538: addu  a2, s2, zero
+	ldloc 8
+	stelem.i4
+// 0x0106d568: 0x106d568: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x0106d56c: 0x106d56c: addu  a0, s1, zero
 	ldloc 11
-	stloc.3
-// 0x0106d53c: 0x106d53c: addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-// 0x0106d540: 0x106d540: sw    v1, 16(sp)
+	stloc.1
+// 0x0106d570: 0x106d570: sw    ra, 300(sp)
+// 0x0106d574: 0x106d574: sw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 73
 	add
-	ldloc 7
+	ldloc 12
 	stelem.i4
-L_106d544:
-// 0x0106d544: 0x106d544: sw    zero, 24(sp)
+// 0x0106d578: 0x106d578: sw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 72
 	add
-	ldc.i4.s 0
+	ldloc 9
 	stelem.i4
-// 0x0106d548: 0x106d548: sw    zero, 28(sp)
+// 0x0106d57c: 0x106d57c: sw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 74
 	add
-	ldc.i4.s 0
+	ldloc 10
 	stelem.i4
-// 0x0106d54c: 0x106d54c: jal   0x101c4fc sw    zero, 32(sp)
-	ldloc 6
+// 0x0106d580: 0x106d580: jal   0x101ca1c addiu s2, sp, 184
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4 184
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106d554:
-// 0x0106d554: 0x106d554: lw    v1, 224(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 56
+// 0x0106d588: 0x106d588: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0106d58c: 0x106d58c: addiu a2, a2, 22928
+	ldloc.3
+	ldc.i4 22928
 	add
-	ldelem.i4
+	stloc.3
+// 0x0106d590: 0x106d590: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d594: 0x106d594: addu  a3, s1, zero
+	ldloc 11
+	stloc 4
+// 0x0106d598: 0x106d598: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x0106d59c: 0x106d59c: jal   0x1000f9c addu  s3, v0, zero
+	ldloc 5
+	stloc 12
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x0106d558: 0x106d558: addiu v0, zero, 2
-	ldc.i4.2
 	stloc 5
-// 0x0106d55c: 0x106d55c: bne   v1, v0, 0x106d5b8 addiu v1, zero, 1
-	ldloc 7
+// --- basic block ---
+// 0x0106d5a4: 0x106d5a4: jal   0x101ca1c addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d5ac: 0x106d5ac: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x0106d5b0: 0x106d5b0: jal   0x101c15c addu  s2, v0, zero
 	ldloc 5
-	ldc.i4.1
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	bne.un L_106d5b8
+	stloc 5
 // --- basic block ---
-// 0x0106d564: 0x106d564: lw    a0, 248(s0)
+// 0x0106d5b8: 0x106d5b8: lw    v0, 352(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 62
+	ldc.i4.s 88
 	add
 	ldelem.i4
+	stloc 5
+// 0x0106d5bc: 0x106d5bc: sll   zero, zero, 0
+// 0x0106d5c0: 0x106d5c0: beq   v0, zero, 0x106d600 lui   a2, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.3
+	brfalse L_106d600
+// --- basic block ---
+// 0x0106d5c8: 0x106d5c8: addiu s4, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc 10
+// 0x0106d5cc: 0x106d5cc: addiu a2, a2, 22940
+	ldloc.3
+	ldc.i4 22940
+	add
+	stloc.3
+// 0x0106d5d0: 0x106d5d0: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d5d4: 0x106d5d4: addu  a3, s1, zero
+	ldloc 11
+	stloc 4
+// 0x0106d5d8: 0x106d5d8: jal   0x1000f9c addu  a0, s4, zero
+	ldloc 10
 	stloc.1
-// 0x0106d568: 0x106d568: sll   zero, zero, 0
-// 0x0106d56c: 0x106d56c: bne   a0, v1, 0x106d58c addiu v0, sp, 40
+	ldloc.0
 	ldloc.1
-	ldloc 7
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d5e0: 0x106d5e0: jal   0x101ca1c addu  a0, s4, zero
+	ldloc 10
+	stloc.1
 	ldloc.0
-	ldc.i4.s 40
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	bne.un L_106d58c
 // --- basic block ---
-// 0x0106d574: 0x106d574: addu  a0, s3, zero
-	ldloc 12
+// 0x0106d5e8: 0x106d5e8: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x0106d578: 0x106d578: addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-// 0x0106d57c: 0x106d57c: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d580: 0x106d580: lw    v1, 328(sp)
+// 0x0106d5ec: 0x106d5ec: jal   0x101c15c sw    v0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 82
+	ldc.i4.s 68
 	add
-	ldelem.i4
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x0106d584: 0x106d584: j	 0x106d5a0 addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-	br L_106d5a0
+	stloc 5
 // --- basic block ---
-L_106d58c:
-// 0x0106d58c: 0x106d58c: lw    v1, 336(sp)
+// 0x0106d5f4: 0x106d5f4: lw    v0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 84
+	ldc.i4.s 68
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106d590: 0x106d590: addu  a0, s3, zero
-	ldloc 12
+	stloc 5
+// 0x0106d5f8: 0x106d5f8: jal   0x101c908 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x0106d594: 0x106d594: addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-// 0x0106d598: 0x106d598: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d59c: 0x106d59c: addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-L_106d5a0:
-// 0x0106d5a0: 0x106d5a0: sw    v1, 16(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106d5a4: 0x106d5a4: sw    v0, 20(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_106d600:
+// 0x0106d600: 0x106d600: lw    v0, 564(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 141
 	add
+	ldelem.i4
+	stloc 5
+// 0x0106d604: 0x106d604: sll   zero, zero, 0
+// 0x0106d608: 0x106d608: beq   v0, zero, 0x106d648 lui   a2, 0x10000
 	ldloc 5
-	stelem.i4
-// 0x0106d5a8: 0x106d5a8: sw    zero, 24(sp)
-	ldloc 6
+	ldc.i4 65536
+	stloc.3
+	brfalse L_106d648
+// --- basic block ---
+// 0x0106d610: 0x106d610: addiu s4, sp, 100
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	ldc.i4.s 100
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106d5ac: 0x106d5ac: sw    zero, 28(sp)
+	stloc 10
+// 0x0106d614: 0x106d614: addiu a2, a2, 22952
+	ldloc.3
+	ldc.i4 22952
+	add
+	stloc.3
+// 0x0106d618: 0x106d618: addu  a3, s1, zero
+	ldloc 11
+	stloc 4
+// 0x0106d61c: 0x106d61c: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d620: 0x106d620: jal   0x1000f9c addu  a0, s4, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d628: 0x106d628: jal   0x101ca1c addu  a0, s4, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d630: 0x106d630: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0106d634: 0x106d634: jal   0x101c15c sw    v0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 68
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-// 0x0106d5b0: 0x106d5b0: jal   0x101c4fc sw    zero, 32(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d63c: 0x106d63c: lw    v0, 272(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 68
 	add
-	ldc.i4.s 0
-	stelem.i4
+	ldelem.i4
+	stloc 5
+// 0x0106d640: 0x106d640: jal   0x101c908 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106d5b8:
-// 0x0106d5b8: 0x106d5b8: lw    a0, 224(s0)
+L_106d648:
+// 0x0106d648: 0x106d648: lw    v0, 224(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5007,11 +5511,15 @@ L_106d5b8:
 	ldc.i4.s 56
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106d5bc: 0x106d5bc: addiu v0, zero, 3
-	ldc.i4.3
 	stloc 5
-// 0x0106d5c0: 0x106d5c0: lw    v1, 248(s0)
+// 0x0106d64c: 0x106d64c: sll   zero, zero, 0
+// 0x0106d650: 0x106d650: bne   v0, zero, 0x106d668 addiu v0, zero, 1
+	ldloc 5
+	ldc.i4.1
+	stloc 5
+	brtrue L_106d668
+// --- basic block ---
+// 0x0106d658: 0x106d658: lw    v1, 248(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5020,640 +5528,959 @@ L_106d5b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106d5c4: 0x106d5c4: bne   a0, v0, 0x106d610 addiu v0, zero, 1
-	ldloc.1
+// 0x0106d65c: 0x106d65c: sll   zero, zero, 0
+// 0x0106d660: 0x106d660: bne   v1, v0, 0x106d674 lui   v0, 0x0
+	ldloc 7
 	ldloc 5
-	ldc.i4.1
+	ldc.i4.s 0
 	stloc 5
-	bne.un L_106d610
+	bne.un L_106d674
 // --- basic block ---
-// 0x0106d5cc: 0x106d5cc: addiu a0, zero, 1
-	ldc.i4.1
+L_106d668:
+// 0x0106d668: 0x106d668: jal   0x101c15c addu  a0, s2, zero
+	ldloc 9
 	stloc.1
-// 0x0106d5d0: 0x106d5d0: bne   v1, a0, 0x106d5f0 addiu v0, sp, 40
-	ldloc 7
-	ldloc.1
 	ldloc.0
-	ldc.i4.s 40
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d670: 0x106d670: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+L_106d674:
+// 0x0106d674: 0x106d674: lw    v1, 0(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x0106d678: 0x106d678: lw    v0, 15056(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 3764
 	add
+	ldelem.i4
+	stloc 5
+// 0x0106d67c: 0x106d67c: sll   zero, zero, 0
+// 0x0106d680: 0x106d680: bne   v1, v0, 0x106d690 sll   zero, zero, 0
+	ldloc 7
+	ldloc 5
+	bne.un L_106d690
+// --- basic block ---
+// 0x0106d688: 0x106d688: jal   0x106c6a0 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::RemoveWazerNearby_106c6a0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	bne.un L_106d5f0
 // --- basic block ---
-// 0x0106d5d8: 0x106d5d8: addu  a0, s3, zero
+L_106d690:
+// 0x0106d690: 0x106d690: jal   0x101c908 addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x0106d5dc: 0x106d5dc: addu  a1, s4, zero
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d698: 0x106d698: jal   0x101c908 addu  a0, s2, zero
 	ldloc 9
-	stloc.2
-// 0x0106d5e0: 0x106d5e0: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d5e4: 0x106d5e4: lw    v1, 324(sp)
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d6a0: 0x106d6a0: lw    ra, 300(sp)
+// 0x0106d6a4: 0x106d6a4: lw    s4, 296(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 81
+	ldc.i4.s 74
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106d5e8: 0x106d5e8: j	 0x106d604 addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-	br L_106d604
-// --- basic block ---
-L_106d5f0:
-// 0x0106d5f0: 0x106d5f0: lw    v1, 332(sp)
+	stloc 10
+// 0x0106d6a8: 0x106d6a8: lw    s3, 292(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 83
+	ldc.i4.s 73
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106d5f4: 0x106d5f4: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x0106d5f8: 0x106d5f8: addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-// 0x0106d5fc: 0x106d5fc: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d600: 0x106d600: addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-L_106d604:
-// 0x0106d604: 0x106d604: sw    v1, 16(sp)
+	stloc 12
+// 0x0106d6ac: 0x106d6ac: lw    s2, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 72
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106d608: 0x106d608: j	 0x106d634 sw    v0, 20(sp)
+	ldelem.i4
+	stloc 9
+// 0x0106d6b0: 0x106d6b0: lw    s1, 284(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 71
 	add
-	ldloc 5
-	stelem.i4
-	br L_106d634
-// --- basic block ---
-L_106d610:
-// 0x0106d610: 0x106d610: bne   v1, v0, 0x106d644 addiu v0, sp, 40
-	ldloc 7
-	ldloc 5
+	ldelem.i4
+	stloc 11
+// 0x0106d6b4: 0x106d6b4: lw    s0, 280(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 70
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106d6b8: 0x106d6b8: jr    ra addiu sp, sp, 304
+	ldloc.0
+	ldc.i4 304
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 OnMoveUser_106d6c0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s4,int32 s1,int32 s3,int32 s5,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local 11 is register s1
+// local  9 is register s2
+// local 12 is register s3
+// local 10 is register s4
+// local 13 is register s5
+// local  0 is register sp
+// local 14 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-	bne.un L_106d644
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 13
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 14
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d618: 0x106d618: sw    v0, 20(sp)
+// 0x0106d6c0: 0x106d6c0: addiu sp, sp, -328
+	ldloc.0
+	ldc.i4 -328
+	add
+	stloc.0
+// 0x0106d6c4: 0x106d6c4: sw    s1, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 76
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
-// 0x0106d61c: 0x106d61c: lw    v0, 316(sp)
+// 0x0106d6c8: 0x106d6c8: addiu s1, a0, 68
+	ldloc.1
+	ldc.i4.s 68
+	add
+	stloc 11
+// 0x0106d6cc: 0x106d6cc: sw    s0, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 79
+	ldc.i4.s 75
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d620: 0x106d620: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x0106d624: 0x106d624: addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-// 0x0106d628: 0x106d628: addu  a2, s2, zero
+	ldloc 8
+	stelem.i4
+// 0x0106d6d0: 0x106d6d0: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x0106d6d4: 0x106d6d4: addu  a0, s1, zero
 	ldloc 11
-	stloc.3
-// 0x0106d62c: 0x106d62c: addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-// 0x0106d630: 0x106d630: sw    v0, 16(sp)
+	stloc.1
+// 0x0106d6d8: 0x106d6d8: sw    ra, 324(sp)
+// 0x0106d6dc: 0x106d6dc: sw    s4, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 79
 	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
-L_106d634:
-// 0x0106d634: 0x106d634: sw    zero, 24(sp)
+// 0x0106d6e0: 0x106d6e0: sw    s3, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 78
 	add
-	ldc.i4.s 0
+	ldloc 12
 	stelem.i4
-// 0x0106d638: 0x106d638: sw    zero, 28(sp)
+// 0x0106d6e4: 0x106d6e4: sw    s2, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 77
 	add
-	ldc.i4.s 0
+	ldloc 9
 	stelem.i4
-// 0x0106d63c: 0x106d63c: jal   0x101c4fc sw    zero, 32(sp)
+// 0x0106d6e8: 0x106d6e8: sw    s5, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 80
 	add
-	ldc.i4.s 0
+	ldloc 13
 	stelem.i4
+// 0x0106d6ec: 0x106d6ec: jal   0x101ca1c addiu s2, sp, 204
+	ldloc.0
+	ldc.i4 204
+	add
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d6f4: 0x106d6f4: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0106d6f8: 0x106d6f8: addiu a2, a2, 22928
+	ldloc.3
+	ldc.i4 22928
+	add
+	stloc.3
+// 0x0106d6fc: 0x106d6fc: addu  a3, s1, zero
+	ldloc 11
+	stloc 4
+// 0x0106d700: 0x106d700: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d704: 0x106d704: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x0106d708: 0x106d708: jal   0x1000f9c addu  s3, v0, zero
+	ldloc 5
+	stloc 12
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d710: 0x106d710: jal   0x101ca1c addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106d644:
-// 0x0106d644: 0x106d644: lw    v0, 352(s0)
+// 0x0106d718: 0x106d718: addu  s2, v0, zero
+	ldloc 5
+	stloc 9
+// 0x0106d71c: 0x106d71c: lw    v1, 132(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 88
+	ldc.i4.s 33
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106d648: 0x106d648: sll   zero, zero, 0
-// 0x0106d64c: 0x106d64c: beq   v0, zero, 0x106d67c addiu v0, sp, 40
-	ldloc 5
-	ldloc.0
-	ldc.i4.s 40
+	stloc 7
+// 0x0106d720: 0x106d720: lw    v0, 136(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
 	add
+	ldelem.i4
 	stloc 5
-	brfalse L_106d67c
-// --- basic block ---
-// 0x0106d654: 0x106d654: lw    a1, 344(sp)
+// 0x0106d724: 0x106d724: lw    a1, 148(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 86
+	ldc.i4.s 37
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106d658: 0x106d658: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x0106d65c: 0x106d65c: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d660: 0x106d660: addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-// 0x0106d664: 0x106d664: sw    v0, 20(sp)
+// 0x0106d728: 0x106d728: lw    a0, 144(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 36
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106d668: 0x106d668: sw    s8, 16(sp)
+	ldelem.i4
+	stloc.1
+// 0x0106d72c: 0x106d72c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 13
+	ldloc 7
 	stelem.i4
-// 0x0106d66c: 0x106d66c: sw    zero, 24(sp)
+// 0x0106d730: 0x106d730: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-// 0x0106d670: 0x106d670: sw    zero, 28(sp)
+// 0x0106d734: 0x106d734: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.6
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106d674: 0x106d674: jal   0x101c4fc sw    zero, 32(sp)
-	ldloc 6
+// 0x0106d738: 0x106d738: jal   0x10c0f10 addiu s4, sp, 16
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4.s 16
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106d67c:
-// 0x0106d67c: 0x106d67c: lw    v0, 564(s0)
+// 0x0106d740: 0x106d740: lw    v1, 140(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 141
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106d680: 0x106d680: sll   zero, zero, 0
-// 0x0106d684: 0x106d684: beq   v0, zero, 0x106d6b4 addiu v0, sp, 40
-	ldloc 5
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 5
-	brfalse L_106d6b4
-// --- basic block ---
-// 0x0106d68c: 0x106d68c: lw    a1, 340(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 85
+	ldc.i4.s 35
 	add
 	ldelem.i4
-	stloc.2
-// 0x0106d690: 0x106d690: addu  a0, s3, zero
+	stloc 7
+// 0x0106d744: 0x106d744: addu  a0, s3, zero
 	ldloc 12
 	stloc.1
-// 0x0106d694: 0x106d694: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x0106d698: 0x106d698: addu  a3, s1, zero
+// 0x0106d748: 0x106d748: addu  a1, s4, zero
 	ldloc 10
-	stloc 4
-// 0x0106d69c: 0x106d69c: sw    v0, 20(sp)
+	stloc.2
+// 0x0106d74c: 0x106d74c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d6a0: 0x106d6a0: sw    s7, 16(sp)
+// 0x0106d750: 0x106d750: jal   0x101bd4c sw    v1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 14
+	ldloc 7
 	stelem.i4
-// 0x0106d6a4: 0x106d6a4: sw    zero, 24(sp)
-	ldloc 6
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_move_101bd4c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d758: 0x106d758: lw    v0, 352(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 88
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106d6a8: 0x106d6a8: sw    zero, 28(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 5
+// 0x0106d75c: 0x106d75c: sll   zero, zero, 0
+// 0x0106d760: 0x106d760: beq   v0, zero, 0x106d7a4 lui   a2, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.3
+	brfalse L_106d7a4
+// --- basic block ---
+// 0x0106d768: 0x106d768: addiu s5, sp, 36
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4.s 36
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106d6ac: 0x106d6ac: jal   0x101c4fc sw    zero, 32(sp)
+	stloc 13
+// 0x0106d76c: 0x106d76c: addiu a2, a2, 22940
+	ldloc.3
+	ldc.i4 22940
+	add
+	stloc.3
+// 0x0106d770: 0x106d770: addu  a3, s1, zero
+	ldloc 11
+	stloc 4
+// 0x0106d774: 0x106d774: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d778: 0x106d778: jal   0x1000f9c addu  a0, s5, zero
+	ldloc 13
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d780: 0x106d780: jal   0x101ca1c addu  a0, s5, zero
+	ldloc 13
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d788: 0x106d788: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0106d78c: 0x106d78c: addu  a1, s4, zero
+	ldloc 10
+	stloc.2
+// 0x0106d790: 0x106d790: jal   0x101bd4c sw    v0, 288(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 72
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_move_101bd4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106d6b4:
-// 0x0106d6b4: 0x106d6b4: jal   0x101c8f8 addu  a0, s3, zero
-	ldloc 12
+// 0x0106d798: 0x106d798: lw    v0, 288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 72
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106d79c: 0x106d79c: jal   0x101c908 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d6bc: 0x106d6bc: jal   0x101c8f8 addu  a0, s6, zero
-	ldloc 15
+L_106d7a4:
+// 0x0106d7a4: 0x106d7a4: lw    v0, 564(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 141
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106d7a8: 0x106d7a8: sll   zero, zero, 0
+// 0x0106d7ac: 0x106d7ac: beq   v0, zero, 0x106d7f0 lui   a2, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.3
+	brfalse L_106d7f0
+// --- basic block ---
+// 0x0106d7b4: 0x106d7b4: addiu s4, sp, 120
+	ldloc.0
+	ldc.i4.s 120
+	add
+	stloc 10
+// 0x0106d7b8: 0x106d7b8: addiu a2, a2, 22952
+	ldloc.3
+	ldc.i4 22952
+	add
+	stloc.3
+// 0x0106d7bc: 0x106d7bc: addu  a3, s1, zero
+	ldloc 11
+	stloc 4
+// 0x0106d7c0: 0x106d7c0: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d7c4: 0x106d7c4: jal   0x1000f9c addu  a0, s4, zero
+	ldloc 10
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d6c4: 0x106d6c4: jal   0x101c8f8 addu  a0, s2, zero
-	ldloc 11
+// 0x0106d7cc: 0x106d7cc: jal   0x101ca1c addu  a0, s4, zero
+	ldloc 10
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d6cc: 0x106d6cc: jal   0x101c8f8 addu  a0, s1, zero
-	ldloc 10
+// 0x0106d7d4: 0x106d7d4: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
+// 0x0106d7d8: 0x106d7d8: addiu a1, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.2
+// 0x0106d7dc: 0x106d7dc: jal   0x101bd4c sw    v0, 288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 72
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_move_101bd4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d6d4: 0x106d6d4: jal   0x101c8f8 addu  a0, s5, zero
-	ldloc 16
+// 0x0106d7e4: 0x106d7e4: lw    v0, 288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 72
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106d7e8: 0x106d7e8: jal   0x101c908 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d6dc: 0x106d6dc: jal   0x101c8f8 addu  a0, s4, zero
+L_106d7f0:
+// 0x0106d7f0: 0x106d7f0: lw    v0, 224(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 56
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106d7f4: 0x106d7f4: sll   zero, zero, 0
+// 0x0106d7f8: 0x106d7f8: bne   v0, zero, 0x106d810 addiu v0, zero, 1
+	ldloc 5
+	ldc.i4.1
+	stloc 5
+	brtrue L_106d810
+// --- basic block ---
+// 0x0106d800: 0x106d800: lw    v1, 248(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 62
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106d804: 0x106d804: sll   zero, zero, 0
+// 0x0106d808: 0x106d808: bne   v1, v0, 0x106d820 lui   v0, 0xe0000
+	ldloc 7
+	ldloc 5
+	ldc.i4 917504
+	stloc 5
+	bne.un L_106d820
+// --- basic block ---
+L_106d810:
+// 0x0106d810: 0x106d810: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
+// 0x0106d814: 0x106d814: jal   0x101bd4c addiu a1, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_move_101bd4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x0106d6e4: 0x106d6e4: lw    a0, 320(sp)
+// --- basic block ---
+// 0x0106d81c: 0x106d81c: lui   v0, 0xe0000
+	ldc.i4 917504
+	stloc 5
+L_106d820:
+// 0x0106d820: 0x106d820: addiu v0, v0, 30068
+	ldloc 5
+	ldc.i4 30068
+	add
+	stloc 5
+// 0x0106d824: 0x106d824: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 80
+	ldc.i4.4
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106d6e8: 0x106d6e8: jal   0x101c8f8 sll   zero, zero, 0
+// 0x0106d828: 0x106d828: lw    a1, 56(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106d82c: 0x106d82c: lw    v1, 20(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106d830: 0x106d830: slt   a1, a1, a0
+	ldloc.2
 	ldloc.1
+	clt
+	stloc.2
+// 0x0106d834: 0x106d834: bne   a1, zero, 0x106d878 sll   zero, zero, 0
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	brtrue L_106d878
 // --- basic block ---
-// 0x0106d6f0: 0x106d6f0: lw    a0, 316(sp)
+// 0x0106d83c: 0x106d83c: lw    a1, 64(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 79
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106d6f4: 0x106d6f4: jal   0x101c8f8 sll   zero, zero, 0
-	ldloc.0
+	stloc.2
+// 0x0106d840: 0x106d840: sll   zero, zero, 0
+// 0x0106d844: 0x106d844: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	clt
+	stloc.1
+// 0x0106d848: 0x106d848: bne   a0, zero, 0x106d878 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106d878
 // --- basic block ---
-// 0x0106d6fc: 0x106d6fc: lw    a0, 312(sp)
+// 0x0106d850: 0x106d850: lw    a0, 60(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 78
+	ldc.i4.s 15
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106d700: 0x106d700: jal   0x101c8f8 sll   zero, zero, 0
-	ldloc.0
+// 0x0106d854: 0x106d854: sll   zero, zero, 0
+// 0x0106d858: 0x106d858: slt   a0, a0, v1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldloc 7
+	clt
+	stloc.1
+// 0x0106d85c: 0x106d85c: bne   a0, zero, 0x106d878 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_106d878
+// --- basic block ---
+// 0x0106d864: 0x106d864: lw    v0, 68(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldelem.i4
 	stloc 5
+// 0x0106d868: 0x106d868: sll   zero, zero, 0
+// 0x0106d86c: 0x106d86c: slt   v1, v1, v0
+	ldloc 7
+	ldloc 5
+	clt
+	stloc 7
+// 0x0106d870: 0x106d870: beq   v1, zero, 0x106d8ac sll   zero, zero, 0
+	ldloc 7
+	brfalse L_106d8ac
 // --- basic block ---
-// 0x0106d708: 0x106d708: jal   0x101c8f8 addu  a0, s8, zero
-	ldloc 13
+L_106d878:
+// 0x0106d878: 0x106d878: jal   0x101c908 addu  a0, s3, zero
+	ldloc 12
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d710: 0x106d710: jal   0x101c8f8 addu  a0, s7, zero
-	ldloc 14
+// 0x0106d880: 0x106d880: jal   0x101c908 addu  a0, s2, zero
+	ldloc 9
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d718: 0x106d718: lw    ra, 388(sp)
-// 0x0106d71c: 0x106d71c: lw    s8, 384(sp)
+// 0x0106d888: 0x106d888: lw    ra, 324(sp)
+// 0x0106d88c: 0x106d88c: lw    s5, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 96
+	ldc.i4.s 80
 	add
 	ldelem.i4
 	stloc 13
-// 0x0106d720: 0x106d720: lw    s7, 380(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 95
-	add
-	ldelem.i4
-	stloc 14
-// 0x0106d724: 0x106d724: lw    s6, 376(sp)
+// 0x0106d890: 0x106d890: lw    s4, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 94
+	ldc.i4.s 79
 	add
 	ldelem.i4
-	stloc 15
-// 0x0106d728: 0x106d728: lw    s5, 372(sp)
+	stloc 10
+// 0x0106d894: 0x106d894: lw    s3, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 93
+	ldc.i4.s 78
 	add
 	ldelem.i4
-	stloc 16
-// 0x0106d72c: 0x106d72c: lw    s4, 368(sp)
+	stloc 12
+// 0x0106d898: 0x106d898: lw    s2, 308(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 92
+	ldc.i4.s 77
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106d730: 0x106d730: lw    s3, 364(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 91
-	add
-	ldelem.i4
-	stloc 12
-// 0x0106d734: 0x106d734: lw    s2, 360(sp)
+// 0x0106d89c: 0x106d89c: lw    s1, 304(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 90
+	ldc.i4.s 76
 	add
 	ldelem.i4
 	stloc 11
-// 0x0106d738: 0x106d738: lw    s1, 356(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 89
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106d73c: 0x106d73c: lw    s0, 352(sp)
+// 0x0106d8a0: 0x106d8a0: lw    s0, 300(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 88
+	ldc.i4.s 75
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106d740: 0x106d740: jr    ra addiu sp, sp, 392
+// 0x0106d8a4: 0x106d8a4: jr    ra addiu sp, sp, 328
 	ldloc.0
-	ldc.i4 392
+	ldc.i4 328
 	add
 	stloc.0
 	br __CIBYL_function_return
+// --- basic block ---
+L_106d8ac:
+// 0x0106d8ac: 0x106d8ac: jal   0x106c6a0 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::RemoveWazerNearby_106c6a0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d8b4: 0x106d8b4: j	 0x106d878 sll   zero, zero, 0
+	br L_106d878
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnUserShortClick_106d748(int32,int32,int32,int32,int32)
+.method public static int32 OnAddUser_106d8bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s4,int32 s1,int32 s2,int32 s3,int32 s8,int32 s7,int32 s6,int32 s5,int32 ra)
 
-// local  7 is register v0
-// local  8 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
+// local 10 is register s1
+// local 11 is register s2
+// local 12 is register s3
+// local  9 is register s4
+// local 16 is register s5
+// local 15 is register s6
+// local 14 is register s7
 // local  0 is register sp
-// local  5 is register ra
+// local 13 is register s8
+// local 17 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5662,1508 +6489,1406 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 16
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 13
+	ldc.i4.s 0
+	stloc 17
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d748: 0x106d748: addiu sp, sp, -24
+// 0x0106d8bc: 0x106d8bc: addiu sp, sp, -392
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4 -392
 	add
 	stloc.0
-// 0x0106d74c: 0x106d74c: lw    a1, 56(sp)
+// 0x0106d8c0: 0x106d8c0: sw    s0, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 88
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106d750: 0x106d750: lui   a0, 0x70000
-	ldc.i4 458752
+	ldloc 8
+	stelem.i4
+// 0x0106d8c4: 0x106d8c4: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x0106d8c8: 0x106d8c8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106d8cc: 0x106d8cc: sw    s7, 380(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 95
+	add
+	ldloc 14
+	stelem.i4
+// 0x0106d8d0: 0x106d8d0: addiu a0, a0, -28772
+	ldloc.1
+	ldc.i4 -28772
+	add
+	stloc.1
+// 0x0106d8d4: 0x106d8d4: addiu s7, s0, 68
+	ldloc 8
+	ldc.i4.s 68
+	add
+	stloc 14
+// 0x0106d8d8: 0x106d8d8: sw    ra, 388(sp)
+// 0x0106d8dc: 0x106d8dc: sw    s6, 376(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 94
+	add
+	ldloc 15
+	stelem.i4
+// 0x0106d8e0: 0x106d8e0: sw    s4, 368(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 92
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106d8e4: 0x106d8e4: sw    s3, 364(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 91
+	add
+	ldloc 12
+	stelem.i4
+// 0x0106d8e8: 0x106d8e8: sw    s2, 360(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 90
+	add
+	ldloc 11
+	stelem.i4
+// 0x0106d8ec: 0x106d8ec: sw    s1, 356(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 89
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106d8f0: 0x106d8f0: sw    s8, 384(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 96
+	add
+	ldloc 13
+	stelem.i4
+// 0x0106d8f4: 0x106d8f4: jal   0x101ca1c sw    s5, 372(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 93
+	add
+	ldloc 16
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d8fc: 0x106d8fc: addu  a0, s7, zero
+	ldloc 14
 	stloc.1
-// 0x0106d754: 0x106d754: addiu a0, a0, 18008
+// 0x0106d900: 0x106d900: jal   0x101ca1c addu  s3, v0, zero
+	ldloc 5
+	stloc 12
+	ldloc.0
 	ldloc.1
-	ldc.i4 18008
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d908: 0x106d908: addiu a0, s0, 4
+	ldloc 8
+	ldc.i4.4
 	add
 	stloc.1
-// 0x0106d758: 0x106d758: sw    ra, 20(sp)
-// 0x0106d75c: 0x106d75c: jal   0x108be4c addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
+// 0x0106d90c: 0x106d90c: jal   0x101ca1c addu  s6, v0, zero
+	ldloc 5
+	stloc 15
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_Popup_108be4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106d764: 0x106d764: lw    ra, 20(sp)
-// 0x0106d768: 0x106d768: sll   zero, zero, 0
-// 0x0106d76c: 0x106d76c: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x0106d914: 0x106d914: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106d918: 0x106d918: addiu a0, a0, 22964
+	ldloc.1
+	ldc.i4 22964
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 Realtime_ShowWazerNearby_106d774(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
+	stloc.1
+// 0x0106d91c: 0x106d91c: addu  s2, v0, zero
+	ldloc 5
+	stloc 11
+// 0x0106d920: 0x106d920: jal   0x101ca1c lui   s4, 0x70000
+	ldc.i4 458752
 	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_106d774:
-// 0x0106d774: 0x106d774: lui   v0, 0x70000
-	ldc.i4 458752
 	stloc 5
-// 0x0106d778: 0x106d778: lw    v0, 17632(v0)
-	ldloc 6
+// --- basic block ---
+// 0x0106d928: 0x106d928: addu  s1, v0, zero
 	ldloc 5
+	stloc 10
+// 0x0106d92c: 0x106d92c: lw    v0, 18092(s4)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 4408
+	ldc.i4 4523
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106d77c: 0x106d77c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106d780: 0x106d780: sw    ra, 20(sp)
-// 0x0106d784: 0x106d784: beq   v0, zero, 0x106d7b0 sw    s0, 16(sp)
+// 0x0106d930: 0x106d930: sll   zero, zero, 0
+// 0x0106d934: 0x106d934: bne   v0, zero, 0x106d954 lui   a0, 0x1070000
 	ldloc 5
+	ldc.i4 17235968
+	stloc.1
+	brtrue L_106d954
+// --- basic block ---
+// 0x0106d93c: 0x106d93c: jal   0x101f980 addiu a0, a0, -8732
+	ldloc.1
+	ldc.i4 -8732
+	add
+	stloc.1
+	ldloc.1
+	call int32 Cibyl23::roadmap_screen_subscribe_after_refresh_101f980(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d944: 0x106d944: lui   v1, 0x70000
+	ldc.i4 458752
+	stloc 7
+// 0x0106d948: 0x106d948: sw    v0, 18088(v1)
 	ldloc 6
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4522
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
-	brfalse L_106d7b0
-// --- basic block ---
-// 0x0106d78c: 0x106d78c: lui   v0, 0x0
-	ldc.i4.s 0
+// 0x0106d94c: 0x106d94c: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x0106d790: 0x106d790: lw    a1, 15056(v0)
+// 0x0106d950: 0x106d950: sw    v0, 18092(s4)
 	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 4523
+	add
 	ldloc 5
+	stelem.i4
+L_106d954:
+// 0x0106d954: 0x106d954: lw    a0, 156(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3764
+	ldc.i4.s 39
 	add
 	ldelem.i4
-	stloc.2
-// 0x0106d794: 0x106d794: lui   s0, 0x70000
-	ldc.i4 458752
-	stloc 7
-// 0x0106d798: 0x106d798: jal   0x108b378 addiu a0, s0, 18008
-	ldloc 7
-	ldc.i4 18008
-	add
 	stloc.1
+// 0x0106d958: 0x106d958: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x0106d95c: 0x106d95c: beq   a0, v0, 0x106d974 sll   zero, zero, 0
+	ldloc.1
+	ldloc 5
+	beq  L_106d974
+// --- basic block ---
+// 0x0106d964: 0x106d964: jal   0x103543c sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_UserByID_108b378(int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_mood_to_string_103543c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d7a0: 0x106d7a0: addiu a1, v0, 68
+// 0x0106d96c: 0x106d96c: j	 0x106d97c addu  a0, v0, zero
 	ldloc 5
-	ldc.i4.s 68
+	stloc.1
+	br L_106d97c
+// --- basic block ---
+L_106d974:
+// 0x0106d974: 0x106d974: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106d978: 0x106d978: addiu a0, a0, -14160
+	ldloc.1
+	ldc.i4 -14160
 	add
-	stloc.2
-// 0x0106d7a4: 0x106d7a4: addiu a0, s0, 18008
-	ldloc 7
-	ldc.i4 18008
+	stloc.1
+L_106d97c:
+// 0x0106d97c: 0x106d97c: jal   0x101ca1c addiu s4, sp, 60
+	ldloc.0
+	ldc.i4.s 60
 	add
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d984: 0x106d984: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0106d988: 0x106d988: addu  a0, s4, zero
+	ldloc 9
 	stloc.1
-// 0x0106d7a8: 0x106d7a8: jal   0x108be4c addiu a2, zero, 2
-	ldc.i4.2
+// 0x0106d98c: 0x106d98c: addiu a2, a2, 22928
+	ldloc.3
+	ldc.i4 22928
+	add
 	stloc.3
+// 0x0106d990: 0x106d990: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d994: 0x106d994: addu  a3, s7, zero
+	ldloc 14
+	stloc 4
+// 0x0106d998: 0x106d998: jal   0x1000f9c addu  s5, v0, zero
+	ldloc 5
+	stloc 16
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_Popup_108be4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_106d7b0:
-// 0x0106d7b0: 0x106d7b0: lw    ra, 20(sp)
-// 0x0106d7b4: 0x106d7b4: lw    s0, 16(sp)
-	ldloc 6
+// 0x0106d9a0: 0x106d9a0: jal   0x101ca1c addu  a0, s4, zero
+	ldloc 9
+	stloc.1
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106d9a8: 0x106d9a8: addu  s4, v0, zero
+	ldloc 5
+	stloc 9
+// 0x0106d9ac: 0x106d9ac: lw    v0, 352(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 88
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106d7b8: 0x106d7b8: jr    ra addiu sp, sp, 24
+	stloc 5
+// 0x0106d9b0: 0x106d9b0: sll   zero, zero, 0
+// 0x0106d9b4: 0x106d9b4: beq   v0, zero, 0x106d9e0 lui   a2, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.3
+	brfalse L_106d9e0
+// --- basic block ---
+// 0x0106d9bc: 0x106d9bc: addiu s8, sp, 144
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4 144
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 realtime_after_refresh_106d7c0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	stloc 13
+// 0x0106d9c0: 0x106d9c0: addiu a2, a2, 22940
+	ldloc.3
+	ldc.i4 22940
+	add
+	stloc.3
+// 0x0106d9c4: 0x106d9c4: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x0106d9c8: 0x106d9c8: addu  a3, s7, zero
+	ldloc 14
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x0106d9cc: 0x106d9cc: jal   0x1000f9c addu  a0, s8, zero
+	ldloc 13
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-__CIBYL_javamethod_begin:
+	stloc 5
 // --- basic block ---
-// 0x0106d7c0: 0x106d7c0: lui   v0, 0x70000
-	ldc.i4 458752
+// 0x0106d9d4: 0x106d9d4: jal   0x101ca1c addu  a0, s8, zero
+	ldloc 13
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0106d7c4: 0x106d7c4: lw    v0, 17632(v0)
-	ldloc 7
+// --- basic block ---
+// 0x0106d9dc: 0x106d9dc: sw    v0, 344(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 86
+	add
 	ldloc 5
+	stelem.i4
+L_106d9e0:
+// 0x0106d9e0: 0x106d9e0: lw    v0, 564(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 4408
+	ldc.i4 141
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106d7c8: 0x106d7c8: addiu sp, sp, -48
+// 0x0106d9e4: 0x106d9e4: sll   zero, zero, 0
+// 0x0106d9e8: 0x106d9e8: beq   v0, zero, 0x106da14 addiu s8, sp, 228
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4 228
 	add
-	stloc.0
-// 0x0106d7cc: 0x106d7cc: beq   v0, zero, 0x106d8e4 sw    ra, 44(sp)
-	ldloc 5
-	brfalse L_106d8e4
+	stloc 13
+	brfalse L_106da14
 // --- basic block ---
-// 0x0106d7d4: 0x106d7d4: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0106d7d8: 0x106d7d8: lw    a1, 15056(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3764
+// 0x0106d9f0: 0x106d9f0: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0106d9f4: 0x106d9f4: addiu a2, a2, 22952
+	ldloc.3
+	ldc.i4 22952
 	add
-	ldelem.i4
+	stloc.3
+// 0x0106d9f8: 0x106d9f8: addu  a3, s7, zero
+	ldloc 14
+	stloc 4
+// 0x0106d9fc: 0x106d9fc: addiu a1, zero, 83
+	ldc.i4.s 83
 	stloc.2
-// 0x0106d7dc: 0x106d7dc: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x0106d7e0: 0x106d7e0: beq   a1, v0, 0x106d8e8 lui   v0, 0x70000
+// 0x0106da00: 0x106da00: jal   0x1000f9c addu  a0, s8, zero
+	ldloc 13
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldloc 5
-	ldc.i4 458752
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	beq  L_106d8e8
 // --- basic block ---
-// 0x0106d7e8: 0x106d7e8: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106d7ec: 0x106d7ec: jal   0x108b378 addiu a0, a0, 18008
-	ldloc.1
-	ldc.i4 18008
-	add
+// 0x0106da08: 0x106da08: jal   0x101ca1c addu  a0, s8, zero
+	ldloc 13
 	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl104::RTUsers_UserByID_108b378(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d7f4: 0x106d7f4: beq   v0, zero, 0x106d8e4 lui   v1, 0xe0000
-	ldloc 5
-	ldc.i4 917504
-	stloc 6
-	brfalse L_106d8e4
-// --- basic block ---
-// 0x0106d7fc: 0x106d7fc: addiu v1, v1, 29604
+// 0x0106da10: 0x106da10: sw    v0, 340(sp)
 	ldloc 6
-	ldc.i4 29604
-	add
-	stloc 6
-// 0x0106d800: 0x106d800: lw    a0, 132(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4.s 85
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106d804: 0x106d804: lw    a1, 56(v1)
-	ldloc 7
+	ldloc 5
+	stelem.i4
+L_106da14:
+// 0x0106da14: 0x106da14: lw    a1, 148(s0)
 	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 37
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106d808: 0x106d808: sll   zero, zero, 0
-// 0x0106d80c: 0x106d80c: slt   a1, a1, a0
-	ldloc.2
-	ldloc.1
-	clt
-	stloc.2
-// 0x0106d810: 0x106d810: bne   a1, zero, 0x106d858 sll   zero, zero, 0
-	ldloc.2
-	brtrue L_106d858
-// --- basic block ---
-// 0x0106d818: 0x106d818: lw    a1, 64(v1)
-	ldloc 7
+// 0x0106da18: 0x106da18: lw    v1, 132(s0)
 	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 33
 	add
 	ldelem.i4
-	stloc.2
-// 0x0106d81c: 0x106d81c: sll   zero, zero, 0
-// 0x0106d820: 0x106d820: slt   a0, a0, a1
-	ldloc.1
-	ldloc.2
-	clt
-	stloc.1
-// 0x0106d824: 0x106d824: bne   a0, zero, 0x106d85c addiu a0, sp, 16
-	ldloc.1
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc.1
-	brtrue L_106d85c
-// --- basic block ---
-// 0x0106d82c: 0x106d82c: lw    a0, 136(v0)
-	ldloc 7
-	ldloc 5
+	stloc 7
+// 0x0106da1c: 0x106da1c: lw    v0, 136(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 34
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106d830: 0x106d830: lw    a1, 60(v1)
-	ldloc 7
+	stloc 5
+// 0x0106da20: 0x106da20: lw    a0, 144(s0)
 	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.s 36
 	add
 	ldelem.i4
-	stloc.2
-// 0x0106d834: 0x106d834: sll   zero, zero, 0
-// 0x0106d838: 0x106d838: slt   a1, a1, a0
-	ldloc.2
-	ldloc.1
-	clt
-	stloc.2
-// 0x0106d83c: 0x106d83c: bne   a1, zero, 0x106d858 sll   zero, zero, 0
-	ldloc.2
-	brtrue L_106d858
-// --- basic block ---
-// 0x0106d844: 0x106d844: lw    v1, 68(v1)
-	ldloc 7
+	stloc.1
+// 0x0106da24: 0x106da24: sw    v1, 40(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 10
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106d848: 0x106d848: sll   zero, zero, 0
-// 0x0106d84c: 0x106d84c: slt   a0, a0, v1
-	ldloc.1
+	ldloc 7
+	stelem.i4
+// 0x0106da28: 0x106da28: sw    v0, 44(sp)
 	ldloc 6
-	clt
-	stloc.1
-// 0x0106d850: 0x106d850: beq   a0, zero, 0x106d908 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_106d908
-// --- basic block ---
-L_106d858:
-// 0x0106d858: 0x106d858: addiu a0, sp, 16
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc.1
-L_106d85c:
-// 0x0106d85c: 0x106d85c: jal   0x1007f28 sw    v0, 32(sp)
-	ldloc 7
+	ldloc 5
+	stelem.i4
+// 0x0106da2c: 0x106da2c: jal   0x10c0f10 sw    zero, 48(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 12
 	add
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl5::roadmap_math_screen_edges_1007f28(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d864: 0x106d864: lw    v0, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106d868: 0x106d868: lw    a0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106d86c: 0x106d86c: lw    v1, 132(v0)
-	ldloc 7
-	ldloc 5
+// 0x0106da34: 0x106da34: lw    v1, 140(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4.s 35
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106d870: 0x106d870: sll   zero, zero, 0
-// 0x0106d874: 0x106d874: slt   a0, v1, a0
-	ldloc 6
-	ldloc.1
-	clt
+	stloc 7
+// 0x0106da38: 0x106da38: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0106d878: 0x106d878: bne   a0, zero, 0x106d894 addiu a0, zero, 2
+// 0x0106da3c: 0x106da3c: addiu a0, a0, 22972
 	ldloc.1
-	ldc.i4.2
-	stloc.1
-	brtrue L_106d894
-// --- basic block ---
-// 0x0106d880: 0x106d880: lw    a0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4 22972
 	add
-	ldelem.i4
 	stloc.1
-// 0x0106d884: 0x106d884: sll   zero, zero, 0
-// 0x0106d888: 0x106d888: slt   v1, a0, v1
-	ldloc.1
-	ldloc 6
-	clt
-	stloc 6
-// 0x0106d88c: 0x106d88c: beq   v1, zero, 0x106d89c addiu a0, zero, 4
+// 0x0106da40: 0x106da40: sw    v1, 56(sp)
 	ldloc 6
-	ldc.i4.4
-	stloc.1
-	brfalse L_106d89c
-// --- basic block ---
-L_106d894:
-// 0x0106d894: 0x106d894: j	 0x106d8c0 lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 6
-	br L_106d8c0
-// --- basic block ---
-L_106d89c:
-// 0x0106d89c: 0x106d89c: lw    a1, 136(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4.s 14
 	add
-	ldelem.i4
-	stloc.2
-// 0x0106d8a0: 0x106d8a0: lw    a0, 20(sp)
 	ldloc 7
+	stelem.i4
+// 0x0106da44: 0x106da44: jal   0x101ca1c sw    v0, 52(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 13
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106d8a4: 0x106d8a4: sll   zero, zero, 0
-// 0x0106d8a8: 0x106d8a8: slt   a0, a0, a1
+	ldloc 5
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	clt
-	stloc.1
-// 0x0106d8ac: 0x106d8ac: beq   a0, zero, 0x106d8bc lui   v1, 0x70000
-	ldloc.1
-	ldc.i4 458752
-	stloc 6
-	brfalse L_106d8bc
-// --- basic block ---
-// 0x0106d8b4: 0x106d8b4: j	 0x106d8c0 addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-	br L_106d8c0
-// --- basic block ---
-L_106d8bc:
-// 0x0106d8bc: 0x106d8bc: addiu a0, zero, 3
-	ldc.i4.3
-	stloc.1
-L_106d8c0:
-// 0x0106d8c0: 0x106d8c0: lw    v0, 352(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 88
-	add
-	ldelem.i4
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0106d8c4: 0x106d8c4: sll   zero, zero, 0
-// 0x0106d8c8: 0x106d8c8: beq   v0, zero, 0x106d8e4 sw    a0, 17632(v1)
-	ldloc 5
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4408
-	add
-	ldloc.1
-	stelem.i4
-	brfalse L_106d8e4
 // --- basic block ---
-// 0x0106d8d0: 0x106d8d0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106d8d4: 0x106d8d4: lw    v1, 17632(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4408
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106d8d8: 0x106d8d8: sll   zero, zero, 0
-// 0x0106d8dc: 0x106d8dc: addiu v1, v1, 4
-	ldloc 6
-	ldc.i4.4
-	add
-	stloc 6
-// 0x0106d8e0: 0x106d8e0: sw    v1, 17632(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4408
+// 0x0106da4c: 0x106da4c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106da50: 0x106da50: addiu a0, a0, 31388
+	ldloc.1
+	ldc.i4 31388
 	add
+	stloc.1
+// 0x0106da54: 0x106da54: jal   0x101ca1c sw    v0, 320(sp)
 	ldloc 6
-	stelem.i4
-L_106d8e4:
-// 0x0106d8e4: 0x106d8e4: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-L_106d8e8:
-// 0x0106d8e8: 0x106d8e8: lw    v0, 17624(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4406
+	ldc.i4.s 80
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d8ec: 0x106d8ec: sll   zero, zero, 0
-// 0x0106d8f0: 0x106d8f0: beq   v0, zero, 0x106d918 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106d918
-// --- basic block ---
-// 0x0106d8f8: 0x106d8f8: jalr  v0 sll   zero, zero, 0
 	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106d900: 0x106d900: j	 0x106d918 sll   zero, zero, 0
-	br L_106d918
-// --- basic block ---
-L_106d908:
-// 0x0106d908: 0x106d908: jal   0x106c07c sll   zero, zero, 0
+// 0x0106da5c: 0x106da5c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106da60: 0x106da60: addiu a0, a0, 22980
+	ldloc.1
+	ldc.i4 22980
+	add
+	stloc.1
+// 0x0106da64: 0x106da64: jal   0x101ca1c sw    v0, 336(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 84
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RemoveWazerNearby_106c07c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106d910: 0x106d910: j	 0x106d8e8 lui   v0, 0x70000
-	ldc.i4 458752
+	stloc 7
 	stloc 5
-	br L_106d8e8
 // --- basic block ---
-L_106d918:
-// 0x0106d918: 0x106d918: lw    ra, 44(sp)
-// 0x0106d91c: 0x106d91c: sll   zero, zero, 0
-// 0x0106d920: 0x106d920: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
+// 0x0106da6c: 0x106da6c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106da70: 0x106da70: addiu a0, a0, 22988
+	ldloc.1
+	ldc.i4 22988
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	stloc.1
+// 0x0106da74: 0x106da74: jal   0x101ca1c sw    v0, 332(sp)
 	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 OnKeepAliveTimer_Realtime_106d928(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106d928: 0x106d928: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106d92c: 0x106d92c: sw    ra, 20(sp)
-// 0x0106d930: 0x106d930: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-// 0x0106d934: 0x106d934: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x0106d938: 0x106d938: cibyl_sysc 0x20f3
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x0106d93c: 0x106d93c: addu  v1, v0, zero
-	ldloc 5
-	stloc 6
-// 0x0106d940: 0x106d940: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106d944: 0x106d944: lw    a0, 17700(v0)
-	ldloc 7
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4425
+	ldc.i4.s 83
 	add
-	ldelem.i4
-	stloc.1
-// 0x0106d948: 0x106d948: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106d94c: 0x106d94c: lw    v0, 17704(v0)
-	ldloc 7
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4426
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106d950: 0x106d950: subu  v1, v1, a0
-	ldloc 6
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	sub
-	stloc 6
-// 0x0106d954: 0x106d954: slt   v1, v0, v1
-	ldloc 5
-	ldloc 6
-	clt
-	stloc 6
-// 0x0106d958: 0x106d958: beq   v1, zero, 0x106d970 lui   a0, 0x70000
-	ldloc 6
-	ldc.i4 458752
-	stloc.1
-	brfalse L_106d970
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106d960: 0x106d960: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x0106d964: 0x106d964: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x0106da7c: 0x106da7c: addiu a0, s0, 460
+	ldloc 8
+	ldc.i4 460
 	add
 	stloc.1
-// 0x0106d968: 0x106d968: jal   0x1075248 addiu a1, a1, 4820
-	ldloc.2
-	ldc.i4 4820
-	add
-	stloc.2
+// 0x0106da80: 0x106da80: jal   0x101ca1c addu  s8, v0, zero
+	ldloc 5
+	stloc 13
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RTNet_KeepAlive_1075248(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_106d970:
-// 0x0106d970: 0x106d970: lw    ra, 20(sp)
-// 0x0106d974: 0x106d974: sll   zero, zero, 0
-// 0x0106d978: 0x106d978: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x0106da88: 0x106da88: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106da8c: 0x106da8c: addiu a0, a0, 23000
+	ldloc.1
+	ldc.i4 23000
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc.1
+// 0x0106da90: 0x106da90: jal   0x101ca1c addu  s7, v0, zero
 	ldloc 5
-	ret
-}
-.method public static int32 Realtime_RandomUserRegister_106d980(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+	stloc 14
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d980: 0x106d980: lui   a0, 0x70000
-	ldc.i4 458752
+// 0x0106da98: 0x106da98: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0106d984: 0x106d984: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x0106d988: 0x106d988: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106d98c: 0x106d98c: addiu a0, a0, 17728
+// 0x0106da9c: 0x106da9c: addiu a0, a0, 23012
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 23012
 	add
 	stloc.1
-// 0x0106d990: 0x106d990: sw    ra, 20(sp)
-// 0x0106d994: 0x106d994: jal   0x10723bc addiu a1, a1, -9664
-	ldloc.2
-	ldc.i4 -9664
+// 0x0106daa0: 0x106daa0: jal   0x101ca1c sw    v0, 316(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 79
 	add
-	stloc.2
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_RandomUserRegister_10723bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
-// --- basic block ---
-// 0x0106d99c: 0x106d99c: lw    ra, 20(sp)
-// 0x0106d9a0: 0x106d9a0: sll   zero, zero, 0
-// 0x0106d9a4: 0x106d9a4: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 Realtime_ResetTransactionState_106d9ac(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
-
-// local  8 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  5 is register s0
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
 	stloc 5
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106d9ac: 0x106d9ac: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x0106daa8: 0x106daa8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106daac: 0x106daac: addiu a0, a0, 23032
+	ldloc.1
+	ldc.i4 23032
 	add
-	stloc.0
-// 0x0106d9b0: 0x106d9b0: sw    s0, 16(sp)
+	stloc.1
+// 0x0106dab0: 0x106dab0: jal   0x101ca1c sw    v0, 312(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 78
 	add
 	ldloc 5
 	stelem.i4
-// 0x0106d9b4: 0x106d9b4: addu  s0, a0, zero
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0106d9b8: 0x106d9b8: lui   a0, 0x70000
-	ldc.i4 458752
+// --- basic block ---
+// 0x0106dab8: 0x106dab8: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0106d9bc: 0x106d9bc: sw    ra, 20(sp)
-// 0x0106d9c0: 0x106d9c0: jal   0x1085b90 addiu a0, a0, 17728
+// 0x0106dabc: 0x106dabc: addiu a0, a0, 23052
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 23052
 	add
 	stloc.1
-	ldloc.1
-	call void Cibyl100::RTConnectionInfo_ResetTransaction_1085b90(int32)
-// --- basic block ---
-// 0x0106d9c8: 0x106d9c8: beq   s0, zero, 0x106d9d8 sll   zero, zero, 0
+// 0x0106dac0: 0x106dac0: jal   0x101ca1c sw    v0, 328(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 82
+	add
 	ldloc 5
-	brfalse L_106d9d8
-// --- basic block ---
-// 0x0106d9d0: 0x106d9d0: jal   0x1021900 sll   zero, zero, 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_106d9d8:
-// 0x0106d9d8: 0x106d9d8: lw    ra, 20(sp)
-// 0x0106d9dc: 0x106d9dc: lw    s0, 16(sp)
+// 0x0106dac8: 0x106dac8: sw    v0, 324(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 81
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106d9e0: 0x106d9e0: jr    ra addiu sp, sp, 24
+	ldloc 5
+	stelem.i4
+// 0x0106dacc: 0x106dacc: addiu v1, sp, 40
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 40
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_GetGeoConfig_106d9e8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
+	stloc 7
+// 0x0106dad0: 0x106dad0: addiu v0, zero, 12
+	ldc.i4.s 12
 	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+// 0x0106dad4: 0x106dad4: addu  a1, s6, zero
+	ldloc 15
+	stloc.2
+// 0x0106dad8: 0x106dad8: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106dadc: 0x106dadc: addu  a3, s1, zero
+	ldloc 10
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106d9e8: 0x106d9e8: addiu sp, sp, -32
+// 0x0106dae0: 0x106dae0: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x0106dae4: 0x106dae4: sw    v0, 28(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.0
-// 0x0106d9ec: 0x106d9ec: sw    ra, 28(sp)
-// 0x0106d9f0: 0x106d9f0: beq   a1, zero, 0x106da28 addu  a0, a1, zero
-	ldloc.2
-	ldloc.2
-	stloc.1
-	brfalse L_106da28
-// --- basic block ---
-// 0x0106d9f8: 0x106d9f8: jal   0x10ac36c sll   zero, zero, 0
+	ldloc 5
+	stelem.i4
+// 0x0106dae8: 0x106dae8: sw    v1, 20(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106da00: 0x106da00: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106da04: 0x106da04: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106da08: 0x106da08: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.2
-// 0x0106da0c: 0x106da0c: addiu a3, a3, 22608
-	ldloc 4
-	ldc.i4 22608
+	ldloc 7
+	stelem.i4
+// 0x0106daec: 0x106daec: sw    v1, 348(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 87
 	add
-	stloc 4
-// 0x0106da10: 0x106da10: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106da14: 0x106da14: addiu a2, zero, 2527
-	ldc.i4 2527
-	stloc.3
-// 0x0106da18: 0x106da18: jal   0x100449c sw    v0, 16(sp)
-	ldloc 8
+	ldloc 7
+	stelem.i4
+// 0x0106daf0: 0x106daf0: sw    s5, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 16
 	stelem.i4
+// 0x0106daf4: 0x106daf4: sw    zero, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106da20: 0x106da20: jal   0x10ac22c sll   zero, zero, 0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106daf8: 0x106daf8: jal   0x101c50c sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_geo_config_transaction_failed_10ac22c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_106da28:
-// 0x0106da28: 0x106da28: jal   0x106d9ac addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0106db00: 0x106db00: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0106db04: 0x106db04: addu  a0, s6, zero
+	ldloc 15
 	stloc.1
+// 0x0106db08: 0x106db08: jal   0x101bee0 addiu a1, a1, -8852
+	ldloc.2
+	ldc.i4 -8852
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_ResetTransactionState_106d9ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106da30: 0x106da30: lw    ra, 28(sp)
-// 0x0106da34: 0x106da34: sll   zero, zero, 0
-// 0x0106da38: 0x106da38: jr    ra addiu sp, sp, 32
+// 0x0106db10: 0x106db10: lw    v0, 224(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 56
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106db14: 0x106db14: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106db18: 0x106db18: lw    v1, 348(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 87
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	ldelem.i4
+	stloc 7
+// 0x0106db1c: 0x106db1c: bne   v0, a0, 0x106db78 sll   zero, zero, 0
+	ldloc 5
+	ldloc.1
+	bne.un L_106db78
+// --- basic block ---
+// 0x0106db24: 0x106db24: lw    a0, 248(s0)
 	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 62
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106db28: 0x106db28: sll   zero, zero, 0
+// 0x0106db2c: 0x106db2c: bne   a0, v0, 0x106db50 addu  a0, s3, zero
+	ldloc.1
 	ldloc 5
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_Register_106da40(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 ra)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 12 is register s2
-// local 10 is register s3
-// local 11 is register s4
-// local  0 is register sp
-// local 13 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 13
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
+	ldloc 12
+	stloc.1
+	bne.un L_106db50
 // --- basic block ---
-// 0x0106da40: 0x106da40: addiu sp, sp, -48
+// 0x0106db34: 0x106db34: lw    v0, 312(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 78
 	add
-	stloc.0
-// 0x0106da44: 0x106da44: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x0106da48: 0x106da48: sw    s2, 32(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x0106db38: 0x106db38: addu  a1, s4, zero
+	ldloc 9
+	stloc.2
+// 0x0106db3c: 0x106db3c: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106db40: 0x106db40: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+// 0x0106db44: 0x106db44: sw    v1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
-	ldloc 12
+	ldloc 7
 	stelem.i4
-// 0x0106da4c: 0x106da4c: sw    s1, 28(sp)
-	ldloc 5
+// 0x0106db48: 0x106db48: j	 0x106db68 sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106da50: 0x106da50: sw    s0, 24(sp)
 	ldloc 5
+	stelem.i4
+	br L_106db68
+// --- basic block ---
+L_106db50:
+// 0x0106db50: 0x106db50: sw    v1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x0106da54: 0x106da54: sw    ra, 44(sp)
-// 0x0106da58: 0x106da58: lw    s0, 17576(v0)
-	ldloc 5
+// 0x0106db54: 0x106db54: lw    v1, 320(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4394
+	ldc.i4.s 80
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106da5c: 0x106da5c: sw    s4, 40(sp)
-	ldloc 5
+	stloc 7
+// 0x0106db58: 0x106db58: addu  a1, s4, zero
+	ldloc 9
+	stloc.2
+// 0x0106db5c: 0x106db5c: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106db60: 0x106db60: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+// 0x0106db64: 0x106db64: sw    v1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.4
 	add
-	ldloc 11
+	ldloc 7
 	stelem.i4
-// 0x0106da60: 0x106da60: sw    s3, 36(sp)
-	ldloc 5
+L_106db68:
+// 0x0106db68: 0x106db68: sw    zero, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.6
 	add
-	ldloc 10
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106da64: 0x106da64: addu  s1, a1, zero
-	ldloc.2
-	stloc 9
-// 0x0106da68: 0x106da68: sw    zero, 17576(v0)
-	ldloc 5
+// 0x0106db6c: 0x106db6c: sw    zero, 28(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4394
+	ldc.i4.7
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106da6c: 0x106da6c: bne   a1, zero, 0x106dadc lui   s2, 0x10000
-	ldloc.2
-	ldc.i4 65536
-	stloc 12
-	brtrue L_106dadc
-// --- basic block ---
-// 0x0106da74: 0x106da74: lui   s4, 0x70000
-	ldc.i4 458752
-	stloc 11
-// 0x0106da78: 0x106da78: addiu a0, s4, 17728
-	ldloc 11
-	ldc.i4 17728
+// 0x0106db70: 0x106db70: jal   0x101c50c sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.1
-// 0x0106da7c: 0x106da7c: jal   0x106aee0 lui   s3, 0x70000
-	ldc.i4 458752
-	stloc 10
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginUsername_106aee0(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106da84: 0x106da84: jal   0x106aeb8 addiu a0, s3, 17792
-	ldloc 10
-	ldc.i4 17792
+L_106db78:
+// 0x0106db78: 0x106db78: lw    v1, 224(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 56
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginPassword_106aeb8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldelem.i4
 	stloc 7
-	stloc 6
+// 0x0106db7c: 0x106db7c: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x0106db80: 0x106db80: bne   v1, v0, 0x106dbdc addiu v1, zero, 1
+	ldloc 7
+	ldloc 5
+	ldc.i4.1
+	stloc 7
+	bne.un L_106dbdc
 // --- basic block ---
-// 0x0106da8c: 0x106da8c: lui   a0, 0x70000
-	ldc.i4 458752
+// 0x0106db88: 0x106db88: lw    a0, 248(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 62
+	add
+	ldelem.i4
 	stloc.1
-// 0x0106da90: 0x106da90: jal   0x106ae90 addiu a0, a0, 17856
+// 0x0106db8c: 0x106db8c: sll   zero, zero, 0
+// 0x0106db90: 0x106db90: bne   a0, v1, 0x106dbb0 addiu v0, sp, 40
 	ldloc.1
-	ldc.i4 17856
+	ldloc 7
+	ldloc.0
+	ldc.i4.s 40
 	add
+	stloc 5
+	bne.un L_106dbb0
+// --- basic block ---
+// 0x0106db98: 0x106db98: addu  a0, s3, zero
+	ldloc 12
 	stloc.1
+// 0x0106db9c: 0x106db9c: addu  a1, s4, zero
+	ldloc 9
+	stloc.2
+// 0x0106dba0: 0x106dba0: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106dba4: 0x106dba4: lw    v1, 328(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_SetLoginNickname_106ae90(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 82
+	add
+	ldelem.i4
 	stloc 7
-	stloc 6
+// 0x0106dba8: 0x106dba8: j	 0x106dbc4 addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+	br L_106dbc4
 // --- basic block ---
-// 0x0106da98: 0x106da98: addiu v1, zero, 1
-	ldc.i4.1
+L_106dbb0:
+// 0x0106dbb0: 0x106dbb0: lw    v1, 336(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 84
+	add
+	ldelem.i4
 	stloc 7
-// 0x0106da9c: 0x106da9c: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x0106daa0: 0x106daa0: addiu a0, zero, 1
-	ldc.i4.1
+// 0x0106dbb4: 0x106dbb4: addu  a0, s3, zero
+	ldloc 12
 	stloc.1
-// 0x0106daa4: 0x106daa4: jal   0x106b014 sw    v1, 17572(v0)
-	ldloc 5
+// 0x0106dbb8: 0x106dbb8: addu  a1, s4, zero
+	ldloc 9
+	stloc.2
+// 0x0106dbbc: 0x106dbbc: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106dbc0: 0x106dbc0: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+L_106dbc4:
+// 0x0106dbc4: 0x106dbc4: sw    v1, 16(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4393
+	ldc.i4.4
 	add
 	ldloc 7
 	stelem.i4
+// 0x0106dbc8: 0x106dbc8: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106dbcc: 0x106dbcc: sw    zero, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106dbd0: 0x106dbd0: sw    zero, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106dbd4: 0x106dbd4: jal   0x101c50c sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_set_random_user_106b014(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106daac: 0x106daac: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dab0: 0x106dab0: addiu s4, s4, 17728
-	ldloc 11
-	ldc.i4 17728
+L_106dbdc:
+// 0x0106dbdc: 0x106dbdc: lw    a0, 224(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 56
 	add
-	stloc 11
-// 0x0106dab4: 0x106dab4: addiu s3, s3, 17792
-	ldloc 10
-	ldc.i4 17792
+	ldelem.i4
+	stloc.1
+// 0x0106dbe0: 0x106dbe0: addiu v0, zero, 3
+	ldc.i4.3
+	stloc 5
+// 0x0106dbe4: 0x106dbe4: lw    v1, 248(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 62
 	add
-	stloc 10
-// 0x0106dab8: 0x106dab8: addiu a1, s2, 20732
-	ldloc 12
-	ldc.i4 20732
+	ldelem.i4
+	stloc 7
+// 0x0106dbe8: 0x106dbe8: bne   a0, v0, 0x106dc34 addiu v0, zero, 1
+	ldloc.1
+	ldloc 5
+	ldc.i4.1
+	stloc 5
+	bne.un L_106dc34
+// --- basic block ---
+// 0x0106dbf0: 0x106dbf0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106dbf4: 0x106dbf4: bne   v1, a0, 0x106dc14 addiu v0, sp, 40
+	ldloc 7
+	ldloc.1
+	ldloc.0
+	ldc.i4.s 40
 	add
+	stloc 5
+	bne.un L_106dc14
+// --- basic block ---
+// 0x0106dbfc: 0x106dbfc: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x0106dc00: 0x106dc00: addu  a1, s4, zero
+	ldloc 9
 	stloc.2
-// 0x0106dabc: 0x106dabc: addiu a3, a3, 22704
-	ldloc 4
-	ldc.i4 22704
+// 0x0106dc04: 0x106dc04: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106dc08: 0x106dc08: lw    v1, 324(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 81
 	add
+	ldelem.i4
+	stloc 7
+// 0x0106dc0c: 0x106dc0c: j	 0x106dc28 addu  a3, s1, zero
+	ldloc 10
 	stloc 4
-// 0x0106dac0: 0x106dac0: addiu a0, zero, 1
-	ldc.i4.1
+	br L_106dc28
+// --- basic block ---
+L_106dc14:
+// 0x0106dc14: 0x106dc14: lw    v1, 332(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 83
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106dc18: 0x106dc18: addu  a0, s3, zero
+	ldloc 12
 	stloc.1
-// 0x0106dac4: 0x106dac4: addiu a2, zero, 2495
-	ldc.i4 2495
+// 0x0106dc1c: 0x106dc1c: addu  a1, s4, zero
+	ldloc 9
+	stloc.2
+// 0x0106dc20: 0x106dc20: addu  a2, s2, zero
+	ldloc 11
 	stloc.3
-// 0x0106dac8: 0x106dac8: sw    s4, 16(sp)
-	ldloc 5
+// 0x0106dc24: 0x106dc24: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+L_106dc28:
+// 0x0106dc28: 0x106dc28: sw    v1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 11
+	ldloc 7
+	stelem.i4
+// 0x0106dc2c: 0x106dc2c: j	 0x106dc58 sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
 	stelem.i4
-// 0x0106dacc: 0x106dacc: jal   0x100449c sw    s3, 20(sp)
+	br L_106dc58
+// --- basic block ---
+L_106dc34:
+// 0x0106dc34: 0x106dc34: bne   v1, v0, 0x106dc68 addiu v0, sp, 40
+	ldloc 7
 	ldloc 5
 	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 5
+	bne.un L_106dc68
+// --- basic block ---
+// 0x0106dc3c: 0x106dc3c: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 10
+	ldloc 5
 	stelem.i4
+// 0x0106dc40: 0x106dc40: lw    v0, 316(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106dad4: 0x106dad4: j	 0x106daf4 sll   zero, zero, 0
-	br L_106daf4
-// --- basic block ---
-L_106dadc:
-// 0x0106dadc: 0x106dadc: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dae0: 0x106dae0: addiu a1, s2, 20732
-	ldloc 12
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106dae4: 0x106dae4: addiu a3, a3, 22812
-	ldloc 4
-	ldc.i4 22812
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 79
 	add
-	stloc 4
-// 0x0106dae8: 0x106dae8: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106daec: 0x106daec: jal   0x100449c addiu a2, zero, 2500
-	ldc.i4 2500
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-L_106daf4:
-// 0x0106daf4: 0x106daf4: jal   0x106d9ac addu  a0, zero, zero
-	ldc.i4.s 0
+	ldelem.i4
+	stloc 5
+// 0x0106dc44: 0x106dc44: addu  a0, s3, zero
+	ldloc 12
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl81::Realtime_ResetTransactionState_106d9ac(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106dafc: 0x106dafc: bne   s1, zero, 0x106db5c sll   zero, zero, 0
+// 0x0106dc48: 0x106dc48: addu  a1, s4, zero
 	ldloc 9
-	brtrue L_106db5c
-// --- basic block ---
-// 0x0106db04: 0x106db04: jal   0x106ba8c addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Realtime_ResetLoginState_106ba8c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106db0c: 0x106db0c: beq   s0, zero, 0x106db24 addu  a0, s0, zero
-	ldloc 8
-	ldloc 8
-	stloc.1
-	brfalse L_106db24
-// --- basic block ---
-// 0x0106db14: 0x106db14: jal   0x106bb20 addu  a1, zero, zero
-	ldc.i4.s 0
 	stloc.2
+// 0x0106dc4c: 0x106dc4c: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106dc50: 0x106dc50: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+// 0x0106dc54: 0x106dc54: sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Login_106bb20(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106db1c: 0x106db1c: j	 0x106db5c sll   zero, zero, 0
-	br L_106db5c
-// --- basic block ---
-L_106db24:
-// 0x0106db24: 0x106db24: lui   s0, 0x70000
-	ldc.i4 458752
-	stloc 8
-// 0x0106db28: 0x106db28: addiu s0, s0, 17728
-	ldloc 8
-	ldc.i4 17728
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc 8
-// 0x0106db2c: 0x106db2c: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106db30: 0x106db30: addiu s1, zero, 1
-	ldc.i4.1
-	stloc 9
-// 0x0106db34: 0x106db34: addiu a0, a0, 2684
-	ldloc.1
-	ldc.i4 2684
+	ldloc 5
+	stelem.i4
+L_106dc58:
+// 0x0106dc58: 0x106dc58: sw    zero, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.1
-// 0x0106db38: 0x106db38: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc.2
-// 0x0106db3c: 0x106db3c: sw    s1, 28688(s0)
-	ldloc 5
-	ldloc 8
+	stelem.i4
+// 0x0106dc5c: 0x106dc5c: sw    zero, 28(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4.7
 	add
-	ldloc 9
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106db40: 0x106db40: jal   0x106bb20 sw    zero, 28696(s0)
-	ldloc 5
-	ldloc 8
+// 0x0106dc60: 0x106dc60: jal   0x101c50c sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4.8
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -7172,360 +7897,445 @@ L_106db24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Login_106bb20(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106db48: 0x106db48: beq   v0, zero, 0x106db58 addiu v0, zero, 2
+L_106dc68:
+// 0x0106dc68: 0x106dc68: lw    v0, 352(s0)
 	ldloc 6
-	ldc.i4.2
-	stloc 6
-	brfalse L_106db58
-// --- basic block ---
-// 0x0106db50: 0x106db50: j	 0x106db5c sw    s1, 28688(s0)
-	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4.s 88
 	add
-	ldloc 9
-	stelem.i4
-	br L_106db5c
-// --- basic block ---
-L_106db58:
-// 0x0106db58: 0x106db58: sw    v0, 28696(s0)
+	ldelem.i4
+	stloc 5
+// 0x0106dc6c: 0x106dc6c: sll   zero, zero, 0
+// 0x0106dc70: 0x106dc70: beq   v0, zero, 0x106dca0 addiu v0, sp, 40
 	ldloc 5
-	ldloc 8
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 5
+	brfalse L_106dca0
+// --- basic block ---
+// 0x0106dc78: 0x106dc78: lw    a1, 344(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4.s 86
 	add
+	ldelem.i4
+	stloc.2
+// 0x0106dc7c: 0x106dc7c: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x0106dc80: 0x106dc80: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106dc84: 0x106dc84: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+// 0x0106dc88: 0x106dc88: sw    v0, 20(sp)
 	ldloc 6
-	stelem.i4
-L_106db5c:
-// 0x0106db5c: 0x106db5c: lw    ra, 44(sp)
-// 0x0106db60: 0x106db60: lw    s4, 40(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 11
-// 0x0106db64: 0x106db64: lw    s3, 36(sp)
 	ldloc 5
+	stelem.i4
+// 0x0106dc8c: 0x106dc8c: sw    s8, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 10
-// 0x0106db68: 0x106db68: lw    s2, 32(sp)
-	ldloc 5
+	ldloc 13
+	stelem.i4
+// 0x0106dc90: 0x106dc90: sw    zero, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 12
-// 0x0106db6c: 0x106db6c: lw    s1, 28(sp)
-	ldloc 5
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106dc94: 0x106dc94: sw    zero, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 9
-// 0x0106db70: 0x106db70: lw    s0, 24(sp)
-	ldloc 5
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106dc98: 0x106dc98: jal   0x101c50c sw    zero, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_106dca0:
+// 0x0106dca0: 0x106dca0: lw    v0, 564(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 141
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106db74: 0x106db74: jr    ra addiu sp, sp, 48
+	stloc 5
+// 0x0106dca4: 0x106dca4: sll   zero, zero, 0
+// 0x0106dca8: 0x106dca8: beq   v0, zero, 0x106dcd8 addiu v0, sp, 40
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 40
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 Realtime_SendCurrenScreenEdges_106db7c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
 	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	brfalse L_106dcd8
 // --- basic block ---
-// 0x0106db7c: 0x106db7c: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106db80: 0x106db80: lw    v0, 17564(v0)
+// 0x0106dcb0: 0x106dcb0: lw    a1, 340(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 85
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106dcb4: 0x106dcb4: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x0106dcb8: 0x106dcb8: addu  a2, s2, zero
+	ldloc 11
+	stloc.3
+// 0x0106dcbc: 0x106dcbc: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+// 0x0106dcc0: 0x106dcc0: sw    v0, 20(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 5
+	stelem.i4
+// 0x0106dcc4: 0x106dcc4: sw    s7, 16(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4391
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106db84: 0x106db84: addiu sp, sp, -56
+	ldloc 14
+	stelem.i4
+// 0x0106dcc8: 0x106dcc8: sw    zero, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.0
-// 0x0106db88: 0x106db88: bne   v0, zero, 0x106dbb4 sw    ra, 52(sp)
-	ldloc 5
-	brtrue L_106dbb4
-// --- basic block ---
-// 0x0106db90: 0x106db90: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106db94: 0x106db94: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106db98: 0x106db98: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106dccc: 0x106dccc: sw    zero, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.2
-// 0x0106db9c: 0x106db9c: addiu a3, a3, 22892
-	ldloc 4
-	ldc.i4 22892
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106dcd0: 0x106dcd0: jal   0x101c50c sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc 4
-// 0x0106dba0: 0x106dba0: addiu a0, zero, 4
-	ldc.i4.4
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_106dcd8:
+// 0x0106dcd8: 0x106dcd8: jal   0x101c908 addu  a0, s3, zero
+	ldloc 12
 	stloc.1
-// 0x0106dba4: 0x106dba4: jal   0x100449c addiu a2, zero, 1995
-	ldc.i4 1995
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106dbac: 0x106dbac: j	 0x106dc2c addu  v0, zero, zero
-	ldc.i4.s 0
+// 0x0106dce0: 0x106dce0: jal   0x101c908 addu  a0, s6, zero
+	ldloc 15
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	br L_106dc2c
 // --- basic block ---
-L_106dbb4:
-// 0x0106dbb4: 0x106dbb4: addiu a1, sp, 24
+// 0x0106dce8: 0x106dce8: jal   0x101c908 addu  a0, s2, zero
+	ldloc 11
+	stloc.1
 	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.2
-// 0x0106dbb8: 0x106dbb8: addu  a0, a1, zero
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106dcf0: 0x106dcf0: jal   0x101c908 addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x0106dbbc: 0x106dbbc: jal   0x1007f50 sw    a1, 40(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
+	ldloc.1
 	ldloc.2
-	stelem.i4
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106dcf8: 0x106dcf8: jal   0x101c908 addu  a0, s5, zero
+	ldloc 16
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f50(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106dbc4: 0x106dbc4: jal   0x1006fc0 addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0106dd00: 0x106dd00: jal   0x101c908 addu  a0, s4, zero
+	ldloc 9
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl4::roadmap_math_get_scale_1006fc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106dbcc: 0x106dbcc: lw    a1, 40(sp)
+// 0x0106dd08: 0x106dd08: lw    a0, 320(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 80
 	add
 	ldelem.i4
-	stloc.2
-// 0x0106dbd0: 0x106dbd0: lui   a0, 0x70000
-	ldc.i4 458752
 	stloc.1
-// 0x0106dbd4: 0x106dbd4: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106dbd8: 0x106dbd8: addiu a0, a0, 17728
+// 0x0106dd0c: 0x106dd0c: jal   0x101c908 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106dbdc: 0x106dbdc: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0106dbe0: 0x106dbe0: addiu a3, a3, -2244
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 -2244
-	add
-	stloc 4
-// 0x0106dbe4: 0x106dbe4: jal   0x1075124 sw    zero, 16(sp)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106dd14: 0x106dd14: lw    a0, 316(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 79
 	add
-	ldc.i4.s 0
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x0106dd18: 0x106dd18: jal   0x101c908 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RTNet_MapDisplyed_1075124(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106dbec: 0x106dbec: beq   v0, zero, 0x106dc0c lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_106dc0c
-// --- basic block ---
-// 0x0106dbf4: 0x106dbf4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dbf8: 0x106dbf8: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106dbfc: 0x106dbfc: addiu a3, a3, 22988
-	ldloc 4
-	ldc.i4 22988
+// 0x0106dd20: 0x106dd20: lw    a0, 312(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 78
 	add
-	stloc 4
-// 0x0106dc00: 0x106dc00: addiu a0, zero, 1
-	ldc.i4.1
+	ldelem.i4
 	stloc.1
-// 0x0106dc04: 0x106dc04: j	 0x106dc20 addiu a2, zero, 2008
-	ldc.i4 2008
-	stloc.3
-	br L_106dc20
-// --- basic block ---
-L_106dc0c:
-// 0x0106dc0c: 0x106dc0c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dc10: 0x106dc10: addiu a1, a1, 20732
+// 0x0106dd24: 0x106dd24: jal   0x101c908 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106dc14: 0x106dc14: addiu a3, a3, 23056
+	ldloc.3
 	ldloc 4
-	ldc.i4 23056
-	add
-	stloc 4
-// 0x0106dc18: 0x106dc18: addiu a0, zero, 4
-	ldc.i4.4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106dd2c: 0x106dd2c: jal   0x101c908 addu  a0, s8, zero
+	ldloc 13
 	stloc.1
-// 0x0106dc1c: 0x106dc1c: addiu a2, zero, 2011
-	ldc.i4 2011
-	stloc.3
-L_106dc20:
-// 0x0106dc20: 0x106dc20: jal   0x100449c sw    v0, 40(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 5
-	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106dd34: 0x106dd34: jal   0x101c908 addu  a0, s7, zero
+	ldloc 14
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106dc28: 0x106dc28: lw    v0, 40(sp)
+// 0x0106dd3c: 0x106dd3c: lw    ra, 388(sp)
+// 0x0106dd40: 0x106dd40: lw    s8, 384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 96
 	add
 	ldelem.i4
-	stloc 5
-L_106dc2c:
-// 0x0106dc2c: 0x106dc2c: lw    ra, 52(sp)
-// 0x0106dc30: 0x106dc30: sll   zero, zero, 0
-// 0x0106dc34: 0x106dc34: jr    ra addiu sp, sp, 56
+	stloc 13
+// 0x0106dd44: 0x106dd44: lw    s7, 380(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 95
+	add
+	ldelem.i4
+	stloc 14
+// 0x0106dd48: 0x106dd48: lw    s6, 376(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 94
+	add
+	ldelem.i4
+	stloc 15
+// 0x0106dd4c: 0x106dd4c: lw    s5, 372(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 93
+	add
+	ldelem.i4
+	stloc 16
+// 0x0106dd50: 0x106dd50: lw    s4, 368(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 92
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106dd54: 0x106dd54: lw    s3, 364(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 91
+	add
+	ldelem.i4
+	stloc 12
+// 0x0106dd58: 0x106dd58: lw    s2, 360(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 90
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106dd5c: 0x106dd5c: lw    s1, 356(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 89
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106dd60: 0x106dd60: lw    s0, 352(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 88
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106dd64: 0x106dd64: jr    ra addiu sp, sp, 392
+	ldloc.0
+	ldc.i4 392
 	add
 	stloc.0
 	br __CIBYL_function_return
diff --git a/converted/Cibyl82.j b/converted/Cibyl82.j
index da297da..5fe2af1 100644
--- a/converted/Cibyl82.j
+++ b/converted/Cibyl82.j
@@ -41,29 +41,25 @@
     IL_0006:  ret
   } // end of method Cibyl82::.ctor
 
-.method public static int32 Realtime_SendCurrentViewDimentions_106dc3c(int32,int32,int32,int32,int32)
+.method public static int32 OnUserShortClick_106dd6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  7 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
 // local  0 is register sp
-// local 12 is register ra
+// local  5 is register ra
 // local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -72,496 +68,661 @@
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106dd6c: 0x106dd6c: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106dd70: 0x106dd70: lw    a1, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106dd74: 0x106dd74: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106dd78: 0x106dd78: addiu a0, a0, 18472
+	ldloc.1
+	ldc.i4 18472
+	add
+	stloc.1
+// 0x0106dd7c: 0x106dd7c: sw    ra, 20(sp)
+// 0x0106dd80: 0x106dd80: jal   0x108c470 addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl104::RTUsers_Popup_108c470(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x0106dd88: 0x106dd88: lw    ra, 20(sp)
+// 0x0106dd8c: 0x106dd8c: sll   zero, zero, 0
+// 0x0106dd90: 0x106dd90: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 Realtime_ShowWazerNearby_106dd98(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc 11
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106dc3c: 0x106dc3c: lui   v0, 0x70000
+L_106dd98:
+// 0x0106dd98: 0x106dd98: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106dc40: 0x106dc40: lw    v0, 17564(v0)
+// 0x0106dd9c: 0x106dd9c: lw    v0, 18096(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4391
+	ldc.i4 4524
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106dc44: 0x106dc44: addiu sp, sp, -64
+// 0x0106dda0: 0x106dda0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -64
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106dc48: 0x106dc48: sw    ra, 60(sp)
-// 0x0106dc4c: 0x106dc4c: sw    s3, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 11
-	stelem.i4
-// 0x0106dc50: 0x106dc50: sw    s2, 52(sp)
+// 0x0106dda4: 0x106dda4: sw    ra, 20(sp)
+// 0x0106dda8: 0x106dda8: beq   v0, zero, 0x106ddd4 sw    s0, 16(sp)
+	ldloc 5
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.4
 	add
-	ldloc 10
+	ldloc 7
 	stelem.i4
-// 0x0106dc54: 0x106dc54: sw    s1, 48(sp)
+	brfalse L_106ddd4
+// --- basic block ---
+// 0x0106ddb0: 0x106ddb0: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x0106ddb4: 0x106ddb4: lw    a1, 15056(v0)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106dc58: 0x106dc58: bne   v0, zero, 0x106dc84 sw    s0, 44(sp)
 	ldloc 5
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 8
-	stelem.i4
-	brtrue L_106dc84
-// --- basic block ---
-// 0x0106dc60: 0x106dc60: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106dc64: 0x106dc64: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dc68: 0x106dc68: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+	ldc.i4 3764
 	add
+	ldelem.i4
 	stloc.2
-// 0x0106dc6c: 0x106dc6c: addiu a3, a3, 22892
-	ldloc 4
-	ldc.i4 22892
+// 0x0106ddb8: 0x106ddb8: lui   s0, 0x70000
+	ldc.i4 458752
+	stloc 7
+// 0x0106ddbc: 0x106ddbc: jal   0x108b99c addiu a0, s0, 18472
+	ldloc 7
+	ldc.i4 18472
 	add
-	stloc 4
-// 0x0106dc70: 0x106dc70: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0106dc74: 0x106dc74: jal   0x100449c addiu a2, zero, 1954
-	ldc.i4 1954
-	stloc.3
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_UserByID_108b99c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0106dc7c: 0x106dc7c: j	 0x106dd94 addu  s0, zero, zero
-	ldc.i4.s 0
-	stloc 8
-	br L_106dd94
-// --- basic block ---
-L_106dc84:
-// 0x0106dc84: 0x106dc84: jal   0x1007f50 addiu a0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x0106ddc4: 0x106ddc4: addiu a1, v0, 68
+	ldloc 5
+	ldc.i4.s 68
+	add
+	stloc.2
+// 0x0106ddc8: 0x106ddc8: addiu a0, s0, 18472
+	ldloc 7
+	ldc.i4 18472
 	add
 	stloc.1
+// 0x0106ddcc: 0x106ddcc: jal   0x108c470 addiu a2, zero, 2
+	ldc.i4.2
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f50(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_Popup_108c470(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
+// --- basic block ---
+L_106ddd4:
+// 0x0106ddd4: 0x106ddd4: lw    ra, 20(sp)
+// 0x0106ddd8: 0x106ddd8: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
 	stloc 7
+// 0x0106dddc: 0x106dddc: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 realtime_after_refresh_106dde4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106dc8c: 0x106dc8c: lui   v0, 0x70000
+// 0x0106dde4: 0x106dde4: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106dc90: 0x106dc90: addiu v0, v0, 17728
-	ldloc 5
-	ldc.i4 17728
-	add
-	stloc 5
-// 0x0106dc94: 0x106dc94: lw    a0, 272(v0)
-	ldloc 6
+// 0x0106dde8: 0x106dde8: lw    v0, 18096(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 68
+	ldc.i4 4524
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106dc98: 0x106dc98: lw    v1, 32(sp)
-	ldloc 6
+	stloc 5
+// 0x0106ddec: 0x106ddec: addiu sp, sp, -48
 	ldloc.0
+	ldc.i4.s -48
+	add
+	stloc.0
+// 0x0106ddf0: 0x106ddf0: beq   v0, zero, 0x106df08 sw    ra, 44(sp)
+	ldloc 5
+	brfalse L_106df08
+// --- basic block ---
+// 0x0106ddf8: 0x106ddf8: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x0106ddfc: 0x106ddfc: lw    a1, 15056(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 3764
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106dc9c: 0x106dc9c: sll   zero, zero, 0
-// 0x0106dca0: 0x106dca0: bne   a0, v1, 0x106dd0c lui   a0, 0x70000
-	ldloc.1
-	ldloc 7
+	stloc.2
+// 0x0106de00: 0x106de00: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x0106de04: 0x106de04: beq   a1, v0, 0x106df0c lui   v0, 0x70000
+	ldloc.2
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	beq  L_106df0c
+// --- basic block ---
+// 0x0106de0c: 0x106de0c: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-	bne.un L_106dd0c
+// 0x0106de10: 0x106de10: jal   0x108b99c addiu a0, a0, 18472
+	ldloc.1
+	ldc.i4 18472
+	add
+	stloc.1
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl104::RTUsers_UserByID_108b99c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106dca8: 0x106dca8: lw    a0, 276(v0)
+// 0x0106de18: 0x106de18: beq   v0, zero, 0x106df08 lui   v1, 0xe0000
+	ldloc 5
+	ldc.i4 917504
+	stloc 6
+	brfalse L_106df08
+// --- basic block ---
+// 0x0106de20: 0x106de20: addiu v1, v1, 30068
 	ldloc 6
+	ldc.i4 30068
+	add
+	stloc 6
+// 0x0106de24: 0x106de24: lw    a0, 132(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 69
+	ldc.i4.s 33
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106dcac: 0x106dcac: lw    v1, 36(sp)
+// 0x0106de28: 0x106de28: lw    a1, 56(v1)
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106dcb0: 0x106dcb0: sll   zero, zero, 0
-// 0x0106dcb4: 0x106dcb4: bne   a0, v1, 0x106dd0c lui   a0, 0x70000
+	stloc.2
+// 0x0106de2c: 0x106de2c: sll   zero, zero, 0
+// 0x0106de30: 0x106de30: slt   a1, a1, a0
+	ldloc.2
 	ldloc.1
-	ldloc 7
-	ldc.i4 458752
-	stloc.1
-	bne.un L_106dd0c
+	clt
+	stloc.2
+// 0x0106de34: 0x106de34: bne   a1, zero, 0x106de7c sll   zero, zero, 0
+	ldloc.2
+	brtrue L_106de7c
 // --- basic block ---
-// 0x0106dcbc: 0x106dcbc: lw    a0, 264(v0)
+// 0x0106de3c: 0x106de3c: lw    a1, 64(v1)
+	ldloc 7
 	ldloc 6
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 66
+	ldc.i4.s 16
 	add
 	ldelem.i4
+	stloc.2
+// 0x0106de40: 0x106de40: sll   zero, zero, 0
+// 0x0106de44: 0x106de44: slt   a0, a0, a1
+	ldloc.1
+	ldloc.2
+	clt
 	stloc.1
-// 0x0106dcc0: 0x106dcc0: lw    v1, 24(sp)
-	ldloc 6
+// 0x0106de48: 0x106de48: bne   a0, zero, 0x106de80 addiu a0, sp, 16
+	ldloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106dcc4: 0x106dcc4: sll   zero, zero, 0
-// 0x0106dcc8: 0x106dcc8: bne   a0, v1, 0x106dd08 sll   zero, zero, 0
-	ldloc.1
-	ldloc 7
-	bne.un L_106dd08
+	stloc.1
+	brtrue L_106de80
 // --- basic block ---
-// 0x0106dcd0: 0x106dcd0: lw    v1, 268(v0)
-	ldloc 6
+// 0x0106de50: 0x106de50: lw    a0, 136(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 67
+	ldc.i4.s 34
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106dcd4: 0x106dcd4: lw    v0, 28(sp)
+	stloc.1
+// 0x0106de54: 0x106de54: lw    a1, 60(v1)
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 15
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106dcd8: 0x106dcd8: sll   zero, zero, 0
-// 0x0106dcdc: 0x106dcdc: bne   v1, v0, 0x106dd0c lui   a0, 0x70000
-	ldloc 7
-	ldloc 5
-	ldc.i4 458752
-	stloc.1
-	bne.un L_106dd0c
-// --- basic block ---
-// 0x0106dce4: 0x106dce4: lui   a1, 0x10000
-	ldc.i4 65536
 	stloc.2
-// 0x0106dce8: 0x106dce8: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dcec: 0x106dcec: addiu a1, a1, 20732
+// 0x0106de58: 0x106de58: sll   zero, zero, 0
+// 0x0106de5c: 0x106de5c: slt   a1, a1, a0
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106dcf0: 0x106dcf0: addiu a3, a3, 23132
-	ldloc 4
-	ldc.i4 23132
-	add
-	stloc 4
-// 0x0106dcf4: 0x106dcf4: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106dcf8: 0x106dcf8: jal   0x100449c addiu a2, zero, 1964
-	ldc.i4 1964
-	stloc.3
-	ldloc.0
 	ldloc.1
+	clt
+	stloc.2
+// 0x0106de60: 0x106de60: bne   a1, zero, 0x106de7c sll   zero, zero, 0
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106dd00: 0x106dd00: j	 0x106dd94 addiu s0, zero, 1
-	ldc.i4.1
-	stloc 8
-	br L_106dd94
+	brtrue L_106de7c
 // --- basic block ---
-L_106dd08:
-// 0x0106dd08: 0x106dd08: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-L_106dd0c:
-// 0x0106dd0c: 0x106dd0c: jal   0x108b2e4 addiu a0, a0, 18008
-	ldloc.1
-	ldc.i4 18008
+// 0x0106de68: 0x106de68: lw    v1, 68(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
 	add
-	stloc.1
+	ldelem.i4
+	stloc 6
+// 0x0106de6c: 0x106de6c: sll   zero, zero, 0
+// 0x0106de70: 0x106de70: slt   a0, a0, v1
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl104::RTUsers_ResetUpdateFlag_108b2e4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106dd14: 0x106dd14: jal   0x1006fc0 addu  a0, zero, zero
-	ldc.i4.s 0
+	ldloc 6
+	clt
 	stloc.1
-	ldloc.0
+// 0x0106de74: 0x106de74: beq   a0, zero, 0x106df2c sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl4::roadmap_math_get_scale_1006fc0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	brfalse L_106df2c
 // --- basic block ---
-// 0x0106dd1c: 0x106dd1c: lui   s2, 0x70000
-	ldc.i4 458752
-	stloc 10
-// 0x0106dd20: 0x106dd20: addiu s1, sp, 24
+L_106de7c:
+// 0x0106de7c: 0x106de7c: addiu a0, sp, 16
 	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 9
-// 0x0106dd24: 0x106dd24: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106dd28: 0x106dd28: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0106dd2c: 0x106dd2c: addiu a3, a3, -2244
-	ldloc 4
-	ldc.i4 -2244
-	add
-	stloc 4
-// 0x0106dd30: 0x106dd30: addiu a0, s2, 17728
-	ldloc 10
-	ldc.i4 17728
+	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0106dd34: 0x106dd34: addu  a1, s1, zero
-	ldloc 9
-	stloc.2
-// 0x0106dd38: 0x106dd38: jal   0x1075124 sw    zero, 16(sp)
-	ldloc 6
+L_106de80:
+// 0x0106de80: 0x106de80: jal   0x1007f38 sw    v0, 32(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RTNet_MapDisplyed_1075124(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_screen_edges_1007f38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106dd40: 0x106dd40: addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0106dd44: 0x106dd44: beq   v0, zero, 0x106dd78 lui   s3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 11
-	brfalse L_106dd78
-// --- basic block ---
-// 0x0106dd4c: 0x106dd4c: addiu a0, s2, 17728
-	ldloc 10
-	ldc.i4 17728
+// 0x0106de88: 0x106de88: lw    v0, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
+	ldelem.i4
+	stloc 5
+// 0x0106de8c: 0x106de8c: lw    a0, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
 	stloc.1
-// 0x0106dd50: 0x106dd50: addiu a0, a0, 264
-	ldloc.1
-	ldc.i4 264
+// 0x0106de90: 0x106de90: lw    v1, 132(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 33
 	add
+	ldelem.i4
+	stloc 6
+// 0x0106de94: 0x106de94: sll   zero, zero, 0
+// 0x0106de98: 0x106de98: slt   a0, v1, a0
+	ldloc 6
+	ldloc.1
+	clt
 	stloc.1
-// 0x0106dd54: 0x106dd54: addu  a1, s1, zero
-	ldloc 9
-	stloc.2
-// 0x0106dd58: 0x106dd58: jal   0x1001800 addiu a2, zero, 16
-	ldc.i4.s 16
-	stloc.3
+// 0x0106de9c: 0x106de9c: bne   a0, zero, 0x106deb8 addiu a0, zero, 2
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	ldc.i4.2
+	stloc.1
+	brtrue L_106deb8
 // --- basic block ---
-// 0x0106dd60: 0x106dd60: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dd64: 0x106dd64: addiu a1, s3, 20732
-	ldloc 11
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106dd68: 0x106dd68: addiu a3, a3, 22988
-	ldloc 4
-	ldc.i4 22988
+// 0x0106dea4: 0x106dea4: lw    a0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc 4
-// 0x0106dd6c: 0x106dd6c: addiu a0, zero, 1
-	ldc.i4.1
+	ldelem.i4
 	stloc.1
-// 0x0106dd70: 0x106dd70: j	 0x106dd8c addiu a2, zero, 1979
-	ldc.i4 1979
-	stloc.3
-	br L_106dd8c
+// 0x0106dea8: 0x106dea8: sll   zero, zero, 0
+// 0x0106deac: 0x106deac: slt   v1, a0, v1
+	ldloc.1
+	ldloc 6
+	clt
+	stloc 6
+// 0x0106deb0: 0x106deb0: beq   v1, zero, 0x106dec0 addiu a0, zero, 4
+	ldloc 6
+	ldc.i4.4
+	stloc.1
+	brfalse L_106dec0
 // --- basic block ---
-L_106dd78:
-// 0x0106dd78: 0x106dd78: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106dd7c: 0x106dd7c: addiu a1, s3, 20732
-	ldloc 11
-	ldc.i4 20732
+L_106deb8:
+// 0x0106deb8: 0x106deb8: j	 0x106dee4 lui   v1, 0x70000
+	ldc.i4 458752
+	stloc 6
+	br L_106dee4
+// --- basic block ---
+L_106dec0:
+// 0x0106dec0: 0x106dec0: lw    a1, 136(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
 	add
+	ldelem.i4
 	stloc.2
-// 0x0106dd80: 0x106dd80: addiu a3, a3, 23056
-	ldloc 4
-	ldc.i4 23056
+// 0x0106dec4: 0x106dec4: lw    a0, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc 4
-// 0x0106dd84: 0x106dd84: addiu a0, zero, 4
-	ldc.i4.4
+	ldelem.i4
 	stloc.1
-// 0x0106dd88: 0x106dd88: addiu a2, zero, 1982
-	ldc.i4 1982
-	stloc.3
-L_106dd8c:
-// 0x0106dd8c: 0x106dd8c: jal   0x100449c sll   zero, zero, 0
-	ldloc.0
+// 0x0106dec8: 0x106dec8: sll   zero, zero, 0
+// 0x0106decc: 0x106decc: slt   a0, a0, a1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	clt
+	stloc.1
+// 0x0106ded0: 0x106ded0: beq   a0, zero, 0x106dee0 lui   v1, 0x70000
+	ldloc.1
+	ldc.i4 458752
+	stloc 6
+	brfalse L_106dee0
 // --- basic block ---
-L_106dd94:
-// 0x0106dd94: 0x106dd94: lw    ra, 60(sp)
-// 0x0106dd98: 0x106dd98: addu  v0, s0, zero
-	ldloc 8
-	stloc 5
-// 0x0106dd9c: 0x106dd9c: lw    s3, 56(sp)
-	ldloc 6
-	ldloc.0
+// 0x0106ded8: 0x106ded8: j	 0x106dee4 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	br L_106dee4
+// --- basic block ---
+L_106dee0:
+// 0x0106dee0: 0x106dee0: addiu a0, zero, 3
+	ldc.i4.3
+	stloc.1
+L_106dee4:
+// 0x0106dee4: 0x106dee4: lw    v0, 352(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 88
 	add
 	ldelem.i4
-	stloc 11
-// 0x0106dda0: 0x106dda0: lw    s2, 52(sp)
+	stloc 5
+// 0x0106dee8: 0x106dee8: sll   zero, zero, 0
+// 0x0106deec: 0x106deec: beq   v0, zero, 0x106df08 sw    a0, 18096(v1)
+	ldloc 5
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4 4524
 	add
-	ldelem.i4
-	stloc 10
-// 0x0106dda4: 0x106dda4: lw    s1, 48(sp)
-	ldloc 6
-	ldloc.0
+	ldloc.1
+	stelem.i4
+	brfalse L_106df08
+// --- basic block ---
+// 0x0106def4: 0x106def4: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106def8: 0x106def8: lw    v1, 18096(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4 4524
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106dda8: 0x106dda8: lw    s0, 44(sp)
+	stloc 6
+// 0x0106defc: 0x106defc: sll   zero, zero, 0
+// 0x0106df00: 0x106df00: addiu v1, v1, 4
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	ldc.i4.4
+	add
+	stloc 6
+// 0x0106df04: 0x106df04: sw    v1, 18096(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4524
+	add
+	ldloc 6
+	stelem.i4
+L_106df08:
+// 0x0106df08: 0x106df08: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_106df0c:
+// 0x0106df0c: 0x106df0c: lw    v0, 18088(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4522
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106ddac: 0x106ddac: jr    ra addiu sp, sp, 64
+	stloc 5
+// 0x0106df10: 0x106df10: sll   zero, zero, 0
+// 0x0106df14: 0x106df14: beq   v0, zero, 0x106df3c sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106df3c
+// --- basic block ---
+// 0x0106df1c: 0x106df1c: jalr  v0 sll   zero, zero, 0
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 64
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106df24: 0x106df24: j	 0x106df3c sll   zero, zero, 0
+	br L_106df3c
+// --- basic block ---
+L_106df2c:
+// 0x0106df2c: 0x106df2c: jal   0x106c6a0 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::RemoveWazerNearby_106c6a0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106df34: 0x106df34: j	 0x106df0c lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+	br L_106df0c
+// --- basic block ---
+L_106df3c:
+// 0x0106df3c: 0x106df3c: lw    ra, 44(sp)
+// 0x0106df40: 0x106df40: sll   zero, zero, 0
+// 0x0106df44: 0x106df44: jr    ra addiu sp, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnTimePassedFromLastMapDragEvent_106ddb4(int32,int32,int32,int32,int32)
+.method public static int32 OnKeepAliveTimer_Realtime_106df4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -596,158 +757,202 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ddb4: 0x106ddb4: addiu sp, sp, -24
+// 0x0106df4c: 0x106df4c: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106ddb8: 0x106ddb8: sw    ra, 20(sp)
-// 0x0106ddbc: 0x106ddbc: addu  v1, zero, zero
+// 0x0106df50: 0x106df50: sw    ra, 20(sp)
+// 0x0106df54: 0x106df54: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x0106ddc0: 0x106ddc0: cibyl_sysc_arg 0x3
+// 0x0106df58: 0x106df58: cibyl_sysc_arg 0x3
 	ldloc 6
-// 0x0106ddc4: 0x106ddc4: cibyl_sysc 0x20f8
+// 0x0106df5c: 0x106df5c: cibyl_sysc 0x20f3
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0106ddc8: 0x106ddc8: addu  v1, v0, zero
+// 0x0106df60: 0x106df60: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0106ddcc: 0x106ddcc: lui   v0, 0x70000
+// 0x0106df64: 0x106df64: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106ddd0: 0x106ddd0: lw    v0, 17608(v0)
+// 0x0106df68: 0x106df68: lw    a0, 18164(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4402
+	ldc.i4 4541
 	add
 	ldelem.i4
+	stloc.1
+// 0x0106df6c: 0x106df6c: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x0106ddd4: 0x106ddd4: sll   zero, zero, 0
-// 0x0106ddd8: 0x106ddd8: subu  v1, v1, v0
-	ldloc 6
+// 0x0106df70: 0x106df70: lw    v0, 18168(v0)
+	ldloc 7
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4542
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106df74: 0x106df74: subu  v1, v1, a0
+	ldloc 6
+	ldloc.1
 	sub
 	stloc 6
-// 0x0106dddc: 0x106dddc: slti  v1, v1, 5
+// 0x0106df78: 0x106df78: slt   v1, v0, v1
+	ldloc 5
 	ldloc 6
-	ldc.i4.5
 	clt
 	stloc 6
-// 0x0106dde0: 0x106dde0: bne   v1, zero, 0x106de20 lui   a0, 0x1070000
+// 0x0106df7c: 0x106df7c: beq   v1, zero, 0x106df94 lui   a0, 0x70000
 	ldloc 6
-	ldc.i4 17235968
+	ldc.i4 458752
 	stloc.1
-	brtrue L_106de20
+	brfalse L_106df94
 // --- basic block ---
-// 0x0106dde8: 0x106dde8: jal   0x104fd00 addiu a0, a0, -8780
+// 0x0106df84: 0x106df84: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0106df88: 0x106df88: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 -8780
+	ldc.i4 18192
 	add
 	stloc.1
+// 0x0106df8c: 0x106df8c: jal   0x107586c addiu a1, a1, 6392
+	ldloc.2
+	ldc.i4 6392
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RTNet_KeepAlive_107586c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ddf0: 0x106ddf0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106ddf4: 0x106ddf4: lw    v0, 17564(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
+L_106df94:
+// 0x0106df94: 0x106df94: lw    ra, 20(sp)
+// 0x0106df98: 0x106df98: sll   zero, zero, 0
+// 0x0106df9c: 0x106df9c: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106ddf8: 0x106ddf8: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x0106ddfc: 0x106ddfc: beq   v0, zero, 0x106de20 sw    zero, 17604(v1)
-	ldloc 5
-	ldloc 7
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4401
-	add
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_RandomUserRegister_106dfa4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stelem.i4
-	brfalse L_106de20
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106de04: 0x106de04: lui   v0, 0x70000
+// 0x0106dfa4: 0x106dfa4: lui   a0, 0x70000
 	ldc.i4 458752
-	stloc 5
-// 0x0106de08: 0x106de08: lw    v0, 17984(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4496
+	stloc.1
+// 0x0106dfa8: 0x106dfa8: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0106dfac: 0x106dfac: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106de0c: 0x106de0c: sll   zero, zero, 0
-// 0x0106de10: 0x106de10: beq   v0, zero, 0x106de20 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106de20
-// --- basic block ---
-// 0x0106de18: 0x106de18: jal   0x106dc3c sll   zero, zero, 0
+	stloc.0
+// 0x0106dfb0: 0x106dfb0: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106dfb4: 0x106dfb4: sw    ra, 20(sp)
+// 0x0106dfb8: 0x106dfb8: jal   0x10729e0 addiu a1, a1, -8092
+	ldloc.2
+	ldc.i4 -8092
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::Realtime_SendCurrentViewDimentions_106dc3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::RTNet_RandomUserRegister_10729e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-L_106de20:
-// 0x0106de20: 0x106de20: lw    ra, 20(sp)
-// 0x0106de24: 0x106de24: sll   zero, zero, 0
-// 0x0106de28: 0x106de28: jr    ra addiu sp, sp, 24
+// 0x0106dfc0: 0x106dfc0: lw    ra, 20(sp)
+// 0x0106dfc4: 0x106dfc4: sll   zero, zero, 0
+// 0x0106dfc8: 0x106dfc8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 7
 	ret
 }
-.method public static int32 SendMessage_UserPoints_106de30(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_ResetTransactionState_106dfd0(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
+// local  5 is register s0
 // local  0 is register sp
-// local 10 is register ra
+// local  7 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -757,228 +962,101 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106de30: 0x106de30: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0106de34: 0x106de34: lw    v0, 15064(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3766
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106de38: 0x106de38: addiu sp, sp, -32
+// 0x0106dfd0: 0x106dfd0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106de3c: 0x106de3c: sw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106de40: 0x106de40: sw    ra, 28(sp)
-// 0x0106de44: 0x106de44: sw    s1, 24(sp)
+// 0x0106dfd4: 0x106dfd4: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106de48: 0x106de48: bne   v0, zero, 0x106de78 addu  s0, a0, zero
 	ldloc 5
+	stelem.i4
+// 0x0106dfd8: 0x106dfd8: addu  s0, a0, zero
 	ldloc.1
-	stloc 8
-	brtrue L_106de78
-// --- basic block ---
-// 0x0106de50: 0x106de50: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106de54: 0x106de54: lw    s1, 17720(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4430
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106de58: 0x106de58: jal   0x10ac820 sll   zero, zero, 0
-	call int32 Cibyl129::editor_points_get_total_points_10ac820()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106de60: 0x106de60: bne   s1, v0, 0x106de78 sll   zero, zero, 0
-	ldloc 9
-	ldloc 5
-	bne.un L_106de78
-// --- basic block ---
-// 0x0106de68: 0x106de68: beq   s0, zero, 0x106dec0 addiu v1, zero, 1
-	ldloc 8
-	ldc.i4.1
-	stloc 7
-	brfalse L_106dec0
-// --- basic block ---
-// 0x0106de70: 0x106de70: j	 0x106dec0 sb    zero, 0(s0)
-	ldloc 8
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_106dec0
-// --- basic block ---
-L_106de78:
-// 0x0106de78: 0x106de78: jal   0x10ac820 sll   zero, zero, 0
-	call int32 Cibyl129::editor_points_get_total_points_10ac820()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x0106de80: 0x106de80: lui   a0, 0x70000
+// 0x0106dfdc: 0x106dfdc: lui   a0, 0x70000
 	ldc.i4 458752
 	stloc.1
-// 0x0106de84: 0x106de84: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106de88: 0x106de88: addiu a0, a0, 17728
+// 0x0106dfe0: 0x106dfe0: sw    ra, 20(sp)
+// 0x0106dfe4: 0x106dfe4: jal   0x10861b4 addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 17728
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x0106de8c: 0x106de8c: addu  a1, v0, zero
+	ldloc.1
+	call void Cibyl100::RTConnectionInfo_ResetTransaction_10861b4(int32)
+// --- basic block ---
+// 0x0106dfec: 0x106dfec: beq   s0, zero, 0x106dffc sll   zero, zero, 0
 	ldloc 5
-	stloc.2
-// 0x0106de90: 0x106de90: addiu a2, a2, -2128
-	ldloc.3
-	ldc.i4 -2128
-	add
-	stloc.3
-// 0x0106de94: 0x106de94: jal   0x1073c0c addu  a3, s0, zero
-	ldloc 8
-	stloc 4
+	brfalse L_106dffc
+// --- basic block ---
+// 0x0106dff4: 0x106dff4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_UserPoints_1073c0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106de9c: 0x106de9c: beq   v0, zero, 0x106dec0 addu  v1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 7
-	brfalse L_106dec0
-// --- basic block ---
-// 0x0106dea4: 0x106dea4: jal   0x10ac820 sll   zero, zero, 0
-	call int32 Cibyl129::editor_points_get_total_points_10ac820()
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x0106deac: 0x106deac: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 7
-// 0x0106deb0: 0x106deb0: sw    v0, 17720(v1)
+L_106dffc:
+// 0x0106dffc: 0x106dffc: lw    ra, 20(sp)
+// 0x0106e000: 0x106e000: lw    s0, 16(sp)
 	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4430
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106deb4: 0x106deb4: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0106deb8: 0x106deb8: sw    zero, 15064(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3766
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106debc: 0x106debc: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-L_106dec0:
-// 0x0106dec0: 0x106dec0: lw    ra, 28(sp)
-// 0x0106dec4: 0x106dec4: addu  v0, v1, zero
-	ldloc 7
-	stloc 5
-// 0x0106dec8: 0x106dec8: lw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106decc: 0x106decc: lw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106ded0: 0x106ded0: jr    ra addiu sp, sp, 32
+	stloc 5
+// 0x0106e004: 0x106e004: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 SendMessage_Location_106ded8(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_GetGeoConfig_106e00c(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -987,197 +1065,121 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ded8: 0x106ded8: addiu sp, sp, -32
+// 0x0106e00c: 0x106e00c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106dedc: 0x106dedc: sw    s0, 20(sp)
-	ldloc 5
+// 0x0106e010: 0x106e010: sw    ra, 28(sp)
+// 0x0106e014: 0x106e014: beq   a1, zero, 0x106e04c addu  a0, a1, zero
+	ldloc.2
+	ldloc.2
+	stloc.1
+	brfalse L_106e04c
+// --- basic block ---
+// 0x0106e01c: 0x106e01c: jal   0x10ac9b4 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106e024: 0x106e024: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106e028: 0x106e028: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e02c: 0x106e02c: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldloc 8
-	stelem.i4
-// 0x0106dee0: 0x106dee0: lui   s0, 0x0
-	ldc.i4.s 0
-	stloc 8
-// 0x0106dee4: 0x106dee4: lw    v0, 15052(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 3763
+	stloc.2
+// 0x0106e030: 0x106e030: addiu a3, a3, 23072
+	ldloc 4
+	ldc.i4 23072
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106dee8: 0x106dee8: sw    s1, 24(sp)
-	ldloc 5
+	stloc 4
+// 0x0106e034: 0x106e034: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106e038: 0x106e038: addiu a2, zero, 2527
+	ldc.i4 2527
+	stloc.3
+// 0x0106e03c: 0x106e03c: jal   0x100449c sw    v0, 16(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 5
 	stelem.i4
-// 0x0106deec: 0x106deec: sw    ra, 28(sp)
-// 0x0106def0: 0x106def0: beq   v0, zero, 0x106df18 addu  s1, a0, zero
-	ldloc 6
+	ldloc.0
 	ldloc.1
-	stloc 9
-	brfalse L_106df18
-// --- basic block ---
-// 0x0106def8: 0x106def8: jal   0x1030ca4 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_get_fix_1030ca4()
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106df00: 0x106df00: bne   v0, zero, 0x106df28 lui   a2, 0x1070000
-	ldloc 6
-	ldc.i4 17235968
-	stloc.3
-	brtrue L_106df28
-// --- basic block ---
-// 0x0106df08: 0x106df08: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106df0c: 0x106df0c: jal   0x1030d84 addiu a0, a0, -8344
-	ldloc.1
-	ldc.i4 -8344
-	add
-	stloc.1
+// 0x0106e044: 0x106e044: jal   0x10ac874 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl35::roadmap_gps_register_fix_listener_1030d84(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl129::roadmap_geo_config_transaction_failed_10ac874(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106df14: 0x106df14: sw    zero, 15052(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 3763
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_106df18:
-// 0x0106df18: 0x106df18: beq   s1, zero, 0x106df50 addiu v1, zero, 1
-	ldloc 9
-	ldc.i4.1
-	stloc 7
-	brfalse L_106df50
-// --- basic block ---
-// 0x0106df20: 0x106df20: j	 0x106df50 sb    zero, 0(s1)
-	ldloc 9
+L_106e04c:
+// 0x0106e04c: 0x106e04c: jal   0x106dfd0 addu  a0, zero, zero
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_106df50
-// --- basic block ---
-L_106df28:
-// 0x0106df28: 0x106df28: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106df2c: 0x106df2c: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
 	stloc.1
-// 0x0106df30: 0x106df30: addu  a1, v0, zero
-	ldloc 6
-	stloc.2
-// 0x0106df34: 0x106df34: addiu a2, a2, -4752
-	ldloc.3
-	ldc.i4 -4752
-	add
-	stloc.3
-// 0x0106df38: 0x106df38: jal   0x1073c70 addu  a3, s1, zero
-	ldloc 9
-	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_Location_1073c70(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_ResetTransactionState_106dfd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106df40: 0x106df40: beq   v0, zero, 0x106df50 addu  v1, zero, zero
-	ldloc 6
-	ldc.i4.s 0
-	stloc 7
-	brfalse L_106df50
-// --- basic block ---
-// 0x0106df48: 0x106df48: sw    zero, 15052(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 3763
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106df4c: 0x106df4c: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-L_106df50:
-// 0x0106df50: 0x106df50: lw    ra, 28(sp)
-// 0x0106df54: 0x106df54: addu  v0, v1, zero
-	ldloc 7
-	stloc 6
-// 0x0106df58: 0x106df58: lw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106df5c: 0x106df5c: lw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106df60: 0x106df60: jr    ra addiu sp, sp, 32
+// 0x0106e054: 0x106e054: lw    ra, 28(sp)
+// 0x0106e058: 0x106e058: sll   zero, zero, 0
+// 0x0106e05c: 0x106e05c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 OnLocation_106df68(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_Register_106e064(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 s4,int32 s2,int32 ra)
 
 // local  6 is register v0
 // local  7 is register v1
@@ -1185,8 +1187,13 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 12 is register s2
+// local 10 is register s3
+// local 11 is register s4
 // local  0 is register sp
-// local  8 is register ra
+// local 13 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -1201,309 +1208,458 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106df68: 0x106df68: addiu sp, sp, -32
+// 0x0106e064: 0x106e064: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0106df6c: 0x106df6c: sw    a0, 16(sp)
+// 0x0106e068: 0x106e068: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 6
+// 0x0106e06c: 0x106e06c: sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc.1
+	ldloc 12
 	stelem.i4
-// 0x0106df70: 0x106df70: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0106df74: 0x106df74: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106df78: 0x106df78: sw    a1, 20(sp)
+// 0x0106e070: 0x106e070: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldloc.2
+	ldloc 9
 	stelem.i4
-// 0x0106df7c: 0x106df7c: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x0106e074: 0x106e074: sw    s0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.1
-// 0x0106df80: 0x106df80: addiu a2, a2, -4752
-	ldloc.3
-	ldc.i4 -4752
+	ldloc 8
+	stelem.i4
+// 0x0106e078: 0x106e078: sw    ra, 44(sp)
+// 0x0106e07c: 0x106e07c: lw    s0, 18040(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 4510
 	add
-	stloc.3
-// 0x0106df84: 0x106df84: addiu a1, sp, 16
+	ldelem.i4
+	stloc 8
+// 0x0106e080: 0x106e080: sw    s4, 40(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
-	stloc.2
-// 0x0106df88: 0x106df88: sw    ra, 28(sp)
-// 0x0106df8c: 0x106df8c: jal   0x1073c70 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::RTNet_Location_1073c70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106df94: 0x106df94: beq   v0, zero, 0x106dfa4 lui   v1, 0x0
-	ldloc 6
-	ldc.i4.s 0
-	stloc 7
-	brfalse L_106dfa4
-// --- basic block ---
-// 0x0106df9c: 0x106df9c: j	 0x106dfac sw    zero, 15052(v1)
+	ldloc 11
+	stelem.i4
+// 0x0106e084: 0x106e084: sw    s3, 36(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3763
+	ldc.i4.s 9
 	add
-	ldc.i4.s 0
+	ldloc 10
 	stelem.i4
-	br L_106dfac
-// --- basic block ---
-L_106dfa4:
-// 0x0106dfa4: 0x106dfa4: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106dfa8: 0x106dfa8: sw    v0, 15052(v1)
+// 0x0106e088: 0x106e088: addu  s1, a1, zero
+	ldloc.2
+	stloc 9
+// 0x0106e08c: 0x106e08c: sw    zero, 18040(v0)
 	ldloc 5
-	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 3763
+	ldc.i4 4510
 	add
-	ldloc 6
+	ldc.i4.s 0
 	stelem.i4
-L_106dfac:
-// 0x0106dfac: 0x106dfac: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106dfb0: 0x106dfb0: jal   0x1031cfc addiu a0, a0, -8344
-	ldloc.1
-	ldc.i4 -8344
+// 0x0106e090: 0x106e090: bne   a1, zero, 0x106e100 lui   s2, 0x10000
+	ldloc.2
+	ldc.i4 65536
+	stloc 12
+	brtrue L_106e100
+// --- basic block ---
+// 0x0106e098: 0x106e098: lui   s4, 0x70000
+	ldc.i4 458752
+	stloc 11
+// 0x0106e09c: 0x106e09c: addiu a0, s4, 18192
+	ldloc 11
+	ldc.i4 18192
 	add
 	stloc.1
+// 0x0106e0a0: 0x106e0a0: jal   0x106b504 lui   s3, 0x70000
+	ldc.i4 458752
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl36::roadmap_gps_unregister_fix_listener_1031cfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_SetLoginUsername_106b504(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106dfb8: 0x106dfb8: lw    ra, 28(sp)
-// 0x0106dfbc: 0x106dfbc: sll   zero, zero, 0
-// 0x0106dfc0: 0x106dfc0: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x0106e0a8: 0x106e0a8: jal   0x106b4dc addiu a0, s3, 18256
+	ldloc 10
+	ldc.i4 18256
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 SendMessage_SetMood_106dfc8(int32,int32,int32,int32,int32)
-{
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_SetLoginPassword_106b4dc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
+	stloc 6
 // --- basic block ---
-// 0x0106dfc8: 0x106dfc8: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
+// 0x0106e0b0: 0x106e0b0: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106e0b4: 0x106e0b4: jal   0x106b4b4 addiu a0, a0, 18320
+	ldloc.1
+	ldc.i4 18320
 	add
-	stloc.0
-// 0x0106dfcc: 0x106dfcc: sw    s0, 24(sp)
-	ldloc 5
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106dfd0: 0x106dfd0: lui   s0, 0x0
-	ldc.i4.s 0
-	stloc 8
-// 0x0106dfd4: 0x106dfd4: lw    v0, 15048(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 3762
-	add
-	ldelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_SetLoginNickname_106b4b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-// 0x0106dfd8: 0x106dfd8: sll   zero, zero, 0
-// 0x0106dfdc: 0x106dfdc: bne   v0, zero, 0x106dff4 sw    ra, 28(sp)
-	ldloc 6
-	brtrue L_106dff4
 // --- basic block ---
-// 0x0106dfe4: 0x106dfe4: beq   a0, zero, 0x106e028 addiu v1, zero, 1
-	ldloc.1
+// 0x0106e0bc: 0x106e0bc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-	brfalse L_106e028
-// --- basic block ---
-// 0x0106dfec: 0x106dfec: j	 0x106e028 sb    zero, 0(a0)
-	ldloc.1
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_106e028
-// --- basic block ---
-L_106dff4:
-// 0x0106dff4: 0x106dff4: jal   0x1034a6c sw    a0, 16(sp)
+// 0x0106e0c0: 0x106e0c0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 6
+// 0x0106e0c4: 0x106e0c4: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106e0c8: 0x106e0c8: jal   0x106b638 sw    v1, 18036(v0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4509
 	add
-	ldloc.1
+	ldloc 7
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl38::roadmap_mood_actual_state_1034a6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_set_random_user_106b638(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106dffc: 0x106dffc: lui   a0, 0x70000
-	ldc.i4 458752
+// 0x0106e0d0: 0x106e0d0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e0d4: 0x106e0d4: addiu s4, s4, 18192
+	ldloc 11
+	ldc.i4 18192
+	add
+	stloc 11
+// 0x0106e0d8: 0x106e0d8: addiu s3, s3, 18256
+	ldloc 10
+	ldc.i4 18256
+	add
+	stloc 10
+// 0x0106e0dc: 0x106e0dc: addiu a1, s2, 21196
+	ldloc 12
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106e0e0: 0x106e0e0: addiu a3, a3, 23168
+	ldloc 4
+	ldc.i4 23168
+	add
+	stloc 4
+// 0x0106e0e4: 0x106e0e4: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106e000: 0x106e000: lui   a2, 0x1070000
-	ldc.i4 17235968
+// 0x0106e0e8: 0x106e0e8: addiu a2, zero, 2495
+	ldc.i4 2495
 	stloc.3
-// 0x0106e004: 0x106e004: lw    a3, 16(sp)
+// 0x0106e0ec: 0x106e0ec: sw    s4, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 4
-// 0x0106e008: 0x106e008: addiu a0, a0, 17728
+	ldloc 11
+	stelem.i4
+// 0x0106e0f0: 0x106e0f0: jal   0x100449c sw    s3, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 10
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	ldc.i4 17728
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106e0f8: 0x106e0f8: j	 0x106e118 sll   zero, zero, 0
+	br L_106e118
+// --- basic block ---
+L_106e100:
+// 0x0106e100: 0x106e100: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e104: 0x106e104: addiu a1, s2, 21196
+	ldloc 12
+	ldc.i4 21196
 	add
-	stloc.1
-// 0x0106e00c: 0x106e00c: addu  a1, v0, zero
-	ldloc 6
 	stloc.2
-// 0x0106e010: 0x106e010: jal   0x1073cf4 addiu a2, a2, -2028
-	ldloc.3
-	ldc.i4 -2028
+// 0x0106e108: 0x106e108: addiu a3, a3, 23276
+	ldloc 4
+	ldc.i4 23276
 	add
+	stloc 4
+// 0x0106e10c: 0x106e10c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106e110: 0x106e110: jal   0x100449c addiu a2, zero, 2500
+	ldc.i4 2500
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_SetMood_1073cf4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0106e018: 0x106e018: beq   v0, zero, 0x106e028 addu  v1, zero, zero
-	ldloc 6
+L_106e118:
+// 0x0106e118: 0x106e118: jal   0x106dfd0 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::Realtime_ResetTransactionState_106dfd0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106e120: 0x106e120: bne   s1, zero, 0x106e180 sll   zero, zero, 0
+	ldloc 9
+	brtrue L_106e180
+// --- basic block ---
+// 0x0106e128: 0x106e128: jal   0x106c0b0 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_ResetLoginState_106c0b0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106e130: 0x106e130: beq   s0, zero, 0x106e148 addu  a0, s0, zero
+	ldloc 8
+	ldloc 8
+	stloc.1
+	brfalse L_106e148
+// --- basic block ---
+// 0x0106e138: 0x106e138: jal   0x106c144 addu  a1, zero, zero
 	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Login_106c144(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brfalse L_106e028
+	stloc 6
+// --- basic block ---
+// 0x0106e140: 0x106e140: j	 0x106e180 sll   zero, zero, 0
+	br L_106e180
 // --- basic block ---
-// 0x0106e020: 0x106e020: sw    zero, 15048(s0)
+L_106e148:
+// 0x0106e148: 0x106e148: lui   s0, 0x70000
+	ldc.i4 458752
+	stloc 8
+// 0x0106e14c: 0x106e14c: addiu s0, s0, 18192
+	ldloc 8
+	ldc.i4 18192
+	add
+	stloc 8
+// 0x0106e150: 0x106e150: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x0106e154: 0x106e154: addiu s1, zero, 1
+	ldc.i4.1
+	stloc 9
+// 0x0106e158: 0x106e158: addiu a0, a0, 4256
+	ldloc.1
+	ldc.i4 4256
+	add
+	stloc.1
+// 0x0106e15c: 0x106e15c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0106e160: 0x106e160: sw    s1, 28688(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 3762
+	ldc.i4 7172
 	add
-	ldc.i4.s 0
+	ldloc 9
 	stelem.i4
-// 0x0106e024: 0x106e024: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-L_106e028:
-// 0x0106e028: 0x106e028: lw    ra, 28(sp)
-// 0x0106e02c: 0x106e02c: addu  v0, v1, zero
-	ldloc 7
-	stloc 6
-// 0x0106e030: 0x106e030: lw    s0, 24(sp)
+// 0x0106e164: 0x106e164: jal   0x106c144 sw    zero, 28696(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 7174
 	add
-	ldelem.i4
-	stloc 8
-// 0x0106e034: 0x106e034: jr    ra addiu sp, sp, 32
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
-	ldc.i4.s 32
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Login_106c144(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106e16c: 0x106e16c: beq   v0, zero, 0x106e17c addiu v0, zero, 2
+	ldloc 6
+	ldc.i4.2
+	stloc 6
+	brfalse L_106e17c
+// --- basic block ---
+// 0x0106e174: 0x106e174: j	 0x106e180 sw    s1, 28688(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 7172
+	add
+	ldloc 9
+	stelem.i4
+	br L_106e180
+// --- basic block ---
+L_106e17c:
+// 0x0106e17c: 0x106e17c: sw    v0, 28696(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 7174
+	add
+	ldloc 6
+	stelem.i4
+L_106e180:
+// 0x0106e180: 0x106e180: lw    ra, 44(sp)
+// 0x0106e184: 0x106e184: lw    s4, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106e188: 0x106e188: lw    s3, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106e18c: 0x106e18c: lw    s2, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 12
+// 0x0106e190: 0x106e190: lw    s1, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106e194: 0x106e194: lw    s0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106e198: 0x106e198: jr    ra addiu sp, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -1513,25 +1669,25 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 OnMoodChanged_106e03c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SendCurrenScreenEdges_106e1a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  8 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1543,85 +1699,271 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e03c: 0x106e03c: addiu sp, sp, -24
+// 0x0106e1a0: 0x106e1a0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106e1a4: 0x106e1a4: lw    v0, 18028(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106e1a8: 0x106e1a8: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0106e040: 0x106e040: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106e044: 0x106e044: lui   v0, 0x0
+// 0x0106e1ac: 0x106e1ac: bne   v0, zero, 0x106e1d8 sw    ra, 52(sp)
+	ldloc 5
+	brtrue L_106e1d8
+// --- basic block ---
+// 0x0106e1b4: 0x106e1b4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106e1b8: 0x106e1b8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e1bc: 0x106e1bc: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106e1c0: 0x106e1c0: addiu a3, a3, 23356
+	ldloc 4
+	ldc.i4 23356
+	add
+	stloc 4
+// 0x0106e1c4: 0x106e1c4: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106e1c8: 0x106e1c8: jal   0x100449c addiu a2, zero, 1995
+	ldc.i4 1995
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e1d0: 0x106e1d0: j	 0x106e250 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0106e048: 0x106e048: addu  a0, zero, zero
+	br L_106e250
+// --- basic block ---
+L_106e1d8:
+// 0x0106e1d8: 0x106e1d8: addiu a1, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.2
+// 0x0106e1dc: 0x106e1dc: addu  a0, a1, zero
+	ldloc.2
+	stloc.1
+// 0x0106e1e0: 0x106e1e0: jal   0x1007f60 sw    a1, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc.2
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e1e8: 0x106e1e8: jal   0x1006fd0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0106e04c: 0x106e04c: sw    ra, 20(sp)
-// 0x0106e050: 0x106e050: jal   0x106dfc8 sw    v1, 15048(v0)
-	ldloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl4::roadmap_math_get_scale_1006fd0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e1f0: 0x106e1f0: lw    a1, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106e1f4: 0x106e1f4: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106e1f8: 0x106e1f8: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106e1fc: 0x106e1fc: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106e200: 0x106e200: addu  a2, v0, zero
 	ldloc 5
+	stloc.3
+// 0x0106e204: 0x106e204: addiu a3, a3, -672
+	ldloc 4
+	ldc.i4 -672
+	add
+	stloc 4
+// 0x0106e208: 0x106e208: jal   0x1075748 sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3762
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RTNet_MapDisplyed_1075748(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e210: 0x106e210: beq   v0, zero, 0x106e230 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_106e230
+// --- basic block ---
+// 0x0106e218: 0x106e218: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e21c: 0x106e21c: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106e220: 0x106e220: addiu a3, a3, 23452
+	ldloc 4
+	ldc.i4 23452
+	add
+	stloc 4
+// 0x0106e224: 0x106e224: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106e228: 0x106e228: j	 0x106e244 addiu a2, zero, 2008
+	ldc.i4 2008
+	stloc.3
+	br L_106e244
+// --- basic block ---
+L_106e230:
+// 0x0106e230: 0x106e230: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e234: 0x106e234: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106e238: 0x106e238: addiu a3, a3, 23520
+	ldloc 4
+	ldc.i4 23520
 	add
+	stloc 4
+// 0x0106e23c: 0x106e23c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106e240: 0x106e240: addiu a2, zero, 2011
+	ldc.i4 2011
+	stloc.3
+L_106e244:
+// 0x0106e244: 0x106e244: jal   0x100449c sw    v0, 40(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_SetMood_106dfc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e058: 0x106e058: lw    ra, 20(sp)
-// 0x0106e05c: 0x106e05c: sll   zero, zero, 0
-// 0x0106e060: 0x106e060: jr    ra addiu sp, sp, 24
+// 0x0106e24c: 0x106e24c: lw    v0, 40(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 5
+L_106e250:
+// 0x0106e250: 0x106e250: lw    ra, 52(sp)
+// 0x0106e254: 0x106e254: sll   zero, zero, 0
+// 0x0106e258: 0x106e258: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 SendMessage_SetMyVisability_106e068(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_SendCurrentViewDimentions_106e260(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s5,int32 s6,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register s0
-// local 11 is register s1
-// local 12 is register s2
-// local 13 is register s3
-// local 14 is register s4
-// local  8 is register s5
-// local  9 is register s6
-// local  0 is register sp
-// local 15 is register ra
-// local  7 is register mem
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1631,763 +1973,912 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e068: 0x106e068: lui   v0, 0x0
-	ldc.i4.s 0
+// 0x0106e260: 0x106e260: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x0106e06c: 0x106e06c: lw    v0, 15044(v0)
-	ldloc 7
+// 0x0106e264: 0x106e264: lw    v0, 18028(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3761
+	ldc.i4 4507
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106e070: 0x106e070: addiu sp, sp, -72
+// 0x0106e268: 0x106e268: addiu sp, sp, -64
 	ldloc.0
-	ldc.i4.s -72
+	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0106e074: 0x106e074: sw    s0, 40(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 10
-	stelem.i4
-// 0x0106e078: 0x106e078: sw    ra, 68(sp)
-// 0x0106e07c: 0x106e07c: sw    s6, 64(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106e080: 0x106e080: sw    s5, 60(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106e084: 0x106e084: sw    s4, 56(sp)
-	ldloc 7
+// 0x0106e26c: 0x106e26c: sw    ra, 60(sp)
+// 0x0106e270: 0x106e270: sw    s3, 56(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 14
 	add
-	ldloc 14
+	ldloc 11
 	stelem.i4
-// 0x0106e088: 0x106e088: sw    s3, 52(sp)
-	ldloc 7
+// 0x0106e274: 0x106e274: sw    s2, 52(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 13
 	add
-	ldloc 13
+	ldloc 10
 	stelem.i4
-// 0x0106e08c: 0x106e08c: sw    s2, 48(sp)
-	ldloc 7
+// 0x0106e278: 0x106e278: sw    s1, 48(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 12
 	add
-	ldloc 12
+	ldloc 9
 	stelem.i4
-// 0x0106e090: 0x106e090: sw    s1, 44(sp)
-	ldloc 7
+// 0x0106e27c: 0x106e27c: bne   v0, zero, 0x106e2a8 sw    s0, 44(sp)
+	ldloc 5
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 11
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x0106e094: 0x106e094: bne   v0, zero, 0x106e0ac addu  s0, a0, zero
-	ldloc 5
-	ldloc.1
-	stloc 10
-	brtrue L_106e0ac
-// --- basic block ---
-// 0x0106e09c: 0x106e09c: beq   a0, zero, 0x106e26c addiu v1, zero, 1
-	ldloc.1
-	ldc.i4.1
-	stloc 6
-	brfalse L_106e26c
-// --- basic block ---
-// 0x0106e0a4: 0x106e0a4: j	 0x106e26c sb    zero, 0(a0)
-	ldloc.1
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_106e26c
+	brtrue L_106e2a8
 // --- basic block ---
-L_106e0ac:
-// 0x0106e0ac: 0x106e0ac: jal   0x10a8760 lui   s5, 0x0
-	ldc.i4.s 0
-	stloc 8
-	ldloc.0
-	ldloc.1
+// 0x0106e284: 0x106e284: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106e288: 0x106e288: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e28c: 0x106e28c: addiu a1, a1, 21196
 	ldloc.2
-	ldloc.3
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106e290: 0x106e290: addiu a3, a3, 23356
 	ldloc 4
-	call int32 Cibyl126::roadmap_download_settings_isDownloadWazers_10a8760(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106e0b4: 0x106e0b4: jal   0x10a89cc addu  s4, v0, zero
-	ldloc 5
-	stloc 14
+	ldc.i4 23356
+	add
+	stloc 4
+// 0x0106e294: 0x106e294: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106e298: 0x106e298: jal   0x100449c addiu a2, zero, 1954
+	ldc.i4 1954
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_download_settings_isDownloadReports_10a89cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e0bc: 0x106e0bc: jal   0x10a8920 addu  s3, v0, zero
-	ldloc 5
-	stloc 13
+// 0x0106e2a0: 0x106e2a0: j	 0x106e3b8 addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 8
+	br L_106e3b8
+// --- basic block ---
+L_106e2a8:
+// 0x0106e2a8: 0x106e2a8: jal   0x1007f60 addiu a0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl126::roadmap_download_settings_isDownloadTraffic_10a8920(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e0c4: 0x106e0c4: jal   0x106ac4c addu  s2, v0, zero
+// 0x0106e2b0: 0x106e2b0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106e2b4: 0x106e2b4: addiu v0, v0, 18192
 	ldloc 5
-	stloc 12
+	ldc.i4 18192
+	add
+	stloc 5
+// 0x0106e2b8: 0x106e2b8: lw    a0, 272(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 68
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106e2bc: 0x106e2bc: lw    v1, 32(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106e2c0: 0x106e2c0: sll   zero, zero, 0
+// 0x0106e2c4: 0x106e2c4: bne   a0, v1, 0x106e330 lui   a0, 0x70000
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_AllowPing_106ac4c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldloc 7
+	ldc.i4 458752
+	stloc.1
+	bne.un L_106e330
 // --- basic block ---
-// 0x0106e0cc: 0x106e0cc: addiu a0, s5, 14928
-	ldloc 8
-	ldc.i4 14928
+// 0x0106e2cc: 0x106e2cc: lw    a0, 276(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 69
 	add
+	ldelem.i4
 	stloc.1
-// 0x0106e0d0: 0x106e0d0: jal   0x100e348 addu  s1, v0, zero
-	ldloc 5
-	stloc 11
+// 0x0106e2d0: 0x106e2d0: lw    v1, 36(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106e2d4: 0x106e2d4: sll   zero, zero, 0
+// 0x0106e2d8: 0x106e2d8: bne   a0, v1, 0x106e330 lui   a0, 0x70000
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldloc 7
+	ldc.i4 458752
+	stloc.1
+	bne.un L_106e330
 // --- basic block ---
-// 0x0106e0d8: 0x106e0d8: jal   0x108d128 addu  a0, v0, zero
+// 0x0106e2e0: 0x106e2e0: lw    a0, 264(v0)
+	ldloc 6
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 66
+	add
+	ldelem.i4
 	stloc.1
+// 0x0106e2e4: 0x106e2e4: lw    v1, 24(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106e2e8: 0x106e2e8: sll   zero, zero, 0
+// 0x0106e2ec: 0x106e2ec: bne   a0, v1, 0x106e32c sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl105::ERTVisabilityGroup_from_string_108d128(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldloc 7
+	bne.un L_106e32c
 // --- basic block ---
-// 0x0106e0e0: 0x106e0e0: addu  s6, v0, zero
+// 0x0106e2f4: 0x106e2f4: lw    v1, 268(v0)
+	ldloc 6
 	ldloc 5
-	stloc 9
-// 0x0106e0e4: 0x106e0e4: addiu v0, zero, 1
-	ldc.i4.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 67
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106e2f8: 0x106e2f8: lw    v0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
 	stloc 5
-// 0x0106e0e8: 0x106e0e8: bne   s6, v0, 0x106e11c lui   a1, 0x10000
-	ldloc 9
+// 0x0106e2fc: 0x106e2fc: sll   zero, zero, 0
+// 0x0106e300: 0x106e300: bne   v1, v0, 0x106e330 lui   a0, 0x70000
+	ldloc 7
 	ldloc 5
+	ldc.i4 458752
+	stloc.1
+	bne.un L_106e330
+// --- basic block ---
+// 0x0106e308: 0x106e308: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-	bne.un L_106e11c
-// --- basic block ---
-// 0x0106e0f0: 0x106e0f0: addiu a1, a1, 20312
+// 0x0106e30c: 0x106e30c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e310: 0x106e310: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20312
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106e0f4: 0x106e0f4: jal   0x100e5c0 addiu a0, s5, 14928
-	ldloc 8
-	ldc.i4 14928
+// 0x0106e314: 0x106e314: addiu a3, a3, 23596
+	ldloc 4
+	ldc.i4 23596
 	add
+	stloc 4
+// 0x0106e318: 0x106e318: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x0106e31c: 0x106e31c: jal   0x100449c addiu a2, zero, 1964
+	ldc.i4 1964
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e0fc: 0x106e0fc: jal   0x100ea50 addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0106e324: 0x106e324: j	 0x106e3b8 addiu s0, zero, 1
+	ldc.i4.1
+	stloc 8
+	br L_106e3b8
+// --- basic block ---
+L_106e32c:
+// 0x0106e32c: 0x106e32c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+L_106e330:
+// 0x0106e330: 0x106e330: jal   0x108b908 addiu a0, a0, 18472
+	ldloc.1
+	ldc.i4 18472
+	add
 	stloc.1
-	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_ResetUpdateFlag_108b908(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e104: 0x106e104: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106e108: 0x106e108: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106e10c: 0x106e10c: addiu a0, a0, 23236
-	ldloc.1
-	ldc.i4 23236
-	add
+// 0x0106e338: 0x106e338: jal   0x1006fd0 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0106e110: 0x106e110: jal   0x104c148 addiu a1, a1, 23244
-	ldloc.2
-	ldc.i4 23244
-	add
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_get_scale_1006fd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e118: 0x106e118: addiu s6, zero, 3
-	ldc.i4.3
+// 0x0106e340: 0x106e340: lui   s2, 0x70000
+	ldc.i4 458752
+	stloc 10
+// 0x0106e344: 0x106e344: addiu s1, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
 	stloc 9
-L_106e11c:
-// 0x0106e11c: 0x106e11c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106e120: 0x106e120: jal   0x100e348 addiu a0, a0, 14944
-	ldloc.1
-	ldc.i4 14944
+// 0x0106e348: 0x106e348: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106e34c: 0x106e34c: addu  a2, v0, zero
+	ldloc 5
+	stloc.3
+// 0x0106e350: 0x106e350: addiu a3, a3, -672
+	ldloc 4
+	ldc.i4 -672
+	add
+	stloc 4
+// 0x0106e354: 0x106e354: addiu a0, s2, 18192
+	ldloc 10
+	ldc.i4 18192
 	add
 	stloc.1
+// 0x0106e358: 0x106e358: addu  a1, s1, zero
+	ldloc 9
+	stloc.2
+// 0x0106e35c: 0x106e35c: jal   0x1075748 sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RTNet_MapDisplyed_1075748(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e128: 0x106e128: jal   0x108d100 addu  a0, v0, zero
+// 0x0106e364: 0x106e364: addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0106e368: 0x106e368: beq   v0, zero, 0x106e39c lui   s3, 0x10000
 	ldloc 5
+	ldc.i4 65536
+	stloc 11
+	brfalse L_106e39c
+// --- basic block ---
+// 0x0106e370: 0x106e370: addiu a0, s2, 18192
+	ldloc 10
+	ldc.i4 18192
+	add
 	stloc.1
-	ldloc.0
+// 0x0106e374: 0x106e374: addiu a0, a0, 264
+	ldloc.1
+	ldc.i4 264
+	add
+	stloc.1
+// 0x0106e378: 0x106e378: addu  a1, s1, zero
+	ldloc 9
+	stloc.2
+// 0x0106e37c: 0x106e37c: jal   0x1001800 addiu a2, zero, 16
+	ldc.i4.s 16
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::ERTVisabilityReport_from_string_108d100(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e130: 0x106e130: jal   0x1026d94 addu  s5, v0, zero
-	ldloc 5
-	stloc 8
+// 0x0106e384: 0x106e384: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e388: 0x106e388: addiu a1, s3, 21196
+	ldloc 11
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106e38c: 0x106e38c: addiu a3, a3, 23452
+	ldloc 4
+	ldc.i4 23452
+	add
+	stloc 4
+// 0x0106e390: 0x106e390: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106e394: 0x106e394: j	 0x106e3b0 addiu a2, zero, 1979
+	ldc.i4 1979
+	stloc.3
+	br L_106e3b0
+// --- basic block ---
+L_106e39c:
+// 0x0106e39c: 0x106e39c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106e3a0: 0x106e3a0: addiu a1, s3, 21196
+	ldloc 11
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106e3a4: 0x106e3a4: addiu a3, a3, 23520
+	ldloc 4
+	ldc.i4 23520
+	add
+	stloc 4
+// 0x0106e3a8: 0x106e3a8: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106e3ac: 0x106e3ac: addiu a2, zero, 1982
+	ldc.i4 1982
+	stloc.3
+L_106e3b0:
+// 0x0106e3b0: 0x106e3b0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e138: 0x106e138: beq   v0, zero, 0x106e21c addiu v0, zero, 2
-	ldloc 5
-	ldc.i4.2
+L_106e3b8:
+// 0x0106e3b8: 0x106e3b8: lw    ra, 60(sp)
+// 0x0106e3bc: 0x106e3bc: addu  v0, s0, zero
+	ldloc 8
 	stloc 5
-	brfalse L_106e21c
-// --- basic block ---
-// 0x0106e140: 0x106e140: bne   s6, v0, 0x106e1b0 sll   zero, zero, 0
-	ldloc 9
+// 0x0106e3c0: 0x106e3c0: lw    s3, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106e3c4: 0x106e3c4: lw    s2, 52(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106e3c8: 0x106e3c8: lw    s1, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106e3cc: 0x106e3cc: lw    s0, 44(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106e3d0: 0x106e3d0: jr    ra addiu sp, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	bne.un L_106e1b0
+	ret
+}
+.method public static int32 OnTimePassedFromLastMapDragEvent_106e3d8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e148: 0x106e148: jal   0x1026a40 sll   zero, zero, 0
+// 0x0106e3d8: 0x106e3d8: addiu sp, sp, -24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106e3dc: 0x106e3dc: sw    ra, 20(sp)
+// 0x0106e3e0: 0x106e3e0: addu  v1, zero, zero
+	ldc.i4.s 0
 	stloc 6
+// 0x0106e3e4: 0x106e3e4: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x0106e3e8: 0x106e3e8: cibyl_sysc 0x20f8
+	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// --- basic block ---
-// 0x0106e150: 0x106e150: bne   v0, s6, 0x106e160 sll   zero, zero, 0
+// 0x0106e3ec: 0x106e3ec: addu  v1, v0, zero
 	ldloc 5
-	ldloc 9
-	bne.un L_106e160
-// --- basic block ---
-// 0x0106e158: 0x106e158: j	 0x106e178 addiu s6, zero, 6
-	ldc.i4.6
-	stloc 9
-	br L_106e178
-// --- basic block ---
-L_106e160:
-// 0x0106e160: 0x106e160: jal   0x1026a40 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
+// 0x0106e3f0: 0x106e3f0: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// --- basic block ---
-// 0x0106e168: 0x106e168: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106e16c: 0x106e16c: bne   v0, v1, 0x106e178 sll   zero, zero, 0
+// 0x0106e3f4: 0x106e3f4: lw    v0, 18072(v0)
+	ldloc 7
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4518
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106e3f8: 0x106e3f8: sll   zero, zero, 0
+// 0x0106e3fc: 0x106e3fc: subu  v1, v1, v0
 	ldloc 6
-	bne.un L_106e178
-// --- basic block ---
-// 0x0106e174: 0x106e174: addiu s6, zero, 18
-	ldc.i4.s 18
-	stloc 9
-L_106e178:
-// 0x0106e178: 0x106e178: jal   0x10269e0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	sub
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106e180: 0x106e180: addiu v1, zero, 2
-	ldc.i4.2
+// 0x0106e400: 0x106e400: slti  v1, v1, 5
+	ldloc 6
+	ldc.i4.5
+	clt
 	stloc 6
-// 0x0106e184: 0x106e184: bne   v0, v1, 0x106e194 sll   zero, zero, 0
-	ldloc 5
+// 0x0106e404: 0x106e404: bne   v1, zero, 0x106e444 lui   a0, 0x1070000
 	ldloc 6
-	bne.un L_106e194
-// --- basic block ---
-// 0x0106e18c: 0x106e18c: j	 0x106e1ac ori   s6, s6, 8
-	ldloc 9
-	ldc.i4.8
-	or
-	stloc 9
-	br L_106e1ac
+	ldc.i4 17235968
+	stloc.1
+	brtrue L_106e444
 // --- basic block ---
-L_106e194:
-// 0x0106e194: 0x106e194: jal   0x10269e0 sll   zero, zero, 0
+// 0x0106e40c: 0x106e40c: jal   0x104fd10 addiu a0, a0, -7208
+	ldloc.1
+	ldc.i4 -7208
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e19c: 0x106e19c: addiu v1, zero, 1
-	ldc.i4.1
+// 0x0106e414: 0x106e414: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106e418: 0x106e418: lw    v0, 18028(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106e41c: 0x106e41c: lui   v1, 0x70000
+	ldc.i4 458752
 	stloc 6
-// 0x0106e1a0: 0x106e1a0: bne   v0, v1, 0x106e1b0 addiu v0, zero, 2
+// 0x0106e420: 0x106e420: beq   v0, zero, 0x106e444 sw    zero, 18068(v1)
 	ldloc 5
+	ldloc 7
 	ldloc 6
 	ldc.i4.2
-	stloc 5
-	bne.un L_106e1b0
+	shr.un
+	ldc.i4 4517
+	add
+	ldc.i4.s 0
+	stelem.i4
+	brfalse L_106e444
 // --- basic block ---
-// 0x0106e1a8: 0x106e1a8: ori   s6, s6, 32
-	ldloc 9
-	ldc.i4.s 32
-	or
-	stloc 9
-L_106e1ac:
-// 0x0106e1ac: 0x106e1ac: addiu v0, zero, 2
+// 0x0106e428: 0x106e428: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106e42c: 0x106e42c: lw    v0, 18448(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
+	shr.un
+	ldc.i4 4612
+	add
+	ldelem.i4
 	stloc 5
-L_106e1b0:
-// 0x0106e1b0: 0x106e1b0: bne   s5, v0, 0x106e21c sll   zero, zero, 0
-	ldloc 8
+// 0x0106e430: 0x106e430: sll   zero, zero, 0
+// 0x0106e434: 0x106e434: beq   v0, zero, 0x106e444 sll   zero, zero, 0
 	ldloc 5
-	bne.un L_106e21c
+	brfalse L_106e444
 // --- basic block ---
-// 0x0106e1b8: 0x106e1b8: jal   0x1026a40 sll   zero, zero, 0
+// 0x0106e43c: 0x106e43c: jal   0x106e260 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_SendCurrentViewDimentions_106e260(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e1c0: 0x106e1c0: bne   v0, s5, 0x106e1d0 sll   zero, zero, 0
-	ldloc 5
-	ldloc 8
-	bne.un L_106e1d0
-// --- basic block ---
-// 0x0106e1c8: 0x106e1c8: j	 0x106e1e8 addiu s5, zero, 6
-	ldc.i4.6
-	stloc 8
-	br L_106e1e8
-// --- basic block ---
-L_106e1d0:
-// 0x0106e1d0: 0x106e1d0: jal   0x1026a40 sll   zero, zero, 0
+L_106e444:
+// 0x0106e444: 0x106e444: lw    ra, 20(sp)
+// 0x0106e448: 0x106e448: sll   zero, zero, 0
+// 0x0106e44c: 0x106e44c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a40(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106e1d8: 0x106e1d8: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106e1dc: 0x106e1dc: bne   v0, v1, 0x106e1e8 sll   zero, zero, 0
-	ldloc 5
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 6
-	bne.un L_106e1e8
-// --- basic block ---
-// 0x0106e1e4: 0x106e1e4: addiu s5, zero, 18
-	ldc.i4.s 18
-	stloc 8
-L_106e1e8:
-// 0x0106e1e8: 0x106e1e8: jal   0x10269e0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106e1f0: 0x106e1f0: addiu v1, zero, 2
-	ldc.i4.2
-	stloc 6
-// 0x0106e1f4: 0x106e1f4: bne   v0, v1, 0x106e204 sll   zero, zero, 0
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldloc 6
-	bne.un L_106e204
-// --- basic block ---
-// 0x0106e1fc: 0x106e1fc: j	 0x106e21c ori   s5, s5, 8
-	ldloc 8
-	ldc.i4.8
-	or
-	stloc 8
-	br L_106e21c
-// --- basic block ---
-L_106e204:
-// 0x0106e204: 0x106e204: jal   0x10269e0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269e0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ret
+}
+.method public static int32 SendMessage_UserPoints_106e454(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x0106e20c: 0x106e20c: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106e210: 0x106e210: bne   v0, v1, 0x106e21c sll   zero, zero, 0
-	ldloc 5
-	ldloc 6
-	bne.un L_106e21c
-// --- basic block ---
-// 0x0106e218: 0x106e218: ori   s5, s5, 32
-	ldloc 8
-	ldc.i4.s 32
-	or
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 8
-L_106e21c:
-// 0x0106e21c: 0x106e21c: jal   0x10a48d0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl123::roadmap_general_settings_events_radius_10a48d0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e224: 0x106e224: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e228: 0x106e228: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x0106e22c: 0x106e22c: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106e230: 0x106e230: addu  a1, s6, zero
-	ldloc 9
-	stloc.2
-// 0x0106e234: 0x106e234: addu  a2, s5, zero
-	ldloc 8
-	stloc.3
-// 0x0106e238: 0x106e238: addiu a3, a3, 4360
-	ldloc 4
-	ldc.i4 4360
-	add
-	stloc 4
-// 0x0106e23c: 0x106e23c: sw    s4, 16(sp)
-	ldloc 7
-	ldloc.0
+// 0x0106e454: 0x106e454: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x0106e458: 0x106e458: lw    v0, 15064(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 3766
 	add
-	ldloc 14
-	stelem.i4
-// 0x0106e240: 0x106e240: sw    s3, 20(sp)
-	ldloc 7
+	ldelem.i4
+	stloc 5
+// 0x0106e45c: 0x106e45c: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x0106e460: 0x106e460: sw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 13
+	ldloc 8
 	stelem.i4
-// 0x0106e244: 0x106e244: sw    s2, 24(sp)
-	ldloc 7
+// 0x0106e464: 0x106e464: sw    ra, 28(sp)
+// 0x0106e468: 0x106e468: sw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 12
+	ldloc 9
 	stelem.i4
-// 0x0106e248: 0x106e248: sw    s1, 28(sp)
-	ldloc 7
-	ldloc.0
+// 0x0106e46c: 0x106e46c: bne   v0, zero, 0x106e49c addu  s0, a0, zero
+	ldloc 5
+	ldloc.1
+	stloc 8
+	brtrue L_106e49c
+// --- basic block ---
+// 0x0106e474: 0x106e474: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106e478: 0x106e478: lw    s1, 18184(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 4546
 	add
-	ldloc 11
-	stelem.i4
-// 0x0106e24c: 0x106e24c: sw    v0, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldelem.i4
+	stloc 9
+// 0x0106e47c: 0x106e47c: jal   0x10ace68 sll   zero, zero, 0
+	call int32 Cibyl129::editor_points_get_total_points_10ace68()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e484: 0x106e484: bne   s1, v0, 0x106e49c sll   zero, zero, 0
+	ldloc 9
+	ldloc 5
+	bne.un L_106e49c
+// --- basic block ---
+// 0x0106e48c: 0x106e48c: beq   s0, zero, 0x106e4e4 addiu v1, zero, 1
+	ldloc 8
+	ldc.i4.1
+	stloc 7
+	brfalse L_106e4e4
+// --- basic block ---
+// 0x0106e494: 0x106e494: j	 0x106e4e4 sb    zero, 0(s0)
+	ldloc 8
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	br L_106e4e4
+// --- basic block ---
+L_106e49c:
+// 0x0106e49c: 0x106e49c: jal   0x10ace68 sll   zero, zero, 0
+	call int32 Cibyl129::editor_points_get_total_points_10ace68()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e4a4: 0x106e4a4: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106e4a8: 0x106e4a8: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106e4ac: 0x106e4ac: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
 	add
+	stloc.1
+// 0x0106e4b0: 0x106e4b0: addu  a1, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0106e250: 0x106e250: jal   0x1073d58 sw    s0, 36(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	stloc.2
+// 0x0106e4b4: 0x106e4b4: addiu a2, a2, -556
+	ldloc.3
+	ldc.i4 -556
 	add
-	ldloc 10
-	stelem.i4
+	stloc.3
+// 0x0106e4b8: 0x106e4b8: jal   0x1074230 addu  a3, s0, zero
+	ldloc 8
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_SetMyVisability_1073d58(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_UserPoints_1074230(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106e258: 0x106e258: beq   v0, zero, 0x106e26c addu  v1, zero, zero
+// 0x0106e4c0: 0x106e4c0: beq   v0, zero, 0x106e4e4 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
-	stloc 6
-	brfalse L_106e26c
+	stloc 7
+	brfalse L_106e4e4
 // --- basic block ---
-// 0x0106e260: 0x106e260: lui   v0, 0x0
-	ldc.i4.s 0
+// 0x0106e4c8: 0x106e4c8: jal   0x10ace68 sll   zero, zero, 0
+	call int32 Cibyl129::editor_points_get_total_points_10ace68()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0106e264: 0x106e264: sw    zero, 15044(v0)
+// --- basic block ---
+// 0x0106e4d0: 0x106e4d0: lui   v1, 0x70000
+	ldc.i4 458752
+	stloc 7
+// 0x0106e4d4: 0x106e4d4: sw    v0, 18184(v1)
+	ldloc 6
 	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 4546
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106e4d8: 0x106e4d8: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x0106e4dc: 0x106e4dc: sw    zero, 15064(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3761
+	ldc.i4 3766
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106e268: 0x106e268: addiu v1, zero, 1
+// 0x0106e4e0: 0x106e4e0: addiu v1, zero, 1
 	ldc.i4.1
-	stloc 6
-L_106e26c:
-// 0x0106e26c: 0x106e26c: lw    ra, 68(sp)
-// 0x0106e270: 0x106e270: addu  v0, v1, zero
-	ldloc 6
-	stloc 5
-// 0x0106e274: 0x106e274: lw    s6, 64(sp)
+	stloc 7
+L_106e4e4:
+// 0x0106e4e4: 0x106e4e4: lw    ra, 28(sp)
+// 0x0106e4e8: 0x106e4e8: addu  v0, v1, zero
 	ldloc 7
+	stloc 5
+// 0x0106e4ec: 0x106e4ec: lw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106e278: 0x106e278: lw    s5, 60(sp)
-	ldloc 7
+// 0x0106e4f0: 0x106e4f0: lw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.5
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106e27c: 0x106e27c: lw    s4, 56(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
-	stloc 14
-// 0x0106e280: 0x106e280: lw    s3, 52(sp)
-	ldloc 7
+// 0x0106e4f4: 0x106e4f4: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 13
-// 0x0106e284: 0x106e284: lw    s2, 48(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 12
-// 0x0106e288: 0x106e288: lw    s1, 44(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 11
-// 0x0106e28c: 0x106e28c: lw    s0, 40(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106e290: 0x106e290: jr    ra addiu sp, sp, 72
-	ldloc.0
-	ldc.i4.s 72
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnSettingsChanged_VisabilityGroup_106e298(int32,int32,int32,int32,int32)
+.method public static int32 SendMessage_Location_106e4fc(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2396,83 +2887,210 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e298: 0x106e298: addiu sp, sp, -24
+// 0x0106e4fc: 0x106e4fc: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106e29c: 0x106e29c: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106e2a0: 0x106e2a0: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0106e2a4: 0x106e2a4: addu  a0, zero, zero
+// 0x0106e500: 0x106e500: sw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106e504: 0x106e504: lui   s0, 0x0
 	ldc.i4.s 0
-	stloc.1
-// 0x0106e2a8: 0x106e2a8: sw    ra, 20(sp)
-// 0x0106e2ac: 0x106e2ac: jal   0x106e068 sw    v1, 15044(v0)
+	stloc 8
+// 0x0106e508: 0x106e508: lw    v0, 15052(s0)
+	ldloc 5
 	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 3763
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106e50c: 0x106e50c: sw    s1, 24(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3761
+	ldc.i4.6
 	add
+	ldloc 9
+	stelem.i4
+// 0x0106e510: 0x106e510: sw    ra, 28(sp)
+// 0x0106e514: 0x106e514: beq   v0, zero, 0x106e53c addu  s1, a0, zero
+	ldloc 6
+	ldloc.1
+	stloc 9
+	brfalse L_106e53c
+// --- basic block ---
+// 0x0106e51c: 0x106e51c: jal   0x1030cb4 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_get_fix_1030cb4()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106e524: 0x106e524: bne   v0, zero, 0x106e54c lui   a2, 0x1070000
 	ldloc 6
+	ldc.i4 17235968
+	stloc.3
+	brtrue L_106e54c
+// --- basic block ---
+// 0x0106e52c: 0x106e52c: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x0106e530: 0x106e530: jal   0x1030d94 addiu a0, a0, -6772
+	ldloc.1
+	ldc.i4 -6772
+	add
+	stloc.1
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call int32 Cibyl35::roadmap_gps_register_fix_listener_1030d94(int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0106e538: 0x106e538: sw    zero, 15052(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 3763
+	add
+	ldc.i4.s 0
 	stelem.i4
+L_106e53c:
+// 0x0106e53c: 0x106e53c: beq   s1, zero, 0x106e574 addiu v1, zero, 1
+	ldloc 9
+	ldc.i4.1
+	stloc 7
+	brfalse L_106e574
+// --- basic block ---
+// 0x0106e544: 0x106e544: j	 0x106e574 sb    zero, 0(s1)
+	ldloc 9
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	br L_106e574
+// --- basic block ---
+L_106e54c:
+// 0x0106e54c: 0x106e54c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106e550: 0x106e550: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106e554: 0x106e554: addu  a1, v0, zero
+	ldloc 6
+	stloc.2
+// 0x0106e558: 0x106e558: addiu a2, a2, -3180
+	ldloc.3
+	ldc.i4 -3180
+	add
+	stloc.3
+// 0x0106e55c: 0x106e55c: jal   0x1074294 addu  a3, s1, zero
+	ldloc 9
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_SetMyVisability_106e068(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_Location_1074294(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0106e2b4: 0x106e2b4: lw    ra, 20(sp)
-// 0x0106e2b8: 0x106e2b8: sll   zero, zero, 0
-// 0x0106e2bc: 0x106e2bc: jr    ra addiu sp, sp, 24
+// 0x0106e564: 0x106e564: beq   v0, zero, 0x106e574 addu  v1, zero, zero
+	ldloc 6
+	ldc.i4.s 0
+	stloc 7
+	brfalse L_106e574
+// --- basic block ---
+// 0x0106e56c: 0x106e56c: sw    zero, 15052(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 3763
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106e570: 0x106e570: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+L_106e574:
+// 0x0106e574: 0x106e574: lw    ra, 28(sp)
+// 0x0106e578: 0x106e578: addu  v0, v1, zero
+	ldloc 7
+	stloc 6
+// 0x0106e57c: 0x106e57c: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106e580: 0x106e580: lw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106e584: 0x106e584: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 SendMessage_At_106e2c4(int32,int32,int32,int32,int32)
+.method public static int32 OnLocation_106e58c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 t0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 ra)
 
-// local  5 is register v0
+// local  6 is register v0
 // local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 11 is register t0
-// local  9 is register s0
-// local 10 is register s1
-// local  8 is register s2
 // local  0 is register sp
-// local 12 is register ra
-// local  6 is register mem
+// local  8 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
 	stloc 7
 	ldarg 1
@@ -2483,153 +3101,109 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e2c4: 0x106e2c4: addiu sp, sp, -80
+// 0x0106e58c: 0x106e58c: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -80
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106e2c8: 0x106e2c8: sw    s1, 68(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldloc 10
-	stelem.i4
-// 0x0106e2cc: 0x106e2cc: sw    s0, 64(sp)
-	ldloc 6
+// 0x0106e590: 0x106e590: sw    a0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.4
 	add
-	ldloc 9
+	ldloc.1
 	stelem.i4
-// 0x0106e2d0: 0x106e2d0: sw    ra, 76(sp)
-// 0x0106e2d4: 0x106e2d4: sw    s2, 72(sp)
-	ldloc 6
+// 0x0106e594: 0x106e594: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106e598: 0x106e598: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106e59c: 0x106e59c: sw    a1, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.5
 	add
-	ldloc 8
-	stelem.i4
-// 0x0106e2d8: 0x106e2d8: addu  s0, a1, zero
-	ldloc.2
-	stloc 9
-// 0x0106e2dc: 0x106e2dc: beq   a1, zero, 0x106e2f0 addu  s1, a0, zero
 	ldloc.2
+	stelem.i4
+// 0x0106e5a0: 0x106e5a0: addiu a0, a0, 18192
 	ldloc.1
-	stloc 10
-	brfalse L_106e2f0
-// --- basic block ---
-// 0x0106e2e4: 0x106e2e4: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e2e8: 0x106e2e8: jal   0x108b2e4 addiu a0, a0, 18008
-	ldloc.1
-	ldc.i4 18008
-	add
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl104::RTUsers_ResetUpdateFlag_108b2e4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_106e2f0:
-// 0x0106e2f0: 0x106e2f0: addiu s2, sp, 44
-	ldloc.0
-	ldc.i4.s 44
+	ldc.i4 18192
 	add
-	stloc 8
-// 0x0106e2f4: 0x106e2f4: addu  a0, s2, zero
-	ldloc 8
 	stloc.1
-// 0x0106e2f8: 0x106e2f8: addiu a1, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.2
-// 0x0106e2fc: 0x106e2fc: addiu a2, sp, 36
-	ldloc.0
-	ldc.i4.s 36
+// 0x0106e5a4: 0x106e5a4: addiu a2, a2, -3180
+	ldloc.3
+	ldc.i4 -3180
 	add
 	stloc.3
-// 0x0106e300: 0x106e300: jal   0x10b2fc8 addiu a3, sp, 40
+// 0x0106e5a8: 0x106e5a8: addiu a1, sp, 16
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 16
 	add
+	stloc.2
+// 0x0106e5ac: 0x106e5ac: sw    ra, 28(sp)
+// 0x0106e5b0: 0x106e5b0: jal   0x1074294 addu  a3, zero, zero
+	ldc.i4.s 0
 	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_report_get_current_position_10b2fc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_Location_1074294(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x0106e308: 0x106e308: bne   v0, zero, 0x106e440 lui   v0, 0x0
-	ldloc 5
+// 0x0106e5b8: 0x106e5b8: beq   v0, zero, 0x106e5c8 lui   v1, 0x0
+	ldloc 6
 	ldc.i4.s 0
-	stloc 5
-	brtrue L_106e440
+	stloc 7
+	brfalse L_106e5c8
 // --- basic block ---
-// 0x0106e310: 0x106e310: jal   0x1030c08 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
-	stloc 5
-// --- basic block ---
-// 0x0106e318: 0x106e318: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-// 0x0106e31c: 0x106e31c: beq   v0, v1, 0x106e338 addu  s2, zero, zero
+// 0x0106e5c0: 0x106e5c0: j	 0x106e5d0 sw    zero, 15052(v1)
 	ldloc 5
 	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 3763
+	add
 	ldc.i4.s 0
-	stloc 8
-	beq  L_106e338
+	stelem.i4
+	br L_106e5d0
 // --- basic block ---
-// 0x0106e324: 0x106e324: jal   0x1030c08 addiu s2, zero, 1
+L_106e5c8:
+// 0x0106e5c8: 0x106e5c8: addiu v0, zero, 1
 	ldc.i4.1
-	stloc 8
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
-	stloc 5
-// --- basic block ---
-// 0x0106e32c: 0x106e32c: bne   v0, zero, 0x106e338 sll   zero, zero, 0
+	stloc 6
+// 0x0106e5cc: 0x106e5cc: sw    v0, 15052(v1)
 	ldloc 5
-	brtrue L_106e338
-// --- basic block ---
-// 0x0106e334: 0x106e334: addu  s2, zero, zero
-	ldc.i4.s 0
-	stloc 8
-L_106e338:
-// 0x0106e338: 0x106e338: lui   a0, 0x10000
-	ldc.i4 65536
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 3763
+	add
+	ldloc 6
+	stelem.i4
+L_106e5d0:
+// 0x0106e5d0: 0x106e5d0: lui   a0, 0x1070000
+	ldc.i4 17235968
 	stloc.1
-// 0x0106e33c: 0x106e33c: jal   0x101df50 addiu a0, a0, -31052
+// 0x0106e5d4: 0x106e5d4: jal   0x1031d0c addiu a0, a0, -6772
 	ldloc.1
-	ldc.i4 -31052
+	ldc.i4 -6772
 	add
 	stloc.1
 	ldloc.0
@@ -2637,477 +3211,317 @@ L_106e338:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl36::roadmap_gps_unregister_fix_listener_1031d0c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x0106e344: 0x106e344: beq   v0, zero, 0x106e374 lui   v1, 0x2120000
-	ldloc 5
-	ldc.i4 34734080
+// 0x0106e5dc: 0x106e5dc: lw    ra, 28(sp)
+// 0x0106e5e0: 0x106e5e0: sll   zero, zero, 0
+// 0x0106e5e4: 0x106e5e4: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 SendMessage_SetMood_106e5ec(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
+
+// local  6 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
 	stloc 7
-	brfalse L_106e374
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e34c: 0x106e34c: lw    a0, 0(v0)
-	ldloc 6
+// 0x0106e5ec: 0x106e5ec: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x0106e5f0: 0x106e5f0: sw    s0, 24(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0106e350: 0x106e350: ori   v1, v1, 60730
-	ldloc 7
-	ldc.i4 60730
-	or
-	stloc 7
-// 0x0106e354: 0x106e354: bne   a0, v1, 0x106e36c lui   v1, 0x1e90000
-	ldloc.1
-	ldloc 7
-	ldc.i4 32047104
-	stloc 7
-	bne.un L_106e36c
-// --- basic block ---
-// 0x0106e35c: 0x106e35c: lw    a0, 4(v0)
-	ldloc 6
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106e5f4: 0x106e5f4: lui   s0, 0x0
+	ldc.i4.s 0
+	stloc 8
+// 0x0106e5f8: 0x106e5f8: lw    v0, 15048(s0)
 	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 3762
 	add
 	ldelem.i4
-	stloc.1
-// 0x0106e360: 0x106e360: ori   v1, v1, 58906
-	ldloc 7
-	ldc.i4 58906
-	or
-	stloc 7
-// 0x0106e364: 0x106e364: beq   a0, v1, 0x106e378 lui   a0, 0x20000
-	ldloc.1
-	ldloc 7
-	ldc.i4 131072
-	stloc.1
-	beq  L_106e378
+	stloc 6
+// 0x0106e5fc: 0x106e5fc: sll   zero, zero, 0
+// 0x0106e600: 0x106e600: bne   v0, zero, 0x106e618 sw    ra, 28(sp)
+	ldloc 6
+	brtrue L_106e618
 // --- basic block ---
-L_106e36c:
-// 0x0106e36c: 0x106e36c: bne   s2, zero, 0x106e388 sll   zero, zero, 0
-	ldloc 8
-	brtrue L_106e388
+// 0x0106e608: 0x106e608: beq   a0, zero, 0x106e64c addiu v1, zero, 1
+	ldloc.1
+	ldc.i4.1
+	stloc 7
+	brfalse L_106e64c
 // --- basic block ---
-L_106e374:
-// 0x0106e374: 0x106e374: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-L_106e378:
-// 0x0106e378: 0x106e378: jal   0x101df50 addiu a0, a0, 6792
+// 0x0106e610: 0x106e610: j	 0x106e64c sb    zero, 0(a0)
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	br L_106e64c
+// --- basic block ---
+L_106e618:
+// 0x0106e618: 0x106e618: jal   0x1034a7c sw    a0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.1
+	ldloc.1
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl38::roadmap_mood_actual_state_1034a7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106e380: 0x106e380: beq   v0, zero, 0x106e40c lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_106e40c
+	stloc 6
 // --- basic block ---
-L_106e388:
-// 0x0106e388: 0x106e388: lui   a0, 0x2120000
-	ldc.i4 34734080
+// 0x0106e620: 0x106e620: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106e38c: 0x106e38c: lw    v1, 0(v0)
-	ldloc 6
+// 0x0106e624: 0x106e624: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0106e628: 0x106e628: lw    a3, 16(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.4
+	add
 	ldelem.i4
-	stloc 7
-// 0x0106e390: 0x106e390: ori   a0, a0, 60730
-	ldloc.1
-	ldc.i4 60730
-	or
-	stloc.1
-// 0x0106e394: 0x106e394: bne   v1, a0, 0x106e3b0 lui   t0, 0x0
-	ldloc 7
+	stloc 4
+// 0x0106e62c: 0x106e62c: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4.s 0
-	stloc 11
-	bne.un L_106e3b0
-// --- basic block ---
-// 0x0106e39c: 0x106e39c: lui   a0, 0x1e90000
-	ldc.i4 32047104
+	ldc.i4 18192
+	add
 	stloc.1
-// 0x0106e3a0: 0x106e3a0: lw    a1, 4(v0)
+// 0x0106e630: 0x106e630: addu  a1, v0, zero
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
 	stloc.2
-// 0x0106e3a4: 0x106e3a4: ori   a0, a0, 58906
+// 0x0106e634: 0x106e634: jal   0x1074318 addiu a2, a2, -456
+	ldloc.3
+	ldc.i4 -456
+	add
+	stloc.3
+	ldloc.0
 	ldloc.1
-	ldc.i4 58906
-	or
-	stloc.1
-// 0x0106e3a8: 0x106e3a8: beq   a1, a0, 0x106e40c lui   a1, 0x10000
 	ldloc.2
-	ldloc.1
-	ldc.i4 65536
-	stloc.2
-	beq  L_106e40c
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl87::RTNet_SetMood_1074318(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
 // --- basic block ---
-L_106e3b0:
-// 0x0106e3b0: 0x106e3b0: lw    a0, 15068(t0)
+// 0x0106e63c: 0x106e63c: beq   v0, zero, 0x106e64c addu  v1, zero, zero
 	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldc.i4 3767
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106e3b4: 0x106e3b4: sll   zero, zero, 0
-// 0x0106e3b8: 0x106e3b8: beq   a0, zero, 0x106e408 lui   a0, 0x70000
-	ldloc.1
-	ldc.i4 458752
-	stloc.1
-	brfalse L_106e408
+	ldc.i4.s 0
+	stloc 7
+	brfalse L_106e64c
 // --- basic block ---
-// 0x0106e3c0: 0x106e3c0: lw    v0, 4(v0)
-	ldloc 6
+// 0x0106e644: 0x106e644: sw    zero, 15048(s0)
 	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e3c4: 0x106e3c4: sll   zero, zero, 0
-// 0x0106e3c8: 0x106e3c8: sw    v0, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+	ldc.i4 3762
 	add
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106e3cc: 0x106e3cc: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106e3d0: 0x106e3d0: addiu v0, v0, 4184
+// 0x0106e648: 0x106e648: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+L_106e64c:
+// 0x0106e64c: 0x106e64c: lw    ra, 28(sp)
+// 0x0106e650: 0x106e650: addu  v0, v1, zero
+	ldloc 7
+	stloc 6
+// 0x0106e654: 0x106e654: lw    s0, 24(sp)
 	ldloc 5
-	ldc.i4 4184
-	add
-	stloc 5
-// 0x0106e3d4: 0x106e3d4: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106e3d8: 0x106e3d8: addiu a1, sp, 44
 	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc.2
-// 0x0106e3dc: 0x106e3dc: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0106e3e0: 0x106e3e0: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x0106e3e4: 0x106e3e4: sw    zero, 15068(t0)
-	ldloc 6
-	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 3767
+	ldc.i4.6
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106e3e8: 0x106e3e8: sw    v1, 44(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 8
+// 0x0106e658: 0x106e658: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 32
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
-	stelem.i4
-// 0x0106e3ec: 0x106e3ec: sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106e3f0: 0x106e3f0: sw    v0, 20(sp)
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106e3f4: 0x106e3f4: sw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-// 0x0106e3f8: 0x106e3f8: sw    zero, 52(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106e3fc: 0x106e3fc: sw    zero, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
+	ret
+}
+.method public static int32 OnMoodChanged_106e660(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  8 is register mem
+
 	ldc.i4.s 0
-	stelem.i4
-// 0x0106e400: 0x106e400: j	 0x106e46c sw    zero, 60(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
-	add
+	stloc 5
 	ldc.i4.s 0
-	stelem.i4
-	br L_106e46c
-// --- basic block ---
-L_106e408:
-// 0x0106e408: 0x106e408: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-L_106e40c:
-// 0x0106e40c: 0x106e40c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106e410: 0x106e410: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106e414: 0x106e414: addiu a3, a3, 23400
-	ldloc 4
-	ldc.i4 23400
-	add
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106e418: 0x106e418: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106e41c: 0x106e41c: jal   0x100449c addiu a2, zero, 1629
-	ldc.i4 1629
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106e424: 0x106e424: beq   s0, zero, 0x106e474 addu  v0, zero, zero
-	ldloc 9
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
-	stloc 5
-	brfalse L_106e474
-// --- basic block ---
-// 0x0106e42c: 0x106e42c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e430: 0x106e430: jal   0x108b310 addiu a0, a0, 18008
-	ldloc.1
-	ldc.i4 18008
-	add
-	stloc.1
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl104::RTUsers_RedoUpdateFlag_108b310(int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106e438: 0x106e438: j	 0x106e474 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_106e474
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_106e440:
-// 0x0106e440: 0x106e440: sw    zero, 15068(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3767
+// 0x0106e660: 0x106e660: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x0106e664: 0x106e664: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106e668: 0x106e668: lui   v0, 0x0
 	ldc.i4.s 0
-	stelem.i4
-// 0x0106e444: 0x106e444: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106e448: 0x106e448: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e44c: 0x106e44c: addiu v0, v0, 4184
-	ldloc 5
-	ldc.i4 4184
-	add
 	stloc 5
-// 0x0106e450: 0x106e450: lw    a2, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc.3
-// 0x0106e454: 0x106e454: lw    a3, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 4
-// 0x0106e458: 0x106e458: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
+// 0x0106e66c: 0x106e66c: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0106e45c: 0x106e45c: addu  a1, s2, zero
+// 0x0106e670: 0x106e670: sw    ra, 20(sp)
+// 0x0106e674: 0x106e674: jal   0x106e5ec sw    v1, 15048(v0)
 	ldloc 8
-	stloc.2
-// 0x0106e460: 0x106e460: sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106e464: 0x106e464: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
 	ldloc 5
-	stelem.i4
-// 0x0106e468: 0x106e468: sw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 3762
 	add
-	ldloc 10
+	ldloc 6
 	stelem.i4
-L_106e46c:
-// 0x0106e46c: 0x106e46c: jal   0x1075284 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RTNet_At_1075284(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_SetMood_106e5ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_106e474:
-// 0x0106e474: 0x106e474: lw    ra, 76(sp)
-// 0x0106e478: 0x106e478: lw    s2, 72(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106e47c: 0x106e47c: lw    s1, 68(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldelem.i4
-	stloc 10
-// 0x0106e480: 0x106e480: lw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106e484: 0x106e484: jr    ra addiu sp, sp, 80
+// 0x0106e67c: 0x106e67c: lw    ra, 20(sp)
+// 0x0106e680: 0x106e680: sll   zero, zero, 0
+// 0x0106e684: 0x106e684: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 80
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 SendMessage_CreateNewRoads_106e48c(int32,int32,int32,int32,int32)
+.method public static int32 SendMessage_SetMyVisability_106e68c(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s5,int32 s6,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
+// local 10 is register s0
+// local 11 is register s1
+// local 12 is register s2
+// local 13 is register s3
+// local 14 is register s4
+// local  8 is register s5
+// local  9 is register s6
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local 15 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3117,1531 +3531,735 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 15
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106e48c: 0x106e48c: addiu sp, sp, -32
+// 0x0106e68c: 0x106e68c: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x0106e690: 0x106e690: lw    v0, 15044(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 3761
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106e694: 0x106e694: addiu sp, sp, -72
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0106e490: 0x106e490: sw    s0, 24(sp)
-	ldloc 6
+// 0x0106e698: 0x106e698: sw    s0, 40(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 10
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-// 0x0106e494: 0x106e494: addu  s0, a0, zero
-	ldloc.1
-	stloc 8
-// 0x0106e498: 0x106e498: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106e49c: 0x106e49c: sw    ra, 28(sp)
-// 0x0106e4a0: 0x106e4a0: jal   0x100f424 addiu a0, a0, 23472
-	ldloc.1
-	ldc.i4 23472
-	add
-	stloc.1
+// 0x0106e69c: 0x106e69c: sw    ra, 68(sp)
+// 0x0106e6a0: 0x106e6a0: sw    s6, 64(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl11::roadmap_state_find_100f424(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106e4a8: 0x106e4a8: bne   v0, zero, 0x106e4d0 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106e4d0
-// --- basic block ---
-// 0x0106e4b0: 0x106e4b0: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106e4b4: 0x106e4b4: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106e4b8: 0x106e4b8: addiu a3, a3, 23484
-	ldloc 4
-	ldc.i4 23484
-	add
-	stloc 4
-// 0x0106e4bc: 0x106e4bc: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106e4c0: 0x106e4c0: jal   0x100449c addiu a2, zero, 1474
-	ldc.i4 1474
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106e4c8: 0x106e4c8: j	 0x106e508 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_106e508
-// --- basic block ---
-L_106e4d0:
-// 0x0106e4d0: 0x106e4d0: jalr  v0 sll   zero, zero, 0
-	ldloc 5
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106e4d8: 0x106e4d8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0106e4dc: 0x106e4dc: lw    v0, -19060(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e4e0: 0x106e4e0: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e4e4: 0x106e4e4: lw    a3, 36(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 4
-// 0x0106e4e8: 0x106e4e8: lw    a1, 28(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106e4ec: 0x106e4ec: lw    a2, 32(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc.3
-// 0x0106e4f0: 0x106e4f0: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106e4f4: 0x106e4f4: addiu v0, v0, -244
-	ldloc 5
-	ldc.i4 -244
-	add
-	stloc 5
-// 0x0106e4f8: 0x106e4f8: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106e4fc: 0x106e4fc: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106e500: 0x106e500: jal   0x1074fc0 sw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_CreateNewRoads_1074fc0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_106e508:
-// 0x0106e508: 0x106e508: lw    ra, 28(sp)
-// 0x0106e50c: 0x106e50c: lw    s0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106e510: 0x106e510: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 SendMessage_GPSPath_106e518(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106e518: 0x106e518: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0106e51c: 0x106e51c: lw    v0, -19060(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e520: 0x106e520: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106e524: 0x106e524: lw    a2, 20(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc.3
-// 0x0106e528: 0x106e528: lw    a3, 16(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 4
-// 0x0106e52c: 0x106e52c: lw    a1, 12(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106e530: 0x106e530: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106e534: 0x106e534: sw    a0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc.1
-	stelem.i4
-// 0x0106e538: 0x106e538: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e53c: 0x106e53c: addiu v0, v0, -492
-	ldloc 5
-	ldc.i4 -492
-	add
-	stloc 5
-// 0x0106e540: 0x106e540: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106e544: 0x106e544: sw    ra, 28(sp)
-// 0x0106e548: 0x106e548: jal   0x1074d64 sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_GPSPath_1074d64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106e550: 0x106e550: lw    ra, 28(sp)
-// 0x0106e554: 0x106e554: sll   zero, zero, 0
-// 0x0106e558: 0x106e558: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 SendMessage_ExternalPoiDisplayed_106e560(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106e560: 0x106e560: addu  a2, a0, zero
-	ldloc.1
-	stloc.3
-// 0x0106e564: 0x106e564: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x0106e568: 0x106e568: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e56c: 0x106e56c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106e570: 0x106e570: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106e574: 0x106e574: sw    ra, 20(sp)
-// 0x0106e578: 0x106e578: jal   0x10749a0 addiu a1, a1, -800
-	ldloc.2
-	ldc.i4 -800
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_ExternalPoiDisplayed_10749a0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0106e580: 0x106e580: lw    ra, 20(sp)
-// 0x0106e584: 0x106e584: sll   zero, zero, 0
-// 0x0106e588: 0x106e588: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 SendMessage_NodePath_106e590(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106e590: 0x106e590: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0106e594: 0x106e594: lw    v0, -19060(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e598: 0x106e598: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106e59c: 0x106e59c: lw    a2, 8(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc.3
-// 0x0106e5a0: 0x106e5a0: lw    v1, 48(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106e5a4: 0x106e5a4: lw    a3, 4(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 4
-// 0x0106e5a8: 0x106e5a8: lw    a1, 4(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106e5ac: 0x106e5ac: sw    v1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106e5b0: 0x106e5b0: lw    v0, 44(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e5b4: 0x106e5b4: sw    a0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc.1
-	stelem.i4
-// 0x0106e5b8: 0x106e5b8: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106e5bc: 0x106e5bc: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106e5c0: 0x106e5c0: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x0106e5c4: 0x106e5c4: addiu v0, v0, -640
-	ldloc 5
-	ldc.i4 -640
-	add
-	stloc 5
-// 0x0106e5c8: 0x106e5c8: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106e5cc: 0x106e5cc: sw    ra, 36(sp)
-// 0x0106e5d0: 0x106e5d0: jal   0x1074af4 sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl87::RTNet_NodePath_1074af4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106e5d8: 0x106e5d8: lw    ra, 36(sp)
-// 0x0106e5dc: 0x106e5dc: sll   zero, zero, 0
-// 0x0106e5e0: 0x106e5e0: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 SendAllMessagesTogether_SendPart2_106e830(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s3,int32 s1,int32 s2,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local 10 is register s1
-// local 11 is register s2
-// local  9 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106e830: 0x106e830: addiu sp, sp, -2344
-	ldloc.0
-	ldc.i4 -2344
-	add
-	stloc.0
-// 0x0106e834: 0x106e834: sw    ra, 2340(sp)
-// 0x0106e838: 0x106e838: sw    s3, 2336(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 584
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106e83c: 0x106e83c: sw    s2, 2332(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 583
-	add
-	ldloc 11
-	stelem.i4
-// 0x0106e840: 0x106e840: sw    s1, 2328(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 582
-	add
-	ldloc 10
-	stelem.i4
-// 0x0106e844: 0x106e844: sw    s0, 2324(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 581
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106e848: 0x106e848: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x0106e84c: 0x106e84c: beq   a0, zero, 0x106e868 lui   v0, 0x70000
-	ldloc.1
-	ldc.i4 458752
-	stloc 5
-	brfalse L_106e868
-// --- basic block ---
-// 0x0106e854: 0x106e854: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106e858: 0x106e858: lw    a0, -19060(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106e85c: 0x106e85c: sw    zero, 17716(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4429
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106e860: 0x106e860: j	 0x106e890 sw    a0, 17712(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4428
-	add
-	ldloc.1
-	stelem.i4
-	br L_106e890
-// --- basic block ---
-L_106e868:
-// 0x0106e868: 0x106e868: lw    v0, 17712(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4428
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e86c: 0x106e86c: lw    a0, 17716(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4429
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106e870: 0x106e870: lw    a1, 16(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc.2
-// 0x0106e874: 0x106e874: sll   zero, zero, 0
-// 0x0106e878: 0x106e878: slt   a1, a0, a1
-	ldloc.1
-	ldloc.2
-	clt
-	stloc.2
-// 0x0106e87c: 0x106e87c: beq   a1, zero, 0x106ead0 addu  v0, zero, zero
-	ldloc.2
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_106ead0
-// --- basic block ---
-// 0x0106e884: 0x106e884: addiu a0, a0, 100
-	ldloc.1
-	ldc.i4.s 100
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
 	add
-	stloc.1
-// 0x0106e888: 0x106e888: sw    a0, 17716(v1)
+	ldloc 9
+	stelem.i4
+// 0x0106e6a4: 0x106e6a4: sw    s5, 60(sp)
 	ldloc 7
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4429
+	ldc.i4.s 15
 	add
-	ldloc.1
+	ldloc 8
 	stelem.i4
-// 0x0106e88c: 0x106e88c: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-L_106e890:
-// 0x0106e890: 0x106e890: lw    v1, 17712(v0)
+// 0x0106e6a8: 0x106e6a8: sw    s4, 56(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4428
+	ldc.i4.s 14
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106e894: 0x106e894: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106e898: 0x106e898: lw    v0, 17716(v0)
+	ldloc 14
+	stelem.i4
+// 0x0106e6ac: 0x106e6ac: sw    s3, 52(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4429
+	ldc.i4.s 13
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106e89c: 0x106e89c: lw    v1, 16(v1)
+	ldloc 13
+	stelem.i4
+// 0x0106e6b0: 0x106e6b0: sw    s2, 48(sp)
 	ldloc 7
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 12
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106e8a0: 0x106e8a0: addiu v0, v0, 100
-	ldloc 5
-	ldc.i4.s 100
+	ldloc 12
+	stelem.i4
+// 0x0106e6b4: 0x106e6b4: sw    s1, 44(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc 5
-// 0x0106e8a4: 0x106e8a4: slt   v0, v0, v1
-	ldloc 5
-	ldloc 6
-	clt
-	stloc 5
-// 0x0106e8a8: 0x106e8a8: beq   v0, zero, 0x106e8bc lui   s2, 0x1070000
-	ldloc 5
-	ldc.i4 17235968
-	stloc 11
-	brfalse L_106e8bc
-// --- basic block ---
-// 0x0106e8b0: 0x106e8b0: addiu s2, s2, -2668
 	ldloc 11
-	ldc.i4 -2668
-	add
-	stloc 11
-// 0x0106e8b4: 0x106e8b4: j	 0x106e8c8 addu  s1, zero, zero
-	ldc.i4.s 0
+	stelem.i4
+// 0x0106e6b8: 0x106e6b8: bne   v0, zero, 0x106e6d0 addu  s0, a0, zero
+	ldloc 5
+	ldloc.1
 	stloc 10
-	br L_106e8c8
+	brtrue L_106e6d0
 // --- basic block ---
-L_106e8bc:
-// 0x0106e8bc: 0x106e8bc: lui   s2, 0x1070000
-	ldc.i4 17235968
-	stloc 11
-// 0x0106e8c0: 0x106e8c0: addiu s2, s2, 4908
-	ldloc 11
-	ldc.i4 4908
-	add
-	stloc 11
-// 0x0106e8c4: 0x106e8c4: addiu s1, zero, 1
+// 0x0106e6c0: 0x106e6c0: beq   a0, zero, 0x106e890 addiu v1, zero, 1
+	ldloc.1
 	ldc.i4.1
-	stloc 10
-L_106e8c8:
-// 0x0106e8c8: 0x106e8c8: addiu s0, sp, 68
-	ldloc.0
-	ldc.i4.s 68
-	add
+	stloc 6
+	brfalse L_106e890
+// --- basic block ---
+// 0x0106e6c8: 0x106e6c8: j	 0x106e890 sb    zero, 0(a0)
+	ldloc.1
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	br L_106e890
+// --- basic block ---
+L_106e6d0:
+// 0x0106e6d0: 0x106e6d0: jal   0x10a8da8 lui   s5, 0x0
+	ldc.i4.s 0
 	stloc 8
-// 0x0106e8cc: 0x106e8cc: jal   0x10674e4 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_download_settings_isDownloadWazers_10a8da8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e8d4: 0x106e8d4: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x0106e8d8: 0x106e8d8: jal   0x106755c addiu a1, zero, 10915
-	ldc.i4 10915
-	stloc.2
+// 0x0106e6d8: 0x106e6d8: jal   0x10a9014 addu  s4, v0, zero
+	ldloc 5
+	stloc 14
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_download_settings_isDownloadReports_10a9014(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e8e0: 0x106e8e0: addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0106e8e4: 0x106e8e4: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106e8e8: 0x106e8e8: lw    s3, 17712(v0)
-	ldloc 7
+// 0x0106e6e0: 0x106e6e0: jal   0x10a8f68 addu  s3, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4428
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106e8ec: 0x106e8ec: addiu a0, sp, 16
+	stloc 13
 	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc.1
-// 0x0106e8f0: 0x106e8f0: addu  a1, s3, zero
-	ldloc 9
-	stloc.2
-// 0x0106e8f4: 0x106e8f4: jal   0x1001800 addiu a2, zero, 52
-	ldc.i4.s 52
-	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	call int32 Cibyl126::roadmap_download_settings_isDownloadTraffic_10a8f68(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e8fc: 0x106e8fc: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106e900: 0x106e900: lw    v1, 16(s3)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106e904: 0x106e904: lw    v0, 17716(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4429
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e908: 0x106e908: sll   zero, zero, 0
-// 0x0106e90c: 0x106e90c: subu  v1, v1, v0
-	ldloc 6
+// 0x0106e6e8: 0x106e6e8: jal   0x106b270 addu  s2, v0, zero
 	ldloc 5
-	sub
-	stloc 6
-// 0x0106e910: 0x106e910: slti  a0, v1, 101
-	ldloc 6
-	ldc.i4.s 101
-	clt
-	stloc.1
-// 0x0106e914: 0x106e914: bne   a0, zero, 0x106e924 sw    v1, 32(sp)
-	ldloc.1
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-	brtrue L_106e924
-// --- basic block ---
-// 0x0106e91c: 0x106e91c: addiu v1, zero, 100
-	ldc.i4.s 100
-	stloc 6
-// 0x0106e920: 0x106e920: sw    v1, 32(sp)
-	ldloc 7
+	stloc 12
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-L_106e924:
-// 0x0106e924: 0x106e924: lw    v1, 20(s3)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_AllowPing_106b270(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x0106e928: 0x106e928: sll   v0, v0, 4
-	ldloc 5
-	ldc.i4.4
-	shl
-	stloc 5
-// 0x0106e92c: 0x106e92c: addu  v0, v1, v0
-	ldloc 6
-	ldloc 5
-	add
 	stloc 5
-// 0x0106e930: 0x106e930: addiu a0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+// --- basic block ---
+// 0x0106e6f0: 0x106e6f0: addiu a0, s5, 14928
+	ldloc 8
+	ldc.i4 14928
 	add
 	stloc.1
-// 0x0106e934: 0x106e934: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x0106e938: 0x106e938: sw    a0, -19060(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldloc.1
-	stelem.i4
-// 0x0106e93c: 0x106e93c: sw    v0, 36(sp)
-	ldloc 7
+// 0x0106e6f4: 0x106e6f4: jal   0x100e358 addu  s1, v0, zero
+	ldloc 5
+	stloc 11
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106e6fc: 0x106e6fc: jal   0x108d74c addu  a0, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0106e940: 0x106e940: beq   s1, zero, 0x106e984 addu  a0, s0, zero
-	ldloc 10
-	ldloc 8
 	stloc.1
-	brfalse L_106e984
-// --- basic block ---
-// 0x0106e948: 0x106e948: jal   0x106e2c4 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_At_106e2c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::ERTVisabilityGroup_from_string_108d74c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e950: 0x106e950: beq   v0, zero, 0x106e968 lui   a1, 0x10000
+// 0x0106e704: 0x106e704: addu  s6, v0, zero
+	ldloc 5
+	stloc 9
+// 0x0106e708: 0x106e708: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0106e70c: 0x106e70c: bne   s6, v0, 0x106e740 lui   a1, 0x10000
+	ldloc 9
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_106e968
+	bne.un L_106e740
 // --- basic block ---
-// 0x0106e958: 0x106e958: jal   0x1001b48 addu  a0, s0, zero
+// 0x0106e714: 0x106e714: addiu a1, a1, 20776
+	ldloc.2
+	ldc.i4 20776
+	add
+	stloc.2
+// 0x0106e718: 0x106e718: jal   0x100e5d0 addiu a0, s5, 14928
 	ldloc 8
+	ldc.i4 14928
+	add
 	stloc.1
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e960: 0x106e960: j	 0x106e984 addu  a0, s0, v0
-	ldloc 8
-	ldloc 5
-	add
+// 0x0106e720: 0x106e720: jal   0x100ea60 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-	br L_106e984
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_106e968:
-// 0x0106e968: 0x106e968: lui   a3, 0x10000
+// 0x0106e728: 0x106e728: lui   a0, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x0106e96c: 0x106e96c: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106e970: 0x106e970: addiu a1, a1, 20732
+// 0x0106e72c: 0x106e72c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106e730: 0x106e730: addiu a0, a0, 23700
+	ldloc.1
+	ldc.i4 23700
+	add
+	stloc.1
+// 0x0106e734: 0x106e734: jal   0x104c158 addiu a1, a1, 23708
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 23708
 	add
 	stloc.2
-// 0x0106e974: 0x106e974: addiu a3, a3, 23520
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 23520
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106e73c: 0x106e73c: addiu s6, zero, 3
+	ldc.i4.3
+	stloc 9
+L_106e740:
+// 0x0106e740: 0x106e740: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0106e744: 0x106e744: jal   0x100e358 addiu a0, a0, 14944
+	ldloc.1
+	ldc.i4 14944
 	add
-	stloc 4
-// 0x0106e978: 0x106e978: jal   0x100449c addiu a2, zero, 2218
-	ldc.i4 2218
-	stloc.3
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e980: 0x106e980: addu  a0, s0, zero
-	ldloc 8
+// 0x0106e74c: 0x106e74c: jal   0x108d724 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-L_106e984:
-// 0x0106e984: 0x106e984: jal   0x106e518 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_GPSPath_106e518(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::ERTVisabilityReport_from_string_108d724(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e98c: 0x106e98c: bne   v0, zero, 0x106e9ac lui   a1, 0x10000
+// 0x0106e754: 0x106e754: jal   0x1026da4 addu  s5, v0, zero
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106e9ac
-// --- basic block ---
-// 0x0106e994: 0x106e994: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106e998: 0x106e998: addiu a1, a1, 20732
+	stloc 8
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106e99c: 0x106e99c: addiu a3, a3, 23616
+	ldloc.3
 	ldloc 4
-	ldc.i4 23616
-	add
-	stloc 4
-// 0x0106e9a0: 0x106e9a0: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106e9a4: 0x106e9a4: j	 0x106e9fc addiu a2, zero, 2224
-	ldc.i4 2224
-	stloc.3
-	br L_106e9fc
-// --- basic block ---
-L_106e9ac:
-// 0x0106e9ac: 0x106e9ac: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e9b4: 0x106e9b4: beq   s1, zero, 0x106ea20 addu  a0, s0, v0
-	ldloc 10
-	ldloc 8
-	ldloc 5
-	add
-	stloc.1
-	brfalse L_106ea20
-// --- basic block ---
-// 0x0106e9bc: 0x106e9bc: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0106e9c0: 0x106e9c0: lw    v0, -19060(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106e9c4: 0x106e9c4: sll   zero, zero, 0
-// 0x0106e9c8: 0x106e9c8: lw    v0, 4(v0)
-	ldloc 7
+// 0x0106e75c: 0x106e75c: beq   v0, zero, 0x106e840 addiu v0, zero, 2
 	ldloc 5
 	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
 	stloc 5
-// 0x0106e9cc: 0x106e9cc: sll   zero, zero, 0
-// 0x0106e9d0: 0x106e9d0: blez  v0, 0x106ea20 sll   zero, zero, 0
+	brfalse L_106e840
+// --- basic block ---
+// 0x0106e764: 0x106e764: bne   s6, v0, 0x106e7d4 sll   zero, zero, 0
+	ldloc 9
 	ldloc 5
-	ldc.i4.s 0
-	ble L_106ea20
+	bne.un L_106e7d4
 // --- basic block ---
-// 0x0106e9d8: 0x106e9d8: jal   0x106e590 sll   zero, zero, 0
+// 0x0106e76c: 0x106e76c: jal   0x1026a50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_NodePath_106e590(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106e9e0: 0x106e9e0: bne   v0, zero, 0x106ea14 lui   a1, 0x10000
+// 0x0106e774: 0x106e774: bne   v0, s6, 0x106e784 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106ea14
+	ldloc 9
+	bne.un L_106e784
 // --- basic block ---
-// 0x0106e9e8: 0x106e9e8: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106e9ec: 0x106e9ec: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106e9f0: 0x106e9f0: addiu a3, a3, 23696
-	ldloc 4
-	ldc.i4 23696
-	add
-	stloc 4
-// 0x0106e9f4: 0x106e9f4: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106e9f8: 0x106e9f8: addiu a2, zero, 2236
-	ldc.i4 2236
-	stloc.3
-L_106e9fc:
-// 0x0106e9fc: 0x106e9fc: jal   0x100449c sll   zero, zero, 0
+// 0x0106e77c: 0x106e77c: j	 0x106e79c addiu s6, zero, 6
+	ldc.i4.6
+	stloc 9
+	br L_106e79c
+// --- basic block ---
+L_106e784:
+// 0x0106e784: 0x106e784: jal   0x1026a50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ea04: 0x106ea04: jal   0x1067508 addiu a0, sp, 68
-	ldloc.0
-	ldc.i4.s 68
-	add
-	stloc.1
+// 0x0106e78c: 0x106e78c: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106e790: 0x106e790: bne   v0, v1, 0x106e79c sll   zero, zero, 0
+	ldloc 5
+	ldloc 6
+	bne.un L_106e79c
+// --- basic block ---
+// 0x0106e798: 0x106e798: addiu s6, zero, 18
+	ldc.i4.s 18
+	stloc 9
+L_106e79c:
+// 0x0106e79c: 0x106e79c: jal   0x10269f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ea0c: 0x106ea0c: j	 0x106ead0 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_106ead0
+// 0x0106e7a4: 0x106e7a4: addiu v1, zero, 2
+	ldc.i4.2
+	stloc 6
+// 0x0106e7a8: 0x106e7a8: bne   v0, v1, 0x106e7b8 sll   zero, zero, 0
+	ldloc 5
+	ldloc 6
+	bne.un L_106e7b8
 // --- basic block ---
-L_106ea14:
-// 0x0106ea14: 0x106ea14: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
+// 0x0106e7b0: 0x106e7b0: j	 0x106e7d0 ori   s6, s6, 8
+	ldloc 9
+	ldc.i4.8
+	or
+	stloc 9
+	br L_106e7d0
+// --- basic block ---
+L_106e7b8:
+// 0x0106e7b8: 0x106e7b8: jal   0x10269f0 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ea1c: 0x106ea1c: addu  a0, s0, v0
-	ldloc 8
+// 0x0106e7c0: 0x106e7c0: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106e7c4: 0x106e7c4: bne   v0, v1, 0x106e7d4 addiu v0, zero, 2
 	ldloc 5
-	add
-	stloc.1
-L_106ea20:
-// 0x0106ea20: 0x106ea20: jal   0x10907cc sw    a0, 2312(sp)
-	ldloc 7
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
-	shr.un
-	ldc.i4 578
-	add
-	ldloc.1
-	stelem.i4
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_10907cc()
 	stloc 5
+	bne.un L_106e7d4
 // --- basic block ---
-// 0x0106ea28: 0x106ea28: lw    a0, 2312(sp)
-	ldloc 7
-	ldloc.0
+// 0x0106e7cc: 0x106e7cc: ori   s6, s6, 32
+	ldloc 9
+	ldc.i4.s 32
+	or
+	stloc 9
+L_106e7d0:
+// 0x0106e7d0: 0x106e7d0: addiu v0, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4 578
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106ea2c: 0x106ea2c: bne   v0, zero, 0x106ea64 sll   zero, zero, 0
+	stloc 5
+L_106e7d4:
+// 0x0106e7d4: 0x106e7d4: bne   s5, v0, 0x106e840 sll   zero, zero, 0
+	ldloc 8
 	ldloc 5
-	brtrue L_106ea64
+	bne.un L_106e840
 // --- basic block ---
-// 0x0106ea34: 0x106ea34: jal   0x106e560 sll   zero, zero, 0
+// 0x0106e7dc: 0x106e7dc: jal   0x1026a50 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_ExternalPoiDisplayed_106e560(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ea3c: 0x106ea3c: bne   v0, zero, 0x106ea64 lui   a1, 0x10000
+// 0x0106e7e4: 0x106e7e4: bne   v0, s5, 0x106e7f4 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106ea64
+	ldloc 8
+	bne.un L_106e7f4
 // --- basic block ---
-// 0x0106ea44: 0x106ea44: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106ea48: 0x106ea48: addiu a1, a1, 20732
+// 0x0106e7ec: 0x106e7ec: j	 0x106e80c addiu s5, zero, 6
+	ldc.i4.6
+	stloc 8
+	br L_106e80c
+// --- basic block ---
+L_106e7f4:
+// 0x0106e7f4: 0x106e7f4: jal   0x1026a50 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106ea4c: 0x106ea4c: addiu a3, a3, 23776
+	ldloc.3
 	ldloc 4
-	ldc.i4 23776
-	add
-	stloc 4
-// 0x0106ea50: 0x106ea50: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106ea54: 0x106ea54: jal   0x100449c addiu a2, zero, 2247
-	ldc.i4 2247
-	stloc.3
+	call int32 Cibyl29::roadmap_facebook_get_show_name_1026a50(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106e7fc: 0x106e7fc: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106e800: 0x106e800: bne   v0, v1, 0x106e80c sll   zero, zero, 0
+	ldloc 5
+	ldloc 6
+	bne.un L_106e80c
+// --- basic block ---
+// 0x0106e808: 0x106e808: addiu s5, zero, 18
+	ldc.i4.s 18
+	stloc 8
+L_106e80c:
+// 0x0106e80c: 0x106e80c: jal   0x10269f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ea5c: 0x106ea5c: j	 0x106ead0 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_106ead0
+// 0x0106e814: 0x106e814: addiu v1, zero, 2
+	ldc.i4.2
+	stloc 6
+// 0x0106e818: 0x106e818: bne   v0, v1, 0x106e828 sll   zero, zero, 0
+	ldloc 5
+	ldloc 6
+	bne.un L_106e828
 // --- basic block ---
-L_106ea64:
-// 0x0106ea64: 0x106ea64: lb    v0, 0(s0)
+// 0x0106e820: 0x106e820: j	 0x106e840 ori   s5, s5, 8
 	ldloc 8
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x0106ea68: 0x106ea68: addiu s1, sp, 68
+	ldc.i4.8
+	or
+	stloc 8
+	br L_106e840
+// --- basic block ---
+L_106e828:
+// 0x0106e828: 0x106e828: jal   0x10269f0 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.s 68
-	add
-	stloc 10
-// 0x0106ea6c: 0x106ea6c: beq   v0, zero, 0x106ea9c lui   s3, 0x70000
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_facebook_get_show_picture_10269f0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106e830: 0x106e830: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106e834: 0x106e834: bne   v0, v1, 0x106e840 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 458752
-	stloc 9
-	brfalse L_106ea9c
+	ldloc 6
+	bne.un L_106e840
 // --- basic block ---
-// 0x0106ea74: 0x106ea74: addiu a0, s3, 17728
-	ldloc 9
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x0106ea78: 0x106ea78: addu  a1, s0, zero
+// 0x0106e83c: 0x106e83c: ori   s5, s5, 32
 	ldloc 8
-	stloc.2
-// 0x0106ea7c: 0x106ea7c: jal   0x1073a90 addu  a2, s2, zero
-	ldloc 11
-	stloc.3
+	ldc.i4.s 32
+	or
+	stloc 8
+L_106e840:
+// 0x0106e840: 0x106e840: jal   0x10a4f18 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_GeneralPacket_1073a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_general_settings_events_radius_10a4f18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ea84: 0x106ea84: addu  a0, s1, zero
-	ldloc 10
+// 0x0106e848: 0x106e848: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106e84c: 0x106e84c: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x0106e850: 0x106e850: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
 	stloc.1
-// 0x0106ea88: 0x106ea88: jal   0x1067508 sw    v0, 2312(sp)
+// 0x0106e854: 0x106e854: addu  a1, s6, zero
+	ldloc 9
+	stloc.2
+// 0x0106e858: 0x106e858: addu  a2, s5, zero
+	ldloc 8
+	stloc.3
+// 0x0106e85c: 0x106e85c: addiu a3, a3, 5932
+	ldloc 4
+	ldc.i4 5932
+	add
+	stloc 4
+// 0x0106e860: 0x106e860: sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 14
 	stelem.i4
+// 0x0106e864: 0x106e864: sw    s3, 20(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ea90: 0x106ea90: lw    v0, 2312(sp)
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 13
+	stelem.i4
+// 0x0106e868: 0x106e868: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106ea94: 0x106ea94: j	 0x106ead0 sll   zero, zero, 0
-	br L_106ead0
-// --- basic block ---
-L_106ea9c:
-// 0x0106ea9c: 0x106ea9c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106eaa0: 0x106eaa0: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106eaa4: 0x106eaa4: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+	ldloc 12
+	stelem.i4
+// 0x0106e86c: 0x106e86c: sw    s1, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.2
-// 0x0106eaa8: 0x106eaa8: addiu a3, a3, 23872
-	ldloc 4
-	ldc.i4 23872
+	ldloc 11
+	stelem.i4
+// 0x0106e870: 0x106e870: sw    v0, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106e874: 0x106e874: jal   0x107437c sw    s0, 36(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
 	add
-	stloc 4
-// 0x0106eaac: 0x106eaac: addiu a2, zero, 2263
-	ldc.i4 2263
-	stloc.3
-// 0x0106eab0: 0x106eab0: jal   0x100449c addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
+	ldloc 10
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_SetMyVisability_107437c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106eab8: 0x106eab8: jal   0x1067508 addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x0106e87c: 0x106e87c: beq   v0, zero, 0x106e890 addu  v1, zero, zero
+	ldloc 5
+	ldc.i4.s 0
 	stloc 6
-	stloc 5
+	brfalse L_106e890
 // --- basic block ---
-// 0x0106eac0: 0x106eac0: addiu s3, s3, 17728
-	ldloc 9
-	ldc.i4 17728
-	add
-	stloc 9
-// 0x0106eac4: 0x106eac4: addiu v0, zero, 23
-	ldc.i4.s 23
+// 0x0106e884: 0x106e884: lui   v0, 0x0
+	ldc.i4.s 0
 	stloc 5
-// 0x0106eac8: 0x106eac8: sw    v0, 28696(s3)
+// 0x0106e888: 0x106e888: sw    zero, 15044(v0)
 	ldloc 7
-	ldloc 9
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4 3761
 	add
-	ldloc 5
-	stelem.i4
-// 0x0106eacc: 0x106eacc: addu  v0, zero, zero
 	ldc.i4.s 0
+	stelem.i4
+// 0x0106e88c: 0x106e88c: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+L_106e890:
+// 0x0106e890: 0x106e890: lw    ra, 68(sp)
+// 0x0106e894: 0x106e894: addu  v0, v1, zero
+	ldloc 6
 	stloc 5
-L_106ead0:
-// 0x0106ead0: 0x106ead0: lw    ra, 2340(sp)
-// 0x0106ead4: 0x106ead4: lw    s3, 2336(sp)
+// 0x0106e898: 0x106e898: lw    s6, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 584
+	ldc.i4.s 16
 	add
 	ldelem.i4
 	stloc 9
-// 0x0106ead8: 0x106ead8: lw    s2, 2332(sp)
+// 0x0106e89c: 0x106e89c: lw    s5, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 583
+	ldc.i4.s 15
 	add
 	ldelem.i4
-	stloc 11
-// 0x0106eadc: 0x106eadc: lw    s1, 2328(sp)
+	stloc 8
+// 0x0106e8a0: 0x106e8a0: lw    s4, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 582
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 10
-// 0x0106eae0: 0x106eae0: lw    s0, 2324(sp)
+	stloc 14
+// 0x0106e8a4: 0x106e8a4: lw    s3, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 581
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106eae4: 0x106eae4: jr    ra addiu sp, sp, 2344
+	stloc 13
+// 0x0106e8a8: 0x106e8a8: lw    s2, 48(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4 2344
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 12
+// 0x0106e8ac: 0x106e8ac: lw    s1, 44(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106e8b0: 0x106e8b0: lw    s0, 40(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106e8b4: 0x106e8b4: jr    ra addiu sp, sp, 72
+	ldloc.0
+	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -4651,25 +4269,25 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 PerformVersionUpgrade_106eaec(int32,int32,int32,int32,int32)
+.method public static int32 OnSettingsChanged_VisabilityGroup_106e8bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  6 is register ra
+// local  7 is register ra
 // local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4681,91 +4299,82 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106eaec: 0x106eaec: addiu sp, sp, -24
+// 0x0106e8bc: 0x106e8bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0106eaf0: 0x106eaf0: addiu v0, zero, 3
-	ldc.i4.3
-	stloc 5
-// 0x0106eaf4: 0x106eaf4: bne   a0, v0, 0x106eb08 sw    ra, 20(sp)
-	ldloc.1
-	ldloc 5
-	bne.un L_106eb08
-// --- basic block ---
-// 0x0106eafc: 0x106eafc: lui   a0, 0xf0000
-	ldc.i4 983040
-	stloc.1
-// 0x0106eb00: 0x106eb00: jal   0x104f628 addiu a0, a0, -30019
-	ldloc.1
-	ldc.i4 -30019
-	add
-	stloc.1
-	ldloc.1
-	call int32 Cibyl59::roadmap_internet_open_browser_104f628(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0106e8c0: 0x106e8c0: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106e8c4: 0x106e8c4: lui   v0, 0x0
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-L_106eb08:
-// 0x0106eb08: 0x106eb08: lui   a0, 0xf0000
-	ldc.i4 983040
+// 0x0106e8c8: 0x106e8c8: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0106eb0c: 0x106eb0c: jal   0x108d0dc addiu a0, a0, -30056
-	ldloc.1
-	ldc.i4 -30056
+// 0x0106e8cc: 0x106e8cc: sw    ra, 20(sp)
+// 0x0106e8d0: 0x106e8d0: jal   0x106e68c sw    v1, 15044(v0)
+	ldloc 8
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 3761
 	add
-	stloc.1
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_SetMyVisability_106e68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106eb14: 0x106eb14: lw    ra, 20(sp)
-// 0x0106eb18: 0x106eb18: sll   zero, zero, 0
-// 0x0106eb1c: 0x106eb1c: jr    ra addiu sp, sp, 24
+// 0x0106e8d8: 0x106e8d8: lw    ra, 20(sp)
+// 0x0106e8dc: 0x106e8dc: sll   zero, zero, 0
+// 0x0106e8e0: 0x106e8e0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnMsgboxClosed_ShowSystemMessage_106eb24(int32,int32,int32,int32,int32)
+.method public static int32 SendMessage_At_106e8e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 t0,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local 11 is register t0
+// local  9 is register s0
+// local 10 is register s1
+// local  8 is register s2
 // local  0 is register sp
-// local  9 is register ra
+// local 12 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4775,318 +4384,601 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106eb24: 0x106eb24: addiu sp, sp, -88
-	ldloc.0
-	ldc.i4.s -88
-	add
-	stloc.0
-// 0x0106eb28: 0x106eb28: sw    ra, 84(sp)
-// 0x0106eb2c: 0x106eb2c: jal   0x108d1a0 sw    s0, 80(sp)
+// 0x0106e8e8: 0x106e8e8: addiu sp, sp, -80
+	ldloc.0
+	ldc.i4.s -80
+	add
+	stloc.0
+// 0x0106e8ec: 0x106e8ec: sw    s1, 68(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106e8f0: 0x106e8f0: sw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106e8f4: 0x106e8f4: sw    ra, 76(sp)
+// 0x0106e8f8: 0x106e8f8: sw    s2, 72(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106e8fc: 0x106e8fc: addu  s0, a1, zero
+	ldloc.2
+	stloc 9
+// 0x0106e900: 0x106e900: beq   a1, zero, 0x106e914 addu  s1, a0, zero
+	ldloc.2
+	ldloc.1
+	stloc 10
+	brfalse L_106e914
+// --- basic block ---
+// 0x0106e908: 0x106e908: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106e90c: 0x106e90c: jal   0x108b908 addiu a0, a0, 18472
+	ldloc.1
+	ldc.i4 18472
+	add
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl104::RTUsers_ResetUpdateFlag_108b908(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_106e914:
+// 0x0106e914: 0x106e914: addiu s2, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc 8
+// 0x0106e918: 0x106e918: addu  a0, s2, zero
+	ldloc 8
+	stloc.1
+// 0x0106e91c: 0x106e91c: addiu a1, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.2
+// 0x0106e920: 0x106e920: addiu a2, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
+	stloc.3
+// 0x0106e924: 0x106e924: jal   0x10b3610 addiu a3, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl133::editor_track_report_get_current_position_10b3610(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e92c: 0x106e92c: bne   v0, zero, 0x106ea64 lui   v0, 0x0
+	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brtrue L_106ea64
+// --- basic block ---
+// 0x0106e934: 0x106e934: jal   0x1030c18 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
+	stloc 5
+// --- basic block ---
+// 0x0106e93c: 0x106e93c: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+// 0x0106e940: 0x106e940: beq   v0, v1, 0x106e95c addu  s2, zero, zero
+	ldloc 5
+	ldloc 7
+	ldc.i4.s 0
+	stloc 8
+	beq  L_106e95c
+// --- basic block ---
+// 0x0106e948: 0x106e948: jal   0x1030c18 addiu s2, zero, 1
+	ldc.i4.1
+	stloc 8
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
+	stloc 5
+// --- basic block ---
+// 0x0106e950: 0x106e950: bne   v0, zero, 0x106e95c sll   zero, zero, 0
+	ldloc 5
+	brtrue L_106e95c
+// --- basic block ---
+// 0x0106e958: 0x106e958: addu  s2, zero, zero
+	ldc.i4.s 0
+	stloc 8
+L_106e95c:
+// 0x0106e95c: 0x106e95c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0106e960: 0x106e960: jal   0x101df60 addiu a0, a0, -31052
+	ldloc.1
+	ldc.i4 -31052
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106e968: 0x106e968: beq   v0, zero, 0x106e998 lui   v1, 0x2120000
+	ldloc 5
+	ldc.i4 34734080
+	stloc 7
+	brfalse L_106e998
+// --- basic block ---
+// 0x0106e970: 0x106e970: lw    a0, 0(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
-	add
+	ldelem.i4
+	stloc.1
+// 0x0106e974: 0x106e974: ori   v1, v1, 60730
 	ldloc 7
-	stelem.i4
-	call int32 Cibyl105::RTSystemMessageQueue_IsEmpty_108d1a0()
-	stloc 5
+	ldc.i4 60730
+	or
+	stloc 7
+// 0x0106e978: 0x106e978: bne   a0, v1, 0x106e990 lui   v1, 0x1e90000
+	ldloc.1
+	ldloc 7
+	ldc.i4 32047104
+	stloc 7
+	bne.un L_106e990
 // --- basic block ---
-// 0x0106eb34: 0x106eb34: bne   v0, zero, 0x106eb64 addiu s0, sp, 16
+// 0x0106e980: 0x106e980: lw    a0, 4(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
+	ldelem.i4
+	stloc.1
+// 0x0106e984: 0x106e984: ori   v1, v1, 58906
+	ldloc 7
+	ldc.i4 58906
+	or
 	stloc 7
-	brtrue L_106eb64
-// --- basic block ---
-// 0x0106eb3c: 0x106eb3c: jal   0x108d42c addu  a0, s0, zero
+// 0x0106e988: 0x106e988: beq   a0, v1, 0x106e99c lui   a0, 0x20000
+	ldloc.1
 	ldloc 7
+	ldc.i4 131072
+	stloc.1
+	beq  L_106e99c
+// --- basic block ---
+L_106e990:
+// 0x0106e990: 0x106e990: bne   s2, zero, 0x106e9ac sll   zero, zero, 0
+	ldloc 8
+	brtrue L_106e9ac
+// --- basic block ---
+L_106e998:
+// 0x0106e998: 0x106e998: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+L_106e99c:
+// 0x0106e99c: 0x106e99c: jal   0x101df60 addiu a0, a0, 7256
+	ldloc.1
+	ldc.i4 7256
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessageQueue_Pop_108d42c(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106eb44: 0x106eb44: beq   v0, zero, 0x106eb64 lui   a2, 0x1070000
+// 0x0106e9a4: 0x106e9a4: beq   v0, zero, 0x106ea30 lui   a1, 0x10000
 	ldloc 5
-	ldc.i4 17235968
-	stloc.3
-	brfalse L_106eb64
+	ldc.i4 65536
+	stloc.2
+	brfalse L_106ea30
 // --- basic block ---
-// 0x0106eb4c: 0x106eb4c: lw    a0, 28(sp)
+L_106e9ac:
+// 0x0106e9ac: 0x106e9ac: lui   a0, 0x2120000
+	ldc.i4 34734080
+	stloc.1
+// 0x0106e9b0: 0x106e9b0: lw    v1, 0(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
-	add
 	ldelem.i4
+	stloc 7
+// 0x0106e9b4: 0x106e9b4: ori   a0, a0, 60730
+	ldloc.1
+	ldc.i4 60730
+	or
+	stloc.1
+// 0x0106e9b8: 0x106e9b8: bne   v1, a0, 0x106e9d4 lui   t0, 0x0
+	ldloc 7
+	ldloc.1
+	ldc.i4.s 0
+	stloc 11
+	bne.un L_106e9d4
+// --- basic block ---
+// 0x0106e9c0: 0x106e9c0: lui   a0, 0x1e90000
+	ldc.i4 32047104
 	stloc.1
-// 0x0106eb50: 0x106eb50: lw    a1, 52(sp)
+// 0x0106e9c4: 0x106e9c4: lw    a1, 4(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.1
 	add
 	ldelem.i4
 	stloc.2
-// 0x0106eb54: 0x106eb54: jal   0x104c058 addiu a2, a2, -5340
-	ldloc.3
-	ldc.i4 -5340
-	add
-	stloc.3
-	ldloc.0
+// 0x0106e9c8: 0x106e9c8: ori   a0, a0, 58906
 	ldloc.1
+	ldc.i4 58906
+	or
+	stloc.1
+// 0x0106e9cc: 0x106e9cc: beq   a1, a0, 0x106ea30 lui   a1, 0x10000
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_cb_104c058(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	ldloc.1
+	ldc.i4 65536
+	stloc.2
+	beq  L_106ea30
 // --- basic block ---
-// 0x0106eb5c: 0x106eb5c: jal   0x108d2b8 addu  a0, s0, zero
-	ldloc 7
+L_106e9d4:
+// 0x0106e9d4: 0x106e9d4: lw    a0, 15068(t0)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldc.i4 3767
+	add
+	ldelem.i4
 	stloc.1
-	ldloc.0
+// 0x0106e9d8: 0x106e9d8: sll   zero, zero, 0
+// 0x0106e9dc: 0x106e9dc: beq   a0, zero, 0x106ea2c lui   a0, 0x70000
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl105::RTSystemMessage_Free_108d2b8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	ldc.i4 458752
+	stloc.1
+	brfalse L_106ea2c
 // --- basic block ---
-L_106eb64:
-// 0x0106eb64: 0x106eb64: lw    ra, 84(sp)
-// 0x0106eb68: 0x106eb68: lw    s0, 80(sp)
+// 0x0106e9e4: 0x106e9e4: lw    v0, 4(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106eb6c: 0x106eb6c: jr    ra addiu sp, sp, 88
+	stloc 5
+// 0x0106e9e8: 0x106e9e8: sll   zero, zero, 0
+// 0x0106e9ec: 0x106e9ec: sw    v0, 48(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 88
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ret
-}
-.method public static int32 Realtime_FullReset_106ec00(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+	stelem.i4
+// 0x0106e9f0: 0x106e9f0: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+// 0x0106e9f4: 0x106e9f4: addiu v0, v0, 5756
+	ldloc 5
+	ldc.i4 5756
+	add
+	stloc 5
+// 0x0106e9f8: 0x106e9f8: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106e9fc: 0x106e9fc: addiu a1, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc.2
+// 0x0106ea00: 0x106ea00: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0106ea04: 0x106ea04: addiu a3, zero, -1
+	ldc.i4.m1
 	stloc 4
+// 0x0106ea08: 0x106ea08: sw    zero, 15068(t0)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldc.i4 3767
+	add
 	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106ec00: 0x106ec00: addiu sp, sp, -24
+	stelem.i4
+// 0x0106ea0c: 0x106ea0c: sw    v1, 44(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc.0
-// 0x0106ec04: 0x106ec04: sw    s0, 16(sp)
+	ldloc 7
+	stelem.i4
+// 0x0106ea10: 0x106ea10: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x0106ec08: 0x106ec08: addu  s0, a0, zero
-	ldloc.1
-	stloc 8
-// 0x0106ec0c: 0x106ec0c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x0106ec10: 0x106ec10: sw    ra, 20(sp)
-// 0x0106ec14: 0x106ec14: jal   0x1085c38 addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x0106ea14: 0x106ea14: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.1
+	ldloc 5
+	stelem.i4
+// 0x0106ea18: 0x106ea18: sw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl100::RTConnectionInfo_FullReset_1085c38(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ec1c: 0x106ec1c: jal   0x106c928 sll   zero, zero, 0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106ea1c: 0x106ea1c: sw    zero, 52(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl81::Realtime_SessionDetailsInit_106c928(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106ea20: 0x106ea20: sw    zero, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106ea24: 0x106ea24: j	 0x106ea90 sw    zero, 60(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
+	add
+	ldc.i4.s 0
+	stelem.i4
+	br L_106ea90
 // --- basic block ---
-// 0x0106ec24: 0x106ec24: lui   a0, 0xf0000
-	ldc.i4 983040
-	stloc.1
-// 0x0106ec28: 0x106ec28: jal   0x108d0dc addiu a0, a0, -30056
-	ldloc.1
-	ldc.i4 -30056
+L_106ea2c:
+// 0x0106ea2c: 0x106ea2c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+L_106ea30:
+// 0x0106ea30: 0x106ea30: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106ea34: 0x106ea34: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
+	stloc.2
+// 0x0106ea38: 0x106ea38: addiu a3, a3, 23864
+	ldloc 4
+	ldc.i4 23864
+	add
+	stloc 4
+// 0x0106ea3c: 0x106ea3c: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x0106ea40: 0x106ea40: jal   0x100449c addiu a2, zero, 1629
+	ldc.i4 1629
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106ec30: 0x106ec30: lui   a0, 0x80000
-	ldc.i4 524288
+// 0x0106ea48: 0x106ea48: beq   s0, zero, 0x106ea98 addu  v0, zero, zero
+	ldloc 9
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_106ea98
+// --- basic block ---
+// 0x0106ea50: 0x106ea50: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x0106ec34: 0x106ec34: jal   0x108d0c0 addiu a0, a0, -19072
+// 0x0106ea54: 0x106ea54: jal   0x108b934 addiu a0, a0, 18472
 	ldloc.1
-	ldc.i4 -19072
+	ldc.i4 18472
 	add
 	stloc.1
 	ldloc.1
-	call void Cibyl105::StatusStatistics_Reset_108d0c0(int32)
-// --- basic block ---
-// 0x0106ec3c: 0x106ec3c: jal   0x1071ff4 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1071ff4(int32,int32,int32,int32,int32)
+	call int32 Cibyl104::RTUsers_RedoUpdateFlag_108b934(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106ec44: 0x106ec44: lui   v0, 0x70000
-	ldc.i4 458752
+// 0x0106ea5c: 0x106ea5c: j	 0x106ea98 addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-// 0x0106ec48: 0x106ec48: sw    zero, 17568(v0)
+	br L_106ea98
+// --- basic block ---
+L_106ea64:
+// 0x0106ea64: 0x106ea64: sw    zero, 15068(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4392
+	ldc.i4 3767
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0106ec4c: 0x106ec4c: lui   v0, 0x70000
+// 0x0106ea68: 0x106ea68: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106ea6c: 0x106ea6c: lui   a0, 0x70000
 	ldc.i4 458752
+	stloc.1
+// 0x0106ea70: 0x106ea70: addiu v0, v0, 5756
+	ldloc 5
+	ldc.i4 5756
+	add
 	stloc 5
-// 0x0106ec50: 0x106ec50: sw    zero, 17592(v0)
+// 0x0106ea74: 0x106ea74: lw    a2, 32(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4398
+	ldc.i4.8
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106ec54: 0x106ec54: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106ec58: 0x106ec58: beq   s0, zero, 0x106ec68 sw    zero, 17640(v0)
+	ldelem.i4
+	stloc.3
+// 0x0106ea78: 0x106ea78: lw    a3, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 4
+// 0x0106ea7c: 0x106ea7c: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106ea80: 0x106ea80: addu  a1, s2, zero
 	ldloc 8
+	stloc.2
+// 0x0106ea84: 0x106ea84: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 9
+	stelem.i4
+// 0x0106ea88: 0x106ea88: sw    v0, 20(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 5
+	stelem.i4
+// 0x0106ea8c: 0x106ea8c: sw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4.6
 	add
-	ldc.i4.s 0
+	ldloc 10
 	stelem.i4
-	brfalse L_106ec68
-// --- basic block ---
-// 0x0106ec60: 0x106ec60: jal   0x1021900 sll   zero, zero, 0
+L_106ea90:
+// 0x0106ea90: 0x106ea90: jal   0x10758a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RTNet_At_10758a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_106ec68:
-// 0x0106ec68: 0x106ec68: lw    ra, 20(sp)
-// 0x0106ec6c: 0x106ec6c: lw    s0, 16(sp)
+L_106ea98:
+// 0x0106ea98: 0x106ea98: lw    ra, 76(sp)
+// 0x0106ea9c: 0x106ea9c: lw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 18
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106ec70: 0x106ec70: jr    ra addiu sp, sp, 24
+// 0x0106eaa0: 0x106eaa0: lw    s1, 68(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106eaa4: 0x106eaa4: lw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
+	stloc 9
+// 0x0106eaa8: 0x106eaa8: jr    ra addiu sp, sp, 80
+	ldloc.0
+	ldc.i4.s 80
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -5096,27 +4988,26 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_Stop_106ec78(int32,int32,int32,int32,int32)
+.method public static int32 SendMessage_CreateNewRoads_106eab0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local  8 is register s1
+// local  8 is register s0
 // local  0 is register sp
-// local 10 is register ra
-// local  7 is register mem
+// local  9 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5126,46 +5017,22 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
 	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ec78: 0x106ec78: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106ec7c: 0x106ec7c: lw    v0, 17564(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106ec80: 0x106ec80: addiu sp, sp, -32
+// 0x0106eab0: 0x106eab0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106ec84: 0x106ec84: sw    s0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106ec88: 0x106ec88: sw    ra, 28(sp)
-// 0x0106ec8c: 0x106ec8c: sw    s1, 24(sp)
-	ldloc 7
+// 0x0106eab4: 0x106eab4: sw    s0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -5173,255 +5040,168 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0106ec90: 0x106ec90: beq   v0, zero, 0x106ed5c addu  s0, a0, zero
-	ldloc 5
-	ldloc.1
-	stloc 9
-	brfalse L_106ed5c
-// --- basic block ---
-// 0x0106ec98: 0x106ec98: jal   0x101f84c addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_flow_control_refresh_101f84c(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106eca0: 0x106eca0: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x0106eca4: 0x106eca4: jal   0x104fd00 addiu a0, a0, 3192
-	ldloc.1
-	ldc.i4 3192
-	add
-	stloc.1
-	ldloc.0
+// 0x0106eab8: 0x106eab8: addu  s0, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ecac: 0x106ecac: lui   s1, 0x70000
-	ldc.i4 458752
 	stloc 8
-// 0x0106ecb0: 0x106ecb0: lui   a0, 0x1070000
-	ldc.i4 17235968
+// 0x0106eabc: 0x106eabc: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0106ecb4: 0x106ecb4: addiu a0, a0, -9944
+// 0x0106eac0: 0x106eac0: sw    ra, 28(sp)
+// 0x0106eac4: 0x106eac4: jal   0x100f434 addiu a0, a0, 23936
 	ldloc.1
-	ldc.i4 -9944
+	ldc.i4 23936
 	add
 	stloc.1
-// 0x0106ecb8: 0x106ecb8: jal   0x104fd00 addiu s1, s1, 17728
-	ldloc 8
-	ldc.i4 17728
-	add
-	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_state_find_100f434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106ecc0: 0x106ecc0: lw    v0, 256(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 64
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106ecc4: 0x106ecc4: sll   zero, zero, 0
-// 0x0106ecc8: 0x106ecc8: beq   v0, zero, 0x106ed28 lui   v0, 0x80000
+// 0x0106eacc: 0x106eacc: bne   v0, zero, 0x106eaf4 lui   a1, 0x10000
 	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brfalse L_106ed28
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106eaf4
 // --- basic block ---
-// 0x0106ecd0: 0x106ecd0: lui   a0, 0xf0000
-	ldc.i4 983040
-	stloc.1
-// 0x0106ecd4: 0x106ecd4: jal   0x108d0dc addiu a0, a0, -30056
-	ldloc.1
-	ldc.i4 -30056
+// 0x0106ead4: 0x106ead4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106ead8: 0x106ead8: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106eadc: 0x106eadc: addiu a3, a3, 23948
+	ldloc 4
+	ldc.i4 23948
 	add
+	stloc 4
+// 0x0106eae0: 0x106eae0: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x0106eae4: 0x106eae4: jal   0x100449c addiu a2, zero, 1474
+	ldc.i4 1474
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106ecdc: 0x106ecdc: jal   0x1071ff4 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1071ff4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0106eaec: 0x106eaec: j	 0x106eb2c addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
+	br L_106eb2c
 // --- basic block ---
-// 0x0106ece4: 0x106ece4: jal   0x108d404 sll   zero, zero, 0
+L_106eaf4:
+// 0x0106eaf4: 0x106eaf4: jalr  v0 sll   zero, zero, 0
+	ldloc 5
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessageQueue_Empty_108d404(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106ecec: 0x106ecec: beq   s0, zero, 0x106ed28 lui   v0, 0x80000
-	ldloc 9
+// 0x0106eafc: 0x106eafc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-	brfalse L_106ed28
-// --- basic block ---
-// 0x0106ecf4: 0x106ecf4: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x0106ecf8: 0x106ecf8: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x0106ecfc: 0x106ecfc: jal   0x1075378 addiu a1, a1, 5004
-	ldloc.2
-	ldc.i4 5004
+// 0x0106eb00: 0x106eb00: lw    v0, -18596(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4649
 	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl88::RTNet_Logout_1075378(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0106ed04: 0x106ed04: bne   v0, zero, 0x106ed5c lui   a1, 0x10000
+// 0x0106eb04: 0x106eb04: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106eb08: 0x106eb08: lw    a3, 36(v0)
+	ldloc 6
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106ed5c
-// --- basic block ---
-// 0x0106ed0c: 0x106ed0c: lui   a3, 0x10000
-	ldc.i4 65536
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
 	stloc 4
-// 0x0106ed10: 0x106ed10: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x0106eb0c: 0x106eb0c: lw    a1, 28(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
+	ldelem.i4
 	stloc.2
-// 0x0106ed14: 0x106ed14: addiu a3, a3, 23944
-	ldloc 4
-	ldc.i4 23944
-	add
-	stloc 4
-// 0x0106ed18: 0x106ed18: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106ed1c: 0x106ed1c: jal   0x100449c addiu a2, zero, 750
-	ldc.i4 750
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ed24: 0x106ed24: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_106ed28:
-// 0x0106ed28: 0x106ed28: lw    v0, -19120(v0)
-	ldloc 7
+// 0x0106eb10: 0x106eb10: lw    a2, 32(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4780
+	ldc.i4.8
 	add
 	ldelem.i4
+	stloc.3
+// 0x0106eb14: 0x106eb14: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-// 0x0106ed2c: 0x106ed2c: sll   zero, zero, 0
-// 0x0106ed30: 0x106ed30: bne   v0, zero, 0x106ed48 sll   zero, zero, 0
+// 0x0106eb18: 0x106eb18: addiu v0, v0, 1328
 	ldloc 5
-	brtrue L_106ed48
-// --- basic block ---
-// 0x0106ed38: 0x106ed38: jal   0x106ec00 addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::Realtime_FullReset_106ec00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ed40: 0x106ed40: j	 0x106ed58 lui   v0, 0x70000
-	ldc.i4 458752
+	ldc.i4 1328
+	add
 	stloc 5
-	br L_106ed58
-// --- basic block ---
-L_106ed48:
-// 0x0106ed48: 0x106ed48: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106ed4c: 0x106ed4c: jal   0x1071f3c addiu a0, a0, -19120
+// 0x0106eb1c: 0x106eb1c: addiu a0, a0, 18192
 	ldloc.1
-	ldc.i4 -19120
+	ldc.i4 18192
 	add
 	stloc.1
+// 0x0106eb20: 0x106eb20: sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106eb24: 0x106eb24: jal   0x10755e4 sw    s0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_AbortTransaction_1071f3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RTNet_CreateNewRoads_10755e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106ed54: 0x106ed54: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-L_106ed58:
-// 0x0106ed58: 0x106ed58: sw    zero, 17564(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_106ed5c:
-// 0x0106ed5c: 0x106ed5c: lw    ra, 28(sp)
-// 0x0106ed60: 0x106ed60: lw    s1, 24(sp)
-	ldloc 7
+L_106eb2c:
+// 0x0106eb2c: 0x106eb2c: lw    ra, 28(sp)
+// 0x0106eb30: 0x106eb30: lw    s0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -5429,48 +5209,37 @@ L_106ed5c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106ed64: 0x106ed64: lw    s0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106ed68: 0x106ed68: jr    ra addiu sp, sp, 32
+// 0x0106eb34: 0x106eb34: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+.method public static int32 SendMessage_GPSPath_106eb3c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  7 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5479,321 +5248,348 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ed70: 0x106ed70: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106ed74: 0x106ed74: addiu v0, v0, 17728
-	ldloc 5
-	ldc.i4 17728
-	add
+// 0x0106eb3c: 0x106eb3c: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0106ed78: 0x106ed78: lw    v1, 28688(v0)
-	ldloc 7
+// 0x0106eb40: 0x106eb40: lw    v0, -18596(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4 -4649
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106ed7c: 0x106ed7c: addiu sp, sp, -64
+	stloc 5
+// 0x0106eb44: 0x106eb44: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -64
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106ed80: 0x106ed80: sw    a1, 28696(v0)
-	ldloc 7
+// 0x0106eb48: 0x106eb48: lw    a2, 20(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7174
+	ldc.i4.5
 	add
-	ldloc.2
-	stelem.i4
-// 0x0106ed84: 0x106ed84: addiu v0, zero, 2
+	ldelem.i4
+	stloc.3
+// 0x0106eb4c: 0x106eb4c: lw    a3, 16(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
-	stloc 5
-// 0x0106ed88: 0x106ed88: sw    ra, 60(sp)
-// 0x0106ed8c: 0x106ed8c: sw    s1, 56(sp)
-	ldloc 7
-	ldloc.0
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 4
+// 0x0106eb50: 0x106eb50: lw    a1, 12(a2)
+	ldloc 6
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.3
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106ed90: 0x106ed90: sw    s0, 52(sp)
-	ldloc 7
+	ldelem.i4
+	stloc.2
+// 0x0106eb54: 0x106eb54: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x0106eb58: 0x106eb58: sw    a0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.5
 	add
-	ldloc 8
+	ldloc.1
 	stelem.i4
-// 0x0106ed94: 0x106ed94: bne   v1, v0, 0x106edd0 sw    zero, 32(sp)
-	ldloc 6
+// 0x0106eb5c: 0x106eb5c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106eb60: 0x106eb60: addiu v0, v0, 1080
 	ldloc 5
-	ldloc 7
+	ldc.i4 1080
+	add
+	stloc 5
+// 0x0106eb64: 0x106eb64: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106eb68: 0x106eb68: sw    ra, 28(sp)
+// 0x0106eb6c: 0x106eb6c: jal   0x1075388 sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-	bne.un L_106edd0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RTNet_GPSPath_1075388(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x0106ed9c: 0x106ed9c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106eda0: 0x106eda0: jal   0x106d9ac lui   s0, 0x70000
+// 0x0106eb74: 0x106eb74: lw    ra, 28(sp)
+// 0x0106eb78: 0x106eb78: sll   zero, zero, 0
+// 0x0106eb7c: 0x106eb7c: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 SendMessage_ExternalPoiDisplayed_106eb84(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106eb84: 0x106eb84: addu  a2, a0, zero
+	ldloc.1
+	stloc.3
+// 0x0106eb88: 0x106eb88: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0106eb8c: 0x106eb8c: lui   a0, 0x70000
 	ldc.i4 458752
+	stloc.1
+// 0x0106eb90: 0x106eb90: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106eb94: 0x106eb94: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x0106eb98: 0x106eb98: sw    ra, 20(sp)
+// 0x0106eb9c: 0x106eb9c: jal   0x1074fc4 addiu a1, a1, 772
+	ldloc.2
+	ldc.i4 772
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl87::RTNet_ExternalPoiDisplayed_1074fc4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x0106eba4: 0x106eba4: lw    ra, 20(sp)
+// 0x0106eba8: 0x106eba8: sll   zero, zero, 0
+// 0x0106ebac: 0x106ebac: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 SendMessage_NodePath_106ebb4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl81::Realtime_ResetTransactionState_106d9ac(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106eda8: 0x106eda8: jal   0x1071ff4 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1071ff4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0106ebb4: 0x106ebb4: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// --- basic block ---
-// 0x0106edb0: 0x106edb0: lw    v0, 17724(s0)
-	ldloc 7
-	ldloc 8
+// 0x0106ebb8: 0x106ebb8: lw    v0, -18596(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4431
+	ldc.i4 -4649
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106edb4: 0x106edb4: sll   zero, zero, 0
-// 0x0106edb8: 0x106edb8: beq   v0, zero, 0x106f254 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106f254
-// --- basic block ---
-// 0x0106edc0: 0x106edc0: jalr  v0 sll   zero, zero, 0
-	ldloc 5
+// 0x0106ebbc: 0x106ebbc: addiu sp, sp, -40
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106edc8: 0x106edc8: j	 0x106f254 sw    zero, 17724(s0)
-	ldloc 7
-	ldloc 8
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0106ebc0: 0x106ebc0: lw    a2, 8(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4431
+	ldc.i4.2
 	add
-	ldc.i4.s 0
-	stelem.i4
-	br L_106f254
-// --- basic block ---
-L_106edd0:
-// 0x0106edd0: 0x106edd0: lui   s0, 0x70000
-	ldc.i4 458752
-	stloc 8
-// 0x0106edd4: 0x106edd4: jal   0x108b1e0 addiu a0, s0, 18008
-	ldloc 8
-	ldc.i4 18008
+	ldelem.i4
+	stloc.3
+// 0x0106ebc4: 0x106ebc4: lw    v1, 48(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
 	add
-	stloc.1
-	ldloc.1
-	call int32 Cibyl104::RTUsers_IsEmpty_108b1e0(int32)
-	stloc 5
-// --- basic block ---
-// 0x0106eddc: 0x106eddc: bne   v0, zero, 0x106ee1c lui   s1, 0x70000
+	ldelem.i4
+	stloc 7
+// 0x0106ebc8: 0x106ebc8: lw    a3, 4(v0)
+	ldloc 6
 	ldloc 5
-	ldc.i4 458752
-	stloc 9
-	brtrue L_106ee1c
-// --- basic block ---
-// 0x0106ede4: 0x106ede4: addiu a0, s0, 18008
-	ldloc 8
-	ldc.i4 18008
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc.1
-// 0x0106ede8: 0x106ede8: addiu a1, sp, 36
-	ldloc.0
-	ldc.i4.s 36
+	ldelem.i4
+	stloc 4
+// 0x0106ebcc: 0x106ebcc: lw    a1, 4(a2)
+	ldloc 6
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
+	ldelem.i4
 	stloc.2
-// 0x0106edec: 0x106edec: jal   0x108bc00 addiu a2, sp, 40
+// 0x0106ebd0: 0x106ebd0: sw    v1, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl104::RTUsers_RemoveUnupdatedUsers_108bc00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106edf4: 0x106edf4: lw    v0, 36(sp)
 	ldloc 7
-	ldloc.0
+	stelem.i4
+// 0x0106ebd4: 0x106ebd4: lw    v0, 44(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 11
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106edf8: 0x106edf8: sll   zero, zero, 0
-// 0x0106edfc: 0x106edfc: bne   v0, zero, 0x106ee14 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_106ee14
-// --- basic block ---
-// 0x0106ee04: 0x106ee04: lw    v0, 40(sp)
-	ldloc 7
+// 0x0106ebd8: 0x106ebd8: sw    a0, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106ee08: 0x106ee08: sll   zero, zero, 0
-// 0x0106ee0c: 0x106ee0c: beq   v0, zero, 0x106ee1c lui   s1, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 9
-	brfalse L_106ee1c
-// --- basic block ---
-L_106ee14:
-// 0x0106ee14: 0x106ee14: jal   0x1021900 lui   s1, 0x70000
-	ldc.i4 458752
-	stloc 9
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_106ee1c:
-// 0x0106ee1c: 0x106ee1c: jal   0x108b1e0 addiu a0, s1, 18008
-	ldloc 9
-	ldc.i4 18008
+	stelem.i4
+// 0x0106ebdc: 0x106ebdc: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
+	ldloc 5
+	stelem.i4
+// 0x0106ebe0: 0x106ebe0: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-	ldloc.1
-	call int32 Cibyl104::RTUsers_IsEmpty_108b1e0(int32)
+// 0x0106ebe4: 0x106ebe4: lui   v0, 0x1070000
+	ldc.i4 17235968
 	stloc 5
-// --- basic block ---
-// 0x0106ee24: 0x106ee24: beq   v0, zero, 0x106ee4c lui   s0, 0x10000
+// 0x0106ebe8: 0x106ebe8: addiu v0, v0, 932
 	ldloc 5
-	ldc.i4 65536
-	stloc 8
-	brfalse L_106ee4c
-// --- basic block ---
-// 0x0106ee2c: 0x106ee2c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106ee30: 0x106ee30: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+	ldc.i4 932
 	add
-	stloc.2
-// 0x0106ee34: 0x106ee34: addiu a3, a3, 23992
-	ldloc 4
-	ldc.i4 23992
-	add
-	stloc 4
-// 0x0106ee38: 0x106ee38: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106ee3c: 0x106ee3c: jal   0x100449c addiu a2, zero, 1062
-	ldc.i4 1062
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ee44: 0x106ee44: j	 0x106ee74 lui   v0, 0x80000
-	ldc.i4 524288
 	stloc 5
-	br L_106ee74
-// --- basic block ---
-L_106ee4c:
-// 0x0106ee4c: 0x106ee4c: jal   0x108b1d4 addiu a0, s1, 18008
-	ldloc 9
-	ldc.i4 18008
-	add
-	stloc.1
+// 0x0106ebec: 0x106ebec: addiu a0, a0, 18192
 	ldloc.1
-	call int32 Cibyl104::RTUsers_Count_108b1d4(int32)
-	stloc 5
-// --- basic block ---
-// 0x0106ee54: 0x106ee54: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106ee58: 0x106ee58: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106ee5c: 0x106ee5c: addiu a3, a3, 24040
-	ldloc 4
-	ldc.i4 24040
+	ldc.i4 18192
 	add
-	stloc 4
-// 0x0106ee60: 0x106ee60: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106ee64: 0x106ee64: addiu a2, zero, 1064
-	ldc.i4 1064
-	stloc.3
-// 0x0106ee68: 0x106ee68: jal   0x100449c sw    v0, 16(sp)
-	ldloc 7
+// 0x0106ebf0: 0x106ebf0: sw    ra, 36(sp)
+// 0x0106ebf4: 0x106ebf4: jal   0x1075118 sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldloc 5
 	stelem.i4
@@ -5802,585 +5598,650 @@ L_106ee4c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_NodePath_1075118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106ee70: 0x106ee70: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_106ee74:
-// 0x0106ee74: 0x106ee74: lw    a0, -19112(v0)
+// 0x0106ebfc: 0x106ebfc: lw    ra, 36(sp)
+// 0x0106ec00: 0x106ec00: sll   zero, zero, 0
+// 0x0106ec04: 0x106ec04: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4778
-	add
-	ldelem.i4
-	stloc.1
-// 0x0106ee78: 0x106ee78: sll   zero, zero, 0
-// 0x0106ee7c: 0x106ee7c: beq   a0, zero, 0x106eeb0 lui   v0, 0x80000
-	ldloc.1
-	ldc.i4 524288
+	ret
+}
+.method public static int32 SendAllMessagesTogether_SendPart2_106ee54(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s3,int32 s1,int32 s2,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local 10 is register s1
+// local 11 is register s2
+// local  9 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-	brfalse L_106eeb0
-// --- basic block ---
-// 0x0106ee84: 0x106ee84: jal   0x10ac36c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ee8c: 0x106ee8c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106ee90: 0x106ee90: lui   a3, 0x10000
-	ldc.i4 65536
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106ee94: 0x106ee94: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106ee54: 0x106ee54: addiu sp, sp, -2344
+	ldloc.0
+	ldc.i4 -2344
 	add
-	stloc.2
-// 0x0106ee98: 0x106ee98: addiu a3, a3, 24084
-	ldloc 4
-	ldc.i4 24084
+	stloc.0
+// 0x0106ee58: 0x106ee58: sw    ra, 2340(sp)
+// 0x0106ee5c: 0x106ee5c: sw    s3, 2336(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 584
 	add
-	stloc 4
-// 0x0106ee9c: 0x106ee9c: addiu a0, zero, 3
-	ldc.i4.3
-	stloc.1
-// 0x0106eea0: 0x106eea0: addiu a2, zero, 1068
-	ldc.i4 1068
-	stloc.3
-// 0x0106eea4: 0x106eea4: jal   0x100449c sw    v0, 16(sp)
+	ldloc 9
+	stelem.i4
+// 0x0106ee60: 0x106ee60: sw    s2, 2332(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 583
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
+// 0x0106ee64: 0x106ee64: sw    s1, 2328(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4 582
+	add
+	ldloc 10
+	stelem.i4
+// 0x0106ee68: 0x106ee68: sw    s0, 2324(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 581
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106ee6c: 0x106ee6c: lui   v1, 0x70000
+	ldc.i4 458752
 	stloc 6
+// 0x0106ee70: 0x106ee70: beq   a0, zero, 0x106ee8c lui   v0, 0x70000
+	ldloc.1
+	ldc.i4 458752
 	stloc 5
+	brfalse L_106ee8c
 // --- basic block ---
-// 0x0106eeac: 0x106eeac: lui   v0, 0x80000
+// 0x0106ee78: 0x106ee78: lui   a0, 0x80000
 	ldc.i4 524288
-	stloc 5
-L_106eeb0:
-// 0x0106eeb0: 0x106eeb0: lw    a0, -19112(v0)
+	stloc.1
+// 0x0106ee7c: 0x106ee7c: lw    a0, -18596(a0)
 	ldloc 7
-	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4778
+	ldc.i4 -4649
 	add
 	ldelem.i4
 	stloc.1
-// 0x0106eeb4: 0x106eeb4: sll   zero, zero, 0
-// 0x0106eeb8: 0x106eeb8: sltiu v0, a0, 24
-	ldloc.1
-	ldc.i4.s 24
-	clt.un
-	stloc 5
-// 0x0106eebc: 0x106eebc: bne   v0, zero, 0x106ef50 addiu v0, a0, -11
-	ldloc 5
-	ldloc.1
-	ldc.i4.s -11
+// 0x0106ee80: 0x106ee80: sw    zero, 18180(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 4545
 	add
-	stloc 5
-	brtrue L_106ef50
-// --- basic block ---
-// 0x0106eec4: 0x106eec4: sltiu v0, a0, 26
-	ldloc.1
-	ldc.i4.s 26
-	clt.un
-	stloc 5
-// 0x0106eec8: 0x106eec8: bne   v0, zero, 0x106eefc lui   v0, 0x0
-	ldloc 5
 	ldc.i4.s 0
-	stloc 5
-	brtrue L_106eefc
-// --- basic block ---
-// 0x0106eed0: 0x106eed0: addiu v0, zero, 27
-	ldc.i4.s 27
-	stloc 5
-// 0x0106eed4: 0x106eed4: bne   a0, v0, 0x106ef4c sll   zero, zero, 0
-	ldloc.1
-	ldloc 5
-	bne.un L_106ef4c
-// --- basic block ---
-// 0x0106eedc: 0x106eedc: jal   0x10ac36c addiu a0, zero, 27
-	ldc.i4.s 27
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106eee4: 0x106eee4: jal   0x103f75c addu  a0, v0, zero
+	stelem.i4
+// 0x0106ee84: 0x106ee84: j	 0x106eeb4 sw    a0, 18176(v0)
+	ldloc 7
 	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_error_103f75c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106eeec: 0x106eeec: jal   0x106ba8c addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 4544
+	add
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Realtime_ResetLoginState_106ba8c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106eef4: 0x106eef4: j	 0x106f03c lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-	br L_106f03c
+	stelem.i4
+	br L_106eeb4
 // --- basic block ---
-L_106eefc:
-// 0x0106eefc: 0x106eefc: lw    v0, 15060(v0)
+L_106ee8c:
+// 0x0106ee8c: 0x106ee8c: lw    v0, 18176(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3765
+	ldc.i4 4544
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106ef00: 0x106ef00: sll   zero, zero, 0
-// 0x0106ef04: 0x106ef04: beq   v0, zero, 0x106ef1c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106ef1c
-// --- basic block ---
-// 0x0106ef0c: 0x106ef0c: jal   0x10a04e4 sll   zero, zero, 0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl119::roadmap_login_new_existing_dlg_10a04e4(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ef14: 0x106ef14: j	 0x106f03c lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-	br L_106f03c
-// --- basic block ---
-L_106ef1c:
-// 0x0106ef1c: 0x106ef1c: jal   0x10a05c4 sll   zero, zero, 0
-	call int32 Cibyl120::roadmap_login_is_login_active_10a05c4()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ef24: 0x106ef24: bne   v0, zero, 0x106f038 lui   a0, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.1
-	brtrue L_106f038
-// --- basic block ---
-// 0x0106ef2c: 0x106ef2c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106ef30: 0x106ef30: addiu a0, a0, 24148
-	ldloc.1
-	ldc.i4 24148
+// 0x0106ee90: 0x106ee90: lw    a0, 18180(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 4545
 	add
+	ldelem.i4
 	stloc.1
-// 0x0106ef34: 0x106ef34: jal   0x104c148 addiu a1, a1, 24184
-	ldloc.2
-	ldc.i4 24184
+// 0x0106ee94: 0x106ee94: lw    a1, 16(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
+	ldelem.i4
 	stloc.2
-	ldloc.0
+// 0x0106ee98: 0x106ee98: sll   zero, zero, 0
+// 0x0106ee9c: 0x106ee9c: slt   a1, a0, a1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ef3c: 0x106ef3c: jal   0x10a12c0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
+	clt
+	stloc.2
+// 0x0106eea0: 0x106eea0: beq   a1, zero, 0x106f0f4 addu  v0, zero, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl120::roadmap_login_details_dialog_show_un_pw_10a12c0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106ef44: 0x106ef44: j	 0x106f03c lui   v0, 0x80000
-	ldc.i4 524288
+	ldc.i4.s 0
 	stloc 5
-	br L_106f03c
+	brfalse L_106f0f4
 // --- basic block ---
-L_106ef4c:
-// 0x0106ef4c: 0x106ef4c: addiu v0, a0, -11
+// 0x0106eea8: 0x106eea8: addiu a0, a0, 100
 	ldloc.1
-	ldc.i4.s -11
+	ldc.i4.s 100
 	add
-	stloc 5
-L_106ef50:
-// 0x0106ef50: 0x106ef50: sltiu v0, v0, 5
-	ldloc 5
-	ldc.i4.5
-	clt.un
-	stloc 5
-// 0x0106ef54: 0x106ef54: beq   v0, zero, 0x106eff4 lui   v0, 0x70000
-	ldloc 5
+	stloc.1
+// 0x0106eeac: 0x106eeac: sw    a0, 18180(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 4545
+	add
+	ldloc.1
+	stelem.i4
+// 0x0106eeb0: 0x106eeb0: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-	brfalse L_106eff4
-// --- basic block ---
-// 0x0106ef5c: 0x106ef5c: lw    v0, 17640(v0)
+L_106eeb4:
+// 0x0106eeb4: 0x106eeb4: lw    v1, 18176(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4 4544
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106ef60: 0x106ef60: sll   zero, zero, 0
-// 0x0106ef64: 0x106ef64: bne   v0, zero, 0x106efb0 lui   v0, 0x70000
-	ldloc 5
+	stloc 6
+// 0x0106eeb8: 0x106eeb8: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-	brtrue L_106efb0
-// --- basic block ---
-// 0x0106ef6c: 0x106ef6c: lw    v0, 17592(v0)
+// 0x0106eebc: 0x106eebc: lw    v0, 18180(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4398
+	ldc.i4 4545
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106ef70: 0x106ef70: sll   zero, zero, 0
-// 0x0106ef74: 0x106ef74: beq   v0, zero, 0x106efb0 lui   v0, 0x70000
+// 0x0106eec0: 0x106eec0: lw    v1, 16(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106eec4: 0x106eec4: addiu v0, v0, 100
 	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	brfalse L_106efb0
-// --- basic block ---
-// 0x0106ef7c: 0x106ef7c: addiu v0, zero, 14
-	ldc.i4.s 14
+	ldc.i4.s 100
+	add
 	stloc 5
-// 0x0106ef80: 0x106ef80: beq   a0, v0, 0x106efb0 lui   v0, 0x70000
-	ldloc.1
+// 0x0106eec8: 0x106eec8: slt   v0, v0, v1
 	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	beq  L_106efb0
-// --- basic block ---
-// 0x0106ef88: 0x106ef88: addiu v0, zero, 15
-	ldc.i4.s 15
+	ldloc 6
+	clt
 	stloc 5
-// 0x0106ef8c: 0x106ef8c: beq   a0, v0, 0x106efac sll   zero, zero, 0
-	ldloc.1
+// 0x0106eecc: 0x106eecc: beq   v0, zero, 0x106eee0 lui   s2, 0x1070000
 	ldloc 5
-	beq  L_106efac
+	ldc.i4 17235968
+	stloc 11
+	brfalse L_106eee0
+// --- basic block ---
+// 0x0106eed4: 0x106eed4: addiu s2, s2, -1096
+	ldloc 11
+	ldc.i4 -1096
+	add
+	stloc 11
+// 0x0106eed8: 0x106eed8: j	 0x106eeec addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 10
+	br L_106eeec
 // --- basic block ---
-// 0x0106ef94: 0x106ef94: jal   0x10ac36c sll   zero, zero, 0
+L_106eee0:
+// 0x0106eee0: 0x106eee0: lui   s2, 0x1070000
+	ldc.i4 17235968
+	stloc 11
+// 0x0106eee4: 0x106eee4: addiu s2, s2, 6480
+	ldloc 11
+	ldc.i4 6480
+	add
+	stloc 11
+// 0x0106eee8: 0x106eee8: addiu s1, zero, 1
+	ldc.i4.1
+	stloc 10
+L_106eeec:
+// 0x0106eeec: 0x106eeec: addiu s0, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc 8
+// 0x0106eef0: 0x106eef0: jal   0x10674f4 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106ef9c: 0x106ef9c: jal   0x103f75c addu  a0, v0, zero
-	ldloc 5
+// 0x0106eef8: 0x106eef8: addu  a0, s0, zero
+	ldloc 8
 	stloc.1
+// 0x0106eefc: 0x106eefc: jal   0x106756c addiu a1, zero, 10915
+	ldc.i4 10915
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_error_103f75c(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106efa4: 0x106efa4: j	 0x106f03c lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-	br L_106f03c
-// --- basic block ---
-L_106efac:
-// 0x0106efac: 0x106efac: lui   v0, 0x70000
+// 0x0106ef04: 0x106ef04: addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0106ef08: 0x106ef08: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-L_106efb0:
-// 0x0106efb0: 0x106efb0: lw    s0, 17592(v0)
+// 0x0106ef0c: 0x106ef0c: lw    s3, 18176(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4398
+	ldc.i4 4544
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106efb4: 0x106efb4: jal   0x10ac36c sltiu s0, s0, 1
-	ldloc 8
-	ldc.i4.1
-	clt.un
-	stloc 8
+	stloc 9
+// 0x0106ef10: 0x106ef10: addiu a0, sp, 16
 	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.1
+// 0x0106ef14: 0x106ef14: addu  a1, s3, zero
+	ldloc 9
+	stloc.2
+// 0x0106ef18: 0x106ef18: jal   0x1001800 addiu a2, zero, 52
+	ldc.i4.s 52
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106efbc: 0x106efbc: lui   v1, 0x70000
+// 0x0106ef20: 0x106ef20: lui   v0, 0x70000
 	ldc.i4 458752
+	stloc 5
+// 0x0106ef24: 0x106ef24: lw    v1, 16(s3)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
 	stloc 6
-// 0x0106efc0: 0x106efc0: lw    v1, 17640(v1)
+// 0x0106ef28: 0x106ef28: lw    v0, 18180(v0)
 	ldloc 7
-	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4 4545
 	add
 	ldelem.i4
+	stloc 5
+// 0x0106ef2c: 0x106ef2c: sll   zero, zero, 0
+// 0x0106ef30: 0x106ef30: subu  v1, v1, v0
+	ldloc 6
+	ldloc 5
+	sub
 	stloc 6
-// 0x0106efc4: 0x106efc4: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106efc8: 0x106efc8: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106efcc: 0x106efcc: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106efd0: 0x106efd0: addiu a3, a3, 24228
-	ldloc 4
-	ldc.i4 24228
-	add
-	stloc 4
-// 0x0106efd4: 0x106efd4: addiu a0, zero, 1
-	ldc.i4.1
+// 0x0106ef34: 0x106ef34: slti  a0, v1, 101
+	ldloc 6
+	ldc.i4.s 101
+	clt
 	stloc.1
-// 0x0106efd8: 0x106efd8: addiu a2, zero, 1109
-	ldc.i4 1109
-	stloc.3
-// 0x0106efdc: 0x106efdc: sw    s0, 16(sp)
+// 0x0106ef38: 0x106ef38: bne   a0, zero, 0x106ef48 sw    v1, 32(sp)
+	ldloc.1
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x0106efe0: 0x106efe0: sw    v0, 20(sp)
+	brtrue L_106ef48
+// --- basic block ---
+// 0x0106ef40: 0x106ef40: addiu v1, zero, 100
+	ldc.i4.s 100
+	stloc 6
+// 0x0106ef44: 0x106ef44: sw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.8
+	add
+	ldloc 6
+	stelem.i4
+L_106ef48:
+// 0x0106ef48: 0x106ef48: lw    v1, 20(s3)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
 	ldc.i4.5
 	add
+	ldelem.i4
+	stloc 6
+// 0x0106ef4c: 0x106ef4c: sll   v0, v0, 4
+	ldloc 5
+	ldc.i4.4
+	shl
+	stloc 5
+// 0x0106ef50: 0x106ef50: addu  v0, v1, v0
+	ldloc 6
 	ldloc 5
+	add
+	stloc 5
+// 0x0106ef54: 0x106ef54: addiu a0, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.1
+// 0x0106ef58: 0x106ef58: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x0106ef5c: 0x106ef5c: sw    a0, -18596(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4649
+	add
+	ldloc.1
 	stelem.i4
-// 0x0106efe4: 0x106efe4: jal   0x100449c sw    v1, 24(sp)
+// 0x0106ef60: 0x106ef60: sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
-	ldloc 6
+	ldloc 5
 	stelem.i4
+// 0x0106ef64: 0x106ef64: beq   s1, zero, 0x106efa8 addu  a0, s0, zero
+	ldloc 10
+	ldloc 8
+	stloc.1
+	brfalse L_106efa8
+// --- basic block ---
+// 0x0106ef6c: 0x106ef6c: jal   0x106e8e8 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_At_106e8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106efec: 0x106efec: j	 0x106f03c lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-	br L_106f03c
+// 0x0106ef74: 0x106ef74: beq   v0, zero, 0x106ef8c lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_106ef8c
 // --- basic block ---
-L_106eff4:
-// 0x0106eff4: 0x106eff4: beq   a0, zero, 0x106f010 addu  v1, zero, zero
+// 0x0106ef7c: 0x106ef7c: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
 	ldloc.1
-	ldc.i4.s 0
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	brfalse L_106f010
+	stloc 5
 // --- basic block ---
-// 0x0106effc: 0x106effc: jal   0x10ac36c sll   zero, zero, 0
+// 0x0106ef84: 0x106ef84: j	 0x106efa8 addu  a0, s0, v0
+	ldloc 8
+	ldloc 5
+	add
+	stloc.1
+	br L_106efa8
+// --- basic block ---
+L_106ef8c:
+// 0x0106ef8c: 0x106ef8c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106ef90: 0x106ef90: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106ef94: 0x106ef94: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106ef98: 0x106ef98: addiu a3, a3, 23984
+	ldloc 4
+	ldc.i4 23984
+	add
+	stloc 4
+// 0x0106ef9c: 0x106ef9c: jal   0x100449c addiu a2, zero, 2218
+	ldc.i4 2218
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::roadmap_result_string_10ac36c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f004: 0x106f004: jal   0x103f75c addu  a0, v0, zero
-	ldloc 5
+// 0x0106efa4: 0x106efa4: addu  a0, s0, zero
+	ldloc 8
 	stloc.1
+L_106efa8:
+// 0x0106efa8: 0x106efa8: jal   0x106eb3c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_net_mon_error_103f75c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_GPSPath_106eb3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f00c: 0x106f00c: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-L_106f010:
-// 0x0106f010: 0x106f010: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x0106f014: 0x106f014: cibyl_sysc 0x20fd
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x0106f018: 0x106f018: addu  v1, v0, zero
+// 0x0106efb0: 0x106efb0: bne   v0, zero, 0x106efd0 lui   a1, 0x10000
 	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106efd0
+// --- basic block ---
+// 0x0106efb8: 0x106efb8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106efbc: 0x106efbc: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106efc0: 0x106efc0: addiu a3, a3, 24080
+	ldloc 4
+	ldc.i4 24080
+	add
+	stloc 4
+// 0x0106efc4: 0x106efc4: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106efc8: 0x106efc8: j	 0x106f020 addiu a2, zero, 2224
+	ldc.i4 2224
+	stloc.3
+	br L_106f020
+// --- basic block ---
+L_106efd0:
+// 0x0106efd0: 0x106efd0: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x0106f01c: 0x106f01c: lui   v0, 0x70000
-	ldc.i4 458752
 	stloc 5
-// 0x0106f020: 0x106f020: lw    a0, 17592(v0)
-	ldloc 7
+// --- basic block ---
+// 0x0106efd8: 0x106efd8: beq   s1, zero, 0x106f044 addu  a0, s0, v0
+	ldloc 10
+	ldloc 8
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4398
 	add
-	ldelem.i4
 	stloc.1
-// 0x0106f024: 0x106f024: lui   a1, 0x80000
-	ldc.i4 524288
-	stloc.2
-// 0x0106f028: 0x106f028: bne   a0, zero, 0x106f038 sw    v1, -19072(a1)
-	ldloc.1
-	ldloc 7
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4768
-	add
-	ldloc 6
-	stelem.i4
-	brtrue L_106f038
+	brfalse L_106f044
 // --- basic block ---
-// 0x0106f030: 0x106f030: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106f034: 0x106f034: sw    v1, 17592(v0)
+// 0x0106efe0: 0x106efe0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0106efe4: 0x106efe4: lw    v0, -18596(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4398
+	ldc.i4 -4649
 	add
-	ldloc 6
-	stelem.i4
-L_106f038:
-// 0x0106f038: 0x106f038: lui   v0, 0x80000
-	ldc.i4 524288
+	ldelem.i4
 	stloc 5
-L_106f03c:
-// 0x0106f03c: 0x106f03c: lw    v1, -19112(v0)
+// 0x0106efe8: 0x106efe8: sll   zero, zero, 0
+// 0x0106efec: 0x106efec: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4778
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106f040: 0x106f040: addiu v0, zero, 15
-	ldc.i4.s 15
 	stloc 5
-// 0x0106f044: 0x106f044: bne   v1, v0, 0x106f080 lui   v0, 0x80000
-	ldloc 6
+// 0x0106eff0: 0x106eff0: sll   zero, zero, 0
+// 0x0106eff4: 0x106eff4: blez  v0, 0x106f044 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 524288
+	ldc.i4.s 0
+	ble L_106f044
+// --- basic block ---
+// 0x0106effc: 0x106effc: jal   0x106ebb4 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendMessage_NodePath_106ebb4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	bne.un L_106f080
 // --- basic block ---
-// 0x0106f04c: 0x106f04c: lui   a1, 0x10000
+// 0x0106f004: 0x106f004: bne   v0, zero, 0x106f038 lui   a1, 0x10000
+	ldloc 5
 	ldc.i4 65536
 	stloc.2
-// 0x0106f050: 0x106f050: lui   a3, 0x10000
+	brtrue L_106f038
+// --- basic block ---
+// 0x0106f00c: 0x106f00c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f054: 0x106f054: addiu a1, a1, 20732
+// 0x0106f010: 0x106f010: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f058: 0x106f058: addiu a3, a3, 24336
+// 0x0106f014: 0x106f014: addiu a3, a3, 24160
 	ldloc 4
-	ldc.i4 24336
+	ldc.i4 24160
 	add
 	stloc 4
-// 0x0106f05c: 0x106f05c: addiu a0, zero, 2
-	ldc.i4.2
+// 0x0106f018: 0x106f018: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0106f060: 0x106f060: jal   0x100449c addiu a2, zero, 1133
-	ldc.i4 1133
+// 0x0106f01c: 0x106f01c: addiu a2, zero, 2236
+	ldc.i4 2236
 	stloc.3
+L_106f020:
+// 0x0106f020: 0x106f020: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6391,172 +6252,102 @@ L_106f03c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f068: 0x106f068: jal   0x106ec78 addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0106f028: 0x106f028: jal   0x1067518 addiu a0, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::Realtime_Stop_106ec78(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f070: 0x106f070: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0106f074: 0x106f074: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106f078: 0x106f078: sw    v1, 17596(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4399
-	add
-	ldloc 6
-	stelem.i4
-// 0x0106f07c: 0x106f07c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_106f080:
-// 0x0106f080: 0x106f080: lw    v0, -19112(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4778
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106f084: 0x106f084: sll   zero, zero, 0
-// 0x0106f088: 0x106f088: addiu v1, v0, -11
-	ldloc 5
-	ldc.i4.s -11
-	add
-	stloc 6
-// 0x0106f08c: 0x106f08c: sltiu v1, v1, 5
-	ldloc 6
-	ldc.i4.5
-	clt.un
-	stloc 6
-// 0x0106f090: 0x106f090: bne   v1, zero, 0x106f0ac lui   s1, 0x80000
-	ldloc 6
-	ldc.i4 524288
-	stloc 9
-	brtrue L_106f0ac
-// --- basic block ---
-// 0x0106f098: 0x106f098: addiu v0, v0, -2
-	ldloc 5
-	ldc.i4.s -2
-	add
-	stloc 5
-// 0x0106f09c: 0x106f09c: sltiu v0, v0, 7
-	ldloc 5
-	ldc.i4.7
-	clt.un
-	stloc 5
-// 0x0106f0a0: 0x106f0a0: beq   v0, zero, 0x106f14c lui   v0, 0x70000
-	ldloc 5
-	ldc.i4 458752
+// 0x0106f030: 0x106f030: j	 0x106f0f4 addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-	brfalse L_106f14c
+	br L_106f0f4
 // --- basic block ---
-// 0x0106f0a8: 0x106f0a8: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 9
-L_106f0ac:
-// 0x0106f0ac: 0x106f0ac: addiu s1, s1, -19072
-	ldloc 9
-	ldc.i4 -19072
-	add
-	stloc 9
-// 0x0106f0b0: 0x106f0b0: lw    v1, 4(s1)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
+L_106f038:
+// 0x0106f038: 0x106f038: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x0106f0b4: 0x106f0b4: lw    v0, 8(s1)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
 	stloc 5
-// 0x0106f0b8: 0x106f0b8: addiu v1, v1, 1
-	ldloc 6
-	ldc.i4.1
-	add
-	stloc 6
-// 0x0106f0bc: 0x106f0bc: addiu v0, v0, 1
+// --- basic block ---
+// 0x0106f040: 0x106f040: addu  a0, s0, v0
+	ldloc 8
 	ldloc 5
-	ldc.i4.1
 	add
-	stloc 5
-// 0x0106f0c0: 0x106f0c0: sw    v1, 4(s1)
+	stloc.1
+L_106f044:
+// 0x0106f044: 0x106f044: jal   0x1090df0 sw    a0, 2312(sp)
 	ldloc 7
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 578
 	add
-	ldloc 6
+	ldloc.1
 	stelem.i4
-// 0x0106f0c4: 0x106f0c4: jal   0x106b250 sw    v0, 8(s1)
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_1090df0()
+	stloc 5
+// --- basic block ---
+// 0x0106f04c: 0x106f04c: lw    a0, 2312(sp)
 	ldloc 7
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4 578
 	add
+	ldelem.i4
+	stloc.1
+// 0x0106f050: 0x106f050: bne   v0, zero, 0x106f088 sll   zero, zero, 0
 	ldloc 5
-	stelem.i4
+	brtrue L_106f088
+// --- basic block ---
+// 0x0106f058: 0x106f058: jal   0x106eb84 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::ThereAreTooManyNetworkErrors_106b250(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_ExternalPoiDisplayed_106eb84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f0cc: 0x106f0cc: beq   v0, zero, 0x106f100 lui   s0, 0x70000
+// 0x0106f060: 0x106f060: bne   v0, zero, 0x106f088 lui   a1, 0x10000
 	ldloc 5
-	ldc.i4 458752
-	stloc 8
-	brfalse L_106f100
-// --- basic block ---
-// 0x0106f0d4: 0x106f0d4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106f0d8: 0x106f0d8: lui   a3, 0x10000
+	brtrue L_106f088
+// --- basic block ---
+// 0x0106f068: 0x106f068: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f0dc: 0x106f0dc: addiu a1, a1, 20732
+// 0x0106f06c: 0x106f06c: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f0e0: 0x106f0e0: addiu a3, a3, 24432
+// 0x0106f070: 0x106f070: addiu a3, a3, 24240
 	ldloc 4
-	ldc.i4 24432
+	ldc.i4 24240
 	add
 	stloc 4
-// 0x0106f0e4: 0x106f0e4: addiu a0, zero, 3
-	ldc.i4.3
+// 0x0106f074: 0x106f074: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0106f0e8: 0x106f0e8: jal   0x100449c addiu a2, zero, 1002
-	ldc.i4 1002
+// 0x0106f078: 0x106f078: jal   0x100449c addiu a2, zero, 2247
+	ldc.i4 2247
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -6568,84 +6359,105 @@ L_106f0ac:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f0f0: 0x106f0f0: jal   0x106ec78 addu  a0, zero, zero
+// 0x0106f080: 0x106f080: j	 0x106f0f4 addu  v0, zero, zero
 	ldc.i4.s 0
+	stloc 5
+	br L_106f0f4
+// --- basic block ---
+L_106f088:
+// 0x0106f088: 0x106f088: lb    v0, 0(s0)
+	ldloc 8
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0106f08c: 0x106f08c: addiu s1, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc 10
+// 0x0106f090: 0x106f090: beq   v0, zero, 0x106f0c0 lui   s3, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 9
+	brfalse L_106f0c0
+// --- basic block ---
+// 0x0106f098: 0x106f098: addiu a0, s3, 18192
+	ldloc 9
+	ldc.i4 18192
+	add
 	stloc.1
+// 0x0106f09c: 0x106f09c: addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+// 0x0106f0a0: 0x106f0a0: jal   0x10740b4 addu  a2, s2, zero
+	ldloc 11
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::Realtime_Stop_106ec78(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_GeneralPacket_10740b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f0f8: 0x106f0f8: j	 0x106f180 lui   v0, 0xf0000
-	ldc.i4 983040
-	stloc 5
-	br L_106f180
-// --- basic block ---
-L_106f100:
-// 0x0106f100: 0x106f100: lw    v0, 17640(s0)
+// 0x0106f0a8: 0x106f0a8: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x0106f0ac: 0x106f0ac: jal   0x1067518 sw    v0, 2312(sp)
 	ldloc 7
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4 578
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106f104: 0x106f104: sll   zero, zero, 0
-// 0x0106f108: 0x106f108: bne   v0, zero, 0x106f180 lui   v0, 0xf0000
 	ldloc 5
-	ldc.i4 983040
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	brtrue L_106f180
 // --- basic block ---
-// 0x0106f110: 0x106f110: lw    v0, 8(s1)
+// 0x0106f0b4: 0x106f0b4: lw    v0, 2312(sp)
 	ldloc 7
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4 578
 	add
 	ldelem.i4
 	stloc 5
-// 0x0106f114: 0x106f114: sll   zero, zero, 0
-// 0x0106f118: 0x106f118: slti  v0, v0, 4
-	ldloc 5
-	ldc.i4.4
-	clt
-	stloc 5
-// 0x0106f11c: 0x106f11c: bne   v0, zero, 0x106f180 lui   v0, 0xf0000
-	ldloc 5
-	ldc.i4 983040
-	stloc 5
-	brtrue L_106f180
+// 0x0106f0b8: 0x106f0b8: j	 0x106f0f4 sll   zero, zero, 0
+	br L_106f0f4
 // --- basic block ---
-// 0x0106f124: 0x106f124: lui   a1, 0x10000
+L_106f0c0:
+// 0x0106f0c0: 0x106f0c0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106f128: 0x106f128: lui   a3, 0x10000
+// 0x0106f0c4: 0x106f0c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f12c: 0x106f12c: addiu a1, a1, 20732
+// 0x0106f0c8: 0x106f0c8: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f130: 0x106f130: addiu a3, a3, 24540
+// 0x0106f0cc: 0x106f0cc: addiu a3, a3, 24336
 	ldloc 4
-	ldc.i4 24540
+	ldc.i4 24336
 	add
 	stloc 4
-// 0x0106f134: 0x106f134: addiu a0, zero, 2
-	ldc.i4.2
-	stloc.1
-// 0x0106f138: 0x106f138: jal   0x100449c addiu a2, zero, 1011
-	ldc.i4 1011
+// 0x0106f0d0: 0x106f0d0: addiu a2, zero, 2263
+	ldc.i4 2263
 	stloc.3
+// 0x0106f0d4: 0x106f0d4: jal   0x100449c addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6656,186 +6468,427 @@ L_106f100:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0106f140: 0x106f140: addiu v0, zero, 1
-	ldc.i4.1
+// 0x0106f0dc: 0x106f0dc: jal   0x1067518 addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f0e4: 0x106f0e4: addiu s3, s3, 18192
+	ldloc 9
+	ldc.i4 18192
+	add
+	stloc 9
+// 0x0106f0e8: 0x106f0e8: addiu v0, zero, 23
+	ldc.i4.s 23
 	stloc 5
-// 0x0106f144: 0x106f144: j	 0x106f17c sw    v0, 17640(s0)
+// 0x0106f0ec: 0x106f0ec: sw    v0, 28696(s3)
 	ldloc 7
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4 7174
 	add
 	ldloc 5
 	stelem.i4
-	br L_106f17c
-// --- basic block ---
-L_106f14c:
-// 0x0106f14c: 0x106f14c: lw    v1, 17640(v0)
+// 0x0106f0f0: 0x106f0f0: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_106f0f4:
+// 0x0106f0f4: 0x106f0f4: lw    ra, 2340(sp)
+// 0x0106f0f8: 0x106f0f8: lw    s3, 2336(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4 584
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106f150: 0x106f150: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x0106f154: 0x106f154: beq   v1, zero, 0x106f17c sw    zero, -19064(a0)
-	ldloc 6
+	stloc 9
+// 0x0106f0fc: 0x106f0fc: lw    s2, 2332(sp)
 	ldloc 7
-	ldloc.1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 583
+	add
+	ldelem.i4
+	stloc 11
+// 0x0106f100: 0x106f100: lw    s1, 2328(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 582
+	add
+	ldelem.i4
+	stloc 10
+// 0x0106f104: 0x106f104: lw    s0, 2324(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4766
+	ldc.i4 581
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106f108: 0x106f108: jr    ra addiu sp, sp, 2344
+	ldloc.0
+	ldc.i4 2344
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 PerformVersionUpgrade_106f110(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  8 is register mem
+
 	ldc.i4.s 0
-	stelem.i4
-	brfalse L_106f17c
-// --- basic block ---
-// 0x0106f15c: 0x106f15c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106f160: 0x106f160: lui   a3, 0x10000
-	ldc.i4 65536
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106f164: 0x106f164: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106f110: 0x106f110: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.2
-// 0x0106f168: 0x106f168: addiu a3, a3, 24604
-	ldloc 4
-	ldc.i4 24604
+	stloc.0
+// 0x0106f114: 0x106f114: addiu v0, zero, 3
+	ldc.i4.3
+	stloc 5
+// 0x0106f118: 0x106f118: bne   a0, v0, 0x106f12c sw    ra, 20(sp)
+	ldloc.1
+	ldloc 5
+	bne.un L_106f12c
+// --- basic block ---
+// 0x0106f120: 0x106f120: lui   a0, 0xf0000
+	ldc.i4 983040
+	stloc.1
+// 0x0106f124: 0x106f124: jal   0x104f638 addiu a0, a0, -29555
+	ldloc.1
+	ldc.i4 -29555
 	add
-	stloc 4
-// 0x0106f16c: 0x106f16c: addiu a0, zero, 2
-	ldc.i4.2
 	stloc.1
-// 0x0106f170: 0x106f170: addiu a2, zero, 1023
-	ldc.i4 1023
-	stloc.3
-// 0x0106f174: 0x106f174: jal   0x100449c sw    zero, 17640(v0)
+	ldloc.1
+	call int32 Cibyl59::roadmap_internet_open_browser_104f638(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_106f12c:
+// 0x0106f12c: 0x106f12c: lui   a0, 0xf0000
+	ldc.i4 983040
+	stloc.1
+// 0x0106f130: 0x106f130: jal   0x108d700 addiu a0, a0, -29592
+	ldloc.1
+	ldc.i4 -29592
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106f138: 0x106f138: lw    ra, 20(sp)
+// 0x0106f13c: 0x106f13c: sll   zero, zero, 0
+// 0x0106f140: 0x106f140: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	ret
+}
+.method public static int32 OnMsgboxClosed_ShowSystemMessage_106f148(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0106f148: 0x106f148: addiu sp, sp, -88
+	ldloc.0
+	ldc.i4.s -88
+	add
+	stloc.0
+// 0x0106f14c: 0x106f14c: sw    ra, 84(sp)
+// 0x0106f150: 0x106f150: jal   0x108d7c4 sw    s0, 80(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4.s 20
 	add
-	ldc.i4.s 0
+	ldloc 7
 	stelem.i4
+	call int32 Cibyl105::RTSystemMessageQueue_IsEmpty_108d7c4()
+	stloc 5
+// --- basic block ---
+// 0x0106f158: 0x106f158: bne   v0, zero, 0x106f188 addiu s0, sp, 16
+	ldloc 5
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc 7
+	brtrue L_106f188
+// --- basic block ---
+// 0x0106f160: 0x106f160: jal   0x108da50 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessageQueue_Pop_108da50(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-L_106f17c:
-// 0x0106f17c: 0x106f17c: lui   v0, 0xf0000
-	ldc.i4 983040
-	stloc 5
-L_106f180:
-// 0x0106f180: 0x106f180: lw    v0, -30056(v0)
-	ldloc 7
+// 0x0106f168: 0x106f168: beq   v0, zero, 0x106f188 lui   a2, 0x1070000
 	ldloc 5
+	ldc.i4 17235968
+	stloc.3
+	brfalse L_106f188
+// --- basic block ---
+// 0x0106f170: 0x106f170: lw    a0, 28(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7514
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106f184: 0x106f184: sll   zero, zero, 0
-// 0x0106f188: 0x106f188: beq   v0, zero, 0x106f198 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106f198
-// --- basic block ---
-// 0x0106f190: 0x106f190: jal   0x106b138 sll   zero, zero, 0
+	stloc.1
+// 0x0106f174: 0x106f174: lw    a1, 52(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldelem.i4
+	stloc.2
+// 0x0106f178: 0x106f178: jal   0x104c068 addiu a2, a2, -3768
+	ldloc.3
+	ldc.i4 -3768
+	add
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::UpgradeVersion_106b138(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_cb_104c068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-L_106f198:
-// 0x0106f198: 0x106f198: jal   0x106d9ac addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0106f180: 0x106f180: jal   0x108d8dc addu  a0, s0, zero
+	ldloc 7
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_ResetTransactionState_106d9ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessage_Free_108d8dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0106f1a0: 0x106f1a0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106f1a4: 0x106f1a4: lw    v0, 17568(v0)
-	ldloc 7
-	ldloc 5
+L_106f188:
+// 0x0106f188: 0x106f188: lw    ra, 84(sp)
+// 0x0106f18c: 0x106f18c: lw    s0, 80(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4392
+	ldc.i4.s 20
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106f1a8: 0x106f1a8: sll   zero, zero, 0
-// 0x0106f1ac: 0x106f1ac: beq   v0, zero, 0x106f1c4 sll   zero, zero, 0
+	stloc 7
+// 0x0106f190: 0x106f190: jr    ra addiu sp, sp, 88
+	ldloc.0
+	ldc.i4.s 88
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	brfalse L_106f1c4
+	ret
+}
+.method public static int32 Realtime_FullReset_106f224(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f1b4: 0x106f1b4: jal   0x106bf14 sll   zero, zero, 0
+// 0x0106f224: 0x106f224: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0106f228: 0x106f228: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106f22c: 0x106f22c: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x0106f230: 0x106f230: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0106f234: 0x106f234: sw    ra, 20(sp)
+// 0x0106f238: 0x106f238: jal   0x108625c addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::TestLoginDetails_106bf14(int32,int32,int32,int32,int32)
+	call int32 Cibyl100::RTConnectionInfo_FullReset_108625c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106f1bc: 0x106f1bc: j	 0x106f200 lui   v0, 0x80000
-	ldc.i4 524288
+	stloc 7
 	stloc 5
-	br L_106f200
 // --- basic block ---
-L_106f1c4:
-// 0x0106f1c4: 0x106f1c4: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106f1c8: 0x106f1c8: lw    v0, 17984(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4496
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106f1cc: 0x106f1cc: sll   zero, zero, 0
-// 0x0106f1d0: 0x106f1d0: beq   v0, zero, 0x106f1f8 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
+// 0x0106f240: 0x106f240: jal   0x106cf4c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl81::Realtime_SessionDetailsInit_106cf4c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	brfalse L_106f1f8
 // --- basic block ---
-// 0x0106f1d8: 0x106f1d8: jal   0x1071fc0 addiu a0, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x0106f248: 0x106f248: lui   a0, 0xf0000
+	ldc.i4 983040
+	stloc.1
+// 0x0106f24c: 0x106f24c: jal   0x108d700 addiu a0, a0, -29592
+	ldloc.1
+	ldc.i4 -29592
 	add
 	stloc.1
 	ldloc.0
@@ -6843,176 +6896,102 @@ L_106f1c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_TransactionQueue_ProcessSingleItem_1071fc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0106f1e0: 0x106f1e0: beq   v0, zero, 0x106f1f8 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brfalse L_106f1f8
-// --- basic block ---
-// 0x0106f1e8: 0x106f1e8: lw    v0, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106f1ec: 0x106f1ec: sll   zero, zero, 0
-// 0x0106f1f0: 0x106f1f0: bne   v0, zero, 0x106f200 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
+	stloc 7
 	stloc 5
-	brtrue L_106f200
 // --- basic block ---
-L_106f1f8:
-// 0x0106f1f8: 0x106f1f8: sw    zero, -19120(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4780
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0106f1fc: 0x106f1fc: lui   v0, 0x80000
+// 0x0106f254: 0x106f254: lui   a0, 0x80000
 	ldc.i4 524288
-	stloc 5
-L_106f200:
-// 0x0106f200: 0x106f200: lw    v0, -19120(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4780
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106f204: 0x106f204: sll   zero, zero, 0
-// 0x0106f208: 0x106f208: bne   v0, zero, 0x106f24c lui   s0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 8
-	brtrue L_106f24c
-// --- basic block ---
-// 0x0106f210: 0x106f210: lw    v0, 17724(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 4431
+	stloc.1
+// 0x0106f258: 0x106f258: jal   0x108d6e4 addiu a0, a0, -18608
+	ldloc.1
+	ldc.i4 -18608
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106f214: 0x106f214: sll   zero, zero, 0
-// 0x0106f218: 0x106f218: beq   v0, zero, 0x106f22c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_106f22c
+	stloc.1
+	ldloc.1
+	call void Cibyl105::StatusStatistics_Reset_108d6e4(int32)
 // --- basic block ---
-// 0x0106f220: 0x106f220: jalr  v0 sll   zero, zero, 0
-	ldloc 5
+// 0x0106f260: 0x106f260: jal   0x1072618 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1072618(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0106f228: 0x106f228: sw    zero, 17724(s0)
-	ldloc 7
-	ldloc 8
+// 0x0106f268: 0x106f268: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f26c: 0x106f26c: sw    zero, 18032(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4431
+	ldc.i4 4508
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_106f22c:
-// 0x0106f22c: 0x106f22c: lui   v0, 0x70000
+// 0x0106f270: 0x106f270: lui   v0, 0x70000
 	ldc.i4 458752
 	stloc 5
-// 0x0106f230: 0x106f230: lw    v0, 17984(v0)
-	ldloc 7
+// 0x0106f274: 0x106f274: sw    zero, 18056(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4496
+	ldc.i4 4514
 	add
-	ldelem.i4
+	ldc.i4.s 0
+	stelem.i4
+// 0x0106f278: 0x106f278: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x0106f234: 0x106f234: sll   zero, zero, 0
-// 0x0106f238: 0x106f238: beq   v0, zero, 0x106f24c lui   a1, 0x1070000
+// 0x0106f27c: 0x106f27c: beq   s0, zero, 0x106f28c sw    zero, 18104(v0)
+	ldloc 8
+	ldloc 6
 	ldloc 5
-	ldc.i4 17235968
-	stloc.2
-	brfalse L_106f24c
-// --- basic block ---
-// 0x0106f240: 0x106f240: addiu a1, a1, -16828
-	ldloc.2
-	ldc.i4 -16828
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
 	add
-	stloc.2
-// 0x0106f244: 0x106f244: jal   0x104fe98 addiu a0, zero, 10
-	ldc.i4.s 10
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.s 0
+	stelem.i4
+	brfalse L_106f28c
 // --- basic block ---
-L_106f24c:
-// 0x0106f24c: 0x106f24c: jal   0x102146c sll   zero, zero, 0
+// 0x0106f284: 0x106f284: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_106f254:
-// 0x0106f254: 0x106f254: lw    ra, 60(sp)
-// 0x0106f258: 0x106f258: lw    s1, 56(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106f25c: 0x106f25c: lw    s0, 52(sp)
-	ldloc 7
+L_106f28c:
+// 0x0106f28c: 0x106f28c: lw    ra, 20(sp)
+// 0x0106f290: 0x106f290: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.4
 	add
 	ldelem.i4
 	stloc 8
-// 0x0106f260: 0x106f260: jr    ra addiu sp, sp, 64
+// 0x0106f294: 0x106f294: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 64
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
diff --git a/converted/Cibyl83.j b/converted/Cibyl83.j
index 3be183b..d589b71 100644
--- a/converted/Cibyl83.j
+++ b/converted/Cibyl83.j
@@ -41,27 +41,27 @@
     IL_0006:  ret
   } // end of method Cibyl83::.ctor
 
-.method public static int32 OnAsyncOperationCompleted_ReportAbuse_106f268(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Stop_106f29c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
 
-// local  9 is register v0
-// local 10 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
+// local  9 is register s0
+// local  8 is register s1
 // local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
+// local 10 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldc.i4.s 0
-	stloc 10
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -71,96 +71,220 @@
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 6
+	stloc 9
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f268: 0x106f268: addiu sp, sp, -32
+// 0x0106f29c: 0x106f29c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f2a0: 0x106f2a0: lw    v0, 18028(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f2a4: 0x106f2a4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f26c: 0x106f26c: sw    s0, 20(sp)
-	ldloc 5
+// 0x0106f2a8: 0x106f2a8: sw    s0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 6
+	ldloc 9
 	stelem.i4
-// 0x0106f270: 0x106f270: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x0106f274: 0x106f274: sw    s1, 24(sp)
-	ldloc 5
+// 0x0106f2ac: 0x106f2ac: sw    ra, 28(sp)
+// 0x0106f2b0: 0x106f2b0: sw    s1, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 7
+	ldloc 8
 	stelem.i4
-// 0x0106f278: 0x106f278: sw    ra, 28(sp)
-// 0x0106f27c: 0x106f27c: addu  s1, a0, zero
+// 0x0106f2b4: 0x106f2b4: beq   v0, zero, 0x106f380 addu  s0, a0, zero
+	ldloc 5
 	ldloc.1
-	stloc 7
-// 0x0106f280: 0x106f280: bne   s0, zero, 0x106f2a0 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106f2a0
+	stloc 9
+	brfalse L_106f380
 // --- basic block ---
-// 0x0106f288: 0x106f288: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f28c: 0x106f28c: addiu a1, a1, 20732
+// 0x0106f2bc: 0x106f2bc: jal   0x101f85c addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.1
+	call int32 Cibyl23::roadmap_screen_subscribe_after_flow_control_refresh_101f85c(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f2c4: 0x106f2c4: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x0106f2c8: 0x106f2c8: jal   0x104fd10 addiu a0, a0, 4764
+	ldloc.1
+	ldc.i4 4764
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f2d0: 0x106f2d0: lui   s1, 0x70000
+	ldc.i4 458752
+	stloc 8
+// 0x0106f2d4: 0x106f2d4: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x0106f2d8: 0x106f2d8: addiu a0, a0, -8372
+	ldloc.1
+	ldc.i4 -8372
 	add
-	stloc.2
-// 0x0106f290: 0x106f290: addiu a3, a3, 24668
+	stloc.1
+// 0x0106f2dc: 0x106f2dc: jal   0x104fd10 addiu s1, s1, 18192
+	ldloc 8
+	ldc.i4 18192
+	add
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 24668
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f2e4: 0x106f2e4: lw    v0, 256(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 64
 	add
-	stloc 4
-// 0x0106f294: 0x106f294: addiu a0, zero, 1
-	ldc.i4.1
+	ldelem.i4
+	stloc 5
+// 0x0106f2e8: 0x106f2e8: sll   zero, zero, 0
+// 0x0106f2ec: 0x106f2ec: beq   v0, zero, 0x106f34c lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brfalse L_106f34c
+// --- basic block ---
+// 0x0106f2f4: 0x106f2f4: lui   a0, 0xf0000
+	ldc.i4 983040
 	stloc.1
-// 0x0106f298: 0x106f298: j	 0x106f2b4 addiu a2, zero, 4103
-	ldc.i4 4103
-	stloc.3
-	br L_106f2b4
+// 0x0106f2f8: 0x106f2f8: jal   0x108d700 addiu a0, a0, -29592
+	ldloc.1
+	ldc.i4 -29592
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f300: 0x106f300: jal   0x1072618 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1072618(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f308: 0x106f308: jal   0x108da28 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::RTSystemMessageQueue_Empty_108da28(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f310: 0x106f310: beq   s0, zero, 0x106f34c lui   v0, 0x80000
+	ldloc 9
+	ldc.i4 524288
+	stloc 5
+	brfalse L_106f34c
+// --- basic block ---
+// 0x0106f318: 0x106f318: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0106f31c: 0x106f31c: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x0106f320: 0x106f320: jal   0x107599c addiu a1, a1, 6576
+	ldloc.2
+	ldc.i4 6576
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RTNet_Logout_107599c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_106f2a0:
-// 0x0106f2a0: 0x106f2a0: lui   a3, 0x10000
+// 0x0106f328: 0x106f328: bne   v0, zero, 0x106f380 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106f380
+// --- basic block ---
+// 0x0106f330: 0x106f330: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f2a4: 0x106f2a4: addiu a1, a1, 20732
+// 0x0106f334: 0x106f334: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f2a8: 0x106f2a8: addiu a3, a3, 24720
+// 0x0106f338: 0x106f338: addiu a3, a3, 24408
 	ldloc 4
-	ldc.i4 24720
+	ldc.i4 24408
 	add
 	stloc 4
-// 0x0106f2ac: 0x106f2ac: addiu a0, zero, 4
+// 0x0106f33c: 0x106f33c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106f2b0: 0x106f2b0: addiu a2, zero, 4105
-	ldc.i4 4105
+// 0x0106f340: 0x106f340: jal   0x100449c addiu a2, zero, 750
+	ldc.i4 750
 	stloc.3
-L_106f2b4:
-// 0x0106f2b4: 0x106f2b4: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -168,77 +292,130 @@ L_106f2b4:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f2bc: 0x106f2bc: addu  a0, s1, zero
+// 0x0106f348: 0x106f348: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_106f34c:
+// 0x0106f34c: 0x106f34c: lw    v0, -18656(v0)
 	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4664
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f350: 0x106f350: sll   zero, zero, 0
+// 0x0106f354: 0x106f354: bne   v0, zero, 0x106f36c sll   zero, zero, 0
+	ldloc 5
+	brtrue L_106f36c
+// --- basic block ---
+// 0x0106f35c: 0x106f35c: jal   0x106f224 addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106f2c0: 0x106f2c0: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_FullReset_106f224(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f364: 0x106f364: j	 0x106f37c lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+	br L_106f37c
+// --- basic block ---
+L_106f36c:
+// 0x0106f36c: 0x106f36c: lui   a0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x0106f370: 0x106f370: jal   0x1072560 addiu a0, a0, -18656
+	ldloc.1
+	ldc.i4 -18656
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::RTNet_AbortTransaction_1072560(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f2c8: 0x106f2c8: lw    ra, 28(sp)
-// 0x0106f2cc: 0x106f2cc: lw    s1, 24(sp)
+// 0x0106f378: 0x106f378: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_106f37c:
+// 0x0106f37c: 0x106f37c: sw    zero, 18028(v0)
+	ldloc 7
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
+	add
+	ldc.i4.s 0
+	stelem.i4
+L_106f380:
+// 0x0106f380: 0x106f380: lw    ra, 28(sp)
+// 0x0106f384: 0x106f384: lw    s1, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f2d0: 0x106f2d0: lw    s0, 20(sp)
-	ldloc 5
+	stloc 8
+// 0x0106f388: 0x106f388: lw    s0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106f2d4: 0x106f2d4: jr    ra addiu sp, sp, 32
+	stloc 9
+// 0x0106f38c: 0x106f38c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_CollectBonus_106f2dc(int32,int32,int32,int32,int32)
+.method public static int32 OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
 
-// local  9 is register v0
-// local 10 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
+// local  8 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
+// local 10 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldc.i4.s 0
-	stloc 10
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -248,273 +425,323 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f2dc: 0x106f2dc: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
+// 0x0106f394: 0x106f394: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f398: 0x106f398: addiu v0, v0, 18192
+	ldloc 5
+	ldc.i4 18192
 	add
-	stloc.0
-// 0x0106f2e0: 0x106f2e0: sw    s0, 20(sp)
+	stloc 5
+// 0x0106f39c: 0x106f39c: lw    v1, 28688(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 7172
 	add
-	ldloc 6
-	stelem.i4
-// 0x0106f2e4: 0x106f2e4: addu  s0, a1, zero
-	ldloc.2
+	ldelem.i4
 	stloc 6
-// 0x0106f2e8: 0x106f2e8: sw    s1, 24(sp)
-	ldloc 5
+// 0x0106f3a0: 0x106f3a0: addiu sp, sp, -64
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	ldc.i4.s -64
 	add
+	stloc.0
+// 0x0106f3a4: 0x106f3a4: sw    a1, 28696(v0)
 	ldloc 7
-	stelem.i4
-// 0x0106f2ec: 0x106f2ec: sw    ra, 28(sp)
-// 0x0106f2f0: 0x106f2f0: addu  s1, a0, zero
-	ldloc.1
-	stloc 7
-// 0x0106f2f4: 0x106f2f4: bne   s0, zero, 0x106f314 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106f314
-// --- basic block ---
-// 0x0106f2fc: 0x106f2fc: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f300: 0x106f300: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106f304: 0x106f304: addiu a3, a3, 24772
-	ldloc 4
-	ldc.i4 24772
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 7174
 	add
-	stloc 4
-// 0x0106f308: 0x106f308: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106f30c: 0x106f30c: j	 0x106f328 addiu a2, zero, 4093
-	ldc.i4 4093
-	stloc.3
-	br L_106f328
-// --- basic block ---
-L_106f314:
-// 0x0106f314: 0x106f314: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f318: 0x106f318: addiu a1, a1, 20732
 	ldloc.2
-	ldc.i4 20732
+	stelem.i4
+// 0x0106f3a8: 0x106f3a8: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x0106f3ac: 0x106f3ac: sw    ra, 60(sp)
+// 0x0106f3b0: 0x106f3b0: sw    s1, 56(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
 	add
-	stloc.2
-// 0x0106f31c: 0x106f31c: addiu a3, a3, 24828
-	ldloc 4
-	ldc.i4 24828
+	ldloc 9
+	stelem.i4
+// 0x0106f3b4: 0x106f3b4: sw    s0, 52(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
 	add
-	stloc 4
-// 0x0106f320: 0x106f320: addiu a0, zero, 4
-	ldc.i4.4
+	ldloc 8
+	stelem.i4
+// 0x0106f3b8: 0x106f3b8: bne   v1, v0, 0x106f3f4 sw    zero, 32(sp)
+	ldloc 6
+	ldloc 5
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldc.i4.s 0
+	stelem.i4
+	bne.un L_106f3f4
+// --- basic block ---
+// 0x0106f3c0: 0x106f3c0: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106f324: 0x106f324: addiu a2, zero, 4095
-	ldc.i4 4095
-	stloc.3
-L_106f328:
-// 0x0106f328: 0x106f328: jal   0x100449c sll   zero, zero, 0
+// 0x0106f3c4: 0x106f3c4: jal   0x106dfd0 lui   s0, 0x70000
+	ldc.i4 458752
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_ResetTransactionState_106dfd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f330: 0x106f330: addu  a0, s1, zero
-	ldloc 7
-	stloc.1
-// 0x0106f334: 0x106f334: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
-	stloc.2
+// 0x0106f3cc: 0x106f3cc: jal   0x1072618 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::RTNet_TransactionQueue_Clear_1072618(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f33c: 0x106f33c: lw    ra, 28(sp)
-// 0x0106f340: 0x106f340: lw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
+// 0x0106f3d4: 0x106f3d4: lw    v0, 18188(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 4547
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f344: 0x106f344: lw    s0, 20(sp)
+	stloc 5
+// 0x0106f3d8: 0x106f3d8: sll   zero, zero, 0
+// 0x0106f3dc: 0x106f3dc: beq   v0, zero, 0x106f878 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106f878
+// --- basic block ---
+// 0x0106f3e4: 0x106f3e4: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f3ec: 0x106f3ec: j	 0x106f878 sw    zero, 18188(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106f348: 0x106f348: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+	ldc.i4 4547
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 10
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_SelectRoute_106f350(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
-
-// local  9 is register v0
-// local 10 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
+	stelem.i4
+	br L_106f878
+// --- basic block ---
+L_106f3f4:
+// 0x0106f3f4: 0x106f3f4: lui   s0, 0x70000
+	ldc.i4 458752
 	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x0106f3f8: 0x106f3f8: jal   0x108b804 addiu a0, s0, 18472
+	ldloc 8
+	ldc.i4 18472
+	add
+	stloc.1
+	ldloc.1
+	call int32 Cibyl104::RTUsers_IsEmpty_108b804(int32)
 	stloc 5
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f350: 0x106f350: addiu sp, sp, -32
+// 0x0106f400: 0x106f400: bne   v0, zero, 0x106f440 lui   s1, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 9
+	brtrue L_106f440
+// --- basic block ---
+// 0x0106f408: 0x106f408: addiu a0, s0, 18472
+	ldloc 8
+	ldc.i4 18472
+	add
+	stloc.1
+// 0x0106f40c: 0x106f40c: addiu a1, sp, 36
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s 36
 	add
-	stloc.0
-// 0x0106f354: 0x106f354: sw    s0, 20(sp)
-	ldloc 5
+	stloc.2
+// 0x0106f410: 0x106f410: jal   0x108c224 addiu a2, sp, 40
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4.s 40
 	add
-	ldloc 6
-	stelem.i4
-// 0x0106f358: 0x106f358: addu  s0, a1, zero
+	stloc.3
+	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl104::RTUsers_RemoveUnupdatedUsers_108c224(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x0106f35c: 0x106f35c: sw    s1, 24(sp)
-	ldloc 5
+	stloc 5
+// --- basic block ---
+// 0x0106f418: 0x106f418: lw    v0, 36(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
+	ldelem.i4
+	stloc 5
+// 0x0106f41c: 0x106f41c: sll   zero, zero, 0
+// 0x0106f420: 0x106f420: bne   v0, zero, 0x106f438 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_106f438
+// --- basic block ---
+// 0x0106f428: 0x106f428: lw    v0, 40(sp)
 	ldloc 7
-	stelem.i4
-// 0x0106f360: 0x106f360: sw    ra, 28(sp)
-// 0x0106f364: 0x106f364: addu  s1, a0, zero
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f42c: 0x106f42c: sll   zero, zero, 0
+// 0x0106f430: 0x106f430: beq   v0, zero, 0x106f440 lui   s1, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 9
+	brfalse L_106f440
+// --- basic block ---
+L_106f438:
+// 0x0106f438: 0x106f438: jal   0x1021910 lui   s1, 0x70000
+	ldc.i4 458752
+	stloc 9
+	ldloc.0
 	ldloc.1
-	stloc 7
-// 0x0106f368: 0x106f368: bne   s0, zero, 0x106f388 lui   a1, 0x10000
-	ldloc 6
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_106f440:
+// 0x0106f440: 0x106f440: jal   0x108b804 addiu a0, s1, 18472
+	ldloc 9
+	ldc.i4 18472
+	add
+	stloc.1
+	ldloc.1
+	call int32 Cibyl104::RTUsers_IsEmpty_108b804(int32)
+	stloc 5
+// --- basic block ---
+// 0x0106f448: 0x106f448: beq   v0, zero, 0x106f470 lui   s0, 0x10000
+	ldloc 5
 	ldc.i4 65536
-	stloc.2
-	brtrue L_106f388
+	stloc 8
+	brfalse L_106f470
 // --- basic block ---
-// 0x0106f370: 0x106f370: lui   a3, 0x10000
+// 0x0106f450: 0x106f450: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f374: 0x106f374: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x0106f454: 0x106f454: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f378: 0x106f378: addiu a3, a3, 24880
+// 0x0106f458: 0x106f458: addiu a3, a3, 24456
 	ldloc 4
-	ldc.i4 24880
+	ldc.i4 24456
 	add
 	stloc 4
-// 0x0106f37c: 0x106f37c: addiu a0, zero, 1
+// 0x0106f45c: 0x106f45c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106f380: 0x106f380: j	 0x106f39c addiu a2, zero, 4083
-	ldc.i4 4083
+// 0x0106f460: 0x106f460: jal   0x100449c addiu a2, zero, 1062
+	ldc.i4 1062
 	stloc.3
-	br L_106f39c
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f468: 0x106f468: j	 0x106f498 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106f498
 // --- basic block ---
-L_106f388:
-// 0x0106f388: 0x106f388: lui   a3, 0x10000
+L_106f470:
+// 0x0106f470: 0x106f470: jal   0x108b7f8 addiu a0, s1, 18472
+	ldloc 9
+	ldc.i4 18472
+	add
+	stloc.1
+	ldloc.1
+	call int32 Cibyl104::RTUsers_Count_108b7f8(int32)
+	stloc 5
+// --- basic block ---
+// 0x0106f478: 0x106f478: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f38c: 0x106f38c: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x0106f47c: 0x106f47c: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f390: 0x106f390: addiu a3, a3, 24932
+// 0x0106f480: 0x106f480: addiu a3, a3, 24504
 	ldloc 4
-	ldc.i4 24932
+	ldc.i4 24504
 	add
 	stloc 4
-// 0x0106f394: 0x106f394: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106f484: 0x106f484: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106f398: 0x106f398: addiu a2, zero, 4085
-	ldc.i4 4085
+// 0x0106f488: 0x106f488: addiu a2, zero, 1064
+	ldc.i4 1064
 	stloc.3
-L_106f39c:
-// 0x0106f39c: 0x106f39c: jal   0x100449c sll   zero, zero, 0
+// 0x0106f48c: 0x106f48c: jal   0x100449c sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -522,234 +749,1220 @@ L_106f39c:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f3a4: 0x106f3a4: addu  a0, s1, zero
+// 0x0106f494: 0x106f494: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_106f498:
+// 0x0106f498: 0x106f498: lw    a0, -18648(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4662
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106f49c: 0x106f49c: sll   zero, zero, 0
+// 0x0106f4a0: 0x106f4a0: beq   a0, zero, 0x106f4d4 lui   v0, 0x80000
+	ldloc.1
+	ldc.i4 524288
+	stloc 5
+	brfalse L_106f4d4
+// --- basic block ---
+// 0x0106f4a8: 0x106f4a8: jal   0x10ac9b4 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f4b0: 0x106f4b0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106f4b4: 0x106f4b4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106f4b8: 0x106f4b8: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106f4bc: 0x106f4bc: addiu a3, a3, 24548
+	ldloc 4
+	ldc.i4 24548
+	add
+	stloc 4
+// 0x0106f4c0: 0x106f4c0: addiu a0, zero, 3
+	ldc.i4.3
+	stloc.1
+// 0x0106f4c4: 0x106f4c4: addiu a2, zero, 1068
+	ldc.i4 1068
+	stloc.3
+// 0x0106f4c8: 0x106f4c8: jal   0x100449c sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f4d0: 0x106f4d0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_106f4d4:
+// 0x0106f4d4: 0x106f4d4: lw    a0, -18648(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4662
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106f4d8: 0x106f4d8: sll   zero, zero, 0
+// 0x0106f4dc: 0x106f4dc: sltiu v0, a0, 24
+	ldloc.1
+	ldc.i4.s 24
+	clt.un
+	stloc 5
+// 0x0106f4e0: 0x106f4e0: bne   v0, zero, 0x106f574 addiu v0, a0, -11
+	ldloc 5
+	ldloc.1
+	ldc.i4.s -11
+	add
+	stloc 5
+	brtrue L_106f574
+// --- basic block ---
+// 0x0106f4e8: 0x106f4e8: sltiu v0, a0, 26
+	ldloc.1
+	ldc.i4.s 26
+	clt.un
+	stloc 5
+// 0x0106f4ec: 0x106f4ec: bne   v0, zero, 0x106f520 lui   v0, 0x0
+	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brtrue L_106f520
+// --- basic block ---
+// 0x0106f4f4: 0x106f4f4: addiu v0, zero, 27
+	ldc.i4.s 27
+	stloc 5
+// 0x0106f4f8: 0x106f4f8: bne   a0, v0, 0x106f570 sll   zero, zero, 0
+	ldloc.1
+	ldloc 5
+	bne.un L_106f570
+// --- basic block ---
+// 0x0106f500: 0x106f500: jal   0x10ac9b4 addiu a0, zero, 27
+	ldc.i4.s 27
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f508: 0x106f508: jal   0x103f76c addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl47::roadmap_net_mon_error_103f76c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f510: 0x106f510: jal   0x106c0b0 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_ResetLoginState_106c0b0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f518: 0x106f518: j	 0x106f660 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106f660
+// --- basic block ---
+L_106f520:
+// 0x0106f520: 0x106f520: lw    v0, 15060(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 3765
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f524: 0x106f524: sll   zero, zero, 0
+// 0x0106f528: 0x106f528: beq   v0, zero, 0x106f540 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106f540
+// --- basic block ---
+// 0x0106f530: 0x106f530: jal   0x10a0b2c sll   zero, zero, 0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl119::roadmap_login_new_existing_dlg_10a0b2c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f538: 0x106f538: j	 0x106f660 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106f660
+// --- basic block ---
+L_106f540:
+// 0x0106f540: 0x106f540: jal   0x10a0c0c sll   zero, zero, 0
+	call int32 Cibyl120::roadmap_login_is_login_active_10a0c0c()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f548: 0x106f548: bne   v0, zero, 0x106f65c lui   a0, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.1
+	brtrue L_106f65c
+// --- basic block ---
+// 0x0106f550: 0x106f550: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106f554: 0x106f554: addiu a0, a0, 24612
+	ldloc.1
+	ldc.i4 24612
+	add
+	stloc.1
+// 0x0106f558: 0x106f558: jal   0x104c158 addiu a1, a1, 24648
+	ldloc.2
+	ldc.i4 24648
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f560: 0x106f560: jal   0x10a1908 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl120::roadmap_login_details_dialog_show_un_pw_10a1908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f568: 0x106f568: j	 0x106f660 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106f660
+// --- basic block ---
+L_106f570:
+// 0x0106f570: 0x106f570: addiu v0, a0, -11
+	ldloc.1
+	ldc.i4.s -11
+	add
+	stloc 5
+L_106f574:
+// 0x0106f574: 0x106f574: sltiu v0, v0, 5
+	ldloc 5
+	ldc.i4.5
+	clt.un
+	stloc 5
+// 0x0106f578: 0x106f578: beq   v0, zero, 0x106f618 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brfalse L_106f618
+// --- basic block ---
+// 0x0106f580: 0x106f580: lw    v0, 18104(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f584: 0x106f584: sll   zero, zero, 0
+// 0x0106f588: 0x106f588: bne   v0, zero, 0x106f5d4 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brtrue L_106f5d4
+// --- basic block ---
+// 0x0106f590: 0x106f590: lw    v0, 18056(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4514
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f594: 0x106f594: sll   zero, zero, 0
+// 0x0106f598: 0x106f598: beq   v0, zero, 0x106f5d4 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brfalse L_106f5d4
+// --- basic block ---
+// 0x0106f5a0: 0x106f5a0: addiu v0, zero, 14
+	ldc.i4.s 14
+	stloc 5
+// 0x0106f5a4: 0x106f5a4: beq   a0, v0, 0x106f5d4 lui   v0, 0x70000
+	ldloc.1
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	beq  L_106f5d4
+// --- basic block ---
+// 0x0106f5ac: 0x106f5ac: addiu v0, zero, 15
+	ldc.i4.s 15
+	stloc 5
+// 0x0106f5b0: 0x106f5b0: beq   a0, v0, 0x106f5d0 sll   zero, zero, 0
+	ldloc.1
+	ldloc 5
+	beq  L_106f5d0
+// --- basic block ---
+// 0x0106f5b8: 0x106f5b8: jal   0x10ac9b4 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f5c0: 0x106f5c0: jal   0x103f76c addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl47::roadmap_net_mon_error_103f76c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f5c8: 0x106f5c8: j	 0x106f660 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106f660
+// --- basic block ---
+L_106f5d0:
+// 0x0106f5d0: 0x106f5d0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_106f5d4:
+// 0x0106f5d4: 0x106f5d4: lw    s0, 18056(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4514
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106f5d8: 0x106f5d8: jal   0x10ac9b4 sltiu s0, s0, 1
+	ldloc 8
+	ldc.i4.1
+	clt.un
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f5e0: 0x106f5e0: lui   v1, 0x70000
+	ldc.i4 458752
+	stloc 6
+// 0x0106f5e4: 0x106f5e4: lw    v1, 18104(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106f5e8: 0x106f5e8: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106f5ec: 0x106f5ec: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106f5f0: 0x106f5f0: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106f5f4: 0x106f5f4: addiu a3, a3, 24692
+	ldloc 4
+	ldc.i4 24692
+	add
+	stloc 4
+// 0x0106f5f8: 0x106f5f8: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106f5fc: 0x106f5fc: addiu a2, zero, 1109
+	ldc.i4 1109
+	stloc.3
+// 0x0106f600: 0x106f600: sw    s0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x0106f604: 0x106f604: sw    v0, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x0106f608: 0x106f608: jal   0x100449c sw    v1, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f610: 0x106f610: j	 0x106f660 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106f660
+// --- basic block ---
+L_106f618:
+// 0x0106f618: 0x106f618: beq   a0, zero, 0x106f634 addu  v1, zero, zero
+	ldloc.1
+	ldc.i4.s 0
+	stloc 6
+	brfalse L_106f634
+// --- basic block ---
+// 0x0106f620: 0x106f620: jal   0x10ac9b4 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::roadmap_result_string_10ac9b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f628: 0x106f628: jal   0x103f76c addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl47::roadmap_net_mon_error_103f76c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f630: 0x106f630: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+L_106f634:
+// 0x0106f634: 0x106f634: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x0106f638: 0x106f638: cibyl_sysc 0x20fd
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 5
+// 0x0106f63c: 0x106f63c: addu  v1, v0, zero
+	ldloc 5
+	stloc 6
+// 0x0106f640: 0x106f640: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f644: 0x106f644: lw    a0, 18056(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4514
+	add
+	ldelem.i4
+	stloc.1
+// 0x0106f648: 0x106f648: lui   a1, 0x80000
+	ldc.i4 524288
+	stloc.2
+// 0x0106f64c: 0x106f64c: bne   a0, zero, 0x106f65c sw    v1, -18608(a1)
+	ldloc.1
+	ldloc 7
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4652
+	add
+	ldloc 6
+	stelem.i4
+	brtrue L_106f65c
+// --- basic block ---
+// 0x0106f654: 0x106f654: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106f658: 0x106f658: sw    v1, 18056(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4514
+	add
+	ldloc 6
+	stelem.i4
+L_106f65c:
+// 0x0106f65c: 0x106f65c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_106f660:
+// 0x0106f660: 0x106f660: lw    v1, -18648(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4662
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106f664: 0x106f664: addiu v0, zero, 15
+	ldc.i4.s 15
+	stloc 5
+// 0x0106f668: 0x106f668: bne   v1, v0, 0x106f6a4 lui   v0, 0x80000
+	ldloc 6
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	bne.un L_106f6a4
+// --- basic block ---
+// 0x0106f670: 0x106f670: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106f674: 0x106f674: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106f678: 0x106f678: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106f67c: 0x106f67c: addiu a3, a3, 24800
+	ldloc 4
+	ldc.i4 24800
+	add
+	stloc 4
+// 0x0106f680: 0x106f680: addiu a0, zero, 2
+	ldc.i4.2
+	stloc.1
+// 0x0106f684: 0x106f684: jal   0x100449c addiu a2, zero, 1133
+	ldc.i4 1133
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f68c: 0x106f68c: jal   0x106f29c addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::Realtime_Stop_106f29c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f694: 0x106f694: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0106f698: 0x106f698: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f69c: 0x106f69c: sw    v1, 18060(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4515
+	add
+	ldloc 6
+	stelem.i4
+// 0x0106f6a0: 0x106f6a0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_106f6a4:
+// 0x0106f6a4: 0x106f6a4: lw    v0, -18648(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4662
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f6a8: 0x106f6a8: sll   zero, zero, 0
+// 0x0106f6ac: 0x106f6ac: addiu v1, v0, -11
+	ldloc 5
+	ldc.i4.s -11
+	add
+	stloc 6
+// 0x0106f6b0: 0x106f6b0: sltiu v1, v1, 5
+	ldloc 6
+	ldc.i4.5
+	clt.un
+	stloc 6
+// 0x0106f6b4: 0x106f6b4: bne   v1, zero, 0x106f6d0 lui   s1, 0x80000
+	ldloc 6
+	ldc.i4 524288
+	stloc 9
+	brtrue L_106f6d0
+// --- basic block ---
+// 0x0106f6bc: 0x106f6bc: addiu v0, v0, -2
+	ldloc 5
+	ldc.i4.s -2
+	add
+	stloc 5
+// 0x0106f6c0: 0x106f6c0: sltiu v0, v0, 7
+	ldloc 5
+	ldc.i4.7
+	clt.un
+	stloc 5
+// 0x0106f6c4: 0x106f6c4: beq   v0, zero, 0x106f770 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brfalse L_106f770
+// --- basic block ---
+// 0x0106f6cc: 0x106f6cc: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 9
+L_106f6d0:
+// 0x0106f6d0: 0x106f6d0: addiu s1, s1, -18608
+	ldloc 9
+	ldc.i4 -18608
+	add
+	stloc 9
+// 0x0106f6d4: 0x106f6d4: lw    v1, 4(s1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106f6d8: 0x106f6d8: lw    v0, 8(s1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f6dc: 0x106f6dc: addiu v1, v1, 1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+// 0x0106f6e0: 0x106f6e0: addiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+// 0x0106f6e4: 0x106f6e4: sw    v1, 4(s1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 6
+	stelem.i4
+// 0x0106f6e8: 0x106f6e8: jal   0x106b874 sw    v0, 8(s1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::ThereAreTooManyNetworkErrors_106b874(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f6f0: 0x106f6f0: beq   v0, zero, 0x106f724 lui   s0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 8
+	brfalse L_106f724
+// --- basic block ---
+// 0x0106f6f8: 0x106f6f8: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106f6fc: 0x106f6fc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106f700: 0x106f700: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106f704: 0x106f704: addiu a3, a3, 24896
+	ldloc 4
+	ldc.i4 24896
+	add
+	stloc 4
+// 0x0106f708: 0x106f708: addiu a0, zero, 3
+	ldc.i4.3
+	stloc.1
+// 0x0106f70c: 0x106f70c: jal   0x100449c addiu a2, zero, 1002
+	ldc.i4 1002
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f714: 0x106f714: jal   0x106f29c addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::Realtime_Stop_106f29c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f71c: 0x106f71c: j	 0x106f7a4 lui   v0, 0xf0000
+	ldc.i4 983040
+	stloc 5
+	br L_106f7a4
+// --- basic block ---
+L_106f724:
+// 0x0106f724: 0x106f724: lw    v0, 18104(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f728: 0x106f728: sll   zero, zero, 0
+// 0x0106f72c: 0x106f72c: bne   v0, zero, 0x106f7a4 lui   v0, 0xf0000
+	ldloc 5
+	ldc.i4 983040
+	stloc 5
+	brtrue L_106f7a4
+// --- basic block ---
+// 0x0106f734: 0x106f734: lw    v0, 8(s1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f738: 0x106f738: sll   zero, zero, 0
+// 0x0106f73c: 0x106f73c: slti  v0, v0, 4
+	ldloc 5
+	ldc.i4.4
+	clt
+	stloc 5
+// 0x0106f740: 0x106f740: bne   v0, zero, 0x106f7a4 lui   v0, 0xf0000
+	ldloc 5
+	ldc.i4 983040
+	stloc 5
+	brtrue L_106f7a4
+// --- basic block ---
+// 0x0106f748: 0x106f748: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106f74c: 0x106f74c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106f750: 0x106f750: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106f754: 0x106f754: addiu a3, a3, 25004
+	ldloc 4
+	ldc.i4 25004
+	add
+	stloc 4
+// 0x0106f758: 0x106f758: addiu a0, zero, 2
+	ldc.i4.2
+	stloc.1
+// 0x0106f75c: 0x106f75c: jal   0x100449c addiu a2, zero, 1011
+	ldc.i4 1011
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f764: 0x106f764: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0106f768: 0x106f768: j	 0x106f7a0 sw    v0, 18104(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
+	add
+	ldloc 5
+	stelem.i4
+	br L_106f7a0
+// --- basic block ---
+L_106f770:
+// 0x0106f770: 0x106f770: lw    v1, 18104(v0)
 	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
+	add
+	ldelem.i4
+	stloc 6
+// 0x0106f774: 0x106f774: lui   a0, 0x80000
+	ldc.i4 524288
 	stloc.1
-// 0x0106f3a8: 0x106f3a8: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106f778: 0x106f778: beq   v1, zero, 0x106f7a0 sw    zero, -18600(a0)
 	ldloc 6
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4650
+	add
+	ldc.i4.s 0
+	stelem.i4
+	brfalse L_106f7a0
+// --- basic block ---
+// 0x0106f780: 0x106f780: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106f784: 0x106f784: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106f788: 0x106f788: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
 	stloc.2
+// 0x0106f78c: 0x106f78c: addiu a3, a3, 25068
+	ldloc 4
+	ldc.i4 25068
+	add
+	stloc 4
+// 0x0106f790: 0x106f790: addiu a0, zero, 2
+	ldc.i4.2
+	stloc.1
+// 0x0106f794: 0x106f794: addiu a2, zero, 1023
+	ldc.i4 1023
+	stloc.3
+// 0x0106f798: 0x106f798: jal   0x100449c sw    zero, 18104(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f3b0: 0x106f3b0: lw    ra, 28(sp)
-// 0x0106f3b4: 0x106f3b4: lw    s1, 24(sp)
+L_106f7a0:
+// 0x0106f7a0: 0x106f7a0: lui   v0, 0xf0000
+	ldc.i4 983040
+	stloc 5
+L_106f7a4:
+// 0x0106f7a4: 0x106f7a4: lw    v0, -29592(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 -7398
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f3b8: 0x106f3b8: lw    s0, 20(sp)
+	stloc 5
+// 0x0106f7a8: 0x106f7a8: sll   zero, zero, 0
+// 0x0106f7ac: 0x106f7ac: beq   v0, zero, 0x106f7bc sll   zero, zero, 0
 	ldloc 5
+	brfalse L_106f7bc
+// --- basic block ---
+// 0x0106f7b4: 0x106f7b4: jal   0x106b75c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::UpgradeVersion_106b75c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_106f7bc:
+// 0x0106f7bc: 0x106f7bc: jal   0x106dfd0 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::Realtime_ResetTransactionState_106dfd0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f7c4: 0x106f7c4: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f7c8: 0x106f7c8: lw    v0, 18032(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4508
 	add
 	ldelem.i4
+	stloc 5
+// 0x0106f7cc: 0x106f7cc: sll   zero, zero, 0
+// 0x0106f7d0: 0x106f7d0: beq   v0, zero, 0x106f7e8 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106f7e8
+// --- basic block ---
+// 0x0106f7d8: 0x106f7d8: jal   0x106c538 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::TestLoginDetails_106c538(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x0106f3bc: 0x106f3bc: jr    ra addiu sp, sp, 32
+	stloc 5
+// --- basic block ---
+// 0x0106f7e0: 0x106f7e0: j	 0x106f824 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_106f824
+// --- basic block ---
+L_106f7e8:
+// 0x0106f7e8: 0x106f7e8: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f7ec: 0x106f7ec: lw    v0, 18448(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4612
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f7f0: 0x106f7f0: sll   zero, zero, 0
+// 0x0106f7f4: 0x106f7f4: beq   v0, zero, 0x106f81c lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brfalse L_106f81c
+// --- basic block ---
+// 0x0106f7fc: 0x106f7fc: jal   0x10725e4 addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 10
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_RequestRoute_106f3c4(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
-
-// local  9 is register v0
-// local 10 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::RTNet_TransactionQueue_ProcessSingleItem_10725e4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f3c4: 0x106f3c4: addiu sp, sp, -32
+// 0x0106f804: 0x106f804: beq   v0, zero, 0x106f81c lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brfalse L_106f81c
+// --- basic block ---
+// 0x0106f80c: 0x106f80c: lw    v0, 32(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.0
-// 0x0106f3c8: 0x106f3c8: sw    s0, 20(sp)
+	ldelem.i4
+	stloc 5
+// 0x0106f810: 0x106f810: sll   zero, zero, 0
+// 0x0106f814: 0x106f814: bne   v0, zero, 0x106f824 lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brtrue L_106f824
+// --- basic block ---
+L_106f81c:
+// 0x0106f81c: 0x106f81c: sw    zero, -18656(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 -4664
 	add
-	ldloc 6
+	ldc.i4.s 0
 	stelem.i4
-// 0x0106f3cc: 0x106f3cc: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x0106f3d0: 0x106f3d0: sw    s1, 24(sp)
+// 0x0106f820: 0x106f820: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_106f824:
+// 0x0106f824: 0x106f824: lw    v0, -18656(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 -4664
 	add
+	ldelem.i4
+	stloc 5
+// 0x0106f828: 0x106f828: sll   zero, zero, 0
+// 0x0106f82c: 0x106f82c: bne   v0, zero, 0x106f870 lui   s0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 8
+	brtrue L_106f870
+// --- basic block ---
+// 0x0106f834: 0x106f834: lw    v0, 18188(s0)
 	ldloc 7
-	stelem.i4
-// 0x0106f3d4: 0x106f3d4: sw    ra, 28(sp)
-// 0x0106f3d8: 0x106f3d8: addu  s1, a0, zero
-	ldloc.1
-	stloc 7
-// 0x0106f3dc: 0x106f3dc: bne   s0, zero, 0x106f3fc lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106f3fc
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4547
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106f838: 0x106f838: sll   zero, zero, 0
+// 0x0106f83c: 0x106f83c: beq   v0, zero, 0x106f850 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_106f850
 // --- basic block ---
-// 0x0106f3e4: 0x106f3e4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f3e8: 0x106f3e8: addiu a1, a1, 20732
+// 0x0106f844: 0x106f844: jalr  v0 sll   zero, zero, 0
+	ldloc 5
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0106f84c: 0x106f84c: sw    zero, 18188(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4547
 	add
-	stloc.2
-// 0x0106f3ec: 0x106f3ec: addiu a3, a3, 24984
-	ldloc 4
-	ldc.i4 24984
+	ldc.i4.s 0
+	stelem.i4
+L_106f850:
+// 0x0106f850: 0x106f850: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106f854: 0x106f854: lw    v0, 18448(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4612
 	add
-	stloc 4
-// 0x0106f3f0: 0x106f3f0: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106f3f4: 0x106f3f4: j	 0x106f410 addiu a2, zero, 4004
-	ldc.i4 4004
-	stloc.3
-	br L_106f410
+	ldelem.i4
+	stloc 5
+// 0x0106f858: 0x106f858: sll   zero, zero, 0
+// 0x0106f85c: 0x106f85c: beq   v0, zero, 0x106f870 lui   a1, 0x1070000
+	ldloc 5
+	ldc.i4 17235968
+	stloc.2
+	brfalse L_106f870
 // --- basic block ---
-L_106f3fc:
-// 0x0106f3fc: 0x106f3fc: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f400: 0x106f400: addiu a1, a1, 20732
+// 0x0106f864: 0x106f864: addiu a1, a1, -15256
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 -15256
 	add
 	stloc.2
-// 0x0106f404: 0x106f404: addiu a3, a3, 25040
-	ldloc 4
-	ldc.i4 25040
-	add
-	stloc 4
-// 0x0106f408: 0x106f408: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106f868: 0x106f868: jal   0x104fea8 addiu a0, zero, 10
+	ldc.i4.s 10
 	stloc.1
-// 0x0106f40c: 0x106f40c: addiu a2, zero, 4006
-	ldc.i4 4006
-	stloc.3
-L_106f410:
-// 0x0106f410: 0x106f410: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f418: 0x106f418: addu  a0, s1, zero
-	ldloc 7
-	stloc.1
-// 0x0106f41c: 0x106f41c: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
-	stloc.2
+L_106f870:
+// 0x0106f870: 0x106f870: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0106f424: 0x106f424: lw    ra, 28(sp)
-// 0x0106f428: 0x106f428: lw    s1, 24(sp)
-	ldloc 5
+L_106f878:
+// 0x0106f878: 0x106f878: lw    ra, 60(sp)
+// 0x0106f87c: 0x106f87c: lw    s1, 56(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f42c: 0x106f42c: lw    s0, 20(sp)
-	ldloc 5
+	stloc 9
+// 0x0106f880: 0x106f880: lw    s0, 52(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106f430: 0x106f430: jr    ra addiu sp, sp, 32
+	stloc 8
+// 0x0106f884: 0x106f884: jr    ra addiu sp, sp, 64
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_ReportOnNavigation_106f438(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_ReportAbuse_106f88c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -790,12 +2003,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f438: 0x106f438: addiu sp, sp, -32
+// 0x0106f88c: 0x106f88c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f43c: 0x106f43c: sw    s0, 20(sp)
+// 0x0106f890: 0x106f890: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -804,10 +2017,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106f440: 0x106f440: addu  s0, a1, zero
+// 0x0106f894: 0x106f894: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x0106f444: 0x106f444: sw    s1, 24(sp)
+// 0x0106f898: 0x106f898: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -816,59 +2029,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106f448: 0x106f448: sw    ra, 28(sp)
-// 0x0106f44c: 0x106f44c: addu  s1, a0, zero
+// 0x0106f89c: 0x106f89c: sw    ra, 28(sp)
+// 0x0106f8a0: 0x106f8a0: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0106f450: 0x106f450: bne   s0, zero, 0x106f470 lui   a1, 0x10000
+// 0x0106f8a4: 0x106f8a4: bne   s0, zero, 0x106f8c4 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_106f470
+	brtrue L_106f8c4
 // --- basic block ---
-// 0x0106f458: 0x106f458: lui   a3, 0x10000
+// 0x0106f8ac: 0x106f8ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f45c: 0x106f45c: addiu a1, a1, 20732
+// 0x0106f8b0: 0x106f8b0: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f460: 0x106f460: addiu a3, a3, 25092
+// 0x0106f8b4: 0x106f8b4: addiu a3, a3, 25132
 	ldloc 4
-	ldc.i4 25092
+	ldc.i4 25132
 	add
 	stloc 4
-// 0x0106f464: 0x106f464: addiu a0, zero, 1
+// 0x0106f8b8: 0x106f8b8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106f468: 0x106f468: j	 0x106f484 addiu a2, zero, 3959
-	ldc.i4 3959
+// 0x0106f8bc: 0x106f8bc: j	 0x106f8d8 addiu a2, zero, 4103
+	ldc.i4 4103
 	stloc.3
-	br L_106f484
+	br L_106f8d8
 // --- basic block ---
-L_106f470:
-// 0x0106f470: 0x106f470: lui   a3, 0x10000
+L_106f8c4:
+// 0x0106f8c4: 0x106f8c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f474: 0x106f474: addiu a1, a1, 20732
+// 0x0106f8c8: 0x106f8c8: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f478: 0x106f478: addiu a3, a3, 25180
+// 0x0106f8cc: 0x106f8cc: addiu a3, a3, 25184
 	ldloc 4
-	ldc.i4 25180
+	ldc.i4 25184
 	add
 	stloc 4
-// 0x0106f47c: 0x106f47c: addiu a0, zero, 4
+// 0x0106f8d0: 0x106f8d0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106f480: 0x106f480: addiu a2, zero, 3961
-	ldc.i4 3961
+// 0x0106f8d4: 0x106f8d4: addiu a2, zero, 4105
+	ldc.i4 4105
 	stloc.3
-L_106f484:
-// 0x0106f484: 0x106f484: jal   0x100449c sll   zero, zero, 0
+L_106f8d8:
+// 0x0106f8d8: 0x106f8d8: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -879,10 +2092,10 @@ L_106f484:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106f48c: 0x106f48c: addu  a0, s1, zero
+// 0x0106f8e0: 0x106f8e0: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0106f490: 0x106f490: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106f8e4: 0x106f8e4: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -890,13 +2103,13 @@ L_106f484:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106f498: 0x106f498: lw    ra, 28(sp)
-// 0x0106f49c: 0x106f49c: lw    s1, 24(sp)
+// 0x0106f8ec: 0x106f8ec: lw    ra, 28(sp)
+// 0x0106f8f0: 0x106f8f0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -905,7 +2118,7 @@ L_106f484:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106f4a0: 0x106f4a0: lw    s0, 20(sp)
+// 0x0106f8f4: 0x106f8f4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -914,7 +2127,7 @@ L_106f484:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106f4a4: 0x106f4a4: jr    ra addiu sp, sp, 32
+// 0x0106f8f8: 0x106f8f8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -926,27 +2139,27 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 OnTransactionCompleted_ReportSegments_106f4ac(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_CollectBonus_106f900(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  9 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
+// local  8 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -956,378 +2169,174 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f4ac: 0x106f4ac: addiu sp, sp, -32
+// 0x0106f900: 0x106f900: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f4b0: 0x106f4b0: sw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106f4b4: 0x106f4b4: sw    s0, 20(sp)
-	ldloc 6
+// 0x0106f904: 0x106f904: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 7
-	stelem.i4
-// 0x0106f4b8: 0x106f4b8: sw    ra, 28(sp)
-// 0x0106f4bc: 0x106f4bc: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106f4c0: 0x106f4c0: beq   a1, zero, 0x106f4e4 addu  s1, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 8
-	brfalse L_106f4e4
-// --- basic block ---
-// 0x0106f4c8: 0x106f4c8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106f4cc: 0x106f4cc: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f4d0: 0x106f4d0: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106f4d4: 0x106f4d4: addiu a3, a3, 25260
-	ldloc 4
-	ldc.i4 25260
-	add
-	stloc 4
-// 0x0106f4d8: 0x106f4d8: addiu a0, zero, 3
-	ldc.i4.3
-	stloc.1
-// 0x0106f4dc: 0x106f4dc: jal   0x100449c addiu a2, zero, 3370
-	ldc.i4 3370
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-L_106f4e4:
-// 0x0106f4e4: 0x106f4e4: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106f4e8: 0x106f4e8: lw    v0, 17612(v0)
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4403
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106f4ec: 0x106f4ec: sll   zero, zero, 0
-// 0x0106f4f0: 0x106f4f0: beq   v0, zero, 0x106f500 sltiu a0, s0, 1
-	ldloc 5
-	ldloc 7
-	ldc.i4.1
-	clt.un
-	stloc.1
-	brfalse L_106f500
-// --- basic block ---
-// 0x0106f4f8: 0x106f4f8: jalr  v0 addu  a1, s0, zero
-	ldloc 5
-	ldloc 7
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-L_106f500:
-// 0x0106f500: 0x106f500: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x0106f504: 0x106f504: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-	ldloc.0
-	ldloc.1
+	stelem.i4
+// 0x0106f908: 0x106f908: addu  s0, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x0106f50c: 0x106f50c: lw    ra, 28(sp)
-// 0x0106f510: 0x106f510: lw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106f514: 0x106f514: lw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 7
-// 0x0106f518: 0x106f518: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 OnTransactionCompleted_ReportMarkers_106f520(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106f520: 0x106f520: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106f524: 0x106f524: sw    s1, 24(sp)
-	ldloc 6
+// 0x0106f90c: 0x106f90c: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 8
-	stelem.i4
-// 0x0106f528: 0x106f528: sw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
 	ldloc 7
 	stelem.i4
-// 0x0106f52c: 0x106f52c: sw    ra, 28(sp)
-// 0x0106f530: 0x106f530: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106f534: 0x106f534: beq   a1, zero, 0x106f558 addu  s1, a0, zero
-	ldloc.2
+// 0x0106f910: 0x106f910: sw    ra, 28(sp)
+// 0x0106f914: 0x106f914: addu  s1, a0, zero
 	ldloc.1
-	stloc 8
-	brfalse L_106f558
-// --- basic block ---
-// 0x0106f53c: 0x106f53c: lui   a1, 0x10000
+	stloc 7
+// 0x0106f918: 0x106f918: bne   s0, zero, 0x106f938 lui   a1, 0x10000
+	ldloc 6
 	ldc.i4 65536
 	stloc.2
-// 0x0106f540: 0x106f540: lui   a3, 0x10000
+	brtrue L_106f938
+// --- basic block ---
+// 0x0106f920: 0x106f920: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f544: 0x106f544: addiu a1, a1, 20732
+// 0x0106f924: 0x106f924: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f548: 0x106f548: addiu a3, a3, 25312
+// 0x0106f928: 0x106f928: addiu a3, a3, 25236
 	ldloc 4
-	ldc.i4 25312
+	ldc.i4 25236
 	add
 	stloc 4
-// 0x0106f54c: 0x106f54c: addiu a0, zero, 3
-	ldc.i4.3
+// 0x0106f92c: 0x106f92c: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106f550: 0x106f550: jal   0x100449c addiu a2, zero, 3357
-	ldc.i4 3357
+// 0x0106f930: 0x106f930: j	 0x106f94c addiu a2, zero, 4093
+	ldc.i4 4093
 	stloc.3
-	ldloc.0
-	ldloc.1
+	br L_106f94c
+// --- basic block ---
+L_106f938:
+// 0x0106f938: 0x106f938: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106f93c: 0x106f93c: addiu a1, a1, 21196
 	ldloc.2
-	ldloc.3
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106f940: 0x106f940: addiu a3, a3, 25292
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-L_106f558:
-// 0x0106f558: 0x106f558: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0106f55c: 0x106f55c: lw    v0, 17616(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4404
+	ldc.i4 25292
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106f560: 0x106f560: sll   zero, zero, 0
-// 0x0106f564: 0x106f564: beq   v0, zero, 0x106f574 sltiu a0, s0, 1
-	ldloc 5
-	ldloc 7
-	ldc.i4.1
-	clt.un
+	stloc 4
+// 0x0106f944: 0x106f944: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-	brfalse L_106f574
-// --- basic block ---
-// 0x0106f56c: 0x106f56c: jalr  v0 addu  a1, s0, zero
-	ldloc 5
-	ldloc 7
-	stloc.2
+// 0x0106f948: 0x106f948: addiu a2, zero, 4095
+	ldc.i4 4095
+	stloc.3
+L_106f94c:
+// 0x0106f94c: 0x106f94c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 5
 // --- basic block ---
-L_106f574:
-// 0x0106f574: 0x106f574: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x0106f578: 0x106f578: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106f954: 0x106f954: addu  a0, s1, zero
 	ldloc 7
+	stloc.1
+// 0x0106f958: 0x106f958: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 5
 // --- basic block ---
-// 0x0106f580: 0x106f580: lw    ra, 28(sp)
-// 0x0106f584: 0x106f584: lw    s1, 24(sp)
-	ldloc 6
+// 0x0106f960: 0x106f960: lw    ra, 28(sp)
+// 0x0106f964: 0x106f964: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106f588: 0x106f588: lw    s0, 20(sp)
-	ldloc 6
+	stloc 7
+// 0x0106f968: 0x106f968: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f58c: 0x106f58c: jr    ra addiu sp, sp, 32
+	stloc 6
+// 0x0106f96c: 0x106f96c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_AllTogether_Part2_106f594(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_SelectRoute_106f974(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
+// local  8 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldc.i4.s 0
-	stloc 7
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1337,212 +2346,96 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f594: 0x106f594: addiu sp, sp, -32
+// 0x0106f974: 0x106f974: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f598: 0x106f598: sw    s2, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-// 0x0106f59c: 0x106f59c: sw    s1, 20(sp)
-	ldloc 6
+// 0x0106f978: 0x106f978: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106f5a0: 0x106f5a0: sw    s0, 16(sp)
 	ldloc 6
+	stelem.i4
+// 0x0106f97c: 0x106f97c: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x0106f980: 0x106f980: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x0106f5a4: 0x106f5a4: sw    ra, 28(sp)
-// 0x0106f5a8: 0x106f5a8: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x0106f5ac: 0x106f5ac: addu  s1, a0, zero
+// 0x0106f984: 0x106f984: sw    ra, 28(sp)
+// 0x0106f988: 0x106f988: addu  s1, a0, zero
 	ldloc.1
-	stloc 9
-// 0x0106f5b0: 0x106f5b0: beq   a1, zero, 0x106f5e4 lui   s0, 0x10000
-	ldloc.2
+	stloc 7
+// 0x0106f98c: 0x106f98c: bne   s0, zero, 0x106f9ac lui   a1, 0x10000
+	ldloc 6
 	ldc.i4 65536
-	stloc 8
-	brfalse L_106f5e4
+	stloc.2
+	brtrue L_106f9ac
 // --- basic block ---
-// 0x0106f5b8: 0x106f5b8: lui   a3, 0x10000
+// 0x0106f994: 0x106f994: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f5bc: 0x106f5bc: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+// 0x0106f998: 0x106f998: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f5c0: 0x106f5c0: addiu a3, a3, 25360
+// 0x0106f99c: 0x106f99c: addiu a3, a3, 25344
 	ldloc 4
-	ldc.i4 25360
+	ldc.i4 25344
 	add
 	stloc 4
-// 0x0106f5c4: 0x106f5c4: addiu a2, zero, 2042
-	ldc.i4 2042
-	stloc.3
-// 0x0106f5c8: 0x106f5c8: jal   0x100449c addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f5d0: 0x106f5d0: jal   0x10b30d0 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl133::editor_track_report_conclude_export_10b30d0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f5d8: 0x106f5d8: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x0106f5dc: 0x106f5dc: j	 0x106f648 addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-	br L_106f648
-// --- basic block ---
-L_106f5e4:
-// 0x0106f5e4: 0x106f5e4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f5e8: 0x106f5e8: addiu a0, zero, 1
+// 0x0106f9a0: 0x106f9a0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106f5ec: 0x106f5ec: addiu a3, a3, 25432
-	ldloc 4
-	ldc.i4 25432
-	add
-	stloc 4
-// 0x0106f5f0: 0x106f5f0: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106f5f4: 0x106f5f4: jal   0x100449c addiu a2, zero, 2048
-	ldc.i4 2048
+// 0x0106f9a4: 0x106f9a4: j	 0x106f9c0 addiu a2, zero, 4083
+	ldc.i4 4083
 	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f5fc: 0x106f5fc: jal   0x106e830 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendAllMessagesTogether_SendPart2_106e830(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f604: 0x106f604: beq   v0, zero, 0x106f62c lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brfalse L_106f62c
+	br L_106f9c0
 // --- basic block ---
-// 0x0106f60c: 0x106f60c: lui   a3, 0x10000
+L_106f9ac:
+// 0x0106f9ac: 0x106f9ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f610: 0x106f610: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+// 0x0106f9b0: 0x106f9b0: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f614: 0x106f614: addiu a3, a3, 25500
+// 0x0106f9b4: 0x106f9b4: addiu a3, a3, 25396
 	ldloc 4
-	ldc.i4 25500
+	ldc.i4 25396
 	add
 	stloc 4
-// 0x0106f618: 0x106f618: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106f61c: 0x106f61c: jal   0x100449c addiu a2, zero, 2051
-	ldc.i4 2051
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f624: 0x106f624: j	 0x106f650 sll   zero, zero, 0
-	br L_106f650
-// --- basic block ---
-L_106f62c:
-// 0x0106f62c: 0x106f62c: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106f630: 0x106f630: addiu a0, zero, 4
+// 0x0106f9b8: 0x106f9b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106f634: 0x106f634: addiu a3, a3, 25572
-	ldloc 4
-	ldc.i4 25572
-	add
-	stloc 4
-// 0x0106f638: 0x106f638: jal   0x100449c addiu a2, zero, 2053
-	ldc.i4 2053
+// 0x0106f9bc: 0x106f9bc: addiu a2, zero, 4085
+	ldc.i4 4085
 	stloc.3
+L_106f9c0:
+// 0x0106f9c0: 0x106f9c0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1550,90 +2443,77 @@ L_106f62c:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 10
+	stloc 9
 // --- basic block ---
-// 0x0106f640: 0x106f640: addu  a0, s1, zero
-	ldloc 9
+// 0x0106f9c8: 0x106f9c8: addu  a0, s1, zero
+	ldloc 7
 	stloc.1
-// 0x0106f644: 0x106f644: addiu a1, zero, 2
-	ldc.i4.2
+// 0x0106f9cc: 0x106f9cc: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
-L_106f648:
-// 0x0106f648: 0x106f648: jal   0x106ed70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 10
+	stloc 9
 // --- basic block ---
-L_106f650:
-// 0x0106f650: 0x106f650: lw    ra, 28(sp)
-// 0x0106f654: 0x106f654: lw    s2, 24(sp)
-	ldloc 6
+// 0x0106f9d4: 0x106f9d4: lw    ra, 28(sp)
+// 0x0106f9d8: 0x106f9d8: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 10
-// 0x0106f658: 0x106f658: lw    s1, 20(sp)
-	ldloc 6
+	stloc 7
+// 0x0106f9dc: 0x106f9dc: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106f65c: 0x106f65c: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106f660: 0x106f660: jr    ra addiu sp, sp, 32
+	stloc 6
+// 0x0106f9e0: 0x106f9e0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_AllTogether_Part1_106f668(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_RequestRoute_106f9e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
+// local  8 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldc.i4.s 0
-	stloc 7
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1643,212 +2523,96 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f668: 0x106f668: addiu sp, sp, -32
+// 0x0106f9e8: 0x106f9e8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f66c: 0x106f66c: sw    s2, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-// 0x0106f670: 0x106f670: sw    s1, 20(sp)
-	ldloc 6
+// 0x0106f9ec: 0x106f9ec: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106f674: 0x106f674: sw    s0, 16(sp)
 	ldloc 6
+	stelem.i4
+// 0x0106f9f0: 0x106f9f0: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x0106f9f4: 0x106f9f4: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x0106f678: 0x106f678: sw    ra, 28(sp)
-// 0x0106f67c: 0x106f67c: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x0106f680: 0x106f680: addu  s1, a0, zero
+// 0x0106f9f8: 0x106f9f8: sw    ra, 28(sp)
+// 0x0106f9fc: 0x106f9fc: addu  s1, a0, zero
 	ldloc.1
-	stloc 9
-// 0x0106f684: 0x106f684: beq   a1, zero, 0x106f6b8 lui   s0, 0x10000
-	ldloc.2
+	stloc 7
+// 0x0106fa00: 0x106fa00: bne   s0, zero, 0x106fa20 lui   a1, 0x10000
+	ldloc 6
 	ldc.i4 65536
-	stloc 8
-	brfalse L_106f6b8
+	stloc.2
+	brtrue L_106fa20
 // --- basic block ---
-// 0x0106f68c: 0x106f68c: lui   a3, 0x10000
+// 0x0106fa08: 0x106fa08: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f690: 0x106f690: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+// 0x0106fa0c: 0x106fa0c: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f694: 0x106f694: addiu a3, a3, 25652
+// 0x0106fa10: 0x106fa10: addiu a3, a3, 25448
 	ldloc 4
-	ldc.i4 25652
+	ldc.i4 25448
 	add
 	stloc 4
-// 0x0106f698: 0x106f698: addiu a2, zero, 2022
-	ldc.i4 2022
-	stloc.3
-// 0x0106f69c: 0x106f69c: jal   0x100449c addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f6a4: 0x106f6a4: jal   0x10b30d0 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl133::editor_track_report_conclude_export_10b30d0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f6ac: 0x106f6ac: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x0106f6b0: 0x106f6b0: j	 0x106f71c addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-	br L_106f71c
-// --- basic block ---
-L_106f6b8:
-// 0x0106f6b8: 0x106f6b8: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f6bc: 0x106f6bc: addiu a0, zero, 1
+// 0x0106fa14: 0x106fa14: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106f6c0: 0x106f6c0: addiu a3, a3, 25724
-	ldloc 4
-	ldc.i4 25724
-	add
-	stloc 4
-// 0x0106f6c4: 0x106f6c4: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106f6c8: 0x106f6c8: jal   0x100449c addiu a2, zero, 2028
-	ldc.i4 2028
+// 0x0106fa18: 0x106fa18: j	 0x106fa34 addiu a2, zero, 4004
+	ldc.i4 4004
 	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f6d0: 0x106f6d0: jal   0x106e830 addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendAllMessagesTogether_SendPart2_106e830(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f6d8: 0x106f6d8: beq   v0, zero, 0x106f700 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brfalse L_106f700
+	br L_106fa34
 // --- basic block ---
-// 0x0106f6e0: 0x106f6e0: lui   a3, 0x10000
+L_106fa20:
+// 0x0106fa20: 0x106fa20: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f6e4: 0x106f6e4: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+// 0x0106fa24: 0x106fa24: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f6e8: 0x106f6e8: addiu a3, a3, 25792
+// 0x0106fa28: 0x106fa28: addiu a3, a3, 25504
 	ldloc 4
-	ldc.i4 25792
+	ldc.i4 25504
 	add
 	stloc 4
-// 0x0106f6ec: 0x106f6ec: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106f6f0: 0x106f6f0: jal   0x100449c addiu a2, zero, 2031
-	ldc.i4 2031
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106f6f8: 0x106f6f8: j	 0x106f724 sll   zero, zero, 0
-	br L_106f724
-// --- basic block ---
-L_106f700:
-// 0x0106f700: 0x106f700: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106f704: 0x106f704: addiu a0, zero, 4
+// 0x0106fa2c: 0x106fa2c: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106f708: 0x106f708: addiu a3, a3, 25860
-	ldloc 4
-	ldc.i4 25860
-	add
-	stloc 4
-// 0x0106f70c: 0x106f70c: jal   0x100449c addiu a2, zero, 2033
-	ldc.i4 2033
+// 0x0106fa30: 0x106fa30: addiu a2, zero, 4006
+	ldc.i4 4006
 	stloc.3
+L_106fa34:
+// 0x0106fa34: 0x106fa34: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1856,69 +2620,57 @@ L_106f700:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 10
+	stloc 9
 // --- basic block ---
-// 0x0106f714: 0x106f714: addu  a0, s1, zero
-	ldloc 9
+// 0x0106fa3c: 0x106fa3c: addu  a0, s1, zero
+	ldloc 7
 	stloc.1
-// 0x0106f718: 0x106f718: addiu a1, zero, 2
-	ldc.i4.2
+// 0x0106fa40: 0x106fa40: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
-L_106f71c:
-// 0x0106f71c: 0x106f71c: jal   0x106ed70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 10
+	stloc 9
 // --- basic block ---
-L_106f724:
-// 0x0106f724: 0x106f724: lw    ra, 28(sp)
-// 0x0106f728: 0x106f728: lw    s2, 24(sp)
-	ldloc 6
+// 0x0106fa48: 0x106fa48: lw    ra, 28(sp)
+// 0x0106fa4c: 0x106fa4c: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 10
-// 0x0106f72c: 0x106f72c: lw    s1, 20(sp)
-	ldloc 6
+	stloc 7
+// 0x0106fa50: 0x106fa50: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106f730: 0x106f730: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x0106f734: 0x106f734: jr    ra addiu sp, sp, 32
+	stloc 6
+// 0x0106fa54: 0x106fa54: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_MapDisplayed__only_106f73c(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_ReportOnNavigation_106fa5c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -1959,12 +2711,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f73c: 0x106f73c: addiu sp, sp, -32
+// 0x0106fa5c: 0x106fa5c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f740: 0x106f740: sw    s0, 20(sp)
+// 0x0106fa60: 0x106fa60: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1973,10 +2725,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106f744: 0x106f744: addu  s0, a1, zero
+// 0x0106fa64: 0x106fa64: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x0106f748: 0x106f748: sw    s1, 24(sp)
+// 0x0106fa68: 0x106fa68: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1985,59 +2737,59 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106f74c: 0x106f74c: sw    ra, 28(sp)
-// 0x0106f750: 0x106f750: addu  s1, a0, zero
+// 0x0106fa6c: 0x106fa6c: sw    ra, 28(sp)
+// 0x0106fa70: 0x106fa70: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-// 0x0106f754: 0x106f754: bne   s0, zero, 0x106f774 lui   a1, 0x10000
+// 0x0106fa74: 0x106fa74: bne   s0, zero, 0x106fa94 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_106f774
+	brtrue L_106fa94
 // --- basic block ---
-// 0x0106f75c: 0x106f75c: lui   a3, 0x10000
+// 0x0106fa7c: 0x106fa7c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f760: 0x106f760: addiu a1, a1, 20732
+// 0x0106fa80: 0x106fa80: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f764: 0x106f764: addiu a3, a3, 25936
+// 0x0106fa84: 0x106fa84: addiu a3, a3, 25556
 	ldloc 4
-	ldc.i4 25936
+	ldc.i4 25556
 	add
 	stloc 4
-// 0x0106f768: 0x106f768: addiu a0, zero, 1
+// 0x0106fa88: 0x106fa88: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0106f76c: 0x106f76c: j	 0x106f788 addiu a2, zero, 1940
-	ldc.i4 1940
+// 0x0106fa8c: 0x106fa8c: j	 0x106faa8 addiu a2, zero, 3959
+	ldc.i4 3959
 	stloc.3
-	br L_106f788
+	br L_106faa8
 // --- basic block ---
-L_106f774:
-// 0x0106f774: 0x106f774: lui   a3, 0x10000
+L_106fa94:
+// 0x0106fa94: 0x106fa94: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f778: 0x106f778: addiu a1, a1, 20732
+// 0x0106fa98: 0x106fa98: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f77c: 0x106f77c: addiu a3, a3, 26024
+// 0x0106fa9c: 0x106fa9c: addiu a3, a3, 25644
 	ldloc 4
-	ldc.i4 26024
+	ldc.i4 25644
 	add
 	stloc 4
-// 0x0106f780: 0x106f780: addiu a0, zero, 4
+// 0x0106faa0: 0x106faa0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106f784: 0x106f784: addiu a2, zero, 1942
-	ldc.i4 1942
+// 0x0106faa4: 0x106faa4: addiu a2, zero, 3961
+	ldc.i4 3961
 	stloc.3
-L_106f788:
-// 0x0106f788: 0x106f788: jal   0x100449c sll   zero, zero, 0
+L_106faa8:
+// 0x0106faa8: 0x106faa8: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2048,10 +2800,10 @@ L_106f788:
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106f790: 0x106f790: addu  a0, s1, zero
+// 0x0106fab0: 0x106fab0: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0106f794: 0x106f794: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106fab4: 0x106fab4: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -2059,13 +2811,13 @@ L_106f788:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106f79c: 0x106f79c: lw    ra, 28(sp)
-// 0x0106f7a0: 0x106f7a0: lw    s1, 24(sp)
+// 0x0106fabc: 0x106fabc: lw    ra, 28(sp)
+// 0x0106fac0: 0x106fac0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2074,7 +2826,7 @@ L_106f788:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106f7a4: 0x106f7a4: lw    s0, 20(sp)
+// 0x0106fac4: 0x106fac4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2083,7 +2835,7 @@ L_106f788:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106f7a8: 0x106f7a8: jr    ra addiu sp, sp, 32
+// 0x0106fac8: 0x106fac8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2095,27 +2847,27 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_UserPoints_106f7b0(int32,int32,int32,int32,int32)
+.method public static int32 OnTransactionCompleted_ReportSegments_106fad0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
+// local  7 is register s0
+// local  8 is register s1
 // local  0 is register sp
 // local 10 is register ra
-// local  5 is register mem
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2125,71 +2877,71 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f7b0: 0x106f7b0: addiu sp, sp, -32
+// 0x0106fad0: 0x106fad0: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f7b4: 0x106f7b4: sw    s1, 24(sp)
-	ldloc 5
+// 0x0106fad4: 0x106fad4: sw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 9
+	ldloc 8
 	stelem.i4
-// 0x0106f7b8: 0x106f7b8: sw    s0, 20(sp)
-	ldloc 5
+// 0x0106fad8: 0x106fad8: sw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x0106f7bc: 0x106f7bc: sw    ra, 28(sp)
-// 0x0106f7c0: 0x106f7c0: addu  s0, a1, zero
+// 0x0106fadc: 0x106fadc: sw    ra, 28(sp)
+// 0x0106fae0: 0x106fae0: addu  s0, a1, zero
 	ldloc.2
-	stloc 8
-// 0x0106f7c4: 0x106f7c4: beq   a1, zero, 0x106f7f4 addu  s1, a0, zero
+	stloc 7
+// 0x0106fae4: 0x106fae4: beq   a1, zero, 0x106fb08 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
-	stloc 9
-	brfalse L_106f7f4
+	stloc 8
+	brfalse L_106fb08
 // --- basic block ---
-// 0x0106f7cc: 0x106f7cc: lui   a1, 0x10000
+// 0x0106faec: 0x106faec: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106f7d0: 0x106f7d0: lui   a3, 0x10000
+// 0x0106faf0: 0x106faf0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f7d4: 0x106f7d4: addiu a1, a1, 20732
+// 0x0106faf4: 0x106faf4: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f7d8: 0x106f7d8: addiu a3, a3, 26104
+// 0x0106faf8: 0x106faf8: addiu a3, a3, 25724
 	ldloc 4
-	ldc.i4 26104
+	ldc.i4 25724
 	add
 	stloc 4
-// 0x0106f7dc: 0x106f7dc: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106fafc: 0x106fafc: addiu a0, zero, 3
+	ldc.i4.3
 	stloc.1
-// 0x0106f7e0: 0x106f7e0: jal   0x100449c addiu a2, zero, 1684
-	ldc.i4 1684
+// 0x0106fb00: 0x106fb00: jal   0x100449c addiu a2, zero, 3370
+	ldc.i4 3370
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -2198,93 +2950,114 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 9
+	stloc 5
 // --- basic block ---
-// 0x0106f7e8: 0x106f7e8: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-// 0x0106f7ec: 0x106f7ec: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 6
-// 0x0106f7f0: 0x106f7f0: sw    v1, 15064(v0)
-	ldloc 5
+L_106fb08:
+// 0x0106fb08: 0x106fb08: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106fb0c: 0x106fb0c: lw    v0, 18076(v0)
 	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3766
+	ldc.i4 4519
 	add
+	ldelem.i4
+	stloc 5
+// 0x0106fb10: 0x106fb10: sll   zero, zero, 0
+// 0x0106fb14: 0x106fb14: beq   v0, zero, 0x106fb24 sltiu a0, s0, 1
+	ldloc 5
 	ldloc 7
-	stelem.i4
-L_106f7f4:
-// 0x0106f7f4: 0x106f7f4: addu  a0, s1, zero
-	ldloc 9
+	ldc.i4.1
+	clt.un
 	stloc.1
-// 0x0106f7f8: 0x106f7f8: jal   0x106ed70 addu  a1, s0, zero
+	brfalse L_106fb24
+// --- basic block ---
+// 0x0106fb1c: 0x106fb1c: jalr  v0 addu  a1, s0, zero
+	ldloc 5
+	ldloc 7
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
+// --- basic block ---
+L_106fb24:
+// 0x0106fb24: 0x106fb24: addu  a0, s1, zero
 	ldloc 8
+	stloc.1
+// 0x0106fb28: 0x106fb28: jal   0x106f394 addu  a1, s0, zero
+	ldloc 7
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 9
+	stloc 5
 // --- basic block ---
-// 0x0106f800: 0x106f800: lw    ra, 28(sp)
-// 0x0106f804: 0x106f804: lw    s1, 24(sp)
-	ldloc 5
+// 0x0106fb30: 0x106fb30: lw    ra, 28(sp)
+// 0x0106fb34: 0x106fb34: lw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106f808: 0x106f808: lw    s0, 20(sp)
-	ldloc 5
+	stloc 8
+// 0x0106fb38: 0x106fb38: lw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106f80c: 0x106f80c: jr    ra addiu sp, sp, 32
+	stloc 7
+// 0x0106fb3c: 0x106fb3c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_SetMood_106f814(int32,int32,int32,int32,int32)
+.method public static int32 OnTransactionCompleted_ReportMarkers_106fb44(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
 
-// local  9 is register v0
-// local 10 is register v1
+// local  5 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
+// local  7 is register s0
+// local  8 is register s1
 // local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
+// local 10 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2294,71 +3067,71 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f814: 0x106f814: addiu sp, sp, -32
+// 0x0106fb44: 0x106fb44: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f818: 0x106f818: sw    s1, 24(sp)
-	ldloc 5
+// 0x0106fb48: 0x106fb48: sw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 7
+	ldloc 8
 	stelem.i4
-// 0x0106f81c: 0x106f81c: sw    s0, 20(sp)
-	ldloc 5
+// 0x0106fb4c: 0x106fb4c: sw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-// 0x0106f820: 0x106f820: sw    ra, 28(sp)
-// 0x0106f824: 0x106f824: addu  s0, a1, zero
+// 0x0106fb50: 0x106fb50: sw    ra, 28(sp)
+// 0x0106fb54: 0x106fb54: addu  s0, a1, zero
 	ldloc.2
-	stloc 6
-// 0x0106f828: 0x106f828: beq   a1, zero, 0x106f84c addu  s1, a0, zero
+	stloc 7
+// 0x0106fb58: 0x106fb58: beq   a1, zero, 0x106fb7c addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
-	stloc 7
-	brfalse L_106f84c
+	stloc 8
+	brfalse L_106fb7c
 // --- basic block ---
-// 0x0106f830: 0x106f830: lui   a1, 0x10000
+// 0x0106fb60: 0x106fb60: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106f834: 0x106f834: lui   a3, 0x10000
+// 0x0106fb64: 0x106fb64: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f838: 0x106f838: addiu a1, a1, 20732
+// 0x0106fb68: 0x106fb68: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f83c: 0x106f83c: addiu a3, a3, 26176
+// 0x0106fb6c: 0x106fb6c: addiu a3, a3, 25776
 	ldloc 4
-	ldc.i4 26176
+	ldc.i4 25776
 	add
 	stloc 4
-// 0x0106f840: 0x106f840: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106fb70: 0x106fb70: addiu a0, zero, 3
+	ldc.i4.3
 	stloc.1
-// 0x0106f844: 0x106f844: jal   0x100449c addiu a2, zero, 1674
-	ldc.i4 1674
+// 0x0106fb74: 0x106fb74: jal   0x100449c addiu a2, zero, 3357
+	ldc.i4 3357
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -2367,78 +3140,115 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
 	stloc 9
+	stloc 5
+// --- basic block ---
+L_106fb7c:
+// 0x0106fb7c: 0x106fb7c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0106fb80: 0x106fb80: lw    v0, 18080(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4520
+	add
+	ldelem.i4
+	stloc 5
+// 0x0106fb84: 0x106fb84: sll   zero, zero, 0
+// 0x0106fb88: 0x106fb88: beq   v0, zero, 0x106fb98 sltiu a0, s0, 1
+	ldloc 5
+	ldloc 7
+	ldc.i4.1
+	clt.un
+	stloc.1
+	brfalse L_106fb98
 // --- basic block ---
-L_106f84c:
-// 0x0106f84c: 0x106f84c: addu  a0, s1, zero
+// 0x0106fb90: 0x106fb90: jalr  v0 addu  a1, s0, zero
+	ldloc 5
 	ldloc 7
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
+// --- basic block ---
+L_106fb98:
+// 0x0106fb98: 0x106fb98: addu  a0, s1, zero
+	ldloc 8
 	stloc.1
-// 0x0106f850: 0x106f850: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
+// 0x0106fb9c: 0x106fb9c: jal   0x106f394 addu  a1, s0, zero
+	ldloc 7
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
 	stloc 9
+	stloc 5
 // --- basic block ---
-// 0x0106f858: 0x106f858: lw    ra, 28(sp)
-// 0x0106f85c: 0x106f85c: lw    s1, 24(sp)
-	ldloc 5
+// 0x0106fba4: 0x106fba4: lw    ra, 28(sp)
+// 0x0106fba8: 0x106fba8: lw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f860: 0x106f860: lw    s0, 20(sp)
-	ldloc 5
+	stloc 8
+// 0x0106fbac: 0x106fbac: lw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106f864: 0x106f864: jr    ra addiu sp, sp, 32
+	stloc 7
+// 0x0106fbb0: 0x106fbb0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_NotifySplashUpdateTime_106f86c(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_AllTogether_Part2_106fbb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
 
-// local  9 is register v0
-// local 10 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
 // local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
+// local 11 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2448,81 +3258,212 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f86c: 0x106f86c: addiu sp, sp, -40
+// 0x0106fbb8: 0x106fbb8: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f870: 0x106f870: sw    s1, 32(sp)
-	ldloc 5
+// 0x0106fbbc: 0x106fbbc: sw    s2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
-// 0x0106f874: 0x106f874: sw    s0, 28(sp)
-	ldloc 5
+// 0x0106fbc0: 0x106fbc0: sw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
+	ldloc 9
+	stelem.i4
+// 0x0106fbc4: 0x106fbc4: sw    s0, 16(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
 	stelem.i4
-// 0x0106f878: 0x106f878: sw    ra, 36(sp)
-// 0x0106f87c: 0x106f87c: addu  s0, a1, zero
+// 0x0106fbc8: 0x106fbc8: sw    ra, 28(sp)
+// 0x0106fbcc: 0x106fbcc: addu  s2, a1, zero
 	ldloc.2
-	stloc 6
-// 0x0106f880: 0x106f880: beq   a1, zero, 0x106f8a8 addu  s1, a0, zero
+	stloc 10
+// 0x0106fbd0: 0x106fbd0: addu  s1, a0, zero
+	ldloc.1
+	stloc 9
+// 0x0106fbd4: 0x106fbd4: beq   a1, zero, 0x106fc08 lui   s0, 0x10000
+	ldloc.2
+	ldc.i4 65536
+	stloc 8
+	brfalse L_106fc08
+// --- basic block ---
+// 0x0106fbdc: 0x106fbdc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106fbe0: 0x106fbe0: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106fbe4: 0x106fbe4: addiu a3, a3, 25824
+	ldloc 4
+	ldc.i4 25824
+	add
+	stloc 4
+// 0x0106fbe8: 0x106fbe8: addiu a2, zero, 2042
+	ldc.i4 2042
+	stloc.3
+// 0x0106fbec: 0x106fbec: jal   0x100449c addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106fbf4: 0x106fbf4: jal   0x10b3718 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl133::editor_track_report_conclude_export_10b3718(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brfalse L_106f8a8
+	stloc 5
 // --- basic block ---
-// 0x0106f888: 0x106f888: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x0106fbfc: 0x106fbfc: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x0106fc00: 0x106fc00: j	 0x106fc6c addu  a1, s2, zero
+	ldloc 10
 	stloc.2
-// 0x0106f88c: 0x106f88c: lui   a3, 0x10000
+	br L_106fc6c
+// --- basic block ---
+L_106fc08:
+// 0x0106fc08: 0x106fc08: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f890: 0x106f890: addiu a1, a1, 20732
+// 0x0106fc0c: 0x106fc0c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106fc10: 0x106fc10: addiu a3, a3, 25896
+	ldloc 4
+	ldc.i4 25896
+	add
+	stloc 4
+// 0x0106fc14: 0x106fc14: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106fc18: 0x106fc18: jal   0x100449c addiu a2, zero, 2048
+	ldc.i4 2048
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106fc20: 0x106fc20: jal   0x106ee54 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendAllMessagesTogether_SendPart2_106ee54(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106fc28: 0x106fc28: beq   v0, zero, 0x106fc50 lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brfalse L_106fc50
+// --- basic block ---
+// 0x0106fc30: 0x106fc30: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106fc34: 0x106fc34: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f894: 0x106f894: addiu a3, a3, 26240
+// 0x0106fc38: 0x106fc38: addiu a3, a3, 25964
 	ldloc 4
-	ldc.i4 26240
+	ldc.i4 25964
 	add
 	stloc 4
-// 0x0106f898: 0x106f898: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0106fc3c: 0x106fc3c: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0106f89c: 0x106f89c: addiu a2, zero, 1454
-	ldc.i4 1454
+// 0x0106fc40: 0x106fc40: jal   0x100449c addiu a2, zero, 2051
+	ldc.i4 2051
 	stloc.3
-// 0x0106f8a0: 0x106f8a0: jal   0x100449c sw    s0, 16(sp)
-	ldloc 5
 	ldloc.0
-	ldc.i4.2
-	shr.un
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106fc48: 0x106fc48: j	 0x106fc74 sll   zero, zero, 0
+	br L_106fc74
+// --- basic block ---
+L_106fc50:
+// 0x0106fc50: 0x106fc50: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106fc54: 0x106fc54: addiu a0, zero, 4
 	ldc.i4.4
+	stloc.1
+// 0x0106fc58: 0x106fc58: addiu a3, a3, 26036
+	ldloc 4
+	ldc.i4 26036
 	add
-	ldloc 6
-	stelem.i4
+	stloc 4
+// 0x0106fc5c: 0x106fc5c: jal   0x100449c addiu a2, zero, 2053
+	ldc.i4 2053
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2530,78 +3471,90 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_106f8a8:
-// 0x0106f8a8: 0x106f8a8: addu  a0, s1, zero
-	ldloc 7
+// 0x0106fc64: 0x106fc64: addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-// 0x0106f8ac: 0x106f8ac: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
+// 0x0106fc68: 0x106fc68: addiu a1, zero, 2
+	ldc.i4.2
 	stloc.2
+L_106fc6c:
+// 0x0106fc6c: 0x106fc6c: jal   0x106f394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106f8b4: 0x106f8b4: lw    ra, 36(sp)
-// 0x0106f8b8: 0x106f8b8: lw    s1, 32(sp)
-	ldloc 5
+L_106fc74:
+// 0x0106fc74: 0x106fc74: lw    ra, 28(sp)
+// 0x0106fc78: 0x106fc78: lw    s2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f8bc: 0x106f8bc: lw    s0, 28(sp)
-	ldloc 5
+	stloc 10
+// 0x0106fc7c: 0x106fc7c: lw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106f8c0: 0x106f8c0: jr    ra addiu sp, sp, 40
+	stloc 9
+// 0x0106fc80: 0x106fc80: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106fc84: 0x106fc84: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_ExternalPoiNotifyOnNavigate_106f8c8(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_AllTogether_Part1_106fc8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
 
-// local  9 is register v0
-// local 10 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
 // local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
+// local 11 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2611,81 +3564,83 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f8c8: 0x106f8c8: addiu sp, sp, -40
+// 0x0106fc8c: 0x106fc8c: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f8cc: 0x106f8cc: sw    s1, 32(sp)
-	ldloc 5
+// 0x0106fc90: 0x106fc90: sw    s2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
-// 0x0106f8d0: 0x106f8d0: sw    s0, 28(sp)
-	ldloc 5
+// 0x0106fc94: 0x106fc94: sw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
+	ldloc 9
+	stelem.i4
+// 0x0106fc98: 0x106fc98: sw    s0, 16(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
 	stelem.i4
-// 0x0106f8d4: 0x106f8d4: sw    ra, 36(sp)
-// 0x0106f8d8: 0x106f8d8: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x0106f8dc: 0x106f8dc: beq   a1, zero, 0x106f904 addu  s1, a0, zero
+// 0x0106fc9c: 0x106fc9c: sw    ra, 28(sp)
+// 0x0106fca0: 0x106fca0: addu  s2, a1, zero
 	ldloc.2
+	stloc 10
+// 0x0106fca4: 0x106fca4: addu  s1, a0, zero
 	ldloc.1
-	stloc 7
-	brfalse L_106f904
-// --- basic block ---
-// 0x0106f8e4: 0x106f8e4: lui   a1, 0x10000
+	stloc 9
+// 0x0106fca8: 0x106fca8: beq   a1, zero, 0x106fcdc lui   s0, 0x10000
+	ldloc.2
 	ldc.i4 65536
-	stloc.2
-// 0x0106f8e8: 0x106f8e8: lui   a3, 0x10000
+	stloc 8
+	brfalse L_106fcdc
+// --- basic block ---
+// 0x0106fcb0: 0x106fcb0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f8ec: 0x106f8ec: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x0106fcb4: 0x106fcb4: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f8f0: 0x106f8f0: addiu a3, a3, 26312
+// 0x0106fcb8: 0x106fcb8: addiu a3, a3, 26116
 	ldloc 4
-	ldc.i4 26312
+	ldc.i4 26116
 	add
 	stloc 4
-// 0x0106f8f4: 0x106f8f4: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106f8f8: 0x106f8f8: addiu a2, zero, 1445
-	ldc.i4 1445
+// 0x0106fcbc: 0x106fcbc: addiu a2, zero, 2022
+	ldc.i4 2022
 	stloc.3
-// 0x0106f8fc: 0x106f8fc: jal   0x100449c sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
+// 0x0106fcc0: 0x106fcc0: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2693,162 +3648,128 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_106f904:
-// 0x0106f904: 0x106f904: addu  a0, s1, zero
-	ldloc 7
+// 0x0106fcc8: 0x106fcc8: jal   0x10b3718 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0106f908: 0x106f908: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_report_conclude_export_10b3718(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106f910: 0x106f910: lw    ra, 36(sp)
-// 0x0106f914: 0x106f914: lw    s1, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+// 0x0106fcd0: 0x106fcd0: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x0106fcd4: 0x106fcd4: j	 0x106fd40 addu  a1, s2, zero
+	ldloc 10
+	stloc.2
+	br L_106fd40
+// --- basic block ---
+L_106fcdc:
+// 0x0106fcdc: 0x106fcdc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106fce0: 0x106fce0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106fce4: 0x106fce4: addiu a3, a3, 26188
+	ldloc 4
+	ldc.i4 26188
 	add
-	ldelem.i4
-	stloc 7
-// 0x0106f918: 0x106f918: lw    s0, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	stloc 4
+// 0x0106fce8: 0x106fce8: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
-	ldelem.i4
-	stloc 6
-// 0x0106f91c: 0x106f91c: jr    ra addiu sp, sp, 40
+	stloc.2
+// 0x0106fcec: 0x106fcec: jal   0x100449c addiu a2, zero, 2028
+	ldc.i4 2028
+	stloc.3
 	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 10
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_ExternalPoiNotifyOnPopUp_106f924(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
-
-// local  9 is register v0
-// local 10 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f924: 0x106f924: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0106f928: 0x106f928: sw    s1, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 7
-	stelem.i4
-// 0x0106f92c: 0x106f92c: sw    s0, 28(sp)
-	ldloc 5
+// 0x0106fcf4: 0x106fcf4: jal   0x106ee54 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 6
-	stelem.i4
-// 0x0106f930: 0x106f930: sw    ra, 36(sp)
-// 0x0106f934: 0x106f934: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x0106f938: 0x106f938: beq   a1, zero, 0x106f960 addu  s1, a0, zero
-	ldloc.2
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendAllMessagesTogether_SendPart2_106ee54(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brfalse L_106f960
+	stloc 5
 // --- basic block ---
-// 0x0106f940: 0x106f940: lui   a1, 0x10000
+// 0x0106fcfc: 0x106fcfc: beq   v0, zero, 0x106fd24 lui   a3, 0x10000
+	ldloc 5
 	ldc.i4 65536
-	stloc.2
-// 0x0106f944: 0x106f944: lui   a3, 0x10000
+	stloc 4
+	brfalse L_106fd24
+// --- basic block ---
+// 0x0106fd04: 0x106fd04: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f948: 0x106f948: addiu a1, a1, 20732
+// 0x0106fd08: 0x106fd08: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106fd0c: 0x106fd0c: addiu a3, a3, 26256
+	ldloc 4
+	ldc.i4 26256
+	add
+	stloc 4
+// 0x0106fd10: 0x106fd10: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106fd14: 0x106fd14: jal   0x100449c addiu a2, zero, 2031
+	ldc.i4 2031
+	stloc.3
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0106fd1c: 0x106fd1c: j	 0x106fd48 sll   zero, zero, 0
+	br L_106fd48
+// --- basic block ---
+L_106fd24:
+// 0x0106fd24: 0x106fd24: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f94c: 0x106f94c: addiu a3, a3, 26380
+// 0x0106fd28: 0x106fd28: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106fd2c: 0x106fd2c: addiu a3, a3, 26324
 	ldloc 4
-	ldc.i4 26380
+	ldc.i4 26324
 	add
 	stloc 4
-// 0x0106f950: 0x106f950: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106f954: 0x106f954: addiu a2, zero, 1435
-	ldc.i4 1435
+// 0x0106fd30: 0x106fd30: jal   0x100449c addiu a2, zero, 2033
+	ldc.i4 2033
 	stloc.3
-// 0x0106f958: 0x106f958: jal   0x100449c sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2856,58 +3777,69 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_106f960:
-// 0x0106f960: 0x106f960: addu  a0, s1, zero
-	ldloc 7
+// 0x0106fd38: 0x106fd38: addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-// 0x0106f964: 0x106f964: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
+// 0x0106fd3c: 0x106fd3c: addiu a1, zero, 2
+	ldc.i4.2
 	stloc.2
+L_106fd40:
+// 0x0106fd40: 0x106fd40: jal   0x106f394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0106f96c: 0x106f96c: lw    ra, 36(sp)
-// 0x0106f970: 0x106f970: lw    s1, 32(sp)
-	ldloc 5
+L_106fd48:
+// 0x0106fd48: 0x106fd48: lw    ra, 28(sp)
+// 0x0106fd4c: 0x106fd4c: lw    s2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106f974: 0x106f974: lw    s0, 28(sp)
-	ldloc 5
+	stloc 10
+// 0x0106fd50: 0x106fd50: lw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106f978: 0x106f978: jr    ra addiu sp, sp, 40
+	stloc 9
+// 0x0106fd54: 0x106fd54: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 8
+// 0x0106fd58: 0x106fd58: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_FacebookPermissions_106f980(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_MapDisplayed__only_106fd60(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -2948,70 +3880,85 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106f980: 0x106f980: addiu sp, sp, -40
+// 0x0106fd60: 0x106fd60: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106f984: 0x106f984: sw    s1, 32(sp)
+// 0x0106fd64: 0x106fd64: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
-// 0x0106f988: 0x106f988: sw    s0, 28(sp)
+// 0x0106fd68: 0x106fd68: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x0106fd6c: 0x106fd6c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.6
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-// 0x0106f98c: 0x106f98c: sw    ra, 36(sp)
-// 0x0106f990: 0x106f990: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x0106f994: 0x106f994: beq   a1, zero, 0x106f9bc addu  s1, a0, zero
-	ldloc.2
+// 0x0106fd70: 0x106fd70: sw    ra, 28(sp)
+// 0x0106fd74: 0x106fd74: addu  s1, a0, zero
 	ldloc.1
 	stloc 7
-	brfalse L_106f9bc
+// 0x0106fd78: 0x106fd78: bne   s0, zero, 0x106fd98 lui   a1, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc.2
+	brtrue L_106fd98
 // --- basic block ---
-// 0x0106f99c: 0x106f99c: lui   a1, 0x10000
+// 0x0106fd80: 0x106fd80: lui   a3, 0x10000
 	ldc.i4 65536
+	stloc 4
+// 0x0106fd84: 0x106fd84: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
 	stloc.2
-// 0x0106f9a0: 0x106f9a0: lui   a3, 0x10000
+// 0x0106fd88: 0x106fd88: addiu a3, a3, 26400
+	ldloc 4
+	ldc.i4 26400
+	add
+	stloc 4
+// 0x0106fd8c: 0x106fd8c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0106fd90: 0x106fd90: j	 0x106fdac addiu a2, zero, 1940
+	ldc.i4 1940
+	stloc.3
+	br L_106fdac
+// --- basic block ---
+L_106fd98:
+// 0x0106fd98: 0x106fd98: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0106f9a4: 0x106f9a4: addiu a1, a1, 20732
+// 0x0106fd9c: 0x106fd9c: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106f9a8: 0x106f9a8: addiu a3, a3, 26312
+// 0x0106fda0: 0x106fda0: addiu a3, a3, 26488
 	ldloc 4
-	ldc.i4 26312
+	ldc.i4 26488
 	add
 	stloc 4
-// 0x0106f9ac: 0x106f9ac: addiu a0, zero, 4
+// 0x0106fda4: 0x106fda4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0106f9b0: 0x106f9b0: addiu a2, zero, 1426
-	ldc.i4 1426
+// 0x0106fda8: 0x106fda8: addiu a2, zero, 1942
+	ldc.i4 1942
 	stloc.3
-// 0x0106f9b4: 0x106f9b4: jal   0x100449c sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
+L_106fdac:
+// 0x0106fdac: 0x106fdac: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3022,11 +3969,10 @@ __CIBYL_javamethod_begin:
 	stloc 10
 	stloc 9
 // --- basic block ---
-L_106f9bc:
-// 0x0106f9bc: 0x106f9bc: addu  a0, s1, zero
+// 0x0106fdb4: 0x106fdb4: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0106f9c0: 0x106f9c0: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106fdb8: 0x106fdb8: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -3034,33 +3980,33 @@ L_106f9bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106f9c8: 0x106f9c8: lw    ra, 36(sp)
-// 0x0106f9cc: 0x106f9cc: lw    s1, 32(sp)
+// 0x0106fdc0: 0x106fdc0: lw    ra, 28(sp)
+// 0x0106fdc4: 0x106fdc4: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106f9d0: 0x106f9d0: lw    s0, 28(sp)
+// 0x0106fdc8: 0x106fdc8: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106f9d4: 0x106f9d4: jr    ra addiu sp, sp, 40
+// 0x0106fdcc: 0x106fdcc: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3070,25 +4016,27 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_TripServer_106f9dc(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_UserPoints_106fdd4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3097,219 +4045,117 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106f9dc: 0x106f9dc: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106f9e0: 0x106f9e0: sw    ra, 28(sp)
-// 0x0106f9e4: 0x106f9e4: beq   a1, zero, 0x106fa14 addu  v0, a1, zero
-	ldloc.2
-	ldloc.2
-	stloc 5
-	brfalse L_106fa14
-// --- basic block ---
-// 0x0106f9ec: 0x106f9ec: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106f9f0: 0x106f9f0: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106f9f4: 0x106f9f4: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106f9f8: 0x106f9f8: addiu a3, a3, 26456
-	ldloc 4
-	ldc.i4 26456
-	add
-	stloc 4
-// 0x0106f9fc: 0x106f9fc: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106fa00: 0x106fa00: addiu a2, zero, 1416
-	ldc.i4 1416
-	stloc.3
-// 0x0106fa04: 0x106fa04: jal   0x100449c sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0106fa0c: 0x106fa0c: j	 0x106fa1c sll   zero, zero, 0
-	br L_106fa1c
-// --- basic block ---
-L_106fa14:
-// 0x0106fa14: 0x106fa14: jal   0x106ed70 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 5
-// --- basic block ---
-L_106fa1c:
-// 0x0106fa1c: 0x106fa1c: lw    ra, 28(sp)
-// 0x0106fa20: 0x106fa20: sll   zero, zero, 0
-// 0x0106fa24: 0x106fa24: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_ReportMapProblem_106fa2c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
-
-// local  9 is register v0
-// local 10 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
-
 	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fa2c: 0x106fa2c: addiu sp, sp, -32
+// 0x0106fdd4: 0x106fdd4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106fa30: 0x106fa30: sw    s1, 24(sp)
+// 0x0106fdd8: 0x106fdd8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x0106fa34: 0x106fa34: sw    s0, 20(sp)
+// 0x0106fddc: 0x106fddc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
-// 0x0106fa38: 0x106fa38: sw    ra, 28(sp)
-// 0x0106fa3c: 0x106fa3c: addu  s0, a1, zero
+// 0x0106fde0: 0x106fde0: sw    ra, 28(sp)
+// 0x0106fde4: 0x106fde4: addu  s0, a1, zero
 	ldloc.2
-	stloc 6
-// 0x0106fa40: 0x106fa40: beq   a1, zero, 0x106fa60 addu  s1, a0, zero
+	stloc 8
+// 0x0106fde8: 0x106fde8: beq   a1, zero, 0x106fe18 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
-	stloc 7
-	brfalse L_106fa60
+	stloc 9
+	brfalse L_106fe18
 // --- basic block ---
-// 0x0106fa48: 0x106fa48: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106fa4c: 0x106fa4c: lui   a1, 0x10000
+// 0x0106fdf0: 0x106fdf0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106fa50: 0x106fa50: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106fa54: 0x106fa54: addiu a1, a1, 26516
+// 0x0106fdf4: 0x106fdf4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106fdf8: 0x106fdf8: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 26516
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106fa58: 0x106fa58: jal   0x104bfe4 addiu a2, zero, 5
-	ldc.i4.5
+// 0x0106fdfc: 0x106fdfc: addiu a3, a3, 26568
+	ldloc 4
+	ldc.i4 26568
+	add
+	stloc 4
+// 0x0106fe00: 0x106fe00: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106fe04: 0x106fe04: jal   0x100449c addiu a2, zero, 1684
+	ldc.i4 1684
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 6
 // --- basic block ---
-L_106fa60:
-// 0x0106fa60: 0x106fa60: addu  a0, s1, zero
+// 0x0106fe0c: 0x106fe0c: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+// 0x0106fe10: 0x106fe10: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 6
+// 0x0106fe14: 0x106fe14: sw    v1, 15064(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 3766
+	add
 	ldloc 7
+	stelem.i4
+L_106fe18:
+// 0x0106fe18: 0x106fe18: addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-// 0x0106fa64: 0x106fa64: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
+// 0x0106fe1c: 0x106fe1c: jal   0x106f394 addu  a1, s0, zero
+	ldloc 8
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x0106fa6c: 0x106fa6c: lw    ra, 28(sp)
-// 0x0106fa70: 0x106fa70: lw    s1, 24(sp)
+// 0x0106fe24: 0x106fe24: lw    ra, 28(sp)
+// 0x0106fe28: 0x106fe28: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3317,8 +4163,8 @@ L_106fa60:
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106fa74: 0x106fa74: lw    s0, 20(sp)
+	stloc 9
+// 0x0106fe2c: 0x106fe2c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3326,20 +4172,20 @@ L_106fa60:
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106fa78: 0x106fa78: jr    ra addiu sp, sp, 32
+	stloc 8
+// 0x0106fe30: 0x106fe30: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
+	ldloc 6
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_PostComment_106fa80(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_SetMood_106fe38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -3380,12 +4226,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fa80: 0x106fa80: addiu sp, sp, -32
+// 0x0106fe38: 0x106fe38: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106fa84: 0x106fa84: sw    s1, 24(sp)
+// 0x0106fe3c: 0x106fe3c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3394,7 +4240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106fa88: 0x106fa88: sw    s0, 20(sp)
+// 0x0106fe40: 0x106fe40: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3403,50 +4249,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106fa8c: 0x106fa8c: sw    ra, 28(sp)
-// 0x0106fa90: 0x106fa90: addu  s0, a1, zero
+// 0x0106fe44: 0x106fe44: sw    ra, 28(sp)
+// 0x0106fe48: 0x106fe48: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x0106fa94: 0x106fa94: beq   a1, zero, 0x106fab4 addu  s1, a0, zero
+// 0x0106fe4c: 0x106fe4c: beq   a1, zero, 0x106fe70 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 7
-	brfalse L_106fab4
+	brfalse L_106fe70
 // --- basic block ---
-// 0x0106fa9c: 0x106fa9c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106faa0: 0x106faa0: lui   a1, 0x10000
+// 0x0106fe54: 0x106fe54: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106faa4: 0x106faa4: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106faa8: 0x106faa8: addiu a1, a1, 22396
+// 0x0106fe58: 0x106fe58: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106fe5c: 0x106fe5c: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 22396
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106faac: 0x106faac: jal   0x104bfe4 addiu a2, zero, 5
-	ldc.i4.5
+// 0x0106fe60: 0x106fe60: addiu a3, a3, 26640
+	ldloc 4
+	ldc.i4 26640
+	add
+	stloc 4
+// 0x0106fe64: 0x106fe64: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106fe68: 0x106fe68: jal   0x100449c addiu a2, zero, 1674
+	ldc.i4 1674
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-L_106fab4:
-// 0x0106fab4: 0x106fab4: addu  a0, s1, zero
+L_106fe70:
+// 0x0106fe70: 0x106fe70: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0106fab8: 0x106fab8: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106fe74: 0x106fe74: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -3454,13 +4303,13 @@ L_106fab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106fac0: 0x106fac0: lw    ra, 28(sp)
-// 0x0106fac4: 0x106fac4: lw    s1, 24(sp)
+// 0x0106fe7c: 0x106fe7c: lw    ra, 28(sp)
+// 0x0106fe80: 0x106fe80: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3469,7 +4318,7 @@ L_106fab4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106fac8: 0x106fac8: lw    s0, 20(sp)
+// 0x0106fe84: 0x106fe84: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3478,7 +4327,7 @@ L_106fab4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106facc: 0x106facc: jr    ra addiu sp, sp, 32
+// 0x0106fe88: 0x106fe88: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3490,26 +4339,27 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_Scoreboard_106fad4(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_NotifySplashUpdateTime_106fe90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local  7 is register ra
+// local  8 is register ra
 // local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 8
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3520,227 +4370,145 @@ __CIBYL_function_return:
 	stloc 4
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fad4: 0x106fad4: addiu sp, sp, -32
+// 0x0106fe90: 0x106fe90: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106fad8: 0x106fad8: sw    s0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 6
-	stelem.i4
-// 0x0106fadc: 0x106fadc: sw    ra, 28(sp)
-// 0x0106fae0: 0x106fae0: beq   a1, zero, 0x106faf8 addu  s0, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 6
-	brfalse L_106faf8
-// --- basic block ---
-// 0x0106fae8: 0x106fae8: addu  a0, a1, zero
-	ldloc.2
-	stloc.1
-// 0x0106faec: 0x106faec: jal   0x104ad98 sw    a1, 16(sp)
+// 0x0106fe94: 0x106fe94: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc.2
+	ldloc 7
 	stelem.i4
-	call void Cibyl55::roadmap_scoreboard_request_failed_104ad98()
-// --- basic block ---
-// 0x0106faf4: 0x106faf4: lw    a1, 16(sp)
+// 0x0106fe98: 0x106fe98: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc.2
-L_106faf8:
-// 0x0106faf8: 0x106faf8: jal   0x106ed70 addu  a0, s0, zero
 	ldloc 6
-	stloc.1
-	ldloc.0
-	ldloc.1
+	stelem.i4
+// 0x0106fe9c: 0x106fe9c: sw    ra, 36(sp)
+// 0x0106fea0: 0x106fea0: addu  s0, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0106fb00: 0x106fb00: lw    ra, 28(sp)
-// 0x0106fb04: 0x106fb04: lw    s0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 6
-// 0x0106fb08: 0x106fb08: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_Foursquare_106fb10(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
-
-// local  8 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  0 is register sp
-// local  7 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
 	stloc 6
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106fb10: 0x106fb10: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106fb14: 0x106fb14: sw    s0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 6
-	stelem.i4
-// 0x0106fb18: 0x106fb18: sw    ra, 28(sp)
-// 0x0106fb1c: 0x106fb1c: beq   a1, zero, 0x106fb34 addu  s0, a0, zero
+// 0x0106fea4: 0x106fea4: beq   a1, zero, 0x106fecc addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
-	stloc 6
-	brfalse L_106fb34
+	stloc 7
+	brfalse L_106fecc
 // --- basic block ---
-// 0x0106fb24: 0x106fb24: addu  a0, a1, zero
+// 0x0106feac: 0x106feac: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0106feb0: 0x106feb0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106feb4: 0x106feb4: addiu a1, a1, 21196
 	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0106feb8: 0x106feb8: addiu a3, a3, 26704
+	ldloc 4
+	ldc.i4 26704
+	add
+	stloc 4
+// 0x0106febc: 0x106febc: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0106fb28: 0x106fb28: jal   0x10176e8 sw    a1, 16(sp)
+// 0x0106fec0: 0x106fec0: addiu a2, zero, 1454
+	ldc.i4 1454
+	stloc.3
+// 0x0106fec4: 0x106fec4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc.2
+	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl17::roadmap_foursquare_request_failed_10176e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-// 0x0106fb30: 0x106fb30: lw    a1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc.2
-L_106fb34:
-// 0x0106fb34: 0x106fb34: jal   0x106ed70 addu  a0, s0, zero
-	ldloc 6
+L_106fecc:
+// 0x0106fecc: 0x106fecc: addu  a0, s1, zero
+	ldloc 7
 	stloc.1
+// 0x0106fed0: 0x106fed0: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-// 0x0106fb3c: 0x106fb3c: lw    ra, 28(sp)
-// 0x0106fb40: 0x106fb40: lw    s0, 24(sp)
+// 0x0106fed8: 0x106fed8: lw    ra, 36(sp)
+// 0x0106fedc: 0x106fedc: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 7
+// 0x0106fee0: 0x106fee0: lw    s0, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106fb44: 0x106fb44: jr    ra addiu sp, sp, 32
+// 0x0106fee4: 0x106fee4: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_TwitterConnect_106fb4c(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_ExternalPoiNotifyOnNavigate_106feec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
@@ -3748,13 +4516,13 @@ __CIBYL_function_return:
 // local  6 is register s0
 // local  7 is register s1
 // local  0 is register sp
-// local 10 is register ra
+// local  8 is register ra
 // local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 8
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3770,88 +4538,90 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fb4c: 0x106fb4c: addiu sp, sp, -32
+// 0x0106feec: 0x106feec: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106fb50: 0x106fb50: sw    s1, 24(sp)
+// 0x0106fef0: 0x106fef0: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
 	ldloc 7
 	stelem.i4
-// 0x0106fb54: 0x106fb54: sw    s0, 20(sp)
+// 0x0106fef4: 0x106fef4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106fb58: 0x106fb58: sw    ra, 28(sp)
-// 0x0106fb5c: 0x106fb5c: addu  s0, a1, zero
+// 0x0106fef8: 0x106fef8: sw    ra, 36(sp)
+// 0x0106fefc: 0x106fefc: addu  s0, a1, zero
 	ldloc.2
 	stloc 6
-// 0x0106fb60: 0x106fb60: beq   a1, zero, 0x106fb84 addu  s1, a0, zero
+// 0x0106ff00: 0x106ff00: beq   a1, zero, 0x106ff28 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
 	stloc 7
-	brfalse L_106fb84
+	brfalse L_106ff28
 // --- basic block ---
-// 0x0106fb68: 0x106fb68: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106fb6c: 0x106fb6c: lui   a1, 0x10000
+// 0x0106ff08: 0x106ff08: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106fb70: 0x106fb70: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106fb74: 0x106fb74: jal   0x104c148 addiu a1, a1, -26456
+// 0x0106ff0c: 0x106ff0c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106ff10: 0x106ff10: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 -26456
+	ldc.i4 21196
 	add
 	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x0106ff14: 0x106ff14: addiu a3, a3, 26776
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0106fb7c: 0x106fb7c: jal   0x10268f0 addu  a0, zero, zero
-	ldc.i4.s 0
+	ldc.i4 26776
+	add
+	stloc 4
+// 0x0106ff18: 0x106ff18: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x0106ff1c: 0x106ff1c: addiu a2, zero, 1445
+	ldc.i4 1445
+	stloc.3
+// 0x0106ff20: 0x106ff20: jal   0x100449c sw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl28::roadmap_twitter_set_logged_in_10268f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-L_106fb84:
-// 0x0106fb84: 0x106fb84: addu  a0, s1, zero
+L_106ff28:
+// 0x0106ff28: 0x106ff28: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0106fb88: 0x106fb88: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106ff2c: 0x106ff2c: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -3859,63 +4629,63 @@ L_106fb84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-// 0x0106fb90: 0x106fb90: lw    ra, 28(sp)
-// 0x0106fb94: 0x106fb94: lw    s1, 24(sp)
+// 0x0106ff34: 0x106ff34: lw    ra, 36(sp)
+// 0x0106ff38: 0x106ff38: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106fb98: 0x106fb98: lw    s0, 20(sp)
+// 0x0106ff3c: 0x106ff3c: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106fb9c: 0x106fb9c: jr    ra addiu sp, sp, 32
+// 0x0106ff40: 0x106ff40: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_SendSMS_106fba4(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_ExternalPoiNotifyOnPopUp_106ff48(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  6 is register s1
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 10 is register ra
+// local  8 is register ra
 // local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 8
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3925,166 +4695,146 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fba4: 0x106fba4: addiu sp, sp, -32
+// 0x0106ff48: 0x106ff48: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106fba8: 0x106fba8: sw    s1, 24(sp)
+// 0x0106ff4c: 0x106ff4c: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-// 0x0106fbac: 0x106fbac: sw    s0, 20(sp)
+// 0x0106ff50: 0x106ff50: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
-// 0x0106fbb0: 0x106fbb0: sw    ra, 28(sp)
-// 0x0106fbb4: 0x106fbb4: addu  s0, a1, zero
+// 0x0106ff54: 0x106ff54: sw    ra, 36(sp)
+// 0x0106ff58: 0x106ff58: addu  s0, a1, zero
 	ldloc.2
-	stloc 7
-// 0x0106fbb8: 0x106fbb8: bne   a1, zero, 0x106fbe0 addu  s1, a0, zero
+	stloc 6
+// 0x0106ff5c: 0x106ff5c: beq   a1, zero, 0x106ff84 addu  s1, a0, zero
 	ldloc.2
 	ldloc.1
-	stloc 6
-	brtrue L_106fbe0
+	stloc 7
+	brfalse L_106ff84
 // --- basic block ---
-// 0x0106fbc0: 0x106fbc0: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0106fbc4: 0x106fbc4: lui   a1, 0x10000
+// 0x0106ff64: 0x106ff64: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106fbc8: 0x106fbc8: addiu a0, a0, -14268
-	ldloc.1
-	ldc.i4 -14268
-	add
-	stloc.1
-// 0x0106fbcc: 0x106fbcc: addiu a1, a1, 26540
+// 0x0106ff68: 0x106ff68: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106ff6c: 0x106ff6c: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 26540
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106fbd0: 0x106fbd0: jal   0x104bfe4 addiu a2, zero, 3
-	ldc.i4.3
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x0106ff70: 0x106ff70: addiu a3, a3, 26844
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0106fbd8: 0x106fbd8: j	 0x106fbf8 addu  a0, s1, zero
-	ldloc 6
-	stloc.1
-	br L_106fbf8
-// --- basic block ---
-L_106fbe0:
-// 0x0106fbe0: 0x106fbe0: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106fbe4: 0x106fbe4: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0106fbe8: 0x106fbe8: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
+	ldc.i4 26844
 	add
+	stloc 4
+// 0x0106ff74: 0x106ff74: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0106fbec: 0x106fbec: jal   0x104c148 addiu a1, a1, 26516
-	ldloc.2
-	ldc.i4 26516
+// 0x0106ff78: 0x106ff78: addiu a2, zero, 1435
+	ldc.i4 1435
+	stloc.3
+// 0x0106ff7c: 0x106ff7c: jal   0x100449c sw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-// 0x0106fbf4: 0x106fbf4: addu  a0, s1, zero
-	ldloc 6
-	stloc.1
-L_106fbf8:
-// 0x0106fbf8: 0x106fbf8: jal   0x106ed70 addu  a1, s0, zero
+L_106ff84:
+// 0x0106ff84: 0x106ff84: addu  a0, s1, zero
 	ldloc 7
+	stloc.1
+// 0x0106ff88: 0x106ff88: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-// 0x0106fc00: 0x106fc00: lw    ra, 28(sp)
-// 0x0106fc04: 0x106fc04: lw    s1, 24(sp)
+// 0x0106ff90: 0x106ff90: lw    ra, 36(sp)
+// 0x0106ff94: 0x106ff94: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 6
-// 0x0106fc08: 0x106fc08: lw    s0, 20(sp)
+	stloc 7
+// 0x0106ff98: 0x106ff98: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 7
-// 0x0106fc0c: 0x106fc0c: jr    ra addiu sp, sp, 32
+	stloc 6
+// 0x0106ff9c: 0x106ff9c: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_PingWazer_106fc14(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_FacebookPermissions_106ffa4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
@@ -4092,13 +4842,13 @@ __CIBYL_function_return:
 // local  6 is register s0
 // local  7 is register s1
 // local  0 is register sp
-// local 10 is register ra
+// local  8 is register ra
 // local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 8
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4114,86 +4864,90 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fc14: 0x106fc14: addiu sp, sp, -32
+// 0x0106ffa4: 0x106ffa4: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0106fc18: 0x106fc18: sw    s0, 20(sp)
+// 0x0106ffa8: 0x106ffa8: sw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.8
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-// 0x0106fc1c: 0x106fc1c: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x0106fc20: 0x106fc20: sw    s1, 24(sp)
+// 0x0106ffac: 0x106ffac: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.7
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
-// 0x0106fc24: 0x106fc24: sw    ra, 28(sp)
-// 0x0106fc28: 0x106fc28: jal   0x104c3f0 addu  s1, a0, zero
+// 0x0106ffb0: 0x106ffb0: sw    ra, 36(sp)
+// 0x0106ffb4: 0x106ffb4: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x0106ffb8: 0x106ffb8: beq   a1, zero, 0x106ffe0 addu  s1, a0, zero
+	ldloc.2
 	ldloc.1
 	stloc 7
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0106fc30: 0x106fc30: beq   s0, zero, 0x106fc54 addu  a0, s1, zero
-	ldloc 6
-	ldloc 7
-	stloc.1
-	brfalse L_106fc54
+	brfalse L_106ffe0
 // --- basic block ---
-// 0x0106fc38: 0x106fc38: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106fc3c: 0x106fc3c: lui   a1, 0x10000
+// 0x0106ffc0: 0x106ffc0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0106fc40: 0x106fc40: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0106fc44: 0x106fc44: addiu a1, a1, 22420
+// 0x0106ffc4: 0x106ffc4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0106ffc8: 0x106ffc8: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 22420
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106fc48: 0x106fc48: jal   0x104bfe4 addiu a2, zero, 5
-	ldc.i4.5
+// 0x0106ffcc: 0x106ffcc: addiu a3, a3, 26776
+	ldloc 4
+	ldc.i4 26776
+	add
+	stloc 4
+// 0x0106ffd0: 0x106ffd0: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0106ffd4: 0x106ffd4: addiu a2, zero, 1426
+	ldc.i4 1426
 	stloc.3
+// 0x0106ffd8: 0x106ffd8: jal   0x100449c sw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-// 0x0106fc50: 0x106fc50: addu  a0, s1, zero
+L_106ffe0:
+// 0x0106ffe0: 0x106ffe0: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-L_106fc54:
-// 0x0106fc54: 0x106fc54: jal   0x106ed70 addu  a1, s0, zero
+// 0x0106ffe4: 0x106ffe4: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -4201,63 +4955,61 @@ L_106fc54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
 	stloc 9
-	stloc 8
 // --- basic block ---
-// 0x0106fc5c: 0x106fc5c: lw    ra, 28(sp)
-// 0x0106fc60: 0x106fc60: lw    s1, 24(sp)
+// 0x0106ffec: 0x106ffec: lw    ra, 36(sp)
+// 0x0106fff0: 0x106fff0: lw    s1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106fc64: 0x106fc64: lw    s0, 20(sp)
+// 0x0106fff4: 0x106fff4: lw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106fc68: 0x106fc68: jr    ra addiu sp, sp, 32
+// 0x0106fff8: 0x106fff8: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_ReportAlert_106fc70(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_TripServer_1070000(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  6 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4266,162 +5018,98 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106fc70: 0x106fc70: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0106fc74: 0x106fc74: sw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 8
-	stelem.i4
-// 0x0106fc78: 0x106fc78: addu  s0, a1, zero
-	ldloc.2
-	stloc 8
-// 0x0106fc7c: 0x106fc7c: sw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x0106fc80: 0x106fc80: sw    ra, 28(sp)
-// 0x0106fc84: 0x106fc84: jal   0x10787d4 addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl90::RTAlerts_CloseProgressDlg_10787d4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106fc8c: 0x106fc8c: bne   s0, zero, 0x106fcac lui   a1, 0x10000
-	ldloc 8
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106fcac
-// --- basic block ---
-// 0x0106fc94: 0x106fc94: jal   0x1077b68 sll   zero, zero, 0
-	call int32 Cibyl89::RTAlerts_Resert_Minimized_1077b68()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
-// --- basic block ---
-// 0x0106fc9c: 0x106fc9c: jal   0x101eee8 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106fca4: 0x106fca4: j	 0x106fcc4 addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-	br L_106fcc4
-// --- basic block ---
-L_106fcac:
-// 0x0106fcac: 0x106fcac: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0106fcb0: 0x106fcb0: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01070000: 0x1070000: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	stloc.1
-// 0x0106fcb4: 0x106fcb4: addiu a1, a1, 26556
+	stloc.0
+// 0x01070004: 0x1070004: sw    ra, 28(sp)
+// 0x01070008: 0x1070008: beq   a1, zero, 0x1070038 addu  v0, a1, zero
+	ldloc.2
+	ldloc.2
+	stloc 5
+	brfalse L_1070038
+// --- basic block ---
+// 0x01070010: 0x1070010: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01070014: 0x1070014: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070018: 0x1070018: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 26556
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x0106fcb8: 0x106fcb8: jal   0x104bfe4 addiu a2, zero, 5
-	ldc.i4.5
+// 0x0107001c: 0x107001c: addiu a3, a3, 26920
+	ldloc 4
+	ldc.i4 26920
+	add
+	stloc 4
+// 0x01070020: 0x1070020: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01070024: 0x1070024: addiu a2, zero, 1416
+	ldc.i4 1416
 	stloc.3
+// 0x01070028: 0x1070028: jal   0x100449c sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x0106fcc0: 0x106fcc0: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-L_106fcc4:
-// 0x0106fcc4: 0x106fcc4: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 8
-	stloc.2
+// 0x01070030: 0x1070030: j	 0x1070040 sll   zero, zero, 0
+	br L_1070040
+// --- basic block ---
+L_1070038:
+// 0x01070038: 0x1070038: jal   0x106f394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0106fccc: 0x106fccc: lw    ra, 28(sp)
-// 0x0106fcd0: 0x106fcd0: lw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 9
-// 0x0106fcd4: 0x106fcd4: lw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
 	stloc 8
-// 0x0106fcd8: 0x106fcd8: jr    ra addiu sp, sp, 32
+	stloc 5
+// --- basic block ---
+L_1070040:
+// 0x01070040: 0x1070040: lw    ra, 28(sp)
+// 0x01070044: 0x1070044: sll   zero, zero, 0
+// 0x01070048: 0x1070048: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_ExternalPoiDisplayed_106fce0(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_ReportMapProblem_1070050(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
@@ -4462,99 +5150,73 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fce0: 0x106fce0: addiu sp, sp, -32
+// 0x01070050: 0x1070050: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106fce4: 0x106fce4: sw    s0, 20(sp)
+// 0x01070054: 0x1070054: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-// 0x0106fce8: 0x106fce8: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x0106fcec: 0x106fcec: sw    s1, 24(sp)
+// 0x01070058: 0x1070058: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
-// 0x0106fcf0: 0x106fcf0: sw    ra, 28(sp)
-// 0x0106fcf4: 0x106fcf4: addu  s1, a0, zero
+// 0x0107005c: 0x107005c: sw    ra, 28(sp)
+// 0x01070060: 0x1070060: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x01070064: 0x1070064: beq   a1, zero, 0x1070084 addu  s1, a0, zero
+	ldloc.2
 	ldloc.1
 	stloc 7
-// 0x0106fcf8: 0x106fcf8: bne   s0, zero, 0x106fd18 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brtrue L_106fd18
+	brfalse L_1070084
 // --- basic block ---
-// 0x0106fd00: 0x106fd00: lui   a3, 0x10000
+// 0x0107006c: 0x107006c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01070070: 0x1070070: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x0106fd04: 0x106fd04: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x0106fd08: 0x106fd08: addiu a3, a3, 26600
-	ldloc 4
-	ldc.i4 26600
+// 0x01070074: 0x1070074: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	stloc 4
-// 0x0106fd0c: 0x106fd0c: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0106fd10: 0x106fd10: j	 0x106fd2c addiu a2, zero, 1218
-	ldc.i4 1218
-	stloc.3
-	br L_106fd2c
-// --- basic block ---
-L_106fd18:
-// 0x0106fd18: 0x106fd18: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106fd1c: 0x106fd1c: addiu a1, a1, 20732
+// 0x01070078: 0x1070078: addiu a1, a1, 26980
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 26980
 	add
 	stloc.2
-// 0x0106fd20: 0x106fd20: addiu a3, a3, 26676
-	ldloc 4
-	ldc.i4 26676
-	add
-	stloc 4
-// 0x0106fd24: 0x106fd24: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106fd28: 0x106fd28: addiu a2, zero, 1221
-	ldc.i4 1221
+// 0x0107007c: 0x107007c: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
 	stloc.3
-L_106fd2c:
-// 0x0106fd2c: 0x106fd2c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106fd34: 0x106fd34: addu  a0, s1, zero
+L_1070084:
+// 0x01070084: 0x1070084: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
-// 0x0106fd38: 0x106fd38: jal   0x106ed70 addu  a1, s0, zero
+// 0x01070088: 0x1070088: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
 	stloc.2
 	ldloc.0
@@ -4562,13 +5224,13 @@ L_106fd2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106fd40: 0x106fd40: lw    ra, 28(sp)
-// 0x0106fd44: 0x106fd44: lw    s1, 24(sp)
+// 0x01070090: 0x1070090: lw    ra, 28(sp)
+// 0x01070094: 0x1070094: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4577,7 +5239,7 @@ L_106fd2c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0106fd48: 0x106fd48: lw    s0, 20(sp)
+// 0x01070098: 0x1070098: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4586,7 +5248,7 @@ L_106fd2c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106fd4c: 0x106fd4c: jr    ra addiu sp, sp, 32
+// 0x0107009c: 0x107009c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4598,111 +5260,10 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_CreateAccount_106fd54(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
-
-// local  8 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  5 is register s0
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0106fd54: 0x106fd54: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0106fd58: 0x106fd58: sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0106fd5c: 0x106fd5c: sw    ra, 20(sp)
-// 0x0106fd60: 0x106fd60: jal   0x106ed70 addu  s0, a1, zero
-	ldloc.2
-	stloc 5
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0106fd68: 0x106fd68: jal   0x10a9228 addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl126::roadmap_login_update_details_on_response_10a9228(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0106fd70: 0x106fd70: lw    ra, 20(sp)
-// 0x0106fd74: 0x106fd74: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-// 0x0106fd78: 0x106fd78: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_NodePath_106fd80(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_PostComment_10700a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
 // local  9 is register v0
 // local 10 is register v1
@@ -4712,9 +5273,8 @@ __CIBYL_function_return:
 // local  4 is register a3
 // local  6 is register s0
 // local  7 is register s1
-// local  8 is register s2
 // local  0 is register sp
-// local 11 is register ra
+// local  8 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -4733,161 +5293,95 @@ __CIBYL_function_return:
 	stloc 6
 	ldc.i4.s 0
 	stloc 7
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fd80: 0x106fd80: addiu sp, sp, -32
+// 0x010700a4: 0x10700a4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106fd84: 0x106fd84: sw    s2, 24(sp)
+// 0x010700a8: 0x10700a8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 8
-	stelem.i4
-// 0x0106fd88: 0x106fd88: sw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
 	ldloc 7
 	stelem.i4
-// 0x0106fd8c: 0x106fd8c: sw    s0, 16(sp)
+// 0x010700ac: 0x10700ac: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
 	ldloc 6
 	stelem.i4
-// 0x0106fd90: 0x106fd90: sw    ra, 28(sp)
-// 0x0106fd94: 0x106fd94: addu  s1, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0106fd98: 0x106fd98: addu  s2, a0, zero
-	ldloc.1
-	stloc 8
-// 0x0106fd9c: 0x106fd9c: bne   a1, zero, 0x106fdd4 lui   s0, 0x10000
+// 0x010700b0: 0x10700b0: sw    ra, 28(sp)
+// 0x010700b4: 0x10700b4: addu  s0, a1, zero
 	ldloc.2
-	ldc.i4 65536
 	stloc 6
-	brtrue L_106fdd4
-// --- basic block ---
-// 0x0106fda4: 0x106fda4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106fda8: 0x106fda8: addiu a3, a3, 26744
-	ldloc 4
-	ldc.i4 26744
-	add
-	stloc 4
-// 0x0106fdac: 0x106fdac: addiu a1, s0, 20732
-	ldloc 6
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106fdb0: 0x106fdb0: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106fdb4: 0x106fdb4: jal   0x100449c addiu a2, zero, 1196
-	ldc.i4 1196
-	stloc.3
-	ldloc.0
-	ldloc.1
+// 0x010700b8: 0x10700b8: beq   a1, zero, 0x10700d8 addu  s1, a0, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	ldloc.1
+	stloc 7
+	brfalse L_10700d8
 // --- basic block ---
-// 0x0106fdbc: 0x106fdbc: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106fdc0: 0x106fdc0: addiu a1, s0, 20732
-	ldloc 6
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106fdc4: 0x106fdc4: addiu a3, a3, 26856
-	ldloc 4
-	ldc.i4 26856
-	add
-	stloc 4
-// 0x0106fdc8: 0x106fdc8: addiu a0, zero, 1
-	ldc.i4.1
+// 0x010700c0: 0x10700c0: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x0106fdcc: 0x106fdcc: j	 0x106fde8 addiu a2, zero, 1197
-	ldc.i4 1197
-	stloc.3
-	br L_106fde8
-// --- basic block ---
-L_106fdd4:
-// 0x0106fdd4: 0x106fdd4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106fdd8: 0x106fdd8: addiu a1, s0, 20732
-	ldloc 6
-	ldc.i4 20732
-	add
+// 0x010700c4: 0x10700c4: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0106fddc: 0x106fddc: addiu a3, a3, 26924
-	ldloc 4
-	ldc.i4 26924
+// 0x010700c8: 0x10700c8: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	stloc 4
-// 0x0106fde0: 0x106fde0: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0106fde4: 0x106fde4: addiu a2, zero, 1200
-	ldc.i4 1200
+// 0x010700cc: 0x10700cc: addiu a1, a1, 22860
+	ldloc.2
+	ldc.i4 22860
+	add
+	stloc.2
+// 0x010700d0: 0x10700d0: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
 	stloc.3
-L_106fde8:
-// 0x0106fde8: 0x106fde8: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106fdf0: 0x106fdf0: addu  a0, s2, zero
-	ldloc 8
-	stloc.1
-// 0x0106fdf4: 0x106fdf4: jal   0x106ed70 addu  a1, s1, zero
+L_10700d8:
+// 0x010700d8: 0x10700d8: addu  a0, s1, zero
 	ldloc 7
+	stloc.1
+// 0x010700dc: 0x10700dc: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 10
 	stloc 9
 // --- basic block ---
-// 0x0106fdfc: 0x106fdfc: lw    ra, 28(sp)
-// 0x0106fe00: 0x106fe00: lw    s2, 24(sp)
+// 0x010700e4: 0x10700e4: lw    ra, 28(sp)
+// 0x010700e8: 0x10700e8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4895,26 +5389,17 @@ L_106fde8:
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106fe04: 0x106fe04: lw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
 	stloc 7
-// 0x0106fe08: 0x106fe08: lw    s0, 16(sp)
+// 0x010700ec: 0x10700ec: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
 	ldelem.i4
 	stloc 6
-// 0x0106fe0c: 0x106fe0c: jr    ra addiu sp, sp, 32
+// 0x010700f0: 0x10700f0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4926,28 +5411,26 @@ __CIBYL_function_return:
 	ldloc 9
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_GPSPath_106fe14(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_Scoreboard_10700f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  6 is register s0
 // local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
+// local  7 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4957,337 +5440,242 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
+	stloc 6
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106fe14: 0x106fe14: addiu sp, sp, -32
+// 0x010700f8: 0x10700f8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106fe18: 0x106fe18: sw    s2, 24(sp)
-	ldloc 6
+// 0x010700fc: 0x10700fc: sw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 10
-	stelem.i4
-// 0x0106fe1c: 0x106fe1c: sw    s1, 20(sp)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
 	stelem.i4
-// 0x0106fe20: 0x106fe20: sw    s0, 16(sp)
-	ldloc 6
+// 0x01070100: 0x1070100: sw    ra, 28(sp)
+// 0x01070104: 0x1070104: beq   a1, zero, 0x107011c addu  s0, a0, zero
+	ldloc.2
+	ldloc.1
+	stloc 6
+	brfalse L_107011c
+// --- basic block ---
+// 0x0107010c: 0x107010c: addu  a0, a1, zero
+	ldloc.2
+	stloc.1
+// 0x01070110: 0x1070110: jal   0x104ada8 sw    a1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 8
-	stelem.i4
-// 0x0106fe24: 0x106fe24: sw    ra, 28(sp)
-// 0x0106fe28: 0x106fe28: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x0106fe2c: 0x106fe2c: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0106fe30: 0x106fe30: beq   a1, zero, 0x106fe5c lui   s0, 0x10000
 	ldloc.2
-	ldc.i4 65536
-	stloc 8
-	brfalse L_106fe5c
+	stelem.i4
+	call void Cibyl55::roadmap_scoreboard_request_failed_104ada8()
 // --- basic block ---
-// 0x0106fe38: 0x106fe38: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106fe3c: 0x106fe3c: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106fe40: 0x106fe40: addiu a0, zero, 4
+// 0x01070118: 0x1070118: lw    a1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
 	ldc.i4.4
-	stloc.1
-// 0x0106fe44: 0x106fe44: addiu a3, a3, 26992
-	ldloc 4
-	ldc.i4 26992
 	add
-	stloc 4
-// 0x0106fe48: 0x106fe48: jal   0x100449c addiu a2, zero, 1263
-	ldc.i4 1263
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106fe50: 0x106fe50: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x0106fe54: 0x106fe54: j	 0x106fedc addu  a1, s2, zero
-	ldloc 10
+	ldelem.i4
 	stloc.2
-	br L_106fedc
-// --- basic block ---
-L_106fe5c:
-// 0x0106fe5c: 0x106fe5c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106fe60: 0x106fe60: addiu a3, a3, 27056
-	ldloc 4
-	ldc.i4 27056
-	add
-	stloc 4
-// 0x0106fe64: 0x106fe64: addiu a0, zero, 1
-	ldc.i4.1
+L_107011c:
+// 0x0107011c: 0x107011c: jal   0x106f394 addu  a0, s0, zero
+	ldloc 6
 	stloc.1
-// 0x0106fe68: 0x106fe68: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106fe6c: 0x106fe6c: jal   0x100449c addiu a2, zero, 1268
-	ldc.i4 1268
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x0106fe74: 0x106fe74: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0106fe78: 0x106fe78: lw    v0, -19060(v0)
-	ldloc 6
+// 0x01070124: 0x1070124: lw    ra, 28(sp)
+// 0x01070128: 0x1070128: lw    s0, 24(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106fe7c: 0x106fe7c: sll   zero, zero, 0
-// 0x0106fe80: 0x106fe80: lw    v0, 4(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc 6
+// 0x0107012c: 0x107012c: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 5
-// 0x0106fe84: 0x106fe84: sll   zero, zero, 0
-// 0x0106fe88: 0x106fe88: blez  v0, 0x106feec addu  a0, s1, zero
-	ldloc 5
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 9
-	stloc.1
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_Foursquare_1070134(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
+
+// local  8 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  6 is register s0
+// local  0 is register sp
+// local  7 is register ra
+// local  5 is register mem
+
 	ldc.i4.s 0
-	ble L_106feec
-// --- basic block ---
-// 0x0106fe90: 0x106fe90: jal   0x106e590 addu  a0, zero, zero
+	stloc 8
 	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendMessage_NodePath_106e590(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106fe98: 0x106fe98: beq   v0, zero, 0x106fec0 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brfalse L_106fec0
-// --- basic block ---
-// 0x0106fea0: 0x106fea0: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106fea4: 0x106fea4: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106fea8: 0x106fea8: addiu a3, a3, 27164
-	ldloc 4
-	ldc.i4 27164
-	add
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0106feac: 0x106feac: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106feb0: 0x106feb0: jal   0x100449c addiu a2, zero, 1273
-	ldc.i4 1273
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
+	stloc 6
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106feb8: 0x106feb8: j	 0x106fef4 sll   zero, zero, 0
-	br L_106fef4
-// --- basic block ---
-L_106fec0:
-// 0x0106fec0: 0x106fec0: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0106fec4: 0x106fec4: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0106fec8: 0x106fec8: addiu a3, a3, 27224
-	ldloc 4
-	ldc.i4 27224
+// 0x01070134: 0x1070134: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	stloc 4
-// 0x0106fecc: 0x106fecc: jal   0x100449c addiu a2, zero, 1276
-	ldc.i4 1276
-	stloc.3
+	stloc.0
+// 0x01070138: 0x1070138: sw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 6
+	stelem.i4
+// 0x0107013c: 0x107013c: sw    ra, 28(sp)
+// 0x01070140: 0x1070140: beq   a1, zero, 0x1070158 addu  s0, a0, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106fed4: 0x106fed4: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x0106fed8: 0x106fed8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-L_106fedc:
-// 0x0106fedc: 0x106fedc: jal   0x106ed70 sll   zero, zero, 0
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106fee4: 0x106fee4: j	 0x106fef4 sll   zero, zero, 0
-	br L_106fef4
+	stloc 6
+	brfalse L_1070158
 // --- basic block ---
-L_106feec:
-// 0x0106feec: 0x106feec: jal   0x106fd80 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+// 0x01070148: 0x1070148: addu  a0, a1, zero
+	ldloc.2
+	stloc.1
+// 0x0107014c: 0x107014c: jal   0x10176f8 sw    a1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc.2
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::OnAsyncOperationCompleted_NodePath_106fd80(int32,int32,int32,int32,int32)
+	call int32 Cibyl17::roadmap_foursquare_request_failed_10176f8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-L_106fef4:
-// 0x0106fef4: 0x106fef4: lw    ra, 28(sp)
-// 0x0106fef8: 0x106fef8: lw    s2, 24(sp)
-	ldloc 6
+// 0x01070154: 0x1070154: lw    a1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 10
-// 0x0106fefc: 0x106fefc: lw    s1, 20(sp)
+	stloc.2
+L_1070158:
+// 0x01070158: 0x1070158: jal   0x106f394 addu  a0, s0, zero
 	ldloc 6
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
-// 0x0106ff00: 0x106ff00: lw    s0, 16(sp)
-	ldloc 6
+	stloc 8
+// --- basic block ---
+// 0x01070160: 0x1070160: lw    ra, 28(sp)
+// 0x01070164: 0x1070164: lw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 8
-// 0x0106ff04: 0x106ff04: jr    ra addiu sp, sp, 32
+	stloc 6
+// 0x01070168: 0x1070168: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_CreateNewRoads_106ff0c(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_TwitterConnect_1070170(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5297,341 +5685,341 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ff0c: 0x106ff0c: addiu sp, sp, -32
+// 0x01070170: 0x1070170: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0106ff10: 0x106ff10: sw    s2, 24(sp)
-	ldloc 6
+// 0x01070174: 0x1070174: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 10
+	ldloc 7
 	stelem.i4
-// 0x0106ff14: 0x106ff14: sw    s1, 20(sp)
-	ldloc 6
+// 0x01070178: 0x1070178: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 9
-	stelem.i4
-// 0x0106ff18: 0x106ff18: sw    s0, 16(sp)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
 	stelem.i4
-// 0x0106ff1c: 0x106ff1c: sw    ra, 28(sp)
-// 0x0106ff20: 0x106ff20: addu  s2, a1, zero
+// 0x0107017c: 0x107017c: sw    ra, 28(sp)
+// 0x01070180: 0x1070180: addu  s0, a1, zero
 	ldloc.2
-	stloc 10
-// 0x0106ff24: 0x106ff24: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0106ff28: 0x106ff28: beq   a1, zero, 0x106ff54 lui   s0, 0x10000
+	stloc 6
+// 0x01070184: 0x1070184: beq   a1, zero, 0x10701a8 addu  s1, a0, zero
 	ldloc.2
-	ldc.i4 65536
-	stloc 8
-	brfalse L_106ff54
+	ldloc.1
+	stloc 7
+	brfalse L_10701a8
 // --- basic block ---
-// 0x0106ff30: 0x106ff30: lui   a3, 0x10000
+// 0x0107018c: 0x107018c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01070190: 0x1070190: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x0106ff34: 0x106ff34: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x0106ff38: 0x106ff38: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01070194: 0x1070194: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
 	stloc.1
-// 0x0106ff3c: 0x106ff3c: addiu a3, a3, 27292
-	ldloc 4
-	ldc.i4 27292
+// 0x01070198: 0x1070198: jal   0x104c158 addiu a1, a1, -26456
+	ldloc.2
+	ldc.i4 -26456
 	add
-	stloc 4
-// 0x0106ff40: 0x106ff40: jal   0x100449c addiu a2, zero, 1315
-	ldc.i4 1315
-	stloc.3
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x0106ff48: 0x106ff48: addu  a0, s1, zero
-	ldloc 9
+// 0x010701a0: 0x10701a0: jal   0x1026900 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0106ff4c: 0x106ff4c: j	 0x106ffd8 addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-	br L_106ffd8
-// --- basic block ---
-L_106ff54:
-// 0x0106ff54: 0x106ff54: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106ff58: 0x106ff58: addiu a3, a3, 27372
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 27372
-	add
-	stloc 4
-// 0x0106ff5c: 0x106ff5c: addiu a0, zero, 1
-	ldc.i4.1
+	call int32 Cibyl28::roadmap_twitter_set_logged_in_1026900(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
+// --- basic block ---
+L_10701a8:
+// 0x010701a8: 0x10701a8: addu  a0, s1, zero
+	ldloc 7
 	stloc.1
-// 0x0106ff60: 0x106ff60: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
+// 0x010701ac: 0x10701ac: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
-// 0x0106ff64: 0x106ff64: jal   0x100449c addiu a2, zero, 1320
-	ldc.i4 1320
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x0106ff6c: 0x106ff6c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0106ff70: 0x106ff70: lw    v0, -19060(v0)
-	ldloc 6
+// 0x010701b4: 0x10701b4: lw    ra, 28(sp)
+// 0x010701b8: 0x10701b8: lw    s1, 24(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106ff74: 0x106ff74: sll   zero, zero, 0
-// 0x0106ff78: 0x106ff78: lw    v0, 16(v0)
-	ldloc 6
+	stloc 7
+// 0x010701bc: 0x10701bc: lw    s0, 20(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 5
-// 0x0106ff7c: 0x106ff7c: sll   zero, zero, 0
-// 0x0106ff80: 0x106ff80: slti  v0, v0, 2
-	ldloc 5
-	ldc.i4.2
-	clt
-	stloc 5
-// 0x0106ff84: 0x106ff84: bne   v0, zero, 0x106ffe8 addu  a0, s1, zero
-	ldloc 5
+	stloc 6
+// 0x010701c0: 0x10701c0: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 9
-	stloc.1
-	brtrue L_106ffe8
-// --- basic block ---
-// 0x0106ff8c: 0x106ff8c: jal   0x106e518 addu  a0, zero, zero
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_SendSMS_10701c8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 s0,int32 v0,int32 v1,int32 ra)
+
+// local  8 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  6 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendMessage_GPSPath_106e518(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
+	ldc.i4.s 0
+	stloc 6
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0106ff94: 0x106ff94: beq   v0, zero, 0x106ffbc lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brfalse L_106ffbc
-// --- basic block ---
-// 0x0106ff9c: 0x106ff9c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0106ffa0: 0x106ffa0: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+// 0x010701c8: 0x10701c8: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	stloc.2
-// 0x0106ffa4: 0x106ffa4: addiu a3, a3, 27444
-	ldloc 4
-	ldc.i4 27444
+	stloc.0
+// 0x010701cc: 0x10701cc: sw    s1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc 4
-// 0x0106ffa8: 0x106ffa8: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0106ffac: 0x106ffac: jal   0x100449c addiu a2, zero, 1325
-	ldc.i4 1325
-	stloc.3
+	ldloc 6
+	stelem.i4
+// 0x010701d0: 0x10701d0: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
+// 0x010701d4: 0x10701d4: sw    ra, 28(sp)
+// 0x010701d8: 0x10701d8: addu  s0, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ffb4: 0x106ffb4: j	 0x106fff0 sll   zero, zero, 0
-	br L_106fff0
+	stloc 7
+// 0x010701dc: 0x10701dc: bne   a1, zero, 0x1070204 addu  s1, a0, zero
+	ldloc.2
+	ldloc.1
+	stloc 6
+	brtrue L_1070204
 // --- basic block ---
-L_106ffbc:
-// 0x0106ffbc: 0x106ffbc: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
+// 0x010701e4: 0x10701e4: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x010701e8: 0x10701e8: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0106ffc0: 0x106ffc0: addiu a0, zero, 4
-	ldc.i4.4
+// 0x010701ec: 0x10701ec: addiu a0, a0, -14272
+	ldloc.1
+	ldc.i4 -14272
+	add
 	stloc.1
-// 0x0106ffc4: 0x106ffc4: addiu a3, a3, 27512
-	ldloc 4
-	ldc.i4 27512
+// 0x010701f0: 0x10701f0: addiu a1, a1, 27004
+	ldloc.2
+	ldc.i4 27004
 	add
-	stloc 4
-// 0x0106ffc8: 0x106ffc8: jal   0x100449c addiu a2, zero, 1328
-	ldc.i4 1328
+	stloc.2
+// 0x010701f4: 0x10701f4: jal   0x104bff4 addiu a2, zero, 3
+	ldc.i4.3
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x0106ffd0: 0x106ffd0: addu  a0, s1, zero
-	ldloc 9
+// 0x010701fc: 0x10701fc: j	 0x107021c addu  a0, s1, zero
+	ldloc 6
 	stloc.1
-// 0x0106ffd4: 0x106ffd4: addiu a1, zero, 2
-	ldc.i4.2
+	br L_107021c
+// --- basic block ---
+L_1070204:
+// 0x01070204: 0x1070204: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01070208: 0x1070208: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107020c: 0x107020c: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x01070210: 0x1070210: jal   0x104c158 addiu a1, a1, 26980
+	ldloc.2
+	ldc.i4 26980
+	add
 	stloc.2
-L_106ffd8:
-// 0x0106ffd8: 0x106ffd8: jal   0x106ed70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0106ffe0: 0x106ffe0: j	 0x106fff0 sll   zero, zero, 0
-	br L_106fff0
+	stloc 9
+	stloc 8
 // --- basic block ---
-L_106ffe8:
-// 0x0106ffe8: 0x106ffe8: jal   0x106fe14 addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x01070218: 0x1070218: addu  a0, s1, zero
+	ldloc 6
+	stloc.1
+L_107021c:
+// 0x0107021c: 0x107021c: jal   0x106f394 addu  a1, s0, zero
+	ldloc 7
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::OnAsyncOperationCompleted_GPSPath_106fe14(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-L_106fff0:
-// 0x0106fff0: 0x106fff0: lw    ra, 28(sp)
-// 0x0106fff4: 0x106fff4: lw    s2, 24(sp)
-	ldloc 6
+// 0x01070224: 0x1070224: lw    ra, 28(sp)
+// 0x01070228: 0x1070228: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 10
-// 0x0106fff8: 0x106fff8: lw    s1, 20(sp)
-	ldloc 6
+	stloc 6
+// 0x0107022c: 0x107022c: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 9
-// 0x0106fffc: 0x106fffc: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x01070000: 0x1070000: jr    ra addiu sp, sp, 32
+	stloc 7
+// 0x01070230: 0x1070230: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_MapDisplayed_1070008(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_PingWazer_1070238(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5641,337 +6029,156 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01070008: 0x1070008: addiu sp, sp, -32
+// 0x01070238: 0x1070238: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0107000c: 0x107000c: sw    s2, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-// 0x01070010: 0x1070010: sw    s1, 20(sp)
-	ldloc 6
+// 0x0107023c: 0x107023c: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 9
-	stelem.i4
-// 0x01070014: 0x1070014: sw    s0, 16(sp)
 	ldloc 6
+	stelem.i4
+// 0x01070240: 0x1070240: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x01070244: 0x1070244: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x01070018: 0x1070018: sw    ra, 28(sp)
-// 0x0107001c: 0x107001c: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x01070020: 0x1070020: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x01070024: 0x1070024: beq   a1, zero, 0x1070050 lui   s0, 0x10000
-	ldloc.2
-	ldc.i4 65536
-	stloc 8
-	brfalse L_1070050
-// --- basic block ---
-// 0x0107002c: 0x107002c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01070030: 0x1070030: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01070034: 0x1070034: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01070038: 0x1070038: addiu a3, a3, 27588
-	ldloc 4
-	ldc.i4 27588
-	add
-	stloc 4
-// 0x0107003c: 0x107003c: jal   0x100449c addiu a2, zero, 1518
-	ldc.i4 1518
-	stloc.3
-	ldloc.0
+// 0x01070248: 0x1070248: sw    ra, 28(sp)
+// 0x0107024c: 0x107024c: jal   0x104c400 addu  s1, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01070044: 0x1070044: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x01070048: 0x1070048: j	 0x10700d0 addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-	br L_10700d0
-// --- basic block ---
-L_1070050:
-// 0x01070050: 0x1070050: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01070054: 0x1070054: addiu a3, a3, 27664
-	ldloc 4
-	ldc.i4 27664
-	add
-	stloc 4
-// 0x01070058: 0x1070058: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107005c: 0x107005c: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01070060: 0x1070060: jal   0x100449c addiu a2, zero, 1523
-	ldc.i4 1523
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01070068: 0x1070068: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107006c: 0x107006c: lw    v0, -19060(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070070: 0x1070070: sll   zero, zero, 0
-// 0x01070074: 0x1070074: lw    v0, 28(v0)
+// 0x01070254: 0x1070254: beq   s0, zero, 0x1070278 addu  a0, s1, zero
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070078: 0x1070078: sll   zero, zero, 0
-// 0x0107007c: 0x107007c: blez  v0, 0x10700e0 addu  a0, s1, zero
-	ldloc 5
-	ldloc 9
+	ldloc 7
 	stloc.1
-	ldc.i4.s 0
-	ble L_10700e0
+	brfalse L_1070278
 // --- basic block ---
-// 0x01070084: 0x1070084: jal   0x106e48c addu  a0, zero, zero
+// 0x0107025c: 0x107025c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendMessage_CreateNewRoads_106e48c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107008c: 0x107008c: beq   v0, zero, 0x10700b4 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brfalse L_10700b4
-// --- basic block ---
-// 0x01070094: 0x1070094: lui   a3, 0x10000
+// 0x01070260: 0x1070260: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x01070098: 0x1070098: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x0107009c: 0x107009c: addiu a3, a3, 27732
-	ldloc 4
-	ldc.i4 27732
+// 0x01070264: 0x1070264: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	stloc 4
-// 0x010700a0: 0x10700a0: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x010700a4: 0x10700a4: jal   0x100449c addiu a2, zero, 1528
-	ldc.i4 1528
-	stloc.3
-	ldloc.0
-	ldloc.1
+// 0x01070268: 0x1070268: addiu a1, a1, 22884
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010700ac: 0x10700ac: j	 0x10700e8 sll   zero, zero, 0
-	br L_10700e8
-// --- basic block ---
-L_10700b4:
-// 0x010700b4: 0x10700b4: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+	ldc.i4 22884
 	add
 	stloc.2
-// 0x010700b8: 0x10700b8: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010700bc: 0x10700bc: addiu a3, a3, 27804
-	ldloc 4
-	ldc.i4 27804
-	add
-	stloc 4
-// 0x010700c0: 0x10700c0: jal   0x100449c addiu a2, zero, 1531
-	ldc.i4 1531
+// 0x0107026c: 0x107026c: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x010700c8: 0x10700c8: addu  a0, s1, zero
-	ldloc 9
+// 0x01070274: 0x1070274: addu  a0, s1, zero
+	ldloc 7
 	stloc.1
-// 0x010700cc: 0x10700cc: addiu a1, zero, 2
-	ldc.i4.2
-	stloc.2
-L_10700d0:
-// 0x010700d0: 0x10700d0: jal   0x106ed70 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010700d8: 0x10700d8: j	 0x10700e8 sll   zero, zero, 0
-	br L_10700e8
-// --- basic block ---
-L_10700e0:
-// 0x010700e0: 0x10700e0: jal   0x106ff0c addu  a1, zero, zero
-	ldc.i4.s 0
+L_1070278:
+// 0x01070278: 0x1070278: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::OnAsyncOperationCompleted_CreateNewRoads_106ff0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-L_10700e8:
-// 0x010700e8: 0x10700e8: lw    ra, 28(sp)
-// 0x010700ec: 0x10700ec: lw    s2, 24(sp)
-	ldloc 6
+// 0x01070280: 0x1070280: lw    ra, 28(sp)
+// 0x01070284: 0x1070284: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 10
-// 0x010700f0: 0x10700f0: lw    s1, 20(sp)
-	ldloc 6
+	stloc 7
+// 0x01070288: 0x1070288: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 9
-// 0x010700f4: 0x10700f4: lw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x010700f8: 0x10700f8: jr    ra addiu sp, sp, 32
+	stloc 6
+// 0x0107028c: 0x107028c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 SendMessage_MapDisplyed_1070100(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_ReportAlert_1070294(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
 
 // local  6 is register v0
-// local  5 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  8 is register s0
 // local  9 is register s1
-// local 10 is register s2
 // local  0 is register sp
-// local 11 is register ra
-// local  7 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 5
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5984,412 +6191,178 @@ __CIBYL_function_return:
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01070100: 0x1070100: addiu sp, sp, -56
+// 0x01070294: 0x1070294: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01070104: 0x1070104: sw    s2, 48(sp)
-	ldloc 7
+// 0x01070298: 0x1070298: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.5
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01070108: 0x1070108: addu  s2, a0, zero
-	ldloc.1
-	stloc 10
-// 0x0107010c: 0x107010c: addiu a0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.1
-// 0x01070110: 0x1070110: sw    ra, 52(sp)
-// 0x01070114: 0x1070114: sw    s1, 44(sp)
-	ldloc 7
+// 0x0107029c: 0x107029c: addu  s0, a1, zero
+	ldloc.2
+	stloc 8
+// 0x010702a0: 0x10702a0: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.6
 	add
 	ldloc 9
 	stelem.i4
-// 0x01070118: 0x1070118: jal   0x1007f50 sw    s0, 40(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 8
-	stelem.i4
+// 0x010702a4: 0x10702a4: sw    ra, 28(sp)
+// 0x010702a8: 0x10702a8: jal   0x1078df8 addu  s1, a0, zero
+	ldloc.1
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f50(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_CloseProgressDlg_1078df8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 6
-// --- basic block ---
-// 0x01070120: 0x1070120: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x01070124: 0x1070124: addiu v0, v0, 17728
-	ldloc 6
-	ldc.i4 17728
-	add
-	stloc 6
-// 0x01070128: 0x1070128: lw    a0, 272(v0)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 68
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107012c: 0x107012c: lw    v1, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070130: 0x1070130: sll   zero, zero, 0
-// 0x01070134: 0x1070134: bne   a0, v1, 0x10701b4 lui   a0, 0x70000
-	ldloc.1
-	ldloc 5
-	ldc.i4 458752
-	stloc.1
-	bne.un L_10701b4
-// --- basic block ---
-// 0x0107013c: 0x107013c: lw    a0, 276(v0)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 69
-	add
-	ldelem.i4
-	stloc.1
-// 0x01070140: 0x1070140: lw    v1, 36(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070144: 0x1070144: sll   zero, zero, 0
-// 0x01070148: 0x1070148: bne   a0, v1, 0x10701b4 lui   a0, 0x70000
-	ldloc.1
-	ldloc 5
-	ldc.i4 458752
-	stloc.1
-	bne.un L_10701b4
-// --- basic block ---
-// 0x01070150: 0x1070150: lw    a0, 264(v0)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 66
-	add
-	ldelem.i4
-	stloc.1
-// 0x01070154: 0x1070154: lw    v1, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070158: 0x1070158: sll   zero, zero, 0
-// 0x0107015c: 0x107015c: bne   a0, v1, 0x10701b0 sll   zero, zero, 0
-	ldloc.1
-	ldloc 5
-	bne.un L_10701b0
-// --- basic block ---
-// 0x01070164: 0x1070164: lw    v1, 268(v0)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 67
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070168: 0x1070168: lw    v0, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
+	stloc 7
 	stloc 6
-// 0x0107016c: 0x107016c: sll   zero, zero, 0
-// 0x01070170: 0x1070170: bne   v1, v0, 0x10701b4 lui   a0, 0x70000
-	ldloc 5
-	ldloc 6
-	ldc.i4 458752
-	stloc.1
-	bne.un L_10701b4
 // --- basic block ---
-// 0x01070178: 0x1070178: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107017c: 0x107017c: lui   a3, 0x10000
+// 0x010702b0: 0x10702b0: bne   s0, zero, 0x10702d0 lui   a1, 0x10000
+	ldloc 8
 	ldc.i4 65536
-	stloc 4
-// 0x01070180: 0x1070180: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x01070184: 0x1070184: addiu a3, a3, 27884
-	ldloc 4
-	ldc.i4 27884
-	add
-	stloc 4
-// 0x01070188: 0x1070188: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107018c: 0x107018c: jal   0x100449c addiu a2, zero, 1550
-	ldc.i4 1550
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	brtrue L_10702d0
+// --- basic block ---
+// 0x010702b8: 0x10702b8: jal   0x107818c sll   zero, zero, 0
+	call int32 Cibyl90::RTAlerts_Resert_Minimized_107818c()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01070194: 0x1070194: bne   s2, zero, 0x1070208 addiu v1, zero, 1
-	ldloc 10
-	ldc.i4.1
-	stloc 5
-	brtrue L_1070208
-// --- basic block ---
-// 0x0107019c: 0x107019c: addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x010701a0: 0x10701a0: jal   0x1070008 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+// 0x010702c0: 0x10702c0: jal   0x101eef8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::OnAsyncOperationCompleted_MapDisplayed_1070008(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010701a8: 0x10701a8: j	 0x1070208 addiu v1, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_1070208
-// --- basic block ---
-L_10701b0:
-// 0x010701b0: 0x10701b0: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-L_10701b4:
-// 0x010701b4: 0x10701b4: jal   0x108b2e4 addiu a0, a0, 18008
-	ldloc.1
-	ldc.i4 18008
-	add
+// 0x010702c8: 0x10702c8: j	 0x10702e8 addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl104::RTUsers_ResetUpdateFlag_108b2e4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 6
+	br L_10702e8
 // --- basic block ---
-// 0x010701bc: 0x10701bc: jal   0x1006fc0 addu  a0, zero, zero
+L_10702d0:
+// 0x010702d0: 0x10702d0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	ldloc.0
+// 0x010702d4: 0x10702d4: addiu a0, a0, 30092
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl4::roadmap_math_get_scale_1006fc0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 6
-// --- basic block ---
-// 0x010701c4: 0x10701c4: lui   s1, 0x70000
-	ldc.i4 458752
-	stloc 9
-// 0x010701c8: 0x10701c8: addiu s0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 8
-// 0x010701cc: 0x10701cc: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x010701d0: 0x10701d0: addu  a2, v0, zero
-	ldloc 6
-	stloc.3
-// 0x010701d4: 0x10701d4: addiu a3, a3, 8
-	ldloc 4
-	ldc.i4.8
-	add
-	stloc 4
-// 0x010701d8: 0x10701d8: addiu a0, s1, 17728
-	ldloc 9
-	ldc.i4 17728
+	ldc.i4 30092
 	add
 	stloc.1
-// 0x010701dc: 0x10701dc: addu  a1, s0, zero
-	ldloc 8
-	stloc.2
-// 0x010701e0: 0x10701e0: jal   0x1075124 sw    s2, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+// 0x010702d8: 0x10702d8: addiu a1, a1, 27020
+	ldloc.2
+	ldc.i4 27020
 	add
-	ldloc 10
-	stelem.i4
+	stloc.2
+// 0x010702dc: 0x10702dc: jal   0x104bff4 addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RTNet_MapDisplyed_1075124(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010701e8: 0x10701e8: beq   v0, zero, 0x1070208 addu  v1, zero, zero
-	ldloc 6
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_1070208
-// --- basic block ---
-// 0x010701f0: 0x10701f0: addiu a0, s1, 17728
+// 0x010702e4: 0x10702e4: addu  a0, s1, zero
 	ldloc 9
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x010701f4: 0x10701f4: addiu a0, a0, 264
-	ldloc.1
-	ldc.i4 264
-	add
 	stloc.1
-// 0x010701f8: 0x10701f8: addu  a1, s0, zero
+L_10702e8:
+// 0x010702e8: 0x10702e8: jal   0x106f394 addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x010701fc: 0x10701fc: jal   0x1001800 addiu a2, zero, 16
-	ldc.i4.s 16
-	stloc.3
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 6
-// --- basic block ---
-// 0x01070204: 0x1070204: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 5
-L_1070208:
-// 0x01070208: 0x1070208: lw    ra, 52(sp)
-// 0x0107020c: 0x107020c: addu  v0, v1, zero
-	ldloc 5
-	stloc 6
-// 0x01070210: 0x1070210: lw    s2, 48(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 10
-// 0x01070214: 0x1070214: lw    s1, 44(sp)
-	ldloc 7
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010702f0: 0x10702f0: lw    ra, 28(sp)
+// 0x010702f4: 0x10702f4: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 9
-// 0x01070218: 0x1070218: lw    s0, 40(sp)
-	ldloc 7
+// 0x010702f8: 0x10702f8: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.5
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107021c: 0x107021c: jr    ra addiu sp, sp, 56
+// 0x010702fc: 0x10702fc: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 SendAllMessagesTogether_BuildPacket_1070224(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_ExternalPoiDisplayed_1070304(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32 s1,int32[] mem,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local 10 is register s2
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 11 is register ra
-// local  9 is register mem
+// local  8 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldc.i4.s 0
-	stloc 6
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6399,156 +6372,96 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 9
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01070224: 0x1070224: addiu sp, sp, -32
+// 0x01070304: 0x1070304: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01070228: 0x1070228: sw    s2, 24(sp)
-	ldloc 9
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-// 0x0107022c: 0x107022c: sw    s1, 20(sp)
-	ldloc 9
+// 0x01070308: 0x1070308: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x01070230: 0x1070230: sw    s0, 16(sp)
-	ldloc 9
+// 0x0107030c: 0x107030c: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x01070310: 0x1070310: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldloc 7
 	stelem.i4
-// 0x01070234: 0x1070234: sw    ra, 28(sp)
-// 0x01070238: 0x1070238: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x0107023c: 0x107023c: addu  s2, a0, zero
-	ldloc.1
-	stloc 10
-// 0x01070240: 0x1070240: bne   a0, zero, 0x10702e8 addu  s1, a1, zero
-	ldloc.1
-	ldloc.2
-	stloc 8
-	brtrue L_10702e8
-// --- basic block ---
-// 0x01070248: 0x1070248: jal   0x106e068 addu  a0, a1, zero
-	ldloc.2
-	stloc.1
-	ldloc.0
+// 0x01070314: 0x1070314: sw    ra, 28(sp)
+// 0x01070318: 0x1070318: addu  s1, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendMessage_SetMyVisability_106e068(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070250: 0x1070250: bne   v0, zero, 0x1070270 lui   a1, 0x10000
-	ldloc 5
+	stloc 7
+// 0x0107031c: 0x107031c: bne   s0, zero, 0x107033c lui   a1, 0x10000
+	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1070270
+	brtrue L_107033c
 // --- basic block ---
-// 0x01070258: 0x1070258: lui   a3, 0x10000
+// 0x01070324: 0x1070324: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0107025c: 0x107025c: addiu a1, a1, 20732
+// 0x01070328: 0x1070328: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070260: 0x1070260: addiu a3, a3, 27976
+// 0x0107032c: 0x107032c: addiu a3, a3, 27064
 	ldloc 4
-	ldc.i4 27976
+	ldc.i4 27064
 	add
 	stloc 4
-// 0x01070264: 0x1070264: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01070330: 0x1070330: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01070268: 0x1070268: j	 0x107029c addiu a2, zero, 2278
-	ldc.i4 2278
+// 0x01070334: 0x1070334: j	 0x1070350 addiu a2, zero, 1218
+	ldc.i4 1218
 	stloc.3
-	br L_107029c
-// --- basic block ---
-L_1070270:
-// 0x01070270: 0x1070270: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070278: 0x1070278: jal   0x106dfc8 addu  a0, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendMessage_SetMood_106dfc8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070280: 0x1070280: bne   v0, zero, 0x10702ac lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_10702ac
+	br L_1070350
 // --- basic block ---
-// 0x01070288: 0x1070288: lui   a3, 0x10000
+L_107033c:
+// 0x0107033c: 0x107033c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0107028c: 0x107028c: addiu a1, a1, 20732
+// 0x01070340: 0x1070340: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070290: 0x1070290: addiu a3, a3, 28052
+// 0x01070344: 0x1070344: addiu a3, a3, 27140
 	ldloc 4
-	ldc.i4 28052
+	ldc.i4 27140
 	add
 	stloc 4
-// 0x01070294: 0x1070294: addiu a0, zero, 4
+// 0x01070348: 0x1070348: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01070298: 0x1070298: addiu a2, zero, 2286
-	ldc.i4 2286
+// 0x0107034c: 0x107034c: addiu a2, zero, 1221
+	ldc.i4 1221
 	stloc.3
-L_107029c:
-// 0x0107029c: 0x107029c: jal   0x100449c sll   zero, zero, 0
+L_1070350:
+// 0x01070350: 0x1070350: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6556,213 +6469,318 @@ L_107029c:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010702a4: 0x10702a4: j	 0x1070540 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1070540
+	stloc 10
+	stloc 9
 // --- basic block ---
-L_10702ac:
-// 0x010702ac: 0x10702ac: jal   0x1001b48 addu  a0, s0, zero
+// 0x01070358: 0x1070358: addu  a0, s1, zero
 	ldloc 7
 	stloc.1
+// 0x0107035c: 0x107035c: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
+	stloc.2
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 10
+	stloc 9
+// --- basic block ---
+// 0x01070364: 0x1070364: lw    ra, 28(sp)
+// 0x01070368: 0x1070368: lw    s1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 7
+// 0x0107036c: 0x107036c: lw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
 	stloc 6
+// 0x01070370: 0x1070370: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 10
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 9
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_CreateAccount_1070378(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+
+// local  8 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  5 is register s0
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 5
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010702b4: 0x10702b4: jal   0x106ded8 addu  a0, s0, v0
-	ldloc 7
-	ldloc 5
+// 0x01070378: 0x1070378: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.1
+	stloc.0
+// 0x0107037c: 0x107037c: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x01070380: 0x1070380: sw    ra, 20(sp)
+// 0x01070384: 0x1070384: jal   0x106f394 addu  s0, a1, zero
+	ldloc.2
+	stloc 5
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_Location_106ded8(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x010702bc: 0x10702bc: bne   v0, zero, 0x10702dc lui   a1, 0x10000
+// 0x0107038c: 0x107038c: jal   0x10a9870 addu  a0, s0, zero
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_10702dc
-// --- basic block ---
-// 0x010702c4: 0x10702c4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010702c8: 0x10702c8: addiu a1, a1, 20732
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x010702cc: 0x10702cc: addiu a3, a3, 28120
+	ldloc.3
 	ldloc 4
-	ldc.i4 28120
+	call int32 Cibyl126::roadmap_login_update_details_on_response_10a9870(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
+// --- basic block ---
+// 0x01070394: 0x1070394: lw    ra, 20(sp)
+// 0x01070398: 0x1070398: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107039c: 0x107039c: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_NodePath_10703a4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v0,int32 v1,int32 ra)
+
+// local  9 is register v0
+// local 10 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  6 is register s0
+// local  7 is register s1
+// local  8 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x010702d0: 0x10702d0: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010702d4: 0x10702d4: j	 0x107029c addiu a2, zero, 2294
-	ldc.i4 2294
-	stloc.3
-	br L_107029c
-// --- basic block ---
-L_10702dc:
-// 0x010702dc: 0x10702dc: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010702e4: 0x10702e4: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
+// 0x010703a4: 0x10703a4: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	stloc 8
-L_10702e8:
-// 0x010702e8: 0x10702e8: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x010702ec: 0x10702ec: lw    v0, 17620(v0)
-	ldloc 9
+	stloc.0
+// 0x010703a8: 0x10703a8: sw    s2, 24(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4405
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 5
-// 0x010702f0: 0x10702f0: sll   zero, zero, 0
-// 0x010702f4: 0x10702f4: blez  v0, 0x1070330 addu  a0, s1, zero
-	ldloc 5
 	ldloc 8
-	stloc.1
-	ldc.i4.s 0
-	ble L_1070330
-// --- basic block ---
-// 0x010702fc: 0x10702fc: jal   0x106c6cc addu  a1, s0, zero
+	stelem.i4
+// 0x010703ac: 0x10703ac: sw    s1, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 7
-	stloc.2
+	stelem.i4
+// 0x010703b0: 0x10703b0: sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+// 0x010703b4: 0x10703b4: sw    ra, 28(sp)
+// 0x010703b8: 0x10703b8: addu  s1, a1, zero
+	ldloc.2
+	stloc 7
+// 0x010703bc: 0x10703bc: addu  s2, a0, zero
 	ldloc.1
+	stloc 8
+// 0x010703c0: 0x10703c0: bne   a1, zero, 0x10703f8 lui   s0, 0x10000
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::SendMessage_CachedMapProblems_106c6cc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070304: 0x1070304: bne   v0, zero, 0x1070324 lui   a1, 0x10000
-	ldloc 5
 	ldc.i4 65536
-	stloc.2
-	brtrue L_1070324
+	stloc 6
+	brtrue L_10703f8
 // --- basic block ---
-// 0x0107030c: 0x107030c: lui   a3, 0x10000
+// 0x010703c8: 0x10703c8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070310: 0x1070310: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01070314: 0x1070314: addiu a3, a3, 28188
+// 0x010703cc: 0x10703cc: addiu a3, a3, 27208
 	ldloc 4
-	ldc.i4 28188
+	ldc.i4 27208
 	add
 	stloc 4
-// 0x01070318: 0x1070318: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0107031c: 0x107031c: j	 0x107029c addiu a2, zero, 2305
-	ldc.i4 2305
-	stloc.3
-	br L_107029c
-// --- basic block ---
-L_1070324:
-// 0x01070324: 0x1070324: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107032c: 0x107032c: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
+// 0x010703d0: 0x10703d0: addiu a1, s0, 21196
+	ldloc 6
+	ldc.i4 21196
 	add
-	stloc 8
-L_1070330:
-// 0x01070330: 0x1070330: jal   0x106de30 addu  a0, s1, zero
-	ldloc 8
+	stloc.2
+// 0x010703d4: 0x10703d4: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x010703d8: 0x10703d8: jal   0x100449c addiu a2, zero, 1196
+	ldc.i4 1196
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_UserPoints_106de30(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 10
+	stloc 9
 // --- basic block ---
-// 0x01070338: 0x1070338: beq   v0, zero, 0x1070350 lui   a1, 0x10000
-	ldloc 5
+// 0x010703e0: 0x10703e0: lui   a3, 0x10000
 	ldc.i4 65536
+	stloc 4
+// 0x010703e4: 0x10703e4: addiu a1, s0, 21196
+	ldloc 6
+	ldc.i4 21196
+	add
 	stloc.2
-	brfalse L_1070350
-// --- basic block ---
-// 0x01070340: 0x1070340: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070348: 0x1070348: j	 0x1070368 addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
+// 0x010703e8: 0x10703e8: addiu a3, a3, 27320
+	ldloc 4
+	ldc.i4 27320
 	add
-	stloc 8
-	br L_1070368
+	stloc 4
+// 0x010703ec: 0x10703ec: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010703f0: 0x10703f0: j	 0x107040c addiu a2, zero, 1197
+	ldc.i4 1197
+	stloc.3
+	br L_107040c
 // --- basic block ---
-L_1070350:
-// 0x01070350: 0x1070350: lui   a3, 0x10000
+L_10703f8:
+// 0x010703f8: 0x10703f8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070354: 0x1070354: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x010703fc: 0x10703fc: addiu a1, s0, 21196
+	ldloc 6
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070358: 0x1070358: addiu a3, a3, 28276
+// 0x01070400: 0x1070400: addiu a3, a3, 27388
 	ldloc 4
-	ldc.i4 28276
+	ldc.i4 27388
 	add
 	stloc 4
-// 0x0107035c: 0x107035c: addiu a0, zero, 1
-	ldc.i4.1
+// 0x01070404: 0x1070404: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01070360: 0x1070360: jal   0x100449c addiu a2, zero, 2316
-	ldc.i4 2316
+// 0x01070408: 0x1070408: addiu a2, zero, 1200
+	ldc.i4 1200
 	stloc.3
+L_107040c:
+// 0x0107040c: 0x107040c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6770,353 +6788,236 @@ L_1070350:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 10
+	stloc 9
 // --- basic block ---
-L_1070368:
-// 0x01070368: 0x1070368: addu  a0, s1, zero
+// 0x01070414: 0x1070414: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107036c: 0x107036c: jal   0x106e2c4 sltiu a1, s2, 1
-	ldloc 10
-	ldc.i4.1
-	clt.un
+// 0x01070418: 0x1070418: jal   0x106f394 addu  a1, s1, zero
+	ldloc 7
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_At_106e2c4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070374: 0x1070374: beq   v0, zero, 0x107038c lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_107038c
-// --- basic block ---
-// 0x0107037c: 0x107037c: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 10
+	stloc 9
 // --- basic block ---
-// 0x01070384: 0x1070384: j	 0x10703a4 addu  s1, s0, v0
-	ldloc 7
+// 0x01070420: 0x1070420: lw    ra, 28(sp)
+// 0x01070424: 0x1070424: lw    s2, 24(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
+	ldelem.i4
 	stloc 8
-	br L_10703a4
-// --- basic block ---
-L_107038c:
-// 0x0107038c: 0x107038c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01070390: 0x1070390: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01070394: 0x1070394: addiu a3, a3, 28376
-	ldloc 4
-	ldc.i4 28376
-	add
-	stloc 4
-// 0x01070398: 0x1070398: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107039c: 0x107039c: jal   0x100449c addiu a2, zero, 2322
-	ldc.i4 2322
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_10703a4:
-// 0x010703a4: 0x10703a4: bne   s2, zero, 0x10703f8 lui   v0, 0x80000
-	ldloc 10
-	ldc.i4 524288
-	stloc 5
-	brtrue L_10703f8
-// --- basic block ---
-// 0x010703ac: 0x10703ac: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x010703b0: 0x10703b0: lw    v0, 14992(v0)
-	ldloc 9
+// 0x01070428: 0x1070428: lw    s1, 20(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3748
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 5
-// 0x010703b4: 0x10703b4: sll   zero, zero, 0
-// 0x010703b8: 0x10703b8: beq   v0, zero, 0x10703f8 lui   v0, 0x80000
+	stloc 7
+// 0x0107042c: 0x107042c: lw    s0, 16(sp)
 	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brfalse L_10703f8
-// --- basic block ---
-// 0x010703c0: 0x10703c0: jal   0x1070100 addu  a0, s1, zero
-	ldloc 8
-	stloc.1
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl83::SendMessage_MapDisplyed_1070100(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010703c8: 0x10703c8: bne   v0, zero, 0x10703e8 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_10703e8
-// --- basic block ---
-// 0x010703d0: 0x10703d0: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010703d4: 0x10703d4: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
-// 0x010703d8: 0x10703d8: addiu a3, a3, 28464
-	ldloc 4
-	ldc.i4 28464
+	ldelem.i4
+	stloc 6
+// 0x01070430: 0x1070430: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 10
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 9
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_GPSPath_1070438(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x010703dc: 0x10703dc: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010703e0: 0x10703e0: j	 0x107029c addiu a2, zero, 2339
-	ldc.i4 2339
-	stloc.3
-	br L_107029c
-// --- basic block ---
-L_10703e8:
-// 0x010703e8: 0x10703e8: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010703f0: 0x10703f0: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
+// 0x01070438: 0x1070438: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	stloc 8
-// 0x010703f4: 0x10703f4: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_10703f8:
-// 0x010703f8: 0x10703f8: lw    v0, -19060(v0)
-	ldloc 9
-	ldloc 5
+	stloc.0
+// 0x0107043c: 0x107043c: sw    s2, 24(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4.6
+	add
+	ldloc 10
+	stelem.i4
+// 0x01070440: 0x1070440: sw    s1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 5
-// 0x010703fc: 0x10703fc: sll   zero, zero, 0
-// 0x01070400: 0x1070400: lw    v0, 28(v0)
 	ldloc 9
-	ldloc 5
+	stelem.i4
+// 0x01070444: 0x1070444: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070404: 0x1070404: sll   zero, zero, 0
-// 0x01070408: 0x1070408: blez  v0, 0x1070448 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	ldc.i4.s 0
-	ble L_1070448
-// --- basic block ---
-// 0x01070410: 0x1070410: jal   0x106e48c addu  a0, s1, zero
 	ldloc 8
-	stloc.1
-	ldloc.0
+	stelem.i4
+// 0x01070448: 0x1070448: sw    ra, 28(sp)
+// 0x0107044c: 0x107044c: addu  s2, a1, zero
+	ldloc.2
+	stloc 10
+// 0x01070450: 0x1070450: addu  s1, a0, zero
 	ldloc.1
+	stloc 9
+// 0x01070454: 0x1070454: beq   a1, zero, 0x1070480 lui   s0, 0x10000
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendMessage_CreateNewRoads_106e48c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070418: 0x1070418: bne   v0, zero, 0x1070438 lui   a1, 0x10000
-	ldloc 5
 	ldc.i4 65536
-	stloc.2
-	brtrue L_1070438
+	stloc 8
+	brfalse L_1070480
 // --- basic block ---
-// 0x01070420: 0x1070420: lui   a3, 0x10000
+// 0x0107045c: 0x107045c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070424: 0x1070424: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x01070460: 0x1070460: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070428: 0x1070428: addiu a3, a3, 28536
+// 0x01070464: 0x1070464: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01070468: 0x1070468: addiu a3, a3, 27456
 	ldloc 4
-	ldc.i4 28536
+	ldc.i4 27456
 	add
 	stloc 4
-// 0x0107042c: 0x107042c: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01070430: 0x1070430: j	 0x107029c addiu a2, zero, 2350
-	ldc.i4 2350
+// 0x0107046c: 0x107046c: jal   0x100449c addiu a2, zero, 1263
+	ldc.i4 1263
 	stloc.3
-	br L_107029c
-// --- basic block ---
-L_1070438:
-// 0x01070438: 0x1070438: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070440: 0x1070440: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 8
-// 0x01070444: 0x1070444: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_1070448:
-// 0x01070448: 0x1070448: lw    v0, -19060(v0)
-	ldloc 9
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107044c: 0x107044c: sll   zero, zero, 0
-// 0x01070450: 0x1070450: lw    v0, 16(v0)
-	ldloc 9
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070454: 0x1070454: sll   zero, zero, 0
-// 0x01070458: 0x1070458: slti  v0, v0, 2
-	ldloc 5
-	ldc.i4.2
-	clt
-	stloc 5
-// 0x0107045c: 0x107045c: bne   v0, zero, 0x107049c lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brtrue L_107049c
-// --- basic block ---
-// 0x01070464: 0x1070464: jal   0x106e518 addu  a0, s1, zero
-	ldloc 8
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_GPSPath_106e518(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107046c: 0x107046c: bne   v0, zero, 0x107048c lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x01070474: 0x1070474: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x01070478: 0x1070478: j	 0x1070500 addu  a1, s2, zero
+	ldloc 10
 	stloc.2
-	brtrue L_107048c
+	br L_1070500
 // --- basic block ---
-// 0x01070474: 0x1070474: lui   a3, 0x10000
+L_1070480:
+// 0x01070480: 0x1070480: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070478: 0x1070478: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0107047c: 0x107047c: addiu a3, a3, 28612
+// 0x01070484: 0x1070484: addiu a3, a3, 27520
 	ldloc 4
-	ldc.i4 28612
+	ldc.i4 27520
 	add
 	stloc 4
-// 0x01070480: 0x1070480: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01070488: 0x1070488: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01070484: 0x1070484: j	 0x107029c addiu a2, zero, 2361
-	ldc.i4 2361
+// 0x0107048c: 0x107048c: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070490: 0x1070490: jal   0x100449c addiu a2, zero, 1268
+	ldc.i4 1268
 	stloc.3
-	br L_107029c
-// --- basic block ---
-L_107048c:
-// 0x0107048c: 0x107048c: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01070494: 0x1070494: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 8
 // 0x01070498: 0x1070498: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107049c:
-// 0x0107049c: 0x107049c: lw    v0, -19060(v0)
-	ldloc 9
+// 0x0107049c: 0x107049c: lw    v0, -18596(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4 -4649
 	add
 	ldelem.i4
 	stloc 5
 // 0x010704a0: 0x10704a0: sll   zero, zero, 0
 // 0x010704a4: 0x10704a4: lw    v0, 4(v0)
-	ldloc 9
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
@@ -7125,149 +7026,130 @@ L_107049c:
 	ldelem.i4
 	stloc 5
 // 0x010704a8: 0x10704a8: sll   zero, zero, 0
-// 0x010704ac: 0x10704ac: blez  v0, 0x10704e8 sll   zero, zero, 0
+// 0x010704ac: 0x10704ac: blez  v0, 0x1070510 addu  a0, s1, zero
 	ldloc 5
+	ldloc 9
+	stloc.1
 	ldc.i4.s 0
-	ble L_10704e8
+	ble L_1070510
 // --- basic block ---
-// 0x010704b4: 0x10704b4: jal   0x106e590 addu  a0, s1, zero
-	ldloc 8
+// 0x010704b4: 0x10704b4: jal   0x106ebb4 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_NodePath_106e590(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_NodePath_106ebb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010704bc: 0x10704bc: bne   v0, zero, 0x10704dc lui   a1, 0x10000
+// 0x010704bc: 0x10704bc: beq   v0, zero, 0x10704e4 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
-	stloc.2
-	brtrue L_10704dc
+	stloc 4
+	brfalse L_10704e4
 // --- basic block ---
 // 0x010704c4: 0x10704c4: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010704c8: 0x10704c8: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x010704c8: 0x10704c8: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x010704cc: 0x10704cc: addiu a3, a3, 28680
+// 0x010704cc: 0x10704cc: addiu a3, a3, 27628
 	ldloc 4
-	ldc.i4 28680
+	ldc.i4 27628
 	add
 	stloc 4
-// 0x010704d0: 0x10704d0: addiu a0, zero, 4
-	ldc.i4.4
+// 0x010704d0: 0x10704d0: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x010704d4: 0x10704d4: j	 0x107029c addiu a2, zero, 2372
-	ldc.i4 2372
+// 0x010704d4: 0x10704d4: jal   0x100449c addiu a2, zero, 1273
+	ldc.i4 1273
 	stloc.3
-	br L_107029c
-// --- basic block ---
-L_10704dc:
-// 0x010704dc: 0x10704dc: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010704e4: 0x10704e4: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 8
-L_10704e8:
-// 0x010704e8: 0x10704e8: jal   0x10907cc sll   zero, zero, 0
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_10907cc()
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010704f0: 0x10704f0: bne   v0, zero, 0x1070520 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1070520
+// 0x010704dc: 0x10704dc: j	 0x1070518 sll   zero, zero, 0
+	br L_1070518
 // --- basic block ---
-// 0x010704f8: 0x10704f8: jal   0x106e560 addu  a0, s1, zero
+L_10704e4:
+// 0x010704e4: 0x10704e4: addiu a1, s0, 21196
 	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x010704e8: 0x10704e8: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x010704ec: 0x10704ec: addiu a3, a3, 27688
+	ldloc 4
+	ldc.i4 27688
+	add
+	stloc 4
+// 0x010704f0: 0x10704f0: jal   0x100449c addiu a2, zero, 1276
+	ldc.i4 1276
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_ExternalPoiDisplayed_106e560(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01070500: 0x1070500: bne   v0, zero, 0x1070520 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x010704f8: 0x10704f8: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x010704fc: 0x10704fc: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-	brtrue L_1070520
-// --- basic block ---
-// 0x01070508: 0x1070508: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0107050c: 0x107050c: addiu a1, a1, 20732
+L_1070500:
+// 0x01070500: 0x1070500: jal   0x106f394 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01070510: 0x1070510: addiu a3, a3, 23776
+	ldloc.3
 	ldloc 4
-	ldc.i4 23776
-	add
-	stloc 4
-// 0x01070514: 0x1070514: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01070518: 0x1070518: j	 0x107029c addiu a2, zero, 2383
-	ldc.i4 2383
-	stloc.3
-	br L_107029c
-// --- basic block ---
-L_1070520:
-// 0x01070520: 0x1070520: lb    v1, 0(s0)
-	ldloc 7
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01070524: 0x1070524: sll   zero, zero, 0
-// 0x01070528: 0x1070528: bne   v1, zero, 0x1070540 addiu v0, zero, 1
-	ldloc 6
-	ldc.i4.1
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	brtrue L_1070540
 // --- basic block ---
-// 0x01070530: 0x1070530: addiu v1, zero, 23
-	ldc.i4.s 23
-	stloc 6
-// 0x01070534: 0x1070534: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01070538: 0x1070538: sw    v1, -19112(v0)
-	ldloc 9
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4778
-	add
-	ldloc 6
-	stelem.i4
-// 0x0107053c: 0x107053c: addu  v0, zero, zero
+// 0x01070508: 0x1070508: j	 0x1070518 sll   zero, zero, 0
+	br L_1070518
+// --- basic block ---
+L_1070510:
+// 0x01070510: 0x1070510: jal   0x10703a4 addu  a1, zero, zero
 	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::OnAsyncOperationCompleted_NodePath_10703a4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-L_1070540:
-// 0x01070540: 0x1070540: lw    ra, 28(sp)
-// 0x01070544: 0x1070544: lw    s2, 24(sp)
-	ldloc 9
+// --- basic block ---
+L_1070518:
+// 0x01070518: 0x1070518: lw    ra, 28(sp)
+// 0x0107051c: 0x107051c: lw    s2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -7275,32 +7157,32 @@ L_1070540:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01070548: 0x1070548: lw    s1, 20(sp)
-	ldloc 9
+// 0x01070520: 0x1070520: lw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107054c: 0x107054c: lw    s0, 16(sp)
-	ldloc 9
+	stloc 9
+// 0x01070524: 0x1070524: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 7
-// 0x01070550: 0x1070550: jr    ra addiu sp, sp, 32
+	stloc 8
+// 0x01070528: 0x1070528: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
diff --git a/converted/Cibyl84.j b/converted/Cibyl84.j
index dde075e..a5e7def 100644
--- a/converted/Cibyl84.j
+++ b/converted/Cibyl84.j
@@ -41,29 +41,28 @@
     IL_0006:  ret
   } // end of method Cibyl84::.ctor
 
-.method public static int32 SendAllMessagesTogether_SendPart1_1070558(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_CreateNewRoads_1070530(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s1,int32 s3,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local  8 is register s0
 // local  9 is register s1
-// local 11 is register s2
-// local 10 is register s3
+// local 10 is register s2
 // local  0 is register sp
-// local 12 is register ra
-// local  8 is register mem
+// local 11 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -73,197 +72,121 @@
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
 	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01070558: 0x1070558: addiu sp, sp, -2288
+// 0x01070530: 0x1070530: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4 -2288
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0107055c: 0x107055c: sw    s2, 2276(sp)
-	ldloc 8
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 569
-	add
-	ldloc 11
-	stelem.i4
-// 0x01070560: 0x1070560: addiu s2, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 11
-// 0x01070564: 0x1070564: sw    s3, 2280(sp)
-	ldloc 8
+// 0x01070534: 0x1070534: sw    s2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 570
+	ldc.i4.6
 	add
 	ldloc 10
 	stelem.i4
-// 0x01070568: 0x1070568: addu  s3, a0, zero
-	ldloc.1
-	stloc 10
-// 0x0107056c: 0x107056c: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-// 0x01070570: 0x1070570: sw    ra, 2284(sp)
-// 0x01070574: 0x1070574: sw    s1, 2272(sp)
-	ldloc 8
+// 0x01070538: 0x1070538: sw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4.5
 	add
 	ldloc 9
 	stelem.i4
-// 0x01070578: 0x1070578: jal   0x10674e4 sw    s0, 2268(sp)
-	ldloc 8
+// 0x0107053c: 0x107053c: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 567
+	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 8
 	stelem.i4
-	ldloc.0
-	ldloc.1
+// 0x01070540: 0x1070540: sw    ra, 28(sp)
+// 0x01070544: 0x1070544: addu  s2, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070580: 0x1070580: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-// 0x01070584: 0x1070584: jal   0x106755c addiu a1, zero, 2015
-	ldc.i4 2015
-	stloc.2
-	ldloc.0
+	stloc 10
+// 0x01070548: 0x1070548: addu  s1, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107058c: 0x107058c: addu  s0, v0, zero
-	ldloc 5
-	stloc 7
-// 0x01070590: 0x1070590: bne   s3, zero, 0x1070638 addu  s1, v0, zero
-	ldloc 10
-	ldloc 5
 	stloc 9
-	brtrue L_1070638
-// --- basic block ---
-// 0x01070598: 0x1070598: jal   0x106e068 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
+// 0x0107054c: 0x107054c: beq   a1, zero, 0x1070578 lui   s0, 0x10000
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::SendMessage_SetMyVisability_106e068(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010705a0: 0x10705a0: bne   v0, zero, 0x10705bc lui   a1, 0x10000
-	ldloc 5
 	ldc.i4 65536
-	stloc.2
-	brtrue L_10705bc
+	stloc 8
+	brfalse L_1070578
 // --- basic block ---
-// 0x010705a8: 0x10705a8: lui   a3, 0x10000
+// 0x01070554: 0x1070554: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010705ac: 0x10705ac: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x01070558: 0x1070558: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x010705b0: 0x10705b0: addiu a3, a3, 28748
+// 0x0107055c: 0x107055c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01070560: 0x1070560: addiu a3, a3, 27756
 	ldloc 4
-	ldc.i4 28748
+	ldc.i4 27756
 	add
 	stloc 4
-// 0x010705b4: 0x10705b4: j	 0x10705e4 addiu a2, zero, 2079
-	ldc.i4 2079
+// 0x01070564: 0x1070564: jal   0x100449c addiu a2, zero, 1315
+	ldc.i4 1315
 	stloc.3
-	br L_10705e4
-// --- basic block ---
-L_10705bc:
-// 0x010705bc: 0x10705bc: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010705c4: 0x10705c4: jal   0x106dfc8 addu  a0, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_SetMood_106dfc8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010705cc: 0x10705cc: bne   v0, zero, 0x1070600 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x0107056c: 0x107056c: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x01070570: 0x1070570: j	 0x10705fc addu  a1, s2, zero
+	ldloc 10
 	stloc.2
-	brtrue L_1070600
+	br L_10705fc
 // --- basic block ---
-// 0x010705d4: 0x10705d4: lui   a3, 0x10000
+L_1070578:
+// 0x01070578: 0x1070578: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010705d8: 0x10705d8: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x010705dc: 0x10705dc: addiu a3, a3, 28828
+// 0x0107057c: 0x107057c: addiu a3, a3, 27836
 	ldloc 4
-	ldc.i4 28828
+	ldc.i4 27836
 	add
 	stloc 4
-// 0x010705e0: 0x10705e0: addiu a2, zero, 2088
-	ldc.i4 2088
-	stloc.3
-L_10705e4:
-// 0x010705e4: 0x10705e4: jal   0x100449c addiu a0, zero, 4
-	ldc.i4.4
+// 0x01070580: 0x1070580: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x01070584: 0x1070584: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070588: 0x1070588: jal   0x100449c addiu a2, zero, 1320
+	ldc.i4 1320
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -271,148 +194,110 @@ L_10705e4:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010705ec: 0x10705ec: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-L_10705f0:
-// 0x010705f0: 0x10705f0: jal   0x1067508 addu  s0, zero, zero
-	ldc.i4.s 0
 	stloc 7
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010705f8: 0x10705f8: j	 0x10707c4 sll   zero, zero, 0
-	br L_10707c4
-// --- basic block ---
-L_1070600:
-// 0x01070600: 0x1070600: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x01070590: 0x1070590: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// --- basic block ---
-// 0x01070608: 0x1070608: jal   0x106ded8 addu  a0, s0, v0
-	ldloc 7
+// 0x01070594: 0x1070594: lw    v0, -18596(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4649
+	add
+	ldelem.i4
+	stloc 5
+// 0x01070598: 0x1070598: sll   zero, zero, 0
+// 0x0107059c: 0x107059c: lw    v0, 16(v0)
+	ldloc 6
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
+	ldelem.i4
+	stloc 5
+// 0x010705a0: 0x10705a0: sll   zero, zero, 0
+// 0x010705a4: 0x10705a4: slti  v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	clt
+	stloc 5
+// 0x010705a8: 0x10705a8: bne   v0, zero, 0x107060c addu  a0, s1, zero
+	ldloc 5
+	ldloc 9
+	stloc.1
+	brtrue L_107060c
+// --- basic block ---
+// 0x010705b0: 0x10705b0: jal   0x106eb3c addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_Location_106ded8(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_GPSPath_106eb3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01070610: 0x1070610: bne   v0, zero, 0x107062c lui   a1, 0x10000
+// 0x010705b8: 0x10705b8: beq   v0, zero, 0x10705e0 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
-	stloc.2
-	brtrue L_107062c
+	stloc 4
+	brfalse L_10705e0
 // --- basic block ---
-// 0x01070618: 0x1070618: lui   a3, 0x10000
+// 0x010705c0: 0x10705c0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0107061c: 0x107061c: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x010705c4: 0x10705c4: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070620: 0x1070620: addiu a3, a3, 28900
+// 0x010705c8: 0x10705c8: addiu a3, a3, 27908
 	ldloc 4
-	ldc.i4 28900
+	ldc.i4 27908
 	add
 	stloc 4
-// 0x01070624: 0x1070624: j	 0x10705e4 addiu a2, zero, 2097
-	ldc.i4 2097
-	stloc.3
-	br L_10705e4
-// --- basic block ---
-L_107062c:
-// 0x0107062c: 0x107062c: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070634: 0x1070634: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 9
-L_1070638:
-// 0x01070638: 0x1070638: jal   0x106de30 addu  a0, s1, zero
-	ldloc 9
+// 0x010705cc: 0x10705cc: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x010705d0: 0x10705d0: jal   0x100449c addiu a2, zero, 1325
+	ldc.i4 1325
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_UserPoints_106de30(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070640: 0x1070640: beq   v0, zero, 0x1070658 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_1070658
-// --- basic block ---
-// 0x01070648: 0x1070648: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01070650: 0x1070650: j	 0x1070670 addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 9
-	br L_1070670
+// 0x010705d8: 0x10705d8: j	 0x1070614 sll   zero, zero, 0
+	br L_1070614
 // --- basic block ---
-L_1070658:
-// 0x01070658: 0x1070658: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0107065c: 0x107065c: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+L_10705e0:
+// 0x010705e0: 0x10705e0: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070660: 0x1070660: addiu a3, a3, 28976
+// 0x010705e4: 0x10705e4: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010705e8: 0x10705e8: addiu a3, a3, 27976
 	ldloc 4
-	ldc.i4 28976
+	ldc.i4 27976
 	add
 	stloc 4
-// 0x01070664: 0x1070664: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01070668: 0x1070668: jal   0x100449c addiu a2, zero, 2108
-	ldc.i4 2108
+// 0x010705ec: 0x10705ec: jal   0x100449c addiu a2, zero, 1328
+	ldc.i4 1328
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -421,177 +306,256 @@ L_1070658:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_1070670:
-// 0x01070670: 0x1070670: addu  a0, s1, zero
+// 0x010705f4: 0x10705f4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01070674: 0x1070674: jal   0x106e2c4 sltiu a1, s3, 1
-	ldloc 10
-	ldc.i4.1
-	clt.un
+// 0x010705f8: 0x10705f8: addiu a1, zero, 2
+	ldc.i4.2
 	stloc.2
+L_10705fc:
+// 0x010705fc: 0x10705fc: jal   0x106f394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_At_106e2c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107067c: 0x107067c: beq   v0, zero, 0x1070694 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_1070694
+// 0x01070604: 0x1070604: j	 0x1070614 sll   zero, zero, 0
+	br L_1070614
 // --- basic block ---
-// 0x01070684: 0x1070684: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
+L_107060c:
+// 0x0107060c: 0x107060c: jal   0x1070438 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::OnAsyncOperationCompleted_GPSPath_1070438(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107068c: 0x107068c: j	 0x10706ac addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 9
-	br L_10706ac
-// --- basic block ---
-L_1070694:
-// 0x01070694: 0x1070694: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01070698: 0x1070698: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+L_1070614:
+// 0x01070614: 0x1070614: lw    ra, 28(sp)
+// 0x01070618: 0x1070618: lw    s2, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.2
-// 0x0107069c: 0x107069c: addiu a3, a3, 29080
-	ldloc 4
-	ldc.i4 29080
+	ldelem.i4
+	stloc 10
+// 0x0107061c: 0x107061c: lw    s1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc 4
-// 0x010706a0: 0x10706a0: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x010706a4: 0x10706a4: jal   0x100449c addiu a2, zero, 2114
-	ldc.i4 2114
-	stloc.3
+	ldelem.i4
+	stloc 9
+// 0x01070620: 0x1070620: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_10706ac:
-// 0x010706ac: 0x10706ac: bne   s3, zero, 0x1070700 lui   v0, 0x80000
-	ldloc 10
-	ldc.i4 524288
-	stloc 5
-	brtrue L_1070700
-// --- basic block ---
-// 0x010706b4: 0x10706b4: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x010706b8: 0x10706b8: lw    v0, 14992(v0)
-	ldloc 8
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3748
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 5
-// 0x010706bc: 0x10706bc: sll   zero, zero, 0
-// 0x010706c0: 0x10706c0: beq   v0, zero, 0x1070700 lui   v0, 0x80000
+	stloc 8
+// 0x01070624: 0x1070624: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4 524288
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_MapDisplayed_107062c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-	brfalse L_1070700
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010706c8: 0x10706c8: jal   0x1070100 addu  a0, s1, zero
+// 0x0107062c: 0x107062c: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x01070630: 0x1070630: sw    s2, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 10
+	stelem.i4
+// 0x01070634: 0x1070634: sw    s1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 9
+	stelem.i4
+// 0x01070638: 0x1070638: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107063c: 0x107063c: sw    ra, 28(sp)
+// 0x01070640: 0x1070640: addu  s2, a1, zero
+	ldloc.2
+	stloc 10
+// 0x01070644: 0x1070644: addu  s1, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01070648: 0x1070648: beq   a1, zero, 0x1070674 lui   s0, 0x10000
+	ldloc.2
+	ldc.i4 65536
+	stloc 8
+	brfalse L_1070674
+// --- basic block ---
+// 0x01070650: 0x1070650: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070654: 0x1070654: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070658: 0x1070658: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x0107065c: 0x107065c: addiu a3, a3, 28052
+	ldloc 4
+	ldc.i4 28052
+	add
+	stloc 4
+// 0x01070660: 0x1070660: jal   0x100449c addiu a2, zero, 1518
+	ldc.i4 1518
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::SendMessage_MapDisplyed_1070100(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010706d0: 0x10706d0: bne   v0, zero, 0x10706f0 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x01070668: 0x1070668: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x0107066c: 0x107066c: j	 0x10706f4 addu  a1, s2, zero
+	ldloc 10
 	stloc.2
-	brtrue L_10706f0
+	br L_10706f4
 // --- basic block ---
-// 0x010706d8: 0x10706d8: lui   a3, 0x10000
+L_1070674:
+// 0x01070674: 0x1070674: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010706dc: 0x10706dc: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x010706e0: 0x10706e0: addiu a3, a3, 29176
+// 0x01070678: 0x1070678: addiu a3, a3, 28128
 	ldloc 4
-	ldc.i4 29176
+	ldc.i4 28128
 	add
 	stloc 4
-// 0x010706e4: 0x10706e4: addiu a0, zero, 4
-	ldc.i4.4
+// 0x0107067c: 0x107067c: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x010706e8: 0x10706e8: j	 0x107073c addiu a2, zero, 2131
-	ldc.i4 2131
+// 0x01070680: 0x1070680: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070684: 0x1070684: jal   0x100449c addiu a2, zero, 1523
+	ldc.i4 1523
 	stloc.3
-	br L_107073c
-// --- basic block ---
-L_10706f0:
-// 0x010706f0: 0x10706f0: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010706f8: 0x10706f8: addu  s1, s0, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 9
-// 0x010706fc: 0x10706fc: lui   v0, 0x80000
+// 0x0107068c: 0x107068c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1070700:
-// 0x01070700: 0x1070700: lw    v0, -19060(v0)
-	ldloc 8
+// 0x01070690: 0x1070690: lw    v0, -18596(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4 -4649
 	add
 	ldelem.i4
 	stloc 5
-// 0x01070704: 0x1070704: sll   zero, zero, 0
-// 0x01070708: 0x1070708: lw    v0, 28(v0)
-	ldloc 8
+// 0x01070694: 0x1070694: sll   zero, zero, 0
+// 0x01070698: 0x1070698: lw    v0, 28(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
@@ -599,52 +563,52 @@ L_1070700:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107070c: 0x107070c: sll   zero, zero, 0
-// 0x01070710: 0x1070710: blez  v0, 0x107074c sll   zero, zero, 0
+// 0x0107069c: 0x107069c: sll   zero, zero, 0
+// 0x010706a0: 0x10706a0: blez  v0, 0x1070704 addu  a0, s1, zero
 	ldloc 5
+	ldloc 9
+	stloc.1
 	ldc.i4.s 0
-	ble L_107074c
+	ble L_1070704
 // --- basic block ---
-// 0x01070718: 0x1070718: jal   0x106e48c addu  a0, s1, zero
-	ldloc 9
+// 0x010706a8: 0x10706a8: jal   0x106eab0 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_CreateNewRoads_106e48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_CreateNewRoads_106eab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01070720: 0x1070720: bne   v0, zero, 0x107074c lui   a1, 0x10000
+// 0x010706b0: 0x10706b0: beq   v0, zero, 0x10706d8 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
-	stloc.2
-	brtrue L_107074c
+	stloc 4
+	brfalse L_10706d8
 // --- basic block ---
-// 0x01070728: 0x1070728: lui   a3, 0x10000
+// 0x010706b8: 0x10706b8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0107072c: 0x107072c: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x010706bc: 0x10706bc: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070730: 0x1070730: addiu a3, a3, 29252
+// 0x010706c0: 0x10706c0: addiu a3, a3, 28196
 	ldloc 4
-	ldc.i4 29252
+	ldc.i4 28196
 	add
 	stloc 4
-// 0x01070734: 0x1070734: addiu a0, zero, 4
-	ldc.i4.4
+// 0x010706c4: 0x10706c4: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01070738: 0x1070738: addiu a2, zero, 2143
-	ldc.i4 2143
+// 0x010706c8: 0x10706c8: jal   0x100449c addiu a2, zero, 1528
+	ldc.i4 1528
 	stloc.3
-L_107073c:
-// 0x0107073c: 0x107073c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -652,231 +616,137 @@ L_107073c:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01070744: 0x1070744: j	 0x10705f0 addiu a0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc.1
-	br L_10705f0
+// 0x010706d0: 0x10706d0: j	 0x107070c sll   zero, zero, 0
+	br L_107070c
 // --- basic block ---
-L_107074c:
-// 0x0107074c: 0x107074c: lb    v1, 0(s0)
-	ldloc 7
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01070750: 0x1070750: addiu s2, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+L_10706d8:
+// 0x010706d8: 0x10706d8: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
-	stloc 11
-// 0x01070754: 0x1070754: lui   s3, 0x70000
-	ldc.i4 458752
-	stloc 10
-// 0x01070758: 0x1070758: beq   v1, zero, 0x107079c lui   s1, 0x70000
-	ldloc 6
-	ldc.i4 458752
-	stloc 9
-	brfalse L_107079c
-// --- basic block ---
-// 0x01070760: 0x1070760: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x01070764: 0x1070764: addu  a1, s0, zero
-	ldloc 7
 	stloc.2
-// 0x01070768: 0x1070768: addiu a0, s3, 17728
-	ldloc 10
-	ldc.i4 17728
-	add
+// 0x010706dc: 0x10706dc: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0107076c: 0x107076c: jal   0x1073a90 addiu a2, a2, -2456
-	ldloc.3
-	ldc.i4 -2456
+// 0x010706e0: 0x10706e0: addiu a3, a3, 28268
+	ldloc 4
+	ldc.i4 28268
 	add
+	stloc 4
+// 0x010706e4: 0x10706e4: jal   0x100449c addiu a2, zero, 1531
+	ldc.i4 1531
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_GeneralPacket_1073a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070774: 0x1070774: addu  s0, v0, zero
-	ldloc 5
 	stloc 7
-// 0x01070778: 0x1070778: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-// 0x0107077c: 0x107077c: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x01070780: 0x1070780: cibyl_sysc 0x2102
-	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01070784: 0x1070784: addu  v1, v0, zero
-	ldloc 5
-	stloc 6
-// 0x01070788: 0x1070788: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-// 0x0107078c: 0x107078c: jal   0x1067508 sw    v1, 17700(s1)
-	ldloc 8
+// --- basic block ---
+// 0x010706ec: 0x10706ec: addu  a0, s1, zero
 	ldloc 9
+	stloc.1
+// 0x010706f0: 0x10706f0: addiu a1, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4 4425
-	add
-	ldloc 6
-	stelem.i4
+	stloc.2
+L_10706f4:
+// 0x010706f4: 0x10706f4: jal   0x106f394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01070794: 0x1070794: j	 0x10707c4 sll   zero, zero, 0
-	br L_10707c4
+// 0x010706fc: 0x10706fc: j	 0x107070c sll   zero, zero, 0
+	br L_107070c
 // --- basic block ---
-L_107079c:
-// 0x0107079c: 0x107079c: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x010707a0: 0x10707a0: cibyl_sysc 0x2107
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x010707a4: 0x10707a4: addu  v1, v0, zero
-	ldloc 5
-	stloc 6
-// 0x010707a8: 0x10707a8: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-// 0x010707ac: 0x10707ac: sw    v1, 17700(s1)
-	ldloc 8
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 4425
-	add
-	ldloc 6
-	stelem.i4
-// 0x010707b0: 0x10707b0: jal   0x1067508 addiu s3, s3, 17728
-	ldloc 10
-	ldc.i4 17728
-	add
-	stloc 10
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+L_1070704:
+// 0x01070704: 0x1070704: jal   0x1070530 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl84::OnAsyncOperationCompleted_CreateNewRoads_1070530(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010707b8: 0x10707b8: addiu v0, zero, 23
-	ldc.i4.s 23
-	stloc 5
-// 0x010707bc: 0x10707bc: sw    v0, 28696(s3)
-	ldloc 8
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 7174
-	add
-	ldloc 5
-	stelem.i4
-// 0x010707c0: 0x10707c0: addu  s0, zero, zero
-	ldc.i4.s 0
-	stloc 7
-L_10707c4:
-// 0x010707c4: 0x10707c4: lw    ra, 2284(sp)
-// 0x010707c8: 0x10707c8: addu  v0, s0, zero
-	ldloc 7
-	stloc 5
-// 0x010707cc: 0x10707cc: lw    s3, 2280(sp)
-	ldloc 8
+L_107070c:
+// 0x0107070c: 0x107070c: lw    ra, 28(sp)
+// 0x01070710: 0x1070710: lw    s2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 570
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 10
-// 0x010707d0: 0x10707d0: lw    s2, 2276(sp)
-	ldloc 8
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 569
-	add
-	ldelem.i4
-	stloc 11
-// 0x010707d4: 0x10707d4: lw    s1, 2272(sp)
-	ldloc 8
+// 0x01070714: 0x1070714: lw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4.5
 	add
 	ldelem.i4
 	stloc 9
-// 0x010707d8: 0x10707d8: lw    s0, 2268(sp)
-	ldloc 8
+// 0x01070718: 0x1070718: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 567
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 7
-// 0x010707dc: 0x10707dc: jr    ra addiu sp, sp, 2288
+	stloc 8
+// 0x0107071c: 0x107071c: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4 2288
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 SendAllMessagesTogether_10707e4(int32,int32,int32,int32,int32)
+.method public static int32 SendMessage_MapDisplyed_1070724(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s2,int32 s0,int32 s4,int32 s1,int32 lo,int32 s6,int32 s5,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register s0
-// local 12 is register s1
-// local  9 is register s2
-// local  8 is register s3
-// local 11 is register s4
-// local 15 is register s5
-// local 14 is register s6
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
 // local  0 is register sp
-// local 16 is register ra
-// local 13 is register lo
+// local 11 is register ra
 // local  7 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -886,231 +756,202 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 15
+	stloc 9
 	ldc.i4.s 0
-	stloc 14
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 13
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010707e4: 0x10707e4: addiu sp, sp, -2304
+// 0x01070724: 0x1070724: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4 -2304
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010707e8: 0x10707e8: sw    s0, 2272(sp)
+// 0x01070728: 0x1070728: sw    s2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4.s 12
 	add
 	ldloc 10
 	stelem.i4
-// 0x010707ec: 0x10707ec: addiu s0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
+// 0x0107072c: 0x107072c: addu  s2, a0, zero
+	ldloc.1
 	stloc 10
-// 0x010707f0: 0x10707f0: sw    s1, 2276(sp)
-	ldloc 7
+// 0x01070730: 0x1070730: addiu a0, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 569
+	ldc.i4.s 24
 	add
-	ldloc 12
-	stelem.i4
-// 0x010707f4: 0x10707f4: addu  s1, a0, zero
-	ldloc.1
-	stloc 12
-// 0x010707f8: 0x10707f8: addu  a0, s0, zero
-	ldloc 10
 	stloc.1
-// 0x010707fc: 0x10707fc: sw    ra, 2300(sp)
-// 0x01070800: 0x1070800: sw    s6, 2296(sp)
+// 0x01070734: 0x1070734: sw    ra, 52(sp)
+// 0x01070738: 0x1070738: sw    s1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 574
+	ldc.i4.s 11
 	add
-	ldloc 14
+	ldloc 9
 	stelem.i4
-// 0x01070804: 0x1070804: sw    s5, 2292(sp)
+// 0x0107073c: 0x107073c: jal   0x1007f60 sw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 573
+	ldc.i4.s 10
 	add
-	ldloc 15
+	ldloc 8
 	stelem.i4
-// 0x01070808: 0x1070808: sw    s4, 2288(sp)
-	ldloc 7
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 572
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl5::roadmap_math_displayed_screen_edges_1007f60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 6
+// --- basic block ---
+// 0x01070744: 0x1070744: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 6
+// 0x01070748: 0x1070748: addiu v0, v0, 18192
+	ldloc 6
+	ldc.i4 18192
 	add
-	ldloc 11
-	stelem.i4
-// 0x0107080c: 0x107080c: sw    s3, 2284(sp)
+	stloc 6
+// 0x0107074c: 0x107074c: lw    a0, 272(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 571
+	ldc.i4.s 68
 	add
-	ldloc 8
-	stelem.i4
-// 0x01070810: 0x1070810: sw    s2, 2280(sp)
+	ldelem.i4
+	stloc.1
+// 0x01070750: 0x1070750: lw    v1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 570
+	ldc.i4.8
 	add
-	ldloc 9
-	stelem.i4
-// 0x01070814: 0x1070814: jal   0x10674e4 addu  s2, a1, zero
-	ldloc.2
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0107081c: 0x107081c: jal   0x10b3140 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
+// 0x01070754: 0x1070754: sll   zero, zero, 0
+// 0x01070758: 0x1070758: bne   a0, v1, 0x10707d8 lui   a0, 0x70000
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl133::editor_track_report_begin_export_10b3140(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldloc 5
+	ldc.i4 458752
+	stloc.1
+	bne.un L_10707d8
 // --- basic block ---
-// 0x01070824: 0x1070824: lui   s5, 0x80000
-	ldc.i4 524288
-	stloc 15
-// 0x01070828: 0x1070828: sw    v0, -19060(s5)
+// 0x01070760: 0x1070760: lw    a0, 276(v0)
 	ldloc 7
-	ldloc 15
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4.s 69
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107082c: 0x107082c: lw    s3, 28(v0)
+	ldelem.i4
+	stloc.1
+// 0x01070764: 0x1070764: lw    v1, 36(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 8
-// 0x01070830: 0x1070830: lw    s6, 16(v0)
-	ldloc 7
+	stloc 5
+// 0x01070768: 0x1070768: sll   zero, zero, 0
+// 0x0107076c: 0x107076c: bne   a0, v1, 0x10707d8 lui   a0, 0x70000
+	ldloc.1
 	ldloc 5
+	ldc.i4 458752
+	stloc.1
+	bne.un L_10707d8
+// --- basic block ---
+// 0x01070774: 0x1070774: lw    a0, 264(v0)
+	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 66
 	add
 	ldelem.i4
-	stloc 14
-// 0x01070834: 0x1070834: lw    s4, 4(v0)
+	stloc.1
+// 0x01070778: 0x1070778: lw    v1, 24(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 11
-// 0x01070838: 0x1070838: jal   0x10907a0 sll   zero, zero, 0
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_Count_10907a0()
 	stloc 5
+// 0x0107077c: 0x107077c: sll   zero, zero, 0
+// 0x01070780: 0x1070780: bne   a0, v1, 0x10707d4 sll   zero, zero, 0
+	ldloc.1
+	ldloc 5
+	bne.un L_10707d4
 // --- basic block ---
-// 0x01070840: 0x1070840: lw    v1, -19060(s5)
+// 0x01070788: 0x1070788: lw    v1, 268(v0)
 	ldloc 7
-	ldloc 15
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4765
+	ldc.i4.s 67
 	add
 	ldelem.i4
-	stloc 6
-// 0x01070844: 0x1070844: sll   zero, zero, 0
-// 0x01070848: 0x1070848: lw    v1, 16(v1)
+	stloc 5
+// 0x0107078c: 0x107078c: lw    v0, 28(sp)
 	ldloc 7
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107084c: 0x107084c: sll   zero, zero, 0
-// 0x01070850: 0x1070850: slti  v1, v1, 101
-	ldloc 6
-	ldc.i4.s 101
-	clt
-	stloc 6
-// 0x01070854: 0x1070854: bne   v1, zero, 0x10708ac addiu v1, zero, 87
+// 0x01070790: 0x1070790: sll   zero, zero, 0
+// 0x01070794: 0x1070794: bne   v1, v0, 0x10707d8 lui   a0, 0x70000
+	ldloc 5
 	ldloc 6
-	ldc.i4.s 87
-	stloc 6
-	brtrue L_10708ac
+	ldc.i4 458752
+	stloc.1
+	bne.un L_10707d8
 // --- basic block ---
-// 0x0107085c: 0x107085c: lui   a1, 0x10000
+// 0x0107079c: 0x107079c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01070860: 0x1070860: lui   a3, 0x10000
+// 0x010707a0: 0x10707a0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070864: 0x1070864: addiu a1, a1, 20732
+// 0x010707a4: 0x10707a4: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070868: 0x1070868: addiu a3, a3, 29332
+// 0x010707a8: 0x10707a8: addiu a3, a3, 28348
 	ldloc 4
-	ldc.i4 29332
+	ldc.i4 28348
 	add
 	stloc 4
-// 0x0107086c: 0x107086c: addiu a2, zero, 2415
-	ldc.i4 2415
-	stloc.3
-// 0x01070870: 0x1070870: jal   0x100449c addiu a0, zero, 3
-	ldc.i4.3
+// 0x010707ac: 0x10707ac: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x010707b0: 0x10707b0: jal   0x100449c addiu a2, zero, 1550
+	ldc.i4 1550
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1118,269 +959,371 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
 	stloc 6
+// --- basic block ---
+// 0x010707b8: 0x10707b8: bne   s2, zero, 0x107082c addiu v1, zero, 1
+	ldloc 10
+	ldc.i4.1
 	stloc 5
+	brtrue L_107082c
 // --- basic block ---
-// 0x01070878: 0x1070878: jal   0x1070558 addu  a0, s1, zero
-	ldloc 12
+// 0x010707c0: 0x10707c0: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
+// 0x010707c4: 0x10707c4: jal   0x107062c addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::SendAllMessagesTogether_SendPart1_1070558(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::OnAsyncOperationCompleted_MapDisplayed_107062c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x01070880: 0x1070880: bne   v0, zero, 0x1070954 addu  s0, v0, zero
-	ldloc 5
-	ldloc 5
-	stloc 10
-	brtrue L_1070954
-// --- basic block ---
-// 0x01070888: 0x1070888: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x010707cc: 0x10707cc: j	 0x107082c addiu v1, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x0107088c: 0x107088c: lw    v1, -19112(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4778
+	br L_107082c
+// --- basic block ---
+L_10707d4:
+// 0x010707d4: 0x10707d4: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+L_10707d8:
+// 0x010707d8: 0x10707d8: jal   0x108b908 addiu a0, a0, 18472
+	ldloc.1
+	ldc.i4 18472
 	add
-	ldelem.i4
-	stloc 6
-// 0x01070890: 0x1070890: addiu v0, zero, 23
-	ldc.i4.s 23
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl104::RTUsers_ResetUpdateFlag_108b908(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
-// 0x01070894: 0x1070894: bne   v1, v0, 0x1070938 lui   a1, 0x10000
-	ldloc 6
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	bne.un L_1070938
+	stloc 6
 // --- basic block ---
-// 0x0107089c: 0x107089c: jal   0x106e830 addiu a0, zero, 1
-	ldc.i4.1
+// 0x010707e0: 0x10707e0: jal   0x1006fd0 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendAllMessagesTogether_SendPart2_106e830(int32,int32,int32,int32,int32)
+	call int32 Cibyl4::roadmap_math_get_scale_1006fd0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x010708a4: 0x10708a4: j	 0x1070930 addu  s0, v0, zero
-	ldloc 5
-	stloc 10
-	br L_1070930
-// --- basic block ---
-L_10708ac:
-// 0x010708ac: 0x10708ac: mult  s6, v1
-	ldloc 14
-	ldloc 6
-	mul
-	stloc 13
-// 0x010708b0: 0x10708b0: addiu v1, zero, 22
-	ldc.i4.s 22
-	stloc 6
-// 0x010708b4: 0x10708b4: addu  a0, s0, zero
-	ldloc 10
-	stloc.1
-// 0x010708b8: 0x10708b8: mflo  lo
-	ldloc 13
-	stloc 14
-// 0x010708bc: 0x10708bc: sll   zero, zero, 0
-// 0x010708c0: 0x10708c0: sll   zero, zero, 0
-// 0x010708c4: 0x10708c4: mult  s4, v1
-	ldloc 11
-	ldloc 6
-	mul
-	stloc 13
-// 0x010708c8: 0x10708c8: addiu v1, zero, 28
-	ldc.i4.s 28
-	stloc 6
-// 0x010708cc: 0x10708cc: mflo  lo
-	ldloc 13
-	stloc 11
-// 0x010708d0: 0x10708d0: addu  s4, s6, s4
-	ldloc 14
-	ldloc 11
-	add
-	stloc 11
-// 0x010708d4: 0x10708d4: addiu s4, s4, 895
-	ldloc 11
-	ldc.i4 895
-	add
-	stloc 11
-// 0x010708d8: 0x10708d8: mult  s3, v1
-	ldloc 8
-	ldloc 6
-	mul
-	stloc 13
-// 0x010708dc: 0x10708dc: addiu v1, zero, 11
-	ldc.i4.s 11
 	stloc 6
-// 0x010708e0: 0x10708e0: mflo  lo
-	ldloc 13
-	stloc 8
-// 0x010708e4: 0x10708e4: addu  s3, s4, s3
-	ldloc 11
-	ldloc 8
+// --- basic block ---
+// 0x010707e8: 0x10707e8: lui   s1, 0x70000
+	ldc.i4 458752
+	stloc 9
+// 0x010707ec: 0x10707ec: addiu s0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
 	stloc 8
-// 0x010708e8: 0x10708e8: sll   zero, zero, 0
-// 0x010708ec: 0x10708ec: mult  v0, v1
-	ldloc 5
+// 0x010707f0: 0x10707f0: lui   a3, 0x1070000
+	ldc.i4 17235968
+	stloc 4
+// 0x010707f4: 0x10707f4: addu  a2, v0, zero
 	ldloc 6
-	mul
-	stloc 13
-// 0x010708f0: 0x10708f0: mflo  lo
-	ldloc 13
-	stloc 5
-// 0x010708f4: 0x10708f4: jal   0x106755c addu  a1, s3, v0
-	ldloc 8
-	ldloc 5
+	stloc.3
+// 0x010707f8: 0x10707f8: addiu a3, a3, 1580
+	ldloc 4
+	ldc.i4 1580
 	add
+	stloc 4
+// 0x010707fc: 0x10707fc: addiu a0, s1, 18192
+	ldloc 9
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x01070800: 0x1070800: addu  a1, s0, zero
+	ldloc 8
 	stloc.2
+// 0x01070804: 0x1070804: jal   0x1075748 sw    s2, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 10
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::RTNet_MapDisplyed_1075748(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
 	stloc 6
+// --- basic block ---
+// 0x0107080c: 0x107080c: beq   v0, zero, 0x107082c addu  v1, zero, zero
+	ldloc 6
+	ldc.i4.s 0
 	stloc 5
+	brfalse L_107082c
 // --- basic block ---
-// 0x010708fc: 0x10708fc: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x01070900: 0x1070900: addu  a0, s1, zero
-	ldloc 12
+// 0x01070814: 0x1070814: addiu a0, s1, 18192
+	ldloc 9
+	ldc.i4 18192
+	add
 	stloc.1
-// 0x01070904: 0x1070904: jal   0x1070224 addu  s0, v0, zero
-	ldloc 5
-	stloc 10
-	ldloc.0
+// 0x01070818: 0x1070818: addiu a0, a0, 264
+	ldloc.1
+	ldc.i4 264
+	add
+	stloc.1
+// 0x0107081c: 0x107081c: addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+// 0x01070820: 0x1070820: jal   0x1001800 addiu a2, zero, 16
+	ldc.i4.s 16
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::SendAllMessagesTogether_BuildPacket_1070224(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x0107090c: 0x107090c: beq   v0, zero, 0x1070938 lui   a1, 0x10000
+// 0x01070828: 0x1070828: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 5
+L_107082c:
+// 0x0107082c: 0x107082c: lw    ra, 52(sp)
+// 0x01070830: 0x1070830: addu  v0, v1, zero
 	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_1070938
+	stloc 6
+// 0x01070834: 0x1070834: lw    s2, 48(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 10
+// 0x01070838: 0x1070838: lw    s1, 44(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107083c: 0x107083c: lw    s0, 40(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 8
+// 0x01070840: 0x1070840: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 SendAllMessagesTogether_BuildPacket_1070848(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32 s1,int32[] mem,int32 s2,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local 10 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  9 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 9
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01070914: 0x1070914: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x01070918: 0x1070918: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x0107091c: 0x107091c: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x01070848: 0x1070848: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x0107084c: 0x107084c: sw    s2, 24(sp)
+	ldloc 9
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.1
-// 0x01070920: 0x1070920: addu  a1, s0, zero
 	ldloc 10
-	stloc.2
-// 0x01070924: 0x1070924: jal   0x1073a90 addiu a2, a2, 4908
-	ldloc.3
-	ldc.i4 4908
+	stelem.i4
+// 0x01070850: 0x1070850: sw    s1, 20(sp)
+	ldloc 9
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.3
+	ldloc 8
+	stelem.i4
+// 0x01070854: 0x1070854: sw    s0, 16(sp)
+	ldloc 9
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x01070858: 0x1070858: sw    ra, 28(sp)
+// 0x0107085c: 0x107085c: addu  s0, a1, zero
+	ldloc.2
+	stloc 7
+// 0x01070860: 0x1070860: addu  s2, a0, zero
+	ldloc.1
+	stloc 10
+// 0x01070864: 0x1070864: bne   a0, zero, 0x107090c addu  s1, a1, zero
+	ldloc.1
+	ldloc.2
+	stloc 8
+	brtrue L_107090c
+// --- basic block ---
+// 0x0107086c: 0x107086c: jal   0x106e68c addu  a0, a1, zero
+	ldloc.2
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::RTNet_GeneralPacket_1073a90(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_SetMyVisability_106e68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107092c: 0x107092c: addu  s0, v0, zero
-	ldloc 5
-	stloc 10
-L_1070930:
-// 0x01070930: 0x1070930: bne   v0, zero, 0x1070954 lui   a1, 0x10000
+// 0x01070874: 0x1070874: bne   v0, zero, 0x1070894 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1070954
+	brtrue L_1070894
 // --- basic block ---
-L_1070938:
-// 0x01070938: 0x1070938: lui   a3, 0x10000
+// 0x0107087c: 0x107087c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0107093c: 0x107093c: addiu a1, a1, 20732
+// 0x01070880: 0x1070880: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070940: 0x1070940: addiu a3, a3, 29392
+// 0x01070884: 0x1070884: addiu a3, a3, 28440
 	ldloc 4
-	ldc.i4 29392
+	ldc.i4 28440
 	add
 	stloc 4
-// 0x01070944: 0x1070944: addiu a0, zero, 3
-	ldc.i4.3
+// 0x01070888: 0x1070888: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01070948: 0x1070948: jal   0x100449c addiu a2, zero, 2433
-	ldc.i4 2433
+// 0x0107088c: 0x107088c: j	 0x10708c0 addiu a2, zero, 2278
+	ldc.i4 2278
 	stloc.3
+	br L_10708c0
+// --- basic block ---
+L_1070894:
+// 0x01070894: 0x1070894: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107089c: 0x107089c: jal   0x106e5ec addu  a0, s0, v0
+	ldloc 7
+	ldloc 5
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_SetMood_106e5ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070950: 0x1070950: addu  s0, zero, zero
-	ldc.i4.s 0
-	stloc 10
-L_1070954:
-// 0x01070954: 0x1070954: beq   s1, zero, 0x1070974 lui   a1, 0x10000
-	ldloc 12
+// 0x010708a4: 0x10708a4: bne   v0, zero, 0x10708d0 lui   a1, 0x10000
+	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_1070974
+	brtrue L_10708d0
 // --- basic block ---
-// 0x0107095c: 0x107095c: lui   a3, 0x10000
+// 0x010708ac: 0x10708ac: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070960: 0x1070960: addiu a1, a1, 20732
+// 0x010708b0: 0x10708b0: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070964: 0x1070964: addiu a3, a3, 29460
+// 0x010708b4: 0x10708b4: addiu a3, a3, 28516
 	ldloc 4
-	ldc.i4 29460
+	ldc.i4 28516
 	add
 	stloc 4
-// 0x01070968: 0x1070968: addiu a0, zero, 2
-	ldc.i4.2
+// 0x010708b8: 0x10708b8: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x0107096c: 0x107096c: jal   0x100449c addiu a2, zero, 2436
-	ldc.i4 2436
+// 0x010708bc: 0x10708bc: addiu a2, zero, 2286
+	ldc.i4 2286
 	stloc.3
+L_10708c0:
+// 0x010708c0: 0x10708c0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1391,743 +1334,775 @@ L_1070954:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1070974:
-// 0x01070974: 0x1070974: bne   s0, zero, 0x1070994 lui   s1, 0x70000
-	ldloc 10
-	ldc.i4 458752
-	stloc 12
-	brtrue L_1070994
-// --- basic block ---
-// 0x0107097c: 0x107097c: beq   s2, zero, 0x1070a6c addu  a0, zero, zero
-	ldloc 9
+// 0x010708c8: 0x10708c8: j	 0x1070b64 addu  v0, zero, zero
 	ldc.i4.s 0
+	stloc 5
+	br L_1070b64
+// --- basic block ---
+L_10708d0:
+// 0x010708d0: 0x10708d0: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
 	stloc.1
-	brfalse L_1070a6c
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01070984: 0x1070984: jal   0x106ed70 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+// 0x010708d8: 0x10708d8: jal   0x106e4fc addu  a0, s0, v0
+	ldloc 7
+	ldloc 5
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_Location_106e4fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107098c: 0x107098c: j	 0x1070a6c sll   zero, zero, 0
-	br L_1070a6c
-// --- basic block ---
-L_1070994:
-// 0x01070994: 0x1070994: lw    v0, 17620(s1)
-	ldloc 7
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4 4405
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070998: 0x1070998: lui   a1, 0x10000
+// 0x010708e0: 0x10708e0: bne   v0, zero, 0x1070900 lui   a1, 0x10000
+	ldloc 5
 	ldc.i4 65536
 	stloc.2
-// 0x0107099c: 0x107099c: lui   a3, 0x10000
+	brtrue L_1070900
+// --- basic block ---
+// 0x010708e8: 0x10708e8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010709a0: 0x10709a0: addiu a1, a1, 20732
+// 0x010708ec: 0x10708ec: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x010709a4: 0x10709a4: addiu a3, a3, 29528
+// 0x010708f0: 0x10708f0: addiu a3, a3, 28584
 	ldloc 4
-	ldc.i4 29528
+	ldc.i4 28584
 	add
 	stloc 4
-// 0x010709a8: 0x10709a8: addiu a0, zero, 1
-	ldc.i4.1
+// 0x010708f4: 0x10708f4: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x010709ac: 0x10709ac: addiu a2, zero, 4487
-	ldc.i4 4487
+// 0x010708f8: 0x10708f8: j	 0x10708c0 addiu a2, zero, 2294
+	ldc.i4 2294
 	stloc.3
-// 0x010709b0: 0x10709b0: jal   0x100449c sw    v0, 16(sp)
+	br L_10708c0
+// --- basic block ---
+L_1070900:
+// 0x01070900: 0x1070900: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010709b8: 0x10709b8: lw    s3, 17620(s1)
+// 0x01070908: 0x1070908: addu  s1, s0, v0
 	ldloc 7
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4 4405
-	add
-	ldelem.i4
-	stloc 8
-// 0x010709bc: 0x10709bc: sll   zero, zero, 0
-// 0x010709c0: 0x10709c0: blez  s3, 0x1070a20 addiu s3, s3, -1
-	ldloc 8
-	ldloc 8
-	ldc.i4.m1
+	ldloc 5
 	add
 	stloc 8
-	ldc.i4.s 0
-	ble L_1070a20
-// --- basic block ---
-// 0x010709c8: 0x10709c8: lui   s2, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x010709cc: 0x10709cc: sll   v0, s3, 2
-	ldloc 8
-	ldc.i4.2
-	shl
+L_107090c:
+// 0x0107090c: 0x107090c: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x010709d0: 0x10709d0: addiu s2, s2, -18544
-	ldloc 9
-	ldc.i4 -18544
-	add
-	stloc 9
-// 0x010709d4: 0x10709d4: addu  s2, s2, v0
+// 0x01070910: 0x1070910: lw    v0, 18084(v0)
 	ldloc 9
 	ldloc 5
-	add
-	stloc 9
-// 0x010709d8: 0x10709d8: addiu s4, zero, -1
-	ldc.i4.m1
-	stloc 11
-L_10709dc:
-// 0x010709dc: 0x10709dc: lw    v1, 0(s2)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 6
-// 0x010709e0: 0x10709e0: lw    v0, 17620(s1)
-	ldloc 7
-	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 4405
+	ldc.i4 4521
 	add
 	ldelem.i4
 	stloc 5
-// 0x010709e4: 0x10709e4: lw    a0, 8(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc.1
-// 0x010709e8: 0x10709e8: addiu v0, v0, -1
+// 0x01070914: 0x1070914: sll   zero, zero, 0
+// 0x01070918: 0x1070918: blez  v0, 0x1070954 addu  a0, s1, zero
 	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x010709ec: 0x10709ec: jal   0x1000930 sw    v0, 17620(s1)
+	ldloc 8
+	stloc.1
+	ldc.i4.s 0
+	ble L_1070954
+// --- basic block ---
+// 0x01070920: 0x1070920: jal   0x106ccf0 addu  a1, s0, zero
 	ldloc 7
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4 4405
-	add
-	ldloc 5
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::SendMessage_CachedMapProblems_106ccf0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010709f4: 0x10709f4: lw    v0, 0(s2)
+// 0x01070928: 0x1070928: bne   v0, zero, 0x1070948 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070948
+// --- basic block ---
+// 0x01070930: 0x1070930: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070934: 0x1070934: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070938: 0x1070938: addiu a3, a3, 28652
+	ldloc 4
+	ldc.i4 28652
+	add
+	stloc 4
+// 0x0107093c: 0x107093c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01070940: 0x1070940: j	 0x10708c0 addiu a2, zero, 2305
+	ldc.i4 2305
+	stloc.3
+	br L_10708c0
+// --- basic block ---
+L_1070948:
+// 0x01070948: 0x1070948: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x010709f8: 0x10709f8: sll   zero, zero, 0
-// 0x010709fc: 0x10709fc: lw    a0, 4(v0)
+// --- basic block ---
+// 0x01070950: 0x1070950: addu  s1, s0, v0
 	ldloc 7
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc.1
-// 0x01070a00: 0x1070a00: jal   0x1000930 addiu s3, s3, -1
-	ldloc 8
-	ldc.i4.m1
 	add
 	stloc 8
+L_1070954:
+// 0x01070954: 0x1070954: jal   0x106e454 addu  a0, s1, zero
+	ldloc 8
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_UserPoints_106e454(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107095c: 0x107095c: beq   v0, zero, 0x1070974 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_1070974
+// --- basic block ---
+// 0x01070964: 0x1070964: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070a08: 0x1070a08: lw    a0, 0(s2)
+// 0x0107096c: 0x107096c: j	 0x107098c addu  s1, s0, v0
 	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+	ldloc 5
+	add
+	stloc 8
+	br L_107098c
+// --- basic block ---
+L_1070974:
+// 0x01070974: 0x1070974: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070978: 0x1070978: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x0107097c: 0x107097c: addiu a3, a3, 28740
+	ldloc 4
+	ldc.i4 28740
+	add
+	stloc 4
+// 0x01070980: 0x1070980: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01070a0c: 0x1070a0c: jal   0x1000930 sll   zero, zero, 0
+// 0x01070984: 0x1070984: jal   0x100449c addiu a2, zero, 2316
+	ldc.i4 2316
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070a14: 0x1070a14: sw    zero, 0(s2)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x01070a18: 0x1070a18: bne   s3, s4, 0x10709dc addiu s2, s2, -4
+L_107098c:
+// 0x0107098c: 0x107098c: addu  a0, s1, zero
 	ldloc 8
-	ldloc 11
-	ldloc 9
-	ldc.i4.s -4
-	add
-	stloc 9
-	bne.un L_10709dc
-// --- basic block ---
-L_1070a20:
-// 0x01070a20: 0x1070a20: addu  v1, zero, zero
-	ldc.i4.s 0
+	stloc.1
+// 0x01070990: 0x1070990: jal   0x106e8e8 sltiu a1, s2, 1
+	ldloc 10
+	ldc.i4.1
+	clt.un
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendMessage_At_106e8e8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x01070a24: 0x1070a24: cibyl_sysc_arg 0x3
-	ldloc 6
-// 0x01070a28: 0x1070a28: cibyl_sysc 0x210c
-	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01070a2c: 0x1070a2c: addu  v1, v0, zero
+// --- basic block ---
+// 0x01070998: 0x1070998: beq   v0, zero, 0x10709b0 lui   a1, 0x10000
 	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_10709b0
+// --- basic block ---
+// 0x010709a0: 0x10709a0: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x01070a30: 0x1070a30: lui   v0, 0x70000
-	ldc.i4 458752
 	stloc 5
-// 0x01070a34: 0x1070a34: sw    v1, 17700(v0)
+// --- basic block ---
+// 0x010709a8: 0x10709a8: j	 0x10709c8 addu  s1, s0, v0
 	ldloc 7
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4425
 	add
-	ldloc 6
-	stelem.i4
-L_1070a38:
-// 0x01070a38: 0x1070a38: jal   0x1067508 addiu a0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+	stloc 8
+	br L_10709c8
+// --- basic block ---
+L_10709b0:
+// 0x010709b0: 0x10709b0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010709b4: 0x10709b4: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x010709b8: 0x10709b8: addiu a3, a3, 28840
+	ldloc 4
+	ldc.i4 28840
 	add
+	stloc 4
+// 0x010709bc: 0x10709bc: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x010709c0: 0x10709c0: jal   0x100449c addiu a2, zero, 2322
+	ldc.i4 2322
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070a40: 0x1070a40: lw    ra, 2300(sp)
-// 0x01070a44: 0x1070a44: addu  v0, s0, zero
+L_10709c8:
+// 0x010709c8: 0x10709c8: bne   s2, zero, 0x1070a1c lui   v0, 0x80000
 	ldloc 10
+	ldc.i4 524288
 	stloc 5
-// 0x01070a48: 0x1070a48: lw    s6, 2296(sp)
-	ldloc 7
-	ldloc.0
+	brtrue L_1070a1c
+// --- basic block ---
+// 0x010709d0: 0x10709d0: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x010709d4: 0x10709d4: lw    v0, 14992(v0)
+	ldloc 9
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 574
+	ldc.i4 3748
 	add
 	ldelem.i4
-	stloc 14
-// 0x01070a4c: 0x1070a4c: lw    s5, 2292(sp)
-	ldloc 7
+	stloc 5
+// 0x010709d8: 0x10709d8: sll   zero, zero, 0
+// 0x010709dc: 0x10709dc: beq   v0, zero, 0x1070a1c lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brfalse L_1070a1c
+// --- basic block ---
+// 0x010709e4: 0x10709e4: jal   0x1070724 addu  a0, s1, zero
+	ldloc 8
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 573
-	add
-	ldelem.i4
-	stloc 15
-// 0x01070a50: 0x1070a50: lw    s4, 2288(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 572
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl84::SendMessage_MapDisplyed_1070724(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010709ec: 0x10709ec: bne   v0, zero, 0x1070a0c lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070a0c
+// --- basic block ---
+// 0x010709f4: 0x10709f4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010709f8: 0x10709f8: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldelem.i4
-	stloc 11
-// 0x01070a54: 0x1070a54: lw    s3, 2284(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 571
+	stloc.2
+// 0x010709fc: 0x10709fc: addiu a3, a3, 28928
+	ldloc 4
+	ldc.i4 28928
 	add
-	ldelem.i4
-	stloc 8
-// 0x01070a58: 0x1070a58: lw    s2, 2280(sp)
+	stloc 4
+// 0x01070a00: 0x1070a00: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01070a04: 0x1070a04: j	 0x10708c0 addiu a2, zero, 2339
+	ldc.i4 2339
+	stloc.3
+	br L_10708c0
+// --- basic block ---
+L_1070a0c:
+// 0x01070a0c: 0x1070a0c: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 570
-	add
-	ldelem.i4
-	stloc 9
-// 0x01070a5c: 0x1070a5c: lw    s1, 2276(sp)
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01070a14: 0x1070a14: addu  s1, s0, v0
 	ldloc 7
-	ldloc.0
+	ldloc 5
+	add
+	stloc 8
+// 0x01070a18: 0x1070a18: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_1070a1c:
+// 0x01070a1c: 0x1070a1c: lw    v0, -18596(v0)
+	ldloc 9
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 569
+	ldc.i4 -4649
 	add
 	ldelem.i4
-	stloc 12
-// 0x01070a60: 0x1070a60: lw    s0, 2272(sp)
-	ldloc 7
-	ldloc.0
+	stloc 5
+// 0x01070a20: 0x1070a20: sll   zero, zero, 0
+// 0x01070a24: 0x1070a24: lw    v0, 28(v0)
+	ldloc 9
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 10
-// 0x01070a64: 0x1070a64: jr    ra addiu sp, sp, 2304
-	ldloc.0
-	ldc.i4 2304
-	add
-	stloc.0
-	br __CIBYL_function_return
-// --- basic block ---
-L_1070a6c:
-// 0x01070a6c: 0x1070a6c: jal   0x10b30d0 addu  a0, zero, zero
+	stloc 5
+// 0x01070a28: 0x1070a28: sll   zero, zero, 0
+// 0x01070a2c: 0x1070a2c: blez  v0, 0x1070a6c lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
 	ldc.i4.s 0
+	ble L_1070a6c
+// --- basic block ---
+// 0x01070a34: 0x1070a34: jal   0x106eab0 addu  a0, s1, zero
+	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl133::editor_track_report_conclude_export_10b30d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_CreateNewRoads_106eab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070a74: 0x1070a74: j	 0x1070a38 sll   zero, zero, 0
-	br L_1070a38
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x01070a3c: 0x1070a3c: bne   v0, zero, 0x1070a5c lui   a1, 0x10000
 	ldloc 5
-	ret
-}
-.method public static int32 OnTransactionCompleted_TestLoginDetails_Login_1070a7c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070a5c
 // --- basic block ---
-// 0x01070a7c: 0x1070a7c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01070a80: 0x1070a80: sltiu a0, a1, 1
+// 0x01070a44: 0x1070a44: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070a48: 0x1070a48: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4.1
-	clt.un
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070a4c: 0x1070a4c: addiu a3, a3, 29000
+	ldloc 4
+	ldc.i4 29000
+	add
+	stloc 4
+// 0x01070a50: 0x1070a50: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01070a84: 0x1070a84: sw    s0, 16(sp)
+// 0x01070a54: 0x1070a54: j	 0x10708c0 addiu a2, zero, 2350
+	ldc.i4 2350
+	stloc.3
+	br L_10708c0
+// --- basic block ---
+L_1070a5c:
+// 0x01070a5c: 0x1070a5c: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-// 0x01070a88: 0x1070a88: sw    ra, 20(sp)
-// 0x01070a8c: 0x1070a8c: jal   0x106bebc addu  s0, a1, zero
-	ldloc.2
-	stloc 8
-	ldloc.0
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::TestLoginDetailsCompleted_106bebc(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070a94: 0x1070a94: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070a98: 0x1070a98: lw    v0, 17984(v0)
+// 0x01070a64: 0x1070a64: addu  s1, s0, v0
 	ldloc 7
 	ldloc 5
+	add
+	stloc 8
+// 0x01070a68: 0x1070a68: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_1070a6c:
+// 0x01070a6c: 0x1070a6c: lw    v0, -18596(v0)
+	ldloc 9
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4496
+	ldc.i4 -4649
 	add
 	ldelem.i4
 	stloc 5
-// 0x01070a9c: 0x1070a9c: sll   zero, zero, 0
-// 0x01070aa0: 0x1070aa0: beq   v0, zero, 0x1070ac4 lui   a1, 0x1070000
+// 0x01070a70: 0x1070a70: sll   zero, zero, 0
+// 0x01070a74: 0x1070a74: lw    v0, 16(v0)
+	ldloc 9
 	ldloc 5
-	ldc.i4 17235968
-	stloc.2
-	brfalse L_1070ac4
-// --- basic block ---
-// 0x01070aa8: 0x1070aa8: addiu a1, a1, -16828
-	ldloc.2
-	ldc.i4 -16828
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
-// 0x01070aac: 0x1070aac: jal   0x104fe98 addiu a0, zero, 10
-	ldc.i4.s 10
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldelem.i4
+	stloc 5
+// 0x01070a78: 0x1070a78: sll   zero, zero, 0
+// 0x01070a7c: 0x1070a7c: slti  v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	clt
+	stloc 5
+// 0x01070a80: 0x1070a80: bne   v0, zero, 0x1070ac0 lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
 	stloc 5
+	brtrue L_1070ac0
 // --- basic block ---
-// 0x01070ab4: 0x1070ab4: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x01070ab8: 0x1070ab8: addiu a1, a1, -16900
-	ldloc.2
-	ldc.i4 -16900
-	add
-	stloc.2
-// 0x01070abc: 0x1070abc: jal   0x104fe98 addiu a0, zero, 30
-	ldc.i4.s 30
+// 0x01070a88: 0x1070a88: jal   0x106eb3c addu  a0, s1, zero
+	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_GPSPath_106eb3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1070ac4:
-// 0x01070ac4: 0x1070ac4: bne   s0, zero, 0x1070ae8 lui   a1, 0x10000
-	ldloc 8
+// 0x01070a90: 0x1070a90: bne   v0, zero, 0x1070ab0 lui   a1, 0x10000
+	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1070ae8
+	brtrue L_1070ab0
 // --- basic block ---
-// 0x01070acc: 0x1070acc: jal   0x106bd84 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
+// 0x01070a98: 0x1070a98: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070a9c: 0x1070a9c: addiu a1, a1, 21196
 	ldloc.2
-	ldloc.3
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070aa0: 0x1070aa0: addiu a3, a3, 29076
 	ldloc 4
-	call int32 Cibyl80::Realtime_SessionDetailsSave_106bd84(int32,int32,int32,int32,int32)
+	ldc.i4 29076
+	add
+	stloc 4
+// 0x01070aa4: 0x1070aa4: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01070aa8: 0x1070aa8: j	 0x10708c0 addiu a2, zero, 2361
+	ldc.i4 2361
+	stloc.3
+	br L_10708c0
+// --- basic block ---
+L_1070ab0:
+// 0x01070ab0: 0x1070ab0: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070ad4: 0x1070ad4: addu  a0, zero, zero
+// 0x01070ab8: 0x1070ab8: addu  s1, s0, v0
+	ldloc 7
+	ldloc 5
+	add
+	stloc 8
+// 0x01070abc: 0x1070abc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_1070ac0:
+// 0x01070ac0: 0x1070ac0: lw    v0, -18596(v0)
+	ldloc 9
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4649
+	add
+	ldelem.i4
+	stloc 5
+// 0x01070ac4: 0x1070ac4: sll   zero, zero, 0
+// 0x01070ac8: 0x1070ac8: lw    v0, 4(v0)
+	ldloc 9
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 5
+// 0x01070acc: 0x1070acc: sll   zero, zero, 0
+// 0x01070ad0: 0x1070ad0: blez  v0, 0x1070b0c sll   zero, zero, 0
+	ldloc 5
 	ldc.i4.s 0
+	ble L_1070b0c
+// --- basic block ---
+// 0x01070ad8: 0x1070ad8: jal   0x106ebb4 addu  a0, s1, zero
+	ldloc 8
 	stloc.1
-// 0x01070ad8: 0x1070ad8: jal   0x10707e4 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::SendAllMessagesTogether_10707e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_NodePath_106ebb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070ae0: 0x1070ae0: j	 0x1070b00 sll   zero, zero, 0
-	br L_1070b00
+// 0x01070ae0: 0x1070ae0: bne   v0, zero, 0x1070b00 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070b00
 // --- basic block ---
-L_1070ae8:
 // 0x01070ae8: 0x1070ae8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070aec: 0x1070aec: addiu a1, a1, 20732
+// 0x01070aec: 0x1070aec: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070af0: 0x1070af0: addiu a3, a3, 29584
+// 0x01070af0: 0x1070af0: addiu a3, a3, 29144
 	ldloc 4
-	ldc.i4 29584
+	ldc.i4 29144
 	add
 	stloc 4
-// 0x01070af4: 0x1070af4: addiu a0, zero, 3
-	ldc.i4.3
+// 0x01070af4: 0x1070af4: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01070af8: 0x1070af8: jal   0x100449c addiu a2, zero, 3834
-	ldc.i4 3834
+// 0x01070af8: 0x1070af8: j	 0x10708c0 addiu a2, zero, 2372
+	ldc.i4 2372
 	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	br L_10708c0
 // --- basic block ---
 L_1070b00:
-// 0x01070b00: 0x1070b00: lw    ra, 20(sp)
-// 0x01070b04: 0x1070b04: lw    s0, 16(sp)
+// 0x01070b00: 0x1070b00: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x01070b08: 0x1070b08: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 TransactionStarted_1070b10(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01070b10: 0x1070b10: lui   v0, 0x70000
-	ldc.i4 458752
 	stloc 5
-// 0x01070b14: 0x1070b14: lw    v0, 17564(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070b18: 0x1070b18: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01070b1c: 0x1070b1c: beq   v0, zero, 0x1070b50 sw    ra, 20(sp)
-	ldloc 5
-	brfalse L_1070b50
 // --- basic block ---
-// 0x01070b24: 0x1070b24: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070b28: 0x1070b28: lw    v0, 17984(v0)
-	ldloc 6
+// 0x01070b08: 0x1070b08: addu  s1, s0, v0
+	ldloc 7
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4496
 	add
-	ldelem.i4
+	stloc 8
+L_1070b0c:
+// 0x01070b0c: 0x1070b0c: jal   0x1090df0 sll   zero, zero, 0
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_IsEmpty_1090df0()
 	stloc 5
-// 0x01070b2c: 0x1070b2c: sll   zero, zero, 0
-// 0x01070b30: 0x1070b30: bne   v0, zero, 0x1070b50 sll   zero, zero, 0
+// --- basic block ---
+// 0x01070b14: 0x1070b14: bne   v0, zero, 0x1070b44 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1070b50
+	brtrue L_1070b44
 // --- basic block ---
-// 0x01070b38: 0x1070b38: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x01070b3c: 0x1070b3c: addiu a0, a0, 4000
-	ldloc.1
-	ldc.i4 4000
-	add
+// 0x01070b1c: 0x1070b1c: jal   0x106eb84 addu  a0, s1, zero
+	ldloc 8
 	stloc.1
-// 0x01070b40: 0x1070b40: jal   0x106bb20 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Login_106bb20(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_ExternalPoiDisplayed_106eb84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070b48: 0x1070b48: j	 0x1070b58 sll   zero, zero, 0
-	br L_1070b58
-// --- basic block ---
-L_1070b50:
-// 0x01070b50: 0x1070b50: jal   0x10707e4 addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x01070b24: 0x1070b24: bne   v0, zero, 0x1070b44 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
 	stloc.2
-	ldloc.0
-	ldloc.1
+	brtrue L_1070b44
+// --- basic block ---
+// 0x01070b2c: 0x1070b2c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070b30: 0x1070b30: addiu a1, a1, 21196
 	ldloc.2
-	ldloc.3
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070b34: 0x1070b34: addiu a3, a3, 24240
 	ldloc 4
-	call int32 Cibyl84::SendAllMessagesTogether_10707e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldc.i4 24240
+	add
+	stloc 4
+// 0x01070b38: 0x1070b38: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01070b3c: 0x1070b3c: j	 0x10708c0 addiu a2, zero, 2383
+	ldc.i4 2383
+	stloc.3
+	br L_10708c0
+// --- basic block ---
+L_1070b44:
+// 0x01070b44: 0x1070b44: lb    v1, 0(s0)
+	ldloc 7
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x01070b48: 0x1070b48: sll   zero, zero, 0
+// 0x01070b4c: 0x1070b4c: bne   v1, zero, 0x1070b64 addiu v0, zero, 1
+	ldloc 6
+	ldc.i4.1
 	stloc 5
+	brtrue L_1070b64
 // --- basic block ---
-L_1070b58:
-// 0x01070b58: 0x1070b58: lw    ra, 20(sp)
-// 0x01070b5c: 0x1070b5c: sll   zero, zero, 0
-// 0x01070b60: 0x1070b60: jr    ra addiu sp, sp, 24
+// 0x01070b54: 0x1070b54: addiu v1, zero, 23
+	ldc.i4.s 23
+	stloc 6
+// 0x01070b58: 0x1070b58: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01070b5c: 0x1070b5c: sw    v1, -18648(v0)
+	ldloc 9
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4662
+	add
+	ldloc 6
+	stelem.i4
+// 0x01070b60: 0x1070b60: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_1070b64:
+// 0x01070b64: 0x1070b64: lw    ra, 28(sp)
+// 0x01070b68: 0x1070b68: lw    s2, 24(sp)
+	ldloc 9
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 10
+// 0x01070b6c: 0x1070b6c: lw    s1, 20(sp)
+	ldloc 9
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 8
+// 0x01070b70: 0x1070b70: lw    s0, 16(sp)
+	ldloc 9
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x01070b74: 0x1070b74: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 StartTransaction_1070b68(int32,int32,int32,int32,int32)
+.method public static int32 SendAllMessagesTogether_SendPart1_1070b7c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 s1,int32 s3,int32 s2,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
+// local  7 is register s0
+// local  9 is register s1
+// local 11 is register s2
+// local 10 is register s3
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local 12 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2137,188 +2112,197 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01070b68: 0x1070b68: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070b6c: 0x1070b6c: lw    v0, 17640(v0)
-	ldloc 6
-	ldloc 5
+// 0x01070b7c: 0x1070b7c: addiu sp, sp, -2288
+	ldloc.0
+	ldc.i4 -2288
+	add
+	stloc.0
+// 0x01070b80: 0x1070b80: sw    s2, 2276(sp)
+	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4410
+	ldc.i4 569
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070b70: 0x1070b70: addiu sp, sp, -32
+	ldloc 11
+	stelem.i4
+// 0x01070b84: 0x1070b84: addiu s2, sp, 16
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s 16
 	add
-	stloc.0
-// 0x01070b74: 0x1070b74: sw    ra, 28(sp)
-// 0x01070b78: 0x1070b78: beq   v0, zero, 0x1070bbc sw    s0, 24(sp)
-	ldloc 5
-	ldloc 6
+	stloc 11
+// 0x01070b88: 0x1070b88: sw    s3, 2280(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 570
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-	brfalse L_1070bbc
-// --- basic block ---
-// 0x01070b80: 0x1070b80: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 7
-// 0x01070b84: 0x1070b84: lw    v0, 17708(v1)
-	ldloc 6
-	ldloc 7
+// 0x01070b8c: 0x1070b8c: addu  s3, a0, zero
+	ldloc.1
+	stloc 10
+// 0x01070b90: 0x1070b90: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x01070b94: 0x1070b94: sw    ra, 2284(sp)
+// 0x01070b98: 0x1070b98: sw    s1, 2272(sp)
+	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4427
+	ldc.i4 568
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070b88: 0x1070b88: sll   zero, zero, 0
-// 0x01070b8c: 0x1070b8c: sltiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	clt.un
-	stloc 5
-// 0x01070b90: 0x1070b90: beq   v0, zero, 0x1070bbc sw    v0, 17708(v1)
-	ldloc 5
-	ldloc 6
-	ldloc 7
+	ldloc 9
+	stelem.i4
+// 0x01070b9c: 0x1070b9c: jal   0x10674f4 sw    s0, 2268(sp)
+	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4427
+	ldc.i4 567
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
-	brfalse L_1070bbc
-// --- basic block ---
-// 0x01070b98: 0x1070b98: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01070b9c: 0x1070b9c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01070ba0: 0x1070ba0: addiu a1, a1, 20732
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01070ba4: 0x1070ba4: addiu a3, a3, 29652
+	ldloc.3
 	ldloc 4
-	ldc.i4 29652
-	add
-	stloc 4
-// 0x01070ba8: 0x1070ba8: addiu a0, zero, 3
-	ldc.i4.3
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01070ba4: 0x1070ba4: addu  a0, s2, zero
+	ldloc 11
 	stloc.1
-// 0x01070bac: 0x1070bac: jal   0x100449c addiu a2, zero, 2626
-	ldc.i4 2626
-	stloc.3
+// 0x01070ba8: 0x1070ba8: jal   0x106756c addiu a1, zero, 2015
+	ldc.i4 2015
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070bb4: 0x1070bb4: j	 0x1070c64 addiu v1, zero, 1
-	ldc.i4.1
+// 0x01070bb0: 0x1070bb0: addu  s0, v0, zero
+	ldloc 5
 	stloc 7
-	br L_1070c64
+// 0x01070bb4: 0x1070bb4: bne   s3, zero, 0x1070c5c addu  s1, v0, zero
+	ldloc 10
+	ldloc 5
+	stloc 9
+	brtrue L_1070c5c
 // --- basic block ---
-L_1070bbc:
-// 0x01070bbc: 0x1070bbc: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01070bc0: 0x1070bc0: lw    v0, -19112(v0)
-	ldloc 6
+// 0x01070bbc: 0x1070bbc: jal   0x106e68c addu  a0, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4778
-	add
-	ldelem.i4
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendMessage_SetMyVisability_106e68c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x01070bc4: 0x1070bc4: sll   zero, zero, 0
-// 0x01070bc8: 0x1070bc8: beq   v0, zero, 0x1070c08 lui   s0, 0x70000
+// --- basic block ---
+// 0x01070bc4: 0x1070bc4: bne   v0, zero, 0x1070be0 lui   a1, 0x10000
 	ldloc 5
-	ldc.i4 458752
-	stloc 8
-	brfalse L_1070c08
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070be0
 // --- basic block ---
-// 0x01070bd0: 0x1070bd0: jal   0x106ac80 sw    a0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+// 0x01070bcc: 0x1070bcc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070bd0: 0x1070bd0: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070bd4: 0x1070bd4: addiu a3, a3, 29212
+	ldloc 4
+	ldc.i4 29212
 	add
+	stloc 4
+// 0x01070bd8: 0x1070bd8: j	 0x1070c08 addiu a2, zero, 2079
+	ldc.i4 2079
+	stloc.3
+	br L_1070c08
+// --- basic block ---
+L_1070be0:
+// 0x01070be0: 0x1070be0: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
 	ldloc.1
-	stelem.i4
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01070be8: 0x1070be8: jal   0x106e5ec addu  a0, s0, v0
+	ldloc 7
+	ldloc 5
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::NameAndPasswordAlreadyFailedAuthentication_106ac80(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_SetMood_106e5ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070bd8: 0x1070bd8: lw    a0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc.1
-// 0x01070bdc: 0x1070bdc: beq   v0, zero, 0x1070c08 lui   s0, 0x70000
+// 0x01070bf0: 0x1070bf0: bne   v0, zero, 0x1070c24 lui   a1, 0x10000
 	ldloc 5
-	ldc.i4 458752
-	stloc 8
-	brfalse L_1070c08
-// --- basic block ---
-// 0x01070be4: 0x1070be4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01070be8: 0x1070be8: lui   a3, 0x10000
+	brtrue L_1070c24
+// --- basic block ---
+// 0x01070bf8: 0x1070bf8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01070bec: 0x1070bec: addiu a1, a1, 20732
+// 0x01070bfc: 0x1070bfc: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01070bf0: 0x1070bf0: addiu a3, a3, 29736
+// 0x01070c00: 0x1070c00: addiu a3, a3, 29292
 	ldloc 4
-	ldc.i4 29736
+	ldc.i4 29292
 	add
 	stloc 4
-// 0x01070bf4: 0x1070bf4: addiu a0, zero, 3
-	ldc.i4.3
-	stloc.1
-// 0x01070bf8: 0x1070bf8: jal   0x100449c addiu a2, zero, 2636
-	ldc.i4 2636
+// 0x01070c04: 0x1070c04: addiu a2, zero, 2088
+	ldc.i4 2088
 	stloc.3
+L_1070c08:
+// 0x01070c08: 0x1070c08: jal   0x100449c addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2326,1135 +2310,576 @@ L_1070bbc:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070c00: 0x1070c00: j	 0x1070c64 addu  v1, zero, zero
+// 0x01070c10: 0x1070c10: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+L_1070c14:
+// 0x01070c14: 0x1070c14: jal   0x1067518 addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_1070c64
-// --- basic block ---
-L_1070c08:
-// 0x01070c08: 0x1070c08: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x01070c0c: 0x1070c0c: addiu s0, s0, 17728
-	ldloc 8
-	ldc.i4 17728
-	add
-	stloc 8
-// 0x01070c10: 0x1070c10: jal   0x1070b10 sw    v0, 28688(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 7172
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::TransactionStarted_1070b10(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070c18: 0x1070c18: bne   v0, zero, 0x1070c64 addiu v1, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 7
-	brtrue L_1070c64
+// 0x01070c1c: 0x1070c1c: j	 0x1070de8 sll   zero, zero, 0
+	br L_1070de8
 // --- basic block ---
-// 0x01070c20: 0x1070c20: lui   a0, 0x70000
-	ldc.i4 458752
+L_1070c24:
+// 0x01070c24: 0x1070c24: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
 	stloc.1
-// 0x01070c24: 0x1070c24: addiu a0, a0, 18008
 	ldloc.1
-	ldc.i4 18008
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01070c2c: 0x1070c2c: jal   0x106e4fc addu  a0, s0, v0
+	ldloc 7
+	ldloc 5
 	add
 	stloc.1
-// 0x01070c28: 0x1070c28: jal   0x108b310 sw    zero, 28688(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 7172
-	add
-	ldc.i4.s 0
-	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl104::RTUsers_RedoUpdateFlag_108b310(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl82::SendMessage_Location_106e4fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070c30: 0x1070c30: lw    v0, 28696(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 7174
+// 0x01070c34: 0x1070c34: bne   v0, zero, 0x1070c50 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070c50
+// --- basic block ---
+// 0x01070c3c: 0x1070c3c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070c40: 0x1070c40: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldelem.i4
+	stloc.2
+// 0x01070c44: 0x1070c44: addiu a3, a3, 29364
+	ldloc 4
+	ldc.i4 29364
+	add
+	stloc 4
+// 0x01070c48: 0x1070c48: j	 0x1070c08 addiu a2, zero, 2097
+	ldc.i4 2097
+	stloc.3
+	br L_1070c08
+// --- basic block ---
+L_1070c50:
+// 0x01070c50: 0x1070c50: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x01070c34: 0x1070c34: sll   zero, zero, 0
-// 0x01070c38: 0x1070c38: bne   v0, zero, 0x1070c4c lui   v0, 0x70000
+// --- basic block ---
+// 0x01070c58: 0x1070c58: addu  s1, s0, v0
+	ldloc 7
 	ldloc 5
-	ldc.i4 458752
+	add
+	stloc 9
+L_1070c5c:
+// 0x01070c5c: 0x1070c5c: jal   0x106e454 addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendMessage_UserPoints_106e454(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	brtrue L_1070c4c
 // --- basic block ---
-// 0x01070c40: 0x1070c40: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x01070c44: 0x1070c44: sw    v0, 28696(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 7174
-	add
+// 0x01070c64: 0x1070c64: beq   v0, zero, 0x1070c7c lui   a1, 0x10000
 	ldloc 5
-	stelem.i4
-// 0x01070c48: 0x1070c48: lui   v0, 0x70000
-	ldc.i4 458752
+	ldc.i4 65536
+	stloc.2
+	brfalse L_1070c7c
+// --- basic block ---
+// 0x01070c6c: 0x1070c6c: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-L_1070c4c:
-// 0x01070c4c: 0x1070c4c: addiu v0, v0, 17728
+// --- basic block ---
+// 0x01070c74: 0x1070c74: j	 0x1070c94 addu  s1, s0, v0
+	ldloc 7
 	ldloc 5
-	ldc.i4 17728
 	add
-	stloc 5
-// 0x01070c50: 0x1070c50: lw    a1, 28696(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 7174
+	stloc 9
+	br L_1070c94
+// --- basic block ---
+L_1070c7c:
+// 0x01070c7c: 0x1070c7c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070c80: 0x1070c80: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldelem.i4
 	stloc.2
-// 0x01070c54: 0x1070c54: addiu a0, zero, 23
-	ldc.i4.s 23
+// 0x01070c84: 0x1070c84: addiu a3, a3, 29440
+	ldloc 4
+	ldc.i4 29440
+	add
+	stloc 4
+// 0x01070c88: 0x1070c88: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01070c58: 0x1070c58: bne   a1, a0, 0x1070c64 addu  v1, zero, zero
+// 0x01070c8c: 0x1070c8c: jal   0x100449c addiu a2, zero, 2108
+	ldc.i4 2108
+	stloc.3
+	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_1070c94:
+// 0x01070c94: 0x1070c94: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x01070c98: 0x1070c98: jal   0x106e8e8 sltiu a1, s3, 1
+	ldloc 10
+	ldc.i4.1
+	clt.un
+	stloc.2
+	ldloc.0
 	ldloc.1
-	ldc.i4.s 0
-	stloc 7
-	bne.un L_1070c64
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendMessage_At_106e8e8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01070c60: 0x1070c60: sw    zero, 28696(v0)
-	ldloc 6
+// 0x01070ca0: 0x1070ca0: beq   v0, zero, 0x1070cb8 lui   a1, 0x10000
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 7174
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_1070c64:
-// 0x01070c64: 0x1070c64: lw    ra, 28(sp)
-// 0x01070c68: 0x1070c68: addu  v0, v1, zero
+	ldc.i4 65536
+	stloc.2
+	brfalse L_1070cb8
+// --- basic block ---
+// 0x01070ca8: 0x1070ca8: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x01070c6c: 0x1070c6c: lw    s0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x01070c70: 0x1070c70: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// --- basic block ---
+// 0x01070cb0: 0x1070cb0: j	 0x1070cd0 addu  s1, s0, v0
 	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ret
-}
-.method public static int32 OnTimer_Realtime_1070c78(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01070c78: 0x1070c78: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070c7c: 0x1070c7c: lw    v0, 17564(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070c80: 0x1070c80: addiu sp, sp, -48
-	ldloc.0
-	ldc.i4.s -48
-	add
-	stloc.0
-// 0x01070c84: 0x1070c84: sw    ra, 44(sp)
-// 0x01070c88: 0x1070c88: beq   v0, zero, 0x1070f90 sw    s0, 40(sp)
-	ldloc 5
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 8
-	stelem.i4
-	brfalse L_1070f90
-// --- basic block ---
-// 0x01070c90: 0x1070c90: addu  s0, zero, zero
-	ldc.i4.s 0
-	stloc 8
-// 0x01070c94: 0x1070c94: cibyl_sysc_arg 0x10
-	ldloc 8
-// 0x01070c98: 0x1070c98: cibyl_sysc 0x2111
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x01070c9c: 0x1070c9c: addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x01070ca0: 0x1070ca0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070ca4: 0x1070ca4: lw    v0, 17640(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4410
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070ca8: 0x1070ca8: sll   zero, zero, 0
-// 0x01070cac: 0x1070cac: bne   v0, zero, 0x1070d00 lui   v0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	brtrue L_1070d00
-// --- basic block ---
-// 0x01070cb4: 0x1070cb4: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070cb8: 0x1070cb8: lw    v0, 17592(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4398
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070cbc: 0x1070cbc: sll   zero, zero, 0
-// 0x01070cc0: 0x1070cc0: beq   v0, zero, 0x1070d00 lui   v0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	brfalse L_1070d00
-// --- basic block ---
-// 0x01070cc8: 0x1070cc8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01070ccc: 0x1070ccc: lw    v0, -19112(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4778
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070cd0: 0x1070cd0: sll   zero, zero, 0
-// 0x01070cd4: 0x1070cd4: addiu v1, v0, -10
-	ldloc 5
-	ldc.i4.s -10
-	add
-	stloc 6
-// 0x01070cd8: 0x1070cd8: sltiu v1, v1, 7
-	ldloc 6
-	ldc.i4.7
-	clt.un
-	stloc 6
-// 0x01070cdc: 0x1070cdc: bne   v1, zero, 0x1070cfc addiu v1, zero, 27
-	ldloc 6
-	ldc.i4.s 27
-	stloc 6
-	brtrue L_1070cfc
-// --- basic block ---
-// 0x01070ce4: 0x1070ce4: beq   v0, v1, 0x1070d00 lui   v0, 0x70000
-	ldloc 5
-	ldloc 6
-	ldc.i4 458752
-	stloc 5
-	beq  L_1070d00
-// --- basic block ---
-// 0x01070cec: 0x1070cec: jal   0x1068fb4 sll   zero, zero, 0
-	call int32 Cibyl78::websvc_trans_getLastNetConnectRes_1068fb4()
-	stloc 5
-// --- basic block ---
-// 0x01070cf4: 0x1070cf4: bne   v0, zero, 0x1070d94 lui   v0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	brtrue L_1070d94
-// --- basic block ---
-L_1070cfc:
-// 0x01070cfc: 0x1070cfc: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-L_1070d00:
-// 0x01070d00: 0x1070d00: lw    v1, 17688(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4422
-	add
-	ldelem.i4
-	stloc 6
-// 0x01070d04: 0x1070d04: sll   zero, zero, 0
-// 0x01070d08: 0x1070d08: blez  v1, 0x1070d30 lui   a0, 0x70000
-	ldloc 6
-	ldc.i4 458752
-	stloc.1
-	ldc.i4.s 0
-	ble L_1070d30
-// --- basic block ---
-// 0x01070d10: 0x1070d10: lw    a0, 17644(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 4411
-	add
-	ldelem.i4
-	stloc.1
-// 0x01070d14: 0x1070d14: sll   zero, zero, 0
-// 0x01070d18: 0x1070d18: sll   a0, a0, 1
-	ldloc.1
-	ldc.i4.1
-	shl
-	stloc.1
-// 0x01070d1c: 0x1070d1c: addu  v1, a0, v1
-	ldloc.1
-	ldloc 6
-	add
-	stloc 6
-// 0x01070d20: 0x1070d20: slt   v1, s0, v1
-	ldloc 8
-	ldloc 6
-	clt
-	stloc 6
-// 0x01070d24: 0x1070d24: bne   v1, zero, 0x1070d30 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_1070d30
-// --- basic block ---
-// 0x01070d2c: 0x1070d2c: sw    zero, 17688(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4422
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_1070d30:
-// 0x01070d30: 0x1070d30: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070d34: 0x1070d34: lw    v1, 17688(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4422
-	add
-	ldelem.i4
-	stloc 6
-// 0x01070d38: 0x1070d38: sll   zero, zero, 0
-// 0x01070d3c: 0x1070d3c: beq   v1, zero, 0x1070d68 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1070d68
-// --- basic block ---
-// 0x01070d44: 0x1070d44: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070d48: 0x1070d48: lw    v0, 17644(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4411
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070d4c: 0x1070d4c: sll   zero, zero, 0
-// 0x01070d50: 0x1070d50: addu  v1, v1, v0
-	ldloc 6
-	ldloc 5
-	add
-	stloc 6
-// 0x01070d54: 0x1070d54: slt   v1, s0, v1
-	ldloc 8
-	ldloc 6
-	clt
-	stloc 6
-// 0x01070d58: 0x1070d58: bne   v1, zero, 0x1070d6c sll   zero, zero, 0
-	ldloc 6
-	brtrue L_1070d6c
-// --- basic block ---
-// 0x01070d60: 0x1070d60: j	 0x1070d9c lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-	br L_1070d9c
-// --- basic block ---
-L_1070d68:
-// 0x01070d68: 0x1070d68: sw    s0, 17688(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4422
-	add
-	ldloc 8
-	stelem.i4
-L_1070d6c:
-// 0x01070d6c: 0x1070d6c: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070d70: 0x1070d70: lw    v0, 17648(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4412
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070d74: 0x1070d74: sll   zero, zero, 0
-// 0x01070d78: 0x1070d78: subu  s0, s0, v0
-	ldloc 8
-	ldloc 5
-	sub
-	stloc 8
-// 0x01070d7c: 0x1070d7c: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070d80: 0x1070d80: sw    s0, 17692(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4423
-	add
-	ldloc 8
-	stelem.i4
-// 0x01070d84: 0x1070d84: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070d88: 0x1070d88: sw    s0, 17696(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4424
-	add
-	ldloc 8
-	stelem.i4
-// 0x01070d8c: 0x1070d8c: j	 0x1070f4c addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-	br L_1070f4c
-// --- basic block ---
-L_1070d94:
-// 0x01070d94: 0x1070d94: sw    zero, 17688(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4422
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01070d98: 0x1070d98: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-L_1070d9c:
-// 0x01070d9c: 0x1070d9c: lw    v1, 17552(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4388
-	add
-	ldelem.i4
-	stloc 6
-// 0x01070da0: 0x1070da0: sll   zero, zero, 0
-// 0x01070da4: 0x1070da4: bne   v1, zero, 0x1070db4 addiu v0, zero, 300
-	ldloc 6
-	ldc.i4 300
-	stloc 5
-	brtrue L_1070db4
-// --- basic block ---
-// 0x01070dac: 0x1070dac: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070db0: 0x1070db0: lw    v0, 17652(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4413
-	add
-	ldelem.i4
-	stloc 5
-L_1070db4:
-// 0x01070db4: 0x1070db4: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x01070db8: 0x1070db8: lw    a1, 17696(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 4424
-	add
-	ldelem.i4
-	stloc.2
-// 0x01070dbc: 0x1070dbc: sll   zero, zero, 0
-// 0x01070dc0: 0x1070dc0: addu  v0, v0, a1
-	ldloc 5
-	ldloc.2
-	add
-	stloc 5
-// 0x01070dc4: 0x1070dc4: slt   v0, s0, v0
-	ldloc 8
-	ldloc 5
-	clt
-	stloc 5
-// 0x01070dc8: 0x1070dc8: bne   v0, zero, 0x1070dec lui   v1, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 6
-	brtrue L_1070dec
-// --- basic block ---
-// 0x01070dd0: 0x1070dd0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070dd4: 0x1070dd4: lw    a1, 17648(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4412
-	add
-	ldelem.i4
-	stloc.2
-// 0x01070dd8: 0x1070dd8: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x01070ddc: 0x1070ddc: subu  s0, s0, a1
-	ldloc 8
-	ldloc.2
-	sub
-	stloc 8
-// 0x01070de0: 0x1070de0: sw    s0, 17692(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4423
-	add
-	ldloc 8
-	stelem.i4
-// 0x01070de4: 0x1070de4: j	 0x1070f4c sw    s0, 17696(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 4424
 	add
-	ldloc 8
-	stelem.i4
-	br L_1070f4c
+	stloc 9
+	br L_1070cd0
 // --- basic block ---
-L_1070dec:
-// 0x01070dec: 0x1070dec: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070df0: 0x1070df0: lw    a0, 17656(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4414
-	add
-	ldelem.i4
-	stloc.1
-// 0x01070df4: 0x1070df4: lw    v0, 17692(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4423
-	add
-	ldelem.i4
-	stloc 5
-// 0x01070df8: 0x1070df8: sll   zero, zero, 0
-// 0x01070dfc: 0x1070dfc: addu  v0, a0, v0
-	ldloc.1
-	ldloc 5
+L_1070cb8:
+// 0x01070cb8: 0x1070cb8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070cbc: 0x1070cbc: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	stloc 5
-// 0x01070e00: 0x1070e00: slt   v0, s0, v0
-	ldloc 8
-	ldloc 5
-	clt
-	stloc 5
-// 0x01070e04: 0x1070e04: bne   v0, zero, 0x1070f90 addiu a0, sp, 20
-	ldloc 5
-	ldloc.0
-	ldc.i4.s 20
+	stloc.2
+// 0x01070cc0: 0x1070cc0: addiu a3, a3, 29544
+	ldloc 4
+	ldc.i4 29544
 	add
+	stloc 4
+// 0x01070cc4: 0x1070cc4: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-	brtrue L_1070f90
-// --- basic block ---
-// 0x01070e0c: 0x1070e0c: jal   0x102a2b0 addiu a1, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc.2
+// 0x01070cc8: 0x1070cc8: jal   0x100449c addiu a2, zero, 2114
+	ldc.i4 2114
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_is_jammed_102a2b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070e14: 0x1070e14: beq   v0, zero, 0x1070e50 lui   v0, 0x70000
-	ldloc 5
-	ldc.i4 458752
+L_1070cd0:
+// 0x01070cd0: 0x1070cd0: bne   s3, zero, 0x1070d24 lui   v0, 0x80000
+	ldloc 10
+	ldc.i4 524288
 	stloc 5
-	brfalse L_1070e50
+	brtrue L_1070d24
 // --- basic block ---
-// 0x01070e1c: 0x1070e1c: lw    v0, 20(sp)
-	ldloc 7
-	ldloc.0
+// 0x01070cd8: 0x1070cd8: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x01070cdc: 0x1070cdc: lw    v0, 14992(v0)
+	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 3748
 	add
 	ldelem.i4
 	stloc 5
-// 0x01070e20: 0x1070e20: sll   zero, zero, 0
-// 0x01070e24: 0x1070e24: bne   v0, zero, 0x1070e50 lui   v0, 0x70000
+// 0x01070ce0: 0x1070ce0: sll   zero, zero, 0
+// 0x01070ce4: 0x1070ce4: beq   v0, zero, 0x1070d24 lui   v0, 0x80000
 	ldloc 5
-	ldc.i4 458752
+	ldc.i4 524288
 	stloc 5
-	brtrue L_1070e50
+	brfalse L_1070d24
 // --- basic block ---
-// 0x01070e2c: 0x1070e2c: lw    a2, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc.3
-// 0x01070e30: 0x1070e30: lw    a0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
+// 0x01070cec: 0x1070cec: jal   0x1070724 addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-// 0x01070e34: 0x1070e34: xori  a2, a2, 2
-	ldloc.3
-	ldc.i4.2
-	xor
-	stloc.3
-// 0x01070e38: 0x1070e38: lw    a1, 32(sp)
-	ldloc 7
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc.2
-// 0x01070e3c: 0x1070e3c: jal   0x1082994 sltiu a2, a2, 1
-	ldloc.3
-	ldc.i4.1
-	clt.un
-	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_Get_Line_1082994(int32,int32,int32,int32)
+	call int32 Cibyl84::SendMessage_MapDisplyed_1070724(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070e44: 0x1070e44: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x01070e48: 0x1070e48: beq   v0, v1, 0x1070e58 lui   v0, 0x70000
+// 0x01070cf4: 0x1070cf4: bne   v0, zero, 0x1070d14 lui   a1, 0x10000
 	ldloc 5
-	ldloc 6
-	ldc.i4 458752
-	stloc 5
-	beq  L_1070e58
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070d14
 // --- basic block ---
-L_1070e50:
-// 0x01070e50: 0x1070e50: j	 0x1070f90 sw    zero, 17660(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4415
+// 0x01070cfc: 0x1070cfc: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070d00: 0x1070d00: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldc.i4.s 0
-	stelem.i4
-	br L_1070f90
-// --- basic block ---
-L_1070e58:
-// 0x01070e58: 0x1070e58: lw    v0, 17660(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4415
+	stloc.2
+// 0x01070d04: 0x1070d04: addiu a3, a3, 29640
+	ldloc 4
+	ldc.i4 29640
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070e5c: 0x1070e5c: sll   zero, zero, 0
-// 0x01070e60: 0x1070e60: beq   v0, zero, 0x1070eec lui   a0, 0x70000
-	ldloc 5
-	ldc.i4 458752
+	stloc 4
+// 0x01070d08: 0x1070d08: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-	brfalse L_1070eec
+// 0x01070d0c: 0x1070d0c: j	 0x1070d60 addiu a2, zero, 2131
+	ldc.i4 2131
+	stloc.3
+	br L_1070d60
 // --- basic block ---
-// 0x01070e68: 0x1070e68: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070e6c: 0x1070e6c: lw    v1, 17668(v0)
+L_1070d14:
+// 0x01070d14: 0x1070d14: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4417
-	add
-	ldelem.i4
-	stloc 6
-// 0x01070e70: 0x1070e70: lw    a0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
 	stloc.1
-// 0x01070e74: 0x1070e74: sll   zero, zero, 0
-// 0x01070e78: 0x1070e78: bne   v1, a0, 0x1070ee8 sll   zero, zero, 0
-	ldloc 6
 	ldloc.1
-	bne.un L_1070ee8
-// --- basic block ---
-// 0x01070e80: 0x1070e80: bne   v1, zero, 0x1070ea4 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_1070ea4
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01070e88: 0x1070e88: addiu v0, v0, 17668
+// 0x01070d1c: 0x1070d1c: addu  s1, s0, v0
+	ldloc 7
 	ldloc 5
-	ldc.i4 17668
 	add
+	stloc 9
+// 0x01070d20: 0x1070d20: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x01070e8c: 0x1070e8c: lw    v1, 12(v0)
-	ldloc 7
+L_1070d24:
+// 0x01070d24: 0x1070d24: lw    v0, -18596(v0)
+	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4 -4649
 	add
 	ldelem.i4
-	stloc 6
-// 0x01070e90: 0x1070e90: lw    v0, 32(sp)
-	ldloc 7
-	ldloc.0
+	stloc 5
+// 0x01070d28: 0x1070d28: sll   zero, zero, 0
+// 0x01070d2c: 0x1070d2c: lw    v0, 28(v0)
+	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.7
 	add
 	ldelem.i4
 	stloc 5
-// 0x01070e94: 0x1070e94: sll   zero, zero, 0
-// 0x01070e98: 0x1070e98: bne   v1, v0, 0x1070eec lui   a0, 0x70000
-	ldloc 6
+// 0x01070d30: 0x1070d30: sll   zero, zero, 0
+// 0x01070d34: 0x1070d34: blez  v0, 0x1070d70 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 458752
-	stloc.1
-	bne.un L_1070eec
+	ldc.i4.s 0
+	ble L_1070d70
 // --- basic block ---
-// 0x01070ea0: 0x1070ea0: lui   v0, 0x70000
-	ldc.i4 458752
+// 0x01070d3c: 0x1070d3c: jal   0x106eab0 addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendMessage_CreateNewRoads_106eab0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-L_1070ea4:
-// 0x01070ea4: 0x1070ea4: addiu v0, v0, 17668
+// --- basic block ---
+// 0x01070d44: 0x1070d44: bne   v0, zero, 0x1070d70 lui   a1, 0x10000
 	ldloc 5
-	ldc.i4 17668
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1070d70
+// --- basic block ---
+// 0x01070d4c: 0x1070d4c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070d50: 0x1070d50: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	stloc 5
-// 0x01070ea8: 0x1070ea8: lw    a0, 4(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc.2
+// 0x01070d54: 0x1070d54: addiu a3, a3, 29716
+	ldloc 4
+	ldc.i4 29716
 	add
-	ldelem.i4
+	stloc 4
+// 0x01070d58: 0x1070d58: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01070eac: 0x1070eac: lw    v1, 24(sp)
-	ldloc 7
+// 0x01070d5c: 0x1070d5c: addiu a2, zero, 2143
+	ldc.i4 2143
+	stloc.3
+L_1070d60:
+// 0x01070d60: 0x1070d60: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 6
-// 0x01070eb0: 0x1070eb0: sll   zero, zero, 0
-// 0x01070eb4: 0x1070eb4: bne   a0, v1, 0x1070eec lui   a0, 0x70000
 	ldloc.1
-	ldloc 6
-	ldc.i4 458752
-	stloc.1
-	bne.un L_1070eec
-// --- basic block ---
-// 0x01070ebc: 0x1070ebc: lw    v1, 16(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x01070ec0: 0x1070ec0: lw    v0, 36(sp)
-	ldloc 7
+	stloc 5
+// --- basic block ---
+// 0x01070d68: 0x1070d68: j	 0x1070c14 addiu a0, sp, 16
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070ec4: 0x1070ec4: sll   zero, zero, 0
-// 0x01070ec8: 0x1070ec8: bne   v1, v0, 0x1070eec sll   zero, zero, 0
-	ldloc 6
-	ldloc 5
-	bne.un L_1070eec
+	stloc.1
+	br L_1070c14
 // --- basic block ---
-// 0x01070ed0: 0x1070ed0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070ed4: 0x1070ed4: lw    v1, 17664(v0)
+L_1070d70:
+// 0x01070d70: 0x1070d70: lb    v1, 0(s0)
 	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4416
-	add
-	ldelem.i4
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x01070ed8: 0x1070ed8: lw    v0, 16(sp)
-	ldloc 7
+// 0x01070d74: 0x1070d74: addiu s2, sp, 16
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070edc: 0x1070edc: sll   zero, zero, 0
-// 0x01070ee0: 0x1070ee0: beq   v1, v0, 0x1070f14 lui   v0, 0x70000
+	stloc 11
+// 0x01070d78: 0x1070d78: lui   s3, 0x70000
+	ldc.i4 458752
+	stloc 10
+// 0x01070d7c: 0x1070d7c: beq   v1, zero, 0x1070dc0 lui   s1, 0x70000
 	ldloc 6
-	ldloc 5
 	ldc.i4 458752
-	stloc 5
-	beq  L_1070f14
+	stloc 9
+	brfalse L_1070dc0
 // --- basic block ---
-L_1070ee8:
-// 0x01070ee8: 0x1070ee8: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-L_1070eec:
-// 0x01070eec: 0x1070eec: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070ef0: 0x1070ef0: addiu a0, a0, 17668
-	ldloc.1
-	ldc.i4 17668
+// 0x01070d84: 0x1070d84: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x01070d88: 0x1070d88: addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+// 0x01070d8c: 0x1070d8c: addiu a0, s3, 18192
+	ldloc 10
+	ldc.i4 18192
 	add
 	stloc.1
-// 0x01070ef4: 0x1070ef4: addiu a1, sp, 20
-	ldloc.0
-	ldc.i4.s 20
+// 0x01070d90: 0x1070d90: jal   0x10740b4 addiu a2, a2, -884
+	ldloc.3
+	ldc.i4 -884
 	add
-	stloc.2
-// 0x01070ef8: 0x1070ef8: addiu a2, zero, 20
-	ldc.i4.s 20
 	stloc.3
-// 0x01070efc: 0x1070efc: jal   0x1001800 sw    s0, 17660(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4415
-	add
-	ldloc 8
-	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_GeneralPacket_10740b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070f04: 0x1070f04: lw    v1, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
+// 0x01070d98: 0x1070d98: addu  s0, v0, zero
+	ldloc 5
+	stloc 7
+// 0x01070d9c: 0x1070d9c: addu  v1, zero, zero
+	ldc.i4.s 0
 	stloc 6
-// 0x01070f08: 0x1070f08: lui   v0, 0x70000
-	ldc.i4 458752
+// 0x01070da0: 0x1070da0: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x01070da4: 0x1070da4: cibyl_sysc 0x2102
+	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01070f0c: 0x1070f0c: sw    v1, 17664(v0)
-	ldloc 7
+// 0x01070da8: 0x1070da8: addu  v1, v0, zero
 	ldloc 5
+	stloc 6
+// 0x01070dac: 0x1070dac: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x01070db0: 0x1070db0: jal   0x1067518 sw    v1, 18164(s1)
+	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 4416
+	ldc.i4 4541
 	add
 	ldloc 6
 	stelem.i4
-// 0x01070f10: 0x1070f10: lui   v0, 0x70000
-	ldc.i4 458752
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-L_1070f14:
-// 0x01070f14: 0x1070f14: lw    v1, 17652(v0)
-	ldloc 7
+// --- basic block ---
+// 0x01070db8: 0x1070db8: j	 0x1070de8 sll   zero, zero, 0
+	br L_1070de8
+// --- basic block ---
+L_1070dc0:
+// 0x01070dc0: 0x1070dc0: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x01070dc4: 0x1070dc4: cibyl_sysc 0x2107
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 5
+// 0x01070dc8: 0x1070dc8: addu  v1, v0, zero
 	ldloc 5
+	stloc 6
+// 0x01070dcc: 0x1070dcc: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x01070dd0: 0x1070dd0: sw    v1, 18164(s1)
+	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 4413
+	ldc.i4 4541
 	add
-	ldelem.i4
+	ldloc 6
+	stelem.i4
+// 0x01070dd4: 0x1070dd4: jal   0x1067518 addiu s3, s3, 18192
+	ldloc 10
+	ldc.i4 18192
+	add
+	stloc 10
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x01070f18: 0x1070f18: lui   v0, 0x70000
-	ldc.i4 458752
 	stloc 5
-// 0x01070f1c: 0x1070f1c: lw    v0, 17660(v0)
-	ldloc 7
-	ldloc 5
+// --- basic block ---
+// 0x01070ddc: 0x1070ddc: addiu v0, zero, 23
+	ldc.i4.s 23
+	stloc 5
+// 0x01070de0: 0x1070de0: sw    v0, 28696(s3)
+	ldloc 8
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 4415
+	ldc.i4 7174
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070f20: 0x1070f20: sll   zero, zero, 0
-// 0x01070f24: 0x1070f24: addu  v0, v1, v0
-	ldloc 6
 	ldloc 5
-	add
+	stelem.i4
+// 0x01070de4: 0x1070de4: addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 7
+L_1070de8:
+// 0x01070de8: 0x1070de8: lw    ra, 2284(sp)
+// 0x01070dec: 0x1070dec: addu  v0, s0, zero
+	ldloc 7
 	stloc 5
-// 0x01070f28: 0x1070f28: slt   v0, s0, v0
+// 0x01070df0: 0x1070df0: lw    s3, 2280(sp)
 	ldloc 8
-	ldloc 5
-	clt
-	stloc 5
-// 0x01070f2c: 0x1070f2c: beq   v0, zero, 0x1070f90 lui   v0, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	brfalse L_1070f90
-// --- basic block ---
-// 0x01070f34: 0x1070f34: lw    v0, 17648(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4412
+	ldc.i4 570
 	add
 	ldelem.i4
-	stloc 5
-// 0x01070f38: 0x1070f38: sll   zero, zero, 0
-// 0x01070f3c: 0x1070f3c: subu  s0, s0, v0
+	stloc 10
+// 0x01070df4: 0x1070df4: lw    s2, 2276(sp)
 	ldloc 8
-	ldloc 5
-	sub
-	stloc 8
-// 0x01070f40: 0x1070f40: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070f44: 0x1070f44: sw    s0, 17692(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4423
+	ldc.i4 569
 	add
+	ldelem.i4
+	stloc 11
+// 0x01070df8: 0x1070df8: lw    s1, 2272(sp)
 	ldloc 8
-	stelem.i4
-// 0x01070f48: 0x1070f48: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-L_1070f4c:
-// 0x01070f4c: 0x1070f4c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x01070f50: 0x1070f50: addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
-	add
-	stloc.1
-// 0x01070f54: 0x1070f54: lw    v1, 28688(a0)
-	ldloc 7
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7172
+	ldc.i4 568
 	add
 	ldelem.i4
-	stloc 6
-// 0x01070f58: 0x1070f58: sll   zero, zero, 0
-// 0x01070f5c: 0x1070f5c: beq   v1, zero, 0x1070f78 xori  v0, v0, 1
-	ldloc 6
-	ldloc 5
-	ldc.i4.1
-	xor
-	stloc 5
-	brfalse L_1070f78
-// --- basic block ---
-// 0x01070f64: 0x1070f64: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x01070f68: 0x1070f68: bne   v1, v0, 0x1070f90 sll   zero, zero, 0
-	ldloc 6
-	ldloc 5
-	bne.un L_1070f90
-// --- basic block ---
-// 0x01070f70: 0x1070f70: j	 0x1070f88 sll   zero, zero, 0
-	br L_1070f88
-// --- basic block ---
-L_1070f78:
-// 0x01070f78: 0x1070f78: jal   0x1070b68 sltiu a0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	clt.un
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl84::StartTransaction_1070b68(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01070f80: 0x1070f80: j	 0x1070f90 sll   zero, zero, 0
-	br L_1070f90
-// --- basic block ---
-L_1070f88:
-// 0x01070f88: 0x1070f88: jal   0x1071f94 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::RTNet_Watchdog_1071f94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_1070f90:
-// 0x01070f90: 0x1070f90: lw    ra, 44(sp)
-// 0x01070f94: 0x1070f94: lw    s0, 40(sp)
-	ldloc 7
+	stloc 9
+// 0x01070dfc: 0x1070dfc: lw    s0, 2268(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4 567
 	add
 	ldelem.i4
-	stloc 8
-// 0x01070f98: 0x1070f98: jr    ra addiu sp, sp, 48
+	stloc 7
+// 0x01070e00: 0x1070e00: jr    ra addiu sp, sp, 2288
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4 2288
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3464,27 +2889,33 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_Login_1070fa0(int32,int32,int32,int32,int32)
+.method public static int32 SendAllMessagesTogether_1070e08(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s2,int32 s0,int32 s4,int32 s1,int32 lo,int32 s6,int32 s5,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
+// local 10 is register s0
+// local 12 is register s1
+// local  9 is register s2
+// local  8 is register s3
+// local 11 is register s4
+// local 15 is register s5
+// local 14 is register s6
 // local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
+// local 16 is register ra
+// local 13 is register lo
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3494,141 +2925,231 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 10
+	ldc.i4.s 0
+	stloc 12
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 16
+	ldc.i4.s 0
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01070fa0: 0x1070fa0: addiu sp, sp, -32
+// 0x01070e08: 0x1070e08: addiu sp, sp, -2304
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4 -2304
+	add
+	stloc.0
+// 0x01070e0c: 0x1070e0c: sw    s0, 2272(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 568
+	add
+	ldloc 10
+	stelem.i4
+// 0x01070e10: 0x1070e10: addiu s0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc 10
+// 0x01070e14: 0x1070e14: sw    s1, 2276(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 569
+	add
+	ldloc 12
+	stelem.i4
+// 0x01070e18: 0x1070e18: addu  s1, a0, zero
+	ldloc.1
+	stloc 12
+// 0x01070e1c: 0x1070e1c: addu  a0, s0, zero
+	ldloc 10
+	stloc.1
+// 0x01070e20: 0x1070e20: sw    ra, 2300(sp)
+// 0x01070e24: 0x1070e24: sw    s6, 2296(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 574
+	add
+	ldloc 14
+	stelem.i4
+// 0x01070e28: 0x1070e28: sw    s5, 2292(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 573
 	add
-	stloc.0
-// 0x01070fa4: 0x1070fa4: sw    s1, 24(sp)
-	ldloc 6
+	ldloc 15
+	stelem.i4
+// 0x01070e2c: 0x1070e2c: sw    s4, 2288(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 572
 	add
-	ldloc 9
+	ldloc 11
 	stelem.i4
-// 0x01070fa8: 0x1070fa8: sw    s0, 20(sp)
-	ldloc 6
+// 0x01070e30: 0x1070e30: sw    s3, 2284(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 571
 	add
 	ldloc 8
 	stelem.i4
-// 0x01070fac: 0x1070fac: sw    ra, 28(sp)
-// 0x01070fb0: 0x1070fb0: addu  s0, a1, zero
-	ldloc.2
-	stloc 8
-// 0x01070fb4: 0x1070fb4: bne   a1, zero, 0x1070fd0 addu  s1, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 9
-	brtrue L_1070fd0
-// --- basic block ---
-// 0x01070fbc: 0x1070fbc: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01070fc0: 0x1070fc0: lw    v0, 17984(v0)
-	ldloc 6
-	ldloc 5
+// 0x01070e34: 0x1070e34: sw    s2, 2280(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4496
+	ldc.i4 570
 	add
-	ldelem.i4
-	stloc 5
-// 0x01070fc4: 0x1070fc4: sll   zero, zero, 0
-// 0x01070fc8: 0x1070fc8: bne   v0, zero, 0x1071000 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brtrue L_1071000
-// --- basic block ---
-L_1070fd0:
-// 0x01070fd0: 0x1070fd0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01070fd4: 0x1070fd4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01070fd8: 0x1070fd8: addiu a1, a1, 20732
+	ldloc 9
+	stelem.i4
+// 0x01070e38: 0x1070e38: jal   0x10674f4 addu  s2, a1, zero
 	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01070fdc: 0x1070fdc: addiu a3, a3, 29868
-	ldloc 4
-	ldc.i4 29868
-	add
-	stloc 4
-// 0x01070fe0: 0x1070fe0: addiu a2, zero, 2457
-	ldc.i4 2457
-	stloc.3
-// 0x01070fe4: 0x1070fe4: jal   0x100449c addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01070fec: 0x1070fec: addu  a0, s1, zero
-	ldloc 9
+// 0x01070e40: 0x1070e40: jal   0x10b3788 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x01070ff0: 0x1070ff0: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 8
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_report_begin_export_10b3788(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01070e48: 0x1070e48: lui   s5, 0x80000
+	ldc.i4 524288
+	stloc 15
+// 0x01070e4c: 0x1070e4c: sw    v0, -18596(s5)
+	ldloc 7
+	ldloc 15
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4649
+	add
+	ldloc 5
+	stelem.i4
+// 0x01070e50: 0x1070e50: lw    s3, 28(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 8
+// 0x01070e54: 0x1070e54: lw    s6, 16(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 14
+// 0x01070e58: 0x1070e58: lw    s4, 4(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 11
+// 0x01070e5c: 0x1070e5c: jal   0x1090dc4 sll   zero, zero, 0
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_Count_1090dc4()
 	stloc 5
 // --- basic block ---
-// 0x01070ff8: 0x1070ff8: j	 0x1071044 sll   zero, zero, 0
-	br L_1071044
+// 0x01070e64: 0x1070e64: lw    v1, -18596(s5)
+	ldloc 7
+	ldloc 15
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4649
+	add
+	ldelem.i4
+	stloc 6
+// 0x01070e68: 0x1070e68: sll   zero, zero, 0
+// 0x01070e6c: 0x1070e6c: lw    v1, 16(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x01070e70: 0x1070e70: sll   zero, zero, 0
+// 0x01070e74: 0x1070e74: slti  v1, v1, 101
+	ldloc 6
+	ldc.i4.s 101
+	clt
+	stloc 6
+// 0x01070e78: 0x1070e78: bne   v1, zero, 0x1070ed0 addiu v1, zero, 87
+	ldloc 6
+	ldc.i4.s 87
+	stloc 6
+	brtrue L_1070ed0
 // --- basic block ---
-L_1071000:
-// 0x01071000: 0x1071000: lui   a1, 0x10000
+// 0x01070e80: 0x1070e80: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01071004: 0x1071004: addiu a1, a1, 20732
+// 0x01070e84: 0x1070e84: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070e88: 0x1070e88: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071008: 0x1071008: addiu a3, a3, 29928
+// 0x01070e8c: 0x1070e8c: addiu a3, a3, 29796
 	ldloc 4
-	ldc.i4 29928
+	ldc.i4 29796
 	add
 	stloc 4
-// 0x0107100c: 0x107100c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071010: 0x1071010: jal   0x100449c addiu a2, zero, 2462
-	ldc.i4 2462
+// 0x01070e90: 0x1070e90: addiu a2, zero, 2415
+	ldc.i4 2415
 	stloc.3
+// 0x01070e94: 0x1070e94: jal   0x100449c addiu a0, zero, 3
+	ldc.i4.3
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3636,253 +3157,229 @@ L_1071000:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071018: 0x1071018: jal   0x106bd84 sll   zero, zero, 0
+// 0x01070e9c: 0x1070e9c: jal   0x1070b7c addu  a0, s1, zero
+	ldloc 12
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_SessionDetailsSave_106bd84(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::SendAllMessagesTogether_SendPart1_1070b7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071020: 0x1071020: addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x01071024: 0x1071024: addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
-// 0x01071028: 0x1071028: lui   v0, 0x0
-	ldc.i4.s 0
+// 0x01070ea4: 0x1070ea4: bne   v0, zero, 0x1070f78 addu  s0, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc 10
+	brtrue L_1070f78
+// --- basic block ---
+// 0x01070eac: 0x1070eac: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0107102c: 0x107102c: jal   0x10707e4 sw    zero, 15060(v0)
-	ldloc 6
+// 0x01070eb0: 0x1070eb0: lw    v1, -18648(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3765
+	ldc.i4 -4662
 	add
-	ldc.i4.s 0
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl84::SendAllMessagesTogether_10707e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldelem.i4
+	stloc 6
+// 0x01070eb4: 0x1070eb4: addiu v0, zero, 23
+	ldc.i4.s 23
 	stloc 5
-// --- basic block ---
-// 0x01071034: 0x1071034: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x01071038: 0x1071038: addiu a1, a1, -16828
-	ldloc.2
-	ldc.i4 -16828
-	add
+// 0x01070eb8: 0x1070eb8: bne   v1, v0, 0x1070f5c lui   a1, 0x10000
+	ldloc 6
+	ldloc 5
+	ldc.i4 65536
 	stloc.2
-// 0x0107103c: 0x107103c: jal   0x104fe98 addiu a0, zero, 10
-	ldc.i4.s 10
+	bne.un L_1070f5c
+// --- basic block ---
+// 0x01070ec0: 0x1070ec0: jal   0x106ee54 addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendAllMessagesTogether_SendPart2_106ee54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_1071044:
-// 0x01071044: 0x1071044: lw    ra, 28(sp)
-// 0x01071048: 0x1071048: lw    s1, 24(sp)
+// 0x01070ec8: 0x1070ec8: j	 0x1070f54 addu  s0, v0, zero
+	ldloc 5
+	stloc 10
+	br L_1070f54
+// --- basic block ---
+L_1070ed0:
+// 0x01070ed0: 0x1070ed0: mult  s6, v1
+	ldloc 14
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 9
-// 0x0107104c: 0x107104c: lw    s0, 20(sp)
+	mul
+	stloc 13
+// 0x01070ed4: 0x1070ed4: addiu v1, zero, 22
+	ldc.i4.s 22
+	stloc 6
+// 0x01070ed8: 0x1070ed8: addu  a0, s0, zero
+	ldloc 10
+	stloc.1
+// 0x01070edc: 0x1070edc: mflo  lo
+	ldloc 13
+	stloc 14
+// 0x01070ee0: 0x1070ee0: sll   zero, zero, 0
+// 0x01070ee4: 0x1070ee4: sll   zero, zero, 0
+// 0x01070ee8: 0x1070ee8: mult  s4, v1
+	ldloc 11
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	mul
+	stloc 13
+// 0x01070eec: 0x1070eec: addiu v1, zero, 28
+	ldc.i4.s 28
+	stloc 6
+// 0x01070ef0: 0x1070ef0: mflo  lo
+	ldloc 13
+	stloc 11
+// 0x01070ef4: 0x1070ef4: addu  s4, s6, s4
+	ldloc 14
+	ldloc 11
 	add
-	ldelem.i4
-	stloc 8
-// 0x01071050: 0x1071050: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+	stloc 11
+// 0x01070ef8: 0x1070ef8: addiu s4, s4, 895
+	ldloc 11
+	ldc.i4 895
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_At_1071058(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 s0,int32[] mem,int32 ra)
-
-// local  6 is register v0
-// local  5 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 5
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 11
+// 0x01070efc: 0x1070efc: mult  s3, v1
+	ldloc 8
+	ldloc 6
+	mul
+	stloc 13
+// 0x01070f00: 0x1070f00: addiu v1, zero, 11
+	ldc.i4.s 11
+	stloc 6
+// 0x01070f04: 0x1070f04: mflo  lo
+	ldloc 13
 	stloc 8
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01071058: 0x1071058: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107105c: 0x107105c: sw    s0, 16(sp)
+// 0x01070f08: 0x1070f08: addu  s3, s4, s3
+	ldloc 11
 	ldloc 8
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
 	add
-	ldloc 7
-	stelem.i4
-// 0x01071060: 0x1071060: sw    ra, 20(sp)
-// 0x01071064: 0x1071064: addu  s0, a0, zero
-	ldloc.1
-	stloc 7
-// 0x01071068: 0x1071068: bne   a1, zero, 0x1071088 lui   v1, 0x10000
-	ldloc.2
-	ldc.i4 65536
+	stloc 8
+// 0x01070f0c: 0x1070f0c: sll   zero, zero, 0
+// 0x01070f10: 0x1070f10: mult  v0, v1
+	ldloc 5
+	ldloc 6
+	mul
+	stloc 13
+// 0x01070f14: 0x1070f14: mflo  lo
+	ldloc 13
 	stloc 5
-	brtrue L_1071088
-// --- basic block ---
-// 0x01071070: 0x1071070: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071074: 0x1071074: addiu a1, v1, 20732
+// 0x01070f18: 0x1070f18: jal   0x106756c addu  a1, s3, v0
+	ldloc 8
 	ldloc 5
-	ldc.i4 20732
 	add
 	stloc.2
-// 0x01071078: 0x1071078: addiu a3, a3, 29980
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 29980
-	add
-	stloc 4
-// 0x0107107c: 0x107107c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071080: 0x1071080: j	 0x107109c addiu a2, zero, 1577
-	ldc.i4 1577
-	stloc.3
-	br L_107109c
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_1071088:
-// 0x01071088: 0x1071088: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0107108c: 0x107108c: addiu a1, v1, 20732
+// 0x01070f20: 0x1070f20: addu  a1, v0, zero
 	ldloc 5
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x01071090: 0x1071090: addiu a3, a3, 30036
-	ldloc 4
-	ldc.i4 30036
-	add
-	stloc 4
-// 0x01071094: 0x1071094: addiu a0, zero, 4
-	ldc.i4.4
+// 0x01070f24: 0x1070f24: addu  a0, s1, zero
+	ldloc 12
 	stloc.1
-// 0x01071098: 0x1071098: addiu a2, zero, 1579
-	ldc.i4 1579
-	stloc.3
-L_107109c:
-// 0x0107109c: 0x107109c: jal   0x100449c sll   zero, zero, 0
+// 0x01070f28: 0x1070f28: jal   0x1070848 addu  s0, v0, zero
+	ldloc 5
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::SendAllMessagesTogether_BuildPacket_1070848(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010710a4: 0x10710a4: jal   0x1070100 addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x01070f30: 0x1070f30: beq   v0, zero, 0x1070f5c lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_1070f5c
+// --- basic block ---
+// 0x01070f38: 0x1070f38: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x01070f3c: 0x1070f3c: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x01070f40: 0x1070f40: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
 	stloc.1
+// 0x01070f44: 0x1070f44: addu  a1, s0, zero
+	ldloc 10
+	stloc.2
+// 0x01070f48: 0x1070f48: jal   0x10740b4 addiu a2, a2, 6480
+	ldloc.3
+	ldc.i4 6480
+	add
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::SendMessage_MapDisplyed_1070100(int32,int32,int32,int32,int32)
+	call int32 Cibyl87::RTNet_GeneralPacket_10740b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010710ac: 0x10710ac: beq   v0, zero, 0x10710d4 lui   v1, 0x10000
-	ldloc 6
+// 0x01070f50: 0x1070f50: addu  s0, v0, zero
+	ldloc 5
+	stloc 10
+L_1070f54:
+// 0x01070f54: 0x1070f54: bne   v0, zero, 0x1070f78 lui   a1, 0x10000
+	ldloc 5
 	ldc.i4 65536
-	stloc 5
-	brfalse L_10710d4
+	stloc.2
+	brtrue L_1070f78
 // --- basic block ---
-// 0x010710b4: 0x10710b4: lui   a3, 0x10000
+L_1070f5c:
+// 0x01070f5c: 0x1070f5c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010710b8: 0x10710b8: addiu a1, v1, 20732
-	ldloc 5
-	ldc.i4 20732
+// 0x01070f60: 0x1070f60: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x010710bc: 0x10710bc: addiu a3, a3, 30128
+// 0x01070f64: 0x1070f64: addiu a3, a3, 29856
 	ldloc 4
-	ldc.i4 30128
+	ldc.i4 29856
 	add
 	stloc 4
-// 0x010710c0: 0x10710c0: addiu a0, zero, 1
-	ldc.i4.1
+// 0x01070f68: 0x1070f68: addiu a0, zero, 3
+	ldc.i4.3
 	stloc.1
-// 0x010710c4: 0x10710c4: jal   0x100449c addiu a2, zero, 1582
-	ldc.i4 1582
+// 0x01070f6c: 0x1070f6c: jal   0x100449c addiu a2, zero, 2433
+	ldc.i4 2433
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -3891,31 +3388,37 @@ L_107109c:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010710cc: 0x10710cc: j	 0x10710f8 sll   zero, zero, 0
-	br L_10710f8
+// 0x01070f74: 0x1070f74: addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 10
+L_1070f78:
+// 0x01070f78: 0x1070f78: beq   s1, zero, 0x1070f98 lui   a1, 0x10000
+	ldloc 12
+	ldc.i4 65536
+	stloc.2
+	brfalse L_1070f98
 // --- basic block ---
-L_10710d4:
-// 0x010710d4: 0x10710d4: lui   a3, 0x10000
+// 0x01070f80: 0x1070f80: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010710d8: 0x10710d8: addiu a1, v1, 20732
-	ldloc 5
-	ldc.i4 20732
+// 0x01070f84: 0x1070f84: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x010710dc: 0x10710dc: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010710e0: 0x10710e0: addiu a3, a3, 30188
+// 0x01070f88: 0x1070f88: addiu a3, a3, 29924
 	ldloc 4
-	ldc.i4 30188
+	ldc.i4 29924
 	add
 	stloc 4
-// 0x010710e4: 0x10710e4: jal   0x100449c addiu a2, zero, 1585
-	ldc.i4 1585
+// 0x01070f8c: 0x1070f8c: addiu a0, zero, 2
+	ldc.i4.2
+	stloc.1
+// 0x01070f90: 0x1070f90: jal   0x100449c addiu a2, zero, 2436
+	ldc.i4 2436
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -3924,375 +3427,401 @@ L_10710d4:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010710ec: 0x10710ec: addu  a0, s0, zero
-	ldloc 7
+L_1070f98:
+// 0x01070f98: 0x1070f98: bne   s0, zero, 0x1070fb8 lui   s1, 0x70000
+	ldloc 10
+	ldc.i4 458752
+	stloc 12
+	brtrue L_1070fb8
+// --- basic block ---
+// 0x01070fa0: 0x1070fa0: beq   s2, zero, 0x1071090 addu  a0, zero, zero
+	ldloc 9
+	ldc.i4.s 0
 	stloc.1
-// 0x010710f0: 0x10710f0: jal   0x106ed70 addiu a1, zero, 2
-	ldc.i4.2
+	brfalse L_1071090
+// --- basic block ---
+// 0x01070fa8: 0x1070fa8: jal   0x106f394 addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
 	stloc 6
+	stloc 5
 // --- basic block ---
-L_10710f8:
-// 0x010710f8: 0x10710f8: lw    ra, 20(sp)
-// 0x010710fc: 0x10710fc: lw    s0, 16(sp)
-	ldloc 8
-	ldloc.0
+// 0x01070fb0: 0x1070fb0: j	 0x1071090 sll   zero, zero, 0
+	br L_1071090
+// --- basic block ---
+L_1070fb8:
+// 0x01070fb8: 0x1070fb8: lw    v0, 18084(s1)
+	ldloc 7
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4521
 	add
 	ldelem.i4
-	stloc 7
-// 0x01071100: 0x1071100: jr    ra addiu sp, sp, 24
+	stloc 5
+// 0x01070fbc: 0x1070fbc: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01070fc0: 0x1070fc0: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01070fc4: 0x1070fc4: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01070fc8: 0x1070fc8: addiu a3, a3, 29992
+	ldloc 4
+	ldc.i4 29992
+	add
+	stloc 4
+// 0x01070fcc: 0x1070fcc: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01070fd0: 0x1070fd0: addiu a2, zero, 4487
+	ldc.i4 4487
+	stloc.3
+// 0x01070fd4: 0x1070fd4: jal   0x100449c sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 OnAsyncOperationCompleted_SetVisability_1071108(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+// --- basic block ---
+// 0x01070fdc: 0x1070fdc: lw    s3, 18084(s1)
+	ldloc 7
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4 4521
+	add
+	ldelem.i4
+	stloc 8
+// 0x01070fe0: 0x1070fe0: sll   zero, zero, 0
+// 0x01070fe4: 0x1070fe4: blez  s3, 0x1071044 addiu s3, s3, -1
+	ldloc 8
+	ldloc 8
+	ldc.i4.m1
+	add
 	stloc 8
 	ldc.i4.s 0
+	ble L_1071044
+// --- basic block ---
+// 0x01070fec: 0x1070fec: lui   s2, 0x80000
+	ldc.i4 524288
 	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+// 0x01070ff0: 0x1070ff0: sll   v0, s3, 2
+	ldloc 8
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x01070ff4: 0x1070ff4: addiu s2, s2, -18080
+	ldloc 9
+	ldc.i4 -18080
+	add
+	stloc 9
+// 0x01070ff8: 0x1070ff8: addu  s2, s2, v0
+	ldloc 9
+	ldloc 5
+	add
+	stloc 9
+// 0x01070ffc: 0x1070ffc: addiu s4, zero, -1
+	ldc.i4.m1
 	stloc 11
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+L_1071000:
+// 0x01071000: 0x1071000: lw    v1, 0(s2)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01071108: 0x1071108: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0107110c: 0x107110c: sw    s2, 24(sp)
-	ldloc 6
-	ldloc.0
+// 0x01071004: 0x1071004: lw    v0, 18084(s1)
+	ldloc 7
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 4521
 	add
-	ldloc 10
-	stelem.i4
-// 0x01071110: 0x1071110: sw    s1, 20(sp)
+	ldelem.i4
+	stloc 5
+// 0x01071008: 0x1071008: lw    a0, 8(v1)
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.2
 	add
-	ldloc 9
-	stelem.i4
-// 0x01071114: 0x1071114: sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
+	ldelem.i4
+	stloc.1
+// 0x0107100c: 0x107100c: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
+	add
+	stloc 5
+// 0x01071010: 0x1071010: jal   0x1000930 sw    v0, 18084(s1)
+	ldloc 7
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4521
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
-// 0x01071118: 0x1071118: sw    ra, 28(sp)
-// 0x0107111c: 0x107111c: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x01071120: 0x1071120: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x01071124: 0x1071124: beq   a1, zero, 0x1071158 lui   s0, 0x10000
-	ldloc.2
-	ldc.i4 65536
-	stloc 8
-	brfalse L_1071158
-// --- basic block ---
-// 0x0107112c: 0x107112c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071130: 0x1071130: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071134: 0x1071134: addiu a3, a3, 30256
-	ldloc 4
-	ldc.i4 30256
-	add
-	stloc 4
-// 0x01071138: 0x1071138: addiu a2, zero, 1653
-	ldc.i4 1653
-	stloc.3
-// 0x0107113c: 0x107113c: jal   0x100449c addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071144: 0x1071144: addu  a0, s1, zero
+// 0x01071018: 0x1071018: lw    v0, 0(s2)
+	ldloc 7
 	ldloc 9
-	stloc.1
-// 0x01071148: 0x1071148: jal   0x106ed70 addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x01071150: 0x1071150: j	 0x10711c4 sll   zero, zero, 0
-	br L_10711c4
-// --- basic block ---
-L_1071158:
-// 0x01071158: 0x1071158: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0107115c: 0x107115c: addiu a0, zero, 1
+// 0x0107101c: 0x107101c: sll   zero, zero, 0
+// 0x01071020: 0x1071020: lw    a0, 4(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
 	ldc.i4.1
+	add
+	ldelem.i4
 	stloc.1
-// 0x01071160: 0x1071160: addiu a1, s0, 20732
+// 0x01071024: 0x1071024: jal   0x1000930 addiu s3, s3, -1
 	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071164: 0x1071164: addiu a3, a3, 30332
-	ldloc 4
-	ldc.i4 30332
+	ldc.i4.m1
 	add
-	stloc 4
-// 0x01071168: 0x1071168: jal   0x100449c addiu a2, zero, 1658
-	ldc.i4 1658
-	stloc.3
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071170: 0x1071170: addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0107102c: 0x107102c: lw    a0, 0(s2)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.1
-// 0x01071174: 0x1071174: jal   0x106e2c4 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+// 0x01071030: 0x1071030: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_At_106e2c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107117c: 0x107117c: beq   v0, zero, 0x10711a4 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brfalse L_10711a4
-// --- basic block ---
-// 0x01071184: 0x1071184: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071188: 0x1071188: addiu a1, s0, 20732
+// 0x01071038: 0x1071038: sw    zero, 0(s2)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107103c: 0x107103c: bne   s3, s4, 0x1071000 addiu s2, s2, -4
 	ldloc 8
-	ldc.i4 20732
+	ldloc 11
+	ldloc 9
+	ldc.i4.s -4
 	add
-	stloc.2
-// 0x0107118c: 0x107118c: addiu a3, a3, 30392
-	ldloc 4
-	ldc.i4 30392
+	stloc 9
+	bne.un L_1071000
+// --- basic block ---
+L_1071044:
+// 0x01071044: 0x1071044: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+// 0x01071048: 0x1071048: cibyl_sysc_arg 0x3
+	ldloc 6
+// 0x0107104c: 0x107104c: cibyl_sysc 0x210c
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 5
+// 0x01071050: 0x1071050: addu  v1, v0, zero
+	ldloc 5
+	stloc 6
+// 0x01071054: 0x1071054: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071058: 0x1071058: sw    v1, 18164(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4541
 	add
-	stloc 4
-// 0x01071190: 0x1071190: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071194: 0x1071194: jal   0x100449c addiu a2, zero, 1662
-	ldc.i4 1662
-	stloc.3
+	ldloc 6
+	stelem.i4
+L_107105c:
+// 0x0107105c: 0x107105c: jal   0x1067518 addiu a0, sp, 24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107119c: 0x107119c: j	 0x10711c4 sll   zero, zero, 0
-	br L_10711c4
-// --- basic block ---
-L_10711a4:
-// 0x010711a4: 0x10711a4: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
+	ldc.i4.s 24
 	add
-	stloc.2
-// 0x010711a8: 0x10711a8: addiu a0, zero, 3
-	ldc.i4.3
 	stloc.1
-// 0x010711ac: 0x10711ac: addiu a3, a3, 30460
-	ldloc 4
-	ldc.i4 30460
-	add
-	stloc 4
-// 0x010711b0: 0x10711b0: jal   0x100449c addiu a2, zero, 1665
-	ldc.i4 1665
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010711b8: 0x10711b8: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x010711bc: 0x10711bc: jal   0x1071058 addiu a1, zero, 2
+// 0x01071064: 0x1071064: lw    ra, 2300(sp)
+// 0x01071068: 0x1071068: addu  v0, s0, zero
+	ldloc 10
+	stloc 5
+// 0x0107106c: 0x107106c: lw    s6, 2296(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
-	stloc.2
+	shr.un
+	ldc.i4 574
+	add
+	ldelem.i4
+	stloc 14
+// 0x01071070: 0x1071070: lw    s5, 2292(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl84::OnAsyncOperationCompleted_At_1071058(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_10711c4:
-// 0x010711c4: 0x10711c4: lw    ra, 28(sp)
-// 0x010711c8: 0x10711c8: lw    s2, 24(sp)
-	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 573
+	add
+	ldelem.i4
+	stloc 15
+// 0x01071074: 0x1071074: lw    s4, 2288(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 572
 	add
 	ldelem.i4
-	stloc 10
-// 0x010711cc: 0x10711cc: lw    s1, 20(sp)
-	ldloc 6
+	stloc 11
+// 0x01071078: 0x1071078: lw    s3, 2284(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 571
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107107c: 0x107107c: lw    s2, 2280(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 570
 	add
 	ldelem.i4
 	stloc 9
-// 0x010711d0: 0x10711d0: lw    s0, 16(sp)
-	ldloc 6
+// 0x01071080: 0x1071080: lw    s1, 2276(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 569
 	add
 	ldelem.i4
-	stloc 8
-// 0x010711d4: 0x10711d4: jr    ra addiu sp, sp, 32
+	stloc 12
+// 0x01071084: 0x1071084: lw    s0, 2272(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 568
+	add
+	ldelem.i4
+	stloc 10
+// 0x01071088: 0x1071088: jr    ra addiu sp, sp, 2304
+	ldloc.0
+	ldc.i4 2304
 	add
 	stloc.0
 	br __CIBYL_function_return
+// --- basic block ---
+L_1071090:
+// 0x01071090: 0x1071090: jal   0x10b3718 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl133::editor_track_report_conclude_export_10b3718(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01071098: 0x1071098: j	 0x107105c sll   zero, zero, 0
+	br L_107105c
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_AlertReport_10711dc(int32,int32,int32,int32,int32)
+.method public static int32 OnTransactionCompleted_TestLoginDetails_Login_10710a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
 // local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4303,43 +3832,26 @@ __CIBYL_function_return:
 	stloc 4
 	ldc.i4.s 0
 	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010711dc: 0x10711dc: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x010711e0: 0x10711e0: sw    s2, 24(sp)
-	ldloc 6
+// 0x010710a0: 0x10710a0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-// 0x010711e4: 0x10711e4: sw    s1, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
-// 0x010711e8: 0x10711e8: sw    s0, 16(sp)
-	ldloc 6
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x010710a4: 0x10710a4: sltiu a0, a1, 1
+	ldloc.2
+	ldc.i4.1
+	clt.un
+	stloc.1
+// 0x010710a8: 0x10710a8: sw    s0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -4347,251 +3859,149 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010711ec: 0x10711ec: sw    ra, 28(sp)
-// 0x010711f0: 0x10711f0: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x010711f4: 0x10711f4: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x010711f8: 0x10711f8: beq   a1, zero, 0x1071224 lui   s0, 0x10000
+// 0x010710ac: 0x10710ac: sw    ra, 20(sp)
+// 0x010710b0: 0x10710b0: jal   0x106c4e0 addu  s0, a1, zero
 	ldloc.2
-	ldc.i4 65536
 	stloc 8
-	brfalse L_1071224
-// --- basic block ---
-// 0x01071200: 0x1071200: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071204: 0x1071204: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071208: 0x1071208: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0107120c: 0x107120c: addiu a3, a3, 30540
-	ldloc 4
-	ldc.i4 30540
-	add
-	stloc 4
-// 0x01071210: 0x1071210: jal   0x100449c addiu a2, zero, 1493
-	ldc.i4 1493
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01071218: 0x1071218: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x0107121c: 0x107121c: j	 0x10712a4 addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-	br L_10712a4
-// --- basic block ---
-L_1071224:
-// 0x01071224: 0x1071224: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071228: 0x1071228: addiu a3, a3, 30612
-	ldloc 4
-	ldc.i4 30612
-	add
-	stloc 4
-// 0x0107122c: 0x107122c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071230: 0x1071230: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071234: 0x1071234: jal   0x100449c addiu a2, zero, 1498
-	ldc.i4 1498
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::TestLoginDetailsCompleted_106c4e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107123c: 0x107123c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01071240: 0x1071240: lw    v0, -19060(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4765
-	add
-	ldelem.i4
+// 0x010710b8: 0x10710b8: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x01071244: 0x1071244: sll   zero, zero, 0
-// 0x01071248: 0x1071248: lw    v0, 28(v0)
-	ldloc 6
+// 0x010710bc: 0x10710bc: lw    v0, 18448(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 4612
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107124c: 0x107124c: sll   zero, zero, 0
-// 0x01071250: 0x1071250: blez  v0, 0x10712b4 addu  a0, s1, zero
+// 0x010710c0: 0x10710c0: sll   zero, zero, 0
+// 0x010710c4: 0x10710c4: beq   v0, zero, 0x10710e8 lui   a1, 0x1070000
 	ldloc 5
-	ldloc 9
-	stloc.1
-	ldc.i4.s 0
-	ble L_10712b4
+	ldc.i4 17235968
+	stloc.2
+	brfalse L_10710e8
 // --- basic block ---
-// 0x01071258: 0x1071258: jal   0x106e48c addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x010710cc: 0x10710cc: addiu a1, a1, -15256
+	ldloc.2
+	ldc.i4 -15256
+	add
+	stloc.2
+// 0x010710d0: 0x10710d0: jal   0x104fea8 addiu a0, zero, 10
+	ldc.i4.s 10
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_CreateNewRoads_106e48c(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071260: 0x1071260: beq   v0, zero, 0x1071288 lui   a3, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 4
-	brfalse L_1071288
-// --- basic block ---
-// 0x01071268: 0x1071268: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0107126c: 0x107126c: addiu a1, s0, 20732
-	ldloc 8
-	ldc.i4 20732
-	add
+// 0x010710d8: 0x10710d8: lui   a1, 0x1070000
+	ldc.i4 17235968
 	stloc.2
-// 0x01071270: 0x1071270: addiu a3, a3, 30680
-	ldloc 4
-	ldc.i4 30680
+// 0x010710dc: 0x10710dc: addiu a1, a1, -15328
+	ldloc.2
+	ldc.i4 -15328
 	add
-	stloc 4
-// 0x01071274: 0x1071274: addiu a0, zero, 1
-	ldc.i4.1
+	stloc.2
+// 0x010710e0: 0x10710e0: jal   0x104fea8 addiu a0, zero, 30
+	ldc.i4.s 30
 	stloc.1
-// 0x01071278: 0x1071278: jal   0x100449c addiu a2, zero, 1503
-	ldc.i4 1503
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071280: 0x1071280: j	 0x10712bc sll   zero, zero, 0
-	br L_10712bc
-// --- basic block ---
-L_1071288:
-// 0x01071288: 0x1071288: addiu a1, s0, 20732
+L_10710e8:
+// 0x010710e8: 0x10710e8: bne   s0, zero, 0x107110c lui   a1, 0x10000
 	ldloc 8
-	ldc.i4 20732
-	add
+	ldc.i4 65536
 	stloc.2
-// 0x0107128c: 0x107128c: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01071290: 0x1071290: addiu a3, a3, 30752
-	ldloc 4
-	ldc.i4 30752
-	add
-	stloc 4
-// 0x01071294: 0x1071294: jal   0x100449c addiu a2, zero, 1506
-	ldc.i4 1506
-	stloc.3
+	brtrue L_107110c
+// --- basic block ---
+// 0x010710f0: 0x10710f0: jal   0x106c3a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_SessionDetailsSave_106c3a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107129c: 0x107129c: addu  a0, s1, zero
-	ldloc 9
+// 0x010710f8: 0x10710f8: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x010712a0: 0x10712a0: addiu a1, zero, 2
-	ldc.i4.2
+// 0x010710fc: 0x10710fc: jal   0x1070e08 addiu a1, zero, 1
+	ldc.i4.1
 	stloc.2
-L_10712a4:
-// 0x010712a4: 0x10712a4: jal   0x106ed70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::SendAllMessagesTogether_1070e08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010712ac: 0x10712ac: j	 0x10712bc sll   zero, zero, 0
-	br L_10712bc
+// 0x01071104: 0x1071104: j	 0x1071124 sll   zero, zero, 0
+	br L_1071124
 // --- basic block ---
-L_10712b4:
-// 0x010712b4: 0x10712b4: jal   0x106ff0c addu  a1, zero, zero
-	ldc.i4.s 0
+L_107110c:
+// 0x0107110c: 0x107110c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071110: 0x1071110: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
 	stloc.2
+// 0x01071114: 0x1071114: addiu a3, a3, 30048
+	ldloc 4
+	ldc.i4 30048
+	add
+	stloc 4
+// 0x01071118: 0x1071118: addiu a0, zero, 3
+	ldc.i4.3
+	stloc.1
+// 0x0107111c: 0x107111c: jal   0x100449c addiu a2, zero, 3834
+	ldc.i4 3834
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl83::OnAsyncOperationCompleted_CreateNewRoads_106ff0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_10712bc:
-// 0x010712bc: 0x10712bc: lw    ra, 28(sp)
-// 0x010712c0: 0x10712c0: lw    s2, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 10
-// 0x010712c4: 0x10712c4: lw    s1, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 9
-// 0x010712c8: 0x10712c8: lw    s0, 16(sp)
-	ldloc 6
+L_1071124:
+// 0x01071124: 0x1071124: lw    ra, 20(sp)
+// 0x01071128: 0x1071128: lw    s0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -4599,39 +4009,37 @@ L_10712bc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010712cc: 0x10712cc: jr    ra addiu sp, sp, 32
+// 0x0107112c: 0x107112c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_KeepAlive_10712d4(int32,int32,int32,int32,int32)
+.method public static int32 TransactionStarted_1071134(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
 
-// local  9 is register v0
-// local 10 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
 // local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 9
+	stloc 5
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4640,152 +4048,125 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010712d4: 0x10712d4: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x010712d8: 0x10712d8: sw    s1, 24(sp)
+// 0x01071134: 0x1071134: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071138: 0x1071138: lw    v0, 18028(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 4507
 	add
-	ldloc 7
-	stelem.i4
-// 0x010712dc: 0x10712dc: sw    s0, 20(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x0107113c: 0x107113c: addiu sp, sp, -24
 	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01071140: 0x1071140: beq   v0, zero, 0x1071174 sw    ra, 20(sp)
+	ldloc 5
+	brfalse L_1071174
+// --- basic block ---
+// 0x01071148: 0x1071148: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0107114c: 0x107114c: lw    v0, 18448(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4612
 	add
-	ldloc 6
-	stelem.i4
-// 0x010712e0: 0x10712e0: sw    ra, 28(sp)
-// 0x010712e4: 0x10712e4: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x010712e8: 0x10712e8: beq   a1, zero, 0x107130c addu  s1, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 7
-	brfalse L_107130c
+	ldelem.i4
+	stloc 5
+// 0x01071150: 0x1071150: sll   zero, zero, 0
+// 0x01071154: 0x1071154: bne   v0, zero, 0x1071174 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_1071174
 // --- basic block ---
-// 0x010712f0: 0x10712f0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010712f4: 0x10712f4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010712f8: 0x10712f8: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x010712fc: 0x10712fc: addiu a3, a3, 30832
-	ldloc 4
-	ldc.i4 30832
+// 0x0107115c: 0x107115c: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x01071160: 0x1071160: addiu a0, a0, 5572
+	ldloc.1
+	ldc.i4 5572
 	add
-	stloc 4
-// 0x01071300: 0x1071300: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x01071304: 0x1071304: jal   0x100449c addiu a2, zero, 1187
-	ldc.i4 1187
-	stloc.3
+// 0x01071164: 0x1071164: jal   0x106c144 addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Login_106c144(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_107130c:
-// 0x0107130c: 0x107130c: addu  a0, s1, zero
-	ldloc 7
-	stloc.1
-// 0x01071310: 0x1071310: jal   0x106ed70 addu  a1, s0, zero
-	ldloc 6
+// 0x0107116c: 0x107116c: j	 0x107117c sll   zero, zero, 0
+	br L_107117c
+// --- basic block ---
+L_1071174:
+// 0x01071174: 0x1071174: jal   0x1070e08 addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::SendAllMessagesTogether_1070e08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
-	stloc 9
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01071318: 0x1071318: lw    ra, 28(sp)
-// 0x0107131c: 0x107131c: lw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 7
-// 0x01071320: 0x1071320: lw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 6
-// 0x01071324: 0x1071324: jr    ra addiu sp, sp, 32
+L_107117c:
+// 0x0107117c: 0x107117c: lw    ra, 20(sp)
+// 0x01071180: 0x1071180: sll   zero, zero, 0
+// 0x01071184: 0x1071184: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 10
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
+	ldloc 5
 	ret
 }
-.method public static int32 OnAsyncOperationCompleted_AllTogether_107132c(int32,int32,int32,int32,int32)
+.method public static int32 StartTransaction_107118c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
+// local  8 is register s0
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  9 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4795,71 +4176,96 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107132c: 0x107132c: addiu sp, sp, -32
+// 0x0107118c: 0x107118c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071190: 0x1071190: lw    v0, 18104(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4526
+	add
+	ldelem.i4
+	stloc 5
+// 0x01071194: 0x1071194: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01071330: 0x1071330: sw    s1, 24(sp)
+// 0x01071198: 0x1071198: sw    ra, 28(sp)
+// 0x0107119c: 0x107119c: beq   v0, zero, 0x10711e0 sw    s0, 24(sp)
 	ldloc 5
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 7
+	ldloc 8
 	stelem.i4
-// 0x01071334: 0x1071334: sw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
+	brfalse L_10711e0
+// --- basic block ---
+// 0x010711a4: 0x10711a4: lui   v1, 0x70000
+	ldc.i4 458752
+	stloc 7
+// 0x010711a8: 0x10711a8: lw    v0, 18172(v1)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4543
 	add
+	ldelem.i4
+	stloc 5
+// 0x010711ac: 0x10711ac: sll   zero, zero, 0
+// 0x010711b0: 0x10711b0: sltiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	clt.un
+	stloc 5
+// 0x010711b4: 0x10711b4: beq   v0, zero, 0x10711e0 sw    v0, 18172(v1)
+	ldloc 5
 	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 4543
+	add
+	ldloc 5
 	stelem.i4
-// 0x01071338: 0x1071338: sw    ra, 28(sp)
-// 0x0107133c: 0x107133c: addu  s0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x01071340: 0x1071340: beq   a1, zero, 0x1071364 addu  s1, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 7
-	brfalse L_1071364
+	brfalse L_10711e0
 // --- basic block ---
-// 0x01071348: 0x1071348: lui   a1, 0x10000
+// 0x010711bc: 0x10711bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107134c: 0x107134c: lui   a3, 0x10000
+// 0x010711c0: 0x10711c0: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01071350: 0x1071350: addiu a1, a1, 20732
+// 0x010711c4: 0x10711c4: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071354: 0x1071354: addiu a3, a3, 30920
+// 0x010711c8: 0x10711c8: addiu a3, a3, 30116
 	ldloc 4
-	ldc.i4 30920
+	ldc.i4 30116
 	add
 	stloc 4
-// 0x01071358: 0x1071358: addiu a0, zero, 4
-	ldc.i4.4
+// 0x010711cc: 0x10711cc: addiu a0, zero, 3
+	ldc.i4.3
 	stloc.1
-// 0x0107135c: 0x107135c: jal   0x100449c addiu a2, zero, 1177
-	ldc.i4 1177
+// 0x010711d0: 0x10711d0: jal   0x100449c addiu a2, zero, 2626
+	ldc.i4 2626
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -4868,137 +4274,89 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_1071364:
-// 0x01071364: 0x1071364: jal   0x10b30d0 sltiu a0, s0, 1
-	ldloc 6
+// 0x010711d8: 0x10711d8: j	 0x1071288 addiu v1, zero, 1
 	ldc.i4.1
-	clt.un
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl133::editor_track_report_conclude_export_10b30d0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	stloc 7
+	br L_1071288
 // --- basic block ---
-// 0x0107136c: 0x107136c: addu  a0, s1, zero
-	ldloc 7
-	stloc.1
-// 0x01071370: 0x1071370: jal   0x106ed70 addu  a1, s0, zero
+L_10711e0:
+// 0x010711e0: 0x10711e0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010711e4: 0x10711e4: lw    v0, -18648(v0)
 	ldloc 6
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::OnTransactionCompleted_106ed70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x01071378: 0x1071378: lw    ra, 28(sp)
-// 0x0107137c: 0x107137c: lw    s1, 24(sp)
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 -4662
 	add
 	ldelem.i4
-	stloc 7
-// 0x01071380: 0x1071380: lw    s0, 20(sp)
+	stloc 5
+// 0x010711e8: 0x10711e8: sll   zero, zero, 0
+// 0x010711ec: 0x10711ec: beq   v0, zero, 0x107122c lui   s0, 0x70000
 	ldloc 5
+	ldc.i4 458752
+	stloc 8
+	brfalse L_107122c
+// --- basic block ---
+// 0x010711f4: 0x10711f4: jal   0x106b2a4 sw    a0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 6
-// 0x01071384: 0x1071384: jr    ra addiu sp, sp, 32
+	ldloc.1
+	stelem.i4
 	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
-	ret
-}
-.method public static int32 OnTransactionCompleted_LogoutAndStop_107138c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::NameAndPasswordAlreadyFailedAuthentication_106b2a4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-__CIBYL_javamethod_begin:
+	stloc 5
 // --- basic block ---
-// 0x0107138c: 0x107138c: addiu sp, sp, -24
+// 0x010711fc: 0x10711fc: lw    a0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-// 0x01071390: 0x1071390: beq   a1, zero, 0x10713b4 sw    ra, 20(sp)
-	ldloc.2
-	brfalse L_10713b4
+	ldelem.i4
+	stloc.1
+// 0x01071200: 0x1071200: beq   v0, zero, 0x107122c lui   s0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 8
+	brfalse L_107122c
 // --- basic block ---
-// 0x01071398: 0x1071398: lui   a1, 0x10000
+// 0x01071208: 0x1071208: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107139c: 0x107139c: lui   a3, 0x10000
+// 0x0107120c: 0x107120c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x010713a0: 0x10713a0: addiu a1, a1, 20732
+// 0x01071210: 0x1071210: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 20732
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x010713a4: 0x10713a4: addiu a3, a3, 31008
+// 0x01071214: 0x1071214: addiu a3, a3, 30200
 	ldloc 4
-	ldc.i4 31008
+	ldc.i4 30200
 	add
 	stloc 4
-// 0x010713a8: 0x10713a8: addiu a0, zero, 3
+// 0x01071218: 0x1071218: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x010713ac: 0x10713ac: jal   0x100449c addiu a2, zero, 720
-	ldc.i4 720
+// 0x0107121c: 0x107121c: jal   0x100449c addiu a2, zero, 2636
+	ldc.i4 2636
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -5007,72 +4365,184 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_10713b4:
-// 0x010713b4: 0x10713b4: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01071224: 0x1071224: j	 0x1071288 addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+	br L_1071288
+// --- basic block ---
+L_107122c:
+// 0x0107122c: 0x107122c: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x01071230: 0x1071230: addiu s0, s0, 18192
+	ldloc 8
+	ldc.i4 18192
+	add
+	stloc 8
+// 0x01071234: 0x1071234: jal   0x1071134 sw    v0, 28688(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 7172
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl84::TransactionStarted_1071134(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x010713b8: 0x10713b8: addiu a0, zero, 1
+// --- basic block ---
+// 0x0107123c: 0x107123c: bne   v0, zero, 0x1071288 addiu v1, zero, 1
+	ldloc 5
 	ldc.i4.1
+	stloc 7
+	brtrue L_1071288
+// --- basic block ---
+// 0x01071244: 0x1071244: lui   a0, 0x70000
+	ldc.i4 458752
 	stloc.1
-// 0x010713bc: 0x10713bc: jal   0x106ec00 sw    zero, -19120(v0)
-	ldloc 7
+// 0x01071248: 0x1071248: addiu a0, a0, 18472
+	ldloc.1
+	ldc.i4 18472
+	add
+	stloc.1
+// 0x0107124c: 0x107124c: jal   0x108b934 sw    zero, 28688(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 7172
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call int32 Cibyl104::RTUsers_RedoUpdateFlag_108b934(int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01071254: 0x1071254: lw    v0, 28696(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 7174
+	add
+	ldelem.i4
+	stloc 5
+// 0x01071258: 0x1071258: sll   zero, zero, 0
+// 0x0107125c: 0x107125c: bne   v0, zero, 0x1071270 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brtrue L_1071270
+// --- basic block ---
+// 0x01071264: 0x1071264: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x01071268: 0x1071268: sw    v0, 28696(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 7174
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107126c: 0x107126c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_1071270:
+// 0x01071270: 0x1071270: addiu v0, v0, 18192
+	ldloc 5
+	ldc.i4 18192
+	add
+	stloc 5
+// 0x01071274: 0x1071274: lw    a1, 28696(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4780
+	ldc.i4 7174
+	add
+	ldelem.i4
+	stloc.2
+// 0x01071278: 0x1071278: addiu a0, zero, 23
+	ldc.i4.s 23
+	stloc.1
+// 0x0107127c: 0x107127c: bne   a1, a0, 0x1071288 addu  v1, zero, zero
+	ldloc.2
+	ldloc.1
+	ldc.i4.s 0
+	stloc 7
+	bne.un L_1071288
+// --- basic block ---
+// 0x01071284: 0x1071284: sw    zero, 28696(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 7174
 	add
 	ldc.i4.s 0
 	stelem.i4
+L_1071288:
+// 0x01071288: 0x1071288: lw    ra, 28(sp)
+// 0x0107128c: 0x107128c: addu  v0, v1, zero
+	ldloc 7
+	stloc 5
+// 0x01071290: 0x1071290: lw    s0, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::Realtime_FullReset_106ec00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
 	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x010713c4: 0x10713c4: lw    ra, 20(sp)
-// 0x010713c8: 0x10713c8: sll   zero, zero, 0
-// 0x010713cc: 0x10713cc: jr    ra addiu sp, sp, 24
+// 0x01071294: 0x1071294: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 Realtime_DecodeRefreshRateMilliseconds_1071440(int32,int32,int32,int32,int32)
+.method public static int32 OnTimer_Realtime_107129c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  8 is register s0
-// local 10 is register s1
-// local  9 is register s2
-// local 11 is register s3
 // local  0 is register sp
-// local 12 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5083,889 +4553,1072 @@ __CIBYL_function_return:
 	stloc 4
 	ldc.i4.s 0
 	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01071440: 0x1071440: addiu sp, sp, -40
+// 0x0107129c: 0x107129c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x010712a0: 0x10712a0: lw    v0, 18028(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
+	add
+	ldelem.i4
+	stloc 5
+// 0x010712a4: 0x10712a4: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01071444: 0x1071444: sw    s3, 32(sp)
-	ldloc 6
+// 0x010712a8: 0x10712a8: sw    ra, 44(sp)
+// 0x010712ac: 0x10712ac: beq   v0, zero, 0x10715b4 sw    s0, 40(sp)
+	ldloc 5
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 10
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x01071448: 0x1071448: sw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
+	brfalse L_10715b4
+// --- basic block ---
+// 0x010712b4: 0x10712b4: addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 8
+// 0x010712b8: 0x10712b8: cibyl_sysc_arg 0x10
+	ldloc 8
+// 0x010712bc: 0x10712bc: cibyl_sysc 0x2111
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 5
+// 0x010712c0: 0x10712c0: addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x010712c4: 0x10712c4: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x010712c8: 0x10712c8: lw    v0, 18104(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 4526
 	add
-	ldloc 10
-	stelem.i4
-// 0x0107144c: 0x107144c: sw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
+	ldelem.i4
+	stloc 5
+// 0x010712cc: 0x10712cc: sll   zero, zero, 0
+// 0x010712d0: 0x10712d0: bne   v0, zero, 0x1071324 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brtrue L_1071324
+// --- basic block ---
+// 0x010712d8: 0x10712d8: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x010712dc: 0x10712dc: lw    v0, 18056(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4514
 	add
-	ldloc 8
-	stelem.i4
-// 0x01071450: 0x1071450: sw    ra, 36(sp)
-// 0x01071454: 0x1071454: sw    s2, 28(sp)
-	ldloc 6
-	ldloc.0
+	ldelem.i4
+	stloc 5
+// 0x010712e0: 0x10712e0: sll   zero, zero, 0
+// 0x010712e4: 0x10712e4: beq   v0, zero, 0x1071324 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brfalse L_1071324
+// --- basic block ---
+// 0x010712ec: 0x10712ec: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010712f0: 0x10712f0: lw    v0, -18648(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 -4662
 	add
-	ldloc 9
-	stelem.i4
-// 0x01071458: 0x1071458: addu  s0, a1, zero
-	ldloc.2
-	stloc 8
-// 0x0107145c: 0x107145c: addu  s1, a2, zero
-	ldloc.3
-	stloc 10
-// 0x01071460: 0x1071460: jal   0x100e348 addu  s3, a3, zero
-	ldloc 4
-	stloc 11
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x01071468: 0x1071468: beq   v0, zero, 0x10714cc sll   zero, zero, 0
+// 0x010712f4: 0x10712f4: sll   zero, zero, 0
+// 0x010712f8: 0x10712f8: addiu v1, v0, -10
 	ldloc 5
-	brfalse L_10714cc
+	ldc.i4.s -10
+	add
+	stloc 6
+// 0x010712fc: 0x10712fc: sltiu v1, v1, 7
+	ldloc 6
+	ldc.i4.7
+	clt.un
+	stloc 6
+// 0x01071300: 0x1071300: bne   v1, zero, 0x1071320 addiu v1, zero, 27
+	ldloc 6
+	ldc.i4.s 27
+	stloc 6
+	brtrue L_1071320
 // --- basic block ---
-// 0x01071470: 0x1071470: lb    v1, 0(v0)
+// 0x01071308: 0x1071308: beq   v0, v1, 0x1071324 lui   v0, 0x70000
 	ldloc 5
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 7
-// 0x01071474: 0x1071474: sll   zero, zero, 0
-// 0x01071478: 0x1071478: beq   v1, zero, 0x10714cc sll   zero, zero, 0
-	ldloc 7
-	brfalse L_10714cc
+	ldloc 6
+	ldc.i4 458752
+	stloc 5
+	beq  L_1071324
 // --- basic block ---
-// 0x01071480: 0x1071480: jal   0x10c1c60 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl144::atof_10c1c60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x01071310: 0x1071310: jal   0x1068fc4 sll   zero, zero, 0
+	call int32 Cibyl78::websvc_trans_getLastNetConnectRes_1068fc4()
 	stloc 5
 // --- basic block ---
-// 0x01071488: 0x1071488: addu  a0, v0, zero
+// 0x01071318: 0x1071318: bne   v0, zero, 0x10713b8 lui   v0, 0x70000
 	ldloc 5
-	stloc.1
-// 0x0107148c: 0x107148c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01071490: 0x1071490: jal   0x10c1c10 addu  s2, v0, zero
-	ldloc 5
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl144::__eqsf2_10c1c10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4 458752
 	stloc 5
+	brtrue L_10713b8
 // --- basic block ---
-// 0x01071498: 0x1071498: beq   v0, zero, 0x10714cc addu  a0, s2, zero
+L_1071320:
+// 0x01071320: 0x1071320: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_1071324:
+// 0x01071324: 0x1071324: lw    v1, 18152(v0)
+	ldloc 7
 	ldloc 5
-	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 4538
+	add
+	ldelem.i4
+	stloc 6
+// 0x01071328: 0x1071328: sll   zero, zero, 0
+// 0x0107132c: 0x107132c: blez  v1, 0x1071354 lui   a0, 0x70000
+	ldloc 6
+	ldc.i4 458752
 	stloc.1
-	brfalse L_10714cc
+	ldc.i4.s 0
+	ble L_1071354
 // --- basic block ---
-// 0x010714a0: 0x10714a0: jal   0x10c1a80 addu  a1, s3, zero
-	ldloc 11
-	stloc.2
-	ldloc.0
+// 0x01071334: 0x1071334: lw    a0, 18108(a0)
+	ldloc 7
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl144::__gtsf2_10c1a80(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4527
+	add
+	ldelem.i4
+	stloc.1
+// 0x01071338: 0x1071338: sll   zero, zero, 0
+// 0x0107133c: 0x107133c: sll   a0, a0, 1
+	ldloc.1
+	ldc.i4.1
+	shl
+	stloc.1
+// 0x01071340: 0x1071340: addu  v1, a0, v1
+	ldloc.1
+	ldloc 6
+	add
+	stloc 6
+// 0x01071344: 0x1071344: slt   v1, s0, v1
+	ldloc 8
+	ldloc 6
+	clt
+	stloc 6
+// 0x01071348: 0x1071348: bne   v1, zero, 0x1071354 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_1071354
 // --- basic block ---
-// 0x010714a8: 0x10714a8: bgtz  v0, 0x10714cc addu  s0, s3, zero
+// 0x01071350: 0x1071350: sw    zero, 18152(v0)
+	ldloc 7
 	ldloc 5
-	ldloc 11
-	stloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4538
+	add
 	ldc.i4.s 0
-	bgt L_10714cc
+	stelem.i4
+L_1071354:
+// 0x01071354: 0x1071354: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071358: 0x1071358: lw    v1, 18152(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4538
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107135c: 0x107135c: sll   zero, zero, 0
+// 0x01071360: 0x1071360: beq   v1, zero, 0x107138c sll   zero, zero, 0
+	ldloc 6
+	brfalse L_107138c
 // --- basic block ---
-// 0x010714b0: 0x10714b0: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x010714b4: 0x10714b4: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x010714b8: 0x10714b8: jal   0x10c1b70 addu  s0, s2, zero
-	ldloc 9
-	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl144::__gesf2_10c1b70(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x01071368: 0x1071368: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x0107136c: 0x107136c: lw    v0, 18108(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4527
+	add
+	ldelem.i4
+	stloc 5
+// 0x01071370: 0x1071370: sll   zero, zero, 0
+// 0x01071374: 0x1071374: addu  v1, v1, v0
+	ldloc 6
+	ldloc 5
+	add
+	stloc 6
+// 0x01071378: 0x1071378: slt   v1, s0, v1
+	ldloc 8
+	ldloc 6
+	clt
+	stloc 6
+// 0x0107137c: 0x107137c: bne   v1, zero, 0x1071390 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_1071390
+// --- basic block ---
+// 0x01071384: 0x1071384: j	 0x10713c0 lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
+	br L_10713c0
 // --- basic block ---
-// 0x010714c0: 0x10714c0: bgez  v0, 0x10714d0 lui   v0, 0x20000
+L_107138c:
+// 0x0107138c: 0x107138c: sw    s0, 18152(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4538
+	add
+	ldloc 8
+	stelem.i4
+L_1071390:
+// 0x01071390: 0x1071390: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071394: 0x1071394: lw    v0, 18112(v0)
+	ldloc 7
 	ldloc 5
-	ldc.i4 131072
+	ldc.i4.2
+	shr.un
+	ldc.i4 4528
+	add
+	ldelem.i4
 	stloc 5
-	ldc.i4.s 0
-	bge L_10714d0
-// --- basic block ---
-// 0x010714c8: 0x10714c8: addu  s0, s1, zero
-	ldloc 10
+// 0x01071398: 0x1071398: sll   zero, zero, 0
+// 0x0107139c: 0x107139c: subu  s0, s0, v0
+	ldloc 8
+	ldloc 5
+	sub
 	stloc 8
-L_10714cc:
-// 0x010714cc: 0x10714cc: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x010713a0: 0x10713a0: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-L_10714d0:
-// 0x010714d0: 0x10714d0: lw    a1, 23652(v0)
-	ldloc 6
+// 0x010713a4: 0x10713a4: sw    s0, 18156(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5913
+	ldc.i4 4539
 	add
-	ldelem.i4
-	stloc.2
-// 0x010714d4: 0x10714d4: jal   0x10c0780 addu  a0, s0, zero
 	ldloc 8
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	stelem.i4
+// 0x010713a8: 0x10713a8: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// --- basic block ---
-// 0x010714dc: 0x10714dc: jal   0x10c08bc addu  a0, v0, zero
+// 0x010713ac: 0x10713ac: sw    s0, 18160(v0)
+	ldloc 7
 	ldloc 5
-	stloc.1
-	ldloc.1
-	call float32 [WazeWP7]CRunTime::intBitsToFloat(int32)
-	conv.i4
+	ldc.i4.2
+	shr.un
+	ldc.i4 4540
+	add
+	ldloc 8
+	stelem.i4
+// 0x010713b0: 0x10713b0: j	 0x1071570 addiu v0, zero, 2
+	ldc.i4.2
 	stloc 5
+	br L_1071570
 // --- basic block ---
-// 0x010714e4: 0x10714e4: lw    ra, 36(sp)
-// 0x010714e8: 0x10714e8: lw    s3, 32(sp)
-	ldloc 6
-	ldloc.0
+L_10713b8:
+// 0x010713b8: 0x10713b8: sw    zero, 18152(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 4538
 	add
-	ldelem.i4
-	stloc 11
-// 0x010714ec: 0x10714ec: lw    s2, 28(sp)
-	ldloc 6
-	ldloc.0
+	ldc.i4.s 0
+	stelem.i4
+// 0x010713bc: 0x10713bc: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_10713c0:
+// 0x010713c0: 0x10713c0: lw    v1, 18016(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 4504
 	add
 	ldelem.i4
-	stloc 9
-// 0x010714f0: 0x10714f0: lw    s1, 24(sp)
+	stloc 6
+// 0x010713c4: 0x10713c4: sll   zero, zero, 0
+// 0x010713c8: 0x10713c8: bne   v1, zero, 0x10713d8 addiu v0, zero, 300
 	ldloc 6
-	ldloc.0
+	ldc.i4 300
+	stloc 5
+	brtrue L_10713d8
+// --- basic block ---
+// 0x010713d0: 0x10713d0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x010713d4: 0x10713d4: lw    v0, 18116(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 4529
 	add
 	ldelem.i4
-	stloc 10
-// 0x010714f4: 0x10714f4: lw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
+	stloc 5
+L_10713d8:
+// 0x010713d8: 0x10713d8: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x010713dc: 0x10713dc: lw    a1, 18160(a0)
+	ldloc 7
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4540
 	add
 	ldelem.i4
-	stloc 8
-// 0x010714f8: 0x10714f8: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+	stloc.2
+// 0x010713e0: 0x10713e0: sll   zero, zero, 0
+// 0x010713e4: 0x10713e4: addu  v0, v0, a1
+	ldloc 5
+	ldloc.2
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+// 0x010713e8: 0x10713e8: slt   v0, s0, v0
+	ldloc 8
 	ldloc 5
-	ret
-}
-.method public static int32 Realtime_GetKeepALiveRateRateinMilliseconds_1071500(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 lo,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local 11 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  9 is register lo
-// local  6 is register mem
-
-	ldc.i4.s 0
+	clt
 	stloc 5
-	ldc.i4.s 0
-	stloc 11
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x010713ec: 0x10713ec: bne   v0, zero, 0x1071410 lui   v1, 0x70000
+	ldloc 5
+	ldc.i4 458752
 	stloc 6
-__CIBYL_javamethod_begin:
+	brtrue L_1071410
 // --- basic block ---
-// 0x01071500: 0x1071500: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x010713f4: 0x10713f4: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x01071504: 0x1071504: lw    a1, 23656(v0)
-	ldloc 6
+// 0x010713f8: 0x10713f8: lw    a1, 18112(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5914
+	ldc.i4 4528
 	add
 	ldelem.i4
 	stloc.2
-// 0x01071508: 0x1071508: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x010713fc: 0x10713fc: addiu v0, zero, 2
+	ldc.i4.2
 	stloc 5
-// 0x0107150c: 0x107150c: lw    a2, 23660(v0)
+// 0x01071400: 0x1071400: subu  s0, s0, a1
+	ldloc 8
+	ldloc.2
+	sub
+	stloc 8
+// 0x01071404: 0x1071404: sw    s0, 18156(v1)
+	ldloc 7
 	ldloc 6
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5915
+	ldc.i4 4539
 	add
-	ldelem.i4
-	stloc.3
-// 0x01071510: 0x1071510: lui   v0, 0x20000
-	ldc.i4 131072
+	ldloc 8
+	stelem.i4
+// 0x01071408: 0x1071408: j	 0x1071570 sw    s0, 18160(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 4540
+	add
+	ldloc 8
+	stelem.i4
+	br L_1071570
+// --- basic block ---
+L_1071410:
+// 0x01071410: 0x1071410: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x01071514: 0x1071514: lw    a3, 23664(v0)
-	ldloc 6
+// 0x01071414: 0x1071414: lw    a0, 18120(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5916
+	ldc.i4 4530
 	add
 	ldelem.i4
-	stloc 4
-// 0x01071518: 0x1071518: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0107151c: 0x107151c: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x01071520: 0x1071520: addiu a0, a0, 15168
-	ldloc.1
-	ldc.i4 15168
-	add
 	stloc.1
-// 0x01071524: 0x1071524: sw    ra, 36(sp)
-// 0x01071528: 0x1071528: sw    s1, 32(sp)
+// 0x01071418: 0x1071418: lw    v0, 18156(v1)
+	ldloc 7
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 4539
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107141c: 0x107141c: sll   zero, zero, 0
+// 0x01071420: 0x1071420: addu  v0, a0, v0
+	ldloc.1
+	ldloc 5
 	add
+	stloc 5
+// 0x01071424: 0x1071424: slt   v0, s0, v0
 	ldloc 8
-	stelem.i4
-// 0x0107152c: 0x107152c: jal   0x1071440 sw    s0, 28(sp)
-	ldloc 6
+	ldloc 5
+	clt
+	stloc 5
+// 0x01071428: 0x1071428: bne   v0, zero, 0x10715b4 addiu a0, sp, 20
+	ldloc 5
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4.s 20
 	add
-	ldloc 7
-	stelem.i4
+	stloc.1
+	brtrue L_10715b4
+// --- basic block ---
+// 0x01071430: 0x1071430: jal   0x102a2c0 addiu a1, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::Realtime_DecodeRefreshRateMilliseconds_1071440(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_is_jammed_102a2c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071534: 0x1071534: addiu s0, zero, 1000
-	ldc.i4 1000
-	stloc 7
-// 0x01071538: 0x1071538: div   v0, s0
+// 0x01071438: 0x1071438: beq   v0, zero, 0x1071474 lui   v0, 0x70000
 	ldloc 5
-	ldloc 7
-	div
-	stloc 9
-// 0x0107153c: 0x107153c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01071540: 0x1071540: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071544: 0x1071544: lui   s1, 0x70000
 	ldc.i4 458752
-	stloc 8
-// 0x01071548: 0x1071548: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x0107154c: 0x107154c: addiu a3, a3, 31068
-	ldloc 4
-	ldc.i4 31068
+	stloc 5
+	brfalse L_1071474
+// --- basic block ---
+// 0x01071440: 0x1071440: lw    v0, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc 4
-// 0x01071550: 0x1071550: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071554: 0x1071554: addiu a2, zero, 466
-	ldc.i4 466
-	stloc.3
-// 0x01071558: 0x1071558: mflo  lo
-	ldloc 9
+	ldelem.i4
 	stloc 5
-// 0x0107155c: 0x107155c: sw    v0, 16(sp)
-	ldloc 6
+// 0x01071444: 0x1071444: sll   zero, zero, 0
+// 0x01071448: 0x1071448: bne   v0, zero, 0x1071474 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	brtrue L_1071474
+// --- basic block ---
+// 0x01071450: 0x1071450: lw    a2, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-// 0x01071560: 0x1071560: jal   0x100449c sw    v0, 17704(s1)
-	ldloc 6
-	ldloc 8
+	ldelem.i4
+	stloc.3
+// 0x01071454: 0x1071454: lw    a0, 24(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4426
+	ldc.i4.6
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x01071458: 0x1071458: xori  a2, a2, 2
+	ldloc.3
+	ldc.i4.2
+	xor
+	stloc.3
+// 0x0107145c: 0x107145c: lw    a1, 32(sp)
+	ldloc 7
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc.2
+// 0x01071460: 0x1071460: jal   0x1082fb8 sltiu a2, a2, 1
+	ldloc.3
+	ldc.i4.1
+	clt.un
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_Get_Line_1082fb8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01071468: 0x1071468: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x0107146c: 0x107146c: beq   v0, v1, 0x107147c lui   v0, 0x70000
+	ldloc 5
+	ldloc 6
+	ldc.i4 458752
 	stloc 5
+	beq  L_107147c
+// --- basic block ---
+L_1071474:
+// 0x01071474: 0x1071474: j	 0x10715b4 sw    zero, 18124(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4531
+	add
+	ldc.i4.s 0
+	stelem.i4
+	br L_10715b4
 // --- basic block ---
-// 0x01071568: 0x1071568: lw    v0, 17704(s1)
-	ldloc 6
-	ldloc 8
+L_107147c:
+// 0x0107147c: 0x107147c: lw    v0, 18124(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4426
+	ldc.i4 4531
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107156c: 0x107156c: lw    ra, 36(sp)
-// 0x01071570: 0x1071570: mult  v0, s0
+// 0x01071480: 0x1071480: sll   zero, zero, 0
+// 0x01071484: 0x1071484: beq   v0, zero, 0x1071510 lui   a0, 0x70000
 	ldloc 5
+	ldc.i4 458752
+	stloc.1
+	brfalse L_1071510
+// --- basic block ---
+// 0x0107148c: 0x107148c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071490: 0x1071490: lw    v1, 18132(v0)
 	ldloc 7
-	mul
-	stloc 9
-// 0x01071574: 0x1071574: lw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 4533
 	add
 	ldelem.i4
-	stloc 8
-// 0x01071578: 0x1071578: lw    s0, 28(sp)
-	ldloc 6
+	stloc 6
+// 0x01071494: 0x1071494: lw    a0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107157c: 0x107157c: mflo  lo
-	ldloc 9
-	stloc 5
-// 0x01071580: 0x1071580: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 11
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Realtime_GetRefreshRateinMilliseconds_1071588(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 s1,int32 s3,int32 s0,int32 s2,int32 s6,int32 s4,int32 s5,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 11 is register s0
-// local  9 is register s1
-// local 12 is register s2
-// local 10 is register s3
-// local 14 is register s4
-// local 15 is register s5
-// local 13 is register s6
-// local  0 is register sp
-// local 16 is register ra
-// local  8 is register lo
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 13
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	stloc.1
+// 0x01071498: 0x1071498: sll   zero, zero, 0
+// 0x0107149c: 0x107149c: bne   v1, a0, 0x107150c sll   zero, zero, 0
+	ldloc 6
+	ldloc.1
+	bne.un L_107150c
 // --- basic block ---
-// 0x01071588: 0x1071588: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x0107158c: 0x107158c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01071590: 0x1071590: sw    s1, 28(sp)
+// 0x010714a4: 0x10714a4: bne   v1, zero, 0x10714c8 sll   zero, zero, 0
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	brtrue L_10714c8
+// --- basic block ---
+// 0x010714ac: 0x10714ac: addiu v0, v0, 18132
+	ldloc 5
+	ldc.i4 18132
 	add
-	ldloc 9
-	stelem.i4
-// 0x01071594: 0x1071594: lw    s1, 23660(v0)
-	ldloc 6
+	stloc 5
+// 0x010714b0: 0x10714b0: lw    v1, 12(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5915
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 9
-// 0x01071598: 0x1071598: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0107159c: 0x107159c: sw    s4, 40(sp)
-	ldloc 6
+	stloc 6
+// 0x010714b4: 0x10714b4: lw    v0, 32(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.8
 	add
-	ldloc 14
-	stelem.i4
-// 0x010715a0: 0x10715a0: lw    s4, 23664(v0)
+	ldelem.i4
+	stloc 5
+// 0x010714b8: 0x10714b8: sll   zero, zero, 0
+// 0x010714bc: 0x10714bc: bne   v1, v0, 0x1071510 lui   a0, 0x70000
 	ldloc 6
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 5916
+	ldc.i4 458752
+	stloc.1
+	bne.un L_1071510
+// --- basic block ---
+// 0x010714c4: 0x10714c4: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_10714c8:
+// 0x010714c8: 0x10714c8: addiu v0, v0, 18132
+	ldloc 5
+	ldc.i4 18132
 	add
-	ldelem.i4
-	stloc 14
-// 0x010715a4: 0x10715a4: lui   v0, 0x20000
-	ldc.i4 131072
 	stloc 5
-// 0x010715a8: 0x10715a8: lw    a1, 23668(v0)
-	ldloc 6
+// 0x010714cc: 0x10714cc: lw    a0, 4(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5917
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc.2
-// 0x010715ac: 0x10715ac: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x010715b0: 0x10715b0: addu  a2, s1, zero
-	ldloc 9
-	stloc.3
-// 0x010715b4: 0x10715b4: addu  a3, s4, zero
-	ldloc 14
-	stloc 4
-// 0x010715b8: 0x10715b8: addiu a0, a0, 15120
-	ldloc.1
-	ldc.i4 15120
-	add
 	stloc.1
-// 0x010715bc: 0x10715bc: sw    ra, 52(sp)
-// 0x010715c0: 0x10715c0: sw    s6, 48(sp)
-	ldloc 6
+// 0x010714d0: 0x10714d0: lw    v1, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.6
 	add
-	ldloc 13
-	stelem.i4
-// 0x010715c4: 0x10715c4: sw    s5, 44(sp)
+	ldelem.i4
+	stloc 6
+// 0x010714d4: 0x10714d4: sll   zero, zero, 0
+// 0x010714d8: 0x10714d8: bne   a0, v1, 0x1071510 lui   a0, 0x70000
+	ldloc.1
 	ldloc 6
-	ldloc.0
+	ldc.i4 458752
+	stloc.1
+	bne.un L_1071510
+// --- basic block ---
+// 0x010714e0: 0x10714e0: lw    v1, 16(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.4
 	add
-	ldloc 15
-	stelem.i4
-// 0x010715c8: 0x10715c8: sw    s3, 36(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 6
+// 0x010714e4: 0x10714e4: lw    v0, 36(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 9
 	add
-	ldloc 10
-	stelem.i4
-// 0x010715cc: 0x10715cc: sw    s2, 32(sp)
+	ldelem.i4
+	stloc 5
+// 0x010714e8: 0x10714e8: sll   zero, zero, 0
+// 0x010714ec: 0x10714ec: bne   v1, v0, 0x1071510 sll   zero, zero, 0
 	ldloc 6
+	ldloc 5
+	bne.un L_1071510
+// --- basic block ---
+// 0x010714f4: 0x10714f4: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x010714f8: 0x10714f8: lw    v1, 18128(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4532
+	add
+	ldelem.i4
+	stloc 6
+// 0x010714fc: 0x10714fc: lw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldloc 12
-	stelem.i4
-// 0x010715d0: 0x10715d0: jal   0x1071440 sw    s0, 24(sp)
+	ldelem.i4
+	stloc 5
+// 0x01071500: 0x1071500: sll   zero, zero, 0
+// 0x01071504: 0x1071504: beq   v1, v0, 0x1071538 lui   v0, 0x70000
 	ldloc 6
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	beq  L_1071538
+// --- basic block ---
+L_107150c:
+// 0x0107150c: 0x107150c: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+L_1071510:
+// 0x01071510: 0x1071510: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071514: 0x1071514: addiu a0, a0, 18132
+	ldloc.1
+	ldc.i4 18132
+	add
+	stloc.1
+// 0x01071518: 0x1071518: addiu a1, sp, 20
 	ldloc.0
+	ldc.i4.s 20
+	add
+	stloc.2
+// 0x0107151c: 0x107151c: addiu a2, zero, 20
+	ldc.i4.s 20
+	stloc.3
+// 0x01071520: 0x1071520: jal   0x1001800 sw    s0, 18124(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 4531
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::Realtime_DecodeRefreshRateMilliseconds_1071440(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010715d8: 0x10715d8: addiu s0, zero, 1000
-	ldc.i4 1000
-	stloc 11
-// 0x010715dc: 0x10715dc: div   v0, s0
-	ldloc 5
-	ldloc 11
-	div
-	stloc 8
-// 0x010715e0: 0x10715e0: lui   s2, 0x10000
-	ldc.i4 65536
-	stloc 12
-// 0x010715e4: 0x10715e4: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010715e8: 0x10715e8: lui   s3, 0x70000
+// 0x01071528: 0x1071528: lw    v1, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107152c: 0x107152c: lui   v0, 0x70000
 	ldc.i4 458752
-	stloc 10
-// 0x010715ec: 0x10715ec: addiu a1, s2, 20732
-	ldloc 12
-	ldc.i4 20732
+	stloc 5
+// 0x01071530: 0x1071530: sw    v1, 18128(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4532
 	add
-	stloc.2
-// 0x010715f0: 0x10715f0: addiu a3, a3, 31112
-	ldloc 4
-	ldc.i4 31112
+	ldloc 6
+	stelem.i4
+// 0x01071534: 0x1071534: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_1071538:
+// 0x01071538: 0x1071538: lw    v1, 18116(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4529
 	add
-	stloc 4
-// 0x010715f4: 0x10715f4: addiu a2, zero, 433
-	ldc.i4 433
-	stloc.3
-// 0x010715f8: 0x10715f8: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x010715fc: 0x10715fc: lui   s6, 0x20000
-	ldc.i4 131072
-	stloc 13
-// 0x01071600: 0x1071600: mflo  lo
-	ldloc 8
+	ldelem.i4
+	stloc 6
+// 0x0107153c: 0x107153c: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x01071604: 0x1071604: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
+// 0x01071540: 0x1071540: lw    v0, 18124(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4531
 	add
-	ldloc 5
-	stelem.i4
-// 0x01071608: 0x1071608: jal   0x100449c sw    v0, 17652(s3)
+	ldelem.i4
+	stloc 5
+// 0x01071544: 0x1071544: sll   zero, zero, 0
+// 0x01071548: 0x1071548: addu  v0, v1, v0
 	ldloc 6
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 4413
+	ldloc 5
 	add
+	stloc 5
+// 0x0107154c: 0x107154c: slt   v0, s0, v0
+	ldloc 8
 	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	clt
+	stloc 5
+// 0x01071550: 0x1071550: beq   v0, zero, 0x10715b4 lui   v0, 0x70000
+	ldloc 5
+	ldc.i4 458752
 	stloc 5
+	brfalse L_10715b4
 // --- basic block ---
-// 0x01071610: 0x1071610: lw    a0, 17652(s3)
-	ldloc 6
-	ldloc 10
+// 0x01071558: 0x1071558: lw    v0, 18112(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4413
+	ldc.i4 4528
 	add
 	ldelem.i4
-	stloc.1
-// 0x01071614: 0x1071614: jal   0x10c09c0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x0107161c: 0x107161c: lw    a3, 23884(s6)
-	ldloc 6
-	ldloc 13
+// 0x0107155c: 0x107155c: sll   zero, zero, 0
+// 0x01071560: 0x1071560: subu  s0, s0, v0
+	ldloc 8
+	ldloc 5
+	sub
+	stloc 8
+// 0x01071564: 0x1071564: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071568: 0x1071568: sw    s0, 18156(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5971
+	ldc.i4 4539
 	add
-	ldelem.i4
-	stloc 4
-// 0x01071620: 0x1071620: lw    a2, 23880(s6)
-	ldloc 6
-	ldloc 13
+	ldloc 8
+	stelem.i4
+// 0x0107156c: 0x107156c: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+L_1071570:
+// 0x01071570: 0x1071570: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x01071574: 0x1071574: addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+// 0x01071578: 0x1071578: lw    v1, 28688(a0)
+	ldloc 7
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5970
+	ldc.i4 7172
 	add
 	ldelem.i4
-	stloc.3
-// 0x01071624: 0x1071624: addu  a1, v1, zero
-	ldloc 7
-	stloc.2
-// 0x01071628: 0x1071628: jal   0x10c0798 addu  a0, v0, zero
+	stloc 6
+// 0x0107157c: 0x107157c: sll   zero, zero, 0
+// 0x01071580: 0x1071580: beq   v1, zero, 0x107159c xori  v0, v0, 1
+	ldloc 6
+	ldloc 5
+	ldc.i4.1
+	xor
+	stloc 5
+	brfalse L_107159c
+// --- basic block ---
+// 0x01071588: 0x1071588: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107158c: 0x107158c: bne   v1, v0, 0x10715b4 sll   zero, zero, 0
+	ldloc 6
+	ldloc 5
+	bne.un L_10715b4
+// --- basic block ---
+// 0x01071594: 0x1071594: j	 0x10715ac sll   zero, zero, 0
+	br L_10715ac
+// --- basic block ---
+L_107159c:
+// 0x0107159c: 0x107159c: jal   0x107118c sltiu a0, v0, 1
 	ldloc 5
+	ldc.i4.1
+	clt.un
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::StartTransaction_107118c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071630: 0x1071630: addu  a1, v1, zero
-	ldloc 7
-	stloc.2
-// 0x01071634: 0x1071634: jal   0x10c0898 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
+// 0x010715a4: 0x10715a4: j	 0x10715b4 sll   zero, zero, 0
+	br L_10715b4
+// --- basic block ---
+L_10715ac:
+// 0x010715ac: 0x10715ac: jal   0x10725b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__truncdfsf2_10c0898(int32,int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::RTNet_Watchdog_10725b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107163c: 0x107163c: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 7
-// 0x01071640: 0x1071640: lw    a2, 23672(v1)
-	ldloc 6
+L_10715b4:
+// 0x010715b4: 0x10715b4: lw    ra, 44(sp)
+// 0x010715b8: 0x10715b8: lw    s0, 40(sp)
 	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 5918
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc.3
-// 0x01071644: 0x1071644: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01071648: 0x1071648: addu  a1, s1, zero
-	ldloc 9
-	stloc.2
-// 0x0107164c: 0x107164c: addiu a0, a0, 15136
-	ldloc.1
-	ldc.i4 15136
+	stloc 8
+// 0x010715bc: 0x10715bc: jr    ra addiu sp, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
-	stloc.1
-// 0x01071650: 0x1071650: jal   0x1071440 addu  a3, v0, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_Login_10715c4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010715c4: 0x10715c4: addiu sp, sp, -32
 	ldloc.0
-	ldloc.1
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x010715c8: 0x10715c8: sw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 9
+	stelem.i4
+// 0x010715cc: 0x10715cc: sw    s0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
+// 0x010715d0: 0x10715d0: sw    ra, 28(sp)
+// 0x010715d4: 0x10715d4: addu  s0, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl84::Realtime_DecodeRefreshRateMilliseconds_1071440(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+// 0x010715d8: 0x10715d8: bne   a1, zero, 0x10715f4 addu  s1, a0, zero
+	ldloc.2
+	ldloc.1
+	stloc 9
+	brtrue L_10715f4
 // --- basic block ---
-// 0x01071658: 0x1071658: div   v0, s0
+// 0x010715e0: 0x10715e0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x010715e4: 0x10715e4: lw    v0, 18448(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4612
+	add
+	ldelem.i4
+	stloc 5
+// 0x010715e8: 0x10715e8: sll   zero, zero, 0
+// 0x010715ec: 0x10715ec: bne   v0, zero, 0x1071624 lui   a3, 0x10000
 	ldloc 5
-	ldloc 11
-	div
-	stloc 8
-// 0x0107165c: 0x107165c: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01071660: 0x1071660: addu  s1, v0, zero
-	ldloc 5
-	stloc 9
-// 0x01071664: 0x1071664: addiu a1, s2, 20732
-	ldloc 12
-	ldc.i4 20732
+	brtrue L_1071624
+// --- basic block ---
+L_10715f4:
+// 0x010715f4: 0x10715f4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010715f8: 0x10715f8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010715fc: 0x10715fc: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071668: 0x1071668: addiu a3, a3, 31152
+// 0x01071600: 0x1071600: addiu a3, a3, 30332
 	ldloc 4
-	ldc.i4 31152
+	ldc.i4 30332
 	add
 	stloc 4
-// 0x0107166c: 0x107166c: addiu a2, zero, 440
-	ldc.i4 440
+// 0x01071604: 0x1071604: addiu a2, zero, 2457
+	ldc.i4 2457
 	stloc.3
-// 0x01071670: 0x1071670: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071674: 0x1071674: mflo  lo
-	ldloc 8
-	stloc 5
-// 0x01071678: 0x1071678: jal   0x100449c sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
+// 0x01071608: 0x1071608: jal   0x100449c addiu a0, zero, 4
 	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5976,245 +5629,252 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071680: 0x1071680: addiu v0, zero, 2000
-	ldc.i4 2000
-	stloc 5
-// 0x01071684: 0x1071684: div   s1, v0
-	ldloc 9
-	ldloc 5
-	div
-	stloc 8
-// 0x01071688: 0x1071688: addu  a0, s1, zero
+// 0x01071610: 0x1071610: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107168c: 0x107168c: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x01071690: 0x1071690: mflo  lo
+// 0x01071614: 0x1071614: jal   0x106f394 addu  a1, s0, zero
 	ldloc 8
-	stloc 7
-// 0x01071694: 0x1071694: jal   0x10c09c0 sw    v1, 17648(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4412
-	add
-	ldloc 7
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107169c: 0x107169c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010716a0: 0x10716a0: lw    a3, 23916(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 5979
-	add
-	ldelem.i4
-	stloc 4
-// 0x010716a4: 0x10716a4: lw    a2, 23912(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 5978
+// 0x0107161c: 0x107161c: j	 0x1071668 sll   zero, zero, 0
+	br L_1071668
+// --- basic block ---
+L_1071624:
+// 0x01071624: 0x1071624: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01071628: 0x1071628: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
 	add
-	ldelem.i4
-	stloc.3
-// 0x010716a8: 0x10716a8: addu  a1, v1, zero
-	ldloc 7
 	stloc.2
-// 0x010716ac: 0x10716ac: jal   0x10c0798 addu  a0, v0, zero
-	ldloc 5
+// 0x0107162c: 0x107162c: addiu a3, a3, 30392
+	ldloc 4
+	ldc.i4 30392
+	add
+	stloc 4
+// 0x01071630: 0x1071630: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
+// 0x01071634: 0x1071634: jal   0x100449c addiu a2, zero, 2462
+	ldc.i4 2462
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010716b4: 0x10716b4: addu  a1, v1, zero
-	ldloc 7
-	stloc.2
-// 0x010716b8: 0x10716b8: jal   0x10c0898 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
+// 0x0107163c: 0x107163c: jal   0x106c3a8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__truncdfsf2_10c0898(int32,int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_SessionDetailsSave_106c3a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010716c0: 0x10716c0: lw    a0, 17652(s3)
-	ldloc 6
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 4413
-	add
-	ldelem.i4
+// 0x01071644: 0x1071644: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x010716c4: 0x10716c4: addu  s5, v0, zero
-	ldloc 5
-	stloc 15
-// 0x010716c8: 0x10716c8: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x01071648: 0x1071648: addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
+// 0x0107164c: 0x107164c: lui   v0, 0x0
+	ldc.i4.s 0
 	stloc 5
-// 0x010716cc: 0x10716cc: lw    s3, 23628(v0)
+// 0x01071650: 0x1071650: jal   0x1070e08 sw    zero, 15060(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5907
+	ldc.i4 3765
 	add
-	ldelem.i4
-	stloc 10
-// 0x010716d0: 0x10716d0: jal   0x10c09c0 sll   zero, zero, 0
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl84::SendAllMessagesTogether_1070e08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010716d8: 0x10716d8: lw    a3, 23884(s6)
-	ldloc 6
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldc.i4 5971
-	add
-	ldelem.i4
-	stloc 4
-// 0x010716dc: 0x10716dc: lw    a2, 23880(s6)
-	ldloc 6
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldc.i4 5970
+// 0x01071658: 0x1071658: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0107165c: 0x107165c: addiu a1, a1, -15256
+	ldloc.2
+	ldc.i4 -15256
 	add
-	ldelem.i4
-	stloc.3
-// 0x010716e0: 0x10716e0: addu  a1, v1, zero
-	ldloc 7
 	stloc.2
-// 0x010716e4: 0x10716e4: jal   0x10c0798 addu  a0, v0, zero
-	ldloc 5
+// 0x01071660: 0x1071660: jal   0x104fea8 addiu a0, zero, 10
+	ldc.i4.s 10
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010716ec: 0x10716ec: addu  a1, v1, zero
+L_1071668:
+// 0x01071668: 0x1071668: lw    ra, 28(sp)
+// 0x0107166c: 0x107166c: lw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 9
+// 0x01071670: 0x1071670: lw    s0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 8
+// 0x01071674: 0x1071674: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
-	stloc.2
-// 0x010716f0: 0x10716f0: jal   0x10c0898 addu  a0, v0, zero
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl143::__truncdfsf2_10c0898(int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ret
+}
+.method public static int32 OnAsyncOperationCompleted_At_107167c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 s0,int32[] mem,int32 ra)
+
+// local  6 is register v0
+// local  5 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x010716f8: 0x10716f8: lui   a0, 0x0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc.1
-// 0x010716fc: 0x10716fc: addu  a1, s3, zero
-	ldloc 10
-	stloc.2
-// 0x01071700: 0x1071700: addu  a2, s5, zero
-	ldloc 15
-	stloc.3
-// 0x01071704: 0x1071704: addiu a0, a0, 15152
-	ldloc.1
-	ldc.i4 15152
+	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107167c: 0x107167c: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.1
-// 0x01071708: 0x1071708: jal   0x1071440 addu  a3, v0, zero
-	ldloc 5
-	stloc 4
+	stloc.0
+// 0x01071680: 0x1071680: sw    s0, 16(sp)
+	ldloc 8
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x01071684: 0x1071684: sw    ra, 20(sp)
+// 0x01071688: 0x1071688: addu  s0, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl84::Realtime_DecodeRefreshRateMilliseconds_1071440(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
+// 0x0107168c: 0x107168c: bne   a1, zero, 0x10716ac lui   v1, 0x10000
+	ldloc.2
+	ldc.i4 65536
 	stloc 5
+	brtrue L_10716ac
 // --- basic block ---
-// 0x01071710: 0x1071710: div   v0, s0
-	ldloc 5
-	ldloc 11
-	div
-	stloc 8
-// 0x01071714: 0x1071714: lui   a3, 0x10000
+// 0x01071694: 0x1071694: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01071718: 0x1071718: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 7
-// 0x0107171c: 0x107171c: addiu a1, s2, 20732
-	ldloc 12
-	ldc.i4 20732
+// 0x01071698: 0x1071698: addiu a1, v1, 21196
+	ldloc 5
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071720: 0x1071720: addiu a3, a3, 31196
+// 0x0107169c: 0x107169c: addiu a3, a3, 30444
 	ldloc 4
-	ldc.i4 31196
+	ldc.i4 30444
 	add
 	stloc 4
-// 0x01071724: 0x1071724: addiu a0, zero, 1
+// 0x010716a0: 0x10716a0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01071728: 0x1071728: addiu a2, zero, 448
-	ldc.i4 448
+// 0x010716a4: 0x10716a4: j	 0x10716c0 addiu a2, zero, 1577
+	ldc.i4 1577
 	stloc.3
-// 0x0107172c: 0x107172c: mflo  lo
-	ldloc 8
-	stloc 5
-// 0x01071730: 0x1071730: sw    v0, 17656(v1)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 4414
-	add
+	br L_10716c0
+// --- basic block ---
+L_10716ac:
+// 0x010716ac: 0x10716ac: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010716b0: 0x10716b0: addiu a1, v1, 21196
 	ldloc 5
-	stelem.i4
-// 0x01071734: 0x1071734: jal   0x100449c sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4 21196
 	add
-	ldloc 5
-	stelem.i4
+	stloc.2
+// 0x010716b4: 0x10716b4: addiu a3, a3, 30500
+	ldloc 4
+	ldc.i4 30500
+	add
+	stloc 4
+// 0x010716b8: 0x10716b8: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010716bc: 0x10716bc: addiu a2, zero, 1579
+	ldc.i4 1579
+	stloc.3
+L_10716c0:
+// 0x010716c0: 0x10716c0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6222,84 +5882,47 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x0107173c: 0x107173c: lui   a0, 0x0
+// 0x010716c8: 0x10716c8: jal   0x1070724 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01071740: 0x1071740: addu  a1, s3, zero
-	ldloc 10
-	stloc.2
-// 0x01071744: 0x1071744: addu  a2, s5, zero
-	ldloc 15
-	stloc.3
-// 0x01071748: 0x1071748: addu  a3, s4, zero
-	ldloc 14
-	stloc 4
-// 0x0107174c: 0x107174c: jal   0x1071440 addiu a0, a0, 15184
-	ldloc.1
-	ldc.i4 15184
-	add
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::Realtime_DecodeRefreshRateMilliseconds_1071440(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::SendMessage_MapDisplyed_1070724(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x01071754: 0x1071754: div   v0, s0
-	ldloc 5
-	ldloc 11
-	div
-	stloc 8
-// 0x01071758: 0x1071758: lui   a3, 0x10000
+// 0x010716d0: 0x10716d0: beq   v0, zero, 0x10716f8 lui   v1, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc 5
+	brfalse L_10716f8
+// --- basic block ---
+// 0x010716d8: 0x10716d8: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0107175c: 0x107175c: addiu a1, s2, 20732
-	ldloc 12
-	ldc.i4 20732
+// 0x010716dc: 0x10716dc: addiu a1, v1, 21196
+	ldloc 5
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071760: 0x1071760: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 7
-// 0x01071764: 0x1071764: addiu a3, a3, 31236
+// 0x010716e0: 0x10716e0: addiu a3, a3, 30592
 	ldloc 4
-	ldc.i4 31236
+	ldc.i4 30592
 	add
 	stloc 4
-// 0x01071768: 0x1071768: addiu a0, zero, 1
+// 0x010716e4: 0x10716e4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107176c: 0x107176c: addiu a2, zero, 455
-	ldc.i4 455
+// 0x010716e8: 0x10716e8: jal   0x100449c addiu a2, zero, 1582
+	ldc.i4 1582
 	stloc.3
-// 0x01071770: 0x1071770: mflo  lo
-	ldloc 8
-	stloc 5
-// 0x01071774: 0x1071774: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x01071778: 0x1071778: jal   0x100449c sw    v0, 17644(v1)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 4411
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6307,108 +5930,103 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x01071780: 0x1071780: lw    ra, 52(sp)
-// 0x01071784: 0x1071784: addu  v0, s1, zero
-	ldloc 9
-	stloc 5
-// 0x01071788: 0x1071788: lw    s6, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107178c: 0x107178c: lw    s5, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 15
-// 0x01071790: 0x1071790: lw    s4, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+// 0x010716f0: 0x10716f0: j	 0x107171c sll   zero, zero, 0
+	br L_107171c
+// --- basic block ---
+L_10716f8:
+// 0x010716f8: 0x10716f8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010716fc: 0x10716fc: addiu a1, v1, 21196
+	ldloc 5
+	ldc.i4 21196
 	add
-	ldelem.i4
-	stloc 14
-// 0x01071794: 0x1071794: lw    s3, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	stloc.2
+// 0x01071700: 0x1071700: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01071704: 0x1071704: addiu a3, a3, 30652
+	ldloc 4
+	ldc.i4 30652
 	add
-	ldelem.i4
-	stloc 10
-// 0x01071798: 0x1071798: lw    s2, 32(sp)
-	ldloc 6
+	stloc 4
+// 0x01071708: 0x1071708: jal   0x100449c addiu a2, zero, 1585
+	ldc.i4 1585
+	stloc.3
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 6
+// --- basic block ---
+// 0x01071710: 0x1071710: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x01071714: 0x1071714: jal   0x106f394 addiu a1, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107179c: 0x107179c: lw    s1, 28(sp)
-	ldloc 6
+	stloc.2
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 9
-// 0x010717a0: 0x10717a0: lw    s0, 24(sp)
-	ldloc 6
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 6
+// --- basic block ---
+L_107171c:
+// 0x0107171c: 0x107171c: lw    ra, 20(sp)
+// 0x01071720: 0x1071720: lw    s0, 16(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 11
-// 0x010717a4: 0x10717a4: jr    ra addiu sp, sp, 56
+	stloc 7
+// 0x01071724: 0x1071724: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
-.method public static int32 Realtime_Start_10717ac(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_SetVisability_107172c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
 // local  0 is register sp
-// local  9 is register ra
-// local  7 is register mem
+// local 11 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6419,35 +6037,43 @@ __CIBYL_function_return:
 	stloc 4
 	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010717ac: 0x10717ac: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x010717b0: 0x10717b0: lw    v0, 17556(v0)
-	ldloc 7
-	ldloc 5
+// 0x0107172c: 0x107172c: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x01071730: 0x1071730: sw    s2, 24(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4389
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 5
-// 0x010717b4: 0x10717b4: addiu sp, sp, -24
+	ldloc 10
+	stelem.i4
+// 0x01071734: 0x1071734: sw    s1, 20(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.0
-// 0x010717b8: 0x10717b8: sw    ra, 20(sp)
-// 0x010717bc: 0x10717bc: beq   v0, zero, 0x1071850 sw    s0, 16(sp)
-	ldloc 5
-	ldloc 7
+	ldloc 9
+	stelem.i4
+// 0x01071738: 0x1071738: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6455,203 +6081,216 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_1071850
-// --- basic block ---
-// 0x010717c4: 0x10717c4: lui   s0, 0x70000
-	ldc.i4 458752
+// 0x0107173c: 0x107173c: sw    ra, 28(sp)
+// 0x01071740: 0x1071740: addu  s2, a1, zero
+	ldloc.2
+	stloc 10
+// 0x01071744: 0x1071744: addu  s1, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01071748: 0x1071748: beq   a1, zero, 0x107177c lui   s0, 0x10000
+	ldloc.2
+	ldc.i4 65536
 	stloc 8
-// 0x010717c8: 0x10717c8: lw    v0, 17564(s0)
-	ldloc 7
+	brfalse L_107177c
+// --- basic block ---
+// 0x01071750: 0x1071750: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071754: 0x1071754: addiu a1, s0, 21196
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
+	ldc.i4 21196
 	add
-	ldelem.i4
-	stloc 5
-// 0x010717cc: 0x10717cc: sll   zero, zero, 0
-// 0x010717d0: 0x10717d0: bne   v0, zero, 0x1071850 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1071850
-// --- basic block ---
-// 0x010717d8: 0x10717d8: jal   0x106ec00 addu  a0, zero, zero
-	ldc.i4.s 0
+	stloc.2
+// 0x01071758: 0x1071758: addiu a3, a3, 30720
+	ldloc 4
+	ldc.i4 30720
+	add
+	stloc 4
+// 0x0107175c: 0x107175c: addiu a2, zero, 1653
+	ldc.i4 1653
+	stloc.3
+// 0x01071760: 0x1071760: jal   0x100449c addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::Realtime_FullReset_106ec00(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010717e0: 0x10717e0: jal   0x107980c sll   zero, zero, 0
+// 0x01071768: 0x1071768: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x0107176c: 0x107176c: jal   0x106f394 addu  a1, s2, zero
+	ldloc 10
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Term_107980c(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010717e8: 0x10717e8: jal   0x107b894 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::RTAlerts_Init_107b894(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+// 0x01071774: 0x1071774: j	 0x10717e8 sll   zero, zero, 0
+	br L_10717e8
 // --- basic block ---
-// 0x010717f0: 0x10717f0: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x010717f4: 0x10717f4: sw    zero, 17724(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4431
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x010717f8: 0x10717f8: addiu v0, zero, 1
+L_107177c:
+// 0x0107177c: 0x107177c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071780: 0x1071780: addiu a0, zero, 1
 	ldc.i4.1
-	stloc 5
-// 0x010717fc: 0x10717fc: jal   0x1071588 sw    v0, 17564(s0)
-	ldloc 7
+	stloc.1
+// 0x01071784: 0x1071784: addiu a1, s0, 21196
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
+	ldc.i4 21196
 	add
-	ldloc 5
-	stelem.i4
+	stloc.2
+// 0x01071788: 0x1071788: addiu a3, a3, 30796
+	ldloc 4
+	ldc.i4 30796
+	add
+	stloc 4
+// 0x0107178c: 0x107178c: jal   0x100449c addiu a2, zero, 1658
+	ldc.i4 1658
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::Realtime_GetRefreshRateinMilliseconds_1071588(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071804: 0x1071804: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x01071808: 0x1071808: addu  a0, v0, zero
-	ldloc 5
+// 0x01071794: 0x1071794: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0107180c: 0x107180c: jal   0x104fe98 addiu a1, a1, 3192
-	ldloc.2
-	ldc.i4 3192
-	add
+// 0x01071798: 0x1071798: jal   0x106e8e8 addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_At_106e8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071814: 0x1071814: jal   0x1071500 sll   zero, zero, 0
+// 0x010717a0: 0x10717a0: beq   v0, zero, 0x10717c8 lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brfalse L_10717c8
+// --- basic block ---
+// 0x010717a8: 0x10717a8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010717ac: 0x10717ac: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x010717b0: 0x10717b0: addiu a3, a3, 30856
+	ldloc 4
+	ldc.i4 30856
+	add
+	stloc 4
+// 0x010717b4: 0x10717b4: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010717b8: 0x10717b8: jal   0x100449c addiu a2, zero, 1662
+	ldc.i4 1662
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::Realtime_GetKeepALiveRateRateinMilliseconds_1071500(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107181c: 0x107181c: lui   a1, 0x1070000
-	ldc.i4 17235968
+// 0x010717c0: 0x10717c0: j	 0x10717e8 sll   zero, zero, 0
+	br L_10717e8
+// --- basic block ---
+L_10717c8:
+// 0x010717c8: 0x10717c8: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
 	stloc.2
-// 0x01071820: 0x1071820: addu  a0, v0, zero
-	ldloc 5
+// 0x010717cc: 0x10717cc: addiu a0, zero, 3
+	ldc.i4.3
 	stloc.1
-// 0x01071824: 0x1071824: jal   0x104fe98 addiu a1, a1, -9944
-	ldloc.2
-	ldc.i4 -9944
+// 0x010717d0: 0x10717d0: addiu a3, a3, 30924
+	ldloc 4
+	ldc.i4 30924
 	add
-	stloc.2
+	stloc 4
+// 0x010717d4: 0x10717d4: jal   0x100449c addiu a2, zero, 1665
+	ldc.i4 1665
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107182c: 0x107182c: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x01071830: 0x1071830: jal   0x101f84c addiu a0, a0, -17320
-	ldloc.1
-	ldc.i4 -17320
-	add
+// 0x010717dc: 0x10717dc: addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-	ldloc.1
-	call int32 Cibyl23::roadmap_screen_subscribe_after_flow_control_refresh_101f84c(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01071838: 0x1071838: lui   v1, 0x70000
-	ldc.i4 458752
-	stloc 6
-// 0x0107183c: 0x107183c: jal   0x1070c78 sw    v0, 17600(v1)
-	ldloc 7
-	ldloc 6
+// 0x010717e0: 0x10717e0: jal   0x107167c addiu a1, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4 4400
-	add
-	ldloc 5
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::OnTimer_Realtime_1070c78(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::OnAsyncOperationCompleted_At_107167c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071844: 0x1071844: lw    v0, 17564(s0)
-	ldloc 7
-	ldloc 8
+L_10717e8:
+// 0x010717e8: 0x10717e8: lw    ra, 28(sp)
+// 0x010717ec: 0x10717ec: lw    s2, 24(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4391
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x01071848: 0x1071848: j	 0x1071854 sll   zero, zero, 0
-	br L_1071854
-// --- basic block ---
-L_1071850:
-// 0x01071850: 0x1071850: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_1071854:
-// 0x01071854: 0x1071854: lw    ra, 20(sp)
-// 0x01071858: 0x1071858: lw    s0, 16(sp)
-	ldloc 7
+	stloc 10
+// 0x010717f0: 0x10717f0: lw    s1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 9
+// 0x010717f4: 0x10717f4: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6659,14 +6298,14 @@ L_1071854:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107185c: 0x107185c: jr    ra addiu sp, sp, 24
+// 0x010717f8: 0x10717f8: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
diff --git a/converted/Cibyl85.j b/converted/Cibyl85.j
index 0eb7aa6..5ce9b8e 100644
--- a/converted/Cibyl85.j
+++ b/converted/Cibyl85.j
@@ -41,10 +41,10 @@
     IL_0006:  ret
   } // end of method Cibyl85::.ctor
 
-.method public static int32 OnDeviceEvent_1071864(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_AlertReport_1071800(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -52,12 +52,11 @@
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local  8 is register s1
+// local  8 is register s0
+// local  9 is register s1
 // local 10 is register s2
-// local 11 is register s3
 // local  0 is register sp
-// local 12 is register ra
+// local 11 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -73,122 +72,83 @@
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldc.i4.s 0
-	stloc 11
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01071864: 0x1071864: addiu sp, sp, -48
+// 0x01071800: 0x1071800: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01071868: 0x1071868: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-// 0x0107186c: 0x107186c: sw    ra, 44(sp)
-// 0x01071870: 0x1071870: sw    s1, 32(sp)
+// 0x01071804: 0x1071804: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-// 0x01071874: 0x1071874: sw    s0, 28(sp)
+// 0x01071808: 0x1071808: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
 	ldloc 9
 	stelem.i4
-// 0x01071878: 0x1071878: sw    s3, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 11
-	stelem.i4
-// 0x0107187c: 0x107187c: sw    s2, 36(sp)
+// 0x0107180c: 0x107180c: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.4
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01071880: 0x1071880: lw    s0, 17588(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4397
-	add
-	ldelem.i4
-	stloc 9
-// 0x01071884: 0x1071884: jal   0x103fffc addu  s1, a0, zero
+// 0x01071810: 0x1071810: sw    ra, 28(sp)
+// 0x01071814: 0x1071814: addu  s2, a1, zero
+	ldloc.2
+	stloc 10
+// 0x01071818: 0x1071818: addu  s1, a0, zero
 	ldloc.1
+	stloc 9
+// 0x0107181c: 0x107181c: beq   a1, zero, 0x1071848 lui   s0, 0x10000
+	ldloc.2
+	ldc.i4 65536
 	stloc 8
-	ldloc.1
-	call int32 Cibyl47::get_device_event_name_103fffc(int32)
-	stloc 5
+	brfalse L_1071848
 // --- basic block ---
-// 0x0107188c: 0x107188c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01071890: 0x1071890: lui   a3, 0x10000
+// 0x01071824: 0x1071824: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x01071894: 0x1071894: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
+// 0x01071828: 0x1071828: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071898: 0x1071898: addiu a3, a3, 31276
+// 0x0107182c: 0x107182c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01071830: 0x1071830: addiu a3, a3, 31004
 	ldloc 4
-	ldc.i4 31276
+	ldc.i4 31004
 	add
 	stloc 4
-// 0x0107189c: 0x107189c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x010718a0: 0x10718a0: addiu a2, zero, 3633
-	ldc.i4 3633
+// 0x01071834: 0x1071834: jal   0x100449c addiu a2, zero, 1493
+	ldc.i4 1493
 	stloc.3
-// 0x010718a4: 0x10718a4: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x010718a8: 0x10718a8: jal   0x100449c sw    s1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -199,106 +159,33 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010718b0: 0x10718b0: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x010718b4: 0x10718b4: beq   s1, v0, 0x10718cc addiu v0, zero, 3
-	ldloc 8
-	ldloc 5
-	ldc.i4.3
-	stloc 5
-	beq  L_10718cc
-// --- basic block ---
-// 0x010718bc: 0x10718bc: beq   s1, v0, 0x10718d4 addiu v0, zero, 6
-	ldloc 8
-	ldloc 5
-	ldc.i4.6
-	stloc 5
-	beq  L_10718d4
-// --- basic block ---
-// 0x010718c4: 0x10718c4: bne   s1, v0, 0x10718dc lui   v0, 0x70000
-	ldloc 8
-	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	bne.un L_10718dc
-// --- basic block ---
-L_10718cc:
-// 0x010718cc: 0x10718cc: j	 0x10718d8 addiu s0, zero, 1
-	ldc.i4.1
-	stloc 9
-	br L_10718d8
-// --- basic block ---
-L_10718d4:
-// 0x010718d4: 0x10718d4: addiu s0, zero, 2
-	ldc.i4.2
-	stloc 9
-L_10718d8:
-// 0x010718d8: 0x10718d8: lui   v0, 0x70000
-	ldc.i4 458752
-	stloc 5
-L_10718dc:
-// 0x010718dc: 0x10718dc: lw    v1, 17588(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4397
-	add
-	ldelem.i4
-	stloc 7
-// 0x010718e0: 0x10718e0: sll   zero, zero, 0
-// 0x010718e4: 0x10718e4: bne   s0, v1, 0x1071928 addiu s3, zero, 1
-	ldloc 9
-	ldloc 7
-	ldc.i4.1
-	stloc 11
-	bne.un L_1071928
-// --- basic block ---
-// 0x010718ec: 0x10718ec: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x010718f0: 0x10718f0: bne   s0, v0, 0x1071a40 lui   v0, 0x70000
+// 0x0107183c: 0x107183c: addu  a0, s1, zero
 	ldloc 9
-	ldloc 5
-	ldc.i4 458752
-	stloc 5
-	bne.un L_1071a40
-// --- basic block ---
-// 0x010718f8: 0x10718f8: lw    v0, 17592(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 4398
-	add
-	ldelem.i4
-	stloc 5
-// 0x010718fc: 0x10718fc: sll   zero, zero, 0
-// 0x01071900: 0x1071900: bne   v0, zero, 0x1071a40 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
+	stloc.1
+// 0x01071840: 0x1071840: j	 0x10718c8 addu  a1, s2, zero
+	ldloc 10
 	stloc.2
-	brtrue L_1071a40
+	br L_10718c8
 // --- basic block ---
-// 0x01071908: 0x1071908: lui   a3, 0x10000
+L_1071848:
+// 0x01071848: 0x1071848: lui   a3, 0x10000
 	ldc.i4 65536
 	stloc 4
-// 0x0107190c: 0x107190c: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071910: 0x1071910: addiu a3, a3, 31312
+// 0x0107184c: 0x107184c: addiu a3, a3, 31076
 	ldloc 4
-	ldc.i4 31312
+	ldc.i4 31076
 	add
 	stloc 4
-// 0x01071914: 0x1071914: addiu a0, zero, 1
+// 0x01071850: 0x1071850: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01071918: 0x1071918: jal   0x100449c addiu a2, zero, 3655
-	ldc.i4 3655
+// 0x01071854: 0x1071854: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071858: 0x1071858: jal   0x100449c addiu a2, zero, 1498
+	ldc.i4 1498
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -310,89 +197,73 @@ L_10718dc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071920: 0x1071920: j	 0x1071a38 sll   zero, zero, 0
-	br L_1071a38
-// --- basic block ---
-L_1071928:
-// 0x01071928: 0x1071928: sw    s0, 17588(v0)
+// 0x01071860: 0x1071860: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01071864: 0x1071864: lw    v0, -18596(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 4397
+	ldc.i4 -4649
 	add
+	ldelem.i4
+	stloc 5
+// 0x01071868: 0x1071868: sll   zero, zero, 0
+// 0x0107186c: 0x107186c: lw    v0, 28(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 5
+// 0x01071870: 0x1071870: sll   zero, zero, 0
+// 0x01071874: 0x1071874: blez  v0, 0x10718d8 addu  a0, s1, zero
+	ldloc 5
 	ldloc 9
-	stelem.i4
-// 0x0107192c: 0x107192c: lui   s2, 0x10000
-	ldc.i4 65536
-	stloc 10
-// 0x01071930: 0x1071930: beq   s0, s3, 0x1071984 lui   s1, 0x70000
-	ldloc 9
-	ldloc 11
-	ldc.i4 458752
-	stloc 8
-	beq  L_1071984
+	stloc.1
+	ldc.i4.s 0
+	ble L_10718d8
 // --- basic block ---
-// 0x01071938: 0x1071938: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x0107193c: 0x107193c: addiu a3, a3, 31392
-	ldloc 4
-	ldc.i4 31392
-	add
-	stloc 4
-// 0x01071940: 0x1071940: addiu a0, zero, 1
-	ldc.i4.1
+// 0x0107187c: 0x107187c: jal   0x106eab0 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x01071944: 0x1071944: addiu a1, s2, 20732
-	ldloc 10
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071948: 0x1071948: jal   0x100449c addiu a2, zero, 3668
-	ldc.i4 3668
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_CreateNewRoads_106eab0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071950: 0x1071950: lw    v0, 17596(s1)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 4399
-	add
-	ldelem.i4
-	stloc 5
-// 0x01071954: 0x1071954: sll   zero, zero, 0
-// 0x01071958: 0x1071958: bne   v0, zero, 0x1071a40 lui   a3, 0x10000
+// 0x01071884: 0x1071884: beq   v0, zero, 0x10718ac lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_1071a40
+	brfalse L_10718ac
 // --- basic block ---
-// 0x01071960: 0x1071960: addiu a1, s2, 20732
-	ldloc 10
-	ldc.i4 20732
+// 0x0107188c: 0x107188c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071890: 0x1071890: addiu a1, s0, 21196
+	ldloc 8
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071964: 0x1071964: addiu a3, a3, 31436
+// 0x01071894: 0x1071894: addiu a3, a3, 31144
 	ldloc 4
-	ldc.i4 31436
+	ldc.i4 31144
 	add
 	stloc 4
-// 0x01071968: 0x1071968: addiu a0, zero, 2
-	ldc.i4.2
+// 0x01071898: 0x1071898: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0107196c: 0x107196c: jal   0x100449c addiu a2, zero, 3672
-	ldc.i4 3672
+// 0x0107189c: 0x107189c: jal   0x100449c addiu a2, zero, 1503
+	ldc.i4 1503
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -404,49 +275,25 @@ L_1071928:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071974: 0x1071974: jal   0x106ec78 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::Realtime_Stop_106ec78(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+// 0x010718a4: 0x10718a4: j	 0x10718e0 sll   zero, zero, 0
+	br L_10718e0
 // --- basic block ---
-// 0x0107197c: 0x107197c: j	 0x1071a40 sw    s3, 17596(s1)
-	ldloc 6
+L_10718ac:
+// 0x010718ac: 0x10718ac: addiu a1, s0, 21196
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 4399
+	ldc.i4 21196
 	add
-	ldloc 11
-	stelem.i4
-	br L_1071a40
-// --- basic block ---
-L_1071984:
-// 0x01071984: 0x1071984: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071988: 0x1071988: addiu a3, a3, 31528
+	stloc.2
+// 0x010718b0: 0x10718b0: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010718b4: 0x10718b4: addiu a3, a3, 31216
 	ldloc 4
-	ldc.i4 31528
+	ldc.i4 31216
 	add
 	stloc 4
-// 0x0107198c: 0x107198c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071990: 0x1071990: addiu a1, s2, 20732
-	ldloc 10
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071994: 0x1071994: jal   0x100449c addiu a2, zero, 3680
-	ldc.i4 3680
+// 0x010718b8: 0x10718b8: jal   0x100449c addiu a2, zero, 1506
+	ldc.i4 1506
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -458,233 +305,73 @@ L_1071984:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107199c: 0x107199c: lw    v0, 17596(s1)
-	ldloc 6
-	ldloc 8
+// 0x010718c0: 0x10718c0: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x010718c4: 0x10718c4: addiu a1, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4 4399
-	add
-	ldelem.i4
-	stloc 5
-// 0x010719a0: 0x10719a0: sll   zero, zero, 0
-// 0x010719a4: 0x10719a4: beq   v0, zero, 0x10719d4 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brfalse L_10719d4
-// --- basic block ---
-// 0x010719ac: 0x10719ac: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010719b0: 0x10719b0: addiu a1, s2, 20732
-	ldloc 10
-	ldc.i4 20732
-	add
 	stloc.2
-// 0x010719b4: 0x10719b4: addiu a3, a3, 31568
-	ldloc 4
-	ldc.i4 31568
-	add
-	stloc 4
-// 0x010719b8: 0x10719b8: addiu a0, zero, 2
-	ldc.i4.2
-	stloc.1
-// 0x010719bc: 0x10719bc: jal   0x100449c addiu a2, zero, 3684
-	ldc.i4 3684
-	stloc.3
+L_10718c8:
+// 0x010718c8: 0x10718c8: jal   0x106f394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010719c4: 0x10719c4: jal   0x10717ac sll   zero, zero, 0
+// 0x010718d0: 0x10718d0: j	 0x10718e0 sll   zero, zero, 0
+	br L_10718e0
+// --- basic block ---
+L_10718d8:
+// 0x010718d8: 0x10718d8: jal   0x1070530 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::Realtime_Start_10717ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl84::OnAsyncOperationCompleted_CreateNewRoads_1070530(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010719cc: 0x10719cc: j	 0x1071a40 sw    zero, 17596(s1)
+L_10718e0:
+// 0x010718e0: 0x10718e0: lw    ra, 28(sp)
+// 0x010718e4: 0x10718e4: lw    s2, 24(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4399
+	ldc.i4.6
 	add
-	ldc.i4.s 0
-	stelem.i4
-	br L_1071a40
-// --- basic block ---
-L_10719d4:
-// 0x010719d4: 0x10719d4: lw    v1, -19120(v0)
+	ldelem.i4
+	stloc 10
+// 0x010718e8: 0x10718e8: lw    s1, 20(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4780
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 7
-// 0x010719d8: 0x10719d8: sll   zero, zero, 0
-// 0x010719dc: 0x10719dc: bne   v1, zero, 0x1071a40 sll   zero, zero, 0
-	ldloc 7
-	brtrue L_1071a40
-// --- basic block ---
-// 0x010719e4: 0x10719e4: cibyl_sysc_arg 0x3
-	ldloc 7
-// 0x010719e8: 0x10719e8: cibyl_sysc 0x2116
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x010719ec: 0x10719ec: addu  v1, v0, zero
-	ldloc 5
-	stloc 7
-// 0x010719f0: 0x10719f0: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x010719f4: 0x10719f4: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x010719f8: 0x10719f8: lw    v0, -19072(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4768
-	add
-	ldelem.i4
-	stloc 5
-// 0x010719fc: 0x10719fc: lw    a0, 17592(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 4398
-	add
-	ldelem.i4
-	stloc.1
-// 0x01071a00: 0x1071a00: sll   zero, zero, 0
-// 0x01071a04: 0x1071a04: beq   a0, zero, 0x1071a18 subu  v0, v1, v0
-	ldloc.1
-	ldloc 7
-	ldloc 5
-	sub
-	stloc 5
-	brfalse L_1071a18
-// --- basic block ---
-// 0x01071a0c: 0x1071a0c: slti  v1, v0, 3601
-	ldloc 5
-	ldc.i4 3601
-	clt
-	stloc 7
-// 0x01071a10: 0x1071a10: bne   v1, zero, 0x1071a40 sll   zero, zero, 0
-	ldloc 7
-	brtrue L_1071a40
-// --- basic block ---
-L_1071a18:
-// 0x01071a18: 0x1071a18: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01071a1c: 0x1071a1c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071a20: 0x1071a20: addiu a1, a1, 20732
-	ldloc.2
-	ldc.i4 20732
-	add
-	stloc.2
-// 0x01071a24: 0x1071a24: addiu a3, a3, 31624
-	ldloc 4
-	ldc.i4 31624
-	add
-	stloc 4
-// 0x01071a28: 0x1071a28: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01071a2c: 0x1071a2c: addiu a2, zero, 3698
-	ldc.i4 3698
-	stloc.3
-// 0x01071a30: 0x1071a30: jal   0x100449c sw    v0, 16(sp)
+	stloc 9
+// 0x010718ec: 0x10718ec: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_1071a38:
-// 0x01071a38: 0x1071a38: jal   0x1070c78 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl84::OnTimer_Realtime_1070c78(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_1071a40:
-// 0x01071a40: 0x1071a40: lw    ra, 44(sp)
-// 0x01071a44: 0x1071a44: lw    s3, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 11
-// 0x01071a48: 0x1071a48: lw    s2, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 10
-// 0x01071a4c: 0x1071a4c: lw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
 	ldelem.i4
 	stloc 8
-// 0x01071a50: 0x1071a50: lw    s0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 9
-// 0x01071a54: 0x1071a54: jr    ra addiu sp, sp, 48
+// 0x010718f0: 0x10718f0: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -694,25 +381,27 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnSettingsChanged_EnableDisable_1071a5c(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_KeepAlive_10718f8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  9 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
 // local  8 is register ra
-// local  7 is register mem
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldc.i4.s 0
-	stloc 6
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -721,134 +410,152 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01071a5c: 0x1071a5c: addiu sp, sp, -24
+// 0x010718f8: 0x10718f8: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01071a60: 0x1071a60: sw    ra, 20(sp)
-// 0x01071a64: 0x1071a64: jal   0x106ad10 sll   zero, zero, 0
+// 0x010718fc: 0x10718fc: sw    s1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 7
+	stelem.i4
+// 0x01071900: 0x1071900: sw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 6
+	stelem.i4
+// 0x01071904: 0x1071904: sw    ra, 28(sp)
+// 0x01071908: 0x1071908: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x0107190c: 0x107190c: beq   a1, zero, 0x1071930 addu  s1, a0, zero
+	ldloc.2
+	ldloc.1
+	stloc 7
+	brfalse L_1071930
+// --- basic block ---
+// 0x01071914: 0x1071914: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01071918: 0x1071918: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0107191c: 0x107191c: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071920: 0x1071920: addiu a3, a3, 31296
+	ldloc 4
+	ldc.i4 31296
+	add
+	stloc 4
+// 0x01071924: 0x1071924: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01071928: 0x1071928: jal   0x100449c addiu a2, zero, 1187
+	ldc.i4 1187
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::GetEnableDisableState_106ad10(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01071a6c: 0x1071a6c: beq   v0, zero, 0x1071a94 lui   v1, 0x70000
-	ldloc 5
-	ldc.i4 458752
-	stloc 6
-	brfalse L_1071a94
+	stloc 10
+	stloc 9
 // --- basic block ---
-// 0x01071a74: 0x1071a74: lw    v0, 17564(v1)
+L_1071930:
+// 0x01071930: 0x1071930: addu  a0, s1, zero
 	ldloc 7
+	stloc.1
+// 0x01071934: 0x1071934: jal   0x106f394 addu  a1, s0, zero
 	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 4391
-	add
-	ldelem.i4
-	stloc 5
-// 0x01071a78: 0x1071a78: sll   zero, zero, 0
-// 0x01071a7c: 0x1071a7c: bne   v0, zero, 0x1071aac sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1071aac
-// --- basic block ---
-// 0x01071a84: 0x1071a84: jal   0x10717ac sll   zero, zero, 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl84::Realtime_Start_10717ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01071a8c: 0x1071a8c: j	 0x1071aac sll   zero, zero, 0
-	br L_1071aac
+	stloc 10
+	stloc 9
 // --- basic block ---
-L_1071a94:
-// 0x01071a94: 0x1071a94: lw    v0, 17564(v1)
-	ldloc 7
-	ldloc 6
+// 0x0107193c: 0x107193c: lw    ra, 28(sp)
+// 0x01071940: 0x1071940: lw    s1, 24(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 4391
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x01071a98: 0x1071a98: sll   zero, zero, 0
-// 0x01071a9c: 0x1071a9c: beq   v0, zero, 0x1071aac sll   zero, zero, 0
+	stloc 7
+// 0x01071944: 0x1071944: lw    s0, 20(sp)
 	ldloc 5
-	brfalse L_1071aac
-// --- basic block ---
-// 0x01071aa4: 0x1071aa4: jal   0x106ec78 addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl82::Realtime_Stop_106ec78(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
 	stloc 6
-	stloc 5
-// --- basic block ---
-L_1071aac:
-// 0x01071aac: 0x1071aac: lw    ra, 20(sp)
-// 0x01071ab0: 0x1071ab0: sll   zero, zero, 0
-// 0x01071ab4: 0x1071ab4: jr    ra addiu sp, sp, 24
+// 0x01071948: 0x1071948: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 9
 	ret
 }
-.method public static int32 Realtime_Initialize_1071abc(int32,int32,int32,int32,int32)
+.method public static int32 OnAsyncOperationCompleted_AllTogether_1071950(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s5,int32 s4,int32 s6,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 14 is register s3
-// local 12 is register s4
-// local 11 is register s5
-// local 13 is register s6
+// local  6 is register s0
+// local  7 is register s1
 // local  0 is register sp
-// local 15 is register ra
-// local  7 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldc.i4.s 0
-	stloc 6
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -858,314 +565,234 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 11
+	stloc 6
 	ldc.i4.s 0
-	stloc 13
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01071abc: 0x1071abc: addiu sp, sp, -64
+// 0x01071950: 0x1071950: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -64
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01071ac0: 0x1071ac0: sw    s3, 44(sp)
-	ldloc 7
+// 0x01071954: 0x1071954: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.6
 	add
-	ldloc 14
+	ldloc 7
 	stelem.i4
-// 0x01071ac4: 0x1071ac4: lui   s3, 0x70000
-	ldc.i4 458752
-	stloc 14
-// 0x01071ac8: 0x1071ac8: sw    s4, 48(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 12
-	stelem.i4
-// 0x01071acc: 0x1071acc: lw    s4, 17556(s3)
-	ldloc 7
-	ldloc 14
-	ldc.i4.2
-	shr.un
-	ldc.i4 4389
-	add
-	ldelem.i4
-	stloc 12
-// 0x01071ad0: 0x1071ad0: sw    ra, 60(sp)
-// 0x01071ad4: 0x1071ad4: sw    s6, 56(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 13
-	stelem.i4
-// 0x01071ad8: 0x1071ad8: sw    s5, 52(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 11
-	stelem.i4
-// 0x01071adc: 0x1071adc: sw    s2, 40(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 10
-	stelem.i4
-// 0x01071ae0: 0x1071ae0: sw    s1, 36(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 9
-	stelem.i4
-// 0x01071ae4: 0x1071ae4: bne   s4, zero, 0x1071e20 sw    s0, 32(sp)
-	ldloc 12
-	ldloc 7
+// 0x01071958: 0x1071958: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-	brtrue L_1071e20
+// 0x0107195c: 0x107195c: sw    ra, 28(sp)
+// 0x01071960: 0x1071960: addu  s0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x01071964: 0x1071964: beq   a1, zero, 0x1071988 addu  s1, a0, zero
+	ldloc.2
+	ldloc.1
+	stloc 7
+	brfalse L_1071988
 // --- basic block ---
-// 0x01071aec: 0x1071aec: lui   s0, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x01071af0: 0x1071af0: lui   s2, 0x10000
+// 0x0107196c: 0x107196c: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc 10
-// 0x01071af4: 0x1071af4: lui   a1, 0x0
-	ldc.i4.s 0
 	stloc.2
-// 0x01071af8: 0x1071af8: addiu a0, s0, -26888
-	ldloc 8
-	ldc.i4 -26888
-	add
-	stloc.1
-// 0x01071afc: 0x1071afc: addiu a2, s2, 18500
-	ldloc 10
-	ldc.i4 18500
-	add
-	stloc.3
-// 0x01071b00: 0x1071b00: addu  a3, zero, zero
-	ldc.i4.s 0
+// 0x01071970: 0x1071970: lui   a3, 0x10000
+	ldc.i4 65536
 	stloc 4
-// 0x01071b04: 0x1071b04: jal   0x100edb0 addiu a1, a1, 18684
+// 0x01071974: 0x1071974: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 18684
+	ldc.i4 21196
 	add
 	stloc.2
+// 0x01071978: 0x1071978: addiu a3, a3, 31384
+	ldloc 4
+	ldc.i4 31384
+	add
+	stloc 4
+// 0x0107197c: 0x107197c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01071980: 0x1071980: jal   0x100449c addiu a2, zero, 1177
+	ldc.i4 1177
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01071b0c: 0x1071b0c: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071b10: 0x1071b10: addiu a0, s0, -26888
-	ldloc 8
-	ldc.i4 -26888
-	add
+L_1071988:
+// 0x01071988: 0x1071988: jal   0x10b3718 sltiu a0, s0, 1
+	ldloc 6
+	ldc.i4.1
+	clt.un
 	stloc.1
-// 0x01071b14: 0x1071b14: addiu a2, s2, 18500
-	ldloc 10
-	ldc.i4 18500
-	add
-	stloc.3
-// 0x01071b18: 0x1071b18: jal   0x100ed70 addiu a1, a1, 18700
-	ldloc.2
-	ldc.i4 18700
-	add
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_password_100ed70(int32,int32,int32,int32,int32)
+	call int32 Cibyl133::editor_track_report_conclude_export_10b3718(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01071b20: 0x1071b20: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071b24: 0x1071b24: addiu a0, s0, -26888
-	ldloc 8
-	ldc.i4 -26888
-	add
+// 0x01071990: 0x1071990: addu  a0, s1, zero
+	ldloc 7
 	stloc.1
-// 0x01071b28: 0x1071b28: addiu a2, s2, 18500
-	ldloc 10
-	ldc.i4 18500
-	add
-	stloc.3
-// 0x01071b2c: 0x1071b2c: addiu a1, a1, 18668
-	ldloc.2
-	ldc.i4 18668
-	add
+// 0x01071994: 0x1071994: jal   0x106f394 addu  a1, s0, zero
+	ldloc 6
 	stloc.2
-// 0x01071b30: 0x1071b30: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x01071b34: 0x1071b34: jal   0x100edb0 lui   s1, 0x10000
-	ldc.i4 65536
-	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl83::OnTransactionCompleted_106f394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01071b3c: 0x1071b3c: lui   s5, 0x0
-	ldc.i4.s 0
-	stloc 11
-// 0x01071b40: 0x1071b40: lui   s6, 0x0
-	ldc.i4.s 0
-	stloc 13
-// 0x01071b44: 0x1071b44: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071b48: 0x1071b48: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x01071b4c: 0x1071b4c: addiu s6, s6, 31272
-	ldloc 13
-	ldc.i4 31272
-	add
-	stloc 13
-// 0x01071b50: 0x1071b50: addiu a0, s1, 12560
-	ldloc 9
-	ldc.i4 12560
-	add
-	stloc.1
-// 0x01071b54: 0x1071b54: addiu a3, s5, 21112
-	ldloc 11
-	ldc.i4 21112
-	add
-	stloc 4
-// 0x01071b58: 0x1071b58: addiu a1, a1, 15088
-	ldloc.2
-	ldc.i4 15088
-	add
-	stloc.2
-// 0x01071b5c: 0x1071b5c: addiu a2, a2, 6748
-	ldloc.3
-	ldc.i4 6748
-	add
-	stloc.3
-// 0x01071b60: 0x1071b60: sw    s6, 16(sp)
-	ldloc 7
+// 0x0107199c: 0x107199c: lw    ra, 28(sp)
+// 0x010719a0: 0x10719a0: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 13
-	stelem.i4
-// 0x01071b64: 0x1071b64: jal   0x100edf8 sw    zero, 20(sp)
-	ldloc 7
+	ldelem.i4
+	stloc 7
+// 0x010719a4: 0x10719a4: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
+	ldelem.i4
+	stloc 6
+// 0x010719a8: 0x10719a8: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 OnTransactionCompleted_LogoutAndStop_10719b0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  7 is register mem
+
 	ldc.i4.s 0
-	stelem.i4
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010719b0: 0x10719b0: addiu sp, sp, -24
 	ldloc.0
-	ldloc.1
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x010719b4: 0x10719b4: beq   a1, zero, 0x10719d8 sw    ra, 20(sp)
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	brfalse L_10719d8
 // --- basic block ---
-// 0x01071b6c: 0x1071b6c: lui   a1, 0x0
-	ldc.i4.s 0
+// 0x010719bc: 0x10719bc: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01071b70: 0x1071b70: addu  a3, s6, zero
-	ldloc 13
+// 0x010719c0: 0x10719c0: lui   a3, 0x10000
+	ldc.i4 65536
 	stloc 4
-// 0x01071b74: 0x1071b74: addiu a0, s1, 12560
-	ldloc 9
-	ldc.i4 12560
-	add
-	stloc.1
-// 0x01071b78: 0x1071b78: addiu a1, a1, 15104
+// 0x010719c4: 0x10719c4: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 15104
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071b7c: 0x1071b7c: addiu s5, s5, 21112
-	ldloc 11
-	ldc.i4 21112
+// 0x010719c8: 0x10719c8: addiu a3, a3, 31472
+	ldloc 4
+	ldc.i4 31472
 	add
-	stloc 11
-// 0x01071b80: 0x1071b80: addu  a2, zero, zero
-	ldc.i4.s 0
+	stloc 4
+// 0x010719cc: 0x10719cc: addiu a0, zero, 3
+	ldc.i4.3
+	stloc.1
+// 0x010719d0: 0x10719d0: jal   0x100449c addiu a2, zero, 720
+	ldc.i4 720
 	stloc.3
-// 0x01071b84: 0x1071b84: sw    s5, 16(sp)
-	ldloc 7
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 11
-	stelem.i4
-// 0x01071b88: 0x1071b88: jal   0x100edf8 sw    zero, 20(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+L_10719d8:
+// 0x010719d8: 0x10719d8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010719dc: 0x10719dc: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010719e0: 0x10719e0: jal   0x106f224 sw    zero, -18656(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 -4664
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -1174,971 +801,1384 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::Realtime_FullReset_106f224(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01071b90: 0x1071b90: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071b94: 0x1071b94: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01071b98: 0x1071b98: addiu a0, s1, 12560
-	ldloc 9
-	ldc.i4 12560
-	add
-	stloc.1
-// 0x01071b9c: 0x1071b9c: addiu a1, a1, 15120
-	ldloc.2
-	ldc.i4 15120
-	add
-	stloc.2
-// 0x01071ba0: 0x1071ba0: addiu a2, a2, 31712
-	ldloc.3
-	ldc.i4 31712
+// 0x010719e8: 0x10719e8: lw    ra, 20(sp)
+// 0x010719ec: 0x10719ec: sll   zero, zero, 0
+// 0x010719f0: 0x10719f0: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc.3
-// 0x01071ba4: 0x1071ba4: jal   0x100edb0 addu  a3, zero, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_DecodeRefreshRateMilliseconds_1071a64(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local 10 is register s1
+// local  9 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
 	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01071bac: 0x1071bac: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071bb0: 0x1071bb0: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01071bb4: 0x1071bb4: addiu a0, s1, 12560
-	ldloc 9
-	ldc.i4 12560
+// 0x01071a64: 0x1071a64: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
 	add
-	stloc.1
-// 0x01071bb8: 0x1071bb8: addiu a1, a1, 15136
-	ldloc.2
-	ldc.i4 15136
+	stloc.0
+// 0x01071a68: 0x1071a68: sw    s3, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.2
-// 0x01071bbc: 0x1071bbc: addiu a2, a2, 31716
-	ldloc.3
-	ldc.i4 31716
+	ldloc 11
+	stelem.i4
+// 0x01071a6c: 0x1071a6c: sw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.3
-// 0x01071bc0: 0x1071bc0: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
+	ldloc 10
+	stelem.i4
+// 0x01071a70: 0x1071a70: sw    s0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
+// 0x01071a74: 0x1071a74: sw    ra, 36(sp)
+// 0x01071a78: 0x1071a78: sw    s2, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 9
+	stelem.i4
+// 0x01071a7c: 0x1071a7c: addu  s0, a1, zero
+	ldloc.2
+	stloc 8
+// 0x01071a80: 0x1071a80: addu  s1, a2, zero
+	ldloc.3
+	stloc 10
+// 0x01071a84: 0x1071a84: jal   0x100e358 addu  s3, a3, zero
+	ldloc 4
+	stloc 11
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071bc8: 0x1071bc8: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071bcc: 0x1071bcc: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01071bd0: 0x1071bd0: addiu a0, s1, 12560
-	ldloc 9
-	ldc.i4 12560
-	add
+// 0x01071a8c: 0x1071a8c: beq   v0, zero, 0x1071af0 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1071af0
+// --- basic block ---
+// 0x01071a94: 0x1071a94: lb    v1, 0(v0)
+	ldloc 5
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 7
+// 0x01071a98: 0x1071a98: sll   zero, zero, 0
+// 0x01071a9c: 0x1071a9c: beq   v1, zero, 0x1071af0 sll   zero, zero, 0
+	ldloc 7
+	brfalse L_1071af0
+// --- basic block ---
+// 0x01071aa4: 0x1071aa4: jal   0x10c22a0 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x01071bd4: 0x1071bd4: addiu a1, a1, 15152
-	ldloc.2
-	ldc.i4 15152
-	add
-	stloc.2
-// 0x01071bd8: 0x1071bd8: addiu a2, a2, 31724
-	ldloc.3
-	ldc.i4 31724
-	add
-	stloc.3
-// 0x01071bdc: 0x1071bdc: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::atof_10c22a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071be4: 0x1071be4: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071be8: 0x1071be8: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01071bec: 0x1071bec: addiu a0, s1, 12560
-	ldloc 9
-	ldc.i4 12560
-	add
+// 0x01071aac: 0x1071aac: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x01071bf0: 0x1071bf0: addiu a1, a1, 15168
-	ldloc.2
-	ldc.i4 15168
-	add
-	stloc.2
-// 0x01071bf4: 0x1071bf4: addiu a2, a2, 31732
-	ldloc.3
-	ldc.i4 31732
-	add
-	stloc.3
-// 0x01071bf8: 0x1071bf8: jal   0x100edb0 addu  a3, zero, zero
+// 0x01071ab0: 0x1071ab0: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc 4
+	stloc.2
+// 0x01071ab4: 0x1071ab4: jal   0x10c2250 addu  s2, v0, zero
+	ldloc 5
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__eqsf2_10c2250(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071c00: 0x1071c00: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071c04: 0x1071c04: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01071c08: 0x1071c08: addiu a0, s1, 12560
+// 0x01071abc: 0x1071abc: beq   v0, zero, 0x1071af0 addu  a0, s2, zero
+	ldloc 5
 	ldloc 9
-	ldc.i4 12560
-	add
 	stloc.1
-// 0x01071c0c: 0x1071c0c: addiu a1, a1, 15184
-	ldloc.2
-	ldc.i4 15184
-	add
+	brfalse L_1071af0
+// --- basic block ---
+// 0x01071ac4: 0x1071ac4: jal   0x10c20c0 addu  a1, s3, zero
+	ldloc 11
 	stloc.2
-// 0x01071c10: 0x1071c10: addiu a2, a2, 31736
-	ldloc.3
-	ldc.i4 31736
-	add
-	stloc.3
-// 0x01071c14: 0x1071c14: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gtsf2_10c20c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071c1c: 0x1071c1c: lui   a1, 0x0
+// 0x01071acc: 0x1071acc: bgtz  v0, 0x1071af0 addu  s0, s3, zero
+	ldloc 5
+	ldloc 11
+	stloc 8
 	ldc.i4.s 0
-	stloc.2
-// 0x01071c20: 0x1071c20: addiu a0, s1, 12560
+	bgt L_1071af0
+// --- basic block ---
+// 0x01071ad4: 0x1071ad4: addu  a0, s2, zero
 	ldloc 9
-	ldc.i4 12560
-	add
 	stloc.1
-// 0x01071c24: 0x1071c24: addiu a2, s2, 18500
+// 0x01071ad8: 0x1071ad8: addu  a1, s1, zero
 	ldloc 10
-	ldc.i4 18500
-	add
-	stloc.3
-// 0x01071c28: 0x1071c28: addiu a1, a1, 15200
-	ldloc.2
-	ldc.i4 15200
-	add
 	stloc.2
-// 0x01071c2c: 0x1071c2c: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
+// 0x01071adc: 0x1071adc: jal   0x10c21b0 addu  s0, s2, zero
+	ldloc 9
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl144::__gesf2_10c21b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071c34: 0x1071c34: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x01071c38: 0x1071c38: addiu v0, v0, 20312
+// 0x01071ae4: 0x1071ae4: bgez  v0, 0x1071af4 lui   v0, 0x20000
 	ldloc 5
-	ldc.i4 20312
-	add
+	ldc.i4 131072
 	stloc 5
-// 0x01071c3c: 0x1071c3c: lui   s1, 0x1070000
-	ldc.i4 17235968
-	stloc 9
-// 0x01071c40: 0x1071c40: sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
+	ldc.i4.s 0
+	bge L_1071af4
+// --- basic block ---
+// 0x01071aec: 0x1071aec: addu  s0, s1, zero
+	ldloc 10
+	stloc 8
+L_1071af0:
+// 0x01071af0: 0x1071af0: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+L_1071af4:
+// 0x01071af4: 0x1071af4: lw    a1, 24112(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 6028
 	add
-	ldloc 5
-	stelem.i4
-// 0x01071c44: 0x1071c44: lui   a1, 0x0
-	ldc.i4.s 0
+	ldelem.i4
 	stloc.2
-// 0x01071c48: 0x1071c48: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01071c4c: 0x1071c4c: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x01071c50: 0x1071c50: addiu a0, s0, -26888
+// 0x01071af8: 0x1071af8: jal   0x10c0dc0 addu  a0, s0, zero
 	ldloc 8
-	ldc.i4 -26888
-	add
 	stloc.1
-// 0x01071c54: 0x1071c54: addiu a2, s1, -7528
-	ldloc 9
-	ldc.i4 -7528
-	add
-	stloc.3
-// 0x01071c58: 0x1071c58: addiu a1, a1, 14928
+	ldloc.1
 	ldloc.2
-	ldc.i4 14928
-	add
-	stloc.2
-// 0x01071c5c: 0x1071c5c: addiu a3, a3, 31740
-	ldloc 4
-	ldc.i4 31740
-	add
-	stloc 4
-// 0x01071c60: 0x1071c60: addiu v0, v0, 31752
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x01071b00: 0x1071b00: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
-	ldc.i4 31752
-	add
+	stloc.1
+	ldloc.1
+	call float32 [WazeWP7]CRunTime::intBitsToFloat(int32)
+	conv.i4
 	stloc 5
-// 0x01071c64: 0x1071c64: sw    v0, 20(sp)
-	ldloc 7
+// --- basic block ---
+// 0x01071b08: 0x1071b08: lw    ra, 36(sp)
+// 0x01071b0c: 0x1071b0c: lw    s3, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.8
 	add
-	ldloc 5
-	stelem.i4
-// 0x01071c68: 0x1071c68: jal   0x100edf8 sw    zero, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
+	ldelem.i4
+	stloc 11
+// 0x01071b10: 0x1071b10: lw    s2, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 9
+// 0x01071b14: 0x1071b14: lw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldc.i4.s 0
-	stelem.i4
+	ldelem.i4
+	stloc 10
+// 0x01071b18: 0x1071b18: lw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 8
+// 0x01071b1c: 0x1071b1c: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_GetKeepALiveRateRateinMilliseconds_1071b24(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 lo,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local 11 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  9 is register lo
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x01071c70: 0x1071c70: lui   a1, 0x0
 	ldc.i4.s 0
-	stloc.2
-// 0x01071c74: 0x1071c74: lui   a3, 0x10000
-	ldc.i4 65536
+	stloc 11
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x01071c78: 0x1071c78: lui   v0, 0x10000
-	ldc.i4 65536
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01071b24: 0x1071b24: lui   v0, 0x20000
+	ldc.i4 131072
 	stloc 5
-// 0x01071c7c: 0x1071c7c: addiu a0, s0, -26888
-	ldloc 8
-	ldc.i4 -26888
-	add
-	stloc.1
-// 0x01071c80: 0x1071c80: addiu a2, s1, -7528
-	ldloc 9
-	ldc.i4 -7528
-	add
-	stloc.3
-// 0x01071c84: 0x1071c84: addiu a1, a1, 14944
-	ldloc.2
-	ldc.i4 14944
-	add
-	stloc.2
-// 0x01071c88: 0x1071c88: addiu a3, a3, 31764
-	ldloc 4
-	ldc.i4 31764
-	add
-	stloc 4
-// 0x01071c8c: 0x1071c8c: addiu v0, v0, 31780
+// 0x01071b28: 0x1071b28: lw    a1, 24116(v0)
+	ldloc 6
 	ldloc 5
-	ldc.i4 31780
+	ldc.i4.2
+	shr.un
+	ldc.i4 6029
 	add
+	ldelem.i4
+	stloc.2
+// 0x01071b2c: 0x1071b2c: lui   v0, 0x20000
+	ldc.i4 131072
 	stloc 5
-// 0x01071c90: 0x1071c90: sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
+// 0x01071b30: 0x1071b30: lw    a2, 24120(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 6030
 	add
+	ldelem.i4
+	stloc.3
+// 0x01071b34: 0x1071b34: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01071b38: 0x1071b38: lw    a3, 24124(v0)
+	ldloc 6
 	ldloc 5
-	stelem.i4
-// 0x01071c94: 0x1071c94: jal   0x100edf8 sw    zero, 20(sp)
-	ldloc 7
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 6031
 	add
+	ldelem.i4
+	stloc 4
+// 0x01071b3c: 0x1071b3c: lui   a0, 0x0
 	ldc.i4.s 0
-	stelem.i4
+	stloc.1
+// 0x01071b40: 0x1071b40: addiu sp, sp, -40
 	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x01071b44: 0x1071b44: addiu a0, a0, 15168
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01071c9c: 0x1071c9c: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071ca0: 0x1071ca0: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01071ca4: 0x1071ca4: addiu a0, s0, -26888
-	ldloc 8
-	ldc.i4 -26888
+	ldc.i4 15168
 	add
 	stloc.1
-// 0x01071ca8: 0x1071ca8: addiu a1, a1, 15072
-	ldloc.2
-	ldc.i4 15072
+// 0x01071b48: 0x1071b48: sw    ra, 36(sp)
+// 0x01071b4c: 0x1071b4c: sw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.2
-// 0x01071cac: 0x1071cac: addiu a2, a2, -48
-	ldloc.3
-	ldc.i4.s -48
+	ldloc 8
+	stelem.i4
+// 0x01071b50: 0x1071b50: jal   0x1071a64 sw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.3
-// 0x01071cb0: 0x1071cb0: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::Realtime_DecodeRefreshRateMilliseconds_1071a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x01071cb8: 0x1071cb8: lui   s5, 0x10000
+// 0x01071b58: 0x1071b58: addiu s0, zero, 1000
+	ldc.i4 1000
+	stloc 7
+// 0x01071b5c: 0x1071b5c: div   v0, s0
+	ldloc 5
+	ldloc 7
+	div
+	stloc 9
+// 0x01071b60: 0x1071b60: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc 11
-// 0x01071cbc: 0x1071cbc: lui   a1, 0x0
-	ldc.i4.s 0
 	stloc.2
-// 0x01071cc0: 0x1071cc0: lui   a2, 0x10000
+// 0x01071b64: 0x1071b64: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc.3
-// 0x01071cc4: 0x1071cc4: addiu a0, s5, 18248
-	ldloc 11
-	ldc.i4 18248
-	add
-	stloc.1
-// 0x01071cc8: 0x1071cc8: addiu a1, a1, 15012
+	stloc 4
+// 0x01071b68: 0x1071b68: lui   s1, 0x70000
+	ldc.i4 458752
+	stloc 8
+// 0x01071b6c: 0x1071b6c: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 15012
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071ccc: 0x1071ccc: addiu a2, a2, 9424
-	ldloc.3
-	ldc.i4 9424
-	add
-	stloc.3
-// 0x01071cd0: 0x1071cd0: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x01071b70: 0x1071b70: addiu a3, a3, 31532
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01071cd8: 0x1071cd8: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071cdc: 0x1071cdc: addiu a0, s5, 18248
-	ldloc 11
-	ldc.i4 18248
+	ldc.i4 31532
 	add
+	stloc 4
+// 0x01071b74: 0x1071b74: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01071ce0: 0x1071ce0: addiu a2, s2, 18500
-	ldloc 10
-	ldc.i4 18500
-	add
+// 0x01071b78: 0x1071b78: addiu a2, zero, 466
+	ldc.i4 466
 	stloc.3
-// 0x01071ce4: 0x1071ce4: addiu a1, a1, 15028
-	ldloc.2
-	ldc.i4 15028
+// 0x01071b7c: 0x1071b7c: mflo  lo
+	ldloc 9
+	stloc 5
+// 0x01071b80: 0x1071b80: sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
-// 0x01071ce8: 0x1071ce8: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
+	ldloc 5
+	stelem.i4
+// 0x01071b84: 0x1071b84: jal   0x100449c sw    v0, 18168(s1)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4542
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 11
 	stloc 5
 // --- basic block ---
-// 0x01071cf0: 0x1071cf0: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071cf4: 0x1071cf4: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01071cf8: 0x1071cf8: addiu a0, s0, -26888
+// 0x01071b8c: 0x1071b8c: lw    v0, 18168(s1)
+	ldloc 6
 	ldloc 8
-	ldc.i4 -26888
-	add
-	stloc.1
-// 0x01071cfc: 0x1071cfc: addiu a1, a1, 14996
-	ldloc.2
-	ldc.i4 14996
+	ldc.i4.2
+	shr.un
+	ldc.i4 4542
 	add
-	stloc.2
-// 0x01071d00: 0x1071d00: addiu a2, a2, -16892
-	ldloc.3
-	ldc.i4 -16892
+	ldelem.i4
+	stloc 5
+// 0x01071b90: 0x1071b90: lw    ra, 36(sp)
+// 0x01071b94: 0x1071b94: mult  v0, s0
+	ldloc 5
+	ldloc 7
+	mul
+	stloc 9
+// 0x01071b98: 0x1071b98: lw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.3
-// 0x01071d04: 0x1071d04: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
+	ldelem.i4
+	stloc 8
+// 0x01071b9c: 0x1071b9c: lw    s0, 28(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 7
+// 0x01071ba0: 0x1071ba0: mflo  lo
+	ldloc 9
 	stloc 5
-// --- basic block ---
-// 0x01071d0c: 0x1071d0c: lui   s5, 0x20000
-	ldc.i4 131072
+// 0x01071ba4: 0x1071ba4: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 11
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Realtime_GetRefreshRateinMilliseconds_1071bac(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 lo,int32 s1,int32 s3,int32 s0,int32 s2,int32 s6,int32 s4,int32 s5,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 11 is register s0
+// local  9 is register s1
+// local 12 is register s2
+// local 10 is register s3
+// local 14 is register s4
+// local 15 is register s5
+// local 13 is register s6
+// local  0 is register sp
+// local 16 is register ra
+// local  8 is register lo
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 11
-// 0x01071d10: 0x1071d10: lui   s2, 0x0
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 12
 	ldc.i4.s 0
 	stloc 10
-// 0x01071d14: 0x1071d14: lui   a1, 0x0
 	ldc.i4.s 0
-	stloc.2
-// 0x01071d18: 0x1071d18: addiu s2, s2, 20820
-	ldloc 10
-	ldc.i4 20820
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 13
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 16
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01071bac: 0x1071bac: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
+	add
+	stloc.0
+// 0x01071bb0: 0x1071bb0: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01071bb4: 0x1071bb4: sw    s1, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc 10
-// 0x01071d1c: 0x1071d1c: addiu a2, s1, -7528
 	ldloc 9
-	ldc.i4 -7528
+	stelem.i4
+// 0x01071bb8: 0x1071bb8: lw    s1, 24120(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 6030
+	add
+	ldelem.i4
+	stloc 9
+// 0x01071bbc: 0x1071bbc: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01071bc0: 0x1071bc0: sw    s4, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 14
+	stelem.i4
+// 0x01071bc4: 0x1071bc4: lw    s4, 24124(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 6031
+	add
+	ldelem.i4
+	stloc 14
+// 0x01071bc8: 0x1071bc8: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01071bcc: 0x1071bcc: lw    a1, 24128(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 6032
 	add
+	ldelem.i4
+	stloc.2
+// 0x01071bd0: 0x1071bd0: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01071bd4: 0x1071bd4: addu  a2, s1, zero
+	ldloc 9
 	stloc.3
-// 0x01071d20: 0x1071d20: addiu a0, s0, -26888
-	ldloc 8
-	ldc.i4 -26888
+// 0x01071bd8: 0x1071bd8: addu  a3, s4, zero
+	ldloc 14
+	stloc 4
+// 0x01071bdc: 0x1071bdc: addiu a0, a0, 15120
+	ldloc.1
+	ldc.i4 15120
 	add
 	stloc.1
-// 0x01071d24: 0x1071d24: addiu a3, s5, 9464
-	ldloc 11
-	ldc.i4 9464
+// 0x01071be0: 0x1071be0: sw    ra, 52(sp)
+// 0x01071be4: 0x1071be4: sw    s6, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
 	add
-	stloc 4
-// 0x01071d28: 0x1071d28: addiu a1, a1, 14976
-	ldloc.2
-	ldc.i4 14976
+	ldloc 13
+	stelem.i4
+// 0x01071be8: 0x1071be8: sw    s5, 44(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc.2
-// 0x01071d2c: 0x1071d2c: sw    s2, 16(sp)
-	ldloc 7
+	ldloc 15
+	stelem.i4
+// 0x01071bec: 0x1071bec: sw    s3, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 9
 	add
 	ldloc 10
 	stelem.i4
-// 0x01071d30: 0x1071d30: jal   0x100edf8 sw    zero, 20(sp)
-	ldloc 7
+// 0x01071bf0: 0x1071bf0: sw    s2, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc 12
+	stelem.i4
+// 0x01071bf4: 0x1071bf4: jal   0x1071a64 sw    s0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 11
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::Realtime_DecodeRefreshRateMilliseconds_1071a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071d38: 0x1071d38: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01071d3c: 0x1071d3c: addiu a0, s0, -26888
-	ldloc 8
-	ldc.i4 -26888
-	add
-	stloc.1
-// 0x01071d40: 0x1071d40: addiu a3, s5, 9464
+// 0x01071bfc: 0x1071bfc: addiu s0, zero, 1000
+	ldc.i4 1000
+	stloc 11
+// 0x01071c00: 0x1071c00: div   v0, s0
+	ldloc 5
 	ldloc 11
-	ldc.i4 9464
-	add
+	div
+	stloc 8
+// 0x01071c04: 0x1071c04: lui   s2, 0x10000
+	ldc.i4 65536
+	stloc 12
+// 0x01071c08: 0x1071c08: lui   a3, 0x10000
+	ldc.i4 65536
 	stloc 4
-// 0x01071d44: 0x1071d44: addiu a1, a1, 14960
-	ldloc.2
-	ldc.i4 14960
+// 0x01071c0c: 0x1071c0c: lui   s3, 0x70000
+	ldc.i4 458752
+	stloc 10
+// 0x01071c10: 0x1071c10: addiu a1, s2, 21196
+	ldloc 12
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01071d48: 0x1071d48: addu  a2, zero, zero
-	ldc.i4.s 0
+// 0x01071c14: 0x1071c14: addiu a3, a3, 31576
+	ldloc 4
+	ldc.i4 31576
+	add
+	stloc 4
+// 0x01071c18: 0x1071c18: addiu a2, zero, 433
+	ldc.i4 433
 	stloc.3
-// 0x01071d4c: 0x1071d4c: sw    s2, 16(sp)
-	ldloc 7
+// 0x01071c1c: 0x1071c1c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01071c20: 0x1071c20: lui   s6, 0x20000
+	ldc.i4 131072
+	stloc 13
+// 0x01071c24: 0x1071c24: mflo  lo
+	ldloc 8
+	stloc 5
+// 0x01071c28: 0x1071c28: sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 10
+	ldloc 5
 	stelem.i4
-// 0x01071d50: 0x1071d50: jal   0x100edf8 sw    zero, 20(sp)
-	ldloc 7
-	ldloc.0
+// 0x01071c2c: 0x1071c2c: jal   0x100449c sw    v0, 18116(s3)
+	ldloc 6
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4529
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071d58: 0x1071d58: jal   0x108dac4 lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 8
+// 0x01071c34: 0x1071c34: lw    a0, 18116(s3)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 4529
+	add
+	ldelem.i4
+	stloc.1
+// 0x01071c38: 0x1071c38: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl105::RealtimePrivacyInit_108dac4(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071d60: 0x1071d60: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x01071d64: 0x1071d64: lui   a2, 0x1070000
-	ldc.i4 17235968
-	stloc.3
-// 0x01071d68: 0x1071d68: lui   a3, 0x1070000
-	ldc.i4 17235968
-	stloc 4
-// 0x01071d6c: 0x1071d6c: lui   a0, 0x70000
-	ldc.i4 458752
-	stloc.1
-// 0x01071d70: 0x1071d70: addiu a1, a1, -11624
-	ldloc.2
-	ldc.i4 -11624
-	add
-	stloc.2
-// 0x01071d74: 0x1071d74: addiu a2, a2, -12132
-	ldloc.3
-	ldc.i4 -12132
-	add
-	stloc.3
-// 0x01071d78: 0x1071d78: addiu a3, a3, -12492
-	ldloc 4
-	ldc.i4 -12492
+// 0x01071c40: 0x1071c40: lw    a3, 24348(s6)
+	ldloc 6
+	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldc.i4 6087
 	add
+	ldelem.i4
 	stloc 4
-// 0x01071d7c: 0x1071d7c: jal   0x1085c60 addiu a0, a0, 17728
-	ldloc.1
-	ldc.i4 17728
+// 0x01071c44: 0x1071c44: lw    a2, 24344(s6)
+	ldloc 6
+	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldc.i4 6086
 	add
+	ldelem.i4
+	stloc.3
+// 0x01071c48: 0x1071c48: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x01071c4c: 0x1071c4c: jal   0x10c0dd8 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl100::RTConnectionInfo_Init_1085c60(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071d84: 0x1071d84: lui   a0, 0xf0000
-	ldc.i4 983040
+// 0x01071c54: 0x1071c54: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x01071c58: 0x1071c58: jal   0x10c0ed8 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x01071d88: 0x1071d88: jal   0x108d0dc addiu a0, a0, -30056
+	ldloc.0
 	ldloc.1
-	ldc.i4 -30056
+	ldloc.2
+	call int32 Cibyl143::__truncdfsf2_10c0ed8(int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01071c60: 0x1071c60: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 7
+// 0x01071c64: 0x1071c64: lw    a2, 24132(v1)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 6033
+	add
+	ldelem.i4
+	stloc.3
+// 0x01071c68: 0x1071c68: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01071c6c: 0x1071c6c: addu  a1, s1, zero
+	ldloc 9
+	stloc.2
+// 0x01071c70: 0x1071c70: addiu a0, a0, 15136
+	ldloc.1
+	ldc.i4 15136
 	add
 	stloc.1
+// 0x01071c74: 0x1071c74: jal   0x1071a64 addu  a3, v0, zero
+	ldloc 5
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::VersionUpgradeInfo_Init_108d0dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::Realtime_DecodeRefreshRateMilliseconds_1071a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071d90: 0x1071d90: jal   0x108d0cc addiu a0, s0, -19072
-	ldloc 8
-	ldc.i4 -19072
+// 0x01071c7c: 0x1071c7c: div   v0, s0
+	ldloc 5
+	ldloc 11
+	div
+	stloc 8
+// 0x01071c80: 0x1071c80: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071c84: 0x1071c84: addu  s1, v0, zero
+	ldloc 5
+	stloc 9
+// 0x01071c88: 0x1071c88: addiu a1, s2, 21196
+	ldloc 12
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071c8c: 0x1071c8c: addiu a3, a3, 31616
+	ldloc 4
+	ldc.i4 31616
 	add
+	stloc 4
+// 0x01071c90: 0x1071c90: addiu a2, zero, 440
+	ldc.i4 440
+	stloc.3
+// 0x01071c94: 0x1071c94: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-	ldloc.1
-	call void Cibyl105::StatusStatistics_Init_108d0cc(int32)
-// --- basic block ---
-// 0x01071d98: 0x1071d98: jal   0x107b894 sll   zero, zero, 0
+// 0x01071c98: 0x1071c98: mflo  lo
+	ldloc 8
+	stloc 5
+// 0x01071c9c: 0x1071c9c: jal   0x100449c sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::RTAlerts_Init_107b894(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071da0: 0x1071da0: jal   0x1075c10 sll   zero, zero, 0
+// 0x01071ca4: 0x1071ca4: addiu v0, zero, 2000
+	ldc.i4 2000
+	stloc 5
+// 0x01071ca8: 0x1071ca8: div   s1, v0
+	ldloc 9
+	ldloc 5
+	div
+	stloc 8
+// 0x01071cac: 0x1071cac: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x01071cb0: 0x1071cb0: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071cb4: 0x1071cb4: mflo  lo
+	ldloc 8
+	stloc 7
+// 0x01071cb8: 0x1071cb8: jal   0x10c1000 sw    v1, 18112(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 4528
+	add
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl88::RealtimeBonus_Init_1075c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071da8: 0x1071da8: jal   0x108fe18 sll   zero, zero, 0
+// 0x01071cc0: 0x1071cc0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01071cc4: 0x1071cc4: lw    a3, 24380(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 6095
+	add
+	ldelem.i4
+	stloc 4
+// 0x01071cc8: 0x1071cc8: lw    a2, 24376(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 6094
+	add
+	ldelem.i4
+	stloc.3
+// 0x01071ccc: 0x1071ccc: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x01071cd0: 0x1071cd0: jal   0x10c0dd8 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoi_Init_108fe18(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071db0: 0x1071db0: jal   0x10756a4 sll   zero, zero, 0
+// 0x01071cd8: 0x1071cd8: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x01071cdc: 0x1071cdc: jal   0x10c0ed8 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl88::RTNet_Init_10756a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__truncdfsf2_10c0ed8(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071db8: 0x1071db8: jal   0x106af08 sll   zero, zero, 0
+// 0x01071ce4: 0x1071ce4: lw    a0, 18116(s3)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 4529
+	add
+	ldelem.i4
+	stloc.1
+// 0x01071ce8: 0x1071ce8: addu  s5, v0, zero
+	ldloc 5
+	stloc 15
+// 0x01071cec: 0x1071cec: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01071cf0: 0x1071cf0: lw    s3, 24088(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 6022
+	add
+	ldelem.i4
+	stloc 10
+// 0x01071cf4: 0x1071cf4: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_LoginDetailsInit_106af08(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071dc0: 0x1071dc0: jal   0x106c928 sll   zero, zero, 0
+// 0x01071cfc: 0x1071cfc: lw    a3, 24348(s6)
+	ldloc 6
+	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldc.i4 6087
+	add
+	ldelem.i4
+	stloc 4
+// 0x01071d00: 0x1071d00: lw    a2, 24344(s6)
+	ldloc 6
+	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldc.i4 6086
+	add
+	ldelem.i4
+	stloc.3
+// 0x01071d04: 0x1071d04: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x01071d08: 0x1071d08: jal   0x10c0dd8 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl81::Realtime_SessionDetailsInit_106c928(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071dc8: 0x1071dc8: jal   0x108d1c8 sll   zero, zero, 0
+// 0x01071d10: 0x1071d10: addu  a1, v1, zero
+	ldloc 7
+	stloc.2
+// 0x01071d14: 0x1071d14: jal   0x10c0ed8 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl105::RTSystemMessagesInit_108d1c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__truncdfsf2_10c0ed8(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071dd0: 0x1071dd0: cibyl_sysc_arg 0x14
-	ldloc 12
-// 0x01071dd4: 0x1071dd4: cibyl_sysc 0x211b
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x01071dd8: 0x1071dd8: addu  s4, v0, zero
-	ldloc 5
-	stloc 12
-// 0x01071ddc: 0x1071ddc: lui   a0, 0x1070000
-	ldc.i4 17235968
+// 0x01071d1c: 0x1071d1c: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x01071de0: 0x1071de0: addiu a0, a0, 6244
+// 0x01071d20: 0x1071d20: addu  a1, s3, zero
+	ldloc 10
+	stloc.2
+// 0x01071d24: 0x1071d24: addu  a2, s5, zero
+	ldloc 15
+	stloc.3
+// 0x01071d28: 0x1071d28: addiu a0, a0, 15152
 	ldloc.1
-	ldc.i4 6244
+	ldc.i4 15152
 	add
 	stloc.1
-// 0x01071de4: 0x1071de4: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01071de8: 0x1071de8: jal   0x10400d8 sw    s4, -19072(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4768
-	add
-	ldloc 12
-	stelem.i4
+// 0x01071d2c: 0x1071d2c: jal   0x1071a64 addu  a3, v0, zero
+	ldloc 5
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_device_events_register_10400d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::Realtime_DecodeRefreshRateMilliseconds_1071a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071df0: 0x1071df0: addiu v0, zero, 1
+// 0x01071d34: 0x1071d34: div   v0, s0
+	ldloc 5
+	ldloc 11
+	div
+	stloc 8
+// 0x01071d38: 0x1071d38: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071d3c: 0x1071d3c: lui   v1, 0x70000
+	ldc.i4 458752
+	stloc 7
+// 0x01071d40: 0x1071d40: addiu a1, s2, 21196
+	ldloc 12
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071d44: 0x1071d44: addiu a3, a3, 31660
+	ldloc 4
+	ldc.i4 31660
+	add
+	stloc 4
+// 0x01071d48: 0x1071d48: addiu a0, zero, 1
 	ldc.i4.1
+	stloc.1
+// 0x01071d4c: 0x1071d4c: addiu a2, zero, 448
+	ldc.i4 448
+	stloc.3
+// 0x01071d50: 0x1071d50: mflo  lo
+	ldloc 8
 	stloc 5
-// 0x01071df4: 0x1071df4: jal   0x1071a5c sw    v0, 17556(s3)
+// 0x01071d54: 0x1071d54: sw    v0, 18120(v1)
+	ldloc 6
 	ldloc 7
-	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 4389
+	ldc.i4 4530
 	add
 	ldloc 5
 	stelem.i4
+// 0x01071d58: 0x1071d58: jal   0x100449c sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::OnSettingsChanged_EnableDisable_1071a5c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01071dfc: 0x1071dfc: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x01071e00: 0x1071e00: addiu a1, a1, -16940
-	ldloc.2
-	ldc.i4 -16940
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
-// 0x01071e04: 0x1071e04: jal   0x104fe98 addiu a0, zero, 30000
-	ldc.i4 30000
-	stloc.1
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071e0c: 0x1071e0c: lui   a0, 0x1070000
-	ldc.i4 17235968
+// 0x01071d60: 0x1071d60: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x01071e10: 0x1071e10: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x01071d64: 0x1071d64: addu  a1, s3, zero
+	ldloc 10
 	stloc.2
-// 0x01071e14: 0x1071e14: addiu a0, a0, -13920
+// 0x01071d68: 0x1071d68: addu  a2, s5, zero
+	ldloc 15
+	stloc.3
+// 0x01071d6c: 0x1071d6c: addu  a3, s4, zero
+	ldloc 14
+	stloc 4
+// 0x01071d70: 0x1071d70: jal   0x1071a64 addiu a0, a0, 15184
 	ldloc.1
-	ldc.i4 -13920
+	ldc.i4 15184
 	add
 	stloc.1
-// 0x01071e18: 0x1071e18: jal   0x100de8c addiu a1, a1, 31796
-	ldloc.2
-	ldc.i4 31796
-	add
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_register_100de8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::Realtime_DecodeRefreshRateMilliseconds_1071a64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_1071e20:
-// 0x01071e20: 0x1071e20: lw    ra, 60(sp)
-// 0x01071e24: 0x1071e24: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x01071e28: 0x1071e28: lw    s6, 56(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
+// 0x01071d78: 0x1071d78: div   v0, s0
+	ldloc 5
+	ldloc 11
+	div
+	stloc 8
+// 0x01071d7c: 0x1071d7c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071d80: 0x1071d80: addiu a1, s2, 21196
+	ldloc 12
+	ldc.i4 21196
 	add
-	ldelem.i4
-	stloc 13
-// 0x01071e2c: 0x1071e2c: lw    s5, 52(sp)
-	ldloc 7
+	stloc.2
+// 0x01071d84: 0x1071d84: lui   v1, 0x70000
+	ldc.i4 458752
+	stloc 7
+// 0x01071d88: 0x1071d88: addiu a3, a3, 31700
+	ldloc 4
+	ldc.i4 31700
+	add
+	stloc 4
+// 0x01071d8c: 0x1071d8c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01071d90: 0x1071d90: addiu a2, zero, 455
+	ldc.i4 455
+	stloc.3
+// 0x01071d94: 0x1071d94: mflo  lo
+	ldloc 8
+	stloc 5
+// 0x01071d98: 0x1071d98: sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 11
-// 0x01071e30: 0x1071e30: lw    s4, 48(sp)
+	ldloc 5
+	stelem.i4
+// 0x01071d9c: 0x1071d9c: jal   0x100449c sw    v0, 18108(v1)
+	ldloc 6
 	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 4527
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01071da4: 0x1071da4: lw    ra, 52(sp)
+// 0x01071da8: 0x1071da8: addu  v0, s1, zero
+	ldloc 9
+	stloc 5
+// 0x01071dac: 0x1071dac: lw    s6, 48(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc 12
-// 0x01071e34: 0x1071e34: lw    s3, 44(sp)
-	ldloc 7
+	stloc 13
+// 0x01071db0: 0x1071db0: lw    s5, 44(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 11
 	add
 	ldelem.i4
-	stloc 14
-// 0x01071e38: 0x1071e38: lw    s2, 40(sp)
-	ldloc 7
+	stloc 15
+// 0x01071db4: 0x1071db4: lw    s4, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 10
-// 0x01071e3c: 0x1071e3c: lw    s1, 36(sp)
-	ldloc 7
+	stloc 14
+// 0x01071db8: 0x1071db8: lw    s3, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 9
-// 0x01071e40: 0x1071e40: lw    s0, 32(sp)
-	ldloc 7
+	stloc 10
+// 0x01071dbc: 0x1071dbc: lw    s2, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 8
-// 0x01071e44: 0x1071e44: jr    ra addiu sp, sp, 64
+	stloc 12
+// 0x01071dc0: 0x1071dc0: lw    s1, 28(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 64
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 9
+// 0x01071dc4: 0x1071dc4: lw    s0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 11
+// 0x01071dc8: 0x1071dc8: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RTNet_CreateAccount_1071e5c(int32,int32,int32,int32,int32)
+.method public static int32 Realtime_Start_1071dd0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 t2,int32 v1,int32 ra,int32 t0,int32 t1,int32 t3)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register t0
-// local 11 is register t1
-// local  7 is register t2
-// local 12 is register t3
+// local  8 is register s0
 // local  0 is register sp
 // local  9 is register ra
-// local  6 is register mem
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2148,179 +2188,118 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 12
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01071e5c: 0x1071e5c: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x01071e60: 0x1071e60: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01071dd0: 0x1071dd0: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x01071e64: 0x1071e64: addu  t2, a0, zero
-	ldloc.1
-	stloc 7
-// 0x01071e68: 0x1071e68: lw    a0, -18464(v0)
-	ldloc 6
+// 0x01071dd4: 0x1071dd4: lw    v0, 18020(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 4505
 	add
 	ldelem.i4
-	stloc.1
-// 0x01071e6c: 0x1071e6c: lw    v0, 72(sp)
-	ldloc 6
+	stloc 5
+// 0x01071dd8: 0x1071dd8: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01071ddc: 0x1071ddc: sw    ra, 20(sp)
+// 0x01071de0: 0x1071de0: beq   v0, zero, 0x1071e74 sw    s0, 16(sp)
+	ldloc 5
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+	brfalse L_1071e74
+// --- basic block ---
+// 0x01071de8: 0x1071de8: lui   s0, 0x70000
+	ldc.i4 458752
+	stloc 8
+// 0x01071dec: 0x1071dec: lw    v0, 18028(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
 	add
 	ldelem.i4
 	stloc 5
-// 0x01071e70: 0x1071e70: sw    ra, 52(sp)
-// 0x01071e74: 0x1071e74: addu  t1, a1, zero
+// 0x01071df0: 0x1071df0: sll   zero, zero, 0
+// 0x01071df4: 0x1071df4: bne   v0, zero, 0x1071e74 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_1071e74
+// --- basic block ---
+// 0x01071dfc: 0x1071dfc: jal   0x106f224 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	stloc 11
-// 0x01071e78: 0x1071e78: addu  t0, a2, zero
 	ldloc.3
-	stloc 10
-// 0x01071e7c: 0x1071e7c: bne   v0, zero, 0x1071e90 addu  v1, a3, zero
-	ldloc 5
 	ldloc 4
-	stloc 8
-	brtrue L_1071e90
+	call int32 Cibyl82::Realtime_FullReset_106f224(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01071e84: 0x1071e84: lui   v0, 0x10000
-	ldc.i4 65536
+// 0x01071e04: 0x1071e04: jal   0x1079e30 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl91::RTAlerts_Term_1079e30(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x01071e88: 0x1071e88: j	 0x1071e98 addiu v0, v0, -25260
-	ldloc 5
-	ldc.i4 -25260
-	add
+// --- basic block ---
+// 0x01071e0c: 0x1071e0c: jal   0x107beb8 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl93::RTAlerts_Init_107beb8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	br L_1071e98
 // --- basic block ---
-L_1071e90:
-// 0x01071e90: 0x1071e90: lui   v0, 0x10000
-	ldc.i4 65536
+// 0x01071e14: 0x1071e14: lui   v0, 0x70000
+	ldc.i4 458752
 	stloc 5
-// 0x01071e94: 0x1071e94: addiu v0, v0, 32112
+// 0x01071e18: 0x1071e18: sw    zero, 18188(v0)
+	ldloc 7
 	ldloc 5
-	ldc.i4 32112
-	add
-	stloc 5
-L_1071e98:
-// 0x01071e98: 0x1071e98: lw    t3, 76(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldelem.i4
-	stloc 12
-// 0x01071e9c: 0x1071e9c: sw    t2, 20(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 4547
 	add
-	ldloc 7
-	stelem.i4
-// 0x01071ea0: 0x1071ea0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01071ea4: 0x1071ea4: lui   a2, 0x0
 	ldc.i4.s 0
-	stloc.3
-// 0x01071ea8: 0x1071ea8: lui   t2, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x01071eac: 0x1071eac: addiu t2, t2, 32136
-	ldloc 7
-	ldc.i4 32136
-	add
-	stloc 7
-// 0x01071eb0: 0x1071eb0: addiu a1, a1, 32120
-	ldloc.2
-	ldc.i4 32120
-	add
-	stloc.2
-// 0x01071eb4: 0x1071eb4: addiu a2, a2, 15252
-	ldloc.3
-	ldc.i4 15252
-	add
-	stloc.3
-// 0x01071eb8: 0x1071eb8: addiu a3, zero, 36
-	ldc.i4.s 36
-	stloc 4
-// 0x01071ebc: 0x1071ebc: sw    t3, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 12
 	stelem.i4
-// 0x01071ec0: 0x1071ec0: sw    t2, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
+// 0x01071e1c: 0x1071e1c: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x01071e20: 0x1071e20: jal   0x1071bac sw    v0, 18028(s0)
 	ldloc 7
-	stelem.i4
-// 0x01071ec4: 0x1071ec4: sw    t1, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 11
-	stelem.i4
-// 0x01071ec8: 0x1071ec8: sw    t0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 10
-	stelem.i4
-// 0x01071ecc: 0x1071ecc: sw    v1, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
 	ldloc 8
-	stelem.i4
-// 0x01071ed0: 0x1071ed0: jal   0x1069ec8 sw    v0, 40(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4 4507
 	add
 	ldloc 5
 	stelem.i4
@@ -2329,130 +2308,128 @@ L_1071e98:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::Realtime_GetRefreshRateinMilliseconds_1071bac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071ed8: 0x1071ed8: lw    ra, 52(sp)
-// 0x01071edc: 0x1071edc: sll   zero, zero, 0
-// 0x01071ee0: 0x1071ee0: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x01071e28: 0x1071e28: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x01071e2c: 0x1071e2c: addu  a0, v0, zero
 	ldloc 5
-	ret
-}
-.method public static int32 RTNet_GetTransactionState_1071ee8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
+	stloc.1
+// 0x01071e30: 0x1071e30: jal   0x104fea8 addiu a1, a1, 4764
+	ldloc.2
+	ldc.i4 4764
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
+	stloc 5
 // --- basic block ---
-// 0x01071ee8: 0x1071ee8: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01071e38: 0x1071e38: jal   0x1071b24 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::Realtime_GetKeepALiveRateRateinMilliseconds_1071b24(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x01071eec: 0x1071eec: lw    a0, -18464(v0)
-	ldloc 7
+// --- basic block ---
+// 0x01071e40: 0x1071e40: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x01071e44: 0x1071e44: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4616
-	add
-	ldelem.i4
 	stloc.1
-// 0x01071ef0: 0x1071ef0: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x01071e48: 0x1071e48: jal   0x104fea8 addiu a1, a1, -8372
+	ldloc.2
+	ldc.i4 -8372
 	add
-	stloc.0
-// 0x01071ef4: 0x1071ef4: beq   a0, zero, 0x1071f28 sw    ra, 20(sp)
+	stloc.2
+	ldloc.0
 	ldloc.1
-	brfalse L_1071f28
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01071efc: 0x1071efc: jal   0x1068f8c sll   zero, zero, 0
+// 0x01071e50: 0x1071e50: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x01071e54: 0x1071e54: jal   0x101f85c addiu a0, a0, -15748
+	ldloc.1
+	ldc.i4 -15748
+	add
+	stloc.1
 	ldloc.1
-	call int32 Cibyl78::wst_get_trans_state_1068f8c(int32)
+	call int32 Cibyl23::roadmap_screen_subscribe_after_flow_control_refresh_101f85c(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01071f04: 0x1071f04: sltiu v1, v0, 3
-	ldloc 5
-	ldc.i4.3
-	clt.un
+// 0x01071e5c: 0x1071e5c: lui   v1, 0x70000
+	ldc.i4 458752
 	stloc 6
-// 0x01071f08: 0x1071f08: beq   v1, zero, 0x1071f28 lui   v1, 0x20000
+// 0x01071e60: 0x1071e60: jal   0x107129c sw    v0, 18064(v1)
+	ldloc 7
 	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brfalse L_1071f28
-// --- basic block ---
-// 0x01071f10: 0x1071f10: sll   v0, v0, 2
-	ldloc 5
 	ldc.i4.2
-	shl
-	stloc 5
-// 0x01071f14: 0x1071f14: addiu v1, v1, 28740
-	ldloc 6
-	ldc.i4 28740
+	shr.un
+	ldc.i4 4516
 	add
-	stloc 6
-// 0x01071f18: 0x1071f18: addu  v0, v0, v1
 	ldloc 5
-	ldloc 6
-	add
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl84::OnTimer_Realtime_107129c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x01071f1c: 0x1071f1c: lw    v0, 0(v0)
+// --- basic block ---
+// 0x01071e68: 0x1071e68: lw    v0, 18028(s0)
 	ldloc 7
-	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
+	ldc.i4 4507
+	add
 	ldelem.i4
 	stloc 5
-// 0x01071f20: 0x1071f20: j	 0x1071f2c sll   zero, zero, 0
-	br L_1071f2c
+// 0x01071e6c: 0x1071e6c: j	 0x1071e78 sll   zero, zero, 0
+	br L_1071e78
 // --- basic block ---
-L_1071f28:
-// 0x01071f28: 0x1071f28: addiu v0, zero, 4
-	ldc.i4.4
+L_1071e74:
+// 0x01071e74: 0x1071e74: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-L_1071f2c:
-// 0x01071f2c: 0x1071f2c: lw    ra, 20(sp)
-// 0x01071f30: 0x1071f30: sll   zero, zero, 0
-// 0x01071f34: 0x1071f34: jr    ra addiu sp, sp, 24
+L_1071e78:
+// 0x01071e78: 0x1071e78: lw    ra, 20(sp)
+// 0x01071e7c: 0x1071e7c: lw    s0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 8
+// 0x01071e80: 0x1071e80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2464,10 +2441,10 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTNet_AbortTransaction_1071f3c(int32,int32,int32,int32,int32)
+.method public static int32 OnDeviceEvent_1071e88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -2475,9 +2452,12 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
+// local  9 is register s0
+// local  8 is register s1
+// local 10 is register s2
+// local 11 is register s3
 // local  0 is register sp
-// local  9 is register ra
+// local 12 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -2493,487 +2473,552 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01071f3c: 0x1071f3c: addiu sp, sp, -24
+// 0x01071e88: 0x1071e88: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01071f40: 0x1071f40: sw    s0, 16(sp)
+// 0x01071e8c: 0x1071e8c: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+// 0x01071e90: 0x1071e90: sw    ra, 44(sp)
+// 0x01071e94: 0x1071e94: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
 	ldloc 8
 	stelem.i4
-// 0x01071f44: 0x1071f44: sw    ra, 20(sp)
-// 0x01071f48: 0x1071f48: jal   0x1071ee8 addu  s0, a0, zero
-	ldloc.1
-	stloc 8
+// 0x01071e98: 0x1071e98: sw    s0, 28(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::RTNet_GetTransactionState_1071ee8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01071f50: 0x1071f50: addiu v1, zero, 4
-	ldc.i4.4
-	stloc 7
-// 0x01071f54: 0x1071f54: beq   v0, v1, 0x1071f84 sw    v1, 0(s0)
-	ldloc 5
-	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 9
+	stelem.i4
+// 0x01071e9c: 0x1071e9c: sw    s3, 40(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldloc 7
+	ldc.i4.s 10
+	add
+	ldloc 11
 	stelem.i4
-	beq  L_1071f84
-// --- basic block ---
-// 0x01071f5c: 0x1071f5c: bne   v0, zero, 0x1071f6c lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brtrue L_1071f6c
-// --- basic block ---
-// 0x01071f64: 0x1071f64: j	 0x1071f84 sw    zero, 0(s0)
+// 0x01071ea0: 0x1071ea0: sw    s2, 36(sp)
 	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 0
+	ldc.i4.s 9
+	add
+	ldloc 10
 	stelem.i4
-	br L_1071f84
-// --- basic block ---
-L_1071f6c:
-// 0x01071f6c: 0x1071f6c: lw    a0, -18464(v0)
+// 0x01071ea4: 0x1071ea4: lw    s0, 18052(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 4513
 	add
 	ldelem.i4
-	stloc.1
-// 0x01071f70: 0x1071f70: jal   0x1068f98 sll   zero, zero, 0
+	stloc 9
+// 0x01071ea8: 0x1071ea8: jal   0x104000c addu  s1, a0, zero
 	ldloc.1
-	call int32 Cibyl78::wst_stop_trans_1068f98(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
+	ldloc.1
+	call int32 Cibyl47::get_device_event_name_104000c(int32)
 	stloc 5
 // --- basic block ---
-// 0x01071f78: 0x1071f78: jal   0x1071ee8 sll   zero, zero, 0
+// 0x01071eb0: 0x1071eb0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01071eb4: 0x1071eb4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071eb8: 0x1071eb8: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071ebc: 0x1071ebc: addiu a3, a3, 31740
+	ldloc 4
+	ldc.i4 31740
+	add
+	stloc 4
+// 0x01071ec0: 0x1071ec0: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01071ec4: 0x1071ec4: addiu a2, zero, 3633
+	ldc.i4 3633
+	stloc.3
+// 0x01071ec8: 0x1071ec8: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x01071ecc: 0x1071ecc: jal   0x100449c sw    s1, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::RTNet_GetTransactionState_1071ee8(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01071f80: 0x1071f80: sw    v0, 0(s0)
-	ldloc 6
-	ldloc 8
+// 0x01071ed4: 0x1071ed4: addiu v0, zero, 2
 	ldc.i4.2
-	shr.un
+	stloc 5
+// 0x01071ed8: 0x1071ed8: beq   s1, v0, 0x1071ef0 addiu v0, zero, 3
+	ldloc 8
 	ldloc 5
-	stelem.i4
-L_1071f84:
-// 0x01071f84: 0x1071f84: lw    ra, 20(sp)
-// 0x01071f88: 0x1071f88: lw    s0, 16(sp)
+	ldc.i4.3
+	stloc 5
+	beq  L_1071ef0
+// --- basic block ---
+// 0x01071ee0: 0x1071ee0: beq   s1, v0, 0x1071ef8 addiu v0, zero, 6
+	ldloc 8
+	ldloc 5
+	ldc.i4.6
+	stloc 5
+	beq  L_1071ef8
+// --- basic block ---
+// 0x01071ee8: 0x1071ee8: bne   s1, v0, 0x1071f00 lui   v0, 0x70000
+	ldloc 8
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	bne.un L_1071f00
+// --- basic block ---
+L_1071ef0:
+// 0x01071ef0: 0x1071ef0: j	 0x1071efc addiu s0, zero, 1
+	ldc.i4.1
+	stloc 9
+	br L_1071efc
+// --- basic block ---
+L_1071ef8:
+// 0x01071ef8: 0x1071ef8: addiu s0, zero, 2
+	ldc.i4.2
+	stloc 9
+L_1071efc:
+// 0x01071efc: 0x1071efc: lui   v0, 0x70000
+	ldc.i4 458752
+	stloc 5
+L_1071f00:
+// 0x01071f00: 0x1071f00: lw    v1, 18052(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4513
 	add
 	ldelem.i4
-	stloc 8
-// 0x01071f8c: 0x1071f8c: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	stloc 7
+// 0x01071f04: 0x1071f04: sll   zero, zero, 0
+// 0x01071f08: 0x1071f08: bne   s0, v1, 0x1071f4c addiu s3, zero, 1
+	ldloc 9
 	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_Watchdog_1071f94(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
+	ldc.i4.1
+	stloc 11
+	bne.un L_1071f4c
 // --- basic block ---
-// 0x01071f94: 0x1071f94: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01071f10: 0x1071f10: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x01071f98: 0x1071f98: lw    a0, -18464(v0)
-	ldloc 7
+// 0x01071f14: 0x1071f14: bne   s0, v0, 0x1072064 lui   v0, 0x70000
+	ldloc 9
+	ldloc 5
+	ldc.i4 458752
+	stloc 5
+	bne.un L_1072064
+// --- basic block ---
+// 0x01071f1c: 0x1071f1c: lw    v0, 18056(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 4514
 	add
 	ldelem.i4
-	stloc.1
-// 0x01071f9c: 0x1071f9c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01071fa0: 0x1071fa0: beq   a0, zero, 0x1071fb0 sw    ra, 20(sp)
-	ldloc.1
-	brfalse L_1071fb0
+	stloc 5
+// 0x01071f20: 0x1071f20: sll   zero, zero, 0
+// 0x01071f24: 0x1071f24: bne   v0, zero, 0x1072064 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1072064
 // --- basic block ---
-// 0x01071fa8: 0x1071fa8: jal   0x106a420 sll   zero, zero, 0
+// 0x01071f2c: 0x1071f2c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071f30: 0x1071f30: addiu a1, a1, 21196
+	ldloc.2
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071f34: 0x1071f34: addiu a3, a3, 31776
+	ldloc 4
+	ldc.i4 31776
+	add
+	stloc 4
+// 0x01071f38: 0x1071f38: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01071f3c: 0x1071f3c: jal   0x100449c addiu a2, zero, 3655
+	ldc.i4 3655
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::wst_watchdog_106a420(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_1071fb0:
-// 0x01071fb0: 0x1071fb0: lw    ra, 20(sp)
-// 0x01071fb4: 0x1071fb4: sll   zero, zero, 0
-// 0x01071fb8: 0x1071fb8: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x01071f44: 0x1071f44: j	 0x107205c sll   zero, zero, 0
+	br L_107205c
+// --- basic block ---
+L_1071f4c:
+// 0x01071f4c: 0x1071f4c: sw    s0, 18052(v0)
+	ldloc 6
 	ldloc 5
-	ret
-}
-.method public static int32 RTNet_TransactionQueue_ProcessSingleItem_1071fc0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	ldc.i4.2
+	shr.un
+	ldc.i4 4513
+	add
+	ldloc 9
+	stelem.i4
+// 0x01071f50: 0x1071f50: lui   s2, 0x10000
+	ldc.i4 65536
+	stloc 10
+// 0x01071f54: 0x1071f54: beq   s0, s3, 0x1071fa8 lui   s1, 0x70000
+	ldloc 9
+	ldloc 11
+	ldc.i4 458752
 	stloc 8
-__CIBYL_javamethod_begin:
+	beq  L_1071fa8
 // --- basic block ---
-// 0x01071fc0: 0x1071fc0: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01071f5c: 0x1071f5c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071f60: 0x1071f60: addiu a3, a3, 31856
+	ldloc 4
+	ldc.i4 31856
+	add
+	stloc 4
+// 0x01071f64: 0x1071f64: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01071f68: 0x1071f68: addiu a1, s2, 21196
+	ldloc 10
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071f6c: 0x1071f6c: jal   0x100449c addiu a2, zero, 3668
+	ldc.i4 3668
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x01071fc4: 0x1071fc4: lw    v1, -18464(v0)
+// --- basic block ---
+// 0x01071f74: 0x1071f74: lw    v0, 18060(s1)
+	ldloc 6
 	ldloc 8
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 4515
 	add
 	ldelem.i4
-	stloc 6
-// 0x01071fc8: 0x1071fc8: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01071fcc: 0x1071fcc: sw    ra, 20(sp)
-// 0x01071fd0: 0x1071fd0: addu  a1, a0, zero
-	ldloc.1
-	stloc.2
-// 0x01071fd4: 0x1071fd4: beq   v1, zero, 0x1071fe4 addu  v0, zero, zero
-	ldloc 6
-	ldc.i4.s 0
 	stloc 5
-	brfalse L_1071fe4
+// 0x01071f78: 0x1071f78: sll   zero, zero, 0
+// 0x01071f7c: 0x1071f7c: bne   v0, zero, 0x1072064 lui   a3, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc 4
+	brtrue L_1072064
 // --- basic block ---
-// 0x01071fdc: 0x1071fdc: jal   0x106a08c addu  a0, v1, zero
-	ldloc 6
+// 0x01071f84: 0x1071f84: addiu a1, s2, 21196
+	ldloc 10
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071f88: 0x1071f88: addiu a3, a3, 31900
+	ldloc 4
+	ldc.i4 31900
+	add
+	stloc 4
+// 0x01071f8c: 0x1071f8c: addiu a0, zero, 2
+	ldc.i4.2
 	stloc.1
+// 0x01071f90: 0x1071f90: jal   0x100449c addiu a2, zero, 3672
+	ldc.i4 3672
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_process_queue_item_106a08c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_1071fe4:
-// 0x01071fe4: 0x1071fe4: lw    ra, 20(sp)
-// 0x01071fe8: 0x1071fe8: sll   zero, zero, 0
-// 0x01071fec: 0x1071fec: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_TransactionQueue_Clear_1071ff4(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
+// 0x01071f98: 0x1071f98: jal   0x106f29c addu  a0, zero, zero
 	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl83::Realtime_Stop_106f29c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01071ff4: 0x1071ff4: lui   v0, 0x80000
-	ldc.i4 524288
 	stloc 5
-// 0x01071ff8: 0x1071ff8: lw    a0, -18464(v0)
-	ldloc 7
-	ldloc 5
+// --- basic block ---
+// 0x01071fa0: 0x1071fa0: j	 0x1072064 sw    s3, 18060(s1)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 4515
 	add
-	ldelem.i4
+	ldloc 11
+	stelem.i4
+	br L_1072064
+// --- basic block ---
+L_1071fa8:
+// 0x01071fa8: 0x1071fa8: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01071fac: 0x1071fac: addiu a3, a3, 31992
+	ldloc 4
+	ldc.i4 31992
+	add
+	stloc 4
+// 0x01071fb0: 0x1071fb0: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01071ffc: 0x1071ffc: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x01071fb4: 0x1071fb4: addiu a1, s2, 21196
+	ldloc 10
+	ldc.i4 21196
 	add
-	stloc.0
-// 0x01072000: 0x1072000: beq   a0, zero, 0x1072010 sw    ra, 20(sp)
-	ldloc.1
-	brfalse L_1072010
-// --- basic block ---
-// 0x01072008: 0x1072008: jal   0x1069bd0 sll   zero, zero, 0
+	stloc.2
+// 0x01071fb8: 0x1071fb8: jal   0x100449c addiu a2, zero, 3680
+	ldc.i4 3680
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_queue_clear_1069bd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_1072010:
-// 0x01072010: 0x1072010: lw    ra, 20(sp)
-// 0x01072014: 0x1072014: sll   zero, zero, 0
-// 0x01072018: 0x1072018: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01071fc0: 0x1071fc0: lw    v0, 18060(s1)
+	ldloc 6
 	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4 4515
+	add
+	ldelem.i4
+	stloc 5
+// 0x01071fc4: 0x1071fc4: sll   zero, zero, 0
+// 0x01071fc8: 0x1071fc8: beq   v0, zero, 0x1071ff8 lui   v0, 0x80000
 	ldloc 5
-	ret
-}
-.method public static int32 RTNet_Auth_BuildCommand_1072020(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+	ldc.i4 524288
 	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	brfalse L_1071ff8
+// --- basic block ---
+// 0x01071fd0: 0x1071fd0: lui   a3, 0x10000
+	ldc.i4 65536
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+// 0x01071fd4: 0x1071fd4: addiu a1, s2, 21196
+	ldloc 10
+	ldc.i4 21196
+	add
+	stloc.2
+// 0x01071fd8: 0x1071fd8: addiu a3, a3, 32032
+	ldloc 4
+	ldc.i4 32032
+	add
+	stloc 4
+// 0x01071fdc: 0x1071fdc: addiu a0, zero, 2
+	ldc.i4.2
+	stloc.1
+// 0x01071fe0: 0x1071fe0: jal   0x100449c addiu a2, zero, 3684
+	ldc.i4 3684
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072020: 0x1072020: addiu sp, sp, -40
+// 0x01071fe8: 0x1071fe8: jal   0x1071dd0 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x01072024: 0x1072024: addu  v0, a2, zero
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::Realtime_Start_1071dd0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x01072028: 0x1072028: sw    a3, 16(sp)
+// --- basic block ---
+// 0x01071ff0: 0x1071ff0: j	 0x1072064 sw    zero, 18060(s1)
 	ldloc 6
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 4515
 	add
-	ldloc 4
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107202c: 0x107202c: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x01072030: 0x1072030: lw    v0, 56(sp)
+	br L_1072064
+// --- basic block ---
+L_1071ff8:
+// 0x01071ff8: 0x1071ff8: lw    v1, -18656(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4 -4664
 	add
 	ldelem.i4
+	stloc 7
+// 0x01071ffc: 0x1071ffc: sll   zero, zero, 0
+// 0x01072000: 0x1072000: bne   v1, zero, 0x1072064 sll   zero, zero, 0
+	ldloc 7
+	brtrue L_1072064
+// --- basic block ---
+// 0x01072008: 0x1072008: cibyl_sysc_arg 0x3
+	ldloc 7
+// 0x0107200c: 0x107200c: cibyl_sysc 0x2116
+	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01072034: 0x1072034: addu  v1, a1, zero
-	ldloc.2
+// 0x01072010: 0x1072010: addu  v1, v0, zero
+	ldloc 5
 	stloc 7
-// 0x01072038: 0x1072038: sw    v0, 20(sp)
+// 0x01072014: 0x1072014: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01072018: 0x1072018: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x0107201c: 0x107201c: lw    v0, -18608(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 -4652
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107203c: 0x107203c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072040: 0x1072040: lw    v0, 60(sp)
+	ldelem.i4
+	stloc 5
+// 0x01072020: 0x1072020: lw    a0, 18056(a0)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4 4514
 	add
 	ldelem.i4
+	stloc.1
+// 0x01072024: 0x1072024: sll   zero, zero, 0
+// 0x01072028: 0x1072028: beq   a0, zero, 0x107203c subu  v0, v1, v0
+	ldloc.1
+	ldloc 7
+	ldloc 5
+	sub
 	stloc 5
-// 0x01072044: 0x1072044: addiu a1, a1, 32228
+	brfalse L_107203c
+// --- basic block ---
+// 0x01072030: 0x1072030: slti  v1, v0, 3601
+	ldloc 5
+	ldc.i4 3601
+	clt
+	stloc 7
+// 0x01072034: 0x1072034: bne   v1, zero, 0x1072064 sll   zero, zero, 0
+	ldloc 7
+	brtrue L_1072064
+// --- basic block ---
+L_107203c:
+// 0x0107203c: 0x107203c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01072040: 0x1072040: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01072044: 0x1072044: addiu a1, a1, 21196
 	ldloc.2
-	ldc.i4 32228
+	ldc.i4 21196
 	add
 	stloc.2
-// 0x01072048: 0x1072048: addu  a2, v1, zero
-	ldloc 7
+// 0x01072048: 0x1072048: addiu a3, a3, 32088
+	ldloc 4
+	ldc.i4 32088
+	add
+	stloc 4
+// 0x0107204c: 0x107204c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01072050: 0x1072050: addiu a2, zero, 3698
+	ldc.i4 3698
 	stloc.3
-// 0x0107204c: 0x107204c: sw    ra, 36(sp)
-// 0x01072050: 0x1072050: jal   0x1000f64 sw    v0, 24(sp)
+// 0x01072054: 0x1072054: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldloc 5
 	stelem.i4
@@ -2982,16 +3027,64 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01072058: 0x1072058: lw    ra, 36(sp)
-// 0x0107205c: 0x107205c: sll   zero, zero, 0
-// 0x01072060: 0x1072060: jr    ra addiu sp, sp, 40
+L_107205c:
+// 0x0107205c: 0x107205c: jal   0x107129c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.s 40
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl84::OnTimer_Realtime_107129c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_1072064:
+// 0x01072064: 0x1072064: lw    ra, 44(sp)
+// 0x01072068: 0x1072068: lw    s3, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 11
+// 0x0107206c: 0x107206c: lw    s2, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 10
+// 0x01072070: 0x1072070: lw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 8
+// 0x01072074: 0x1072074: lw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 9
+// 0x01072078: 0x1072078: jr    ra addiu sp, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3001,32 +3094,23 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 format_ParamPair_string_1072068(int32,int32,int32,int32,int32)
+.method public static int32 OnSettingsChanged_EnableDisable_1072080(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s6,int32 s0,int32 s8,int32 s1,int32 s3,int32 s4,int32 s5,int32 s7,int32 s2,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  7 is register v0
+// local  5 is register v0
 // local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local 11 is register s1
-// local 16 is register s2
-// local 12 is register s3
-// local 13 is register s4
-// local 14 is register s5
-// local  8 is register s6
-// local 15 is register s7
 // local  0 is register sp
-// local 10 is register s8
-// local 17 is register ra
-// local  5 is register mem
+// local  8 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
 	stloc 6
 	ldarg 1
@@ -3037,897 +3121,1392 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 17
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072068: 0x1072068: addiu sp, sp, -56
+// 0x01072080: 0x1072080: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107206c: 0x107206c: sw    s1, 20(sp)
-	ldloc 5
+// 0x01072084: 0x1072084: sw    ra, 20(sp)
+// 0x01072088: 0x1072088: jal   0x106b334 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 11
-	stelem.i4
-// 0x01072070: 0x1072070: addu  s1, a1, zero
+	ldloc.1
 	ldloc.2
-	stloc 11
-// 0x01072074: 0x1072074: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01072078: 0x1072078: sw    s2, 24(sp)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::GetEnableDisableState_106b334(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072090: 0x1072090: beq   v0, zero, 0x10720b8 lui   v1, 0x70000
 	ldloc 5
-	ldloc.0
+	ldc.i4 458752
+	stloc 6
+	brfalse L_10720b8
+// --- basic block ---
+// 0x01072098: 0x1072098: lw    v0, 18028(v1)
+	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 4507
 	add
-	ldloc 16
-	stelem.i4
-// 0x0107207c: 0x107207c: sw    s0, 16(sp)
+	ldelem.i4
+	stloc 5
+// 0x0107209c: 0x107209c: sll   zero, zero, 0
+// 0x010720a0: 0x10720a0: bne   v0, zero, 0x10720d0 sll   zero, zero, 0
 	ldloc 5
+	brtrue L_10720d0
+// --- basic block ---
+// 0x010720a8: 0x10720a8: jal   0x1071dd0 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x01072080: 0x1072080: addiu a1, a1, -13884
+	ldloc.1
 	ldloc.2
-	ldc.i4 -13884
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::Realtime_Start_1071dd0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010720b0: 0x10720b0: j	 0x10720d0 sll   zero, zero, 0
+	br L_10720d0
+// --- basic block ---
+L_10720b8:
+// 0x010720b8: 0x10720b8: lw    v0, 18028(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 4507
 	add
-	stloc.2
-// 0x01072084: 0x1072084: addu  s0, a0, zero
+	ldelem.i4
+	stloc 5
+// 0x010720bc: 0x10720bc: sll   zero, zero, 0
+// 0x010720c0: 0x10720c0: beq   v0, zero, 0x10720d0 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_10720d0
+// --- basic block ---
+// 0x010720c8: 0x10720c8: jal   0x106f29c addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
 	ldloc.1
-	stloc 9
-// 0x01072088: 0x1072088: addu  s2, a2, zero
-	ldloc.3
-	stloc 16
-// 0x0107208c: 0x107208c: sll   a2, a2, 1
+	ldloc.2
 	ldloc.3
-	ldc.i4.1
-	shl
-	stloc.3
-// 0x01072090: 0x1072090: sw    ra, 52(sp)
-// 0x01072094: 0x1072094: sw    s7, 44(sp)
+	ldloc 4
+	call int32 Cibyl83::Realtime_Stop_106f29c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_10720d0:
+// 0x010720d0: 0x10720d0: lw    ra, 20(sp)
+// 0x010720d4: 0x10720d4: sll   zero, zero, 0
+// 0x010720d8: 0x10720d8: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	ret
+}
+.method public static int32 Realtime_Initialize_10720e0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s5,int32 s4,int32 s6,int32 s3,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 14 is register s3
+// local 12 is register s4
+// local 11 is register s5
+// local 13 is register s6
+// local  0 is register sp
+// local 15 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 13
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 15
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010720e0: 0x10720e0: addiu sp, sp, -64
+	ldloc.0
+	ldc.i4.s -64
+	add
+	stloc.0
+// 0x010720e4: 0x10720e4: sw    s3, 44(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 11
 	add
-	ldloc 15
+	ldloc 14
 	stelem.i4
-// 0x01072098: 0x1072098: sw    s5, 36(sp)
-	ldloc 5
+// 0x010720e8: 0x10720e8: lui   s3, 0x70000
+	ldc.i4 458752
+	stloc 14
+// 0x010720ec: 0x10720ec: sw    s4, 48(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 12
 	add
-	ldloc 14
+	ldloc 12
 	stelem.i4
-// 0x0107209c: 0x107209c: sw    s4, 32(sp)
-	ldloc 5
-	ldloc.0
+// 0x010720f0: 0x10720f0: lw    s4, 18020(s3)
+	ldloc 7
+	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 4505
 	add
-	ldloc 13
-	stelem.i4
-// 0x010720a0: 0x10720a0: sw    s3, 28(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 12
+// 0x010720f4: 0x10720f4: sw    ra, 60(sp)
+// 0x010720f8: 0x10720f8: sw    s6, 56(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 14
 	add
-	ldloc 12
+	ldloc 13
 	stelem.i4
-// 0x010720a4: 0x10720a4: addu  s4, a3, zero
-	ldloc 4
-	stloc 13
-// 0x010720a8: 0x10720a8: sw    s8, 48(sp)
-	ldloc 5
+// 0x010720fc: 0x10720fc: sw    s5, 52(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.s 13
 	add
-	ldloc 10
+	ldloc 11
 	stelem.i4
-// 0x010720ac: 0x10720ac: jal   0x1000f64 sw    s6, 40(sp)
-	ldloc 5
+// 0x01072100: 0x1072100: sw    s2, 40(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 10
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
-// --- basic block ---
-// 0x010720b4: 0x10720b4: lw    s3, 72(sp)
-	ldloc 5
+// 0x01072104: 0x1072104: sw    s1, 36(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc 12
-// 0x010720b8: 0x10720b8: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
-// --- basic block ---
-// 0x010720c0: 0x10720c0: addu  s5, zero, zero
-	ldc.i4.s 0
-	stloc 14
-// 0x010720c4: 0x10720c4: j	 0x1072210 addiu s7, zero, 44
-	ldc.i4.s 44
-	stloc 15
-	br L_1072210
-// --- basic block ---
-L_10720cc:
-// 0x010720cc: 0x10720cc: lw    v1, 0(s4)
-	ldloc 5
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 6
-// 0x010720d0: 0x10720d0: sll   zero, zero, 0
-// 0x010720d4: 0x10720d4: beq   v1, zero, 0x1072204 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1072204
-// --- basic block ---
-// 0x010720dc: 0x10720dc: lb    v1, 0(v1)
-	ldloc 6
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x010720e0: 0x10720e0: sll   zero, zero, 0
-// 0x010720e4: 0x10720e4: beq   v1, zero, 0x1072204 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1072204
-// --- basic block ---
-// 0x010720ec: 0x10720ec: lw    v1, 0(s3)
-	ldloc 5
+	stelem.i4
+// 0x01072108: 0x1072108: bne   s4, zero, 0x1072444 sw    s0, 32(sp)
 	ldloc 12
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 6
-// 0x010720f0: 0x10720f0: sll   zero, zero, 0
-// 0x010720f4: 0x10720f4: beq   v1, zero, 0x1072204 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1072204
-// --- basic block ---
-// 0x010720fc: 0x10720fc: lb    v1, 0(v1)
-	ldloc 6
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01072100: 0x1072100: sll   zero, zero, 0
-// 0x01072104: 0x1072104: beq   v1, zero, 0x1072204 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1072204
-// --- basic block ---
-// 0x0107210c: 0x107210c: bne   v0, s1, 0x1072130 addu  v1, s0, v0
-	ldloc 7
-	ldloc 11
-	ldloc 9
-	ldloc 7
+	ldc.i4.8
 	add
-	stloc 6
-	bne.un L_1072130
+	ldloc 8
+	stelem.i4
+	brtrue L_1072444
 // --- basic block ---
-// 0x01072114: 0x1072114: lui   a1, 0x10000
+// 0x01072110: 0x1072110: lui   s0, 0x20000
+	ldc.i4 131072
+	stloc 8
+// 0x01072114: 0x1072114: lui   s2, 0x10000
 	ldc.i4 65536
+	stloc 10
+// 0x01072118: 0x1072118: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-// 0x01072118: 0x1072118: lui   a3, 0x10000
-	ldc.i4 65536
+// 0x0107211c: 0x107211c: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x01072120: 0x1072120: addiu a2, s2, 18768
+	ldloc 10
+	ldc.i4 18768
+	add
+	stloc.3
+// 0x01072124: 0x1072124: addu  a3, zero, zero
+	ldc.i4.s 0
 	stloc 4
-// 0x0107211c: 0x107211c: addiu a1, a1, 32252
+// 0x01072128: 0x1072128: jal   0x100edc0 addiu a1, a1, 18684
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 18684
 	add
 	stloc.2
-// 0x01072120: 0x1072120: addiu a3, a3, 32288
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 32288
-	add
-	stloc 4
-// 0x01072124: 0x1072124: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01072128: 0x1072128: j	 0x1072168 addiu a2, zero, 319
-	ldc.i4 319
-	stloc.3
-	br L_1072168
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_1072130:
-// 0x01072130: 0x1072130: addiu s6, v0, 1
-	ldloc 7
-	ldc.i4.1
-	add
-	stloc 8
-// 0x01072134: 0x1072134: sb    s7, 0(v1)
-	ldloc 6
-	ldloc 15
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01072138: 0x1072138: addu  s8, s0, s6
-	ldloc 9
+// 0x01072130: 0x1072130: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x01072134: 0x1072134: addiu a0, s0, -26424
 	ldloc 8
+	ldc.i4 -26424
 	add
-	stloc 10
-// 0x0107213c: 0x107213c: lw    a0, 0(s4)
-	ldloc 5
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldelem.i4
 	stloc.1
-// 0x01072140: 0x1072140: addu  a1, s8, zero
+// 0x01072138: 0x1072138: addiu a2, s2, 18768
 	ldloc 10
-	stloc.2
-// 0x01072144: 0x1072144: jal   0x1067b64 subu  a2, s1, s6
-	ldloc 11
-	ldloc 8
-	sub
+	ldc.i4 18768
+	add
 	stloc.3
+// 0x0107213c: 0x107213c: jal   0x100ed80 addiu a1, a1, 18700
+	ldloc.2
+	ldc.i4 18700
+	add
+	stloc.2
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_password_100ed80(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107214c: 0x107214c: bne   v0, zero, 0x107218c lui   a1, 0x10000
-	ldloc 7
-	ldc.i4 65536
+// 0x01072144: 0x1072144: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-	brtrue L_107218c
-// --- basic block ---
-// 0x01072154: 0x1072154: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01072158: 0x1072158: addiu a1, a1, 32252
+// 0x01072148: 0x1072148: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x0107214c: 0x107214c: addiu a2, s2, 18768
+	ldloc 10
+	ldc.i4 18768
+	add
+	stloc.3
+// 0x01072150: 0x1072150: addiu a1, a1, 18668
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 18668
 	add
 	stloc.2
-// 0x0107215c: 0x107215c: addiu a3, a3, 32288
+// 0x01072154: 0x1072154: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x01072158: 0x1072158: jal   0x100edc0 lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 32288
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072160: 0x1072160: lui   s5, 0x0
+	ldc.i4.s 0
+	stloc 11
+// 0x01072164: 0x1072164: lui   s6, 0x0
+	ldc.i4.s 0
+	stloc 13
+// 0x01072168: 0x1072168: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107216c: 0x107216c: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x01072170: 0x1072170: addiu s6, s6, 31272
+	ldloc 13
+	ldc.i4 31272
+	add
+	stloc 13
+// 0x01072174: 0x1072174: addiu a0, s1, 12556
+	ldloc 9
+	ldc.i4 12556
 	add
-	stloc 4
-// 0x01072160: 0x1072160: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x01072164: 0x1072164: addiu a2, zero, 327
-	ldc.i4 327
+// 0x01072178: 0x1072178: addiu a3, s5, 21112
+	ldloc 11
+	ldc.i4 21112
+	add
+	stloc 4
+// 0x0107217c: 0x107217c: addiu a1, a1, 15088
+	ldloc.2
+	ldc.i4 15088
+	add
+	stloc.2
+// 0x01072180: 0x1072180: addiu a2, a2, 8320
+	ldloc.3
+	ldc.i4 8320
+	add
 	stloc.3
-L_1072168:
-// 0x01072168: 0x1072168: jal   0x100449c sll   zero, zero, 0
+// 0x01072184: 0x1072184: sw    s6, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 13
+	stelem.i4
+// 0x01072188: 0x1072188: jal   0x100ee08 sw    zero, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072170: 0x1072170: lui   a0, 0x0
+// 0x01072190: 0x1072190: lui   a1, 0x0
 	ldc.i4.s 0
-	stloc.1
-// 0x01072174: 0x1072174: lui   a1, 0x10000
-	ldc.i4 65536
 	stloc.2
-// 0x01072178: 0x1072178: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
+// 0x01072194: 0x1072194: addu  a3, s6, zero
+	ldloc 13
+	stloc 4
+// 0x01072198: 0x1072198: addiu a0, s1, 12556
+	ldloc 9
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0107217c: 0x107217c: jal   0x104c148 addiu a1, a1, 32340
+// 0x0107219c: 0x107219c: addiu a1, a1, 15104
 	ldloc.2
-	ldc.i4 32340
+	ldc.i4 15104
 	add
 	stloc.2
+// 0x010721a0: 0x10721a0: addiu s5, s5, 21112
+	ldloc 11
+	ldc.i4 21112
+	add
+	stloc 11
+// 0x010721a4: 0x10721a4: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x010721a8: 0x10721a8: sw    s5, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 11
+	stelem.i4
+// 0x010721ac: 0x10721ac: jal   0x100ee08 sw    zero, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072184: 0x1072184: j	 0x1072220 addu  v0, zero, zero
+// 0x010721b4: 0x10721b4: lui   a1, 0x0
 	ldc.i4.s 0
-	stloc 7
-	br L_1072220
-// --- basic block ---
-L_107218c:
-// 0x0107218c: 0x107218c: jal   0x1001b48 addu  a0, s8, zero
-	ldloc 10
+	stloc.2
+// 0x010721b8: 0x10721b8: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x010721bc: 0x10721bc: addiu a0, s1, 12556
+	ldloc 9
+	ldc.i4 12556
+	add
 	stloc.1
+// 0x010721c0: 0x10721c0: addiu a1, a1, 15120
+	ldloc.2
+	ldc.i4 15120
+	add
+	stloc.2
+// 0x010721c4: 0x10721c4: addiu a2, a2, 32176
+	ldloc.3
+	ldc.i4 32176
+	add
+	stloc.3
+// 0x010721c8: 0x10721c8: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072194: 0x1072194: addu  s6, v0, s6
-	ldloc 7
-	ldloc 8
-	add
-	stloc 8
-// 0x01072198: 0x1072198: bne   s6, s1, 0x10721b8 lui   a1, 0x10000
-	ldloc 8
-	ldloc 11
-	ldc.i4 65536
+// 0x010721d0: 0x10721d0: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-	bne.un L_10721b8
-// --- basic block ---
-// 0x010721a0: 0x10721a0: lui   a3, 0x10000
+// 0x010721d4: 0x10721d4: lui   a2, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x010721a4: 0x10721a4: addiu a1, a1, 32252
+	stloc.3
+// 0x010721d8: 0x10721d8: addiu a0, s1, 12556
+	ldloc 9
+	ldc.i4 12556
+	add
+	stloc.1
+// 0x010721dc: 0x10721dc: addiu a1, a1, 15136
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 15136
 	add
 	stloc.2
-// 0x010721a8: 0x10721a8: addiu a3, a3, 32288
-	ldloc 4
-	ldc.i4 32288
+// 0x010721e0: 0x10721e0: addiu a2, a2, 32180
+	ldloc.3
+	ldc.i4 32180
 	add
-	stloc 4
-// 0x010721ac: 0x10721ac: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010721b0: 0x10721b0: j	 0x1072168 addiu a2, zero, 335
-	ldc.i4 335
 	stloc.3
-	br L_1072168
+// 0x010721e4: 0x10721e4: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_10721b8:
-// 0x010721b8: 0x10721b8: addu  v0, s0, s6
+// 0x010721ec: 0x10721ec: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x010721f0: 0x10721f0: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x010721f4: 0x10721f4: addiu a0, s1, 12556
 	ldloc 9
-	ldloc 8
+	ldc.i4 12556
 	add
-	stloc 7
-// 0x010721bc: 0x10721bc: sb    s7, 0(v0)
-	ldloc 7
-	ldloc 15
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010721c0: 0x10721c0: addiu s6, s6, 1
-	ldloc 8
-	ldc.i4.1
+	stloc.1
+// 0x010721f8: 0x10721f8: addiu a1, a1, 15152
+	ldloc.2
+	ldc.i4 15152
 	add
-	stloc 8
-// 0x010721c4: 0x10721c4: addu  s8, s0, s6
+	stloc.2
+// 0x010721fc: 0x10721fc: addiu a2, a2, 32188
+	ldloc.3
+	ldc.i4 32188
+	add
+	stloc.3
+// 0x01072200: 0x1072200: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072208: 0x1072208: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107220c: 0x107220c: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x01072210: 0x1072210: addiu a0, s1, 12556
 	ldloc 9
-	ldloc 8
+	ldc.i4 12556
 	add
-	stloc 10
-// 0x010721c8: 0x10721c8: lw    a0, 0(s3)
-	ldloc 5
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldelem.i4
 	stloc.1
-// 0x010721cc: 0x10721cc: addu  a1, s8, zero
-	ldloc 10
+// 0x01072214: 0x1072214: addiu a1, a1, 15168
+	ldloc.2
+	ldc.i4 15168
+	add
 	stloc.2
-// 0x010721d0: 0x10721d0: jal   0x1067b64 subu  a2, s1, s6
-	ldloc 11
-	ldloc 8
-	sub
+// 0x01072218: 0x1072218: addiu a2, a2, 32196
+	ldloc.3
+	ldc.i4 32196
+	add
 	stloc.3
+// 0x0107221c: 0x107221c: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x010721d8: 0x10721d8: bne   v0, zero, 0x10721f8 lui   a1, 0x10000
-	ldloc 7
-	ldc.i4 65536
+// 0x01072224: 0x1072224: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-	brtrue L_10721f8
-// --- basic block ---
-// 0x010721e0: 0x10721e0: lui   a3, 0x10000
+// 0x01072228: 0x1072228: lui   a2, 0x10000
 	ldc.i4 65536
-	stloc 4
-// 0x010721e4: 0x10721e4: addiu a1, a1, 32252
+	stloc.3
+// 0x0107222c: 0x107222c: addiu a0, s1, 12556
+	ldloc 9
+	ldc.i4 12556
+	add
+	stloc.1
+// 0x01072230: 0x1072230: addiu a1, a1, 15184
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 15184
 	add
 	stloc.2
-// 0x010721e8: 0x10721e8: addiu a3, a3, 32288
-	ldloc 4
-	ldc.i4 32288
+// 0x01072234: 0x1072234: addiu a2, a2, 32200
+	ldloc.3
+	ldc.i4 32200
 	add
-	stloc 4
-// 0x010721ec: 0x10721ec: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010721f0: 0x10721f0: j	 0x1072168 addiu a2, zero, 343
-	ldc.i4 343
 	stloc.3
-	br L_1072168
-// --- basic block ---
-L_10721f8:
-// 0x010721f8: 0x10721f8: jal   0x1001b48 addu  a0, s8, zero
-	ldloc 10
-	stloc.1
+// 0x01072238: 0x1072238: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072200: 0x1072200: addu  v0, v0, s6
-	ldloc 7
-	ldloc 8
+// 0x01072240: 0x1072240: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x01072244: 0x1072244: addiu a0, s1, 12556
+	ldloc 9
+	ldc.i4 12556
 	add
-	stloc 7
-L_1072204:
-// 0x01072204: 0x1072204: addiu s5, s5, 1
-	ldloc 14
-	ldc.i4.1
+	stloc.1
+// 0x01072248: 0x1072248: addiu a2, s2, 18768
+	ldloc 10
+	ldc.i4 18768
 	add
-	stloc 14
-// 0x01072208: 0x1072208: addiu s4, s4, 4
-	ldloc 13
-	ldc.i4.4
+	stloc.3
+// 0x0107224c: 0x107224c: addiu a1, a1, 15200
+	ldloc.2
+	ldc.i4 15200
 	add
-	stloc 13
-// 0x0107220c: 0x107220c: addiu s3, s3, 4
-	ldloc 12
-	ldc.i4.4
-	add
-	stloc 12
-L_1072210:
-// 0x01072210: 0x1072210: slt   v1, s5, s2
-	ldloc 14
-	ldloc 16
-	clt
+	stloc.2
+// 0x01072250: 0x1072250: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x01072214: 0x1072214: bne   v1, zero, 0x10720cc sll   zero, zero, 0
-	ldloc 6
-	brtrue L_10720cc
+	stloc 5
 // --- basic block ---
-// 0x0107221c: 0x107221c: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 7
-L_1072220:
-// 0x01072220: 0x1072220: lw    ra, 52(sp)
-// 0x01072224: 0x1072224: lw    s8, 48(sp)
+// 0x01072258: 0x1072258: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x0107225c: 0x107225c: addiu v0, v0, 20776
 	ldloc 5
+	ldc.i4 20776
+	add
+	stloc 5
+// 0x01072260: 0x1072260: lui   s1, 0x1070000
+	ldc.i4 17235968
+	stloc 9
+// 0x01072264: 0x1072264: sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 10
-// 0x01072228: 0x1072228: lw    s7, 44(sp)
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	stelem.i4
+// 0x01072268: 0x1072268: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107226c: 0x107226c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01072270: 0x1072270: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01072274: 0x1072274: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
 	add
-	ldelem.i4
-	stloc 15
-// 0x0107222c: 0x107222c: lw    s6, 40(sp)
+	stloc.1
+// 0x01072278: 0x1072278: addiu a2, s1, -5956
+	ldloc 9
+	ldc.i4 -5956
+	add
+	stloc.3
+// 0x0107227c: 0x107227c: addiu a1, a1, 14928
+	ldloc.2
+	ldc.i4 14928
+	add
+	stloc.2
+// 0x01072280: 0x1072280: addiu a3, a3, 32204
+	ldloc 4
+	ldc.i4 32204
+	add
+	stloc 4
+// 0x01072284: 0x1072284: addiu v0, v0, 32216
 	ldloc 5
+	ldc.i4 32216
+	add
+	stloc 5
+// 0x01072288: 0x1072288: sw    v0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 8
-// 0x01072230: 0x1072230: lw    s5, 36(sp)
 	ldloc 5
+	stelem.i4
+// 0x0107228c: 0x107228c: jal   0x100ee08 sw    zero, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 14
-// 0x01072234: 0x1072234: lw    s4, 32(sp)
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072294: 0x1072294: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x01072298: 0x1072298: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0107229c: 0x107229c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x010722a0: 0x10722a0: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x010722a4: 0x10722a4: addiu a2, s1, -5956
+	ldloc 9
+	ldc.i4 -5956
+	add
+	stloc.3
+// 0x010722a8: 0x10722a8: addiu a1, a1, 14944
+	ldloc.2
+	ldc.i4 14944
+	add
+	stloc.2
+// 0x010722ac: 0x10722ac: addiu a3, a3, 32228
+	ldloc 4
+	ldc.i4 32228
+	add
+	stloc 4
+// 0x010722b0: 0x10722b0: addiu v0, v0, 32244
 	ldloc 5
+	ldc.i4 32244
+	add
+	stloc 5
+// 0x010722b4: 0x10722b4: sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 13
-// 0x01072238: 0x1072238: lw    s3, 28(sp)
 	ldloc 5
+	stelem.i4
+// 0x010722b8: 0x10722b8: jal   0x100ee08 sw    zero, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 12
-// 0x0107223c: 0x107223c: lw    s2, 24(sp)
-	ldloc 5
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010722c0: 0x10722c0: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x010722c4: 0x10722c4: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x010722c8: 0x10722c8: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x010722cc: 0x10722cc: addiu a1, a1, 15072
+	ldloc.2
+	ldc.i4 15072
+	add
+	stloc.2
+// 0x010722d0: 0x10722d0: addiu a2, a2, -52
+	ldloc.3
+	ldc.i4.s -52
+	add
+	stloc.3
+// 0x010722d4: 0x10722d4: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010722dc: 0x10722dc: lui   s5, 0x10000
+	ldc.i4 65536
+	stloc 11
+// 0x010722e0: 0x10722e0: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x010722e4: 0x10722e4: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x010722e8: 0x10722e8: addiu a0, s5, 19712
+	ldloc 11
+	ldc.i4 19712
+	add
+	stloc.1
+// 0x010722ec: 0x10722ec: addiu a1, a1, 15012
+	ldloc.2
+	ldc.i4 15012
+	add
+	stloc.2
+// 0x010722f0: 0x10722f0: addiu a2, a2, 9420
+	ldloc.3
+	ldc.i4 9420
+	add
+	stloc.3
+// 0x010722f4: 0x10722f4: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010722fc: 0x10722fc: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x01072300: 0x1072300: addiu a0, s5, 19712
+	ldloc 11
+	ldc.i4 19712
+	add
+	stloc.1
+// 0x01072304: 0x1072304: addiu a2, s2, 18768
+	ldloc 10
+	ldc.i4 18768
+	add
+	stloc.3
+// 0x01072308: 0x1072308: addiu a1, a1, 15028
+	ldloc.2
+	ldc.i4 15028
+	add
+	stloc.2
+// 0x0107230c: 0x107230c: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072314: 0x1072314: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x01072318: 0x1072318: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107231c: 0x107231c: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x01072320: 0x1072320: addiu a1, a1, 14996
+	ldloc.2
+	ldc.i4 14996
+	add
+	stloc.2
+// 0x01072324: 0x1072324: addiu a2, a2, 19396
+	ldloc.3
+	ldc.i4 19396
+	add
+	stloc.3
+// 0x01072328: 0x1072328: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072330: 0x1072330: lui   s5, 0x20000
+	ldc.i4 131072
+	stloc 11
+// 0x01072334: 0x1072334: lui   s2, 0x0
+	ldc.i4.s 0
+	stloc 10
+// 0x01072338: 0x1072338: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107233c: 0x107233c: addiu s2, s2, 20820
+	ldloc 10
+	ldc.i4 20820
+	add
+	stloc 10
+// 0x01072340: 0x1072340: addiu a2, s1, -5956
+	ldloc 9
+	ldc.i4 -5956
+	add
+	stloc.3
+// 0x01072344: 0x1072344: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x01072348: 0x1072348: addiu a3, s5, 9928
+	ldloc 11
+	ldc.i4 9928
+	add
+	stloc 4
+// 0x0107234c: 0x107234c: addiu a1, a1, 14976
+	ldloc.2
+	ldc.i4 14976
+	add
+	stloc.2
+// 0x01072350: 0x1072350: sw    s2, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 16
-// 0x01072240: 0x1072240: lw    s1, 20(sp)
-	ldloc 5
+	ldloc 10
+	stelem.i4
+// 0x01072354: 0x1072354: jal   0x100ee08 sw    zero, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 11
-// 0x01072244: 0x1072244: lw    s0, 16(sp)
-	ldloc 5
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107235c: 0x107235c: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x01072360: 0x1072360: addiu a0, s0, -26424
+	ldloc 8
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x01072364: 0x1072364: addiu a3, s5, 9928
+	ldloc 11
+	ldc.i4 9928
+	add
+	stloc 4
+// 0x01072368: 0x1072368: addiu a1, a1, 14960
+	ldloc.2
+	ldc.i4 14960
+	add
+	stloc.2
+// 0x0107236c: 0x107236c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x01072370: 0x1072370: sw    s2, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 9
-// 0x01072248: 0x1072248: jr    ra addiu sp, sp, 56
+	ldloc 10
+	stelem.i4
+// 0x01072374: 0x1072374: jal   0x100ee08 sw    zero, 20(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 RTNet_ReportOneSegment_MaxLength_1072250(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra,int32 lo)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local 10 is register lo
-// local  7 is register mem
-
 	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	ldc.i4.s 0
+// --- basic block ---
+// 0x0107237c: 0x107237c: jal   0x108e0e8 lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::RealtimePrivacyInit_108e0e8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	stloc 5
+// --- basic block ---
+// 0x01072384: 0x1072384: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x01072388: 0x1072388: lui   a2, 0x1070000
+	ldc.i4 17235968
+	stloc.3
+// 0x0107238c: 0x107238c: lui   a3, 0x1070000
+	ldc.i4 17235968
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
+// 0x01072390: 0x1072390: lui   a0, 0x70000
+	ldc.i4 458752
+	stloc.1
+// 0x01072394: 0x1072394: addiu a1, a1, -10052
+	ldloc.2
+	ldc.i4 -10052
+	add
+	stloc.2
+// 0x01072398: 0x1072398: addiu a2, a2, -10560
+	ldloc.3
+	ldc.i4 -10560
+	add
+	stloc.3
+// 0x0107239c: 0x107239c: addiu a3, a3, -10920
+	ldloc 4
+	ldc.i4 -10920
+	add
+	stloc 4
+// 0x010723a0: 0x10723a0: jal   0x1086284 addiu a0, a0, 18192
+	ldloc.1
+	ldc.i4 18192
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl100::RTConnectionInfo_Init_1086284(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01072250: 0x1072250: addiu sp, sp, -48
+// 0x010723a8: 0x10723a8: lui   a0, 0xf0000
+	ldc.i4 983040
+	stloc.1
+// 0x010723ac: 0x10723ac: jal   0x108d700 addiu a0, a0, -29592
+	ldloc.1
+	ldc.i4 -29592
+	add
+	stloc.1
 	ldloc.0
-	ldc.i4.s -48
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::VersionUpgradeInfo_Init_108d700(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010723b4: 0x10723b4: jal   0x108d6f0 addiu a0, s0, -18608
+	ldloc 8
+	ldc.i4 -18608
 	add
-	stloc.0
-// 0x01072254: 0x1072254: sw    s0, 40(sp)
-	ldloc 7
+	stloc.1
+	ldloc.1
+	call void Cibyl105::StatusStatistics_Init_108d6f0(int32)
+// --- basic block ---
+// 0x010723bc: 0x10723bc: jal   0x107beb8 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl93::RTAlerts_Init_107beb8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010723c4: 0x10723c4: jal   0x1076234 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RealtimeBonus_Init_1076234(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010723cc: 0x10723cc: jal   0x109043c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl107::RealtimeExternalPoi_Init_109043c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010723d4: 0x10723d4: jal   0x1075cc8 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 8
-	stelem.i4
-// 0x01072258: 0x1072258: sw    ra, 44(sp)
-// 0x0107225c: 0x107225c: jal   0x10b57b4 addu  s0, a0, zero
 	ldloc.1
-	stloc 8
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RTNet_Init_1075cc8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010723dc: 0x10723dc: jal   0x106b52c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_committed_10b57b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_LoginDetailsInit_106b52c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01072264: 0x1072264: bne   v0, zero, 0x1072300 addu  v0, zero, zero
-	ldloc 5
-	ldc.i4.s 0
+// 0x010723e4: 0x10723e4: jal   0x106cf4c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl81::Realtime_SessionDetailsInit_106cf4c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	brtrue L_1072300
 // --- basic block ---
-// 0x0107226c: 0x107226c: addiu v0, sp, 28
+// 0x010723ec: 0x10723ec: jal   0x108d7ec sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.s 28
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::RTSystemMessagesInit_108d7ec(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x01072270: 0x1072270: addu  a0, s0, zero
-	ldloc 8
+// --- basic block ---
+// 0x010723f4: 0x10723f4: cibyl_sysc_arg 0x14
+	ldloc 12
+// 0x010723f8: 0x10723f8: cibyl_sysc 0x211b
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 5
+// 0x010723fc: 0x10723fc: addu  s4, v0, zero
+	ldloc 5
+	stloc 12
+// 0x01072400: 0x1072400: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x01072404: 0x1072404: addiu a0, a0, 7816
+	ldloc.1
+	ldc.i4 7816
+	add
 	stloc.1
-// 0x01072274: 0x1072274: addu  a1, zero, zero
+// 0x01072408: 0x1072408: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01072278: 0x1072278: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107227c: 0x107227c: addiu a3, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 4
-// 0x01072280: 0x1072280: sw    v0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x01072284: 0x1072284: jal   0x10b5d30 sw    zero, 16(sp)
+// 0x0107240c: 0x107240c: jal   0x10400e8 sw    s4, -18608(s0)
 	ldloc 7
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 -4652
 	add
-	ldc.i4.s 0
+	ldloc 12
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_device_events_register_10400e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107228c: 0x107228c: lw    v0, 28(sp)
+// 0x01072414: 0x1072414: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x01072418: 0x1072418: jal   0x1072080 sw    v0, 18020(s3)
 	ldloc 7
-	ldloc.0
+	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 4505
 	add
-	ldelem.i4
-	stloc 5
-// 0x01072290: 0x1072290: sll   zero, zero, 0
-// 0x01072294: 0x1072294: andi  v0, v0, 4
-	ldloc 5
-	ldc.i4.4
-	and
-	stloc 5
-// 0x01072298: 0x1072298: beq   v0, zero, 0x1072300 addu  v0, zero, zero
 	ldloc 5
-	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::OnSettingsChanged_EnableDisable_1072080(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	brfalse L_1072300
 // --- basic block ---
-// 0x010722a0: 0x10722a0: lw    a0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc.1
-// 0x010722a4: 0x10722a4: addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x01072420: 0x1072420: lui   a1, 0x1070000
+	ldc.i4 17235968
 	stloc.2
-// 0x010722a8: 0x10722a8: addiu a2, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x01072424: 0x1072424: addiu a1, a1, -15368
+	ldloc.2
+	ldc.i4 -15368
 	add
-	stloc.3
-// 0x010722ac: 0x10722ac: addiu a3, sp, 36
+	stloc.2
+// 0x01072428: 0x1072428: jal   0x104fea8 addiu a0, zero, 30000
+	ldc.i4 30000
+	stloc.1
 	ldloc.0
-	ldc.i4.s 36
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072430: 0x1072430: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x01072434: 0x1072434: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01072438: 0x1072438: addiu a0, a0, -12348
+	ldloc.1
+	ldc.i4 -12348
 	add
-	stloc 4
-// 0x010722b0: 0x10722b0: jal   0x10b48f8 sw    zero, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc.1
+// 0x0107243c: 0x107243c: jal   0x100de9c addiu a1, a1, 32260
+	ldloc.2
+	ldc.i4 32260
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_register_100de9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010722b8: 0x10722b8: lw    v0, 32(sp)
+L_1072444:
+// 0x01072444: 0x1072444: lw    ra, 60(sp)
+// 0x01072448: 0x1072448: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107244c: 0x107244c: lw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 5
-// 0x010722bc: 0x10722bc: sll   zero, zero, 0
-// 0x010722c0: 0x10722c0: bltz  v0, 0x10722d8 addu  v1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	blt L_10722d8
-// --- basic block ---
-// 0x010722c8: 0x10722c8: lw    v1, 36(sp)
+	stloc 13
+// 0x01072450: 0x1072450: lw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc 6
-// 0x010722cc: 0x10722cc: sll   zero, zero, 0
-// 0x010722d0: 0x10722d0: addiu v1, v1, 1
-	ldloc 6
-	ldc.i4.1
-	add
-	stloc 6
-// 0x010722d4: 0x10722d4: subu  v1, v1, v0
-	ldloc 6
-	ldloc 5
-	sub
-	stloc 6
-L_10722d8:
-// 0x010722d8: 0x10722d8: addiu v0, zero, 36
-	ldc.i4.s 36
-	stloc 5
-// 0x010722dc: 0x10722dc: mult  v1, v0
-	ldloc 6
-	ldloc 5
-	mul
-	stloc 10
-// 0x010722e0: 0x10722e0: lw    a0, 28(sp)
+	stloc 11
+// 0x01072454: 0x1072454: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc.1
-// 0x010722e4: 0x10722e4: sll   zero, zero, 0
-// 0x010722e8: 0x10722e8: andi  a0, a0, 1
-	ldloc.1
-	ldc.i4.1
-	and
-	stloc.1
-// 0x010722ec: 0x10722ec: mflo  lo
-	ldloc 10
-	stloc 6
-// 0x010722f0: 0x10722f0: bne   a0, zero, 0x10722fc addiu v0, v1, 154
-	ldloc.1
-	ldloc 6
-	ldc.i4 154
+	stloc 12
+// 0x01072458: 0x1072458: lw    s3, 44(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc 5
-	brtrue L_10722fc
-// --- basic block ---
-// 0x010722f8: 0x10722f8: addiu v0, v1, 2210
-	ldloc 6
-	ldc.i4 2210
+	ldelem.i4
+	stloc 14
+// 0x0107245c: 0x107245c: lw    s2, 40(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
-	stloc 5
-L_10722fc:
-// 0x010722fc: 0x10722fc: addiu v0, v0, 1024
-	ldloc 5
-	ldc.i4 1024
+	ldelem.i4
+	stloc 10
+// 0x01072460: 0x1072460: lw    s1, 36(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
 	add
-	stloc 5
-L_1072300:
-// 0x01072300: 0x1072300: lw    ra, 44(sp)
-// 0x01072304: 0x1072304: lw    s0, 40(sp)
+	ldelem.i4
+	stloc 9
+// 0x01072464: 0x1072464: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.8
 	add
 	ldelem.i4
 	stloc 8
-// 0x01072308: 0x1072308: jr    ra addiu sp, sp, 48
+// 0x01072468: 0x1072468: jr    ra addiu sp, sp, 64
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -3937,27 +4516,29 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTNet_RandomUserRegister_10723bc(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_CreateAccount_1072480(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 t2,int32 v1,int32 ra,int32 t0,int32 t1,int32 t3)
 
-// local  7 is register v0
-// local  6 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
+// local 10 is register t0
+// local 11 is register t1
+// local  7 is register t2
+// local 12 is register t3
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  9 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3967,274 +4548,210 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010723bc: 0x10723bc: addiu sp, sp, -64
-	ldloc.0
-	ldc.i4.s -64
-	add
-	stloc.0
-// 0x010723c0: 0x10723c0: sw    s1, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 9
-	stelem.i4
-// 0x010723c4: 0x10723c4: sw    s0, 52(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 8
-	stelem.i4
-// 0x010723c8: 0x10723c8: addu  s1, a1, zero
-	ldloc.2
-	stloc 9
-// 0x010723cc: 0x10723cc: addu  s0, a0, zero
-	ldloc.1
-	stloc 8
-// 0x010723d0: 0x10723d0: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x010723d4: 0x10723d4: sw    ra, 60(sp)
-// 0x010723d8: 0x10723d8: jal   0x100177c addiu a2, zero, 64
-	ldc.i4.s 64
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
-// --- basic block ---
-// 0x010723e0: 0x10723e0: addiu a0, s0, 64
-	ldloc 8
-	ldc.i4.s 64
-	add
-	stloc.1
-// 0x010723e4: 0x10723e4: addu  a1, zero, zero
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldc.i4.s 0
-	stloc.2
-// 0x010723e8: 0x10723e8: jal   0x100177c addiu a2, zero, 64
-	ldc.i4.s 64
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 7
-// --- basic block ---
-// 0x010723f0: 0x10723f0: addiu a0, s0, 128
-	ldloc 8
-	ldc.i4 128
-	add
-	stloc.1
-// 0x010723f4: 0x10723f4: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc.2
-// 0x010723f8: 0x10723f8: jal   0x100177c addiu a2, zero, 64
-	ldc.i4.s 64
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 12
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072400: 0x1072400: lui   v0, 0x80000
+// 0x01072480: 0x1072480: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
+	add
+	stloc.0
+// 0x01072484: 0x1072484: lui   v0, 0x80000
 	ldc.i4 524288
+	stloc 5
+// 0x01072488: 0x1072488: addu  t2, a0, zero
+	ldloc.1
 	stloc 7
-// 0x01072404: 0x1072404: lw    a0, -18464(v0)
+// 0x0107248c: 0x107248c: lw    a0, -18000(v0)
+	ldloc 6
 	ldloc 5
-	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4 -4500
 	add
 	ldelem.i4
 	stloc.1
-// 0x01072408: 0x1072408: jal   0x102c3f0 sw    a0, 40(sp)
-	ldloc 5
+// 0x01072490: 0x1072490: lw    v0, 72(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 18
 	add
-	ldloc.1
-	stelem.i4
-	ldloc.0
-	ldloc.1
+	ldelem.i4
+	stloc 5
+// 0x01072494: 0x1072494: sw    ra, 52(sp)
+// 0x01072498: 0x1072498: addu  t1, a1, zero
 	ldloc.2
+	stloc 11
+// 0x0107249c: 0x107249c: addu  t0, a2, zero
 	ldloc.3
+	stloc 10
+// 0x010724a0: 0x10724a0: bne   v0, zero, 0x10724b4 addu  v1, a3, zero
+	ldloc 5
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
+	stloc 8
+	brtrue L_10724b4
 // --- basic block ---
-// 0x01072410: 0x1072410: lui   v1, 0x10000
+// 0x010724a8: 0x10724a8: lui   v0, 0x10000
 	ldc.i4 65536
-	stloc 6
-// 0x01072414: 0x1072414: addiu v1, v1, 32392
-	ldloc 6
-	ldc.i4 32392
+	stloc 5
+// 0x010724ac: 0x10724ac: j	 0x10724bc addiu v0, v0, -25260
+	ldloc 5
+	ldc.i4 -25260
 	add
-	stloc 6
-// 0x01072418: 0x1072418: sw    v1, 24(sp)
+	stloc 5
+	br L_10724bc
+// --- basic block ---
+L_10724b4:
+// 0x010724b4: 0x10724b4: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x010724b8: 0x10724b8: addiu v0, v0, 32576
 	ldloc 5
+	ldc.i4 32576
+	add
+	stloc 5
+L_10724bc:
+// 0x010724bc: 0x10724bc: lw    t3, 76(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 19
 	add
+	ldelem.i4
+	stloc 12
+// 0x010724c0: 0x10724c0: sw    t2, 20(sp)
 	ldloc 6
-	stelem.i4
-// 0x0107241c: 0x107241c: lw    a0, 40(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc.1
-// 0x01072420: 0x1072420: addiu v1, zero, 140
-	ldc.i4 140
-	stloc 6
-// 0x01072424: 0x1072424: lui   a1, 0x10000
+	ldloc 7
+	stelem.i4
+// 0x010724c4: 0x10724c4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01072428: 0x1072428: lui   a2, 0x0
+// 0x010724c8: 0x10724c8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0107242c: 0x107242c: sw    v1, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+// 0x010724cc: 0x10724cc: lui   t2, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x010724d0: 0x10724d0: addiu t2, t2, 32600
+	ldloc 7
+	ldc.i4 32600
 	add
-	ldloc 6
-	stelem.i4
-// 0x01072430: 0x1072430: addiu a1, a1, 32384
+	stloc 7
+// 0x010724d4: 0x10724d4: addiu a1, a1, 32584
 	ldloc.2
-	ldc.i4 32384
+	ldc.i4 32584
 	add
 	stloc.2
-// 0x01072434: 0x1072434: addiu v1, zero, 70
-	ldc.i4.s 70
-	stloc 6
-// 0x01072438: 0x1072438: addiu a2, a2, 15604
+// 0x010724d8: 0x10724d8: addiu a2, a2, 15252
 	ldloc.3
-	ldc.i4 15604
+	ldc.i4 15252
 	add
 	stloc.3
-// 0x0107243c: 0x107243c: addiu a3, zero, 1
-	ldc.i4.1
+// 0x010724dc: 0x10724dc: addiu a3, zero, 36
+	ldc.i4.s 36
 	stloc 4
-// 0x01072440: 0x1072440: sw    s1, 16(sp)
-	ldloc 5
+// 0x010724e0: 0x10724e0: sw    t3, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 12
 	stelem.i4
-// 0x01072444: 0x1072444: sw    s0, 20(sp)
-	ldloc 5
+// 0x010724e4: 0x10724e4: sw    t2, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x01072448: 0x1072448: sw    v1, 32(sp)
-	ldloc 5
+// 0x010724e8: 0x10724e8: sw    t1, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.7
 	add
-	ldloc 6
+	ldloc 11
 	stelem.i4
-// 0x0107244c: 0x107244c: jal   0x1069ec8 sw    v0, 36(sp)
-	ldloc 5
+// 0x010724ec: 0x10724ec: sw    t0, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.8
 	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
-// --- basic block ---
-// 0x01072454: 0x1072454: lw    ra, 60(sp)
-// 0x01072458: 0x1072458: lw    s1, 56(sp)
-	ldloc 5
+// 0x010724f0: 0x10724f0: sw    v1, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc 9
-// 0x0107245c: 0x107245c: lw    s0, 52(sp)
-	ldloc 5
+	ldloc 8
+	stelem.i4
+// 0x010724f4: 0x10724f4: jal   0x106a4b4 sw    v0, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.s 10
 	add
-	ldelem.i4
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-// 0x01072460: 0x1072460: jr    ra addiu sp, sp, 64
+	stloc 5
+// --- basic block ---
+// 0x010724fc: 0x10724fc: lw    ra, 52(sp)
+// 0x01072500: 0x1072500: sll   zero, zero, 0
+// 0x01072504: 0x1072504: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldc.i4.s 64
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 5
 	ret
 }
-.method public static int32 convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_GetTransactionState_107250c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32 hi,int32 lo,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
 // local  5 is register v0
 // local  6 is register v1
@@ -4243,10 +4760,8 @@ __CIBYL_function_return:
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register hi
-// local  9 is register lo
-// local 10 is register mem
+// local  8 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -4258,133 +4773,86 @@ __CIBYL_function_return:
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 10
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01072468: 0x1072468: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107246c: 0x107246c: sw    ra, 20(sp)
-// 0x01072470: 0x1072470: bne   a1, zero, 0x107248c addu  v0, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 5
-	brtrue L_107248c
-// --- basic block ---
-// 0x01072478: 0x1072478: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107247c: 0x107247c: jal   0x1001b68 addiu a1, a1, -48
-	ldloc.2
-	ldc.i4.s -48
-	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcpy_1001b68(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01072484: 0x1072484: j	 0x10724d8 sll   zero, zero, 0
-	br L_10724d8
-// --- basic block ---
-L_107248c:
-// 0x0107248c: 0x107248c: bgez  a1, 0x107249c addu  v1, zero, zero
-	ldloc.2
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	bge L_107249c
-// --- basic block ---
-// 0x01072494: 0x1072494: subu  a1, zero, a1
-	ldloc.2
-	neg
-	stloc.2
-// 0x01072498: 0x1072498: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-L_107249c:
-// 0x0107249c: 0x107249c: lui   a3, 0xf0000
-	ldc.i4 983040
-	stloc 4
-// 0x010724a0: 0x10724a0: ori   a3, a3, 16960
-	ldloc 4
-	ldc.i4 16960
-	or
-	stloc 4
-// 0x010724a4: 0x10724a4: div   a1, a3
-	ldloc.2
-	ldloc 4
-	ldloc.2
-	ldloc 4
-	div
-	stloc 9
-	rem
-	stloc 8
-// 0x010724a8: 0x10724a8: mfhi  hi
-	ldloc 8
-	stloc 4
-// 0x010724ac: 0x10724ac: mflo  lo
-	ldloc 9
-	stloc.3
-// 0x010724b0: 0x10724b0: beq   v1, zero, 0x10724c4 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brfalse L_10724c4
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010724b8: 0x10724b8: addu  a0, v0, zero
+// 0x0107250c: 0x107250c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01072510: 0x1072510: lw    a0, -18000(v0)
+	ldloc 7
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4500
+	add
+	ldelem.i4
 	stloc.1
-// 0x010724bc: 0x10724bc: j	 0x10724d0 addiu a1, a1, 32412
-	ldloc.2
-	ldc.i4 32412
+// 0x01072514: 0x1072514: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.2
-	br L_10724d0
+	stloc.0
+// 0x01072518: 0x1072518: beq   a0, zero, 0x107254c sw    ra, 20(sp)
+	ldloc.1
+	brfalse L_107254c
 // --- basic block ---
-L_10724c4:
-// 0x010724c4: 0x10724c4: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010724c8: 0x10724c8: addu  a0, v0, zero
+// 0x01072520: 0x1072520: jal   0x1068f9c sll   zero, zero, 0
+	ldloc.1
+	call int32 Cibyl78::wst_get_trans_state_1068f9c(int32)
+	stloc 5
+// --- basic block ---
+// 0x01072528: 0x1072528: sltiu v1, v0, 3
 	ldloc 5
-	stloc.1
-// 0x010724cc: 0x10724cc: addiu a1, a1, 32424
-	ldloc.2
-	ldc.i4 32424
+	ldc.i4.3
+	clt.un
+	stloc 6
+// 0x0107252c: 0x107252c: beq   v1, zero, 0x107254c lui   v1, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 6
+	brfalse L_107254c
+// --- basic block ---
+// 0x01072534: 0x1072534: sll   v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x01072538: 0x1072538: addiu v1, v1, 29204
+	ldloc 6
+	ldc.i4 29204
 	add
-	stloc.2
-L_10724d0:
-// 0x010724d0: 0x10724d0: jal   0x1000f64 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
+// 0x0107253c: 0x107253c: addu  v0, v0, v1
+	ldloc 5
+	ldloc 6
+	add
+	stloc 5
+// 0x01072540: 0x1072540: lw    v0, 0(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 5
+// 0x01072544: 0x1072544: j	 0x1072550 sll   zero, zero, 0
+	br L_1072550
 // --- basic block ---
-L_10724d8:
-// 0x010724d8: 0x10724d8: lw    ra, 20(sp)
-// 0x010724dc: 0x10724dc: sll   zero, zero, 0
-// 0x010724e0: 0x10724e0: jr    ra addiu sp, sp, 24
+L_107254c:
+// 0x0107254c: 0x107254c: addiu v0, zero, 4
+	ldc.i4.4
+	stloc 5
+L_1072550:
+// 0x01072550: 0x1072550: lw    ra, 20(sp)
+// 0x01072554: 0x1072554: sll   zero, zero, 0
+// 0x01072558: 0x1072558: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4396,29 +4864,26 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 format_RoadMapArea_string_10724e8(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_AbortTransaction_1072560(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
 
-// local  7 is register v0
-// local  8 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local 10 is register s1
-// local  6 is register s2
-// local 11 is register s3
+// local  8 is register s0
 // local  0 is register sp
-// local 12 is register ra
-// local  5 is register mem
+// local  9 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4428,322 +4893,149 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 11
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010724e8: 0x10724e8: addiu sp, sp, -136
+// 0x01072560: 0x1072560: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4 -136
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010724ec: 0x10724ec: sw    s2, 124(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 31
-	add
+// 0x01072564: 0x1072564: sw    s0, 16(sp)
 	ldloc 6
-	stelem.i4
-// 0x010724f0: 0x10724f0: sw    s1, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldloc 10
-	stelem.i4
-// 0x010724f4: 0x10724f4: addu  s2, a1, zero
-	ldloc.2
-	stloc 6
-// 0x010724f8: 0x10724f8: addiu s1, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 10
-// 0x010724fc: 0x10724fc: lw    a1, 0(a1)
-	ldloc 5
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01072500: 0x1072500: sw    s3, 128(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4.4
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x01072504: 0x1072504: addu  s3, a0, zero
+// 0x01072568: 0x1072568: sw    ra, 20(sp)
+// 0x0107256c: 0x107256c: jal   0x107250c addu  s0, a0, zero
 	ldloc.1
-	stloc 11
-// 0x01072508: 0x1072508: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x0107250c: 0x107250c: sw    ra, 132(sp)
-// 0x01072510: 0x1072510: jal   0x1072468 sw    s0, 116(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 29
-	add
-	ldloc 9
-	stelem.i4
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::RTNet_GetTransactionState_107250c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072518: 0x1072518: addiu s0, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc 9
-// 0x0107251c: 0x107251c: lw    a1, 4(s2)
+// 0x01072574: 0x1072574: addiu v1, zero, 4
+	ldc.i4.4
+	stloc 7
+// 0x01072578: 0x1072578: beq   v0, v1, 0x10725a8 sw    v1, 0(s0)
 	ldloc 5
+	ldloc 7
 	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc.2
-// 0x01072520: 0x1072520: jal   0x1072468 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	ldloc 7
+	stelem.i4
+	beq  L_10725a8
 // --- basic block ---
-// 0x01072528: 0x1072528: addiu a2, sp, 64
-	ldloc.0
-	ldc.i4.s 64
-	add
-	stloc.3
-// 0x0107252c: 0x107252c: lw    a1, 8(s2)
+// 0x01072580: 0x1072580: bne   v0, zero, 0x1072590 lui   v0, 0x80000
 	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brtrue L_1072590
+// --- basic block ---
+// 0x01072588: 0x1072588: j	 0x10725a8 sw    zero, 0(s0)
 	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc.2
-// 0x01072530: 0x1072530: addu  a0, a2, zero
-	ldloc.3
-	stloc.1
-// 0x01072534: 0x1072534: jal   0x1072468 sw    a2, 108(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
-	add
-	ldloc.3
+	ldc.i4.s 0
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	br L_10725a8
 // --- basic block ---
-// 0x0107253c: 0x107253c: addiu a3, sp, 84
-	ldloc.0
-	ldc.i4.s 84
-	add
-	stloc 4
-// 0x01072540: 0x1072540: lw    a1, 12(s2)
-	ldloc 5
+L_1072590:
+// 0x01072590: 0x1072590: lw    a0, -18000(v0)
 	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4 -4500
 	add
 	ldelem.i4
-	stloc.2
-// 0x01072544: 0x1072544: addu  a0, a3, zero
-	ldloc 4
 	stloc.1
-// 0x01072548: 0x1072548: jal   0x1072468 sw    a3, 104(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
-	add
-	ldloc 4
-	stelem.i4
-	ldloc.0
+// 0x01072594: 0x1072594: jal   0x1068fa8 sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl78::wst_stop_trans_1068fa8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072550: 0x1072550: lw    a2, 108(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
-	add
-	ldelem.i4
-	stloc.3
-// 0x01072554: 0x1072554: lw    a3, 104(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
-	add
-	ldelem.i4
-	stloc 4
-// 0x01072558: 0x1072558: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107255c: 0x107255c: addu  a0, s3, zero
-	ldloc 11
-	stloc.1
-// 0x01072560: 0x1072560: addiu a1, a1, 32432
-	ldloc.2
-	ldc.i4 32432
-	add
-	stloc.2
-// 0x01072564: 0x1072564: sw    s1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 10
-	stelem.i4
-// 0x01072568: 0x1072568: jal   0x1000f64 sw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
+// 0x0107259c: 0x107259c: jal   0x107250c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::RTNet_GetTransactionState_107250c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01072570: 0x1072570: lw    ra, 132(sp)
-// 0x01072574: 0x1072574: lw    s3, 128(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 32
-	add
-	ldelem.i4
-	stloc 11
-// 0x01072578: 0x1072578: lw    s2, 124(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 31
-	add
-	ldelem.i4
-	stloc 6
-// 0x0107257c: 0x107257c: lw    s1, 120(sp)
-	ldloc 5
-	ldloc.0
+// 0x010725a4: 0x10725a4: sw    v0, 0(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
-	add
-	ldelem.i4
-	stloc 10
-// 0x01072580: 0x1072580: lw    s0, 116(sp)
 	ldloc 5
+	stelem.i4
+L_10725a8:
+// 0x010725a8: 0x10725a8: lw    ra, 20(sp)
+// 0x010725ac: 0x10725ac: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 29
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 9
-// 0x01072584: 0x1072584: jr    ra addiu sp, sp, 136
+	stloc 8
+// 0x010725b0: 0x10725b0: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4 136
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 format_point_string_107258c(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_Watchdog_10725b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
-// local 10 is register v0
-// local 11 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  8 is register s2
-// local  9 is register s3
 // local  0 is register sp
-// local 12 is register ra
-// local  5 is register mem
+// local  6 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 10
+	stloc 5
 	ldc.i4.s 0
-	stloc 11
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4752,115 +5044,124 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 6
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107258c: 0x107258c: addiu sp, sp, -96
-	ldloc.0
-	ldc.i4.s -96
-	add
-	stloc.0
-// 0x01072590: 0x1072590: sw    s1, 80(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
+// 0x010725b8: 0x10725b8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010725bc: 0x10725bc: lw    a0, -18000(v0)
 	ldloc 7
-	stelem.i4
-// 0x01072594: 0x1072594: addiu s1, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 7
-// 0x01072598: 0x1072598: sw    s3, 88(sp)
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4 -4500
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107259c: 0x107259c: addu  s3, a0, zero
-	ldloc.1
-	stloc 9
-// 0x010725a0: 0x10725a0: addu  a0, s1, zero
-	ldloc 7
+	ldelem.i4
 	stloc.1
-// 0x010725a4: 0x10725a4: sw    ra, 92(sp)
-// 0x010725a8: 0x10725a8: sw    s2, 84(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldloc 8
-	stelem.i4
-// 0x010725ac: 0x10725ac: sw    s0, 76(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldloc 6
-	stelem.i4
-// 0x010725b0: 0x10725b0: addu  s2, a3, zero
-	ldloc 4
-	stloc 8
-// 0x010725b4: 0x10725b4: jal   0x1072468 sw    a2, 64(sp)
-	ldloc 5
+// 0x010725c0: 0x10725c0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	ldc.i4.s -24
 	add
-	ldloc.3
-	stelem.i4
+	stloc.0
+// 0x010725c4: 0x10725c4: beq   a0, zero, 0x10725d4 sw    ra, 20(sp)
+	ldloc.1
+	brfalse L_10725d4
+// --- basic block ---
+// 0x010725cc: 0x10725cc: jal   0x106aa28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_watchdog_106aa28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x010725bc: 0x10725bc: lw    a2, 64(sp)
-	ldloc 5
+L_10725d4:
+// 0x010725d4: 0x10725d4: lw    ra, 20(sp)
+// 0x010725d8: 0x10725d8: sll   zero, zero, 0
+// 0x010725dc: 0x10725dc: jr    ra addiu sp, sp, 24
 	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_TransactionQueue_ProcessSingleItem_10725e4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010725e4: 0x10725e4: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010725e8: 0x10725e8: lw    v1, -18000(v0)
+	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4 -4500
 	add
 	ldelem.i4
-	stloc.3
-// 0x010725c0: 0x10725c0: addiu s0, sp, 44
+	stloc 6
+// 0x010725ec: 0x10725ec: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 44
+	ldc.i4.s -24
 	add
-	stloc 6
-// 0x010725c4: 0x10725c4: addu  a1, a2, zero
-	ldloc.3
+	stloc.0
+// 0x010725f0: 0x10725f0: sw    ra, 20(sp)
+// 0x010725f4: 0x10725f4: addu  a1, a0, zero
+	ldloc.1
 	stloc.2
-// 0x010725c8: 0x10725c8: jal   0x1072468 addu  a0, s0, zero
+// 0x010725f8: 0x10725f8: beq   v1, zero, 0x1072608 addu  v0, zero, zero
+	ldloc 6
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_1072608
+// --- basic block ---
+// 0x01072600: 0x1072600: jal   0x106a678 addu  a0, v1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4868,119 +5169,127 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_process_queue_item_106a678(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010725d0: 0x10725d0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010725d4: 0x10725d4: addu  a0, s3, zero
-	ldloc 9
-	stloc.1
-// 0x010725d8: 0x10725d8: addu  a2, s1, zero
-	ldloc 7
-	stloc.3
-// 0x010725dc: 0x10725dc: addu  a3, s0, zero
-	ldloc 6
-	stloc 4
-// 0x010725e0: 0x10725e0: addiu a1, a1, 32444
-	ldloc.2
-	ldc.i4 32444
-	add
-	stloc.2
-// 0x010725e4: 0x10725e4: jal   0x1000f64 sw    s2, 16(sp)
-	ldloc 5
+L_1072608:
+// 0x01072608: 0x1072608: lw    ra, 20(sp)
+// 0x0107260c: 0x107260c: sll   zero, zero, 0
+// 0x01072610: 0x1072610: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s 24
 	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_TransactionQueue_Clear_1072618(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010725ec: 0x10725ec: lw    ra, 92(sp)
-// 0x010725f0: 0x10725f0: lw    s3, 88(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc 9
-// 0x010725f4: 0x10725f4: lw    s2, 84(sp)
+// 0x01072618: 0x1072618: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107261c: 0x107261c: lw    a0, -18000(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4 -4500
 	add
 	ldelem.i4
-	stloc 8
-// 0x010725f8: 0x10725f8: lw    s1, 80(sp)
-	ldloc 5
+	stloc.1
+// 0x01072620: 0x1072620: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 7
-// 0x010725fc: 0x10725fc: lw    s0, 76(sp)
-	ldloc 5
+	stloc.0
+// 0x01072624: 0x1072624: beq   a0, zero, 0x1072634 sw    ra, 20(sp)
+	ldloc.1
+	brfalse L_1072634
+// --- basic block ---
+// 0x0107262c: 0x107262c: jal   0x106a1bc sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldelem.i4
-	stloc 6
-// 0x01072600: 0x1072600: jr    ra addiu sp, sp, 96
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_queue_clear_106a1bc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+L_1072634:
+// 0x01072634: 0x1072634: lw    ra, 20(sp)
+// 0x01072638: 0x1072638: sll   zero, zero, 0
+// 0x0107263c: 0x107263c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 96
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 11
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 10
+	ldloc 5
 	ret
 }
-.method public static int32 format_DB_point_string_1072608(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_Auth_BuildCommand_1072644(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 v0,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
-// local 10 is register v0
-// local 11 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  8 is register s2
-// local  9 is register s3
 // local  0 is register sp
-// local 12 is register ra
-// local  5 is register mem
+// local  8 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 10
+	stloc 5
 	ldc.i4.s 0
-	stloc 11
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4989,167 +5298,84 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072608: 0x1072608: addiu sp, sp, -96
+// 0x01072644: 0x1072644: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -96
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0107260c: 0x107260c: sw    s1, 80(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 7
-	stelem.i4
-// 0x01072610: 0x1072610: addiu s1, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 7
-// 0x01072614: 0x1072614: sw    s3, 88(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldloc 9
-	stelem.i4
-// 0x01072618: 0x1072618: addu  s3, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0107261c: 0x107261c: addu  a0, s1, zero
-	ldloc 7
-	stloc.1
-// 0x01072620: 0x1072620: sw    ra, 92(sp)
-// 0x01072624: 0x1072624: sw    s2, 84(sp)
-	ldloc 5
+// 0x01072648: 0x1072648: addu  v0, a2, zero
+	ldloc.3
+	stloc 5
+// 0x0107264c: 0x107264c: sw    a3, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 4
 	stelem.i4
-// 0x01072628: 0x1072628: sw    s0, 76(sp)
+// 0x01072650: 0x1072650: addu  a3, v0, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
+	stloc 4
+// 0x01072654: 0x1072654: lw    v0, 56(sp)
 	ldloc 6
-	stelem.i4
-// 0x0107262c: 0x107262c: addu  s2, a3, zero
-	ldloc 4
-	stloc 8
-// 0x01072630: 0x1072630: jal   0x1072468 sw    a2, 64(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 14
 	add
-	ldloc.3
-	stelem.i4
-	ldloc.0
-	ldloc.1
+	ldelem.i4
+	stloc 5
+// 0x01072658: 0x1072658: addu  v1, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
-// --- basic block ---
-// 0x01072638: 0x1072638: lw    a2, 64(sp)
-	ldloc 5
+	stloc 7
+// 0x0107265c: 0x107265c: sw    v0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107263c: 0x107263c: addiu s0, sp, 44
-	ldloc.0
-	ldc.i4.s 44
+	ldc.i4.5
 	add
-	stloc 6
-// 0x01072640: 0x1072640: addu  a1, a2, zero
-	ldloc.3
+	ldloc 5
+	stelem.i4
+// 0x01072660: 0x1072660: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01072644: 0x1072644: jal   0x1072468 addu  a0, s0, zero
+// 0x01072664: 0x1072664: lw    v0, 60(sp)
 	ldloc 6
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
-// --- basic block ---
-// 0x0107264c: 0x107264c: lw    a2, 112(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4.s 15
 	add
 	ldelem.i4
-	stloc.3
-// 0x01072650: 0x1072650: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072654: 0x1072654: addu  a0, s3, zero
-	ldloc 9
-	stloc.1
-// 0x01072658: 0x1072658: addu  a3, s1, zero
-	ldloc 7
-	stloc 4
-// 0x0107265c: 0x107265c: addiu a1, a1, 32456
+	stloc 5
+// 0x01072668: 0x1072668: addiu a1, a1, 32692
 	ldloc.2
-	ldc.i4 32456
+	ldc.i4 32692
 	add
 	stloc.2
-// 0x01072660: 0x1072660: sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+// 0x0107266c: 0x107266c: addu  a2, v1, zero
+	ldloc 7
+	stloc.3
+// 0x01072670: 0x1072670: sw    ra, 36(sp)
+// 0x01072674: 0x1072674: jal   0x1000f64 sw    v0, 24(sp)
 	ldloc 6
-	stelem.i4
-// 0x01072664: 0x1072664: jal   0x1000f64 sw    s2, 20(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -5158,84 +5384,51 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
-// --- basic block ---
-// 0x0107266c: 0x107266c: lw    ra, 92(sp)
-// 0x01072670: 0x1072670: lw    s3, 88(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc 9
-// 0x01072674: 0x1072674: lw    s2, 84(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc 8
-// 0x01072678: 0x1072678: lw    s1, 80(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldelem.i4
 	stloc 7
-// 0x0107267c: 0x107267c: lw    s0, 76(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldelem.i4
-	stloc 6
-// 0x01072680: 0x1072680: jr    ra addiu sp, sp, 96
+	stloc 5
+// --- basic block ---
+// 0x0107267c: 0x107267c: lw    ra, 36(sp)
+// 0x01072680: 0x1072680: sll   zero, zero, 0
+// 0x01072684: 0x1072684: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 96
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 11
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 10
+	ldloc 5
 	ret
 }
-.method public static int32 RTNet_ReportOneSegment_Encode_1072688(int32,int32,int32,int32,int32)
+.method public static int32 format_ParamPair_string_107268c(int32,int32,int32,int32,int32)
 {
 .maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s3,int32 s2,int32 s4,int32 s5,int32 ra,int32 lo)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s6,int32 s0,int32 s8,int32 s1,int32 s3,int32 s4,int32 s5,int32 s7,int32 s2,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  7 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  9 is register s0
-// local  8 is register s1
-// local 11 is register s2
-// local 10 is register s3
-// local 12 is register s4
-// local 13 is register s5
+// local 11 is register s1
+// local 16 is register s2
+// local 12 is register s3
+// local 13 is register s4
+// local 14 is register s5
+// local  8 is register s6
+// local 15 is register s7
 // local  0 is register sp
-// local 14 is register ra
-// local 15 is register lo
-// local  6 is register mem
+// local 10 is register s8
+// local 17 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5247,629 +5440,540 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
 	stloc 11
 	ldc.i4.s 0
-	stloc 10
+	stloc 16
 	ldc.i4.s 0
 	stloc 12
 	ldc.i4.s 0
 	stloc 13
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
 	stloc 14
 	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 15
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 17
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072688: 0x1072688: addiu sp, sp, -1840
+// 0x0107268c: 0x107268c: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4 -1840
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0107268c: 0x107268c: sw    s0, 1812(sp)
-	ldloc 6
+// 0x01072690: 0x1072690: sw    s1, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 453
+	ldc.i4.5
 	add
-	ldloc 9
+	ldloc 11
 	stelem.i4
-// 0x01072690: 0x1072690: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x01072694: 0x1072694: addu  s0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x01072698: 0x1072698: addu  a0, a1, zero
+// 0x01072694: 0x1072694: addu  s1, a1, zero
 	ldloc.2
-	stloc.1
-// 0x0107269c: 0x107269c: sw    s2, 1820(sp)
-	ldloc 6
+	stloc 11
+// 0x01072698: 0x1072698: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107269c: 0x107269c: sw    s2, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 455
+	ldc.i4.6
 	add
-	ldloc 11
+	ldloc 16
 	stelem.i4
-// 0x010726a0: 0x10726a0: sw    ra, 1836(sp)
-// 0x010726a4: 0x10726a4: sw    s5, 1832(sp)
-	ldloc 6
+// 0x010726a0: 0x10726a0: sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 458
+	ldc.i4.4
 	add
-	ldloc 13
+	ldloc 9
 	stelem.i4
-// 0x010726a8: 0x10726a8: sw    s4, 1828(sp)
-	ldloc 6
+// 0x010726a4: 0x10726a4: addiu a1, a1, 19088
+	ldloc.2
+	ldc.i4 19088
+	add
+	stloc.2
+// 0x010726a8: 0x10726a8: addu  s0, a0, zero
+	ldloc.1
+	stloc 9
+// 0x010726ac: 0x10726ac: addu  s2, a2, zero
+	ldloc.3
+	stloc 16
+// 0x010726b0: 0x10726b0: sll   a2, a2, 1
+	ldloc.3
+	ldc.i4.1
+	shl
+	stloc.3
+// 0x010726b4: 0x10726b4: sw    ra, 52(sp)
+// 0x010726b8: 0x10726b8: sw    s7, 44(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 457
+	ldc.i4.s 11
 	add
-	ldloc 12
+	ldloc 15
 	stelem.i4
-// 0x010726ac: 0x10726ac: sw    s3, 1824(sp)
-	ldloc 6
+// 0x010726bc: 0x10726bc: sw    s5, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 456
+	ldc.i4.s 9
 	add
-	ldloc 10
+	ldloc 14
 	stelem.i4
-// 0x010726b0: 0x10726b0: sw    s1, 1816(sp)
-	ldloc 6
+// 0x010726c0: 0x10726c0: sw    s4, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 454
+	ldc.i4.8
 	add
-	ldloc 8
+	ldloc 13
 	stelem.i4
-// 0x010726b4: 0x10726b4: addu  s2, a1, zero
-	ldloc.2
-	stloc 11
-// 0x010726b8: 0x10726b8: jal   0x10b57b4 sw    v0, 72(sp)
-	ldloc 6
+// 0x010726c4: 0x10726c4: sw    s3, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.7
 	add
-	ldloc 5
+	ldloc 12
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x010726c8: 0x10726c8: addu  s4, a3, zero
 	ldloc 4
-	call int32 Cibyl135::editor_line_committed_10b57b4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010726c0: 0x10726c0: bne   v0, zero, 0x10726fc addiu v0, sp, 48
+	stloc 13
+// 0x010726cc: 0x10726cc: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc 5
-	brtrue L_10726fc
-// --- basic block ---
-// 0x010726c8: 0x10726c8: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 12
 	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
-// 0x010726cc: 0x10726cc: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-// 0x010726d0: 0x10726d0: addiu v0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc 5
-// 0x010726d4: 0x10726d4: addiu a1, sp, 80
-	ldloc.0
-	ldc.i4.s 80
-	add
-	stloc.2
-// 0x010726d8: 0x10726d8: addiu a2, sp, 88
-	ldloc.0
-	ldc.i4.s 88
-	add
-	stloc.3
-// 0x010726dc: 0x10726dc: addiu a3, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 4
-// 0x010726e0: 0x10726e0: jal   0x10b5d30 sw    v0, 20(sp)
-	ldloc 6
+// 0x010726d0: 0x10726d0: jal   0x1000f64 sw    s6, 40(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 10
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_10b5d30(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x010726e8: 0x10726e8: lw    v0, 36(sp)
-	ldloc 6
+// 0x010726d8: 0x10726d8: lw    s3, 72(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 18
 	add
 	ldelem.i4
-	stloc 5
-// 0x010726ec: 0x10726ec: sll   zero, zero, 0
-// 0x010726f0: 0x10726f0: andi  v0, v0, 4
-	ldloc 5
-	ldc.i4.4
-	and
-	stloc 5
-// 0x010726f4: 0x10726f4: bne   v0, zero, 0x1072704 addiu v0, sp, 52
-	ldloc 5
-	ldloc.0
-	ldc.i4.s 52
-	add
-	stloc 5
-	brtrue L_1072704
-// --- basic block ---
-L_10726fc:
-// 0x010726fc: 0x10726fc: j	 0x1072960 sb    zero, 0(s0)
+	stloc 12
+// 0x010726dc: 0x10726dc: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 9
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 7
+// --- basic block ---
+// 0x010726e4: 0x10726e4: addu  s5, zero, zero
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	br L_1072960
+	stloc 14
+// 0x010726e8: 0x10726e8: j	 0x1072834 addiu s7, zero, 44
+	ldc.i4.s 44
+	stloc 15
+	br L_1072834
 // --- basic block ---
-L_1072704:
-// 0x01072704: 0x1072704: lw    a0, 32(sp)
-	ldloc 6
-	ldloc.0
+L_10726f0:
+// 0x010726f0: 0x10726f0: lw    v1, 0(s4)
+	ldloc 5
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
 	ldelem.i4
-	stloc.1
-// 0x01072708: 0x1072708: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107270c: 0x107270c: addiu a2, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.3
-// 0x01072710: 0x1072710: addiu a3, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc 4
-// 0x01072714: 0x1072714: jal   0x10b48f8 sw    v0, 16(sp)
+	stloc 6
+// 0x010726f4: 0x10726f4: sll   zero, zero, 0
+// 0x010726f8: 0x10726f8: beq   v1, zero, 0x1072828 sll   zero, zero, 0
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_10b48f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	brfalse L_1072828
 // --- basic block ---
-// 0x0107271c: 0x107271c: lw    v0, 40(sp)
+// 0x01072700: 0x1072700: lb    v1, 0(v1)
 	ldloc 6
-	ldloc.0
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x01072704: 0x1072704: sll   zero, zero, 0
+// 0x01072708: 0x1072708: beq   v1, zero, 0x1072828 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_1072828
+// --- basic block ---
+// 0x01072710: 0x1072710: lw    v1, 0(s3)
+	ldloc 5
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
-	add
 	ldelem.i4
-	stloc 5
-// 0x01072720: 0x1072720: sll   zero, zero, 0
-// 0x01072724: 0x1072724: bltz  v0, 0x107273c addu  s1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	blt L_107273c
+	stloc 6
+// 0x01072714: 0x1072714: sll   zero, zero, 0
+// 0x01072718: 0x1072718: beq   v1, zero, 0x1072828 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_1072828
 // --- basic block ---
-// 0x0107272c: 0x107272c: lw    s1, 44(sp)
+// 0x01072720: 0x1072720: lb    v1, 0(v1)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x01072724: 0x1072724: sll   zero, zero, 0
+// 0x01072728: 0x1072728: beq   v1, zero, 0x1072828 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_1072828
+// --- basic block ---
+// 0x01072730: 0x1072730: bne   v0, s1, 0x1072754 addu  v1, s0, v0
+	ldloc 7
+	ldloc 11
+	ldloc 9
+	ldloc 7
 	add
-	ldelem.i4
-	stloc 8
-// 0x01072730: 0x1072730: sll   zero, zero, 0
-// 0x01072734: 0x1072734: addiu s1, s1, 1
-	ldloc 8
+	stloc 6
+	bne.un L_1072754
+// --- basic block ---
+// 0x01072738: 0x1072738: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107273c: 0x107273c: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01072740: 0x1072740: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x01072744: 0x1072744: addiu a3, a3, 32752
+	ldloc 4
+	ldc.i4 32752
+	add
+	stloc 4
+// 0x01072748: 0x1072748: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0107274c: 0x107274c: j	 0x107278c addiu a2, zero, 319
+	ldc.i4 319
+	stloc.3
+	br L_107278c
+// --- basic block ---
+L_1072754:
+// 0x01072754: 0x1072754: addiu s6, v0, 1
+	ldloc 7
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01072738: 0x1072738: subu  s1, s1, v0
+// 0x01072758: 0x1072758: sb    s7, 0(v1)
+	ldloc 6
+	ldloc 15
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0107275c: 0x107275c: addu  s8, s0, s6
+	ldloc 9
 	ldloc 8
+	add
+	stloc 10
+// 0x01072760: 0x1072760: lw    a0, 0(s4)
 	ldloc 5
-	sub
-	stloc 8
-L_107273c:
-// 0x0107273c: 0x107273c: lw    a0, 32(sp)
-	ldloc 6
-	ldloc.0
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
 	ldelem.i4
 	stloc.1
-// 0x01072740: 0x1072740: addiu a1, sp, 64
-	ldloc.0
-	ldc.i4.s 64
-	add
+// 0x01072764: 0x1072764: addu  a1, s8, zero
+	ldloc 10
 	stloc.2
-// 0x01072744: 0x1072744: jal   0x10b49a8 addiu a2, sp, 68
-	ldloc.0
-	ldc.i4.s 68
-	add
+// 0x01072768: 0x1072768: jal   0x1067b74 subu  a2, s1, s6
+	ldloc 11
+	ldloc 8
+	sub
 	stloc.3
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_trkseg_get_time_10b49a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0107274c: 0x107274c: addiu a1, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+// 0x01072770: 0x1072770: bne   v0, zero, 0x10727b0 lui   a1, 0x10000
+	ldloc 7
+	ldc.i4 65536
+	stloc.2
+	brtrue L_10727b0
+// --- basic block ---
+// 0x01072778: 0x1072778: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x0107277c: 0x107277c: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x01072750: 0x1072750: addiu a2, sp, 60
-	ldloc.0
-	ldc.i4.s 60
+// 0x01072780: 0x1072780: addiu a3, a3, 32752
+	ldloc 4
+	ldc.i4 32752
 	add
-	stloc.3
-// 0x01072754: 0x1072754: jal   0x10b5924 addu  a0, s2, zero
-	ldloc 11
+	stloc 4
+// 0x01072784: 0x1072784: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x01072788: 0x1072788: addiu a2, zero, 327
+	ldc.i4 327
+	stloc.3
+L_107278c:
+// 0x0107278c: 0x107278c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl135::editor_line_get_points_10b5924(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0107275c: 0x107275c: lw    a0, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
+// 0x01072794: 0x1072794: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01072798: 0x1072798: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107279c: 0x107279c: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	ldelem.i4
 	stloc.1
-// 0x01072760: 0x1072760: jal   0x10b4670 sll   zero, zero, 0
+// 0x010727a0: 0x10727a0: jal   0x104c158 addiu a1, a1, -32732
+	ldloc.2
+	ldc.i4 -32732
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_point_db_id_10b4670(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x01072768: 0x1072768: lw    a0, 60(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
-	add
-	ldelem.i4
+// 0x010727a8: 0x10727a8: j	 0x1072844 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 7
+	br L_1072844
+// --- basic block ---
+L_10727b0:
+// 0x010727b0: 0x10727b0: jal   0x1001b48 addu  a0, s8, zero
+	ldloc 10
 	stloc.1
-// 0x0107276c: 0x107276c: jal   0x10b4670 addu  s3, v0, zero
-	ldloc 5
-	stloc 10
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl134::editor_point_db_id_10b4670(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x01072774: 0x1072774: lw    a1, 80(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
+// 0x010727b8: 0x10727b8: addu  s6, v0, s6
+	ldloc 7
+	ldloc 8
 	add
-	ldelem.i4
+	stloc 8
+// 0x010727bc: 0x10727bc: bne   s6, s1, 0x10727dc lui   a1, 0x10000
+	ldloc 8
+	ldloc 11
+	ldc.i4 65536
 	stloc.2
-// 0x01072778: 0x1072778: lw    a2, 84(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
+	bne.un L_10727dc
+// --- basic block ---
+// 0x010727c4: 0x10727c4: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x010727c8: 0x10727c8: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	ldelem.i4
-	stloc.3
-// 0x0107277c: 0x107277c: lw    a3, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	stloc.2
+// 0x010727cc: 0x10727cc: addiu a3, a3, 32752
+	ldloc 4
+	ldc.i4 32752
 	add
-	ldelem.i4
 	stloc 4
-// 0x01072780: 0x1072780: addiu a0, sp, 144
-	ldloc.0
-	ldc.i4 144
-	add
+// 0x010727d0: 0x10727d0: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01072784: 0x1072784: sw    v0, 1800(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 450
+// 0x010727d4: 0x10727d4: j	 0x107278c addiu a2, zero, 335
+	ldc.i4 335
+	stloc.3
+	br L_107278c
+// --- basic block ---
+L_10727dc:
+// 0x010727dc: 0x10727dc: addu  v0, s0, s6
+	ldloc 9
+	ldloc 8
+	add
+	stloc 7
+// 0x010727e0: 0x10727e0: sb    s7, 0(v0)
+	ldloc 7
+	ldloc 15
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x010727e4: 0x10727e4: addiu s6, s6, 1
+	ldloc 8
+	ldc.i4.1
+	add
+	stloc 8
+// 0x010727e8: 0x10727e8: addu  s8, s0, s6
+	ldloc 9
+	ldloc 8
 	add
+	stloc 10
+// 0x010727ec: 0x10727ec: lw    a0, 0(s3)
 	ldloc 5
-	stelem.i4
-// 0x01072788: 0x1072788: jal   0x1072608 sw    s3, 16(sp)
-	ldloc 6
-	ldloc.0
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
+	ldelem.i4
+	stloc.1
+// 0x010727f0: 0x10727f0: addu  a1, s8, zero
 	ldloc 10
-	stelem.i4
-	ldloc.0
+	stloc.2
+// 0x010727f4: 0x10727f4: jal   0x1067b74 subu  a2, s1, s6
+	ldloc 11
+	ldloc 8
+	sub
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::format_DB_point_string_1072608(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x01072790: 0x1072790: lw    v0, 1800(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 450
-	add
-	ldelem.i4
-	stloc 5
-// 0x01072794: 0x1072794: lw    a1, 88(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
+// 0x010727fc: 0x10727fc: bne   v0, zero, 0x107281c lui   a1, 0x10000
+	ldloc 7
+	ldc.i4 65536
 	stloc.2
-// 0x01072798: 0x1072798: lw    a2, 92(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
+	brtrue L_107281c
+// --- basic block ---
+// 0x01072804: 0x1072804: lui   a3, 0x10000
+	ldc.i4 65536
+	stloc 4
+// 0x01072808: 0x1072808: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	ldelem.i4
-	stloc.3
-// 0x0107279c: 0x107279c: lw    a3, 68(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
+	stloc.2
+// 0x0107280c: 0x107280c: addiu a3, a3, 32752
+	ldloc 4
+	ldc.i4 32752
 	add
-	ldelem.i4
 	stloc 4
-// 0x010727a0: 0x10727a0: addiu a0, sp, 196
-	ldloc.0
-	ldc.i4 196
-	add
-	stloc.1
-// 0x010727a4: 0x10727a4: jal   0x1072608 sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
+// 0x01072810: 0x1072810: addiu a0, zero, 4
 	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
+	stloc.1
+// 0x01072814: 0x1072814: j	 0x107278c addiu a2, zero, 343
+	ldc.i4 343
+	stloc.3
+	br L_107278c
+// --- basic block ---
+L_107281c:
+// 0x0107281c: 0x107281c: jal   0x1001b48 addu  a0, s8, zero
+	ldloc 10
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::format_DB_point_string_1072608(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x010727ac: 0x10727ac: lw    v0, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+// 0x01072824: 0x1072824: addu  v0, v0, s6
+	ldloc 7
+	ldloc 8
 	add
-	ldelem.i4
-	stloc 5
-// 0x010727b0: 0x10727b0: sll   zero, zero, 0
-// 0x010727b4: 0x10727b4: andi  v0, v0, 1
-	ldloc 5
+	stloc 7
+L_1072828:
+// 0x01072828: 0x1072828: addiu s5, s5, 1
+	ldloc 14
 	ldc.i4.1
-	and
-	stloc 5
-// 0x010727b8: 0x10727b8: bne   v0, zero, 0x10727c8 lui   a2, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.3
-	brtrue L_10727c8
-// --- basic block ---
-// 0x010727c0: 0x10727c0: j	 0x10727d0 addiu a2, a2, 32468
-	ldloc.3
-	ldc.i4 32468
-	add
-	stloc.3
-	br L_10727d0
-// --- basic block ---
-L_10727c8:
-// 0x010727c8: 0x10727c8: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x010727cc: 0x10727cc: addiu a2, a2, 32476
-	ldloc.3
-	ldc.i4 32476
-	add
-	stloc.3
-L_10727d0:
-// 0x010727d0: 0x10727d0: addiu v0, zero, 3
-	ldc.i4.3
-	stloc 5
-// 0x010727d4: 0x10727d4: mult  s1, v0
-	ldloc 8
-	ldloc 5
-	mul
-	stloc 15
-// 0x010727d8: 0x10727d8: addiu v0, sp, 144
-	ldloc.0
-	ldc.i4 144
 	add
-	stloc 5
-// 0x010727dc: 0x10727dc: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010727e0: 0x10727e0: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x010727e4: 0x10727e4: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
+	stloc 14
+// 0x0107282c: 0x107282c: addiu s4, s4, 4
+	ldloc 13
 	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-// 0x010727e8: 0x10727e8: addiu v0, sp, 196
-	ldloc.0
-	ldc.i4 196
+	stloc 13
+// 0x01072830: 0x1072830: addiu s3, s3, 4
+	ldloc 12
+	ldc.i4.4
 	add
-	stloc 5
-// 0x010727ec: 0x10727ec: sw    v0, 20(sp)
+	stloc 12
+L_1072834:
+// 0x01072834: 0x1072834: slt   v1, s5, s2
+	ldloc 14
+	ldloc 16
+	clt
+	stloc 6
+// 0x01072838: 0x1072838: bne   v1, zero, 0x10726f0 sll   zero, zero, 0
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
+	brtrue L_10726f0
+// --- basic block ---
+// 0x01072840: 0x1072840: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 7
+L_1072844:
+// 0x01072844: 0x1072844: lw    ra, 52(sp)
+// 0x01072848: 0x1072848: lw    s8, 48(sp)
 	ldloc 5
-	stelem.i4
-// 0x010727f0: 0x10727f0: addiu a1, a1, 32484
-	ldloc.2
-	ldc.i4 32484
-	add
-	stloc.2
-// 0x010727f4: 0x10727f4: addiu a3, a3, 32516
-	ldloc 4
-	ldc.i4 32516
-	add
-	stloc 4
-// 0x010727f8: 0x10727f8: addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-// 0x010727fc: 0x10727fc: mflo  lo
-	ldloc 15
-	stloc 5
-// 0x01072800: 0x1072800: jal   0x1000f64 sw    v0, 24(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 12
 	add
+	ldelem.i4
+	stloc 10
+// 0x0107284c: 0x107284c: lw    s7, 44(sp)
 	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01072808: 0x1072808: beq   s1, zero, 0x1072888 sll   zero, zero, 0
-	ldloc 8
-	brfalse L_1072888
-// --- basic block ---
-// 0x01072810: 0x1072810: lw    v0, 80(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 11
 	add
 	ldelem.i4
-	stloc 5
-// 0x01072814: 0x1072814: lw    s1, 40(sp)
-	ldloc 6
+	stloc 15
+// 0x01072850: 0x1072850: lw    s6, 40(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -5877,557 +5981,677 @@ L_10727d0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01072818: 0x1072818: sw    v0, 96(sp)
-	ldloc 6
+// 0x01072854: 0x1072854: lw    s5, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.s 9
 	add
+	ldelem.i4
+	stloc 14
+// 0x01072858: 0x1072858: lw    s4, 32(sp)
 	ldloc 5
-	stelem.i4
-// 0x0107281c: 0x107281c: lw    v0, 84(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 5
-// 0x01072820: 0x1072820: addiu s5, sp, 96
-	ldloc.0
-	ldc.i4.s 96
-	add
 	stloc 13
-// 0x01072824: 0x1072824: sw    v0, 100(sp)
-	ldloc 6
+// 0x0107285c: 0x107285c: lw    s3, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
+	ldc.i4.7
 	add
+	ldelem.i4
+	stloc 12
+// 0x01072860: 0x1072860: lw    s2, 24(sp)
 	ldloc 5
-	stelem.i4
-// 0x01072828: 0x1072828: lw    v0, 64(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107282c: 0x107282c: addiu s4, sp, 76
+	stloc 16
+// 0x01072864: 0x1072864: lw    s1, 20(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 76
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc 12
-// 0x01072830: 0x1072830: sw    v0, 76(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 11
+// 0x01072868: 0x1072868: lw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-// 0x01072834: 0x1072834: j	 0x1072874 addiu s3, sp, 104
+	ldelem.i4
+	stloc 9
+// 0x0107286c: 0x107286c: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldc.i4.s 104
+	ldc.i4.s 56
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 RTNet_ReportOneSegment_MaxLength_1072874(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra,int32 lo)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local 10 is register lo
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
 	stloc 10
-	br L_1072874
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_107283c:
-// 0x0107283c: 0x107283c: jal   0x10b45c4 sll   zero, zero, 0
+// 0x01072874: 0x1072874: addiu sp, sp, -48
+	ldloc.0
+	ldc.i4.s -48
+	add
+	stloc.0
+// 0x01072878: 0x1072878: sw    s0, 40(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107287c: 0x107287c: sw    ra, 44(sp)
+// 0x01072880: 0x1072880: jal   0x10b5dfc addu  s0, a0, zero
+	ldloc.1
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_position_10b45c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_committed_10b5dfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072888: 0x1072888: bne   v0, zero, 0x1072924 addu  v0, zero, zero
+	ldloc 5
+	ldc.i4.s 0
 	stloc 5
+	brtrue L_1072924
 // --- basic block ---
-// 0x01072844: 0x1072844: addu  a0, s1, zero
+// 0x01072890: 0x1072890: addiu v0, sp, 28
+	ldloc.0
+	ldc.i4.s 28
+	add
+	stloc 5
+// 0x01072894: 0x1072894: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01072848: 0x1072848: jal   0x10b4548 addu  a1, s4, zero
-	ldloc 12
+// 0x01072898: 0x1072898: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
+// 0x0107289c: 0x107289c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x010728a0: 0x10728a0: addiu a3, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc 4
+// 0x010728a4: 0x10728a4: sw    v0, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x010728a8: 0x10728a8: jal   0x10b6378 sw    zero, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_shape_time_10b4548(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01072850: 0x1072850: lw    a1, 96(sp)
-	ldloc 6
+// 0x010728b0: 0x10728b0: lw    v0, 28(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc.2
-// 0x01072854: 0x1072854: lw    a2, 100(sp)
-	ldloc 6
+	stloc 5
+// 0x010728b4: 0x10728b4: sll   zero, zero, 0
+// 0x010728b8: 0x10728b8: andi  v0, v0, 4
+	ldloc 5
+	ldc.i4.4
+	and
+	stloc 5
+// 0x010728bc: 0x10728bc: beq   v0, zero, 0x1072924 addu  v0, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_1072924
+// --- basic block ---
+// 0x010728c4: 0x10728c4: lw    a0, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
+	ldc.i4.6
 	add
 	ldelem.i4
+	stloc.1
+// 0x010728c8: 0x10728c8: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x010728cc: 0x10728cc: addiu a2, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
 	stloc.3
-// 0x01072858: 0x1072858: lw    a3, 76(sp)
-	ldloc 6
+// 0x010728d0: 0x10728d0: addiu a3, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
+	stloc 4
+// 0x010728d4: 0x10728d4: jal   0x10b4f40 sw    zero, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 4
-// 0x0107285c: 0x107285c: jal   0x107258c addu  a0, s3, zero
-	ldloc 10
-	stloc.1
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::format_point_string_107258c(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01072864: 0x1072864: addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-// 0x01072868: 0x1072868: addu  a1, s3, zero
-	ldloc 10
-	stloc.2
-// 0x0107286c: 0x107286c: jal   0x1001ac4 addiu s1, s1, 1
-	ldloc 8
-	ldc.i4.1
+// 0x010728dc: 0x10728dc: lw    v0, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc 8
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	ldelem.i4
 	stloc 5
+// 0x010728e0: 0x10728e0: sll   zero, zero, 0
+// 0x010728e4: 0x10728e4: bltz  v0, 0x10728fc addu  v1, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	blt L_10728fc
 // --- basic block ---
-L_1072874:
-// 0x01072874: 0x1072874: lw    v0, 44(sp)
-	ldloc 6
+// 0x010728ec: 0x10728ec: lw    v1, 36(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 9
 	add
 	ldelem.i4
+	stloc 6
+// 0x010728f0: 0x10728f0: sll   zero, zero, 0
+// 0x010728f4: 0x10728f4: addiu v1, v1, 1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+// 0x010728f8: 0x10728f8: subu  v1, v1, v0
+	ldloc 6
+	ldloc 5
+	sub
+	stloc 6
+L_10728fc:
+// 0x010728fc: 0x10728fc: addiu v0, zero, 36
+	ldc.i4.s 36
 	stloc 5
-// 0x01072878: 0x1072878: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x0107287c: 0x107287c: slt   v0, v0, s1
+// 0x01072900: 0x1072900: mult  v1, v0
+	ldloc 6
 	ldloc 5
-	ldloc 8
-	clt
+	mul
+	stloc 10
+// 0x01072904: 0x1072904: lw    a0, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc.1
+// 0x01072908: 0x1072908: sll   zero, zero, 0
+// 0x0107290c: 0x107290c: andi  a0, a0, 1
+	ldloc.1
+	ldc.i4.1
+	and
+	stloc.1
+// 0x01072910: 0x1072910: mflo  lo
+	ldloc 10
+	stloc 6
+// 0x01072914: 0x1072914: bne   a0, zero, 0x1072920 addiu v0, v1, 154
+	ldloc.1
+	ldloc 6
+	ldc.i4 154
+	add
 	stloc 5
-// 0x01072880: 0x1072880: beq   v0, zero, 0x107283c addu  a1, s5, zero
-	ldloc 5
-	ldloc 13
-	stloc.2
-	brfalse L_107283c
+	brtrue L_1072920
 // --- basic block ---
-L_1072888:
-// 0x01072888: 0x1072888: lw    v0, 36(sp)
+// 0x0107291c: 0x107291c: addiu v0, v1, 2210
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4 2210
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107288c: 0x107288c: sll   zero, zero, 0
-// 0x01072890: 0x1072890: andi  v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	and
 	stloc 5
-// 0x01072894: 0x1072894: bne   v0, zero, 0x1072944 addu  a0, s2, zero
+L_1072920:
+// 0x01072920: 0x1072920: addiu v0, v0, 1024
 	ldloc 5
-	ldloc 11
-	stloc.1
-	brtrue L_1072944
-// --- basic block ---
-// 0x0107289c: 0x107289c: jal   0x10b58c8 addiu a1, sp, 72
-	ldloc.0
-	ldc.i4.s 72
+	ldc.i4 1024
 	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl135::editor_line_get_street_10b58c8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x010728a4: 0x10728a4: lw    a0, 72(sp)
-	ldloc 6
+L_1072924:
+// 0x01072924: 0x1072924: lw    ra, 44(sp)
+// 0x01072928: 0x1072928: lw    s0, 40(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc.1
-// 0x010728a8: 0x10728a8: sll   zero, zero, 0
-// 0x010728ac: 0x10728ac: bltz  a0, 0x1072944 sll   zero, zero, 0
-	ldloc.1
-	ldc.i4.s 0
-	blt L_1072944
-// --- basic block ---
-// 0x010728b4: 0x10728b4: jal   0x10b4bfc addiu s3, sp, 248
+	stloc 8
+// 0x0107292c: 0x107292c: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4 248
+	ldc.i4.s 48
 	add
-	stloc 10
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_name_10b4bfc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010728bc: 0x10728bc: addu  a1, s3, zero
-	ldloc 10
-	stloc.2
-// 0x010728c0: 0x10728c0: addiu a2, zero, 512
-	ldc.i4 512
-	stloc.3
-// 0x010728c4: 0x10728c4: jal   0x1067b64 addu  a0, v0, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	stloc.1
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ret
+}
+.method public static int32 RTNet_RandomUserRegister_10729e0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 ra)
+
+// local  7 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010728cc: 0x10728cc: lw    a0, 72(sp)
-	ldloc 6
+// 0x010729e0: 0x10729e0: addiu sp, sp, -64
+	ldloc.0
+	ldc.i4.s -64
+	add
+	stloc.0
+// 0x010729e4: 0x10729e4: sw    s1, 56(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 14
 	add
-	ldelem.i4
-	stloc.1
-// 0x010728d0: 0x10728d0: jal   0x10b4a94 addiu s2, sp, 764
+	ldloc 9
+	stelem.i4
+// 0x010729e8: 0x10729e8: sw    s0, 52(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4 764
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
 	add
-	stloc 11
-	ldloc.0
-	ldloc.1
+	ldloc 8
+	stelem.i4
+// 0x010729ec: 0x10729ec: addu  s1, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_t2s_10b4a94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010728d8: 0x10728d8: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x010728dc: 0x10728dc: addu  a1, s2, zero
-	ldloc 11
+	stloc 9
+// 0x010729f0: 0x10729f0: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x010729f4: 0x10729f4: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-// 0x010728e0: 0x10728e0: jal   0x1067b64 addiu a2, zero, 512
-	ldc.i4 512
+// 0x010729f8: 0x10729f8: sw    ra, 60(sp)
+// 0x010729fc: 0x10729fc: jal   0x100177c addiu a2, zero, 64
+	ldc.i4.s 64
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x010728e8: 0x10728e8: lw    a0, 72(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
+// 0x01072a04: 0x1072a04: addiu a0, s0, 64
+	ldloc 8
+	ldc.i4.s 64
 	add
-	ldelem.i4
 	stloc.1
-// 0x010728ec: 0x10728ec: jal   0x10b4aec addiu s1, sp, 1280
-	ldloc.0
-	ldc.i4 1280
-	add
-	stloc 8
-	ldloc.0
+// 0x01072a08: 0x1072a08: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01072a0c: 0x1072a0c: jal   0x100177c addiu a2, zero, 64
+	ldc.i4.s 64
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl134::editor_street_get_street_city_10b4aec(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x010728f4: 0x10728f4: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x010728f8: 0x10728f8: addu  a1, s1, zero
+// 0x01072a14: 0x1072a14: addiu a0, s0, 128
 	ldloc 8
+	ldc.i4 128
+	add
+	stloc.1
+// 0x01072a18: 0x1072a18: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-// 0x010728fc: 0x10728fc: jal   0x1067b64 addiu a2, zero, 512
-	ldc.i4 512
+// 0x01072a1c: 0x1072a1c: jal   0x100177c addiu a2, zero, 64
+	ldc.i4.s 64
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x01072904: 0x1072904: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x01072a24: 0x1072a24: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107290c: 0x107290c: lw    a0, 48(sp)
-	ldloc 6
-	ldloc.0
+// 0x01072a28: 0x1072a28: lw    a0, -18000(v0)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4 -4500
 	add
 	ldelem.i4
 	stloc.1
-// 0x01072910: 0x1072910: jal   0x10102f4 addu  s4, v0, zero
-	ldloc 5
-	stloc 12
-	ldloc.1
-	call int32 Cibyl11::roadmap_layer_cfcc2type_10102f4(int32)
-	stloc 5
-// --- basic block ---
-// 0x01072918: 0x1072918: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107291c: 0x107291c: addu  a0, s0, s4
-	ldloc 9
-	ldloc 12
-	add
-	stloc.1
-// 0x01072920: 0x1072920: addiu a1, a1, 32524
-	ldloc.2
-	ldc.i4 32524
-	add
-	stloc.2
-// 0x01072924: 0x1072924: addu  a3, v0, zero
+// 0x01072a2c: 0x1072a2c: jal   0x102c400 sw    a0, 40(sp)
 	ldloc 5
-	stloc 4
-// 0x01072928: 0x1072928: addiu a2, zero, 8
-	ldc.i4.8
-	stloc.3
-// 0x0107292c: 0x107292c: sw    s3, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 10
-	stelem.i4
-// 0x01072930: 0x1072930: sw    s2, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 11
-	stelem.i4
-// 0x01072934: 0x1072934: jal   0x1000f64 sw    s1, 24(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 10
 	add
-	ldloc 8
+	ldloc.1
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107293c: 0x107293c: j	 0x1072960 sll   zero, zero, 0
-	br L_1072960
-// --- basic block ---
-L_1072944:
-// 0x01072944: 0x1072944: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	stloc 5
 // --- basic block ---
-// 0x0107294c: 0x107294c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072950: 0x1072950: addu  a0, s0, v0
-	ldloc 9
+// 0x01072a34: 0x1072a34: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 6
+// 0x01072a38: 0x1072a38: addiu v1, v1, -32680
+	ldloc 6
+	ldc.i4 -32680
+	add
+	stloc 6
+// 0x01072a3c: 0x1072a3c: sw    v1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 6
+	stelem.i4
+// 0x01072a40: 0x1072a40: lw    a0, 40(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
+	ldelem.i4
 	stloc.1
-// 0x01072954: 0x1072954: addiu a1, a1, 32588
-	ldloc.2
-	ldc.i4 32588
-	add
+// 0x01072a44: 0x1072a44: addiu v1, zero, 140
+	ldc.i4 140
+	stloc 6
+// 0x01072a48: 0x1072a48: lui   a1, 0x20000
+	ldc.i4 131072
 	stloc.2
-// 0x01072958: 0x1072958: jal   0x1000f64 addu  a2, zero, zero
+// 0x01072a4c: 0x1072a4c: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
+// 0x01072a50: 0x1072a50: sw    v1, 28(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 6
+	stelem.i4
+// 0x01072a54: 0x1072a54: addiu a1, a1, -32688
 	ldloc.2
+	ldc.i4 -32688
+	add
+	stloc.2
+// 0x01072a58: 0x1072a58: addiu v1, zero, 70
+	ldc.i4.s 70
+	stloc 6
+// 0x01072a5c: 0x1072a5c: addiu a2, a2, 15604
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_1072960:
-// 0x01072960: 0x1072960: lw    ra, 1836(sp)
-// 0x01072964: 0x1072964: addiu v0, zero, 1
+	ldc.i4 15604
+	add
+	stloc.3
+// 0x01072a60: 0x1072a60: addiu a3, zero, 1
 	ldc.i4.1
-	stloc 5
-// 0x01072968: 0x1072968: lw    s5, 1832(sp)
-	ldloc 6
+	stloc 4
+// 0x01072a64: 0x1072a64: sw    s1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 458
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 13
-// 0x0107296c: 0x107296c: lw    s4, 1828(sp)
-	ldloc 6
+	ldloc 9
+	stelem.i4
+// 0x01072a68: 0x1072a68: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 457
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 12
-// 0x01072970: 0x1072970: lw    s3, 1824(sp)
-	ldloc 6
+	ldloc 8
+	stelem.i4
+// 0x01072a6c: 0x1072a6c: sw    v1, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 456
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc 10
-// 0x01072974: 0x1072974: lw    s2, 1820(sp)
 	ldloc 6
+	stelem.i4
+// 0x01072a70: 0x1072a70: jal   0x106a4b4 sw    v0, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 455
+	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc 11
-// 0x01072978: 0x1072978: lw    s1, 1816(sp)
-	ldloc 6
+	ldloc 7
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 7
+// --- basic block ---
+// 0x01072a78: 0x1072a78: lw    ra, 60(sp)
+// 0x01072a7c: 0x1072a7c: lw    s1, 56(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 454
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107297c: 0x107297c: lw    s0, 1812(sp)
-	ldloc 6
+	stloc 9
+// 0x01072a80: 0x1072a80: lw    s0, 52(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 453
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc 9
-// 0x01072980: 0x1072980: jr    ra addiu sp, sp, 1840
+	stloc 8
+// 0x01072a84: 0x1072a84: jr    ra addiu sp, sp, 64
 	ldloc.0
-	ldc.i4 1840
+	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 7
 	ret
 }
-.method public static int32 format_RoadMapGpsPosition_Pos_Azy_Str_1072988(int32,int32,int32,int32,int32)
+.method public static int32 convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32 hi,int32 lo,int32[] mem)
 
-// local  6 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  7 is register ra
+// local  8 is register hi
+// local  9 is register lo
+// local 10 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6436,165 +6660,117 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
 	stloc 8
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 10
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072988: 0x1072988: addiu sp, sp, -88
+// 0x01072a8c: 0x1072a8c: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -88
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107298c: 0x107298c: addiu a2, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.3
-// 0x01072990: 0x1072990: sw    s0, 76(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldloc 7
-	stelem.i4
-// 0x01072994: 0x1072994: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x01072998: 0x1072998: lw    a1, 0(a1)
-	ldloc 5
+// 0x01072a90: 0x1072a90: sw    ra, 20(sp)
+// 0x01072a94: 0x1072a94: bne   a1, zero, 0x1072ab0 addu  v0, a0, zero
 	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-// 0x0107299c: 0x107299c: sw    s1, 80(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 8
-	stelem.i4
-// 0x010729a0: 0x10729a0: addu  s1, a0, zero
 	ldloc.1
-	stloc 8
-// 0x010729a4: 0x10729a4: addu  a0, a2, zero
-	ldloc.3
-	stloc.1
-// 0x010729a8: 0x10729a8: sw    ra, 84(sp)
-// 0x010729ac: 0x10729ac: jal   0x1072468 sw    a2, 68(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
+	stloc 5
+	brtrue L_1072ab0
+// --- basic block ---
+// 0x01072a9c: 0x1072a9c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01072aa0: 0x1072aa0: jal   0x1001b68 addiu a1, a1, -52
+	ldloc.2
+	ldc.i4.s -52
 	add
-	ldloc.3
-	stelem.i4
-	ldloc.0
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strcpy_1001b68(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010729b4: 0x10729b4: addiu a3, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc 4
-// 0x010729b8: 0x10729b8: lw    a1, 4(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
+// 0x01072aa8: 0x1072aa8: j	 0x1072afc sll   zero, zero, 0
+	br L_1072afc
+// --- basic block ---
+L_1072ab0:
+// 0x01072ab0: 0x1072ab0: bgez  a1, 0x1072ac0 addu  v1, zero, zero
+	ldloc.2
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	bge L_1072ac0
+// --- basic block ---
+// 0x01072ab8: 0x1072ab8: subu  a1, zero, a1
+	ldloc.2
+	neg
 	stloc.2
-// 0x010729bc: 0x10729bc: addu  a0, a3, zero
+// 0x01072abc: 0x1072abc: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+L_1072ac0:
+// 0x01072ac0: 0x1072ac0: lui   a3, 0xf0000
+	ldc.i4 983040
+	stloc 4
+// 0x01072ac4: 0x1072ac4: ori   a3, a3, 16960
 	ldloc 4
-	stloc.1
-// 0x010729c0: 0x10729c0: jal   0x1072468 sw    a3, 64(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
+	ldc.i4 16960
+	or
+	stloc 4
+// 0x01072ac8: 0x1072ac8: div   a1, a3
+	ldloc.2
 	ldloc 4
-	stelem.i4
-	ldloc.0
-	ldloc.1
 	ldloc.2
-	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	div
 	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x010729c8: 0x10729c8: lw    v0, 16(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 6
-// 0x010729cc: 0x10729cc: lw    a2, 68(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldelem.i4
-	stloc.3
-// 0x010729d0: 0x10729d0: lw    a3, 64(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
+	rem
+	stloc 8
+// 0x01072acc: 0x1072acc: mfhi  hi
+	ldloc 8
 	stloc 4
-// 0x010729d4: 0x10729d4: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x01072ad0: 0x1072ad0: mflo  lo
+	ldloc 9
+	stloc.3
+// 0x01072ad4: 0x1072ad4: beq   v1, zero, 0x1072ae8 lui   a1, 0x20000
+	ldloc 6
+	ldc.i4 131072
 	stloc.2
-// 0x010729d8: 0x10729d8: addu  a0, s1, zero
-	ldloc 8
+	brfalse L_1072ae8
+// --- basic block ---
+// 0x01072adc: 0x1072adc: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x010729dc: 0x10729dc: addiu a1, a1, 32504
+// 0x01072ae0: 0x1072ae0: j	 0x1072af4 addiu a1, a1, -32660
 	ldloc.2
-	ldc.i4 32504
+	ldc.i4 -32660
 	add
 	stloc.2
-// 0x010729e0: 0x10729e0: jal   0x1000f64 sw    v0, 16(sp)
+	br L_1072af4
+// --- basic block ---
+L_1072ae8:
+// 0x01072ae8: 0x1072ae8: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01072aec: 0x1072aec: addu  a0, v0, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc.1
+// 0x01072af0: 0x1072af0: addiu a1, a1, -32648
+	ldloc.2
+	ldc.i4 -32648
 	add
-	ldloc 6
-	stelem.i4
+	stloc.2
+L_1072af4:
+// 0x01072af4: 0x1072af4: jal   0x1000f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6602,44 +6778,28 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010729e8: 0x10729e8: lw    ra, 84(sp)
-// 0x010729ec: 0x10729ec: lw    s1, 80(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldelem.i4
-	stloc 8
-// 0x010729f0: 0x10729f0: lw    s0, 76(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldelem.i4
-	stloc 7
-// 0x010729f4: 0x10729f4: jr    ra addiu sp, sp, 88
+L_1072afc:
+// 0x01072afc: 0x1072afc: lw    ra, 20(sp)
+// 0x01072b00: 0x1072b00: sll   zero, zero, 0
+// 0x01072b04: 0x1072b04: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 88
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+__CIBYL_function_return:
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 format_RoadMapGpsPosition_string_10729fc(int32,int32,int32,int32,int32)
+.method public static int32 format_RoadMapArea_string_1072b0c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 v1,int32 s0,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s2,int32 v0,int32 v1,int32 s0,int32 s1,int32 s3,int32 ra)
 
 // local  7 is register v0
 // local  8 is register v1
@@ -6648,10 +6808,11 @@ __CIBYL_function_return:
 // local  3 is register a2
 // local  4 is register a3
 // local  9 is register s0
-// local  6 is register s1
-// local 10 is register s2
+// local 10 is register s1
+// local  6 is register s2
+// local 11 is register s3
 // local  0 is register sp
-// local 11 is register ra
+// local 12 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -6669,77 +6830,79 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 10
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010729fc: 0x10729fc: addiu sp, sp, -120
+// 0x01072b0c: 0x1072b0c: addiu sp, sp, -136
 	ldloc.0
-	ldc.i4.s -120
+	ldc.i4 -136
 	add
 	stloc.0
-// 0x01072a00: 0x1072a00: addiu a2, sp, 32
+// 0x01072b10: 0x1072b10: sw    s2, 124(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
 	add
-	stloc.3
-// 0x01072a04: 0x1072a04: sw    s1, 108(sp)
+	ldloc 6
+	stelem.i4
+// 0x01072b14: 0x1072b14: sw    s1, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 27
+	ldc.i4.s 30
 	add
-	ldloc 6
+	ldloc 10
 	stelem.i4
-// 0x01072a08: 0x1072a08: addu  s1, a1, zero
+// 0x01072b18: 0x1072b18: addu  s2, a1, zero
 	ldloc.2
 	stloc 6
-// 0x01072a0c: 0x1072a0c: lw    a1, 0(a1)
+// 0x01072b1c: 0x1072b1c: addiu s1, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc 10
+// 0x01072b20: 0x1072b20: lw    a1, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01072a10: 0x1072a10: sw    s2, 112(sp)
+// 0x01072b24: 0x1072b24: sw    s3, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4.s 32
 	add
-	ldloc 10
+	ldloc 11
 	stelem.i4
-// 0x01072a14: 0x1072a14: addu  s2, a0, zero
+// 0x01072b28: 0x1072b28: addu  s3, a0, zero
 	ldloc.1
-	stloc 10
-// 0x01072a18: 0x1072a18: addu  a0, a2, zero
-	ldloc.3
+	stloc 11
+// 0x01072b2c: 0x1072b2c: addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x01072a1c: 0x1072a1c: sw    ra, 116(sp)
-// 0x01072a20: 0x1072a20: sw    a2, 100(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldloc.3
-	stelem.i4
-// 0x01072a24: 0x1072a24: jal   0x1072468 sw    s0, 104(sp)
+// 0x01072b30: 0x1072b30: sw    ra, 132(sp)
+// 0x01072b34: 0x1072b34: jal   0x1072a8c sw    s0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 26
+	ldc.i4.s 29
 	add
 	ldloc 9
 	stelem.i4
@@ -6748,17 +6911,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01072a2c: 0x1072a2c: addiu a3, sp, 52
+// 0x01072b3c: 0x1072b3c: addiu s0, sp, 44
 	ldloc.0
-	ldc.i4.s 52
+	ldc.i4.s 44
 	add
-	stloc 4
-// 0x01072a30: 0x1072a30: lw    a1, 4(s1)
+	stloc 9
+// 0x01072b40: 0x1072b40: lw    a1, 4(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6767,34 +6930,25 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01072a34: 0x1072a34: addu  a0, a3, zero
-	ldloc 4
+// 0x01072b44: 0x1072b44: jal   0x1072a8c addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x01072a38: 0x1072a38: sw    a3, 96(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldloc 4
-	stelem.i4
-// 0x01072a3c: 0x1072a3c: jal   0x1072468 addiu s0, sp, 72
-	ldloc.0
-	ldc.i4.s 72
-	add
-	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01072a44: 0x1072a44: lw    a1, 8(s1)
+// 0x01072b4c: 0x1072b4c: addiu a2, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc.3
+// 0x01072b50: 0x1072b50: lw    a1, 8(s2)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -6803,114 +6957,65 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01072a48: 0x1072a48: jal   0x1072468 addu  a0, s0, zero
-	ldloc 9
+// 0x01072b54: 0x1072b54: addu  a0, a2, zero
+	ldloc.3
 	stloc.1
+// 0x01072b58: 0x1072b58: jal   0x1072a8c sw    a2, 108(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 27
+	add
+	ldloc.3
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01072a50: 0x1072a50: lw    v0, 12(s1)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc 7
-// 0x01072a54: 0x1072a54: lw    v1, 16(s1)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x01072a58: 0x1072a58: lw    a2, 100(sp)
-	ldloc 5
+// 0x01072b60: 0x1072b60: addiu a3, sp, 84
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
+	ldc.i4.s 84
 	add
-	ldelem.i4
-	stloc.3
-// 0x01072a5c: 0x1072a5c: lw    a3, 96(sp)
+	stloc 4
+// 0x01072b64: 0x1072b64: lw    a1, 12(s2)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 4
-// 0x01072a60: 0x1072a60: lui   a1, 0x10000
-	ldc.i4 65536
 	stloc.2
-// 0x01072a64: 0x1072a64: addu  a0, s2, zero
-	ldloc 10
+// 0x01072b68: 0x1072b68: addu  a0, a3, zero
+	ldloc 4
 	stloc.1
-// 0x01072a68: 0x1072a68: addiu a1, a1, 32596
-	ldloc.2
-	ldc.i4 32596
-	add
-	stloc.2
-// 0x01072a6c: 0x1072a6c: sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x01072a70: 0x1072a70: sw    v1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 8
-	stelem.i4
-// 0x01072a74: 0x1072a74: jal   0x1000f64 sw    v0, 24(sp)
+// 0x01072b6c: 0x1072b6c: jal   0x1072a8c sw    a3, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 26
 	add
-	ldloc 7
+	ldloc 4
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01072a7c: 0x1072a7c: lw    ra, 116(sp)
-// 0x01072a80: 0x1072a80: lw    s2, 112(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 28
-	add
-	ldelem.i4
-	stloc 10
-// 0x01072a84: 0x1072a84: lw    s1, 108(sp)
+// 0x01072b74: 0x1072b74: lw    a2, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6918,8 +7023,8 @@ __CIBYL_javamethod_begin:
 	ldc.i4.s 27
 	add
 	ldelem.i4
-	stloc 6
-// 0x01072a88: 0x1072a88: lw    s0, 104(sp)
+	stloc.3
+// 0x01072b78: 0x1072b78: lw    a3, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6927,141 +7032,36 @@ __CIBYL_javamethod_begin:
 	ldc.i4.s 26
 	add
 	ldelem.i4
-	stloc 9
-// 0x01072a8c: 0x1072a8c: jr    ra addiu sp, sp, 120
-	ldloc.0
-	ldc.i4.s 120
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 format_RoadMapPosition_string_1072a94(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 s2,int32 ra)
-
-// local  8 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local 10 is register s2
-// local  0 is register sp
-// local 11 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 10
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 11
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01072a94: 0x1072a94: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x01072a98: 0x1072a98: sw    s2, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 10
-	stelem.i4
-// 0x01072a9c: 0x1072a9c: sw    s0, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 6
-	stelem.i4
-// 0x01072aa0: 0x1072aa0: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x01072aa4: 0x1072aa4: addiu s0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 6
-// 0x01072aa8: 0x1072aa8: lw    a1, 0(a1)
-	ldloc 5
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01072aac: 0x1072aac: sw    s1, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 7
-	stelem.i4
-// 0x01072ab0: 0x1072ab0: addu  s1, a0, zero
-	ldloc.1
-	stloc 7
-// 0x01072ab4: 0x1072ab4: sw    ra, 52(sp)
-// 0x01072ab8: 0x1072ab8: jal   0x1072468 addu  a0, s0, zero
-	ldloc 6
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x01072ac0: 0x1072ac0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072ac4: 0x1072ac4: addu  a2, s0, zero
-	ldloc 6
-	stloc.3
-// 0x01072ac8: 0x1072ac8: addu  a0, s1, zero
-	ldloc 7
+// 0x01072b7c: 0x1072b7c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01072b80: 0x1072b80: addu  a0, s3, zero
+	ldloc 11
 	stloc.1
-// 0x01072acc: 0x1072acc: jal   0x1000f64 addiu a1, a1, 32612
+// 0x01072b84: 0x1072b84: addiu a1, a1, -32640
 	ldloc.2
-	ldc.i4 32612
+	ldc.i4 -32640
 	add
 	stloc.2
+// 0x01072b88: 0x1072b88: sw    s1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 10
+	stelem.i4
+// 0x01072b8c: 0x1072b8c: jal   0x1000f64 sw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 9
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7069,105 +7069,81 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x01072ad4: 0x1072ad4: lw    a1, 4(s2)
+// 0x01072b94: 0x1072b94: lw    ra, 132(sp)
+// 0x01072b98: 0x1072b98: lw    s3, 128(sp)
 	ldloc 5
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 32
 	add
 	ldelem.i4
-	stloc.2
-// 0x01072ad8: 0x1072ad8: jal   0x1072468 addu  a0, s0, zero
-	ldloc 6
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x01072ae0: 0x1072ae0: addu  a0, s1, zero
-	ldloc 7
-	stloc.1
-// 0x01072ae4: 0x1072ae4: jal   0x1001ac4 addu  a1, s0, zero
-	ldloc 6
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 8
-// --- basic block ---
-// 0x01072aec: 0x1072aec: lw    ra, 52(sp)
-// 0x01072af0: 0x1072af0: lw    s2, 48(sp)
+	stloc 11
+// 0x01072b9c: 0x1072b9c: lw    s2, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.s 31
 	add
 	ldelem.i4
-	stloc 10
-// 0x01072af4: 0x1072af4: lw    s1, 44(sp)
+	stloc 6
+// 0x01072ba0: 0x1072ba0: lw    s1, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 30
 	add
 	ldelem.i4
-	stloc 7
-// 0x01072af8: 0x1072af8: lw    s0, 40(sp)
+	stloc 10
+// 0x01072ba4: 0x1072ba4: lw    s0, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 29
 	add
 	ldelem.i4
-	stloc 6
-// 0x01072afc: 0x1072afc: jr    ra addiu sp, sp, 56
+	stloc 9
+// 0x01072ba8: 0x1072ba8: jr    ra addiu sp, sp, 136
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4 136
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
 	ret
 }
-.method public static int32 RTNet_GetGeoConfig_1072b04(int32,int32,int32,int32,int32)
+.method public static int32 format_point_string_1072bb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 v0,int32 v1,int32 ra)
 
-// local  7 is register v0
-// local  6 is register v1
+// local 10 is register v0
+// local 11 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
+// local  6 is register s0
+// local  7 is register s1
+// local  8 is register s2
+// local  9 is register s3
 // local  0 is register sp
 // local 12 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 10
 	ldc.i4.s 0
-	stloc 6
+	stloc 11
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -7177,13 +7153,13 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldc.i4.s 0
-	stloc 11
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
@@ -7192,268 +7168,194 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072b04: 0x1072b04: addiu sp, sp, -152
+// 0x01072bb0: 0x1072bb0: addiu sp, sp, -96
 	ldloc.0
-	ldc.i4 -152
+	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01072b08: 0x1072b08: sw    s0, 132(sp)
+// 0x01072bb4: 0x1072bb4: sw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4.s 20
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x01072b0c: 0x1072b0c: addiu s0, sp, 48
+// 0x01072bb8: 0x1072bb8: addiu s1, sp, 24
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 24
 	add
-	stloc 8
-// 0x01072b10: 0x1072b10: sw    s3, 144(sp)
+	stloc 7
+// 0x01072bbc: 0x1072bbc: sw    s3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 36
+	ldc.i4.s 22
 	add
-	ldloc 11
+	ldloc 9
 	stelem.i4
-// 0x01072b14: 0x1072b14: sw    s2, 140(sp)
+// 0x01072bc0: 0x1072bc0: addu  s3, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01072bc4: 0x1072bc4: addu  a0, s1, zero
+	ldloc 7
+	stloc.1
+// 0x01072bc8: 0x1072bc8: sw    ra, 92(sp)
+// 0x01072bcc: 0x1072bcc: sw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 35
+	ldc.i4.s 21
 	add
-	ldloc 10
-	stelem.i4
-// 0x01072b18: 0x1072b18: addu  s3, a1, zero
-	ldloc.2
-	stloc 11
-// 0x01072b1c: 0x1072b1c: addu  s2, a0, zero
-	ldloc.1
-	stloc 10
-// 0x01072b20: 0x1072b20: addu  a1, a2, zero
-	ldloc.3
-	stloc.2
-// 0x01072b24: 0x1072b24: addu  a0, s0, zero
 	ldloc 8
-	stloc.1
-// 0x01072b28: 0x1072b28: sw    ra, 148(sp)
-// 0x01072b2c: 0x1072b2c: sw    s1, 136(sp)
+	stelem.i4
+// 0x01072bd0: 0x1072bd0: sw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4.s 19
 	add
-	ldloc 9
+	ldloc 6
 	stelem.i4
-// 0x01072b30: 0x1072b30: jal   0x1072a94 addu  s1, a3, zero
+// 0x01072bd4: 0x1072bd4: addu  s2, a3, zero
 	ldloc 4
-	stloc 9
+	stloc 8
+// 0x01072bd8: 0x1072bd8: jal   0x1072a8c sw    a2, 64(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::format_RoadMapPosition_string_1072a94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
-// --- basic block ---
-// 0x01072b38: 0x1072b38: jal   0x102c3f0 sll   zero, zero, 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
+	stloc 11
+	stloc 10
 // --- basic block ---
-// 0x01072b40: 0x1072b40: lw    v1, 168(sp)
+// 0x01072be0: 0x1072be0: lw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc 6
-// 0x01072b44: 0x1072b44: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01072b48: 0x1072b48: sw    v1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
-// 0x01072b4c: 0x1072b4c: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x01072b50: 0x1072b50: addiu v1, v1, 32616
-	ldloc 6
-	ldc.i4 32616
-	add
-	stloc 6
-// 0x01072b54: 0x1072b54: sw    v1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 6
-	stelem.i4
-// 0x01072b58: 0x1072b58: lui   a2, 0x0
-	ldc.i4.s 0
 	stloc.3
-// 0x01072b5c: 0x1072b5c: addiu v1, zero, 140
-	ldc.i4 140
-	stloc 6
-// 0x01072b60: 0x1072b60: sw    v1, 28(sp)
-	ldloc 5
+// 0x01072be4: 0x1072be4: addiu s0, sp, 44
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4.s 44
 	add
+	stloc 6
+// 0x01072be8: 0x1072be8: addu  a1, a2, zero
+	ldloc.3
+	stloc.2
+// 0x01072bec: 0x1072bec: jal   0x1072a8c addu  a0, s0, zero
 	ldloc 6
-	stelem.i4
-// 0x01072b64: 0x1072b64: addu  a0, s3, zero
-	ldloc 11
 	stloc.1
-// 0x01072b68: 0x1072b68: addiu v1, zero, 70
-	ldc.i4.s 70
-	stloc 6
-// 0x01072b6c: 0x1072b6c: addiu a1, a1, 972
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 972
-	add
-	stloc.2
-// 0x01072b70: 0x1072b70: addiu a2, a2, 15220
 	ldloc.3
-	ldc.i4 15220
-	add
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
+	stloc 10
+// --- basic block ---
+// 0x01072bf4: 0x1072bf4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01072bf8: 0x1072bf8: addu  a0, s3, zero
+	ldloc 9
+	stloc.1
+// 0x01072bfc: 0x1072bfc: addu  a2, s1, zero
+	ldloc 7
 	stloc.3
-// 0x01072b74: 0x1072b74: addiu a3, zero, 4
-	ldc.i4.4
+// 0x01072c00: 0x1072c00: addu  a3, s0, zero
+	ldloc 6
 	stloc 4
-// 0x01072b78: 0x1072b78: sw    s2, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+// 0x01072c04: 0x1072c04: addiu a1, a1, -32628
+	ldloc.2
+	ldc.i4 -32628
 	add
-	ldloc 10
-	stelem.i4
-// 0x01072b7c: 0x1072b7c: sw    s0, 32(sp)
+	stloc.2
+// 0x01072c08: 0x1072c08: jal   0x1000f64 sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
 	ldloc 8
 	stelem.i4
-// 0x01072b80: 0x1072b80: sw    s1, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 9
-	stelem.i4
-// 0x01072b84: 0x1072b84: sw    v1, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 6
-	stelem.i4
-// 0x01072b88: 0x1072b88: jal   0x1069ec8 sw    v0, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 7
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 7
+	stloc 11
+	stloc 10
 // --- basic block ---
-// 0x01072b90: 0x1072b90: lw    ra, 148(sp)
-// 0x01072b94: 0x1072b94: sltu  v0, zero, v0
-	ldc.i4.s 0
-	ldloc 7
-	clt.un
-	stloc 7
-// 0x01072b98: 0x1072b98: lw    s3, 144(sp)
+// 0x01072c10: 0x1072c10: lw    ra, 92(sp)
+// 0x01072c14: 0x1072c14: lw    s3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 36
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc 11
-// 0x01072b9c: 0x1072b9c: lw    s2, 140(sp)
+	stloc 9
+// 0x01072c18: 0x1072c18: lw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 35
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 10
-// 0x01072ba0: 0x1072ba0: lw    s1, 136(sp)
+	stloc 8
+// 0x01072c1c: 0x1072c1c: lw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4.s 20
 	add
 	ldelem.i4
-	stloc 9
-// 0x01072ba4: 0x1072ba4: lw    s0, 132(sp)
+	stloc 7
+// 0x01072c20: 0x1072c20: lw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4.s 19
 	add
 	ldelem.i4
-	stloc 8
-// 0x01072ba8: 0x1072ba8: jr    ra addiu sp, sp, 152
+	stloc 6
+// 0x01072c24: 0x1072c24: jr    ra addiu sp, sp, 96
 	ldloc.0
-	ldc.i4 152
+	ldc.i4.s 96
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 11
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 10
 	ret
 }
 }
diff --git a/converted/Cibyl86.j b/converted/Cibyl86.j
index aa4a50c..39906f0 100644
--- a/converted/Cibyl86.j
+++ b/converted/Cibyl86.j
@@ -41,35 +41,29 @@
     IL_0006:  ret
   } // end of method Cibyl86::.ctor
 
-.method public static int32 RTNet_GPSPath_BuildCommand_1072bb0(int32,int32,int32,int32,int32)
+.method public static int32 format_DB_point_string_1072c2c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s6,int32 v1,int32 s1,int32 s2,int32 s8,int32 s4,int32 s5,int32 s3,int32 s7,int32 ra,int32 lo)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 v0,int32 v1,int32 ra)
 
-// local  6 is register v0
-// local  9 is register v1
+// local 10 is register v0
+// local 11 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local 10 is register s1
-// local 11 is register s2
-// local 15 is register s3
-// local 13 is register s4
-// local 14 is register s5
-// local  8 is register s6
-// local 16 is register s7
+// local  6 is register s0
+// local  7 is register s1
+// local  8 is register s2
+// local  9 is register s3
 // local  0 is register sp
-// local 12 is register s8
-// local 17 is register ra
-// local 18 is register lo
+// local 12 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 10
 	ldc.i4.s 0
-	stloc 9
+	stloc 11
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -79,197 +73,167 @@
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 13
+	stloc 6
 	ldc.i4.s 0
-	stloc 14
+	stloc 7
 	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
-	stloc 16
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 12
-	ldc.i4.s 0
-	stloc 17
-	ldc.i4.s 0
-	stloc 18
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072bb0: 0x1072bb0: addiu v0, a2, -2
-	ldloc.3
-	ldc.i4.s -2
-	add
-	stloc 6
-// 0x01072bb4: 0x1072bb4: addiu sp, sp, -192
+// 0x01072c2c: 0x1072c2c: addiu sp, sp, -96
 	ldloc.0
-	ldc.i4 -192
+	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01072bb8: 0x1072bb8: sltiu v0, v0, 99
-	ldloc 6
-	ldc.i4.s 99
-	clt.un
-	stloc 6
-// 0x01072bbc: 0x1072bbc: sw    s7, 180(sp)
+// 0x01072c30: 0x1072c30: sw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 45
+	ldc.i4.s 20
 	add
-	ldloc 16
+	ldloc 7
 	stelem.i4
-// 0x01072bc0: 0x1072bc0: sw    s3, 164(sp)
-	ldloc 5
+// 0x01072c34: 0x1072c34: addiu s1, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 41
+	ldc.i4.s 24
 	add
-	ldloc 15
-	stelem.i4
-// 0x01072bc4: 0x1072bc4: sw    s1, 156(sp)
+	stloc 7
+// 0x01072c38: 0x1072c38: sw    s3, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 39
+	ldc.i4.s 22
 	add
-	ldloc 10
+	ldloc 9
 	stelem.i4
-// 0x01072bc8: 0x1072bc8: sw    s0, 152(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 38
-	add
+// 0x01072c3c: 0x1072c3c: addu  s3, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01072c40: 0x1072c40: addu  a0, s1, zero
 	ldloc 7
-	stelem.i4
-// 0x01072bcc: 0x1072bcc: sw    ra, 188(sp)
-// 0x01072bd0: 0x1072bd0: sw    s8, 184(sp)
+	stloc.1
+// 0x01072c44: 0x1072c44: sw    ra, 92(sp)
+// 0x01072c48: 0x1072c48: sw    s2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 46
+	ldc.i4.s 21
 	add
-	ldloc 12
+	ldloc 8
 	stelem.i4
-// 0x01072bd4: 0x1072bd4: sw    s6, 176(sp)
+// 0x01072c4c: 0x1072c4c: sw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 44
+	ldc.i4.s 19
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x01072bd8: 0x1072bd8: sw    s5, 172(sp)
+// 0x01072c50: 0x1072c50: addu  s2, a3, zero
+	ldloc 4
+	stloc 8
+// 0x01072c54: 0x1072c54: jal   0x1072a8c sw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 43
+	ldc.i4.s 16
 	add
-	ldloc 14
+	ldloc.3
 	stelem.i4
-// 0x01072bdc: 0x1072bdc: sw    s4, 168(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
+	stloc 10
+// --- basic block ---
+// 0x01072c5c: 0x1072c5c: lw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.s 16
 	add
-	ldloc 13
-	stelem.i4
-// 0x01072be0: 0x1072be0: sw    s2, 160(sp)
-	ldloc 5
+	ldelem.i4
+	stloc.3
+// 0x01072c60: 0x1072c60: addiu s0, sp, 44
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 40
+	ldc.i4.s 44
 	add
-	ldloc 11
-	stelem.i4
-// 0x01072be4: 0x1072be4: addu  s3, a2, zero
+	stloc 6
+// 0x01072c64: 0x1072c64: addu  a1, a2, zero
 	ldloc.3
-	stloc 15
-// 0x01072be8: 0x1072be8: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x01072bec: 0x1072bec: addu  s7, a3, zero
-	ldloc 4
-	stloc 16
-// 0x01072bf0: 0x1072bf0: beq   v0, zero, 0x1072c94 addu  s1, a0, zero
+	stloc.2
+// 0x01072c68: 0x1072c68: jal   0x1072a8c addu  a0, s0, zero
 	ldloc 6
+	stloc.1
+	ldloc.0
 	ldloc.1
-	stloc 10
-	brfalse L_1072c94
-// --- basic block ---
-// 0x01072bf8: 0x1072bf8: addiu a3, zero, 3
-	ldc.i4.3
-	stloc 4
-// 0x01072bfc: 0x1072bfc: mult  a2, a3
+	ldloc.2
 	ldloc.3
 	ldloc 4
-	mul
-	stloc 18
-// 0x01072c00: 0x1072c00: lw    a2, 12(a1)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
+	stloc 10
+// --- basic block ---
+// 0x01072c70: 0x1072c70: lw    a2, 112(sp)
 	ldloc 5
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 28
 	add
 	ldelem.i4
 	stloc.3
-// 0x01072c04: 0x1072c04: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x01072c74: 0x1072c74: lui   a1, 0x20000
+	ldc.i4 131072
 	stloc.2
-// 0x01072c08: 0x1072c08: addiu a1, a1, 32652
+// 0x01072c78: 0x1072c78: addu  a0, s3, zero
+	ldloc 9
+	stloc.1
+// 0x01072c7c: 0x1072c7c: addu  a3, s1, zero
+	ldloc 7
+	stloc 4
+// 0x01072c80: 0x1072c80: addiu a1, a1, -32616
 	ldloc.2
-	ldc.i4 32652
+	ldc.i4 -32616
 	add
 	stloc.2
-// 0x01072c0c: 0x1072c0c: lui   s8, 0x10000
-	ldc.i4 65536
-	stloc 12
-// 0x01072c10: 0x1072c10: addu  s2, zero, zero
-	ldc.i4.s 0
-	stloc 11
-// 0x01072c14: 0x1072c14: addu  s6, zero, zero
-	ldc.i4.s 0
-	stloc 8
-// 0x01072c18: 0x1072c18: addiu s5, sp, 24
+// 0x01072c84: 0x1072c84: sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc 14
-// 0x01072c1c: 0x1072c1c: addiu s4, sp, 64
+	ldloc 6
+	stelem.i4
+// 0x01072c88: 0x1072c88: jal   0x1000f64 sw    s2, 20(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 64
-	add
-	stloc 13
-// 0x01072c20: 0x1072c20: mflo  lo
-	ldloc 18
-	stloc 4
-// 0x01072c24: 0x1072c24: jal   0x1000f64 addiu s8, s8, 32668
-	ldloc 12
-	ldc.i4 32668
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc 12
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -277,257 +241,62 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x01072c2c: 0x1072c2c: j	 0x1072c48 addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-	br L_1072c48
+	stloc 11
+	stloc 10
 // --- basic block ---
-L_1072c34:
-// 0x01072c34: 0x1072c34: lw    s6, 28(s0)
+// 0x01072c90: 0x1072c90: lw    ra, 92(sp)
+// 0x01072c94: 0x1072c94: lw    s3, 88(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc 8
-// 0x01072c38: 0x1072c38: lw    v0, 12(s0)
+	stloc 9
+// 0x01072c98: 0x1072c98: lw    s2, 84(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 6
-// 0x01072c3c: 0x1072c3c: addiu s0, s0, 16
-	ldloc 7
-	ldc.i4.s 16
-	add
-	stloc 7
-// 0x01072c40: 0x1072c40: subu  s6, s6, v0
-	ldloc 8
-	ldloc 6
-	sub
 	stloc 8
-// 0x01072c44: 0x1072c44: addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-L_1072c48:
-// 0x01072c48: 0x1072c48: jal   0x1072a94 addu  a0, s5, zero
-	ldloc 14
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::format_RoadMapPosition_string_1072a94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x01072c50: 0x1072c50: lw    a3, 8(s0)
+// 0x01072c9c: 0x1072c9c: lw    s1, 80(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.s 20
 	add
 	ldelem.i4
-	stloc 4
-// 0x01072c54: 0x1072c54: addu  a2, s5, zero
-	ldloc 14
-	stloc.3
-// 0x01072c58: 0x1072c58: addu  a0, s4, zero
-	ldloc 13
-	stloc.1
-// 0x01072c5c: 0x1072c5c: addu  a1, s8, zero
-	ldloc 12
-	stloc.2
-// 0x01072c60: 0x1072c60: sw    s6, 16(sp)
+	stloc 7
+// 0x01072ca0: 0x1072ca0: lw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-// 0x01072c64: 0x1072c64: jal   0x1000f64 addiu s2, s2, 1
-	ldloc 11
-	ldc.i4.1
+	ldc.i4.s 19
 	add
-	stloc 11
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x01072c6c: 0x1072c6c: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x01072c70: 0x1072c70: jal   0x1001ac4 addu  a1, s4, zero
-	ldloc 13
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 6
-// --- basic block ---
-// 0x01072c78: 0x1072c78: slt   v0, s2, s3
-	ldloc 11
-	ldloc 15
-	clt
+	ldelem.i4
 	stloc 6
-// 0x01072c7c: 0x1072c7c: bne   v0, zero, 0x1072c34 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_1072c34
-// --- basic block ---
-// 0x01072c84: 0x1072c84: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072c88: 0x1072c88: addiu a1, a1, 19160
-	ldloc.2
-	ldc.i4 19160
-	add
-	stloc.2
-// 0x01072c8c: 0x1072c8c: jal   0x1001ac4 addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 6
-// --- basic block ---
-L_1072c94:
-// 0x01072c94: 0x1072c94: beq   s7, zero, 0x1072ca8 addu  a0, s1, zero
-	ldloc 16
-	ldloc 10
-	stloc.1
-	brfalse L_1072ca8
-// --- basic block ---
-// 0x01072c9c: 0x1072c9c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072ca0: 0x1072ca0: jal   0x1001ac4 addiu a1, a1, 32680
-	ldloc.2
-	ldc.i4 32680
-	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 6
-// --- basic block ---
-L_1072ca8:
-// 0x01072ca8: 0x1072ca8: lw    ra, 188(sp)
-// 0x01072cac: 0x1072cac: lw    s8, 184(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 46
-	add
-	ldelem.i4
-	stloc 12
-// 0x01072cb0: 0x1072cb0: lw    s7, 180(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 45
-	add
-	ldelem.i4
-	stloc 16
-// 0x01072cb4: 0x1072cb4: lw    s6, 176(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 44
-	add
-	ldelem.i4
-	stloc 8
-// 0x01072cb8: 0x1072cb8: lw    s5, 172(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 43
-	add
-	ldelem.i4
-	stloc 14
-// 0x01072cbc: 0x1072cbc: lw    s4, 168(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 42
-	add
-	ldelem.i4
-	stloc 13
-// 0x01072cc0: 0x1072cc0: lw    s3, 164(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 41
-	add
-	ldelem.i4
-	stloc 15
-// 0x01072cc4: 0x1072cc4: lw    s2, 160(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 40
-	add
-	ldelem.i4
-	stloc 11
-// 0x01072cc8: 0x1072cc8: lw    s1, 156(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 39
-	add
-	ldelem.i4
-	stloc 10
-// 0x01072ccc: 0x1072ccc: lw    s0, 152(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 38
-	add
-	ldelem.i4
-	stloc 7
-// 0x01072cd0: 0x1072cd0: jr    ra addiu sp, sp, 192
-	ldloc.0
-	ldc.i4 192
+// 0x01072ca4: 0x1072ca4: jr    ra addiu sp, sp, 96
+	ldloc.0
+	ldc.i4.s 96
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 11
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 10
 	ret
 }
-.method public static int32 wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_ReportOneSegment_Encode_1072cac(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s4,int32 s0,int32 s2,int32 s3,int32 s8,int32 s5,int32 s6,int32 s7,int32 ra)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s3,int32 s2,int32 s4,int32 s5,int32 ra,int32 lo)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -535,17 +304,15 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register s0
+// local  9 is register s0
 // local  8 is register s1
 // local 11 is register s2
-// local 12 is register s3
-// local  9 is register s4
-// local 14 is register s5
-// local 15 is register s6
-// local 16 is register s7
+// local 10 is register s3
+// local 12 is register s4
+// local 13 is register s5
 // local  0 is register sp
-// local 13 is register s8
-// local 17 is register ra
+// local 14 is register ra
+// local 15 is register lo
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -561,245 +328,236 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 11
 	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 14
+	stloc 10
 	ldc.i4.s 0
-	stloc 15
+	stloc 12
 	ldc.i4.s 0
-	stloc 16
+	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
+	stloc 14
 	ldc.i4.s 0
-	stloc 17
+	stloc 15
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01072cd8: 0x1072cd8: addiu sp, sp, -2416
+// 0x01072cac: 0x1072cac: addiu sp, sp, -1840
 	ldloc.0
-	ldc.i4 -2416
+	ldc.i4 -1840
 	add
 	stloc.0
-// 0x01072cdc: 0x1072cdc: sw    s7, 2404(sp)
+// 0x01072cb0: 0x1072cb0: sw    s0, 1812(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 601
+	ldc.i4 453
 	add
-	ldloc 16
+	ldloc 9
 	stelem.i4
-// 0x01072ce0: 0x1072ce0: sw    s6, 2400(sp)
+// 0x01072cb4: 0x1072cb4: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x01072cb8: 0x1072cb8: addu  s0, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01072cbc: 0x1072cbc: addu  a0, a1, zero
+	ldloc.2
+	stloc.1
+// 0x01072cc0: 0x1072cc0: sw    s2, 1820(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 600
+	ldc.i4 455
 	add
-	ldloc 15
+	ldloc 11
 	stelem.i4
-// 0x01072ce4: 0x1072ce4: sw    s5, 2396(sp)
+// 0x01072cc4: 0x1072cc4: sw    ra, 1836(sp)
+// 0x01072cc8: 0x1072cc8: sw    s5, 1832(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 599
+	ldc.i4 458
 	add
-	ldloc 14
+	ldloc 13
 	stelem.i4
-// 0x01072ce8: 0x1072ce8: sw    s2, 2384(sp)
+// 0x01072ccc: 0x1072ccc: sw    s4, 1828(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 596
+	ldc.i4 457
 	add
-	ldloc 11
+	ldloc 12
 	stelem.i4
-// 0x01072cec: 0x1072cec: sw    s1, 2380(sp)
+// 0x01072cd0: 0x1072cd0: sw    s3, 1824(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 595
+	ldc.i4 456
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-// 0x01072cf0: 0x1072cf0: sw    ra, 2412(sp)
-// 0x01072cf4: 0x1072cf4: sw    s8, 2408(sp)
+// 0x01072cd4: 0x1072cd4: sw    s1, 1816(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 602
+	ldc.i4 454
 	add
-	ldloc 13
+	ldloc 8
 	stelem.i4
-// 0x01072cf8: 0x1072cf8: sw    s4, 2392(sp)
+// 0x01072cd8: 0x1072cd8: addu  s2, a1, zero
+	ldloc.2
+	stloc 11
+// 0x01072cdc: 0x1072cdc: jal   0x10b5dfc sw    v0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 598
+	ldc.i4.s 18
 	add
-	ldloc 9
+	ldloc 5
 	stelem.i4
-// 0x01072cfc: 0x1072cfc: sw    s3, 2388(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl135::editor_line_committed_10b5dfc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01072ce4: 0x1072ce4: bne   v0, zero, 0x1072d20 addiu v0, sp, 48
+	ldloc 5
+	ldloc.0
+	ldc.i4.s 48
+	add
+	stloc 5
+	brtrue L_1072d20
+// --- basic block ---
+// 0x01072cec: 0x1072cec: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 597
+	ldc.i4.4
 	add
-	ldloc 12
+	ldloc 5
 	stelem.i4
-// 0x01072d00: 0x1072d00: sw    s0, 2376(sp)
+// 0x01072cf0: 0x1072cf0: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x01072cf4: 0x1072cf4: addiu v0, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
+	stloc 5
+// 0x01072cf8: 0x1072cf8: addiu a1, sp, 80
+	ldloc.0
+	ldc.i4.s 80
+	add
+	stloc.2
+// 0x01072cfc: 0x1072cfc: addiu a2, sp, 88
+	ldloc.0
+	ldc.i4.s 88
+	add
+	stloc.3
+// 0x01072d00: 0x1072d00: addiu a3, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 4
+// 0x01072d04: 0x1072d04: jal   0x10b6378 sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 594
+	ldc.i4.5
 	add
-	ldloc 10
+	ldloc 5
 	stelem.i4
-// 0x01072d04: 0x1072d04: addu  s2, a3, zero
-	ldloc 4
-	stloc 11
-// 0x01072d08: 0x1072d08: addu  s7, a0, zero
+	ldloc.0
 	ldloc.1
-	stloc 16
-// 0x01072d0c: 0x1072d0c: addu  s6, a1, zero
 	ldloc.2
-	stloc 15
-// 0x01072d10: 0x1072d10: lw    s1, 2432(sp)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl135::editor_line_get_10b6378(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01072d0c: 0x1072d0c: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 608
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 8
-// 0x01072d14: 0x1072d14: beq   a3, zero, 0x1072e78 addu  s5, a2, zero
-	ldloc 4
-	ldloc.3
-	stloc 14
-	brfalse L_1072e78
-// --- basic block ---
-// 0x01072d1c: 0x1072d1c: beq   a0, zero, 0x1072e7c addu  v0, zero, zero
-	ldloc.1
-	ldc.i4.s 0
 	stloc 5
-	brfalse L_1072e7c
-// --- basic block ---
-// 0x01072d24: 0x1072d24: beq   a1, zero, 0x1072e7c sll   zero, zero, 0
-	ldloc.2
-	brfalse L_1072e7c
-// --- basic block ---
-// 0x01072d2c: 0x1072d2c: beq   a2, zero, 0x1072e7c sll   zero, zero, 0
-	ldloc.3
-	brfalse L_1072e7c
-// --- basic block ---
-// 0x01072d34: 0x1072d34: beq   s1, zero, 0x1072e7c sll   zero, zero, 0
-	ldloc 8
-	brfalse L_1072e7c
-// --- basic block ---
-// 0x01072d3c: 0x1072d3c: lb    v0, 0(s1)
-	ldloc 8
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+// 0x01072d10: 0x1072d10: sll   zero, zero, 0
+// 0x01072d14: 0x1072d14: andi  v0, v0, 4
+	ldloc 5
+	ldc.i4.4
+	and
 	stloc 5
-// 0x01072d40: 0x1072d40: sll   zero, zero, 0
-// 0x01072d44: 0x1072d44: beq   v0, zero, 0x1072e7c addu  v0, zero, zero
+// 0x01072d18: 0x1072d18: bne   v0, zero, 0x1072d28 addiu v0, sp, 52
 	ldloc 5
-	ldc.i4.s 0
+	ldloc.0
+	ldc.i4.s 52
+	add
 	stloc 5
-	brfalse L_1072e7c
+	brtrue L_1072d28
+// --- basic block ---
+L_1072d20:
+// 0x01072d20: 0x1072d20: j	 0x1072f84 sb    zero, 0(s0)
+	ldloc 9
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	br L_1072f84
 // --- basic block ---
-// 0x01072d4c: 0x1072d4c: addiu s0, sp, 120
+L_1072d28:
+// 0x01072d28: 0x1072d28: lw    a0, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 120
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc 10
-// 0x01072d50: 0x1072d50: jal   0x10674e4 addu  a0, s0, zero
-	ldloc 10
+	ldelem.i4
 	stloc.1
+// 0x01072d2c: 0x1072d2c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01072d30: 0x1072d30: addiu a2, sp, 40
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01072d58: 0x1072d58: jal   0x1001b48 addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01072d60: 0x1072d60: addiu s4, v0, 339
-	ldloc 5
-	ldc.i4 339
+	ldc.i4.s 40
 	add
-	stloc 9
-// 0x01072d64: 0x1072d64: addu  a0, s0, zero
-	ldloc 10
-	stloc.1
-// 0x01072d68: 0x1072d68: jal   0x106755c addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01072d70: 0x1072d70: addu  s3, v0, zero
-	ldloc 5
-	stloc 12
-// 0x01072d74: 0x1072d74: addiu v0, sp, 2436
+	stloc.3
+// 0x01072d34: 0x1072d34: addiu a3, sp, 44
 	ldloc.0
-	ldc.i4 2436
+	ldc.i4.s 44
 	add
-	stloc 5
-// 0x01072d78: 0x1072d78: addu  a3, v0, zero
-	ldloc 5
 	stloc 4
-// 0x01072d7c: 0x1072d7c: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x01072d80: 0x1072d80: addu  a1, s4, zero
-	ldloc 9
-	stloc.2
-// 0x01072d84: 0x1072d84: addu  a2, s1, zero
-	ldloc 8
-	stloc.3
-// 0x01072d88: 0x1072d88: jal   0x10c0a70 sw    v0, 32(sp)
+// 0x01072d38: 0x1072d38: jal   0x10b4f40 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
 	ldloc 5
 	stelem.i4
@@ -808,503 +566,365 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_trkseg_get_10b4f40(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01072d90: 0x1072d90: bgez  v0, 0x1072dc0 lui   a2, 0x20000
-	ldloc 5
-	ldc.i4 131072
-	stloc.3
-	ldc.i4.s 0
-	bge L_1072dc0
-// --- basic block ---
-// 0x01072d98: 0x1072d98: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072d9c: 0x1072d9c: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01072da0: 0x1072da0: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01072da4: 0x1072da4: addiu a3, a3, 32696
-	ldloc 4
-	ldc.i4 32696
-	add
-	stloc 4
-// 0x01072da8: 0x1072da8: addiu a2, zero, 529
-	ldc.i4 529
-	stloc.3
-// 0x01072dac: 0x1072dac: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01072db0: 0x1072db0: jal   0x100449c sw    s1, 16(sp)
+// 0x01072d40: 0x1072d40: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 10
 	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldelem.i4
 	stloc 5
+// 0x01072d44: 0x1072d44: sll   zero, zero, 0
+// 0x01072d48: 0x1072d48: bltz  v0, 0x1072d60 addu  s1, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	blt L_1072d60
 // --- basic block ---
-// 0x01072db8: 0x1072db8: j	 0x1072e20 sll   zero, zero, 0
-	br L_1072e20
-// --- basic block ---
-L_1072dc0:
-// 0x01072dc0: 0x1072dc0: lw    a3, 260(s2)
+// 0x01072d50: 0x1072d50: lw    s1, 44(sp)
 	ldloc 6
-	ldloc 11
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 65
+	ldc.i4.s 11
 	add
 	ldelem.i4
-	stloc 4
-// 0x01072dc4: 0x1072dc4: addiu s1, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
 	stloc 8
-// 0x01072dc8: 0x1072dc8: addiu a2, a2, -32752
-	ldloc.3
-	ldc.i4 -32752
-	add
-	stloc.3
-// 0x01072dcc: 0x1072dcc: addiu a1, zero, 83
-	ldc.i4.s 83
-	stloc.2
-// 0x01072dd0: 0x1072dd0: addiu v0, s2, 192
-	ldloc 11
-	ldc.i4 192
+// 0x01072d54: 0x1072d54: sll   zero, zero, 0
+// 0x01072d58: 0x1072d58: addiu s1, s1, 1
+	ldloc 8
+	ldc.i4.1
 	add
-	stloc 5
-// 0x01072dd4: 0x1072dd4: addu  a0, s1, zero
+	stloc 8
+// 0x01072d5c: 0x1072d5c: subu  s1, s1, v0
 	ldloc 8
-	stloc.1
-// 0x01072dd8: 0x1072dd8: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 5
+	sub
+	stloc 8
+L_1072d60:
+// 0x01072d60: 0x1072d60: lw    a0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x01072d64: 0x1072d64: addiu a1, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc.2
+// 0x01072d68: 0x1072d68: jal   0x10b4ff0 addiu a2, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01072de0: 0x1072de0: jal   0x1001b48 addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01072de8: 0x1072de8: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x01072dec: 0x1072dec: jal   0x1001b48 addu  s8, v0, zero
-	ldloc 5
-	stloc 13
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl134::editor_trkseg_get_time_10b4ff0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01072df4: 0x1072df4: addu  s8, v0, s8
-	ldloc 5
-	ldloc 13
-	add
-	stloc 13
-// 0x01072df8: 0x1072df8: slt   s4, s8, s4
-	ldloc 13
-	ldloc 9
-	clt
-	stloc 9
-// 0x01072dfc: 0x1072dfc: bne   s4, zero, 0x1072e30 addu  a0, s1, zero
-	ldloc 9
-	ldloc 8
-	stloc.1
-	brtrue L_1072e30
-// --- basic block ---
-// 0x01072e04: 0x1072e04: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072e08: 0x1072e08: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01072e0c: 0x1072e0c: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
+// 0x01072d70: 0x1072d70: addiu a1, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
 	stloc.2
-// 0x01072e10: 0x1072e10: addiu a3, a3, -32740
-	ldloc 4
-	ldc.i4 -32740
+// 0x01072d74: 0x1072d74: addiu a2, sp, 60
+	ldloc.0
+	ldc.i4.s 60
 	add
-	stloc 4
-// 0x01072e14: 0x1072e14: addiu a2, zero, 541
-	ldc.i4 541
 	stloc.3
-// 0x01072e18: 0x1072e18: jal   0x100449c addiu a0, zero, 4
-	ldc.i4.4
+// 0x01072d78: 0x1072d78: jal   0x10b5f6c addu  a0, s2, zero
+	ldloc 11
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_points_10b5f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1072e20:
-// 0x01072e20: 0x1072e20: jal   0x1067508 addu  a0, s0, zero
-	ldloc 10
+// 0x01072d80: 0x1072d80: lw    a0, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
 	stloc.1
+// 0x01072d84: 0x1072d84: jal   0x10b4cb8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_db_id_10b4cb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01072e28: 0x1072e28: j	 0x1072e7c addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1072e7c
-// --- basic block ---
-L_1072e30:
-// 0x01072e30: 0x1072e30: jal   0x1068098 addu  a1, s3, zero
-	ldloc 12
-	stloc.2
+// 0x01072d8c: 0x1072d8c: lw    a0, 60(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
+	add
+	ldelem.i4
+	stloc.1
+// 0x01072d90: 0x1072d90: jal   0x10b4cb8 addu  s3, v0, zero
+	ldloc 5
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::AppendPrefix_ShiftOriginalRight_1068098(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_point_db_id_10b4cb8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01072e38: 0x1072e38: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x01072e3c: 0x1072e3c: lw    a0, -18464(v1)
+// 0x01072d98: 0x1072d98: lw    a1, 80(sp)
 	ldloc 6
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4.s 20
 	add
 	ldelem.i4
-	stloc.1
-// 0x01072e40: 0x1072e40: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01072e44: 0x1072e44: addiu a1, a1, -32620
-	ldloc.2
-	ldc.i4 -32620
-	add
 	stloc.2
-// 0x01072e48: 0x1072e48: addu  a2, s7, zero
-	ldloc 16
-	stloc.3
-// 0x01072e4c: 0x1072e4c: addu  a3, s6, zero
-	ldloc 15
-	stloc 4
-// 0x01072e50: 0x1072e50: sw    s5, 16(sp)
+// 0x01072d9c: 0x1072d9c: lw    a2, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 21
 	add
-	ldloc 14
-	stelem.i4
-// 0x01072e54: 0x1072e54: sw    s2, 20(sp)
+	ldelem.i4
+	stloc.3
+// 0x01072da0: 0x1072da0: lw    a3, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 16
 	add
-	ldloc 11
-	stelem.i4
-// 0x01072e58: 0x1072e58: jal   0x1069ec8 sw    v0, 24(sp)
+	ldelem.i4
+	stloc 4
+// 0x01072da4: 0x1072da4: addiu a0, sp, 144
+	ldloc.0
+	ldc.i4 144
+	add
+	stloc.1
+// 0x01072da8: 0x1072da8: sw    v0, 1800(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 450
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01072e60: 0x1072e60: addu  a0, s0, zero
-	ldloc 10
-	stloc.1
-// 0x01072e64: 0x1072e64: jal   0x1067508 sw    v0, 2368(sp)
+// 0x01072dac: 0x1072dac: jal   0x1072c2c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 592
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::format_DB_point_string_1072c2c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01072e6c: 0x1072e6c: lw    v0, 2368(sp)
+// 0x01072db4: 0x1072db4: lw    v0, 1800(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 592
+	ldc.i4 450
 	add
 	ldelem.i4
 	stloc 5
-// 0x01072e70: 0x1072e70: j	 0x1072e7c sll   zero, zero, 0
-	br L_1072e7c
-// --- basic block ---
-L_1072e78:
-// 0x01072e78: 0x1072e78: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_1072e7c:
-// 0x01072e7c: 0x1072e7c: lw    ra, 2412(sp)
-// 0x01072e80: 0x1072e80: lw    s8, 2408(sp)
+// 0x01072db8: 0x1072db8: lw    a1, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 602
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc 13
-// 0x01072e84: 0x1072e84: lw    s7, 2404(sp)
+	stloc.2
+// 0x01072dbc: 0x1072dbc: lw    a2, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 601
+	ldc.i4.s 23
 	add
 	ldelem.i4
-	stloc 16
-// 0x01072e88: 0x1072e88: lw    s6, 2400(sp)
+	stloc.3
+// 0x01072dc0: 0x1072dc0: lw    a3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 600
+	ldc.i4.s 17
 	add
 	ldelem.i4
-	stloc 15
-// 0x01072e8c: 0x1072e8c: lw    s5, 2396(sp)
-	ldloc 6
+	stloc 4
+// 0x01072dc4: 0x1072dc4: addiu a0, sp, 196
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 599
+	ldc.i4 196
 	add
-	ldelem.i4
-	stloc 14
-// 0x01072e90: 0x1072e90: lw    s4, 2392(sp)
+	stloc.1
+// 0x01072dc8: 0x1072dc8: jal   0x1072c2c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 598
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 9
-// 0x01072e94: 0x1072e94: lw    s3, 2388(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 597
-	add
-	ldelem.i4
-	stloc 12
-// 0x01072e98: 0x1072e98: lw    s2, 2384(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 596
-	add
-	ldelem.i4
-	stloc 11
-// 0x01072e9c: 0x1072e9c: lw    s1, 2380(sp)
-	ldloc 6
+	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 595
-	add
-	ldelem.i4
-	stloc 8
-// 0x01072ea0: 0x1072ea0: lw    s0, 2376(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::format_DB_point_string_1072c2c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01072dd0: 0x1072dd0: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 594
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 10
-// 0x01072ea4: 0x1072ea4: jr    ra addiu sp, sp, 2416
-	ldloc.0
-	ldc.i4 2416
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+// 0x01072dd4: 0x1072dd4: sll   zero, zero, 0
+// 0x01072dd8: 0x1072dd8: andi  v0, v0, 1
 	ldloc 5
-	ret
-}
-.method public static int32 RTNet_SelectRoute_1072eac(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+	ldc.i4.1
+	and
 	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+// 0x01072ddc: 0x1072ddc: bne   v0, zero, 0x1072dec lui   a2, 0x20000
+	ldloc 5
+	ldc.i4 131072
+	stloc.3
+	brtrue L_1072dec
+// --- basic block ---
+// 0x01072de4: 0x1072de4: j	 0x1072df4 addiu a2, a2, -32604
+	ldloc.3
+	ldc.i4 -32604
+	add
+	stloc.3
+	br L_1072df4
 // --- basic block ---
-// 0x01072eac: 0x1072eac: addiu sp, sp, -40
+L_1072dec:
+// 0x01072dec: 0x1072dec: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x01072df0: 0x1072df0: addiu a2, a2, -32596
+	ldloc.3
+	ldc.i4 -32596
+	add
+	stloc.3
+L_1072df4:
+// 0x01072df4: 0x1072df4: addiu v0, zero, 3
+	ldc.i4.3
+	stloc 5
+// 0x01072df8: 0x1072df8: mult  s1, v0
+	ldloc 8
+	ldloc 5
+	mul
+	stloc 15
+// 0x01072dfc: 0x1072dfc: addiu v0, sp, 144
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4 144
 	add
-	stloc.0
-// 0x01072eb0: 0x1072eb0: addu  v0, a0, zero
-	ldloc.1
 	stloc 5
-// 0x01072eb4: 0x1072eb4: sw    a2, 24(sp)
+// 0x01072e00: 0x1072e00: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01072e04: 0x1072e04: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01072e08: 0x1072e08: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc.3
-	stelem.i4
-// 0x01072eb8: 0x1072eb8: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01072ebc: 0x1072ebc: addu  a2, a3, zero
-	ldloc 4
-	stloc.3
-// 0x01072ec0: 0x1072ec0: addu  a3, v0, zero
 	ldloc 5
-	stloc 4
-// 0x01072ec4: 0x1072ec4: lui   v0, 0x20000
-	ldc.i4 131072
+	stelem.i4
+// 0x01072e0c: 0x1072e0c: addiu v0, sp, 196
+	ldloc.0
+	ldc.i4 196
+	add
 	stloc 5
-// 0x01072ec8: 0x1072ec8: sw    a1, 20(sp)
+// 0x01072e10: 0x1072e10: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc.2
-	stelem.i4
-// 0x01072ecc: 0x1072ecc: addiu v0, v0, -32612
 	ldloc 5
-	ldc.i4 -32612
+	stelem.i4
+// 0x01072e14: 0x1072e14: addiu a1, a1, -32588
+	ldloc.2
+	ldc.i4 -32588
 	add
-	stloc 5
-// 0x01072ed0: 0x1072ed0: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	stloc.2
+// 0x01072e18: 0x1072e18: addiu a3, a3, -32556
+	ldloc 4
+	ldc.i4 -32556
 	add
+	stloc 4
+// 0x01072e1c: 0x1072e1c: addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x01072ed4: 0x1072ed4: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01072ed8: 0x1072ed8: sw    ra, 36(sp)
-// 0x01072edc: 0x1072edc: jal   0x1072cd8 sw    v0, 16(sp)
+// 0x01072e20: 0x1072e20: mflo  lo
+	ldloc 15
+	stloc 5
+// 0x01072e24: 0x1072e24: jal   0x1000f64 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldloc 5
 	stelem.i4
@@ -1313,1979 +933,1583 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01072ee4: 0x1072ee4: lw    ra, 36(sp)
-// 0x01072ee8: 0x1072ee8: sll   zero, zero, 0
-// 0x01072eec: 0x1072eec: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01072e2c: 0x1072e2c: beq   s1, zero, 0x1072eac sll   zero, zero, 0
 	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_RequestRoute_1072ef4(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t5,int32 s0,int32 s6,int32 s7,int32 s8,int32 t0,int32 s3,int32 s4,int32 s5,int32 s1,int32 s2,int32 lo,int32 ra,int32 t1,int32 t2,int32 t3,int32 t4)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 13 is register t0
-// local 21 is register t1
-// local 22 is register t2
-// local 23 is register t3
-// local 24 is register t4
-// local  8 is register t5
-// local  9 is register s0
-// local 17 is register s1
-// local 18 is register s2
-// local 14 is register s3
-// local 15 is register s4
-// local 16 is register s5
-// local 10 is register s6
-// local 11 is register s7
-// local  0 is register sp
-// local 12 is register s8
-// local 20 is register ra
-// local 19 is register lo
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 21
-	ldc.i4.s 0
-	stloc 22
-	ldc.i4.s 0
-	stloc 23
-	ldc.i4.s 0
-	stloc 24
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 17
-	ldc.i4.s 0
-	stloc 18
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 20
-	ldc.i4.s 0
-	stloc 19
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
+	brfalse L_1072eac
 // --- basic block ---
-// 0x01072ef4: 0x1072ef4: addiu sp, sp, -168
-	ldloc.0
-	ldc.i4 -168
-	add
-	stloc.0
-// 0x01072ef8: 0x1072ef8: sw    s0, 128(sp)
-	ldloc 5
+// 0x01072e34: 0x1072e34: lw    v0, 80(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4.s 20
 	add
-	ldloc 9
-	stelem.i4
-// 0x01072efc: 0x1072efc: sw    a0, 168(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 5
+// 0x01072e38: 0x1072e38: lw    s1, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.s 10
 	add
-	ldloc.1
-	stelem.i4
-// 0x01072f00: 0x1072f00: sw    a1, 172(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 8
+// 0x01072e3c: 0x1072e3c: sw    v0, 96(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 43
+	ldc.i4.s 24
 	add
-	ldloc.2
-	stelem.i4
-// 0x01072f04: 0x1072f04: lw    v0, 200(sp)
 	ldloc 5
+	stelem.i4
+// 0x01072e40: 0x1072e40: lw    v0, 84(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 50
-	add
-	ldelem.i4
-	stloc 6
-// 0x01072f08: 0x1072f08: lw    v1, 204(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 51
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 7
-// 0x01072f0c: 0x1072f0c: lw    a0, 224(sp)
-	ldloc 5
+	stloc 5
+// 0x01072e44: 0x1072e44: addiu s5, sp, 96
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 56
+	ldc.i4.s 96
 	add
-	ldelem.i4
-	stloc.1
-// 0x01072f10: 0x1072f10: lw    a1, 228(sp)
-	ldloc 5
+	stloc 13
+// 0x01072e48: 0x1072e48: sw    v0, 100(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 57
+	ldc.i4.s 25
 	add
-	ldelem.i4
-	stloc.2
-// 0x01072f14: 0x1072f14: lw    s0, 216(sp)
 	ldloc 5
+	stelem.i4
+// 0x01072e4c: 0x1072e4c: lw    v0, 64(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 54
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc 9
-// 0x01072f18: 0x1072f18: sw    s6, 152(sp)
-	ldloc 5
+	stloc 5
+// 0x01072e50: 0x1072e50: addiu s4, sp, 76
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 38
+	ldc.i4.s 76
 	add
-	ldloc 10
-	stelem.i4
-// 0x01072f1c: 0x1072f1c: sw    s5, 148(sp)
-	ldloc 5
+	stloc 12
+// 0x01072e54: 0x1072e54: sw    v0, 76(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 37
+	ldc.i4.s 19
 	add
-	ldloc 16
-	stelem.i4
-// 0x01072f20: 0x1072f20: sw    s4, 144(sp)
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 36
-	add
-	ldloc 15
 	stelem.i4
-// 0x01072f24: 0x1072f24: sw    s3, 140(sp)
-	ldloc 5
+// 0x01072e58: 0x1072e58: j	 0x1072e98 addiu s3, sp, 104
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 35
+	ldc.i4.s 104
 	add
-	ldloc 14
-	stelem.i4
-// 0x01072f28: 0x1072f28: sw    ra, 164(sp)
-// 0x01072f2c: 0x1072f2c: sw    s8, 160(sp)
-	ldloc 5
+	stloc 10
+	br L_1072e98
+// --- basic block ---
+L_1072e60:
+// 0x01072e60: 0x1072e60: jal   0x10b4c0c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 40
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl134::editor_shape_position_10b4c0c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01072e68: 0x1072e68: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x01072e6c: 0x1072e6c: jal   0x10b4b90 addu  a1, s4, zero
 	ldloc 12
-	stelem.i4
-// 0x01072f30: 0x1072f30: sw    s7, 156(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 39
-	add
-	ldloc 11
-	stelem.i4
-// 0x01072f34: 0x1072f34: sw    s2, 136(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 34
-	add
-	ldloc 18
-	stelem.i4
-// 0x01072f38: 0x1072f38: sw    s1, 132(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 33
-	add
-	ldloc 17
-	stelem.i4
-// 0x01072f3c: 0x1072f3c: sw    a2, 176(sp)
-	ldloc 5
+	stloc.2
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 44
-	add
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	stelem.i4
-// 0x01072f40: 0x1072f40: sw    a3, 180(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 45
-	add
 	ldloc 4
-	stelem.i4
-// 0x01072f44: 0x1072f44: lw    s6, 240(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 60
-	add
-	ldelem.i4
-	stloc 10
-// 0x01072f48: 0x1072f48: lw    s5, 244(sp)
-	ldloc 5
+	call int32 Cibyl134::editor_shape_time_10b4b90(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01072e74: 0x1072e74: lw    a1, 96(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 61
+	ldc.i4.s 24
 	add
 	ldelem.i4
-	stloc 16
-// 0x01072f4c: 0x1072f4c: lw    s4, 248(sp)
-	ldloc 5
+	stloc.2
+// 0x01072e78: 0x1072e78: lw    a2, 100(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 62
+	ldc.i4.s 25
 	add
 	ldelem.i4
-	stloc 15
-// 0x01072f50: 0x1072f50: lw    s3, 252(sp)
-	ldloc 5
+	stloc.3
+// 0x01072e7c: 0x1072e7c: lw    a3, 76(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 63
+	ldc.i4.s 19
 	add
 	ldelem.i4
-	stloc 14
-// 0x01072f54: 0x1072f54: sw    v0, 116(sp)
-	ldloc 5
+	stloc 4
+// 0x01072e80: 0x1072e80: jal   0x1072bb0 addu  a0, s3, zero
+	ldloc 10
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 29
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::format_point_string_1072bb0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01072e88: 0x1072e88: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x01072e8c: 0x1072e8c: addu  a1, s3, zero
+	ldloc 10
+	stloc.2
+// 0x01072e90: 0x1072e90: jal   0x1001ac4 addiu s1, s1, 1
+	ldloc 8
+	ldc.i4.1
 	add
+	stloc 8
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 5
+// --- basic block ---
+L_1072e98:
+// 0x01072e98: 0x1072e98: lw    v0, 44(sp)
 	ldloc 6
-	stelem.i4
-// 0x01072f58: 0x1072f58: sw    v1, 112(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4.s 11
 	add
-	ldloc 7
-	stelem.i4
-// 0x01072f5c: 0x1072f5c: sw    a0, 108(sp)
+	ldelem.i4
+	stloc 5
+// 0x01072e9c: 0x1072e9c: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x01072ea0: 0x1072ea0: slt   v0, v0, s1
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
-	add
-	ldloc.1
-	stelem.i4
-// 0x01072f60: 0x1072f60: beq   s0, zero, 0x1072fe8 sw    a1, 104(sp)
-	ldloc 9
+	ldloc 8
+	clt
+	stloc 5
+// 0x01072ea4: 0x1072ea4: beq   v0, zero, 0x1072e60 addu  a1, s5, zero
 	ldloc 5
+	ldloc 13
+	stloc.2
+	brfalse L_1072e60
+// --- basic block ---
+L_1072eac:
+// 0x01072eac: 0x1072eac: lw    v0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 26
+	ldc.i4.s 9
 	add
-	ldloc.2
-	stelem.i4
-	brfalse L_1072fe8
-// --- basic block ---
-// 0x01072f68: 0x1072f68: lb    v0, 0(s0)
-	ldloc 9
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01072f6c: 0x1072f6c: sll   zero, zero, 0
-// 0x01072f70: 0x1072f70: beq   v0, zero, 0x1072fec lui   s8, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc 12
-	brfalse L_1072fec
-// --- basic block ---
-// 0x01072f78: 0x1072f78: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01072f80: 0x1072f80: sll   v0, v0, 1
-	ldloc 6
-	ldc.i4.1
-	shl
-	stloc 6
-// 0x01072f84: 0x1072f84: addiu a2, v0, 1
-	ldloc 6
+	ldelem.i4
+	stloc 5
+// 0x01072eb0: 0x1072eb0: sll   zero, zero, 0
+// 0x01072eb4: 0x1072eb4: andi  v0, v0, 1
+	ldloc 5
 	ldc.i4.1
-	add
-	stloc.3
-// 0x01072f88: 0x1072f88: addu  a0, a2, zero
-	ldloc.3
-	stloc.1
-// 0x01072f8c: 0x1072f8c: jal   0x1000910 sw    a2, 120(sp)
+	and
+	stloc 5
+// 0x01072eb8: 0x1072eb8: bne   v0, zero, 0x1072f68 addu  a0, s2, zero
 	ldloc 5
+	ldloc 11
+	stloc.1
+	brtrue L_1072f68
+// --- basic block ---
+// 0x01072ec0: 0x1072ec0: jal   0x10b5f10 addiu a1, sp, 72
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
+	ldc.i4.s 72
 	add
-	ldloc.3
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	call int32 Cibyl135::editor_line_get_street_10b5f10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01072f94: 0x1072f94: lw    a2, 120(sp)
-	ldloc 5
+// 0x01072ec8: 0x1072ec8: lw    a0, 72(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.s 18
 	add
 	ldelem.i4
-	stloc.3
-// 0x01072f98: 0x1072f98: addu  a0, s0, zero
-	ldloc 9
 	stloc.1
-// 0x01072f9c: 0x1072f9c: addu  a1, v0, zero
-	ldloc 6
-	stloc.2
-// 0x01072fa0: 0x1072fa0: jal   0x1067b64 addu  s2, v0, zero
-	ldloc 6
-	stloc 18
+// 0x01072ecc: 0x1072ecc: sll   zero, zero, 0
+// 0x01072ed0: 0x1072ed0: bltz  a0, 0x1072f68 sll   zero, zero, 0
+	ldloc.1
+	ldc.i4.s 0
+	blt L_1072f68
+// --- basic block ---
+// 0x01072ed8: 0x1072ed8: jal   0x10b5244 addiu s3, sp, 248
+	ldloc.0
+	ldc.i4 248
+	add
+	stloc 10
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_name_10b5244(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01072fa8: 0x1072fa8: bne   v0, zero, 0x1072ff4 addu  s8, s2, zero
-	ldloc 6
-	ldloc 18
-	stloc 12
-	brtrue L_1072ff4
+	stloc 5
 // --- basic block ---
-// 0x01072fb0: 0x1072fb0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01072fb4: 0x1072fb4: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01072fb8: 0x1072fb8: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
+// 0x01072ee0: 0x1072ee0: addu  a1, s3, zero
+	ldloc 10
 	stloc.2
-// 0x01072fbc: 0x1072fbc: addiu a3, a3, -32592
-	ldloc 4
-	ldc.i4 -32592
-	add
-	stloc 4
-// 0x01072fc0: 0x1072fc0: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01072fc4: 0x1072fc4: jal   0x100449c addiu a2, zero, 2205
-	ldc.i4 2205
+// 0x01072ee4: 0x1072ee4: addiu a2, zero, 512
+	ldc.i4 512
 	stloc.3
-	ldloc.0
+// 0x01072ee8: 0x1072ee8: jal   0x1067b74 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01072fcc: 0x1072fcc: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01072fd0: 0x1072fd0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01072fd4: 0x1072fd4: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
+// 0x01072ef0: 0x1072ef0: lw    a0, 72(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
 	add
+	ldelem.i4
 	stloc.1
-// 0x01072fd8: 0x1072fd8: jal   0x104c148 addiu a1, a1, -32536
-	ldloc.2
-	ldc.i4 -32536
+// 0x01072ef4: 0x1072ef4: jal   0x10b50dc addiu s2, sp, 764
+	ldloc.0
+	ldc.i4 764
 	add
-	stloc.2
+	stloc 11
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_t2s_10b50dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01072fe0: 0x1072fe0: j	 0x10733ec addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 17
-	br L_10733ec
-// --- basic block ---
-L_1072fe8:
-// 0x01072fe8: 0x1072fe8: lui   s8, 0x10000
-	ldc.i4 65536
-	stloc 12
-L_1072fec:
-// 0x01072fec: 0x1072fec: addiu s8, s8, 18500
-	ldloc 12
-	ldc.i4 18500
-	add
-	stloc 12
-// 0x01072ff0: 0x1072ff0: addu  s2, zero, zero
-	ldc.i4.s 0
-	stloc 18
-L_1072ff4:
-// 0x01072ff4: 0x1072ff4: beq   s6, zero, 0x107307c lui   s7, 0x10000
-	ldloc 10
-	ldc.i4 65536
-	stloc 11
-	brfalse L_107307c
-// --- basic block ---
-// 0x01072ffc: 0x1072ffc: lb    v0, 0(s6)
-	ldloc 10
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01073000: 0x1073000: sll   zero, zero, 0
-// 0x01073004: 0x1073004: beq   v0, zero, 0x1073080 addiu s7, s7, 18500
-	ldloc 6
-	ldloc 11
-	ldc.i4 18500
-	add
-	stloc 11
-	brfalse L_1073080
+	stloc 5
 // --- basic block ---
-// 0x0107300c: 0x107300c: jal   0x1001b48 addu  a0, s6, zero
-	ldloc 10
+// 0x01072efc: 0x1072efc: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
+// 0x01072f00: 0x1072f00: addu  a1, s2, zero
+	ldloc 11
+	stloc.2
+// 0x01072f04: 0x1072f04: jal   0x1067b74 addiu a2, zero, 512
+	ldc.i4 512
+	stloc.3
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01073014: 0x1073014: sll   v0, v0, 1
-	ldloc 6
-	ldc.i4.1
-	shl
-	stloc 6
-// 0x01073018: 0x1073018: addiu a2, v0, 1
+// 0x01072f0c: 0x1072f0c: lw    a0, 72(sp)
 	ldloc 6
-	ldc.i4.1
-	add
-	stloc.3
-// 0x0107301c: 0x107301c: addu  a0, a2, zero
-	ldloc.3
-	stloc.1
-// 0x01073020: 0x1073020: jal   0x1000910 sw    a2, 120(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.s 18
 	add
-	ldloc.3
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x01072f10: 0x1072f10: jal   0x10b5134 addiu s1, sp, 1280
+	ldloc.0
+	ldc.i4 1280
+	add
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	call int32 Cibyl134::editor_street_get_street_city_10b5134(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01073028: 0x1073028: lw    a2, 120(sp)
+// 0x01072f18: 0x1072f18: addu  a0, v0, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107302c: 0x107302c: addu  a0, s6, zero
-	ldloc 10
 	stloc.1
-// 0x01073030: 0x1073030: addu  a1, v0, zero
-	ldloc 6
+// 0x01072f1c: 0x1072f1c: addu  a1, s1, zero
+	ldloc 8
 	stloc.2
-// 0x01073034: 0x1073034: jal   0x1067b64 addu  s1, v0, zero
-	ldloc 6
-	stloc 17
+// 0x01072f20: 0x1072f20: jal   0x1067b74 addiu a2, zero, 512
+	ldc.i4 512
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01072f28: 0x1072f28: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107303c: 0x107303c: bne   v0, zero, 0x1073084 addu  s7, s1, zero
+// 0x01072f30: 0x1072f30: lw    a0, 48(sp)
 	ldloc 6
-	ldloc 17
-	stloc 11
-	brtrue L_1073084
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc.1
+// 0x01072f34: 0x1072f34: jal   0x1010304 addu  s4, v0, zero
+	ldloc 5
+	stloc 12
+	ldloc.1
+	call int32 Cibyl11::roadmap_layer_cfcc2type_1010304(int32)
+	stloc 5
 // --- basic block ---
-// 0x01073044: 0x1073044: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01073048: 0x1073048: lui   a3, 0x20000
+// 0x01072f3c: 0x1072f3c: lui   a1, 0x20000
 	ldc.i4 131072
-	stloc 4
-// 0x0107304c: 0x107304c: addiu a1, a1, 32252
+	stloc.2
+// 0x01072f40: 0x1072f40: addu  a0, s0, s4
+	ldloc 9
+	ldloc 12
+	add
+	stloc.1
+// 0x01072f44: 0x1072f44: addiu a1, a1, -32548
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 -32548
 	add
 	stloc.2
-// 0x01073050: 0x1073050: addiu a3, a3, -32592
-	ldloc 4
-	ldc.i4 -32592
-	add
+// 0x01072f48: 0x1072f48: addu  a3, v0, zero
+	ldloc 5
 	stloc 4
-// 0x01073054: 0x1073054: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01073058: 0x1073058: jal   0x100449c addiu a2, zero, 2219
-	ldc.i4 2219
+// 0x01072f4c: 0x1072f4c: addiu a2, zero, 8
+	ldc.i4.8
 	stloc.3
+// 0x01072f50: 0x1072f50: sw    s3, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 10
+	stelem.i4
+// 0x01072f54: 0x1072f54: sw    s2, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 11
+	stelem.i4
+// 0x01072f58: 0x1072f58: jal   0x1000f64 sw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01073060: 0x1073060: lui   a0, 0x0
-	ldc.i4.s 0
+// 0x01072f60: 0x1072f60: j	 0x1072f84 sll   zero, zero, 0
+	br L_1072f84
+// --- basic block ---
+L_1072f68:
+// 0x01072f68: 0x1072f68: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x01073064: 0x1073064: lui   a1, 0x20000
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01072f70: 0x1072f70: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01073068: 0x1073068: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
+// 0x01072f74: 0x1072f74: addu  a0, s0, v0
+	ldloc 9
+	ldloc 5
 	add
 	stloc.1
-// 0x0107306c: 0x107306c: jal   0x104c148 addiu a1, a1, -32536
+// 0x01072f78: 0x1072f78: addiu a1, a1, -32484
 	ldloc.2
-	ldc.i4 -32536
+	ldc.i4 -32484
 	add
 	stloc.2
+// 0x01072f7c: 0x1072f7c: jal   0x1000f64 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073074: 0x1073074: j	 0x1073394 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_1073394
-// --- basic block ---
-L_107307c:
-// 0x0107307c: 0x107307c: addiu s7, s7, 18500
-	ldloc 11
-	ldc.i4 18500
-	add
-	stloc 11
-L_1073080:
-// 0x01073080: 0x1073080: addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 17
-L_1073084:
-// 0x01073084: 0x1073084: bne   s5, zero, 0x1073094 sll   zero, zero, 0
-	ldloc 16
-	brtrue L_1073094
-// --- basic block ---
-// 0x0107308c: 0x107308c: lui   s5, 0x10000
-	ldc.i4 65536
-	stloc 16
-// 0x01073090: 0x1073090: addiu s5, s5, 18500
-	ldloc 16
-	ldc.i4 18500
-	add
-	stloc 16
-L_1073094:
-// 0x01073094: 0x1073094: bne   s4, zero, 0x10730a4 sll   zero, zero, 0
-	ldloc 15
-	brtrue L_10730a4
-// --- basic block ---
-// 0x0107309c: 0x107309c: lui   s4, 0x10000
-	ldc.i4 65536
-	stloc 15
-// 0x010730a0: 0x10730a0: addiu s4, s4, 18500
-	ldloc 15
-	ldc.i4 18500
-	add
-	stloc 15
-L_10730a4:
-// 0x010730a4: 0x10730a4: bne   s3, zero, 0x10730b4 sll   zero, zero, 0
-	ldloc 14
-	brtrue L_10730b4
-// --- basic block ---
-// 0x010730ac: 0x10730ac: lui   s3, 0x10000
-	ldc.i4 65536
-	stloc 14
-// 0x010730b0: 0x10730b0: addiu s3, s3, 18500
-	ldloc 14
-	ldc.i4 18500
-	add
-	stloc 14
-L_10730b4:
-// 0x010730b4: 0x10730b4: jal   0x1001b48 addu  a0, s8, zero
-	ldloc 12
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010730bc: 0x10730bc: addu  a0, s7, zero
-	ldloc 11
-	stloc.1
-// 0x010730c0: 0x10730c0: jal   0x1001b48 sw    v0, 120(sp)
-	ldloc 5
+L_1072f84:
+// 0x01072f84: 0x1072f84: lw    ra, 1836(sp)
+// 0x01072f88: 0x1072f88: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x01072f8c: 0x1072f8c: lw    s5, 1832(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4 458
 	add
+	ldelem.i4
+	stloc 13
+// 0x01072f90: 0x1072f90: lw    s4, 1828(sp)
 	ldloc 6
-	stelem.i4
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010730c8: 0x10730c8: addu  a0, s5, zero
-	ldloc 16
-	stloc.1
-// 0x010730cc: 0x10730cc: jal   0x1001b48 sw    v0, 124(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4 457
 	add
+	ldelem.i4
+	stloc 12
+// 0x01072f94: 0x1072f94: lw    s3, 1824(sp)
 	ldloc 6
-	stelem.i4
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010730d4: 0x10730d4: addu  a0, s4, zero
-	ldloc 15
-	stloc.1
-// 0x010730d8: 0x10730d8: jal   0x1001b48 addu  s6, v0, zero
-	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 456
+	add
+	ldelem.i4
 	stloc 10
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010730e0: 0x10730e0: addu  a0, s3, zero
-	ldloc 14
-	stloc.1
-// 0x010730e4: 0x10730e4: jal   0x1001b48 addu  s0, v0, zero
+// 0x01072f98: 0x1072f98: lw    s2, 1820(sp)
 	ldloc 6
-	stloc 9
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010730ec: 0x10730ec: lw    a2, 260(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 65
+	ldc.i4 455
 	add
 	ldelem.i4
-	stloc.3
-// 0x010730f0: 0x10730f0: addiu a0, zero, 13
-	ldc.i4.s 13
-	stloc.1
-// 0x010730f4: 0x10730f4: mult  a2, a0
-	ldloc.3
-	ldloc.1
-	mul
-	stloc 19
-// 0x010730f8: 0x10730f8: lw    a1, 120(sp)
-	ldloc 5
+	stloc 11
+// 0x01072f9c: 0x1072f9c: lw    s1, 1816(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4 454
 	add
 	ldelem.i4
-	stloc.2
-// 0x010730fc: 0x10730fc: lw    v1, 124(sp)
-	ldloc 5
+	stloc 8
+// 0x01072fa0: 0x1072fa0: lw    s0, 1812(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4 453
 	add
 	ldelem.i4
-	stloc 7
-// 0x01073100: 0x1073100: mflo  lo
-	ldloc 19
-	stloc.1
-// 0x01073104: 0x1073104: addiu a0, a0, 238
-	ldloc.1
-	ldc.i4 238
-	add
-	stloc.1
-// 0x01073108: 0x1073108: addu  a1, a0, a1
-	ldloc.1
-	ldloc.2
+	stloc 9
+// 0x01072fa4: 0x1072fa4: jr    ra addiu sp, sp, 1840
+	ldloc.0
+	ldc.i4 1840
 	add
-	stloc.2
-// 0x0107310c: 0x107310c: addu  v1, a1, v1
-	ldloc.2
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
-	add
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 format_RoadMapGpsPosition_Pos_Azy_Str_1072fac(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+
+// local  6 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 7
-// 0x01073110: 0x1073110: addu  s6, v1, s6
-	ldloc 7
-	ldloc 10
-	add
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 10
-// 0x01073114: 0x1073114: addu  s6, s6, s0
-	ldloc 10
-	ldloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01072fac: 0x1072fac: addiu sp, sp, -88
+	ldloc.0
+	ldc.i4.s -88
 	add
-	stloc 10
-// 0x01073118: 0x1073118: addu  s6, s6, v0
-	ldloc 10
-	ldloc 6
+	stloc.0
+// 0x01072fb0: 0x1072fb0: addiu a2, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc 10
-// 0x0107311c: 0x107311c: jal   0x1000910 addu  a0, s6, zero
-	ldloc 10
-	stloc.1
+	stloc.3
+// 0x01072fb4: 0x1072fb4: sw    s0, 76(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldloc 7
+	stelem.i4
+// 0x01072fb8: 0x1072fb8: addu  s0, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073124: 0x1073124: addu  s0, v0, zero
-	ldloc 6
-	stloc 9
-// 0x01073128: 0x1073128: lw    t5, 212(sp)
+// 0x01072fbc: 0x1072fbc: lw    a1, 0(a1)
+	ldloc 5
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.2
+// 0x01072fc0: 0x1072fc0: sw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 53
+	ldc.i4.s 20
 	add
-	ldelem.i4
+	ldloc 8
+	stelem.i4
+// 0x01072fc4: 0x1072fc4: addu  s1, a0, zero
+	ldloc.1
 	stloc 8
-// 0x0107312c: 0x107312c: lw    v0, 220(sp)
+// 0x01072fc8: 0x1072fc8: addu  a0, a2, zero
+	ldloc.3
+	stloc.1
+// 0x01072fcc: 0x1072fcc: sw    ra, 84(sp)
+// 0x01072fd0: 0x1072fd0: jal   0x1072a8c sw    a2, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 55
+	ldc.i4.s 17
 	add
-	ldelem.i4
+	ldloc.3
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-// 0x01073130: 0x1073130: lw    t1, 4(t5)
+// --- basic block ---
+// 0x01072fd8: 0x1072fd8: addiu a3, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc 4
+// 0x01072fdc: 0x1072fdc: lw    a1, 4(s0)
 	ldloc 5
-	ldloc 8
+	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 21
-// 0x01073134: 0x1073134: lw    t2, 0(t5)
+	stloc.2
+// 0x01072fe0: 0x1072fe0: addu  a0, a3, zero
+	ldloc 4
+	stloc.1
+// 0x01072fe4: 0x1072fe4: jal   0x1072a8c sw    a3, 64(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 22
-// 0x01073138: 0x1073138: bne   v0, zero, 0x1073148 lui   v1, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 7
-	brtrue L_1073148
-// --- basic block ---
-// 0x01073140: 0x1073140: j	 0x1073150 addiu v1, v1, 18636
-	ldloc 7
-	ldc.i4 18636
+	ldc.i4.s 16
 	add
-	stloc 7
-	br L_1073150
+	ldloc 4
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
 // --- basic block ---
-L_1073148:
-// 0x01073148: 0x1073148: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x0107314c: 0x107314c: addiu v1, v1, 12208
-	ldloc 7
-	ldc.i4 12208
-	add
-	stloc 7
-L_1073150:
-// 0x01073150: 0x1073150: lw    v0, 236(sp)
+// 0x01072fec: 0x1072fec: lw    v0, 16(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 59
+	ldc.i4.4
 	add
 	ldelem.i4
 	stloc 6
-// 0x01073154: 0x1073154: sll   zero, zero, 0
-// 0x01073158: 0x1073158: lw    t0, 4(v0)
+// 0x01072ff0: 0x1072ff0: lw    a2, 68(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 17
 	add
 	ldelem.i4
-	stloc 13
-// 0x0107315c: 0x107315c: lw    t3, 0(v0)
+	stloc.3
+// 0x01072ff4: 0x1072ff4: lw    a3, 64(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 16
+	add
 	ldelem.i4
-	stloc 23
-// 0x01073160: 0x1073160: lw    v0, 256(sp)
+	stloc 4
+// 0x01072ff8: 0x1072ff8: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01072ffc: 0x1072ffc: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x01073000: 0x1073000: addiu a1, a1, -32568
+	ldloc.2
+	ldc.i4 -32568
+	add
+	stloc.2
+// 0x01073004: 0x1073004: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 64
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 6
-// 0x01073164: 0x1073164: sll   zero, zero, 0
-// 0x01073168: 0x1073168: bne   v0, zero, 0x1073178 lui   v0, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brtrue L_1073178
-// --- basic block ---
-// 0x01073170: 0x1073170: j	 0x1073180 addiu v0, v0, 18636
 	ldloc 6
-	ldc.i4 18636
-	add
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	br L_1073180
 // --- basic block ---
-L_1073178:
-// 0x01073178: 0x1073178: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x0107317c: 0x107317c: addiu v0, v0, 12208
-	ldloc 6
-	ldc.i4 12208
-	add
-	stloc 6
-L_1073180:
-// 0x01073180: 0x1073180: lw    t5, 176(sp)
+// 0x0107300c: 0x107300c: lw    ra, 84(sp)
+// 0x01073010: 0x1073010: lw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 44
+	ldc.i4.s 20
 	add
 	ldelem.i4
 	stloc 8
-// 0x01073184: 0x1073184: sw    v1, 60(sp)
+// 0x01073014: 0x1073014: lw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4.s 19
 	add
-	ldloc 7
-	stelem.i4
-// 0x01073188: 0x1073188: sw    t5, 16(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 7
+// 0x01073018: 0x1073018: jr    ra addiu sp, sp, 88
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s 88
 	add
-	ldloc 8
-	stelem.i4
-// 0x0107318c: 0x107318c: lw    t5, 180(sp)
-	ldloc 5
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 format_RoadMapGpsPosition_string_1073020(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s1,int32 v0,int32 v1,int32 s0,int32 s2,int32 ra)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local  6 is register s1
+// local 10 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01073020: 0x1073020: addiu sp, sp, -120
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 45
+	ldc.i4.s -120
 	add
-	ldelem.i4
-	stloc 8
-// 0x01073190: 0x1073190: lw    v1, 108(sp)
-	ldloc 5
+	stloc.0
+// 0x01073024: 0x1073024: addiu a2, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 7
-// 0x01073194: 0x1073194: sw    t5, 20(sp)
+	stloc.3
+// 0x01073028: 0x1073028: sw    s1, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 27
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x01073198: 0x1073198: lw    t5, 188(sp)
+// 0x0107302c: 0x107302c: addu  s1, a1, zero
+	ldloc.2
+	stloc 6
+// 0x01073030: 0x1073030: lw    a1, 0(a1)
 	ldloc 5
-	ldloc.0
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 47
-	add
 	ldelem.i4
-	stloc 8
-// 0x0107319c: 0x107319c: lw    a0, 260(sp)
+	stloc.2
+// 0x01073034: 0x1073034: sw    s2, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 65
+	ldc.i4.s 28
 	add
-	ldelem.i4
+	ldloc 10
+	stelem.i4
+// 0x01073038: 0x1073038: addu  s2, a0, zero
+	ldloc.1
+	stloc 10
+// 0x0107303c: 0x107303c: addu  a0, a2, zero
+	ldloc.3
 	stloc.1
-// 0x010731a0: 0x10731a0: sw    t5, 24(sp)
+// 0x01073040: 0x1073040: sw    ra, 116(sp)
+// 0x01073044: 0x1073044: sw    a2, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 25
 	add
-	ldloc 8
+	ldloc.3
 	stelem.i4
-// 0x010731a4: 0x10731a4: lw    t5, 192(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 48
-	add
-	ldelem.i4
-	stloc 8
-// 0x010731a8: 0x10731a8: sw    v1, 64(sp)
+// 0x01073048: 0x1073048: jal   0x1072a8c sw    s0, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 26
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x010731ac: 0x10731ac: sw    t5, 28(sp)
-	ldloc 5
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 8
-	stelem.i4
-// 0x010731b0: 0x10731b0: lw    t5, 196(sp)
-	ldloc 5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x01073050: 0x1073050: addiu a3, sp, 52
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 49
+	ldc.i4.s 52
 	add
-	ldelem.i4
-	stloc 8
-// 0x010731b4: 0x10731b4: lw    v1, 232(sp)
+	stloc 4
+// 0x01073054: 0x1073054: lw    a1, 4(s1)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 58
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 7
-// 0x010731b8: 0x10731b8: sw    t5, 32(sp)
+	stloc.2
+// 0x01073058: 0x1073058: addu  a0, a3, zero
+	ldloc 4
+	stloc.1
+// 0x0107305c: 0x107305c: sw    a3, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 24
 	add
-	ldloc 8
+	ldloc 4
 	stelem.i4
-// 0x010731bc: 0x10731bc: lw    t5, 116(sp)
-	ldloc 5
+// 0x01073060: 0x1073060: jal   0x1072a8c addiu s0, sp, 72
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 29
+	ldc.i4.s 72
 	add
-	ldelem.i4
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-// 0x010731c0: 0x10731c0: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x010731c4: 0x10731c4: sw    t5, 36(sp)
+	stloc 7
+// --- basic block ---
+// 0x01073068: 0x1073068: lw    a1, 8(s1)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 8
-	stelem.i4
-// 0x010731c8: 0x10731c8: lw    t5, 112(sp)
-	ldloc 5
-	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 28
 	add
 	ldelem.i4
+	stloc.2
+// 0x0107306c: 0x107306c: jal   0x1072a8c addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-// 0x010731cc: 0x10731cc: lw    a3, 172(sp)
+	stloc 7
+// --- basic block ---
+// 0x01073074: 0x1073074: lw    v0, 12(s1)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 43
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 4
-// 0x010731d0: 0x10731d0: sw    t5, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 8
-	stelem.i4
-// 0x010731d4: 0x10731d4: lw    t5, 208(sp)
+	stloc 7
+// 0x01073078: 0x1073078: lw    v1, 16(s1)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 52
+	ldc.i4.4
 	add
 	ldelem.i4
 	stloc 8
-// 0x010731d8: 0x10731d8: sll   t4, a0, 1
-	ldloc.1
-	ldc.i4.1
-	shl
-	stloc 24
-// 0x010731dc: 0x10731dc: sw    t5, 44(sp)
+// 0x0107307c: 0x107307c: lw    a2, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 25
 	add
-	ldloc 8
-	stelem.i4
-// 0x010731e0: 0x10731e0: lw    t5, 104(sp)
+	ldelem.i4
+	stloc.3
+// 0x01073080: 0x1073080: lw    a3, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 26
+	ldc.i4.s 24
 	add
 	ldelem.i4
-	stloc 8
-// 0x010731e4: 0x10731e4: addiu a2, a2, -32512
-	ldloc.3
-	ldc.i4 -32512
-	add
-	stloc.3
-// 0x010731e8: 0x10731e8: addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-// 0x010731ec: 0x10731ec: addu  a1, s6, zero
+	stloc 4
+// 0x01073084: 0x1073084: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01073088: 0x1073088: addu  a0, s2, zero
 	ldloc 10
+	stloc.1
+// 0x0107308c: 0x107308c: addiu a1, a1, -32476
+	ldloc.2
+	ldc.i4 -32476
+	add
 	stloc.2
-// 0x010731f0: 0x10731f0: sw    s8, 56(sp)
+// 0x01073090: 0x1073090: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.4
 	add
-	ldloc 12
+	ldloc 9
 	stelem.i4
-// 0x010731f4: 0x10731f4: sw    v1, 72(sp)
+// 0x01073094: 0x1073094: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.5
 	add
-	ldloc 7
+	ldloc 8
 	stelem.i4
-// 0x010731f8: 0x10731f8: sw    s7, 84(sp)
+// 0x01073098: 0x1073098: jal   0x1000f64 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.6
 	add
-	ldloc 11
+	ldloc 7
 	stelem.i4
-// 0x010731fc: 0x10731fc: sw    t2, 48(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x010730a0: 0x10730a0: lw    ra, 116(sp)
+// 0x010730a4: 0x10730a4: lw    s2, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.s 28
 	add
-	ldloc 22
-	stelem.i4
-// 0x01073200: 0x1073200: sw    t1, 52(sp)
+	ldelem.i4
+	stloc 10
+// 0x010730a8: 0x10730a8: lw    s1, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.s 27
 	add
-	ldloc 21
-	stelem.i4
-// 0x01073204: 0x1073204: sw    t5, 68(sp)
+	ldelem.i4
+	stloc 6
+// 0x010730ac: 0x10730ac: lw    s0, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 26
 	add
-	ldloc 8
-	stelem.i4
-// 0x01073208: 0x1073208: sw    t3, 76(sp)
-	ldloc 5
+	ldelem.i4
+	stloc 9
+// 0x010730b0: 0x10730b0: jr    ra addiu sp, sp, 120
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
+	ldc.i4.s 120
 	add
-	ldloc 23
-	stelem.i4
-// 0x0107320c: 0x107320c: sw    t0, 80(sp)
-	ldloc 5
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 format_RoadMapPosition_string_10730b8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 v0,int32 v1,int32 s2,int32 ra)
+
+// local  8 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  6 is register s0
+// local  7 is register s1
+// local 10 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 10
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010730b8: 0x10730b8: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
+	ldc.i4.s -56
 	add
-	ldloc 13
-	stelem.i4
-// 0x01073210: 0x1073210: sw    v0, 88(sp)
+	stloc.0
+// 0x010730bc: 0x10730bc: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.s 12
 	add
-	ldloc 6
+	ldloc 10
 	stelem.i4
-// 0x01073214: 0x1073214: sw    t4, 92(sp)
+// 0x010730c0: 0x10730c0: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.s 10
 	add
-	ldloc 24
+	ldloc 6
 	stelem.i4
-// 0x01073218: 0x1073218: jal   0x1000f9c addu  s7, zero, zero
-	ldc.i4.s 0
-	stloc 11
-	ldloc.0
-	ldloc.1
+// 0x010730c4: 0x10730c4: addu  s2, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073220: 0x1073220: lw    v1, 264(sp)
-	ldloc 5
+	stloc 10
+// 0x010730c8: 0x10730c8: addiu s0, sp, 16
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 66
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc 7
-// 0x01073224: 0x1073224: lw    s8, 268(sp)
+	stloc 6
+// 0x010730cc: 0x10730cc: lw    a1, 0(a1)
 	ldloc 5
-	ldloc.0
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 67
-	add
 	ldelem.i4
-	stloc 12
-// 0x01073228: 0x1073228: j	 0x1073284 sll   zero, zero, 0
-	br L_1073284
-// --- basic block ---
-L_1073230:
-// 0x01073230: 0x1073230: jal   0x1001b48 sw    v1, 124(sp)
+	stloc.2
+// 0x010730d0: 0x10730d0: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4.s 11
 	add
 	ldloc 7
 	stelem.i4
+// 0x010730d4: 0x10730d4: addu  s1, a0, zero
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073238: 0x1073238: lw    v1, 124(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 31
-	add
-	ldelem.i4
 	stloc 7
-// 0x0107323c: 0x107323c: lw    t0, 0(s8)
-	ldloc 5
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 13
-// 0x01073240: 0x1073240: subu  a1, s6, v0
-	ldloc 10
+// 0x010730d8: 0x10730d8: sw    ra, 52(sp)
+// 0x010730dc: 0x10730dc: jal   0x1072a8c addu  a0, s0, zero
 	ldloc 6
-	sub
-	stloc.2
-// 0x01073244: 0x1073244: addu  a0, s0, v0
-	ldloc 9
-	ldloc 6
-	add
 	stloc.1
-// 0x01073248: 0x1073248: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107324c: 0x107324c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 6
-// 0x01073250: 0x1073250: lw    a3, 0(v1)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 4
-// 0x01073254: 0x1073254: addiu a2, a2, -32412
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	ldc.i4 -32412
-	add
-	stloc.3
-// 0x01073258: 0x1073258: addiu s7, s7, 1
-	ldloc 11
-	ldc.i4.1
-	add
-	stloc 11
-// 0x0107325c: 0x107325c: addiu s8, s8, 4
-	ldloc 12
-	ldc.i4.4
-	add
-	stloc 12
-// 0x01073260: 0x1073260: addiu v1, v1, 4
-	ldloc 7
-	ldc.i4.4
-	add
-	stloc 7
-// 0x01073264: 0x1073264: beq   t0, zero, 0x1073274 addiu v0, v0, 18636
-	ldloc 13
-	ldloc 6
-	ldc.i4 18636
-	add
-	stloc 6
-	brfalse L_1073274
+	ldloc 4
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x0107326c: 0x107326c: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x01073270: 0x1073270: addiu v0, v0, 12208
+// 0x010730e4: 0x10730e4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x010730e8: 0x10730e8: addu  a2, s0, zero
 	ldloc 6
-	ldc.i4 12208
-	add
-	stloc 6
-L_1073274:
-// 0x01073274: 0x1073274: sw    v1, 124(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 31
-	add
+	stloc.3
+// 0x010730ec: 0x10730ec: addu  a0, s1, zero
 	ldloc 7
-	stelem.i4
-// 0x01073278: 0x1073278: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	stloc.1
+// 0x010730f0: 0x10730f0: jal   0x1000f64 addiu a1, a1, -32460
+	ldloc.2
+	ldc.i4 -32460
 	add
-	ldloc 6
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01073280: 0x1073280: lw    v1, 124(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 31
-	add
-	ldelem.i4
-	stloc 7
-L_1073284:
-// 0x01073284: 0x1073284: lw    a1, 260(sp)
+// 0x010730f8: 0x10730f8: lw    a1, 4(s2)
 	ldloc 5
-	ldloc.0
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 65
+	ldc.i4.1
 	add
 	ldelem.i4
 	stloc.2
-// 0x01073288: 0x1073288: sll   zero, zero, 0
-// 0x0107328c: 0x107328c: slt   v0, s7, a1
-	ldloc 11
-	ldloc.2
-	clt
-	stloc 6
-// 0x01073290: 0x1073290: bne   v0, zero, 0x1073230 addu  a0, s0, zero
-	ldloc 6
-	ldloc 9
-	stloc.1
-	brtrue L_1073230
-// --- basic block ---
-// 0x01073298: 0x1073298: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-// 0x0107329c: 0x107329c: cibyl_sysc_arg 0x3
-	ldloc 7
-// 0x010732a0: 0x10732a0: cibyl_sysc 0x2120
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 6
-// 0x010732a4: 0x10732a4: addu  v1, v0, zero
+// 0x010730fc: 0x10730fc: jal   0x1072a8c addu  a0, s0, zero
 	ldloc 6
-	stloc 7
-// 0x010732a8: 0x10732a8: addiu a0, sp, 96
-	ldloc.0
-	ldc.i4.s 96
-	add
 	stloc.1
-// 0x010732ac: 0x10732ac: jal   0x10c3558 sw    v1, 96(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldloc 7
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl145::localtime_10c3558(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x010732b4: 0x10732b4: lw    a1, 8(v0)
-	ldloc 5
+// 0x01073104: 0x1073104: addu  a0, s1, zero
+	ldloc 7
+	stloc.1
+// 0x01073108: 0x1073108: jal   0x1001ac4 addu  a1, s0, zero
 	ldloc 6
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 8
+// --- basic block ---
+// 0x01073110: 0x1073110: lw    ra, 52(sp)
+// 0x01073114: 0x1073114: lw    s2, 48(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc.2
-// 0x010732b8: 0x10732b8: sll   zero, zero, 0
-// 0x010732bc: 0x10732bc: sw    a1, 120(sp)
+	stloc 10
+// 0x01073118: 0x1073118: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.s 11
 	add
-	ldloc.2
-	stelem.i4
-// 0x010732c0: 0x10732c0: lw    s7, 0(v0)
+	ldelem.i4
+	stloc 7
+// 0x0107311c: 0x107311c: lw    s0, 40(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 10
+	add
 	ldelem.i4
-	stloc 11
-// 0x010732c4: 0x10732c4: lw    s8, 4(v0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc 6
+// 0x01073120: 0x1073120: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
-	ldelem.i4
-	stloc 12
-// 0x010732c8: 0x10732c8: jal   0x1001b48 addu  a0, s0, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 RTNet_GetGeoConfig_1073128(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
+
+// local  7 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
 	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010732d0: 0x10732d0: lw    v1, 280(sp)
+// 0x01073128: 0x1073128: addiu sp, sp, -152
+	ldloc.0
+	ldc.i4 -152
+	add
+	stloc.0
+// 0x0107312c: 0x107312c: sw    s0, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.s 33
 	add
-	ldelem.i4
-	stloc 7
-// 0x010732d4: 0x10732d4: lw    a1, 120(sp)
+	ldloc 8
+	stelem.i4
+// 0x01073130: 0x1073130: addiu s0, sp, 48
+	ldloc.0
+	ldc.i4.s 48
+	add
+	stloc 8
+// 0x01073134: 0x1073134: sw    s3, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4.s 36
 	add
-	ldelem.i4
+	ldloc 11
+	stelem.i4
+// 0x01073138: 0x1073138: sw    s2, 140(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 35
+	add
+	ldloc 10
+	stelem.i4
+// 0x0107313c: 0x107313c: addu  s3, a1, zero
+	ldloc.2
+	stloc 11
+// 0x01073140: 0x1073140: addu  s2, a0, zero
+	ldloc.1
+	stloc 10
+// 0x01073144: 0x1073144: addu  a1, a2, zero
+	ldloc.3
 	stloc.2
-// 0x010732d8: 0x10732d8: bne   v1, zero, 0x10732e8 lui   v1, 0x20000
-	ldloc 7
-	ldc.i4 131072
-	stloc 7
-	brtrue L_10732e8
-// --- basic block ---
-// 0x010732e0: 0x10732e0: j	 0x10732f0 addiu v1, v1, 18636
-	ldloc 7
-	ldc.i4 18636
+// 0x01073148: 0x1073148: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x0107314c: 0x107314c: sw    ra, 148(sp)
+// 0x01073150: 0x1073150: sw    s1, 136(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
 	add
+	ldloc 9
+	stelem.i4
+// 0x01073154: 0x1073154: jal   0x10730b8 addu  s1, a3, zero
+	ldloc 4
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::format_RoadMapPosition_string_10730b8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 7
-	br L_10732f0
 // --- basic block ---
-L_10732e8:
-// 0x010732e8: 0x10732e8: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x010732ec: 0x10732ec: addiu v1, v1, 12208
-	ldloc 7
-	ldc.i4 12208
-	add
-	stloc 7
-L_10732f0:
-// 0x010732f0: 0x10732f0: addiu t0, zero, 3600
-	ldc.i4 3600
-	stloc 13
-// 0x010732f4: 0x10732f4: mult  a1, t0
+// 0x0107315c: 0x107315c: jal   0x102c400 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldloc 13
-	mul
-	stloc 19
-// 0x010732f8: 0x10732f8: addu  a0, s0, v0
-	ldloc 9
-	ldloc 6
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 7
+// --- basic block ---
+// 0x01073164: 0x1073164: lw    v1, 168(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 42
 	add
-	stloc.1
-// 0x010732fc: 0x10732fc: subu  a1, s6, v0
-	ldloc 10
-	ldloc 6
-	sub
+	ldelem.i4
+	stloc 6
+// 0x01073168: 0x1073168: lui   a1, 0x20000
+	ldc.i4 131072
 	stloc.2
-// 0x01073300: 0x1073300: lw    v0, 276(sp)
+// 0x0107316c: 0x107316c: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 69
+	ldc.i4.4
 	add
-	ldelem.i4
+	ldloc 6
+	stelem.i4
+// 0x01073170: 0x1073170: lui   v1, 0x20000
+	ldc.i4 131072
 	stloc 6
-// 0x01073304: 0x1073304: lw    a3, 272(sp)
+// 0x01073174: 0x1073174: addiu v1, v1, -32456
+	ldloc 6
+	ldc.i4 -32456
+	add
+	stloc 6
+// 0x01073178: 0x1073178: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 68
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 4
-// 0x01073308: 0x1073308: sw    v0, 32(sp)
+	ldloc 6
+	stelem.i4
+// 0x0107317c: 0x107317c: lui   a2, 0x0
+	ldc.i4.s 0
+	stloc.3
+// 0x01073180: 0x1073180: addiu v1, zero, 140
+	ldc.i4 140
+	stloc 6
+// 0x01073184: 0x1073184: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.7
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107330c: 0x107330c: addiu v0, zero, 60
-	ldc.i4.s 60
+// 0x01073188: 0x1073188: addu  a0, s3, zero
+	ldloc 11
+	stloc.1
+// 0x0107318c: 0x107318c: addiu v1, zero, 70
+	ldc.i4.s 70
 	stloc 6
-// 0x01073310: 0x1073310: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x01073314: 0x1073314: addiu a2, a2, -32428
+// 0x01073190: 0x1073190: addiu a1, a1, 1436
+	ldloc.2
+	ldc.i4 1436
+	add
+	stloc.2
+// 0x01073194: 0x1073194: addiu a2, a2, 15220
 	ldloc.3
-	ldc.i4 -32428
+	ldc.i4 15220
 	add
 	stloc.3
-// 0x01073318: 0x1073318: sw    v1, 36(sp)
+// 0x01073198: 0x1073198: addiu a3, zero, 4
+	ldc.i4.4
+	stloc 4
+// 0x0107319c: 0x107319c: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.5
 	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
-// 0x0107331c: 0x107331c: sw    s5, 16(sp)
+// 0x010731a0: 0x10731a0: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 16
+	ldloc 8
 	stelem.i4
-// 0x01073320: 0x1073320: sw    s4, 20(sp)
+// 0x010731a4: 0x10731a4: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 11
 	add
-	ldloc 15
+	ldloc 9
 	stelem.i4
-// 0x01073324: 0x1073324: sw    s3, 24(sp)
+// 0x010731a8: 0x10731a8: sw    v1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
-	ldloc 14
-	stelem.i4
-// 0x01073328: 0x1073328: mflo  lo
-	ldloc 19
-	stloc 13
-// 0x0107332c: 0x107332c: sll   zero, zero, 0
-// 0x01073330: 0x1073330: sll   zero, zero, 0
-// 0x01073334: 0x1073334: mult  s8, v0
-	ldloc 12
 	ldloc 6
-	mul
-	stloc 19
-// 0x01073338: 0x1073338: mflo  lo
-	ldloc 19
-	stloc 12
-// 0x0107333c: 0x107333c: addu  t0, t0, s8
-	ldloc 13
-	ldloc 12
-	add
-	stloc 13
-// 0x01073340: 0x1073340: addu  s7, t0, s7
-	ldloc 13
-	ldloc 11
-	add
-	stloc 11
-// 0x01073344: 0x1073344: jal   0x1000f9c sw    s7, 28(sp)
+	stelem.i4
+// 0x010731ac: 0x10731ac: jal   0x106a4b4 sw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 10
 	add
-	ldloc 11
+	ldloc 7
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
-// --- basic block ---
-// 0x0107334c: 0x107334c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01073350: 0x1073350: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01073354: 0x1073354: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01073358: 0x1073358: addiu a2, zero, 2275
-	ldc.i4 2275
-	stloc.3
-// 0x0107335c: 0x107335c: jal   0x100449c addu  a3, s0, zero
-	ldloc 9
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
 // --- basic block ---
-// 0x01073364: 0x1073364: lui   a0, 0x0
+// 0x010731b4: 0x10731b4: lw    ra, 148(sp)
+// 0x010731b8: 0x10731b8: sltu  v0, zero, v0
 	ldc.i4.s 0
-	stloc.1
-// 0x01073368: 0x1073368: lw    a2, 284(sp)
+	ldloc 7
+	clt.un
+	stloc 7
+// 0x010731bc: 0x10731bc: lw    s3, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 71
+	ldc.i4.s 36
 	add
 	ldelem.i4
-	stloc.3
-// 0x0107336c: 0x107336c: lw    a3, 168(sp)
+	stloc 11
+// 0x010731c0: 0x10731c0: lw    s2, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
-	add
-	ldelem.i4
-	stloc 4
-// 0x01073370: 0x1073370: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x01073374: 0x1073374: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01073378: 0x1073378: jal   0x1072cd8 sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073380: 0x1073380: beq   s0, zero, 0x1073394 addu  a0, s0, zero
-	ldloc 9
-	ldloc 9
-	stloc.1
-	brfalse L_1073394
-// --- basic block ---
-// 0x01073388: 0x1073388: jal   0x1000930 sw    v0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073390: 0x1073390: lw    v0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldelem.i4
-	stloc 6
-L_1073394:
-// 0x01073394: 0x1073394: beq   s1, zero, 0x10733a8 addu  a0, s1, zero
-	ldloc 17
-	ldloc 17
-	stloc.1
-	brfalse L_10733a8
-// --- basic block ---
-// 0x0107339c: 0x107339c: jal   0x1000930 sw    v0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010733a4: 0x10733a4: lw    v0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldelem.i4
-	stloc 6
-L_10733a8:
-// 0x010733a8: 0x10733a8: beq   s2, zero, 0x10733bc addu  a0, s2, zero
-	ldloc 18
-	ldloc 18
-	stloc.1
-	brfalse L_10733bc
-// --- basic block ---
-// 0x010733b0: 0x10733b0: jal   0x1000930 sw    v0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010733b8: 0x10733b8: lw    v0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
-	add
-	ldelem.i4
-	stloc 6
-L_10733bc:
-// 0x010733bc: 0x10733bc: lw    ra, 164(sp)
-// 0x010733c0: 0x10733c0: lw    s8, 160(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 40
-	add
-	ldelem.i4
-	stloc 12
-// 0x010733c4: 0x10733c4: lw    s7, 156(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 39
-	add
-	ldelem.i4
-	stloc 11
-// 0x010733c8: 0x10733c8: lw    s6, 152(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 38
+	ldc.i4.s 35
 	add
 	ldelem.i4
 	stloc 10
-// 0x010733cc: 0x10733cc: lw    s5, 148(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 37
-	add
-	ldelem.i4
-	stloc 16
-// 0x010733d0: 0x10733d0: lw    s4, 144(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 36
-	add
-	ldelem.i4
-	stloc 15
-// 0x010733d4: 0x10733d4: lw    s3, 140(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 35
-	add
-	ldelem.i4
-	stloc 14
-// 0x010733d8: 0x10733d8: lw    s2, 136(sp)
+// 0x010731c4: 0x10731c4: lw    s1, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3293,8 +2517,8 @@ L_10733bc:
 	ldc.i4.s 34
 	add
 	ldelem.i4
-	stloc 18
-// 0x010733dc: 0x10733dc: lw    s1, 132(sp)
+	stloc 9
+// 0x010731c8: 0x10731c8: lw    s0, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3302,57 +2526,48 @@ L_10733bc:
 	ldc.i4.s 33
 	add
 	ldelem.i4
-	stloc 17
-// 0x010733e0: 0x10733e0: lw    s0, 128(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 32
-	add
-	ldelem.i4
-	stloc 9
-// 0x010733e4: 0x10733e4: jr    ra addiu sp, sp, 168
+	stloc 8
+// 0x010731cc: 0x10731cc: jr    ra addiu sp, sp, 152
 	ldloc.0
-	ldc.i4 168
+	ldc.i4 152
 	add
 	stloc.0
 	br __CIBYL_function_return
-// --- basic block ---
-L_10733ec:
-// 0x010733ec: 0x10733ec: j	 0x1073394 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_1073394
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
 	ret
 }
-.method public static int32 RTNet_TripServer_FindTrip_107346c(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_GPSPath_BuildCommand_10731d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 t0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s6,int32 v1,int32 s1,int32 s2,int32 s8,int32 s4,int32 s5,int32 s3,int32 s7,int32 ra,int32 lo)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
-// local  8 is register s0
+// local  7 is register s0
 // local 10 is register s1
 // local 11 is register s2
+// local 15 is register s3
+// local 13 is register s4
+// local 14 is register s5
+// local  8 is register s6
+// local 16 is register s7
 // local  0 is register sp
-// local 12 is register ra
+// local 12 is register s8
+// local 17 is register ra
+// local 18 is register lo
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3362,266 +2577,479 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
 	stloc 11
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 16
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 12
+	ldc.i4.s 0
+	stloc 17
+	ldc.i4.s 0
+	stloc 18
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107346c: 0x107346c: addiu sp, sp, -48
+// 0x010731d4: 0x10731d4: addiu v0, a2, -2
+	ldloc.3
+	ldc.i4.s -2
+	add
+	stloc 6
+// 0x010731d8: 0x10731d8: addiu sp, sp, -192
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4 -192
 	add
 	stloc.0
-// 0x01073470: 0x1073470: lw    v1, 4(a1)
+// 0x010731dc: 0x10731dc: sltiu v0, v0, 99
+	ldloc 6
+	ldc.i4.s 99
+	clt.un
+	stloc 6
+// 0x010731e0: 0x10731e0: sw    s7, 180(sp)
 	ldloc 5
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 45
 	add
-	ldelem.i4
-	stloc 7
-// 0x01073474: 0x1073474: lw    v0, 0(a1)
+	ldloc 16
+	stelem.i4
+// 0x010731e4: 0x10731e4: sw    s3, 164(sp)
 	ldloc 5
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 6
-// 0x01073478: 0x1073478: sw    s0, 32(sp)
+	ldc.i4.s 41
+	add
+	ldloc 15
+	stelem.i4
+// 0x010731e8: 0x10731e8: sw    s1, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 39
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-// 0x0107347c: 0x107347c: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01073480: 0x1073480: addu  s0, a1, zero
-	ldloc.2
-	stloc 8
-// 0x01073484: 0x1073484: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01073488: 0x1073488: sw    s2, 40(sp)
+// 0x010731ec: 0x10731ec: sw    s0, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 38
 	add
-	ldloc 11
+	ldloc 7
 	stelem.i4
-// 0x0107348c: 0x107348c: sw    s1, 36(sp)
+// 0x010731f0: 0x10731f0: sw    ra, 188(sp)
+// 0x010731f4: 0x10731f4: sw    s8, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 46
 	add
-	ldloc 10
+	ldloc 12
 	stelem.i4
-// 0x01073490: 0x1073490: addu  s2, a2, zero
-	ldloc.3
-	stloc 11
-// 0x01073494: 0x1073494: addu  s1, a0, zero
-	ldloc.1
-	stloc 10
-// 0x01073498: 0x1073498: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
+// 0x010731f8: 0x10731f8: sw    s6, 176(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 44
 	add
-	stloc.2
-// 0x0107349c: 0x107349c: addiu a3, a3, -32304
-	ldloc 4
-	ldc.i4 -32304
+	ldloc 8
+	stelem.i4
+// 0x010731fc: 0x10731fc: sw    s5, 172(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 43
 	add
-	stloc 4
-// 0x010734a0: 0x10734a0: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x010734a4: 0x10734a4: addiu a2, zero, 2042
-	ldc.i4 2042
-	stloc.3
-// 0x010734a8: 0x10734a8: sw    ra, 44(sp)
-// 0x010734ac: 0x10734ac: sw    v1, 16(sp)
+	ldloc 14
+	stelem.i4
+// 0x01073200: 0x1073200: sw    s4, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 42
 	add
-	ldloc 7
+	ldloc 13
 	stelem.i4
-// 0x010734b0: 0x10734b0: jal   0x100449c sw    v0, 20(sp)
+// 0x01073204: 0x1073204: sw    s2, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 40
 	add
-	ldloc 6
+	ldloc 11
 	stelem.i4
+// 0x01073208: 0x1073208: addu  s3, a2, zero
+	ldloc.3
+	stloc 15
+// 0x0107320c: 0x107320c: addu  s0, a1, zero
+	ldloc.2
+	stloc 7
+// 0x01073210: 0x1073210: addu  s7, a3, zero
+	ldloc 4
+	stloc 16
+// 0x01073214: 0x1073214: beq   v0, zero, 0x10732b8 addu  s1, a0, zero
+	ldloc 6
+	ldloc.1
+	stloc 10
+	brfalse L_10732b8
+// --- basic block ---
+// 0x0107321c: 0x107321c: addiu a3, zero, 3
+	ldc.i4.3
+	stloc 4
+// 0x01073220: 0x1073220: mult  a2, a3
+	ldloc.3
+	ldloc 4
+	mul
+	stloc 18
+// 0x01073224: 0x1073224: lw    a2, 12(a1)
+	ldloc 5
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldelem.i4
+	stloc.3
+// 0x01073228: 0x1073228: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107322c: 0x107322c: addiu a1, a1, -32420
+	ldloc.2
+	ldc.i4 -32420
+	add
+	stloc.2
+// 0x01073230: 0x1073230: lui   s8, 0x20000
+	ldc.i4 131072
+	stloc 12
+// 0x01073234: 0x1073234: addu  s2, zero, zero
+	ldc.i4.s 0
+	stloc 11
+// 0x01073238: 0x1073238: addu  s6, zero, zero
+	ldc.i4.s 0
+	stloc 8
+// 0x0107323c: 0x107323c: addiu s5, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc 14
+// 0x01073240: 0x1073240: addiu s4, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc 13
+// 0x01073244: 0x1073244: mflo  lo
+	ldloc 18
+	stloc 4
+// 0x01073248: 0x1073248: jal   0x1000f64 addiu s8, s8, -32404
+	ldloc 12
+	ldc.i4 -32404
+	add
+	stloc 12
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010734b8: 0x10734b8: lw    v0, 4(s0)
+// 0x01073250: 0x1073250: j	 0x107326c addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+	br L_107326c
+// --- basic block ---
+L_1073258:
+// 0x01073258: 0x1073258: lw    s6, 28(s0)
 	ldloc 5
-	ldloc 8
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 6
-// 0x010734bc: 0x10734bc: lw    v1, 0(s0)
+	stloc 8
+// 0x0107325c: 0x107325c: lw    v0, 12(s0)
 	ldloc 5
-	ldloc 8
+	ldloc 7
 	ldc.i4.2
 	shr.un
+	ldc.i4.3
+	add
 	ldelem.i4
+	stloc 6
+// 0x01073260: 0x1073260: addiu s0, s0, 16
+	ldloc 7
+	ldc.i4.s 16
+	add
 	stloc 7
-// 0x010734c0: 0x10734c0: lui   a0, 0x0
-	ldc.i4.s 0
+// 0x01073264: 0x1073264: subu  s6, s6, v0
+	ldloc 8
+	ldloc 6
+	sub
+	stloc 8
+// 0x01073268: 0x1073268: addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+L_107326c:
+// 0x0107326c: 0x107326c: jal   0x10730b8 addu  a0, s5, zero
+	ldloc 14
 	stloc.1
-// 0x010734c4: 0x10734c4: lui   t0, 0x20000
-	ldc.i4 131072
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::format_RoadMapPosition_string_10730b8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
-// 0x010734c8: 0x10734c8: addu  a2, s2, zero
-	ldloc 11
-	stloc.3
-// 0x010734cc: 0x10734cc: addu  a3, s1, zero
-	ldloc 10
+	stloc 6
+// --- basic block ---
+// 0x01073274: 0x1073274: lw    a3, 8(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldelem.i4
 	stloc 4
-// 0x010734d0: 0x10734d0: addiu t0, t0, -32256
-	ldloc 9
-	ldc.i4 -32256
+// 0x01073278: 0x1073278: addu  a2, s5, zero
+	ldloc 14
+	stloc.3
+// 0x0107327c: 0x107327c: addu  a0, s4, zero
+	ldloc 13
+	stloc.1
+// 0x01073280: 0x1073280: addu  a1, s8, zero
+	ldloc 12
+	stloc.2
+// 0x01073284: 0x1073284: sw    s6, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x01073288: 0x1073288: jal   0x1000f64 addiu s2, s2, 1
+	ldloc 11
+	ldc.i4.1
 	add
+	stloc 11
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
-// 0x010734d4: 0x10734d4: addiu a0, a0, 15252
+	stloc 6
+// --- basic block ---
+// 0x01073290: 0x1073290: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x01073294: 0x1073294: jal   0x1001ac4 addu  a1, s4, zero
+	ldloc 13
+	stloc.2
 	ldloc.1
-	ldc.i4 15252
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 6
+// --- basic block ---
+// 0x0107329c: 0x107329c: slt   v0, s2, s3
+	ldloc 11
+	ldloc 15
+	clt
+	stloc 6
+// 0x010732a0: 0x10732a0: bne   v0, zero, 0x1073258 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_1073258
+// --- basic block ---
+// 0x010732a8: 0x10732a8: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010732ac: 0x10732ac: addiu a1, a1, 18632
+	ldloc.2
+	ldc.i4 18632
 	add
+	stloc.2
+// 0x010732b0: 0x10732b0: jal   0x1001ac4 addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x010734d8: 0x10734d8: addiu a1, zero, 36
-	ldc.i4.s 36
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 6
+// --- basic block ---
+L_10732b8:
+// 0x010732b8: 0x10732b8: beq   s7, zero, 0x10732cc addu  a0, s1, zero
+	ldloc 16
+	ldloc 10
+	stloc.1
+	brfalse L_10732cc
+// --- basic block ---
+// 0x010732c0: 0x10732c0: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x010732c4: 0x10732c4: jal   0x1001ac4 addiu a1, a1, -32392
+	ldloc.2
+	ldc.i4 -32392
+	add
 	stloc.2
-// 0x010734dc: 0x10734dc: sw    t0, 16(sp)
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 6
+// --- basic block ---
+L_10732cc:
+// 0x010732cc: 0x10732cc: lw    ra, 188(sp)
+// 0x010732d0: 0x10732d0: lw    s8, 184(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 46
 	add
-	ldloc 9
-	stelem.i4
-// 0x010734e0: 0x10734e0: sw    v1, 20(sp)
+	ldelem.i4
+	stloc 12
+// 0x010732d4: 0x10732d4: lw    s7, 180(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 45
 	add
-	ldloc 7
-	stelem.i4
-// 0x010734e4: 0x10734e4: jal   0x1072cd8 sw    v0, 24(sp)
+	ldelem.i4
+	stloc 16
+// 0x010732d8: 0x10732d8: lw    s6, 176(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 44
 	add
-	ldloc 6
-	stelem.i4
+	ldelem.i4
+	stloc 8
+// 0x010732dc: 0x10732dc: lw    s5, 172(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010734ec: 0x10734ec: lw    ra, 44(sp)
-// 0x010734f0: 0x10734f0: lw    s2, 40(sp)
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 43
+	add
+	ldelem.i4
+	stloc 14
+// 0x010732e0: 0x10732e0: lw    s4, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 42
+	add
+	ldelem.i4
+	stloc 13
+// 0x010732e4: 0x10732e4: lw    s3, 164(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 41
+	add
+	ldelem.i4
+	stloc 15
+// 0x010732e8: 0x10732e8: lw    s2, 160(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 40
 	add
 	ldelem.i4
 	stloc 11
-// 0x010734f4: 0x10734f4: lw    s1, 36(sp)
+// 0x010732ec: 0x10732ec: lw    s1, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 39
 	add
 	ldelem.i4
 	stloc 10
-// 0x010734f8: 0x10734f8: lw    s0, 32(sp)
+// 0x010732f0: 0x10732f0: lw    s0, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 38
 	add
 	ldelem.i4
-	stloc 8
-// 0x010734fc: 0x10734fc: jr    ra addiu sp, sp, 48
+	stloc 7
+// 0x010732f4: 0x10732f4: jr    ra addiu sp, sp, 192
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4 192
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_TripServer_DeletePOI_1073504(int32,int32,int32,int32,int32)
+.method public static int32 wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s4,int32 s0,int32 s2,int32 s3,int32 s8,int32 s5,int32 s6,int32 s7,int32 ra)
 
-// local  6 is register v0
-// local  5 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local 10 is register s0
+// local  8 is register s1
+// local 11 is register s2
+// local 12 is register s3
+// local  9 is register s4
+// local 14 is register s5
+// local 15 is register s6
+// local 16 is register s7
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local 13 is register s8
+// local 17 is register ra
+// local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 6
 	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3630,334 +3058,246 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 16
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 13
+	ldc.i4.s 0
+	stloc 17
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01073504: 0x1073504: addiu sp, sp, -32
+// 0x010732fc: 0x10732fc: addiu sp, sp, -2416
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4 -2416
 	add
 	stloc.0
-// 0x01073508: 0x1073508: sw    ra, 28(sp)
-// 0x0107350c: 0x107350c: addu  v0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x01073510: 0x1073510: bne   a1, zero, 0x107353c addu  a3, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 4
-	brtrue L_107353c
-// --- basic block ---
-// 0x01073518: 0x1073518: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107351c: 0x107351c: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01073520: 0x1073520: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01073524: 0x1073524: addiu a3, a3, -32212
-	ldloc 4
-	ldc.i4 -32212
-	add
-	stloc 4
-// 0x01073528: 0x1073528: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x0107352c: 0x107352c: jal   0x100449c addiu a2, zero, 2021
-	ldc.i4 2021
-	stloc.3
+// 0x01073300: 0x1073300: sw    s7, 2404(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 6
-// --- basic block ---
-// 0x01073534: 0x1073534: j	 0x107355c addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_107355c
-// --- basic block ---
-L_107353c:
-// 0x0107353c: 0x107353c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073540: 0x1073540: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01073544: 0x1073544: addiu v1, v1, -32172
-	ldloc 5
-	ldc.i4 -32172
-	add
-	stloc 5
-// 0x01073548: 0x1073548: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldc.i4.2
+	shr.un
+	ldc.i4 601
 	add
-	stloc.1
-// 0x0107354c: 0x107354c: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01073550: 0x1073550: sw    v1, 16(sp)
-	ldloc 7
+	ldloc 16
+	stelem.i4
+// 0x01073304: 0x1073304: sw    s6, 2400(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 600
 	add
-	ldloc 5
+	ldloc 15
 	stelem.i4
-// 0x01073554: 0x1073554: jal   0x1072cd8 sw    v0, 20(sp)
-	ldloc 7
+// 0x01073308: 0x1073308: sw    s5, 2396(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 599
 	add
+	ldloc 14
+	stelem.i4
+// 0x0107330c: 0x107330c: sw    s2, 2384(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 596
+	add
+	ldloc 11
 	stelem.i4
+// 0x01073310: 0x1073310: sw    s1, 2380(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 6
-// --- basic block ---
-L_107355c:
-// 0x0107355c: 0x107355c: lw    ra, 28(sp)
-// 0x01073560: 0x1073560: sll   zero, zero, 0
-// 0x01073564: 0x1073564: jr    ra addiu sp, sp, 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 595
+	add
+	ldloc 8
+	stelem.i4
+// 0x01073314: 0x1073314: sw    ra, 2412(sp)
+// 0x01073318: 0x1073318: sw    s8, 2408(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 602
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 13
+	stelem.i4
+// 0x0107331c: 0x107331c: sw    s4, 2392(sp)
 	ldloc 6
-	ret
-}
-.method public static int32 RTNet_TripServer_GetNumPOIs_107356c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107356c: 0x107356c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01073570: 0x1073570: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4 598
 	add
-	stloc.0
-// 0x01073574: 0x1073574: addiu v0, v0, -32128
-	ldloc 5
-	ldc.i4 -32128
+	ldloc 9
+	stelem.i4
+// 0x01073320: 0x1073320: sw    s3, 2388(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 597
 	add
-	stloc 5
-// 0x01073578: 0x1073578: sw    v0, 16(sp)
+	ldloc 12
+	stelem.i4
+// 0x01073324: 0x1073324: sw    s0, 2376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 594
 	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
-// 0x0107357c: 0x107357c: addu  a3, a0, zero
+// 0x01073328: 0x1073328: addu  s2, a3, zero
+	ldloc 4
+	stloc 11
+// 0x0107332c: 0x107332c: addu  s7, a0, zero
 	ldloc.1
-	stloc 4
-// 0x01073580: 0x1073580: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x01073584: 0x1073584: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073588: 0x1073588: addu  a2, a1, zero
+	stloc 16
+// 0x01073330: 0x1073330: addu  s6, a1, zero
 	ldloc.2
-	stloc.3
-// 0x0107358c: 0x107358c: addiu v0, v0, 32112
-	ldloc 5
-	ldc.i4 32112
-	add
-	stloc 5
-// 0x01073590: 0x1073590: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x01073594: 0x1073594: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01073598: 0x1073598: sw    ra, 28(sp)
-// 0x0107359c: 0x107359c: jal   0x1072cd8 sw    v0, 20(sp)
+	stloc 15
+// 0x01073334: 0x1073334: lw    s1, 2432(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 608
 	add
+	ldelem.i4
+	stloc 8
+// 0x01073338: 0x1073338: beq   a3, zero, 0x107349c addu  s5, a2, zero
+	ldloc 4
+	ldloc.3
+	stloc 14
+	brfalse L_107349c
+// --- basic block ---
+// 0x01073340: 0x1073340: beq   a0, zero, 0x10734a0 addu  v0, zero, zero
+	ldloc.1
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_10734a0
+// --- basic block ---
+// 0x01073348: 0x1073348: beq   a1, zero, 0x10734a0 sll   zero, zero, 0
+	ldloc.2
+	brfalse L_10734a0
+// --- basic block ---
+// 0x01073350: 0x1073350: beq   a2, zero, 0x10734a0 sll   zero, zero, 0
+	ldloc.3
+	brfalse L_10734a0
+// --- basic block ---
+// 0x01073358: 0x1073358: beq   s1, zero, 0x10734a0 sll   zero, zero, 0
+	ldloc 8
+	brfalse L_10734a0
+// --- basic block ---
+// 0x01073360: 0x1073360: lb    v0, 0(s1)
+	ldloc 8
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01073364: 0x1073364: sll   zero, zero, 0
+// 0x01073368: 0x1073368: beq   v0, zero, 0x10734a0 addu  v0, zero, zero
 	ldloc 5
-	stelem.i4
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_10734a0
+// --- basic block ---
+// 0x01073370: 0x1073370: addiu s0, sp, 120
+	ldloc.0
+	ldc.i4.s 120
+	add
+	stloc 10
+// 0x01073374: 0x1073374: jal   0x10674f4 addu  a0, s0, zero
+	ldloc 10
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010735a4: 0x10735a4: lw    ra, 28(sp)
-// 0x010735a8: 0x10735a8: sll   zero, zero, 0
-// 0x010735ac: 0x10735ac: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x0107337c: 0x107337c: jal   0x1001b48 addu  a0, s1, zero
 	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_TripServer_GetPOIs_10735b4(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010735b4: 0x10735b4: lui   v0, 0x20000
-	ldc.i4 131072
 	stloc 5
-// 0x010735b8: 0x10735b8: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x010735bc: 0x10735bc: addiu v0, v0, -32092
+// --- basic block ---
+// 0x01073384: 0x1073384: addiu s4, v0, 339
 	ldloc 5
-	ldc.i4 -32092
+	ldc.i4 339
 	add
-	stloc 5
-// 0x010735c0: 0x10735c0: sw    v0, 16(sp)
-	ldloc 6
+	stloc 9
+// 0x01073388: 0x1073388: addu  a0, s0, zero
+	ldloc 10
+	stloc.1
+// 0x0107338c: 0x107338c: jal   0x106756c addu  a1, s4, zero
+	ldloc 9
+	stloc.2
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x010735c4: 0x10735c4: addu  a3, a0, zero
 	ldloc.1
-	stloc 4
-// 0x010735c8: 0x10735c8: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x010735cc: 0x10735cc: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x010735d0: 0x10735d0: addu  a2, a1, zero
 	ldloc.2
-	stloc.3
-// 0x010735d4: 0x10735d4: addiu v0, v0, 32112
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01073394: 0x1073394: addu  s3, v0, zero
 	ldloc 5
-	ldc.i4 32112
+	stloc 12
+// 0x01073398: 0x1073398: addiu v0, sp, 2436
+	ldloc.0
+	ldc.i4 2436
 	add
 	stloc 5
-// 0x010735d8: 0x10735d8: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
+// 0x0107339c: 0x107339c: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x010733a0: 0x10733a0: addu  a0, s3, zero
+	ldloc 12
 	stloc.1
-// 0x010735dc: 0x10735dc: addiu a1, zero, 36
-	ldc.i4.s 36
+// 0x010733a4: 0x10733a4: addu  a1, s4, zero
+	ldloc 9
 	stloc.2
-// 0x010735e0: 0x10735e0: sw    ra, 28(sp)
-// 0x010735e4: 0x10735e4: jal   0x1072cd8 sw    v0, 20(sp)
+// 0x010733a8: 0x10733a8: addu  a2, s1, zero
+	ldloc 8
+	stloc.3
+// 0x010733ac: 0x10733ac: jal   0x10c10b0 sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.8
 	add
 	ldloc 5
 	stelem.i4
@@ -3966,136 +3306,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x010735ec: 0x10735ec: lw    ra, 28(sp)
-// 0x010735f0: 0x10735f0: sll   zero, zero, 0
-// 0x010735f4: 0x10735f4: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_TripServer_CreatePOI_10735fc(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t1,int32 ra,int32 t0)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 10 is register t0
-// local  8 is register t1
-// local  0 is register sp
-// local  9 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
 	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010735fc: 0x10735fc: addiu sp, sp, -48
-	ldloc.0
-	ldc.i4.s -48
-	add
-	stloc.0
-// 0x01073600: 0x1073600: sw    ra, 44(sp)
-// 0x01073604: 0x1073604: addu  v0, a1, zero
-	ldloc.2
-	stloc 6
-// 0x01073608: 0x1073608: bne   a1, zero, 0x107362c addu  a3, a0, zero
-	ldloc.2
-	ldloc.1
-	stloc 4
-	brtrue L_107362c
 // --- basic block ---
-// 0x01073610: 0x1073610: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01073614: 0x1073614: lui   a3, 0x20000
+// 0x010733b4: 0x10733b4: bgez  v0, 0x10733e4 lui   a2, 0x20000
+	ldloc 5
 	ldc.i4 131072
-	stloc 4
-// 0x01073618: 0x1073618: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x0107361c: 0x107361c: addiu a3, a3, -32060
-	ldloc 4
-	ldc.i4 -32060
-	add
-	stloc 4
-// 0x01073620: 0x1073620: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01073624: 0x1073624: j	 0x107364c addiu a2, zero, 1964
-	ldc.i4 1964
 	stloc.3
-	br L_107364c
-// --- basic block ---
-L_107362c:
-// 0x0107362c: 0x107362c: bne   a2, zero, 0x107365c lui   a0, 0x0
-	ldloc.3
 	ldc.i4.s 0
-	stloc.1
-	brtrue L_107365c
+	bge L_10733e4
 // --- basic block ---
-// 0x01073634: 0x1073634: lui   a1, 0x10000
+// 0x010733bc: 0x10733bc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01073638: 0x1073638: lui   a3, 0x20000
+// 0x010733c0: 0x10733c0: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107363c: 0x107363c: addiu a1, a1, 32252
+// 0x010733c4: 0x10733c4: addiu a1, a1, 32716
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x01073640: 0x1073640: addiu a3, a3, -32016
+// 0x010733c8: 0x10733c8: addiu a3, a3, -32376
 	ldloc 4
-	ldc.i4 -32016
+	ldc.i4 -32376
 	add
 	stloc 4
-// 0x01073644: 0x1073644: addiu a0, zero, 4
+// 0x010733cc: 0x10733cc: addiu a2, zero, 529
+	ldc.i4 529
+	stloc.3
+// 0x010733d0: 0x10733d0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01073648: 0x1073648: addiu a2, zero, 1969
-	ldc.i4 1969
-	stloc.3
-L_107364c:
-// 0x0107364c: 0x107364c: jal   0x100449c sll   zero, zero, 0
+// 0x010733d4: 0x10733d4: jal   0x100449c sw    s1, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4104,475 +3357,360 @@ L_107364c:
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01073654: 0x1073654: j	 0x10736a0 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_10736a0
+// 0x010733dc: 0x10733dc: j	 0x1073444 sll   zero, zero, 0
+	br L_1073444
 // --- basic block ---
-L_107365c:
-// 0x0107365c: 0x107365c: lw    v1, 4(a2)
-	ldloc 5
-	ldloc.3
+L_10733e4:
+// 0x010733e4: 0x10733e4: lw    a3, 260(s2)
+	ldloc 6
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 65
 	add
 	ldelem.i4
-	stloc 7
-// 0x01073660: 0x1073660: lw    t0, 0(a2)
-	ldloc 5
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 10
-// 0x01073664: 0x1073664: sw    v0, 28(sp)
-	ldloc 5
+	stloc 4
+// 0x010733e8: 0x10733e8: addiu s1, sp, 36
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 6
-	stelem.i4
-// 0x01073668: 0x1073668: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x0107366c: 0x107366c: addiu v0, v0, 32112
-	ldloc 6
-	ldc.i4 32112
+	ldc.i4.s 36
 	add
-	stloc 6
-// 0x01073670: 0x1073670: lui   t1, 0x20000
-	ldc.i4 131072
 	stloc 8
-// 0x01073674: 0x1073674: sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-// 0x01073678: 0x1073678: lw    a2, 68(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
+// 0x010733ec: 0x10733ec: addiu a2, a2, -32288
+	ldloc.3
+	ldc.i4 -32288
 	add
-	ldelem.i4
 	stloc.3
-// 0x0107367c: 0x107367c: lw    v0, 64(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+// 0x010733f0: 0x10733f0: addiu a1, zero, 83
+	ldc.i4.s 83
+	stloc.2
+// 0x010733f4: 0x10733f4: addiu v0, s2, 192
+	ldloc 11
+	ldc.i4 192
 	add
-	ldelem.i4
-	stloc 6
-// 0x01073680: 0x1073680: addiu t1, t1, -31964
+	stloc 5
+// 0x010733f8: 0x10733f8: addu  a0, s1, zero
 	ldloc 8
-	ldc.i4 -31964
-	add
-	stloc 8
-// 0x01073684: 0x1073684: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
 	stloc.1
-// 0x01073688: 0x1073688: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x0107368c: 0x107368c: sw    t1, 16(sp)
-	ldloc 5
+// 0x010733fc: 0x10733fc: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 8
-	stelem.i4
-// 0x01073690: 0x1073690: sw    t0, 20(sp)
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 10
-	stelem.i4
-// 0x01073694: 0x1073694: sw    v1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 7
-	stelem.i4
-// 0x01073698: 0x1073698: jal   0x1072cd8 sw    v0, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	stloc 5
 // --- basic block ---
-L_10736a0:
-// 0x010736a0: 0x10736a0: lw    ra, 44(sp)
-// 0x010736a4: 0x10736a4: sll   zero, zero, 0
-// 0x010736a8: 0x10736a8: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 RTNet_NotifySplashUpdateTime_10736b0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local 10 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
+// 0x01073404: 0x1073404: jal   0x1001b48 addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	ldc.i4.s 0
-	stloc 10
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+// --- basic block ---
+// 0x0107340c: 0x107340c: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x01073410: 0x1073410: jal   0x1001b48 addu  s8, v0, zero
+	ldloc 5
+	stloc 13
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+	stloc 5
+// --- basic block ---
+// 0x01073418: 0x1073418: addu  s8, v0, s8
+	ldloc 5
+	ldloc 13
+	add
+	stloc 13
+// 0x0107341c: 0x107341c: slt   s4, s8, s4
+	ldloc 13
+	ldloc 9
+	clt
 	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+// 0x01073420: 0x1073420: bne   s4, zero, 0x1073454 addu  a0, s1, zero
+	ldloc 9
+	ldloc 8
+	stloc.1
+	brtrue L_1073454
 // --- basic block ---
-// 0x010736b0: 0x10736b0: addiu sp, sp, -104
-	ldloc.0
-	ldc.i4.s -104
+// 0x01073428: 0x1073428: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107342c: 0x107342c: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01073430: 0x1073430: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	stloc.0
-// 0x010736b4: 0x10736b4: sw    s1, 96(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
+	stloc.2
+// 0x01073434: 0x1073434: addiu a3, a3, -32276
+	ldloc 4
+	ldc.i4 -32276
 	add
-	ldloc 8
-	stelem.i4
-// 0x010736b8: 0x10736b8: sw    ra, 100(sp)
-// 0x010736bc: 0x10736bc: sw    s0, 92(sp)
-	ldloc 6
+	stloc 4
+// 0x01073438: 0x1073438: addiu a2, zero, 541
+	ldc.i4 541
+	stloc.3
+// 0x0107343c: 0x107343c: jal   0x100449c addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
-	add
-	ldloc 7
-	stelem.i4
-// 0x010736c0: 0x10736c0: addu  a3, a0, zero
 	ldloc.1
-	stloc 4
-// 0x010736c4: 0x10736c4: beq   a1, zero, 0x1073728 addu  s1, a2, zero
 	ldloc.2
 	ldloc.3
-	stloc 8
-	brfalse L_1073728
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x010736cc: 0x10736cc: lb    v0, 0(a1)
+L_1073444:
+// 0x01073444: 0x1073444: jal   0x1067518 addu  a0, s0, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x010736d0: 0x10736d0: sll   zero, zero, 0
-// 0x010736d4: 0x10736d4: beq   v0, zero, 0x107372c addu  v0, zero, zero
-	ldloc 5
+// --- basic block ---
+// 0x0107344c: 0x107344c: j	 0x10734a0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_107372c
+	br L_10734a0
 // --- basic block ---
-// 0x010736dc: 0x10736dc: addiu s0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 7
-// 0x010736e0: 0x10736e0: addu  a0, a1, zero
-	ldloc.2
-	stloc.1
-// 0x010736e4: 0x10736e4: addiu a2, zero, 50
-	ldc.i4.s 50
-	stloc.3
-// 0x010736e8: 0x10736e8: addu  a1, s0, zero
-	ldloc 7
+L_1073454:
+// 0x01073454: 0x1073454: jal   0x10680a8 addu  a1, s3, zero
+	ldloc 12
 	stloc.2
-// 0x010736ec: 0x10736ec: jal   0x1067b64 sw    a3, 80(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 4
-	stelem.i4
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
+	call int32 Cibyl77::AppendPrefix_ShiftOriginalRight_10680a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010736f4: 0x10736f4: lw    a3, 80(sp)
+// 0x0107345c: 0x107345c: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x01073460: 0x1073460: lw    a0, -18000(v1)
 	ldloc 6
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4 -4500
 	add
 	ldelem.i4
-	stloc 4
-// 0x010736f8: 0x10736f8: beq   v0, zero, 0x1073728 lui   a0, 0x0
-	ldloc 5
-	ldc.i4.s 0
 	stloc.1
-	brfalse L_1073728
-// --- basic block ---
-// 0x01073700: 0x1073700: lui   v0, 0x20000
+// 0x01073464: 0x1073464: lui   a1, 0x20000
 	ldc.i4 131072
-	stloc 5
-// 0x01073704: 0x1073704: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x01073708: 0x1073708: addu  a2, s1, zero
-	ldloc 8
-	stloc.3
-// 0x0107370c: 0x107370c: addiu a1, zero, 36
-	ldc.i4.s 36
 	stloc.2
-// 0x01073710: 0x1073710: addiu v0, v0, -31892
-	ldloc 5
-	ldc.i4 -31892
+// 0x01073468: 0x1073468: addiu a1, a1, -32156
+	ldloc.2
+	ldc.i4 -32156
 	add
-	stloc 5
-// 0x01073714: 0x1073714: sw    v0, 16(sp)
+	stloc.2
+// 0x0107346c: 0x107346c: addu  a2, s7, zero
+	ldloc 16
+	stloc.3
+// 0x01073470: 0x1073470: addu  a3, s6, zero
+	ldloc 15
+	stloc 4
+// 0x01073474: 0x1073474: sw    s5, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 14
 	stelem.i4
-// 0x01073718: 0x1073718: jal   0x1072cd8 sw    s0, 20(sp)
+// 0x01073478: 0x1073478: sw    s2, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 7
+	ldloc 11
+	stelem.i4
+// 0x0107347c: 0x107347c: jal   0x106a4b4 sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 10
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01073484: 0x1073484: addu  a0, s0, zero
+	ldloc 10
+	stloc.1
+// 0x01073488: 0x1073488: jal   0x1067518 sw    v0, 2368(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 592
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01073720: 0x1073720: j	 0x107372c sll   zero, zero, 0
-	br L_107372c
+// 0x01073490: 0x1073490: lw    v0, 2368(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 592
+	add
+	ldelem.i4
+	stloc 5
+// 0x01073494: 0x1073494: j	 0x10734a0 sll   zero, zero, 0
+	br L_10734a0
 // --- basic block ---
-L_1073728:
-// 0x01073728: 0x1073728: addu  v0, zero, zero
+L_107349c:
+// 0x0107349c: 0x107349c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_107372c:
-// 0x0107372c: 0x107372c: lw    ra, 100(sp)
-// 0x01073730: 0x1073730: lw    s1, 96(sp)
+L_10734a0:
+// 0x010734a0: 0x10734a0: lw    ra, 2412(sp)
+// 0x010734a4: 0x10734a4: lw    s8, 2408(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4 602
 	add
 	ldelem.i4
-	stloc 8
-// 0x01073734: 0x1073734: lw    s0, 92(sp)
+	stloc 13
+// 0x010734a8: 0x10734a8: lw    s7, 2404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4 601
 	add
 	ldelem.i4
-	stloc 7
-// 0x01073738: 0x1073738: jr    ra addiu sp, sp, 104
+	stloc 16
+// 0x010734ac: 0x10734ac: lw    s6, 2400(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 104
+	ldc.i4.2
+	shr.un
+	ldc.i4 600
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 10
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_ExternalPoiNotifyOnNavigate_1073740(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01073740: 0x1073740: addiu sp, sp, -32
+	ldelem.i4
+	stloc 15
+// 0x010734b0: 0x10734b0: lw    s5, 2396(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4 599
 	add
-	stloc.0
-// 0x01073744: 0x1073744: addu  a3, a0, zero
-	ldloc.1
-	stloc 4
-// 0x01073748: 0x1073748: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0107374c: 0x107374c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073750: 0x1073750: sw    a1, 20(sp)
+	ldelem.i4
+	stloc 14
+// 0x010734b4: 0x10734b4: lw    s4, 2392(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
-	ldloc.2
-	stelem.i4
-// 0x01073754: 0x1073754: addiu v0, v0, -31864
-	ldloc 5
-	ldc.i4 -31864
+	ldc.i4 598
 	add
-	stloc 5
-// 0x01073758: 0x1073758: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldelem.i4
+	stloc 9
+// 0x010734b8: 0x10734b8: lw    s3, 2388(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 597
 	add
-	stloc.1
-// 0x0107375c: 0x107375c: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01073760: 0x1073760: sw    ra, 28(sp)
-// 0x01073764: 0x1073764: jal   0x1072cd8 sw    v0, 16(sp)
+	ldelem.i4
+	stloc 12
+// 0x010734bc: 0x10734bc: lw    s2, 2384(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 596
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc 11
+// 0x010734c0: 0x10734c0: lw    s1, 2380(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4 595
+	add
+	ldelem.i4
 	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0107376c: 0x107376c: lw    ra, 28(sp)
-// 0x01073770: 0x1073770: sll   zero, zero, 0
-// 0x01073774: 0x1073774: jr    ra addiu sp, sp, 32
+// 0x010734c4: 0x10734c4: lw    s0, 2376(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 594
+	add
+	ldelem.i4
+	stloc 10
+// 0x010734c8: 0x10734c8: jr    ra addiu sp, sp, 2416
+	ldloc.0
+	ldc.i4 2416
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RTNet_ExternalPoiNotifyOnPopUp_107377c(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_SelectRoute_10734d0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -4607,21 +3745,36 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107377c: 0x107377c: addiu sp, sp, -32
+// 0x010734d0: 0x10734d0: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01073780: 0x1073780: addu  a3, a0, zero
+// 0x010734d4: 0x10734d4: addu  v0, a0, zero
 	ldloc.1
-	stloc 4
-// 0x01073784: 0x1073784: lui   v0, 0x20000
-	ldc.i4 131072
 	stloc 5
-// 0x01073788: 0x1073788: lui   a0, 0x0
+// 0x010734d8: 0x10734d8: sw    a2, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc.3
+	stelem.i4
+// 0x010734dc: 0x10734dc: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0107378c: 0x107378c: sw    a1, 20(sp)
+// 0x010734e0: 0x10734e0: addu  a2, a3, zero
+	ldloc 4
+	stloc.3
+// 0x010734e4: 0x10734e4: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x010734e8: 0x10734e8: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x010734ec: 0x10734ec: sw    a1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4630,21 +3783,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01073790: 0x1073790: addiu v0, v0, -31832
+// 0x010734f0: 0x10734f0: addiu v0, v0, -32148
 	ldloc 5
-	ldc.i4 -31832
+	ldc.i4 -32148
 	add
 	stloc 5
-// 0x01073794: 0x1073794: addiu a0, a0, 15252
+// 0x010734f4: 0x10734f4: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073798: 0x1073798: addiu a1, zero, 36
+// 0x010734f8: 0x10734f8: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x0107379c: 0x107379c: sw    ra, 28(sp)
-// 0x010737a0: 0x10737a0: jal   0x1072cd8 sw    v0, 16(sp)
+// 0x010734fc: 0x10734fc: sw    ra, 36(sp)
+// 0x01073500: 0x1073500: jal   0x10732fc sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4658,16 +3811,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010737a8: 0x10737a8: lw    ra, 28(sp)
-// 0x010737ac: 0x10737ac: sll   zero, zero, 0
-// 0x010737b0: 0x10737b0: jr    ra addiu sp, sp, 32
+// 0x01073508: 0x1073508: lw    ra, 36(sp)
+// 0x0107350c: 0x107350c: sll   zero, zero, 0
+// 0x01073510: 0x1073510: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -4677,28 +3830,41 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTNet_FacebookPermissions_10737b8(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_RequestRoute_1073518(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 t2,int32 t0,int32 t1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t5,int32 s0,int32 s6,int32 s7,int32 s8,int32 t0,int32 s3,int32 s4,int32 s5,int32 s1,int32 s2,int32 lo,int32 ra,int32 t1,int32 t2,int32 t3,int32 t4)
 
-// local  7 is register v0
-// local  5 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
-// local 10 is register t1
-// local  8 is register t2
+// local 13 is register t0
+// local 21 is register t1
+// local 22 is register t2
+// local 23 is register t3
+// local 24 is register t4
+// local  8 is register t5
+// local  9 is register s0
+// local 17 is register s1
+// local 18 is register s2
+// local 14 is register s3
+// local 15 is register s4
+// local 16 is register s5
+// local 10 is register s6
+// local 11 is register s7
 // local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
+// local 12 is register s8
+// local 20 is register ra
+// local 19 is register lo
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldc.i4.s 0
-	stloc 5
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4708,763 +3874,1964 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 21
+	ldc.i4.s 0
+	stloc 22
+	ldc.i4.s 0
+	stloc 23
+	ldc.i4.s 0
+	stloc 24
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
+	stloc 17
+	ldc.i4.s 0
+	stloc 18
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 16
+	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 8
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 12
+	ldc.i4.s 0
+	stloc 20
+	ldc.i4.s 0
+	stloc 19
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010737b8: 0x10737b8: addiu sp, sp, -48
+// 0x01073518: 0x1073518: addiu sp, sp, -168
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4 -168
 	add
 	stloc.0
-// 0x010737bc: 0x10737bc: sltiu v1, a1, 3
-	ldloc.2
-	ldc.i4.3
-	clt.un
-	stloc 5
-// 0x010737c0: 0x10737c0: addu  t2, a0, zero
-	ldloc.1
-	stloc 8
-// 0x010737c4: 0x10737c4: sw    ra, 44(sp)
-// 0x010737c8: 0x10737c8: lw    a0, 64(sp)
-	ldloc 6
+// 0x0107351c: 0x107351c: sw    s0, 128(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc.1
-// 0x010737cc: 0x10737cc: bne   v1, zero, 0x10737e0 sll   a1, a1, 2
+	ldloc 9
+	stelem.i4
+// 0x01073520: 0x1073520: sw    a0, 168(sp)
 	ldloc 5
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
-	shl
-	stloc.2
-	brtrue L_10737e0
-// --- basic block ---
-// 0x010737d4: 0x10737d4: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x010737d8: 0x10737d8: j	 0x10737f0 addiu v1, v1, 18500
-	ldloc 5
-	ldc.i4 18500
+	shr.un
+	ldc.i4.s 42
 	add
-	stloc 5
-	br L_10737f0
-// --- basic block ---
-L_10737e0:
-// 0x010737e0: 0x10737e0: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x010737e4: 0x10737e4: addiu v1, v1, 28752
+	ldloc.1
+	stelem.i4
+// 0x01073524: 0x1073524: sw    a1, 172(sp)
 	ldloc 5
-	ldc.i4 28752
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 43
 	add
-	stloc 5
-// 0x010737e8: 0x10737e8: addu  a1, a1, v1
 	ldloc.2
+	stelem.i4
+// 0x01073528: 0x1073528: lw    v0, 200(sp)
 	ldloc 5
-	add
-	stloc.2
-// 0x010737ec: 0x10737ec: lw    v1, 0(a1)
-	ldloc 6
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 50
+	add
 	ldelem.i4
-	stloc 5
-L_10737f0:
-// 0x010737f0: 0x10737f0: beq   a2, zero, 0x1073814 addiu a1, zero, 1
-	ldloc.3
-	ldc.i4.1
-	stloc.2
-	brfalse L_1073814
-// --- basic block ---
-// 0x010737f8: 0x10737f8: beq   a2, a1, 0x1073820 addiu a1, zero, 2
-	ldloc.3
-	ldloc.2
+	stloc 6
+// 0x0107352c: 0x107352c: lw    v1, 204(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
-	stloc.2
-	beq  L_1073820
-// --- basic block ---
-// 0x01073800: 0x1073800: bne   a2, a1, 0x107382c sll   zero, zero, 0
-	ldloc.3
-	ldloc.2
-	bne.un L_107382c
-// --- basic block ---
-// 0x01073808: 0x1073808: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x0107380c: 0x107380c: j	 0x1073834 addiu v0, v0, 32112
-	ldloc 7
-	ldc.i4 32112
+	shr.un
+	ldc.i4.s 51
 	add
+	ldelem.i4
 	stloc 7
-	br L_1073834
-// --- basic block ---
-L_1073814:
-// 0x01073814: 0x1073814: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x01073818: 0x1073818: j	 0x1073834 addiu v0, v0, -25260
-	ldloc 7
-	ldc.i4 -25260
+// 0x01073530: 0x1073530: lw    a0, 224(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 56
+	add
+	ldelem.i4
+	stloc.1
+// 0x01073534: 0x1073534: lw    a1, 228(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 57
+	add
+	ldelem.i4
+	stloc.2
+// 0x01073538: 0x1073538: lw    s0, 216(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 54
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107353c: 0x107353c: sw    s6, 152(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
+	add
+	ldloc 10
+	stelem.i4
+// 0x01073540: 0x1073540: sw    s5, 148(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 37
+	add
+	ldloc 16
+	stelem.i4
+// 0x01073544: 0x1073544: sw    s4, 144(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 36
+	add
+	ldloc 15
+	stelem.i4
+// 0x01073548: 0x1073548: sw    s3, 140(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 35
+	add
+	ldloc 14
+	stelem.i4
+// 0x0107354c: 0x107354c: sw    ra, 164(sp)
+// 0x01073550: 0x1073550: sw    s8, 160(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 40
+	add
+	ldloc 12
+	stelem.i4
+// 0x01073554: 0x1073554: sw    s7, 156(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 39
+	add
+	ldloc 11
+	stelem.i4
+// 0x01073558: 0x1073558: sw    s2, 136(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
+	add
+	ldloc 18
+	stelem.i4
+// 0x0107355c: 0x107355c: sw    s1, 132(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 33
+	add
+	ldloc 17
+	stelem.i4
+// 0x01073560: 0x1073560: sw    a2, 176(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 44
+	add
+	ldloc.3
+	stelem.i4
+// 0x01073564: 0x1073564: sw    a3, 180(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 45
+	add
+	ldloc 4
+	stelem.i4
+// 0x01073568: 0x1073568: lw    s6, 240(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 60
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107356c: 0x107356c: lw    s5, 244(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 61
+	add
+	ldelem.i4
+	stloc 16
+// 0x01073570: 0x1073570: lw    s4, 248(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 62
+	add
+	ldelem.i4
+	stloc 15
+// 0x01073574: 0x1073574: lw    s3, 252(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 63
+	add
+	ldelem.i4
+	stloc 14
+// 0x01073578: 0x1073578: sw    v0, 116(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 29
+	add
+	ldloc 6
+	stelem.i4
+// 0x0107357c: 0x107357c: sw    v1, 112(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 28
+	add
+	ldloc 7
+	stelem.i4
+// 0x01073580: 0x1073580: sw    a0, 108(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 27
+	add
+	ldloc.1
+	stelem.i4
+// 0x01073584: 0x1073584: beq   s0, zero, 0x107360c sw    a1, 104(sp)
+	ldloc 9
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 26
+	add
+	ldloc.2
+	stelem.i4
+	brfalse L_107360c
+// --- basic block ---
+// 0x0107358c: 0x107358c: lb    v0, 0(s0)
+	ldloc 9
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x01073590: 0x1073590: sll   zero, zero, 0
+// 0x01073594: 0x1073594: beq   v0, zero, 0x1073610 lui   s8, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc 12
+	brfalse L_1073610
+// --- basic block ---
+// 0x0107359c: 0x107359c: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010735a4: 0x10735a4: sll   v0, v0, 1
+	ldloc 6
+	ldc.i4.1
+	shl
+	stloc 6
+// 0x010735a8: 0x10735a8: addiu a2, v0, 1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc.3
+// 0x010735ac: 0x10735ac: addu  a0, a2, zero
+	ldloc.3
+	stloc.1
+// 0x010735b0: 0x10735b0: jal   0x1000910 sw    a2, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldloc.3
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010735b8: 0x10735b8: lw    a2, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldelem.i4
+	stloc.3
+// 0x010735bc: 0x10735bc: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x010735c0: 0x10735c0: addu  a1, v0, zero
+	ldloc 6
+	stloc.2
+// 0x010735c4: 0x10735c4: jal   0x1067b74 addu  s2, v0, zero
+	ldloc 6
+	stloc 18
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010735cc: 0x10735cc: bne   v0, zero, 0x1073618 addu  s8, s2, zero
+	ldloc 6
+	ldloc 18
+	stloc 12
+	brtrue L_1073618
+// --- basic block ---
+// 0x010735d4: 0x10735d4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010735d8: 0x10735d8: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x010735dc: 0x10735dc: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x010735e0: 0x10735e0: addiu a3, a3, -32128
+	ldloc 4
+	ldc.i4 -32128
+	add
+	stloc 4
+// 0x010735e4: 0x10735e4: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010735e8: 0x10735e8: jal   0x100449c addiu a2, zero, 2205
+	ldc.i4 2205
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010735f0: 0x10735f0: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010735f4: 0x10735f4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x010735f8: 0x10735f8: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x010735fc: 0x10735fc: jal   0x104c158 addiu a1, a1, -32072
+	ldloc.2
+	ldc.i4 -32072
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073604: 0x1073604: j	 0x1073a10 addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 17
+	br L_1073a10
+// --- basic block ---
+L_107360c:
+// 0x0107360c: 0x107360c: lui   s8, 0x10000
+	ldc.i4 65536
+	stloc 12
+L_1073610:
+// 0x01073610: 0x1073610: addiu s8, s8, 18768
+	ldloc 12
+	ldc.i4 18768
+	add
+	stloc 12
+// 0x01073614: 0x1073614: addu  s2, zero, zero
+	ldc.i4.s 0
+	stloc 18
+L_1073618:
+// 0x01073618: 0x1073618: beq   s6, zero, 0x10736a0 lui   s7, 0x10000
+	ldloc 10
+	ldc.i4 65536
+	stloc 11
+	brfalse L_10736a0
+// --- basic block ---
+// 0x01073620: 0x1073620: lb    v0, 0(s6)
+	ldloc 10
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x01073624: 0x1073624: sll   zero, zero, 0
+// 0x01073628: 0x1073628: beq   v0, zero, 0x10736a4 addiu s7, s7, 18768
+	ldloc 6
+	ldloc 11
+	ldc.i4 18768
+	add
+	stloc 11
+	brfalse L_10736a4
+// --- basic block ---
+// 0x01073630: 0x1073630: jal   0x1001b48 addu  a0, s6, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073638: 0x1073638: sll   v0, v0, 1
+	ldloc 6
+	ldc.i4.1
+	shl
+	stloc 6
+// 0x0107363c: 0x107363c: addiu a2, v0, 1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc.3
+// 0x01073640: 0x1073640: addu  a0, a2, zero
+	ldloc.3
+	stloc.1
+// 0x01073644: 0x1073644: jal   0x1000910 sw    a2, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldloc.3
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0107364c: 0x107364c: lw    a2, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldelem.i4
+	stloc.3
+// 0x01073650: 0x1073650: addu  a0, s6, zero
+	ldloc 10
+	stloc.1
+// 0x01073654: 0x1073654: addu  a1, v0, zero
+	ldloc 6
+	stloc.2
+// 0x01073658: 0x1073658: jal   0x1067b74 addu  s1, v0, zero
+	ldloc 6
+	stloc 17
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073660: 0x1073660: bne   v0, zero, 0x10736a8 addu  s7, s1, zero
+	ldloc 6
+	ldloc 17
+	stloc 11
+	brtrue L_10736a8
+// --- basic block ---
+// 0x01073668: 0x1073668: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107366c: 0x107366c: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01073670: 0x1073670: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x01073674: 0x1073674: addiu a3, a3, -32128
+	ldloc 4
+	ldc.i4 -32128
+	add
+	stloc 4
+// 0x01073678: 0x1073678: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0107367c: 0x107367c: jal   0x100449c addiu a2, zero, 2219
+	ldc.i4 2219
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073684: 0x1073684: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01073688: 0x1073688: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107368c: 0x107368c: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x01073690: 0x1073690: jal   0x104c158 addiu a1, a1, -32072
+	ldloc.2
+	ldc.i4 -32072
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073698: 0x1073698: j	 0x10739b8 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_10739b8
+// --- basic block ---
+L_10736a0:
+// 0x010736a0: 0x10736a0: addiu s7, s7, 18768
+	ldloc 11
+	ldc.i4 18768
+	add
+	stloc 11
+L_10736a4:
+// 0x010736a4: 0x10736a4: addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 17
+L_10736a8:
+// 0x010736a8: 0x10736a8: bne   s5, zero, 0x10736b8 sll   zero, zero, 0
+	ldloc 16
+	brtrue L_10736b8
+// --- basic block ---
+// 0x010736b0: 0x10736b0: lui   s5, 0x10000
+	ldc.i4 65536
+	stloc 16
+// 0x010736b4: 0x10736b4: addiu s5, s5, 18768
+	ldloc 16
+	ldc.i4 18768
+	add
+	stloc 16
+L_10736b8:
+// 0x010736b8: 0x10736b8: bne   s4, zero, 0x10736c8 sll   zero, zero, 0
+	ldloc 15
+	brtrue L_10736c8
+// --- basic block ---
+// 0x010736c0: 0x10736c0: lui   s4, 0x10000
+	ldc.i4 65536
+	stloc 15
+// 0x010736c4: 0x10736c4: addiu s4, s4, 18768
+	ldloc 15
+	ldc.i4 18768
+	add
+	stloc 15
+L_10736c8:
+// 0x010736c8: 0x10736c8: bne   s3, zero, 0x10736d8 sll   zero, zero, 0
+	ldloc 14
+	brtrue L_10736d8
+// --- basic block ---
+// 0x010736d0: 0x10736d0: lui   s3, 0x10000
+	ldc.i4 65536
+	stloc 14
+// 0x010736d4: 0x10736d4: addiu s3, s3, 18768
+	ldloc 14
+	ldc.i4 18768
+	add
+	stloc 14
+L_10736d8:
+// 0x010736d8: 0x10736d8: jal   0x1001b48 addu  a0, s8, zero
+	ldloc 12
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010736e0: 0x10736e0: addu  a0, s7, zero
+	ldloc 11
+	stloc.1
+// 0x010736e4: 0x10736e4: jal   0x1001b48 sw    v0, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010736ec: 0x10736ec: addu  a0, s5, zero
+	ldloc 16
+	stloc.1
+// 0x010736f0: 0x10736f0: jal   0x1001b48 sw    v0, 124(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010736f8: 0x10736f8: addu  a0, s4, zero
+	ldloc 15
+	stloc.1
+// 0x010736fc: 0x10736fc: jal   0x1001b48 addu  s6, v0, zero
+	ldloc 6
+	stloc 10
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073704: 0x1073704: addu  a0, s3, zero
+	ldloc 14
+	stloc.1
+// 0x01073708: 0x1073708: jal   0x1001b48 addu  s0, v0, zero
+	ldloc 6
+	stloc 9
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073710: 0x1073710: lw    a2, 260(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 65
+	add
+	ldelem.i4
+	stloc.3
+// 0x01073714: 0x1073714: addiu a0, zero, 13
+	ldc.i4.s 13
+	stloc.1
+// 0x01073718: 0x1073718: mult  a2, a0
+	ldloc.3
+	ldloc.1
+	mul
+	stloc 19
+// 0x0107371c: 0x107371c: lw    a1, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldelem.i4
+	stloc.2
+// 0x01073720: 0x1073720: lw    v1, 124(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
+	add
+	ldelem.i4
+	stloc 7
+// 0x01073724: 0x1073724: mflo  lo
+	ldloc 19
+	stloc.1
+// 0x01073728: 0x1073728: addiu a0, a0, 238
+	ldloc.1
+	ldc.i4 238
+	add
+	stloc.1
+// 0x0107372c: 0x107372c: addu  a1, a0, a1
+	ldloc.1
+	ldloc.2
+	add
+	stloc.2
+// 0x01073730: 0x1073730: addu  v1, a1, v1
+	ldloc.2
+	ldloc 7
+	add
+	stloc 7
+// 0x01073734: 0x1073734: addu  s6, v1, s6
+	ldloc 7
+	ldloc 10
+	add
+	stloc 10
+// 0x01073738: 0x1073738: addu  s6, s6, s0
+	ldloc 10
+	ldloc 9
+	add
+	stloc 10
+// 0x0107373c: 0x107373c: addu  s6, s6, v0
+	ldloc 10
+	ldloc 6
+	add
+	stloc 10
+// 0x01073740: 0x1073740: jal   0x1000910 addu  a0, s6, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073748: 0x1073748: addu  s0, v0, zero
+	ldloc 6
+	stloc 9
+// 0x0107374c: 0x107374c: lw    t5, 212(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 53
+	add
+	ldelem.i4
+	stloc 8
+// 0x01073750: 0x1073750: lw    v0, 220(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 55
+	add
+	ldelem.i4
+	stloc 6
+// 0x01073754: 0x1073754: lw    t1, 4(t5)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 21
+// 0x01073758: 0x1073758: lw    t2, 0(t5)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 22
+// 0x0107375c: 0x107375c: bne   v0, zero, 0x107376c lui   v1, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 7
+	brtrue L_107376c
+// --- basic block ---
+// 0x01073764: 0x1073764: j	 0x1073774 addiu v1, v1, 19096
+	ldloc 7
+	ldc.i4 19096
+	add
+	stloc 7
+	br L_1073774
+// --- basic block ---
+L_107376c:
+// 0x0107376c: 0x107376c: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x01073770: 0x1073770: addiu v1, v1, 12204
+	ldloc 7
+	ldc.i4 12204
+	add
+	stloc 7
+L_1073774:
+// 0x01073774: 0x1073774: lw    v0, 236(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 59
+	add
+	ldelem.i4
+	stloc 6
+// 0x01073778: 0x1073778: sll   zero, zero, 0
+// 0x0107377c: 0x107377c: lw    t0, 4(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 13
+// 0x01073780: 0x1073780: lw    t3, 0(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 23
+// 0x01073784: 0x1073784: lw    v0, 256(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 64
+	add
+	ldelem.i4
+	stloc 6
+// 0x01073788: 0x1073788: sll   zero, zero, 0
+// 0x0107378c: 0x107378c: bne   v0, zero, 0x107379c lui   v0, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 6
+	brtrue L_107379c
+// --- basic block ---
+// 0x01073794: 0x1073794: j	 0x10737a4 addiu v0, v0, 19096
+	ldloc 6
+	ldc.i4 19096
+	add
+	stloc 6
+	br L_10737a4
+// --- basic block ---
+L_107379c:
+// 0x0107379c: 0x107379c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x010737a0: 0x10737a0: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
+	add
+	stloc 6
+L_10737a4:
+// 0x010737a4: 0x10737a4: lw    t5, 176(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 44
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737a8: 0x10737a8: sw    v1, 60(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
+	add
+	ldloc 7
+	stelem.i4
+// 0x010737ac: 0x10737ac: sw    t5, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x010737b0: 0x10737b0: lw    t5, 180(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 45
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737b4: 0x10737b4: lw    v1, 108(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 27
+	add
+	ldelem.i4
+	stloc 7
+// 0x010737b8: 0x10737b8: sw    t5, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
+// 0x010737bc: 0x10737bc: lw    t5, 188(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 47
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737c0: 0x10737c0: lw    a0, 260(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 65
+	add
+	ldelem.i4
+	stloc.1
+// 0x010737c4: 0x10737c4: sw    t5, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x010737c8: 0x10737c8: lw    t5, 192(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 48
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737cc: 0x10737cc: sw    v1, 64(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 7
+	stelem.i4
+// 0x010737d0: 0x10737d0: sw    t5, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 8
+	stelem.i4
+// 0x010737d4: 0x10737d4: lw    t5, 196(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 49
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737d8: 0x10737d8: lw    v1, 232(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 58
+	add
+	ldelem.i4
+	stloc 7
+// 0x010737dc: 0x10737dc: sw    t5, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 8
+	stelem.i4
+// 0x010737e0: 0x10737e0: lw    t5, 116(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 29
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737e4: 0x10737e4: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x010737e8: 0x10737e8: sw    t5, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 8
+	stelem.i4
+// 0x010737ec: 0x10737ec: lw    t5, 112(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 28
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737f0: 0x10737f0: lw    a3, 172(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 43
+	add
+	ldelem.i4
+	stloc 4
+// 0x010737f4: 0x10737f4: sw    t5, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 8
+	stelem.i4
+// 0x010737f8: 0x10737f8: lw    t5, 208(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 52
+	add
+	ldelem.i4
+	stloc 8
+// 0x010737fc: 0x10737fc: sll   t4, a0, 1
+	ldloc.1
+	ldc.i4.1
+	shl
+	stloc 24
+// 0x01073800: 0x1073800: sw    t5, 44(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldloc 8
+	stelem.i4
+// 0x01073804: 0x1073804: lw    t5, 104(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 26
+	add
+	ldelem.i4
+	stloc 8
+// 0x01073808: 0x1073808: addiu a2, a2, -32048
+	ldloc.3
+	ldc.i4 -32048
+	add
+	stloc.3
+// 0x0107380c: 0x107380c: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x01073810: 0x1073810: addu  a1, s6, zero
+	ldloc 10
+	stloc.2
+// 0x01073814: 0x1073814: sw    s8, 56(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc 12
+	stelem.i4
+// 0x01073818: 0x1073818: sw    v1, 72(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
 	add
-	stloc 7
-	br L_1073834
-// --- basic block ---
-L_1073820:
-// 0x01073820: 0x1073820: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 7
-// 0x01073824: 0x1073824: j	 0x1073834 addiu v0, v0, -31804
 	ldloc 7
-	ldc.i4 -31804
+	stelem.i4
+// 0x0107381c: 0x107381c: sw    s7, 84(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldloc 11
+	stelem.i4
+// 0x01073820: 0x1073820: sw    t2, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 22
+	stelem.i4
+// 0x01073824: 0x1073824: sw    t1, 52(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldloc 21
+	stelem.i4
+// 0x01073828: 0x1073828: sw    t5, 68(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107382c: 0x107382c: sw    t3, 76(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldloc 23
+	stelem.i4
+// 0x01073830: 0x1073830: sw    t0, 80(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
+	add
+	ldloc 13
+	stelem.i4
+// 0x01073834: 0x1073834: sw    v0, 88(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
+	add
+	ldloc 6
+	stelem.i4
+// 0x01073838: 0x1073838: sw    t4, 92(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
 	add
+	ldloc 24
+	stelem.i4
+// 0x0107383c: 0x107383c: jal   0x1000f9c addu  s7, zero, zero
+	ldc.i4.s 0
+	stloc 11
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	br L_1073834
+	stloc 6
 // --- basic block ---
-L_107382c:
-// 0x0107382c: 0x107382c: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x01073830: 0x1073830: addiu v1, v1, 18500
+// 0x01073844: 0x1073844: lw    v1, 264(sp)
 	ldloc 5
-	ldc.i4 18500
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 66
 	add
-	stloc 5
-L_1073834:
-// 0x01073834: 0x1073834: sltiu a1, a3, 3
-	ldloc 4
-	ldc.i4.3
-	clt.un
-	stloc.2
-// 0x01073838: 0x1073838: bne   a1, zero, 0x107384c lui   a1, 0x20000
-	ldloc.2
-	ldc.i4 131072
-	stloc.2
-	brtrue L_107384c
+	ldelem.i4
+	stloc 7
+// 0x01073848: 0x1073848: lw    s8, 268(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 67
+	add
+	ldelem.i4
+	stloc 12
+// 0x0107384c: 0x107384c: j	 0x10738a8 sll   zero, zero, 0
+	br L_10738a8
 // --- basic block ---
-// 0x01073840: 0x1073840: lui   t1, 0x10000
-	ldc.i4 65536
-	stloc 10
-// 0x01073844: 0x1073844: j	 0x107385c addiu t1, t1, 18500
-	ldloc 10
-	ldc.i4 18500
+L_1073854:
+// 0x01073854: 0x1073854: jal   0x1001b48 sw    v1, 124(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
 	add
-	stloc 10
-	br L_107385c
+	ldloc 7
+	stelem.i4
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
 // --- basic block ---
-L_107384c:
-// 0x0107384c: 0x107384c: sll   a3, a3, 2
-	ldloc 4
+// 0x0107385c: 0x107385c: lw    v1, 124(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
-	shl
-	stloc 4
-// 0x01073850: 0x1073850: addiu a1, a1, 28764
-	ldloc.2
-	ldc.i4 28764
+	shr.un
+	ldc.i4.s 31
 	add
+	ldelem.i4
+	stloc 7
+// 0x01073860: 0x1073860: lw    t0, 0(s8)
+	ldloc 5
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 13
+// 0x01073864: 0x1073864: subu  a1, s6, v0
+	ldloc 10
+	ldloc 6
+	sub
 	stloc.2
-// 0x01073854: 0x1073854: addu  a3, a3, a1
-	ldloc 4
-	ldloc.2
+// 0x01073868: 0x1073868: addu  a0, s0, v0
+	ldloc 9
+	ldloc 6
 	add
+	stloc.1
+// 0x0107386c: 0x107386c: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x01073870: 0x1073870: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 6
+// 0x01073874: 0x1073874: lw    a3, 0(v1)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 4
-// 0x01073858: 0x1073858: lw    t1, 0(a3)
+// 0x01073878: 0x1073878: addiu a2, a2, -31948
+	ldloc.3
+	ldc.i4 -31948
+	add
+	stloc.3
+// 0x0107387c: 0x107387c: addiu s7, s7, 1
+	ldloc 11
+	ldc.i4.1
+	add
+	stloc 11
+// 0x01073880: 0x1073880: addiu s8, s8, 4
+	ldloc 12
+	ldc.i4.4
+	add
+	stloc 12
+// 0x01073884: 0x1073884: addiu v1, v1, 4
+	ldloc 7
+	ldc.i4.4
+	add
+	stloc 7
+// 0x01073888: 0x1073888: beq   t0, zero, 0x1073898 addiu v0, v0, 19096
+	ldloc 13
 	ldloc 6
+	ldc.i4 19096
+	add
+	stloc 6
+	brfalse L_1073898
+// --- basic block ---
+// 0x01073890: 0x1073890: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x01073894: 0x1073894: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
+	add
+	stloc 6
+L_1073898:
+// 0x01073898: 0x1073898: sw    v1, 124(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
+	add
+	ldloc 7
+	stelem.i4
+// 0x0107389c: 0x107389c: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010738a4: 0x10738a4: lw    v1, 124(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 31
+	add
+	ldelem.i4
+	stloc 7
+L_10738a8:
+// 0x010738a8: 0x10738a8: lw    a1, 260(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 65
+	add
 	ldelem.i4
-	stloc 10
-L_107385c:
-// 0x0107385c: 0x107385c: sltiu a1, a0, 3
-	ldloc.1
-	ldc.i4.3
-	clt.un
 	stloc.2
-// 0x01073860: 0x1073860: bne   a1, zero, 0x1073874 lui   a1, 0x20000
+// 0x010738ac: 0x10738ac: sll   zero, zero, 0
+// 0x010738b0: 0x10738b0: slt   v0, s7, a1
+	ldloc 11
 	ldloc.2
-	ldc.i4 131072
-	stloc.2
-	brtrue L_1073874
-// --- basic block ---
-// 0x01073868: 0x1073868: lui   t0, 0x10000
-	ldc.i4 65536
-	stloc 9
-// 0x0107386c: 0x107386c: j	 0x1073884 addiu t0, t0, 18500
+	clt
+	stloc 6
+// 0x010738b4: 0x10738b4: bne   v0, zero, 0x1073854 addu  a0, s0, zero
+	ldloc 6
 	ldloc 9
-	ldc.i4 18500
-	add
-	stloc 9
-	br L_1073884
+	stloc.1
+	brtrue L_1073854
 // --- basic block ---
-L_1073874:
-// 0x01073874: 0x1073874: sll   a0, a0, 2
-	ldloc.1
-	ldc.i4.2
-	shl
+// 0x010738bc: 0x10738bc: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+// 0x010738c0: 0x10738c0: cibyl_sysc_arg 0x3
+	ldloc 7
+// 0x010738c4: 0x10738c4: cibyl_sysc 0x2120
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc 6
+// 0x010738c8: 0x10738c8: addu  v1, v0, zero
+	ldloc 6
+	stloc 7
+// 0x010738cc: 0x10738cc: addiu a0, sp, 96
+	ldloc.0
+	ldc.i4.s 96
+	add
 	stloc.1
-// 0x01073878: 0x1073878: addiu a1, a1, 28776
+// 0x010738d0: 0x10738d0: jal   0x10c3b98 sw    v1, 96(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
+	ldloc 7
+	stelem.i4
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 28776
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl145::localtime_10c3b98(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010738d8: 0x10738d8: lw    a1, 8(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
 	add
+	ldelem.i4
 	stloc.2
-// 0x0107387c: 0x107387c: addu  a0, a0, a1
-	ldloc.1
+// 0x010738dc: 0x10738dc: sll   zero, zero, 0
+// 0x010738e0: 0x10738e0: sw    a1, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
 	ldloc.2
+	stelem.i4
+// 0x010738e4: 0x10738e4: lw    s7, 0(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 11
+// 0x010738e8: 0x10738e8: lw    s8, 4(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
+	ldelem.i4
+	stloc 12
+// 0x010738ec: 0x10738ec: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x01073880: 0x1073880: lw    t0, 0(a0)
-	ldloc 6
 	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010738f4: 0x10738f4: lw    v1, 280(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 70
+	add
 	ldelem.i4
-	stloc 9
-L_1073884:
-// 0x01073884: 0x1073884: lw    a2, 68(sp)
-	ldloc 6
+	stloc 7
+// 0x010738f8: 0x10738f8: lw    a1, 120(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 30
 	add
 	ldelem.i4
-	stloc.3
-// 0x01073888: 0x1073888: addu  a3, t2, zero
-	ldloc 8
-	stloc 4
-// 0x0107388c: 0x107388c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073890: 0x1073890: lui   t2, 0x20000
+	stloc.2
+// 0x010738fc: 0x10738fc: bne   v1, zero, 0x107390c lui   v1, 0x20000
+	ldloc 7
 	ldc.i4 131072
-	stloc 8
-// 0x01073894: 0x1073894: addiu t2, t2, -31796
-	ldloc 8
-	ldc.i4 -31796
+	stloc 7
+	brtrue L_107390c
+// --- basic block ---
+// 0x01073904: 0x1073904: j	 0x1073914 addiu v1, v1, 19096
+	ldloc 7
+	ldc.i4 19096
 	add
-	stloc 8
-// 0x01073898: 0x1073898: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	stloc 7
+	br L_1073914
+// --- basic block ---
+L_107390c:
+// 0x0107390c: 0x107390c: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x01073910: 0x1073910: addiu v1, v1, 12204
+	ldloc 7
+	ldc.i4 12204
+	add
+	stloc 7
+L_1073914:
+// 0x01073914: 0x1073914: addiu t0, zero, 3600
+	ldc.i4 3600
+	stloc 13
+// 0x01073918: 0x1073918: mult  a1, t0
+	ldloc.2
+	ldloc 13
+	mul
+	stloc 19
+// 0x0107391c: 0x107391c: addu  a0, s0, v0
+	ldloc 9
+	ldloc 6
 	add
 	stloc.1
-// 0x0107389c: 0x107389c: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x010738a0: 0x10738a0: sw    t2, 16(sp)
+// 0x01073920: 0x1073920: subu  a1, s6, v0
+	ldloc 10
 	ldloc 6
+	sub
+	stloc.2
+// 0x01073924: 0x1073924: lw    v0, 276(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 69
 	add
-	ldloc 8
-	stelem.i4
-// 0x010738a4: 0x10738a4: sw    v1, 20(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 6
+// 0x01073928: 0x1073928: lw    a3, 272(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 68
 	add
+	ldelem.i4
+	stloc 4
+// 0x0107392c: 0x107392c: sw    v0, 32(sp)
 	ldloc 5
-	stelem.i4
-// 0x010738a8: 0x10738a8: sw    v0, 24(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.8
 	add
-	ldloc 7
-	stelem.i4
-// 0x010738ac: 0x10738ac: sw    t1, 28(sp)
 	ldloc 6
+	stelem.i4
+// 0x01073930: 0x1073930: addiu v0, zero, 60
+	ldc.i4.s 60
+	stloc 6
+// 0x01073934: 0x1073934: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x01073938: 0x1073938: addiu a2, a2, -31964
+	ldloc.3
+	ldc.i4 -31964
+	add
+	stloc.3
+// 0x0107393c: 0x107393c: sw    v1, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 9
 	add
-	ldloc 10
+	ldloc 7
 	stelem.i4
-// 0x010738b0: 0x10738b0: jal   0x1072cd8 sw    t0, 32(sp)
-	ldloc 6
+// 0x01073940: 0x1073940: sw    s5, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 16
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
-	stloc 7
-// --- basic block ---
-// 0x010738b8: 0x10738b8: lw    ra, 44(sp)
-// 0x010738bc: 0x10738bc: sll   zero, zero, 0
-// 0x010738c0: 0x10738c0: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01073944: 0x1073944: sw    s4, 20(sp)
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 RTNet_ReportAbuse_10738c8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010738c8: 0x10738c8: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x010738cc: 0x10738cc: addu  v0, a0, zero
-	ldloc.1
-	stloc 5
-// 0x010738d0: 0x10738d0: sw    a2, 24(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
-	ldloc.3
+	ldloc 15
 	stelem.i4
-// 0x010738d4: 0x10738d4: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x010738d8: 0x10738d8: addu  a2, a3, zero
-	ldloc 4
-	stloc.3
-// 0x010738dc: 0x10738dc: addu  a3, v0, zero
+// 0x01073948: 0x1073948: sw    s3, 24(sp)
 	ldloc 5
-	stloc 4
-// 0x010738e0: 0x10738e0: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x010738e4: 0x10738e4: sw    a1, 20(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc.2
+	ldloc 14
 	stelem.i4
-// 0x010738e8: 0x10738e8: addiu v0, v0, -31664
-	ldloc 5
-	ldc.i4 -31664
+// 0x0107394c: 0x107394c: mflo  lo
+	ldloc 19
+	stloc 13
+// 0x01073950: 0x1073950: sll   zero, zero, 0
+// 0x01073954: 0x1073954: sll   zero, zero, 0
+// 0x01073958: 0x1073958: mult  s8, v0
+	ldloc 12
+	ldloc 6
+	mul
+	stloc 19
+// 0x0107395c: 0x107395c: mflo  lo
+	ldloc 19
+	stloc 12
+// 0x01073960: 0x1073960: addu  t0, t0, s8
+	ldloc 13
+	ldloc 12
 	add
-	stloc 5
-// 0x010738ec: 0x10738ec: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	stloc 13
+// 0x01073964: 0x1073964: addu  s7, t0, s7
+	ldloc 13
+	ldloc 11
 	add
-	stloc.1
-// 0x010738f0: 0x10738f0: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x010738f4: 0x10738f4: sw    ra, 36(sp)
-// 0x010738f8: 0x10738f8: jal   0x1072cd8 sw    v0, 16(sp)
-	ldloc 6
+	stloc 11
+// 0x01073968: 0x1073968: jal   0x1000f9c sw    s7, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01073900: 0x1073900: lw    ra, 36(sp)
-// 0x01073904: 0x1073904: sll   zero, zero, 0
-// 0x01073908: 0x1073908: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+// 0x01073970: 0x1073970: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01073974: 0x1073974: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_CollectCustomBonus_1073910(int32,int32,int32,int32,int32)
-{
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s0,int32 s1,int32 ra)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register t0
-// local  9 is register s0
-// local 10 is register s1
-// local  0 is register sp
-// local 11 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	stloc.2
+// 0x01073978: 0x1073978: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0107397c: 0x107397c: addiu a2, zero, 2275
+	ldc.i4 2275
+	stloc.3
+// 0x01073980: 0x1073980: jal   0x100449c addu  a3, s0, zero
+	ldloc 9
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 11
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01073910: 0x1073910: addiu sp, sp, -176
-	ldloc.0
-	ldc.i4 -176
-	add
-	stloc.0
-// 0x01073914: 0x1073914: sw    s1, 168(sp)
+// 0x01073988: 0x1073988: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0107398c: 0x107398c: lw    a2, 284(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.s 71
 	add
-	ldloc 10
-	stelem.i4
-// 0x01073918: 0x1073918: sw    s0, 164(sp)
+	ldelem.i4
+	stloc.3
+// 0x01073990: 0x1073990: lw    a3, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4.s 42
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107391c: 0x107391c: addu  s1, a0, zero
+	ldelem.i4
+	stloc 4
+// 0x01073994: 0x1073994: addiu a0, a0, 15252
 	ldloc.1
-	stloc 10
-// 0x01073920: 0x1073920: addu  s0, a1, zero
-	ldloc.2
-	stloc 9
-// 0x01073924: 0x1073924: addiu a0, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073928: 0x1073928: sw    a2, 152(sp)
+// 0x01073998: 0x1073998: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x0107399c: 0x107399c: jal   0x10732fc sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4.4
 	add
-	ldloc.3
+	ldloc 9
 	stelem.i4
-// 0x0107392c: 0x107392c: sw    a3, 156(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010739a4: 0x10739a4: beq   s0, zero, 0x10739b8 addu  a0, s0, zero
+	ldloc 9
+	ldloc 9
+	stloc.1
+	brfalse L_10739b8
+// --- basic block ---
+// 0x010739ac: 0x10739ac: jal   0x1000930 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 39
+	ldc.i4.s 30
 	add
-	ldloc 4
+	ldloc 6
 	stelem.i4
-// 0x01073930: 0x1073930: sw    ra, 172(sp)
-// 0x01073934: 0x1073934: jal   0x106e2c4 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_At_106e2c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0107393c: 0x107393c: lw    a2, 152(sp)
+// 0x010739b4: 0x10739b4: lw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4.s 30
 	add
 	ldelem.i4
-	stloc.3
-// 0x01073940: 0x1073940: lw    a3, 156(sp)
+	stloc 6
+L_10739b8:
+// 0x010739b8: 0x10739b8: beq   s1, zero, 0x10739cc addu  a0, s1, zero
+	ldloc 17
+	ldloc 17
+	stloc.1
+	brfalse L_10739cc
+// --- basic block ---
+// 0x010739c0: 0x10739c0: jal   0x1000930 sw    v0, 120(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 39
+	ldc.i4.s 30
 	add
-	ldelem.i4
-	stloc 4
-// 0x01073944: 0x1073944: bne   v0, zero, 0x1073950 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1073950
-// --- basic block ---
-// 0x0107394c: 0x107394c: sb    zero, 40(sp)
+	stelem.i4
 	ldloc.0
-	ldc.i4.s 40
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1073950:
-// 0x01073950: 0x1073950: bne   a2, zero, 0x1073960 lui   v1, 0x20000
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	ldc.i4 131072
-	stloc 7
-	brtrue L_1073960
-// --- basic block ---
-// 0x01073958: 0x1073958: j	 0x1073968 addiu v1, v1, 18636
-	ldloc 7
-	ldc.i4 18636
-	add
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	br L_1073968
+	stloc 6
 // --- basic block ---
-L_1073960:
-// 0x01073960: 0x1073960: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x01073964: 0x1073964: addiu v1, v1, 12208
-	ldloc 7
-	ldc.i4 12208
+// 0x010739c8: 0x10739c8: lw    v0, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
 	add
-	stloc 7
-L_1073968:
-// 0x01073968: 0x1073968: bne   a3, zero, 0x1073978 lui   v0, 0x20000
-	ldloc 4
-	ldc.i4 131072
+	ldelem.i4
 	stloc 6
-	brtrue L_1073978
+L_10739cc:
+// 0x010739cc: 0x10739cc: beq   s2, zero, 0x10739e0 addu  a0, s2, zero
+	ldloc 18
+	ldloc 18
+	stloc.1
+	brfalse L_10739e0
 // --- basic block ---
-// 0x01073970: 0x1073970: j	 0x1073980 addiu v0, v0, 18636
-	ldloc 6
-	ldc.i4 18636
+// 0x010739d4: 0x10739d4: jal   0x1000930 sw    v0, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
 	add
+	ldloc 6
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	br L_1073980
 // --- basic block ---
-L_1073978:
-// 0x01073978: 0x1073978: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x0107397c: 0x107397c: addiu v0, v0, 12208
-	ldloc 6
-	ldc.i4 12208
+// 0x010739dc: 0x10739dc: lw    v0, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
 	add
+	ldelem.i4
 	stloc 6
-L_1073980:
-// 0x01073980: 0x1073980: lui   t0, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x01073984: 0x1073984: lw    a2, 192(sp)
+L_10739e0:
+// 0x010739e0: 0x10739e0: lw    ra, 164(sp)
+// 0x010739e4: 0x10739e4: lw    s8, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 48
+	ldc.i4.s 40
 	add
 	ldelem.i4
-	stloc.3
-// 0x01073988: 0x1073988: addiu t0, t0, -31644
-	ldloc 8
-	ldc.i4 -31644
-	add
-	stloc 8
-// 0x0107398c: 0x107398c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073990: 0x1073990: sw    t0, 16(sp)
+	stloc 12
+// 0x010739e8: 0x10739e8: lw    s7, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 39
 	add
-	ldloc 8
-	stelem.i4
-// 0x01073994: 0x1073994: addu  a3, s1, zero
-	ldloc 10
-	stloc 4
-// 0x01073998: 0x1073998: addiu t0, sp, 40
+	ldelem.i4
+	stloc 11
+// 0x010739ec: 0x10739ec: lw    s6, 152(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 8
-// 0x0107399c: 0x107399c: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
 	add
-	stloc.1
-// 0x010739a0: 0x10739a0: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x010739a4: 0x10739a4: sw    s0, 24(sp)
+	ldelem.i4
+	stloc 10
+// 0x010739f0: 0x10739f0: lw    s5, 148(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 37
 	add
-	ldloc 9
-	stelem.i4
-// 0x010739a8: 0x10739a8: sw    t0, 20(sp)
+	ldelem.i4
+	stloc 16
+// 0x010739f4: 0x10739f4: lw    s4, 144(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 36
 	add
-	ldloc 8
-	stelem.i4
-// 0x010739ac: 0x10739ac: sw    v1, 28(sp)
+	ldelem.i4
+	stloc 15
+// 0x010739f8: 0x10739f8: lw    s3, 140(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 35
 	add
-	ldloc 7
-	stelem.i4
-// 0x010739b0: 0x10739b0: jal   0x1072cd8 sw    v0, 32(sp)
+	ldelem.i4
+	stloc 14
+// 0x010739fc: 0x10739fc: lw    s2, 136(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 34
 	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010739b8: 0x10739b8: lw    ra, 172(sp)
-// 0x010739bc: 0x10739bc: lw    s1, 168(sp)
+	ldelem.i4
+	stloc 18
+// 0x01073a00: 0x1073a00: lw    s1, 132(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.s 33
 	add
 	ldelem.i4
-	stloc 10
-// 0x010739c0: 0x10739c0: lw    s0, 164(sp)
+	stloc 17
+// 0x01073a04: 0x1073a04: lw    s0, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4.s 32
 	add
 	ldelem.i4
 	stloc 9
-// 0x010739c4: 0x10739c4: jr    ra addiu sp, sp, 176
+// 0x01073a08: 0x1073a08: jr    ra addiu sp, sp, 168
 	ldloc.0
-	ldc.i4 176
+	ldc.i4 168
 	add
 	stloc.0
 	br __CIBYL_function_return
+// --- basic block ---
+L_1073a10:
+// 0x01073a10: 0x1073a10: j	 0x10739b8 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_10739b8
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_CollectBonus_10739cc(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_TripServer_FindTrip_1073a90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 t0,int32 s1,int32 s2,int32 ra)
 
 // local  6 is register v0
 // local  7 is register v1
@@ -5472,8 +5839,8 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register t0
-// local  9 is register s0
+// local  9 is register t0
+// local  8 is register s0
 // local 10 is register s1
 // local 11 is register s2
 // local  0 is register sp
@@ -5493,10 +5860,10 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
 	stloc 11
@@ -5508,228 +5875,179 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010739cc: 0x10739cc: addiu sp, sp, -176
+// 0x01073a90: 0x1073a90: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4 -176
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010739d0: 0x10739d0: sw    s2, 168(sp)
+// 0x01073a94: 0x1073a94: lw    v1, 4(a1)
+	ldloc 5
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 7
+// 0x01073a98: 0x1073a98: lw    v0, 0(a1)
+	ldloc 5
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 6
+// 0x01073a9c: 0x1073a9c: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.8
+	add
+	ldloc 8
+	stelem.i4
+// 0x01073aa0: 0x1073aa0: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01073aa4: 0x1073aa4: addu  s0, a1, zero
+	ldloc.2
+	stloc 8
+// 0x01073aa8: 0x1073aa8: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01073aac: 0x1073aac: sw    s2, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
 	ldloc 11
 	stelem.i4
-// 0x010739d4: 0x10739d4: sw    s1, 164(sp)
+// 0x01073ab0: 0x1073ab0: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4.s 9
 	add
 	ldloc 10
 	stelem.i4
-// 0x010739d8: 0x10739d8: addu  s2, a0, zero
-	ldloc.1
+// 0x01073ab4: 0x1073ab4: addu  s2, a2, zero
+	ldloc.3
 	stloc 11
-// 0x010739dc: 0x10739dc: addu  s1, a1, zero
-	ldloc.2
+// 0x01073ab8: 0x1073ab8: addu  s1, a0, zero
+	ldloc.1
 	stloc 10
-// 0x010739e0: 0x10739e0: addiu a0, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+// 0x01073abc: 0x1073abc: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	stloc.1
-// 0x010739e4: 0x10739e4: addu  a1, zero, zero
-	ldc.i4.s 0
 	stloc.2
-// 0x010739e8: 0x10739e8: sw    s0, 160(sp)
+// 0x01073ac0: 0x1073ac0: addiu a3, a3, -31840
+	ldloc 4
+	ldc.i4 -31840
+	add
+	stloc 4
+// 0x01073ac4: 0x1073ac4: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01073ac8: 0x1073ac8: addiu a2, zero, 2042
+	ldc.i4 2042
+	stloc.3
+// 0x01073acc: 0x1073acc: sw    ra, 44(sp)
+// 0x01073ad0: 0x1073ad0: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 7
 	stelem.i4
-// 0x010739ec: 0x10739ec: sw    a3, 152(sp)
+// 0x01073ad4: 0x1073ad4: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4.5
 	add
-	ldloc 4
+	ldloc 6
 	stelem.i4
-// 0x010739f0: 0x10739f0: sw    ra, 172(sp)
-// 0x010739f4: 0x10739f4: jal   0x106e2c4 addu  s0, a2, zero
-	ldloc.3
-	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl82::SendMessage_At_106e2c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010739fc: 0x10739fc: lw    a3, 152(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 38
-	add
-	ldelem.i4
-	stloc 4
-// 0x01073a00: 0x1073a00: sll   zero, zero, 0
-// 0x01073a04: 0x1073a04: bne   a3, zero, 0x1073a14 lui   v1, 0x20000
-	ldloc 4
-	ldc.i4 131072
-	stloc 7
-	brtrue L_1073a14
-// --- basic block ---
-// 0x01073a0c: 0x1073a0c: j	 0x1073a1c addiu v1, v1, 18636
-	ldloc 7
-	ldc.i4 18636
-	add
-	stloc 7
-	br L_1073a1c
-// --- basic block ---
-L_1073a14:
-// 0x01073a14: 0x1073a14: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x01073a18: 0x1073a18: addiu v1, v1, 12208
-	ldloc 7
-	ldc.i4 12208
-	add
-	stloc 7
-L_1073a1c:
-// 0x01073a1c: 0x1073a1c: lw    v0, 192(sp)
+// 0x01073adc: 0x1073adc: lw    v0, 4(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 48
+	ldc.i4.1
 	add
 	ldelem.i4
 	stloc 6
-// 0x01073a20: 0x1073a20: sll   zero, zero, 0
-// 0x01073a24: 0x1073a24: bne   v0, zero, 0x1073a34 lui   v0, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brtrue L_1073a34
-// --- basic block ---
-// 0x01073a2c: 0x1073a2c: j	 0x1073a3c addiu v0, v0, 18636
-	ldloc 6
-	ldc.i4 18636
-	add
-	stloc 6
-	br L_1073a3c
-// --- basic block ---
-L_1073a34:
-// 0x01073a34: 0x1073a34: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x01073a38: 0x1073a38: addiu v0, v0, 12208
-	ldloc 6
-	ldc.i4 12208
-	add
-	stloc 6
-L_1073a3c:
-// 0x01073a3c: 0x1073a3c: lui   t0, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x01073a40: 0x1073a40: lw    a2, 196(sp)
+// 0x01073ae0: 0x1073ae0: lw    v1, 0(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 49
-	add
 	ldelem.i4
-	stloc.3
-// 0x01073a44: 0x1073a44: addiu t0, t0, -31612
-	ldloc 8
-	ldc.i4 -31612
-	add
-	stloc 8
-// 0x01073a48: 0x1073a48: lui   a0, 0x0
+	stloc 7
+// 0x01073ae4: 0x1073ae4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01073a4c: 0x1073a4c: sw    t0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-// 0x01073a50: 0x1073a50: addu  a3, s2, zero
+// 0x01073ae8: 0x1073ae8: lui   t0, 0x20000
+	ldc.i4 131072
+	stloc 9
+// 0x01073aec: 0x1073aec: addu  a2, s2, zero
 	ldloc 11
+	stloc.3
+// 0x01073af0: 0x1073af0: addu  a3, s1, zero
+	ldloc 10
 	stloc 4
-// 0x01073a54: 0x1073a54: addiu t0, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+// 0x01073af4: 0x1073af4: addiu t0, t0, -31792
+	ldloc 9
+	ldc.i4 -31792
 	add
-	stloc 8
-// 0x01073a58: 0x1073a58: addiu a0, a0, 15252
+	stloc 9
+// 0x01073af8: 0x1073af8: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073a5c: 0x1073a5c: addiu a1, zero, 36
+// 0x01073afc: 0x1073afc: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01073a60: 0x1073a60: sw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-// 0x01073a64: 0x1073a64: sw    s0, 28(sp)
+// 0x01073b00: 0x1073b00: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
 	ldloc 9
 	stelem.i4
-// 0x01073a68: 0x1073a68: sw    t0, 20(sp)
+// 0x01073b04: 0x1073b04: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 8
-	stelem.i4
-// 0x01073a6c: 0x1073a6c: sw    v1, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
 	ldloc 7
 	stelem.i4
-// 0x01073a70: 0x1073a70: jal   0x1072cd8 sw    v0, 36(sp)
+// 0x01073b08: 0x1073b08: jal   0x10732fc sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.6
 	add
 	ldloc 6
 	stelem.i4
@@ -5738,42 +6056,42 @@ L_1073a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01073a78: 0x1073a78: lw    ra, 172(sp)
-// 0x01073a7c: 0x1073a7c: lw    s2, 168(sp)
+// 0x01073b10: 0x1073b10: lw    ra, 44(sp)
+// 0x01073b14: 0x1073b14: lw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.s 10
 	add
 	ldelem.i4
 	stloc 11
-// 0x01073a80: 0x1073a80: lw    s1, 164(sp)
+// 0x01073b18: 0x1073b18: lw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4.s 9
 	add
 	ldelem.i4
 	stloc 10
-// 0x01073a84: 0x1073a84: lw    s0, 160(sp)
+// 0x01073b1c: 0x1073b1c: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 9
-// 0x01073a88: 0x1073a88: jr    ra addiu sp, sp, 176
+	stloc 8
+// 0x01073b20: 0x1073b20: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4 176
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -5783,118 +6101,25 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_GeneralPacket_1073a90(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01073a90: 0x1073a90: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x01073a94: 0x1073a94: addu  a3, a0, zero
-	ldloc.1
-	stloc 4
-// 0x01073a98: 0x1073a98: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073a9c: 0x1073a9c: sw    a1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc.2
-	stelem.i4
-// 0x01073aa0: 0x1073aa0: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x01073aa4: 0x1073aa4: sw    ra, 28(sp)
-// 0x01073aa8: 0x1073aa8: jal   0x1072cd8 addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x01073ab0: 0x1073ab0: lw    ra, 28(sp)
-// 0x01073ab4: 0x1073ab4: sll   zero, zero, 0
-// 0x01073ab8: 0x1073ab8: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 RTNet_UpdateProfile_1073ac0(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_TripServer_DeletePOI_1073b28(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local 12 is register s4
 // local  0 is register sp
-// local 13 is register ra
-// local  5 is register mem
+// local  8 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5903,154 +6128,51 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01073ac0: 0x1073ac0: addiu sp, sp, -64
-	ldloc.0
-	ldc.i4.s -64
-	add
-	stloc.0
-// 0x01073ac4: 0x1073ac4: sw    s3, 52(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 11
-	stelem.i4
-// 0x01073ac8: 0x1073ac8: sw    s2, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 10
-	stelem.i4
-// 0x01073acc: 0x1073acc: lw    s3, 80(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldelem.i4
-	stloc 11
-// 0x01073ad0: 0x1073ad0: addu  s2, a1, zero
-	ldloc.2
-	stloc 10
-// 0x01073ad4: 0x1073ad4: sw    s0, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 8
-	stelem.i4
-// 0x01073ad8: 0x1073ad8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01073adc: 0x1073adc: addu  s0, a3, zero
-	ldloc 4
 	stloc 8
-// 0x01073ae0: 0x1073ae0: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01073ae4: 0x1073ae4: sw    s4, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 12
-	stelem.i4
-// 0x01073ae8: 0x1073ae8: sw    s1, 44(sp)
-	ldloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01073b28: 0x1073b28: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	ldc.i4.s -32
 	add
-	ldloc 9
-	stelem.i4
-// 0x01073aec: 0x1073aec: addu  s4, a0, zero
+	stloc.0
+// 0x01073b2c: 0x1073b2c: sw    ra, 28(sp)
+// 0x01073b30: 0x1073b30: addu  v0, a1, zero
+	ldloc.2
+	stloc 6
+// 0x01073b34: 0x1073b34: bne   a1, zero, 0x1073b60 addu  a3, a0, zero
+	ldloc.2
 	ldloc.1
-	stloc 12
-// 0x01073af0: 0x1073af0: addu  s1, a2, zero
-	ldloc.3
-	stloc 9
-// 0x01073af4: 0x1073af4: addiu a1, a1, 32252
+	stloc 4
+	brtrue L_1073b60
+// --- basic block ---
+// 0x01073b3c: 0x1073b3c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01073b40: 0x1073b40: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01073b44: 0x1073b44: addiu a1, a1, 32716
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x01073af8: 0x1073af8: addiu a3, a3, -31584
+// 0x01073b48: 0x1073b48: addiu a3, a3, -31748
 	ldloc 4
-	ldc.i4 -31584
+	ldc.i4 -31748
 	add
 	stloc 4
-// 0x01073afc: 0x1073afc: addiu a0, zero, 1
-	ldc.i4.1
+// 0x01073b4c: 0x1073b4c: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01073b00: 0x1073b00: addiu a2, zero, 1566
-	ldc.i4 1566
+// 0x01073b50: 0x1073b50: jal   0x100449c addiu a2, zero, 2021
+	ldc.i4 2021
 	stloc.3
-// 0x01073b04: 0x1073b04: sw    ra, 60(sp)
-// 0x01073b08: 0x1073b08: sw    s2, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 10
-	stelem.i4
-// 0x01073b0c: 0x1073b0c: sw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
-// 0x01073b10: 0x1073b10: sw    s0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x01073b14: 0x1073b14: jal   0x100449c sw    s3, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 11
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6058,105 +6180,49 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073b1c: 0x1073b1c: bne   s3, zero, 0x1073b2c lui   v0, 0x10000
-	ldloc 11
-	ldc.i4 65536
+	stloc 5
 	stloc 6
-	brtrue L_1073b2c
 // --- basic block ---
-// 0x01073b24: 0x1073b24: j	 0x1073b34 addiu v0, v0, -25260
-	ldloc 6
-	ldc.i4 -25260
-	add
+// 0x01073b58: 0x1073b58: j	 0x1073b80 addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 6
-	br L_1073b34
+	br L_1073b80
 // --- basic block ---
-L_1073b2c:
-// 0x01073b2c: 0x1073b2c: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x01073b30: 0x1073b30: addiu v0, v0, 32112
-	ldloc 6
-	ldc.i4 32112
-	add
-	stloc 6
-L_1073b34:
-// 0x01073b34: 0x1073b34: lw    a2, 84(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc.3
-// 0x01073b38: 0x1073b38: lui   a0, 0x0
+L_1073b60:
+// 0x01073b60: 0x1073b60: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01073b3c: 0x1073b3c: lui   v1, 0x20000
+// 0x01073b64: 0x1073b64: lui   v1, 0x20000
 	ldc.i4 131072
-	stloc 7
-// 0x01073b40: 0x1073b40: addu  a3, s4, zero
-	ldloc 12
-	stloc 4
-// 0x01073b44: 0x1073b44: addiu v1, v1, -31508
-	ldloc 7
-	ldc.i4 -31508
+	stloc 5
+// 0x01073b68: 0x1073b68: addiu v1, v1, -31708
+	ldloc 5
+	ldc.i4 -31708
 	add
-	stloc 7
-// 0x01073b48: 0x1073b48: addiu a0, a0, 15252
+	stloc 5
+// 0x01073b6c: 0x1073b6c: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073b4c: 0x1073b4c: addiu a1, zero, 36
+// 0x01073b70: 0x1073b70: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01073b50: 0x1073b50: sw    s2, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 10
-	stelem.i4
-// 0x01073b54: 0x1073b54: sw    s1, 24(sp)
-	ldloc 5
+// 0x01073b74: 0x1073b74: sw    v1, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
-// 0x01073b58: 0x1073b58: sw    s0, 28(sp)
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 8
 	stelem.i4
-// 0x01073b5c: 0x1073b5c: sw    v1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+// 0x01073b78: 0x1073b78: jal   0x10732fc sw    v0, 20(sp)
 	ldloc 7
-	stelem.i4
-// 0x01073b60: 0x1073b60: jal   0x1072cd8 sw    v0, 32(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
 	ldloc 6
 	stelem.i4
@@ -6165,70 +6231,143 @@ L_1073b34:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x01073b68: 0x1073b68: lw    ra, 60(sp)
-// 0x01073b6c: 0x1073b6c: lw    s4, 56(sp)
-	ldloc 5
+L_1073b80:
+// 0x01073b80: 0x1073b80: lw    ra, 28(sp)
+// 0x01073b84: 0x1073b84: sll   zero, zero, 0
+// 0x01073b88: 0x1073b88: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 12
-// 0x01073b70: 0x1073b70: lw    s3, 52(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTNet_TripServer_GetNumPOIs_1073b90(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01073b90: 0x1073b90: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01073b94: 0x1073b94: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
+	ldc.i4.s -32
 	add
-	ldelem.i4
-	stloc 11
-// 0x01073b74: 0x1073b74: lw    s2, 48(sp)
+	stloc.0
+// 0x01073b98: 0x1073b98: addiu v0, v0, -31664
 	ldloc 5
+	ldc.i4 -31664
+	add
+	stloc 5
+// 0x01073b9c: 0x1073b9c: sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 10
-// 0x01073b78: 0x1073b78: lw    s1, 44(sp)
 	ldloc 5
+	stelem.i4
+// 0x01073ba0: 0x1073ba0: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x01073ba4: 0x1073ba4: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01073ba8: 0x1073ba8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01073bac: 0x1073bac: addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+// 0x01073bb0: 0x1073bb0: addiu v0, v0, 32576
+	ldloc 5
+	ldc.i4 32576
+	add
+	stloc 5
+// 0x01073bb4: 0x1073bb4: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01073bb8: 0x1073bb8: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01073bbc: 0x1073bbc: sw    ra, 28(sp)
+// 0x01073bc0: 0x1073bc0: jal   0x10732fc sw    v0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 9
-// 0x01073b7c: 0x1073b7c: lw    s0, 40(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-// 0x01073b80: 0x1073b80: jr    ra addiu sp, sp, 64
+	stloc 5
+// --- basic block ---
+// 0x01073bc8: 0x1073bc8: lw    ra, 28(sp)
+// 0x01073bcc: 0x1073bcc: sll   zero, zero, 0
+// 0x01073bd0: 0x1073bd0: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 64
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTNet_TrafficAlertFeedback_1073b88(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_TripServer_GetPOIs_1073bd8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -6263,64 +6402,60 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01073b88: 0x1073b88: addiu sp, sp, -40
+// 0x01073bd8: 0x1073bd8: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01073bdc: 0x1073bdc: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01073b8c: 0x1073b8c: addu  v0, a0, zero
-	ldloc.1
+// 0x01073be0: 0x1073be0: addiu v0, v0, -31628
+	ldloc 5
+	ldc.i4 -31628
+	add
 	stloc 5
-// 0x01073b90: 0x1073b90: sw    a2, 24(sp)
+// 0x01073be4: 0x1073be4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc.3
-	stelem.i4
-// 0x01073b94: 0x1073b94: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073b98: 0x1073b98: addu  a2, a3, zero
-	ldloc 4
-	stloc.3
-// 0x01073b9c: 0x1073b9c: addu  a3, v0, zero
 	ldloc 5
+	stelem.i4
+// 0x01073be8: 0x1073be8: addu  a3, a0, zero
+	ldloc.1
 	stloc 4
-// 0x01073ba0: 0x1073ba0: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x01073bec: 0x1073bec: lui   v0, 0x10000
+	ldc.i4 65536
 	stloc 5
-// 0x01073ba4: 0x1073ba4: sw    a1, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
+// 0x01073bf0: 0x1073bf0: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01073bf4: 0x1073bf4: addu  a2, a1, zero
 	ldloc.2
-	stelem.i4
-// 0x01073ba8: 0x1073ba8: addiu v0, v0, -31408
+	stloc.3
+// 0x01073bf8: 0x1073bf8: addiu v0, v0, 32576
 	ldloc 5
-	ldc.i4 -31408
+	ldc.i4 32576
 	add
 	stloc 5
-// 0x01073bac: 0x1073bac: addiu a0, a0, 15252
+// 0x01073bfc: 0x1073bfc: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073bb0: 0x1073bb0: addiu a1, zero, 36
+// 0x01073c00: 0x1073c00: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01073bb4: 0x1073bb4: sw    ra, 36(sp)
-// 0x01073bb8: 0x1073bb8: jal   0x1072cd8 sw    v0, 16(sp)
+// 0x01073c04: 0x1073c04: sw    ra, 28(sp)
+// 0x01073c08: 0x1073c08: jal   0x10732fc sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
 	ldloc 5
 	stelem.i4
@@ -6329,16 +6464,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01073bc0: 0x1073bc0: lw    ra, 36(sp)
-// 0x01073bc4: 0x1073bc4: sll   zero, zero, 0
-// 0x01073bc8: 0x1073bc8: jr    ra addiu sp, sp, 40
+// 0x01073c10: 0x1073c10: lw    ra, 28(sp)
+// 0x01073c14: 0x1073c14: sll   zero, zero, 0
+// 0x01073c18: 0x1073c18: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -6348,25 +6483,27 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTNet_UserPoints_1073c0c(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_TripServer_CreatePOI_1073c20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t1,int32 ra,int32 t0)
 
 // local  6 is register v0
-// local  5 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local 10 is register t0
+// local  8 is register t1
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local  9 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 5
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6375,96 +6512,213 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01073c0c: 0x1073c0c: addiu sp, sp, -32
+// 0x01073c20: 0x1073c20: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01073c10: 0x1073c10: addu  v1, a3, zero
-	ldloc 4
-	stloc 5
-// 0x01073c14: 0x1073c14: sw    ra, 28(sp)
-// 0x01073c18: 0x1073c18: addu  a3, a0, zero
-	ldloc.1
-	stloc 4
-// 0x01073c1c: 0x1073c1c: beq   v1, zero, 0x1073c40 addu  v0, a1, zero
-	ldloc 5
+// 0x01073c24: 0x1073c24: sw    ra, 44(sp)
+// 0x01073c28: 0x1073c28: addu  v0, a1, zero
 	ldloc.2
 	stloc 6
-	brfalse L_1073c40
+// 0x01073c2c: 0x1073c2c: bne   a1, zero, 0x1073c50 addu  a3, a0, zero
+	ldloc.2
+	ldloc.1
+	stloc 4
+	brtrue L_1073c50
 // --- basic block ---
-// 0x01073c24: 0x1073c24: lui   a1, 0x20000
+// 0x01073c34: 0x1073c34: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01073c38: 0x1073c38: lui   a3, 0x20000
 	ldc.i4 131072
+	stloc 4
+// 0x01073c3c: 0x1073c3c: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
 	stloc.2
-// 0x01073c28: 0x1073c28: addu  a0, v1, zero
-	ldloc 5
+// 0x01073c40: 0x1073c40: addiu a3, a3, -31596
+	ldloc 4
+	ldc.i4 -31596
+	add
+	stloc 4
+// 0x01073c44: 0x1073c44: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01073c48: 0x1073c48: j	 0x1073c70 addiu a2, zero, 1964
+	ldc.i4 1964
+	stloc.3
+	br L_1073c70
+// --- basic block ---
+L_1073c50:
+// 0x01073c50: 0x1073c50: bne   a2, zero, 0x1073c80 lui   a0, 0x0
+	ldloc.3
+	ldc.i4.s 0
 	stloc.1
-// 0x01073c2c: 0x1073c2c: addiu a1, a1, -31364
+	brtrue L_1073c80
+// --- basic block ---
+// 0x01073c58: 0x1073c58: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01073c5c: 0x1073c5c: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01073c60: 0x1073c60: addiu a1, a1, 32716
 	ldloc.2
-	ldc.i4 -31364
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x01073c30: 0x1073c30: jal   0x1000f64 addu  a2, v0, zero
-	ldloc 6
+// 0x01073c64: 0x1073c64: addiu a3, a3, -31552
+	ldloc 4
+	ldc.i4 -31552
+	add
+	stloc 4
+// 0x01073c68: 0x1073c68: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01073c6c: 0x1073c6c: addiu a2, zero, 1969
+	ldc.i4 1969
 	stloc.3
+L_1073c70:
+// 0x01073c70: 0x1073c70: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01073c38: 0x1073c38: j	 0x1073c60 addiu v0, zero, 1
-	ldc.i4.1
+// 0x01073c78: 0x1073c78: j	 0x1073cc4 addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 6
-	br L_1073c60
+	br L_1073cc4
 // --- basic block ---
-L_1073c40:
-// 0x01073c40: 0x1073c40: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073c44: 0x1073c44: lui   v1, 0x20000
+L_1073c80:
+// 0x01073c80: 0x1073c80: lw    v1, 4(a2)
+	ldloc 5
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 7
+// 0x01073c84: 0x1073c84: lw    t0, 0(a2)
+	ldloc 5
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 10
+// 0x01073c88: 0x1073c88: sw    v0, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 6
+	stelem.i4
+// 0x01073c8c: 0x1073c8c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x01073c90: 0x1073c90: addiu v0, v0, 32576
+	ldloc 6
+	ldc.i4 32576
+	add
+	stloc 6
+// 0x01073c94: 0x1073c94: lui   t1, 0x20000
 	ldc.i4 131072
-	stloc 5
-// 0x01073c48: 0x1073c48: addiu v1, v1, -31348
+	stloc 8
+// 0x01073c98: 0x1073c98: sw    v0, 32(sp)
 	ldloc 5
-	ldc.i4 -31348
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc 5
-// 0x01073c4c: 0x1073c4c: addiu a0, a0, 15252
+	ldloc 6
+	stelem.i4
+// 0x01073c9c: 0x1073c9c: lw    a2, 68(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldelem.i4
+	stloc.3
+// 0x01073ca0: 0x1073ca0: lw    v0, 64(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
+	stloc 6
+// 0x01073ca4: 0x1073ca4: addiu t1, t1, -31500
+	ldloc 8
+	ldc.i4 -31500
+	add
+	stloc 8
+// 0x01073ca8: 0x1073ca8: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073c50: 0x1073c50: addiu a1, zero, 36
+// 0x01073cac: 0x1073cac: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01073c54: 0x1073c54: sw    v1, 16(sp)
-	ldloc 7
+// 0x01073cb0: 0x1073cb0: sw    t1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
+	ldloc 8
+	stelem.i4
+// 0x01073cb4: 0x1073cb4: sw    t0, 20(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 10
 	stelem.i4
-// 0x01073c58: 0x1073c58: jal   0x1072cd8 sw    v0, 20(sp)
+// 0x01073cb8: 0x1073cb8: sw    v1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
 	ldloc 7
+	stelem.i4
+// 0x01073cbc: 0x1073cbc: jal   0x10732fc sw    v0, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 9
 	add
 	ldloc 6
 	stelem.i4
@@ -6473,33 +6727,33 @@ L_1073c40:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 7
 	stloc 6
 // --- basic block ---
-L_1073c60:
-// 0x01073c60: 0x1073c60: lw    ra, 28(sp)
-// 0x01073c64: 0x1073c64: sll   zero, zero, 0
-// 0x01073c68: 0x1073c68: jr    ra addiu sp, sp, 32
+L_1073cc4:
+// 0x01073cc4: 0x1073cc4: lw    ra, 44(sp)
+// 0x01073cc8: 0x1073cc8: sll   zero, zero, 0
+// 0x01073ccc: 0x1073ccc: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_Location_1073c70(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_NotifySplashUpdateTime_1073cd4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
 
-// local  6 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local 10 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
@@ -6507,13 +6761,13 @@ __CIBYL_function_return:
 // local  7 is register s0
 // local  8 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  9 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 10
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6529,155 +6783,132 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01073c70: 0x1073c70: addiu sp, sp, -88
+// 0x01073cd4: 0x1073cd4: addiu sp, sp, -104
 	ldloc.0
-	ldc.i4.s -88
+	ldc.i4.s -104
 	add
 	stloc.0
-// 0x01073c74: 0x1073c74: sw    s0, 76(sp)
-	ldloc 5
+// 0x01073cd8: 0x1073cd8: sw    s1, 96(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
-	add
-	ldloc 7
-	stelem.i4
-// 0x01073c78: 0x1073c78: addiu s0, sp, 24
-	ldloc.0
 	ldc.i4.s 24
 	add
-	stloc 7
-// 0x01073c7c: 0x1073c7c: sw    s1, 80(sp)
-	ldloc 5
+	ldloc 8
+	stelem.i4
+// 0x01073cdc: 0x1073cdc: sw    ra, 100(sp)
+// 0x01073ce0: 0x1073ce0: sw    s0, 92(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 23
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x01073c80: 0x1073c80: addu  s1, a0, zero
+// 0x01073ce4: 0x1073ce4: addu  a3, a0, zero
 	ldloc.1
+	stloc 4
+// 0x01073ce8: 0x1073ce8: beq   a1, zero, 0x1073d4c addu  s1, a2, zero
+	ldloc.2
+	ldloc.3
 	stloc 8
-// 0x01073c84: 0x1073c84: sw    a2, 64(sp)
+	brfalse L_1073d4c
+// --- basic block ---
+// 0x01073cf0: 0x1073cf0: lb    v0, 0(a1)
+	ldloc.2
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01073cf4: 0x1073cf4: sll   zero, zero, 0
+// 0x01073cf8: 0x1073cf8: beq   v0, zero, 0x1073d50 addu  v0, zero, zero
 	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_1073d50
+// --- basic block ---
+// 0x01073d00: 0x1073d00: addiu s0, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 24
 	add
-	ldloc.3
-	stelem.i4
-// 0x01073c88: 0x1073c88: sw    a3, 68(sp)
-	ldloc 5
+	stloc 7
+// 0x01073d04: 0x1073d04: addu  a0, a1, zero
+	ldloc.2
+	stloc.1
+// 0x01073d08: 0x1073d08: addiu a2, zero, 50
+	ldc.i4.s 50
+	stloc.3
+// 0x01073d0c: 0x1073d0c: addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+// 0x01073d10: 0x1073d10: jal   0x1067b74 sw    a3, 80(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 20
 	add
 	ldloc 4
 	stelem.i4
-// 0x01073c8c: 0x1073c8c: sw    ra, 84(sp)
-// 0x01073c90: 0x1073c90: jal   0x1072a94 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::format_RoadMapPosition_string_1072a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
+	stloc 10
+	stloc 5
 // --- basic block ---
-// 0x01073c98: 0x1073c98: lw    a3, 68(sp)
-	ldloc 5
+// 0x01073d18: 0x1073d18: lw    a3, 80(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 20
 	add
 	ldelem.i4
 	stloc 4
-// 0x01073c9c: 0x1073c9c: lw    a2, 64(sp)
+// 0x01073d1c: 0x1073d1c: beq   v0, zero, 0x1073d4c lui   a0, 0x0
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc.3
-// 0x01073ca0: 0x1073ca0: beq   a3, zero, 0x1073cc0 lui   v0, 0x20000
-	ldloc 4
-	ldc.i4 131072
-	stloc 6
-	brfalse L_1073cc0
-// --- basic block ---
-// 0x01073ca8: 0x1073ca8: addu  a0, a3, zero
-	ldloc 4
-	stloc.1
-// 0x01073cac: 0x1073cac: addiu a1, v0, -31332
-	ldloc 6
-	ldc.i4 -31332
-	add
-	stloc.2
-// 0x01073cb0: 0x1073cb0: jal   0x1000f64 addu  a2, s0, zero
-	ldloc 7
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x01073cb8: 0x1073cb8: j	 0x1073ce0 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-	br L_1073ce0
-// --- basic block ---
-L_1073cc0:
-// 0x01073cc0: 0x1073cc0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01073cc4: 0x1073cc4: addiu v0, v0, -31332
-	ldloc 6
-	ldc.i4 -31332
-	add
-	stloc 6
-// 0x01073cc8: 0x1073cc8: addiu a0, a0, 15252
+	brfalse L_1073d4c
+// --- basic block ---
+// 0x01073d24: 0x1073d24: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01073d28: 0x1073d28: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073ccc: 0x1073ccc: addu  a3, s1, zero
+// 0x01073d2c: 0x1073d2c: addu  a2, s1, zero
 	ldloc 8
-	stloc 4
-// 0x01073cd0: 0x1073cd0: addiu a1, zero, 36
+	stloc.3
+// 0x01073d30: 0x1073d30: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01073cd4: 0x1073cd4: sw    v0, 16(sp)
+// 0x01073d34: 0x1073d34: addiu v0, v0, -31428
 	ldloc 5
+	ldc.i4 -31428
+	add
+	stloc 5
+// 0x01073d38: 0x1073d38: sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 6
-	stelem.i4
-// 0x01073cd8: 0x1073cd8: jal   0x1072cd8 sw    s0, 20(sp)
 	ldloc 5
+	stelem.i4
+// 0x01073d3c: 0x1073d3c: jal   0x10732fc sw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6690,62 +6921,69 @@ L_1073cc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
+	stloc 10
+	stloc 5
 // --- basic block ---
-L_1073ce0:
-// 0x01073ce0: 0x1073ce0: lw    ra, 84(sp)
-// 0x01073ce4: 0x1073ce4: lw    s1, 80(sp)
-	ldloc 5
+// 0x01073d44: 0x1073d44: j	 0x1073d50 sll   zero, zero, 0
+	br L_1073d50
+// --- basic block ---
+L_1073d4c:
+// 0x01073d4c: 0x1073d4c: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_1073d50:
+// 0x01073d50: 0x1073d50: lw    ra, 100(sp)
+// 0x01073d54: 0x1073d54: lw    s1, 96(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 24
 	add
 	ldelem.i4
 	stloc 8
-// 0x01073ce8: 0x1073ce8: lw    s0, 76(sp)
-	ldloc 5
+// 0x01073d58: 0x1073d58: lw    s0, 92(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.s 23
 	add
 	ldelem.i4
 	stloc 7
-// 0x01073cec: 0x1073cec: jr    ra addiu sp, sp, 88
+// 0x01073d5c: 0x1073d5c: jr    ra addiu sp, sp, 104
 	ldloc.0
-	ldc.i4.s 88
+	ldc.i4.s 104
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 10
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTNet_SetMood_1073cf4(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_ExternalPoiNotifyOnNavigate_1073d64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
 
-// local  6 is register v0
-// local  5 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 6
 	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6757,80 +6995,155 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01073cf4: 0x1073cf4: addiu sp, sp, -32
+// 0x01073d64: 0x1073d64: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01073cf8: 0x1073cf8: addu  v1, a3, zero
-	ldloc 4
-	stloc 5
-// 0x01073cfc: 0x1073cfc: sw    ra, 28(sp)
-// 0x01073d00: 0x1073d00: addu  a3, a0, zero
+// 0x01073d68: 0x1073d68: addu  a3, a0, zero
 	ldloc.1
 	stloc 4
-// 0x01073d04: 0x1073d04: beq   v1, zero, 0x1073d28 addu  v0, a1, zero
-	ldloc 5
-	ldloc.2
-	stloc 6
-	brfalse L_1073d28
-// --- basic block ---
-// 0x01073d0c: 0x1073d0c: lui   a1, 0x20000
+// 0x01073d6c: 0x1073d6c: lui   v0, 0x20000
 	ldc.i4 131072
-	stloc.2
-// 0x01073d10: 0x1073d10: addu  a0, v1, zero
-	ldloc 5
+	stloc 5
+// 0x01073d70: 0x1073d70: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-// 0x01073d14: 0x1073d14: addiu a1, a1, -31316
+// 0x01073d74: 0x1073d74: sw    a1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc.2
-	ldc.i4 -31316
+	stelem.i4
+// 0x01073d78: 0x1073d78: addiu v0, v0, -31400
+	ldloc 5
+	ldc.i4 -31400
+	add
+	stloc 5
+// 0x01073d7c: 0x1073d7c: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
 	add
+	stloc.1
+// 0x01073d80: 0x1073d80: addiu a1, zero, 36
+	ldc.i4.s 36
 	stloc.2
-// 0x01073d18: 0x1073d18: jal   0x1000f64 addu  a2, v0, zero
+// 0x01073d84: 0x1073d84: sw    ra, 28(sp)
+// 0x01073d88: 0x1073d88: jal   0x10732fc sw    v0, 16(sp)
 	ldloc 6
-	stloc.3
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	stloc 6
 // --- basic block ---
-// 0x01073d20: 0x1073d20: j	 0x1073d48 addiu v0, zero, 1
-	ldc.i4.1
+// 0x01073d90: 0x1073d90: lw    ra, 28(sp)
+// 0x01073d94: 0x1073d94: sll   zero, zero, 0
+// 0x01073d98: 0x1073d98: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_ExternalPoiNotifyOnPopUp_1073da0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	br L_1073d48
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1073d28:
-// 0x01073d28: 0x1073d28: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073d2c: 0x1073d2c: lui   v1, 0x20000
+// 0x01073da0: 0x1073da0: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x01073da4: 0x1073da4: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x01073da8: 0x1073da8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01073d30: 0x1073d30: addiu v1, v1, -31304
+// 0x01073dac: 0x1073dac: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01073db0: 0x1073db0: sw    a1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc.2
+	stelem.i4
+// 0x01073db4: 0x1073db4: addiu v0, v0, -31368
 	ldloc 5
-	ldc.i4 -31304
+	ldc.i4 -31368
 	add
 	stloc 5
-// 0x01073d34: 0x1073d34: addiu a0, a0, 15252
+// 0x01073db8: 0x1073db8: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073d38: 0x1073d38: addiu a1, zero, 36
+// 0x01073dbc: 0x1073dbc: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01073d3c: 0x1073d3c: sw    v1, 16(sp)
-	ldloc 7
+// 0x01073dc0: 0x1073dc0: sw    ra, 28(sp)
+// 0x01073dc4: 0x1073dc4: jal   0x10732fc sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6838,66 +7151,52 @@ L_1073d28:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01073d40: 0x1073d40: jal   0x1072cd8 sw    v0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 6
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	stloc 6
 // --- basic block ---
-L_1073d48:
-// 0x01073d48: 0x1073d48: lw    ra, 28(sp)
-// 0x01073d4c: 0x1073d4c: sll   zero, zero, 0
-// 0x01073d50: 0x1073d50: jr    ra addiu sp, sp, 32
+// 0x01073dcc: 0x1073dcc: lw    ra, 28(sp)
+// 0x01073dd0: 0x1073dd0: sll   zero, zero, 0
+// 0x01073dd4: 0x1073dd4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTNet_SetMyVisability_1073d58(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_FacebookPermissions_1073ddc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 t0,int32 t1,int32 t2,int32 t5,int32 v0,int32 t3,int32 t4,int32 ra,int32 t6)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 t2,int32 t0,int32 t1,int32 ra)
 
-// local 11 is register v0
-// local  6 is register v1
+// local  7 is register v0
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register t0
-// local  8 is register t1
-// local  9 is register t2
-// local 12 is register t3
-// local 13 is register t4
-// local 10 is register t5
-// local 15 is register t6
+// local  9 is register t0
+// local 10 is register t1
+// local  8 is register t2
 // local  0 is register sp
-// local 14 is register ra
-// local  5 is register mem
+// local 11 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 11
+	stloc 7
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6907,482 +7206,330 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 15
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01073d58: 0x1073d58: addiu sp, sp, -56
+// 0x01073ddc: 0x1073ddc: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01073d5c: 0x1073d5c: lw    t5, 92(sp)
-	ldloc 5
+// 0x01073de0: 0x1073de0: sltiu v1, a1, 3
+	ldloc.2
+	ldc.i4.3
+	clt.un
+	stloc 5
+// 0x01073de4: 0x1073de4: addu  t2, a0, zero
+	ldloc.1
+	stloc 8
+// 0x01073de8: 0x1073de8: sw    ra, 44(sp)
+// 0x01073dec: 0x1073dec: lw    a0, 64(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc 10
-// 0x01073d60: 0x1073d60: addu  t6, a0, zero
-	ldloc.1
-	stloc 15
-// 0x01073d64: 0x1073d64: addu  t4, a1, zero
-	ldloc.2
-	stloc 13
-// 0x01073d68: 0x1073d68: addu  t3, a2, zero
-	ldloc.3
-	stloc 12
-// 0x01073d6c: 0x1073d6c: sw    ra, 52(sp)
-// 0x01073d70: 0x1073d70: addu  a2, a3, zero
-	ldloc 4
-	stloc.3
-// 0x01073d74: 0x1073d74: lw    a1, 76(sp)
+	stloc.1
+// 0x01073df0: 0x1073df0: bne   v1, zero, 0x1073e04 sll   a1, a1, 2
 	ldloc 5
-	ldloc.0
+	ldloc.2
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldelem.i4
+	shl
 	stloc.2
-// 0x01073d78: 0x1073d78: lw    a3, 72(sp)
+	brtrue L_1073e04
+// --- basic block ---
+// 0x01073df8: 0x1073df8: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01073dfc: 0x1073dfc: j	 0x1073e14 addiu v1, v1, 18768
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
+	ldc.i4 18768
 	add
-	ldelem.i4
-	stloc 4
-// 0x01073d7c: 0x1073d7c: lw    a0, 80(sp)
+	stloc 5
+	br L_1073e14
+// --- basic block ---
+L_1073e04:
+// 0x01073e04: 0x1073e04: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01073e08: 0x1073e08: addiu v1, v1, 29216
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
+	ldc.i4 29216
 	add
-	ldelem.i4
-	stloc.1
-// 0x01073d80: 0x1073d80: lw    v1, 84(sp)
+	stloc 5
+// 0x01073e0c: 0x1073e0c: addu  a1, a1, v1
+	ldloc.2
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
 	add
-	ldelem.i4
-	stloc 6
-// 0x01073d84: 0x1073d84: lw    v0, 88(sp)
-	ldloc 5
-	ldloc.0
+	stloc.2
+// 0x01073e10: 0x1073e10: lw    v1, 0(a1)
+	ldloc 6
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
-	add
 	ldelem.i4
-	stloc 11
-// 0x01073d88: 0x1073d88: beq   t5, zero, 0x1073e24 sll   zero, zero, 0
-	ldloc 10
-	brfalse L_1073e24
-// --- basic block ---
-// 0x01073d90: 0x1073d90: bne   a3, zero, 0x1073da0 lui   t2, 0x20000
-	ldloc 4
-	ldc.i4 131072
-	stloc 9
-	brtrue L_1073da0
-// --- basic block ---
-// 0x01073d98: 0x1073d98: j	 0x1073da8 addiu t2, t2, 18636
-	ldloc 9
-	ldc.i4 18636
-	add
-	stloc 9
-	br L_1073da8
+	stloc 5
+L_1073e14:
+// 0x01073e14: 0x1073e14: beq   a2, zero, 0x1073e38 addiu a1, zero, 1
+	ldloc.3
+	ldc.i4.1
+	stloc.2
+	brfalse L_1073e38
 // --- basic block ---
-L_1073da0:
-// 0x01073da0: 0x1073da0: lui   t2, 0x10000
-	ldc.i4 65536
-	stloc 9
-// 0x01073da4: 0x1073da4: addiu t2, t2, 12208
-	ldloc 9
-	ldc.i4 12208
-	add
-	stloc 9
-L_1073da8:
-// 0x01073da8: 0x1073da8: bne   a1, zero, 0x1073db8 lui   t1, 0x20000
+// 0x01073e1c: 0x1073e1c: beq   a2, a1, 0x1073e44 addiu a1, zero, 2
+	ldloc.3
 	ldloc.2
-	ldc.i4 131072
-	stloc 8
-	brtrue L_1073db8
+	ldc.i4.2
+	stloc.2
+	beq  L_1073e44
 // --- basic block ---
-// 0x01073db0: 0x1073db0: j	 0x1073dc0 addiu t1, t1, 18636
-	ldloc 8
-	ldc.i4 18636
-	add
-	stloc 8
-	br L_1073dc0
+// 0x01073e24: 0x1073e24: bne   a2, a1, 0x1073e50 sll   zero, zero, 0
+	ldloc.3
+	ldloc.2
+	bne.un L_1073e50
 // --- basic block ---
-L_1073db8:
-// 0x01073db8: 0x1073db8: lui   t1, 0x10000
+// 0x01073e2c: 0x1073e2c: lui   v0, 0x10000
 	ldc.i4 65536
-	stloc 8
-// 0x01073dbc: 0x1073dbc: addiu t1, t1, 12208
-	ldloc 8
-	ldc.i4 12208
-	add
-	stloc 8
-L_1073dc0:
-// 0x01073dc0: 0x1073dc0: bne   a0, zero, 0x1073dd0 lui   t0, 0x20000
-	ldloc.1
-	ldc.i4 131072
 	stloc 7
-	brtrue L_1073dd0
-// --- basic block ---
-// 0x01073dc8: 0x1073dc8: j	 0x1073dd8 addiu t0, t0, 18636
+// 0x01073e30: 0x1073e30: j	 0x1073e58 addiu v0, v0, 32576
 	ldloc 7
-	ldc.i4 18636
+	ldc.i4 32576
 	add
 	stloc 7
-	br L_1073dd8
+	br L_1073e58
 // --- basic block ---
-L_1073dd0:
-// 0x01073dd0: 0x1073dd0: lui   t0, 0x10000
+L_1073e38:
+// 0x01073e38: 0x1073e38: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x01073dd4: 0x1073dd4: addiu t0, t0, 12208
+// 0x01073e3c: 0x1073e3c: j	 0x1073e58 addiu v0, v0, -25260
 	ldloc 7
-	ldc.i4 12208
+	ldc.i4 -25260
 	add
 	stloc 7
-L_1073dd8:
-// 0x01073dd8: 0x1073dd8: bne   v1, zero, 0x1073de8 lui   v1, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brtrue L_1073de8
+	br L_1073e58
 // --- basic block ---
-// 0x01073de0: 0x1073de0: j	 0x1073df0 addiu v1, v1, -27472
-	ldloc 6
-	ldc.i4 -27472
+L_1073e44:
+// 0x01073e44: 0x1073e44: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 7
+// 0x01073e48: 0x1073e48: j	 0x1073e58 addiu v0, v0, -31340
+	ldloc 7
+	ldc.i4 -31340
 	add
-	stloc 6
-	br L_1073df0
+	stloc 7
+	br L_1073e58
 // --- basic block ---
-L_1073de8:
-// 0x01073de8: 0x1073de8: lui   v1, 0x10000
+L_1073e50:
+// 0x01073e50: 0x1073e50: lui   v1, 0x10000
 	ldc.i4 65536
-	stloc 6
-// 0x01073dec: 0x1073dec: addiu v1, v1, -16892
-	ldloc 6
-	ldc.i4 -16892
+	stloc 5
+// 0x01073e54: 0x1073e54: addiu v1, v1, 18768
+	ldloc 5
+	ldc.i4 18768
 	add
-	stloc 6
-L_1073df0:
-// 0x01073df0: 0x1073df0: lui   a1, 0x20000
-	ldc.i4 131072
+	stloc 5
+L_1073e58:
+// 0x01073e58: 0x1073e58: sltiu a1, a3, 3
+	ldloc 4
+	ldc.i4.3
+	clt.un
 	stloc.2
-// 0x01073df4: 0x1073df4: addu  a0, t5, zero
-	ldloc 10
-	stloc.1
-// 0x01073df8: 0x1073df8: addiu a1, a1, -31292
+// 0x01073e5c: 0x1073e5c: bne   a1, zero, 0x1073e70 lui   a1, 0x20000
 	ldloc.2
-	ldc.i4 -31292
-	add
+	ldc.i4 131072
 	stloc.2
-// 0x01073dfc: 0x1073dfc: addu  a2, t4, zero
-	ldloc 13
-	stloc.3
-// 0x01073e00: 0x1073e00: addu  a3, t3, zero
-	ldloc 12
-	stloc 4
-// 0x01073e04: 0x1073e04: sw    t2, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x01073e08: 0x1073e08: sw    t1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	brtrue L_1073e70
+// --- basic block ---
+// 0x01073e64: 0x1073e64: lui   t1, 0x10000
+	ldc.i4 65536
+	stloc 10
+// 0x01073e68: 0x1073e68: j	 0x1073e80 addiu t1, t1, 18768
+	ldloc 10
+	ldc.i4 18768
 	add
-	ldloc 8
-	stelem.i4
-// 0x01073e0c: 0x1073e0c: sw    t0, 24(sp)
-	ldloc 5
-	ldloc.0
+	stloc 10
+	br L_1073e80
+// --- basic block ---
+L_1073e70:
+// 0x01073e70: 0x1073e70: sll   a3, a3, 2
+	ldloc 4
 	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	shl
+	stloc 4
+// 0x01073e74: 0x1073e74: addiu a1, a1, 29228
+	ldloc.2
+	ldc.i4 29228
 	add
-	ldloc 7
-	stelem.i4
-// 0x01073e10: 0x1073e10: sw    v1, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	stloc.2
+// 0x01073e78: 0x1073e78: addu  a3, a3, a1
+	ldloc 4
+	ldloc.2
 	add
+	stloc 4
+// 0x01073e7c: 0x1073e7c: lw    t1, 0(a3)
 	ldloc 6
-	stelem.i4
-// 0x01073e14: 0x1073e14: jal   0x1000f64 sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldloc 11
-	stelem.i4
-	ldloc.0
+	ldelem.i4
+	stloc 10
+L_1073e80:
+// 0x01073e80: 0x1073e80: sltiu a1, a0, 3
 	ldloc.1
+	ldc.i4.3
+	clt.un
+	stloc.2
+// 0x01073e84: 0x1073e84: bne   a1, zero, 0x1073e98 lui   a1, 0x20000
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 11
-// --- basic block ---
-// 0x01073e1c: 0x1073e1c: j	 0x1073ec0 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 11
-	br L_1073ec0
-// --- basic block ---
-L_1073e24:
-// 0x01073e24: 0x1073e24: bne   a3, zero, 0x1073e34 lui   t2, 0x20000
-	ldloc 4
 	ldc.i4 131072
-	stloc 9
-	brtrue L_1073e34
-// --- basic block ---
-// 0x01073e2c: 0x1073e2c: j	 0x1073e3c addiu t2, t2, 18636
-	ldloc 9
-	ldc.i4 18636
-	add
-	stloc 9
-	br L_1073e3c
+	stloc.2
+	brtrue L_1073e98
 // --- basic block ---
-L_1073e34:
-// 0x01073e34: 0x1073e34: lui   t2, 0x10000
+// 0x01073e8c: 0x1073e8c: lui   t0, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01073e38: 0x1073e38: addiu t2, t2, 12208
+// 0x01073e90: 0x1073e90: j	 0x1073ea8 addiu t0, t0, 18768
 	ldloc 9
-	ldc.i4 12208
+	ldc.i4 18768
 	add
 	stloc 9
-L_1073e3c:
-// 0x01073e3c: 0x1073e3c: bne   a1, zero, 0x1073e4c lui   t1, 0x20000
-	ldloc.2
-	ldc.i4 131072
-	stloc 8
-	brtrue L_1073e4c
-// --- basic block ---
-// 0x01073e44: 0x1073e44: j	 0x1073e54 addiu t1, t1, 18636
-	ldloc 8
-	ldc.i4 18636
-	add
-	stloc 8
-	br L_1073e54
+	br L_1073ea8
 // --- basic block ---
-L_1073e4c:
-// 0x01073e4c: 0x1073e4c: lui   t1, 0x10000
-	ldc.i4 65536
-	stloc 8
-// 0x01073e50: 0x1073e50: addiu t1, t1, 12208
-	ldloc 8
-	ldc.i4 12208
-	add
-	stloc 8
-L_1073e54:
-// 0x01073e54: 0x1073e54: bne   a0, zero, 0x1073e64 lui   t0, 0x20000
+L_1073e98:
+// 0x01073e98: 0x1073e98: sll   a0, a0, 2
 	ldloc.1
-	ldc.i4 131072
-	stloc 7
-	brtrue L_1073e64
-// --- basic block ---
-// 0x01073e5c: 0x1073e5c: j	 0x1073e6c addiu t0, t0, 18636
-	ldloc 7
-	ldc.i4 18636
+	ldc.i4.2
+	shl
+	stloc.1
+// 0x01073e9c: 0x1073e9c: addiu a1, a1, 29240
+	ldloc.2
+	ldc.i4 29240
 	add
-	stloc 7
-	br L_1073e6c
-// --- basic block ---
-L_1073e64:
-// 0x01073e64: 0x1073e64: lui   t0, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x01073e68: 0x1073e68: addiu t0, t0, 12208
-	ldloc 7
-	ldc.i4 12208
+	stloc.2
+// 0x01073ea0: 0x1073ea0: addu  a0, a0, a1
+	ldloc.1
+	ldloc.2
 	add
-	stloc 7
-L_1073e6c:
-// 0x01073e6c: 0x1073e6c: bne   v1, zero, 0x1073e7c lui   v1, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brtrue L_1073e7c
-// --- basic block ---
-// 0x01073e74: 0x1073e74: j	 0x1073e84 addiu v1, v1, -27472
+	stloc.1
+// 0x01073ea4: 0x1073ea4: lw    t0, 0(a0)
 	ldloc 6
-	ldc.i4 -27472
-	add
-	stloc 6
-	br L_1073e84
-// --- basic block ---
-L_1073e7c:
-// 0x01073e7c: 0x1073e7c: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x01073e80: 0x1073e80: addiu v1, v1, -16892
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 9
+L_1073ea8:
+// 0x01073ea8: 0x1073ea8: lw    a2, 68(sp)
 	ldloc 6
-	ldc.i4 -16892
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
 	add
-	stloc 6
-L_1073e84:
-// 0x01073e84: 0x1073e84: lui   a0, 0x0
+	ldelem.i4
+	stloc.3
+// 0x01073eac: 0x1073eac: addu  a3, t2, zero
+	ldloc 8
+	stloc 4
+// 0x01073eb0: 0x1073eb0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01073e88: 0x1073e88: lui   t5, 0x20000
+// 0x01073eb4: 0x1073eb4: lui   t2, 0x20000
 	ldc.i4 131072
-	stloc 10
-// 0x01073e8c: 0x1073e8c: addiu t5, t5, -31264
-	ldloc 10
-	ldc.i4 -31264
+	stloc 8
+// 0x01073eb8: 0x1073eb8: addiu t2, t2, -31332
+	ldloc 8
+	ldc.i4 -31332
 	add
-	stloc 10
-// 0x01073e90: 0x1073e90: addiu a0, a0, 15252
+	stloc 8
+// 0x01073ebc: 0x1073ebc: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01073e94: 0x1073e94: addu  a3, t6, zero
-	ldloc 15
-	stloc 4
-// 0x01073e98: 0x1073e98: addiu a1, zero, 36
+// 0x01073ec0: 0x1073ec0: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01073e9c: 0x1073e9c: sw    t5, 16(sp)
-	ldloc 5
+// 0x01073ec4: 0x1073ec4: sw    t2, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01073ea0: 0x1073ea0: sw    t4, 20(sp)
-	ldloc 5
+// 0x01073ec8: 0x1073ec8: sw    v1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 13
-	stelem.i4
-// 0x01073ea4: 0x1073ea4: sw    t3, 24(sp)
 	ldloc 5
+	stelem.i4
+// 0x01073ecc: 0x1073ecc: sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 12
+	ldloc 7
 	stelem.i4
-// 0x01073ea8: 0x1073ea8: sw    t2, 28(sp)
-	ldloc 5
+// 0x01073ed0: 0x1073ed0: sw    t1, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
-	ldloc 9
-	stelem.i4
-// 0x01073eac: 0x1073eac: sw    t1, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 8
-	stelem.i4
-// 0x01073eb0: 0x1073eb0: sw    t0, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
-// 0x01073eb4: 0x1073eb4: sw    v1, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
+// 0x01073ed4: 0x1073ed4: jal   0x10732fc sw    t0, 32(sp)
 	ldloc 6
-	stelem.i4
-// 0x01073eb8: 0x1073eb8: jal   0x1072cd8 sw    v0, 44(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.8
 	add
-	ldloc 11
+	ldloc 9
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 11
+	stloc 5
+	stloc 7
 // --- basic block ---
-L_1073ec0:
-// 0x01073ec0: 0x1073ec0: lw    ra, 52(sp)
-// 0x01073ec4: 0x1073ec4: sll   zero, zero, 0
-// 0x01073ec8: 0x1073ec8: jr    ra addiu sp, sp, 56
+// 0x01073edc: 0x1073edc: lw    ra, 44(sp)
+// 0x01073ee0: 0x1073ee0: sll   zero, zero, 0
+// 0x01073ee4: 0x1073ee4: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 11
+	ldloc 7
 	ret
 }
 }
diff --git a/converted/Cibyl87.j b/converted/Cibyl87.j
index bae6607..9036b58 100644
--- a/converted/Cibyl87.j
+++ b/converted/Cibyl87.j
@@ -41,10 +41,130 @@
     IL_0006:  ret
   } // end of method Cibyl87::.ctor
 
-.method public static int32 RTNet_ReportMarker_1073ed0(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_ReportAbuse_1073eec(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 t0)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01073eec: 0x1073eec: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x01073ef0: 0x1073ef0: addu  v0, a0, zero
+	ldloc.1
+	stloc 5
+// 0x01073ef4: 0x1073ef4: sw    a2, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc.3
+	stelem.i4
+// 0x01073ef8: 0x1073ef8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01073efc: 0x1073efc: addu  a2, a3, zero
+	ldloc 4
+	stloc.3
+// 0x01073f00: 0x1073f00: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x01073f04: 0x1073f04: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01073f08: 0x1073f08: sw    a1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc.2
+	stelem.i4
+// 0x01073f0c: 0x1073f0c: addiu v0, v0, -31200
+	ldloc 5
+	ldc.i4 -31200
+	add
+	stloc 5
+// 0x01073f10: 0x1073f10: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01073f14: 0x1073f14: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01073f18: 0x1073f18: sw    ra, 36(sp)
+// 0x01073f1c: 0x1073f1c: jal   0x10732fc sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01073f24: 0x1073f24: lw    ra, 36(sp)
+// 0x01073f28: 0x1073f28: sll   zero, zero, 0
+// 0x01073f2c: 0x1073f2c: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_CollectCustomBonus_1073f34(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s0,int32 s1,int32 ra)
 
 // local  6 is register v0
 // local  7 is register v1
@@ -52,15 +172,11 @@
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 15 is register t0
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local 12 is register s4
-// local 13 is register s5
+// local  8 is register t0
+// local  9 is register s0
+// local 10 is register s1
 // local  0 is register sp
-// local 14 is register ra
+// local 11 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -76,440 +192,519 @@
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
 	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01073ed0: 0x1073ed0: addiu sp, sp, -2352
+// 0x01073f34: 0x1073f34: addiu sp, sp, -176
 	ldloc.0
-	ldc.i4 -2352
+	ldc.i4 -176
 	add
 	stloc.0
-// 0x01073ed4: 0x1073ed4: sw    s5, 2344(sp)
+// 0x01073f38: 0x1073f38: sw    s1, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 586
+	ldc.i4.s 42
 	add
-	ldloc 13
+	ldloc 10
 	stelem.i4
-// 0x01073ed8: 0x1073ed8: sw    s3, 2336(sp)
+// 0x01073f3c: 0x1073f3c: sw    s0, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 584
+	ldc.i4.s 41
 	add
-	ldloc 11
+	ldloc 9
 	stelem.i4
-// 0x01073edc: 0x1073edc: addu  s5, a0, zero
+// 0x01073f40: 0x1073f40: addu  s1, a0, zero
 	ldloc.1
-	stloc 13
-// 0x01073ee0: 0x1073ee0: addu  s3, a1, zero
+	stloc 10
+// 0x01073f44: 0x1073f44: addu  s0, a1, zero
 	ldloc.2
-	stloc 11
-// 0x01073ee4: 0x1073ee4: addiu a0, sp, 48
+	stloc 9
+// 0x01073f48: 0x1073f48: addiu a0, sp, 40
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 40
 	add
 	stloc.1
-// 0x01073ee8: 0x1073ee8: sw    s4, 2340(sp)
+// 0x01073f4c: 0x1073f4c: sw    a2, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
+	ldc.i4.s 38
 	add
-	ldloc 12
+	ldloc.3
 	stelem.i4
-// 0x01073eec: 0x1073eec: sw    s2, 2332(sp)
+// 0x01073f50: 0x1073f50: sw    a3, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 583
+	ldc.i4.s 39
 	add
-	ldloc 10
+	ldloc 4
 	stelem.i4
-// 0x01073ef0: 0x1073ef0: sw    s1, 2328(sp)
+// 0x01073f54: 0x1073f54: sw    ra, 172(sp)
+// 0x01073f58: 0x1073f58: jal   0x106e8e8 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl82::SendMessage_At_106e8e8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01073f60: 0x1073f60: lw    a2, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 582
+	ldc.i4.s 38
 	add
-	ldloc 9
-	stelem.i4
-// 0x01073ef4: 0x1073ef4: sw    a3, 2312(sp)
+	ldelem.i4
+	stloc.3
+// 0x01073f64: 0x1073f64: lw    a3, 156(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.s 39
+	add
+	ldelem.i4
+	stloc 4
+// 0x01073f68: 0x1073f68: bne   v0, zero, 0x1073f74 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_1073f74
+// --- basic block ---
+// 0x01073f70: 0x1073f70: sb    zero, 40(sp)
+	ldloc.0
+	ldc.i4.s 40
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+L_1073f74:
+// 0x01073f74: 0x1073f74: bne   a2, zero, 0x1073f84 lui   v1, 0x20000
+	ldloc.3
+	ldc.i4 131072
+	stloc 7
+	brtrue L_1073f84
+// --- basic block ---
+// 0x01073f7c: 0x1073f7c: j	 0x1073f8c addiu v1, v1, 19096
+	ldloc 7
+	ldc.i4 19096
+	add
+	stloc 7
+	br L_1073f8c
+// --- basic block ---
+L_1073f84:
+// 0x01073f84: 0x1073f84: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x01073f88: 0x1073f88: addiu v1, v1, 12204
+	ldloc 7
+	ldc.i4 12204
 	add
+	stloc 7
+L_1073f8c:
+// 0x01073f8c: 0x1073f8c: bne   a3, zero, 0x1073f9c lui   v0, 0x20000
 	ldloc 4
-	stelem.i4
-// 0x01073ef8: 0x1073ef8: lw    s1, 2372(sp)
+	ldc.i4 131072
+	stloc 6
+	brtrue L_1073f9c
+// --- basic block ---
+// 0x01073f94: 0x1073f94: j	 0x1073fa4 addiu v0, v0, 19096
+	ldloc 6
+	ldc.i4 19096
+	add
+	stloc 6
+	br L_1073fa4
+// --- basic block ---
+L_1073f9c:
+// 0x01073f9c: 0x1073f9c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x01073fa0: 0x1073fa0: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
+	add
+	stloc 6
+L_1073fa4:
+// 0x01073fa4: 0x1073fa4: lui   t0, 0x20000
+	ldc.i4 131072
+	stloc 8
+// 0x01073fa8: 0x1073fa8: lw    a2, 192(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 593
+	ldc.i4.s 48
 	add
 	ldelem.i4
-	stloc 9
-// 0x01073efc: 0x1073efc: sw    ra, 2348(sp)
-// 0x01073f00: 0x1073f00: sw    s0, 2324(sp)
+	stloc.3
+// 0x01073fac: 0x1073fac: addiu t0, t0, -31180
+	ldloc 8
+	ldc.i4 -31180
+	add
+	stloc 8
+// 0x01073fb0: 0x1073fb0: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01073fb4: 0x1073fb4: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 581
+	ldc.i4.4
 	add
 	ldloc 8
 	stelem.i4
-// 0x01073f04: 0x1073f04: lw    s2, 2368(sp)
+// 0x01073fb8: 0x1073fb8: addu  a3, s1, zero
+	ldloc 10
+	stloc 4
+// 0x01073fbc: 0x1073fbc: addiu t0, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 8
+// 0x01073fc0: 0x1073fc0: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01073fc4: 0x1073fc4: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01073fc8: 0x1073fc8: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 592
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 10
-// 0x01073f08: 0x1073f08: lw    s4, 2392(sp)
+	ldloc 9
+	stelem.i4
+// 0x01073fcc: 0x1073fcc: sw    t0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 598
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 12
-// 0x01073f0c: 0x1073f0c: jal   0x1072468 addu  a1, a2, zero
-	ldloc.3
-	stloc.2
+	ldloc 8
+	stelem.i4
+// 0x01073fd0: 0x1073fd0: sw    v1, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 7
+	stelem.i4
+// 0x01073fd4: 0x1073fd4: jal   0x10732fc sw    v0, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01073f14: 0x1073f14: lw    a3, 2312(sp)
+// 0x01073fdc: 0x1073fdc: lw    ra, 172(sp)
+// 0x01073fe0: 0x1073fe0: lw    s1, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.s 42
 	add
 	ldelem.i4
-	stloc 4
-// 0x01073f18: 0x1073f18: addiu a0, sp, 68
+	stloc 10
+// 0x01073fe4: 0x1073fe4: lw    s0, 164(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 68
-	add
-	stloc.1
-// 0x01073f1c: 0x1073f1c: jal   0x1072468 addu  a1, a3, zero
-	ldloc 4
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073f24: 0x1073f24: beq   s1, zero, 0x1073f74 lui   s0, 0x10000
-	ldloc 9
-	ldc.i4 65536
-	stloc 8
-	brfalse L_1073f74
-// --- basic block ---
-// 0x01073f2c: 0x1073f2c: lb    v0, 0(s1)
-	ldloc 9
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01073f30: 0x1073f30: sll   zero, zero, 0
-// 0x01073f34: 0x1073f34: beq   v0, zero, 0x1073f78 addiu s0, s0, 18500
-	ldloc 6
-	ldloc 8
-	ldc.i4 18500
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 41
 	add
-	stloc 8
-	brfalse L_1073f78
-// --- basic block ---
-// 0x01073f3c: 0x1073f3c: addiu s0, sp, 88
+	ldelem.i4
+	stloc 9
+// 0x01073fe8: 0x1073fe8: jr    ra addiu sp, sp, 176
 	ldloc.0
-	ldc.i4.s 88
+	ldc.i4 176
 	add
-	stloc 8
-// 0x01073f40: 0x1073f40: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x01073f44: 0x1073f44: addu  a1, s0, zero
-	ldloc 8
-	stloc.2
-// 0x01073f48: 0x1073f48: jal   0x1067b64 addiu a2, zero, 201
-	ldc.i4 201
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01073f50: 0x1073f50: bne   v0, zero, 0x1073f7c addiu s1, sp, 292
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
-	ldloc.0
-	ldc.i4 292
-	add
-	stloc 9
-	brtrue L_1073f7c
-// --- basic block ---
-// 0x01073f58: 0x1073f58: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01073f5c: 0x1073f5c: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01073f60: 0x1073f60: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01073f64: 0x1073f64: addiu a3, a3, -31236
-	ldloc 4
-	ldc.i4 -31236
-	add
+	ret
+}
+.method public static int32 RTNet_CollectBonus_1073ff0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s0,int32 s1,int32 s2,int32 ra)
+
+// local  6 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register t0
+// local  9 is register s0
+// local 10 is register s1
+// local 11 is register s2
+// local  0 is register sp
+// local 12 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x01073f68: 0x1073f68: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01073f6c: 0x1073f6c: j	 0x1073fb8 addiu a2, zero, 1349
-	ldc.i4 1349
-	stloc.3
-	br L_1073fb8
-// --- basic block ---
-L_1073f74:
-// 0x01073f74: 0x1073f74: addiu s0, s0, 18500
-	ldloc 8
-	ldc.i4 18500
-	add
+	ldc.i4.s 0
 	stloc 8
-L_1073f78:
-// 0x01073f78: 0x1073f78: addiu s1, sp, 292
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01073ff0: 0x1073ff0: addiu sp, sp, -176
 	ldloc.0
-	ldc.i4 292
+	ldc.i4 -176
 	add
-	stloc 9
-L_1073f7c:
-// 0x01073f7c: 0x1073f7c: lw    v0, 2384(sp)
+	stloc.0
+// 0x01073ff4: 0x1073ff4: sw    s2, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 596
+	ldc.i4.s 42
 	add
-	ldelem.i4
-	stloc 6
-// 0x01073f80: 0x1073f80: lw    a2, 2376(sp)
+	ldloc 11
+	stelem.i4
+// 0x01073ff8: 0x1073ff8: sw    s1, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 594
+	ldc.i4.s 41
 	add
-	ldelem.i4
-	stloc.3
-// 0x01073f84: 0x1073f84: lw    a3, 2380(sp)
+	ldloc 10
+	stelem.i4
+// 0x01073ffc: 0x1073ffc: addu  s2, a0, zero
+	ldloc.1
+	stloc 11
+// 0x01074000: 0x1074000: addu  s1, a1, zero
+	ldloc.2
+	stloc 10
+// 0x01074004: 0x1074004: addiu a0, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.1
+// 0x01074008: 0x1074008: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107400c: 0x107400c: sw    s0, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 595
+	ldc.i4.s 40
 	add
-	ldelem.i4
-	stloc 4
-// 0x01073f88: 0x1073f88: addu  a0, s1, zero
 	ldloc 9
-	stloc.1
-// 0x01073f8c: 0x1073f8c: addiu a1, zero, 2014
-	ldc.i4 2014
-	stloc.2
-// 0x01073f90: 0x1073f90: jal   0x1072068 sw    v0, 16(sp)
+	stelem.i4
+// 0x01074010: 0x1074010: sw    a3, 152(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 38
 	add
-	ldloc 6
+	ldloc 4
 	stelem.i4
+// 0x01074014: 0x1074014: sw    ra, 172(sp)
+// 0x01074018: 0x1074018: jal   0x106e8e8 addu  s0, a2, zero
+	ldloc.3
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::format_ParamPair_string_1072068(int32,int32,int32,int32,int32)
+	call int32 Cibyl82::SendMessage_At_106e8e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01073f98: 0x1073f98: bne   v0, zero, 0x1073fdc addiu v1, sp, 48
-	ldloc 6
+// 0x01074020: 0x1074020: lw    a3, 152(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
 	add
-	stloc 7
-	brtrue L_1073fdc
-// --- basic block ---
-// 0x01073fa0: 0x1073fa0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01073fa4: 0x1073fa4: lui   a3, 0x20000
-	ldc.i4 131072
+	ldelem.i4
 	stloc 4
-// 0x01073fa8: 0x1073fa8: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01073fac: 0x1073fac: addiu a3, a3, -31180
+// 0x01074024: 0x1074024: sll   zero, zero, 0
+// 0x01074028: 0x1074028: bne   a3, zero, 0x1074038 lui   v1, 0x20000
 	ldloc 4
-	ldc.i4 -31180
+	ldc.i4 131072
+	stloc 7
+	brtrue L_1074038
+// --- basic block ---
+// 0x01074030: 0x1074030: j	 0x1074040 addiu v1, v1, 19096
+	ldloc 7
+	ldc.i4 19096
 	add
-	stloc 4
-// 0x01073fb0: 0x1073fb0: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01073fb4: 0x1073fb4: addiu a2, zero, 1363
-	ldc.i4 1363
-	stloc.3
-L_1073fb8:
-// 0x01073fb8: 0x1073fb8: jal   0x100449c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	br L_1074040
 // --- basic block ---
-// 0x01073fc0: 0x1073fc0: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01073fc4: 0x1073fc4: lui   a1, 0x10000
+L_1074038:
+// 0x01074038: 0x1074038: lui   v1, 0x10000
 	ldc.i4 65536
-	stloc.2
-// 0x01073fc8: 0x1073fc8: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x01073fcc: 0x1073fcc: jal   0x104c148 addiu a1, a1, 32340
-	ldloc.2
-	ldc.i4 32340
+	stloc 7
+// 0x0107403c: 0x107403c: addiu v1, v1, 12204
+	ldloc 7
+	ldc.i4 12204
 	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
+L_1074040:
+// 0x01074040: 0x1074040: lw    v0, 192(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 48
+	add
+	ldelem.i4
 	stloc 6
+// 0x01074044: 0x1074044: sll   zero, zero, 0
+// 0x01074048: 0x1074048: bne   v0, zero, 0x1074058 lui   v0, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 6
+	brtrue L_1074058
 // --- basic block ---
-// 0x01073fd4: 0x1073fd4: j	 0x107404c addu  v0, zero, zero
-	ldc.i4.s 0
+// 0x01074050: 0x1074050: j	 0x1074060 addiu v0, v0, 19096
+	ldloc 6
+	ldc.i4 19096
+	add
 	stloc 6
-	br L_107404c
+	br L_1074060
 // --- basic block ---
-L_1073fdc:
-// 0x01073fdc: 0x1073fdc: addiu v0, sp, 68
-	ldloc.0
-	ldc.i4.s 68
+L_1074058:
+// 0x01074058: 0x1074058: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x0107405c: 0x107405c: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
 	add
 	stloc 6
-// 0x01073fe0: 0x1073fe0: beq   s4, zero, 0x1074014 lui   a1, 0x20000
-	ldloc 12
+L_1074060:
+// 0x01074060: 0x1074060: lui   t0, 0x20000
 	ldc.i4 131072
-	stloc.2
-	brfalse L_1074014
-// --- basic block ---
-// 0x01073fe8: 0x1073fe8: addu  a0, s4, zero
-	ldloc 12
-	stloc.1
-// 0x01073fec: 0x1073fec: addiu a1, a1, -31124
-	ldloc.2
-	ldc.i4 -31124
+	stloc 8
+// 0x01074064: 0x1074064: lw    a2, 196(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 49
 	add
-	stloc.2
-// 0x01073ff0: 0x1073ff0: addu  a2, s3, zero
-	ldloc 11
+	ldelem.i4
 	stloc.3
-// 0x01073ff4: 0x1073ff4: addu  a3, v1, zero
-	ldloc 7
-	stloc 4
-// 0x01073ff8: 0x1073ff8: sw    v0, 16(sp)
+// 0x01074068: 0x1074068: addiu t0, t0, -31148
+	ldloc 8
+	ldc.i4 -31148
+	add
+	stloc 8
+// 0x0107406c: 0x107406c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074070: 0x1074070: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
-// 0x01073ffc: 0x1073ffc: sw    s2, 20(sp)
+// 0x01074074: 0x1074074: addu  a3, s2, zero
+	ldloc 11
+	stloc 4
+// 0x01074078: 0x1074078: addiu t0, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 8
+// 0x0107407c: 0x107407c: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074080: 0x1074080: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074084: 0x1074084: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
 	ldloc 10
 	stelem.i4
-// 0x01074000: 0x1074000: sw    s0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x01074004: 0x1074004: jal   0x1000f64 sw    s1, 28(sp)
+// 0x01074088: 0x1074088: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -518,217 +713,195 @@ L_1073fdc:
 	add
 	ldloc 9
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0107400c: 0x107400c: j	 0x107404c addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-	br L_107404c
-// --- basic block ---
-L_1074014:
-// 0x01074014: 0x1074014: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074018: 0x1074018: lw    a2, 2388(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 597
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107401c: 0x107401c: addiu t0, a1, -31124
-	ldloc.2
-	ldc.i4 -31124
-	add
-	stloc 15
-// 0x01074020: 0x1074020: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x01074024: 0x1074024: addu  a3, s5, zero
-	ldloc 13
-	stloc 4
-// 0x01074028: 0x1074028: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x0107402c: 0x107402c: sw    t0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 15
-	stelem.i4
-// 0x01074030: 0x1074030: sw    s3, 20(sp)
+// 0x0107408c: 0x107408c: sw    t0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 11
-	stelem.i4
-// 0x01074034: 0x1074034: sw    v1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 7
-	stelem.i4
-// 0x01074038: 0x1074038: sw    v0, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
-// 0x0107403c: 0x107403c: sw    s2, 32(sp)
+// 0x01074090: 0x1074090: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 10
+	ldloc 7
 	stelem.i4
-// 0x01074040: 0x1074040: sw    s0, 36(sp)
+// 0x01074094: 0x1074094: jal   0x10732fc sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 9
 	add
-	ldloc 8
-	stelem.i4
-// 0x01074044: 0x1074044: jal   0x1072cd8 sw    s1, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 9
+	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_107404c:
-// 0x0107404c: 0x107404c: lw    ra, 2348(sp)
-// 0x01074050: 0x1074050: lw    s5, 2344(sp)
+// 0x0107409c: 0x107409c: lw    ra, 172(sp)
+// 0x010740a0: 0x10740a0: lw    s2, 168(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 586
+	ldc.i4.s 42
 	add
 	ldelem.i4
-	stloc 13
-// 0x01074054: 0x1074054: lw    s4, 2340(sp)
+	stloc 11
+// 0x010740a4: 0x10740a4: lw    s1, 164(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
+	ldc.i4.s 41
 	add
 	ldelem.i4
-	stloc 12
-// 0x01074058: 0x1074058: lw    s3, 2336(sp)
+	stloc 10
+// 0x010740a8: 0x10740a8: lw    s0, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 584
+	ldc.i4.s 40
 	add
 	ldelem.i4
-	stloc 11
-// 0x0107405c: 0x107405c: lw    s2, 2332(sp)
-	ldloc 5
+	stloc 9
+// 0x010740ac: 0x10740ac: jr    ra addiu sp, sp, 176
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 583
+	ldc.i4 176
 	add
-	ldelem.i4
-	stloc 10
-// 0x01074060: 0x1074060: lw    s1, 2328(sp)
-	ldloc 5
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTNet_GeneralPacket_10740b4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010740b4: 0x10740b4: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 582
+	ldc.i4.s -32
 	add
-	ldelem.i4
-	stloc 9
-// 0x01074064: 0x1074064: lw    s0, 2324(sp)
-	ldloc 5
+	stloc.0
+// 0x010740b8: 0x10740b8: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x010740bc: 0x10740bc: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010740c0: 0x10740c0: sw    a1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 581
+	ldc.i4.4
 	add
-	ldelem.i4
+	ldloc.2
+	stelem.i4
+// 0x010740c4: 0x10740c4: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x010740c8: 0x10740c8: sw    ra, 28(sp)
+// 0x010740cc: 0x10740cc: jal   0x10732fc addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-// 0x01074068: 0x1074068: jr    ra addiu sp, sp, 2352
+	stloc 7
+// --- basic block ---
+// 0x010740d4: 0x10740d4: lw    ra, 28(sp)
+// 0x010740d8: 0x10740d8: sll   zero, zero, 0
+// 0x010740dc: 0x10740dc: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4 2352
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 7
 	ret
 }
-.method public static int32 RTNet_ReportMapProblem_1074070(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_UpdateProfile_10740e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s5,int32 v1,int32 s0,int32 s3,int32 s1,int32 s4,int32 s2,int32 ra,int32 t0)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
 
 // local  6 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 15 is register t0
-// local  9 is register s0
-// local 11 is register s1
-// local 13 is register s2
-// local 10 is register s3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
 // local 12 is register s4
-// local  7 is register s5
 // local  0 is register sp
-// local 14 is register ra
+// local 13 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -738,513 +911,331 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 15
+	stloc 8
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 12
+	stloc 11
 	ldc.i4.s 0
-	stloc 7
+	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074070: 0x1074070: addiu sp, sp, -880
+// 0x010740e4: 0x10740e4: addiu sp, sp, -64
 	ldloc.0
-	ldc.i4 -880
+	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01074074: 0x1074074: sw    s4, 868(sp)
+// 0x010740e8: 0x10740e8: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 217
+	ldc.i4.s 13
 	add
-	ldloc 12
+	ldloc 11
 	stelem.i4
-// 0x01074078: 0x1074078: sw    s3, 864(sp)
+// 0x010740ec: 0x10740ec: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 216
+	ldc.i4.s 12
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107407c: 0x107407c: sw    s2, 860(sp)
+// 0x010740f0: 0x10740f0: lw    s3, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 215
+	ldc.i4.s 20
 	add
-	ldloc 13
-	stelem.i4
-// 0x01074080: 0x1074080: sw    s1, 856(sp)
+	ldelem.i4
+	stloc 11
+// 0x010740f4: 0x10740f4: addu  s2, a1, zero
+	ldloc.2
+	stloc 10
+// 0x010740f8: 0x10740f8: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 214
+	ldc.i4.s 10
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x01074084: 0x1074084: sw    s0, 852(sp)
+// 0x010740fc: 0x10740fc: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01074100: 0x1074100: addu  s0, a3, zero
+	ldloc 4
+	stloc 8
+// 0x01074104: 0x1074104: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01074108: 0x1074108: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 213
+	ldc.i4.s 14
 	add
-	ldloc 9
+	ldloc 12
 	stelem.i4
-// 0x01074088: 0x1074088: sw    ra, 876(sp)
-// 0x0107408c: 0x107408c: sw    s5, 872(sp)
+// 0x0107410c: 0x107410c: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 218
+	ldc.i4.s 11
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x01074090: 0x1074090: addu  s2, a0, zero
+// 0x01074110: 0x1074110: addu  s4, a0, zero
 	ldloc.1
-	stloc 13
-// 0x01074094: 0x1074094: addu  s1, a1, zero
+	stloc 12
+// 0x01074114: 0x1074114: addu  s1, a2, zero
+	ldloc.3
+	stloc 9
+// 0x01074118: 0x1074118: addiu a1, a1, 32716
 	ldloc.2
-	stloc 11
-// 0x01074098: 0x1074098: lw    s0, 896(sp)
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x0107411c: 0x107411c: addiu a3, a3, -31120
+	ldloc 4
+	ldc.i4 -31120
+	add
+	stloc 4
+// 0x01074120: 0x1074120: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01074124: 0x1074124: addiu a2, zero, 1566
+	ldc.i4 1566
+	stloc.3
+// 0x01074128: 0x1074128: sw    ra, 60(sp)
+// 0x0107412c: 0x107412c: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 224
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 9
-// 0x0107409c: 0x107409c: lw    s4, 904(sp)
+	ldloc 10
+	stelem.i4
+// 0x01074130: 0x1074130: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 226
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 12
-// 0x010740a0: 0x10740a0: beq   a2, zero, 0x1074108 addu  s3, a3, zero
-	ldloc.3
-	ldloc 4
-	stloc 10
-	brfalse L_1074108
-// --- basic block ---
-// 0x010740a8: 0x10740a8: lb    v0, 0(a2)
-	ldloc.3
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x010740ac: 0x10740ac: sll   zero, zero, 0
-// 0x010740b0: 0x10740b0: beq   v0, zero, 0x107410c lui   s5, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc 7
-	brfalse L_107410c
-// --- basic block ---
-// 0x010740b8: 0x10740b8: addiu s5, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 7
-// 0x010740bc: 0x10740bc: addu  a0, a2, zero
-	ldloc.3
-	stloc.1
-// 0x010740c0: 0x10740c0: addu  a1, s5, zero
-	ldloc 7
-	stloc.2
-// 0x010740c4: 0x10740c4: jal   0x1067b64 addiu a2, zero, 801
-	ldc.i4 801
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x010740cc: 0x10740cc: bne   v0, zero, 0x1074110 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brtrue L_1074110
-// --- basic block ---
-// 0x010740d4: 0x10740d4: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x010740d8: 0x10740d8: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x010740dc: 0x10740dc: addiu a3, a3, -31092
-	ldloc 4
-	ldc.i4 -31092
-	add
-	stloc 4
-// 0x010740e0: 0x10740e0: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010740e4: 0x10740e4: jal   0x100449c addiu a2, zero, 1286
-	ldc.i4 1286
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x010740ec: 0x10740ec: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x010740f0: 0x10740f0: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010740f4: 0x10740f4: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x010740f8: 0x10740f8: jal   0x104c148 addiu a1, a1, 32340
-	ldloc.2
-	ldc.i4 32340
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x01074100: 0x1074100: j	 0x1074134 sw    zero, 0(s0)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-	br L_1074134
-// --- basic block ---
-L_1074108:
-// 0x01074108: 0x1074108: lui   s5, 0x10000
-	ldc.i4 65536
-	stloc 7
-L_107410c:
-// 0x0107410c: 0x107410c: addiu s5, s5, 18500
-	ldloc 7
-	ldc.i4 18500
-	add
-	stloc 7
-L_1074110:
-// 0x01074110: 0x1074110: bne   s3, zero, 0x107413c lui   a1, 0x10000
-	ldloc 10
-	ldc.i4 65536
-	stloc.2
-	brtrue L_107413c
-// --- basic block ---
-// 0x01074118: 0x1074118: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x0107411c: 0x107411c: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01074120: 0x1074120: addiu a3, a3, -31028
-	ldloc 4
-	ldc.i4 -31028
-	add
-	stloc 4
-// 0x01074124: 0x1074124: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01074128: 0x1074128: jal   0x100449c addiu a2, zero, 1295
-	ldc.i4 1295
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x01074130: 0x1074130: sw    zero, 0(s0)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-L_1074134:
-// 0x01074134: 0x1074134: j	 0x10741a8 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_10741a8
-// --- basic block ---
-L_107413c:
-// 0x0107413c: 0x107413c: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x01074140: 0x1074140: sw    v0, 0(s0)
-	ldloc 5
 	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldloc 6
 	stelem.i4
-// 0x01074144: 0x1074144: lw    v1, 0(s3)
-	ldloc 5
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 8
-// 0x01074148: 0x1074148: lw    v0, 4(s3)
-	ldloc 5
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 6
-// 0x0107414c: 0x107414c: beq   s4, zero, 0x1074178 lui   a1, 0x20000
-	ldloc 12
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1074178
-// --- basic block ---
-// 0x01074154: 0x1074154: addu  a0, s4, zero
-	ldloc 12
-	stloc.1
-// 0x01074158: 0x1074158: addiu a1, a1, -30980
-	ldloc.2
-	ldc.i4 -30980
-	add
-	stloc.2
-// 0x0107415c: 0x107415c: addu  a2, v1, zero
-	ldloc 8
-	stloc.3
-// 0x01074160: 0x1074160: addu  a3, v0, zero
-	ldloc 6
-	stloc 4
-// 0x01074164: 0x1074164: sw    s1, 16(sp)
+// 0x01074134: 0x1074134: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x01074168: 0x1074168: jal   0x1000f64 sw    s5, 20(sp)
+// 0x01074138: 0x1074138: jal   0x100449c sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldloc 7
+	ldloc 11
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01074170: 0x1074170: j	 0x10741a8 addiu v0, zero, 1
-	ldc.i4.1
+// 0x01074140: 0x1074140: bne   s3, zero, 0x1074150 lui   v0, 0x10000
+	ldloc 11
+	ldc.i4 65536
 	stloc 6
-	br L_10741a8
+	brtrue L_1074150
 // --- basic block ---
-L_1074178:
-// 0x01074178: 0x1074178: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0107417c: 0x107417c: lw    a2, 900(sp)
+// 0x01074148: 0x1074148: j	 0x1074158 addiu v0, v0, -25260
+	ldloc 6
+	ldc.i4 -25260
+	add
+	stloc 6
+	br L_1074158
+// --- basic block ---
+L_1074150:
+// 0x01074150: 0x1074150: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x01074154: 0x1074154: addiu v0, v0, 32576
+	ldloc 6
+	ldc.i4 32576
+	add
+	stloc 6
+L_1074158:
+// 0x01074158: 0x1074158: lw    a2, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 225
+	ldc.i4.s 21
 	add
 	ldelem.i4
 	stloc.3
-// 0x01074180: 0x1074180: addiu t0, a1, -30980
-	ldloc.2
-	ldc.i4 -30980
+// 0x0107415c: 0x107415c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074160: 0x1074160: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 7
+// 0x01074164: 0x1074164: addu  a3, s4, zero
+	ldloc 12
+	stloc 4
+// 0x01074168: 0x1074168: addiu v1, v1, -31044
+	ldloc 7
+	ldc.i4 -31044
 	add
-	stloc 15
-// 0x01074184: 0x1074184: addiu a0, a0, 15252
+	stloc 7
+// 0x0107416c: 0x107416c: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01074188: 0x1074188: addu  a3, s2, zero
-	ldloc 13
-	stloc 4
-// 0x0107418c: 0x107418c: addiu a1, zero, 36
+// 0x01074170: 0x1074170: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01074190: 0x1074190: sw    t0, 16(sp)
+// 0x01074174: 0x1074174: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldloc 15
+	ldloc 10
 	stelem.i4
-// 0x01074194: 0x1074194: sw    v1, 20(sp)
+// 0x01074178: 0x1074178: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x01074198: 0x1074198: sw    v0, 24(sp)
+// 0x0107417c: 0x107417c: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.7
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
-// 0x0107419c: 0x107419c: sw    s1, 28(sp)
+// 0x01074180: 0x1074180: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldloc 11
+	ldloc 7
 	stelem.i4
-// 0x010741a0: 0x10741a0: jal   0x1072cd8 sw    s5, 32(sp)
+// 0x01074184: 0x1074184: jal   0x10732fc sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 6
 // --- basic block ---
-L_10741a8:
-// 0x010741a8: 0x10741a8: lw    ra, 876(sp)
-// 0x010741ac: 0x10741ac: lw    s5, 872(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 218
-	add
-	ldelem.i4
-	stloc 7
-// 0x010741b0: 0x10741b0: lw    s4, 868(sp)
+// 0x0107418c: 0x107418c: lw    ra, 60(sp)
+// 0x01074190: 0x1074190: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 217
+	ldc.i4.s 14
 	add
 	ldelem.i4
 	stloc 12
-// 0x010741b4: 0x10741b4: lw    s3, 864(sp)
+// 0x01074194: 0x1074194: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 216
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc 10
-// 0x010741b8: 0x10741b8: lw    s2, 860(sp)
+	stloc 11
+// 0x01074198: 0x1074198: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 215
+	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc 13
-// 0x010741bc: 0x10741bc: lw    s1, 856(sp)
+	stloc 10
+// 0x0107419c: 0x107419c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 214
+	ldc.i4.s 11
 	add
 	ldelem.i4
-	stloc 11
-// 0x010741c0: 0x10741c0: lw    s0, 852(sp)
+	stloc 9
+// 0x010741a0: 0x10741a0: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 213
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 9
-// 0x010741c4: 0x10741c4: jr    ra addiu sp, sp, 880
+	stloc 8
+// 0x010741a4: 0x10741a4: jr    ra addiu sp, sp, 64
 	ldloc.0
-	ldc.i4 880
+	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_RemoveAlert_10741cc(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_TrafficAlertFeedback_10741ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
@@ -1279,44 +1270,59 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010741cc: 0x10741cc: addiu sp, sp, -32
+// 0x010741ac: 0x10741ac: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010741d0: 0x10741d0: addu  a3, a0, zero
+// 0x010741b0: 0x10741b0: addu  v0, a0, zero
 	ldloc.1
-	stloc 4
-// 0x010741d4: 0x10741d4: lui   v0, 0x20000
-	ldc.i4 131072
 	stloc 5
-// 0x010741d8: 0x10741d8: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x010741dc: 0x10741dc: sw    a1, 20(sp)
+// 0x010741b4: 0x10741b4: sw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
+	add
+	ldloc.3
+	stelem.i4
+// 0x010741b8: 0x10741b8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010741bc: 0x10741bc: addu  a2, a3, zero
+	ldloc 4
+	stloc.3
+// 0x010741c0: 0x10741c0: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x010741c4: 0x10741c4: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x010741c8: 0x10741c8: sw    a1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
 	ldloc.2
 	stelem.i4
-// 0x010741e0: 0x10741e0: addiu v0, v0, -30892
+// 0x010741cc: 0x10741cc: addiu v0, v0, -30944
 	ldloc 5
-	ldc.i4 -30892
+	ldc.i4 -30944
 	add
 	stloc 5
-// 0x010741e4: 0x10741e4: addiu a0, a0, 15252
+// 0x010741d0: 0x10741d0: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x010741e8: 0x10741e8: addiu a1, zero, 36
+// 0x010741d4: 0x10741d4: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x010741ec: 0x10741ec: sw    ra, 28(sp)
-// 0x010741f0: 0x10741f0: jal   0x1072cd8 sw    v0, 16(sp)
+// 0x010741d8: 0x10741d8: sw    ra, 36(sp)
+// 0x010741dc: 0x10741dc: jal   0x10732fc sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1330,16 +1336,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010741f8: 0x10741f8: lw    ra, 28(sp)
-// 0x010741fc: 0x10741fc: sll   zero, zero, 0
-// 0x01074200: 0x1074200: jr    ra addiu sp, sp, 32
+// 0x010741e4: 0x10741e4: lw    ra, 36(sp)
+// 0x010741e8: 0x10741e8: sll   zero, zero, 0
+// 0x010741ec: 0x10741ec: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -1349,31 +1355,25 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTNet_PinqWazer_1074208(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_UserPoints_1074230(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local  8 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local 12 is register s4
-// local 13 is register s5
 // local  0 is register sp
-// local 14 is register ra
-// local  5 is register mem
+// local  8 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1382,532 +1382,377 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074208: 0x1074208: addiu sp, sp, -976
+// 0x01074230: 0x1074230: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4 -976
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0107420c: 0x107420c: lw    v0, 1000(sp)
+// 0x01074234: 0x1074234: addu  v1, a3, zero
+	ldloc 4
+	stloc 5
+// 0x01074238: 0x1074238: sw    ra, 28(sp)
+// 0x0107423c: 0x107423c: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x01074240: 0x1074240: beq   v1, zero, 0x1074264 addu  v0, a1, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 250
+	ldloc.2
+	stloc 6
+	brfalse L_1074264
+// --- basic block ---
+// 0x01074248: 0x1074248: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107424c: 0x107424c: addu  a0, v1, zero
+	ldloc 5
+	stloc.1
+// 0x01074250: 0x1074250: addiu a1, a1, -30900
+	ldloc.2
+	ldc.i4 -30900
 	add
-	ldelem.i4
+	stloc.2
+// 0x01074254: 0x1074254: jal   0x1000f64 addu  a2, v0, zero
+	ldloc 6
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 6
+// --- basic block ---
+// 0x0107425c: 0x107425c: j	 0x1074284 addiu v0, zero, 1
+	ldc.i4.1
 	stloc 6
-// 0x01074210: 0x1074210: sw    s5, 968(sp)
+	br L_1074284
+// --- basic block ---
+L_1074264:
+// 0x01074264: 0x1074264: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074268: 0x1074268: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0107426c: 0x107426c: addiu v1, v1, -30884
 	ldloc 5
+	ldc.i4 -30884
+	add
+	stloc 5
+// 0x01074270: 0x1074270: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074274: 0x1074274: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074278: 0x1074278: sw    v1, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 242
+	ldc.i4.4
 	add
-	ldloc 13
-	stelem.i4
-// 0x01074214: 0x1074214: sw    s4, 964(sp)
 	ldloc 5
+	stelem.i4
+// 0x0107427c: 0x107427c: jal   0x10732fc sw    v0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 241
+	ldc.i4.5
 	add
-	ldloc 12
+	ldloc 6
 	stelem.i4
-// 0x01074218: 0x1074218: sw    s3, 960(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 6
+// --- basic block ---
+L_1074284:
+// 0x01074284: 0x1074284: lw    ra, 28(sp)
+// 0x01074288: 0x1074288: sll   zero, zero, 0
+// 0x0107428c: 0x107428c: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTNet_Location_1074294(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+
+// local  6 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01074294: 0x1074294: addiu sp, sp, -88
+	ldloc.0
+	ldc.i4.s -88
+	add
+	stloc.0
+// 0x01074298: 0x1074298: sw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 240
+	ldc.i4.s 19
 	add
-	ldloc 11
+	ldloc 7
 	stelem.i4
-// 0x0107421c: 0x107421c: sw    s2, 956(sp)
+// 0x0107429c: 0x107429c: addiu s0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc 7
+// 0x010742a0: 0x10742a0: sw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 239
+	ldc.i4.s 20
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01074220: 0x1074220: sw    s0, 948(sp)
+// 0x010742a4: 0x10742a4: addu  s1, a0, zero
+	ldloc.1
+	stloc 8
+// 0x010742a8: 0x10742a8: sw    a2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 237
+	ldc.i4.s 16
 	add
-	ldloc 9
+	ldloc.3
 	stelem.i4
-// 0x01074224: 0x1074224: sw    ra, 972(sp)
-// 0x01074228: 0x1074228: sw    s1, 952(sp)
+// 0x010742ac: 0x10742ac: sw    a3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 238
+	ldc.i4.s 17
 	add
-	ldloc 8
+	ldloc 4
 	stelem.i4
-// 0x0107422c: 0x107422c: addu  s4, a0, zero
+// 0x010742b0: 0x10742b0: sw    ra, 84(sp)
+// 0x010742b4: 0x10742b4: jal   0x10730b8 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+	ldloc.0
 	ldloc.1
-	stloc 12
-// 0x01074230: 0x1074230: addu  s5, a1, zero
 	ldloc.2
-	stloc 13
-// 0x01074234: 0x1074234: addu  s3, a2, zero
 	ldloc.3
-	stloc 11
-// 0x01074238: 0x1074238: lw    s0, 1004(sp)
+	ldloc 4
+	call int32 Cibyl86::format_RoadMapPosition_string_10730b8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
+// --- basic block ---
+// 0x010742bc: 0x10742bc: lw    a3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 251
+	ldc.i4.s 17
 	add
 	ldelem.i4
-	stloc 9
-// 0x0107423c: 0x107423c: beq   v0, zero, 0x10742a4 addu  s2, a3, zero
-	ldloc 6
-	ldloc 4
-	stloc 10
-	brfalse L_10742a4
-// --- basic block ---
-// 0x01074244: 0x1074244: lb    v1, 0(v0)
-	ldloc 6
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 7
-// 0x01074248: 0x1074248: sll   zero, zero, 0
-// 0x0107424c: 0x107424c: beq   v1, zero, 0x10742a8 lui   s1, 0x10000
-	ldloc 7
-	ldc.i4 65536
-	stloc 8
-	brfalse L_10742a8
-// --- basic block ---
-// 0x01074254: 0x1074254: addiu s1, sp, 136
+	stloc 4
+// 0x010742c0: 0x10742c0: lw    a2, 64(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4 136
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
 	add
-	stloc 8
-// 0x01074258: 0x1074258: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x0107425c: 0x107425c: addu  a1, s1, zero
-	ldloc 8
-	stloc.2
-// 0x01074260: 0x1074260: jal   0x1067b64 addiu a2, zero, 801
-	ldc.i4 801
+	ldelem.i4
 	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x010742c4: 0x10742c4: beq   a3, zero, 0x10742e4 lui   v0, 0x20000
 	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4 131072
 	stloc 6
+	brfalse L_10742e4
 // --- basic block ---
-// 0x01074268: 0x1074268: bne   v0, zero, 0x10742ac lui   a1, 0x10000
+// 0x010742cc: 0x10742cc: addu  a0, a3, zero
+	ldloc 4
+	stloc.1
+// 0x010742d0: 0x10742d0: addiu a1, v0, -30868
 	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brtrue L_10742ac
-// --- basic block ---
-// 0x01074270: 0x1074270: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01074274: 0x1074274: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
+	ldc.i4 -30868
 	add
 	stloc.2
-// 0x01074278: 0x1074278: addiu a3, a3, -30872
-	ldloc 4
-	ldc.i4 -30872
-	add
-	stloc 4
-// 0x0107427c: 0x107427c: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01074280: 0x1074280: jal   0x100449c addiu a2, zero, 1228
-	ldc.i4 1228
+// 0x010742d4: 0x10742d4: jal   0x1000f64 addu  a2, s0, zero
+	ldloc 7
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01074288: 0x1074288: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0107428c: 0x107428c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01074290: 0x1074290: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x01074294: 0x1074294: jal   0x104c148 addiu a1, a1, 22420
-	ldloc.2
-	ldc.i4 22420
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x010742dc: 0x10742dc: j	 0x1074304 addiu v0, zero, 1
+	ldc.i4.1
 	stloc 6
+	br L_1074304
 // --- basic block ---
-// 0x0107429c: 0x107429c: j	 0x1074334 addu  v0, zero, zero
+L_10742e4:
+// 0x010742e4: 0x10742e4: lui   a0, 0x0
 	ldc.i4.s 0
-	stloc 6
-	br L_1074334
-// --- basic block ---
-L_10742a4:
-// 0x010742a4: 0x10742a4: lui   s1, 0x10000
-	ldc.i4 65536
-	stloc 8
-L_10742a8:
-// 0x010742a8: 0x10742a8: addiu s1, s1, 18500
-	ldloc 8
-	ldc.i4 18500
-	add
-	stloc 8
-L_10742ac:
-// 0x010742ac: 0x10742ac: bne   s0, zero, 0x10742bc addu  a1, s5, zero
-	ldloc 9
-	ldloc 13
-	stloc.2
-	brtrue L_10742bc
-// --- basic block ---
-// 0x010742b4: 0x10742b4: lui   s0, 0x10000
-	ldc.i4 65536
-	stloc 9
-// 0x010742b8: 0x10742b8: addiu s0, s0, 18500
-	ldloc 9
-	ldc.i4 18500
-	add
-	stloc 9
-L_10742bc:
-// 0x010742bc: 0x10742bc: jal   0x1072988 addiu a0, sp, 56
-	ldloc.0
-	ldc.i4.s 56
-	add
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::format_RoadMapGpsPosition_Pos_Azy_Str_1072988(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010742c4: 0x10742c4: lw    v0, 1008(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 252
-	add
-	ldelem.i4
-	stloc 6
-// 0x010742c8: 0x10742c8: sll   zero, zero, 0
-// 0x010742cc: 0x10742cc: bne   v0, zero, 0x10742dc lui   v0, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brtrue L_10742dc
-// --- basic block ---
-// 0x010742d4: 0x10742d4: j	 0x10742e4 addiu v0, v0, 18636
-	ldloc 6
-	ldc.i4 18636
-	add
-	stloc 6
-	br L_10742e4
-// --- basic block ---
-L_10742dc:
-// 0x010742dc: 0x10742dc: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x010742e0: 0x10742e0: addiu v0, v0, 12208
+// 0x010742e8: 0x10742e8: addiu v0, v0, -30868
 	ldloc 6
-	ldc.i4 12208
+	ldc.i4 -30868
 	add
 	stloc 6
-L_10742e4:
-// 0x010742e4: 0x10742e4: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 7
-// 0x010742e8: 0x10742e8: addiu v1, v1, -30820
-	ldloc 7
-	ldc.i4 -30820
-	add
-	stloc 7
-// 0x010742ec: 0x10742ec: sw    v1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x010742f0: 0x10742f0: addiu v1, sp, 56
-	ldloc.0
-	ldc.i4.s 56
-	add
-	stloc 7
-// 0x010742f4: 0x10742f4: sw    v1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x010742f8: 0x10742f8: lw    v1, 992(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 248
-	add
-	ldelem.i4
-	stloc 7
-// 0x010742fc: 0x10742fc: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074300: 0x1074300: sw    v1, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 7
-	stelem.i4
-// 0x01074304: 0x1074304: lw    a2, 1012(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 253
-	add
-	ldelem.i4
-	stloc.3
-// 0x01074308: 0x1074308: lw    v1, 996(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 249
-	add
-	ldelem.i4
-	stloc 7
-// 0x0107430c: 0x107430c: addiu a0, a0, 15252
+// 0x010742ec: 0x10742ec: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01074310: 0x1074310: addu  a3, s4, zero
-	ldloc 12
+// 0x010742f0: 0x10742f0: addu  a3, s1, zero
+	ldloc 8
 	stloc 4
-// 0x01074314: 0x1074314: addiu a1, zero, 36
+// 0x010742f4: 0x10742f4: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01074318: 0x1074318: sw    s3, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 11
-	stelem.i4
-// 0x0107431c: 0x107431c: sw    s2, 28(sp)
+// 0x010742f8: 0x10742f8: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldloc 10
+	ldloc 6
 	stelem.i4
-// 0x01074320: 0x1074320: sw    v1, 36(sp)
+// 0x010742fc: 0x10742fc: jal   0x10732fc sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.5
 	add
 	ldloc 7
 	stelem.i4
-// 0x01074324: 0x1074324: sw    s1, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 8
-	stelem.i4
-// 0x01074328: 0x1074328: sw    s0, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107432c: 0x107432c: jal   0x1072cd8 sw    v0, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 6
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-L_1074334:
-// 0x01074334: 0x1074334: lw    ra, 972(sp)
-// 0x01074338: 0x1074338: lw    s5, 968(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 242
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107433c: 0x107433c: lw    s4, 964(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 241
-	add
-	ldelem.i4
-	stloc 12
-// 0x01074340: 0x1074340: lw    s3, 960(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 240
-	add
-	ldelem.i4
-	stloc 11
-// 0x01074344: 0x1074344: lw    s2, 956(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 239
-	add
-	ldelem.i4
-	stloc 10
-// 0x01074348: 0x1074348: lw    s1, 952(sp)
+L_1074304:
+// 0x01074304: 0x1074304: lw    ra, 84(sp)
+// 0x01074308: 0x1074308: lw    s1, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 238
+	ldc.i4.s 20
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107434c: 0x107434c: lw    s0, 948(sp)
+// 0x0107430c: 0x107430c: lw    s0, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 237
+	ldc.i4.s 19
 	add
 	ldelem.i4
-	stloc 9
-// 0x01074350: 0x1074350: jr    ra addiu sp, sp, 976
+	stloc 7
+// 0x01074310: 0x1074310: jr    ra addiu sp, sp, 88
 	ldloc.0
-	ldc.i4 976
+	ldc.i4.s 88
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_ReportAlertAtPosition_1074358(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_SetMood_1074318(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s2,int32 s0,int32 s1,int32 s3,int32 s4,int32 s5,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register t0
-// local 10 is register s0
-// local 11 is register s1
-// local  9 is register s2
-// local 12 is register s3
-// local 13 is register s4
-// local 14 is register s5
 // local  0 is register sp
-// local 15 is register ra
-// local  5 is register mem
+// local  8 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1916,368 +1761,375 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074358: 0x1074358: addiu sp, sp, -984
+// 0x01074318: 0x1074318: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4 -984
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0107435c: 0x107435c: sw    s5, 976(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 244
-	add
-	ldloc 14
-	stelem.i4
-// 0x01074360: 0x1074360: sw    s4, 972(sp)
+// 0x0107431c: 0x107431c: addu  v1, a3, zero
+	ldloc 4
+	stloc 5
+// 0x01074320: 0x1074320: sw    ra, 28(sp)
+// 0x01074324: 0x1074324: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x01074328: 0x1074328: beq   v1, zero, 0x107434c addu  v0, a1, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 243
-	add
-	ldloc 13
-	stelem.i4
-// 0x01074364: 0x1074364: sw    s3, 968(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 242
-	add
-	ldloc 12
-	stelem.i4
-// 0x01074368: 0x1074368: sw    s1, 960(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 240
-	add
-	ldloc 11
-	stelem.i4
-// 0x0107436c: 0x107436c: sw    s0, 956(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 239
-	add
-	ldloc 10
-	stelem.i4
-// 0x01074370: 0x1074370: sw    ra, 980(sp)
-// 0x01074374: 0x1074374: sw    s2, 964(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 241
-	add
-	ldloc 9
-	stelem.i4
-// 0x01074378: 0x1074378: addu  s5, a0, zero
-	ldloc.1
-	stloc 14
-// 0x0107437c: 0x107437c: addu  s4, a1, zero
-	ldloc.2
-	stloc 13
-// 0x01074380: 0x1074380: lw    s1, 1000(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 250
-	add
-	ldelem.i4
-	stloc 11
-// 0x01074384: 0x1074384: lw    s0, 1024(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 256
-	add
-	ldelem.i4
-	stloc 10
-// 0x01074388: 0x1074388: beq   a2, zero, 0x10743f0 addu  s3, a3, zero
-	ldloc.3
-	ldloc 4
-	stloc 12
-	brfalse L_10743f0
-// --- basic block ---
-// 0x01074390: 0x1074390: lb    v0, 0(a2)
-	ldloc.3
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01074394: 0x1074394: sll   zero, zero, 0
-// 0x01074398: 0x1074398: beq   v0, zero, 0x10743f4 lui   s2, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc 9
-	brfalse L_10743f4
-// --- basic block ---
-// 0x010743a0: 0x10743a0: addiu s2, sp, 144
-	ldloc.0
-	ldc.i4 144
-	add
-	stloc 9
-// 0x010743a4: 0x10743a4: addu  a0, a2, zero
-	ldloc.3
-	stloc.1
-// 0x010743a8: 0x10743a8: addu  a1, s2, zero
-	ldloc 9
-	stloc.2
-// 0x010743ac: 0x10743ac: jal   0x1067b64 addiu a2, zero, 801
-	ldc.i4 801
-	stloc.3
-	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	brfalse L_107434c
 // --- basic block ---
-// 0x010743b4: 0x10743b4: bne   v0, zero, 0x10743f8 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brtrue L_10743f8
-// --- basic block ---
-// 0x010743bc: 0x10743bc: lui   a3, 0x20000
+// 0x01074330: 0x1074330: lui   a1, 0x20000
 	ldc.i4 131072
-	stloc 4
-// 0x010743c0: 0x10743c0: addiu a1, a1, 32252
+	stloc.2
+// 0x01074334: 0x1074334: addu  a0, v1, zero
+	ldloc 5
+	stloc.1
+// 0x01074338: 0x1074338: addiu a1, a1, -30852
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 -30852
 	add
 	stloc.2
-// 0x010743c4: 0x10743c4: addiu a3, a3, -31092
-	ldloc 4
-	ldc.i4 -31092
-	add
-	stloc 4
-// 0x010743c8: 0x10743c8: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x010743cc: 0x10743cc: jal   0x100449c addiu a2, zero, 1176
-	ldc.i4 1176
+// 0x0107433c: 0x107433c: jal   0x1000f64 addu  a2, v0, zero
+	ldloc 6
 	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 5
+	stloc 6
+// --- basic block ---
+// 0x01074344: 0x1074344: j	 0x107436c addiu v0, zero, 1
+	ldc.i4.1
 	stloc 6
+	br L_107436c
 // --- basic block ---
-// 0x010743d4: 0x10743d4: lui   a0, 0x0
+L_107434c:
+// 0x0107434c: 0x107434c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010743d8: 0x10743d8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x010743dc: 0x10743dc: addiu a0, a0, 30092
+// 0x01074350: 0x1074350: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01074354: 0x1074354: addiu v1, v1, -30840
+	ldloc 5
+	ldc.i4 -30840
+	add
+	stloc 5
+// 0x01074358: 0x1074358: addiu a0, a0, 15252
 	ldloc.1
-	ldc.i4 30092
+	ldc.i4 15252
 	add
 	stloc.1
-// 0x010743e0: 0x10743e0: jal   0x104c148 addiu a1, a1, 32340
-	ldloc.2
-	ldc.i4 32340
-	add
+// 0x0107435c: 0x107435c: addiu a1, zero, 36
+	ldc.i4.s 36
 	stloc.2
+// 0x01074360: 0x1074360: sw    v1, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x01074364: 0x1074364: jal   0x10732fc sw    v0, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x010743e8: 0x10743e8: j	 0x10744bc addu  v0, zero, zero
+L_107436c:
+// 0x0107436c: 0x107436c: lw    ra, 28(sp)
+// 0x01074370: 0x1074370: sll   zero, zero, 0
+// 0x01074374: 0x1074374: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTNet_SetMyVisability_107437c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 t0,int32 t1,int32 t2,int32 t5,int32 v0,int32 t3,int32 t4,int32 ra,int32 t6)
+
+// local 11 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register t0
+// local  8 is register t1
+// local  9 is register t2
+// local 12 is register t3
+// local 13 is register t4
+// local 10 is register t5
+// local 15 is register t6
+// local  0 is register sp
+// local 14 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 11
 	ldc.i4.s 0
 	stloc 6
-	br L_10744bc
-// --- basic block ---
-L_10743f0:
-// 0x010743f0: 0x10743f0: lui   s2, 0x10000
-	ldc.i4 65536
-	stloc 9
-L_10743f4:
-// 0x010743f4: 0x10743f4: addiu s2, s2, 18500
-	ldloc 9
-	ldc.i4 18500
-	add
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 9
-L_10743f8:
-// 0x010743f8: 0x10743f8: bne   s1, zero, 0x1074408 sll   zero, zero, 0
-	ldloc 11
-	brtrue L_1074408
-// --- basic block ---
-// 0x01074400: 0x1074400: lui   s1, 0x10000
-	ldc.i4 65536
-	stloc 11
-// 0x01074404: 0x1074404: addiu s1, s1, 18500
-	ldloc 11
-	ldc.i4 18500
-	add
-	stloc 11
-L_1074408:
-// 0x01074408: 0x1074408: bne   s0, zero, 0x1074418 sll   zero, zero, 0
-	ldloc 10
-	brtrue L_1074418
-// --- basic block ---
-// 0x01074410: 0x1074410: lui   s0, 0x10000
-	ldc.i4 65536
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
 	stloc 10
-// 0x01074414: 0x1074414: addiu s0, s0, 18500
-	ldloc 10
-	ldc.i4 18500
+	ldc.i4.s 0
+	stloc 15
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 14
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107437c: 0x107437c: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
 	add
-	stloc 10
-L_1074418:
-// 0x01074418: 0x1074418: lw    a1, 1012(sp)
+	stloc.0
+// 0x01074380: 0x1074380: lw    t5, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 253
+	ldc.i4.s 23
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107441c: 0x107441c: jal   0x10729fc addiu a0, sp, 64
-	ldloc.0
-	ldc.i4.s 64
-	add
-	stloc.1
-	ldloc.0
+	stloc 10
+// 0x01074384: 0x1074384: addu  t6, a0, zero
 	ldloc.1
+	stloc 15
+// 0x01074388: 0x1074388: addu  t4, a1, zero
 	ldloc.2
+	stloc 13
+// 0x0107438c: 0x107438c: addu  t3, a2, zero
 	ldloc.3
+	stloc 12
+// 0x01074390: 0x1074390: sw    ra, 52(sp)
+// 0x01074394: 0x1074394: addu  a2, a3, zero
 	ldloc 4
-	call int32 Cibyl85::format_RoadMapGpsPosition_string_10729fc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074424: 0x1074424: lw    v0, 1004(sp)
+	stloc.3
+// 0x01074398: 0x1074398: lw    a1, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 251
+	ldc.i4.s 19
 	add
 	ldelem.i4
-	stloc 6
-// 0x01074428: 0x1074428: sll   zero, zero, 0
-// 0x0107442c: 0x107442c: bne   v0, zero, 0x107443c lui   v1, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 7
-	brtrue L_107443c
-// --- basic block ---
-// 0x01074434: 0x1074434: j	 0x1074444 addiu v1, v1, 18636
-	ldloc 7
-	ldc.i4 18636
+	stloc.2
+// 0x0107439c: 0x107439c: lw    a3, 72(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
 	add
-	stloc 7
-	br L_1074444
-// --- basic block ---
-L_107443c:
-// 0x0107443c: 0x107443c: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x01074440: 0x1074440: addiu v1, v1, 12208
-	ldloc 7
-	ldc.i4 12208
+	ldelem.i4
+	stloc 4
+// 0x010743a0: 0x10743a0: lw    a0, 80(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
 	add
-	stloc 7
-L_1074444:
-// 0x01074444: 0x1074444: lw    v0, 1008(sp)
+	ldelem.i4
+	stloc.1
+// 0x010743a4: 0x10743a4: lw    v1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 252
+	ldc.i4.s 21
 	add
 	ldelem.i4
 	stloc 6
-// 0x01074448: 0x1074448: sll   zero, zero, 0
-// 0x0107444c: 0x107444c: bne   v0, zero, 0x107445c lui   v0, 0x20000
-	ldloc 6
+// 0x010743a8: 0x10743a8: lw    v0, 88(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
+	add
+	ldelem.i4
+	stloc 11
+// 0x010743ac: 0x10743ac: beq   t5, zero, 0x1074448 sll   zero, zero, 0
+	ldloc 10
+	brfalse L_1074448
+// --- basic block ---
+// 0x010743b4: 0x10743b4: bne   a3, zero, 0x10743c4 lui   t2, 0x20000
+	ldloc 4
+	ldc.i4 131072
+	stloc 9
+	brtrue L_10743c4
+// --- basic block ---
+// 0x010743bc: 0x10743bc: j	 0x10743cc addiu t2, t2, 19096
+	ldloc 9
+	ldc.i4 19096
+	add
+	stloc 9
+	br L_10743cc
+// --- basic block ---
+L_10743c4:
+// 0x010743c4: 0x10743c4: lui   t2, 0x10000
+	ldc.i4 65536
+	stloc 9
+// 0x010743c8: 0x10743c8: addiu t2, t2, 12204
+	ldloc 9
+	ldc.i4 12204
+	add
+	stloc 9
+L_10743cc:
+// 0x010743cc: 0x10743cc: bne   a1, zero, 0x10743dc lui   t1, 0x20000
+	ldloc.2
+	ldc.i4 131072
+	stloc 8
+	brtrue L_10743dc
+// --- basic block ---
+// 0x010743d4: 0x10743d4: j	 0x10743e4 addiu t1, t1, 19096
+	ldloc 8
+	ldc.i4 19096
+	add
+	stloc 8
+	br L_10743e4
+// --- basic block ---
+L_10743dc:
+// 0x010743dc: 0x10743dc: lui   t1, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x010743e0: 0x10743e0: addiu t1, t1, 12204
+	ldloc 8
+	ldc.i4 12204
+	add
+	stloc 8
+L_10743e4:
+// 0x010743e4: 0x10743e4: bne   a0, zero, 0x10743f4 lui   t0, 0x20000
+	ldloc.1
 	ldc.i4 131072
+	stloc 7
+	brtrue L_10743f4
+// --- basic block ---
+// 0x010743ec: 0x10743ec: j	 0x10743fc addiu t0, t0, 19096
+	ldloc 7
+	ldc.i4 19096
+	add
+	stloc 7
+	br L_10743fc
+// --- basic block ---
+L_10743f4:
+// 0x010743f4: 0x10743f4: lui   t0, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x010743f8: 0x10743f8: addiu t0, t0, 12204
+	ldloc 7
+	ldc.i4 12204
+	add
+	stloc 7
+L_10743fc:
+// 0x010743fc: 0x10743fc: bne   v1, zero, 0x107440c lui   v1, 0x10000
+	ldloc 6
+	ldc.i4 65536
 	stloc 6
-	brtrue L_107445c
+	brtrue L_107440c
 // --- basic block ---
-// 0x01074454: 0x1074454: j	 0x1074464 addiu v0, v0, 18636
+// 0x01074404: 0x1074404: j	 0x1074414 addiu v1, v1, 19424
 	ldloc 6
-	ldc.i4 18636
+	ldc.i4 19424
 	add
 	stloc 6
-	br L_1074464
+	br L_1074414
 // --- basic block ---
-L_107445c:
-// 0x0107445c: 0x107445c: lui   v0, 0x10000
+L_107440c:
+// 0x0107440c: 0x107440c: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x01074460: 0x1074460: addiu v0, v0, 12208
+// 0x01074410: 0x1074410: addiu v1, v1, 19396
 	ldloc 6
-	ldc.i4 12208
+	ldc.i4 19396
 	add
 	stloc 6
-L_1074464:
-// 0x01074464: 0x1074464: lui   t0, 0x20000
+L_1074414:
+// 0x01074414: 0x1074414: lui   a1, 0x20000
 	ldc.i4 131072
-	stloc 8
-// 0x01074468: 0x1074468: addiu t0, t0, -30784
-	ldloc 8
-	ldc.i4 -30784
+	stloc.2
+// 0x01074418: 0x1074418: addu  a0, t5, zero
+	ldloc 10
+	stloc.1
+// 0x0107441c: 0x107441c: addiu a1, a1, -30828
+	ldloc.2
+	ldc.i4 -30828
 	add
-	stloc 8
-// 0x0107446c: 0x107446c: sw    t0, 16(sp)
+	stloc.2
+// 0x01074420: 0x1074420: addu  a2, t4, zero
+	ldloc 13
+	stloc.3
+// 0x01074424: 0x1074424: addu  a3, t3, zero
+	ldloc 12
+	stloc 4
+// 0x01074428: 0x1074428: sw    t2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x01074470: 0x1074470: addiu t0, sp, 64
-	ldloc.0
-	ldc.i4.s 64
-	add
-	stloc 8
-// 0x01074474: 0x1074474: sw    t0, 20(sp)
+// 0x0107442c: 0x107442c: sw    t1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2286,210 +2138,264 @@ L_1074464:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01074478: 0x1074478: lw    t0, 1016(sp)
+// 0x01074430: 0x1074430: sw    t0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 254
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 8
-// 0x0107447c: 0x107447c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074480: 0x1074480: sw    t0, 24(sp)
+	ldloc 7
+	stelem.i4
+// 0x01074434: 0x1074434: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.7
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x01074484: 0x1074484: lw    a2, 1028(sp)
+// 0x01074438: 0x1074438: jal   0x1000f64 sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 257
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc.3
-// 0x01074488: 0x1074488: lw    t0, 1020(sp)
-	ldloc 5
+	ldloc 11
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 255
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 11
+// --- basic block ---
+// 0x01074440: 0x1074440: j	 0x10744e4 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 11
+	br L_10744e4
+// --- basic block ---
+L_1074448:
+// 0x01074448: 0x1074448: bne   a3, zero, 0x1074458 lui   t2, 0x20000
+	ldloc 4
+	ldc.i4 131072
+	stloc 9
+	brtrue L_1074458
+// --- basic block ---
+// 0x01074450: 0x1074450: j	 0x1074460 addiu t2, t2, 19096
+	ldloc 9
+	ldc.i4 19096
+	add
+	stloc 9
+	br L_1074460
+// --- basic block ---
+L_1074458:
+// 0x01074458: 0x1074458: lui   t2, 0x10000
+	ldc.i4 65536
+	stloc 9
+// 0x0107445c: 0x107445c: addiu t2, t2, 12204
+	ldloc 9
+	ldc.i4 12204
+	add
+	stloc 9
+L_1074460:
+// 0x01074460: 0x1074460: bne   a1, zero, 0x1074470 lui   t1, 0x20000
+	ldloc.2
+	ldc.i4 131072
+	stloc 8
+	brtrue L_1074470
+// --- basic block ---
+// 0x01074468: 0x1074468: j	 0x1074478 addiu t1, t1, 19096
+	ldloc 8
+	ldc.i4 19096
+	add
+	stloc 8
+	br L_1074478
+// --- basic block ---
+L_1074470:
+// 0x01074470: 0x1074470: lui   t1, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x01074474: 0x1074474: addiu t1, t1, 12204
+	ldloc 8
+	ldc.i4 12204
 	add
-	ldelem.i4
 	stloc 8
-// 0x0107448c: 0x107448c: addiu a0, a0, 15252
+L_1074478:
+// 0x01074478: 0x1074478: bne   a0, zero, 0x1074488 lui   t0, 0x20000
+	ldloc.1
+	ldc.i4 131072
+	stloc 7
+	brtrue L_1074488
+// --- basic block ---
+// 0x01074480: 0x1074480: j	 0x1074490 addiu t0, t0, 19096
+	ldloc 7
+	ldc.i4 19096
+	add
+	stloc 7
+	br L_1074490
+// --- basic block ---
+L_1074488:
+// 0x01074488: 0x1074488: lui   t0, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x0107448c: 0x107448c: addiu t0, t0, 12204
+	ldloc 7
+	ldc.i4 12204
+	add
+	stloc 7
+L_1074490:
+// 0x01074490: 0x1074490: bne   v1, zero, 0x10744a0 lui   v1, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc 6
+	brtrue L_10744a0
+// --- basic block ---
+// 0x01074498: 0x1074498: j	 0x10744a8 addiu v1, v1, 19424
+	ldloc 6
+	ldc.i4 19424
+	add
+	stloc 6
+	br L_10744a8
+// --- basic block ---
+L_10744a0:
+// 0x010744a0: 0x10744a0: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x010744a4: 0x10744a4: addiu v1, v1, 19396
+	ldloc 6
+	ldc.i4 19396
+	add
+	stloc 6
+L_10744a8:
+// 0x010744a8: 0x10744a8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010744ac: 0x10744ac: lui   t5, 0x20000
+	ldc.i4 131072
+	stloc 10
+// 0x010744b0: 0x10744b0: addiu t5, t5, -30800
+	ldloc 10
+	ldc.i4 -30800
+	add
+	stloc 10
+// 0x010744b4: 0x10744b4: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01074490: 0x1074490: addu  a3, s5, zero
-	ldloc 14
+// 0x010744b8: 0x10744b8: addu  a3, t6, zero
+	ldloc 15
 	stloc 4
-// 0x01074494: 0x1074494: addiu a1, zero, 36
+// 0x010744bc: 0x10744bc: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01074498: 0x1074498: sw    t0, 28(sp)
+// 0x010744c0: 0x10744c0: sw    t5, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
-// 0x0107449c: 0x107449c: sw    s4, 32(sp)
+// 0x010744c4: 0x10744c4: sw    t4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
 	ldloc 13
 	stelem.i4
-// 0x010744a0: 0x10744a0: sw    s2, 36(sp)
+// 0x010744c8: 0x10744c8: sw    t3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.6
 	add
-	ldloc 9
+	ldloc 12
 	stelem.i4
-// 0x010744a4: 0x10744a4: sw    s3, 40(sp)
+// 0x010744cc: 0x10744cc: sw    t2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.7
 	add
-	ldloc 12
+	ldloc 9
 	stelem.i4
-// 0x010744a8: 0x10744a8: sw    s1, 44(sp)
+// 0x010744d0: 0x10744d0: sw    t1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.8
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x010744ac: 0x10744ac: sw    v1, 48(sp)
+// 0x010744d4: 0x10744d4: sw    t0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.s 9
 	add
 	ldloc 7
 	stelem.i4
-// 0x010744b0: 0x10744b0: sw    v0, 52(sp)
+// 0x010744d8: 0x10744d8: sw    v1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.s 10
 	add
 	ldloc 6
 	stelem.i4
-// 0x010744b4: 0x10744b4: jal   0x1072cd8 sw    s0, 56(sp)
+// 0x010744dc: 0x10744dc: jal   0x10732fc sw    v0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 11
 	add
-	ldloc 10
+	ldloc 11
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
-// --- basic block ---
-L_10744bc:
-// 0x010744bc: 0x10744bc: lw    ra, 980(sp)
-// 0x010744c0: 0x10744c0: lw    s5, 976(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 244
-	add
-	ldelem.i4
-	stloc 14
-// 0x010744c4: 0x10744c4: lw    s4, 972(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 243
-	add
-	ldelem.i4
-	stloc 13
-// 0x010744c8: 0x10744c8: lw    s3, 968(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 242
-	add
-	ldelem.i4
-	stloc 12
-// 0x010744cc: 0x10744cc: lw    s2, 964(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 241
-	add
-	ldelem.i4
-	stloc 9
-// 0x010744d0: 0x10744d0: lw    s1, 960(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 240
-	add
-	ldelem.i4
 	stloc 11
-// 0x010744d4: 0x10744d4: lw    s0, 956(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 239
-	add
-	ldelem.i4
-	stloc 10
-// 0x010744d8: 0x10744d8: jr    ra addiu sp, sp, 984
+// --- basic block ---
+L_10744e4:
+// 0x010744e4: 0x10744e4: lw    ra, 52(sp)
+// 0x010744e8: 0x10744e8: sll   zero, zero, 0
+// 0x010744ec: 0x10744ec: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldc.i4 984
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 11
 	ret
 }
-.method public static int32 RTNet_ReportAlert_10744e0(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_ReportMarker_10744f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra,int32 t0)
 
 // local  6 is register v0
 // local  7 is register v1
@@ -2497,12 +2403,15 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local 15 is register t0
 // local  8 is register s0
 // local  9 is register s1
 // local 10 is register s2
 // local 11 is register s3
+// local 12 is register s4
+// local 13 is register s5
 // local  0 is register sp
-// local 12 is register ra
+// local 14 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -2518,6 +2427,8 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
@@ -2525,324 +2436,502 @@ __CIBYL_function_return:
 	stloc 10
 	ldc.i4.s 0
 	stloc 11
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
 	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 14
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010744e0: 0x10744e0: addiu sp, sp, -88
+// 0x010744f4: 0x10744f4: addiu sp, sp, -2352
 	ldloc.0
-	ldc.i4.s -88
+	ldc.i4 -2352
 	add
 	stloc.0
-// 0x010744e4: 0x10744e4: sw    s0, 68(sp)
+// 0x010744f8: 0x10744f8: sw    s5, 2344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4 586
 	add
-	ldloc 8
+	ldloc 13
 	stelem.i4
-// 0x010744e8: 0x10744e8: lui   s0, 0x10000
-	ldc.i4 65536
-	stloc 8
-// 0x010744ec: 0x10744ec: sw    s3, 80(sp)
+// 0x010744fc: 0x10744fc: sw    s3, 2336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4 584
 	add
 	ldloc 11
 	stelem.i4
-// 0x010744f0: 0x10744f0: addu  s3, a0, zero
+// 0x01074500: 0x1074500: addu  s5, a0, zero
 	ldloc.1
+	stloc 13
+// 0x01074504: 0x1074504: addu  s3, a1, zero
+	ldloc.2
 	stloc 11
-// 0x010744f4: 0x10744f4: addiu a0, s0, -23972
-	ldloc 8
-	ldc.i4 -23972
+// 0x01074508: 0x1074508: addiu a0, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
 	stloc.1
-// 0x010744f8: 0x10744f8: sw    s2, 76(sp)
+// 0x0107450c: 0x107450c: sw    s4, 2340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4 585
+	add
+	ldloc 12
+	stelem.i4
+// 0x01074510: 0x1074510: sw    s2, 2332(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 583
 	add
 	ldloc 10
 	stelem.i4
-// 0x010744fc: 0x10744fc: sw    s1, 72(sp)
+// 0x01074514: 0x1074514: sw    s1, 2328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4 582
 	add
 	ldloc 9
 	stelem.i4
-// 0x01074500: 0x1074500: sw    a3, 60(sp)
+// 0x01074518: 0x1074518: sw    a3, 2312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4 578
 	add
 	ldloc 4
 	stelem.i4
-// 0x01074504: 0x1074504: sw    ra, 84(sp)
-// 0x01074508: 0x1074508: addu  s2, a1, zero
-	ldloc.2
+// 0x0107451c: 0x107451c: lw    s1, 2372(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 593
+	add
+	ldelem.i4
+	stloc 9
+// 0x01074520: 0x1074520: sw    ra, 2348(sp)
+// 0x01074524: 0x1074524: sw    s0, 2324(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 581
+	add
+	ldloc 8
+	stelem.i4
+// 0x01074528: 0x1074528: lw    s2, 2368(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 592
+	add
+	ldelem.i4
 	stloc 10
-// 0x0107450c: 0x107450c: jal   0x101df24 addu  s1, a2, zero
+// 0x0107452c: 0x107452c: lw    s4, 2392(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 598
+	add
+	ldelem.i4
+	stloc 12
+// 0x01074530: 0x1074530: jal   0x1072a8c addu  a1, a2, zero
 	ldloc.3
-	stloc 9
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01074514: 0x1074514: lw    a3, 60(sp)
+// 0x01074538: 0x1074538: lw    a3, 2312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 15
+	ldc.i4 578
 	add
 	ldelem.i4
 	stloc 4
-// 0x01074518: 0x1074518: bne   v0, zero, 0x107453c addiu a0, s0, -23972
-	ldloc 6
-	ldloc 8
-	ldc.i4 -23972
-	add
-	stloc.1
-	brtrue L_107453c
-// --- basic block ---
-// 0x01074520: 0x1074520: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074524: 0x1074524: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01074528: 0x1074528: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
+// 0x0107453c: 0x107453c: addiu a0, sp, 68
+	ldloc.0
+	ldc.i4.s 68
 	add
 	stloc.1
-// 0x0107452c: 0x107452c: jal   0x104c148 addiu a1, a1, -30736
-	ldloc.2
-	ldc.i4 -30736
-	add
+// 0x01074540: 0x1074540: jal   0x1072a8c addu  a1, a3, zero
+	ldloc 4
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01074534: 0x1074534: j	 0x10745a4 addu  v0, zero, zero
-	ldc.i4.s 0
+// 0x01074548: 0x1074548: beq   s1, zero, 0x1074598 lui   s0, 0x10000
+	ldloc 9
+	ldc.i4 65536
+	stloc 8
+	brfalse L_1074598
+// --- basic block ---
+// 0x01074550: 0x1074550: lb    v0, 0(s1)
+	ldloc 9
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-	br L_10745a4
+// 0x01074554: 0x1074554: sll   zero, zero, 0
+// 0x01074558: 0x1074558: beq   v0, zero, 0x107459c addiu s0, s0, 18768
+	ldloc 6
+	ldloc 8
+	ldc.i4 18768
+	add
+	stloc 8
+	brfalse L_107459c
 // --- basic block ---
-L_107453c:
-// 0x0107453c: 0x107453c: addiu a1, sp, 48
+// 0x01074560: 0x1074560: addiu s0, sp, 88
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 88
 	add
+	stloc 8
+// 0x01074564: 0x1074564: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x01074568: 0x1074568: addu  a1, s0, zero
+	ldloc 8
 	stloc.2
-// 0x01074540: 0x1074540: addiu a2, sp, 52
-	ldloc.0
-	ldc.i4.s 52
-	add
+// 0x0107456c: 0x107456c: jal   0x1067b74 addiu a2, zero, 201
+	ldc.i4 201
 	stloc.3
-// 0x01074544: 0x1074544: sw    v0, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 6
-	stelem.i4
-// 0x01074548: 0x1074548: jal   0x101dec8 sw    a3, 60(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
-	add
-	ldloc 4
-	stelem.i4
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_nodes_101dec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01074550: 0x1074550: lw    v0, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
-	stloc 6
-// 0x01074554: 0x1074554: lw    v1, 104(sp)
-	ldloc 5
+// 0x01074574: 0x1074574: bne   v0, zero, 0x10745a0 addiu s1, sp, 292
+	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
+	ldc.i4 292
 	add
-	ldelem.i4
-	stloc 7
-// 0x01074558: 0x1074558: sw    v0, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	stloc 9
+	brtrue L_10745a0
+// --- basic block ---
+// 0x0107457c: 0x107457c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01074580: 0x1074580: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01074584: 0x1074584: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	ldloc 6
-	stelem.i4
-// 0x0107455c: 0x107455c: lw    v0, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+	stloc.2
+// 0x01074588: 0x1074588: addiu a3, a3, -30772
+	ldloc 4
+	ldc.i4 -30772
 	add
-	ldelem.i4
-	stloc 6
-// 0x01074560: 0x1074560: sw    v1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
+	stloc 4
+// 0x0107458c: 0x107458c: addiu a0, zero, 4
 	ldc.i4.4
+	stloc.1
+// 0x01074590: 0x1074590: j	 0x10745dc addiu a2, zero, 1349
+	ldc.i4 1349
+	stloc.3
+	br L_10745dc
+// --- basic block ---
+L_1074598:
+// 0x01074598: 0x1074598: addiu s0, s0, 18768
+	ldloc 8
+	ldc.i4 18768
 	add
-	ldloc 7
-	stelem.i4
-// 0x01074564: 0x1074564: sw    v0, 32(sp)
-	ldloc 5
+	stloc 8
+L_107459c:
+// 0x0107459c: 0x107459c: addiu s1, sp, 292
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4 292
 	add
-	ldloc 6
-	stelem.i4
-// 0x01074568: 0x1074568: lw    v0, 52(sp)
+	stloc 9
+L_10745a0:
+// 0x010745a0: 0x10745a0: lw    v0, 2384(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4 596
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107456c: 0x107456c: lw    v1, 108(sp)
+// 0x010745a4: 0x10745a4: lw    a2, 2376(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 27
+	ldc.i4 594
 	add
 	ldelem.i4
-	stloc 7
-// 0x01074570: 0x1074570: sw    v0, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 6
-	stelem.i4
-// 0x01074574: 0x1074574: lw    v0, 116(sp)
+	stloc.3
+// 0x010745a8: 0x10745a8: lw    a3, 2380(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 29
+	ldc.i4 595
 	add
 	ldelem.i4
-	stloc 6
-// 0x01074578: 0x1074578: sw    v1, 20(sp)
+	stloc 4
+// 0x010745ac: 0x10745ac: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x010745b0: 0x10745b0: addiu a1, zero, 2014
+	ldc.i4 2014
+	stloc.2
+// 0x010745b4: 0x10745b4: jal   0x107268c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
-// 0x0107457c: 0x107457c: sw    v0, 40(sp)
-	ldloc 5
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl85::format_ParamPair_string_107268c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010745bc: 0x10745bc: bne   v0, zero, 0x1074600 addiu v1, sp, 48
 	ldloc 6
-	stelem.i4
-// 0x01074580: 0x1074580: lw    v1, 112(sp)
-	ldloc 5
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 28
+	ldc.i4.s 48
 	add
-	ldelem.i4
 	stloc 7
-// 0x01074584: 0x1074584: lw    v0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
+	brtrue L_1074600
+// --- basic block ---
+// 0x010745c4: 0x10745c4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010745c8: 0x10745c8: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x010745cc: 0x10745cc: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	ldelem.i4
-	stloc 6
-// 0x01074588: 0x1074588: lw    a3, 60(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
+	stloc.2
+// 0x010745d0: 0x10745d0: addiu a3, a3, -30716
+	ldloc 4
+	ldc.i4 -30716
 	add
-	ldelem.i4
 	stloc 4
-// 0x0107458c: 0x107458c: addu  a0, s3, zero
-	ldloc 11
+// 0x010745d4: 0x10745d4: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01074590: 0x1074590: addu  a1, s2, zero
-	ldloc 10
+// 0x010745d8: 0x10745d8: addiu a2, zero, 1363
+	ldc.i4 1363
+	stloc.3
+L_10745dc:
+// 0x010745dc: 0x10745dc: jal   0x100449c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010745e4: 0x10745e4: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010745e8: 0x10745e8: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x010745ec: 0x10745ec: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x010745f0: 0x10745f0: jal   0x104c158 addiu a1, a1, -32732
+	ldloc.2
+	ldc.i4 -32732
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010745f8: 0x10745f8: j	 0x1074670 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1074670
+// --- basic block ---
+L_1074600:
+// 0x01074600: 0x1074600: addiu v0, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc 6
+// 0x01074604: 0x1074604: beq   s4, zero, 0x1074638 lui   a1, 0x20000
+	ldloc 12
+	ldc.i4 131072
+	stloc.2
+	brfalse L_1074638
+// --- basic block ---
+// 0x0107460c: 0x107460c: addu  a0, s4, zero
+	ldloc 12
+	stloc.1
+// 0x01074610: 0x1074610: addiu a1, a1, -30660
+	ldloc.2
+	ldc.i4 -30660
+	add
 	stloc.2
-// 0x01074594: 0x1074594: addu  a2, s1, zero
+// 0x01074614: 0x1074614: addu  a2, s3, zero
+	ldloc 11
+	stloc.3
+// 0x01074618: 0x1074618: addu  a3, v1, zero
+	ldloc 7
+	stloc 4
+// 0x0107461c: 0x107461c: sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+// 0x01074620: 0x1074620: sw    s2, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 10
+	stelem.i4
+// 0x01074624: 0x1074624: sw    s0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x01074628: 0x1074628: jal   0x1000f64 sw    s1, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
 	ldloc 9
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01074630: 0x1074630: j	 0x1074670 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+	br L_1074670
+// --- basic block ---
+L_1074638:
+// 0x01074638: 0x1074638: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0107463c: 0x107463c: lw    a2, 2388(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 597
+	add
+	ldelem.i4
 	stloc.3
-// 0x01074598: 0x1074598: sw    v1, 24(sp)
+// 0x01074640: 0x1074640: addiu t0, a1, -30660
+	ldloc.2
+	ldc.i4 -30660
+	add
+	stloc 15
+// 0x01074644: 0x1074644: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074648: 0x1074648: addu  a3, s5, zero
+	ldloc 13
+	stloc 4
+// 0x0107464c: 0x107464c: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074650: 0x1074650: sw    t0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 15
+	stelem.i4
+// 0x01074654: 0x1074654: sw    s3, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 11
+	stelem.i4
+// 0x01074658: 0x1074658: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2851,66 +2940,111 @@ L_107453c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0107459c: 0x107459c: jal   0x1074358 sw    v0, 44(sp)
+// 0x0107465c: 0x107465c: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.7
 	add
 	ldloc 6
 	stelem.i4
+// 0x01074660: 0x1074660: sw    s2, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 10
+	stelem.i4
+// 0x01074664: 0x1074664: sw    s0, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 8
+	stelem.i4
+// 0x01074668: 0x1074668: jal   0x10732fc sw    s1, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 9
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl87::RTNet_ReportAlertAtPosition_1074358(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10745a4:
-// 0x010745a4: 0x10745a4: lw    ra, 84(sp)
-// 0x010745a8: 0x10745a8: lw    s3, 80(sp)
+L_1074670:
+// 0x01074670: 0x1074670: lw    ra, 2348(sp)
+// 0x01074674: 0x1074674: lw    s5, 2344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4 586
+	add
+	ldelem.i4
+	stloc 13
+// 0x01074678: 0x1074678: lw    s4, 2340(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 585
+	add
+	ldelem.i4
+	stloc 12
+// 0x0107467c: 0x107467c: lw    s3, 2336(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 584
 	add
 	ldelem.i4
 	stloc 11
-// 0x010745ac: 0x10745ac: lw    s2, 76(sp)
+// 0x01074680: 0x1074680: lw    s2, 2332(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4 583
 	add
 	ldelem.i4
 	stloc 10
-// 0x010745b0: 0x10745b0: lw    s1, 72(sp)
+// 0x01074684: 0x1074684: lw    s1, 2328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4 582
 	add
 	ldelem.i4
 	stloc 9
-// 0x010745b4: 0x10745b4: lw    s0, 68(sp)
+// 0x01074688: 0x1074688: lw    s0, 2324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4 581
 	add
 	ldelem.i4
 	stloc 8
-// 0x010745b8: 0x10745b8: jr    ra addiu sp, sp, 88
+// 0x0107468c: 0x107468c: jr    ra addiu sp, sp, 2352
 	ldloc.0
-	ldc.i4.s 88
+	ldc.i4 2352
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -2920,29 +3054,32 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_PostAlertComment_10745c0(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_ReportMapProblem_1074694(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 t0,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s5,int32 v1,int32 s0,int32 s3,int32 s1,int32 s4,int32 s2,int32 ra,int32 t0)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
-// local 10 is register s0
+// local 15 is register t0
+// local  9 is register s0
 // local 11 is register s1
-// local  8 is register s2
+// local 13 is register s2
+// local 10 is register s3
+// local 12 is register s4
+// local  7 is register s5
 // local  0 is register sp
-// local 12 is register ra
+// local 14 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2952,139 +3089,175 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 11
+	stloc 12
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 14
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010745c0: 0x10745c0: addiu sp, sp, -872
+// 0x01074694: 0x1074694: addiu sp, sp, -880
 	ldloc.0
-	ldc.i4 -872
+	ldc.i4 -880
 	add
 	stloc.0
-// 0x010745c4: 0x10745c4: sw    s1, 860(sp)
+// 0x01074698: 0x1074698: sw    s4, 868(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 215
+	ldc.i4 217
 	add
-	ldloc 11
+	ldloc 12
 	stelem.i4
-// 0x010745c8: 0x10745c8: sw    s0, 856(sp)
+// 0x0107469c: 0x107469c: sw    s3, 864(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 214
+	ldc.i4 216
 	add
 	ldloc 10
 	stelem.i4
-// 0x010745cc: 0x10745cc: sw    ra, 868(sp)
-// 0x010745d0: 0x10745d0: sw    s2, 864(sp)
+// 0x010746a0: 0x10746a0: sw    s2, 860(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 216
+	ldc.i4 215
 	add
-	ldloc 8
+	ldloc 13
 	stelem.i4
-// 0x010745d4: 0x10745d4: addu  s1, a0, zero
-	ldloc.1
-	stloc 11
-// 0x010745d8: 0x10745d8: beq   a2, zero, 0x1074648 addu  s0, a1, zero
-	ldloc.3
-	ldloc.2
-	stloc 10
-	brfalse L_1074648
-// --- basic block ---
-// 0x010745e0: 0x10745e0: lb    v0, 0(a2)
-	ldloc.3
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x010745e4: 0x10745e4: sll   zero, zero, 0
-// 0x010745e8: 0x10745e8: beq   v0, zero, 0x107464c lui   s2, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc 8
-	brfalse L_107464c
-// --- basic block ---
-// 0x010745f0: 0x10745f0: addiu s2, sp, 40
+// 0x010746a4: 0x10746a4: sw    s1, 856(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4 214
 	add
-	stloc 8
-// 0x010745f4: 0x10745f4: addu  a0, a2, zero
-	ldloc.3
-	stloc.1
-// 0x010745f8: 0x10745f8: addu  a1, s2, zero
-	ldloc 8
-	stloc.2
-// 0x010745fc: 0x10745fc: addiu a2, zero, 801
-	ldc.i4 801
-	stloc.3
-// 0x01074600: 0x1074600: jal   0x1067b64 sw    a3, 848(sp)
+	ldloc 11
+	stelem.i4
+// 0x010746a8: 0x10746a8: sw    s0, 852(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 212
+	ldc.i4 213
 	add
-	ldloc 4
+	ldloc 9
 	stelem.i4
+// 0x010746ac: 0x10746ac: sw    ra, 876(sp)
+// 0x010746b0: 0x10746b0: sw    s5, 872(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 218
+	add
+	ldloc 7
+	stelem.i4
+// 0x010746b4: 0x10746b4: addu  s2, a0, zero
 	ldloc.1
+	stloc 13
+// 0x010746b8: 0x10746b8: addu  s1, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074608: 0x1074608: lw    a3, 848(sp)
+	stloc 11
+// 0x010746bc: 0x10746bc: lw    s0, 896(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 212
+	ldc.i4 224
 	add
 	ldelem.i4
-	stloc 4
-// 0x0107460c: 0x107460c: bne   v0, zero, 0x1074650 lui   a1, 0x10000
+	stloc 9
+// 0x010746c0: 0x10746c0: lw    s4, 904(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 226
+	add
+	ldelem.i4
+	stloc 12
+// 0x010746c4: 0x10746c4: beq   a2, zero, 0x107472c addu  s3, a3, zero
+	ldloc.3
+	ldloc 4
+	stloc 10
+	brfalse L_107472c
+// --- basic block ---
+// 0x010746cc: 0x10746cc: lb    v0, 0(a2)
+	ldloc.3
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x010746d0: 0x10746d0: sll   zero, zero, 0
+// 0x010746d4: 0x10746d4: beq   v0, zero, 0x1074730 lui   s5, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc 7
+	brfalse L_1074730
+// --- basic block ---
+// 0x010746dc: 0x10746dc: addiu s5, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 7
+// 0x010746e0: 0x10746e0: addu  a0, a2, zero
+	ldloc.3
+	stloc.1
+// 0x010746e4: 0x10746e4: addu  a1, s5, zero
+	ldloc 7
+	stloc.2
+// 0x010746e8: 0x10746e8: jal   0x1067b74 addiu a2, zero, 801
+	ldc.i4 801
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x010746f0: 0x10746f0: bne   v0, zero, 0x1074734 lui   a1, 0x10000
 	ldloc 6
 	ldc.i4 65536
 	stloc.2
-	brtrue L_1074650
+	brtrue L_1074734
 // --- basic block ---
-// 0x01074614: 0x1074614: lui   a3, 0x20000
+// 0x010746f8: 0x10746f8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01074618: 0x1074618: addiu a1, a1, 32252
+// 0x010746fc: 0x10746fc: addiu a1, a1, 32716
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x0107461c: 0x107461c: addiu a3, a3, -30708
+// 0x01074700: 0x1074700: addiu a3, a3, -30628
 	ldloc 4
-	ldc.i4 -30708
+	ldc.i4 -30628
 	add
 	stloc 4
-// 0x01074620: 0x1074620: addiu a0, zero, 4
+// 0x01074704: 0x1074704: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01074624: 0x1074624: jal   0x100449c addiu a2, zero, 1134
-	ldc.i4 1134
+// 0x01074708: 0x1074708: jal   0x100449c addiu a2, zero, 1286
+	ldc.i4 1286
 	stloc.3
 	ldloc.0
 	ldloc.1
@@ -3093,23 +3266,23 @@ __CIBYL_javamethod_begin:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x0107462c: 0x107462c: lui   a0, 0x0
+// 0x01074710: 0x1074710: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01074630: 0x1074630: lui   a1, 0x20000
+// 0x01074714: 0x1074714: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01074634: 0x1074634: addiu a0, a0, 30092
+// 0x01074718: 0x1074718: addiu a0, a0, 30092
 	ldloc.1
 	ldc.i4 30092
 	add
 	stloc.1
-// 0x01074638: 0x1074638: jal   0x104c148 addiu a1, a1, -30648
+// 0x0107471c: 0x107471c: jal   0x104c158 addiu a1, a1, -32732
 	ldloc.2
-	ldc.i4 -30648
+	ldc.i4 -32732
 	add
 	stloc.2
 	ldloc.0
@@ -3117,172 +3290,264 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01074640: 0x1074640: j	 0x10746bc addu  v0, zero, zero
+// 0x01074724: 0x1074724: j	 0x1074758 sw    zero, 0(s0)
+	ldloc 5
+	ldloc 9
+	ldc.i4.2
+	shr.un
 	ldc.i4.s 0
-	stloc 6
-	br L_10746bc
+	stelem.i4
+	br L_1074758
 // --- basic block ---
-L_1074648:
-// 0x01074648: 0x1074648: lui   s2, 0x10000
+L_107472c:
+// 0x0107472c: 0x107472c: lui   s5, 0x10000
 	ldc.i4 65536
-	stloc 8
-L_107464c:
-// 0x0107464c: 0x107464c: addiu s2, s2, 18500
-	ldloc 8
-	ldc.i4 18500
-	add
-	stloc 8
-L_1074650:
-// 0x01074650: 0x1074650: bne   a3, zero, 0x1074660 lui   v1, 0x20000
-	ldloc 4
-	ldc.i4 131072
 	stloc 7
-	brtrue L_1074660
-// --- basic block ---
-// 0x01074658: 0x1074658: j	 0x1074668 addiu v1, v1, 18636
+L_1074730:
+// 0x01074730: 0x1074730: addiu s5, s5, 18768
 	ldloc 7
-	ldc.i4 18636
+	ldc.i4 18768
 	add
 	stloc 7
-	br L_1074668
-// --- basic block ---
-L_1074660:
-// 0x01074660: 0x1074660: lui   v1, 0x10000
+L_1074734:
+// 0x01074734: 0x1074734: bne   s3, zero, 0x1074760 lui   a1, 0x10000
+	ldloc 10
 	ldc.i4 65536
-	stloc 7
-// 0x01074664: 0x1074664: addiu v1, v1, 12208
-	ldloc 7
-	ldc.i4 12208
+	stloc.2
+	brtrue L_1074760
+// --- basic block ---
+// 0x0107473c: 0x107473c: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01074740: 0x1074740: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	stloc 7
-L_1074668:
-// 0x01074668: 0x1074668: lw    v0, 888(sp)
-	ldloc 5
+	stloc.2
+// 0x01074744: 0x1074744: addiu a3, a3, -30564
+	ldloc 4
+	ldc.i4 -30564
+	add
+	stloc 4
+// 0x01074748: 0x1074748: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0107474c: 0x107474c: jal   0x100449c addiu a2, zero, 1295
+	ldc.i4 1295
+	stloc.3
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x01074754: 0x1074754: sw    zero, 0(s0)
+	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 222
+	ldc.i4.s 0
+	stelem.i4
+L_1074758:
+// 0x01074758: 0x1074758: j	 0x10747cc addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_10747cc
+// --- basic block ---
+L_1074760:
+// 0x01074760: 0x1074760: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x01074764: 0x1074764: sw    v0, 0(s0)
+	ldloc 5
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldloc 6
+	stelem.i4
+// 0x01074768: 0x1074768: lw    v1, 0(s3)
+	ldloc 5
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 8
+// 0x0107476c: 0x107476c: lw    v0, 4(s3)
+	ldloc 5
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107466c: 0x107466c: sll   zero, zero, 0
-// 0x01074670: 0x1074670: bne   v0, zero, 0x1074680 lui   v0, 0x20000
-	ldloc 6
+// 0x01074770: 0x1074770: beq   s4, zero, 0x107479c lui   a1, 0x20000
+	ldloc 12
 	ldc.i4 131072
-	stloc 6
-	brtrue L_1074680
+	stloc.2
+	brfalse L_107479c
 // --- basic block ---
-// 0x01074678: 0x1074678: j	 0x1074688 addiu v0, v0, 18636
+// 0x01074778: 0x1074778: addu  a0, s4, zero
+	ldloc 12
+	stloc.1
+// 0x0107477c: 0x107477c: addiu a1, a1, -30516
+	ldloc.2
+	ldc.i4 -30516
+	add
+	stloc.2
+// 0x01074780: 0x1074780: addu  a2, v1, zero
+	ldloc 8
+	stloc.3
+// 0x01074784: 0x1074784: addu  a3, v0, zero
 	ldloc 6
-	ldc.i4 18636
+	stloc 4
+// 0x01074788: 0x1074788: sw    s1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 11
+	stelem.i4
+// 0x0107478c: 0x107478c: jal   0x1000f64 sw    s5, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
+	ldloc 7
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
-	br L_1074688
 // --- basic block ---
-L_1074680:
-// 0x01074680: 0x1074680: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x01074684: 0x1074684: addiu v0, v0, 12208
-	ldloc 6
-	ldc.i4 12208
-	add
+// 0x01074794: 0x1074794: j	 0x10747cc addiu v0, zero, 1
+	ldc.i4.1
 	stloc 6
-L_1074688:
-// 0x01074688: 0x1074688: lui   a0, 0x0
+	br L_10747cc
+// --- basic block ---
+L_107479c:
+// 0x0107479c: 0x107479c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0107468c: 0x107468c: lui   t0, 0x20000
-	ldc.i4 131072
-	stloc 9
-// 0x01074690: 0x1074690: lw    a2, 892(sp)
+// 0x010747a0: 0x10747a0: lw    a2, 900(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 223
+	ldc.i4 225
 	add
 	ldelem.i4
 	stloc.3
-// 0x01074694: 0x1074694: addiu t0, t0, -30624
-	ldloc 9
-	ldc.i4 -30624
+// 0x010747a4: 0x10747a4: addiu t0, a1, -30516
+	ldloc.2
+	ldc.i4 -30516
 	add
-	stloc 9
-// 0x01074698: 0x1074698: addiu a0, a0, 15252
+	stloc 15
+// 0x010747a8: 0x10747a8: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x0107469c: 0x107469c: addu  a3, s1, zero
-	ldloc 11
+// 0x010747ac: 0x10747ac: addu  a3, s2, zero
+	ldloc 13
 	stloc 4
-// 0x010746a0: 0x10746a0: addiu a1, zero, 36
+// 0x010747b0: 0x10747b0: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x010746a4: 0x10746a4: sw    t0, 16(sp)
+// 0x010747b4: 0x10747b4: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 15
 	stelem.i4
-// 0x010746a8: 0x10746a8: sw    s0, 20(sp)
+// 0x010747b8: 0x10747b8: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x010746ac: 0x10746ac: sw    s2, 24(sp)
+// 0x010747bc: 0x10747bc: sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x010746b0: 0x10746b0: sw    v1, 28(sp)
+// 0x010747c0: 0x10747c0: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
-	ldloc 7
+	ldloc 11
 	stelem.i4
-// 0x010746b4: 0x10746b4: jal   0x1072cd8 sw    v0, 32(sp)
+// 0x010747c4: 0x10747c4: jal   0x10732fc sw    s5, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 6
 // --- basic block ---
-L_10746bc:
-// 0x010746bc: 0x10746bc: lw    ra, 868(sp)
-// 0x010746c0: 0x10746c0: lw    s2, 864(sp)
+L_10747cc:
+// 0x010747cc: 0x10747cc: lw    ra, 876(sp)
+// 0x010747d0: 0x10747d0: lw    s5, 872(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 218
+	add
+	ldelem.i4
+	stloc 7
+// 0x010747d4: 0x10747d4: lw    s4, 868(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 217
+	add
+	ldelem.i4
+	stloc 12
+// 0x010747d8: 0x10747d8: lw    s3, 864(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3290,8 +3555,8 @@ L_10746bc:
 	ldc.i4 216
 	add
 	ldelem.i4
-	stloc 8
-// 0x010746c4: 0x10746c4: lw    s1, 860(sp)
+	stloc 10
+// 0x010747dc: 0x10747dc: lw    s2, 860(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3299,8 +3564,8 @@ L_10746bc:
 	ldc.i4 215
 	add
 	ldelem.i4
-	stloc 11
-// 0x010746c8: 0x10746c8: lw    s0, 856(sp)
+	stloc 13
+// 0x010747e0: 0x10747e0: lw    s1, 856(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3308,44 +3573,47 @@ L_10746bc:
 	ldc.i4 214
 	add
 	ldelem.i4
-	stloc 10
-// 0x010746cc: 0x10746cc: jr    ra addiu sp, sp, 872
+	stloc 11
+// 0x010747e4: 0x10747e4: lw    s0, 852(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4 872
+	ldc.i4.2
+	shr.un
+	ldc.i4 213
+	add
+	ldelem.i4
+	stloc 9
+// 0x010747e8: 0x10747e8: jr    ra addiu sp, sp, 880
+	ldloc.0
+	ldc.i4 880
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_Scoreboard_getPoints_10746d4(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_RemoveAlert_10747f0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
 
-// local  6 is register v0
-// local 13 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  9 is register s2
-// local 10 is register s3
-// local 11 is register s4
-// local 12 is register s5
 // local  0 is register sp
-// local 14 is register ra
-// local  5 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 13
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3354,726 +3622,641 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
 	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 14
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010746d4: 0x10746d4: addiu sp, sp, -112
+// 0x010747f0: 0x10747f0: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -112
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010746d8: 0x10746d8: sw    s2, 92(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
-	add
-	ldloc 9
-	stelem.i4
-// 0x010746dc: 0x10746dc: sw    s1, 88(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldloc 8
-	stelem.i4
-// 0x010746e0: 0x10746e0: lui   s2, 0x20000
+// 0x010747f4: 0x10747f4: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x010747f8: 0x10747f8: lui   v0, 0x20000
 	ldc.i4 131072
-	stloc 9
-// 0x010746e4: 0x10746e4: addiu s1, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 8
-// 0x010746e8: 0x10746e8: sw    s5, 104(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
-	add
-	ldloc 12
-	stelem.i4
-// 0x010746ec: 0x10746ec: sw    s4, 100(sp)
-	ldloc 5
+	stloc 5
+// 0x010747fc: 0x10747fc: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074800: 0x1074800: sw    a1, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
+	ldc.i4.5
 	add
-	ldloc 11
+	ldloc.2
 	stelem.i4
-// 0x010746f0: 0x10746f0: sw    s3, 96(sp)
+// 0x01074804: 0x1074804: addiu v0, v0, -30428
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
+	ldc.i4 -30428
 	add
-	ldloc 10
-	stelem.i4
-// 0x010746f4: 0x10746f4: addu  s5, a0, zero
+	stloc 5
+// 0x01074808: 0x1074808: addiu a0, a0, 15252
 	ldloc.1
-	stloc 12
-// 0x010746f8: 0x10746f8: addu  s4, a1, zero
-	ldloc.2
-	stloc 11
-// 0x010746fc: 0x10746fc: addu  s3, a2, zero
-	ldloc.3
-	stloc 10
-// 0x01074700: 0x1074700: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x01074704: 0x1074704: addiu a2, s2, -13884
-	ldloc 9
-	ldc.i4 -13884
+	ldc.i4 15252
 	add
-	stloc.3
-// 0x01074708: 0x1074708: addiu a1, zero, 20
-	ldc.i4.s 20
+	stloc.1
+// 0x0107480c: 0x107480c: addiu a1, zero, 36
+	ldc.i4.s 36
 	stloc.2
-// 0x0107470c: 0x107470c: sw    ra, 108(sp)
-// 0x01074710: 0x1074710: jal   0x1000f9c sw    s0, 84(sp)
-	ldloc 5
+// 0x01074810: 0x1074810: sw    ra, 28(sp)
+// 0x01074814: 0x1074814: jal   0x10732fc sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 13
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01074718: 0x1074718: addiu s0, sp, 60
-	ldloc.0
-	ldc.i4.s 60
-	add
-	stloc 7
-// 0x0107471c: 0x107471c: lw    a3, 128(sp)
-	ldloc 5
+// 0x0107481c: 0x107481c: lw    ra, 28(sp)
+// 0x01074820: 0x1074820: sll   zero, zero, 0
+// 0x01074824: 0x1074824: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
 	ldc.i4.s 32
 	add
-	ldelem.i4
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_PinqWazer_107482c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
+
+// local  6 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local  8 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local 12 is register s4
+// local 13 is register s5
+// local  0 is register sp
+// local 14 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x01074720: 0x1074720: addiu a2, s2, -13884
-	ldloc 9
-	ldc.i4 -13884
-	add
-	stloc.3
-// 0x01074724: 0x1074724: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x01074728: 0x1074728: jal   0x1000f9c addiu a1, zero, 20
-	ldc.i4.s 20
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
 	stloc 13
-	stloc 6
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 14
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074730: 0x1074730: lw    a2, 132(sp)
+// 0x0107482c: 0x107482c: addiu sp, sp, -976
+	ldloc.0
+	ldc.i4 -976
+	add
+	stloc.0
+// 0x01074830: 0x1074830: lw    v0, 1000(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4 250
 	add
 	ldelem.i4
-	stloc.3
-// 0x01074734: 0x1074734: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074738: 0x1074738: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 6
-// 0x0107473c: 0x107473c: addu  a3, s5, zero
-	ldloc 12
-	stloc 4
-// 0x01074740: 0x1074740: addiu v0, v0, -30592
-	ldloc 6
-	ldc.i4 -30592
-	add
 	stloc 6
-// 0x01074744: 0x1074744: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x01074748: 0x1074748: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x0107474c: 0x107474c: sw    s4, 20(sp)
+// 0x01074834: 0x1074834: sw    s5, 968(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 242
 	add
-	ldloc 11
+	ldloc 13
 	stelem.i4
-// 0x01074750: 0x1074750: sw    s3, 24(sp)
+// 0x01074838: 0x1074838: sw    s4, 964(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 241
 	add
-	ldloc 10
+	ldloc 12
 	stelem.i4
-// 0x01074754: 0x1074754: sw    s1, 28(sp)
+// 0x0107483c: 0x107483c: sw    s3, 960(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 240
 	add
-	ldloc 8
+	ldloc 11
 	stelem.i4
-// 0x01074758: 0x1074758: sw    s0, 32(sp)
+// 0x01074840: 0x1074840: sw    s2, 956(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 239
 	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
-// 0x0107475c: 0x107475c: jal   0x1072cd8 sw    v0, 16(sp)
+// 0x01074844: 0x1074844: sw    s0, 948(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 237
 	add
-	ldloc 6
+	ldloc 9
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 13
-	stloc 6
-// --- basic block ---
-// 0x01074764: 0x1074764: lw    ra, 108(sp)
-// 0x01074768: 0x1074768: lw    s5, 104(sp)
+// 0x01074848: 0x1074848: sw    ra, 972(sp)
+// 0x0107484c: 0x107484c: sw    s1, 952(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 26
+	ldc.i4 238
 	add
-	ldelem.i4
+	ldloc 8
+	stelem.i4
+// 0x01074850: 0x1074850: addu  s4, a0, zero
+	ldloc.1
 	stloc 12
-// 0x0107476c: 0x107476c: lw    s4, 100(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldelem.i4
+// 0x01074854: 0x1074854: addu  s5, a1, zero
+	ldloc.2
+	stloc 13
+// 0x01074858: 0x1074858: addu  s3, a2, zero
+	ldloc.3
 	stloc 11
-// 0x01074770: 0x1074770: lw    s3, 96(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldelem.i4
-	stloc 10
-// 0x01074774: 0x1074774: lw    s2, 92(sp)
+// 0x0107485c: 0x107485c: lw    s0, 1004(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4 251
 	add
 	ldelem.i4
 	stloc 9
-// 0x01074778: 0x1074778: lw    s1, 88(sp)
-	ldloc 5
+// 0x01074860: 0x1074860: beq   v0, zero, 0x10748c8 addu  s2, a3, zero
+	ldloc 6
+	ldloc 4
+	stloc 10
+	brfalse L_10748c8
+// --- basic block ---
+// 0x01074868: 0x1074868: lb    v1, 0(v0)
+	ldloc 6
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 7
+// 0x0107486c: 0x107486c: sll   zero, zero, 0
+// 0x01074870: 0x1074870: beq   v1, zero, 0x10748cc lui   s1, 0x10000
+	ldloc 7
+	ldc.i4 65536
+	stloc 8
+	brfalse L_10748cc
+// --- basic block ---
+// 0x01074878: 0x1074878: addiu s1, sp, 136
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
+	ldc.i4 136
 	add
-	ldelem.i4
 	stloc 8
-// 0x0107477c: 0x107477c: lw    s0, 84(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
+// 0x0107487c: 0x107487c: addu  a0, v0, zero
+	ldloc 6
+	stloc.1
+// 0x01074880: 0x1074880: addu  a1, s1, zero
+	ldloc 8
+	stloc.2
+// 0x01074884: 0x1074884: jal   0x1067b74 addiu a2, zero, 801
+	ldc.i4 801
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x01074780: 0x1074780: jr    ra addiu sp, sp, 112
-	ldloc.0
-	ldc.i4.s 112
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 13
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+// --- basic block ---
+// 0x0107488c: 0x107488c: bne   v0, zero, 0x10748d0 lui   a1, 0x10000
 	ldloc 6
-	ret
-}
-.method public static int32 RTNet_FoursquareCheckin_1074788(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 t0,int32[] mem,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register t0
-// local  0 is register sp
-// local  9 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	ldc.i4 65536
+	stloc.2
+	brtrue L_10748d0
+// --- basic block ---
+// 0x01074894: 0x1074894: lui   a3, 0x20000
+	ldc.i4 131072
 	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x01074898: 0x1074898: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x0107489c: 0x107489c: addiu a3, a3, -30408
+	ldloc 4
+	ldc.i4 -30408
+	add
+	stloc 4
+// 0x010748a0: 0x10748a0: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010748a4: 0x10748a4: jal   0x100449c addiu a2, zero, 1228
+	ldc.i4 1228
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-__CIBYL_javamethod_begin:
+	stloc 6
 // --- basic block ---
-// 0x01074788: 0x1074788: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
+// 0x010748ac: 0x10748ac: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010748b0: 0x10748b0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010748b4: 0x10748b4: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	stloc.0
-// 0x0107478c: 0x107478c: sw    ra, 36(sp)
-// 0x01074790: 0x1074790: addu  t0, a0, zero
+	stloc.1
+// 0x010748b8: 0x10748b8: jal   0x104c158 addiu a1, a1, 22884
+	ldloc.2
+	ldc.i4 22884
+	add
+	stloc.2
+	ldloc.0
 	ldloc.1
-	stloc 6
-// 0x01074794: 0x1074794: bne   a2, zero, 0x10747a8 addu  v1, a1, zero
-	ldloc.3
 	ldloc.2
-	stloc 8
-	brtrue L_10747a8
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x0107479c: 0x107479c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x010747a0: 0x10747a0: j	 0x10747b0 addiu v0, v0, 18636
-	ldloc 5
-	ldc.i4 18636
+// 0x010748c0: 0x10748c0: j	 0x1074958 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1074958
+// --- basic block ---
+L_10748c8:
+// 0x010748c8: 0x10748c8: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 8
+L_10748cc:
+// 0x010748cc: 0x10748cc: addiu s1, s1, 18768
+	ldloc 8
+	ldc.i4 18768
 	add
-	stloc 5
-	br L_10747b0
+	stloc 8
+L_10748d0:
+// 0x010748d0: 0x10748d0: bne   s0, zero, 0x10748e0 addu  a1, s5, zero
+	ldloc 9
+	ldloc 13
+	stloc.2
+	brtrue L_10748e0
 // --- basic block ---
-L_10747a8:
-// 0x010747a8: 0x10747a8: lui   v0, 0x10000
+// 0x010748d8: 0x10748d8: lui   s0, 0x10000
 	ldc.i4 65536
-	stloc 5
-// 0x010747ac: 0x10747ac: addiu v0, v0, 12208
-	ldloc 5
-	ldc.i4 12208
+	stloc 9
+// 0x010748dc: 0x10748dc: addiu s0, s0, 18768
+	ldloc 9
+	ldc.i4 18768
+	add
+	stloc 9
+L_10748e0:
+// 0x010748e0: 0x10748e0: jal   0x1072fac addiu a0, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
-	stloc 5
-L_10747b0:
-// 0x010747b0: 0x10747b0: addu  a2, a3, zero
-	ldloc 4
-	stloc.3
-// 0x010747b4: 0x10747b4: lui   a0, 0x0
-	ldc.i4.s 0
 	stloc.1
-// 0x010747b8: 0x10747b8: addu  a3, t0, zero
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::format_RoadMapGpsPosition_Pos_Azy_Str_1072fac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010748e8: 0x10748e8: lw    v0, 1008(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 252
+	add
+	ldelem.i4
+	stloc 6
+// 0x010748ec: 0x10748ec: sll   zero, zero, 0
+// 0x010748f0: 0x10748f0: bne   v0, zero, 0x1074900 lui   v0, 0x20000
 	ldloc 6
-	stloc 4
-// 0x010747bc: 0x10747bc: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x010747c0: 0x10747c0: addiu t0, t0, -30512
+	brtrue L_1074900
+// --- basic block ---
+// 0x010748f8: 0x10748f8: j	 0x1074908 addiu v0, v0, 19096
 	ldloc 6
-	ldc.i4 -30512
+	ldc.i4 19096
 	add
 	stloc 6
-// 0x010747c4: 0x10747c4: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	br L_1074908
+// --- basic block ---
+L_1074900:
+// 0x01074900: 0x1074900: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x01074904: 0x1074904: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
 	add
-	stloc.1
-// 0x010747c8: 0x10747c8: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x010747cc: 0x10747cc: sw    t0, 16(sp)
+	stloc 6
+L_1074908:
+// 0x01074908: 0x1074908: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 7
+// 0x0107490c: 0x107490c: addiu v1, v1, -30356
 	ldloc 7
+	ldc.i4 -30356
+	add
+	stloc 7
+// 0x01074910: 0x1074910: sw    v1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 6
-	stelem.i4
-// 0x010747d0: 0x10747d0: sw    v1, 20(sp)
 	ldloc 7
+	stelem.i4
+// 0x01074914: 0x1074914: addiu v1, sp, 56
+	ldloc.0
+	ldc.i4.s 56
+	add
+	stloc 7
+// 0x01074918: 0x1074918: sw    v1, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 8
-	stelem.i4
-// 0x010747d4: 0x10747d4: jal   0x1072cd8 sw    v0, 24(sp)
 	ldloc 7
+	stelem.i4
+// 0x0107491c: 0x107491c: lw    v1, 992(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x010747dc: 0x10747dc: lw    ra, 36(sp)
-// 0x010747e0: 0x10747e0: sll   zero, zero, 0
-// 0x010747e4: 0x10747e4: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+	ldc.i4 248
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_FoursquareSearch_10747ec(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
-
-// local  6 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+	ldelem.i4
 	stloc 7
+// 0x01074920: 0x1074920: lui   a0, 0x0
 	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010747ec: 0x10747ec: addiu sp, sp, -136
-	ldloc.0
-	ldc.i4 -136
-	add
-	stloc.0
-// 0x010747f0: 0x10747f0: sw    s1, 128(sp)
+	stloc.1
+// 0x01074924: 0x1074924: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4.8
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x010747f4: 0x10747f4: sw    s0, 124(sp)
+// 0x01074928: 0x1074928: lw    a2, 1012(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4 253
 	add
-	ldloc 7
-	stelem.i4
-// 0x010747f8: 0x10747f8: addiu s1, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 8
-// 0x010747fc: 0x10747fc: addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-// 0x01074800: 0x1074800: lw    a1, 4(a1)
+	ldelem.i4
+	stloc.3
+// 0x0107492c: 0x107492c: lw    v1, 996(sp)
 	ldloc 5
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 249
 	add
 	ldelem.i4
-	stloc.2
-// 0x01074804: 0x1074804: addu  a3, a0, zero
+	stloc 7
+// 0x01074930: 0x1074930: addiu a0, a0, 15252
 	ldloc.1
-	stloc 4
-// 0x01074808: 0x1074808: addu  a0, s1, zero
-	ldloc 8
+	ldc.i4 15252
+	add
 	stloc.1
-// 0x0107480c: 0x107480c: sw    ra, 132(sp)
-// 0x01074810: 0x1074810: sw    a2, 116(sp)
+// 0x01074934: 0x1074934: addu  a3, s4, zero
+	ldloc 12
+	stloc 4
+// 0x01074938: 0x1074938: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x0107493c: 0x107493c: sw    s3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 29
+	ldc.i4.6
 	add
-	ldloc.3
+	ldloc 11
 	stelem.i4
-// 0x01074814: 0x1074814: jal   0x1072468 sw    a3, 112(sp)
+// 0x01074940: 0x1074940: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4.7
 	add
-	ldloc 4
+	ldloc 10
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x0107481c: 0x107481c: lw    a1, 0(s0)
+// 0x01074944: 0x1074944: sw    v1, 36(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
 	ldloc 7
+	stelem.i4
+// 0x01074948: 0x1074948: sw    s1, 40(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01074820: 0x1074820: addiu s0, sp, 72
+	ldc.i4.s 10
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107494c: 0x107494c: sw    s0, 44(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc 7
-// 0x01074824: 0x1074824: jal   0x1072468 addu  a0, s0, zero
-	ldloc 7
-	stloc.1
+	ldloc 9
+	stelem.i4
+// 0x01074950: 0x1074950: jal   0x10732fc sw    v0, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072468(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0107482c: 0x107482c: lw    a2, 116(sp)
+L_1074958:
+// 0x01074958: 0x1074958: lw    ra, 972(sp)
+// 0x0107495c: 0x107495c: lw    s5, 968(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 29
+	ldc.i4 242
 	add
 	ldelem.i4
-	stloc.3
-// 0x01074830: 0x1074830: lw    a3, 112(sp)
+	stloc 13
+// 0x01074960: 0x1074960: lw    s4, 964(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4 241
 	add
 	ldelem.i4
-	stloc 4
-// 0x01074834: 0x1074834: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074838: 0x1074838: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 6
-// 0x0107483c: 0x107483c: addiu v0, v0, -30456
-	ldloc 6
-	ldc.i4 -30456
-	add
-	stloc 6
-// 0x01074840: 0x1074840: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x01074844: 0x1074844: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01074848: 0x1074848: sw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107484c: 0x107484c: sw    s0, 24(sp)
+	stloc 12
+// 0x01074964: 0x1074964: lw    s3, 960(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 240
 	add
-	ldloc 7
-	stelem.i4
-// 0x01074850: 0x1074850: jal   0x1072cd8 sw    v0, 16(sp)
+	ldelem.i4
+	stloc 11
+// 0x01074968: 0x1074968: lw    s2, 956(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 239
 	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x01074858: 0x1074858: lw    ra, 132(sp)
-// 0x0107485c: 0x107485c: lw    s1, 128(sp)
+	ldelem.i4
+	stloc 10
+// 0x0107496c: 0x107496c: lw    s1, 952(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4 238
 	add
 	ldelem.i4
 	stloc 8
-// 0x01074860: 0x1074860: lw    s0, 124(sp)
+// 0x01074970: 0x1074970: lw    s0, 948(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4 237
 	add
 	ldelem.i4
-	stloc 7
-// 0x01074864: 0x1074864: jr    ra addiu sp, sp, 136
+	stloc 9
+// 0x01074974: 0x1074974: jr    ra addiu sp, sp, 976
 	ldloc.0
-	ldc.i4 136
+	ldc.i4 976
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_FoursquareConnect_107486c(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_ReportAlertAtPosition_107497c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t1,int32 ra,int32 t0)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 t0,int32 s2,int32 s0,int32 s1,int32 s3,int32 s4,int32 s5,int32 ra)
 
-// local  5 is register v0
+// local  6 is register v0
 // local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register t0
-// local  8 is register t1
+// local  8 is register t0
+// local 10 is register s0
+// local 11 is register s1
+// local  9 is register s2
+// local 12 is register s3
+// local 13 is register s4
+// local 14 is register s5
 // local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
+// local 15 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
 	stloc 7
 	ldarg 1
@@ -4085,310 +4268,354 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 8
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 15
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107486c: 0x107486c: addiu sp, sp, -48
+// 0x0107497c: 0x107497c: addiu sp, sp, -984
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4 -984
 	add
 	stloc.0
-// 0x01074870: 0x1074870: sw    ra, 44(sp)
-// 0x01074874: 0x1074874: addu  t1, a0, zero
-	ldloc.1
-	stloc 8
-// 0x01074878: 0x1074878: addu  t0, a1, zero
-	ldloc.2
-	stloc 10
-// 0x0107487c: 0x107487c: bne   a3, zero, 0x1074890 addu  v1, a2, zero
-	ldloc 4
-	ldloc.3
-	stloc 7
-	brtrue L_1074890
-// --- basic block ---
-// 0x01074884: 0x1074884: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01074888: 0x1074888: j	 0x1074898 addiu v0, v0, 18636
+// 0x01074980: 0x1074980: sw    s5, 976(sp)
 	ldloc 5
-	ldc.i4 18636
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 244
 	add
-	stloc 5
-	br L_1074898
-// --- basic block ---
-L_1074890:
-// 0x01074890: 0x1074890: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x01074894: 0x1074894: addiu v0, v0, 12208
+	ldloc 14
+	stelem.i4
+// 0x01074984: 0x1074984: sw    s4, 972(sp)
 	ldloc 5
-	ldc.i4 12208
-	add
-	stloc 5
-L_1074898:
-// 0x01074898: 0x1074898: sw    v1, 24(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 243
 	add
-	ldloc 7
+	ldloc 13
 	stelem.i4
-// 0x0107489c: 0x107489c: lw    a2, 64(sp)
-	ldloc 6
+// 0x01074988: 0x1074988: sw    s3, 968(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc.3
-// 0x010748a0: 0x10748a0: addu  a3, t1, zero
-	ldloc 8
-	stloc 4
-// 0x010748a4: 0x10748a4: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x010748a8: 0x10748a8: lui   t1, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x010748ac: 0x10748ac: lui   v1, 0x10000
-	ldc.i4 65536
-	stloc 7
-// 0x010748b0: 0x10748b0: addiu t1, t1, -30400
-	ldloc 8
-	ldc.i4 -30400
-	add
-	stloc 8
-// 0x010748b4: 0x10748b4: addiu v1, v1, 12208
-	ldloc 7
-	ldc.i4 12208
-	add
-	stloc 7
-// 0x010748b8: 0x10748b8: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldc.i4 242
 	add
-	stloc.1
-// 0x010748bc: 0x10748bc: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x010748c0: 0x10748c0: sw    t1, 16(sp)
-	ldloc 6
+	ldloc 12
+	stelem.i4
+// 0x0107498c: 0x107498c: sw    s1, 960(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 240
 	add
-	ldloc 8
+	ldloc 11
 	stelem.i4
-// 0x010748c4: 0x10748c4: sw    t0, 20(sp)
-	ldloc 6
+// 0x01074990: 0x1074990: sw    s0, 956(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 239
 	add
 	ldloc 10
 	stelem.i4
-// 0x010748c8: 0x10748c8: sw    v1, 28(sp)
-	ldloc 6
+// 0x01074994: 0x1074994: sw    ra, 980(sp)
+// 0x01074998: 0x1074998: sw    s2, 964(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 241
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x010748cc: 0x10748cc: jal   0x1072cd8 sw    v0, 32(sp)
-	ldloc 6
+// 0x0107499c: 0x107499c: addu  s5, a0, zero
+	ldloc.1
+	stloc 14
+// 0x010749a0: 0x10749a0: addu  s4, a1, zero
+	ldloc.2
+	stloc 13
+// 0x010749a4: 0x10749a4: lw    s1, 1000(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 250
 	add
+	ldelem.i4
+	stloc 11
+// 0x010749a8: 0x10749a8: lw    s0, 1024(sp)
 	ldloc 5
-	stelem.i4
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4 256
+	add
+	ldelem.i4
+	stloc 10
+// 0x010749ac: 0x10749ac: beq   a2, zero, 0x1074a14 addu  s3, a3, zero
+	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 12
+	brfalse L_1074a14
+// --- basic block ---
+// 0x010749b4: 0x10749b4: lb    v0, 0(a2)
+	ldloc.3
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x010749b8: 0x10749b8: sll   zero, zero, 0
+// 0x010749bc: 0x10749bc: beq   v0, zero, 0x1074a18 lui   s2, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc 9
+	brfalse L_1074a18
 // --- basic block ---
-// 0x010748d4: 0x10748d4: lw    ra, 44(sp)
-// 0x010748d8: 0x10748d8: sll   zero, zero, 0
-// 0x010748dc: 0x10748dc: jr    ra addiu sp, sp, 48
+// 0x010749c4: 0x10749c4: addiu s2, sp, 144
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4 144
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_TwitterConnect_10748e4(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t1,int32 ra,int32 t0)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 10 is register t0
-// local  8 is register t1
-// local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
 	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x010749c8: 0x10749c8: addu  a0, a2, zero
+	ldloc.3
+	stloc.1
+// 0x010749cc: 0x10749cc: addu  a1, s2, zero
+	ldloc 9
+	stloc.2
+// 0x010749d0: 0x10749d0: jal   0x1067b74 addiu a2, zero, 801
+	ldc.i4 801
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010748e4: 0x10748e4: addiu sp, sp, -48
-	ldloc.0
-	ldc.i4.s -48
+// 0x010749d8: 0x10749d8: bne   v0, zero, 0x1074a1c lui   a1, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1074a1c
+// --- basic block ---
+// 0x010749e0: 0x10749e0: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x010749e4: 0x10749e4: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	stloc.0
-// 0x010748e8: 0x10748e8: sw    ra, 44(sp)
-// 0x010748ec: 0x10748ec: addu  t1, a0, zero
+	stloc.2
+// 0x010749e8: 0x10749e8: addiu a3, a3, -30628
+	ldloc 4
+	ldc.i4 -30628
+	add
+	stloc 4
+// 0x010749ec: 0x10749ec: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x010749f0: 0x10749f0: jal   0x100449c addiu a2, zero, 1176
+	ldc.i4 1176
+	stloc.3
+	ldloc.0
 	ldloc.1
-	stloc 8
-// 0x010748f0: 0x10748f0: addu  t0, a1, zero
 	ldloc.2
-	stloc 10
-// 0x010748f4: 0x10748f4: bne   a3, zero, 0x1074908 addu  v1, a2, zero
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010749f8: 0x10749f8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010749fc: 0x10749fc: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01074a00: 0x1074a00: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x01074a04: 0x1074a04: jal   0x104c158 addiu a1, a1, -32732
+	ldloc.2
+	ldc.i4 -32732
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brtrue L_1074908
+	stloc 6
+// --- basic block ---
+// 0x01074a0c: 0x1074a0c: j	 0x1074ae0 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1074ae0
 // --- basic block ---
-// 0x010748fc: 0x10748fc: lui   v0, 0x10000
+L_1074a14:
+// 0x01074a14: 0x1074a14: lui   s2, 0x10000
 	ldc.i4 65536
-	stloc 5
-// 0x01074900: 0x1074900: j	 0x1074910 addiu v0, v0, -25260
-	ldloc 5
-	ldc.i4 -25260
+	stloc 9
+L_1074a18:
+// 0x01074a18: 0x1074a18: addiu s2, s2, 18768
+	ldloc 9
+	ldc.i4 18768
 	add
-	stloc 5
-	br L_1074910
+	stloc 9
+L_1074a1c:
+// 0x01074a1c: 0x1074a1c: bne   s1, zero, 0x1074a2c sll   zero, zero, 0
+	ldloc 11
+	brtrue L_1074a2c
 // --- basic block ---
-L_1074908:
-// 0x01074908: 0x1074908: lui   v0, 0x10000
+// 0x01074a24: 0x1074a24: lui   s1, 0x10000
 	ldc.i4 65536
-	stloc 5
-// 0x0107490c: 0x107490c: addiu v0, v0, 32112
-	ldloc 5
-	ldc.i4 32112
+	stloc 11
+// 0x01074a28: 0x1074a28: addiu s1, s1, 18768
+	ldloc 11
+	ldc.i4 18768
 	add
-	stloc 5
-L_1074910:
-// 0x01074910: 0x1074910: sw    v1, 24(sp)
-	ldloc 6
+	stloc 11
+L_1074a2c:
+// 0x01074a2c: 0x1074a2c: bne   s0, zero, 0x1074a3c sll   zero, zero, 0
+	ldloc 10
+	brtrue L_1074a3c
+// --- basic block ---
+// 0x01074a34: 0x1074a34: lui   s0, 0x10000
+	ldc.i4 65536
+	stloc 10
+// 0x01074a38: 0x1074a38: addiu s0, s0, 18768
+	ldloc 10
+	ldc.i4 18768
+	add
+	stloc 10
+L_1074a3c:
+// 0x01074a3c: 0x1074a3c: lw    a1, 1012(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 253
 	add
-	ldloc 7
-	stelem.i4
-// 0x01074914: 0x1074914: sw    v0, 32(sp)
-	ldloc 6
+	ldelem.i4
+	stloc.2
+// 0x01074a40: 0x1074a40: jal   0x1073020 addiu a0, sp, 64
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4.s 64
 	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::format_RoadMapGpsPosition_string_1073020(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01074a48: 0x1074a48: lw    v0, 1004(sp)
 	ldloc 5
-	stelem.i4
-// 0x01074918: 0x1074918: lw    a2, 68(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4 251
 	add
 	ldelem.i4
-	stloc.3
-// 0x0107491c: 0x107491c: lw    v0, 64(sp)
+	stloc 6
+// 0x01074a4c: 0x1074a4c: sll   zero, zero, 0
+// 0x01074a50: 0x1074a50: bne   v0, zero, 0x1074a60 lui   v1, 0x20000
 	ldloc 6
+	ldc.i4 131072
+	stloc 7
+	brtrue L_1074a60
+// --- basic block ---
+// 0x01074a58: 0x1074a58: j	 0x1074a68 addiu v1, v1, 19096
+	ldloc 7
+	ldc.i4 19096
+	add
+	stloc 7
+	br L_1074a68
+// --- basic block ---
+L_1074a60:
+// 0x01074a60: 0x1074a60: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x01074a64: 0x1074a64: addiu v1, v1, 12204
+	ldloc 7
+	ldc.i4 12204
+	add
+	stloc 7
+L_1074a68:
+// 0x01074a68: 0x1074a68: lw    v0, 1008(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4 252
 	add
 	ldelem.i4
-	stloc 5
-// 0x01074920: 0x1074920: addu  a3, t1, zero
-	ldloc 8
-	stloc 4
-// 0x01074924: 0x1074924: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074928: 0x1074928: lui   t1, 0x20000
+	stloc 6
+// 0x01074a6c: 0x1074a6c: sll   zero, zero, 0
+// 0x01074a70: 0x1074a70: bne   v0, zero, 0x1074a80 lui   v0, 0x20000
+	ldloc 6
 	ldc.i4 131072
-	stloc 8
-// 0x0107492c: 0x107492c: lui   v1, 0x10000
+	stloc 6
+	brtrue L_1074a80
+// --- basic block ---
+// 0x01074a78: 0x1074a78: j	 0x1074a88 addiu v0, v0, 19096
+	ldloc 6
+	ldc.i4 19096
+	add
+	stloc 6
+	br L_1074a88
+// --- basic block ---
+L_1074a80:
+// 0x01074a80: 0x1074a80: lui   v0, 0x10000
 	ldc.i4 65536
-	stloc 7
-// 0x01074930: 0x1074930: addiu t1, t1, -30320
+	stloc 6
+// 0x01074a84: 0x1074a84: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
+	add
+	stloc 6
+L_1074a88:
+// 0x01074a88: 0x1074a88: lui   t0, 0x20000
+	ldc.i4 131072
+	stloc 8
+// 0x01074a8c: 0x1074a8c: addiu t0, t0, -30320
 	ldloc 8
 	ldc.i4 -30320
 	add
 	stloc 8
-// 0x01074934: 0x1074934: addiu v1, v1, 32112
-	ldloc 7
-	ldc.i4 32112
-	add
-	stloc 7
-// 0x01074938: 0x1074938: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x0107493c: 0x107493c: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01074940: 0x1074940: sw    t1, 16(sp)
-	ldloc 6
+// 0x01074a90: 0x1074a90: sw    t0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -4396,168 +4623,226 @@ L_1074910:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01074944: 0x1074944: sw    t0, 20(sp)
-	ldloc 6
+// 0x01074a94: 0x1074a94: addiu t0, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc 8
+// 0x01074a98: 0x1074a98: sw    t0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01074948: 0x1074948: sw    v1, 28(sp)
-	ldloc 6
+// 0x01074a9c: 0x1074a9c: lw    t0, 1016(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 254
 	add
-	ldloc 7
+	ldelem.i4
+	stloc 8
+// 0x01074aa0: 0x1074aa0: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074aa4: 0x1074aa4: sw    t0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
 	stelem.i4
-// 0x0107494c: 0x107494c: jal   0x1072cd8 sw    v0, 36(sp)
-	ldloc 6
+// 0x01074aa8: 0x1074aa8: lw    a2, 1028(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 257
 	add
+	ldelem.i4
+	stloc.3
+// 0x01074aac: 0x1074aac: lw    t0, 1020(sp)
 	ldloc 5
-	stelem.i4
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01074954: 0x1074954: lw    ra, 44(sp)
-// 0x01074958: 0x1074958: sll   zero, zero, 0
-// 0x0107495c: 0x107495c: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.2
+	shr.un
+	ldc.i4 255
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTNet_SendSMS_1074964(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
+	ldelem.i4
 	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+// 0x01074ab0: 0x1074ab0: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074ab4: 0x1074ab4: addu  a3, s5, zero
+	ldloc 14
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01074964: 0x1074964: addiu sp, sp, -32
+// 0x01074ab8: 0x1074ab8: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074abc: 0x1074abc: sw    t0, 28(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.0
-// 0x01074968: 0x1074968: addu  a3, a0, zero
-	ldloc.1
-	stloc 4
-// 0x0107496c: 0x107496c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01074970: 0x1074970: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074974: 0x1074974: sw    a1, 20(sp)
-	ldloc 6
+	ldloc 8
+	stelem.i4
+// 0x01074ac0: 0x1074ac0: sw    s4, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.8
 	add
-	ldloc.2
+	ldloc 13
 	stelem.i4
-// 0x01074978: 0x1074978: addiu v0, v0, -30204
+// 0x01074ac4: 0x1074ac4: sw    s2, 36(sp)
 	ldloc 5
-	ldc.i4 -30204
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
 	add
-	stloc 5
-// 0x0107497c: 0x107497c: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldloc 9
+	stelem.i4
+// 0x01074ac8: 0x1074ac8: sw    s3, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
-	stloc.1
-// 0x01074980: 0x1074980: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01074984: 0x1074984: sw    ra, 28(sp)
-// 0x01074988: 0x1074988: jal   0x1072cd8 sw    v0, 16(sp)
-	ldloc 6
+	ldloc 12
+	stelem.i4
+// 0x01074acc: 0x1074acc: sw    s1, 44(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 11
+	add
+	ldloc 11
+	stelem.i4
+// 0x01074ad0: 0x1074ad0: sw    v1, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 7
+	stelem.i4
+// 0x01074ad4: 0x1074ad4: sw    v0, 52(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
 	add
+	ldloc 6
+	stelem.i4
+// 0x01074ad8: 0x1074ad8: jal   0x10732fc sw    s0, 56(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc 10
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01074990: 0x1074990: lw    ra, 28(sp)
-// 0x01074994: 0x1074994: sll   zero, zero, 0
-// 0x01074998: 0x1074998: jr    ra addiu sp, sp, 32
+L_1074ae0:
+// 0x01074ae0: 0x1074ae0: lw    ra, 980(sp)
+// 0x01074ae4: 0x1074ae4: lw    s5, 976(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 244
+	add
+	ldelem.i4
+	stloc 14
+// 0x01074ae8: 0x1074ae8: lw    s4, 972(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 243
+	add
+	ldelem.i4
+	stloc 13
+// 0x01074aec: 0x1074aec: lw    s3, 968(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 242
+	add
+	ldelem.i4
+	stloc 12
+// 0x01074af0: 0x1074af0: lw    s2, 964(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 241
+	add
+	ldelem.i4
+	stloc 9
+// 0x01074af4: 0x1074af4: lw    s1, 960(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 240
+	add
+	ldelem.i4
+	stloc 11
+// 0x01074af8: 0x1074af8: lw    s0, 956(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 239
+	add
+	ldelem.i4
+	stloc 10
+// 0x01074afc: 0x1074afc: jr    ra addiu sp, sp, 984
+	ldloc.0
+	ldc.i4 984
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTNet_ExternalPoiDisplayed_10749a0(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_ReportAlert_1074b04(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s7,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra,int32 lo)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
 
-// local  5 is register v0
+// local  6 is register v0
 // local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
@@ -4566,18 +4851,13 @@ __CIBYL_function_return:
 // local  8 is register s0
 // local  9 is register s1
 // local 10 is register s2
-// local 12 is register s3
-// local 13 is register s4
-// local 14 is register s5
-// local 15 is register s6
-// local 11 is register s7
+// local 11 is register s3
 // local  0 is register sp
-// local 16 is register ra
-// local 17 is register lo
-// local  6 is register mem
+// local 12 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
 	stloc 7
 	ldarg 1
@@ -4595,498 +4875,406 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
 	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 17
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010749a0: 0x10749a0: addiu sp, sp, -2336
+// 0x01074b04: 0x1074b04: addiu sp, sp, -88
 	ldloc.0
-	ldc.i4 -2336
+	ldc.i4.s -88
 	add
 	stloc.0
-// 0x010749a4: 0x10749a4: sw    ra, 2332(sp)
-// 0x010749a8: 0x10749a8: sw    s6, 2324(sp)
-	ldloc 6
+// 0x01074b08: 0x1074b08: sw    s0, 68(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 581
+	ldc.i4.s 17
 	add
-	ldloc 15
+	ldloc 8
 	stelem.i4
-// 0x010749ac: 0x10749ac: sw    s5, 2320(sp)
-	ldloc 6
+// 0x01074b0c: 0x1074b0c: lui   s0, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x01074b10: 0x1074b10: sw    s3, 80(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 580
+	ldc.i4.s 20
 	add
-	ldloc 14
+	ldloc 11
 	stelem.i4
-// 0x010749b0: 0x10749b0: sw    s3, 2312(sp)
-	ldloc 6
+// 0x01074b14: 0x1074b14: addu  s3, a0, zero
+	ldloc.1
+	stloc 11
+// 0x01074b18: 0x1074b18: addiu a0, s0, -23972
+	ldloc 8
+	ldc.i4 -23972
+	add
+	stloc.1
+// 0x01074b1c: 0x1074b1c: sw    s2, 76(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.s 19
 	add
-	ldloc 12
+	ldloc 10
 	stelem.i4
-// 0x010749b4: 0x10749b4: sw    s1, 2304(sp)
-	ldloc 6
+// 0x01074b20: 0x1074b20: sw    s1, 72(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 576
+	ldc.i4.s 18
 	add
 	ldloc 9
 	stelem.i4
-// 0x010749b8: 0x10749b8: sw    s0, 2300(sp)
-	ldloc 6
+// 0x01074b24: 0x1074b24: sw    a3, 60(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 575
+	ldc.i4.s 15
 	add
-	ldloc 8
+	ldloc 4
 	stelem.i4
-// 0x010749bc: 0x10749bc: addu  s5, a0, zero
-	ldloc.1
-	stloc 14
-// 0x010749c0: 0x10749c0: addu  s6, a1, zero
+// 0x01074b28: 0x1074b28: sw    ra, 84(sp)
+// 0x01074b2c: 0x1074b2c: addu  s2, a1, zero
 	ldloc.2
-	stloc 15
-// 0x010749c4: 0x10749c4: addu  s3, a2, zero
+	stloc 10
+// 0x01074b30: 0x1074b30: jal   0x101df34 addu  s1, a2, zero
 	ldloc.3
-	stloc 12
-// 0x010749c8: 0x10749c8: sw    s7, 2328(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 582
-	add
-	ldloc 11
-	stelem.i4
-// 0x010749cc: 0x10749cc: sw    s4, 2316(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 579
-	add
-	ldloc 13
-	stelem.i4
-// 0x010749d0: 0x10749d0: sw    s2, 2308(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 577
-	add
-	ldloc 10
-	stelem.i4
-// 0x010749d4: 0x10749d4: jal   0x10907a0 addiu s0, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc 8
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_Count_10907a0()
-	stloc 5
-// --- basic block ---
-// 0x010749dc: 0x10749dc: addu  s1, v0, zero
-	ldloc 5
 	stloc 9
-// 0x010749e0: 0x10749e0: jal   0x10674e4 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010749e8: 0x10749e8: beq   s1, zero, 0x1074ac8 addu  v0, zero, zero
-	ldloc 9
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_1074ac8
+	stloc 6
 // --- basic block ---
-// 0x010749f0: 0x10749f0: addiu a1, zero, 11
-	ldc.i4.s 11
-	stloc.2
-// 0x010749f4: 0x10749f4: mult  s1, a1
-	ldloc 9
-	ldloc.2
-	mul
-	stloc 17
-// 0x010749f8: 0x10749f8: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x010749fc: 0x10749fc: lui   s7, 0x20000
-	ldc.i4 131072
-	stloc 11
-// 0x01074a00: 0x1074a00: addu  s2, zero, zero
-	ldc.i4.s 0
-	stloc 10
-// 0x01074a04: 0x1074a04: addiu s4, sp, 24
+// 0x01074b38: 0x1074b38: lw    a3, 60(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 13
-// 0x01074a08: 0x1074a08: addiu s7, s7, -31368
-	ldloc 11
-	ldc.i4 -31368
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
 	add
-	stloc 11
-// 0x01074a0c: 0x1074a0c: mflo  lo
-	ldloc 17
-	stloc.2
-// 0x01074a10: 0x1074a10: jal   0x106755c addiu a1, a1, 20
-	ldloc.2
-	ldc.i4.s 20
+	ldelem.i4
+	stloc 4
+// 0x01074b3c: 0x1074b3c: bne   v0, zero, 0x1074b60 addiu a0, s0, -23972
+	ldloc 6
+	ldloc 8
+	ldc.i4 -23972
 	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc.1
+	brtrue L_1074b60
 // --- basic block ---
-// 0x01074a18: 0x1074a18: lui   a1, 0x20000
+// 0x01074b44: 0x1074b44: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074b48: 0x1074b48: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01074a1c: 0x1074a1c: sb    zero, 0(v0)
-	ldloc 5
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074a20: 0x1074a20: sb    zero, 1(v0)
-	ldloc 5
-	ldc.i4.1
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074a24: 0x1074a24: sb    zero, 2(v0)
-	ldloc 5
-	ldc.i4.2
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074a28: 0x1074a28: sb    zero, 3(v0)
-	ldloc 5
-	ldc.i4.3
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074a2c: 0x1074a2c: addiu a1, a1, -30148
-	ldloc.2
-	ldc.i4 -30148
+// 0x01074b4c: 0x1074b4c: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	stloc.2
-// 0x01074a30: 0x1074a30: addu  a0, v0, zero
-	ldloc 5
 	stloc.1
-// 0x01074a34: 0x1074a34: addu  a2, s1, zero
-	ldloc 9
-	stloc.3
-// 0x01074a38: 0x1074a38: jal   0x1000f64 addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-	ldloc.0
-	ldloc.1
+// 0x01074b50: 0x1074b50: jal   0x104c158 addiu a1, a1, -30272
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01074a40: 0x1074a40: j	 0x1074a70 slt   v0, s2, s1
-	ldloc 10
-	ldloc 9
-	clt
-	stloc 5
-	br L_1074a70
-// --- basic block ---
-L_1074a48:
-// 0x01074a48: 0x1074a48: jal   0x10907b0 addiu s2, s2, 1
-	ldloc 10
-	ldc.i4.1
+	ldc.i4 -30272
 	add
-	stloc 10
-	ldloc.1
-	call int32 Cibyl107::RealtimeExternalPoi_DisplayedList_get_ID_10907b0(int32)
-	stloc 5
-// --- basic block ---
-// 0x01074a50: 0x1074a50: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x01074a54: 0x1074a54: addu  a0, s4, zero
-	ldloc 13
-	stloc.1
-// 0x01074a58: 0x1074a58: jal   0x1000f64 addu  a1, s7, zero
-	ldloc 11
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01074a60: 0x1074a60: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x01074a64: 0x1074a64: jal   0x1001ac4 addu  a1, s4, zero
-	ldloc 13
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x01074a6c: 0x1074a6c: slt   v0, s2, s1
-	ldloc 10
-	ldloc 9
-	clt
-	stloc 5
-L_1074a70:
-// 0x01074a70: 0x1074a70: bne   v0, zero, 0x1074a48 addu  a0, s2, zero
-	ldloc 5
-	ldloc 10
-	stloc.1
-	brtrue L_1074a48
+	stloc 6
 // --- basic block ---
-// 0x01074a78: 0x1074a78: beq   s3, zero, 0x1074a98 lui   a1, 0x20000
-	ldloc 12
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1074a98
+// 0x01074b58: 0x1074b58: j	 0x1074bc8 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1074bc8
 // --- basic block ---
-// 0x01074a80: 0x1074a80: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x01074a84: 0x1074a84: addiu a1, a1, -29620
-	ldloc.2
-	ldc.i4 -29620
+L_1074b60:
+// 0x01074b60: 0x1074b60: addiu a1, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
 	stloc.2
-// 0x01074a88: 0x1074a88: jal   0x1000f64 addu  a2, s0, zero
-	ldloc 8
-	stloc.3
+// 0x01074b64: 0x1074b64: addiu a2, sp, 52
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01074a90: 0x1074a90: j	 0x1074ab4 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_1074ab4
-// --- basic block ---
-L_1074a98:
-// 0x01074a98: 0x1074a98: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074a9c: 0x1074a9c: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldc.i4.s 52
 	add
-	stloc.1
-// 0x01074aa0: 0x1074aa0: addu  a2, s6, zero
-	ldloc 15
 	stloc.3
-// 0x01074aa4: 0x1074aa4: addu  a3, s5, zero
-	ldloc 14
-	stloc 4
-// 0x01074aa8: 0x1074aa8: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01074aac: 0x1074aac: jal   0x1072cd8 sw    s0, 16(sp)
-	ldloc 6
+// 0x01074b68: 0x1074b68: sw    v0, 56(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 14
 	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_1074ab4:
-// 0x01074ab4: 0x1074ab4: jal   0x10908f4 sw    v0, 2288(sp)
 	ldloc 6
+	stelem.i4
+// 0x01074b6c: 0x1074b6c: jal   0x101ded8 sw    a3, 60(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4.s 15
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
 	ldloc 4
-	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_clear_10908f4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01074abc: 0x1074abc: jal   0x1067508 addiu a0, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc.1
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_nodes_101ded8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x01074ac4: 0x1074ac4: lw    v0, 2288(sp)
-	ldloc 6
+// 0x01074b74: 0x1074b74: lw    v0, 56(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc 5
-L_1074ac8:
-// 0x01074ac8: 0x1074ac8: lw    ra, 2332(sp)
-// 0x01074acc: 0x1074acc: lw    s7, 2328(sp)
-	ldloc 6
+	stloc 6
+// 0x01074b78: 0x1074b78: lw    v1, 104(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 582
+	ldc.i4.s 26
 	add
 	ldelem.i4
-	stloc 11
-// 0x01074ad0: 0x1074ad0: lw    s6, 2324(sp)
-	ldloc 6
+	stloc 7
+// 0x01074b7c: 0x1074b7c: sw    v0, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 581
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 15
-// 0x01074ad4: 0x1074ad4: lw    s5, 2320(sp)
 	ldloc 6
+	stelem.i4
+// 0x01074b80: 0x1074b80: lw    v0, 48(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 580
+	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc 14
-// 0x01074ad8: 0x1074ad8: lw    s4, 2316(sp)
-	ldloc 6
+	stloc 6
+// 0x01074b84: 0x1074b84: sw    v1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 579
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x01074b88: 0x1074b88: sw    v0, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc 13
-// 0x01074adc: 0x1074adc: lw    s3, 2312(sp)
 	ldloc 6
+	stelem.i4
+// 0x01074b8c: 0x1074b8c: lw    v0, 52(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc 12
-// 0x01074ae0: 0x1074ae0: lw    s2, 2308(sp)
+	stloc 6
+// 0x01074b90: 0x1074b90: lw    v1, 108(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 27
+	add
+	ldelem.i4
+	stloc 7
+// 0x01074b94: 0x1074b94: sw    v0, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
 	ldloc 6
+	stelem.i4
+// 0x01074b98: 0x1074b98: lw    v0, 116(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 577
+	ldc.i4.s 29
 	add
 	ldelem.i4
-	stloc 10
-// 0x01074ae4: 0x1074ae4: lw    s1, 2304(sp)
+	stloc 6
+// 0x01074b9c: 0x1074b9c: sw    v1, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
+// 0x01074ba0: 0x1074ba0: sw    v0, 40(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
 	ldloc 6
+	stelem.i4
+// 0x01074ba4: 0x1074ba4: lw    v1, 112(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 576
+	ldc.i4.s 28
 	add
 	ldelem.i4
-	stloc 9
-// 0x01074ae8: 0x1074ae8: lw    s0, 2300(sp)
+	stloc 7
+// 0x01074ba8: 0x1074ba8: lw    v0, 120(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
+	add
+	ldelem.i4
+	stloc 6
+// 0x01074bac: 0x1074bac: lw    a3, 60(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
+	add
+	ldelem.i4
+	stloc 4
+// 0x01074bb0: 0x1074bb0: addu  a0, s3, zero
+	ldloc 11
+	stloc.1
+// 0x01074bb4: 0x1074bb4: addu  a1, s2, zero
+	ldloc 10
+	stloc.2
+// 0x01074bb8: 0x1074bb8: addu  a2, s1, zero
+	ldloc 9
+	stloc.3
+// 0x01074bbc: 0x1074bbc: sw    v1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 7
+	stelem.i4
+// 0x01074bc0: 0x1074bc0: jal   0x107497c sw    v0, 44(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
 	ldloc 6
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl87::RTNet_ReportAlertAtPosition_107497c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+L_1074bc8:
+// 0x01074bc8: 0x1074bc8: lw    ra, 84(sp)
+// 0x01074bcc: 0x1074bcc: lw    s3, 80(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 575
+	ldc.i4.s 20
+	add
+	ldelem.i4
+	stloc 11
+// 0x01074bd0: 0x1074bd0: lw    s2, 76(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldelem.i4
+	stloc 10
+// 0x01074bd4: 0x1074bd4: lw    s1, 72(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldelem.i4
+	stloc 9
+// 0x01074bd8: 0x1074bd8: lw    s0, 68(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
 	add
 	ldelem.i4
 	stloc 8
-// 0x01074aec: 0x1074aec: jr    ra addiu sp, sp, 2336
+// 0x01074bdc: 0x1074bdc: jr    ra addiu sp, sp, 88
 	ldloc.0
-	ldc.i4 2336
+	ldc.i4.s 88
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTNet_NodePath_1074af4(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_PostAlertComment_1074be4(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s4,int32 s0,int32 s2,int32 s3,int32 s8,int32 s5,int32 s6,int32 s7,int32 ra,int32 lo)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 t0,int32 s0,int32 s1,int32 ra)
 
 // local  6 is register v0
 // local  7 is register v1
@@ -5094,18 +5282,12 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  9 is register t0
 // local 10 is register s0
-// local  8 is register s1
-// local 11 is register s2
-// local 12 is register s3
-// local  9 is register s4
-// local 14 is register s5
-// local 15 is register s6
-// local 16 is register s7
+// local 11 is register s1
+// local  8 is register s2
 // local  0 is register sp
-// local 13 is register s8
-// local 17 is register ra
-// local 18 is register lo
+// local 12 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -5121,764 +5303,634 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 14
+	stloc 10
 	ldc.i4.s 0
-	stloc 15
+	stloc 11
 	ldc.i4.s 0
-	stloc 16
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 17
-	ldc.i4.s 0
-	stloc 18
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074af4: 0x1074af4: addiu sp, sp, -2352
+// 0x01074be4: 0x1074be4: addiu sp, sp, -872
 	ldloc.0
-	ldc.i4 -2352
+	ldc.i4 -872
 	add
 	stloc.0
-// 0x01074af8: 0x1074af8: sw    s8, 2344(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 586
-	add
-	ldloc 13
-	stelem.i4
-// 0x01074afc: 0x1074afc: sw    s7, 2340(sp)
+// 0x01074be8: 0x1074be8: sw    s1, 860(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
+	ldc.i4 215
 	add
-	ldloc 16
+	ldloc 11
 	stelem.i4
-// 0x01074b00: 0x1074b00: sw    s4, 2328(sp)
+// 0x01074bec: 0x1074bec: sw    s0, 856(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 582
+	ldc.i4 214
 	add
-	ldloc 9
+	ldloc 10
 	stelem.i4
-// 0x01074b04: 0x1074b04: sw    s3, 2324(sp)
+// 0x01074bf0: 0x1074bf0: sw    ra, 868(sp)
+// 0x01074bf4: 0x1074bf4: sw    s2, 864(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 581
+	ldc.i4 216
 	add
-	ldloc 12
+	ldloc 8
 	stelem.i4
-// 0x01074b08: 0x1074b08: sw    s1, 2316(sp)
-	ldloc 5
+// 0x01074bf8: 0x1074bf8: addu  s1, a0, zero
+	ldloc.1
+	stloc 11
+// 0x01074bfc: 0x1074bfc: beq   a2, zero, 0x1074c6c addu  s0, a1, zero
+	ldloc.3
+	ldloc.2
+	stloc 10
+	brfalse L_1074c6c
+// --- basic block ---
+// 0x01074c04: 0x1074c04: lb    v0, 0(a2)
+	ldloc.3
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x01074c08: 0x1074c08: sll   zero, zero, 0
+// 0x01074c0c: 0x1074c0c: beq   v0, zero, 0x1074c70 lui   s2, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc 8
+	brfalse L_1074c70
+// --- basic block ---
+// 0x01074c14: 0x1074c14: addiu s2, sp, 40
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 579
+	ldc.i4.s 40
 	add
+	stloc 8
+// 0x01074c18: 0x1074c18: addu  a0, a2, zero
+	ldloc.3
+	stloc.1
+// 0x01074c1c: 0x1074c1c: addu  a1, s2, zero
 	ldloc 8
-	stelem.i4
-// 0x01074b0c: 0x1074b0c: sw    ra, 2348(sp)
-// 0x01074b10: 0x1074b10: sw    s6, 2336(sp)
+	stloc.2
+// 0x01074c20: 0x1074c20: addiu a2, zero, 801
+	ldc.i4 801
+	stloc.3
+// 0x01074c24: 0x1074c24: jal   0x1067b74 sw    a3, 848(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 584
+	ldc.i4 212
 	add
-	ldloc 15
+	ldloc 4
 	stelem.i4
-// 0x01074b14: 0x1074b14: sw    s5, 2332(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01074c2c: 0x1074c2c: lw    a3, 848(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 583
+	ldc.i4 212
 	add
-	ldloc 14
-	stelem.i4
-// 0x01074b18: 0x1074b18: sw    s2, 2320(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 580
+	ldelem.i4
+	stloc 4
+// 0x01074c30: 0x1074c30: bne   v0, zero, 0x1074c74 lui   a1, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc.2
+	brtrue L_1074c74
+// --- basic block ---
+// 0x01074c38: 0x1074c38: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01074c3c: 0x1074c3c: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	ldloc 11
-	stelem.i4
-// 0x01074b1c: 0x1074b1c: sw    s0, 2312(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 578
+	stloc.2
+// 0x01074c40: 0x1074c40: addiu a3, a3, -30244
+	ldloc 4
+	ldc.i4 -30244
 	add
-	ldloc 10
-	stelem.i4
-// 0x01074b20: 0x1074b20: addu  s1, a3, zero
-	ldloc 4
-	stloc 8
-// 0x01074b24: 0x1074b24: sw    a0, 2352(sp)
-	ldloc 5
+	stloc 4
+// 0x01074c44: 0x1074c44: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01074c48: 0x1074c48: jal   0x100449c addiu a2, zero, 1134
+	ldc.i4 1134
+	stloc.3
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 588
-	add
 	ldloc.1
-	stelem.i4
-// 0x01074b28: 0x1074b28: addu  s8, a1, zero
 	ldloc.2
-	stloc 13
-// 0x01074b2c: 0x1074b2c: addu  s4, a2, zero
 	ldloc.3
-	stloc 9
-// 0x01074b30: 0x1074b30: lw    s3, 2368(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 592
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01074c50: 0x1074c50: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074c54: 0x1074c54: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01074c58: 0x1074c58: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
 	add
-	ldelem.i4
-	stloc 12
-// 0x01074b34: 0x1074b34: lw    v1, 2372(sp)
-	ldloc 5
+	stloc.1
+// 0x01074c5c: 0x1074c5c: jal   0x104c158 addiu a1, a1, -30184
+	ldloc.2
+	ldc.i4 -30184
+	add
+	stloc.2
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 593
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01074c64: 0x1074c64: j	 0x1074ce0 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1074ce0
+// --- basic block ---
+L_1074c6c:
+// 0x01074c6c: 0x1074c6c: lui   s2, 0x10000
+	ldc.i4 65536
+	stloc 8
+L_1074c70:
+// 0x01074c70: 0x1074c70: addiu s2, s2, 18768
+	ldloc 8
+	ldc.i4 18768
+	add
+	stloc 8
+L_1074c74:
+// 0x01074c74: 0x1074c74: bne   a3, zero, 0x1074c84 lui   v1, 0x20000
+	ldloc 4
+	ldc.i4 131072
+	stloc 7
+	brtrue L_1074c84
+// --- basic block ---
+// 0x01074c7c: 0x1074c7c: j	 0x1074c8c addiu v1, v1, 19096
+	ldloc 7
+	ldc.i4 19096
+	add
+	stloc 7
+	br L_1074c8c
+// --- basic block ---
+L_1074c84:
+// 0x01074c84: 0x1074c84: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x01074c88: 0x1074c88: addiu v1, v1, 12204
+	ldloc 7
+	ldc.i4 12204
 	add
-	ldelem.i4
 	stloc 7
-// 0x01074b38: 0x1074b38: lw    s7, 2380(sp)
+L_1074c8c:
+// 0x01074c8c: 0x1074c8c: lw    v0, 888(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 595
+	ldc.i4 222
 	add
 	ldelem.i4
-	stloc 16
-// 0x01074b3c: 0x1074b3c: blez  a3, 0x1074d34 addu  v0, zero, zero
-	ldloc 4
-	ldc.i4.s 0
 	stloc 6
-	ldc.i4.s 0
-	ble L_1074d34
+// 0x01074c90: 0x1074c90: sll   zero, zero, 0
+// 0x01074c94: 0x1074c94: bne   v0, zero, 0x1074ca4 lui   v0, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 6
+	brtrue L_1074ca4
 // --- basic block ---
-// 0x01074b44: 0x1074b44: blez  v1, 0x1074ba8 addu  s5, zero, zero
-	ldloc 7
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	ble L_1074ba8
+// 0x01074c9c: 0x1074c9c: j	 0x1074cac addiu v0, v0, 19096
+	ldloc 6
+	ldc.i4 19096
+	add
+	stloc 6
+	br L_1074cac
 // --- basic block ---
-// 0x01074b4c: 0x1074b4c: beq   v1, a3, 0x1074b7c lui   a1, 0x10000
-	ldloc 7
-	ldloc 4
+L_1074ca4:
+// 0x01074ca4: 0x1074ca4: lui   v0, 0x10000
 	ldc.i4 65536
-	stloc.2
-	beq  L_1074b7c
-// --- basic block ---
-// 0x01074b54: 0x1074b54: lui   a3, 0x20000
+	stloc 6
+// 0x01074ca8: 0x1074ca8: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
+	add
+	stloc 6
+L_1074cac:
+// 0x01074cac: 0x1074cac: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074cb0: 0x1074cb0: lui   t0, 0x20000
 	ldc.i4 131072
-	stloc 4
-// 0x01074b58: 0x1074b58: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
+	stloc 9
+// 0x01074cb4: 0x1074cb4: lw    a2, 892(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 223
 	add
-	stloc.2
-// 0x01074b5c: 0x1074b5c: addiu a3, a3, -30116
-	ldloc 4
-	ldc.i4 -30116
+	ldelem.i4
+	stloc.3
+// 0x01074cb8: 0x1074cb8: addiu t0, t0, -30160
+	ldloc 9
+	ldc.i4 -30160
+	add
+	stloc 9
+// 0x01074cbc: 0x1074cbc: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
 	add
-	stloc 4
-// 0x01074b60: 0x1074b60: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x01074b64: 0x1074b64: addiu a2, zero, 859
-	ldc.i4 859
-	stloc.3
-// 0x01074b68: 0x1074b68: sw    v1, 16(sp)
+// 0x01074cc0: 0x1074cc0: addu  a3, s1, zero
+	ldloc 11
+	stloc 4
+// 0x01074cc4: 0x1074cc4: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074cc8: 0x1074cc8: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x01074b6c: 0x1074b6c: jal   0x100449c sw    s1, 20(sp)
+// 0x01074ccc: 0x1074ccc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 8
+	ldloc 10
 	stelem.i4
+// 0x01074cd0: 0x1074cd0: sw    s2, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074b74: 0x1074b74: j	 0x1074ba8 addu  s5, zero, zero
-	ldc.i4.s 0
-	stloc 14
-	br L_1074ba8
-// --- basic block ---
-L_1074b7c:
-// 0x01074b7c: 0x1074b7c: addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-// 0x01074b80: 0x1074b80: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-L_1074b84:
-// 0x01074b84: 0x1074b84: lw    a2, 0(a0)
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x01074cd4: 0x1074cd4: sw    v1, 28(sp)
 	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x01074b88: 0x1074b88: addiu v0, v0, 1
-	ldloc 6
-	ldc.i4.1
+	ldc.i4.7
 	add
-	stloc 6
-// 0x01074b8c: 0x1074b8c: blez  a2, 0x1074b9c slt   a1, v0, v1
-	ldloc.3
-	ldloc 6
 	ldloc 7
-	clt
-	stloc.2
-	ldc.i4.s 0
-	ble L_1074b9c
-// --- basic block ---
-// 0x01074b94: 0x1074b94: j	 0x1074ba8 addiu s5, zero, 1
-	ldc.i4.1
-	stloc 14
-	br L_1074ba8
-// --- basic block ---
-L_1074b9c:
-// 0x01074b9c: 0x1074b9c: bne   a1, zero, 0x1074b84 addiu a0, a0, 8
-	ldloc.2
-	ldloc.1
-	ldc.i4.8
-	add
-	stloc.1
-	brtrue L_1074b84
-// --- basic block ---
-// 0x01074ba4: 0x1074ba4: addu  s5, zero, zero
-	ldc.i4.s 0
-	stloc 14
-L_1074ba8:
-// 0x01074ba8: 0x1074ba8: jal   0x10674e4 addiu a0, sp, 60
+	stelem.i4
+// 0x01074cd8: 0x1074cd8: jal   0x10732fc sw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 60
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.1
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01074bb0: 0x1074bb0: slti  v0, s1, 61
-	ldloc 8
-	ldc.i4.s 61
-	clt
-	stloc 6
-// 0x01074bb4: 0x1074bb4: bne   v0, zero, 0x1074bcc sll   zero, zero, 0
-	ldloc 6
-	brtrue L_1074bcc
-// --- basic block ---
-// 0x01074bbc: 0x1074bbc: addiu s1, s1, -60
-	ldloc 8
-	ldc.i4.s -60
-	add
-	stloc 8
-// 0x01074bc0: 0x1074bc0: sll   s1, s1, 3
-	ldloc 8
-	ldc.i4.3
-	shl
-	stloc 8
-// 0x01074bc4: 0x1074bc4: addu  s4, s4, s1
-	ldloc 9
-	ldloc 8
-	add
-	stloc 9
-// 0x01074bc8: 0x1074bc8: addiu s1, zero, 60
-	ldc.i4.s 60
-	stloc 8
-L_1074bcc:
-// 0x01074bcc: 0x1074bcc: addiu a1, zero, 87
-	ldc.i4.s 87
-	stloc.2
-// 0x01074bd0: 0x1074bd0: mult  s1, a1
-	ldloc 8
-	ldloc.2
-	mul
-	stloc 18
-// 0x01074bd4: 0x1074bd4: addiu a0, sp, 60
+L_1074ce0:
+// 0x01074ce0: 0x1074ce0: lw    ra, 868(sp)
+// 0x01074ce4: 0x1074ce4: lw    s2, 864(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 60
+	ldc.i4.2
+	shr.un
+	ldc.i4 216
 	add
-	stloc.1
-// 0x01074bd8: 0x1074bd8: addiu s2, sp, 24
+	ldelem.i4
+	stloc 8
+// 0x01074ce8: 0x1074ce8: lw    s1, 860(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 215
 	add
+	ldelem.i4
 	stloc 11
-// 0x01074bdc: 0x1074bdc: addu  s6, zero, zero
-	ldc.i4.s 0
-	stloc 15
-// 0x01074be0: 0x1074be0: mflo  lo
-	ldloc 18
-	stloc.2
-// 0x01074be4: 0x1074be4: jal   0x106755c addiu a1, a1, 62
-	ldloc.2
-	ldc.i4.s 62
+// 0x01074cec: 0x1074cec: lw    s0, 856(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 214
 	add
-	stloc.2
+	ldelem.i4
+	stloc 10
+// 0x01074cf0: 0x1074cf0: jr    ra addiu sp, sp, 872
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074bec: 0x1074bec: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01074bf0: 0x1074bf0: addu  a2, s8, zero
-	ldloc 13
-	stloc.3
-// 0x01074bf4: 0x1074bf4: addiu a1, a1, -30032
-	ldloc.2
-	ldc.i4 -30032
+	ldc.i4 872
 	add
-	stloc.2
-// 0x01074bf8: 0x1074bf8: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x01074bfc: 0x1074bfc: sb    zero, 0(v0)
-	ldloc 6
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074c00: 0x1074c00: sb    zero, 1(v0)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
-	ldc.i4.1
-	add
+	ret
+}
+.method public static int32 RTNet_Scoreboard_getPoints_1074cf8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 v1,int32 ra)
+
+// local  6 is register v0
+// local 13 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  9 is register s2
+// local 10 is register s3
+// local 11 is register s4
+// local 12 is register s5
+// local  0 is register sp
+// local 14 is register ra
+// local  5 is register mem
+
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074c04: 0x1074c04: sb    zero, 2(v0)
-	ldloc 6
-	ldc.i4.2
-	add
+	stloc 6
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074c08: 0x1074c08: sb    zero, 3(v0)
-	ldloc 6
-	ldc.i4.3
-	add
+	stloc 13
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01074c0c: 0x1074c0c: jal   0x1000f64 addu  s0, v0, zero
-	ldloc 6
-	stloc 10
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 14
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074c14: 0x1074c14: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01074c18: 0x1074c18: addiu a1, a1, -13884
-	ldloc.2
-	ldc.i4 -13884
+// 0x01074cf8: 0x1074cf8: addiu sp, sp, -112
+	ldloc.0
+	ldc.i4.s -112
 	add
-	stloc.2
-// 0x01074c1c: 0x1074c1c: sll   a2, s1, 1
-	ldloc 8
-	ldc.i4.1
-	shl
-	stloc.3
-// 0x01074c20: 0x1074c20: jal   0x1000f64 addiu a0, sp, 24
+	stloc.0
+// 0x01074cfc: 0x1074cfc: sw    s2, 92(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
 	add
-	stloc.1
+	ldloc 9
+	stelem.i4
+// 0x01074d00: 0x1074d00: sw    s1, 88(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074c28: 0x1074c28: lui   s8, 0x20000
-	ldc.i4 131072
-	stloc 13
-// 0x01074c2c: 0x1074c2c: addu  a0, s0, zero
-	ldloc 10
-	stloc.1
-// 0x01074c30: 0x1074c30: jal   0x1001ac4 addiu a1, sp, 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
+	add
+	ldloc 8
+	stelem.i4
+// 0x01074d04: 0x1074d04: lui   s2, 0x10000
+	ldc.i4 65536
+	stloc 9
+// 0x01074d08: 0x1074d08: addiu s1, sp, 40
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 40
 	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 6
-// --- basic block ---
-// 0x01074c38: 0x1074c38: addiu s8, s8, -31388
-	ldloc 13
-	ldc.i4 -31388
+	stloc 8
+// 0x01074d0c: 0x1074d0c: sw    s5, 104(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 26
 	add
-	stloc 13
-// 0x01074c3c: 0x1074c3c: j	 0x1074c54 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_1074c54
-// --- basic block ---
-L_1074c44:
-// 0x01074c44: 0x1074c44: lw    a3, 12(s4)
+	ldloc 12
+	stelem.i4
+// 0x01074d10: 0x1074d10: sw    s4, 100(sp)
 	ldloc 5
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 25
 	add
-	ldelem.i4
-	stloc 4
-// 0x01074c48: 0x1074c48: lw    v0, 4(s4)
+	ldloc 11
+	stelem.i4
+// 0x01074d14: 0x1074d14: sw    s3, 96(sp)
 	ldloc 5
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc 6
-// 0x01074c4c: 0x1074c4c: addiu s4, s4, 8
+	ldloc 10
+	stelem.i4
+// 0x01074d18: 0x1074d18: addu  s5, a0, zero
+	ldloc.1
+	stloc 12
+// 0x01074d1c: 0x1074d1c: addu  s4, a1, zero
+	ldloc.2
+	stloc 11
+// 0x01074d20: 0x1074d20: addu  s3, a2, zero
+	ldloc.3
+	stloc 10
+// 0x01074d24: 0x1074d24: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x01074d28: 0x1074d28: addiu a2, s2, 19088
 	ldloc 9
-	ldc.i4.8
+	ldc.i4 19088
 	add
-	stloc 9
-// 0x01074c50: 0x1074c50: subu  a3, a3, v0
-	ldloc 4
-	ldloc 6
-	sub
-	stloc 4
-L_1074c54:
-// 0x01074c54: 0x1074c54: lw    a2, 0(s4)
+	stloc.3
+// 0x01074d2c: 0x1074d2c: addiu a1, zero, 20
+	ldc.i4.s 20
+	stloc.2
+// 0x01074d30: 0x1074d30: sw    ra, 108(sp)
+// 0x01074d34: 0x1074d34: jal   0x1000f9c sw    s0, 84(sp)
 	ldloc 5
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x01074c58: 0x1074c58: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-// 0x01074c5c: 0x1074c5c: jal   0x1000f64 addu  a1, s8, zero
-	ldloc 13
-	stloc.2
+	ldc.i4.s 21
+	add
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x01074c64: 0x1074c64: addiu s6, s6, 1
-	ldloc 15
-	ldc.i4.1
+// 0x01074d3c: 0x1074d3c: addiu s0, sp, 60
+	ldloc.0
+	ldc.i4.s 60
 	add
-	stloc 15
-// 0x01074c68: 0x1074c68: addu  a0, s0, zero
-	ldloc 10
-	stloc.1
-// 0x01074c6c: 0x1074c6c: jal   0x1001ac4 addu  a1, s2, zero
-	ldloc 11
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 6
-// --- basic block ---
-// 0x01074c74: 0x1074c74: slt   v0, s6, s1
-	ldloc 15
-	ldloc 8
-	clt
-	stloc 6
-// 0x01074c78: 0x1074c78: bne   v0, zero, 0x1074c44 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_1074c44
-// --- basic block ---
-// 0x01074c80: 0x1074c80: beq   s5, zero, 0x1074ce8 lui   a1, 0x20000
-	ldloc 14
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1074ce8
-// --- basic block ---
-// 0x01074c88: 0x1074c88: addiu a1, a1, -31368
-	ldloc.2
-	ldc.i4 -31368
+	stloc 7
+// 0x01074d40: 0x1074d40: lw    a3, 128(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 32
+	add
+	ldelem.i4
+	stloc 4
+// 0x01074d44: 0x1074d44: addiu a2, s2, 19088
+	ldloc 9
+	ldc.i4 19088
 	add
-	stloc.2
-// 0x01074c8c: 0x1074c8c: addiu a2, zero, 1
-	ldc.i4.1
 	stloc.3
-// 0x01074c90: 0x1074c90: jal   0x1000f64 addu  a0, s2, zero
-	ldloc 11
+// 0x01074d48: 0x1074d48: addu  a0, s0, zero
+	ldloc 7
 	stloc.1
+// 0x01074d4c: 0x1074d4c: jal   0x1000f9c addiu a1, zero, 20
+	ldc.i4.s 20
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074c98: 0x1074c98: addu  a0, s0, zero
-	ldloc 10
-	stloc.1
-// 0x01074c9c: 0x1074c9c: jal   0x1001ac4 addu  a1, s2, zero
-	ldloc 11
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x01074ca4: 0x1074ca4: addu  s4, zero, zero
-	ldc.i4.s 0
-	stloc 9
-L_1074ca8:
-// 0x01074ca8: 0x1074ca8: addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-// 0x01074cac: 0x1074cac: lw    a3, 4(s3)
+// 0x01074d54: 0x1074d54: lw    a2, 132(sp)
 	ldloc 5
-	ldloc 12
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 33
 	add
 	ldelem.i4
+	stloc.3
+// 0x01074d58: 0x1074d58: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074d5c: 0x1074d5c: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 6
+// 0x01074d60: 0x1074d60: addu  a3, s5, zero
+	ldloc 12
 	stloc 4
-// 0x01074cb0: 0x1074cb0: beq   s4, zero, 0x1074cc4 addu  a1, s8, zero
-	ldloc 9
-	ldloc 13
-	stloc.2
-	brfalse L_1074cc4
-// --- basic block ---
-// 0x01074cb8: 0x1074cb8: lw    v0, -4(s3)
-	ldloc 5
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4.m1
-	add
-	ldelem.i4
-	stloc 6
-// 0x01074cbc: 0x1074cbc: sll   zero, zero, 0
-// 0x01074cc0: 0x1074cc0: subu  a3, a3, v0
-	ldloc 4
+// 0x01074d64: 0x1074d64: addiu v0, v0, -30128
 	ldloc 6
-	sub
-	stloc 4
-L_1074cc4:
-// 0x01074cc4: 0x1074cc4: lw    a2, 0(s3)
-	ldloc 5
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.3
-// 0x01074cc8: 0x1074cc8: jal   0x1000f64 addiu s4, s4, 1
-	ldloc 9
-	ldc.i4.1
+	ldc.i4 -30128
 	add
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
-// --- basic block ---
-// 0x01074cd0: 0x1074cd0: addu  a0, s0, zero
-	ldloc 10
-	stloc.1
-// 0x01074cd4: 0x1074cd4: jal   0x1001ac4 addu  a1, s2, zero
-	ldloc 11
-	stloc.2
+// 0x01074d68: 0x1074d68: addiu a0, a0, 15252
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcat_1001ac4(int32,int32)
-	stloc 6
-// --- basic block ---
-// 0x01074cdc: 0x1074cdc: slt   v0, s4, s1
-	ldloc 9
-	ldloc 8
-	clt
-	stloc 6
-// 0x01074ce0: 0x1074ce0: bne   v0, zero, 0x1074ca8 addiu s3, s3, 8
-	ldloc 6
-	ldloc 12
-	ldc.i4.8
+	ldc.i4 15252
 	add
-	stloc 12
-	brtrue L_1074ca8
-// --- basic block ---
-L_1074ce8:
-// 0x01074ce8: 0x1074ce8: beq   s7, zero, 0x1074d08 lui   a1, 0x20000
-	ldloc 16
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1074d08
-// --- basic block ---
-// 0x01074cf0: 0x1074cf0: addu  a0, s7, zero
-	ldloc 16
 	stloc.1
-// 0x01074cf4: 0x1074cf4: addiu a1, a1, -29620
-	ldloc.2
-	ldc.i4 -29620
-	add
+// 0x01074d6c: 0x1074d6c: addiu a1, zero, 36
+	ldc.i4.s 36
 	stloc.2
-// 0x01074cf8: 0x1074cf8: jal   0x1000f64 addu  a2, s0, zero
-	ldloc 10
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074d00: 0x1074d00: j	 0x1074d24 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-	br L_1074d24
-// --- basic block ---
-L_1074d08:
-// 0x01074d08: 0x1074d08: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074d0c: 0x1074d0c: lw    a2, 2376(sp)
+// 0x01074d70: 0x1074d70: sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 594
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc.3
-// 0x01074d10: 0x1074d10: lw    a3, 2352(sp)
+	ldloc 11
+	stelem.i4
+// 0x01074d74: 0x1074d74: sw    s3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 588
-	add
-	ldelem.i4
-	stloc 4
-// 0x01074d14: 0x1074d14: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldc.i4.6
 	add
-	stloc.1
-// 0x01074d18: 0x1074d18: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01074d1c: 0x1074d1c: jal   0x1072cd8 sw    s0, 16(sp)
+	ldloc 10
+	stelem.i4
+// 0x01074d78: 0x1074d78: sw    s1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
+// 0x01074d7c: 0x1074d7c: sw    s0, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-L_1074d24:
-// 0x01074d24: 0x1074d24: addiu a0, sp, 60
-	ldloc.0
-	ldc.i4.s 60
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.1
-// 0x01074d28: 0x1074d28: jal   0x1067508 sw    v0, 2304(sp)
+	ldloc 7
+	stelem.i4
+// 0x01074d80: 0x1074d80: jal   0x10732fc sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 576
+	ldc.i4.4
 	add
 	ldloc 6
 	stelem.i4
@@ -5887,144 +5939,98 @@ L_1074d24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 13
 	stloc 6
 // --- basic block ---
-// 0x01074d30: 0x1074d30: lw    v0, 2304(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 576
-	add
-	ldelem.i4
-	stloc 6
-L_1074d34:
-// 0x01074d34: 0x1074d34: lw    ra, 2348(sp)
-// 0x01074d38: 0x1074d38: lw    s8, 2344(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 586
-	add
-	ldelem.i4
-	stloc 13
-// 0x01074d3c: 0x1074d3c: lw    s7, 2340(sp)
+// 0x01074d88: 0x1074d88: lw    ra, 108(sp)
+// 0x01074d8c: 0x1074d8c: lw    s5, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
+	ldc.i4.s 26
 	add
 	ldelem.i4
-	stloc 16
-// 0x01074d40: 0x1074d40: lw    s6, 2336(sp)
+	stloc 12
+// 0x01074d90: 0x1074d90: lw    s4, 100(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 584
+	ldc.i4.s 25
 	add
 	ldelem.i4
-	stloc 15
-// 0x01074d44: 0x1074d44: lw    s5, 2332(sp)
+	stloc 11
+// 0x01074d94: 0x1074d94: lw    s3, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 583
+	ldc.i4.s 24
 	add
 	ldelem.i4
-	stloc 14
-// 0x01074d48: 0x1074d48: lw    s4, 2328(sp)
+	stloc 10
+// 0x01074d98: 0x1074d98: lw    s2, 92(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 582
+	ldc.i4.s 23
 	add
 	ldelem.i4
 	stloc 9
-// 0x01074d4c: 0x1074d4c: lw    s3, 2324(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 581
-	add
-	ldelem.i4
-	stloc 12
-// 0x01074d50: 0x1074d50: lw    s2, 2320(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 580
-	add
-	ldelem.i4
-	stloc 11
-// 0x01074d54: 0x1074d54: lw    s1, 2316(sp)
+// 0x01074d9c: 0x1074d9c: lw    s1, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 579
+	ldc.i4.s 22
 	add
 	ldelem.i4
 	stloc 8
-// 0x01074d58: 0x1074d58: lw    s0, 2312(sp)
+// 0x01074da0: 0x1074da0: lw    s0, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 10
-// 0x01074d5c: 0x1074d5c: jr    ra addiu sp, sp, 2352
+	stloc 7
+// 0x01074da4: 0x1074da4: jr    ra addiu sp, sp, 112
 	ldloc.0
-	ldc.i4 2352
+	ldc.i4.s 112
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 13
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 RTNet_GPSPath_1074d64(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_FoursquareCheckin_1074dac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s1,int32 s3,int32 s4,int32 s0,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 t0,int32[] mem,int32 v1,int32 ra)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 12 is register s0
-// local  9 is register s1
-// local  8 is register s2
-// local 10 is register s3
-// local 11 is register s4
-// local 13 is register s5
-// local 14 is register s6
-// local 15 is register s7
+// local  6 is register t0
 // local  0 is register sp
-// local 16 is register s8
-// local 17 is register ra
-// local 18 is register lo
-// local  5 is register mem
+// local  9 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6034,920 +6040,783 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
+	stloc 6
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 17
-	ldc.i4.s 0
-	stloc 18
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074d64: 0x1074d64: addiu sp, sp, -2320
+// 0x01074dac: 0x1074dac: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4 -2320
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01074d68: 0x1074d68: slti  v1, a3, 2
-	ldloc 4
-	ldc.i4.2
-	clt
-	stloc 7
-// 0x01074d6c: 0x1074d6c: sw    s8, 2312(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 578
-	add
-	ldloc 16
-	stelem.i4
-// 0x01074d70: 0x1074d70: sw    s6, 2304(sp)
+// 0x01074db0: 0x1074db0: sw    ra, 36(sp)
+// 0x01074db4: 0x1074db4: addu  t0, a0, zero
+	ldloc.1
+	stloc 6
+// 0x01074db8: 0x1074db8: bne   a2, zero, 0x1074dcc addu  v1, a1, zero
+	ldloc.3
+	ldloc.2
+	stloc 8
+	brtrue L_1074dcc
+// --- basic block ---
+// 0x01074dc0: 0x1074dc0: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01074dc4: 0x1074dc4: j	 0x1074dd4 addiu v0, v0, 19096
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 576
+	ldc.i4 19096
 	add
-	ldloc 14
-	stelem.i4
-// 0x01074d74: 0x1074d74: sw    s3, 2292(sp)
+	stloc 5
+	br L_1074dd4
+// --- basic block ---
+L_1074dcc:
+// 0x01074dcc: 0x1074dcc: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01074dd0: 0x1074dd0: addiu v0, v0, 12204
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 573
+	ldc.i4 12204
 	add
-	ldloc 10
-	stelem.i4
-// 0x01074d78: 0x1074d78: sw    s2, 2288(sp)
-	ldloc 5
+	stloc 5
+L_1074dd4:
+// 0x01074dd4: 0x1074dd4: addu  a2, a3, zero
+	ldloc 4
+	stloc.3
+// 0x01074dd8: 0x1074dd8: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074ddc: 0x1074ddc: addu  a3, t0, zero
+	ldloc 6
+	stloc 4
+// 0x01074de0: 0x1074de0: lui   t0, 0x20000
+	ldc.i4 131072
+	stloc 6
+// 0x01074de4: 0x1074de4: addiu t0, t0, -30048
+	ldloc 6
+	ldc.i4 -30048
+	add
+	stloc 6
+// 0x01074de8: 0x1074de8: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074dec: 0x1074dec: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074df0: 0x1074df0: sw    t0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x01074d7c: 0x1074d7c: sw    ra, 2316(sp)
-// 0x01074d80: 0x1074d80: sw    s7, 2308(sp)
-	ldloc 5
+// 0x01074df4: 0x1074df4: sw    v1, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 577
+	ldc.i4.5
 	add
-	ldloc 15
+	ldloc 8
 	stelem.i4
-// 0x01074d84: 0x1074d84: sw    s5, 2300(sp)
-	ldloc 5
+// 0x01074df8: 0x1074df8: jal   0x10732fc sw    v0, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 575
+	ldc.i4.6
 	add
-	ldloc 13
+	ldloc 5
 	stelem.i4
-// 0x01074d88: 0x1074d88: sw    s4, 2296(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01074e00: 0x1074e00: lw    ra, 36(sp)
+// 0x01074e04: 0x1074e04: sll   zero, zero, 0
+// 0x01074e08: 0x1074e08: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_FoursquareSearch_1074e10(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+
+// local  6 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01074e10: 0x1074e10: addiu sp, sp, -136
+	ldloc.0
+	ldc.i4 -136
+	add
+	stloc.0
+// 0x01074e14: 0x1074e14: sw    s1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 574
+	ldc.i4.s 32
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x01074d8c: 0x1074d8c: sw    s1, 2284(sp)
+// 0x01074e18: 0x1074e18: sw    s0, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 571
+	ldc.i4.s 31
 	add
-	ldloc 9
+	ldloc 7
 	stelem.i4
-// 0x01074d90: 0x1074d90: sw    s0, 2280(sp)
-	ldloc 5
+// 0x01074e1c: 0x1074e1c: addiu s1, sp, 32
 	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 8
+// 0x01074e20: 0x1074e20: addu  s0, a1, zero
+	ldloc.2
+	stloc 7
+// 0x01074e24: 0x1074e24: lw    a1, 4(a1)
+	ldloc 5
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 570
+	ldc.i4.1
 	add
-	ldloc 12
-	stelem.i4
-// 0x01074d94: 0x1074d94: addu  s2, a3, zero
-	ldloc 4
-	stloc 8
-// 0x01074d98: 0x1074d98: addu  s8, a0, zero
+	ldelem.i4
+	stloc.2
+// 0x01074e28: 0x1074e28: addu  a3, a0, zero
 	ldloc.1
-	stloc 16
-// 0x01074d9c: 0x1074d9c: addu  s3, a2, zero
-	ldloc.3
-	stloc 10
-// 0x01074da0: 0x1074da0: lw    s6, 2340(sp)
+	stloc 4
+// 0x01074e2c: 0x1074e2c: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x01074e30: 0x1074e30: sw    ra, 132(sp)
+// 0x01074e34: 0x1074e34: sw    a2, 116(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
+	ldc.i4.s 29
 	add
-	ldelem.i4
-	stloc 14
-// 0x01074da4: 0x1074da4: bne   v1, zero, 0x1074f90 addu  v0, zero, zero
-	ldloc 7
-	ldc.i4.s 0
-	stloc 6
-	brtrue L_1074f90
-// --- basic block ---
-// 0x01074dac: 0x1074dac: jal   0x10674e4 addiu a0, sp, 24
+	ldloc.3
+	stelem.i4
+// 0x01074e38: 0x1074e38: jal   0x1072a8c sw    a3, 112(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 28
 	add
-	stloc.1
+	ldloc 4
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074db4: 0x1074db4: slti  v0, s2, 101
-	ldloc 8
-	ldc.i4.s 101
-	clt
+	stloc 9
 	stloc 6
-// 0x01074db8: 0x1074db8: bne   v0, zero, 0x1074e04 addiu a2, zero, 87
-	ldloc 6
-	ldc.i4.s 87
-	stloc.3
-	brtrue L_1074e04
 // --- basic block ---
-// 0x01074dc0: 0x1074dc0: addiu s2, s2, -100
-	ldloc 8
-	ldc.i4.s -100
-	add
-	stloc 8
-// 0x01074dc4: 0x1074dc4: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01074dc8: 0x1074dc8: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01074dcc: 0x1074dcc: sw    s2, 16(sp)
+// 0x01074e40: 0x1074e40: lw    a1, 0(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 8
-	stelem.i4
-// 0x01074dd0: 0x1074dd0: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
+	ldelem.i4
 	stloc.2
-// 0x01074dd4: 0x1074dd4: sll   s2, s2, 4
-	ldloc 8
-	ldc.i4.4
-	shl
-	stloc 8
-// 0x01074dd8: 0x1074dd8: addiu a3, a3, -30016
-	ldloc 4
-	ldc.i4 -30016
+// 0x01074e44: 0x1074e44: addiu s0, sp, 72
+	ldloc.0
+	ldc.i4.s 72
 	add
-	stloc 4
-// 0x01074ddc: 0x1074ddc: addiu a0, zero, 4
-	ldc.i4.4
+	stloc 7
+// 0x01074e48: 0x1074e48: jal   0x1072a8c addu  a0, s0, zero
+	ldloc 7
 	stloc.1
-// 0x01074de0: 0x1074de0: jal   0x100449c addiu a2, zero, 779
-	ldc.i4 779
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl85::convert_int_coordinate_to_float_string_1072a8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01074de8: 0x1074de8: addu  s3, s3, s2
-	ldloc 10
-	ldloc 8
-	add
-	stloc 10
-// 0x01074dec: 0x1074dec: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x01074df0: 0x1074df0: sw    v0, 4(s3)
+// 0x01074e50: 0x1074e50: lw    a2, 116(sp)
 	ldloc 5
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 29
 	add
-	ldloc 6
-	stelem.i4
-// 0x01074df4: 0x1074df4: sw    v0, 0(s3)
-	ldloc 5
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldloc 6
-	stelem.i4
-// 0x01074df8: 0x1074df8: sw    zero, 12(s3)
+	ldelem.i4
+	stloc.3
+// 0x01074e54: 0x1074e54: lw    a3, 112(sp)
 	ldloc 5
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 28
 	add
+	ldelem.i4
+	stloc 4
+// 0x01074e58: 0x1074e58: lui   a0, 0x0
 	ldc.i4.s 0
-	stelem.i4
-// 0x01074dfc: 0x1074dfc: addiu s2, zero, 100
-	ldc.i4.s 100
-	stloc 8
-// 0x01074e00: 0x1074e00: addiu a2, zero, 87
-	ldc.i4.s 87
-	stloc.3
-L_1074e04:
-// 0x01074e04: 0x1074e04: mult  s2, a2
-	ldloc 8
-	ldloc.3
-	mul
-	stloc 18
-// 0x01074e08: 0x1074e08: addiu a0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
 	stloc.1
-// 0x01074e0c: 0x1074e0c: addu  s5, s3, zero
-	ldloc 10
-	stloc 13
-// 0x01074e10: 0x1074e10: addu  s4, zero, zero
-	ldc.i4.s 0
-	stloc 11
-// 0x01074e14: 0x1074e14: addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 9
-// 0x01074e18: 0x1074e18: addiu s7, zero, -1
-	ldc.i4.m1
-	stloc 15
-// 0x01074e1c: 0x1074e1c: mflo  lo
-	ldloc 18
-	stloc.3
-// 0x01074e20: 0x1074e20: addiu a2, a2, 62
-	ldloc.3
-	ldc.i4.s 62
+// 0x01074e5c: 0x1074e5c: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 6
+// 0x01074e60: 0x1074e60: addiu v0, v0, -29992
+	ldloc 6
+	ldc.i4 -29992
 	add
-	stloc.3
-// 0x01074e24: 0x1074e24: addu  a1, a2, zero
-	ldloc.3
+	stloc 6
+// 0x01074e64: 0x1074e64: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074e68: 0x1074e68: addiu a1, zero, 36
+	ldc.i4.s 36
 	stloc.2
-// 0x01074e28: 0x1074e28: jal   0x106755c sw    a2, 2272(sp)
+// 0x01074e6c: 0x1074e6c: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4.5
 	add
-	ldloc.3
+	ldloc 8
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074e30: 0x1074e30: lw    a2, 2272(sp)
+// 0x01074e70: 0x1074e70: sw    s0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
-	add
-	ldelem.i4
-	stloc.3
-// 0x01074e34: 0x1074e34: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x01074e38: 0x1074e38: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01074e3c: 0x1074e3c: jal   0x100177c addu  s0, v0, zero
-	ldloc 6
-	stloc 12
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-L_1074e44:
-// 0x01074e44: 0x1074e44: lw    v0, 0(s5)
-	ldloc 5
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 6
-// 0x01074e48: 0x1074e48: sll   zero, zero, 0
-// 0x01074e4c: 0x1074e4c: beq   v0, s7, 0x1074e64 sll   zero, zero, 0
-	ldloc 6
-	ldloc 15
-	beq  L_1074e64
-// --- basic block ---
-// 0x01074e54: 0x1074e54: lw    v0, 4(s5)
-	ldloc 5
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 6
-// 0x01074e58: 0x1074e58: sll   zero, zero, 0
-// 0x01074e5c: 0x1074e5c: bne   v0, s7, 0x1074ec0 sll   zero, zero, 0
-	ldloc 6
-	ldloc 15
-	bne.un L_1074ec0
-// --- basic block ---
-L_1074e64:
-// 0x01074e64: 0x1074e64: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 12
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074e6c: 0x1074e6c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01074e70: 0x1074e70: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01074e74: 0x1074e74: subu  v1, s4, s1
-	ldloc 11
-	ldloc 9
-	sub
-	stloc 7
-// 0x01074e78: 0x1074e78: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01074e7c: 0x1074e7c: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01074e80: 0x1074e80: addiu a2, zero, 799
-	ldc.i4 799
-	stloc.3
-// 0x01074e84: 0x1074e84: addiu a3, a3, -29972
-	ldloc 4
-	ldc.i4 -29972
-	add
-	stloc 4
-// 0x01074e88: 0x1074e88: sw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
-// 0x01074e8c: 0x1074e8c: sw    v1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldloc 7
 	stelem.i4
-// 0x01074e90: 0x1074e90: sw    v0, 2276(sp)
+// 0x01074e74: 0x1074e74: jal   0x10732fc sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 569
+	ldc.i4.4
 	add
 	ldloc 6
 	stelem.i4
-// 0x01074e94: 0x1074e94: jal   0x100449c sw    v1, 2272(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 568
-	add
-	ldloc 7
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01074e9c: 0x1074e9c: lw    v0, 2276(sp)
+// 0x01074e7c: 0x1074e7c: lw    ra, 132(sp)
+// 0x01074e80: 0x1074e80: lw    s1, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 569
+	ldc.i4.s 32
 	add
 	ldelem.i4
-	stloc 6
-// 0x01074ea0: 0x1074ea0: lw    v1, 2272(sp)
+	stloc 8
+// 0x01074e84: 0x1074e84: lw    s0, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4.s 31
 	add
 	ldelem.i4
 	stloc 7
-// 0x01074ea4: 0x1074ea4: sll   a1, s1, 4
+// 0x01074e88: 0x1074e88: jr    ra addiu sp, sp, 136
+	ldloc.0
+	ldc.i4 136
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 9
-	ldc.i4.4
-	shl
-	stloc.2
-// 0x01074ea8: 0x1074ea8: addu  a0, s0, v0
-	ldloc 12
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
-	add
-	stloc.1
-// 0x01074eac: 0x1074eac: addu  a1, s3, a1
-	ldloc 10
-	ldloc.2
-	add
-	stloc.2
-// 0x01074eb0: 0x1074eb0: addu  a2, v1, zero
-	ldloc 7
-	stloc.3
-// 0x01074eb4: 0x1074eb4: jal   0x1072bb0 addiu a3, zero, 1
-	ldc.i4.1
+	ret
+}
+.method public static int32 RTNet_FoursquareConnect_1074e90(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t1,int32 ra,int32 t0)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 10 is register t0
+// local  8 is register t1
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01074e90: 0x1074e90: addiu sp, sp, -48
 	ldloc.0
+	ldc.i4.s -48
+	add
+	stloc.0
+// 0x01074e94: 0x1074e94: sw    ra, 44(sp)
+// 0x01074e98: 0x1074e98: addu  t1, a0, zero
 	ldloc.1
+	stloc 8
+// 0x01074e9c: 0x1074e9c: addu  t0, a1, zero
 	ldloc.2
-	ldloc.3
+	stloc 10
+// 0x01074ea0: 0x1074ea0: bne   a3, zero, 0x1074eb4 addu  v1, a2, zero
 	ldloc 4
-	call int32 Cibyl86::RTNet_GPSPath_BuildCommand_1072bb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.3
 	stloc 7
-	stloc 6
+	brtrue L_1074eb4
 // --- basic block ---
-// 0x01074ebc: 0x1074ebc: addiu s1, s4, 1
-	ldloc 11
-	ldc.i4.1
+// 0x01074ea8: 0x1074ea8: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01074eac: 0x1074eac: j	 0x1074ebc addiu v0, v0, 19096
+	ldloc 5
+	ldc.i4 19096
 	add
-	stloc 9
-L_1074ec0:
-// 0x01074ec0: 0x1074ec0: addiu s4, s4, 1
-	ldloc 11
-	ldc.i4.1
+	stloc 5
+	br L_1074ebc
+// --- basic block ---
+L_1074eb4:
+// 0x01074eb4: 0x1074eb4: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01074eb8: 0x1074eb8: addiu v0, v0, 12204
+	ldloc 5
+	ldc.i4 12204
 	add
-	stloc 11
-// 0x01074ec4: 0x1074ec4: slt   v0, s4, s2
-	ldloc 11
-	ldloc 8
-	clt
-	stloc 6
-// 0x01074ec8: 0x1074ec8: bne   v0, zero, 0x1074e44 addiu s5, s5, 16
+	stloc 5
+L_1074ebc:
+// 0x01074ebc: 0x1074ebc: sw    v1, 24(sp)
 	ldloc 6
-	ldloc 13
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 7
+	stelem.i4
+// 0x01074ec0: 0x1074ec0: lw    a2, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
 	ldc.i4.s 16
 	add
-	stloc 13
-	brtrue L_1074e44
-// --- basic block ---
-// 0x01074ed0: 0x1074ed0: addiu s4, s2, -1
+	ldelem.i4
+	stloc.3
+// 0x01074ec4: 0x1074ec4: addu  a3, t1, zero
 	ldloc 8
-	ldc.i4.m1
-	add
-	stloc 11
-// 0x01074ed4: 0x1074ed4: slt   v0, s1, s4
-	ldloc 9
-	ldloc 11
-	clt
-	stloc 6
-// 0x01074ed8: 0x1074ed8: beq   v0, zero, 0x1074f30 lui   a1, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	brfalse L_1074f30
-// --- basic block ---
-// 0x01074ee0: 0x1074ee0: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 12
+	stloc 4
+// 0x01074ec8: 0x1074ec8: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074ee8: 0x1074ee8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01074eec: 0x1074eec: lui   a3, 0x20000
+// 0x01074ecc: 0x1074ecc: lui   t1, 0x20000
 	ldc.i4 131072
-	stloc 4
-// 0x01074ef0: 0x1074ef0: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
+	stloc 8
+// 0x01074ed0: 0x1074ed0: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x01074ed4: 0x1074ed4: addiu t1, t1, -29936
+	ldloc 8
+	ldc.i4 -29936
 	add
-	stloc.2
-// 0x01074ef4: 0x1074ef4: addiu a3, a3, -29888
-	ldloc 4
-	ldc.i4 -29888
+	stloc 8
+// 0x01074ed8: 0x1074ed8: addiu v1, v1, 12204
+	ldloc 7
+	ldc.i4 12204
+	add
+	stloc 7
+// 0x01074edc: 0x1074edc: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
 	add
-	stloc 4
-// 0x01074ef8: 0x1074ef8: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x01074efc: 0x1074efc: addiu a2, zero, 813
-	ldc.i4 813
-	stloc.3
-// 0x01074f00: 0x1074f00: sw    v0, 2276(sp)
-	ldloc 5
+// 0x01074ee0: 0x1074ee0: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074ee4: 0x1074ee4: sw    t1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 569
+	ldc.i4.4
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
-// 0x01074f04: 0x1074f04: sw    s4, 20(sp)
-	ldloc 5
+// 0x01074ee8: 0x1074ee8: sw    t0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 11
+	ldloc 10
 	stelem.i4
-// 0x01074f08: 0x1074f08: jal   0x100449c sw    s1, 16(sp)
-	ldloc 5
+// 0x01074eec: 0x1074eec: sw    v1, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldloc 9
+	ldloc 7
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074f10: 0x1074f10: lw    v0, 2276(sp)
-	ldloc 5
+// 0x01074ef0: 0x1074ef0: jal   0x10732fc sw    v0, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 569
-	add
-	ldelem.i4
-	stloc 6
-// 0x01074f14: 0x1074f14: sll   a1, s1, 4
-	ldloc 9
-	ldc.i4.4
-	shl
-	stloc.2
-// 0x01074f18: 0x1074f18: addu  a1, s3, a1
-	ldloc 10
-	ldloc.2
-	add
-	stloc.2
-// 0x01074f1c: 0x1074f1c: subu  a2, s2, s1
-	ldloc 8
-	ldloc 9
-	sub
-	stloc.3
-// 0x01074f20: 0x1074f20: addu  a0, s0, v0
-	ldloc 12
-	ldloc 6
-	add
-	stloc.1
-// 0x01074f24: 0x1074f24: jal   0x1072bb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::RTNet_GPSPath_BuildCommand_1072bb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074f2c: 0x1074f2c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-L_1074f30:
-// 0x01074f30: 0x1074f30: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01074f34: 0x1074f34: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01074f38: 0x1074f38: addiu a3, a3, -29804
-	ldloc 4
-	ldc.i4 -29804
+	ldc.i4.8
 	add
-	stloc 4
-// 0x01074f3c: 0x1074f3c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01074f40: 0x1074f40: addiu a2, zero, 820
-	ldc.i4 820
-	stloc.3
-// 0x01074f44: 0x1074f44: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 12
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074f4c: 0x1074f4c: beq   s6, zero, 0x1074f64 addu  a0, s6, zero
-	ldloc 14
-	ldloc 14
-	stloc.1
-	brfalse L_1074f64
-// --- basic block ---
-// 0x01074f54: 0x1074f54: jal   0x1001b68 addu  a1, s0, zero
-	ldloc 12
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcpy_1001b68(int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01074f5c: 0x1074f5c: j	 0x1074f80 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-	br L_1074f80
+	stloc 5
 // --- basic block ---
-L_1074f64:
-// 0x01074f64: 0x1074f64: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01074f68: 0x1074f68: lw    a2, 2336(sp)
-	ldloc 5
+// 0x01074ef8: 0x1074ef8: lw    ra, 44(sp)
+// 0x01074efc: 0x1074efc: sll   zero, zero, 0
+// 0x01074f00: 0x1074f00: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 584
-	add
-	ldelem.i4
-	stloc.3
-// 0x01074f6c: 0x1074f6c: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
+	ldc.i4.s 48
 	add
-	stloc.1
-// 0x01074f70: 0x1074f70: addu  a3, s8, zero
-	ldloc 16
-	stloc 4
-// 0x01074f74: 0x1074f74: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01074f78: 0x1074f78: jal   0x1072cd8 sw    s0, 16(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 12
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ret
+}
+.method public static int32 RTNet_TwitterConnect_1074f08(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t1,int32 ra,int32 t0)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 10 is register t0
+// local  8 is register t1
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
 	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1074f80:
-// 0x01074f80: 0x1074f80: addiu a0, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.1
-// 0x01074f84: 0x1074f84: jal   0x1067508 sw    v0, 2276(sp)
-	ldloc 5
+// 0x01074f08: 0x1074f08: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 569
+	ldc.i4.s -48
 	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
+	stloc.0
+// 0x01074f0c: 0x1074f0c: sw    ra, 44(sp)
+// 0x01074f10: 0x1074f10: addu  t1, a0, zero
 	ldloc.1
+	stloc 8
+// 0x01074f14: 0x1074f14: addu  t0, a1, zero
 	ldloc.2
-	ldloc.3
+	stloc 10
+// 0x01074f18: 0x1074f18: bne   a3, zero, 0x1074f2c addu  v1, a2, zero
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.3
 	stloc 7
-	stloc 6
+	brtrue L_1074f2c
 // --- basic block ---
-// 0x01074f8c: 0x1074f8c: lw    v0, 2276(sp)
+// 0x01074f20: 0x1074f20: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01074f24: 0x1074f24: j	 0x1074f34 addiu v0, v0, -25260
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 569
+	ldc.i4 -25260
 	add
-	ldelem.i4
-	stloc 6
-L_1074f90:
-// 0x01074f90: 0x1074f90: lw    ra, 2316(sp)
-// 0x01074f94: 0x1074f94: lw    s8, 2312(sp)
+	stloc 5
+	br L_1074f34
+// --- basic block ---
+L_1074f2c:
+// 0x01074f2c: 0x1074f2c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x01074f30: 0x1074f30: addiu v0, v0, 32576
 	ldloc 5
+	ldc.i4 32576
+	add
+	stloc 5
+L_1074f34:
+// 0x01074f34: 0x1074f34: sw    v1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 16
-// 0x01074f98: 0x1074f98: lw    s7, 2308(sp)
-	ldloc 5
+	ldloc 7
+	stelem.i4
+// 0x01074f38: 0x1074f38: sw    v0, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 577
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc 15
-// 0x01074f9c: 0x1074f9c: lw    s6, 2304(sp)
 	ldloc 5
+	stelem.i4
+// 0x01074f3c: 0x1074f3c: lw    a2, 68(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 576
+	ldc.i4.s 17
 	add
 	ldelem.i4
-	stloc 14
-// 0x01074fa0: 0x1074fa0: lw    s5, 2300(sp)
-	ldloc 5
+	stloc.3
+// 0x01074f40: 0x1074f40: lw    v0, 64(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 575
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc 13
-// 0x01074fa4: 0x1074fa4: lw    s4, 2296(sp)
-	ldloc 5
+	stloc 5
+// 0x01074f44: 0x1074f44: addu  a3, t1, zero
+	ldloc 8
+	stloc 4
+// 0x01074f48: 0x1074f48: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01074f4c: 0x1074f4c: lui   t1, 0x20000
+	ldc.i4 131072
+	stloc 8
+// 0x01074f50: 0x1074f50: lui   v1, 0x10000
+	ldc.i4 65536
+	stloc 7
+// 0x01074f54: 0x1074f54: addiu t1, t1, -29856
+	ldloc 8
+	ldc.i4 -29856
+	add
+	stloc 8
+// 0x01074f58: 0x1074f58: addiu v1, v1, 32576
+	ldloc 7
+	ldc.i4 32576
+	add
+	stloc 7
+// 0x01074f5c: 0x1074f5c: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074f60: 0x1074f60: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074f64: 0x1074f64: sw    t1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 574
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 11
-// 0x01074fa8: 0x1074fa8: lw    s3, 2292(sp)
-	ldloc 5
+	ldloc 8
+	stelem.i4
+// 0x01074f68: 0x1074f68: sw    t0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 573
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 10
-// 0x01074fac: 0x1074fac: lw    s2, 2288(sp)
-	ldloc 5
+	ldloc 10
+	stelem.i4
+// 0x01074f6c: 0x1074f6c: sw    v1, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 8
-// 0x01074fb0: 0x1074fb0: lw    s1, 2284(sp)
-	ldloc 5
+	ldloc 7
+	stelem.i4
+// 0x01074f70: 0x1074f70: jal   0x10732fc sw    v0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 571
+	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc 9
-// 0x01074fb4: 0x1074fb4: lw    s0, 2280(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 570
-	add
-	ldelem.i4
-	stloc 12
-// 0x01074fb8: 0x1074fb8: jr    ra addiu sp, sp, 2320
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01074f78: 0x1074f78: lw    ra, 44(sp)
+// 0x01074f7c: 0x1074f7c: sll   zero, zero, 0
+// 0x01074f80: 0x1074f80: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4 2320
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTNet_CreateNewRoads_1074fc0(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_SendSMS_1074f88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s7,int32 v1,int32 s1,int32 s2,int32 s3,int32 s5,int32 s8,int32 s4,int32 s6,int32 ra,int32 lo)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
 
-// local  6 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local 10 is register s1
-// local 11 is register s2
-// local 12 is register s3
-// local 15 is register s4
-// local 13 is register s5
-// local 16 is register s6
-// local  8 is register s7
 // local  0 is register sp
-// local 14 is register s8
-// local 17 is register ra
-// local 18 is register lo
-// local  5 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6956,286 +6825,1283 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01074f88: 0x1074f88: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x01074f8c: 0x1074f8c: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x01074f90: 0x1074f90: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01074f94: 0x1074f94: lui   a0, 0x0
 	ldc.i4.s 0
-	stloc 10
+	stloc.1
+// 0x01074f98: 0x1074f98: sw    a1, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc.2
+	stelem.i4
+// 0x01074f9c: 0x1074f9c: addiu v0, v0, -29740
+	ldloc 5
+	ldc.i4 -29740
+	add
+	stloc 5
+// 0x01074fa0: 0x1074fa0: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x01074fa4: 0x1074fa4: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01074fa8: 0x1074fa8: sw    ra, 28(sp)
+// 0x01074fac: 0x1074fac: jal   0x10732fc sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01074fb4: 0x1074fb4: lw    ra, 28(sp)
+// 0x01074fb8: 0x1074fb8: sll   zero, zero, 0
+// 0x01074fbc: 0x1074fbc: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_ExternalPoiDisplayed_1074fc4(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s7,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra,int32 lo)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 12 is register s3
+// local 13 is register s4
+// local 14 is register s5
+// local 15 is register s6
+// local 11 is register s7
+// local  0 is register sp
+// local 16 is register ra
+// local 17 is register lo
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc 11
+	stloc 5
 	ldc.i4.s 0
-	stloc 12
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc 15
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 12
 	ldc.i4.s 0
 	stloc 13
 	ldc.i4.s 0
-	stloc 16
+	stloc 14
 	ldc.i4.s 0
-	stloc 8
+	stloc 15
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 16
 	ldc.i4.s 0
 	stloc 17
-	ldc.i4.s 0
-	stloc 18
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01074fc0: 0x1074fc0: addiu sp, sp, -2320
+// 0x01074fc4: 0x1074fc4: addiu sp, sp, -2336
 	ldloc.0
-	ldc.i4 -2320
+	ldc.i4 -2336
 	add
 	stloc.0
-// 0x01074fc4: 0x1074fc4: sw    s0, 2280(sp)
-	ldloc 5
+// 0x01074fc8: 0x1074fc8: sw    ra, 2332(sp)
+// 0x01074fcc: 0x1074fcc: sw    s6, 2324(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 570
+	ldc.i4 581
 	add
-	ldloc 7
+	ldloc 15
 	stelem.i4
-// 0x01074fc8: 0x1074fc8: addiu s0, sp, 24
+// 0x01074fd0: 0x1074fd0: sw    s5, 2320(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 580
 	add
-	stloc 7
-// 0x01074fcc: 0x1074fcc: sw    s7, 2308(sp)
-	ldloc 5
+	ldloc 14
+	stelem.i4
+// 0x01074fd4: 0x1074fd4: sw    s3, 2312(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 577
+	ldc.i4 578
 	add
-	ldloc 8
+	ldloc 12
 	stelem.i4
-// 0x01074fd0: 0x1074fd0: sw    s6, 2304(sp)
-	ldloc 5
+// 0x01074fd8: 0x1074fd8: sw    s1, 2304(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4 576
 	add
-	ldloc 16
+	ldloc 9
 	stelem.i4
-// 0x01074fd4: 0x1074fd4: sw    s5, 2300(sp)
-	ldloc 5
+// 0x01074fdc: 0x1074fdc: sw    s0, 2300(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4 575
 	add
-	ldloc 13
+	ldloc 8
 	stelem.i4
-// 0x01074fd8: 0x1074fd8: addiu s7, zero, 28
-	ldc.i4.s 28
-	stloc 8
-// 0x01074fdc: 0x1074fdc: addu  s5, a1, zero
-	ldloc.2
-	stloc 13
-// 0x01074fe0: 0x1074fe0: addu  s6, a0, zero
+// 0x01074fe0: 0x1074fe0: addu  s5, a0, zero
 	ldloc.1
-	stloc 16
-// 0x01074fe4: 0x1074fe4: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x01074fe8: 0x1074fe8: sw    ra, 2316(sp)
-// 0x01074fec: 0x1074fec: sw    s8, 2312(sp)
-	ldloc 5
+	stloc 14
+// 0x01074fe4: 0x1074fe4: addu  s6, a1, zero
+	ldloc.2
+	stloc 15
+// 0x01074fe8: 0x1074fe8: addu  s3, a2, zero
+	ldloc.3
+	stloc 12
+// 0x01074fec: 0x1074fec: sw    s7, 2328(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4 582
 	add
-	ldloc 14
+	ldloc 11
 	stelem.i4
-// 0x01074ff0: 0x1074ff0: sw    s4, 2296(sp)
-	ldloc 5
+// 0x01074ff0: 0x1074ff0: sw    s4, 2316(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 574
+	ldc.i4 579
 	add
-	ldloc 15
+	ldloc 13
 	stelem.i4
-// 0x01074ff4: 0x1074ff4: sw    s3, 2292(sp)
-	ldloc 5
+// 0x01074ff4: 0x1074ff4: sw    s2, 2308(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 573
+	ldc.i4 577
 	add
-	ldloc 12
+	ldloc 10
 	stelem.i4
-// 0x01074ff8: 0x1074ff8: sw    s2, 2288(sp)
+// 0x01074ff8: 0x1074ff8: jal   0x1090dc4 addiu s0, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc 8
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_Count_1090dc4()
+	stloc 5
+// --- basic block ---
+// 0x01075000: 0x1075000: addu  s1, v0, zero
 	ldloc 5
+	stloc 9
+// 0x01075004: 0x1075004: jal   0x10674f4 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 572
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107500c: 0x107500c: beq   s1, zero, 0x10750ec addu  v0, zero, zero
+	ldloc 9
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_10750ec
+// --- basic block ---
+// 0x01075014: 0x1075014: addiu a1, zero, 11
+	ldc.i4.s 11
+	stloc.2
+// 0x01075018: 0x1075018: mult  s1, a1
+	ldloc 9
+	ldloc.2
+	mul
+	stloc 17
+// 0x0107501c: 0x107501c: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x01075020: 0x1075020: lui   s7, 0x20000
+	ldc.i4 131072
+	stloc 11
+// 0x01075024: 0x1075024: addu  s2, zero, zero
+	ldc.i4.s 0
+	stloc 10
+// 0x01075028: 0x1075028: addiu s4, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
+	stloc 13
+// 0x0107502c: 0x107502c: addiu s7, s7, -30904
 	ldloc 11
-	stelem.i4
-// 0x01074ffc: 0x1074ffc: addu  s3, a2, zero
+	ldc.i4 -30904
+	add
+	stloc 11
+// 0x01075030: 0x1075030: mflo  lo
+	ldloc 17
+	stloc.2
+// 0x01075034: 0x1075034: jal   0x106756c addiu a1, a1, 20
+	ldloc.2
+	ldc.i4.s 20
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	stloc 12
-// 0x01075000: 0x1075000: sw    s1, 2284(sp)
+	ldloc 4
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107503c: 0x107503c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01075040: 0x1075040: sb    zero, 0(v0)
+	ldloc 5
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075044: 0x1075044: sb    zero, 1(v0)
+	ldloc 5
+	ldc.i4.1
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075048: 0x1075048: sb    zero, 2(v0)
+	ldloc 5
+	ldc.i4.2
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0107504c: 0x107504c: sb    zero, 3(v0)
+	ldloc 5
+	ldc.i4.3
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075050: 0x1075050: addiu a1, a1, -29684
+	ldloc.2
+	ldc.i4 -29684
+	add
+	stloc.2
+// 0x01075054: 0x1075054: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01075058: 0x1075058: addu  a2, s1, zero
+	ldloc 9
+	stloc.3
+// 0x0107505c: 0x107505c: jal   0x1000f64 addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01075064: 0x1075064: j	 0x1075094 slt   v0, s2, s1
+	ldloc 10
+	ldloc 9
+	clt
+	stloc 5
+	br L_1075094
+// --- basic block ---
+L_107506c:
+// 0x0107506c: 0x107506c: jal   0x1090dd4 addiu s2, s2, 1
+	ldloc 10
+	ldc.i4.1
+	add
+	stloc 10
+	ldloc.1
+	call int32 Cibyl107::RealtimeExternalPoi_DisplayedList_get_ID_1090dd4(int32)
+	stloc 5
+// --- basic block ---
+// 0x01075074: 0x1075074: addu  a2, v0, zero
+	ldloc 5
+	stloc.3
+// 0x01075078: 0x1075078: addu  a0, s4, zero
+	ldloc 13
+	stloc.1
+// 0x0107507c: 0x107507c: jal   0x1000f64 addu  a1, s7, zero
+	ldloc 11
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01075084: 0x1075084: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x01075088: 0x1075088: jal   0x1001ac4 addu  a1, s4, zero
+	ldloc 13
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x01075090: 0x1075090: slt   v0, s2, s1
+	ldloc 10
+	ldloc 9
+	clt
+	stloc 5
+L_1075094:
+// 0x01075094: 0x1075094: bne   v0, zero, 0x107506c addu  a0, s2, zero
+	ldloc 5
+	ldloc 10
+	stloc.1
+	brtrue L_107506c
+// --- basic block ---
+// 0x0107509c: 0x107509c: beq   s3, zero, 0x10750bc lui   a1, 0x20000
+	ldloc 12
+	ldc.i4 131072
+	stloc.2
+	brfalse L_10750bc
+// --- basic block ---
+// 0x010750a4: 0x10750a4: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x010750a8: 0x10750a8: addiu a1, a1, -29156
+	ldloc.2
+	ldc.i4 -29156
+	add
+	stloc.2
+// 0x010750ac: 0x10750ac: jal   0x1000f64 addu  a2, s0, zero
+	ldloc 8
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010750b4: 0x10750b4: j	 0x10750d8 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_10750d8
+// --- basic block ---
+L_10750bc:
+// 0x010750bc: 0x10750bc: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010750c0: 0x10750c0: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x010750c4: 0x10750c4: addu  a2, s6, zero
+	ldloc 15
+	stloc.3
+// 0x010750c8: 0x10750c8: addu  a3, s5, zero
+	ldloc 14
+	stloc 4
+// 0x010750cc: 0x10750cc: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x010750d0: 0x10750d0: jal   0x10732fc sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_10750d8:
+// 0x010750d8: 0x10750d8: jal   0x1090f18 sw    v0, 2288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl107::RealtimeExternalPoiNotifier_DisplayedList_clear_1090f18(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010750e0: 0x10750e0: jal   0x1067518 addiu a0, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010750e8: 0x10750e8: lw    v0, 2288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
+	add
+	ldelem.i4
+	stloc 5
+L_10750ec:
+// 0x010750ec: 0x10750ec: lw    ra, 2332(sp)
+// 0x010750f0: 0x10750f0: lw    s7, 2328(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 582
+	add
+	ldelem.i4
+	stloc 11
+// 0x010750f4: 0x10750f4: lw    s6, 2324(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 581
+	add
+	ldelem.i4
+	stloc 15
+// 0x010750f8: 0x10750f8: lw    s5, 2320(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 580
+	add
+	ldelem.i4
+	stloc 14
+// 0x010750fc: 0x10750fc: lw    s4, 2316(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 579
+	add
+	ldelem.i4
+	stloc 13
+// 0x01075100: 0x1075100: lw    s3, 2312(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 578
+	add
+	ldelem.i4
+	stloc 12
+// 0x01075104: 0x1075104: lw    s2, 2308(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 577
+	add
+	ldelem.i4
+	stloc 10
+// 0x01075108: 0x1075108: lw    s1, 2304(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 576
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107510c: 0x107510c: lw    s0, 2300(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 575
+	add
+	ldelem.i4
+	stloc 8
+// 0x01075110: 0x1075110: jr    ra addiu sp, sp, 2336
+	ldloc.0
+	ldc.i4 2336
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_NodePath_1075118(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s1,int32 s4,int32 s0,int32 s2,int32 s3,int32 s8,int32 s5,int32 s6,int32 s7,int32 ra,int32 lo)
+
+// local  6 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 10 is register s0
+// local  8 is register s1
+// local 11 is register s2
+// local 12 is register s3
+// local  9 is register s4
+// local 14 is register s5
+// local 15 is register s6
+// local 16 is register s7
+// local  0 is register sp
+// local 13 is register s8
+// local 17 is register ra
+// local 18 is register lo
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 16
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 17
+	ldc.i4.s 0
+	stloc 18
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01075118: 0x1075118: addiu sp, sp, -2352
+	ldloc.0
+	ldc.i4 -2352
+	add
+	stloc.0
+// 0x0107511c: 0x107511c: sw    s8, 2344(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 586
+	add
+	ldloc 13
+	stelem.i4
+// 0x01075120: 0x1075120: sw    s7, 2340(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 585
+	add
+	ldloc 16
+	stelem.i4
+// 0x01075124: 0x1075124: sw    s4, 2328(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 582
+	add
+	ldloc 9
+	stelem.i4
+// 0x01075128: 0x1075128: sw    s3, 2324(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 581
+	add
+	ldloc 12
+	stelem.i4
+// 0x0107512c: 0x107512c: sw    s1, 2316(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 579
+	add
+	ldloc 8
+	stelem.i4
+// 0x01075130: 0x1075130: sw    ra, 2348(sp)
+// 0x01075134: 0x1075134: sw    s6, 2336(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 584
+	add
+	ldloc 15
+	stelem.i4
+// 0x01075138: 0x1075138: sw    s5, 2332(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 583
+	add
+	ldloc 14
+	stelem.i4
+// 0x0107513c: 0x107513c: sw    s2, 2320(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 580
+	add
+	ldloc 11
+	stelem.i4
+// 0x01075140: 0x1075140: sw    s0, 2312(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 578
+	add
+	ldloc 10
+	stelem.i4
+// 0x01075144: 0x1075144: addu  s1, a3, zero
+	ldloc 4
+	stloc 8
+// 0x01075148: 0x1075148: sw    a0, 2352(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 588
+	add
+	ldloc.1
+	stelem.i4
+// 0x0107514c: 0x107514c: addu  s8, a1, zero
+	ldloc.2
+	stloc 13
+// 0x01075150: 0x1075150: addu  s4, a2, zero
+	ldloc.3
+	stloc 9
+// 0x01075154: 0x1075154: lw    s3, 2368(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 592
+	add
+	ldelem.i4
+	stloc 12
+// 0x01075158: 0x1075158: lw    v1, 2372(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 593
+	add
+	ldelem.i4
+	stloc 7
+// 0x0107515c: 0x107515c: lw    s7, 2380(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 595
+	add
+	ldelem.i4
+	stloc 16
+// 0x01075160: 0x1075160: blez  a3, 0x1075358 addu  v0, zero, zero
+	ldloc 4
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	ble L_1075358
+// --- basic block ---
+// 0x01075168: 0x1075168: blez  v1, 0x10751cc addu  s5, zero, zero
+	ldloc 7
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	ble L_10751cc
+// --- basic block ---
+// 0x01075170: 0x1075170: beq   v1, a3, 0x10751a0 lui   a1, 0x10000
+	ldloc 7
+	ldloc 4
+	ldc.i4 65536
+	stloc.2
+	beq  L_10751a0
+// --- basic block ---
+// 0x01075178: 0x1075178: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x0107517c: 0x107517c: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x01075180: 0x1075180: addiu a3, a3, -29652
+	ldloc 4
+	ldc.i4 -29652
+	add
+	stloc 4
+// 0x01075184: 0x1075184: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01075188: 0x1075188: addiu a2, zero, 859
+	ldc.i4 859
+	stloc.3
+// 0x0107518c: 0x107518c: sw    v1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x01075190: 0x1075190: jal   0x100449c sw    s1, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01075198: 0x1075198: j	 0x10751cc addu  s5, zero, zero
+	ldc.i4.s 0
+	stloc 14
+	br L_10751cc
+// --- basic block ---
+L_10751a0:
+// 0x010751a0: 0x10751a0: addu  a0, s3, zero
+	ldloc 12
+	stloc.1
+// 0x010751a4: 0x10751a4: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+L_10751a8:
+// 0x010751a8: 0x10751a8: lw    a2, 0(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x010751ac: 0x10751ac: addiu v0, v0, 1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+// 0x010751b0: 0x10751b0: blez  a2, 0x10751c0 slt   a1, v0, v1
+	ldloc.3
+	ldloc 6
+	ldloc 7
+	clt
+	stloc.2
+	ldc.i4.s 0
+	ble L_10751c0
+// --- basic block ---
+// 0x010751b8: 0x10751b8: j	 0x10751cc addiu s5, zero, 1
+	ldc.i4.1
+	stloc 14
+	br L_10751cc
+// --- basic block ---
+L_10751c0:
+// 0x010751c0: 0x10751c0: bne   a1, zero, 0x10751a8 addiu a0, a0, 8
+	ldloc.2
+	ldloc.1
+	ldc.i4.8
+	add
+	stloc.1
+	brtrue L_10751a8
+// --- basic block ---
+// 0x010751c8: 0x10751c8: addu  s5, zero, zero
+	ldc.i4.s 0
+	stloc 14
+L_10751cc:
+// 0x010751cc: 0x10751cc: jal   0x10674f4 addiu a0, sp, 60
+	ldloc.0
+	ldc.i4.s 60
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010751d4: 0x10751d4: slti  v0, s1, 61
+	ldloc 8
+	ldc.i4.s 61
+	clt
+	stloc 6
+// 0x010751d8: 0x10751d8: bne   v0, zero, 0x10751f0 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_10751f0
+// --- basic block ---
+// 0x010751e0: 0x10751e0: addiu s1, s1, -60
+	ldloc 8
+	ldc.i4.s -60
+	add
+	stloc 8
+// 0x010751e4: 0x10751e4: sll   s1, s1, 3
+	ldloc 8
+	ldc.i4.3
+	shl
+	stloc 8
+// 0x010751e8: 0x10751e8: addu  s4, s4, s1
+	ldloc 9
+	ldloc 8
+	add
+	stloc 9
+// 0x010751ec: 0x10751ec: addiu s1, zero, 60
+	ldc.i4.s 60
+	stloc 8
+L_10751f0:
+// 0x010751f0: 0x10751f0: addiu a1, zero, 87
+	ldc.i4.s 87
+	stloc.2
+// 0x010751f4: 0x10751f4: mult  s1, a1
+	ldloc 8
+	ldloc.2
+	mul
+	stloc 18
+// 0x010751f8: 0x10751f8: addiu a0, sp, 60
+	ldloc.0
+	ldc.i4.s 60
+	add
+	stloc.1
+// 0x010751fc: 0x10751fc: addiu s2, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc 11
+// 0x01075200: 0x1075200: addu  s6, zero, zero
+	ldc.i4.s 0
+	stloc 15
+// 0x01075204: 0x1075204: mflo  lo
+	ldloc 18
+	stloc.2
+// 0x01075208: 0x1075208: jal   0x106756c addiu a1, a1, 62
+	ldloc.2
+	ldc.i4.s 62
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01075210: 0x1075210: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01075214: 0x1075214: addu  a2, s8, zero
+	ldloc 13
+	stloc.3
+// 0x01075218: 0x1075218: addiu a1, a1, -29568
+	ldloc.2
+	ldc.i4 -29568
+	add
+	stloc.2
+// 0x0107521c: 0x107521c: addu  a0, v0, zero
+	ldloc 6
+	stloc.1
+// 0x01075220: 0x1075220: sb    zero, 0(v0)
+	ldloc 6
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075224: 0x1075224: sb    zero, 1(v0)
+	ldloc 6
+	ldc.i4.1
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075228: 0x1075228: sb    zero, 2(v0)
+	ldloc 6
+	ldc.i4.2
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0107522c: 0x107522c: sb    zero, 3(v0)
+	ldloc 6
+	ldc.i4.3
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075230: 0x1075230: jal   0x1000f64 addu  s0, v0, zero
+	ldloc 6
+	stloc 10
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01075238: 0x1075238: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107523c: 0x107523c: addiu a1, a1, 19088
+	ldloc.2
+	ldc.i4 19088
+	add
+	stloc.2
+// 0x01075240: 0x1075240: sll   a2, s1, 1
+	ldloc 8
+	ldc.i4.1
+	shl
+	stloc.3
+// 0x01075244: 0x1075244: jal   0x1000f64 addiu a0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0107524c: 0x107524c: lui   s8, 0x20000
+	ldc.i4 131072
+	stloc 13
+// 0x01075250: 0x1075250: addu  a0, s0, zero
+	ldloc 10
+	stloc.1
+// 0x01075254: 0x1075254: jal   0x1001ac4 addiu a1, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 6
+// --- basic block ---
+// 0x0107525c: 0x107525c: addiu s8, s8, -30924
+	ldloc 13
+	ldc.i4 -30924
+	add
+	stloc 13
+// 0x01075260: 0x1075260: j	 0x1075278 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_1075278
+// --- basic block ---
+L_1075268:
+// 0x01075268: 0x1075268: lw    a3, 12(s4)
+	ldloc 5
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldelem.i4
+	stloc 4
+// 0x0107526c: 0x107526c: lw    v0, 4(s4)
 	ldloc 5
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 571
+	ldc.i4.1
 	add
-	ldloc 10
-	stelem.i4
-// 0x01075004: 0x1075004: lw    s4, 2340(sp)
+	ldelem.i4
+	stloc 6
+// 0x01075270: 0x1075270: addiu s4, s4, 8
+	ldloc 9
+	ldc.i4.8
+	add
+	stloc 9
+// 0x01075274: 0x1075274: subu  a3, a3, v0
+	ldloc 4
+	ldloc 6
+	sub
+	stloc 4
+L_1075278:
+// 0x01075278: 0x1075278: lw    a2, 0(s4)
 	ldloc 5
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 585
-	add
 	ldelem.i4
-	stloc 15
-// 0x01075008: 0x1075008: jal   0x10674e4 addu  s2, a3, zero
-	ldloc 4
-	stloc 11
+	stloc.3
+// 0x0107527c: 0x107527c: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x01075280: 0x1075280: jal   0x1000f64 addu  a1, s8, zero
+	ldloc 13
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_init_10674e4(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01075010: 0x1075010: mult  s5, s7
-	ldloc 13
-	ldloc 8
-	mul
-	stloc 18
-// 0x01075014: 0x1075014: addu  a0, s0, zero
-	ldloc 7
+// 0x01075288: 0x1075288: addiu s6, s6, 1
+	ldloc 15
+	ldc.i4.1
+	add
+	stloc 15
+// 0x0107528c: 0x107528c: addu  a0, s0, zero
+	ldloc 10
 	stloc.1
-// 0x01075018: 0x1075018: lui   s8, 0x20000
-	ldc.i4 131072
-	stloc 14
-// 0x0107501c: 0x107501c: addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 10
-// 0x01075020: 0x1075020: mflo  lo
-	ldloc 18
+// 0x01075290: 0x1075290: jal   0x1001ac4 addu  a1, s2, zero
+	ldloc 11
 	stloc.2
-// 0x01075024: 0x1075024: mflo  lo
-	ldloc 18
-	stloc 8
-// 0x01075028: 0x1075028: jal   0x106755c addiu s8, s8, 18636
-	ldloc 14
-	ldc.i4 18636
-	add
-	stloc 14
-	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl76::ebuffer_alloc_106755c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01075030: 0x1075030: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x01075034: 0x1075034: addu  a2, s7, zero
+// 0x01075298: 0x1075298: slt   v0, s6, s1
+	ldloc 15
 	ldloc 8
-	stloc.3
-// 0x01075038: 0x1075038: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107503c: 0x107503c: lui   s7, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x01075040: 0x1075040: addu  s0, v0, zero
+	clt
+	stloc 6
+// 0x0107529c: 0x107529c: bne   v0, zero, 0x1075268 sll   zero, zero, 0
 	ldloc 6
-	stloc 7
-// 0x01075044: 0x1075044: jal   0x100177c addiu s7, s7, -29764
-	ldloc 8
-	ldc.i4 -29764
+	brtrue L_1075268
+// --- basic block ---
+// 0x010752a4: 0x10752a4: beq   s5, zero, 0x107530c lui   a1, 0x20000
+	ldloc 14
+	ldc.i4 131072
+	stloc.2
+	brfalse L_107530c
+// --- basic block ---
+// 0x010752ac: 0x10752ac: addiu a1, a1, -30904
+	ldloc.2
+	ldc.i4 -30904
 	add
-	stloc 8
+	stloc.2
+// 0x010752b0: 0x10752b0: addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+// 0x010752b4: 0x10752b4: jal   0x1000f64 addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x0107504c: 0x107504c: j	 0x1075088 slt   v0, s1, s5
-	ldloc 10
-	ldloc 13
-	clt
+	stloc 7
 	stloc 6
-	br L_1075088
 // --- basic block ---
-L_1075054:
-// 0x01075054: 0x1075054: jal   0x1001b48 addiu s1, s1, 1
+// 0x010752bc: 0x10752bc: addu  a0, s0, zero
 	ldloc 10
-	ldc.i4.1
-	add
-	stloc 10
+	stloc.1
+// 0x010752c0: 0x10752c0: jal   0x1001ac4 addu  a1, s2, zero
+	ldloc 11
+	stloc.2
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x0107505c: 0x107505c: lw    a2, 0(s3)
+// 0x010752c8: 0x10752c8: addu  s4, zero, zero
+	ldc.i4.s 0
+	stloc 9
+L_10752cc:
+// 0x010752cc: 0x10752cc: addu  a0, s2, zero
+	ldloc 11
+	stloc.1
+// 0x010752d0: 0x10752d0: lw    a3, 4(s3)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x01075060: 0x1075060: addu  a0, s0, v0
-	ldloc 7
-	ldloc 6
+	ldc.i4.1
 	add
-	stloc.1
-// 0x01075064: 0x1075064: addu  a1, s7, zero
-	ldloc 8
+	ldelem.i4
+	stloc 4
+// 0x010752d4: 0x10752d4: beq   s4, zero, 0x10752e8 addu  a1, s8, zero
+	ldloc 9
+	ldloc 13
 	stloc.2
-// 0x01075068: 0x1075068: addiu s3, s3, 4
+	brfalse L_10752e8
+// --- basic block ---
+// 0x010752dc: 0x10752dc: lw    v0, -4(s3)
+	ldloc 5
 	ldloc 12
-	ldc.i4.4
+	ldc.i4.2
+	shr.un
+	ldc.i4.m1
 	add
-	stloc 12
-// 0x0107506c: 0x107506c: beq   s2, zero, 0x107507c addu  a3, s8, zero
-	ldloc 11
-	ldloc 14
-	stloc 4
-	brfalse L_107507c
-// --- basic block ---
-// 0x01075074: 0x1075074: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01075078: 0x1075078: addiu a3, a3, 12208
+	ldelem.i4
+	stloc 6
+// 0x010752e0: 0x10752e0: sll   zero, zero, 0
+// 0x010752e4: 0x10752e4: subu  a3, a3, v0
 	ldloc 4
-	ldc.i4 12208
-	add
+	ldloc 6
+	sub
 	stloc 4
-L_107507c:
-// 0x0107507c: 0x107507c: jal   0x1000f64 sltiu s2, s2, 1
-	ldloc 11
+L_10752e8:
+// 0x010752e8: 0x10752e8: lw    a2, 0(s3)
+	ldloc 5
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x010752ec: 0x10752ec: jal   0x1000f64 addiu s4, s4, 1
+	ldloc 9
 	ldc.i4.1
-	clt.un
-	stloc 11
+	add
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7243,138 +8109,127 @@ L_107507c:
 	ldloc 4
 	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01075084: 0x1075084: slt   v0, s1, s5
+// 0x010752f4: 0x10752f4: addu  a0, s0, zero
 	ldloc 10
-	ldloc 13
+	stloc.1
+// 0x010752f8: 0x10752f8: jal   0x1001ac4 addu  a1, s2, zero
+	ldloc 11
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcat_1001ac4(int32,int32)
+	stloc 6
+// --- basic block ---
+// 0x01075300: 0x1075300: slt   v0, s4, s1
+	ldloc 9
+	ldloc 8
 	clt
 	stloc 6
-L_1075088:
-// 0x01075088: 0x1075088: bne   v0, zero, 0x1075054 addu  a0, s0, zero
+// 0x01075304: 0x1075304: bne   v0, zero, 0x10752cc addiu s3, s3, 8
 	ldloc 6
-	ldloc 7
-	stloc.1
-	brtrue L_1075054
+	ldloc 12
+	ldc.i4.8
+	add
+	stloc 12
+	brtrue L_10752cc
 // --- basic block ---
-// 0x01075090: 0x1075090: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01075094: 0x1075094: lui   a3, 0x20000
+L_107530c:
+// 0x0107530c: 0x107530c: beq   s7, zero, 0x107532c lui   a1, 0x20000
+	ldloc 16
 	ldc.i4 131072
-	stloc 4
-// 0x01075098: 0x1075098: addiu a1, a1, 32252
+	stloc.2
+	brfalse L_107532c
+// --- basic block ---
+// 0x01075314: 0x1075314: addu  a0, s7, zero
+	ldloc 16
+	stloc.1
+// 0x01075318: 0x1075318: addiu a1, a1, -29156
 	ldloc.2
-	ldc.i4 32252
+	ldc.i4 -29156
 	add
 	stloc.2
-// 0x0107509c: 0x107509c: addiu a3, a3, -29740
-	ldloc 4
-	ldc.i4 -29740
-	add
-	stloc 4
-// 0x010750a0: 0x10750a0: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x010750a4: 0x10750a4: addiu a2, zero, 690
-	ldc.i4 690
+// 0x0107531c: 0x107531c: jal   0x1000f64 addu  a2, s0, zero
+	ldloc 10
 	stloc.3
-// 0x010750a8: 0x10750a8: jal   0x100449c sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x010750b0: 0x10750b0: beq   s4, zero, 0x10750c8 addu  a0, s4, zero
-	ldloc 15
-	ldloc 15
-	stloc.1
-	brfalse L_10750c8
-// --- basic block ---
-// 0x010750b8: 0x10750b8: jal   0x1001b68 addu  a1, s0, zero
-	ldloc 7
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcpy_1001b68(int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010750c0: 0x10750c0: j	 0x10750e4 addiu v0, zero, 1
+// 0x01075324: 0x1075324: j	 0x1075348 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-	br L_10750e4
+	br L_1075348
 // --- basic block ---
-L_10750c8:
-// 0x010750c8: 0x10750c8: lui   a0, 0x0
+L_107532c:
+// 0x0107532c: 0x107532c: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x010750cc: 0x10750cc: lw    a2, 2336(sp)
+// 0x01075330: 0x1075330: lw    a2, 2376(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 584
+	ldc.i4 594
 	add
 	ldelem.i4
 	stloc.3
-// 0x010750d0: 0x10750d0: addiu a0, a0, 15252
+// 0x01075334: 0x1075334: lw    a3, 2352(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 588
+	add
+	ldelem.i4
+	stloc 4
+// 0x01075338: 0x1075338: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x010750d4: 0x10750d4: addu  a3, s6, zero
-	ldloc 16
-	stloc 4
-// 0x010750d8: 0x10750d8: addiu a1, zero, 36
+// 0x0107533c: 0x107533c: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x010750dc: 0x10750dc: jal   0x1072cd8 sw    s0, 16(sp)
+// 0x01075340: 0x1075340: jal   0x10732fc sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-L_10750e4:
-// 0x010750e4: 0x10750e4: addiu a0, sp, 24
+L_1075348:
+// 0x01075348: 0x1075348: addiu a0, sp, 60
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 60
 	add
 	stloc.1
-// 0x010750e8: 0x10750e8: jal   0x1067508 sw    v0, 2272(sp)
+// 0x0107534c: 0x107534c: jal   0x1067518 sw    v0, 2304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4 576
 	add
 	ldloc 6
 	stelem.i4
@@ -7383,110 +8238,111 @@ L_10750e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl76::ebuffer_free_1067508(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010750f0: 0x10750f0: lw    ra, 2316(sp)
-// 0x010750f4: 0x10750f4: lw    v0, 2272(sp)
+// 0x01075354: 0x1075354: lw    v0, 2304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 568
+	ldc.i4 576
 	add
 	ldelem.i4
 	stloc 6
-// 0x010750f8: 0x10750f8: lw    s8, 2312(sp)
+L_1075358:
+// 0x01075358: 0x1075358: lw    ra, 2348(sp)
+// 0x0107535c: 0x107535c: lw    s8, 2344(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 578
+	ldc.i4 586
 	add
 	ldelem.i4
-	stloc 14
-// 0x010750fc: 0x10750fc: lw    s7, 2308(sp)
+	stloc 13
+// 0x01075360: 0x1075360: lw    s7, 2340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 577
+	ldc.i4 585
 	add
 	ldelem.i4
-	stloc 8
-// 0x01075100: 0x1075100: lw    s6, 2304(sp)
+	stloc 16
+// 0x01075364: 0x1075364: lw    s6, 2336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 576
+	ldc.i4 584
 	add
 	ldelem.i4
-	stloc 16
-// 0x01075104: 0x1075104: lw    s5, 2300(sp)
+	stloc 15
+// 0x01075368: 0x1075368: lw    s5, 2332(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 575
+	ldc.i4 583
 	add
 	ldelem.i4
-	stloc 13
-// 0x01075108: 0x1075108: lw    s4, 2296(sp)
+	stloc 14
+// 0x0107536c: 0x107536c: lw    s4, 2328(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 574
+	ldc.i4 582
 	add
 	ldelem.i4
-	stloc 15
-// 0x0107510c: 0x107510c: lw    s3, 2292(sp)
+	stloc 9
+// 0x01075370: 0x1075370: lw    s3, 2324(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 573
+	ldc.i4 581
 	add
 	ldelem.i4
 	stloc 12
-// 0x01075110: 0x1075110: lw    s2, 2288(sp)
+// 0x01075374: 0x1075374: lw    s2, 2320(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 572
+	ldc.i4 580
 	add
 	ldelem.i4
 	stloc 11
-// 0x01075114: 0x1075114: lw    s1, 2284(sp)
+// 0x01075378: 0x1075378: lw    s1, 2316(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 571
+	ldc.i4 579
 	add
 	ldelem.i4
-	stloc 10
-// 0x01075118: 0x1075118: lw    s0, 2280(sp)
+	stloc 8
+// 0x0107537c: 0x107537c: lw    s0, 2312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 570
+	ldc.i4 578
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107511c: 0x107511c: jr    ra addiu sp, sp, 2320
+	stloc 10
+// 0x01075380: 0x1075380: jr    ra addiu sp, sp, 2352
 	ldloc.0
-	ldc.i4 2320
+	ldc.i4 2352
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
diff --git a/converted/Cibyl88.j b/converted/Cibyl88.j
index 937de08..6e8fc6b 100644
--- a/converted/Cibyl88.j
+++ b/converted/Cibyl88.j
@@ -41,29 +41,35 @@
     IL_0006:  ret
   } // end of method Cibyl88::.ctor
 
-.method public static int32 RTNet_MapDisplyed_1075124(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_GPSPath_1075388(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s1,int32 s3,int32 s4,int32 s0,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 lo)
 
 // local  6 is register v0
-// local 11 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  9 is register s2
+// local 12 is register s0
+// local  9 is register s1
+// local  8 is register s2
 // local 10 is register s3
+// local 11 is register s4
+// local 13 is register s5
+// local 14 is register s6
+// local 15 is register s7
 // local  0 is register sp
-// local 12 is register ra
+// local 16 is register s8
+// local 17 is register ra
+// local 18 is register lo
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 11
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -73,644 +79,920 @@
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
+	stloc 12
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 16
+	ldc.i4.s 0
+	stloc 17
+	ldc.i4.s 0
+	stloc 18
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01075124: 0x1075124: addiu sp, sp, -144
+// 0x01075388: 0x1075388: addiu sp, sp, -2320
 	ldloc.0
-	ldc.i4 -144
+	ldc.i4 -2320
 	add
 	stloc.0
-// 0x01075128: 0x1075128: sw    s2, 132(sp)
+// 0x0107538c: 0x107538c: slti  v1, a3, 2
+	ldloc 4
+	ldc.i4.2
+	clt
+	stloc 7
+// 0x01075390: 0x1075390: sw    s8, 2312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4 578
 	add
-	ldloc 9
+	ldloc 16
 	stelem.i4
-// 0x0107512c: 0x107512c: sw    s0, 124(sp)
+// 0x01075394: 0x1075394: sw    s6, 2304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4 576
 	add
-	ldloc 7
+	ldloc 14
 	stelem.i4
-// 0x01075130: 0x1075130: lw    s2, 160(sp)
+// 0x01075398: 0x1075398: sw    s3, 2292(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4 573
 	add
-	ldelem.i4
-	stloc 9
-// 0x01075134: 0x1075134: addiu s0, sp, 32
+	ldloc 10
+	stelem.i4
+// 0x0107539c: 0x107539c: sw    s2, 2288(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
 	add
-	stloc 7
-// 0x01075138: 0x1075138: sw    s3, 136(sp)
+	ldloc 8
+	stelem.i4
+// 0x010753a0: 0x10753a0: sw    ra, 2316(sp)
+// 0x010753a4: 0x10753a4: sw    s7, 2308(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4 577
 	add
-	ldloc 10
+	ldloc 15
 	stelem.i4
-// 0x0107513c: 0x107513c: addu  s3, a0, zero
-	ldloc.1
-	stloc 10
-// 0x01075140: 0x1075140: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x01075144: 0x1075144: sw    s1, 128(sp)
+// 0x010753a8: 0x10753a8: sw    s5, 2300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4 575
 	add
-	ldloc 8
+	ldloc 13
 	stelem.i4
-// 0x01075148: 0x1075148: sw    ra, 140(sp)
-// 0x0107514c: 0x107514c: addu  s1, a2, zero
-	ldloc.3
-	stloc 8
-// 0x01075150: 0x1075150: jal   0x10724e8 sw    a3, 112(sp)
+// 0x010753ac: 0x10753ac: sw    s4, 2296(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4 574
 	add
-	ldloc 4
+	ldloc 11
+	stelem.i4
+// 0x010753b0: 0x10753b0: sw    s1, 2284(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 571
+	add
+	ldloc 9
 	stelem.i4
+// 0x010753b4: 0x10753b4: sw    s0, 2280(sp)
+	ldloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 570
+	add
+	ldloc 12
+	stelem.i4
+// 0x010753b8: 0x10753b8: addu  s2, a3, zero
+	ldloc 4
+	stloc 8
+// 0x010753bc: 0x10753bc: addu  s8, a0, zero
 	ldloc.1
-	ldloc.2
+	stloc 16
+// 0x010753c0: 0x10753c0: addu  s3, a2, zero
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl85::format_RoadMapArea_string_10724e8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 6
-// --- basic block ---
-// 0x01075158: 0x1075158: lw    a2, 112(sp)
+	stloc 10
+// 0x010753c4: 0x10753c4: lw    s6, 2340(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4 585
 	add
 	ldelem.i4
-	stloc.3
-// 0x0107515c: 0x107515c: beq   s2, zero, 0x1075180 lui   v0, 0x20000
-	ldloc 9
-	ldc.i4 131072
+	stloc 14
+// 0x010753c8: 0x10753c8: bne   v1, zero, 0x10755b4 addu  v0, zero, zero
+	ldloc 7
+	ldc.i4.s 0
 	stloc 6
-	brfalse L_1075180
+	brtrue L_10755b4
 // --- basic block ---
-// 0x01075164: 0x1075164: addu  a0, s2, zero
-	ldloc 9
+// 0x010753d0: 0x10753d0: jal   0x10674f4 addiu a0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
 	stloc.1
-// 0x01075168: 0x1075168: addiu a1, v0, -29692
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010753d8: 0x10753d8: slti  v0, s2, 101
+	ldloc 8
+	ldc.i4.s 101
+	clt
+	stloc 6
+// 0x010753dc: 0x10753dc: bne   v0, zero, 0x1075428 addiu a2, zero, 87
 	ldloc 6
-	ldc.i4 -29692
+	ldc.i4.s 87
+	stloc.3
+	brtrue L_1075428
+// --- basic block ---
+// 0x010753e4: 0x10753e4: addiu s2, s2, -100
+	ldloc 8
+	ldc.i4.s -100
 	add
+	stloc 8
+// 0x010753e8: 0x10753e8: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0107516c: 0x107516c: addu  a2, s0, zero
-	ldloc 7
-	stloc.3
-// 0x01075170: 0x1075170: jal   0x1000f64 addu  a3, s1, zero
+// 0x010753ec: 0x10753ec: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x010753f0: 0x10753f0: sw    s2, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x010753f4: 0x10753f4: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x010753f8: 0x10753f8: sll   s2, s2, 4
 	ldloc 8
+	ldc.i4.4
+	shl
+	stloc 8
+// 0x010753fc: 0x10753fc: addiu a3, a3, -29552
+	ldloc 4
+	ldc.i4 -29552
+	add
 	stloc 4
+// 0x01075400: 0x1075400: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01075404: 0x1075404: jal   0x100449c addiu a2, zero, 779
+	ldc.i4 779
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 6
-// --- basic block ---
-// 0x01075178: 0x1075178: j	 0x10751a4 addiu v0, zero, 1
-	ldc.i4.1
+	stloc 7
 	stloc 6
-	br L_10751a4
 // --- basic block ---
-L_1075180:
-// 0x01075180: 0x1075180: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01075184: 0x1075184: addiu v0, v0, -29692
-	ldloc 6
-	ldc.i4 -29692
+// 0x0107540c: 0x107540c: addu  s3, s3, s2
+	ldloc 10
+	ldloc 8
 	add
+	stloc 10
+// 0x01075410: 0x1075410: addiu v0, zero, -1
+	ldc.i4.m1
 	stloc 6
-// 0x01075188: 0x1075188: addiu a0, a0, 15252
-	ldloc.1
-	ldc.i4 15252
-	add
-	stloc.1
-// 0x0107518c: 0x107518c: addu  a3, s3, zero
-	ldloc 10
-	stloc 4
-// 0x01075190: 0x1075190: addiu a1, zero, 36
-	ldc.i4.s 36
-	stloc.2
-// 0x01075194: 0x1075194: sw    v0, 16(sp)
+// 0x01075414: 0x1075414: sw    v0, 4(s3)
 	ldloc 5
-	ldloc.0
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.1
 	add
 	ldloc 6
 	stelem.i4
-// 0x01075198: 0x1075198: sw    s0, 20(sp)
+// 0x01075418: 0x1075418: sw    v0, 0(s3)
 	ldloc 5
-	ldloc.0
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldloc 6
+	stelem.i4
+// 0x0107541c: 0x107541c: sw    zero, 12(s3)
+	ldloc 5
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
 	add
-	ldloc 7
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107519c: 0x107519c: jal   0x1072cd8 sw    s1, 24(sp)
+// 0x01075420: 0x1075420: addiu s2, zero, 100
+	ldc.i4.s 100
+	stloc 8
+// 0x01075424: 0x1075424: addiu a2, zero, 87
+	ldc.i4.s 87
+	stloc.3
+L_1075428:
+// 0x01075428: 0x1075428: mult  s2, a2
+	ldloc 8
+	ldloc.3
+	mul
+	stloc 18
+// 0x0107542c: 0x107542c: addiu a0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.1
+// 0x01075430: 0x1075430: addu  s5, s3, zero
+	ldloc 10
+	stloc 13
+// 0x01075434: 0x1075434: addu  s4, zero, zero
+	ldc.i4.s 0
+	stloc 11
+// 0x01075438: 0x1075438: addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 9
+// 0x0107543c: 0x107543c: addiu s7, zero, -1
+	ldc.i4.m1
+	stloc 15
+// 0x01075440: 0x1075440: mflo  lo
+	ldloc 18
+	stloc.3
+// 0x01075444: 0x1075444: addiu a2, a2, 62
+	ldloc.3
+	ldc.i4.s 62
+	add
+	stloc.3
+// 0x01075448: 0x1075448: addu  a1, a2, zero
+	ldloc.3
+	stloc.2
+// 0x0107544c: 0x107544c: jal   0x106756c sw    a2, 2272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 568
 	add
-	ldloc 8
+	ldloc.3
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
+	stloc 7
 	stloc 6
 // --- basic block ---
-L_10751a4:
-// 0x010751a4: 0x10751a4: lw    ra, 140(sp)
-// 0x010751a8: 0x10751a8: lw    s3, 136(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 34
-	add
-	ldelem.i4
-	stloc 10
-// 0x010751ac: 0x10751ac: lw    s2, 132(sp)
+// 0x01075454: 0x1075454: lw    a2, 2272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4 568
 	add
 	ldelem.i4
-	stloc 9
-// 0x010751b0: 0x10751b0: lw    s1, 128(sp)
+	stloc.3
+// 0x01075458: 0x1075458: addu  a0, v0, zero
+	ldloc 6
+	stloc.1
+// 0x0107545c: 0x107545c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01075460: 0x1075460: jal   0x100177c addu  s0, v0, zero
+	ldloc 6
+	stloc 12
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+L_1075468:
+// 0x01075468: 0x1075468: lw    v0, 0(s5)
 	ldloc 5
-	ldloc.0
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
-	add
 	ldelem.i4
-	stloc 8
-// 0x010751b4: 0x10751b4: lw    s0, 124(sp)
+	stloc 6
+// 0x0107546c: 0x107546c: sll   zero, zero, 0
+// 0x01075470: 0x1075470: beq   v0, s7, 0x1075488 sll   zero, zero, 0
+	ldloc 6
+	ldloc 15
+	beq  L_1075488
+// --- basic block ---
+// 0x01075478: 0x1075478: lw    v0, 4(s5)
 	ldloc 5
-	ldloc.0
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 7
-// 0x010751b8: 0x10751b8: jr    ra addiu sp, sp, 144
-	ldloc.0
-	ldc.i4 144
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 11
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+// 0x0107547c: 0x107547c: sll   zero, zero, 0
+// 0x01075480: 0x1075480: bne   v0, s7, 0x10754e4 sll   zero, zero, 0
 	ldloc 6
-	ret
-}
-.method public static int32 RTNet_NavigateTo_10751c0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 v1,int32 t0,int32 s1,int32 ra)
-
-// local  6 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 10 is register t0
-// local  7 is register s0
-// local 11 is register s1
-// local  8 is register s2
-// local  0 is register sp
-// local 12 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
+	ldloc 15
+	bne.un L_10754e4
+// --- basic block ---
+L_1075488:
+// 0x01075488: 0x1075488: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 12
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+// --- basic block ---
+// 0x01075490: 0x1075490: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01075494: 0x1075494: lui   a3, 0x20000
+	ldc.i4 131072
 	stloc 4
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
+// 0x01075498: 0x1075498: subu  v1, s4, s1
+	ldloc 11
+	ldloc 9
+	sub
 	stloc 7
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010751c0: 0x10751c0: addiu sp, sp, -104
-	ldloc.0
-	ldc.i4.s -104
+// 0x0107549c: 0x107549c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010754a0: 0x10754a0: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	stloc.0
-// 0x010751c4: 0x10751c4: sw    s0, 88(sp)
+	stloc.2
+// 0x010754a4: 0x10754a4: addiu a2, zero, 799
+	ldc.i4 799
+	stloc.3
+// 0x010754a8: 0x10754a8: addiu a3, a3, -29508
+	ldloc 4
+	ldc.i4 -29508
+	add
+	stloc 4
+// 0x010754ac: 0x10754ac: sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.5
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x010751c8: 0x10751c8: addiu s0, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 7
-// 0x010751cc: 0x10751cc: sw    s2, 96(sp)
+// 0x010754b0: 0x10754b0: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x010751d0: 0x10751d0: sw    s1, 92(sp)
+// 0x010754b4: 0x10754b4: sw    v0, 2276(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4 569
 	add
-	ldloc 11
+	ldloc 6
 	stelem.i4
-// 0x010751d4: 0x10751d4: addu  s2, a2, zero
-	ldloc.3
-	stloc 8
-// 0x010751d8: 0x10751d8: addu  s1, a0, zero
-	ldloc.1
-	stloc 11
-// 0x010751dc: 0x10751dc: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x010751e0: 0x10751e0: sw    ra, 100(sp)
-// 0x010751e4: 0x10751e4: jal   0x1072a94 sw    a3, 80(sp)
+// 0x010754b8: 0x10754b8: jal   0x100449c sw    v1, 2272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4 568
 	add
-	ldloc 4
+	ldloc 7
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::format_RoadMapPosition_string_1072a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010751ec: 0x10751ec: lw    v0, 12(s2)
+// 0x010754c0: 0x10754c0: lw    v0, 2276(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4 569
 	add
 	ldelem.i4
 	stloc 6
-// 0x010751f0: 0x10751f0: lw    v1, 8(s2)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc 9
-// 0x010751f4: 0x10751f4: lw    a2, 80(sp)
+// 0x010754c4: 0x10754c4: lw    v1, 2272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4 568
 	add
 	ldelem.i4
-	stloc.3
-// 0x010751f8: 0x10751f8: sw    v0, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
+	stloc 7
+// 0x010754c8: 0x10754c8: sll   a1, s1, 4
+	ldloc 9
+	ldc.i4.4
+	shl
+	stloc.2
+// 0x010754cc: 0x10754cc: addu  a0, s0, v0
+	ldloc 12
 	ldloc 6
-	stelem.i4
-// 0x010751fc: 0x10751fc: lui   a0, 0x0
-	ldc.i4.s 0
+	add
 	stloc.1
-// 0x01075200: 0x1075200: lui   t0, 0x20000
-	ldc.i4 131072
-	stloc 10
-// 0x01075204: 0x1075204: lui   v0, 0x10000
-	ldc.i4 65536
+// 0x010754d0: 0x10754d0: addu  a1, s3, a1
+	ldloc 10
+	ldloc.2
+	add
+	stloc.2
+// 0x010754d4: 0x10754d4: addu  a2, v1, zero
+	ldloc 7
+	stloc.3
+// 0x010754d8: 0x10754d8: jal   0x10731d4 addiu a3, zero, 1
+	ldc.i4.1
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::RTNet_GPSPath_BuildCommand_10731d4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-// 0x01075208: 0x1075208: addu  a3, s1, zero
+// --- basic block ---
+// 0x010754e0: 0x10754e0: addiu s1, s4, 1
 	ldloc 11
-	stloc 4
-// 0x0107520c: 0x107520c: addiu t0, t0, -29672
-	ldloc 10
-	ldc.i4 -29672
+	ldc.i4.1
 	add
-	stloc 10
-// 0x01075210: 0x1075210: addiu v0, v0, 18500
+	stloc 9
+L_10754e4:
+// 0x010754e4: 0x10754e4: addiu s4, s4, 1
+	ldloc 11
+	ldc.i4.1
+	add
+	stloc 11
+// 0x010754e8: 0x10754e8: slt   v0, s4, s2
+	ldloc 11
+	ldloc 8
+	clt
+	stloc 6
+// 0x010754ec: 0x10754ec: bne   v0, zero, 0x1075468 addiu s5, s5, 16
 	ldloc 6
-	ldc.i4 18500
+	ldloc 13
+	ldc.i4.s 16
+	add
+	stloc 13
+	brtrue L_1075468
+// --- basic block ---
+// 0x010754f4: 0x10754f4: addiu s4, s2, -1
+	ldloc 8
+	ldc.i4.m1
 	add
+	stloc 11
+// 0x010754f8: 0x10754f8: slt   v0, s1, s4
+	ldloc 9
+	ldloc 11
+	clt
 	stloc 6
-// 0x01075214: 0x1075214: addiu a0, a0, 15252
+// 0x010754fc: 0x10754fc: beq   v0, zero, 0x1075554 lui   a1, 0x10000
+	ldloc 6
+	ldc.i4 65536
+	stloc.2
+	brfalse L_1075554
+// --- basic block ---
+// 0x01075504: 0x1075504: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 12
+	stloc.1
 	ldloc.1
-	ldc.i4 15252
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0107550c: 0x107550c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01075510: 0x1075510: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01075514: 0x1075514: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
 	add
-	stloc.1
-// 0x01075218: 0x1075218: addiu a1, zero, 36
-	ldc.i4.s 36
 	stloc.2
-// 0x0107521c: 0x107521c: sw    s0, 20(sp)
+// 0x01075518: 0x1075518: addiu a3, a3, -29424
+	ldloc 4
+	ldc.i4 -29424
+	add
+	stloc 4
+// 0x0107551c: 0x107551c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01075520: 0x1075520: addiu a2, zero, 813
+	ldc.i4 813
+	stloc.3
+// 0x01075524: 0x1075524: sw    v0, 2276(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 569
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
-// 0x01075220: 0x1075220: sw    t0, 16(sp)
+// 0x01075528: 0x1075528: sw    s4, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldloc 10
+	ldloc 11
 	stelem.i4
-// 0x01075224: 0x1075224: sw    v1, 24(sp)
+// 0x0107552c: 0x107552c: jal   0x100449c sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
 	ldloc 9
 	stelem.i4
-// 0x01075228: 0x1075228: jal   0x1072cd8 sw    v0, 32(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01075534: 0x1075534: lw    v0, 2276(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 569
+	add
+	ldelem.i4
+	stloc 6
+// 0x01075538: 0x1075538: sll   a1, s1, 4
+	ldloc 9
+	ldc.i4.4
+	shl
+	stloc.2
+// 0x0107553c: 0x107553c: addu  a1, s3, a1
+	ldloc 10
+	ldloc.2
 	add
+	stloc.2
+// 0x01075540: 0x1075540: subu  a2, s2, s1
+	ldloc 8
+	ldloc 9
+	sub
+	stloc.3
+// 0x01075544: 0x1075544: addu  a0, s0, v0
+	ldloc 12
 	ldloc 6
-	stelem.i4
+	add
+	stloc.1
+// 0x01075548: 0x1075548: jal   0x10731d4 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::RTNet_GPSPath_BuildCommand_10731d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01075230: 0x1075230: lw    ra, 100(sp)
-// 0x01075234: 0x1075234: lw    s2, 96(sp)
+// 0x01075550: 0x1075550: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+L_1075554:
+// 0x01075554: 0x1075554: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01075558: 0x1075558: addiu a1, a1, 32716
+	ldloc.2
+	ldc.i4 32716
+	add
+	stloc.2
+// 0x0107555c: 0x107555c: addiu a3, a3, -29340
+	ldloc 4
+	ldc.i4 -29340
+	add
+	stloc 4
+// 0x01075560: 0x1075560: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01075564: 0x1075564: addiu a2, zero, 820
+	ldc.i4 820
+	stloc.3
+// 0x01075568: 0x1075568: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 8
-// 0x01075238: 0x1075238: lw    s1, 92(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107523c: 0x107523c: lw    s0, 88(sp)
-	ldloc 5
+	ldloc 12
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x01075240: 0x1075240: jr    ra addiu sp, sp, 104
-	ldloc.0
-	ldc.i4.s 104
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 RTNet_KeepAlive_1075248(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
 	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01075248: 0x1075248: addu  a3, a0, zero
+// 0x01075570: 0x1075570: beq   s6, zero, 0x1075588 addu  a0, s6, zero
+	ldloc 14
+	ldloc 14
+	stloc.1
+	brfalse L_1075588
+// --- basic block ---
+// 0x01075578: 0x1075578: jal   0x1001b68 addu  a1, s0, zero
+	ldloc 12
+	stloc.2
 	ldloc.1
-	stloc 4
-// 0x0107524c: 0x107524c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01075250: 0x1075250: lui   a0, 0x0
+	ldloc.2
+	call int32 Cibyl1::strcpy_1001b68(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01075580: 0x1075580: j	 0x10755a4 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+	br L_10755a4
+// --- basic block ---
+L_1075588:
+// 0x01075588: 0x1075588: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01075254: 0x1075254: addiu sp, sp, -32
+// 0x0107558c: 0x107558c: lw    a2, 2336(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4 584
 	add
-	stloc.0
-// 0x01075258: 0x1075258: addu  a2, a1, zero
-	ldloc.2
+	ldelem.i4
 	stloc.3
-// 0x0107525c: 0x107525c: addiu v0, v0, -29644
-	ldloc 5
-	ldc.i4 -29644
-	add
-	stloc 5
-// 0x01075260: 0x1075260: addiu a0, a0, 15252
+// 0x01075590: 0x1075590: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01075264: 0x1075264: addiu a1, zero, 36
+// 0x01075594: 0x1075594: addu  a3, s8, zero
+	ldloc 16
+	stloc 4
+// 0x01075598: 0x1075598: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01075268: 0x1075268: sw    ra, 28(sp)
-// 0x0107526c: 0x107526c: jal   0x1072cd8 sw    v0, 16(sp)
-	ldloc 7
+// 0x0107559c: 0x107559c: jal   0x10732fc sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
+	ldloc 12
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+L_10755a4:
+// 0x010755a4: 0x10755a4: addiu a0, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.1
+// 0x010755a8: 0x10755a8: jal   0x1067518 sw    v0, 2276(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 569
+	add
+	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01075274: 0x1075274: lw    ra, 28(sp)
-// 0x01075278: 0x1075278: sll   zero, zero, 0
-// 0x0107527c: 0x107527c: jr    ra addiu sp, sp, 32
+// 0x010755b0: 0x10755b0: lw    v0, 2276(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 569
+	add
+	ldelem.i4
+	stloc 6
+L_10755b4:
+// 0x010755b4: 0x10755b4: lw    ra, 2316(sp)
+// 0x010755b8: 0x10755b8: lw    s8, 2312(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 578
+	add
+	ldelem.i4
+	stloc 16
+// 0x010755bc: 0x10755bc: lw    s7, 2308(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 577
+	add
+	ldelem.i4
+	stloc 15
+// 0x010755c0: 0x10755c0: lw    s6, 2304(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 576
+	add
+	ldelem.i4
+	stloc 14
+// 0x010755c4: 0x10755c4: lw    s5, 2300(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 575
+	add
+	ldelem.i4
+	stloc 13
+// 0x010755c8: 0x10755c8: lw    s4, 2296(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 574
+	add
+	ldelem.i4
+	stloc 11
+// 0x010755cc: 0x10755cc: lw    s3, 2292(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 573
+	add
+	ldelem.i4
+	stloc 10
+// 0x010755d0: 0x10755d0: lw    s2, 2288(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
+	add
+	ldelem.i4
+	stloc 8
+// 0x010755d4: 0x10755d4: lw    s1, 2284(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 571
+	add
+	ldelem.i4
+	stloc 9
+// 0x010755d8: 0x10755d8: lw    s0, 2280(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 570
+	add
+	ldelem.i4
+	stloc 12
+// 0x010755dc: 0x10755dc: jr    ra addiu sp, sp, 2320
+	ldloc.0
+	ldc.i4 2320
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTNet_At_1075284(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_CreateNewRoads_10755e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s7,int32 v1,int32 s1,int32 s2,int32 s3,int32 s5,int32 s8,int32 s4,int32 s6,int32 ra,int32 lo)
 
 // local  6 is register v0
-// local  7 is register v1
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  7 is register s0
+// local 10 is register s1
+// local 11 is register s2
 // local 12 is register s3
-// local 11 is register s4
+// local 15 is register s4
+// local 13 is register s5
+// local 16 is register s6
+// local  8 is register s7
 // local  0 is register sp
-// local 13 is register ra
+// local 14 is register s8
+// local 17 is register ra
+// local 18 is register lo
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -720,298 +1002,424 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
 	stloc 12
 	ldc.i4.s 0
-	stloc 11
+	stloc 15
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 16
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
+	stloc 14
+	ldc.i4.s 0
+	stloc 17
+	ldc.i4.s 0
+	stloc 18
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01075284: 0x1075284: addiu sp, sp, -144
+// 0x010755e4: 0x10755e4: addiu sp, sp, -2320
 	ldloc.0
-	ldc.i4 -144
+	ldc.i4 -2320
 	add
 	stloc.0
-// 0x01075288: 0x1075288: sw    s2, 128(sp)
+// 0x010755e8: 0x10755e8: sw    s0, 2280(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4 570
 	add
-	ldloc 10
+	ldloc 7
 	stelem.i4
-// 0x0107528c: 0x107528c: lw    s2, 168(sp)
-	ldloc 5
+// 0x010755ec: 0x10755ec: addiu s0, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 42
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc 10
-// 0x01075290: 0x1075290: sw    s3, 132(sp)
+	stloc 7
+// 0x010755f0: 0x10755f0: sw    s7, 2308(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4 577
 	add
-	ldloc 12
+	ldloc 8
 	stelem.i4
-// 0x01075294: 0x1075294: addu  s3, a0, zero
-	ldloc.1
-	stloc 12
-// 0x01075298: 0x1075298: addiu a0, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.1
-// 0x0107529c: 0x107529c: sw    s4, 136(sp)
+// 0x010755f4: 0x10755f4: sw    s6, 2304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4 576
 	add
-	ldloc 11
+	ldloc 16
 	stelem.i4
-// 0x010752a0: 0x10752a0: sw    s1, 124(sp)
+// 0x010755f8: 0x10755f8: sw    s5, 2300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4 575
 	add
-	ldloc 9
+	ldloc 13
 	stelem.i4
-// 0x010752a4: 0x10752a4: sw    s0, 120(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 30
+// 0x010755fc: 0x10755fc: addiu s7, zero, 28
+	ldc.i4.s 28
+	stloc 8
+// 0x01075600: 0x1075600: addu  s5, a1, zero
+	ldloc.2
+	stloc 13
+// 0x01075604: 0x1075604: addu  s6, a0, zero
+	ldloc.1
+	stloc 16
+// 0x01075608: 0x1075608: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x0107560c: 0x107560c: sw    ra, 2316(sp)
+// 0x01075610: 0x1075610: sw    s8, 2312(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 578
 	add
-	ldloc 8
+	ldloc 14
+	stelem.i4
+// 0x01075614: 0x1075614: sw    s4, 2296(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 574
+	add
+	ldloc 15
+	stelem.i4
+// 0x01075618: 0x1075618: sw    s3, 2292(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 573
+	add
+	ldloc 12
+	stelem.i4
+// 0x0107561c: 0x107561c: sw    s2, 2288(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
+	add
+	ldloc 11
 	stelem.i4
-// 0x010752a8: 0x10752a8: sw    ra, 140(sp)
-// 0x010752ac: 0x10752ac: addu  s1, a2, zero
+// 0x01075620: 0x1075620: addu  s3, a2, zero
 	ldloc.3
-	stloc 9
-// 0x010752b0: 0x10752b0: lw    s4, 160(sp)
+	stloc 12
+// 0x01075624: 0x1075624: sw    s1, 2284(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4 571
+	add
+	ldloc 10
+	stelem.i4
+// 0x01075628: 0x1075628: lw    s4, 2340(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 585
 	add
 	ldelem.i4
+	stloc 15
+// 0x0107562c: 0x107562c: jal   0x10674f4 addu  s2, a3, zero
+	ldloc 4
 	stloc 11
-// 0x010752b4: 0x10752b4: jal   0x10729fc addu  s0, a3, zero
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl76::ebuffer_init_10674f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
+// --- basic block ---
+// 0x01075634: 0x1075634: mult  s5, s7
+	ldloc 13
+	ldloc 8
+	mul
+	stloc 18
+// 0x01075638: 0x1075638: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x0107563c: 0x107563c: lui   s8, 0x20000
+	ldc.i4 131072
+	stloc 14
+// 0x01075640: 0x1075640: addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 10
+// 0x01075644: 0x1075644: mflo  lo
+	ldloc 18
+	stloc.2
+// 0x01075648: 0x1075648: mflo  lo
+	ldloc 18
 	stloc 8
+// 0x0107564c: 0x107564c: jal   0x106756c addiu s8, s8, 19096
+	ldloc 14
+	ldc.i4 19096
+	add
+	stloc 14
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl85::format_RoadMapGpsPosition_string_10729fc(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_alloc_106756c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
+// --- basic block ---
+// 0x01075654: 0x1075654: addu  a0, v0, zero
+	ldloc 6
+	stloc.1
+// 0x01075658: 0x1075658: addu  a2, s7, zero
+	ldloc 8
+	stloc.3
+// 0x0107565c: 0x107565c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01075660: 0x1075660: lui   s7, 0x20000
+	ldc.i4 131072
+	stloc 8
+// 0x01075664: 0x1075664: addu  s0, v0, zero
+	ldloc 6
 	stloc 7
+// 0x01075668: 0x1075668: jal   0x100177c addiu s7, s7, -29300
+	ldloc 8
+	ldc.i4 -29300
+	add
+	stloc 8
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x010752bc: 0x10752bc: beq   s2, zero, 0x1075308 sll   zero, zero, 0
+// 0x01075670: 0x1075670: j	 0x10756ac slt   v0, s1, s5
 	ldloc 10
-	brfalse L_1075308
-// --- basic block ---
-// 0x010752c4: 0x10752c4: bne   s4, zero, 0x10752d8 sll   zero, zero, 0
-	ldloc 11
-	brtrue L_10752d8
+	ldloc 13
+	clt
+	stloc 6
+	br L_10756ac
 // --- basic block ---
-// 0x010752cc: 0x10752cc: lui   v0, 0x20000
-	ldc.i4 131072
+L_1075678:
+// 0x01075678: 0x1075678: jal   0x1001b48 addiu s1, s1, 1
+	ldloc 10
+	ldc.i4.1
+	add
+	stloc 10
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-// 0x010752d0: 0x10752d0: j	 0x10752e0 addiu v0, v0, 18636
+// --- basic block ---
+// 0x01075680: 0x1075680: lw    a2, 0(s3)
+	ldloc 5
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x01075684: 0x1075684: addu  a0, s0, v0
+	ldloc 7
 	ldloc 6
-	ldc.i4 18636
 	add
-	stloc 6
-	br L_10752e0
+	stloc.1
+// 0x01075688: 0x1075688: addu  a1, s7, zero
+	ldloc 8
+	stloc.2
+// 0x0107568c: 0x107568c: addiu s3, s3, 4
+	ldloc 12
+	ldc.i4.4
+	add
+	stloc 12
+// 0x01075690: 0x1075690: beq   s2, zero, 0x10756a0 addu  a3, s8, zero
+	ldloc 11
+	ldloc 14
+	stloc 4
+	brfalse L_10756a0
 // --- basic block ---
-L_10752d8:
-// 0x010752d8: 0x10752d8: lui   v0, 0x10000
+// 0x01075698: 0x1075698: lui   a3, 0x10000
 	ldc.i4 65536
-	stloc 6
-// 0x010752dc: 0x10752dc: addiu v0, v0, 12208
-	ldloc 6
-	ldc.i4 12208
+	stloc 4
+// 0x0107569c: 0x107569c: addiu a3, a3, 12204
+	ldloc 4
+	ldc.i4 12204
 	add
+	stloc 4
+L_10756a0:
+// 0x010756a0: 0x10756a0: jal   0x1000f64 sltiu s2, s2, 1
+	ldloc 11
+	ldc.i4.1
+	clt.un
+	stloc 11
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-L_10752e0:
-// 0x010752e0: 0x10752e0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010752e4: 0x10752e4: addu  a0, s2, zero
+// --- basic block ---
+// 0x010756a8: 0x10756a8: slt   v0, s1, s5
 	ldloc 10
+	ldloc 13
+	clt
+	stloc 6
+L_10756ac:
+// 0x010756ac: 0x10756ac: bne   v0, zero, 0x1075678 addu  a0, s0, zero
+	ldloc 6
+	ldloc 7
 	stloc.1
-// 0x010752e8: 0x10752e8: addiu a1, a1, -29632
+	brtrue L_1075678
+// --- basic block ---
+// 0x010756b4: 0x10756b4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010756b8: 0x10756b8: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x010756bc: 0x10756bc: addiu a1, a1, 32716
 	ldloc.2
-	ldc.i4 -29632
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x010752ec: 0x10752ec: addu  a3, s1, zero
-	ldloc 9
-	stloc 4
-// 0x010752f0: 0x10752f0: addiu a2, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+// 0x010756c0: 0x10756c0: addiu a3, a3, -29276
+	ldloc 4
+	ldc.i4 -29276
 	add
+	stloc 4
+// 0x010756c4: 0x10756c4: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x010756c8: 0x10756c8: addiu a2, zero, 690
+	ldc.i4 690
 	stloc.3
-// 0x010752f4: 0x10752f4: sw    s0, 16(sp)
+// 0x010756cc: 0x10756cc: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 8
-	stelem.i4
-// 0x010752f8: 0x10752f8: jal   0x1000f64 sw    v0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01075300: 0x1075300: j	 0x1075358 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-	br L_1075358
+// 0x010756d4: 0x10756d4: beq   s4, zero, 0x10756ec addu  a0, s4, zero
+	ldloc 15
+	ldloc 15
+	stloc.1
+	brfalse L_10756ec
 // --- basic block ---
-L_1075308:
-// 0x01075308: 0x1075308: bne   s4, zero, 0x1075318 lui   v0, 0x20000
-	ldloc 11
-	ldc.i4 131072
+// 0x010756dc: 0x10756dc: jal   0x1001b68 addu  a1, s0, zero
+	ldloc 7
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcpy_1001b68(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	brtrue L_1075318
 // --- basic block ---
-// 0x01075310: 0x1075310: j	 0x1075320 addiu v0, v0, 18636
-	ldloc 6
-	ldc.i4 18636
-	add
+// 0x010756e4: 0x10756e4: j	 0x1075708 addiu v0, zero, 1
+	ldc.i4.1
 	stloc 6
-	br L_1075320
+	br L_1075708
 // --- basic block ---
-L_1075318:
-// 0x01075318: 0x1075318: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 6
-// 0x0107531c: 0x107531c: addiu v0, v0, 12208
-	ldloc 6
-	ldc.i4 12208
-	add
-	stloc 6
-L_1075320:
-// 0x01075320: 0x1075320: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 7
-// 0x01075324: 0x1075324: addiu v1, v1, -29632
-	ldloc 7
-	ldc.i4 -29632
-	add
-	stloc 7
-// 0x01075328: 0x1075328: lui   a0, 0x0
+L_10756ec:
+// 0x010756ec: 0x10756ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0107532c: 0x107532c: lw    a2, 164(sp)
+// 0x010756f0: 0x10756f0: lw    a2, 2336(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4 584
 	add
 	ldelem.i4
 	stloc.3
-// 0x01075330: 0x1075330: sw    v1, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x01075334: 0x1075334: addiu a0, a0, 15252
+// 0x010756f4: 0x10756f4: addiu a0, a0, 15252
 	ldloc.1
 	ldc.i4 15252
 	add
 	stloc.1
-// 0x01075338: 0x1075338: addiu v1, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 7
-// 0x0107533c: 0x107533c: addu  a3, s3, zero
-	ldloc 12
+// 0x010756f8: 0x10756f8: addu  a3, s6, zero
+	ldloc 16
 	stloc 4
-// 0x01075340: 0x1075340: addiu a1, zero, 36
+// 0x010756fc: 0x10756fc: addiu a1, zero, 36
 	ldc.i4.s 36
 	stloc.2
-// 0x01075344: 0x1075344: sw    v1, 20(sp)
+// 0x01075700: 0x1075700: jal   0x10732fc sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
 	ldloc 7
 	stelem.i4
-// 0x01075348: 0x1075348: sw    s1, 24(sp)
-	ldloc 5
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107534c: 0x107534c: sw    s0, 28(sp)
-	ldloc 5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 6
+// --- basic block ---
+L_1075708:
+// 0x01075708: 0x1075708: addiu a0, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4.s 24
 	add
-	ldloc 8
-	stelem.i4
-// 0x01075350: 0x1075350: jal   0x1072cd8 sw    v0, 32(sp)
+	stloc.1
+// 0x0107570c: 0x107570c: jal   0x1067518 sw    v0, 2272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 568
 	add
 	ldloc 6
 	stelem.i4
@@ -1020,194 +1428,137 @@ L_1075320:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl76::ebuffer_free_1067518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 9
 	stloc 6
 // --- basic block ---
-L_1075358:
-// 0x01075358: 0x1075358: lw    ra, 140(sp)
-// 0x0107535c: 0x107535c: lw    s4, 136(sp)
+// 0x01075714: 0x1075714: lw    ra, 2316(sp)
+// 0x01075718: 0x1075718: lw    v0, 2272(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 34
+	ldc.i4 568
 	add
 	ldelem.i4
-	stloc 11
-// 0x01075360: 0x1075360: lw    s3, 132(sp)
+	stloc 6
+// 0x0107571c: 0x107571c: lw    s8, 2312(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 33
+	ldc.i4 578
 	add
 	ldelem.i4
-	stloc 12
-// 0x01075364: 0x1075364: lw    s2, 128(sp)
+	stloc 14
+// 0x01075720: 0x1075720: lw    s7, 2308(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 32
+	ldc.i4 577
 	add
 	ldelem.i4
-	stloc 10
-// 0x01075368: 0x1075368: lw    s1, 124(sp)
+	stloc 8
+// 0x01075724: 0x1075724: lw    s6, 2304(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 31
+	ldc.i4 576
 	add
 	ldelem.i4
-	stloc 9
-// 0x0107536c: 0x107536c: lw    s0, 120(sp)
+	stloc 16
+// 0x01075728: 0x1075728: lw    s5, 2300(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 30
+	ldc.i4 575
 	add
 	ldelem.i4
-	stloc 8
-// 0x01075370: 0x1075370: jr    ra addiu sp, sp, 144
+	stloc 13
+// 0x0107572c: 0x107572c: lw    s4, 2296(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4 144
+	ldc.i4.2
+	shr.un
+	ldc.i4 574
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 RTNet_Logout_1075378(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01075378: 0x1075378: addu  a3, a0, zero
-	ldloc.1
-	stloc 4
-// 0x0107537c: 0x107537c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01075380: 0x1075380: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01075384: 0x1075384: addiu sp, sp, -32
+	ldelem.i4
+	stloc 15
+// 0x01075730: 0x1075730: lw    s3, 2292(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4 573
 	add
-	stloc.0
-// 0x01075388: 0x1075388: addu  a2, a1, zero
-	ldloc.2
-	stloc.3
-// 0x0107538c: 0x107538c: addiu v0, v0, -29616
+	ldelem.i4
+	stloc 12
+// 0x01075734: 0x1075734: lw    s2, 2288(sp)
 	ldloc 5
-	ldc.i4 -29616
-	add
-	stloc 5
-// 0x01075390: 0x1075390: addiu a0, a0, 15540
-	ldloc.1
-	ldc.i4 15540
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 572
 	add
-	stloc.1
-// 0x01075394: 0x1075394: addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
-// 0x01075398: 0x1075398: sw    ra, 28(sp)
-// 0x0107539c: 0x107539c: jal   0x1072cd8 sw    v0, 16(sp)
-	ldloc 7
+	ldelem.i4
+	stloc 11
+// 0x01075738: 0x1075738: lw    s1, 2284(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 571
 	add
+	ldelem.i4
+	stloc 10
+// 0x0107573c: 0x107573c: lw    s0, 2280(sp)
 	ldloc 5
-	stelem.i4
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl86::wst_start_session_trans_1072cd8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x010753a4: 0x10753a4: lw    ra, 28(sp)
-// 0x010753a8: 0x10753a8: sll   zero, zero, 0
-// 0x010753ac: 0x10753ac: jr    ra addiu sp, sp, 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 570
+	add
+	ldelem.i4
+	stloc 7
+// 0x01075740: 0x1075740: jr    ra addiu sp, sp, 2320
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4 2320
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTNet_Login_10753b4(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_MapDisplyed_1075748(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 t0,int32 s3,int32 s1,int32 s2,int32 s4,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  6 is register v0
+// local 11 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register t0
-// local  8 is register s0
-// local 11 is register s1
-// local 12 is register s2
+// local  7 is register s0
+// local  8 is register s1
+// local  9 is register s2
 // local 10 is register s3
-// local 13 is register s4
 // local  0 is register sp
-// local 14 is register ra
-// local  6 is register mem
+// local 12 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 11
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1217,708 +1568,538 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
+	stloc 9
 	ldc.i4.s 0
 	stloc 10
-	ldc.i4.s 0
-	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010753b4: 0x10753b4: addiu sp, sp, -96
+// 0x01075748: 0x1075748: addiu sp, sp, -144
 	ldloc.0
-	ldc.i4.s -96
+	ldc.i4 -144
 	add
 	stloc.0
-// 0x010753b8: 0x10753b8: sw    s3, 84(sp)
-	ldloc 6
+// 0x0107574c: 0x107574c: sw    s2, 132(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.s 33
 	add
-	ldloc 10
+	ldloc 9
 	stelem.i4
-// 0x010753bc: 0x10753bc: sw    s2, 80(sp)
-	ldloc 6
+// 0x01075750: 0x1075750: sw    s0, 124(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 31
 	add
-	ldloc 12
+	ldloc 7
 	stelem.i4
-// 0x010753c0: 0x10753c0: sw    s1, 76(sp)
-	ldloc 6
+// 0x01075754: 0x1075754: lw    s2, 160(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.s 40
 	add
-	ldloc 11
+	ldelem.i4
+	stloc 9
+// 0x01075758: 0x1075758: addiu s0, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 7
+// 0x0107575c: 0x107575c: sw    s3, 136(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
+	add
+	ldloc 10
 	stelem.i4
-// 0x010753c4: 0x10753c4: sw    s0, 72(sp)
-	ldloc 6
+// 0x01075760: 0x1075760: addu  s3, a0, zero
+	ldloc.1
+	stloc 10
+// 0x01075764: 0x1075764: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x01075768: 0x1075768: sw    s1, 128(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 32
 	add
 	ldloc 8
 	stelem.i4
-// 0x010753c8: 0x10753c8: sw    ra, 92(sp)
-// 0x010753cc: 0x10753cc: sw    s4, 88(sp)
-	ldloc 6
+// 0x0107576c: 0x107576c: sw    ra, 140(sp)
+// 0x01075770: 0x1075770: addu  s1, a2, zero
+	ldloc.3
+	stloc 8
+// 0x01075774: 0x1075774: jal   0x1072b0c sw    a3, 112(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.s 28
 	add
-	ldloc 13
+	ldloc 4
 	stelem.i4
-// 0x010753d0: 0x10753d0: addu  s2, a1, zero
-	ldloc.2
-	stloc 12
-// 0x010753d4: 0x10753d4: addu  s0, a0, zero
+	ldloc.0
 	ldloc.1
-	stloc 8
-// 0x010753d8: 0x10753d8: addu  s1, a2, zero
-	ldloc.3
-	stloc 11
-// 0x010753dc: 0x10753dc: beq   a1, zero, 0x107540c addu  s3, a3, zero
-	ldloc.2
-	ldloc 4
-	stloc 10
-	brfalse L_107540c
-// --- basic block ---
-// 0x010753e4: 0x10753e4: lb    v0, 0(a1)
 	ldloc.2
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x010753e8: 0x10753e8: sll   zero, zero, 0
-// 0x010753ec: 0x10753ec: beq   v0, zero, 0x107540c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107540c
-// --- basic block ---
-// 0x010753f4: 0x10753f4: beq   a2, zero, 0x107540c sll   zero, zero, 0
 	ldloc.3
-	brfalse L_107540c
+	ldloc 4
+	call int32 Cibyl85::format_RoadMapArea_string_1072b0c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
+	stloc 6
 // --- basic block ---
-// 0x010753fc: 0x10753fc: lb    v0, 0(a2)
-	ldloc.3
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x01075400: 0x1075400: sll   zero, zero, 0
-// 0x01075404: 0x1075404: bne   v0, zero, 0x1075430 sll   zero, zero, 0
+// 0x0107577c: 0x107577c: lw    a2, 112(sp)
 	ldloc 5
-	brtrue L_1075430
-// --- basic block ---
-L_107540c:
-// 0x0107540c: 0x107540c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01075410: 0x1075410: lui   a3, 0x20000
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 28
+	add
+	ldelem.i4
+	stloc.3
+// 0x01075780: 0x1075780: beq   s2, zero, 0x10757a4 lui   v0, 0x20000
+	ldloc 9
 	ldc.i4 131072
-	stloc 4
-// 0x01075414: 0x1075414: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
+	stloc 6
+	brfalse L_10757a4
+// --- basic block ---
+// 0x01075788: 0x1075788: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x0107578c: 0x107578c: addiu a1, v0, -29228
+	ldloc 6
+	ldc.i4 -29228
 	add
 	stloc.2
-// 0x01075418: 0x1075418: addiu a3, a3, -29608
-	ldloc 4
-	ldc.i4 -29608
-	add
-	stloc 4
-// 0x0107541c: 0x107541c: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01075420: 0x1075420: jal   0x100449c addiu a2, zero, 394
-	ldc.i4 394
+// 0x01075790: 0x1075790: addu  a2, s0, zero
+	ldloc 7
 	stloc.3
+// 0x01075794: 0x1075794: jal   0x1000f64 addu  a3, s1, zero
+	ldloc 8
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 11
+	stloc 6
 // --- basic block ---
-// 0x01075428: 0x1075428: j	 0x1075590 addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-	br L_1075590
+// 0x0107579c: 0x107579c: j	 0x10757c8 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+	br L_10757c8
 // --- basic block ---
-L_1075430:
-// 0x01075430: 0x1075430: jal   0x1001b48 addu  a0, a1, zero
-	ldloc.2
+L_10757a4:
+// 0x010757a4: 0x10757a4: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
+// 0x010757a8: 0x10757a8: addiu v0, v0, -29228
+	ldloc 6
+	ldc.i4 -29228
+	add
+	stloc 6
+// 0x010757ac: 0x10757ac: addiu a0, a0, 15252
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01075438: 0x1075438: sltiu v0, v0, 64
-	ldloc 5
-	ldc.i4.s 64
-	clt.un
-	stloc 5
-// 0x0107543c: 0x107543c: beq   v0, zero, 0x1075458 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brfalse L_1075458
-// --- basic block ---
-// 0x01075444: 0x1075444: jal   0x1001b48 addu  a0, s1, zero
-	ldloc 11
+	ldc.i4 15252
+	add
 	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107544c: 0x107544c: sltiu v0, v0, 64
-	ldloc 5
-	ldc.i4.s 64
-	clt.un
-	stloc 5
-// 0x01075450: 0x1075450: bne   v0, zero, 0x1075484 lui   a1, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc.2
-	brtrue L_1075484
-// --- basic block ---
-L_1075458:
-// 0x01075458: 0x1075458: lui   a3, 0x20000
-	ldc.i4 131072
+// 0x010757b0: 0x10757b0: addu  a3, s3, zero
+	ldloc 10
 	stloc 4
-// 0x0107545c: 0x107545c: addiu v0, zero, 63
-	ldc.i4.s 63
-	stloc 5
-// 0x01075460: 0x1075460: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
+// 0x010757b4: 0x10757b4: addiu a1, zero, 36
+	ldc.i4.s 36
 	stloc.2
-// 0x01075464: 0x1075464: addiu a3, a3, -29552
-	ldloc 4
-	ldc.i4 -29552
-	add
-	stloc 4
-// 0x01075468: 0x1075468: addiu a0, zero, 4
+// 0x010757b8: 0x10757b8: sw    v0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
 	ldc.i4.4
-	stloc.1
-// 0x0107546c: 0x107546c: addiu a2, zero, 402
-	ldc.i4 402
-	stloc.3
-// 0x01075470: 0x1075470: sw    v0, 20(sp)
+	add
 	ldloc 6
+	stelem.i4
+// 0x010757bc: 0x10757bc: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
-// 0x01075474: 0x1075474: jal   0x100449c sw    v0, 16(sp)
-	ldloc 6
+// 0x010757c0: 0x10757c0: jal   0x10732fc sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107547c: 0x107547c: j	 0x1075590 addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-	br L_1075590
+	stloc 11
+	stloc 6
 // --- basic block ---
-L_1075484:
-// 0x01075484: 0x1075484: addu  a0, s2, zero
-	ldloc 12
-	stloc.1
-// 0x01075488: 0x1075488: addu  a1, s0, zero
-	ldloc 8
-	stloc.2
-// 0x0107548c: 0x107548c: addiu a2, zero, 63
-	ldc.i4.s 63
-	stloc.3
-// 0x01075490: 0x1075490: jal   0x1067b64 addiu s2, s0, 64
-	ldloc 8
-	ldc.i4.s 64
+L_10757c8:
+// 0x010757c8: 0x10757c8: lw    ra, 140(sp)
+// 0x010757cc: 0x10757cc: lw    s3, 136(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
 	add
-	stloc 12
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldelem.i4
+	stloc 10
+// 0x010757d0: 0x10757d0: lw    s2, 132(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 33
+	add
+	ldelem.i4
+	stloc 9
+// 0x010757d4: 0x10757d4: lw    s1, 128(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 32
+	add
+	ldelem.i4
+	stloc 8
+// 0x010757d8: 0x10757d8: lw    s0, 124(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 31
+	add
+	ldelem.i4
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01075498: 0x1075498: addu  a0, s1, zero
+// 0x010757dc: 0x10757dc: jr    ra addiu sp, sp, 144
+	ldloc.0
+	ldc.i4 144
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 11
-	stloc.1
-// 0x0107549c: 0x107549c: addu  a1, s2, zero
-	ldloc 12
-	stloc.2
-// 0x010754a0: 0x10754a0: jal   0x1067b64 addiu a2, zero, 63
-	ldc.i4.s 63
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTNet_NavigateTo_10757e4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 v1,int32 t0,int32 s1,int32 ra)
+
+// local  6 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 10 is register t0
+// local  7 is register s0
+// local 11 is register s1
+// local  8 is register s2
+// local  0 is register sp
+// local 12 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010754a8: 0x10754a8: beq   s3, zero, 0x10754d4 sll   zero, zero, 0
-	ldloc 10
-	brfalse L_10754d4
-// --- basic block ---
-// 0x010754b0: 0x10754b0: lb    v0, 0(s3)
-	ldloc 10
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x010754b4: 0x10754b4: sll   zero, zero, 0
-// 0x010754b8: 0x10754b8: beq   v0, zero, 0x10754d4 addu  a0, s3, zero
+// 0x010757e4: 0x10757e4: addiu sp, sp, -104
+	ldloc.0
+	ldc.i4.s -104
+	add
+	stloc.0
+// 0x010757e8: 0x10757e8: sw    s0, 88(sp)
 	ldloc 5
-	ldloc 10
-	stloc.1
-	brfalse L_10754d4
-// --- basic block ---
-// 0x010754c0: 0x10754c0: addiu a1, s0, 128
-	ldloc 8
-	ldc.i4 128
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
 	add
-	stloc.2
-// 0x010754c4: 0x10754c4: jal   0x1067b64 addiu a2, zero, 63
-	ldc.i4.s 63
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::PackNetworkString_1067b64(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010754cc: 0x10754cc: j	 0x10754dc lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-	br L_10754dc
-// --- basic block ---
-L_10754d4:
-// 0x010754d4: 0x10754d4: sb    zero, 128(s0)
-	ldloc 8
-	ldc.i4 128
+	ldloc 7
+	stelem.i4
+// 0x010757ec: 0x10757ec: addiu s0, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010754d8: 0x10754d8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_10754dc:
-// 0x010754dc: 0x10754dc: lw    a0, -18464(v0)
-	ldloc 6
+	stloc 7
+// 0x010757f0: 0x10757f0: sw    s2, 96(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc.1
-// 0x010754e0: 0x10754e0: jal   0x102c3f0 sw    a0, 64(sp)
-	ldloc 6
+	ldloc 8
+	stelem.i4
+// 0x010757f4: 0x10757f4: sw    s1, 92(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 23
 	add
-	ldloc.1
+	ldloc 11
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
+// 0x010757f8: 0x10757f8: addu  s2, a2, zero
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl32::roadmap_start_version_102c3f0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010754e8: 0x10754e8: jal   0x10aa9a4 addu  s4, v0, zero
+	stloc 8
+// 0x010757fc: 0x10757fc: addu  s1, a0, zero
+	ldloc.1
+	stloc 11
+// 0x01075800: 0x1075800: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x01075804: 0x1075804: sw    ra, 100(sp)
+// 0x01075808: 0x1075808: jal   0x10730b8 sw    a3, 80(sp)
 	ldloc 5
-	stloc 13
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
+	add
 	ldloc 4
-	call int32 Cibyl127::roadmap_geo_config_get_version_10aa9a4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x010754f0: 0x10754f0: jal   0x108d230 addu  s3, v0, zero
-	ldloc 5
-	stloc 10
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RTSystemMessagesGetLastMessageDisplayed_108d230(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::format_RoadMapPosition_string_10730b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 6
 // --- basic block ---
-// 0x010754f8: 0x10754f8: jal   0x101d484 addu  s1, v0, zero
+// 0x01075810: 0x1075810: lw    v0, 12(s2)
 	ldloc 5
-	stloc 11
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_system_lang_101d484(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01075500: 0x1075500: lw    t0, 112(sp)
-	ldloc 6
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 28
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 9
-// 0x01075504: 0x1075504: lw    a0, 64(sp)
-	ldloc 6
-	ldloc.0
+	stloc 6
+// 0x01075814: 0x1075814: lw    v1, 8(s2)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc.1
-// 0x01075508: 0x1075508: sw    t0, 16(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107550c: 0x107550c: lui   t0, 0x20000
-	ldc.i4 131072
-	stloc 9
-// 0x01075510: 0x1075510: addiu t0, t0, -29480
-	ldloc 9
-	ldc.i4 -29480
 	add
+	ldelem.i4
 	stloc 9
-// 0x01075514: 0x1075514: sw    t0, 24(sp)
-	ldloc 6
+// 0x01075818: 0x1075818: lw    a2, 80(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 20
 	add
-	ldloc 9
-	stelem.i4
-// 0x01075518: 0x1075518: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107551c: 0x107551c: addiu t0, zero, 140
-	ldc.i4 140
-	stloc 9
-// 0x01075520: 0x1075520: lui   a2, 0x0
-	ldc.i4.s 0
+	ldelem.i4
 	stloc.3
-// 0x01075524: 0x1075524: addiu v1, s0, 128
-	ldloc 8
-	ldc.i4 128
-	add
-	stloc 7
-// 0x01075528: 0x1075528: sw    t0, 28(sp)
-	ldloc 6
+// 0x0107581c: 0x107581c: sw    v0, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
-	ldloc 9
+	ldloc 6
 	stelem.i4
-// 0x0107552c: 0x107552c: addiu a1, a1, 972
-	ldloc.2
-	ldc.i4 972
-	add
-	stloc.2
-// 0x01075530: 0x1075530: addiu t0, zero, 70
-	ldc.i4.s 70
-	stloc 9
-// 0x01075534: 0x1075534: addiu a2, a2, 15548
-	ldloc.3
-	ldc.i4 15548
-	add
-	stloc.3
-// 0x01075538: 0x1075538: addiu a3, zero, 7
-	ldc.i4.7
+// 0x01075820: 0x1075820: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01075824: 0x1075824: lui   t0, 0x20000
+	ldc.i4 131072
+	stloc 10
+// 0x01075828: 0x1075828: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x0107582c: 0x107582c: addu  a3, s1, zero
+	ldloc 11
 	stloc 4
-// 0x0107553c: 0x107553c: sw    v1, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+// 0x01075830: 0x1075830: addiu t0, t0, -29208
+	ldloc 10
+	ldc.i4 -29208
 	add
-	ldloc 7
-	stelem.i4
-// 0x01075540: 0x1075540: sw    s2, 36(sp)
+	stloc 10
+// 0x01075834: 0x1075834: addiu v0, v0, 18768
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4 18768
 	add
-	ldloc 12
-	stelem.i4
-// 0x01075544: 0x1075544: sw    t0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	stloc 6
+// 0x01075838: 0x1075838: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
 	add
-	ldloc 9
-	stelem.i4
-// 0x01075548: 0x1075548: sw    s4, 44(sp)
-	ldloc 6
+	stloc.1
+// 0x0107583c: 0x107583c: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01075840: 0x1075840: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.5
 	add
-	ldloc 13
+	ldloc 7
 	stelem.i4
-// 0x0107554c: 0x107554c: sw    s3, 52(sp)
-	ldloc 6
+// 0x01075844: 0x1075844: sw    t0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.4
 	add
 	ldloc 10
 	stelem.i4
-// 0x01075550: 0x1075550: sw    s1, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 11
-	stelem.i4
-// 0x01075554: 0x1075554: sw    v0, 60(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
-	add
+// 0x01075848: 0x1075848: sw    v1, 24(sp)
 	ldloc 5
-	stelem.i4
-// 0x01075558: 0x1075558: sw    s0, 20(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x0107555c: 0x107555c: jal   0x1069ec8 sw    s0, 32(sp)
-	ldloc 6
+// 0x0107584c: 0x107584c: jal   0x10732fc sw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl78::wst_start_trans_1069ec8(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 6
 // --- basic block ---
-// 0x01075564: 0x1075564: bne   v0, zero, 0x1075590 addiu v1, zero, 1
+// 0x01075854: 0x1075854: lw    ra, 100(sp)
+// 0x01075858: 0x1075858: lw    s2, 96(sp)
 	ldloc 5
-	ldc.i4.1
-	stloc 7
-	brtrue L_1075590
-// --- basic block ---
-// 0x0107556c: 0x107556c: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x01075570: 0x1075570: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01075574: 0x1075574: jal   0x100177c addiu a2, zero, 64
-	ldc.i4.s 64
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107557c: 0x107557c: addiu a0, s0, 64
-	ldloc 8
-	ldc.i4.s 64
-	add
-	stloc.1
-// 0x01075580: 0x1075580: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01075584: 0x1075584: jal   0x100177c addiu a2, zero, 64
-	ldc.i4.s 64
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107558c: 0x107558c: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-L_1075590:
-// 0x01075590: 0x1075590: lw    ra, 92(sp)
-// 0x01075594: 0x1075594: addu  v0, v1, zero
-	ldloc 7
-	stloc 5
-// 0x01075598: 0x1075598: lw    s4, 88(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107559c: 0x107559c: lw    s3, 84(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc 10
-// 0x010755a0: 0x10755a0: lw    s2, 80(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 24
 	add
 	ldelem.i4
-	stloc 12
-// 0x010755a4: 0x10755a4: lw    s1, 76(sp)
-	ldloc 6
+	stloc 8
+// 0x0107585c: 0x107585c: lw    s1, 92(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.s 23
 	add
 	ldelem.i4
 	stloc 11
-// 0x010755a8: 0x10755a8: lw    s0, 72(sp)
-	ldloc 6
+// 0x01075860: 0x1075860: lw    s0, 88(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc 8
-// 0x010755ac: 0x10755ac: jr    ra addiu sp, sp, 96
+	stloc 7
+// 0x01075864: 0x1075864: jr    ra addiu sp, sp, 104
 	ldloc.0
-	ldc.i4.s 96
+	ldc.i4.s 104
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTNet_LoadParams_10755b4(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_KeepAlive_107586c(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s0,int32 s1,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
-// local  6 is register v0
+// local  5 is register v0
 // local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local 10 is register s1
-// local  7 is register s2
 // local  0 is register sp
-// local 11 is register ra
-// local  5 is register mem
+// local  6 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
 	stloc 8
 	ldarg 1
@@ -1929,276 +2110,102 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 6
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010755b4: 0x10755b4: addiu sp, sp, -40
+// 0x0107586c: 0x107586c: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x01075870: 0x1075870: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01075874: 0x1075874: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01075878: 0x1075878: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010755b8: 0x10755b8: sw    s1, 28(sp)
+// 0x0107587c: 0x107587c: addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+// 0x01075880: 0x1075880: addiu v0, v0, -29180
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldc.i4 -29180
 	add
-	ldloc 10
-	stelem.i4
-// 0x010755bc: 0x10755bc: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 10
-// 0x010755c0: 0x10755c0: lw    v1, -18460(s1)
-	ldloc 5
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4615
-	add
-	ldelem.i4
-	stloc 8
-// 0x010755c4: 0x10755c4: sw    ra, 36(sp)
-// 0x010755c8: 0x10755c8: sw    s2, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 7
-	stelem.i4
-// 0x010755cc: 0x10755cc: sw    s0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x010755d0: 0x10755d0: bne   v1, zero, 0x1075654 addiu v0, zero, 1
-	ldloc 8
-	ldc.i4.1
-	stloc 6
-	brtrue L_1075654
-// --- basic block ---
-// 0x010755d8: 0x10755d8: jal   0x106ac28 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::RT_GetWebServiceAddress_106ac28(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x010755e0: 0x10755e0: lui   a1, 0x80000
-	ldc.i4 524288
-	stloc.2
-// 0x010755e4: 0x10755e4: lui   a2, 0x80000
-	ldc.i4 524288
-	stloc.3
-// 0x010755e8: 0x10755e8: lui   a3, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x010755ec: 0x10755ec: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x010755f0: 0x10755f0: addiu a1, a1, -17860
-	ldloc.2
-	ldc.i4 -17860
-	add
-	stloc.2
-// 0x010755f4: 0x10755f4: addiu a2, a2, -17276
-	ldloc.3
-	ldc.i4 -17276
-	add
-	stloc.3
-// 0x010755f8: 0x10755f8: addiu a3, a3, -17792
-	ldloc 4
-	ldc.i4 -17792
-	add
-	stloc 4
-// 0x010755fc: 0x10755fc: jal   0x1068a88 addu  s0, v0, zero
-	ldloc 6
-	stloc 9
-	ldloc.0
+	stloc 5
+// 0x01075884: 0x1075884: addiu a0, a0, 15252
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl77::WSA_ExtractParams_1068a88(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x01075604: 0x1075604: bne   v0, zero, 0x1075634 lui   s2, 0x80000
-	ldloc 6
-	ldc.i4 524288
-	stloc 7
-	brtrue L_1075634
-// --- basic block ---
-// 0x0107560c: 0x107560c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01075610: 0x1075610: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01075614: 0x1075614: addiu a1, a1, 32252
-	ldloc.2
-	ldc.i4 32252
-	add
-	stloc.2
-// 0x01075618: 0x1075618: addiu a3, a3, -29444
-	ldloc 4
-	ldc.i4 -29444
+	ldc.i4 15252
 	add
-	stloc 4
-// 0x0107561c: 0x107561c: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x01075620: 0x1075620: addiu a2, zero, 367
-	ldc.i4 367
-	stloc.3
-// 0x01075624: 0x1075624: jal   0x100449c sw    s0, 16(sp)
-	ldloc 5
+// 0x01075888: 0x1075888: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x0107588c: 0x107588c: sw    ra, 28(sp)
+// 0x01075890: 0x1075890: jal   0x10732fc sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 9
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0107562c: 0x107562c: j	 0x1075654 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_1075654
-// --- basic block ---
-L_1075634:
-// 0x01075634: 0x1075634: addiu a0, s2, -18456
-	ldloc 7
-	ldc.i4 -18456
-	add
-	stloc.1
-// 0x01075638: 0x1075638: addu  a1, s0, zero
-	ldloc 9
-	stloc.2
-// 0x0107563c: 0x107563c: jal   0x1001af8 addiu a2, zero, 596
-	ldc.i4 596
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
-	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01075644: 0x1075644: addiu s2, s2, -18456
-	ldloc 7
-	ldc.i4 -18456
-	add
-	stloc 7
-// 0x01075648: 0x1075648: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0107564c: 0x107564c: sw    v0, -18460(s1)
-	ldloc 5
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4615
-	add
-	ldloc 6
-	stelem.i4
-// 0x01075650: 0x1075650: sb    zero, 595(s2)
-	ldloc 7
-	ldc.i4 595
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-L_1075654:
-// 0x01075654: 0x1075654: lw    ra, 36(sp)
-// 0x01075658: 0x1075658: lw    s2, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 7
-// 0x0107565c: 0x107565c: lw    s1, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 10
-// 0x01075660: 0x1075660: lw    s0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 9
-// 0x01075664: 0x1075664: jr    ra addiu sp, sp, 40
+// 0x01075898: 0x1075898: lw    ra, 28(sp)
+// 0x0107589c: 0x107589c: sll   zero, zero, 0
+// 0x010758a0: 0x10758a0: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTNet_Term_107566c(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_At_10758a8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 s3,int32 ra)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  6 is register s0
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 12 is register s3
+// local 11 is register s4
 // local  0 is register sp
-// local  7 is register ra
+// local 13 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2208,2150 +2215,729 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107566c: 0x107566c: addiu sp, sp, -24
+// 0x010758a8: 0x10758a8: addiu sp, sp, -144
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4 -144
 	add
 	stloc.0
-// 0x01075670: 0x1075670: sw    s0, 16(sp)
+// 0x010758ac: 0x10758ac: sw    s2, 128(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 32
 	add
-	ldloc 6
+	ldloc 10
 	stelem.i4
-// 0x01075674: 0x1075674: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x01075678: 0x1075678: lw    a0, -18464(s0)
+// 0x010758b0: 0x10758b0: lw    s2, 168(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4.s 42
 	add
 	ldelem.i4
-	stloc.1
-// 0x0107567c: 0x107567c: sll   zero, zero, 0
-// 0x01075680: 0x1075680: beq   a0, zero, 0x1075694 sw    ra, 20(sp)
-	ldloc.1
-	brfalse L_1075694
-// --- basic block ---
-// 0x01075688: 0x1075688: jal   0x106a494 sll   zero, zero, 0
+	stloc 10
+// 0x010758b4: 0x10758b4: sw    s3, 132(sp)
+	ldloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 33
+	add
+	ldloc 12
+	stelem.i4
+// 0x010758b8: 0x10758b8: addu  s3, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::wst_term_106a494(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x01075690: 0x1075690: sw    zero, -18464(s0)
+	stloc 12
+// 0x010758bc: 0x10758bc: addiu a0, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.1
+// 0x010758c0: 0x10758c0: sw    s4, 136(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4616
+	ldc.i4.s 34
 	add
-	ldc.i4.s 0
+	ldloc 11
 	stelem.i4
-L_1075694:
-// 0x01075694: 0x1075694: lw    ra, 20(sp)
-// 0x01075698: 0x1075698: lw    s0, 16(sp)
+// 0x010758c4: 0x10758c4: sw    s1, 124(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 31
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107569c: 0x107569c: jr    ra addiu sp, sp, 24
+	ldloc 9
+	stelem.i4
+// 0x010758c8: 0x10758c8: sw    s0, 120(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 30
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 8
-	ret
-}
-.method public static int32 RTNet_Init_10756a4(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010756a4: 0x10756a4: addiu sp, sp, -24
+	stelem.i4
+// 0x010758cc: 0x10758cc: sw    ra, 140(sp)
+// 0x010758d0: 0x10758d0: addu  s1, a2, zero
+	ldloc.3
+	stloc 9
+// 0x010758d4: 0x10758d4: lw    s4, 160(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 40
 	add
-	stloc.0
-// 0x010756a8: 0x10756a8: sw    ra, 20(sp)
-// 0x010756ac: 0x10756ac: jal   0x10755b4 sll   zero, zero, 0
+	ldelem.i4
+	stloc 11
+// 0x010758d8: 0x10758d8: jal   0x1073020 addu  s0, a3, zero
+	ldloc 4
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RTNet_LoadParams_10755b4(int32,int32,int32,int32,int32)
+	call int32 Cibyl86::format_RoadMapGpsPosition_string_1073020(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x010756b4: 0x10756b4: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x010756b8: 0x10756b8: lui   a1, 0x20000
+// 0x010758e0: 0x10758e0: beq   s2, zero, 0x107592c sll   zero, zero, 0
+	ldloc 10
+	brfalse L_107592c
+// --- basic block ---
+// 0x010758e8: 0x10758e8: bne   s4, zero, 0x10758fc sll   zero, zero, 0
+	ldloc 11
+	brtrue L_10758fc
+// --- basic block ---
+// 0x010758f0: 0x10758f0: lui   v0, 0x20000
 	ldc.i4 131072
-	stloc.2
-// 0x010756bc: 0x10756bc: addiu a0, a0, -18456
-	ldloc.1
-	ldc.i4 -18456
-	add
-	stloc.1
-// 0x010756c0: 0x10756c0: jal   0x106a1ac addiu a1, a1, -29388
-	ldloc.2
-	ldc.i4 -29388
+	stloc 6
+// 0x010758f4: 0x10758f4: j	 0x1075904 addiu v0, v0, 19096
+	ldloc 6
+	ldc.i4 19096
 	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::wst_init_106a1ac(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 5
+	br L_1075904
 // --- basic block ---
-// 0x010756c8: 0x10756c8: lw    ra, 20(sp)
-// 0x010756cc: 0x10756cc: lui   v1, 0x80000
-	ldc.i4 524288
+L_10758fc:
+// 0x010758fc: 0x10758fc: lui   v0, 0x10000
+	ldc.i4 65536
 	stloc 6
-// 0x010756d0: 0x10756d0: sw    v0, -18464(v1)
-	ldloc 8
+// 0x01075900: 0x1075900: addiu v0, v0, 12204
 	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4616
-	add
-	ldloc 5
-	stelem.i4
-// 0x010756d4: 0x10756d4: addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+	ldc.i4 12204
 	add
-	stloc.0
-// 0x010756d8: 0x10756d8: jr    ra sltu  v0, zero, v0
-	ldc.i4.s 0
-	ldloc 5
-	clt.un
-	stloc 5
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RealtimeBonus_Record_Init_10756e8(int32)
-{
-.maxstack 10
-.locals init (int32 a0,int32[] mem,int32 v0,int32 ra)
-
-// local  2 is register v0
-// local  0 is register a0
-// local  3 is register ra
-// local  1 is register mem
-
-	ldc.i4.s 0
+	stloc 6
+L_1075904:
+// 0x01075904: 0x1075904: lui   a1, 0x20000
+	ldc.i4 131072
 	stloc.2
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc.3
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x01075908: 0x1075908: addu  a0, s2, zero
+	ldloc 10
 	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010756e8: 0x10756e8: addiu v0, zero, -1
-	ldc.i4.m1
+// 0x0107590c: 0x107590c: addiu a1, a1, -29168
+	ldloc.2
+	ldc.i4 -29168
+	add
 	stloc.2
-// 0x010756ec: 0x10756ec: sw    v0, 72(a0)
-	ldloc 1
+// 0x01075910: 0x1075910: addu  a3, s1, zero
+	ldloc 9
+	stloc 4
+// 0x01075914: 0x1075914: addiu a2, sp, 40
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 40
 	add
-	ldloc.2
-	stelem.i4
-// 0x010756f0: 0x10756f0: sw    zero, 84(a0)
-	ldloc 1
+	stloc.3
+// 0x01075918: 0x1075918: sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.4
 	add
-	ldc.i4.s 0
+	ldloc 8
 	stelem.i4
-// 0x010756f4: 0x10756f4: sw    v0, 0(a0)
-	ldloc 1
+// 0x0107591c: 0x107591c: jal   0x1000f64 sw    v0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldloc.2
+	ldc.i4.5
+	add
+	ldloc 6
 	stelem.i4
-// 0x010756f8: 0x10756f8: sw    zero, 4(a0)
-	ldloc 1
 	ldloc.0
-	ldc.i4.2
-	shr.un
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x01075924: 0x1075924: j	 0x107597c addiu v0, zero, 1
 	ldc.i4.1
+	stloc 6
+	br L_107597c
+// --- basic block ---
+L_107592c:
+// 0x0107592c: 0x107592c: bne   s4, zero, 0x107593c lui   v0, 0x20000
+	ldloc 11
+	ldc.i4 131072
+	stloc 6
+	brtrue L_107593c
+// --- basic block ---
+// 0x01075934: 0x1075934: j	 0x1075944 addiu v0, v0, 19096
+	ldloc 6
+	ldc.i4 19096
+	add
+	stloc 6
+	br L_1075944
+// --- basic block ---
+L_107593c:
+// 0x0107593c: 0x107593c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 6
+// 0x01075940: 0x1075940: addiu v0, v0, 12204
+	ldloc 6
+	ldc.i4 12204
+	add
+	stloc 6
+L_1075944:
+// 0x01075944: 0x1075944: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 7
+// 0x01075948: 0x1075948: addiu v1, v1, -29168
+	ldloc 7
+	ldc.i4 -29168
 	add
+	stloc 7
+// 0x0107594c: 0x107594c: lui   a0, 0x0
 	ldc.i4.s 0
-	stelem.i4
-// 0x010756fc: 0x10756fc: sw    v0, 8(a0)
-	ldloc 1
+	stloc.1
+// 0x01075950: 0x1075950: lw    a2, 164(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.s 41
 	add
-	ldloc.2
-	stelem.i4
-// 0x01075700: 0x1075700: sw    v0, 24(a0)
-	ldloc 1
+	ldelem.i4
+	stloc.3
+// 0x01075954: 0x1075954: sw    v1, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc.2
+	ldloc 7
 	stelem.i4
-// 0x01075704: 0x1075704: sw    v0, 20(a0)
-	ldloc 1
+// 0x01075958: 0x1075958: addiu a0, a0, 15252
+	ldloc.1
+	ldc.i4 15252
+	add
+	stloc.1
+// 0x0107595c: 0x107595c: addiu v1, sp, 40
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4.s 40
 	add
-	ldloc.2
-	stelem.i4
-// 0x01075708: 0x1075708: sw    zero, 16(a0)
-	ldloc 1
+	stloc 7
+// 0x01075960: 0x1075960: addu  a3, s3, zero
+	ldloc 12
+	stloc 4
+// 0x01075964: 0x1075964: addiu a1, zero, 36
+	ldc.i4.s 36
+	stloc.2
+// 0x01075968: 0x1075968: sw    v1, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldc.i4.s 0
+	ldloc 7
 	stelem.i4
-// 0x0107570c: 0x107570c: sw    zero, 12(a0)
-	ldloc 1
+// 0x0107596c: 0x107596c: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.6
 	add
-	ldc.i4.s 0
+	ldloc 9
 	stelem.i4
-// 0x01075710: 0x1075710: sw    zero, 28(a0)
-	ldloc 1
+// 0x01075970: 0x1075970: sw    s0, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
-	ldc.i4.s 0
+	ldloc 8
 	stelem.i4
-// 0x01075714: 0x1075714: sb    zero, 32(a0)
-	ldloc.0
-	ldc.i4.s 32
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01075718: 0x1075718: sw    zero, 64(a0)
-	ldloc 1
+// 0x01075974: 0x1075974: jal   0x10732fc sw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc 6
 	stelem.i4
-// 0x0107571c: 0x107571c: sw    zero, 88(a0)
-	ldloc 1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+L_107597c:
+// 0x0107597c: 0x107597c: lw    ra, 140(sp)
+// 0x01075980: 0x1075980: lw    s4, 136(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.s 34
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01075720: 0x1075720: sw    v0, 76(a0)
-	ldloc 1
+	ldelem.i4
+	stloc 11
+// 0x01075984: 0x1075984: lw    s3, 132(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 19
+	ldc.i4.s 33
 	add
-	ldloc.2
-	stelem.i4
-// 0x01075724: 0x1075724: sw    v0, 68(a0)
-	ldloc 1
+	ldelem.i4
+	stloc 12
+// 0x01075988: 0x1075988: lw    s2, 128(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.s 32
 	add
-	ldloc.2
-	stelem.i4
-// 0x01075728: 0x1075728: sw    zero, 80(a0)
-	ldloc 1
+	ldelem.i4
+	stloc 10
+// 0x0107598c: 0x107598c: lw    s1, 124(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.s 31
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107572c: 0x107572c: sw    zero, 92(a0)
-	ldloc 1
+	ldelem.i4
+	stloc 9
+// 0x01075990: 0x1075990: lw    s0, 120(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.s 30
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01075730: 0x1075730: sw    zero, 96(a0)
-	ldloc 1
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01075734: 0x1075734: jr    ra sw    zero, 100(a0)
-	ldloc 1
+	ldelem.i4
+	stloc 8
+// 0x01075994: 0x1075994: jr    ra addiu sp, sp, 144
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
+	ldc.i4 144
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.2
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
-.method public static int32 RealtimeBonus_Count_107573c()
+.method public static int32 RTNet_Logout_107599c(int32,int32,int32,int32,int32)
 {
-.maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc.0
+	stloc 5
 	ldc.i4.s 0
-	stloc.1
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.2
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_107573c:
-// 0x0107573c: 0x107573c: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x0107599c: 0x107599c: addu  a3, a0, zero
+	ldloc.1
+	stloc 4
+// 0x010759a0: 0x10759a0: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x010759a4: 0x10759a4: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010759a8: 0x10759a8: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
 	stloc.0
-// 0x01075740: 0x1075740: lw    v0, -16252(v0)
-	ldloc 2
+// 0x010759ac: 0x10759ac: addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+// 0x010759b0: 0x10759b0: addiu v0, v0, -29152
+	ldloc 5
+	ldc.i4 -29152
+	add
+	stloc 5
+// 0x010759b4: 0x10759b4: addiu a0, a0, 15540
+	ldloc.1
+	ldc.i4 15540
+	add
+	stloc.1
+// 0x010759b8: 0x10759b8: addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
+// 0x010759bc: 0x10759bc: sw    ra, 28(sp)
+// 0x010759c0: 0x10759c0: jal   0x10732fc sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4063
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl86::wst_start_session_trans_10732fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x010759c8: 0x10759c8: lw    ra, 28(sp)
+// 0x010759cc: 0x10759cc: sll   zero, zero, 0
+// 0x010759d0: 0x10759d0: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	ldelem.i4
 	stloc.0
-// 0x01075744: 0x1075744: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.0
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 RealtimeBonus_Check_Same_Street_1075844()
+.method public static int32 RTNet_Login_10759d8(int32,int32,int32,int32,int32)
 {
-.maxstack 4
-.locals init (int32 v0,int32 ra)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 t0,int32 s3,int32 s1,int32 s2,int32 s4,int32 ra)
 
-// local  0 is register v0
-// local  1 is register ra
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register t0
+// local  8 is register s0
+// local 11 is register s1
+// local 12 is register s2
+// local 10 is register s3
+// local 13 is register s4
+// local  0 is register sp
+// local 14 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.0
+	stloc 5
 	ldc.i4.s 0
-	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1075844:
-// 0x01075844: 0x1075844: jr    ra addu  v0, zero, zero
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RealtimeBonus_is_square_dependent_107584c()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
+	stloc 9
 	ldc.i4.s 0
-	stloc.0
+	stloc 8
 	ldc.i4.s 0
-	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107584c:
-// 0x0107584c: 0x107584c: jr    ra addu  v0, zero, zero
+	stloc 11
 	ldc.i4.s 0
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RealtimeBonus_get_location_info_1075854(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
-
-// local  1 is register v0
-// local  2 is register v1
-// local  0 is register a0
-// local  3 is register ra
-// local  4 is register mem
-
+	stloc 12
 	ldc.i4.s 0
-	stloc.1
+	stloc 10
 	ldc.i4.s 0
-	stloc.2
+	stloc 13
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc.3
+	stloc 14
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 4
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1075854:
-// 0x01075854: 0x1075854: slti  v0, a0, 250
+// 0x010759d8: 0x10759d8: addiu sp, sp, -96
 	ldloc.0
-	ldc.i4 250
-	clt
-	stloc.1
-// 0x01075858: 0x1075858: beq   v0, zero, 0x107587c sll   a0, a0, 2
-	ldloc.1
+	ldc.i4.s -96
+	add
+	stloc.0
+// 0x010759dc: 0x10759dc: sw    s3, 84(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
-	shl
-	stloc.0
-	brfalse L_107587c
-// --- basic block ---
-// 0x01075860: 0x1075860: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x01075864: 0x1075864: addiu v0, v0, -17252
-	ldloc.1
-	ldc.i4 -17252
+	shr.un
+	ldc.i4.s 21
 	add
-	stloc.1
-// 0x01075868: 0x1075868: addu  a0, a0, v0
+	ldloc 10
+	stelem.i4
+// 0x010759e0: 0x10759e0: sw    s2, 80(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
 	add
-	stloc.0
-// 0x0107586c: 0x107586c: lw    v1, 0(a0)
-	ldloc 4
+	ldloc 12
+	stelem.i4
+// 0x010759e4: 0x10759e4: sw    s1, 76(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01075870: 0x1075870: sll   zero, zero, 0
-// 0x01075874: 0x1075874: bne   v1, zero, 0x1075880 addiu v0, v1, 68
+	ldc.i4.s 19
+	add
+	ldloc 11
+	stelem.i4
+// 0x010759e8: 0x10759e8: sw    s0, 72(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldloc 8
+	stelem.i4
+// 0x010759ec: 0x10759ec: sw    ra, 92(sp)
+// 0x010759f0: 0x10759f0: sw    s4, 88(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
+	add
+	ldloc 13
+	stelem.i4
+// 0x010759f4: 0x10759f4: addu  s2, a1, zero
 	ldloc.2
+	stloc 12
+// 0x010759f8: 0x10759f8: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x010759fc: 0x10759fc: addu  s1, a2, zero
+	ldloc.3
+	stloc 11
+// 0x01075a00: 0x1075a00: beq   a1, zero, 0x1075a30 addu  s3, a3, zero
 	ldloc.2
-	ldc.i4.s 68
-	add
-	stloc.1
-	brtrue L_1075880
+	ldloc 4
+	stloc 10
+	brfalse L_1075a30
 // --- basic block ---
-L_107587c:
-// 0x0107587c: 0x107587c: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-L_1075880:
-// 0x01075880: 0x1075880: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01075a08: 0x1075a08: lb    v0, 0(a1)
 	ldloc.2
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.1
-	ret
-}
-.method public static int32 RealtimeBonus_get_priority_1075888()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1075888:
-// 0x01075888: 0x1075888: jr    ra addiu v0, zero, 3
-	ldc.i4.3
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RealtimeBonus_Get_Speed_1075890()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1075890:
-// 0x01075890: 0x1075890: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RealtimeBonus_Get_Id_1075898(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
-
-// local  1 is register v0
-// local  0 is register a0
-// local  2 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
-	stloc.1
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc.2
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1075898:
-// 0x01075898: 0x1075898: slti  v0, a0, 250
-	ldloc.0
-	ldc.i4 250
-	clt
-	stloc.1
-// 0x0107589c: 0x107589c: beq   v0, zero, 0x10758cc sll   a0, a0, 2
-	ldloc.1
-	ldloc.0
-	ldc.i4.2
-	shl
-	stloc.0
-	brfalse L_10758cc
-// --- basic block ---
-// 0x010758a4: 0x10758a4: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x010758a8: 0x10758a8: addiu v0, v0, -17252
-	ldloc.1
-	ldc.i4 -17252
-	add
-	stloc.1
-// 0x010758ac: 0x10758ac: addu  a0, a0, v0
-	ldloc.0
-	ldloc.1
-	add
-	stloc.0
-// 0x010758b0: 0x10758b0: lw    v0, 0(a0)
-	ldloc 3
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x010758b4: 0x10758b4: sll   zero, zero, 0
-// 0x010758b8: 0x10758b8: beq   v0, zero, 0x10758cc sll   zero, zero, 0
-	ldloc.1
-	brfalse L_10758cc
-// --- basic block ---
-// 0x010758c0: 0x10758c0: lw    v0, 0(v0)
-	ldloc 3
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x010758c4: 0x10758c4: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-// --- basic block ---
-L_10758cc:
-// 0x010758cc: 0x10758cc: jr    ra addiu v0, zero, -1
-	ldc.i4.m1
-	stloc.1
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.1
-	ret
-}
-.method public static int32 RealtimeBonus_Get_Position_10758d4(int32,int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  3 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  6 is register ra
-// local  4 is register mem
-
-	ldc.i4.s 0
-	stloc.3
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 4
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_10758d4:
-// 0x010758d4: 0x10758d4: slti  v0, a0, 250
-	ldloc.0
-	ldc.i4 250
-	clt
-	stloc.3
-// 0x010758d8: 0x10758d8: beq   v0, zero, 0x107591c lui   v0, 0x80000
-	ldloc.3
-	ldc.i4 524288
-	stloc.3
-	brfalse L_107591c
-// --- basic block ---
-// 0x010758e0: 0x10758e0: addiu v0, v0, -17252
-	ldloc.3
-	ldc.i4 -17252
-	add
-	stloc.3
-// 0x010758e4: 0x10758e4: sll   a0, a0, 2
-	ldloc.0
-	ldc.i4.2
-	shl
-	stloc.0
-// 0x010758e8: 0x10758e8: addu  a0, a0, v0
-	ldloc.0
-	ldloc.3
-	add
-	stloc.0
-// 0x010758ec: 0x10758ec: lw    v0, 0(a0)
-	ldloc 4
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.3
-// 0x010758f0: 0x10758f0: sll   zero, zero, 0
-// 0x010758f4: 0x10758f4: beq   v0, zero, 0x107591c sll   zero, zero, 0
-	ldloc.3
-	brfalse L_107591c
-// --- basic block ---
-// 0x010758fc: 0x10758fc: beq   a1, zero, 0x107591c sll   zero, zero, 0
-	ldloc.1
-	brfalse L_107591c
-// --- basic block ---
-// 0x01075904: 0x1075904: lw    v1, 24(v0)
-	ldloc 4
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 5
-// 0x01075908: 0x1075908: lw    v0, 20(v0)
-	ldloc 4
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107590c: 0x107590c: sw    v1, 4(a1)
-	ldloc 4
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldloc 5
-	stelem.i4
-// 0x01075910: 0x1075910: beq   a2, zero, 0x107591c sw    v0, 0(a1)
-	ldloc.2
-	ldloc 4
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldloc.3
-	stelem.i4
-	brfalse L_107591c
-// --- basic block ---
-// 0x01075918: 0x1075918: sw    zero, 0(a2)
-	ldloc 4
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-L_107591c:
-// 0x0107591c: 0x107591c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.3
-	ret
-}
-.method public static int32 RealtimeBonus_Get_Distance_1075a44(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
-
-// local  1 is register v0
-// local  0 is register a0
-// local  2 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
-	stloc.1
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc.2
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1075a44:
-// 0x01075a44: 0x1075a44: slti  v0, a0, 250
-	ldloc.0
-	ldc.i4 250
-	clt
-	stloc.1
-// 0x01075a48: 0x1075a48: beq   v0, zero, 0x1075a78 sll   a0, a0, 2
-	ldloc.1
-	ldloc.0
-	ldc.i4.2
-	shl
-	stloc.0
-	brfalse L_1075a78
-// --- basic block ---
-// 0x01075a50: 0x1075a50: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x01075a54: 0x1075a54: addiu v0, v0, -17252
-	ldloc.1
-	ldc.i4 -17252
-	add
-	stloc.1
-// 0x01075a58: 0x1075a58: addu  a0, a0, v0
-	ldloc.0
-	ldloc.1
-	add
-	stloc.0
-// 0x01075a5c: 0x1075a5c: lw    v0, 0(a0)
-	ldloc 3
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01075a60: 0x1075a60: sll   zero, zero, 0
-// 0x01075a64: 0x1075a64: beq   v0, zero, 0x1075a78 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1075a78
-// --- basic block ---
-// 0x01075a6c: 0x1075a6c: lw    v0, 12(v0)
-	ldloc 3
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc.1
-// 0x01075a70: 0x1075a70: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-// --- basic block ---
-L_1075a78:
-// 0x01075a78: 0x1075a78: jr    ra addiu v0, zero, -1
-	ldc.i4.m1
-	stloc.1
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.1
-	ret
-}
-.method public static int32 RealtimeBonus_Is_Alertable_1075ae0(int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  1 is register v0
-// local  2 is register v1
-// local  0 is register a0
-// local  4 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
-	stloc.1
-	ldc.i4.s 0
-	stloc.2
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 4
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1075ae0:
-// 0x01075ae0: 0x1075ae0: slti  v0, a0, 250
-	ldloc.0
-	ldc.i4 250
-	clt
-	stloc.1
-// 0x01075ae4: 0x1075ae4: beq   v0, zero, 0x1075b2c addu  v0, zero, zero
-	ldloc.1
-	ldc.i4.s 0
-	stloc.1
-	brfalse L_1075b2c
-// --- basic block ---
-// 0x01075aec: 0x1075aec: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x01075af0: 0x1075af0: sll   a0, a0, 2
-	ldloc.0
-	ldc.i4.2
-	shl
-	stloc.0
-// 0x01075af4: 0x1075af4: addiu v0, v0, -17252
-	ldloc.1
-	ldc.i4 -17252
-	add
-	stloc.1
-// 0x01075af8: 0x1075af8: addu  a0, a0, v0
-	ldloc.0
-	ldloc.1
-	add
-	stloc.0
-// 0x01075afc: 0x1075afc: lw    v1, 0(a0)
-	ldloc 3
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01075b00: 0x1075b00: sll   zero, zero, 0
-// 0x01075b04: 0x1075b04: beq   v1, zero, 0x1075b28 sll   zero, zero, 0
-	ldloc.2
-	brfalse L_1075b28
-// --- basic block ---
-// 0x01075b0c: 0x1075b0c: lw    a0, 84(v1)
-	ldloc 3
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc.0
-// 0x01075b10: 0x1075b10: sll   zero, zero, 0
-// 0x01075b14: 0x1075b14: beq   a0, zero, 0x1075b2c addiu v0, zero, 1
-	ldloc.0
-	ldc.i4.1
-	stloc.1
-	brfalse L_1075b2c
-// --- basic block ---
-// 0x01075b1c: 0x1075b1c: lw    v0, 88(v1)
-	ldloc 3
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc.1
-// 0x01075b20: 0x1075b20: jr    ra sltu  v0, zero, v0
-	ldc.i4.s 0
-	ldloc.1
-	clt.un
-	stloc.1
-	br __CIBYL_function_return
-// --- basic block ---
-L_1075b28:
-// 0x01075b28: 0x1075b28: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-L_1075b2c:
-// 0x01075b2c: 0x1075b2c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.2
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.1
-	ret
-}
-.method public static int32 onBonusDelete_1075b34(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01075b34: 0x1075b34: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x01075b38: 0x1075b38: sw    s0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 7
-	stelem.i4
-// 0x01075b3c: 0x1075b3c: addu  s0, a0, zero
-	ldloc.1
-	stloc 7
-// 0x01075b40: 0x1075b40: sw    ra, 28(sp)
-// 0x01075b44: 0x1075b44: jal   0x101ca0c addiu a0, a0, 32
-	ldloc.1
-	ldc.i4.s 32
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01075b4c: 0x1075b4c: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01075b50: 0x1075b50: lw    v0, 84(s0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc 5
-// 0x01075b54: 0x1075b54: sll   zero, zero, 0
-// 0x01075b58: 0x1075b58: beq   v0, zero, 0x1075b70 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1075b70
-// --- basic block ---
-// 0x01075b60: 0x1075b60: lw    v0, 88(s0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc 5
-// 0x01075b64: 0x1075b64: sll   zero, zero, 0
-// 0x01075b68: 0x1075b68: beq   v0, zero, 0x1075b8c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1075b8c
-// --- basic block ---
-L_1075b70:
-// 0x01075b70: 0x1075b70: jal   0x10a6ed0 sw    a0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc.1
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a6ed0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01075b78: 0x1075b78: lw    a0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc.1
-// 0x01075b7c: 0x1075b7c: beq   v0, zero, 0x1075b8c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1075b8c
-// --- basic block ---
-// 0x01075b84: 0x1075b84: jal   0x101c14c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-L_1075b8c:
-// 0x01075b8c: 0x1075b8c: lw    ra, 28(sp)
-// 0x01075b90: 0x1075b90: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x01075b94: 0x1075b94: lw    s0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 7
-// 0x01075b98: 0x1075b98: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RealtimeBonus_Term_1075ba0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v0,int32 ra,int32 v1)
-
-// local  9 is register v0
-// local 11 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  7 is register s1
-// local  8 is register s2
-// local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01075ba0: 0x1075ba0: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x01075ba4: 0x1075ba4: sw    s2, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x01075ba8: 0x1075ba8: sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
-// 0x01075bac: 0x1075bac: lui   s2, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x01075bb0: 0x1075bb0: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x01075bb4: 0x1075bb4: sw    ra, 28(sp)
-// 0x01075bb8: 0x1075bb8: sw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x01075bbc: 0x1075bbc: addiu s0, s0, -17252
-	ldloc 6
-	ldc.i4 -17252
-	add
-	stloc 6
-// 0x01075bc0: 0x1075bc0: addiu s2, s2, -16252
-	ldloc 8
-	ldc.i4 -16252
-	add
-	stloc 8
-L_1075bc4:
-// 0x01075bc4: 0x1075bc4: lw    s1, 0(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x01075bc8: 0x1075bc8: sll   zero, zero, 0
-// 0x01075bcc: 0x1075bcc: beq   s1, zero, 0x1075be4 addu  a0, s1, zero
-	ldloc 7
-	ldloc 7
-	stloc.1
-	brfalse L_1075be4
-// --- basic block ---
-// 0x01075bd4: 0x1075bd4: jal   0x1075b34 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl88::onBonusDelete_1075b34(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 9
-// --- basic block ---
-// 0x01075bdc: 0x1075bdc: jal   0x1000930 addu  a0, s1, zero
-	ldloc 7
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 9
-// --- basic block ---
-L_1075be4:
-// 0x01075be4: 0x1075be4: sw    zero, 0(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x01075be8: 0x1075be8: addiu s0, s0, 4
-	ldloc 6
-	ldc.i4.4
-	add
-	stloc 6
-// 0x01075bec: 0x1075bec: bne   s0, s2, 0x1075bc4 lui   v0, 0x80000
-	ldloc 6
-	ldloc 8
-	ldc.i4 524288
-	stloc 9
-	bne.un L_1075bc4
-// --- basic block ---
-// 0x01075bf4: 0x1075bf4: lw    ra, 28(sp)
-// 0x01075bf8: 0x1075bf8: lw    s2, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x01075bfc: 0x1075bfc: lw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 7
-// 0x01075c00: 0x1075c00: lw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 6
-// 0x01075c04: 0x1075c04: sw    zero, -16252(v0)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4063
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01075c08: 0x1075c08: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 11
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 9
-	ret
-}
-.method public static int32 RealtimeBonus_Init_1075c10(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  0 is register sp
-// local  9 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01075c10: 0x1075c10: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01075c14: 0x1075c14: lw    v1, -17272(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4318
-	add
-	ldelem.i4
-	stloc 6
-// 0x01075c18: 0x1075c18: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x01075c1c: 0x1075c1c: sw    ra, 28(sp)
-// 0x01075c20: 0x1075c20: bne   v1, zero, 0x1075c3c sw    s0, 24(sp)
-	ldloc 6
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-	brtrue L_1075c3c
-// --- basic block ---
-// 0x01075c28: 0x1075c28: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01075c2c: 0x1075c2c: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x01075c30: 0x1075c30: addiu a0, a0, 15612
-	ldloc.1
-	ldc.i4 15612
-	add
-	stloc.1
-// 0x01075c34: 0x1075c34: jal   0x1033160 sw    v1, -17272(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4318
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl37::roadmap_alerter_register_1033160(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_1075c3c:
-// 0x01075c3c: 0x1075c3c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01075c40: 0x1075c40: addiu v0, v0, -17252
-	ldloc 5
-	ldc.i4 -17252
-	add
-	stloc 5
-// 0x01075c44: 0x1075c44: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x01075c48: 0x1075c48: sw    zero, 1000(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 250
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01075c4c: 0x1075c4c: addiu v1, v1, -16252
-	ldloc 6
-	ldc.i4 -16252
-	add
-	stloc 6
-L_1075c50:
-// 0x01075c50: 0x1075c50: sw    zero, 0(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x01075c54: 0x1075c54: addiu v0, v0, 4
-	ldloc 5
-	ldc.i4.4
-	add
-	stloc 5
-// 0x01075c58: 0x1075c58: bne   v0, v1, 0x1075c50 lui   a1, 0x0
-	ldloc 5
-	ldloc 6
-	ldc.i4.s 0
-	stloc.2
-	bne.un L_1075c50
-// --- basic block ---
-// 0x01075c60: 0x1075c60: lui   s0, 0x10000
-	ldc.i4 65536
-	stloc 8
-// 0x01075c64: 0x1075c64: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01075c68: 0x1075c68: addiu a0, s0, 12560
-	ldloc 8
-	ldc.i4 12560
-	add
-	stloc.1
-// 0x01075c6c: 0x1075c6c: addiu a1, a1, 15692
-	ldloc.2
-	ldc.i4 15692
-	add
-	stloc.2
-// 0x01075c70: 0x1075c70: addiu a2, a2, -15288
-	ldloc.3
-	ldc.i4 -15288
-	add
-	stloc.3
-// 0x01075c74: 0x1075c74: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01075c7c: 0x1075c7c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01075c80: 0x1075c80: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01075c84: 0x1075c84: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01075c88: 0x1075c88: addiu a0, a0, -26888
-	ldloc.1
-	ldc.i4 -26888
-	add
-	stloc.1
-// 0x01075c8c: 0x1075c8c: addiu a1, a1, 15708
-	ldloc.2
-	ldc.i4 15708
-	add
-	stloc.2
-// 0x01075c90: 0x1075c90: addiu a2, a2, -48
-	ldloc.3
-	ldc.i4.s -48
-	add
-	stloc.3
-// 0x01075c94: 0x1075c94: jal   0x100edb0 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01075c9c: 0x1075c9c: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01075ca0: 0x1075ca0: lui   a3, 0x0
-	ldc.i4.s 0
-	stloc 4
-// 0x01075ca4: 0x1075ca4: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01075ca8: 0x1075ca8: addiu a0, s0, 12560
-	ldloc 8
-	ldc.i4 12560
-	add
-	stloc.1
-// 0x01075cac: 0x1075cac: addiu v0, v0, 9464
-	ldloc 5
-	ldc.i4 9464
-	add
-	stloc 5
-// 0x01075cb0: 0x1075cb0: addiu a1, a1, 15724
-	ldloc.2
-	ldc.i4 15724
-	add
-	stloc.2
-// 0x01075cb4: 0x1075cb4: addiu a3, a3, 20820
-	ldloc 4
-	ldc.i4 20820
-	add
-	stloc 4
-// 0x01075cb8: 0x1075cb8: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x01075cbc: 0x1075cbc: sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x01075cc0: 0x1075cc0: jal   0x100edf8 sw    zero, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldc.i4.s 0
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01075cc8: 0x1075cc8: lw    ra, 28(sp)
-// 0x01075ccc: 0x1075ccc: lw    s0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x01075cd0: 0x1075cd0: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RealtimeBonus_OpenMessageTicker_1075cd8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s3,int32 s1,int32 s2,int32 v0,int32 v1,int32 ra)
-
-// local 10 is register v0
-// local 11 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  8 is register s1
-// local  9 is register s2
-// local  7 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01075cd8: 0x1075cd8: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x01075cdc: 0x1075cdc: sw    s2, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 9
-	stelem.i4
-// 0x01075ce0: 0x1075ce0: sw    s1, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 8
-	stelem.i4
-// 0x01075ce4: 0x1075ce4: addu  s2, a1, zero
-	ldloc.2
-	stloc 9
-// 0x01075ce8: 0x1075ce8: addu  s1, a3, zero
-	ldloc 4
-	stloc 8
-// 0x01075cec: 0x1075cec: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01075cf0: 0x1075cf0: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01075cf4: 0x1075cf4: sw    s3, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 7
-	stelem.i4
-// 0x01075cf8: 0x1075cf8: sw    s0, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 6
-	stelem.i4
-// 0x01075cfc: 0x1075cfc: addu  s3, a2, zero
-	ldloc.3
-	stloc 7
-// 0x01075d00: 0x1075d00: addu  s0, a0, zero
-	ldloc.1
-	stloc 6
-// 0x01075d04: 0x1075d04: addiu a1, a1, -28844
-	ldloc.2
-	ldc.i4 -28844
-	add
-	stloc.2
-// 0x01075d08: 0x1075d08: addiu a3, a3, -28808
-	ldloc 4
-	ldc.i4 -28808
-	add
-	stloc 4
-// 0x01075d0c: 0x1075d0c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01075d10: 0x1075d10: addiu a2, zero, 721
-	ldc.i4 721
-	stloc.3
-// 0x01075d14: 0x1075d14: sw    ra, 52(sp)
-// 0x01075d18: 0x1075d18: sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
-// 0x01075d1c: 0x1075d1c: sw    s3, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x01075d20: 0x1075d20: sw    s2, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x01075d24: 0x1075d24: jal   0x100449c sw    s1, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01075a0c: 0x1075a0c: sll   zero, zero, 0
+// 0x01075a10: 0x1075a10: beq   v0, zero, 0x1075a30 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1075a30
 // --- basic block ---
-// 0x01075d2c: 0x1075d2c: blez  s0, 0x1075d40 addu  a0, s3, zero
-	ldloc 6
-	ldloc 7
-	stloc.1
-	ldc.i4.s 0
-	ble L_1075d40
+// 0x01075a18: 0x1075a18: beq   a2, zero, 0x1075a30 sll   zero, zero, 0
+	ldloc.3
+	brfalse L_1075a30
 // --- basic block ---
-// 0x01075d34: 0x1075d34: jal   0x10acad0 addu  a0, s0, zero
-	ldloc 6
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
+// 0x01075a20: 0x1075a20: lb    v0, 0(a2)
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01075a24: 0x1075a24: sll   zero, zero, 0
+// 0x01075a28: 0x1075a28: bne   v0, zero, 0x1075a54 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_1075a54
 // --- basic block ---
-// 0x01075d3c: 0x1075d3c: addu  a0, s3, zero
-	ldloc 7
-	stloc.1
-L_1075d40:
-// 0x01075d40: 0x1075d40: addu  a1, s2, zero
-	ldloc 9
+L_1075a30:
+// 0x01075a30: 0x1075a30: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01075d44: 0x1075d44: addu  a2, s1, zero
-	ldloc 8
-	stloc.3
-// 0x01075d48: 0x1075d48: jal   0x1053b10 addiu a3, zero, -1
-	ldc.i4.m1
+// 0x01075a34: 0x1075a34: lui   a3, 0x20000
+	ldc.i4 131072
 	stloc 4
-	ldloc.0
-	ldloc.1
+// 0x01075a38: 0x1075a38: addiu a1, a1, 32716
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_show_1053b10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 10
-// --- basic block ---
-// 0x01075d50: 0x1075d50: lw    ra, 52(sp)
-// 0x01075d54: 0x1075d54: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 10
-// 0x01075d58: 0x1075d58: lw    s3, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 7
-// 0x01075d5c: 0x1075d5c: lw    s2, 44(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 9
-// 0x01075d60: 0x1075d60: lw    s1, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 8
-// 0x01075d64: 0x1075d64: lw    s0, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4 32716
 	add
-	ldelem.i4
-	stloc 6
-// 0x01075d68: 0x1075d68: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+	stloc.2
+// 0x01075a3c: 0x1075a3c: addiu a3, a3, -29144
+	ldloc 4
+	ldc.i4 -29144
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 11
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 10
-	ret
-}
-.method public static int32 RealtimeBonus_CreateGUIID_1075d70(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01075d70: 0x1075d70: lw    a3, 0(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
 	stloc 4
-// 0x01075d74: 0x1075d74: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x01075d78: 0x1075d78: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01075d7c: 0x1075d7c: addiu a2, a2, -28728
-	ldloc.3
-	ldc.i4 -28728
-	add
-	stloc.3
-// 0x01075d80: 0x1075d80: addiu a0, a0, 32
-	ldloc.1
-	ldc.i4.s 32
-	add
+// 0x01075a40: 0x1075a40: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01075d84: 0x1075d84: sw    ra, 20(sp)
-// 0x01075d88: 0x1075d88: jal   0x1000f9c addiu a1, zero, 30
-	ldc.i4.s 30
-	stloc.2
+// 0x01075a44: 0x1075a44: jal   0x100449c addiu a2, zero, 394
+	ldc.i4 394
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
-// --- basic block ---
-// 0x01075d90: 0x1075d90: lw    ra, 20(sp)
-// 0x01075d94: 0x1075d94: sll   zero, zero, 0
-// 0x01075d98: 0x1075d98: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 RealtimeBonus_CollectedPointsConfirmed_1075da0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local  0 is register sp
-// local 11 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
 	stloc 5
+// --- basic block ---
+// 0x01075a4c: 0x1075a4c: j	 0x1075bb4 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 11
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	br L_1075bb4
 // --- basic block ---
-// 0x01075da0: 0x1075da0: addiu sp, sp, -304
-	ldloc.0
-	ldc.i4 -304
-	add
-	stloc.0
-// 0x01075da4: 0x1075da4: sw    s2, 296(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 74
-	add
-	ldloc 10
-	stelem.i4
-// 0x01075da8: 0x1075da8: sw    s0, 288(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 72
-	add
-	ldloc 8
-	stelem.i4
-// 0x01075dac: 0x1075dac: sw    ra, 300(sp)
-// 0x01075db0: 0x1075db0: sw    s1, 292(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 73
-	add
-	ldloc 9
-	stelem.i4
-// 0x01075db4: 0x1075db4: addu  v1, a1, zero
+L_1075a54:
+// 0x01075a54: 0x1075a54: jal   0x1001b48 addu  a0, a1, zero
 	ldloc.2
-	stloc 7
-// 0x01075db8: 0x1075db8: addu  v0, a0, zero
+	stloc.1
 	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01075a5c: 0x1075a5c: sltiu v0, v0, 64
+	ldloc 5
+	ldc.i4.s 64
+	clt.un
+	stloc 5
+// 0x01075a60: 0x1075a60: beq   v0, zero, 0x1075a7c lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
+	stloc.2
+	brfalse L_1075a7c
+// --- basic block ---
+// 0x01075a68: 0x1075a68: jal   0x1001b48 addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x01075dbc: 0x1075dbc: lw    s2, 324(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 81
-	add
-	ldelem.i4
-	stloc 10
-// 0x01075dc0: 0x1075dc0: bne   a1, zero, 0x1075e18 addu  s0, a2, zero
-	ldloc.2
-	ldloc.3
-	stloc 8
-	brtrue L_1075e18
 // --- basic block ---
-// 0x01075dc8: 0x1075dc8: beq   a2, zero, 0x1075df8 lui   a1, 0x20000
-	ldloc.3
-	ldc.i4 131072
+// 0x01075a70: 0x1075a70: sltiu v0, v0, 64
+	ldloc 5
+	ldc.i4.s 64
+	clt.un
+	stloc 5
+// 0x01075a74: 0x1075a74: bne   v0, zero, 0x1075aa8 lui   a1, 0x10000
+	ldloc 5
+	ldc.i4 65536
 	stloc.2
-	brfalse L_1075df8
+	brtrue L_1075aa8
 // --- basic block ---
-// 0x01075dd0: 0x1075dd0: lui   a3, 0x20000
+L_1075a7c:
+// 0x01075a7c: 0x1075a7c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01075dd4: 0x1075dd4: addiu a1, a1, -28844
+// 0x01075a80: 0x1075a80: addiu v0, zero, 63
+	ldc.i4.s 63
+	stloc 5
+// 0x01075a84: 0x1075a84: addiu a1, a1, 32716
 	ldloc.2
-	ldc.i4 -28844
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x01075dd8: 0x1075dd8: addiu a3, a3, -28712
+// 0x01075a88: 0x1075a88: addiu a3, a3, -29088
 	ldloc 4
-	ldc.i4 -28712
+	ldc.i4 -29088
 	add
 	stloc 4
-// 0x01075ddc: 0x1075ddc: addiu a2, zero, 680
-	ldc.i4 680
-	stloc.3
-// 0x01075de0: 0x1075de0: addiu a0, zero, 1
-	ldc.i4.1
+// 0x01075a8c: 0x1075a8c: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01075de4: 0x1075de4: sw    v0, 16(sp)
+// 0x01075a90: 0x1075a90: addiu a2, zero, 402
+	ldc.i4 402
+	stloc.3
+// 0x01075a94: 0x1075a94: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
 	ldloc 5
 	stelem.i4
-// 0x01075de8: 0x1075de8: jal   0x100449c sw    s0, 20(sp)
+// 0x01075a98: 0x1075a98: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -4363,415 +2949,634 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01075df0: 0x1075df0: j	 0x1075e9c sll   zero, zero, 0
-	br L_1075e9c
+// 0x01075aa0: 0x1075aa0: j	 0x1075bb4 addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+	br L_1075bb4
 // --- basic block ---
-L_1075df8:
-// 0x01075df8: 0x1075df8: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01075dfc: 0x1075dfc: addiu a1, a1, -28844
-	ldloc.2
-	ldc.i4 -28844
+L_1075aa8:
+// 0x01075aa8: 0x1075aa8: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x01075aac: 0x1075aac: addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+// 0x01075ab0: 0x1075ab0: addiu a2, zero, 63
+	ldc.i4.s 63
+	stloc.3
+// 0x01075ab4: 0x1075ab4: jal   0x1067b74 addiu s2, s0, 64
+	ldloc 8
+	ldc.i4.s 64
 	add
+	stloc 12
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01075abc: 0x1075abc: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x01075ac0: 0x1075ac0: addu  a1, s2, zero
+	ldloc 12
 	stloc.2
-// 0x01075e00: 0x1075e00: addiu a3, a3, -28652
+// 0x01075ac4: 0x1075ac4: jal   0x1067b74 addiu a2, zero, 63
+	ldc.i4.s 63
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 -28652
-	add
-	stloc 4
-// 0x01075e04: 0x1075e04: addiu a0, zero, 4
-	ldc.i4.4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01075acc: 0x1075acc: beq   s3, zero, 0x1075af8 sll   zero, zero, 0
+	ldloc 10
+	brfalse L_1075af8
+// --- basic block ---
+// 0x01075ad4: 0x1075ad4: lb    v0, 0(s3)
+	ldloc 10
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01075ad8: 0x1075ad8: sll   zero, zero, 0
+// 0x01075adc: 0x1075adc: beq   v0, zero, 0x1075af8 addu  a0, s3, zero
+	ldloc 5
+	ldloc 10
 	stloc.1
-// 0x01075e08: 0x1075e08: addiu a2, zero, 685
-	ldc.i4 685
+	brfalse L_1075af8
+// --- basic block ---
+// 0x01075ae4: 0x1075ae4: addiu a1, s0, 128
+	ldloc 8
+	ldc.i4 128
+	add
+	stloc.2
+// 0x01075ae8: 0x1075ae8: jal   0x1067b74 addiu a2, zero, 63
+	ldc.i4.s 63
 	stloc.3
-// 0x01075e0c: 0x1075e0c: sw    v0, 16(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl77::PackNetworkString_1067b74(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01075af0: 0x1075af0: j	 0x1075b00 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_1075b00
+// --- basic block ---
+L_1075af8:
+// 0x01075af8: 0x1075af8: sb    zero, 128(s0)
+	ldloc 8
+	ldc.i4 128
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075afc: 0x1075afc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_1075b00:
+// 0x01075b00: 0x1075b00: lw    a0, -18000(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 -4500
 	add
-	ldloc 5
-	stelem.i4
-// 0x01075e10: 0x1075e10: j	 0x1075f38 sw    zero, 20(sp)
+	ldelem.i4
+	stloc.1
+// 0x01075b04: 0x1075b04: jal   0x102c400 sw    a0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 16
 	add
-	ldc.i4.s 0
+	ldloc.1
 	stelem.i4
-	br L_1075f38
-// --- basic block ---
-L_1075e18:
-// 0x01075e18: 0x1075e18: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01075e1c: 0x1075e1c: bne   a1, a0, 0x1075f1c lui   a1, 0x20000
-	ldloc.2
+	ldloc.0
 	ldloc.1
-	ldc.i4 131072
-	stloc.2
-	bne.un L_1075f1c
-// --- basic block ---
-// 0x01075e24: 0x1075e24: bne   a3, zero, 0x1075e50 lui   a0, 0x20000
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 131072
-	stloc.1
-	brtrue L_1075e50
+	call int32 Cibyl32::roadmap_start_version_102c400(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01075e2c: 0x1075e2c: jal   0x101cd60 addiu a0, a0, -28584
-	ldloc.1
-	ldc.i4 -28584
-	add
-	stloc.1
+// 0x01075b0c: 0x1075b0c: jal   0x10aafec addu  s4, v0, zero
+	ldloc 5
+	stloc 13
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl127::roadmap_geo_config_get_version_10aafec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01075e34: 0x1075e34: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01075e38: 0x1075e38: addiu a0, a0, 18500
-	ldloc.1
-	ldc.i4 18500
-	add
-	stloc.1
-// 0x01075e3c: 0x1075e3c: addu  a1, v0, zero
+// 0x01075b14: 0x1075b14: jal   0x108d854 addu  s3, v0, zero
 	ldloc 5
-	stloc.2
-// 0x01075e40: 0x1075e40: jal   0x104bfe4 addiu a2, zero, 10
-	ldc.i4.s 10
-	stloc.3
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl105::RTSystemMessagesGetLastMessageDisplayed_108d854(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01075e48: 0x1075e48: j	 0x1075f40 sll   zero, zero, 0
-	br L_1075f40
-// --- basic block ---
-L_1075e50:
-// 0x01075e50: 0x1075e50: beq   a2, zero, 0x1075ebc lui   s1, 0x10000
-	ldloc.3
-	ldc.i4 65536
-	stloc 9
-	brfalse L_1075ebc
-// --- basic block ---
-// 0x01075e58: 0x1075e58: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01075e5c: 0x1075e5c: jal   0x101cd60 addiu a0, a0, -28472
-	ldloc.1
-	ldc.i4 -28472
-	add
-	stloc.1
+// 0x01075b1c: 0x1075b1c: jal   0x101d494 addu  s1, v0, zero
+	ldloc 5
+	stloc 11
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_system_lang_101d494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01075e64: 0x1075e64: addu  a0, s2, zero
-	ldloc 10
+// 0x01075b24: 0x1075b24: lw    t0, 112(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 28
+	add
+	ldelem.i4
+	stloc 9
+// 0x01075b28: 0x1075b28: lw    a0, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
 	stloc.1
-// 0x01075e68: 0x1075e68: addiu s1, sp, 24
+// 0x01075b2c: 0x1075b2c: sw    t0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 9
+	stelem.i4
+// 0x01075b30: 0x1075b30: lui   t0, 0x20000
+	ldc.i4 131072
+	stloc 9
+// 0x01075b34: 0x1075b34: addiu t0, t0, -29016
+	ldloc 9
+	ldc.i4 -29016
 	add
 	stloc 9
-// 0x01075e6c: 0x1075e6c: jal   0x101cd60 sw    v0, 280(sp)
+// 0x01075b38: 0x1075b38: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.6
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
+// 0x01075b3c: 0x1075b3c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01075b40: 0x1075b40: addiu t0, zero, 140
+	ldc.i4 140
+	stloc 9
+// 0x01075b44: 0x1075b44: lui   a2, 0x0
+	ldc.i4.s 0
+	stloc.3
+// 0x01075b48: 0x1075b48: addiu v1, s0, 128
+	ldloc 8
+	ldc.i4 128
+	add
+	stloc 7
+// 0x01075b4c: 0x1075b4c: sw    t0, 28(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 9
+	stelem.i4
+// 0x01075b50: 0x1075b50: addiu a1, a1, 1436
 	ldloc.2
+	ldc.i4 1436
+	add
+	stloc.2
+// 0x01075b54: 0x1075b54: addiu t0, zero, 70
+	ldc.i4.s 70
+	stloc 9
+// 0x01075b58: 0x1075b58: addiu a2, a2, 15548
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01075e74: 0x1075e74: lw    a2, 280(sp)
+	ldc.i4 15548
+	add
+	stloc.3
+// 0x01075b5c: 0x1075b5c: addiu a3, zero, 7
+	ldc.i4.7
+	stloc 4
+// 0x01075b60: 0x1075b60: sw    v1, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 7
+	stelem.i4
+// 0x01075b64: 0x1075b64: sw    s2, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 12
+	stelem.i4
+// 0x01075b68: 0x1075b68: sw    t0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 9
+	stelem.i4
+// 0x01075b6c: 0x1075b6c: sw    s4, 44(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldloc 13
+	stelem.i4
+// 0x01075b70: 0x1075b70: sw    s3, 52(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldloc 10
+	stelem.i4
+// 0x01075b74: 0x1075b74: sw    s1, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc 11
+	stelem.i4
+// 0x01075b78: 0x1075b78: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.s 15
 	add
-	ldelem.i4
-	stloc.3
-// 0x01075e78: 0x1075e78: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x01075e7c: 0x1075e7c: addiu a1, zero, 250
-	ldc.i4 250
-	stloc.2
-// 0x01075e80: 0x1075e80: addu  a3, v0, zero
 	ldloc 5
-	stloc 4
-// 0x01075e84: 0x1075e84: jal   0x1000f9c sw    s0, 16(sp)
+	stelem.i4
+// 0x01075b7c: 0x1075b7c: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
 	ldloc 8
 	stelem.i4
+// 0x01075b80: 0x1075b80: jal   0x106a4b4 sw    s0, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01075e8c: 0x1075e8c: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01075e90: 0x1075e90: addu  a1, s1, zero
-	ldloc 9
-	stloc.2
-// 0x01075e94: 0x1075e94: jal   0x104c148 addiu a0, a0, 18500
-	ldloc.1
-	ldc.i4 18500
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.1
+	ldloc 8
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_start_trans_106a4b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1075e9c:
-// 0x01075e9c: 0x1075e9c: jal   0x10acad0 addu  a0, s0, zero
+// 0x01075b88: 0x1075b88: bne   v0, zero, 0x1075bb4 addiu v1, zero, 1
+	ldloc 5
+	ldc.i4.1
+	stloc 7
+	brtrue L_1075bb4
+// --- basic block ---
+// 0x01075b90: 0x1075b90: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-	ldloc.0
+// 0x01075b94: 0x1075b94: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01075b98: 0x1075b98: jal   0x100177c addiu a2, zero, 64
+	ldc.i4.s 64
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01075ea4: 0x1075ea4: addu  a0, s0, zero
+// 0x01075ba0: 0x1075ba0: addiu a0, s0, 64
 	ldloc 8
+	ldc.i4.s 64
+	add
 	stloc.1
-// 0x01075ea8: 0x1075ea8: addiu a1, zero, 6
-	ldc.i4.6
+// 0x01075ba4: 0x1075ba4: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-// 0x01075eac: 0x1075eac: jal   0x10ac874 addiu a2, zero, 6
-	ldc.i4.6
+// 0x01075ba8: 0x1075ba8: jal   0x100177c addiu a2, zero, 64
+	ldc.i4.s 64
 	stloc.3
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_display_new_points_timed_10ac874(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01075eb4: 0x1075eb4: j	 0x1075f40 sll   zero, zero, 0
-	br L_1075f40
-// --- basic block ---
-L_1075ebc:
-// 0x01075ebc: 0x1075ebc: lw    v0, 320(sp)
+// 0x01075bb0: 0x1075bb0: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+L_1075bb4:
+// 0x01075bb4: 0x1075bb4: lw    ra, 92(sp)
+// 0x01075bb8: 0x1075bb8: addu  v0, v1, zero
+	ldloc 7
+	stloc 5
+// 0x01075bbc: 0x1075bbc: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 80
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc 5
-// 0x01075ec0: 0x1075ec0: sll   zero, zero, 0
-// 0x01075ec4: 0x1075ec4: beq   v0, zero, 0x1075ed8 addiu s0, sp, 24
-	ldloc 5
+	stloc 13
+// 0x01075bc0: 0x1075bc0: lw    s3, 84(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 8
-	brfalse L_1075ed8
-// --- basic block ---
-// 0x01075ecc: 0x1075ecc: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01075ed0: 0x1075ed0: j	 0x1075ee0 addiu a0, a0, -28396
-	ldloc.1
-	ldc.i4 -28396
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
 	add
-	stloc.1
-	br L_1075ee0
-// --- basic block ---
-L_1075ed8:
-// 0x01075ed8: 0x1075ed8: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01075edc: 0x1075edc: addiu a0, a0, -28328
-	ldloc.1
-	ldc.i4 -28328
+	ldelem.i4
+	stloc 10
+// 0x01075bc4: 0x1075bc4: lw    s2, 80(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
 	add
-	stloc.1
-L_1075ee0:
-// 0x01075ee0: 0x1075ee0: jal   0x101cd60 sll   zero, zero, 0
+	ldelem.i4
+	stloc 12
+// 0x01075bc8: 0x1075bc8: lw    s1, 76(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01075ee8: 0x1075ee8: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x01075eec: 0x1075eec: jal   0x101cd60 sw    v0, 280(sp)
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldelem.i4
+	stloc 11
+// 0x01075bcc: 0x1075bcc: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.s 18
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc 8
+// 0x01075bd0: 0x1075bd0: jr    ra addiu sp, sp, 96
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 96
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTNet_LoadParams_1075bd8(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s2,int32 v1,int32 s0,int32 s1,int32 ra)
+
+// local  6 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local 10 is register s1
+// local  7 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
 	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01075ef4: 0x1075ef4: lw    a2, 280(sp)
-	ldloc 6
+// 0x01075bd8: 0x1075bd8: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x01075bdc: 0x1075bdc: sw    s1, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.7
+	add
+	ldloc 10
+	stelem.i4
+// 0x01075be0: 0x1075be0: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 10
+// 0x01075be4: 0x1075be4: lw    v1, -17996(s1)
+	ldloc 5
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4499
 	add
 	ldelem.i4
-	stloc.3
-// 0x01075ef8: 0x1075ef8: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x01075efc: 0x1075efc: addu  a3, v0, zero
+	stloc 8
+// 0x01075be8: 0x1075be8: sw    ra, 36(sp)
+// 0x01075bec: 0x1075bec: sw    s2, 32(sp)
 	ldloc 5
-	stloc 4
-// 0x01075f00: 0x1075f00: jal   0x1000f9c addiu a1, zero, 250
-	ldc.i4 250
-	stloc.2
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 7
+	stelem.i4
+// 0x01075bf0: 0x1075bf0: sw    s0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 9
+	stelem.i4
+// 0x01075bf4: 0x1075bf4: bne   v1, zero, 0x1075c78 addiu v0, zero, 1
+	ldloc 8
+	ldc.i4.1
+	stloc 6
+	brtrue L_1075c78
+// --- basic block ---
+// 0x01075bfc: 0x1075bfc: jal   0x106b24c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::RT_GetWebServiceAddress_106b24c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x01075f08: 0x1075f08: addiu a0, s1, 18500
-	ldloc 9
-	ldc.i4 18500
-	add
+// 0x01075c04: 0x1075c04: lui   a1, 0x80000
+	ldc.i4 524288
+	stloc.2
+// 0x01075c08: 0x1075c08: lui   a2, 0x80000
+	ldc.i4 524288
+	stloc.3
+// 0x01075c0c: 0x1075c0c: lui   a3, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01075c10: 0x1075c10: addu  a0, v0, zero
+	ldloc 6
 	stloc.1
-// 0x01075f0c: 0x1075f0c: jal   0x104c148 addu  a1, s0, zero
-	ldloc 8
+// 0x01075c14: 0x1075c14: addiu a1, a1, -17396
+	ldloc.2
+	ldc.i4 -17396
+	add
 	stloc.2
+// 0x01075c18: 0x1075c18: addiu a2, a2, -16812
+	ldloc.3
+	ldc.i4 -16812
+	add
+	stloc.3
+// 0x01075c1c: 0x1075c1c: addiu a3, a3, -17328
+	ldloc 4
+	ldc.i4 -17328
+	add
+	stloc 4
+// 0x01075c20: 0x1075c20: jal   0x1068a98 addu  s0, v0, zero
+	ldloc 6
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
+	call int32 Cibyl77::WSA_ExtractParams_1068a98(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x01075f14: 0x1075f14: j	 0x1075f40 sll   zero, zero, 0
-	br L_1075f40
+// 0x01075c28: 0x1075c28: bne   v0, zero, 0x1075c58 lui   s2, 0x80000
+	ldloc 6
+	ldc.i4 524288
+	stloc 7
+	brtrue L_1075c58
 // --- basic block ---
-L_1075f1c:
-// 0x01075f1c: 0x1075f1c: lui   a3, 0x20000
+// 0x01075c30: 0x1075c30: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01075c34: 0x1075c34: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01075f20: 0x1075f20: addiu a1, a1, -28844
+// 0x01075c38: 0x1075c38: addiu a1, a1, 32716
 	ldloc.2
-	ldc.i4 -28844
+	ldc.i4 32716
 	add
 	stloc.2
-// 0x01075f24: 0x1075f24: addiu a3, a3, -28276
+// 0x01075c3c: 0x1075c3c: addiu a3, a3, -28980
 	ldloc 4
-	ldc.i4 -28276
+	ldc.i4 -28980
 	add
 	stloc 4
-// 0x01075f28: 0x1075f28: addiu a0, zero, 4
+// 0x01075c40: 0x1075c40: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01075f2c: 0x1075f2c: addiu a2, zero, 713
-	ldc.i4 713
-	stloc.3
-// 0x01075f30: 0x1075f30: sw    v1, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x01075f34: 0x1075f34: sw    v0, 20(sp)
-	ldloc 6
+// 0x01075c44: 0x1075c44: addiu a2, zero, 367
+	ldc.i4 367
+	stloc.3
+// 0x01075c48: 0x1075c48: jal   0x100449c sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-L_1075f38:
-// 0x01075f38: 0x1075f38: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -4779,72 +3584,114 @@ L_1075f38:
 	ldloc 4
 	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-L_1075f40:
-// 0x01075f40: 0x1075f40: lw    ra, 300(sp)
-// 0x01075f44: 0x1075f44: addiu v0, zero, 1
+// 0x01075c50: 0x1075c50: j	 0x1075c78 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_1075c78
+// --- basic block ---
+L_1075c58:
+// 0x01075c58: 0x1075c58: addiu a0, s2, -17992
+	ldloc 7
+	ldc.i4 -17992
+	add
+	stloc.1
+// 0x01075c5c: 0x1075c5c: addu  a1, s0, zero
+	ldloc 9
+	stloc.2
+// 0x01075c60: 0x1075c60: jal   0x1001af8 addiu a2, zero, 596
+	ldc.i4 596
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
+	stloc 6
+// --- basic block ---
+// 0x01075c68: 0x1075c68: addiu s2, s2, -17992
+	ldloc 7
+	ldc.i4 -17992
+	add
+	stloc 7
+// 0x01075c6c: 0x1075c6c: addiu v0, zero, 1
 	ldc.i4.1
-	stloc 5
-// 0x01075f48: 0x1075f48: lw    s2, 296(sp)
+	stloc 6
+// 0x01075c70: 0x1075c70: sw    v0, -17996(s1)
+	ldloc 5
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4499
+	add
 	ldloc 6
+	stelem.i4
+// 0x01075c74: 0x1075c74: sb    zero, 595(s2)
+	ldloc 7
+	ldc.i4 595
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+L_1075c78:
+// 0x01075c78: 0x1075c78: lw    ra, 36(sp)
+// 0x01075c7c: 0x1075c7c: lw    s2, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 74
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 10
-// 0x01075f4c: 0x1075f4c: lw    s1, 292(sp)
-	ldloc 6
+	stloc 7
+// 0x01075c80: 0x1075c80: lw    s1, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 73
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 9
-// 0x01075f50: 0x1075f50: lw    s0, 288(sp)
-	ldloc 6
+	stloc 10
+// 0x01075c84: 0x1075c84: lw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 72
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 8
-// 0x01075f54: 0x1075f54: jr    ra addiu sp, sp, 304
+	stloc 9
+// 0x01075c88: 0x1075c88: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4 304
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RealtimeBonus_distance_check_1075f5c(int32,int32,int32,int32,int32)
+.method public static int32 RTNet_Term_1075c90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
 
-// local  6 is register v0
+// local  8 is register v0
 // local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
+// local  6 is register s0
 // local  0 is register sp
-// local 10 is register ra
+// local  7 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldc.i4.s 0
 	stloc 9
 	ldarg 1
@@ -4856,1582 +3703,1384 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1075f5c:
-// 0x01075f5c: 0x1075f5c: addiu sp, sp, -32
+// 0x01075c90: 0x1075c90: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01075f60: 0x1075f60: sw    s1, 24(sp)
+// 0x01075c94: 0x1075c94: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldloc 8
+	ldloc 6
 	stelem.i4
-// 0x01075f64: 0x1075f64: lui   s1, 0x80000
+// 0x01075c98: 0x1075c98: lui   s0, 0x80000
 	ldc.i4 524288
-	stloc 8
-// 0x01075f68: 0x1075f68: sw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x01075f6c: 0x1075f6c: addiu s0, s1, -17268
-	ldloc 8
-	ldc.i4 -17268
-	add
-	stloc 7
-// 0x01075f70: 0x1075f70: lw    v0, 4(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
 	stloc 6
-// 0x01075f74: 0x1075f74: sw    ra, 28(sp)
-// 0x01075f78: 0x1075f78: sw    a0, 32(sp)
+// 0x01075c9c: 0x1075c9c: lw    a0, -18000(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 -4500
 	add
+	ldelem.i4
+	stloc.1
+// 0x01075ca0: 0x1075ca0: sll   zero, zero, 0
+// 0x01075ca4: 0x1075ca4: beq   a0, zero, 0x1075cb8 sw    ra, 20(sp)
 	ldloc.1
-	stelem.i4
-// 0x01075f7c: 0x1075f7c: bne   v0, zero, 0x1075f90 sw    a1, 36(sp)
-	ldloc 6
-	ldloc 5
+	brfalse L_1075cb8
+// --- basic block ---
+// 0x01075cac: 0x1075cac: jal   0x106aa9c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
+	ldloc.1
 	ldloc.2
-	stelem.i4
-	brtrue L_1075f90
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::wst_term_106aa9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01075f84: 0x1075f84: sw    a0, -17268(s1)
+// 0x01075cb4: 0x1075cb4: sw    zero, -18000(s0)
 	ldloc 5
-	ldloc 8
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4317
+	ldc.i4 -4500
 	add
-	ldloc.1
+	ldc.i4.s 0
 	stelem.i4
-// 0x01075f88: 0x1075f88: j	 0x1075fc0 sw    a1, 4(s0)
+L_1075cb8:
+// 0x01075cb8: 0x1075cb8: lw    ra, 20(sp)
+// 0x01075cbc: 0x1075cbc: lw    s0, 16(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.4
 	add
-	ldloc.2
-	stelem.i4
-	br L_1075fc0
+	ldelem.i4
+	stloc 6
+// 0x01075cc0: 0x1075cc0: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 RTNet_Init_1075cc8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1075f90:
-// 0x01075f90: 0x1075f90: addiu a0, sp, 32
+// 0x01075cc8: 0x1075cc8: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01075ccc: 0x1075ccc: sw    ra, 20(sp)
+// 0x01075cd0: 0x1075cd0: jal   0x1075bd8 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RTNet_LoadParams_1075bd8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01075cd8: 0x1075cd8: lui   a0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01075cdc: 0x1075cdc: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01075ce0: 0x1075ce0: addiu a0, a0, -17992
+	ldloc.1
+	ldc.i4 -17992
 	add
 	stloc.1
-// 0x01075f94: 0x1075f94: jal   0x1008eb0 addu  a1, s0, zero
-	ldloc 7
+// 0x01075ce4: 0x1075ce4: jal   0x106a798 addiu a1, a1, -28924
+	ldloc.2
+	ldc.i4 -28924
+	add
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::wst_init_106a798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01075f9c: 0x1075f9c: slti  v1, v0, 5
+// 0x01075cec: 0x1075cec: lw    ra, 20(sp)
+// 0x01075cf0: 0x1075cf0: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x01075cf4: 0x1075cf4: sw    v0, -18000(v1)
+	ldloc 8
 	ldloc 6
-	ldc.i4.5
-	clt
-	stloc 9
-// 0x01075fa0: 0x1075fa0: bne   v1, zero, 0x1075fc4 addu  v0, zero, zero
-	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4500
+	add
+	ldloc 5
+	stelem.i4
+// 0x01075cf8: 0x1075cf8: addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+// 0x01075cfc: 0x1075cfc: jr    ra sltu  v0, zero, v0
 	ldc.i4.s 0
-	stloc 6
-	brtrue L_1075fc4
-// --- basic block ---
-// 0x01075fa8: 0x1075fa8: lw    v0, 32(sp)
 	ldloc 5
+	clt.un
+	stloc 5
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RealtimeBonus_Record_Init_1075d0c(int32)
+{
+.maxstack 10
+.locals init (int32 a0,int32[] mem,int32 v0,int32 ra)
+
+// local  2 is register v0
+// local  0 is register a0
+// local  3 is register ra
+// local  1 is register mem
+
+	ldc.i4.s 0
+	stloc.2
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc.3
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.1
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01075d0c: 0x1075d0c: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc.2
+// 0x01075d10: 0x1075d10: sw    v0, 72(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 18
 	add
-	ldelem.i4
-	stloc 6
-// 0x01075fac: 0x1075fac: sll   zero, zero, 0
-// 0x01075fb0: 0x1075fb0: sw    v0, -17268(s1)
-	ldloc 5
-	ldloc 8
+	ldloc.2
+	stelem.i4
+// 0x01075d14: 0x1075d14: sw    zero, 84(a0)
+	ldloc 1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4317
+	ldc.i4.s 21
 	add
-	ldloc 6
+	ldc.i4.s 0
 	stelem.i4
-// 0x01075fb4: 0x1075fb4: lw    v0, 36(sp)
-	ldloc 5
+// 0x01075d18: 0x1075d18: sw    v0, 0(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 6
-// 0x01075fb8: 0x1075fb8: sll   zero, zero, 0
-// 0x01075fbc: 0x1075fbc: sw    v0, 4(s0)
-	ldloc 5
-	ldloc 7
+	ldloc.2
+	stelem.i4
+// 0x01075d1c: 0x1075d1c: sw    zero, 4(a0)
+	ldloc 1
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.1
 	add
-	ldloc 6
+	ldc.i4.s 0
 	stelem.i4
-L_1075fc0:
-// 0x01075fc0: 0x1075fc0: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-L_1075fc4:
-// 0x01075fc4: 0x1075fc4: lw    ra, 28(sp)
-// 0x01075fc8: 0x1075fc8: lw    s1, 24(sp)
-	ldloc 5
+// 0x01075d20: 0x1075d20: sw    v0, 8(a0)
+	ldloc 1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldloc.2
+	stelem.i4
+// 0x01075d24: 0x1075d24: sw    v0, 24(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 8
-// 0x01075fcc: 0x1075fcc: lw    s0, 20(sp)
-	ldloc 5
+	ldloc.2
+	stelem.i4
+// 0x01075d28: 0x1075d28: sw    v0, 20(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 7
-// 0x01075fd0: 0x1075fd0: jr    ra addiu sp, sp, 32
+	ldloc.2
+	stelem.i4
+// 0x01075d2c: 0x1075d2c: sw    zero, 16(a0)
+	ldloc 1
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 RealtimeBonus_HandleEvent_1075fd8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s1,int32 s3,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register s0
-// local 10 is register s1
-// local  8 is register s2
-// local 11 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
 	ldc.i4.s 0
-	stloc 8
+	stelem.i4
+// 0x01075d30: 0x1075d30: sw    zero, 12(a0)
+	ldloc 1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
 	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
+	stelem.i4
+// 0x01075d34: 0x1075d34: sw    zero, 28(a0)
+	ldloc 1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
 	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1075fd8:
-// 0x01075fd8: 0x1075fd8: addiu sp, sp, -48
+	stelem.i4
+// 0x01075d38: 0x1075d38: sb    zero, 32(a0)
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4.s 32
 	add
-	stloc.0
-// 0x01075fdc: 0x1075fdc: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x01075fe0: 0x1075fe0: sw    s1, 32(sp)
-	ldloc 7
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01075d3c: 0x1075d3c: sw    zero, 64(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 16
 	add
-	ldloc 10
+	ldc.i4.s 0
 	stelem.i4
-// 0x01075fe4: 0x1075fe4: sw    ra, 44(sp)
-// 0x01075fe8: 0x1075fe8: addu  s1, a0, zero
-	ldloc.1
-	stloc 10
-// 0x01075fec: 0x1075fec: sw    s3, 40(sp)
-	ldloc 7
+// 0x01075d40: 0x1075d40: sw    zero, 88(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 22
 	add
-	ldloc 11
+	ldc.i4.s 0
 	stelem.i4
-// 0x01075ff0: 0x1075ff0: sw    s2, 36(sp)
-	ldloc 7
+// 0x01075d44: 0x1075d44: sw    v0, 76(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 19
 	add
-	ldloc 8
+	ldloc.2
 	stelem.i4
-// 0x01075ff4: 0x1075ff4: sw    s0, 28(sp)
-	ldloc 7
+// 0x01075d48: 0x1075d48: sw    v0, 68(a0)
+	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 17
 	add
-	ldloc 9
+	ldloc.2
 	stelem.i4
-// 0x01075ff8: 0x1075ff8: addiu v1, v1, -17252
-	ldloc 6
-	ldc.i4 -17252
-	add
-	stloc 6
-// 0x01075ffc: 0x1075ffc: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-// 0x01076000: 0x1076000: addiu a0, zero, 250
-	ldc.i4 250
-	stloc.1
-L_1076004:
-// 0x01076004: 0x1076004: lw    s0, 0(v1)
-	ldloc 7
-	ldloc 6
+// 0x01075d4c: 0x1075d4c: sw    zero, 80(a0)
+	ldloc 1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 9
-// 0x01076008: 0x1076008: sll   zero, zero, 0
-// 0x0107600c: 0x107600c: beq   s0, zero, 0x107604c addiu v1, v1, 4
-	ldloc 9
-	ldloc 6
-	ldc.i4.4
+	ldc.i4.s 20
 	add
-	stloc 6
-	brfalse L_107604c
-// --- basic block ---
-// 0x01076014: 0x1076014: lw    a1, 0(s0)
-	ldloc 7
-	ldloc 9
+	ldc.i4.s 0
+	stelem.i4
+// 0x01075d50: 0x1075d50: sw    zero, 92(a0)
+	ldloc 1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01076018: 0x1076018: sll   zero, zero, 0
-// 0x0107601c: 0x107601c: bne   a1, s1, 0x1076050 addiu v0, v0, 1
-	ldloc.2
-	ldloc 10
-	ldloc 5
-	ldc.i4.1
-	add
-	stloc 5
-	bne.un L_1076050
-// --- basic block ---
-// 0x01076024: 0x1076024: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
+	ldc.i4.s 23
 	add
-	stloc 5
-// 0x01076028: 0x1076028: slti  v0, v0, 250
-	ldloc 5
-	ldc.i4 250
-	clt
-	stloc 5
-// 0x0107602c: 0x107602c: beq   v0, zero, 0x1076200 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1076200
-// --- basic block ---
-// 0x01076034: 0x1076034: lw    v0, 64(s0)
-	ldloc 7
-	ldloc 9
+	ldc.i4.s 0
+	stelem.i4
+// 0x01075d54: 0x1075d54: sw    zero, 96(a0)
+	ldloc 1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc 5
-// 0x01076038: 0x1076038: sll   zero, zero, 0
-// 0x0107603c: 0x107603c: bne   v0, zero, 0x1076200 addiu s2, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 8
-	brtrue L_1076200
-// --- basic block ---
-// 0x01076044: 0x1076044: j	 0x1076060 sll   zero, zero, 0
-	br L_1076060
-// --- basic block ---
-L_107604c:
-// 0x0107604c: 0x107604c: addiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4.s 24
 	add
-	stloc 5
-L_1076050:
-// 0x01076050: 0x1076050: bne   v0, a0, 0x1076004 sll   zero, zero, 0
-	ldloc 5
-	ldloc.1
-	bne.un L_1076004
-// --- basic block ---
-// 0x01076058: 0x1076058: j	 0x1076200 sll   zero, zero, 0
-	br L_1076200
-// --- basic block ---
-L_1076060:
-// 0x01076060: 0x1076060: jal   0x10a6ed0 sw    s2, 64(s0)
-	ldloc 7
-	ldloc 9
+	ldc.i4.s 0
+	stelem.i4
+// 0x01075d58: 0x1075d58: jr    ra sw    zero, 100(a0)
+	ldloc 1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.s 25
 	add
-	ldloc 8
+	ldc.i4.s 0
 	stelem.i4
-	ldloc.0
-	ldloc.1
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a6ed0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01076068: 0x1076068: beq   v0, zero, 0x1076124 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1076124
+	ret
+}
+.method public static int32 RealtimeBonus_Count_1075d60()
+{
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
+
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.2
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076070: 0x1076070: lw    v0, 4(s0)
-	ldloc 7
-	ldloc 9
+L_1075d60:
+// 0x01075d60: 0x1075d60: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.0
+// 0x01075d64: 0x1075d64: lw    v0, -15788(v0)
+	ldloc 2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 -3947
 	add
 	ldelem.i4
-	stloc 5
-// 0x01076074: 0x1076074: sll   zero, zero, 0
-// 0x01076078: 0x1076078: bne   v0, s2, 0x10760b8 lui   a1, 0x20000
-	ldloc 5
-	ldloc 8
-	ldc.i4 131072
-	stloc.2
-	bne.un L_10760b8
+	stloc.0
+// 0x01075d68: 0x1075d68: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RealtimeBonus_Check_Same_Street_1075e68()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076080: 0x1076080: jal   0x106b068 sll   zero, zero, 0
+L_1075e68:
+// 0x01075e68: 0x1075e68: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ret
+}
+.method public static int32 RealtimeBonus_is_square_dependent_1075e70()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076088: 0x1076088: beq   v0, zero, 0x10760b8 lui   a1, 0x20000
-	ldloc 5
-	ldc.i4 131072
+L_1075e70:
+// 0x01075e70: 0x1075e70: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RealtimeBonus_get_location_info_1075e78(int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
+
+// local  1 is register v0
+// local  2 is register v1
+// local  0 is register a0
+// local  3 is register ra
+// local  4 is register mem
+
+	ldc.i4.s 0
+	stloc.1
+	ldc.i4.s 0
 	stloc.2
-	brfalse L_10760b8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc.3
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 4
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076090: 0x1076090: lui   a0, 0x20000
-	ldc.i4 131072
+L_1075e78:
+// 0x01075e78: 0x1075e78: slti  v0, a0, 250
+	ldloc.0
+	ldc.i4 250
+	clt
 	stloc.1
-// 0x01076094: 0x1076094: jal   0x101cd60 addiu a0, a0, -28212
+// 0x01075e7c: 0x1075e7c: beq   v0, zero, 0x1075ea0 sll   a0, a0, 2
 	ldloc.1
-	ldc.i4 -28212
-	add
-	stloc.1
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.2
+	shl
+	stloc.0
+	brfalse L_1075ea0
 // --- basic block ---
-// 0x0107609c: 0x107609c: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x01075e84: 0x1075e84: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc.1
-// 0x010760a0: 0x10760a0: addiu a0, a0, 18500
+// 0x01075e88: 0x1075e88: addiu v0, v0, -16788
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 -16788
 	add
 	stloc.1
-// 0x010760a4: 0x10760a4: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x010760a8: 0x10760a8: jal   0x104bfe4 addiu a2, zero, 10
-	ldc.i4.s 10
-	stloc.3
+// 0x01075e8c: 0x1075e8c: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010760b0: 0x10760b0: j	 0x1076200 sll   zero, zero, 0
-	br L_1076200
-// --- basic block ---
-L_10760b8:
-// 0x010760b8: 0x10760b8: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x010760bc: 0x10760bc: addiu a1, a1, -28844
-	ldloc.2
-	ldc.i4 -28844
 	add
-	stloc.2
-// 0x010760c0: 0x10760c0: addiu a3, a3, -28072
+	stloc.0
+// 0x01075e90: 0x1075e90: lw    v1, 0(a0)
 	ldloc 4
-	ldc.i4 -28072
-	add
-	stloc 4
-// 0x010760c4: 0x10760c4: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x010760c8: 0x10760c8: addiu a2, zero, 621
-	ldc.i4 621
-	stloc.3
-// 0x010760cc: 0x10760cc: lui   s2, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x010760d0: 0x10760d0: jal   0x100449c sw    s1, 16(sp)
-	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 10
-	stelem.i4
-	ldloc.0
-	ldloc.1
+	ldelem.i4
+	stloc.2
+// 0x01075e94: 0x1075e94: sll   zero, zero, 0
+// 0x01075e98: 0x1075e98: bne   v1, zero, 0x1075ea4 addiu v0, v1, 68
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010760d8: 0x10760d8: lw    v0, -17260(s2)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4315
+	ldloc.2
+	ldc.i4.s 68
 	add
-	ldelem.i4
-	stloc 5
-// 0x010760dc: 0x10760dc: sll   zero, zero, 0
-// 0x010760e0: 0x10760e0: bne   v0, zero, 0x1076118 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brtrue L_1076118
+	stloc.1
+	brtrue L_1075ea4
 // --- basic block ---
-// 0x010760e8: 0x10760e8: jal   0x10518a8 addiu a0, zero, 1
-	ldc.i4.1
+L_1075ea0:
+// 0x01075ea0: 0x1075ea0: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc.1
+L_1075ea4:
+// 0x01075ea4: 0x1075ea4: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.2
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ret
+}
+.method public static int32 RealtimeBonus_get_priority_1075eac()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010760f0: 0x10760f0: lui   s3, 0x20000
-	ldc.i4 131072
-	stloc 11
-// 0x010760f4: 0x10760f4: addu  a0, v0, zero
-	ldloc 5
+L_1075eac:
+// 0x01075eac: 0x1075eac: jr    ra addiu v0, zero, 3
+	ldc.i4.3
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RealtimeBonus_Get_Speed_1075eb4()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
 	stloc.1
-// 0x010760f8: 0x10760f8: addiu a1, s3, -28040
-	ldloc 11
-	ldc.i4 -28040
-	add
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1075eb4:
+// 0x01075eb4: 0x1075eb4: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RealtimeBonus_Get_Id_1075ebc(int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
+
+// local  1 is register v0
+// local  0 is register a0
+// local  2 is register ra
+// local  3 is register mem
+
+	ldc.i4.s 0
+	stloc.1
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc.2
-// 0x010760fc: 0x10760fc: jal   0x10518cc sw    v0, -17260(s2)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4315
-	add
-	ldloc 5
-	stelem.i4
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.3
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1075ebc:
+// 0x01075ebc: 0x1075ebc: slti  v0, a0, 250
+	ldloc.0
+	ldc.i4 250
+	clt
+	stloc.1
+// 0x01075ec0: 0x1075ec0: beq   v0, zero, 0x1075ef0 sll   a0, a0, 2
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldloc.0
+	ldc.i4.2
+	shl
+	stloc.0
+	brfalse L_1075ef0
 // --- basic block ---
-// 0x01076104: 0x1076104: addiu a2, s3, -28040
-	ldloc 11
-	ldc.i4 -28040
+// 0x01075ec8: 0x1075ec8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01075ecc: 0x1075ecc: addiu v0, v0, -16788
+	ldloc.1
+	ldc.i4 -16788
 	add
-	stloc.3
-// 0x01076108: 0x1076108: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0107610c: 0x107610c: jal   0x10a1918 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+// 0x01075ed0: 0x1075ed0: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01076114: 0x1076114: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_1076118:
-// 0x01076118: 0x1076118: lw    a0, -17260(v0)
-	ldloc 7
-	ldloc 5
+	add
+	stloc.0
+// 0x01075ed4: 0x1075ed4: lw    v0, 0(a0)
+	ldloc 3
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4315
-	add
 	ldelem.i4
 	stloc.1
-// 0x0107611c: 0x107611c: jal   0x105195c sll   zero, zero, 0
-	ldloc.0
+// 0x01075ed8: 0x1075ed8: sll   zero, zero, 0
+// 0x01075edc: 0x1075edc: beq   v0, zero, 0x1075ef0 sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	brfalse L_1075ef0
 // --- basic block ---
-L_1076124:
-// 0x01076124: 0x1076124: lw    v0, 84(s0)
-	ldloc 7
-	ldloc 9
+// 0x01075ee4: 0x1075ee4: lw    v0, 0(v0)
+	ldloc 3
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
-	add
 	ldelem.i4
-	stloc 5
-// 0x01076128: 0x1076128: sll   zero, zero, 0
-// 0x0107612c: 0x107612c: beq   v0, zero, 0x107619c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107619c
+	stloc.1
+// 0x01075ee8: 0x1075ee8: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x01076134: 0x1076134: jal   0x1026bdc sll   zero, zero, 0
-	ldloc.0
+L_1075ef0:
+// 0x01075ef0: 0x1075ef0: jr    ra addiu v0, zero, -1
+	ldc.i4.m1
+	stloc.1
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_munching_enabled_1026bdc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107613c: 0x107613c: beq   v0, zero, 0x1076158 addu  s2, zero, zero
-	ldloc 5
+	ret
+}
+.method public static int32 RealtimeBonus_Get_Position_1075ef8(int32,int32,int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32[] mem,int32 v1,int32 ra)
+
+// local  3 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  6 is register ra
+// local  4 is register mem
+
 	ldc.i4.s 0
-	stloc 8
-	brfalse L_1076158
-// --- basic block ---
-// 0x01076144: 0x1076144: jal   0x1026edc addiu s2, zero, 1
-	ldc.i4.1
-	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107614c: 0x107614c: bne   v0, zero, 0x1076158 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1076158
-// --- basic block ---
-// 0x01076154: 0x1076154: addu  s2, zero, zero
+	stloc.3
 	ldc.i4.s 0
-	stloc 8
-L_1076158:
-// 0x01076158: 0x1076158: jal   0x1026bb8 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_is_munching_enabled_1026bb8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x01076160: 0x1076160: beq   v0, zero, 0x107617c addu  a2, zero, zero
-	ldloc 5
+	ldarg 0
+	stloc 0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
 	ldc.i4.s 0
-	stloc.3
-	brfalse L_107617c
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 4
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076168: 0x1076168: jal   0x1026d94 sll   zero, zero, 0
+L_1075ef8:
+// 0x01075ef8: 0x1075ef8: slti  v0, a0, 250
 	ldloc.0
-	ldloc.1
-	ldloc.2
+	ldc.i4 250
+	clt
+	stloc.3
+// 0x01075efc: 0x1075efc: beq   v0, zero, 0x1075f40 lui   v0, 0x80000
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01076170: 0x1076170: bne   v0, zero, 0x107617c addiu a2, zero, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4 524288
 	stloc.3
-	brtrue L_107617c
+	brfalse L_1075f40
 // --- basic block ---
-// 0x01076178: 0x1076178: addu  a2, zero, zero
-	ldc.i4.s 0
+// 0x01075f04: 0x1075f04: addiu v0, v0, -16788
+	ldloc.3
+	ldc.i4 -16788
+	add
 	stloc.3
-L_107617c:
-// 0x0107617c: 0x107617c: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x01076180: 0x1076180: jal   0x106b4f0 addu  a1, s2, zero
-	ldloc 8
-	stloc.2
+// 0x01075f08: 0x1075f08: sll   a0, a0, 2
+	ldloc.0
+	ldc.i4.2
+	shl
+	stloc.0
+// 0x01075f0c: 0x1075f0c: addu  a0, a0, v0
 	ldloc.0
-	ldloc.1
-	ldloc.2
 	ldloc.3
+	add
+	stloc.0
+// 0x01075f10: 0x1075f10: lw    v0, 0(a0)
 	ldloc 4
-	call int32 Cibyl79::Realtime_CollectCustomBonus_106b4f0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01076188: 0x1076188: lw    a0, 16(s0)
-	ldloc 7
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
 	ldelem.i4
-	stloc.1
-// 0x0107618c: 0x107618c: jal   0x10acad0 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
+	stloc.3
+// 0x01075f14: 0x1075f14: sll   zero, zero, 0
+// 0x01075f18: 0x1075f18: beq   v0, zero, 0x1075f40 sll   zero, zero, 0
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	brfalse L_1075f40
 // --- basic block ---
-// 0x01076194: 0x1076194: j	 0x10761f8 sll   zero, zero, 0
-	br L_10761f8
+// 0x01075f20: 0x1075f20: beq   a1, zero, 0x1075f40 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1075f40
 // --- basic block ---
-L_107619c:
-// 0x0107619c: 0x107619c: lw    s3, 8(s0)
-	ldloc 7
-	ldloc 9
+// 0x01075f28: 0x1075f28: lw    v1, 24(v0)
+	ldloc 4
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 11
-// 0x010761a0: 0x10761a0: jal   0x1026bdc sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_munching_enabled_1026bdc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x010761a8: 0x10761a8: beq   v0, zero, 0x10761c4 addu  s2, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 8
-	brfalse L_10761c4
-// --- basic block ---
-// 0x010761b0: 0x10761b0: jal   0x1026edc addiu s2, zero, 1
-	ldc.i4.1
-	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
+// 0x01075f2c: 0x1075f2c: lw    v0, 20(v0)
+	ldloc 4
 	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc.3
+// 0x01075f30: 0x1075f30: sw    v1, 4(a1)
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010761b8: 0x10761b8: bne   v0, zero, 0x10761c4 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_10761c4
-// --- basic block ---
-// 0x010761c0: 0x10761c0: addu  s2, zero, zero
-	ldc.i4.s 0
-	stloc 8
-L_10761c4:
-// 0x010761c4: 0x10761c4: jal   0x1026bb8 sll   zero, zero, 0
-	ldloc.0
 	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 5
+	stelem.i4
+// 0x01075f34: 0x1075f34: beq   a2, zero, 0x1075f40 sw    v0, 0(a1)
 	ldloc.2
-	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_is_munching_enabled_1026bb8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010761cc: 0x10761cc: beq   v0, zero, 0x10761e8 addu  a3, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 4
-	brfalse L_10761e8
-// --- basic block ---
-// 0x010761d4: 0x10761d4: jal   0x1026d94 sll   zero, zero, 0
-	ldloc.0
 	ldloc.1
-	ldloc.2
+	ldc.i4.2
+	shr.un
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stelem.i4
+	brfalse L_1075f40
 // --- basic block ---
-// 0x010761dc: 0x10761dc: bne   v0, zero, 0x10761e8 addiu a3, zero, 1
+// 0x01075f3c: 0x1075f3c: sw    zero, 0(a2)
+	ldloc 4
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+L_1075f40:
+// 0x01075f40: 0x1075f40: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 5
-	ldc.i4.1
-	stloc 4
-	brtrue L_10761e8
-// --- basic block ---
-// 0x010761e4: 0x10761e4: addu  a3, zero, zero
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.3
+	ret
+}
+.method public static int32 RealtimeBonus_Get_Distance_1076068(int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
+
+// local  1 is register v0
+// local  0 is register a0
+// local  2 is register ra
+// local  3 is register mem
+
 	ldc.i4.s 0
-	stloc 4
-L_10761e8:
-// 0x010761e8: 0x10761e8: addu  a0, s1, zero
-	ldloc 10
 	stloc.1
-// 0x010761ec: 0x10761ec: addu  a1, s3, zero
-	ldloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc.2
-// 0x010761f0: 0x10761f0: jal   0x106b580 addu  a2, s2, zero
-	ldloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc.3
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1076068:
+// 0x01076068: 0x1076068: slti  v0, a0, 250
 	ldloc.0
+	ldc.i4 250
+	clt
+	stloc.1
+// 0x0107606c: 0x107606c: beq   v0, zero, 0x107609c sll   a0, a0, 2
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_CollectBonus_106b580(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_10761f8:
-// 0x010761f8: 0x10761f8: jal   0x1075b34 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl88::onBonusDelete_1075b34(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_1076200:
-// 0x01076200: 0x1076200: lw    ra, 44(sp)
-// 0x01076204: 0x1076204: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x01076208: 0x1076208: lw    s3, 40(sp)
-	ldloc 7
 	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	shl
+	stloc.0
+	brfalse L_107609c
+// --- basic block ---
+// 0x01076074: 0x1076074: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01076078: 0x1076078: addiu v0, v0, -16788
+	ldloc.1
+	ldc.i4 -16788
 	add
-	ldelem.i4
-	stloc 11
-// 0x0107620c: 0x107620c: lw    s2, 36(sp)
-	ldloc 7
+	stloc.1
+// 0x0107607c: 0x107607c: addu  a0, a0, v0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldloc.1
 	add
-	ldelem.i4
-	stloc 8
-// 0x01076210: 0x1076210: lw    s1, 32(sp)
-	ldloc 7
+	stloc.0
+// 0x01076080: 0x1076080: lw    v0, 0(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
 	ldelem.i4
-	stloc 10
-// 0x01076214: 0x1076214: lw    s0, 28(sp)
-	ldloc 7
-	ldloc.0
+	stloc.1
+// 0x01076084: 0x1076084: sll   zero, zero, 0
+// 0x01076088: 0x1076088: beq   v0, zero, 0x107609c sll   zero, zero, 0
+	ldloc.1
+	brfalse L_107609c
+// --- basic block ---
+// 0x01076090: 0x1076090: lw    v0, 12(v0)
+	ldloc 3
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 9
-// 0x01076218: 0x1076218: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc.0
+	stloc.1
+// 0x01076094: 0x1076094: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+// --- basic block ---
+L_107609c:
+// 0x0107609c: 0x107609c: jr    ra addiu v0, zero, -1
+	ldc.i4.m1
+	stloc.1
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc.1
 	ret
 }
-.method public static int32 AddBonusToMap_1076220(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_Is_Alertable_1076104(int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra,int32 t0)
+.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 16 is register t0
-// local  8 is register s0
-// local 10 is register s1
-// local  9 is register s2
-// local 11 is register s3
-// local 12 is register s4
-// local 13 is register s5
-// local 14 is register s6
-// local  0 is register sp
-// local 15 is register ra
-// local  5 is register mem
+// local  1 is register v0
+// local  2 is register v1
+// local  0 is register a0
+// local  4 is register ra
+// local  3 is register mem
 
 	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
+	stloc.1
 	ldc.i4.s 0
-	stloc 14
+	stloc.2
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 4
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076220: 0x1076220: addiu sp, sp, -112
-	ldloc.0
-	ldc.i4.s -112
-	add
-	stloc.0
-// 0x01076224: 0x1076224: sw    s0, 80(sp)
-	ldloc 5
+L_1076104:
+// 0x01076104: 0x1076104: slti  v0, a0, 250
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 8
-	stelem.i4
-// 0x01076228: 0x1076228: addu  s0, a0, zero
+	ldc.i4 250
+	clt
+	stloc.1
+// 0x01076108: 0x1076108: beq   v0, zero, 0x1076150 addu  v0, zero, zero
 	ldloc.1
-	stloc 8
-// 0x0107622c: 0x107622c: lui   a0, 0x20000
-	ldc.i4 131072
+	ldc.i4.s 0
 	stloc.1
-// 0x01076230: 0x1076230: sw    s2, 88(sp)
-	ldloc 5
+	brfalse L_1076150
+// --- basic block ---
+// 0x01076110: 0x1076110: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01076114: 0x1076114: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldloc 9
-	stelem.i4
-// 0x01076234: 0x1076234: addiu a0, a0, -28032
+	shl
+	stloc.0
+// 0x01076118: 0x1076118: addiu v0, v0, -16788
 	ldloc.1
-	ldc.i4 -28032
+	ldc.i4 -16788
 	add
 	stloc.1
-// 0x01076238: 0x1076238: addiu s2, s0, 32
-	ldloc 8
-	ldc.i4.s 32
-	add
-	stloc 9
-// 0x0107623c: 0x107623c: sw    a1, 72(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
-	add
-	ldloc.2
-	stelem.i4
-// 0x01076240: 0x1076240: sw    ra, 108(sp)
-// 0x01076244: 0x1076244: sw    s5, 100(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldloc 13
-	stelem.i4
-// 0x01076248: 0x1076248: sw    s4, 96(sp)
-	ldloc 5
+// 0x0107611c: 0x107611c: addu  a0, a0, v0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
+	ldloc.1
 	add
-	ldloc 12
-	stelem.i4
-// 0x0107624c: 0x107624c: sw    s3, 92(sp)
-	ldloc 5
+	stloc.0
+// 0x01076120: 0x1076120: lw    v1, 0(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
-	add
-	ldloc 11
-	stelem.i4
-// 0x01076250: 0x1076250: sw    s1, 84(sp)
-	ldloc 5
-	ldloc.0
+	ldelem.i4
+	stloc.2
+// 0x01076124: 0x1076124: sll   zero, zero, 0
+// 0x01076128: 0x1076128: beq   v1, zero, 0x107614c sll   zero, zero, 0
+	ldloc.2
+	brfalse L_107614c
+// --- basic block ---
+// 0x01076130: 0x1076130: lw    a0, 84(v1)
+	ldloc 3
+	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 21
 	add
-	ldloc 10
-	stelem.i4
-// 0x01076254: 0x1076254: jal   0x101ca0c sw    s6, 104(sp)
-	ldloc 5
+	ldelem.i4
+	stloc.0
+// 0x01076134: 0x1076134: sll   zero, zero, 0
+// 0x01076138: 0x1076138: beq   a0, zero, 0x1076150 addiu v0, zero, 1
 	ldloc.0
+	ldc.i4.1
+	stloc.1
+	brfalse L_1076150
+// --- basic block ---
+// 0x01076140: 0x1076140: lw    v0, 88(v1)
+	ldloc 3
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 26
+	ldc.i4.s 22
 	add
-	ldloc 14
-	stelem.i4
-	ldloc.0
+	ldelem.i4
+	stloc.1
+// 0x01076144: 0x1076144: jr    ra sltu  v0, zero, v0
+	ldc.i4.s 0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	clt.un
+	stloc.1
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x0107625c: 0x107625c: addu  a0, s2, zero
-	ldloc 9
+L_107614c:
+// 0x0107614c: 0x107614c: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x01076260: 0x1076260: jal   0x101ca0c addu  s5, v0, zero
-	ldloc 6
-	stloc 13
-	ldloc.0
-	ldloc.1
+L_1076150:
+// 0x01076150: 0x1076150: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.1
+	ret
+}
+.method public static int32 onBonusDelete_1076158(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076268: 0x1076268: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x0107626c: 0x107626c: jal   0x101ca0c addu  s1, v0, zero
+// 0x01076158: 0x1076158: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x0107615c: 0x107615c: sw    s0, 24(sp)
 	ldloc 6
-	stloc 10
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 7
+	stelem.i4
+// 0x01076160: 0x1076160: addu  s0, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01076274: 0x1076274: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01076278: 0x1076278: addiu a0, a0, -27460
+// 0x01076164: 0x1076164: sw    ra, 28(sp)
+// 0x01076168: 0x1076168: jal   0x101ca1c addiu a0, a0, 32
 	ldloc.1
-	ldc.i4 -27460
+	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0107627c: 0x107627c: jal   0x101ca0c addu  s4, v0, zero
-	ldloc 6
-	stloc 12
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01076284: 0x1076284: lw    a0, 28(s0)
+// 0x01076170: 0x1076170: addu  a0, v0, zero
 	ldloc 5
-	ldloc 8
+	stloc.1
+// 0x01076174: 0x1076174: lw    v0, 84(s0)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc.1
-// 0x01076288: 0x1076288: jal   0x101ca0c addu  s3, v0, zero
-	ldloc 6
-	stloc 11
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01076290: 0x1076290: lw    a1, 72(sp)
+	stloc 5
+// 0x01076178: 0x1076178: sll   zero, zero, 0
+// 0x0107617c: 0x107617c: beq   v0, zero, 0x1076194 sll   zero, zero, 0
 	ldloc 5
-	ldloc.0
+	brfalse L_1076194
+// --- basic block ---
+// 0x01076184: 0x1076184: lw    v0, 88(s0)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc.2
-// 0x01076294: 0x1076294: sll   zero, zero, 0
-// 0x01076298: 0x1076298: beq   a1, zero, 0x10762d0 addu  s2, v0, zero
-	ldloc.2
-	ldloc 6
-	stloc 9
-	brfalse L_10762d0
-// --- basic block ---
-// 0x010762a0: 0x10762a0: lw    a2, 16(s0)
+	stloc 5
+// 0x01076188: 0x1076188: sll   zero, zero, 0
+// 0x0107618c: 0x107618c: beq   v0, zero, 0x10761b0 sll   zero, zero, 0
 	ldloc 5
-	ldloc 8
+	brfalse L_10761b0
+// --- basic block ---
+L_1076194:
+// 0x01076194: 0x1076194: jal   0x10a7518 sw    a0, 16(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc.3
-// 0x010762a4: 0x10762a4: sll   zero, zero, 0
-// 0x010762a8: 0x10762a8: beq   a2, zero, 0x10762d0 addiu s6, sp, 40
-	ldloc.3
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 14
-	brfalse L_10762d0
-// --- basic block ---
-// 0x010762b0: 0x10762b0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010762b4: 0x10762b4: addu  a0, s6, zero
-	ldloc 14
-	stloc.1
-// 0x010762b8: 0x10762b8: jal   0x1000f64 addiu a1, a1, -13884
-	ldloc.2
-	ldc.i4 -13884
-	add
-	stloc.2
+	ldloc.1
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a7518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x010762c0: 0x10762c0: jal   0x101ca0c addu  a0, s6, zero
-	ldloc 14
+// 0x0107619c: 0x107619c: lw    a0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
 	stloc.1
+// 0x010761a0: 0x10761a0: beq   v0, zero, 0x10761b0 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_10761b0
+// --- basic block ---
+// 0x010761a8: 0x10761a8: jal   0x101c15c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010762c8: 0x10762c8: j	 0x10762d4 sll   zero, zero, 0
-	br L_10762d4
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_10762d0:
-// 0x010762d0: 0x10762d0: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-L_10762d4:
-// 0x010762d4: 0x10762d4: lw    v1, 24(s0)
-	ldloc 5
-	ldloc 8
+L_10761b0:
+// 0x010761b0: 0x10761b0: lw    ra, 28(sp)
+// 0x010761b4: 0x10761b4: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x010761b8: 0x10761b8: lw    s0, 24(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 7
-// 0x010762d8: 0x10762d8: lw    t0, 20(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 16
-// 0x010762dc: 0x10762dc: sw    v1, 56(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 7
-	stelem.i4
-// 0x010762e0: 0x10762e0: addiu v1, sp, 52
+// 0x010761bc: 0x10761bc: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 52
+	ldc.i4.s 32
 	add
-	stloc 7
-// 0x010762e4: 0x10762e4: addu  a2, s4, zero
-	ldloc 12
-	stloc.3
-// 0x010762e8: 0x10762e8: addu  a3, s3, zero
-	ldloc 11
-	stloc 4
-// 0x010762ec: 0x10762ec: addu  a0, s5, zero
-	ldloc 13
-	stloc.1
-// 0x010762f0: 0x10762f0: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x010762f4: 0x10762f4: sw    v1, 20(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x010762f8: 0x10762f8: addiu v1, zero, 17
-	ldc.i4.s 17
+	ret
+}
+.method public static int32 RealtimeBonus_Term_10761c4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 v0,int32 ra,int32 v1)
+
+// local  9 is register v0
+// local 11 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  6 is register s0
+// local  7 is register s1
+// local  8 is register s2
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
 	stloc 7
-// 0x010762fc: 0x10762fc: sw    t0, 52(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 16
-	stelem.i4
-// 0x01076300: 0x1076300: sw    v1, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 7
-	stelem.i4
-// 0x01076304: 0x1076304: sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-// 0x01076308: 0x1076308: sw    s2, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107630c: 0x107630c: sw    zero, 60(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 15
-	add
 	ldc.i4.s 0
-	stelem.i4
-// 0x01076310: 0x1076310: sw    zero, 64(sp)
-	ldloc 5
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010761c4: 0x10761c4: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	ldc.i4.s -32
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01076314: 0x1076314: sw    zero, 68(sp)
+	stloc.0
+// 0x010761c8: 0x10761c8: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.6
 	add
-	ldc.i4.s 0
+	ldloc 8
 	stelem.i4
-// 0x01076318: 0x1076318: jal   0x101c4fc sw    zero, 24(sp)
+// 0x010761cc: 0x10761cc: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.4
 	add
-	ldc.i4.s 0
+	ldloc 6
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_101c4fc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01076320: 0x1076320: addiu v0, zero, 1
-	ldc.i4.1
+// 0x010761d0: 0x10761d0: lui   s2, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x010761d4: 0x10761d4: lui   s0, 0x80000
+	ldc.i4 524288
 	stloc 6
-// 0x01076324: 0x1076324: lui   a1, 0x1070000
-	ldc.i4 17235968
-	stloc.2
-// 0x01076328: 0x1076328: sw    v0, 88(s0)
+// 0x010761d8: 0x10761d8: sw    ra, 28(sp)
+// 0x010761dc: 0x10761dc: sw    s1, 20(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.5
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-// 0x0107632c: 0x107632c: addiu a1, a1, 26812
-	ldloc.2
-	ldc.i4 26812
+// 0x010761e0: 0x10761e0: addiu s0, s0, -16788
+	ldloc 6
+	ldc.i4 -16788
 	add
-	stloc.2
-// 0x01076330: 0x1076330: jal   0x101bed0 addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01076338: 0x1076338: jal   0x101c8f8 addu  a0, s5, zero
-	ldloc 13
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
-// --- basic block ---
-// 0x01076340: 0x1076340: jal   0x101c8f8 addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x010761e4: 0x10761e4: addiu s2, s2, -15788
+	ldloc 8
+	ldc.i4 -15788
+	add
+	stloc 8
+L_10761e8:
+// 0x010761e8: 0x10761e8: lw    s1, 0(s0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01076348: 0x1076348: jal   0x101c8f8 addu  a0, s4, zero
-	ldloc 12
+// 0x010761ec: 0x10761ec: sll   zero, zero, 0
+// 0x010761f0: 0x10761f0: beq   s1, zero, 0x1076208 addu  a0, s1, zero
+	ldloc 7
+	ldloc 7
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	brfalse L_1076208
 // --- basic block ---
-// 0x01076350: 0x1076350: jal   0x101c8f8 addu  a0, s3, zero
-	ldloc 11
-	stloc.1
+// 0x010761f8: 0x10761f8: jal   0x1076158 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::onBonusDelete_1076158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 11
+	stloc 9
 // --- basic block ---
-// 0x01076358: 0x1076358: jal   0x101c8f8 addu  a0, s2, zero
-	ldloc 9
+// 0x01076200: 0x1076200: jal   0x1000930 addu  a0, s1, zero
+	ldloc 7
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 11
+	stloc 9
 // --- basic block ---
-// 0x01076360: 0x1076360: lw    ra, 108(sp)
-// 0x01076364: 0x1076364: lw    s6, 104(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
-	add
-	ldelem.i4
-	stloc 14
-// 0x01076368: 0x1076368: lw    s5, 100(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107636c: 0x107636c: lw    s4, 96(sp)
+L_1076208:
+// 0x01076208: 0x1076208: sw    zero, 0(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107620c: 0x107620c: addiu s0, s0, 4
+	ldloc 6
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 12
-// 0x01076370: 0x1076370: lw    s3, 92(sp)
+	stloc 6
+// 0x01076210: 0x1076210: bne   s0, s2, 0x10761e8 lui   v0, 0x80000
+	ldloc 6
+	ldloc 8
+	ldc.i4 524288
+	stloc 9
+	bne.un L_10761e8
+// --- basic block ---
+// 0x01076218: 0x1076218: lw    ra, 28(sp)
+// 0x0107621c: 0x107621c: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 11
-// 0x01076374: 0x1076374: lw    s2, 88(sp)
+	stloc 8
+// 0x01076220: 0x1076220: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 22
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 9
-// 0x01076378: 0x1076378: lw    s1, 84(sp)
+	stloc 7
+// 0x01076224: 0x1076224: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 10
-// 0x0107637c: 0x107637c: lw    s0, 80(sp)
+	stloc 6
+// 0x01076228: 0x1076228: sw    zero, -15788(v0)
 	ldloc 5
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4 -3947
 	add
-	ldelem.i4
-	stloc 8
-// 0x01076380: 0x1076380: jr    ra addiu sp, sp, 112
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107622c: 0x107622c: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 112
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 11
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 9
 	ret
 }
-.method public static int32 onBonusAdd_1076388(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_Init_1076234(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
 // local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6440,142 +5089,295 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076388: 0x1076388: lw    v0, 84(a0)
-	ldloc 6
-	ldloc.1
+// 0x01076234: 0x1076234: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01076238: 0x1076238: lw    v1, -16808(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4 -4202
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107638c: 0x107638c: addiu sp, sp, -32
+	stloc 6
+// 0x0107623c: 0x107623c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01076390: 0x1076390: beq   v0, zero, 0x10763b0 sw    ra, 28(sp)
+// 0x01076240: 0x1076240: sw    ra, 28(sp)
+// 0x01076244: 0x1076244: bne   v1, zero, 0x1076260 sw    s0, 24(sp)
+	ldloc 6
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+	brtrue L_1076260
+// --- basic block ---
+// 0x0107624c: 0x107624c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01076250: 0x1076250: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x01076254: 0x1076254: addiu a0, a0, 15612
+	ldloc.1
+	ldc.i4 15612
+	add
+	stloc.1
+// 0x01076258: 0x1076258: jal   0x1033170 sw    v1, -16808(v0)
+	ldloc 7
 	ldloc 5
-	brfalse L_10763b0
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4202
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl37::roadmap_alerter_register_1033170(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01076398: 0x1076398: lui   a1, 0x1070000
-	ldc.i4 17235968
+L_1076260:
+// 0x01076260: 0x1076260: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01076264: 0x1076264: addiu v0, v0, -16788
+	ldloc 5
+	ldc.i4 -16788
+	add
+	stloc 5
+// 0x01076268: 0x1076268: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x0107626c: 0x107626c: sw    zero, 1000(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 250
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x01076270: 0x1076270: addiu v1, v1, -15788
+	ldloc 6
+	ldc.i4 -15788
+	add
+	stloc 6
+L_1076274:
+// 0x01076274: 0x1076274: sw    zero, 0(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x01076278: 0x1076278: addiu v0, v0, 4
+	ldloc 5
+	ldc.i4.4
+	add
+	stloc 5
+// 0x0107627c: 0x107627c: bne   v0, v1, 0x1076274 lui   a1, 0x0
+	ldloc 5
+	ldloc 6
+	ldc.i4.s 0
 	stloc.2
-// 0x0107639c: 0x107639c: addiu a1, a1, 25776
+	bne.un L_1076274
+// --- basic block ---
+// 0x01076284: 0x1076284: lui   s0, 0x10000
+	ldc.i4 65536
+	stloc 8
+// 0x01076288: 0x1076288: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107628c: 0x107628c: addiu a0, s0, 12556
+	ldloc 8
+	ldc.i4 12556
+	add
+	stloc.1
+// 0x01076290: 0x1076290: addiu a1, a1, 15692
 	ldloc.2
-	ldc.i4 25776
+	ldc.i4 15692
 	add
 	stloc.2
-// 0x010763a0: 0x10763a0: jal   0x104fe98 addiu a0, zero, 1000
-	ldc.i4 1000
-	stloc.1
+// 0x01076294: 0x1076294: addiu a2, a2, -15292
+	ldloc.3
+	ldc.i4 -15292
+	add
+	stloc.3
+// 0x01076298: 0x1076298: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010763a8: 0x10763a8: j	 0x10763cc sll   zero, zero, 0
-	br L_10763cc
-// --- basic block ---
-L_10763b0:
-// 0x010763b0: 0x10763b0: jal   0x10a6ed0 sw    a0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+// 0x010762a0: 0x10762a0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x010762a4: 0x10762a4: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x010762a8: 0x10762a8: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x010762ac: 0x10762ac: addiu a0, a0, -26424
 	ldloc.1
-	stelem.i4
+	ldc.i4 -26424
+	add
+	stloc.1
+// 0x010762b0: 0x10762b0: addiu a1, a1, 15708
+	ldloc.2
+	ldc.i4 15708
+	add
+	stloc.2
+// 0x010762b4: 0x10762b4: addiu a2, a2, -52
+	ldloc.3
+	ldc.i4.s -52
+	add
+	stloc.3
+// 0x010762b8: 0x10762b8: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a6ed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010763b8: 0x10763b8: lw    a0, 16(sp)
-	ldloc 6
+// 0x010762c0: 0x10762c0: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x010762c4: 0x10762c4: lui   a3, 0x0
+	ldc.i4.s 0
+	stloc 4
+// 0x010762c8: 0x10762c8: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x010762cc: 0x10762cc: addiu a0, s0, 12556
+	ldloc 8
+	ldc.i4 12556
+	add
+	stloc.1
+// 0x010762d0: 0x10762d0: addiu v0, v0, 9928
+	ldloc 5
+	ldc.i4 9928
+	add
+	stloc 5
+// 0x010762d4: 0x10762d4: addiu a1, a1, 15724
+	ldloc.2
+	ldc.i4 15724
+	add
+	stloc.2
+// 0x010762d8: 0x10762d8: addiu a3, a3, 20820
+	ldloc 4
+	ldc.i4 20820
+	add
+	stloc 4
+// 0x010762dc: 0x10762dc: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x010762e0: 0x10762e0: sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc.1
-// 0x010763bc: 0x10763bc: beq   v0, zero, 0x10763cc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10763cc
-// --- basic block ---
-// 0x010763c4: 0x10763c4: jal   0x1076220 addu  a1, zero, zero
+	stelem.i4
+// 0x010762e4: 0x10762e4: jal   0x100ee08 sw    zero, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldc.i4.s 0
-	stloc.2
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::AddBonusToMap_1076220(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_10763cc:
-// 0x010763cc: 0x10763cc: lw    ra, 28(sp)
-// 0x010763d0: 0x10763d0: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x010763d4: 0x10763d4: jr    ra addiu sp, sp, 32
+// 0x010762ec: 0x10762ec: lw    ra, 28(sp)
+// 0x010762f0: 0x10762f0: lw    s0, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x010762f4: 0x10762f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 on_resource_downloaded_10763dc(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_OpenMessageTicker_10762fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 v0,int32 ra,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s3,int32 s1,int32 s2,int32 v0,int32 v1,int32 ra)
 
 // local 10 is register v0
-// local 12 is register v1
+// local 11 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  6 is register s0
-// local  7 is register s1
-// local  8 is register s2
-// local  9 is register s3
+// local  8 is register s1
+// local  9 is register s2
+// local  7 is register s3
 // local  0 is register sp
-// local 11 is register ra
+// local 12 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 12
+	stloc 11
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6587,205 +5389,346 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 7
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010763dc: 0x10763dc: addiu sp, sp, -40
+// 0x010762fc: 0x10762fc: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010763e0: 0x10763e0: sw    s2, 28(sp)
+// 0x01076300: 0x1076300: sw    s2, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 11
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x010763e4: 0x10763e4: sw    s0, 20(sp)
+// 0x01076304: 0x1076304: sw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 10
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
-// 0x010763e8: 0x10763e8: lui   s2, 0x80000
-	ldc.i4 524288
+// 0x01076308: 0x1076308: addu  s2, a1, zero
+	ldloc.2
+	stloc 9
+// 0x0107630c: 0x107630c: addu  s1, a3, zero
+	ldloc 4
 	stloc 8
-// 0x010763ec: 0x10763ec: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x010763f0: 0x10763f0: sw    s3, 32(sp)
+// 0x01076310: 0x1076310: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01076314: 0x1076314: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01076318: 0x1076318: sw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 12
 	add
-	ldloc 9
+	ldloc 7
 	stelem.i4
-// 0x010763f4: 0x10763f4: sw    ra, 36(sp)
-// 0x010763f8: 0x10763f8: sw    s1, 24(sp)
+// 0x0107631c: 0x107631c: sw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
-	ldloc 7
+	ldloc 6
 	stelem.i4
-// 0x010763fc: 0x10763fc: addu  s3, a0, zero
+// 0x01076320: 0x1076320: addu  s3, a2, zero
+	ldloc.3
+	stloc 7
+// 0x01076324: 0x1076324: addu  s0, a0, zero
 	ldloc.1
-	stloc 9
-// 0x01076400: 0x1076400: addiu s0, s0, -17252
-	ldloc 6
-	ldc.i4 -17252
-	add
 	stloc 6
-// 0x01076404: 0x1076404: addiu s2, s2, -16252
-	ldloc 8
-	ldc.i4 -16252
+// 0x01076328: 0x1076328: addiu a1, a1, -28380
+	ldloc.2
+	ldc.i4 -28380
 	add
-	stloc 8
-L_1076408:
-// 0x01076408: 0x1076408: lw    s1, 0(s0)
+	stloc.2
+// 0x0107632c: 0x107632c: addiu a3, a3, -28344
+	ldloc 4
+	ldc.i4 -28344
+	add
+	stloc 4
+// 0x01076330: 0x1076330: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01076334: 0x1076334: addiu a2, zero, 721
+	ldc.i4 721
+	stloc.3
+// 0x01076338: 0x1076338: sw    ra, 52(sp)
+// 0x0107633c: 0x107633c: sw    s0, 16(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 7
-// 0x0107640c: 0x107640c: addu  a0, s3, zero
-	ldloc 9
-	stloc.1
-// 0x01076410: 0x1076410: beq   s1, zero, 0x1076434 addiu s0, s0, 4
-	ldloc 7
-	ldloc 6
 	ldc.i4.4
 	add
-	stloc 6
-	brfalse L_1076434
-// --- basic block ---
-// 0x01076418: 0x1076418: lw    a1, 28(s1)
+	ldloc 6
+	stelem.i4
+// 0x01076340: 0x1076340: sw    s3, 20(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 7
+	stelem.i4
+// 0x01076344: 0x1076344: sw    s2, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 9
+	stelem.i4
+// 0x01076348: 0x1076348: jal   0x100449c sw    s1, 28(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107641c: 0x107641c: jal   0x1001b14 sll   zero, zero, 0
+	ldloc 8
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
 	stloc 10
 // --- basic block ---
-// 0x01076424: 0x1076424: bne   v0, zero, 0x1076434 sll   zero, zero, 0
-	ldloc 10
-	brtrue L_1076434
-// --- basic block ---
-// 0x0107642c: 0x107642c: jal   0x1076388 addu  a0, s1, zero
+// 0x01076350: 0x1076350: blez  s0, 0x1076364 addu  a0, s3, zero
+	ldloc 6
 	ldloc 7
 	stloc.1
+	ldc.i4.s 0
+	ble L_1076364
+// --- basic block ---
+// 0x01076358: 0x1076358: jal   0x10ad118 addu  a0, s0, zero
+	ldloc 6
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::onBonusAdd_1076388(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 12
+	stloc 11
 	stloc 10
 // --- basic block ---
-L_1076434:
-// 0x01076434: 0x1076434: bne   s0, s2, 0x1076408 sll   zero, zero, 0
-	ldloc 6
+// 0x01076360: 0x1076360: addu  a0, s3, zero
+	ldloc 7
+	stloc.1
+L_1076364:
+// 0x01076364: 0x1076364: addu  a1, s2, zero
+	ldloc 9
+	stloc.2
+// 0x01076368: 0x1076368: addu  a2, s1, zero
 	ldloc 8
-	bne.un L_1076408
+	stloc.3
+// 0x0107636c: 0x107636c: jal   0x1053b20 addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl62::roadmap_message_ticker_show_1053b20(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
+	stloc 10
 // --- basic block ---
-// 0x0107643c: 0x107643c: lw    ra, 36(sp)
-// 0x01076440: 0x1076440: lw    s3, 32(sp)
+// 0x01076374: 0x1076374: lw    ra, 52(sp)
+// 0x01076378: 0x1076378: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 10
+// 0x0107637c: 0x107637c: lw    s3, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 7
+// 0x01076380: 0x1076380: lw    s2, 44(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
 	ldelem.i4
 	stloc 9
-// 0x01076444: 0x1076444: lw    s2, 28(sp)
+// 0x01076384: 0x1076384: lw    s1, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 10
 	add
 	ldelem.i4
 	stloc 8
-// 0x01076448: 0x1076448: lw    s1, 24(sp)
+// 0x01076388: 0x1076388: lw    s0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107638c: 0x107638c: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 11
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 10
+	ret
+}
+.method public static int32 RealtimeBonus_CreateGUIID_1076394(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01076394: 0x1076394: lw    a3, 0(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x01076398: 0x1076398: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107639c: 0x107639c: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x010763a0: 0x10763a0: addiu a2, a2, -28264
+	ldloc.3
+	ldc.i4 -28264
+	add
+	stloc.3
+// 0x010763a4: 0x10763a4: addiu a0, a0, 32
+	ldloc.1
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 7
-// 0x0107644c: 0x107644c: lw    s0, 20(sp)
-	ldloc 5
+	stloc.1
+// 0x010763a8: 0x10763a8: sw    ra, 20(sp)
+// 0x010763ac: 0x10763ac: jal   0x1000f9c addiu a1, zero, 30
+	ldc.i4.s 30
+	stloc.2
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 6
-// 0x01076450: 0x1076450: jr    ra addiu sp, sp, 40
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x010763b4: 0x10763b4: lw    ra, 20(sp)
+// 0x010763b8: 0x10763b8: sll   zero, zero, 0
+// 0x010763bc: 0x10763bc: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 12
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 10
+	ldloc 7
 	ret
 }
-.method public static int32 ticker_closed_cb_1076458(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_CollectedPointsConfirmed_10763c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local 11 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6794,70 +5737,190 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 11
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076458: 0x1076458: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0107645c: 0x107645c: lw    v1, 15740(v0)
-	ldloc 7
-	ldloc 5
+// 0x010763c4: 0x10763c4: addiu sp, sp, -304
+	ldloc.0
+	ldc.i4 -304
+	add
+	stloc.0
+// 0x010763c8: 0x10763c8: sw    s2, 296(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3935
+	ldc.i4.s 74
 	add
-	ldelem.i4
-	stloc 6
-// 0x01076460: 0x1076460: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01076464: 0x1076464: sll   v1, v1, 2
+	ldloc 10
+	stelem.i4
+// 0x010763cc: 0x10763cc: sw    s0, 288(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
-	shl
-	stloc 6
-// 0x01076468: 0x1076468: addiu v0, v0, -17252
-	ldloc 5
-	ldc.i4 -17252
+	shr.un
+	ldc.i4.s 72
 	add
-	stloc 5
-// 0x0107646c: 0x107646c: addu  v0, v1, v0
+	ldloc 8
+	stelem.i4
+// 0x010763d0: 0x10763d0: sw    ra, 300(sp)
+// 0x010763d4: 0x10763d4: sw    s1, 292(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 73
 	add
+	ldloc 9
+	stelem.i4
+// 0x010763d8: 0x10763d8: addu  v1, a1, zero
+	ldloc.2
+	stloc 7
+// 0x010763dc: 0x10763dc: addu  v0, a0, zero
+	ldloc.1
 	stloc 5
-// 0x01076470: 0x1076470: lw    v0, 0(v0)
-	ldloc 7
-	ldloc 5
+// 0x010763e0: 0x10763e0: lw    s2, 324(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 81
+	add
 	ldelem.i4
-	stloc 5
-// 0x01076474: 0x1076474: lui   a0, 0x0
-	ldc.i4.s 0
+	stloc 10
+// 0x010763e4: 0x10763e4: bne   a1, zero, 0x107643c addu  s0, a2, zero
+	ldloc.2
+	ldloc.3
+	stloc 8
+	brtrue L_107643c
+// --- basic block ---
+// 0x010763ec: 0x10763ec: beq   a2, zero, 0x107641c lui   a1, 0x20000
+	ldloc.3
+	ldc.i4 131072
+	stloc.2
+	brfalse L_107641c
+// --- basic block ---
+// 0x010763f4: 0x10763f4: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x010763f8: 0x10763f8: addiu a1, a1, -28380
+	ldloc.2
+	ldc.i4 -28380
+	add
+	stloc.2
+// 0x010763fc: 0x10763fc: addiu a3, a3, -28248
+	ldloc 4
+	ldc.i4 -28248
+	add
+	stloc 4
+// 0x01076400: 0x1076400: addiu a2, zero, 680
+	ldc.i4 680
+	stloc.3
+// 0x01076404: 0x1076404: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01076478: 0x1076478: lw    a1, 0(v0)
-	ldloc 7
+// 0x01076408: 0x1076408: sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
 	ldloc 5
+	stelem.i4
+// 0x0107640c: 0x107640c: jal   0x100449c sw    s0, 20(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01076414: 0x1076414: j	 0x10764c0 sll   zero, zero, 0
+	br L_10764c0
+// --- basic block ---
+L_107641c:
+// 0x0107641c: 0x107641c: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01076420: 0x1076420: addiu a1, a1, -28380
+	ldloc.2
+	ldc.i4 -28380
+	add
 	stloc.2
-// 0x0107647c: 0x107647c: addiu sp, sp, -24
+// 0x01076424: 0x1076424: addiu a3, a3, -28188
+	ldloc 4
+	ldc.i4 -28188
+	add
+	stloc 4
+// 0x01076428: 0x1076428: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0107642c: 0x107642c: addiu a2, zero, 685
+	ldc.i4 685
+	stloc.3
+// 0x01076430: 0x1076430: sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-// 0x01076480: 0x1076480: sw    ra, 20(sp)
-// 0x01076484: 0x1076484: jal   0x100e610 addiu a0, a0, 15708
+	ldloc 5
+	stelem.i4
+// 0x01076434: 0x1076434: j	 0x107655c sw    zero, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldc.i4.s 0
+	stelem.i4
+	br L_107655c
+// --- basic block ---
+L_107643c:
+// 0x0107643c: 0x107643c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01076440: 0x1076440: bne   a1, a0, 0x1076540 lui   a1, 0x20000
+	ldloc.2
 	ldloc.1
-	ldc.i4 15708
+	ldc.i4 131072
+	stloc.2
+	bne.un L_1076540
+// --- basic block ---
+// 0x01076448: 0x1076448: bne   a3, zero, 0x1076474 lui   a0, 0x20000
+	ldloc 4
+	ldc.i4 131072
+	stloc.1
+	brtrue L_1076474
+// --- basic block ---
+// 0x01076450: 0x1076450: jal   0x101cd70 addiu a0, a0, -28120
+	ldloc.1
+	ldc.i4 -28120
 	add
 	stloc.1
 	ldloc.0
@@ -6865,146 +5928,136 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107648c: 0x107648c: jal   0x100ea50 addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x01076458: 0x1076458: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
+// 0x0107645c: 0x107645c: addiu a0, a0, 18768
+	ldloc.1
+	ldc.i4 18768
+	add
+	stloc.1
+// 0x01076460: 0x1076460: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x01076464: 0x1076464: jal   0x104bff4 addiu a2, zero, 10
+	ldc.i4.s 10
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01076494: 0x1076494: lui   a0, 0x1070000
-	ldc.i4 17235968
+// 0x0107646c: 0x107646c: j	 0x1076564 sll   zero, zero, 0
+	br L_1076564
+// --- basic block ---
+L_1076474:
+// 0x01076474: 0x1076474: beq   a2, zero, 0x10764e0 lui   s1, 0x10000
+	ldloc.3
+	ldc.i4 65536
+	stloc 9
+	brfalse L_10764e0
+// --- basic block ---
+// 0x0107647c: 0x107647c: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x01076498: 0x1076498: jal   0x1029c90 addiu a0, a0, 28400
+// 0x01076480: 0x1076480: jal   0x101cd70 addiu a0, a0, -28008
 	ldloc.1
-	ldc.i4 28400
+	ldc.i4 -28008
 	add
 	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl30::roadmap_navigate_register_segment_changed_1029c90(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010764a0: 0x10764a0: lw    ra, 20(sp)
-// 0x010764a4: 0x10764a4: sll   zero, zero, 0
-// 0x010764a8: 0x10764a8: jr    ra addiu sp, sp, 24
+// 0x01076488: 0x1076488: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x0107648c: 0x107648c: addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 SpeedCheck_Timer_10764b0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
-
-// local  6 is register v0
-// local  5 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 5
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010764b0: 0x10764b0: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x010764b4: 0x10764b4: sw    ra, 52(sp)
-// 0x010764b8: 0x10764b8: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
-	stloc 6
-// --- basic block ---
-// 0x010764c0: 0x10764c0: beq   v0, zero, 0x1076558 addiu a0, sp, 24
+	stloc 9
+// 0x01076490: 0x1076490: jal   0x101cd70 sw    v0, 280(sp)
 	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 70
 	add
-	stloc.1
-	brfalse L_1076558
-// --- basic block ---
-// 0x010764c8: 0x10764c8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x010764cc: 0x10764cc: jal   0x1029da8 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	stloc 6
 // --- basic block ---
-// 0x010764d4: 0x10764d4: lw    v0, 36(sp)
-	ldloc 7
+// 0x01076498: 0x1076498: lw    a2, 280(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 70
 	add
 	ldelem.i4
-	stloc 6
-// 0x010764d8: 0x10764d8: sll   zero, zero, 0
-// 0x010764dc: 0x10764dc: slti  v0, v0, 2
+	stloc.3
+// 0x0107649c: 0x107649c: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x010764a0: 0x10764a0: addiu a1, zero, 250
+	ldc.i4 250
+	stloc.2
+// 0x010764a4: 0x10764a4: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x010764a8: 0x10764a8: jal   0x1000f9c sw    s0, 16(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
-	clt
-	stloc 6
-// 0x010764e0: 0x10764e0: beq   v0, zero, 0x1076558 lui   a0, 0x1070000
-	ldloc 6
-	ldc.i4 17235968
-	stloc.1
-	brfalse L_1076558
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x010764e8: 0x10764e8: jal   0x104fd00 addiu a0, a0, 25776
+// 0x010764b0: 0x10764b0: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x010764b4: 0x10764b4: addu  a1, s1, zero
+	ldloc 9
+	stloc.2
+// 0x010764b8: 0x10764b8: jal   0x104c158 addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 25776
+	ldc.i4 18768
 	add
 	stloc.1
 	ldloc.0
@@ -7012,188 +6065,283 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	stloc 6
 // --- basic block ---
-// 0x010764f0: 0x10764f0: lui   a0, 0x0
-	ldc.i4.s 0
+L_10764c0:
+// 0x010764c0: 0x10764c0: jal   0x10ad118 addu  a0, s0, zero
+	ldloc 8
 	stloc.1
-// 0x010764f4: 0x10764f4: jal   0x100e788 addiu a0, a0, 15708
+	ldloc.0
 	ldloc.1
-	ldc.i4 15708
-	add
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010764c8: 0x10764c8: addu  a0, s0, zero
+	ldloc 8
 	stloc.1
+// 0x010764cc: 0x10764cc: addiu a1, zero, 6
+	ldc.i4.6
+	stloc.2
+// 0x010764d0: 0x10764d0: jal   0x10acebc addiu a2, zero, 6
+	ldc.i4.6
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_display_new_points_timed_10acebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	stloc 6
 // --- basic block ---
-// 0x010764fc: 0x10764fc: lui   v1, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x01076500: 0x1076500: lw    a0, 15740(v1)
-	ldloc 7
-	ldloc 5
+// 0x010764d8: 0x10764d8: j	 0x1076564 sll   zero, zero, 0
+	br L_1076564
+// --- basic block ---
+L_10764e0:
+// 0x010764e0: 0x10764e0: lw    v0, 320(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3935
+	ldc.i4.s 80
 	add
 	ldelem.i4
-	stloc.1
-// 0x01076504: 0x1076504: lui   v1, 0x80000
-	ldc.i4 524288
 	stloc 5
-// 0x01076508: 0x1076508: sll   a0, a0, 2
-	ldloc.1
-	ldc.i4.2
-	shl
-	stloc.1
-// 0x0107650c: 0x107650c: addiu v1, v1, -17252
+// 0x010764e4: 0x10764e4: sll   zero, zero, 0
+// 0x010764e8: 0x10764e8: beq   v0, zero, 0x10764fc addiu s0, sp, 24
 	ldloc 5
-	ldc.i4 -17252
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc 5
-// 0x01076510: 0x1076510: addu  v1, a0, v1
+	stloc 8
+	brfalse L_10764fc
+// --- basic block ---
+// 0x010764f0: 0x10764f0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x010764f4: 0x10764f4: j	 0x1076504 addiu a0, a0, -27932
 	ldloc.1
-	ldloc 5
+	ldc.i4 -27932
+	add
+	stloc.1
+	br L_1076504
+// --- basic block ---
+L_10764fc:
+// 0x010764fc: 0x10764fc: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076500: 0x1076500: addiu a0, a0, -27864
+	ldloc.1
+	ldc.i4 -27864
 	add
+	stloc.1
+L_1076504:
+// 0x01076504: 0x1076504: jal   0x101cd70 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x01076514: 0x1076514: lw    v1, 0(v1)
-	ldloc 7
-	ldloc 5
+// --- basic block ---
+// 0x0107650c: 0x107650c: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x01076510: 0x1076510: jal   0x101cd70 sw    v0, 280(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 5
-// 0x01076518: 0x1076518: sll   zero, zero, 0
-// 0x0107651c: 0x107651c: lw    a0, 0(v1)
-	ldloc 7
+	ldc.i4.s 70
+	add
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01076520: 0x1076520: sll   zero, zero, 0
-// 0x01076524: 0x1076524: beq   v0, a0, 0x1076550 lui   v0, 0x1070000
-	ldloc 6
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	ldc.i4 17235968
-	stloc 6
-	beq  L_1076550
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107652c: 0x107652c: lw    a2, 100(v1)
-	ldloc 7
-	ldloc 5
+// 0x01076518: 0x1076518: lw    a2, 280(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
+	ldc.i4.s 70
 	add
 	ldelem.i4
 	stloc.3
-// 0x01076530: 0x1076530: lw    a0, 96(v1)
-	ldloc 7
+// 0x0107651c: 0x107651c: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x01076520: 0x1076520: addu  a3, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
+	stloc 4
+// 0x01076524: 0x1076524: jal   0x1000f9c addiu a1, zero, 250
+	ldc.i4 250
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107652c: 0x107652c: addiu a0, s1, 18768
+	ldloc 9
+	ldc.i4 18768
 	add
-	ldelem.i4
 	stloc.1
-// 0x01076534: 0x1076534: lw    a1, 92(v1)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
+// 0x01076530: 0x1076530: jal   0x104c158 addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01076538: 0x1076538: j	 0x1076564 sll   zero, zero, 0
+	br L_1076564
+// --- basic block ---
+L_1076540:
+// 0x01076540: 0x1076540: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01076544: 0x1076544: addiu a1, a1, -28380
+	ldloc.2
+	ldc.i4 -28380
 	add
-	ldelem.i4
 	stloc.2
-// 0x01076538: 0x1076538: addiu v0, v0, 25688
-	ldloc 6
-	ldc.i4 25688
+// 0x01076548: 0x1076548: addiu a3, a3, -27812
+	ldloc 4
+	ldc.i4 -27812
 	add
-	stloc 6
-// 0x0107653c: 0x107653c: addiu a3, zero, -1
-	ldc.i4.m1
 	stloc 4
-// 0x01076540: 0x1076540: jal   0x1053964 sw    v0, 16(sp)
-	ldloc 7
+// 0x0107654c: 0x107654c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01076550: 0x1076550: addiu a2, zero, 713
+	ldc.i4 713
+	stloc.3
+// 0x01076554: 0x1076554: sw    v1, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
+	ldloc 7
+	stelem.i4
+// 0x01076558: 0x1076558: sw    v0, 20(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
 	stelem.i4
+L_107655c:
+// 0x0107655c: 0x107655c: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_message_ticker_show_cb_1053964(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	stloc 6
-// --- basic block ---
-// 0x01076548: 0x1076548: j	 0x1076558 sll   zero, zero, 0
-	br L_1076558
 // --- basic block ---
-L_1076550:
-// 0x01076550: 0x1076550: jal   0x1076458 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl88::ticker_closed_cb_1076458(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+L_1076564:
+// 0x01076564: 0x1076564: lw    ra, 300(sp)
+// 0x01076568: 0x1076568: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-	stloc 6
-// --- basic block ---
-L_1076558:
-// 0x01076558: 0x1076558: lw    ra, 52(sp)
-// 0x0107655c: 0x107655c: sll   zero, zero, 0
-// 0x01076560: 0x1076560: jr    ra addiu sp, sp, 56
+// 0x0107656c: 0x107656c: lw    s2, 296(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 74
+	add
+	ldelem.i4
+	stloc 10
+// 0x01076570: 0x1076570: lw    s1, 292(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 73
+	add
+	ldelem.i4
+	stloc 9
+// 0x01076574: 0x1076574: lw    s0, 288(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 72
+	add
+	ldelem.i4
+	stloc 8
+// 0x01076578: 0x1076578: jr    ra addiu sp, sp, 304
+	ldloc.0
+	ldc.i4 304
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RealtimeBonus_PopUp_1076568(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_distance_check_1076580(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local 10 is register s1
-// local  9 is register s2
+// local  7 is register s0
+// local  8 is register s1
 // local  0 is register sp
-// local 11 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
+// local 10 is register ra
+// local  5 is register mem
+
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -7203,563 +6351,457 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076568: 0x1076568: addiu sp, sp, -568
+L_1076580:
+// 0x01076580: 0x1076580: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4 -568
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0107656c: 0x107656c: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x01076570: 0x1076570: sw    ra, 564(sp)
-// 0x01076574: 0x1076574: sw    s2, 560(sp)
-	ldloc 7
+// 0x01076584: 0x1076584: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 140
+	ldc.i4.6
 	add
-	ldloc 9
+	ldloc 8
 	stelem.i4
-// 0x01076578: 0x1076578: sw    s1, 556(sp)
-	ldloc 7
+// 0x01076588: 0x1076588: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107658c: 0x107658c: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 139
+	ldc.i4.5
 	add
-	ldloc 10
-	stelem.i4
-// 0x0107657c: 0x107657c: sw    s0, 552(sp)
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 138
-	add
-	ldloc 8
 	stelem.i4
-// 0x01076580: 0x1076580: addiu v1, v1, -17252
-	ldloc 6
-	ldc.i4 -17252
+// 0x01076590: 0x1076590: addiu s0, s1, -16804
+	ldloc 8
+	ldc.i4 -16804
 	add
-	stloc 6
-// 0x01076584: 0x1076584: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-// 0x01076588: 0x1076588: addiu a1, zero, 250
-	ldc.i4 250
-	stloc.2
-L_107658c:
-// 0x0107658c: 0x107658c: lw    s0, 0(v1)
+	stloc 7
+// 0x01076594: 0x1076594: lw    v0, 4(s0)
+	ldloc 5
 	ldloc 7
-	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 8
-// 0x01076590: 0x1076590: sll   zero, zero, 0
-// 0x01076594: 0x1076594: beq   s0, zero, 0x10765d4 addiu v1, v1, 4
-	ldloc 8
-	ldloc 6
-	ldc.i4.4
+	ldc.i4.1
 	add
+	ldelem.i4
 	stloc 6
-	brfalse L_10765d4
-// --- basic block ---
-// 0x0107659c: 0x107659c: lw    a2, 0(s0)
-	ldloc 7
-	ldloc 8
+// 0x01076598: 0x1076598: sw    ra, 28(sp)
+// 0x0107659c: 0x107659c: sw    a0, 32(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x010765a0: 0x10765a0: sll   zero, zero, 0
-// 0x010765a4: 0x10765a4: bne   a2, a0, 0x10765d8 addiu v0, v0, 1
-	ldloc.3
+	ldc.i4.8
+	add
 	ldloc.1
+	stelem.i4
+// 0x010765a0: 0x10765a0: bne   v0, zero, 0x10765b4 sw    a1, 36(sp)
+	ldloc 6
 	ldloc 5
-	ldc.i4.1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
 	add
-	stloc 5
-	bne.un L_10765d8
+	ldloc.2
+	stelem.i4
+	brtrue L_10765b4
 // --- basic block ---
-// 0x010765ac: 0x10765ac: addiu v0, v0, -1
+// 0x010765a8: 0x10765a8: sw    a0, -16804(s1)
 	ldloc 5
-	ldc.i4.m1
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4201
 	add
-	stloc 5
-// 0x010765b0: 0x10765b0: slti  v0, v0, 250
-	ldloc 5
-	ldc.i4 250
-	clt
-	stloc 5
-// 0x010765b4: 0x10765b4: beq   v0, zero, 0x10768a4 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_10768a4
-// --- basic block ---
-// 0x010765bc: 0x10765bc: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
-	stloc 5
-// --- basic block ---
-// 0x010765c4: 0x10765c4: beq   v0, zero, 0x1076610 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1076610
-// --- basic block ---
-// 0x010765cc: 0x10765cc: j	 0x10765e8 sll   zero, zero, 0
-	br L_10765e8
-// --- basic block ---
-L_10765d4:
-// 0x010765d4: 0x10765d4: addiu v0, v0, 1
+	ldloc.1
+	stelem.i4
+// 0x010765ac: 0x10765ac: j	 0x10765e4 sw    a1, 4(s0)
 	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
 	ldc.i4.1
 	add
-	stloc 5
-L_10765d8:
-// 0x010765d8: 0x10765d8: bne   v0, a1, 0x107658c sll   zero, zero, 0
-	ldloc 5
 	ldloc.2
-	bne.un L_107658c
-// --- basic block ---
-// 0x010765e0: 0x10765e0: j	 0x10768a4 sll   zero, zero, 0
-	br L_10768a4
-// --- basic block ---
-L_10765e8:
-// 0x010765e8: 0x10765e8: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stelem.i4
+	br L_10765e4
 // --- basic block ---
-// 0x010765f0: 0x10765f0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010765f4: 0x10765f4: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x010765f8: 0x10765f8: jal   0x1001b14 addiu a1, a1, -28020
-	ldloc.2
-	ldc.i4 -28020
+L_10765b4:
+// 0x010765b4: 0x10765b4: addiu a0, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x01076600: 0x1076600: bne   v0, zero, 0x1076610 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1076610
-// --- basic block ---
-// 0x01076608: 0x1076608: jal   0x1094b64 addiu a0, zero, 2
-	ldc.i4.2
 	stloc.1
+// 0x010765b8: 0x10765b8: jal   0x1008ec0 addu  a1, s0, zero
+	ldloc 7
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_1076610:
-// 0x01076610: 0x1076610: lw    v0, 4(s0)
-	ldloc 7
+// 0x010765c0: 0x10765c0: slti  v1, v0, 5
+	ldloc 6
+	ldc.i4.5
+	clt
+	stloc 9
+// 0x010765c4: 0x10765c4: bne   v1, zero, 0x10765e8 addu  v0, zero, zero
+	ldloc 9
+	ldc.i4.s 0
+	stloc 6
+	brtrue L_10765e8
+// --- basic block ---
+// 0x010765cc: 0x10765cc: lw    v0, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 6
+// 0x010765d0: 0x10765d0: sll   zero, zero, 0
+// 0x010765d4: 0x10765d4: sw    v0, -16804(s1)
+	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 -4201
+	add
+	ldloc 6
+	stelem.i4
+// 0x010765d8: 0x10765d8: lw    v0, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 5
-// 0x01076614: 0x1076614: sll   zero, zero, 0
-// 0x01076618: 0x1076618: bne   v0, zero, 0x107662c addiu v1, zero, 1
+	stloc 6
+// 0x010765dc: 0x10765dc: sll   zero, zero, 0
+// 0x010765e0: 0x10765e0: sw    v0, 4(s0)
 	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
 	ldc.i4.1
-	stloc 6
-	brtrue L_107662c
-// --- basic block ---
-// 0x01076620: 0x1076620: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01076624: 0x1076624: j	 0x107663c addiu a0, a0, 29940
-	ldloc.1
-	ldc.i4 29940
 	add
-	stloc.1
-	br L_107663c
-// --- basic block ---
-L_107662c:
-// 0x0107662c: 0x107662c: bne   v0, v1, 0x107664c addiu v0, s0, 20
-	ldloc 5
 	ldloc 6
-	ldloc 8
-	ldc.i4.s 20
+	stelem.i4
+L_10765e4:
+// 0x010765e4: 0x10765e4: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+L_10765e8:
+// 0x010765e8: 0x10765e8: lw    ra, 28(sp)
+// 0x010765ec: 0x10765ec: lw    s1, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc 5
-	bne.un L_107664c
-// --- basic block ---
-// 0x01076634: 0x1076634: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01076638: 0x1076638: addiu a0, a0, -28004
-	ldloc.1
-	ldc.i4 -28004
+	ldelem.i4
+	stloc 8
+// 0x010765f0: 0x10765f0: lw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.1
-L_107663c:
-// 0x0107663c: 0x107663c: jal   0x101cd60 sll   zero, zero, 0
+	ldelem.i4
+	stloc 7
+// 0x010765f4: 0x10765f4: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RealtimeBonus_HandleEvent_10765fc(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s0,int32 s1,int32 s3,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local 10 is register s1
+// local  8 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x01076644: 0x1076644: addu  s1, v0, zero
-	ldloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
 	stloc 10
-// 0x01076648: 0x1076648: addiu v0, s0, 20
-	ldloc 8
-	ldc.i4.s 20
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_10765fc:
+// 0x010765fc: 0x10765fc: addiu sp, sp, -48
+	ldloc.0
+	ldc.i4.s -48
 	add
-	stloc 5
-L_107664c:
-// 0x0107664c: 0x107664c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01076650: 0x1076650: addiu v1, zero, -1
-	ldc.i4.m1
+	stloc.0
+// 0x01076600: 0x1076600: lui   v1, 0x80000
+	ldc.i4 524288
 	stloc 6
-// 0x01076654: 0x1076654: addu  a1, s1, zero
+// 0x01076604: 0x1076604: sw    s1, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
 	ldloc 10
-	stloc.2
-// 0x01076658: 0x1076658: addiu a0, a0, -28020
+	stelem.i4
+// 0x01076608: 0x1076608: sw    ra, 44(sp)
+// 0x0107660c: 0x107660c: addu  s1, a0, zero
 	ldloc.1
-	ldc.i4 -28020
-	add
-	stloc.1
-// 0x0107665c: 0x107665c: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x01076660: 0x1076660: addiu a3, zero, -2
-	ldc.i4.s -2
-	stloc 4
-// 0x01076664: 0x1076664: sw    v0, 20(sp)
+	stloc 10
+// 0x01076610: 0x1076610: sw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 10
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
-// 0x01076668: 0x1076668: lui   v0, 0x18800000
-	ldc.i4 411041792
-	stloc 5
-// 0x0107666c: 0x107666c: sw    v1, 16(sp)
+// 0x01076614: 0x1076614: sw    s2, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 9
 	add
-	ldloc 6
+	ldloc 8
 	stelem.i4
-// 0x01076670: 0x1076670: lui   s2, 0x10000
-	ldc.i4 65536
-	stloc 9
-// 0x01076674: 0x1076674: jal   0x109e4f0 sw    v0, 24(sp)
+// 0x01076618: 0x1076618: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.7
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x0107661c: 0x107661c: addiu v1, v1, -16788
+	ldloc 6
+	ldc.i4 -16788
+	add
 	stloc 6
+// 0x01076620: 0x1076620: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x0107667c: 0x107667c: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01076680: 0x1076680: addiu a3, zero, 5
-	ldc.i4.5
-	stloc 4
-// 0x01076684: 0x1076684: addu  s1, v0, zero
-	ldloc 5
-	stloc 10
-// 0x01076688: 0x1076688: addiu a1, s2, 18500
-	ldloc 9
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107668c: 0x107668c: addiu a0, a0, 1764
-	ldloc.1
-	ldc.i4 1764
-	add
+// 0x01076624: 0x1076624: addiu a0, zero, 250
+	ldc.i4 250
 	stloc.1
-// 0x01076690: 0x1076690: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x01076694: 0x1076694: addiu v0, zero, 8
-	ldc.i4.8
-	stloc 5
-// 0x01076698: 0x1076698: jal   0x1093a24 sw    v0, 16(sp)
+L_1076628:
+// 0x01076628: 0x1076628: lw    s0, 0(v1)
 	ldloc 7
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
+	ldelem.i4
+	stloc 9
+// 0x0107662c: 0x107662c: sll   zero, zero, 0
+// 0x01076630: 0x1076630: beq   s0, zero, 0x1076670 addiu v1, v1, 4
+	ldloc 9
+	ldloc 6
 	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 5
+	brfalse L_1076670
 // --- basic block ---
-// 0x010766a0: 0x10766a0: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x010766a4: 0x10766a4: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x010766a8: 0x10766a8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x010766ac: 0x10766ac: jal   0x1098fe0 sw    v0, 544(sp)
+// 0x01076638: 0x1076638: lw    a1, 0(s0)
 	ldloc 7
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 136
+	ldelem.i4
+	stloc.2
+// 0x0107663c: 0x107663c: sll   zero, zero, 0
+// 0x01076640: 0x1076640: bne   a1, s1, 0x1076674 addiu v0, v0, 1
+	ldloc.2
+	ldloc 10
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+	bne.un L_1076674
+// --- basic block ---
+// 0x01076648: 0x1076648: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
 	add
+	stloc 5
+// 0x0107664c: 0x107664c: slti  v0, v0, 250
 	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldc.i4 250
+	clt
+	stloc 5
+// 0x01076650: 0x1076650: beq   v0, zero, 0x1076824 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1076824
 // --- basic block ---
-// 0x010766b4: 0x10766b4: lw    v0, 544(sp)
+// 0x01076658: 0x1076658: lw    v0, 64(s0)
 	ldloc 7
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 136
+	ldc.i4.s 16
 	add
 	ldelem.i4
 	stloc 5
-// 0x010766b8: 0x10766b8: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x010766bc: 0x10766bc: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107665c: 0x107665c: sll   zero, zero, 0
+// 0x01076660: 0x1076660: bne   v0, zero, 0x1076824 addiu s2, zero, 1
 	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.1
+	stloc 8
+	brtrue L_1076824
 // --- basic block ---
-// 0x010766c4: 0x10766c4: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010766c8: 0x10766c8: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x010766cc: 0x10766cc: addiu a1, s2, 18500
-	ldloc 9
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x010766d0: 0x10766d0: addiu a0, a0, -27988
-	ldloc.1
-	ldc.i4 -27988
+// 0x01076668: 0x1076668: j	 0x1076684 sll   zero, zero, 0
+	br L_1076684
+// --- basic block ---
+L_1076670:
+// 0x01076670: 0x1076670: addiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
 	add
-	stloc.1
-// 0x010766d4: 0x10766d4: addiu a2, zero, 50
-	ldc.i4.s 50
-	stloc.3
-// 0x010766d8: 0x10766d8: addiu v0, zero, 2
-	ldc.i4.2
 	stloc 5
-// 0x010766dc: 0x10766dc: jal   0x1093a24 sw    v0, 16(sp)
+L_1076674:
+// 0x01076674: 0x1076674: bne   v0, a0, 0x1076628 sll   zero, zero, 0
+	ldloc 5
+	ldloc.1
+	bne.un L_1076628
+// --- basic block ---
+// 0x0107667c: 0x107667c: j	 0x1076824 sll   zero, zero, 0
+	br L_1076824
+// --- basic block ---
+L_1076684:
+// 0x01076684: 0x1076684: jal   0x10a7518 sw    s2, 64(s0)
 	ldloc 7
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 16
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a7518(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010766e4: 0x10766e4: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x010766e8: 0x10766e8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x010766ec: 0x10766ec: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x010766f0: 0x10766f0: jal   0x1098fe0 addu  s2, v0, zero
+// 0x0107668c: 0x107668c: beq   v0, zero, 0x1076748 sll   zero, zero, 0
 	ldloc 5
-	stloc 9
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	brfalse L_1076748
 // --- basic block ---
-// 0x010766f8: 0x10766f8: lw    a1, 28(s0)
+// 0x01076694: 0x1076694: lw    v0, 4(s0)
 	ldloc 7
-	ldloc 8
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc.2
-// 0x010766fc: 0x10766fc: lui   a0, 0x20000
+	stloc 5
+// 0x01076698: 0x1076698: sll   zero, zero, 0
+// 0x0107669c: 0x107669c: bne   v0, s2, 0x10766dc lui   a1, 0x20000
+	ldloc 5
+	ldloc 8
 	ldc.i4 131072
-	stloc.1
-// 0x01076700: 0x1076700: addiu a2, zero, 17
-	ldc.i4.s 17
-	stloc.3
-// 0x01076704: 0x1076704: jal   0x109e13c addiu a0, a0, -27980
-	ldloc.1
-	ldc.i4 -27980
-	add
-	stloc.1
+	stloc.2
+	bne.un L_10766dc
+// --- basic block ---
+// 0x010766a4: 0x10766a4: jal   0x106b68c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107670c: 0x107670c: addu  a1, v0, zero
+// 0x010766ac: 0x10766ac: beq   v0, zero, 0x10766dc lui   a1, 0x20000
 	ldloc 5
+	ldc.i4 131072
 	stloc.2
-// 0x01076710: 0x1076710: jal   0x1098ec4 addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01076718: 0x1076718: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x0107671c: 0x107671c: jal   0x1098ec4 addu  a1, s2, zero
-	ldloc 9
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01076724: 0x1076724: lw    a3, 80(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldelem.i4
-	stloc 4
-// 0x01076728: 0x1076728: sll   zero, zero, 0
-// 0x0107672c: 0x107672c: beq   a3, zero, 0x1076740 lui   a2, 0x10000
-	ldloc 4
-	ldc.i4 65536
-	stloc.3
-	brfalse L_1076740
-// --- basic block ---
-// 0x01076734: 0x1076734: addiu a2, a2, 19912
-	ldloc.3
-	ldc.i4 19912
-	add
-	stloc.3
-// 0x01076738: 0x1076738: j	 0x10767d8 addiu a0, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.1
-	br L_10767d8
-// --- basic block ---
-L_1076740:
-// 0x01076740: 0x1076740: lw    v0, 4(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 5
-// 0x01076744: 0x1076744: sll   zero, zero, 0
-// 0x01076748: 0x1076748: bne   v0, zero, 0x1076798 addiu v1, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 6
-	brtrue L_1076798
+	brfalse L_10766dc
 // --- basic block ---
-// 0x01076750: 0x1076750: lui   a0, 0x20000
+// 0x010766b4: 0x10766b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01076754: 0x1076754: jal   0x101cd60 addiu a0, a0, -27968
+// 0x010766b8: 0x10766b8: jal   0x101cd70 addiu a0, a0, -27748
 	ldloc.1
-	ldc.i4 -27968
+	ldc.i4 -27748
 	add
 	stloc.1
 	ldloc.0
@@ -7767,457 +6809,470 @@ L_1076740:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107675c: 0x107675c: lui   a0, 0x20000
-	ldc.i4 131072
+// 0x010766c0: 0x10766c0: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x01076760: 0x1076760: addiu a0, a0, -27932
+// 0x010766c4: 0x10766c4: addiu a0, a0, 18768
 	ldloc.1
-	ldc.i4 -27932
+	ldc.i4 18768
 	add
 	stloc.1
-// 0x01076764: 0x1076764: lw    s0, 16(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x01076768: 0x1076768: jal   0x101cd60 sw    v0, 544(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 136
-	add
+// 0x010766c8: 0x10766c8: addu  a1, v0, zero
 	ldloc 5
-	stelem.i4
+	stloc.2
+// 0x010766cc: 0x10766cc: jal   0x104bff4 addiu a2, zero, 10
+	ldc.i4.s 10
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076770: 0x1076770: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x01076774: 0x1076774: lw    a3, 544(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 136
-	add
-	ldelem.i4
+// 0x010766d4: 0x10766d4: j	 0x1076824 sll   zero, zero, 0
+	br L_1076824
+// --- basic block ---
+L_10766dc:
+// 0x010766dc: 0x10766dc: lui   a3, 0x20000
+	ldc.i4 131072
 	stloc 4
-// 0x01076778: 0x1076778: addiu a2, a2, 10532
-	ldloc.3
-	ldc.i4 10532
+// 0x010766e0: 0x10766e0: addiu a1, a1, -28380
+	ldloc.2
+	ldc.i4 -28380
 	add
-	stloc.3
-// 0x0107677c: 0x107677c: addiu a0, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+	stloc.2
+// 0x010766e4: 0x10766e4: addiu a3, a3, -27608
+	ldloc 4
+	ldc.i4 -27608
 	add
+	stloc 4
+// 0x010766e8: 0x10766e8: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01076780: 0x1076780: addiu a1, zero, 512
-	ldc.i4 512
-	stloc.2
-// 0x01076784: 0x1076784: sw    s0, 16(sp)
+// 0x010766ec: 0x10766ec: addiu a2, zero, 621
+	ldc.i4 621
+	stloc.3
+// 0x010766f0: 0x10766f0: lui   s2, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x010766f4: 0x10766f4: jal   0x100449c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 8
-	stelem.i4
-// 0x01076788: 0x1076788: jal   0x1000f9c sw    v0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076790: 0x1076790: j	 0x10767e4 lui   v0, 0xf0000
-	ldc.i4 983040
+// 0x010766fc: 0x10766fc: lw    v0, -16796(s2)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4199
+	add
+	ldelem.i4
 	stloc 5
-	br L_10767e4
-// --- basic block ---
-L_1076798:
-// 0x01076798: 0x1076798: bne   v0, v1, 0x10767e4 lui   v0, 0xf0000
+// 0x01076700: 0x1076700: sll   zero, zero, 0
+// 0x01076704: 0x1076704: bne   v0, zero, 0x107673c lui   v0, 0x80000
 	ldloc 5
-	ldloc 6
-	ldc.i4 983040
+	ldc.i4 524288
 	stloc 5
-	bne.un L_10767e4
+	brtrue L_107673c
 // --- basic block ---
-// 0x010767a0: 0x10767a0: jal   0x106b068 addiu s2, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 9
-	ldloc.0
+// 0x0107670c: 0x107670c: jal   0x10518b8 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_is_random_user_106b068(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010767a8: 0x10767a8: bne   v0, zero, 0x10767bc lui   s0, 0x10000
-	ldloc 5
-	ldc.i4 65536
-	stloc 8
-	brtrue L_10767bc
-// --- basic block ---
-// 0x010767b0: 0x10767b0: lui   a0, 0x20000
+// 0x01076714: 0x1076714: lui   s3, 0x20000
 	ldc.i4 131072
+	stloc 11
+// 0x01076718: 0x1076718: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x010767b4: 0x10767b4: j	 0x10767c4 addiu a0, a0, -27924
-	ldloc.1
-	ldc.i4 -27924
+// 0x0107671c: 0x107671c: addiu a1, s3, -27576
+	ldloc 11
+	ldc.i4 -27576
 	add
-	stloc.1
-	br L_10767c4
-// --- basic block ---
-L_10767bc:
-// 0x010767bc: 0x10767bc: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010767c0: 0x10767c0: addiu a0, a0, -27840
-	ldloc.1
-	ldc.i4 -27840
+	stloc.2
+// 0x01076720: 0x1076720: jal   0x10518dc sw    v0, -16796(s2)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4199
 	add
-	stloc.1
-L_10767c4:
-// 0x010767c4: 0x10767c4: jal   0x101cd60 sll   zero, zero, 0
-	ldloc.0
+	ldloc 5
+	stelem.i4
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010767cc: 0x10767cc: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x010767d0: 0x10767d0: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x010767d4: 0x10767d4: addiu a2, s0, 19912
-	ldloc 8
-	ldc.i4 19912
+// 0x01076728: 0x1076728: addiu a2, s3, -27576
+	ldloc 11
+	ldc.i4 -27576
 	add
 	stloc.3
-L_10767d8:
-// 0x010767d8: 0x10767d8: jal   0x1000f9c addiu a1, zero, 512
-	ldc.i4 512
+// 0x0107672c: 0x107672c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01076730: 0x1076730: jal   0x10a1f60 addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010767e0: 0x10767e0: lui   v0, 0xf0000
-	ldc.i4 983040
+// 0x01076738: 0x1076738: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-L_10767e4:
-// 0x010767e4: 0x10767e4: lw    v1, -30068(v0)
+L_107673c:
+// 0x0107673c: 0x107673c: lw    a0, -16796(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -4199
 	add
 	ldelem.i4
+	stloc.1
+// 0x01076740: 0x1076740: jal   0x105196c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x010767e8: 0x10767e8: lui   v0, 0xf0000
-	ldc.i4 983040
 	stloc 5
-// 0x010767ec: 0x10767ec: lw    v0, -30072(v0)
+// --- basic block ---
+L_1076748:
+// 0x01076748: 0x1076748: lw    v0, 84(s0)
 	ldloc 7
-	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4.s 21
 	add
 	ldelem.i4
 	stloc 5
-// 0x010767f0: 0x10767f0: addiu a2, v1, -90
-	ldloc 6
-	ldc.i4.s -90
-	add
-	stloc.3
-// 0x010767f4: 0x10767f4: slt   v1, v0, v1
+// 0x0107674c: 0x107674c: sll   zero, zero, 0
+// 0x01076750: 0x1076750: beq   v0, zero, 0x10767c0 sll   zero, zero, 0
 	ldloc 5
-	ldloc 6
-	clt
+	brfalse L_10767c0
+// --- basic block ---
+// 0x01076758: 0x1076758: jal   0x1026bec sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_twitter_is_munching_enabled_1026bec(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x010767f8: 0x10767f8: beq   v1, zero, 0x1076804 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1076804
+	stloc 5
 // --- basic block ---
-// 0x01076800: 0x1076800: addiu a2, v0, -90
+// 0x01076760: 0x1076760: beq   v0, zero, 0x107677c addu  s2, zero, zero
 	ldloc 5
-	ldc.i4.s -90
-	add
-	stloc.3
-L_1076804:
-// 0x01076804: 0x1076804: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x01076808: 0x1076808: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107680c: 0x107680c: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x01076810: 0x1076810: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x01076814: 0x1076814: addiu a0, a0, -27988
-	ldloc.1
-	ldc.i4 -27988
-	add
-	stloc.1
-// 0x01076818: 0x1076818: jal   0x1093a24 sw    zero, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
 	ldc.i4.s 0
-	stelem.i4
+	stloc 8
+	brfalse L_107677c
+// --- basic block ---
+// 0x01076768: 0x1076768: jal   0x1026eec addiu s2, zero, 1
+	ldc.i4.1
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076820: 0x1076820: addu  a0, v0, zero
+// 0x01076770: 0x1076770: bne   v0, zero, 0x107677c sll   zero, zero, 0
 	ldloc 5
-	stloc.1
-// 0x01076824: 0x1076824: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01076828: 0x1076828: addu  a2, zero, zero
+	brtrue L_107677c
+// --- basic block ---
+// 0x01076778: 0x1076778: addu  s2, zero, zero
 	ldc.i4.s 0
-	stloc.3
-// 0x0107682c: 0x107682c: jal   0x1098fe0 addu  s0, v0, zero
-	ldloc 5
 	stloc 8
+L_107677c:
+// 0x0107677c: 0x107677c: jal   0x1026bc8 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl29::roadmap_facebook_is_munching_enabled_1026bc8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01076834: 0x1076834: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01076838: 0x1076838: addiu a2, zero, 16
-	ldc.i4.s 16
+// 0x01076784: 0x1076784: beq   v0, zero, 0x10767a0 addu  a2, zero, zero
+	ldloc 5
+	ldc.i4.s 0
 	stloc.3
-// 0x0107683c: 0x107683c: addiu a3, zero, 8
-	ldc.i4.8
-	stloc 4
-// 0x01076840: 0x1076840: addiu a0, a0, -27648
-	ldloc.1
-	ldc.i4 -27648
-	add
-	stloc.1
-// 0x01076844: 0x1076844: jal   0x1098d10 addiu a1, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.2
+	brfalse L_10767a0
+// --- basic block ---
+// 0x0107678c: 0x107678c: jal   0x1026da4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107684c: 0x107684c: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01076850: 0x1076850: addu  a0, v0, zero
+// 0x01076794: 0x1076794: bne   v0, zero, 0x10767a0 addiu a2, zero, 1
 	ldloc 5
+	ldc.i4.1
+	stloc.3
+	brtrue L_10767a0
+// --- basic block ---
+// 0x0107679c: 0x107679c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+L_10767a0:
+// 0x010767a0: 0x10767a0: addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x01076854: 0x1076854: addiu a1, a1, 23008
-	ldloc.2
-	ldc.i4 23008
-	add
+// 0x010767a4: 0x10767a4: jal   0x106bb14 addu  a1, s2, zero
+	ldloc 8
 	stloc.2
-// 0x01076858: 0x1076858: jal   0x1097af8 sw    v0, 544(sp)
-	ldloc 7
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_CollectCustomBonus_106bb14(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x010767ac: 0x10767ac: lw    a0, 16(s0)
+	ldloc 7
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 136
+	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x010767b0: 0x10767b0: jal   0x10ad118 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01076860: 0x1076860: lw    v0, 544(sp)
+// 0x010767b8: 0x10767b8: j	 0x107681c sll   zero, zero, 0
+	br L_107681c
+// --- basic block ---
+L_10767c0:
+// 0x010767c0: 0x10767c0: lw    s3, 8(s0)
 	ldloc 7
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 136
+	ldc.i4.2
 	add
 	ldelem.i4
-	stloc 5
-// 0x01076864: 0x1076864: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x01076868: 0x1076868: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
+	stloc 11
+// 0x010767c4: 0x10767c4: jal   0x1026bec sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_twitter_is_munching_enabled_1026bec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076870: 0x1076870: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x01076874: 0x1076874: jal   0x1098ec4 addu  a1, s0, zero
-	ldloc 8
-	stloc.2
+// 0x010767cc: 0x10767cc: beq   v0, zero, 0x10767e8 addu  s2, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 8
+	brfalse L_10767e8
+// --- basic block ---
+// 0x010767d4: 0x10767d4: jal   0x1026eec addiu s2, zero, 1
+	ldc.i4.1
+	stloc 8
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107687c: 0x107687c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01076880: 0x1076880: addiu a0, a0, -28020
-	ldloc.1
-	ldc.i4 -28020
-	add
-	stloc.1
-// 0x01076884: 0x1076884: jal   0x1095eec addu  a1, zero, zero
+// 0x010767dc: 0x10767dc: bne   v0, zero, 0x10767e8 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_10767e8
+// --- basic block ---
+// 0x010767e4: 0x10767e4: addu  s2, zero, zero
 	ldc.i4.s 0
-	stloc.2
+	stloc 8
+L_10767e8:
+// 0x010767e8: 0x10767e8: jal   0x1026bc8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_is_munching_enabled_1026bc8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107688c: 0x107688c: jal   0x102146c sll   zero, zero, 0
+// 0x010767f0: 0x10767f0: beq   v0, zero, 0x107680c addu  a3, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 4
+	brfalse L_107680c
+// --- basic block ---
+// 0x010767f8: 0x10767f8: jal   0x1026da4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076894: 0x1076894: bne   v0, zero, 0x10768a4 sll   zero, zero, 0
+// 0x01076800: 0x1076800: bne   v0, zero, 0x107680c addiu a3, zero, 1
 	ldloc 5
-	brtrue L_10768a4
+	ldc.i4.1
+	stloc 4
+	brtrue L_107680c
+// --- basic block ---
+// 0x01076808: 0x1076808: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+L_107680c:
+// 0x0107680c: 0x107680c: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x01076810: 0x1076810: addu  a1, s3, zero
+	ldloc 11
+	stloc.2
+// 0x01076814: 0x1076814: jal   0x106bba4 addu  a2, s2, zero
+	ldloc 8
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl80::Realtime_CollectBonus_106bba4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107689c: 0x107689c: jal   0x1021900 sll   zero, zero, 0
+L_107681c:
+// 0x0107681c: 0x107681c: jal   0x1076158 addu  a0, s0, zero
+	ldloc 9
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl88::onBonusDelete_1076158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10768a4:
-// 0x010768a4: 0x10768a4: lw    ra, 564(sp)
-// 0x010768a8: 0x10768a8: lw    s2, 560(sp)
+L_1076824:
+// 0x01076824: 0x1076824: lw    ra, 44(sp)
+// 0x01076828: 0x1076828: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107682c: 0x107682c: lw    s3, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 140
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 9
-// 0x010768ac: 0x10768ac: lw    s1, 556(sp)
+	stloc 11
+// 0x01076830: 0x1076830: lw    s2, 36(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 8
+// 0x01076834: 0x1076834: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 139
+	ldc.i4.8
 	add
 	ldelem.i4
 	stloc 10
-// 0x010768b0: 0x10768b0: lw    s0, 552(sp)
+// 0x01076838: 0x1076838: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 138
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 8
-// 0x010768b4: 0x10768b4: jr    ra addiu sp, sp, 568
+	stloc 9
+// 0x0107683c: 0x107683c: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4 568
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
diff --git a/converted/Cibyl89.j b/converted/Cibyl89.j
index f3499f9..dc67494 100644
--- a/converted/Cibyl89.j
+++ b/converted/Cibyl89.j
@@ -41,25 +41,33 @@
     IL_0006:  ret
   } // end of method Cibyl89::.ctor
 
-.method public static int32 OnbonusShortClick_10768bc(int32,int32,int32,int32,int32)
+.method public static int32 AddBonusToMap_1076844(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s2,int32 s1,int32 s3,int32 s4,int32 s5,int32 s6,int32 ra,int32 t0)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local 16 is register t0
+// local  8 is register s0
+// local 10 is register s1
+// local  9 is register s2
+// local 11 is register s3
+// local 12 is register s4
+// local 13 is register s5
+// local 14 is register s6
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local 15 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -68,743 +76,509 @@
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 16
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 15
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010768bc: 0x10768bc: addiu sp, sp, -24
+// 0x01076844: 0x1076844: addiu sp, sp, -112
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -112
 	add
 	stloc.0
-// 0x010768c0: 0x10768c0: lw    a0, 56(sp)
+// 0x01076848: 0x1076848: sw    s0, 80(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
+	add
 	ldloc 8
+	stelem.i4
+// 0x0107684c: 0x107684c: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x01076850: 0x1076850: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076854: 0x1076854: sw    s2, 88(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 22
+	add
+	ldloc 9
+	stelem.i4
+// 0x01076858: 0x1076858: addiu a0, a0, -27568
+	ldloc.1
+	ldc.i4 -27568
 	add
-	ldelem.i4
 	stloc.1
-// 0x010768c4: 0x10768c4: sw    ra, 20(sp)
-// 0x010768c8: 0x10768c8: jal   0x1001ba8 sll   zero, zero, 0
+// 0x0107685c: 0x107685c: addiu s2, s0, 32
+	ldloc 8
+	ldc.i4.s 32
+	add
+	stloc 9
+// 0x01076860: 0x1076860: sw    a1, 72(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldloc.2
+	stelem.i4
+// 0x01076864: 0x1076864: sw    ra, 108(sp)
+// 0x01076868: 0x1076868: sw    s5, 100(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 25
+	add
+	ldloc 13
+	stelem.i4
+// 0x0107686c: 0x107686c: sw    s4, 96(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
+	ldloc 12
+	stelem.i4
+// 0x01076870: 0x1076870: sw    s3, 92(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
+	add
+	ldloc 11
+	stelem.i4
+// 0x01076874: 0x1076874: sw    s1, 84(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldloc 10
+	stelem.i4
+// 0x01076878: 0x1076878: jal   0x101ca1c sw    s6, 104(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 26
+	add
+	ldloc 14
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x010768d0: 0x10768d0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010768d4: 0x10768d4: addu  a0, v0, zero
-	ldloc 5
+// 0x01076880: 0x1076880: addu  a0, s2, zero
+	ldloc 9
 	stloc.1
-// 0x010768d8: 0x10768d8: jal   0x1001984 addiu a1, a1, -24304
-	ldloc.2
-	ldc.i4 -24304
-	add
-	stloc.2
+// 0x01076884: 0x1076884: jal   0x101ca1c addu  s5, v0, zero
+	ldloc 6
+	stloc 13
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strtok_1001984(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x010768e0: 0x10768e0: addu  a0, v0, zero
-	ldloc 5
+// 0x0107688c: 0x107688c: addu  a0, s2, zero
+	ldloc 9
 	stloc.1
-// 0x010768e4: 0x10768e4: beq   a0, zero, 0x10768f4 addiu v0, zero, -1
-	ldloc.1
-	ldc.i4.m1
-	stloc 5
-	brfalse L_10768f4
-// --- basic block ---
-// 0x010768ec: 0x10768ec: jal   0x1000d8c sll   zero, zero, 0
+// 0x01076890: 0x1076890: jal   0x101ca1c addu  s1, v0, zero
+	ldloc 6
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::atoi_1000d8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_10768f4:
-// 0x010768f4: 0x10768f4: jal   0x1076568 addu  a0, v0, zero
-	ldloc 5
+// 0x01076898: 0x1076898: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
+// 0x0107689c: 0x107689c: addiu a0, a0, -26996
+	ldloc.1
+	ldc.i4 -26996
+	add
+	stloc.1
+// 0x010768a0: 0x10768a0: jal   0x101ca1c addu  s4, v0, zero
+	ldloc 6
+	stloc 12
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RealtimeBonus_PopUp_1076568(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x010768fc: 0x10768fc: lw    ra, 20(sp)
-// 0x01076900: 0x1076900: sll   zero, zero, 0
-// 0x01076904: 0x1076904: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x010768a8: 0x10768a8: lw    a0, 28(s0)
 	ldloc 5
-	ret
-}
-.method public static int32 RealtimeBonus_RemoveFromTable_107690c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  8 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107690c: 0x107690c: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x01076910: 0x1076910: addu  v0, a0, zero
-	ldloc.1
-	stloc 5
-// 0x01076914: 0x1076914: lui   a0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x01076918: 0x1076918: sw    s0, 28(sp)
-	ldloc 7
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
+	ldelem.i4
+	stloc.1
+// 0x010768ac: 0x10768ac: jal   0x101ca1c addu  s3, v0, zero
 	ldloc 6
-	stelem.i4
-// 0x0107691c: 0x107691c: sw    ra, 36(sp)
-// 0x01076920: 0x1076920: sw    s1, 32(sp)
-	ldloc 7
+	stloc 11
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 8
-	stelem.i4
-// 0x01076924: 0x1076924: addiu a0, a0, -17252
 	ldloc.1
-	ldc.i4 -17252
-	add
-	stloc.1
-// 0x01076928: 0x1076928: addu  s0, zero, zero
-	ldc.i4.s 0
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-// 0x0107692c: 0x107692c: addiu a1, zero, 250
-	ldc.i4 250
-	stloc.2
-L_1076930:
-// 0x01076930: 0x1076930: lw    v1, 0(a0)
-	ldloc 7
-	ldloc.1
+// --- basic block ---
+// 0x010768b4: 0x10768b4: lw    a1, 72(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 18
+	add
 	ldelem.i4
+	stloc.2
+// 0x010768b8: 0x10768b8: sll   zero, zero, 0
+// 0x010768bc: 0x10768bc: beq   a1, zero, 0x10768f4 addu  s2, v0, zero
+	ldloc.2
+	ldloc 6
 	stloc 9
-// 0x01076934: 0x1076934: sll   zero, zero, 0
-// 0x01076938: 0x1076938: beq   v1, zero, 0x10769bc addiu a0, a0, 4
-	ldloc 9
-	ldloc.1
-	ldc.i4.4
-	add
-	stloc.1
-	brfalse L_10769bc
+	brfalse L_10768f4
 // --- basic block ---
-// 0x01076940: 0x1076940: lw    a2, 0(v1)
-	ldloc 7
-	ldloc 9
+// 0x010768c4: 0x10768c4: lw    a2, 16(s0)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
+	ldc.i4.4
+	add
 	ldelem.i4
 	stloc.3
-// 0x01076944: 0x1076944: sll   zero, zero, 0
-// 0x01076948: 0x1076948: bne   a2, v0, 0x10769c0 addiu s0, s0, 1
+// 0x010768c8: 0x10768c8: sll   zero, zero, 0
+// 0x010768cc: 0x10768cc: beq   a2, zero, 0x10768f4 addiu s6, sp, 40
 	ldloc.3
-	ldloc 5
-	ldloc 6
-	ldc.i4.1
+	ldloc.0
+	ldc.i4.s 40
 	add
-	stloc 6
-	bne.un L_10769c0
+	stloc 14
+	brfalse L_10768f4
 // --- basic block ---
-// 0x01076950: 0x1076950: addiu s0, s0, -1
-	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x01076954: 0x1076954: lw    v0, 84(v1)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc 5
-// 0x01076958: 0x1076958: sll   zero, zero, 0
-// 0x0107695c: 0x107695c: beq   v0, zero, 0x1076990 lui   s1, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 8
-	brfalse L_1076990
-// --- basic block ---
-// 0x01076964: 0x1076964: lw    v0, 88(v1)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc 5
-// 0x01076968: 0x1076968: sll   zero, zero, 0
-// 0x0107696c: 0x107696c: bne   v0, zero, 0x1076994 addiu s1, s1, -17252
-	ldloc 5
-	ldloc 8
-	ldc.i4 -17252
-	add
-	stloc 8
-	brtrue L_1076994
-// --- basic block ---
-// 0x01076974: 0x1076974: lui   a0, 0x1070000
-	ldc.i4 17235968
+// 0x010768d4: 0x10768d4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x010768d8: 0x10768d8: addu  a0, s6, zero
+	ldloc 14
 	stloc.1
-// 0x01076978: 0x1076978: jal   0x1029d04 addiu a0, a0, 28400
-	ldloc.1
-	ldc.i4 28400
+// 0x010768dc: 0x10768dc: jal   0x1000f64 addiu a1, a1, 19088
+	ldloc.2
+	ldc.i4 19088
 	add
-	stloc.1
+	stloc.2
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl31::roadmap_navigate_unregister_segment_changed_1029d04(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::sprintf_1000f64(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-// 0x01076980: 0x1076980: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 9
-// 0x01076984: 0x1076984: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x01076988: 0x1076988: sw    v1, 15740(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3935
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107698c: 0x107698c: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 8
-L_1076990:
-// 0x01076990: 0x1076990: addiu s1, s1, -17252
-	ldloc 8
-	ldc.i4 -17252
-	add
-	stloc 8
-L_1076994:
-// 0x01076994: 0x1076994: sll   s0, s0, 2
-	ldloc 6
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x01076998: 0x1076998: addu  s0, s0, s1
-	ldloc 6
-	ldloc 8
-	add
+	stloc 7
 	stloc 6
-// 0x0107699c: 0x107699c: lw    a0, 0(s0)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+// --- basic block ---
+// 0x010768e4: 0x10768e4: jal   0x101ca1c addu  a0, s6, zero
+	ldloc 14
 	stloc.1
-// 0x010769a0: 0x10769a0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x010769a8: 0x10769a8: lw    v0, 1000(s1)
-	ldloc 7
+// 0x010768ec: 0x10768ec: j	 0x10768f8 sll   zero, zero, 0
+	br L_10768f8
+// --- basic block ---
+L_10768f4:
+// 0x010768f4: 0x10768f4: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+L_10768f8:
+// 0x010768f8: 0x10768f8: lw    v1, 24(s0)
+	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 250
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x010769ac: 0x10769ac: sw    zero, 0(s0)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x010769b0: 0x10769b0: addiu v0, v0, -1
+	stloc 7
+// 0x010768fc: 0x10768fc: lw    t0, 20(s0)
 	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x010769b4: 0x10769b4: j	 0x10769e4 sw    v0, 1000(s1)
-	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 250
+	ldc.i4.5
 	add
+	ldelem.i4
+	stloc 16
+// 0x01076900: 0x1076900: sw    v1, 56(sp)
 	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc 7
 	stelem.i4
-	br L_10769e4
-// --- basic block ---
-L_10769bc:
-// 0x010769bc: 0x10769bc: addiu s0, s0, 1
-	ldloc 6
-	ldc.i4.1
+// 0x01076904: 0x1076904: addiu v1, sp, 52
+	ldloc.0
+	ldc.i4.s 52
 	add
-	stloc 6
-L_10769c0:
-// 0x010769c0: 0x10769c0: bne   s0, a1, 0x1076930 lui   a3, 0x20000
-	ldloc 6
-	ldloc.2
-	ldc.i4 131072
+	stloc 7
+// 0x01076908: 0x1076908: addu  a2, s4, zero
+	ldloc 12
+	stloc.3
+// 0x0107690c: 0x107690c: addu  a3, s3, zero
+	ldloc 11
 	stloc 4
-	bne.un L_1076930
-// --- basic block ---
-// 0x010769c8: 0x10769c8: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010769cc: 0x10769cc: addiu a1, a1, -28844
-	ldloc.2
-	ldc.i4 -28844
-	add
+// 0x01076910: 0x1076910: addu  a0, s5, zero
+	ldloc 13
+	stloc.1
+// 0x01076914: 0x1076914: addu  a1, s1, zero
+	ldloc 10
 	stloc.2
-// 0x010769d0: 0x10769d0: addiu a3, a3, -27636
-	ldloc 4
-	ldc.i4 -27636
+// 0x01076918: 0x1076918: sw    v1, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc 4
-// 0x010769d4: 0x10769d4: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x010769d8: 0x10769d8: addiu a2, zero, 265
-	ldc.i4 265
-	stloc.3
-// 0x010769dc: 0x10769dc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
+	stelem.i4
+// 0x0107691c: 0x107691c: addiu v1, zero, 17
+	ldc.i4.s 17
+	stloc 7
+// 0x01076920: 0x1076920: sw    t0, 52(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 13
 	add
-	ldloc 5
+	ldloc 16
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 5
-// --- basic block ---
-L_10769e4:
-// 0x010769e4: 0x10769e4: lw    ra, 36(sp)
-// 0x010769e8: 0x10769e8: lw    s1, 32(sp)
-	ldloc 7
+// 0x01076924: 0x1076924: sw    v1, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 8
-// 0x010769ec: 0x10769ec: lw    s0, 28(sp)
 	ldloc 7
+	stelem.i4
+// 0x01076928: 0x1076928: sw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc 6
-// 0x010769f0: 0x10769f0: jr    ra addiu sp, sp, 40
+	ldloc 6
+	stelem.i4
+// 0x0107692c: 0x107692c: sw    s2, 16(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
 	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stelem.i4
+// 0x01076930: 0x1076930: sw    zero, 60(sp)
 	ldloc 5
-	ret
-}
-.method public static int32 RealtimeBonus_Delete_10769f8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register s0
-// local  8 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
-	ldarg 0
-	stloc 0
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 15
+	add
 	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010769f8: 0x10769f8: addiu sp, sp, -32
+	stelem.i4
+// 0x01076934: 0x1076934: sw    zero, 64(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
 	add
-	stloc.0
-// 0x010769fc: 0x10769fc: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x01076a00: 0x1076a00: sw    s0, 20(sp)
-	ldloc 7
+	ldc.i4.s 0
+	stelem.i4
+// 0x01076938: 0x1076938: sw    zero, 68(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 17
 	add
-	ldloc 9
+	ldc.i4.s 0
 	stelem.i4
-// 0x01076a04: 0x1076a04: sw    ra, 28(sp)
-// 0x01076a08: 0x1076a08: addu  s0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x01076a0c: 0x1076a0c: sw    s1, 24(sp)
-	ldloc 7
+// 0x0107693c: 0x107693c: jal   0x101c50c sw    zero, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 8
+	ldc.i4.s 0
 	stelem.i4
-// 0x01076a10: 0x1076a10: addiu v1, v1, -17252
-	ldloc 6
-	ldc.i4 -17252
-	add
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_add_101c50c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-// 0x01076a14: 0x1076a14: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-// 0x01076a18: 0x1076a18: addiu a0, zero, 250
-	ldc.i4 250
-	stloc.1
-L_1076a1c:
-// 0x01076a1c: 0x1076a1c: lw    s1, 0(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 8
-// 0x01076a20: 0x1076a20: sll   zero, zero, 0
-// 0x01076a24: 0x1076a24: beq   s1, zero, 0x1076a64 addiu v1, v1, 4
-	ldloc 8
-	ldloc 6
-	ldc.i4.4
-	add
-	stloc 6
-	brfalse L_1076a64
 // --- basic block ---
-// 0x01076a2c: 0x1076a2c: lw    a1, 0(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01076a30: 0x1076a30: sll   zero, zero, 0
-// 0x01076a34: 0x1076a34: bne   a1, s0, 0x1076a68 addiu v0, v0, 1
-	ldloc.2
-	ldloc 9
-	ldloc 5
+// 0x01076944: 0x1076944: addiu v0, zero, 1
 	ldc.i4.1
-	add
-	stloc 5
-	bne.un L_1076a68
-// --- basic block ---
-// 0x01076a3c: 0x1076a3c: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x01076a40: 0x1076a40: slti  v0, v0, 250
-	ldloc 5
-	ldc.i4 250
-	clt
-	stloc 5
-// 0x01076a44: 0x1076a44: beq   v0, zero, 0x1076af8 sll   zero, zero, 0
+	stloc 6
+// 0x01076948: 0x1076948: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x0107694c: 0x107694c: sw    v0, 88(s0)
 	ldloc 5
-	brfalse L_1076af8
-// --- basic block ---
-// 0x01076a4c: 0x1076a4c: lw    a0, 28(s1)
-	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc.1
-// 0x01076a50: 0x1076a50: sll   zero, zero, 0
-// 0x01076a54: 0x1076a54: bne   a0, zero, 0x1076a78 sll   zero, zero, 0
-	ldloc.1
-	brtrue L_1076a78
-// --- basic block ---
-// 0x01076a5c: 0x1076a5c: j	 0x1076a80 sll   zero, zero, 0
-	br L_1076a80
-// --- basic block ---
-L_1076a64:
-// 0x01076a64: 0x1076a64: addiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4.s 22
 	add
-	stloc 5
-L_1076a68:
-// 0x01076a68: 0x1076a68: bne   v0, a0, 0x1076a1c sll   zero, zero, 0
-	ldloc 5
-	ldloc.1
-	bne.un L_1076a1c
-// --- basic block ---
-// 0x01076a70: 0x1076a70: j	 0x1076afc addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1076afc
-// --- basic block ---
-L_1076a78:
-// 0x01076a78: 0x1076a78: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
+	ldloc 6
+	stelem.i4
+// 0x01076950: 0x1076950: addiu a1, a1, 28384
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_1076a80:
-// 0x01076a80: 0x1076a80: lw    a0, 80(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
+	ldc.i4 28384
 	add
-	ldelem.i4
+	stloc.2
+// 0x01076954: 0x1076954: jal   0x101bee0 addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x01076a84: 0x1076a84: sll   zero, zero, 0
-// 0x01076a88: 0x1076a88: beq   a0, zero, 0x1076a98 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1076a98
-// --- basic block ---
-// 0x01076a90: 0x1076a90: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_1076a98:
-// 0x01076a98: 0x1076a98: lw    a0, 92(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
-	add
-	ldelem.i4
+// 0x0107695c: 0x107695c: jal   0x101c908 addu  a0, s5, zero
+	ldloc 13
 	stloc.1
-// 0x01076a9c: 0x1076a9c: sll   zero, zero, 0
-// 0x01076aa0: 0x1076aa0: beq   a0, zero, 0x1076ab0 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1076ab0
-// --- basic block ---
-// 0x01076aa8: 0x1076aa8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_1076ab0:
-// 0x01076ab0: 0x1076ab0: lw    a0, 96(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldelem.i4
+// 0x01076964: 0x1076964: jal   0x101c908 addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x01076ab4: 0x1076ab4: sll   zero, zero, 0
-// 0x01076ab8: 0x1076ab8: beq   a0, zero, 0x1076ac8 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1076ac8
-// --- basic block ---
-// 0x01076ac0: 0x1076ac0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_1076ac8:
-// 0x01076ac8: 0x1076ac8: lw    a0, 100(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldelem.i4
+// 0x0107696c: 0x107696c: jal   0x101c908 addu  a0, s4, zero
+	ldloc 12
 	stloc.1
-// 0x01076acc: 0x1076acc: sll   zero, zero, 0
-// 0x01076ad0: 0x1076ad0: beq   a0, zero, 0x1076ae0 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1076ae0
-// --- basic block ---
-// 0x01076ad8: 0x1076ad8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_1076ae0:
-// 0x01076ae0: 0x1076ae0: jal   0x1075b34 addu  a0, s1, zero
-	ldloc 8
+// 0x01076974: 0x1076974: jal   0x101c908 addu  a0, s3, zero
+	ldloc 11
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::onBonusDelete_1075b34(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x01076ae8: 0x1076ae8: jal   0x107690c addu  a0, s0, zero
+// 0x0107697c: 0x107697c: jal   0x101c908 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -812,77 +586,106 @@ L_1076ae0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RealtimeBonus_RemoveFromTable_107690c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01076af0: 0x1076af0: j	 0x1076afc addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_1076afc
 // --- basic block ---
-L_1076af8:
-// 0x01076af8: 0x1076af8: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_1076afc:
-// 0x01076afc: 0x1076afc: lw    ra, 28(sp)
-// 0x01076b00: 0x1076b00: lw    s1, 24(sp)
-	ldloc 7
+// 0x01076984: 0x1076984: lw    ra, 108(sp)
+// 0x01076988: 0x1076988: lw    s6, 104(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 26
 	add
 	ldelem.i4
-	stloc 8
-// 0x01076b04: 0x1076b04: lw    s0, 20(sp)
-	ldloc 7
+	stloc 14
+// 0x0107698c: 0x107698c: lw    s5, 100(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 25
+	add
+	ldelem.i4
+	stloc 13
+// 0x01076990: 0x1076990: lw    s4, 96(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
+	ldelem.i4
+	stloc 12
+// 0x01076994: 0x1076994: lw    s3, 92(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 23
+	add
+	ldelem.i4
+	stloc 11
+// 0x01076998: 0x1076998: lw    s2, 88(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
 	add
 	ldelem.i4
 	stloc 9
-// 0x01076b08: 0x1076b08: jr    ra addiu sp, sp, 32
+// 0x0107699c: 0x107699c: lw    s1, 84(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldelem.i4
+	stloc 10
+// 0x010769a0: 0x10769a0: lw    s0, 80(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
+	add
+	ldelem.i4
+	stloc 8
+// 0x010769a4: 0x10769a4: jr    ra addiu sp, sp, 112
+	ldloc.0
+	ldc.i4.s 112
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RealtimeBonus_Add_1076b10(int32,int32,int32,int32,int32)
+.method public static int32 onBonusAdd_10769ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 v1,int32 s0,int32 s1,int32 s3,int32 ra,int32 t0,int32 t1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
 // local  5 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 13 is register t0
-// local 14 is register t1
-// local  9 is register s0
-// local 10 is register s1
-// local  7 is register s2
-// local 11 is register s3
 // local  0 is register sp
-// local 12 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -891,1804 +694,1714 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01076b10: 0x1076b10: addiu sp, sp, -56
+// 0x010769ac: 0x10769ac: lw    v0, 84(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldelem.i4
+	stloc 5
+// 0x010769b0: 0x10769b0: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01076b14: 0x1076b14: sw    s0, 36(sp)
+// 0x010769b4: 0x10769b4: beq   v0, zero, 0x10769d4 sw    ra, 28(sp)
+	ldloc 5
+	brfalse L_10769d4
+// --- basic block ---
+// 0x010769bc: 0x10769bc: lui   a1, 0x1070000
+	ldc.i4 17235968
+	stloc.2
+// 0x010769c0: 0x10769c0: addiu a1, a1, 27348
+	ldloc.2
+	ldc.i4 27348
+	add
+	stloc.2
+// 0x010769c4: 0x10769c4: jal   0x104fea8 addiu a0, zero, 1000
+	ldc.i4 1000
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010769cc: 0x10769cc: j	 0x10769f0 sll   zero, zero, 0
+	br L_10769f0
+// --- basic block ---
+L_10769d4:
+// 0x010769d4: 0x10769d4: jal   0x10a7518 sw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.4
 	add
-	ldloc 9
+	ldloc.1
 	stelem.i4
-// 0x01076b18: 0x1076b18: sw    ra, 52(sp)
-// 0x01076b1c: 0x1076b1c: sw    s3, 48(sp)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a7518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010769dc: 0x10769dc: lw    a0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.4
 	add
-	ldloc 11
-	stelem.i4
-// 0x01076b20: 0x1076b20: sw    s2, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 7
-	stelem.i4
-// 0x01076b24: 0x1076b24: sw    s1, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 10
-	stelem.i4
-// 0x01076b28: 0x1076b28: jal   0x10a6ed0 addu  s0, a0, zero
-	ldloc.1
-	stloc 9
+	ldelem.i4
+	stloc.1
+// 0x010769e0: 0x10769e0: beq   v0, zero, 0x10769f0 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_10769f0
+// --- basic block ---
+// 0x010769e8: 0x10769e8: jal   0x1076844 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a6ed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::AddBonusToMap_1076844(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01076b30: 0x1076b30: bne   v0, zero, 0x1076b48 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
+L_10769f0:
+// 0x010769f0: 0x10769f0: lw    ra, 28(sp)
+// 0x010769f4: 0x10769f4: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-	brtrue L_1076b48
-// --- basic block ---
-// 0x01076b38: 0x1076b38: lw    v0, 84(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
+// 0x010769f8: 0x10769f8: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 5
-// 0x01076b3c: 0x1076b3c: sll   zero, zero, 0
-// 0x01076b40: 0x1076b40: beq   v0, zero, 0x1076eb0 lui   v0, 0x80000
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4 524288
+	ret
+}
+.method public static int32 on_resource_downloaded_1076a00(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 v0,int32 ra,int32 v1)
+
+// local 10 is register v0
+// local 12 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  6 is register s0
+// local  7 is register s1
+// local  8 is register s2
+// local  9 is register s3
+// local  0 is register sp
+// local 11 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 12
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-	brfalse L_1076eb0
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1076b48:
-// 0x01076b48: 0x1076b48: lw    v1, -16252(v0)
-	ldloc 6
+// 0x01076a00: 0x1076a00: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x01076a04: 0x1076a04: sw    s2, 28(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4063
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 8
-// 0x01076b4c: 0x1076b4c: addiu v0, zero, 250
-	ldc.i4 250
-	stloc 5
-// 0x01076b50: 0x1076b50: bne   v1, v0, 0x1076b78 lui   a1, 0x20000
 	ldloc 8
+	stelem.i4
+// 0x01076a08: 0x1076a08: sw    s0, 20(sp)
 	ldloc 5
-	ldc.i4 131072
-	stloc.2
-	bne.un L_1076b78
-// --- basic block ---
-// 0x01076b58: 0x1076b58: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01076b5c: 0x1076b5c: addiu a1, a1, -28844
-	ldloc.2
-	ldc.i4 -28844
-	add
-	stloc.2
-// 0x01076b60: 0x1076b60: addiu a3, a3, -27580
-	ldloc 4
-	ldc.i4 -27580
-	add
-	stloc 4
-// 0x01076b64: 0x1076b64: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01076b68: 0x1076b68: jal   0x100449c addiu a2, zero, 496
-	ldc.i4 496
-	stloc.3
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01076b70: 0x1076b70: j	 0x1076eb4 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1076eb4
-// --- basic block ---
-L_1076b78:
-// 0x01076b78: 0x1076b78: lw    v0, 84(s0)
-	ldloc 6
-	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 5
-// 0x01076b7c: 0x1076b7c: sll   zero, zero, 0
-// 0x01076b80: 0x1076b80: beq   v0, zero, 0x1076bc4 lui   s2, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 7
-	brfalse L_1076bc4
-// --- basic block ---
-// 0x01076b88: 0x1076b88: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x01076b8c: 0x1076b8c: lw    v1, 15740(v0)
 	ldloc 6
+	stelem.i4
+// 0x01076a0c: 0x1076a0c: lui   s2, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x01076a10: 0x1076a10: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x01076a14: 0x1076a14: sw    s3, 32(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3935
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc 8
-// 0x01076b90: 0x1076b90: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x01076b94: 0x1076b94: bne   v1, v0, 0x1076eb4 addiu v0, zero, 1
-	ldloc 8
+	ldloc 9
+	stelem.i4
+// 0x01076a18: 0x1076a18: sw    ra, 36(sp)
+// 0x01076a1c: 0x1076a1c: sw    s1, 24(sp)
 	ldloc 5
-	ldc.i4.1
-	stloc 5
-	bne.un L_1076eb4
-// --- basic block ---
-// 0x01076b9c: 0x1076b9c: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01076ba0: 0x1076ba0: jal   0x100e348 addiu a0, a0, 15724
-	ldloc.1
-	ldc.i4 15724
-	add
-	stloc.1
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01076ba8: 0x1076ba8: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x01076bac: 0x1076bac: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01076bb0: 0x1076bb0: jal   0x1001b14 addiu a1, a1, 20820
-	ldloc.2
-	ldc.i4 20820
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x01076bb8: 0x1076bb8: bne   v0, zero, 0x1076ed0 addu  a1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc.2
-	brtrue L_1076ed0
-// --- basic block ---
-// 0x01076bc0: 0x1076bc0: lui   s2, 0x80000
-	ldc.i4 524288
-	stloc 7
-L_1076bc4:
-// 0x01076bc4: 0x1076bc4: addiu s2, s2, -17252
 	ldloc 7
-	ldc.i4 -17252
+	stelem.i4
+// 0x01076a20: 0x1076a20: addu  s3, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01076a24: 0x1076a24: addiu s0, s0, -16788
+	ldloc 6
+	ldc.i4 -16788
 	add
-	stloc 7
-// 0x01076bc8: 0x1076bc8: lw    a0, 0(s0)
+	stloc 6
+// 0x01076a28: 0x1076a28: addiu s2, s2, -15788
+	ldloc 8
+	ldc.i4 -15788
+	add
+	stloc 8
+L_1076a2c:
+// 0x01076a2c: 0x1076a2c: lw    s1, 0(s0)
+	ldloc 5
 	ldloc 6
-	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
+	stloc 7
+// 0x01076a30: 0x1076a30: addu  a0, s3, zero
+	ldloc 9
 	stloc.1
-// 0x01076bcc: 0x1076bcc: addu  v1, s2, zero
+// 0x01076a34: 0x1076a34: beq   s1, zero, 0x1076a58 addiu s0, s0, 4
 	ldloc 7
-	stloc 8
-// 0x01076bd0: 0x1076bd0: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-// 0x01076bd4: 0x1076bd4: addiu a2, zero, 250
-	ldc.i4 250
-	stloc.3
-L_1076bd8:
-// 0x01076bd8: 0x1076bd8: lw    a1, 0(v1)
 	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-// 0x01076bdc: 0x1076bdc: sll   zero, zero, 0
-// 0x01076be0: 0x1076be0: beq   a1, zero, 0x1076c18 addiu v1, v1, 4
-	ldloc.2
-	ldloc 8
 	ldc.i4.4
 	add
-	stloc 8
-	brfalse L_1076c18
+	stloc 6
+	brfalse L_1076a58
 // --- basic block ---
-// 0x01076be8: 0x1076be8: lw    a1, 0(a1)
-	ldloc 6
-	ldloc.2
+// 0x01076a3c: 0x1076a3c: lw    a1, 28(s1)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
+	ldc.i4.7
+	add
 	ldelem.i4
 	stloc.2
-// 0x01076bec: 0x1076bec: sll   zero, zero, 0
-// 0x01076bf0: 0x1076bf0: bne   a1, a0, 0x1076c1c addiu v0, v0, 1
-	ldloc.2
+// 0x01076a40: 0x1076a40: jal   0x1001b14 sll   zero, zero, 0
 	ldloc.1
-	ldloc 5
-	ldc.i4.1
-	add
-	stloc 5
-	bne.un L_1076c1c
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 10
 // --- basic block ---
-// 0x01076bf8: 0x1076bf8: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x01076bfc: 0x1076bfc: slti  v0, v0, 250
-	ldloc 5
-	ldc.i4 250
-	clt
-	stloc 5
-// 0x01076c00: 0x1076c00: beq   v0, zero, 0x1076c24 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1076c24
+// 0x01076a48: 0x1076a48: bne   v0, zero, 0x1076a58 sll   zero, zero, 0
+	ldloc 10
+	brtrue L_1076a58
 // --- basic block ---
-// 0x01076c08: 0x1076c08: jal   0x10769f8 sll   zero, zero, 0
+// 0x01076a50: 0x1076a50: jal   0x10769ac addu  a0, s1, zero
+	ldloc 7
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RealtimeBonus_Delete_10769f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::onBonusAdd_10769ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 12
+	stloc 10
 // --- basic block ---
-// 0x01076c10: 0x1076c10: j	 0x1076c28 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1076c28
+L_1076a58:
+// 0x01076a58: 0x1076a58: bne   s0, s2, 0x1076a2c sll   zero, zero, 0
+	ldloc 6
+	ldloc 8
+	bne.un L_1076a2c
 // --- basic block ---
-L_1076c18:
-// 0x01076c18: 0x1076c18: addiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	add
-	stloc 5
-L_1076c1c:
-// 0x01076c1c: 0x1076c1c: bne   v0, a2, 0x1076bd8 sll   zero, zero, 0
+// 0x01076a60: 0x1076a60: lw    ra, 36(sp)
+// 0x01076a64: 0x1076a64: lw    s3, 32(sp)
 	ldloc 5
-	ldloc.3
-	bne.un L_1076bd8
-// --- basic block ---
-L_1076c24:
-// 0x01076c24: 0x1076c24: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_1076c28:
-// 0x01076c28: 0x1076c28: addiu v1, zero, 250
-	ldc.i4 250
-	stloc 8
-L_1076c2c:
-// 0x01076c2c: 0x1076c2c: lw    a0, 0(s2)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01076c30: 0x1076c30: sll   zero, zero, 0
-// 0x01076c34: 0x1076c34: bne   a0, zero, 0x1076c44 addiu s2, s2, 4
-	ldloc.1
-	ldloc 7
-	ldc.i4.4
-	add
-	stloc 7
-	brtrue L_1076c44
-// --- basic block ---
-// 0x01076c3c: 0x1076c3c: j	 0x1076c50 addu  s1, v0, zero
-	ldloc 5
-	stloc 10
-	br L_1076c50
-// --- basic block ---
-L_1076c44:
-// 0x01076c44: 0x1076c44: addiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	add
-	stloc 5
-// 0x01076c48: 0x1076c48: bne   v0, v1, 0x1076c2c sll   zero, zero, 0
-	ldloc 5
-	ldloc 8
-	bne.un L_1076c2c
-// --- basic block ---
-L_1076c50:
-// 0x01076c50: 0x1076c50: jal   0x1000910 addiu a0, zero, 104
-	ldc.i4.s 104
-	stloc.1
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01076c58: 0x1076c58: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01076c5c: 0x1076c5c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01076c60: 0x1076c60: addiu a2, zero, 104
-	ldc.i4.s 104
-	stloc.3
-// 0x01076c64: 0x1076c64: lui   s3, 0x80000
-	ldc.i4 524288
-	stloc 11
-// 0x01076c68: 0x1076c68: addu  s2, v0, zero
-	ldloc 5
-	stloc 7
-// 0x01076c6c: 0x1076c6c: jal   0x100177c addiu s3, s3, -17252
-	ldloc 11
-	ldc.i4 -17252
-	add
-	stloc 11
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01076c74: 0x1076c74: sll   v0, s1, 2
-	ldloc 10
-	ldc.i4.2
-	shl
-	stloc 5
-// 0x01076c78: 0x1076c78: addu  s3, v0, s3
-	ldloc 5
-	ldloc 11
-	add
-	stloc 11
-// 0x01076c7c: 0x1076c7c: addu  a0, s2, zero
-	ldloc 7
-	stloc.1
-// 0x01076c80: 0x1076c80: jal   0x10756e8 sw    s2, 0(s3)
-	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldloc 7
-	stelem.i4
-	ldloc.1
-	call int32 Cibyl88::RealtimeBonus_Record_Init_10756e8(int32)
-	stloc 5
-// --- basic block ---
-// 0x01076c88: 0x1076c88: lw    s2, 0(s3)
-	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x01076c8c: 0x1076c8c: lw    t1, 0(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 14
-// 0x01076c90: 0x1076c90: lw    t0, 4(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 13
-// 0x01076c94: 0x1076c94: lw    a3, 16(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 4
-// 0x01076c98: 0x1076c98: lw    a2, 8(s0)
-	ldloc 6
-	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc.3
-// 0x01076c9c: 0x1076c9c: lw    a1, 12(s0)
-	ldloc 6
-	ldloc 9
+	stloc 9
+// 0x01076a68: 0x1076a68: lw    s2, 28(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc.2
-// 0x01076ca0: 0x1076ca0: lw    v1, 24(s0)
-	ldloc 6
-	ldloc 9
+	stloc 8
+// 0x01076a6c: 0x1076a6c: lw    s1, 24(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 8
-// 0x01076ca4: 0x1076ca4: lw    v0, 20(s0)
-	ldloc 6
-	ldloc 9
+	stloc 7
+// 0x01076a70: 0x1076a70: lw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 5
-// 0x01076ca8: 0x1076ca8: lw    a0, 28(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	stloc 6
+// 0x01076a74: 0x1076a74: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
-	ldelem.i4
-	stloc.1
-// 0x01076cac: 0x1076cac: sw    t1, 0(s2)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldloc 14
-	stelem.i4
-// 0x01076cb0: 0x1076cb0: sw    t0, 4(s2)
-	ldloc 6
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 12
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 10
+	ret
+}
+.method public static int32 ticker_closed_cb_1076a7c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01076a7c: 0x1076a7c: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x01076a80: 0x1076a80: lw    v1, 15740(v0)
 	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 3935
 	add
-	ldloc 13
-	stelem.i4
-// 0x01076cb4: 0x1076cb4: sw    a3, 16(s2)
+	ldelem.i4
+	stloc 6
+// 0x01076a84: 0x1076a84: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01076a88: 0x1076a88: sll   v1, v1, 2
 	ldloc 6
-	ldloc 7
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	shl
+	stloc 6
+// 0x01076a8c: 0x1076a8c: addiu v0, v0, -16788
+	ldloc 5
+	ldc.i4 -16788
 	add
-	ldloc 4
-	stelem.i4
-// 0x01076cb8: 0x1076cb8: sw    a2, 8(s2)
+	stloc 5
+// 0x01076a90: 0x1076a90: addu  v0, v1, v0
 	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
+	ldloc 5
 	add
-	ldloc.3
-	stelem.i4
-// 0x01076cbc: 0x1076cbc: sw    a1, 12(s2)
-	ldloc 6
+	stloc 5
+// 0x01076a94: 0x1076a94: lw    v0, 0(v0)
 	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
-	add
-	ldloc.2
-	stelem.i4
-// 0x01076cc0: 0x1076cc0: sw    v1, 24(s2)
-	ldloc 6
+	ldelem.i4
+	stloc 5
+// 0x01076a98: 0x1076a98: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01076a9c: 0x1076a9c: lw    a1, 0(v0)
 	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldelem.i4
+	stloc.2
+// 0x01076aa0: 0x1076aa0: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	ldloc 8
-	stelem.i4
-// 0x01076cc4: 0x1076cc4: jal   0x1001ba8 sw    v0, 20(s2)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	stloc.0
+// 0x01076aa4: 0x1076aa4: sw    ra, 20(sp)
+// 0x01076aa8: 0x1076aa8: jal   0x100e620 addiu a0, a0, 15708
+	ldloc.1
+	ldc.i4 15708
 	add
-	ldloc 5
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076ccc: 0x1076ccc: lw    a0, 80(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldelem.i4
+// 0x01076ab0: 0x1076ab0: jal   0x100ea60 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x01076cd0: 0x1076cd0: sll   zero, zero, 0
-// 0x01076cd4: 0x1076cd4: beq   a0, zero, 0x1076cec sw    v0, 28(s2)
-	ldloc.1
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 5
-	stelem.i4
-	brfalse L_1076cec
-// --- basic block ---
-// 0x01076cdc: 0x1076cdc: lw    s2, 0(s3)
-	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x01076ce0: 0x1076ce0: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076ce8: 0x1076ce8: sw    v0, 80(s2)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 5
-	stelem.i4
-L_1076cec:
-// 0x01076cec: 0x1076cec: lw    a0, 92(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
+// 0x01076ab8: 0x1076ab8: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+// 0x01076abc: 0x1076abc: jal   0x1029ca0 addiu a0, a0, 29972
+	ldloc.1
+	ldc.i4 29972
 	add
-	ldelem.i4
 	stloc.1
-// 0x01076cf0: 0x1076cf0: sll   zero, zero, 0
-// 0x01076cf4: 0x1076cf4: beq   a0, zero, 0x1076d18 lui   v0, 0x80000
 	ldloc.1
-	ldc.i4 524288
+	ldloc.2
+	call int32 Cibyl30::roadmap_navigate_register_segment_changed_1029ca0(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	brfalse L_1076d18
 // --- basic block ---
-// 0x01076cfc: 0x1076cfc: sll   v1, s1, 2
-	ldloc 10
-	ldc.i4.2
-	shl
-	stloc 8
-// 0x01076d00: 0x1076d00: addiu v0, v0, -17252
-	ldloc 5
-	ldc.i4 -17252
-	add
-	stloc 5
-// 0x01076d04: 0x1076d04: addu  v0, v1, v0
-	ldloc 8
-	ldloc 5
+// 0x01076ac4: 0x1076ac4: lw    ra, 20(sp)
+// 0x01076ac8: 0x1076ac8: sll   zero, zero, 0
+// 0x01076acc: 0x1076acc: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc 5
-// 0x01076d08: 0x1076d08: lw    s2, 0(v0)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+	ret
+}
+.method public static int32 SpeedCheck_Timer_1076ad4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
+
+// local  6 is register v0
+// local  5 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 5
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
-// 0x01076d0c: 0x1076d0c: jal   0x1001ba8 sll   zero, zero, 0
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01076ad4: 0x1076ad4: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
+	add
+	stloc.0
+// 0x01076ad8: 0x1076ad8: sw    ra, 52(sp)
+// 0x01076adc: 0x1076adc: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
+	stloc 6
+// --- basic block ---
+// 0x01076ae4: 0x1076ae4: beq   v0, zero, 0x1076b7c addiu a0, sp, 24
+	ldloc 6
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.1
+	brfalse L_1076b7c
+// --- basic block ---
+// 0x01076aec: 0x1076aec: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01076af0: 0x1076af0: jal   0x1029db8 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x01076d14: 0x1076d14: sw    v0, 92(s2)
-	ldloc 6
+// 0x01076af8: 0x1076af8: lw    v0, 36(sp)
 	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 23
+	ldc.i4.s 9
 	add
-	ldloc 5
-	stelem.i4
-L_1076d18:
-// 0x01076d18: 0x1076d18: lw    a0, 96(s0)
+	ldelem.i4
+	stloc 6
+// 0x01076afc: 0x1076afc: sll   zero, zero, 0
+// 0x01076b00: 0x1076b00: slti  v0, v0, 2
 	ldloc 6
-	ldloc 9
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
+	clt
+	stloc 6
+// 0x01076b04: 0x1076b04: beq   v0, zero, 0x1076b7c lui   a0, 0x1070000
+	ldloc 6
+	ldc.i4 17235968
+	stloc.1
+	brfalse L_1076b7c
+// --- basic block ---
+// 0x01076b0c: 0x1076b0c: jal   0x104fd10 addiu a0, a0, 27348
+	ldloc.1
+	ldc.i4 27348
 	add
-	ldelem.i4
 	stloc.1
-// 0x01076d1c: 0x1076d1c: sll   zero, zero, 0
-// 0x01076d20: 0x1076d20: beq   a0, zero, 0x1076d44 lui   v0, 0x80000
+	ldloc.0
 	ldloc.1
-	ldc.i4 524288
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
-	brfalse L_1076d44
+	stloc 6
 // --- basic block ---
-// 0x01076d28: 0x1076d28: sll   v1, s1, 2
-	ldloc 10
-	ldc.i4.2
-	shl
-	stloc 8
-// 0x01076d2c: 0x1076d2c: addiu v0, v0, -17252
-	ldloc 5
-	ldc.i4 -17252
-	add
-	stloc 5
-// 0x01076d30: 0x1076d30: addu  v0, v1, v0
-	ldloc 8
-	ldloc 5
+// 0x01076b14: 0x1076b14: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x01076b18: 0x1076b18: jal   0x100e798 addiu a0, a0, 15708
+	ldloc.1
+	ldc.i4 15708
 	add
-	stloc 5
-// 0x01076d34: 0x1076d34: lw    s2, 0(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x01076d38: 0x1076d38: jal   0x1001ba8 sll   zero, zero, 0
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x01076d40: 0x1076d40: sw    v0, 96(s2)
-	ldloc 6
+// 0x01076b20: 0x1076b20: lui   v1, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x01076b24: 0x1076b24: lw    a0, 15740(v1)
 	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
 	ldloc 5
-	stelem.i4
-L_1076d44:
-// 0x01076d44: 0x1076d44: lw    a0, 100(s0)
-	ldloc 6
-	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
+	ldc.i4 3935
 	add
 	ldelem.i4
 	stloc.1
-// 0x01076d48: 0x1076d48: sll   zero, zero, 0
-// 0x01076d4c: 0x1076d4c: beq   a0, zero, 0x1076d70 lui   v0, 0x80000
-	ldloc.1
+// 0x01076b28: 0x1076b28: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1076d70
-// --- basic block ---
-// 0x01076d54: 0x1076d54: sll   v1, s1, 2
-	ldloc 10
+// 0x01076b2c: 0x1076b2c: sll   a0, a0, 2
+	ldloc.1
 	ldc.i4.2
 	shl
-	stloc 8
-// 0x01076d58: 0x1076d58: addiu v0, v0, -17252
+	stloc.1
+// 0x01076b30: 0x1076b30: addiu v1, v1, -16788
 	ldloc 5
-	ldc.i4 -17252
+	ldc.i4 -16788
 	add
 	stloc 5
-// 0x01076d5c: 0x1076d5c: addu  v0, v1, v0
-	ldloc 8
+// 0x01076b34: 0x1076b34: addu  v1, a0, v1
+	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01076d60: 0x1076d60: lw    s2, 0(v0)
-	ldloc 6
+// 0x01076b38: 0x1076b38: lw    v1, 0(v1)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc 7
-// 0x01076d64: 0x1076d64: jal   0x1001ba8 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 5
-// --- basic block ---
-// 0x01076d6c: 0x1076d6c: sw    v0, 100(s2)
-	ldloc 6
+// 0x01076b3c: 0x1076b3c: sll   zero, zero, 0
+// 0x01076b40: 0x1076b40: lw    a0, 0(v1)
 	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
-	add
+	ldelem.i4
+	stloc.1
+// 0x01076b44: 0x1076b44: sll   zero, zero, 0
+// 0x01076b48: 0x1076b48: beq   v0, a0, 0x1076b74 lui   v0, 0x1070000
+	ldloc 6
+	ldloc.1
+	ldc.i4 17235968
+	stloc 6
+	beq  L_1076b74
+// --- basic block ---
+// 0x01076b50: 0x1076b50: lw    a2, 100(v1)
+	ldloc 7
 	ldloc 5
-	stelem.i4
-L_1076d70:
-// 0x01076d70: 0x1076d70: lui   s3, 0x80000
-	ldc.i4 524288
-	stloc 11
-// 0x01076d74: 0x1076d74: addiu s3, s3, -17252
-	ldloc 11
-	ldc.i4 -17252
-	add
-	stloc 11
-// 0x01076d78: 0x1076d78: sll   s2, s1, 2
-	ldloc 10
 	ldc.i4.2
-	shl
-	stloc 7
-// 0x01076d7c: 0x1076d7c: addu  s2, s2, s3
-	ldloc 7
-	ldloc 11
+	shr.un
+	ldc.i4.s 25
 	add
-	stloc 7
-// 0x01076d80: 0x1076d80: lw    a0, 0(s2)
-	ldloc 6
+	ldelem.i4
+	stloc.3
+// 0x01076b54: 0x1076b54: lw    a0, 96(v1)
 	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 24
+	add
 	ldelem.i4
 	stloc.1
-// 0x01076d84: 0x1076d84: lw    v0, 84(s0)
-	ldloc 6
-	ldloc 9
+// 0x01076b58: 0x1076b58: lw    a1, 92(v1)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.s 23
 	add
 	ldelem.i4
-	stloc 5
-// 0x01076d88: 0x1076d88: sw    zero, 64(a0)
+	stloc.2
+// 0x01076b5c: 0x1076b5c: addiu v0, v0, 27260
 	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	ldc.i4 27260
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01076d8c: 0x1076d8c: jal   0x1075d70 sw    v0, 84(a0)
-	ldloc 6
-	ldloc.1
+	stloc 6
+// 0x01076b60: 0x1076b60: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x01076b64: 0x1076b64: jal   0x1053974 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 6
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::RealtimeBonus_CreateGUIID_1075d70(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_message_ticker_show_cb_1053974(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 5
+	stloc 6
 // --- basic block ---
-// 0x01076d94: 0x1076d94: lw    v0, 1000(s3)
-	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldc.i4 250
-	add
-	ldelem.i4
+// 0x01076b6c: 0x1076b6c: j	 0x1076b7c sll   zero, zero, 0
+	br L_1076b7c
+// --- basic block ---
+L_1076b74:
+// 0x01076b74: 0x1076b74: jal   0x1076a7c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl89::ticker_closed_cb_1076a7c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
-// 0x01076d98: 0x1076d98: lw    s2, 0(s2)
+	stloc 6
+// --- basic block ---
+L_1076b7c:
+// 0x01076b7c: 0x1076b7c: lw    ra, 52(sp)
+// 0x01076b80: 0x1076b80: sll   zero, zero, 0
+// 0x01076b84: 0x1076b84: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	ret
+}
+.method public static int32 RealtimeBonus_PopUp_1076b8c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s1,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local 10 is register s1
+// local  9 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01076b8c: 0x1076b8c: addiu sp, sp, -568
+	ldloc.0
+	ldc.i4 -568
+	add
+	stloc.0
+// 0x01076b90: 0x1076b90: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x01076b94: 0x1076b94: sw    ra, 564(sp)
+// 0x01076b98: 0x1076b98: sw    s2, 560(sp)
 	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 7
-// 0x01076d9c: 0x1076d9c: addiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4 140
 	add
-	stloc 5
-// 0x01076da0: 0x1076da0: sw    v0, 1000(s3)
-	ldloc 6
-	ldloc 11
+	ldloc 9
+	stelem.i4
+// 0x01076b9c: 0x1076b9c: sw    s1, 556(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 250
+	ldc.i4 139
 	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
-// 0x01076da4: 0x1076da4: lw    v0, 84(s2)
-	ldloc 6
+// 0x01076ba0: 0x1076ba0: sw    s0, 552(sp)
 	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4 138
 	add
-	ldelem.i4
-	stloc 5
-// 0x01076da8: 0x1076da8: sll   zero, zero, 0
-// 0x01076dac: 0x1076dac: beq   v0, zero, 0x1076de0 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1076de0
-// --- basic block ---
-// 0x01076db4: 0x1076db4: lw    v0, 16(s2)
+	ldloc 8
+	stelem.i4
+// 0x01076ba4: 0x1076ba4: addiu v1, v1, -16788
 	ldloc 6
+	ldc.i4 -16788
+	add
+	stloc 6
+// 0x01076ba8: 0x1076ba8: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+// 0x01076bac: 0x1076bac: addiu a1, zero, 250
+	ldc.i4 250
+	stloc.2
+L_1076bb0:
+// 0x01076bb0: 0x1076bb0: lw    s0, 0(v1)
 	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
+	ldelem.i4
+	stloc 8
+// 0x01076bb4: 0x1076bb4: sll   zero, zero, 0
+// 0x01076bb8: 0x1076bb8: beq   s0, zero, 0x1076bf8 addiu v1, v1, 4
+	ldloc 8
+	ldloc 6
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 5
-// 0x01076db8: 0x1076db8: sll   zero, zero, 0
-// 0x01076dbc: 0x1076dbc: beq   v0, zero, 0x1076dc8 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1076dc8
+	stloc 6
+	brfalse L_1076bf8
 // --- basic block ---
-// 0x01076dc4: 0x1076dc4: sw    zero, 4(s2)
-	ldloc 6
+// 0x01076bc0: 0x1076bc0: lw    a2, 0(s0)
 	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_1076dc8:
-// 0x01076dc8: 0x1076dc8: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01076dcc: 0x1076dcc: jal   0x100e788 addiu a0, a0, 15692
+	ldelem.i4
+	stloc.3
+// 0x01076bc4: 0x1076bc4: sll   zero, zero, 0
+// 0x01076bc8: 0x1076bc8: bne   a2, a0, 0x1076bfc addiu v0, v0, 1
+	ldloc.3
 	ldloc.1
-	ldc.i4 15692
+	ldloc 5
+	ldc.i4.1
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 5
+	bne.un L_1076bfc
 // --- basic block ---
-// 0x01076dd4: 0x1076dd4: sw    v0, 12(s2)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
+// 0x01076bd0: 0x1076bd0: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
 	add
+	stloc 5
+// 0x01076bd4: 0x1076bd4: slti  v0, v0, 250
 	ldloc 5
-	stelem.i4
-// 0x01076dd8: 0x1076dd8: lui   v0, 0x0
-	ldc.i4.s 0
+	ldc.i4 250
+	clt
 	stloc 5
-// 0x01076ddc: 0x1076ddc: sw    s1, 15740(v0)
-	ldloc 6
+// 0x01076bd8: 0x1076bd8: beq   v0, zero, 0x1076ec8 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3935
-	add
-	ldloc 10
-	stelem.i4
-L_1076de0:
-// 0x01076de0: 0x1076de0: lui   s2, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x01076de4: 0x1076de4: sll   v0, s1, 2
-	ldloc 10
-	ldc.i4.2
-	shl
+	brfalse L_1076ec8
+// --- basic block ---
+// 0x01076be0: 0x1076be0: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
-// 0x01076de8: 0x1076de8: addiu s2, s2, -17252
-	ldloc 7
-	ldc.i4 -17252
-	add
-	stloc 7
-// 0x01076dec: 0x1076dec: addu  s2, v0, s2
+// --- basic block ---
+// 0x01076be8: 0x1076be8: beq   v0, zero, 0x1076c34 sll   zero, zero, 0
 	ldloc 5
-	ldloc 7
+	brfalse L_1076c34
+// --- basic block ---
+// 0x01076bf0: 0x1076bf0: j	 0x1076c0c sll   zero, zero, 0
+	br L_1076c0c
+// --- basic block ---
+L_1076bf8:
+// 0x01076bf8: 0x1076bf8: addiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
 	add
-	stloc 7
-// 0x01076df0: 0x1076df0: lw    v0, 0(s2)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldelem.i4
 	stloc 5
-// 0x01076df4: 0x1076df4: addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x01076df8: 0x1076df8: lw    a2, 28(v0)
-	ldloc 6
+L_1076bfc:
+// 0x01076bfc: 0x1076bfc: bne   v0, a1, 0x1076bb0 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldloc.2
+	bne.un L_1076bb0
+// --- basic block ---
+// 0x01076c04: 0x1076c04: j	 0x1076ec8 sll   zero, zero, 0
+	br L_1076ec8
+// --- basic block ---
+L_1076c0c:
+// 0x01076c0c: 0x1076c0c: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01076c14: 0x1076c14: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01076c18: 0x1076c18: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01076c1c: 0x1076c1c: jal   0x1001b14 addiu a1, a1, -27556
+	ldloc.2
+	ldc.i4 -27556
 	add
-	ldelem.i4
-	stloc.3
-// 0x01076dfc: 0x1076dfc: jal   0x10a1918 addiu a1, zero, 1
-	ldc.i4.1
 	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x01076c24: 0x1076c24: bne   v0, zero, 0x1076c34 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_1076c34
+// --- basic block ---
+// 0x01076c2c: 0x1076c2c: jal   0x10951ac addiu a0, zero, 2
+	ldc.i4.2
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076e04: 0x1076e04: lw    v1, 84(s0)
-	ldloc 6
-	ldloc 9
+L_1076c34:
+// 0x01076c34: 0x1076c34: lw    v0, 4(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 21
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 8
-// 0x01076e08: 0x1076e08: bne   v0, zero, 0x1076e78 sll   zero, zero, 0
+	stloc 5
+// 0x01076c38: 0x1076c38: sll   zero, zero, 0
+// 0x01076c3c: 0x1076c3c: bne   v0, zero, 0x1076c50 addiu v1, zero, 1
 	ldloc 5
-	brtrue L_1076e78
+	ldc.i4.1
+	stloc 6
+	brtrue L_1076c50
 // --- basic block ---
-// 0x01076e10: 0x1076e10: beq   v1, zero, 0x1076e2c lui   a0, 0x20000
-	ldloc 8
-	ldc.i4 131072
+// 0x01076c44: 0x1076c44: lui   a0, 0x0
+	ldc.i4.s 0
 	stloc.1
-	brfalse L_1076e2c
+// 0x01076c48: 0x1076c48: j	 0x1076c60 addiu a0, a0, 29940
+	ldloc.1
+	ldc.i4 29940
+	add
+	stloc.1
+	br L_1076c60
 // --- basic block ---
-// 0x01076e18: 0x1076e18: lw    v0, 0(s2)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x01076e1c: 0x1076e1c: sll   zero, zero, 0
-// 0x01076e20: 0x1076e20: lw    a1, 28(v0)
-	ldloc 6
+L_1076c50:
+// 0x01076c50: 0x1076c50: bne   v0, v1, 0x1076c70 addiu v0, s0, 20
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldloc 6
+	ldloc 8
+	ldc.i4.s 20
 	add
-	ldelem.i4
-	stloc.2
-// 0x01076e24: 0x1076e24: jal   0x1000e78 addiu a0, a0, -27532
+	stloc 5
+	bne.un L_1076c70
+// --- basic block ---
+// 0x01076c58: 0x1076c58: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076c5c: 0x1076c5c: addiu a0, a0, -27540
 	ldloc.1
-	ldc.i4 -27532
+	ldc.i4 -27540
 	add
 	stloc.1
+L_1076c60:
+// 0x01076c60: 0x1076c60: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::printf_1000e78(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_1076e2c:
-// 0x01076e2c: 0x1076e2c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01076e30: 0x1076e30: addiu v0, v0, -17252
+// 0x01076c68: 0x1076c68: addu  s1, v0, zero
 	ldloc 5
-	ldc.i4 -17252
+	stloc 10
+// 0x01076c6c: 0x1076c6c: addiu v0, s0, 20
+	ldloc 8
+	ldc.i4.s 20
 	add
 	stloc 5
-// 0x01076e34: 0x1076e34: sll   s1, s1, 2
+L_1076c70:
+// 0x01076c70: 0x1076c70: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076c74: 0x1076c74: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x01076c78: 0x1076c78: addu  a1, s1, zero
 	ldloc 10
-	ldc.i4.2
-	shl
-	stloc 10
-// 0x01076e38: 0x1076e38: addu  s1, s1, v0
-	ldloc 10
-	ldloc 5
-	add
-	stloc 10
-// 0x01076e3c: 0x1076e3c: lw    v0, 0(s1)
-	ldloc 6
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x01076e40: 0x1076e40: lui   a3, 0x10000
-	ldc.i4 65536
-	stloc 4
-// 0x01076e44: 0x1076e44: lw    a1, 28(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
 	stloc.2
-// 0x01076e48: 0x1076e48: lui   v0, 0x1070000
-	ldc.i4 17235968
-	stloc 5
-// 0x01076e4c: 0x1076e4c: addiu v0, v0, 25564
-	ldloc 5
-	ldc.i4 25564
-	add
-	stloc 5
-// 0x01076e50: 0x1076e50: addiu a3, a3, 18500
-	ldloc 4
-	ldc.i4 18500
+// 0x01076c7c: 0x1076c7c: addiu a0, a0, -27556
+	ldloc.1
+	ldc.i4 -27556
 	add
-	stloc 4
-// 0x01076e54: 0x1076e54: addu  a0, zero, zero
-	ldc.i4.s 0
 	stloc.1
-// 0x01076e58: 0x1076e58: addu  a2, zero, zero
+// 0x01076c80: 0x1076c80: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01076e5c: 0x1076e5c: sw    v0, 24(sp)
-	ldloc 6
+// 0x01076c84: 0x1076c84: addiu a3, zero, -2
+	ldc.i4.s -2
+	stloc 4
+// 0x01076c88: 0x1076c88: sw    v0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
 	ldloc 5
 	stelem.i4
-// 0x01076e60: 0x1076e60: sw    zero, 16(sp)
-	ldloc 6
+// 0x01076c8c: 0x1076c8c: lui   v0, 0x18800000
+	ldc.i4 411041792
+	stloc 5
+// 0x01076c90: 0x1076c90: sw    v1, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01076e64: 0x1076e64: sw    zero, 20(sp)
 	ldloc 6
+	stelem.i4
+// 0x01076c94: 0x1076c94: lui   s2, 0x10000
+	ldc.i4 65536
+	stloc 9
+// 0x01076c98: 0x1076c98: jal   0x109eb38 sw    v0, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-// 0x01076e68: 0x1076e68: jal   0x10a2c58 sw    zero, 28(sp)
-	ldloc 6
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01076ca0: 0x1076ca0: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01076ca4: 0x1076ca4: addiu a3, zero, 5
+	ldc.i4.5
+	stloc 4
+// 0x01076ca8: 0x1076ca8: addu  s1, v0, zero
+	ldloc 5
+	stloc 10
+// 0x01076cac: 0x1076cac: addiu a1, s2, 18768
+	ldloc 9
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x01076cb0: 0x1076cb0: addiu a0, a0, 1760
+	ldloc.1
+	ldc.i4 1760
+	add
+	stloc.1
+// 0x01076cb4: 0x1076cb4: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x01076cb8: 0x1076cb8: addiu v0, zero, 8
+	ldc.i4.8
+	stloc 5
+// 0x01076cbc: 0x1076cbc: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01076e70: 0x1076e70: j	 0x1076eb4 addiu v0, zero, 1
-	ldc.i4.1
+	stloc 6
 	stloc 5
-	br L_1076eb4
 // --- basic block ---
-L_1076e78:
-// 0x01076e78: 0x1076e78: beq   v1, zero, 0x1076e98 lui   v0, 0x80000
-	ldloc 8
-	ldc.i4 524288
-	stloc 5
-	brfalse L_1076e98
+// 0x01076cc4: 0x1076cc4: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01076cc8: 0x1076cc8: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x01076ccc: 0x1076ccc: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01076cd0: 0x1076cd0: jal   0x1099628 sw    v0, 544(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 136
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01076e80: 0x1076e80: lw    v0, 0(s2)
-	ldloc 6
+// 0x01076cd8: 0x1076cd8: lw    v0, 544(sp)
 	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4 136
+	add
 	ldelem.i4
 	stloc 5
-// 0x01076e84: 0x1076e84: lui   a0, 0x20000
-	ldc.i4 131072
+// 0x01076cdc: 0x1076cdc: addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x01076e88: 0x1076e88: lw    a1, 28(v0)
-	ldloc 6
+// 0x01076ce0: 0x1076ce0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01076ce8: 0x1076ce8: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076cec: 0x1076cec: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x01076cf0: 0x1076cf0: addiu a1, s2, 18768
+	ldloc 9
+	ldc.i4 18768
 	add
-	ldelem.i4
 	stloc.2
-// 0x01076e8c: 0x1076e8c: jal   0x1000e78 addiu a0, a0, -27512
+// 0x01076cf4: 0x1076cf4: addiu a0, a0, -27524
 	ldloc.1
-	ldc.i4 -27512
+	ldc.i4 -27524
 	add
 	stloc.1
+// 0x01076cf8: 0x1076cf8: addiu a2, zero, 50
+	ldc.i4.s 50
+	stloc.3
+// 0x01076cfc: 0x1076cfc: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x01076d00: 0x1076d00: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::printf_1000e78(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076e94: 0x1076e94: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_1076e98:
-// 0x01076e98: 0x1076e98: sll   s1, s1, 2
-	ldloc 10
-	ldc.i4.2
-	shl
-	stloc 10
-// 0x01076e9c: 0x1076e9c: addiu v0, v0, -17252
+// 0x01076d08: 0x1076d08: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4 -17252
-	add
-	stloc 5
-// 0x01076ea0: 0x1076ea0: addu  s1, s1, v0
-	ldloc 10
+	stloc.1
+// 0x01076d0c: 0x1076d0c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01076d10: 0x1076d10: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x01076d14: 0x1076d14: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
-	add
-	stloc 10
-// 0x01076ea4: 0x1076ea4: lw    a0, 0(s1)
-	ldloc 6
-	ldloc 10
+	stloc 9
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x01076d1c: 0x1076d1c: lw    a1, 28(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
+	ldc.i4.7
+	add
 	ldelem.i4
+	stloc.2
+// 0x01076d20: 0x1076d20: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076d24: 0x1076d24: addiu a2, zero, 17
+	ldc.i4.s 17
+	stloc.3
+// 0x01076d28: 0x1076d28: jal   0x109e784 addiu a0, a0, -27516
+	ldloc.1
+	ldc.i4 -27516
+	add
 	stloc.1
-// 0x01076ea8: 0x1076ea8: jal   0x1076388 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::onBonusAdd_1076388(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_1076eb0:
-// 0x01076eb0: 0x1076eb0: addiu v0, zero, 1
-	ldc.i4.1
+// 0x01076d30: 0x1076d30: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x01076d34: 0x1076d34: jal   0x109950c addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-L_1076eb4:
-// 0x01076eb4: 0x1076eb4: lw    ra, 52(sp)
-// 0x01076eb8: 0x1076eb8: lw    s3, 48(sp)
-	ldloc 6
-	ldloc.0
+// --- basic block ---
+// 0x01076d3c: 0x1076d3c: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x01076d40: 0x1076d40: jal   0x109950c addu  a1, s2, zero
+	ldloc 9
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01076d48: 0x1076d48: lw    a3, 80(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.s 20
 	add
 	ldelem.i4
-	stloc 11
-// 0x01076ebc: 0x1076ebc: lw    s2, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	stloc 4
+// 0x01076d4c: 0x1076d4c: sll   zero, zero, 0
+// 0x01076d50: 0x1076d50: beq   a3, zero, 0x1076d64 lui   a2, 0x10000
+	ldloc 4
+	ldc.i4 65536
+	stloc.3
+	brfalse L_1076d64
+// --- basic block ---
+// 0x01076d58: 0x1076d58: addiu a2, a2, 20332
+	ldloc.3
+	ldc.i4 20332
 	add
-	ldelem.i4
-	stloc 7
-// 0x01076ec0: 0x1076ec0: lw    s1, 40(sp)
-	ldloc 6
+	stloc.3
+// 0x01076d5c: 0x1076d5c: j	 0x1076dfc addiu a0, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 32
 	add
-	ldelem.i4
-	stloc 10
-// 0x01076ec4: 0x1076ec4: lw    s0, 36(sp)
-	ldloc 6
-	ldloc.0
+	stloc.1
+	br L_1076dfc
+// --- basic block ---
+L_1076d64:
+// 0x01076d64: 0x1076d64: lw    v0, 4(s0)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 9
-// 0x01076ec8: 0x1076ec8: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
-	add
-	stloc.0
-	br __CIBYL_function_return
+	stloc 5
+// 0x01076d68: 0x1076d68: sll   zero, zero, 0
+// 0x01076d6c: 0x1076d6c: bne   v0, zero, 0x1076dbc addiu v1, zero, 1
+	ldloc 5
+	ldc.i4.1
+	stloc 6
+	brtrue L_1076dbc
 // --- basic block ---
-L_1076ed0:
-// 0x01076ed0: 0x1076ed0: lw    a0, 0(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+// 0x01076d74: 0x1076d74: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076d78: 0x1076d78: jal   0x101cd70 addiu a0, a0, -27504
+	ldloc.1
+	ldc.i4 -27504
+	add
 	stloc.1
-// 0x01076ed4: 0x1076ed4: jal   0x106b4f0 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_CollectCustomBonus_106b4f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076edc: 0x1076edc: lw    a0, 16(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
+// 0x01076d80: 0x1076d80: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076d84: 0x1076d84: addiu a0, a0, -27468
+	ldloc.1
+	ldc.i4 -27468
+	add
+	stloc.1
+// 0x01076d88: 0x1076d88: lw    s0, 16(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldelem.i4
-	stloc.1
-// 0x01076ee0: 0x1076ee0: jal   0x10acad0 sll   zero, zero, 0
+	stloc 8
+// 0x01076d8c: 0x1076d8c: jal   0x101cd70 sw    v0, 544(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 136
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076ee8: 0x1076ee8: j	 0x1076eb4 addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-	br L_1076eb4
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RealTimeBonus_SegmentChangedCB_1076ef0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+// 0x01076d94: 0x1076d94: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x01076d98: 0x1076d98: lw    a3, 544(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 136
+	add
+	ldelem.i4
 	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01076ef0: 0x1076ef0: addiu sp, sp, -48
+// 0x01076d9c: 0x1076d9c: addiu a2, a2, 10528
+	ldloc.3
+	ldc.i4 10528
+	add
+	stloc.3
+// 0x01076da0: 0x1076da0: addiu a0, sp, 32
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4.s 32
 	add
-	stloc.0
-// 0x01076ef4: 0x1076ef4: sw    s0, 36(sp)
-	ldloc 6
+	stloc.1
+// 0x01076da4: 0x1076da4: addiu a1, zero, 512
+	ldc.i4 512
+	stloc.2
+// 0x01076da8: 0x1076da8: sw    s0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.4
 	add
 	ldloc 8
 	stelem.i4
-// 0x01076ef8: 0x1076ef8: addu  s0, a0, zero
-	ldloc.1
-	stloc 8
-// 0x01076efc: 0x1076efc: lw    a0, 4(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc.1
-// 0x01076f00: 0x1076f00: sw    s1, 40(sp)
-	ldloc 6
+// 0x01076dac: 0x1076dac: jal   0x1000f9c sw    v0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.5
 	add
-	ldloc 9
+	ldloc 5
 	stelem.i4
-// 0x01076f04: 0x1076f04: sw    ra, 44(sp)
-// 0x01076f08: 0x1076f08: jal   0x100405c addu  s1, a1, zero
-	ldloc.2
-	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_line_length_100405c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076f10: 0x1076f10: slti  v0, v0, 75
-	ldloc 5
-	ldc.i4.s 75
-	clt
-	stloc 5
-// 0x01076f14: 0x1076f14: bne   v0, zero, 0x1077070 lui   v0, 0x0
-	ldloc 5
-	ldc.i4.s 0
+// 0x01076db4: 0x1076db4: j	 0x1076e08 lui   v0, 0xf0000
+	ldc.i4 983040
 	stloc 5
-	brtrue L_1077070
+	br L_1076e08
 // --- basic block ---
-// 0x01076f1c: 0x1076f1c: lw    v0, 576(v0)
-	ldloc 6
+L_1076dbc:
+// 0x01076dbc: 0x1076dbc: bne   v0, v1, 0x1076e08 lui   v0, 0xf0000
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 144
-	add
-	ldelem.i4
-	stloc 5
-// 0x01076f20: 0x1076f20: lw    a0, 12(s0)
 	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldelem.i4
-	stloc.1
-// 0x01076f24: 0x1076f24: sll   zero, zero, 0
-// 0x01076f28: 0x1076f28: beq   a0, v0, 0x1076f44 addiu v0, zero, 1
-	ldloc.1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4 983040
 	stloc 5
-	beq  L_1076f44
-// --- basic block ---
-// 0x01076f30: 0x1076f30: bltz  a0, 0x1076f44 sll   zero, zero, 0
-	ldloc.1
-	ldc.i4.s 0
-	blt L_1076f44
+	bne.un L_1076e08
 // --- basic block ---
-// 0x01076f38: 0x1076f38: jal   0x100b164 sll   zero, zero, 0
+// 0x01076dc4: 0x1076dc4: jal   0x106b68c addiu s2, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_is_random_user_106b68c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076f40: 0x1076f40: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-L_1076f44:
-// 0x01076f44: 0x1076f44: bne   s1, v0, 0x1076f60 addiu a1, sp, 24
-	ldloc 9
+// 0x01076dcc: 0x1076dcc: bne   v0, zero, 0x1076de0 lui   s0, 0x10000
 	ldloc 5
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.2
-	bne.un L_1076f60
+	ldc.i4 65536
+	stloc 8
+	brtrue L_1076de0
 // --- basic block ---
-// 0x01076f4c: 0x1076f4c: addu  a2, a1, zero
-	ldloc.2
-	stloc.3
-// 0x01076f50: 0x1076f50: addu  a0, s0, zero
-	ldloc 8
+// 0x01076dd4: 0x1076dd4: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x01076f54: 0x1076f54: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01076f58: 0x1076f58: j	 0x1076f6c addiu a3, zero, 2
-	ldc.i4.2
-	stloc 4
-	br L_1076f6c
+// 0x01076dd8: 0x1076dd8: j	 0x1076de8 addiu a0, a0, -27460
+	ldloc.1
+	ldc.i4 -27460
+	add
+	stloc.1
+	br L_1076de8
 // --- basic block ---
-L_1076f60:
-// 0x01076f60: 0x1076f60: addu  a0, s0, zero
-	ldloc 8
+L_1076de0:
+// 0x01076de0: 0x1076de0: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x01076f64: 0x1076f64: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x01076f68: 0x1076f68: addiu a3, zero, 1
-	ldc.i4.1
-	stloc 4
-L_1076f6c:
-// 0x01076f6c: 0x1076f6c: lui   s1, 0x0
-	ldc.i4.s 0
-	stloc 9
-// 0x01076f70: 0x1076f70: sw    zero, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+// 0x01076de4: 0x1076de4: addiu a0, a0, -27376
+	ldloc.1
+	ldc.i4 -27376
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01076f74: 0x1076f74: jal   0x1012790 sw    zero, 20(sp)
-	ldloc 6
+	stloc.1
+L_1076de8:
+// 0x01076de8: 0x1076de8: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01076df0: 0x1076df0: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x01076df4: 0x1076df4: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x01076df8: 0x1076df8: addiu a2, s0, 20332
+	ldloc 8
+	ldc.i4 20332
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc.3
+L_1076dfc:
+// 0x01076dfc: 0x1076dfc: jal   0x1000f9c addiu a1, zero, 512
+	ldc.i4 512
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_extend_line_ends_1012790(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076f7c: 0x1076f7c: lw    v0, 15740(s1)
-	ldloc 6
-	ldloc 9
+// 0x01076e04: 0x1076e04: lui   v0, 0xf0000
+	ldc.i4 983040
+	stloc 5
+L_1076e08:
+// 0x01076e08: 0x1076e08: lw    v1, -29604(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3935
+	ldc.i4 -7401
 	add
 	ldelem.i4
+	stloc 6
+// 0x01076e0c: 0x1076e0c: lui   v0, 0xf0000
+	ldc.i4 983040
 	stloc 5
-// 0x01076f80: 0x1076f80: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 7
-// 0x01076f84: 0x1076f84: beq   v0, v1, 0x1077070 lui   s0, 0x80000
-	ldloc 5
+// 0x01076e10: 0x1076e10: lw    v0, -29608(v0)
 	ldloc 7
-	ldc.i4 524288
-	stloc 8
-	beq  L_1077070
-// --- basic block ---
-// 0x01076f8c: 0x1076f8c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
-	shl
-	stloc 5
-// 0x01076f90: 0x1076f90: addiu s0, s0, -17252
-	ldloc 8
-	ldc.i4 -17252
-	add
-	stloc 8
-// 0x01076f94: 0x1076f94: addu  v0, v0, s0
-	ldloc 5
-	ldloc 8
+	shr.un
+	ldc.i4 -7402
 	add
+	ldelem.i4
 	stloc 5
-// 0x01076f98: 0x1076f98: lw    v0, 0(v0)
+// 0x01076e14: 0x1076e14: addiu a2, v1, -90
 	ldloc 6
+	ldc.i4.s -90
+	add
+	stloc.3
+// 0x01076e18: 0x1076e18: slt   v1, v0, v1
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x01076f9c: 0x1076f9c: sll   zero, zero, 0
-// 0x01076fa0: 0x1076fa0: beq   v0, zero, 0x1077070 lui   a0, 0x20000
+	ldloc 6
+	clt
+	stloc 6
+// 0x01076e1c: 0x1076e1c: beq   v1, zero, 0x1076e28 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_1076e28
+// --- basic block ---
+// 0x01076e24: 0x1076e24: addiu a2, v0, -90
 	ldloc 5
+	ldc.i4.s -90
+	add
+	stloc.3
+L_1076e28:
+// 0x01076e28: 0x1076e28: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01076e2c: 0x1076e2c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	brfalse L_1077070
-// --- basic block ---
-// 0x01076fa8: 0x1076fa8: lw    a1, 28(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+// 0x01076e30: 0x1076e30: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x01076e34: 0x1076e34: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
-	ldelem.i4
 	stloc.2
-// 0x01076fac: 0x1076fac: jal   0x1000e78 addiu a0, a0, -27496
+// 0x01076e38: 0x1076e38: addiu a0, a0, -27524
 	ldloc.1
-	ldc.i4 -27496
+	ldc.i4 -27524
 	add
 	stloc.1
+// 0x01076e3c: 0x1076e3c: jal   0x1094048 sw    zero, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::printf_1000e78(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076fb4: 0x1076fb4: lw    v0, 15740(s1)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 3935
-	add
-	ldelem.i4
-	stloc 5
-// 0x01076fb8: 0x1076fb8: lw    v1, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 7
-// 0x01076fbc: 0x1076fbc: sll   v0, v0, 2
+// 0x01076e44: 0x1076e44: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4.2
-	shl
-	stloc 5
-// 0x01076fc0: 0x1076fc0: addu  s0, v0, s0
+	stloc.1
+// 0x01076e48: 0x1076e48: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01076e4c: 0x1076e4c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x01076e50: 0x1076e50: jal   0x1099628 addu  s0, v0, zero
 	ldloc 5
-	ldloc 8
-	add
 	stloc 8
-// 0x01076fc4: 0x1076fc4: lw    v0, 0(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x01076fc8: 0x1076fc8: sll   zero, zero, 0
-// 0x01076fcc: 0x1076fcc: sw    v1, 24(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x01076e58: 0x1076e58: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076e5c: 0x1076e5c: addiu a2, zero, 16
+	ldc.i4.s 16
+	stloc.3
+// 0x01076e60: 0x1076e60: addiu a3, zero, 8
+	ldc.i4.8
+	stloc 4
+// 0x01076e64: 0x1076e64: addiu a0, a0, -27184
+	ldloc.1
+	ldc.i4 -27184
 	add
-	ldloc 7
-	stelem.i4
-// 0x01076fd0: 0x1076fd0: lw    v1, 24(sp)
-	ldloc 6
+	stloc.1
+// 0x01076e68: 0x1076e68: jal   0x1099358 addiu a1, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 7
-// 0x01076fd4: 0x1076fd4: jal   0x10a6ed0 sw    v1, 20(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4.s 32
 	add
-	ldloc 7
-	stelem.i4
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a6ed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01076fdc: 0x1076fdc: beq   v0, zero, 0x107705c lui   a0, 0x1070000
+// 0x01076e70: 0x1076e70: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x01076e74: 0x1076e74: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4 17235968
 	stloc.1
-	brfalse L_107705c
+// 0x01076e78: 0x1076e78: addiu a1, a1, 23008
+	ldloc.2
+	ldc.i4 23008
+	add
+	stloc.2
+// 0x01076e7c: 0x1076e7c: jal   0x1098140 sw    v0, 544(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 136
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01076fe4: 0x1076fe4: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x01076fe8: 0x1076fe8: lw    v0, -17256(s1)
-	ldloc 6
-	ldloc 9
+// 0x01076e84: 0x1076e84: lw    v0, 544(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4314
+	ldc.i4 136
 	add
 	ldelem.i4
 	stloc 5
-// 0x01076fec: 0x1076fec: sll   zero, zero, 0
-// 0x01076ff0: 0x1076ff0: bne   v0, zero, 0x1077028 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brtrue L_1077028
-// --- basic block ---
-// 0x01076ff8: 0x1076ff8: jal   0x10518a8 addiu a0, zero, 1
-	ldc.i4.1
+// 0x01076e88: 0x1076e88: addu  a0, s0, zero
+	ldloc 8
 	stloc.1
+// 0x01076e8c: 0x1076e8c: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
 	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01077000: 0x1077000: lui   s0, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x01077004: 0x1077004: addu  a0, v0, zero
-	ldloc 5
+// 0x01076e94: 0x1076e94: addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x01077008: 0x1077008: addiu a1, s0, -27476
+// 0x01076e98: 0x1076e98: jal   0x109950c addu  a1, s0, zero
 	ldloc 8
-	ldc.i4 -27476
-	add
 	stloc.2
-// 0x0107700c: 0x107700c: jal   0x10518cc sw    v0, -17256(s1)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4314
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01077014: 0x1077014: addiu a2, s0, -27476
-	ldloc 8
-	ldc.i4 -27476
+// 0x01076ea0: 0x1076ea0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01076ea4: 0x1076ea4: addiu a0, a0, -27556
+	ldloc.1
+	ldc.i4 -27556
 	add
-	stloc.3
-// 0x01077018: 0x1077018: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0107701c: 0x107701c: jal   0x10a1918 addu  a1, zero, zero
+// 0x01076ea8: 0x1076ea8: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -2696,3026 +2409,2359 @@ L_1076f6c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01077024: 0x1077024: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_1077028:
-// 0x01077028: 0x1077028: lw    a0, -17256(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4314
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107702c: 0x107702c: jal   0x105195c sll   zero, zero, 0
+// 0x01076eb0: 0x1076eb0: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01077034: 0x1077034: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x01077038: 0x1077038: lw    v1, 15740(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3935
-	add
-	ldelem.i4
-	stloc 7
-// 0x0107703c: 0x107703c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01077040: 0x1077040: sll   v1, v1, 2
-	ldloc 7
-	ldc.i4.2
-	shl
-	stloc 7
-// 0x01077044: 0x1077044: addiu v0, v0, -17252
-	ldloc 5
-	ldc.i4 -17252
-	add
-	stloc 5
-// 0x01077048: 0x1077048: addu  v0, v1, v0
-	ldloc 7
-	ldloc 5
-	add
-	stloc 5
-// 0x0107704c: 0x107704c: lw    a0, 0(v0)
-	ldloc 6
+// 0x01076eb8: 0x1076eb8: bne   v0, zero, 0x1076ec8 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01077050: 0x1077050: jal   0x1076220 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
+	brtrue L_1076ec8
+// --- basic block ---
+// 0x01076ec0: 0x1076ec0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl88::AddBonusToMap_1076220(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01077058: 0x1077058: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-L_107705c:
-// 0x0107705c: 0x107705c: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 7
-// 0x01077060: 0x1077060: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x01077064: 0x1077064: addiu a0, a0, 28400
-	ldloc.1
-	ldc.i4 28400
-	add
-	stloc.1
-// 0x01077068: 0x1077068: jal   0x1029d04 sw    v1, 15740(v0)
-	ldloc 6
-	ldloc 5
+L_1076ec8:
+// 0x01076ec8: 0x1076ec8: lw    ra, 564(sp)
+// 0x01076ecc: 0x1076ecc: lw    s2, 560(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3935
+	ldc.i4 140
 	add
+	ldelem.i4
+	stloc 9
+// 0x01076ed0: 0x1076ed0: lw    s1, 556(sp)
 	ldloc 7
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl31::roadmap_navigate_unregister_segment_changed_1029d04(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_1077070:
-// 0x01077070: 0x1077070: lw    ra, 44(sp)
-// 0x01077074: 0x1077074: lw    s1, 40(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4 139
 	add
 	ldelem.i4
-	stloc 9
-// 0x01077078: 0x1077078: lw    s0, 36(sp)
-	ldloc 6
+	stloc 10
+// 0x01076ed4: 0x1076ed4: lw    s0, 552(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 138
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107707c: 0x107707c: jr    ra addiu sp, sp, 48
+// 0x01076ed8: 0x1076ed8: jr    ra addiu sp, sp, 568
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4 568
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Count_1077084()
+.method public static int32 OnbonusShortClick_1076ee0(int32,int32,int32,int32,int32)
 {
-.maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc.0
+	stloc 5
 	ldc.i4.s 0
-	stloc.1
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.2
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1077084:
-// 0x01077084: 0x1077084: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01076ee0: 0x1076ee0: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
 	stloc.0
-// 0x01077088: 0x1077088: lw    v0, -14028(v0)
-	ldloc 2
+// 0x01076ee4: 0x1076ee4: lw    a0, 56(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4.s 14
 	add
 	ldelem.i4
-	stloc.0
-// 0x0107708c: 0x107708c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	stloc.1
+// 0x01076ee8: 0x1076ee8: sw    ra, 20(sp)
+// 0x01076eec: 0x1076eec: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
-	ret
-}
-.method public static int32 RTAlerts_Get_10770d4(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
-
-// local  1 is register v0
-// local  0 is register a0
-// local  2 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01076ef4: 0x1076ef4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01076ef8: 0x1076ef8: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+// 0x01076efc: 0x1076efc: jal   0x1001984 addiu a1, a1, -23840
+	ldloc.2
+	ldc.i4 -23840
+	add
 	stloc.2
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::strtok_1001984(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x010770d4: 0x10770d4: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01076f04: 0x1076f04: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x010770d8: 0x10770d8: addiu v0, v0, -16028
+// 0x01076f08: 0x1076f08: beq   a0, zero, 0x1076f18 addiu v0, zero, -1
 	ldloc.1
-	ldc.i4 -16028
-	add
-	stloc.1
-// 0x010770dc: 0x10770dc: sll   a0, a0, 2
+	ldc.i4.m1
+	stloc 5
+	brfalse L_1076f18
+// --- basic block ---
+// 0x01076f10: 0x1076f10: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
-	ldc.i4.2
-	shl
-	stloc.0
-// 0x010770e0: 0x10770e0: addu  a0, a0, v0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::atoi_1000d8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_1076f18:
+// 0x01076f18: 0x1076f18: jal   0x1076b8c addu  a0, v0, zero
+	ldloc 5
+	stloc.1
 	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl89::RealtimeBonus_PopUp_1076b8c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01076f20: 0x1076f20: lw    ra, 20(sp)
+// 0x01076f24: 0x1076f24: sll   zero, zero, 0
+// 0x01076f28: 0x1076f28: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
 	stloc.0
-// 0x010770e4: 0x10770e4: lw    v0, 0(a0)
-	ldloc 3
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x010770e8: 0x10770e8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.1
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Get_By_ID_10770f0(int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_RemoveFromTable_1076f30(int32,int32,int32,int32,int32)
 {
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 s1,int32 v1,int32 ra)
 
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
+// local  5 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  6 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  7 is register mem
 
-	ldc.i4.s 0
-	stloc 4
 	ldc.i4.s 0
 	stloc 5
-	ldarg 0
-	stloc 0
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010770f0: 0x10770f0: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x010770f4: 0x10770f4: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+// 0x01076f30: 0x1076f30: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
 	add
-	stloc 4
-// 0x010770f8: 0x10770f8: addu  a1, v0, zero
-	ldloc 4
+	stloc.0
+// 0x01076f34: 0x1076f34: addu  v0, a0, zero
+	ldloc.1
+	stloc 5
+// 0x01076f38: 0x1076f38: lui   a0, 0x80000
+	ldc.i4 524288
 	stloc.1
-// 0x010770fc: 0x10770fc: lw    a2, 2000(v0)
-	ldloc 6
-	ldloc 4
+// 0x01076f3c: 0x1076f3c: sw    s0, 28(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc.2
-// 0x01077100: 0x1077100: j	 0x1077120 addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1077120
-// --- basic block ---
-L_1077108:
-// 0x01077108: 0x1077108: lw    v0, 0(a1)
 	ldloc 6
-	ldloc.1
+	stelem.i4
+// 0x01076f40: 0x1076f40: sw    ra, 36(sp)
+// 0x01076f44: 0x1076f44: sw    s1, 32(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107710c: 0x107710c: addiu v1, v1, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4.8
 	add
-	stloc 5
-// 0x01077110: 0x1077110: lw    a3, 0(v0)
-	ldloc 6
-	ldloc 4
+	ldloc 8
+	stelem.i4
+// 0x01076f48: 0x1076f48: addiu a0, a0, -16788
+	ldloc.1
+	ldc.i4 -16788
+	add
+	stloc.1
+// 0x01076f4c: 0x1076f4c: addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+// 0x01076f50: 0x1076f50: addiu a1, zero, 250
+	ldc.i4 250
+	stloc.2
+L_1076f54:
+// 0x01076f54: 0x1076f54: lw    v1, 0(a0)
+	ldloc 7
+	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.3
-// 0x01077114: 0x1077114: sll   zero, zero, 0
-// 0x01077118: 0x1077118: beq   a3, a0, 0x107712c addiu a1, a1, 4
-	ldloc.3
-	ldloc.0
+	stloc 9
+// 0x01076f58: 0x1076f58: sll   zero, zero, 0
+// 0x01076f5c: 0x1076f5c: beq   v1, zero, 0x1076fe0 addiu a0, a0, 4
+	ldloc 9
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-	beq  L_107712c
+	brfalse L_1076fe0
 // --- basic block ---
-L_1077120:
-// 0x01077120: 0x1077120: slt   v0, v1, a2
+// 0x01076f64: 0x1076f64: lw    a2, 0(v1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x01076f68: 0x1076f68: sll   zero, zero, 0
+// 0x01076f6c: 0x1076f6c: bne   a2, v0, 0x1076fe4 addiu s0, s0, 1
+	ldloc.3
 	ldloc 5
-	ldloc.2
-	clt
-	stloc 4
-// 0x01077124: 0x1077124: bne   v0, zero, 0x1077108 addu  v0, zero, zero
-	ldloc 4
-	ldc.i4.s 0
-	stloc 4
-	brtrue L_1077108
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+	bne.un L_1076fe4
 // --- basic block ---
-L_107712c:
-// 0x0107712c: 0x107712c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01076f74: 0x1076f74: addiu s0, s0, -1
+	ldloc 6
+	ldc.i4.m1
+	add
+	stloc 6
+// 0x01076f78: 0x1076f78: lw    v0, 84(v1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldelem.i4
+	stloc 5
+// 0x01076f7c: 0x1076f7c: sll   zero, zero, 0
+// 0x01076f80: 0x1076f80: beq   v0, zero, 0x1076fb4 lui   s1, 0x80000
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_State_1077178()
-{
-.maxstack 5
-.locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  0 is register v0
-// local  1 is register v1
-// local  3 is register ra
-// local  2 is register mem
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-	ldc.i4.s 0
-	stloc.3
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.2
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01077178: 0x1077178: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc.0
-// 0x0107717c: 0x107717c: lw    v1, -14028(v0)
-	ldloc 2
-	ldloc.0
+	stloc 8
+	brfalse L_1076fb4
+// --- basic block ---
+// 0x01076f88: 0x1076f88: lw    v0, 88(v1)
+	ldloc 7
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4.s 22
 	add
 	ldelem.i4
+	stloc 5
+// 0x01076f8c: 0x1076f8c: sll   zero, zero, 0
+// 0x01076f90: 0x1076f90: bne   v0, zero, 0x1076fb8 addiu s1, s1, -16788
+	ldloc 5
+	ldloc 8
+	ldc.i4 -16788
+	add
+	stloc 8
+	brtrue L_1076fb8
+// --- basic block ---
+// 0x01076f98: 0x1076f98: lui   a0, 0x1070000
+	ldc.i4 17235968
 	stloc.1
-// 0x01077180: 0x1077180: sll   zero, zero, 0
-// 0x01077184: 0x1077184: beq   v1, zero, 0x1077194 addiu v0, zero, -1
+// 0x01076f9c: 0x1076f9c: jal   0x1029d14 addiu a0, a0, 29972
 	ldloc.1
-	ldc.i4.m1
-	stloc.0
-	brfalse L_1077194
+	ldc.i4 29972
+	add
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl31::roadmap_navigate_unregister_segment_changed_1029d14(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
 // --- basic block ---
-// 0x0107718c: 0x107718c: lui   v0, 0x0
+// 0x01076fa4: 0x1076fa4: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 9
+// 0x01076fa8: 0x1076fa8: lui   v0, 0x0
 	ldc.i4.s 0
-	stloc.0
-// 0x01077190: 0x1077190: lw    v0, 15940(v0)
-	ldloc 2
-	ldloc.0
+	stloc 5
+// 0x01076fac: 0x1076fac: sw    v1, 15740(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3985
+	ldc.i4 3935
 	add
-	ldelem.i4
-	stloc.0
-L_1077194:
-// 0x01077194: 0x1077194: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.1
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.0
-	ret
-}
-.method public static int32 RTAlerts_Get_Number_of_Comments_10771d8(int32,int32,int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010771d8: 0x10771d8: lui   v0, 0x80000
+	ldloc 9
+	stelem.i4
+// 0x01076fb0: 0x1076fb0: lui   s1, 0x80000
 	ldc.i4 524288
-	stloc 4
-// 0x010771dc: 0x10771dc: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+	stloc 8
+L_1076fb4:
+// 0x01076fb4: 0x1076fb4: addiu s1, s1, -16788
+	ldloc 8
+	ldc.i4 -16788
 	add
-	stloc 4
-// 0x010771e0: 0x10771e0: addu  v1, v0, zero
-	ldloc 4
-	stloc 5
-// 0x010771e4: 0x10771e4: lw    a2, 2000(v0)
+	stloc 8
+L_1076fb8:
+// 0x01076fb8: 0x1076fb8: sll   s0, s0, 2
 	ldloc 6
-	ldloc 4
 	ldc.i4.2
-	shr.un
-	ldc.i4 500
+	shl
+	stloc 6
+// 0x01076fbc: 0x1076fbc: addu  s0, s0, s1
+	ldloc 6
+	ldloc 8
 	add
-	ldelem.i4
-	stloc.2
-// 0x010771e8: 0x10771e8: j	 0x1077214 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_1077214
-// --- basic block ---
-L_10771f0:
-// 0x010771f0: 0x10771f0: lw    a1, 0(v1)
+	stloc 6
+// 0x01076fc0: 0x1076fc0: lw    a0, 0(s0)
+	ldloc 7
 	ldloc 6
-	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010771f4: 0x10771f4: addiu v0, v0, 1
+// 0x01076fc4: 0x1076fc4: jal   0x1000930 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4.1
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
+// --- basic block ---
+// 0x01076fcc: 0x1076fcc: lw    v0, 1000(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 250
 	add
-	stloc 4
-// 0x010771f8: 0x10771f8: lw    a3, 0(a1)
+	ldelem.i4
+	stloc 5
+// 0x01076fd0: 0x1076fd0: sw    zero, 0(s0)
+	ldloc 7
 	ldloc 6
-	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x010771fc: 0x10771fc: sll   zero, zero, 0
-// 0x01077200: 0x1077200: bne   a3, a0, 0x1077214 addiu v1, v1, 4
-	ldloc.3
-	ldloc.0
+	ldc.i4.s 0
+	stelem.i4
+// 0x01076fd4: 0x1076fd4: addiu v0, v0, -1
 	ldloc 5
-	ldc.i4.4
+	ldc.i4.m1
 	add
 	stloc 5
-	bne.un L_1077214
-// --- basic block ---
-// 0x01077208: 0x1077208: lw    v0, 1276(a1)
-	ldloc 6
-	ldloc.1
+// 0x01076fd8: 0x1076fd8: j	 0x1077008 sw    v0, 1000(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4 250
 	add
-	ldelem.i4
+	ldloc 5
+	stelem.i4
+	br L_1077008
+// --- basic block ---
+L_1076fe0:
+// 0x01076fe0: 0x1076fe0: addiu s0, s0, 1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+L_1076fe4:
+// 0x01076fe4: 0x1076fe4: bne   s0, a1, 0x1076f54 lui   a3, 0x20000
+	ldloc 6
+	ldloc.2
+	ldc.i4 131072
 	stloc 4
-// 0x0107720c: 0x107720c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
+	bne.un L_1076f54
 // --- basic block ---
-L_1077214:
-// 0x01077214: 0x1077214: slt   a1, v0, a2
-	ldloc 4
+// 0x01076fec: 0x1076fec: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01076ff0: 0x1076ff0: addiu a1, a1, -28380
 	ldloc.2
-	clt
+	ldc.i4 -28380
+	add
+	stloc.2
+// 0x01076ff4: 0x1076ff4: addiu a3, a3, -27172
+	ldloc 4
+	ldc.i4 -27172
+	add
+	stloc 4
+// 0x01076ff8: 0x1076ff8: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x01077218: 0x1077218: bne   a1, zero, 0x10771f0 sll   zero, zero, 0
+// 0x01076ffc: 0x1076ffc: addiu a2, zero, 265
+	ldc.i4 265
+	stloc.3
+// 0x01077000: 0x1077000: jal   0x100449c sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	brtrue L_10771f0
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 5
 // --- basic block ---
-// 0x01077220: 0x1077220: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
+L_1077008:
+// 0x01077008: 0x1077008: lw    ra, 36(sp)
+// 0x0107700c: 0x107700c: lw    s1, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 8
+// 0x01077010: 0x1077010: lw    s0, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 6
+// 0x01077014: 0x1077014: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Has_Image_1077274(int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_Delete_107701c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
 
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  7 is register mem
 
-	ldc.i4.s 0
-	stloc 4
 	ldc.i4.s 0
 	stloc 5
-	ldarg 0
-	stloc 0
+	ldc.i4.s 0
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077274: 0x1077274: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x01077278: 0x1077278: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+// 0x0107701c: 0x107701c: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	stloc 4
-// 0x0107727c: 0x107727c: addu  v1, v0, zero
-	ldloc 4
-	stloc 5
-// 0x01077280: 0x1077280: lw    a2, 2000(v0)
-	ldloc 6
-	ldloc 4
+	stloc.0
+// 0x01077020: 0x1077020: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x01077024: 0x1077024: sw    s0, 20(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc.2
-// 0x01077284: 0x1077284: j	 0x10772b0 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_10772b0
-// --- basic block ---
-L_107728c:
-// 0x0107728c: 0x107728c: lw    a1, 0(v1)
-	ldloc 6
-	ldloc 5
+	ldloc 9
+	stelem.i4
+// 0x01077028: 0x1077028: sw    ra, 28(sp)
+// 0x0107702c: 0x107702c: addu  s0, a0, zero
+	ldloc.1
+	stloc 9
+// 0x01077030: 0x1077030: sw    s1, 24(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01077290: 0x1077290: addiu v0, v0, 1
-	ldloc 4
-	ldc.i4.1
+	ldc.i4.6
 	add
-	stloc 4
-// 0x01077294: 0x1077294: lw    a3, 0(a1)
+	ldloc 8
+	stelem.i4
+// 0x01077034: 0x1077034: addiu v1, v1, -16788
+	ldloc 6
+	ldc.i4 -16788
+	add
+	stloc 6
+// 0x01077038: 0x1077038: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+// 0x0107703c: 0x107703c: addiu a0, zero, 250
+	ldc.i4 250
+	stloc.1
+L_1077040:
+// 0x01077040: 0x1077040: lw    s1, 0(v1)
+	ldloc 7
 	ldloc 6
-	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.3
-// 0x01077298: 0x1077298: sll   zero, zero, 0
-// 0x0107729c: 0x107729c: bne   a3, a0, 0x10772b0 addiu v1, v1, 4
-	ldloc.3
-	ldloc.0
-	ldloc 5
+	stloc 8
+// 0x01077044: 0x1077044: sll   zero, zero, 0
+// 0x01077048: 0x1077048: beq   s1, zero, 0x1077088 addiu v1, v1, 4
+	ldloc 8
+	ldloc 6
 	ldc.i4.4
 	add
-	stloc 5
-	bne.un L_10772b0
+	stloc 6
+	brfalse L_1077088
 // --- basic block ---
-// 0x010772a4: 0x10772a4: lb    v0, 708(a1)
-	ldloc.1
-	ldc.i4 708
+// 0x01077050: 0x1077050: lw    a1, 0(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.2
+// 0x01077054: 0x1077054: sll   zero, zero, 0
+// 0x01077058: 0x1077058: bne   a1, s0, 0x107708c addiu v0, v0, 1
+	ldloc.2
+	ldloc 9
+	ldloc 5
+	ldc.i4.1
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 4
-// 0x010772a8: 0x10772a8: jr    ra sltu  v0, zero, v0
-	ldc.i4.s 0
-	ldloc 4
-	clt.un
-	stloc 4
-	br __CIBYL_function_return
+	stloc 5
+	bne.un L_107708c
 // --- basic block ---
-L_10772b0:
-// 0x010772b0: 0x10772b0: slt   a1, v0, a2
-	ldloc 4
-	ldloc.2
+// 0x01077060: 0x1077060: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
+	add
+	stloc 5
+// 0x01077064: 0x1077064: slti  v0, v0, 250
+	ldloc 5
+	ldc.i4 250
 	clt
+	stloc 5
+// 0x01077068: 0x1077068: beq   v0, zero, 0x107711c sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107711c
+// --- basic block ---
+// 0x01077070: 0x1077070: lw    a0, 28(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
 	stloc.1
-// 0x010772b4: 0x10772b4: bne   a1, zero, 0x107728c sll   zero, zero, 0
+// 0x01077074: 0x1077074: sll   zero, zero, 0
+// 0x01077078: 0x1077078: bne   a0, zero, 0x107709c sll   zero, zero, 0
 	ldloc.1
-	brtrue L_107728c
+	brtrue L_107709c
 // --- basic block ---
-// 0x010772bc: 0x10772bc: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01077080: 0x1077080: j	 0x10770a4 sll   zero, zero, 0
+	br L_10770a4
+// --- basic block ---
+L_1077088:
+// 0x01077088: 0x1077088: addiu v0, v0, 1
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_Position_10772c4(int32,int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  3 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  6 is register ra
-// local  4 is register mem
-
-	ldc.i4.s 0
-	stloc.3
-	ldc.i4.s 0
+	ldc.i4.1
+	add
 	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
+L_107708c:
+// 0x0107708c: 0x107708c: bne   v0, a0, 0x1077040 sll   zero, zero, 0
+	ldloc 5
+	ldloc.1
+	bne.un L_1077040
+// --- basic block ---
+// 0x01077094: 0x1077094: j	 0x1077120 addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 4
-__CIBYL_javamethod_begin:
+	stloc 5
+	br L_1077120
 // --- basic block ---
-L_10772c4:
-// 0x010772c4: 0x10772c4: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.3
-// 0x010772c8: 0x10772c8: addiu v0, v0, -16028
-	ldloc.3
-	ldc.i4 -16028
-	add
-	stloc.3
-// 0x010772cc: 0x10772cc: sll   a0, a0, 2
-	ldloc.0
-	ldc.i4.2
-	shl
-	stloc.0
-// 0x010772d0: 0x10772d0: addu  a0, a0, v0
+L_107709c:
+// 0x0107709c: 0x107709c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	add
-	stloc.0
-// 0x010772d4: 0x10772d4: lw    v0, 0(a0)
 	ldloc 4
-	ldloc.0
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_10770a4:
+// 0x010770a4: 0x10770a4: lw    a0, 80(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 20
+	add
 	ldelem.i4
-	stloc.3
-// 0x010772d8: 0x10772d8: sll   zero, zero, 0
-// 0x010772dc: 0x10772dc: beq   v0, zero, 0x1077308 sll   zero, zero, 0
-	ldloc.3
-	brfalse L_1077308
+	stloc.1
+// 0x010770a8: 0x10770a8: sll   zero, zero, 0
+// 0x010770ac: 0x10770ac: beq   a0, zero, 0x10770bc sll   zero, zero, 0
+	ldloc.1
+	brfalse L_10770bc
 // --- basic block ---
-// 0x010772e4: 0x10772e4: lw    v1, 16(v0)
-	ldloc 4
+// 0x010770b4: 0x10770b4: jal   0x1000930 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_10770bc:
+// 0x010770bc: 0x10770bc: lw    a0, 92(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 23
 	add
 	ldelem.i4
-	stloc 5
-// 0x010772e8: 0x10772e8: sll   zero, zero, 0
-// 0x010772ec: 0x10772ec: sw    v1, 0(a1)
-	ldloc 4
+	stloc.1
+// 0x010770c0: 0x10770c0: sll   zero, zero, 0
+// 0x010770c4: 0x10770c4: beq   a0, zero, 0x10770d4 sll   zero, zero, 0
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldloc 5
-	stelem.i4
-// 0x010772f0: 0x10772f0: lw    v1, 20(v0)
-	ldloc 4
+	brfalse L_10770d4
+// --- basic block ---
+// 0x010770cc: 0x10770cc: jal   0x1000930 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_10770d4:
+// 0x010770d4: 0x10770d4: lw    a0, 96(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 24
 	add
 	ldelem.i4
-	stloc 5
-// 0x010772f4: 0x10772f4: sll   zero, zero, 0
-// 0x010772f8: 0x10772f8: sw    v1, 4(a1)
-	ldloc 4
+	stloc.1
+// 0x010770d8: 0x10770d8: sll   zero, zero, 0
+// 0x010770dc: 0x10770dc: beq   a0, zero, 0x10770ec sll   zero, zero, 0
+	ldloc.1
+	brfalse L_10770ec
+// --- basic block ---
+// 0x010770e4: 0x10770e4: jal   0x1000930 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_10770ec:
+// 0x010770ec: 0x10770ec: lw    a0, 100(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 25
 	add
-	ldloc 5
-	stelem.i4
-// 0x010772fc: 0x10772fc: lw    v0, 24(v0)
+	ldelem.i4
+	stloc.1
+// 0x010770f0: 0x10770f0: sll   zero, zero, 0
+// 0x010770f4: 0x10770f4: beq   a0, zero, 0x1077104 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1077104
+// --- basic block ---
+// 0x010770fc: 0x10770fc: jal   0x1000930 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_1077104:
+// 0x01077104: 0x1077104: jal   0x1076158 addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::onBonusDelete_1076158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107710c: 0x107710c: jal   0x1076f30 addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl89::RealtimeBonus_RemoveFromTable_1076f30(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01077114: 0x1077114: j	 0x1077120 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_1077120
+// --- basic block ---
+L_107711c:
+// 0x0107711c: 0x107711c: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_1077120:
+// 0x01077120: 0x1077120: lw    ra, 28(sp)
+// 0x01077124: 0x1077124: lw    s1, 24(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc.3
-// 0x01077300: 0x1077300: sll   zero, zero, 0
-// 0x01077304: 0x1077304: sw    v0, 0(a2)
-	ldloc 4
-	ldloc.2
+	stloc 8
+// 0x01077128: 0x1077128: lw    s0, 20(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldloc.3
-	stelem.i4
-L_1077308:
-// 0x01077308: 0x1077308: jr    ra sll   zero, zero, 0
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107712c: 0x107712c: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.3
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Get_Type_By_Id_107733c(int32,int32,int32,int32)
+.method public static int32 RealtimeBonus_Add_1077134(int32,int32,int32,int32,int32)
 {
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 v1,int32 s0,int32 s1,int32 s3,int32 ra,int32 t0,int32 t1)
 
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 13 is register t0
+// local 14 is register t1
+// local  9 is register s0
+// local 10 is register s1
+// local  7 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
 // local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 4
 	ldc.i4.s 0
 	stloc 5
-	ldarg 0
-	stloc 0
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107733c: 0x107733c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x01077340: 0x1077340: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+// 0x01077134: 0x1077134: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
 	add
-	stloc 4
-// 0x01077344: 0x1077344: addu  v1, v0, zero
-	ldloc 4
-	stloc 5
-// 0x01077348: 0x1077348: lw    a2, 2000(v0)
+	stloc.0
+// 0x01077138: 0x1077138: sw    s0, 36(sp)
 	ldloc 6
-	ldloc 4
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107734c: 0x107734c: j	 0x1077378 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_1077378
-// --- basic block ---
-L_1077354:
-// 0x01077354: 0x1077354: lw    a1, 0(v1)
+	ldloc 9
+	stelem.i4
+// 0x0107713c: 0x107713c: sw    ra, 52(sp)
+// 0x01077140: 0x1077140: sw    s3, 48(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01077358: 0x1077358: addiu v0, v0, 1
-	ldloc 4
-	ldc.i4.1
+	ldc.i4.s 12
 	add
-	stloc 4
-// 0x0107735c: 0x107735c: lw    a3, 0(a1)
+	ldloc 11
+	stelem.i4
+// 0x01077144: 0x1077144: sw    s2, 44(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x01077360: 0x1077360: sll   zero, zero, 0
-// 0x01077364: 0x1077364: bne   a3, a0, 0x1077378 addiu v1, v1, 4
-	ldloc.3
+	ldc.i4.s 11
+	add
+	ldloc 7
+	stelem.i4
+// 0x01077148: 0x1077148: sw    s1, 40(sp)
+	ldloc 6
 	ldloc.0
-	ldloc 5
-	ldc.i4.4
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
+	ldloc 10
+	stelem.i4
+// 0x0107714c: 0x107714c: jal   0x10a7518 addu  s0, a0, zero
+	ldloc.1
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a7518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01077154: 0x1077154: bne   v0, zero, 0x107716c lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
 	stloc 5
-	bne.un L_1077378
+	brtrue L_107716c
 // --- basic block ---
-// 0x0107736c: 0x107736c: lw    v0, 4(a1)
+// 0x0107715c: 0x107715c: lw    v0, 84(s0)
 	ldloc 6
-	ldloc.1
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 4
-// 0x01077370: 0x1077370: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077378:
-// 0x01077378: 0x1077378: slt   a1, v0, a2
-	ldloc 4
-	ldloc.2
-	clt
-	stloc.1
-// 0x0107737c: 0x107737c: bne   a1, zero, 0x1077354 sll   zero, zero, 0
-	ldloc.1
-	brtrue L_1077354
+	stloc 5
+// 0x01077160: 0x1077160: sll   zero, zero, 0
+// 0x01077164: 0x1077164: beq   v0, zero, 0x10774d4 lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brfalse L_10774d4
 // --- basic block ---
-// 0x01077384: 0x1077384: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
-__CIBYL_function_return:
+L_107716c:
+// 0x0107716c: 0x107716c: lw    v1, -15788(v0)
+	ldloc 6
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_GroupName_By_Id_107738c(int32,int32,int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3947
+	add
+	ldelem.i4
+	stloc 8
+// 0x01077170: 0x1077170: addiu v0, zero, 250
+	ldc.i4 250
 	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+// 0x01077174: 0x1077174: bne   v1, v0, 0x107719c lui   a1, 0x20000
+	ldloc 8
+	ldloc 5
+	ldc.i4 131072
+	stloc.2
+	bne.un L_107719c
 // --- basic block ---
-// 0x0107738c: 0x107738c: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x0107717c: 0x107717c: lui   a3, 0x20000
+	ldc.i4 131072
 	stloc 4
-// 0x01077390: 0x1077390: addiu v0, v0, -16028
+// 0x01077180: 0x1077180: addiu a1, a1, -28380
+	ldloc.2
+	ldc.i4 -28380
+	add
+	stloc.2
+// 0x01077184: 0x1077184: addiu a3, a3, -27116
 	ldloc 4
-	ldc.i4 -16028
+	ldc.i4 -27116
 	add
 	stloc 4
-// 0x01077394: 0x1077394: addu  a1, v0, zero
-	ldloc 4
+// 0x01077188: 0x1077188: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-// 0x01077398: 0x1077398: lw    a2, 2000(v0)
-	ldloc 6
+// 0x0107718c: 0x107718c: jal   0x100449c addiu a2, zero, 496
+	ldc.i4 496
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc.2
-// 0x0107739c: 0x107739c: j	 0x10773c4 addu  v1, zero, zero
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01077194: 0x1077194: j	 0x10774d8 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10773c4
+	br L_10774d8
 // --- basic block ---
-L_10773a4:
-// 0x010773a4: 0x10773a4: lw    v0, 0(a1)
+L_107719c:
+// 0x0107719c: 0x107719c: lw    v0, 84(s0)
 	ldloc 6
-	ldloc.1
+	ldloc 9
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 21
+	add
 	ldelem.i4
-	stloc 4
-// 0x010773a8: 0x10773a8: sll   zero, zero, 0
-// 0x010773ac: 0x10773ac: lw    a3, 0(v0)
+	stloc 5
+// 0x010771a0: 0x10771a0: sll   zero, zero, 0
+// 0x010771a4: 0x10771a4: beq   v0, zero, 0x10771e8 lui   s2, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 7
+	brfalse L_10771e8
+// --- basic block ---
+// 0x010771ac: 0x10771ac: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x010771b0: 0x10771b0: lw    v1, 15740(v0)
 	ldloc 6
-	ldloc 4
+	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4 3935
+	add
 	ldelem.i4
-	stloc.3
-// 0x010773b0: 0x10773b0: sll   zero, zero, 0
-// 0x010773b4: 0x10773b4: bne   a3, a0, 0x10773c4 addiu a1, a1, 4
-	ldloc.3
-	ldloc.0
+	stloc 8
+// 0x010771b4: 0x10771b4: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x010771b8: 0x10771b8: bne   v1, v0, 0x10774d8 addiu v0, zero, 1
+	ldloc 8
+	ldloc 5
+	ldc.i4.1
+	stloc 5
+	bne.un L_10774d8
+// --- basic block ---
+// 0x010771c0: 0x10771c0: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x010771c4: 0x10771c4: jal   0x100e358 addiu a0, a0, 15724
 	ldloc.1
-	ldc.i4.4
+	ldc.i4 15724
 	add
 	stloc.1
-	bne.un L_10773c4
-// --- basic block ---
-// 0x010773bc: 0x10773bc: jr    ra addiu v0, v0, 1624
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4 1624
-	add
-	stloc 4
-	br __CIBYL_function_return
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_10773c4:
-// 0x010773c4: 0x10773c4: slt   v0, v1, a2
+// 0x010771cc: 0x10771cc: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x010771d0: 0x10771d0: addu  a0, v0, zero
 	ldloc 5
+	stloc.1
+// 0x010771d4: 0x10771d4: jal   0x1001b14 addiu a1, a1, 20820
 	ldloc.2
-	clt
-	stloc 4
-// 0x010773c8: 0x10773c8: bne   v0, zero, 0x10773a4 addiu v1, v1, 1
-	ldloc 4
-	ldloc 5
-	ldc.i4.1
+	ldc.i4 20820
 	add
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
-	brtrue L_10773a4
 // --- basic block ---
-// 0x010773d0: 0x10773d0: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x010771dc: 0x10771dc: bne   v0, zero, 0x10774f4 addu  a1, zero, zero
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_Id_10773d8(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  1 is register v0
-// local  2 is register v1
-// local  0 is register a0
-// local  4 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
-	stloc.1
 	ldc.i4.s 0
 	stloc.2
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 4
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
+	brtrue L_10774f4
 // --- basic block ---
-L_10773d8:
-// 0x010773d8: 0x10773d8: lui   v0, 0x80000
+// 0x010771e4: 0x10771e4: lui   s2, 0x80000
 	ldc.i4 524288
-	stloc.1
-// 0x010773dc: 0x10773dc: addiu v0, v0, -16028
-	ldloc.1
-	ldc.i4 -16028
+	stloc 7
+L_10771e8:
+// 0x010771e8: 0x10771e8: addiu s2, s2, -16788
+	ldloc 7
+	ldc.i4 -16788
 	add
-	stloc.1
-// 0x010773e0: 0x10773e0: sll   a0, a0, 2
-	ldloc.0
+	stloc 7
+// 0x010771ec: 0x10771ec: lw    a0, 0(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
-	shl
-	stloc.0
-// 0x010773e4: 0x10773e4: addu  a0, a0, v0
-	ldloc.0
-	ldloc.1
-	add
-	stloc.0
-// 0x010773e8: 0x10773e8: lw    v1, 0(a0)
-	ldloc 3
-	ldloc.0
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x010771f0: 0x10771f0: addu  v1, s2, zero
+	ldloc 7
+	stloc 8
+// 0x010771f4: 0x10771f4: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+// 0x010771f8: 0x10771f8: addiu a2, zero, 250
+	ldc.i4 250
+	stloc.3
+L_10771fc:
+// 0x010771fc: 0x10771fc: lw    a1, 0(v1)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010773ec: 0x10773ec: sll   zero, zero, 0
-// 0x010773f0: 0x10773f0: beq   v1, zero, 0x10773fc addiu v0, zero, -1
+// 0x01077200: 0x1077200: sll   zero, zero, 0
+// 0x01077204: 0x1077204: beq   a1, zero, 0x107723c addiu v1, v1, 4
 	ldloc.2
-	ldc.i4.m1
-	stloc.1
-	brfalse L_10773fc
+	ldloc 8
+	ldc.i4.4
+	add
+	stloc 8
+	brfalse L_107723c
 // --- basic block ---
-// 0x010773f8: 0x10773f8: lw    v0, 0(v1)
-	ldloc 3
+// 0x0107720c: 0x107720c: lw    a1, 0(a1)
+	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.1
-L_10773fc:
-// 0x010773fc: 0x10773fc: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	stloc.2
+// 0x01077210: 0x1077210: sll   zero, zero, 0
+// 0x01077214: 0x1077214: bne   a1, a0, 0x1077240 addiu v0, v0, 1
 	ldloc.2
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc.1
-	ret
-}
-.method public static int32 RTAlerts_Get_LocationStrByID_1077430(int32,int32,int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
+	ldloc 5
+	ldc.i4.1
+	add
 	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	bne.un L_1077240
 // --- basic block ---
-// 0x01077430: 0x1077430: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x01077434: 0x1077434: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+// 0x0107721c: 0x107721c: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
 	add
-	stloc 4
-// 0x01077438: 0x1077438: addu  a1, v0, zero
-	ldloc 4
-	stloc.1
-// 0x0107743c: 0x107743c: lw    a2, 2000(v0)
-	ldloc 6
+	stloc 5
+// 0x01077220: 0x1077220: slti  v0, v0, 250
+	ldloc 5
+	ldc.i4 250
+	clt
+	stloc 5
+// 0x01077224: 0x1077224: beq   v0, zero, 0x1077248 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1077248
+// --- basic block ---
+// 0x0107722c: 0x107722c: jal   0x107701c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc.2
-// 0x01077440: 0x1077440: j	 0x1077468 addu  v1, zero, zero
+	call int32 Cibyl89::RealtimeBonus_Delete_107701c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01077234: 0x1077234: j	 0x107724c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1077468
+	br L_107724c
 // --- basic block ---
-L_1077448:
-// 0x01077448: 0x1077448: lw    v0, 0(a1)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107744c: 0x107744c: addiu v1, v1, 1
+L_107723c:
+// 0x0107723c: 0x107723c: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01077450: 0x1077450: lw    a3, 0(v0)
+L_1077240:
+// 0x01077240: 0x1077240: bne   v0, a2, 0x10771fc sll   zero, zero, 0
+	ldloc 5
+	ldloc.3
+	bne.un L_10771fc
+// --- basic block ---
+L_1077248:
+// 0x01077248: 0x1077248: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_107724c:
+// 0x0107724c: 0x107724c: addiu v1, zero, 250
+	ldc.i4 250
+	stloc 8
+L_1077250:
+// 0x01077250: 0x1077250: lw    a0, 0(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.3
-// 0x01077454: 0x1077454: sll   zero, zero, 0
-// 0x01077458: 0x1077458: bne   a3, a0, 0x1077468 addiu a1, a1, 4
-	ldloc.3
-	ldloc.0
+	stloc.1
+// 0x01077254: 0x1077254: sll   zero, zero, 0
+// 0x01077258: 0x1077258: bne   a0, zero, 0x1077268 addiu s2, s2, 4
 	ldloc.1
+	ldloc 7
 	ldc.i4.4
 	add
-	stloc.1
-	bne.un L_1077468
+	stloc 7
+	brtrue L_1077268
 // --- basic block ---
-// 0x01077460: 0x1077460: jr    ra addiu v0, v0, 557
-	ldloc 4
-	ldc.i4 557
-	add
-	stloc 4
-	br __CIBYL_function_return
+// 0x01077260: 0x1077260: j	 0x1077274 addu  s1, v0, zero
+	ldloc 5
+	stloc 10
+	br L_1077274
 // --- basic block ---
-L_1077468:
-// 0x01077468: 0x1077468: slt   v0, v1, a2
+L_1077268:
+// 0x01077268: 0x1077268: addiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+// 0x0107726c: 0x107726c: bne   v0, v1, 0x1077250 sll   zero, zero, 0
 	ldloc 5
+	ldloc 8
+	bne.un L_1077250
+// --- basic block ---
+L_1077274:
+// 0x01077274: 0x1077274: jal   0x1000910 addiu a0, zero, 104
+	ldc.i4.s 104
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	clt
-	stloc 4
-// 0x0107746c: 0x107746c: bne   v0, zero, 0x1077448 lui   v0, 0x10000
+	ldloc.3
 	ldloc 4
-	ldc.i4 65536
-	stloc 4
-	brtrue L_1077448
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01077474: 0x1077474: jr    ra addiu v0, v0, 18500
-	ldloc 4
-	ldc.i4 18500
-	add
-	stloc 4
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x0107727c: 0x107727c: addu  a0, v0, zero
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_Speed_107747c(int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  1 is register v0
-// local  2 is register v1
-// local  0 is register a0
-// local  4 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
 	stloc.1
+// 0x01077280: 0x1077280: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 4
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x01077284: 0x1077284: addiu a2, zero, 104
+	ldc.i4.s 104
 	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107747c:
-// 0x0107747c: 0x107747c: lui   v0, 0x80000
+// 0x01077288: 0x1077288: lui   s3, 0x80000
 	ldc.i4 524288
-	stloc.1
-// 0x01077480: 0x1077480: addiu v0, v0, -16028
+	stloc 11
+// 0x0107728c: 0x107728c: addu  s2, v0, zero
+	ldloc 5
+	stloc 7
+// 0x01077290: 0x1077290: jal   0x100177c addiu s3, s3, -16788
+	ldloc 11
+	ldc.i4 -16788
+	add
+	stloc 11
 	ldloc.1
-	ldc.i4 -16028
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01077298: 0x1077298: sll   v0, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x0107729c: 0x107729c: addu  s3, v0, s3
+	ldloc 5
+	ldloc 11
 	add
+	stloc 11
+// 0x010772a0: 0x10772a0: addu  a0, s2, zero
+	ldloc 7
 	stloc.1
-// 0x01077484: 0x1077484: sll   a0, a0, 2
-	ldloc.0
+// 0x010772a4: 0x10772a4: jal   0x1075d0c sw    s2, 0(s3)
+	ldloc 6
+	ldloc 11
 	ldc.i4.2
-	shl
-	stloc.0
-// 0x01077488: 0x1077488: addu  a0, a0, v0
-	ldloc.0
+	shr.un
+	ldloc 7
+	stelem.i4
 	ldloc.1
+	call int32 Cibyl88::RealtimeBonus_Record_Init_1075d0c(int32)
+	stloc 5
+// --- basic block ---
+// 0x010772ac: 0x10772ac: lw    s2, 0(s3)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x010772b0: 0x10772b0: lw    t1, 0(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 14
+// 0x010772b4: 0x10772b4: lw    t0, 4(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc.0
-// 0x0107748c: 0x107748c: lw    v1, 0(a0)
-	ldloc 3
-	ldloc.0
+	ldelem.i4
+	stloc 13
+// 0x010772b8: 0x10772b8: lw    a3, 16(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
+	ldc.i4.4
+	add
 	ldelem.i4
-	stloc.2
-// 0x01077490: 0x1077490: sll   zero, zero, 0
-// 0x01077494: 0x1077494: beq   v1, zero, 0x10774a0 addiu v0, zero, -1
-	ldloc.2
-	ldc.i4.m1
-	stloc.1
-	brfalse L_10774a0
-// --- basic block ---
-// 0x0107749c: 0x107749c: lw    v0, 28(v1)
-	ldloc 3
-	ldloc.2
+	stloc 4
+// 0x010772bc: 0x10772bc: lw    a2, 8(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.2
 	add
 	ldelem.i4
-	stloc.1
-L_10774a0:
-// 0x010774a0: 0x10774a0: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.2
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.1
-	ret
-}
-.method public static int32 RTAlerts_Get_IconByType_10774a8(int32,int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 a1,int32 v0,int32 ra,int32[] mem)
-
-// local  2 is register v0
-// local  0 is register a0
-// local  1 is register a1
-// local  3 is register ra
-// local  4 is register mem
-
-	ldc.i4.s 0
-	stloc.2
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldc.i4.s 0
 	stloc.3
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 4
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010774a8: 0x10774a8: sltiu v0, a1, 10
-	ldloc.1
-	ldc.i4.s 10
-	clt.un
-	stloc.2
-// 0x010774ac: 0x10774ac: beq   v0, zero, 0x1077558 lui   v0, 0x20000
-	ldloc.2
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1077558
-// --- basic block ---
-// 0x010774b4: 0x10774b4: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010774b8: 0x10774b8: addiu v0, v0, 28788
-	ldloc.2
-	ldc.i4 28788
-	add
-	stloc.2
-// 0x010774bc: 0x10774bc: sll   a1, a1, 2
-	ldloc.1
-	ldc.i4.2
-	shl
-	stloc.1
-// 0x010774c0: 0x10774c0: addu  a1, v0, a1
-	ldloc.2
-	ldloc.1
-	add
-	stloc.1
-// 0x010774c4: 0x10774c4: lw    v0, 0(a1)
-	ldloc 4
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-// 0x010774c8: 0x10774c8: sll   zero, zero, 0
-// 0x010774cc: 0x10774cc: jr    v0 sll   zero, zero, 0
-	ldloc.2
-	br __CIBYL_local_jumptab
-// --- basic block ---
-L_10774d4:
-// 0x010774d4: 0x10774d4: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010774d8: 0x10774d8: jr    ra addiu v0, v0, -27412
-	ldloc.2
-	ldc.i4 -27412
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_10774e0:
-// 0x010774e0: 0x10774e0: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010774e4: 0x10774e4: jr    ra addiu v0, v0, -27392
-	ldloc.2
-	ldc.i4 -27392
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_10774ec:
-// 0x010774ec: 0x10774ec: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010774f0: 0x10774f0: jr    ra addiu v0, v0, -27348
-	ldloc.2
-	ldc.i4 -27348
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_10774f8:
-// 0x010774f8: 0x10774f8: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010774fc: 0x10774fc: jr    ra addiu v0, v0, -27324
-	ldloc.2
-	ldc.i4 -27324
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077504:
-// 0x01077504: 0x1077504: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01077508: 0x1077508: jr    ra addiu v0, v0, -27300
-	ldloc.2
-	ldc.i4 -27300
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077510:
-// 0x01077510: 0x1077510: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01077514: 0x1077514: jr    ra addiu v0, v0, -27280
-	ldloc.2
-	ldc.i4 -27280
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_107751c:
-// 0x0107751c: 0x107751c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01077520: 0x1077520: jr    ra addiu v0, v0, -27260
-	ldloc.2
-	ldc.i4 -27260
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077528:
-// 0x01077528: 0x1077528: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107752c: 0x107752c: jr    ra addiu v0, v0, -27228
-	ldloc.2
-	ldc.i4 -27228
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077534:
-// 0x01077534: 0x1077534: beq   a0, zero, 0x1077560 lui   v0, 0x20000
-	ldloc.0
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1077560
-// --- basic block ---
-// 0x0107753c: 0x107753c: lw    v0, 1504(a0)
-	ldloc 4
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 376
-	add
-	ldelem.i4
-	stloc.2
-// 0x01077540: 0x1077540: sll   zero, zero, 0
-// 0x01077544: 0x1077544: bne   v0, zero, 0x1077564 sll   zero, zero, 0
-	ldloc.2
-	brtrue L_1077564
-// --- basic block ---
-// 0x0107754c: 0x107754c: j	 0x1077560 lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-	br L_1077560
-// --- basic block ---
-L_1077554:
-// 0x01077554: 0x1077554: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.2
-L_1077558:
-// 0x01077558: 0x1077558: jr    ra addiu v0, v0, -27372
-	ldloc.2
-	ldc.i4 -27372
-	add
-	stloc.2
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077560:
-// 0x01077560: 0x1077560: addiu v0, v0, -27372
-	ldloc.2
-	ldc.i4 -27372
-	add
-	stloc.2
-L_1077564:
-// 0x01077564: 0x1077564: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-	br __CIBYL_function_return
-__CIBYL_local_jumptab:
-	stloc.2
-	ldloc.2
-	ldc.i4 17265876
-	beq  L_10774d4
-	ldloc.2
-	ldc.i4 17265888
-	beq  L_10774e0
-	ldloc.2
-	ldc.i4 17265900
-	beq  L_10774ec
-	ldloc.2
-	ldc.i4 17265912
-	beq  L_10774f8
-	ldloc.2
-	ldc.i4 17265924
-	beq  L_1077504
-	ldloc.2
-	ldc.i4 17265936
-	beq  L_1077510
-	ldloc.2
-	ldc.i4 17265948
-	beq  L_107751c
-	ldloc.2
-	ldc.i4 17265960
-	beq  L_1077528
-	ldloc.2
-	ldc.i4 17265972
-	beq  L_1077534
-	ldloc.2
-	ldc.i4 17266004
-	beq  L_1077554
-		br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.2
-	ret
-}
-.method public static int32 RTAlerts_Get_Icon_107756c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107756c: 0x107756c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01077570: 0x1077570: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x01077574: 0x1077574: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01077578: 0x1077578: sw    ra, 20(sp)
-// 0x0107757c: 0x107757c: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x01077580: 0x1077580: lw    a2, 2000(v0)
+// 0x010772c0: 0x10772c0: lw    a1, 12(s0)
 	ldloc 6
-	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc.3
-// 0x01077584: 0x1077584: j	 0x10775c0 addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-	br L_10775c0
-// --- basic block ---
-L_107758c:
-// 0x0107758c: 0x107758c: lw    v0, 0(a1)
+	stloc.2
+// 0x010772c4: 0x10772c4: lw    v1, 24(s0)
 	ldloc 6
-	ldloc.2
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 5
-// 0x01077590: 0x1077590: addiu v1, v1, 1
-	ldloc 7
-	ldc.i4.1
+	ldc.i4.6
 	add
-	stloc 7
-// 0x01077594: 0x1077594: lw    a3, 0(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
 	ldelem.i4
-	stloc 4
-// 0x01077598: 0x1077598: sll   zero, zero, 0
-// 0x0107759c: 0x107759c: bne   a3, a0, 0x10775c0 addiu a1, a1, 4
-	ldloc 4
-	ldloc.1
-	ldloc.2
-	ldc.i4.4
-	add
-	stloc.2
-	bne.un L_10775c0
-// --- basic block ---
-// 0x010775a4: 0x10775a4: lw    a2, 1276(v0)
+	stloc 8
+// 0x010772c8: 0x10772c8: lw    v0, 20(s0)
 	ldloc 6
-	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc.3
-// 0x010775a8: 0x10775a8: lw    a1, 4(v0)
+	stloc 5
+// 0x010772cc: 0x10772cc: lw    a0, 28(s0)
 	ldloc 6
-	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc.2
-// 0x010775ac: 0x10775ac: addu  a0, v0, zero
-	ldloc 5
 	stloc.1
-// 0x010775b0: 0x10775b0: jal   0x10774a8 sltu  a2, zero, a2
-	ldc.i4.s 0
-	ldloc.3
-	clt.un
-	stloc.3
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl89::RTAlerts_Get_IconByType_10774a8(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x010775b8: 0x10775b8: j	 0x10775cc sll   zero, zero, 0
-	br L_10775cc
-// --- basic block ---
-L_10775c0:
-// 0x010775c0: 0x10775c0: slt   v0, v1, a2
-	ldloc 7
-	ldloc.3
-	clt
-	stloc 5
-// 0x010775c4: 0x10775c4: bne   v0, zero, 0x107758c addu  v0, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 5
-	brtrue L_107758c
-// --- basic block ---
-L_10775cc:
-// 0x010775cc: 0x10775cc: lw    ra, 20(sp)
-// 0x010775d0: 0x10775d0: sll   zero, zero, 0
-// 0x010775d4: 0x10775d4: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_Get_Map_AddOn_10775dc(int32,int32,int32,int32)
-{
-.maxstack 7
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  8 is register t0
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010775dc: 0x10775dc: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x010775e0: 0x10775e0: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
-	add
-	stloc 4
-// 0x010775e4: 0x10775e4: addu  a2, v0, zero
-	ldloc 4
-	stloc.2
-// 0x010775e8: 0x10775e8: lw    a3, 2000(v0)
+// 0x010772d0: 0x10772d0: sw    t1, 0(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc.3
-// 0x010775ec: 0x10775ec: j	 0x1077624 addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1077624
-// --- basic block ---
-L_10775f4:
-// 0x010775f4: 0x10775f4: lw    v0, 0(a2)
+	ldloc 14
+	stelem.i4
+// 0x010772d4: 0x10772d4: sw    t0, 4(s2)
 	ldloc 6
-	ldloc.2
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x010775f8: 0x10775f8: addiu v1, v1, 1
-	ldloc 5
 	ldc.i4.1
 	add
-	stloc 5
-// 0x010775fc: 0x10775fc: lw    t0, 0(v0)
+	ldloc 13
+	stelem.i4
+// 0x010772d8: 0x10772d8: sw    a3, 16(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 8
-// 0x01077600: 0x1077600: sll   zero, zero, 0
-// 0x01077604: 0x1077604: bne   t0, a0, 0x1077624 addiu a2, a2, 4
-	ldloc 8
-	ldloc.0
-	ldloc.2
 	ldc.i4.4
 	add
-	stloc.2
-	bne.un L_1077624
-// --- basic block ---
-// 0x0107760c: 0x107760c: lw    a0, 4(v0)
-	ldloc 6
 	ldloc 4
+	stelem.i4
+// 0x010772dc: 0x10772dc: sw    a2, 8(s2)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.2
 	add
-	ldelem.i4
-	stloc.0
-// 0x01077610: 0x1077610: addiu v1, zero, 4
-	ldc.i4.4
-	stloc 5
-// 0x01077614: 0x1077614: bne   a0, v1, 0x1077638 sll   zero, zero, 0
-	ldloc.0
-	ldloc 5
-	bne.un L_1077638
-// --- basic block ---
-// 0x0107761c: 0x107761c: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077624:
-// 0x01077624: 0x1077624: slt   v0, v1, a3
-	ldloc 5
 	ldloc.3
-	clt
-	stloc 4
-// 0x01077628: 0x1077628: bne   v0, zero, 0x10775f4 addu  v0, zero, zero
-	ldloc 4
-	ldc.i4.s 0
-	stloc 4
-	brtrue L_10775f4
-// --- basic block ---
-// 0x01077630: 0x1077630: j	 0x1077698 sll   zero, zero, 0
-	br L_1077698
-// --- basic block ---
-L_1077638:
-// 0x01077638: 0x1077638: bne   a1, zero, 0x107765c addiu v1, zero, 1
-	ldloc.1
-	ldc.i4.1
-	stloc 5
-	brtrue L_107765c
-// --- basic block ---
-// 0x01077640: 0x1077640: lw    v1, 1276(v0)
+	stelem.i4
+// 0x010772e0: 0x10772e0: sw    a1, 12(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
-	add
-	ldelem.i4
-	stloc 5
-// 0x01077644: 0x1077644: sll   zero, zero, 0
-// 0x01077648: 0x1077648: beq   v1, zero, 0x1077664 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1077664
-// --- basic block ---
-// 0x01077650: 0x1077650: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01077654: 0x1077654: jr    ra addiu v0, v0, -27208
-	ldloc 4
-	ldc.i4 -27208
+	ldc.i4.3
 	add
-	stloc 4
-	br __CIBYL_function_return
-// --- basic block ---
-L_107765c:
-// 0x0107765c: 0x107765c: bne   a1, v1, 0x1077680 addiu v1, zero, 2
-	ldloc.1
-	ldloc 5
+	ldloc.2
+	stelem.i4
+// 0x010772e4: 0x10772e4: sw    v1, 24(s2)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
-	stloc 5
-	bne.un L_1077680
-// --- basic block ---
-L_1077664:
-// 0x01077664: 0x1077664: lb    v1, 708(v0)
-	ldloc 4
-	ldc.i4 708
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x01077668: 0x1077668: sll   zero, zero, 0
-// 0x0107766c: 0x107766c: beq   v1, zero, 0x1077688 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1077688
-// --- basic block ---
-// 0x01077674: 0x1077674: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01077678: 0x1077678: jr    ra addiu v0, v0, -27184
-	ldloc 4
-	ldc.i4 -27184
+	shr.un
+	ldc.i4.6
 	add
-	stloc 4
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077680:
-// 0x01077680: 0x1077680: bne   a1, v1, 0x1077694 sll   zero, zero, 0
-	ldloc.1
-	ldloc 5
-	bne.un L_1077694
-// --- basic block ---
-L_1077688:
-// 0x01077688: 0x1077688: lw    v0, 1500(v0)
+	ldloc 8
+	stelem.i4
+// 0x010772e8: 0x10772e8: jal   0x1001ba8 sw    v0, 20(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 375
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 4
-// 0x0107768c: 0x107768c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077694:
-// 0x01077694: 0x1077694: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-L_1077698:
-// 0x01077698: 0x1077698: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_Number_Of_Map_AddOns_10776a0(int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010776a0: 0x10776a0: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x010776a4: 0x10776a4: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
-	add
-	stloc 4
-// 0x010776a8: 0x10776a8: addu  a1, v0, zero
-	ldloc 4
-	stloc.1
-// 0x010776ac: 0x10776ac: lw    a2, 2000(v0)
+// 0x010772f0: 0x10772f0: lw    a0, 80(s0)
 	ldloc 6
-	ldloc 4
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.s 20
 	add
 	ldelem.i4
-	stloc.2
-// 0x010776b0: 0x10776b0: j	 0x10776e8 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_10776e8
-// --- basic block ---
-L_10776b8:
-// 0x010776b8: 0x10776b8: lw    v1, 0(a1)
-	ldloc 6
+	stloc.1
+// 0x010772f4: 0x10772f4: sll   zero, zero, 0
+// 0x010772f8: 0x10772f8: beq   a0, zero, 0x1077310 sw    v0, 28(s2)
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x010776bc: 0x10776bc: addiu v0, v0, 1
-	ldloc 4
-	ldc.i4.1
-	add
-	stloc 4
-// 0x010776c0: 0x10776c0: lw    a3, 0(v1)
 	ldloc 6
-	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x010776c4: 0x10776c4: sll   zero, zero, 0
-// 0x010776c8: 0x10776c8: bne   a3, a0, 0x10776e8 addiu a1, a1, 4
-	ldloc.3
-	ldloc.0
-	ldloc.1
-	ldc.i4.4
+	ldc.i4.7
 	add
-	stloc.1
-	bne.un L_10776e8
+	ldloc 5
+	stelem.i4
+	brfalse L_1077310
 // --- basic block ---
-// 0x010776d0: 0x10776d0: lw    a0, 4(v1)
+// 0x01077300: 0x1077300: lw    s2, 0(s3)
 	ldloc 6
-	ldloc 5
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
-	add
 	ldelem.i4
-	stloc.0
-// 0x010776d4: 0x10776d4: addiu v0, zero, 4
-	ldc.i4.4
-	stloc 4
-// 0x010776d8: 0x10776d8: bne   a0, v0, 0x10776fc sll   zero, zero, 0
+	stloc 7
+// 0x01077304: 0x1077304: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
-	ldloc 4
-	bne.un L_10776fc
-// --- basic block ---
-// 0x010776e0: 0x10776e0: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
-// --- basic block ---
-L_10776e8:
-// 0x010776e8: 0x10776e8: slt   v1, v0, a2
-	ldloc 4
+	ldloc.1
 	ldloc.2
-	clt
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x010776ec: 0x10776ec: bne   v1, zero, 0x10776b8 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_10776b8
-// --- basic block ---
-// 0x010776f4: 0x10776f4: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
 // --- basic block ---
-L_10776fc:
-// 0x010776fc: 0x10776fc: lw    v0, 1276(v1)
+// 0x0107730c: 0x107730c: sw    v0, 80(s2)
 	ldloc 6
-	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4.s 20
 	add
-	ldelem.i4
-	stloc 4
-// 0x01077700: 0x1077700: lb    a0, 708(v1)
 	ldloc 5
-	ldc.i4 708
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc.0
-// 0x01077704: 0x1077704: lw    v1, 1500(v1)
+	stelem.i4
+L_1077310:
+// 0x01077310: 0x1077310: lw    a0, 92(s0)
 	ldloc 6
-	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 375
+	ldc.i4.s 23
 	add
 	ldelem.i4
+	stloc.1
+// 0x01077314: 0x1077314: sll   zero, zero, 0
+// 0x01077318: 0x1077318: beq   a0, zero, 0x107733c lui   v0, 0x80000
+	ldloc.1
+	ldc.i4 524288
 	stloc 5
-// 0x01077708: 0x1077708: sltu  v0, zero, v0
-	ldc.i4.s 0
-	ldloc 4
-	clt.un
-	stloc 4
-// 0x0107770c: 0x107770c: sltu  a0, zero, a0
-	ldc.i4.s 0
-	ldloc.0
-	clt.un
-	stloc.0
-// 0x01077710: 0x1077710: addu  v0, v0, a0
-	ldloc 4
-	ldloc.0
-	add
-	stloc 4
-// 0x01077714: 0x1077714: sltu  v1, zero, v1
-	ldc.i4.s 0
+	brfalse L_107733c
+// --- basic block ---
+// 0x01077320: 0x1077320: sll   v1, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 8
+// 0x01077324: 0x1077324: addiu v0, v0, -16788
 	ldloc 5
-	clt.un
+	ldc.i4 -16788
+	add
 	stloc 5
-// 0x01077718: 0x1077718: addu  v0, v0, v1
-	ldloc 4
+// 0x01077328: 0x1077328: addu  v0, v1, v0
+	ldloc 8
 	ldloc 5
 	add
-	stloc 4
-// 0x0107771c: 0x107771c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_Number_Of_AddOns_1077724(int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
 	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
+// 0x0107732c: 0x107732c: lw    s2, 0(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01077724: 0x1077724: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x01077728: 0x1077728: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
-	add
-	stloc 4
-// 0x0107772c: 0x107772c: addu  a1, v0, zero
+// 0x01077330: 0x1077330: jal   0x1001ba8 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	stloc.1
-// 0x01077730: 0x1077730: lw    a2, 2000(v0)
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01077338: 0x1077338: sw    v0, 92(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.s 23
 	add
-	ldelem.i4
-	stloc.2
-// 0x01077734: 0x1077734: j	 0x107776c addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_107776c
-// --- basic block ---
-L_107773c:
-// 0x0107773c: 0x107773c: lw    v1, 0(a1)
+	ldloc 5
+	stelem.i4
+L_107733c:
+// 0x0107733c: 0x107733c: lw    a0, 96(s0)
 	ldloc 6
-	ldloc.1
+	ldloc 9
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 24
+	add
 	ldelem.i4
+	stloc.1
+// 0x01077340: 0x1077340: sll   zero, zero, 0
+// 0x01077344: 0x1077344: beq   a0, zero, 0x1077368 lui   v0, 0x80000
+	ldloc.1
+	ldc.i4 524288
 	stloc 5
-// 0x01077740: 0x1077740: addiu v0, v0, 1
-	ldloc 4
-	ldc.i4.1
+	brfalse L_1077368
+// --- basic block ---
+// 0x0107734c: 0x107734c: sll   v1, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 8
+// 0x01077350: 0x1077350: addiu v0, v0, -16788
+	ldloc 5
+	ldc.i4 -16788
 	add
-	stloc 4
-// 0x01077744: 0x1077744: lw    a3, 0(v1)
+	stloc 5
+// 0x01077354: 0x1077354: addu  v0, v1, v0
+	ldloc 8
+	ldloc 5
+	add
+	stloc 5
+// 0x01077358: 0x1077358: lw    s2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.3
-// 0x01077748: 0x1077748: sll   zero, zero, 0
-// 0x0107774c: 0x107774c: bne   a3, a0, 0x107776c addiu a1, a1, 4
-	ldloc.3
+	stloc 7
+// 0x0107735c: 0x107735c: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	ldc.i4.4
-	add
-	stloc.1
-	bne.un L_107776c
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01077754: 0x1077754: lw    a0, 4(v1)
+// 0x01077364: 0x1077364: sw    v0, 96(s2)
 	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 24
+	add
 	ldloc 5
+	stelem.i4
+L_1077368:
+// 0x01077368: 0x1077368: lw    a0, 100(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 25
 	add
 	ldelem.i4
-	stloc.0
-// 0x01077758: 0x1077758: addiu a1, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0107775c: 0x107775c: bne   a0, a1, 0x1077780 addiu v0, zero, 1
-	ldloc.0
+// 0x0107736c: 0x107736c: sll   zero, zero, 0
+// 0x01077370: 0x1077370: beq   a0, zero, 0x1077394 lui   v0, 0x80000
 	ldloc.1
-	ldc.i4.1
-	stloc 4
-	bne.un L_1077780
-// --- basic block ---
-// 0x01077764: 0x1077764: j	 0x10777b0 sll   zero, zero, 0
-	br L_10777b0
-// --- basic block ---
-L_107776c:
-// 0x0107776c: 0x107776c: slt   v1, v0, a2
-	ldloc 4
-	ldloc.2
-	clt
+	ldc.i4 524288
 	stloc 5
-// 0x01077770: 0x1077770: bne   v1, zero, 0x107773c sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107773c
-// --- basic block ---
-// 0x01077778: 0x1077778: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
+	brfalse L_1077394
 // --- basic block ---
-L_1077780:
-// 0x01077780: 0x1077780: addiu a1, zero, 3
-	ldc.i4.3
-	stloc.1
-// 0x01077784: 0x1077784: bne   a0, a1, 0x1077798 addu  v0, zero, zero
-	ldloc.0
-	ldloc.1
-	ldc.i4.s 0
-	stloc 4
-	bne.un L_1077798
-// --- basic block ---
-// 0x0107778c: 0x107778c: lb    v0, 1304(v1)
+// 0x01077378: 0x1077378: sll   v1, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 8
+// 0x0107737c: 0x107737c: addiu v0, v0, -16788
 	ldloc 5
-	ldc.i4 1304
+	ldc.i4 -16788
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 4
-// 0x01077790: 0x1077790: sll   zero, zero, 0
-// 0x01077794: 0x1077794: sltiu v0, v0, 1
-	ldloc 4
-	ldc.i4.1
-	clt.un
-	stloc 4
-L_1077798:
-// 0x01077798: 0x1077798: lw    a0, 1276(v1)
+	stloc 5
+// 0x01077380: 0x1077380: addu  v0, v1, v0
+	ldloc 8
+	ldloc 5
+	add
+	stloc 5
+// 0x01077384: 0x1077384: lw    s2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
-	add
 	ldelem.i4
-	stloc.0
-// 0x0107779c: 0x107779c: lb    v1, 1304(v1)
-	ldloc 5
-	ldc.i4 1304
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x010777a0: 0x10777a0: sltu  a0, zero, a0
-	ldc.i4.s 0
+	stloc 7
+// 0x01077388: 0x1077388: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
-	clt.un
-	stloc.0
-// 0x010777a4: 0x10777a4: addu  v0, v0, a0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldloc.0
-	add
-	stloc 4
-// 0x010777a8: 0x10777a8: sltu  v1, zero, v1
-	ldc.i4.s 0
-	ldloc 5
-	clt.un
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x010777ac: 0x10777ac: addu  v0, v0, v1
-	ldloc 4
-	ldloc 5
+// --- basic block ---
+// 0x01077390: 0x1077390: sw    v0, 100(s2)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 25
 	add
-	stloc 4
-L_10777b0:
-// 0x010777b0: 0x10777b0: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_AddOn_10777b8(int32,int32,int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  8 is register t0
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010777b8: 0x10777b8: lui   v0, 0x80000
+	stelem.i4
+L_1077394:
+// 0x01077394: 0x1077394: lui   s3, 0x80000
 	ldc.i4 524288
-	stloc 4
-// 0x010777bc: 0x10777bc: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+	stloc 11
+// 0x01077398: 0x1077398: addiu s3, s3, -16788
+	ldloc 11
+	ldc.i4 -16788
 	add
-	stloc 4
-// 0x010777c0: 0x10777c0: addu  a2, v0, zero
-	ldloc 4
-	stloc.2
-// 0x010777c4: 0x10777c4: lw    a3, 2000(v0)
+	stloc 11
+// 0x0107739c: 0x107739c: sll   s2, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 7
+// 0x010773a0: 0x10773a0: addu  s2, s2, s3
+	ldloc 7
+	ldloc 11
+	add
+	stloc 7
+// 0x010773a4: 0x10773a4: lw    a0, 0(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldelem.i4
+	stloc.1
+// 0x010773a8: 0x10773a8: lw    v0, 84(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc.3
-// 0x010777c8: 0x10777c8: j	 0x1077804 addu  v1, zero, zero
-	ldc.i4.s 0
 	stloc 5
-	br L_1077804
-// --- basic block ---
-L_10777d0:
-// 0x010777d0: 0x10777d0: lw    v0, 0(a2)
+// 0x010773ac: 0x10773ac: sw    zero, 64(a0)
 	ldloc 6
-	ldloc.2
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x010777d4: 0x10777d4: addiu v1, v1, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4.s 16
 	add
-	stloc 5
-// 0x010777d8: 0x10777d8: lw    t0, 0(v0)
+	ldc.i4.s 0
+	stelem.i4
+// 0x010773b0: 0x10773b0: jal   0x1076394 sw    v0, 84(a0)
 	ldloc 6
-	ldloc 4
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 8
-// 0x010777dc: 0x10777dc: sll   zero, zero, 0
-// 0x010777e0: 0x10777e0: bne   t0, a0, 0x1077804 addiu a2, a2, 4
-	ldloc 8
+	ldc.i4.s 21
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4.4
-	add
-	stloc.2
-	bne.un L_1077804
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl88::RealtimeBonus_CreateGUIID_1076394(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x010777e8: 0x10777e8: lw    v1, 4(v0)
+// 0x010773b8: 0x10773b8: lw    v0, 1000(s3)
 	ldloc 6
-	ldloc 4
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 250
 	add
 	ldelem.i4
 	stloc 5
-// 0x010777ec: 0x10777ec: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.0
-// 0x010777f0: 0x10777f0: bne   v1, a0, 0x1077818 sll   zero, zero, 0
-	ldloc 5
-	ldloc.0
-	bne.un L_1077818
-// --- basic block ---
-// 0x010777f8: 0x10777f8: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x010777fc: 0x10777fc: jr    ra addiu v0, v0, -27156
-	ldloc 4
-	ldc.i4 -27156
-	add
-	stloc 4
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077804:
-// 0x01077804: 0x1077804: slt   v0, v1, a3
+// 0x010773bc: 0x10773bc: lw    s2, 0(s2)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x010773c0: 0x10773c0: addiu v0, v0, 1
 	ldloc 5
-	ldloc.3
-	clt
-	stloc 4
-// 0x01077808: 0x1077808: bne   v0, zero, 0x10777d0 addu  v0, zero, zero
-	ldloc 4
-	ldc.i4.s 0
-	stloc 4
-	brtrue L_10777d0
-// --- basic block ---
-// 0x01077810: 0x1077810: j	 0x107786c sll   zero, zero, 0
-	br L_107786c
-// --- basic block ---
-L_1077818:
-// 0x01077818: 0x1077818: bne   a1, zero, 0x107783c addiu a0, zero, 1
-	ldloc.1
-	ldc.i4.1
-	stloc.0
-	brtrue L_107783c
-// --- basic block ---
-// 0x01077820: 0x1077820: lw    a0, 1276(v0)
+	ldc.i4.1
+	add
+	stloc 5
+// 0x010773c4: 0x10773c4: sw    v0, 1000(s3)
 	ldloc 6
-	ldloc 4
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4 250
 	add
-	ldelem.i4
-	stloc.0
-// 0x01077824: 0x1077824: sll   zero, zero, 0
-// 0x01077828: 0x1077828: beq   a0, zero, 0x1077844 sll   zero, zero, 0
-	ldloc.0
-	brfalse L_1077844
-// --- basic block ---
-// 0x01077830: 0x1077830: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01077834: 0x1077834: jr    ra addiu v0, v0, -27132
-	ldloc 4
-	ldc.i4 -27132
+	ldloc 5
+	stelem.i4
+// 0x010773c8: 0x10773c8: lw    v0, 84(s2)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
 	add
-	stloc 4
-	br __CIBYL_function_return
-// --- basic block ---
-L_107783c:
-// 0x0107783c: 0x107783c: bne   a1, a0, 0x1077868 sll   zero, zero, 0
-	ldloc.1
-	ldloc.0
-	bne.un L_1077868
+	ldelem.i4
+	stloc 5
+// 0x010773cc: 0x10773cc: sll   zero, zero, 0
+// 0x010773d0: 0x10773d0: beq   v0, zero, 0x1077404 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1077404
 // --- basic block ---
-L_1077844:
-// 0x01077844: 0x1077844: lw    v0, 1496(v0)
+// 0x010773d8: 0x10773d8: lw    v0, 16(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 374
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 4
-// 0x01077848: 0x1077848: sll   zero, zero, 0
-// 0x0107784c: 0x107784c: bne   v0, zero, 0x107786c addiu a0, zero, 3
-	ldloc 4
-	ldc.i4.3
-	stloc.0
-	brtrue L_107786c
-// --- basic block ---
-// 0x01077854: 0x1077854: bne   v1, a0, 0x107786c sll   zero, zero, 0
+	stloc 5
+// 0x010773dc: 0x10773dc: sll   zero, zero, 0
+// 0x010773e0: 0x10773e0: beq   v0, zero, 0x10773ec sll   zero, zero, 0
 	ldloc 5
-	ldloc.0
-	bne.un L_107786c
+	brfalse L_10773ec
 // --- basic block ---
-// 0x0107785c: 0x107785c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01077860: 0x1077860: jr    ra addiu v0, v0, -27104
-	ldloc 4
-	ldc.i4 -27104
+// 0x010773e8: 0x10773e8: sw    zero, 4(s2)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc 4
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077868:
-// 0x01077868: 0x1077868: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-L_107786c:
-// 0x0107786c: 0x107786c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_Alert_Icon_1077874(int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
 	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
+	stelem.i4
+L_10773ec:
+// 0x010773ec: 0x10773ec: lui   a0, 0x0
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1077874:
-// 0x01077874: 0x1077874: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x01077878: 0x1077878: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+	stloc.1
+// 0x010773f0: 0x10773f0: jal   0x100e798 addiu a0, a0, 15692
+	ldloc.1
+	ldc.i4 15692
 	add
-	stloc 4
-// 0x0107787c: 0x107787c: addu  v1, v0, zero
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x01077880: 0x1077880: lw    a2, 2000(v0)
+// --- basic block ---
+// 0x010773f8: 0x10773f8: sw    v0, 12(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.3
 	add
-	ldelem.i4
-	stloc.2
-// 0x01077884: 0x1077884: j	 0x10778c4 addu  v0, zero, zero
+	ldloc 5
+	stelem.i4
+// 0x010773fc: 0x10773fc: lui   v0, 0x0
 	ldc.i4.s 0
-	stloc 4
-	br L_10778c4
-// --- basic block ---
-L_107788c:
-// 0x0107788c: 0x107788c: lw    a1, 0(v1)
+	stloc 5
+// 0x01077400: 0x1077400: sw    s1, 15740(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4 3935
+	add
+	ldloc 10
+	stelem.i4
+L_1077404:
+// 0x01077404: 0x1077404: lui   s2, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x01077408: 0x1077408: sll   v0, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x0107740c: 0x107740c: addiu s2, s2, -16788
+	ldloc 7
+	ldc.i4 -16788
+	add
+	stloc 7
+// 0x01077410: 0x1077410: addu  s2, v0, s2
+	ldloc 5
+	ldloc 7
+	add
+	stloc 7
+// 0x01077414: 0x1077414: lw    v0, 0(s2)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
 	ldelem.i4
+	stloc 5
+// 0x01077418: 0x1077418: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x01077890: 0x1077890: addiu v0, v0, 1
-	ldloc 4
-	ldc.i4.1
-	add
-	stloc 4
-// 0x01077894: 0x1077894: lw    a3, 0(a1)
+// 0x0107741c: 0x107741c: lw    a2, 28(v0)
 	ldloc 6
-	ldloc.1
+	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4.7
+	add
 	ldelem.i4
 	stloc.3
-// 0x01077898: 0x1077898: sll   zero, zero, 0
-// 0x0107789c: 0x107789c: bne   a3, a0, 0x10778c4 addiu v1, v1, 4
-	ldloc.3
+// 0x01077420: 0x1077420: jal   0x10a1f60 addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
 	ldloc.0
-	ldloc 5
-	ldc.i4.4
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	bne.un L_10778c4
 // --- basic block ---
-// 0x010778a4: 0x10778a4: lw    v0, 4(a1)
+// 0x01077428: 0x1077428: lw    v1, 84(s0)
 	ldloc 6
-	ldloc.1
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 4
-// 0x010778a8: 0x10778a8: sll   zero, zero, 0
-// 0x010778ac: 0x10778ac: addiu v0, v0, -1
-	ldloc 4
-	ldc.i4.m1
-	add
-	stloc 4
-// 0x010778b0: 0x10778b0: sltiu v1, v0, 2
-	ldloc 4
-	ldc.i4.2
-	clt.un
-	stloc 5
-// 0x010778b4: 0x10778b4: beq   v1, zero, 0x10778ec lui   v1, 0x20000
+	stloc 8
+// 0x0107742c: 0x107742c: bne   v0, zero, 0x107749c sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 131072
-	stloc 5
-	brfalse L_10778ec
-// --- basic block ---
-// 0x010778bc: 0x10778bc: j	 0x10778d8 sll   v0, v0, 2
-	ldloc 4
-	ldc.i4.2
-	shl
-	stloc 4
-	br L_10778d8
+	brtrue L_107749c
 // --- basic block ---
-L_10778c4:
-// 0x010778c4: 0x10778c4: slt   a1, v0, a2
-	ldloc 4
-	ldloc.2
-	clt
+// 0x01077434: 0x1077434: beq   v1, zero, 0x1077450 lui   a0, 0x20000
+	ldloc 8
+	ldc.i4 131072
 	stloc.1
-// 0x010778c8: 0x10778c8: bne   a1, zero, 0x107788c sll   zero, zero, 0
-	ldloc.1
-	brtrue L_107788c
-// --- basic block ---
-// 0x010778d0: 0x10778d0: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
+	brfalse L_1077450
 // --- basic block ---
-L_10778d8:
-// 0x010778d8: 0x10778d8: addiu v1, v1, 29240
-	ldloc 5
-	ldc.i4 29240
-	add
-	stloc 5
-// 0x010778dc: 0x10778dc: addu  v0, v0, v1
-	ldloc 4
-	ldloc 5
-	add
-	stloc 4
-// 0x010778e0: 0x10778e0: lw    v0, 0(v0)
+// 0x0107743c: 0x107743c: lw    v0, 0(s2)
 	ldloc 6
-	ldloc 4
+	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc 4
-// 0x010778e4: 0x10778e4: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-// --- basic block ---
-L_10778ec:
-// 0x010778ec: 0x10778ec: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x010778f0: 0x10778f0: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	stloc 5
+// 0x01077440: 0x1077440: sll   zero, zero, 0
+// 0x01077444: 0x1077444: lw    a1, 28(v0)
+	ldloc 6
 	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc.2
+// 0x01077448: 0x1077448: jal   0x1000e78 addiu a0, a0, -27068
+	ldloc.1
+	ldc.i4 -27068
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_Warn_Icon_10778f8(int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
+	call int32 Cibyl::printf_1000e78(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_10778f8:
-// 0x010778f8: 0x10778f8: lui   v0, 0x80000
+L_1077450:
+// 0x01077450: 0x1077450: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc 4
-// 0x010778fc: 0x10778fc: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
+	stloc 5
+// 0x01077454: 0x1077454: addiu v0, v0, -16788
+	ldloc 5
+	ldc.i4 -16788
 	add
-	stloc 4
-// 0x01077900: 0x1077900: addu  v1, v0, zero
-	ldloc 4
 	stloc 5
-// 0x01077904: 0x1077904: lw    a2, 2000(v0)
+// 0x01077458: 0x1077458: sll   s1, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 10
+// 0x0107745c: 0x107745c: addu  s1, s1, v0
+	ldloc 10
+	ldloc 5
+	add
+	stloc 10
+// 0x01077460: 0x1077460: lw    v0, 0(s1)
 	ldloc 6
-	ldloc 4
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
-	add
 	ldelem.i4
-	stloc.2
-// 0x01077908: 0x1077908: j	 0x1077948 addu  v0, zero, zero
-	ldc.i4.s 0
+	stloc 5
+// 0x01077464: 0x1077464: lui   a3, 0x10000
+	ldc.i4 65536
 	stloc 4
-	br L_1077948
-// --- basic block ---
-L_1077910:
-// 0x01077910: 0x1077910: lw    a1, 0(v1)
+// 0x01077468: 0x1077468: lw    a1, 28(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4.7
+	add
 	ldelem.i4
-	stloc.1
-// 0x01077914: 0x1077914: addiu v0, v0, 1
+	stloc.2
+// 0x0107746c: 0x107746c: lui   v0, 0x1070000
+	ldc.i4 17235968
+	stloc 5
+// 0x01077470: 0x1077470: addiu v0, v0, 27136
+	ldloc 5
+	ldc.i4 27136
+	add
+	stloc 5
+// 0x01077474: 0x1077474: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4.1
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x01077918: 0x1077918: lw    a3, 0(a1)
+// 0x01077478: 0x1077478: addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+// 0x0107747c: 0x107747c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x01077480: 0x1077480: sw    v0, 24(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x0107791c: 0x107791c: sll   zero, zero, 0
-// 0x01077920: 0x1077920: bne   a3, a0, 0x1077948 addiu v1, v1, 4
-	ldloc.3
-	ldloc.0
+	ldc.i4.6
+	add
 	ldloc 5
+	stelem.i4
+// 0x01077484: 0x1077484: sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
 	ldc.i4.4
 	add
-	stloc 5
-	bne.un L_1077948
-// --- basic block ---
-// 0x01077928: 0x1077928: lw    v0, 4(a1)
+	ldc.i4.s 0
+	stelem.i4
+// 0x01077488: 0x1077488: sw    zero, 20(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 4
-// 0x0107792c: 0x107792c: sll   zero, zero, 0
-// 0x01077930: 0x1077930: addiu v0, v0, -1
-	ldloc 4
-	ldc.i4.m1
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107748c: 0x107748c: jal   0x10a32a0 sw    zero, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc 4
-// 0x01077934: 0x1077934: sltiu v1, v0, 2
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ldc.i4.2
-	clt.un
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x01077938: 0x1077938: beq   v1, zero, 0x1077970 lui   v1, 0x20000
-	ldloc 5
-	ldc.i4 131072
+// --- basic block ---
+// 0x01077494: 0x1077494: j	 0x10774d8 addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-	brfalse L_1077970
+	br L_10774d8
 // --- basic block ---
-// 0x01077940: 0x1077940: j	 0x107795c sll   v0, v0, 2
-	ldloc 4
-	ldc.i4.2
-	shl
-	stloc 4
-	br L_107795c
+L_107749c:
+// 0x0107749c: 0x107749c: beq   v1, zero, 0x10774bc lui   v0, 0x80000
+	ldloc 8
+	ldc.i4 524288
+	stloc 5
+	brfalse L_10774bc
 // --- basic block ---
-L_1077948:
-// 0x01077948: 0x1077948: slt   a1, v0, a2
-	ldloc 4
-	ldloc.2
-	clt
+// 0x010774a4: 0x10774a4: lw    v0, 0(s2)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 5
+// 0x010774a8: 0x10774a8: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x0107794c: 0x107794c: bne   a1, zero, 0x1077910 sll   zero, zero, 0
+// 0x010774ac: 0x10774ac: lw    a1, 28(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc.2
+// 0x010774b0: 0x10774b0: jal   0x1000e78 addiu a0, a0, -27048
 	ldloc.1
-	brtrue L_1077910
-// --- basic block ---
-// 0x01077954: 0x1077954: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br __CIBYL_function_return
+	ldc.i4 -27048
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::printf_1000e78(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_107795c:
-// 0x0107795c: 0x107795c: addiu v1, v1, 29248
+// 0x010774b8: 0x10774b8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_10774bc:
+// 0x010774bc: 0x10774bc: sll   s1, s1, 2
+	ldloc 10
+	ldc.i4.2
+	shl
+	stloc 10
+// 0x010774c0: 0x10774c0: addiu v0, v0, -16788
 	ldloc 5
-	ldc.i4 29248
+	ldc.i4 -16788
 	add
 	stloc 5
-// 0x01077960: 0x1077960: addu  v0, v0, v1
-	ldloc 4
+// 0x010774c4: 0x10774c4: addu  s1, s1, v0
+	ldloc 10
 	ldloc 5
 	add
-	stloc 4
-// 0x01077964: 0x1077964: lw    v0, 0(v0)
+	stloc 10
+// 0x010774c8: 0x10774c8: lw    a0, 0(s1)
 	ldloc 6
-	ldloc 4
+	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc 4
-// 0x01077968: 0x1077968: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077970:
-// 0x01077970: 0x1077970: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x01077974: 0x1077974: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 5
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc.1
+// 0x010774cc: 0x10774cc: jal   0x10769ac sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
-	ret
-}
-.method public static int32 RTAlerts_Get_String_107797c(int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  4 is register v0
-// local  5 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  2 is register a2
-// local  3 is register a3
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 4
-	ldc.i4.s 0
+	call int32 Cibyl89::onBonusAdd_10769ac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
 // --- basic block ---
-L_107797c:
-// 0x0107797c: 0x107797c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 4
-// 0x01077980: 0x1077980: addiu v0, v0, -16028
-	ldloc 4
-	ldc.i4 -16028
-	add
-	stloc 4
-// 0x01077984: 0x1077984: addu  v1, v0, zero
-	ldloc 4
+L_10774d4:
+// 0x010774d4: 0x10774d4: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x01077988: 0x1077988: lw    a2, 2000(v0)
+L_10774d8:
+// 0x010774d8: 0x10774d8: lw    ra, 52(sp)
+// 0x010774dc: 0x10774dc: lw    s3, 48(sp)
 	ldloc 6
-	ldloc 4
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107798c: 0x107798c: j	 0x10779cc addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_10779cc
-// --- basic block ---
-L_1077994:
-// 0x01077994: 0x1077994: lw    a1, 0(v1)
+	stloc 11
+// 0x010774e0: 0x10774e0: lw    s2, 44(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01077998: 0x1077998: addiu v0, v0, 1
-	ldloc 4
-	ldc.i4.1
+	ldc.i4.s 11
 	add
-	stloc 4
-// 0x0107799c: 0x107799c: lw    a3, 0(a1)
+	ldelem.i4
+	stloc 7
+// 0x010774e4: 0x10774e4: lw    s1, 40(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x010779a0: 0x10779a0: sll   zero, zero, 0
-// 0x010779a4: 0x10779a4: bne   a3, a0, 0x10779cc addiu v1, v1, 4
-	ldloc.3
-	ldloc.0
-	ldloc 5
-	ldc.i4.4
+	ldc.i4.s 10
 	add
-	stloc 5
-	bne.un L_10779cc
-// --- basic block ---
-// 0x010779ac: 0x10779ac: lw    v0, 4(a1)
+	ldelem.i4
+	stloc 10
+// 0x010774e8: 0x10774e8: lw    s0, 36(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 4
-// 0x010779b0: 0x10779b0: sll   zero, zero, 0
-// 0x010779b4: 0x10779b4: addiu v0, v0, -1
-	ldloc 4
-	ldc.i4.m1
-	add
-	stloc 4
-// 0x010779b8: 0x10779b8: sltiu v1, v0, 2
-	ldloc 4
-	ldc.i4.2
-	clt.un
-	stloc 5
-// 0x010779bc: 0x10779bc: beq   v1, zero, 0x10779f4 lui   v1, 0x20000
-	ldloc 5
-	ldc.i4 131072
-	stloc 5
-	brfalse L_10779f4
-// --- basic block ---
-// 0x010779c4: 0x10779c4: j	 0x10779e0 sll   v0, v0, 2
-	ldloc 4
-	ldc.i4.2
-	shl
-	stloc 4
-	br L_10779e0
-// --- basic block ---
-L_10779cc:
-// 0x010779cc: 0x10779cc: slt   a1, v0, a2
-	ldloc 4
-	ldloc.2
-	clt
-	stloc.1
-// 0x010779d0: 0x10779d0: bne   a1, zero, 0x1077994 sll   zero, zero, 0
-	ldloc.1
-	brtrue L_1077994
-// --- basic block ---
-// 0x010779d8: 0x10779d8: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
+	stloc 9
+// 0x010774ec: 0x10774ec: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
+	add
+	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_10779e0:
-// 0x010779e0: 0x10779e0: addiu v1, v1, 29256
-	ldloc 5
-	ldc.i4 29256
-	add
-	stloc 5
-// 0x010779e4: 0x10779e4: addu  v0, v0, v1
-	ldloc 4
-	ldloc 5
-	add
-	stloc 4
-// 0x010779e8: 0x10779e8: lw    v0, 0(v0)
+L_10774f4:
+// 0x010774f4: 0x10774f4: lw    a0, 0(s0)
 	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x010774f8: 0x10774f8: jal   0x106bb14 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl80::Realtime_CollectCustomBonus_106bb14(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01077500: 0x1077500: lw    a0, 16(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
+	ldc.i4.4
+	add
 	ldelem.i4
-	stloc 4
-// 0x010779ec: 0x10779ec: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
+	stloc.1
+// 0x01077504: 0x1077504: jal   0x10ad118 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_10779f4:
-// 0x010779f4: 0x10779f4: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x010779f8: 0x10779f8: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
+// 0x0107750c: 0x107750c: j	 0x10774d8 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_10774d8
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 4
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Get_Distance_1077a00(int32)
+.method public static int32 RealTimeBonus_SegmentChangedCB_1077514(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
 
-// local  1 is register v0
-// local  2 is register v1
-// local  0 is register a0
-// local  4 is register ra
-// local  3 is register mem
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.1
+	stloc 5
 	ldc.i4.s 0
-	stloc.2
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 4
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1077a00:
-// 0x01077a00: 0x1077a00: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc.1
-// 0x01077a04: 0x1077a04: addiu v0, v0, -16028
-	ldloc.1
-	ldc.i4 -16028
-	add
-	stloc.1
-// 0x01077a08: 0x1077a08: sll   a0, a0, 2
-	ldloc.0
-	ldc.i4.2
-	shl
-	stloc.0
-// 0x01077a0c: 0x1077a0c: addu  a0, a0, v0
+// 0x01077514: 0x1077514: addiu sp, sp, -48
 	ldloc.0
-	ldloc.1
+	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01077a10: 0x1077a10: lw    v0, 0(a0)
-	ldloc 3
+// 0x01077518: 0x1077518: sw    s0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01077a14: 0x1077a14: sll   zero, zero, 0
-// 0x01077a18: 0x1077a18: beq   v0, zero, 0x1077a50 sll   zero, zero, 0
+	ldc.i4.s 9
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107751c: 0x107751c: addu  s0, a0, zero
 	ldloc.1
-	brfalse L_1077a50
-// --- basic block ---
-// 0x01077a20: 0x1077a20: lw    v0, 4(v0)
-	ldloc 3
+	stloc 8
+// 0x01077520: 0x1077520: lw    a0, 4(a0)
+	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
@@ -5723,339 +4769,516 @@ L_1077a00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01077a24: 0x1077a24: sll   zero, zero, 0
-// 0x01077a28: 0x1077a28: addiu v0, v0, -1
-	ldloc.1
-	ldc.i4.m1
+// 0x01077524: 0x1077524: sw    s1, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
-	stloc.1
-// 0x01077a2c: 0x1077a2c: sltiu v1, v0, 2
+	ldloc 9
+	stelem.i4
+// 0x01077528: 0x1077528: sw    ra, 44(sp)
+// 0x0107752c: 0x107752c: jal   0x100405c addu  s1, a1, zero
+	ldloc.2
+	stloc 9
+	ldloc.0
 	ldloc.1
-	ldc.i4.2
-	clt.un
-	stloc.2
-// 0x01077a30: 0x1077a30: beq   v1, zero, 0x1077a50 lui   v1, 0x20000
 	ldloc.2
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1077a50
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_line_length_100405c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01077a38: 0x1077a38: sll   v0, v0, 2
-	ldloc.1
+// 0x01077534: 0x1077534: slti  v0, v0, 75
+	ldloc 5
+	ldc.i4.s 75
+	clt
+	stloc 5
+// 0x01077538: 0x1077538: bne   v0, zero, 0x1077694 lui   v0, 0x0
+	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brtrue L_1077694
+// --- basic block ---
+// 0x01077540: 0x1077540: lw    v0, 576(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
-	shl
-	stloc.1
-// 0x01077a3c: 0x1077a3c: addiu v1, v1, 29264
-	ldloc.2
-	ldc.i4 29264
-	add
-	stloc.2
-// 0x01077a40: 0x1077a40: addu  v0, v0, v1
-	ldloc.1
-	ldloc.2
+	shr.un
+	ldc.i4 144
 	add
-	stloc.1
-// 0x01077a44: 0x1077a44: lw    v0, 0(v0)
-	ldloc 3
-	ldloc.1
+	ldelem.i4
+	stloc 5
+// 0x01077544: 0x1077544: lw    a0, 12(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
+	ldc.i4.3
+	add
 	ldelem.i4
 	stloc.1
-// 0x01077a48: 0x1077a48: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
+// 0x01077548: 0x1077548: sll   zero, zero, 0
+// 0x0107754c: 0x107754c: beq   a0, v0, 0x1077568 addiu v0, zero, 1
+	ldloc.1
+	ldloc 5
+	ldc.i4.1
+	stloc 5
+	beq  L_1077568
 // --- basic block ---
-L_1077a50:
-// 0x01077a50: 0x1077a50: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.2
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x01077554: 0x1077554: bltz  a0, 0x1077568 sll   zero, zero, 0
 	ldloc.1
-	ret
-}
-.method public static int32 RTAlerts_Is_Alertable_1077a58(int32)
-{
-.maxstack 8
-.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  1 is register v0
-// local  2 is register v1
-// local  0 is register a0
-// local  4 is register ra
-// local  3 is register mem
-
 	ldc.i4.s 0
+	blt L_1077568
+// --- basic block ---
+// 0x0107755c: 0x107755c: jal   0x100b174 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01077564: 0x1077564: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+L_1077568:
+// 0x01077568: 0x1077568: bne   s1, v0, 0x1077584 addiu a1, sp, 24
+	ldloc 9
+	ldloc 5
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.2
+	bne.un L_1077584
+// --- basic block ---
+// 0x01077570: 0x1077570: addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+// 0x01077574: 0x1077574: addu  a0, s0, zero
+	ldloc 8
 	stloc.1
+// 0x01077578: 0x1077578: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+// 0x0107757c: 0x107757c: j	 0x1077590 addiu a3, zero, 2
+	ldc.i4.2
 	stloc 4
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	br L_1077590
+// --- basic block ---
+L_1077584:
+// 0x01077584: 0x1077584: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x01077588: 0x1077588: addu  a2, zero, zero
+	ldc.i4.s 0
 	stloc.3
-__CIBYL_javamethod_begin:
+// 0x0107758c: 0x107758c: addiu a3, zero, 1
+	ldc.i4.1
+	stloc 4
+L_1077590:
+// 0x01077590: 0x1077590: lui   s1, 0x0
+	ldc.i4.s 0
+	stloc 9
+// 0x01077594: 0x1077594: sw    zero, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x01077598: 0x1077598: jal   0x10127a0 sw    zero, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl13::roadmap_street_extend_line_ends_10127a0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_1077a58:
-// 0x01077a58: 0x1077a58: lui   v0, 0x80000
+// 0x010775a0: 0x10775a0: lw    v0, 15740(s1)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 3935
+	add
+	ldelem.i4
+	stloc 5
+// 0x010775a4: 0x10775a4: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 7
+// 0x010775a8: 0x10775a8: beq   v0, v1, 0x1077694 lui   s0, 0x80000
+	ldloc 5
+	ldloc 7
 	ldc.i4 524288
-	stloc.1
-// 0x01077a5c: 0x1077a5c: addiu v0, v0, -16028
-	ldloc.1
-	ldc.i4 -16028
-	add
-	stloc.1
-// 0x01077a60: 0x1077a60: sll   a0, a0, 2
-	ldloc.0
+	stloc 8
+	beq  L_1077694
+// --- basic block ---
+// 0x010775b0: 0x10775b0: sll   v0, v0, 2
+	ldloc 5
 	ldc.i4.2
 	shl
-	stloc.0
-// 0x01077a64: 0x1077a64: addu  a0, a0, v0
-	ldloc.0
-	ldloc.1
+	stloc 5
+// 0x010775b4: 0x10775b4: addiu s0, s0, -16788
+	ldloc 8
+	ldc.i4 -16788
 	add
-	stloc.0
-// 0x01077a68: 0x1077a68: lw    v0, 0(a0)
-	ldloc 3
-	ldloc.0
+	stloc 8
+// 0x010775b8: 0x10775b8: addu  v0, v0, s0
+	ldloc 5
+	ldloc 8
+	add
+	stloc 5
+// 0x010775bc: 0x10775bc: lw    v0, 0(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
+	stloc 5
+// 0x010775c0: 0x10775c0: sll   zero, zero, 0
+// 0x010775c4: 0x10775c4: beq   v0, zero, 0x1077694 lui   a0, 0x20000
+	ldloc 5
+	ldc.i4 131072
 	stloc.1
-// 0x01077a6c: 0x1077a6c: sll   zero, zero, 0
-// 0x01077a70: 0x1077a70: beq   v0, zero, 0x1077aa4 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1077aa4
+	brfalse L_1077694
 // --- basic block ---
-// 0x01077a78: 0x1077a78: lw    v0, 4(v0)
-	ldloc 3
-	ldloc.1
+// 0x010775cc: 0x10775cc: lw    a1, 28(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc.1
-// 0x01077a7c: 0x1077a7c: sll   zero, zero, 0
-// 0x01077a80: 0x1077a80: sltiu v1, v0, 10
-	ldloc.1
-	ldc.i4.s 10
-	clt.un
-	stloc.2
-// 0x01077a84: 0x1077a84: beq   v1, zero, 0x1077aa4 lui   v1, 0x20000
-	ldloc.2
-	ldc.i4 131072
-	stloc.2
-	brfalse L_1077aa4
-// --- basic block ---
-// 0x01077a8c: 0x1077a8c: sll   v0, v0, 2
-	ldloc.1
-	ldc.i4.2
-	shl
-	stloc.1
-// 0x01077a90: 0x1077a90: addiu v1, v1, 29272
-	ldloc.2
-	ldc.i4 29272
-	add
 	stloc.2
-// 0x01077a94: 0x1077a94: addu  v0, v0, v1
+// 0x010775d0: 0x10775d0: jal   0x1000e78 addiu a0, a0, -27032
 	ldloc.1
-	ldloc.2
+	ldc.i4 -27032
 	add
 	stloc.1
-// 0x01077a98: 0x1077a98: lw    v0, 0(v0)
-	ldloc 3
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::printf_1000e78(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x010775d8: 0x10775d8: lw    v0, 15740(s1)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
+	ldc.i4 3935
+	add
 	ldelem.i4
-	stloc.1
-// 0x01077a9c: 0x1077a9c: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-// --- basic block ---
-L_1077aa4:
-// 0x01077aa4: 0x1077aa4: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.2
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.1
-	ret
-}
-.method public static int32 compare_proximity_1077ab4(int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  2 is register v0
-// local  4 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  5 is register ra
-// local  3 is register mem
-
-	ldc.i4.s 0
-	stloc.2
-	ldc.i4.s 0
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldc.i4.s 0
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01077ab4: 0x1077ab4: lw    v0, 0(a0)
-	ldloc 3
+// 0x010775dc: 0x10775dc: lw    v1, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.7
+	add
 	ldelem.i4
-	stloc.2
-// 0x01077ab8: 0x1077ab8: lw    a0, 0(a1)
-	ldloc 3
-	ldloc.1
+	stloc 7
+// 0x010775e0: 0x10775e0: sll   v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x010775e4: 0x10775e4: addu  s0, v0, s0
+	ldloc 5
+	ldloc 8
+	add
+	stloc 8
+// 0x010775e8: 0x10775e8: lw    v0, 0(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.0
-// 0x01077abc: 0x1077abc: lw    v1, 1264(v0)
-	ldloc 3
-	ldloc.2
+	stloc 5
+// 0x010775ec: 0x10775ec: sll   zero, zero, 0
+// 0x010775f0: 0x10775f0: sw    v1, 24(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 316
+	ldc.i4.6
 	add
-	ldelem.i4
-	stloc 4
-// 0x01077ac0: 0x1077ac0: lw    v0, 1264(a0)
-	ldloc 3
+	ldloc 7
+	stelem.i4
+// 0x010775f4: 0x10775f4: lw    v1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 316
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc.2
-// 0x01077ac4: 0x1077ac4: sll   zero, zero, 0
-// 0x01077ac8: 0x1077ac8: slt   a0, v1, v0
-	ldloc 4
-	ldloc.2
-	clt
-	stloc.0
-// 0x01077acc: 0x1077acc: beq   a0, zero, 0x1077ad8 slt   v0, v0, v1
+	stloc 7
+// 0x010775f8: 0x10775f8: jal   0x10a7518 sw    v1, 20(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
 	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
 	ldloc 4
-	clt
-	stloc.2
-	brfalse L_1077ad8
+	call int32 Cibyl124::roadmap_map_settings_road_goodies_10a7518(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01077ad4: 0x1077ad4: addiu v0, zero, -1
-	ldc.i4.m1
+// 0x01077600: 0x1077600: beq   v0, zero, 0x1077680 lui   a0, 0x1070000
+	ldloc 5
+	ldc.i4 17235968
+	stloc.1
+	brfalse L_1077680
+// --- basic block ---
+// 0x01077608: 0x1077608: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 9
+// 0x0107760c: 0x107760c: lw    v0, -16792(s1)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4198
+	add
+	ldelem.i4
+	stloc 5
+// 0x01077610: 0x1077610: sll   zero, zero, 0
+// 0x01077614: 0x1077614: bne   v0, zero, 0x107764c lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
+	stloc 5
+	brtrue L_107764c
+// --- basic block ---
+// 0x0107761c: 0x107761c: jal   0x10518b8 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.1
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01077624: 0x1077624: lui   s0, 0x20000
+	ldc.i4 131072
+	stloc 8
+// 0x01077628: 0x1077628: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107762c: 0x107762c: addiu a1, s0, -27012
+	ldloc 8
+	ldc.i4 -27012
+	add
 	stloc.2
-L_1077ad8:
-// 0x01077ad8: 0x1077ad8: jr    ra sll   zero, zero, 0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 4
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x01077630: 0x1077630: jal   0x10518dc sw    v0, -16792(s1)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4198
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
 	ldloc.2
-	ret
-}
-.method public static int32 compare_recency_1077ae0(int32,int32)
-{
-.maxstack 5
-.locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  2 is register v0
-// local  4 is register v1
-// local  0 is register a0
-// local  1 is register a1
-// local  5 is register ra
-// local  3 is register mem
-
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01077638: 0x1077638: addiu a2, s0, -27012
+	ldloc 8
+	ldc.i4 -27012
+	add
+	stloc.3
+// 0x0107763c: 0x107763c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01077640: 0x1077640: jal   0x10a1f60 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01077648: 0x1077648: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_107764c:
+// 0x0107764c: 0x107764c: lw    a0, -16792(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -4198
+	add
+	ldelem.i4
+	stloc.1
+// 0x01077650: 0x1077650: jal   0x105196c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x01077658: 0x1077658: lui   v0, 0x0
 	ldc.i4.s 0
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldarg 1
-	stloc 1
-	ldc.i4.s 0
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01077ae0: 0x1077ae0: lw    v0, 0(a0)
-	ldloc 3
-	ldloc.0
+// 0x0107765c: 0x107765c: lw    v1, 15740(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 3935
+	add
+	ldelem.i4
+	stloc 7
+// 0x01077660: 0x1077660: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01077664: 0x1077664: sll   v1, v1, 2
+	ldloc 7
+	ldc.i4.2
+	shl
+	stloc 7
+// 0x01077668: 0x1077668: addiu v0, v0, -16788
+	ldloc 5
+	ldc.i4 -16788
+	add
+	stloc 5
+// 0x0107766c: 0x107766c: addu  v0, v1, v0
+	ldloc 7
+	ldloc 5
+	add
+	stloc 5
+// 0x01077670: 0x1077670: lw    a0, 0(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
+	stloc.1
+// 0x01077674: 0x1077674: jal   0x1076844 addiu a1, zero, 1
+	ldc.i4.1
 	stloc.2
-// 0x01077ae4: 0x1077ae4: lw    a0, 0(a1)
-	ldloc 3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl89::AddBonusToMap_1076844(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107767c: 0x107767c: lui   a0, 0x1070000
+	ldc.i4 17235968
+	stloc.1
+L_1077680:
+// 0x01077680: 0x1077680: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 7
+// 0x01077684: 0x1077684: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x01077688: 0x1077688: addiu a0, a0, 29972
 	ldloc.1
+	ldc.i4 29972
+	add
+	stloc.1
+// 0x0107768c: 0x107768c: jal   0x1029d14 sw    v1, 15740(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.0
-// 0x01077ae8: 0x1077ae8: lw    v1, 144(v0)
-	ldloc 3
+	ldc.i4 3935
+	add
+	ldloc 7
+	stelem.i4
+	ldloc.1
 	ldloc.2
+	call int32 Cibyl31::roadmap_navigate_unregister_segment_changed_1029d14(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_1077694:
+// 0x01077694: 0x1077694: lw    ra, 44(sp)
+// 0x01077698: 0x1077698: lw    s1, 40(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 36
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 4
-// 0x01077aec: 0x1077aec: lw    v0, 144(a0)
-	ldloc 3
+	stloc 9
+// 0x0107769c: 0x107769c: lw    s0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 36
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc.2
-// 0x01077af0: 0x1077af0: sll   zero, zero, 0
-// 0x01077af4: 0x1077af4: slt   a0, v0, v1
-	ldloc.2
-	ldloc 4
-	clt
-	stloc.0
-// 0x01077af8: 0x1077af8: beq   a0, zero, 0x1077b04 slt   v0, v1, v0
+	stloc 8
+// 0x010776a0: 0x10776a0: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldloc 4
-	ldloc.2
-	clt
-	stloc.2
-	brfalse L_1077b04
-// --- basic block ---
-// 0x01077b00: 0x1077b00: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc.2
-L_1077b04:
-// 0x01077b04: 0x1077b04: jr    ra sll   zero, zero, 0
+	ldc.i4.s 48
+	add
+	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 4
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.2
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Get_Current_Alert_Id_1077b0c()
+.method public static int32 RTAlerts_Count_10776a8()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -6072,252 +5295,237 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077b0c: 0x1077b0c: lui   v0, 0x80000
+L_10776a8:
+// 0x010776a8: 0x10776a8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01077b10: 0x1077b10: lw    v0, -14004(v0)
+// 0x010776ac: 0x10776ac: lw    v0, -13564(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc.0
-// 0x01077b14: 0x1077b14: jr    ra sll   zero, zero, 0
+// 0x010776b0: 0x10776b0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RTAlerts_Penalty_1077b1c()
+.method public static int32 RTAlerts_Get_10776f8(int32)
 {
-.maxstack 4
-.locals init (int32 v0,int32 ra)
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
 
-// local  0 is register v0
-// local  1 is register ra
+// local  1 is register v0
+// local  0 is register a0
+// local  2 is register ra
+// local  3 is register mem
 
-	ldc.i4.s 0
-	stloc.0
 	ldc.i4.s 0
 	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01077b1c: 0x1077b1c: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RTAlerts_Is_Cancelable_1077b24()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
-	stloc.0
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
-	stloc.1
+	stloc.2
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1077b24:
-// 0x01077b24: 0x1077b24: jr    ra addiu v0, zero, 1
-	ldc.i4.1
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RTAlerts_Check_Same_Street_1077b2c()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
+// 0x010776f8: 0x10776f8: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1077b2c:
-// 0x01077b2c: 0x1077b2c: jr    ra addiu v0, zero, 1
-	ldc.i4.1
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.0
-	ret
-}
-.method public static int32 RTAlerts_HandleAlert_1077b34()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
+// 0x010776fc: 0x10776fc: addiu v0, v0, -15564
+	ldloc.1
+	ldc.i4 -15564
+	add
 	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1077b34:
-// 0x01077b34: 0x1077b34: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01077700: 0x1077700: sll   a0, a0, 2
 	ldloc.0
-	ret
-}
-.method public static int32 RTAlerts_is_square_dependent_1077b3c()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1077b3c:
-// 0x01077b3c: 0x1077b3c: jr    ra addu  v0, zero, zero
-	ldc.i4.s 0
+	ldc.i4.2
+	shl
 	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x01077704: 0x1077704: addu  a0, a0, v0
 	ldloc.0
-	ret
-}
-.method public static int32 RTAlerts_get_priority_1077b44()
-{
-.maxstack 4
-.locals init (int32 v0,int32 ra)
-
-// local  0 is register v0
-// local  1 is register ra
-
-	ldc.i4.s 0
+	ldloc.1
+	add
 	stloc.0
-	ldc.i4.s 0
-	stloc.1
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1077b44:
-// 0x01077b44: 0x1077b44: jr    ra addiu v0, zero, 2
+// 0x01077708: 0x1077708: lw    v0, 0(a0)
+	ldloc 3
+	ldloc.0
 	ldc.i4.2
-	stloc.0
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0107770c: 0x107770c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.0
+	ldloc.1
 	ret
 }
-.method public static int32 RTAlerts_get_location_info_1077b4c(int32)
+.method public static int32 RTAlerts_Get_By_ID_1077714(int32,int32,int32,int32)
 {
 .maxstack 5
-.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  1 is register v0
+// local  4 is register v0
+// local  5 is register v1
 // local  0 is register a0
-// local  2 is register ra
-// local  3 is register mem
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.1
+	stloc 4
+	ldc.i4.s 0
+	stloc 5
 	ldarg 0
 	stloc 0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
 	ldc.i4.s 0
-	stloc.2
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1077b4c:
-// 0x01077b4c: 0x1077b4c: lui   v0, 0x80000
+// 0x01077714: 0x1077714: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc.1
-// 0x01077b50: 0x1077b50: addiu v0, v0, -16028
-	ldloc.1
-	ldc.i4 -16028
+	stloc 4
+// 0x01077718: 0x1077718: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
+	stloc 4
+// 0x0107771c: 0x107771c: addu  a1, v0, zero
+	ldloc 4
 	stloc.1
-// 0x01077b54: 0x1077b54: sll   a0, a0, 2
-	ldloc.0
+// 0x01077720: 0x1077720: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
-	shl
-	stloc.0
-// 0x01077b58: 0x1077b58: addu  a0, a0, v0
-	ldloc.0
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.2
+// 0x01077724: 0x1077724: j	 0x1077744 addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_1077744
+// --- basic block ---
+L_107772c:
+// 0x0107772c: 0x107772c: lw    v0, 0(a1)
+	ldloc 6
 	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x01077730: 0x1077730: addiu v1, v1, 1
+	ldloc 5
+	ldc.i4.1
 	add
-	stloc.0
-// 0x01077b5c: 0x1077b5c: lw    v0, 0(a0)
-	ldloc 3
-	ldloc.0
+	stloc 5
+// 0x01077734: 0x1077734: lw    a3, 0(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.1
-// 0x01077b60: 0x1077b60: jr    ra addiu v0, v0, 1288
+	stloc.3
+// 0x01077738: 0x1077738: sll   zero, zero, 0
+// 0x0107773c: 0x107773c: beq   a3, a0, 0x1077750 addiu a1, a1, 4
+	ldloc.3
+	ldloc.0
 	ldloc.1
-	ldc.i4 1288
+	ldc.i4.4
 	add
 	stloc.1
+	beq  L_1077750
+// --- basic block ---
+L_1077744:
+// 0x01077744: 0x1077744: slt   v0, v1, a2
+	ldloc 5
+	ldloc.2
+	clt
+	stloc 4
+// 0x01077748: 0x1077748: bne   v0, zero, 0x107772c addu  v0, zero, zero
+	ldloc 4
+	ldc.i4.s 0
+	stloc 4
+	brtrue L_107772c
+// --- basic block ---
+L_1077750:
+// 0x01077750: 0x1077750: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.1
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
 	ret
 }
-.method public static int32 RTAlerts_Resert_Minimized_1077b68()
+.method public static int32 RTAlerts_State_107779c()
 {
 .maxstack 5
-.locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
 
 // local  0 is register v0
 // local  1 is register v1
-// local  2 is register ra
-// local  3 is register mem
+// local  3 is register ra
+// local  2 is register mem
 
 	ldc.i4.s 0
 	stloc.0
 	ldc.i4.s 0
 	stloc.1
 	ldc.i4.s 0
-	stloc.2
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc.3
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077b68: 0x1077b68: addiu v1, zero, -1
-	ldc.i4.m1
+// 0x0107779c: 0x107779c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.0
+// 0x010777a0: 0x10777a0: lw    v1, -13564(v0)
+	ldloc 2
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3391
+	add
+	ldelem.i4
 	stloc.1
-// 0x01077b6c: 0x1077b6c: lui   v0, 0x0
+// 0x010777a4: 0x10777a4: sll   zero, zero, 0
+// 0x010777a8: 0x10777a8: beq   v1, zero, 0x10777b8 addiu v0, zero, -1
+	ldloc.1
+	ldc.i4.m1
+	stloc.0
+	brfalse L_10777b8
+// --- basic block ---
+// 0x010777b0: 0x10777b0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc.0
-// 0x01077b70: 0x1077b70: jr    ra sw    v1, 15876(v0)
-	ldloc 3
+// 0x010777b4: 0x10777b4: lw    v0, 15940(v0)
+	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3969
+	ldc.i4 3985
 	add
-	ldloc.1
-	stelem.i4
+	ldelem.i4
+	stloc.0
+L_10777b8:
+// 0x010777b8: 0x10777b8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.1
@@ -6325,113 +5533,368 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RTAlerts_Get_Minimize_State_1077b78()
+.method public static int32 RTAlerts_Get_Number_of_Comments_10777fc(int32,int32,int32,int32)
 {
 .maxstack 5
-.locals init (int32 v0,int32 ra,int32[] mem)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  0 is register v0
-// local  1 is register ra
-// local  2 is register mem
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.0
+	stloc 4
 	ldc.i4.s 0
-	stloc.1
+	stloc 5
+	ldarg 0
+	stloc 0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldc.i4.s 0
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.2
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077b78: 0x1077b78: lui   v0, 0x0
+// 0x010777fc: 0x10777fc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01077800: 0x1077800: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
+	add
+	stloc 4
+// 0x01077804: 0x1077804: addu  v1, v0, zero
+	ldloc 4
+	stloc 5
+// 0x01077808: 0x1077808: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107780c: 0x107780c: j	 0x1077838 addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc.0
-// 0x01077b7c: 0x1077b7c: lw    v0, 15876(v0)
-	ldloc 2
+	stloc 4
+	br L_1077838
+// --- basic block ---
+L_1077814:
+// 0x01077814: 0x1077814: lw    a1, 0(v1)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x01077818: 0x1077818: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
+	add
+	stloc 4
+// 0x0107781c: 0x107781c: lw    a3, 0(a1)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x01077820: 0x1077820: sll   zero, zero, 0
+// 0x01077824: 0x1077824: bne   a3, a0, 0x1077838 addiu v1, v1, 4
+	ldloc.3
 	ldloc.0
+	ldloc 5
+	ldc.i4.4
+	add
+	stloc 5
+	bne.un L_1077838
+// --- basic block ---
+// 0x0107782c: 0x107782c: lw    v0, 1276(a1)
+	ldloc 6
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3969
+	ldc.i4 319
 	add
 	ldelem.i4
-	stloc.0
-// 0x01077b80: 0x1077b80: jr    ra sll   zero, zero, 0
+	stloc 4
+// 0x01077830: 0x1077830: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077838:
+// 0x01077838: 0x1077838: slt   a1, v0, a2
+	ldloc 4
+	ldloc.2
+	clt
+	stloc.1
+// 0x0107783c: 0x107783c: bne   a1, zero, 0x1077814 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_1077814
+// --- basic block ---
+// 0x01077844: 0x1077844: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.0
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
 	ret
 }
-.method public static int32 RTAlerts_Get_Stars_Icon_1077bb0(int32)
+.method public static int32 RTAlerts_Has_Image_1077898(int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  1 is register v0
+// local  4 is register v0
+// local  5 is register v1
 // local  0 is register a0
-// local  2 is register ra
-// local  3 is register mem
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.1
+	stloc 4
+	ldc.i4.s 0
+	stloc 5
 	ldarg 0
 	stloc 0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
 	ldc.i4.s 0
-	stloc.2
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.3
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077bb0: 0x1077bb0: sltiu v0, a0, 6
-	ldloc.0
-	ldc.i4.6
-	clt.un
+// 0x01077898: 0x1077898: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x0107789c: 0x107789c: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
+	add
+	stloc 4
+// 0x010778a0: 0x10778a0: addu  v1, v0, zero
+	ldloc 4
+	stloc 5
+// 0x010778a4: 0x10778a4: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.2
+// 0x010778a8: 0x10778a8: j	 0x10778d4 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_10778d4
+// --- basic block ---
+L_10778b0:
+// 0x010778b0: 0x10778b0: lw    a1, 0(v1)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.1
-// 0x01077bb4: 0x1077bb4: bne   v0, zero, 0x1077bc8 sll   zero, zero, 0
+// 0x010778b4: 0x10778b4: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
+	add
+	stloc 4
+// 0x010778b8: 0x10778b8: lw    a3, 0(a1)
+	ldloc 6
 	ldloc.1
-	brtrue L_1077bc8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x010778bc: 0x10778bc: sll   zero, zero, 0
+// 0x010778c0: 0x10778c0: bne   a3, a0, 0x10778d4 addiu v1, v1, 4
+	ldloc.3
+	ldloc.0
+	ldloc 5
+	ldc.i4.4
+	add
+	stloc 5
+	bne.un L_10778d4
 // --- basic block ---
-// 0x01077bbc: 0x1077bbc: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01077bc0: 0x1077bc0: jr    ra addiu v0, v0, -27080
+// 0x010778c8: 0x10778c8: lb    v0, 708(a1)
 	ldloc.1
-	ldc.i4 -27080
+	ldc.i4 708
 	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 4
+// 0x010778cc: 0x10778cc: jr    ra sltu  v0, zero, v0
+	ldc.i4.s 0
+	ldloc 4
+	clt.un
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_10778d4:
+// 0x010778d4: 0x10778d4: slt   a1, v0, a2
+	ldloc 4
+	ldloc.2
+	clt
 	stloc.1
+// 0x010778d8: 0x10778d8: bne   a1, zero, 0x10778b0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_10778b0
+// --- basic block ---
+// 0x010778e0: 0x10778e0: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
+	ret
+}
+.method public static int32 RTAlerts_Get_Position_10778e8(int32,int32,int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 a2,int32 v0,int32[] mem,int32 v1,int32 ra)
+
+// local  3 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  6 is register ra
+// local  4 is register mem
+
+	ldc.i4.s 0
+	stloc.3
+	ldc.i4.s 0
+	stloc 5
+	ldarg 0
+	stloc 0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 4
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1077bc8:
-// 0x01077bc8: 0x1077bc8: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01077bcc: 0x1077bcc: addiu v0, v0, 29312
-	ldloc.1
-	ldc.i4 29312
+L_10778e8:
+// 0x010778e8: 0x10778e8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.3
+// 0x010778ec: 0x10778ec: addiu v0, v0, -15564
+	ldloc.3
+	ldc.i4 -15564
 	add
-	stloc.1
-// 0x01077bd0: 0x1077bd0: sll   a0, a0, 2
+	stloc.3
+// 0x010778f0: 0x10778f0: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-// 0x01077bd4: 0x1077bd4: addu  a0, a0, v0
+// 0x010778f4: 0x10778f4: addu  a0, a0, v0
 	ldloc.0
-	ldloc.1
+	ldloc.3
 	add
 	stloc.0
-// 0x01077bd8: 0x1077bd8: lw    v0, 0(a0)
-	ldloc 3
+// 0x010778f8: 0x10778f8: lw    v0, 0(a0)
+	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.1
-// 0x01077bdc: 0x1077bdc: jr    ra sll   zero, zero, 0
+	stloc.3
+// 0x010778fc: 0x10778fc: sll   zero, zero, 0
+// 0x01077900: 0x1077900: beq   v0, zero, 0x107792c sll   zero, zero, 0
+	ldloc.3
+	brfalse L_107792c
+// --- basic block ---
+// 0x01077908: 0x1077908: lw    v1, 16(v0)
+	ldloc 4
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107790c: 0x107790c: sll   zero, zero, 0
+// 0x01077910: 0x1077910: sw    v1, 0(a1)
+	ldloc 4
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldloc 5
+	stelem.i4
+// 0x01077914: 0x1077914: lw    v1, 20(v0)
+	ldloc 4
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 5
+// 0x01077918: 0x1077918: sll   zero, zero, 0
+// 0x0107791c: 0x107791c: sw    v1, 4(a1)
+	ldloc 4
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 5
+	stelem.i4
+// 0x01077920: 0x1077920: lw    v0, 24(v0)
+	ldloc 4
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc.3
+// 0x01077924: 0x1077924: sll   zero, zero, 0
+// 0x01077928: 0x1077928: sw    v0, 0(a2)
+	ldloc 4
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldloc.3
+	stelem.i4
+L_107792c:
+// 0x0107792c: 0x107792c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.1
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.3
 	ret
 }
-.method public static int32 RTAlerts_isByMe_1077bf0(int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Type_By_Id_1077960(int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6463,18 +5926,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077bf0: 0x1077bf0: lui   v0, 0x80000
+// 0x01077960: 0x1077960: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x01077bf4: 0x1077bf4: addiu v0, v0, -16028
+// 0x01077964: 0x1077964: addiu v0, v0, -15564
 	ldloc 4
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 4
-// 0x01077bf8: 0x1077bf8: addu  v1, v0, zero
+// 0x01077968: 0x1077968: addu  v1, v0, zero
 	ldloc 4
 	stloc 5
-// 0x01077bfc: 0x1077bfc: lw    a2, 2000(v0)
+// 0x0107796c: 0x107796c: lw    a2, 2000(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -6483,64 +5946,64 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01077c00: 0x1077c00: j	 0x1077c2c addu  v0, zero, zero
+// 0x01077970: 0x1077970: j	 0x107799c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_1077c2c
+	br L_107799c
 // --- basic block ---
-L_1077c08:
-// 0x01077c08: 0x1077c08: lw    a1, 0(v1)
+L_1077978:
+// 0x01077978: 0x1077978: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01077c0c: 0x1077c0c: addiu v0, v0, 1
+// 0x0107797c: 0x107797c: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01077c10: 0x1077c10: lw    a3, 0(a1)
+// 0x01077980: 0x1077980: lw    a3, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01077c14: 0x1077c14: sll   zero, zero, 0
-// 0x01077c18: 0x1077c18: bne   a3, a0, 0x1077c2c addiu v1, v1, 4
+// 0x01077984: 0x1077984: sll   zero, zero, 0
+// 0x01077988: 0x1077988: bne   a3, a0, 0x107799c addiu v1, v1, 4
 	ldloc.3
 	ldloc.0
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-	bne.un L_1077c2c
+	bne.un L_107799c
 // --- basic block ---
-// 0x01077c20: 0x1077c20: lw    v0, 1280(a1)
+// 0x01077990: 0x1077990: lw    v0, 4(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 320
+	ldc.i4.1
 	add
 	ldelem.i4
 	stloc 4
-// 0x01077c24: 0x1077c24: jr    ra sll   zero, zero, 0
+// 0x01077994: 0x1077994: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1077c2c:
-// 0x01077c2c: 0x1077c2c: slt   a1, v0, a2
+L_107799c:
+// 0x0107799c: 0x107799c: slt   a1, v0, a2
 	ldloc 4
 	ldloc.2
 	clt
 	stloc.1
-// 0x01077c30: 0x1077c30: bne   a1, zero, 0x1077c08 sll   zero, zero, 0
+// 0x010779a0: 0x10779a0: bne   a1, zero, 0x1077978 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1077c08
+	brtrue L_1077978
 // --- basic block ---
-// 0x01077c38: 0x1077c38: jr    ra addu  v0, zero, zero
+// 0x010779a8: 0x10779a8: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
@@ -6550,458 +6013,776 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 j2me_sort_alerts_1077c40(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_GroupName_By_Id_10779b0(int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 v1)
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  6 is register v0
-// local 17 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  7 is register s1
-// local  9 is register s2
-// local 10 is register s3
-// local 11 is register s4
-// local 12 is register s5
-// local 13 is register s6
-// local 14 is register s7
-// local  0 is register sp
-// local 15 is register s8
-// local 16 is register ra
-// local  5 is register mem
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 4
 	ldc.i4.s 0
-	stloc 17
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
 	ldc.i4.s 0
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010779b0: 0x10779b0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x010779b4: 0x10779b4: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
+	add
+	stloc 4
+// 0x010779b8: 0x10779b8: addu  a1, v0, zero
+	ldloc 4
+	stloc.1
+// 0x010779bc: 0x10779bc: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.2
+// 0x010779c0: 0x10779c0: j	 0x10779e8 addu  v1, zero, zero
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
+	stloc 5
+	br L_10779e8
+// --- basic block ---
+L_10779c8:
+// 0x010779c8: 0x10779c8: lw    v0, 0(a1)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x010779cc: 0x10779cc: sll   zero, zero, 0
+// 0x010779d0: 0x10779d0: lw    a3, 0(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x010779d4: 0x10779d4: sll   zero, zero, 0
+// 0x010779d8: 0x10779d8: bne   a3, a0, 0x10779e8 addiu a1, a1, 4
+	ldloc.3
+	ldloc.0
+	ldloc.1
+	ldc.i4.4
+	add
+	stloc.1
+	bne.un L_10779e8
+// --- basic block ---
+// 0x010779e0: 0x10779e0: jr    ra addiu v0, v0, 1624
+	ldloc 4
+	ldc.i4 1624
+	add
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_10779e8:
+// 0x010779e8: 0x10779e8: slt   v0, v1, a2
+	ldloc 5
+	ldloc.2
+	clt
+	stloc 4
+// 0x010779ec: 0x10779ec: bne   v0, zero, 0x10779c8 addiu v1, v1, 1
+	ldloc 4
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+	brtrue L_10779c8
+// --- basic block ---
+// 0x010779f4: 0x10779f4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc 12
+	stloc 4
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
+	ret
+}
+.method public static int32 RTAlerts_Get_Id_10779fc(int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  1 is register v0
+// local  2 is register v1
+// local  0 is register a0
+// local  4 is register ra
+// local  3 is register mem
+
 	ldc.i4.s 0
-	stloc 13
+	stloc.1
 	ldc.i4.s 0
-	stloc 14
+	stloc.2
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 16
+	stloc 4
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077c40: 0x1077c40: addiu sp, sp, -64
+L_10779fc:
+// 0x010779fc: 0x10779fc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01077a00: 0x1077a00: addiu v0, v0, -15564
+	ldloc.1
+	ldc.i4 -15564
+	add
+	stloc.1
+// 0x01077a04: 0x1077a04: sll   a0, a0, 2
+	ldloc.0
+	ldc.i4.2
+	shl
+	stloc.0
+// 0x01077a08: 0x1077a08: addu  a0, a0, v0
 	ldloc.0
-	ldc.i4.s -64
+	ldloc.1
 	add
 	stloc.0
-// 0x01077c44: 0x1077c44: sw    s0, 24(sp)
-	ldloc 5
+// 0x01077a0c: 0x1077a0c: lw    v1, 0(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x01077c48: 0x1077c48: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x01077c4c: 0x1077c4c: addiu s0, s0, -16028
-	ldloc 8
-	ldc.i4 -16028
-	add
-	stloc 8
-// 0x01077c50: 0x1077c50: sw    s8, 56(sp)
-	ldloc 5
-	ldloc.0
+	ldelem.i4
+	stloc.2
+// 0x01077a10: 0x1077a10: sll   zero, zero, 0
+// 0x01077a14: 0x1077a14: beq   v1, zero, 0x1077a20 addiu v0, zero, -1
+	ldloc.2
+	ldc.i4.m1
+	stloc.1
+	brfalse L_1077a20
+// --- basic block ---
+// 0x01077a1c: 0x1077a1c: lw    v0, 0(v1)
+	ldloc 3
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldelem.i4
+	stloc.1
+L_1077a20:
+// 0x01077a20: 0x1077a20: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.2
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.1
+	ret
+}
+.method public static int32 RTAlerts_Get_LocationStrByID_1077a54(int32,int32,int32,int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 4
+	ldc.i4.s 0
+	stloc 5
+	ldarg 0
+	stloc 0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01077a54: 0x1077a54: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01077a58: 0x1077a58: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
-	ldloc 15
-	stelem.i4
-// 0x01077c54: 0x1077c54: sw    s6, 48(sp)
-	ldloc 5
-	ldloc.0
+	stloc 4
+// 0x01077a5c: 0x1077a5c: addu  a1, v0, zero
+	ldloc 4
+	stloc.1
+// 0x01077a60: 0x1077a60: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4 500
 	add
-	ldloc 13
-	stelem.i4
-// 0x01077c58: 0x1077c58: sw    s5, 44(sp)
-	ldloc 5
-	ldloc.0
+	ldelem.i4
+	stloc.2
+// 0x01077a64: 0x1077a64: j	 0x1077a8c addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_1077a8c
+// --- basic block ---
+L_1077a6c:
+// 0x01077a6c: 0x1077a6c: lw    v0, 0(a1)
+	ldloc 6
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 12
-	stelem.i4
-// 0x01077c5c: 0x1077c5c: sw    s3, 36(sp)
+	ldelem.i4
+	stloc 4
+// 0x01077a70: 0x1077a70: addiu v1, v1, 1
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4.1
 	add
-	ldloc 10
-	stelem.i4
-// 0x01077c60: 0x1077c60: sw    s1, 28(sp)
-	ldloc 5
-	ldloc.0
+	stloc 5
+// 0x01077a74: 0x1077a74: lw    a3, 0(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldelem.i4
+	stloc.3
+// 0x01077a78: 0x1077a78: sll   zero, zero, 0
+// 0x01077a7c: 0x1077a7c: bne   a3, a0, 0x1077a8c addiu a1, a1, 4
+	ldloc.3
+	ldloc.0
+	ldloc.1
+	ldc.i4.4
 	add
-	ldloc 7
-	stelem.i4
-// 0x01077c64: 0x1077c64: sw    ra, 60(sp)
-// 0x01077c68: 0x1077c68: sw    s7, 52(sp)
+	stloc.1
+	bne.un L_1077a8c
+// --- basic block ---
+// 0x01077a84: 0x1077a84: jr    ra addiu v0, v0, 557
+	ldloc 4
+	ldc.i4 557
+	add
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077a8c:
+// 0x01077a8c: 0x1077a8c: slt   v0, v1, a2
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
+	ldloc.2
+	clt
+	stloc 4
+// 0x01077a90: 0x1077a90: bne   v0, zero, 0x1077a6c lui   v0, 0x10000
+	ldloc 4
+	ldc.i4 65536
+	stloc 4
+	brtrue L_1077a6c
+// --- basic block ---
+// 0x01077a98: 0x1077a98: jr    ra addiu v0, v0, 18768
+	ldloc 4
+	ldc.i4 18768
 	add
-	ldloc 14
-	stelem.i4
-// 0x01077c6c: 0x1077c6c: sw    s4, 40(sp)
+	stloc 4
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
+	ret
+}
+.method public static int32 RTAlerts_Get_Speed_1077aa0(int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  1 is register v0
+// local  2 is register v1
+// local  0 is register a0
+// local  4 is register ra
+// local  3 is register mem
+
+	ldc.i4.s 0
+	stloc.1
+	ldc.i4.s 0
+	stloc.2
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 4
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.3
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1077aa0:
+// 0x01077aa0: 0x1077aa0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01077aa4: 0x1077aa4: addiu v0, v0, -15564
+	ldloc.1
+	ldc.i4 -15564
+	add
+	stloc.1
+// 0x01077aa8: 0x1077aa8: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	shl
+	stloc.0
+// 0x01077aac: 0x1077aac: addu  a0, a0, v0
+	ldloc.0
+	ldloc.1
 	add
-	ldloc 11
-	stelem.i4
-// 0x01077c70: 0x1077c70: sw    s2, 32(sp)
-	ldloc 5
+	stloc.0
+// 0x01077ab0: 0x1077ab0: lw    v1, 0(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldloc 9
-	stelem.i4
-// 0x01077c74: 0x1077c74: addu  s6, a0, zero
-	ldloc.1
-	stloc 13
-// 0x01077c78: 0x1077c78: addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-// 0x01077c7c: 0x1077c7c: addu  s3, s0, zero
-	ldloc 8
-	stloc 10
-// 0x01077c80: 0x1077c80: addiu s5, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 12
-// 0x01077c84: 0x1077c84: j	 0x1077cfc addiu s8, zero, -1
+	ldelem.i4
+	stloc.2
+// 0x01077ab4: 0x1077ab4: sll   zero, zero, 0
+// 0x01077ab8: 0x1077ab8: beq   v1, zero, 0x1077ac4 addiu v0, zero, -1
+	ldloc.2
 	ldc.i4.m1
-	stloc 15
-	br L_1077cfc
+	stloc.1
+	brfalse L_1077ac4
 // --- basic block ---
-L_1077c8c:
-// 0x01077c8c: 0x1077c8c: lw    v0, 4(s0)
-	ldloc 5
-	ldloc 8
+// 0x01077ac0: 0x1077ac0: lw    v0, 28(v1)
+	ldloc 3
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 6
-// 0x01077c90: 0x1077c90: addu  a0, s5, zero
-	ldloc 12
 	stloc.1
-// 0x01077c94: 0x1077c94: addu  a1, s0, zero
-	ldloc 8
+L_1077ac4:
+// 0x01077ac4: 0x1077ac4: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.2
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.1
+	ret
+}
+.method public static int32 RTAlerts_Get_IconByType_1077acc(int32,int32)
+{
+.maxstack 8
+.locals init (int32 a0,int32 a1,int32 v0,int32 ra,int32[] mem)
+
+// local  2 is register v0
+// local  0 is register a0
+// local  1 is register a1
+// local  3 is register ra
+// local  4 is register mem
+
+	ldc.i4.s 0
 	stloc.2
-// 0x01077c98: 0x1077c98: jalr  s6 sw    v0, 16(sp)
-	ldloc 13
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
+	ldarg 0
+	stloc 0
+	ldarg 1
+	stloc 1
+	ldc.i4.s 0
+	stloc.3
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 4
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01077acc: 0x1077acc: sltiu v0, a1, 10
 	ldloc.1
+	ldc.i4.s 10
+	clt.un
+	stloc.2
+// 0x01077ad0: 0x1077ad0: beq   v0, zero, 0x1077b7c lui   v0, 0x20000
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 17
-	stloc 6
+	ldc.i4 131072
+	stloc.2
+	brfalse L_1077b7c
 // --- basic block ---
-// 0x01077ca0: 0x1077ca0: sll   s2, s1, 2
-	ldloc 7
+// 0x01077ad8: 0x1077ad8: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077adc: 0x1077adc: addiu v0, v0, 29252
+	ldloc.2
+	ldc.i4 29252
+	add
+	stloc.2
+// 0x01077ae0: 0x1077ae0: sll   a1, a1, 2
+	ldloc.1
 	ldc.i4.2
 	shl
-	stloc 9
-// 0x01077ca4: 0x1077ca4: srl   v0, v0, 31
-	ldloc 6
-	ldc.i4.s 31
-	shr.un
-	stloc 6
-// 0x01077ca8: 0x1077ca8: addu  s2, s3, s2
-	ldloc 10
-	ldloc 9
-	add
-	stloc 9
-// 0x01077cac: 0x1077cac: j	 0x1077cd4 addiu s4, s0, -4
-	ldloc 8
-	ldc.i4.s -4
+	stloc.1
+// 0x01077ae4: 0x1077ae4: addu  a1, v0, a1
+	ldloc.2
+	ldloc.1
 	add
-	stloc 11
-	br L_1077cd4
-// --- basic block ---
-L_1077cb4:
-// 0x01077cb4: 0x1077cb4: lw    v0, 0(s2)
-	ldloc 5
-	ldloc 9
+	stloc.1
+// 0x01077ae8: 0x1077ae8: lw    v0, 0(a1)
+	ldloc 4
+	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc 6
-// 0x01077cb8: 0x1077cb8: addiu s1, s1, -1
-	ldloc 7
-	ldc.i4.m1
+	stloc.2
+// 0x01077aec: 0x1077aec: sll   zero, zero, 0
+// 0x01077af0: 0x1077af0: jr    v0 sll   zero, zero, 0
+	ldloc.2
+	br __CIBYL_local_jumptab
+// --- basic block ---
+L_1077af8:
+// 0x01077af8: 0x1077af8: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077afc: 0x1077afc: jr    ra addiu v0, v0, -26948
+	ldloc.2
+	ldc.i4 -26948
 	add
-	stloc 7
-// 0x01077cbc: 0x1077cbc: sw    v0, 4(s2)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc.2
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077b04:
+// 0x01077b04: 0x1077b04: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077b08: 0x1077b08: jr    ra addiu v0, v0, -26928
+	ldloc.2
+	ldc.i4 -26928
 	add
-	ldloc 6
-	stelem.i4
-// 0x01077cc0: 0x1077cc0: beq   s1, s8, 0x1077ce0 addiu s2, s2, -4
-	ldloc 7
-	ldloc 15
-	ldloc 9
-	ldc.i4.s -4
+	stloc.2
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077b10:
+// 0x01077b10: 0x1077b10: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077b14: 0x1077b14: jr    ra addiu v0, v0, -26884
+	ldloc.2
+	ldc.i4 -26884
+	add
+	stloc.2
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077b1c:
+// 0x01077b1c: 0x1077b1c: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077b20: 0x1077b20: jr    ra addiu v0, v0, -26860
+	ldloc.2
+	ldc.i4 -26860
 	add
-	stloc 9
-	beq  L_1077ce0
+	stloc.2
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x01077cc8: 0x1077cc8: jalr  s6 addiu s4, s4, -4
-	ldloc 13
-	ldloc 11
-	ldc.i4.s -4
+L_1077b28:
+// 0x01077b28: 0x1077b28: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077b2c: 0x1077b2c: jr    ra addiu v0, v0, -26836
+	ldloc.2
+	ldc.i4 -26836
 	add
-	stloc 11
-	ldloc.0
-	ldloc.1
+	stloc.2
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077b34:
+// 0x01077b34: 0x1077b34: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077b38: 0x1077b38: jr    ra addiu v0, v0, -26816
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 17
-	stloc 6
+	ldc.i4 -26816
+	add
+	stloc.2
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x01077cd0: 0x1077cd0: srl   v0, v0, 31
-	ldloc 6
-	ldc.i4.s 31
-	shr.un
-	stloc 6
-L_1077cd4:
-// 0x01077cd4: 0x1077cd4: addu  a1, s4, zero
-	ldloc 11
+L_1077b40:
+// 0x01077b40: 0x1077b40: lui   v0, 0x20000
+	ldc.i4 131072
 	stloc.2
-// 0x01077cd8: 0x1077cd8: bne   v0, zero, 0x1077cb4 addu  a0, s5, zero
-	ldloc 6
-	ldloc 12
-	stloc.1
-	brtrue L_1077cb4
+// 0x01077b44: 0x1077b44: jr    ra addiu v0, v0, -26796
+	ldloc.2
+	ldc.i4 -26796
+	add
+	stloc.2
+	br __CIBYL_function_return
 // --- basic block ---
-L_1077ce0:
-// 0x01077ce0: 0x1077ce0: addiu s1, s1, 1
-	ldloc 7
-	ldc.i4.1
+L_1077b4c:
+// 0x01077b4c: 0x1077b4c: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01077b50: 0x1077b50: jr    ra addiu v0, v0, -26764
+	ldloc.2
+	ldc.i4 -26764
 	add
-	stloc 7
-// 0x01077ce4: 0x1077ce4: sll   s1, s1, 2
-	ldloc 7
-	ldc.i4.2
-	shl
-	stloc 7
-// 0x01077ce8: 0x1077ce8: lw    v0, 16(sp)
-	ldloc 5
+	stloc.2
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077b58:
+// 0x01077b58: 0x1077b58: beq   a0, zero, 0x1077b84 lui   v0, 0x20000
+	ldloc.0
+	ldc.i4 131072
+	stloc.2
+	brfalse L_1077b84
+// --- basic block ---
+// 0x01077b60: 0x1077b60: lw    v0, 1504(a0)
+	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 376
 	add
 	ldelem.i4
-	stloc 6
-// 0x01077cec: 0x1077cec: addu  s1, s1, s3
-	ldloc 7
-	ldloc 10
+	stloc.2
+// 0x01077b64: 0x1077b64: sll   zero, zero, 0
+// 0x01077b68: 0x1077b68: bne   v0, zero, 0x1077b88 sll   zero, zero, 0
+	ldloc.2
+	brtrue L_1077b88
+// --- basic block ---
+// 0x01077b70: 0x1077b70: j	 0x1077b84 lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+	br L_1077b84
+// --- basic block ---
+L_1077b78:
+// 0x01077b78: 0x1077b78: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.2
+L_1077b7c:
+// 0x01077b7c: 0x1077b7c: jr    ra addiu v0, v0, -26908
+	ldloc.2
+	ldc.i4 -26908
 	add
-	stloc 7
-// 0x01077cf0: 0x1077cf0: sw    v0, 0(s1)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldloc 6
-	stelem.i4
-// 0x01077cf4: 0x1077cf4: addiu s0, s0, 4
-	ldloc 8
-	ldc.i4.4
+	stloc.2
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077b84:
+// 0x01077b84: 0x1077b84: addiu v0, v0, -26908
+	ldloc.2
+	ldc.i4 -26908
 	add
-	stloc 8
-// 0x01077cf8: 0x1077cf8: addu  s1, s7, zero
-	ldloc 14
+	stloc.2
+L_1077b88:
+// 0x01077b88: 0x1077b88: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+	br __CIBYL_function_return
+__CIBYL_local_jumptab:
+	stloc.2
+	ldloc.2
+	ldc.i4 17267448
+	beq  L_1077af8
+	ldloc.2
+	ldc.i4 17267460
+	beq  L_1077b04
+	ldloc.2
+	ldc.i4 17267472
+	beq  L_1077b10
+	ldloc.2
+	ldc.i4 17267484
+	beq  L_1077b1c
+	ldloc.2
+	ldc.i4 17267496
+	beq  L_1077b28
+	ldloc.2
+	ldc.i4 17267508
+	beq  L_1077b34
+	ldloc.2
+	ldc.i4 17267520
+	beq  L_1077b40
+	ldloc.2
+	ldc.i4 17267532
+	beq  L_1077b4c
+	ldloc.2
+	ldc.i4 17267544
+	beq  L_1077b58
+	ldloc.2
+	ldc.i4 17267576
+	beq  L_1077b78
+		br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.2
+	ret
+}
+.method public static int32 RTAlerts_Get_Icon_1077b90(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
 	stloc 7
-L_1077cfc:
-// 0x01077cfc: 0x1077cfc: lw    v0, 2000(s3)
-	ldloc 5
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc 6
-// 0x01077d00: 0x1077d00: addiu s7, s1, 1
-	ldloc 7
-	ldc.i4.1
-	add
-	stloc 14
-// 0x01077d04: 0x1077d04: slt   v0, s7, v0
-	ldloc 14
-	ldloc 6
-	clt
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-// 0x01077d08: 0x1077d08: bne   v0, zero, 0x1077c8c sll   zero, zero, 0
-	ldloc 6
-	brtrue L_1077c8c
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077d10: 0x1077d10: lw    ra, 60(sp)
-// 0x01077d14: 0x1077d14: lw    s8, 56(sp)
+// 0x01077b90: 0x1077b90: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01077b94: 0x1077b94: addiu v0, v0, -15564
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
+	ldc.i4 -15564
 	add
-	ldelem.i4
-	stloc 15
-// 0x01077d18: 0x1077d18: lw    s7, 52(sp)
-	ldloc 5
+	stloc 5
+// 0x01077b98: 0x1077b98: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 14
-// 0x01077d1c: 0x1077d1c: lw    s6, 48(sp)
+	stloc.0
+// 0x01077b9c: 0x1077b9c: sw    ra, 20(sp)
+// 0x01077ba0: 0x1077ba0: addu  a1, v0, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 13
-// 0x01077d20: 0x1077d20: lw    s5, 44(sp)
+	stloc.2
+// 0x01077ba4: 0x1077ba4: lw    a2, 2000(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 12
-// 0x01077d24: 0x1077d24: lw    s4, 40(sp)
-	ldloc 5
-	ldloc.0
+	stloc.3
+// 0x01077ba8: 0x1077ba8: j	 0x1077be4 addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+	br L_1077be4
+// --- basic block ---
+L_1077bb0:
+// 0x01077bb0: 0x1077bb0: lw    v0, 0(a1)
+	ldloc 6
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
-	add
 	ldelem.i4
-	stloc 11
-// 0x01077d28: 0x1077d28: lw    s3, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	stloc 5
+// 0x01077bb4: 0x1077bb4: addiu v1, v1, 1
+	ldloc 7
+	ldc.i4.1
 	add
-	ldelem.i4
-	stloc 10
-// 0x01077d2c: 0x1077d2c: lw    s2, 32(sp)
+	stloc 7
+// 0x01077bb8: 0x1077bb8: lw    a3, 0(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
 	ldelem.i4
-	stloc 9
-// 0x01077d30: 0x1077d30: lw    s1, 28(sp)
+	stloc 4
+// 0x01077bbc: 0x1077bbc: sll   zero, zero, 0
+// 0x01077bc0: 0x1077bc0: bne   a3, a0, 0x1077be4 addiu a1, a1, 4
+	ldloc 4
+	ldloc.1
+	ldloc.2
+	ldc.i4.4
+	add
+	stloc.2
+	bne.un L_1077be4
+// --- basic block ---
+// 0x01077bc8: 0x1077bc8: lw    a2, 1276(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 319
 	add
 	ldelem.i4
-	stloc 7
-// 0x01077d34: 0x1077d34: lw    s0, 24(sp)
+	stloc.3
+// 0x01077bcc: 0x1077bcc: lw    a1, 4(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 8
-// 0x01077d38: 0x1077d38: jr    ra addiu sp, sp, 64
+	stloc.2
+// 0x01077bd0: 0x1077bd0: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01077bd4: 0x1077bd4: jal   0x1077acc sltu  a2, zero, a2
+	ldc.i4.s 0
+	ldloc.3
+	clt.un
+	stloc.3
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl89::RTAlerts_Get_IconByType_1077acc(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x01077bdc: 0x1077bdc: j	 0x1077bf0 sll   zero, zero, 0
+	br L_1077bf0
+// --- basic block ---
+L_1077be4:
+// 0x01077be4: 0x1077be4: slt   v0, v1, a2
+	ldloc 7
+	ldloc.3
+	clt
+	stloc 5
+// 0x01077be8: 0x1077be8: bne   v0, zero, 0x1077bb0 addu  v0, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	brtrue L_1077bb0
+// --- basic block ---
+L_1077bf0:
+// 0x01077bf0: 0x1077bf0: lw    ra, 20(sp)
+// 0x01077bf4: 0x1077bf4: sll   zero, zero, 0
+// 0x01077bf8: 0x1077bf8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 64
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 17
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
 }
diff --git a/converted/Cibyl9.j b/converted/Cibyl9.j
index 9bf30c4..2fc3008 100644
--- a/converted/Cibyl9.j
+++ b/converted/Cibyl9.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl9::.ctor
 
-.method public static int32 roadmap_tile_edges_100c85c(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_edges_100c86c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 lo,int32 t0,int32 ra)
@@ -85,13 +85,13 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c85c: 0x100c85c: addiu sp, sp, -40
+// 0x0100c86c: 0x100c86c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100c860: 0x100c860: sw    ra, 36(sp)
-// 0x0100c864: 0x100c864: sw    s0, 32(sp)
+// 0x0100c870: 0x100c870: sw    ra, 36(sp)
+// 0x0100c874: 0x100c874: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -100,7 +100,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100c868: 0x100c868: sw    a1, 16(sp)
+// 0x0100c878: 0x100c878: sw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -109,10 +109,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100c86c: 0x100c86c: addu  s0, a0, zero
+// 0x0100c87c: 0x100c87c: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x0100c870: 0x100c870: sw    a2, 20(sp)
+// 0x0100c880: 0x100c880: sw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -121,7 +121,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0100c874: 0x100c874: jal   0x100c800 sw    a3, 24(sp)
+// 0x0100c884: 0x100c884: jal   0x100c810 sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -135,32 +135,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_tile_get_scale_100c800(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_tile_get_scale_100c810(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x0100c87c: 0x100c87c: addiu v1, zero, 20
+// 0x0100c88c: 0x100c88c: addiu v1, zero, 20
 	ldc.i4.s 20
 	stloc 8
-// 0x0100c880: 0x100c880: mult  v0, v1
+// 0x0100c890: 0x100c890: mult  v0, v1
 	ldloc 7
 	ldloc 8
 	mul
 	stloc 9
-// 0x0100c884: 0x100c884: lui   v1, 0x20000
+// 0x0100c894: 0x100c894: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100c888: 0x100c888: lw    v1, 31256(v1)
+// 0x0100c898: 0x100c898: lw    v1, 31720(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7814
+	ldc.i4 7930
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c88c: 0x100c88c: lw    a1, 16(sp)
+// 0x0100c89c: 0x100c89c: lw    a1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -169,7 +169,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c890: 0x100c890: lw    a2, 20(sp)
+// 0x0100c8a0: 0x100c8a0: lw    a2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -178,7 +178,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100c894: 0x100c894: lw    a3, 24(sp)
+// 0x0100c8a4: 0x100c8a4: lw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -187,16 +187,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100c898: 0x100c898: lw    ra, 36(sp)
-// 0x0100c89c: 0x100c89c: mflo  lo
+// 0x0100c8a8: 0x100c8a8: lw    ra, 36(sp)
+// 0x0100c8ac: 0x100c8ac: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0100c8a0: 0x100c8a0: addu  v0, v1, v0
+// 0x0100c8b0: 0x100c8b0: addu  v0, v1, v0
 	ldloc 8
 	ldloc 7
 	add
 	stloc 7
-// 0x0100c8a4: 0x100c8a4: lw    a0, 8(v0)
+// 0x0100c8b4: 0x100c8b4: lw    a0, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -205,7 +205,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c8a8: 0x100c8a8: lw    v1, 12(v0)
+// 0x0100c8b8: 0x100c8b8: lw    v1, 12(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -214,17 +214,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100c8ac: 0x100c8ac: subu  s0, s0, a0
+// 0x0100c8bc: 0x100c8bc: subu  s0, s0, a0
 	ldloc 6
 	ldloc.1
 	sub
 	stloc 6
-// 0x0100c8b0: 0x100c8b0: div   s0, v1
+// 0x0100c8c0: 0x100c8c0: div   s0, v1
 	ldloc 6
 	ldloc 8
 	div
 	stloc 9
-// 0x0100c8b4: 0x100c8b4: lw    t0, 4(v0)
+// 0x0100c8c4: 0x100c8c4: lw    t0, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -233,47 +233,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100c8b8: 0x100c8b8: mflo  lo
+// 0x0100c8c8: 0x100c8c8: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0100c8bc: 0x100c8bc: sll   zero, zero, 0
-// 0x0100c8c0: 0x100c8c0: sll   zero, zero, 0
-// 0x0100c8c4: 0x100c8c4: mult  a0, t0
+// 0x0100c8cc: 0x100c8cc: sll   zero, zero, 0
+// 0x0100c8d0: 0x100c8d0: sll   zero, zero, 0
+// 0x0100c8d4: 0x100c8d4: mult  a0, t0
 	ldloc.1
 	ldloc 10
 	mul
 	stloc 9
-// 0x0100c8c8: 0x100c8c8: mflo  lo
+// 0x0100c8d8: 0x100c8d8: mflo  lo
 	ldloc 9
 	stloc 10
-// 0x0100c8cc: 0x100c8cc: sll   zero, zero, 0
-// 0x0100c8d0: 0x100c8d0: sll   zero, zero, 0
-// 0x0100c8d4: 0x100c8d4: mult  a0, v1
+// 0x0100c8dc: 0x100c8dc: sll   zero, zero, 0
+// 0x0100c8e0: 0x100c8e0: sll   zero, zero, 0
+// 0x0100c8e4: 0x100c8e4: mult  a0, v1
 	ldloc.1
 	ldloc 8
 	mul
 	stloc 9
-// 0x0100c8d8: 0x100c8d8: lui   a0, 0xf5450000
+// 0x0100c8e8: 0x100c8e8: lui   a0, 0xf5450000
 	ldc.i4 4114939904
 	stloc.1
-// 0x0100c8dc: 0x100c8dc: ori   a0, a0, 27392
+// 0x0100c8ec: 0x100c8ec: ori   a0, a0, 27392
 	ldloc.1
 	ldc.i4 27392
 	or
 	stloc.1
-// 0x0100c8e0: 0x100c8e0: addu  t0, t0, a0
+// 0x0100c8f0: 0x100c8f0: addu  t0, t0, a0
 	ldloc 10
 	ldloc.1
 	add
 	stloc 10
-// 0x0100c8e4: 0x100c8e4: sw    t0, 0(a1)
+// 0x0100c8f4: 0x100c8f4: sw    t0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x0100c8e8: 0x100c8e8: lw    a0, 4(v0)
+// 0x0100c8f8: 0x100c8f8: lw    a0, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -282,20 +282,20 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c8ec: 0x100c8ec: sll   zero, zero, 0
-// 0x0100c8f0: 0x100c8f0: addu  t0, t0, a0
+// 0x0100c8fc: 0x100c8fc: sll   zero, zero, 0
+// 0x0100c900: 0x100c900: addu  t0, t0, a0
 	ldloc 10
 	ldloc.1
 	add
 	stloc 10
-// 0x0100c8f4: 0x100c8f4: sw    t0, 0(a2)
+// 0x0100c904: 0x100c904: sw    t0, 0(a2)
 	ldloc 5
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-// 0x0100c8f8: 0x100c8f8: lw    a1, 4(v0)
+// 0x0100c908: 0x100c908: lw    a1, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -304,44 +304,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c8fc: 0x100c8fc: mflo  lo
+// 0x0100c90c: 0x100c90c: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x0100c900: 0x100c900: subu  s0, s0, v1
+// 0x0100c910: 0x100c910: subu  s0, s0, v1
 	ldloc 6
 	ldloc 8
 	sub
 	stloc 6
-// 0x0100c904: 0x100c904: sll   zero, zero, 0
-// 0x0100c908: 0x100c908: mult  s0, a1
+// 0x0100c914: 0x100c914: sll   zero, zero, 0
+// 0x0100c918: 0x100c918: mult  s0, a1
 	ldloc 6
 	ldloc.2
 	mul
 	stloc 9
-// 0x0100c90c: 0x100c90c: lui   a1, 0xfaa20000
+// 0x0100c91c: 0x100c91c: lui   a1, 0xfaa20000
 	ldc.i4 4204920832
 	stloc.2
-// 0x0100c910: 0x100c910: ori   a1, a1, 46464
+// 0x0100c920: 0x100c920: ori   a1, a1, 46464
 	ldloc.2
 	ldc.i4 46464
 	or
 	stloc.2
-// 0x0100c914: 0x100c914: mflo  lo
+// 0x0100c924: 0x100c924: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0100c918: 0x100c918: addu  s0, s0, a1
+// 0x0100c928: 0x100c928: addu  s0, s0, a1
 	ldloc 6
 	ldloc.2
 	add
 	stloc 6
-// 0x0100c91c: 0x100c91c: sw    s0, 0(a3)
+// 0x0100c92c: 0x100c92c: sw    s0, 0(a3)
 	ldloc 5
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100c920: 0x100c920: lw    v0, 4(v0)
+// 0x0100c930: 0x100c930: lw    v0, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -350,13 +350,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c924: 0x100c924: sll   zero, zero, 0
-// 0x0100c928: 0x100c928: addu  s0, s0, v0
+// 0x0100c934: 0x100c934: sll   zero, zero, 0
+// 0x0100c938: 0x100c938: addu  s0, s0, v0
 	ldloc 6
 	ldloc 7
 	add
 	stloc 6
-// 0x0100c92c: 0x100c92c: lw    v0, 56(sp)
+// 0x0100c93c: 0x100c93c: lw    v0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -365,15 +365,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c930: 0x100c930: sll   zero, zero, 0
-// 0x0100c934: 0x100c934: sw    s0, 0(v0)
+// 0x0100c940: 0x100c940: sll   zero, zero, 0
+// 0x0100c944: 0x100c944: sw    s0, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100c938: 0x100c938: lw    s0, 32(sp)
+// 0x0100c948: 0x100c948: lw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -382,7 +382,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100c93c: 0x100c93c: jr    ra addiu sp, sp, 40
+// 0x0100c94c: 0x100c94c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -394,7 +394,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 roadmap_tile_is_adjacent_100c944(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_is_adjacent_100c954(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -432,17 +432,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100c944: 0x100c944: addiu sp, sp, -64
+// 0x0100c954: 0x100c954: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0100c948: 0x100c948: addiu v0, sp, 48
+// 0x0100c958: 0x100c958: addiu v0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc 5
-// 0x0100c94c: 0x100c94c: sw    s0, 56(sp)
+// 0x0100c95c: 0x100c95c: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -451,26 +451,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100c950: 0x100c950: addiu a2, sp, 32
+// 0x0100c960: 0x100c960: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0100c954: 0x100c954: addu  s0, a1, zero
+// 0x0100c964: 0x100c964: addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-// 0x0100c958: 0x100c958: addiu a3, sp, 40
+// 0x0100c968: 0x100c968: addiu a3, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 4
-// 0x0100c95c: 0x100c95c: addiu a1, sp, 24
+// 0x0100c96c: 0x100c96c: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x0100c960: 0x100c960: sw    ra, 60(sp)
-// 0x0100c964: 0x100c964: jal   0x100c85c sw    v0, 16(sp)
+// 0x0100c970: 0x100c970: sw    ra, 60(sp)
+// 0x0100c974: 0x100c974: jal   0x100c86c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -484,35 +484,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_edges_100c85c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_edges_100c86c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100c96c: 0x100c96c: addu  a0, s0, zero
+// 0x0100c97c: 0x100c97c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100c970: 0x100c970: addiu v0, sp, 52
+// 0x0100c980: 0x100c980: addiu v0, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 5
-// 0x0100c974: 0x100c974: addiu a1, sp, 28
+// 0x0100c984: 0x100c984: addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc.2
-// 0x0100c978: 0x100c978: addiu a2, sp, 36
+// 0x0100c988: 0x100c988: addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.3
-// 0x0100c97c: 0x100c97c: addiu a3, sp, 44
+// 0x0100c98c: 0x100c98c: addiu a3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 4
-// 0x0100c980: 0x100c980: jal   0x100c85c sw    v0, 16(sp)
+// 0x0100c990: 0x100c990: jal   0x100c86c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -526,12 +526,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_edges_100c85c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_edges_100c86c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100c988: 0x100c988: lw    a0, 40(sp)
+// 0x0100c998: 0x100c998: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -540,7 +540,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100c98c: 0x100c98c: lw    v1, 44(sp)
+// 0x0100c99c: 0x100c99c: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -549,13 +549,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100c990: 0x100c990: sll   zero, zero, 0
-// 0x0100c994: 0x100c994: bne   a0, v1, 0x100c9c4 sll   zero, zero, 0
+// 0x0100c9a0: 0x100c9a0: sll   zero, zero, 0
+// 0x0100c9a4: 0x100c9a4: bne   a0, v1, 0x100c9d4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	bne.un L_100c9c4
+	bne.un L_100c9d4
 // --- basic block ---
-// 0x0100c99c: 0x100c99c: lw    v0, 36(sp)
+// 0x0100c9ac: 0x100c9ac: lw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -564,7 +564,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c9a0: 0x100c9a0: lw    a1, 24(sp)
+// 0x0100c9b0: 0x100c9b0: lw    a1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -573,15 +573,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c9a4: 0x100c9a4: sll   zero, zero, 0
-// 0x0100c9a8: 0x100c9a8: beq   a1, v0, 0x100ca00 addiu v0, zero, 1
+// 0x0100c9b4: 0x100c9b4: sll   zero, zero, 0
+// 0x0100c9b8: 0x100c9b8: beq   a1, v0, 0x100ca10 addiu v0, zero, 1
 	ldloc.2
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	beq  L_100ca00
+	beq  L_100ca10
 // --- basic block ---
-// 0x0100c9b0: 0x100c9b0: lw    v0, 28(sp)
+// 0x0100c9c0: 0x100c9c0: lw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -590,7 +590,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c9b4: 0x100c9b4: lw    a1, 32(sp)
+// 0x0100c9c4: 0x100c9c4: lw    a1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -599,16 +599,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c9b8: 0x100c9b8: sll   zero, zero, 0
-// 0x0100c9bc: 0x100c9bc: beq   a1, v0, 0x100ca00 addiu v0, zero, 1
+// 0x0100c9c8: 0x100c9c8: sll   zero, zero, 0
+// 0x0100c9cc: 0x100c9cc: beq   a1, v0, 0x100ca10 addiu v0, zero, 1
 	ldloc.2
 	ldloc 5
 	ldc.i4.1
 	stloc 5
-	beq  L_100ca00
+	beq  L_100ca10
 // --- basic block ---
-L_100c9c4:
-// 0x0100c9c4: 0x100c9c4: lw    a1, 28(sp)
+L_100c9d4:
+// 0x0100c9d4: 0x100c9d4: lw    a1, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -617,7 +617,7 @@ L_100c9c4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100c9c8: 0x100c9c8: lw    a2, 24(sp)
+// 0x0100c9d8: 0x100c9d8: lw    a2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -626,15 +626,15 @@ L_100c9c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100c9cc: 0x100c9cc: sll   zero, zero, 0
-// 0x0100c9d0: 0x100c9d0: bne   a2, a1, 0x100ca00 addu  v0, zero, zero
+// 0x0100c9dc: 0x100c9dc: sll   zero, zero, 0
+// 0x0100c9e0: 0x100c9e0: bne   a2, a1, 0x100ca10 addu  v0, zero, zero
 	ldloc.3
 	ldloc.2
 	ldc.i4.s 0
 	stloc 5
-	bne.un L_100ca00
+	bne.un L_100ca10
 // --- basic block ---
-// 0x0100c9d8: 0x100c9d8: lw    v0, 52(sp)
+// 0x0100c9e8: 0x100c9e8: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -643,13 +643,13 @@ L_100c9c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c9dc: 0x100c9dc: sll   zero, zero, 0
-// 0x0100c9e0: 0x100c9e0: beq   a0, v0, 0x100c9fc sll   zero, zero, 0
+// 0x0100c9ec: 0x100c9ec: sll   zero, zero, 0
+// 0x0100c9f0: 0x100c9f0: beq   a0, v0, 0x100ca0c sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_100c9fc
+	beq  L_100ca0c
 // --- basic block ---
-// 0x0100c9e8: 0x100c9e8: lw    v0, 48(sp)
+// 0x0100c9f8: 0x100c9f8: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -658,26 +658,26 @@ L_100c9c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100c9ec: 0x100c9ec: sll   zero, zero, 0
-// 0x0100c9f0: 0x100c9f0: xor   v0, v0, v1
+// 0x0100c9fc: 0x100c9fc: sll   zero, zero, 0
+// 0x0100ca00: 0x100ca00: xor   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	xor
 	stloc 5
-// 0x0100c9f4: 0x100c9f4: j	 0x100ca00 sltiu v0, v0, 1
+// 0x0100ca04: 0x100ca04: j	 0x100ca10 sltiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
 	stloc 5
-	br L_100ca00
+	br L_100ca10
 // --- basic block ---
-L_100c9fc:
-// 0x0100c9fc: 0x100c9fc: addiu v0, zero, 1
+L_100ca0c:
+// 0x0100ca0c: 0x100ca0c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_100ca00:
-// 0x0100ca00: 0x100ca00: lw    ra, 60(sp)
-// 0x0100ca04: 0x100ca04: lw    s0, 56(sp)
+L_100ca10:
+// 0x0100ca10: 0x100ca10: lw    ra, 60(sp)
+// 0x0100ca14: 0x100ca14: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -686,7 +686,7 @@ L_100ca00:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100ca08: 0x100ca08: jr    ra addiu sp, sp, 64
+// 0x0100ca18: 0x100ca18: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -698,7 +698,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_register_callback_100ca10(int32)
+.method public static int32 roadmap_tile_register_callback_100ca20(int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 v1,int32[] mem,int32 v0,int32 ra)
@@ -721,24 +721,24 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100ca10: 0x100ca10: lui   v1, 0x20000
+// 0x0100ca20: 0x100ca20: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0100ca14: 0x100ca14: lw    v0, 31272(v1)
+// 0x0100ca24: 0x100ca24: lw    v0, 31736(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7818
+	ldc.i4 7934
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100ca18: 0x100ca18: jr    ra sw    a0, 31272(v1)
+// 0x0100ca28: 0x100ca28: jr    ra sw    a0, 31736(v1)
 	ldloc 2
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7818
+	ldc.i4 7934
 	add
 	ldloc.0
 	stelem.i4
@@ -749,7 +749,7 @@ __CIBYL_function_return:
 	ldloc.3
 	ret
 }
-.method public static int32 roadmap_tile_refresh_all_100ca20(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_refresh_all_100ca30(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -784,10 +784,10 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100ca20: 0x100ca20: lui   v0, 0x0
+// 0x0100ca30: 0x100ca30: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100ca24: 0x100ca24: lw    v0, 776(v0)
+// 0x0100ca34: 0x100ca34: lw    v0, 776(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
@@ -796,36 +796,36 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100ca28: 0x100ca28: addiu sp, sp, -24
+// 0x0100ca38: 0x100ca38: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100ca2c: 0x100ca2c: sw    ra, 20(sp)
-// 0x0100ca30: 0x100ca30: bltz  v0, 0x100ca58 lui   a1, 0x0
+// 0x0100ca3c: 0x100ca3c: sw    ra, 20(sp)
+// 0x0100ca40: 0x100ca40: bltz  v0, 0x100ca68 lui   a1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
 	ldc.i4.s 0
-	blt L_100ca58
+	blt L_100ca68
 // --- basic block ---
-// 0x0100ca38: 0x100ca38: lui   a3, 0x0
+// 0x0100ca48: 0x100ca48: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100ca3c: 0x100ca3c: addiu a1, a1, 24928
+// 0x0100ca4c: 0x100ca4c: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100ca40: 0x100ca40: addiu a3, a3, 24964
+// 0x0100ca50: 0x100ca50: addiu a3, a3, 24964
 	ldloc 4
 	ldc.i4 24964
 	add
 	stloc 4
-// 0x0100ca44: 0x100ca44: addiu a0, zero, 3
+// 0x0100ca54: 0x100ca54: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0100ca48: 0x100ca48: jal   0x100449c addiu a2, zero, 669
+// 0x0100ca58: 0x100ca58: jal   0x100449c addiu a2, zero, 669
 	ldc.i4 669
 	stloc.3
 	ldloc.0
@@ -838,27 +838,27 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ca50: 0x100ca50: j	 0x100caac sll   zero, zero, 0
-	br L_100caac
+// 0x0100ca60: 0x100ca60: j	 0x100cabc sll   zero, zero, 0
+	br L_100cabc
 // --- basic block ---
-L_100ca58:
-// 0x0100ca58: 0x100ca58: lui   a3, 0x0
+L_100ca68:
+// 0x0100ca68: 0x100ca68: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100ca5c: 0x100ca5c: addiu a1, a1, 24928
+// 0x0100ca6c: 0x100ca6c: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100ca60: 0x100ca60: addiu a3, a3, 25016
+// 0x0100ca70: 0x100ca70: addiu a3, a3, 25016
 	ldloc 4
 	ldc.i4 25016
 	add
 	stloc 4
-// 0x0100ca64: 0x100ca64: addiu a2, zero, 673
+// 0x0100ca74: 0x100ca74: addiu a2, zero, 673
 	ldc.i4 673
 	stloc.3
-// 0x0100ca68: 0x100ca68: jal   0x100449c addiu a0, zero, 1
+// 0x0100ca78: 0x100ca78: jal   0x100449c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -871,10 +871,10 @@ L_100ca58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ca70: 0x100ca70: lui   a0, 0x0
+// 0x0100ca80: 0x100ca80: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100ca74: 0x100ca74: jal   0x101cd60 addiu a0, a0, 25044
+// 0x0100ca84: 0x100ca84: jal   0x101cd70 addiu a0, a0, 25044
 	ldloc.1
 	ldc.i4 25044
 	add
@@ -884,56 +884,56 @@ L_100ca58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ca7c: 0x100ca7c: jal   0x104c3d0 addu  a0, v0, zero
+// 0x0100ca8c: 0x100ca8c: jal   0x104c3e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0100ca84: 0x100ca84: jal   0x102146c sll   zero, zero, 0
+// 0x0100ca94: 0x100ca94: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ca8c: 0x100ca8c: bne   v0, zero, 0x100caa0 lui   a1, 0x1010000
+// 0x0100ca9c: 0x100ca9c: bne   v0, zero, 0x100cab0 lui   a1, 0x1010000
 	ldloc 5
 	ldc.i4 16842752
 	stloc.2
-	brtrue L_100caa0
+	brtrue L_100cab0
 // --- basic block ---
-// 0x0100ca94: 0x100ca94: jal   0x1021900 sll   zero, zero, 0
+// 0x0100caa4: 0x100caa4: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100ca9c: 0x100ca9c: lui   a1, 0x1010000
+// 0x0100caac: 0x100caac: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-L_100caa0:
-// 0x0100caa0: 0x100caa0: addiu a1, a1, -13636
+L_100cab0:
+// 0x0100cab0: 0x100cab0: addiu a1, a1, -13620
 	ldloc.2
-	ldc.i4 -13636
+	ldc.i4 -13620
 	add
 	stloc.2
-// 0x0100caa4: 0x100caa4: jal   0x104fe98 addiu a0, zero, 100
+// 0x0100cab4: 0x100cab4: jal   0x104fea8 addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
 	ldloc.0
@@ -941,15 +941,15 @@ L_100caa0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_100caac:
-// 0x0100caac: 0x100caac: lw    ra, 20(sp)
-// 0x0100cab0: 0x100cab0: sll   zero, zero, 0
-// 0x0100cab4: 0x100cab4: jr    ra addiu sp, sp, 24
+L_100cabc:
+// 0x0100cabc: 0x100cabc: lw    ra, 20(sp)
+// 0x0100cac0: 0x100cac0: sll   zero, zero, 0
+// 0x0100cac4: 0x100cac4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -961,7 +961,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 refresh_all_tiles_100cabc(int32,int32,int32,int32,int32)
+.method public static int32 refresh_all_tiles_100cacc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -1002,15 +1002,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100cabc: 0x100cabc: addiu sp, sp, -40
+// 0x0100cacc: 0x100cacc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100cac0: 0x100cac0: lui   v0, 0x0
+// 0x0100cad0: 0x100cad0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100cac4: 0x100cac4: sw    s0, 28(sp)
+// 0x0100cad4: 0x100cad4: sw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1019,10 +1019,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100cac8: 0x100cac8: lui   a0, 0x1010000
+// 0x0100cad8: 0x100cad8: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x0100cacc: 0x100cacc: lw    s0, 1816(v0)
+// 0x0100cadc: 0x100cadc: lw    s0, 1816(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1031,13 +1031,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100cad0: 0x100cad0: addiu a0, a0, -13636
+// 0x0100cae0: 0x100cae0: addiu a0, a0, -13620
 	ldloc.1
-	ldc.i4 -13636
+	ldc.i4 -13620
 	add
 	stloc.1
-// 0x0100cad4: 0x100cad4: sw    ra, 36(sp)
-// 0x0100cad8: 0x100cad8: jal   0x104fd00 sw    s1, 32(sp)
+// 0x0100cae4: 0x100cae4: sw    ra, 36(sp)
+// 0x0100cae8: 0x100cae8: jal   0x104fd10 sw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1051,55 +1051,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cae0: 0x100cae0: jal   0x105944c sll   zero, zero, 0
+// 0x0100caf0: 0x100caf0: jal   0x105945c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl66::navigate_main_stop_navigation_105944c(int32,int32,int32,int32,int32)
+	call int32 Cibyl66::navigate_main_stop_navigation_105945c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cae8: 0x100cae8: jal   0x1013734 addu  a0, s0, zero
+// 0x0100caf8: 0x100caf8: jal   0x1013744 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl14::roadmap_locator_close_1013734(int32,int32)
+	call int32 Cibyl14::roadmap_locator_close_1013744(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100caf0: 0x100caf0: jal   0x1052acc addu  a0, s0, zero
+// 0x0100cb00: 0x100cb00: jal   0x1052adc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-	call void Cibyl61::roadmap_tile_remove_all_1052acc()
+	call void Cibyl61::roadmap_tile_remove_all_1052adc()
 // --- basic block ---
-// 0x0100caf8: 0x100caf8: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+// 0x0100cb08: 0x100cb08: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cb00: 0x100cb00: jal   0x102146c sll   zero, zero, 0
+// 0x0100cb10: 0x100cb10: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cb08: 0x100cb08: jal   0x1013c44 addu  a0, s0, zero
+// 0x0100cb18: 0x100cb18: jal   0x1013c54 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1107,37 +1107,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cb10: 0x100cb10: beq   v0, zero, 0x100cb38 lui   v0, 0x20000
+// 0x0100cb20: 0x100cb20: beq   v0, zero, 0x100cb48 lui   v0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 5
-	brfalse L_100cb38
+	brfalse L_100cb48
 // --- basic block ---
-// 0x0100cb18: 0x100cb18: lui   a1, 0x0
+// 0x0100cb28: 0x100cb28: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100cb1c: 0x100cb1c: lui   a3, 0x0
+// 0x0100cb2c: 0x100cb2c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100cb20: 0x100cb20: addiu a1, a1, 24928
+// 0x0100cb30: 0x100cb30: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100cb24: 0x100cb24: addiu a3, a3, 25068
+// 0x0100cb34: 0x100cb34: addiu a3, a3, 25068
 	ldloc 4
 	ldc.i4 25068
 	add
 	stloc 4
-// 0x0100cb28: 0x100cb28: addiu a0, zero, 4
+// 0x0100cb38: 0x100cb38: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100cb2c: 0x100cb2c: jal   0x100449c addiu a2, zero, 650
+// 0x0100cb3c: 0x100cb3c: jal   0x100449c addiu a2, zero, 650
 	ldc.i4 650
 	stloc.3
 	ldloc.0
@@ -1150,42 +1150,42 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cb34: 0x100cb34: lui   v0, 0x20000
+// 0x0100cb44: 0x100cb44: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_100cb38:
-// 0x0100cb38: 0x100cb38: lui   a1, 0x0
+L_100cb48:
+// 0x0100cb48: 0x100cb48: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100cb3c: 0x100cb3c: lui   a0, 0x1010000
+// 0x0100cb4c: 0x100cb4c: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x0100cb40: 0x100cb40: lui   s1, 0x0
+// 0x0100cb50: 0x100cb50: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x0100cb44: 0x100cb44: addiu a1, a1, 25096
+// 0x0100cb54: 0x100cb54: addiu a1, a1, 25096
 	ldloc.2
 	ldc.i4 25096
 	add
 	stloc.2
-// 0x0100cb48: 0x100cb48: addiu a0, a0, -13404
+// 0x0100cb58: 0x100cb58: addiu a0, a0, -13388
 	ldloc.1
-	ldc.i4 -13404
+	ldc.i4 -13388
 	add
 	stloc.1
-// 0x0100cb4c: 0x100cb4c: sw    zero, 31260(v0)
+// 0x0100cb5c: 0x100cb5c: sw    zero, 31724(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100cb50: 0x100cb50: addiu v0, zero, -1
+// 0x0100cb60: 0x100cb60: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0100cb54: 0x100cb54: jal   0x100de8c sw    v0, 776(s1)
+// 0x0100cb64: 0x100cb64: jal   0x100de9c sw    v0, 776(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1199,18 +1199,18 @@ L_100cb38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_register_100de8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_register_100de9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cb5c: 0x100cb5c: addu  a0, s0, zero
+// 0x0100cb6c: 0x100cb6c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100cb60: 0x100cb60: addiu a1, zero, 256
+// 0x0100cb70: 0x100cb70: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0100cb64: 0x100cb64: jal   0x100acd0 addu  a2, zero, zero
+// 0x0100cb74: 0x100cb74: jal   0x100ace0 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1218,34 +1218,34 @@ L_100cb38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_refresh_100acd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_refresh_100ace0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cb6c: 0x100cb6c: lui   a1, 0x0
+// 0x0100cb7c: 0x100cb7c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100cb70: 0x100cb70: lui   a3, 0x0
+// 0x0100cb80: 0x100cb80: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100cb74: 0x100cb74: addiu a1, a1, 24928
+// 0x0100cb84: 0x100cb84: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100cb78: 0x100cb78: addiu a3, a3, 25108
+// 0x0100cb88: 0x100cb88: addiu a3, a3, 25108
 	ldloc 4
 	ldc.i4 25108
 	add
 	stloc 4
-// 0x0100cb7c: 0x100cb7c: addiu a0, zero, 3
+// 0x0100cb8c: 0x100cb8c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0100cb80: 0x100cb80: addiu a2, zero, 660
+// 0x0100cb90: 0x100cb90: addiu a2, zero, 660
 	ldc.i4 660
 	stloc.3
-// 0x0100cb84: 0x100cb84: sw    v0, 776(s1)
+// 0x0100cb94: 0x100cb94: sw    v0, 776(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1254,7 +1254,7 @@ L_100cb38:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100cb88: 0x100cb88: jal   0x100449c sw    v0, 16(sp)
+// 0x0100cb98: 0x100cb98: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1273,8 +1273,8 @@ L_100cb38:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100cb90: 0x100cb90: lw    ra, 36(sp)
-// 0x0100cb94: 0x100cb94: lw    s1, 32(sp)
+// 0x0100cba0: 0x100cba0: lw    ra, 36(sp)
+// 0x0100cba4: 0x100cba4: lw    s1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1283,7 +1283,7 @@ L_100cb38:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100cb98: 0x100cb98: lw    s0, 28(sp)
+// 0x0100cba8: 0x100cba8: lw    s0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1292,7 +1292,7 @@ L_100cb38:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100cb9c: 0x100cb9c: jr    ra addiu sp, sp, 40
+// 0x0100cbac: 0x100cbac: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1304,7 +1304,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 tile_load_progress_warn_100cba4(int32,int32,int32,int32,int32)
+.method public static int32 tile_load_progress_warn_100cbb4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 lo,int32 ra)
@@ -1348,10 +1348,10 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100cba4: 0x100cba4: lui   v0, 0x0
+// 0x0100cbb4: 0x100cbb4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100cba8: 0x100cba8: lw    v0, 776(v0)
+// 0x0100cbb8: 0x100cbb8: lw    v0, 776(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1360,12 +1360,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100cbac: 0x100cbac: addiu sp, sp, -40
+// 0x0100cbbc: 0x100cbbc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100cbb0: 0x100cbb0: sw    s1, 32(sp)
+// 0x0100cbc0: 0x100cbc0: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1374,8 +1374,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100cbb4: 0x100cbb4: sw    ra, 36(sp)
-// 0x0100cbb8: 0x100cbb8: sw    s0, 28(sp)
+// 0x0100cbc4: 0x100cbc4: sw    ra, 36(sp)
+// 0x0100cbc8: 0x100cbc8: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1384,50 +1384,50 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100cbbc: 0x100cbbc: blez  v0, 0x100cc18 addu  s1, a0, zero
+// 0x0100cbcc: 0x100cbcc: blez  v0, 0x100cc28 addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 9
 	ldc.i4.s 0
-	ble L_100cc18
+	ble L_100cc28
 // --- basic block ---
-// 0x0100cbc4: 0x100cbc4: lui   v1, 0x20000
+// 0x0100cbd4: 0x100cbd4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100cbc8: 0x100cbc8: lw    s0, 31260(v1)
+// 0x0100cbd8: 0x100cbd8: lw    s0, 31724(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100cbcc: 0x100cbcc: addiu v1, zero, 100
+// 0x0100cbdc: 0x100cbdc: addiu v1, zero, 100
 	ldc.i4.s 100
 	stloc 8
-// 0x0100cbd0: 0x100cbd0: mult  s0, v1
+// 0x0100cbe0: 0x100cbe0: mult  s0, v1
 	ldloc 7
 	ldloc 8
 	mul
 	stloc 10
-// 0x0100cbd4: 0x100cbd4: lui   a0, 0x0
+// 0x0100cbe4: 0x100cbe4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100cbd8: 0x100cbd8: mflo  lo
+// 0x0100cbe8: 0x100cbe8: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x0100cbdc: 0x100cbdc: sll   zero, zero, 0
-// 0x0100cbe0: 0x100cbe0: sll   zero, zero, 0
-// 0x0100cbe4: 0x100cbe4: div   s0, v0
+// 0x0100cbec: 0x100cbec: sll   zero, zero, 0
+// 0x0100cbf0: 0x100cbf0: sll   zero, zero, 0
+// 0x0100cbf4: 0x100cbf4: div   s0, v0
 	ldloc 7
 	ldloc 5
 	div
 	stloc 10
-// 0x0100cbe8: 0x100cbe8: mflo  lo
+// 0x0100cbf8: 0x100cbf8: mflo  lo
 	ldloc 10
 	stloc 7
-// 0x0100cbec: 0x100cbec: jal   0x101cd60 addiu a0, a0, 25136
+// 0x0100cbfc: 0x100cbfc: jal   0x101cd70 addiu a0, a0, 25136
 	ldloc.1
 	ldc.i4 25136
 	add
@@ -1437,29 +1437,29 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100cbf4: 0x100cbf4: lui   a2, 0x0
+// 0x0100cc04: 0x100cc04: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100cbf8: 0x100cbf8: addu  a0, s1, zero
+// 0x0100cc08: 0x100cc08: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100cbfc: 0x100cbfc: addiu a2, a2, 25160
+// 0x0100cc0c: 0x100cc0c: addiu a2, a2, 25160
 	ldloc.3
 	ldc.i4 25160
 	add
 	stloc.3
-// 0x0100cc00: 0x100cc00: addu  a3, v0, zero
+// 0x0100cc10: 0x100cc10: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0100cc04: 0x100cc04: addiu a1, zero, 128
+// 0x0100cc14: 0x100cc14: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0100cc08: 0x100cc08: jal   0x1000f9c sw    s0, 16(sp)
+// 0x0100cc18: 0x100cc18: jal   0x1000f9c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1478,35 +1478,35 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100cc10: 0x100cc10: j	 0x100cc28 addiu v0, zero, 1
+// 0x0100cc20: 0x100cc20: j	 0x100cc38 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_100cc28
+	br L_100cc38
 // --- basic block ---
-L_100cc18:
-// 0x0100cc18: 0x100cc18: lui   a0, 0x1010000
+L_100cc28:
+// 0x0100cc28: 0x100cc28: lui   a0, 0x1010000
 	ldc.i4 16842752
 	stloc.1
-// 0x0100cc1c: 0x100cc1c: jal   0x100dc38 addiu a0, a0, -13404
+// 0x0100cc2c: 0x100cc2c: jal   0x100dc48 addiu a0, a0, -13388
 	ldloc.1
-	ldc.i4 -13404
+	ldc.i4 -13388
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_warning_unregister_100dc38(int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_warning_unregister_100dc48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100cc24: 0x100cc24: addu  v0, zero, zero
+// 0x0100cc34: 0x100cc34: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_100cc28:
-// 0x0100cc28: 0x100cc28: lw    ra, 36(sp)
-// 0x0100cc2c: 0x100cc2c: lw    s1, 32(sp)
+L_100cc38:
+// 0x0100cc38: 0x100cc38: lw    ra, 36(sp)
+// 0x0100cc3c: 0x100cc3c: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1515,7 +1515,7 @@ L_100cc28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100cc30: 0x100cc30: lw    s0, 28(sp)
+// 0x0100cc40: 0x100cc40: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1524,7 +1524,7 @@ L_100cc28:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100cc34: 0x100cc34: jr    ra addiu sp, sp, 40
+// 0x0100cc44: 0x100cc44: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1536,7 +1536,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 init_loading_session_100cc3c(int32,int32,int32,int32,int32)
+.method public static int32 init_loading_session_100cc4c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 s4,int32 v1,int32 s0,int32 s1,int32 s3,int32 ra)
@@ -1586,15 +1586,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100cc3c: 0x100cc3c: addiu sp, sp, -40
+// 0x0100cc4c: 0x100cc4c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100cc40: 0x100cc40: lui   v0, 0x20000
+// 0x0100cc50: 0x100cc50: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100cc44: 0x100cc44: sw    s2, 24(sp)
+// 0x0100cc54: 0x100cc54: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1603,17 +1603,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100cc48: 0x100cc48: lw    s2, 31268(v0)
+// 0x0100cc58: 0x100cc58: lw    s2, 31732(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7817
+	ldc.i4 7933
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100cc4c: 0x100cc4c: sw    ra, 36(sp)
-// 0x0100cc50: 0x100cc50: sw    s4, 32(sp)
+// 0x0100cc5c: 0x100cc5c: sw    ra, 36(sp)
+// 0x0100cc60: 0x100cc60: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1622,7 +1622,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100cc54: 0x100cc54: sw    s3, 28(sp)
+// 0x0100cc64: 0x100cc64: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1631,7 +1631,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100cc58: 0x100cc58: sw    s1, 20(sp)
+// 0x0100cc68: 0x100cc68: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1640,7 +1640,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100cc5c: 0x100cc5c: bne   s2, zero, 0x100ccf4 sw    s0, 16(sp)
+// 0x0100cc6c: 0x100cc6c: bne   s2, zero, 0x100cd04 sw    s0, 16(sp)
 	ldloc 7
 	ldloc 6
 	ldloc.0
@@ -1650,53 +1650,53 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-	brtrue L_100ccf4
+	brtrue L_100cd04
 // --- basic block ---
-// 0x0100cc64: 0x100cc64: addiu s1, zero, 1
+// 0x0100cc74: 0x100cc74: addiu s1, zero, 1
 	ldc.i4.1
 	stloc 11
-// 0x0100cc68: 0x100cc68: sw    s1, 31268(v0)
+// 0x0100cc78: 0x100cc78: sw    s1, 31732(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7817
+	ldc.i4 7933
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100cc6c: 0x100cc6c: cibyl_sysc_arg 0x12
+// 0x0100cc7c: 0x100cc7c: cibyl_sysc_arg 0x12
 	ldloc 7
-// 0x0100cc70: 0x100cc70: cibyl_sysc 0x284
+// 0x0100cc80: 0x100cc80: cibyl_sysc 0x284
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0100cc74: 0x100cc74: addu  s2, v0, zero
+// 0x0100cc84: 0x100cc84: addu  s2, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0100cc78: 0x100cc78: lui   s0, 0x0
+// 0x0100cc88: 0x100cc88: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0100cc7c: 0x100cc7c: lui   a0, 0x10000
+// 0x0100cc8c: 0x100cc8c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0100cc80: 0x100cc80: lui   a2, 0x10000
+// 0x0100cc90: 0x100cc90: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0100cc84: 0x100cc84: addiu a0, a0, 18248
+// 0x0100cc94: 0x100cc94: addiu a0, a0, 19712
 	ldloc.1
-	ldc.i4 18248
+	ldc.i4 19712
 	add
 	stloc.1
-// 0x0100cc88: 0x100cc88: addiu a2, a2, -48
+// 0x0100cc98: 0x100cc98: addiu a2, a2, -52
 	ldloc.3
-	ldc.i4.s -48
+	ldc.i4.s -52
 	add
 	stloc.3
-// 0x0100cc8c: 0x100cc8c: addiu a1, s0, 780
+// 0x0100cc9c: 0x100cc9c: addiu a1, s0, 780
 	ldloc 10
 	ldc.i4 780
 	add
 	stloc.2
-// 0x0100cc90: 0x100cc90: jal   0x100edb0 addu  a3, zero, zero
+// 0x0100cca0: 0x100cca0: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1704,36 +1704,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100cc98: 0x100cc98: lui   s3, 0x0
+// 0x0100cca8: 0x100cca8: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x0100cc9c: 0x100cc9c: lui   a2, 0x0
+// 0x0100ccac: 0x100ccac: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100cca0: 0x100cca0: lui   a0, 0x10000
+// 0x0100ccb0: 0x100ccb0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0100cca4: 0x100cca4: addiu a2, a2, 25172
+// 0x0100ccb4: 0x100ccb4: addiu a2, a2, 25172
 	ldloc.3
 	ldc.i4 25172
 	add
 	stloc.3
-// 0x0100cca8: 0x100cca8: addiu a1, s3, 796
+// 0x0100ccb8: 0x100ccb8: addiu a1, s3, 796
 	ldloc 12
 	ldc.i4 796
 	add
 	stloc.2
-// 0x0100ccac: 0x100ccac: addu  a3, zero, zero
+// 0x0100ccbc: 0x100ccbc: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0100ccb0: 0x100ccb0: jal   0x100edb0 addiu a0, a0, 12560
+// 0x0100ccc0: 0x100ccc0: jal   0x100edc0 addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
 	ldloc.0
@@ -1741,12 +1741,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100ccb8: 0x100ccb8: jal   0x100e788 addiu a0, s0, 780
+// 0x0100ccc8: 0x100ccc8: jal   0x100e798 addiu a0, s0, 780
 	ldloc 10
 	ldc.i4 780
 	add
@@ -1756,17 +1756,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100ccc0: 0x100ccc0: addiu a0, s3, 796
+// 0x0100ccd0: 0x100ccd0: addiu a0, s3, 796
 	ldloc 12
 	ldc.i4 796
 	add
 	stloc.1
-// 0x0100ccc4: 0x100ccc4: jal   0x100e788 addu  s4, v0, zero
+// 0x0100ccd4: 0x100ccd4: jal   0x100e798 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -1774,41 +1774,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100cccc: 0x100cccc: addu  s4, v0, s4
+// 0x0100ccdc: 0x100ccdc: addu  s4, v0, s4
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0100ccd0: 0x100ccd0: slt   s4, s4, s2
+// 0x0100cce0: 0x100cce0: slt   s4, s4, s2
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 8
-// 0x0100ccd4: 0x100ccd4: beq   s4, zero, 0x100ccf4 lui   v0, 0x20000
+// 0x0100cce4: 0x100cce4: beq   s4, zero, 0x100cd04 lui   v0, 0x20000
 	ldloc 8
 	ldc.i4 131072
 	stloc 5
-	brfalse L_100ccf4
+	brfalse L_100cd04
 // --- basic block ---
-// 0x0100ccdc: 0x100ccdc: addiu a0, s0, 780
+// 0x0100ccec: 0x100ccec: addiu a0, s0, 780
 	ldloc 10
 	ldc.i4 780
 	add
 	stloc.1
-// 0x0100cce0: 0x100cce0: addu  a1, s2, zero
+// 0x0100ccf0: 0x100ccf0: addu  a1, s2, zero
 	ldloc 7
 	stloc.2
-// 0x0100cce4: 0x100cce4: jal   0x100e610 sw    s1, 31264(v0)
+// 0x0100ccf4: 0x100ccf4: jal   0x100e620 sw    s1, 31728(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7816
+	ldc.i4 7932
 	add
 	ldloc 11
 	stelem.i4
@@ -1817,12 +1817,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_integer_100e610(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_integer_100e620(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x0100ccec: 0x100ccec: jal   0x100ea50 addu  a0, zero, zero
+// 0x0100ccfc: 0x100ccfc: jal   0x100ea60 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1830,14 +1830,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_save_100ea50(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_save_100ea60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_100ccf4:
-// 0x0100ccf4: 0x100ccf4: lw    ra, 36(sp)
-// 0x0100ccf8: 0x100ccf8: lw    s4, 32(sp)
+L_100cd04:
+// 0x0100cd04: 0x100cd04: lw    ra, 36(sp)
+// 0x0100cd08: 0x100cd08: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1846,7 +1846,7 @@ L_100ccf4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100ccfc: 0x100ccfc: lw    s3, 28(sp)
+// 0x0100cd0c: 0x100cd0c: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1855,7 +1855,7 @@ L_100ccf4:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100cd00: 0x100cd00: lw    s2, 24(sp)
+// 0x0100cd10: 0x100cd10: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1864,7 +1864,7 @@ L_100ccf4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100cd04: 0x100cd04: lw    s1, 20(sp)
+// 0x0100cd14: 0x100cd14: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1873,7 +1873,7 @@ L_100ccf4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100cd08: 0x100cd08: lw    s0, 16(sp)
+// 0x0100cd18: 0x100cd18: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1882,7 +1882,7 @@ L_100ccf4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100cd0c: 0x100cd0c: jr    ra addiu sp, sp, 40
+// 0x0100cd1c: 0x100cd1c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1894,7 +1894,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 queue_tile_100cd5c(int32,int32,int32,int32,int32)
+.method public static int32 queue_tile_100cd6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 s3,int32 lo,int32 hi,int32 s4,int32 t2,int32 t3,int32 s5,int32 t0,int32 s0,int32 s6,int32 t1,int32 s1,int32 s2,int32 ra,int32 t4)
@@ -1971,12 +1971,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100cd5c: 0x100cd5c: addiu sp, sp, -72
+// 0x0100cd6c: 0x100cd6c: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x0100cd60: 0x100cd60: sw    s2, 48(sp)
+// 0x0100cd70: 0x100cd70: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1985,7 +1985,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0100cd64: 0x100cd64: sw    s1, 44(sp)
+// 0x0100cd74: 0x100cd74: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1994,7 +1994,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0100cd68: 0x100cd68: sw    s0, 40(sp)
+// 0x0100cd78: 0x100cd78: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2003,8 +2003,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100cd6c: 0x100cd6c: sw    ra, 68(sp)
-// 0x0100cd70: 0x100cd70: sw    s6, 64(sp)
+// 0x0100cd7c: 0x100cd7c: sw    ra, 68(sp)
+// 0x0100cd80: 0x100cd80: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2013,7 +2013,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0100cd74: 0x100cd74: sw    s5, 60(sp)
+// 0x0100cd84: 0x100cd84: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2022,7 +2022,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100cd78: 0x100cd78: sw    s4, 56(sp)
+// 0x0100cd88: 0x100cd88: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2031,7 +2031,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100cd7c: 0x100cd7c: sw    s3, 52(sp)
+// 0x0100cd8c: 0x100cd8c: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2040,42 +2040,42 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100cd80: 0x100cd80: addu  s0, a1, zero
+// 0x0100cd90: 0x100cd90: addu  s0, a1, zero
 	ldloc.2
 	stloc 16
-// 0x0100cd84: 0x100cd84: addu  s1, a0, zero
+// 0x0100cd94: 0x100cd94: addu  s1, a0, zero
 	ldloc.1
 	stloc 19
-// 0x0100cd88: 0x100cd88: addu  s2, a2, zero
+// 0x0100cd98: 0x100cd98: addu  s2, a2, zero
 	ldloc.3
 	stloc 20
-// 0x0100cd8c: 0x100cd8c: beq   a1, zero, 0x100cf44 lui   v1, 0x20000
+// 0x0100cd9c: 0x100cd9c: beq   a1, zero, 0x100cf54 lui   v1, 0x20000
 	ldloc.2
 	ldc.i4 131072
 	stloc 6
-	brfalse L_100cf44
+	brfalse L_100cf54
 // --- basic block ---
-// 0x0100cd94: 0x100cd94: lui   s6, 0x20000
+// 0x0100cda4: 0x100cda4: lui   s6, 0x20000
 	ldc.i4 131072
 	stloc 17
-// 0x0100cd98: 0x100cd98: lw    s3, 31284(s6)
+// 0x0100cda8: 0x100cda8: lw    s3, 31748(s6)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100cd9c: 0x100cd9c: addiu a0, zero, 256
+// 0x0100cdac: 0x100cdac: addiu a0, zero, 256
 	ldc.i4 256
 	stloc.1
-// 0x0100cda0: 0x100cda0: addiu s3, s3, 255
+// 0x0100cdb0: 0x100cdb0: addiu s3, s3, 255
 	ldloc 8
 	ldc.i4 255
 	add
 	stloc 8
-// 0x0100cda4: 0x100cda4: div   s3, a0
+// 0x0100cdb4: 0x100cdb4: div   s3, a0
 	ldloc 8
 	ldloc.1
 	ldloc 8
@@ -2084,56 +2084,56 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	rem
 	stloc 10
-// 0x0100cda8: 0x100cda8: lw    v0, 31288(v1)
+// 0x0100cdb8: 0x100cdb8: lw    v0, 31752(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100cdac: 0x100cdac: mfhi  hi
+// 0x0100cdbc: 0x100cdbc: mfhi  hi
 	ldloc 10
 	stloc 8
-// 0x0100cdb0: 0x100cdb0: bne   v0, a0, 0x100ce90 sw    s3, 31284(s6)
+// 0x0100cdc0: 0x100cdc0: bne   v0, a0, 0x100cea0 sw    s3, 31748(s6)
 	ldloc 7
 	ldloc.1
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldloc 8
 	stelem.i4
-	bne.un L_100ce90
+	bne.un L_100cea0
 // --- basic block ---
-// 0x0100cdb8: 0x100cdb8: addiu s5, zero, 12
+// 0x0100cdc8: 0x100cdc8: addiu s5, zero, 12
 	ldc.i4.s 12
 	stloc 14
-// 0x0100cdbc: 0x100cdbc: mult  s3, s5
+// 0x0100cdcc: 0x100cdcc: mult  s3, s5
 	ldloc 8
 	ldloc 14
 	mul
 	stloc 9
-// 0x0100cdc0: 0x100cdc0: lui   s4, 0x20000
+// 0x0100cdd0: 0x100cdd0: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x0100cdc4: 0x100cdc4: addiu s4, s4, 31300
+// 0x0100cdd4: 0x100cdd4: addiu s4, s4, 31764
 	ldloc 11
-	ldc.i4 31300
+	ldc.i4 31764
 	add
 	stloc 11
-// 0x0100cdc8: 0x100cdc8: mflo  lo
+// 0x0100cdd8: 0x100cdd8: mflo  lo
 	ldloc 9
 	stloc 6
-// 0x0100cdcc: 0x100cdcc: addu  v1, s4, v1
+// 0x0100cddc: 0x100cddc: addu  v1, s4, v1
 	ldloc 11
 	ldloc 6
 	add
 	stloc 6
-// 0x0100cdd0: 0x100cdd0: lw    a0, 4(v1)
+// 0x0100cde0: 0x100cde0: lw    a0, 4(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2142,41 +2142,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100cdd4: 0x100cdd4: sll   zero, zero, 0
-// 0x0100cdd8: 0x100cdd8: slt   a0, a1, a0
+// 0x0100cde4: 0x100cde4: sll   zero, zero, 0
+// 0x0100cde8: 0x100cde8: slt   a0, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.1
-// 0x0100cddc: 0x100cddc: beq   a0, zero, 0x100cdfc lui   a1, 0x0
+// 0x0100cdec: 0x100cdec: beq   a0, zero, 0x100ce0c lui   a1, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_100cdfc
+	brfalse L_100ce0c
 // --- basic block ---
-// 0x0100cde4: 0x100cde4: lui   a3, 0x0
+// 0x0100cdf4: 0x100cdf4: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100cde8: 0x100cde8: addiu a1, a1, 24928
+// 0x0100cdf8: 0x100cdf8: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100cdec: 0x100cdec: addiu a3, a3, 25180
+// 0x0100cdfc: 0x100cdfc: addiu a3, a3, 25180
 	ldloc 4
 	ldc.i4 25180
 	add
 	stloc 4
-// 0x0100cdf0: 0x100cdf0: addiu a0, zero, 3
+// 0x0100ce00: 0x100ce00: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0100cdf4: 0x100cdf4: j	 0x100cf70 addiu a2, zero, 483
+// 0x0100ce04: 0x100ce04: j	 0x100cf80 addiu a2, zero, 483
 	ldc.i4 483
 	stloc.3
-	br L_100cf70
+	br L_100cf80
 // --- basic block ---
-L_100cdfc:
-// 0x0100cdfc: 0x100cdfc: lw    v1, 8(v1)
+L_100ce0c:
+// 0x0100ce0c: 0x100ce0c: lw    v1, 8(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2185,16 +2185,16 @@ L_100cdfc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ce00: 0x100ce00: sll   zero, zero, 0
-// 0x0100ce04: 0x100ce04: beq   v1, zero, 0x100ce7c addiu s3, s3, 255
+// 0x0100ce10: 0x100ce10: sll   zero, zero, 0
+// 0x0100ce14: 0x100ce14: beq   v1, zero, 0x100ce8c addiu s3, s3, 255
 	ldloc 6
 	ldloc 8
 	ldc.i4 255
 	add
 	stloc 8
-	brfalse L_100ce7c
+	brfalse L_100ce8c
 // --- basic block ---
-// 0x0100ce0c: 0x100ce0c: div   s3, v0
+// 0x0100ce1c: 0x100ce1c: div   s3, v0
 	ldloc 8
 	ldloc 7
 	ldloc 8
@@ -2203,103 +2203,103 @@ L_100cdfc:
 	stloc 9
 	rem
 	stloc 10
-// 0x0100ce10: 0x100ce10: mfhi  hi
+// 0x0100ce20: 0x100ce20: mfhi  hi
 	ldloc 10
 	stloc 8
-// 0x0100ce14: 0x100ce14: sll   zero, zero, 0
-// 0x0100ce18: 0x100ce18: sll   zero, zero, 0
-// 0x0100ce1c: 0x100ce1c: mult  s3, s5
+// 0x0100ce24: 0x100ce24: sll   zero, zero, 0
+// 0x0100ce28: 0x100ce28: sll   zero, zero, 0
+// 0x0100ce2c: 0x100ce2c: mult  s3, s5
 	ldloc 8
 	ldloc 14
 	mul
 	stloc 9
-// 0x0100ce20: 0x100ce20: mflo  lo
+// 0x0100ce30: 0x100ce30: mflo  lo
 	ldloc 9
 	stloc 8
-// 0x0100ce24: 0x100ce24: addu  s3, s3, s4
+// 0x0100ce34: 0x100ce34: addu  s3, s3, s4
 	ldloc 8
 	ldloc 11
 	add
 	stloc 8
-// 0x0100ce28: 0x100ce28: lw    a0, 0(s3)
+// 0x0100ce38: 0x100ce38: lw    a0, 0(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100ce2c: 0x100ce2c: jal   0x100db90 sll   zero, zero, 0
+// 0x0100ce3c: 0x100ce3c: jal   0x100dba0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0100ce34: 0x100ce34: lw    a0, 0(v0)
+// 0x0100ce44: 0x100ce44: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100ce38: 0x100ce38: addiu v1, zero, -65
+// 0x0100ce48: 0x100ce48: addiu v1, zero, -65
 	ldc.i4.s -65
 	stloc 6
-// 0x0100ce3c: 0x100ce3c: and   v1, a0, v1
+// 0x0100ce4c: 0x100ce4c: and   v1, a0, v1
 	ldloc.1
 	ldloc 6
 	and
 	stloc 6
-// 0x0100ce40: 0x100ce40: sw    v1, 0(v0)
+// 0x0100ce50: 0x100ce50: sw    v1, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100ce44: 0x100ce44: lw    v0, 31284(s6)
+// 0x0100ce54: 0x100ce54: lw    v0, 31748(s6)
 	ldloc 5
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ce48: 0x100ce48: sll   zero, zero, 0
-// 0x0100ce4c: 0x100ce4c: mult  v0, s5
+// 0x0100ce58: 0x100ce58: sll   zero, zero, 0
+// 0x0100ce5c: 0x100ce5c: mult  v0, s5
 	ldloc 7
 	ldloc 14
 	mul
 	stloc 9
-// 0x0100ce50: 0x100ce50: mflo  lo
+// 0x0100ce60: 0x100ce60: mflo  lo
 	ldloc 9
 	stloc 14
-// 0x0100ce54: 0x100ce54: addu  s4, s5, s4
+// 0x0100ce64: 0x100ce64: addu  s4, s5, s4
 	ldloc 14
 	ldloc 11
 	add
 	stloc 11
-// 0x0100ce58: 0x100ce58: lw    v0, 0(s4)
+// 0x0100ce68: 0x100ce68: lw    v0, 0(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100ce5c: 0x100ce5c: sll   zero, zero, 0
-// 0x0100ce60: 0x100ce60: sw    v0, 0(s3)
+// 0x0100ce6c: 0x100ce6c: sll   zero, zero, 0
+// 0x0100ce70: 0x100ce70: sw    v0, 0(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0100ce64: 0x100ce64: lw    v0, 4(s4)
+// 0x0100ce74: 0x100ce74: lw    v0, 4(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -2308,8 +2308,8 @@ L_100cdfc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ce68: 0x100ce68: sll   zero, zero, 0
-// 0x0100ce6c: 0x100ce6c: sw    v0, 4(s3)
+// 0x0100ce78: 0x100ce78: sll   zero, zero, 0
+// 0x0100ce7c: 0x100ce7c: sw    v0, 4(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2318,7 +2318,7 @@ L_100cdfc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100ce70: 0x100ce70: lw    v0, 8(s4)
+// 0x0100ce80: 0x100ce80: lw    v0, 8(s4)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -2327,8 +2327,8 @@ L_100cdfc:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100ce74: 0x100ce74: sll   zero, zero, 0
-// 0x0100ce78: 0x100ce78: sw    v0, 8(s3)
+// 0x0100ce84: 0x100ce84: sll   zero, zero, 0
+// 0x0100ce88: 0x100ce88: sw    v0, 8(s3)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -2337,83 +2337,83 @@ L_100cdfc:
 	add
 	ldloc 7
 	stelem.i4
-L_100ce7c:
-// 0x0100ce7c: 0x100ce7c: lui   v0, 0x20000
+L_100ce8c:
+// 0x0100ce8c: 0x100ce8c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0100ce80: 0x100ce80: lw    v1, 31288(v0)
+// 0x0100ce90: 0x100ce90: lw    v1, 31752(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100ce84: 0x100ce84: sll   zero, zero, 0
-// 0x0100ce88: 0x100ce88: addiu v1, v1, -1
+// 0x0100ce94: 0x100ce94: sll   zero, zero, 0
+// 0x0100ce98: 0x100ce98: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-// 0x0100ce8c: 0x100ce8c: sw    v1, 31288(v0)
+// 0x0100ce9c: 0x100ce9c: sw    v1, 31752(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldloc 6
 	stelem.i4
-L_100ce90:
-// 0x0100ce90: 0x100ce90: lui   v0, 0x20000
+L_100cea0:
+// 0x0100cea0: 0x100cea0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0100ce94: 0x100ce94: lw    t0, 31284(v0)
+// 0x0100cea4: 0x100cea4: lw    t0, 31748(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100ce98: 0x100ce98: lui   t1, 0x20000
+// 0x0100cea8: 0x100cea8: lui   t1, 0x20000
 	ldc.i4 131072
 	stloc 18
-// 0x0100ce9c: 0x100ce9c: lui   v0, 0x20000
+// 0x0100ceac: 0x100ceac: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0100cea0: 0x100cea0: lw    a1, 31288(v0)
+// 0x0100ceb0: 0x100ceb0: lw    a1, 31752(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100cea4: 0x100cea4: addiu t1, t1, 31300
+// 0x0100ceb4: 0x100ceb4: addiu t1, t1, 31764
 	ldloc 18
-	ldc.i4 31300
+	ldc.i4 31764
 	add
 	stloc 18
-// 0x0100cea8: 0x100cea8: addu  v0, t0, zero
+// 0x0100ceb8: 0x100ceb8: addu  v0, t0, zero
 	ldloc 15
 	stloc 7
-// 0x0100ceac: 0x100ceac: addiu v1, zero, 1
+// 0x0100cebc: 0x100cebc: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0100ceb0: 0x100ceb0: addiu a3, zero, 256
+// 0x0100cec0: 0x100cec0: addiu a3, zero, 256
 	ldc.i4 256
 	stloc 4
-// 0x0100ceb4: 0x100ceb4: j	 0x100cf1c addiu a2, zero, 12
+// 0x0100cec4: 0x100cec4: j	 0x100cf2c addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-	br L_100cf1c
+	br L_100cf2c
 // --- basic block ---
-L_100cebc:
-// 0x0100cebc: 0x100cebc: div   t2, a3
+L_100cecc:
+// 0x0100cecc: 0x100cecc: div   t2, a3
 	ldloc 12
 	ldloc 4
 	ldloc 12
@@ -2422,25 +2422,25 @@ L_100cebc:
 	stloc 9
 	rem
 	stloc 10
-// 0x0100cec0: 0x100cec0: mfhi  hi
+// 0x0100ced0: 0x100ced0: mfhi  hi
 	ldloc 10
 	stloc 12
-// 0x0100cec4: 0x100cec4: sll   zero, zero, 0
-// 0x0100cec8: 0x100cec8: sll   zero, zero, 0
-// 0x0100cecc: 0x100cecc: mult  t2, a2
+// 0x0100ced4: 0x100ced4: sll   zero, zero, 0
+// 0x0100ced8: 0x100ced8: sll   zero, zero, 0
+// 0x0100cedc: 0x100cedc: mult  t2, a2
 	ldloc 12
 	ldloc.3
 	mul
 	stloc 9
-// 0x0100ced0: 0x100ced0: mflo  lo
+// 0x0100cee0: 0x100cee0: mflo  lo
 	ldloc 9
 	stloc.1
-// 0x0100ced4: 0x100ced4: addu  a0, t1, a0
+// 0x0100cee4: 0x100cee4: addu  a0, t1, a0
 	ldloc 18
 	ldloc.1
 	add
 	stloc.1
-// 0x0100ced8: 0x100ced8: lw    t3, 4(a0)
+// 0x0100cee8: 0x100cee8: lw    t3, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2449,51 +2449,51 @@ L_100cebc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100cedc: 0x100cedc: sll   zero, zero, 0
-// 0x0100cee0: 0x100cee0: slt   t3, s0, t3
+// 0x0100ceec: 0x100ceec: sll   zero, zero, 0
+// 0x0100cef0: 0x100cef0: slt   t3, s0, t3
 	ldloc 16
 	ldloc 13
 	clt
 	stloc 13
-// 0x0100cee4: 0x100cee4: beq   t3, zero, 0x100cf28 addiu v1, v1, 1
+// 0x0100cef4: 0x100cef4: beq   t3, zero, 0x100cf38 addiu v1, v1, 1
 	ldloc 13
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_100cf28
+	brfalse L_100cf38
 // --- basic block ---
-// 0x0100ceec: 0x100ceec: mult  v0, a2
+// 0x0100cefc: 0x100cefc: mult  v0, a2
 	ldloc 7
 	ldloc.3
 	mul
 	stloc 9
-// 0x0100cef0: 0x100cef0: lw    t3, 0(a0)
+// 0x0100cf00: 0x100cf00: lw    t3, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0100cef4: 0x100cef4: addu  v0, t2, zero
+// 0x0100cf04: 0x100cf04: addu  v0, t2, zero
 	ldloc 12
 	stloc 7
-// 0x0100cef8: 0x100cef8: mflo  lo
+// 0x0100cf08: 0x100cf08: mflo  lo
 	ldloc 9
 	stloc 22
-// 0x0100cefc: 0x100cefc: addu  t2, t4, t1
+// 0x0100cf0c: 0x100cf0c: addu  t2, t4, t1
 	ldloc 22
 	ldloc 18
 	add
 	stloc 12
-// 0x0100cf00: 0x100cf00: sw    t3, 0(t2)
+// 0x0100cf10: 0x100cf10: sw    t3, 0(t2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-// 0x0100cf04: 0x100cf04: lw    t3, 4(a0)
+// 0x0100cf14: 0x100cf14: lw    t3, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2502,8 +2502,8 @@ L_100cebc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100cf08: 0x100cf08: sll   zero, zero, 0
-// 0x0100cf0c: 0x100cf0c: sw    t3, 4(t2)
+// 0x0100cf18: 0x100cf18: sll   zero, zero, 0
+// 0x0100cf1c: 0x100cf1c: sw    t3, 4(t2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2512,7 +2512,7 @@ L_100cebc:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100cf10: 0x100cf10: lw    a0, 8(a0)
+// 0x0100cf20: 0x100cf20: lw    a0, 8(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2521,8 +2521,8 @@ L_100cebc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100cf14: 0x100cf14: sll   zero, zero, 0
-// 0x0100cf18: 0x100cf18: sw    a0, 8(t2)
+// 0x0100cf24: 0x100cf24: sll   zero, zero, 0
+// 0x0100cf28: 0x100cf28: sw    a0, 8(t2)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
@@ -2531,97 +2531,97 @@ L_100cebc:
 	add
 	ldloc.1
 	stelem.i4
-L_100cf1c:
-// 0x0100cf1c: 0x100cf1c: slt   a0, a1, v1
+L_100cf2c:
+// 0x0100cf2c: 0x100cf2c: slt   a0, a1, v1
 	ldloc.2
 	ldloc 6
 	clt
 	stloc.1
-// 0x0100cf20: 0x100cf20: beq   a0, zero, 0x100cebc addu  t2, v1, t0
+// 0x0100cf30: 0x100cf30: beq   a0, zero, 0x100cecc addu  t2, v1, t0
 	ldloc.1
 	ldloc 6
 	ldloc 15
 	add
 	stloc 12
-	brfalse L_100cebc
+	brfalse L_100cecc
 // --- basic block ---
-L_100cf28:
-// 0x0100cf28: 0x100cf28: slti  v1, a1, 256
+L_100cf38:
+// 0x0100cf38: 0x100cf38: slti  v1, a1, 256
 	ldloc.2
 	ldc.i4 256
 	clt
 	stloc 6
-// 0x0100cf2c: 0x100cf2c: beq   v1, zero, 0x100cfa0 lui   v1, 0x20000
+// 0x0100cf3c: 0x100cf3c: beq   v1, zero, 0x100cfb0 lui   v1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_100cfa0
+	brfalse L_100cfb0
 // --- basic block ---
-// 0x0100cf34: 0x100cf34: addiu a1, a1, 1
+// 0x0100cf44: 0x100cf44: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x0100cf38: 0x100cf38: lui   v1, 0x20000
+// 0x0100cf48: 0x100cf48: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100cf3c: 0x100cf3c: j	 0x100cf9c sw    a1, 31288(v1)
+// 0x0100cf4c: 0x100cf4c: j	 0x100cfac sw    a1, 31752(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldloc.2
 	stelem.i4
-	br L_100cf9c
+	br L_100cfac
 // --- basic block ---
-L_100cf44:
-// 0x0100cf44: 0x100cf44: lw    a0, 31288(v1)
+L_100cf54:
+// 0x0100cf54: 0x100cf54: lw    a0, 31752(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100cf48: 0x100cf48: sll   zero, zero, 0
-// 0x0100cf4c: 0x100cf4c: slti  v0, a0, 256
+// 0x0100cf58: 0x100cf58: sll   zero, zero, 0
+// 0x0100cf5c: 0x100cf5c: slti  v0, a0, 256
 	ldloc.1
 	ldc.i4 256
 	clt
 	stloc 7
-// 0x0100cf50: 0x100cf50: bne   v0, zero, 0x100cf80 lui   v0, 0x20000
+// 0x0100cf60: 0x100cf60: bne   v0, zero, 0x100cf90 lui   v0, 0x20000
 	ldloc 7
 	ldc.i4 131072
 	stloc 7
-	brtrue L_100cf80
+	brtrue L_100cf90
 // --- basic block ---
-// 0x0100cf58: 0x100cf58: lui   a1, 0x0
+// 0x0100cf68: 0x100cf68: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100cf5c: 0x100cf5c: lui   a3, 0x0
+// 0x0100cf6c: 0x100cf6c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100cf60: 0x100cf60: addiu a1, a1, 24928
+// 0x0100cf70: 0x100cf70: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100cf64: 0x100cf64: addiu a3, a3, 25232
+// 0x0100cf74: 0x100cf74: addiu a3, a3, 25232
 	ldloc 4
 	ldc.i4 25232
 	add
 	stloc 4
-// 0x0100cf68: 0x100cf68: addiu a0, zero, 2
+// 0x0100cf78: 0x100cf78: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0100cf6c: 0x100cf6c: addiu a2, zero, 508
+// 0x0100cf7c: 0x100cf7c: addiu a2, zero, 508
 	ldc.i4 508
 	stloc.3
-L_100cf70:
-// 0x0100cf70: 0x100cf70: jal   0x100449c sll   zero, zero, 0
+L_100cf80:
+// 0x0100cf80: 0x100cf80: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2632,28 +2632,28 @@ L_100cf70:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x0100cf78: 0x100cf78: j	 0x100d014 sll   zero, zero, 0
-	br L_100d014
+// 0x0100cf88: 0x100cf88: j	 0x100d024 sll   zero, zero, 0
+	br L_100d024
 // --- basic block ---
-L_100cf80:
-// 0x0100cf80: 0x100cf80: lw    v0, 31284(v0)
+L_100cf90:
+// 0x0100cf90: 0x100cf90: lw    v0, 31748(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100cf84: 0x100cf84: addiu a1, zero, 256
+// 0x0100cf94: 0x100cf94: addiu a1, zero, 256
 	ldc.i4 256
 	stloc.2
-// 0x0100cf88: 0x100cf88: addu  v0, a0, v0
+// 0x0100cf98: 0x100cf98: addu  v0, a0, v0
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0100cf8c: 0x100cf8c: div   v0, a1
+// 0x0100cf9c: 0x100cf9c: div   v0, a1
 	ldloc 7
 	ldloc.2
 	ldloc 7
@@ -2662,51 +2662,51 @@ L_100cf80:
 	stloc 9
 	rem
 	stloc 10
-// 0x0100cf90: 0x100cf90: addiu a0, a0, 1
+// 0x0100cfa0: 0x100cfa0: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0100cf94: 0x100cf94: sw    a0, 31288(v1)
+// 0x0100cfa4: 0x100cfa4: sw    a0, 31752(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100cf98: 0x100cf98: mfhi  hi
+// 0x0100cfa8: 0x100cfa8: mfhi  hi
 	ldloc 10
 	stloc 7
-L_100cf9c:
-// 0x0100cf9c: 0x100cf9c: lui   v1, 0x20000
+L_100cfac:
+// 0x0100cfac: 0x100cfac: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-L_100cfa0:
-// 0x0100cfa0: 0x100cfa0: lw    v1, 31284(v1)
+L_100cfb0:
+// 0x0100cfb0: 0x100cfb0: lw    v1, 31748(v1)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100cfa4: 0x100cfa4: addiu a0, zero, 256
+// 0x0100cfb4: 0x100cfb4: addiu a0, zero, 256
 	ldc.i4 256
 	stloc.1
-// 0x0100cfa8: 0x100cfa8: subu  v1, v0, v1
+// 0x0100cfb8: 0x100cfb8: subu  v1, v0, v1
 	ldloc 7
 	ldloc 6
 	sub
 	stloc 6
-// 0x0100cfac: 0x100cfac: addiu v1, v1, 257
+// 0x0100cfbc: 0x100cfbc: addiu v1, v1, 257
 	ldloc 6
 	ldc.i4 257
 	add
 	stloc 6
-// 0x0100cfb0: 0x100cfb0: div   v1, a0
+// 0x0100cfc0: 0x100cfc0: div   v1, a0
 	ldloc 6
 	ldloc.1
 	ldloc 6
@@ -2715,19 +2715,19 @@ L_100cfa0:
 	stloc 9
 	rem
 	stloc 10
-// 0x0100cfb4: 0x100cfb4: lui   a0, 0x20000
+// 0x0100cfc4: 0x100cfc4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0100cfb8: 0x100cfb8: lw    t0, 31276(a0)
+// 0x0100cfc8: 0x100cfc8: lw    t0, 31740(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldelem.i4
 	stloc 15
-// 0x0100cfbc: 0x100cfbc: sw    v0, 20(sp)
+// 0x0100cfcc: 0x100cfcc: sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2736,7 +2736,7 @@ L_100cfa0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100cfc0: 0x100cfc0: sw    t0, 32(sp)
+// 0x0100cfd0: 0x100cfd0: sw    t0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2745,16 +2745,16 @@ L_100cfa0:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0100cfc4: 0x100cfc4: addiu t0, zero, 12
+// 0x0100cfd4: 0x100cfd4: addiu t0, zero, 12
 	ldc.i4.s 12
 	stloc 15
-// 0x0100cfc8: 0x100cfc8: lui   a1, 0x0
+// 0x0100cfd8: 0x100cfd8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100cfcc: 0x100cfcc: lui   a3, 0x0
+// 0x0100cfdc: 0x100cfdc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100cfd0: 0x100cfd0: sw    s1, 16(sp)
+// 0x0100cfe0: 0x100cfe0: sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2763,7 +2763,7 @@ L_100cfa0:
 	add
 	ldloc 19
 	stelem.i4
-// 0x0100cfd4: 0x100cfd4: sw    s0, 28(sp)
+// 0x0100cfe4: 0x100cfe4: sw    s0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2772,26 +2772,26 @@ L_100cfa0:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100cfd8: 0x100cfd8: addiu a1, a1, 24928
+// 0x0100cfe8: 0x100cfe8: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100cfdc: 0x100cfdc: addiu a3, a3, 25260
+// 0x0100cfec: 0x100cfec: addiu a3, a3, 25260
 	ldloc 4
 	ldc.i4 25260
 	add
 	stloc 4
-// 0x0100cfe0: 0x100cfe0: addiu a0, zero, 1
+// 0x0100cff0: 0x100cff0: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100cfe4: 0x100cfe4: addiu a2, zero, 520
+// 0x0100cff4: 0x100cff4: addiu a2, zero, 520
 	ldc.i4 520
 	stloc.3
-// 0x0100cfe8: 0x100cfe8: mfhi  hi
+// 0x0100cff8: 0x100cff8: mfhi  hi
 	ldloc 10
 	stloc 6
-// 0x0100cfec: 0x100cfec: sw    v1, 24(sp)
+// 0x0100cffc: 0x100cffc: sw    v1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2800,28 +2800,28 @@ L_100cfa0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100cff0: 0x100cff0: lui   v1, 0x20000
+// 0x0100d000: 0x100d000: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100cff4: 0x100cff4: mult  v0, t0
+// 0x0100d004: 0x100d004: mult  v0, t0
 	ldloc 7
 	ldloc 15
 	mul
 	stloc 9
-// 0x0100cff8: 0x100cff8: addiu v1, v1, 31300
+// 0x0100d008: 0x100d008: addiu v1, v1, 31764
 	ldloc 6
-	ldc.i4 31300
+	ldc.i4 31764
 	add
 	stloc 6
-// 0x0100cffc: 0x100cffc: mflo  lo
+// 0x0100d00c: 0x100d00c: mflo  lo
 	ldloc 9
 	stloc 7
-// 0x0100d000: 0x100d000: addu  v0, v0, v1
+// 0x0100d010: 0x100d010: addu  v0, v0, v1
 	ldloc 7
 	ldloc 6
 	add
 	stloc 7
-// 0x0100d004: 0x100d004: sw    s2, 8(v0)
+// 0x0100d014: 0x100d014: sw    s2, 8(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2830,7 +2830,7 @@ L_100cfa0:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0100d008: 0x100d008: sw    s0, 4(v0)
+// 0x0100d018: 0x100d018: sw    s0, 4(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2839,7 +2839,7 @@ L_100cfa0:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100d00c: 0x100d00c: jal   0x100449c sw    s1, 0(v0)
+// 0x0100d01c: 0x100d01c: jal   0x100449c sw    s1, 0(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2856,9 +2856,9 @@ L_100cfa0:
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_100d014:
-// 0x0100d014: 0x100d014: lw    ra, 68(sp)
-// 0x0100d018: 0x100d018: lw    s6, 64(sp)
+L_100d024:
+// 0x0100d024: 0x100d024: lw    ra, 68(sp)
+// 0x0100d028: 0x100d028: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2867,7 +2867,7 @@ L_100d014:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0100d01c: 0x100d01c: lw    s5, 60(sp)
+// 0x0100d02c: 0x100d02c: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2876,7 +2876,7 @@ L_100d014:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100d020: 0x100d020: lw    s4, 56(sp)
+// 0x0100d030: 0x100d030: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2885,7 +2885,7 @@ L_100d014:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100d024: 0x100d024: lw    s3, 52(sp)
+// 0x0100d034: 0x100d034: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2894,7 +2894,7 @@ L_100d014:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d028: 0x100d028: lw    s2, 48(sp)
+// 0x0100d038: 0x100d038: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2903,7 +2903,7 @@ L_100d014:
 	add
 	ldelem.i4
 	stloc 20
-// 0x0100d02c: 0x100d02c: lw    s1, 44(sp)
+// 0x0100d03c: 0x100d03c: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2912,7 +2912,7 @@ L_100d014:
 	add
 	ldelem.i4
 	stloc 19
-// 0x0100d030: 0x100d030: lw    s0, 40(sp)
+// 0x0100d040: 0x100d040: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2921,7 +2921,7 @@ L_100d014:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100d034: 0x100d034: jr    ra addiu sp, sp, 72
+// 0x0100d044: 0x100d044: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -2933,7 +2933,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 http_cb_size_100d03c(int32,int32,int32,int32,int32)
+.method public static int32 http_cb_size_100d04c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 ra,int32 v1)
@@ -2974,26 +2974,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100d03c:
-// 0x0100d03c: 0x100d03c: lui   v0, 0x10000
+L_100d04c:
+// 0x0100d04c: 0x100d04c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 5
-// 0x0100d040: 0x100d040: ori   v0, v0, 34465
+// 0x0100d050: 0x100d050: ori   v0, v0, 34465
 	ldloc 5
 	ldc.i4 34465
 	or
 	stloc 5
-// 0x0100d044: 0x100d044: addiu sp, sp, -40
+// 0x0100d054: 0x100d054: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0100d048: 0x100d048: sltu  v0, a1, v0
+// 0x0100d058: 0x100d058: sltu  v0, a1, v0
 	ldloc.2
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x0100d04c: 0x100d04c: sw    s1, 32(sp)
+// 0x0100d05c: 0x100d05c: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3002,7 +3002,7 @@ L_100d03c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d050: 0x100d050: sw    s0, 28(sp)
+// 0x0100d060: 0x100d060: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3011,44 +3011,44 @@ L_100d03c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100d054: 0x100d054: sw    ra, 36(sp)
-// 0x0100d058: 0x100d058: addu  s0, a1, zero
+// 0x0100d064: 0x100d064: sw    ra, 36(sp)
+// 0x0100d068: 0x100d068: addu  s0, a1, zero
 	ldloc.2
 	stloc 7
-// 0x0100d05c: 0x100d05c: bne   v0, zero, 0x100d08c addu  s1, a0, zero
+// 0x0100d06c: 0x100d06c: bne   v0, zero, 0x100d09c addu  s1, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brtrue L_100d08c
+	brtrue L_100d09c
 // --- basic block ---
-// 0x0100d064: 0x100d064: lui   a1, 0x0
+// 0x0100d074: 0x100d074: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d068: 0x100d068: lui   a3, 0x0
+// 0x0100d078: 0x100d078: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d06c: 0x100d06c: addiu v0, a0, 12
+// 0x0100d07c: 0x100d07c: addiu v0, a0, 12
 	ldloc.1
 	ldc.i4.s 12
 	add
 	stloc 5
-// 0x0100d070: 0x100d070: addiu a1, a1, 24928
+// 0x0100d080: 0x100d080: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d074: 0x100d074: addiu a3, a3, 25328
+// 0x0100d084: 0x100d084: addiu a3, a3, 25328
 	ldloc 4
 	ldc.i4 25328
 	add
 	stloc 4
-// 0x0100d078: 0x100d078: addiu a0, zero, 4
+// 0x0100d088: 0x100d088: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100d07c: 0x100d07c: addiu a2, zero, 176
+// 0x0100d08c: 0x100d08c: addiu a2, zero, 176
 	ldc.i4 176
 	stloc.3
-// 0x0100d080: 0x100d080: sw    v0, 16(sp)
+// 0x0100d090: 0x100d090: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3057,7 +3057,7 @@ L_100d03c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100d084: 0x100d084: jal   0x100449c sw    s0, 20(sp)
+// 0x0100d094: 0x100d094: jal   0x100449c sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3076,8 +3076,8 @@ L_100d03c:
 	stloc 10
 	stloc 5
 // --- basic block ---
-L_100d08c:
-// 0x0100d08c: 0x100d08c: jal   0x1000910 addu  a0, s0, zero
+L_100d09c:
+// 0x0100d09c: 0x100d09c: jal   0x1000910 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -3090,8 +3090,8 @@ L_100d08c:
 	stloc 10
 	stloc 5
 // --- basic block ---
-// 0x0100d094: 0x100d094: lw    ra, 36(sp)
-// 0x0100d098: 0x100d098: sw    v0, 528(s1)
+// 0x0100d0a4: 0x100d0a4: lw    ra, 36(sp)
+// 0x0100d0a8: 0x100d0a8: sw    v0, 528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3100,7 +3100,7 @@ L_100d08c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100d09c: 0x100d09c: sw    zero, 532(s1)
+// 0x0100d0ac: 0x100d0ac: sw    zero, 532(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3109,10 +3109,10 @@ L_100d08c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d0a0: 0x100d0a0: addu  v0, s0, zero
+// 0x0100d0b0: 0x100d0b0: addu  v0, s0, zero
 	ldloc 7
 	stloc 5
-// 0x0100d0a4: 0x100d0a4: lw    s1, 32(sp)
+// 0x0100d0b4: 0x100d0b4: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3121,7 +3121,7 @@ L_100d08c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d0a8: 0x100d0a8: lw    s0, 28(sp)
+// 0x0100d0b8: 0x100d0b8: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3130,7 +3130,7 @@ L_100d08c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d0ac: 0x100d0ac: jr    ra addiu sp, sp, 40
+// 0x0100d0bc: 0x100d0bc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3142,7 +3142,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 http_cb_progress_100d0b4(int32,int32,int32,int32,int32)
+.method public static int32 http_cb_progress_100d0c4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
@@ -3183,13 +3183,13 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100d0b4:
-// 0x0100d0b4: 0x100d0b4: addiu sp, sp, -32
+L_100d0c4:
+// 0x0100d0c4: 0x100d0c4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100d0b8: 0x100d0b8: sw    s1, 24(sp)
+// 0x0100d0c8: 0x100d0c8: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3198,7 +3198,7 @@ L_100d0b4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100d0bc: 0x100d0bc: sw    s0, 20(sp)
+// 0x0100d0cc: 0x100d0cc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3207,17 +3207,17 @@ L_100d0b4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d0c0: 0x100d0c0: sw    ra, 28(sp)
-// 0x0100d0c4: 0x100d0c4: addu  s1, a2, zero
+// 0x0100d0d0: 0x100d0d0: sw    ra, 28(sp)
+// 0x0100d0d4: 0x100d0d4: addu  s1, a2, zero
 	ldloc.3
 	stloc 9
-// 0x0100d0c8: 0x100d0c8: beq   a2, zero, 0x100d0fc addu  s0, a0, zero
+// 0x0100d0d8: 0x100d0d8: beq   a2, zero, 0x100d10c addu  s0, a0, zero
 	ldloc.3
 	ldloc.1
 	stloc 8
-	brfalse L_100d0fc
+	brfalse L_100d10c
 // --- basic block ---
-// 0x0100d0d0: 0x100d0d0: lw    v0, 528(a0)
+// 0x0100d0e0: 0x100d0e0: lw    v0, 528(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3226,14 +3226,14 @@ L_100d0b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d0d4: 0x100d0d4: sll   zero, zero, 0
-// 0x0100d0d8: 0x100d0d8: beq   v0, zero, 0x100d100 addu  v1, zero, zero
+// 0x0100d0e4: 0x100d0e4: sll   zero, zero, 0
+// 0x0100d0e8: 0x100d0e8: beq   v0, zero, 0x100d110 addu  v1, zero, zero
 	ldloc 6
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_100d100
+	brfalse L_100d110
 // --- basic block ---
-// 0x0100d0e0: 0x100d0e0: lw    a0, 532(a0)
+// 0x0100d0f0: 0x100d0f0: lw    a0, 532(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3242,7 +3242,7 @@ L_100d0b4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d0e4: 0x100d0e4: jal   0x1001800 addu  a0, v0, a0
+// 0x0100d0f4: 0x100d0f4: jal   0x1001800 addu  a0, v0, a0
 	ldloc 6
 	ldloc.1
 	add
@@ -3256,7 +3256,7 @@ L_100d0b4:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d0ec: 0x100d0ec: lw    v0, 532(s0)
+// 0x0100d0fc: 0x100d0fc: lw    v0, 532(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3265,13 +3265,13 @@ L_100d0b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d0f0: 0x100d0f0: sll   zero, zero, 0
-// 0x0100d0f4: 0x100d0f4: addu  s1, v0, s1
+// 0x0100d100: 0x100d100: sll   zero, zero, 0
+// 0x0100d104: 0x100d104: addu  s1, v0, s1
 	ldloc 6
 	ldloc 9
 	add
 	stloc 9
-// 0x0100d0f8: 0x100d0f8: sw    s1, 532(s0)
+// 0x0100d108: 0x100d108: sw    s1, 532(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3280,33 +3280,33 @@ L_100d0b4:
 	add
 	ldloc 9
 	stelem.i4
-L_100d0fc:
-// 0x0100d0fc: 0x100d0fc: addu  v1, zero, zero
+L_100d10c:
+// 0x0100d10c: 0x100d10c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-L_100d100:
-// 0x0100d100: 0x100d100: cibyl_sysc_arg 0x3
+L_100d110:
+// 0x0100d110: 0x100d110: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0100d104: 0x100d104: cibyl_sysc 0x28e
+// 0x0100d114: 0x100d114: cibyl_sysc 0x28e
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 6
-// 0x0100d108: 0x100d108: addu  v1, v0, zero
+// 0x0100d118: 0x100d118: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x0100d10c: 0x100d10c: lw    ra, 28(sp)
-// 0x0100d110: 0x100d110: addiu v1, v1, 20
+// 0x0100d11c: 0x100d11c: lw    ra, 28(sp)
+// 0x0100d120: 0x100d120: addiu v1, v1, 20
 	ldloc 7
 	ldc.i4.s 20
 	add
 	stloc 7
-// 0x0100d114: 0x100d114: sw    v1, 0(s0)
+// 0x0100d124: 0x100d124: sw    v1, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0100d118: 0x100d118: lw    s1, 24(sp)
+// 0x0100d128: 0x100d128: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3315,7 +3315,7 @@ L_100d100:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100d11c: 0x100d11c: lw    s0, 20(sp)
+// 0x0100d12c: 0x100d12c: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3324,7 +3324,7 @@ L_100d100:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d120: 0x100d120: jr    ra addiu sp, sp, 32
+// 0x0100d130: 0x100d130: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -3336,7 +3336,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 load_next_tile_100d128(int32,int32,int32,int32,int32)
+.method public static int32 load_next_tile_100d138(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s6,int32 s4,int32 s2,int32 s1,int32 s5,int32 s3,int32 lo,int32 s7,int32 s8,int32 hi,int32 ra,int32 t0)
@@ -3407,12 +3407,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100d128: 0x100d128: addiu sp, sp, -96
+// 0x0100d138: 0x100d138: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x0100d12c: 0x100d12c: sw    s0, 56(sp)
+// 0x0100d13c: 0x100d13c: sw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3421,41 +3421,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d130: 0x100d130: lui   s0, 0x20000
+// 0x0100d140: 0x100d140: lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100d134: 0x100d134: lw    v0, 31276(s0)
+// 0x0100d144: 0x100d144: lw    v0, 31740(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d138: 0x100d138: lui   a1, 0x0
+// 0x0100d148: 0x100d148: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d13c: 0x100d13c: lui   a3, 0x0
+// 0x0100d14c: 0x100d14c: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d140: 0x100d140: addiu a1, a1, 24928
+// 0x0100d150: 0x100d150: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d144: 0x100d144: addiu a3, a3, 25360
+// 0x0100d154: 0x100d154: addiu a3, a3, 25360
 	ldloc 4
 	ldc.i4 25360
 	add
 	stloc 4
-// 0x0100d148: 0x100d148: addiu a0, zero, 1
+// 0x0100d158: 0x100d158: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d14c: 0x100d14c: addiu a2, zero, 365
+// 0x0100d15c: 0x100d15c: addiu a2, zero, 365
 	ldc.i4 365
 	stloc.3
-// 0x0100d150: 0x100d150: sw    v0, 16(sp)
+// 0x0100d160: 0x100d160: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3464,8 +3464,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100d154: 0x100d154: sw    ra, 92(sp)
-// 0x0100d158: 0x100d158: sw    s8, 88(sp)
+// 0x0100d164: 0x100d164: sw    ra, 92(sp)
+// 0x0100d168: 0x100d168: sw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3474,7 +3474,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 17
 	stelem.i4
-// 0x0100d15c: 0x100d15c: sw    s7, 84(sp)
+// 0x0100d16c: 0x100d16c: sw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3483,7 +3483,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0100d160: 0x100d160: sw    s6, 80(sp)
+// 0x0100d170: 0x100d170: sw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3492,7 +3492,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100d164: 0x100d164: sw    s5, 76(sp)
+// 0x0100d174: 0x100d174: sw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3501,7 +3501,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0100d168: 0x100d168: sw    s4, 72(sp)
+// 0x0100d178: 0x100d178: sw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3510,7 +3510,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100d16c: 0x100d16c: sw    s3, 68(sp)
+// 0x0100d17c: 0x100d17c: sw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3519,7 +3519,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100d170: 0x100d170: sw    s2, 64(sp)
+// 0x0100d180: 0x100d180: sw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3528,7 +3528,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100d174: 0x100d174: jal   0x100449c sw    s1, 60(sp)
+// 0x0100d184: 0x100d184: jal   0x100449c sw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3547,130 +3547,130 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d17c: 0x100d17c: lui   v0, 0x20000
+// 0x0100d18c: 0x100d18c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100d180: 0x100d180: lw    v0, 31296(v0)
+// 0x0100d190: 0x100d190: lw    v0, 31760(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d184: 0x100d184: sll   zero, zero, 0
-// 0x0100d188: 0x100d188: bgtz  v0, 0x100d354 addiu v0, zero, 2
+// 0x0100d194: 0x100d194: sll   zero, zero, 0
+// 0x0100d198: 0x100d198: bgtz  v0, 0x100d364 addiu v0, zero, 2
 	ldloc 6
 	ldc.i4.2
 	stloc 6
 	ldc.i4.s 0
-	bgt L_100d354
+	bgt L_100d364
 // --- basic block ---
-// 0x0100d190: 0x100d190: lw    v1, 31276(s0)
+// 0x0100d1a0: 0x100d1a0: lw    v1, 31740(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d194: 0x100d194: sll   zero, zero, 0
-// 0x0100d198: 0x100d198: bne   v1, v0, 0x100d354 lui   s6, 0x20000
+// 0x0100d1a4: 0x100d1a4: sll   zero, zero, 0
+// 0x0100d1a8: 0x100d1a8: bne   v1, v0, 0x100d364 lui   s6, 0x20000
 	ldloc 7
 	ldloc 6
 	ldc.i4 131072
 	stloc 9
-	bne.un L_100d354
+	bne.un L_100d364
 // --- basic block ---
-// 0x0100d1a0: 0x100d1a0: lui   s5, 0x20000
+// 0x0100d1b0: 0x100d1b0: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x0100d1a4: 0x100d1a4: addiu s4, zero, 256
+// 0x0100d1b4: 0x100d1b4: addiu s4, zero, 256
 	ldc.i4 256
 	stloc 10
-// 0x0100d1a8: 0x100d1a8: addiu s8, zero, -1
+// 0x0100d1b8: 0x100d1b8: addiu s8, zero, -1
 	ldc.i4.m1
 	stloc 17
-// 0x0100d1ac: 0x100d1ac: addiu s7, zero, -65
+// 0x0100d1bc: 0x100d1bc: addiu s7, zero, -65
 	ldc.i4.s -65
 	stloc 16
-L_100d1b0:
-// 0x0100d1b0: 0x100d1b0: lw    v0, 31288(s6)
+L_100d1c0:
+// 0x0100d1c0: 0x100d1c0: lw    v0, 31752(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d1b4: 0x100d1b4: sll   zero, zero, 0
-// 0x0100d1b8: 0x100d1b8: blez  v0, 0x100d354 addiu a0, v0, -1
+// 0x0100d1c4: 0x100d1c4: sll   zero, zero, 0
+// 0x0100d1c8: 0x100d1c8: blez  v0, 0x100d364 addiu a0, v0, -1
 	ldloc 6
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc.1
 	ldc.i4.s 0
-	ble L_100d354
+	ble L_100d364
 // --- basic block ---
-// 0x0100d1c0: 0x100d1c0: lw    v1, 31284(s5)
+// 0x0100d1d0: 0x100d1d0: lw    v1, 31748(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d1c4: 0x100d1c4: sw    a0, 31288(s6)
+// 0x0100d1d4: 0x100d1d4: sw    a0, 31752(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 7822
+	ldc.i4 7938
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100d1c8: 0x100d1c8: addiu a0, zero, 12
+// 0x0100d1d8: 0x100d1d8: addiu a0, zero, 12
 	ldc.i4.s 12
 	stloc.1
-// 0x0100d1cc: 0x100d1cc: mult  v1, a0
+// 0x0100d1dc: 0x100d1dc: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 15
-// 0x0100d1d0: 0x100d1d0: addiu v0, v1, 1
+// 0x0100d1e0: 0x100d1e0: addiu v0, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0100d1d4: 0x100d1d4: lui   a0, 0x20000
+// 0x0100d1e4: 0x100d1e4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0100d1d8: 0x100d1d8: addiu a0, a0, 31300
+// 0x0100d1e8: 0x100d1e8: addiu a0, a0, 31764
 	ldloc.1
-	ldc.i4 31300
+	ldc.i4 31764
 	add
 	stloc.1
-// 0x0100d1dc: 0x100d1dc: mflo  lo
+// 0x0100d1ec: 0x100d1ec: mflo  lo
 	ldloc 15
 	stloc 7
-// 0x0100d1e0: 0x100d1e0: addu  v1, v1, a0
+// 0x0100d1f0: 0x100d1f0: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x0100d1e4: 0x100d1e4: lw    s0, 0(v1)
+// 0x0100d1f4: 0x100d1f4: lw    s0, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0100d1e8: 0x100d1e8: div   v0, s4
+// 0x0100d1f8: 0x100d1f8: div   v0, s4
 	ldloc 6
 	ldloc 10
 	ldloc 6
@@ -3679,7 +3679,7 @@ L_100d1b0:
 	stloc 15
 	rem
 	stloc 18
-// 0x0100d1ec: 0x100d1ec: lw    s2, 4(v1)
+// 0x0100d1fc: 0x100d1fc: lw    s2, 4(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3688,10 +3688,10 @@ L_100d1b0:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100d1f0: 0x100d1f0: addu  a0, s0, zero
+// 0x0100d200: 0x100d200: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100d1f4: 0x100d1f4: lw    s3, 8(v1)
+// 0x0100d204: 0x100d204: lw    s3, 8(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3700,58 +3700,58 @@ L_100d1b0:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100d1f8: 0x100d1f8: mfhi  hi
+// 0x0100d208: 0x100d208: mfhi  hi
 	ldloc 18
 	stloc 6
-// 0x0100d1fc: 0x100d1fc: beq   s0, s8, 0x100d354 sw    v0, 31284(s5)
+// 0x0100d20c: 0x100d20c: beq   s0, s8, 0x100d364 sw    v0, 31748(s5)
 	ldloc 8
 	ldloc 17
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7821
+	ldc.i4 7937
 	add
 	ldloc 6
 	stelem.i4
-	beq  L_100d354
+	beq  L_100d364
 // --- basic block ---
-// 0x0100d204: 0x100d204: jal   0x100db90 sll   zero, zero, 0
+// 0x0100d214: 0x100d214: jal   0x100dba0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d20c: 0x100d20c: addu  s1, v0, zero
+// 0x0100d21c: 0x100d21c: addu  s1, v0, zero
 	ldloc 6
 	stloc 12
-// 0x0100d210: 0x100d210: lw    v0, 0(v0)
+// 0x0100d220: 0x100d220: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100d214: 0x100d214: sll   zero, zero, 0
-// 0x0100d218: 0x100d218: andi  v0, v0, 4
+// 0x0100d224: 0x100d224: sll   zero, zero, 0
+// 0x0100d228: 0x100d228: andi  v0, v0, 4
 	ldloc 6
 	ldc.i4.4
 	and
 	stloc 6
-// 0x0100d21c: 0x100d21c: beq   v0, zero, 0x100d234 sll   zero, zero, 0
+// 0x0100d22c: 0x100d22c: beq   v0, zero, 0x100d244 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_100d234
+	brfalse L_100d244
 // --- basic block ---
-// 0x0100d224: 0x100d224: beq   s3, zero, 0x100d234 sll   zero, zero, 0
+// 0x0100d234: 0x100d234: beq   s3, zero, 0x100d244 sll   zero, zero, 0
 	ldloc 14
-	brfalse L_100d234
+	brfalse L_100d244
 // --- basic block ---
-// 0x0100d22c: 0x100d22c: jalr  s3 sll   zero, zero, 0
+// 0x0100d23c: 0x100d23c: jalr  s3 sll   zero, zero, 0
 	ldloc 14
 	ldloc.0
 	ldloc.1
@@ -3763,26 +3763,26 @@ L_100d1b0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100d234:
-// 0x0100d234: 0x100d234: lw    v0, 0(s1)
+L_100d244:
+// 0x0100d244: 0x100d244: lw    v0, 0(s1)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100d238: 0x100d238: sll   zero, zero, 0
-// 0x0100d23c: 0x100d23c: andi  v1, v0, 12
+// 0x0100d248: 0x100d248: sll   zero, zero, 0
+// 0x0100d24c: 0x100d24c: andi  v1, v0, 12
 	ldloc 6
 	ldc.i4.s 12
 	and
 	stloc 7
-// 0x0100d240: 0x100d240: and   v0, v0, s7
+// 0x0100d250: 0x100d250: and   v0, v0, s7
 	ldloc 6
 	ldloc 16
 	and
 	stloc 6
-// 0x0100d244: 0x100d244: bne   v1, zero, 0x100d1b0 sw    v0, 0(s1)
+// 0x0100d254: 0x100d254: bne   v1, zero, 0x100d1c0 sw    v0, 0(s1)
 	ldloc 7
 	ldloc 5
 	ldloc 12
@@ -3790,34 +3790,34 @@ L_100d234:
 	shr.un
 	ldloc 6
 	stelem.i4
-	brtrue L_100d1b0
+	brtrue L_100d1c0
 // --- basic block ---
-// 0x0100d24c: 0x100d24c: lui   a1, 0x0
+// 0x0100d25c: 0x100d25c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d250: 0x100d250: lui   a3, 0x0
+// 0x0100d260: 0x100d260: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d254: 0x100d254: addiu a1, a1, 24928
+// 0x0100d264: 0x100d264: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d258: 0x100d258: addiu a3, a3, 25388
+// 0x0100d268: 0x100d268: addiu a3, a3, 25388
 	ldloc 4
 	ldc.i4 25388
 	add
 	stloc 4
-// 0x0100d25c: 0x100d25c: addiu a2, zero, 385
+// 0x0100d26c: 0x100d26c: addiu a2, zero, 385
 	ldc.i4 385
 	stloc.3
-// 0x0100d260: 0x100d260: addiu a0, zero, 1
+// 0x0100d270: 0x100d270: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d264: 0x100d264: lui   s5, 0x20000
+// 0x0100d274: 0x100d274: lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x0100d268: 0x100d268: sw    s2, 20(sp)
+// 0x0100d278: 0x100d278: sw    s2, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3826,7 +3826,7 @@ L_100d234:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100d26c: 0x100d26c: jal   0x100449c sw    s0, 16(sp)
+// 0x0100d27c: 0x100d27c: jal   0x100449c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3845,19 +3845,19 @@ L_100d234:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d274: 0x100d274: lw    s6, 31292(s5)
+// 0x0100d284: 0x100d284: lw    s6, 31756(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7823
+	ldc.i4 7939
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100d278: 0x100d278: addiu v0, zero, 540
+// 0x0100d288: 0x100d288: addiu v0, zero, 540
 	ldc.i4 540
 	stloc 6
-// 0x0100d27c: 0x100d27c: lw    s4, 8(s6)
+// 0x0100d28c: 0x100d28c: lw    s4, 8(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3866,23 +3866,23 @@ L_100d234:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100d280: 0x100d280: lui   a0, 0x0
+// 0x0100d290: 0x100d290: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100d284: 0x100d284: sltu  s4, zero, s4
+// 0x0100d294: 0x100d294: sltu  s4, zero, s4
 	ldc.i4.s 0
 	ldloc 10
 	clt.un
 	stloc 10
-// 0x0100d288: 0x100d288: mult  s4, v0
+// 0x0100d298: 0x100d298: mult  s4, v0
 	ldloc 10
 	ldloc 6
 	mul
 	stloc 15
-// 0x0100d28c: 0x100d28c: lui   v0, 0x0
+// 0x0100d29c: 0x100d29c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0100d290: 0x100d290: lw    s2, 1816(v0)
+// 0x0100d2a0: 0x100d2a0: lw    s2, 1816(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -3891,20 +3891,20 @@ L_100d234:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100d294: 0x100d294: addiu a0, a0, 828
+// 0x0100d2a4: 0x100d2a4: addiu a0, a0, 828
 	ldloc.1
 	ldc.i4 828
 	add
 	stloc.1
-// 0x0100d298: 0x100d298: mflo  lo
+// 0x0100d2a8: 0x100d2a8: mflo  lo
 	ldloc 15
 	stloc 10
-// 0x0100d29c: 0x100d29c: addu  s6, s6, s4
+// 0x0100d2ac: 0x100d2ac: addu  s6, s6, s4
 	ldloc 9
 	ldloc 10
 	add
 	stloc 9
-// 0x0100d2a0: 0x100d2a0: sw    s0, 4(s6)
+// 0x0100d2b0: 0x100d2b0: sw    s0, 4(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3913,7 +3913,7 @@ L_100d234:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d2a4: 0x100d2a4: sw    s3, 524(s6)
+// 0x0100d2b4: 0x100d2b4: sw    s3, 524(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3922,7 +3922,7 @@ L_100d234:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0100d2a8: 0x100d2a8: sw    s1, 8(s6)
+// 0x0100d2b8: 0x100d2b8: sw    s1, 8(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3931,14 +3931,14 @@ L_100d234:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100d2ac: 0x100d2ac: sw    zero, 0(s6)
+// 0x0100d2bc: 0x100d2bc: sw    zero, 0(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d2b0: 0x100d2b0: sw    zero, 528(s6)
+// 0x0100d2c0: 0x100d2c0: sw    zero, 528(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3947,7 +3947,7 @@ L_100d234:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d2b4: 0x100d2b4: jal   0x100e348 sw    zero, 532(s6)
+// 0x0100d2c4: 0x100d2c4: jal   0x100e358 sw    zero, 532(s6)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3961,20 +3961,20 @@ L_100d234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d2bc: 0x100d2bc: addu  a3, v0, zero
+// 0x0100d2cc: 0x100d2cc: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0100d2c0: 0x100d2c0: sra   v0, s0, 8
+// 0x0100d2d0: 0x100d2d0: sra   v0, s0, 8
 	ldloc 8
 	ldc.i4.8
 	shr
 	stloc 6
-// 0x0100d2c4: 0x100d2c4: sw    v0, 36(sp)
+// 0x0100d2d4: 0x100d2d4: sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3983,41 +3983,41 @@ L_100d234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100d2c8: 0x100d2c8: lui   a2, 0x0
+// 0x0100d2d8: 0x100d2d8: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x0100d2cc: 0x100d2cc: lui   v0, 0x0
+// 0x0100d2dc: 0x100d2dc: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0100d2d0: 0x100d2d0: sra   t0, s0, 24
+// 0x0100d2e0: 0x100d2e0: sra   t0, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	shr
 	stloc 20
-// 0x0100d2d4: 0x100d2d4: sra   v1, s0, 16
+// 0x0100d2e4: 0x100d2e4: sra   v1, s0, 16
 	ldloc 8
 	ldc.i4.s 16
 	shr
 	stloc 7
-// 0x0100d2d8: 0x100d2d8: addiu a2, a2, 25420
+// 0x0100d2e8: 0x100d2e8: addiu a2, a2, 25420
 	ldloc.3
 	ldc.i4 25420
 	add
 	stloc.3
-// 0x0100d2dc: 0x100d2dc: addiu a1, zero, 512
+// 0x0100d2ec: 0x100d2ec: addiu a1, zero, 512
 	ldc.i4 512
 	stloc.2
-// 0x0100d2e0: 0x100d2e0: addiu a0, s6, 12
+// 0x0100d2f0: 0x100d2f0: addiu a0, s6, 12
 	ldloc 9
 	ldc.i4.s 12
 	add
 	stloc.1
-// 0x0100d2e4: 0x100d2e4: addiu v0, v0, 25472
+// 0x0100d2f4: 0x100d2f4: addiu v0, v0, 25472
 	ldloc 6
 	ldc.i4 25472
 	add
 	stloc 6
-// 0x0100d2e8: 0x100d2e8: sw    t0, 20(sp)
+// 0x0100d2f8: 0x100d2f8: sw    t0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4026,7 +4026,7 @@ L_100d234:
 	add
 	ldloc 20
 	stelem.i4
-// 0x0100d2ec: 0x100d2ec: sw    v1, 28(sp)
+// 0x0100d2fc: 0x100d2fc: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4035,7 +4035,7 @@ L_100d234:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100d2f0: 0x100d2f0: sw    s0, 44(sp)
+// 0x0100d300: 0x100d300: sw    s0, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4044,7 +4044,7 @@ L_100d234:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d2f4: 0x100d2f4: sw    s2, 40(sp)
+// 0x0100d304: 0x100d304: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4053,7 +4053,7 @@ L_100d234:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100d2f8: 0x100d2f8: sw    v0, 48(sp)
+// 0x0100d308: 0x100d308: sw    v0, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4062,7 +4062,7 @@ L_100d234:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100d2fc: 0x100d2fc: sw    s2, 16(sp)
+// 0x0100d30c: 0x100d30c: sw    s2, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4071,7 +4071,7 @@ L_100d234:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100d300: 0x100d300: sw    s2, 24(sp)
+// 0x0100d310: 0x100d310: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4080,7 +4080,7 @@ L_100d234:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100d304: 0x100d304: jal   0x1000f9c sw    s2, 32(sp)
+// 0x0100d314: 0x100d314: jal   0x1000f9c sw    s2, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4099,51 +4099,51 @@ L_100d234:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d30c: 0x100d30c: lw    v1, 0(s1)
+// 0x0100d31c: 0x100d31c: lw    v1, 0(s1)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100d310: 0x100d310: lui   v0, 0x20000
+// 0x0100d320: 0x100d320: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100d314: 0x100d314: ori   v1, v1, 8
+// 0x0100d324: 0x100d324: ori   v1, v1, 8
 	ldloc 7
 	ldc.i4.8
 	or
 	stloc 7
-// 0x0100d318: 0x100d318: sw    v1, 0(s1)
+// 0x0100d328: 0x100d328: sw    v1, 0(s1)
 	ldloc 5
 	ldloc 12
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-// 0x0100d31c: 0x100d31c: lw    v1, 31296(v0)
+// 0x0100d32c: 0x100d32c: lw    v1, 31760(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d320: 0x100d320: addu  a0, s0, zero
+// 0x0100d330: 0x100d330: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0100d324: 0x100d324: addiu v1, v1, 1
+// 0x0100d334: 0x100d334: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0100d328: 0x100d328: jal   0x100b50c sw    v1, 31296(v0)
+// 0x0100d338: 0x100d338: jal   0x100b51c sw    v1, 31760(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldloc 7
 	stelem.i4
@@ -4152,40 +4152,40 @@ L_100d234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d330: 0x100d330: lw    s0, 31292(s5)
+// 0x0100d340: 0x100d340: lw    s0, 31756(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 7823
+	ldc.i4 7939
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d334: 0x100d334: lui   a0, 0x0
+// 0x0100d344: 0x100d344: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100d338: 0x100d338: addu  s0, s0, s4
+// 0x0100d348: 0x100d348: addu  s0, s0, s4
 	ldloc 8
 	ldloc 10
 	add
 	stloc 8
-// 0x0100d33c: 0x100d33c: addiu a0, a0, 812
+// 0x0100d34c: 0x100d34c: addiu a0, a0, 812
 	ldloc.1
 	ldc.i4 812
 	add
 	stloc.1
-// 0x0100d340: 0x100d340: addu  a3, v0, zero
+// 0x0100d350: 0x100d350: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0100d344: 0x100d344: addu  a1, s0, zero
+// 0x0100d354: 0x100d354: addu  a1, s0, zero
 	ldloc 8
 	stloc.2
-// 0x0100d348: 0x100d348: jal   0x1045dd0 addiu a2, s0, 12
+// 0x0100d358: 0x100d358: jal   0x1045de0 addiu a2, s0, 12
 	ldloc 8
 	ldc.i4.s 12
 	add
@@ -4195,12 +4195,12 @@ L_100d234:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_http_async_copy_1045dd0(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_http_async_copy_1045de0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d350: 0x100d350: sw    v0, 536(s0)
+// 0x0100d360: 0x100d360: sw    v0, 536(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4209,9 +4209,9 @@ L_100d234:
 	add
 	ldloc 6
 	stelem.i4
-L_100d354:
-// 0x0100d354: 0x100d354: lw    ra, 92(sp)
-// 0x0100d358: 0x100d358: lw    s8, 88(sp)
+L_100d364:
+// 0x0100d364: 0x100d364: lw    ra, 92(sp)
+// 0x0100d368: 0x100d368: lw    s8, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4220,7 +4220,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0100d35c: 0x100d35c: lw    s7, 84(sp)
+// 0x0100d36c: 0x100d36c: lw    s7, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4229,7 +4229,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0100d360: 0x100d360: lw    s6, 80(sp)
+// 0x0100d370: 0x100d370: lw    s6, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4238,7 +4238,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100d364: 0x100d364: lw    s5, 76(sp)
+// 0x0100d374: 0x100d374: lw    s5, 76(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4247,7 +4247,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0100d368: 0x100d368: lw    s4, 72(sp)
+// 0x0100d378: 0x100d378: lw    s4, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4256,7 +4256,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100d36c: 0x100d36c: lw    s3, 68(sp)
+// 0x0100d37c: 0x100d37c: lw    s3, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4265,7 +4265,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0100d370: 0x100d370: lw    s2, 64(sp)
+// 0x0100d380: 0x100d380: lw    s2, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4274,7 +4274,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100d374: 0x100d374: lw    s1, 60(sp)
+// 0x0100d384: 0x100d384: lw    s1, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4283,7 +4283,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100d378: 0x100d378: lw    s0, 56(sp)
+// 0x0100d388: 0x100d388: lw    s0, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4292,7 +4292,7 @@ L_100d354:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d37c: 0x100d37c: jr    ra addiu sp, sp, 96
+// 0x0100d38c: 0x100d38c: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -4304,7 +4304,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -4354,12 +4354,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100d384: 0x100d384: addiu sp, sp, -48
+// 0x0100d394: 0x100d394: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0100d388: 0x100d388: sw    s4, 40(sp)
+// 0x0100d398: 0x100d398: sw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4368,7 +4368,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0100d38c: 0x100d38c: sw    s3, 36(sp)
+// 0x0100d39c: 0x100d39c: sw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4377,7 +4377,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100d390: 0x100d390: sw    s2, 32(sp)
+// 0x0100d3a0: 0x100d3a0: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4386,7 +4386,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100d394: 0x100d394: sw    s1, 28(sp)
+// 0x0100d3a4: 0x100d3a4: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4395,7 +4395,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d398: 0x100d398: sw    s0, 24(sp)
+// 0x0100d3a8: 0x100d3a8: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4404,17 +4404,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100d39c: 0x100d39c: sw    ra, 44(sp)
-// 0x0100d3a0: 0x100d3a0: addu  s0, a1, zero
+// 0x0100d3ac: 0x100d3ac: sw    ra, 44(sp)
+// 0x0100d3b0: 0x100d3b0: addu  s0, a1, zero
 	ldloc.2
 	stloc 9
-// 0x0100d3a4: 0x100d3a4: addu  s3, a2, zero
+// 0x0100d3b4: 0x100d3b4: addu  s3, a2, zero
 	ldloc.3
 	stloc 11
-// 0x0100d3a8: 0x100d3a8: addu  s4, a3, zero
+// 0x0100d3b8: 0x100d3b8: addu  s4, a3, zero
 	ldloc 4
 	stloc 12
-// 0x0100d3ac: 0x100d3ac: jal   0x100db90 addu  s1, a0, zero
+// 0x0100d3bc: 0x100d3bc: jal   0x100dba0 addu  s1, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -4422,102 +4422,102 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d3b4: 0x100d3b4: beq   v0, zero, 0x100d4e8 addu  s2, v0, zero
+// 0x0100d3c4: 0x100d3c4: beq   v0, zero, 0x100d4f8 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 10
-	brfalse L_100d4e8
+	brfalse L_100d4f8
 // --- basic block ---
-// 0x0100d3bc: 0x100d3bc: lw    v0, 0(v0)
+// 0x0100d3cc: 0x100d3cc: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100d3c0: 0x100d3c0: sll   zero, zero, 0
-// 0x0100d3c4: 0x100d3c4: andi  v1, v0, 12
+// 0x0100d3d0: 0x100d3d0: sll   zero, zero, 0
+// 0x0100d3d4: 0x100d3d4: andi  v1, v0, 12
 	ldloc 5
 	ldc.i4.s 12
 	and
 	stloc 6
-// 0x0100d3c8: 0x100d3c8: bne   v1, zero, 0x100d4e8 andi  v1, v0, 64
+// 0x0100d3d8: 0x100d3d8: bne   v1, zero, 0x100d4f8 andi  v1, v0, 64
 	ldloc 6
 	ldloc 5
 	ldc.i4.s 64
 	and
 	stloc 6
-	brtrue L_100d4e8
+	brtrue L_100d4f8
 // --- basic block ---
-// 0x0100d3d0: 0x100d3d0: beq   v1, zero, 0x100d3e8 lui   v1, 0xff0000
+// 0x0100d3e0: 0x100d3e0: beq   v1, zero, 0x100d3f8 lui   v1, 0xff0000
 	ldloc 6
 	ldc.i4 16711680
 	stloc 6
-	brfalse L_100d3e8
+	brfalse L_100d3f8
 // --- basic block ---
-// 0x0100d3d8: 0x100d3d8: and   v1, v0, v1
+// 0x0100d3e8: 0x100d3e8: and   v1, v0, v1
 	ldloc 5
 	ldloc 6
 	and
 	stloc 6
-// 0x0100d3dc: 0x100d3dc: slt   v1, s0, v1
+// 0x0100d3ec: 0x100d3ec: slt   v1, s0, v1
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 6
-// 0x0100d3e0: 0x100d3e0: bne   v1, zero, 0x100d4e8 sll   zero, zero, 0
+// 0x0100d3f0: 0x100d3f0: bne   v1, zero, 0x100d4f8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_100d4e8
+	brtrue L_100d4f8
 // --- basic block ---
-L_100d3e8:
-// 0x0100d3e8: 0x100d3e8: bne   s3, zero, 0x100d458 andi  v0, v0, 128
+L_100d3f8:
+// 0x0100d3f8: 0x100d3f8: bne   s3, zero, 0x100d468 andi  v0, v0, 128
 	ldloc 11
 	ldloc 5
 	ldc.i4 128
 	and
 	stloc 5
-	brtrue L_100d458
+	brtrue L_100d468
 // --- basic block ---
-// 0x0100d3f0: 0x100d3f0: bne   v0, zero, 0x100d4e8 sll   zero, zero, 0
+// 0x0100d400: 0x100d400: bne   v0, zero, 0x100d4f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_100d4e8
+	brtrue L_100d4f8
 // --- basic block ---
-// 0x0100d3f8: 0x100d3f8: jal   0x100cc3c sll   zero, zero, 0
+// 0x0100d408: 0x100d408: jal   0x100cc4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::init_loading_session_100cc3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::init_loading_session_100cc4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d400: 0x100d400: lui   v0, 0x20000
+// 0x0100d410: 0x100d410: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100d404: 0x100d404: lw    v0, 31264(v0)
+// 0x0100d414: 0x100d414: lw    v0, 31728(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7816
+	ldc.i4 7932
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d408: 0x100d408: sll   zero, zero, 0
-// 0x0100d40c: 0x100d40c: bne   v0, zero, 0x100d45c addu  a0, s1, zero
+// 0x0100d418: 0x100d418: sll   zero, zero, 0
+// 0x0100d41c: 0x100d41c: bne   v0, zero, 0x100d46c addu  a0, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_100d45c
+	brtrue L_100d46c
 // --- basic block ---
-// 0x0100d414: 0x100d414: jal   0x100b50c addu  a0, s1, zero
+// 0x0100d424: 0x100d424: jal   0x100b51c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -4525,60 +4525,60 @@ L_100d3e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_timestamp_100b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_timestamp_100b51c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d41c: 0x100d41c: blez  v0, 0x100d45c addu  a0, s1, zero
+// 0x0100d42c: 0x100d42c: blez  v0, 0x100d46c addu  a0, s1, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
 	ldc.i4.s 0
-	ble L_100d45c
+	ble L_100d46c
 // --- basic block ---
-// 0x0100d424: 0x100d424: lw    v0, 0(s2)
+// 0x0100d434: 0x100d434: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100d428: 0x100d428: lui   a1, 0x0
+// 0x0100d438: 0x100d438: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d42c: 0x100d42c: ori   v0, v0, 128
+// 0x0100d43c: 0x100d43c: ori   v0, v0, 128
 	ldloc 5
 	ldc.i4 128
 	or
 	stloc 5
-// 0x0100d430: 0x100d430: lui   a3, 0x0
+// 0x0100d440: 0x100d440: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d434: 0x100d434: sw    v0, 0(s2)
+// 0x0100d444: 0x100d444: sw    v0, 0(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0100d438: 0x100d438: addiu a1, a1, 24928
+// 0x0100d448: 0x100d448: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d43c: 0x100d43c: addiu a3, a3, 25480
+// 0x0100d44c: 0x100d44c: addiu a3, a3, 25480
 	ldloc 4
 	ldc.i4 25480
 	add
 	stloc 4
-// 0x0100d440: 0x100d440: addiu a0, zero, 1
+// 0x0100d450: 0x100d450: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d444: 0x100d444: addiu a2, zero, 548
+// 0x0100d454: 0x100d454: addiu a2, zero, 548
 	ldc.i4 548
 	stloc.3
-// 0x0100d448: 0x100d448: jal   0x100449c sw    s1, 16(sp)
+// 0x0100d458: 0x100d458: jal   0x100449c sw    s1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4597,18 +4597,18 @@ L_100d3e8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d450: 0x100d450: j	 0x100d4e8 sll   zero, zero, 0
-	br L_100d4e8
+// 0x0100d460: 0x100d460: j	 0x100d4f8 sll   zero, zero, 0
+	br L_100d4f8
 // --- basic block ---
-L_100d458:
-// 0x0100d458: 0x100d458: addu  a0, s1, zero
+L_100d468:
+// 0x0100d468: 0x100d468: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-L_100d45c:
-// 0x0100d45c: 0x100d45c: addu  a1, s0, zero
+L_100d46c:
+// 0x0100d46c: 0x100d46c: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0100d460: 0x100d460: jal   0x100cd5c addu  a2, s4, zero
+// 0x0100d470: 0x100d470: jal   0x100cd6c addu  a2, s4, zero
 	ldloc 12
 	stloc.3
 	ldloc.0
@@ -4616,54 +4616,54 @@ L_100d45c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::queue_tile_100cd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::queue_tile_100cd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d468: 0x100d468: lw    v0, 0(s2)
+// 0x0100d478: 0x100d478: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100d46c: 0x100d46c: lui   v1, 0xff000000
+// 0x0100d47c: 0x100d47c: lui   v1, 0xff000000
 	ldc.i4 4278190080
 	stloc 6
-// 0x0100d470: 0x100d470: lui   s1, 0x20000
+// 0x0100d480: 0x100d480: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100d474: 0x100d474: ori   v1, v1, 65471
+// 0x0100d484: 0x100d484: ori   v1, v1, 65471
 	ldloc 6
 	ldc.i4 65471
 	or
 	stloc 6
-// 0x0100d478: 0x100d478: and   v1, v0, v1
+// 0x0100d488: 0x100d488: and   v1, v0, v1
 	ldloc 5
 	ldloc 6
 	and
 	stloc 6
-// 0x0100d47c: 0x100d47c: ori   s0, s0, 64
+// 0x0100d48c: 0x100d48c: ori   s0, s0, 64
 	ldloc 9
 	ldc.i4.s 64
 	or
 	stloc 9
-// 0x0100d480: 0x100d480: lw    v0, 31292(s1)
+// 0x0100d490: 0x100d490: lw    v0, 31756(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7823
+	ldc.i4 7939
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d484: 0x100d484: or    s0, s0, v1
+// 0x0100d494: 0x100d494: or    s0, s0, v1
 	ldloc 9
 	ldloc 6
 	or
 	stloc 9
-// 0x0100d488: 0x100d488: bne   v0, zero, 0x100d4a0 sw    s0, 0(s2)
+// 0x0100d498: 0x100d498: bne   v0, zero, 0x100d4b0 sw    s0, 0(s2)
 	ldloc 5
 	ldloc 7
 	ldloc 10
@@ -4671,9 +4671,9 @@ L_100d45c:
 	shr.un
 	ldloc 9
 	stelem.i4
-	brtrue L_100d4a0
+	brtrue L_100d4b0
 // --- basic block ---
-// 0x0100d490: 0x100d490: jal   0x1000910 addiu a0, zero, 540
+// 0x0100d4a0: 0x100d4a0: jal   0x1000910 addiu a0, zero, 540
 	ldc.i4 540
 	stloc.1
 	ldloc.0
@@ -4686,16 +4686,16 @@ L_100d45c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d498: 0x100d498: sw    v0, 31292(s1)
+// 0x0100d4a8: 0x100d4a8: sw    v0, 31756(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7823
+	ldc.i4 7939
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100d49c: 0x100d49c: sw    zero, 8(v0)
+// 0x0100d4ac: 0x100d4ac: sw    zero, 8(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -4704,40 +4704,40 @@ L_100d45c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100d4a0:
-// 0x0100d4a0: 0x100d4a0: lui   v0, 0x20000
+L_100d4b0:
+// 0x0100d4b0: 0x100d4b0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100d4a4: 0x100d4a4: lw    v1, 31276(v0)
+// 0x0100d4b4: 0x100d4b4: lw    v1, 31740(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d4a8: 0x100d4a8: sll   zero, zero, 0
-// 0x0100d4ac: 0x100d4ac: bne   v1, zero, 0x100d4d4 lui   a0, 0x1010000
+// 0x0100d4b8: 0x100d4b8: sll   zero, zero, 0
+// 0x0100d4bc: 0x100d4bc: bne   v1, zero, 0x100d4e4 lui   a0, 0x1010000
 	ldloc 6
 	ldc.i4 16842752
 	stloc.1
-	brtrue L_100d4d4
+	brtrue L_100d4e4
 // --- basic block ---
-// 0x0100d4b4: 0x100d4b4: addiu v1, zero, 1
+// 0x0100d4c4: 0x100d4c4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0100d4b8: 0x100d4b8: addiu a0, a0, -9968
+// 0x0100d4c8: 0x100d4c8: addiu a0, a0, -9952
 	ldloc.1
-	ldc.i4 -9968
+	ldc.i4 -9952
 	add
 	stloc.1
-// 0x0100d4bc: 0x100d4bc: jal   0x106bcfc sw    v1, 31276(v0)
+// 0x0100d4cc: 0x100d4cc: jal   0x106c320 sw    v1, 31740(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldloc 6
 	stelem.i4
@@ -4746,58 +4746,58 @@ L_100d4a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_NotifyOnLogin_106bcfc(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_NotifyOnLogin_106c320(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d4c4: 0x100d4c4: lui   v1, 0x20000
+// 0x0100d4d4: 0x100d4d4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100d4c8: 0x100d4c8: sw    v0, 31280(v1)
+// 0x0100d4d8: 0x100d4d8: sw    v0, 31744(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7820
+	ldc.i4 7936
 	add
 	ldloc 5
 	stelem.i4
-// 0x0100d4cc: 0x100d4cc: lui   v0, 0x20000
+// 0x0100d4dc: 0x100d4dc: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100d4d0: 0x100d4d0: lw    v1, 31276(v0)
+// 0x0100d4e0: 0x100d4e0: lw    v1, 31740(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldelem.i4
 	stloc 6
-L_100d4d4:
-// 0x0100d4d4: 0x100d4d4: addiu v0, zero, 2
+L_100d4e4:
+// 0x0100d4e4: 0x100d4e4: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0100d4d8: 0x100d4d8: bne   v1, v0, 0x100d4e8 sll   zero, zero, 0
+// 0x0100d4e8: 0x100d4e8: bne   v1, v0, 0x100d4f8 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_100d4e8
+	bne.un L_100d4f8
 // --- basic block ---
-// 0x0100d4e0: 0x100d4e0: jal   0x100d128 sll   zero, zero, 0
+// 0x0100d4f0: 0x100d4f0: jal   0x100d138 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::load_next_tile_100d128(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::load_next_tile_100d138(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_100d4e8:
-// 0x0100d4e8: 0x100d4e8: lw    ra, 44(sp)
-// 0x0100d4ec: 0x100d4ec: lw    s4, 40(sp)
+L_100d4f8:
+// 0x0100d4f8: 0x100d4f8: lw    ra, 44(sp)
+// 0x0100d4fc: 0x100d4fc: lw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4806,7 +4806,7 @@ L_100d4e8:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0100d4f0: 0x100d4f0: lw    s3, 36(sp)
+// 0x0100d500: 0x100d500: lw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4815,7 +4815,7 @@ L_100d4e8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100d4f4: 0x100d4f4: lw    s2, 32(sp)
+// 0x0100d504: 0x100d504: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4824,7 +4824,7 @@ L_100d4e8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100d4f8: 0x100d4f8: lw    s1, 28(sp)
+// 0x0100d508: 0x100d508: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4833,7 +4833,7 @@ L_100d4e8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d4fc: 0x100d4fc: lw    s0, 24(sp)
+// 0x0100d50c: 0x100d50c: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4842,7 +4842,7 @@ L_100d4e8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100d500: 0x100d500: jr    ra addiu sp, sp, 48
+// 0x0100d510: 0x100d510: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4854,7 +4854,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 http_cb_done_100d508(int32,int32,int32,int32,int32)
+.method public static int32 http_cb_done_100d518(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s3,int32 s2,int32 ra)
@@ -4901,13 +4901,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100d508:
-// 0x0100d508: 0x100d508: addiu sp, sp, -48
+L_100d518:
+// 0x0100d518: 0x100d518: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0100d50c: 0x100d50c: sw    s0, 28(sp)
+// 0x0100d51c: 0x100d51c: sw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4916,7 +4916,7 @@ L_100d508:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100d510: 0x100d510: lw    s0, 4(a0)
+// 0x0100d520: 0x100d520: lw    s0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4925,7 +4925,7 @@ L_100d508:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100d514: 0x100d514: sw    s2, 36(sp)
+// 0x0100d524: 0x100d524: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4934,7 +4934,7 @@ L_100d508:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100d518: 0x100d518: sw    s1, 32(sp)
+// 0x0100d528: 0x100d528: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4943,7 +4943,7 @@ L_100d508:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d51c: 0x100d51c: lw    s2, 8(a0)
+// 0x0100d52c: 0x100d52c: lw    s2, 8(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4952,14 +4952,14 @@ L_100d508:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100d520: 0x100d520: addu  s1, a0, zero
+// 0x0100d530: 0x100d530: addu  s1, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0100d524: 0x100d524: addu  a0, s0, zero
+// 0x0100d534: 0x100d534: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0100d528: 0x100d528: sw    ra, 44(sp)
-// 0x0100d52c: 0x100d52c: jal   0x10137c0 sw    s3, 40(sp)
+// 0x0100d538: 0x100d538: sw    ra, 44(sp)
+// 0x0100d53c: 0x100d53c: jal   0x10137d0 sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4973,18 +4973,18 @@ L_100d508:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_unload_tile_10137c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_unload_tile_10137d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d534: 0x100d534: addu  s3, v0, zero
+// 0x0100d544: 0x100d544: addu  s3, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0100d538: 0x100d538: lui   v0, 0x0
+// 0x0100d548: 0x100d548: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100d53c: 0x100d53c: lw    a0, 1816(v0)
+// 0x0100d54c: 0x100d54c: lw    a0, 1816(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4993,7 +4993,7 @@ L_100d508:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d540: 0x100d540: lw    a2, 528(s1)
+// 0x0100d550: 0x100d550: lw    a2, 528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5002,7 +5002,7 @@ L_100d508:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100d544: 0x100d544: lw    a3, 532(s1)
+// 0x0100d554: 0x100d554: lw    a3, 532(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5011,66 +5011,66 @@ L_100d508:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0100d548: 0x100d548: jal   0x1052a8c addu  a1, s0, zero
+// 0x0100d558: 0x100d558: jal   0x1052a9c addu  a1, s0, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::roadmap_tile_store_1052a8c(int32,int32,int32,int32)
+	call int32 Cibyl61::roadmap_tile_store_1052a9c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d550: 0x100d550: lw    v1, 0(s2)
+// 0x0100d560: 0x100d560: lw    v1, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0100d554: 0x100d554: addiu v0, zero, -15
+// 0x0100d564: 0x100d564: addiu v0, zero, -15
 	ldc.i4.s -15
 	stloc 5
-// 0x0100d558: 0x100d558: and   v0, v1, v0
+// 0x0100d568: 0x100d568: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x0100d55c: 0x100d55c: ori   v0, v0, 6
+// 0x0100d56c: 0x100d56c: ori   v0, v0, 6
 	ldloc 5
 	ldc.i4.6
 	or
 	stloc 5
-// 0x0100d560: 0x100d560: sw    v0, 0(s2)
+// 0x0100d570: 0x100d570: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0100d564: 0x100d564: lui   v0, 0x20000
+// 0x0100d574: 0x100d574: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100d568: 0x100d568: lw    v1, 31296(v0)
+// 0x0100d578: 0x100d578: lw    v1, 31760(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d56c: 0x100d56c: addu  a0, s0, zero
+// 0x0100d57c: 0x100d57c: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0100d570: 0x100d570: addiu v1, v1, -1
+// 0x0100d580: 0x100d580: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0100d574: 0x100d574: sw    zero, 8(s1)
+// 0x0100d584: 0x100d584: sw    zero, 8(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5079,19 +5079,19 @@ L_100d508:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d578: 0x100d578: jal   0x10bfab4 sw    v1, 31296(v0)
+// 0x0100d588: 0x100d588: jal   0x10c00fc sw    v1, 31760(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl142::roadmap_label_clear_10bfab4()
+	call int32 Cibyl142::roadmap_label_clear_10c00fc()
 	stloc 5
 // --- basic block ---
-// 0x0100d580: 0x100d580: jal   0x1060998 addu  a0, s0, zero
+// 0x0100d590: 0x100d590: jal   0x10609a8 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5099,16 +5099,16 @@ L_100d508:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl71::navigate_graph_clear_1060998(int32,int32,int32,int32,int32)
+	call int32 Cibyl71::navigate_graph_clear_10609a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d588: 0x100d588: bne   s3, zero, 0x100d598 sll   zero, zero, 0
+// 0x0100d598: 0x100d598: bne   s3, zero, 0x100d5a8 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_100d598
+	brtrue L_100d5a8
 // --- basic block ---
-// 0x0100d590: 0x100d590: jal   0x100c1bc addu  a0, s0, zero
+// 0x0100d5a0: 0x100d5a0: jal   0x100c1cc addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5116,13 +5116,13 @@ L_100d508:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_delete_reference_100c1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_delete_reference_100c1cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100d598:
-// 0x0100d598: 0x100d598: lw    a1, 528(s1)
+L_100d5a8:
+// 0x0100d5a8: 0x100d5a8: lw    a1, 528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5131,7 +5131,7 @@ L_100d598:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100d59c: 0x100d59c: lw    a2, 532(s1)
+// 0x0100d5ac: 0x100d5ac: lw    a2, 532(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5140,7 +5140,7 @@ L_100d598:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100d5a0: 0x100d5a0: jal   0x10137f4 addu  a0, s0, zero
+// 0x0100d5b0: 0x100d5b0: jal   0x1013804 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5148,12 +5148,12 @@ L_100d598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_load_tile_mem_10137f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_load_tile_mem_1013804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d5a8: 0x100d5a8: lw    a0, 528(s1)
+// 0x0100d5b8: 0x100d5b8: lw    a0, 528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5162,7 +5162,7 @@ L_100d598:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d5ac: 0x100d5ac: jal   0x1000930 addu  s3, v0, zero
+// 0x0100d5bc: 0x100d5bc: jal   0x1000930 addu  s3, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -5175,10 +5175,10 @@ L_100d598:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d5b4: 0x100d5b4: lui   v1, 0x0
+// 0x0100d5c4: 0x100d5c4: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-// 0x0100d5b8: 0x100d5b8: lw    a1, 776(v1)
+// 0x0100d5c8: 0x100d5c8: lw    a1, 776(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5187,8 +5187,8 @@ L_100d598:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100d5bc: 0x100d5bc: sll   zero, zero, 0
-// 0x0100d5c0: 0x100d5c0: bltz  a1, 0x100d628 sw    zero, 528(s1)
+// 0x0100d5cc: 0x100d5cc: sll   zero, zero, 0
+// 0x0100d5d0: 0x100d5d0: bltz  a1, 0x100d638 sw    zero, 528(s1)
 	ldloc.2
 	ldloc 6
 	ldloc 8
@@ -5199,47 +5199,47 @@ L_100d598:
 	ldc.i4.s 0
 	stelem.i4
 	ldc.i4.s 0
-	blt L_100d628
+	blt L_100d638
 // --- basic block ---
-// 0x0100d5c8: 0x100d5c8: lui   v0, 0x20000
+// 0x0100d5d8: 0x100d5d8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100d5cc: 0x100d5cc: lw    a0, 31260(v0)
+// 0x0100d5dc: 0x100d5dc: lw    a0, 31724(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d5d0: 0x100d5d0: sll   zero, zero, 0
-// 0x0100d5d4: 0x100d5d4: addiu a0, a0, 1
+// 0x0100d5e0: 0x100d5e0: sll   zero, zero, 0
+// 0x0100d5e4: 0x100d5e4: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0100d5d8: 0x100d5d8: slt   a1, a0, a1
+// 0x0100d5e8: 0x100d5e8: slt   a1, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.2
-// 0x0100d5dc: 0x100d5dc: bne   a1, zero, 0x100d5f8 sw    a0, 31260(v0)
+// 0x0100d5ec: 0x100d5ec: bne   a1, zero, 0x100d608 sw    a0, 31724(v0)
 	ldloc.2
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_100d5f8
+	brtrue L_100d608
 // --- basic block ---
-// 0x0100d5e4: 0x100d5e4: addiu a0, zero, -1
+// 0x0100d5f4: 0x100d5f4: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0100d5e8: 0x100d5e8: sw    a0, 776(v1)
+// 0x0100d5f8: 0x100d5f8: sw    a0, 776(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5248,12 +5248,12 @@ L_100d598:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100d5ec: 0x100d5ec: jal   0x102146c sw    zero, 31260(v0)
+// 0x0100d5fc: 0x100d5fc: jal   0x102147c sw    zero, 31724(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5262,28 +5262,28 @@ L_100d598:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d5f4: 0x100d5f4: lui   v0, 0x20000
+// 0x0100d604: 0x100d604: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_100d5f8:
-// 0x0100d5f8: 0x100d5f8: lw    v1, 31260(v0)
+L_100d608:
+// 0x0100d608: 0x100d608: lw    v1, 31724(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d5fc: 0x100d5fc: lui   v0, 0x0
+// 0x0100d60c: 0x100d60c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0100d600: 0x100d600: lw    v0, 776(v0)
+// 0x0100d610: 0x100d610: lw    v0, 776(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5292,29 +5292,29 @@ L_100d5f8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d604: 0x100d604: lui   a1, 0x0
+// 0x0100d614: 0x100d614: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d608: 0x100d608: lui   a3, 0x0
+// 0x0100d618: 0x100d618: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d60c: 0x100d60c: addiu a1, a1, 24928
+// 0x0100d61c: 0x100d61c: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d610: 0x100d610: addiu a3, a3, 25548
+// 0x0100d620: 0x100d620: addiu a3, a3, 25548
 	ldloc 4
 	ldc.i4 25548
 	add
 	stloc 4
-// 0x0100d614: 0x100d614: addiu a0, zero, 1
+// 0x0100d624: 0x100d624: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d618: 0x100d618: addiu a2, zero, 621
+// 0x0100d628: 0x100d628: addiu a2, zero, 621
 	ldc.i4 621
 	stloc.3
-// 0x0100d61c: 0x100d61c: sw    v1, 16(sp)
+// 0x0100d62c: 0x100d62c: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5323,7 +5323,7 @@ L_100d5f8:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100d620: 0x100d620: jal   0x100449c sw    v0, 20(sp)
+// 0x0100d630: 0x100d630: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5342,23 +5342,23 @@ L_100d5f8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100d628:
-// 0x0100d628: 0x100d628: jal   0x100d128 sll   zero, zero, 0
+L_100d638:
+// 0x0100d638: 0x100d638: jal   0x100d138 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::load_next_tile_100d128(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::load_next_tile_100d138(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d630: 0x100d630: bne   s3, zero, 0x100d6d4 sll   zero, zero, 0
+// 0x0100d640: 0x100d640: bne   s3, zero, 0x100d6e4 sll   zero, zero, 0
 	ldloc 10
-	brtrue L_100d6d4
+	brtrue L_100d6e4
 // --- basic block ---
-// 0x0100d638: 0x100d638: lw    v0, 524(s1)
+// 0x0100d648: 0x100d648: lw    v0, 524(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5367,14 +5367,14 @@ L_100d628:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d63c: 0x100d63c: sll   zero, zero, 0
-// 0x0100d640: 0x100d640: beq   v0, zero, 0x100d650 lui   s3, 0x0
+// 0x0100d64c: 0x100d64c: sll   zero, zero, 0
+// 0x0100d650: 0x100d650: beq   v0, zero, 0x100d660 lui   s3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 10
-	brfalse L_100d650
+	brfalse L_100d660
 // --- basic block ---
-// 0x0100d648: 0x100d648: jalr  v0 sll   zero, zero, 0
+// 0x0100d658: 0x100d658: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5386,30 +5386,30 @@ L_100d628:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100d650:
-// 0x0100d650: 0x100d650: lui   a3, 0x0
+L_100d660:
+// 0x0100d660: 0x100d660: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d654: 0x100d654: addiu a3, a3, 25572
+// 0x0100d664: 0x100d664: addiu a3, a3, 25572
 	ldloc 4
 	ldc.i4 25572
 	add
 	stloc 4
-// 0x0100d658: 0x100d658: addiu a0, zero, 1
+// 0x0100d668: 0x100d668: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d65c: 0x100d65c: addiu a1, s3, 24928
+// 0x0100d66c: 0x100d66c: addiu a1, s3, 24928
 	ldloc 10
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d660: 0x100d660: addiu a2, zero, 291
+// 0x0100d670: 0x100d670: addiu a2, zero, 291
 	ldc.i4 291
 	stloc.3
-// 0x0100d664: 0x100d664: lui   s1, 0x20000
+// 0x0100d674: 0x100d674: lui   s1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0100d668: 0x100d668: jal   0x100449c sw    s0, 16(sp)
+// 0x0100d678: 0x100d678: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5428,56 +5428,56 @@ L_100d650:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d670: 0x100d670: lw    v0, 31272(s1)
+// 0x0100d680: 0x100d680: lw    v0, 31736(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7818
+	ldc.i4 7934
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d674: 0x100d674: sll   zero, zero, 0
-// 0x0100d678: 0x100d678: beq   v0, zero, 0x100d6bc sll   zero, zero, 0
+// 0x0100d684: 0x100d684: sll   zero, zero, 0
+// 0x0100d688: 0x100d688: beq   v0, zero, 0x100d6cc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100d6bc
+	brfalse L_100d6cc
 // --- basic block ---
-// 0x0100d680: 0x100d680: lw    v0, 0(s2)
+// 0x0100d690: 0x100d690: lw    v0, 0(s2)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100d684: 0x100d684: sll   zero, zero, 0
-// 0x0100d688: 0x100d688: andi  v0, v0, 32
+// 0x0100d694: 0x100d694: sll   zero, zero, 0
+// 0x0100d698: 0x100d698: andi  v0, v0, 32
 	ldloc 5
 	ldc.i4.s 32
 	and
 	stloc 5
-// 0x0100d68c: 0x100d68c: beq   v0, zero, 0x100d6bc lui   a3, 0x0
+// 0x0100d69c: 0x100d69c: beq   v0, zero, 0x100d6cc lui   a3, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_100d6bc
+	brfalse L_100d6cc
 // --- basic block ---
-// 0x0100d694: 0x100d694: addiu a0, zero, 1
+// 0x0100d6a4: 0x100d6a4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d698: 0x100d698: addiu a1, s3, 24928
+// 0x0100d6a8: 0x100d6a8: addiu a1, s3, 24928
 	ldloc 10
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d69c: 0x100d69c: addiu a3, a3, 25604
+// 0x0100d6ac: 0x100d6ac: addiu a3, a3, 25604
 	ldloc 4
 	ldc.i4 25604
 	add
 	stloc 4
-// 0x0100d6a0: 0x100d6a0: addiu a2, zero, 294
+// 0x0100d6b0: 0x100d6b0: addiu a2, zero, 294
 	ldc.i4 294
 	stloc.3
-// 0x0100d6a4: 0x100d6a4: jal   0x100449c sw    s0, 16(sp)
+// 0x0100d6b4: 0x100d6b4: jal   0x100449c sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5496,17 +5496,17 @@ L_100d650:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d6ac: 0x100d6ac: lw    v0, 31272(s1)
+// 0x0100d6bc: 0x100d6bc: lw    v0, 31736(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7818
+	ldc.i4 7934
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d6b0: 0x100d6b0: sll   zero, zero, 0
-// 0x0100d6b4: 0x100d6b4: jalr  v0 addu  a0, s0, zero
+// 0x0100d6c0: 0x100d6c0: sll   zero, zero, 0
+// 0x0100d6c4: 0x100d6c4: jalr  v0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
@@ -5520,36 +5520,36 @@ L_100d650:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100d6bc:
-// 0x0100d6bc: 0x100d6bc: jal   0x101f804 addu  a0, s0, zero
+L_100d6cc:
+// 0x0100d6cc: 0x100d6cc: jal   0x101f814 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl23::roadmap_screen_in_view_101f804(int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_in_view_101f814(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d6c4: 0x100d6c4: beq   v0, zero, 0x100d6d4 sll   zero, zero, 0
+// 0x0100d6d4: 0x100d6d4: beq   v0, zero, 0x100d6e4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100d6d4
+	brfalse L_100d6e4
 // --- basic block ---
-// 0x0100d6cc: 0x100d6cc: jal   0x1021900 sll   zero, zero, 0
+// 0x0100d6dc: 0x100d6dc: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_100d6d4:
-// 0x0100d6d4: 0x100d6d4: lw    ra, 44(sp)
-// 0x0100d6d8: 0x100d6d8: lw    s3, 40(sp)
+L_100d6e4:
+// 0x0100d6e4: 0x100d6e4: lw    ra, 44(sp)
+// 0x0100d6e8: 0x100d6e8: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5558,7 +5558,7 @@ L_100d6d4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100d6dc: 0x100d6dc: lw    s2, 36(sp)
+// 0x0100d6ec: 0x100d6ec: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5567,7 +5567,7 @@ L_100d6d4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100d6e0: 0x100d6e0: lw    s1, 32(sp)
+// 0x0100d6f0: 0x100d6f0: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5576,7 +5576,7 @@ L_100d6d4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d6e4: 0x100d6e4: lw    s0, 28(sp)
+// 0x0100d6f4: 0x100d6f4: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5585,7 +5585,7 @@ L_100d6d4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100d6e8: 0x100d6e8: jr    ra addiu sp, sp, 48
+// 0x0100d6f8: 0x100d6f8: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5597,7 +5597,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 http_cb_error_100d6f0(int32,int32,int32,int32,int32)
+.method public static int32 http_cb_error_100d700(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -5641,18 +5641,18 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_100d6f0:
-// 0x0100d6f0: 0x100d6f0: addiu sp, sp, -1072
+L_100d700:
+// 0x0100d700: 0x100d700: addiu sp, sp, -1072
 	ldloc.0
 	ldc.i4 -1072
 	add
 	stloc.0
-// 0x0100d6f4: 0x100d6f4: addiu v0, sp, 1084
+// 0x0100d704: 0x100d704: addiu v0, sp, 1084
 	ldloc.0
 	ldc.i4 1084
 	add
 	stloc 6
-// 0x0100d6f8: 0x100d6f8: sw    s1, 1060(sp)
+// 0x0100d708: 0x100d708: sw    s1, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5661,12 +5661,12 @@ L_100d6f0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100d6fc: 0x100d6fc: addiu s1, sp, 28
+// 0x0100d70c: 0x100d70c: addiu s1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
 	stloc 9
-// 0x0100d700: 0x100d700: sw    s2, 1064(sp)
+// 0x0100d710: 0x100d710: sw    s2, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5675,7 +5675,7 @@ L_100d6f0:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0100d704: 0x100d704: sw    s0, 1056(sp)
+// 0x0100d714: 0x100d714: sw    s0, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5684,7 +5684,7 @@ L_100d6f0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d708: 0x100d708: sw    a3, 1084(sp)
+// 0x0100d718: 0x100d718: sw    a3, 1084(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5693,23 +5693,23 @@ L_100d6f0:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0100d70c: 0x100d70c: addu  s0, a0, zero
+// 0x0100d71c: 0x100d71c: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x0100d710: 0x100d710: addu  s2, a1, zero
+// 0x0100d720: 0x100d720: addu  s2, a1, zero
 	ldloc.2
 	stloc 10
-// 0x0100d714: 0x100d714: addu  a3, v0, zero
+// 0x0100d724: 0x100d724: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x0100d718: 0x100d718: addiu a1, zero, 1024
+// 0x0100d728: 0x100d728: addiu a1, zero, 1024
 	ldc.i4 1024
 	stloc.2
-// 0x0100d71c: 0x100d71c: addu  a0, s1, zero
+// 0x0100d72c: 0x100d72c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0100d720: 0x100d720: sw    ra, 1068(sp)
-// 0x0100d724: 0x100d724: jal   0x10c0a70 sw    v0, 24(sp)
+// 0x0100d730: 0x100d730: sw    ra, 1068(sp)
+// 0x0100d734: 0x100d734: jal   0x10c10b0 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5723,12 +5723,12 @@ L_100d6f0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d72c: 0x100d72c: lw    v0, 4(s0)
+// 0x0100d73c: 0x100d73c: lw    v0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5737,55 +5737,55 @@ L_100d6f0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d730: 0x100d730: beq   s2, zero, 0x100d750 lui   a1, 0x0
+// 0x0100d740: 0x100d740: beq   s2, zero, 0x100d760 lui   a1, 0x0
 	ldloc 10
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_100d750
+	brfalse L_100d760
 // --- basic block ---
-// 0x0100d738: 0x100d738: lui   a3, 0x0
+// 0x0100d748: 0x100d748: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d73c: 0x100d73c: addiu a1, a1, 24928
+// 0x0100d74c: 0x100d74c: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d740: 0x100d740: addiu a3, a3, 25636
+// 0x0100d750: 0x100d750: addiu a3, a3, 25636
 	ldloc 4
 	ldc.i4 25636
 	add
 	stloc 4
-// 0x0100d744: 0x100d744: addiu a0, zero, 4
+// 0x0100d754: 0x100d754: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100d748: 0x100d748: j	 0x100d764 addiu a2, zero, 208
+// 0x0100d758: 0x100d758: j	 0x100d774 addiu a2, zero, 208
 	ldc.i4 208
 	stloc.3
-	br L_100d764
+	br L_100d774
 // --- basic block ---
-L_100d750:
-// 0x0100d750: 0x100d750: lui   a3, 0x0
+L_100d760:
+// 0x0100d760: 0x100d760: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d754: 0x100d754: addiu a1, a1, 24928
+// 0x0100d764: 0x100d764: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d758: 0x100d758: addiu a3, a3, 25668
+// 0x0100d768: 0x100d768: addiu a3, a3, 25668
 	ldloc 4
 	ldc.i4 25668
 	add
 	stloc 4
-// 0x0100d75c: 0x100d75c: addiu a0, zero, 1
+// 0x0100d76c: 0x100d76c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d760: 0x100d760: addiu a2, zero, 210
+// 0x0100d770: 0x100d770: addiu a2, zero, 210
 	ldc.i4 210
 	stloc.3
-L_100d764:
-// 0x0100d764: 0x100d764: sw    v0, 16(sp)
+L_100d774:
+// 0x0100d774: 0x100d774: sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5794,7 +5794,7 @@ L_100d764:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0100d768: 0x100d768: jal   0x100449c sw    s1, 20(sp)
+// 0x0100d778: 0x100d778: jal   0x100449c sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5813,7 +5813,7 @@ L_100d764:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d770: 0x100d770: lw    a0, 528(s0)
+// 0x0100d780: 0x100d780: lw    a0, 528(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5822,14 +5822,14 @@ L_100d764:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d774: 0x100d774: sll   zero, zero, 0
-// 0x0100d778: 0x100d778: beq   a0, zero, 0x100d790 lui   v1, 0x0
+// 0x0100d784: 0x100d784: sll   zero, zero, 0
+// 0x0100d788: 0x100d788: beq   a0, zero, 0x100d7a0 lui   v1, 0x0
 	ldloc.1
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_100d790
+	brfalse L_100d7a0
 // --- basic block ---
-// 0x0100d780: 0x100d780: jal   0x1000930 sll   zero, zero, 0
+// 0x0100d790: 0x100d790: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -5840,7 +5840,7 @@ L_100d764:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d788: 0x100d788: sw    zero, 528(s0)
+// 0x0100d798: 0x100d798: sw    zero, 528(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -5849,11 +5849,11 @@ L_100d764:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d78c: 0x100d78c: lui   v1, 0x0
+// 0x0100d79c: 0x100d79c: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 7
-L_100d790:
-// 0x0100d790: 0x100d790: lw    a1, 776(v1)
+L_100d7a0:
+// 0x0100d7a0: 0x100d7a0: lw    a1, 776(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5862,50 +5862,50 @@ L_100d790:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100d794: 0x100d794: sll   zero, zero, 0
-// 0x0100d798: 0x100d798: bltz  a1, 0x100d7fc lui   v0, 0x20000
+// 0x0100d7a4: 0x100d7a4: sll   zero, zero, 0
+// 0x0100d7a8: 0x100d7a8: bltz  a1, 0x100d80c lui   v0, 0x20000
 	ldloc.2
 	ldc.i4 131072
 	stloc 6
 	ldc.i4.s 0
-	blt L_100d7fc
+	blt L_100d80c
 // --- basic block ---
-// 0x0100d7a0: 0x100d7a0: lw    a0, 31260(v0)
+// 0x0100d7b0: 0x100d7b0: lw    a0, 31724(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d7a4: 0x100d7a4: sll   zero, zero, 0
-// 0x0100d7a8: 0x100d7a8: addiu a0, a0, 1
+// 0x0100d7b4: 0x100d7b4: sll   zero, zero, 0
+// 0x0100d7b8: 0x100d7b8: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0100d7ac: 0x100d7ac: slt   a1, a0, a1
+// 0x0100d7bc: 0x100d7bc: slt   a1, a0, a1
 	ldloc.1
 	ldloc.2
 	clt
 	stloc.2
-// 0x0100d7b0: 0x100d7b0: bne   a1, zero, 0x100d7cc sw    a0, 31260(v0)
+// 0x0100d7c0: 0x100d7c0: bne   a1, zero, 0x100d7dc sw    a0, 31724(v0)
 	ldloc.2
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_100d7cc
+	brtrue L_100d7dc
 // --- basic block ---
-// 0x0100d7b8: 0x100d7b8: addiu a0, zero, -1
+// 0x0100d7c8: 0x100d7c8: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0100d7bc: 0x100d7bc: sw    a0, 776(v1)
+// 0x0100d7cc: 0x100d7cc: sw    a0, 776(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -5914,12 +5914,12 @@ L_100d790:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0100d7c0: 0x100d7c0: jal   0x102146c sw    zero, 31260(v0)
+// 0x0100d7d0: 0x100d7d0: jal   0x102147c sw    zero, 31724(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -5928,28 +5928,28 @@ L_100d790:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d7c8: 0x100d7c8: lui   v0, 0x20000
+// 0x0100d7d8: 0x100d7d8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-L_100d7cc:
-// 0x0100d7cc: 0x100d7cc: lw    v1, 31260(v0)
+L_100d7dc:
+// 0x0100d7dc: 0x100d7dc: lw    v1, 31724(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7815
+	ldc.i4 7931
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d7d0: 0x100d7d0: lui   v0, 0x0
+// 0x0100d7e0: 0x100d7e0: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0100d7d4: 0x100d7d4: lw    v0, 776(v0)
+// 0x0100d7e4: 0x100d7e4: lw    v0, 776(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5958,29 +5958,29 @@ L_100d7cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d7d8: 0x100d7d8: lui   a1, 0x0
+// 0x0100d7e8: 0x100d7e8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d7dc: 0x100d7dc: lui   a3, 0x0
+// 0x0100d7ec: 0x100d7ec: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100d7e0: 0x100d7e0: addiu a1, a1, 24928
+// 0x0100d7f0: 0x100d7f0: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d7e4: 0x100d7e4: addiu a3, a3, 25548
+// 0x0100d7f4: 0x100d7f4: addiu a3, a3, 25548
 	ldloc 4
 	ldc.i4 25548
 	add
 	stloc 4
-// 0x0100d7e8: 0x100d7e8: addiu a0, zero, 1
+// 0x0100d7f8: 0x100d7f8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0100d7ec: 0x100d7ec: addiu a2, zero, 621
+// 0x0100d7fc: 0x100d7fc: addiu a2, zero, 621
 	ldc.i4 621
 	stloc.3
-// 0x0100d7f0: 0x100d7f0: sw    v1, 16(sp)
+// 0x0100d800: 0x100d800: sw    v1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5989,7 +5989,7 @@ L_100d7cc:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0100d7f4: 0x100d7f4: jal   0x100449c sw    v0, 20(sp)
+// 0x0100d804: 0x100d804: jal   0x100449c sw    v0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6008,8 +6008,8 @@ L_100d7cc:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100d7fc:
-// 0x0100d7fc: 0x100d7fc: sw    zero, 536(s0)
+L_100d80c:
+// 0x0100d80c: 0x100d80c: sw    zero, 536(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6018,14 +6018,14 @@ L_100d7fc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d800: 0x100d800: sw    zero, 0(s0)
+// 0x0100d810: 0x100d810: sw    zero, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d804: 0x100d804: lw    v0, 8(s0)
+// 0x0100d814: 0x100d814: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6034,7 +6034,7 @@ L_100d7fc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0100d808: 0x100d808: lw    a2, 524(s0)
+// 0x0100d818: 0x100d818: lw    a2, 524(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6043,35 +6043,35 @@ L_100d7fc:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100d80c: 0x100d80c: beq   s2, zero, 0x100d878 addiu v1, zero, -14
+// 0x0100d81c: 0x100d81c: beq   s2, zero, 0x100d888 addiu v1, zero, -14
 	ldloc 10
 	ldc.i4.s -14
 	stloc 7
-	brfalse L_100d878
+	brfalse L_100d888
 // --- basic block ---
-// 0x0100d814: 0x100d814: lw    a1, 0(v0)
+// 0x0100d824: 0x100d824: lw    a1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0100d818: 0x100d818: addiu v1, zero, -9
+// 0x0100d828: 0x100d828: addiu v1, zero, -9
 	ldc.i4.s -9
 	stloc 7
-// 0x0100d81c: 0x100d81c: and   a1, a1, v1
+// 0x0100d82c: 0x100d82c: and   a1, a1, v1
 	ldloc.2
 	ldloc 7
 	and
 	stloc.2
-// 0x0100d820: 0x100d820: sw    a1, 0(v0)
+// 0x0100d830: 0x100d830: sw    a1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0100d824: 0x100d824: lw    a0, 4(s0)
+// 0x0100d834: 0x100d834: lw    a0, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6080,10 +6080,10 @@ L_100d7fc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d828: 0x100d828: lui   v0, 0xff0000
+// 0x0100d838: 0x100d838: lui   v0, 0xff0000
 	ldc.i4 16711680
 	stloc 6
-// 0x0100d82c: 0x100d82c: jal   0x100cd5c and   a1, a1, v0
+// 0x0100d83c: 0x100d83c: jal   0x100cd6c and   a1, a1, v0
 	ldloc.2
 	ldloc 6
 	and
@@ -6093,53 +6093,53 @@ L_100d7fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::queue_tile_100cd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::queue_tile_100cd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d834: 0x100d834: lui   v1, 0x20000
+// 0x0100d844: 0x100d844: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0100d838: 0x100d838: lw    a1, 31296(v1)
+// 0x0100d848: 0x100d848: lw    a1, 31760(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100d83c: 0x100d83c: lui   v0, 0x20000
+// 0x0100d84c: 0x100d84c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100d840: 0x100d840: addiu a1, a1, -1
+// 0x0100d850: 0x100d850: addiu a1, a1, -1
 	ldloc.2
 	ldc.i4.m1
 	add
 	stloc.2
-// 0x0100d844: 0x100d844: lw    a0, 31276(v0)
+// 0x0100d854: 0x100d854: lw    a0, 31740(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d848: 0x100d848: sw    a1, 31296(v1)
+// 0x0100d858: 0x100d858: sw    a1, 31760(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldloc.2
 	stelem.i4
-// 0x0100d84c: 0x100d84c: addiu v1, zero, 2
+// 0x0100d85c: 0x100d85c: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 7
-// 0x0100d850: 0x100d850: bne   a0, v1, 0x100d8b0 sw    zero, 8(s0)
+// 0x0100d860: 0x100d860: bne   a0, v1, 0x100d8c0 sw    zero, 8(s0)
 	ldloc.1
 	ldloc 7
 	ldloc 5
@@ -6150,28 +6150,28 @@ L_100d7fc:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	bne.un L_100d8b0
+	bne.un L_100d8c0
 // --- basic block ---
-// 0x0100d858: 0x100d858: lui   a1, 0x1010000
+// 0x0100d868: 0x100d868: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0100d85c: 0x100d85c: addiu v1, zero, 1
+// 0x0100d86c: 0x100d86c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0100d860: 0x100d860: addiu a1, a1, -10040
+// 0x0100d870: 0x100d870: addiu a1, a1, -10024
 	ldloc.2
-	ldc.i4 -10040
+	ldc.i4 -10024
 	add
 	stloc.2
-// 0x0100d864: 0x100d864: addiu a0, zero, 20000
+// 0x0100d874: 0x100d874: addiu a0, zero, 20000
 	ldc.i4 20000
 	stloc.1
-// 0x0100d868: 0x100d868: jal   0x104fe98 sw    v1, 31276(v0)
+// 0x0100d878: 0x100d878: jal   0x104fea8 sw    v1, 31740(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldloc 7
 	stelem.i4
@@ -6180,34 +6180,34 @@ L_100d7fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0100d870: 0x100d870: j	 0x100d8b0 sll   zero, zero, 0
-	br L_100d8b0
+// 0x0100d880: 0x100d880: j	 0x100d8c0 sll   zero, zero, 0
+	br L_100d8c0
 // --- basic block ---
-L_100d878:
-// 0x0100d878: 0x100d878: lw    a0, 0(v0)
+L_100d888:
+// 0x0100d888: 0x100d888: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0100d87c: 0x100d87c: sll   zero, zero, 0
-// 0x0100d880: 0x100d880: and   v1, a0, v1
+// 0x0100d88c: 0x100d88c: sll   zero, zero, 0
+// 0x0100d890: 0x100d890: and   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	and
 	stloc 7
-// 0x0100d884: 0x100d884: ori   v1, v1, 5
+// 0x0100d894: 0x100d894: ori   v1, v1, 5
 	ldloc 7
 	ldc.i4.5
 	or
 	stloc 7
-// 0x0100d888: 0x100d888: beq   a2, zero, 0x100d898 sw    v1, 0(v0)
+// 0x0100d898: 0x100d898: beq   a2, zero, 0x100d8a8 sw    v1, 0(v0)
 	ldloc.3
 	ldloc 5
 	ldloc 6
@@ -6215,9 +6215,9 @@ L_100d878:
 	shr.un
 	ldloc 7
 	stelem.i4
-	brfalse L_100d898
+	brfalse L_100d8a8
 // --- basic block ---
-// 0x0100d890: 0x100d890: jalr  a2 sll   zero, zero, 0
+// 0x0100d8a0: 0x100d8a0: jalr  a2 sll   zero, zero, 0
 	ldloc.3
 	ldloc.0
 	ldloc.1
@@ -6229,20 +6229,20 @@ L_100d878:
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100d898:
-// 0x0100d898: 0x100d898: lui   v0, 0x20000
+L_100d8a8:
+// 0x0100d8a8: 0x100d8a8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x0100d89c: 0x100d89c: lw    v1, 31296(v0)
+// 0x0100d8ac: 0x100d8ac: lw    v1, 31760(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d8a0: 0x100d8a0: sw    zero, 8(s0)
+// 0x0100d8b0: 0x100d8b0: sw    zero, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -6251,17 +6251,17 @@ L_100d898:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100d8a4: 0x100d8a4: addiu v1, v1, -1
+// 0x0100d8b4: 0x100d8b4: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0100d8a8: 0x100d8a8: jal   0x100d128 sw    v1, 31296(v0)
+// 0x0100d8b8: 0x100d8b8: jal   0x100d138 sw    v1, 31760(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldloc 7
 	stelem.i4
@@ -6270,14 +6270,14 @@ L_100d898:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::load_next_tile_100d128(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::load_next_tile_100d138(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_100d8b0:
-// 0x0100d8b0: 0x100d8b0: lw    ra, 1068(sp)
-// 0x0100d8b4: 0x100d8b4: lw    s2, 1064(sp)
+L_100d8c0:
+// 0x0100d8c0: 0x100d8c0: lw    ra, 1068(sp)
+// 0x0100d8c4: 0x100d8c4: lw    s2, 1064(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6286,7 +6286,7 @@ L_100d8b0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0100d8b8: 0x100d8b8: lw    s1, 1060(sp)
+// 0x0100d8c8: 0x100d8c8: lw    s1, 1060(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6295,7 +6295,7 @@ L_100d8b0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100d8bc: 0x100d8bc: lw    s0, 1056(sp)
+// 0x0100d8cc: 0x100d8cc: lw    s0, 1056(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6304,7 +6304,7 @@ L_100d8b0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d8c0: 0x100d8c0: jr    ra addiu sp, sp, 1072
+// 0x0100d8d0: 0x100d8d0: jr    ra addiu sp, sp, 1072
 	ldloc.0
 	ldc.i4 1072
 	add
@@ -6316,7 +6316,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 start_network_100d8c8(int32,int32,int32,int32,int32)
+.method public static int32 start_network_100d8d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -6351,37 +6351,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100d8c8: 0x100d8c8: lui   a0, 0x10000
+// 0x0100d8d8: 0x100d8d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0100d8cc: 0x100d8cc: lui   a1, 0x0
+// 0x0100d8dc: 0x100d8dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d8d0: 0x100d8d0: lui   a2, 0x10000
+// 0x0100d8e0: 0x100d8e0: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0100d8d4: 0x100d8d4: addiu sp, sp, -24
+// 0x0100d8e4: 0x100d8e4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100d8d8: 0x100d8d8: addiu a0, a0, 12560
+// 0x0100d8e8: 0x100d8e8: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x0100d8dc: 0x100d8dc: addiu a1, a1, 828
+// 0x0100d8ec: 0x100d8ec: addiu a1, a1, 828
 	ldloc.2
 	ldc.i4 828
 	add
 	stloc.2
-// 0x0100d8e0: 0x100d8e0: addiu a2, a2, 18500
+// 0x0100d8f0: 0x100d8f0: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0100d8e4: 0x100d8e4: sw    ra, 20(sp)
-// 0x0100d8e8: 0x100d8e8: jal   0x100edb0 addu  a3, zero, zero
+// 0x0100d8f4: 0x100d8f4: sw    ra, 20(sp)
+// 0x0100d8f8: 0x100d8f8: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -6389,23 +6389,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d8f0: 0x100d8f0: addiu v1, zero, 2
+// 0x0100d900: 0x100d900: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x0100d8f4: 0x100d8f4: lui   v0, 0x20000
+// 0x0100d904: 0x100d904: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100d8f8: 0x100d8f8: jal   0x100d128 sw    v1, 31276(v0)
+// 0x0100d908: 0x100d908: jal   0x100d138 sw    v1, 31740(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7819
+	ldc.i4 7935
 	add
 	ldloc 6
 	stelem.i4
@@ -6414,14 +6414,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::load_next_tile_100d128(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::load_next_tile_100d138(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0100d900: 0x100d900: lw    ra, 20(sp)
-// 0x0100d904: 0x100d904: sll   zero, zero, 0
-// 0x0100d908: 0x100d908: jr    ra addiu sp, sp, 24
+// 0x0100d910: 0x100d910: lw    ra, 20(sp)
+// 0x0100d914: 0x100d914: sll   zero, zero, 0
+// 0x0100d918: 0x100d918: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6433,7 +6433,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_manager_login_cb_100d910(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_manager_login_cb_100d920(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -6471,13 +6471,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100d910: 0x100d910: addiu sp, sp, -24
+// 0x0100d920: 0x100d920: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0100d914: 0x100d914: sw    ra, 20(sp)
-// 0x0100d918: 0x100d918: jal   0x100d8c8 sw    s0, 16(sp)
+// 0x0100d924: 0x100d924: sw    ra, 20(sp)
+// 0x0100d928: 0x100d928: jal   0x100d8d8 sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6491,23 +6491,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::start_network_100d8c8(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::start_network_100d8d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100d920: 0x100d920: lui   a1, 0x1010000
+// 0x0100d930: 0x100d930: lui   a1, 0x1010000
 	ldc.i4 16842752
 	stloc.2
-// 0x0100d924: 0x100d924: addiu a1, a1, -9888
+// 0x0100d934: 0x100d934: addiu a1, a1, -9872
 	ldloc.2
-	ldc.i4 -9888
+	ldc.i4 -9872
 	add
 	stloc.2
-// 0x0100d928: 0x100d928: addiu a0, zero, 20000
+// 0x0100d938: 0x100d938: addiu a0, zero, 20000
 	ldc.i4 20000
 	stloc.1
-// 0x0100d92c: 0x100d92c: jal   0x104fe98 lui   s0, 0x20000
+// 0x0100d93c: 0x100d93c: jal   0x104fea8 lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 7
 	ldloc.0
@@ -6515,26 +6515,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100d934: 0x100d934: lw    v0, 31280(s0)
+// 0x0100d944: 0x100d944: lw    v0, 31744(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7820
+	ldc.i4 7936
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d938: 0x100d938: sll   zero, zero, 0
-// 0x0100d93c: 0x100d93c: beq   v0, zero, 0x100d950 sll   zero, zero, 0
+// 0x0100d948: 0x100d948: sll   zero, zero, 0
+// 0x0100d94c: 0x100d94c: beq   v0, zero, 0x100d960 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100d950
+	brfalse L_100d960
 // --- basic block ---
-// 0x0100d944: 0x100d944: jalr  v0 sll   zero, zero, 0
+// 0x0100d954: 0x100d954: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -6546,18 +6546,18 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0100d94c: 0x100d94c: sw    zero, 31280(s0)
+// 0x0100d95c: 0x100d95c: sw    zero, 31744(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7820
+	ldc.i4 7936
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_100d950:
-// 0x0100d950: 0x100d950: lw    ra, 20(sp)
-// 0x0100d954: 0x100d954: lw    s0, 16(sp)
+L_100d960:
+// 0x0100d960: 0x100d960: lw    ra, 20(sp)
+// 0x0100d964: 0x100d964: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6566,7 +6566,7 @@ L_100d950:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100d958: 0x100d958: jr    ra addiu sp, sp, 24
+// 0x0100d968: 0x100d968: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6578,7 +6578,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_manager_check_timeouts_100d960(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_manager_check_timeouts_100d970(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -6616,13 +6616,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100d960: 0x100d960: addiu sp, sp, -32
+// 0x0100d970: 0x100d970: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100d964: 0x100d964: sw    ra, 28(sp)
-// 0x0100d968: 0x100d968: sw    s0, 24(sp)
+// 0x0100d974: 0x100d974: sw    ra, 28(sp)
+// 0x0100d978: 0x100d978: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6631,31 +6631,31 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100d96c: 0x100d96c: addu  v1, zero, zero
+// 0x0100d97c: 0x100d97c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0100d970: 0x100d970: cibyl_sysc_arg 0x3
+// 0x0100d980: 0x100d980: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x0100d974: 0x100d974: cibyl_sysc 0x293
+// 0x0100d984: 0x100d984: cibyl_sysc 0x293
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0100d978: 0x100d978: addu  v1, v0, zero
+// 0x0100d988: 0x100d988: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x0100d97c: 0x100d97c: lui   v0, 0x20000
+// 0x0100d98c: 0x100d98c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100d980: 0x100d980: lw    s0, 31292(v0)
+// 0x0100d990: 0x100d990: lw    s0, 31756(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7823
+	ldc.i4 7939
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100d984: 0x100d984: sll   zero, zero, 0
-// 0x0100d988: 0x100d988: lw    v0, 8(s0)
+// 0x0100d994: 0x100d994: sll   zero, zero, 0
+// 0x0100d998: 0x100d998: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6664,34 +6664,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d98c: 0x100d98c: sll   zero, zero, 0
-// 0x0100d990: 0x100d990: beq   v0, zero, 0x100da18 sll   zero, zero, 0
+// 0x0100d99c: 0x100d99c: sll   zero, zero, 0
+// 0x0100d9a0: 0x100d9a0: beq   v0, zero, 0x100da28 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_100da18
+	brfalse L_100da28
 // --- basic block ---
-// 0x0100d998: 0x100d998: lw    v0, 0(s0)
+// 0x0100d9a8: 0x100d9a8: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0100d99c: 0x100d99c: sll   zero, zero, 0
-// 0x0100d9a0: 0x100d9a0: beq   v0, zero, 0x100da18 slt   v1, v0, v1
+// 0x0100d9ac: 0x100d9ac: sll   zero, zero, 0
+// 0x0100d9b0: 0x100d9b0: beq   v0, zero, 0x100da28 slt   v1, v0, v1
 	ldloc 5
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 7
-	brfalse L_100da18
+	brfalse L_100da28
 // --- basic block ---
-// 0x0100d9a8: 0x100d9a8: beq   v1, zero, 0x100da18 lui   a3, 0x0
+// 0x0100d9b8: 0x100d9b8: beq   v1, zero, 0x100da28 lui   a3, 0x0
 	ldloc 7
 	ldc.i4.s 0
 	stloc 4
-	brfalse L_100da18
+	brfalse L_100da28
 // --- basic block ---
-// 0x0100d9b0: 0x100d9b0: lw    v0, 4(s0)
+// 0x0100d9c0: 0x100d9c0: lw    v0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6700,26 +6700,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d9b4: 0x100d9b4: lui   a1, 0x0
+// 0x0100d9c4: 0x100d9c4: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100d9b8: 0x100d9b8: addiu a1, a1, 24928
+// 0x0100d9c8: 0x100d9c8: addiu a1, a1, 24928
 	ldloc.2
 	ldc.i4 24928
 	add
 	stloc.2
-// 0x0100d9bc: 0x100d9bc: addiu a3, a3, 25700
+// 0x0100d9cc: 0x100d9cc: addiu a3, a3, 25700
 	ldloc 4
 	ldc.i4 25700
 	add
 	stloc 4
-// 0x0100d9c0: 0x100d9c0: addiu a2, zero, 435
+// 0x0100d9d0: 0x100d9d0: addiu a2, zero, 435
 	ldc.i4 435
 	stloc.3
-// 0x0100d9c4: 0x100d9c4: addiu a0, zero, 4
+// 0x0100d9d4: 0x100d9d4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100d9c8: 0x100d9c8: jal   0x100449c sw    v0, 16(sp)
+// 0x0100d9d8: 0x100d9d8: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6738,7 +6738,7 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d9d0: 0x100d9d0: lw    a0, 536(s0)
+// 0x0100d9e0: 0x100d9e0: lw    a0, 536(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6747,18 +6747,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d9d4: 0x100d9d4: jal   0x1045d7c sll   zero, zero, 0
+// 0x0100d9e4: 0x100d9e4: jal   0x1045d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl51::roadmap_http_async_copy_abort_1045d7c(int32,int32,int32,int32,int32)
+	call int32 Cibyl51::roadmap_http_async_copy_abort_1045d8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100d9dc: 0x100d9dc: lw    v0, 8(s0)
+// 0x0100d9ec: 0x100d9ec: lw    v0, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6767,17 +6767,17 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100d9e0: 0x100d9e0: addiu v1, zero, -9
+// 0x0100d9f0: 0x100d9f0: addiu v1, zero, -9
 	ldc.i4.s -9
 	stloc 7
-// 0x0100d9e4: 0x100d9e4: lw    a1, 0(v0)
+// 0x0100d9f4: 0x100d9f4: lw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0100d9e8: 0x100d9e8: lw    a2, 524(s0)
+// 0x0100d9f8: 0x100d9f8: lw    a2, 524(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6786,19 +6786,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100d9ec: 0x100d9ec: and   a1, a1, v1
+// 0x0100d9fc: 0x100d9fc: and   a1, a1, v1
 	ldloc.2
 	ldloc 7
 	and
 	stloc.2
-// 0x0100d9f0: 0x100d9f0: sw    a1, 0(v0)
+// 0x0100da00: 0x100da00: sw    a1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x0100d9f4: 0x100d9f4: lw    a0, 4(s0)
+// 0x0100da04: 0x100da04: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6807,10 +6807,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100d9f8: 0x100d9f8: lui   v0, 0xff0000
+// 0x0100da08: 0x100da08: lui   v0, 0xff0000
 	ldc.i4 16711680
 	stloc 5
-// 0x0100d9fc: 0x100d9fc: jal   0x100cd5c and   a1, a1, v0
+// 0x0100da0c: 0x100da0c: jal   0x100cd6c and   a1, a1, v0
 	ldloc.2
 	ldloc 5
 	and
@@ -6820,24 +6820,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::queue_tile_100cd5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::queue_tile_100cd6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0100da04: 0x100da04: lui   v0, 0x20000
+// 0x0100da14: 0x100da14: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0100da08: 0x100da08: lw    v1, 31296(v0)
+// 0x0100da18: 0x100da18: lw    v1, 31760(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldelem.i4
 	stloc 7
-// 0x0100da0c: 0x100da0c: sw    zero, 8(s0)
+// 0x0100da1c: 0x100da1c: sw    zero, 8(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -6846,23 +6846,23 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100da10: 0x100da10: addiu v1, v1, -1
+// 0x0100da20: 0x100da20: addiu v1, v1, -1
 	ldloc 7
 	ldc.i4.m1
 	add
 	stloc 7
-// 0x0100da14: 0x100da14: sw    v1, 31296(v0)
+// 0x0100da24: 0x100da24: sw    v1, 31760(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7824
+	ldc.i4 7940
 	add
 	ldloc 7
 	stelem.i4
-L_100da18:
-// 0x0100da18: 0x100da18: lw    ra, 28(sp)
-// 0x0100da1c: 0x100da1c: lw    s0, 24(sp)
+L_100da28:
+// 0x0100da28: 0x100da28: lw    ra, 28(sp)
+// 0x0100da2c: 0x100da2c: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6871,7 +6871,7 @@ L_100da18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100da20: 0x100da20: jr    ra addiu sp, sp, 32
+// 0x0100da30: 0x100da30: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -6883,7 +6883,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 roadmap_tile_status_add_100da28(int32,int32,int32,int32,int32)
+.method public static int32 roadmap_tile_status_add_100da38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 s1,int32 s2,int32 lo,int32 s0,int32 hi,int32 ra)
@@ -6933,12 +6933,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0100da28: 0x100da28: addiu sp, sp, -32
+// 0x0100da38: 0x100da38: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0100da2c: 0x100da2c: sw    s2, 24(sp)
+// 0x0100da3c: 0x100da3c: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6947,10 +6947,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0100da30: 0x100da30: lui   s2, 0x30000
+// 0x0100da40: 0x100da40: lui   s2, 0x30000
 	ldc.i4 196608
 	stloc 9
-// 0x0100da34: 0x100da34: sw    s1, 20(sp)
+// 0x0100da44: 0x100da44: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6959,24 +6959,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0100da38: 0x100da38: lw    s1, -31164(s2)
+// 0x0100da48: 0x100da48: lw    s1, -30700(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7791
+	ldc.i4 -7675
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100da3c: 0x100da3c: lui   v0, 0x10000
+// 0x0100da4c: 0x100da4c: lui   v0, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x0100da40: 0x100da40: slt   v0, s1, v0
+// 0x0100da50: 0x100da50: slt   v0, s1, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x0100da44: 0x100da44: sw    s0, 16(sp)
+// 0x0100da54: 0x100da54: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6985,48 +6985,48 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0100da48: 0x100da48: sw    ra, 28(sp)
-// 0x0100da4c: 0x100da4c: bne   v0, zero, 0x100da70 addu  s0, a0, zero
+// 0x0100da58: 0x100da58: sw    ra, 28(sp)
+// 0x0100da5c: 0x100da5c: bne   v0, zero, 0x100da80 addu  s0, a0, zero
 	ldloc 6
 	ldloc.1
 	stloc 11
-	brtrue L_100da70
+	brtrue L_100da80
 // --- basic block ---
-// 0x0100da54: 0x100da54: lui   a1, 0x0
+// 0x0100da64: 0x100da64: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100da58: 0x100da58: lui   a3, 0x0
+// 0x0100da68: 0x100da68: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100da5c: 0x100da5c: addiu a1, a1, 25784
+// 0x0100da6c: 0x100da6c: addiu a1, a1, 25784
 	ldloc.2
 	ldc.i4 25784
 	add
 	stloc.2
-// 0x0100da60: 0x100da60: addiu a3, a3, 25816
+// 0x0100da70: 0x100da70: addiu a3, a3, 25816
 	ldloc 4
 	ldc.i4 25816
 	add
 	stloc 4
-// 0x0100da64: 0x100da64: addiu a0, zero, 4
+// 0x0100da74: 0x100da74: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100da68: 0x100da68: j	 0x100dae0 addiu a2, zero, 62
+// 0x0100da78: 0x100da78: j	 0x100daf0 addiu a2, zero, 62
 	ldc.i4.s 62
 	stloc.3
-	br L_100dae0
+	br L_100daf0
 // --- basic block ---
-L_100da70:
-// 0x0100da70: 0x100da70: andi  v0, s1, 4095
+L_100da80:
+// 0x0100da80: 0x100da80: andi  v0, s1, 4095
 	ldloc 8
 	ldc.i4 4095
 	and
 	stloc 6
-// 0x0100da74: 0x100da74: bne   v0, zero, 0x100db1c sll   zero, zero, 0
+// 0x0100da84: 0x100da84: bne   v0, zero, 0x100db2c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_100db1c
+	brtrue L_100db2c
 // --- basic block ---
-// 0x0100da7c: 0x100da7c: jal   0x1000910 ori   a0, zero, 32768
+// 0x0100da8c: 0x100da8c: jal   0x1000910 ori   a0, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
@@ -7041,10 +7041,10 @@ L_100da70:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100da84: 0x100da84: addiu v1, zero, 4096
+// 0x0100da94: 0x100da94: addiu v1, zero, 4096
 	ldc.i4 4096
 	stloc 5
-// 0x0100da88: 0x100da88: div   s1, v1
+// 0x0100da98: 0x100da98: div   s1, v1
 	ldloc 8
 	ldloc 5
 	ldloc 8
@@ -7053,37 +7053,37 @@ L_100da70:
 	stloc 10
 	rem
 	stloc 12
-// 0x0100da8c: 0x100da8c: lw    a1, -31164(s2)
+// 0x0100da9c: 0x100da9c: lw    a1, -30700(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7791
+	ldc.i4 -7675
 	add
 	ldelem.i4
 	stloc.2
-// 0x0100da90: 0x100da90: lui   a0, 0x30000
+// 0x0100daa0: 0x100daa0: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0100da94: 0x100da94: addiu a0, a0, -31156
+// 0x0100daa4: 0x100daa4: addiu a0, a0, -30692
 	ldloc.1
-	ldc.i4 -31156
+	ldc.i4 -30692
 	add
 	stloc.1
-// 0x0100da98: 0x100da98: mflo  lo
+// 0x0100daa8: 0x100daa8: mflo  lo
 	ldloc 10
 	stloc 8
-// 0x0100da9c: 0x100da9c: sll   s1, s1, 2
+// 0x0100daac: 0x100daac: sll   s1, s1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x0100daa0: 0x100daa0: addu  s1, s1, a0
+// 0x0100dab0: 0x100dab0: addu  s1, s1, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc 8
-// 0x0100daa4: 0x100daa4: div   a1, v1
+// 0x0100dab4: 0x100dab4: div   a1, v1
 	ldloc.2
 	ldloc 5
 	ldloc.2
@@ -7092,64 +7092,64 @@ L_100da70:
 	stloc 10
 	rem
 	stloc 12
-// 0x0100daa8: 0x100daa8: sw    v0, 0(s1)
+// 0x0100dab8: 0x100dab8: sw    v0, 0(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-// 0x0100daac: 0x100daac: mflo  lo
+// 0x0100dabc: 0x100dabc: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0100dab0: 0x100dab0: sll   v1, v1, 2
+// 0x0100dac0: 0x100dac0: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100dab4: 0x100dab4: addu  a0, v1, a0
+// 0x0100dac4: 0x100dac4: addu  a0, v1, a0
 	ldloc 5
 	ldloc.1
 	add
 	stloc.1
-// 0x0100dab8: 0x100dab8: lw    v0, 0(a0)
+// 0x0100dac8: 0x100dac8: lw    v0, 0(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0100dabc: 0x100dabc: sll   zero, zero, 0
-// 0x0100dac0: 0x100dac0: bne   v0, zero, 0x100daf0 lui   s1, 0x30000
+// 0x0100dacc: 0x100dacc: sll   zero, zero, 0
+// 0x0100dad0: 0x100dad0: bne   v0, zero, 0x100db00 lui   s1, 0x30000
 	ldloc 6
 	ldc.i4 196608
 	stloc 8
-	brtrue L_100daf0
+	brtrue L_100db00
 // --- basic block ---
-// 0x0100dac8: 0x100dac8: lui   a1, 0x0
+// 0x0100dad8: 0x100dad8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0100dacc: 0x100dacc: lui   a3, 0x0
+// 0x0100dadc: 0x100dadc: lui   a3, 0x0
 	ldc.i4.s 0
 	stloc 4
-// 0x0100dad0: 0x100dad0: addiu a1, a1, 25784
+// 0x0100dae0: 0x100dae0: addiu a1, a1, 25784
 	ldloc.2
 	ldc.i4 25784
 	add
 	stloc.2
-// 0x0100dad4: 0x100dad4: addiu a3, a3, 25836
+// 0x0100dae4: 0x100dae4: addiu a3, a3, 25836
 	ldloc 4
 	ldc.i4 25836
 	add
 	stloc 4
-// 0x0100dad8: 0x100dad8: addiu a0, zero, 4
+// 0x0100dae8: 0x100dae8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0100dadc: 0x100dadc: addiu a2, zero, 69
+// 0x0100daec: 0x100daec: addiu a2, zero, 69
 	ldc.i4.s 69
 	stloc.3
-L_100dae0:
-// 0x0100dae0: 0x100dae0: jal   0x100449c sll   zero, zero, 0
+L_100daf0:
+// 0x0100daf0: 0x100daf0: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -7160,34 +7160,34 @@ L_100dae0:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100dae8: 0x100dae8: j	 0x100db78 addu  v0, zero, zero
+// 0x0100daf8: 0x100daf8: j	 0x100db88 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_100db78
+	br L_100db88
 // --- basic block ---
-L_100daf0:
-// 0x0100daf0: 0x100daf0: lw    a0, -31160(s1)
+L_100db00:
+// 0x0100db00: 0x100db00: lw    a0, -30696(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7790
+	ldc.i4 -7674
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100daf4: 0x100daf4: sll   zero, zero, 0
-// 0x0100daf8: 0x100daf8: bne   a0, zero, 0x100db14 addiu a1, a1, 4096
+// 0x0100db04: 0x100db04: sll   zero, zero, 0
+// 0x0100db08: 0x100db08: bne   a0, zero, 0x100db24 addiu a1, a1, 4096
 	ldloc.1
 	ldloc.2
 	ldc.i4 4096
 	add
 	stloc.2
-	brtrue L_100db14
+	brtrue L_100db24
 // --- basic block ---
-// 0x0100db00: 0x100db00: lui   a0, 0x0
+// 0x0100db10: 0x100db10: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0100db04: 0x100db04: jal   0x10158bc addiu a0, a0, 25872
+// 0x0100db14: 0x100db14: jal   0x10158cc addiu a0, a0, 25872
 	ldloc.1
 	ldc.i4 25872
 	add
@@ -7197,51 +7197,51 @@ L_100daf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_new_10158bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_new_10158cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100db0c: 0x100db0c: j	 0x100db1c sw    v0, -31160(s1)
+// 0x0100db1c: 0x100db1c: j	 0x100db2c sw    v0, -30696(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7790
+	ldc.i4 -7674
 	add
 	ldloc 6
 	stelem.i4
-	br L_100db1c
+	br L_100db2c
 // --- basic block ---
-L_100db14:
-// 0x0100db14: 0x100db14: jal   0x1015b18 sll   zero, zero, 0
+L_100db24:
+// 0x0100db24: 0x100db24: jal   0x1015b28 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_resize_1015b18(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_resize_1015b28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_100db1c:
-// 0x0100db1c: 0x100db1c: lui   s1, 0x30000
+L_100db2c:
+// 0x0100db2c: 0x100db2c: lui   s1, 0x30000
 	ldc.i4 196608
 	stloc 8
-// 0x0100db20: 0x100db20: lw    a2, -31164(s1)
+// 0x0100db30: 0x100db30: lw    a2, -30700(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7791
+	ldc.i4 -7675
 	add
 	ldelem.i4
 	stloc.3
-// 0x0100db24: 0x100db24: addiu v1, zero, 4096
+// 0x0100db34: 0x100db34: addiu v1, zero, 4096
 	ldc.i4 4096
 	stloc 5
-// 0x0100db28: 0x100db28: div   a2, v1
+// 0x0100db38: 0x100db38: div   a2, v1
 	ldloc.3
 	ldloc 5
 	ldloc.3
@@ -7250,63 +7250,63 @@ L_100db1c:
 	stloc 10
 	rem
 	stloc 12
-// 0x0100db2c: 0x100db2c: lui   a3, 0x30000
+// 0x0100db3c: 0x100db3c: lui   a3, 0x30000
 	ldc.i4 196608
 	stloc 4
-// 0x0100db30: 0x100db30: addiu a3, a3, -31156
+// 0x0100db40: 0x100db40: addiu a3, a3, -30692
 	ldloc 4
-	ldc.i4 -31156
+	ldc.i4 -30692
 	add
 	stloc 4
-// 0x0100db34: 0x100db34: lui   a0, 0x30000
+// 0x0100db44: 0x100db44: lui   a0, 0x30000
 	ldc.i4 196608
 	stloc.1
-// 0x0100db38: 0x100db38: lw    a0, -31160(a0)
+// 0x0100db48: 0x100db48: lw    a0, -30696(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7790
+	ldc.i4 -7674
 	add
 	ldelem.i4
 	stloc.1
-// 0x0100db3c: 0x100db3c: addu  a1, s0, zero
+// 0x0100db4c: 0x100db4c: addu  a1, s0, zero
 	ldloc 11
 	stloc.2
-// 0x0100db40: 0x100db40: mflo  lo
+// 0x0100db50: 0x100db50: mflo  lo
 	ldloc 10
 	stloc 5
-// 0x0100db44: 0x100db44: sll   v1, v1, 2
+// 0x0100db54: 0x100db54: sll   v1, v1, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0100db48: 0x100db48: addu  v1, v1, a3
+// 0x0100db58: 0x100db58: addu  v1, v1, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
-// 0x0100db4c: 0x100db4c: lw    s2, 0(v1)
+// 0x0100db5c: 0x100db5c: lw    s2, 0(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0100db50: 0x100db50: mfhi  hi
+// 0x0100db60: 0x100db60: mfhi  hi
 	ldloc 12
 	stloc 6
-// 0x0100db54: 0x100db54: sll   v0, v0, 3
+// 0x0100db64: 0x100db64: sll   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x0100db58: 0x100db58: addu  s2, s2, v0
+// 0x0100db68: 0x100db68: addu  s2, s2, v0
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x0100db5c: 0x100db5c: sw    zero, 4(s2)
+// 0x0100db6c: 0x100db6c: sw    zero, 4(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7315,7 +7315,7 @@ L_100db1c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0100db60: 0x100db60: jal   0x10157cc sw    s0, 0(s2)
+// 0x0100db70: 0x100db70: jal   0x10157dc sw    s0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -7327,42 +7327,42 @@ L_100db1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl15::roadmap_hash_add_10157cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl15::roadmap_hash_add_10157dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0100db68: 0x100db68: lw    v1, -31164(s1)
+// 0x0100db78: 0x100db78: lw    v1, -30700(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7791
+	ldc.i4 -7675
 	add
 	ldelem.i4
 	stloc 5
-// 0x0100db6c: 0x100db6c: addiu v0, s2, 4
+// 0x0100db7c: 0x100db7c: addiu v0, s2, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 6
-// 0x0100db70: 0x100db70: addiu v1, v1, 1
+// 0x0100db80: 0x100db80: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0100db74: 0x100db74: sw    v1, -31164(s1)
+// 0x0100db84: 0x100db84: sw    v1, -30700(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7791
+	ldc.i4 -7675
 	add
 	ldloc 5
 	stelem.i4
-L_100db78:
-// 0x0100db78: 0x100db78: lw    ra, 28(sp)
-// 0x0100db7c: 0x100db7c: lw    s2, 24(sp)
+L_100db88:
+// 0x0100db88: 0x100db88: lw    ra, 28(sp)
+// 0x0100db8c: 0x100db8c: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7371,7 +7371,7 @@ L_100db78:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0100db80: 0x100db80: lw    s1, 20(sp)
+// 0x0100db90: 0x100db90: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7380,7 +7380,7 @@ L_100db78:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0100db84: 0x100db84: lw    s0, 16(sp)
+// 0x0100db94: 0x100db94: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7389,7 +7389,7 @@ L_100db78:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0100db88: 0x100db88: jr    ra addiu sp, sp, 32
+// 0x0100db98: 0x100db98: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl90.j b/converted/Cibyl90.j
index da0f447..f9bda34 100644
--- a/converted/Cibyl90.j
+++ b/converted/Cibyl90.j
@@ -41,2777 +41,2239 @@
     IL_0006:  ret
   } // end of method Cibyl90::.ctor
 
-.method public static int32 RTAlerts_clear_group_counter_1077d40()
+.method public static int32 RTAlerts_Get_Map_AddOn_1077c00(int32,int32,int32,int32)
 {
-.maxstack 5
-.locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
+.maxstack 7
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
 
-// local  0 is register v0
-// local  1 is register v1
-// local  3 is register ra
-// local  2 is register mem
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  8 is register t0
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc.0
+	stloc 4
 	ldc.i4.s 0
-	stloc.1
+	stloc 5
+	ldarg 0
+	stloc 0
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
 	ldc.i4.s 0
-	stloc.3
+	stloc 8
+	ldc.i4.s 0
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc.2
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077d40: 0x1077d40: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x01077d44: 0x1077d44: cibyl_sysc_arg 0x3
-	ldloc.1
-// 0x01077d48: 0x1077d48: cibyl_sysc 0x2125
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc.0
-// 0x01077d4c: 0x1077d4c: addu  v1, v0, zero
-	ldloc.0
-	stloc.1
-// 0x01077d50: 0x1077d50: lui   v0, 0x80000
+// 0x01077c00: 0x1077c00: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc.0
-// 0x01077d54: 0x1077d54: sw    v1, -16248(v0)
-	ldloc 2
-	ldloc.0
+	stloc 4
+// 0x01077c04: 0x1077c04: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
+	add
+	stloc 4
+// 0x01077c08: 0x1077c08: addu  a2, v0, zero
+	ldloc 4
+	stloc.2
+// 0x01077c0c: 0x1077c0c: lw    a3, 2000(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4062
+	ldc.i4 500
 	add
-	ldloc.1
-	stelem.i4
-// 0x01077d58: 0x1077d58: addiu v1, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01077d5c: 0x1077d5c: lui   v0, 0x0
+	ldelem.i4
+	stloc.3
+// 0x01077c10: 0x1077c10: j	 0x1077c48 addu  v1, zero, zero
 	ldc.i4.s 0
-	stloc.0
-// 0x01077d60: 0x1077d60: jr    ra sw    v1, 15824(v0)
-	ldloc 2
-	ldloc.0
+	stloc 5
+	br L_1077c48
+// --- basic block ---
+L_1077c18:
+// 0x01077c18: 0x1077c18: lw    v0, 0(a2)
+	ldloc 6
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 3956
+	ldelem.i4
+	stloc 4
+// 0x01077c1c: 0x1077c1c: addiu v1, v1, 1
+	ldloc 5
+	ldc.i4.1
 	add
-	ldloc.1
-	stelem.i4
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc.1
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+// 0x01077c20: 0x1077c20: lw    t0, 0(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 8
+// 0x01077c24: 0x1077c24: sll   zero, zero, 0
+// 0x01077c28: 0x1077c28: bne   t0, a0, 0x1077c48 addiu a2, a2, 4
+	ldloc 8
 	ldloc.0
-	ret
-}
-.method public static int32 RAlerts_get_group_state_1077d68()
-{
-.maxstack 5
-.locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  0 is register v0
-// local  1 is register v1
-// local  3 is register ra
-// local  2 is register mem
-
-	ldc.i4.s 0
-	stloc.0
-	ldc.i4.s 0
-	stloc.1
-	ldc.i4.s 0
-	stloc.3
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	ldloc.2
+	ldc.i4.4
+	add
 	stloc.2
-__CIBYL_javamethod_begin:
+	bne.un L_1077c48
 // --- basic block ---
-// 0x01077d68: 0x1077d68: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01077c30: 0x1077c30: lw    a0, 4(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
 	stloc.0
-// 0x01077d6c: 0x1077d6c: lw    v1, -14024(v0)
-	ldloc 2
+// 0x01077c34: 0x1077c34: addiu v1, zero, 4
+	ldc.i4.4
+	stloc 5
+// 0x01077c38: 0x1077c38: bne   a0, v1, 0x1077c5c sll   zero, zero, 0
 	ldloc.0
+	ldloc 5
+	bne.un L_1077c5c
+// --- basic block ---
+// 0x01077c40: 0x1077c40: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077c48:
+// 0x01077c48: 0x1077c48: slt   v0, v1, a3
+	ldloc 5
+	ldloc.3
+	clt
+	stloc 4
+// 0x01077c4c: 0x1077c4c: bne   v0, zero, 0x1077c18 addu  v0, zero, zero
+	ldloc 4
+	ldc.i4.s 0
+	stloc 4
+	brtrue L_1077c18
+// --- basic block ---
+// 0x01077c54: 0x1077c54: j	 0x1077cbc sll   zero, zero, 0
+	br L_1077cbc
+// --- basic block ---
+L_1077c5c:
+// 0x01077c5c: 0x1077c5c: bne   a1, zero, 0x1077c80 addiu v1, zero, 1
+	ldloc.1
+	ldc.i4.1
+	stloc 5
+	brtrue L_1077c80
+// --- basic block ---
+// 0x01077c64: 0x1077c64: lw    v1, 1276(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3506
+	ldc.i4 319
 	add
 	ldelem.i4
-	stloc.1
-// 0x01077d70: 0x1077d70: sll   zero, zero, 0
-// 0x01077d74: 0x1077d74: beq   v1, zero, 0x1077d84 addiu v0, zero, 1
+	stloc 5
+// 0x01077c68: 0x1077c68: sll   zero, zero, 0
+// 0x01077c6c: 0x1077c6c: beq   v1, zero, 0x1077c88 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1077c88
+// --- basic block ---
+// 0x01077c74: 0x1077c74: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01077c78: 0x1077c78: jr    ra addiu v0, v0, -26744
+	ldloc 4
+	ldc.i4 -26744
+	add
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077c80:
+// 0x01077c80: 0x1077c80: bne   a1, v1, 0x1077ca4 addiu v1, zero, 2
 	ldloc.1
-	ldc.i4.1
-	stloc.0
-	brfalse L_1077d84
+	ldloc 5
+	ldc.i4.2
+	stloc 5
+	bne.un L_1077ca4
 // --- basic block ---
-// 0x01077d7c: 0x1077d7c: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc.0
-// 0x01077d80: 0x1077d80: lw    v0, 15824(v0)
-	ldloc 2
-	ldloc.0
+L_1077c88:
+// 0x01077c88: 0x1077c88: lb    v1, 708(v0)
+	ldloc 4
+	ldc.i4 708
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01077c8c: 0x1077c8c: sll   zero, zero, 0
+// 0x01077c90: 0x1077c90: beq   v1, zero, 0x1077cac sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1077cac
+// --- basic block ---
+// 0x01077c98: 0x1077c98: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01077c9c: 0x1077c9c: jr    ra addiu v0, v0, -26720
+	ldloc 4
+	ldc.i4 -26720
+	add
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077ca4:
+// 0x01077ca4: 0x1077ca4: bne   a1, v1, 0x1077cb8 sll   zero, zero, 0
+	ldloc.1
+	ldloc 5
+	bne.un L_1077cb8
+// --- basic block ---
+L_1077cac:
+// 0x01077cac: 0x1077cac: lw    v0, 1500(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 3956
+	ldc.i4 375
 	add
 	ldelem.i4
-	stloc.0
-L_1077d84:
-// 0x01077d84: 0x1077d84: jr    ra sll   zero, zero, 0
+	stloc 4
+// 0x01077cb0: 0x1077cb0: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077cb8:
+// 0x01077cb8: 0x1077cb8: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+L_1077cbc:
+// 0x01077cbc: 0x1077cbc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc.1
+	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc.0
+	ldloc 4
 	ret
 }
-.method public static int32 RTAlerts_isAlertOnRoute_1077ddc(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Number_Of_Map_AddOns_1077cc4(int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077ddc: 0x1077ddc: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
+// 0x01077cc4: 0x1077cc4: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01077cc8: 0x1077cc8: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
-	stloc.0
-// 0x01077de0: 0x1077de0: sw    a0, 16(sp)
+	stloc 4
+// 0x01077ccc: 0x1077ccc: addu  a1, v0, zero
+	ldloc 4
+	stloc.1
+// 0x01077cd0: 0x1077cd0: lw    a2, 2000(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 500
 	add
-	ldloc.1
-	stelem.i4
-// 0x01077de4: 0x1077de4: sw    ra, 28(sp)
-// 0x01077de8: 0x1077de8: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
-	stloc 5
+	ldelem.i4
+	stloc.2
+// 0x01077cd4: 0x1077cd4: j	 0x1077d0c addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_1077d0c
 // --- basic block ---
-// 0x01077df0: 0x1077df0: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 7
-// 0x01077df4: 0x1077df4: lw    a0, 16(sp)
+L_1077cdc:
+// 0x01077cdc: 0x1077cdc: lw    v1, 0(a1)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
 	ldelem.i4
-	stloc.1
-// 0x01077df8: 0x1077df8: beq   v0, v1, 0x1077e44 lui   v0, 0x80000
-	ldloc 5
-	ldloc 7
-	ldc.i4 524288
 	stloc 5
-	beq  L_1077e44
-// --- basic block ---
-// 0x01077e00: 0x1077e00: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
+// 0x01077ce0: 0x1077ce0: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
 	add
-	stloc 5
-// 0x01077e04: 0x1077e04: addu  v1, v0, zero
-	ldloc 5
-	stloc 7
-// 0x01077e08: 0x1077e08: lw    a2, 2000(v0)
+	stloc 4
+// 0x01077ce4: 0x1077ce4: lw    a3, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
-	add
 	ldelem.i4
 	stloc.3
-// 0x01077e0c: 0x1077e0c: j	 0x1077e38 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1077e38
+// 0x01077ce8: 0x1077ce8: sll   zero, zero, 0
+// 0x01077cec: 0x1077cec: bne   a3, a0, 0x1077d0c addiu a1, a1, 4
+	ldloc.3
+	ldloc.0
+	ldloc.1
+	ldc.i4.4
+	add
+	stloc.1
+	bne.un L_1077d0c
 // --- basic block ---
-L_1077e14:
-// 0x01077e14: 0x1077e14: lw    a1, 0(v1)
+// 0x01077cf4: 0x1077cf4: lw    a0, 4(v1)
 	ldloc 6
-	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4.1
+	add
 	ldelem.i4
-	stloc.2
-// 0x01077e18: 0x1077e18: sll   zero, zero, 0
-// 0x01077e1c: 0x1077e1c: lw    a3, 0(a1)
-	ldloc 6
+	stloc.0
+// 0x01077cf8: 0x1077cf8: addiu v0, zero, 4
+	ldc.i4.4
+	stloc 4
+// 0x01077cfc: 0x1077cfc: bne   a0, v0, 0x1077d20 sll   zero, zero, 0
+	ldloc.0
+	ldloc 4
+	bne.un L_1077d20
+// --- basic block ---
+// 0x01077d04: 0x1077d04: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077d0c:
+// 0x01077d0c: 0x1077d0c: slt   v1, v0, a2
+	ldloc 4
 	ldloc.2
+	clt
+	stloc 5
+// 0x01077d10: 0x1077d10: bne   v1, zero, 0x1077cdc sll   zero, zero, 0
+	ldloc 5
+	brtrue L_1077cdc
+// --- basic block ---
+// 0x01077d18: 0x1077d18: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077d20:
+// 0x01077d20: 0x1077d20: lw    v0, 1276(v1)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4 319
+	add
 	ldelem.i4
 	stloc 4
-// 0x01077e20: 0x1077e20: sll   zero, zero, 0
-// 0x01077e24: 0x1077e24: bne   a3, a0, 0x1077e38 addiu v1, v1, 4
-	ldloc 4
-	ldloc.1
-	ldloc 7
-	ldc.i4.4
+// 0x01077d24: 0x1077d24: lb    a0, 708(v1)
+	ldloc 5
+	ldc.i4 708
 	add
-	stloc 7
-	bne.un L_1077e38
-// --- basic block ---
-// 0x01077e2c: 0x1077e2c: lw    v0, 1516(a1)
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc.0
+// 0x01077d28: 0x1077d28: lw    v1, 1500(v1)
 	ldloc 6
-	ldloc.2
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 379
+	ldc.i4 375
 	add
 	ldelem.i4
 	stloc 5
-// 0x01077e30: 0x1077e30: j	 0x1077e48 sll   zero, zero, 0
-	br L_1077e48
-// --- basic block ---
-L_1077e38:
-// 0x01077e38: 0x1077e38: slt   a1, v0, a2
-	ldloc 5
-	ldloc.3
-	clt
-	stloc.2
-// 0x01077e3c: 0x1077e3c: bne   a1, zero, 0x1077e14 addiu v0, v0, 1
-	ldloc.2
-	ldloc 5
-	ldc.i4.1
+// 0x01077d2c: 0x1077d2c: sltu  v0, zero, v0
+	ldc.i4.s 0
+	ldloc 4
+	clt.un
+	stloc 4
+// 0x01077d30: 0x1077d30: sltu  a0, zero, a0
+	ldc.i4.s 0
+	ldloc.0
+	clt.un
+	stloc.0
+// 0x01077d34: 0x1077d34: addu  v0, v0, a0
+	ldloc 4
+	ldloc.0
 	add
-	stloc 5
-	brtrue L_1077e14
-// --- basic block ---
-L_1077e44:
-// 0x01077e44: 0x1077e44: addu  v0, zero, zero
+	stloc 4
+// 0x01077d38: 0x1077d38: sltu  v1, zero, v1
 	ldc.i4.s 0
+	ldloc 5
+	clt.un
 	stloc 5
-L_1077e48:
-// 0x01077e48: 0x1077e48: lw    ra, 28(sp)
-// 0x01077e4c: 0x1077e4c: sll   zero, zero, 0
-// 0x01077e50: 0x1077e50: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x01077d3c: 0x1077d3c: addu  v0, v0, v1
+	ldloc 4
+	ldloc 5
 	add
-	stloc.0
+	stloc 4
+// 0x01077d40: 0x1077d40: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
 	ret
 }
-.method public static int32 RTAlerts_show_space_before_desc_1077e58(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Number_Of_AddOns_1077d48(int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
 // local  7 is register ra
-// local  8 is register mem
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 4
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
 	ldc.i4.s 0
 	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077e58: 0x1077e58: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x01077d48: 0x1077d48: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01077d4c: 0x1077d4c: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
-	stloc.0
-// 0x01077e5c: 0x1077e5c: sw    ra, 20(sp)
-// 0x01077e60: 0x1077e60: lb    v0, 32(a1)
-	ldloc.2
-	ldc.i4.s 32
+	stloc 4
+// 0x01077d50: 0x1077d50: addu  a1, v0, zero
+	ldloc 4
+	stloc.1
+// 0x01077d54: 0x1077d54: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x01077e64: 0x1077e64: sll   zero, zero, 0
-// 0x01077e68: 0x1077e68: bne   v0, zero, 0x1077e88 lui   a1, 0x20000
-	ldloc 5
-	ldc.i4 131072
+	ldelem.i4
 	stloc.2
-	brtrue L_1077e88
+// 0x01077d58: 0x1077d58: j	 0x1077d90 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_1077d90
 // --- basic block ---
-// 0x01077e70: 0x1077e70: jal   0x109b304 addiu a1, a1, -27068
-	ldloc.2
-	ldc.i4 -27068
+L_1077d60:
+// 0x01077d60: 0x1077d60: lw    v1, 0(a1)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 5
+// 0x01077d64: 0x1077d64: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
 	add
-	stloc.2
+	stloc 4
+// 0x01077d68: 0x1077d68: lw    a3, 0(v1)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x01077d6c: 0x1077d6c: sll   zero, zero, 0
+// 0x01077d70: 0x1077d70: bne   a3, a0, 0x1077d90 addiu a1, a1, 4
+	ldloc.3
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.4
+	add
+	stloc.1
+	bne.un L_1077d90
 // --- basic block ---
-// 0x01077e78: 0x1077e78: jal   0x1099098 addu  a0, v0, zero
+// 0x01077d78: 0x1077d78: lw    a0, 4(v1)
+	ldloc 6
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc.0
+// 0x01077d7c: 0x1077d7c: addiu a1, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x01077d80: 0x1077d80: bne   a0, a1, 0x1077da4 addiu v0, zero, 1
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
-	stloc 5
+	ldc.i4.1
+	stloc 4
+	bne.un L_1077da4
 // --- basic block ---
-// 0x01077e80: 0x1077e80: j	 0x1077e98 sll   zero, zero, 0
-	br L_1077e98
+// 0x01077d88: 0x1077d88: j	 0x1077dd4 sll   zero, zero, 0
+	br L_1077dd4
 // --- basic block ---
-L_1077e88:
-// 0x01077e88: 0x1077e88: jal   0x109b304 addiu a1, a1, -27068
-	ldloc.2
-	ldc.i4 -27068
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+L_1077d90:
+// 0x01077d90: 0x1077d90: slt   v1, v0, a2
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldloc.2
+	clt
 	stloc 5
-// --- basic block ---
-// 0x01077e90: 0x1077e90: jal   0x10990ac addu  a0, v0, zero
+// 0x01077d94: 0x1077d94: bne   v1, zero, 0x1077d60 sll   zero, zero, 0
 	ldloc 5
+	brtrue L_1077d60
+// --- basic block ---
+// 0x01077d9c: 0x1077d9c: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077da4:
+// 0x01077da4: 0x1077da4: addiu a1, zero, 3
+	ldc.i4.3
 	stloc.1
+// 0x01077da8: 0x1077da8: bne   a0, a1, 0x1077dbc addu  v0, zero, zero
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.s 0
+	stloc 4
+	bne.un L_1077dbc
 // --- basic block ---
-L_1077e98:
-// 0x01077e98: 0x1077e98: lw    ra, 20(sp)
-// 0x01077e9c: 0x1077e9c: sll   zero, zero, 0
-// 0x01077ea0: 0x1077ea0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x01077db0: 0x1077db0: lb    v0, 1304(v1)
+	ldloc 5
+	ldc.i4 1304
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 4
+// 0x01077db4: 0x1077db4: sll   zero, zero, 0
+// 0x01077db8: 0x1077db8: sltiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
+	clt.un
+	stloc 4
+L_1077dbc:
+// 0x01077dbc: 0x1077dbc: lw    a0, 1276(v1)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 319
+	add
+	ldelem.i4
+	stloc.0
+// 0x01077dc0: 0x1077dc0: lb    v1, 1304(v1)
+	ldloc 5
+	ldc.i4 1304
 	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01077dc4: 0x1077dc4: sltu  a0, zero, a0
+	ldc.i4.s 0
+	ldloc.0
+	clt.un
 	stloc.0
+// 0x01077dc8: 0x1077dc8: addu  v0, v0, a0
+	ldloc 4
+	ldloc.0
+	add
+	stloc 4
+// 0x01077dcc: 0x1077dcc: sltu  v1, zero, v1
+	ldc.i4.s 0
+	ldloc 5
+	clt.un
+	stloc 5
+// 0x01077dd0: 0x1077dd0: addu  v0, v0, v1
+	ldloc 4
+	ldloc 5
+	add
+	stloc 4
+L_1077dd4:
+// 0x01077dd4: 0x1077dd4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
 	ret
 }
-.method public static int32 RTAlerts_get_title_1077ea8(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_AddOn_1077ddc(int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem,int32 t0)
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra,int32 t0)
 
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register t0
-// local  0 is register sp
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  8 is register t0
 // local  7 is register ra
-// local  8 is register mem
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 4
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
+	stloc 8
 	ldc.i4.s 0
 	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077ea8: 0x1077ea8: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x01077ddc: 0x1077ddc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01077de0: 0x1077de0: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
-	stloc.0
-// 0x01077eac: 0x1077eac: addiu v0, zero, 2
+	stloc 4
+// 0x01077de4: 0x1077de4: addu  a2, v0, zero
+	ldloc 4
+	stloc.2
+// 0x01077de8: 0x1077de8: lw    a3, 2000(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.3
+// 0x01077dec: 0x1077dec: j	 0x1077e28 addu  v1, zero, zero
+	ldc.i4.s 0
 	stloc 5
-// 0x01077eb0: 0x1077eb0: bne   a1, v0, 0x1077ec4 sw    ra, 20(sp)
+	br L_1077e28
+// --- basic block ---
+L_1077df4:
+// 0x01077df4: 0x1077df4: lw    v0, 0(a2)
+	ldloc 6
 	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x01077df8: 0x1077df8: addiu v1, v1, 1
 	ldloc 5
-	bne.un L_1077ec4
-// --- basic block ---
-// 0x01077eb8: 0x1077eb8: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01077ebc: 0x1077ebc: j	 0x1077fc0 addiu a0, a0, -19640
-	ldloc.1
-	ldc.i4 -19640
-	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077ec4:
-// 0x01077ec4: 0x1077ec4: addiu a3, zero, 1
 	ldc.i4.1
-	stloc 4
-// 0x01077ec8: 0x1077ec8: bne   a1, a3, 0x1077edc addiu v1, zero, 3
-	ldloc.2
-	ldloc 4
-	ldc.i4.3
-	stloc 6
-	bne.un L_1077edc
-// --- basic block ---
-// 0x01077ed0: 0x1077ed0: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01077ed4: 0x1077ed4: j	 0x1077fc0 addiu a0, a0, -27044
-	ldloc.1
-	ldc.i4 -27044
 	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077edc:
-// 0x01077edc: 0x1077edc: bne   a1, v1, 0x1077ef0 addiu t0, zero, 4
-	ldloc.2
+	stloc 5
+// 0x01077dfc: 0x1077dfc: lw    t0, 0(v0)
 	ldloc 6
-	ldc.i4.4
-	stloc 9
-	bne.un L_1077ef0
-// --- basic block ---
-// 0x01077ee4: 0x1077ee4: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01077ee8: 0x1077ee8: j	 0x1077fc0 addiu a0, a0, -19588
-	ldloc.1
-	ldc.i4 -19588
-	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077ef0:
-// 0x01077ef0: 0x1077ef0: bne   a1, t0, 0x1077f48 sll   zero, zero, 0
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 8
+// 0x01077e00: 0x1077e00: sll   zero, zero, 0
+// 0x01077e04: 0x1077e04: bne   t0, a0, 0x1077e28 addiu a2, a2, 4
+	ldloc 8
+	ldloc.0
 	ldloc.2
-	ldloc 9
-	bne.un L_1077f48
-// --- basic block ---
-// 0x01077ef8: 0x1077ef8: bne   a2, zero, 0x1077f08 lui   a0, 0x20000
-	ldloc.3
-	ldc.i4 131072
-	stloc.1
-	brtrue L_1077f08
-// --- basic block ---
-// 0x01077f00: 0x1077f00: j	 0x1077fc0 addiu a0, a0, -27032
-	ldloc.1
-	ldc.i4 -27032
+	ldc.i4.4
 	add
-	stloc.1
-	br L_1077fc0
+	stloc.2
+	bne.un L_1077e28
 // --- basic block ---
-L_1077f08:
-// 0x01077f08: 0x1077f08: bne   a2, a3, 0x1077f18 lui   a0, 0x20000
-	ldloc.3
+// 0x01077e0c: 0x1077e0c: lw    v1, 4(v0)
+	ldloc 6
 	ldloc 4
-	ldc.i4 131072
-	stloc.1
-	bne.un L_1077f18
-// --- basic block ---
-// 0x01077f10: 0x1077f10: j	 0x1077fc0 addiu a0, a0, -27016
-	ldloc.1
-	ldc.i4 -27016
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077f18:
-// 0x01077f18: 0x1077f18: bne   a2, v0, 0x1077f28 lui   a0, 0x20000
-	ldloc.3
+	ldelem.i4
+	stloc 5
+// 0x01077e10: 0x1077e10: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.0
+// 0x01077e14: 0x1077e14: bne   v1, a0, 0x1077e3c sll   zero, zero, 0
 	ldloc 5
-	ldc.i4 131072
-	stloc.1
-	bne.un L_1077f28
-// --- basic block ---
-// 0x01077f20: 0x1077f20: j	 0x1077fc0 addiu a0, a0, -26996
-	ldloc.1
-	ldc.i4 -26996
-	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077f28:
-// 0x01077f28: 0x1077f28: bne   a2, v1, 0x1077f3c sll   zero, zero, 0
-	ldloc.3
-	ldloc 6
-	bne.un L_1077f3c
-// --- basic block ---
-// 0x01077f30: 0x1077f30: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01077f34: 0x1077f34: j	 0x1077fc0 addiu a0, a0, -26980
-	ldloc.1
-	ldc.i4 -26980
-	add
-	stloc.1
-	br L_1077fc0
+	ldloc.0
+	bne.un L_1077e3c
 // --- basic block ---
-L_1077f3c:
-// 0x01077f3c: 0x1077f3c: lui   a0, 0x20000
+// 0x01077e1c: 0x1077e1c: lui   v0, 0x20000
 	ldc.i4 131072
-	stloc.1
-// 0x01077f40: 0x1077f40: j	 0x1077fc0 addiu a0, a0, 9684
-	ldloc.1
-	ldc.i4 9684
+	stloc 4
+// 0x01077e20: 0x1077e20: jr    ra addiu v0, v0, -26692
+	ldloc 4
+	ldc.i4 -26692
 	add
-	stloc.1
-	br L_1077fc0
+	stloc 4
+	br __CIBYL_function_return
 // --- basic block ---
-L_1077f48:
-// 0x01077f48: 0x1077f48: addiu v0, zero, 5
-	ldc.i4.5
-	stloc 5
-// 0x01077f4c: 0x1077f4c: bne   a1, v0, 0x1077f60 addiu v0, zero, 6
-	ldloc.2
+L_1077e28:
+// 0x01077e28: 0x1077e28: slt   v0, v1, a3
 	ldloc 5
-	ldc.i4.6
-	stloc 5
-	bne.un L_1077f60
-// --- basic block ---
-// 0x01077f54: 0x1077f54: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01077f58: 0x1077f58: j	 0x1077fc0 addiu a0, a0, -19536
-	ldloc.1
-	ldc.i4 -19536
-	add
-	stloc.1
-	br L_1077fc0
+	ldloc.3
+	clt
+	stloc 4
+// 0x01077e2c: 0x1077e2c: bne   v0, zero, 0x1077df4 addu  v0, zero, zero
+	ldloc 4
+	ldc.i4.s 0
+	stloc 4
+	brtrue L_1077df4
 // --- basic block ---
-L_1077f60:
-// 0x01077f60: 0x1077f60: bne   a1, v0, 0x1077f74 addiu v0, zero, 7
-	ldloc.2
-	ldloc 5
-	ldc.i4.7
-	stloc 5
-	bne.un L_1077f74
+// 0x01077e34: 0x1077e34: j	 0x1077e90 sll   zero, zero, 0
+	br L_1077e90
 // --- basic block ---
-// 0x01077f68: 0x1077f68: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01077f6c: 0x1077f6c: j	 0x1077fc0 addiu a0, a0, -19488
+L_1077e3c:
+// 0x01077e3c: 0x1077e3c: bne   a1, zero, 0x1077e60 addiu a0, zero, 1
 	ldloc.1
-	ldc.i4 -19488
-	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077f74:
-// 0x01077f74: 0x1077f74: bne   a1, v0, 0x1077f88 addiu v0, zero, 8
-	ldloc.2
-	ldloc 5
-	ldc.i4.8
-	stloc 5
-	bne.un L_1077f88
+	ldc.i4.1
+	stloc.0
+	brtrue L_1077e60
 // --- basic block ---
-// 0x01077f7c: 0x1077f7c: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01077f80: 0x1077f80: j	 0x1077fc0 addiu a0, a0, -19444
-	ldloc.1
-	ldc.i4 -19444
+// 0x01077e44: 0x1077e44: lw    a0, 1276(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldc.i4 319
 	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077f88:
-// 0x01077f88: 0x1077f88: bne   a1, v0, 0x1077f9c addiu v0, zero, 9
-	ldloc.2
-	ldloc 5
-	ldc.i4.s 9
-	stloc 5
-	bne.un L_1077f9c
+	ldelem.i4
+	stloc.0
+// 0x01077e48: 0x1077e48: sll   zero, zero, 0
+// 0x01077e4c: 0x1077e4c: beq   a0, zero, 0x1077e68 sll   zero, zero, 0
+	ldloc.0
+	brfalse L_1077e68
 // --- basic block ---
-// 0x01077f90: 0x1077f90: lui   a0, 0x20000
+// 0x01077e54: 0x1077e54: lui   v0, 0x20000
 	ldc.i4 131072
-	stloc.1
-// 0x01077f94: 0x1077f94: j	 0x1077fc0 addiu a0, a0, -26960
-	ldloc.1
-	ldc.i4 -26960
+	stloc 4
+// 0x01077e58: 0x1077e58: jr    ra addiu v0, v0, -26668
+	ldloc 4
+	ldc.i4 -26668
 	add
-	stloc.1
-	br L_1077fc0
-// --- basic block ---
-L_1077f9c:
-// 0x01077f9c: 0x1077f9c: bne   a1, v0, 0x1077fb8 sll   zero, zero, 0
-	ldloc.2
-	ldloc 5
-	bne.un L_1077fb8
+	stloc 4
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x01077fa4: 0x1077fa4: beq   a0, zero, 0x1077fb8 sll   zero, zero, 0
+L_1077e60:
+// 0x01077e60: 0x1077e60: bne   a1, a0, 0x1077e8c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1077fb8
+	ldloc.0
+	bne.un L_1077e8c
 // --- basic block ---
-// 0x01077fac: 0x1077fac: lw    a0, 1512(a0)
-	ldloc 8
-	ldloc.1
+L_1077e68:
+// 0x01077e68: 0x1077e68: lw    v0, 1496(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 378
+	ldc.i4 374
 	add
 	ldelem.i4
-	stloc.1
-// 0x01077fb0: 0x1077fb0: j	 0x1077fc0 sll   zero, zero, 0
-	br L_1077fc0
-// --- basic block ---
-L_1077fb8:
-// 0x01077fb8: 0x1077fb8: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01077fbc: 0x1077fbc: addiu a0, a0, -19132
-	ldloc.1
-	ldc.i4 -19132
-	add
-	stloc.1
-L_1077fc0:
-// 0x01077fc0: 0x1077fc0: jal   0x101cd60 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+	stloc 4
+// 0x01077e6c: 0x1077e6c: sll   zero, zero, 0
+// 0x01077e70: 0x1077e70: bne   v0, zero, 0x1077e90 addiu a0, zero, 3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.3
+	stloc.0
+	brtrue L_1077e90
 // --- basic block ---
-// 0x01077fc8: 0x1077fc8: lw    ra, 20(sp)
-// 0x01077fcc: 0x1077fcc: sll   zero, zero, 0
-// 0x01077fd0: 0x1077fd0: jr    ra addiu sp, sp, 24
+// 0x01077e78: 0x1077e78: bne   v1, a0, 0x1077e90 sll   zero, zero, 0
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	bne.un L_1077e90
+// --- basic block ---
+// 0x01077e80: 0x1077e80: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x01077e84: 0x1077e84: jr    ra addiu v0, v0, -26640
+	ldloc 4
+	ldc.i4 -26640
 	add
-	stloc.0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077e8c:
+// 0x01077e8c: 0x1077e8c: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+L_1077e90:
+// 0x01077e90: 0x1077e90: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
 	ret
 }
-.method public static int32 RTAlerts_get_reported_by_string_1077fd8(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Alert_Icon_1077e98(int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra,int32 v1)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  6 is register v0
-// local 11 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
-// local  9 is register s2
-// local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 4
 	ldc.i4.s 0
-	stloc 11
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
 	ldc.i4.s 0
 	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01077fd8: 0x1077fd8: addiu sp, sp, -48
-	ldloc.0
-	ldc.i4.s -48
+L_1077e98:
+// 0x01077e98: 0x1077e98: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01077e9c: 0x1077e9c: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
-	stloc.0
-// 0x01077fdc: 0x1077fdc: sw    s2, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 9
-	stelem.i4
-// 0x01077fe0: 0x1077fe0: sw    ra, 44(sp)
-// 0x01077fe4: 0x1077fe4: sw    s1, 36(sp)
-	ldloc 5
-	ldloc.0
+	stloc 4
+// 0x01077ea0: 0x1077ea0: addu  v1, v0, zero
+	ldloc 4
+	stloc 5
+// 0x01077ea4: 0x1077ea4: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 500
 	add
-	ldloc 8
-	stelem.i4
-// 0x01077fe8: 0x1077fe8: sw    s0, 32(sp)
+	ldelem.i4
+	stloc.2
+// 0x01077ea8: 0x1077ea8: j	 0x1077ee8 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_1077ee8
+// --- basic block ---
+L_1077eb0:
+// 0x01077eb0: 0x1077eb0: lw    a1, 0(v1)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldloc 7
-	stelem.i4
-// 0x01077fec: 0x1077fec: lb    v0, 32(a0)
-	ldloc.1
-	ldc.i4.s 32
+	ldelem.i4
+	stloc.1
+// 0x01077eb4: 0x1077eb4: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01077ff0: 0x1077ff0: sll   zero, zero, 0
-// 0x01077ff4: 0x1077ff4: beq   v0, zero, 0x107802c addu  s2, a1, zero
+	stloc 4
+// 0x01077eb8: 0x1077eb8: lw    a3, 0(a1)
 	ldloc 6
-	ldloc.2
-	stloc 9
-	brfalse L_107802c
-// --- basic block ---
-// 0x01077ffc: 0x1077ffc: addiu s0, a0, 32
 	ldloc.1
-	ldc.i4.s 32
-	add
-	stloc 7
-// 0x01078000: 0x1078000: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01078004: 0x1078004: addiu a0, a0, -13684
-	ldloc.1
-	ldc.i4 -13684
-	add
-	stloc.1
-// 0x01078008: 0x1078008: sw    a2, 24(sp)
-	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
+	ldelem.i4
+	stloc.3
+// 0x01077ebc: 0x1077ebc: sll   zero, zero, 0
+// 0x01077ec0: 0x1077ec0: bne   a3, a0, 0x1077ee8 addiu v1, v1, 4
 	ldloc.3
-	stelem.i4
-// 0x0107800c: 0x107800c: jal   0x101cd60 lui   s1, 0x20000
-	ldc.i4 131072
-	stloc 8
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 6
-// --- basic block ---
-// 0x01078014: 0x1078014: lw    a1, 24(sp)
 	ldloc 5
-	ldloc.0
+	ldc.i4.4
+	add
+	stloc 5
+	bne.un L_1077ee8
+// --- basic block ---
+// 0x01077ec8: 0x1077ec8: lw    v0, 4(a1)
+	ldloc 6
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc.2
-// 0x01078018: 0x1078018: addu  a3, v0, zero
-	ldloc 6
 	stloc 4
-// 0x0107801c: 0x107801c: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x01078020: 0x1078020: addiu a2, s1, -26952
-	ldloc 8
-	ldc.i4 -26952
+// 0x01077ecc: 0x1077ecc: sll   zero, zero, 0
+// 0x01077ed0: 0x1077ed0: addiu v0, v0, -1
+	ldloc 4
+	ldc.i4.m1
 	add
-	stloc.3
-// 0x01078024: 0x1078024: jal   0x1000f9c sw    s0, 16(sp)
+	stloc 4
+// 0x01077ed4: 0x1077ed4: sltiu v1, v0, 2
+	ldloc 4
+	ldc.i4.2
+	clt.un
+	stloc 5
+// 0x01077ed8: 0x1077ed8: beq   v1, zero, 0x1077f10 lui   v1, 0x20000
 	ldloc 5
-	ldloc.0
+	ldc.i4 131072
+	stloc 5
+	brfalse L_1077f10
+// --- basic block ---
+// 0x01077ee0: 0x1077ee0: j	 0x1077efc sll   v0, v0, 2
+	ldloc 4
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+	shl
+	stloc 4
+	br L_1077efc
+// --- basic block ---
+L_1077ee8:
+// 0x01077ee8: 0x1077ee8: slt   a1, v0, a2
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 11
-	stloc 6
+	ldloc.2
+	clt
+	stloc.1
+// 0x01077eec: 0x1077eec: bne   a1, zero, 0x1077eb0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_1077eb0
 // --- basic block ---
-L_107802c:
-// 0x0107802c: 0x107802c: lw    ra, 44(sp)
-// 0x01078030: 0x1078030: lw    s2, 40(sp)
+// 0x01077ef4: 0x1077ef4: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077efc:
+// 0x01077efc: 0x1077efc: addiu v1, v1, 29704
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	ldc.i4 29704
 	add
-	ldelem.i4
-	stloc 9
-// 0x01078034: 0x1078034: lw    s1, 36(sp)
+	stloc 5
+// 0x01077f00: 0x1077f00: addu  v0, v0, v1
+	ldloc 4
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc 8
-// 0x01078038: 0x1078038: lw    s0, 32(sp)
-	ldloc 5
-	ldloc.0
+	stloc 4
+// 0x01077f04: 0x1077f04: lw    v0, 0(v0)
+	ldloc 6
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
 	ldelem.i4
-	stloc 7
-// 0x0107803c: 0x107803c: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc.0
+	stloc 4
+// 0x01077f08: 0x1077f08: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077f10:
+// 0x01077f10: 0x1077f10: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x01077f14: 0x1077f14: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 11
+	ldloc 5
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 4
 	ret
 }
-.method public static int32 RTAlerts_GroupCount_Str_1078044(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Warn_Icon_1077f1c(int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  9 is register ra
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
 	ldc.i4.s 0
 	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1078044:
-// 0x01078044: 0x1078044: lui   v0, 0x80000
+L_1077f1c:
+// 0x01077f1c: 0x1077f1c: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc 5
-// 0x01078048: 0x1078048: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
+	stloc 4
+// 0x01077f20: 0x1077f20: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
+	stloc 4
+// 0x01077f24: 0x1077f24: addu  v1, v0, zero
+	ldloc 4
 	stloc 5
-// 0x0107804c: 0x107804c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01078050: 0x1078050: lw    v1, 2008(v0)
+// 0x01077f28: 0x1077f28: lw    a2, 2000(v0)
 	ldloc 6
-	ldloc 5
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 502
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 8
-// 0x01078054: 0x1078054: lw    a3, 2004(v0)
+	stloc.2
+// 0x01077f2c: 0x1077f2c: j	 0x1077f6c addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_1077f6c
+// --- basic block ---
+L_1077f34:
+// 0x01077f34: 0x1077f34: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 501
-	add
 	ldelem.i4
+	stloc.1
+// 0x01077f38: 0x1077f38: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
+	add
 	stloc 4
-// 0x01078058: 0x1078058: sw    s0, 16(sp)
+// 0x01077f3c: 0x1077f3c: lw    a3, 0(a1)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0107805c: 0x107805c: lui   a2, 0x20000
-	ldc.i4 131072
+	ldelem.i4
 	stloc.3
-// 0x01078060: 0x1078060: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x01078064: 0x1078064: addiu a0, s0, -16076
-	ldloc 7
-	ldc.i4 -16076
-	add
-	stloc.1
-// 0x01078068: 0x1078068: subu  a3, a3, v1
-	ldloc 4
-	ldloc 8
-	sub
-	stloc 4
-// 0x0107806c: 0x107806c: addiu a2, a2, -13884
+// 0x01077f40: 0x1077f40: sll   zero, zero, 0
+// 0x01077f44: 0x1077f44: bne   a3, a0, 0x1077f6c addiu v1, v1, 4
 	ldloc.3
-	ldc.i4 -13884
-	add
-	stloc.3
-// 0x01078070: 0x1078070: sw    ra, 20(sp)
-// 0x01078074: 0x1078074: jal   0x1000f9c addiu a1, zero, 20
-	ldc.i4.s 20
-	stloc.2
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0107807c: 0x107807c: lw    ra, 20(sp)
-// 0x01078080: 0x1078080: addiu v0, s0, -16076
-	ldloc 7
-	ldc.i4 -16076
+	ldloc 5
+	ldc.i4.4
 	add
 	stloc 5
-// 0x01078084: 0x1078084: lw    s0, 16(sp)
+	bne.un L_1077f6c
+// --- basic block ---
+// 0x01077f4c: 0x1077f4c: lw    v0, 4(a1)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 7
-// 0x01078088: 0x1078088: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+	stloc 4
+// 0x01077f50: 0x1077f50: sll   zero, zero, 0
+// 0x01077f54: 0x1077f54: addiu v0, v0, -1
+	ldloc 4
+	ldc.i4.m1
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 4
+// 0x01077f58: 0x1077f58: sltiu v1, v0, 2
+	ldloc 4
+	ldc.i4.2
+	clt.un
+	stloc 5
+// 0x01077f5c: 0x1077f5c: beq   v1, zero, 0x1077f94 lui   v1, 0x20000
 	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_Count_Str_1078090(int32,int32,int32,int32,int32)
+	ldc.i4 131072
+	stloc 5
+	brfalse L_1077f94
+// --- basic block ---
+// 0x01077f64: 0x1077f64: j	 0x1077f80 sll   v0, v0, 2
+	ldloc 4
+	ldc.i4.2
+	shl
+	stloc 4
+	br L_1077f80
+// --- basic block ---
+L_1077f6c:
+// 0x01077f6c: 0x1077f6c: slt   a1, v0, a2
+	ldloc 4
+	ldloc.2
+	clt
+	stloc.1
+// 0x01077f70: 0x1077f70: bne   a1, zero, 0x1077f34 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_1077f34
+// --- basic block ---
+// 0x01077f78: 0x1077f78: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077f80:
+// 0x01077f80: 0x1077f80: addiu v1, v1, 29712
+	ldloc 5
+	ldc.i4 29712
+	add
+	stloc 5
+// 0x01077f84: 0x1077f84: addu  v0, v0, v1
+	ldloc 4
+	ldloc 5
+	add
+	stloc 4
+// 0x01077f88: 0x1077f88: lw    v0, 0(v0)
+	ldloc 6
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x01077f8c: 0x1077f8c: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+// --- basic block ---
+L_1077f94:
+// 0x01077f94: 0x1077f94: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x01077f98: 0x1077f98: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
+	ret
+}
+.method public static int32 RTAlerts_Get_String_1077fa0(int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  9 is register ra
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
 	ldc.i4.s 0
 	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1078090:
-// 0x01078090: 0x1078090: lui   v0, 0x80000
+L_1077fa0:
+// 0x01077fa0: 0x1077fa0: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc 5
-// 0x01078094: 0x1078094: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
+	stloc 4
+// 0x01077fa4: 0x1077fa4: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
+	stloc 4
+// 0x01077fa8: 0x1077fa8: addu  v1, v0, zero
+	ldloc 4
 	stloc 5
-// 0x01078098: 0x1078098: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107809c: 0x107809c: lw    v1, 2008(v0)
+// 0x01077fac: 0x1077fac: lw    a2, 2000(v0)
 	ldloc 6
-	ldloc 5
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 502
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 8
-// 0x010780a0: 0x10780a0: lw    a3, 2000(v0)
+	stloc.2
+// 0x01077fb0: 0x1077fb0: j	 0x1077ff0 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_1077ff0
+// --- basic block ---
+L_1077fb8:
+// 0x01077fb8: 0x1077fb8: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
-	add
 	ldelem.i4
+	stloc.1
+// 0x01077fbc: 0x1077fbc: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
+	add
 	stloc 4
-// 0x010780a4: 0x10780a4: sw    s0, 16(sp)
+// 0x01077fc0: 0x1077fc0: lw    a3, 0(a1)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
+	ldelem.i4
+	stloc.3
+// 0x01077fc4: 0x1077fc4: sll   zero, zero, 0
+// 0x01077fc8: 0x1077fc8: bne   a3, a0, 0x1077ff0 addiu v1, v1, 4
+	ldloc.3
+	ldloc.0
+	ldloc 5
 	ldc.i4.4
 	add
-	ldloc 7
-	stelem.i4
-// 0x010780a8: 0x10780a8: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x010780ac: 0x10780ac: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x010780b0: 0x10780b0: addiu a0, s0, -16056
-	ldloc 7
-	ldc.i4 -16056
+	stloc 5
+	bne.un L_1077ff0
+// --- basic block ---
+// 0x01077fd0: 0x1077fd0: lw    v0, 4(a1)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc.1
-// 0x010780b4: 0x10780b4: subu  a3, a3, v1
-	ldloc 4
-	ldloc 8
-	sub
+	ldelem.i4
 	stloc 4
-// 0x010780b8: 0x10780b8: addiu a2, a2, -13884
-	ldloc.3
-	ldc.i4 -13884
+// 0x01077fd4: 0x1077fd4: sll   zero, zero, 0
+// 0x01077fd8: 0x1077fd8: addiu v0, v0, -1
+	ldloc 4
+	ldc.i4.m1
 	add
-	stloc.3
-// 0x010780bc: 0x10780bc: sw    ra, 20(sp)
-// 0x010780c0: 0x10780c0: jal   0x1000f9c addiu a1, zero, 20
-	ldc.i4.s 20
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+	stloc 4
+// 0x01077fdc: 0x1077fdc: sltiu v1, v0, 2
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	ldc.i4.2
+	clt.un
+	stloc 5
+// 0x01077fe0: 0x1077fe0: beq   v1, zero, 0x1078018 lui   v1, 0x20000
+	ldloc 5
+	ldc.i4 131072
 	stloc 5
+	brfalse L_1078018
 // --- basic block ---
-// 0x010780c8: 0x10780c8: lw    ra, 20(sp)
-// 0x010780cc: 0x10780cc: addiu v0, s0, -16056
-	ldloc 7
-	ldc.i4 -16056
+// 0x01077fe8: 0x1077fe8: j	 0x1078004 sll   v0, v0, 2
+	ldloc 4
+	ldc.i4.2
+	shl
+	stloc 4
+	br L_1078004
+// --- basic block ---
+L_1077ff0:
+// 0x01077ff0: 0x1077ff0: slt   a1, v0, a2
+	ldloc 4
+	ldloc.2
+	clt
+	stloc.1
+// 0x01077ff4: 0x1077ff4: bne   a1, zero, 0x1077fb8 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_1077fb8
+// --- basic block ---
+// 0x01077ffc: 0x1077ffc: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br __CIBYL_function_return
+// --- basic block ---
+L_1078004:
+// 0x01078004: 0x1078004: addiu v1, v1, 29720
+	ldloc 5
+	ldc.i4 29720
 	add
 	stloc 5
-// 0x010780d0: 0x10780d0: lw    s0, 16(sp)
+// 0x01078008: 0x1078008: addu  v0, v0, v1
+	ldloc 4
+	ldloc 5
+	add
+	stloc 4
+// 0x0107800c: 0x107800c: lw    v0, 0(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
 	ldelem.i4
-	stloc 7
-// 0x010780d4: 0x10780d4: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
+	stloc 4
+// 0x01078010: 0x1078010: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+// --- basic block ---
+L_1078018:
+// 0x01078018: 0x1078018: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107801c: 0x107801c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
 	ret
 }
-.method public static int32 checkbox_callback_10780dc(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Distance_1078024(int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s1,int32 s4,int32 s5,int32 v1,int32 s3,int32 s6,int32 ra)
+.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  6 is register v0
-// local 12 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
-// local  8 is register s2
-// local 13 is register s3
-// local 10 is register s4
-// local 11 is register s5
-// local 14 is register s6
-// local  0 is register sp
-// local 15 is register ra
-// local  5 is register mem
+// local  1 is register v0
+// local  2 is register v1
+// local  0 is register a0
+// local  4 is register ra
+// local  3 is register mem
 
 	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 12
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
+	stloc.1
 	ldc.i4.s 0
-	stloc 14
+	stloc.2
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 4
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010780dc: 0x10780dc: addiu sp, sp, -48
-	ldloc.0
-	ldc.i4.s -48
+L_1078024:
+// 0x01078024: 0x1078024: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01078028: 0x1078028: addiu v0, v0, -15564
+	ldloc.1
+	ldc.i4 -15564
 	add
-	stloc.0
-// 0x010780e0: 0x10780e0: sw    s5, 36(sp)
-	ldloc 5
+	stloc.1
+// 0x0107802c: 0x107802c: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	shl
+	stloc.0
+// 0x01078030: 0x1078030: addu  a0, a0, v0
+	ldloc.0
+	ldloc.1
 	add
-	ldloc 11
-	stelem.i4
-// 0x010780e4: 0x10780e4: sw    s4, 32(sp)
-	ldloc 5
+	stloc.0
+// 0x01078034: 0x1078034: lw    v0, 0(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldloc 10
-	stelem.i4
-// 0x010780e8: 0x10780e8: sw    s2, 24(sp)
-	ldloc 5
-	ldloc.0
+	ldelem.i4
+	stloc.1
+// 0x01078038: 0x1078038: sll   zero, zero, 0
+// 0x0107803c: 0x107803c: beq   v0, zero, 0x1078074 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1078074
+// --- basic block ---
+// 0x01078044: 0x1078044: lw    v0, 4(v0)
+	ldloc 3
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.1
 	add
-	ldloc 8
-	stelem.i4
-// 0x010780ec: 0x10780ec: lui   s5, 0x0
-	ldc.i4.s 0
-	stloc 11
-// 0x010780f0: 0x10780f0: lui   s2, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x010780f4: 0x10780f4: lui   s4, 0x20000
-	ldc.i4 131072
-	stloc 10
-// 0x010780f8: 0x10780f8: sw    s6, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 14
-	stelem.i4
-// 0x010780fc: 0x10780fc: sw    s3, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	ldelem.i4
+	stloc.1
+// 0x01078048: 0x1078048: sll   zero, zero, 0
+// 0x0107804c: 0x107804c: addiu v0, v0, -1
+	ldloc.1
+	ldc.i4.m1
 	add
-	ldloc 13
-	stelem.i4
-// 0x01078100: 0x1078100: sw    s1, 20(sp)
-	ldloc 5
-	ldloc.0
+	stloc.1
+// 0x01078050: 0x1078050: sltiu v1, v0, 2
+	ldloc.1
 	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
-// 0x01078104: 0x1078104: sw    ra, 44(sp)
-// 0x01078108: 0x1078108: sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
+	clt.un
+	stloc.2
+// 0x01078054: 0x1078054: beq   v1, zero, 0x1078074 lui   v1, 0x20000
+	ldloc.2
+	ldc.i4 131072
+	stloc.2
+	brfalse L_1078074
+// --- basic block ---
+// 0x0107805c: 0x107805c: sll   v0, v0, 2
+	ldloc.1
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	shl
+	stloc.1
+// 0x01078060: 0x1078060: addiu v1, v1, 29728
+	ldloc.2
+	ldc.i4 29728
 	add
-	ldloc 7
-	stelem.i4
-// 0x0107810c: 0x107810c: addu  s6, a0, zero
+	stloc.2
+// 0x01078064: 0x1078064: addu  v0, v0, v1
 	ldloc.1
-	stloc 14
-// 0x01078110: 0x1078110: addiu s2, s2, -13912
-	ldloc 8
-	ldc.i4 -13912
-	add
-	stloc 8
-// 0x01078114: 0x1078114: addiu s5, s5, 20820
-	ldloc 11
-	ldc.i4 20820
-	add
-	stloc 11
-// 0x01078118: 0x1078118: addiu s4, s4, 9464
-	ldloc 10
-	ldc.i4 9464
+	ldloc.2
 	add
-	stloc 10
-// 0x0107811c: 0x107811c: addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 9
-// 0x01078120: 0x1078120: j	 0x1078174 lui   s3, 0x80000
-	ldc.i4 524288
-	stloc 13
-	br L_1078174
-// --- basic block ---
-L_1078128:
-// 0x01078128: 0x1078128: lw    s0, 0(s2)
-	ldloc 5
-	ldloc 8
+	stloc.1
+// 0x01078068: 0x1078068: lw    v0, 0(v0)
+	ldloc 3
+	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc 7
-// 0x0107812c: 0x107812c: sll   zero, zero, 0
-// 0x01078130: 0x1078130: beq   s0, zero, 0x107816c sll   zero, zero, 0
-	ldloc 7
-	brfalse L_107816c
+	stloc.1
+// 0x0107806c: 0x107806c: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x01078138: 0x1078138: lw    v0, 4(s6)
-	ldloc 5
-	ldloc 14
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+L_1078074:
+// 0x01078074: 0x1078074: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.2
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.1
+	ret
+}
+.method public static int32 RTAlerts_Is_Alertable_107807c(int32)
+{
+.maxstack 8
+.locals init (int32 a0,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  1 is register v0
+// local  2 is register v1
+// local  0 is register a0
+// local  4 is register ra
+// local  3 is register mem
+
+	ldc.i4.s 0
+	stloc.1
+	ldc.i4.s 0
+	stloc.2
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 4
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.3
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107807c:
+// 0x0107807c: 0x107807c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.1
+// 0x01078080: 0x1078080: addiu v0, v0, -15564
+	ldloc.1
+	ldc.i4 -15564
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107813c: 0x107813c: lw    a1, 16(s0)
-	ldloc 5
-	ldloc 7
+	stloc.1
+// 0x01078084: 0x1078084: sll   a0, a0, 2
+	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	shl
+	stloc.0
+// 0x01078088: 0x1078088: addu  a0, a0, v0
+	ldloc.0
+	ldloc.1
 	add
-	ldelem.i4
-	stloc.2
-// 0x01078140: 0x1078140: lw    a0, 16(v0)
-	ldloc 5
-	ldloc 6
+	stloc.0
+// 0x0107808c: 0x107808c: lw    v0, 0(a0)
+	ldloc 3
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
 	ldelem.i4
 	stloc.1
-// 0x01078144: 0x1078144: jal   0x1001b14 sll   zero, zero, 0
+// 0x01078090: 0x1078090: sll   zero, zero, 0
+// 0x01078094: 0x1078094: beq   v0, zero, 0x10780c8 sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 6
+	brfalse L_10780c8
 // --- basic block ---
-// 0x0107814c: 0x107814c: addu  a0, s0, zero
-	ldloc 7
-	stloc.1
-// 0x01078150: 0x1078150: lw    v1, 180(s0)
-	ldloc 5
-	ldloc 7
+// 0x0107809c: 0x107809c: lw    v0, 4(v0)
+	ldloc 3
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 45
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 12
-// 0x01078154: 0x1078154: bne   v0, zero, 0x1078164 addu  a1, s4, zero
-	ldloc 6
-	ldloc 10
+	stloc.1
+// 0x010780a0: 0x10780a0: sll   zero, zero, 0
+// 0x010780a4: 0x10780a4: sltiu v1, v0, 10
+	ldloc.1
+	ldc.i4.s 10
+	clt.un
+	stloc.2
+// 0x010780a8: 0x10780a8: beq   v1, zero, 0x10780c8 lui   v1, 0x20000
+	ldloc.2
+	ldc.i4 131072
 	stloc.2
-	brtrue L_1078164
+	brfalse L_10780c8
 // --- basic block ---
-// 0x0107815c: 0x107815c: addu  a0, s0, zero
-	ldloc 7
+// 0x010780b0: 0x10780b0: sll   v0, v0, 2
+	ldloc.1
+	ldc.i4.2
+	shl
 	stloc.1
-// 0x01078160: 0x1078160: addu  a1, s5, zero
-	ldloc 11
+// 0x010780b4: 0x10780b4: addiu v1, v1, 29736
+	ldloc.2
+	ldc.i4 29736
+	add
 	stloc.2
-L_1078164:
-// 0x01078164: 0x1078164: jalr  v1 sll   zero, zero, 0
-	ldloc 12
-	ldloc.0
+// 0x010780b8: 0x10780b8: addu  v0, v0, v1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 12
-	stloc 6
-// --- basic block ---
-L_107816c:
-// 0x0107816c: 0x107816c: addiu s1, s1, 1
-	ldloc 9
-	ldc.i4.1
-	add
-	stloc 9
-// 0x01078170: 0x1078170: addiu s2, s2, 4
-	ldloc 8
-	ldc.i4.4
 	add
-	stloc 8
-L_1078174:
-// 0x01078174: 0x1078174: lw    v0, -16244(s3)
-	ldloc 5
-	ldloc 13
+	stloc.1
+// 0x010780bc: 0x10780bc: lw    v0, 0(v0)
+	ldloc 3
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4061
-	add
 	ldelem.i4
-	stloc 6
-// 0x01078178: 0x1078178: sll   zero, zero, 0
-// 0x0107817c: 0x107817c: slt   v0, s1, v0
-	ldloc 9
-	ldloc 6
-	clt
-	stloc 6
-// 0x01078180: 0x1078180: bne   v0, zero, 0x1078128 addiu v0, zero, 1
-	ldloc 6
-	ldc.i4.1
-	stloc 6
-	brtrue L_1078128
+	stloc.1
+// 0x010780c0: 0x10780c0: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x01078188: 0x1078188: lw    ra, 44(sp)
-// 0x0107818c: 0x107818c: lw    s6, 40(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 14
-// 0x01078190: 0x1078190: lw    s5, 36(sp)
-	ldloc 5
+L_10780c8:
+// 0x010780c8: 0x10780c8: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.2
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.1
+	ret
+}
+.method public static int32 compare_proximity_10780d8(int32,int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
+
+// local  2 is register v0
+// local  4 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  5 is register ra
+// local  3 is register mem
+
+	ldc.i4.s 0
+	stloc.2
+	ldc.i4.s 0
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldarg 1
+	stloc 1
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.3
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010780d8: 0x10780d8: lw    v0, 0(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
-	add
 	ldelem.i4
-	stloc 11
-// 0x01078194: 0x1078194: lw    s4, 32(sp)
-	ldloc 5
-	ldloc.0
+	stloc.2
+// 0x010780dc: 0x10780dc: lw    a0, 0(a1)
+	ldloc 3
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
 	ldelem.i4
-	stloc 10
-// 0x01078198: 0x1078198: lw    s3, 28(sp)
-	ldloc 5
-	ldloc.0
+	stloc.0
+// 0x010780e0: 0x10780e0: lw    v1, 1264(v0)
+	ldloc 3
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 316
 	add
 	ldelem.i4
-	stloc 13
-// 0x0107819c: 0x107819c: lw    s2, 24(sp)
-	ldloc 5
+	stloc 4
+// 0x010780e4: 0x10780e4: lw    v0, 1264(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 316
 	add
 	ldelem.i4
-	stloc 8
-// 0x010781a0: 0x10781a0: lw    s1, 20(sp)
-	ldloc 5
+	stloc.2
+// 0x010780e8: 0x10780e8: sll   zero, zero, 0
+// 0x010780ec: 0x10780ec: slt   a0, v1, v0
+	ldloc 4
+	ldloc.2
+	clt
+	stloc.0
+// 0x010780f0: 0x10780f0: beq   a0, zero, 0x10780fc slt   v0, v0, v1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 9
-// 0x010781a4: 0x10781a4: lw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 7
-// 0x010781a8: 0x10781a8: jr    ra addiu sp, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc.0
+	ldloc.2
+	ldloc 4
+	clt
+	stloc.2
+	brfalse L_10780fc
+// --- basic block ---
+// 0x010780f8: 0x10780f8: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc.2
+L_10780fc:
+// 0x010780fc: 0x10780fc: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 12
+	ldloc 4
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc.2
 	ret
 }
-.method public static int32 RtAlerts_get_addional_text_icon_10781f0(int32,int32,int32,int32,int32)
+.method public static int32 compare_recency_1078104(int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
 
-// local  6 is register v0
-// local  5 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  2 is register v0
+// local  4 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  5 is register ra
+// local  3 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc.2
 	ldc.i4.s 0
-	stloc 5
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
 	stloc 4
 	ldarg 0
 	stloc 0
+	ldarg 1
+	stloc 1
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010781f0: 0x10781f0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010781f4: 0x10781f4: addiu sp, sp, -24
+// 0x01078104: 0x1078104: lw    v0, 0(a0)
+	ldloc 3
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x010781f8: 0x10781f8: addiu a0, a0, 1304
-	ldloc.1
-	ldc.i4 1304
-	add
-	stloc.1
-// 0x010781fc: 0x10781fc: sw    ra, 20(sp)
-// 0x01078200: 0x1078200: jal   0x1001b14 addiu a1, a1, -26940
-	ldloc.2
-	ldc.i4 -26940
-	add
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.2
+// 0x01078108: 0x1078108: lw    a0, 0(a1)
+	ldloc 3
 	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.0
+// 0x0107810c: 0x107810c: lw    v1, 144(v0)
+	ldloc 3
 	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 6
-// --- basic block ---
-// 0x01078208: 0x1078208: bne   v0, zero, 0x1078218 addu  v1, zero, zero
-	ldloc 6
-	ldc.i4.s 0
-	stloc 5
-	brtrue L_1078218
-// --- basic block ---
-// 0x01078210: 0x1078210: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01078214: 0x1078214: addiu v1, v1, -26880
-	ldloc 5
-	ldc.i4 -26880
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 36
 	add
-	stloc 5
-L_1078218:
-// 0x01078218: 0x1078218: lw    ra, 20(sp)
-// 0x0107821c: 0x107821c: addu  v0, v1, zero
-	ldloc 5
-	stloc 6
-// 0x01078220: 0x1078220: jr    ra addiu sp, sp, 24
+	ldelem.i4
+	stloc 4
+// 0x01078110: 0x1078110: lw    v0, 144(a0)
+	ldloc 3
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 36
 	add
+	ldelem.i4
+	stloc.2
+// 0x01078114: 0x1078114: sll   zero, zero, 0
+// 0x01078118: 0x1078118: slt   a0, v0, v1
+	ldloc.2
+	ldloc 4
+	clt
 	stloc.0
+// 0x0107811c: 0x107811c: beq   a0, zero, 0x1078128 slt   v0, v1, v0
+	ldloc.0
+	ldloc 4
+	ldloc.2
+	clt
+	stloc.2
+	brfalse L_1078128
+// --- basic block ---
+// 0x01078124: 0x1078124: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc.2
+L_1078128:
+// 0x01078128: 0x1078128: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 4
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc.2
 	ret
 }
-.method public static int32 RtAlerts_get_addional_text_1078228(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Current_Alert_Id_1078130()
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
 
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
 
 	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
+	stloc.0
 	ldc.i4.s 0
-	stloc 7
+	stloc.1
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078228: 0x1078228: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107822c: 0x107822c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
+// 0x01078130: 0x1078130: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc.0
-// 0x01078230: 0x1078230: addiu a0, a0, 1304
-	ldloc.1
-	ldc.i4 1304
-	add
-	stloc.1
-// 0x01078234: 0x1078234: sw    ra, 20(sp)
-// 0x01078238: 0x1078238: jal   0x1001b14 addiu a1, a1, -26940
-	ldloc.2
-	ldc.i4 -26940
-	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x01078240: 0x1078240: bne   v0, zero, 0x1078258 addu  v1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 6
-	brtrue L_1078258
-// --- basic block ---
-// 0x01078248: 0x1078248: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107824c: 0x107824c: jal   0x101cd60 addiu a0, a0, -26860
-	ldloc.1
-	ldc.i4 -26860
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078254: 0x1078254: addu  v1, v0, zero
-	ldloc 5
-	stloc 6
-L_1078258:
-// 0x01078258: 0x1078258: lw    ra, 20(sp)
-// 0x0107825c: 0x107825c: addu  v0, v1, zero
-	ldloc 6
-	stloc 5
-// 0x01078260: 0x1078260: jr    ra addiu sp, sp, 24
+// 0x01078134: 0x1078134: lw    v0, -13540(v0)
+	ldloc 2
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3385
 	add
+	ldelem.i4
 	stloc.0
+// 0x01078138: 0x1078138: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc.0
 	ret
 }
-.method public static int32 RTAlerts_add_comment_stars_1078364(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Penalty_1078140()
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
+.maxstack 4
+.locals init (int32 v0,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register s0
-// local  8 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  7 is register mem
+// local  0 is register v0
+// local  1 is register ra
 
 	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 9
+	stloc.0
 	ldc.i4.s 0
-	stloc 8
+	stloc.1
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01078140: 0x1078140: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc 10
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RTAlerts_Is_Cancelable_1078148()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
 	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
+	stloc.0
 	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078364: 0x1078364: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
+L_1078148:
+// 0x01078148: 0x1078148: jr    ra addiu v0, zero, 1
+	ldc.i4.1
 	stloc.0
-// 0x01078368: 0x1078368: sw    s2, 28(sp)
-	ldloc 7
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 10
-	stelem.i4
-// 0x0107836c: 0x107836c: lui   s2, 0x20000
-	ldc.i4 131072
-	stloc 10
-// 0x01078370: 0x1078370: sw    s0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
-// 0x01078374: 0x1078374: addu  s0, a0, zero
-	ldloc.1
-	stloc 9
-// 0x01078378: 0x1078378: addiu a0, s2, -6328
-	ldloc 10
-	ldc.i4 -6328
-	add
-	stloc.1
-// 0x0107837c: 0x107837c: sw    s3, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 11
-	stelem.i4
-// 0x01078380: 0x1078380: sw    s1, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x01078384: 0x1078384: addiu s3, a1, 16
-	ldloc.2
-	ldc.i4.s 16
-	add
-	stloc 11
-// 0x01078388: 0x1078388: sw    ra, 36(sp)
-// 0x0107838c: 0x107838c: jal   0x101cd60 addu  s1, a1, zero
-	ldloc.2
-	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078394: 0x1078394: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x01078398: 0x1078398: jal   0x1001b14 addu  a0, s3, zero
-	ldloc 11
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x010783a0: 0x10783a0: beq   v0, zero, 0x107842c addu  a0, s3, zero
-	ldloc 5
-	ldloc 11
-	stloc.1
-	brfalse L_107842c
-// --- basic block ---
-// 0x010783a8: 0x10783a8: jal   0x1001b14 addiu a1, s2, -6328
-	ldloc 10
-	ldc.i4 -6328
-	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x010783b0: 0x10783b0: beq   v0, zero, 0x107842c addiu v1, zero, -1
-	ldloc 5
-	ldc.i4.m1
-	stloc 6
-	brfalse L_107842c
-// --- basic block ---
-// 0x010783b8: 0x10783b8: lw    v0, 528(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 132
-	add
-	ldelem.i4
-	stloc 5
-// 0x010783bc: 0x10783bc: sll   zero, zero, 0
-// 0x010783c0: 0x10783c0: beq   v0, v1, 0x107842c sltiu v1, v0, 6
-	ldloc 5
-	ldloc 6
-	ldloc 5
-	ldc.i4.6
-	clt.un
-	stloc 6
-	beq  L_107842c
-// --- basic block ---
-// 0x010783c8: 0x10783c8: bne   v1, zero, 0x10783dc lui   v1, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brtrue L_10783dc
-// --- basic block ---
-// 0x010783d0: 0x10783d0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010783d4: 0x10783d4: j	 0x10783ec addiu a1, a1, -27080
-	ldloc.2
-	ldc.i4 -27080
-	add
-	stloc.2
-	br L_10783ec
-// --- basic block ---
-L_10783dc:
-// 0x010783dc: 0x10783dc: sll   v0, v0, 2
-	ldloc 5
-	ldc.i4.2
-	shl
-	stloc 5
-// 0x010783e0: 0x10783e0: addiu v1, v1, 29312
-	ldloc 6
-	ldc.i4 29312
-	add
-	stloc 6
-// 0x010783e4: 0x10783e4: addu  v0, v0, v1
-	ldloc 5
-	ldloc 6
-	add
-	stloc 5
-// 0x010783e8: 0x10783e8: lw    a1, 0(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.2
-L_10783ec:
-// 0x010783ec: 0x10783ec: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010783f0: 0x10783f0: addiu a0, a0, -26832
-	ldloc.1
-	ldc.i4 -26832
-	add
-	stloc.1
-// 0x010783f4: 0x10783f4: jal   0x109e13c addiu a2, zero, 8
-	ldc.i4.8
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010783fc: 0x10783fc: addu  s1, v0, zero
-	ldloc 5
-	stloc 8
-// 0x01078400: 0x1078400: addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-// 0x01078404: 0x1078404: addiu a1, zero, 5
-	ldc.i4.5
-	stloc.2
-// 0x01078408: 0x1078408: jal   0x109434c addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078410: 0x1078410: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x01078414: 0x1078414: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078418: 0x1078418: jal   0x1098f84 addiu a2, zero, 5
-	ldc.i4.5
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078420: 0x1078420: addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-// 0x01078424: 0x1078424: jal   0x1098ec4 addu  a1, s1, zero
-	ldloc 8
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_107842c:
-// 0x0107842c: 0x107842c: lw    ra, 36(sp)
-// 0x01078430: 0x1078430: lw    s3, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 11
-// 0x01078434: 0x1078434: lw    s2, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 10
-// 0x01078438: 0x1078438: lw    s1, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107843c: 0x107843c: lw    s0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 9
-// 0x01078440: 0x1078440: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_update_stars_1078448(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01078448: 0x1078448: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0107844c: 0x107844c: sw    s3, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 11
-	stelem.i4
-// 0x01078450: 0x1078450: lui   s3, 0x20000
-	ldc.i4 131072
-	stloc 11
-// 0x01078454: 0x1078454: sw    s1, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x01078458: 0x1078458: addu  s1, a1, zero
-	ldloc.2
-	stloc 9
-// 0x0107845c: 0x107845c: addiu a1, s3, -26820
-	ldloc 11
-	ldc.i4 -26820
-	add
-	stloc.2
-// 0x01078460: 0x1078460: sw    s2, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 10
-	stelem.i4
-// 0x01078464: 0x1078464: sw    s0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 8
-	stelem.i4
-// 0x01078468: 0x1078468: sw    ra, 36(sp)
-// 0x0107846c: 0x107846c: jal   0x109b304 addu  s2, a0, zero
-	ldloc.1
-	stloc 10
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078474: 0x1078474: bne   v0, zero, 0x10784c0 addu  s0, v0, zero
-	ldloc 5
-	ldloc 5
-	stloc 8
-	brtrue L_10784c0
+	ret
+}
+.method public static int32 RTAlerts_Check_Same_Street_1078150()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107847c: 0x107847c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01078480: 0x1078480: addiu a1, a1, -27080
-	ldloc.2
-	ldc.i4 -27080
-	add
-	stloc.2
-// 0x01078484: 0x1078484: addiu a0, s3, -26820
-	ldloc 11
-	ldc.i4 -26820
-	add
+L_1078150:
+// 0x01078150: 0x1078150: jr    ra addiu v0, zero, 1
+	ldc.i4.1
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RTAlerts_HandleAlert_1078158()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
 	stloc.1
-// 0x01078488: 0x1078488: jal   0x109e13c addu  a2, zero, zero
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1078158:
+// 0x01078158: 0x1078158: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc.3
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078490: 0x1078490: addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x01078494: 0x1078494: addu  a0, s2, zero
-	ldloc 10
+	ret
+}
+.method public static int32 RTAlerts_is_square_dependent_1078160()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
 	stloc.1
-// 0x01078498: 0x1078498: addiu a1, zero, 5
-	ldc.i4.5
-	stloc.2
-// 0x0107849c: 0x107849c: jal   0x109434c addu  a2, zero, zero
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1078160:
+// 0x01078160: 0x1078160: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc.3
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ret
+}
+.method public static int32 RTAlerts_get_priority_1078168()
+{
+.maxstack 4
+.locals init (int32 v0,int32 ra)
+
+// local  0 is register v0
+// local  1 is register ra
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010784a4: 0x10784a4: addu  a0, s0, zero
-	ldloc 8
+L_1078168:
+// 0x01078168: 0x1078168: jr    ra addiu v0, zero, 2
+	ldc.i4.2
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.0
+	ret
+}
+.method public static int32 RTAlerts_get_location_info_1078170(int32)
+{
+.maxstack 5
+.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
+
+// local  1 is register v0
+// local  0 is register a0
+// local  2 is register ra
+// local  3 is register mem
+
+	ldc.i4.s 0
 	stloc.1
-// 0x010784a8: 0x10784a8: addu  a1, zero, zero
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
 	stloc.2
-// 0x010784ac: 0x10784ac: jal   0x1098f84 addiu a2, zero, 5
-	ldc.i4.5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010784b4: 0x10784b4: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x010784b8: 0x10784b8: jal   0x1098ec4 addu  a1, s0, zero
-	ldloc 8
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_10784c0:
-// 0x010784c0: 0x10784c0: lb    v0, 32(s1)
-	ldloc 9
-	ldc.i4.s 32
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x010784c4: 0x10784c4: sll   zero, zero, 0
-// 0x010784c8: 0x10784c8: beq   v0, zero, 0x1078534 lui   a0, 0x20000
-	ldloc 5
-	ldc.i4 131072
+L_1078170:
+// 0x01078170: 0x1078170: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc.1
-	brfalse L_1078534
-// --- basic block ---
-// 0x010784d0: 0x10784d0: jal   0x101cd60 addiu a0, a0, -6328
+// 0x01078174: 0x1078174: addiu v0, v0, -15564
 	ldloc.1
-	ldc.i4 -6328
+	ldc.i4 -15564
 	add
 	stloc.1
+// 0x01078178: 0x1078178: sll   a0, a0, 2
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x010784d8: 0x10784d8: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x010784dc: 0x10784dc: jal   0x1001b14 addiu a0, s1, 32
-	ldloc 9
-	ldc.i4.s 32
-	add
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x010784e4: 0x10784e4: beq   v0, zero, 0x1078534 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1078534
-// --- basic block ---
-// 0x010784ec: 0x10784ec: lw    v0, 136(s1)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 34
-	add
-	ldelem.i4
-	stloc 5
-// 0x010784f0: 0x10784f0: sll   zero, zero, 0
-// 0x010784f4: 0x10784f4: sltiu v1, v0, 6
-	ldloc 5
-	ldc.i4.6
-	clt.un
-	stloc 6
-// 0x010784f8: 0x10784f8: bne   v1, zero, 0x107850c lui   v1, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc 6
-	brtrue L_107850c
-// --- basic block ---
-// 0x01078500: 0x1078500: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01078504: 0x1078504: j	 0x107851c addiu a1, a1, -27080
-	ldloc.2
-	ldc.i4 -27080
-	add
-	stloc.2
-	br L_107851c
-// --- basic block ---
-L_107850c:
-// 0x0107850c: 0x107850c: sll   v0, v0, 2
-	ldloc 5
 	ldc.i4.2
 	shl
-	stloc 5
-// 0x01078510: 0x1078510: addiu v1, v1, 29312
-	ldloc 6
-	ldc.i4 29312
-	add
-	stloc 6
-// 0x01078514: 0x1078514: addu  v0, v0, v1
-	ldloc 5
-	ldloc 6
+	stloc.0
+// 0x0107817c: 0x107817c: addu  a0, a0, v0
+	ldloc.0
+	ldloc.1
 	add
-	stloc 5
-// 0x01078518: 0x1078518: lw    a1, 0(v0)
-	ldloc 7
-	ldloc 5
+	stloc.0
+// 0x01078180: 0x1078180: lw    v0, 0(a0)
+	ldloc 3
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.2
-L_107851c:
-// 0x0107851c: 0x107851c: jal   0x109df10 addu  a0, s0, zero
-	ldloc 8
 	stloc.1
-	ldloc.0
+// 0x01078184: 0x1078184: jr    ra addiu v0, v0, 1288
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078524: 0x1078524: jal   0x10990ac addu  a0, s0, zero
-	ldloc 8
+	ldc.i4 1288
+	add
 	stloc.1
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107852c: 0x107852c: j	 0x107853c sll   zero, zero, 0
-	br L_107853c
-// --- basic block ---
-L_1078534:
-// 0x01078534: 0x1078534: jal   0x1099098 addu  a0, s0, zero
-	ldloc 8
+	ret
+}
+.method public static int32 RTAlerts_Resert_Minimized_107818c()
+{
+.maxstack 5
+.locals init (int32 v0,int32 v1,int32 ra,int32[] mem)
+
+// local  0 is register v0
+// local  1 is register v1
+// local  2 is register ra
+// local  3 is register mem
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
 	stloc.1
-	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
-	stloc 5
+	ldc.i4.s 0
+	stloc.2
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.3
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_107853c:
-// 0x0107853c: 0x107853c: lw    ra, 36(sp)
-// 0x01078540: 0x1078540: lw    s3, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 11
-// 0x01078544: 0x1078544: lw    s2, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 10
-// 0x01078548: 0x1078548: lw    s1, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 9
-// 0x0107854c: 0x107854c: lw    s0, 20(sp)
-	ldloc 7
+// 0x0107818c: 0x107818c: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc.1
+// 0x01078190: 0x1078190: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc.0
+// 0x01078194: 0x1078194: jr    ra sw    v1, 15876(v0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 3969
 	add
-	ldelem.i4
-	stloc 8
-// 0x01078550: 0x1078550: jr    ra addiu sp, sp, 40
+	ldloc.1
+	stelem.i4
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc.1
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc.0
-	ldc.i4.s 40
+	ret
+}
+.method public static int32 RTAlerts_Get_Minimize_State_107819c()
+{
+.maxstack 5
+.locals init (int32 v0,int32 ra,int32[] mem)
+
+// local  0 is register v0
+// local  1 is register ra
+// local  2 is register mem
+
+	ldc.i4.s 0
+	stloc.0
+	ldc.i4.s 0
+	stloc.1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc.2
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107819c: 0x107819c: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc.0
+// 0x010781a0: 0x10781a0: lw    v0, 15876(v0)
+	ldloc 2
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 3969
 	add
+	ldelem.i4
 	stloc.0
+// 0x010781a4: 0x10781a4: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc.0
 	ret
 }
-.method public static int32 RTAlerts_Delete_All_Comments_10785d8(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Get_Stars_Icon_10781d4(int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
+.locals init (int32 a0,int32 v0,int32 ra,int32[] mem)
 
-// local  8 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  0 is register sp
-// local  7 is register ra
-// local  5 is register mem
+// local  1 is register v0
+// local  0 is register a0
+// local  2 is register ra
+// local  3 is register mem
 
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
+	stloc.1
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc.2
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010785d8: 0x10785d8: addiu sp, sp, -24
+// 0x010781d4: 0x10781d4: sltiu v0, a0, 6
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x010785dc: 0x10785dc: lw    a0, 1300(a0)
-	ldloc 5
+	ldc.i4.6
+	clt.un
+	stloc.1
+// 0x010781d8: 0x10781d8: bne   v0, zero, 0x10781ec sll   zero, zero, 0
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4 325
-	add
-	ldelem.i4
+	brtrue L_10781ec
+// --- basic block ---
+// 0x010781e0: 0x10781e0: lui   v0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x010785e0: 0x10785e0: sw    ra, 20(sp)
-// 0x010785e4: 0x10785e4: sw    s0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
-L_10785e8:
-// 0x010785e8: 0x10785e8: beq   a0, zero, 0x1078604 sll   zero, zero, 0
+// 0x010781e4: 0x10781e4: jr    ra addiu v0, v0, -26616
 	ldloc.1
-	brfalse L_1078604
+	ldc.i4 -26616
+	add
+	stloc.1
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x010785f0: 0x10785f0: lw    s0, 0(a0)
-	ldloc 5
+L_10781ec:
+// 0x010781ec: 0x10781ec: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x010781f0: 0x10781f0: addiu v0, v0, 29776
 	ldloc.1
+	ldc.i4 29776
+	add
+	stloc.1
+// 0x010781f4: 0x10781f4: sll   a0, a0, 2
+	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 6
-// 0x010785f4: 0x10785f4: jal   0x1000930 sll   zero, zero, 0
+	shl
+	stloc.0
+// 0x010781f8: 0x10781f8: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x010785fc: 0x10785fc: j	 0x10785e8 addu  a0, s0, zero
-	ldloc 6
-	stloc.1
-	br L_10785e8
-// --- basic block ---
-L_1078604:
-// 0x01078604: 0x1078604: lw    ra, 20(sp)
-// 0x01078608: 0x1078608: lw    s0, 16(sp)
-	ldloc 5
+	add
+	stloc.0
+// 0x010781fc: 0x10781fc: lw    v0, 0(a0)
+	ldloc 3
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
 	ldelem.i4
-	stloc 6
-// 0x0107860c: 0x107860c: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
+	stloc.1
+// 0x01078200: 0x1078200: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc.1
 	ret
 }
-.method public static int32 space_1078614(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_isByMe_1078214(int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 lo)
+.maxstack 5
+.locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  9 is register lo
+// local  4 is register v0
+// local  5 is register v1
+// local  0 is register a0
+// local  1 is register a1
+// local  2 is register a2
+// local  3 is register a3
+// local  7 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
+	ldarg 0
+	stloc 0
 	ldarg 1
 	stloc 1
 	ldarg 2
 	stloc 2
 	ldarg 3
 	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078614: 0x1078614: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
+// 0x01078214: 0x1078214: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 4
+// 0x01078218: 0x1078218: addiu v0, v0, -15564
+	ldloc 4
+	ldc.i4 -15564
 	add
-	stloc.0
-// 0x01078618: 0x1078618: sw    a0, 24(sp)
+	stloc 4
+// 0x0107821c: 0x107821c: addu  v1, v0, zero
+	ldloc 4
+	stloc 5
+// 0x01078220: 0x1078220: lw    a2, 2000(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 500
 	add
-	ldloc.1
-	stelem.i4
-// 0x0107861c: 0x107861c: sw    ra, 36(sp)
-// 0x01078620: 0x1078620: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
-	stloc 5
+	ldelem.i4
+	stloc.2
+// 0x01078224: 0x1078224: j	 0x1078250 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_1078250
 // --- basic block ---
-// 0x01078628: 0x1078628: lw    a0, 24(sp)
+L_107822c:
+// 0x0107822c: 0x107822c: lw    a1, 0(v1)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
 	ldelem.i4
 	stloc.1
-// 0x0107862c: 0x107862c: beq   v0, zero, 0x107863c addiu v0, zero, 10
-	ldloc 5
-	ldc.i4.s 10
-	stloc 5
-	brfalse L_107863c
-// --- basic block ---
-// 0x01078634: 0x1078634: mult  a0, v0
-	ldloc.1
-	ldloc 5
-	mul
-	stloc 9
-// 0x01078638: 0x1078638: mflo  lo
-	ldloc 9
-	stloc.1
-L_107863c:
-// 0x0107863c: 0x107863c: addu  a3, a0, zero
-	ldloc.1
-	stloc 4
-// 0x01078640: 0x1078640: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01078644: 0x1078644: addiu a0, a0, 32124
-	ldloc.1
-	ldc.i4 32124
+// 0x01078230: 0x1078230: addiu v0, v0, 1
+	ldloc 4
+	ldc.i4.1
 	add
-	stloc.1
-// 0x01078648: 0x1078648: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107864c: 0x107864c: addiu a2, zero, -2
-	ldc.i4.s -2
-	stloc.3
-// 0x01078650: 0x1078650: addiu v0, zero, 136
-	ldc.i4 136
-	stloc 5
-// 0x01078654: 0x1078654: jal   0x1093a24 sw    v0, 16(sp)
+	stloc 4
+// 0x01078234: 0x1078234: lw    a3, 0(a1)
 	ldloc 6
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
+	ldelem.i4
+	stloc.3
+// 0x01078238: 0x1078238: sll   zero, zero, 0
+// 0x0107823c: 0x107823c: bne   a3, a0, 0x1078250 addiu v1, v1, 4
+	ldloc.3
+	ldloc.0
+	ldloc 5
 	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
+	bne.un L_1078250
 // --- basic block ---
-// 0x0107865c: 0x107865c: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01078660: 0x1078660: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078664: 0x1078664: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x01078668: 0x1078668: jal   0x1098fe0 sw    v0, 24(sp)
+// 0x01078244: 0x1078244: lw    v0, 1280(a1)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x01078670: 0x1078670: lw    ra, 36(sp)
-// 0x01078674: 0x1078674: lw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 320
 	add
 	ldelem.i4
-	stloc 5
-// 0x01078678: 0x1078678: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
+	stloc 4
+// 0x01078248: 0x1078248: jr    ra sll   zero, zero, 0
+	br __CIBYL_function_return
+// --- basic block ---
+L_1078250:
+// 0x01078250: 0x1078250: slt   a1, v0, a2
+	ldloc 4
+	ldloc.2
+	clt
+	stloc.1
+// 0x01078254: 0x1078254: bne   a1, zero, 0x107822c sll   zero, zero, 0
+	ldloc.1
+	brtrue L_107822c
+// --- basic block ---
+// 0x0107825c: 0x107825c: jr    ra addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 4
 	ret
 }
-.method public static int32 send_map_problem_sk_cb_1078680(int32,int32,int32,int32,int32)
+.method public static int32 j2me_sort_alerts_1078264(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 v1,int32 s1,int32 s3,int32 s0,int32 s5,int32 s4,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra,int32 v1)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local 17 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 11 is register s0
-// local  9 is register s1
-// local  7 is register s2
+// local  8 is register s0
+// local  7 is register s1
+// local  9 is register s2
 // local 10 is register s3
-// local 13 is register s4
+// local 11 is register s4
 // local 12 is register s5
+// local 13 is register s6
+// local 14 is register s7
 // local  0 is register sp
-// local 14 is register ra
-// local  6 is register mem
+// local 15 is register s8
+// local 16 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 17
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2821,418 +2283,386 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldc.i4.s 0
 	stloc 7
 	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 13
+	stloc 11
 	ldc.i4.s 0
 	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 15
+	ldc.i4.s 0
+	stloc 16
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078680: 0x1078680: addiu sp, sp, -56
+// 0x01078264: 0x1078264: addiu sp, sp, -64
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01078684: 0x1078684: sw    s0, 28(sp)
-	ldloc 6
+// 0x01078268: 0x1078268: sw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.6
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x01078688: 0x1078688: lui   s0, 0x20000
-	ldc.i4 131072
-	stloc 11
-// 0x0107868c: 0x107868c: sw    s1, 32(sp)
-	ldloc 6
+// 0x0107826c: 0x107826c: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x01078270: 0x1078270: addiu s0, s0, -15564
+	ldloc 8
+	ldc.i4 -15564
+	add
+	stloc 8
+// 0x01078274: 0x1078274: sw    s8, 56(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 14
 	add
-	ldloc 9
+	ldloc 15
 	stelem.i4
-// 0x01078690: 0x1078690: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x01078694: 0x1078694: addiu a0, s0, -26808
-	ldloc 11
-	ldc.i4 -26808
-	add
-	stloc.1
-// 0x01078698: 0x1078698: sw    ra, 52(sp)
-// 0x0107869c: 0x107869c: sw    s5, 48(sp)
-	ldloc 6
+// 0x01078278: 0x1078278: sw    s6, 48(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 12
 	add
-	ldloc 12
+	ldloc 13
 	stelem.i4
-// 0x010786a0: 0x10786a0: sw    s4, 44(sp)
-	ldloc 6
+// 0x0107827c: 0x107827c: sw    s5, 44(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 11
 	add
-	ldloc 13
+	ldloc 12
 	stelem.i4
-// 0x010786a4: 0x10786a4: sw    s3, 40(sp)
-	ldloc 6
+// 0x01078280: 0x1078280: sw    s3, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 9
 	add
 	ldloc 10
 	stelem.i4
-// 0x010786a8: 0x10786a8: jal   0x101cd60 sw    s2, 36(sp)
-	ldloc 6
+// 0x01078284: 0x1078284: sw    s1, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.7
 	add
 	ldloc 7
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x010786b0: 0x10786b0: addu  a1, v0, zero
+// 0x01078288: 0x1078288: sw    ra, 60(sp)
+// 0x0107828c: 0x107828c: sw    s7, 52(sp)
 	ldloc 5
-	stloc.2
-// 0x010786b4: 0x10786b4: jal   0x109b304 addu  a0, s1, zero
-	ldloc 9
-	stloc.1
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x010786bc: 0x10786bc: addiu a0, s0, -26808
-	ldloc 11
-	ldc.i4 -26808
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
 	add
-	stloc.1
-// 0x010786c0: 0x10786c0: jal   0x101cd60 addu  s1, v0, zero
+	ldloc 14
+	stelem.i4
+// 0x01078290: 0x1078290: sw    s4, 40(sp)
 	ldloc 5
-	stloc 9
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x010786c8: 0x10786c8: addu  a1, v0, zero
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 11
+	stelem.i4
+// 0x01078294: 0x1078294: sw    s2, 32(sp)
 	ldloc 5
-	stloc.2
-// 0x010786cc: 0x10786cc: jal   0x109b634 addu  a0, s1, zero
-	ldloc 9
-	stloc.1
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 9
+	stelem.i4
+// 0x01078298: 0x1078298: addu  s6, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_widget_get_value_109b634(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 13
+// 0x0107829c: 0x107829c: addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+// 0x010782a0: 0x10782a0: addu  s3, s0, zero
+	ldloc 8
+	stloc 10
+// 0x010782a4: 0x10782a4: addiu s5, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc 12
+// 0x010782a8: 0x10782a8: j	 0x1078320 addiu s8, zero, -1
+	ldc.i4.m1
+	stloc 15
+	br L_1078320
 // --- basic block ---
-// 0x010786d4: 0x10786d4: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x010786d8: 0x10786d8: addiu a0, a0, -23972
-	ldloc.1
-	ldc.i4 -23972
+L_10782b0:
+// 0x010782b0: 0x10782b0: lw    v0, 4(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
+	ldelem.i4
+	stloc 6
+// 0x010782b4: 0x10782b4: addu  a0, s5, zero
+	ldloc 12
 	stloc.1
-// 0x010786dc: 0x10786dc: addu  s1, v0, zero
+// 0x010782b8: 0x10782b8: addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+// 0x010782bc: 0x10782bc: jalr  s6 sw    v0, 16(sp)
+	ldloc 13
 	ldloc 5
-	stloc 9
-// 0x010786e0: 0x10786e0: jal   0x101df24 lui   s3, 0x80000
-	ldc.i4 524288
-	stloc 10
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 17
+	stloc 6
 // --- basic block ---
-// 0x010786e8: 0x10786e8: lui   s5, 0x0
-	ldc.i4.s 0
-	stloc 12
-// 0x010786ec: 0x10786ec: addu  s0, v0, zero
-	ldloc 5
-	stloc 11
-// 0x010786f0: 0x10786f0: addiu s3, s3, -13912
+// 0x010782c4: 0x10782c4: sll   s2, s1, 2
+	ldloc 7
+	ldc.i4.2
+	shl
+	stloc 9
+// 0x010782c8: 0x10782c8: srl   v0, v0, 31
+	ldloc 6
+	ldc.i4.s 31
+	shr.un
+	stloc 6
+// 0x010782cc: 0x10782cc: addu  s2, s3, s2
 	ldloc 10
-	ldc.i4 -13912
+	ldloc 9
 	add
-	stloc 10
-// 0x010786f4: 0x10786f4: addiu s5, s5, 20820
-	ldloc 12
-	ldc.i4 20820
+	stloc 9
+// 0x010782d0: 0x10782d0: j	 0x10782f8 addiu s4, s0, -4
+	ldloc 8
+	ldc.i4.s -4
 	add
-	stloc 12
-// 0x010786f8: 0x10786f8: addu  s2, zero, zero
-	ldc.i4.s 0
-	stloc 7
-// 0x010786fc: 0x10786fc: j	 0x1078764 lui   s4, 0x80000
-	ldc.i4 524288
-	stloc 13
-	br L_1078764
+	stloc 11
+	br L_10782f8
 // --- basic block ---
-L_1078704:
-// 0x01078704: 0x1078704: lw    v0, 0(s3)
-	ldloc 6
-	ldloc 10
+L_10782d8:
+// 0x010782d8: 0x10782d8: lw    v0, 0(s2)
+	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc 5
-// 0x01078708: 0x1078708: sll   zero, zero, 0
-// 0x0107870c: 0x107870c: lw    a0, 16(v0)
-	ldloc 6
+	stloc 6
+// 0x010782dc: 0x10782dc: addiu s1, s1, -1
+	ldloc 7
+	ldc.i4.m1
+	add
+	stloc 7
+// 0x010782e0: 0x10782e0: sw    v0, 4(s2)
 	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.1
 	add
-	ldelem.i4
-	stloc.1
-// 0x01078710: 0x1078710: jal   0x10947ac addiu s3, s3, 4
-	ldloc 10
-	ldc.i4.4
+	ldloc 6
+	stelem.i4
+// 0x010782e4: 0x10782e4: beq   s1, s8, 0x1078304 addiu s2, s2, -4
+	ldloc 7
+	ldloc 15
+	ldloc 9
+	ldc.i4.s -4
 	add
-	stloc 10
+	stloc 9
+	beq  L_1078304
+// --- basic block ---
+// 0x010782ec: 0x10782ec: jalr  s6 addiu s4, s4, -4
+	ldloc 13
+	ldloc 11
+	ldc.i4.s -4
+	add
+	stloc 11
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_get_data_10947ac(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 17
+	stloc 6
 // --- basic block ---
-// 0x01078718: 0x1078718: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107871c: 0x107871c: jal   0x1001b14 addu  a1, s5, zero
-	ldloc 12
+// 0x010782f4: 0x10782f4: srl   v0, v0, 31
+	ldloc 6
+	ldc.i4.s 31
+	shr.un
+	stloc 6
+L_10782f8:
+// 0x010782f8: 0x10782f8: addu  a1, s4, zero
+	ldloc 11
 	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x01078724: 0x1078724: bne   v0, zero, 0x1078764 addiu s2, s2, 1
-	ldloc 5
-	ldloc 7
-	ldc.i4.1
-	add
-	stloc 7
-	brtrue L_1078764
+// 0x010782fc: 0x10782fc: bne   v0, zero, 0x10782d8 addu  a0, s5, zero
+	ldloc 6
+	ldloc 12
+	stloc.1
+	brtrue L_10782d8
 // --- basic block ---
-// 0x0107872c: 0x107872c: addiu s2, s2, -1
+L_1078304:
+// 0x01078304: 0x1078304: addiu s1, s1, 1
 	ldloc 7
-	ldc.i4.m1
+	ldc.i4.1
 	add
 	stloc 7
-// 0x01078730: 0x1078730: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01078734: 0x1078734: sll   s2, s2, 2
+// 0x01078308: 0x1078308: sll   s1, s1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01078738: 0x1078738: addiu v0, v0, -13972
+// 0x0107830c: 0x107830c: lw    v0, 16(sp)
 	ldloc 5
-	ldc.i4 -13972
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc 5
-// 0x0107873c: 0x107873c: addu  s2, s2, v0
+	ldelem.i4
+	stloc 6
+// 0x01078310: 0x1078310: addu  s1, s1, s3
 	ldloc 7
-	ldloc 5
+	ldloc 10
 	add
 	stloc 7
-// 0x01078740: 0x1078740: lw    a3, 0(s2)
-	ldloc 6
+// 0x01078314: 0x1078314: sw    v0, 0(s1)
+	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x01078744: 0x1078744: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x01078748: 0x1078748: addiu a2, a2, -13884
-	ldloc.3
-	ldc.i4 -13884
-	add
-	stloc.3
-// 0x0107874c: 0x107874c: addiu a3, a3, 6
-	ldloc 4
-	ldc.i4.6
-	add
-	stloc 4
-// 0x01078750: 0x1078750: addiu a0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+	ldloc 6
+	stelem.i4
+// 0x01078318: 0x1078318: addiu s0, s0, 4
+	ldloc 8
+	ldc.i4.4
 	add
-	stloc.1
-// 0x01078754: 0x1078754: jal   0x1000f9c addiu a1, zero, 3
-	ldc.i4.3
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0107875c: 0x107875c: j	 0x1078778 addu  a1, s1, zero
-	ldloc 9
-	stloc.2
-	br L_1078778
-// --- basic block ---
-L_1078764:
-// 0x01078764: 0x1078764: lw    v0, -16244(s4)
-	ldloc 6
-	ldloc 13
+// 0x0107831c: 0x107831c: addu  s1, s7, zero
+	ldloc 14
+	stloc 7
+L_1078320:
+// 0x01078320: 0x1078320: lw    v0, 2000(s3)
+	ldloc 5
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4061
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 5
-// 0x01078768: 0x1078768: sll   zero, zero, 0
-// 0x0107876c: 0x107876c: slt   v0, s2, v0
+	stloc 6
+// 0x01078324: 0x1078324: addiu s7, s1, 1
 	ldloc 7
-	ldloc 5
+	ldc.i4.1
+	add
+	stloc 14
+// 0x01078328: 0x1078328: slt   v0, s7, v0
+	ldloc 14
+	ldloc 6
 	clt
-	stloc 5
-// 0x01078770: 0x1078770: bne   v0, zero, 0x1078704 addu  a1, s1, zero
-	ldloc 5
-	ldloc 9
-	stloc.2
-	brtrue L_1078704
+	stloc 6
+// 0x0107832c: 0x107832c: bne   v0, zero, 0x10782b0 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_10782b0
 // --- basic block ---
-L_1078778:
-// 0x01078778: 0x1078778: addu  a2, s0, zero
-	ldloc 11
-	stloc.3
-// 0x0107877c: 0x107877c: jal   0x106c814 addiu a0, sp, 16
+// 0x01078334: 0x1078334: lw    ra, 60(sp)
+// 0x01078338: 0x1078338: lw    s8, 56(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Realtime_ReportMapProblem_106c814(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01078784: 0x1078784: jal   0x1094a94 addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
+	ldelem.i4
+	stloc 15
+// 0x0107833c: 0x107833c: lw    s7, 52(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0107878c: 0x107878c: lw    ra, 52(sp)
-// 0x01078790: 0x1078790: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x01078794: 0x1078794: lw    s5, 48(sp)
-	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldelem.i4
+	stloc 14
+// 0x01078340: 0x1078340: lw    s6, 48(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc 12
-// 0x01078798: 0x1078798: lw    s4, 44(sp)
-	ldloc 6
+	stloc 13
+// 0x01078344: 0x1078344: lw    s5, 44(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 11
 	add
 	ldelem.i4
-	stloc 13
-// 0x0107879c: 0x107879c: lw    s3, 40(sp)
-	ldloc 6
+	stloc 12
+// 0x01078348: 0x1078348: lw    s4, 40(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 10
-// 0x010787a0: 0x10787a0: lw    s2, 36(sp)
-	ldloc 6
+	stloc 11
+// 0x0107834c: 0x107834c: lw    s3, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 7
-// 0x010787a4: 0x10787a4: lw    s1, 32(sp)
-	ldloc 6
+	stloc 10
+// 0x01078350: 0x1078350: lw    s2, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -3240,158 +2670,165 @@ L_1078778:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010787a8: 0x10787a8: lw    s0, 28(sp)
-	ldloc 6
+// 0x01078354: 0x1078354: lw    s1, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 11
-// 0x010787ac: 0x10787ac: jr    ra addiu sp, sp, 56
+	stloc 7
+// 0x01078358: 0x1078358: lw    s0, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107835c: 0x107835c: jr    ra addiu sp, sp, 64
+	ldloc.0
+	ldc.i4.s 64
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 17
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 on_map_problem_close_10787b4(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_clear_group_counter_1078364()
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.maxstack 5
+.locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
+// local  0 is register v0
+// local  1 is register v1
+// local  3 is register ra
+// local  2 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc.0
 	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
+	stloc.1
 	ldc.i4.s 0
-	stloc 5
+	stloc.3
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010787b4: 0x10787b4: addiu sp, sp, -24
+// 0x01078364: 0x1078364: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc.1
+// 0x01078368: 0x1078368: cibyl_sysc_arg 0x3
+	ldloc.1
+// 0x0107836c: 0x107836c: cibyl_sysc 0x2125
+	call int32 [WazeWP7]Syscalls::time(int32)
+	stloc.0
+// 0x01078370: 0x1078370: addu  v1, v0, zero
 	ldloc.0
-	ldc.i4.s -24
-	add
+	stloc.1
+// 0x01078374: 0x1078374: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc.0
-// 0x010787b8: 0x10787b8: sw    ra, 20(sp)
-// 0x010787bc: 0x10787bc: jal   0x101eee8 sll   zero, zero, 0
+// 0x01078378: 0x1078378: sw    v1, -15784(v0)
+	ldloc 2
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3946
+	add
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl22::roadmap_trip_restore_focus_101eee8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x010787c4: 0x10787c4: lw    ra, 20(sp)
-// 0x010787c8: 0x10787c8: sll   zero, zero, 0
-// 0x010787cc: 0x10787cc: jr    ra addiu sp, sp, 24
+	stelem.i4
+// 0x0107837c: 0x107837c: addiu v1, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01078380: 0x1078380: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc.0
+// 0x01078384: 0x1078384: jr    ra sw    v1, 15824(v0)
+	ldloc 2
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 3956
 	add
-	stloc.0
+	ldloc.1
+	stelem.i4
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc.1
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc.0
 	ret
 }
-.method public static int32 RTAlerts_CloseProgressDlg_10787d4(int32,int32,int32,int32,int32)
+.method public static int32 RAlerts_get_group_state_107838c()
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.maxstack 5
+.locals init (int32 v0,int32 v1,int32[] mem,int32 ra)
 
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
+// local  0 is register v0
+// local  1 is register v1
+// local  3 is register ra
+// local  2 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc.0
 	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
+	stloc.1
 	ldc.i4.s 0
-	stloc 5
+	stloc.3
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010787d4: 0x10787d4: addiu sp, sp, -24
+// 0x0107838c: 0x107838c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc.0
+// 0x01078390: 0x1078390: lw    v1, -13560(v0)
+	ldloc 2
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3390
 	add
+	ldelem.i4
+	stloc.1
+// 0x01078394: 0x1078394: sll   zero, zero, 0
+// 0x01078398: 0x1078398: beq   v1, zero, 0x10783a8 addiu v0, zero, 1
+	ldloc.1
+	ldc.i4.1
 	stloc.0
-// 0x010787d8: 0x10787d8: sw    ra, 20(sp)
-// 0x010787dc: 0x10787dc: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	brfalse L_10783a8
 // --- basic block ---
-// 0x010787e4: 0x10787e4: lw    ra, 20(sp)
-// 0x010787e8: 0x10787e8: sll   zero, zero, 0
-// 0x010787ec: 0x10787ec: jr    ra addiu sp, sp, 24
+// 0x010783a0: 0x10783a0: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc.0
+// 0x010783a4: 0x10783a4: lw    v0, 15824(v0)
+	ldloc 2
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 3956
 	add
+	ldelem.i4
 	stloc.0
+L_10783a8:
+// 0x010783a8: 0x10783a8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc.1
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc.0
 	ret
 }
-.method public static int32 RTAlerts_ShowProgressDlg_10787f4(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_isAlertOnRoute_1078400(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -3400,8 +2837,8 @@ __CIBYL_function_return:
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  6 is register ra
-// local  8 is register mem
+// local  8 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -3418,165 +2855,161 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010787f4: 0x10787f4: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010787f8: 0x10787f8: addiu sp, sp, -24
+// 0x01078400: 0x1078400: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010787fc: 0x10787fc: sw    ra, 20(sp)
-// 0x01078800: 0x1078800: jal   0x101cd60 addiu a0, a0, -26788
-	ldloc.1
-	ldc.i4 -26788
-	add
-	stloc.1
+// 0x01078404: 0x1078404: sw    a0, 16(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stelem.i4
+// 0x01078408: 0x1078408: sw    ra, 28(sp)
+// 0x0107840c: 0x107840c: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x01078808: 0x1078808: jal   0x104c3d0 addu  a0, v0, zero
-	ldloc 5
+// 0x01078414: 0x1078414: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 7
+// 0x01078418: 0x1078418: lw    a0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
 	stloc.1
-	ldloc.1
-	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3d0(int32)
+// 0x0107841c: 0x107841c: beq   v0, v1, 0x1078468 lui   v0, 0x80000
+	ldloc 5
+	ldloc 7
+	ldc.i4 524288
 	stloc 5
+	beq  L_1078468
 // --- basic block ---
-// 0x01078810: 0x1078810: lw    ra, 20(sp)
-// 0x01078814: 0x1078814: sll   zero, zero, 0
-// 0x01078818: 0x1078818: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x01078424: 0x1078424: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+// 0x01078428: 0x1078428: addu  v1, v0, zero
 	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_Minimized_Alert_Dialog_1078820(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  8 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
 	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
+// 0x0107842c: 0x107842c: lw    a2, 2000(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.3
+// 0x01078430: 0x1078430: j	 0x107845c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
-__CIBYL_javamethod_begin:
+	br L_107845c
 // --- basic block ---
-L_1078820:
-// 0x01078820: 0x1078820: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01078824: 0x1078824: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01078828: 0x1078828: addiu a0, a0, -23936
-	ldloc.1
-	ldc.i4 -23936
-	add
-	stloc.1
-// 0x0107882c: 0x107882c: sw    ra, 20(sp)
-// 0x01078830: 0x1078830: jal   0x1095eec addu  a1, zero, zero
-	ldc.i4.s 0
+L_1078438:
+// 0x01078438: 0x1078438: lw    a1, 0(v1)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.2
-	ldloc.0
-	ldloc.1
+// 0x0107843c: 0x107843c: sll   zero, zero, 0
+// 0x01078440: 0x1078440: lw    a3, 0(a1)
+	ldloc 6
 	ldloc.2
-	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x01078444: 0x1078444: sll   zero, zero, 0
+// 0x01078448: 0x1078448: bne   a3, a0, 0x107845c addiu v1, v1, 4
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc.1
+	ldloc 7
+	ldc.i4.4
+	add
 	stloc 7
-	stloc 6
+	bne.un L_107845c
 // --- basic block ---
-// 0x01078838: 0x1078838: jal   0x109483c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
+// 0x01078450: 0x1078450: lw    v0, 1516(a1)
+	ldloc 6
 	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldc.i4 379
+	add
+	ldelem.i4
+	stloc 5
+// 0x01078454: 0x1078454: j	 0x107846c sll   zero, zero, 0
+	br L_107846c
+// --- basic block ---
+L_107845c:
+// 0x0107845c: 0x107845c: slt   a1, v0, a2
+	ldloc 5
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	clt
+	stloc.2
+// 0x01078460: 0x1078460: bne   a1, zero, 0x1078438 addiu v0, v0, 1
+	ldloc.2
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+	brtrue L_1078438
 // --- basic block ---
-// 0x01078840: 0x1078840: lw    ra, 20(sp)
-// 0x01078844: 0x1078844: sll   zero, zero, 0
-// 0x01078848: 0x1078848: jr    ra addiu sp, sp, 24
+L_1078468:
+// 0x01078468: 0x1078468: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_107846c:
+// 0x0107846c: 0x107846c: lw    ra, 28(sp)
+// 0x01078470: 0x1078470: sll   zero, zero, 0
+// 0x01078474: 0x1078474: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_distance_check_1078850(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_show_space_before_desc_107847c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
-// local  6 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3585,233 +3018,118 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1078850:
-// 0x01078850: 0x1078850: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x01078854: 0x1078854: sw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x01078858: 0x1078858: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x0107885c: 0x107885c: sw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 7
-	stelem.i4
-// 0x01078860: 0x1078860: addiu s0, s1, -16240
-	ldloc 8
-	ldc.i4 -16240
-	add
-	stloc 7
-// 0x01078864: 0x1078864: lw    v0, 4(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 6
-// 0x01078868: 0x1078868: sw    ra, 28(sp)
-// 0x0107886c: 0x107886c: sw    a0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc.1
-	stelem.i4
-// 0x01078870: 0x1078870: bne   v0, zero, 0x1078884 sw    a1, 36(sp)
-	ldloc 6
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc.2
-	stelem.i4
-	brtrue L_1078884
-// --- basic block ---
-// 0x01078878: 0x1078878: sw    a0, -16240(s1)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4060
-	add
-	ldloc.1
-	stelem.i4
-// 0x0107887c: 0x107887c: j	 0x10788b4 sw    a1, 4(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldloc.2
-	stelem.i4
-	br L_10788b4
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1078884:
-// 0x01078884: 0x1078884: addiu a0, sp, 32
+// 0x0107847c: 0x107847c: addiu sp, sp, -24
 	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01078480: 0x1078480: sw    ra, 20(sp)
+// 0x01078484: 0x1078484: lb    v0, 32(a1)
+	ldloc.2
 	ldc.i4.s 32
 	add
-	stloc.1
-// 0x01078888: 0x1078888: jal   0x1008eb0 addu  a1, s0, zero
-	ldloc 7
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01078488: 0x1078488: sll   zero, zero, 0
+// 0x0107848c: 0x107848c: bne   v0, zero, 0x10784ac lui   a1, 0x20000
+	ldloc 5
+	ldc.i4 131072
+	stloc.2
+	brtrue L_10784ac
+// --- basic block ---
+// 0x01078494: 0x1078494: jal   0x109b94c addiu a1, a1, -26604
+	ldloc.2
+	ldc.i4 -26604
+	add
 	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x01078890: 0x1078890: slti  v1, v0, 80
-	ldloc 6
-	ldc.i4.s 80
-	clt
-	stloc 9
-// 0x01078894: 0x1078894: bne   v1, zero, 0x10788b8 addu  v0, zero, zero
-	ldloc 9
-	ldc.i4.s 0
 	stloc 6
-	brtrue L_10788b8
+	stloc 5
 // --- basic block ---
-// 0x0107889c: 0x107889c: lw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 6
-// 0x010788a0: 0x10788a0: sll   zero, zero, 0
-// 0x010788a4: 0x10788a4: sw    v0, -16240(s1)
+// 0x0107849c: 0x107849c: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4060
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
+	stloc 5
+// --- basic block ---
+// 0x010784a4: 0x10784a4: j	 0x10784bc sll   zero, zero, 0
+	br L_10784bc
+// --- basic block ---
+L_10784ac:
+// 0x010784ac: 0x10784ac: jal   0x109b94c addiu a1, a1, -26604
+	ldloc.2
+	ldc.i4 -26604
 	add
-	ldloc 6
-	stelem.i4
-// 0x010788a8: 0x10788a8: lw    v0, 36(sp)
-	ldloc 5
+	stloc.2
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x010788ac: 0x10788ac: sll   zero, zero, 0
-// 0x010788b0: 0x10788b0: sw    v0, 4(s0)
+	stloc 5
+// --- basic block ---
+// 0x010784b4: 0x10784b4: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldloc 6
-	stelem.i4
-L_10788b4:
-// 0x010788b4: 0x10788b4: addiu v0, zero, 1
-	ldc.i4.1
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-L_10788b8:
-// 0x010788b8: 0x10788b8: lw    ra, 28(sp)
-// 0x010788bc: 0x10788bc: lw    s1, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x010788c0: 0x10788c0: lw    s0, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 7
-// 0x010788c4: 0x10788c4: jr    ra addiu sp, sp, 32
+	stloc 5
+// --- basic block ---
+L_10784bc:
+// 0x010784bc: 0x10784bc: lw    ra, 20(sp)
+// 0x010784c0: 0x10784c0: sll   zero, zero, 0
+// 0x010784c4: 0x10784c4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_get_title_10784cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem,int32 t0)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local 12 is register s4
-// local 13 is register s5
-// local 14 is register s6
-// local 15 is register s7
+// local  9 is register t0
 // local  0 is register sp
-// local 16 is register s8
-// local 17 is register ra
-// local  5 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3821,637 +3139,798 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 17
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010788cc: 0x10788cc: addiu sp, sp, -120
+// 0x010784cc: 0x10784cc: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -120
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010788d0: 0x10788d0: sw    s0, 80(sp)
-	ldloc 5
-	ldloc.0
+// 0x010784d0: 0x10784d0: addiu v0, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
+	stloc 5
+// 0x010784d4: 0x10784d4: bne   a1, v0, 0x10784e8 sw    ra, 20(sp)
+	ldloc.2
+	ldloc 5
+	bne.un L_10784e8
+// --- basic block ---
+// 0x010784dc: 0x10784dc: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x010784e0: 0x10784e0: j	 0x10785e4 addiu a0, a0, -19640
+	ldloc.1
+	ldc.i4 -19640
 	add
-	ldloc 8
-	stelem.i4
-// 0x010788d4: 0x10788d4: addiu v1, zero, 1
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_10784e8:
+// 0x010784e8: 0x10784e8: addiu a3, zero, 1
 	ldc.i4.1
-	stloc 7
-// 0x010788d8: 0x10788d8: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x010788dc: 0x10788dc: lui   v0, 0x0
-	ldc.i4.s 0
+	stloc 4
+// 0x010784ec: 0x10784ec: bne   a1, a3, 0x1078500 addiu v1, zero, 3
+	ldloc.2
+	ldloc 4
+	ldc.i4.3
 	stloc 6
-// 0x010788e0: 0x10788e0: sw    s8, 112(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 28
-	add
-	ldloc 16
-	stelem.i4
-// 0x010788e4: 0x10788e4: sw    s7, 108(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
-	add
-	ldloc 15
-	stelem.i4
-// 0x010788e8: 0x10788e8: sw    s6, 104(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 26
-	add
-	ldloc 14
-	stelem.i4
-// 0x010788ec: 0x10788ec: sw    s5, 100(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 25
-	add
-	ldloc 13
-	stelem.i4
-// 0x010788f0: 0x10788f0: sw    s4, 96(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 24
-	add
-	ldloc 12
-	stelem.i4
-// 0x010788f4: 0x10788f4: sw    s3, 92(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
-	add
-	ldloc 11
-	stelem.i4
-// 0x010788f8: 0x10788f8: sw    s2, 88(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
+	bne.un L_1078500
+// --- basic block ---
+// 0x010784f4: 0x10784f4: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x010784f8: 0x10784f8: j	 0x10785e4 addiu a0, a0, -26580
+	ldloc.1
+	ldc.i4 -26580
 	add
-	ldloc 10
-	stelem.i4
-// 0x010788fc: 0x10788fc: sw    s1, 84(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_1078500:
+// 0x01078500: 0x1078500: bne   a1, v1, 0x1078514 addiu t0, zero, 4
+	ldloc.2
+	ldloc 6
+	ldc.i4.4
+	stloc 9
+	bne.un L_1078514
+// --- basic block ---
+// 0x01078508: 0x1078508: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107850c: 0x107850c: j	 0x10785e4 addiu a0, a0, -19588
+	ldloc.1
+	ldc.i4 -19588
 	add
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_1078514:
+// 0x01078514: 0x1078514: bne   a1, t0, 0x107856c sll   zero, zero, 0
+	ldloc.2
 	ldloc 9
-	stelem.i4
-// 0x01078900: 0x1078900: sw    ra, 116(sp)
-// 0x01078904: 0x1078904: addiu s0, s0, -16028
-	ldloc 8
-	ldc.i4 -16028
-	add
-	stloc 8
-// 0x01078908: 0x1078908: sw    v1, 15940(v0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 3985
+	bne.un L_107856c
+// --- basic block ---
+// 0x0107851c: 0x107851c: bne   a2, zero, 0x107852c lui   a0, 0x20000
+	ldloc.3
+	ldc.i4 131072
+	stloc.1
+	brtrue L_107852c
+// --- basic block ---
+// 0x01078524: 0x1078524: j	 0x10785e4 addiu a0, a0, -26568
+	ldloc.1
+	ldc.i4 -26568
 	add
-	ldloc 7
-	stelem.i4
-// 0x0107890c: 0x107890c: addu  s4, a0, zero
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_107852c:
+// 0x0107852c: 0x107852c: bne   a2, a3, 0x107853c lui   a0, 0x20000
+	ldloc.3
+	ldloc 4
+	ldc.i4 131072
+	stloc.1
+	bne.un L_107853c
+// --- basic block ---
+// 0x01078534: 0x1078534: j	 0x10785e4 addiu a0, a0, -26552
 	ldloc.1
-	stloc 12
-// 0x01078910: 0x1078910: addu  s3, zero, zero
-	ldc.i4.s 0
-	stloc 11
-// 0x01078914: 0x1078914: addiu s8, sp, 36
-	ldloc.0
-	ldc.i4.s 36
+	ldc.i4 -26552
 	add
-	stloc 16
-// 0x01078918: 0x1078918: addiu s7, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_107853c:
+// 0x0107853c: 0x107853c: bne   a2, v0, 0x107854c lui   a0, 0x20000
+	ldloc.3
+	ldloc 5
+	ldc.i4 131072
+	stloc.1
+	bne.un L_107854c
+// --- basic block ---
+// 0x01078544: 0x1078544: j	 0x10785e4 addiu a0, a0, -26532
+	ldloc.1
+	ldc.i4 -26532
 	add
-	stloc 15
-// 0x0107891c: 0x107891c: addiu s6, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_107854c:
+// 0x0107854c: 0x107854c: bne   a2, v1, 0x1078560 sll   zero, zero, 0
+	ldloc.3
+	ldloc 6
+	bne.un L_1078560
+// --- basic block ---
+// 0x01078554: 0x1078554: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01078558: 0x1078558: j	 0x10785e4 addiu a0, a0, -26516
+	ldloc.1
+	ldc.i4 -26516
 	add
-	stloc 14
-// 0x01078920: 0x1078920: addiu s5, zero, -1
-	ldc.i4.m1
-	stloc 13
-// 0x01078924: 0x1078924: addiu s2, sp, 28
-	ldloc.0
-	ldc.i4.s 28
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_1078560:
+// 0x01078560: 0x1078560: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01078564: 0x1078564: j	 0x10785e4 addiu a0, a0, 10144
+	ldloc.1
+	ldc.i4 10144
 	add
-	stloc 10
-// 0x01078928: 0x1078928: j	 0x10789f4 addiu s1, sp, 20
-	ldloc.0
-	ldc.i4.s 20
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_107856c:
+// 0x0107856c: 0x107856c: addiu v0, zero, 5
+	ldc.i4.5
+	stloc 5
+// 0x01078570: 0x1078570: bne   a1, v0, 0x1078584 addiu v0, zero, 6
+	ldloc.2
+	ldloc 5
+	ldc.i4.6
+	stloc 5
+	bne.un L_1078584
+// --- basic block ---
+// 0x01078578: 0x1078578: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107857c: 0x107857c: j	 0x10785e4 addiu a0, a0, -19536
+	ldloc.1
+	ldc.i4 -19536
 	add
-	stloc 9
-	br L_10789f4
+	stloc.1
+	br L_10785e4
 // --- basic block ---
-L_1078930:
-// 0x01078930: 0x1078930: lw    v0, 0(s0)
+L_1078584:
+// 0x01078584: 0x1078584: bne   a1, v0, 0x1078598 addiu v0, zero, 7
+	ldloc.2
 	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 6
-// 0x01078934: 0x1078934: sll   zero, zero, 0
-// 0x01078938: 0x1078938: lw    v1, 16(v0)
+	ldc.i4.7
+	stloc 5
+	bne.un L_1078598
+// --- basic block ---
+// 0x0107858c: 0x107858c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01078590: 0x1078590: j	 0x10785e4 addiu a0, a0, -19488
+	ldloc.1
+	ldc.i4 -19488
+	add
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_1078598:
+// 0x01078598: 0x1078598: bne   a1, v0, 0x10785ac addiu v0, zero, 8
+	ldloc.2
 	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.8
+	stloc 5
+	bne.un L_10785ac
+// --- basic block ---
+// 0x010785a0: 0x10785a0: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x010785a4: 0x10785a4: j	 0x10785e4 addiu a0, a0, -19444
+	ldloc.1
+	ldc.i4 -19444
 	add
-	ldelem.i4
-	stloc 7
-// 0x0107893c: 0x107893c: sll   zero, zero, 0
-// 0x01078940: 0x1078940: sw    v1, 20(sp)
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_10785ac:
+// 0x010785ac: 0x10785ac: bne   a1, v0, 0x10785c0 addiu v0, zero, 9
+	ldloc.2
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldc.i4.s 9
+	stloc 5
+	bne.un L_10785c0
+// --- basic block ---
+// 0x010785b4: 0x10785b4: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x010785b8: 0x10785b8: j	 0x10785e4 addiu a0, a0, -26496
+	ldloc.1
+	ldc.i4 -26496
 	add
-	ldloc 7
-	stelem.i4
-// 0x01078944: 0x1078944: lw    v0, 20(v0)
+	stloc.1
+	br L_10785e4
+// --- basic block ---
+L_10785c0:
+// 0x010785c0: 0x10785c0: bne   a1, v0, 0x10785dc sll   zero, zero, 0
+	ldloc.2
 	ldloc 5
-	ldloc 6
+	bne.un L_10785dc
+// --- basic block ---
+// 0x010785c8: 0x10785c8: beq   a0, zero, 0x10785dc sll   zero, zero, 0
+	ldloc.1
+	brfalse L_10785dc
+// --- basic block ---
+// 0x010785d0: 0x10785d0: lw    a0, 1512(a0)
+	ldloc 8
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 378
 	add
 	ldelem.i4
-	stloc 6
-// 0x01078948: 0x1078948: jal   0x1029da8 sw    v0, 24(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	stloc.1
+// 0x010785d4: 0x10785d4: j	 0x10785e4 sll   zero, zero, 0
+	br L_10785e4
+// --- basic block ---
+L_10785dc:
+// 0x010785dc: 0x10785dc: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x010785e0: 0x10785e0: addiu a0, a0, -19132
+	ldloc.1
+	ldc.i4 -19132
 	add
-	ldloc 6
-	stelem.i4
+	stloc.1
+L_10785e4:
+// 0x010785e4: 0x10785e4: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01078950: 0x1078950: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x01078954: 0x1078954: beq   v0, s5, 0x1078974 addu  a1, s1, zero
+// 0x010785ec: 0x10785ec: lw    ra, 20(sp)
+// 0x010785f0: 0x10785f0: sll   zero, zero, 0
+// 0x010785f4: 0x10785f4: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 6
-	ldloc 13
-	ldloc 9
-	stloc.2
-	beq  L_1078974
-// --- basic block ---
-// 0x0107895c: 0x107895c: lw    v0, 40(sp)
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_get_reported_by_string_10785fc(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 ra,int32 v1)
+
+// local  6 is register v0
+// local 11 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  9 is register s2
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 11
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x010785fc: 0x10785fc: addiu sp, sp, -48
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	ldc.i4.s -48
 	add
-	ldelem.i4
-	stloc 6
-// 0x01078960: 0x1078960: sll   zero, zero, 0
-// 0x01078964: 0x1078964: sw    v0, 32(sp)
+	stloc.0
+// 0x01078600: 0x1078600: sw    s2, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 10
 	add
-	ldloc 6
+	ldloc 9
 	stelem.i4
-// 0x01078968: 0x1078968: lw    v0, 36(sp)
+// 0x01078604: 0x1078604: sw    ra, 44(sp)
+// 0x01078608: 0x1078608: sw    s1, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 9
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107896c: 0x107896c: j	 0x10789d8 sw    v0, 28(sp)
+	ldloc 8
+	stelem.i4
+// 0x0107860c: 0x107860c: sw    s0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.8
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-	br L_10789d8
-// --- basic block ---
-L_1078974:
-// 0x01078974: 0x1078974: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01078978: 0x1078978: jal   0x101df50 addiu a0, a0, 6792
+// 0x01078610: 0x1078610: lb    v0, 32(a0)
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4.s 32
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// --- basic block ---
-// 0x01078980: 0x1078980: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x01078984: 0x1078984: beq   v0, zero, 0x10789b0 addu  a1, s1, zero
-	ldloc 6
-	ldloc 9
-	stloc.2
-	brfalse L_10789b0
-// --- basic block ---
-// 0x0107898c: 0x107898c: lui   a2, 0x2120000
-	ldc.i4 34734080
-	stloc.3
-// 0x01078990: 0x1078990: lw    v1, 0(v0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x01078994: 0x1078994: ori   a2, a2, 60730
-	ldloc.3
-	ldc.i4 60730
-	or
-	stloc.3
-// 0x01078998: 0x1078998: bne   v1, a2, 0x10789cc lui   a2, 0x1e90000
-	ldloc 7
-	ldloc.3
-	ldc.i4 32047104
-	stloc.3
-	bne.un L_10789cc
-// --- basic block ---
-// 0x010789a0: 0x10789a0: lw    v1, 4(v0)
-	ldloc 5
+// 0x01078614: 0x1078614: sll   zero, zero, 0
+// 0x01078618: 0x1078618: beq   v0, zero, 0x1078650 addu  s2, a1, zero
 	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	ldloc.2
+	stloc 9
+	brfalse L_1078650
+// --- basic block ---
+// 0x01078620: 0x1078620: addiu s0, a0, 32
+	ldloc.1
+	ldc.i4.s 32
 	add
-	ldelem.i4
 	stloc 7
-// 0x010789a4: 0x10789a4: ori   a2, a2, 58906
-	ldloc.3
-	ldc.i4 58906
-	or
-	stloc.3
-// 0x010789a8: 0x10789a8: bne   v1, a2, 0x10789c8 sll   zero, zero, 0
-	ldloc 7
-	ldloc.3
-	bne.un L_10789c8
-// --- basic block ---
-L_10789b0:
-// 0x010789b0: 0x10789b0: lui   a0, 0x10000
+// 0x01078624: 0x1078624: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010789b4: 0x10789b4: jal   0x101df50 addiu a0, a0, -31052
+// 0x01078628: 0x1078628: addiu a0, a0, -13688
 	ldloc.1
-	ldc.i4 -31052
+	ldc.i4 -13688
 	add
 	stloc.1
+// 0x0107862c: 0x107862c: sw    a2, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc.3
+	stelem.i4
+// 0x01078630: 0x1078630: jal   0x101cd70 lui   s1, 0x20000
+	ldc.i4 131072
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010789bc: 0x10789bc: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x010789c0: 0x10789c0: beq   v0, zero, 0x10789ec addu  a1, s1, zero
-	ldloc 6
-	ldloc 9
-	stloc.2
-	brfalse L_10789ec
-// --- basic block ---
-L_10789c8:
-// 0x010789c8: 0x10789c8: lw    v1, 0(v0)
+// 0x01078638: 0x1078638: lw    a1, 24(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.6
+	add
 	ldelem.i4
-	stloc 7
-L_10789cc:
-// 0x010789cc: 0x10789cc: lw    v0, 4(v0)
-	ldloc 5
+	stloc.2
+// 0x0107863c: 0x107863c: addu  a3, v0, zero
 	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc 4
+// 0x01078640: 0x1078640: addu  a0, s2, zero
+	ldloc 9
+	stloc.1
+// 0x01078644: 0x1078644: addiu a2, s1, -26488
+	ldloc 8
+	ldc.i4 -26488
 	add
-	ldelem.i4
-	stloc 6
-// 0x010789d0: 0x10789d0: sw    v1, 28(sp)
+	stloc.3
+// 0x01078648: 0x1078648: jal   0x1000f9c sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.4
 	add
 	ldloc 7
 	stelem.i4
-// 0x010789d4: 0x10789d4: sw    v0, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 6
-	stelem.i4
-L_10789d8:
-// 0x010789d8: 0x10789d8: jal   0x1008eb0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 11
 	stloc 6
 // --- basic block ---
-// 0x010789e0: 0x10789e0: lw    v1, 0(s0)
+L_1078650:
+// 0x01078650: 0x1078650: lw    ra, 44(sp)
+// 0x01078654: 0x1078654: lw    s2, 40(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 10
+	add
 	ldelem.i4
-	stloc 7
-// 0x010789e4: 0x10789e4: sll   zero, zero, 0
-// 0x010789e8: 0x10789e8: sw    v0, 1264(v1)
+	stloc 9
+// 0x01078658: 0x1078658: lw    s1, 36(sp)
 	ldloc 5
-	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 316
+	ldc.i4.s 9
 	add
-	ldloc 6
-	stelem.i4
-L_10789ec:
-// 0x010789ec: 0x10789ec: addiu s3, s3, 1
-	ldloc 11
-	ldc.i4.1
+	ldelem.i4
+	stloc 8
+// 0x0107865c: 0x107865c: lw    s0, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc 11
-// 0x010789f0: 0x10789f0: addiu s0, s0, 4
-	ldloc 8
-	ldc.i4.4
+	ldelem.i4
+	stloc 7
+// 0x01078660: 0x1078660: jr    ra addiu sp, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 11
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTAlerts_GroupCount_Str_1078668(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
 	stloc 8
-L_10789f4:
-// 0x010789f4: 0x10789f4: lui   v1, 0x80000
-	ldc.i4 524288
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 7
-// 0x010789f8: 0x10789f8: addiu v1, v1, -16028
-	ldloc 7
-	ldc.i4 -16028
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1078668:
+// 0x01078668: 0x1078668: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107866c: 0x107866c: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
 	add
-	stloc 7
-// 0x010789fc: 0x10789fc: lw    v0, 2000(v1)
+	stloc 5
+// 0x01078670: 0x1078670: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01078674: 0x1078674: lw    v1, 2008(v0)
+	ldloc 6
 	ldloc 5
-	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 502
 	add
 	ldelem.i4
-	stloc 6
-// 0x01078a00: 0x1078a00: addu  a1, s7, zero
-	ldloc 15
-	stloc.2
-// 0x01078a04: 0x1078a04: slt   v0, s3, v0
-	ldloc 11
+	stloc 8
+// 0x01078678: 0x1078678: lw    a3, 2004(v0)
 	ldloc 6
-	clt
-	stloc 6
-// 0x01078a08: 0x1078a08: addu  a2, s6, zero
-	ldloc 14
-	stloc.3
-// 0x01078a0c: 0x1078a0c: bne   v0, zero, 0x1078930 addu  a0, s8, zero
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 501
+	add
+	ldelem.i4
+	stloc 4
+// 0x0107867c: 0x107867c: sw    s0, 16(sp)
 	ldloc 6
-	ldloc 16
-	stloc.1
-	brtrue L_1078930
-// --- basic block ---
-// 0x01078a14: 0x1078a14: bne   s4, zero, 0x1078a24 lui   a0, 0x1070000
-	ldloc 12
-	ldc.i4 17235968
-	stloc.1
-	brtrue L_1078a24
-// --- basic block ---
-// 0x01078a1c: 0x1078a1c: j	 0x1078a2c addiu a0, a0, 31412
-	ldloc.1
-	ldc.i4 31412
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.1
-	br L_1078a2c
-// --- basic block ---
-L_1078a24:
-// 0x01078a24: 0x1078a24: lui   a0, 0x1070000
-	ldc.i4 17235968
-	stloc.1
-// 0x01078a28: 0x1078a28: addiu a0, a0, 31456
-	ldloc.1
-	ldc.i4 31456
+	ldloc 7
+	stelem.i4
+// 0x01078680: 0x1078680: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x01078684: 0x1078684: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x01078688: 0x1078688: addiu a0, s0, -15612
+	ldloc 7
+	ldc.i4 -15612
 	add
 	stloc.1
-L_1078a2c:
-// 0x01078a2c: 0x1078a2c: jal   0x1077c40 sll   zero, zero, 0
+// 0x0107868c: 0x107868c: subu  a3, a3, v1
+	ldloc 4
+	ldloc 8
+	sub
+	stloc 4
+// 0x01078690: 0x1078690: addiu a2, a2, 19088
+	ldloc.3
+	ldc.i4 19088
+	add
+	stloc.3
+// 0x01078694: 0x1078694: sw    ra, 20(sp)
+// 0x01078698: 0x1078698: jal   0x1000f9c addiu a1, zero, 20
+	ldc.i4.s 20
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::j2me_sort_alerts_1077c40(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x010786a0: 0x10786a0: lw    ra, 20(sp)
+// 0x010786a4: 0x10786a4: addiu v0, s0, -15612
+	ldloc 7
+	ldc.i4 -15612
+	add
+	stloc 5
+// 0x010786a8: 0x10786a8: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x010786ac: 0x10786ac: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Count_Str_10786b4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078a34: 0x1078a34: lw    ra, 116(sp)
-// 0x01078a38: 0x1078a38: lw    s8, 112(sp)
+L_10786b4:
+// 0x010786b4: 0x10786b4: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010786b8: 0x10786b8: addiu v0, v0, -15564
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 28
+	ldc.i4 -15564
 	add
-	ldelem.i4
-	stloc 16
-// 0x01078a3c: 0x1078a3c: lw    s7, 108(sp)
-	ldloc 5
+	stloc 5
+// 0x010786bc: 0x10786bc: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 27
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 15
-// 0x01078a40: 0x1078a40: lw    s6, 104(sp)
+	stloc.0
+// 0x010786c0: 0x10786c0: lw    v1, 2008(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 26
+	ldc.i4 502
 	add
 	ldelem.i4
-	stloc 14
-// 0x01078a44: 0x1078a44: lw    s5, 100(sp)
+	stloc 8
+// 0x010786c4: 0x10786c4: lw    a3, 2000(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 25
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 13
-// 0x01078a48: 0x1078a48: lw    s4, 96(sp)
-	ldloc 5
+	stloc 4
+// 0x010786c8: 0x10786c8: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 24
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 12
-// 0x01078a4c: 0x1078a4c: lw    s3, 92(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 23
+	ldloc 7
+	stelem.i4
+// 0x010786cc: 0x10786cc: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x010786d0: 0x10786d0: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x010786d4: 0x10786d4: addiu a0, s0, -15592
+	ldloc 7
+	ldc.i4 -15592
 	add
-	ldelem.i4
-	stloc 11
-// 0x01078a50: 0x1078a50: lw    s2, 88(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
+	stloc.1
+// 0x010786d8: 0x10786d8: subu  a3, a3, v1
+	ldloc 4
+	ldloc 8
+	sub
+	stloc 4
+// 0x010786dc: 0x10786dc: addiu a2, a2, 19088
+	ldloc.3
+	ldc.i4 19088
 	add
-	ldelem.i4
-	stloc 10
-// 0x01078a54: 0x1078a54: lw    s1, 84(sp)
-	ldloc 5
+	stloc.3
+// 0x010786e0: 0x10786e0: sw    ra, 20(sp)
+// 0x010786e4: 0x10786e4: jal   0x1000f9c addiu a1, zero, 20
+	ldc.i4.s 20
+	stloc.2
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x010786ec: 0x10786ec: lw    ra, 20(sp)
+// 0x010786f0: 0x10786f0: addiu v0, s0, -15592
+	ldloc 7
+	ldc.i4 -15592
 	add
-	ldelem.i4
-	stloc 9
-// 0x01078a58: 0x1078a58: lw    s0, 80(sp)
-	ldloc 5
+	stloc 5
+// 0x010786f4: 0x10786f4: lw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 20
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 8
-// 0x01078a5c: 0x1078a5c: jr    ra addiu sp, sp, 120
+	stloc 7
+// 0x010786f8: 0x10786f8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 120
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_CurrentAlert_Has_Comments_1078a64(int32,int32,int32,int32,int32)
+.method public static int32 checkbox_callback_1078700(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s2,int32 s1,int32 s4,int32 s5,int32 v1,int32 s3,int32 s6,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local 12 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  7 is register s0
+// local  9 is register s1
+// local  8 is register s2
+// local 13 is register s3
+// local 10 is register s4
+// local 11 is register s5
+// local 14 is register s6
 // local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
+// local 15 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 12
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4460,158 +3939,331 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 15
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078a64: 0x1078a64: lui   v0, 0x80000
+// 0x01078700: 0x1078700: addiu sp, sp, -48
+	ldloc.0
+	ldc.i4.s -48
+	add
+	stloc.0
+// 0x01078704: 0x1078704: sw    s5, 36(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 11
+	stelem.i4
+// 0x01078708: 0x1078708: sw    s4, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 10
+	stelem.i4
+// 0x0107870c: 0x107870c: sw    s2, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x01078710: 0x1078710: lui   s5, 0x0
+	ldc.i4.s 0
+	stloc 11
+// 0x01078714: 0x1078714: lui   s2, 0x80000
 	ldc.i4 524288
-	stloc 5
-// 0x01078a68: 0x1078a68: addiu v0, v0, -16028
+	stloc 8
+// 0x01078718: 0x1078718: lui   s4, 0x20000
+	ldc.i4 131072
+	stloc 10
+// 0x0107871c: 0x107871c: sw    s6, 40(sp)
 	ldloc 5
-	ldc.i4 -16028
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
-	stloc 5
-// 0x01078a6c: 0x1078a6c: lui   v1, 0x80000
+	ldloc 14
+	stelem.i4
+// 0x01078720: 0x1078720: sw    s3, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 13
+	stelem.i4
+// 0x01078724: 0x1078724: sw    s1, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 9
+	stelem.i4
+// 0x01078728: 0x1078728: sw    ra, 44(sp)
+// 0x0107872c: 0x107872c: sw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x01078730: 0x1078730: addu  s6, a0, zero
+	ldloc.1
+	stloc 14
+// 0x01078734: 0x1078734: addiu s2, s2, -13448
+	ldloc 8
+	ldc.i4 -13448
+	add
+	stloc 8
+// 0x01078738: 0x1078738: addiu s5, s5, 20820
+	ldloc 11
+	ldc.i4 20820
+	add
+	stloc 11
+// 0x0107873c: 0x107873c: addiu s4, s4, 9928
+	ldloc 10
+	ldc.i4 9928
+	add
+	stloc 10
+// 0x01078740: 0x1078740: addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 9
+// 0x01078744: 0x1078744: j	 0x1078798 lui   s3, 0x80000
 	ldc.i4 524288
+	stloc 13
+	br L_1078798
+// --- basic block ---
+L_107874c:
+// 0x0107874c: 0x107874c: lw    s0, 0(s2)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x01078750: 0x1078750: sll   zero, zero, 0
+// 0x01078754: 0x1078754: beq   s0, zero, 0x1078790 sll   zero, zero, 0
+	ldloc 7
+	brfalse L_1078790
+// --- basic block ---
+// 0x0107875c: 0x107875c: lw    v0, 4(s6)
+	ldloc 5
+	ldloc 14
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
 	stloc 6
-// 0x01078a70: 0x1078a70: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x01078760: 0x1078760: lw    a1, 16(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-// 0x01078a74: 0x1078a74: lw    a2, -14004(v1)
+	ldelem.i4
+	stloc.2
+// 0x01078764: 0x1078764: lw    a0, 16(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc.1
+// 0x01078768: 0x1078768: jal   0x1001b14 sll   zero, zero, 0
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 6
+// --- basic block ---
+// 0x01078770: 0x1078770: addu  a0, s0, zero
+	ldloc 7
+	stloc.1
+// 0x01078774: 0x1078774: lw    v1, 180(s0)
+	ldloc 5
 	ldloc 7
-	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4.s 45
 	add
 	ldelem.i4
-	stloc.3
-// 0x01078a78: 0x1078a78: lw    a1, 2000(v0)
+	stloc 12
+// 0x01078778: 0x1078778: bne   v0, zero, 0x1078788 addu  a1, s4, zero
+	ldloc 6
+	ldloc 10
+	stloc.2
+	brtrue L_1078788
+// --- basic block ---
+// 0x01078780: 0x1078780: addu  a0, s0, zero
 	ldloc 7
+	stloc.1
+// 0x01078784: 0x1078784: addu  a1, s5, zero
+	ldloc 11
+	stloc.2
+L_1078788:
+// 0x01078788: 0x1078788: jalr  v1 sll   zero, zero, 0
+	ldloc 12
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 12
+	stloc 6
+// --- basic block ---
+L_1078790:
+// 0x01078790: 0x1078790: addiu s1, s1, 1
+	ldloc 9
+	ldc.i4.1
+	add
+	stloc 9
+// 0x01078794: 0x1078794: addiu s2, s2, 4
+	ldloc 8
+	ldc.i4.4
+	add
+	stloc 8
+L_1078798:
+// 0x01078798: 0x1078798: lw    v0, -15780(s3)
 	ldloc 5
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 -3945
 	add
 	ldelem.i4
-	stloc.2
-// 0x01078a7c: 0x1078a7c: addu  v1, v0, zero
-	ldloc 5
 	stloc 6
-// 0x01078a80: 0x1078a80: sw    ra, 20(sp)
-// 0x01078a84: 0x1078a84: j	 0x1078abc addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1078abc
-// --- basic block ---
-L_1078a8c:
-// 0x01078a8c: 0x1078a8c: lw    a0, 0(v1)
-	ldloc 7
+// 0x0107879c: 0x107879c: sll   zero, zero, 0
+// 0x010787a0: 0x10787a0: slt   v0, s1, v0
+	ldloc 9
 	ldloc 6
+	clt
+	stloc 6
+// 0x010787a4: 0x10787a4: bne   v0, zero, 0x107874c addiu v0, zero, 1
+	ldloc 6
+	ldc.i4.1
+	stloc 6
+	brtrue L_107874c
+// --- basic block ---
+// 0x010787ac: 0x10787ac: lw    ra, 44(sp)
+// 0x010787b0: 0x10787b0: lw    s6, 40(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 10
+	add
 	ldelem.i4
-	stloc.1
-// 0x01078a90: 0x1078a90: addiu v0, v0, 1
+	stloc 14
+// 0x010787b4: 0x10787b4: lw    s5, 36(sp)
 	ldloc 5
-	ldc.i4.1
-	add
-	stloc 5
-// 0x01078a94: 0x1078a94: lw    a3, 0(a0)
-	ldloc 7
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x01078a98: 0x1078a98: sll   zero, zero, 0
-// 0x01078a9c: 0x1078a9c: bne   a3, a2, 0x1078abc addiu v1, v1, 4
-	ldloc 4
-	ldloc.3
-	ldloc 6
-	ldc.i4.4
+	ldc.i4.s 9
 	add
-	stloc 6
-	bne.un L_1078abc
-// --- basic block ---
-// 0x01078aa4: 0x1078aa4: lw    v0, 1276(a0)
-	ldloc 7
-	ldloc.1
+	ldelem.i4
+	stloc 11
+// 0x010787b8: 0x10787b8: lw    s4, 32(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 5
-// 0x01078aa8: 0x1078aa8: sll   zero, zero, 0
-// 0x01078aac: 0x1078aac: bne   v0, zero, 0x1078ad0 sll   zero, zero, 0
+	stloc 10
+// 0x010787bc: 0x10787bc: lw    s3, 28(sp)
 	ldloc 5
-	brtrue L_1078ad0
-// --- basic block ---
-// 0x01078ab4: 0x1078ab4: j	 0x1078ae0 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1078ae0
-// --- basic block ---
-L_1078abc:
-// 0x01078abc: 0x1078abc: slt   a0, v0, a1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 13
+// 0x010787c0: 0x10787c0: lw    s2, 24(sp)
 	ldloc 5
-	ldloc.2
-	clt
-	stloc.1
-// 0x01078ac0: 0x1078ac0: bne   a0, zero, 0x1078a8c sll   zero, zero, 0
-	ldloc.1
-	brtrue L_1078a8c
-// --- basic block ---
-// 0x01078ac8: 0x1078ac8: j	 0x1078ae0 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1078ae0
-// --- basic block ---
-L_1078ad0:
-// 0x01078ad0: 0x1078ad0: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
-	stloc 5
-// --- basic block ---
-// 0x01078ad8: 0x1078ad8: sltu  v0, zero, v0
-	ldc.i4.s 0
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x010787c4: 0x10787c4: lw    s1, 20(sp)
 	ldloc 5
-	clt.un
-	stloc 5
-// 0x01078adc: 0x1078adc: addiu v0, v0, 1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 9
+// 0x010787c8: 0x10787c8: lw    s0, 16(sp)
 	ldloc 5
-	ldc.i4.1
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc 5
-L_1078ae0:
-// 0x01078ae0: 0x1078ae0: lw    ra, 20(sp)
-// 0x01078ae4: 0x1078ae4: sll   zero, zero, 0
-// 0x01078ae8: 0x1078ae8: jr    ra addiu sp, sp, 24
+	ldelem.i4
+	stloc 7
+// 0x010787cc: 0x10787cc: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 12
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTAlerts_is_reply_popup_on_1078af0(int32,int32,int32,int32,int32)
+.method public static int32 RtAlerts_get_addional_text_icon_1078814(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32 ra,int32[] mem)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  5 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
@@ -4620,10 +4272,10 @@ __CIBYL_function_return:
 // local  7 is register ra
 // local  8 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 5
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4640,67 +4292,62 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078af0: 0x1078af0: addiu sp, sp, -24
+// 0x01078814: 0x1078814: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01078818: 0x1078818: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01078af4: 0x1078af4: sw    ra, 20(sp)
-// 0x01078af8: 0x1078af8: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
-	stloc 5
-// --- basic block ---
-// 0x01078b00: 0x1078b00: beq   v0, zero, 0x1078b24 addu  v1, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 6
-	brfalse L_1078b24
-// --- basic block ---
-// 0x01078b08: 0x1078b08: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078b10: 0x1078b10: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01078b14: 0x1078b14: addu  a0, v0, zero
-	ldloc 5
+// 0x0107881c: 0x107881c: addiu a0, a0, 1304
+	ldloc.1
+	ldc.i4 1304
+	add
 	stloc.1
-// 0x01078b18: 0x1078b18: jal   0x1001b14 addiu a1, a1, -26764
+// 0x01078820: 0x1078820: sw    ra, 20(sp)
+// 0x01078824: 0x1078824: jal   0x1001b14 addiu a1, a1, -26476
 	ldloc.2
-	ldc.i4 -26764
+	ldc.i4 -26476
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 6
+// --- basic block ---
+// 0x0107882c: 0x107882c: bne   v0, zero, 0x107883c addu  v1, zero, zero
+	ldloc 6
+	ldc.i4.s 0
 	stloc 5
+	brtrue L_107883c
 // --- basic block ---
-// 0x01078b20: 0x1078b20: sltiu v1, v0, 1
+// 0x01078834: 0x1078834: lui   v1, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01078838: 0x1078838: addiu v1, v1, -26416
 	ldloc 5
-	ldc.i4.1
-	clt.un
-	stloc 6
-L_1078b24:
-// 0x01078b24: 0x1078b24: lw    ra, 20(sp)
-// 0x01078b28: 0x1078b28: addu  v0, v1, zero
-	ldloc 6
+	ldc.i4 -26416
+	add
 	stloc 5
-// 0x01078b2c: 0x1078b2c: jr    ra addiu sp, sp, 24
+L_107883c:
+// 0x0107883c: 0x107883c: lw    ra, 20(sp)
+// 0x01078840: 0x1078840: addu  v0, v1, zero
+	ldloc 5
+	stloc 6
+// 0x01078844: 0x1078844: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
-.method public static int32 RTAlerts_ScrollState_1078b34(int32,int32,int32,int32,int32)
+.method public static int32 RtAlerts_get_addional_text_107884c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4735,37 +4382,23 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078b34: 0x1078b34: addiu sp, sp, -24
+// 0x0107884c: 0x107884c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01078850: 0x1078850: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01078b38: 0x1078b38: sw    ra, 20(sp)
-// 0x01078b3c: 0x1078b3c: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
-	stloc 5
-// --- basic block ---
-// 0x01078b44: 0x1078b44: beq   v0, zero, 0x1078b70 addiu v1, zero, -1
-	ldloc 5
-	ldc.i4.m1
-	stloc 6
-	brfalse L_1078b70
-// --- basic block ---
-// 0x01078b4c: 0x1078b4c: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078b54: 0x1078b54: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01078b58: 0x1078b58: addu  a0, v0, zero
-	ldloc 5
+// 0x01078854: 0x1078854: addiu a0, a0, 1304
+	ldloc.1
+	ldc.i4 1304
+	add
 	stloc.1
-// 0x01078b5c: 0x1078b5c: jal   0x1001b14 addiu a1, a1, -26748
+// 0x01078858: 0x1078858: sw    ra, 20(sp)
+// 0x0107885c: 0x107885c: jal   0x1001b14 addiu a1, a1, -26476
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26476
 	add
 	stloc.2
 	ldloc.1
@@ -4773,130 +4406,73 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01078b64: 0x1078b64: beq   v0, zero, 0x1078b70 addu  v1, zero, zero
+// 0x01078864: 0x1078864: bne   v0, zero, 0x107887c addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brfalse L_1078b70
+	brtrue L_107887c
 // --- basic block ---
-// 0x01078b6c: 0x1078b6c: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-L_1078b70:
-// 0x01078b70: 0x1078b70: lw    ra, 20(sp)
-// 0x01078b74: 0x1078b74: addu  v0, v1, zero
-	ldloc 6
-	stloc 5
-// 0x01078b78: 0x1078b78: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_CurrentComments_1078b80(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_1078b80:
-// 0x01078b80: 0x1078b80: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01078b84: 0x1078b84: lw    a0, -14004(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3501
-	add
-	ldelem.i4
+// 0x0107886c: 0x107886c: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x01078b88: 0x1078b88: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x01078870: 0x1078870: jal   0x101cd70 addiu a0, a0, -26396
+	ldloc.1
+	ldc.i4 -26396
 	add
-	stloc.0
-// 0x01078b8c: 0x1078b8c: sw    ra, 20(sp)
-// 0x01078b90: 0x1078b90: jal   0x10847d8 sll   zero, zero, 0
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeAlertCommentsList_10847d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01078b98: 0x1078b98: lw    ra, 20(sp)
-// 0x01078b9c: 0x1078b9c: sll   zero, zero, 0
-// 0x01078ba0: 0x1078ba0: jr    ra addiu sp, sp, 24
+// 0x01078878: 0x1078878: addu  v1, v0, zero
+	ldloc 5
+	stloc 6
+L_107887c:
+// 0x0107887c: 0x107887c: lw    ra, 20(sp)
+// 0x01078880: 0x1078880: addu  v0, v1, zero
+	ldloc 6
+	stloc 5
+// 0x01078884: 0x1078884: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 on_view_comments_1078ba8(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_add_comment_stars_1078988(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 ra)
 
-// local  6 is register v0
-// local  8 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  9 is register s0
+// local  8 is register s1
+// local 10 is register s2
+// local 11 is register s3
 // local  0 is register sp
-// local  5 is register ra
+// local 12 is register ra
 // local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4905,117 +4481,314 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078ba8: 0x1078ba8: addiu sp, sp, -24
+// 0x01078988: 0x1078988: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01078bac: 0x1078bac: sw    ra, 20(sp)
-// 0x01078bb0: 0x1078bb0: jal   0x1078b80 sll   zero, zero, 0
+// 0x0107898c: 0x107898c: sw    s2, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 10
+	stelem.i4
+// 0x01078990: 0x1078990: lui   s2, 0x20000
+	ldc.i4 131072
+	stloc 10
+// 0x01078994: 0x1078994: sw    s0, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 9
+	stelem.i4
+// 0x01078998: 0x1078998: addu  s0, a0, zero
+	ldloc.1
+	stloc 9
+// 0x0107899c: 0x107899c: addiu a0, s2, -5864
+	ldloc 10
+	ldc.i4 -5864
+	add
+	stloc.1
+// 0x010789a0: 0x10789a0: sw    s3, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 11
+	stelem.i4
+// 0x010789a4: 0x10789a4: sw    s1, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x010789a8: 0x10789a8: addiu s3, a1, 16
+	ldloc.2
+	ldc.i4.s 16
+	add
+	stloc 11
+// 0x010789ac: 0x10789ac: sw    ra, 36(sp)
+// 0x010789b0: 0x10789b0: jal   0x101cd70 addu  s1, a1, zero
+	ldloc.2
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_CurrentComments_1078b80(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01078bb8: 0x1078bb8: lw    ra, 20(sp)
-// 0x01078bbc: 0x1078bbc: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-// 0x01078bc0: 0x1078bc0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+// 0x010789b8: 0x10789b8: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x010789bc: 0x10789bc: jal   0x1001b14 addu  a0, s3, zero
+	ldloc 11
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x010789c4: 0x10789c4: beq   v0, zero, 0x1078a50 addu  a0, s3, zero
+	ldloc 5
+	ldloc 11
+	stloc.1
+	brfalse L_1078a50
+// --- basic block ---
+// 0x010789cc: 0x10789cc: jal   0x1001b14 addiu a1, s2, -5864
+	ldloc 10
+	ldc.i4 -5864
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x010789d4: 0x10789d4: beq   v0, zero, 0x1078a50 addiu v1, zero, -1
+	ldloc 5
+	ldc.i4.m1
+	stloc 6
+	brfalse L_1078a50
+// --- basic block ---
+// 0x010789dc: 0x10789dc: lw    v0, 528(s1)
+	ldloc 7
 	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4 132
+	add
+	ldelem.i4
+	stloc 5
+// 0x010789e0: 0x10789e0: sll   zero, zero, 0
+// 0x010789e4: 0x10789e4: beq   v0, v1, 0x1078a50 sltiu v1, v0, 6
+	ldloc 5
 	ldloc 6
-	ret
-}
-.method public static int32 real_time_remove_alert_1078cbc(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+	ldloc 5
+	ldc.i4.6
+	clt.un
+	stloc 6
+	beq  L_1078a50
+// --- basic block ---
+// 0x010789ec: 0x10789ec: bne   v1, zero, 0x1078a00 lui   v1, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 6
+	brtrue L_1078a00
+// --- basic block ---
+// 0x010789f4: 0x10789f4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x010789f8: 0x10789f8: j	 0x1078a10 addiu a1, a1, -26616
+	ldloc.2
+	ldc.i4 -26616
+	add
+	stloc.2
+	br L_1078a10
+// --- basic block ---
+L_1078a00:
+// 0x01078a00: 0x1078a00: sll   v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x01078a04: 0x1078a04: addiu v1, v1, 29776
+	ldloc 6
+	ldc.i4 29776
+	add
 	stloc 6
-__CIBYL_javamethod_begin:
+// 0x01078a08: 0x1078a08: addu  v0, v0, v1
+	ldloc 5
+	ldloc 6
+	add
+	stloc 5
+// 0x01078a0c: 0x1078a0c: lw    a1, 0(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.2
+L_1078a10:
+// 0x01078a10: 0x1078a10: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01078a14: 0x1078a14: addiu a0, a0, -26368
+	ldloc.1
+	ldc.i4 -26368
+	add
+	stloc.1
+// 0x01078a18: 0x1078a18: jal   0x109e784 addiu a2, zero, 8
+	ldc.i4.8
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01078cbc: 0x1078cbc: addiu sp, sp, -24
+// 0x01078a20: 0x1078a20: addu  s1, v0, zero
+	ldloc 5
+	stloc 8
+// 0x01078a24: 0x1078a24: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x01078a28: 0x1078a28: addiu a1, zero, 5
+	ldc.i4.5
+	stloc.2
+// 0x01078a2c: 0x1078a2c: jal   0x1094970 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01078cc0: 0x1078cc0: sw    ra, 20(sp)
-// 0x01078cc4: 0x1078cc4: jal   0x106c69c sll   zero, zero, 0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01078a34: 0x1078a34: addu  a0, s1, zero
+	ldloc 8
+	stloc.1
+// 0x01078a38: 0x1078a38: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01078a3c: 0x1078a3c: jal   0x10995cc addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_Remove_Alert_106c69c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01078a44: 0x1078a44: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x01078a48: 0x1078a48: jal   0x109950c addu  a1, s1, zero
+	ldloc 8
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_1078a50:
+// 0x01078a50: 0x1078a50: lw    ra, 36(sp)
+// 0x01078a54: 0x1078a54: lw    s3, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 11
+// 0x01078a58: 0x1078a58: lw    s2, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 10
+// 0x01078a5c: 0x1078a5c: lw    s1, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
 	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x01078ccc: 0x1078ccc: lw    ra, 20(sp)
-// 0x01078cd0: 0x1078cd0: sll   zero, zero, 0
-// 0x01078cd4: 0x1078cd4: jr    ra addiu sp, sp, 24
+// 0x01078a60: 0x1078a60: lw    s0, 20(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 9
+// 0x01078a64: 0x1078a64: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 5
 	ret
 }
-.method public static int32 real_time_post_alert_comment_by_id_1078cdc(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_update_stars_1078a6c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
 
 // local  5 is register v0
 // local  6 is register v1
@@ -5024,8 +4797,11 @@ __CIBYL_function_return:
 // local  3 is register a2
 // local  4 is register a3
 // local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
 // local  0 is register sp
-// local  9 is register ra
+// local 12 is register ra
 // local  7 is register mem
 
 	ldc.i4.s 0
@@ -5042,136 +4818,189 @@ __CIBYL_function_return:
 	stloc 4
 	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078cdc: 0x1078cdc: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01078ce0: 0x1078ce0: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x01078ce4: 0x1078ce4: addiu sp, sp, -32
+// 0x01078a6c: 0x1078a6c: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01078ce8: 0x1078ce8: addu  v1, v0, zero
-	ldloc 5
-	stloc 6
-// 0x01078cec: 0x1078cec: lw    a1, 2000(v0)
+// 0x01078a70: 0x1078a70: sw    s3, 32(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc.2
-// 0x01078cf0: 0x1078cf0: sw    ra, 28(sp)
-// 0x01078cf4: 0x1078cf4: sw    s0, 24(sp)
+	ldloc 11
+	stelem.i4
+// 0x01078a74: 0x1078a74: lui   s3, 0x20000
+	ldc.i4 131072
+	stloc 11
+// 0x01078a78: 0x1078a78: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x01078cf8: 0x1078cf8: j	 0x1078d30 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_1078d30
-// --- basic block ---
-L_1078d00:
-// 0x01078d00: 0x1078d00: lw    s0, 0(v1)
+// 0x01078a7c: 0x1078a7c: addu  s1, a1, zero
+	ldloc.2
+	stloc 9
+// 0x01078a80: 0x1078a80: addiu a1, s3, -26356
+	ldloc 11
+	ldc.i4 -26356
+	add
+	stloc.2
+// 0x01078a84: 0x1078a84: sw    s2, 28(sp)
 	ldloc 7
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 8
-// 0x01078d04: 0x1078d04: addiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4.7
 	add
-	stloc 5
-// 0x01078d08: 0x1078d08: lw    a2, 0(s0)
+	ldloc 10
+	stelem.i4
+// 0x01078a88: 0x1078a88: sw    s0, 20(sp)
 	ldloc 7
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x01078d0c: 0x1078d0c: sll   zero, zero, 0
-// 0x01078d10: 0x1078d10: bne   a2, a0, 0x1078d30 addiu v1, v1, 4
-	ldloc.3
-	ldloc.1
-	ldloc 6
-	ldc.i4.4
+	ldc.i4.5
 	add
-	stloc 6
-	bne.un L_1078d30
-// --- basic block ---
-// 0x01078d18: 0x1078d18: jal   0x106b08c sll   zero, zero, 0
+	ldloc 8
+	stelem.i4
+// 0x01078a8c: 0x1078a8c: sw    ra, 36(sp)
+// 0x01078a90: 0x1078a90: jal   0x109b94c addu  s2, a0, zero
+	ldloc.1
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_RandomUserMsg_106b08c(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01078d20: 0x1078d20: bne   v0, zero, 0x1078d84 sll   zero, zero, 0
+// 0x01078a98: 0x1078a98: bne   v0, zero, 0x1078ae4 addu  s0, v0, zero
 	ldloc 5
-	brtrue L_1078d84
-// --- basic block ---
-// 0x01078d28: 0x1078d28: j	 0x1078d44 sll   zero, zero, 0
-	br L_1078d44
-// --- basic block ---
-L_1078d30:
-// 0x01078d30: 0x1078d30: slt   a2, v0, a1
 	ldloc 5
+	stloc 8
+	brtrue L_1078ae4
+// --- basic block ---
+// 0x01078aa0: 0x1078aa0: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01078aa4: 0x1078aa4: addiu a1, a1, -26616
 	ldloc.2
-	clt
+	ldc.i4 -26616
+	add
+	stloc.2
+// 0x01078aa8: 0x1078aa8: addiu a0, s3, -26356
+	ldloc 11
+	ldc.i4 -26356
+	add
+	stloc.1
+// 0x01078aac: 0x1078aac: jal   0x109e784 addu  a2, zero, zero
+	ldc.i4.s 0
 	stloc.3
-// 0x01078d34: 0x1078d34: bne   a2, zero, 0x1078d00 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	brtrue L_1078d00
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x01078d3c: 0x1078d3c: j	 0x1078d84 sll   zero, zero, 0
-	br L_1078d84
+// 0x01078ab4: 0x1078ab4: addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x01078ab8: 0x1078ab8: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x01078abc: 0x1078abc: addiu a1, zero, 5
+	ldc.i4.5
+	stloc.2
+// 0x01078ac0: 0x1078ac0: jal   0x1094970 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_1078d44:
-// 0x01078d44: 0x1078d44: jal   0x106ab9c sll   zero, zero, 0
+// 0x01078ac8: 0x1078ac8: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x01078acc: 0x1078acc: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01078ad0: 0x1078ad0: jal   0x10995cc addiu a2, zero, 5
+	ldc.i4.5
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_AnonymousMsg_106ab9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01078ad8: 0x1078ad8: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x01078adc: 0x1078adc: jal   0x109950c addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01078d4c: 0x1078d4c: bne   v0, zero, 0x1078d84 lui   a0, 0x20000
+L_1078ae4:
+// 0x01078ae4: 0x1078ae4: lb    v0, 32(s1)
+	ldloc 9
+	ldc.i4.s 32
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x01078ae8: 0x1078ae8: sll   zero, zero, 0
+// 0x01078aec: 0x1078aec: beq   v0, zero, 0x1078b58 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1078d84
+	brfalse L_1078b58
 // --- basic block ---
-// 0x01078d54: 0x1078d54: jal   0x101cd60 addiu a0, a0, -29292
+// 0x01078af4: 0x1078af4: jal   0x101cd70 addiu a0, a0, -5864
 	ldloc.1
-	ldc.i4 -29292
+	ldc.i4 -5864
 	add
 	stloc.1
 	ldloc.0
@@ -5179,195 +5008,186 @@ L_1078d44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01078d5c: 0x1078d5c: addu  a0, v0, zero
+// 0x01078afc: 0x1078afc: addu  a1, v0, zero
 	ldloc 5
-	stloc.1
-// 0x01078d60: 0x1078d60: lui   a1, 0x10000
-	ldc.i4 65536
 	stloc.2
-// 0x01078d64: 0x1078d64: lui   a2, 0x1080000
-	ldc.i4 17301504
-	stloc.3
-// 0x01078d68: 0x1078d68: lui   v0, 0x20000
-	ldc.i4 131072
+// 0x01078b00: 0x1078b00: jal   0x1001b14 addiu a0, s1, 32
+	ldloc 9
+	ldc.i4.s 32
+	add
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
-// 0x01078d6c: 0x1078d6c: ori   v0, v0, 1
+// --- basic block ---
+// 0x01078b08: 0x1078b08: beq   v0, zero, 0x1078b58 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4.1
-	or
+	brfalse L_1078b58
+// --- basic block ---
+// 0x01078b10: 0x1078b10: lw    v0, 136(s1)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
+	add
+	ldelem.i4
 	stloc 5
-// 0x01078d70: 0x1078d70: addiu a1, a1, 18500
+// 0x01078b14: 0x1078b14: sll   zero, zero, 0
+// 0x01078b18: 0x1078b18: sltiu v1, v0, 6
+	ldloc 5
+	ldc.i4.6
+	clt.un
+	stloc 6
+// 0x01078b1c: 0x1078b1c: bne   v1, zero, 0x1078b30 lui   v1, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 6
+	brtrue L_1078b30
+// --- basic block ---
+// 0x01078b24: 0x1078b24: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01078b28: 0x1078b28: j	 0x1078b40 addiu a1, a1, -26616
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 -26616
 	add
 	stloc.2
-// 0x01078d74: 0x1078d74: addiu a2, a2, -25944
-	ldloc.3
-	ldc.i4 -25944
+	br L_1078b40
+// --- basic block ---
+L_1078b30:
+// 0x01078b30: 0x1078b30: sll   v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x01078b34: 0x1078b34: addiu v1, v1, 29776
+	ldloc 6
+	ldc.i4 29776
 	add
-	stloc.3
-// 0x01078d78: 0x1078d78: addu  a3, s0, zero
-	ldloc 8
-	stloc 4
-// 0x01078d7c: 0x1078d7c: jal   0x1052e08 sw    v0, 16(sp)
+	stloc 6
+// 0x01078b38: 0x1078b38: addu  v0, v0, v1
+	ldloc 5
+	ldloc 6
+	add
+	stloc 5
+// 0x01078b3c: 0x1078b3c: lw    a1, 0(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc.2
+L_1078b40:
+// 0x01078b40: 0x1078b40: jal   0x109e558 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl61::ShowEditbox_1052e08(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1078d84:
-// 0x01078d84: 0x1078d84: lw    ra, 28(sp)
-// 0x01078d88: 0x1078d88: lw    s0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x01078d8c: 0x1078d8c: jr    ra addiu sp, sp, 32
-	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 real_time_post_alert_comment_1078d94(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x01078b48: 0x1078b48: jal   0x10996f4 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-__CIBYL_javamethod_begin:
+	stloc 5
 // --- basic block ---
-L_1078d94:
-// 0x01078d94: 0x1078d94: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x01078b50: 0x1078b50: j	 0x1078b60 sll   zero, zero, 0
+	br L_1078b60
+// --- basic block ---
+L_1078b58:
+// 0x01078b58: 0x1078b58: jal   0x10996e0 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
-// 0x01078d98: 0x1078d98: lw    a0, -14004(v0)
-	ldloc 6
-	ldloc 5
+// --- basic block ---
+L_1078b60:
+// 0x01078b60: 0x1078b60: lw    ra, 36(sp)
+// 0x01078b64: 0x1078b64: lw    s3, 32(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc.1
-// 0x01078d9c: 0x1078d9c: addiu sp, sp, -24
+	stloc 11
+// 0x01078b68: 0x1078b68: lw    s2, 28(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01078da0: 0x1078da0: addiu v1, zero, 2
 	ldc.i4.2
-	stloc 7
-// 0x01078da4: 0x1078da4: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x01078da8: 0x1078da8: sw    ra, 20(sp)
-// 0x01078dac: 0x1078dac: jal   0x1078cdc sw    v1, 15880(v0)
-	ldloc 6
-	ldloc 5
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 10
+// 0x01078b6c: 0x1078b6c: lw    s1, 24(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3970
+	ldc.i4.6
 	add
+	ldelem.i4
+	stloc 9
+// 0x01078b70: 0x1078b70: lw    s0, 20(sp)
 	ldloc 7
-	stelem.i4
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl90::real_time_post_alert_comment_by_id_1078cdc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01078db4: 0x1078db4: lw    ra, 20(sp)
-// 0x01078db8: 0x1078db8: sll   zero, zero, 0
-// 0x01078dbc: 0x1078dbc: jr    ra addiu sp, sp, 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 8
+// 0x01078b74: 0x1078b74: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 on_add_comment_1078dc4(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Delete_All_Comments_1078bfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  6 is register s0
 // local  0 is register sp
-// local  8 is register ra
-// local  6 is register mem
+// local  7 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5376,92 +5196,111 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 6
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078dc4: 0x1078dc4: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01078dc8: 0x1078dc8: lw    a0, -14004(v0)
-	ldloc 6
+// 0x01078bfc: 0x1078bfc: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01078c00: 0x1078c00: lw    a0, 1300(a0)
 	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 325
 	add
 	ldelem.i4
 	stloc.1
-// 0x01078dcc: 0x1078dcc: addiu sp, sp, -24
+// 0x01078c04: 0x1078c04: sw    ra, 20(sp)
+// 0x01078c08: 0x1078c08: sw    s0, 16(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01078dd0: 0x1078dd0: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x01078dd4: 0x1078dd4: addiu v1, zero, 2
 	ldc.i4.2
-	stloc 7
-// 0x01078dd8: 0x1078dd8: sw    ra, 20(sp)
-// 0x01078ddc: 0x1078ddc: jal   0x1078cdc sw    v1, 15880(v0)
+	shr.un
+	ldc.i4.4
+	add
 	ldloc 6
+	stelem.i4
+L_1078c0c:
+// 0x01078c0c: 0x1078c0c: beq   a0, zero, 0x1078c28 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1078c28
+// --- basic block ---
+// 0x01078c14: 0x1078c14: lw    s0, 0(a0)
 	ldloc 5
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 3970
-	add
-	ldloc 7
-	stelem.i4
+	ldelem.i4
+	stloc 6
+// 0x01078c18: 0x1078c18: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::real_time_post_alert_comment_by_id_1078cdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01078de4: 0x1078de4: lw    ra, 20(sp)
-// 0x01078de8: 0x1078de8: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-// 0x01078dec: 0x1078dec: jr    ra addiu sp, sp, 24
+// 0x01078c20: 0x1078c20: j	 0x1078c0c addu  a0, s0, zero
+	ldloc 6
+	stloc.1
+	br L_1078c0c
+// --- basic block ---
+L_1078c28:
+// 0x01078c28: 0x1078c28: lw    ra, 20(sp)
+// 0x01078c2c: 0x1078c2c: lw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 6
+// 0x01078c30: 0x1078c30: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 RTAlerts_Comment_PopUp_Hide_1078df4(int32,int32,int32,int32,int32)
+.method public static int32 space_1078c38(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra,int32 lo)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  8 is register ra
+// local  9 is register lo
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5473,215 +5312,165 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078df4: 0x1078df4: addiu sp, sp, -24
+// 0x01078c38: 0x1078c38: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01078df8: 0x1078df8: sw    ra, 20(sp)
-// 0x01078dfc: 0x1078dfc: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
-	stloc 5
-// --- basic block ---
-// 0x01078e04: 0x1078e04: beq   v0, zero, 0x1078e34 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1078e34
-// --- basic block ---
-// 0x01078e0c: 0x1078e0c: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01078e14: 0x1078e14: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01078e18: 0x1078e18: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01078e1c: 0x1078e1c: jal   0x1001b14 addiu a1, a1, -26764
-	ldloc.2
-	ldc.i4 -26764
+// 0x01078c3c: 0x1078c3c: sw    a0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.2
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stelem.i4
+// 0x01078c40: 0x1078c40: sw    ra, 36(sp)
+// 0x01078c44: 0x1078c44: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01078e24: 0x1078e24: bne   v0, zero, 0x1078e34 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1078e34
-// --- basic block ---
-// 0x01078e2c: 0x1078e2c: jal   0x1094b64 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
+// 0x01078c4c: 0x1078c4c: lw    a0, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_1078e34:
-// 0x01078e34: 0x1078e34: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
-	stloc 5
-// --- basic block ---
-// 0x01078e3c: 0x1078e3c: beq   v0, zero, 0x1078e6c sll   zero, zero, 0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc.1
+// 0x01078c50: 0x1078c50: beq   v0, zero, 0x1078c60 addiu v0, zero, 10
 	ldloc 5
-	brfalse L_1078e6c
-// --- basic block ---
-// 0x01078e44: 0x1078e44: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.s 10
 	stloc 5
+	brfalse L_1078c60
 // --- basic block ---
-// 0x01078e4c: 0x1078e4c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01078e50: 0x1078e50: addu  a0, v0, zero
+// 0x01078c58: 0x1078c58: mult  a0, v0
+	ldloc.1
 	ldloc 5
+	mul
+	stloc 9
+// 0x01078c5c: 0x1078c5c: mflo  lo
+	ldloc 9
 	stloc.1
-// 0x01078e54: 0x1078e54: jal   0x1001b14 addiu a1, a1, -26732
-	ldloc.2
-	ldc.i4 -26732
-	add
-	stloc.2
+L_1078c60:
+// 0x01078c60: 0x1078c60: addu  a3, a0, zero
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x01078e5c: 0x1078e5c: bne   v0, zero, 0x1078e6c sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1078e6c
-// --- basic block ---
-// 0x01078e64: 0x1078e64: jal   0x1094b64 addu  a0, zero, zero
+	stloc 4
+// 0x01078c64: 0x1078c64: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-	ldloc.0
+// 0x01078c68: 0x1078c68: addiu a0, a0, 32124
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_1078e6c:
-// 0x01078e6c: 0x1078e6c: lw    ra, 20(sp)
-// 0x01078e70: 0x1078e70: sll   zero, zero, 0
-// 0x01078e74: 0x1078e74: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+	ldc.i4 32124
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Comment_Ignore_sk_cb_1078e7c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
-
-// local  6 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
+	stloc.1
+// 0x01078c6c: 0x1078c6c: addu  a1, zero, zero
 	ldc.i4.s 0
+	stloc.2
+// 0x01078c70: 0x1078c70: addiu a2, zero, -2
+	ldc.i4.s -2
+	stloc.3
+// 0x01078c74: 0x1078c74: addiu v0, zero, 136
+	ldc.i4 136
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01078e7c: 0x1078e7c: addiu sp, sp, -24
+// 0x01078c78: 0x1078c78: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-// 0x01078e80: 0x1078e80: sw    ra, 20(sp)
-// 0x01078e84: 0x1078e84: jal   0x1078df4 sll   zero, zero, 0
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Comment_PopUp_Hide_1078df4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01078e8c: 0x1078e8c: lw    ra, 20(sp)
-// 0x01078e90: 0x1078e90: addu  v0, zero, zero
+// 0x01078c80: 0x1078c80: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01078c84: 0x1078c84: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc 6
-// 0x01078e94: 0x1078e94: jr    ra addiu sp, sp, 24
+	stloc.2
+// 0x01078c88: 0x1078c88: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x01078c8c: 0x1078c8c: jal   0x1099628 sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x01078c94: 0x1078c94: lw    ra, 36(sp)
+// 0x01078c98: 0x1078c98: lw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 5
+// 0x01078c9c: 0x1078c9c: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Comment_Init_1078e9c(int32,int32,int32,int32,int32)
+.method public static int32 send_map_problem_sk_cb_1078ca4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s2,int32 v1,int32 s1,int32 s3,int32 s0,int32 s5,int32 s4,int32 ra)
 
-// local  6 is register v0
-// local  7 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
+// local 11 is register s0
+// local  9 is register s1
+// local  7 is register s2
+// local 10 is register s3
+// local 13 is register s4
+// local 12 is register s5
 // local  0 is register sp
-// local  9 is register ra
-// local  5 is register mem
+// local 14 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5691,784 +5480,940 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 14
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078e9c: 0x1078e9c: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x01078ea0: 0x1078ea0: addiu sp, sp, -24
+// 0x01078ca4: 0x1078ca4: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01078ea4: 0x1078ea4: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-// 0x01078ea8: 0x1078ea8: sw    v0, 4(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldloc 6
-	stelem.i4
-// 0x01078eac: 0x1078eac: sw    v0, 0(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
+// 0x01078ca8: 0x1078ca8: sw    s0, 28(sp)
 	ldloc 6
-	stelem.i4
-// 0x01078eb0: 0x1078eb0: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 6
-// 0x01078eb4: 0x1078eb4: sw    v1, 12(a0)
-	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.7
 	add
-	ldloc 7
+	ldloc 11
 	stelem.i4
-// 0x01078eb8: 0x1078eb8: sw    s0, 16(sp)
-	ldloc 5
+// 0x01078cac: 0x1078cac: lui   s0, 0x20000
+	ldc.i4 131072
+	stloc 11
+// 0x01078cb0: 0x1078cb0: sw    s1, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x01078ebc: 0x1078ebc: sw    v0, 8(a0)
-	ldloc 5
+// 0x01078cb4: 0x1078cb4: addu  s1, a0, zero
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
+	stloc 9
+// 0x01078cb8: 0x1078cb8: addiu a0, s0, -26344
+	ldloc 11
+	ldc.i4 -26344
 	add
+	stloc.1
+// 0x01078cbc: 0x1078cbc: sw    ra, 52(sp)
+// 0x01078cc0: 0x1078cc0: sw    s5, 48(sp)
 	ldloc 6
-	stelem.i4
-// 0x01078ec0: 0x1078ec0: addu  s0, a0, zero
-	ldloc.1
-	stloc 8
-// 0x01078ec4: 0x1078ec4: sw    zero, 528(a0)
-	ldloc 5
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 132
+	ldc.i4.s 12
 	add
-	ldc.i4.s 0
+	ldloc 12
 	stelem.i4
-// 0x01078ec8: 0x1078ec8: sw    zero, 532(a0)
-	ldloc 5
-	ldloc.1
+// 0x01078cc4: 0x1078cc4: sw    s4, 44(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 133
+	ldc.i4.s 11
 	add
-	ldc.i4.s 0
+	ldloc 13
 	stelem.i4
-// 0x01078ecc: 0x1078ecc: sw    zero, 520(a0)
-	ldloc 5
-	ldloc.1
+// 0x01078cc8: 0x1078cc8: sw    s3, 40(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 130
+	ldc.i4.s 10
 	add
-	ldc.i4.s 0
+	ldloc 10
 	stelem.i4
-// 0x01078ed0: 0x1078ed0: sw    zero, 636(a0)
-	ldloc 5
-	ldloc.1
+// 0x01078ccc: 0x1078ccc: jal   0x101cd70 sw    s2, 36(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 159
+	ldc.i4.s 9
 	add
-	ldc.i4.s 0
+	ldloc 7
 	stelem.i4
-// 0x01078ed4: 0x1078ed4: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078ed8: 0x1078ed8: addiu a0, a0, 16
-	ldloc.1
-	ldc.i4.s 16
-	add
-	stloc.1
-// 0x01078edc: 0x1078edc: sw    ra, 20(sp)
-// 0x01078ee0: 0x1078ee0: jal   0x100177c addiu a2, zero, 100
-	ldc.i4.s 100
-	stloc.3
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01078ee8: 0x1078ee8: addiu a0, s0, 117
-	ldloc 8
-	ldc.i4.s 117
-	add
-	stloc.1
-// 0x01078eec: 0x1078eec: addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x01078cd4: 0x1078cd4: addu  a1, v0, zero
+	ldloc 5
 	stloc.2
-// 0x01078ef0: 0x1078ef0: jal   0x100177c addiu a2, zero, 400
-	ldc.i4 400
-	stloc.3
+// 0x01078cd8: 0x1078cd8: jal   0x109b94c addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01078ef8: 0x1078ef8: addiu a0, s0, 536
-	ldloc 8
-	ldc.i4 536
+// 0x01078ce0: 0x1078ce0: addiu a0, s0, -26344
+	ldloc 11
+	ldc.i4 -26344
 	add
 	stloc.1
-// 0x01078efc: 0x1078efc: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078f00: 0x1078f00: jal   0x100177c addiu a2, zero, 100
-	ldc.i4.s 100
-	stloc.3
+// 0x01078ce4: 0x1078ce4: jal   0x101cd70 addu  s1, v0, zero
+	ldloc 5
+	stloc 9
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	stloc 8
+	stloc 5
 // --- basic block ---
-// 0x01078f08: 0x1078f08: lw    ra, 20(sp)
-// 0x01078f0c: 0x1078f0c: lw    s0, 16(sp)
+// 0x01078cec: 0x1078cec: addu  a1, v0, zero
 	ldloc 5
+	stloc.2
+// 0x01078cf0: 0x1078cf0: jal   0x109bc7c addu  a0, s1, zero
+	ldloc 9
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 8
-// 0x01078f10: 0x1078f10: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 RTAlerts_Alert_Init_1078f18(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 s1,int32 ra)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  6 is register s0
-// local  9 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_get_value_109bc7c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078f18: 0x1078f18: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
+// 0x01078cf8: 0x1078cf8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01078cfc: 0x1078cfc: addiu a0, a0, -23972
+	ldloc.1
+	ldc.i4 -23972
 	add
-	stloc.0
-// 0x01078f1c: 0x1078f1c: sw    s1, 24(sp)
+	stloc.1
+// 0x01078d00: 0x1078d00: addu  s1, v0, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 9
-	stelem.i4
-// 0x01078f20: 0x1078f20: addiu s1, zero, -1
-	ldc.i4.m1
 	stloc 9
-// 0x01078f24: 0x1078f24: sw    s0, 20(sp)
-	ldloc 5
+// 0x01078d04: 0x1078d04: jal   0x101df34 lui   s3, 0x80000
+	ldc.i4 524288
+	stloc 10
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01078d0c: 0x1078d0c: lui   s5, 0x0
+	ldc.i4.s 0
+	stloc 12
+// 0x01078d10: 0x1078d10: addu  s0, v0, zero
+	ldloc 5
+	stloc 11
+// 0x01078d14: 0x1078d14: addiu s3, s3, -13448
+	ldloc 10
+	ldc.i4 -13448
+	add
+	stloc 10
+// 0x01078d18: 0x1078d18: addiu s5, s5, 20820
+	ldloc 12
+	ldc.i4 20820
 	add
+	stloc 12
+// 0x01078d1c: 0x1078d1c: addu  s2, zero, zero
+	ldc.i4.s 0
+	stloc 7
+// 0x01078d20: 0x1078d20: j	 0x1078d88 lui   s4, 0x80000
+	ldc.i4 524288
+	stloc 13
+	br L_1078d88
+// --- basic block ---
+L_1078d28:
+// 0x01078d28: 0x1078d28: lw    v0, 0(s3)
 	ldloc 6
-	stelem.i4
-// 0x01078f28: 0x1078f28: sw    s1, 0(a0)
-	ldloc 5
-	ldloc.1
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldloc 9
-	stelem.i4
-// 0x01078f2c: 0x1078f2c: addu  s0, a0, zero
-	ldloc.1
-	stloc 6
-// 0x01078f30: 0x1078f30: sw    zero, 16(a0)
+	ldelem.i4
+	stloc 5
+// 0x01078d2c: 0x1078d2c: sll   zero, zero, 0
+// 0x01078d30: 0x1078d30: lw    a0, 16(v0)
+	ldloc 6
 	ldloc 5
-	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f34: 0x1078f34: sw    zero, 20(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldelem.i4
+	stloc.1
+// 0x01078d34: 0x1078d34: jal   0x1094dd0 addiu s3, s3, 4
+	ldloc 10
+	ldc.i4.4
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f38: 0x1078f38: sw    zero, 24(a0)
-	ldloc 5
+	stloc 10
+	ldloc.0
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f3c: 0x1078f3c: sw    zero, 4(a0)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_get_data_1094dd0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01078d3c: 0x1078d3c: addu  a0, v0, zero
 	ldloc 5
+	stloc.1
+// 0x01078d40: 0x1078d40: jal   0x1001b14 addu  a1, s5, zero
+	ldloc 12
+	stloc.2
 	ldloc.1
-	ldc.i4.2
-	shr.un
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x01078d48: 0x1078d48: bne   v0, zero, 0x1078d88 addiu s2, s2, 1
+	ldloc 5
+	ldloc 7
 	ldc.i4.1
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f40: 0x1078f40: sw    zero, 8(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
+	stloc 7
+	brtrue L_1078d88
+// --- basic block ---
+// 0x01078d50: 0x1078d50: addiu s2, s2, -1
+	ldloc 7
+	ldc.i4.m1
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f44: 0x1078f44: sw    zero, 136(a0)
-	ldloc 5
-	ldloc.1
+	stloc 7
+// 0x01078d54: 0x1078d54: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01078d58: 0x1078d58: sll   s2, s2, 2
+	ldloc 7
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 34
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f48: 0x1078f48: sw    zero, 140(a0)
+	shl
+	stloc 7
+// 0x01078d5c: 0x1078d5c: addiu v0, v0, -13508
 	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 35
+	ldc.i4 -13508
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f4c: 0x1078f4c: sw    zero, 144(a0)
+	stloc 5
+// 0x01078d60: 0x1078d60: addu  s2, s2, v0
+	ldloc 7
 	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 36
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f50: 0x1078f50: sw    zero, 148(a0)
-	ldloc 5
-	ldloc.1
+	stloc 7
+// 0x01078d64: 0x1078d64: lw    a3, 0(s2)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 37
+	ldelem.i4
+	stloc 4
+// 0x01078d68: 0x1078d68: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x01078d6c: 0x1078d6c: addiu a2, a2, 19088
+	ldloc.3
+	ldc.i4 19088
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f54: 0x1078f54: sw    zero, 152(a0)
-	ldloc 5
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 38
+	stloc.3
+// 0x01078d70: 0x1078d70: addiu a3, a3, 6
+	ldloc 4
+	ldc.i4.6
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f58: 0x1078f58: sw    zero, 1264(a0)
-	ldloc 5
+	stloc 4
+// 0x01078d74: 0x1078d74: addiu a0, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.1
+// 0x01078d78: 0x1078d78: jal   0x1000f9c addiu a1, zero, 3
+	ldc.i4.3
+	stloc.2
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01078d80: 0x1078d80: j	 0x1078d9c addu  a1, s1, zero
+	ldloc 9
+	stloc.2
+	br L_1078d9c
+// --- basic block ---
+L_1078d88:
+// 0x01078d88: 0x1078d88: lw    v0, -15780(s4)
+	ldloc 6
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 316
+	ldc.i4 -3945
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f5c: 0x1078f5c: sw    zero, 1280(a0)
+	ldelem.i4
+	stloc 5
+// 0x01078d8c: 0x1078d8c: sll   zero, zero, 0
+// 0x01078d90: 0x1078d90: slt   v0, s2, v0
+	ldloc 7
+	ldloc 5
+	clt
+	stloc 5
+// 0x01078d94: 0x1078d94: bne   v0, zero, 0x1078d28 addu  a1, s1, zero
 	ldloc 5
+	ldloc 9
+	stloc.2
+	brtrue L_1078d28
+// --- basic block ---
+L_1078d9c:
+// 0x01078d9c: 0x1078d9c: addu  a2, s0, zero
+	ldloc 11
+	stloc.3
+// 0x01078da0: 0x1078da0: jal   0x106ce38 addiu a0, sp, 16
+	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl81::Realtime_ReportMapProblem_106ce38(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01078da8: 0x1078da8: jal   0x10950dc addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.0
 	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01078db0: 0x1078db0: lw    ra, 52(sp)
+// 0x01078db4: 0x1078db4: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x01078db8: 0x1078db8: lw    s5, 48(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 320
+	ldc.i4.s 12
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f60: 0x1078f60: sw    zero, 1516(a0)
-	ldloc 5
-	ldloc.1
+	ldelem.i4
+	stloc 12
+// 0x01078dbc: 0x1078dbc: lw    s4, 44(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 379
+	ldc.i4.s 11
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f64: 0x1078f64: sw    zero, 1284(a0)
-	ldloc 5
-	ldloc.1
+	ldelem.i4
+	stloc 13
+// 0x01078dc0: 0x1078dc0: lw    s3, 40(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 321
+	ldc.i4.s 10
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f68: 0x1078f68: sw    zero, 1828(a0)
-	ldloc 5
-	ldloc.1
+	ldelem.i4
+	stloc 10
+// 0x01078dc4: 0x1078dc4: lw    s2, 36(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 457
+	ldc.i4.s 9
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f6c: 0x1078f6c: sw    zero, 1832(a0)
-	ldloc 5
-	ldloc.1
+	ldelem.i4
+	stloc 7
+// 0x01078dc8: 0x1078dc8: lw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 458
+	ldc.i4.8
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01078f70: 0x1078f70: sw    zero, 1824(a0)
-	ldloc 5
-	ldloc.1
+	ldelem.i4
+	stloc 9
+// 0x01078dcc: 0x1078dcc: lw    s0, 28(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 456
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 11
+// 0x01078dd0: 0x1078dd0: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 on_map_problem_close_1078dd8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stelem.i4
-// 0x01078f74: 0x1078f74: addu  a1, zero, zero
+	stloc 7
 	ldc.i4.s 0
-	stloc.2
-// 0x01078f78: 0x1078f78: addiu a0, a0, 32
-	ldloc.1
-	ldc.i4.s 32
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01078dd8: 0x1078dd8: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.1
-// 0x01078f7c: 0x1078f7c: sw    ra, 28(sp)
-// 0x01078f80: 0x1078f80: jal   0x100177c addiu a2, zero, 100
-	ldc.i4.s 100
-	stloc.3
+	stloc.0
+// 0x01078ddc: 0x1078ddc: sw    ra, 20(sp)
+// 0x01078de0: 0x1078de0: jal   0x101eef8 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_restore_focus_101eef8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01078f88: 0x1078f88: addiu a0, s0, 156
-	ldloc 6
-	ldc.i4 156
+// 0x01078de8: 0x1078de8: lw    ra, 20(sp)
+// 0x01078dec: 0x1078dec: sll   zero, zero, 0
+// 0x01078df0: 0x1078df0: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc.1
-// 0x01078f8c: 0x1078f8c: addu  a1, zero, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 RTAlerts_CloseProgressDlg_1078df8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc.2
-// 0x01078f90: 0x1078f90: jal   0x100177c addiu a2, zero, 400
-	ldc.i4 400
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078f98: 0x1078f98: addiu a0, s0, 557
-	ldloc 6
-	ldc.i4 557
+// 0x01078df8: 0x1078df8: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.1
-// 0x01078f9c: 0x1078f9c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078fa0: 0x1078fa0: jal   0x100177c addiu a2, zero, 150
-	ldc.i4 150
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	stloc.0
+// 0x01078dfc: 0x1078dfc: sw    ra, 20(sp)
+// 0x01078e00: 0x1078e00: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x01078fa8: 0x1078fa8: addiu a0, s0, 809
-	ldloc 6
-	ldc.i4 809
+// 0x01078e08: 0x1078e08: lw    ra, 20(sp)
+// 0x01078e0c: 0x1078e0c: sll   zero, zero, 0
+// 0x01078e10: 0x1078e10: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc.1
-// 0x01078fac: 0x1078fac: addu  a1, zero, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 RTAlerts_ShowProgressDlg_1078e18(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
+	stloc 5
 	ldc.i4.s 0
-	stloc.2
-// 0x01078fb0: 0x1078fb0: jal   0x100177c addiu a2, zero, 150
-	ldc.i4 150
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078fb8: 0x1078fb8: addiu a0, s0, 708
-	ldloc 6
-	ldc.i4 708
+// 0x01078e18: 0x1078e18: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01078e1c: 0x1078e1c: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01078e20: 0x1078e20: sw    ra, 20(sp)
+// 0x01078e24: 0x1078e24: jal   0x101cd70 addiu a0, a0, -26324
+	ldloc.1
+	ldc.i4 -26324
 	add
 	stloc.1
-// 0x01078fbc: 0x1078fbc: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078fc0: 0x1078fc0: jal   0x100177c addiu a2, zero, 100
-	ldc.i4.s 100
-	stloc.3
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01078fc8: 0x1078fc8: addiu a0, s0, 960
-	ldloc 6
-	ldc.i4 960
-	add
+// 0x01078e2c: 0x1078e2c: jal   0x104c3e0 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x01078fcc: 0x1078fcc: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078fd0: 0x1078fd0: jal   0x100177c addiu a2, zero, 150
-	ldc.i4 150
-	stloc.3
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	call int32 Cibyl56::ssd_progress_msg_dialog_show_104c3e0(int32)
+	stloc 5
+// --- basic block ---
+// 0x01078e34: 0x1078e34: lw    ra, 20(sp)
+// 0x01078e38: 0x1078e38: sll   zero, zero, 0
+// 0x01078e3c: 0x1078e3c: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Minimized_Alert_Dialog_1078e44(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
+
+// local  6 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
 	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01078fd8: 0x1078fd8: addiu a0, s0, 1111
-	ldloc 6
-	ldc.i4 1111
+L_1078e44:
+// 0x01078e44: 0x1078e44: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01078e48: 0x1078e48: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01078e4c: 0x1078e4c: addiu a0, a0, -23936
+	ldloc.1
+	ldc.i4 -23936
 	add
 	stloc.1
-// 0x01078fdc: 0x1078fdc: addu  a1, zero, zero
+// 0x01078e50: 0x1078e50: sw    ra, 20(sp)
+// 0x01078e54: 0x1078e54: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01078fe0: 0x1078fe0: jal   0x100177c addiu a2, zero, 150
-	ldc.i4 150
-	stloc.3
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01078fe8: 0x1078fe8: addiu a0, s0, 1304
-	ldloc 6
-	ldc.i4 1304
-	add
-	stloc.1
-// 0x01078fec: 0x1078fec: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01078ff0: 0x1078ff0: jal   0x100177c addiu a2, zero, 128
-	ldc.i4 128
-	stloc.3
+// 0x01078e5c: 0x1078e5c: jal   0x1094e60 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01078ff8: 0x1078ff8: addiu a0, s0, 1432
-	ldloc 6
-	ldc.i4 1432
+// 0x01078e64: 0x1078e64: lw    ra, 20(sp)
+// 0x01078e68: 0x1078e68: sll   zero, zero, 0
+// 0x01078e6c: 0x1078e6c: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc.1
-// 0x01078ffc: 0x1078ffc: addu  a1, zero, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTAlerts_distance_check_1078e74(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
+
+// local  6 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  8 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
-	stloc.2
-// 0x01079000: 0x1079000: jal   0x100177c addiu a2, zero, 64
-	ldc.i4.s 64
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079008: 0x1079008: sw    s1, 1292(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 323
+L_1078e74:
+// 0x01078e74: 0x1078e74: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107900c: 0x107900c: sw    s1, 1296(s0)
+	stloc.0
+// 0x01078e78: 0x1078e78: sw    s1, 24(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 324
+	ldc.i4.6
 	add
-	ldloc 9
+	ldloc 8
 	stelem.i4
-// 0x01079010: 0x1079010: sw    s1, 1288(s0)
+// 0x01078e7c: 0x1078e7c: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x01078e80: 0x1078e80: sw    s0, 20(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 322
+	ldc.i4.5
 	add
-	ldloc 9
+	ldloc 7
 	stelem.i4
-// 0x01079014: 0x1079014: addiu a0, s0, 1520
-	ldloc 6
-	ldc.i4 1520
-	add
-	stloc.1
-// 0x01079018: 0x1079018: sw    zero, 1496(s0)
-	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 374
+// 0x01078e84: 0x1078e84: addiu s0, s1, -15776
+	ldloc 8
+	ldc.i4 -15776
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107901c: 0x107901c: sw    zero, 1500(s0)
+	stloc 7
+// 0x01078e88: 0x1078e88: lw    v0, 4(s0)
 	ldloc 5
-	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 375
+	ldc.i4.1
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01079020: 0x1079020: sw    zero, 1504(s0)
+	ldelem.i4
+	stloc 6
+// 0x01078e8c: 0x1078e8c: sw    ra, 28(sp)
+// 0x01078e90: 0x1078e90: sw    a0, 32(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 376
+	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc.1
 	stelem.i4
-// 0x01079024: 0x1079024: sw    zero, 1508(s0)
-	ldloc 5
+// 0x01078e94: 0x1078e94: bne   v0, zero, 0x1078ea8 sw    a1, 36(sp)
 	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 377
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01079028: 0x1079028: sw    zero, 1512(s0)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 378
+	ldc.i4.s 9
 	add
-	ldc.i4.s 0
+	ldloc.2
 	stelem.i4
-// 0x0107902c: 0x107902c: sw    zero, 1276(s0)
+	brtrue L_1078ea8
+// --- basic block ---
+// 0x01078e9c: 0x1078e9c: sw    a0, -15776(s1)
 	ldloc 5
-	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4 -3944
 	add
-	ldc.i4.s 0
+	ldloc.1
 	stelem.i4
-// 0x01079030: 0x1079030: sw    zero, 1300(s0)
+// 0x01078ea0: 0x1078ea0: j	 0x1078ed8 sw    a1, 4(s0)
 	ldloc 5
-	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 325
+	ldc.i4.1
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01079034: 0x1079034: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01079038: 0x1079038: jal   0x100177c addiu a2, zero, 100
-	ldc.i4.s 100
-	stloc.3
-	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stelem.i4
+	br L_1078ed8
 // --- basic block ---
-// 0x01079040: 0x1079040: addiu a0, s0, 1624
-	ldloc 6
-	ldc.i4 1624
+L_1078ea8:
+// 0x01078ea8: 0x1078ea8: addiu a0, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01079044: 0x1079044: addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x01078eac: 0x1078eac: jal   0x1008ec0 addu  a1, s0, zero
+	ldloc 7
 	stloc.2
-// 0x01079048: 0x1079048: jal   0x100177c addiu a2, zero, 100
-	ldc.i4.s 100
-	stloc.3
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stloc 9
+	stloc 6
 // --- basic block ---
-// 0x01079050: 0x1079050: addiu a0, s0, 1724
+// 0x01078eb4: 0x1078eb4: slti  v1, v0, 80
 	ldloc 6
-	ldc.i4 1724
-	add
-	stloc.1
-// 0x01079054: 0x1079054: addu  a1, zero, zero
+	ldc.i4.s 80
+	clt
+	stloc 9
+// 0x01078eb8: 0x1078eb8: bne   v1, zero, 0x1078edc addu  v0, zero, zero
+	ldloc 9
 	ldc.i4.s 0
-	stloc.2
-// 0x01079058: 0x1079058: jal   0x100177c addiu a2, zero, 100
-	ldc.i4.s 100
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stloc 6
+	brtrue L_1078edc
 // --- basic block ---
-// 0x01079060: 0x1079060: lw    ra, 28(sp)
-// 0x01079064: 0x1079064: sw    zero, 1836(s0)
+// 0x01078ec0: 0x1078ec0: lw    v0, 32(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 459
+	ldc.i4.8
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01079068: 0x1079068: sw    zero, 1620(s0)
+	ldelem.i4
+	stloc 6
+// 0x01078ec4: 0x1078ec4: sll   zero, zero, 0
+// 0x01078ec8: 0x1078ec8: sw    v0, -15776(s1)
 	ldloc 5
-	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 405
+	ldc.i4 -3944
 	add
-	ldc.i4.s 0
+	ldloc 6
 	stelem.i4
-// 0x0107906c: 0x107906c: sw    zero, 1824(s0)
+// 0x01078ecc: 0x1078ecc: lw    v0, 36(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 456
+	ldc.i4.s 9
 	add
-	ldc.i4.s 0
+	ldelem.i4
+	stloc 6
+// 0x01078ed0: 0x1078ed0: sll   zero, zero, 0
+// 0x01078ed4: 0x1078ed4: sw    v0, 4(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 6
 	stelem.i4
-// 0x01079070: 0x1079070: lw    s1, 24(sp)
+L_1078ed8:
+// 0x01078ed8: 0x1078ed8: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+L_1078edc:
+// 0x01078edc: 0x1078edc: lw    ra, 28(sp)
+// 0x01078ee0: 0x1078ee0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6476,8 +6421,8 @@ __CIBYL_javamethod_begin:
 	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 9
-// 0x01079074: 0x1079074: lw    s0, 20(sp)
+	stloc 8
+// 0x01078ee4: 0x1078ee4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -6485,23 +6430,23 @@ __CIBYL_javamethod_begin:
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 6
-// 0x01079078: 0x1079078: jr    ra addiu sp, sp, 32
+	stloc 7
+// 0x01078ee8: 0x1078ee8: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
+	ldloc 6
 	ret
 }
-.method public static int32 continue_report_after_image_upload_1079080(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 ra)
 
 // local  6 is register v0
 // local  7 is register v1
@@ -6514,8 +6459,12 @@ __CIBYL_function_return:
 // local 10 is register s2
 // local 11 is register s3
 // local 12 is register s4
+// local 13 is register s5
+// local 14 is register s6
+// local 15 is register s7
 // local  0 is register sp
-// local 13 is register ra
+// local 16 is register s8
+// local 17 is register ra
 // local  5 is register mem
 
 	ldc.i4.s 0
@@ -6540,850 +6489,779 @@ __CIBYL_function_return:
 	stloc 11
 	ldc.i4.s 0
 	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 13
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x01079080: 0x1079080: addiu sp, sp, -56
-	ldloc.0
-	ldc.i4.s -56
-	add
-	stloc.0
-// 0x01079084: 0x1079084: sw    s1, 36(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 9
-	stelem.i4
-// 0x01079088: 0x1079088: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x0107908c: 0x107908c: lw    v0, -13996(s1)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3499
+	stloc 16
+	ldc.i4.s 0
+	stloc 17
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01078ef0: 0x1078ef0: addiu sp, sp, -120
+	ldloc.0
+	ldc.i4.s -120
 	add
-	ldelem.i4
-	stloc 6
-// 0x01079090: 0x1079090: sw    s0, 32(sp)
+	stloc.0
+// 0x01078ef4: 0x1078ef4: sw    s0, 80(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 20
 	add
 	ldloc 8
 	stelem.i4
-// 0x01079094: 0x1079094: sw    ra, 52(sp)
-// 0x01079098: 0x1079098: sw    s4, 48(sp)
+// 0x01078ef8: 0x1078ef8: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+// 0x01078efc: 0x1078efc: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x01078f00: 0x1078f00: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 6
+// 0x01078f04: 0x1078f04: sw    s8, 112(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.s 28
 	add
-	ldloc 12
+	ldloc 16
 	stelem.i4
-// 0x0107909c: 0x107909c: sw    s3, 44(sp)
+// 0x01078f08: 0x1078f08: sw    s7, 108(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 27
 	add
-	ldloc 11
+	ldloc 15
 	stelem.i4
-// 0x010790a0: 0x10790a0: sw    s2, 40(sp)
+// 0x01078f0c: 0x1078f0c: sw    s6, 104(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 26
 	add
-	ldloc 10
+	ldloc 14
 	stelem.i4
-// 0x010790a4: 0x10790a4: beq   v0, zero, 0x10790bc addu  s0, a0, zero
-	ldloc 6
-	ldloc.1
-	stloc 8
-	brfalse L_10790bc
-// --- basic block ---
-// 0x010790ac: 0x10790ac: jal   0x1000930 addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010790b4: 0x10790b4: jal   0x1052ee0 sw    zero, -13996(s1)
+// 0x01078f10: 0x1078f10: sw    s5, 100(sp)
 	ldloc 5
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3499
+	ldc.i4.s 25
 	add
-	ldc.i4.s 0
+	ldloc 13
 	stelem.i4
-	call int32 Cibyl61::ResetEditBoxCameraImagePath_1052ee0()
-	stloc 6
-// --- basic block ---
-L_10790bc:
-// 0x010790bc: 0x10790bc: lw    s4, 0(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 12
-// 0x010790c0: 0x10790c0: lw    s3, 4(s0)
+// 0x01078f14: 0x1078f14: sw    s4, 96(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 24
 	add
-	ldelem.i4
-	stloc 11
-// 0x010790c4: 0x10790c4: lw    s2, 8(s0)
+	ldloc 12
+	stelem.i4
+// 0x01078f18: 0x1078f18: sw    s3, 92(sp)
 	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc 10
-// 0x010790c8: 0x10790c8: jal   0x1026cf8 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_sending_enabled_1026cf8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010790d0: 0x10790d0: beq   v0, zero, 0x10790ec addu  s1, zero, zero
-	ldloc 6
-	ldc.i4.s 0
-	stloc 9
-	brfalse L_10790ec
-// --- basic block ---
-// 0x010790d8: 0x10790d8: jal   0x1026edc addiu s1, zero, 1
-	ldc.i4.1
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010790e0: 0x10790e0: bne   v0, zero, 0x10790ec sll   zero, zero, 0
-	ldloc 6
-	brtrue L_10790ec
-// --- basic block ---
-// 0x010790e8: 0x10790e8: addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 9
-L_10790ec:
-// 0x010790ec: 0x10790ec: jal   0x1026cd4 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_is_sending_enabled_1026cd4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x010790f4: 0x10790f4: beq   v0, zero, 0x1079110 addu  v1, zero, zero
-	ldloc 6
-	ldc.i4.s 0
-	stloc 7
-	brfalse L_1079110
-// --- basic block ---
-// 0x010790fc: 0x10790fc: jal   0x1026d94 sll   zero, zero, 0
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01079104: 0x1079104: bne   v0, zero, 0x1079110 addiu v1, zero, 1
-	ldloc 6
-	ldc.i4.1
-	stloc 7
-	brtrue L_1079110
-// --- basic block ---
-// 0x0107910c: 0x107910c: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 7
-L_1079110:
-// 0x01079110: 0x1079110: lw    v0, 12(s0)
-	ldloc 5
-	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 23
 	add
-	ldelem.i4
-	stloc 6
-// 0x01079114: 0x1079114: lui   a3, 0x0
-	ldc.i4.s 0
-	stloc 4
-// 0x01079118: 0x1079118: addu  a0, s4, zero
-	ldloc 12
-	stloc.1
-// 0x0107911c: 0x107911c: addu  a1, s3, zero
 	ldloc 11
-	stloc.2
-// 0x01079120: 0x1079120: addu  a2, s2, zero
-	ldloc 10
-	stloc.3
-// 0x01079124: 0x1079124: addiu a3, a3, 15884
-	ldloc 4
-	ldc.i4 15884
-	add
-	stloc 4
-// 0x01079128: 0x1079128: sw    s1, 16(sp)
+	stelem.i4
+// 0x01078f1c: 0x1078f1c: sw    s2, 88(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 22
 	add
-	ldloc 9
+	ldloc 10
 	stelem.i4
-// 0x0107912c: 0x107912c: sw    v1, 20(sp)
+// 0x01078f20: 0x1078f20: sw    s1, 84(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 21
 	add
-	ldloc 7
+	ldloc 9
 	stelem.i4
-// 0x01079130: 0x1079130: jal   0x106ce68 sw    v0, 24(sp)
+// 0x01078f24: 0x1078f24: sw    ra, 116(sp)
+// 0x01078f28: 0x1078f28: addiu s0, s0, -15564
+	ldloc 8
+	ldc.i4 -15564
+	add
+	stloc 8
+// 0x01078f2c: 0x1078f2c: sw    v1, 15940(v0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 3985
 	add
-	ldloc 6
+	ldloc 7
 	stelem.i4
-	ldloc.0
+// 0x01078f30: 0x1078f30: addu  s4, a0, zero
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl81::Realtime_Report_Alert_106ce68(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01079138: 0x1079138: beq   v0, zero, 0x1079150 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_1079150
-// --- basic block ---
-// 0x01079140: 0x1079140: jal   0x1094a94 addu  a0, zero, zero
+	stloc 12
+// 0x01078f34: 0x1078f34: addu  s3, zero, zero
 	ldc.i4.s 0
-	stloc.1
+	stloc 11
+// 0x01078f38: 0x1078f38: addiu s8, sp, 36
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x01079148: 0x1079148: j	 0x1079158 sll   zero, zero, 0
-	br L_1079158
-// --- basic block ---
-L_1079150:
-// 0x01079150: 0x1079150: jal   0x104c3f0 sll   zero, zero, 0
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-L_1079158:
-// 0x01079158: 0x1079158: lw    a0, 4(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	ldc.i4.s 36
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107915c: 0x107915c: sll   zero, zero, 0
-// 0x01079160: 0x1079160: beq   a0, zero, 0x1079170 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1079170
-// --- basic block ---
-// 0x01079168: 0x1079168: jal   0x1000930 sll   zero, zero, 0
+	stloc 16
+// 0x01078f3c: 0x1078f3c: addiu s7, sp, 56
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-L_1079170:
-// 0x01079170: 0x1079170: lw    a0, 12(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
+	ldc.i4.s 56
 	add
-	ldelem.i4
-	stloc.1
-// 0x01079174: 0x1079174: sll   zero, zero, 0
-// 0x01079178: 0x1079178: beq   a0, zero, 0x1079188 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1079188
-// --- basic block ---
-// 0x01079180: 0x1079180: jal   0x1000930 sll   zero, zero, 0
+	stloc 15
+// 0x01078f40: 0x1078f40: addiu s6, sp, 16
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-L_1079188:
-// 0x01079188: 0x1079188: jal   0x1000930 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
+	ldc.i4.s 16
+	add
+	stloc 14
+// 0x01078f44: 0x1078f44: addiu s5, zero, -1
+	ldc.i4.m1
+	stloc 13
+// 0x01078f48: 0x1078f48: addiu s2, sp, 28
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	ldc.i4.s 28
+	add
+	stloc 10
+// 0x01078f4c: 0x1078f4c: j	 0x1079018 addiu s1, sp, 20
+	ldloc.0
+	ldc.i4.s 20
+	add
+	stloc 9
+	br L_1079018
 // --- basic block ---
-// 0x01079190: 0x1079190: lw    ra, 52(sp)
-// 0x01079194: 0x1079194: lw    s4, 48(sp)
+L_1078f54:
+// 0x01078f54: 0x1078f54: lw    v0, 0(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
+	shr.un
 	ldelem.i4
-	stloc 12
-// 0x01079198: 0x1079198: lw    s3, 44(sp)
+	stloc 6
+// 0x01078f58: 0x1078f58: sll   zero, zero, 0
+// 0x01078f5c: 0x1078f5c: lw    v1, 16(v0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.4
 	add
 	ldelem.i4
-	stloc 11
-// 0x0107919c: 0x107919c: lw    s2, 40(sp)
+	stloc 7
+// 0x01078f60: 0x1078f60: sll   zero, zero, 0
+// 0x01078f64: 0x1078f64: sw    v1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 10
-// 0x010791a0: 0x10791a0: lw    s1, 36(sp)
+	ldloc 7
+	stelem.i4
+// 0x01078f68: 0x1078f68: lw    v0, 20(v0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 9
-// 0x010791a4: 0x10791a4: lw    s0, 32(sp)
+	stloc 6
+// 0x01078f6c: 0x1078f6c: jal   0x1029db8 sw    v0, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 8
-// 0x010791a8: 0x10791a8: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.6
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
-	ret
-}
-.method public static int32 on_keyboard_closed_10791b0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s1,int32 s0,int32 s3,int32 ra)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 10 is register s0
-// local  9 is register s1
-// local  8 is register s2
-// local 11 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
+	stloc 6
 // --- basic block ---
-// 0x010791b0: 0x10791b0: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x010791b4: 0x10791b4: sw    s2, 28(sp)
+// 0x01078f74: 0x1078f74: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x01078f78: 0x1078f78: beq   v0, s5, 0x1078f98 addu  a1, s1, zero
+	ldloc 6
+	ldloc 13
+	ldloc 9
+	stloc.2
+	beq  L_1078f98
+// --- basic block ---
+// 0x01078f80: 0x1078f80: lw    v0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 10
 	add
-	ldloc 8
-	stelem.i4
-// 0x010791b8: 0x10791b8: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x010791bc: 0x10791bc: lui   s2, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x010791c0: 0x10791c0: sw    s3, 32(sp)
+	ldelem.i4
+	stloc 6
+// 0x01078f84: 0x1078f84: sll   zero, zero, 0
+// 0x01078f88: 0x1078f88: sw    v0, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 11
+	ldloc 6
 	stelem.i4
-// 0x010791c4: 0x10791c4: sw    s1, 24(sp)
+// 0x01078f8c: 0x1078f8c: lw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
-	ldloc 9
-	stelem.i4
-// 0x010791c8: 0x10791c8: sw    s0, 20(sp)
+	ldelem.i4
+	stloc 6
+// 0x01078f90: 0x1078f90: j	 0x1078ffc sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldloc 10
+	ldloc 6
 	stelem.i4
-// 0x010791cc: 0x10791cc: addu  s3, a0, zero
+	br L_1078ffc
+// --- basic block ---
+L_1078f98:
+// 0x01078f98: 0x1078f98: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01078f9c: 0x1078f9c: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	stloc 11
-// 0x010791d0: 0x10791d0: addu  s1, a1, zero
-	ldloc.2
-	stloc 9
-// 0x010791d4: 0x10791d4: addu  s0, a2, zero
-	ldloc.3
-	stloc 10
-// 0x010791d8: 0x10791d8: addiu a3, a3, -26676
-	ldloc 4
-	ldc.i4 -26676
+	ldc.i4 7256
 	add
-	stloc 4
-// 0x010791dc: 0x10791dc: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x010791e0: 0x10791e0: addiu a1, s2, -26712
-	ldloc 8
-	ldc.i4 -26712
-	add
-	stloc.2
-// 0x010791e4: 0x10791e4: sw    ra, 36(sp)
-// 0x010791e8: 0x10791e8: jal   0x100449c addiu a2, zero, 4143
-	ldc.i4 4143
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010791f0: 0x10791f0: addiu v1, zero, 1
-	ldc.i4.1
+// 0x01078fa4: 0x1078fa4: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x01078fa8: 0x1078fa8: beq   v0, zero, 0x1078fd4 addu  a1, s1, zero
+	ldloc 6
+	ldloc 9
+	stloc.2
+	brfalse L_1078fd4
+// --- basic block ---
+// 0x01078fb0: 0x1078fb0: lui   a2, 0x2120000
+	ldc.i4 34734080
+	stloc.3
+// 0x01078fb4: 0x1078fb4: lw    v1, 0(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 7
-// 0x010791f4: 0x10791f4: bne   s3, v1, 0x10792bc addiu v0, zero, 1
-	ldloc 11
+// 0x01078fb8: 0x1078fb8: ori   a2, a2, 60730
+	ldloc.3
+	ldc.i4 60730
+	or
+	stloc.3
+// 0x01078fbc: 0x1078fbc: bne   v1, a2, 0x1078ff0 lui   a2, 0x1e90000
 	ldloc 7
-	ldc.i4.1
-	stloc 6
-	bne.un L_10792bc
+	ldloc.3
+	ldc.i4 32047104
+	stloc.3
+	bne.un L_1078ff0
 // --- basic block ---
-// 0x010791fc: 0x10791fc: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01079200: 0x1079200: addiu a1, s2, -26712
-	ldloc 8
-	ldc.i4 -26712
+// 0x01078fc4: 0x1078fc4: lw    v1, 4(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc.2
-// 0x01079204: 0x1079204: addiu a3, a3, -26664
-	ldloc 4
-	ldc.i4 -26664
+	ldelem.i4
+	stloc 7
+// 0x01078fc8: 0x1078fc8: ori   a2, a2, 58906
+	ldloc.3
+	ldc.i4 58906
+	or
+	stloc.3
+// 0x01078fcc: 0x1078fcc: bne   v1, a2, 0x1078fec sll   zero, zero, 0
+	ldloc 7
+	ldloc.3
+	bne.un L_1078fec
+// --- basic block ---
+L_1078fd4:
+// 0x01078fd4: 0x1078fd4: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01078fd8: 0x1078fd8: jal   0x101df60 addiu a0, a0, -31052
+	ldloc.1
+	ldc.i4 -31052
 	add
-	stloc 4
-// 0x01079208: 0x1079208: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x0107920c: 0x107920c: jal   0x100449c addiu a2, zero, 4150
-	ldc.i4 4150
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01079214: 0x1079214: lw    v0, 0(s0)
-	ldloc 5
+// 0x01078fe0: 0x1078fe0: addu  a0, s2, zero
 	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 6
-// 0x01079218: 0x1079218: sll   zero, zero, 0
-// 0x0107921c: 0x107921c: bne   v0, zero, 0x1079234 sll   zero, zero, 0
+	stloc.1
+// 0x01078fe4: 0x1078fe4: beq   v0, zero, 0x1079010 addu  a1, s1, zero
 	ldloc 6
-	brtrue L_1079234
-// --- basic block ---
-// 0x01079224: 0x1079224: lb    v1, 0(s1)
-	ldloc 9
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 7
-// 0x01079228: 0x1079228: sll   zero, zero, 0
-// 0x0107922c: 0x107922c: beq   v1, zero, 0x10792bc sll   zero, zero, 0
-	ldloc 7
-	brfalse L_10792bc
-// --- basic block ---
-L_1079234:
-// 0x01079234: 0x1079234: lb    v0, 0(s1)
 	ldloc 9
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01079238: 0x1079238: sll   zero, zero, 0
-// 0x0107923c: 0x107923c: bne   v0, zero, 0x107924c sll   zero, zero, 0
-	ldloc 6
-	brtrue L_107924c
+	stloc.2
+	brfalse L_1079010
 // --- basic block ---
-// 0x01079244: 0x1079244: lw    s1, 8(s0)
+L_1078fec:
+// 0x01078fec: 0x1078fec: lw    v1, 0(v0)
 	ldloc 5
-	ldloc 10
+	ldloc 6
 	ldc.i4.2
 	shr.un
+	ldelem.i4
+	stloc 7
+L_1078ff0:
+// 0x01078ff0: 0x1078ff0: lw    v0, 4(v0)
+	ldloc 5
+	ldloc 6
 	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 9
-// 0x01079248: 0x1079248: sll   zero, zero, 0
-L_107924c:
-// 0x0107924c: 0x107924c: bne   s1, zero, 0x107925c sll   zero, zero, 0
-	ldloc 9
-	brtrue L_107925c
-// --- basic block ---
-// 0x01079254: 0x1079254: lui   s1, 0x10000
-	ldc.i4 65536
-	stloc 9
-// 0x01079258: 0x1079258: addiu s1, s1, 18500
-	ldloc 9
-	ldc.i4 18500
+	stloc 6
+// 0x01078ff4: 0x1078ff4: sw    v1, 28(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc 9
-L_107925c:
-// 0x0107925c: 0x107925c: jal   0x10787f4 sll   zero, zero, 0
+	ldloc 7
+	stelem.i4
+// 0x01078ff8: 0x1078ff8: sw    v0, 32(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 6
+	stelem.i4
+L_1078ffc:
+// 0x01078ffc: 0x1078ffc: jal   0x1008ec0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_ShowProgressDlg_10787f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01079264: 0x1079264: jal   0x1000910 addiu a0, zero, 16
-	ldc.i4.s 16
+// 0x01079004: 0x1079004: lw    v1, 0(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x01079008: 0x1079008: sll   zero, zero, 0
+// 0x0107900c: 0x107900c: sw    v0, 1264(v1)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 316
+	add
+	ldloc 6
+	stelem.i4
+L_1079010:
+// 0x01079010: 0x1079010: addiu s3, s3, 1
+	ldloc 11
+	ldc.i4.1
+	add
+	stloc 11
+// 0x01079014: 0x1079014: addiu s0, s0, 4
+	ldloc 8
+	ldc.i4.4
+	add
+	stloc 8
+L_1079018:
+// 0x01079018: 0x1079018: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107901c: 0x107901c: addiu v1, v1, -15564
+	ldloc 7
+	ldc.i4 -15564
+	add
+	stloc 7
+// 0x01079020: 0x1079020: lw    v0, 2000(v1)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc 6
+// 0x01079024: 0x1079024: addu  a1, s7, zero
+	ldloc 15
+	stloc.2
+// 0x01079028: 0x1079028: slt   v0, s3, v0
+	ldloc 11
+	ldloc 6
+	clt
+	stloc 6
+// 0x0107902c: 0x107902c: addu  a2, s6, zero
+	ldloc 14
+	stloc.3
+// 0x01079030: 0x1079030: bne   v0, zero, 0x1078f54 addu  a0, s8, zero
+	ldloc 6
+	ldloc 16
+	stloc.1
+	brtrue L_1078f54
+// --- basic block ---
+// 0x01079038: 0x1079038: bne   s4, zero, 0x1079048 lui   a0, 0x1080000
+	ldloc 12
+	ldc.i4 17301504
 	stloc.1
-	ldloc.0
+	brtrue L_1079048
+// --- basic block ---
+// 0x01079040: 0x1079040: j	 0x1079050 addiu a0, a0, -32552
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
+	ldc.i4 -32552
+	add
+	stloc.1
+	br L_1079050
 // --- basic block ---
-// 0x0107926c: 0x107926c: addu  a0, s1, zero
-	ldloc 9
+L_1079048:
+// 0x01079048: 0x1079048: lui   a0, 0x1080000
+	ldc.i4 17301504
 	stloc.1
-// 0x01079270: 0x1079270: jal   0x1001ba8 addu  s2, v0, zero
-	ldloc 6
-	stloc 8
+// 0x0107904c: 0x107904c: addiu a0, a0, -32508
+	ldloc.1
+	ldc.i4 -32508
+	add
+	stloc.1
+L_1079050:
+// 0x01079050: 0x1079050: jal   0x1078264 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::j2me_sort_alerts_1078264(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01079278: 0x1079278: lw    a1, 4(s0)
+// 0x01079058: 0x1079058: lw    ra, 116(sp)
+// 0x0107905c: 0x107905c: lw    s8, 112(sp)
 	ldloc 5
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 28
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107927c: 0x107927c: lw    v1, 0(s0)
+	stloc 16
+// 0x01079060: 0x1079060: lw    s7, 108(sp)
 	ldloc 5
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 27
+	add
 	ldelem.i4
-	stloc 7
-// 0x01079280: 0x1079280: lw    a0, 12(s0)
+	stloc 15
+// 0x01079064: 0x1079064: lw    s6, 104(sp)
 	ldloc 5
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 26
 	add
 	ldelem.i4
-	stloc.1
-// 0x01079284: 0x1079284: sw    a1, 8(s2)
+	stloc 14
+// 0x01079068: 0x1079068: lw    s5, 100(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.s 25
 	add
-	ldloc.2
-	stelem.i4
-// 0x01079288: 0x1079288: sw    v0, 4(s2)
+	ldelem.i4
+	stloc 13
+// 0x0107906c: 0x107906c: lw    s4, 96(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 24
 	add
-	ldloc 6
-	stelem.i4
-// 0x0107928c: 0x107928c: beq   a0, zero, 0x10792a4 sw    v1, 0(s2)
-	ldloc.1
+	ldelem.i4
+	stloc 12
+// 0x01079070: 0x1079070: lw    s3, 92(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldloc 7
-	stelem.i4
-	brfalse L_10792a4
-// --- basic block ---
-// 0x01079294: 0x1079294: jal   0x1001ba8 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0107929c: 0x107929c: j	 0x10792a8 sw    v0, 12(s2)
+	ldc.i4.s 23
+	add
+	ldelem.i4
+	stloc 11
+// 0x01079074: 0x1079074: lw    s2, 88(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 22
 	add
-	ldloc 6
-	stelem.i4
-	br L_10792a8
-// --- basic block ---
-L_10792a4:
-// 0x010792a4: 0x10792a4: sw    zero, 12(s2)
+	ldelem.i4
+	stloc 10
+// 0x01079078: 0x1079078: lw    s1, 84(sp)
 	ldloc 5
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.s 21
 	add
-	ldc.i4.s 0
-	stelem.i4
-L_10792a8:
-// 0x010792a8: 0x10792a8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x010792ac: 0x10792ac: addu  a0, s2, zero
-	ldloc 8
-	stloc.1
-// 0x010792b0: 0x10792b0: jal   0x1079080 sw    zero, -13996(v0)
+	ldelem.i4
+	stloc 9
+// 0x0107907c: 0x107907c: lw    s0, 80(sp)
 	ldloc 5
-	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3499
+	ldc.i4.s 20
 	add
-	ldc.i4.s 0
-	stelem.i4
+	ldelem.i4
+	stloc 8
+// 0x01079080: 0x1079080: jr    ra addiu sp, sp, 120
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl90::continue_report_after_image_upload_1079080(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4.s 120
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTAlerts_CurrentAlert_Has_Comments_1079088(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
 	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010792b8: 0x10792b8: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-L_10792bc:
-// 0x010792bc: 0x10792bc: lw    ra, 36(sp)
-// 0x010792c0: 0x10792c0: lw    s3, 32(sp)
+// 0x01079088: 0x1079088: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107908c: 0x107908c: addiu v0, v0, -15564
 	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x01079090: 0x1079090: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x01079094: 0x1079094: addiu sp, sp, -24
 	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01079098: 0x1079098: lw    a2, -13540(v1)
+	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 -3385
 	add
 	ldelem.i4
-	stloc 11
-// 0x010792c4: 0x10792c4: lw    s2, 28(sp)
+	stloc.3
+// 0x0107909c: 0x107909c: lw    a1, 2000(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 8
-// 0x010792c8: 0x10792c8: lw    s1, 24(sp)
+	stloc.2
+// 0x010790a0: 0x10790a0: addu  v1, v0, zero
 	ldloc 5
-	ldloc.0
+	stloc 6
+// 0x010790a4: 0x10790a4: sw    ra, 20(sp)
+// 0x010790a8: 0x10790a8: j	 0x10790e0 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_10790e0
+// --- basic block ---
+L_10790b0:
+// 0x010790b0: 0x10790b0: lw    a0, 0(v1)
+	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
 	ldelem.i4
-	stloc 9
-// 0x010792cc: 0x10792cc: lw    s0, 20(sp)
+	stloc.1
+// 0x010790b4: 0x10790b4: addiu v0, v0, 1
 	ldloc 5
-	ldloc.0
+	ldc.i4.1
+	add
+	stloc 5
+// 0x010790b8: 0x10790b8: lw    a3, 0(a0)
+	ldloc 7
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldelem.i4
+	stloc 4
+// 0x010790bc: 0x10790bc: sll   zero, zero, 0
+// 0x010790c0: 0x10790c0: bne   a3, a2, 0x10790e0 addiu v1, v1, 4
+	ldloc 4
+	ldloc.3
+	ldloc 6
+	ldc.i4.4
+	add
+	stloc 6
+	bne.un L_10790e0
+// --- basic block ---
+// 0x010790c8: 0x10790c8: lw    v0, 1276(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 319
 	add
 	ldelem.i4
-	stloc 10
-// 0x010792d0: 0x10792d0: jr    ra addiu sp, sp, 40
+	stloc 5
+// 0x010790cc: 0x10790cc: sll   zero, zero, 0
+// 0x010790d0: 0x10790d0: bne   v0, zero, 0x10790f4 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_10790f4
+// --- basic block ---
+// 0x010790d8: 0x10790d8: j	 0x1079104 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_1079104
+// --- basic block ---
+L_10790e0:
+// 0x010790e0: 0x10790e0: slt   a0, v0, a1
+	ldloc 5
+	ldloc.2
+	clt
+	stloc.1
+// 0x010790e4: 0x10790e4: bne   a0, zero, 0x10790b0 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_10790b0
+// --- basic block ---
+// 0x010790ec: 0x10790ec: j	 0x1079104 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_1079104
+// --- basic block ---
+L_10790f4:
+// 0x010790f4: 0x10790f4: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
+	stloc 5
+// --- basic block ---
+// 0x010790fc: 0x10790fc: sltu  v0, zero, v0
+	ldc.i4.s 0
+	ldloc 5
+	clt.un
+	stloc 5
+// 0x01079100: 0x1079100: addiu v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+L_1079104:
+// 0x01079104: 0x1079104: lw    ra, 20(sp)
+// 0x01079108: 0x1079108: sll   zero, zero, 0
+// 0x0107910c: 0x107910c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
 }
diff --git a/converted/Cibyl91.j b/converted/Cibyl91.j
index e07b5c4..96d396b 100644
--- a/converted/Cibyl91.j
+++ b/converted/Cibyl91.j
@@ -41,27 +41,25 @@
     IL_0006:  ret
   } // end of method Cibyl91::.ctor
 
-.method public static int32 alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_is_reply_popup_on_1079114(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
-// local  9 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
-// local  8 is register s1
 // local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -70,204 +68,93 @@
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010792d8: 0x10792d8: addiu sp, sp, -40
+// 0x01079114: 0x1079114: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010792dc: 0x10792dc: sw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 8
-	stelem.i4
-// 0x010792e0: 0x10792e0: addu  s1, a0, zero
-	ldloc.1
-	stloc 8
-// 0x010792e4: 0x10792e4: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x010792e8: 0x10792e8: addiu a0, a0, -23972
-	ldloc.1
-	ldc.i4 -23972
-	add
-	stloc.1
-// 0x010792ec: 0x10792ec: sw    s0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 7
-	stelem.i4
-// 0x010792f0: 0x10792f0: sw    ra, 36(sp)
-// 0x010792f4: 0x10792f4: jal   0x101df24 addu  s0, a1, zero
-	ldloc.2
-	stloc 7
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+// 0x01079118: 0x1079118: sw    ra, 20(sp)
+// 0x0107911c: 0x107911c: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x010792fc: 0x10792fc: bne   v0, zero, 0x1079320 lui   a2, 0x0
+// 0x01079124: 0x1079124: beq   v0, zero, 0x1079148 addu  v1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
-	stloc.3
-	brtrue L_1079320
+	stloc 6
+	brfalse L_1079148
 // --- basic block ---
-// 0x01079304: 0x1079304: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x01079308: 0x1079308: lui   a1, 0x20000
+// 0x0107912c: 0x107912c: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01079134: 0x1079134: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107930c: 0x107930c: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
+// 0x01079138: 0x1079138: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x01079310: 0x1079310: jal   0x104c148 addiu a1, a1, -30736
+// 0x0107913c: 0x107913c: jal   0x1001b14 addiu a1, a1, -26300
 	ldloc.2
-	ldc.i4 -30736
+	ldc.i4 -26300
 	add
 	stloc.2
-	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01079318: 0x1079318: j	 0x1079344 sll   zero, zero, 0
-	br L_1079344
-// --- basic block ---
-L_1079320:
-// 0x01079320: 0x1079320: lui   v0, 0x90000
-	ldc.i4 589824
-	stloc 5
-// 0x01079324: 0x1079324: ori   v0, v0, 16
+// 0x01079144: 0x1079144: sltiu v1, v0, 1
 	ldloc 5
-	ldc.i4.s 16
-	or
-	stloc 5
-// 0x01079328: 0x1079328: addu  a0, s1, zero
-	ldloc 8
-	stloc.1
-// 0x0107932c: 0x107932c: addiu a2, a2, 15924
-	ldloc.3
-	ldc.i4 15924
-	add
-	stloc.3
-// 0x01079330: 0x1079330: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01079334: 0x1079334: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x01079338: 0x1079338: sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 7
-	stelem.i4
-// 0x0107933c: 0x107933c: jal   0x1096e4c sw    v0, 20(sp)
+	ldc.i4.1
+	clt.un
+	stloc 6
+L_1079148:
+// 0x01079148: 0x1079148: lw    ra, 20(sp)
+// 0x0107914c: 0x107914c: addu  v0, v1, zero
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl112::ssd_list_menu_activate_1096e4c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 5
-// --- basic block ---
-L_1079344:
-// 0x01079344: 0x1079344: lw    ra, 36(sp)
-// 0x01079348: 0x1079348: lw    s1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107934c: 0x107934c: lw    s0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 7
-// 0x01079350: 0x1079350: jr    ra addiu sp, sp, 40
+// 0x01079150: 0x1079150: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 add_real_time_alert_for_construction_1079358(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_ScrollState_1079158(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
 // local  7 is register ra
-// local  6 is register mem
+// local  8 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -276,123 +163,97 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1079358:
-// 0x01079358: 0x1079358: addiu sp, sp, -72
+// 0x01079158: 0x1079158: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -72
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107935c: 0x107935c: sw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
+// 0x0107915c: 0x107915c: sw    ra, 20(sp)
+// 0x01079160: 0x1079160: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
+	stloc 5
+// --- basic block ---
+// 0x01079168: 0x1079168: beq   v0, zero, 0x1079194 addiu v1, zero, -1
 	ldloc 5
-	stelem.i4
-// 0x01079360: 0x1079360: lui   a1, 0x20000
+	ldc.i4.m1
+	stloc 6
+	brfalse L_1079194
+// --- basic block ---
+// 0x01079170: 0x1079170: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01079178: 0x1079178: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01079364: 0x1079364: addiu s0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 5
-// 0x01079368: 0x1079368: addu  a0, s0, zero
+// 0x0107917c: 0x107917c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107936c: 0x107936c: addiu a1, a1, 28888
+// 0x01079180: 0x1079180: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 28888
+	ldc.i4 -26284
 	add
 	stloc.2
-// 0x01079370: 0x1079370: sw    ra, 68(sp)
-// 0x01079374: 0x1079374: jal   0x1001800 addiu a2, zero, 48
-	ldc.i4.s 48
-	stloc.3
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
 // --- basic block ---
-// 0x0107937c: 0x107937c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079380: 0x1079380: addu  a1, s0, zero
+// 0x01079188: 0x1079188: beq   v0, zero, 0x1079194 addu  v1, zero, zero
 	ldloc 5
-	stloc.2
-// 0x01079384: 0x1079384: jal   0x10792d8 addiu a0, a0, -26648
-	ldloc.1
-	ldc.i4 -26648
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl91::alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	ldc.i4.s 0
+	stloc 6
+	brfalse L_1079194
 // --- basic block ---
-// 0x0107938c: 0x107938c: lw    ra, 68(sp)
-// 0x01079390: 0x1079390: lw    s0, 64(sp)
+// 0x01079190: 0x1079190: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+L_1079194:
+// 0x01079194: 0x1079194: lw    ra, 20(sp)
+// 0x01079198: 0x1079198: addu  v0, v1, zero
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
 	stloc 5
-// 0x01079394: 0x1079394: jr    ra addiu sp, sp, 72
+// 0x0107919c: 0x107919c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 5
 	ret
 }
-.method public static int32 add_real_time_alert_for_other_107939c(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_CurrentComments_10791a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
+// local  6 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -401,123 +262,77 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_107939c:
-// 0x0107939c: 0x107939c: addiu sp, sp, -72
-	ldloc.0
-	ldc.i4.s -72
-	add
-	stloc.0
-// 0x010793a0: 0x10793a0: sw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
+L_10791a4:
+// 0x010791a4: 0x10791a4: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010791a8: 0x10791a8: lw    a0, -13540(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4 -3385
 	add
-	ldloc 5
-	stelem.i4
-// 0x010793a4: 0x10793a4: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010793a8: 0x10793a8: addiu s0, sp, 16
+	ldelem.i4
+	stloc.1
+// 0x010791ac: 0x10791ac: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.s -24
 	add
-	stloc 5
-// 0x010793ac: 0x10793ac: addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-// 0x010793b0: 0x10793b0: addiu a1, a1, 28936
-	ldloc.2
-	ldc.i4 28936
-	add
-	stloc.2
-// 0x010793b4: 0x10793b4: sw    ra, 68(sp)
-// 0x010793b8: 0x10793b8: jal   0x1001800 addiu a2, zero, 48
-	ldc.i4.s 48
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x010793c0: 0x10793c0: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010793c4: 0x10793c4: addu  a1, s0, zero
-	ldloc 5
-	stloc.2
-// 0x010793c8: 0x10793c8: jal   0x10792d8 addiu a0, a0, -26620
-	ldloc.1
-	ldc.i4 -26620
-	add
-	stloc.1
+	stloc.0
+// 0x010791b0: 0x10791b0: sw    ra, 20(sp)
+// 0x010791b4: 0x10791b4: jal   0x1084dfc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeAlertCommentsList_1084dfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 8
-// --- basic block ---
-// 0x010793d0: 0x10793d0: lw    ra, 68(sp)
-// 0x010793d4: 0x10793d4: lw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
 	stloc 5
-// 0x010793d8: 0x10793d8: jr    ra addiu sp, sp, 72
+// --- basic block ---
+// 0x010791bc: 0x10791bc: lw    ra, 20(sp)
+// 0x010791c0: 0x10791c0: sll   zero, zero, 0
+// 0x010791c4: 0x10791c4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
-.method public static int32 add_real_time_alert_for_parking_10793e0(int32,int32,int32,int32,int32)
+.method public static int32 on_view_comments_10791cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  6 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
+// local  5 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 6
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -526,123 +341,66 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10793e0:
-// 0x010793e0: 0x10793e0: addiu sp, sp, -72
+// 0x010791cc: 0x10791cc: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -72
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010793e4: 0x10793e4: sw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldloc 5
-	stelem.i4
-// 0x010793e8: 0x10793e8: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010793ec: 0x10793ec: addiu s0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 5
-// 0x010793f0: 0x10793f0: addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-// 0x010793f4: 0x10793f4: addiu a1, a1, 28984
-	ldloc.2
-	ldc.i4 28984
-	add
-	stloc.2
-// 0x010793f8: 0x10793f8: sw    ra, 68(sp)
-// 0x010793fc: 0x10793fc: jal   0x1001800 addiu a2, zero, 48
-	ldc.i4.s 48
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x01079404: 0x1079404: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079408: 0x1079408: addu  a1, s0, zero
-	ldloc 5
-	stloc.2
-// 0x0107940c: 0x107940c: jal   0x10792d8 addiu a0, a0, -26596
-	ldloc.1
-	ldc.i4 -26596
-	add
-	stloc.1
+// 0x010791d0: 0x10791d0: sw    ra, 20(sp)
+// 0x010791d4: 0x10791d4: jal   0x10791a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_CurrentComments_10791a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x01079414: 0x1079414: lw    ra, 68(sp)
-// 0x01079418: 0x1079418: lw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107941c: 0x107941c: jr    ra addiu sp, sp, 72
+// 0x010791dc: 0x10791dc: lw    ra, 20(sp)
+// 0x010791e0: 0x10791e0: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+// 0x010791e4: 0x10791e4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
 	ret
 }
-.method public static int32 add_real_time_alert_for_hazard_1079424(int32,int32,int32,int32,int32)
+.method public static int32 real_time_remove_alert_10792e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  7 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
-// local  7 is register ra
+// local  5 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldc.i4.s 0
-	stloc 9
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -651,123 +409,65 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1079424:
-// 0x01079424: 0x1079424: addiu sp, sp, -72
+// 0x010792e0: 0x10792e0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -72
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01079428: 0x1079428: sw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107942c: 0x107942c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01079430: 0x1079430: addiu s0, sp, 16
-	ldloc.0
-	ldc.i4.s 16
-	add
-	stloc 5
-// 0x01079434: 0x1079434: addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-// 0x01079438: 0x1079438: addiu a1, a1, 29032
-	ldloc.2
-	ldc.i4 29032
-	add
-	stloc.2
-// 0x0107943c: 0x107943c: sw    ra, 68(sp)
-// 0x01079440: 0x1079440: jal   0x1001800 addiu a2, zero, 48
-	ldc.i4.s 48
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x01079448: 0x1079448: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107944c: 0x107944c: addu  a1, s0, zero
-	ldloc 5
-	stloc.2
-// 0x01079450: 0x1079450: jal   0x10792d8 addiu a0, a0, -26572
-	ldloc.1
-	ldc.i4 -26572
-	add
-	stloc.1
+// 0x010792e4: 0x10792e4: sw    ra, 20(sp)
+// 0x010792e8: 0x10792e8: jal   0x106ccc0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_Remove_Alert_106ccc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
 	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x01079458: 0x1079458: lw    ra, 68(sp)
-// 0x0107945c: 0x107945c: lw    s0, 64(sp)
-	ldloc 6
+// 0x010792f0: 0x10792f0: lw    ra, 20(sp)
+// 0x010792f4: 0x10792f4: sll   zero, zero, 0
+// 0x010792f8: 0x10792f8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
-	stloc 5
-// 0x01079460: 0x1079460: jr    ra addiu sp, sp, 72
-	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
 	ret
 }
-.method public static int32 add_real_time_alert_for_traffic_jam_1079468(int32,int32,int32,int32,int32)
+.method public static int32 real_time_post_alert_comment_by_id_1079300(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
+// local  8 is register s0
 // local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
+// local  9 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -777,68 +477,137 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1079468:
-// 0x01079468: 0x1079468: addiu sp, sp, -72
+// 0x01079300: 0x1079300: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01079304: 0x1079304: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x01079308: 0x1079308: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -72
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0107946c: 0x107946c: sw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
+// 0x0107930c: 0x107930c: addu  v1, v0, zero
+	ldloc 5
+	stloc 6
+// 0x01079310: 0x1079310: lw    a1, 2000(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4 500
 	add
-	ldloc 5
-	stelem.i4
-// 0x01079470: 0x1079470: lui   a1, 0x20000
-	ldc.i4 131072
+	ldelem.i4
 	stloc.2
-// 0x01079474: 0x1079474: addiu s0, sp, 16
+// 0x01079314: 0x1079314: sw    ra, 28(sp)
+// 0x01079318: 0x1079318: sw    s0, 24(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
+	ldloc 8
+	stelem.i4
+// 0x0107931c: 0x107931c: j	 0x1079354 addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-// 0x01079478: 0x1079478: addu  a0, s0, zero
+	br L_1079354
+// --- basic block ---
+L_1079324:
+// 0x01079324: 0x1079324: lw    s0, 0(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 8
+// 0x01079328: 0x1079328: addiu v0, v0, 1
 	ldloc 5
-	stloc.1
-// 0x0107947c: 0x107947c: addiu a1, a1, 29080
-	ldloc.2
-	ldc.i4 29080
+	ldc.i4.1
 	add
-	stloc.2
-// 0x01079480: 0x1079480: sw    ra, 68(sp)
-// 0x01079484: 0x1079484: jal   0x1001800 addiu a2, zero, 48
-	ldc.i4.s 48
+	stloc 5
+// 0x0107932c: 0x107932c: lw    a2, 0(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.3
+// 0x01079330: 0x1079330: sll   zero, zero, 0
+// 0x01079334: 0x1079334: bne   a2, a0, 0x1079354 addiu v1, v1, 4
+	ldloc.3
+	ldloc.1
+	ldloc 6
+	ldc.i4.4
+	add
+	stloc 6
+	bne.un L_1079354
+// --- basic block ---
+// 0x0107933c: 0x107933c: jal   0x106b6b0 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_RandomUserMsg_106b6b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x01079344: 0x1079344: bne   v0, zero, 0x10793a8 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_10793a8
+// --- basic block ---
+// 0x0107934c: 0x107934c: j	 0x1079368 sll   zero, zero, 0
+	br L_1079368
+// --- basic block ---
+L_1079354:
+// 0x01079354: 0x1079354: slt   a2, v0, a1
+	ldloc 5
+	ldloc.2
+	clt
+	stloc.3
+// 0x01079358: 0x1079358: bne   a2, zero, 0x1079324 sll   zero, zero, 0
+	ldloc.3
+	brtrue L_1079324
+// --- basic block ---
+// 0x01079360: 0x1079360: j	 0x10793a8 sll   zero, zero, 0
+	br L_10793a8
+// --- basic block ---
+L_1079368:
+// 0x01079368: 0x1079368: jal   0x106b1c0 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_AnonymousMsg_106b1c0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107948c: 0x107948c: lui   a0, 0x20000
+// 0x01079370: 0x1079370: bne   v0, zero, 0x10793a8 lui   a0, 0x20000
+	ldloc 5
 	ldc.i4 131072
 	stloc.1
-// 0x01079490: 0x1079490: addu  a1, s0, zero
-	ldloc 5
-	stloc.2
-// 0x01079494: 0x1079494: jal   0x10792d8 addiu a0, a0, -26548
+	brtrue L_10793a8
+// --- basic block ---
+// 0x01079378: 0x1079378: jal   0x101cd70 addiu a0, a0, -28828
 	ldloc.1
-	ldc.i4 -26548
+	ldc.i4 -28828
 	add
 	stloc.1
 	ldloc.0
@@ -846,53 +615,102 @@ L_1079468:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107949c: 0x107949c: lw    ra, 68(sp)
-// 0x010794a0: 0x10794a0: lw    s0, 64(sp)
-	ldloc 6
+// 0x01079380: 0x1079380: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01079384: 0x1079384: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x01079388: 0x1079388: lui   a2, 0x1080000
+	ldc.i4 17301504
+	stloc.3
+// 0x0107938c: 0x107938c: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x01079390: 0x1079390: ori   v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	or
+	stloc 5
+// 0x01079394: 0x1079394: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x01079398: 0x1079398: addiu a2, a2, -24372
+	ldloc.3
+	ldc.i4 -24372
+	add
+	stloc.3
+// 0x0107939c: 0x107939c: addu  a3, s0, zero
+	ldloc 8
+	stloc 4
+// 0x010793a0: 0x10793a0: jal   0x1052e18 sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4.4
 	add
-	ldelem.i4
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl61::ShowEditbox_1052e18(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x010794a4: 0x10794a4: jr    ra addiu sp, sp, 72
+// --- basic block ---
+L_10793a8:
+// 0x010793a8: 0x10793a8: lw    ra, 28(sp)
+// 0x010793ac: 0x10793ac: lw    s0, 24(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x010793b0: 0x10793b0: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 5
 	ret
 }
-.method public static int32 add_real_time_alert_for_accident_10794ac(int32,int32,int32,int32,int32)
+.method public static int32 real_time_post_alert_comment_10793b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
-// local  7 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -901,123 +719,91 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10794ac:
-// 0x010794ac: 0x10794ac: addiu sp, sp, -72
-	ldloc.0
-	ldc.i4.s -72
-	add
-	stloc.0
-// 0x010794b0: 0x10794b0: sw    s0, 64(sp)
+L_10793b8:
+// 0x010793b8: 0x10793b8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010793bc: 0x10793bc: lw    a0, -13540(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4 -3385
 	add
-	ldloc 5
-	stelem.i4
-// 0x010794b4: 0x10794b4: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010794b8: 0x10794b8: addiu s0, sp, 16
+	ldelem.i4
+	stloc.1
+// 0x010793c0: 0x10793c0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x010793c4: 0x10793c4: addiu v1, zero, 2
+	ldc.i4.2
+	stloc 7
+// 0x010793c8: 0x10793c8: lui   v0, 0x0
+	ldc.i4.s 0
 	stloc 5
-// 0x010794bc: 0x10794bc: addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-// 0x010794c0: 0x10794c0: addiu a1, a1, 29128
-	ldloc.2
-	ldc.i4 29128
-	add
-	stloc.2
-// 0x010794c4: 0x10794c4: sw    ra, 68(sp)
-// 0x010794c8: 0x10794c8: jal   0x1001800 addiu a2, zero, 48
-	ldc.i4.s 48
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x010794d0: 0x10794d0: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010794d4: 0x10794d4: addu  a1, s0, zero
+// 0x010793cc: 0x10793cc: sw    ra, 20(sp)
+// 0x010793d0: 0x10793d0: jal   0x1079300 sw    v1, 15880(v0)
+	ldloc 6
 	ldloc 5
-	stloc.2
-// 0x010794d8: 0x10794d8: jal   0x10792d8 addiu a0, a0, -26528
-	ldloc.1
-	ldc.i4 -26528
+	ldc.i4.2
+	shr.un
+	ldc.i4 3970
 	add
-	stloc.1
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::real_time_post_alert_comment_by_id_1079300(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x010794e0: 0x10794e0: lw    ra, 68(sp)
-// 0x010794e4: 0x10794e4: lw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
+	stloc 7
 	stloc 5
-// 0x010794e8: 0x10794e8: jr    ra addiu sp, sp, 72
+// --- basic block ---
+// 0x010793d8: 0x10793d8: lw    ra, 20(sp)
+// 0x010793dc: 0x10793dc: sll   zero, zero, 0
+// 0x010793e0: 0x10793e0: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 5
 	ret
 }
-.method public static int32 add_real_time_alert_for_police_10794f0(int32,int32,int32,int32,int32)
+.method public static int32 on_add_comment_10793e8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
 
-// local  8 is register v0
-// local  9 is register v1
+// local  5 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  5 is register s0
 // local  0 is register sp
-// local  7 is register ra
+// local  8 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 8
+	stloc 5
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1026,107 +812,77 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10794f0:
-// 0x010794f0: 0x10794f0: addiu sp, sp, -72
-	ldloc.0
-	ldc.i4.s -72
-	add
-	stloc.0
-// 0x010794f4: 0x10794f4: sw    s0, 64(sp)
+// 0x010793e8: 0x10793e8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x010793ec: 0x10793ec: lw    a0, -13540(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 16
+	ldc.i4 -3385
 	add
-	ldloc 5
-	stelem.i4
-// 0x010794f8: 0x10794f8: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x010794fc: 0x10794fc: addiu s0, sp, 16
+	ldelem.i4
+	stloc.1
+// 0x010793f0: 0x10793f0: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 16
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x010793f4: 0x10793f4: lui   v0, 0x0
+	ldc.i4.s 0
 	stloc 5
-// 0x01079500: 0x1079500: addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-// 0x01079504: 0x1079504: addiu a1, a1, 29176
-	ldloc.2
-	ldc.i4 29176
-	add
-	stloc.2
-// 0x01079508: 0x1079508: sw    ra, 68(sp)
-// 0x0107950c: 0x107950c: jal   0x1001800 addiu a2, zero, 48
-	ldc.i4.s 48
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x01079514: 0x1079514: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079518: 0x1079518: addu  a1, s0, zero
+// 0x010793f8: 0x10793f8: addiu v1, zero, 2
+	ldc.i4.2
+	stloc 7
+// 0x010793fc: 0x10793fc: sw    ra, 20(sp)
+// 0x01079400: 0x1079400: jal   0x1079300 sw    v1, 15880(v0)
+	ldloc 6
 	ldloc 5
-	stloc.2
-// 0x0107951c: 0x107951c: jal   0x10792d8 addiu a0, a0, -26504
-	ldloc.1
-	ldc.i4 -26504
+	ldc.i4.2
+	shr.un
+	ldc.i4 3970
 	add
-	stloc.1
+	ldloc 7
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::alerts_direction_menu_10792d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::real_time_post_alert_comment_by_id_1079300(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x01079524: 0x1079524: lw    ra, 68(sp)
-// 0x01079528: 0x1079528: lw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
-	add
-	ldelem.i4
+// 0x01079408: 0x1079408: lw    ra, 20(sp)
+// 0x0107940c: 0x107940c: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-// 0x0107952c: 0x107952c: jr    ra addiu sp, sp, 72
+// 0x01079410: 0x1079410: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 72
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_get_report_info_str_1079534(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Comment_PopUp_Hide_1079418(int32,int32,int32,int32,int32)
 {
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s0,int32 s2,int32 s1,int32 ra,int32 lo)
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
 
 // local  5 is register v0
 // local  6 is register v1
@@ -1134,14 +890,9 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local 11 is register s1
-// local 10 is register s2
-// local  8 is register s3
 // local  0 is register sp
-// local 12 is register ra
-// local 13 is register lo
-// local  7 is register mem
+// local  7 is register ra
+// local  8 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -1155,459 +906,218 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079534: 0x1079534: addiu sp, sp, -40
+// 0x01079418: 0x1079418: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01079538: 0x1079538: sw    s3, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107953c: 0x107953c: sw    s1, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 11
-	stelem.i4
-// 0x01079540: 0x1079540: sw    s0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 9
-	stelem.i4
-// 0x01079544: 0x1079544: sw    ra, 36(sp)
-// 0x01079548: 0x1079548: sw    s2, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 10
-	stelem.i4
-// 0x0107954c: 0x107954c: addu  s3, a0, zero
-	ldloc.1
-	stloc 8
-// 0x01079550: 0x1079550: addu  s0, a1, zero
-	ldloc.2
-	stloc 9
-// 0x01079554: 0x1079554: addu  s1, a2, zero
-	ldloc.3
-	stloc 11
-// 0x01079558: 0x1079558: addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x0107955c: 0x107955c: cibyl_sysc_arg 0x4
-	ldloc.1
-// 0x01079560: 0x1079560: cibyl_sysc 0x212a
-	call int32 [WazeWP7]Syscalls::time(int32)
-	stloc 5
-// 0x01079564: 0x1079564: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01079568: 0x1079568: lw    v0, 144(s3)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 36
-	add
-	ldelem.i4
+// 0x0107941c: 0x107941c: sw    ra, 20(sp)
+// 0x01079420: 0x1079420: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
-// 0x0107956c: 0x107956c: jal   0x10c09c0 subu  a0, a0, v0
-	ldloc.1
+// --- basic block ---
+// 0x01079428: 0x1079428: beq   v0, zero, 0x1079458 sll   zero, zero, 0
 	ldloc 5
-	sub
-	stloc.1
-	ldloc.0
-	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	brfalse L_1079458
+// --- basic block ---
+// 0x01079430: 0x1079430: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079574: 0x1079574: addu  a1, v1, zero
-	ldloc 6
+// 0x01079438: 0x1079438: lui   a1, 0x20000
+	ldc.i4 131072
 	stloc.2
-// 0x01079578: 0x1079578: jal   0x10c08d0 addu  a0, v0, zero
+// 0x0107943c: 0x107943c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-	ldloc.0
-	ldloc.1
+// 0x01079440: 0x1079440: jal   0x1001b14 addiu a1, a1, -26300
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079580: 0x1079580: addu  s2, v0, zero
-	ldloc 5
-	stloc 10
-// 0x01079584: 0x1079584: sb    zero, 0(s0)
-	ldloc 9
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01079588: 0x1079588: nor   v0, zero, v0
-	ldloc 5
-	ldc.i4.m1
-	xor
-	stloc 5
-// 0x0107958c: 0x107958c: sra   v0, v0, 31
-	ldloc 5
-	ldc.i4.s 31
-	shr
-	stloc 5
-// 0x01079590: 0x1079590: lw    v1, 4(s3)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 6
-// 0x01079594: 0x1079594: and   s2, s2, v0
-	ldloc 10
-	ldloc 5
-	and
-	stloc 10
-// 0x01079598: 0x1079598: addiu v0, zero, 4
-	ldc.i4.4
-	stloc 5
-// 0x0107959c: 0x107959c: bne   v1, v0, 0x10795ac lui   a0, 0x20000
-	ldloc 6
-	ldloc 5
-	ldc.i4 131072
-	stloc.1
-	bne.un L_10795ac
-// --- basic block ---
-// 0x010795a4: 0x10795a4: j	 0x10795b4 addiu a0, a0, -26480
-	ldloc.1
-	ldc.i4 -26480
-	add
-	stloc.1
-	br L_10795b4
-// --- basic block ---
-L_10795ac:
-// 0x010795ac: 0x10795ac: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x010795b0: 0x10795b0: addiu a0, a0, 18500
-	ldloc.1
-	ldc.i4 18500
+	ldc.i4 -26300
 	add
-	stloc.1
-L_10795b4:
-// 0x010795b4: 0x10795b4: jal   0x101cd60 sll   zero, zero, 0
-	ldloc.0
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010795bc: 0x10795bc: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x010795c0: 0x10795c0: addiu a2, a2, 19912
-	ldloc.3
-	ldc.i4 19912
-	add
-	stloc.3
-// 0x010795c4: 0x10795c4: addu  a3, v0, zero
+// 0x01079448: 0x1079448: bne   v0, zero, 0x1079458 sll   zero, zero, 0
 	ldloc 5
-	stloc 4
-// 0x010795c8: 0x10795c8: addu  a0, s0, zero
-	ldloc 9
+	brtrue L_1079458
+// --- basic block ---
+// 0x01079450: 0x1079450: jal   0x10951ac addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x010795cc: 0x10795cc: jal   0x1000f9c addu  a1, s1, zero
-	ldloc 11
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010795d4: 0x10795d4: slti  v0, s2, 60
-	ldloc 10
-	ldc.i4.s 60
-	clt
+L_1079458:
+// 0x01079458: 0x1079458: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
-// 0x010795d8: 0x10795d8: beq   v0, zero, 0x107960c addiu v0, s2, -60
+// --- basic block ---
+// 0x01079460: 0x1079460: beq   v0, zero, 0x1079490 sll   zero, zero, 0
 	ldloc 5
-	ldloc 10
-	ldc.i4.s -60
-	add
-	stloc 5
-	brfalse L_107960c
+	brfalse L_1079490
 // --- basic block ---
-// 0x010795e0: 0x10795e0: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+// 0x01079468: 0x1079468: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010795e8: 0x10795e8: lui   a0, 0x20000
+// 0x01079470: 0x1079470: lui   a1, 0x20000
 	ldc.i4 131072
+	stloc.2
+// 0x01079474: 0x1079474: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x010795ec: 0x10795ec: addiu a0, a0, -26468
-	ldloc.1
-	ldc.i4 -26468
+// 0x01079478: 0x1079478: jal   0x1001b14 addiu a1, a1, -26268
+	ldloc.2
+	ldc.i4 -26268
 	add
-	stloc.1
-// 0x010795f0: 0x10795f0: jal   0x101cd60 addu  s3, v0, zero
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x01079480: 0x1079480: bne   v0, zero, 0x1079490 sll   zero, zero, 0
 	ldloc 5
-	stloc 8
+	brtrue L_1079490
+// --- basic block ---
+// 0x01079488: 0x1079488: jal   0x10951ac addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010795f8: 0x10795f8: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x010795fc: 0x10795fc: subu  a1, s1, s3
-	ldloc 11
-	ldloc 8
-	sub
-	stloc.2
-// 0x01079600: 0x1079600: addu  a0, s0, s3
-	ldloc 9
-	ldloc 8
+L_1079490:
+// 0x01079490: 0x1079490: lw    ra, 20(sp)
+// 0x01079494: 0x1079494: sll   zero, zero, 0
+// 0x01079498: 0x1079498: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc.1
-// 0x01079604: 0x1079604: j	 0x1079668 addu  a3, s2, zero
-	ldloc 10
-	stloc 4
-	br L_1079668
-// --- basic block ---
-L_107960c:
-// 0x0107960c: 0x107960c: sltiu v0, v0, 3540
-	ldloc 5
-	ldc.i4 3540
-	clt.un
-	stloc 5
-// 0x01079610: 0x1079610: beq   v0, zero, 0x1079638 sll   zero, zero, 0
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	brfalse L_1079638
-// --- basic block ---
-// 0x01079618: 0x1079618: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ret
+}
+.method public static int32 Comment_Ignore_sk_cb_10794a0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
+
+// local  6 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079620: 0x1079620: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01079624: 0x1079624: addiu a0, a0, -284
-	ldloc.1
-	ldc.i4 -284
+// 0x010794a0: 0x10794a0: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.1
-// 0x01079628: 0x1079628: jal   0x101cd60 addu  s3, v0, zero
-	ldloc 5
-	stloc 8
+	stloc.0
+// 0x010794a4: 0x10794a4: sw    ra, 20(sp)
+// 0x010794a8: 0x10794a8: jal   0x1079418 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Comment_PopUp_Hide_1079418(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079630: 0x1079630: j	 0x1079654 addiu a3, zero, 60
-	ldc.i4.s 60
-	stloc 4
-	br L_1079654
 // --- basic block ---
-L_1079638:
-// 0x01079638: 0x1079638: jal   0x1001b48 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079640: 0x1079640: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079644: 0x1079644: addiu a0, a0, -26452
-	ldloc.1
-	ldc.i4 -26452
-	add
-	stloc.1
-// 0x01079648: 0x1079648: jal   0x101cd60 addu  s3, v0, zero
-	ldloc 5
-	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079650: 0x1079650: addiu a3, zero, 3600
-	ldc.i4 3600
-	stloc 4
-L_1079654:
-// 0x01079654: 0x1079654: div   s2, a3
-	ldloc 10
-	ldloc 4
-	div
-	stloc 13
-// 0x01079658: 0x1079658: subu  a1, s1, s3
-	ldloc 11
-	ldloc 8
-	sub
-	stloc.2
-// 0x0107965c: 0x107965c: addu  a0, s0, s3
-	ldloc 9
-	ldloc 8
-	add
-	stloc.1
-// 0x01079660: 0x1079660: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x01079664: 0x1079664: mflo  lo
-	ldloc 13
-	stloc 4
-L_1079668:
-// 0x01079668: 0x1079668: jal   0x1000f9c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x010794b0: 0x10794b0: lw    ra, 20(sp)
+// 0x010794b4: 0x10794b4: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079670: 0x1079670: lw    ra, 36(sp)
-// 0x01079674: 0x1079674: lw    s3, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 8
-// 0x01079678: 0x1079678: lw    s2, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 10
-// 0x0107967c: 0x107967c: lw    s1, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 11
-// 0x01079680: 0x1079680: lw    s0, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 9
-// 0x01079684: 0x1079684: jr    ra addiu sp, sp, 40
+// 0x010794b8: 0x10794b8: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 on_button_close_107968c(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Comment_Init_10794c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 ra)
 
 // local  6 is register v0
-// local  8 is register v1
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
 // local  0 is register sp
-// local  5 is register ra
-// local  7 is register mem
+// local  9 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -1616,74 +1126,214 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107968c: 0x107968c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079690: 0x1079690: addiu sp, sp, -24
+// 0x010794c0: 0x10794c0: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x010794c4: 0x10794c4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01079694: 0x1079694: addiu a0, a0, -26748
+// 0x010794c8: 0x10794c8: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 7
+// 0x010794cc: 0x10794cc: sw    v0, 4(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 6
+	stelem.i4
+// 0x010794d0: 0x10794d0: sw    v0, 0(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldloc 6
+	stelem.i4
+// 0x010794d4: 0x10794d4: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 6
+// 0x010794d8: 0x10794d8: sw    v1, 12(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldloc 7
+	stelem.i4
+// 0x010794dc: 0x10794dc: sw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x010794e0: 0x10794e0: sw    v0, 8(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldloc 6
+	stelem.i4
+// 0x010794e4: 0x10794e4: addu  s0, a0, zero
+	ldloc.1
+	stloc 8
+// 0x010794e8: 0x10794e8: sw    zero, 528(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 132
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x010794ec: 0x10794ec: sw    zero, 532(a0)
+	ldloc 5
 	ldloc.1
-	ldc.i4 -26748
+	ldc.i4.2
+	shr.un
+	ldc.i4 133
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x010794f0: 0x10794f0: sw    zero, 520(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 130
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x010794f4: 0x10794f4: sw    zero, 636(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 159
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x010794f8: 0x10794f8: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x010794fc: 0x10794fc: addiu a0, a0, 16
+	ldloc.1
+	ldc.i4.s 16
+	add
+	stloc.1
+// 0x01079500: 0x1079500: sw    ra, 20(sp)
+// 0x01079504: 0x1079504: jal   0x100177c addiu a2, zero, 100
+	ldc.i4.s 100
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0107950c: 0x107950c: addiu a0, s0, 117
+	ldloc 8
+	ldc.i4.s 117
 	add
 	stloc.1
-// 0x01079698: 0x1079698: sw    ra, 20(sp)
-// 0x0107969c: 0x107969c: jal   0x1094884 addu  a1, zero, zero
+// 0x01079510: 0x1079510: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-	ldloc.0
+// 0x01079514: 0x1079514: jal   0x100177c addiu a2, zero, 400
+	ldc.i4 400
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x010796a4: 0x10796a4: lw    ra, 20(sp)
-// 0x010796a8: 0x10796a8: addiu v0, zero, 1
-	ldc.i4.1
+// 0x0107951c: 0x107951c: addiu a0, s0, 536
+	ldloc 8
+	ldc.i4 536
+	add
+	stloc.1
+// 0x01079520: 0x1079520: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01079524: 0x1079524: jal   0x100177c addiu a2, zero, 100
+	ldc.i4.s 100
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-// 0x010796ac: 0x10796ac: jr    ra addiu sp, sp, 24
+// --- basic block ---
+// 0x0107952c: 0x107952c: lw    ra, 20(sp)
+// 0x01079530: 0x1079530: lw    s0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 8
+// 0x01079534: 0x1079534: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
 	ret
 }
-.method public static int32 on_ping_wazer_button_close_10796b4(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Alert_Init_107953c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 v1,int32 s1,int32 ra)
 
-// local  6 is register v0
+// local  7 is register v0
 // local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  6 is register s0
+// local  9 is register s1
 // local  0 is register sp
-// local  5 is register ra
-// local  7 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 6
+	stloc 7
 	ldc.i4.s 0
 	stloc 8
 	ldarg 1
@@ -1694,517 +1344,620 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 6
+	ldc.i4.s 0
+	stloc 9
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010796b4: 0x10796b4: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x010796b8: 0x10796b8: addiu sp, sp, -24
+// 0x0107953c: 0x107953c: addiu sp, sp, -32
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010796bc: 0x10796bc: addiu a0, a0, -26732
-	ldloc.1
-	ldc.i4 -26732
-	add
-	stloc.1
-// 0x010796c0: 0x10796c0: sw    ra, 20(sp)
-// 0x010796c4: 0x10796c4: jal   0x1094884 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+// 0x01079540: 0x1079540: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x010796cc: 0x10796cc: lw    ra, 20(sp)
-// 0x010796d0: 0x10796d0: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x010796d4: 0x10796d4: jr    ra addiu sp, sp, 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 9
+	stelem.i4
+// 0x01079544: 0x1079544: addiu s1, zero, -1
+	ldc.i4.m1
+	stloc 9
+// 0x01079548: 0x1079548: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
-	ret
-}
-.method public static int32 RTAlerts_Clear_All_10796dc(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
-
-// local  6 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
+	stelem.i4
+// 0x0107954c: 0x107954c: sw    s1, 0(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldloc 9
+	stelem.i4
+// 0x01079550: 0x1079550: addu  s0, a0, zero
+	ldloc.1
 	stloc 6
+// 0x01079554: 0x1079554: sw    zero, 16(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
 	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
+	stelem.i4
+// 0x01079558: 0x1079558: sw    zero, 20(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldc.i4.s 0
-	stloc 7
+	stelem.i4
+// 0x0107955c: 0x107955c: sw    zero, 24(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
 	ldc.i4.s 0
-	stloc 9
+	stelem.i4
+// 0x01079560: 0x1079560: sw    zero, 4(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
 	ldc.i4.s 0
-	stloc 10
+	stelem.i4
+// 0x01079564: 0x1079564: sw    zero, 8(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
 	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
+	stelem.i4
+// 0x01079568: 0x1079568: sw    zero, 136(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 34
+	add
 	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x010796dc: 0x10796dc: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
+	stelem.i4
+// 0x0107956c: 0x107956c: sw    zero, 140(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 35
 	add
-	stloc.0
-// 0x010796e0: 0x10796e0: sw    s1, 24(sp)
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079570: 0x1079570: sw    zero, 144(a0)
 	ldloc 5
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 36
 	add
-	ldloc 9
+	ldc.i4.s 0
 	stelem.i4
-// 0x010796e4: 0x10796e4: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x010796e8: 0x10796e8: addiu s1, s1, -16028
-	ldloc 9
-	ldc.i4 -16028
+// 0x01079574: 0x1079574: sw    zero, 148(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 37
 	add
-	stloc 9
-// 0x010796ec: 0x10796ec: sw    s3, 32(sp)
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079578: 0x1079578: sw    zero, 152(a0)
 	ldloc 5
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 38
 	add
-	ldloc 11
+	ldc.i4.s 0
 	stelem.i4
-// 0x010796f0: 0x10796f0: sw    s2, 28(sp)
+// 0x0107957c: 0x107957c: sw    zero, 1264(a0)
 	ldloc 5
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 316
 	add
-	ldloc 10
+	ldc.i4.s 0
 	stelem.i4
-// 0x010796f4: 0x10796f4: sw    ra, 36(sp)
-// 0x010796f8: 0x10796f8: sw    s0, 20(sp)
+// 0x01079580: 0x1079580: sw    zero, 1280(a0)
 	ldloc 5
-	ldloc.0
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 320
 	add
-	ldloc 7
+	ldc.i4.s 0
 	stelem.i4
-// 0x010796fc: 0x10796fc: addu  s2, zero, zero
+// 0x01079584: 0x1079584: sw    zero, 1516(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 379
+	add
 	ldc.i4.s 0
-	stloc 10
-// 0x01079700: 0x1079700: j	 0x10797a0 addu  s3, s1, zero
-	ldloc 9
-	stloc 11
-	br L_10797a0
-// --- basic block ---
-L_1079708:
-// 0x01079708: 0x1079708: lw    s0, 0(s1)
+	stelem.i4
+// 0x01079588: 0x1079588: sw    zero, 1284(a0)
 	ldloc 5
-	ldloc 9
+	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 7
-// 0x0107970c: 0x107970c: jal   0x10785d8 addu  a0, s0, zero
-	ldloc 7
+	ldc.i4 321
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107958c: 0x107958c: sw    zero, 1828(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 457
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079590: 0x1079590: sw    zero, 1832(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 458
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079594: 0x1079594: sw    zero, 1824(a0)
+	ldloc 5
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4 456
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079598: 0x1079598: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107959c: 0x107959c: addiu a0, a0, 32
+	ldloc.1
+	ldc.i4.s 32
+	add
 	stloc.1
-	ldloc.0
+// 0x010795a0: 0x10795a0: sw    ra, 28(sp)
+// 0x010795a4: 0x10795a4: jal   0x100177c addiu a2, zero, 100
+	ldc.i4.s 100
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Delete_All_Comments_10785d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-// 0x01079714: 0x1079714: lw    a0, 1512(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 378
+// 0x010795ac: 0x10795ac: addiu a0, s0, 156
+	ldloc 6
+	ldc.i4 156
 	add
-	ldelem.i4
 	stloc.1
-// 0x01079718: 0x1079718: sll   zero, zero, 0
-// 0x0107971c: 0x107971c: beq   a0, zero, 0x107972c sll   zero, zero, 0
-	ldloc.1
-	brfalse L_107972c
-// --- basic block ---
-// 0x01079724: 0x1079724: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
+// 0x010795b0: 0x10795b0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x010795b4: 0x10795b4: jal   0x100177c addiu a2, zero, 400
+	ldc.i4 400
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-L_107972c:
-// 0x0107972c: 0x107972c: lw    a0, 1504(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 376
+// 0x010795bc: 0x10795bc: addiu a0, s0, 557
+	ldloc 6
+	ldc.i4 557
 	add
-	ldelem.i4
 	stloc.1
-// 0x01079730: 0x1079730: sll   zero, zero, 0
-// 0x01079734: 0x1079734: beq   a0, zero, 0x1079744 sll   zero, zero, 0
-	ldloc.1
-	brfalse L_1079744
-// --- basic block ---
-// 0x0107973c: 0x107973c: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
+// 0x010795c0: 0x10795c0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x010795c4: 0x10795c4: jal   0x100177c addiu a2, zero, 150
+	ldc.i4 150
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-L_1079744:
-// 0x01079744: 0x1079744: lw    a0, 1508(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 377
+// 0x010795cc: 0x10795cc: addiu a0, s0, 809
+	ldloc 6
+	ldc.i4 809
 	add
-	ldelem.i4
 	stloc.1
-// 0x01079748: 0x1079748: sll   zero, zero, 0
-// 0x0107974c: 0x107974c: beq   a0, zero, 0x107975c sll   zero, zero, 0
-	ldloc.1
-	brfalse L_107975c
-// --- basic block ---
-// 0x01079754: 0x1079754: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
+// 0x010795d0: 0x10795d0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x010795d4: 0x10795d4: jal   0x100177c addiu a2, zero, 150
+	ldc.i4 150
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-L_107975c:
-// 0x0107975c: 0x107975c: lw    a0, 1500(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 375
+// 0x010795dc: 0x10795dc: addiu a0, s0, 708
+	ldloc 6
+	ldc.i4 708
 	add
-	ldelem.i4
 	stloc.1
-// 0x01079760: 0x1079760: sll   zero, zero, 0
-// 0x01079764: 0x1079764: beq   a0, zero, 0x1079774 sll   zero, zero, 0
+// 0x010795e0: 0x10795e0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x010795e4: 0x10795e4: jal   0x100177c addiu a2, zero, 100
+	ldc.i4.s 100
+	stloc.3
 	ldloc.1
-	brfalse L_1079774
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107976c: 0x107976c: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
+// 0x010795ec: 0x10795ec: addiu a0, s0, 960
+	ldloc 6
+	ldc.i4 960
+	add
+	stloc.1
+// 0x010795f0: 0x10795f0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x010795f4: 0x10795f4: jal   0x100177c addiu a2, zero, 150
+	ldc.i4 150
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-L_1079774:
-// 0x01079774: 0x1079774: lw    a0, 1496(s0)
-	ldloc 5
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 374
+// 0x010795fc: 0x10795fc: addiu a0, s0, 1111
+	ldloc 6
+	ldc.i4 1111
 	add
-	ldelem.i4
 	stloc.1
-// 0x01079778: 0x1079778: sll   zero, zero, 0
-// 0x0107977c: 0x107977c: beq   a0, zero, 0x107978c sll   zero, zero, 0
+// 0x01079600: 0x1079600: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01079604: 0x1079604: jal   0x100177c addiu a2, zero, 150
+	ldc.i4 150
+	stloc.3
 	ldloc.1
-	brfalse L_107978c
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x01079784: 0x1079784: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
+// 0x0107960c: 0x107960c: addiu a0, s0, 1304
+	ldloc 6
+	ldc.i4 1304
+	add
+	stloc.1
+// 0x01079610: 0x1079610: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01079614: 0x1079614: jal   0x100177c addiu a2, zero, 128
+	ldc.i4 128
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-L_107978c:
-// 0x0107978c: 0x107978c: jal   0x1000930 addu  a0, s0, zero
-	ldloc 7
+// 0x0107961c: 0x107961c: addiu a0, s0, 1432
+	ldloc 6
+	ldc.i4 1432
+	add
 	stloc.1
-	ldloc.0
+// 0x01079620: 0x1079620: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x01079624: 0x1079624: jal   0x100177c addiu a2, zero, 64
+	ldc.i4.s 64
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
-	stloc 6
+	stloc 7
 // --- basic block ---
-// 0x01079794: 0x1079794: addiu s2, s2, 1
-	ldloc 10
-	ldc.i4.1
-	add
-	stloc 10
-// 0x01079798: 0x1079798: sw    zero, 0(s1)
+// 0x0107962c: 0x107962c: sw    s1, 1292(s0)
 	ldloc 5
-	ldloc 9
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107979c: 0x107979c: addiu s1, s1, 4
-	ldloc 9
-	ldc.i4.4
+	ldc.i4 323
 	add
-	stloc 9
-L_10797a0:
-// 0x010797a0: 0x10797a0: lw    v0, 2000(s3)
+	ldloc 9
+	stelem.i4
+// 0x01079630: 0x1079630: sw    s1, 1296(s0)
 	ldloc 5
-	ldloc 11
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 324
 	add
-	ldelem.i4
-	stloc 6
-// 0x010797a4: 0x10797a4: sll   zero, zero, 0
-// 0x010797a8: 0x10797a8: slt   v1, s2, v0
-	ldloc 10
-	ldloc 6
-	clt
-	stloc 8
-// 0x010797ac: 0x10797ac: bne   v1, zero, 0x1079708 sll   zero, zero, 0
-	ldloc 8
-	brtrue L_1079708
-// --- basic block ---
-// 0x010797b4: 0x10797b4: bne   v0, zero, 0x10797dc lui   s0, 0x80000
-	ldloc 6
-	ldc.i4 524288
-	stloc 7
-	brtrue L_10797dc
-// --- basic block ---
-// 0x010797bc: 0x10797bc: lw    v0, -13992(s0)
+	ldloc 9
+	stelem.i4
+// 0x01079634: 0x1079634: sw    s1, 1288(s0)
 	ldloc 5
-	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3498
+	ldc.i4 322
 	add
-	ldelem.i4
-	stloc 6
-// 0x010797c0: 0x10797c0: sll   zero, zero, 0
-// 0x010797c4: 0x10797c4: beq   v0, zero, 0x10797e0 lui   v0, 0x80000
+	ldloc 9
+	stelem.i4
+// 0x01079638: 0x1079638: addiu a0, s0, 1520
 	ldloc 6
-	ldc.i4 524288
-	stloc 6
-	brfalse L_10797e0
-// --- basic block ---
-// 0x010797cc: 0x10797cc: lui   a0, 0x1080000
-	ldc.i4 17301504
-	stloc.1
-// 0x010797d0: 0x10797d0: jal   0x104fd00 addiu a0, a0, -1240
-	ldloc.1
-	ldc.i4 -1240
+	ldc.i4 1520
 	add
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x010797d8: 0x10797d8: sw    zero, -13992(s0)
+// 0x0107963c: 0x107963c: sw    zero, 1496(s0)
 	ldloc 5
-	ldloc 7
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3498
+	ldc.i4 374
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10797dc:
-// 0x010797dc: 0x10797dc: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 6
-L_10797e0:
-// 0x010797e0: 0x10797e0: lw    ra, 36(sp)
-// 0x010797e4: 0x10797e4: addiu v0, v0, -16028
+// 0x01079640: 0x1079640: sw    zero, 1500(s0)
+	ldloc 5
 	ldloc 6
-	ldc.i4 -16028
+	ldc.i4.2
+	shr.un
+	ldc.i4 375
 	add
-	stloc 6
-// 0x010797e8: 0x10797e8: lw    s3, 32(sp)
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079644: 0x1079644: sw    zero, 1504(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 376
 	add
-	ldelem.i4
-	stloc 11
-// 0x010797ec: 0x10797ec: lw    s2, 28(sp)
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079648: 0x1079648: sw    zero, 1508(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 377
 	add
-	ldelem.i4
-	stloc 10
-// 0x010797f0: 0x10797f0: lw    s1, 24(sp)
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107964c: 0x107964c: sw    zero, 1512(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 378
 	add
-	ldelem.i4
-	stloc 9
-// 0x010797f4: 0x10797f4: lw    s0, 20(sp)
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079650: 0x1079650: sw    zero, 1276(s0)
 	ldloc 5
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 319
 	add
-	ldelem.i4
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079654: 0x1079654: sw    zero, 1300(s0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 325
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x01079658: 0x1079658: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107965c: 0x107965c: jal   0x100177c addiu a2, zero, 100
+	ldc.i4.s 100
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x01079664: 0x1079664: addiu a0, s0, 1624
+	ldloc 6
+	ldc.i4 1624
+	add
+	stloc.1
+// 0x01079668: 0x1079668: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107966c: 0x107966c: jal   0x100177c addiu a2, zero, 100
+	ldc.i4.s 100
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
+// --- basic block ---
+// 0x01079674: 0x1079674: addiu a0, s0, 1724
+	ldloc 6
+	ldc.i4 1724
+	add
+	stloc.1
+// 0x01079678: 0x1079678: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107967c: 0x107967c: jal   0x100177c addiu a2, zero, 100
+	ldc.i4.s 100
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
-// 0x010797f8: 0x10797f8: sw    zero, 2008(v0)
+// --- basic block ---
+// 0x01079684: 0x1079684: lw    ra, 28(sp)
+// 0x01079688: 0x1079688: sw    zero, 1836(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 502
+	ldc.i4 459
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010797fc: 0x10797fc: sw    zero, 2000(v0)
+// 0x0107968c: 0x107968c: sw    zero, 1620(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 405
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01079800: 0x1079800: sw    zero, 2004(v0)
+// 0x01079690: 0x1079690: sw    zero, 1824(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 501
+	ldc.i4 456
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01079804: 0x1079804: jr    ra addiu sp, sp, 40
+// 0x01079694: 0x1079694: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 9
+// 0x01079698: 0x1079698: lw    s0, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107969c: 0x107969c: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 7
 	ret
 }
-.method public static int32 RTAlerts_Term_107980c(int32,int32,int32,int32,int32)
+.method public static int32 continue_report_after_image_upload_10796a4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
 
-// local  7 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local 12 is register s4
 // local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
+// local 13 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2213,677 +1966,457 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 5
+	stloc 13
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107980c: 0x107980c: addiu sp, sp, -24
+// 0x010796a4: 0x10796a4: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01079810: 0x1079810: sw    ra, 20(sp)
-// 0x01079814: 0x1079814: jal   0x10796dc sll   zero, zero, 0
+// 0x010796a8: 0x10796a8: sw    s1, 36(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl91::RTAlerts_Clear_All_10796dc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107981c: 0x107981c: lw    ra, 20(sp)
-// 0x01079820: 0x1079820: sll   zero, zero, 0
-// 0x01079824: 0x1079824: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 alertCountTimerRedrawCB_107982c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107982c: 0x107982c: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x01079830: 0x1079830: sw    ra, 20(sp)
-// 0x01079834: 0x1079834: jal   0x1021900 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0107983c: 0x107983c: lui   a0, 0x1080000
-	ldc.i4 17301504
-	stloc.1
-// 0x01079840: 0x1079840: jal   0x104fd00 addiu a0, a0, -26580
-	ldloc.1
-	ldc.i4 -26580
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01079848: 0x1079848: lw    ra, 20(sp)
-// 0x0107984c: 0x107984c: lui   v0, 0x80000
+	ldloc 9
+	stelem.i4
+// 0x010796ac: 0x10796ac: lui   s1, 0x80000
 	ldc.i4 524288
-	stloc 5
-// 0x01079850: 0x1079850: sw    zero, -16092(v0)
-	ldloc 7
+	stloc 9
+// 0x010796b0: 0x10796b0: lw    v0, -13532(s1)
 	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4023
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01079854: 0x1079854: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
+	ldc.i4 -3383
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 on_popup_close_107985c(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local  0 is register sp
-// local 12 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 12
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	ldelem.i4
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107985c: 0x107985c: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x01079860: 0x1079860: sw    s2, 28(sp)
-	ldloc 6
+// 0x010796b4: 0x10796b4: sw    s0, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.8
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01079864: 0x1079864: lui   s2, 0x0
-	ldc.i4.s 0
-	stloc 10
-// 0x01079868: 0x1079868: lw    a1, 15944(s2)
-	ldloc 6
-	ldloc 10
+// 0x010796b8: 0x10796b8: sw    ra, 52(sp)
+// 0x010796bc: 0x10796bc: sw    s4, 48(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3986
+	ldc.i4.s 12
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107986c: 0x107986c: addiu v0, zero, -2
-	ldc.i4.s -2
-	stloc 5
-// 0x01079870: 0x1079870: sw    s3, 32(sp)
-	ldloc 6
+	ldloc 12
+	stelem.i4
+// 0x010796c0: 0x10796c0: sw    s3, 44(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 11
 	add
 	ldloc 11
 	stelem.i4
-// 0x01079874: 0x1079874: sw    ra, 36(sp)
-// 0x01079878: 0x1079878: sw    s1, 24(sp)
-	ldloc 6
+// 0x010796c4: 0x10796c4: sw    s2, 40(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 10
 	add
-	ldloc 9
+	ldloc 10
 	stelem.i4
-// 0x0107987c: 0x107987c: sw    s0, 20(sp)
+// 0x010796c8: 0x10796c8: beq   v0, zero, 0x10796e0 addu  s0, a0, zero
 	ldloc 6
+	ldloc.1
+	stloc 8
+	brfalse L_10796e0
+// --- basic block ---
+// 0x010796d0: 0x10796d0: jal   0x1000930 addu  a0, v0, zero
+	ldloc 6
+	stloc.1
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010796d8: 0x10796d8: jal   0x1052ef0 sw    zero, -13532(s1)
+	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 -3383
 	add
-	ldloc 7
+	ldc.i4.s 0
 	stelem.i4
-// 0x01079880: 0x1079880: beq   a1, v0, 0x10798c8 addu  s3, a0, zero
-	ldloc.2
+	call int32 Cibyl61::ResetEditBoxCameraImagePath_1052ef0()
+	stloc 6
+// --- basic block ---
+L_10796e0:
+// 0x010796e0: 0x10796e0: lw    s4, 0(s0)
 	ldloc 5
-	ldloc.1
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 12
+// 0x010796e4: 0x10796e4: lw    s3, 4(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
 	stloc 11
-	beq  L_10798c8
-// --- basic block ---
-// 0x01079888: 0x1079888: addiu s0, zero, -1
-	ldc.i4.m1
-	stloc 7
-// 0x0107988c: 0x107988c: bne   a1, s0, 0x10798b0 lui   s1, 0x80000
-	ldloc.2
-	ldloc 7
-	ldc.i4 524288
-	stloc 9
-	bne.un L_10798b0
-// --- basic block ---
-// 0x01079894: 0x1079894: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x01079898: 0x1079898: jal   0x101ece8 addiu a0, a0, -31052
-	ldloc.1
-	ldc.i4 -31052
+// 0x010796e8: 0x10796e8: lw    s2, 8(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
 	add
-	stloc.1
+	ldelem.i4
+	stloc 10
+// 0x010796ec: 0x10796ec: jal   0x1026d08 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_is_sending_enabled_1026d08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010796f4: 0x10796f4: beq   v0, zero, 0x1079710 addu  s1, zero, zero
+	ldloc 6
+	ldc.i4.s 0
+	stloc 9
+	brfalse L_1079710
 // --- basic block ---
-// 0x010798a0: 0x10798a0: jal   0x1009a28 sll   zero, zero, 0
+// 0x010796fc: 0x10796fc: jal   0x1026eec addiu s1, zero, 1
+	ldc.i4.1
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_zoom_reset_1009a28(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x010798a8: 0x10798a8: j	 0x10798cc lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-	br L_10798cc
+// 0x01079704: 0x1079704: bne   v0, zero, 0x1079710 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_1079710
 // --- basic block ---
-L_10798b0:
-// 0x010798b0: 0x10798b0: jal   0x10086bc addiu a0, s1, -13980
-	ldloc 9
-	ldc.i4 -13980
-	add
-	stloc.1
+// 0x0107970c: 0x107970c: addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 9
+L_1079710:
+// 0x01079710: 0x1079710: jal   0x1026ce4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_is_sending_enabled_1026ce4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x010798b8: 0x10798b8: addiu v0, s1, -13980
-	ldloc 9
-	ldc.i4 -13980
-	add
-	stloc 5
-// 0x010798bc: 0x10798bc: sw    s0, 15944(s2)
-	ldloc 6
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 3986
-	add
-	ldloc 7
-	stelem.i4
-// 0x010798c0: 0x10798c0: sw    s0, 4(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldloc 7
-	stelem.i4
-// 0x010798c4: 0x10798c4: sw    s0, -13980(s1)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3495
-	add
-	ldloc 7
-	stelem.i4
-L_10798c8:
-// 0x010798c8: 0x10798c8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_10798cc:
-// 0x010798cc: 0x10798cc: lw    a0, -16228(v0)
+// 0x01079718: 0x1079718: beq   v0, zero, 0x1079734 addu  v1, zero, zero
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4057
-	add
-	ldelem.i4
-	stloc.1
-// 0x010798d0: 0x10798d0: sll   zero, zero, 0
-// 0x010798d4: 0x10798d4: beq   a0, zero, 0x10798e8 lui   v0, 0x80000
-	ldloc.1
-	ldc.i4 524288
-	stloc 5
-	brfalse L_10798e8
+	ldc.i4.s 0
+	stloc 7
+	brfalse L_1079734
 // --- basic block ---
-// 0x010798dc: 0x10798dc: jal   0x101ece8 sll   zero, zero, 0
+// 0x01079720: 0x1079720: jal   0x1026da4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x010798e4: 0x10798e4: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_10798e8:
-// 0x010798e8: 0x10798e8: bne   s3, zero, 0x1079944 sw    zero, -16228(v0)
-	ldloc 11
+// 0x01079728: 0x1079728: bne   v0, zero, 0x1079734 addiu v1, zero, 1
 	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4057
-	add
-	ldc.i4.s 0
-	stelem.i4
-	brtrue L_1079944
+	ldc.i4.1
+	stloc 7
+	brtrue L_1079734
 // --- basic block ---
-// 0x010798f0: 0x10798f0: lui   s0, 0x80000
-	ldc.i4 524288
+// 0x01079730: 0x1079730: addu  v1, zero, zero
+	ldc.i4.s 0
 	stloc 7
-// 0x010798f4: 0x10798f4: lw    v0, -14008(s0)
-	ldloc 6
-	ldloc 7
+L_1079734:
+// 0x01079734: 0x1079734: lw    v0, 12(s0)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4.3
 	add
 	ldelem.i4
-	stloc 5
-// 0x010798f8: 0x10798f8: sll   zero, zero, 0
-// 0x010798fc: 0x10798fc: beq   v0, zero, 0x1079920 lui   a0, 0x1080000
-	ldloc 5
-	ldc.i4 17301504
-	stloc.1
-	brfalse L_1079920
-// --- basic block ---
-// 0x01079904: 0x1079904: jal   0x104fd00 addiu a0, a0, -1240
-	ldloc.1
-	ldc.i4 -1240
-	add
+	stloc 6
+// 0x01079738: 0x1079738: lui   a3, 0x0
+	ldc.i4.s 0
+	stloc 4
+// 0x0107973c: 0x107973c: addu  a0, s4, zero
+	ldloc 12
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x01079740: 0x1079740: addu  a1, s3, zero
+	ldloc 11
+	stloc.2
+// 0x01079744: 0x1079744: addu  a2, s2, zero
+	ldloc 10
+	stloc.3
+// 0x01079748: 0x1079748: addiu a3, a3, 15884
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0107990c: 0x107990c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079910: 0x1079910: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x01079914: 0x1079914: jal   0x106aae8 sw    zero, -13992(v0)
-	ldloc 6
+	ldc.i4 15884
+	add
+	stloc 4
+// 0x0107974c: 0x107974c: sw    s1, 16(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3498
+	ldc.i4.4
 	add
-	ldc.i4.s 0
+	ldloc 9
 	stelem.i4
-	ldloc.1
-	call int32 Cibyl79::RealTime_SetMapDisplayed_106aae8(int32)
-	stloc 5
-// --- basic block ---
-// 0x0107991c: 0x107991c: sw    zero, -14008(s0)
-	ldloc 6
-	ldloc 7
+// 0x01079750: 0x1079750: sw    v1, 20(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4.5
 	add
-	ldc.i4.s 0
-	stelem.i4
-L_1079920:
-// 0x01079920: 0x1079920: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x01079924: 0x1079924: lw    v0, -13988(s0)
-	ldloc 6
 	ldloc 7
+	stelem.i4
+// 0x01079754: 0x1079754: jal   0x106d48c sw    v0, 24(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3497
-	add
-	ldelem.i4
-	stloc 5
-// 0x01079928: 0x1079928: sll   zero, zero, 0
-// 0x0107992c: 0x107992c: beq   v0, zero, 0x1079950 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1079950
-// --- basic block ---
-// 0x01079934: 0x1079934: lui   a0, 0x1080000
-	ldc.i4 17301504
-	stloc.1
-// 0x01079938: 0x1079938: jal   0x104fd00 addiu a0, a0, -2060
-	ldloc.1
-	ldc.i4 -2060
+	ldc.i4.6
 	add
-	stloc.1
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_Report_Alert_106d48c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01079940: 0x1079940: sw    zero, -13988(s0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3497
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_1079944:
-// 0x01079944: 0x1079944: lui   s0, 0x80000
-	ldc.i4 524288
 	stloc 7
-// 0x01079948: 0x1079948: lw    v0, -13988(s0)
+	stloc 6
+// --- basic block ---
+// 0x0107975c: 0x107975c: beq   v0, zero, 0x1079774 sll   zero, zero, 0
 	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3497
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107994c: 0x107994c: sll   zero, zero, 0
-L_1079950:
-// 0x01079950: 0x1079950: beq   v0, zero, 0x1079968 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1079968
+	brfalse L_1079774
 // --- basic block ---
-// 0x01079958: 0x1079958: lui   a0, 0x1080000
-	ldc.i4 17301504
-	stloc.1
-// 0x0107995c: 0x107995c: jal   0x104fd00 addiu a0, a0, -2060
-	ldloc.1
-	ldc.i4 -2060
-	add
+// 0x01079764: 0x1079764: jal   0x10950dc addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01079964: 0x1079964: sw    zero, -13988(s0)
-	ldloc 6
-	ldloc 7
+// 0x0107976c: 0x107976c: j	 0x107977c sll   zero, zero, 0
+	br L_107977c
+// --- basic block ---
+L_1079774:
+// 0x01079774: 0x1079774: jal   0x104c400 sll   zero, zero, 0
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+L_107977c:
+// 0x0107977c: 0x107977c: lw    a0, 4(s0)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3497
+	ldc.i4.1
 	add
-	ldc.i4.s 0
-	stelem.i4
-L_1079968:
-// 0x01079968: 0x1079968: jal   0x101f93c sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_set_orientation_dynamic_101f93c()
-	stloc 5
-// --- basic block ---
-// 0x01079970: 0x1079970: lui   a0, 0x10000
-	ldc.i4 65536
+	ldelem.i4
 	stloc.1
-// 0x01079974: 0x1079974: jal   0x103fdbc addiu a0, a0, -29376
+// 0x01079780: 0x1079780: sll   zero, zero, 0
+// 0x01079784: 0x1079784: beq   a0, zero, 0x1079794 sll   zero, zero, 0
 	ldloc.1
-	ldc.i4 -29376
-	add
-	stloc.1
+	brfalse L_1079794
+// --- basic block ---
+// 0x0107978c: 0x107978c: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x0107997c: 0x107997c: jal   0x1010a4c sll   zero, zero, 0
-	ldloc.0
+L_1079794:
+// 0x01079794: 0x1079794: lw    a0, 12(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldelem.i4
+	stloc.1
+// 0x01079798: 0x1079798: sll   zero, zero, 0
+// 0x0107979c: 0x107979c: beq   a0, zero, 0x10797ac sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	brfalse L_10797ac
 // --- basic block ---
-// 0x01079984: 0x1079984: jal   0x102146c sll   zero, zero, 0
+// 0x010797a4: 0x10797a4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x0107998c: 0x107998c: bne   v0, zero, 0x107999c sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107999c
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01079994: 0x1079994: jal   0x1021900 sll   zero, zero, 0
+L_10797ac:
+// 0x010797ac: 0x10797ac: jal   0x1000930 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-L_107999c:
-// 0x0107999c: 0x107999c: lw    ra, 36(sp)
-// 0x010799a0: 0x10799a0: lw    s3, 32(sp)
-	ldloc 6
+// 0x010797b4: 0x10797b4: lw    ra, 52(sp)
+// 0x010797b8: 0x10797b8: lw    s4, 48(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 12
+// 0x010797bc: 0x10797bc: lw    s3, 44(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
 	ldelem.i4
 	stloc 11
-// 0x010799a4: 0x10799a4: lw    s2, 28(sp)
-	ldloc 6
+// 0x010797c0: 0x10797c0: lw    s2, 40(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 10
 	add
 	ldelem.i4
 	stloc 10
-// 0x010799a8: 0x10799a8: lw    s1, 24(sp)
-	ldloc 6
+// 0x010797c4: 0x10797c4: lw    s1, 36(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
 	ldelem.i4
 	stloc 9
-// 0x010799ac: 0x10799ac: lw    s0, 20(sp)
-	ldloc 6
+// 0x010797c8: 0x10797c8: lw    s0, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 7
-// 0x010799b0: 0x10799b0: jr    ra addiu sp, sp, 40
+	stloc 8
+// 0x010797cc: 0x10797cc: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+.method public static int32 on_keyboard_closed_10797d4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s2,int32 s1,int32 s0,int32 s3,int32 ra)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local 10 is register s0
 // local  9 is register s1
-// local 10 is register s2
+// local  8 is register s2
 // local 11 is register s3
 // local  0 is register sp
 // local 12 is register ra
-// local  6 is register mem
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2893,11 +2426,11 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 10
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldc.i4.s 0
 	stloc 11
 	ldarg 0
@@ -2905,35 +2438,40 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010799b8: 0x10799b8: addiu sp, sp, -40
+// 0x010797d4: 0x10797d4: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010799bc: 0x10799bc: sw    ra, 36(sp)
-// 0x010799c0: 0x10799c0: sw    s3, 32(sp)
-	ldloc 6
+// 0x010797d8: 0x10797d8: sw    s2, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.7
 	add
-	ldloc 11
+	ldloc 8
 	stelem.i4
-// 0x010799c4: 0x10799c4: sw    s2, 28(sp)
-	ldloc 6
+// 0x010797dc: 0x10797dc: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x010797e0: 0x10797e0: lui   s2, 0x20000
+	ldc.i4 131072
+	stloc 8
+// 0x010797e4: 0x10797e4: sw    s3, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.8
 	add
-	ldloc 10
+	ldloc 11
 	stelem.i4
-// 0x010799c8: 0x10799c8: sw    s1, 24(sp)
-	ldloc 6
+// 0x010797e8: 0x10797e8: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -2941,274 +2479,321 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010799cc: 0x10799cc: jal   0x1093f90 sw    s0, 20(sp)
-	ldloc 6
+// 0x010797ec: 0x10797ec: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 7
+	ldloc 10
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
-	stloc 5
-// --- basic block ---
-// 0x010799d4: 0x10799d4: beq   v0, zero, 0x1079a64 lui   s0, 0x80000
-	ldloc 5
-	ldc.i4 524288
+// 0x010797f0: 0x10797f0: addu  s3, a0, zero
+	ldloc.1
+	stloc 11
+// 0x010797f4: 0x10797f4: addu  s1, a1, zero
+	ldloc.2
+	stloc 9
+// 0x010797f8: 0x10797f8: addu  s0, a2, zero
+	ldloc.3
+	stloc 10
+// 0x010797fc: 0x10797fc: addiu a3, a3, -26212
+	ldloc 4
+	ldc.i4 -26212
+	add
+	stloc 4
+// 0x01079800: 0x1079800: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01079804: 0x1079804: addiu a1, s2, -26248
+	ldloc 8
+	ldc.i4 -26248
+	add
+	stloc.2
+// 0x01079808: 0x1079808: sw    ra, 36(sp)
+// 0x0107980c: 0x107980c: jal   0x100449c addiu a2, zero, 4143
+	ldc.i4 4143
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-	brfalse L_1079a64
+	stloc 6
 // --- basic block ---
-// 0x010799dc: 0x10799dc: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+// 0x01079814: 0x1079814: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+// 0x01079818: 0x1079818: bne   s3, v1, 0x10798e0 addiu v0, zero, 1
+	ldloc 11
+	ldloc 7
+	ldc.i4.1
+	stloc 6
+	bne.un L_10798e0
 // --- basic block ---
-// 0x010799e4: 0x10799e4: lui   a1, 0x20000
+// 0x01079820: 0x1079820: lui   a3, 0x20000
 	ldc.i4 131072
-	stloc.2
-// 0x010799e8: 0x10799e8: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x010799ec: 0x10799ec: jal   0x1001b14 addiu a1, a1, -26748
-	ldloc.2
-	ldc.i4 -26748
+	stloc 4
+// 0x01079824: 0x1079824: addiu a1, s2, -26248
+	ldloc 8
+	ldc.i4 -26248
 	add
 	stloc.2
+// 0x01079828: 0x1079828: addiu a3, a3, -26200
+	ldloc 4
+	ldc.i4 -26200
+	add
+	stloc 4
+// 0x0107982c: 0x107982c: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x01079830: 0x1079830: jal   0x100449c addiu a2, zero, 4150
+	ldc.i4 4150
+	stloc.3
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
-	stloc 5
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x010799f4: 0x10799f4: bne   v0, zero, 0x1079a64 lui   s0, 0x80000
+// 0x01079838: 0x1079838: lw    v0, 0(s0)
 	ldloc 5
-	ldc.i4 524288
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 6
+// 0x0107983c: 0x107983c: sll   zero, zero, 0
+// 0x01079840: 0x1079840: bne   v0, zero, 0x1079858 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_1079858
+// --- basic block ---
+// 0x01079848: 0x1079848: lb    v1, 0(s1)
+	ldloc 9
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 7
-	brtrue L_1079a64
+// 0x0107984c: 0x107984c: sll   zero, zero, 0
+// 0x01079850: 0x1079850: beq   v1, zero, 0x10798e0 sll   zero, zero, 0
+	ldloc 7
+	brfalse L_10798e0
 // --- basic block ---
-// 0x010799fc: 0x10799fc: lui   s2, 0x0
-	ldc.i4.s 0
-	stloc 10
-// 0x01079a00: 0x1079a00: lw    a1, 15944(s2)
+L_1079858:
+// 0x01079858: 0x1079858: lb    v0, 0(s1)
+	ldloc 9
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x0107985c: 0x107985c: sll   zero, zero, 0
+// 0x01079860: 0x1079860: bne   v0, zero, 0x1079870 sll   zero, zero, 0
 	ldloc 6
+	brtrue L_1079870
+// --- basic block ---
+// 0x01079868: 0x1079868: lw    s1, 8(s0)
+	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3986
+	ldc.i4.2
 	add
 	ldelem.i4
-	stloc.2
-// 0x01079a04: 0x1079a04: addiu s0, zero, -1
-	ldc.i4.m1
-	stloc 7
-// 0x01079a08: 0x1079a08: bne   a1, s0, 0x1079a28 lui   s3, 0x10000
-	ldloc.2
-	ldloc 7
-	ldc.i4 65536
-	stloc 11
-	bne.un L_1079a28
+	stloc 9
+// 0x0107986c: 0x107986c: sll   zero, zero, 0
+L_1079870:
+// 0x01079870: 0x1079870: bne   s1, zero, 0x1079880 sll   zero, zero, 0
+	ldloc 9
+	brtrue L_1079880
 // --- basic block ---
-// 0x01079a10: 0x1079a10: jal   0x101ece8 addiu a0, s3, -31052
-	ldloc 11
-	ldc.i4 -31052
+// 0x01079878: 0x1079878: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 9
+// 0x0107987c: 0x107987c: addiu s1, s1, 18768
+	ldloc 9
+	ldc.i4 18768
 	add
-	stloc.1
+	stloc 9
+L_1079880:
+// 0x01079880: 0x1079880: jal   0x1078e18 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_ShowProgressDlg_1078e18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01079a18: 0x1079a18: jal   0x1009a28 sll   zero, zero, 0
+// 0x01079888: 0x1079888: jal   0x1000910 addiu a0, zero, 16
+	ldc.i4.s 16
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_zoom_reset_1009a28(int32,int32,int32,int32,int32)
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01079a20: 0x1079a20: j	 0x1079a4c sll   zero, zero, 0
-	br L_1079a4c
+	stloc 7
+	stloc 6
 // --- basic block ---
-L_1079a28:
-// 0x01079a28: 0x1079a28: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x01079a2c: 0x1079a2c: jal   0x10086bc addiu a0, s1, -13980
+// 0x01079890: 0x1079890: addu  a0, s1, zero
 	ldloc 9
-	ldc.i4 -13980
-	add
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x01079894: 0x1079894: jal   0x1001ba8 addu  s2, v0, zero
+	ldloc 6
 	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01079a34: 0x1079a34: jal   0x101ece8 addiu a0, s3, -31052
-	ldloc 11
-	ldc.i4 -31052
-	add
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_set_focus_101ece8(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01079a3c: 0x1079a3c: addiu v0, s1, -13980
-	ldloc 9
-	ldc.i4 -13980
+// 0x0107989c: 0x107989c: lw    a1, 4(s0)
+	ldloc 5
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc 5
-// 0x01079a40: 0x1079a40: sw    s0, 15944(s2)
-	ldloc 6
+	ldelem.i4
+	stloc.2
+// 0x010798a0: 0x10798a0: lw    v1, 0(s0)
+	ldloc 5
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 3986
+	ldelem.i4
+	stloc 7
+// 0x010798a4: 0x10798a4: lw    a0, 12(s0)
+	ldloc 5
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
 	add
-	ldloc 7
+	ldelem.i4
+	stloc.1
+// 0x010798a8: 0x10798a8: sw    a1, 8(s2)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldloc.2
 	stelem.i4
-// 0x01079a44: 0x1079a44: sw    s0, 4(v0)
-	ldloc 6
+// 0x010798ac: 0x10798ac: sw    v0, 4(s2)
 	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.1
 	add
-	ldloc 7
-	stelem.i4
-// 0x01079a48: 0x1079a48: sw    s0, -13980(s1)
 	ldloc 6
-	ldloc 9
+	stelem.i4
+// 0x010798b0: 0x10798b0: beq   a0, zero, 0x10798c8 sw    v1, 0(s2)
+	ldloc.1
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3495
-	add
 	ldloc 7
 	stelem.i4
-L_1079a4c:
-// 0x01079a4c: 0x1079a4c: jal   0x1094b64 addiu a0, zero, 2
-	ldc.i4.2
-	stloc.1
+	brfalse L_10798c8
+// --- basic block ---
+// 0x010798b8: 0x10798b8: jal   0x1001ba8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x010798c0: 0x10798c0: j	 0x10798cc sw    v0, 12(s2)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldloc 6
+	stelem.i4
+	br L_10798cc
 // --- basic block ---
-// 0x01079a54: 0x1079a54: jal   0x1010a4c lui   s0, 0x80000
+L_10798c8:
+// 0x010798c8: 0x10798c8: sw    zero, 12(s2)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
+	ldc.i4.s 0
+	stelem.i4
+L_10798cc:
+// 0x010798cc: 0x10798cc: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc 7
+	stloc 6
+// 0x010798d0: 0x10798d0: addu  a0, s2, zero
+	ldloc 8
+	stloc.1
+// 0x010798d4: 0x10798d4: jal   0x10796a4 sw    zero, -13532(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3383
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_layer_adjust_1010a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::continue_report_after_image_upload_10796a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x01079a5c: 0x1079a5c: jal   0x1021900 sll   zero, zero, 0
+// 0x010798dc: 0x10798dc: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+L_10798e0:
+// 0x010798e0: 0x10798e0: lw    ra, 36(sp)
+// 0x010798e4: 0x10798e4: lw    s3, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-L_1079a64:
-// 0x01079a64: 0x1079a64: lw    v0, -13988(s0)
-	ldloc 6
-	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3497
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 5
-// 0x01079a68: 0x1079a68: sll   zero, zero, 0
-// 0x01079a6c: 0x1079a6c: beq   v0, zero, 0x1079a84 sll   zero, zero, 0
+	stloc 11
+// 0x010798e8: 0x10798e8: lw    s2, 28(sp)
 	ldloc 5
-	brfalse L_1079a84
-// --- basic block ---
-// 0x01079a74: 0x1079a74: lui   a0, 0x1080000
-	ldc.i4 17301504
-	stloc.1
-// 0x01079a78: 0x1079a78: jal   0x104fd00 addiu a0, a0, -2060
-	ldloc.1
-	ldc.i4 -2060
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01079a80: 0x1079a80: sw    zero, -13988(s0)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3497
-	add
-	ldc.i4.s 0
-	stelem.i4
-L_1079a84:
-// 0x01079a84: 0x1079a84: lw    ra, 36(sp)
-// 0x01079a88: 0x1079a88: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079a8c: 0x1079a8c: lw    s3, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 11
-// 0x01079a90: 0x1079a90: lw    s2, 28(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 10
-// 0x01079a94: 0x1079a94: lw    s1, 24(sp)
-	ldloc 6
+	stloc 8
+// 0x010798ec: 0x10798ec: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -3216,58 +2801,48 @@ L_1079a84:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01079a98: 0x1079a98: lw    s0, 20(sp)
-	ldloc 6
+// 0x010798f0: 0x10798f0: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 7
-// 0x01079a9c: 0x1079a9c: sw    zero, -14016(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3504
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01079aa0: 0x1079aa0: jr    ra addiu sp, sp, 40
+	stloc 10
+// 0x010798f4: 0x10798f4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 post_comment_keyboard_callback_1079aa8(int32,int32,int32,int32,int32)
+.method public static int32 alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
+// local  7 is register s0
+// local  8 is register s1
 // local  0 is register sp
-// local 11 is register ra
-// local  7 is register mem
+// local 10 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3277,194 +2852,139 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldc.i4.s 0
-	stloc 10
+	stloc 8
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 11
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079aa8: 0x1079aa8: addiu sp, sp, -40
+// 0x010798fc: 0x10798fc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01079aac: 0x1079aac: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x01079ab0: 0x1079ab0: sw    s1, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 9
-	stelem.i4
-// 0x01079ab4: 0x1079ab4: sw    ra, 36(sp)
-// 0x01079ab8: 0x1079ab8: sw    s2, 32(sp)
-	ldloc 7
+// 0x01079900: 0x1079900: sw    s1, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 10
+	ldloc 8
 	stelem.i4
-// 0x01079abc: 0x1079abc: sw    s0, 24(sp)
-	ldloc 7
+// 0x01079904: 0x1079904: addu  s1, a0, zero
+	ldloc.1
+	stloc 8
+// 0x01079908: 0x1079908: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107990c: 0x107990c: addiu a0, a0, -23972
+	ldloc.1
+	ldc.i4 -23972
+	add
+	stloc.1
+// 0x01079910: 0x1079910: sw    s0, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.7
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x01079ac0: 0x1079ac0: addu  s1, a1, zero
+// 0x01079914: 0x1079914: sw    ra, 36(sp)
+// 0x01079918: 0x1079918: jal   0x101df34 addu  s0, a1, zero
 	ldloc.2
-	stloc 9
-// 0x01079ac4: 0x1079ac4: bne   a0, v1, 0x1079b84 addiu v0, zero, 1
-	ldloc.1
-	ldloc 6
-	ldc.i4.1
-	stloc 5
-	bne.un L_1079b84
-// --- basic block ---
-// 0x01079acc: 0x1079acc: lb    v1, 0(a1)
-	ldloc.2
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x01079ad0: 0x1079ad0: sll   zero, zero, 0
-// 0x01079ad4: 0x1079ad4: beq   v1, zero, 0x1079b84 addu  v0, zero, zero
-	ldloc 6
-	ldc.i4.s 0
-	stloc 5
-	brfalse L_1079b84
-// --- basic block ---
-// 0x01079adc: 0x1079adc: lw    s2, 0(a2)
-	ldloc 7
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 10
-// 0x01079ae0: 0x1079ae0: jal   0x1026cf8 sll   zero, zero, 0
+	stloc 7
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_is_sending_enabled_1026cf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01079ae8: 0x1079ae8: beq   v0, zero, 0x1079b04 addu  s0, zero, zero
+// 0x01079920: 0x1079920: bne   v0, zero, 0x1079944 lui   a2, 0x0
 	ldloc 5
 	ldc.i4.s 0
-	stloc 8
-	brfalse L_1079b04
+	stloc.3
+	brtrue L_1079944
 // --- basic block ---
-// 0x01079af0: 0x1079af0: jal   0x1026edc addiu s0, zero, 1
-	ldc.i4.1
-	stloc 8
-	ldloc.0
+// 0x01079928: 0x1079928: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0107992c: 0x107992c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01079930: 0x1079930: addiu a0, a0, 30092
 	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x01079934: 0x1079934: jal   0x104c158 addiu a1, a1, -30272
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_twitter_logged_in_1026edc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079af8: 0x1079af8: bne   v0, zero, 0x1079b04 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_1079b04
-// --- basic block ---
-// 0x01079b00: 0x1079b00: addu  s0, zero, zero
-	ldc.i4.s 0
-	stloc 8
-L_1079b04:
-// 0x01079b04: 0x1079b04: jal   0x1026cd4 sll   zero, zero, 0
+	ldc.i4 -30272
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_is_sending_enabled_1026cd4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01079b0c: 0x1079b0c: beq   v0, zero, 0x1079b28 addu  a3, zero, zero
-	ldloc 5
-	ldc.i4.s 0
-	stloc 4
-	brfalse L_1079b28
+// 0x0107993c: 0x107993c: j	 0x1079968 sll   zero, zero, 0
+	br L_1079968
 // --- basic block ---
-// 0x01079b14: 0x1079b14: jal   0x1026d94 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl29::roadmap_facebook_logged_in_1026d94(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+L_1079944:
+// 0x01079944: 0x1079944: lui   v0, 0x90000
+	ldc.i4 589824
 	stloc 5
-// --- basic block ---
-// 0x01079b1c: 0x1079b1c: bne   v0, zero, 0x1079b28 addiu a3, zero, 1
+// 0x01079948: 0x1079948: ori   v0, v0, 16
 	ldloc 5
-	ldc.i4.1
-	stloc 4
-	brtrue L_1079b28
-// --- basic block ---
-// 0x01079b24: 0x1079b24: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-L_1079b28:
-// 0x01079b28: 0x1079b28: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x01079b2c: 0x1079b2c: addu  a1, s1, zero
-	ldloc 9
-	stloc.2
-// 0x01079b30: 0x1079b30: jal   0x106caa0 addu  a2, s0, zero
+	ldc.i4.s 16
+	or
+	stloc 5
+// 0x0107994c: 0x107994c: addu  a0, s1, zero
 	ldloc 8
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
+	stloc.1
+// 0x01079950: 0x1079950: addiu a2, a2, 15924
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl81::Realtime_Post_Alert_Comment_106caa0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079b38: 0x1079b38: beq   v0, zero, 0x1079b84 addu  a0, zero, zero
-	ldloc 5
+	ldc.i4 15924
+	add
+	stloc.3
+// 0x01079954: 0x1079954: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc.1
-	brfalse L_1079b84
-// --- basic block ---
-// 0x01079b40: 0x1079b40: lui   s0, 0x0
+	stloc.2
+// 0x01079958: 0x1079958: addu  a3, zero, zero
 	ldc.i4.s 0
-	stloc 8
-// 0x01079b44: 0x1079b44: jal   0x1094a94 sw    v0, 16(sp)
-	ldloc 7
+	stloc 4
+// 0x0107995c: 0x107995c: sw    s0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
+	ldloc 7
+	stelem.i4
+// 0x01079960: 0x1079960: jal   0x1097494 sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 5
 	stelem.i4
 	ldloc.0
@@ -3472,155 +2992,63 @@ L_1079b28:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_list_menu_activate_1097494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01079b4c: 0x1079b4c: lw    a0, 15880(s0)
-	ldloc 7
-	ldloc 8
+L_1079968:
+// 0x01079968: 0x1079968: lw    ra, 36(sp)
+// 0x0107996c: 0x107996c: lw    s1, 32(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 3970
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc.1
-// 0x01079b50: 0x1079b50: addiu v1, zero, 2
-	ldc.i4.2
-	stloc 6
-// 0x01079b54: 0x1079b54: lw    v0, 16(sp)
-	ldloc 7
+	stloc 8
+// 0x01079970: 0x1079970: lw    s0, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 5
-// 0x01079b58: 0x1079b58: bne   a0, v1, 0x1079b70 sll   zero, zero, 0
-	ldloc.1
-	ldloc 6
-	bne.un L_1079b70
-// --- basic block ---
-// 0x01079b60: 0x1079b60: jal   0x10799b8 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079b68: 0x1079b68: j	 0x1079b7c addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-	br L_1079b7c
-// --- basic block ---
-L_1079b70:
-// 0x01079b70: 0x1079b70: jal   0x1078df4 sw    v0, 16(sp)
-	ldloc 7
+	stloc 7
+// 0x01079974: 0x1079974: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s 40
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl90::RTAlerts_Comment_PopUp_Hide_1078df4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x01079b78: 0x1079b78: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-L_1079b7c:
-// 0x01079b7c: 0x1079b7c: lw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-// 0x01079b80: 0x1079b80: sw    v1, 15880(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 3970
-	add
-	ldloc 6
-	stelem.i4
-L_1079b84:
-// 0x01079b84: 0x1079b84: lw    ra, 36(sp)
-// 0x01079b88: 0x1079b88: lw    s2, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 10
-// 0x01079b8c: 0x1079b8c: lw    s1, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 9
-// 0x01079b90: 0x1079b90: lw    s0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldelem.i4
-	stloc 8
-// 0x01079b94: 0x1079b94: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Cancel_Scrolling_1079b9c(int32,int32,int32,int32,int32)
+.method public static int32 add_real_time_alert_for_construction_107997c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  5 is register s0
 // local  0 is register sp
 // local  7 is register ra
 // local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3629,6 +3057,8 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
@@ -3637,47 +3067,59 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1079b9c:
-// 0x01079b9c: 0x1079b9c: addiu sp, sp, -24
+L_107997c:
+// 0x0107997c: 0x107997c: addiu sp, sp, -72
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01079ba0: 0x1079ba0: sw    ra, 20(sp)
-// 0x01079ba4: 0x1079ba4: jal   0x10799b8 sll   zero, zero, 0
+// 0x01079980: 0x1079980: sw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 5
+	stelem.i4
+// 0x01079984: 0x1079984: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01079988: 0x1079988: addiu s0, sp, 16
 	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc 5
+// 0x0107998c: 0x107998c: addu  a0, s0, zero
+	ldloc 5
+	stloc.1
+// 0x01079990: 0x1079990: addiu a1, a1, 29352
+	ldloc.2
+	ldc.i4 29352
+	add
+	stloc.2
+// 0x01079994: 0x1079994: sw    ra, 68(sp)
+// 0x01079998: 0x1079998: jal   0x1001800 addiu a2, zero, 48
+	ldc.i4.s 48
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 8
-	stloc 5
-// --- basic block ---
-// 0x01079bac: 0x1079bac: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079bb0: 0x1079bb0: lw    v0, -13992(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3498
-	add
-	ldelem.i4
-	stloc 5
-// 0x01079bb4: 0x1079bb4: sll   zero, zero, 0
-// 0x01079bb8: 0x1079bb8: beq   v0, zero, 0x1079bcc sll   zero, zero, 0
-	ldloc 5
-	brfalse L_1079bcc
 // --- basic block ---
-// 0x01079bc0: 0x1079bc0: lui   a0, 0x1080000
-	ldc.i4 17301504
+// 0x010799a0: 0x10799a0: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x01079bc4: 0x1079bc4: jal   0x104fd00 addiu a0, a0, -1240
+// 0x010799a4: 0x10799a4: addu  a1, s0, zero
+	ldloc 5
+	stloc.2
+// 0x010799a8: 0x10799a8: jal   0x10798fc addiu a0, a0, -26184
 	ldloc.1
-	ldc.i4 -1240
+	ldc.i4 -26184
 	add
 	stloc.1
 	ldloc.0
@@ -3685,56 +3127,53 @@ L_1079b9c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 8
-	stloc 5
 // --- basic block ---
-L_1079bcc:
-// 0x01079bcc: 0x1079bcc: lw    ra, 20(sp)
-// 0x01079bd0: 0x1079bd0: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079bd4: 0x1079bd4: sw    zero, -13992(v0)
+// 0x010799b0: 0x10799b0: lw    ra, 68(sp)
+// 0x010799b4: 0x10799b4: lw    s0, 64(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3498
+	ldc.i4.s 16
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x01079bd8: 0x1079bd8: jr    ra addiu sp, sp, 24
+	ldelem.i4
+	stloc 5
+// 0x010799b8: 0x10799b8: jr    ra addiu sp, sp, 72
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 on_groups_callbak_1079be0(int32,int32,int32,int32,int32)
+.method public static int32 add_real_time_alert_for_other_10799c0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  5 is register s0
 // local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3743,38 +3182,69 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079be0: 0x1079be0: lw    a0, 116(a0)
-	ldloc 7
-	ldloc.1
+L_10799c0:
+// 0x010799c0: 0x10799c0: addiu sp, sp, -72
+	ldloc.0
+	ldc.i4.s -72
+	add
+	stloc.0
+// 0x010799c4: 0x10799c4: sw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 29
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc.1
-// 0x01079be4: 0x1079be4: addiu sp, sp, -24
+	ldloc 5
+	stelem.i4
+// 0x010799c8: 0x10799c8: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x010799cc: 0x10799cc: addiu s0, sp, 16
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s 16
 	add
-	stloc.0
-// 0x01079be8: 0x1079be8: sw    ra, 20(sp)
-// 0x01079bec: 0x1079bec: beq   a0, zero, 0x1079c00 addu  v0, zero, zero
-	ldloc.1
-	ldc.i4.s 0
 	stloc 5
-	brfalse L_1079c00
+// 0x010799d0: 0x10799d0: addu  a0, s0, zero
+	ldloc 5
+	stloc.1
+// 0x010799d4: 0x10799d4: addiu a1, a1, 29400
+	ldloc.2
+	ldc.i4 29400
+	add
+	stloc.2
+// 0x010799d8: 0x10799d8: sw    ra, 68(sp)
+// 0x010799dc: 0x10799dc: jal   0x1001800 addiu a2, zero, 48
+	ldc.i4.s 48
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01079bf4: 0x1079bf4: jal   0x105474c addiu a0, a0, 1624
+// 0x010799e4: 0x10799e4: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x010799e8: 0x10799e8: addu  a1, s0, zero
+	ldloc 5
+	stloc.2
+// 0x010799ec: 0x10799ec: jal   0x10798fc addiu a0, a0, -26156
 	ldloc.1
-	ldc.i4 1624
+	ldc.i4 -26156
 	add
 	stloc.1
 	ldloc.0
@@ -3782,49 +3252,53 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_show_group_105474c(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 8
-	stloc 5
 // --- basic block ---
-// 0x01079bfc: 0x1079bfc: addiu v0, zero, 1
-	ldc.i4.1
+// 0x010799f4: 0x10799f4: lw    ra, 68(sp)
+// 0x010799f8: 0x10799f8: lw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
 	stloc 5
-L_1079c00:
-// 0x01079c00: 0x1079c00: lw    ra, 20(sp)
-// 0x01079c04: 0x1079c04: sll   zero, zero, 0
-// 0x01079c08: 0x1079c08: jr    ra addiu sp, sp, 24
+// 0x010799fc: 0x10799fc: jr    ra addiu sp, sp, 72
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 RTAlerts_Download_Image_1079c10(int32,int32,int32,int32,int32)
+.method public static int32 add_real_time_alert_for_parking_1079a04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 s0,int32 v0,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
 
 // local  8 is register v0
-// local  5 is register v1
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local  5 is register s0
 // local  0 is register sp
-// local  9 is register ra
+// local  7 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
-	stloc 5
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -3834,189 +3308,247 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079c10: 0x1079c10: addiu sp, sp, -24
+L_1079a04:
+// 0x01079a04: 0x1079a04: addiu sp, sp, -72
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01079c14: 0x1079c14: sw    s0, 16(sp)
+// 0x01079a08: 0x1079a08: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 16
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
-// 0x01079c18: 0x1079c18: addu  s0, a0, zero
-	ldloc.1
-	stloc 7
-// 0x01079c1c: 0x1079c1c: sw    ra, 20(sp)
-// 0x01079c20: 0x1079c20: jal   0x1000910 addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
+// 0x01079a0c: 0x1079a0c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01079a10: 0x1079a10: addiu s0, sp, 16
 	ldloc.0
+	ldc.i4.s 16
+	add
+	stloc 5
+// 0x01079a14: 0x1079a14: addu  a0, s0, zero
+	ldloc 5
+	stloc.1
+// 0x01079a18: 0x1079a18: addiu a1, a1, 29448
+	ldloc.2
+	ldc.i4 29448
+	add
+	stloc.2
+// 0x01079a1c: 0x1079a1c: sw    ra, 68(sp)
+// 0x01079a20: 0x1079a20: jal   0x1001800 addiu a2, zero, 48
+	ldc.i4.s 48
+	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01079c28: 0x1079c28: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079c2c: 0x1079c2c: addiu v1, v1, -16028
+// 0x01079a28: 0x1079a28: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01079a2c: 0x1079a2c: addu  a1, s0, zero
 	ldloc 5
-	ldc.i4 -16028
+	stloc.2
+// 0x01079a30: 0x1079a30: jal   0x10798fc addiu a0, a0, -26132
+	ldloc.1
+	ldc.i4 -26132
 	add
-	stloc 5
-// 0x01079c30: 0x1079c30: sw    s0, 0(v0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldloc 7
-	stelem.i4
-// 0x01079c34: 0x1079c34: addu  a1, v1, zero
-	ldloc 5
-	stloc.2
-// 0x01079c38: 0x1079c38: lw    a2, 2000(v1)
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl91::alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
+// --- basic block ---
+// 0x01079a38: 0x1079a38: lw    ra, 68(sp)
+// 0x01079a3c: 0x1079a3c: lw    s0, 64(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc.3
-// 0x01079c3c: 0x1079c3c: j	 0x1079c78 addu  v1, zero, zero
+	stloc 5
+// 0x01079a40: 0x1079a40: jr    ra addiu sp, sp, 72
+	ldloc.0
+	ldc.i4.s 72
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 add_real_time_alert_for_hazard_1079a48(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+
+// local  8 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  5 is register s0
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
 	ldc.i4.s 0
 	stloc 5
-	br L_1079c78
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_1079c44:
-// 0x01079c44: 0x1079c44: lw    a0, 0(a1)
+L_1079a48:
+// 0x01079a48: 0x1079a48: addiu sp, sp, -72
+	ldloc.0
+	ldc.i4.s -72
+	add
+	stloc.0
+// 0x01079a4c: 0x1079a4c: sw    s0, 64(sp)
 	ldloc 6
-	ldloc.2
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01079c48: 0x1079c48: addiu v1, v1, 1
+	ldc.i4.s 16
+	add
 	ldloc 5
-	ldc.i4.1
+	stelem.i4
+// 0x01079a50: 0x1079a50: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01079a54: 0x1079a54: addiu s0, sp, 16
+	ldloc.0
+	ldc.i4.s 16
 	add
 	stloc 5
-// 0x01079c4c: 0x1079c4c: lw    a3, 0(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 4
-// 0x01079c50: 0x1079c50: sll   zero, zero, 0
-// 0x01079c54: 0x1079c54: bne   a3, s0, 0x1079c78 addiu a1, a1, 4
-	ldloc 4
-	ldloc 7
+// 0x01079a58: 0x1079a58: addu  a0, s0, zero
+	ldloc 5
+	stloc.1
+// 0x01079a5c: 0x1079a5c: addiu a1, a1, 29496
 	ldloc.2
-	ldc.i4.4
+	ldc.i4 29496
 	add
 	stloc.2
-	bne.un L_1079c78
-// --- basic block ---
-// 0x01079c5c: 0x1079c5c: lui   a2, 0x1080000
-	ldc.i4 17301504
+// 0x01079a60: 0x1079a60: sw    ra, 68(sp)
+// 0x01079a64: 0x1079a64: jal   0x1001800 addiu a2, zero, 48
+	ldc.i4.s 48
 	stloc.3
-// 0x01079c60: 0x1079c60: addiu a0, a0, 708
 	ldloc.1
-	ldc.i4 708
-	add
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
+// --- basic block ---
+// 0x01079a6c: 0x1079a6c: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x01079c64: 0x1079c64: addu  a1, v0, zero
-	ldloc 8
+// 0x01079a70: 0x1079a70: addu  a1, s0, zero
+	ldloc 5
 	stloc.2
-// 0x01079c68: 0x1079c68: jal   0x100fe9c addiu a2, a2, -25412
-	ldloc.3
-	ldc.i4 -25412
+// 0x01079a74: 0x1079a74: jal   0x10798fc addiu a0, a0, -26108
+	ldloc.1
+	ldc.i4 -26108
 	add
-	stloc.3
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_camera_image_download_100fe9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 5
+	stloc 9
 	stloc 8
 // --- basic block ---
-// 0x01079c70: 0x1079c70: j	 0x1079c84 sll   zero, zero, 0
-	br L_1079c84
-// --- basic block ---
-L_1079c78:
-// 0x01079c78: 0x1079c78: slt   a0, v1, a2
-	ldloc 5
-	ldloc.3
-	clt
-	stloc.1
-// 0x01079c7c: 0x1079c7c: bne   a0, zero, 0x1079c44 sll   zero, zero, 0
-	ldloc.1
-	brtrue L_1079c44
-// --- basic block ---
-L_1079c84:
-// 0x01079c84: 0x1079c84: lw    ra, 20(sp)
-// 0x01079c88: 0x1079c88: lw    s0, 16(sp)
+// 0x01079a7c: 0x1079a7c: lw    ra, 68(sp)
+// 0x01079a80: 0x1079a80: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc 7
-// 0x01079c8c: 0x1079c8c: jr    ra addiu sp, sp, 24
+	stloc 5
+// 0x01079a84: 0x1079a84: jr    ra addiu sp, sp, 72
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 5
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 8
 	ret
 }
-.method public static int32 on_view_image_1079c94(int32,int32,int32,int32,int32)
+.method public static int32 add_real_time_alert_for_traffic_jam_1079a8c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  8 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local  5 is register s0
 // local  0 is register sp
-// local  6 is register ra
-// local  7 is register mem
+// local  7 is register ra
+// local  6 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 8
+	ldc.i4.s 0
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4025,85 +3557,123 @@ __CIBYL_function_return:
 	stloc 3
 	ldarg 4
 	stloc 4
+	ldc.i4.s 0
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 6
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079c94: 0x1079c94: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079c98: 0x1079c98: lw    a0, -14004(v0)
-	ldloc 7
-	ldloc 5
+L_1079a8c:
+// 0x01079a8c: 0x1079a8c: addiu sp, sp, -72
+	ldloc.0
+	ldc.i4.s -72
+	add
+	stloc.0
+// 0x01079a90: 0x1079a90: sw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc.1
-// 0x01079c9c: 0x1079c9c: addiu sp, sp, -24
+	ldloc 5
+	stelem.i4
+// 0x01079a94: 0x1079a94: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01079a98: 0x1079a98: addiu s0, sp, 16
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s 16
 	add
-	stloc.0
-// 0x01079ca0: 0x1079ca0: sw    ra, 20(sp)
-// 0x01079ca4: 0x1079ca4: jal   0x1079c10 sll   zero, zero, 0
+	stloc 5
+// 0x01079a9c: 0x1079a9c: addu  a0, s0, zero
+	ldloc 5
+	stloc.1
+// 0x01079aa0: 0x1079aa0: addiu a1, a1, 29544
+	ldloc.2
+	ldc.i4 29544
+	add
+	stloc.2
+// 0x01079aa4: 0x1079aa4: sw    ra, 68(sp)
+// 0x01079aa8: 0x1079aa8: jal   0x1001800 addiu a2, zero, 48
+	ldc.i4.s 48
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
+// --- basic block ---
+// 0x01079ab0: 0x1079ab0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01079ab4: 0x1079ab4: addu  a1, s0, zero
+	ldloc 5
+	stloc.2
+// 0x01079ab8: 0x1079ab8: jal   0x10798fc addiu a0, a0, -26084
+	ldloc.1
+	ldc.i4 -26084
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Download_Image_1079c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 8
-	stloc 5
 // --- basic block ---
-// 0x01079cac: 0x1079cac: lw    ra, 20(sp)
-// 0x01079cb0: 0x1079cb0: addu  v0, zero, zero
-	ldc.i4.s 0
+// 0x01079ac0: 0x1079ac0: lw    ra, 68(sp)
+// 0x01079ac4: 0x1079ac4: lw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
 	stloc 5
-// 0x01079cb4: 0x1079cb4: jr    ra addiu sp, sp, 24
+// 0x01079ac8: 0x1079ac8: jr    ra addiu sp, sp, 72
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 72
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 8
+	ldloc 9
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 8
 	ret
 }
-.method public static int32 RTAlerts_Download_Image_Callback_1079cbc(int32,int32,int32,int32,int32)
+.method public static int32 add_real_time_alert_for_accident_1079ad0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 s4,int32 s3,int32 s6,int32 s5,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  8 is register v0
+// local  9 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local 10 is register s1
-// local  8 is register s2
-// local 12 is register s3
-// local 11 is register s4
-// local 14 is register s5
-// local 13 is register s6
+// local  5 is register s0
 // local  0 is register sp
-// local 15 is register ra
+// local  7 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 8
 	ldc.i4.s 0
-	stloc 7
+	stloc 9
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -4113,287 +3683,174 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 13
+	stloc 5
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 7
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079cbc: 0x1079cbc: addiu sp, sp, -96
+L_1079ad0:
+// 0x01079ad0: 0x1079ad0: addiu sp, sp, -72
 	ldloc.0
-	ldc.i4.s -96
+	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01079cc0: 0x1079cc0: sw    s2, 72(sp)
+// 0x01079ad4: 0x1079ad4: sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 18
+	ldc.i4.s 16
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
-// 0x01079cc4: 0x1079cc4: addu  s2, a1, zero
-	ldloc.2
-	stloc 8
-// 0x01079cc8: 0x1079cc8: sw    s5, 84(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldloc 14
-	stelem.i4
-// 0x01079ccc: 0x1079ccc: sw    s1, 68(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldloc 10
-	stelem.i4
-// 0x01079cd0: 0x1079cd0: sw    s0, 64(sp)
-	ldloc 6
+// 0x01079ad8: 0x1079ad8: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x01079adc: 0x1079adc: addiu s0, sp, 16
 	ldloc.0
-	ldc.i4.2
-	shr.un
 	ldc.i4.s 16
 	add
-	ldloc 9
-	stelem.i4
-// 0x01079cd4: 0x1079cd4: sw    ra, 92(sp)
-// 0x01079cd8: 0x1079cd8: sw    s6, 88(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldloc 13
-	stelem.i4
-// 0x01079cdc: 0x1079cdc: sw    s4, 80(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldloc 11
-	stelem.i4
-// 0x01079ce0: 0x1079ce0: sw    s3, 76(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
+	stloc 5
+// 0x01079ae0: 0x1079ae0: addu  a0, s0, zero
+	ldloc 5
+	stloc.1
+// 0x01079ae4: 0x1079ae4: addiu a1, a1, 29592
+	ldloc.2
+	ldc.i4 29592
 	add
-	ldloc 12
-	stelem.i4
-// 0x01079ce4: 0x1079ce4: addu  s5, a0, zero
-	ldloc.1
-	stloc 14
-// 0x01079ce8: 0x1079ce8: lw    s0, 0(a0)
-	ldloc 6
+	stloc.2
+// 0x01079ae8: 0x1079ae8: sw    ra, 68(sp)
+// 0x01079aec: 0x1079aec: jal   0x1001800 addiu a2, zero, 48
+	ldc.i4.s 48
+	stloc.3
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 9
-// 0x01079cec: 0x1079cec: jal   0x104c3f0 addu  s1, a2, zero
+	ldloc.2
 	ldloc.3
-	stloc 10
-	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c3f0()
+	ldloc 4
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01079cf4: 0x1079cf4: bne   s2, zero, 0x1079f54 lui   a1, 0x20000
-	ldloc 8
+// 0x01079af4: 0x1079af4: lui   a0, 0x20000
 	ldc.i4 131072
+	stloc.1
+// 0x01079af8: 0x1079af8: addu  a1, s0, zero
+	ldloc 5
 	stloc.2
-	brtrue L_1079f54
-// --- basic block ---
-// 0x01079cfc: 0x1079cfc: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x01079d00: 0x1079d00: jal   0x104eca0 addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x01079afc: 0x1079afc: jal   0x10798fc addiu a0, a0, -26064
+	ldloc.1
+	ldc.i4 -26064
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_load_image_104eca0(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079d08: 0x1079d08: beq   v0, zero, 0x1079f2c addu  s1, v0, zero
-	ldloc 5
-	ldloc 5
-	stloc 10
-	brfalse L_1079f2c
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01079d10: 0x1079d10: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079d14: 0x1079d14: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x01079d18: 0x1079d18: addu  v1, v0, zero
-	ldloc 5
-	stloc 7
-// 0x01079d1c: 0x1079d1c: lw    a1, 2000(v0)
+// 0x01079b04: 0x1079b04: lw    ra, 68(sp)
+// 0x01079b08: 0x1079b08: lw    s0, 64(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.s 16
 	add
 	ldelem.i4
-	stloc.2
-// 0x01079d20: 0x1079d20: j	 0x1079d40 addu  v0, zero, zero
-	ldc.i4.s 0
 	stloc 5
-	br L_1079d40
-// --- basic block ---
-L_1079d28:
-// 0x01079d28: 0x1079d28: lw    a0, 0(v1)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x01079d2c: 0x1079d2c: sll   zero, zero, 0
-// 0x01079d30: 0x1079d30: lw    a2, 0(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.3
-// 0x01079d34: 0x1079d34: sll   zero, zero, 0
-// 0x01079d38: 0x1079d38: beq   a2, s0, 0x1079d50 addiu v1, v1, 4
-	ldloc.3
-	ldloc 9
-	ldloc 7
-	ldc.i4.4
-	add
-	stloc 7
-	beq  L_1079d50
-// --- basic block ---
-L_1079d40:
-// 0x01079d40: 0x1079d40: slt   a0, v0, a1
-	ldloc 5
-	ldloc.2
-	clt
-	stloc.1
-// 0x01079d44: 0x1079d44: bne   a0, zero, 0x1079d28 addiu v0, v0, 1
-	ldloc.1
-	ldloc 5
-	ldc.i4.1
+// 0x01079b0c: 0x1079b0c: jr    ra addiu sp, sp, 72
+	ldloc.0
+	ldc.i4.s 72
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 add_real_time_alert_for_police_1079b14(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+
+// local  8 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  5 is register s0
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 5
-	brtrue L_1079d28
-// --- basic block ---
-// 0x01079d4c: 0x1079d4c: addu  a0, zero, zero
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
-	stloc.1
-L_1079d50:
-// 0x01079d50: 0x1079d50: lw    a1, 4(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_1079b14:
+// 0x01079b14: 0x1079b14: addiu sp, sp, -72
+	ldloc.0
+	ldc.i4.s -72
 	add
-	ldelem.i4
-	stloc.2
-// 0x01079d54: 0x1079d54: lw    a2, 8(a0)
+	stloc.0
+// 0x01079b18: 0x1079b18: sw    s0, 64(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.2
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc.3
-// 0x01079d58: 0x1079d58: jal   0x1077ea8 lui   s3, 0x20000
+	ldloc 5
+	stelem.i4
+// 0x01079b1c: 0x1079b1c: lui   a1, 0x20000
 	ldc.i4 131072
-	stloc 12
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl90::RTAlerts_get_title_1077ea8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079d60: 0x1079d60: addiu a0, s3, -26436
-	ldloc 12
-	ldc.i4 -26436
-	add
-	stloc.1
-// 0x01079d64: 0x1079d64: jal   0x1095eec addu  a1, zero, zero
-	ldc.i4.s 0
 	stloc.2
+// 0x01079b20: 0x1079b20: addiu s0, sp, 16
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4.s 16
+	add
 	stloc 5
-// --- basic block ---
-// 0x01079d6c: 0x1079d6c: bne   v0, zero, 0x1079f0c addu  s0, v0, zero
-	ldloc 5
+// 0x01079b24: 0x1079b24: addu  a0, s0, zero
 	ldloc 5
-	stloc 9
-	brtrue L_1079f0c
-// --- basic block ---
-// 0x01079d74: 0x1079d74: addiu s4, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 11
-// 0x01079d78: 0x1079d78: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01079d7c: 0x1079d7c: addiu a1, a1, 29224
+	stloc.1
+// 0x01079b28: 0x1079b28: addiu a1, a1, 29640
 	ldloc.2
-	ldc.i4 29224
+	ldc.i4 29640
 	add
 	stloc.2
-// 0x01079d80: 0x1079d80: addu  a0, s4, zero
-	ldloc 11
-	stloc.1
-// 0x01079d84: 0x1079d84: jal   0x1001800 addiu a2, zero, 16
-	ldc.i4.s 16
+// 0x01079b2c: 0x1079b2c: sw    ra, 68(sp)
+// 0x01079b30: 0x1079b30: jal   0x1001800 addiu a2, zero, 48
+	ldc.i4.s 48
 	stloc.3
 	ldloc.1
 	ldloc.2
@@ -4401,286 +3858,283 @@ L_1079d50:
 	ldloc 4
 	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	stloc 8
 // --- basic block ---
-// 0x01079d8c: 0x1079d8c: lui   s6, 0x10000
-	ldc.i4 65536
-	stloc 13
-// 0x01079d90: 0x1079d90: lui   a3, 0x10010000
-	ldc.i4 268500992
-	stloc 4
-// 0x01079d94: 0x1079d94: ori   a3, a3, 20481
-	ldloc 4
-	ldc.i4 20481
-	or
-	stloc 4
-// 0x01079d98: 0x1079d98: addiu a0, s3, -26436
-	ldloc 12
-	ldc.i4 -26436
-	add
+// 0x01079b38: 0x1079b38: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x01079d9c: 0x1079d9c: addiu a1, s6, 18500
-	ldloc 13
-	ldc.i4 18500
-	add
+// 0x01079b3c: 0x1079b3c: addu  a1, s0, zero
+	ldloc 5
 	stloc.2
-// 0x01079da0: 0x1079da0: jal   0x1095a08 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+// 0x01079b40: 0x1079b40: jal   0x10798fc addiu a0, a0, -26040
+	ldloc.1
+	ldc.i4 -26040
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::alerts_direction_menu_10798fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079da8: 0x1079da8: bne   v0, zero, 0x1079dd4 addu  s0, v0, zero
-	ldloc 5
-	ldloc 5
 	stloc 9
-	brtrue L_1079dd4
+	stloc 8
 // --- basic block ---
-// 0x01079db0: 0x1079db0: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01079db4: 0x1079db4: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01079db8: 0x1079db8: addiu a1, a1, -26712
-	ldloc.2
-	ldc.i4 -26712
-	add
-	stloc.2
-// 0x01079dbc: 0x1079dbc: addiu a3, a3, -26408
-	ldloc 4
-	ldc.i4 -26408
-	add
-	stloc 4
-// 0x01079dc0: 0x1079dc0: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01079dc4: 0x1079dc4: jal   0x100449c addiu a2, zero, 3888
-	ldc.i4 3888
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079dcc: 0x1079dcc: j	 0x1079f8c sll   zero, zero, 0
-	br L_1079f8c
-// --- basic block ---
-L_1079dd4:
-// 0x01079dd4: 0x1079dd4: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079dd8: 0x1079dd8: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x01079ddc: 0x1079ddc: addiu a0, a0, -26372
-	ldloc.1
-	ldc.i4 -26372
-	add
-	stloc.1
-// 0x01079de0: 0x1079de0: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01079de4: 0x1079de4: addiu a2, zero, 50
-	ldc.i4.s 50
-	stloc.3
-// 0x01079de8: 0x1079de8: addiu v0, zero, 10
-	ldc.i4.s 10
-	stloc 5
-// 0x01079dec: 0x1079dec: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01079b48: 0x1079b48: lw    ra, 68(sp)
+// 0x01079b4c: 0x1079b4c: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 16
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc 5
+// 0x01079b50: 0x1079b50: jr    ra addiu sp, sp, 72
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4.s 72
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 RTAlerts_get_report_info_str_1079b58(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s0,int32 s2,int32 s1,int32 ra,int32 lo)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local 11 is register s1
+// local 10 is register s2
+// local  8 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local 13 is register lo
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x01079df4: 0x1079df4: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x01079df8: 0x1079df8: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc.2
-// 0x01079dfc: 0x1079dfc: addu  a2, zero, zero
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 10
 	ldc.i4.s 0
-	stloc.3
-// 0x01079e00: 0x1079e00: jal   0x1098fe0 addu  s2, v0, zero
-	ldloc 5
 	stloc 8
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079e08: 0x1079e08: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x01079e0c: 0x1079e0c: addiu v0, v0, -31128
-	ldloc 5
-	ldc.i4 -31128
+// 0x01079b58: 0x1079b58: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
 	add
-	stloc 5
-// 0x01079e10: 0x1079e10: sw    v0, 32(sp)
-	ldloc 6
+	stloc.0
+// 0x01079b5c: 0x1079b5c: sw    s3, 32(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.8
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
-// 0x01079e14: 0x1079e14: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x01079e18: 0x1079e18: addiu v0, v0, -26332
-	ldloc 5
-	ldc.i4 -26332
-	add
-	stloc 5
-// 0x01079e1c: 0x1079e1c: sw    v0, 36(sp)
-	ldloc 6
+// 0x01079b60: 0x1079b60: sw    s1, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.6
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
-// 0x01079e20: 0x1079e20: addiu v0, zero, 17
-	ldc.i4.s 17
-	stloc 5
-// 0x01079e24: 0x1079e24: sw    v0, 16(sp)
-	ldloc 6
+// 0x01079b64: 0x1079b64: sw    s0, 20(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-// 0x01079e28: 0x1079e28: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079e2c: 0x1079e2c: lui   v0, 0x1080000
-	ldc.i4 17301504
-	stloc 5
-// 0x01079e30: 0x1079e30: addiu a2, sp, 32
+// 0x01079b68: 0x1079b68: sw    ra, 36(sp)
+// 0x01079b6c: 0x1079b6c: sw    s2, 28(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc.3
-// 0x01079e34: 0x1079e34: addiu a3, zero, 2
 	ldc.i4.2
-	stloc 4
-// 0x01079e38: 0x1079e38: addiu a0, a0, -26316
-	ldloc.1
-	ldc.i4 -26316
+	shr.un
+	ldc.i4.7
 	add
+	ldloc 10
+	stelem.i4
+// 0x01079b70: 0x1079b70: addu  s3, a0, zero
+	ldloc.1
+	stloc 8
+// 0x01079b74: 0x1079b74: addu  s0, a1, zero
+	ldloc.2
+	stloc 9
+// 0x01079b78: 0x1079b78: addu  s1, a2, zero
+	ldloc.3
+	stloc 11
+// 0x01079b7c: 0x1079b7c: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x01079e3c: 0x1079e3c: addiu a1, s6, 18500
-	ldloc 13
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x01079e40: 0x1079e40: addiu v0, v0, -24644
-	ldloc 5
-	ldc.i4 -24644
-	add
+// 0x01079b80: 0x1079b80: cibyl_sysc_arg 0x4
+	ldloc.1
+// 0x01079b84: 0x1079b84: cibyl_sysc 0x212a
+	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01079e44: 0x1079e44: jal   0x1090ecc sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
+// 0x01079b88: 0x1079b88: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x01079b8c: 0x1079b8c: lw    v0, 144(s3)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 36
 	add
+	ldelem.i4
+	stloc 5
+// 0x01079b90: 0x1079b90: jal   0x10c1000 subu  a0, a0, v0
+	ldloc.1
 	ldloc 5
-	stelem.i4
+	sub
+	stloc.1
 	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079e4c: 0x1079e4c: addu  a1, v0, zero
-	ldloc 5
+// 0x01079b98: 0x1079b98: addu  a1, v1, zero
+	ldloc 6
 	stloc.2
-// 0x01079e50: 0x1079e50: addu  a0, s2, zero
-	ldloc 8
+// 0x01079b9c: 0x1079b9c: jal   0x10c0f10 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x01079e54: 0x1079e54: jal   0x1098ec4 sw    v0, 56(sp)
-	ldloc 6
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079e5c: 0x1079e5c: lw    v0, 56(sp)
-	ldloc 6
-	ldloc.0
+// 0x01079ba4: 0x1079ba4: addu  s2, v0, zero
+	ldloc 5
+	stloc 10
+// 0x01079ba8: 0x1079ba8: sb    zero, 0(s0)
+	ldloc 9
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x01079bac: 0x1079bac: nor   v0, zero, v0
+	ldloc 5
+	ldc.i4.m1
+	xor
+	stloc 5
+// 0x01079bb0: 0x1079bb0: sra   v0, v0, 31
+	ldloc 5
+	ldc.i4.s 31
+	shr
+	stloc 5
+// 0x01079bb4: 0x1079bb4: lw    v1, 4(s3)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.1
 	add
 	ldelem.i4
+	stloc 6
+// 0x01079bb8: 0x1079bb8: and   s2, s2, v0
+	ldloc 10
+	ldloc 5
+	and
+	stloc 10
+// 0x01079bbc: 0x1079bbc: addiu v0, zero, 4
+	ldc.i4.4
 	stloc 5
-// 0x01079e60: 0x1079e60: addu  a1, s4, zero
-	ldloc 11
-	stloc.2
-// 0x01079e64: 0x1079e64: jal   0x10991ac addu  a0, v0, zero
+// 0x01079bc0: 0x1079bc0: bne   v1, v0, 0x1079bd0 lui   a0, 0x20000
+	ldloc 6
 	ldloc 5
+	ldc.i4 131072
+	stloc.1
+	bne.un L_1079bd0
+// --- basic block ---
+// 0x01079bc8: 0x1079bc8: j	 0x1079bd8 addiu a0, a0, -26016
+	ldloc.1
+	ldc.i4 -26016
+	add
+	stloc.1
+	br L_1079bd8
+// --- basic block ---
+L_1079bd0:
+// 0x01079bd0: 0x1079bd0: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01079bd4: 0x1079bd4: addiu a0, a0, 18768
+	ldloc.1
+	ldc.i4 18768
+	add
 	stloc.1
+L_1079bd8:
+// 0x01079bd8: 0x1079bd8: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079e6c: 0x1079e6c: addu  a0, s2, zero
-	ldloc 8
+// 0x01079be0: 0x1079be0: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x01079be4: 0x1079be4: addiu a2, a2, 20332
+	ldloc.3
+	ldc.i4 20332
+	add
+	stloc.3
+// 0x01079be8: 0x1079be8: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+// 0x01079bec: 0x1079bec: addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x01079e70: 0x1079e70: jal   0x10991ac addu  a1, s4, zero
+// 0x01079bf0: 0x1079bf0: jal   0x1000f9c addu  a1, s1, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -4688,103 +4142,42 @@ L_1079dd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_10991ac(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079e78: 0x1079e78: addu  a1, s2, zero
-	ldloc 8
-	stloc.2
-// 0x01079e7c: 0x1079e7c: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079e84: 0x1079e84: jal   0x104dffc addu  a0, s1, zero
+// 0x01079bf8: 0x1079bf8: slti  v0, s2, 60
 	ldloc 10
-	stloc.1
-	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4.s 60
+	clt
 	stloc 5
-// --- basic block ---
-// 0x01079e8c: 0x1079e8c: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x01079e90: 0x1079e90: jal   0x104e020 addu  s2, v0, zero
+// 0x01079bfc: 0x1079bfc: beq   v0, zero, 0x1079c30 addiu v0, s2, -60
 	ldloc 5
-	stloc 8
-	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldloc 10
+	ldc.i4.s -60
+	add
 	stloc 5
+	brfalse L_1079c30
 // --- basic block ---
-// 0x01079e98: 0x1079e98: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x01079e9c: 0x1079e9c: addiu a3, v0, 3
-	ldloc 5
-	ldc.i4.3
-	add
-	stloc 4
-// 0x01079ea0: 0x1079ea0: addiu a2, s2, 4
-	ldloc 8
-	ldc.i4.4
-	add
-	stloc.3
-// 0x01079ea4: 0x1079ea4: addiu a0, a0, -26280
-	ldloc.1
-	ldc.i4 -26280
-	add
+// 0x01079c04: 0x1079c04: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x01079ea8: 0x1079ea8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01079eac: 0x1079eac: addiu v0, zero, 4233
-	ldc.i4 4233
-	stloc 5
-// 0x01079eb0: 0x1079eb0: jal   0x1093a24 sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079eb8: 0x1079eb8: lui   a0, 0x20000
+// 0x01079c0c: 0x1079c0c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01079ebc: 0x1079ebc: addiu a0, a0, -26236
+// 0x01079c10: 0x1079c10: addiu a0, a0, -26004
 	ldloc.1
-	ldc.i4 -26236
+	ldc.i4 -26004
 	add
 	stloc.1
-// 0x01079ec0: 0x1079ec0: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x01079ec4: 0x1079ec4: addiu a2, zero, 17
-	ldc.i4.s 17
-	stloc.3
-// 0x01079ec8: 0x1079ec8: jal   0x109df90 addu  s2, v0, zero
+// 0x01079c14: 0x1079c14: jal   0x101cd70 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4792,380 +4185,210 @@ L_1079dd4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_image_new_109df90(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079ed0: 0x1079ed0: addu  a0, v0, zero
+// 0x01079c1c: 0x1079c1c: addu  a2, v0, zero
 	ldloc 5
-	stloc.1
-// 0x01079ed4: 0x1079ed4: addiu a2, zero, -1
-	ldc.i4.m1
 	stloc.3
-// 0x01079ed8: 0x1079ed8: lui   s4, 0x80000
-	ldc.i4 524288
-	stloc 11
-// 0x01079edc: 0x1079edc: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x01079ee0: 0x1079ee0: jal   0x1098f84 sw    v0, -16224(s4)
-	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4056
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079ee8: 0x1079ee8: lw    a1, -16224(s4)
-	ldloc 6
+// 0x01079c20: 0x1079c20: subu  a1, s1, s3
 	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4056
-	add
-	ldelem.i4
+	ldloc 8
+	sub
 	stloc.2
-// 0x01079eec: 0x1079eec: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01079c24: 0x1079c24: addu  a0, s0, s3
+	ldloc 9
 	ldloc 8
+	add
 	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x01079c28: 0x1079c28: j	 0x1079c8c addu  a3, s2, zero
+	ldloc 10
+	stloc 4
+	br L_1079c8c
+// --- basic block ---
+L_1079c30:
+// 0x01079c30: 0x1079c30: sltiu v0, v0, 3540
+	ldloc 5
+	ldc.i4 3540
+	clt.un
 	stloc 5
+// 0x01079c34: 0x1079c34: beq   v0, zero, 0x1079c5c sll   zero, zero, 0
+	ldloc 5
+	brfalse L_1079c5c
 // --- basic block ---
-// 0x01079ef4: 0x1079ef4: addu  a0, s0, zero
+// 0x01079c3c: 0x1079c3c: jal   0x1001b48 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x01079ef8: 0x1079ef8: jal   0x1098ec4 addu  a1, s2, zero
-	ldloc 8
-	stloc.2
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079f00: 0x1079f00: addiu a0, s3, -26436
-	ldloc 12
-	ldc.i4 -26436
+// 0x01079c44: 0x1079c44: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01079c48: 0x1079c48: addiu a0, a0, -288
+	ldloc.1
+	ldc.i4 -288
 	add
 	stloc.1
-// 0x01079f04: 0x1079f04: jal   0x1095eec addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+// 0x01079c4c: 0x1079c4c: jal   0x101cd70 addu  s3, v0, zero
+	ldloc 5
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_1079f0c:
-// 0x01079f0c: 0x1079f0c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x01079f10: 0x1079f10: lw    a0, -16224(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4056
-	add
-	ldelem.i4
+// 0x01079c54: 0x1079c54: j	 0x1079c78 addiu a3, zero, 60
+	ldc.i4.s 60
+	stloc 4
+	br L_1079c78
+// --- basic block ---
+L_1079c5c:
+// 0x01079c5c: 0x1079c5c: jal   0x1001b48 addu  a0, s0, zero
+	ldloc 9
 	stloc.1
-// 0x01079f14: 0x1079f14: jal   0x109df3c addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_image_update_109df3c(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079f1c: 0x1079f1c: jal   0x109483c sw    s1, 164(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 41
+// 0x01079c64: 0x1079c64: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01079c68: 0x1079c68: addiu a0, a0, -25988
+	ldloc.1
+	ldc.i4 -25988
 	add
-	ldloc 10
-	stelem.i4
+	stloc.1
+// 0x01079c6c: 0x1079c6c: jal   0x101cd70 addu  s3, v0, zero
+	ldloc 5
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_draw_109483c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079f24: 0x1079f24: j	 0x1079f8c sll   zero, zero, 0
-	br L_1079f8c
-// --- basic block ---
-L_1079f2c:
-// 0x01079f2c: 0x1079f2c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01079f30: 0x1079f30: lui   a3, 0x20000
-	ldc.i4 131072
+// 0x01079c74: 0x1079c74: addiu a3, zero, 3600
+	ldc.i4 3600
 	stloc 4
-// 0x01079f34: 0x1079f34: addiu a1, a1, -26712
-	ldloc.2
-	ldc.i4 -26712
-	add
-	stloc.2
-// 0x01079f38: 0x1079f38: addiu a3, a3, -26200
+L_1079c78:
+// 0x01079c78: 0x1079c78: div   s2, a3
+	ldloc 10
 	ldloc 4
-	ldc.i4 -26200
+	div
+	stloc 13
+// 0x01079c7c: 0x1079c7c: subu  a1, s1, s3
+	ldloc 11
+	ldloc 8
+	sub
+	stloc.2
+// 0x01079c80: 0x1079c80: addu  a0, s0, s3
+	ldloc 9
+	ldloc 8
 	add
-	stloc 4
-// 0x01079f3c: 0x1079f3c: addiu a0, zero, 4
-	ldc.i4.4
 	stloc.1
-// 0x01079f40: 0x1079f40: addiu a2, zero, 3822
-	ldc.i4 3822
+// 0x01079c84: 0x1079c84: addu  a2, v0, zero
+	ldloc 5
 	stloc.3
-// 0x01079f44: 0x1079f44: jal   0x100449c sw    s0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
+// 0x01079c88: 0x1079c88: mflo  lo
+	ldloc 13
+	stloc 4
+L_1079c8c:
+// 0x01079c8c: 0x1079c8c: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01079f4c: 0x1079f4c: j	 0x1079f7c lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-	br L_1079f7c
-// --- basic block ---
-L_1079f54:
-// 0x01079f54: 0x1079f54: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x01079f58: 0x1079f58: addiu a1, a1, -26712
-	ldloc.2
-	ldc.i4 -26712
-	add
-	stloc.2
-// 0x01079f5c: 0x1079f5c: addiu a3, a3, -26140
-	ldloc 4
-	ldc.i4 -26140
-	add
-	stloc 4
-// 0x01079f60: 0x1079f60: addiu a0, zero, 4
-	ldc.i4.4
-	stloc.1
-// 0x01079f64: 0x1079f64: addiu a2, zero, 3828
-	ldc.i4 3828
-	stloc.3
-// 0x01079f68: 0x1079f68: sw    s0, 16(sp)
-	ldloc 6
+// 0x01079c94: 0x1079c94: lw    ra, 36(sp)
+// 0x01079c98: 0x1079c98: lw    s3, 32(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldloc 9
-	stelem.i4
-// 0x01079f6c: 0x1079f6c: sw    s2, 20(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 8
+// 0x01079c9c: 0x1079c9c: lw    s2, 28(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldloc 8
-	stelem.i4
-// 0x01079f70: 0x1079f70: jal   0x100449c sw    s1, 24(sp)
-	ldloc 6
+	ldelem.i4
+	stloc 10
+// 0x01079ca0: 0x1079ca0: lw    s1, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 10
-	stelem.i4
+	ldelem.i4
+	stloc 11
+// 0x01079ca4: 0x1079ca4: lw    s0, 20(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079f78: 0x1079f78: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-L_1079f7c:
-// 0x01079f7c: 0x1079f7c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x01079f80: 0x1079f80: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x01079f84: 0x1079f84: jal   0x104c148 addiu a1, a1, -26164
-	ldloc.2
-	ldc.i4 -26164
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_1079f8c:
-// 0x01079f8c: 0x1079f8c: jal   0x1000930 addu  a0, s5, zero
-	ldloc 14
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x01079f94: 0x1079f94: lw    ra, 92(sp)
-// 0x01079f98: 0x1079f98: lw    s6, 88(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 22
-	add
-	ldelem.i4
-	stloc 13
-// 0x01079f9c: 0x1079f9c: lw    s5, 84(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 21
-	add
-	ldelem.i4
-	stloc 14
-// 0x01079fa0: 0x1079fa0: lw    s4, 80(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 20
-	add
-	ldelem.i4
-	stloc 11
-// 0x01079fa4: 0x1079fa4: lw    s3, 76(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 19
-	add
-	ldelem.i4
-	stloc 12
-// 0x01079fa8: 0x1079fa8: lw    s2, 72(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 18
-	add
-	ldelem.i4
-	stloc 8
-// 0x01079fac: 0x1079fac: lw    s1, 68(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 17
-	add
-	ldelem.i4
-	stloc 10
-// 0x01079fb0: 0x1079fb0: lw    s0, 64(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 16
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
 	ldelem.i4
 	stloc 9
-// 0x01079fb4: 0x1079fb4: jr    ra addiu sp, sp, 96
+// 0x01079ca8: 0x1079ca8: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 96
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_View_Image_DlgClose_Callback_1079fbc(int32,int32,int32,int32,int32)
+.method public static int32 on_button_close_1079cb0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
 // local  0 is register sp
-// local  7 is register ra
-// local  8 is register mem
+// local  5 is register ra
+// local  7 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5177,43 +4400,104 @@ __CIBYL_function_return:
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 7
+	stloc 5
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 8
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079fbc: 0x1079fbc: addiu sp, sp, -24
+// 0x01079cb0: 0x1079cb0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x01079cb4: 0x1079cb4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01079fc0: 0x1079fc0: sw    ra, 20(sp)
-// 0x01079fc4: 0x1079fc4: jal   0x1094000 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_current_data_1094000()
-	stloc 5
-// --- basic block ---
-// 0x01079fcc: 0x1079fcc: jal   0x104ec70 addu  a0, v0, zero
-	ldloc 5
+// 0x01079cb8: 0x1079cb8: addiu a0, a0, -26284
+	ldloc.1
+	ldc.i4 -26284
+	add
 	stloc.1
+// 0x01079cbc: 0x1079cbc: sw    ra, 20(sp)
+// 0x01079cc0: 0x1079cc0: jal   0x1094ff4 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_free_image_104ec70(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
+// --- basic block ---
+// 0x01079cc8: 0x1079cc8: lw    ra, 20(sp)
+// 0x01079ccc: 0x1079ccc: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x01079cd0: 0x1079cd0: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 on_ping_wazer_button_close_1079cd8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
+
+// local  6 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079fd4: 0x1079fd4: lui   a0, 0x20000
+// 0x01079cd8: 0x1079cd8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01079fd8: 0x1079fd8: addiu a0, a0, -26436
+// 0x01079cdc: 0x1079cdc: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x01079ce0: 0x1079ce0: addiu a0, a0, -26268
 	ldloc.1
-	ldc.i4 -26436
+	ldc.i4 -26268
 	add
 	stloc.1
-// 0x01079fdc: 0x1079fdc: jal   0x1094884 addu  a1, zero, zero
+// 0x01079ce4: 0x1079ce4: sw    ra, 20(sp)
+// 0x01079ce8: 0x1079ce8: jal   0x1094ff4 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5221,56 +4505,50 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_1094884(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x01079fe4: 0x1079fe4: lw    ra, 20(sp)
-// 0x01079fe8: 0x1079fe8: addiu v0, zero, 1
+// 0x01079cf0: 0x1079cf0: lw    ra, 20(sp)
+// 0x01079cf4: 0x1079cf4: addiu v0, zero, 1
 	ldc.i4.1
-	stloc 5
-// 0x01079fec: 0x1079fec: jr    ra addiu sp, sp, 24
+	stloc 6
+// 0x01079cf8: 0x1079cf8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
+	ldloc 6
 	ret
 }
-.method public static int32 RTAlerts_Get_City_Street_1079ff4(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Clear_All_1079d00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s6,int32 s4,int32 s5,int32 s1,int32 s0,int32 s2,int32 s3,int32 s7,int32 s8,int32 lo,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
 
-// local  5 is register v0
-// local  7 is register v1
+// local  6 is register v0
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 12 is register s0
-// local 11 is register s1
-// local 13 is register s2
-// local 14 is register s3
-// local  9 is register s4
-// local 10 is register s5
-// local  8 is register s6
-// local 15 is register s7
+// local  7 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
 // local  0 is register sp
-// local 16 is register s8
-// local 18 is register ra
-// local 17 is register lo
-// local  6 is register mem
+// local 12 is register ra
+// local  5 is register mem
 
 	ldc.i4.s 0
-	stloc 5
+	stloc 6
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5280,1395 +4558,1113 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
+	stloc 7
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 15
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 16
-	ldc.i4.s 0
-	stloc 18
-	ldc.i4.s 0
-	stloc 17
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01079ff4: 0x1079ff4: addiu sp, sp, -1400
+// 0x01079d00: 0x1079d00: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4 -1400
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01079ff8: 0x1079ff8: sw    s4, 1376(sp)
-	ldloc 6
+// 0x01079d04: 0x1079d04: sw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 344
+	ldc.i4.6
 	add
 	ldloc 9
 	stelem.i4
-// 0x01079ffc: 0x1079ffc: addiu s4, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
+// 0x01079d08: 0x1079d08: lui   s1, 0x80000
+	ldc.i4 524288
 	stloc 9
-// 0x0107a000: 0x107a000: sw    a0, 1400(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 350
-	add
-	ldloc.1
-	stelem.i4
-// 0x0107a004: 0x107a004: sw    a1, 1404(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 351
-	add
-	ldloc.2
-	stelem.i4
-// 0x0107a008: 0x107a008: addu  a0, s4, zero
+// 0x01079d0c: 0x1079d0c: addiu s1, s1, -15564
 	ldloc 9
-	stloc.1
-// 0x0107a00c: 0x107a00c: addiu a1, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+	ldc.i4 -15564
 	add
-	stloc.2
-// 0x0107a010: 0x107a010: sw    ra, 1396(sp)
-// 0x0107a014: 0x107a014: sw    s5, 1380(sp)
-	ldloc 6
+	stloc 9
+// 0x01079d10: 0x1079d10: sw    s3, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 345
+	ldc.i4.8
 	add
-	ldloc 10
+	ldloc 11
 	stelem.i4
-// 0x0107a018: 0x107a018: sw    s3, 1372(sp)
-	ldloc 6
+// 0x01079d14: 0x1079d14: sw    s2, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 343
+	ldc.i4.7
 	add
-	ldloc 14
+	ldloc 10
 	stelem.i4
-// 0x0107a01c: 0x107a01c: sw    s2, 1368(sp)
-	ldloc 6
+// 0x01079d18: 0x1079d18: sw    ra, 36(sp)
+// 0x01079d1c: 0x1079d1c: sw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 342
+	ldc.i4.5
 	add
-	ldloc 13
+	ldloc 7
 	stelem.i4
-// 0x0107a020: 0x107a020: addu  s3, a2, zero
-	ldloc.3
-	stloc 14
-// 0x0107a024: 0x107a024: sw    s1, 1364(sp)
-	ldloc 6
-	ldloc.0
+// 0x01079d20: 0x1079d20: addu  s2, zero, zero
+	ldc.i4.s 0
+	stloc 10
+// 0x01079d24: 0x1079d24: j	 0x1079dc4 addu  s3, s1, zero
+	ldloc 9
+	stloc 11
+	br L_1079dc4
+// --- basic block ---
+L_1079d2c:
+// 0x01079d2c: 0x1079d2c: lw    s0, 0(s1)
+	ldloc 5
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 341
-	add
-	ldloc 11
-	stelem.i4
-// 0x0107a028: 0x107a028: sw    s0, 1360(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 340
-	add
-	ldloc 12
-	stelem.i4
-// 0x0107a02c: 0x107a02c: addiu s5, sp, 68
-	ldloc.0
-	ldc.i4.s 68
-	add
-	stloc 10
-// 0x0107a030: 0x107a030: sw    s8, 1392(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 348
-	add
-	ldloc 16
-	stelem.i4
-// 0x0107a034: 0x107a034: sw    s7, 1388(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 347
-	add
-	ldloc 15
-	stelem.i4
-// 0x0107a038: 0x107a038: sw    s6, 1384(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 346
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107a03c: 0x107a03c: lw    s1, 1416(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 354
-	add
 	ldelem.i4
-	stloc 11
-// 0x0107a040: 0x107a040: lw    s2, 1420(sp)
-	ldloc 6
+	stloc 7
+// 0x01079d30: 0x1079d30: jal   0x1078bfc addu  a0, s0, zero
+	ldloc 7
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 355
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107a044: 0x107a044: jal   0x100844c addu  s0, a3, zero
-	ldloc 4
-	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl90::RTAlerts_Delete_All_Comments_1078bfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x0107a04c: 0x107a04c: addiu a0, sp, 1400
-	ldloc.0
-	ldc.i4 1400
+// 0x01079d38: 0x1079d38: lw    a0, 1512(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 378
 	add
+	ldelem.i4
 	stloc.1
-// 0x0107a050: 0x107a050: jal   0x10086bc addiu a1, zero, 20
-	ldc.i4.s 20
-	stloc.2
+// 0x01079d3c: 0x1079d3c: sll   zero, zero, 0
+// 0x01079d40: 0x1079d40: beq   a0, zero, 0x1079d50 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1079d50
+// --- basic block ---
+// 0x01079d48: 0x1079d48: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x0107a058: 0x107a058: addu  a0, s5, zero
-	ldloc 10
+L_1079d50:
+// 0x01079d50: 0x1079d50: lw    a0, 1504(s0)
+	ldloc 5
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 376
+	add
+	ldelem.i4
 	stloc.1
-// 0x0107a05c: 0x107a05c: jal   0x1010058 addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
+// 0x01079d54: 0x1079d54: sll   zero, zero, 0
+// 0x01079d58: 0x1079d58: beq   a0, zero, 0x1079d68 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1079d68
+// --- basic block ---
+// 0x01079d60: 0x1079d60: jal   0x1000930 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl11::roadmap_layer_all_roads_1010058(int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x0107a064: 0x107a064: addu  a3, v0, zero
+L_1079d68:
+// 0x01079d68: 0x1079d68: lw    a0, 1508(s0)
 	ldloc 5
-	stloc 4
-// 0x0107a068: 0x107a068: addiu v1, sp, 580
-	ldloc.0
-	ldc.i4 580
-	add
-	stloc 7
-// 0x0107a06c: 0x107a06c: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107a070: 0x107a070: addu  a2, s5, zero
-	ldloc 10
-	stloc.3
-// 0x0107a074: 0x107a074: addiu a0, sp, 1400
-	ldloc.0
-	ldc.i4 1400
-	add
-	stloc.1
-// 0x0107a078: 0x107a078: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107a07c: 0x107a07c: sw    v1, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
 	ldloc 7
-	stelem.i4
-// 0x0107a080: 0x107a080: sw    v0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107a084: 0x107a084: jal   0x1013028 sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 377
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x01079d6c: 0x1079d6c: sll   zero, zero, 0
+// 0x01079d70: 0x1079d70: beq   a0, zero, 0x1079d80 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1079d80
+// --- basic block ---
+// 0x01079d78: 0x1079d78: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a08c: 0x107a08c: beq   v0, zero, 0x107a328 addiu v0, zero, -1
-	ldloc 5
-	ldc.i4.m1
-	stloc 5
-	brfalse L_107a328
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x0107a094: 0x107a094: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0107a098: 0x107a098: lw    v0, 576(v0)
-	ldloc 6
+L_1079d80:
+// 0x01079d80: 0x1079d80: lw    a0, 1500(s0)
 	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 144
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107a09c: 0x107a09c: lw    a0, 592(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 148
+	ldc.i4 375
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107a0a0: 0x107a0a0: sll   zero, zero, 0
-// 0x0107a0a4: 0x107a0a4: beq   a0, v0, 0x107a0bc sll   zero, zero, 0
+// 0x01079d84: 0x1079d84: sll   zero, zero, 0
+// 0x01079d88: 0x1079d88: beq   a0, zero, 0x1079d98 sll   zero, zero, 0
 	ldloc.1
-	ldloc 5
-	beq  L_107a0bc
-// --- basic block ---
-// 0x0107a0ac: 0x107a0ac: bltz  a0, 0x107a0bc sll   zero, zero, 0
-	ldloc.1
-	ldc.i4.s 0
-	blt L_107a0bc
+	brfalse L_1079d98
 // --- basic block ---
-// 0x0107a0b4: 0x107a0b4: jal   0x100b164 sll   zero, zero, 0
+// 0x01079d90: 0x1079d90: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-L_107a0bc:
-// 0x0107a0bc: 0x107a0bc: lw    a0, 596(sp)
-	ldloc 6
-	ldloc.0
+L_1079d98:
+// 0x01079d98: 0x1079d98: lw    a0, 1496(s0)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 149
+	ldc.i4 374
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107a0c0: 0x107a0c0: jal   0x1013c44 sll   zero, zero, 0
+// 0x01079d9c: 0x1079d9c: sll   zero, zero, 0
+// 0x01079da0: 0x1079da0: beq   a0, zero, 0x1079db0 sll   zero, zero, 0
+	ldloc.1
+	brfalse L_1079db0
+// --- basic block ---
+// 0x01079da8: 0x1079da8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_locator_activate_1013c44(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x0107a0c8: 0x107a0c8: bgez  v0, 0x107a0f0 addiu s4, sp, 44
-	ldloc 5
+L_1079db0:
+// 0x01079db0: 0x1079db0: jal   0x1000930 addu  a0, s0, zero
+	ldloc 7
+	stloc.1
 	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc 9
-	ldc.i4.s 0
-	bge L_107a0f0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x0107a0d0: 0x107a0d0: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x0107a0d4: 0x107a0d4: lw    a1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+// 0x01079db8: 0x1079db8: addiu s2, s2, 1
+	ldloc 10
+	ldc.i4.1
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107a0d8: 0x107a0d8: sw    zero, 0(s3)
-	ldloc 6
-	ldloc 14
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107a0dc: 0x107a0dc: sw    v0, 0(s2)
-	ldloc 6
-	ldloc 13
-	ldc.i4.2
-	shr.un
+	stloc 10
+// 0x01079dbc: 0x1079dbc: sw    zero, 0(s1)
 	ldloc 5
-	stelem.i4
-// 0x0107a0e0: 0x107a0e0: sw    zero, 0(s0)
-	ldloc 6
-	ldloc 12
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107a0e4: 0x107a0e4: sw    v0, 0(s1)
-	ldloc 6
+// 0x01079dc0: 0x1079dc0: addiu s1, s1, 4
+	ldloc 9
+	ldc.i4.4
+	add
+	stloc 9
+L_1079dc4:
+// 0x01079dc4: 0x1079dc4: lw    v0, 2000(s3)
+	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldloc 5
-	stelem.i4
-// 0x0107a0e8: 0x107a0e8: j	 0x107a340 addiu a0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
+	ldc.i4 500
 	add
-	stloc.1
-	br L_107a340
+	ldelem.i4
+	stloc 6
+// 0x01079dc8: 0x1079dc8: sll   zero, zero, 0
+// 0x01079dcc: 0x1079dcc: slt   v1, s2, v0
+	ldloc 10
+	ldloc 6
+	clt
+	stloc 8
+// 0x01079dd0: 0x1079dd0: bne   v1, zero, 0x1079d2c sll   zero, zero, 0
+	ldloc 8
+	brtrue L_1079d2c
 // --- basic block ---
-L_107a0f0:
-// 0x0107a0f0: 0x107a0f0: lw    a0, 584(sp)
+// 0x01079dd8: 0x1079dd8: bne   v0, zero, 0x1079e00 lui   s0, 0x80000
 	ldloc 6
-	ldloc.0
+	ldc.i4 524288
+	stloc 7
+	brtrue L_1079e00
+// --- basic block ---
+// 0x01079de0: 0x1079de0: lw    v0, -13528(s0)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 146
+	ldc.i4 -3382
 	add
 	ldelem.i4
+	stloc 6
+// 0x01079de4: 0x1079de4: sll   zero, zero, 0
+// 0x01079de8: 0x1079de8: beq   v0, zero, 0x1079e04 lui   v0, 0x80000
+	ldloc 6
+	ldc.i4 524288
+	stloc 6
+	brfalse L_1079e04
+// --- basic block ---
+// 0x01079df0: 0x1079df0: lui   a0, 0x1080000
+	ldc.i4 17301504
+	stloc.1
+// 0x01079df4: 0x1079df4: jal   0x104fd10 addiu a0, a0, 332
+	ldloc.1
+	ldc.i4 332
+	add
 	stloc.1
-// 0x0107a0f4: 0x107a0f4: jal   0x1011a4c addu  a1, s4, zero
-	ldloc 9
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 8
+	stloc 6
 // --- basic block ---
-// 0x0107a0fc: 0x107a0fc: lw    a0, 584(sp)
-	ldloc 6
-	ldloc.0
+// 0x01079dfc: 0x1079dfc: sw    zero, -13528(s0)
+	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 146
+	ldc.i4 -3382
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107a100: 0x107a100: jal   0x1004a70 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl3::roadmap_line_route_get_direction_1004a70(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a108: 0x107a108: addu  a0, s4, zero
-	ldloc 9
-	stloc.1
-// 0x0107a10c: 0x107a10c: jal   0x1011818 addu  s5, v0, zero
-	ldloc 5
-	stloc 10
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a114: 0x107a114: sw    v0, 0(s0)
-	ldloc 6
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107a118: 0x107a118: addiu v0, zero, 3
-	ldc.i4.3
-	stloc 5
-// 0x0107a11c: 0x107a11c: beq   s5, v0, 0x107a134 addiu v0, zero, 1
-	ldloc 10
-	ldloc 5
-	ldc.i4.1
-	stloc 5
-	beq  L_107a134
-// --- basic block ---
-// 0x0107a124: 0x107a124: lw    v1, 1424(sp)
+L_1079e00:
+// 0x01079e00: 0x1079e00: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 6
+L_1079e04:
+// 0x01079e04: 0x1079e04: lw    ra, 36(sp)
+// 0x01079e08: 0x1079e08: addiu v0, v0, -15564
 	ldloc 6
+	ldc.i4 -15564
+	add
+	stloc 6
+// 0x01079e0c: 0x1079e0c: lw    s3, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 356
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107a128: 0x107a128: sll   zero, zero, 0
-// 0x0107a12c: 0x107a12c: bne   v1, v0, 0x107a168 lui   v0, 0x0
-	ldloc 7
+	stloc 11
+// 0x01079e10: 0x1079e10: lw    s2, 28(sp)
 	ldloc 5
-	ldc.i4.s 0
-	stloc 5
-	bne.un L_107a168
-// --- basic block ---
-L_107a134:
-// 0x0107a134: 0x107a134: addiu a0, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc.1
-// 0x0107a138: 0x107a138: jal   0x1011298 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a140: 0x107a140: lw    a0, 584(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 146
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc.1
-// 0x0107a144: 0x107a144: lw    v1, 592(sp)
-	ldloc 6
+	stloc 10
+// 0x01079e14: 0x1079e14: lw    s1, 24(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 148
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107a148: 0x107a148: lw    a1, 32(sp)
-	ldloc 6
+	stloc 9
+// 0x01079e18: 0x1079e18: lw    s0, 20(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107a14c: 0x107a14c: sw    v0, 0(s3)
+	stloc 7
+// 0x01079e1c: 0x1079e1c: sw    zero, 2008(v0)
+	ldloc 5
 	ldloc 6
-	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldloc 5
+	ldc.i4 502
+	add
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107a150: 0x107a150: sw    a0, 0(s2)
+// 0x01079e20: 0x1079e20: sw    zero, 2000(v0)
+	ldloc 5
 	ldloc 6
-	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldloc.1
+	ldc.i4 500
+	add
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107a154: 0x107a154: sw    v1, 0(s1)
+// 0x01079e24: 0x1079e24: sw    zero, 2004(v0)
+	ldloc 5
 	ldloc 6
-	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldloc 7
+	ldc.i4 501
+	add
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107a158: 0x107a158: jal   0x10086bc addiu a0, sp, 36
+// 0x01079e28: 0x1079e28: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 36
+	ldc.i4.s 40
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTAlerts_Term_1079e30(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107a160: 0x107a160: j	 0x107a350 sll   zero, zero, 0
-	br L_107a350
-// --- basic block ---
-L_107a168:
-// 0x0107a168: 0x107a168: lw    v0, 576(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 144
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107a16c: 0x107a16c: lw    a0, 592(sp)
-	ldloc 6
+// 0x01079e30: 0x1079e30: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 148
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107a170: 0x107a170: sll   zero, zero, 0
-// 0x0107a174: 0x107a174: beq   a0, v0, 0x107a18c sll   zero, zero, 0
-	ldloc.1
-	ldloc 5
-	beq  L_107a18c
-// --- basic block ---
-// 0x0107a17c: 0x107a17c: bltz  a0, 0x107a18c sll   zero, zero, 0
-	ldloc.1
-	ldc.i4.s 0
-	blt L_107a18c
-// --- basic block ---
-// 0x0107a184: 0x107a184: jal   0x100b164 sll   zero, zero, 0
+	stloc.0
+// 0x01079e34: 0x1079e34: sw    ra, 20(sp)
+// 0x01079e38: 0x1079e38: jal   0x1079d00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Clear_All_1079d00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 7
+// --- basic block ---
+// 0x01079e40: 0x1079e40: lw    ra, 20(sp)
+// 0x01079e44: 0x1079e44: sll   zero, zero, 0
+// 0x01079e48: 0x1079e48: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 alertCountTimerRedrawCB_1079e50(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_107a18c:
-// 0x0107a18c: 0x107a18c: lw    a0, 0(s0)
-	ldloc 6
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107a190: 0x107a190: jal   0x1001ba8 addiu s5, sp, 44
+// 0x01079e50: 0x1079e50: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.s 44
+	ldc.i4.s -24
 	add
-	stloc 10
+	stloc.0
+// 0x01079e54: 0x1079e54: sw    ra, 20(sp)
+// 0x01079e58: 0x1079e58: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a198: 0x107a198: addu  a0, s5, zero
-	ldloc 10
+// 0x01079e60: 0x1079e60: lui   a0, 0x1080000
+	ldc.i4 17301504
+	stloc.1
+// 0x01079e64: 0x1079e64: jal   0x104fd10 addiu a0, a0, -25008
+	ldloc.1
+	ldc.i4 -25008
+	add
 	stloc.1
-// 0x0107a19c: 0x107a19c: addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
-// 0x0107a1a0: 0x107a1a0: jal   0x1011298 addu  s4, v0, zero
-	ldloc 5
-	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a1a8: 0x107a1a8: lw    a0, 592(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 148
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107a1ac: 0x107a1ac: lw    a1, 584(sp)
-	ldloc 6
-	ldloc.0
+// 0x01079e6c: 0x1079e6c: lw    ra, 20(sp)
+// 0x01079e70: 0x1079e70: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01079e74: 0x1079e74: sw    zero, -15628(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 146
+	ldc.i4 -3907
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107a1b0: 0x107a1b0: sw    v0, 0(s3)
-	ldloc 6
-	ldloc 14
-	ldc.i4.2
-	shr.un
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107a1b4: 0x107a1b4: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107a1b8: 0x107a1b8: lw    v1, 588(sp)
-	ldloc 6
+// 0x01079e78: 0x1079e78: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 147
+	ldc.i4.s 24
 	add
-	ldelem.i4
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 on_popup_close_1079e80(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
 	stloc 7
-// 0x0107a1bc: 0x107a1bc: sw    a1, 0(s2)
-	ldloc 6
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldloc.2
-	stelem.i4
-// 0x0107a1c0: 0x107a1c0: sw    a0, 0(s1)
-	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldloc.1
-	stelem.i4
-// 0x0107a1c4: 0x107a1c4: sw    v0, 16(sp)
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x01079e80: 0x1079e80: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x01079e84: 0x1079e84: sw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
-// 0x0107a1c8: 0x107a1c8: addiu v0, sp, 580
-	ldloc.0
-	ldc.i4 580
-	add
-	stloc 5
-// 0x0107a1cc: 0x107a1cc: sw    v0, 20(sp)
+// 0x01079e88: 0x1079e88: lui   s2, 0x0
+	ldc.i4.s 0
+	stloc 10
+// 0x01079e8c: 0x1079e8c: lw    a1, 15944(s2)
 	ldloc 6
-	ldloc.0
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107a1d0: 0x107a1d0: addiu a0, sp, 1400
-	ldloc.0
-	ldc.i4 1400
+	ldc.i4 3986
 	add
-	stloc.1
-// 0x0107a1d4: 0x107a1d4: addiu v0, zero, 10
-	ldc.i4.s 10
-	stloc 5
-// 0x0107a1d8: 0x107a1d8: addu  a1, zero, zero
-	ldc.i4.s 0
+	ldelem.i4
 	stloc.2
-// 0x0107a1dc: 0x107a1dc: addiu a2, sp, 68
-	ldloc.0
-	ldc.i4.s 68
-	add
-	stloc.3
-// 0x0107a1e0: 0x107a1e0: addiu a3, zero, 1
-	ldc.i4.1
-	stloc 4
-// 0x0107a1e4: 0x107a1e4: sw    v1, 68(sp)
+// 0x01079e90: 0x1079e90: addiu v0, zero, -2
+	ldc.i4.s -2
+	stloc 5
+// 0x01079e94: 0x1079e94: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 17
+	ldc.i4.8
 	add
-	ldloc 7
+	ldloc 11
 	stelem.i4
-// 0x0107a1e8: 0x107a1e8: jal   0x1013028 sw    v0, 24(sp)
+// 0x01079e98: 0x1079e98: sw    ra, 36(sp)
+// 0x01079e9c: 0x1079e9c: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl13::roadmap_street_get_closest_1013028(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a1f0: 0x107a1f0: sw    v0, 1352(sp)
+// 0x01079ea0: 0x1079ea0: sw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 338
+	ldc.i4.5
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
-// 0x0107a1f4: 0x107a1f4: addiu s7, sp, 584
-	ldloc.0
-	ldc.i4 584
-	add
-	stloc 15
-// 0x0107a1f8: 0x107a1f8: addu  s6, zero, zero
-	ldc.i4.s 0
-	stloc 8
-// 0x0107a1fc: 0x107a1fc: j	 0x107a2ec lui   s8, 0x0
-	ldc.i4.s 0
-	stloc 16
-	br L_107a2ec
+// 0x01079ea4: 0x1079ea4: beq   a1, v0, 0x1079eec addu  s3, a0, zero
+	ldloc.2
+	ldloc 5
+	ldloc.1
+	stloc 11
+	beq  L_1079eec
 // --- basic block ---
-L_107a204:
-// 0x0107a204: 0x107a204: lw    v0, 8(s7)
-	ldloc 6
-	ldloc 15
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107a208: 0x107a208: lw    v1, 576(s8)
-	ldloc 6
-	ldloc 16
-	ldc.i4.2
-	shr.un
-	ldc.i4 144
-	add
-	ldelem.i4
+// 0x01079eac: 0x1079eac: addiu s0, zero, -1
+	ldc.i4.m1
 	stloc 7
-// 0x0107a20c: 0x107a20c: sll   zero, zero, 0
-// 0x0107a210: 0x107a210: beq   v0, v1, 0x107a228 sll   zero, zero, 0
-	ldloc 5
+// 0x01079eb0: 0x1079eb0: bne   a1, s0, 0x1079ed4 lui   s1, 0x80000
+	ldloc.2
 	ldloc 7
-	beq  L_107a228
+	ldc.i4 524288
+	stloc 9
+	bne.un L_1079ed4
 // --- basic block ---
-// 0x0107a218: 0x107a218: bltz  v0, 0x107a228 addu  a0, v0, zero
-	ldloc 5
-	ldloc 5
+// 0x01079eb8: 0x1079eb8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01079ebc: 0x1079ebc: jal   0x101ecf8 addiu a0, a0, -31052
+	ldloc.1
+	ldc.i4 -31052
+	add
 	stloc.1
-	ldc.i4.s 0
-	blt L_107a228
-// --- basic block ---
-// 0x0107a220: 0x107a220: jal   0x100b164 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-L_107a228:
-// 0x0107a228: 0x107a228: lw    a0, 0(s7)
-	ldloc 6
-	ldloc 15
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107a22c: 0x107a22c: jal   0x1011a4c addu  a1, s5, zero
-	ldloc 10
-	stloc.2
+// 0x01079ec4: 0x1079ec4: jal   0x1009a38 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_zoom_reset_1009a38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a234: 0x107a234: jal   0x1011818 addu  a0, s5, zero
-	ldloc 10
+// 0x01079ecc: 0x1079ecc: j	 0x1079ef0 lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+	br L_1079ef0
+// --- basic block ---
+L_1079ed4:
+// 0x01079ed4: 0x1079ed4: jal   0x10086cc addiu a0, s1, -13516
+	ldloc 9
+	ldc.i4 -13516
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a23c: 0x107a23c: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107a240: 0x107a240: addu  a0, s4, zero
+// 0x01079edc: 0x1079edc: addiu v0, s1, -13516
 	ldloc 9
-	stloc.1
-// 0x0107a244: 0x107a244: sw    v0, 0(s0)
+	ldc.i4 -13516
+	add
+	stloc 5
+// 0x01079ee0: 0x1079ee0: sw    s0, 15944(s2)
 	ldloc 6
-	ldloc 12
+	ldloc 10
 	ldc.i4.2
 	shr.un
+	ldc.i4 3986
+	add
+	ldloc 7
+	stelem.i4
+// 0x01079ee4: 0x1079ee4: sw    s0, 4(v0)
+	ldloc 6
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 7
 	stelem.i4
-// 0x0107a248: 0x107a248: jal   0x1001b14 sw    v0, 1356(sp)
+// 0x01079ee8: 0x1079ee8: sw    s0, -13516(s1)
 	ldloc 6
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 339
+	ldc.i4 -3379
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+L_1079eec:
+// 0x01079eec: 0x1079eec: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// --- basic block ---
-// 0x0107a250: 0x107a250: lw    v1, 1356(sp)
+L_1079ef0:
+// 0x01079ef0: 0x1079ef0: lw    a0, -15764(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 339
+	ldc.i4 -3941
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107a254: 0x107a254: addu  a0, s4, zero
-	ldloc 9
 	stloc.1
-// 0x0107a258: 0x107a258: addu  a1, v1, zero
-	ldloc 7
-	stloc.2
-// 0x0107a25c: 0x107a25c: beq   v0, zero, 0x107a2e4 addiu a2, zero, 2
-	ldloc 5
-	ldc.i4.2
-	stloc.3
-	brfalse L_107a2e4
-// --- basic block ---
-// 0x0107a264: 0x107a264: jal   0x1001b2c sll   zero, zero, 0
+// 0x01079ef4: 0x1079ef4: sll   zero, zero, 0
+// 0x01079ef8: 0x1079ef8: beq   a0, zero, 0x1079f0c lui   v0, 0x80000
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
+	ldc.i4 524288
 	stloc 5
+	brfalse L_1079f0c
 // --- basic block ---
-// 0x0107a26c: 0x107a26c: bne   v0, zero, 0x107a2e8 addiu s6, s6, 1
-	ldloc 5
-	ldloc 8
-	ldc.i4.1
-	add
-	stloc 8
-	brtrue L_107a2e8
-// --- basic block ---
-// 0x0107a274: 0x107a274: addiu s6, s6, -1
-	ldloc 8
-	ldc.i4.m1
-	add
-	stloc 8
-// 0x0107a278: 0x107a278: addu  a0, s5, zero
-	ldloc 10
-	stloc.1
-// 0x0107a27c: 0x107a27c: jal   0x1011298 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
+// 0x01079f00: 0x1079f00: jal   0x101ecf8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_city_1011298(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a284: 0x107a284: addiu a2, zero, 6
-	ldc.i4.6
-	stloc.3
-// 0x0107a288: 0x107a288: mult  s6, a2
-	ldloc 8
-	ldloc.3
-	mul
-	stloc 17
-// 0x0107a28c: 0x107a28c: sw    v0, 0(s3)
+// 0x01079f08: 0x1079f08: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_1079f0c:
+// 0x01079f0c: 0x1079f0c: bne   s3, zero, 0x1079f68 sw    zero, -15764(v0)
+	ldloc 11
 	ldloc 6
-	ldloc 14
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldloc 5
-	stelem.i4
-// 0x0107a290: 0x107a290: addiu v0, zero, 48
-	ldc.i4.s 48
-	stloc 5
-// 0x0107a294: 0x107a294: addiu v1, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+	ldc.i4 -3941
 	add
+	ldc.i4.s 0
+	stelem.i4
+	brtrue L_1079f68
+// --- basic block ---
+// 0x01079f14: 0x1079f14: lui   s0, 0x80000
+	ldc.i4 524288
 	stloc 7
-// 0x0107a298: 0x107a298: lw    a1, 32(sp)
+// 0x01079f18: 0x1079f18: lw    v0, -13544(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4 -3386
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107a29c: 0x107a29c: addiu a0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc.1
-// 0x0107a2a0: 0x107a2a0: mflo  lo
-	ldloc 17
-	stloc.3
-// 0x0107a2a4: 0x107a2a4: addiu a2, a2, 1
-	ldloc.3
-	ldc.i4.1
-	add
-	stloc.3
-// 0x0107a2a8: 0x107a2a8: sll   a2, a2, 3
-	ldloc.3
-	ldc.i4.3
-	shl
-	stloc.3
-// 0x0107a2ac: 0x107a2ac: mult  s6, v0
-	ldloc 8
+	stloc 5
+// 0x01079f1c: 0x1079f1c: sll   zero, zero, 0
+// 0x01079f20: 0x1079f20: beq   v0, zero, 0x1079f44 lui   a0, 0x1080000
 	ldloc 5
-	mul
-	stloc 17
-// 0x0107a2b0: 0x107a2b0: addu  a2, v1, a2
-	ldloc 7
-	ldloc.3
+	ldc.i4 17301504
+	stloc.1
+	brfalse L_1079f44
+// --- basic block ---
+// 0x01079f28: 0x1079f28: jal   0x104fd10 addiu a0, a0, 332
+	ldloc.1
+	ldc.i4 332
 	add
-	stloc.3
-// 0x0107a2b4: 0x107a2b4: lw    v0, 552(a2)
-	ldloc 6
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x01079f30: 0x1079f30: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x01079f34: 0x1079f34: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x01079f38: 0x1079f38: jal   0x106b10c sw    zero, -13528(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 138
+	ldc.i4 -3382
 	add
-	ldelem.i4
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.1
+	call int32 Cibyl79::RealTime_SetMapDisplayed_106b10c(int32)
 	stloc 5
-// 0x0107a2b8: 0x107a2b8: sll   zero, zero, 0
-// 0x0107a2bc: 0x107a2bc: sw    v0, 0(s1)
+// --- basic block ---
+// 0x01079f40: 0x1079f40: sw    zero, -13544(s0)
 	ldloc 6
-	ldloc 11
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldloc 5
-	stelem.i4
-// 0x0107a2c0: 0x107a2c0: mflo  lo
-	ldloc 17
-	stloc 8
-// 0x0107a2c4: 0x107a2c4: addu  v1, v1, s6
-	ldloc 7
-	ldloc 8
+	ldc.i4 -3386
 	add
+	ldc.i4.s 0
+	stelem.i4
+L_1079f44:
+// 0x01079f44: 0x1079f44: lui   s0, 0x80000
+	ldc.i4 524288
 	stloc 7
-// 0x0107a2c8: 0x107a2c8: lw    v0, 552(v1)
+// 0x01079f48: 0x1079f48: lw    v0, -13524(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 138
+	ldc.i4 -3381
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107a2cc: 0x107a2cc: jal   0x10086bc sw    v0, 0(s2)
-	ldloc 6
-	ldloc 13
-	ldc.i4.2
-	shr.un
+// 0x01079f4c: 0x1079f4c: sll   zero, zero, 0
+// 0x01079f50: 0x1079f50: beq   v0, zero, 0x1079f74 sll   zero, zero, 0
 	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	brfalse L_1079f74
 // --- basic block ---
-// 0x0107a2d4: 0x107a2d4: jal   0x1000930 addu  a0, s4, zero
-	ldloc 9
+// 0x01079f58: 0x1079f58: lui   a0, 0x1080000
+	ldc.i4 17301504
+	stloc.1
+// 0x01079f5c: 0x1079f5c: jal   0x104fd10 addiu a0, a0, -488
+	ldloc.1
+	ldc.i4 -488
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a2dc: 0x107a2dc: j	 0x107a360 addiu v0, zero, 1
-	ldc.i4.1
+	stloc 8
 	stloc 5
-	br L_107a360
 // --- basic block ---
-L_107a2e4:
-// 0x0107a2e4: 0x107a2e4: addiu s6, s6, 1
-	ldloc 8
-	ldc.i4.1
-	add
-	stloc 8
-L_107a2e8:
-// 0x0107a2e8: 0x107a2e8: addiu s7, s7, 48
-	ldloc 15
-	ldc.i4.s 48
-	add
-	stloc 15
-L_107a2ec:
-// 0x0107a2ec: 0x107a2ec: lw    v1, 1352(sp)
+// 0x01079f64: 0x1079f64: sw    zero, -13524(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 338
+	ldc.i4 -3381
 	add
-	ldelem.i4
+	ldc.i4.s 0
+	stelem.i4
+L_1079f68:
+// 0x01079f68: 0x1079f68: lui   s0, 0x80000
+	ldc.i4 524288
 	stloc 7
-// 0x0107a2f0: 0x107a2f0: sll   zero, zero, 0
-// 0x0107a2f4: 0x107a2f4: slt   v0, s6, v1
-	ldloc 8
+// 0x01079f6c: 0x1079f6c: lw    v0, -13524(s0)
+	ldloc 6
 	ldloc 7
-	clt
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3381
+	add
+	ldelem.i4
 	stloc 5
-// 0x0107a2f8: 0x107a2f8: bne   v0, zero, 0x107a204 sll   zero, zero, 0
+// 0x01079f70: 0x1079f70: sll   zero, zero, 0
+L_1079f74:
+// 0x01079f74: 0x1079f74: beq   v0, zero, 0x1079f8c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107a204
+	brfalse L_1079f8c
 // --- basic block ---
-// 0x0107a300: 0x107a300: jal   0x1000930 addu  a0, s4, zero
-	ldloc 9
+// 0x01079f7c: 0x1079f7c: lui   a0, 0x1080000
+	ldc.i4 17301504
+	stloc.1
+// 0x01079f80: 0x1079f80: jal   0x104fd10 addiu a0, a0, -488
+	ldloc.1
+	ldc.i4 -488
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a308: 0x107a308: addiu s1, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc 11
-// 0x0107a30c: 0x107a30c: lw    a0, 584(sp)
+// 0x01079f88: 0x1079f88: sw    zero, -13524(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 146
+	ldc.i4 -3381
+	add
+	ldc.i4.s 0
+	stelem.i4
+L_1079f8c:
+// 0x01079f8c: 0x1079f8c: jal   0x101f94c sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_set_orientation_dynamic_101f94c()
+	stloc 5
+// --- basic block ---
+// 0x01079f94: 0x1079f94: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x01079f98: 0x1079f98: jal   0x103fdcc addiu a0, a0, -29376
+	ldloc.1
+	ldc.i4 -29376
 	add
-	ldelem.i4
 	stloc.1
-// 0x0107a310: 0x107a310: jal   0x1011a4c addu  a1, s1, zero
-	ldloc 11
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_properties_1011a4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl47::roadmap_softkeys_remove_right_soft_key_103fdcc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a318: 0x107a318: jal   0x1011818 addu  a0, s1, zero
-	ldloc 11
-	stloc.1
+// 0x01079fa0: 0x1079fa0: jal   0x1010a5c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl12::roadmap_street_get_street_name_1011818(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a320: 0x107a320: j	 0x107a350 sw    v0, 0(s0)
-	ldloc 6
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldloc 5
-	stelem.i4
-	br L_107a350
-// --- basic block ---
-L_107a328:
-// 0x0107a328: 0x107a328: lw    a1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc.2
-// 0x0107a32c: 0x107a32c: sw    zero, 0(s3)
-	ldloc 6
-	ldloc 14
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107a330: 0x107a330: sw    v0, 0(s2)
-	ldloc 6
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldloc 5
-	stelem.i4
-// 0x0107a334: 0x107a334: sw    zero, 0(s0)
-	ldloc 6
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107a338: 0x107a338: sw    v0, 0(s1)
-	ldloc 6
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldloc 5
-	stelem.i4
-// 0x0107a33c: 0x107a33c: addu  a0, s4, zero
-	ldloc 9
-	stloc.1
-L_107a340:
-// 0x0107a340: 0x107a340: jal   0x10086bc sll   zero, zero, 0
+// 0x01079fa8: 0x1079fa8: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a348: 0x107a348: j	 0x107a360 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_107a360
+// 0x01079fb0: 0x1079fb0: bne   v0, zero, 0x1079fc0 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_1079fc0
 // --- basic block ---
-L_107a350:
-// 0x0107a350: 0x107a350: lw    a1, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc.2
-// 0x0107a354: 0x107a354: jal   0x10086bc addiu a0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc.1
+// 0x01079fb8: 0x1079fb8: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107a35c: 0x107a35c: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-L_107a360:
-// 0x0107a360: 0x107a360: lw    ra, 1396(sp)
-// 0x0107a364: 0x107a364: lw    s8, 1392(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 348
-	add
-	ldelem.i4
-	stloc 16
-// 0x0107a368: 0x107a368: lw    s7, 1388(sp)
+L_1079fc0:
+// 0x01079fc0: 0x1079fc0: lw    ra, 36(sp)
+// 0x01079fc4: 0x1079fc4: lw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 347
-	add
-	ldelem.i4
-	stloc 15
-// 0x0107a36c: 0x107a36c: lw    s6, 1384(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 346
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107a370: 0x107a370: lw    s5, 1380(sp)
+	stloc 11
+// 0x01079fc8: 0x1079fc8: lw    s2, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 345
+	ldc.i4.7
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107a374: 0x107a374: lw    s4, 1376(sp)
+// 0x01079fcc: 0x1079fcc: lw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 344
+	ldc.i4.6
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107a378: 0x107a378: lw    s3, 1372(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 343
-	add
-	ldelem.i4
-	stloc 14
-// 0x0107a37c: 0x107a37c: lw    s2, 1368(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 342
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107a380: 0x107a380: lw    s1, 1364(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 341
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107a384: 0x107a384: lw    s0, 1360(sp)
+// 0x01079fd0: 0x1079fd0: lw    s0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 340
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 12
-// 0x0107a388: 0x107a388: jr    ra addiu sp, sp, 1400
+	stloc 7
+// 0x01079fd4: 0x1079fd4: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4 1400
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Get_Sound_107a390(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 ra)
 
 // local  5 is register v0
-// local  6 is register v1
+// local  8 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register s0
+// local  7 is register s0
 // local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
 // local  0 is register sp
-// local 10 is register ra
-// local  7 is register mem
+// local 12 is register ra
+// local  6 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 6
+	stloc 8
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -6678,25 +5674,47 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 7
 	ldc.i4.s 0
 	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 10
+	stloc 12
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_107a390:
-// 0x0107a390: 0x107a390: addiu sp, sp, -32
+// 0x01079fdc: 0x1079fdc: addiu sp, sp, -40
 	ldloc.0
-	ldc.i4.s -32
+	ldc.i4.s -40
 	add
 	stloc.0
-// 0x0107a394: 0x107a394: sw    s1, 24(sp)
-	ldloc 7
+// 0x01079fe0: 0x1079fe0: sw    ra, 36(sp)
+// 0x01079fe4: 0x1079fe4: sw    s3, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 11
+	stelem.i4
+// 0x01079fe8: 0x1079fe8: sw    s2, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 10
+	stelem.i4
+// 0x01079fec: 0x1079fec: sw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6704,159 +5722,274 @@ L_107a390:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107a398: 0x107a398: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0107a39c: 0x107a39c: sw    s0, 20(sp)
-	ldloc 7
+// 0x01079ff0: 0x1079ff0: jal   0x10945b4 sw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
-	ldloc 8
+	ldloc 7
 	stelem.i4
-// 0x0107a3a0: 0x107a3a0: sw    ra, 28(sp)
-// 0x0107a3a4: 0x107a3a4: jal   0x10518a8 addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107a3ac: 0x107a3ac: addu  s0, v0, zero
+// 0x01079ff8: 0x1079ff8: beq   v0, zero, 0x107a088 lui   s0, 0x80000
 	ldloc 5
-	stloc 8
-// 0x0107a3b0: 0x107a3b0: lui   v0, 0x80000
 	ldc.i4 524288
+	stloc 7
+	brfalse L_107a088
+// --- basic block ---
+// 0x0107a000: 0x107a000: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-// 0x0107a3b4: 0x107a3b4: addiu v0, v0, -16028
+// --- basic block ---
+// 0x0107a008: 0x107a008: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107a00c: 0x107a00c: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4 -16028
+	stloc.1
+// 0x0107a010: 0x107a010: jal   0x1001b14 addiu a1, a1, -26284
+	ldloc.2
+	ldc.i4 -26284
 	add
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
-// 0x0107a3b8: 0x107a3b8: addu  v1, v0, zero
-	ldloc 5
-	stloc 6
-// 0x0107a3bc: 0x107a3bc: lw    a1, 2000(v0)
-	ldloc 7
+// --- basic block ---
+// 0x0107a018: 0x107a018: bne   v0, zero, 0x107a088 lui   s0, 0x80000
 	ldloc 5
+	ldc.i4 524288
+	stloc 7
+	brtrue L_107a088
+// --- basic block ---
+// 0x0107a020: 0x107a020: lui   s2, 0x0
+	ldc.i4.s 0
+	stloc 10
+// 0x0107a024: 0x107a024: lw    a1, 15944(s2)
+	ldloc 6
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 3986
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107a3c0: 0x107a3c0: j	 0x107a400 addu  v0, zero, zero
-	ldc.i4.s 0
+// 0x0107a028: 0x107a028: addiu s0, zero, -1
+	ldc.i4.m1
+	stloc 7
+// 0x0107a02c: 0x107a02c: bne   a1, s0, 0x107a04c lui   s3, 0x10000
+	ldloc.2
+	ldloc 7
+	ldc.i4 65536
+	stloc 11
+	bne.un L_107a04c
+// --- basic block ---
+// 0x0107a034: 0x107a034: jal   0x101ecf8 addiu a0, s3, -31052
+	ldloc 11
+	ldc.i4 -31052
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	br L_107a400
 // --- basic block ---
-L_107a3c8:
-// 0x0107a3c8: 0x107a3c8: lw    a0, 0(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+// 0x0107a03c: 0x107a03c: jal   0x1009a38 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl6::roadmap_math_zoom_reset_1009a38(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0107a044: 0x107a044: j	 0x107a070 sll   zero, zero, 0
+	br L_107a070
+// --- basic block ---
+L_107a04c:
+// 0x0107a04c: 0x107a04c: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 9
+// 0x0107a050: 0x107a050: jal   0x10086cc addiu a0, s1, -13516
+	ldloc 9
+	ldc.i4 -13516
+	add
 	stloc.1
-// 0x0107a3cc: 0x107a3cc: sll   zero, zero, 0
-// 0x0107a3d0: 0x107a3d0: lw    a2, 0(a0)
-	ldloc 7
+	ldloc.0
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.3
-// 0x0107a3d4: 0x107a3d4: sll   zero, zero, 0
-// 0x0107a3d8: 0x107a3d8: bne   a2, s1, 0x107a400 addiu v1, v1, 4
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0107a058: 0x107a058: jal   0x101ecf8 addiu a0, s3, -31052
+	ldloc 11
+	ldc.i4 -31052
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
+	ldloc 4
+	call int32 Cibyl22::roadmap_trip_set_focus_101ecf8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0107a060: 0x107a060: addiu v0, s1, -13516
 	ldloc 9
+	ldc.i4 -13516
+	add
+	stloc 5
+// 0x0107a064: 0x107a064: sw    s0, 15944(s2)
 	ldloc 6
-	ldc.i4.4
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 3986
 	add
-	stloc 6
-	bne.un L_107a400
-// --- basic block ---
-// 0x0107a3e0: 0x107a3e0: lw    v0, 4(a0)
 	ldloc 7
-	ldloc.1
+	stelem.i4
+// 0x0107a068: 0x107a068: sw    s0, 4(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.1
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107a3e4: 0x107a3e4: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0107a3e8: 0x107a3e8: beq   v0, v1, 0x107a414 addiu v1, zero, 2
-	ldloc 5
+	ldloc 7
+	stelem.i4
+// 0x0107a06c: 0x107a06c: sw    s0, -13516(s1)
 	ldloc 6
+	ldloc 9
 	ldc.i4.2
-	stloc 6
-	beq  L_107a414
-// --- basic block ---
-// 0x0107a3f0: 0x107a3f0: bne   v0, v1, 0x107a424 lui   a1, 0x10000
-	ldloc 5
-	ldloc 6
-	ldc.i4 65536
-	stloc.2
-	bne.un L_107a424
-// --- basic block ---
-// 0x0107a3f8: 0x107a3f8: j	 0x107a41c addiu a1, a1, -19640
-	ldloc.2
-	ldc.i4 -19640
+	shr.un
+	ldc.i4 -3379
 	add
-	stloc.2
-	br L_107a41c
-// --- basic block ---
-L_107a400:
-// 0x0107a400: 0x107a400: slt   a0, v0, a1
-	ldloc 5
-	ldloc.2
-	clt
+	ldloc 7
+	stelem.i4
+L_107a070:
+// 0x0107a070: 0x107a070: jal   0x10951ac addiu a0, zero, 2
+	ldc.i4.2
 	stloc.1
-// 0x0107a404: 0x107a404: bne   a0, zero, 0x107a3c8 addiu v0, v0, 1
+	ldloc.0
 	ldloc.1
-	ldloc 5
-	ldc.i4.1
-	add
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 5
-	brtrue L_107a3c8
 // --- basic block ---
-// 0x0107a40c: 0x107a40c: j	 0x107a424 sll   zero, zero, 0
-	br L_107a424
+// 0x0107a078: 0x107a078: jal   0x1010a5c lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl12::roadmap_layer_adjust_1010a5c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
 // --- basic block ---
-L_107a414:
-// 0x0107a414: 0x107a414: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107a418: 0x107a418: addiu a1, a1, -19680
+// 0x0107a080: 0x107a080: jal   0x1021910 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 -19680
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+L_107a088:
+// 0x0107a088: 0x107a088: lw    v0, -13524(s0)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3381
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107a08c: 0x107a08c: sll   zero, zero, 0
+// 0x0107a090: 0x107a090: beq   v0, zero, 0x107a0a8 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107a0a8
+// --- basic block ---
+// 0x0107a098: 0x107a098: lui   a0, 0x1080000
+	ldc.i4 17301504
+	stloc.1
+// 0x0107a09c: 0x107a09c: jal   0x104fd10 addiu a0, a0, -488
+	ldloc.1
+	ldc.i4 -488
 	add
-	stloc.2
-L_107a41c:
-// 0x0107a41c: 0x107a41c: jal   0x10518cc addu  a0, s0, zero
-	ldloc 8
 	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-L_107a424:
-// 0x0107a424: 0x107a424: lw    ra, 28(sp)
-// 0x0107a428: 0x107a428: addu  v0, s0, zero
-	ldloc 8
-	stloc 5
-// 0x0107a42c: 0x107a42c: lw    s1, 24(sp)
+// 0x0107a0a4: 0x107a0a4: sw    zero, -13524(s0)
+	ldloc 6
 	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3381
+	add
+	ldc.i4.s 0
+	stelem.i4
+L_107a0a8:
+// 0x0107a0a8: 0x107a0a8: lw    ra, 36(sp)
+// 0x0107a0ac: 0x107a0ac: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107a0b0: 0x107a0b0: lw    s3, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 11
+// 0x0107a0b4: 0x107a0b4: lw    s2, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107a0b8: 0x107a0b8: lw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -6864,31 +5997,40 @@ L_107a424:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107a430: 0x107a430: lw    s0, 20(sp)
-	ldloc 7
+// 0x0107a0bc: 0x107a0bc: lw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107a434: 0x107a434: jr    ra addiu sp, sp, 32
+	stloc 7
+// 0x0107a0c0: 0x107a0c0: sw    zero, -13552(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3388
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107a0c4: 0x107a0c4: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 8
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Get_Map_Icon_107a43c(int32,int32,int32,int32,int32)
+.method public static int32 post_comment_keyboard_callback_107a0cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
 
 // local  5 is register v0
 // local  6 is register v1
@@ -6896,10 +6038,12 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  7 is register s0
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
 // local  0 is register sp
-// local  9 is register ra
-// local  8 is register mem
+// local 11 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
@@ -6914,358 +6058,1872 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 7
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 9
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 11
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107a0cc: 0x107a0cc: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0107a0d0: 0x107a0d0: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0107a0d4: 0x107a0d4: sw    s1, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 9
+	stelem.i4
+// 0x0107a0d8: 0x107a0d8: sw    ra, 36(sp)
+// 0x0107a0dc: 0x107a0dc: sw    s2, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldloc 10
+	stelem.i4
+// 0x0107a0e0: 0x107a0e0: sw    s0, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107a0e4: 0x107a0e4: addu  s1, a1, zero
+	ldloc.2
+	stloc 9
+// 0x0107a0e8: 0x107a0e8: bne   a0, v1, 0x107a1a8 addiu v0, zero, 1
+	ldloc.1
+	ldloc 6
+	ldc.i4.1
+	stloc 5
+	bne.un L_107a1a8
+// --- basic block ---
+// 0x0107a0f0: 0x107a0f0: lb    v1, 0(a1)
+	ldloc.2
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x0107a0f4: 0x107a0f4: sll   zero, zero, 0
+// 0x0107a0f8: 0x107a0f8: beq   v1, zero, 0x107a1a8 addu  v0, zero, zero
+	ldloc 6
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_107a1a8
+// --- basic block ---
+// 0x0107a100: 0x107a100: lw    s2, 0(a2)
+	ldloc 7
+	ldloc.3
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 10
+// 0x0107a104: 0x107a104: jal   0x1026d08 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_twitter_is_sending_enabled_1026d08(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a10c: 0x107a10c: beq   v0, zero, 0x107a128 addu  s0, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 8
+	brfalse L_107a128
+// --- basic block ---
+// 0x0107a114: 0x107a114: jal   0x1026eec addiu s0, zero, 1
+	ldc.i4.1
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_twitter_logged_in_1026eec(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a11c: 0x107a11c: bne   v0, zero, 0x107a128 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_107a128
+// --- basic block ---
+// 0x0107a124: 0x107a124: addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 8
+L_107a128:
+// 0x0107a128: 0x107a128: jal   0x1026ce4 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_facebook_is_sending_enabled_1026ce4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a130: 0x107a130: beq   v0, zero, 0x107a14c addu  a3, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc 4
+	brfalse L_107a14c
+// --- basic block ---
+// 0x0107a138: 0x107a138: jal   0x1026da4 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl29::roadmap_facebook_logged_in_1026da4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a140: 0x107a140: bne   v0, zero, 0x107a14c addiu a3, zero, 1
+	ldloc 5
+	ldc.i4.1
+	stloc 4
+	brtrue L_107a14c
+// --- basic block ---
+// 0x0107a148: 0x107a148: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+L_107a14c:
+// 0x0107a14c: 0x107a14c: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x0107a150: 0x107a150: addu  a1, s1, zero
+	ldloc 9
+	stloc.2
+// 0x0107a154: 0x107a154: jal   0x106d0c4 addu  a2, s0, zero
+	ldloc 8
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl81::Realtime_Post_Alert_Comment_106d0c4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a15c: 0x107a15c: beq   v0, zero, 0x107a1a8 addu  a0, zero, zero
+	ldloc 5
+	ldc.i4.s 0
+	stloc.1
+	brfalse L_107a1a8
+// --- basic block ---
+// 0x0107a164: 0x107a164: lui   s0, 0x0
+	ldc.i4.s 0
+	stloc 8
+// 0x0107a168: 0x107a168: jal   0x10950dc sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a170: 0x107a170: lw    a0, 15880(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 3970
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107a174: 0x107a174: addiu v1, zero, 2
+	ldc.i4.2
+	stloc 6
+// 0x0107a178: 0x107a178: lw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107a17c: 0x107a17c: bne   a0, v1, 0x107a194 sll   zero, zero, 0
+	ldloc.1
+	ldloc 6
+	bne.un L_107a194
+// --- basic block ---
+// 0x0107a184: 0x107a184: jal   0x1079fdc sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a18c: 0x107a18c: j	 0x107a1a0 addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+	br L_107a1a0
+// --- basic block ---
+L_107a194:
+// 0x0107a194: 0x107a194: jal   0x1079418 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl91::RTAlerts_Comment_PopUp_Hide_1079418(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a19c: 0x107a19c: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+L_107a1a0:
+// 0x0107a1a0: 0x107a1a0: lw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107a1a4: 0x107a1a4: sw    v1, 15880(s0)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 3970
+	add
+	ldloc 6
+	stelem.i4
+L_107a1a8:
+// 0x0107a1a8: 0x107a1a8: lw    ra, 36(sp)
+// 0x0107a1ac: 0x107a1ac: lw    s2, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107a1b0: 0x107a1b0: lw    s1, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107a1b4: 0x107a1b4: lw    s0, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107a1b8: 0x107a1b8: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Cancel_Scrolling_107a1c0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107a1c0:
+// 0x0107a1c0: 0x107a1c0: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107a1c4: 0x107a1c4: sw    ra, 20(sp)
+// 0x0107a1c8: 0x107a1c8: jal   0x1079fdc sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0107a1d0: 0x107a1d0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107a1d4: 0x107a1d4: lw    v0, -13528(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3382
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107a1d8: 0x107a1d8: sll   zero, zero, 0
+// 0x0107a1dc: 0x107a1dc: beq   v0, zero, 0x107a1f0 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107a1f0
+// --- basic block ---
+// 0x0107a1e4: 0x107a1e4: lui   a0, 0x1080000
+	ldc.i4 17301504
+	stloc.1
+// 0x0107a1e8: 0x107a1e8: jal   0x104fd10 addiu a0, a0, 332
+	ldloc.1
+	ldc.i4 332
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+L_107a1f0:
+// 0x0107a1f0: 0x107a1f0: lw    ra, 20(sp)
+// 0x0107a1f4: 0x107a1f4: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107a1f8: 0x107a1f8: sw    zero, -13528(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3382
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107a1fc: 0x107a1fc: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 on_groups_callbak_107a204(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107a204: 0x107a204: lw    a0, 116(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 29
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107a208: 0x107a208: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107a20c: 0x107a20c: sw    ra, 20(sp)
+// 0x0107a210: 0x107a210: beq   a0, zero, 0x107a224 addu  v0, zero, zero
+	ldloc.1
+	ldc.i4.s 0
+	stloc 5
+	brfalse L_107a224
+// --- basic block ---
+// 0x0107a218: 0x107a218: jal   0x105475c addiu a0, a0, 1624
+	ldloc.1
+	ldc.i4 1624
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl62::roadmap_groups_show_group_105475c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0107a220: 0x107a220: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+L_107a224:
+// 0x0107a224: 0x107a224: lw    ra, 20(sp)
+// 0x0107a228: 0x107a228: sll   zero, zero, 0
+// 0x0107a22c: 0x107a22c: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Download_Image_107a234(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 s0,int32 v0,int32 ra)
+
+// local  8 is register v0
+// local  5 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 5
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107a234: 0x107a234: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107a238: 0x107a238: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 7
+	stelem.i4
+// 0x0107a23c: 0x107a23c: addu  s0, a0, zero
+	ldloc.1
+	stloc 7
+// 0x0107a240: 0x107a240: sw    ra, 20(sp)
+// 0x0107a244: 0x107a244: jal   0x1000910 addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 8
+// --- basic block ---
+// 0x0107a24c: 0x107a24c: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107a250: 0x107a250: addiu v1, v1, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107a254: 0x107a254: sw    s0, 0(v0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldloc 7
+	stelem.i4
+// 0x0107a258: 0x107a258: addu  a1, v1, zero
+	ldloc 5
+	stloc.2
+// 0x0107a25c: 0x107a25c: lw    a2, 2000(v1)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.3
+// 0x0107a260: 0x107a260: j	 0x107a29c addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_107a29c
+// --- basic block ---
+L_107a268:
+// 0x0107a268: 0x107a268: lw    a0, 0(a1)
+	ldloc 6
+	ldloc.2
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0107a26c: 0x107a26c: addiu v1, v1, 1
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+// 0x0107a270: 0x107a270: lw    a3, 0(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x0107a274: 0x107a274: sll   zero, zero, 0
+// 0x0107a278: 0x107a278: bne   a3, s0, 0x107a29c addiu a1, a1, 4
+	ldloc 4
+	ldloc 7
+	ldloc.2
+	ldc.i4.4
+	add
+	stloc.2
+	bne.un L_107a29c
+// --- basic block ---
+// 0x0107a280: 0x107a280: lui   a2, 0x1080000
+	ldc.i4 17301504
+	stloc.3
+// 0x0107a284: 0x107a284: addiu a0, a0, 708
+	ldloc.1
+	ldc.i4 708
+	add
+	stloc.1
+// 0x0107a288: 0x107a288: addu  a1, v0, zero
+	ldloc 8
+	stloc.2
+// 0x0107a28c: 0x107a28c: jal   0x100feac addiu a2, a2, -23840
+	ldloc.3
+	ldc.i4 -23840
+	add
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl11::roadmap_camera_image_download_100feac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 5
+	stloc 8
+// --- basic block ---
+// 0x0107a294: 0x107a294: j	 0x107a2a8 sll   zero, zero, 0
+	br L_107a2a8
+// --- basic block ---
+L_107a29c:
+// 0x0107a29c: 0x107a29c: slt   a0, v1, a2
+	ldloc 5
+	ldloc.3
+	clt
+	stloc.1
+// 0x0107a2a0: 0x107a2a0: bne   a0, zero, 0x107a268 sll   zero, zero, 0
+	ldloc.1
+	brtrue L_107a268
+// --- basic block ---
+L_107a2a8:
+// 0x0107a2a8: 0x107a2a8: lw    ra, 20(sp)
+// 0x0107a2ac: 0x107a2ac: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x0107a2b0: 0x107a2b0: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 5
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 on_view_image_107a2b8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  6 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 6
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107a2b8: 0x107a2b8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107a2bc: 0x107a2bc: lw    a0, -13540(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3385
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107a2c0: 0x107a2c0: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107a2c4: 0x107a2c4: sw    ra, 20(sp)
+// 0x0107a2c8: 0x107a2c8: jal   0x107a234 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl91::RTAlerts_Download_Image_107a234(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 5
+// --- basic block ---
+// 0x0107a2d0: 0x107a2d0: lw    ra, 20(sp)
+// 0x0107a2d4: 0x107a2d4: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+// 0x0107a2d8: 0x107a2d8: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Download_Image_Callback_107a2e0(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s1,int32 s4,int32 s3,int32 s6,int32 s5,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local 10 is register s1
+// local  8 is register s2
+// local 12 is register s3
+// local 11 is register s4
+// local 14 is register s5
+// local 13 is register s6
+// local  0 is register sp
+// local 15 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 13
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 15
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107a2e0: 0x107a2e0: addiu sp, sp, -96
+	ldloc.0
+	ldc.i4.s -96
+	add
+	stloc.0
+// 0x0107a2e4: 0x107a2e4: sw    s2, 72(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107a2e8: 0x107a2e8: addu  s2, a1, zero
+	ldloc.2
+	stloc 8
+// 0x0107a2ec: 0x107a2ec: sw    s5, 84(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 21
+	add
+	ldloc 14
+	stelem.i4
+// 0x0107a2f0: 0x107a2f0: sw    s1, 68(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldloc 10
+	stelem.i4
+// 0x0107a2f4: 0x107a2f4: sw    s0, 64(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldloc 9
+	stelem.i4
+// 0x0107a2f8: 0x107a2f8: sw    ra, 92(sp)
+// 0x0107a2fc: 0x107a2fc: sw    s6, 88(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 22
+	add
+	ldloc 13
+	stelem.i4
+// 0x0107a300: 0x107a300: sw    s4, 80(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
+	add
+	ldloc 11
+	stelem.i4
+// 0x0107a304: 0x107a304: sw    s3, 76(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldloc 12
+	stelem.i4
+// 0x0107a308: 0x107a308: addu  s5, a0, zero
+	ldloc.1
+	stloc 14
+// 0x0107a30c: 0x107a30c: lw    s0, 0(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 9
+// 0x0107a310: 0x107a310: jal   0x104c400 addu  s1, a2, zero
+	ldloc.3
+	stloc 10
+	call int32 Cibyl56::ssd_progress_msg_dialog_hide_104c400()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a318: 0x107a318: bne   s2, zero, 0x107a578 lui   a1, 0x20000
+	ldloc 8
+	ldc.i4 131072
+	stloc.2
+	brtrue L_107a578
+// --- basic block ---
+// 0x0107a320: 0x107a320: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x0107a324: 0x107a324: jal   0x104ecb0 addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl58::roadmap_canvas_load_image_104ecb0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a32c: 0x107a32c: beq   v0, zero, 0x107a550 addu  s1, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc 10
+	brfalse L_107a550
+// --- basic block ---
+// 0x0107a334: 0x107a334: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107a338: 0x107a338: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107a33c: 0x107a33c: addu  v1, v0, zero
+	ldloc 5
+	stloc 7
+// 0x0107a340: 0x107a340: lw    a1, 2000(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107a344: 0x107a344: j	 0x107a364 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_107a364
+// --- basic block ---
+L_107a34c:
+// 0x0107a34c: 0x107a34c: lw    a0, 0(v1)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0107a350: 0x107a350: sll   zero, zero, 0
+// 0x0107a354: 0x107a354: lw    a2, 0(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x0107a358: 0x107a358: sll   zero, zero, 0
+// 0x0107a35c: 0x107a35c: beq   a2, s0, 0x107a374 addiu v1, v1, 4
+	ldloc.3
+	ldloc 9
+	ldloc 7
+	ldc.i4.4
+	add
+	stloc 7
+	beq  L_107a374
+// --- basic block ---
+L_107a364:
+// 0x0107a364: 0x107a364: slt   a0, v0, a1
+	ldloc 5
+	ldloc.2
+	clt
+	stloc.1
+// 0x0107a368: 0x107a368: bne   a0, zero, 0x107a34c addiu v0, v0, 1
+	ldloc.1
+	ldloc 5
+	ldc.i4.1
+	add
+	stloc 5
+	brtrue L_107a34c
+// --- basic block ---
+// 0x0107a370: 0x107a370: addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+L_107a374:
+// 0x0107a374: 0x107a374: lw    a1, 4(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107a378: 0x107a378: lw    a2, 8(a0)
+	ldloc 6
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldelem.i4
+	stloc.3
+// 0x0107a37c: 0x107a37c: jal   0x10784cc lui   s3, 0x20000
+	ldc.i4 131072
+	stloc 12
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl90::RTAlerts_get_title_10784cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a384: 0x107a384: addiu a0, s3, -25972
+	ldloc 12
+	ldc.i4 -25972
+	add
+	stloc.1
+// 0x0107a388: 0x107a388: jal   0x1096534 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a390: 0x107a390: bne   v0, zero, 0x107a530 addu  s0, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc 9
+	brtrue L_107a530
+// --- basic block ---
+// 0x0107a398: 0x107a398: addiu s4, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 11
+// 0x0107a39c: 0x107a39c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107a3a0: 0x107a3a0: addiu a1, a1, 29688
+	ldloc.2
+	ldc.i4 29688
+	add
+	stloc.2
+// 0x0107a3a4: 0x107a3a4: addu  a0, s4, zero
+	ldloc 11
+	stloc.1
+// 0x0107a3a8: 0x107a3a8: jal   0x1001800 addiu a2, zero, 16
+	ldc.i4.s 16
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a3b0: 0x107a3b0: lui   s6, 0x10000
+	ldc.i4 65536
+	stloc 13
+// 0x0107a3b4: 0x107a3b4: lui   a3, 0x10010000
+	ldc.i4 268500992
+	stloc 4
+// 0x0107a3b8: 0x107a3b8: ori   a3, a3, 20481
+	ldloc 4
+	ldc.i4 20481
+	or
+	stloc 4
+// 0x0107a3bc: 0x107a3bc: addiu a0, s3, -25972
+	ldloc 12
+	ldc.i4 -25972
+	add
+	stloc.1
+// 0x0107a3c0: 0x107a3c0: addiu a1, s6, 18768
+	ldloc 13
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107a3c4: 0x107a3c4: jal   0x1096050 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a3cc: 0x107a3cc: bne   v0, zero, 0x107a3f8 addu  s0, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc 9
+	brtrue L_107a3f8
+// --- basic block ---
+// 0x0107a3d4: 0x107a3d4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107a3d8: 0x107a3d8: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x0107a3dc: 0x107a3dc: addiu a1, a1, -26248
+	ldloc.2
+	ldc.i4 -26248
+	add
+	stloc.2
+// 0x0107a3e0: 0x107a3e0: addiu a3, a3, -25944
+	ldloc 4
+	ldc.i4 -25944
+	add
+	stloc 4
+// 0x0107a3e4: 0x107a3e4: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0107a3e8: 0x107a3e8: jal   0x100449c addiu a2, zero, 3888
+	ldc.i4 3888
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a3f0: 0x107a3f0: j	 0x107a5b0 sll   zero, zero, 0
+	br L_107a5b0
+// --- basic block ---
+L_107a3f8:
+// 0x0107a3f8: 0x107a3f8: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107a3fc: 0x107a3fc: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x0107a400: 0x107a400: addiu a0, a0, -25908
+	ldloc.1
+	ldc.i4 -25908
+	add
+	stloc.1
+// 0x0107a404: 0x107a404: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107a408: 0x107a408: addiu a2, zero, 50
+	ldc.i4.s 50
+	stloc.3
+// 0x0107a40c: 0x107a40c: addiu v0, zero, 10
+	ldc.i4.s 10
+	stloc 5
+// 0x0107a410: 0x107a410: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a418: 0x107a418: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107a41c: 0x107a41c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107a420: 0x107a420: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107a424: 0x107a424: jal   0x1099628 addu  s2, v0, zero
+	ldloc 5
 	stloc 8
-__CIBYL_javamethod_begin:
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-L_107a43c:
-// 0x0107a43c: 0x107a43c: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x0107a42c: 0x107a42c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x0107a430: 0x107a430: addiu v0, v0, -31128
+	ldloc 5
+	ldc.i4 -31128
+	add
 	stloc 5
-// 0x0107a440: 0x107a440: addiu sp, sp, -24
+// 0x0107a434: 0x107a434: sw    v0, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.0
-// 0x0107a444: 0x107a444: addiu v0, v0, -16028
 	ldloc 5
-	ldc.i4 -16028
+	stelem.i4
+// 0x0107a438: 0x107a438: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0107a43c: 0x107a43c: addiu v0, v0, -25868
+	ldloc 5
+	ldc.i4 -25868
 	add
 	stloc 5
-// 0x0107a448: 0x107a448: sw    ra, 20(sp)
-// 0x0107a44c: 0x107a44c: sw    s0, 16(sp)
-	ldloc 8
+// 0x0107a440: 0x107a440: sw    v0, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 9
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
-// 0x0107a450: 0x107a450: addu  a1, v0, zero
+// 0x0107a444: 0x107a444: addiu v0, zero, 17
+	ldc.i4.s 17
+	stloc 5
+// 0x0107a448: 0x107a448: sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
 	ldloc 5
+	stelem.i4
+// 0x0107a44c: 0x107a44c: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107a450: 0x107a450: lui   v0, 0x1080000
+	ldc.i4 17301504
+	stloc 5
+// 0x0107a454: 0x107a454: addiu a2, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.3
+// 0x0107a458: 0x107a458: addiu a3, zero, 2
+	ldc.i4.2
+	stloc 4
+// 0x0107a45c: 0x107a45c: addiu a0, a0, -25852
+	ldloc.1
+	ldc.i4 -25852
+	add
+	stloc.1
+// 0x0107a460: 0x107a460: addiu a1, s6, 18768
+	ldloc 13
+	ldc.i4 18768
+	add
 	stloc.2
-// 0x0107a454: 0x107a454: lw    a2, 2000(v0)
-	ldloc 8
+// 0x0107a464: 0x107a464: addiu v0, v0, -23072
 	ldloc 5
+	ldc.i4 -23072
+	add
+	stloc 5
+// 0x0107a468: 0x107a468: jal   0x10914f0 sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc.3
-// 0x0107a458: 0x107a458: j	 0x107a4ac addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_107a4ac
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_107a460:
-// 0x0107a460: 0x107a460: lw    v0, 0(a1)
+// 0x0107a470: 0x107a470: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107a474: 0x107a474: addu  a0, s2, zero
 	ldloc 8
+	stloc.1
+// 0x0107a478: 0x107a478: jal   0x109950c sw    v0, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
 	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a480: 0x107a480: lw    v0, 56(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 14
+	add
 	ldelem.i4
 	stloc 5
-// 0x0107a464: 0x107a464: sll   zero, zero, 0
-// 0x0107a468: 0x107a468: lw    a3, 0(v0)
+// 0x0107a484: 0x107a484: addu  a1, s4, zero
+	ldloc 11
+	stloc.2
+// 0x0107a488: 0x107a488: jal   0x10997f4 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a490: 0x107a490: addu  a0, s2, zero
+	ldloc 8
+	stloc.1
+// 0x0107a494: 0x107a494: jal   0x10997f4 addu  a1, s4, zero
+	ldloc 11
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_click_offsets_10997f4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a49c: 0x107a49c: addu  a1, s2, zero
 	ldloc 8
+	stloc.2
+// 0x0107a4a0: 0x107a4a0: jal   0x109950c addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a4a8: 0x107a4a8: jal   0x104e00c addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a4b0: 0x107a4b0: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x0107a4b4: 0x107a4b4: jal   0x104e030 addu  s2, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.1
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a4bc: 0x107a4bc: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107a4c0: 0x107a4c0: addiu a3, v0, 3
 	ldloc 5
+	ldc.i4.3
+	add
+	stloc 4
+// 0x0107a4c4: 0x107a4c4: addiu a2, s2, 4
+	ldloc 8
+	ldc.i4.4
+	add
+	stloc.3
+// 0x0107a4c8: 0x107a4c8: addiu a0, a0, -25816
+	ldloc.1
+	ldc.i4 -25816
+	add
+	stloc.1
+// 0x0107a4cc: 0x107a4cc: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107a4d0: 0x107a4d0: addiu v0, zero, 4233
+	ldc.i4 4233
+	stloc 5
+// 0x0107a4d4: 0x107a4d4: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107a46c: 0x107a46c: sll   zero, zero, 0
-// 0x0107a470: 0x107a470: bne   a3, a0, 0x107a4a8 addiu a1, a1, 4
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
 	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a4dc: 0x107a4dc: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107a4e0: 0x107a4e0: addiu a0, a0, -25772
+	ldloc.1
+	ldc.i4 -25772
+	add
+	stloc.1
+// 0x0107a4e4: 0x107a4e4: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x0107a4e8: 0x107a4e8: addiu a2, zero, 17
+	ldc.i4.s 17
+	stloc.3
+// 0x0107a4ec: 0x107a4ec: jal   0x109e5d8 addu  s2, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldc.i4.4
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_image_new_109e5d8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a4f4: 0x107a4f4: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107a4f8: 0x107a4f8: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107a4fc: 0x107a4fc: lui   s4, 0x80000
+	ldc.i4 524288
+	stloc 11
+// 0x0107a500: 0x107a500: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107a504: 0x107a504: jal   0x10995cc sw    v0, -15760(s4)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3940
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a50c: 0x107a50c: lw    a1, -15760(s4)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3940
 	add
+	ldelem.i4
 	stloc.2
-	bne.un L_107a4a8
+// 0x0107a510: 0x107a510: jal   0x109950c addu  a0, s2, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107a478: 0x107a478: lw    v1, 4(v0)
+// 0x0107a518: 0x107a518: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+// 0x0107a51c: 0x107a51c: jal   0x109950c addu  a1, s2, zero
 	ldloc 8
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a524: 0x107a524: addiu a0, s3, -25972
+	ldloc 12
+	ldc.i4 -25972
+	add
+	stloc.1
+// 0x0107a528: 0x107a528: jal   0x1096534 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_107a530:
+// 0x0107a530: 0x107a530: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107a534: 0x107a534: lw    a0, -15760(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 -3940
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a47c: 0x107a47c: sll   zero, zero, 0
-// 0x0107a480: 0x107a480: sltiu a0, v1, 10
-	ldloc 6
-	ldc.i4.s 10
-	clt.un
 	stloc.1
-// 0x0107a484: 0x107a484: beq   a0, zero, 0x107a55c lui   a0, 0x20000
+// 0x0107a538: 0x107a538: jal   0x109e584 addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+	ldloc.0
 	ldloc.1
-	ldc.i4 131072
-	stloc.1
-	brfalse L_107a55c
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_image_update_109e584(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107a48c: 0x107a48c: sll   v1, v1, 2
-	ldloc 6
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a490: 0x107a490: addiu a0, a0, 28828
-	ldloc.1
-	ldc.i4 28828
-	add
-	stloc.1
-// 0x0107a494: 0x107a494: addu  v1, a0, v1
-	ldloc.1
-	ldloc 6
-	add
-	stloc 6
-// 0x0107a498: 0x107a498: lw    v1, 0(v1)
-	ldloc 8
+// 0x0107a540: 0x107a540: jal   0x1094e60 sw    s1, 164(s0)
 	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 6
-// 0x0107a49c: 0x107a49c: sll   zero, zero, 0
-// 0x0107a4a0: 0x107a4a0: jr    v1 sll   zero, zero, 0
-	ldloc 6
-	br __CIBYL_local_jumptab
-// --- basic block ---
-L_107a4a8:
-// 0x0107a4a8: 0x107a4a8: addiu v1, v1, 1
-	ldloc 6
-	ldc.i4.1
+	ldc.i4.s 41
 	add
-	stloc 6
-L_107a4ac:
-// 0x0107a4ac: 0x107a4ac: slt   v0, v1, a2
-	ldloc 6
+	ldloc 10
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
 	ldloc.3
-	clt
-	stloc 5
-// 0x0107a4b0: 0x107a4b0: bne   v0, zero, 0x107a460 addu  v0, zero, zero
-	ldloc 5
-	ldc.i4.s 0
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_draw_1094e60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	brtrue L_107a460
 // --- basic block ---
-// 0x0107a4b8: 0x107a4b8: j	 0x107a560 sll   zero, zero, 0
-	br L_107a560
+// 0x0107a548: 0x107a548: j	 0x107a5b0 sll   zero, zero, 0
+	br L_107a5b0
 // --- basic block ---
-L_107a4c0:
-// 0x0107a4c0: 0x107a4c0: lui   a1, 0x20000
+L_107a550:
+// 0x0107a550: 0x107a550: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107a4c4: 0x107a4c4: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107a4c8: 0x107a4c8: j	 0x107a4dc addiu a1, a1, -26076
-	ldloc.2
-	ldc.i4 -26076
-	add
-	stloc.2
-	br L_107a4dc
-// --- basic block ---
-L_107a4d0:
-// 0x0107a4d0: 0x107a4d0: lui   a1, 0x20000
+// 0x0107a554: 0x107a554: lui   a3, 0x20000
 	ldc.i4 131072
-	stloc.2
-// 0x0107a4d4: 0x107a4d4: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107a4d8: 0x107a4d8: addiu a1, a1, -26056
+	stloc 4
+// 0x0107a558: 0x107a558: addiu a1, a1, -26248
 	ldloc.2
-	ldc.i4 -26056
+	ldc.i4 -26248
 	add
 	stloc.2
-L_107a4dc:
-// 0x0107a4dc: 0x107a4dc: jal   0x1001b68 addiu a0, s0, -16220
-	ldloc 7
-	ldc.i4 -16220
+// 0x0107a55c: 0x107a55c: addiu a3, a3, -25736
+	ldloc 4
+	ldc.i4 -25736
 	add
+	stloc 4
+// 0x0107a560: 0x107a560: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
+// 0x0107a564: 0x107a564: addiu a2, zero, 3822
+	ldc.i4 3822
+	stloc.3
+// 0x0107a568: 0x107a568: jal   0x100449c sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 9
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl1::strcpy_1001b68(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a4e4: 0x107a4e4: j	 0x107a560 addiu v0, s0, -16220
-	ldloc 7
-	ldc.i4 -16220
-	add
-	stloc 5
-	br L_107a560
+// 0x0107a570: 0x107a570: j	 0x107a5a0 lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+	br L_107a5a0
 // --- basic block ---
-L_107a4ec:
-// 0x0107a4ec: 0x107a4ec: lui   a1, 0x20000
+L_107a578:
+// 0x0107a578: 0x107a578: lui   a3, 0x20000
 	ldc.i4 131072
-	stloc.2
-// 0x0107a4f0: 0x107a4f0: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107a4f4: 0x107a4f4: j	 0x107a4dc addiu a1, a1, -26036
+	stloc 4
+// 0x0107a57c: 0x107a57c: addiu a1, a1, -26248
 	ldloc.2
-	ldc.i4 -26036
+	ldc.i4 -26248
 	add
 	stloc.2
-	br L_107a4dc
-// --- basic block ---
-L_107a4fc:
-// 0x0107a4fc: 0x107a4fc: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107a500: 0x107a500: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107a504: 0x107a504: j	 0x107a4dc addiu a1, a1, -26016
-	ldloc.2
-	ldc.i4 -26016
+// 0x0107a580: 0x107a580: addiu a3, a3, -25676
+	ldloc 4
+	ldc.i4 -25676
 	add
-	stloc.2
-	br L_107a4dc
-// --- basic block ---
-L_107a50c:
-// 0x0107a50c: 0x107a50c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107a510: 0x107a510: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107a514: 0x107a514: j	 0x107a4dc addiu a1, a1, -26000
-	ldloc.2
-	ldc.i4 -26000
+	stloc 4
+// 0x0107a584: 0x107a584: addiu a0, zero, 4
+	ldc.i4.4
+	stloc.1
+// 0x0107a588: 0x107a588: addiu a2, zero, 3828
+	ldc.i4 3828
+	stloc.3
+// 0x0107a58c: 0x107a58c: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
-	br L_107a4dc
-// --- basic block ---
-L_107a51c:
-// 0x0107a51c: 0x107a51c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107a520: 0x107a520: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107a524: 0x107a524: j	 0x107a4dc addiu a1, a1, -25980
-	ldloc.2
-	ldc.i4 -25980
+	ldloc 9
+	stelem.i4
+// 0x0107a590: 0x107a590: sw    s2, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.2
-	br L_107a4dc
+	ldloc 8
+	stelem.i4
+// 0x0107a594: 0x107a594: jal   0x100449c sw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 10
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_107a52c:
-// 0x0107a52c: 0x107a52c: lui   a1, 0x20000
+// 0x0107a59c: 0x107a59c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+L_107a5a0:
+// 0x0107a5a0: 0x107a5a0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107a530: 0x107a530: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107a534: 0x107a534: j	 0x107a4dc addiu a1, a1, -25960
+// 0x0107a5a4: 0x107a5a4: addiu a0, a0, 30092
+	ldloc.1
+	ldc.i4 30092
+	add
+	stloc.1
+// 0x0107a5a8: 0x107a5a8: jal   0x104c158 addiu a1, a1, -25700
 	ldloc.2
-	ldc.i4 -25960
+	ldc.i4 -25700
 	add
 	stloc.2
-	br L_107a4dc
-// --- basic block ---
-L_107a53c:
-// 0x0107a53c: 0x107a53c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107a540: 0x107a540: lui   s0, 0x80000
-	ldc.i4 524288
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x0107a544: 0x107a544: j	 0x107a4dc addiu a1, a1, -25944
+	stloc 5
+// --- basic block ---
+L_107a5b0:
+// 0x0107a5b0: 0x107a5b0: jal   0x1000930 addu  a0, s5, zero
+	ldloc 14
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldc.i4 -25944
-	add
-	stloc.2
-	br L_107a4dc
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-L_107a54c:
-// 0x0107a54c: 0x107a54c: lw    a1, 1508(v0)
-	ldloc 8
-	ldloc 5
+// 0x0107a5b8: 0x107a5b8: lw    ra, 92(sp)
+// 0x0107a5bc: 0x107a5bc: lw    s6, 88(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 377
+	ldc.i4.s 22
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107a550: 0x107a550: sll   zero, zero, 0
-// 0x0107a554: 0x107a554: bne   a1, zero, 0x107a4dc lui   s0, 0x80000
-	ldloc.2
-	ldc.i4 524288
-	stloc 7
-	brtrue L_107a4dc
-// --- basic block ---
-L_107a55c:
-// 0x0107a55c: 0x107a55c: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-L_107a560:
-// 0x0107a560: 0x107a560: lw    ra, 20(sp)
-// 0x0107a564: 0x107a564: lw    s0, 16(sp)
-	ldloc 8
+	stloc 13
+// 0x0107a5c0: 0x107a5c0: lw    s5, 84(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 21
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107a568: 0x107a568: jr    ra addiu sp, sp, 24
+	stloc 14
+// 0x0107a5c4: 0x107a5c4: lw    s4, 80(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 20
 	add
-	stloc.0
-	br __CIBYL_function_return
-	br __CIBYL_function_return
-__CIBYL_local_jumptab:
-	stloc 6
-	ldloc 6
-	ldc.i4 17278012
-	beq  L_107a43c
-	ldloc 6
-	ldc.i4 17278144
-	beq  L_107a4c0
-	ldloc 6
-	ldc.i4 17278160
-	beq  L_107a4d0
-	ldloc 6
-	ldc.i4 17278188
-	beq  L_107a4ec
-	ldloc 6
-	ldc.i4 17278204
-	beq  L_107a4fc
-	ldloc 6
-	ldc.i4 17278220
-	beq  L_107a50c
-	ldloc 6
-	ldc.i4 17278236
-	beq  L_107a51c
+	ldelem.i4
+	stloc 11
+// 0x0107a5c8: 0x107a5c8: lw    s3, 76(sp)
 	ldloc 6
-	ldc.i4 17278252
-	beq  L_107a52c
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 19
+	add
+	ldelem.i4
+	stloc 12
+// 0x0107a5cc: 0x107a5cc: lw    s2, 72(sp)
 	ldloc 6
-	ldc.i4 17278268
-	beq  L_107a53c
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 18
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107a5d0: 0x107a5d0: lw    s1, 68(sp)
 	ldloc 6
-	ldc.i4 17278284
-	beq  L_107a54c
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107a5d4: 0x107a5d4: lw    s0, 64(sp)
 	ldloc 6
-	ldc.i4 17278300
-	beq  L_107a55c
-		br __CIBYL_function_return
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 16
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107a5d8: 0x107a5d8: jr    ra addiu sp, sp, 96
+	ldloc.0
+	ldc.i4.s 96
+	add
+	stloc.0
+	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
diff --git a/converted/Cibyl92.j b/converted/Cibyl92.j
index e81b595..ab991d9 100644
--- a/converted/Cibyl92.j
+++ b/converted/Cibyl92.j
@@ -41,10 +41,105 @@
     IL_0006:  ret
   } // end of method Cibyl92::.ctor
 
-.method public static int32 DeleteAlertObject_107a570(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_View_Image_DlgClose_Callback_107a5e0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s6,int32 s2,int32 s3,int32 s4,int32 s5,int32 s7,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107a5e0: 0x107a5e0: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107a5e4: 0x107a5e4: sw    ra, 20(sp)
+// 0x0107a5e8: 0x107a5e8: jal   0x1094624 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_current_data_1094624()
+	stloc 5
+// --- basic block ---
+// 0x0107a5f0: 0x107a5f0: jal   0x104ec80 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl58::roadmap_canvas_free_image_104ec80(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a5f8: 0x107a5f8: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107a5fc: 0x107a5fc: addiu a0, a0, -25972
+	ldloc.1
+	ldc.i4 -25972
+	add
+	stloc.1
+// 0x0107a600: 0x107a600: jal   0x1094ff4 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_hide_1094ff4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107a608: 0x107a608: lw    ra, 20(sp)
+// 0x0107a60c: 0x107a60c: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107a610: 0x107a610: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Get_City_Street_107a618(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s6,int32 s4,int32 s5,int32 s1,int32 s0,int32 s2,int32 s3,int32 s7,int32 s8,int32 lo,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -52,16 +147,18 @@
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  9 is register s0
-// local  8 is register s1
-// local 11 is register s2
-// local 12 is register s3
-// local 13 is register s4
-// local 14 is register s5
-// local 10 is register s6
+// local 12 is register s0
+// local 11 is register s1
+// local 13 is register s2
+// local 14 is register s3
+// local  9 is register s4
+// local 10 is register s5
+// local  8 is register s6
 // local 15 is register s7
 // local  0 is register sp
-// local 16 is register ra
+// local 16 is register s8
+// local 18 is register ra
+// local 17 is register lo
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -77,269 +174,267 @@
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
+	stloc 12
 	ldc.i4.s 0
 	stloc 11
 	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
 	stloc 13
 	ldc.i4.s 0
 	stloc 14
 	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
 	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
 	stloc 16
+	ldc.i4.s 0
+	stloc 18
+	ldc.i4.s 0
+	stloc 17
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107a570: 0x107a570: addiu sp, sp, -200
+// 0x0107a618: 0x107a618: addiu sp, sp, -1400
 	ldloc.0
-	ldc.i4 -200
+	ldc.i4 -1400
 	add
 	stloc.0
-// 0x0107a574: 0x107a574: sw    s1, 168(sp)
+// 0x0107a61c: 0x107a61c: sw    s4, 1376(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4 344
 	add
-	ldloc 8
+	ldloc 9
 	stelem.i4
-// 0x0107a578: 0x107a578: lui   s1, 0x20000
-	ldc.i4 131072
-	stloc 8
-// 0x0107a57c: 0x107a57c: sw    s0, 164(sp)
+// 0x0107a620: 0x107a620: addiu s4, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
+	stloc 9
+// 0x0107a624: 0x107a624: sw    a0, 1400(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4 350
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107a580: 0x107a580: addu  s0, a0, zero
 	ldloc.1
-	stloc 9
-// 0x0107a584: 0x107a584: addiu a0, s1, -25916
-	ldloc 8
-	ldc.i4 -25916
-	add
-	stloc.1
-// 0x0107a588: 0x107a588: sw    ra, 196(sp)
-// 0x0107a58c: 0x107a58c: sw    s7, 192(sp)
+	stelem.i4
+// 0x0107a628: 0x107a628: sw    a1, 1404(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 48
+	ldc.i4 351
 	add
-	ldloc 15
+	ldloc.2
 	stelem.i4
-// 0x0107a590: 0x107a590: sw    s6, 188(sp)
+// 0x0107a62c: 0x107a62c: addu  a0, s4, zero
+	ldloc 9
+	stloc.1
+// 0x0107a630: 0x107a630: addiu a1, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.2
+// 0x0107a634: 0x107a634: sw    ra, 1396(sp)
+// 0x0107a638: 0x107a638: sw    s5, 1380(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 47
+	ldc.i4 345
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107a594: 0x107a594: sw    s5, 184(sp)
+// 0x0107a63c: 0x107a63c: sw    s3, 1372(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 46
+	ldc.i4 343
 	add
 	ldloc 14
 	stelem.i4
-// 0x0107a598: 0x107a598: sw    s4, 180(sp)
+// 0x0107a640: 0x107a640: sw    s2, 1368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 45
+	ldc.i4 342
 	add
 	ldloc 13
 	stelem.i4
-// 0x0107a59c: 0x107a59c: sw    s3, 176(sp)
+// 0x0107a644: 0x107a644: addu  s3, a2, zero
+	ldloc.3
+	stloc 14
+// 0x0107a648: 0x107a648: sw    s1, 1364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 44
+	ldc.i4 341
 	add
-	ldloc 12
+	ldloc 11
 	stelem.i4
-// 0x0107a5a0: 0x107a5a0: jal   0x101ca0c sw    s2, 172(sp)
+// 0x0107a64c: 0x107a64c: sw    s0, 1360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 43
+	ldc.i4 340
 	add
-	ldloc 11
+	ldloc 12
 	stelem.i4
+// 0x0107a650: 0x107a650: addiu s5, sp, 68
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a5a8: 0x107a5a8: addiu a0, s1, -25916
-	ldloc 8
-	ldc.i4 -25916
+	ldc.i4.s 68
 	add
-	stloc.1
-// 0x0107a5ac: 0x107a5ac: addu  s5, v0, zero
-	ldloc 5
-	stloc 14
-// 0x0107a5b0: 0x107a5b0: jal   0x101ca0c addiu s1, sp, 24
+	stloc 10
+// 0x0107a654: 0x107a654: sw    s8, 1392(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 348
 	add
-	stloc 8
+	ldloc 16
+	stelem.i4
+// 0x0107a658: 0x107a658: sw    s7, 1388(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a5b8: 0x107a5b8: lw    a3, 0(s0)
+	ldc.i4.2
+	shr.un
+	ldc.i4 347
+	add
+	ldloc 15
+	stelem.i4
+// 0x0107a65c: 0x107a65c: sw    s6, 1384(sp)
 	ldloc 6
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107a5bc: 0x107a5bc: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107a5c0: 0x107a5c0: addiu a2, a2, -13884
-	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 346
 	add
-	stloc.3
-// 0x0107a5c4: 0x107a5c4: addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
-// 0x0107a5c8: 0x107a5c8: addu  a0, s1, zero
 	ldloc 8
-	stloc.1
-// 0x0107a5cc: 0x107a5cc: jal   0x1000f9c addu  s3, v0, zero
-	ldloc 5
-	stloc 12
+	stelem.i4
+// 0x0107a660: 0x107a660: lw    s1, 1416(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 354
+	add
+	ldelem.i4
+	stloc 11
+// 0x0107a664: 0x107a664: lw    s2, 1420(sp)
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 355
+	add
+	ldelem.i4
+	stloc 13
+// 0x0107a668: 0x107a668: jal   0x100845c addu  s0, a3, zero
+	ldloc 4
+	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a5d4: 0x107a5d4: jal   0x101ca0c addu  a0, s1, zero
-	ldloc 8
+// 0x0107a670: 0x107a670: addiu a0, sp, 1400
+	ldloc.0
+	ldc.i4 1400
+	add
 	stloc.1
+// 0x0107a674: 0x107a674: jal   0x10086cc addiu a1, zero, 20
+	ldc.i4.s 20
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a5dc: 0x107a5dc: lw    a0, 0(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+// 0x0107a67c: 0x107a67c: addu  a0, s5, zero
+	ldloc 10
 	stloc.1
-// 0x0107a5e0: 0x107a5e0: addu  s4, v0, zero
-	ldloc 5
-	stloc 13
-// 0x0107a5e4: 0x107a5e4: jal   0x10776a0 lui   s6, 0x20000
-	ldc.i4 131072
-	stloc 10
+// 0x0107a680: 0x107a680: jal   0x1010068 addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_Of_Map_AddOns_10776a0(int32,int32,int32,int32)
+	call int32 Cibyl11::roadmap_layer_all_roads_1010068(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a5ec: 0x107a5ec: addu  s2, s1, zero
-	ldloc 8
-	stloc 11
-// 0x0107a5f0: 0x107a5f0: addu  s7, v0, zero
+// 0x0107a688: 0x107a688: addu  a3, v0, zero
 	ldloc 5
-	stloc 15
-// 0x0107a5f4: 0x107a5f4: addiu s6, s6, -25900
-	ldloc 10
-	ldc.i4 -25900
+	stloc 4
+// 0x0107a68c: 0x107a68c: addiu v1, sp, 580
+	ldloc.0
+	ldc.i4 580
 	add
-	stloc 10
-// 0x0107a5f8: 0x107a5f8: j	 0x107a640 addu  s1, zero, zero
-	ldc.i4.s 0
-	stloc 8
-	br L_107a640
-// --- basic block ---
-L_107a600:
-// 0x0107a600: 0x107a600: jal   0x10775dc sll   zero, zero, 0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Map_AddOn_10775dc(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
+// 0x0107a690: 0x107a690: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// --- basic block ---
-// 0x0107a608: 0x107a608: lw    a3, 0(s0)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107a60c: 0x107a60c: addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
-// 0x0107a610: 0x107a610: addu  a2, s6, zero
+// 0x0107a694: 0x107a694: addu  a2, s5, zero
 	ldloc 10
 	stloc.3
-// 0x0107a614: 0x107a614: addu  a0, s2, zero
-	ldloc 11
+// 0x0107a698: 0x107a698: addiu a0, sp, 1400
+	ldloc.0
+	ldc.i4 1400
+	add
 	stloc.1
-// 0x0107a618: 0x107a618: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0107a69c: 0x107a69c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107a6a0: 0x107a6a0: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
+	add
+	ldloc 7
+	stelem.i4
+// 0x0107a6a4: 0x107a6a4: sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107a6a8: 0x107a6a8: jal   0x1013038 sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
 	ldloc 5
 	stelem.i4
@@ -348,730 +443,815 @@ L_107a600:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a620: 0x107a620: jal   0x101ca0c addu  a0, s2, zero
-	ldloc 11
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0107a6b0: 0x107a6b0: beq   v0, zero, 0x107a94c addiu v0, zero, -1
+	ldloc 5
+	ldc.i4.m1
 	stloc 5
+	brfalse L_107a94c
 // --- basic block ---
-// 0x0107a628: 0x107a628: addu  a0, v0, zero
+// 0x0107a6b8: 0x107a6b8: lui   v0, 0x0
+	ldc.i4.s 0
+	stloc 5
+// 0x0107a6bc: 0x107a6bc: lw    v0, 576(v0)
+	ldloc 6
 	ldloc 5
-	stloc.1
-// 0x0107a62c: 0x107a62c: jal   0x101c14c sw    v0, 152(sp)
+	ldc.i4.2
+	shr.un
+	ldc.i4 144
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107a6c0: 0x107a6c0: lw    a0, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 148
 	add
+	ldelem.i4
+	stloc.1
+// 0x0107a6c4: 0x107a6c4: sll   zero, zero, 0
+// 0x0107a6c8: 0x107a6c8: beq   a0, v0, 0x107a6e0 sll   zero, zero, 0
+	ldloc.1
 	ldloc 5
-	stelem.i4
+	beq  L_107a6e0
+// --- basic block ---
+// 0x0107a6d0: 0x107a6d0: bltz  a0, 0x107a6e0 sll   zero, zero, 0
+	ldloc.1
+	ldc.i4.s 0
+	blt L_107a6e0
+// --- basic block ---
+// 0x0107a6d8: 0x107a6d8: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a634: 0x107a634: lw    v0, 152(sp)
+L_107a6e0:
+// 0x0107a6e0: 0x107a6e0: lw    a0, 596(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 149
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107a638: 0x107a638: jal   0x101c8f8 addu  a0, v0, zero
-	ldloc 5
 	stloc.1
+// 0x0107a6e4: 0x107a6e4: jal   0x1013c54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_locator_activate_1013c54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107a640:
-// 0x0107a640: 0x107a640: slt   v0, s1, s7
-	ldloc 8
-	ldloc 15
-	clt
+// 0x0107a6ec: 0x107a6ec: bgez  v0, 0x107a714 addiu s4, sp, 44
+	ldloc 5
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc 9
+	ldc.i4.s 0
+	bge L_107a714
+// --- basic block ---
+// 0x0107a6f4: 0x107a6f4: addiu v0, zero, -1
+	ldc.i4.m1
 	stloc 5
-// 0x0107a644: 0x107a644: addu  a1, s1, zero
-	ldloc 8
-	stloc.2
-// 0x0107a648: 0x107a648: lw    a0, 0(s0)
+// 0x0107a6f8: 0x107a6f8: lw    a1, 32(sp)
 	ldloc 6
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.8
+	add
 	ldelem.i4
-	stloc.1
-// 0x0107a64c: 0x107a64c: bne   v0, zero, 0x107a600 addiu s1, s1, 1
+	stloc.2
+// 0x0107a6fc: 0x107a6fc: sw    zero, 0(s3)
+	ldloc 6
+	ldloc 14
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107a700: 0x107a700: sw    v0, 0(s2)
+	ldloc 6
+	ldloc 13
+	ldc.i4.2
+	shr.un
 	ldloc 5
-	ldloc 8
-	ldc.i4.1
+	stelem.i4
+// 0x0107a704: 0x107a704: sw    zero, 0(s0)
+	ldloc 6
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107a708: 0x107a708: sw    v0, 0(s1)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldloc 5
+	stelem.i4
+// 0x0107a70c: 0x107a70c: j	 0x107a964 addiu a0, sp, 36
+	ldloc.0
+	ldc.i4.s 36
 	add
-	stloc 8
-	brtrue L_107a600
+	stloc.1
+	br L_107a964
 // --- basic block ---
-// 0x0107a654: 0x107a654: jal   0x107a43c sll   zero, zero, 0
+L_107a714:
+// 0x0107a714: 0x107a714: lw    a0, 584(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 146
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107a718: 0x107a718: jal   0x1011a5c addu  a1, s4, zero
+	ldloc 9
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Get_Map_Icon_107a43c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a65c: 0x107a65c: beq   v0, zero, 0x107a6d4 addiu s1, sp, 24
-	ldloc 5
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc 8
-	brfalse L_107a6d4
-// --- basic block ---
-// 0x0107a664: 0x107a664: lw    a3, 0(s0)
+// 0x0107a720: 0x107a720: lw    a0, 584(sp)
 	ldloc 6
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107a668: 0x107a668: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107a66c: 0x107a66c: addiu a2, a2, -25892
-	ldloc.3
-	ldc.i4 -25892
+	ldc.i4 146
 	add
-	stloc.3
-// 0x0107a670: 0x107a670: addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
-// 0x0107a674: 0x107a674: jal   0x1000f9c addu  a0, s1, zero
-	ldloc 8
+	ldelem.i4
 	stloc.1
-	ldloc.0
+// 0x0107a724: 0x107a724: jal   0x1004a80 addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_line_route_get_direction_1004a80(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a67c: 0x107a67c: jal   0x101ca0c addu  a0, s1, zero
-	ldloc 8
+// 0x0107a72c: 0x107a72c: addu  a0, s4, zero
+	ldloc 9
 	stloc.1
+// 0x0107a730: 0x107a730: jal   0x1011828 addu  s5, v0, zero
+	ldloc 5
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a684: 0x107a684: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107a688: 0x107a688: jal   0x101c14c sw    v0, 152(sp)
+// 0x0107a738: 0x107a738: sw    v0, 0(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
-	add
 	ldloc 5
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0107a73c: 0x107a73c: addiu v0, zero, 3
+	ldc.i4.3
+	stloc 5
+// 0x0107a740: 0x107a740: beq   s5, v0, 0x107a758 addiu v0, zero, 1
+	ldloc 10
+	ldloc 5
+	ldc.i4.1
 	stloc 5
+	beq  L_107a758
 // --- basic block ---
-// 0x0107a690: 0x107a690: lw    v0, 152(sp)
+// 0x0107a748: 0x107a748: lw    v1, 1424(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 356
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107a694: 0x107a694: jal   0x101c8f8 addu  a0, v0, zero
+	stloc 7
+// 0x0107a74c: 0x107a74c: sll   zero, zero, 0
+// 0x0107a750: 0x107a750: bne   v1, v0, 0x107a78c lui   v0, 0x0
+	ldloc 7
 	ldloc 5
+	ldc.i4.s 0
+	stloc 5
+	bne.un L_107a78c
+// --- basic block ---
+L_107a758:
+// 0x0107a758: 0x107a758: addiu a0, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
 	stloc.1
+// 0x0107a75c: 0x107a75c: jal   0x10112a8 addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a69c: 0x107a69c: lw    a3, 0(s0)
+// 0x0107a764: 0x107a764: lw    a0, 584(sp)
 	ldloc 6
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107a6a0: 0x107a6a0: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107a6a4: 0x107a6a4: addiu a2, a2, -25880
-	ldloc.3
-	ldc.i4 -25880
+	ldc.i4 146
 	add
-	stloc.3
-// 0x0107a6a8: 0x107a6a8: addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
-// 0x0107a6ac: 0x107a6ac: jal   0x1000f9c addu  a0, s1, zero
-	ldloc 8
+	ldelem.i4
 	stloc.1
+// 0x0107a768: 0x107a768: lw    v1, 592(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4 148
+	add
+	ldelem.i4
 	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a6b4: 0x107a6b4: jal   0x101ca0c addu  a0, s1, zero
-	ldloc 8
+// 0x0107a76c: 0x107a76c: lw    a1, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107a770: 0x107a770: sw    v0, 0(s3)
+	ldloc 6
+	ldloc 14
+	ldc.i4.2
+	shr.un
+	ldloc 5
+	stelem.i4
+// 0x0107a774: 0x107a774: sw    a0, 0(s2)
+	ldloc 6
+	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldloc.1
+	stelem.i4
+// 0x0107a778: 0x107a778: sw    v1, 0(s1)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldloc 7
+	stelem.i4
+// 0x0107a77c: 0x107a77c: jal   0x10086cc addiu a0, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a6bc: 0x107a6bc: addu  a0, v0, zero
+// 0x0107a784: 0x107a784: j	 0x107a974 sll   zero, zero, 0
+	br L_107a974
+// --- basic block ---
+L_107a78c:
+// 0x0107a78c: 0x107a78c: lw    v0, 576(v0)
+	ldloc 6
 	ldloc 5
-	stloc.1
-// 0x0107a6c0: 0x107a6c0: jal   0x101c14c sw    v0, 152(sp)
+	ldc.i4.2
+	shr.un
+	ldc.i4 144
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107a790: 0x107a790: lw    a0, 592(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 148
 	add
+	ldelem.i4
+	stloc.1
+// 0x0107a794: 0x107a794: sll   zero, zero, 0
+// 0x0107a798: 0x107a798: beq   a0, v0, 0x107a7b0 sll   zero, zero, 0
+	ldloc.1
 	ldloc 5
-	stelem.i4
+	beq  L_107a7b0
+// --- basic block ---
+// 0x0107a7a0: 0x107a7a0: bltz  a0, 0x107a7b0 sll   zero, zero, 0
+	ldloc.1
+	ldc.i4.s 0
+	blt L_107a7b0
+// --- basic block ---
+// 0x0107a7a8: 0x107a7a8: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_remove_101c14c(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a6c8: 0x107a6c8: lw    v0, 152(sp)
+L_107a7b0:
+// 0x0107a7b0: 0x107a7b0: lw    a0, 0(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
-	add
 	ldelem.i4
-	stloc 5
-// 0x0107a6cc: 0x107a6cc: jal   0x101c8f8 addu  a0, v0, zero
-	ldloc 5
 	stloc.1
+// 0x0107a7b4: 0x107a7b4: jal   0x1001ba8 addiu s5, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc 10
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107a6d4:
-// 0x0107a6d4: 0x107a6d4: jal   0x101c8f8 addu  a0, s5, zero
-	ldloc 14
+// 0x0107a7bc: 0x107a7bc: addu  a0, s5, zero
+	ldloc 10
 	stloc.1
+// 0x0107a7c0: 0x107a7c0: addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
+// 0x0107a7c4: 0x107a7c4: jal   0x10112a8 addu  s4, v0, zero
+	ldloc 5
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a6dc: 0x107a6dc: jal   0x101c8f8 addu  a0, s4, zero
-	ldloc 13
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a6e4: 0x107a6e4: jal   0x101c8f8 addu  a0, s3, zero
-	ldloc 12
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107a6ec: 0x107a6ec: lw    ra, 196(sp)
-// 0x0107a6f0: 0x107a6f0: lw    s7, 192(sp)
-	ldloc 6
+// 0x0107a7cc: 0x107a7cc: lw    a0, 592(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 48
+	ldc.i4 148
 	add
 	ldelem.i4
-	stloc 15
-// 0x0107a6f4: 0x107a6f4: lw    s6, 188(sp)
+	stloc.1
+// 0x0107a7d0: 0x107a7d0: lw    a1, 584(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 47
+	ldc.i4 146
 	add
 	ldelem.i4
-	stloc 10
-// 0x0107a6f8: 0x107a6f8: lw    s5, 184(sp)
+	stloc.2
+// 0x0107a7d4: 0x107a7d4: sw    v0, 0(s3)
 	ldloc 6
-	ldloc.0
+	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 46
-	add
-	ldelem.i4
-	stloc 14
-// 0x0107a6fc: 0x107a6fc: lw    s4, 180(sp)
+	ldloc 5
+	stelem.i4
+// 0x0107a7d8: 0x107a7d8: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107a7dc: 0x107a7dc: lw    v1, 588(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 45
+	ldc.i4 147
 	add
 	ldelem.i4
-	stloc 13
-// 0x0107a700: 0x107a700: lw    s3, 176(sp)
+	stloc 7
+// 0x0107a7e0: 0x107a7e0: sw    a1, 0(s2)
 	ldloc 6
-	ldloc.0
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 44
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107a704: 0x107a704: lw    s2, 172(sp)
+	ldloc.2
+	stelem.i4
+// 0x0107a7e4: 0x107a7e4: sw    a0, 0(s1)
 	ldloc 6
-	ldloc.0
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 43
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107a708: 0x107a708: lw    s1, 168(sp)
+	ldloc.1
+	stelem.i4
+// 0x0107a7e8: 0x107a7e8: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 8
-// 0x0107a70c: 0x107a70c: lw    s0, 164(sp)
+	ldloc 5
+	stelem.i4
+// 0x0107a7ec: 0x107a7ec: addiu v0, sp, 580
+	ldloc.0
+	ldc.i4 580
+	add
+	stloc 5
+// 0x0107a7f0: 0x107a7f0: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4.5
 	add
-	ldelem.i4
-	stloc 9
-// 0x0107a710: 0x107a710: jr    ra addiu sp, sp, 200
+	ldloc 5
+	stelem.i4
+// 0x0107a7f4: 0x107a7f4: addiu a0, sp, 1400
 	ldloc.0
-	ldc.i4 200
+	ldc.i4 1400
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_Remove_107a718(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  9 is register s0
-// local  8 is register s1
-// local 10 is register s2
-// local 11 is register s3
-// local 12 is register s4
-// local 13 is register s5
-// local  0 is register sp
-// local 14 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
+	stloc.1
+// 0x0107a7f8: 0x107a7f8: addiu v0, zero, 10
+	ldc.i4.s 10
 	stloc 5
+// 0x0107a7fc: 0x107a7fc: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	stloc.2
+// 0x0107a800: 0x107a800: addiu a2, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc.3
+// 0x0107a804: 0x107a804: addiu a3, zero, 1
+	ldc.i4.1
 	stloc 4
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 14
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107a718: 0x107a718: addiu sp, sp, -56
+// 0x0107a808: 0x107a808: sw    v1, 68(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 17
 	add
-	stloc.0
-// 0x0107a71c: 0x107a71c: sw    s1, 32(sp)
 	ldloc 7
+	stelem.i4
+// 0x0107a80c: 0x107a80c: jal   0x1013038 sw    v0, 24(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.6
 	add
-	ldloc 8
+	ldloc 5
 	stelem.i4
-// 0x0107a720: 0x107a720: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x0107a724: 0x107a724: addiu s1, s1, -16028
-	ldloc 8
-	ldc.i4 -16028
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl13::roadmap_street_get_closest_1013038(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a814: 0x107a814: sw    v0, 1352(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 338
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107a818: 0x107a818: addiu s7, sp, 584
+	ldloc.0
+	ldc.i4 584
 	add
+	stloc 15
+// 0x0107a81c: 0x107a81c: addu  s6, zero, zero
+	ldc.i4.s 0
 	stloc 8
-// 0x0107a728: 0x107a728: lw    v0, 2000(s1)
-	ldloc 7
-	ldloc 8
+// 0x0107a820: 0x107a820: j	 0x107a910 lui   s8, 0x0
+	ldc.i4.s 0
+	stloc 16
+	br L_107a910
+// --- basic block ---
+L_107a828:
+// 0x0107a828: 0x107a828: lw    v0, 8(s7)
+	ldloc 6
+	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.2
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107a72c: 0x107a72c: sw    s0, 28(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107a82c: 0x107a82c: lw    v1, 576(s8)
+	ldloc 6
+	ldloc 16
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4 144
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107a730: 0x107a730: sw    ra, 52(sp)
-// 0x0107a734: 0x107a734: sw    s5, 48(sp)
+	ldelem.i4
+	stloc 7
+// 0x0107a830: 0x107a830: sll   zero, zero, 0
+// 0x0107a834: 0x107a834: beq   v0, v1, 0x107a84c sll   zero, zero, 0
+	ldloc 5
 	ldloc 7
+	beq  L_107a84c
+// --- basic block ---
+// 0x0107a83c: 0x107a83c: bltz  v0, 0x107a84c addu  a0, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc.1
+	ldc.i4.s 0
+	blt L_107a84c
+// --- basic block ---
+// 0x0107a844: 0x107a844: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_107a84c:
+// 0x0107a84c: 0x107a84c: lw    a0, 0(s7)
+	ldloc 6
+	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 13
-	stelem.i4
-// 0x0107a738: 0x107a738: sw    s4, 44(sp)
-	ldloc 7
+	ldelem.i4
+	stloc.1
+// 0x0107a850: 0x107a850: jal   0x1011a5c addu  a1, s5, zero
+	ldloc 10
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a858: 0x107a858: jal   0x1011828 addu  a0, s5, zero
+	ldloc 10
+	stloc.1
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a860: 0x107a860: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107a864: 0x107a864: addu  a0, s4, zero
+	ldloc 9
+	stloc.1
+// 0x0107a868: 0x107a868: sw    v0, 0(s0)
+	ldloc 6
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 12
+	ldloc 5
 	stelem.i4
-// 0x0107a73c: 0x107a73c: sw    s3, 40(sp)
-	ldloc 7
+// 0x0107a86c: 0x107a86c: jal   0x1001b14 sw    v0, 1356(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4 339
 	add
-	ldloc 11
+	ldloc 5
 	stelem.i4
-// 0x0107a740: 0x107a740: sw    s2, 36(sp)
-	ldloc 7
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl1::strcmp_1001b14(int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x0107a874: 0x107a874: lw    v1, 1356(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 339
 	add
-	ldloc 10
-	stelem.i4
-// 0x0107a744: 0x107a744: bne   v0, zero, 0x107a768 addu  s0, a0, zero
-	ldloc 5
-	ldloc.1
-	stloc 9
-	brtrue L_107a768
-// --- basic block ---
-// 0x0107a74c: 0x107a74c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107a750: 0x107a750: lui   a3, 0x20000
-	ldc.i4 131072
-	stloc 4
-// 0x0107a754: 0x107a754: addiu a1, a1, -26712
-	ldloc.2
-	ldc.i4 -26712
-	add
-	stloc.2
-// 0x0107a758: 0x107a758: addiu a3, a3, -25860
-	ldloc 4
-	ldc.i4 -25860
-	add
-	stloc 4
-// 0x0107a75c: 0x107a75c: addiu a0, zero, 4
-	ldc.i4.4
+	ldelem.i4
+	stloc 7
+// 0x0107a878: 0x107a878: addu  a0, s4, zero
+	ldloc 9
 	stloc.1
-// 0x0107a760: 0x107a760: j	 0x107ab18 addiu a2, zero, 942
-	ldc.i4 942
-	stloc.3
-	br L_107ab18
-// --- basic block ---
-L_107a768:
-// 0x0107a768: 0x107a768: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x0107a76c: 0x107a76c: sll   v0, v0, 2
-	ldloc 5
-	ldc.i4.2
-	shl
-	stloc 5
-// 0x0107a770: 0x107a770: addu  v0, v0, s1
-	ldloc 5
-	ldloc 8
-	add
-	stloc 5
-// 0x0107a774: 0x107a774: lw    a0, 0(v0)
+// 0x0107a87c: 0x107a87c: addu  a1, v1, zero
 	ldloc 7
+	stloc.2
+// 0x0107a880: 0x107a880: beq   v0, zero, 0x107a908 addiu a2, zero, 2
 	ldloc 5
 	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107a778: 0x107a778: sll   zero, zero, 0
-// 0x0107a77c: 0x107a77c: lw    v0, 0(a0)
-	ldloc 7
+	stloc.3
+	brfalse L_107a908
+// --- basic block ---
+// 0x0107a888: 0x107a888: jal   0x1001b2c sll   zero, zero, 0
 	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+	ldloc.2
+	ldloc.3
+	call int32 Cibyl1::strncmp_1001b2c(int32,int32,int32)
 	stloc 5
-// 0x0107a780: 0x107a780: sll   zero, zero, 0
-// 0x0107a784: 0x107a784: beq   v0, s0, 0x107a7a0 addu  s3, zero, zero
-	ldloc 5
-	ldloc 9
-	ldc.i4.s 0
-	stloc 11
-	beq  L_107a7a0
 // --- basic block ---
-// 0x0107a78c: 0x107a78c: addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-// 0x0107a790: 0x107a790: addu  s2, s1, zero
+// 0x0107a890: 0x107a890: bne   v0, zero, 0x107a90c addiu s6, s6, 1
+	ldloc 5
 	ldloc 8
-	stloc 10
-// 0x0107a794: 0x107a794: lui   s5, 0x0
-	ldc.i4.s 0
-	stloc 13
-// 0x0107a798: 0x107a798: j	 0x107aa68 addiu s4, zero, 1
 	ldc.i4.1
-	stloc 12
-	br L_107aa68
+	add
+	stloc 8
+	brtrue L_107a90c
 // --- basic block ---
-L_107a7a0:
-// 0x0107a7a0: 0x107a7a0: jal   0x107a570 sll   zero, zero, 0
+// 0x0107a898: 0x107a898: addiu s6, s6, -1
+	ldloc 8
+	ldc.i4.m1
+	add
+	stloc 8
+// 0x0107a89c: 0x107a89c: addu  a0, s5, zero
+	ldloc 10
+	stloc.1
+// 0x0107a8a0: 0x107a8a0: jal   0x10112a8 addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::DeleteAlertObject_107a570(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_city_10112a8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a7a8: 0x107a7a8: lw    v0, 2000(s1)
-	ldloc 7
+// 0x0107a8a8: 0x107a8a8: addiu a2, zero, 6
+	ldc.i4.6
+	stloc.3
+// 0x0107a8ac: 0x107a8ac: mult  s6, a2
 	ldloc 8
+	ldloc.3
+	mul
+	stloc 17
+// 0x0107a8b0: 0x107a8b0: sw    v0, 0(s3)
+	ldloc 6
+	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107a7ac: 0x107a7ac: sll   zero, zero, 0
-// 0x0107a7b0: 0x107a7b0: addiu v0, v0, -1
 	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x0107a7b4: 0x107a7b4: sll   v0, v0, 2
-	ldloc 5
-	ldc.i4.2
-	shl
+	stelem.i4
+// 0x0107a8b4: 0x107a8b4: addiu v0, zero, 48
+	ldc.i4.s 48
 	stloc 5
-// 0x0107a7b8: 0x107a7b8: addu  v0, v0, s1
-	ldloc 5
-	ldloc 8
+// 0x0107a8b8: 0x107a8b8: addiu v1, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	stloc 5
-// 0x0107a7bc: 0x107a7bc: lw    a0, 0(v0)
-	ldloc 7
-	ldloc 5
+	stloc 7
+// 0x0107a8bc: 0x107a8bc: lw    a1, 32(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.8
+	add
 	ldelem.i4
-	stloc.1
-// 0x0107a7c0: 0x107a7c0: jal   0x10785d8 sll   zero, zero, 0
+	stloc.2
+// 0x0107a8c0: 0x107a8c0: addiu a0, sp, 36
 	ldloc.0
-	ldloc.1
-	ldloc.2
+	ldc.i4.s 36
+	add
+	stloc.1
+// 0x0107a8c4: 0x107a8c4: mflo  lo
+	ldloc 17
+	stloc.3
+// 0x0107a8c8: 0x107a8c8: addiu a2, a2, 1
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl90::RTAlerts_Delete_All_Comments_10785d8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107a7c8: 0x107a7c8: lw    v0, 2000(s1)
-	ldloc 7
+	ldc.i4.1
+	add
+	stloc.3
+// 0x0107a8cc: 0x107a8cc: sll   a2, a2, 3
+	ldloc.3
+	ldc.i4.3
+	shl
+	stloc.3
+// 0x0107a8d0: 0x107a8d0: mult  s6, v0
 	ldloc 8
+	ldloc 5
+	mul
+	stloc 17
+// 0x0107a8d4: 0x107a8d4: addu  a2, v1, a2
+	ldloc 7
+	ldloc.3
+	add
+	stloc.3
+// 0x0107a8d8: 0x107a8d8: lw    v0, 552(a2)
+	ldloc 6
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 138
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107a7cc: 0x107a7cc: sll   zero, zero, 0
-// 0x0107a7d0: 0x107a7d0: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x0107a7d4: 0x107a7d4: sll   v0, v0, 2
-	ldloc 5
+// 0x0107a8dc: 0x107a8dc: sll   zero, zero, 0
+// 0x0107a8e0: 0x107a8e0: sw    v0, 0(s1)
+	ldloc 6
+	ldloc 11
 	ldc.i4.2
-	shl
-	stloc 5
-// 0x0107a7d8: 0x107a7d8: addu  s1, v0, s1
+	shr.un
 	ldloc 5
-	ldloc 8
-	add
+	stelem.i4
+// 0x0107a8e4: 0x107a8e4: mflo  lo
+	ldloc 17
 	stloc 8
-// 0x0107a7dc: 0x107a7dc: lw    v0, 0(s1)
+// 0x0107a8e8: 0x107a8e8: addu  v1, v1, s6
 	ldloc 7
 	ldloc 8
+	add
+	stloc 7
+// 0x0107a8ec: 0x107a8ec: lw    v0, 552(v1)
+	ldloc 6
+	ldloc 7
 	ldc.i4.2
 	shr.un
+	ldc.i4 138
+	add
 	ldelem.i4
 	stloc 5
-// 0x0107a7e0: 0x107a7e0: sll   zero, zero, 0
-// 0x0107a7e4: 0x107a7e4: lw    a0, 1512(v0)
-	ldloc 7
-	ldloc 5
+// 0x0107a8f0: 0x107a8f0: jal   0x10086cc sw    v0, 0(s2)
+	ldloc 6
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldc.i4 378
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107a7e8: 0x107a7e8: sll   zero, zero, 0
-// 0x0107a7ec: 0x107a7ec: beq   a0, zero, 0x107a800 lui   v0, 0x80000
+	ldloc 5
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	ldc.i4 524288
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	brfalse L_107a800
 // --- basic block ---
-// 0x0107a7f4: 0x107a7f4: jal   0x1000930 sll   zero, zero, 0
+// 0x0107a8f8: 0x107a8f8: jal   0x1000930 addu  a0, s4, zero
+	ldloc 9
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1079,1143 +1259,915 @@ L_107a7a0:
 	ldloc 4
 	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a7fc: 0x107a7fc: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_107a800:
-// 0x0107a800: 0x107a800: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
+// 0x0107a900: 0x107a900: j	 0x107a984 addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x0107a804: 0x107a804: lw    v1, 2000(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
+	br L_107a984
+// --- basic block ---
+L_107a908:
+// 0x0107a908: 0x107a908: addiu s6, s6, 1
+	ldloc 8
+	ldc.i4.1
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107a808: 0x107a808: sll   zero, zero, 0
-// 0x0107a80c: 0x107a80c: addiu v1, v1, -1
-	ldloc 6
-	ldc.i4.m1
+	stloc 8
+L_107a90c:
+// 0x0107a90c: 0x107a90c: addiu s7, s7, 48
+	ldloc 15
+	ldc.i4.s 48
 	add
-	stloc 6
-// 0x0107a810: 0x107a810: sll   v1, v1, 2
-	ldloc 6
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a814: 0x107a814: addu  v0, v1, v0
+	stloc 15
+L_107a910:
+// 0x0107a910: 0x107a910: lw    v1, 1352(sp)
 	ldloc 6
-	ldloc 5
-	add
-	stloc 5
-// 0x0107a818: 0x107a818: lw    v0, 0(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4 338
+	add
 	ldelem.i4
-	stloc 5
-// 0x0107a81c: 0x107a81c: sll   zero, zero, 0
-// 0x0107a820: 0x107a820: lw    a0, 1504(v0)
+	stloc 7
+// 0x0107a914: 0x107a914: sll   zero, zero, 0
+// 0x0107a918: 0x107a918: slt   v0, s6, v1
+	ldloc 8
 	ldloc 7
+	clt
+	stloc 5
+// 0x0107a91c: 0x107a91c: bne   v0, zero, 0x107a828 sll   zero, zero, 0
 	ldloc 5
+	brtrue L_107a828
+// --- basic block ---
+// 0x0107a924: 0x107a924: jal   0x1000930 addu  a0, s4, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107a92c: 0x107a92c: addiu s1, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc 11
+// 0x0107a930: 0x107a930: lw    a0, 584(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 376
+	ldc.i4 146
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107a824: 0x107a824: sll   zero, zero, 0
-// 0x0107a828: 0x107a828: beq   a0, zero, 0x107a83c lui   v0, 0x80000
+// 0x0107a934: 0x107a934: jal   0x1011a5c addu  a1, s1, zero
+	ldloc 11
+	stloc.2
+	ldloc.0
 	ldloc.1
-	ldc.i4 524288
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl12::roadmap_street_get_properties_1011a5c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-	brfalse L_107a83c
 // --- basic block ---
-// 0x0107a830: 0x107a830: jal   0x1000930 sll   zero, zero, 0
+// 0x0107a93c: 0x107a93c: jal   0x1011828 addu  a0, s1, zero
+	ldloc 11
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl12::roadmap_street_get_street_name_1011828(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a838: 0x107a838: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_107a83c:
-// 0x0107a83c: 0x107a83c: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x0107a840: 0x107a840: lw    v1, 2000(v0)
-	ldloc 7
-	ldloc 5
+// 0x0107a944: 0x107a944: j	 0x107a974 sw    v0, 0(s0)
+	ldloc 6
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc 6
-// 0x0107a844: 0x107a844: sll   zero, zero, 0
-// 0x0107a848: 0x107a848: addiu v1, v1, -1
-	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x0107a84c: 0x107a84c: sll   v1, v1, 2
-	ldloc 6
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a850: 0x107a850: addu  v0, v1, v0
-	ldloc 6
-	ldloc 5
-	add
-	stloc 5
-// 0x0107a854: 0x107a854: lw    v0, 0(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107a858: 0x107a858: sll   zero, zero, 0
-// 0x0107a85c: 0x107a85c: lw    a0, 1508(v0)
-	ldloc 7
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 377
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107a860: 0x107a860: sll   zero, zero, 0
-// 0x0107a864: 0x107a864: beq   a0, zero, 0x107a878 lui   v0, 0x80000
-	ldloc.1
-	ldc.i4 524288
-	stloc 5
-	brfalse L_107a878
+	stelem.i4
+	br L_107a974
 // --- basic block ---
-// 0x0107a86c: 0x107a86c: jal   0x1000930 sll   zero, zero, 0
+L_107a94c:
+// 0x0107a94c: 0x107a94c: lw    a1, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107a874: 0x107a874: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_107a878:
-// 0x0107a878: 0x107a878: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x0107a87c: 0x107a87c: lw    v1, 2000(v0)
-	ldloc 7
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a880: 0x107a880: sll   zero, zero, 0
-// 0x0107a884: 0x107a884: addiu v1, v1, -1
-	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x0107a888: 0x107a888: sll   v1, v1, 2
+	stloc.2
+// 0x0107a950: 0x107a950: sw    zero, 0(s3)
 	ldloc 6
+	ldloc 14
 	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a88c: 0x107a88c: addu  v0, v1, v0
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107a954: 0x107a954: sw    v0, 0(s2)
 	ldloc 6
-	ldloc 5
-	add
-	stloc 5
-// 0x0107a890: 0x107a890: lw    v0, 0(v0)
-	ldloc 7
-	ldloc 5
+	ldloc 13
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107a894: 0x107a894: sll   zero, zero, 0
-// 0x0107a898: 0x107a898: lw    a0, 1500(v0)
-	ldloc 7
 	ldloc 5
+	stelem.i4
+// 0x0107a958: 0x107a958: sw    zero, 0(s0)
+	ldloc 6
+	ldloc 12
 	ldc.i4.2
 	shr.un
-	ldc.i4 375
-	add
-	ldelem.i4
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107a95c: 0x107a95c: sw    v0, 0(s1)
+	ldloc 6
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldloc 5
+	stelem.i4
+// 0x0107a960: 0x107a960: addu  a0, s4, zero
+	ldloc 9
 	stloc.1
-// 0x0107a89c: 0x107a89c: sll   zero, zero, 0
-// 0x0107a8a0: 0x107a8a0: beq   a0, zero, 0x107a8b4 lui   v0, 0x80000
-	ldloc.1
-	ldc.i4 524288
-	stloc 5
-	brfalse L_107a8b4
-// --- basic block ---
-// 0x0107a8a8: 0x107a8a8: jal   0x1000930 sll   zero, zero, 0
+L_107a964:
+// 0x0107a964: 0x107a964: jal   0x10086cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a8b0: 0x107a8b0: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_107a8b4:
-// 0x0107a8b4: 0x107a8b4: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
+// 0x0107a96c: 0x107a96c: j	 0x107a984 addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
-// 0x0107a8b8: 0x107a8b8: lw    v1, 2000(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc 6
-// 0x0107a8bc: 0x107a8bc: sll   zero, zero, 0
-// 0x0107a8c0: 0x107a8c0: addiu v1, v1, -1
-	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x0107a8c4: 0x107a8c4: sll   v1, v1, 2
-	ldloc 6
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a8c8: 0x107a8c8: addu  v0, v1, v0
+	br L_107a984
+// --- basic block ---
+L_107a974:
+// 0x0107a974: 0x107a974: lw    a1, 32(sp)
 	ldloc 6
-	ldloc 5
-	add
-	stloc 5
-// 0x0107a8cc: 0x107a8cc: lw    v0, 0(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107a8d0: 0x107a8d0: sll   zero, zero, 0
-// 0x0107a8d4: 0x107a8d4: lw    a0, 1496(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 374
+	ldc.i4.8
 	add
 	ldelem.i4
+	stloc.2
+// 0x0107a978: 0x107a978: jal   0x10086cc addiu a0, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
 	stloc.1
-// 0x0107a8d8: 0x107a8d8: sll   zero, zero, 0
-// 0x0107a8dc: 0x107a8dc: beq   a0, zero, 0x107a8f0 lui   v0, 0x80000
-	ldloc.1
-	ldc.i4 524288
-	stloc 5
-	brfalse L_107a8f0
-// --- basic block ---
-// 0x0107a8e4: 0x107a8e4: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107a8ec: 0x107a8ec: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-L_107a8f0:
-// 0x0107a8f0: 0x107a8f0: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
+// 0x0107a980: 0x107a980: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x0107a8f4: 0x107a8f4: lw    v1, 2000(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc 6
-// 0x0107a8f8: 0x107a8f8: sll   zero, zero, 0
-// 0x0107a8fc: 0x107a8fc: addiu v1, v1, -1
-	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x0107a900: 0x107a900: sll   v1, v1, 2
-	ldloc 6
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a904: 0x107a904: addu  v1, v1, v0
-	ldloc 6
-	ldloc 5
-	add
-	stloc 6
-// 0x0107a908: 0x107a908: lw    v1, 0(v1)
-	ldloc 7
+L_107a984:
+// 0x0107a984: 0x107a984: lw    ra, 1396(sp)
+// 0x0107a988: 0x107a988: lw    s8, 1392(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4 348
+	add
 	ldelem.i4
-	stloc 6
-// 0x0107a90c: 0x107a90c: sll   zero, zero, 0
-// 0x0107a910: 0x107a910: lw    v1, 1824(v1)
-	ldloc 7
+	stloc 16
+// 0x0107a98c: 0x107a98c: lw    s7, 1388(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 456
+	ldc.i4 347
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a914: 0x107a914: sll   zero, zero, 0
-// 0x0107a918: 0x107a918: beq   v1, zero, 0x107a930 sll   zero, zero, 0
+	stloc 15
+// 0x0107a990: 0x107a990: lw    s6, 1384(sp)
 	ldloc 6
-	brfalse L_107a930
-// --- basic block ---
-// 0x0107a920: 0x107a920: lw    v1, 2004(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 501
+	ldc.i4 346
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a924: 0x107a924: sll   zero, zero, 0
-// 0x0107a928: 0x107a928: addiu v1, v1, -1
+	stloc 8
+// 0x0107a994: 0x107a994: lw    s5, 1380(sp)
 	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x0107a92c: 0x107a92c: sw    v1, 2004(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 501
+	ldc.i4 345
 	add
+	ldelem.i4
+	stloc 10
+// 0x0107a998: 0x107a998: lw    s4, 1376(sp)
 	ldloc 6
-	stelem.i4
-L_107a930:
-// 0x0107a930: 0x107a930: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107a934: 0x107a934: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x0107a938: 0x107a938: lw    v1, 2000(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 344
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a93c: 0x107a93c: sll   zero, zero, 0
-// 0x0107a940: 0x107a940: addiu v1, v1, -1
-	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x0107a944: 0x107a944: sll   v1, v1, 2
-	ldloc 6
-	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a948: 0x107a948: addu  v1, v1, v0
-	ldloc 6
-	ldloc 5
-	add
-	stloc 6
-// 0x0107a94c: 0x107a94c: lw    v1, 0(v1)
-	ldloc 7
+	stloc 9
+// 0x0107a99c: 0x107a99c: lw    s3, 1372(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4 343
+	add
 	ldelem.i4
-	stloc 6
-// 0x0107a950: 0x107a950: sll   zero, zero, 0
-// 0x0107a954: 0x107a954: lw    v1, 1836(v1)
-	ldloc 7
+	stloc 14
+// 0x0107a9a0: 0x107a9a0: lw    s2, 1368(sp)
 	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 459
+	ldc.i4 342
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a958: 0x107a958: sll   zero, zero, 0
-// 0x0107a95c: 0x107a95c: beq   v1, zero, 0x107a974 sll   zero, zero, 0
+	stloc 13
+// 0x0107a9a4: 0x107a9a4: lw    s1, 1364(sp)
 	ldloc 6
-	brfalse L_107a974
-// --- basic block ---
-// 0x0107a964: 0x107a964: lw    v1, 2008(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 502
+	ldc.i4 341
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a968: 0x107a968: sll   zero, zero, 0
-// 0x0107a96c: 0x107a96c: addiu v1, v1, -1
+	stloc 11
+// 0x0107a9a8: 0x107a9a8: lw    s0, 1360(sp)
 	ldloc 6
-	ldc.i4.m1
-	add
-	stloc 6
-// 0x0107a970: 0x107a970: sw    v1, 2008(v0)
-	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 502
+	ldc.i4 340
 	add
-	ldloc 6
-	stelem.i4
-L_107a974:
-// 0x0107a974: 0x107a974: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107a978: 0x107a978: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
+	ldelem.i4
+	stloc 12
+// 0x0107a9ac: 0x107a9ac: jr    ra addiu sp, sp, 1400
+	ldloc.0
+	ldc.i4 1400
 	add
-	stloc 5
-// 0x0107a97c: 0x107a97c: lw    v1, 2000(v0)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
+	ret
+}
+.method public static int32 RTAlerts_Get_Sound_107a9b4(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
 	stloc 6
-// 0x0107a980: 0x107a980: sll   zero, zero, 0
-// 0x0107a984: 0x107a984: addiu v1, v1, -1
-	ldloc 6
-	ldc.i4.m1
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107a9b4:
+// 0x0107a9b4: 0x107a9b4: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
 	add
-	stloc 6
-// 0x0107a988: 0x107a988: sll   v1, v1, 2
-	ldloc 6
+	stloc.0
+// 0x0107a9b8: 0x107a9b8: sw    s1, 24(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
-	shl
-	stloc 6
-// 0x0107a98c: 0x107a98c: addu  v0, v1, v0
-	ldloc 6
-	ldloc 5
+	shr.un
+	ldc.i4.6
 	add
-	stloc 5
-// 0x0107a990: 0x107a990: lw    a0, 0(v0)
+	ldloc 9
+	stelem.i4
+// 0x0107a9bc: 0x107a9bc: addu  s1, a0, zero
+	ldloc.1
+	stloc 9
+// 0x0107a9c0: 0x107a9c0: sw    s0, 20(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
+	ldc.i4.5
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107a9c4: 0x107a9c4: sw    ra, 28(sp)
+// 0x0107a9c8: 0x107a9c8: jal   0x10518b8 addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0107a994: 0x107a994: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107a99c: 0x107a99c: j	 0x107aa8c lui   v1, 0x80000
+// 0x0107a9d0: 0x107a9d0: addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0107a9d4: 0x107a9d4: lui   v0, 0x80000
 	ldc.i4 524288
-	stloc 6
-	br L_107aa8c
-// --- basic block ---
-L_107a9a4:
-// 0x0107a9a4: 0x107a9a4: beq   v0, zero, 0x107a9b8 sll   zero, zero, 0
+	stloc 5
+// 0x0107a9d8: 0x107a9d8: addiu v0, v0, -15564
 	ldloc 5
-	brfalse L_107a9b8
-// --- basic block ---
-// 0x0107a9ac: 0x107a9ac: lw    v1, 4(s1)
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107a9dc: 0x107a9dc: addu  v1, v0, zero
+	ldloc 5
+	stloc 6
+// 0x0107a9e0: 0x107a9e0: lw    a1, 2000(v0)
 	ldloc 7
-	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107a9b0: 0x107a9b0: j	 0x107aa60 sw    v1, 0(s1)
+	stloc.2
+// 0x0107a9e4: 0x107a9e4: j	 0x107aa24 addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+	br L_107aa24
+// --- basic block ---
+L_107a9ec:
+// 0x0107a9ec: 0x107a9ec: lw    a0, 0(v1)
 	ldloc 7
-	ldloc 8
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldloc 6
-	stelem.i4
-	br L_107aa60
-// --- basic block ---
-L_107a9b8:
-// 0x0107a9b8: 0x107a9b8: lw    a0, 0(s1)
+	ldelem.i4
+	stloc.1
+// 0x0107a9f0: 0x107a9f0: sll   zero, zero, 0
+// 0x0107a9f4: 0x107a9f4: lw    a2, 0(a0)
 	ldloc 7
-	ldloc 8
+	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.1
-// 0x0107a9bc: 0x107a9bc: sll   zero, zero, 0
-// 0x0107a9c0: 0x107a9c0: lw    v1, 0(a0)
+	stloc.3
+// 0x0107a9f8: 0x107a9f8: sll   zero, zero, 0
+// 0x0107a9fc: 0x107a9fc: bne   a2, s1, 0x107aa24 addiu v1, v1, 4
+	ldloc.3
+	ldloc 9
+	ldloc 6
+	ldc.i4.4
+	add
+	stloc 6
+	bne.un L_107aa24
+// --- basic block ---
+// 0x0107aa04: 0x107aa04: lw    v0, 4(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
+	ldc.i4.1
+	add
 	ldelem.i4
+	stloc 5
+// 0x0107aa08: 0x107aa08: addiu v1, zero, 1
+	ldc.i4.1
 	stloc 6
-// 0x0107a9c4: 0x107a9c4: sll   zero, zero, 0
-// 0x0107a9c8: 0x107a9c8: bne   v1, s0, 0x107aa60 sll   zero, zero, 0
+// 0x0107aa0c: 0x107aa0c: beq   v0, v1, 0x107aa38 addiu v1, zero, 2
+	ldloc 5
 	ldloc 6
-	ldloc 9
-	bne.un L_107aa60
+	ldc.i4.2
+	stloc 6
+	beq  L_107aa38
 // --- basic block ---
-// 0x0107a9d0: 0x107a9d0: jal   0x107a570 sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
+// 0x0107aa14: 0x107aa14: bne   v0, v1, 0x107aa48 lui   a1, 0x10000
+	ldloc 5
+	ldloc 6
+	ldc.i4 65536
+	stloc.2
+	bne.un L_107aa48
+// --- basic block ---
+// 0x0107aa1c: 0x107aa1c: j	 0x107aa40 addiu a1, a1, -19640
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl92::DeleteAlertObject_107a570(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4 -19640
+	add
+	stloc.2
+	br L_107aa40
+// --- basic block ---
+L_107aa24:
+// 0x0107aa24: 0x107aa24: slt   a0, v0, a1
+	ldloc 5
+	ldloc.2
+	clt
+	stloc.1
+// 0x0107aa28: 0x107aa28: bne   a0, zero, 0x107a9ec addiu v0, v0, 1
+	ldloc.1
+	ldloc 5
+	ldc.i4.1
+	add
 	stloc 5
+	brtrue L_107a9ec
 // --- basic block ---
-// 0x0107a9d8: 0x107a9d8: lw    a0, 0(s1)
-	ldloc 7
+// 0x0107aa30: 0x107aa30: j	 0x107aa48 sll   zero, zero, 0
+	br L_107aa48
+// --- basic block ---
+L_107aa38:
+// 0x0107aa38: 0x107aa38: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107aa3c: 0x107aa3c: addiu a1, a1, -19680
+	ldloc.2
+	ldc.i4 -19680
+	add
+	stloc.2
+L_107aa40:
+// 0x0107aa40: 0x107aa40: jal   0x10518dc addu  a0, s0, zero
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
 	stloc.1
-// 0x0107a9dc: 0x107a9dc: jal   0x10785d8 sll   zero, zero, 0
-	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl90::RTAlerts_Delete_All_Comments_10785d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107a9e4: 0x107a9e4: lw    v0, 0(s1)
-	ldloc 7
+L_107aa48:
+// 0x0107aa48: 0x107aa48: lw    ra, 28(sp)
+// 0x0107aa4c: 0x107aa4c: addu  v0, s0, zero
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
 	stloc 5
-// 0x0107a9e8: 0x107a9e8: sll   zero, zero, 0
-// 0x0107a9ec: 0x107a9ec: lw    v0, 1824(v0)
+// 0x0107aa50: 0x107aa50: lw    s1, 24(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 456
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107a9f0: 0x107a9f0: sll   zero, zero, 0
-// 0x0107a9f4: 0x107a9f4: beq   v0, zero, 0x107aa0c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107aa0c
-// --- basic block ---
-// 0x0107a9fc: 0x107a9fc: lw    v0, 2004(s2)
+	stloc 9
+// 0x0107aa54: 0x107aa54: lw    s0, 20(sp)
 	ldloc 7
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 501
+	ldc.i4.5
 	add
 	ldelem.i4
+	stloc 8
+// 0x0107aa58: 0x107aa58: jr    ra addiu sp, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Get_Map_Icon_107aa60(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  9 is register ra
+// local  8 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 9
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 8
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107aa60:
+// 0x0107aa60: 0x107aa60: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0107aa00: 0x107aa00: sll   zero, zero, 0
-// 0x0107aa04: 0x107aa04: addiu v0, v0, -1
+// 0x0107aa64: 0x107aa64: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107aa68: 0x107aa68: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4.m1
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107aa08: 0x107aa08: sw    v0, 2004(s2)
-	ldloc 7
-	ldloc 10
+// 0x0107aa6c: 0x107aa6c: sw    ra, 20(sp)
+// 0x0107aa70: 0x107aa70: sw    s0, 16(sp)
+	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 501
+	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
-L_107aa0c:
-// 0x0107aa0c: 0x107aa0c: lw    v0, 0(s1)
 	ldloc 7
+	stelem.i4
+// 0x0107aa74: 0x107aa74: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107aa78: 0x107aa78: lw    a2, 2000(v0)
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107aa10: 0x107aa10: sll   zero, zero, 0
-// 0x0107aa14: 0x107aa14: lw    v0, 1836(v0)
-	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 459
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107aa18: 0x107aa18: sll   zero, zero, 0
-// 0x0107aa1c: 0x107aa1c: beq   v0, zero, 0x107aa34 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107aa34
+	stloc.3
+// 0x0107aa7c: 0x107aa7c: j	 0x107aad0 addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_107aad0
 // --- basic block ---
-// 0x0107aa24: 0x107aa24: lw    v0, 2008(s2)
-	ldloc 7
-	ldloc 10
+L_107aa84:
+// 0x0107aa84: 0x107aa84: lw    v0, 0(a1)
+	ldloc 8
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 502
-	add
 	ldelem.i4
 	stloc 5
-// 0x0107aa28: 0x107aa28: sll   zero, zero, 0
-// 0x0107aa2c: 0x107aa2c: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
-	add
-	stloc 5
-// 0x0107aa30: 0x107aa30: sw    v0, 2008(s2)
-	ldloc 7
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 502
-	add
-	ldloc 5
-	stelem.i4
-L_107aa34:
-// 0x0107aa34: 0x107aa34: lw    v0, 2004(s2)
-	ldloc 7
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 501
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107aa38: 0x107aa38: sll   zero, zero, 0
-// 0x0107aa3c: 0x107aa3c: bne   v0, zero, 0x107aa48 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107aa48
-// --- basic block ---
-// 0x0107aa44: 0x107aa44: sw    s4, 15824(s5)
-	ldloc 7
-	ldloc 13
-	ldc.i4.2
-	shr.un
-	ldc.i4 3956
-	add
-	ldloc 12
-	stelem.i4
-L_107aa48:
-// 0x0107aa48: 0x107aa48: lw    a0, 0(s1)
-	ldloc 7
+// 0x0107aa88: 0x107aa88: sll   zero, zero, 0
+// 0x0107aa8c: 0x107aa8c: lw    a3, 0(v0)
 	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
-	stloc.1
-// 0x0107aa4c: 0x107aa4c: jal   0x1000930 sll   zero, zero, 0
-	ldloc.0
+	stloc 4
+// 0x0107aa90: 0x107aa90: sll   zero, zero, 0
+// 0x0107aa94: 0x107aa94: bne   a3, a0, 0x107aacc addiu a1, a1, 4
+	ldloc 4
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.4
+	add
+	stloc.2
+	bne.un L_107aacc
 // --- basic block ---
-// 0x0107aa54: 0x107aa54: lw    v1, 4(s1)
-	ldloc 7
+// 0x0107aa9c: 0x107aa9c: lw    v1, 4(v0)
 	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.1
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107aa58: 0x107aa58: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107aa5c: 0x107aa5c: sw    v1, 0(s1)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
+// 0x0107aaa0: 0x107aaa0: sll   zero, zero, 0
+// 0x0107aaa4: 0x107aaa4: sltiu a0, v1, 10
+	ldloc 6
+	ldc.i4.s 10
+	clt.un
+	stloc.1
+// 0x0107aaa8: 0x107aaa8: beq   a0, zero, 0x107ab80 lui   a0, 0x20000
+	ldloc.1
+	ldc.i4 131072
+	stloc.1
+	brfalse L_107ab80
+// --- basic block ---
+// 0x0107aab0: 0x107aab0: sll   v1, v1, 2
 	ldloc 6
-	stelem.i4
-L_107aa60:
-// 0x0107aa60: 0x107aa60: addiu s3, s3, 1
-	ldloc 11
-	ldc.i4.1
-	add
-	stloc 11
-// 0x0107aa64: 0x107aa64: addiu s1, s1, 4
-	ldloc 8
-	ldc.i4.4
-	add
-	stloc 8
-L_107aa68:
-// 0x0107aa68: 0x107aa68: lw    v1, 2000(s2)
-	ldloc 7
-	ldloc 10
 	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
+	shl
 	stloc 6
-// 0x0107aa6c: 0x107aa6c: sll   zero, zero, 0
-// 0x0107aa70: 0x107aa70: addiu v1, v1, -1
+// 0x0107aab4: 0x107aab4: addiu a0, a0, 29292
+	ldloc.1
+	ldc.i4 29292
+	add
+	stloc.1
+// 0x0107aab8: 0x107aab8: addu  v1, a0, v1
+	ldloc.1
 	ldloc 6
-	ldc.i4.m1
 	add
 	stloc 6
-// 0x0107aa74: 0x107aa74: slt   v1, s3, v1
-	ldloc 11
+// 0x0107aabc: 0x107aabc: lw    v1, 0(v1)
+	ldloc 8
 	ldloc 6
-	clt
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 6
-// 0x0107aa78: 0x107aa78: bne   v1, zero, 0x107a9a4 sll   zero, zero, 0
+// 0x0107aac0: 0x107aac0: sll   zero, zero, 0
+// 0x0107aac4: 0x107aac4: jr    v1 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_107a9a4
-// --- basic block ---
-// 0x0107aa80: 0x107aa80: beq   v0, zero, 0x107ab04 lui   a1, 0x20000
-	ldloc 5
-	ldc.i4 131072
-	stloc.2
-	brfalse L_107ab04
+	br __CIBYL_local_jumptab
 // --- basic block ---
-// 0x0107aa88: 0x107aa88: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-L_107aa8c:
-// 0x0107aa8c: 0x107aa8c: addiu v1, v1, -16028
+L_107aacc:
+// 0x0107aacc: 0x107aacc: addiu v1, v1, 1
 	ldloc 6
-	ldc.i4 -16028
+	ldc.i4.1
 	add
 	stloc 6
-// 0x0107aa90: 0x107aa90: lw    v0, 2000(v1)
-	ldloc 7
+L_107aad0:
+// 0x0107aad0: 0x107aad0: slt   v0, v1, a2
 	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107aa94: 0x107aa94: sll   zero, zero, 0
-// 0x0107aa98: 0x107aa98: addiu v0, v0, -1
-	ldloc 5
-	ldc.i4.m1
-	add
+	ldloc.3
+	clt
 	stloc 5
-// 0x0107aa9c: 0x107aa9c: sll   a0, v0, 2
+// 0x0107aad4: 0x107aad4: bne   v0, zero, 0x107aa84 addu  v0, zero, zero
 	ldloc 5
-	ldc.i4.2
-	shl
-	stloc.1
-// 0x0107aaa0: 0x107aaa0: addu  a0, a0, v1
-	ldloc.1
-	ldloc 6
-	add
-	stloc.1
-// 0x0107aaa4: 0x107aaa4: sw    zero, 0(a0)
-	ldloc 7
-	ldloc.1
-	ldc.i4.2
-	shr.un
 	ldc.i4.s 0
-	stelem.i4
-// 0x0107aaa8: 0x107aaa8: bne   v0, zero, 0x107aad4 sw    v0, 2000(v1)
-	ldloc 5
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldloc 5
-	stelem.i4
-	brtrue L_107aad4
+	stloc 5
+	brtrue L_107aa84
 // --- basic block ---
-// 0x0107aab0: 0x107aab0: lui   s0, 0x80000
+// 0x0107aadc: 0x107aadc: j	 0x107ab84 sll   zero, zero, 0
+	br L_107ab84
+// --- basic block ---
+L_107aae4:
+// 0x0107aae4: 0x107aae4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107aae8: 0x107aae8: lui   s0, 0x80000
 	ldc.i4 524288
-	stloc 9
-// 0x0107aab4: 0x107aab4: lw    v0, -13992(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3498
+	stloc 7
+// 0x0107aaec: 0x107aaec: j	 0x107ab00 addiu a1, a1, -25612
+	ldloc.2
+	ldc.i4 -25612
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107aab8: 0x107aab8: sll   zero, zero, 0
-// 0x0107aabc: 0x107aabc: beq   v0, zero, 0x107aad8 lui   v0, 0x80000
-	ldloc 5
-	ldc.i4 524288
-	stloc 5
-	brfalse L_107aad8
+	stloc.2
+	br L_107ab00
 // --- basic block ---
-// 0x0107aac4: 0x107aac4: lui   a0, 0x1080000
-	ldc.i4 17301504
-	stloc.1
-// 0x0107aac8: 0x107aac8: jal   0x104fd00 addiu a0, a0, -1240
-	ldloc.1
-	ldc.i4 -1240
+L_107aaf4:
+// 0x0107aaf4: 0x107aaf4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107aaf8: 0x107aaf8: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107aafc: 0x107aafc: addiu a1, a1, -25592
+	ldloc.2
+	ldc.i4 -25592
+	add
+	stloc.2
+L_107ab00:
+// 0x0107ab00: 0x107ab00: jal   0x1001b68 addiu a0, s0, -15756
+	ldloc 7
+	ldc.i4 -15756
 	add
 	stloc.1
-	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_remove_periodic_104fd00(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strcpy_1001b68(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107aad0: 0x107aad0: sw    zero, -13992(s0)
+// 0x0107ab08: 0x107ab08: j	 0x107ab84 addiu v0, s0, -15756
 	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3498
+	ldc.i4 -15756
 	add
-	ldc.i4.s 0
-	stelem.i4
-L_107aad4:
-// 0x0107aad4: 0x107aad4: lui   v0, 0x80000
-	ldc.i4 524288
 	stloc 5
-L_107aad8:
-// 0x0107aad8: 0x107aad8: lw    v1, -16092(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4023
+	br L_107ab84
+// --- basic block ---
+L_107ab10:
+// 0x0107ab10: 0x107ab10: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107ab14: 0x107ab14: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107ab18: 0x107ab18: j	 0x107ab00 addiu a1, a1, -25572
+	ldloc.2
+	ldc.i4 -25572
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107aadc: 0x107aadc: sll   zero, zero, 0
-// 0x0107aae0: 0x107aae0: bne   v1, zero, 0x107ab20 lui   a1, 0x1080000
-	ldloc 6
-	ldc.i4 17301504
 	stloc.2
-	brtrue L_107ab20
+	br L_107ab00
 // --- basic block ---
-// 0x0107aae8: 0x107aae8: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0107aaec: 0x107aaec: addiu a1, a1, -26580
+L_107ab20:
+// 0x0107ab20: 0x107ab20: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107ab24: 0x107ab24: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107ab28: 0x107ab28: j	 0x107ab00 addiu a1, a1, -25552
 	ldloc.2
-	ldc.i4 -26580
+	ldc.i4 -25552
 	add
 	stloc.2
-// 0x0107aaf0: 0x107aaf0: addiu a0, zero, 2000
-	ldc.i4 2000
-	stloc.1
-// 0x0107aaf4: 0x107aaf4: jal   0x104fe98 sw    v1, -16092(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4023
+	br L_107ab00
+// --- basic block ---
+L_107ab30:
+// 0x0107ab30: 0x107ab30: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107ab34: 0x107ab34: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107ab38: 0x107ab38: j	 0x107ab00 addiu a1, a1, -25536
+	ldloc.2
+	ldc.i4 -25536
 	add
-	ldloc 6
-	stelem.i4
-	ldloc.0
-	ldloc.1
+	stloc.2
+	br L_107ab00
+// --- basic block ---
+L_107ab40:
+// 0x0107ab40: 0x107ab40: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107ab44: 0x107ab44: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107ab48: 0x107ab48: j	 0x107ab00 addiu a1, a1, -25516
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4 -25516
+	add
+	stloc.2
+	br L_107ab00
 // --- basic block ---
-// 0x0107aafc: 0x107aafc: j	 0x107ab20 sll   zero, zero, 0
-	br L_107ab20
+L_107ab50:
+// 0x0107ab50: 0x107ab50: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107ab54: 0x107ab54: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107ab58: 0x107ab58: j	 0x107ab00 addiu a1, a1, -25496
+	ldloc.2
+	ldc.i4 -25496
+	add
+	stloc.2
+	br L_107ab00
 // --- basic block ---
-L_107ab04:
-// 0x0107ab04: 0x107ab04: lui   a3, 0x20000
+L_107ab60:
+// 0x0107ab60: 0x107ab60: lui   a1, 0x20000
 	ldc.i4 131072
-	stloc 4
-// 0x0107ab08: 0x107ab08: addiu a1, a1, -26712
+	stloc.2
+// 0x0107ab64: 0x107ab64: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107ab68: 0x107ab68: j	 0x107ab00 addiu a1, a1, -25480
 	ldloc.2
-	ldc.i4 -26712
+	ldc.i4 -25480
 	add
 	stloc.2
-// 0x0107ab0c: 0x107ab0c: addiu a3, a3, -25804
-	ldloc 4
-	ldc.i4 -25804
+	br L_107ab00
+// --- basic block ---
+L_107ab70:
+// 0x0107ab70: 0x107ab70: lw    a1, 1508(v0)
+	ldloc 8
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 377
 	add
-	stloc 4
-// 0x0107ab10: 0x107ab10: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107ab14: 0x107ab14: addiu a2, zero, 1024
-	ldc.i4 1024
-	stloc.3
-L_107ab18:
-// 0x0107ab18: 0x107ab18: jal   0x100449c sw    s0, 16(sp)
-	ldloc 7
+	ldelem.i4
+	stloc.2
+// 0x0107ab74: 0x107ab74: sll   zero, zero, 0
+// 0x0107ab78: 0x107ab78: bne   a1, zero, 0x107ab00 lui   s0, 0x80000
+	ldloc.2
+	ldc.i4 524288
+	stloc 7
+	brtrue L_107ab00
+// --- basic block ---
+L_107ab80:
+// 0x0107ab80: 0x107ab80: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+L_107ab84:
+// 0x0107ab84: 0x107ab84: lw    ra, 20(sp)
+// 0x0107ab88: 0x107ab88: lw    s0, 16(sp)
+	ldloc 8
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
+	ldelem.i4
+	stloc 7
+// 0x0107ab8c: 0x107ab8c: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_107ab20:
-// 0x0107ab20: 0x107ab20: lw    ra, 52(sp)
-// 0x0107ab24: 0x107ab24: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107ab28: 0x107ab28: lw    s5, 48(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107ab2c: 0x107ab2c: lw    s4, 44(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107ab30: 0x107ab30: lw    s3, 40(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107ab34: 0x107ab34: lw    s2, 36(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 10
-// 0x0107ab38: 0x107ab38: lw    s1, 32(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107ab3c: 0x107ab3c: lw    s0, 28(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 9
-// 0x0107ab40: 0x107ab40: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+	ldc.i4.s 24
 	add
 	stloc.0
 	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 Rtalerts_Delete_107ab48(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
-
-// local  8 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  5 is register s0
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 5
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	br __CIBYL_function_return
+__CIBYL_local_jumptab:
 	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107ab48:
-// 0x0107ab48: 0x107ab48: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107ab4c: 0x107ab4c: sw    s0, 16(sp)
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107ab50: 0x107ab50: sw    ra, 20(sp)
-// 0x0107ab54: 0x107ab54: jal   0x107a718 addu  s0, a0, zero
-	ldloc.1
-	stloc 5
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl92::RTAlerts_Remove_107a718(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0107ab5c: 0x107ab5c: jal   0x106c69c addu  a0, s0, zero
-	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl80::Realtime_Remove_Alert_106c69c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 8
-// --- basic block ---
-// 0x0107ab64: 0x107ab64: lw    ra, 20(sp)
-// 0x0107ab68: 0x107ab68: lw    s0, 16(sp)
+	ldc.i4 17279584
+	beq  L_107aa60
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107ab6c: 0x107ab6c: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
+	ldc.i4 17279716
+	beq  L_107aae4
+	ldloc 6
+	ldc.i4 17279732
+	beq  L_107aaf4
+	ldloc 6
+	ldc.i4 17279760
+	beq  L_107ab10
+	ldloc 6
+	ldc.i4 17279776
+	beq  L_107ab20
+	ldloc 6
+	ldc.i4 17279792
+	beq  L_107ab30
+	ldloc 6
+	ldc.i4 17279808
+	beq  L_107ab40
+	ldloc 6
+	ldc.i4 17279824
+	beq  L_107ab50
+	ldloc 6
+	ldc.i4 17279840
+	beq  L_107ab60
+	ldloc 6
+	ldc.i4 17279856
+	beq  L_107ab70
+	ldloc 6
+	ldc.i4 17279872
+	beq  L_107ab80
+		br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 8
+	ldloc 5
 	ret
 }
-.method public static int32 CreateAlertObject_107ab74(int32,int32,int32,int32,int32)
+.method public static int32 DeleteAlertObject_107ab94(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s5,int32 s0,int32 s6,int32 s1,int32 s2,int32 s3,int32 lo,int32 s7,int32 s8,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s6,int32 s2,int32 s3,int32 s4,int32 s5,int32 s7,int32 ra)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -2223,18 +2175,16 @@ __CIBYL_function_return:
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 10 is register s0
-// local 12 is register s1
-// local 13 is register s2
-// local 14 is register s3
-// local  8 is register s4
-// local  9 is register s5
-// local 11 is register s6
-// local 16 is register s7
+// local  9 is register s0
+// local  8 is register s1
+// local 11 is register s2
+// local 12 is register s3
+// local 13 is register s4
+// local 14 is register s5
+// local 10 is register s6
+// local 15 is register s7
 // local  0 is register sp
-// local 17 is register s8
-// local 18 is register ra
-// local 15 is register lo
+// local 16 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -2250,7 +2200,11 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 10
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 11
 	ldc.i4.s 0
 	stloc 12
 	ldc.i4.s 0
@@ -2258,178 +2212,161 @@ __CIBYL_function_return:
 	ldc.i4.s 0
 	stloc 14
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
+	stloc 10
 	ldc.i4.s 0
-	stloc 16
+	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 17
-	ldc.i4.s 0
-	stloc 18
-	ldc.i4.s 0
-	stloc 15
+	stloc 16
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107ab74: 0x107ab74: addiu sp, sp, -248
+// 0x0107ab94: 0x107ab94: addiu sp, sp, -200
 	ldloc.0
-	ldc.i4 -248
+	ldc.i4 -200
 	add
 	stloc.0
-// 0x0107ab78: 0x107ab78: sw    s1, 212(sp)
+// 0x0107ab98: 0x107ab98: sw    s1, 168(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 53
+	ldc.i4.s 42
 	add
-	ldloc 12
+	ldloc 8
 	stelem.i4
-// 0x0107ab7c: 0x107ab7c: lui   s1, 0x20000
+// 0x0107ab9c: 0x107ab9c: lui   s1, 0x20000
 	ldc.i4 131072
-	stloc 12
-// 0x0107ab80: 0x107ab80: sw    s0, 208(sp)
+	stloc 8
+// 0x0107aba0: 0x107aba0: sw    s0, 164(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 52
+	ldc.i4.s 41
 	add
-	ldloc 10
+	ldloc 9
 	stelem.i4
-// 0x0107ab84: 0x107ab84: addu  s0, a0, zero
+// 0x0107aba4: 0x107aba4: addu  s0, a0, zero
 	ldloc.1
-	stloc 10
-// 0x0107ab88: 0x107ab88: addiu a0, s1, -25916
-	ldloc 12
-	ldc.i4 -25916
+	stloc 9
+// 0x0107aba8: 0x107aba8: addiu a0, s1, -25452
+	ldloc 8
+	ldc.i4 -25452
 	add
 	stloc.1
-// 0x0107ab8c: 0x107ab8c: sw    ra, 244(sp)
-// 0x0107ab90: 0x107ab90: sw    s4, 224(sp)
+// 0x0107abac: 0x107abac: sw    ra, 196(sp)
+// 0x0107abb0: 0x107abb0: sw    s7, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 56
+	ldc.i4.s 48
 	add
-	ldloc 8
+	ldloc 15
 	stelem.i4
-// 0x0107ab94: 0x107ab94: sw    s3, 220(sp)
+// 0x0107abb4: 0x107abb4: sw    s6, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 55
+	ldc.i4.s 47
 	add
-	ldloc 14
+	ldloc 10
 	stelem.i4
-// 0x0107ab98: 0x107ab98: sw    s2, 216(sp)
+// 0x0107abb8: 0x107abb8: sw    s5, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 54
+	ldc.i4.s 46
 	add
-	ldloc 13
+	ldloc 14
 	stelem.i4
-// 0x0107ab9c: 0x107ab9c: sw    s8, 240(sp)
+// 0x0107abbc: 0x107abbc: sw    s4, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 60
+	ldc.i4.s 45
 	add
-	ldloc 17
+	ldloc 13
 	stelem.i4
-// 0x0107aba0: 0x107aba0: sw    s7, 236(sp)
+// 0x0107abc0: 0x107abc0: sw    s3, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 59
+	ldc.i4.s 44
 	add
-	ldloc 16
+	ldloc 12
 	stelem.i4
-// 0x0107aba4: 0x107aba4: sw    s6, 232(sp)
+// 0x0107abc4: 0x107abc4: jal   0x101ca1c sw    s2, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 58
+	ldc.i4.s 43
 	add
 	ldloc 11
 	stelem.i4
-// 0x0107aba8: 0x107aba8: jal   0x101ca0c sw    s5, 228(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 57
-	add
-	ldloc 9
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107abb0: 0x107abb0: addiu a0, s1, -25916
-	ldloc 12
-	ldc.i4 -25916
+// 0x0107abcc: 0x107abcc: addiu a0, s1, -25452
+	ldloc 8
+	ldc.i4 -25452
 	add
 	stloc.1
-// 0x0107abb4: 0x107abb4: addiu s2, sp, 68
-	ldloc.0
-	ldc.i4.s 68
-	add
-	stloc 13
-// 0x0107abb8: 0x107abb8: jal   0x101ca0c addu  s3, v0, zero
+// 0x0107abd0: 0x107abd0: addu  s5, v0, zero
 	ldloc 5
 	stloc 14
+// 0x0107abd4: 0x107abd4: jal   0x101ca1c addiu s1, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107abc0: 0x107abc0: lw    a3, 0(s0)
+// 0x0107abdc: 0x107abdc: lw    a3, 0(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0107abc4: 0x107abc4: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x0107abe0: 0x107abe0: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0107abc8: 0x107abc8: addiu a2, a2, -13884
+// 0x0107abe4: 0x107abe4: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x0107abcc: 0x107abcc: addiu a1, zero, 128
+// 0x0107abe8: 0x107abe8: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0107abd0: 0x107abd0: addu  a0, s2, zero
-	ldloc 13
+// 0x0107abec: 0x107abec: addu  a0, s1, zero
+	ldloc 8
 	stloc.1
-// 0x0107abd4: 0x107abd4: jal   0x1000f9c addu  s1, v0, zero
+// 0x0107abf0: 0x107abf0: jal   0x1000f9c addu  s3, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2442,74 +2379,90 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107abdc: 0x107abdc: jal   0x101ca0c addu  a0, s2, zero
-	ldloc 13
+// 0x0107abf8: 0x107abf8: jal   0x101ca1c addu  a0, s1, zero
+	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107abe4: 0x107abe4: addu  s2, v0, zero
-	ldloc 5
-	stloc 13
-// 0x0107abe8: 0x107abe8: lw    v0, 20(s0)
+// 0x0107ac00: 0x107ac00: lw    a0, 0(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
 	ldelem.i4
+	stloc.1
+// 0x0107ac04: 0x107ac04: addu  s4, v0, zero
+	ldloc 5
+	stloc 13
+// 0x0107ac08: 0x107ac08: jal   0x1077cc4 lui   s6, 0x20000
+	ldc.i4 131072
+	stloc 10
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl90::RTAlerts_Get_Number_Of_Map_AddOns_1077cc4(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0107abec: 0x107abec: lw    v1, 16(s0)
-	ldloc 6
+// --- basic block ---
+// 0x0107ac10: 0x107ac10: addu  s2, s1, zero
+	ldloc 8
+	stloc 11
+// 0x0107ac14: 0x107ac14: addu  s7, v0, zero
+	ldloc 5
+	stloc 15
+// 0x0107ac18: 0x107ac18: addiu s6, s6, -25436
 	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4 -25436
 	add
-	ldelem.i4
+	stloc 10
+// 0x0107ac1c: 0x107ac1c: j	 0x107ac64 addu  s1, zero, zero
+	ldc.i4.s 0
+	stloc 8
+	br L_107ac64
+// --- basic block ---
+L_107ac24:
+// 0x0107ac24: 0x107ac24: jal   0x1077c00 sll   zero, zero, 0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl90::RTAlerts_Get_Map_AddOn_1077c00(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
-// 0x0107abf0: 0x107abf0: lw    a0, 0(s0)
+	stloc 5
+// --- basic block ---
+// 0x0107ac2c: 0x107ac2c: lw    a3, 0(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
+	stloc 4
+// 0x0107ac30: 0x107ac30: addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
+// 0x0107ac34: 0x107ac34: addu  a2, s6, zero
+	ldloc 10
+	stloc.3
+// 0x0107ac38: 0x107ac38: addu  a0, s2, zero
+	ldloc 11
 	stloc.1
-// 0x0107abf4: 0x107abf4: sw    v0, 52(sp)
+// 0x0107ac3c: 0x107ac3c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107abf8: 0x107abf8: addiu v0, zero, 4
 	ldc.i4.4
-	stloc 5
-// 0x0107abfc: 0x107abfc: sw    v1, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 7
-	stelem.i4
-// 0x0107ac00: 0x107ac00: jal   0x107a43c sw    v0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
 	add
 	ldloc 5
 	stelem.i4
@@ -2518,121 +2471,132 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Get_Map_Icon_107a43c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ac08: 0x107ac08: beq   v0, zero, 0x107ade0 addu  s4, v0, zero
-	ldloc 5
-	ldloc 5
-	stloc 8
-	brfalse L_107ade0
-// --- basic block ---
-// 0x0107ac10: 0x107ac10: addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0107ac44: 0x107ac44: jal   0x101ca1c addu  a0, s2, zero
+	ldloc 11
 	stloc.1
-// 0x0107ac14: 0x107ac14: addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
-// 0x0107ac18: 0x107ac18: jal   0x10a1918 addu  a2, v0, zero
-	ldloc 5
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ac20: 0x107ac20: beq   v0, zero, 0x107ac48 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107ac48
-// --- basic block ---
-// 0x0107ac28: 0x107ac28: jal   0x104e020 addu  a0, v0, zero
+// 0x0107ac4c: 0x107ac4c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
+// 0x0107ac50: 0x107ac50: jal   0x101c15c sw    v0, 152(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ac30: 0x107ac30: addiu v1, zero, 2
-	ldc.i4.2
-	stloc 7
-// 0x0107ac34: 0x107ac34: div   v0, v1
-	ldloc 5
-	ldloc 7
-	div
-	stloc 15
-// 0x0107ac38: 0x107ac38: mflo  lo
-	ldloc 15
-	stloc 7
-// 0x0107ac3c: 0x107ac3c: subu  v1, zero, v1
-	ldloc 7
-	neg
-	stloc 7
-// 0x0107ac40: 0x107ac40: addiu v1, v1, 4
-	ldloc 7
-	ldc.i4.4
-	add
-	stloc 7
-// 0x0107ac44: 0x107ac44: sw    v1, 44(sp)
+// 0x0107ac58: 0x107ac58: lw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 38
 	add
-	ldloc 7
-	stelem.i4
-L_107ac48:
-// 0x0107ac48: 0x107ac48: jal   0x101ca0c addu  a0, s4, zero
+	ldelem.i4
+	stloc 5
+// 0x0107ac5c: 0x107ac5c: jal   0x101c908 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_107ac64:
+// 0x0107ac64: 0x107ac64: slt   v0, s1, s7
+	ldloc 8
+	ldloc 15
+	clt
+	stloc 5
+// 0x0107ac68: 0x107ac68: addu  a1, s1, zero
 	ldloc 8
+	stloc.2
+// 0x0107ac6c: 0x107ac6c: lw    a0, 0(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.1
+// 0x0107ac70: 0x107ac70: bne   v0, zero, 0x107ac24 addiu s1, s1, 1
+	ldloc 5
+	ldloc 8
+	ldc.i4.1
+	add
+	stloc 8
+	brtrue L_107ac24
+// --- basic block ---
+// 0x0107ac78: 0x107ac78: jal   0x107aa60 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::RTAlerts_Get_Map_Icon_107aa60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ac50: 0x107ac50: addiu s4, sp, 68
+// 0x0107ac80: 0x107ac80: beq   v0, zero, 0x107acf8 addiu s1, sp, 24
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 68
+	ldc.i4.s 24
 	add
 	stloc 8
-// 0x0107ac54: 0x107ac54: lw    a3, 0(s0)
+	brfalse L_107acf8
+// --- basic block ---
+// 0x0107ac88: 0x107ac88: lw    a3, 0(s0)
 	ldloc 6
-	ldloc 10
+	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x0107ac58: 0x107ac58: lui   a2, 0x20000
+// 0x0107ac8c: 0x107ac8c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0107ac5c: 0x107ac5c: addiu a2, a2, -25892
+// 0x0107ac90: 0x107ac90: addiu a2, a2, -25428
 	ldloc.3
-	ldc.i4 -25892
+	ldc.i4 -25428
 	add
 	stloc.3
-// 0x0107ac60: 0x107ac60: addiu a1, zero, 128
+// 0x0107ac94: 0x107ac94: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0107ac64: 0x107ac64: addu  a0, s4, zero
+// 0x0107ac98: 0x107ac98: jal   0x1000f9c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x0107ac68: 0x107ac68: jal   0x1000f9c addu  s5, v0, zero
-	ldloc 5
-	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -2643,7 +2607,7 @@ L_107ac48:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ac70: 0x107ac70: jal   0x101ca0c addu  a0, s4, zero
+// 0x0107aca0: 0x107aca0: jal   0x101ca1c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2651,2203 +2615,2805 @@ L_107ac48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ac78: 0x107ac78: addu  s6, v0, zero
-	ldloc 5
-	stloc 11
-// 0x0107ac7c: 0x107ac7c: addu  a1, v0, zero
+// 0x0107aca8: 0x107aca8: addu  a0, v0, zero
 	ldloc 5
-	stloc.2
-// 0x0107ac80: 0x107ac80: addiu v0, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc 5
-// 0x0107ac84: 0x107ac84: sw    v0, 20(sp)
+	stloc.1
+// 0x0107acac: 0x107acac: jal   0x101c15c sw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 38
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ac88: 0x107ac88: addiu v0, sp, 40
 	ldloc.0
-	ldc.i4.s 40
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0107ac8c: 0x107ac8c: addu  a3, s1, zero
-	ldloc 12
-	stloc 4
-// 0x0107ac90: 0x107ac90: addu  a2, s2, zero
-	ldloc 13
-	stloc.3
-// 0x0107ac94: 0x107ac94: addu  a0, s3, zero
-	ldloc 14
-	stloc.1
-// 0x0107ac98: 0x107ac98: sw    v0, 24(sp)
+// --- basic block ---
+// 0x0107acb4: 0x107acb4: lw    v0, 152(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 38
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107ac9c: 0x107ac9c: addiu s4, zero, 2
-	ldc.i4.2
-	stloc 8
-// 0x0107aca0: 0x107aca0: addiu v0, zero, 19
-	ldc.i4.s 19
+	ldelem.i4
 	stloc 5
-// 0x0107aca4: 0x107aca4: sw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
+// 0x0107acb8: 0x107acb8: jal   0x101c908 addu  a0, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0107aca8: 0x107aca8: sw    s5, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107acac: 0x107acac: sw    zero, 32(sp)
-	ldloc 6
+	stloc.1
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107acb0: 0x107acb0: jal   0x101c27c sw    s4, 36(sp)
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107acc0: 0x107acc0: lw    a3, 0(s0)
 	ldloc 6
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldelem.i4
+	stloc 4
+// 0x0107acc4: 0x107acc4: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107acc8: 0x107acc8: addiu a2, a2, -25416
+	ldloc.3
+	ldc.i4 -25416
 	add
+	stloc.3
+// 0x0107accc: 0x107accc: addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
+// 0x0107acd0: 0x107acd0: jal   0x1000f9c addu  a0, s1, zero
 	ldloc 8
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_with_priority_101c27c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107acb8: 0x107acb8: lui   a1, 0x1080000
-	ldc.i4 17301504
-	stloc.2
-// 0x0107acbc: 0x107acbc: addu  a0, s6, zero
-	ldloc 11
+// 0x0107acd8: 0x107acd8: jal   0x101ca1c addu  a0, s1, zero
+	ldloc 8
 	stloc.1
-// 0x0107acc0: 0x107acc0: jal   0x101bed0 addiu a1, a1, -5372
-	ldloc.2
-	ldc.i4 -5372
-	add
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107acc8: 0x107acc8: lui   v0, 0xe0000
-	ldc.i4 917504
-	stloc 5
-// 0x0107accc: 0x107accc: lw    v0, 29728(v0)
-	ldloc 6
+// 0x0107ace0: 0x107ace0: addu  a0, v0, zero
 	ldloc 5
+	stloc.1
+// 0x0107ace4: 0x107ace4: jal   0x101c15c sw    v0, 152(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4.s 38
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107acd0: 0x107acd0: addiu a1, zero, -1
-	ldc.i4.m1
-	stloc.2
-// 0x0107acd4: 0x107acd4: lw    a2, 976(v0)
-	ldloc 6
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 244
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107acd8: 0x107acd8: jal   0x101be78 addu  a0, s6, zero
-	ldloc 11
-	stloc.1
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl20::roadmap_object_set_zoom_101be78(int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107ace0: 0x107ace0: jal   0x101c8f8 addu  a0, s5, zero
-	ldloc 9
-	stloc.1
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_remove_101c15c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ace8: 0x107ace8: jal   0x101c8f8 addu  a0, s6, zero
-	ldloc 11
-	stloc.1
+// 0x0107acec: 0x107acec: lw    v0, 152(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107acf0: 0x107acf0: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107acf4: 0x107acf4: addiu a2, a2, -25764
-	ldloc.3
-	ldc.i4 -25764
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 38
 	add
-	stloc.3
-// 0x0107acf8: 0x107acf8: addu  a0, zero, zero
-	ldc.i4.s 0
+	ldelem.i4
+	stloc 5
+// 0x0107acf0: 0x107acf0: jal   0x101c908 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x0107acfc: 0x107acfc: jal   0x10a1918 addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107ad04: 0x107ad04: beq   v0, zero, 0x107ad28 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107ad28
-// --- basic block ---
-// 0x0107ad0c: 0x107ad0c: jal   0x104e020 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ad14: 0x107ad14: div   v0, s4
-	ldloc 5
-	ldloc 8
-	div
-	stloc 15
-// 0x0107ad18: 0x107ad18: mflo  lo
-	ldloc 15
-	stloc 8
-// 0x0107ad1c: 0x107ad1c: subu  s4, zero, s4
-	ldloc 8
-	neg
-	stloc 8
-// 0x0107ad20: 0x107ad20: addiu s4, s4, 4
-	ldloc 8
-	ldc.i4.4
-	add
-	stloc 8
-// 0x0107ad24: 0x107ad24: sw    s4, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 8
-	stelem.i4
-L_107ad28:
-// 0x0107ad28: 0x107ad28: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107ad2c: 0x107ad2c: addiu a0, a0, -25764
-	ldloc.1
-	ldc.i4 -25764
-	add
+L_107acf8:
+// 0x0107acf8: 0x107acf8: jal   0x101c908 addu  a0, s5, zero
+	ldloc 14
 	stloc.1
-// 0x0107ad30: 0x107ad30: addiu v0, zero, 6
-	ldc.i4.6
-	stloc 5
-// 0x0107ad34: 0x107ad34: addiu s5, sp, 68
-	ldloc.0
-	ldc.i4.s 68
-	add
-	stloc 9
-// 0x0107ad38: 0x107ad38: jal   0x101ca0c sw    v0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ad40: 0x107ad40: lw    a3, 0(s0)
-	ldloc 6
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107ad44: 0x107ad44: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107ad48: 0x107ad48: addiu a2, a2, -25880
-	ldloc.3
-	ldc.i4 -25880
-	add
-	stloc.3
-// 0x0107ad4c: 0x107ad4c: addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
-// 0x0107ad50: 0x107ad50: addu  a0, s5, zero
-	ldloc 9
+// 0x0107ad00: 0x107ad00: jal   0x101c908 addu  a0, s4, zero
+	ldloc 13
 	stloc.1
-// 0x0107ad54: 0x107ad54: jal   0x1000f9c addu  s4, v0, zero
-	ldloc 5
-	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ad5c: 0x107ad5c: jal   0x101ca0c addu  a0, s5, zero
-	ldloc 9
+// 0x0107ad08: 0x107ad08: jal   0x101c908 addu  a0, s3, zero
+	ldloc 12
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ad64: 0x107ad64: addu  s5, v0, zero
-	ldloc 5
-	stloc 9
-// 0x0107ad68: 0x107ad68: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107ad6c: 0x107ad6c: addiu v0, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc 5
-// 0x0107ad70: 0x107ad70: sw    v0, 20(sp)
+// 0x0107ad10: 0x107ad10: lw    ra, 196(sp)
+// 0x0107ad14: 0x107ad14: lw    s7, 192(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107ad74: 0x107ad74: addiu v0, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+	ldc.i4.s 48
 	add
-	stloc 5
-// 0x0107ad78: 0x107ad78: sw    v0, 24(sp)
+	ldelem.i4
+	stloc 15
+// 0x0107ad18: 0x107ad18: lw    s6, 188(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 47
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107ad7c: 0x107ad7c: addiu v0, zero, 3
-	ldc.i4.3
-	stloc 5
-// 0x0107ad80: 0x107ad80: addu  a3, s1, zero
-	ldloc 12
-	stloc 4
-// 0x0107ad84: 0x107ad84: addu  a2, s2, zero
-	ldloc 13
-	stloc.3
-// 0x0107ad88: 0x107ad88: addu  a0, s3, zero
-	ldloc 14
-	stloc.1
-// 0x0107ad8c: 0x107ad8c: sw    v0, 28(sp)
+	ldelem.i4
+	stloc 10
+// 0x0107ad1c: 0x107ad1c: lw    s5, 184(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 46
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107ad90: 0x107ad90: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x0107ad94: 0x107ad94: sw    v0, 36(sp)
+	ldelem.i4
+	stloc 14
+// 0x0107ad20: 0x107ad20: lw    s4, 180(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 45
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107ad98: 0x107ad98: sw    s4, 16(sp)
+	ldelem.i4
+	stloc 13
+// 0x0107ad24: 0x107ad24: lw    s3, 176(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 44
 	add
-	ldloc 8
-	stelem.i4
-// 0x0107ad9c: 0x107ad9c: jal   0x101c27c sw    zero, 32(sp)
+	ldelem.i4
+	stloc 12
+// 0x0107ad28: 0x107ad28: lw    s2, 172(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldc.i4.s 0
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_with_priority_101c27c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107ada4: 0x107ada4: lui   a1, 0x1080000
-	ldc.i4 17301504
-	stloc.2
-// 0x0107ada8: 0x107ada8: addu  a0, s5, zero
-	ldloc 9
-	stloc.1
-// 0x0107adac: 0x107adac: jal   0x101bed0 addiu a1, a1, -5372
-	ldloc.2
-	ldc.i4 -5372
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_object_set_action_101bed0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107adb4: 0x107adb4: lui   v0, 0xe0000
-	ldc.i4 917504
-	stloc 5
-// 0x0107adb8: 0x107adb8: lw    v0, 29728(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 7432
+	ldc.i4.s 43
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107adbc: 0x107adbc: addu  a0, s5, zero
-	ldloc 9
-	stloc.1
-// 0x0107adc0: 0x107adc0: lw    a1, 976(v0)
+	stloc 11
+// 0x0107ad2c: 0x107ad2c: lw    s1, 168(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 244
+	ldc.i4.s 42
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107adc4: 0x107adc4: lw    a2, 400(v0)
+	stloc 8
+// 0x0107ad30: 0x107ad30: lw    s0, 164(sp)
 	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 100
+	ldc.i4.s 41
 	add
 	ldelem.i4
-	stloc.3
-// 0x0107adc8: 0x107adc8: jal   0x101be78 addiu a1, a1, 1
-	ldloc.2
-	ldc.i4.1
+	stloc 9
+// 0x0107ad34: 0x107ad34: jr    ra addiu sp, sp, 200
+	ldloc.0
+	ldc.i4 200
 	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl20::roadmap_object_set_zoom_101be78(int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_Remove_107ad3c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  9 is register s0
+// local  8 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local 12 is register s4
+// local 13 is register s5
+// local  0 is register sp
+// local 14 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x0107add0: 0x107add0: jal   0x101c8f8 addu  a0, s4, zero
-	ldloc 8
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 14
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 7
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107add8: 0x107add8: jal   0x101c8f8 addu  a0, s5, zero
-	ldloc 9
-	stloc.1
+// 0x0107ad3c: 0x107ad3c: addiu sp, sp, -56
+	ldloc.0
+	ldc.i4.s -56
+	add
+	stloc.0
+// 0x0107ad40: 0x107ad40: sw    s1, 32(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_107ade0:
-// 0x0107ade0: 0x107ade0: lw    a0, 0(s0)
-	ldloc 6
-	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107ade4: 0x107ade4: jal   0x10776a0 addu  s4, zero, zero
-	ldc.i4.s 0
+	ldc.i4.8
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107ad44: 0x107ad44: lui   s1, 0x80000
+	ldc.i4 524288
 	stloc 8
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_Of_Map_AddOns_10776a0(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0107ad48: 0x107ad48: addiu s1, s1, -15564
+	ldloc 8
+	ldc.i4 -15564
+	add
+	stloc 8
+// 0x0107ad4c: 0x107ad4c: lw    v0, 2000(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0107adec: 0x107adec: sw    v0, 200(sp)
-	ldloc 6
+// 0x0107ad50: 0x107ad50: sw    s0, 28(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 50
+	ldc.i4.7
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-// 0x0107adf0: 0x107adf0: addiu s5, zero, 2
+// 0x0107ad54: 0x107ad54: sw    ra, 52(sp)
+// 0x0107ad58: 0x107ad58: sw    s5, 48(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
-	stloc 9
-// 0x0107adf4: 0x107adf4: j	 0x107aed0 addiu s7, sp, 68
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 13
+	stelem.i4
+// 0x0107ad5c: 0x107ad5c: sw    s4, 44(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 68
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc 16
-	br L_107aed0
-// --- basic block ---
-L_107adfc:
-// 0x0107adfc: 0x107adfc: lw    a0, 0(s0)
-	ldloc 6
-	ldloc 10
+	ldloc 12
+	stelem.i4
+// 0x0107ad60: 0x107ad60: sw    s3, 40(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107ae00: 0x107ae00: jal   0x10775dc addiu s4, s4, 1
-	ldloc 8
-	ldc.i4.1
+	ldc.i4.s 10
 	add
-	stloc 8
+	ldloc 11
+	stelem.i4
+// 0x0107ad64: 0x107ad64: sw    s2, 36(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 10
+	stelem.i4
+// 0x0107ad68: 0x107ad68: bne   v0, zero, 0x107ad8c addu  s0, a0, zero
+	ldloc 5
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Map_AddOn_10775dc(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	stloc 9
+	brtrue L_107ad8c
 // --- basic block ---
-// 0x0107ae08: 0x107ae08: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0107ae0c: 0x107ae0c: addu  a0, zero, zero
-	ldc.i4.s 0
-	stloc.1
-// 0x0107ae10: 0x107ae10: addiu a1, zero, 1
-	ldc.i4.1
+// 0x0107ad70: 0x107ad70: lui   a1, 0x20000
+	ldc.i4 131072
 	stloc.2
-// 0x0107ae14: 0x107ae14: jal   0x10a1918 addu  s6, v0, zero
-	ldloc 5
-	stloc 11
-	ldloc.0
-	ldloc.1
+// 0x0107ad74: 0x107ad74: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x0107ad78: 0x107ad78: addiu a1, a1, -26248
 	ldloc.2
-	ldloc.3
+	ldc.i4 -26248
+	add
+	stloc.2
+// 0x0107ad7c: 0x107ad7c: addiu a3, a3, -25396
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107ae1c: 0x107ae1c: beq   v0, zero, 0x107ae40 addu  a0, v0, zero
-	ldloc 5
-	ldloc 5
+	ldc.i4 -25396
+	add
+	stloc 4
+// 0x0107ad80: 0x107ad80: addiu a0, zero, 4
+	ldc.i4.4
 	stloc.1
-	brfalse L_107ae40
-// --- basic block ---
-// 0x0107ae24: 0x107ae24: jal   0x104e020 sll   zero, zero, 0
-	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_height_104e020(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+// 0x0107ad84: 0x107ad84: j	 0x107b13c addiu a2, zero, 942
+	ldc.i4 942
+	stloc.3
+	br L_107b13c
 // --- basic block ---
-// 0x0107ae2c: 0x107ae2c: div   v0, s5
+L_107ad8c:
+// 0x0107ad8c: 0x107ad8c: addiu v0, v0, -1
 	ldloc 5
-	ldloc 9
-	div
-	stloc 15
-// 0x0107ae30: 0x107ae30: mflo  lo
-	ldloc 15
+	ldc.i4.m1
+	add
 	stloc 5
-// 0x0107ae34: 0x107ae34: subu  v0, zero, v0
+// 0x0107ad90: 0x107ad90: sll   v0, v0, 2
 	ldloc 5
-	neg
+	ldc.i4.2
+	shl
 	stloc 5
-// 0x0107ae38: 0x107ae38: addiu v0, v0, 4
+// 0x0107ad94: 0x107ad94: addu  v0, v0, s1
 	ldloc 5
-	ldc.i4.4
+	ldloc 8
 	add
 	stloc 5
-// 0x0107ae3c: 0x107ae3c: sw    v0, 44(sp)
-	ldloc 6
-	ldloc.0
+// 0x0107ad98: 0x107ad98: lw    a0, 0(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 5
-	stelem.i4
-L_107ae40:
-// 0x0107ae40: 0x107ae40: jal   0x101ca0c addu  a0, s6, zero
-	ldloc 11
+	ldelem.i4
 	stloc.1
+// 0x0107ad9c: 0x107ad9c: sll   zero, zero, 0
+// 0x0107ada0: 0x107ada0: lw    v0, 0(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 5
+// 0x0107ada4: 0x107ada4: sll   zero, zero, 0
+// 0x0107ada8: 0x107ada8: beq   v0, s0, 0x107adc4 addu  s3, zero, zero
+	ldloc 5
+	ldloc 9
+	ldc.i4.s 0
+	stloc 11
+	beq  L_107adc4
+// --- basic block ---
+// 0x0107adb0: 0x107adb0: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+// 0x0107adb4: 0x107adb4: addu  s2, s1, zero
+	ldloc 8
+	stloc 10
+// 0x0107adb8: 0x107adb8: lui   s5, 0x0
+	ldc.i4.s 0
+	stloc 13
+// 0x0107adbc: 0x107adbc: j	 0x107b08c addiu s4, zero, 1
+	ldc.i4.1
+	stloc 12
+	br L_107b08c
+// --- basic block ---
+L_107adc4:
+// 0x0107adc4: 0x107adc4: jal   0x107ab94 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::DeleteAlertObject_107ab94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ae48: 0x107ae48: lw    a3, 0(s0)
-	ldloc 6
-	ldloc 10
+// 0x0107adcc: 0x107adcc: lw    v0, 2000(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
+	ldc.i4 500
+	add
 	ldelem.i4
-	stloc 4
-// 0x0107ae4c: 0x107ae4c: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107ae50: 0x107ae50: addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
-// 0x0107ae54: 0x107ae54: addiu a2, a2, -25900
-	ldloc.3
-	ldc.i4 -25900
+	stloc 5
+// 0x0107add0: 0x107add0: sll   zero, zero, 0
+// 0x0107add4: 0x107add4: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
 	add
-	stloc.3
-// 0x0107ae58: 0x107ae58: addu  a0, s7, zero
-	ldloc 16
-	stloc.1
-// 0x0107ae5c: 0x107ae5c: addu  s8, v0, zero
+	stloc 5
+// 0x0107add8: 0x107add8: sll   v0, v0, 2
 	ldloc 5
-	stloc 17
-// 0x0107ae60: 0x107ae60: jal   0x1000f9c sw    s6, 16(sp)
-	ldloc 6
-	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	shl
+	stloc 5
+// 0x0107addc: 0x107addc: addu  v0, v0, s1
+	ldloc 5
+	ldloc 8
 	add
-	ldloc 11
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 5
-// --- basic block ---
-// 0x0107ae68: 0x107ae68: jal   0x101ca0c addu  a0, s7, zero
-	ldloc 16
+// 0x0107ade0: 0x107ade0: lw    a0, 0(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.1
+// 0x0107ade4: 0x107ade4: jal   0x1078bfc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Delete_All_Comments_1078bfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ae70: 0x107ae70: addu  s6, v0, zero
-	ldloc 5
-	stloc 11
-// 0x0107ae74: 0x107ae74: addu  a3, s1, zero
-	ldloc 12
-	stloc 4
-// 0x0107ae78: 0x107ae78: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107ae7c: 0x107ae7c: addiu v1, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc 7
-// 0x0107ae80: 0x107ae80: addiu v0, sp, 48
-	ldloc.0
-	ldc.i4.s 48
-	add
-	stloc 5
-// 0x0107ae84: 0x107ae84: addu  a0, s3, zero
-	ldloc 14
-	stloc.1
-// 0x0107ae88: 0x107ae88: addu  a2, s2, zero
-	ldloc 13
-	stloc.3
-// 0x0107ae8c: 0x107ae8c: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
+// 0x0107adec: 0x107adec: lw    v0, 2000(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4 500
 	add
+	ldelem.i4
+	stloc 5
+// 0x0107adf0: 0x107adf0: sll   zero, zero, 0
+// 0x0107adf4: 0x107adf4: addiu v0, v0, -1
 	ldloc 5
-	stelem.i4
-// 0x0107ae90: 0x107ae90: sw    v1, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 7
-	stelem.i4
-// 0x0107ae94: 0x107ae94: sw    s8, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.m1
 	add
-	ldloc 17
-	stelem.i4
-// 0x0107ae98: 0x107ae98: sw    zero, 28(sp)
-	ldloc 6
-	ldloc.0
+	stloc 5
+// 0x0107adf8: 0x107adf8: sll   v0, v0, 2
+	ldloc 5
 	ldc.i4.2
-	shr.un
-	ldc.i4.7
+	shl
+	stloc 5
+// 0x0107adfc: 0x107adfc: addu  s1, v0, s1
+	ldloc 5
+	ldloc 8
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107ae9c: 0x107ae9c: sw    zero, 32(sp)
-	ldloc 6
-	ldloc.0
+	stloc 8
+// 0x0107ae00: 0x107ae00: lw    v0, 0(s1)
+	ldloc 7
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107aea0: 0x107aea0: jal   0x101c27c sw    s5, 36(sp)
-	ldloc 6
-	ldloc.0
+	ldelem.i4
+	stloc 5
+// 0x0107ae04: 0x107ae04: sll   zero, zero, 0
+// 0x0107ae08: 0x107ae08: lw    a0, 1512(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 378
 	add
-	ldloc 9
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x0107ae0c: 0x107ae0c: sll   zero, zero, 0
+// 0x0107ae10: 0x107ae10: beq   a0, zero, 0x107ae24 lui   v0, 0x80000
+	ldloc.1
+	ldc.i4 524288
+	stloc 5
+	brfalse L_107ae24
+// --- basic block ---
+// 0x0107ae18: 0x107ae18: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_object_add_with_priority_101c27c(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107aea8: 0x107aea8: lui   v1, 0xe0000
-	ldc.i4 917504
-	stloc 7
-// 0x0107aeac: 0x107aeac: lw    v0, 29728(v1)
-	ldloc 6
+// 0x0107ae20: 0x107ae20: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_107ae24:
+// 0x0107ae24: 0x107ae24: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107ae28: 0x107ae28: lw    v1, 2000(v0)
 	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107aeb0: 0x107aeb0: addiu a1, zero, -1
+	stloc 6
+// 0x0107ae2c: 0x107ae2c: sll   zero, zero, 0
+// 0x0107ae30: 0x107ae30: addiu v1, v1, -1
+	ldloc 6
 	ldc.i4.m1
-	stloc.2
-// 0x0107aeb4: 0x107aeb4: lw    a2, 976(v0)
+	add
+	stloc 6
+// 0x0107ae34: 0x107ae34: sll   v1, v1, 2
+	ldloc 6
+	ldc.i4.2
+	shl
+	stloc 6
+// 0x0107ae38: 0x107ae38: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
+	add
+	stloc 5
+// 0x0107ae3c: 0x107ae3c: lw    v0, 0(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 244
+	ldelem.i4
+	stloc 5
+// 0x0107ae40: 0x107ae40: sll   zero, zero, 0
+// 0x0107ae44: 0x107ae44: lw    a0, 1504(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 376
 	add
 	ldelem.i4
-	stloc.3
-// 0x0107aeb8: 0x107aeb8: jal   0x101be78 addu  a0, s6, zero
-	ldloc 11
 	stloc.1
+// 0x0107ae48: 0x107ae48: sll   zero, zero, 0
+// 0x0107ae4c: 0x107ae4c: beq   a0, zero, 0x107ae60 lui   v0, 0x80000
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	call int32 Cibyl20::roadmap_object_set_zoom_101be78(int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4 524288
 	stloc 5
+	brfalse L_107ae60
 // --- basic block ---
-// 0x0107aec0: 0x107aec0: jal   0x101c8f8 addu  a0, s8, zero
-	ldloc 17
-	stloc.1
+// 0x0107ae54: 0x107ae54: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107aec8: 0x107aec8: jal   0x101c8f8 addu  a0, s6, zero
-	ldloc 11
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0107ae5c: 0x107ae5c: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// --- basic block ---
-L_107aed0:
-// 0x0107aed0: 0x107aed0: lw    v1, 200(sp)
-	ldloc 6
-	ldloc.0
+L_107ae60:
+// 0x0107ae60: 0x107ae60: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107ae64: 0x107ae64: lw    v1, 2000(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 50
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107aed4: 0x107aed4: sll   zero, zero, 0
-// 0x0107aed8: 0x107aed8: slt   v0, s4, v1
-	ldloc 8
+	stloc 6
+// 0x0107ae68: 0x107ae68: sll   zero, zero, 0
+// 0x0107ae6c: 0x107ae6c: addiu v1, v1, -1
+	ldloc 6
+	ldc.i4.m1
+	add
+	stloc 6
+// 0x0107ae70: 0x107ae70: sll   v1, v1, 2
+	ldloc 6
+	ldc.i4.2
+	shl
+	stloc 6
+// 0x0107ae74: 0x107ae74: addu  v0, v1, v0
+	ldloc 6
+	ldloc 5
+	add
+	stloc 5
+// 0x0107ae78: 0x107ae78: lw    v0, 0(v0)
 	ldloc 7
-	clt
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 5
-// 0x0107aedc: 0x107aedc: bne   v0, zero, 0x107adfc addu  a1, s4, zero
+// 0x0107ae7c: 0x107ae7c: sll   zero, zero, 0
+// 0x0107ae80: 0x107ae80: lw    a0, 1508(v0)
+	ldloc 7
 	ldloc 5
-	ldloc 8
-	stloc.2
-	brtrue L_107adfc
-// --- basic block ---
-// 0x0107aee4: 0x107aee4: jal   0x101c8f8 addu  a0, s3, zero
-	ldloc 14
+	ldc.i4.2
+	shr.un
+	ldc.i4 377
+	add
+	ldelem.i4
 	stloc.1
-	ldloc.0
+// 0x0107ae84: 0x107ae84: sll   zero, zero, 0
+// 0x0107ae88: 0x107ae88: beq   a0, zero, 0x107ae9c lui   v0, 0x80000
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldc.i4 524288
 	stloc 5
+	brfalse L_107ae9c
 // --- basic block ---
-// 0x0107aeec: 0x107aeec: jal   0x101c8f8 addu  a0, s2, zero
-	ldloc 13
-	stloc.1
+// 0x0107ae90: 0x107ae90: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107aef4: 0x107aef4: jal   0x101c8f8 addu  a0, s1, zero
-	ldloc 12
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0107ae98: 0x107ae98: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// --- basic block ---
-// 0x0107aefc: 0x107aefc: lw    ra, 244(sp)
-// 0x0107af00: 0x107af00: lw    s8, 240(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 60
+L_107ae9c:
+// 0x0107ae9c: 0x107ae9c: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
 	add
-	ldelem.i4
-	stloc 17
-// 0x0107af04: 0x107af04: lw    s7, 236(sp)
-	ldloc 6
-	ldloc.0
+	stloc 5
+// 0x0107aea0: 0x107aea0: lw    v1, 2000(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 59
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 16
-// 0x0107af08: 0x107af08: lw    s6, 232(sp)
+	stloc 6
+// 0x0107aea4: 0x107aea4: sll   zero, zero, 0
+// 0x0107aea8: 0x107aea8: addiu v1, v1, -1
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 58
+	ldc.i4.m1
 	add
-	ldelem.i4
-	stloc 11
-// 0x0107af0c: 0x107af0c: lw    s5, 228(sp)
+	stloc 6
+// 0x0107aeac: 0x107aeac: sll   v1, v1, 2
 	ldloc 6
-	ldloc.0
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 57
-	add
-	ldelem.i4
-	stloc 9
-// 0x0107af10: 0x107af10: lw    s4, 224(sp)
+	shl
+	stloc 6
+// 0x0107aeb0: 0x107aeb0: addu  v0, v1, v0
 	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 56
+	ldloc 5
 	add
-	ldelem.i4
-	stloc 8
-// 0x0107af14: 0x107af14: lw    s3, 220(sp)
-	ldloc 6
-	ldloc.0
+	stloc 5
+// 0x0107aeb4: 0x107aeb4: lw    v0, 0(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 55
-	add
 	ldelem.i4
-	stloc 14
-// 0x0107af18: 0x107af18: lw    s2, 216(sp)
-	ldloc 6
-	ldloc.0
+	stloc 5
+// 0x0107aeb8: 0x107aeb8: sll   zero, zero, 0
+// 0x0107aebc: 0x107aebc: lw    a0, 1500(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 54
+	ldc.i4 375
 	add
 	ldelem.i4
-	stloc 13
-// 0x0107af1c: 0x107af1c: lw    s1, 212(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 53
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107af20: 0x107af20: lw    s0, 208(sp)
-	ldloc 6
+	stloc.1
+// 0x0107aec0: 0x107aec0: sll   zero, zero, 0
+// 0x0107aec4: 0x107aec4: beq   a0, zero, 0x107aed8 lui   v0, 0x80000
+	ldloc.1
+	ldc.i4 524288
+	stloc 5
+	brfalse L_107aed8
+// --- basic block ---
+// 0x0107aecc: 0x107aecc: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107aed4: 0x107aed4: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_107aed8:
+// 0x0107aed8: 0x107aed8: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107aedc: 0x107aedc: lw    v1, 2000(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 52
+	ldc.i4 500
 	add
 	ldelem.i4
-	stloc 10
-// 0x0107af24: 0x107af24: jr    ra addiu sp, sp, 248
-	ldloc.0
-	ldc.i4 248
+	stloc 6
+// 0x0107aee0: 0x107aee0: sll   zero, zero, 0
+// 0x0107aee4: 0x107aee4: addiu v1, v1, -1
+	ldloc 6
+	ldc.i4.m1
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_Comment_PopUp_107af2c(int32,int32,int32,int32,int32)
-{
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s6,int32 s5,int32 s1,int32 s0,int32 s4,int32 s2,int32 s3,int32 s7,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 11 is register s0
-// local 10 is register s1
-// local 13 is register s2
-// local 14 is register s3
-// local 12 is register s4
-// local  9 is register s5
-// local  8 is register s6
-// local 15 is register s7
-// local  0 is register sp
-// local 16 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
 	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 15
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 16
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107af2c: 0x107af2c: addiu sp, sp, -784
-	ldloc.0
-	ldc.i4 -784
+// 0x0107aee8: 0x107aee8: sll   v1, v1, 2
+	ldloc 6
+	ldc.i4.2
+	shl
+	stloc 6
+// 0x0107aeec: 0x107aeec: addu  v0, v1, v0
+	ldloc 6
+	ldloc 5
 	add
-	stloc.0
-// 0x0107af30: 0x107af30: lui   v0, 0xf0000
-	ldc.i4 983040
 	stloc 5
-// 0x0107af34: 0x107af34: sw    s5, 768(sp)
+// 0x0107aef0: 0x107aef0: lw    v0, 0(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 192
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107af38: 0x107af38: lw    s5, -30068(v0)
+	ldelem.i4
+	stloc 5
+// 0x0107aef4: 0x107aef4: sll   zero, zero, 0
+// 0x0107aef8: 0x107aef8: lw    a0, 1496(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 374
 	add
 	ldelem.i4
-	stloc 9
-// 0x0107af3c: 0x107af3c: lui   v0, 0xf0000
-	ldc.i4 983040
+	stloc.1
+// 0x0107aefc: 0x107aefc: sll   zero, zero, 0
+// 0x0107af00: 0x107af00: beq   a0, zero, 0x107af14 lui   v0, 0x80000
+	ldloc.1
+	ldc.i4 524288
 	stloc 5
-// 0x0107af40: 0x107af40: sw    s6, 772(sp)
-	ldloc 7
+	brfalse L_107af14
+// --- basic block ---
+// 0x0107af08: 0x107af08: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107af10: 0x107af10: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_107af14:
+// 0x0107af14: 0x107af14: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107af18: 0x107af18: lw    v1, 2000(v0)
+	ldloc 7
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 193
+	ldc.i4 500
 	add
-	ldloc 8
-	stelem.i4
-// 0x0107af44: 0x107af44: sw    s2, 756(sp)
+	ldelem.i4
+	stloc 6
+// 0x0107af1c: 0x107af1c: sll   zero, zero, 0
+// 0x0107af20: 0x107af20: addiu v1, v1, -1
+	ldloc 6
+	ldc.i4.m1
+	add
+	stloc 6
+// 0x0107af24: 0x107af24: sll   v1, v1, 2
+	ldloc 6
+	ldc.i4.2
+	shl
+	stloc 6
+// 0x0107af28: 0x107af28: addu  v1, v1, v0
+	ldloc 6
+	ldloc 5
+	add
+	stloc 6
+// 0x0107af2c: 0x107af2c: lw    v1, 0(v1)
 	ldloc 7
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 189
-	add
-	ldloc 13
-	stelem.i4
-// 0x0107af48: 0x107af48: sw    s1, 752(sp)
+	ldelem.i4
+	stloc 6
+// 0x0107af30: 0x107af30: sll   zero, zero, 0
+// 0x0107af34: 0x107af34: lw    v1, 1824(v1)
 	ldloc 7
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 188
+	ldc.i4 456
 	add
-	ldloc 10
-	stelem.i4
-// 0x0107af4c: 0x107af4c: sw    s0, 748(sp)
+	ldelem.i4
+	stloc 6
+// 0x0107af38: 0x107af38: sll   zero, zero, 0
+// 0x0107af3c: 0x107af3c: beq   v1, zero, 0x107af54 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_107af54
+// --- basic block ---
+// 0x0107af44: 0x107af44: lw    v1, 2004(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 187
+	ldc.i4 501
 	add
-	ldloc 11
-	stelem.i4
-// 0x0107af50: 0x107af50: sw    ra, 780(sp)
-// 0x0107af54: 0x107af54: sw    s7, 776(sp)
+	ldelem.i4
+	stloc 6
+// 0x0107af48: 0x107af48: sll   zero, zero, 0
+// 0x0107af4c: 0x107af4c: addiu v1, v1, -1
+	ldloc 6
+	ldc.i4.m1
+	add
+	stloc 6
+// 0x0107af50: 0x107af50: sw    v1, 2004(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 194
+	ldc.i4 501
 	add
-	ldloc 15
+	ldloc 6
 	stelem.i4
-// 0x0107af58: 0x107af58: sw    s4, 764(sp)
+L_107af54:
+// 0x0107af54: 0x107af54: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107af58: 0x107af58: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107af5c: 0x107af5c: lw    v1, 2000(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 191
+	ldc.i4 500
 	add
-	ldloc 12
-	stelem.i4
-// 0x0107af5c: 0x107af5c: sw    s3, 760(sp)
+	ldelem.i4
+	stloc 6
+// 0x0107af60: 0x107af60: sll   zero, zero, 0
+// 0x0107af64: 0x107af64: addiu v1, v1, -1
+	ldloc 6
+	ldc.i4.m1
+	add
+	stloc 6
+// 0x0107af68: 0x107af68: sll   v1, v1, 2
+	ldloc 6
+	ldc.i4.2
+	shl
+	stloc 6
+// 0x0107af6c: 0x107af6c: addu  v1, v1, v0
+	ldloc 6
+	ldloc 5
+	add
+	stloc 6
+// 0x0107af70: 0x107af70: lw    v1, 0(v1)
 	ldloc 7
-	ldloc.0
+	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 190
+	ldelem.i4
+	stloc 6
+// 0x0107af74: 0x107af74: sll   zero, zero, 0
+// 0x0107af78: 0x107af78: lw    v1, 1836(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 459
 	add
-	ldloc 14
-	stelem.i4
-// 0x0107af60: 0x107af60: addu  s2, a0, zero
-	ldloc.1
-	stloc 13
-// 0x0107af64: 0x107af64: addu  s1, a1, zero
-	ldloc.2
-	stloc 10
-// 0x0107af68: 0x107af68: lw    s6, -30072(v0)
+	ldelem.i4
+	stloc 6
+// 0x0107af7c: 0x107af7c: sll   zero, zero, 0
+// 0x0107af80: 0x107af80: beq   v1, zero, 0x107af98 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_107af98
+// --- basic block ---
+// 0x0107af88: 0x107af88: lw    v1, 2008(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 502
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107af6c: 0x107af6c: jal   0x101fa28 sb    zero, 32(sp)
-	ldloc.0
-	ldc.i4.s 32
+	stloc 6
+// 0x0107af8c: 0x107af8c: sll   zero, zero, 0
+// 0x0107af90: 0x107af90: addiu v1, v1, -1
+	ldloc 6
+	ldc.i4.m1
 	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
-	stloc 5
-// --- basic block ---
-// 0x0107af74: 0x107af74: beq   v0, zero, 0x107af80 addiu s0, zero, 52
+	stloc 6
+// 0x0107af94: 0x107af94: sw    v1, 2008(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 502
+	add
+	ldloc 6
+	stelem.i4
+L_107af98:
+// 0x0107af98: 0x107af98: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107af9c: 0x107af9c: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
+	add
+	stloc 5
+// 0x0107afa0: 0x107afa0: lw    v1, 2000(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107afa4: 0x107afa4: sll   zero, zero, 0
+// 0x0107afa8: 0x107afa8: addiu v1, v1, -1
+	ldloc 6
+	ldc.i4.m1
+	add
+	stloc 6
+// 0x0107afac: 0x107afac: sll   v1, v1, 2
+	ldloc 6
+	ldc.i4.2
+	shl
+	stloc 6
+// 0x0107afb0: 0x107afb0: addu  v0, v1, v0
+	ldloc 6
 	ldloc 5
-	ldc.i4.s 52
-	stloc 11
-	brfalse L_107af80
-// --- basic block ---
-// 0x0107af7c: 0x107af7c: addiu s0, zero, 78
-	ldc.i4.s 78
-	stloc 11
-L_107af80:
-// 0x0107af80: 0x107af80: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107af84: 0x107af84: jal   0x101cd60 addiu a0, a0, -8164
-	ldloc.1
-	ldc.i4 -8164
 	add
+	stloc 5
+// 0x0107afb4: 0x107afb4: lw    a0, 0(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.1
+// 0x0107afb8: 0x107afb8: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107af8c: 0x107af8c: addu  a1, v0, zero
+// 0x0107afc0: 0x107afc0: j	 0x107b0b0 lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+	br L_107b0b0
+// --- basic block ---
+L_107afc8:
+// 0x0107afc8: 0x107afc8: beq   v0, zero, 0x107afdc sll   zero, zero, 0
 	ldloc 5
-	stloc.2
-// 0x0107af90: 0x107af90: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107af94: 0x107af94: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x0107af98: 0x107af98: addiu a0, a0, -26764
-	ldloc.1
-	ldc.i4 -26764
-	add
-	stloc.1
-// 0x0107af9c: 0x107af9c: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107afa0: 0x107afa0: addiu a3, zero, -2
-	ldc.i4.s -2
-	stloc 4
-// 0x0107afa4: 0x107afa4: sw    v0, 16(sp)
+	brfalse L_107afdc
+// --- basic block ---
+// 0x0107afd0: 0x107afd0: lw    v1, 4(s1)
 	ldloc 7
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.1
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107afa8: 0x107afa8: lui   v0, 0x1a000000
-	ldc.i4 436207616
-	stloc 5
-// 0x0107afac: 0x107afac: sw    v0, 24(sp)
+	ldelem.i4
+	stloc 6
+// 0x0107afd4: 0x107afd4: j	 0x107b084 sw    v1, 0(s1)
 	ldloc 7
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
+	ldloc 6
 	stelem.i4
-// 0x0107afb0: 0x107afb0: jal   0x109e4f0 sw    zero, 20(sp)
+	br L_107b084
+// --- basic block ---
+L_107afdc:
+// 0x0107afdc: 0x107afdc: lw    a0, 0(s1)
 	ldloc 7
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
-	ldc.i4.s 0
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x0107afe0: 0x107afe0: sll   zero, zero, 0
+// 0x0107afe4: 0x107afe4: lw    v1, 0(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 6
+// 0x0107afe8: 0x107afe8: sll   zero, zero, 0
+// 0x0107afec: 0x107afec: bne   v1, s0, 0x107b084 sll   zero, zero, 0
+	ldloc 6
+	ldloc 9
+	bne.un L_107b084
+// --- basic block ---
+// 0x0107aff4: 0x107aff4: jal   0x107ab94 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::DeleteAlertObject_107ab94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107afb8: 0x107afb8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107afbc: 0x107afbc: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107afc0: 0x107afc0: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107afc4: 0x107afc4: addiu a0, a0, 9040
-	ldloc.1
-	ldc.i4 9040
-	add
-	stloc.1
-// 0x0107afc8: 0x107afc8: addu  a2, s0, zero
-	ldloc 11
-	stloc.3
-// 0x0107afcc: 0x107afcc: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x0107afd0: 0x107afd0: addu  s3, v0, zero
-	ldloc 5
-	stloc 14
-// 0x0107afd4: 0x107afd4: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x0107afd8: 0x107afd8: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107affc: 0x107affc: lw    a0, 0(s1)
 	ldloc 7
-	ldloc.0
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x0107b000: 0x107b000: jal   0x1078bfc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Delete_All_Comments_1078bfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107afe0: 0x107afe0: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107afe4: 0x107afe4: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107afe8: 0x107afe8: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107afec: 0x107afec: jal   0x1098fe0 addu  s4, v0, zero
-	ldloc 5
-	stloc 12
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107aff4: 0x107aff4: slt   v0, s5, s6
-	ldloc 9
+// 0x0107b008: 0x107b008: lw    v0, 0(s1)
+	ldloc 7
 	ldloc 8
-	clt
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 5
-// 0x0107aff8: 0x107aff8: beq   v0, zero, 0x107b008 addiu s6, s6, -40
+// 0x0107b00c: 0x107b00c: sll   zero, zero, 0
+// 0x0107b010: 0x107b010: lw    v0, 1824(v0)
+	ldloc 7
 	ldloc 5
-	ldloc 8
-	ldc.i4.s -40
+	ldc.i4.2
+	shr.un
+	ldc.i4 456
 	add
-	stloc 8
-	brfalse L_107b008
+	ldelem.i4
+	stloc 5
+// 0x0107b014: 0x107b014: sll   zero, zero, 0
+// 0x0107b018: 0x107b018: beq   v0, zero, 0x107b030 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107b030
 // --- basic block ---
-// 0x0107b000: 0x107b000: addu  s6, s5, zero
-	ldloc 9
-	stloc 8
-// 0x0107b004: 0x107b004: addiu s6, s6, -40
-	ldloc 8
-	ldc.i4.s -40
-	add
-	stloc 8
-L_107b008:
-// 0x0107b008: 0x107b008: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107b00c: 0x107b00c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107b010: 0x107b010: subu  a2, s6, s0
-	ldloc 8
-	ldloc 11
-	sub
-	stloc.3
-// 0x0107b014: 0x107b014: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107b018: 0x107b018: addiu a0, a0, -25744
-	ldloc.1
-	ldc.i4 -25744
+// 0x0107b020: 0x107b020: lw    v0, 2004(s2)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 501
 	add
-	stloc.1
-// 0x0107b01c: 0x107b01c: addiu a3, zero, -1
+	ldelem.i4
+	stloc 5
+// 0x0107b024: 0x107b024: sll   zero, zero, 0
+// 0x0107b028: 0x107b028: addiu v0, v0, -1
+	ldloc 5
 	ldc.i4.m1
-	stloc 4
-// 0x0107b020: 0x107b020: jal   0x1093a24 sw    zero, 16(sp)
+	add
+	stloc 5
+// 0x0107b02c: 0x107b02c: sw    v0, 2004(s2)
 	ldloc 7
-	ldloc.0
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 501
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+L_107b030:
+// 0x0107b030: 0x107b030: lw    v0, 0(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0107b028: 0x107b028: addu  a0, v0, zero
+// 0x0107b034: 0x107b034: sll   zero, zero, 0
+// 0x0107b038: 0x107b038: lw    v0, 1836(v0)
+	ldloc 7
 	ldloc 5
-	stloc.1
-// 0x0107b02c: 0x107b02c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107b030: 0x107b030: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107b034: 0x107b034: jal   0x1098fe0 addu  s0, v0, zero
+	ldc.i4.2
+	shr.un
+	ldc.i4 459
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107b03c: 0x107b03c: sll   zero, zero, 0
+// 0x0107b040: 0x107b040: beq   v0, zero, 0x107b058 sll   zero, zero, 0
 	ldloc 5
-	stloc 11
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	brfalse L_107b058
 // --- basic block ---
-// 0x0107b03c: 0x107b03c: lw    v0, 4(s1)
+// 0x0107b048: 0x107b048: lw    v0, 2008(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 502
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107b040: 0x107b040: addiu v1, zero, 2
+// 0x0107b04c: 0x107b04c: sll   zero, zero, 0
+// 0x0107b050: 0x107b050: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
+	add
+	stloc 5
+// 0x0107b054: 0x107b054: sw    v0, 2008(s2)
+	ldloc 7
+	ldloc 10
 	ldc.i4.2
-	stloc 6
-// 0x0107b044: 0x107b044: bne   v0, v1, 0x107b068 addiu v1, zero, 1
+	shr.un
+	ldc.i4 502
+	add
 	ldloc 5
-	ldloc 6
-	ldc.i4.1
-	stloc 6
-	bne.un L_107b068
+	stelem.i4
+L_107b058:
+// 0x0107b058: 0x107b058: lw    v0, 2004(s2)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 501
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107b05c: 0x107b05c: sll   zero, zero, 0
+// 0x0107b060: 0x107b060: bne   v0, zero, 0x107b06c sll   zero, zero, 0
+	ldloc 5
+	brtrue L_107b06c
 // --- basic block ---
-// 0x0107b04c: 0x107b04c: addiu s6, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x0107b068: 0x107b068: sw    s4, 15824(s5)
+	ldloc 7
+	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldc.i4 3956
 	add
-	stloc 8
-// 0x0107b050: 0x107b050: jal   0x1001b48 addu  a0, s6, zero
+	ldloc 12
+	stelem.i4
+L_107b06c:
+// 0x0107b06c: 0x107b06c: lw    a0, 0(s1)
+	ldloc 7
 	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.1
+// 0x0107b070: 0x107b070: jal   0x1000930 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b058: 0x107b058: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107b05c: 0x107b05c: addu  s5, v0, zero
-	ldloc 5
-	stloc 9
-// 0x0107b060: 0x107b060: j	 0x107b118 addiu a0, a0, -19640
-	ldloc.1
-	ldc.i4 -19640
+// 0x0107b078: 0x107b078: lw    v1, 4(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc.1
-	br L_107b118
-// --- basic block ---
-L_107b068:
-// 0x0107b068: 0x107b068: bne   v0, v1, 0x107b08c addiu v1, zero, 3
-	ldloc 5
-	ldloc 6
-	ldc.i4.3
+	ldelem.i4
 	stloc 6
-	bne.un L_107b08c
-// --- basic block ---
-// 0x0107b070: 0x107b070: addiu s6, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x0107b07c: 0x107b07c: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107b080: 0x107b080: sw    v1, 0(s1)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldloc 6
+	stelem.i4
+L_107b084:
+// 0x0107b084: 0x107b084: addiu s3, s3, 1
+	ldloc 11
+	ldc.i4.1
 	add
-	stloc 8
-// 0x0107b074: 0x107b074: jal   0x1001b48 addu  a0, s6, zero
+	stloc 11
+// 0x0107b088: 0x107b088: addiu s1, s1, 4
 	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107b07c: 0x107b07c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107b080: 0x107b080: addu  s5, v0, zero
-	ldloc 5
-	stloc 9
-// 0x0107b084: 0x107b084: j	 0x107b118 addiu a0, a0, -27044
-	ldloc.1
-	ldc.i4 -27044
+	ldc.i4.4
 	add
-	stloc.1
-	br L_107b118
-// --- basic block ---
+	stloc 8
 L_107b08c:
-// 0x0107b08c: 0x107b08c: bne   v0, v1, 0x107b0b0 addiu v1, zero, 5
-	ldloc 5
+// 0x0107b08c: 0x107b08c: lw    v1, 2000(s2)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107b090: 0x107b090: sll   zero, zero, 0
+// 0x0107b094: 0x107b094: addiu v1, v1, -1
 	ldloc 6
-	ldc.i4.5
+	ldc.i4.m1
+	add
+	stloc 6
+// 0x0107b098: 0x107b098: slt   v1, s3, v1
+	ldloc 11
+	ldloc 6
+	clt
 	stloc 6
-	bne.un L_107b0b0
+// 0x0107b09c: 0x107b09c: bne   v1, zero, 0x107afc8 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_107afc8
 // --- basic block ---
-// 0x0107b094: 0x107b094: addiu s6, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x0107b0a4: 0x107b0a4: beq   v0, zero, 0x107b128 lui   a1, 0x20000
+	ldloc 5
+	ldc.i4 131072
+	stloc.2
+	brfalse L_107b128
+// --- basic block ---
+// 0x0107b0ac: 0x107b0ac: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+L_107b0b0:
+// 0x0107b0b0: 0x107b0b0: addiu v1, v1, -15564
+	ldloc 6
+	ldc.i4 -15564
 	add
-	stloc 8
-// 0x0107b098: 0x107b098: jal   0x1001b48 addu  a0, s6, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
+// 0x0107b0b4: 0x107b0b4: lw    v0, 2000(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0107b0a0: 0x107b0a0: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107b0a4: 0x107b0a4: addu  s5, v0, zero
+// 0x0107b0b8: 0x107b0b8: sll   zero, zero, 0
+// 0x0107b0bc: 0x107b0bc: addiu v0, v0, -1
 	ldloc 5
-	stloc 9
-// 0x0107b0a8: 0x107b0a8: j	 0x107b118 addiu a0, a0, -19588
+	ldc.i4.m1
+	add
+	stloc 5
+// 0x0107b0c0: 0x107b0c0: sll   a0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
+	stloc.1
+// 0x0107b0c4: 0x107b0c4: addu  a0, a0, v1
 	ldloc.1
-	ldc.i4 -19588
+	ldloc 6
 	add
 	stloc.1
-	br L_107b118
-// --- basic block ---
-L_107b0b0:
-// 0x0107b0b0: 0x107b0b0: bne   v0, v1, 0x107b0d4 addiu v1, zero, 8
+// 0x0107b0c8: 0x107b0c8: sw    zero, 0(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107b0cc: 0x107b0cc: bne   v0, zero, 0x107b0f8 sw    v0, 2000(v1)
 	ldloc 5
+	ldloc 7
 	ldloc 6
-	ldc.i4.8
-	stloc 6
-	bne.un L_107b0d4
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldloc 5
+	stelem.i4
+	brtrue L_107b0f8
 // --- basic block ---
-// 0x0107b0b8: 0x107b0b8: addiu s6, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+// 0x0107b0d4: 0x107b0d4: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 9
+// 0x0107b0d8: 0x107b0d8: lw    v0, -13528(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3382
 	add
-	stloc 8
-// 0x0107b0bc: 0x107b0bc: jal   0x1001b48 addu  a0, s6, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldelem.i4
+	stloc 5
+// 0x0107b0dc: 0x107b0dc: sll   zero, zero, 0
+// 0x0107b0e0: 0x107b0e0: beq   v0, zero, 0x107b0fc lui   v0, 0x80000
+	ldloc 5
+	ldc.i4 524288
 	stloc 5
+	brfalse L_107b0fc
 // --- basic block ---
-// 0x0107b0c4: 0x107b0c4: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x0107b0e8: 0x107b0e8: lui   a0, 0x1080000
+	ldc.i4 17301504
 	stloc.1
-// 0x0107b0c8: 0x107b0c8: addu  s5, v0, zero
-	ldloc 5
-	stloc 9
-// 0x0107b0cc: 0x107b0cc: j	 0x107b118 addiu a0, a0, -19536
+// 0x0107b0ec: 0x107b0ec: jal   0x104fd10 addiu a0, a0, 332
 	ldloc.1
-	ldc.i4 -19536
+	ldc.i4 332
 	add
 	stloc.1
-	br L_107b118
-// --- basic block ---
-L_107b0d4:
-// 0x0107b0d4: 0x107b0d4: bne   v0, v1, 0x107b0f8 addiu v1, zero, 6
-	ldloc 5
-	ldloc 6
-	ldc.i4.6
-	stloc 6
-	bne.un L_107b0f8
-// --- basic block ---
-// 0x0107b0dc: 0x107b0dc: addiu s6, sp, 32
 	ldloc.0
-	ldc.i4.s 32
-	add
-	stloc 8
-// 0x0107b0e0: 0x107b0e0: jal   0x1001b48 addu  a0, s6, zero
-	ldloc 8
-	stloc.1
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl59::roadmap_main_remove_periodic_104fd10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b0e8: 0x107b0e8: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107b0ec: 0x107b0ec: addu  s5, v0, zero
-	ldloc 5
-	stloc 9
-// 0x0107b0f0: 0x107b0f0: j	 0x107b118 addiu a0, a0, -26960
-	ldloc.1
-	ldc.i4 -26960
+// 0x0107b0f4: 0x107b0f4: sw    zero, -13528(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3382
 	add
-	stloc.1
-	br L_107b118
-// --- basic block ---
+	ldc.i4.s 0
+	stelem.i4
 L_107b0f8:
-// 0x0107b0f8: 0x107b0f8: bne   v0, v1, 0x107b13c sll   zero, zero, 0
+// 0x0107b0f8: 0x107b0f8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+L_107b0fc:
+// 0x0107b0fc: 0x107b0fc: lw    v1, -15628(v0)
+	ldloc 7
 	ldloc 5
-	ldloc 6
-	bne.un L_107b13c
-// --- basic block ---
-// 0x0107b100: 0x107b100: addiu s6, sp, 32
-	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3907
 	add
-	stloc 8
-// 0x0107b104: 0x107b104: jal   0x1001b48 addu  a0, s6, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldelem.i4
 	stloc 6
-	stloc 5
+// 0x0107b100: 0x107b100: sll   zero, zero, 0
+// 0x0107b104: 0x107b104: bne   v1, zero, 0x107b144 lui   a1, 0x1080000
+	ldloc 6
+	ldc.i4 17301504
+	stloc.2
+	brtrue L_107b144
 // --- basic block ---
-// 0x0107b10c: 0x107b10c: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x0107b10c: 0x107b10c: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0107b110: 0x107b110: addiu a1, a1, -25008
+	ldloc.2
+	ldc.i4 -25008
+	add
+	stloc.2
+// 0x0107b114: 0x107b114: addiu a0, zero, 2000
+	ldc.i4 2000
 	stloc.1
-// 0x0107b110: 0x107b110: addu  s5, v0, zero
+// 0x0107b118: 0x107b118: jal   0x104fea8 sw    v1, -15628(v0)
+	ldloc 7
 	ldloc 5
-	stloc 9
-// 0x0107b114: 0x107b114: addiu a0, a0, -19488
-	ldloc.1
-	ldc.i4 -19488
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3907
 	add
-	stloc.1
-L_107b118:
-// 0x0107b118: 0x107b118: jal   0x101cd60 sll   zero, zero, 0
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b120: 0x107b120: addiu a1, zero, 700
-	ldc.i4 700
-	stloc.2
-// 0x0107b124: 0x107b124: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107b128: 0x107b128: subu  a1, a1, s5
+// 0x0107b120: 0x107b120: j	 0x107b144 sll   zero, zero, 0
+	br L_107b144
+// --- basic block ---
+L_107b128:
+// 0x0107b128: 0x107b128: lui   a3, 0x20000
+	ldc.i4 131072
+	stloc 4
+// 0x0107b12c: 0x107b12c: addiu a1, a1, -26248
 	ldloc.2
-	ldloc 9
-	sub
+	ldc.i4 -26248
+	add
 	stloc.2
-// 0x0107b12c: 0x107b12c: addu  a0, s6, s5
-	ldloc 8
-	ldloc 9
+// 0x0107b130: 0x107b130: addiu a3, a3, -25340
+	ldloc 4
+	ldc.i4 -25340
 	add
+	stloc 4
+// 0x0107b134: 0x107b134: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0107b130: 0x107b130: addiu a2, a2, 32612
-	ldloc.3
-	ldc.i4 32612
-	add
+// 0x0107b138: 0x107b138: addiu a2, zero, 1024
+	ldc.i4 1024
 	stloc.3
-// 0x0107b134: 0x107b134: jal   0x1000f9c addu  a3, v0, zero
-	ldloc 5
-	stloc 4
+L_107b13c:
+// 0x0107b13c: 0x107b13c: jal   0x100449c sw    s0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 9
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl3::roadmap_log_100449c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107b13c:
-// 0x0107b13c: 0x107b13c: lw    a1, 0(s1)
+L_107b144:
+// 0x0107b144: 0x107b144: lw    ra, 52(sp)
+// 0x0107b148: 0x107b148: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107b14c: 0x107b14c: lw    s5, 48(sp)
 	ldloc 7
-	ldloc 10
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 12
+	add
 	ldelem.i4
-	stloc.2
-// 0x0107b140: 0x107b140: lw    v1, 0(s2)
+	stloc 13
+// 0x0107b150: 0x107b150: lw    s4, 44(sp)
 	ldloc 7
-	ldloc 13
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 11
+	add
 	ldelem.i4
-	stloc 6
-// 0x0107b144: 0x107b144: addiu s5, sp, 32
+	stloc 12
+// 0x0107b154: 0x107b154: lw    s3, 40(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
 	add
+	ldelem.i4
+	stloc 11
+// 0x0107b158: 0x107b158: lw    s2, 36(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107b15c: 0x107b15c: lw    s1, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107b160: 0x107b160: lw    s0, 28(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldelem.i4
 	stloc 9
-// 0x0107b148: 0x107b148: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x0107b164: 0x107b164: jr    ra addiu sp, sp, 56
+	ldloc.0
+	ldc.i4.s 56
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 Rtalerts_Delete_107b16c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 s0,int32[] mem,int32 ra,int32 v0,int32 v1)
+
+// local  8 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  5 is register s0
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 5
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107b16c:
+// 0x0107b16c: 0x107b16c: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107b170: 0x107b170: sw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b174: 0x107b174: sw    ra, 20(sp)
+// 0x0107b178: 0x107b178: jal   0x107ad3c addu  s0, a0, zero
+	ldloc.1
+	stloc 5
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl92::RTAlerts_Remove_107ad3c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
+// --- basic block ---
+// 0x0107b180: 0x107b180: jal   0x106ccc0 addu  a0, s0, zero
+	ldloc 5
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl81::Realtime_Remove_Alert_106ccc0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
+	stloc 8
+// --- basic block ---
+// 0x0107b188: 0x107b188: lw    ra, 20(sp)
+// 0x0107b18c: 0x107b18c: lw    s0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107b190: 0x107b190: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 8
+	ret
+}
+.method public static int32 CreateAlertObject_107b198(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s4,int32 s5,int32 s0,int32 s6,int32 s1,int32 s2,int32 s3,int32 lo,int32 s7,int32 s8,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 10 is register s0
+// local 12 is register s1
+// local 13 is register s2
+// local 14 is register s3
+// local  8 is register s4
+// local  9 is register s5
+// local 11 is register s6
+// local 16 is register s7
+// local  0 is register sp
+// local 17 is register s8
+// local 18 is register ra
+// local 15 is register lo
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 16
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 17
+	ldc.i4.s 0
+	stloc 18
+	ldc.i4.s 0
+	stloc 15
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107b198: 0x107b198: addiu sp, sp, -248
+	ldloc.0
+	ldc.i4 -248
+	add
+	stloc.0
+// 0x0107b19c: 0x107b19c: sw    s1, 212(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 53
+	add
+	ldloc 12
+	stelem.i4
+// 0x0107b1a0: 0x107b1a0: lui   s1, 0x20000
+	ldc.i4 131072
+	stloc 12
+// 0x0107b1a4: 0x107b1a4: sw    s0, 208(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 52
+	add
+	ldloc 10
+	stelem.i4
+// 0x0107b1a8: 0x107b1a8: addu  s0, a0, zero
+	ldloc.1
+	stloc 10
+// 0x0107b1ac: 0x107b1ac: addiu a0, s1, -25452
+	ldloc 12
+	ldc.i4 -25452
+	add
+	stloc.1
+// 0x0107b1b0: 0x107b1b0: sw    ra, 244(sp)
+// 0x0107b1b4: 0x107b1b4: sw    s4, 224(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 56
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107b1b8: 0x107b1b8: sw    s3, 220(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 55
+	add
+	ldloc 14
+	stelem.i4
+// 0x0107b1bc: 0x107b1bc: sw    s2, 216(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 54
+	add
+	ldloc 13
+	stelem.i4
+// 0x0107b1c0: 0x107b1c0: sw    s8, 240(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 60
+	add
+	ldloc 17
+	stelem.i4
+// 0x0107b1c4: 0x107b1c4: sw    s7, 236(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 59
+	add
+	ldloc 16
+	stelem.i4
+// 0x0107b1c8: 0x107b1c8: sw    s6, 232(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 58
+	add
+	ldloc 11
+	stelem.i4
+// 0x0107b1cc: 0x107b1cc: jal   0x101ca1c sw    s5, 228(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 57
+	add
+	ldloc 9
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b1d4: 0x107b1d4: addiu a0, s1, -25452
+	ldloc 12
+	ldc.i4 -25452
+	add
+	stloc.1
+// 0x0107b1d8: 0x107b1d8: addiu s2, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc 13
+// 0x0107b1dc: 0x107b1dc: jal   0x101ca1c addu  s3, v0, zero
+	ldloc 5
+	stloc 14
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b1e4: 0x107b1e4: lw    a3, 0(s0)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x0107b1e8: 0x107b1e8: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107b1ec: 0x107b1ec: addiu a2, a2, 19088
+	ldloc.3
+	ldc.i4 19088
+	add
+	stloc.3
+// 0x0107b1f0: 0x107b1f0: addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
+// 0x0107b1f4: 0x107b1f4: addu  a0, s2, zero
+	ldloc 13
+	stloc.1
+// 0x0107b1f8: 0x107b1f8: jal   0x1000f9c addu  s1, v0, zero
+	ldloc 5
+	stloc 12
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b200: 0x107b200: jal   0x101ca1c addu  a0, s2, zero
+	ldloc 13
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b208: 0x107b208: addu  s2, v0, zero
+	ldloc 5
+	stloc 13
+// 0x0107b20c: 0x107b20c: lw    v0, 20(s0)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107b210: 0x107b210: lw    v1, 16(s0)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc 7
+// 0x0107b214: 0x107b214: lw    a0, 0(s0)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0107b218: 0x107b218: sw    v0, 52(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b21c: 0x107b21c: addiu v0, zero, 4
+	ldc.i4.4
+	stloc 5
+// 0x0107b220: 0x107b220: sw    v1, 48(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 7
+	stelem.i4
+// 0x0107b224: 0x107b224: jal   0x107aa60 sw    v0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl92::RTAlerts_Get_Map_Icon_107aa60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b22c: 0x107b22c: beq   v0, zero, 0x107b404 addu  s4, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc 8
+	brfalse L_107b404
+// --- basic block ---
+// 0x0107b234: 0x107b234: addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+// 0x0107b238: 0x107b238: addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
+// 0x0107b23c: 0x107b23c: jal   0x10a1f60 addu  a2, v0, zero
+	ldloc 5
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 5
-// 0x0107b14c: 0x107b14c: addu  a0, s5, zero
-	ldloc 9
+// --- basic block ---
+// 0x0107b244: 0x107b244: beq   v0, zero, 0x107b26c sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107b26c
+// --- basic block ---
+// 0x0107b24c: 0x107b24c: jal   0x104e030 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-// 0x0107b150: 0x107b150: sw    a1, -14004(v0)
-	ldloc 7
+	ldloc.1
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b254: 0x107b254: addiu v1, zero, 2
+	ldc.i4.2
+	stloc 7
+// 0x0107b258: 0x107b258: div   v0, v1
 	ldloc 5
+	ldloc 7
+	div
+	stloc 15
+// 0x0107b25c: 0x107b25c: mflo  lo
+	ldloc 15
+	stloc 7
+// 0x0107b260: 0x107b260: subu  v1, zero, v1
+	ldloc 7
+	neg
+	stloc 7
+// 0x0107b264: 0x107b264: addiu v1, v1, 4
+	ldloc 7
+	ldc.i4.4
+	add
+	stloc 7
+// 0x0107b268: 0x107b268: sw    v1, 44(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldloc 7
+	stelem.i4
+L_107b26c:
+// 0x0107b26c: 0x107b26c: jal   0x101ca1c addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b274: 0x107b274: addiu s4, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc 8
+// 0x0107b278: 0x107b278: lw    a3, 0(s0)
+	ldloc 6
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldelem.i4
+	stloc 4
+// 0x0107b27c: 0x107b27c: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107b280: 0x107b280: addiu a2, a2, -25428
+	ldloc.3
+	ldc.i4 -25428
 	add
+	stloc.3
+// 0x0107b284: 0x107b284: addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
+// 0x0107b288: 0x107b288: addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+// 0x0107b28c: 0x107b28c: jal   0x1000f9c addu  s5, v0, zero
+	ldloc 5
+	stloc 9
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b294: 0x107b294: jal   0x101ca1c addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b29c: 0x107b29c: addu  s6, v0, zero
+	ldloc 5
+	stloc 11
+// 0x0107b2a0: 0x107b2a0: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107b2a4: 0x107b2a4: addiu v0, sp, 48
+	ldloc.0
+	ldc.i4.s 48
+	add
+	stloc 5
+// 0x0107b2a8: 0x107b2a8: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
 	stelem.i4
-// 0x0107b154: 0x107b154: lui   v0, 0x80000
-	ldc.i4 524288
+// 0x0107b2ac: 0x107b2ac: addiu v0, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
 	stloc 5
-// 0x0107b158: 0x107b158: jal   0x1001b48 sw    v1, -14000(v0)
-	ldloc 7
+// 0x0107b2b0: 0x107b2b0: addu  a3, s1, zero
+	ldloc 12
+	stloc 4
+// 0x0107b2b4: 0x107b2b4: addu  a2, s2, zero
+	ldloc 13
+	stloc.3
+// 0x0107b2b8: 0x107b2b8: addu  a0, s3, zero
+	ldloc 14
+	stloc.1
+// 0x0107b2bc: 0x107b2bc: sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b2c0: 0x107b2c0: addiu s4, zero, 2
+	ldc.i4.2
+	stloc 8
+// 0x0107b2c4: 0x107b2c4: addiu v0, zero, 19
+	ldc.i4.s 19
+	stloc 5
+// 0x0107b2c8: 0x107b2c8: sw    v0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
 	ldloc 5
+	stelem.i4
+// 0x0107b2cc: 0x107b2cc: sw    s5, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 9
+	stelem.i4
+// 0x0107b2d0: 0x107b2d0: sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3500
+	ldc.i4.8
 	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107b2d4: 0x107b2d4: jal   0x101c28c sw    s4, 36(sp)
 	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 8
 	stelem.i4
+	ldloc.0
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_add_with_priority_101c28c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b160: 0x107b160: addiu a1, zero, 700
-	ldc.i4 700
+// 0x0107b2dc: 0x107b2dc: lui   a1, 0x1080000
+	ldc.i4 17301504
 	stloc.2
-// 0x0107b164: 0x107b164: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107b168: 0x107b168: addiu a3, s1, 557
-	ldloc 10
-	ldc.i4 557
+// 0x0107b2e0: 0x107b2e0: addu  a0, s6, zero
+	ldloc 11
+	stloc.1
+// 0x0107b2e4: 0x107b2e4: jal   0x101bee0 addiu a1, a1, -3800
+	ldloc.2
+	ldc.i4 -3800
 	add
-	stloc 4
-// 0x0107b16c: 0x107b16c: addu  a0, s5, v0
-	ldloc 9
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b2ec: 0x107b2ec: lui   v0, 0xe0000
+	ldc.i4 917504
+	stloc 5
+// 0x0107b2f0: 0x107b2f0: lw    v0, 30192(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 7548
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107b2f4: 0x107b2f4: addiu a1, zero, -1
+	ldc.i4.m1
+	stloc.2
+// 0x0107b2f8: 0x107b2f8: lw    a2, 976(v0)
+	ldloc 6
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 244
 	add
+	ldelem.i4
+	stloc.3
+// 0x0107b2fc: 0x107b2fc: jal   0x101be88 addu  a0, s6, zero
+	ldloc 11
 	stloc.1
-// 0x0107b170: 0x107b170: subu  a1, a1, v0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call int32 Cibyl20::roadmap_object_set_zoom_101be88(int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b304: 0x107b304: jal   0x101c908 addu  a0, s5, zero
+	ldloc 9
+	stloc.1
+	ldloc.0
+	ldloc.1
 	ldloc.2
-	ldloc 5
-	sub
-	stloc.2
-// 0x0107b174: 0x107b174: jal   0x1000f9c addiu a2, a2, 19912
 	ldloc.3
-	ldc.i4 19912
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b30c: 0x107b30c: jal   0x101c908 addu  a0, s6, zero
+	ldloc 11
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b314: 0x107b314: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107b318: 0x107b318: addiu a2, a2, -25300
+	ldloc.3
+	ldc.i4 -25300
 	add
 	stloc.3
+// 0x0107b31c: 0x107b31c: addu  a0, zero, zero
+	ldc.i4.s 0
+	stloc.1
+// 0x0107b320: 0x107b320: jal   0x10a1f60 addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+// 0x0107b328: 0x107b328: beq   v0, zero, 0x107b34c sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107b34c
+// --- basic block ---
+// 0x0107b330: 0x107b330: jal   0x104e030 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.1
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b17c: 0x107b17c: lw    a1, 4(s1)
-	ldloc 7
-	ldloc 10
+// 0x0107b338: 0x107b338: div   v0, s4
+	ldloc 5
+	ldloc 8
+	div
+	stloc 15
+// 0x0107b33c: 0x107b33c: mflo  lo
+	ldloc 15
+	stloc 8
+// 0x0107b340: 0x107b340: subu  s4, zero, s4
+	ldloc 8
+	neg
+	stloc 8
+// 0x0107b344: 0x107b344: addiu s4, s4, 4
+	ldloc 8
+	ldc.i4.4
+	add
+	stloc 8
+// 0x0107b348: 0x107b348: sw    s4, 44(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 11
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107b180: 0x107b180: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x0107b184: 0x107b184: jal   0x10774a8 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl89::RTAlerts_Get_IconByType_10774a8(int32,int32)
-	stloc 5
-// --- basic block ---
-// 0x0107b18c: 0x107b18c: lui   a0, 0x20000
+	ldloc 8
+	stelem.i4
+L_107b34c:
+// 0x0107b34c: 0x107b34c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107b190: 0x107b190: addiu a0, a0, -25728
+// 0x0107b350: 0x107b350: addiu a0, a0, -25300
 	ldloc.1
-	ldc.i4 -25728
+	ldc.i4 -25300
 	add
 	stloc.1
-// 0x0107b194: 0x107b194: addu  a1, v0, zero
+// 0x0107b354: 0x107b354: addiu v0, zero, 6
+	ldc.i4.6
+	stloc 5
+// 0x0107b358: 0x107b358: addiu s5, sp, 68
+	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc 9
+// 0x0107b35c: 0x107b35c: jal   0x101ca1c sw    v0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
 	ldloc 5
-	stloc.2
-// 0x0107b198: 0x107b198: jal   0x109e13c addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b1a0: 0x107b1a0: lw    a0, 0(s1)
-	ldloc 7
+// 0x0107b364: 0x107b364: lw    a3, 0(s0)
+	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
+	stloc 4
+// 0x0107b368: 0x107b368: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107b36c: 0x107b36c: addiu a2, a2, -25416
+	ldloc.3
+	ldc.i4 -25416
+	add
+	stloc.3
+// 0x0107b370: 0x107b370: addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
+// 0x0107b374: 0x107b374: addu  a0, s5, zero
+	ldloc 9
 	stloc.1
-// 0x0107b1a4: 0x107b1a4: jal   0x1077724 addu  s6, v0, zero
+// 0x0107b378: 0x107b378: jal   0x1000f9c addu  s4, v0, zero
 	ldloc 5
 	stloc 8
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_Of_AddOns_1077724(int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b1ac: 0x107b1ac: addu  s5, zero, zero
-	ldc.i4.s 0
-	stloc 9
-// 0x0107b1b0: 0x107b1b0: j	 0x107b1d8 addu  s7, v0, zero
-	ldloc 5
-	stloc 15
-	br L_107b1d8
-// --- basic block ---
-L_107b1b8:
-// 0x0107b1b8: 0x107b1b8: lw    a0, 0(s1)
-	ldloc 7
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107b1bc: 0x107b1bc: jal   0x10777b8 addiu s5, s5, 1
+// 0x0107b380: 0x107b380: jal   0x101ca1c addu  a0, s5, zero
 	ldloc 9
-	ldc.i4.1
-	add
-	stloc 9
+	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_AddOn_10777b8(int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b1c4: 0x107b1c4: addu  a1, v0, zero
+// 0x0107b388: 0x107b388: addu  s5, v0, zero
 	ldloc 5
-	stloc.2
-// 0x0107b1c8: 0x107b1c8: beq   v0, zero, 0x107b1d8 addu  a0, s6, zero
+	stloc 9
+// 0x0107b38c: 0x107b38c: addu  a1, v0, zero
 	ldloc 5
-	ldloc 8
-	stloc.1
-	brfalse L_107b1d8
-// --- basic block ---
-// 0x0107b1d0: 0x107b1d0: jal   0x109ddec sll   zero, zero, 0
+	stloc.2
+// 0x0107b390: 0x107b390: addiu v0, sp, 48
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_add_overlay_109ddec(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_107b1d8:
-// 0x0107b1d8: 0x107b1d8: slt   v0, s5, s7
-	ldloc 9
-	ldloc 15
-	clt
+	ldc.i4.s 48
+	add
 	stloc 5
-// 0x0107b1dc: 0x107b1dc: bne   v0, zero, 0x107b1b8 addu  a1, s5, zero
+// 0x0107b394: 0x107b394: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 5
-	ldloc 9
-	stloc.2
-	brtrue L_107b1b8
-// --- basic block ---
-// 0x0107b1e4: 0x107b1e4: addu  a1, s6, zero
-	ldloc 8
-	stloc.2
-// 0x0107b1e8: 0x107b1e8: addu  a0, s4, zero
-	ldloc 12
-	stloc.1
-// 0x0107b1ec: 0x107b1ec: jal   0x1098ec4 addiu s1, sp, 32
+	stelem.i4
+// 0x0107b398: 0x107b398: addiu v0, sp, 40
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 40
 	add
-	stloc 10
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x0107b1f4: 0x107b1f4: addu  a0, s3, zero
+// 0x0107b39c: 0x107b39c: sw    v0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b3a0: 0x107b3a0: addiu v0, zero, 3
+	ldc.i4.3
+	stloc 5
+// 0x0107b3a4: 0x107b3a4: addu  a3, s1, zero
+	ldloc 12
+	stloc 4
+// 0x0107b3a8: 0x107b3a8: addu  a2, s2, zero
+	ldloc 13
+	stloc.3
+// 0x0107b3ac: 0x107b3ac: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x0107b1f8: 0x107b1f8: addu  a1, s4, zero
-	ldloc 12
-	stloc.2
-// 0x0107b1fc: 0x107b1fc: jal   0x1098ec4 lui   s4, 0x20000
-	ldc.i4 131072
-	stloc 12
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0107b3b0: 0x107b3b0: sw    v0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b3b4: 0x107b3b4: addiu v0, zero, 2
+	ldc.i4.2
 	stloc 5
-// --- basic block ---
-// 0x0107b204: 0x107b204: addiu a3, zero, 8
+// 0x0107b3b8: 0x107b3b8: sw    v0, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b3bc: 0x107b3bc: sw    s4, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107b3c0: 0x107b3c0: jal   0x101c28c sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
 	ldc.i4.8
-	stloc 4
-// 0x0107b208: 0x107b208: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x0107b20c: 0x107b20c: addiu a0, s4, -25716
-	ldloc 12
-	ldc.i4 -25716
 	add
-	stloc.1
-// 0x0107b210: 0x107b210: jal   0x1098d10 addiu a2, zero, 14
-	ldc.i4.s 14
-	stloc.3
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_object_add_with_priority_101c28c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b218: 0x107b218: lui   a1, 0x0
-	ldc.i4.s 0
+// 0x0107b3c8: 0x107b3c8: lui   a1, 0x1080000
+	ldc.i4 17301504
 	stloc.2
-// 0x0107b21c: 0x107b21c: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107b220: 0x107b220: addu  a0, v0, zero
-	ldloc 5
+// 0x0107b3cc: 0x107b3cc: addu  a0, s5, zero
+	ldloc 9
 	stloc.1
-// 0x0107b224: 0x107b224: addiu a1, a1, 23000
+// 0x0107b3d0: 0x107b3d0: jal   0x101bee0 addiu a1, a1, -3800
 	ldloc.2
-	ldc.i4 23000
+	ldc.i4 -3800
 	add
 	stloc.2
-// 0x0107b228: 0x107b228: jal   0x1098fe0 sw    v0, 736(sp)
-	ldloc 7
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 184
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_set_action_101bee0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107b230: 0x107b230: lw    v0, 736(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107b3d8: 0x107b3d8: lui   v0, 0xe0000
+	ldc.i4 917504
+	stloc 5
+// 0x0107b3dc: 0x107b3dc: lw    v0, 30192(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 184
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107b234: 0x107b234: addu  a0, s0, zero
-	ldloc 11
+// 0x0107b3e0: 0x107b3e0: addu  a0, s5, zero
+	ldloc 9
 	stloc.1
-// 0x0107b238: 0x107b238: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107b3e4: 0x107b3e4: lw    a1, 976(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 244
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107b3e8: 0x107b3e8: lw    a2, 400(v0)
+	ldloc 6
 	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 100
+	add
+	ldelem.i4
+	stloc.3
+// 0x0107b3ec: 0x107b3ec: jal   0x101be88 addiu a1, a1, 1
+	ldloc.2
+	ldc.i4.1
+	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	call int32 Cibyl20::roadmap_object_set_zoom_101be88(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b240: 0x107b240: addu  a0, s1, zero
-	ldloc 10
+// 0x0107b3f4: 0x107b3f4: jal   0x101c908 addu  a0, s4, zero
+	ldloc 8
 	stloc.1
-// 0x0107b244: 0x107b244: jal   0x1001b48 sb    zero, 32(sp)
 	ldloc.0
-	ldc.i4.s 32
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b24c: 0x107b24c: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107b250: 0x107b250: addiu a0, a0, -13684
-	ldloc.1
-	ldc.i4 -13684
-	add
+// 0x0107b3fc: 0x107b3fc: jal   0x101c908 addu  a0, s5, zero
+	ldloc 9
 	stloc.1
-// 0x0107b254: 0x107b254: jal   0x101cd60 addu  s5, v0, zero
-	ldloc 5
-	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b25c: 0x107b25c: addiu a0, s2, 16
-	ldloc 13
-	ldc.i4.s 16
-	add
-	stloc.1
-// 0x0107b260: 0x107b260: addiu s6, zero, 700
-	ldc.i4 700
-	stloc 8
-// 0x0107b264: 0x107b264: jal   0x101cd60 sw    v0, 736(sp)
-	ldloc 7
-	ldloc.0
+L_107b404:
+// 0x0107b404: 0x107b404: lw    a0, 0(s0)
+	ldloc 6
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 184
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
+	ldelem.i4
+	stloc.1
+// 0x0107b408: 0x107b408: jal   0x1077cc4 addu  s4, zero, zero
+	ldc.i4.s 0
+	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_Number_Of_Map_AddOns_1077cc4(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b26c: 0x107b26c: lw    a3, 736(sp)
-	ldloc 7
+// 0x0107b410: 0x107b410: sw    v0, 200(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 184
-	add
-	ldelem.i4
-	stloc 4
-// 0x0107b270: 0x107b270: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107b274: 0x107b274: subu  a1, s6, s5
-	ldloc 8
-	ldloc 9
-	sub
-	stloc.2
-// 0x0107b278: 0x107b278: addu  a0, s1, s5
-	ldloc 10
-	ldloc 9
-	add
-	stloc.1
-// 0x0107b27c: 0x107b27c: addiu a2, a2, -6888
-	ldloc.3
-	ldc.i4 -6888
+	ldc.i4.s 50
 	add
-	stloc.3
-// 0x0107b280: 0x107b280: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 7
+	ldloc 5
+	stelem.i4
+// 0x0107b414: 0x107b414: addiu s5, zero, 2
+	ldc.i4.2
+	stloc 9
+// 0x0107b418: 0x107b418: j	 0x107b4f4 addiu s7, sp, 68
 	ldloc.0
+	ldc.i4.s 68
+	add
+	stloc 16
+	br L_107b4f4
+// --- basic block ---
+L_107b420:
+// 0x0107b420: 0x107b420: lw    a0, 0(s0)
+	ldloc 6
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldelem.i4
+	stloc.1
+// 0x0107b424: 0x107b424: jal   0x1077c00 addiu s4, s4, 1
+	ldloc 8
+	ldc.i4.1
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
+	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_Map_AddOn_1077c00(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b288: 0x107b288: ori   a3, zero, 32776
-	ldc.i4.s 0
-	ldc.i4 32776
-	or
-	stloc 4
-// 0x0107b28c: 0x107b28c: addiu a2, zero, 14
-	ldc.i4.s 14
+// 0x0107b42c: 0x107b42c: addu  a2, v0, zero
+	ldloc 5
 	stloc.3
-// 0x0107b290: 0x107b290: addiu a0, s4, -25716
-	ldloc 12
-	ldc.i4 -25716
-	add
+// 0x0107b430: 0x107b430: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0107b294: 0x107b294: jal   0x1098d10 addu  a1, s1, zero
-	ldloc 10
+// 0x0107b434: 0x107b434: addiu a1, zero, 1
+	ldc.i4.1
 	stloc.2
+// 0x0107b438: 0x107b438: jal   0x10a1f60 addu  s6, v0, zero
+	ldloc 5
+	stloc 11
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b29c: 0x107b29c: addu  a1, v0, zero
+// 0x0107b440: 0x107b440: beq   v0, zero, 0x107b464 addu  a0, v0, zero
 	ldloc 5
-	stloc.2
-// 0x0107b2a0: 0x107b2a0: addu  a0, s0, zero
-	ldloc 11
-	stloc.1
-// 0x0107b2a4: 0x107b2a4: jal   0x1098ec4 sw    v0, 736(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 184
-	add
 	ldloc 5
-	stelem.i4
+	stloc.1
+	brfalse L_107b464
+// --- basic block ---
+// 0x0107b448: 0x107b448: jal   0x104e030 sll   zero, zero, 0
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl57::roadmap_canvas_image_height_104e030(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b2ac: 0x107b2ac: lw    v0, 736(sp)
-	ldloc 7
+// 0x0107b450: 0x107b450: div   v0, s5
+	ldloc 5
+	ldloc 9
+	div
+	stloc 15
+// 0x0107b454: 0x107b454: mflo  lo
+	ldloc 15
+	stloc 5
+// 0x0107b458: 0x107b458: subu  v0, zero, v0
+	ldloc 5
+	neg
+	stloc 5
+// 0x0107b45c: 0x107b45c: addiu v0, v0, 4
+	ldloc 5
+	ldc.i4.4
+	add
+	stloc 5
+// 0x0107b460: 0x107b460: sw    v0, 44(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 184
+	ldc.i4.s 11
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107b2b0: 0x107b2b0: lui   s5, 0x0
-	ldc.i4.s 0
-	stloc 9
-// 0x0107b2b4: 0x107b2b4: addu  a0, v0, zero
 	ldloc 5
-	stloc.1
-// 0x0107b2b8: 0x107b2b8: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107b2bc: 0x107b2bc: jal   0x1098fe0 addiu a1, s5, 23008
-	ldloc 9
-	ldc.i4 23008
-	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107b2c4: 0x107b2c4: addu  a1, s2, zero
-	ldloc 13
-	stloc.2
-// 0x0107b2c8: 0x107b2c8: jal   0x1078364 addu  a0, s0, zero
+	stelem.i4
+L_107b464:
+// 0x0107b464: 0x107b464: jal   0x101ca1c addu  a0, s6, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -4855,65 +5421,43 @@ L_107b1d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_add_comment_stars_1078364(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107b2d0: 0x107b2d0: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x0107b2d4: 0x107b2d4: jal   0x1001b48 sb    zero, 32(sp)
-	ldloc.0
-	ldc.i4.s 32
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b2dc: 0x107b2dc: subu  a1, s6, v0
-	ldloc 8
-	ldloc 5
-	sub
-	stloc.2
-// 0x0107b2e0: 0x107b2e0: addu  a0, s1, v0
+// 0x0107b46c: 0x107b46c: lw    a3, 0(s0)
+	ldloc 6
 	ldloc 10
-	ldloc 5
-	add
-	stloc.1
-// 0x0107b2e4: 0x107b2e4: lui   a2, 0x20000
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x0107b470: 0x107b470: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0107b2e8: 0x107b2e8: lui   v0, 0x10000
-	ldc.i4 65536
-	stloc 5
-// 0x0107b2ec: 0x107b2ec: addiu a3, s2, 117
-	ldloc 13
-	ldc.i4.s 117
-	add
-	stloc 4
-// 0x0107b2f0: 0x107b2f0: addiu a2, a2, 21592
+// 0x0107b474: 0x107b474: addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
+// 0x0107b478: 0x107b478: addiu a2, a2, -25436
 	ldloc.3
-	ldc.i4 21592
+	ldc.i4 -25436
 	add
 	stloc.3
-// 0x0107b2f4: 0x107b2f4: addiu v0, v0, 19160
+// 0x0107b47c: 0x107b47c: addu  a0, s7, zero
+	ldloc 16
+	stloc.1
+// 0x0107b480: 0x107b480: addu  s8, v0, zero
 	ldloc 5
-	ldc.i4 19160
-	add
-	stloc 5
-// 0x0107b2f8: 0x107b2f8: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 7
+	stloc 17
+// 0x0107b484: 0x107b484: jal   0x1000f9c sw    s6, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
 	ldloc.0
 	ldloc.1
@@ -4922,165 +5466,160 @@ L_107b1d8:
 	ldloc 4
 	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b300: 0x107b300: jal   0x1078614 addiu a0, zero, 2
-	ldc.i4.2
+// 0x0107b48c: 0x107b48c: jal   0x101ca1c addu  a0, s7, zero
+	ldloc 16
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::space_1078614(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b308: 0x107b308: addu  a1, v0, zero
+// 0x0107b494: 0x107b494: addu  s6, v0, zero
 	ldloc 5
-	stloc.2
-// 0x0107b30c: 0x107b30c: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 11
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107b314: 0x107b314: addiu a3, zero, 4
-	ldc.i4.4
-	stloc 4
-// 0x0107b318: 0x107b318: addiu a0, s4, -25716
+	stloc 11
+// 0x0107b498: 0x107b498: addu  a3, s1, zero
 	ldloc 12
-	ldc.i4 -25716
+	stloc 4
+// 0x0107b49c: 0x107b49c: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107b4a0: 0x107b4a0: addiu v1, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc 7
+// 0x0107b4a4: 0x107b4a4: addiu v0, sp, 48
+	ldloc.0
+	ldc.i4.s 48
 	add
+	stloc 5
+// 0x0107b4a8: 0x107b4a8: addu  a0, s3, zero
+	ldloc 14
 	stloc.1
-// 0x0107b31c: 0x107b31c: addu  a1, s1, zero
-	ldloc 10
-	stloc.2
-// 0x0107b320: 0x107b320: jal   0x1098d10 addiu a2, zero, 16
-	ldc.i4.s 16
+// 0x0107b4ac: 0x107b4ac: addu  a2, s2, zero
+	ldloc 13
 	stloc.3
+// 0x0107b4b0: 0x107b4b0: sw    v0, 20(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107b328: 0x107b328: addu  a1, v0, zero
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
 	ldloc 5
-	stloc.2
-// 0x0107b32c: 0x107b32c: addu  a0, s0, zero
-	ldloc 11
-	stloc.1
-// 0x0107b330: 0x107b330: jal   0x1098ec4 sw    v0, 736(sp)
+	stelem.i4
+// 0x0107b4b4: 0x107b4b4: sw    v1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
 	ldloc 7
+	stelem.i4
+// 0x0107b4b8: 0x107b4b8: sw    s8, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 17
+	stelem.i4
+// 0x0107b4bc: 0x107b4bc: sw    zero, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107b4c0: 0x107b4c0: sw    zero, 32(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107b4c4: 0x107b4c4: jal   0x101c28c sw    s5, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 184
+	ldc.i4.s 9
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_object_add_with_priority_101c28c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b338: 0x107b338: lw    v0, 736(sp)
+// 0x0107b4cc: 0x107b4cc: lui   v1, 0xe0000
+	ldc.i4 917504
+	stloc 7
+// 0x0107b4d0: 0x107b4d0: lw    v0, 30192(v1)
+	ldloc 6
 	ldloc 7
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 184
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107b33c: 0x107b33c: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107b340: 0x107b340: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107b344: 0x107b344: jal   0x1098fe0 addiu a1, s5, 23008
-	ldloc 9
-	ldc.i4 23008
-	add
-	stloc.2
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107b34c: 0x107b34c: addu  a0, s3, zero
-	ldloc 14
-	stloc.1
-// 0x0107b350: 0x107b350: jal   0x1098ec4 addu  a1, s0, zero
-	ldloc 11
+// 0x0107b4d4: 0x107b4d4: addiu a1, zero, -1
+	ldc.i4.m1
 	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107b358: 0x107b358: lw    s0, 4(s3)
-	ldloc 7
-	ldloc 14
+// 0x0107b4d8: 0x107b4d8: lw    a2, 976(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 244
 	add
 	ldelem.i4
-	stloc 11
-// 0x0107b35c: 0x107b35c: lui   s1, 0x1080000
-	ldc.i4 17301504
-	stloc 10
-// 0x0107b360: 0x107b360: addiu a1, s1, -19460
-	ldloc 10
-	ldc.i4 -19460
-	add
-	stloc.2
-// 0x0107b364: 0x107b364: jal   0x1099174 addu  a0, s0, zero
+	stloc.3
+// 0x0107b4dc: 0x107b4dc: jal   0x101be88 addu  a0, s6, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	ldloc.3
+	call int32 Cibyl20::roadmap_object_set_zoom_101be88(int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107b36c: 0x107b36c: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107b370: 0x107b370: jal   0x101cd60 addiu a0, a0, -6188
-	ldloc.1
-	ldc.i4 -6188
-	add
+// 0x0107b4e4: 0x107b4e4: jal   0x101c908 addu  a0, s8, zero
+	ldloc 17
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b378: 0x107b378: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107b37c: 0x107b37c: jal   0x109b434 addu  a0, s0, zero
+// 0x0107b4ec: 0x107b4ec: jal   0x101c908 addu  a0, s6, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -5088,227 +5627,193 @@ L_107b1d8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b384: 0x107b384: lw    a1, 16(s0)
-	ldloc 7
-	ldloc 11
+L_107b4f4:
+// 0x0107b4f4: 0x107b4f4: lw    v1, 200(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 50
 	add
 	ldelem.i4
-	stloc.2
-// 0x0107b388: 0x107b388: jal   0x109c5ec addiu a0, s1, -19460
-	ldloc 10
-	ldc.i4 -19460
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
+// 0x0107b4f8: 0x107b4f8: sll   zero, zero, 0
+// 0x0107b4fc: 0x107b4fc: slt   v0, s4, v1
+	ldloc 8
+	ldloc 7
+	clt
 	stloc 5
-// --- basic block ---
-// 0x0107b390: 0x107b390: lui   a1, 0x1080000
-	ldc.i4 17301504
-	stloc.2
-// 0x0107b394: 0x107b394: addu  a0, s0, zero
-	ldloc 11
-	stloc.1
-// 0x0107b398: 0x107b398: jal   0x109917c addiu a1, a1, -29060
-	ldloc.2
-	ldc.i4 -29060
-	add
+// 0x0107b500: 0x107b500: bne   v0, zero, 0x107b420 addu  a1, s4, zero
+	ldloc 5
+	ldloc 8
 	stloc.2
-	ldloc.1
-	ldloc.2
-	call void Cibyl114::ssd_widget_set_right_softkey_callback_109917c(int32,int32)
+	brtrue L_107b420
 // --- basic block ---
-// 0x0107b3a0: 0x107b3a0: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107b3a4: 0x107b3a4: jal   0x101cd60 addiu a0, a0, -25704
-	ldloc.1
-	ldc.i4 -25704
-	add
+// 0x0107b508: 0x107b508: jal   0x101c908 addu  a0, s3, zero
+	ldloc 14
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b3ac: 0x107b3ac: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107b3b0: 0x107b3b0: jal   0x109b50c addu  a0, s0, zero
-	ldloc 11
+// 0x0107b510: 0x107b510: jal   0x101c908 addu  a0, s2, zero
+	ldloc 13
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b3b8: 0x107b3b8: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107b3bc: 0x107b3bc: addiu a0, a0, -26764
-	ldloc.1
-	ldc.i4 -26764
-	add
+// 0x0107b518: 0x107b518: jal   0x101c908 addu  a0, s1, zero
+	ldloc 12
 	stloc.1
-// 0x0107b3c0: 0x107b3c0: jal   0x1095eec addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b3c8: 0x107b3c8: jal   0x1021900 sll   zero, zero, 0
+// 0x0107b520: 0x107b520: lw    ra, 244(sp)
+// 0x0107b524: 0x107b524: lw    s8, 240(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107b3d0: 0x107b3d0: lw    ra, 780(sp)
-// 0x0107b3d4: 0x107b3d4: lw    s7, 776(sp)
-	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 60
+	add
+	ldelem.i4
+	stloc 17
+// 0x0107b528: 0x107b528: lw    s7, 236(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 194
+	ldc.i4.s 59
 	add
 	ldelem.i4
-	stloc 15
-// 0x0107b3d8: 0x107b3d8: lw    s6, 772(sp)
-	ldloc 7
+	stloc 16
+// 0x0107b52c: 0x107b52c: lw    s6, 232(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 193
+	ldc.i4.s 58
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107b3dc: 0x107b3dc: lw    s5, 768(sp)
-	ldloc 7
+	stloc 11
+// 0x0107b530: 0x107b530: lw    s5, 228(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 192
+	ldc.i4.s 57
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107b3e0: 0x107b3e0: lw    s4, 764(sp)
-	ldloc 7
+// 0x0107b534: 0x107b534: lw    s4, 224(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 191
+	ldc.i4.s 56
 	add
 	ldelem.i4
-	stloc 12
-// 0x0107b3e4: 0x107b3e4: lw    s3, 760(sp)
-	ldloc 7
+	stloc 8
+// 0x0107b538: 0x107b538: lw    s3, 220(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 190
+	ldc.i4.s 55
 	add
 	ldelem.i4
 	stloc 14
-// 0x0107b3e8: 0x107b3e8: lw    s2, 756(sp)
-	ldloc 7
+// 0x0107b53c: 0x107b53c: lw    s2, 216(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 189
+	ldc.i4.s 54
 	add
 	ldelem.i4
 	stloc 13
-// 0x0107b3ec: 0x107b3ec: lw    s1, 752(sp)
-	ldloc 7
+// 0x0107b540: 0x107b540: lw    s1, 212(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 188
+	ldc.i4.s 53
 	add
 	ldelem.i4
-	stloc 10
-// 0x0107b3f0: 0x107b3f0: lw    s0, 748(sp)
-	ldloc 7
+	stloc 12
+// 0x0107b544: 0x107b544: lw    s0, 208(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 187
+	ldc.i4.s 52
 	add
 	ldelem.i4
-	stloc 11
-// 0x0107b3f4: 0x107b3f4: jr    ra addiu sp, sp, 784
+	stloc 10
+// 0x0107b548: 0x107b548: jr    ra addiu sp, sp, 248
 	ldloc.0
-	ldc.i4 784
+	ldc.i4 248
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 on_options_107b3fc(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Comment_PopUp_107b550(int32,int32,int32,int32,int32)
 {
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t0,int32 s1,int32 t1,int32 s0,int32 s2,int32 s3,int32 ra,int32 t2)
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s6,int32 s5,int32 s1,int32 s0,int32 s4,int32 s2,int32 s3,int32 s7,int32 ra)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local  8 is register t0
-// local 10 is register t1
-// local 15 is register t2
 // local 11 is register s0
-// local  9 is register s1
-// local 12 is register s2
-// local 13 is register s3
+// local 10 is register s1
+// local 13 is register s2
+// local 14 is register s3
+// local 12 is register s4
+// local  9 is register s5
+// local  8 is register s6
+// local 15 is register s7
 // local  0 is register sp
-// local 14 is register ra
-// local  6 is register mem
+// local 16 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -5318,537 +5823,346 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 8
+	stloc 11
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
-	stloc 15
+	stloc 13
 	ldc.i4.s 0
-	stloc 11
+	stloc 14
+	ldc.i4.s 0
+	stloc 12
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
-	stloc 12
+	stloc 8
 	ldc.i4.s 0
-	stloc 13
+	stloc 15
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 14
+	stloc 16
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107b3fc: 0x107b3fc: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107b400: 0x107b400: addiu sp, sp, -56
+// 0x0107b550: 0x107b550: addiu sp, sp, -784
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4 -784
 	add
 	stloc.0
-// 0x0107b404: 0x107b404: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
+// 0x0107b554: 0x107b554: lui   v0, 0xf0000
+	ldc.i4 983040
 	stloc 5
-// 0x0107b408: 0x107b408: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107b40c: 0x107b40c: lw    a0, -14004(v1)
-	ldloc 6
+// 0x0107b558: 0x107b558: sw    s5, 768(sp)
 	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3501
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107b410: 0x107b410: sw    ra, 52(sp)
-// 0x0107b414: 0x107b414: sw    s3, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldloc 13
-	stelem.i4
-// 0x0107b418: 0x107b418: sw    s2, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldloc 12
-	stelem.i4
-// 0x0107b41c: 0x107b41c: sw    s1, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107b420: 0x107b420: sw    s0, 36(sp)
-	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4 192
 	add
-	ldloc 11
+	ldloc 9
 	stelem.i4
-// 0x0107b424: 0x107b424: lw    v1, 2000(v0)
-	ldloc 6
+// 0x0107b55c: 0x107b55c: lw    s5, -29604(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 -7401
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107b428: 0x107b428: addu  a2, v0, zero
-	ldloc 5
-	stloc.3
-// 0x0107b42c: 0x107b42c: addu  t0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0107b430: 0x107b430: j	 0x107b450 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_107b450
-// --- basic block ---
-L_107b438:
-// 0x0107b438: 0x107b438: lw    a1, 0(t0)
-	ldloc 6
-	ldloc 8
+	stloc 9
+// 0x0107b560: 0x107b560: lui   v0, 0xf0000
+	ldc.i4 983040
+	stloc 5
+// 0x0107b564: 0x107b564: sw    s6, 772(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.2
-// 0x0107b43c: 0x107b43c: addiu a3, a3, 1
-	ldloc 4
-	ldc.i4.1
+	ldc.i4 193
 	add
-	stloc 4
-// 0x0107b440: 0x107b440: lw    t1, 0(a1)
-	ldloc 6
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 10
-// 0x0107b444: 0x107b444: sll   zero, zero, 0
-// 0x0107b448: 0x107b448: beq   t1, a0, 0x107b45c addiu t0, t0, 4
-	ldloc 10
-	ldloc.1
 	ldloc 8
-	ldc.i4.4
-	add
-	stloc 8
-	beq  L_107b45c
-// --- basic block ---
-L_107b450:
-// 0x0107b450: 0x107b450: slt   a1, a3, v1
-	ldloc 4
+	stelem.i4
+// 0x0107b568: 0x107b568: sw    s2, 756(sp)
 	ldloc 7
-	clt
-	stloc.2
-// 0x0107b454: 0x107b454: bne   a1, zero, 0x107b438 addu  a1, zero, zero
-	ldloc.2
-	ldc.i4.s 0
-	stloc.2
-	brtrue L_107b438
-// --- basic block ---
-L_107b45c:
-// 0x0107b45c: 0x107b45c: addu  t0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0107b460: 0x107b460: j	 0x107b494 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_107b494
-// --- basic block ---
-L_107b468:
-// 0x0107b468: 0x107b468: lw    t1, 0(t0)
-	ldloc 6
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 10
-// 0x0107b46c: 0x107b46c: addiu a3, a3, 1
-	ldloc 4
-	ldc.i4.1
+	ldc.i4 189
 	add
-	stloc 4
-// 0x0107b470: 0x107b470: lw    t2, 0(t1)
-	ldloc 6
-	ldloc 10
+	ldloc 13
+	stelem.i4
+// 0x0107b56c: 0x107b56c: sw    s1, 752(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 15
-// 0x0107b474: 0x107b474: sll   zero, zero, 0
-// 0x0107b478: 0x107b478: bne   t2, a0, 0x107b494 addiu t0, t0, 4
-	ldloc 15
-	ldloc.1
-	ldloc 8
-	ldc.i4.4
+	ldc.i4 188
 	add
-	stloc 8
-	bne.un L_107b494
-// --- basic block ---
-// 0x0107b480: 0x107b480: lw    s1, 4(t1)
-	ldloc 6
 	ldloc 10
+	stelem.i4
+// 0x0107b570: 0x107b570: sw    s0, 748(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 187
 	add
-	ldelem.i4
-	stloc 9
-// 0x0107b484: 0x107b484: sll   zero, zero, 0
-// 0x0107b488: 0x107b488: xori  s1, s1, 4
-	ldloc 9
-	ldc.i4.4
-	xor
-	stloc 9
-// 0x0107b48c: 0x107b48c: j	 0x107b4a0 sltiu s1, s1, 1
-	ldloc 9
-	ldc.i4.1
-	clt.un
-	stloc 9
-	br L_107b4a0
-// --- basic block ---
-L_107b494:
-// 0x0107b494: 0x107b494: slt   t1, a3, v1
-	ldloc 4
+	ldloc 11
+	stelem.i4
+// 0x0107b574: 0x107b574: sw    ra, 780(sp)
+// 0x0107b578: 0x107b578: sw    s7, 776(sp)
 	ldloc 7
-	clt
-	stloc 10
-// 0x0107b498: 0x107b498: bne   t1, zero, 0x107b468 addu  s1, zero, zero
-	ldloc 10
-	ldc.i4.s 0
-	stloc 9
-	brtrue L_107b468
-// --- basic block ---
-L_107b4a0:
-// 0x0107b4a0: 0x107b4a0: j	 0x107b4cc addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	br L_107b4cc
-// --- basic block ---
-L_107b4a8:
-// 0x0107b4a8: 0x107b4a8: lw    t0, 0(v0)
-	ldloc 6
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 8
-// 0x0107b4ac: 0x107b4ac: sll   zero, zero, 0
-// 0x0107b4b0: 0x107b4b0: lw    t1, 0(t0)
-	ldloc 6
-	ldloc 8
+	ldc.i4 194
+	add
+	ldloc 15
+	stelem.i4
+// 0x0107b57c: 0x107b57c: sw    s4, 764(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 10
-// 0x0107b4b4: 0x107b4b4: sll   zero, zero, 0
-// 0x0107b4b8: 0x107b4b8: bne   t1, a0, 0x107b4cc addiu v0, v0, 4
-	ldloc 10
-	ldloc.1
-	ldloc 5
-	ldc.i4.4
+	ldc.i4 191
 	add
-	stloc 5
-	bne.un L_107b4cc
-// --- basic block ---
-// 0x0107b4c0: 0x107b4c0: lw    s3, 1276(t0)
-	ldloc 6
-	ldloc 8
+	ldloc 12
+	stelem.i4
+// 0x0107b580: 0x107b580: sw    s3, 760(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4 190
 	add
-	ldelem.i4
-	stloc 13
-// 0x0107b4c4: 0x107b4c4: j	 0x107b4dc sltu  s3, zero, s3
-	ldc.i4.s 0
-	ldloc 13
-	clt.un
+	ldloc 14
+	stelem.i4
+// 0x0107b584: 0x107b584: addu  s2, a0, zero
+	ldloc.1
 	stloc 13
-	br L_107b4dc
-// --- basic block ---
-L_107b4cc:
-// 0x0107b4cc: 0x107b4cc: slt   t0, a3, v1
-	ldloc 4
+// 0x0107b588: 0x107b588: addu  s1, a1, zero
+	ldloc.2
+	stloc 10
+// 0x0107b58c: 0x107b58c: lw    s6, -29608(v0)
 	ldloc 7
-	clt
-	stloc 8
-// 0x0107b4d0: 0x107b4d0: bne   t0, zero, 0x107b4a8 addiu a3, a3, 1
-	ldloc 8
-	ldloc 4
-	ldc.i4.1
-	add
-	stloc 4
-	brtrue L_107b4a8
-// --- basic block ---
-// 0x0107b4d8: 0x107b4d8: addu  s3, zero, zero
-	ldc.i4.s 0
-	stloc 13
-L_107b4dc:
-// 0x0107b4dc: 0x107b4dc: j	 0x107b508 addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_107b508
-// --- basic block ---
-L_107b4e4:
-// 0x0107b4e4: 0x107b4e4: lw    a3, 0(a2)
-	ldloc 6
-	ldloc.3
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107b4e8: 0x107b4e8: sll   zero, zero, 0
-// 0x0107b4ec: 0x107b4ec: lw    t0, 0(a3)
-	ldloc 6
-	ldloc 4
+	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldc.i4 -7402
+	add
 	ldelem.i4
 	stloc 8
-// 0x0107b4f0: 0x107b4f0: sll   zero, zero, 0
-// 0x0107b4f4: 0x107b4f4: bne   t0, a0, 0x107b508 addiu a2, a2, 4
-	ldloc 8
-	ldloc.1
-	ldloc.3
-	ldc.i4.4
-	add
-	stloc.3
-	bne.un L_107b508
-// --- basic block ---
-// 0x0107b4fc: 0x107b4fc: lb    a2, 708(a3)
-	ldloc 4
-	ldc.i4 708
+// 0x0107b590: 0x107b590: jal   0x101fa38 sb    zero, 32(sp)
+	ldloc.0
+	ldc.i4.s 32
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc.3
-// 0x0107b500: 0x107b500: j	 0x107b518 sltu  a2, zero, a2
 	ldc.i4.s 0
-	ldloc.3
-	clt.un
-	stloc.3
-	br L_107b518
-// --- basic block ---
-L_107b508:
-// 0x0107b508: 0x107b508: slt   a3, v0, v1
-	ldloc 5
-	ldloc 7
-	clt
-	stloc 4
-// 0x0107b50c: 0x107b50c: bne   a3, zero, 0x107b4e4 addiu v0, v0, 1
-	ldloc 4
-	ldloc 5
-	ldc.i4.1
-	add
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
-	brtrue L_107b4e4
 // --- basic block ---
-// 0x0107b514: 0x107b514: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-L_107b518:
-// 0x0107b518: 0x107b518: bne   s1, zero, 0x107b52c addu  s2, zero, zero
-	ldloc 9
-	ldc.i4.s 0
-	stloc 12
-	brtrue L_107b52c
+// 0x0107b598: 0x107b598: beq   v0, zero, 0x107b5a4 addiu s0, zero, 52
+	ldloc 5
+	ldc.i4.s 52
+	stloc 11
+	brfalse L_107b5a4
 // --- basic block ---
-// 0x0107b520: 0x107b520: lw    s2, 1284(a1)
-	ldloc 6
-	ldloc.2
-	ldc.i4.2
-	shr.un
-	ldc.i4 321
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107b524: 0x107b524: sll   zero, zero, 0
-// 0x0107b528: 0x107b528: sltu  s2, zero, s2
-	ldc.i4.s 0
-	ldloc 12
-	clt.un
-	stloc 12
-L_107b52c:
-// 0x0107b52c: 0x107b52c: lui   s0, 0x0
-	ldc.i4.s 0
+// 0x0107b5a0: 0x107b5a0: addiu s0, zero, 78
+	ldc.i4.s 78
 	stloc 11
-// 0x0107b530: 0x107b530: addiu a0, s0, 15964
-	ldloc 11
-	ldc.i4 15964
+L_107b5a4:
+// 0x0107b5a4: 0x107b5a4: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107b5a8: 0x107b5a8: jal   0x101cd70 addiu a0, a0, -7700
+	ldloc.1
+	ldc.i4 -7700
 	add
 	stloc.1
-// 0x0107b534: 0x107b534: addiu a1, zero, 2
-	ldc.i4.2
-	stloc.2
-// 0x0107b538: 0x107b538: jal   0x109c504 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b540: 0x107b540: addu  a2, s3, zero
-	ldloc 13
+// 0x0107b5b0: 0x107b5b0: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107b5b4: 0x107b5b4: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107b5b8: 0x107b5b8: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x0107b5bc: 0x107b5bc: addiu a0, a0, -26300
+	ldloc.1
+	ldc.i4 -26300
+	add
+	stloc.1
+// 0x0107b5c0: 0x107b5c0: addu  a2, zero, zero
+	ldc.i4.s 0
 	stloc.3
-// 0x0107b544: 0x107b544: addiu a0, s0, 15964
-	ldloc 11
-	ldc.i4 15964
+// 0x0107b5c4: 0x107b5c4: addiu a3, zero, -2
+	ldc.i4.s -2
+	stloc 4
+// 0x0107b5c8: 0x107b5c8: sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b5cc: 0x107b5cc: lui   v0, 0x1a000000
+	ldc.i4 436207616
+	stloc 5
+// 0x0107b5d0: 0x107b5d0: sw    v0, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107b5d4: 0x107b5d4: jal   0x109eb38 sw    zero, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.1
-// 0x0107b548: 0x107b548: addiu a1, zero, 1
-	ldc.i4.1
-	stloc.2
-// 0x0107b54c: 0x107b54c: jal   0x109c504 addu  a3, zero, zero
 	ldc.i4.s 0
-	stloc 4
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b554: 0x107b554: xori  a2, s1, 1
-	ldloc 9
-	ldc.i4.1
-	xor
-	stloc.3
-// 0x0107b558: 0x107b558: addiu a0, s0, 15964
-	ldloc 11
-	ldc.i4 15964
-	add
+// 0x0107b5dc: 0x107b5dc: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107b5e0: 0x107b5e0: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107b55c: 0x107b55c: addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x0107b5e4: 0x107b5e4: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
+	add
 	stloc.2
-// 0x0107b560: 0x107b560: jal   0x109c504 addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-	ldloc.0
+// 0x0107b5e8: 0x107b5e8: addiu a0, a0, 9036
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107b568: 0x107b568: addu  a2, s2, zero
-	ldloc 12
+	ldc.i4 9036
+	add
+	stloc.1
+// 0x0107b5ec: 0x107b5ec: addu  a2, s0, zero
+	ldloc 11
 	stloc.3
-// 0x0107b56c: 0x107b56c: addiu a1, zero, 3
-	ldc.i4.3
-	stloc.2
-// 0x0107b570: 0x107b570: addu  a3, zero, zero
-	ldc.i4.s 0
+// 0x0107b5f0: 0x107b5f0: addiu a3, zero, -1
+	ldc.i4.m1
 	stloc 4
-// 0x0107b574: 0x107b574: jal   0x109c504 addiu a0, s0, 15964
-	ldloc 11
-	ldc.i4 15964
+// 0x0107b5f4: 0x107b5f4: addu  s3, v0, zero
+	ldloc 5
+	stloc 14
+// 0x0107b5f8: 0x107b5f8: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x0107b5fc: 0x107b5fc: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.1
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b57c: 0x107b57c: jal   0x109a424 addu  a0, zero, zero
-	ldc.i4.s 0
+// 0x0107b604: 0x107b604: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-	ldloc.0
+// 0x0107b608: 0x107b608: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107b60c: 0x107b60c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107b610: 0x107b610: jal   0x1099628 addu  s4, v0, zero
+	ldloc 5
+	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107b584: 0x107b584: sltu  v0, zero, v0
-	ldc.i4.s 0
-	ldloc 5
-	clt.un
+// 0x0107b618: 0x107b618: slt   v0, s5, s6
+	ldloc 9
+	ldloc 8
+	clt
 	stloc 5
-// 0x0107b588: 0x107b588: nor   a0, zero, v0
+// 0x0107b61c: 0x107b61c: beq   v0, zero, 0x107b62c addiu s6, s6, -40
 	ldloc 5
-	ldc.i4.m1
-	xor
-	stloc.1
-// 0x0107b58c: 0x107b58c: lui   a3, 0x1080000
-	ldc.i4 17301504
-	stloc 4
-// 0x0107b590: 0x107b590: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x0107b594: 0x107b594: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+	ldloc 8
+	ldc.i4.s -40
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107b598: 0x107b598: addiu a2, s0, 15964
-	ldloc 11
-	ldc.i4 15964
+	stloc 8
+	brfalse L_107b62c
+// --- basic block ---
+// 0x0107b624: 0x107b624: addu  s6, s5, zero
+	ldloc 9
+	stloc 8
+// 0x0107b628: 0x107b628: addiu s6, s6, -40
+	ldloc 8
+	ldc.i4.s -40
 	add
+	stloc 8
+L_107b62c:
+// 0x0107b62c: 0x107b62c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107b630: 0x107b630: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107b634: 0x107b634: subu  a2, s6, s0
+	ldloc 8
+	ldloc 11
+	sub
 	stloc.3
-// 0x0107b59c: 0x107b59c: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107b5a0: 0x107b5a0: addiu a3, a3, -18844
-	ldloc 4
-	ldc.i4 -18844
+// 0x0107b638: 0x107b638: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
-	stloc 4
-// 0x0107b5a4: 0x107b5a4: addiu a1, zero, -2
-	ldc.i4.s -2
 	stloc.2
-// 0x0107b5a8: 0x107b5a8: sw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
+// 0x0107b63c: 0x107b63c: addiu a0, a0, -25280
+	ldloc.1
+	ldc.i4 -25280
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107b5ac: 0x107b5ac: sw    zero, 16(sp)
-	ldloc 6
+	stloc.1
+// 0x0107b640: 0x107b640: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x0107b644: 0x107b644: jal   0x1094048 sw    zero, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
@@ -5856,1195 +6170,1240 @@ L_107b52c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107b5b0: 0x107b5b0: jal   0x109c7f0 sw    zero, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldc.i4.s 0
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b5b8: 0x107b5b8: lw    ra, 52(sp)
-// 0x0107b5bc: 0x107b5bc: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107b5c0: 0x107b5c0: sw    v0, -16088(v1)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4022
-	add
+// 0x0107b64c: 0x107b64c: addu  a0, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0107b5c4: 0x107b5c4: lw    s3, 48(sp)
-	ldloc 6
-	ldloc.0
+	stloc.1
+// 0x0107b650: 0x107b650: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107b654: 0x107b654: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107b658: 0x107b658: jal   0x1099628 addu  s0, v0, zero
+	ldloc 5
+	stloc 11
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107b660: 0x107b660: lw    v0, 4(s1)
+	ldloc 7
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 13
-// 0x0107b5c8: 0x107b5c8: addu  v0, zero, zero
-	ldc.i4.s 0
 	stloc 5
-// 0x0107b5cc: 0x107b5cc: lw    s2, 44(sp)
-	ldloc 6
-	ldloc.0
+// 0x0107b664: 0x107b664: addiu v1, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107b5d0: 0x107b5d0: lw    s1, 40(sp)
+	stloc 6
+// 0x0107b668: 0x107b668: bne   v0, v1, 0x107b68c addiu v1, zero, 1
+	ldloc 5
 	ldloc 6
+	ldc.i4.1
+	stloc 6
+	bne.un L_107b68c
+// --- basic block ---
+// 0x0107b670: 0x107b670: addiu s6, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 32
 	add
-	ldelem.i4
+	stloc 8
+// 0x0107b674: 0x107b674: jal   0x1001b48 addu  a0, s6, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b67c: 0x107b67c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107b680: 0x107b680: addu  s5, v0, zero
+	ldloc 5
 	stloc 9
-// 0x0107b5d4: 0x107b5d4: lw    s0, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107b5d8: 0x107b5d8: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+// 0x0107b684: 0x107b684: j	 0x107b73c addiu a0, a0, -19640
+	ldloc.1
+	ldc.i4 -19640
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc.1
+	br L_107b73c
+// --- basic block ---
+L_107b68c:
+// 0x0107b68c: 0x107b68c: bne   v0, v1, 0x107b6b0 addiu v1, zero, 3
 	ldloc 5
-	ret
-}
-.method public static int32 report_abuse_107b5e0(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
+	ldloc 6
+	ldc.i4.3
 	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
+	bne.un L_107b6b0
+// --- basic block ---
+// 0x0107b694: 0x107b694: addiu s6, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
 	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+// 0x0107b698: 0x107b698: jal   0x1001b48 addu  a0, s6, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107b5e0: 0x107b5e0: lui   a0, 0x20000
+// 0x0107b6a0: 0x107b6a0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107b5e4: 0x107b5e4: addiu sp, sp, -56
+// 0x0107b6a4: 0x107b6a4: addu  s5, v0, zero
+	ldloc 5
+	stloc 9
+// 0x0107b6a8: 0x107b6a8: j	 0x107b73c addiu a0, a0, -26580
+	ldloc.1
+	ldc.i4 -26580
+	add
+	stloc.1
+	br L_107b73c
+// --- basic block ---
+L_107b6b0:
+// 0x0107b6b0: 0x107b6b0: bne   v0, v1, 0x107b6d4 addiu v1, zero, 5
+	ldloc 5
+	ldloc 6
+	ldc.i4.5
+	stloc 6
+	bne.un L_107b6d4
+// --- basic block ---
+// 0x0107b6b8: 0x107b6b8: addiu s6, sp, 32
 	ldloc.0
-	ldc.i4.s -56
+	ldc.i4.s 32
 	add
-	stloc.0
-// 0x0107b5e8: 0x107b5e8: addiu a0, a0, -25696
+	stloc 8
+// 0x0107b6bc: 0x107b6bc: jal   0x1001b48 addu  a0, s6, zero
+	ldloc 8
+	stloc.1
 	ldloc.1
-	ldc.i4 -25696
-	add
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b6c4: 0x107b6c4: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107b5ec: 0x107b5ec: sw    ra, 52(sp)
-// 0x0107b5f0: 0x107b5f0: sw    s1, 48(sp)
+// 0x0107b6c8: 0x107b6c8: addu  s5, v0, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+	stloc 9
+// 0x0107b6cc: 0x107b6cc: j	 0x107b73c addiu a0, a0, -19588
+	ldloc.1
+	ldc.i4 -19588
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107b5f4: 0x107b5f4: jal   0x101cd60 sw    s0, 44(sp)
+	stloc.1
+	br L_107b73c
+// --- basic block ---
+L_107b6d4:
+// 0x0107b6d4: 0x107b6d4: bne   v0, v1, 0x107b6f8 addiu v1, zero, 8
 	ldloc 5
+	ldloc 6
+	ldc.i4.8
+	stloc 6
+	bne.un L_107b6f8
+// --- basic block ---
+// 0x0107b6dc: 0x107b6dc: addiu s6, sp, 32
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 32
 	add
+	stloc 8
+// 0x0107b6e0: 0x107b6e0: jal   0x1001b48 addu  a0, s6, zero
 	ldloc 8
-	stelem.i4
-	ldloc.0
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b5fc: 0x107b5fc: lui   a0, 0x20000
-	ldc.i4 131072
+// 0x0107b6e8: 0x107b6e8: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107b600: 0x107b600: addiu a0, a0, -25680
+// 0x0107b6ec: 0x107b6ec: addu  s5, v0, zero
+	ldloc 5
+	stloc 9
+// 0x0107b6f0: 0x107b6f0: j	 0x107b73c addiu a0, a0, -19536
 	ldloc.1
-	ldc.i4 -25680
+	ldc.i4 -19536
 	add
 	stloc.1
-// 0x0107b604: 0x107b604: jal   0x101cd60 addu  s1, v0, zero
+	br L_107b73c
+// --- basic block ---
+L_107b6f8:
+// 0x0107b6f8: 0x107b6f8: bne   v0, v1, 0x107b71c addiu v1, zero, 6
+	ldloc 5
 	ldloc 6
-	stloc 9
+	ldc.i4.6
+	stloc 6
+	bne.un L_107b71c
+// --- basic block ---
+// 0x0107b700: 0x107b700: addiu s6, sp, 32
 	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 8
+// 0x0107b704: 0x107b704: jal   0x1001b48 addu  a0, s6, zero
+	ldloc 8
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b60c: 0x107b60c: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x0107b70c: 0x107b70c: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x0107b610: 0x107b610: addiu a0, a0, -23936
+// 0x0107b710: 0x107b710: addu  s5, v0, zero
+	ldloc 5
+	stloc 9
+// 0x0107b714: 0x107b714: j	 0x107b73c addiu a0, a0, -26496
 	ldloc.1
-	ldc.i4 -23936
+	ldc.i4 -26496
 	add
 	stloc.1
-// 0x0107b614: 0x107b614: jal   0x101cd60 sw    v0, 32(sp)
+	br L_107b73c
+// --- basic block ---
+L_107b71c:
+// 0x0107b71c: 0x107b71c: bne   v0, v1, 0x107b760 sll   zero, zero, 0
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
 	ldloc 6
-	stelem.i4
+	bne.un L_107b760
+// --- basic block ---
+// 0x0107b724: 0x107b724: addiu s6, sp, 32
 	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 8
+// 0x0107b728: 0x107b728: jal   0x1001b48 addu  a0, s6, zero
+	ldloc 8
+	stloc.1
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b61c: 0x107b61c: lui   a0, 0x10000
+// 0x0107b730: 0x107b730: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107b620: 0x107b620: addiu a0, a0, -25292
+// 0x0107b734: 0x107b734: addu  s5, v0, zero
+	ldloc 5
+	stloc 9
+// 0x0107b738: 0x107b738: addiu a0, a0, -19488
 	ldloc.1
-	ldc.i4 -25292
+	ldc.i4 -19488
 	add
 	stloc.1
-// 0x0107b624: 0x107b624: jal   0x101cd60 addu  s0, v0, zero
-	ldloc 6
-	stloc 8
+L_107b73c:
+// 0x0107b73c: 0x107b73c: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b62c: 0x107b62c: lw    a1, 32(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
+// 0x0107b744: 0x107b744: addiu a1, zero, 700
+	ldc.i4 700
 	stloc.2
-// 0x0107b630: 0x107b630: lui   a3, 0x1080000
-	ldc.i4 17301504
-	stloc 4
-// 0x0107b634: 0x107b634: addu  a0, s1, zero
+// 0x0107b748: 0x107b748: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107b74c: 0x107b74c: subu  a1, a1, s5
+	ldloc.2
+	ldloc 9
+	sub
+	stloc.2
+// 0x0107b750: 0x107b750: addu  a0, s6, s5
+	ldloc 8
 	ldloc 9
+	add
 	stloc.1
-// 0x0107b638: 0x107b638: addiu a3, a3, -18636
-	ldloc 4
-	ldc.i4 -18636
+// 0x0107b754: 0x107b754: addiu a2, a2, -32460
+	ldloc.3
+	ldc.i4 -32460
 	add
-	stloc 4
-// 0x0107b63c: 0x107b63c: addu  a2, zero, zero
-	ldc.i4.s 0
 	stloc.3
-// 0x0107b640: 0x107b640: sw    s0, 20(sp)
+// 0x0107b758: 0x107b758: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 5
+	stloc 4
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_107b760:
+// 0x0107b760: 0x107b760: lw    a1, 0(s1)
+	ldloc 7
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldelem.i4
+	stloc.2
+// 0x0107b764: 0x107b764: lw    v1, 0(s2)
+	ldloc 7
+	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 6
+// 0x0107b768: 0x107b768: addiu s5, sp, 32
+	ldloc.0
+	ldc.i4.s 32
 	add
-	ldloc 8
-	stelem.i4
-// 0x0107b644: 0x107b644: sw    v0, 24(sp)
+	stloc 9
+// 0x0107b76c: 0x107b76c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107b770: 0x107b770: addu  a0, s5, zero
+	ldloc 9
+	stloc.1
+// 0x0107b774: 0x107b774: sw    a1, -13540(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 -3385
 	add
-	ldloc 6
+	ldloc.2
 	stelem.i4
-// 0x0107b648: 0x107b648: jal   0x104c2a4 sw    zero, 16(sp)
+// 0x0107b778: 0x107b778: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107b77c: 0x107b77c: jal   0x1001b48 sw    v1, -13536(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 -3384
 	add
-	ldc.i4.s 0
+	ldloc 6
 	stelem.i4
-	ldloc.0
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_104c2a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strlen_1001b48(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b650: 0x107b650: lw    ra, 52(sp)
-// 0x0107b654: 0x107b654: lw    s1, 48(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+// 0x0107b784: 0x107b784: addiu a1, zero, 700
+	ldc.i4 700
+	stloc.2
+// 0x0107b788: 0x107b788: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107b78c: 0x107b78c: addiu a3, s1, 557
+	ldloc 10
+	ldc.i4 557
 	add
-	ldelem.i4
-	stloc 9
-// 0x0107b658: 0x107b658: lw    s0, 44(sp)
+	stloc 4
+// 0x0107b790: 0x107b790: addu  a0, s5, v0
+	ldloc 9
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
 	add
-	ldelem.i4
-	stloc 8
-// 0x0107b65c: 0x107b65c: jr    ra addiu sp, sp, 56
-	ldloc.0
-	ldc.i4.s 56
+	stloc.1
+// 0x0107b794: 0x107b794: subu  a1, a1, v0
+	ldloc.2
+	ldloc 5
+	sub
+	stloc.2
+// 0x0107b798: 0x107b798: jal   0x1000f9c addiu a2, a2, 20332
+	ldloc.3
+	ldc.i4 20332
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 on_option_selected_107b664(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  8 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107b664: 0x107b664: addiu sp, sp, -24
+	stloc.3
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107b668: 0x107b668: lui   v0, 0x80000
-	ldc.i4 524288
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x0107b66c: 0x107b66c: sw    ra, 20(sp)
-// 0x0107b670: 0x107b670: beq   a0, zero, 0x107b704 sw    zero, -16088(v0)
-	ldloc.1
+// --- basic block ---
+// 0x0107b7a0: 0x107b7a0: lw    a1, 4(s1)
 	ldloc 7
-	ldloc 5
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4022
+	ldc.i4.1
 	add
+	ldelem.i4
+	stloc.2
+// 0x0107b7a4: 0x107b7a4: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x0107b7a8: 0x107b7a8: jal   0x1077acc addu  a2, zero, zero
 	ldc.i4.s 0
-	stelem.i4
-	brfalse L_107b704
+	stloc.3
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl89::RTAlerts_Get_IconByType_1077acc(int32,int32)
+	stloc 5
 // --- basic block ---
-// 0x0107b678: 0x107b678: lw    v0, 20(a1)
-	ldloc 7
+// 0x0107b7b0: 0x107b7b0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107b7b4: 0x107b7b4: addiu a0, a0, -25264
+	ldloc.1
+	ldc.i4 -25264
+	add
+	stloc.1
+// 0x0107b7b8: 0x107b7b8: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107b7bc: 0x107b7bc: jal   0x109e784 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
 	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b7c4: 0x107b7c4: lw    a0, 0(s1)
+	ldloc 7
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
-	add
 	ldelem.i4
-	stloc 5
-// 0x0107b67c: 0x107b67c: sll   zero, zero, 0
-// 0x0107b680: 0x107b680: sltiu v1, v0, 5
+	stloc.1
+// 0x0107b7c8: 0x107b7c8: jal   0x1077d48 addu  s6, v0, zero
 	ldloc 5
-	ldc.i4.5
-	clt.un
-	stloc 6
-// 0x0107b684: 0x107b684: beq   v1, zero, 0x107b704 lui   v1, 0x20000
-	ldloc 6
-	ldc.i4 131072
+	stloc 8
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl90::RTAlerts_Get_Number_Of_AddOns_1077d48(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	brfalse L_107b704
-// --- basic block ---
-// 0x0107b68c: 0x107b68c: sll   v0, v0, 2
-	ldloc 5
-	ldc.i4.2
-	shl
 	stloc 5
-// 0x0107b690: 0x107b690: addiu v1, v1, 28868
-	ldloc 6
-	ldc.i4 28868
-	add
-	stloc 6
-// 0x0107b694: 0x107b694: addu  v0, v1, v0
-	ldloc 6
+// --- basic block ---
+// 0x0107b7d0: 0x107b7d0: addu  s5, zero, zero
+	ldc.i4.s 0
+	stloc 9
+// 0x0107b7d4: 0x107b7d4: j	 0x107b7fc addu  s7, v0, zero
 	ldloc 5
-	add
-	stloc 5
-// 0x0107b698: 0x107b698: lw    v0, 0(v0)
+	stloc 15
+	br L_107b7fc
+// --- basic block ---
+L_107b7dc:
+// 0x0107b7dc: 0x107b7dc: lw    a0, 0(s1)
 	ldloc 7
-	ldloc 5
+	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
+	stloc.1
+// 0x0107b7e0: 0x107b7e0: jal   0x1077ddc addiu s5, s5, 1
+	ldloc 9
+	ldc.i4.1
+	add
+	stloc 9
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl90::RTAlerts_Get_AddOn_1077ddc(int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x0107b69c: 0x107b69c: sll   zero, zero, 0
-// 0x0107b6a0: 0x107b6a0: jr    v0 sll   zero, zero, 0
+// --- basic block ---
+// 0x0107b7e8: 0x107b7e8: addu  a1, v0, zero
 	ldloc 5
-	br __CIBYL_local_jumptab
+	stloc.2
+// 0x0107b7ec: 0x107b7ec: beq   v0, zero, 0x107b7fc addu  a0, s6, zero
+	ldloc 5
+	ldloc 8
+	stloc.1
+	brfalse L_107b7fc
 // --- basic block ---
-L_107b6a8:
-// 0x0107b6a8: 0x107b6a8: jal   0x1078d94 sll   zero, zero, 0
+// 0x0107b7f4: 0x107b7f4: jal   0x109e434 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::real_time_post_alert_comment_1078d94(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_add_overlay_109e434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b6b0: 0x107b6b0: j	 0x107b704 sll   zero, zero, 0
-	br L_107b704
-// --- basic block ---
-L_107b6b8:
-// 0x0107b6b8: 0x107b6b8: lui   v0, 0x80000
-	ldc.i4 524288
+L_107b7fc:
+// 0x0107b7fc: 0x107b7fc: slt   v0, s5, s7
+	ldloc 9
+	ldloc 15
+	clt
 	stloc 5
-// 0x0107b6bc: 0x107b6bc: lw    a0, -14004(v0)
-	ldloc 7
+// 0x0107b800: 0x107b800: bne   v0, zero, 0x107b7dc addu  a1, s5, zero
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3501
+	ldloc 9
+	stloc.2
+	brtrue L_107b7dc
+// --- basic block ---
+// 0x0107b808: 0x107b808: addu  a1, s6, zero
+	ldloc 8
+	stloc.2
+// 0x0107b80c: 0x107b80c: addu  a0, s4, zero
+	ldloc 12
+	stloc.1
+// 0x0107b810: 0x107b810: jal   0x109950c addiu s1, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc 10
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b818: 0x107b818: addu  a0, s3, zero
+	ldloc 14
+	stloc.1
+// 0x0107b81c: 0x107b81c: addu  a1, s4, zero
+	ldloc 12
+	stloc.2
+// 0x0107b820: 0x107b820: jal   0x109950c lui   s4, 0x20000
+	ldc.i4 131072
+	stloc 12
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b828: 0x107b828: addiu a3, zero, 8
+	ldc.i4.8
+	stloc 4
+// 0x0107b82c: 0x107b82c: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x0107b830: 0x107b830: addiu a0, s4, -25252
+	ldloc 12
+	ldc.i4 -25252
 	add
-	ldelem.i4
 	stloc.1
-// 0x0107b6c0: 0x107b6c0: jal   0x10847d8 sll   zero, zero, 0
+// 0x0107b834: 0x107b834: jal   0x1099358 addiu a2, zero, 14
+	ldc.i4.s 14
+	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeAlertCommentsList_10847d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b6c8: 0x107b6c8: j	 0x107b704 sll   zero, zero, 0
-	br L_107b704
-// --- basic block ---
-L_107b6d0:
-// 0x0107b6d0: 0x107b6d0: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107b6d4: 0x107b6d4: lw    a0, -14004(v0)
+// 0x0107b83c: 0x107b83c: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107b840: 0x107b840: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107b844: 0x107b844: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107b848: 0x107b848: addiu a1, a1, 23000
+	ldloc.2
+	ldc.i4 23000
+	add
+	stloc.2
+// 0x0107b84c: 0x107b84c: jal   0x1099628 sw    v0, 736(sp)
 	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 184
+	add
 	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107b854: 0x107b854: lw    v0, 736(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 184
 	add
 	ldelem.i4
+	stloc 5
+// 0x0107b858: 0x107b858: addu  a0, s0, zero
+	ldloc 11
 	stloc.1
-// 0x0107b6d8: 0x107b6d8: jal   0x1079c10 sll   zero, zero, 0
-	ldloc.0
+// 0x0107b85c: 0x107b85c: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl91::RTAlerts_Download_Image_1079c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b6e0: 0x107b6e0: j	 0x107b704 sll   zero, zero, 0
-	br L_107b704
+// 0x0107b864: 0x107b864: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x0107b868: 0x107b868: jal   0x1001b48 sb    zero, 32(sp)
+	ldloc.0
+	ldc.i4.s 32
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_107b6e8:
-// 0x0107b6e8: 0x107b6e8: jal   0x107b5e0 sll   zero, zero, 0
+// 0x0107b870: 0x107b870: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107b874: 0x107b874: addiu a0, a0, -13688
+	ldloc.1
+	ldc.i4 -13688
+	add
+	stloc.1
+// 0x0107b878: 0x107b878: jal   0x101cd70 addu  s5, v0, zero
+	ldloc 5
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::report_abuse_107b5e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b6f0: 0x107b6f0: j	 0x107b704 sll   zero, zero, 0
-	br L_107b704
-// --- basic block ---
-L_107b6f8:
-// 0x0107b6f8: 0x107b6f8: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107b6fc: 0x107b6fc: jal   0x102146c sw    zero, -16088(v0)
+// 0x0107b880: 0x107b880: addiu a0, s2, 16
+	ldloc 13
+	ldc.i4.s 16
+	add
+	stloc.1
+// 0x0107b884: 0x107b884: addiu s6, zero, 700
+	ldc.i4 700
+	stloc 8
+// 0x0107b888: 0x107b888: jal   0x101cd70 sw    v0, 736(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4022
+	ldc.i4 184
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107b704:
-// 0x0107b704: 0x107b704: lw    ra, 20(sp)
-// 0x0107b708: 0x107b708: sll   zero, zero, 0
-// 0x0107b70c: 0x107b70c: jr    ra addiu sp, sp, 24
+// 0x0107b890: 0x107b890: lw    a3, 736(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4 184
 	add
-	stloc.0
-	br __CIBYL_function_return
-	br __CIBYL_function_return
-__CIBYL_local_jumptab:
-	stloc 5
-	ldloc 5
-	ldc.i4 17282728
-	beq  L_107b6a8
-	ldloc 5
-	ldc.i4 17282744
-	beq  L_107b6b8
-	ldloc 5
-	ldc.i4 17282768
-	beq  L_107b6d0
-	ldloc 5
-	ldc.i4 17282792
-	beq  L_107b6e8
-	ldloc 5
-	ldc.i4 17282808
-	beq  L_107b6f8
-		br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 on_report_abuse_107b714(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
-
-// local  6 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	ldelem.i4
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107b714: 0x107b714: addiu sp, sp, -24
+// 0x0107b894: 0x107b894: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107b898: 0x107b898: subu  a1, s6, s5
+	ldloc 8
+	ldloc 9
+	sub
+	stloc.2
+// 0x0107b89c: 0x107b89c: addu  a0, s1, s5
+	ldloc 10
+	ldloc 9
+	add
+	stloc.1
+// 0x0107b8a0: 0x107b8a0: addiu a2, a2, -6424
+	ldloc.3
+	ldc.i4 -6424
+	add
+	stloc.3
+// 0x0107b8a4: 0x107b8a4: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.0
-// 0x0107b718: 0x107b718: sw    ra, 20(sp)
-// 0x0107b71c: 0x107b71c: jal   0x107b5e0 sll   zero, zero, 0
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::report_abuse_107b5e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 6
-// --- basic block ---
-// 0x0107b724: 0x107b724: lw    ra, 20(sp)
-// 0x0107b728: 0x107b728: addu  v0, zero, zero
-	ldc.i4.s 0
 	stloc 6
-// 0x0107b72c: 0x107b72c: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 report_abuse_confirm_dlg_callback_107b734(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
-
-// local  5 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  7 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
 	stloc 5
+// --- basic block ---
+// 0x0107b8ac: 0x107b8ac: ori   a3, zero, 32776
 	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	ldc.i4 32776
+	or
 	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 7
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107b734: 0x107b734: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
+// 0x0107b8b0: 0x107b8b0: addiu a2, zero, 14
+	ldc.i4.s 14
+	stloc.3
+// 0x0107b8b4: 0x107b8b4: addiu a0, s4, -25252
+	ldloc 12
+	ldc.i4 -25252
 	add
-	stloc.0
-// 0x0107b738: 0x107b738: addiu v0, zero, 3
-	ldc.i4.3
-	stloc 5
-// 0x0107b73c: 0x107b73c: bne   a0, v0, 0x107b764 sw    ra, 20(sp)
-	ldloc.1
-	ldloc 5
-	bne.un L_107b764
-// --- basic block ---
-// 0x0107b744: 0x107b744: jal   0x1094b64 addu  a0, zero, zero
-	ldc.i4.s 0
 	stloc.1
+// 0x0107b8b8: 0x107b8b8: jal   0x1099358 addu  a1, s1, zero
+	ldloc 10
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107b74c: 0x107b74c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107b750: 0x107b750: lw    a0, -14004(v0)
-	ldloc 6
+// 0x0107b8c0: 0x107b8c0: addu  a1, v0, zero
 	ldloc 5
+	stloc.2
+// 0x0107b8c4: 0x107b8c4: addu  a0, s0, zero
+	ldloc 11
+	stloc.1
+// 0x0107b8c8: 0x107b8c8: jal   0x109950c sw    v0, 736(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 184
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107b754: 0x107b754: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107b758: 0x107b758: lw    a1, -14000(v0)
-	ldloc 6
 	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b8d0: 0x107b8d0: lw    v0, 736(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3500
+	ldc.i4 184
 	add
 	ldelem.i4
+	stloc 5
+// 0x0107b8d4: 0x107b8d4: lui   s5, 0x0
+	ldc.i4.s 0
+	stloc 9
+// 0x0107b8d8: 0x107b8d8: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107b8dc: 0x107b8dc: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107b8e0: 0x107b8e0: jal   0x1099628 addiu a1, s5, 23008
+	ldloc 9
+	ldc.i4 23008
+	add
+	stloc.2
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107b8e8: 0x107b8e8: addu  a1, s2, zero
+	ldloc 13
 	stloc.2
-// 0x0107b75c: 0x107b75c: jal   0x106b428 sll   zero, zero, 0
+// 0x0107b8ec: 0x107b8ec: jal   0x1078988 addu  a0, s0, zero
+	ldloc 11
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_ReportAbuse_106b428(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_add_comment_stars_1078988(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_107b764:
-// 0x0107b764: 0x107b764: lw    ra, 20(sp)
-// 0x0107b768: 0x107b768: sll   zero, zero, 0
-// 0x0107b76c: 0x107b76c: jr    ra addiu sp, sp, 24
+// 0x0107b8f4: 0x107b8f4: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x0107b8f8: 0x107b8f8: jal   0x1001b48 sb    zero, 32(sp)
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.s 32
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_RefreshOnMap_107b774(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 s3,int32 s4,int32 ra)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local 10 is register s2
-// local 13 is register s3
-// local 14 is register s4
-// local 11 is register s5
-// local 12 is register s6
-// local  0 is register sp
-// local 15 is register ra
-// local  5 is register mem
-
 	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 15
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
-__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107b774: 0x107b774: addiu sp, sp, -176
-	ldloc.0
-	ldc.i4 -176
+// 0x0107b900: 0x107b900: subu  a1, s6, v0
+	ldloc 8
+	ldloc 5
+	sub
+	stloc.2
+// 0x0107b904: 0x107b904: addu  a0, s1, v0
+	ldloc 10
+	ldloc 5
 	add
-	stloc.0
-// 0x0107b778: 0x107b778: sw    s1, 148(sp)
+	stloc.1
+// 0x0107b908: 0x107b908: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107b90c: 0x107b90c: lui   v0, 0x10000
+	ldc.i4 65536
+	stloc 5
+// 0x0107b910: 0x107b910: addiu a3, s2, 117
+	ldloc 13
+	ldc.i4.s 117
+	add
+	stloc 4
+// 0x0107b914: 0x107b914: addiu a2, a2, 22052
+	ldloc.3
+	ldc.i4 22052
+	add
+	stloc.3
+// 0x0107b918: 0x107b918: addiu v0, v0, 18632
 	ldloc 5
+	ldc.i4 18632
+	add
+	stloc 5
+// 0x0107b91c: 0x107b91c: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 37
+	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107b77c: 0x107b77c: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x0107b780: 0x107b780: sw    s5, 164(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b924: 0x107b924: jal   0x1078c38 addiu a0, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.s 41
-	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl90::space_1078c38(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b92c: 0x107b92c: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107b930: 0x107b930: jal   0x109950c addu  a0, s0, zero
 	ldloc 11
-	stelem.i4
-// 0x0107b784: 0x107b784: addiu s1, s1, -16028
-	ldloc 9
-	ldc.i4 -16028
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b938: 0x107b938: addiu a3, zero, 4
+	ldc.i4.4
+	stloc 4
+// 0x0107b93c: 0x107b93c: addiu a0, s4, -25252
+	ldloc 12
+	ldc.i4 -25252
 	add
-	stloc 9
-// 0x0107b788: 0x107b788: lui   s5, 0x20000
-	ldc.i4 131072
-	stloc 11
-// 0x0107b78c: 0x107b78c: sw    s4, 160(sp)
+	stloc.1
+// 0x0107b940: 0x107b940: addu  a1, s1, zero
+	ldloc 10
+	stloc.2
+// 0x0107b944: 0x107b944: jal   0x1099358 addiu a2, zero, 16
+	ldc.i4.s 16
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b94c: 0x107b94c: addu  a1, v0, zero
 	ldloc 5
+	stloc.2
+// 0x0107b950: 0x107b950: addu  a0, s0, zero
+	ldloc 11
+	stloc.1
+// 0x0107b954: 0x107b954: jal   0x109950c sw    v0, 736(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4 184
 	add
-	ldloc 14
-	stelem.i4
-// 0x0107b790: 0x107b790: sw    s3, 156(sp)
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 39
-	add
-	ldloc 13
 	stelem.i4
-// 0x0107b794: 0x107b794: sw    s2, 152(sp)
-	ldloc 5
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b95c: 0x107b95c: lw    v0, 736(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 184
 	add
-	ldloc 10
-	stelem.i4
-// 0x0107b798: 0x107b798: sw    ra, 172(sp)
-// 0x0107b79c: 0x107b79c: sw    s6, 168(sp)
+	ldelem.i4
+	stloc 5
+// 0x0107b960: 0x107b960: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107b964: 0x107b964: addu  a0, v0, zero
 	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 42
+	stloc.1
+// 0x0107b968: 0x107b968: jal   0x1099628 addiu a1, s5, 23008
+	ldloc 9
+	ldc.i4 23008
 	add
-	ldloc 12
-	stelem.i4
-// 0x0107b7a0: 0x107b7a0: sw    s0, 144(sp)
-	ldloc 5
-	ldloc.0
+	stloc.2
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107b970: 0x107b970: addu  a0, s3, zero
+	ldloc 14
+	stloc.1
+// 0x0107b974: 0x107b974: jal   0x109950c addu  a1, s0, zero
+	ldloc 11
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107b97c: 0x107b97c: lw    s0, 4(s3)
+	ldloc 7
+	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 36
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107b7a4: 0x107b7a4: addiu s5, s5, -25892
-	ldloc 11
-	ldc.i4 -25892
+	ldc.i4.1
 	add
+	ldelem.i4
 	stloc 11
-// 0x0107b7a8: 0x107b7a8: addu  s2, zero, zero
-	ldc.i4.s 0
+// 0x0107b980: 0x107b980: lui   s1, 0x1080000
+	ldc.i4 17301504
 	stloc 10
-// 0x0107b7ac: 0x107b7ac: addu  s4, s1, zero
-	ldloc 9
-	stloc 14
-// 0x0107b7b0: 0x107b7b0: j	 0x107b854 addiu s3, sp, 16
-	ldloc.0
-	ldc.i4.s 16
+// 0x0107b984: 0x107b984: addiu a1, s1, -17888
+	ldloc 10
+	ldc.i4 -17888
 	add
-	stloc 13
-	br L_107b854
+	stloc.2
+// 0x0107b988: 0x107b988: jal   0x10997bc addu  a0, s0, zero
+	ldloc 11
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-L_107b7b8:
-// 0x0107b7b8: 0x107b7b8: lw    s0, 0(s1)
-	ldloc 5
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 8
-// 0x0107b7bc: 0x107b7bc: sll   zero, zero, 0
-// 0x0107b7c0: 0x107b7c0: lw    a3, 0(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107b7c4: 0x107b7c4: jal   0x1000f9c sll   zero, zero, 0
+// 0x0107b990: 0x107b990: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107b994: 0x107b994: jal   0x101cd70 addiu a0, a0, -6192
+	ldloc.1
+	ldc.i4 -6192
+	add
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b7cc: 0x107b7cc: jal   0x101ca0c addu  a0, s3, zero
-	ldloc 13
+// 0x0107b99c: 0x107b99c: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107b9a0: 0x107b9a0: jal   0x109ba7c addu  a0, s0, zero
+	ldloc 11
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_string_new_101ca0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b7d4: 0x107b7d4: lw    a0, 4(s0)
-	ldloc 5
-	ldloc 8
+// 0x0107b9a8: 0x107b9a8: lw    a1, 16(s0)
+	ldloc 7
+	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.4
 	add
 	ldelem.i4
+	stloc.2
+// 0x0107b9ac: 0x107b9ac: jal   0x109cc34 addiu a0, s1, -17888
+	ldloc 10
+	ldc.i4 -17888
+	add
 	stloc.1
-// 0x0107b7d8: 0x107b7d8: jal   0x10a6d54 addu  s6, v0, zero
-	ldloc 6
-	stloc 12
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b7e0: 0x107b7e0: beq   v0, zero, 0x107b818 addu  a0, s6, zero
-	ldloc 6
-	ldloc 12
+// 0x0107b9b4: 0x107b9b4: lui   a1, 0x1080000
+	ldc.i4 17301504
+	stloc.2
+// 0x0107b9b8: 0x107b9b8: addu  a0, s0, zero
+	ldloc 11
 	stloc.1
-	brfalse L_107b818
-// --- basic block ---
-// 0x0107b7e8: 0x107b7e8: jal   0x101bcc8 sll   zero, zero, 0
+// 0x0107b9bc: 0x107b9bc: jal   0x10997c4 addiu a1, a1, -27488
+	ldloc.2
+	ldc.i4 -27488
+	add
+	stloc.2
 	ldloc.1
-	call int32 Cibyl20::roadmap_object_exists_101bcc8(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0107b7f0: 0x107b7f0: bne   v0, zero, 0x107b818 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_107b818
+	ldloc.2
+	call void Cibyl114::ssd_widget_set_right_softkey_callback_10997c4(int32,int32)
 // --- basic block ---
-// 0x0107b7f8: 0x107b7f8: lw    v0, 1836(s0)
-	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 459
+// 0x0107b9c4: 0x107b9c4: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107b9c8: 0x107b9c8: jal   0x101cd70 addiu a0, a0, -25240
+	ldloc.1
+	ldc.i4 -25240
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107b7fc: 0x107b7fc: sll   zero, zero, 0
-// 0x0107b800: 0x107b800: bne   v0, zero, 0x107b818 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_107b818
-// --- basic block ---
-// 0x0107b808: 0x107b808: jal   0x107ab74 addu  a0, s0, zero
-	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::CreateAlertObject_107ab74(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b810: 0x107b810: j	 0x107b844 sll   zero, zero, 0
-	br L_107b844
-// --- basic block ---
-L_107b818:
-// 0x0107b818: 0x107b818: lw    a0, 4(s0)
+// 0x0107b9d0: 0x107b9d0: addu  a1, v0, zero
 	ldloc 5
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
+	stloc.2
+// 0x0107b9d4: 0x107b9d4: jal   0x109bb54 addu  a0, s0, zero
+	ldloc 11
 	stloc.1
-// 0x0107b81c: 0x107b81c: jal   0x10a6d54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b824: 0x107b824: bne   v0, zero, 0x107b844 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_107b844
-// --- basic block ---
-// 0x0107b82c: 0x107b82c: jal   0x101bcc8 addu  a0, s6, zero
-	ldloc 12
+// 0x0107b9dc: 0x107b9dc: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
+// 0x0107b9e0: 0x107b9e0: addiu a0, a0, -26300
 	ldloc.1
-	call int32 Cibyl20::roadmap_object_exists_101bcc8(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 6
-// --- basic block ---
-// 0x0107b834: 0x107b834: beq   v0, zero, 0x107b844 sll   zero, zero, 0
-	ldloc 6
-	brfalse L_107b844
-// --- basic block ---
-// 0x0107b83c: 0x107b83c: jal   0x107a570 addu  a0, s0, zero
-	ldloc 8
+	ldc.i4 -26300
+	add
 	stloc.1
+// 0x0107b9e4: 0x107b9e4: jal   0x1096534 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::DeleteAlertObject_107a570(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-L_107b844:
-// 0x0107b844: 0x107b844: jal   0x101c8f8 addu  a0, s6, zero
-	ldloc 12
-	stloc.1
+// 0x0107b9ec: 0x107b9ec: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl20::roadmap_string_release_101c8f8(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107b84c: 0x107b84c: addiu s2, s2, 1
-	ldloc 10
-	ldc.i4.1
-	add
-	stloc 10
-// 0x0107b850: 0x107b850: addiu s1, s1, 4
-	ldloc 9
-	ldc.i4.4
-	add
-	stloc 9
-L_107b854:
-// 0x0107b854: 0x107b854: lw    v0, 2000(s4)
-	ldloc 5
-	ldloc 14
+// 0x0107b9f4: 0x107b9f4: lw    ra, 780(sp)
+// 0x0107b9f8: 0x107b9f8: lw    s7, 776(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4 194
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107b858: 0x107b858: addiu a1, zero, 128
-	ldc.i4 128
-	stloc.2
-// 0x0107b85c: 0x107b85c: slt   v0, s2, v0
-	ldloc 10
-	ldloc 6
-	clt
-	stloc 6
-// 0x0107b860: 0x107b860: addu  a2, s5, zero
-	ldloc 11
-	stloc.3
-// 0x0107b864: 0x107b864: bne   v0, zero, 0x107b7b8 addu  a0, s3, zero
-	ldloc 6
-	ldloc 13
-	stloc.1
-	brtrue L_107b7b8
-// --- basic block ---
-// 0x0107b86c: 0x107b86c: lw    ra, 172(sp)
-// 0x0107b870: 0x107b870: lw    s6, 168(sp)
-	ldloc 5
+	stloc 15
+// 0x0107b9fc: 0x107b9fc: lw    s6, 772(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 42
+	ldc.i4 193
 	add
 	ldelem.i4
-	stloc 12
-// 0x0107b874: 0x107b874: lw    s5, 164(sp)
-	ldloc 5
+	stloc 8
+// 0x0107ba00: 0x107ba00: lw    s5, 768(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 41
+	ldc.i4 192
 	add
 	ldelem.i4
-	stloc 11
-// 0x0107b878: 0x107b878: lw    s4, 160(sp)
-	ldloc 5
+	stloc 9
+// 0x0107ba04: 0x107ba04: lw    s4, 764(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 40
+	ldc.i4 191
 	add
 	ldelem.i4
-	stloc 14
-// 0x0107b87c: 0x107b87c: lw    s3, 156(sp)
-	ldloc 5
+	stloc 12
+// 0x0107ba08: 0x107ba08: lw    s3, 760(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 39
+	ldc.i4 190
 	add
 	ldelem.i4
-	stloc 13
-// 0x0107b880: 0x107b880: lw    s2, 152(sp)
-	ldloc 5
+	stloc 14
+// 0x0107ba0c: 0x107ba0c: lw    s2, 756(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 38
+	ldc.i4 189
 	add
 	ldelem.i4
-	stloc 10
-// 0x0107b884: 0x107b884: lw    s1, 148(sp)
-	ldloc 5
+	stloc 13
+// 0x0107ba10: 0x107ba10: lw    s1, 752(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 37
+	ldc.i4 188
 	add
 	ldelem.i4
-	stloc 9
-// 0x0107b888: 0x107b888: lw    s0, 144(sp)
-	ldloc 5
+	stloc 10
+// 0x0107ba14: 0x107ba14: lw    s0, 748(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 36
+	ldc.i4 187
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107b88c: 0x107b88c: jr    ra addiu sp, sp, 176
+	stloc 11
+// 0x0107ba18: 0x107ba18: jr    ra addiu sp, sp, 784
 	ldloc.0
-	ldc.i4 176
+	ldc.i4 784
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
 	ret
 }
 }
diff --git a/converted/Cibyl93.j b/converted/Cibyl93.j
index eb7c49a..6400ec7 100644
--- a/converted/Cibyl93.j
+++ b/converted/Cibyl93.j
@@ -41,10 +41,10 @@
     IL_0006:  ret
   } // end of method Cibyl93::.ctor
 
-.method public static int32 RTAlerts_Init_107b894(int32,int32,int32,int32,int32)
+.method public static int32 on_options_107ba20(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t0,int32 s0,int32 s1,int32 s4,int32 s2,int32 s3,int32 s5,int32 ra,int32 t1)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t0,int32 s1,int32 t1,int32 s0,int32 s2,int32 s3,int32 ra,int32 t2)
 
 // local  5 is register v0
 // local  7 is register v1
@@ -53,15 +53,14 @@
 // local  3 is register a2
 // local  4 is register a3
 // local  8 is register t0
-// local 16 is register t1
-// local  9 is register s0
-// local 10 is register s1
+// local 10 is register t1
+// local 15 is register t2
+// local 11 is register s0
+// local  9 is register s1
 // local 12 is register s2
 // local 13 is register s3
-// local 11 is register s4
-// local 14 is register s5
 // local  0 is register sp
-// local 15 is register ra
+// local 14 is register ra
 // local  6 is register mem
 
 	ldc.i4.s 0
@@ -79,379 +78,384 @@
 	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
-	stloc 16
+	stloc 10
 	ldc.i4.s 0
-	stloc 9
+	stloc 15
 	ldc.i4.s 0
-	stloc 10
+	stloc 11
+	ldc.i4.s 0
+	stloc 9
 	ldc.i4.s 0
 	stloc 12
 	ldc.i4.s 0
 	stloc 13
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 14
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 15
+	stloc 14
 	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107b894: 0x107b894: addiu sp, sp, -48
+// 0x0107ba20: 0x107ba20: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107ba24: 0x107ba24: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4.s -48
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0107b898: 0x107b898: sw    s0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+// 0x0107ba28: 0x107ba28: addiu v0, v0, -15564
+	ldloc 5
+	ldc.i4 -15564
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107b89c: 0x107b89c: lui   s0, 0x80000
+	stloc 5
+// 0x0107ba2c: 0x107ba2c: lui   v1, 0x80000
 	ldc.i4 524288
-	stloc 9
-// 0x0107b8a0: 0x107b8a0: lw    v0, -16036(s0)
+	stloc 7
+// 0x0107ba30: 0x107ba30: lw    a0, -13540(v1)
 	ldloc 6
-	ldloc 9
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4009
+	ldc.i4 -3385
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107b8a4: 0x107b8a4: sw    ra, 44(sp)
-// 0x0107b8a8: 0x107b8a8: sw    s5, 40(sp)
+	stloc.1
+// 0x0107ba34: 0x107ba34: sw    ra, 52(sp)
+// 0x0107ba38: 0x107ba38: sw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 12
 	add
-	ldloc 14
+	ldloc 13
 	stelem.i4
-// 0x0107b8ac: 0x107b8ac: sw    s4, 36(sp)
+// 0x0107ba3c: 0x107ba3c: sw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 11
 	add
-	ldloc 11
+	ldloc 12
 	stelem.i4
-// 0x0107b8b0: 0x107b8b0: sw    s3, 32(sp)
+// 0x0107ba40: 0x107ba40: sw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 10
 	add
-	ldloc 13
+	ldloc 9
 	stelem.i4
-// 0x0107b8b4: 0x107b8b4: sw    s2, 28(sp)
+// 0x0107ba44: 0x107ba44: sw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 9
 	add
-	ldloc 12
+	ldloc 11
 	stelem.i4
-// 0x0107b8b8: 0x107b8b8: bne   v0, zero, 0x107b8d4 sw    s1, 24(sp)
-	ldloc 5
+// 0x0107ba48: 0x107ba48: lw    v1, 2000(v0)
 	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
-	add
-	ldloc 10
-	stelem.i4
-	brtrue L_107b8d4
-// --- basic block ---
-// 0x0107b8c0: 0x107b8c0: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0107b8c4: 0x107b8c4: jal   0x1033160 addiu a0, a0, 15744
-	ldloc.1
-	ldc.i4 15744
+	ldc.i4 500
 	add
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl37::roadmap_alerter_register_1033160(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldelem.i4
 	stloc 7
-	stloc 5
+// 0x0107ba4c: 0x107ba4c: addu  a2, v0, zero
+	ldloc 5
+	stloc.3
+// 0x0107ba50: 0x107ba50: addu  t0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0107ba54: 0x107ba54: j	 0x107ba74 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_107ba74
 // --- basic block ---
-// 0x0107b8cc: 0x107b8cc: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107b8d0: 0x107b8d0: sw    v0, -16036(s0)
+L_107ba5c:
+// 0x0107ba5c: 0x107ba5c: lw    a1, 0(t0)
 	ldloc 6
-	ldloc 9
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4009
-	add
-	ldloc 5
-	stelem.i4
-L_107b8d4:
-// 0x0107b8d4: 0x107b8d4: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107b8d8: 0x107b8d8: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107b8dc: 0x107b8dc: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x0107b8e0: 0x107b8e0: addiu v1, v1, -14028
-	ldloc 7
-	ldc.i4 -14028
+	ldelem.i4
+	stloc.2
+// 0x0107ba60: 0x107ba60: addiu a3, a3, 1
+	ldloc 4
+	ldc.i4.1
 	add
-	stloc 7
-L_107b8e4:
-// 0x0107b8e4: 0x107b8e4: sw    zero, 0(v0)
+	stloc 4
+// 0x0107ba64: 0x107ba64: lw    t1, 0(a1)
 	ldloc 6
-	ldloc 5
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107b8e8: 0x107b8e8: addiu v0, v0, 4
-	ldloc 5
+	ldelem.i4
+	stloc 10
+// 0x0107ba68: 0x107ba68: sll   zero, zero, 0
+// 0x0107ba6c: 0x107ba6c: beq   t1, a0, 0x107ba80 addiu t0, t0, 4
+	ldloc 10
+	ldloc.1
+	ldloc 8
 	ldc.i4.4
 	add
-	stloc 5
-// 0x0107b8ec: 0x107b8ec: bne   v0, v1, 0x107b8e4 lui   t0, 0x80000
-	ldloc 5
+	stloc 8
+	beq  L_107ba80
+// --- basic block ---
+L_107ba74:
+// 0x0107ba74: 0x107ba74: slt   a1, a3, v1
+	ldloc 4
 	ldloc 7
-	ldc.i4 524288
+	clt
+	stloc.2
+// 0x0107ba78: 0x107ba78: bne   a1, zero, 0x107ba5c addu  a1, zero, zero
+	ldloc.2
+	ldc.i4.s 0
+	stloc.2
+	brtrue L_107ba5c
+// --- basic block ---
+L_107ba80:
+// 0x0107ba80: 0x107ba80: addu  t0, v0, zero
+	ldloc 5
 	stloc 8
-	bne.un L_107b8e4
+// 0x0107ba84: 0x107ba84: j	 0x107bab8 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_107bab8
 // --- basic block ---
-// 0x0107b8f4: 0x107b8f4: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x0107b8f8: 0x107b8f8: addiu t1, t0, -13980
-	ldloc 8
-	ldc.i4 -13980
-	add
-	stloc 16
-// 0x0107b8fc: 0x107b8fc: sw    v0, -13980(t0)
+L_107ba8c:
+// 0x0107ba8c: 0x107ba8c: lw    t1, 0(t0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3495
+	ldelem.i4
+	stloc 10
+// 0x0107ba90: 0x107ba90: addiu a3, a3, 1
+	ldloc 4
+	ldc.i4.1
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107b900: 0x107b900: lui   t0, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x0107b904: 0x107b904: sw    zero, -14008(t0)
+	stloc 4
+// 0x0107ba94: 0x107ba94: lw    t2, 0(t1)
 	ldloc 6
-	ldloc 8
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldelem.i4
+	stloc 15
+// 0x0107ba98: 0x107ba98: sll   zero, zero, 0
+// 0x0107ba9c: 0x107ba9c: bne   t2, a0, 0x107bab8 addiu t0, t0, 4
+	ldloc 15
+	ldloc.1
+	ldloc 8
+	ldc.i4.4
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107b908: 0x107b908: lui   t0, 0x80000
-	ldc.i4 524288
 	stloc 8
-// 0x0107b90c: 0x107b90c: sw    zero, -14016(t0)
+	bne.un L_107bab8
+// --- basic block ---
+// 0x0107baa4: 0x107baa4: lw    s1, 4(t1)
 	ldloc 6
-	ldloc 8
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4.1
 	add
+	ldelem.i4
+	stloc 9
+// 0x0107baa8: 0x107baa8: sll   zero, zero, 0
+// 0x0107baac: 0x107baac: xori  s1, s1, 4
+	ldloc 9
+	ldc.i4.4
+	xor
+	stloc 9
+// 0x0107bab0: 0x107bab0: j	 0x107bac4 sltiu s1, s1, 1
+	ldloc 9
+	ldc.i4.1
+	clt.un
+	stloc 9
+	br L_107bac4
+// --- basic block ---
+L_107bab8:
+// 0x0107bab8: 0x107bab8: slt   t1, a3, v1
+	ldloc 4
+	ldloc 7
+	clt
+	stloc 10
+// 0x0107babc: 0x107babc: bne   t1, zero, 0x107ba8c addu  s1, zero, zero
+	ldloc 10
 	ldc.i4.s 0
-	stelem.i4
-// 0x0107b910: 0x107b910: lui   t0, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x0107b914: 0x107b914: sw    v0, -14004(t0)
+	stloc 9
+	brtrue L_107ba8c
+// --- basic block ---
+L_107bac4:
+// 0x0107bac4: 0x107bac4: j	 0x107baf0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+	br L_107baf0
+// --- basic block ---
+L_107bacc:
+// 0x0107bacc: 0x107bacc: lw    t0, 0(v0)
 	ldloc 6
-	ldloc 8
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107b918: 0x107b918: lui   t0, 0x80000
-	ldc.i4 524288
+	ldelem.i4
 	stloc 8
-// 0x0107b91c: 0x107b91c: sw    v0, -14000(t0)
+// 0x0107bad0: 0x107bad0: sll   zero, zero, 0
+// 0x0107bad4: 0x107bad4: lw    t1, 0(t0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3500
-	add
+	ldelem.i4
+	stloc 10
+// 0x0107bad8: 0x107bad8: sll   zero, zero, 0
+// 0x0107badc: 0x107badc: bne   t1, a0, 0x107baf0 addiu v0, v0, 4
+	ldloc 10
+	ldloc.1
 	ldloc 5
-	stelem.i4
-// 0x0107b920: 0x107b920: lui   t0, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x0107b924: 0x107b924: sw    zero, -13992(t0)
+	ldc.i4.4
+	add
+	stloc 5
+	bne.un L_107baf0
+// --- basic block ---
+// 0x0107bae4: 0x107bae4: lw    s3, 1276(t0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3498
+	ldc.i4 319
 	add
+	ldelem.i4
+	stloc 13
+// 0x0107bae8: 0x107bae8: j	 0x107bb00 sltu  s3, zero, s3
 	ldc.i4.s 0
-	stelem.i4
-// 0x0107b928: 0x107b928: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 7
-// 0x0107b92c: 0x107b92c: lui   t0, 0x80000
-	ldc.i4 524288
-	stloc 8
-// 0x0107b930: 0x107b930: addiu v1, v1, -16028
+	ldloc 13
+	clt.un
+	stloc 13
+	br L_107bb00
+// --- basic block ---
+L_107baf0:
+// 0x0107baf0: 0x107baf0: slt   t0, a3, v1
+	ldloc 4
 	ldloc 7
-	ldc.i4 -16028
-	add
-	stloc 7
-// 0x0107b934: 0x107b934: lui   s1, 0x10000
-	ldc.i4 65536
-	stloc 10
-// 0x0107b938: 0x107b938: lui   s0, 0x10000
-	ldc.i4 65536
-	stloc 9
-// 0x0107b93c: 0x107b93c: sw    zero, -13988(t0)
-	ldloc 6
+	clt
+	stloc 8
+// 0x0107baf4: 0x107baf4: bne   t0, zero, 0x107bacc addiu a3, a3, 1
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3497
+	ldloc 4
+	ldc.i4.1
 	add
+	stloc 4
+	brtrue L_107bacc
+// --- basic block ---
+// 0x0107bafc: 0x107bafc: addu  s3, zero, zero
 	ldc.i4.s 0
-	stelem.i4
-// 0x0107b940: 0x107b940: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0107b944: 0x107b944: lui   t0, 0x0
+	stloc 13
+L_107bb00:
+// 0x0107bb00: 0x107bb00: j	 0x107bb2c addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc 8
-// 0x0107b948: 0x107b948: sw    v0, 15944(t0)
+	stloc 5
+	br L_107bb2c
+// --- basic block ---
+L_107bb08:
+// 0x0107bb08: 0x107bb08: lw    a3, 0(a2)
 	ldloc 6
-	ldloc 8
+	ldloc.3
 	ldc.i4.2
 	shr.un
-	ldc.i4 3986
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107b94c: 0x107b94c: sw    zero, 2008(v1)
+	ldelem.i4
+	stloc 4
+// 0x0107bb0c: 0x107bb0c: sll   zero, zero, 0
+// 0x0107bb10: 0x107bb10: lw    t0, 0(a3)
 	ldloc 6
-	ldloc 7
+	ldloc 4
 	ldc.i4.2
 	shr.un
-	ldc.i4 502
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107b950: 0x107b950: lui   t0, 0x80000
-	ldc.i4 524288
+	ldelem.i4
 	stloc 8
-// 0x0107b954: 0x107b954: sw    zero, 2000(v1)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
+// 0x0107bb14: 0x107bb14: sll   zero, zero, 0
+// 0x0107bb18: 0x107bb18: bne   t0, a0, 0x107bb2c addiu a2, a2, 4
+	ldloc 8
+	ldloc.1
+	ldloc.3
+	ldc.i4.4
 	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107b958: 0x107b958: sw    zero, 2004(v1)
-	ldloc 6
-	ldloc 7
-	ldc.i4.2
-	shr.un
-	ldc.i4 501
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107b95c: 0x107b95c: addiu a0, s1, 18248
-	ldloc 10
-	ldc.i4 18248
-	add
-	stloc.1
-// 0x0107b960: 0x107b960: addiu a1, a1, 15980
-	ldloc.2
-	ldc.i4 15980
-	add
-	stloc.2
-// 0x0107b964: 0x107b964: addiu a2, s0, 9424
-	ldloc 9
-	ldc.i4 9424
+	stloc.3
+	bne.un L_107bb2c
+// --- basic block ---
+// 0x0107bb20: 0x107bb20: lb    a2, 708(a3)
+	ldloc 4
+	ldc.i4 708
 	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.3
-// 0x0107b968: 0x107b968: addu  a3, zero, zero
+// 0x0107bb24: 0x107bb24: j	 0x107bb3c sltu  a2, zero, a2
 	ldc.i4.s 0
+	ldloc.3
+	clt.un
+	stloc.3
+	br L_107bb3c
+// --- basic block ---
+L_107bb2c:
+// 0x0107bb2c: 0x107bb2c: slt   a3, v0, v1
+	ldloc 5
+	ldloc 7
+	clt
 	stloc 4
-// 0x0107b96c: 0x107b96c: sw    v0, 4(t1)
-	ldloc 6
-	ldloc 16
-	ldc.i4.2
-	shr.un
+// 0x0107bb30: 0x107bb30: bne   a3, zero, 0x107bb08 addiu v0, v0, 1
+	ldloc 4
+	ldloc 5
 	ldc.i4.1
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107b970: 0x107b970: jal   0x100edb0 sw    zero, -16228(t0)
+	stloc 5
+	brtrue L_107bb08
+// --- basic block ---
+// 0x0107bb38: 0x107bb38: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+L_107bb3c:
+// 0x0107bb3c: 0x107bb3c: bne   s1, zero, 0x107bb50 addu  s2, zero, zero
+	ldloc 9
+	ldc.i4.s 0
+	stloc 12
+	brtrue L_107bb50
+// --- basic block ---
+// 0x0107bb44: 0x107bb44: lw    s2, 1284(a1)
 	ldloc 6
-	ldloc 8
+	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4057
+	ldc.i4 321
 	add
+	ldelem.i4
+	stloc 12
+// 0x0107bb48: 0x107bb48: sll   zero, zero, 0
+// 0x0107bb4c: 0x107bb4c: sltu  s2, zero, s2
 	ldc.i4.s 0
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107b978: 0x107b978: lui   a1, 0x0
+	ldloc 12
+	clt.un
+	stloc 12
+L_107bb50:
+// 0x0107bb50: 0x107bb50: lui   s0, 0x0
 	ldc.i4.s 0
-	stloc.2
-// 0x0107b97c: 0x107b97c: addiu a0, s1, 18248
-	ldloc 10
-	ldc.i4 18248
+	stloc 11
+// 0x0107bb54: 0x107bb54: addiu a0, s0, 15964
+	ldloc 11
+	ldc.i4 15964
 	add
 	stloc.1
-// 0x0107b980: 0x107b980: addiu a1, a1, 15996
-	ldloc.2
-	ldc.i4 15996
-	add
+// 0x0107bb58: 0x107bb58: addiu a1, zero, 2
+	ldc.i4.2
 	stloc.2
-// 0x0107b984: 0x107b984: addiu a2, s0, 9424
-	ldloc 9
-	ldc.i4 9424
-	add
-	stloc.3
-// 0x0107b988: 0x107b988: jal   0x100edb0 addu  a3, zero, zero
+// 0x0107bb5c: 0x107bb5c: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -459,36 +463,23 @@ L_107b8e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b990: 0x107b990: lui   s1, 0x10000
-	ldc.i4 65536
-	stloc 10
-// 0x0107b994: 0x107b994: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0107b998: 0x107b998: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107b99c: 0x107b99c: addiu a1, a1, 15948
-	ldloc.2
-	ldc.i4 15948
-	add
-	stloc.2
-// 0x0107b9a0: 0x107b9a0: addiu a2, a2, -25616
-	ldloc.3
-	ldc.i4 -25616
-	add
+// 0x0107bb64: 0x107bb64: addu  a2, s3, zero
+	ldloc 13
 	stloc.3
-// 0x0107b9a4: 0x107b9a4: addiu a0, s1, 12560
-	ldloc 10
-	ldc.i4 12560
+// 0x0107bb68: 0x107bb68: addiu a0, s0, 15964
+	ldloc 11
+	ldc.i4 15964
 	add
 	stloc.1
-// 0x0107b9a8: 0x107b9a8: jal   0x100edb0 addu  a3, zero, zero
+// 0x0107bb6c: 0x107bb6c: addiu a1, zero, 1
+	ldc.i4.1
+	stloc.2
+// 0x0107bb70: 0x107bb70: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -496,67 +487,49 @@ L_107b8e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b9b0: 0x107b9b0: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107b9b4: 0x107b9b4: lw    v1, -16032(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4008
-	add
-	ldelem.i4
-	stloc 7
-// 0x0107b9b8: 0x107b9b8: addiu v0, zero, 1
+// 0x0107bb78: 0x107bb78: xori  a2, s1, 1
+	ldloc 9
 	ldc.i4.1
-	stloc 5
-// 0x0107b9bc: 0x107b9bc: beq   v1, v0, 0x107ba70 lui   s0, 0x0
-	ldloc 7
-	ldloc 5
-	ldc.i4.s 0
-	stloc 9
-	beq  L_107ba70
-// --- basic block ---
-// 0x0107b9c4: 0x107b9c4: lui   a2, 0x10000
-	ldc.i4 65536
+	xor
 	stloc.3
-// 0x0107b9c8: 0x107b9c8: addiu a1, s0, 16012
-	ldloc 9
-	ldc.i4 16012
+// 0x0107bb7c: 0x107bb7c: addiu a0, s0, 15964
+	ldloc 11
+	ldc.i4 15964
 	add
+	stloc.1
+// 0x0107bb80: 0x107bb80: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-// 0x0107b9cc: 0x107b9cc: addiu a2, a2, 18500
-	ldloc.3
-	ldc.i4 18500
-	add
-	stloc.3
-// 0x0107b9d0: 0x107b9d0: addu  a3, zero, zero
+// 0x0107bb84: 0x107bb84: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0107b9d4: 0x107b9d4: jal   0x100edb0 addiu a0, s1, 12560
-	ldloc 10
-	ldc.i4 12560
-	add
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b9dc: 0x107b9dc: jal   0x100e348 addiu a0, s0, 16012
-	ldloc 9
-	ldc.i4 16012
+// 0x0107bb8c: 0x107bb8c: addu  a2, s2, zero
+	ldloc 12
+	stloc.3
+// 0x0107bb90: 0x107bb90: addiu a1, zero, 3
+	ldc.i4.3
+	stloc.2
+// 0x0107bb94: 0x107bb94: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107bb98: 0x107bb98: jal   0x109cb4c addiu a0, s0, 15964
+	ldloc 11
+	ldc.i4 15964
 	add
 	stloc.1
 	ldloc.0
@@ -564,247 +537,157 @@ L_107b8e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107b9e4: 0x107b9e4: jal   0x1001ba8 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107b9ec: 0x107b9ec: lui   s0, 0x10000
-	ldc.i4 65536
-	stloc 9
-// 0x0107b9f0: 0x107b9f0: addiu a1, s0, -22604
-	ldloc 9
-	ldc.i4 -22604
-	add
-	stloc.2
-// 0x0107b9f4: 0x107b9f4: addu  a0, v0, zero
-	ldloc 5
+// 0x0107bba0: 0x107bba0: jal   0x109aa6c addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-// 0x0107b9f8: 0x107b9f8: lui   s4, 0x80000
-	ldc.i4 524288
-	stloc 11
-// 0x0107b9fc: 0x107b9fc: addu  s1, v0, zero
-	ldloc 5
-	stloc 10
-// 0x0107ba00: 0x107ba00: jal   0x1001984 addiu s5, s0, -22604
-	ldloc 9
-	ldc.i4 -22604
-	add
-	stloc 14
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::strtok_1001984(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ba08: 0x107ba08: addiu s4, s4, -13972
-	ldloc 11
-	ldc.i4 -13972
-	add
-	stloc 11
-// 0x0107ba0c: 0x107ba0c: addu  s0, zero, zero
+// 0x0107bba8: 0x107bba8: sltu  v0, zero, v0
 	ldc.i4.s 0
-	stloc 9
-// 0x0107ba10: 0x107ba10: j	 0x107ba54 lui   s2, 0x80000
-	ldc.i4 524288
-	stloc 12
-	br L_107ba54
-// --- basic block ---
-L_107ba18:
-// 0x0107ba18: 0x107ba18: jal   0x1000d8c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::atoi_1000d8c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	ldloc 5
+	clt.un
 	stloc 5
-// --- basic block ---
-// 0x0107ba20: 0x107ba20: addu  s3, v0, zero
+// 0x0107bbac: 0x107bbac: nor   a0, zero, v0
 	ldloc 5
-	stloc 13
-// 0x0107ba24: 0x107ba24: addu  a0, zero, zero
-	ldc.i4.s 0
+	ldc.i4.m1
+	xor
 	stloc.1
-// 0x0107ba28: 0x107ba28: jal   0x1001984 addu  a1, s5, zero
-	ldloc 14
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::strtok_1001984(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+// 0x0107bbb0: 0x107bbb0: lui   a3, 0x1080000
+	ldc.i4 17301504
+	stloc 4
+// 0x0107bbb4: 0x107bbb4: addiu v0, zero, 2
+	ldc.i4.2
 	stloc 5
-// --- basic block ---
-// 0x0107ba30: 0x107ba30: sll   a0, s0, 2
-	ldloc 9
+// 0x0107bbb8: 0x107bbb8: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
-	shl
-	stloc.1
-// 0x0107ba34: 0x107ba34: slti  v1, s3, 11
-	ldloc 13
-	ldc.i4.s 11
-	clt
-	stloc 7
-// 0x0107ba38: 0x107ba38: beq   v1, zero, 0x107ba54 addu  a0, a0, s4
-	ldloc 7
-	ldloc.1
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107bbbc: 0x107bbbc: addiu a2, s0, 15964
 	ldloc 11
+	ldc.i4 15964
 	add
-	stloc.1
-	brfalse L_107ba54
-// --- basic block ---
-// 0x0107ba40: 0x107ba40: lw    v1, -16244(s2)
+	stloc.3
+// 0x0107bbc0: 0x107bbc0: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107bbc4: 0x107bbc4: addiu a3, a3, -17272
+	ldloc 4
+	ldc.i4 -17272
+	add
+	stloc 4
+// 0x0107bbc8: 0x107bbc8: addiu a1, zero, -2
+	ldc.i4.s -2
+	stloc.2
+// 0x0107bbcc: 0x107bbcc: sw    v0, 28(sp)
 	ldloc 6
-	ldloc 12
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4061
+	ldc.i4.7
 	add
-	ldelem.i4
-	stloc 7
-// 0x0107ba44: 0x107ba44: sw    s3, 0(a0)
+	ldloc 5
+	stelem.i4
+// 0x0107bbd0: 0x107bbd0: sw    zero, 16(sp)
 	ldloc 6
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldloc 13
-	stelem.i4
-// 0x0107ba48: 0x107ba48: addiu v1, v1, 1
-	ldloc 7
-	ldc.i4.1
+	ldc.i4.4
 	add
-	stloc 7
-// 0x0107ba4c: 0x107ba4c: sw    v1, -16244(s2)
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bbd4: 0x107bbd4: jal   0x109ce38 sw    zero, 24(sp)
 	ldloc 6
-	ldloc 12
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4061
+	ldc.i4.6
 	add
-	ldloc 7
+	ldc.i4.s 0
 	stelem.i4
-// 0x0107ba50: 0x107ba50: addiu s0, s0, 1
-	ldloc 9
-	ldc.i4.1
-	add
-	stloc 9
-L_107ba54:
-// 0x0107ba54: 0x107ba54: bne   v0, zero, 0x107ba18 addu  a0, v0, zero
-	ldloc 5
-	ldloc 5
-	stloc.1
-	brtrue L_107ba18
-// --- basic block ---
-// 0x0107ba5c: 0x107ba5c: jal   0x1000930 addu  a0, s1, zero
-	ldloc 10
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ba64: 0x107ba64: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 7
-// 0x0107ba68: 0x107ba68: lui   v0, 0x80000
+// 0x0107bbdc: 0x107bbdc: lw    ra, 52(sp)
+// 0x0107bbe0: 0x107bbe0: lui   v1, 0x80000
 	ldc.i4 524288
-	stloc 5
-// 0x0107ba6c: 0x107ba6c: sw    v1, -16032(v0)
+	stloc 7
+// 0x0107bbe4: 0x107bbe4: sw    v0, -15624(v1)
 	ldloc 6
-	ldloc 5
+	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4008
+	ldc.i4 -3906
 	add
-	ldloc 7
+	ldloc 5
 	stelem.i4
-L_107ba70:
-// 0x0107ba70: 0x107ba70: lw    ra, 44(sp)
-// 0x0107ba74: 0x107ba74: lw    s5, 40(sp)
+// 0x0107bbe8: 0x107bbe8: lw    s3, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc 14
-// 0x0107ba78: 0x107ba78: lw    s4, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107ba7c: 0x107ba7c: lw    s3, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
+	ldc.i4.s 12
 	add
 	ldelem.i4
 	stloc 13
-// 0x0107ba80: 0x107ba80: lw    s2, 28(sp)
+// 0x0107bbec: 0x107bbec: addu  v0, zero, zero
+	ldc.i4.s 0
+	stloc 5
+// 0x0107bbf0: 0x107bbf0: lw    s2, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 11
 	add
 	ldelem.i4
 	stloc 12
-// 0x0107ba84: 0x107ba84: lw    s1, 24(sp)
+// 0x0107bbf4: 0x107bbf4: lw    s1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 10
-// 0x0107ba88: 0x107ba88: lw    s0, 20(sp)
+	stloc 9
+// 0x0107bbf8: 0x107bbf8: lw    s0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 9
-// 0x0107ba8c: 0x107ba8c: jr    ra addiu sp, sp, 48
+	stloc 11
+// 0x0107bbfc: 0x107bbfc: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 56
 	add
 	stloc.0
 	br __CIBYL_function_return
@@ -814,37 +697,27 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_report_map_problem_107ba94(int32,int32,int32,int32,int32)
+.method public static int32 report_abuse_107bc04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 t0,int32 s3,int32 s4,int32 s7,int32 s8,int32 t1,int32 ra,int32 t2)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
 
-// local  5 is register v0
-// local  6 is register v1
+// local  6 is register v0
+// local  7 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
-// local 13 is register t0
-// local 18 is register t1
-// local 20 is register t2
 // local  8 is register s0
 // local  9 is register s1
-// local 10 is register s2
-// local 14 is register s3
-// local 15 is register s4
-// local 11 is register s5
-// local 12 is register s6
-// local 16 is register s7
 // local  0 is register sp
-// local 17 is register s8
-// local 19 is register ra
-// local  7 is register mem
+// local 10 is register ra
+// local  5 is register mem
 
-	ldc.i4.s 0
-	stloc 5
 	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 7
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -854,122 +727,46 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 18
-	ldc.i4.s 0
-	stloc 20
-	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 14
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 16
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 17
-	ldc.i4.s 0
-	stloc 19
+	stloc 10
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
+	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_107ba94:
-// 0x0107ba94: 0x107ba94: addiu sp, sp, -336
+// 0x0107bc04: 0x107bc04: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107bc08: 0x107bc08: addiu sp, sp, -56
 	ldloc.0
-	ldc.i4 -336
+	ldc.i4.s -56
 	add
 	stloc.0
-// 0x0107ba98: 0x107ba98: sw    ra, 332(sp)
-// 0x0107ba9c: 0x107ba9c: sw    s8, 328(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 82
-	add
-	ldloc 17
-	stelem.i4
-// 0x0107baa0: 0x107baa0: sw    s7, 324(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 81
-	add
-	ldloc 16
-	stelem.i4
-// 0x0107baa4: 0x107baa4: sw    s6, 320(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 80
-	add
-	ldloc 12
-	stelem.i4
-// 0x0107baa8: 0x107baa8: sw    s5, 316(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 79
-	add
-	ldloc 11
-	stelem.i4
-// 0x0107baac: 0x107baac: sw    s4, 312(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 78
-	add
-	ldloc 15
-	stelem.i4
-// 0x0107bab0: 0x107bab0: sw    s3, 308(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 77
-	add
-	ldloc 14
-	stelem.i4
-// 0x0107bab4: 0x107bab4: sw    s2, 304(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 76
+// 0x0107bc0c: 0x107bc0c: addiu a0, a0, -25232
+	ldloc.1
+	ldc.i4 -25232
 	add
-	ldloc 10
-	stelem.i4
-// 0x0107bab8: 0x107bab8: sw    s1, 300(sp)
-	ldloc 7
+	stloc.1
+// 0x0107bc10: 0x107bc10: sw    ra, 52(sp)
+// 0x0107bc14: 0x107bc14: sw    s1, 48(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 75
+	ldc.i4.s 12
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107babc: 0x107babc: jal   0x106c170 sw    s0, 296(sp)
-	ldloc 7
+// 0x0107bc18: 0x107bc18: jal   0x101cd70 sw    s0, 44(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 74
+	ldc.i4.s 11
 	add
 	ldloc 8
 	stelem.i4
@@ -978,753 +775,766 @@ L_107ba94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107bac4: 0x107bac4: jal   0x1030e98 sll   zero, zero, 0
-	call int32 Cibyl35::roadmap_gps_have_reception_1030e98()
-	stloc 5
 // --- basic block ---
-// 0x0107bacc: 0x107bacc: beq   v0, zero, 0x107bb48 lui   a0, 0x10000
-	ldloc 5
-	ldc.i4 65536
+// 0x0107bc20: 0x107bc20: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-	brfalse L_107bb48
-// --- basic block ---
-// 0x0107bad4: 0x107bad4: jal   0x101df24 addiu a0, a0, -23972
+// 0x0107bc24: 0x107bc24: addiu a0, a0, -25216
 	ldloc.1
-	ldc.i4 -23972
+	ldc.i4 -25216
 	add
 	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107badc: 0x107badc: bne   v0, zero, 0x107bb84 addu  s1, v0, zero
-	ldloc 5
-	ldloc 5
+// 0x0107bc28: 0x107bc28: jal   0x101cd70 addu  s1, v0, zero
+	ldloc 6
 	stloc 9
-	brtrue L_107bb84
-// --- basic block ---
-// 0x0107bae4: 0x107bae4: jal   0x1000910 addiu a0, zero, 20
-	ldc.i4.s 20
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107baec: 0x107baec: addu  a0, v0, zero
-	ldloc 5
+// 0x0107bc30: 0x107bc30: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107baf0: 0x107baf0: addiu a1, sp, 60
-	ldloc.0
-	ldc.i4.s 60
+// 0x0107bc34: 0x107bc34: addiu a0, a0, -23936
+	ldloc.1
+	ldc.i4 -23936
 	add
-	stloc.2
-// 0x0107baf4: 0x107baf4: addiu a2, sp, 32
+	stloc.1
+// 0x0107bc38: 0x107bc38: jal   0x101cd70 sw    v0, 32(sp)
+	ldloc 5
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.3
-// 0x0107baf8: 0x107baf8: jal   0x1029da8 addu  s0, v0, zero
-	ldloc 5
-	stloc 8
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107bb00: 0x107bb00: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x0107bb04: 0x107bb04: bne   v0, v1, 0x107bb64 addu  s1, s0, zero
-	ldloc 5
-	ldloc 6
-	ldloc 8
-	stloc 9
-	bne.un L_107bb64
 // --- basic block ---
-// 0x0107bb0c: 0x107bb0c: lui   a0, 0x10000
+// 0x0107bc40: 0x107bc40: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107bb10: 0x107bb10: jal   0x101df50 addiu a0, a0, -31052
+// 0x0107bc44: 0x107bc44: addiu a0, a0, -25292
 	ldloc.1
-	ldc.i4 -31052
+	ldc.i4 -25292
 	add
 	stloc.1
+// 0x0107bc48: 0x107bc48: jal   0x101cd70 addu  s0, v0, zero
+	ldloc 6
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107bb18: 0x107bb18: beq   v0, zero, 0x107bb40 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107bb40
 // --- basic block ---
-// 0x0107bb20: 0x107bb20: lw    v1, 4(v0)
-	ldloc 7
+// 0x0107bc50: 0x107bc50: lw    a1, 32(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107bb24: 0x107bb24: sll   zero, zero, 0
-// 0x0107bb28: 0x107bb28: sw    v1, 4(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
+	stloc.2
+// 0x0107bc54: 0x107bc54: lui   a3, 0x1080000
+	ldc.i4 17301504
+	stloc 4
+// 0x0107bc58: 0x107bc58: addu  a0, s1, zero
+	ldloc 9
+	stloc.1
+// 0x0107bc5c: 0x107bc5c: addiu a3, a3, -17064
+	ldloc 4
+	ldc.i4 -17064
 	add
-	ldloc 6
-	stelem.i4
-// 0x0107bb2c: 0x107bb2c: lw    v0, 0(v0)
-	ldloc 7
+	stloc 4
+// 0x0107bc60: 0x107bc60: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107bc64: 0x107bc64: sw    s0, 20(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107bb30: 0x107bb30: sw    zero, 12(s0)
-	ldloc 7
+	ldc.i4.5
+	add
 	ldloc 8
+	stelem.i4
+// 0x0107bc68: 0x107bc68: sw    v0, 24(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.6
 	add
-	ldc.i4.s 0
+	ldloc 6
 	stelem.i4
-// 0x0107bb34: 0x107bb34: sw    v0, 0(s0)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
+// 0x0107bc6c: 0x107bc6c: jal   0x104c2b4 sw    zero, 16(sp)
 	ldloc 5
-	stelem.i4
-// 0x0107bb38: 0x107bb38: j	 0x107bb64 sw    zero, 16(s0)
-	ldloc 7
-	ldloc 8
+	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_107bb64
-// --- basic block ---
-L_107bb40:
-// 0x0107bb40: 0x107bb40: jal   0x1000930 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_custom_104c2b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-L_107bb48:
-// 0x0107bb48: 0x107bb48: lui   a0, 0x0
-	ldc.i4.s 0
-	stloc.1
-// 0x0107bb4c: 0x107bb4c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107bb50: 0x107bb50: addiu a0, a0, 30152
-	ldloc.1
-	ldc.i4 30152
+// 0x0107bc74: 0x107bc74: lw    ra, 52(sp)
+// 0x0107bc78: 0x107bc78: lw    s1, 48(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
 	add
-	stloc.1
-// 0x0107bb54: 0x107bb54: jal   0x104c148 addiu a1, a1, -25608
-	ldloc.2
-	ldc.i4 -25608
+	ldelem.i4
+	stloc 9
+// 0x0107bc7c: 0x107bc7c: lw    s0, 44(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
 	add
-	stloc.2
+	ldelem.i4
+	stloc 8
+// 0x0107bc80: 0x107bc80: jr    ra addiu sp, sp, 56
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.s 56
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 on_option_selected_107bc88(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  8 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107bb5c: 0x107bb5c: j	 0x107bff0 sll   zero, zero, 0
-	br L_107bff0
-// --- basic block ---
-L_107bb64:
-// 0x0107bb64: 0x107bb64: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107bb68: 0x107bb68: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107bb6c: 0x107bb6c: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107bb70: 0x107bb70: addiu a0, a0, -23972
+// 0x0107bc88: 0x107bc88: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
+	add
+	stloc.0
+// 0x0107bc8c: 0x107bc8c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107bc90: 0x107bc90: sw    ra, 20(sp)
+// 0x0107bc94: 0x107bc94: beq   a0, zero, 0x107bd28 sw    zero, -15624(v0)
 	ldloc.1
-	ldc.i4 -23972
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3906
 	add
-	stloc.1
-// 0x0107bb74: 0x107bb74: addiu a1, a1, -28932
+	ldc.i4.s 0
+	stelem.i4
+	brfalse L_107bd28
+// --- basic block ---
+// 0x0107bc9c: 0x107bc9c: lw    v0, 20(a1)
+	ldloc 7
 	ldloc.2
-	ldc.i4 -28932
-	add
-	stloc.2
-// 0x0107bb78: 0x107bb78: addiu a2, a2, -23956
-	ldloc.3
-	ldc.i4 -23956
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.3
-// 0x0107bb7c: 0x107bb7c: jal   0x101f638 addu  a3, s0, zero
-	ldloc 8
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_gps_position_101f638(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldelem.i4
 	stloc 5
+// 0x0107bca0: 0x107bca0: sll   zero, zero, 0
+// 0x0107bca4: 0x107bca4: sltiu v1, v0, 5
+	ldloc 5
+	ldc.i4.5
+	clt.un
+	stloc 6
+// 0x0107bca8: 0x107bca8: beq   v1, zero, 0x107bd28 lui   v1, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc 6
+	brfalse L_107bd28
 // --- basic block ---
-L_107bb84:
-// 0x0107bb84: 0x107bb84: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107bb88: 0x107bb88: addiu v1, zero, -1
-	ldc.i4.m1
+// 0x0107bcb0: 0x107bcb0: sll   v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x0107bcb4: 0x107bcb4: addiu v1, v1, 29332
+	ldloc 6
+	ldc.i4 29332
+	add
 	stloc 6
-// 0x0107bb8c: 0x107bb8c: addiu a0, a0, -17588
-	ldloc.1
-	ldc.i4 -17588
+// 0x0107bcb8: 0x107bcb8: addu  v0, v1, v0
+	ldloc 6
+	ldloc 5
 	add
-	stloc.1
-// 0x0107bb90: 0x107bb90: lui   v0, 0x0
-	ldc.i4.s 0
 	stloc 5
-// 0x0107bb94: 0x107bb94: jal   0x101cd60 sw    v1, 15876(v0)
+// 0x0107bcbc: 0x107bcbc: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 3969
-	add
-	ldloc 6
-	stelem.i4
+	ldelem.i4
+	stloc 5
+// 0x0107bcc0: 0x107bcc0: sll   zero, zero, 0
+// 0x0107bcc4: 0x107bcc4: jr    v0 sll   zero, zero, 0
+	ldloc 5
+	br __CIBYL_local_jumptab
+// --- basic block ---
+L_107bccc:
+// 0x0107bccc: 0x107bccc: jal   0x10793b8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::real_time_post_alert_comment_10793b8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107bb9c: 0x107bb9c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107bba0: 0x107bba0: lui   a2, 0x1080000
-	ldc.i4 17301504
-	stloc.3
-// 0x0107bba4: 0x107bba4: addiu a0, a0, -25520
-	ldloc.1
-	ldc.i4 -25520
-	add
-	stloc.1
-// 0x0107bba8: 0x107bba8: addu  a1, v0, zero
+// 0x0107bcd4: 0x107bcd4: j	 0x107bd28 sll   zero, zero, 0
+	br L_107bd28
+// --- basic block ---
+L_107bcdc:
+// 0x0107bcdc: 0x107bcdc: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107bce0: 0x107bce0: lw    a0, -13540(v0)
+	ldloc 7
 	ldloc 5
-	stloc.2
-// 0x0107bbac: 0x107bbac: addiu a2, a2, -30796
-	ldloc.3
-	ldc.i4 -30796
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3385
 	add
-	stloc.3
-// 0x0107bbb0: 0x107bbb0: jal   0x1095a08 addiu a3, zero, 8192
-	ldc.i4 8192
-	stloc 4
+	ldelem.i4
+	stloc.1
+// 0x0107bce4: 0x107bce4: jal   0x1084dfc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeAlertCommentsList_1084dfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107bbb8: 0x107bbb8: addu  s3, v0, zero
-	ldloc 5
-	stloc 14
-// 0x0107bbbc: 0x107bbbc: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107bbc0: 0x107bbc0: lui   v0, 0x41000000
-	ldc.i4 1090519040
-	stloc 5
-// 0x0107bbc4: 0x107bbc4: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0107bbc8: 0x107bbc8: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x0107bbcc: 0x107bbcc: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107bbd0: 0x107bbd0: addiu a0, a0, -25508
-	ldloc.1
-	ldc.i4 -25508
-	add
-	stloc.1
-// 0x0107bbd4: 0x107bbd4: ori   v0, v0, 20616
-	ldloc 5
-	ldc.i4 20616
-	or
+// 0x0107bcec: 0x107bcec: j	 0x107bd28 sll   zero, zero, 0
+	br L_107bd28
+// --- basic block ---
+L_107bcf4:
+// 0x0107bcf4: 0x107bcf4: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0107bbd8: 0x107bbd8: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107bcf8: 0x107bcf8: lw    a0, -13540(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 -3385
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc.1
+// 0x0107bcfc: 0x107bcfc: jal   0x107a234 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Download_Image_107a234(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107bbe0: 0x107bbe0: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107bbe4: 0x107bbe4: jal   0x1078614 addu  s0, v0, zero
-	ldloc 5
-	stloc 8
+// 0x0107bd04: 0x107bd04: j	 0x107bd28 sll   zero, zero, 0
+	br L_107bd28
+// --- basic block ---
+L_107bd0c:
+// 0x0107bd0c: 0x107bd0c: jal   0x107bc04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::space_1078614(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_abuse_107bc04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107bbec: 0x107bbec: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107bbf0: 0x107bbf0: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+// 0x0107bd14: 0x107bd14: j	 0x107bd28 sll   zero, zero, 0
+	br L_107bd28
 // --- basic block ---
-// 0x0107bbf8: 0x107bbf8: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107bbfc: 0x107bbfc: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x0107bc00: 0x107bc00: addiu a0, a0, -1100
-	ldloc.1
-	ldc.i4 -1100
-	add
-	stloc.1
-// 0x0107bc04: 0x107bc04: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107bc08: 0x107bc08: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0107bc0c: 0x107bc0c: addiu v0, zero, 136
-	ldc.i4 136
+L_107bd1c:
+// 0x0107bd1c: 0x107bd1c: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0107bc10: 0x107bc10: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107bd20: 0x107bd20: jal   0x102147c sw    zero, -15624(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 -3906
 	add
-	ldloc 5
+	ldc.i4.s 0
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107bc18: 0x107bc18: addu  a0, v0, zero
+L_107bd28:
+// 0x0107bd28: 0x107bd28: lw    ra, 20(sp)
+// 0x0107bd2c: 0x107bd2c: sll   zero, zero, 0
+// 0x0107bd30: 0x107bd30: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+	br __CIBYL_function_return
+__CIBYL_local_jumptab:
+	stloc 5
 	ldloc 5
-	stloc.1
-// 0x0107bc1c: 0x107bc1c: addu  a1, zero, zero
+	ldc.i4 17284300
+	beq  L_107bccc
+	ldloc 5
+	ldc.i4 17284316
+	beq  L_107bcdc
+	ldloc 5
+	ldc.i4 17284340
+	beq  L_107bcf4
+	ldloc 5
+	ldc.i4 17284364
+	beq  L_107bd0c
+	ldloc 5
+	ldc.i4 17284380
+	beq  L_107bd1c
+		br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 on_report_abuse_107bd38(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32[] mem,int32 v1)
+
+// local  6 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  7 is register mem
+
 	ldc.i4.s 0
-	stloc.2
-// 0x0107bc20: 0x107bc20: addu  a2, zero, zero
+	stloc 6
 	ldc.i4.s 0
-	stloc.3
-// 0x0107bc24: 0x107bc24: jal   0x1098fe0 addu  s2, v0, zero
-	ldloc 5
-	stloc 10
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107bc2c: 0x107bc2c: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107bc30: 0x107bc30: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107bc34: 0x107bc34: addiu a0, a0, -27784
-	ldloc.1
-	ldc.i4 -27784
-	add
-	stloc.1
-// 0x0107bc38: 0x107bc38: addiu a1, a1, -25496
-	ldloc.2
-	ldc.i4 -25496
+// 0x0107bd38: 0x107bd38: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
-	stloc.2
-// 0x0107bc3c: 0x107bc3c: jal   0x109e13c addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+	stloc.0
+// 0x0107bd3c: 0x107bd3c: sw    ra, 20(sp)
+// 0x0107bd40: 0x107bd40: jal   0x107bc04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_abuse_107bc04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bc44: 0x107bc44: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107bc48: 0x107bc48: jal   0x1098ec4 addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x0107bd48: 0x107bd48: lw    ra, 20(sp)
+// 0x0107bd4c: 0x107bd4c: addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 6
+// 0x0107bd50: 0x107bd50: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 report_abuse_confirm_dlg_callback_107bd58(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 ra,int32 v1)
+
+// local  5 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  7 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 7
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107bc50: 0x107bc50: bne   s1, zero, 0x107bc84 lui   a0, 0x10000
-	ldloc 9
-	ldc.i4 65536
-	stloc.1
-	brtrue L_107bc84
-// --- basic block ---
-// 0x0107bc58: 0x107bc58: jal   0x101df24 addiu a0, a0, -23972
-	ldloc.1
-	ldc.i4 -23972
+// 0x0107bd58: 0x107bd58: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x0107bd5c: 0x107bd5c: addiu v0, zero, 3
+	ldc.i4.3
+	stloc 5
+// 0x0107bd60: 0x107bd60: bne   a0, v0, 0x107bd88 sw    ra, 20(sp)
+	ldloc.1
+	ldloc 5
+	bne.un L_107bd88
+// --- basic block ---
+// 0x0107bd68: 0x107bd68: jal   0x10951ac addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107bc60: 0x107bc60: bne   v0, zero, 0x107bc84 addu  s1, v0, zero
-	ldloc 5
+// 0x0107bd70: 0x107bd70: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107bd74: 0x107bd74: lw    a0, -13540(v0)
+	ldloc 6
 	ldloc 5
-	stloc 9
-	brtrue L_107bc84
-// --- basic block ---
-// 0x0107bc68: 0x107bc68: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107bc6c: 0x107bc6c: addiu a2, a2, 48
-	ldloc.3
-	ldc.i4.s 48
-	add
-	stloc.3
-// 0x0107bc70: 0x107bc70: addiu a0, sp, 80
-	ldloc.0
-	ldc.i4.s 80
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3385
 	add
+	ldelem.i4
 	stloc.1
-// 0x0107bc74: 0x107bc74: jal   0x1000f9c addiu a1, zero, 150
-	ldc.i4 150
+// 0x0107bd78: 0x107bd78: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107bd7c: 0x107bd7c: lw    a1, -13536(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3384
+	add
+	ldelem.i4
 	stloc.2
+// 0x0107bd80: 0x107bd80: jal   0x106ba4c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ReportAbuse_106ba4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0107bc7c: 0x107bc7c: j	 0x107bd58 lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-	br L_107bd58
-// --- basic block ---
-L_107bc84:
-// 0x0107bc84: 0x107bc84: lw    a1, 4(s1)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc.2
-// 0x0107bc88: 0x107bc88: addiu v1, sp, 48
+L_107bd88:
+// 0x0107bd88: 0x107bd88: lw    ra, 20(sp)
+// 0x0107bd8c: 0x107bd8c: sll   zero, zero, 0
+// 0x0107bd90: 0x107bd90: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.s 48
+	ldc.i4.s 24
 	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_RefreshOnMap_107bd98(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 s3,int32 s4,int32 ra)
+
+// local  6 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 13 is register s3
+// local 14 is register s4
+// local 11 is register s5
+// local 12 is register s6
+// local  0 is register sp
+// local 15 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
 	stloc 6
-// 0x0107bc8c: 0x107bc8c: sw    a1, 56(sp)
-	ldloc 7
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 15
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 5
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107bd98: 0x107bd98: addiu sp, sp, -176
+	ldloc.0
+	ldc.i4 -176
+	add
+	stloc.0
+// 0x0107bd9c: 0x107bd9c: sw    s1, 148(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 14
+	ldc.i4.s 37
 	add
-	ldloc.2
-	stelem.i4
-// 0x0107bc90: 0x107bc90: lw    v0, 0(s1)
-	ldloc 7
 	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107bc94: 0x107bc94: sw    v1, 16(sp)
-	ldloc 7
+	stelem.i4
+// 0x0107bda0: 0x107bda0: lui   s1, 0x80000
+	ldc.i4 524288
+	stloc 9
+// 0x0107bda4: 0x107bda4: sw    s5, 164(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 41
 	add
-	ldloc 6
+	ldloc 11
 	stelem.i4
-// 0x0107bc98: 0x107bc98: addiu v1, sp, 44
-	ldloc.0
-	ldc.i4.s 44
+// 0x0107bda8: 0x107bda8: addiu s1, s1, -15564
+	ldloc 9
+	ldc.i4 -15564
 	add
-	stloc 6
-// 0x0107bc9c: 0x107bc9c: sw    v1, 20(sp)
-	ldloc 7
+	stloc 9
+// 0x0107bdac: 0x107bdac: lui   s5, 0x20000
+	ldc.i4 131072
+	stloc 11
+// 0x0107bdb0: 0x107bdb0: sw    s4, 160(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 40
 	add
-	ldloc 6
+	ldloc 14
 	stelem.i4
-// 0x0107bca0: 0x107bca0: addu  a0, v0, zero
+// 0x0107bdb4: 0x107bdb4: sw    s3, 156(sp)
 	ldloc 5
-	stloc.1
-// 0x0107bca4: 0x107bca4: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0107bca8: 0x107bca8: addiu a2, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.3
-// 0x0107bcac: 0x107bcac: addiu a3, sp, 36
 	ldloc.0
-	ldc.i4.s 36
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 39
 	add
-	stloc 4
-// 0x0107bcb0: 0x107bcb0: sw    v1, 24(sp)
-	ldloc 7
+	ldloc 13
+	stelem.i4
+// 0x0107bdb8: 0x107bdb8: sw    s2, 152(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 38
 	add
-	ldloc 6
+	ldloc 10
 	stelem.i4
-// 0x0107bcb4: 0x107bcb4: jal   0x1079ff4 sw    v0, 52(sp)
-	ldloc 7
+// 0x0107bdbc: 0x107bdbc: sw    ra, 172(sp)
+// 0x0107bdc0: 0x107bdc0: sw    s6, 168(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 13
+	ldc.i4.s 42
 	add
-	ldloc 5
+	ldloc 12
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl91::RTAlerts_Get_City_Street_1079ff4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107bcbc: 0x107bcbc: lw    v0, 40(sp)
-	ldloc 7
+// 0x0107bdc4: 0x107bdc4: sw    s0, 144(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 36
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107bcc0: 0x107bcc0: sll   zero, zero, 0
-// 0x0107bcc4: 0x107bcc4: bne   v0, zero, 0x107bce4 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107bce4
-// --- basic block ---
-// 0x0107bccc: 0x107bccc: lw    v1, 36(sp)
-	ldloc 7
+	ldloc 8
+	stelem.i4
+// 0x0107bdc8: 0x107bdc8: addiu s5, s5, -25428
+	ldloc 11
+	ldc.i4 -25428
+	add
+	stloc 11
+// 0x0107bdcc: 0x107bdcc: addu  s2, zero, zero
+	ldc.i4.s 0
+	stloc 10
+// 0x0107bdd0: 0x107bdd0: addu  s4, s1, zero
+	ldloc 9
+	stloc 14
+// 0x0107bdd4: 0x107bdd4: j	 0x107be78 addiu s3, sp, 16
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
+	ldc.i4.s 16
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107bcd0: 0x107bcd0: sll   zero, zero, 0
-// 0x0107bcd4: 0x107bcd4: bne   v1, zero, 0x107bd00 lui   a0, 0x20000
-	ldloc 6
-	ldc.i4 131072
-	stloc.1
-	brtrue L_107bd00
-// --- basic block ---
-// 0x0107bcdc: 0x107bcdc: j	 0x107bd5c addiu a3, zero, 24
-	ldc.i4.s 24
-	stloc 4
-	br L_107bd5c
+	stloc 13
+	br L_107be78
 // --- basic block ---
-L_107bce4:
-// 0x0107bce4: 0x107bce4: lb    v1, 0(v0)
+L_107bddc:
+// 0x0107bddc: 0x107bddc: lw    s0, 0(s1)
 	ldloc 5
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x0107bce8: 0x107bce8: sll   zero, zero, 0
-// 0x0107bcec: 0x107bcec: bne   v1, zero, 0x107bd00 lui   a2, 0x10000
-	ldloc 6
-	ldc.i4 65536
-	stloc.3
-	brtrue L_107bd00
-// --- basic block ---
-// 0x0107bcf4: 0x107bcf4: lw    a3, 36(sp)
-	ldloc 7
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
-	add
 	ldelem.i4
-	stloc 4
-// 0x0107bcf8: 0x107bcf8: j	 0x107bd2c addiu a2, a2, 19912
-	ldloc.3
-	ldc.i4 19912
-	add
-	stloc.3
-	br L_107bd2c
-// --- basic block ---
-L_107bd00:
-// 0x0107bd00: 0x107bd00: lw    a3, 36(sp)
-	ldloc 7
-	ldloc.0
+	stloc 8
+// 0x0107bde0: 0x107bde0: sll   zero, zero, 0
+// 0x0107bde4: 0x107bde4: lw    a3, 0(s0)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 9
-	add
 	ldelem.i4
 	stloc 4
-// 0x0107bd04: 0x107bd04: sll   zero, zero, 0
-// 0x0107bd08: 0x107bd08: beq   a3, zero, 0x107bd40 lui   a2, 0x10000
-	ldloc 4
-	ldc.i4 65536
-	stloc.3
-	brfalse L_107bd40
-// --- basic block ---
-// 0x0107bd10: 0x107bd10: lb    v1, 0(a3)
-	ldloc 4
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 6
-// 0x0107bd14: 0x107bd14: sll   zero, zero, 0
-// 0x0107bd18: 0x107bd18: bne   v1, zero, 0x107bd40 sll   zero, zero, 0
-	ldloc 6
-	brtrue L_107bd40
-// --- basic block ---
-// 0x0107bd20: 0x107bd20: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107bd24: 0x107bd24: addiu a2, a2, 19912
-	ldloc.3
-	ldc.i4 19912
-	add
-	stloc.3
-// 0x0107bd28: 0x107bd28: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-L_107bd2c:
-// 0x0107bd2c: 0x107bd2c: addiu a0, sp, 80
-	ldloc.0
-	ldc.i4.s 80
-	add
-	stloc.1
-// 0x0107bd30: 0x107bd30: jal   0x1000f9c addiu a1, zero, 150
-	ldc.i4 150
-	stloc.2
+// 0x0107bde8: 0x107bde8: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1732,1157 +1542,1073 @@ L_107bd2c:
 	ldloc 4
 	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bd38: 0x107bd38: j	 0x107bd58 lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-	br L_107bd58
-// --- basic block ---
-L_107bd40:
-// 0x0107bd40: 0x107bd40: addiu a2, a2, -10228
-	ldloc.3
-	ldc.i4 -10228
-	add
-	stloc.3
-// 0x0107bd44: 0x107bd44: addiu a0, sp, 80
-	ldloc.0
-	ldc.i4.s 80
-	add
+// 0x0107bdf0: 0x107bdf0: jal   0x101ca1c addu  a0, s3, zero
+	ldloc 13
 	stloc.1
-// 0x0107bd48: 0x107bd48: addiu a1, zero, 150
-	ldc.i4 150
-	stloc.2
-// 0x0107bd4c: 0x107bd4c: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_string_new_101ca1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bd54: 0x107bd54: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-L_107bd58:
-// 0x0107bd58: 0x107bd58: addiu a3, zero, 24
-	ldc.i4.s 24
-	stloc 4
-L_107bd5c:
-// 0x0107bd5c: 0x107bd5c: addiu a0, a0, -25480
-	ldloc.1
-	ldc.i4 -25480
+// 0x0107bdf8: 0x107bdf8: lw    a0, 4(s0)
+	ldloc 5
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
+	ldelem.i4
 	stloc.1
-// 0x0107bd60: 0x107bd60: addiu a1, sp, 80
-	ldloc.0
-	ldc.i4.s 80
-	add
-	stloc.2
-// 0x0107bd64: 0x107bd64: jal   0x1098d10 addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
+// 0x0107bdfc: 0x107bdfc: jal   0x10a739c addu  s6, v0, zero
+	ldloc 6
+	stloc 12
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bd6c: 0x107bd6c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107bd70: 0x107bd70: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107bd74: 0x107bd74: addu  a0, v0, zero
-	ldloc 5
+// 0x0107be04: 0x107be04: beq   v0, zero, 0x107be3c addu  a0, s6, zero
+	ldloc 6
+	ldloc 12
 	stloc.1
-// 0x0107bd78: 0x107bd78: addiu a1, a1, -25464
-	ldloc.2
-	ldc.i4 -25464
-	add
-	stloc.2
-// 0x0107bd7c: 0x107bd7c: jal   0x1098fe0 sw    v0, 280(sp)
-	ldloc 7
-	ldloc.0
+	brfalse L_107be3c
+// --- basic block ---
+// 0x0107be0c: 0x107be0c: jal   0x101bcd8 sll   zero, zero, 0
+	ldloc.1
+	call int32 Cibyl20::roadmap_object_exists_101bcd8(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
+// --- basic block ---
+// 0x0107be14: 0x107be14: bne   v0, zero, 0x107be3c sll   zero, zero, 0
+	ldloc 6
+	brtrue L_107be3c
+// --- basic block ---
+// 0x0107be1c: 0x107be1c: lw    v0, 1836(s0)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4 459
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc 6
+// 0x0107be20: 0x107be20: sll   zero, zero, 0
+// 0x0107be24: 0x107be24: bne   v0, zero, 0x107be3c sll   zero, zero, 0
+	ldloc 6
+	brtrue L_107be3c
+// --- basic block ---
+// 0x0107be2c: 0x107be2c: jal   0x107b198 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl92::CreateAlertObject_107b198(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 6
 // --- basic block ---
-// 0x0107bd84: 0x107bd84: lw    v0, 280(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107be34: 0x107be34: j	 0x107be68 sll   zero, zero, 0
+	br L_107be68
+// --- basic block ---
+L_107be3c:
+// 0x0107be3c: 0x107be3c: lw    a0, 4(s0)
+	ldloc 5
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107bd88: 0x107bd88: addu  a0, s2, zero
-	ldloc 10
 	stloc.1
-// 0x0107bd8c: 0x107bd8c: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
+// 0x0107be40: 0x107be40: jal   0x10a739c sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bd94: 0x107bd94: addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-// 0x0107bd98: 0x107bd98: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 8
+// 0x0107be48: 0x107be48: bne   v0, zero, 0x107be68 sll   zero, zero, 0
+	ldloc 6
+	brtrue L_107be68
+// --- basic block ---
+// 0x0107be50: 0x107be50: jal   0x101bcd8 addu  a0, s6, zero
+	ldloc 12
 	stloc.1
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl20::roadmap_object_exists_101bcd8(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bda0: 0x107bda0: jal   0x1078614 addiu a0, zero, 2
-	ldc.i4.2
+// 0x0107be58: 0x107be58: beq   v0, zero, 0x107be68 sll   zero, zero, 0
+	ldloc 6
+	brfalse L_107be68
+// --- basic block ---
+// 0x0107be60: 0x107be60: jal   0x107ab94 addu  a0, s0, zero
+	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::space_1078614(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::DeleteAlertObject_107ab94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bda8: 0x107bda8: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107bdac: 0x107bdac: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 8
+L_107be68:
+// 0x0107be68: 0x107be68: jal   0x101c908 addu  a0, s6, zero
+	ldloc 12
 	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl20::roadmap_string_release_101c908(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107bdb4: 0x107bdb4: lui   s1, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x0107bdb8: 0x107bdb8: lui   s5, 0x80000
-	ldc.i4 524288
-	stloc 11
-// 0x0107bdbc: 0x107bdbc: lui   t0, 0x100000
-	ldc.i4 1048576
-	stloc 13
-// 0x0107bdc0: 0x107bdc0: lui   v1, 0x20000
-	ldc.i4 131072
-	stloc 6
-// 0x0107bdc4: 0x107bdc4: lui   s6, 0x0
-	ldc.i4.s 0
-	stloc 12
-// 0x0107bdc8: 0x107bdc8: lui   s8, 0x10000
-	ldc.i4 65536
-	stloc 17
-// 0x0107bdcc: 0x107bdcc: lui   s7, 0x20000
-	ldc.i4 131072
-	stloc 16
-// 0x0107bdd0: 0x107bdd0: addiu s1, s1, -13972
+// 0x0107be70: 0x107be70: addiu s2, s2, 1
+	ldloc 10
+	ldc.i4.1
+	add
+	stloc 10
+// 0x0107be74: 0x107be74: addiu s1, s1, 4
 	ldloc 9
-	ldc.i4 -13972
+	ldc.i4.4
 	add
 	stloc 9
-// 0x0107bdd4: 0x107bdd4: addiu s5, s5, -13912
-	ldloc 11
-	ldc.i4 -13912
+L_107be78:
+// 0x0107be78: 0x107be78: lw    v0, 2000(s4)
+	ldloc 5
+	ldloc 14
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
 	add
-	stloc 11
-// 0x0107bdd8: 0x107bdd8: ori   t0, t0, 136
-	ldloc 13
-	ldc.i4 136
-	or
-	stloc 13
-// 0x0107bddc: 0x107bddc: addiu v1, v1, -25456
+	ldelem.i4
+	stloc 6
+// 0x0107be7c: 0x107be7c: addiu a1, zero, 128
+	ldc.i4 128
+	stloc.2
+// 0x0107be80: 0x107be80: slt   v0, s2, v0
+	ldloc 10
 	ldloc 6
-	ldc.i4 -25456
-	add
+	clt
 	stloc 6
-// 0x0107bde0: 0x107bde0: addiu s6, s6, 15832
-	ldloc 12
-	ldc.i4 15832
-	add
-	stloc 12
-// 0x0107bde4: 0x107bde4: addiu s8, s8, -27036
-	ldloc 17
-	ldc.i4 -27036
-	add
-	stloc 17
-// 0x0107bde8: 0x107bde8: addiu s7, s7, -25444
-	ldloc 16
-	ldc.i4 -25444
-	add
-	stloc 16
-// 0x0107bdec: 0x107bdec: addu  s4, zero, zero
-	ldc.i4.s 0
-	stloc 15
-// 0x0107bdf0: 0x107bdf0: j	 0x107bee8 lui   t1, 0x80000
-	ldc.i4 524288
-	stloc 18
-	br L_107bee8
+// 0x0107be84: 0x107be84: addu  a2, s5, zero
+	ldloc 11
+	stloc.3
+// 0x0107be88: 0x107be88: bne   v0, zero, 0x107bddc addu  a0, s3, zero
+	ldloc 6
+	ldloc 13
+	stloc.1
+	brtrue L_107bddc
 // --- basic block ---
-L_107bdf8:
-// 0x0107bdf8: 0x107bdf8: sw    t0, 16(sp)
-	ldloc 7
+// 0x0107be90: 0x107be90: lw    ra, 172(sp)
+// 0x0107be94: 0x107be94: lw    s6, 168(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 42
 	add
-	ldloc 13
-	stelem.i4
-// 0x0107bdfc: 0x107bdfc: sw    v1, 292(sp)
-	ldloc 7
+	ldelem.i4
+	stloc 12
+// 0x0107be98: 0x107be98: lw    s5, 164(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 73
+	ldc.i4.s 41
 	add
-	ldloc 6
-	stelem.i4
-// 0x0107be00: 0x107be00: sw    t0, 288(sp)
-	ldloc 7
+	ldelem.i4
+	stloc 11
+// 0x0107be9c: 0x107be9c: lw    s4, 160(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 72
+	ldc.i4.s 40
 	add
-	ldloc 13
-	stelem.i4
-// 0x0107be04: 0x107be04: jal   0x1093a24 sw    t1, 284(sp)
-	ldloc 7
+	ldelem.i4
+	stloc 14
+// 0x0107bea0: 0x107bea0: lw    s3, 156(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 71
+	ldc.i4.s 39
 	add
-	ldloc 18
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107be0c: 0x107be0c: addu  s2, v0, zero
+	ldelem.i4
+	stloc 13
+// 0x0107bea4: 0x107bea4: lw    s2, 152(sp)
 	ldloc 5
-	stloc 10
-// 0x0107be10: 0x107be10: lw    v0, 0(s1)
-	ldloc 7
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 38
+	add
 	ldelem.i4
-	stloc 5
-// 0x0107be14: 0x107be14: lui   a3, 0x1080000
-	ldc.i4 17301504
-	stloc 4
-// 0x0107be18: 0x107be18: sll   v0, v0, 2
+	stloc 10
+// 0x0107bea8: 0x107bea8: lw    s1, 148(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
-	shl
-	stloc 5
-// 0x0107be1c: 0x107be1c: addu  v0, v0, s6
-	ldloc 5
-	ldloc 12
+	shr.un
+	ldc.i4.s 37
 	add
-	stloc 5
-// 0x0107be20: 0x107be20: lw    a0, 0(v0)
-	ldloc 7
+	ldelem.i4
+	stloc 9
+// 0x0107beac: 0x107beac: lw    s0, 144(sp)
 	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 36
+	add
 	ldelem.i4
-	stloc.1
-// 0x0107be24: 0x107be24: addiu a2, zero, 16
-	ldc.i4.s 16
-	stloc.3
-// 0x0107be28: 0x107be28: addiu a3, a3, -32548
-	ldloc 4
-	ldc.i4 -32548
+	stloc 8
+// 0x0107beb0: 0x107beb0: jr    ra addiu sp, sp, 176
+	ldloc.0
+	ldc.i4 176
 	add
-	stloc 4
-// 0x0107be2c: 0x107be2c: addu  a1, zero, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTAlerts_Init_107beb8(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 t0,int32 s0,int32 s1,int32 s4,int32 s2,int32 s3,int32 s5,int32 ra,int32 t1)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register t0
+// local 16 is register t1
+// local  9 is register s0
+// local 10 is register s1
+// local 12 is register s2
+// local 13 is register s3
+// local 11 is register s4
+// local 14 is register s5
+// local  0 is register sp
+// local 15 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc.2
-// 0x0107be30: 0x107be30: addiu v0, zero, 1
-	ldc.i4.1
 	stloc 5
-// 0x0107be34: 0x107be34: sw    zero, 16(sp)
-	ldloc 7
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 16
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 14
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 15
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107beb8: 0x107beb8: addiu sp, sp, -48
+	ldloc.0
+	ldc.i4.s -48
+	add
+	stloc.0
+// 0x0107bebc: 0x107bebc: sw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldc.i4.s 0
+	ldloc 9
 	stelem.i4
-// 0x0107be38: 0x107be38: sw    zero, 20(sp)
-	ldloc 7
+// 0x0107bec0: 0x107bec0: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 9
+// 0x0107bec4: 0x107bec4: lw    v0, -15572(s0)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3893
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107bec8: 0x107bec8: sw    ra, 44(sp)
+// 0x0107becc: 0x107becc: sw    s5, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 10
 	add
-	ldc.i4.s 0
+	ldloc 14
 	stelem.i4
-// 0x0107be3c: 0x107be3c: jal   0x109c14c sw    v0, 24(sp)
-	ldloc 7
+// 0x0107bed0: 0x107bed0: sw    s4, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 9
 	add
-	ldloc 5
+	ldloc 11
 	stelem.i4
+// 0x0107bed4: 0x107bed4: sw    s3, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_checkbox_new_109c14c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107be44: 0x107be44: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107be48: 0x107be48: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x0107be4c: 0x107be4c: jal   0x1098ec4 sw    v0, 0(s5)
-	ldloc 7
-	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldloc 5
+	ldc.i4.8
+	add
+	ldloc 13
 	stelem.i4
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107be54: 0x107be54: addiu a3, zero, 14
-	ldc.i4.s 14
-	stloc 4
-// 0x0107be58: 0x107be58: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107be5c: 0x107be5c: addiu a2, zero, 10
-	ldc.i4.s 10
-	stloc.3
-// 0x0107be60: 0x107be60: addu  a0, s8, zero
-	ldloc 17
-	stloc.1
-// 0x0107be64: 0x107be64: jal   0x1093a24 sw    zero, 16(sp)
-	ldloc 7
+// 0x0107bed8: 0x107bed8: sw    s2, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldc.i4.s 0
+	ldloc 12
 	stelem.i4
+// 0x0107bedc: 0x107bedc: bne   v0, zero, 0x107bef8 sw    s1, 24(sp)
+	ldloc 5
+	ldloc 6
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 10
+	stelem.i4
+	brtrue L_107bef8
+// --- basic block ---
+// 0x0107bee4: 0x107bee4: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0107bee8: 0x107bee8: jal   0x1033170 addiu a0, a0, 15744
+	ldloc.1
+	ldc.i4 15744
+	add
+	stloc.1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl37::roadmap_alerter_register_1033170(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107be6c: 0x107be6c: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107be70: 0x107be70: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107be74: 0x107be74: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107be78: 0x107be78: jal   0x1098fe0 sw    v0, 280(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107bef0: 0x107bef0: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107bef4: 0x107bef4: sw    v0, -15572(s0)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 70
+	ldc.i4 -3893
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107be80: 0x107be80: lw    v0, 280(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 70
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107be84: 0x107be84: addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-// 0x0107be88: 0x107be88: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107be90: 0x107be90: lw    v0, 0(s1)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107be94: 0x107be94: addiu s4, s4, 1
-	ldloc 15
-	ldc.i4.1
-	add
-	stloc 15
-// 0x0107be98: 0x107be98: sll   v0, v0, 2
-	ldloc 5
-	ldc.i4.2
-	shl
+L_107bef8:
+// 0x0107bef8: 0x107bef8: lui   v0, 0x80000
+	ldc.i4 524288
 	stloc 5
-// 0x0107be9c: 0x107be9c: addu  v0, v0, s6
+// 0x0107befc: 0x107befc: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 7
+// 0x0107bf00: 0x107bf00: addiu v0, v0, -15564
 	ldloc 5
-	ldloc 12
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107bea0: 0x107bea0: lw    a0, 0(v0)
+// 0x0107bf04: 0x107bf04: addiu v1, v1, -13564
 	ldloc 7
+	ldc.i4 -13564
+	add
+	stloc 7
+L_107bf08:
+// 0x0107bf08: 0x107bf08: sw    zero, 0(v0)
+	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107bea4: 0x107bea4: jal   0x101cd60 addiu s1, s1, 4
-	ldloc 9
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bf0c: 0x107bf0c: addiu v0, v0, 4
+	ldloc 5
 	ldc.i4.4
 	add
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x0107beac: 0x107beac: addu  a1, v0, zero
+// 0x0107bf10: 0x107bf10: bne   v0, v1, 0x107bf08 lui   t0, 0x80000
 	ldloc 5
-	stloc.2
-// 0x0107beb0: 0x107beb0: addiu a2, zero, 14
-	ldc.i4.s 14
-	stloc.3
-// 0x0107beb4: 0x107beb4: addiu a3, zero, 152
-	ldc.i4 152
-	stloc 4
-// 0x0107beb8: 0x107beb8: jal   0x1098d10 addu  a0, s7, zero
-	ldloc 16
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldloc 7
+	ldc.i4 524288
+	stloc 8
+	bne.un L_107bf08
 // --- basic block ---
-// 0x0107bec0: 0x107bec0: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107bec4: 0x107bec4: jal   0x1098ec4 addu  a0, s2, zero
-	ldloc 10
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0107bf18: 0x107bf18: addiu v0, zero, -1
+	ldc.i4.m1
 	stloc 5
-// --- basic block ---
-// 0x0107becc: 0x107becc: addu  a0, s0, zero
+// 0x0107bf1c: 0x107bf1c: addiu t1, t0, -13516
+	ldloc 8
+	ldc.i4 -13516
+	add
+	stloc 16
+// 0x0107bf20: 0x107bf20: sw    v0, -13516(t0)
+	ldloc 6
 	ldloc 8
-	stloc.1
-// 0x0107bed0: 0x107bed0: jal   0x1098ec4 addu  a1, s2, zero
-	ldloc 10
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107bed8: 0x107bed8: lw    t1, 284(sp)
-	ldloc 7
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 71
+	ldc.i4 -3379
 	add
-	ldelem.i4
-	stloc 18
-// 0x0107bedc: 0x107bedc: lw    t0, 288(sp)
-	ldloc 7
-	ldloc.0
+	ldloc 5
+	stelem.i4
+// 0x0107bf24: 0x107bf24: lui   t0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107bf28: 0x107bf28: sw    zero, -13544(t0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 72
+	ldc.i4 -3386
 	add
-	ldelem.i4
-	stloc 13
-// 0x0107bee0: 0x107bee0: lw    v1, 292(sp)
-	ldloc 7
-	ldloc.0
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bf2c: 0x107bf2c: lui   t0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107bf30: 0x107bf30: sw    zero, -13552(t0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 73
-	add
-	ldelem.i4
-	stloc 6
-// 0x0107bee4: 0x107bee4: addiu s5, s5, 4
-	ldloc 11
-	ldc.i4.4
+	ldc.i4 -3388
 	add
-	stloc 11
-L_107bee8:
-// 0x0107bee8: 0x107bee8: lw    v0, -16244(t1)
-	ldloc 7
-	ldloc 18
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bf34: 0x107bf34: lui   t0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107bf38: 0x107bf38: sw    v0, -13540(t0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4061
+	ldc.i4 -3385
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107beec: 0x107beec: addu  a0, v1, zero
-	ldloc 6
-	stloc.1
-// 0x0107bef0: 0x107bef0: slt   t2, s4, v0
-	ldloc 15
 	ldloc 5
-	clt
-	stloc 20
-// 0x0107bef4: 0x107bef4: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107bef8: 0x107bef8: addiu a2, zero, -2
-	ldc.i4.s -2
-	stloc.3
-// 0x0107befc: 0x107befc: bne   t2, zero, 0x107bdf8 addiu a3, zero, 35
-	ldloc 20
-	ldc.i4.s 35
-	stloc 4
-	brtrue L_107bdf8
-// --- basic block ---
-// 0x0107bf04: 0x107bf04: addiu v0, v0, -1
+	stelem.i4
+// 0x0107bf3c: 0x107bf3c: lui   t0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107bf40: 0x107bf40: sw    v0, -13536(t0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3384
+	add
 	ldloc 5
-	ldc.i4.m1
+	stelem.i4
+// 0x0107bf44: 0x107bf44: lui   t0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107bf48: 0x107bf48: sw    zero, -13528(t0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3382
 	add
-	stloc 5
-// 0x0107bf08: 0x107bf08: lui   v1, 0x80000
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bf4c: 0x107bf4c: lui   v1, 0x80000
 	ldc.i4 524288
-	stloc 6
-// 0x0107bf0c: 0x107bf0c: addiu v1, v1, -13912
+	stloc 7
+// 0x0107bf50: 0x107bf50: lui   t0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107bf54: 0x107bf54: addiu v1, v1, -15564
+	ldloc 7
+	ldc.i4 -15564
+	add
+	stloc 7
+// 0x0107bf58: 0x107bf58: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 10
+// 0x0107bf5c: 0x107bf5c: lui   s0, 0x10000
+	ldc.i4 65536
+	stloc 9
+// 0x0107bf60: 0x107bf60: sw    zero, -13524(t0)
 	ldloc 6
-	ldc.i4 -13912
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3381
 	add
-	stloc 6
-// 0x0107bf10: 0x107bf10: sll   v0, v0, 2
-	ldloc 5
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bf64: 0x107bf64: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107bf68: 0x107bf68: lui   t0, 0x0
+	ldc.i4.s 0
+	stloc 8
+// 0x0107bf6c: 0x107bf6c: sw    v0, 15944(t0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
-	shl
-	stloc 5
-// 0x0107bf14: 0x107bf14: addu  v0, v0, v1
+	shr.un
+	ldc.i4 3986
+	add
 	ldloc 5
+	stelem.i4
+// 0x0107bf70: 0x107bf70: sw    zero, 2008(v1)
 	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldc.i4 502
 	add
-	stloc 5
-// 0x0107bf18: 0x107bf18: lw    a0, 0(v0)
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bf74: 0x107bf74: lui   t0, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107bf78: 0x107bf78: sw    zero, 2000(v1)
+	ldloc 6
 	ldloc 7
-	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107bf1c: 0x107bf1c: lui   a1, 0x0
+	ldc.i4 500
+	add
 	ldc.i4.s 0
-	stloc.2
-// 0x0107bf20: 0x107bf20: lw    v0, 180(a0)
+	stelem.i4
+// 0x0107bf7c: 0x107bf7c: sw    zero, 2004(v1)
+	ldloc 6
 	ldloc 7
-	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 45
+	ldc.i4 501
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107bf24: 0x107bf24: sll   zero, zero, 0
-// 0x0107bf28: 0x107bf28: jalr  v0 addiu a1, a1, 20820
-	ldloc 5
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107bf80: 0x107bf80: addiu a0, s1, 19712
+	ldloc 10
+	ldc.i4 19712
+	add
+	stloc.1
+// 0x0107bf84: 0x107bf84: addiu a1, a1, 15980
 	ldloc.2
-	ldc.i4 20820
+	ldc.i4 15980
 	add
 	stloc.2
+// 0x0107bf88: 0x107bf88: addiu a2, s0, 9420
+	ldloc 9
+	ldc.i4 9420
+	add
+	stloc.3
+// 0x0107bf8c: 0x107bf8c: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107bf90: 0x107bf90: sw    v0, 4(t1)
+	ldloc 6
+	ldloc 16
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107bf94: 0x107bf94: jal   0x100edc0 sw    zero, -15764(t0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3941
+	add
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bf30: 0x107bf30: jal   0x1078614 addiu a0, zero, 2
-	ldc.i4.2
+// 0x0107bf9c: 0x107bf9c: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107bfa0: 0x107bfa0: addiu a0, s1, 19712
+	ldloc 10
+	ldc.i4 19712
+	add
 	stloc.1
+// 0x0107bfa4: 0x107bfa4: addiu a1, a1, 15996
+	ldloc.2
+	ldc.i4 15996
+	add
+	stloc.2
+// 0x0107bfa8: 0x107bfa8: addiu a2, s0, 9420
+	ldloc 9
+	ldc.i4 9420
+	add
+	stloc.3
+// 0x0107bfac: 0x107bfac: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::space_1078614(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bf38: 0x107bf38: addu  a1, v0, zero
-	ldloc 5
+// 0x0107bfb4: 0x107bfb4: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 10
+// 0x0107bfb8: 0x107bfb8: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-// 0x0107bf3c: 0x107bf3c: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107bf44: 0x107bf44: lui   a0, 0x20000
+// 0x0107bfbc: 0x107bfbc: lui   a2, 0x20000
 	ldc.i4 131072
-	stloc.1
-// 0x0107bf48: 0x107bf48: jal   0x101cd60 addiu a0, a0, -26808
-	ldloc.1
-	ldc.i4 -26808
+	stloc.3
+// 0x0107bfc0: 0x107bfc0: addiu a1, a1, 15948
+	ldloc.2
+	ldc.i4 15948
+	add
+	stloc.2
+// 0x0107bfc4: 0x107bfc4: addiu a2, a2, -25152
+	ldloc.3
+	ldc.i4 -25152
+	add
+	stloc.3
+// 0x0107bfc8: 0x107bfc8: addiu a0, s1, 12556
+	ldloc 10
+	ldc.i4 12556
 	add
 	stloc.1
+// 0x0107bfcc: 0x107bfcc: jal   0x100edc0 addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bf50: 0x107bf50: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107bf54: 0x107bf54: addiu a0, a0, -25428
-	ldloc.1
-	ldc.i4 -25428
+// 0x0107bfd4: 0x107bfd4: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107bfd8: 0x107bfd8: lw    v1, -15568(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3892
 	add
-	stloc.1
-// 0x0107bf58: 0x107bf58: jal   0x101cd60 addu  s1, v0, zero
+	ldelem.i4
+	stloc 7
+// 0x0107bfdc: 0x107bfdc: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107bfe0: 0x107bfe0: beq   v1, v0, 0x107c094 lui   s0, 0x0
+	ldloc 7
 	ldloc 5
+	ldc.i4.s 0
 	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	beq  L_107c094
 // --- basic block ---
-// 0x0107bf60: 0x107bf60: addiu v1, zero, -2
-	ldc.i4.s -2
-	stloc 6
-// 0x0107bf64: 0x107bf64: lui   a1, 0x10000
+// 0x0107bfe8: 0x107bfe8: lui   a2, 0x10000
 	ldc.i4 65536
-	stloc.2
-// 0x0107bf68: 0x107bf68: lui   a2, 0x100000
-	ldc.i4 1048576
 	stloc.3
-// 0x0107bf6c: 0x107bf6c: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x0107bf70: 0x107bf70: addu  a0, s1, zero
+// 0x0107bfec: 0x107bfec: addiu a1, s0, 16012
 	ldloc 9
-	stloc.1
-// 0x0107bf74: 0x107bf74: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
+	ldc.i4 16012
 	add
 	stloc.2
-// 0x0107bf78: 0x107bf78: sw    v1, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 6
-	stelem.i4
-// 0x0107bf7c: 0x107bf7c: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x0107bf80: 0x107bf80: sw    v1, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
+// 0x0107bff0: 0x107bff0: addiu a2, a2, 18768
+	ldloc.3
+	ldc.i4 18768
 	add
-	ldloc 6
-	stelem.i4
-// 0x0107bf84: 0x107bf84: jal   0x109683c sw    v0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
+	stloc.3
+// 0x0107bff4: 0x107bff4: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107bff8: 0x107bff8: jal   0x100edc0 addiu a0, s1, 12556
+	ldloc 10
+	ldc.i4 12556
 	add
-	ldloc 5
-	stelem.i4
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_entry_new_109683c(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bf8c: 0x107bf8c: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107bf90: 0x107bf90: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 8
+// 0x0107c000: 0x107c000: jal   0x100e358 addiu a0, s0, 16012
+	ldloc 9
+	ldc.i4 16012
+	add
 	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bf98: 0x107bf98: jal   0x1078614 addiu a0, zero, 2
-	ldc.i4.2
+// 0x0107c008: 0x107c008: jal   0x1001ba8 addu  a0, v0, zero
+	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::space_1078614(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strdup_1001ba8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bfa0: 0x107bfa0: addu  a1, v0, zero
-	ldloc 5
+// 0x0107c010: 0x107c010: lui   s0, 0x10000
+	ldc.i4 65536
+	stloc 9
+// 0x0107c014: 0x107c014: addiu a1, s0, -22604
+	ldloc 9
+	ldc.i4 -22604
+	add
 	stloc.2
-// 0x0107bfa4: 0x107bfa4: jal   0x1098ec4 addu  a0, s0, zero
-	ldloc 8
+// 0x0107c018: 0x107c018: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
+// 0x0107c01c: 0x107c01c: lui   s4, 0x80000
+	ldc.i4 524288
+	stloc 11
+// 0x0107c020: 0x107c020: addu  s1, v0, zero
+	ldloc 5
+	stloc 10
+// 0x0107c024: 0x107c024: jal   0x1001984 addiu s5, s0, -22604
+	ldloc 9
+	ldc.i4 -22604
+	add
+	stloc 14
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl1::strtok_1001984(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bfac: 0x107bfac: lui   a1, 0x1080000
-	ldc.i4 17301504
-	stloc.2
-// 0x0107bfb0: 0x107bfb0: addiu a1, a1, -31104
-	ldloc.2
-	ldc.i4 -31104
+// 0x0107c02c: 0x107c02c: addiu s4, s4, -13508
+	ldloc 11
+	ldc.i4 -13508
 	add
-	stloc.2
-// 0x0107bfb4: 0x107bfb4: jal   0x1099174 addu  a0, s3, zero
-	ldloc 14
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	stloc 11
+// 0x0107c030: 0x107c030: addu  s0, zero, zero
+	ldc.i4.s 0
+	stloc 9
+// 0x0107c034: 0x107c034: j	 0x107c078 lui   s2, 0x80000
+	ldc.i4 524288
+	stloc 12
+	br L_107c078
 // --- basic block ---
-// 0x0107bfbc: 0x107bfbc: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107bfc0: 0x107bfc0: jal   0x101cd60 addiu a0, a0, -6464
-	ldloc.1
-	ldc.i4 -6464
-	add
-	stloc.1
+L_107c03c:
+// 0x0107c03c: 0x107c03c: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl::atoi_1000d8c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bfc8: 0x107bfc8: addu  a1, v0, zero
+// 0x0107c044: 0x107c044: addu  s3, v0, zero
 	ldloc 5
-	stloc.2
-// 0x0107bfcc: 0x107bfcc: jal   0x109b434 addu  a0, s3, zero
-	ldloc 14
+	stloc 13
+// 0x0107c048: 0x107c048: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
+// 0x0107c04c: 0x107c04c: jal   0x1001984 addu  a1, s5, zero
+	ldloc 14
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::strtok_1001984(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107bfd4: 0x107bfd4: addu  a0, s3, zero
-	ldloc 14
+// 0x0107c054: 0x107c054: sll   a0, s0, 2
+	ldloc 9
+	ldc.i4.2
+	shl
 	stloc.1
-// 0x0107bfd8: 0x107bfd8: jal   0x1098ec4 addu  a1, s0, zero
-	ldloc 8
-	stloc.2
+// 0x0107c058: 0x107c058: slti  v1, s3, 11
+	ldloc 13
+	ldc.i4.s 11
+	clt
+	stloc 7
+// 0x0107c05c: 0x107c05c: beq   v1, zero, 0x107c078 addu  a0, a0, s4
+	ldloc 7
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107bfe0: 0x107bfe0: lui   a0, 0x20000
-	ldc.i4 131072
+	ldloc 11
+	add
 	stloc.1
-// 0x0107bfe4: 0x107bfe4: addiu a0, a0, -25520
+	brfalse L_107c078
+// --- basic block ---
+// 0x0107c064: 0x107c064: lw    v1, -15780(s2)
+	ldloc 6
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3945
+	add
+	ldelem.i4
+	stloc 7
+// 0x0107c068: 0x107c068: sw    s3, 0(a0)
+	ldloc 6
 	ldloc.1
-	ldc.i4 -25520
+	ldc.i4.2
+	shr.un
+	ldloc 13
+	stelem.i4
+// 0x0107c06c: 0x107c06c: addiu v1, v1, 1
+	ldloc 7
+	ldc.i4.1
+	add
+	stloc 7
+// 0x0107c070: 0x107c070: sw    v1, -15780(s2)
+	ldloc 6
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3945
+	add
+	ldloc 7
+	stelem.i4
+// 0x0107c074: 0x107c074: addiu s0, s0, 1
+	ldloc 9
+	ldc.i4.1
 	add
+	stloc 9
+L_107c078:
+// 0x0107c078: 0x107c078: bne   v0, zero, 0x107c03c addu  a0, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc.1
+	brtrue L_107c03c
+// --- basic block ---
+// 0x0107c080: 0x107c080: jal   0x1000930 addu  a0, s1, zero
+	ldloc 10
 	stloc.1
-// 0x0107bfe8: 0x107bfe8: jal   0x1095eec addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-L_107bff0:
-// 0x0107bff0: 0x107bff0: lw    ra, 332(sp)
-// 0x0107bff4: 0x107bff4: lw    s8, 328(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107c088: 0x107c088: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 7
+// 0x0107c08c: 0x107c08c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107c090: 0x107c090: sw    v1, -15568(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 82
+	ldc.i4 -3892
 	add
-	ldelem.i4
-	stloc 17
-// 0x0107bff8: 0x107bff8: lw    s7, 324(sp)
 	ldloc 7
+	stelem.i4
+L_107c094:
+// 0x0107c094: 0x107c094: lw    ra, 44(sp)
+// 0x0107c098: 0x107c098: lw    s5, 40(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 81
+	ldc.i4.s 10
 	add
 	ldelem.i4
-	stloc 16
-// 0x0107bffc: 0x107bffc: lw    s6, 320(sp)
-	ldloc 7
+	stloc 14
+// 0x0107c09c: 0x107c09c: lw    s4, 36(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 80
+	ldc.i4.s 9
 	add
 	ldelem.i4
-	stloc 12
-// 0x0107c000: 0x107c000: lw    s5, 316(sp)
-	ldloc 7
+	stloc 11
+// 0x0107c0a0: 0x107c0a0: lw    s3, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 79
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107c004: 0x107c004: lw    s4, 312(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 78
-	add
-	ldelem.i4
-	stloc 15
-// 0x0107c008: 0x107c008: lw    s3, 308(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 77
-	add
-	ldelem.i4
-	stloc 14
-// 0x0107c00c: 0x107c00c: lw    s2, 304(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 76
-	add
-	ldelem.i4
-	stloc 10
-// 0x0107c010: 0x107c010: lw    s1, 300(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 75
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 9
-// 0x0107c014: 0x107c014: lw    s0, 296(sp)
-	ldloc 7
+	stloc 13
+// 0x0107c0a4: 0x107c0a4: lw    s2, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 74
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107c018: 0x107c018: jr    ra addiu sp, sp, 336
-	ldloc.0
-	ldc.i4 336
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+	stloc 12
+// 0x0107c0a8: 0x107c0a8: lw    s1, 24(sp)
 	ldloc 6
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 T_411_107c020(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
-
-// local  6 is register v0
-// local  9 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  7 is register s0
-// local  0 is register sp
-// local  8 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 9
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 7
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 8
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107c020: 0x107c020: addiu sp, sp, -32
-	ldloc.0
-	ldc.i4.s -32
-	add
-	stloc.0
-// 0x0107c024: 0x107c024: sw    ra, 28(sp)
-// 0x0107c028: 0x107c028: sw    s0, 24(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.6
 	add
-	ldloc 7
-	stelem.i4
-// 0x0107c02c: 0x107c02c: jal   0x1000910 sw    a0, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc.1
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x0107c034: 0x107c034: lw    a2, 16(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
 	ldelem.i4
-	stloc.3
-// 0x0107c038: 0x107c038: addu  a0, v0, zero
-	ldloc 6
-	stloc.1
-// 0x0107c03c: 0x107c03c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107c040: 0x107c040: jal   0x100177c addu  s0, v0, zero
+	stloc 10
+// 0x0107c0ac: 0x107c0ac: lw    s0, 20(sp)
 	ldloc 6
-	stloc 7
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 9
-	stloc 6
-// --- basic block ---
-// 0x0107c048: 0x107c048: lw    ra, 28(sp)
-// 0x0107c04c: 0x107c04c: addu  v0, s0, zero
-	ldloc 7
-	stloc 6
-// 0x0107c050: 0x107c050: lw    s0, 24(sp)
-	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.5
 	add
 	ldelem.i4
-	stloc 7
-// 0x0107c054: 0x107c054: jr    ra addiu sp, sp, 32
+	stloc 9
+// 0x0107c0b0: 0x107c0b0: jr    ra addiu sp, sp, 48
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.s 48
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 9
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
+	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Comment_Add_107c05c(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_report_map_problem_107c0b8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s5,int32 s6,int32 t0,int32 s3,int32 s4,int32 s7,int32 s8,int32 t1,int32 ra,int32 t2)
 
 // local  5 is register v0
-// local  7 is register v1
+// local  6 is register v1
 // local  1 is register a0
 // local  2 is register a1
 // local  3 is register a2
 // local  4 is register a3
+// local 13 is register t0
+// local 18 is register t1
+// local 20 is register t2
 // local  8 is register s0
 // local  9 is register s1
 // local 10 is register s2
-// local 11 is register s3
+// local 14 is register s3
+// local 15 is register s4
+// local 11 is register s5
+// local 12 is register s6
+// local 16 is register s7
 // local  0 is register sp
-// local 12 is register ra
-// local  6 is register mem
+// local 17 is register s8
+// local 19 is register ra
+// local  7 is register mem
 
 	ldc.i4.s 0
 	stloc 5
 	ldc.i4.s 0
-	stloc 7
+	stloc 6
 	ldarg 1
 	stloc 1
 	ldarg 2
@@ -2892,6735 +2618,4544 @@ __CIBYL_function_return:
 	ldarg 4
 	stloc 4
 	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 18
+	ldc.i4.s 0
+	stloc 20
+	ldc.i4.s 0
 	stloc 8
 	ldc.i4.s 0
 	stloc 9
 	ldc.i4.s 0
 	stloc 10
 	ldc.i4.s 0
+	stloc 14
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
 	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 16
 	ldarg 0
 	stloc 0
 	ldc.i4.s 0
-	stloc 12
+	stloc 17
+	ldc.i4.s 0
+	stloc 19
 	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
+	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107c05c: 0x107c05c: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107c060: 0x107c060: addiu sp, sp, -40
+L_107c0b8:
+// 0x0107c0b8: 0x107c0b8: addiu sp, sp, -336
 	ldloc.0
-	ldc.i4.s -40
+	ldc.i4 -336
 	add
 	stloc.0
-// 0x0107c064: 0x107c064: addiu v0, v0, -16028
-	ldloc 5
-	ldc.i4 -16028
-	add
-	stloc 5
-// 0x0107c068: 0x107c068: sw    s1, 24(sp)
-	ldloc 6
+// 0x0107c0bc: 0x107c0bc: sw    ra, 332(sp)
+// 0x0107c0c0: 0x107c0c0: sw    s8, 328(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4.s 82
 	add
-	ldloc 9
+	ldloc 17
 	stelem.i4
-// 0x0107c06c: 0x107c06c: addu  v1, v0, zero
-	ldloc 5
-	stloc 7
-// 0x0107c070: 0x107c070: addu  s1, a0, zero
-	ldloc.1
-	stloc 9
-// 0x0107c074: 0x107c074: lw    a1, 4(a0)
-	ldloc 6
-	ldloc.1
+// 0x0107c0c4: 0x107c0c4: sw    s7, 324(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4.s 81
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107c078: 0x107c078: sw    ra, 36(sp)
-// 0x0107c07c: 0x107c07c: lw    a0, 2000(v0)
-	ldloc 6
-	ldloc 5
+	ldloc 16
+	stelem.i4
+// 0x0107c0c8: 0x107c0c8: sw    s6, 320(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 500
+	ldc.i4.s 80
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107c080: 0x107c080: sw    s3, 32(sp)
-	ldloc 6
+	ldloc 12
+	stelem.i4
+// 0x0107c0cc: 0x107c0cc: sw    s5, 316(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.s 79
 	add
 	ldloc 11
 	stelem.i4
-// 0x0107c084: 0x107c084: sw    s2, 28(sp)
-	ldloc 6
+// 0x0107c0d0: 0x107c0d0: sw    s4, 312(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.7
+	ldc.i4.s 78
 	add
-	ldloc 10
+	ldloc 15
 	stelem.i4
-// 0x0107c088: 0x107c088: sw    s0, 20(sp)
-	ldloc 6
+// 0x0107c0d4: 0x107c0d4: sw    s3, 308(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 77
 	add
-	ldloc 8
+	ldloc 14
 	stelem.i4
-// 0x0107c08c: 0x107c08c: j	 0x107c0bc addu  v0, zero, zero
-	ldc.i4.s 0
-	stloc 5
-	br L_107c0bc
-// --- basic block ---
-L_107c094:
-// 0x0107c094: 0x107c094: lw    s0, 0(v1)
-	ldloc 6
+// 0x0107c0d8: 0x107c0d8: sw    s2, 304(sp)
 	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 8
-// 0x0107c098: 0x107c098: addiu v0, v0, 1
-	ldloc 5
-	ldc.i4.1
+	ldc.i4.s 76
 	add
-	stloc 5
-// 0x0107c09c: 0x107c09c: lw    a2, 0(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.3
-// 0x0107c0a0: 0x107c0a0: sll   zero, zero, 0
-// 0x0107c0a4: 0x107c0a4: bne   a2, a1, 0x107c0bc addiu v1, v1, 4
-	ldloc.3
-	ldloc.2
+	ldloc 10
+	stelem.i4
+// 0x0107c0dc: 0x107c0dc: sw    s1, 300(sp)
 	ldloc 7
-	ldc.i4.4
-	add
-	stloc 7
-	bne.un L_107c0bc
-// --- basic block ---
-// 0x0107c0ac: 0x107c0ac: lw    v1, 0(s1)
-	ldloc 6
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 7
-// 0x0107c0b0: 0x107c0b0: lw    v0, 1300(s0)
-	ldloc 6
-	ldloc 8
+	ldc.i4.s 75
+	add
+	ldloc 9
+	stelem.i4
+// 0x0107c0e0: 0x107c0e0: jal   0x106c794 sw    s0, 296(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 325
+	ldc.i4.s 74
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107c0b4: 0x107c0b4: j	 0x107c0e8 sll   zero, zero, 0
-	br L_107c0e8
-// --- basic block ---
-L_107c0bc:
-// 0x0107c0bc: 0x107c0bc: slt   a2, v0, a0
-	ldloc 5
+	ldloc 8
+	stelem.i4
+	ldloc.0
 	ldloc.1
-	clt
-	stloc.3
-// 0x0107c0c0: 0x107c0c0: bne   a2, zero, 0x107c094 sll   zero, zero, 0
+	ldloc.2
 	ldloc.3
-	brtrue L_107c094
+	ldloc 4
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107c0c8: 0x107c0c8: j	 0x107c224 addu  v0, zero, zero
-	ldc.i4.s 0
+// 0x0107c0e8: 0x107c0e8: jal   0x1030ea8 sll   zero, zero, 0
+	call int32 Cibyl35::roadmap_gps_have_reception_1030ea8()
 	stloc 5
-	br L_107c224
 // --- basic block ---
-L_107c0d0:
-// 0x0107c0d0: 0x107c0d0: lw    a0, 8(v0)
-	ldloc 6
+// 0x0107c0f0: 0x107c0f0: beq   v0, zero, 0x107c16c lui   a0, 0x10000
 	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldelem.i4
+	ldc.i4 65536
 	stloc.1
-// 0x0107c0d4: 0x107c0d4: sll   zero, zero, 0
-// 0x0107c0d8: 0x107c0d8: beq   a0, v1, 0x107c220 sll   zero, zero, 0
-	ldloc.1
-	ldloc 7
-	beq  L_107c220
-// --- basic block ---
-// 0x0107c0e0: 0x107c0e0: lw    v0, 0(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 5
-// 0x0107c0e4: 0x107c0e4: sll   zero, zero, 0
-L_107c0e8:
-// 0x0107c0e8: 0x107c0e8: bne   v0, zero, 0x107c0d0 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107c0d0
+	brfalse L_107c16c
 // --- basic block ---
-// 0x0107c0f0: 0x107c0f0: j	 0x107c240 sll   zero, zero, 0
-	br L_107c240
-// --- basic block ---
-L_107c0f8:
-// 0x0107c0f8: 0x107c0f8: lw    v0, 1276(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 319
+// 0x0107c0f8: 0x107c0f8: jal   0x101df34 addiu a0, a0, -23972
+	ldloc.1
+	ldc.i4 -23972
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107c0fc: 0x107c0fc: sll   zero, zero, 0
-// 0x0107c100: 0x107c100: bne   v0, zero, 0x107c110 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107c110
-// --- basic block ---
-// 0x0107c108: 0x107c108: jal   0x107a570 addu  a0, s0, zero
-	ldloc 8
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::DeleteAlertObject_107a570(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_107c110:
-// 0x0107c110: 0x107c110: jal   0x107c020 addiu a0, zero, 648
-	ldc.i4 648
+// 0x0107c100: 0x107c100: bne   v0, zero, 0x107c1a8 addu  s1, v0, zero
+	ldloc 5
+	ldloc 5
+	stloc 9
+	brtrue L_107c1a8
+// --- basic block ---
+// 0x0107c108: 0x107c108: jal   0x1000910 addiu a0, zero, 20
+	ldc.i4.s 20
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::T_411_107c020(int32,int32,int32,int32,int32)
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c118: 0x107c118: addu  s2, v0, zero
-	ldloc 5
-	stloc 10
-// 0x0107c11c: 0x107c11c: addiu a0, v0, 8
+// 0x0107c110: 0x107c110: addu  a0, v0, zero
 	ldloc 5
-	ldc.i4.8
-	add
 	stloc.1
-// 0x0107c120: 0x107c120: addu  a1, s1, zero
-	ldloc 9
+// 0x0107c114: 0x107c114: addiu a1, sp, 60
+	ldloc.0
+	ldc.i4.s 60
+	add
 	stloc.2
-// 0x0107c124: 0x107c124: jal   0x1001800 addiu a2, zero, 640
-	ldc.i4 640
+// 0x0107c118: 0x107c118: addiu a2, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
 	stloc.3
+// 0x0107c11c: 0x107c11c: jal   0x1029db8 addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c12c: 0x107c12c: sw    zero, 4(s2)
-	ldloc 6
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107c130: 0x107c130: sw    zero, 0(s2)
-	ldloc 6
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107c134: 0x107c134: lw    v0, 1300(s0)
+// 0x0107c124: 0x107c124: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x0107c128: 0x107c128: bne   v0, v1, 0x107c188 addu  s1, s0, zero
+	ldloc 5
 	ldloc 6
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 325
+	stloc 9
+	bne.un L_107c188
+// --- basic block ---
+// 0x0107c130: 0x107c130: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107c134: 0x107c134: jal   0x101df60 addiu a0, a0, -31052
+	ldloc.1
+	ldc.i4 -31052
 	add
-	ldelem.i4
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-// 0x0107c138: 0x107c138: sll   zero, zero, 0
-// 0x0107c13c: 0x107c13c: beq   v0, zero, 0x107c17c addu  s3, zero, zero
+// --- basic block ---
+// 0x0107c13c: 0x107c13c: beq   v0, zero, 0x107c164 sll   zero, zero, 0
 	ldloc 5
-	ldc.i4.s 0
-	stloc 11
-	brfalse L_107c17c
+	brfalse L_107c164
 // --- basic block ---
-L_107c144:
-// 0x0107c144: 0x107c144: lw    v1, 528(v0)
-	ldloc 6
+// 0x0107c144: 0x107c144: lw    v1, 4(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 132
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 7
+	stloc 6
 // 0x0107c148: 0x107c148: sll   zero, zero, 0
-// 0x0107c14c: 0x107c14c: beq   v1, zero, 0x107c158 sll   zero, zero, 0
+// 0x0107c14c: 0x107c14c: sw    v1, 4(s0)
 	ldloc 7
-	brfalse L_107c158
-// --- basic block ---
-// 0x0107c154: 0x107c154: addiu s3, zero, 1
-	ldc.i4.1
-	stloc 11
-L_107c158:
-// 0x0107c158: 0x107c158: lw    v1, 0(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x0107c15c: 0x107c15c: sll   zero, zero, 0
-// 0x0107c160: 0x107c160: bne   v1, zero, 0x107c174 sll   zero, zero, 0
-	ldloc 7
-	brtrue L_107c174
-// --- basic block ---
-// 0x0107c168: 0x107c168: sw    v0, 4(s2)
-	ldloc 6
-	ldloc 10
+	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.1
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107c16c: 0x107c16c: j	 0x107c180 sw    s2, 0(v0)
 	ldloc 6
+	stelem.i4
+// 0x0107c150: 0x107c150: lw    v0, 0(v0)
+	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldloc 10
-	stelem.i4
-	br L_107c180
-// --- basic block ---
-L_107c174:
-// 0x0107c174: 0x107c174: j	 0x107c144 addu  v0, v1, zero
-	ldloc 7
+	ldelem.i4
 	stloc 5
-	br L_107c144
-// --- basic block ---
-L_107c17c:
-// 0x0107c17c: 0x107c17c: sw    s2, 1300(s0)
-	ldloc 6
+// 0x0107c154: 0x107c154: sw    zero, 12(s0)
+	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 325
+	ldc.i4.3
 	add
-	ldloc 10
+	ldc.i4.s 0
 	stelem.i4
-L_107c180:
-// 0x0107c180: 0x107c180: lw    v0, 1276(s0)
-	ldloc 6
+// 0x0107c158: 0x107c158: sw    v0, 0(s0)
+	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c184: 0x107c184: sll   zero, zero, 0
-// 0x0107c188: 0x107c188: addiu v1, v0, 1
-	ldloc 5
-	ldc.i4.1
-	add
-	stloc 7
-// 0x0107c18c: 0x107c18c: bne   v0, zero, 0x107c1c0 sw    v1, 1276(s0)
 	ldloc 5
-	ldloc 6
+	stelem.i4
+// 0x0107c15c: 0x107c15c: j	 0x107c188 sw    zero, 16(s0)
+	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 319
+	ldc.i4.4
 	add
-	ldloc 7
+	ldc.i4.s 0
 	stelem.i4
-	brtrue L_107c1c0
+	br L_107c188
 // --- basic block ---
-// 0x0107c194: 0x107c194: lw    a0, 4(s0)
-	ldloc 6
+L_107c164:
+// 0x0107c164: 0x107c164: jal   0x1000930 addu  a0, s0, zero
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
 	stloc.1
-// 0x0107c198: 0x107c198: jal   0x10a6d54 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl::free_1000930(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c1a0: 0x107c1a0: beq   v0, zero, 0x107c1c0 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107c1c0
-// --- basic block ---
-// 0x0107c1a8: 0x107c1a8: lw    v0, 1836(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 459
+L_107c16c:
+// 0x0107c16c: 0x107c16c: lui   a0, 0x0
+	ldc.i4.s 0
+	stloc.1
+// 0x0107c170: 0x107c170: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107c174: 0x107c174: addiu a0, a0, 30152
+	ldloc.1
+	ldc.i4 30152
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107c1ac: 0x107c1ac: sll   zero, zero, 0
-// 0x0107c1b0: 0x107c1b0: bne   v0, zero, 0x107c1c0 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107c1c0
-// --- basic block ---
-// 0x0107c1b8: 0x107c1b8: jal   0x107ab74 addu  a0, s0, zero
-	ldloc 8
 	stloc.1
+// 0x0107c178: 0x107c178: jal   0x104c158 addiu a1, a1, -25144
+	ldloc.2
+	ldc.i4 -25144
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::CreateAlertObject_107ab74(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_107c1c0:
-// 0x0107c1c0: 0x107c1c0: lw    v0, 524(s1)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 131
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c1c4: 0x107c1c4: sll   zero, zero, 0
-// 0x0107c1c8: 0x107c1c8: beq   v0, zero, 0x107c224 addiu v0, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 5
-	brfalse L_107c224
+// 0x0107c180: 0x107c180: j	 0x107c614 sll   zero, zero, 0
+	br L_107c614
 // --- basic block ---
-// 0x0107c1d0: 0x107c1d0: lw    v0, 520(s1)
-	ldloc 6
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 130
+L_107c188:
+// 0x0107c188: 0x107c188: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107c18c: 0x107c18c: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107c190: 0x107c190: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107c194: 0x107c194: addiu a0, a0, -23972
+	ldloc.1
+	ldc.i4 -23972
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107c1d4: 0x107c1d4: sll   zero, zero, 0
-// 0x0107c1d8: 0x107c1d8: bne   v0, zero, 0x107c224 addiu v0, zero, 1
-	ldloc 5
-	ldc.i4.1
-	stloc 5
-	brtrue L_107c224
-// --- basic block ---
-// 0x0107c1e0: 0x107c1e0: bne   s3, zero, 0x107c1fc addiu v1, zero, 3
-	ldloc 11
-	ldc.i4.3
-	stloc 7
-	brtrue L_107c1fc
-// --- basic block ---
-// 0x0107c1e8: 0x107c1e8: lw    v0, 1280(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 320
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c1ec: 0x107c1ec: sll   zero, zero, 0
-// 0x0107c1f0: 0x107c1f0: beq   v0, zero, 0x107c218 addiu v1, zero, 2
-	ldloc 5
-	ldc.i4.2
-	stloc 7
-	brfalse L_107c218
-// --- basic block ---
-// 0x0107c1f8: 0x107c1f8: addiu v1, zero, 3
-	ldc.i4.3
-	stloc 7
-L_107c1fc:
-// 0x0107c1fc: 0x107c1fc: lui   v0, 0x0
-	ldc.i4.s 0
-	stloc 5
-// 0x0107c200: 0x107c200: addu  a0, s1, zero
-	ldloc 9
 	stloc.1
-// 0x0107c204: 0x107c204: addu  a1, s0, zero
-	ldloc 8
+// 0x0107c198: 0x107c198: addiu a1, a1, -28468
+	ldloc.2
+	ldc.i4 -28468
+	add
 	stloc.2
-// 0x0107c208: 0x107c208: jal   0x107af2c sw    v1, 15940(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3985
+// 0x0107c19c: 0x107c19c: addiu a2, a2, -23956
+	ldloc.3
+	ldc.i4 -23956
 	add
-	ldloc 7
-	stelem.i4
+	stloc.3
+// 0x0107c1a0: 0x107c1a0: jal   0x101f648 addu  a3, s0, zero
+	ldloc 8
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::RTAlerts_Comment_PopUp_107af2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_gps_position_101f648(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c210: 0x107c210: j	 0x107c224 addiu v0, zero, 1
-	ldc.i4.1
+	stloc 6
 	stloc 5
-	br L_107c224
 // --- basic block ---
-L_107c218:
-// 0x0107c218: 0x107c218: lui   v0, 0x0
+L_107c1a8:
+// 0x0107c1a8: 0x107c1a8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107c1ac: 0x107c1ac: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x0107c1b0: 0x107c1b0: addiu a0, a0, -17588
+	ldloc.1
+	ldc.i4 -17588
+	add
+	stloc.1
+// 0x0107c1b4: 0x107c1b4: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0107c21c: 0x107c21c: sw    v1, 15940(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 3985
-	add
+// 0x0107c1b8: 0x107c1b8: jal   0x101cd70 sw    v1, 15876(v0)
 	ldloc 7
-	stelem.i4
-L_107c220:
-// 0x0107c220: 0x107c220: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-L_107c224:
-// 0x0107c224: 0x107c224: lw    ra, 36(sp)
-// 0x0107c228: 0x107c228: lw    s3, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107c22c: 0x107c22c: lw    s2, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 10
-// 0x0107c230: 0x107c230: lw    s1, 24(sp)
-	ldloc 6
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.6
+	ldc.i4 3969
 	add
-	ldelem.i4
-	stloc 9
-// 0x0107c234: 0x107c234: lw    s0, 20(sp)
 	ldloc 6
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107c238: 0x107c238: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-L_107c240:
-// 0x0107c240: 0x107c240: lb    v0, 117(s1)
-	ldloc 9
-	ldc.i4.s 117
+// 0x0107c1c0: 0x107c1c0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107c1c4: 0x107c1c4: lui   a2, 0x1080000
+	ldc.i4 17301504
+	stloc.3
+// 0x0107c1c8: 0x107c1c8: addiu a0, a0, -25056
+	ldloc.1
+	ldc.i4 -25056
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x0107c244: 0x107c244: sll   zero, zero, 0
-// 0x0107c248: 0x107c248: bne   v0, zero, 0x107c0f8 addiu v0, zero, 1
+	stloc.1
+// 0x0107c1cc: 0x107c1cc: addu  a1, v0, zero
 	ldloc 5
-	ldc.i4.1
+	stloc.2
+// 0x0107c1d0: 0x107c1d0: addiu a2, a2, -29224
+	ldloc.3
+	ldc.i4 -29224
+	add
+	stloc.3
+// 0x0107c1d4: 0x107c1d4: jal   0x1096050 addiu a3, zero, 8192
+	ldc.i4 8192
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
-	brtrue L_107c0f8
 // --- basic block ---
-// 0x0107c250: 0x107c250: j	 0x107c224 sll   zero, zero, 0
-	br L_107c224
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
+// 0x0107c1dc: 0x107c1dc: addu  s3, v0, zero
 	ldloc 5
-	ret
-}
-.method public static int32 report_alert_107c258(int32,int32,int32,int32,int32)
-{
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
-
-// local  6 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  5 is register mem
-
-	ldc.i4.s 0
-	stloc 6
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
+	stloc 14
+// 0x0107c1e0: 0x107c1e0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107c1e4: 0x107c1e4: lui   v0, 0x41000000
+	ldc.i4 1090519040
+	stloc 5
+// 0x0107c1e8: 0x107c1e8: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107c1ec: 0x107c1ec: addiu a3, zero, -1
+	ldc.i4.m1
 	stloc 4
+// 0x0107c1f0: 0x107c1f0: addu  a1, zero, zero
 	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 5
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107c258: 0x107c258: addiu sp, sp, -40
-	ldloc.0
-	ldc.i4.s -40
-	add
-	stloc.0
-// 0x0107c25c: 0x107c25c: sw    s0, 28(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107c260: 0x107c260: addu  s0, a0, zero
+	stloc.2
+// 0x0107c1f4: 0x107c1f4: addiu a0, a0, -25044
 	ldloc.1
-	stloc 8
-// 0x0107c264: 0x107c264: addiu a0, zero, 16
-	ldc.i4.s 16
+	ldc.i4 -25044
+	add
 	stloc.1
-// 0x0107c268: 0x107c268: sw    ra, 36(sp)
-// 0x0107c26c: 0x107c26c: sw    s1, 32(sp)
+// 0x0107c1f8: 0x107c1f8: ori   v0, v0, 20616
 	ldloc 5
+	ldc.i4 20616
+	or
+	stloc 5
+// 0x0107c1fc: 0x107c1fc: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107c270: 0x107c270: sw    a1, 16(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
+	ldloc.1
 	ldloc.2
-	stelem.i4
-// 0x0107c274: 0x107c274: addu  s1, a2, zero
 	ldloc.3
-	stloc 9
-// 0x0107c278: 0x107c278: jal   0x107c020 sw    a3, 20(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
 	ldloc 4
-	stelem.i4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c204: 0x107c204: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0107c208: 0x107c208: jal   0x1078c38 addu  s0, v0, zero
+	ldloc 5
+	stloc 8
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::T_411_107c020(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::space_1078c38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107c280: 0x107c280: lw    a1, 16(sp)
+// 0x0107c210: 0x107c210: addu  a1, v0, zero
 	ldloc 5
+	stloc.2
+// 0x0107c214: 0x107c214: jal   0x109950c addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c21c: 0x107c21c: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107c220: 0x107c220: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x0107c224: 0x107c224: addiu a0, a0, -636
+	ldloc.1
+	ldc.i4 -636
+	add
+	stloc.1
+// 0x0107c228: 0x107c228: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107c22c: 0x107c22c: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107c230: 0x107c230: addiu v0, zero, 136
+	ldc.i4 136
+	stloc 5
+// 0x0107c234: 0x107c234: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldc.i4.4
 	add
-	ldelem.i4
-	stloc.2
-// 0x0107c284: 0x107c284: lw    a3, 20(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 4
-// 0x0107c288: 0x107c288: lui   v1, 0x0
-	ldc.i4.s 0
-	stloc 7
-// 0x0107c28c: 0x107c28c: sb    zero, 15884(v1)
-	ldloc 7
-	ldc.i4 15884
-	add
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c23c: 0x107c23c: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107c240: 0x107c240: addu  a1, zero, zero
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107c290: 0x107c290: addu  a0, zero, zero
+	stloc.2
+// 0x0107c244: 0x107c244: addu  a2, zero, zero
 	ldc.i4.s 0
+	stloc.3
+// 0x0107c248: 0x107c248: jal   0x1099628 addu  s2, v0, zero
+	ldloc 5
+	stloc 10
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107c250: 0x107c250: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107c294: 0x107c294: sw    s0, 0(v0)
+// 0x0107c254: 0x107c254: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107c258: 0x107c258: addiu a0, a0, -27784
+	ldloc.1
+	ldc.i4 -27784
+	add
+	stloc.1
+// 0x0107c25c: 0x107c25c: addiu a1, a1, -25032
+	ldloc.2
+	ldc.i4 -25032
+	add
+	stloc.2
+// 0x0107c260: 0x107c260: jal   0x109e784 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c268: 0x107c268: addu  a1, v0, zero
 	ldloc 5
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldloc 8
-	stelem.i4
-// 0x0107c298: 0x107c298: sw    a1, 8(v0)
+	stloc.2
+// 0x0107c26c: 0x107c26c: jal   0x109950c addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c274: 0x107c274: bne   s1, zero, 0x107c2a8 lui   a0, 0x10000
+	ldloc 9
+	ldc.i4 65536
+	stloc.1
+	brtrue L_107c2a8
+// --- basic block ---
+// 0x0107c27c: 0x107c27c: jal   0x101df34 addiu a0, a0, -23972
+	ldloc.1
+	ldc.i4 -23972
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c284: 0x107c284: bne   v0, zero, 0x107c2a8 addu  s1, v0, zero
 	ldloc 5
-	ldloc 6
+	ldloc 5
+	stloc 9
+	brtrue L_107c2a8
+// --- basic block ---
+// 0x0107c28c: 0x107c28c: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107c290: 0x107c290: addiu a2, a2, 512
+	ldloc.3
+	ldc.i4 512
+	add
+	stloc.3
+// 0x0107c294: 0x107c294: addiu a0, sp, 80
+	ldloc.0
+	ldc.i4.s 80
+	add
+	stloc.1
+// 0x0107c298: 0x107c298: jal   0x1000f9c addiu a1, zero, 150
+	ldc.i4 150
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c2a0: 0x107c2a0: j	 0x107c37c lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+	br L_107c37c
+// --- basic block ---
+L_107c2a8:
+// 0x0107c2a8: 0x107c2a8: lw    a1, 4(s1)
+	ldloc 7
+	ldloc 9
 	ldc.i4.2
 	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107c2ac: 0x107c2ac: addiu v1, sp, 48
+	ldloc.0
+	ldc.i4.s 48
+	add
+	stloc 6
+// 0x0107c2b0: 0x107c2b0: sw    a1, 56(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
 	add
 	ldloc.2
 	stelem.i4
-// 0x0107c29c: 0x107c29c: sw    s1, 4(v0)
-	ldloc 5
-	ldloc 6
+// 0x0107c2b4: 0x107c2b4: lw    v0, 0(s1)
+	ldloc 7
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldelem.i4
+	stloc 5
+// 0x0107c2b8: 0x107c2b8: sw    v1, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	ldloc 9
-	stelem.i4
-// 0x0107c2a0: 0x107c2a0: sw    a3, 12(v0)
-	ldloc 5
 	ldloc 6
+	stelem.i4
+// 0x0107c2bc: 0x107c2bc: addiu v1, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc 6
+// 0x0107c2c0: 0x107c2c0: sw    v1, 20(sp)
+	ldloc 7
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.3
+	ldc.i4.5
 	add
-	ldloc 4
+	ldloc 6
 	stelem.i4
-// 0x0107c2a4: 0x107c2a4: jal   0x1094b64 sw    v0, 16(sp)
+// 0x0107c2c4: 0x107c2c4: addu  a0, v0, zero
 	ldloc 5
+	stloc.1
+// 0x0107c2c8: 0x107c2c8: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0107c2cc: 0x107c2cc: addiu a2, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.3
+// 0x0107c2d0: 0x107c2d0: addiu a3, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
+	stloc 4
+// 0x0107c2d4: 0x107c2d4: sw    v1, 24(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.6
 	add
 	ldloc 6
 	stelem.i4
+// 0x0107c2d8: 0x107c2d8: jal   0x107a618 sw    v0, 52(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 13
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::RTAlerts_Get_City_Street_107a618(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107c2ac: 0x107c2ac: lw    v0, 16(sp)
+// 0x0107c2e0: 0x107c2e0: lw    v0, 40(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107c2e4: 0x107c2e4: sll   zero, zero, 0
+// 0x0107c2e8: 0x107c2e8: bne   v0, zero, 0x107c308 sll   zero, zero, 0
 	ldloc 5
+	brtrue L_107c308
+// --- basic block ---
+// 0x0107c2f0: 0x107c2f0: lw    v1, 36(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 9
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107c2b0: 0x107c2b0: lui   a1, 0x10000
+// 0x0107c2f4: 0x107c2f4: sll   zero, zero, 0
+// 0x0107c2f8: 0x107c2f8: bne   v1, zero, 0x107c324 lui   a0, 0x20000
+	ldloc 6
+	ldc.i4 131072
+	stloc.1
+	brtrue L_107c324
+// --- basic block ---
+// 0x0107c300: 0x107c300: j	 0x107c380 addiu a3, zero, 24
+	ldc.i4.s 24
+	stloc 4
+	br L_107c380
+// --- basic block ---
+L_107c308:
+// 0x0107c308: 0x107c308: lb    v1, 0(v0)
+	ldloc 5
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x0107c30c: 0x107c30c: sll   zero, zero, 0
+// 0x0107c310: 0x107c310: bne   v1, zero, 0x107c324 lui   a2, 0x10000
+	ldloc 6
 	ldc.i4 65536
-	stloc.2
-// 0x0107c2b4: 0x107c2b4: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
+	stloc.3
+	brtrue L_107c324
+// --- basic block ---
+// 0x0107c318: 0x107c318: lw    a3, 36(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
 	add
-	stloc.2
-// 0x0107c2b8: 0x107c2b8: addu  a2, v0, zero
+	ldelem.i4
+	stloc 4
+// 0x0107c31c: 0x107c31c: j	 0x107c350 addiu a2, a2, 20332
+	ldloc.3
+	ldc.i4 20332
+	add
+	stloc.3
+	br L_107c350
+// --- basic block ---
+L_107c324:
+// 0x0107c324: 0x107c324: lw    a3, 36(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc 4
+// 0x0107c328: 0x107c328: sll   zero, zero, 0
+// 0x0107c32c: 0x107c32c: beq   a3, zero, 0x107c364 lui   a2, 0x10000
+	ldloc 4
+	ldc.i4 65536
+	stloc.3
+	brfalse L_107c364
+// --- basic block ---
+// 0x0107c334: 0x107c334: lb    v1, 0(a3)
+	ldloc 4
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 6
+// 0x0107c338: 0x107c338: sll   zero, zero, 0
+// 0x0107c33c: 0x107c33c: bne   v1, zero, 0x107c364 sll   zero, zero, 0
 	ldloc 6
+	brtrue L_107c364
+// --- basic block ---
+// 0x0107c344: 0x107c344: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0107c2bc: 0x107c2bc: jal   0x10791b0 addiu a0, zero, 1
-	ldc.i4.1
+// 0x0107c348: 0x107c348: addiu a2, a2, 20332
+	ldloc.3
+	ldc.i4 20332
+	add
+	stloc.3
+// 0x0107c34c: 0x107c34c: addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+L_107c350:
+// 0x0107c350: 0x107c350: addiu a0, sp, 80
+	ldloc.0
+	ldc.i4.s 80
+	add
 	stloc.1
+// 0x0107c354: 0x107c354: jal   0x1000f9c addiu a1, zero, 150
+	ldc.i4 150
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::on_keyboard_closed_10791b0(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
 	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107c2c4: 0x107c2c4: lw    ra, 36(sp)
-// 0x0107c2c8: 0x107c2c8: lw    s1, 32(sp)
-	ldloc 5
+// 0x0107c35c: 0x107c35c: j	 0x107c37c lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+	br L_107c37c
+// --- basic block ---
+L_107c364:
+// 0x0107c364: 0x107c364: addiu a2, a2, -10232
+	ldloc.3
+	ldc.i4 -10232
+	add
+	stloc.3
+// 0x0107c368: 0x107c368: addiu a0, sp, 80
+	ldloc.0
+	ldc.i4.s 80
+	add
+	stloc.1
+// 0x0107c36c: 0x107c36c: addiu a1, zero, 150
+	ldc.i4 150
+	stloc.2
+// 0x0107c370: 0x107c370: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 9
-// 0x0107c2cc: 0x107c2cc: lw    s0, 28(sp)
 	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107c2d0: 0x107c2d0: jr    ra addiu sp, sp, 40
-	ldloc.0
-	ldc.i4.s 40
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 6
-	ret
-}
-.method public static int32 add_real_time_alert_for_construction_opposite_direction_107c2d8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-__CIBYL_javamethod_begin:
+	stloc 5
 // --- basic block ---
-L_107c2d8:
-// 0x0107c2d8: 0x107c2d8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c2dc: 0x107c2dc: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
+// 0x0107c378: 0x107c378: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+L_107c37c:
+// 0x0107c37c: 0x107c37c: addiu a3, zero, 24
+	ldc.i4.s 24
+	stloc 4
+L_107c380:
+// 0x0107c380: 0x107c380: addiu a0, a0, -25016
+	ldloc.1
+	ldc.i4 -25016
 	add
-	stloc.2
-// 0x0107c2e0: 0x107c2e0: addiu sp, sp, -24
+	stloc.1
+// 0x0107c384: 0x107c384: addiu a1, sp, 80
 	ldloc.0
-	ldc.i4.s -24
+	ldc.i4.s 80
 	add
-	stloc.0
-// 0x0107c2e4: 0x107c2e4: addiu a0, zero, 7
-	ldc.i4.7
-	stloc.1
-// 0x0107c2e8: 0x107c2e8: addiu a2, zero, 2
-	ldc.i4.2
+	stloc.2
+// 0x0107c388: 0x107c388: jal   0x1099358 addiu a2, zero, -1
+	ldc.i4.m1
 	stloc.3
-// 0x0107c2ec: 0x107c2ec: sw    ra, 20(sp)
-// 0x0107c2f0: 0x107c2f0: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c2f8: 0x107c2f8: lw    ra, 20(sp)
-// 0x0107c2fc: 0x107c2fc: sll   zero, zero, 0
-// 0x0107c300: 0x107c300: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_other_opposite_direction_107c308(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-__CIBYL_javamethod_begin:
+	stloc 5
 // --- basic block ---
-L_107c308:
-// 0x0107c308: 0x107c308: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x0107c390: 0x107c390: lui   a1, 0x20000
+	ldc.i4 131072
 	stloc.2
-// 0x0107c30c: 0x107c30c: addiu a1, a1, 18500
+// 0x0107c394: 0x107c394: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107c398: 0x107c398: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107c39c: 0x107c39c: addiu a1, a1, -25000
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 -25000
 	add
 	stloc.2
-// 0x0107c310: 0x107c310: addiu sp, sp, -24
+// 0x0107c3a0: 0x107c3a0: jal   0x1099628 sw    v0, 280(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c314: 0x107c314: addiu a0, zero, 6
-	ldc.i4.6
-	stloc.1
-// 0x0107c318: 0x107c318: addiu a2, zero, 2
 	ldc.i4.2
-	stloc.3
-// 0x0107c31c: 0x107c31c: sw    ra, 20(sp)
-// 0x0107c320: 0x107c320: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
+	shr.un
+	ldc.i4.s 70
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107c328: 0x107c328: lw    ra, 20(sp)
-// 0x0107c32c: 0x107c32c: sll   zero, zero, 0
-// 0x0107c330: 0x107c330: jr    ra addiu sp, sp, 24
+// 0x0107c3a8: 0x107c3a8: lw    v0, 280(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4.s 24
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 70
 	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_hazard_opposite_direction_107c368(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
+	ldelem.i4
 	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c368:
-// 0x0107c368: 0x107c368: lui   a1, 0x10000
-	ldc.i4 65536
+// 0x0107c3ac: 0x107c3ac: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x0107c3b0: 0x107c3b0: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
 	stloc.2
-// 0x0107c36c: 0x107c36c: addiu a1, a1, 18500
+	ldloc.1
 	ldloc.2
-	ldc.i4 18500
-	add
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c3b8: 0x107c3b8: addu  a1, s2, zero
+	ldloc 10
 	stloc.2
-// 0x0107c370: 0x107c370: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c374: 0x107c374: addiu a0, zero, 5
-	ldc.i4.5
+// 0x0107c3bc: 0x107c3bc: jal   0x109950c addu  a0, s0, zero
+	ldloc 8
 	stloc.1
-// 0x0107c378: 0x107c378: addiu a2, zero, 2
-	ldc.i4.2
-	stloc.3
-// 0x0107c37c: 0x107c37c: sw    ra, 20(sp)
-// 0x0107c380: 0x107c380: jal   0x107c258 addu  a3, a1, zero
+	ldloc.1
 	ldloc.2
-	stloc 4
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c3c4: 0x107c3c4: jal   0x1078c38 addiu a0, zero, 2
+	ldc.i4.2
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::space_1078c38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107c388: 0x107c388: lw    ra, 20(sp)
-// 0x0107c38c: 0x107c38c: sll   zero, zero, 0
-// 0x0107c390: 0x107c390: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
+// 0x0107c3cc: 0x107c3cc: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107c3d0: 0x107c3d0: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_traffic_jam_opposite_direction_107c398(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c398:
-// 0x0107c398: 0x107c398: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c39c: 0x107c39c: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c3a0: 0x107c3a0: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c3a4: 0x107c3a4: addiu a0, zero, 3
-	ldc.i4.3
-	stloc.1
-// 0x0107c3a8: 0x107c3a8: addiu a2, zero, 2
-	ldc.i4.2
-	stloc.3
-// 0x0107c3ac: 0x107c3ac: sw    ra, 20(sp)
-// 0x0107c3b0: 0x107c3b0: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c3b8: 0x107c3b8: lw    ra, 20(sp)
-// 0x0107c3bc: 0x107c3bc: sll   zero, zero, 0
-// 0x0107c3c0: 0x107c3c0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_accident_opposite_direction_107c3c8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c3c8:
-// 0x0107c3c8: 0x107c3c8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c3cc: 0x107c3cc: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c3d0: 0x107c3d0: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c3d4: 0x107c3d4: addiu a0, zero, 2
-	ldc.i4.2
-	stloc.1
-// 0x0107c3d8: 0x107c3d8: addiu a2, zero, 2
-	ldc.i4.2
-	stloc.3
-// 0x0107c3dc: 0x107c3dc: sw    ra, 20(sp)
-// 0x0107c3e0: 0x107c3e0: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c3e8: 0x107c3e8: lw    ra, 20(sp)
-// 0x0107c3ec: 0x107c3ec: sll   zero, zero, 0
-// 0x0107c3f0: 0x107c3f0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_police_opposite_direction_107c3f8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c3f8:
-// 0x0107c3f8: 0x107c3f8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c3fc: 0x107c3fc: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c400: 0x107c400: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c404: 0x107c404: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107c408: 0x107c408: addiu a2, zero, 2
-	ldc.i4.2
-	stloc.3
-// 0x0107c40c: 0x107c40c: sw    ra, 20(sp)
-// 0x0107c410: 0x107c410: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c418: 0x107c418: lw    ra, 20(sp)
-// 0x0107c41c: 0x107c41c: sll   zero, zero, 0
-// 0x0107c420: 0x107c420: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_construction_my_direction_107c428(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c428:
-// 0x0107c428: 0x107c428: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c42c: 0x107c42c: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c430: 0x107c430: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c434: 0x107c434: addiu a0, zero, 7
-	ldc.i4.7
-	stloc.1
-// 0x0107c438: 0x107c438: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107c43c: 0x107c43c: sw    ra, 20(sp)
-// 0x0107c440: 0x107c440: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c448: 0x107c448: lw    ra, 20(sp)
-// 0x0107c44c: 0x107c44c: sll   zero, zero, 0
-// 0x0107c450: 0x107c450: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_other_my_direction_107c458(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c458:
-// 0x0107c458: 0x107c458: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c45c: 0x107c45c: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c460: 0x107c460: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c464: 0x107c464: addiu a0, zero, 6
-	ldc.i4.6
-	stloc.1
-// 0x0107c468: 0x107c468: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107c46c: 0x107c46c: sw    ra, 20(sp)
-// 0x0107c470: 0x107c470: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c478: 0x107c478: lw    ra, 20(sp)
-// 0x0107c47c: 0x107c47c: sll   zero, zero, 0
-// 0x0107c480: 0x107c480: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_hazard_my_direction_107c4b8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c4b8:
-// 0x0107c4b8: 0x107c4b8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c4bc: 0x107c4bc: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c4c0: 0x107c4c0: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c4c4: 0x107c4c4: addiu a0, zero, 5
-	ldc.i4.5
-	stloc.1
-// 0x0107c4c8: 0x107c4c8: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107c4cc: 0x107c4cc: sw    ra, 20(sp)
-// 0x0107c4d0: 0x107c4d0: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c4d8: 0x107c4d8: lw    ra, 20(sp)
-// 0x0107c4dc: 0x107c4dc: sll   zero, zero, 0
-// 0x0107c4e0: 0x107c4e0: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_traffic_jam_my_direction_107c4e8(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c4e8:
-// 0x0107c4e8: 0x107c4e8: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c4ec: 0x107c4ec: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c4f0: 0x107c4f0: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c4f4: 0x107c4f4: addiu a0, zero, 3
-	ldc.i4.3
-	stloc.1
-// 0x0107c4f8: 0x107c4f8: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107c4fc: 0x107c4fc: sw    ra, 20(sp)
-// 0x0107c500: 0x107c500: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c508: 0x107c508: lw    ra, 20(sp)
-// 0x0107c50c: 0x107c50c: sll   zero, zero, 0
-// 0x0107c510: 0x107c510: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_accident_my_direction_107c518(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c518:
-// 0x0107c518: 0x107c518: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c51c: 0x107c51c: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c520: 0x107c520: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c524: 0x107c524: addiu a0, zero, 2
-	ldc.i4.2
-	stloc.1
-// 0x0107c528: 0x107c528: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107c52c: 0x107c52c: sw    ra, 20(sp)
-// 0x0107c530: 0x107c530: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c538: 0x107c538: lw    ra, 20(sp)
-// 0x0107c53c: 0x107c53c: sll   zero, zero, 0
-// 0x0107c540: 0x107c540: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_alert_for_police_my_direction_107c548(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
-
-// local  7 is register v0
-// local  8 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  0 is register sp
-// local  5 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 7
-	ldc.i4.s 0
-	stloc 8
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 5
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c548:
-// 0x0107c548: 0x107c548: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c54c: 0x107c54c: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c550: 0x107c550: addiu sp, sp, -24
-	ldloc.0
-	ldc.i4.s -24
-	add
-	stloc.0
-// 0x0107c554: 0x107c554: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107c558: 0x107c558: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107c55c: 0x107c55c: sw    ra, 20(sp)
-// 0x0107c560: 0x107c560: jal   0x107c258 addu  a3, a1, zero
-	ldloc.2
-	stloc 4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::report_alert_107c258(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 8
-	stloc 7
-// --- basic block ---
-// 0x0107c568: 0x107c568: lw    ra, 20(sp)
-// 0x0107c56c: 0x107c56c: sll   zero, zero, 0
-// 0x0107c570: 0x107c570: jr    ra addiu sp, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 8
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 7
-	ret
-}
-.method public static int32 add_real_time_chit_chat_107c578(int32,int32,int32,int32,int32)
-{
-.maxstack 8
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local  9 is register s1
-// local  0 is register sp
-// local 10 is register ra
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 10
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-L_107c578:
-// 0x0107c578: 0x107c578: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107c57c: 0x107c57c: addiu sp, sp, -64
-	ldloc.0
-	ldc.i4.s -64
-	add
-	stloc.0
-// 0x0107c580: 0x107c580: addiu a0, a0, -23972
-	ldloc.1
-	ldc.i4 -23972
-	add
-	stloc.1
-// 0x0107c584: 0x107c584: sw    ra, 60(sp)
-// 0x0107c588: 0x107c588: sw    s1, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107c58c: 0x107c58c: jal   0x101df24 sw    s0, 52(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldloc 8
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_gps_position_101df24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c594: 0x107c594: bne   v0, zero, 0x107c5b4 lui   a0, 0x0
-	ldloc 5
-	ldc.i4.s 0
-	stloc.1
-	brtrue L_107c5b4
-// --- basic block ---
-// 0x0107c59c: 0x107c59c: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c5a0: 0x107c5a0: addiu a0, a0, 30092
-	ldloc.1
-	ldc.i4 30092
-	add
-	stloc.1
-// 0x0107c5a4: 0x107c5a4: jal   0x104c148 addiu a1, a1, -14372
-	ldloc.2
-	ldc.i4 -14372
-	add
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_104c148(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c5ac: 0x107c5ac: j	 0x107c670 sll   zero, zero, 0
-	br L_107c670
-// --- basic block ---
-L_107c5b4:
-// 0x0107c5b4: 0x107c5b4: jal   0x106b08c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_RandomUserMsg_106b08c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c5bc: 0x107c5bc: bne   v0, zero, 0x107c670 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107c670
-// --- basic block ---
-// 0x0107c5c4: 0x107c5c4: jal   0x106ab9c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_AnonymousMsg_106ab9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c5cc: 0x107c5cc: bne   v0, zero, 0x107c670 sll   zero, zero, 0
-	ldloc 5
-	brtrue L_107c670
-// --- basic block ---
-// 0x0107c5d4: 0x107c5d4: jal   0x107c020 addiu a0, zero, 16
-	ldc.i4.s 16
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl93::T_411_107c020(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c5dc: 0x107c5dc: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107c5e0: 0x107c5e0: addiu a1, a1, 18500
-	ldloc.2
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107c5e4: 0x107c5e4: addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0107c5e8: 0x107c5e8: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107c5ec: 0x107c5ec: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107c5f0: 0x107c5f0: sw    a1, 8(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.2
-	add
-	ldloc.2
-	stelem.i4
-// 0x0107c5f4: 0x107c5f4: sw    a1, 12(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.3
-	add
-	ldloc.2
-	stelem.i4
-// 0x0107c5f8: 0x107c5f8: addiu a0, a0, -25408
-	ldloc.1
-	ldc.i4 -25408
-	add
-	stloc.1
-// 0x0107c5fc: 0x107c5fc: sw    v0, 4(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107c600: 0x107c600: sw    zero, 0(s0)
-	ldloc 6
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 0
-	stelem.i4
-// 0x0107c604: 0x107c604: jal   0x101cd60 sw    a1, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc.2
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c60c: 0x107c60c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107c610: 0x107c610: addiu a0, a0, -25400
-	ldloc.1
-	ldc.i4 -25400
-	add
-	stloc.1
-// 0x0107c614: 0x107c614: jal   0x101cd60 addu  s1, v0, zero
-	ldloc 5
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c61c: 0x107c61c: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107c620: 0x107c620: addiu a0, a0, -6464
-	ldloc.1
-	ldc.i4 -6464
-	add
-	stloc.1
-// 0x0107c624: 0x107c624: jal   0x101cd60 sw    v0, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c62c: 0x107c62c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107c630: 0x107c630: addiu a0, a0, -25388
-	ldloc.1
-	ldc.i4 -25388
-	add
-	stloc.1
-// 0x0107c634: 0x107c634: jal   0x101cd60 sw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c63c: 0x107c63c: sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107c640: 0x107c640: lui   v0, 0x1080000
-	ldc.i4 17301504
-	stloc 5
-// 0x0107c644: 0x107c644: addiu v0, v0, -28240
-	ldloc 5
-	ldc.i4 -28240
-	add
-	stloc 5
-// 0x0107c648: 0x107c648: sw    v0, 20(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107c64c: 0x107c64c: lw    a1, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldelem.i4
-	stloc.2
-// 0x0107c650: 0x107c650: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0107c654: 0x107c654: lw    a2, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107c658: 0x107c658: lw    a3, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldelem.i4
-	stloc 4
-// 0x0107c65c: 0x107c65c: ori   v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	or
-	stloc 5
-// 0x0107c660: 0x107c660: addu  a0, s1, zero
-	ldloc 9
-	stloc.1
-// 0x0107c664: 0x107c664: sw    s0, 24(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107c668: 0x107c668: jal   0x1052fa4 sw    v0, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl61::ShowEditboxCamera_1052fa4(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_107c670:
-// 0x0107c670: 0x107c670: lw    ra, 60(sp)
-// 0x0107c674: 0x107c674: lw    s1, 56(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 14
-	add
-	ldelem.i4
-	stloc 9
-// 0x0107c678: 0x107c678: lw    s0, 52(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 13
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107c67c: 0x107c67c: jr    ra addiu sp, sp, 64
-	ldloc.0
-	ldc.i4.s 64
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 T_412_107c684(int32,int32,int32,int32,int32)
-{
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra,int32 hi,int32 lo)
-
-// local  5 is register v0
-// local  7 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local  8 is register s0
-// local 10 is register s1
-// local  9 is register s2
-// local  0 is register sp
-// local 11 is register ra
-// local 12 is register hi
-// local 13 is register lo
-// local  6 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 7
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 9
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 13
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 6
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107c684: 0x107c684: addiu sp, sp, -232
-	ldloc.0
-	ldc.i4 -232
-	add
-	stloc.0
-// 0x0107c688: 0x107c688: sw    s1, 220(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 55
-	add
-	ldloc 10
-	stelem.i4
-// 0x0107c68c: 0x107c68c: sw    ra, 228(sp)
-// 0x0107c690: 0x107c690: sw    s2, 224(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 56
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107c694: 0x107c694: sw    s0, 216(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 54
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107c698: 0x107c698: sb    zero, 0(a1)
-	ldloc.2
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107c69c: 0x107c69c: lw    v1, 16(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldelem.i4
-	stloc 7
-// 0x0107c6a0: 0x107c6a0: lw    v0, 20(a0)
-	ldloc 6
-	ldloc.1
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c6a4: 0x107c6a4: addu  s1, a1, zero
-	ldloc.2
-	stloc 10
-// 0x0107c6a8: 0x107c6a8: addiu a0, sp, 44
-	ldloc.0
-	ldc.i4.s 44
-	add
-	stloc.1
-// 0x0107c6ac: 0x107c6ac: addiu a1, sp, 64
-	ldloc.0
-	ldc.i4.s 64
-	add
-	stloc.2
-// 0x0107c6b0: 0x107c6b0: addiu a2, sp, 24
-	ldloc.0
-	ldc.i4.s 24
-	add
-	stloc.3
-// 0x0107c6b4: 0x107c6b4: sw    v1, 28(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.7
-	add
-	ldloc 7
-	stelem.i4
-// 0x0107c6b8: 0x107c6b8: jal   0x1029da8 sw    v0, 32(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.8
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c6c0: 0x107c6c0: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 7
-// 0x0107c6c4: 0x107c6c4: beq   v0, v1, 0x107c6e8 addiu a1, sp, 28
-	ldloc 5
-	ldloc 7
-	ldloc.0
-	ldc.i4.s 28
-	add
-	stloc.2
-	beq  L_107c6e8
-// --- basic block ---
-// 0x0107c6cc: 0x107c6cc: lw    v0, 48(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c6d0: 0x107c6d0: sll   zero, zero, 0
-// 0x0107c6d4: 0x107c6d4: sw    v0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107c6d8: 0x107c6d8: lw    v0, 44(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 11
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c6dc: 0x107c6dc: addiu a0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc.1
-// 0x0107c6e0: 0x107c6e0: j	 0x107c710 sw    v0, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 5
-	stelem.i4
-	br L_107c710
-// --- basic block ---
-L_107c6e8:
-// 0x0107c6e8: 0x107c6e8: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107c6ec: 0x107c6ec: jal   0x101df50 addiu a0, a0, 6792
-	ldloc.1
-	ldc.i4 6792
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c6f4: 0x107c6f4: beq   v0, zero, 0x107c7ac addiu a1, sp, 28
-	ldloc 5
-	ldloc.0
-	ldc.i4.s 28
-	add
-	stloc.2
-	brfalse L_107c7ac
-// --- basic block ---
-// 0x0107c6fc: 0x107c6fc: lw    v1, 0(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 7
-// 0x0107c700: 0x107c700: lw    v0, 4(v0)
-	ldloc 6
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c704: 0x107c704: addiu a0, sp, 36
-	ldloc.0
-	ldc.i4.s 36
-	add
-	stloc.1
-// 0x0107c708: 0x107c708: sw    v0, 40(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 10
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107c70c: 0x107c70c: sw    v1, 36(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 9
-	add
-	ldloc 7
-	stelem.i4
-L_107c710:
-// 0x0107c710: 0x107c710: jal   0x1008eb0 addiu s2, sp, 84
-	ldloc.0
-	ldc.i4.s 84
-	add
-	stloc 9
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c718: 0x107c718: addu  s0, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0107c71c: 0x107c71c: jal   0x1007df4 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
-	stloc 5
-// --- basic block ---
-// 0x0107c724: 0x107c724: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x0107c728: 0x107c728: jal   0x1007e18 sw    v0, 208(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 52
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c730: 0x107c730: addiu v1, zero, 10
-	ldc.i4.s 10
-	stloc 7
-// 0x0107c734: 0x107c734: div   v0, v1
-	ldloc 5
-	ldloc 7
-	ldloc 5
-	ldloc 7
-	div
-	stloc 13
-	rem
-	stloc 12
-// 0x0107c738: 0x107c738: lw    a3, 208(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 52
-	add
-	ldelem.i4
-	stloc 4
-// 0x0107c73c: 0x107c73c: addiu s0, sp, 104
-	ldloc.0
-	ldc.i4.s 104
-	add
-	stloc 8
-// 0x0107c740: 0x107c740: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107c744: 0x107c744: addiu a2, a2, 8928
-	ldloc.3
-	ldc.i4 8928
-	add
-	stloc.3
-// 0x0107c748: 0x107c748: addu  a0, s0, zero
-	ldloc 8
-	stloc.1
-// 0x0107c74c: 0x107c74c: addiu a1, zero, 100
-	ldc.i4.s 100
-	stloc.2
-// 0x0107c750: 0x107c750: mfhi  hi
-	ldloc 12
-	stloc 5
-// 0x0107c754: 0x107c754: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c75c: 0x107c75c: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
-	stloc 5
-// --- basic block ---
-// 0x0107c764: 0x107c764: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107c768: 0x107c768: addiu a2, a2, 19912
-	ldloc.3
-	ldc.i4 19912
-	add
-	stloc.3
-// 0x0107c76c: 0x107c76c: addu  a3, v0, zero
-	ldloc 5
-	stloc 4
-// 0x0107c770: 0x107c770: addiu a1, zero, 20
-	ldc.i4.s 20
-	stloc.2
-// 0x0107c774: 0x107c774: jal   0x1000f9c addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c77c: 0x107c77c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107c780: 0x107c780: jal   0x101cd60 addiu a0, a0, -6888
-	ldloc.1
-	ldc.i4 -6888
-	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c788: 0x107c788: addu  a0, s2, zero
-	ldloc 9
-	stloc.1
-// 0x0107c78c: 0x107c78c: jal   0x101cd60 sw    v0, 208(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 52
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-// 0x0107c794: 0x107c794: lw    a2, 208(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 52
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107c798: 0x107c798: addu  a0, s1, zero
-	ldloc 10
-	stloc.1
-// 0x0107c79c: 0x107c79c: addu  a3, s0, zero
-	ldloc 8
-	stloc 4
-// 0x0107c7a0: 0x107c7a0: addiu a1, zero, 700
-	ldc.i4 700
-	stloc.2
-// 0x0107c7a4: 0x107c7a4: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 7
-	stloc 5
-// --- basic block ---
-L_107c7ac:
-// 0x0107c7ac: 0x107c7ac: lw    ra, 228(sp)
-// 0x0107c7b0: 0x107c7b0: lw    s2, 224(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 56
-	add
-	ldelem.i4
-	stloc 9
-// 0x0107c7b4: 0x107c7b4: lw    s1, 220(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 55
-	add
-	ldelem.i4
-	stloc 10
-// 0x0107c7b8: 0x107c7b8: lw    s0, 216(sp)
-	ldloc 6
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 54
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107c7bc: 0x107c7bc: jr    ra addiu sp, sp, 232
-	ldloc.0
-	ldc.i4 232
-	add
-	stloc.0
-	br __CIBYL_function_return
-__CIBYL_function_return:
-	ldloc 7
-	stsfld int32 [WazeWP7]CRunTime::saved_v1
-	ldloc 5
-	ret
-}
-.method public static int32 RTAlerts_popup_PingWazer_107c7c4(int32,int32,int32,int32,int32)
-{
-.maxstack 10
-.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s4,int32 s0,int32 s3,int32 s1,int32 s2,int32 s5,int32 s7,int32 s6,int32 ra,int32 t0)
-
-// local  5 is register v0
-// local  6 is register v1
-// local  1 is register a0
-// local  2 is register a1
-// local  3 is register a2
-// local  4 is register a3
-// local 17 is register t0
-// local  9 is register s0
-// local 11 is register s1
-// local 12 is register s2
-// local 10 is register s3
-// local  8 is register s4
-// local 13 is register s5
-// local 15 is register s6
-// local 14 is register s7
-// local  0 is register sp
-// local 16 is register ra
-// local  7 is register mem
-
-	ldc.i4.s 0
-	stloc 5
-	ldc.i4.s 0
-	stloc 6
-	ldarg 1
-	stloc 1
-	ldarg 2
-	stloc 2
-	ldarg 3
-	stloc 3
-	ldarg 4
-	stloc 4
-	ldc.i4.s 0
-	stloc 17
-	ldc.i4.s 0
-	stloc 9
-	ldc.i4.s 0
-	stloc 11
-	ldc.i4.s 0
-	stloc 12
-	ldc.i4.s 0
-	stloc 10
-	ldc.i4.s 0
-	stloc 8
-	ldc.i4.s 0
-	stloc 13
-	ldc.i4.s 0
-	stloc 15
-	ldc.i4.s 0
-	stloc 14
-	ldarg 0
-	stloc 0
-	ldc.i4.s 0
-	stloc 16
-	ldsfld int32[] [WazeWP7]CRunTime::memory
-	stloc 7
-__CIBYL_javamethod_begin:
-// --- basic block ---
-// 0x0107c7c4: 0x107c7c4: addiu sp, sp, -1728
-	ldloc.0
-	ldc.i4 -1728
-	add
-	stloc.0
-// 0x0107c7c8: 0x107c7c8: lui   v0, 0xf0000
-	ldc.i4 983040
-	stloc 5
-// 0x0107c7cc: 0x107c7cc: sw    s2, 1700(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 425
-	add
-	ldloc 12
-	stelem.i4
-// 0x0107c7d0: 0x107c7d0: lw    s2, -30068(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -7517
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107c7d4: 0x107c7d4: lui   v0, 0xf0000
-	ldc.i4 983040
-	stloc 5
-// 0x0107c7d8: 0x107c7d8: sw    s4, 1708(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 427
-	add
-	ldloc 8
-	stelem.i4
-// 0x0107c7dc: 0x107c7dc: sw    s0, 1692(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 423
-	add
-	ldloc 9
-	stelem.i4
-// 0x0107c7e0: 0x107c7e0: sw    ra, 1724(sp)
-// 0x0107c7e4: 0x107c7e4: sw    s7, 1720(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 430
-	add
-	ldloc 14
-	stelem.i4
-// 0x0107c7e8: 0x107c7e8: sw    s6, 1716(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 429
-	add
-	ldloc 15
-	stelem.i4
-// 0x0107c7ec: 0x107c7ec: sw    s5, 1712(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 428
-	add
-	ldloc 13
-	stelem.i4
-// 0x0107c7f0: 0x107c7f0: sw    s3, 1704(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 426
-	add
-	ldloc 10
-	stelem.i4
-// 0x0107c7f4: 0x107c7f4: sw    s1, 1696(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 424
-	add
-	ldloc 11
-	stelem.i4
-// 0x0107c7f8: 0x107c7f8: sb    zero, 276(sp)
-	ldloc.0
-	ldc.i4 276
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107c7fc: 0x107c7fc: lw    s4, -30072(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -7518
-	add
-	ldelem.i4
-	stloc 8
-// 0x0107c800: 0x107c800: jal   0x101de10 addu  s0, a0, zero
+	stloc.1
 	ldloc.1
-	stloc 9
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c808: 0x107c808: lui   v0, 0x80000
+// 0x0107c3d8: 0x107c3d8: lui   s1, 0x80000
 	ldc.i4 524288
-	stloc 5
-// 0x0107c80c: 0x107c80c: lw    v0, -14028(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3507
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c810: 0x107c810: sll   zero, zero, 0
-// 0x0107c814: 0x107c814: beq   v0, zero, 0x107d47c sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107d47c
-// --- basic block ---
-// 0x0107c81c: 0x107c81c: jal   0x101fa28 addiu s6, zero, 70
-	ldc.i4.s 70
-	stloc 15
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
-	stloc 5
-// --- basic block ---
-// 0x0107c824: 0x107c824: beq   v0, zero, 0x107c830 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107c830
-// --- basic block ---
-// 0x0107c82c: 0x107c82c: addiu s6, zero, 100
-	ldc.i4.s 100
-	stloc 15
-L_107c830:
-// 0x0107c830: 0x107c830: beq   s0, zero, 0x107d47c lui   s3, 0x80000
-	ldloc 9
+	stloc 9
+// 0x0107c3dc: 0x107c3dc: lui   s5, 0x80000
 	ldc.i4 524288
-	stloc 10
-	brfalse L_107d47c
-// --- basic block ---
-// 0x0107c838: 0x107c838: lw    v0, -16084(s3)
-	ldloc 7
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4021
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107c83c: 0x107c83c: sll   zero, zero, 0
-// 0x0107c840: 0x107c840: bne   v0, zero, 0x107c874 sb    zero, 276(sp)
-	ldloc 5
-	ldloc.0
-	ldc.i4 276
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	brtrue L_107c874
-// --- basic block ---
-// 0x0107c848: 0x107c848: jal   0x10518a8 addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-	ldloc.1
-	call int32 Cibyl60::roadmap_sound_list_create_10518a8(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 11
+// 0x0107c3e0: 0x107c3e0: lui   t0, 0x100000
+	ldc.i4 1048576
+	stloc 13
+// 0x0107c3e4: 0x107c3e4: lui   v1, 0x20000
+	ldc.i4 131072
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c850: 0x107c850: lui   s1, 0x10000
+// 0x0107c3e8: 0x107c3e8: lui   s6, 0x0
+	ldc.i4.s 0
+	stloc 12
+// 0x0107c3ec: 0x107c3ec: lui   s8, 0x10000
 	ldc.i4 65536
-	stloc 11
-// 0x0107c854: 0x107c854: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107c858: 0x107c858: addiu a1, s1, 22580
-	ldloc 11
-	ldc.i4 22580
-	add
-	stloc.2
-// 0x0107c85c: 0x107c85c: jal   0x10518cc sw    v0, -16084(s3)
-	ldloc 7
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4021
+	stloc 17
+// 0x0107c3f0: 0x107c3f0: lui   s7, 0x20000
+	ldc.i4 131072
+	stloc 16
+// 0x0107c3f4: 0x107c3f4: addiu s1, s1, -13508
+	ldloc 9
+	ldc.i4 -13508
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl60::roadmap_sound_list_add_10518cc(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c864: 0x107c864: addiu a2, s1, 22580
+	stloc 9
+// 0x0107c3f8: 0x107c3f8: addiu s5, s5, -13448
 	ldloc 11
-	ldc.i4 22580
+	ldc.i4 -13448
 	add
-	stloc.3
-// 0x0107c868: 0x107c868: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107c86c: 0x107c86c: jal   0x10a1918 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-L_107c874:
-// 0x0107c874: 0x107c874: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107c878: 0x107c878: lw    a0, -16084(v0)
-	ldloc 7
-	ldloc 5
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4021
+	stloc 11
+// 0x0107c3fc: 0x107c3fc: ori   t0, t0, 136
+	ldloc 13
+	ldc.i4 136
+	or
+	stloc 13
+// 0x0107c400: 0x107c400: addiu v1, v1, -24992
+	ldloc 6
+	ldc.i4 -24992
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107c87c: 0x107c87c: jal   0x105195c lui   s3, 0x20000
-	ldc.i4 131072
-	stloc 10
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl60::roadmap_sound_play_list_105195c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c884: 0x107c884: lui   v0, 0x80000
+// 0x0107c404: 0x107c404: addiu s6, s6, 15832
+	ldloc 12
+	ldc.i4 15832
+	add
+	stloc 12
+// 0x0107c408: 0x107c408: addiu s8, s8, -27036
+	ldloc 17
+	ldc.i4 -27036
+	add
+	stloc 17
+// 0x0107c40c: 0x107c40c: addiu s7, s7, -24980
+	ldloc 16
+	ldc.i4 -24980
+	add
+	stloc 16
+// 0x0107c410: 0x107c410: addu  s4, zero, zero
+	ldc.i4.s 0
+	stloc 15
+// 0x0107c414: 0x107c414: j	 0x107c50c lui   t1, 0x80000
 	ldc.i4 524288
-	stloc 5
-// 0x0107c888: 0x107c888: lw    s1, -16080(v0)
+	stloc 18
+	br L_107c50c
+// --- basic block ---
+L_107c41c:
+// 0x0107c41c: 0x107c41c: sw    t0, 16(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4020
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 11
-// 0x0107c88c: 0x107c88c: sll   zero, zero, 0
-// 0x0107c890: 0x107c890: beq   s1, zero, 0x107cc30 lui   v0, 0x80000
-	ldloc 11
-	ldc.i4 524288
-	stloc 5
-	brfalse L_107cc30
-// --- basic block ---
-// 0x0107c898: 0x107c898: lw    v1, 0(s0)
+	ldloc 13
+	stelem.i4
+// 0x0107c420: 0x107c420: sw    v1, 292(sp)
 	ldloc 7
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 6
-// 0x0107c89c: 0x107c89c: sll   zero, zero, 0
-// 0x0107c8a0: 0x107c8a0: sw    v1, -14004(v0)
+	ldc.i4.s 73
+	add
+	ldloc 6
+	stelem.i4
+// 0x0107c424: 0x107c424: sw    t0, 288(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4.s 72
 	add
-	ldloc 6
+	ldloc 13
 	stelem.i4
-// 0x0107c8a4: 0x107c8a4: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107c8a8: 0x107c8a8: addiu v1, zero, -1
-	ldc.i4.m1
-	stloc 6
-// 0x0107c8ac: 0x107c8ac: lui   v0, 0x80000
-	ldc.i4 524288
-	stloc 5
-// 0x0107c8b0: 0x107c8b0: jal   0x1098ff8 sw    v1, -14000(v0)
+// 0x0107c428: 0x107c428: jal   0x1094048 sw    t1, 284(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3500
+	ldc.i4.s 71
 	add
-	ldloc 6
+	ldloc 18
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c8b8: 0x107c8b8: lw    a0, 140(s0)
+// 0x0107c430: 0x107c430: addu  s2, v0, zero
+	ldloc 5
+	stloc 10
+// 0x0107c434: 0x107c434: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 35
-	add
 	ldelem.i4
-	stloc.1
-// 0x0107c8bc: 0x107c8bc: jal   0x103542c lui   s4, 0x20000
-	ldc.i4 131072
-	stloc 8
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl39::roadmap_mood_to_string_103542c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x0107c8c4: 0x107c8c4: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107c8c8: 0x107c8c8: addiu a1, s3, -25372
-	ldloc 10
-	ldc.i4 -25372
-	add
-	stloc.2
-// 0x0107c8cc: 0x107c8cc: jal   0x109b304 addu  s5, v0, zero
+// 0x0107c438: 0x107c438: lui   a3, 0x1080000
+	ldc.i4 17301504
+	stloc 4
+// 0x0107c43c: 0x107c43c: sll   v0, v0, 2
 	ldloc 5
-	stloc 13
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.2
+	shl
 	stloc 5
-// --- basic block ---
-// 0x0107c8d4: 0x107c8d4: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107c8d8: 0x107c8d8: addu  a1, s5, zero
-	ldloc 13
-	stloc.2
-// 0x0107c8dc: 0x107c8dc: jal   0x109df10 addu  s2, v0, zero
+// 0x0107c440: 0x107c440: addu  v0, v0, s6
 	ldloc 5
-	stloc 12
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c8e4: 0x107c8e4: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107c8e8: 0x107c8e8: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107c8ec: 0x107c8ec: addiu a1, a1, -25352
-	ldloc.2
-	ldc.i4 -25352
-	add
-	stloc.2
-// 0x0107c8f0: 0x107c8f0: jal   0x109b3e0 addiu a2, s0, 32
-	ldloc 9
-	ldc.i4.s 32
-	add
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c8f8: 0x107c8f8: lb    v0, 1520(s0)
-	ldloc 9
-	ldc.i4 1520
+	ldloc 12
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107c8fc: 0x107c8fc: sll   zero, zero, 0
-// 0x0107c900: 0x107c900: beq   v0, zero, 0x107c94c addiu s3, sp, 164
+// 0x0107c444: 0x107c444: lw    a0, 0(v0)
+	ldloc 7
 	ldloc 5
-	ldloc.0
-	ldc.i4 164
-	add
-	stloc 10
-	brfalse L_107c94c
-// --- basic block ---
-// 0x0107c908: 0x107c908: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107c90c: 0x107c90c: addiu a3, s0, 1520
-	ldloc 9
-	ldc.i4 1520
-	add
-	stloc 4
-// 0x0107c910: 0x107c910: addu  a0, s3, zero
-	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.1
-// 0x0107c914: 0x107c914: addiu a2, a2, 14640
-	ldloc.3
-	ldc.i4 14640
-	add
+// 0x0107c448: 0x107c448: addiu a2, zero, 16
+	ldc.i4.s 16
 	stloc.3
-// 0x0107c918: 0x107c918: jal   0x1000f9c addiu a1, zero, 110
-	ldc.i4.s 110
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
+// 0x0107c44c: 0x107c44c: addiu a3, a3, -30976
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c920: 0x107c920: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107c924: 0x107c924: addu  a2, s3, zero
-	ldloc 10
-	stloc.3
-// 0x0107c928: 0x107c928: jal   0x109b3e0 addiu a1, s4, -25336
-	ldloc 8
-	ldc.i4 -25336
+	ldc.i4 -30976
 	add
+	stloc 4
+// 0x0107c450: 0x107c450: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0107c454: 0x107c454: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// --- basic block ---
-// 0x0107c930: 0x107c930: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107c934: 0x107c934: jal   0x109b304 addiu a1, s4, -25336
-	ldloc 8
-	ldc.i4 -25336
-	add
-	stloc.2
+// 0x0107c458: 0x107c458: sw    zero, 16(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c93c: 0x107c93c: jal   0x10990ac addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c944: 0x107c944: j	 0x107c960 sll   zero, zero, 0
-	br L_107c960
-// --- basic block ---
-L_107c94c:
-// 0x0107c94c: 0x107c94c: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107c950: 0x107c950: jal   0x109b304 addiu a1, s4, -25336
-	ldloc 8
-	ldc.i4 -25336
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.2
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107c45c: 0x107c45c: sw    zero, 20(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c958: 0x107c958: jal   0x1099098 addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
-	stloc 5
-// --- basic block ---
-L_107c960:
-// 0x0107c960: 0x107c960: lb    v0, 156(s0)
-	ldloc 9
-	ldc.i4 156
-	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x0107c964: 0x107c964: sll   zero, zero, 0
-// 0x0107c968: 0x107c968: beq   v0, zero, 0x107ca20 lui   a1, 0x20000
-	ldloc 5
-	ldc.i4 131072
-	stloc.2
-	brfalse L_107ca20
-// --- basic block ---
-// 0x0107c970: 0x107c970: addiu a1, a1, -25320
-	ldloc.2
-	ldc.i4 -25320
-	add
-	stloc.2
-// 0x0107c974: 0x107c974: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107c978: 0x107c978: jal   0x109b3e0 addiu a2, s0, 156
-	ldloc 9
-	ldc.i4 156
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c980: 0x107c980: jal   0x108dbb0 sb    zero, 976(sp)
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107c460: 0x107c460: jal   0x109c794 sw    v0, 24(sp)
+	ldloc 7
 	ldloc.0
-	ldc.i4 976
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl105::RealtimePrivacyState_108dbb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_checkbox_new_109c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c988: 0x107c988: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0107c98c: 0x107c98c: addiu s3, sp, 976
-	ldloc.0
-	ldc.i4 976
-	add
-	stloc 10
-// 0x0107c990: 0x107c990: bne   v0, v1, 0x107c9d0 lui   s7, 0x20000
+// 0x0107c468: 0x107c468: addu  a1, v0, zero
 	ldloc 5
-	ldloc 6
-	ldc.i4 131072
-	stloc 14
-	bne.un L_107c9d0
-// --- basic block ---
-// 0x0107c998: 0x107c998: jal   0x1001b48 addu  a0, s3, zero
+	stloc.2
+// 0x0107c46c: 0x107c46c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c9a0: 0x107c9a0: addiu a0, s7, -25304
-	ldloc 14
-	ldc.i4 -25304
-	add
-	stloc.1
-// 0x0107c9a4: 0x107c9a4: jal   0x101cd60 addu  s4, v0, zero
+// 0x0107c470: 0x107c470: jal   0x109950c sw    v0, 0(s5)
+	ldloc 7
+	ldloc 11
+	ldc.i4.2
+	shr.un
 	ldloc 5
-	stloc 8
-	ldloc.0
+	stelem.i4
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c9ac: 0x107c9ac: addiu a1, zero, 700
-	ldc.i4 700
+// 0x0107c478: 0x107c478: addiu a3, zero, 14
+	ldc.i4.s 14
+	stloc 4
+// 0x0107c47c: 0x107c47c: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-// 0x0107c9b0: 0x107c9b0: lui   a2, 0x10000
-	ldc.i4 65536
+// 0x0107c480: 0x107c480: addiu a2, zero, 10
+	ldc.i4.s 10
 	stloc.3
-// 0x0107c9b4: 0x107c9b4: subu  a1, a1, s4
-	ldloc.2
-	ldloc 8
-	sub
-	stloc.2
-// 0x0107c9b8: 0x107c9b8: addu  a0, s3, s4
-	ldloc 10
-	ldloc 8
-	add
+// 0x0107c484: 0x107c484: addu  a0, s8, zero
+	ldloc 17
 	stloc.1
-// 0x0107c9bc: 0x107c9bc: addiu a2, a2, 744
-	ldloc.3
-	ldc.i4 744
+// 0x0107c488: 0x107c488: jal   0x1094048 sw    zero, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.3
-// 0x0107c9c0: 0x107c9c0: jal   0x1000f9c addu  a3, v0, zero
-	ldloc 5
-	stloc 4
+	ldc.i4.s 0
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c9c8: 0x107c9c8: j	 0x107ca10 lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-	br L_107ca10
-// --- basic block ---
-L_107c9d0:
-// 0x0107c9d0: 0x107c9d0: jal   0x1001b48 addu  a0, s3, zero
-	ldloc 10
+// 0x0107c490: 0x107c490: addu  a0, v0, zero
+	ldloc 5
 	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107c9d8: 0x107c9d8: addiu a0, s7, -25304
-	ldloc 14
-	ldc.i4 -25304
+// 0x0107c494: 0x107c494: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107c498: 0x107c498: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107c49c: 0x107c49c: jal   0x1099628 sw    v0, 280(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 70
 	add
-	stloc.1
-// 0x0107c9dc: 0x107c9dc: jal   0x101cd60 addu  s4, v0, zero
 	ldloc 5
-	stloc 8
-	ldloc.0
+	stelem.i4
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107c9e4: 0x107c9e4: jal   0x106abe0 sw    v0, 1680(sp)
+// 0x0107c4a4: 0x107c4a4: lw    v0, 280(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.s 70
 	add
+	ldelem.i4
+	stloc 5
+// 0x0107c4a8: 0x107c4a8: addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+// 0x0107c4ac: 0x107c4ac: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
-	stelem.i4
-	ldloc.0
+	stloc.2
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl79::Realtime_GetNickName_106abe0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107c9ec: 0x107c9ec: addiu a1, zero, 700
-	ldc.i4 700
-	stloc.2
-// 0x0107c9f0: 0x107c9f0: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107c9f4: 0x107c9f4: lw    a3, 1680(sp)
+// 0x0107c4b4: 0x107c4b4: lw    v0, 0(s1)
 	ldloc 7
-	ldloc.0
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
-	add
 	ldelem.i4
-	stloc 4
-// 0x0107c9f8: 0x107c9f8: subu  a1, a1, s4
-	ldloc.2
-	ldloc 8
-	sub
-	stloc.2
-// 0x0107c9fc: 0x107c9fc: addu  a0, s3, s4
-	ldloc 10
-	ldloc 8
+	stloc 5
+// 0x0107c4b8: 0x107c4b8: addiu s4, s4, 1
+	ldloc 15
+	ldc.i4.1
 	add
-	stloc.1
-// 0x0107ca00: 0x107ca00: addiu a2, a2, -25300
-	ldloc.3
-	ldc.i4 -25300
+	stloc 15
+// 0x0107c4bc: 0x107c4bc: sll   v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
+	stloc 5
+// 0x0107c4c0: 0x107c4c0: addu  v0, v0, s6
+	ldloc 5
+	ldloc 12
 	add
-	stloc.3
-// 0x0107ca04: 0x107ca04: jal   0x1000f9c sw    v0, 16(sp)
+	stloc 5
+// 0x0107c4c4: 0x107c4c4: lw    a0, 0(v0)
 	ldloc 7
-	ldloc.0
+	ldloc 5
 	ldc.i4.2
 	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0107c4c8: 0x107c4c8: jal   0x101cd70 addiu s1, s1, 4
+	ldloc 9
 	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ca0c: 0x107ca0c: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-L_107ca10:
-// 0x0107ca10: 0x107ca10: addiu a1, a1, -25292
-	ldloc.2
-	ldc.i4 -25292
-	add
-	stloc.2
-// 0x0107ca14: 0x107ca14: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107ca18: 0x107ca18: j	 0x107ca30 addiu a2, sp, 976
-	ldloc.0
-	ldc.i4 976
-	add
-	stloc.3
-	br L_107ca30
-// --- basic block ---
-L_107ca20:
-// 0x0107ca20: 0x107ca20: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107ca24: 0x107ca24: addiu a1, a1, -25320
-	ldloc.2
-	ldc.i4 -25320
-	add
+// 0x0107c4d0: 0x107c4d0: addu  a1, v0, zero
+	ldloc 5
 	stloc.2
-// 0x0107ca28: 0x107ca28: addiu a2, a2, 18500
-	ldloc.3
-	ldc.i4 18500
-	add
+// 0x0107c4d4: 0x107c4d4: addiu a2, zero, 14
+	ldc.i4.s 14
 	stloc.3
-// 0x0107ca2c: 0x107ca2c: addu  a0, s1, zero
-	ldloc 11
+// 0x0107c4d8: 0x107c4d8: addiu a3, zero, 152
+	ldc.i4 152
+	stloc 4
+// 0x0107c4dc: 0x107c4dc: jal   0x1099358 addu  a0, s7, zero
+	ldloc 16
 	stloc.1
-L_107ca30:
-// 0x0107ca30: 0x107ca30: jal   0x109b3e0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ca38: 0x107ca38: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x0107ca3c: 0x107ca3c: addiu v1, v1, -16028
-	ldloc 6
-	ldc.i4 -16028
-	add
+// 0x0107c4e4: 0x107c4e4: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107c4e8: 0x107c4e8: jal   0x109950c addu  a0, s2, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-// 0x0107ca40: 0x107ca40: addu  v0, v1, zero
-	ldloc 6
 	stloc 5
-// 0x0107ca44: 0x107ca44: lw    a2, 2000(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 500
-	add
-	ldelem.i4
-	stloc.3
-// 0x0107ca48: 0x107ca48: addu  a0, v1, zero
-	ldloc 6
+// --- basic block ---
+// 0x0107c4f0: 0x107c4f0: addu  a0, s0, zero
+	ldloc 8
 	stloc.1
-// 0x0107ca4c: 0x107ca4c: lw    s3, 4(s1)
-	ldloc 7
-	ldloc 11
-	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 10
-// 0x0107ca50: 0x107ca50: lw    a1, 0(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
+// 0x0107c4f4: 0x107c4f4: jal   0x109950c addu  a1, s2, zero
+	ldloc 10
 	stloc.2
-// 0x0107ca54: 0x107ca54: j	 0x107ca74 addu  v1, zero, zero
-	ldc.i4.s 0
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
-	br L_107ca74
+	stloc 5
 // --- basic block ---
-L_107ca5c:
-// 0x0107ca5c: 0x107ca5c: lw    a3, 0(a0)
+// 0x0107c4fc: 0x107c4fc: lw    t1, 284(sp)
 	ldloc 7
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc 4
-// 0x0107ca60: 0x107ca60: addiu v1, v1, 1
-	ldloc 6
-	ldc.i4.1
+	ldc.i4.s 71
 	add
-	stloc 6
-// 0x0107ca64: 0x107ca64: lw    a3, 0(a3)
-	ldloc 7
-	ldloc 4
-	ldc.i4.2
-	shr.un
 	ldelem.i4
-	stloc 4
-// 0x0107ca68: 0x107ca68: sll   zero, zero, 0
-// 0x0107ca6c: 0x107ca6c: beq   a3, a1, 0x107caa8 addiu a0, a0, 4
-	ldloc 4
-	ldloc.2
-	ldloc.1
-	ldc.i4.4
-	add
-	stloc.1
-	beq  L_107caa8
-// --- basic block ---
-L_107ca74:
-// 0x0107ca74: 0x107ca74: slt   a3, v1, a2
-	ldloc 6
-	ldloc.3
-	clt
-	stloc 4
-// 0x0107ca78: 0x107ca78: bne   a3, zero, 0x107ca5c sll   zero, zero, 0
-	ldloc 4
-	brtrue L_107ca5c
-// --- basic block ---
-// 0x0107ca80: 0x107ca80: j	 0x107caac addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-	br L_107caac
-// --- basic block ---
-L_107ca88:
-// 0x0107ca88: 0x107ca88: lw    a0, 0(v0)
+	stloc 18
+// 0x0107c500: 0x107c500: lw    t0, 288(sp)
 	ldloc 7
-	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
+	ldc.i4.s 72
+	add
 	ldelem.i4
-	stloc.1
-// 0x0107ca8c: 0x107ca8c: sll   zero, zero, 0
-// 0x0107ca90: 0x107ca90: lw    a0, 0(a0)
+	stloc 13
+// 0x0107c504: 0x107c504: lw    v1, 292(sp)
 	ldloc 7
-	ldloc.1
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.1
-// 0x0107ca94: 0x107ca94: sll   zero, zero, 0
-// 0x0107ca98: 0x107ca98: bne   a0, a1, 0x107caac addiu v0, v0, 4
-	ldloc.1
-	ldloc.2
-	ldloc 5
-	ldc.i4.4
-	add
-	stloc 5
-	bne.un L_107caac
-// --- basic block ---
-// 0x0107caa0: 0x107caa0: j	 0x107cab8 sll   zero, zero, 0
-	br L_107cab8
-// --- basic block ---
-L_107caa8:
-// 0x0107caa8: 0x107caa8: addu  v1, zero, zero
-	ldc.i4.s 0
-	stloc 6
-L_107caac:
-// 0x0107caac: 0x107caac: slt   a0, v1, a2
-	ldloc 6
-	ldloc.3
-	clt
-	stloc.1
-// 0x0107cab0: 0x107cab0: bne   a0, zero, 0x107ca88 addiu v1, v1, 1
-	ldloc.1
-	ldloc 6
-	ldc.i4.1
+	ldc.i4.s 73
 	add
+	ldelem.i4
 	stloc 6
-	brtrue L_107ca88
-// --- basic block ---
-L_107cab8:
-// 0x0107cab8: 0x107cab8: lw    v1, 4(s0)
+// 0x0107c508: 0x107c508: addiu s5, s5, 4
+	ldloc 11
+	ldc.i4.4
+	add
+	stloc 11
+L_107c50c:
+// 0x0107c50c: 0x107c50c: lw    v0, -15780(t1)
 	ldloc 7
-	ldloc 9
+	ldloc 18
 	ldc.i4.2
 	shr.un
-	ldc.i4.1
+	ldc.i4 -3945
 	add
 	ldelem.i4
-	stloc 6
-// 0x0107cabc: 0x107cabc: addiu v0, zero, 4
-	ldc.i4.4
 	stloc 5
-// 0x0107cac0: 0x107cac0: beq   v1, v0, 0x107d450 lui   s4, 0x1080000
+// 0x0107c510: 0x107c510: addu  a0, v1, zero
 	ldloc 6
+	stloc.1
+// 0x0107c514: 0x107c514: slt   t2, s4, v0
+	ldloc 15
 	ldloc 5
-	ldc.i4 17301504
-	stloc 8
-	beq  L_107d450
-// --- basic block ---
-// 0x0107cac8: 0x107cac8: addiu a1, s4, -19460
-	ldloc 8
-	ldc.i4 -19460
-	add
+	clt
+	stloc 20
+// 0x0107c518: 0x107c518: addu  a1, zero, zero
+	ldc.i4.s 0
 	stloc.2
-// 0x0107cacc: 0x107cacc: jal   0x1099174 addu  a0, s3, zero
-	ldloc 10
-	stloc.1
-	ldloc.1
-	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+// 0x0107c51c: 0x107c51c: addiu a2, zero, -2
+	ldc.i4.s -2
+	stloc.3
+// 0x0107c520: 0x107c520: bne   t2, zero, 0x107c41c addiu a3, zero, 35
+	ldloc 20
+	ldc.i4.s 35
+	stloc 4
+	brtrue L_107c41c
 // --- basic block ---
-// 0x0107cad4: 0x107cad4: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107cad8: 0x107cad8: jal   0x101cd60 addiu a0, a0, -6188
-	ldloc.1
-	ldc.i4 -6188
+// 0x0107c528: 0x107c528: addiu v0, v0, -1
+	ldloc 5
+	ldc.i4.m1
+	add
+	stloc 5
+// 0x0107c52c: 0x107c52c: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x0107c530: 0x107c530: addiu v1, v1, -13448
+	ldloc 6
+	ldc.i4 -13448
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
+// 0x0107c534: 0x107c534: sll   v0, v0, 2
+	ldloc 5
+	ldc.i4.2
+	shl
 	stloc 5
-// --- basic block ---
-// 0x0107cae0: 0x107cae0: addu  a1, v0, zero
+// 0x0107c538: 0x107c538: addu  v0, v0, v1
 	ldloc 5
-	stloc.2
-// 0x0107cae4: 0x107cae4: jal   0x109b434 addu  a0, s3, zero
-	ldloc 10
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldloc 6
+	add
 	stloc 5
-// --- basic block ---
-// 0x0107caec: 0x107caec: lw    a1, 16(s3)
+// 0x0107c53c: 0x107c53c: lw    a0, 0(v0)
 	ldloc 7
-	ldloc 10
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
-	add
 	ldelem.i4
+	stloc.1
+// 0x0107c540: 0x107c540: lui   a1, 0x0
+	ldc.i4.s 0
 	stloc.2
-// 0x0107caf0: 0x107caf0: jal   0x109c5ec addiu a0, s4, -19460
-	ldloc 8
-	ldc.i4 -19460
+// 0x0107c544: 0x107c544: lw    v0, 180(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 45
 	add
-	stloc.1
+	ldelem.i4
+	stloc 5
+// 0x0107c548: 0x107c548: sll   zero, zero, 0
+// 0x0107c54c: 0x107c54c: jalr  v0 addiu a1, a1, 20820
+	ldloc 5
+	ldloc.2
+	ldc.i4 20820
+	add
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 [WazeWP7]CibylCallTable::fcall(int32,int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107caf8: 0x107caf8: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-L_107cafc:
-// 0x0107cafc: 0x107cafc: lw    s3, 4(s1)
-	ldloc 7
-	ldloc 11
+// 0x0107c554: 0x107c554: jal   0x1078c38 addiu a0, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.1
-	add
-	ldelem.i4
-	stloc 10
-// 0x0107cb00: 0x107cb00: jal   0x101cd60 addiu a0, a0, -14440
-	ldloc.1
-	ldc.i4 -14440
-	add
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::space_1078c38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cb08: 0x107cb08: addu  a1, v0, zero
+// 0x0107c55c: 0x107c55c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107cb0c: 0x107cb0c: jal   0x109b50c addu  a0, s3, zero
-	ldloc 10
+// 0x0107c560: 0x107c560: jal   0x109950c addu  a0, s0, zero
+	ldloc 8
 	stloc.1
-	ldloc.0
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109b50c(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cb14: 0x107cb14: lui   a1, 0x20000
+// 0x0107c568: 0x107c568: lui   a0, 0x20000
 	ldc.i4 131072
-	stloc.2
-// 0x0107cb18: 0x107cb18: addu  a0, s1, zero
-	ldloc 11
 	stloc.1
-// 0x0107cb1c: 0x107cb1c: jal   0x109b304 addiu a1, a1, -25268
-	ldloc.2
-	ldc.i4 -25268
+// 0x0107c56c: 0x107c56c: jal   0x101cd70 addiu a0, a0, -26344
+	ldloc.1
+	ldc.i4 -26344
 	add
-	stloc.2
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cb24: 0x107cb24: lui   a1, 0x20000
+// 0x0107c574: 0x107c574: lui   a0, 0x20000
 	ldc.i4 131072
-	stloc.2
-// 0x0107cb28: 0x107cb28: addu  a0, s1, zero
-	ldloc 11
 	stloc.1
-// 0x0107cb2c: 0x107cb2c: addiu a1, a1, -25252
-	ldloc.2
-	ldc.i4 -25252
+// 0x0107c578: 0x107c578: addiu a0, a0, -24964
+	ldloc.1
+	ldc.i4 -24964
 	add
-	stloc.2
-// 0x0107cb30: 0x107cb30: jal   0x109b304 addu  s3, v0, zero
+	stloc.1
+// 0x0107c57c: 0x107c57c: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
-	stloc 10
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cb38: 0x107cb38: addu  s4, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0107cb3c: 0x107cb3c: lw    v0, 1620(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 405
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107cb40: 0x107cb40: sll   zero, zero, 0
-// 0x0107cb44: 0x107cb44: beq   v0, zero, 0x107cbc8 addu  a0, s4, zero
-	ldloc 5
-	ldloc 8
-	stloc.1
-	brfalse L_107cbc8
-// --- basic block ---
-// 0x0107cb4c: 0x107cb4c: beq   s3, zero, 0x107cc00 lui   a1, 0x20000
-	ldloc 10
-	ldc.i4 131072
+// 0x0107c584: 0x107c584: addiu v1, zero, -2
+	ldc.i4.s -2
+	stloc 6
+// 0x0107c588: 0x107c588: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-	brfalse L_107cc00
-// --- basic block ---
-// 0x0107cb54: 0x107cb54: addu  a0, s3, zero
-	ldloc 10
+// 0x0107c58c: 0x107c58c: lui   a2, 0x100000
+	ldc.i4 1048576
+	stloc.3
+// 0x0107c590: 0x107c590: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107c594: 0x107c594: addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-// 0x0107cb58: 0x107cb58: jal   0x109df10 addiu a1, a1, -25232
+// 0x0107c598: 0x107c598: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 -25232
+	ldc.i4 18768
 	add
 	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107cb60: 0x107cb60: lw    a2, 0(s0)
+// 0x0107c59c: 0x107c59c: sw    v1, 16(sp)
 	ldloc 7
-	ldloc 9
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldelem.i4
-	stloc.3
-// 0x0107cb64: 0x107cb64: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x0107cb68: 0x107cb68: addiu a1, zero, 2
-	ldc.i4.2
-	stloc.2
-// 0x0107cb6c: 0x107cb6c: addiu a0, zero, 1
-	ldc.i4.1
-	stloc.1
-// 0x0107cb70: 0x107cb70: addiu v0, zero, -1
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+// 0x0107c5a0: 0x107c5a0: addiu v1, zero, -1
 	ldc.i4.m1
-	stloc 5
-// 0x0107cb74: 0x107cb74: sw    v0, 16(sp)
+	stloc 6
+// 0x0107c5a4: 0x107c5a4: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldloc 5
+	ldloc 6
 	stelem.i4
-// 0x0107cb78: 0x107cb78: jal   0x104b534 sw    s3, 20(sp)
+// 0x0107c5a8: 0x107c5a8: jal   0x1096e84 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.6
 	add
-	ldloc 10
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b534(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_entry_new_1096e84(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cb80: 0x107cb80: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0107cb84: 0x107cb84: addiu a1, a1, 23008
-	ldloc.2
-	ldc.i4 23008
-	add
+// 0x0107c5b0: 0x107c5b0: addu  a1, v0, zero
+	ldloc 5
 	stloc.2
-// 0x0107cb88: 0x107cb88: addu  a0, s4, zero
+// 0x0107c5b4: 0x107c5b4: jal   0x109950c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0107cb8c: 0x107cb8c: jal   0x1098fe0 addu  a2, a1, zero
-	ldloc.2
-	stloc.3
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
 // --- basic block ---
-// 0x0107cb94: 0x107cb94: addu  a0, s2, zero
-	ldloc 12
+// 0x0107c5bc: 0x107c5bc: jal   0x1078c38 addiu a0, zero, 2
+	ldc.i4.2
 	stloc.1
-// 0x0107cb98: 0x107cb98: addiu a1, zero, -20
-	ldc.i4.s -20
-	stloc.2
-// 0x0107cb9c: 0x107cb9c: jal   0x1098f84 addiu a2, zero, 12
-	ldc.i4.s 12
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::space_1078c38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cba4: 0x107cba4: lw    v0, 48(s2)
-	ldloc 7
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107cba8: 0x107cba8: addiu v1, zero, -2
-	ldc.i4.s -2
-	stloc 6
-// 0x0107cbac: 0x107cbac: ori   v0, v0, 512
-	ldloc 5
-	ldc.i4 512
-	or
-	stloc 5
-// 0x0107cbb0: 0x107cbb0: and   v0, v0, v1
-	ldloc 5
-	ldloc 6
-	and
-	stloc 5
-// 0x0107cbb4: 0x107cbb4: sw    v0, 48(s2)
-	ldloc 7
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
+// 0x0107c5c4: 0x107c5c4: addu  a1, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0107cbb8: 0x107cbb8: jal   0x10990ac addu  a0, s3, zero
-	ldloc 10
+	stloc.2
+// 0x0107c5c8: 0x107c5c8: jal   0x109950c addu  a0, s0, zero
+	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cbc0: 0x107cbc0: j	 0x107cc04 lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-	br L_107cc04
-// --- basic block ---
-L_107cbc8:
-// 0x0107cbc8: 0x107cbc8: addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x0107c5d0: 0x107c5d0: lui   a1, 0x1080000
+	ldc.i4 17301504
 	stloc.2
-// 0x0107cbcc: 0x107cbcc: jal   0x1098fe0 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+// 0x0107c5d4: 0x107c5d4: addiu a1, a1, -29532
+	ldloc.2
+	ldc.i4 -29532
+	add
+	stloc.2
+// 0x0107c5d8: 0x107c5d8: jal   0x10997bc addu  a0, s3, zero
+	ldloc 14
+	stloc.1
 	ldloc.1
 	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x0107cbd4: 0x107cbd4: lw    v1, 48(s2)
-	ldloc 7
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
-	add
-	ldelem.i4
-	stloc 6
-// 0x0107cbd8: 0x107cbd8: addiu v0, zero, -513
-	ldc.i4 -513
-	stloc 5
-// 0x0107cbdc: 0x107cbdc: and   v0, v1, v0
-	ldloc 6
-	ldloc 5
-	and
-	stloc 5
-// 0x0107cbe0: 0x107cbe0: ori   v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	or
-	stloc 5
-// 0x0107cbe4: 0x107cbe4: addu  a0, s2, zero
-	ldloc 12
+// 0x0107c5e0: 0x107c5e0: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107cbe8: 0x107cbe8: sw    v0, 48(s2)
-	ldloc 7
-	ldloc 12
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+// 0x0107c5e4: 0x107c5e4: jal   0x101cd70 addiu a0, a0, -6468
+	ldloc.1
+	ldc.i4 -6468
 	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107c5ec: 0x107c5ec: addu  a1, v0, zero
 	ldloc 5
-	stelem.i4
-// 0x0107cbec: 0x107cbec: addu  a1, zero, zero
-	ldc.i4.s 0
 	stloc.2
-// 0x0107cbf0: 0x107cbf0: jal   0x1098f84 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+// 0x0107c5f0: 0x107c5f0: jal   0x109ba7c addu  a0, s3, zero
+	ldloc 14
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cbf8: 0x107cbf8: jal   0x1099098 addu  a0, s3, zero
-	ldloc 10
+// 0x0107c5f8: 0x107c5f8: addu  a0, s3, zero
+	ldloc 14
 	stloc.1
+// 0x0107c5fc: 0x107c5fc: jal   0x109950c addu  a1, s0, zero
+	ldloc 8
+	stloc.2
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
 	stloc 5
 // --- basic block ---
-L_107cc00:
-// 0x0107cc00: 0x107cc00: lui   a0, 0x20000
+// 0x0107c604: 0x107c604: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_107cc04:
-// 0x0107cc04: 0x107cc04: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107cc08: 0x107cc08: jal   0x1095eec addiu a0, a0, -26732
+// 0x0107c608: 0x107c608: addiu a0, a0, -25056
 	ldloc.1
-	ldc.i4 -26732
+	ldc.i4 -25056
 	add
 	stloc.1
+// 0x0107c60c: 0x107c60c: jal   0x1096534 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107cc10: 0x107cc10: jal   0x1095020 sll   zero, zero, 0
+L_107c614:
+// 0x0107c614: 0x107c614: lw    ra, 332(sp)
+// 0x0107c618: 0x107c618: lw    s8, 328(sp)
+	ldloc 7
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095020(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 82
+	add
+	ldelem.i4
+	stloc 17
+// 0x0107c61c: 0x107c61c: lw    s7, 324(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 81
+	add
+	ldelem.i4
+	stloc 16
+// 0x0107c620: 0x107c620: lw    s6, 320(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 80
+	add
+	ldelem.i4
+	stloc 12
+// 0x0107c624: 0x107c624: lw    s5, 316(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 79
+	add
+	ldelem.i4
+	stloc 11
+// 0x0107c628: 0x107c628: lw    s4, 312(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 78
+	add
+	ldelem.i4
+	stloc 15
+// 0x0107c62c: 0x107c62c: lw    s3, 308(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 77
+	add
+	ldelem.i4
+	stloc 14
+// 0x0107c630: 0x107c630: lw    s2, 304(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 76
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107c634: 0x107c634: lw    s1, 300(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 75
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107c638: 0x107c638: lw    s0, 296(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 74
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107c63c: 0x107c63c: jr    ra addiu sp, sp, 336
+	ldloc.0
+	ldc.i4 336
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 T_411_107c644(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 ra,int32 v1)
+
+// local  6 is register v0
+// local  9 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  7 is register s0
+// local  0 is register sp
+// local  8 is register ra
+// local  5 is register mem
+
+	ldc.i4.s 0
 	stloc 6
+	ldc.i4.s 0
+	stloc 9
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 7
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 8
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107cc18: 0x107cc18: jal   0x1098ff8 addu  a0, s1, zero
-	ldloc 11
-	stloc.1
+// 0x0107c644: 0x107c644: addiu sp, sp, -32
+	ldloc.0
+	ldc.i4.s -32
+	add
+	stloc.0
+// 0x0107c648: 0x107c648: sw    ra, 28(sp)
+// 0x0107c64c: 0x107c64c: sw    s0, 24(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 7
+	stelem.i4
+// 0x0107c650: 0x107c650: jal   0x1000910 sw    a0, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc.1
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::malloc_1000910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107cc20: 0x107cc20: jal   0x1099048 addu  a0, s1, zero
-	ldloc 11
-	stloc.1
+// 0x0107c658: 0x107c658: lw    a2, 16(sp)
+	ldloc 5
 	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc.3
+// 0x0107c65c: 0x107c65c: addu  a0, v0, zero
+	ldloc 6
+	stloc.1
+// 0x0107c660: 0x107c660: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107c664: 0x107c664: jal   0x100177c addu  s0, v0, zero
+	ldloc 6
+	stloc 7
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memset_100177c(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 9
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107cc28: 0x107cc28: j	 0x107d430 sll   zero, zero, 0
-	br L_107d430
-// --- basic block ---
-L_107cc30:
-// 0x0107cc30: 0x107cc30: lw    a0, 140(s0)
+// 0x0107c66c: 0x107c66c: lw    ra, 28(sp)
+// 0x0107c670: 0x107c670: addu  v0, s0, zero
 	ldloc 7
-	ldloc 9
+	stloc 6
+// 0x0107c674: 0x107c674: lw    s0, 24(sp)
+	ldloc 5
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 35
+	ldc.i4.6
 	add
 	ldelem.i4
-	stloc.1
-// 0x0107cc34: 0x107cc34: jal   0x103542c sll   zero, zero, 0
+	stloc 7
+// 0x0107c678: 0x107c678: jr    ra addiu sp, sp, 32
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl39::roadmap_mood_to_string_103542c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 32
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 9
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 RTAlerts_Comment_Add_107c680(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local 10 is register s2
+// local 11 is register s3
+// local  0 is register sp
+// local 12 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 11
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 12
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107cc3c: 0x107cc3c: addu  a1, v0, zero
+// 0x0107c680: 0x107c680: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107c684: 0x107c684: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0107c688: 0x107c688: addiu v0, v0, -15564
 	ldloc 5
-	stloc.2
-// 0x0107cc40: 0x107cc40: addiu a0, s3, -25372
-	ldloc 10
-	ldc.i4 -25372
+	ldc.i4 -15564
 	add
-	stloc.1
-// 0x0107cc44: 0x107cc44: jal   0x109e13c addiu a2, zero, 512
-	ldc.i4 512
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x0107cc4c: 0x107cc4c: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107cc50: 0x107cc50: addiu a1, sp, 32
+// 0x0107c68c: 0x107c68c: sw    s1, 24(sp)
+	ldloc 6
 	ldloc.0
-	ldc.i4.s 32
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
 	add
-	stloc.2
-// 0x0107cc54: 0x107cc54: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107cc58: 0x107cc58: jal   0x1099350 addu  s3, v0, zero
+	ldloc 9
+	stelem.i4
+// 0x0107c690: 0x107c690: addu  v1, v0, zero
 	ldloc 5
-	stloc 10
-	ldloc.0
+	stloc 7
+// 0x0107c694: 0x107c694: addu  s1, a0, zero
+	ldloc.1
+	stloc 9
+// 0x0107c698: 0x107c698: lw    a1, 4(a0)
+	ldloc 6
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107cc60: 0x107cc60: slt   v0, s2, s4
-	ldloc 12
-	ldloc 8
-	clt
-	stloc 5
-// 0x0107cc64: 0x107cc64: beq   v0, zero, 0x107cc70 sll   zero, zero, 0
-	ldloc 5
-	brfalse L_107cc70
-// --- basic block ---
-// 0x0107cc6c: 0x107cc6c: addu  s4, s2, zero
-	ldloc 12
-	stloc 8
-L_107cc70:
-// 0x0107cc70: 0x107cc70: lw    v0, 32(sp)
-	ldloc 7
-	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.8
+	ldc.i4.1
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107cc74: 0x107cc74: lui   s7, 0x10000
-	ldc.i4 65536
-	stloc 14
-// 0x0107cc78: 0x107cc78: subu  s4, s4, v0
-	ldloc 8
+	stloc.2
+// 0x0107c69c: 0x107c69c: sw    ra, 36(sp)
+// 0x0107c6a0: 0x107c6a0: lw    a0, 2000(v0)
+	ldloc 6
 	ldloc 5
-	sub
-	stloc 8
-// 0x0107cc7c: 0x107cc7c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107cc80: 0x107cc80: subu  a2, s4, s6
-	ldloc 8
-	ldloc 15
-	sub
-	stloc.3
-// 0x0107cc84: 0x107cc84: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x0107cc88: 0x107cc88: addiu a0, a0, -25208
-	ldloc.1
-	ldc.i4 -25208
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
 	add
+	ldelem.i4
 	stloc.1
-// 0x0107cc8c: 0x107cc8c: addiu a1, s7, 18500
-	ldloc 14
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107cc90: 0x107cc90: jal   0x1093a24 sw    zero, 16(sp)
-	ldloc 7
+// 0x0107c6a4: 0x107c6a4: sw    s3, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc 11
 	stelem.i4
+// 0x0107c6a8: 0x107c6a8: sw    s2, 28(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107cc98: 0x107cc98: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107cc9c: 0x107cc9c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107cca0: 0x107cca0: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107cca4: 0x107cca4: jal   0x1098fe0 addu  s1, v0, zero
-	ldloc 5
-	stloc 11
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107ccac: 0x107ccac: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107ccb0: 0x107ccb0: addiu a3, zero, -1
-	ldc.i4.m1
-	stloc 4
-// 0x0107ccb4: 0x107ccb4: addiu a0, a0, -25188
-	ldloc.1
-	ldc.i4 -25188
-	add
-	stloc.1
-// 0x0107ccb8: 0x107ccb8: addiu a1, s7, 18500
-	ldloc 14
-	ldc.i4 18500
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc.2
-// 0x0107ccbc: 0x107ccbc: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0107ccc0: 0x107ccc0: jal   0x1093a24 sw    zero, 16(sp)
-	ldloc 7
+	ldloc 10
+	stelem.i4
+// 0x0107c6ac: 0x107c6ac: sw    s0, 20(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.5
 	add
-	ldc.i4.s 0
+	ldloc 8
 	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0107c6b0: 0x107c6b0: j	 0x107c6e0 addu  v0, zero, zero
+	ldc.i4.s 0
 	stloc 5
+	br L_107c6e0
 // --- basic block ---
-// 0x0107ccc8: 0x107ccc8: addu  a0, v0, zero
+L_107c6b8:
+// 0x0107c6b8: 0x107c6b8: lw    s0, 0(v1)
+	ldloc 6
+	ldloc 7
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 8
+// 0x0107c6bc: 0x107c6bc: addiu v0, v0, 1
 	ldloc 5
-	stloc.1
-// 0x0107cccc: 0x107cccc: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107ccd0: 0x107ccd0: addu  a2, zero, zero
-	ldc.i4.s 0
+	ldc.i4.1
+	add
+	stloc 5
+// 0x0107c6c0: 0x107c6c0: lw    a2, 0(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldelem.i4
 	stloc.3
-// 0x0107ccd4: 0x107ccd4: jal   0x1098fe0 addu  s2, v0, zero
-	ldloc 5
-	stloc 12
-	ldloc.1
-	ldloc.2
+// 0x0107c6c4: 0x107c6c4: sll   zero, zero, 0
+// 0x0107c6c8: 0x107c6c8: bne   a2, a1, 0x107c6e0 addiu v1, v1, 4
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldloc.2
+	ldloc 7
+	ldc.i4.4
+	add
+	stloc 7
+	bne.un L_107c6e0
 // --- basic block ---
-// 0x0107ccdc: 0x107ccdc: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107cce0: 0x107cce0: jal   0x101cd60 addiu a0, a0, -25172
-	ldloc.1
-	ldc.i4 -25172
+// 0x0107c6d0: 0x107c6d0: lw    v1, 0(s1)
+	ldloc 6
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x0107c6d4: 0x107c6d4: lw    v0, 1300(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 325
 	add
-	stloc.1
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldelem.i4
 	stloc 5
+// 0x0107c6d8: 0x107c6d8: j	 0x107c70c sll   zero, zero, 0
+	br L_107c70c
 // --- basic block ---
-// 0x0107cce8: 0x107cce8: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107ccec: 0x107ccec: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x0107ccf0: 0x107ccf0: addu  a1, v0, zero
+L_107c6e0:
+// 0x0107c6e0: 0x107c6e0: slt   a2, v0, a0
 	ldloc 5
-	stloc.2
-// 0x0107ccf4: 0x107ccf4: addiu a0, a0, -25160
 	ldloc.1
-	ldc.i4 -25160
-	add
-	stloc.1
-// 0x0107ccf8: 0x107ccf8: jal   0x1098d10 addiu a2, zero, 18
-	ldc.i4.s 18
+	clt
 	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
+// 0x0107c6e4: 0x107c6e4: bne   a2, zero, 0x107c6b8 sll   zero, zero, 0
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	brtrue L_107c6b8
 // --- basic block ---
-// 0x0107cd00: 0x107cd00: lui   a1, 0x0
+// 0x0107c6ec: 0x107c6ec: j	 0x107c848 addu  v0, zero, zero
 	ldc.i4.s 0
-	stloc.2
-// 0x0107cd04: 0x107cd04: addu  a0, v0, zero
+	stloc 5
+	br L_107c848
+// --- basic block ---
+L_107c6f4:
+// 0x0107c6f4: 0x107c6f4: lw    a0, 8(v0)
+	ldloc 6
 	ldloc 5
-	stloc.1
-// 0x0107cd08: 0x107cd08: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107cd0c: 0x107cd0c: addiu a1, a1, 23008
-	ldloc.2
-	ldc.i4 23008
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
 	add
-	stloc.2
-// 0x0107cd10: 0x107cd10: jal   0x1098fe0 sw    v0, 1680(sp)
+	ldelem.i4
+	stloc.1
+// 0x0107c6f8: 0x107c6f8: sll   zero, zero, 0
+// 0x0107c6fc: 0x107c6fc: beq   a0, v1, 0x107c844 sll   zero, zero, 0
+	ldloc.1
 	ldloc 7
-	ldloc.0
+	beq  L_107c844
+// --- basic block ---
+// 0x0107c704: 0x107c704: lw    v0, 0(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
-	add
+	ldelem.i4
+	stloc 5
+// 0x0107c708: 0x107c708: sll   zero, zero, 0
+L_107c70c:
+// 0x0107c70c: 0x107c70c: bne   v0, zero, 0x107c6f4 sll   zero, zero, 0
 	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	brtrue L_107c6f4
 // --- basic block ---
-// 0x0107cd18: 0x107cd18: lw    v0, 1680(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107c714: 0x107c714: j	 0x107c864 sll   zero, zero, 0
+	br L_107c864
+// --- basic block ---
+L_107c71c:
+// 0x0107c71c: 0x107c71c: lw    v0, 1276(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4 319
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107cd1c: 0x107cd1c: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107cd20: 0x107cd20: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107c720: 0x107c720: sll   zero, zero, 0
+// 0x0107c724: 0x107c724: bne   v0, zero, 0x107c734 sll   zero, zero, 0
 	ldloc 5
-	stloc.2
+	brtrue L_107c734
+// --- basic block ---
+// 0x0107c72c: 0x107c72c: jal   0x107ab94 addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl92::DeleteAlertObject_107ab94(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107cd28: 0x107cd28: addu  a0, s1, zero
-	ldloc 11
+L_107c734:
+// 0x0107c734: 0x107c734: jal   0x107c644 addiu a0, zero, 648
+	ldc.i4 648
 	stloc.1
-// 0x0107cd2c: 0x107cd2c: addiu a1, zero, 5
-	ldc.i4.5
-	stloc.2
-// 0x0107cd30: 0x107cd30: jal   0x109434c addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::T_411_107c644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107cd38: 0x107cd38: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107cd3c: 0x107cd3c: addiu a3, zero, 8
+// 0x0107c73c: 0x107c73c: addu  s2, v0, zero
+	ldloc 5
+	stloc 10
+// 0x0107c740: 0x107c740: addiu a0, v0, 8
+	ldloc 5
 	ldc.i4.8
-	stloc 4
-// 0x0107cd40: 0x107cd40: addiu a0, a0, -25352
-	ldloc.1
-	ldc.i4 -25352
 	add
 	stloc.1
-// 0x0107cd44: 0x107cd44: addiu a1, s0, 32
+// 0x0107c744: 0x107c744: addu  a1, s1, zero
 	ldloc 9
-	ldc.i4.s 32
-	add
 	stloc.2
-// 0x0107cd48: 0x107cd48: jal   0x1098d10 addiu a2, zero, 18
-	ldc.i4.s 18
+// 0x0107c748: 0x107c748: jal   0x1001800 addiu a2, zero, 640
+	ldc.i4 640
 	stloc.3
-	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl1::memcpy_1001800(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107cd50: 0x107cd50: lui   s5, 0x0
+// 0x0107c750: 0x107c750: sw    zero, 4(s2)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
 	ldc.i4.s 0
-	stloc 13
-// 0x0107cd54: 0x107cd54: addu  a0, v0, zero
+	stelem.i4
+// 0x0107c754: 0x107c754: sw    zero, 0(s2)
+	ldloc 6
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107c758: 0x107c758: lw    v0, 1300(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 325
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107c75c: 0x107c75c: sll   zero, zero, 0
+// 0x0107c760: 0x107c760: beq   v0, zero, 0x107c7a0 addu  s3, zero, zero
 	ldloc 5
-	stloc.1
-// 0x0107cd58: 0x107cd58: addu  a2, zero, zero
 	ldc.i4.s 0
-	stloc.3
-// 0x0107cd5c: 0x107cd5c: addiu a1, s5, 23000
-	ldloc 13
-	ldc.i4 23000
+	stloc 11
+	brfalse L_107c7a0
+// --- basic block ---
+L_107c768:
+// 0x0107c768: 0x107c768: lw    v1, 528(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 132
 	add
-	stloc.2
-// 0x0107cd60: 0x107cd60: jal   0x1098fe0 sw    v0, 1680(sp)
+	ldelem.i4
+	stloc 7
+// 0x0107c76c: 0x107c76c: sll   zero, zero, 0
+// 0x0107c770: 0x107c770: beq   v1, zero, 0x107c77c sll   zero, zero, 0
 	ldloc 7
-	ldloc.0
+	brfalse L_107c77c
+// --- basic block ---
+// 0x0107c778: 0x107c778: addiu s3, zero, 1
+	ldc.i4.1
+	stloc 11
+L_107c77c:
+// 0x0107c77c: 0x107c77c: lw    v1, 0(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x0107c780: 0x107c780: sll   zero, zero, 0
+// 0x0107c784: 0x107c784: bne   v1, zero, 0x107c798 sll   zero, zero, 0
+	ldloc 7
+	brtrue L_107c798
+// --- basic block ---
+// 0x0107c78c: 0x107c78c: sw    v0, 4(s2)
+	ldloc 6
+	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.1
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+// 0x0107c790: 0x107c790: j	 0x107c7a4 sw    s2, 0(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldloc 10
+	stelem.i4
+	br L_107c7a4
 // --- basic block ---
-// 0x0107cd68: 0x107cd68: lw    v0, 1680(sp)
+L_107c798:
+// 0x0107c798: 0x107c798: j	 0x107c768 addu  v0, v1, zero
 	ldloc 7
-	ldloc.0
+	stloc 5
+	br L_107c768
+// --- basic block ---
+L_107c7a0:
+// 0x0107c7a0: 0x107c7a0: sw    s2, 1300(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 325
+	add
+	ldloc 10
+	stelem.i4
+L_107c7a4:
+// 0x0107c7a4: 0x107c7a4: lw    v0, 1276(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4 319
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107cd6c: 0x107cd6c: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107cd70: 0x107cd70: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107c7a8: 0x107c7a8: sll   zero, zero, 0
+// 0x0107c7ac: 0x107c7ac: addiu v1, v0, 1
 	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107cd78: 0x107cd78: lb    v0, 1520(s0)
-	ldloc 9
-	ldc.i4 1520
+	ldc.i4.1
 	add
-	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
-	stloc 5
-// 0x0107cd7c: 0x107cd7c: sll   zero, zero, 0
-// 0x0107cd80: 0x107cd80: beq   v0, zero, 0x107cde4 lui   s4, 0x20000
+	stloc 7
+// 0x0107c7b0: 0x107c7b0: bne   v0, zero, 0x107c7e4 sw    v1, 1276(s0)
 	ldloc 5
-	ldc.i4 131072
-	stloc 8
-	brfalse L_107cde4
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 319
+	add
+	ldloc 7
+	stelem.i4
+	brtrue L_107c7e4
 // --- basic block ---
-// 0x0107cd88: 0x107cd88: addiu s7, sp, 52
-	ldloc.0
-	ldc.i4.s 52
+// 0x0107c7b8: 0x107c7b8: lw    a0, 4(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
 	add
-	stloc 14
-// 0x0107cd8c: 0x107cd8c: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107cd90: 0x107cd90: addu  a0, s7, zero
-	ldloc 14
+	ldelem.i4
 	stloc.1
-// 0x0107cd94: 0x107cd94: addiu a3, s0, 1520
-	ldloc 9
-	ldc.i4 1520
-	add
-	stloc 4
-// 0x0107cd98: 0x107cd98: addiu a2, a2, 14640
-	ldloc.3
-	ldc.i4 14640
-	add
-	stloc.3
-// 0x0107cd9c: 0x107cd9c: jal   0x1000f9c addiu a1, zero, 110
-	ldc.i4.s 110
-	stloc.2
+// 0x0107c7bc: 0x107c7bc: jal   0x10a739c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107cda4: 0x107cda4: addu  a1, s7, zero
-	ldloc 14
-	stloc.2
-// 0x0107cda8: 0x107cda8: addiu a0, s4, -25336
+// 0x0107c7c4: 0x107c7c4: beq   v0, zero, 0x107c7e4 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107c7e4
+// --- basic block ---
+// 0x0107c7cc: 0x107c7cc: lw    v0, 1836(s0)
+	ldloc 6
 	ldloc 8
-	ldc.i4 -25336
+	ldc.i4.2
+	shr.un
+	ldc.i4 459
 	add
+	ldelem.i4
+	stloc 5
+// 0x0107c7d0: 0x107c7d0: sll   zero, zero, 0
+// 0x0107c7d4: 0x107c7d4: bne   v0, zero, 0x107c7e4 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_107c7e4
+// --- basic block ---
+// 0x0107c7dc: 0x107c7dc: jal   0x107b198 addu  a0, s0, zero
+	ldloc 8
 	stloc.1
-// 0x0107cdac: 0x107cdac: addiu a3, zero, 8
-	ldc.i4.8
-	stloc 4
-// 0x0107cdb0: 0x107cdb0: jal   0x1098d10 addiu a2, zero, 18
-	ldc.i4.s 18
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::CreateAlertObject_107b198(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107cdb8: 0x107cdb8: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107cdbc: 0x107cdbc: addiu a1, s5, 23000
-	ldloc 13
-	ldc.i4 23000
-	add
-	stloc.2
-// 0x0107cdc0: 0x107cdc0: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107cdc4: 0x107cdc4: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
-	ldloc.0
+L_107c7e4:
+// 0x0107c7e4: 0x107c7e4: lw    v0, 524(s1)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4 131
 	add
+	ldelem.i4
+	stloc 5
+// 0x0107c7e8: 0x107c7e8: sll   zero, zero, 0
+// 0x0107c7ec: 0x107c7ec: beq   v0, zero, 0x107c848 addiu v0, zero, 1
 	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldc.i4.1
+	stloc 5
+	brfalse L_107c848
 // --- basic block ---
-// 0x0107cdcc: 0x107cdcc: lw    v0, 1680(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107c7f4: 0x107c7f4: lw    v0, 520(s1)
+	ldloc 6
+	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4 130
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107cdd0: 0x107cdd0: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107cdd4: 0x107cdd4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107c7f8: 0x107c7f8: sll   zero, zero, 0
+// 0x0107c7fc: 0x107c7fc: bne   v0, zero, 0x107c848 addiu v0, zero, 1
 	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldc.i4.1
 	stloc 5
+	brtrue L_107c848
 // --- basic block ---
-// 0x0107cddc: 0x107cddc: j	 0x107ce24 lui   s4, 0x10000
-	ldc.i4 65536
-	stloc 8
-	br L_107ce24
+// 0x0107c804: 0x107c804: bne   s3, zero, 0x107c820 addiu v1, zero, 3
+	ldloc 11
+	ldc.i4.3
+	stloc 7
+	brtrue L_107c820
 // --- basic block ---
-L_107cde4:
-// 0x0107cde4: 0x107cde4: addiu a0, s4, -25336
+// 0x0107c80c: 0x107c80c: lw    v0, 1280(s0)
+	ldloc 6
 	ldloc 8
-	ldc.i4 -25336
-	add
-	stloc.1
-// 0x0107cde8: 0x107cde8: addiu a3, zero, 8
-	ldc.i4.8
-	stloc 4
-// 0x0107cdec: 0x107cdec: addiu a1, s7, 18500
-	ldloc 14
-	ldc.i4 18500
+	ldc.i4.2
+	shr.un
+	ldc.i4 320
 	add
-	stloc.2
-// 0x0107cdf0: 0x107cdf0: jal   0x1098d10 addiu a2, zero, 18
-	ldc.i4.s 18
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ldelem.i4
 	stloc 5
-// --- basic block ---
-// 0x0107cdf8: 0x107cdf8: addu  s4, v0, zero
-	ldloc 5
-	stloc 8
-// 0x0107cdfc: 0x107cdfc: addu  a0, v0, zero
+// 0x0107c810: 0x107c810: sll   zero, zero, 0
+// 0x0107c814: 0x107c814: beq   v0, zero, 0x107c83c addiu v1, zero, 2
 	ldloc 5
-	stloc.1
-// 0x0107ce00: 0x107ce00: addiu a1, s5, 23000
-	ldloc 13
-	ldc.i4 23000
-	add
-	stloc.2
-// 0x0107ce04: 0x107ce04: jal   0x1098fe0 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107ce0c: 0x107ce0c: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107ce10: 0x107ce10: jal   0x1098ec4 addu  a1, s4, zero
-	ldloc 8
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.2
+	stloc 7
+	brfalse L_107c83c
 // --- basic block ---
-// 0x0107ce18: 0x107ce18: jal   0x1099098 addu  a0, s4, zero
-	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+// 0x0107c81c: 0x107c81c: addiu v1, zero, 3
+	ldc.i4.3
+	stloc 7
+L_107c820:
+// 0x0107c820: 0x107c820: lui   v0, 0x0
+	ldc.i4.s 0
 	stloc 5
-// --- basic block ---
-// 0x0107ce20: 0x107ce20: lui   s4, 0x10000
-	ldc.i4 65536
-	stloc 8
-L_107ce24:
-// 0x0107ce24: 0x107ce24: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107ce28: 0x107ce28: addiu a3, zero, 5
-	ldc.i4.5
-	stloc 4
-// 0x0107ce2c: 0x107ce2c: addiu a0, a0, 1764
-	ldloc.1
-	ldc.i4 1764
-	add
+// 0x0107c824: 0x107c824: addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-// 0x0107ce30: 0x107ce30: addiu a1, s4, 18500
-	ldloc 8
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107ce34: 0x107ce34: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0107ce38: 0x107ce38: addiu v0, zero, 8
-	ldc.i4.8
-	stloc 5
-// 0x0107ce3c: 0x107ce3c: jal   0x1093a24 sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107c828: 0x107c828: addu  a1, s0, zero
+	ldloc 8
+	stloc.2
+// 0x0107c82c: 0x107c82c: jal   0x107b550 sw    v1, 15940(v0)
+	ldloc 6
+	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4 3985
 	add
-	ldloc 5
+	ldloc 7
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::RTAlerts_Comment_PopUp_107b550(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ce44: 0x107ce44: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107ce48: 0x107ce48: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107ce4c: 0x107ce4c: addu  a1, zero, zero
+// 0x0107c834: 0x107c834: j	 0x107c848 addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+	br L_107c848
+// --- basic block ---
+L_107c83c:
+// 0x0107c83c: 0x107c83c: lui   v0, 0x0
 	ldc.i4.s 0
-	stloc.2
-// 0x0107ce50: 0x107ce50: jal   0x1098fe0 sw    v0, 1680(sp)
+	stloc 5
+// 0x0107c840: 0x107c840: sw    v1, 15940(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 3985
+	add
 	ldloc 7
+	stelem.i4
+L_107c844:
+// 0x0107c844: 0x107c844: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+L_107c848:
+// 0x0107c848: 0x107c848: lw    ra, 36(sp)
+// 0x0107c84c: 0x107c84c: lw    s3, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.8
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107ce58: 0x107ce58: lw    v0, 1680(sp)
-	ldloc 7
+	ldelem.i4
+	stloc 11
+// 0x0107c850: 0x107c850: lw    s2, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.7
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107ce5c: 0x107ce5c: addu  a0, s1, zero
-	ldloc 11
-	stloc.1
-// 0x0107ce60: 0x107ce60: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 10
+// 0x0107c854: 0x107c854: lw    s1, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107c858: 0x107c858: lw    s0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107c85c: 0x107c85c: jr    ra addiu sp, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
 // --- basic block ---
-// 0x0107ce68: 0x107ce68: lb    v0, 156(s0)
+L_107c864:
+// 0x0107c864: 0x107c864: lb    v0, 117(s1)
 	ldloc 9
-	ldc.i4 156
+	ldc.i4.s 117
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107ce6c: 0x107ce6c: sll   zero, zero, 0
-// 0x0107ce70: 0x107ce70: beq   v0, zero, 0x107cfb0 lui   a0, 0x20000
+// 0x0107c868: 0x107c868: sll   zero, zero, 0
+// 0x0107c86c: 0x107c86c: bne   v0, zero, 0x107c71c addiu v0, zero, 1
 	ldloc 5
-	ldc.i4 131072
-	stloc.1
-	brfalse L_107cfb0
+	ldc.i4.1
+	stloc 5
+	brtrue L_107c71c
 // --- basic block ---
-// 0x0107ce78: 0x107ce78: jal   0x108dbb0 sb    zero, 276(sp)
-	ldloc.0
-	ldc.i4 276
-	add
+// 0x0107c874: 0x107c874: j	 0x107c848 sll   zero, zero, 0
+	br L_107c848
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 report_alert_107c87c(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 s1,int32 ra)
+
+// local  6 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  5 is register mem
+
 	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl105::RealtimePrivacyState_108dbb0(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107ce80: 0x107ce80: addiu v1, zero, 1
-	ldc.i4.1
-	stloc 6
-// 0x0107ce84: 0x107ce84: lui   s7, 0x20000
-	ldc.i4 131072
-	stloc 14
-// 0x0107ce88: 0x107ce88: bne   v0, v1, 0x107cec8 addiu s4, sp, 276
+// 0x0107c87c: 0x107c87c: addiu sp, sp, -40
+	ldloc.0
+	ldc.i4.s -40
+	add
+	stloc.0
+// 0x0107c880: 0x107c880: sw    s0, 28(sp)
 	ldloc 5
-	ldloc 6
 	ldloc.0
-	ldc.i4 276
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
 	add
-	stloc 8
-	bne.un L_107cec8
-// --- basic block ---
-// 0x0107ce90: 0x107ce90: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 8
-	stloc.1
+	stelem.i4
+// 0x0107c884: 0x107c884: addu  s0, a0, zero
 	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107ce98: 0x107ce98: addiu a0, s7, -25304
-	ldloc 14
-	ldc.i4 -25304
-	add
+	stloc 8
+// 0x0107c888: 0x107c888: addiu a0, zero, 16
+	ldc.i4.s 16
 	stloc.1
-// 0x0107ce9c: 0x107ce9c: jal   0x101cd60 addu  s5, v0, zero
+// 0x0107c88c: 0x107c88c: sw    ra, 36(sp)
+// 0x0107c890: 0x107c890: sw    s1, 32(sp)
 	ldloc 5
-	stloc 13
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107cea4: 0x107cea4: addiu a1, zero, 700
-	ldc.i4 700
-	stloc.2
-// 0x0107cea8: 0x107cea8: lui   a2, 0x10000
-	ldc.i4 65536
-	stloc.3
-// 0x0107ceac: 0x107ceac: subu  a1, a1, s5
-	ldloc.2
-	ldloc 13
-	sub
-	stloc.2
-// 0x0107ceb0: 0x107ceb0: addu  a0, s4, s5
-	ldloc 8
-	ldloc 13
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
-	stloc.1
-// 0x0107ceb4: 0x107ceb4: addiu a2, a2, 744
-	ldloc.3
-	ldc.i4 744
+	ldloc 9
+	stelem.i4
+// 0x0107c894: 0x107c894: sw    a1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.3
-// 0x0107ceb8: 0x107ceb8: jal   0x1000f9c addu  a3, v0, zero
+	ldloc.2
+	stelem.i4
+// 0x0107c898: 0x107c898: addu  s1, a2, zero
+	ldloc.3
+	stloc 9
+// 0x0107c89c: 0x107c89c: jal   0x107c644 sw    a3, 20(sp)
 	ldloc 5
-	stloc 4
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 4
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::T_411_107c644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107cec0: 0x107cec0: j	 0x107cf08 lui   a0, 0x20000
-	ldc.i4 131072
+// 0x0107c8a4: 0x107c8a4: lw    a1, 16(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107c8a8: 0x107c8a8: lw    a3, 20(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldelem.i4
+	stloc 4
+// 0x0107c8ac: 0x107c8ac: lui   v1, 0x0
+	ldc.i4.s 0
+	stloc 7
+// 0x0107c8b0: 0x107c8b0: sb    zero, 15884(v1)
+	ldloc 7
+	ldc.i4 15884
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0107c8b4: 0x107c8b4: addu  a0, zero, zero
+	ldc.i4.s 0
 	stloc.1
-	br L_107cf08
-// --- basic block ---
-L_107cec8:
-// 0x0107cec8: 0x107cec8: jal   0x1001b48 addu  a0, s4, zero
+// 0x0107c8b8: 0x107c8b8: sw    s0, 0(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
 	ldloc 8
-	stloc.1
-	ldloc.1
-	call int32 Cibyl1::strlen_1001b48(int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107ced0: 0x107ced0: addiu a0, s7, -25304
-	ldloc 14
-	ldc.i4 -25304
+	stelem.i4
+// 0x0107c8bc: 0x107c8bc: sw    a1, 8(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.2
+	add
+	ldloc.2
+	stelem.i4
+// 0x0107c8c0: 0x107c8c0: sw    s1, 4(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldloc 9
+	stelem.i4
+// 0x0107c8c4: 0x107c8c4: sw    a3, 12(v0)
+	ldloc 5
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
 	add
-	stloc.1
-// 0x0107ced4: 0x107ced4: jal   0x101cd60 addu  s5, v0, zero
+	ldloc 4
+	stelem.i4
+// 0x0107c8c8: 0x107c8c8: jal   0x10951ac sw    v0, 16(sp)
 	ldloc 5
-	stloc 13
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107cedc: 0x107cedc: jal   0x106abe0 sw    v0, 1680(sp)
-	ldloc 7
+// 0x0107c8d0: 0x107c8d0: lw    v0, 16(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.4
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc 6
+// 0x0107c8d4: 0x107c8d4: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107c8d8: 0x107c8d8: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107c8dc: 0x107c8dc: addu  a2, v0, zero
+	ldloc 6
+	stloc.3
+// 0x0107c8e0: 0x107c8e0: jal   0x10797d4 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_GetNickName_106abe0(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::on_keyboard_closed_10797d4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
 	stloc 6
-	stloc 5
 // --- basic block ---
-// 0x0107cee4: 0x107cee4: addiu a1, zero, 700
-	ldc.i4 700
-	stloc.2
-// 0x0107cee8: 0x107cee8: lui   a2, 0x20000
-	ldc.i4 131072
-	stloc.3
-// 0x0107ceec: 0x107ceec: lw    a3, 1680(sp)
-	ldloc 7
+// 0x0107c8e8: 0x107c8e8: lw    ra, 36(sp)
+// 0x0107c8ec: 0x107c8ec: lw    s1, 32(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.8
 	add
 	ldelem.i4
-	stloc 4
-// 0x0107cef0: 0x107cef0: subu  a1, a1, s5
-	ldloc.2
-	ldloc 13
-	sub
-	stloc.2
-// 0x0107cef4: 0x107cef4: addu  a0, s4, s5
-	ldloc 8
-	ldloc 13
-	add
-	stloc.1
-// 0x0107cef8: 0x107cef8: addiu a2, a2, -25300
-	ldloc.3
-	ldc.i4 -25300
-	add
-	stloc.3
-// 0x0107cefc: 0x107cefc: jal   0x1000f9c sw    v0, 16(sp)
-	ldloc 7
+	stloc 9
+// 0x0107c8f0: 0x107c8f0: lw    s0, 28(sp)
+	ldloc 5
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.7
 	add
-	ldloc 5
-	stelem.i4
+	ldelem.i4
+	stloc 8
+// 0x0107c8f4: 0x107c8f4: jr    ra addiu sp, sp, 40
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107cf04: 0x107cf04: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-L_107cf08:
-// 0x0107cf08: 0x107cf08: addu  a3, zero, zero
+	ldc.i4.s 40
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 6
+	ret
+}
+.method public static int32 add_real_time_alert_for_construction_opposite_direction_107c8fc(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
 	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-// 0x0107cf0c: 0x107cf0c: addiu a0, a0, -25292
-	ldloc.1
-	ldc.i4 -25292
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107c8fc:
+// 0x0107c8fc: 0x107c8fc: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107c900: 0x107c900: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
-	stloc.1
-// 0x0107cf10: 0x107cf10: addiu a1, sp, 276
+	stloc.2
+// 0x0107c904: 0x107c904: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4 276
+	ldc.i4.s -24
 	add
-	stloc.2
-// 0x0107cf14: 0x107cf14: jal   0x1098d10 addiu a2, zero, 18
-	ldc.i4.s 18
+	stloc.0
+// 0x0107c908: 0x107c908: addiu a0, zero, 7
+	ldc.i4.7
+	stloc.1
+// 0x0107c90c: 0x107c90c: addiu a2, zero, 2
+	ldc.i4.2
 	stloc.3
+// 0x0107c910: 0x107c910: sw    ra, 20(sp)
+// 0x0107c914: 0x107c914: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107cf1c: 0x107cf1c: lui   s4, 0x0
+// 0x0107c91c: 0x107c91c: lw    ra, 20(sp)
+// 0x0107c920: 0x107c920: sll   zero, zero, 0
+// 0x0107c924: 0x107c924: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_other_opposite_direction_107c92c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
 	ldc.i4.s 0
 	stloc 8
-// 0x0107cf20: 0x107cf20: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107cf24: 0x107cf24: addu  a2, zero, zero
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
-	stloc.3
-// 0x0107cf28: 0x107cf28: addiu a1, s4, 23008
-	ldloc 8
-	ldc.i4 23008
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107c92c:
+// 0x0107c92c: 0x107c92c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107c930: 0x107c930: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107cf2c: 0x107cf2c: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
+// 0x0107c934: 0x107c934: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
+	stloc.0
+// 0x0107c938: 0x107c938: addiu a0, zero, 6
+	ldc.i4.6
+	stloc.1
+// 0x0107c93c: 0x107c93c: addiu a2, zero, 2
+	ldc.i4.2
+	stloc.3
+// 0x0107c940: 0x107c940: sw    ra, 20(sp)
+// 0x0107c944: 0x107c944: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
+	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	ldloc 4
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107cf34: 0x107cf34: lw    v0, 1680(sp)
-	ldloc 7
+// 0x0107c94c: 0x107c94c: lw    ra, 20(sp)
+// 0x0107c950: 0x107c950: sll   zero, zero, 0
+// 0x0107c954: 0x107c954: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
+	ldc.i4.s 24
 	add
-	ldelem.i4
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_hazard_opposite_direction_107c98c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
-// 0x0107cf38: 0x107cf38: addu  a0, s2, zero
-	ldloc 12
-	stloc.1
-// 0x0107cf3c: 0x107cf3c: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107cf44: 0x107cf44: lui   a1, 0x10000
-	ldc.i4 65536
-	stloc.2
-// 0x0107cf48: 0x107cf48: lui   a0, 0x10000
+L_107c98c:
+// 0x0107c98c: 0x107c98c: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc.1
-// 0x0107cf4c: 0x107cf4c: addiu a3, zero, 5
-	ldc.i4.5
-	stloc 4
-// 0x0107cf50: 0x107cf50: addiu a1, a1, 18500
+	stloc.2
+// 0x0107c990: 0x107c990: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107cf54: 0x107cf54: addiu a0, a0, 1764
-	ldloc.1
-	ldc.i4 1764
+// 0x0107c994: 0x107c994: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x0107c998: 0x107c998: addiu a0, zero, 5
+	ldc.i4.5
 	stloc.1
-// 0x0107cf58: 0x107cf58: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0107cf5c: 0x107cf5c: addiu v0, zero, 8
-	ldc.i4.8
-	stloc 5
-// 0x0107cf60: 0x107cf60: jal   0x1093a24 sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107c99c: 0x107c99c: addiu a2, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
+	stloc.3
+// 0x0107c9a0: 0x107c9a0: sw    ra, 20(sp)
+// 0x0107c9a4: 0x107c9a4: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107cf68: 0x107cf68: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107cf6c: 0x107cf6c: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107cf70: 0x107cf70: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107cf74: 0x107cf74: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
+// 0x0107c9ac: 0x107c9ac: lw    ra, 20(sp)
+// 0x0107c9b0: 0x107c9b0: sll   zero, zero, 0
+// 0x0107c9b4: 0x107c9b4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
+	ldc.i4.s 24
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107cf7c: 0x107cf7c: lw    v0, 1680(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
-	add
-	ldelem.i4
+	ret
+}
+.method public static int32 add_real_time_alert_for_traffic_jam_opposite_direction_107c9bc(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
-// 0x0107cf80: 0x107cf80: addu  a0, s2, zero
-	ldloc 12
-	stloc.1
-// 0x0107cf84: 0x107cf84: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107cf8c: 0x107cf8c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107cf90: 0x107cf90: addiu a0, a0, -25320
-	ldloc.1
-	ldc.i4 -25320
-	add
-	stloc.1
-// 0x0107cf94: 0x107cf94: addiu a1, s0, 156
-	ldloc 9
-	ldc.i4 156
-	add
+L_107c9bc:
+// 0x0107c9bc: 0x107c9bc: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0107cf98: 0x107cf98: addiu a3, zero, 8
-	ldc.i4.8
-	stloc 4
-// 0x0107cf9c: 0x107cf9c: jal   0x1098d10 addiu a2, zero, 18
-	ldc.i4.s 18
-	stloc.3
-	ldloc.0
-	ldloc.1
+// 0x0107c9c0: 0x107c9c0: addiu a1, a1, 18768
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107cfa4: 0x107cfa4: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107cfa8: 0x107cfa8: j	 0x107d010 addiu a1, s4, 23008
-	ldloc 8
-	ldc.i4 23008
+	ldc.i4 18768
 	add
 	stloc.2
-	br L_107d010
-// --- basic block ---
-L_107cfb0:
-// 0x0107cfb0: 0x107cfb0: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x0107cfb4: 0x107cfb4: addiu a0, a0, -25292
-	ldloc.1
-	ldc.i4 -25292
+// 0x0107c9c4: 0x107c9c4: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x0107c9c8: 0x107c9c8: addiu a0, zero, 3
+	ldc.i4.3
 	stloc.1
-// 0x0107cfb8: 0x107cfb8: addiu a1, s4, 18500
-	ldloc 8
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107cfbc: 0x107cfbc: jal   0x1098d10 addiu a2, zero, 18
-	ldc.i4.s 18
+// 0x0107c9cc: 0x107c9cc: addiu a2, zero, 2
+	ldc.i4.2
 	stloc.3
+// 0x0107c9d0: 0x107c9d0: sw    ra, 20(sp)
+// 0x0107c9d4: 0x107c9d4: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107cfc4: 0x107cfc4: lui   a1, 0x0
+// 0x0107c9dc: 0x107c9dc: lw    ra, 20(sp)
+// 0x0107c9e0: 0x107c9e0: sll   zero, zero, 0
+// 0x0107c9e4: 0x107c9e4: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_accident_opposite_direction_107c9ec(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc.2
-// 0x0107cfc8: 0x107cfc8: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107cfcc: 0x107cfcc: addu  a2, zero, zero
+	stloc 7
 	ldc.i4.s 0
-	stloc.3
-// 0x0107cfd0: 0x107cfd0: addiu a1, a1, 23008
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107c9ec:
+// 0x0107c9ec: 0x107c9ec: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107c9f0: 0x107c9f0: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 23008
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107cfd4: 0x107cfd4: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
+// 0x0107c9f4: 0x107c9f4: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107cfdc: 0x107cfdc: lw    v0, 1680(sp)
-	ldloc 7
-	ldloc.0
+	stloc.0
+// 0x0107c9f8: 0x107c9f8: addiu a0, zero, 2
 	ldc.i4.2
-	shr.un
-	ldc.i4 420
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107cfe0: 0x107cfe0: addu  a0, s2, zero
-	ldloc 12
 	stloc.1
-// 0x0107cfe4: 0x107cfe4: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
+// 0x0107c9fc: 0x107c9fc: addiu a2, zero, 2
+	ldc.i4.2
+	stloc.3
+// 0x0107ca00: 0x107ca00: sw    ra, 20(sp)
+// 0x0107ca04: 0x107ca04: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107cfec: 0x107cfec: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107cff0: 0x107cff0: addiu a1, s4, 18500
-	ldloc 8
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107cff4: 0x107cff4: addiu a0, a0, -25320
-	ldloc.1
-	ldc.i4 -25320
+// 0x0107ca0c: 0x107ca0c: lw    ra, 20(sp)
+// 0x0107ca10: 0x107ca10: sll   zero, zero, 0
+// 0x0107ca14: 0x107ca14: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc.1
-// 0x0107cff8: 0x107cff8: addu  a3, zero, zero
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_police_opposite_direction_107ca1c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
 	ldc.i4.s 0
-	stloc 4
-// 0x0107cffc: 0x107cffc: jal   0x1098d10 addiu a2, zero, 20
-	ldc.i4.s 20
-	stloc.3
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d004: 0x107d004: lui   a1, 0x0
-	ldc.i4.s 0
+L_107ca1c:
+// 0x0107ca1c: 0x107ca1c: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0107d008: 0x107d008: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107d00c: 0x107d00c: addiu a1, a1, 23000
+// 0x0107ca20: 0x107ca20: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 23000
+	ldc.i4 18768
 	add
 	stloc.2
-L_107d010:
-// 0x0107d010: 0x107d010: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107d014: 0x107d014: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107d01c: 0x107d01c: lw    v0, 1680(sp)
-	ldloc 7
+// 0x0107ca24: 0x107ca24: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
+	ldc.i4.s -24
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107d020: 0x107d020: addu  a0, s2, zero
-	ldloc 12
+	stloc.0
+// 0x0107ca28: 0x107ca28: addiu a0, zero, 1
+	ldc.i4.1
 	stloc.1
-// 0x0107d024: 0x107d024: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
+// 0x0107ca2c: 0x107ca2c: addiu a2, zero, 2
+	ldc.i4.2
+	stloc.3
+// 0x0107ca30: 0x107ca30: sw    ra, 20(sp)
+// 0x0107ca34: 0x107ca34: jal   0x107c87c addu  a3, a1, zero
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d02c: 0x107d02c: addu  a1, s2, zero
-	ldloc 12
-	stloc.2
-// 0x0107d030: 0x107d030: jal   0x1098ec4 addu  a0, s1, zero
-	ldloc 11
-	stloc.1
+	stloc 4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107d038: 0x107d038: sb    zero, 276(sp)
+// 0x0107ca3c: 0x107ca3c: lw    ra, 20(sp)
+// 0x0107ca40: 0x107ca40: sll   zero, zero, 0
+// 0x0107ca44: 0x107ca44: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4 276
+	ldc.i4.s 24
 	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107d03c: 0x107d03c: lw    t0, 0(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc 17
-// 0x0107d040: 0x107d040: lui   v1, 0x80000
-	ldc.i4 524288
-	stloc 6
-// 0x0107d044: 0x107d044: sw    t0, -14004(v1)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3501
-	add
-	ldloc 17
-	stelem.i4
-// 0x0107d048: 0x107d048: lui   s2, 0x10000
-	ldc.i4 65536
-	stloc 12
-// 0x0107d04c: 0x107d04c: addiu v0, zero, -1
-	ldc.i4.m1
+	ret
+}
+.method public static int32 add_real_time_alert_for_construction_my_direction_107ca4c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
-// 0x0107d050: 0x107d050: lui   v1, 0x80000
-	ldc.i4 524288
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-// 0x0107d054: 0x107d054: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107d058: 0x107d058: sw    v0, -14000(v1)
-	ldloc 7
-	ldloc 6
-	ldc.i4.2
-	shr.un
-	ldc.i4 -3500
+__CIBYL_javamethod_begin:
+// --- basic block ---
+L_107ca4c:
+// 0x0107ca4c: 0x107ca4c: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107ca50: 0x107ca50: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107d05c: 0x107d05c: addiu a0, a0, -26732
-	ldloc.1
-	ldc.i4 -26732
+	stloc.2
+// 0x0107ca54: 0x107ca54: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x0107ca58: 0x107ca58: addiu a0, zero, 7
+	ldc.i4.7
 	stloc.1
-// 0x0107d060: 0x107d060: addiu a1, s2, 18500
-	ldloc 12
-	ldc.i4 18500
-	add
-	stloc.2
-// 0x0107d064: 0x107d064: addu  a2, zero, zero
-	ldc.i4.s 0
+// 0x0107ca5c: 0x107ca5c: addiu a2, zero, 1
+	ldc.i4.1
 	stloc.3
-// 0x0107d068: 0x107d068: addiu a3, zero, -2
-	ldc.i4.s -2
+// 0x0107ca60: 0x107ca60: sw    ra, 20(sp)
+// 0x0107ca64: 0x107ca64: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
 	stloc 4
-// 0x0107d06c: 0x107d06c: sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107d070: 0x107d070: lui   v0, 0x12000000
-	ldc.i4 301989888
-	stloc 5
-// 0x0107d074: 0x107d074: sw    v0, 24(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.6
-	add
-	ldloc 5
-	stelem.i4
-// 0x0107d078: 0x107d078: jal   0x109e4f0 sw    zero, 20(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.5
-	add
-	ldc.i4.s 0
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d080: 0x107d080: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107d084: 0x107d084: addiu v1, zero, 15
-	ldc.i4.s 15
-	stloc 6
-// 0x0107d088: 0x107d088: lui   s4, 0x80000
-	ldc.i4 524288
 	stloc 8
-// 0x0107d08c: 0x107d08c: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107d090: 0x107d090: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107d094: 0x107d094: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x0107d098: 0x107d098: sw    v1, 16(sp)
-	ldloc 7
+	stloc 7
+// --- basic block ---
+// 0x0107ca6c: 0x107ca6c: lw    ra, 20(sp)
+// 0x0107ca70: 0x107ca70: sll   zero, zero, 0
+// 0x0107ca74: 0x107ca74: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s 24
 	add
-	ldloc 6
-	stelem.i4
-// 0x0107d09c: 0x107d09c: jal   0x10991d0 sw    v0, -16080(s4)
-	ldloc 7
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4020
-	add
-	ldloc 5
-	stelem.i4
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_10991d0(int32,int32,int32,int32,int32)
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_other_my_direction_107ca7c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d0a4: 0x107d0a4: lui   a0, 0x10000
+L_107ca7c:
+// 0x0107ca7c: 0x107ca7c: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc.1
-// 0x0107d0a8: 0x107d0a8: addiu a3, zero, 5
-	ldc.i4.5
-	stloc 4
-// 0x0107d0ac: 0x107d0ac: addiu a0, a0, 1764
-	ldloc.1
-	ldc.i4 1764
-	add
-	stloc.1
-// 0x0107d0b0: 0x107d0b0: addiu a1, s2, 18500
-	ldloc 12
-	ldc.i4 18500
-	add
 	stloc.2
-// 0x0107d0b4: 0x107d0b4: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0107d0b8: 0x107d0b8: addiu v0, zero, 8
-	ldc.i4.8
-	stloc 5
-// 0x0107d0bc: 0x107d0bc: jal   0x1093a24 sw    v0, 16(sp)
-	ldloc 7
+// 0x0107ca80: 0x107ca80: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107ca84: 0x107ca84: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
+	stloc.0
+// 0x0107ca88: 0x107ca88: addiu a0, zero, 6
+	ldc.i4.6
+	stloc.1
+// 0x0107ca8c: 0x107ca8c: addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+// 0x0107ca90: 0x107ca90: sw    ra, 20(sp)
+// 0x0107ca94: 0x107ca94: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107d0c4: 0x107d0c4: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107d0c8: 0x107d0c8: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107d0cc: 0x107d0cc: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107d0d0: 0x107d0d0: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
+// 0x0107ca9c: 0x107ca9c: lw    ra, 20(sp)
+// 0x0107caa0: 0x107caa0: sll   zero, zero, 0
+// 0x0107caa4: 0x107caa4: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
+	ldc.i4.s 24
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107d0d8: 0x107d0d8: lw    v0, 1680(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
-	add
-	ldelem.i4
+	ret
+}
+.method public static int32 add_real_time_alert_for_hazard_my_direction_107cadc(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
-// 0x0107d0dc: 0x107d0dc: lw    a0, -16080(s4)
-	ldloc 7
-	ldloc 8
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4020
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107d0e0: 0x107d0e0: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d0e8: 0x107d0e8: lui   a0, 0x10000
+L_107cadc:
+// 0x0107cadc: 0x107cadc: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc.1
-// 0x0107d0ec: 0x107d0ec: addiu a1, s2, 18500
-	ldloc 12
-	ldc.i4 18500
+	stloc.2
+// 0x0107cae0: 0x107cae0: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107d0f0: 0x107d0f0: addiu a0, a0, 9040
-	ldloc.1
-	ldc.i4 9040
+// 0x0107cae4: 0x107cae4: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x0107cae8: 0x107cae8: addiu a0, zero, 5
+	ldc.i4.5
 	stloc.1
-// 0x0107d0f4: 0x107d0f4: addu  a2, s6, zero
-	ldloc 15
+// 0x0107caec: 0x107caec: addiu a2, zero, 1
+	ldc.i4.1
 	stloc.3
-// 0x0107d0f8: 0x107d0f8: addiu a3, zero, -1
-	ldc.i4.m1
+// 0x0107caf0: 0x107caf0: sw    ra, 20(sp)
+// 0x0107caf4: 0x107caf4: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
 	stloc 4
-// 0x0107d0fc: 0x107d0fc: addiu v0, zero, 2
-	ldc.i4.2
-	stloc 5
-// 0x0107d100: 0x107d100: jal   0x1093a24 sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
-	add
-	ldloc 5
-	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107d108: 0x107d108: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107d10c: 0x107d10c: addu  a1, zero, zero
+// 0x0107cafc: 0x107cafc: lw    ra, 20(sp)
+// 0x0107cb00: 0x107cb00: sll   zero, zero, 0
+// 0x0107cb04: 0x107cb04: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_traffic_jam_my_direction_107cb0c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
 	ldc.i4.s 0
-	stloc.2
-// 0x0107d110: 0x107d110: addu  a2, zero, zero
+	stloc 7
 	ldc.i4.s 0
-	stloc.3
-// 0x0107d114: 0x107d114: jal   0x1098fe0 addu  s4, v0, zero
-	ldloc 5
 	stloc 8
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107d11c: 0x107d11c: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
-	stloc 5
-// --- basic block ---
-// 0x0107d124: 0x107d124: beq   v0, zero, 0x107d134 addiu a3, zero, 77
-	ldloc 5
-	ldc.i4.s 77
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
 	stloc 4
-	brfalse L_107d134
-// --- basic block ---
-// 0x0107d12c: 0x107d12c: j	 0x107d13c addiu a2, zero, 77
-	ldc.i4.s 77
-	stloc.3
-	br L_107d13c
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-L_107d134:
-// 0x0107d134: 0x107d134: addiu a3, zero, 52
-	ldc.i4.s 52
-	stloc 4
-// 0x0107d138: 0x107d138: addiu a2, zero, 52
-	ldc.i4.s 52
-	stloc.3
-L_107d13c:
-// 0x0107d13c: 0x107d13c: lui   s7, 0x10000
+L_107cb0c:
+// 0x0107cb0c: 0x107cb0c: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc 14
-// 0x0107d140: 0x107d140: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107d144: 0x107d144: addiu a0, a0, -25252
-	ldloc.1
-	ldc.i4 -25252
-	add
-	stloc.1
-// 0x0107d148: 0x107d148: addiu a1, s7, 18500
-	ldloc 14
-	ldc.i4 18500
+	stloc.2
+// 0x0107cb10: 0x107cb10: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107d14c: 0x107d14c: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107d150: 0x107d150: jal   0x1093a24 sw    v0, 16(sp)
-	ldloc 7
+// 0x0107cb14: 0x107cb14: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s -24
 	add
-	ldloc 5
-	stelem.i4
+	stloc.0
+// 0x0107cb18: 0x107cb18: addiu a0, zero, 3
+	ldc.i4.3
+	stloc.1
+// 0x0107cb1c: 0x107cb1c: addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+// 0x0107cb20: 0x107cb20: sw    ra, 20(sp)
+// 0x0107cb24: 0x107cb24: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107d158: 0x107d158: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0107d15c: 0x107d15c: addiu a1, a1, 23008
-	ldloc.2
-	ldc.i4 23008
+// 0x0107cb2c: 0x107cb2c: lw    ra, 20(sp)
+// 0x0107cb30: 0x107cb30: sll   zero, zero, 0
+// 0x0107cb34: 0x107cb34: jr    ra addiu sp, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc.2
-// 0x0107d160: 0x107d160: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107d164: 0x107d164: addu  a2, a1, zero
-	ldloc.2
-	stloc.3
-// 0x0107d168: 0x107d168: jal   0x1098fe0 addu  s2, v0, zero
-	ldloc 5
-	stloc 12
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_accident_my_direction_107cb3c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d170: 0x107d170: lui   a1, 0x20000
-	ldc.i4 131072
+L_107cb3c:
+// 0x0107cb3c: 0x107cb3c: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0107d174: 0x107d174: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107d178: 0x107d178: addiu a1, a1, -25232
+// 0x0107cb40: 0x107cb40: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 -25232
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107d17c: 0x107d17c: addiu a0, a0, -25268
-	ldloc.1
-	ldc.i4 -25268
+// 0x0107cb44: 0x107cb44: addiu sp, sp, -24
+	ldloc.0
+	ldc.i4.s -24
 	add
+	stloc.0
+// 0x0107cb48: 0x107cb48: addiu a0, zero, 2
+	ldc.i4.2
 	stloc.1
-// 0x0107d180: 0x107d180: jal   0x109e13c addiu a2, zero, 1
+// 0x0107cb4c: 0x107cb4c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-	ldloc.0
-	ldloc.1
+// 0x0107cb50: 0x107cb50: sw    ra, 20(sp)
+// 0x0107cb54: 0x107cb54: jal   0x107c87c addu  a3, a1, zero
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d188: 0x107d188: addu  s5, v0, zero
-	ldloc 5
-	stloc 13
-// 0x0107d18c: 0x107d18c: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107d190: 0x107d190: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107d194: 0x107d194: jal   0x1098f84 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d19c: 0x107d19c: addu  a0, s2, zero
-	ldloc 12
-	stloc.1
-// 0x0107d1a0: 0x107d1a0: jal   0x1098ec4 addu  a1, s5, zero
-	ldloc 13
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107d1a8: 0x107d1a8: addiu a2, zero, 12
-	ldc.i4.s 12
-	stloc.3
-// 0x0107d1ac: 0x107d1ac: addu  a0, s3, zero
-	ldloc 10
-	stloc.1
-// 0x0107d1b0: 0x107d1b0: jal   0x1098f84 addiu a1, zero, -20
-	ldc.i4.s -20
-	stloc.2
+// 0x0107cb5c: 0x107cb5c: lw    ra, 20(sp)
+// 0x0107cb60: 0x107cb60: sll   zero, zero, 0
+// 0x0107cb64: 0x107cb64: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d1b8: 0x107d1b8: addu  a0, s4, zero
+	ldc.i4.s 24
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
 	ldloc 8
-	stloc.1
-// 0x0107d1bc: 0x107d1bc: jal   0x1098ec4 addu  a1, s2, zero
-	ldloc 12
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 7
+	ret
+}
+.method public static int32 add_real_time_alert_for_police_my_direction_107cb6c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
+
+// local  7 is register v0
+// local  8 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  0 is register sp
+// local  5 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
+	stloc 7
+	ldc.i4.s 0
+	stloc 8
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
 	stloc 5
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d1c4: 0x107d1c4: lui   a0, 0x10000
+L_107cb6c:
+// 0x0107cb6c: 0x107cb6c: lui   a1, 0x10000
 	ldc.i4 65536
-	stloc.1
-// 0x0107d1c8: 0x107d1c8: addiu a3, zero, 7
-	ldc.i4.7
-	stloc 4
-// 0x0107d1cc: 0x107d1cc: addiu a1, s7, 18500
-	ldloc 14
-	ldc.i4 18500
-	add
 	stloc.2
-// 0x0107d1d0: 0x107d1d0: addu  a2, s6, zero
-	ldloc 15
-	stloc.3
-// 0x0107d1d4: 0x107d1d4: addiu a0, a0, 1764
-	ldloc.1
-	ldc.i4 1764
+// 0x0107cb70: 0x107cb70: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
 	add
-	stloc.1
-// 0x0107d1d8: 0x107d1d8: jal   0x1093a24 sw    zero, 16(sp)
-	ldloc 7
+	stloc.2
+// 0x0107cb74: 0x107cb74: addiu sp, sp, -24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4.4
+	ldc.i4.s -24
 	add
-	ldc.i4.s 0
-	stelem.i4
+	stloc.0
+// 0x0107cb78: 0x107cb78: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0107cb7c: 0x107cb7c: addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+// 0x0107cb80: 0x107cb80: sw    ra, 20(sp)
+// 0x0107cb84: 0x107cb84: jal   0x107c87c addu  a3, a1, zero
+	ldloc.2
+	stloc 4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::report_alert_107c87c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	stloc 8
+	stloc 7
 // --- basic block ---
-// 0x0107d1e0: 0x107d1e0: addu  a0, v0, zero
-	ldloc 5
-	stloc.1
-// 0x0107d1e4: 0x107d1e4: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107d1e8: 0x107d1e8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107d1ec: 0x107d1ec: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
+// 0x0107cb8c: 0x107cb8c: lw    ra, 20(sp)
+// 0x0107cb90: 0x107cb90: sll   zero, zero, 0
+// 0x0107cb94: 0x107cb94: jr    ra addiu sp, sp, 24
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
+	ldc.i4.s 24
 	add
-	ldloc 5
-	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107d1f4: 0x107d1f4: lw    v0, 1680(sp)
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 8
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 420
-	add
-	ldelem.i4
+	ret
+}
+.method public static int32 add_real_time_chit_chat_107cb9c(int32,int32,int32,int32,int32)
+{
+.maxstack 8
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 ra)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local  9 is register s1
+// local  0 is register sp
+// local 10 is register ra
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
-// 0x0107d1f8: 0x107d1f8: addu  a0, s4, zero
-	ldloc 8
-	stloc.1
-// 0x0107d1fc: 0x107d1fc: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 10
+	ldsfld int32[] [WazeWP7]CRunTime::memory
 	stloc 6
-	stloc 5
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d204: 0x107d204: addu  a0, s2, zero
-	ldloc 12
+L_107cb9c:
+// 0x0107cb9c: 0x107cb9c: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107d208: 0x107d208: jal   0x1098ec4 addu  a1, s3, zero
-	ldloc 10
-	stloc.2
+// 0x0107cba0: 0x107cba0: addiu sp, sp, -64
+	ldloc.0
+	ldc.i4.s -64
+	add
+	stloc.0
+// 0x0107cba4: 0x107cba4: addiu a0, a0, -23972
 	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d210: 0x107d210: lw    v0, 1620(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 405
+	ldc.i4 -23972
 	add
-	ldelem.i4
-	stloc 5
-// 0x0107d214: 0x107d214: sll   zero, zero, 0
-// 0x0107d218: 0x107d218: beq   v0, zero, 0x107d244 addiu a3, zero, -1
-	ldloc 5
-	ldc.i4.m1
-	stloc 4
-	brfalse L_107d244
-// --- basic block ---
-// 0x0107d220: 0x107d220: lw    a2, 0(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldelem.i4
-	stloc.3
-// 0x0107d224: 0x107d224: addiu a0, zero, 1
-	ldc.i4.1
 	stloc.1
-// 0x0107d228: 0x107d228: addiu a1, zero, 2
-	ldc.i4.2
-	stloc.2
-// 0x0107d22c: 0x107d22c: addiu v0, zero, -1
-	ldc.i4.m1
-	stloc 5
-// 0x0107d230: 0x107d230: sw    v0, 16(sp)
-	ldloc 7
+// 0x0107cba8: 0x107cba8: sw    ra, 60(sp)
+// 0x0107cbac: 0x107cbac: sw    s1, 56(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 14
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-// 0x0107d234: 0x107d234: jal   0x104b534 sw    s5, 20(sp)
-	ldloc 7
+// 0x0107cbb0: 0x107cbb0: jal   0x101df34 sw    s0, 52(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.s 13
 	add
-	ldloc 13
+	ldloc 8
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b534(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_gps_position_101df34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d23c: 0x107d23c: j	 0x107d284 addu  a0, s0, zero
-	ldloc 9
+// 0x0107cbb8: 0x107cbb8: bne   v0, zero, 0x107cbd8 lui   a0, 0x0
+	ldloc 5
+	ldc.i4.s 0
 	stloc.1
-	br L_107d284
+	brtrue L_107cbd8
 // --- basic block ---
-L_107d244:
-// 0x0107d244: 0x107d244: addu  a0, s2, zero
-	ldloc 12
-	stloc.1
-// 0x0107d248: 0x107d248: addu  a1, zero, zero
-	ldc.i4.s 0
+// 0x0107cbc0: 0x107cbc0: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x0107d24c: 0x107d24c: jal   0x1098fe0 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+// 0x0107cbc4: 0x107cbc4: addiu a0, a0, 30092
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107d254: 0x107d254: lw    v1, 48(s3)
-	ldloc 7
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+	ldc.i4 30092
 	add
-	ldelem.i4
-	stloc 6
-// 0x0107d258: 0x107d258: addiu v0, zero, -513
-	ldc.i4 -513
-	stloc 5
-// 0x0107d25c: 0x107d25c: and   v0, v1, v0
-	ldloc 6
-	ldloc 5
-	and
-	stloc 5
-// 0x0107d260: 0x107d260: ori   v0, v0, 1
-	ldloc 5
-	ldc.i4.1
-	or
-	stloc 5
-// 0x0107d264: 0x107d264: addu  a0, s3, zero
-	ldloc 10
 	stloc.1
-// 0x0107d268: 0x107d268: sw    v0, 48(s3)
-	ldloc 7
-	ldloc 10
-	ldc.i4.2
-	shr.un
-	ldc.i4.s 12
+// 0x0107cbc8: 0x107cbc8: jal   0x104c158 addiu a1, a1, -14376
+	ldloc.2
+	ldc.i4 -14376
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107d26c: 0x107d26c: addu  a1, zero, zero
-	ldc.i4.s 0
 	stloc.2
-// 0x0107d270: 0x107d270: jal   0x1098f84 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_104c158(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d278: 0x107d278: jal   0x1099098 addu  a0, s5, zero
-	ldloc 13
-	stloc.1
-	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
-	stloc 5
+// 0x0107cbd0: 0x107cbd0: j	 0x107cc94 sll   zero, zero, 0
+	br L_107cc94
 // --- basic block ---
-// 0x0107d280: 0x107d280: addu  a0, s0, zero
-	ldloc 9
-	stloc.1
-L_107d284:
-// 0x0107d284: 0x107d284: addiu a1, sp, 276
-	ldloc.0
-	ldc.i4 276
-	add
-	stloc.2
-// 0x0107d288: 0x107d288: lui   s0, 0x80000
-	ldc.i4 524288
-	stloc 9
-// 0x0107d28c: 0x107d28c: jal   0x107c684 sb    zero, 276(sp)
-	ldloc.0
-	ldc.i4 276
-	add
-	ldc.i4.s 0
-	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+L_107cbd8:
+// 0x0107cbd8: 0x107cbd8: jal   0x106b6b0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::T_412_107c684(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_RandomUserMsg_106b6b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d294: 0x107d294: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4020
-	add
-	ldelem.i4
-	stloc.1
-// 0x0107d298: 0x107d298: jal   0x1098ec4 addu  a1, s4, zero
-	ldloc 8
-	stloc.2
+// 0x0107cbe0: 0x107cbe0: bne   v0, zero, 0x107cc94 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_107cc94
+// --- basic block ---
+// 0x0107cbe8: 0x107cbe8: jal   0x106b1c0 sll   zero, zero, 0
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_AnonymousMsg_106b1c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d2a0: 0x107d2a0: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4020
-	add
-	ldelem.i4
+// 0x0107cbf0: 0x107cbf0: bne   v0, zero, 0x107cc94 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_107cc94
+// --- basic block ---
+// 0x0107cbf8: 0x107cbf8: jal   0x107c644 addiu a0, zero, 16
+	ldc.i4.s 16
 	stloc.1
-// 0x0107d2a4: 0x107d2a4: jal   0x1098ec4 addu  a1, s1, zero
-	ldloc 11
-	stloc.2
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl93::T_411_107c644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d2ac: 0x107d2ac: lui   a1, 0x10000
+// 0x0107cc00: 0x107cc00: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107d2b0: 0x107d2b0: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107d2b4: 0x107d2b4: addiu a3, zero, 5
-	ldc.i4.5
-	stloc 4
-// 0x0107d2b8: 0x107d2b8: addiu a1, a1, 18500
+// 0x0107cc04: 0x107cc04: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107d2bc: 0x107d2bc: addiu a0, a0, 1764
-	ldloc.1
-	ldc.i4 1764
-	add
+// 0x0107cc08: 0x107cc08: addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0107cc0c: 0x107cc0c: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x0107d2c0: 0x107d2c0: addiu a2, zero, -1
-	ldc.i4.m1
-	stloc.3
-// 0x0107d2c4: 0x107d2c4: addiu v0, zero, 8
-	ldc.i4.8
+// 0x0107cc10: 0x107cc10: addiu v0, zero, 1
+	ldc.i4.1
 	stloc 5
-// 0x0107d2c8: 0x107d2c8: jal   0x1093a24 sw    v0, 16(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107cc14: 0x107cc14: sw    a1, 8(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.2
 	add
-	ldloc 5
+	ldloc.2
 	stelem.i4
-	ldloc.0
-	ldloc.1
+// 0x0107cc18: 0x107cc18: sw    a1, 12(s0)
+	ldloc 6
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4.3
+	add
 	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d2d0: 0x107d2d0: addu  a0, v0, zero
-	ldloc 5
+	stelem.i4
+// 0x0107cc1c: 0x107cc1c: addiu a0, a0, -24944
+	ldloc.1
+	ldc.i4 -24944
+	add
 	stloc.1
-// 0x0107d2d4: 0x107d2d4: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107d2d8: 0x107d2d8: addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-// 0x0107d2dc: 0x107d2dc: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107cc20: 0x107cc20: sw    v0, 4(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.1
 	add
 	ldloc 5
 	stelem.i4
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
-// --- basic block ---
-// 0x0107d2e4: 0x107d2e4: lw    v0, 1680(sp)
-	ldloc 7
-	ldloc.0
+// 0x0107cc24: 0x107cc24: sw    zero, 0(s0)
+	ldloc 6
+	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
-	add
-	ldelem.i4
-	stloc 5
-// 0x0107d2e8: 0x107d2e8: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
+	ldc.i4.s 0
+	stelem.i4
+// 0x0107cc28: 0x107cc28: jal   0x101cd70 sw    a1, 40(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4020
+	ldc.i4.s 10
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107d2ec: 0x107d2ec: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
+	ldloc.2
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d2f4: 0x107d2f4: lui   a0, 0x20000
+// 0x0107cc30: 0x107cc30: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107d2f8: 0x107d2f8: jal   0x101cd60 addiu a0, a0, -25148
+// 0x0107cc34: 0x107cc34: addiu a0, a0, -24936
 	ldloc.1
-	ldc.i4 -25148
+	ldc.i4 -24936
 	add
 	stloc.1
+// 0x0107cc38: 0x107cc38: jal   0x101cd70 addu  s1, v0, zero
+	ldloc 5
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d300: 0x107d300: lui   a3, 0x1080000
-	ldc.i4 17301504
-	stloc 4
-// 0x0107d304: 0x107d304: lui   a0, 0x20000
-	ldc.i4 131072
+// 0x0107cc40: 0x107cc40: lui   a0, 0x10000
+	ldc.i4 65536
 	stloc.1
-// 0x0107d308: 0x107d308: addiu a3, a3, -29244
-	ldloc 4
-	ldc.i4 -29244
-	add
-	stloc 4
-// 0x0107d30c: 0x107d30c: addiu a2, zero, 1
-	ldc.i4.1
-	stloc.3
-// 0x0107d310: 0x107d310: addiu a0, a0, -25140
+// 0x0107cc44: 0x107cc44: addiu a0, a0, -6468
 	ldloc.1
-	ldc.i4 -25140
+	ldc.i4 -6468
 	add
 	stloc.1
-// 0x0107d314: 0x107d314: jal   0x1091088 addu  a1, v0, zero
+// 0x0107cc48: 0x107cc48: jal   0x101cd70 sw    v0, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
 	ldloc 5
-	stloc.2
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d31c: 0x107d31c: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
+// 0x0107cc50: 0x107cc50: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107cc54: 0x107cc54: addiu a0, a0, -24924
+	ldloc.1
+	ldc.i4 -24924
+	add
+	stloc.1
+// 0x0107cc58: 0x107cc58: jal   0x101cd70 sw    v0, 32(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4020
+	ldc.i4.8
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107d320: 0x107d320: jal   0x1098ec4 addu  a1, v0, zero
 	ldloc 5
-	stloc.2
+	stelem.i4
+	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d328: 0x107d328: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107d32c: 0x107d32c: jal   0x101cd60 addiu a0, a0, 844
-	ldloc.1
-	ldc.i4 844
+// 0x0107cc60: 0x107cc60: sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
 	add
-	stloc.1
+	ldloc 5
+	stelem.i4
+// 0x0107cc64: 0x107cc64: lui   v0, 0x1080000
+	ldc.i4 17301504
+	stloc 5
+// 0x0107cc68: 0x107cc68: addiu v0, v0, -26668
+	ldloc 5
+	ldc.i4 -26668
+	add
+	stloc 5
+// 0x0107cc6c: 0x107cc6c: sw    v0, 20(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107cc70: 0x107cc70: lw    a1, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107cc74: 0x107cc74: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0107cc78: 0x107cc78: lw    a2, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldelem.i4
+	stloc.3
+// 0x0107cc7c: 0x107cc7c: lw    a3, 32(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d334: 0x107d334: lui   a3, 0x1080000
-	ldc.i4 17301504
-	stloc 4
-// 0x0107d338: 0x107d338: lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-// 0x0107d33c: 0x107d33c: addiu a3, a3, -26956
-	ldloc 4
-	ldc.i4 -26956
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
 	add
+	ldelem.i4
 	stloc 4
-// 0x0107d340: 0x107d340: addiu a2, zero, 1
+// 0x0107cc80: 0x107cc80: ori   v0, v0, 1
+	ldloc 5
 	ldc.i4.1
-	stloc.3
-// 0x0107d344: 0x107d344: addiu a0, a0, 852
-	ldloc.1
-	ldc.i4 852
-	add
+	or
+	stloc 5
+// 0x0107cc84: 0x107cc84: addu  a0, s1, zero
+	ldloc 9
 	stloc.1
-// 0x0107d348: 0x107d348: jal   0x1091088 addu  a1, v0, zero
+// 0x0107cc88: 0x107cc88: sw    s0, 24(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107cc8c: 0x107cc8c: jal   0x1052fb4 sw    v0, 28(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.7
+	add
 	ldloc 5
-	stloc.2
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl61::ShowEditboxCamera_1052fb4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d350: 0x107d350: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
+L_107cc94:
+// 0x0107cc94: 0x107cc94: lw    ra, 60(sp)
+// 0x0107cc98: 0x107cc98: lw    s1, 56(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 14
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107cc9c: 0x107cc9c: lw    s0, 52(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4020
+	ldc.i4.s 13
 	add
 	ldelem.i4
-	stloc.1
-// 0x0107d354: 0x107d354: jal   0x1098ec4 addu  a1, v0, zero
+	stloc 8
+// 0x0107cca0: 0x107cca0: jr    ra addiu sp, sp, 64
+	ldloc.0
+	ldc.i4.s 64
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 7
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	ret
+}
+.method public static int32 T_412_107cca8(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s2,int32 s1,int32 ra,int32 hi,int32 lo)
+
+// local  5 is register v0
+// local  7 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local  8 is register s0
+// local 10 is register s1
+// local  9 is register s2
+// local  0 is register sp
+// local 11 is register ra
+// local 12 is register hi
+// local 13 is register lo
+// local  6 is register mem
+
+	ldc.i4.s 0
 	stloc 5
+	ldc.i4.s 0
+	stloc 7
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 9
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 13
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 6
+__CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d35c: 0x107d35c: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0107d360: 0x107d360: addiu v0, v0, -25124
-	ldloc 5
-	ldc.i4 -25124
+// 0x0107cca8: 0x107cca8: addiu sp, sp, -232
+	ldloc.0
+	ldc.i4 -232
 	add
-	stloc 5
-// 0x0107d364: 0x107d364: sw    v0, 40(sp)
-	ldloc 7
+	stloc.0
+// 0x0107ccac: 0x107ccac: sw    s1, 220(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 10
+	ldc.i4.s 55
 	add
-	ldloc 5
+	ldloc 10
 	stelem.i4
-// 0x0107d368: 0x107d368: lui   v0, 0x20000
-	ldc.i4 131072
-	stloc 5
-// 0x0107d36c: 0x107d36c: addiu v0, v0, -25104
-	ldloc 5
-	ldc.i4 -25104
-	add
-	stloc 5
-// 0x0107d370: 0x107d370: sw    v0, 44(sp)
-	ldloc 7
+// 0x0107ccb0: 0x107ccb0: sw    ra, 228(sp)
+// 0x0107ccb4: 0x107ccb4: sw    s2, 224(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 11
+	ldc.i4.s 56
 	add
-	ldloc 5
+	ldloc 9
 	stelem.i4
-// 0x0107d374: 0x107d374: addiu v0, zero, 1
-	ldc.i4.1
-	stloc 5
-// 0x0107d378: 0x107d378: sw    v0, 16(sp)
-	ldloc 7
+// 0x0107ccb8: 0x107ccb8: sw    s0, 216(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.4
+	ldc.i4.s 54
 	add
-	ldloc 5
+	ldloc 8
 	stelem.i4
-// 0x0107d37c: 0x107d37c: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107d380: 0x107d380: lui   a1, 0x20000
-	ldc.i4 131072
-	stloc.2
-// 0x0107d384: 0x107d384: lui   v0, 0x1080000
-	ldc.i4 17301504
-	stloc 5
-// 0x0107d388: 0x107d388: addiu a3, zero, 2
+// 0x0107ccbc: 0x107ccbc: sb    zero, 0(a1)
+	ldloc.2
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0107ccc0: 0x107ccc0: lw    v1, 16(a0)
+	ldloc 6
+	ldloc.1
 	ldc.i4.2
-	stloc 4
-// 0x0107d38c: 0x107d38c: addiu a2, sp, 40
-	ldloc.0
-	ldc.i4.s 40
+	shr.un
+	ldc.i4.4
 	add
-	stloc.3
-// 0x0107d390: 0x107d390: addiu a0, a0, -25076
+	ldelem.i4
+	stloc 7
+// 0x0107ccc4: 0x107ccc4: lw    v0, 20(a0)
+	ldloc 6
 	ldloc.1
-	ldc.i4 -25076
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
 	add
-	stloc.1
-// 0x0107d394: 0x107d394: addiu a1, a1, -25056
+	ldelem.i4
+	stloc 5
+// 0x0107ccc8: 0x107ccc8: addu  s1, a1, zero
 	ldloc.2
-	ldc.i4 -25056
+	stloc 10
+// 0x0107cccc: 0x107cccc: addiu a0, sp, 44
+	ldloc.0
+	ldc.i4.s 44
+	add
+	stloc.1
+// 0x0107ccd0: 0x107ccd0: addiu a1, sp, 64
+	ldloc.0
+	ldc.i4.s 64
 	add
 	stloc.2
-// 0x0107d398: 0x107d398: addiu v0, v0, -18668
-	ldloc 5
-	ldc.i4 -18668
+// 0x0107ccd4: 0x107ccd4: addiu a2, sp, 24
+	ldloc.0
+	ldc.i4.s 24
 	add
-	stloc 5
-// 0x0107d39c: 0x107d39c: sw    v0, 20(sp)
-	ldloc 7
+	stloc.3
+// 0x0107ccd8: 0x107ccd8: sw    v1, 28(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.5
+	ldc.i4.7
 	add
-	ldloc 5
-	stelem.i4
-// 0x0107d3a0: 0x107d3a0: jal   0x1090ecc sw    zero, 48(sp)
 	ldloc 7
+	stelem.i4
+// 0x0107ccdc: 0x107ccdc: jal   0x1029db8 sw    v0, 32(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4.s 12
+	ldc.i4.8
 	add
-	ldc.i4.s 0
+	ldloc 5
 	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d3a8: 0x107d3a8: lw    a0, -16080(s0)
+// 0x0107cce4: 0x107cce4: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 7
+// 0x0107cce8: 0x107cce8: beq   v0, v1, 0x107cd0c addiu a1, sp, 28
+	ldloc 5
 	ldloc 7
-	ldloc 9
+	ldloc.0
+	ldc.i4.s 28
+	add
+	stloc.2
+	beq  L_107cd0c
+// --- basic block ---
+// 0x0107ccf0: 0x107ccf0: lw    v0, 48(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4020
+	ldc.i4.s 12
 	add
 	ldelem.i4
-	stloc.1
-// 0x0107d3ac: 0x107d3ac: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
 	stloc 5
-// --- basic block ---
-// 0x0107d3b4: 0x107d3b4: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
+// 0x0107ccf4: 0x107ccf4: sll   zero, zero, 0
+// 0x0107ccf8: 0x107ccf8: sw    v0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107ccfc: 0x107ccfc: lw    v0, 44(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4020
+	ldc.i4.s 11
 	add
 	ldelem.i4
+	stloc 5
+// 0x0107cd00: 0x107cd00: addiu a0, sp, 36
+	ldloc.0
+	ldc.i4.s 36
+	add
 	stloc.1
-// 0x0107d3b8: 0x107d3b8: addiu a1, zero, 3
-	ldc.i4.3
-	stloc.2
-// 0x0107d3bc: 0x107d3bc: jal   0x10942e8 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+// 0x0107cd04: 0x107cd04: j	 0x107cd34 sw    v0, 36(sp)
+	ldloc 6
 	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 5
+	stelem.i4
+	br L_107cd34
 // --- basic block ---
-// 0x0107d3c4: 0x107d3c4: lui   a0, 0x20000
+L_107cd0c:
+// 0x0107cd0c: 0x107cd0c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107d3c8: 0x107d3c8: jal   0x101cd60 addiu a0, a0, -25044
+// 0x0107cd10: 0x107cd10: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 -25044
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -9628,187 +7163,201 @@ L_107d284:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d3d0: 0x107d3d0: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107d3d4: 0x107d3d4: addu  a3, zero, zero
-	ldc.i4.s 0
-	stloc 4
-// 0x0107d3d8: 0x107d3d8: addu  a1, v0, zero
+// 0x0107cd18: 0x107cd18: beq   v0, zero, 0x107cdd0 addiu a1, sp, 28
 	ldloc 5
+	ldloc.0
+	ldc.i4.s 28
+	add
 	stloc.2
-// 0x0107d3dc: 0x107d3dc: addiu a0, a0, -25008
-	ldloc.1
-	ldc.i4 -25008
+	brfalse L_107cdd0
+// --- basic block ---
+// 0x0107cd20: 0x107cd20: lw    v1, 0(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 7
+// 0x0107cd24: 0x107cd24: lw    v0, 4(v0)
+	ldloc 6
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107cd28: 0x107cd28: addiu a0, sp, 36
+	ldloc.0
+	ldc.i4.s 36
 	add
 	stloc.1
-// 0x0107d3e0: 0x107d3e0: jal   0x1098d10 addiu a2, zero, 12
-	ldc.i4.s 12
-	stloc.3
+// 0x0107cd2c: 0x107cd2c: sw    v0, 40(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107cd30: 0x107cd30: sw    v1, 36(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 9
+	add
+	ldloc 7
+	stelem.i4
+L_107cd34:
+// 0x0107cd34: 0x107cd34: jal   0x1008ec0 addiu s2, sp, 84
+	ldloc.0
+	ldc.i4.s 84
+	add
+	stloc 9
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d3e8: 0x107d3e8: lui   a1, 0x0
-	ldc.i4.s 0
-	stloc.2
-// 0x0107d3ec: 0x107d3ec: addu  a0, v0, zero
+// 0x0107cd3c: 0x107cd3c: addu  s0, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0107cd40: 0x107cd40: jal   0x1007e04 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107d3f0: 0x107d3f0: addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
-// 0x0107d3f4: 0x107d3f4: addiu a1, a1, 23008
-	ldloc.2
-	ldc.i4 23008
-	add
-	stloc.2
-// 0x0107d3f8: 0x107d3f8: jal   0x1098fe0 sw    v0, 1680(sp)
-	ldloc 7
+	ldloc.1
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
+	stloc 5
+// --- basic block ---
+// 0x0107cd48: 0x107cd48: addu  a0, s0, zero
+	ldloc 8
+	stloc.1
+// 0x0107cd4c: 0x107cd4c: jal   0x1007e28 sw    v0, 208(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.s 52
 	add
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	ldloc.2
-	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
 // --- basic block ---
-// 0x0107d400: 0x107d400: lw    v0, 1680(sp)
+// 0x0107cd54: 0x107cd54: addiu v1, zero, 10
+	ldc.i4.s 10
+	stloc 7
+// 0x0107cd58: 0x107cd58: div   v0, v1
+	ldloc 5
+	ldloc 7
+	ldloc 5
 	ldloc 7
+	div
+	stloc 13
+	rem
+	stloc 12
+// 0x0107cd5c: 0x107cd5c: lw    a3, 208(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 420
+	ldc.i4.s 52
 	add
 	ldelem.i4
-	stloc 5
-// 0x0107d404: 0x107d404: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
-	ldc.i4.2
-	shr.un
-	ldc.i4 -4020
+	stloc 4
+// 0x0107cd60: 0x107cd60: addiu s0, sp, 104
+	ldloc.0
+	ldc.i4.s 104
 	add
-	ldelem.i4
+	stloc 8
+// 0x0107cd64: 0x107cd64: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107cd68: 0x107cd68: addiu a2, a2, 8924
+	ldloc.3
+	ldc.i4 8924
+	add
+	stloc.3
+// 0x0107cd6c: 0x107cd6c: addu  a0, s0, zero
+	ldloc 8
 	stloc.1
-// 0x0107d408: 0x107d408: jal   0x1098ec4 addu  a1, v0, zero
-	ldloc 5
+// 0x0107cd70: 0x107cd70: addiu a1, zero, 100
+	ldc.i4.s 100
 	stloc.2
-	ldloc.1
-	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0107cd74: 0x107cd74: mfhi  hi
+	ldloc 12
 	stloc 5
-// --- basic block ---
-// 0x0107d410: 0x107d410: lw    a0, -16080(s0)
-	ldloc 7
-	ldloc 9
+// 0x0107cd78: 0x107cd78: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 6
+	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4020
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc.1
-// 0x0107d414: 0x107d414: addiu a1, zero, 3
-	ldc.i4.3
-	stloc.2
-// 0x0107d418: 0x107d418: jal   0x10942e8 addu  a2, zero, zero
-	ldc.i4.s 0
-	stloc.3
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d420: 0x107d420: lui   a0, 0x20000
-	ldc.i4 131072
-	stloc.1
-// 0x0107d424: 0x107d424: addiu a0, a0, -26732
-	ldloc.1
-	ldc.i4 -26732
-	add
-	stloc.1
-// 0x0107d428: 0x107d428: jal   0x1095eec addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-	ldloc.0
-	ldloc.1
-	ldloc.2
-	ldloc.3
-	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+// 0x0107cd80: 0x107cd80: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-L_107d430:
-// 0x0107d430: 0x107d430: jal   0x102146c sll   zero, zero, 0
-	ldloc.0
-	ldloc.1
-	ldloc.2
+// 0x0107cd88: 0x107cd88: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107cd8c: 0x107cd8c: addiu a2, a2, 20332
 	ldloc.3
-	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
-	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
-	stloc 5
-// --- basic block ---
-// 0x0107d438: 0x107d438: bne   v0, zero, 0x107d47c sll   zero, zero, 0
+	ldc.i4 20332
+	add
+	stloc.3
+// 0x0107cd90: 0x107cd90: addu  a3, v0, zero
 	ldloc 5
-	brtrue L_107d47c
-// --- basic block ---
-// 0x0107d440: 0x107d440: jal   0x1021900 sll   zero, zero, 0
+	stloc 4
+// 0x0107cd94: 0x107cd94: addiu a1, zero, 20
+	ldc.i4.s 20
+	stloc.2
+// 0x0107cd98: 0x107cd98: jal   0x1000f9c addu  a0, s2, zero
+	ldloc 9
+	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d448: 0x107d448: j	 0x107d47c sll   zero, zero, 0
-	br L_107d47c
-// --- basic block ---
-L_107d450:
-// 0x0107d450: 0x107d450: addu  a0, s3, zero
-	ldloc 10
-	stloc.1
-// 0x0107d454: 0x107d454: jal   0x1099174 addu  a1, zero, zero
-	ldc.i4.s 0
-	stloc.2
-	ldloc.1
-	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
-// --- basic block ---
-// 0x0107d45c: 0x107d45c: lui   a0, 0x10000
-	ldc.i4 65536
+// 0x0107cda0: 0x107cda0: lui   a0, 0x20000
+	ldc.i4 131072
 	stloc.1
-// 0x0107d460: 0x107d460: jal   0x101cd60 addiu a0, a0, 18500
+// 0x0107cda4: 0x107cda4: jal   0x101cd70 addiu a0, a0, -6424
 	ldloc.1
-	ldc.i4 18500
+	ldc.i4 -6424
 	add
 	stloc.1
 	ldloc.0
@@ -9816,114 +7365,107 @@ L_107d450:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d468: 0x107d468: addu  a1, v0, zero
-	ldloc 5
-	stloc.2
-// 0x0107d46c: 0x107d46c: jal   0x109b434 addu  a0, s3, zero
-	ldloc 10
+// 0x0107cdac: 0x107cdac: addu  a0, s2, zero
+	ldloc 9
 	stloc.1
+// 0x0107cdb0: 0x107cdb0: jal   0x101cd70 sw    v0, 208(sp)
+	ldloc 6
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 52
+	add
+	ldloc 5
+	stelem.i4
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
-	stloc 6
+	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107d474: 0x107d474: j	 0x107cafc lui   a0, 0x10000
-	ldc.i4 65536
-	stloc.1
-	br L_107cafc
-// --- basic block ---
-L_107d47c:
-// 0x0107d47c: 0x107d47c: lw    ra, 1724(sp)
-// 0x0107d480: 0x107d480: lw    s7, 1720(sp)
-	ldloc 7
+// 0x0107cdb8: 0x107cdb8: lw    a2, 208(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 430
+	ldc.i4.s 52
 	add
 	ldelem.i4
-	stloc 14
-// 0x0107d484: 0x107d484: lw    s6, 1716(sp)
-	ldloc 7
+	stloc.3
+// 0x0107cdbc: 0x107cdbc: addu  a0, s1, zero
+	ldloc 10
+	stloc.1
+// 0x0107cdc0: 0x107cdc0: addu  a3, s0, zero
+	ldloc 8
+	stloc 4
+// 0x0107cdc4: 0x107cdc4: addiu a1, zero, 700
+	ldc.i4 700
+	stloc.2
+// 0x0107cdc8: 0x107cdc8: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 429
+	ldc.i4.4
 	add
-	ldelem.i4
-	stloc 15
-// 0x0107d488: 0x107d488: lw    s5, 1712(sp)
-	ldloc 7
+	ldloc 5
+	stelem.i4
 	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 428
-	add
-	ldelem.i4
-	stloc 13
-// 0x0107d48c: 0x107d48c: lw    s4, 1708(sp)
-	ldloc 7
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 7
+	stloc 5
+// --- basic block ---
+L_107cdd0:
+// 0x0107cdd0: 0x107cdd0: lw    ra, 228(sp)
+// 0x0107cdd4: 0x107cdd4: lw    s2, 224(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 427
+	ldc.i4.s 56
 	add
 	ldelem.i4
-	stloc 8
-// 0x0107d490: 0x107d490: lw    s3, 1704(sp)
-	ldloc 7
+	stloc 9
+// 0x0107cdd8: 0x107cdd8: lw    s1, 220(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 426
+	ldc.i4.s 55
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107d494: 0x107d494: lw    s2, 1700(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 425
-	add
-	ldelem.i4
-	stloc 12
-// 0x0107d498: 0x107d498: lw    s1, 1696(sp)
-	ldloc 7
-	ldloc.0
-	ldc.i4.2
-	shr.un
-	ldc.i4 424
-	add
-	ldelem.i4
-	stloc 11
-// 0x0107d49c: 0x107d49c: lw    s0, 1692(sp)
-	ldloc 7
+// 0x0107cddc: 0x107cddc: lw    s0, 216(sp)
+	ldloc 6
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 423
+	ldc.i4.s 54
 	add
 	ldelem.i4
-	stloc 9
-// 0x0107d4a0: 0x107d4a0: jr    ra addiu sp, sp, 1728
+	stloc 8
+// 0x0107cde0: 0x107cde0: jr    ra addiu sp, sp, 232
 	ldloc.0
-	ldc.i4 1728
+	ldc.i4 232
 	add
 	stloc.0
 	br __CIBYL_function_return
 __CIBYL_function_return:
-	ldloc 6
+	ldloc 7
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
diff --git a/converted/Cibyl94.j b/converted/Cibyl94.j
index d990927..37cbcd6 100644
--- a/converted/Cibyl94.j
+++ b/converted/Cibyl94.j
@@ -41,7 +41,4229 @@
     IL_0006:  ret
   } // end of method Cibyl94::.ctor
 
-.method public static int32 RTAlerts_popup_alert_107d4a8(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_popup_PingWazer_107cde8(int32,int32,int32,int32,int32)
+{
+.maxstack 10
+.locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s4,int32 s0,int32 s3,int32 s1,int32 s2,int32 s5,int32 s7,int32 s6,int32 ra,int32 t0)
+
+// local  5 is register v0
+// local  6 is register v1
+// local  1 is register a0
+// local  2 is register a1
+// local  3 is register a2
+// local  4 is register a3
+// local 17 is register t0
+// local  9 is register s0
+// local 11 is register s1
+// local 12 is register s2
+// local 10 is register s3
+// local  8 is register s4
+// local 13 is register s5
+// local 15 is register s6
+// local 14 is register s7
+// local  0 is register sp
+// local 16 is register ra
+// local  7 is register mem
+
+	ldc.i4.s 0
+	stloc 5
+	ldc.i4.s 0
+	stloc 6
+	ldarg 1
+	stloc 1
+	ldarg 2
+	stloc 2
+	ldarg 3
+	stloc 3
+	ldarg 4
+	stloc 4
+	ldc.i4.s 0
+	stloc 17
+	ldc.i4.s 0
+	stloc 9
+	ldc.i4.s 0
+	stloc 11
+	ldc.i4.s 0
+	stloc 12
+	ldc.i4.s 0
+	stloc 10
+	ldc.i4.s 0
+	stloc 8
+	ldc.i4.s 0
+	stloc 13
+	ldc.i4.s 0
+	stloc 15
+	ldc.i4.s 0
+	stloc 14
+	ldarg 0
+	stloc 0
+	ldc.i4.s 0
+	stloc 16
+	ldsfld int32[] [WazeWP7]CRunTime::memory
+	stloc 7
+__CIBYL_javamethod_begin:
+// --- basic block ---
+// 0x0107cde8: 0x107cde8: addiu sp, sp, -1728
+	ldloc.0
+	ldc.i4 -1728
+	add
+	stloc.0
+// 0x0107cdec: 0x107cdec: lui   v0, 0xf0000
+	ldc.i4 983040
+	stloc 5
+// 0x0107cdf0: 0x107cdf0: sw    s2, 1700(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 425
+	add
+	ldloc 12
+	stelem.i4
+// 0x0107cdf4: 0x107cdf4: lw    s2, -29604(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -7401
+	add
+	ldelem.i4
+	stloc 12
+// 0x0107cdf8: 0x107cdf8: lui   v0, 0xf0000
+	ldc.i4 983040
+	stloc 5
+// 0x0107cdfc: 0x107cdfc: sw    s4, 1708(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 427
+	add
+	ldloc 8
+	stelem.i4
+// 0x0107ce00: 0x107ce00: sw    s0, 1692(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 423
+	add
+	ldloc 9
+	stelem.i4
+// 0x0107ce04: 0x107ce04: sw    ra, 1724(sp)
+// 0x0107ce08: 0x107ce08: sw    s7, 1720(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 430
+	add
+	ldloc 14
+	stelem.i4
+// 0x0107ce0c: 0x107ce0c: sw    s6, 1716(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 429
+	add
+	ldloc 15
+	stelem.i4
+// 0x0107ce10: 0x107ce10: sw    s5, 1712(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 428
+	add
+	ldloc 13
+	stelem.i4
+// 0x0107ce14: 0x107ce14: sw    s3, 1704(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 426
+	add
+	ldloc 10
+	stelem.i4
+// 0x0107ce18: 0x107ce18: sw    s1, 1696(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 424
+	add
+	ldloc 11
+	stelem.i4
+// 0x0107ce1c: 0x107ce1c: sb    zero, 276(sp)
+	ldloc.0
+	ldc.i4 276
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0107ce20: 0x107ce20: lw    s4, -29608(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -7402
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107ce24: 0x107ce24: jal   0x101de20 addu  s0, a0, zero
+	ldloc.1
+	stloc 9
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107ce2c: 0x107ce2c: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107ce30: 0x107ce30: lw    v0, -13564(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3391
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107ce34: 0x107ce34: sll   zero, zero, 0
+// 0x0107ce38: 0x107ce38: beq   v0, zero, 0x107daa0 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107daa0
+// --- basic block ---
+// 0x0107ce40: 0x107ce40: jal   0x101fa38 addiu s6, zero, 70
+	ldc.i4.s 70
+	stloc 15
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
+	stloc 5
+// --- basic block ---
+// 0x0107ce48: 0x107ce48: beq   v0, zero, 0x107ce54 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107ce54
+// --- basic block ---
+// 0x0107ce50: 0x107ce50: addiu s6, zero, 100
+	ldc.i4.s 100
+	stloc 15
+L_107ce54:
+// 0x0107ce54: 0x107ce54: beq   s0, zero, 0x107daa0 lui   s3, 0x80000
+	ldloc 9
+	ldc.i4 524288
+	stloc 10
+	brfalse L_107daa0
+// --- basic block ---
+// 0x0107ce5c: 0x107ce5c: lw    v0, -15620(s3)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3905
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107ce60: 0x107ce60: sll   zero, zero, 0
+// 0x0107ce64: 0x107ce64: bne   v0, zero, 0x107ce98 sb    zero, 276(sp)
+	ldloc 5
+	ldloc.0
+	ldc.i4 276
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	brtrue L_107ce98
+// --- basic block ---
+// 0x0107ce6c: 0x107ce6c: jal   0x10518b8 addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+	ldloc.1
+	call int32 Cibyl60::roadmap_sound_list_create_10518b8(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107ce74: 0x107ce74: lui   s1, 0x10000
+	ldc.i4 65536
+	stloc 11
+// 0x0107ce78: 0x107ce78: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107ce7c: 0x107ce7c: addiu a1, s1, 23044
+	ldloc 11
+	ldc.i4 23044
+	add
+	stloc.2
+// 0x0107ce80: 0x107ce80: jal   0x10518dc sw    v0, -15620(s3)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3905
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl60::roadmap_sound_list_add_10518dc(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107ce88: 0x107ce88: addiu a2, s1, 23044
+	ldloc 11
+	ldc.i4 23044
+	add
+	stloc.3
+// 0x0107ce8c: 0x107ce8c: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0107ce90: 0x107ce90: jal   0x10a1f60 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_107ce98:
+// 0x0107ce98: 0x107ce98: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107ce9c: 0x107ce9c: lw    a0, -15620(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3905
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107cea0: 0x107cea0: jal   0x105196c lui   s3, 0x20000
+	ldc.i4 131072
+	stloc 10
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl60::roadmap_sound_play_list_105196c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cea8: 0x107cea8: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107ceac: 0x107ceac: lw    s1, -15616(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc 11
+// 0x0107ceb0: 0x107ceb0: sll   zero, zero, 0
+// 0x0107ceb4: 0x107ceb4: beq   s1, zero, 0x107d254 lui   v0, 0x80000
+	ldloc 11
+	ldc.i4 524288
+	stloc 5
+	brfalse L_107d254
+// --- basic block ---
+// 0x0107cebc: 0x107cebc: lw    v1, 0(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 6
+// 0x0107cec0: 0x107cec0: sll   zero, zero, 0
+// 0x0107cec4: 0x107cec4: sw    v1, -13540(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3385
+	add
+	ldloc 6
+	stelem.i4
+// 0x0107cec8: 0x107cec8: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107cecc: 0x107cecc: addiu v1, zero, -1
+	ldc.i4.m1
+	stloc 6
+// 0x0107ced0: 0x107ced0: lui   v0, 0x80000
+	ldc.i4 524288
+	stloc 5
+// 0x0107ced4: 0x107ced4: jal   0x1099640 sw    v1, -13536(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3384
+	add
+	ldloc 6
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cedc: 0x107cedc: lw    a0, 140(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 35
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107cee0: 0x107cee0: jal   0x103543c lui   s4, 0x20000
+	ldc.i4 131072
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl39::roadmap_mood_to_string_103543c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cee8: 0x107cee8: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107ceec: 0x107ceec: addiu a1, s3, -24908
+	ldloc 10
+	ldc.i4 -24908
+	add
+	stloc.2
+// 0x0107cef0: 0x107cef0: jal   0x109b94c addu  s5, v0, zero
+	ldloc 5
+	stloc 13
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cef8: 0x107cef8: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107cefc: 0x107cefc: addu  a1, s5, zero
+	ldloc 13
+	stloc.2
+// 0x0107cf00: 0x107cf00: jal   0x109e558 addu  s2, v0, zero
+	ldloc 5
+	stloc 12
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cf08: 0x107cf08: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107cf0c: 0x107cf0c: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107cf10: 0x107cf10: addiu a1, a1, -24888
+	ldloc.2
+	ldc.i4 -24888
+	add
+	stloc.2
+// 0x0107cf14: 0x107cf14: jal   0x109ba28 addiu a2, s0, 32
+	ldloc 9
+	ldc.i4.s 32
+	add
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cf1c: 0x107cf1c: lb    v0, 1520(s0)
+	ldloc 9
+	ldc.i4 1520
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0107cf20: 0x107cf20: sll   zero, zero, 0
+// 0x0107cf24: 0x107cf24: beq   v0, zero, 0x107cf70 addiu s3, sp, 164
+	ldloc 5
+	ldloc.0
+	ldc.i4 164
+	add
+	stloc 10
+	brfalse L_107cf70
+// --- basic block ---
+// 0x0107cf2c: 0x107cf2c: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107cf30: 0x107cf30: addiu a3, s0, 1520
+	ldloc 9
+	ldc.i4 1520
+	add
+	stloc 4
+// 0x0107cf34: 0x107cf34: addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+// 0x0107cf38: 0x107cf38: addiu a2, a2, 14636
+	ldloc.3
+	ldc.i4 14636
+	add
+	stloc.3
+// 0x0107cf3c: 0x107cf3c: jal   0x1000f9c addiu a1, zero, 110
+	ldc.i4.s 110
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cf44: 0x107cf44: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107cf48: 0x107cf48: addu  a2, s3, zero
+	ldloc 10
+	stloc.3
+// 0x0107cf4c: 0x107cf4c: jal   0x109ba28 addiu a1, s4, -24872
+	ldloc 8
+	ldc.i4 -24872
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cf54: 0x107cf54: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107cf58: 0x107cf58: jal   0x109b94c addiu a1, s4, -24872
+	ldloc 8
+	ldc.i4 -24872
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cf60: 0x107cf60: jal   0x10996f4 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cf68: 0x107cf68: j	 0x107cf84 sll   zero, zero, 0
+	br L_107cf84
+// --- basic block ---
+L_107cf70:
+// 0x0107cf70: 0x107cf70: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107cf74: 0x107cf74: jal   0x109b94c addiu a1, s4, -24872
+	ldloc 8
+	ldc.i4 -24872
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cf7c: 0x107cf7c: jal   0x10996e0 addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
+	stloc 5
+// --- basic block ---
+L_107cf84:
+// 0x0107cf84: 0x107cf84: lb    v0, 156(s0)
+	ldloc 9
+	ldc.i4 156
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0107cf88: 0x107cf88: sll   zero, zero, 0
+// 0x0107cf8c: 0x107cf8c: beq   v0, zero, 0x107d044 lui   a1, 0x20000
+	ldloc 5
+	ldc.i4 131072
+	stloc.2
+	brfalse L_107d044
+// --- basic block ---
+// 0x0107cf94: 0x107cf94: addiu a1, a1, -24856
+	ldloc.2
+	ldc.i4 -24856
+	add
+	stloc.2
+// 0x0107cf98: 0x107cf98: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107cf9c: 0x107cf9c: jal   0x109ba28 addiu a2, s0, 156
+	ldloc 9
+	ldc.i4 156
+	add
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cfa4: 0x107cfa4: jal   0x108e1d4 sb    zero, 976(sp)
+	ldloc.0
+	ldc.i4 976
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::RealtimePrivacyState_108e1d4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cfac: 0x107cfac: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0107cfb0: 0x107cfb0: addiu s3, sp, 976
+	ldloc.0
+	ldc.i4 976
+	add
+	stloc 10
+// 0x0107cfb4: 0x107cfb4: bne   v0, v1, 0x107cff4 lui   s7, 0x20000
+	ldloc 5
+	ldloc 6
+	ldc.i4 131072
+	stloc 14
+	bne.un L_107cff4
+// --- basic block ---
+// 0x0107cfbc: 0x107cfbc: jal   0x1001b48 addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cfc4: 0x107cfc4: addiu a0, s7, -24840
+	ldloc 14
+	ldc.i4 -24840
+	add
+	stloc.1
+// 0x0107cfc8: 0x107cfc8: jal   0x101cd70 addu  s4, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cfd0: 0x107cfd0: addiu a1, zero, 700
+	ldc.i4 700
+	stloc.2
+// 0x0107cfd4: 0x107cfd4: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107cfd8: 0x107cfd8: subu  a1, a1, s4
+	ldloc.2
+	ldloc 8
+	sub
+	stloc.2
+// 0x0107cfdc: 0x107cfdc: addu  a0, s3, s4
+	ldloc 10
+	ldloc 8
+	add
+	stloc.1
+// 0x0107cfe0: 0x107cfe0: addiu a2, a2, 740
+	ldloc.3
+	ldc.i4 740
+	add
+	stloc.3
+// 0x0107cfe4: 0x107cfe4: jal   0x1000f9c addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cfec: 0x107cfec: j	 0x107d034 lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+	br L_107d034
+// --- basic block ---
+L_107cff4:
+// 0x0107cff4: 0x107cff4: jal   0x1001b48 addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107cffc: 0x107cffc: addiu a0, s7, -24840
+	ldloc 14
+	ldc.i4 -24840
+	add
+	stloc.1
+// 0x0107d000: 0x107d000: jal   0x101cd70 addu  s4, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d008: 0x107d008: jal   0x106b204 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_GetNickName_106b204(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d010: 0x107d010: addiu a1, zero, 700
+	ldc.i4 700
+	stloc.2
+// 0x0107d014: 0x107d014: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107d018: 0x107d018: lw    a3, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 4
+// 0x0107d01c: 0x107d01c: subu  a1, a1, s4
+	ldloc.2
+	ldloc 8
+	sub
+	stloc.2
+// 0x0107d020: 0x107d020: addu  a0, s3, s4
+	ldloc 10
+	ldloc 8
+	add
+	stloc.1
+// 0x0107d024: 0x107d024: addiu a2, a2, -24836
+	ldloc.3
+	ldc.i4 -24836
+	add
+	stloc.3
+// 0x0107d028: 0x107d028: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d030: 0x107d030: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+L_107d034:
+// 0x0107d034: 0x107d034: addiu a1, a1, -24828
+	ldloc.2
+	ldc.i4 -24828
+	add
+	stloc.2
+// 0x0107d038: 0x107d038: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d03c: 0x107d03c: j	 0x107d054 addiu a2, sp, 976
+	ldloc.0
+	ldc.i4 976
+	add
+	stloc.3
+	br L_107d054
+// --- basic block ---
+L_107d044:
+// 0x0107d044: 0x107d044: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107d048: 0x107d048: addiu a1, a1, -24856
+	ldloc.2
+	ldc.i4 -24856
+	add
+	stloc.2
+// 0x0107d04c: 0x107d04c: addiu a2, a2, 18768
+	ldloc.3
+	ldc.i4 18768
+	add
+	stloc.3
+// 0x0107d050: 0x107d050: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+L_107d054:
+// 0x0107d054: 0x107d054: jal   0x109ba28 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d05c: 0x107d05c: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x0107d060: 0x107d060: addiu v1, v1, -15564
+	ldloc 6
+	ldc.i4 -15564
+	add
+	stloc 6
+// 0x0107d064: 0x107d064: addu  v0, v1, zero
+	ldloc 6
+	stloc 5
+// 0x0107d068: 0x107d068: lw    a2, 2000(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 500
+	add
+	ldelem.i4
+	stloc.3
+// 0x0107d06c: 0x107d06c: addu  a0, v1, zero
+	ldloc 6
+	stloc.1
+// 0x0107d070: 0x107d070: lw    s3, 4(s1)
+	ldloc 7
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107d074: 0x107d074: lw    a1, 0(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.2
+// 0x0107d078: 0x107d078: j	 0x107d098 addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_107d098
+// --- basic block ---
+L_107d080:
+// 0x0107d080: 0x107d080: lw    a3, 0(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x0107d084: 0x107d084: addiu v1, v1, 1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+// 0x0107d088: 0x107d088: lw    a3, 0(a3)
+	ldloc 7
+	ldloc 4
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 4
+// 0x0107d08c: 0x107d08c: sll   zero, zero, 0
+// 0x0107d090: 0x107d090: beq   a3, a1, 0x107d0cc addiu a0, a0, 4
+	ldloc 4
+	ldloc.2
+	ldloc.1
+	ldc.i4.4
+	add
+	stloc.1
+	beq  L_107d0cc
+// --- basic block ---
+L_107d098:
+// 0x0107d098: 0x107d098: slt   a3, v1, a2
+	ldloc 6
+	ldloc.3
+	clt
+	stloc 4
+// 0x0107d09c: 0x107d09c: bne   a3, zero, 0x107d080 sll   zero, zero, 0
+	ldloc 4
+	brtrue L_107d080
+// --- basic block ---
+// 0x0107d0a4: 0x107d0a4: j	 0x107d0d0 addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+	br L_107d0d0
+// --- basic block ---
+L_107d0ac:
+// 0x0107d0ac: 0x107d0ac: lw    a0, 0(v0)
+	ldloc 7
+	ldloc 5
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0107d0b0: 0x107d0b0: sll   zero, zero, 0
+// 0x0107d0b4: 0x107d0b4: lw    a0, 0(a0)
+	ldloc 7
+	ldloc.1
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.1
+// 0x0107d0b8: 0x107d0b8: sll   zero, zero, 0
+// 0x0107d0bc: 0x107d0bc: bne   a0, a1, 0x107d0d0 addiu v0, v0, 4
+	ldloc.1
+	ldloc.2
+	ldloc 5
+	ldc.i4.4
+	add
+	stloc 5
+	bne.un L_107d0d0
+// --- basic block ---
+// 0x0107d0c4: 0x107d0c4: j	 0x107d0dc sll   zero, zero, 0
+	br L_107d0dc
+// --- basic block ---
+L_107d0cc:
+// 0x0107d0cc: 0x107d0cc: addu  v1, zero, zero
+	ldc.i4.s 0
+	stloc 6
+L_107d0d0:
+// 0x0107d0d0: 0x107d0d0: slt   a0, v1, a2
+	ldloc 6
+	ldloc.3
+	clt
+	stloc.1
+// 0x0107d0d4: 0x107d0d4: bne   a0, zero, 0x107d0ac addiu v1, v1, 1
+	ldloc.1
+	ldloc 6
+	ldc.i4.1
+	add
+	stloc 6
+	brtrue L_107d0ac
+// --- basic block ---
+L_107d0dc:
+// 0x0107d0dc: 0x107d0dc: lw    v1, 4(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107d0e0: 0x107d0e0: addiu v0, zero, 4
+	ldc.i4.4
+	stloc 5
+// 0x0107d0e4: 0x107d0e4: beq   v1, v0, 0x107da74 lui   s4, 0x1080000
+	ldloc 6
+	ldloc 5
+	ldc.i4 17301504
+	stloc 8
+	beq  L_107da74
+// --- basic block ---
+// 0x0107d0ec: 0x107d0ec: addiu a1, s4, -17888
+	ldloc 8
+	ldc.i4 -17888
+	add
+	stloc.2
+// 0x0107d0f0: 0x107d0f0: jal   0x10997bc addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
+// --- basic block ---
+// 0x0107d0f8: 0x107d0f8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d0fc: 0x107d0fc: jal   0x101cd70 addiu a0, a0, -6192
+	ldloc.1
+	ldc.i4 -6192
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d104: 0x107d104: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107d108: 0x107d108: jal   0x109ba7c addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d110: 0x107d110: lw    a1, 16(s3)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldelem.i4
+	stloc.2
+// 0x0107d114: 0x107d114: jal   0x109cc34 addiu a0, s4, -17888
+	ldloc 8
+	ldc.i4 -17888
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d11c: 0x107d11c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+L_107d120:
+// 0x0107d120: 0x107d120: lw    s3, 4(s1)
+	ldloc 7
+	ldloc 11
+	ldc.i4.2
+	shr.un
+	ldc.i4.1
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107d124: 0x107d124: jal   0x101cd70 addiu a0, a0, -14444
+	ldloc.1
+	ldc.i4 -14444
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d12c: 0x107d12c: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107d130: 0x107d130: jal   0x109bb54 addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_set_right_softkey_text_109bb54(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d138: 0x107d138: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107d13c: 0x107d13c: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d140: 0x107d140: jal   0x109b94c addiu a1, a1, -24804
+	ldloc.2
+	ldc.i4 -24804
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d148: 0x107d148: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107d14c: 0x107d14c: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d150: 0x107d150: addiu a1, a1, -24788
+	ldloc.2
+	ldc.i4 -24788
+	add
+	stloc.2
+// 0x0107d154: 0x107d154: jal   0x109b94c addu  s3, v0, zero
+	ldloc 5
+	stloc 10
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d15c: 0x107d15c: addu  s4, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0107d160: 0x107d160: lw    v0, 1620(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 405
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d164: 0x107d164: sll   zero, zero, 0
+// 0x0107d168: 0x107d168: beq   v0, zero, 0x107d1ec addu  a0, s4, zero
+	ldloc 5
+	ldloc 8
+	stloc.1
+	brfalse L_107d1ec
+// --- basic block ---
+// 0x0107d170: 0x107d170: beq   s3, zero, 0x107d224 lui   a1, 0x20000
+	ldloc 10
+	ldc.i4 131072
+	stloc.2
+	brfalse L_107d224
+// --- basic block ---
+// 0x0107d178: 0x107d178: addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+// 0x0107d17c: 0x107d17c: jal   0x109e558 addiu a1, a1, -24768
+	ldloc.2
+	ldc.i4 -24768
+	add
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d184: 0x107d184: lw    a2, 0(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x0107d188: 0x107d188: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x0107d18c: 0x107d18c: addiu a1, zero, 2
+	ldc.i4.2
+	stloc.2
+// 0x0107d190: 0x107d190: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0107d194: 0x107d194: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x0107d198: 0x107d198: sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d19c: 0x107d19c: jal   0x104b544 sw    s3, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 10
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b544(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d1a4: 0x107d1a4: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d1a8: 0x107d1a8: addiu a1, a1, 23008
+	ldloc.2
+	ldc.i4 23008
+	add
+	stloc.2
+// 0x0107d1ac: 0x107d1ac: addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+// 0x0107d1b0: 0x107d1b0: jal   0x1099628 addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d1b8: 0x107d1b8: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d1bc: 0x107d1bc: addiu a1, zero, -20
+	ldc.i4.s -20
+	stloc.2
+// 0x0107d1c0: 0x107d1c0: jal   0x10995cc addiu a2, zero, 12
+	ldc.i4.s 12
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d1c8: 0x107d1c8: lw    v0, 48(s2)
+	ldloc 7
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d1cc: 0x107d1cc: addiu v1, zero, -2
+	ldc.i4.s -2
+	stloc 6
+// 0x0107d1d0: 0x107d1d0: ori   v0, v0, 512
+	ldloc 5
+	ldc.i4 512
+	or
+	stloc 5
+// 0x0107d1d4: 0x107d1d4: and   v0, v0, v1
+	ldloc 5
+	ldloc 6
+	and
+	stloc 5
+// 0x0107d1d8: 0x107d1d8: sw    v0, 48(s2)
+	ldloc 7
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d1dc: 0x107d1dc: jal   0x10996f4 addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d1e4: 0x107d1e4: j	 0x107d228 lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+	br L_107d228
+// --- basic block ---
+L_107d1ec:
+// 0x0107d1ec: 0x107d1ec: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d1f0: 0x107d1f0: jal   0x1099628 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d1f8: 0x107d1f8: lw    v1, 48(s2)
+	ldloc 7
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107d1fc: 0x107d1fc: addiu v0, zero, -513
+	ldc.i4 -513
+	stloc 5
+// 0x0107d200: 0x107d200: and   v0, v1, v0
+	ldloc 6
+	ldloc 5
+	and
+	stloc 5
+// 0x0107d204: 0x107d204: ori   v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	or
+	stloc 5
+// 0x0107d208: 0x107d208: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d20c: 0x107d20c: sw    v0, 48(s2)
+	ldloc 7
+	ldloc 12
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d210: 0x107d210: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d214: 0x107d214: jal   0x10995cc addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d21c: 0x107d21c: jal   0x10996e0 addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
+	stloc 5
+// --- basic block ---
+L_107d224:
+// 0x0107d224: 0x107d224: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+L_107d228:
+// 0x0107d228: 0x107d228: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d22c: 0x107d22c: jal   0x1096534 addiu a0, a0, -26268
+	ldloc.1
+	ldc.i4 -26268
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d234: 0x107d234: jal   0x1095668 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095668(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d23c: 0x107d23c: jal   0x1099640 addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d244: 0x107d244: jal   0x1099690 addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d24c: 0x107d24c: j	 0x107da54 sll   zero, zero, 0
+	br L_107da54
+// --- basic block ---
+L_107d254:
+// 0x0107d254: 0x107d254: lw    a0, 140(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 35
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d258: 0x107d258: jal   0x103543c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl39::roadmap_mood_to_string_103543c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d260: 0x107d260: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107d264: 0x107d264: addiu a0, s3, -24908
+	ldloc 10
+	ldc.i4 -24908
+	add
+	stloc.1
+// 0x0107d268: 0x107d268: jal   0x109e784 addiu a2, zero, 512
+	ldc.i4 512
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d270: 0x107d270: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d274: 0x107d274: addiu a1, sp, 32
+	ldloc.0
+	ldc.i4.s 32
+	add
+	stloc.2
+// 0x0107d278: 0x107d278: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d27c: 0x107d27c: jal   0x1099998 addu  s3, v0, zero
+	ldloc 5
+	stloc 10
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d284: 0x107d284: slt   v0, s2, s4
+	ldloc 12
+	ldloc 8
+	clt
+	stloc 5
+// 0x0107d288: 0x107d288: beq   v0, zero, 0x107d294 sll   zero, zero, 0
+	ldloc 5
+	brfalse L_107d294
+// --- basic block ---
+// 0x0107d290: 0x107d290: addu  s4, s2, zero
+	ldloc 12
+	stloc 8
+L_107d294:
+// 0x0107d294: 0x107d294: lw    v0, 32(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.8
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d298: 0x107d298: lui   s7, 0x10000
+	ldc.i4 65536
+	stloc 14
+// 0x0107d29c: 0x107d29c: subu  s4, s4, v0
+	ldloc 8
+	ldloc 5
+	sub
+	stloc 8
+// 0x0107d2a0: 0x107d2a0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d2a4: 0x107d2a4: subu  a2, s4, s6
+	ldloc 8
+	ldloc 15
+	sub
+	stloc.3
+// 0x0107d2a8: 0x107d2a8: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x0107d2ac: 0x107d2ac: addiu a0, a0, -24744
+	ldloc.1
+	ldc.i4 -24744
+	add
+	stloc.1
+// 0x0107d2b0: 0x107d2b0: addiu a1, s7, 18768
+	ldloc 14
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d2b4: 0x107d2b4: jal   0x1094048 sw    zero, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d2bc: 0x107d2bc: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d2c0: 0x107d2c0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d2c4: 0x107d2c4: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d2c8: 0x107d2c8: jal   0x1099628 addu  s1, v0, zero
+	ldloc 5
+	stloc 11
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d2d0: 0x107d2d0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d2d4: 0x107d2d4: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x0107d2d8: 0x107d2d8: addiu a0, a0, -24724
+	ldloc.1
+	ldc.i4 -24724
+	add
+	stloc.1
+// 0x0107d2dc: 0x107d2dc: addiu a1, s7, 18768
+	ldloc 14
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d2e0: 0x107d2e0: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107d2e4: 0x107d2e4: jal   0x1094048 sw    zero, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d2ec: 0x107d2ec: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d2f0: 0x107d2f0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d2f4: 0x107d2f4: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d2f8: 0x107d2f8: jal   0x1099628 addu  s2, v0, zero
+	ldloc 5
+	stloc 12
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d300: 0x107d300: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d304: 0x107d304: jal   0x101cd70 addiu a0, a0, -24708
+	ldloc.1
+	ldc.i4 -24708
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d30c: 0x107d30c: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d310: 0x107d310: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107d314: 0x107d314: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107d318: 0x107d318: addiu a0, a0, -24696
+	ldloc.1
+	ldc.i4 -24696
+	add
+	stloc.1
+// 0x0107d31c: 0x107d31c: jal   0x1099358 addiu a2, zero, 18
+	ldc.i4.s 18
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d324: 0x107d324: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d328: 0x107d328: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d32c: 0x107d32c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d330: 0x107d330: addiu a1, a1, 23008
+	ldloc.2
+	ldc.i4 23008
+	add
+	stloc.2
+// 0x0107d334: 0x107d334: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d33c: 0x107d33c: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d340: 0x107d340: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d344: 0x107d344: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d34c: 0x107d34c: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d350: 0x107d350: addiu a1, zero, 5
+	ldc.i4.5
+	stloc.2
+// 0x0107d354: 0x107d354: jal   0x1094970 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d35c: 0x107d35c: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d360: 0x107d360: addiu a3, zero, 8
+	ldc.i4.8
+	stloc 4
+// 0x0107d364: 0x107d364: addiu a0, a0, -24888
+	ldloc.1
+	ldc.i4 -24888
+	add
+	stloc.1
+// 0x0107d368: 0x107d368: addiu a1, s0, 32
+	ldloc 9
+	ldc.i4.s 32
+	add
+	stloc.2
+// 0x0107d36c: 0x107d36c: jal   0x1099358 addiu a2, zero, 18
+	ldc.i4.s 18
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d374: 0x107d374: lui   s5, 0x0
+	ldc.i4.s 0
+	stloc 13
+// 0x0107d378: 0x107d378: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d37c: 0x107d37c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d380: 0x107d380: addiu a1, s5, 23000
+	ldloc 13
+	ldc.i4 23000
+	add
+	stloc.2
+// 0x0107d384: 0x107d384: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d38c: 0x107d38c: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d390: 0x107d390: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d394: 0x107d394: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d39c: 0x107d39c: lb    v0, 1520(s0)
+	ldloc 9
+	ldc.i4 1520
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0107d3a0: 0x107d3a0: sll   zero, zero, 0
+// 0x0107d3a4: 0x107d3a4: beq   v0, zero, 0x107d408 lui   s4, 0x20000
+	ldloc 5
+	ldc.i4 131072
+	stloc 8
+	brfalse L_107d408
+// --- basic block ---
+// 0x0107d3ac: 0x107d3ac: addiu s7, sp, 52
+	ldloc.0
+	ldc.i4.s 52
+	add
+	stloc 14
+// 0x0107d3b0: 0x107d3b0: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107d3b4: 0x107d3b4: addu  a0, s7, zero
+	ldloc 14
+	stloc.1
+// 0x0107d3b8: 0x107d3b8: addiu a3, s0, 1520
+	ldloc 9
+	ldc.i4 1520
+	add
+	stloc 4
+// 0x0107d3bc: 0x107d3bc: addiu a2, a2, 14636
+	ldloc.3
+	ldc.i4 14636
+	add
+	stloc.3
+// 0x0107d3c0: 0x107d3c0: jal   0x1000f9c addiu a1, zero, 110
+	ldc.i4.s 110
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d3c8: 0x107d3c8: addu  a1, s7, zero
+	ldloc 14
+	stloc.2
+// 0x0107d3cc: 0x107d3cc: addiu a0, s4, -24872
+	ldloc 8
+	ldc.i4 -24872
+	add
+	stloc.1
+// 0x0107d3d0: 0x107d3d0: addiu a3, zero, 8
+	ldc.i4.8
+	stloc 4
+// 0x0107d3d4: 0x107d3d4: jal   0x1099358 addiu a2, zero, 18
+	ldc.i4.s 18
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d3dc: 0x107d3dc: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d3e0: 0x107d3e0: addiu a1, s5, 23000
+	ldloc 13
+	ldc.i4 23000
+	add
+	stloc.2
+// 0x0107d3e4: 0x107d3e4: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d3e8: 0x107d3e8: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d3f0: 0x107d3f0: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d3f4: 0x107d3f4: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d3f8: 0x107d3f8: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d400: 0x107d400: j	 0x107d448 lui   s4, 0x10000
+	ldc.i4 65536
+	stloc 8
+	br L_107d448
+// --- basic block ---
+L_107d408:
+// 0x0107d408: 0x107d408: addiu a0, s4, -24872
+	ldloc 8
+	ldc.i4 -24872
+	add
+	stloc.1
+// 0x0107d40c: 0x107d40c: addiu a3, zero, 8
+	ldc.i4.8
+	stloc 4
+// 0x0107d410: 0x107d410: addiu a1, s7, 18768
+	ldloc 14
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d414: 0x107d414: jal   0x1099358 addiu a2, zero, 18
+	ldc.i4.s 18
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d41c: 0x107d41c: addu  s4, v0, zero
+	ldloc 5
+	stloc 8
+// 0x0107d420: 0x107d420: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d424: 0x107d424: addiu a1, s5, 23000
+	ldloc 13
+	ldc.i4 23000
+	add
+	stloc.2
+// 0x0107d428: 0x107d428: jal   0x1099628 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d430: 0x107d430: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d434: 0x107d434: jal   0x109950c addu  a1, s4, zero
+	ldloc 8
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d43c: 0x107d43c: jal   0x10996e0 addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
+	stloc 5
+// --- basic block ---
+// 0x0107d444: 0x107d444: lui   s4, 0x10000
+	ldc.i4 65536
+	stloc 8
+L_107d448:
+// 0x0107d448: 0x107d448: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d44c: 0x107d44c: addiu a3, zero, 5
+	ldc.i4.5
+	stloc 4
+// 0x0107d450: 0x107d450: addiu a0, a0, 1760
+	ldloc.1
+	ldc.i4 1760
+	add
+	stloc.1
+// 0x0107d454: 0x107d454: addiu a1, s4, 18768
+	ldloc 8
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d458: 0x107d458: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107d45c: 0x107d45c: addiu v0, zero, 8
+	ldc.i4.8
+	stloc 5
+// 0x0107d460: 0x107d460: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d468: 0x107d468: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d46c: 0x107d46c: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d470: 0x107d470: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d474: 0x107d474: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d47c: 0x107d47c: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d480: 0x107d480: addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+// 0x0107d484: 0x107d484: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d48c: 0x107d48c: lb    v0, 156(s0)
+	ldloc 9
+	ldc.i4 156
+	add
+	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
+	stloc 5
+// 0x0107d490: 0x107d490: sll   zero, zero, 0
+// 0x0107d494: 0x107d494: beq   v0, zero, 0x107d5d4 lui   a0, 0x20000
+	ldloc 5
+	ldc.i4 131072
+	stloc.1
+	brfalse L_107d5d4
+// --- basic block ---
+// 0x0107d49c: 0x107d49c: jal   0x108e1d4 sb    zero, 276(sp)
+	ldloc.0
+	ldc.i4 276
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl105::RealtimePrivacyState_108e1d4(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d4a4: 0x107d4a4: addiu v1, zero, 1
+	ldc.i4.1
+	stloc 6
+// 0x0107d4a8: 0x107d4a8: lui   s7, 0x20000
+	ldc.i4 131072
+	stloc 14
+// 0x0107d4ac: 0x107d4ac: bne   v0, v1, 0x107d4ec addiu s4, sp, 276
+	ldloc 5
+	ldloc 6
+	ldloc.0
+	ldc.i4 276
+	add
+	stloc 8
+	bne.un L_107d4ec
+// --- basic block ---
+// 0x0107d4b4: 0x107d4b4: jal   0x1001b48 addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d4bc: 0x107d4bc: addiu a0, s7, -24840
+	ldloc 14
+	ldc.i4 -24840
+	add
+	stloc.1
+// 0x0107d4c0: 0x107d4c0: jal   0x101cd70 addu  s5, v0, zero
+	ldloc 5
+	stloc 13
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d4c8: 0x107d4c8: addiu a1, zero, 700
+	ldc.i4 700
+	stloc.2
+// 0x0107d4cc: 0x107d4cc: lui   a2, 0x10000
+	ldc.i4 65536
+	stloc.3
+// 0x0107d4d0: 0x107d4d0: subu  a1, a1, s5
+	ldloc.2
+	ldloc 13
+	sub
+	stloc.2
+// 0x0107d4d4: 0x107d4d4: addu  a0, s4, s5
+	ldloc 8
+	ldloc 13
+	add
+	stloc.1
+// 0x0107d4d8: 0x107d4d8: addiu a2, a2, 740
+	ldloc.3
+	ldc.i4 740
+	add
+	stloc.3
+// 0x0107d4dc: 0x107d4dc: jal   0x1000f9c addu  a3, v0, zero
+	ldloc 5
+	stloc 4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d4e4: 0x107d4e4: j	 0x107d52c lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+	br L_107d52c
+// --- basic block ---
+L_107d4ec:
+// 0x0107d4ec: 0x107d4ec: jal   0x1001b48 addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+	ldloc.1
+	call int32 Cibyl1::strlen_1001b48(int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d4f4: 0x107d4f4: addiu a0, s7, -24840
+	ldloc 14
+	ldc.i4 -24840
+	add
+	stloc.1
+// 0x0107d4f8: 0x107d4f8: jal   0x101cd70 addu  s5, v0, zero
+	ldloc 5
+	stloc 13
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d500: 0x107d500: jal   0x106b204 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl79::Realtime_GetNickName_106b204(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d508: 0x107d508: addiu a1, zero, 700
+	ldc.i4 700
+	stloc.2
+// 0x0107d50c: 0x107d50c: lui   a2, 0x20000
+	ldc.i4 131072
+	stloc.3
+// 0x0107d510: 0x107d510: lw    a3, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 4
+// 0x0107d514: 0x107d514: subu  a1, a1, s5
+	ldloc.2
+	ldloc 13
+	sub
+	stloc.2
+// 0x0107d518: 0x107d518: addu  a0, s4, s5
+	ldloc 8
+	ldloc 13
+	add
+	stloc.1
+// 0x0107d51c: 0x107d51c: addiu a2, a2, -24836
+	ldloc.3
+	ldc.i4 -24836
+	add
+	stloc.3
+// 0x0107d520: 0x107d520: jal   0x1000f9c sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl::snprintf_1000f9c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d528: 0x107d528: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+L_107d52c:
+// 0x0107d52c: 0x107d52c: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107d530: 0x107d530: addiu a0, a0, -24828
+	ldloc.1
+	ldc.i4 -24828
+	add
+	stloc.1
+// 0x0107d534: 0x107d534: addiu a1, sp, 276
+	ldloc.0
+	ldc.i4 276
+	add
+	stloc.2
+// 0x0107d538: 0x107d538: jal   0x1099358 addiu a2, zero, 18
+	ldc.i4.s 18
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d540: 0x107d540: lui   s4, 0x0
+	ldc.i4.s 0
+	stloc 8
+// 0x0107d544: 0x107d544: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d548: 0x107d548: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d54c: 0x107d54c: addiu a1, s4, 23008
+	ldloc 8
+	ldc.i4 23008
+	add
+	stloc.2
+// 0x0107d550: 0x107d550: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d558: 0x107d558: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d55c: 0x107d55c: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d560: 0x107d560: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d568: 0x107d568: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107d56c: 0x107d56c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d570: 0x107d570: addiu a3, zero, 5
+	ldc.i4.5
+	stloc 4
+// 0x0107d574: 0x107d574: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d578: 0x107d578: addiu a0, a0, 1760
+	ldloc.1
+	ldc.i4 1760
+	add
+	stloc.1
+// 0x0107d57c: 0x107d57c: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107d580: 0x107d580: addiu v0, zero, 8
+	ldc.i4.8
+	stloc 5
+// 0x0107d584: 0x107d584: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d58c: 0x107d58c: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d590: 0x107d590: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d594: 0x107d594: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d598: 0x107d598: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d5a0: 0x107d5a0: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d5a4: 0x107d5a4: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d5a8: 0x107d5a8: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d5b0: 0x107d5b0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d5b4: 0x107d5b4: addiu a0, a0, -24856
+	ldloc.1
+	ldc.i4 -24856
+	add
+	stloc.1
+// 0x0107d5b8: 0x107d5b8: addiu a1, s0, 156
+	ldloc 9
+	ldc.i4 156
+	add
+	stloc.2
+// 0x0107d5bc: 0x107d5bc: addiu a3, zero, 8
+	ldc.i4.8
+	stloc 4
+// 0x0107d5c0: 0x107d5c0: jal   0x1099358 addiu a2, zero, 18
+	ldc.i4.s 18
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d5c8: 0x107d5c8: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d5cc: 0x107d5cc: j	 0x107d634 addiu a1, s4, 23008
+	ldloc 8
+	ldc.i4 23008
+	add
+	stloc.2
+	br L_107d634
+// --- basic block ---
+L_107d5d4:
+// 0x0107d5d4: 0x107d5d4: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107d5d8: 0x107d5d8: addiu a0, a0, -24828
+	ldloc.1
+	ldc.i4 -24828
+	add
+	stloc.1
+// 0x0107d5dc: 0x107d5dc: addiu a1, s4, 18768
+	ldloc 8
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d5e0: 0x107d5e0: jal   0x1099358 addiu a2, zero, 18
+	ldc.i4.s 18
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d5e8: 0x107d5e8: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d5ec: 0x107d5ec: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d5f0: 0x107d5f0: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d5f4: 0x107d5f4: addiu a1, a1, 23008
+	ldloc.2
+	ldc.i4 23008
+	add
+	stloc.2
+// 0x0107d5f8: 0x107d5f8: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d600: 0x107d600: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d604: 0x107d604: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d608: 0x107d608: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d610: 0x107d610: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d614: 0x107d614: addiu a1, s4, 18768
+	ldloc 8
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d618: 0x107d618: addiu a0, a0, -24856
+	ldloc.1
+	ldc.i4 -24856
+	add
+	stloc.1
+// 0x0107d61c: 0x107d61c: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107d620: 0x107d620: jal   0x1099358 addiu a2, zero, 20
+	ldc.i4.s 20
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d628: 0x107d628: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d62c: 0x107d62c: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d630: 0x107d630: addiu a1, a1, 23000
+	ldloc.2
+	ldc.i4 23000
+	add
+	stloc.2
+L_107d634:
+// 0x0107d634: 0x107d634: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d638: 0x107d638: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d640: 0x107d640: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d644: 0x107d644: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d648: 0x107d648: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d650: 0x107d650: addu  a1, s2, zero
+	ldloc 12
+	stloc.2
+// 0x0107d654: 0x107d654: jal   0x109950c addu  a0, s1, zero
+	ldloc 11
+	stloc.1
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d65c: 0x107d65c: sb    zero, 276(sp)
+	ldloc.0
+	ldc.i4 276
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+// 0x0107d660: 0x107d660: lw    t0, 0(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc 17
+// 0x0107d664: 0x107d664: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x0107d668: 0x107d668: sw    t0, -13540(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3385
+	add
+	ldloc 17
+	stelem.i4
+// 0x0107d66c: 0x107d66c: lui   s2, 0x10000
+	ldc.i4 65536
+	stloc 12
+// 0x0107d670: 0x107d670: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x0107d674: 0x107d674: lui   v1, 0x80000
+	ldc.i4 524288
+	stloc 6
+// 0x0107d678: 0x107d678: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d67c: 0x107d67c: sw    v0, -13536(v1)
+	ldloc 7
+	ldloc 6
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3384
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d680: 0x107d680: addiu a0, a0, -26268
+	ldloc.1
+	ldc.i4 -26268
+	add
+	stloc.1
+// 0x0107d684: 0x107d684: addiu a1, s2, 18768
+	ldloc 12
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d688: 0x107d688: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d68c: 0x107d68c: addiu a3, zero, -2
+	ldc.i4.s -2
+	stloc 4
+// 0x0107d690: 0x107d690: sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d694: 0x107d694: lui   v0, 0x12000000
+	ldc.i4 301989888
+	stloc 5
+// 0x0107d698: 0x107d698: sw    v0, 24(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.6
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d69c: 0x107d69c: jal   0x109eb38 sw    zero, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d6a4: 0x107d6a4: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d6a8: 0x107d6a8: addiu v1, zero, 15
+	ldc.i4.s 15
+	stloc 6
+// 0x0107d6ac: 0x107d6ac: lui   s4, 0x80000
+	ldc.i4 524288
+	stloc 8
+// 0x0107d6b0: 0x107d6b0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d6b4: 0x107d6b4: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d6b8: 0x107d6b8: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107d6bc: 0x107d6bc: sw    v1, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 6
+	stelem.i4
+// 0x0107d6c0: 0x107d6c0: jal   0x1099818 sw    v0, -15616(s4)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_1099818(int32,int32,int32,int32,int32)
+	stloc 5
+// --- basic block ---
+// 0x0107d6c8: 0x107d6c8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d6cc: 0x107d6cc: addiu a3, zero, 5
+	ldc.i4.5
+	stloc 4
+// 0x0107d6d0: 0x107d6d0: addiu a0, a0, 1760
+	ldloc.1
+	ldc.i4 1760
+	add
+	stloc.1
+// 0x0107d6d4: 0x107d6d4: addiu a1, s2, 18768
+	ldloc 12
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d6d8: 0x107d6d8: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107d6dc: 0x107d6dc: addiu v0, zero, 8
+	ldc.i4.8
+	stloc 5
+// 0x0107d6e0: 0x107d6e0: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d6e8: 0x107d6e8: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d6ec: 0x107d6ec: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d6f0: 0x107d6f0: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d6f4: 0x107d6f4: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d6fc: 0x107d6fc: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d700: 0x107d700: lw    a0, -15616(s4)
+	ldloc 7
+	ldloc 8
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d704: 0x107d704: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d70c: 0x107d70c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d710: 0x107d710: addiu a1, s2, 18768
+	ldloc 12
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d714: 0x107d714: addiu a0, a0, 9036
+	ldloc.1
+	ldc.i4 9036
+	add
+	stloc.1
+// 0x0107d718: 0x107d718: addu  a2, s6, zero
+	ldloc 15
+	stloc.3
+// 0x0107d71c: 0x107d71c: addiu a3, zero, -1
+	ldc.i4.m1
+	stloc 4
+// 0x0107d720: 0x107d720: addiu v0, zero, 2
+	ldc.i4.2
+	stloc 5
+// 0x0107d724: 0x107d724: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d72c: 0x107d72c: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d730: 0x107d730: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d734: 0x107d734: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d738: 0x107d738: jal   0x1099628 addu  s4, v0, zero
+	ldloc 5
+	stloc 8
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d740: 0x107d740: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
+	stloc 5
+// --- basic block ---
+// 0x0107d748: 0x107d748: beq   v0, zero, 0x107d758 addiu a3, zero, 77
+	ldloc 5
+	ldc.i4.s 77
+	stloc 4
+	brfalse L_107d758
+// --- basic block ---
+// 0x0107d750: 0x107d750: j	 0x107d760 addiu a2, zero, 77
+	ldc.i4.s 77
+	stloc.3
+	br L_107d760
+// --- basic block ---
+L_107d758:
+// 0x0107d758: 0x107d758: addiu a3, zero, 52
+	ldc.i4.s 52
+	stloc 4
+// 0x0107d75c: 0x107d75c: addiu a2, zero, 52
+	ldc.i4.s 52
+	stloc.3
+L_107d760:
+// 0x0107d760: 0x107d760: lui   s7, 0x10000
+	ldc.i4 65536
+	stloc 14
+// 0x0107d764: 0x107d764: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d768: 0x107d768: addiu a0, a0, -24788
+	ldloc.1
+	ldc.i4 -24788
+	add
+	stloc.1
+// 0x0107d76c: 0x107d76c: addiu a1, s7, 18768
+	ldloc 14
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d770: 0x107d770: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107d774: 0x107d774: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d77c: 0x107d77c: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d780: 0x107d780: addiu a1, a1, 23008
+	ldloc.2
+	ldc.i4 23008
+	add
+	stloc.2
+// 0x0107d784: 0x107d784: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d788: 0x107d788: addu  a2, a1, zero
+	ldloc.2
+	stloc.3
+// 0x0107d78c: 0x107d78c: jal   0x1099628 addu  s2, v0, zero
+	ldloc 5
+	stloc 12
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d794: 0x107d794: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107d798: 0x107d798: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d79c: 0x107d79c: addiu a1, a1, -24768
+	ldloc.2
+	ldc.i4 -24768
+	add
+	stloc.2
+// 0x0107d7a0: 0x107d7a0: addiu a0, a0, -24804
+	ldloc.1
+	ldc.i4 -24804
+	add
+	stloc.1
+// 0x0107d7a4: 0x107d7a4: jal   0x109e784 addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d7ac: 0x107d7ac: addu  s5, v0, zero
+	ldloc 5
+	stloc 13
+// 0x0107d7b0: 0x107d7b0: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d7b4: 0x107d7b4: addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+// 0x0107d7b8: 0x107d7b8: jal   0x10995cc addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d7c0: 0x107d7c0: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d7c4: 0x107d7c4: jal   0x109950c addu  a1, s5, zero
+	ldloc 13
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d7cc: 0x107d7cc: addiu a2, zero, 12
+	ldc.i4.s 12
+	stloc.3
+// 0x0107d7d0: 0x107d7d0: addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+// 0x0107d7d4: 0x107d7d4: jal   0x10995cc addiu a1, zero, -20
+	ldc.i4.s -20
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d7dc: 0x107d7dc: addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+// 0x0107d7e0: 0x107d7e0: jal   0x109950c addu  a1, s2, zero
+	ldloc 12
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d7e8: 0x107d7e8: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d7ec: 0x107d7ec: addiu a3, zero, 7
+	ldc.i4.7
+	stloc 4
+// 0x0107d7f0: 0x107d7f0: addiu a1, s7, 18768
+	ldloc 14
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d7f4: 0x107d7f4: addu  a2, s6, zero
+	ldloc 15
+	stloc.3
+// 0x0107d7f8: 0x107d7f8: addiu a0, a0, 1760
+	ldloc.1
+	ldc.i4 1760
+	add
+	stloc.1
+// 0x0107d7fc: 0x107d7fc: jal   0x1094048 sw    zero, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d804: 0x107d804: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d808: 0x107d808: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d80c: 0x107d80c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d810: 0x107d810: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d818: 0x107d818: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d81c: 0x107d81c: addu  a0, s4, zero
+	ldloc 8
+	stloc.1
+// 0x0107d820: 0x107d820: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d828: 0x107d828: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d82c: 0x107d82c: jal   0x109950c addu  a1, s3, zero
+	ldloc 10
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d834: 0x107d834: lw    v0, 1620(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 405
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d838: 0x107d838: sll   zero, zero, 0
+// 0x0107d83c: 0x107d83c: beq   v0, zero, 0x107d868 addiu a3, zero, -1
+	ldloc 5
+	ldc.i4.m1
+	stloc 4
+	brfalse L_107d868
+// --- basic block ---
+// 0x0107d844: 0x107d844: lw    a2, 0(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldelem.i4
+	stloc.3
+// 0x0107d848: 0x107d848: addiu a0, zero, 1
+	ldc.i4.1
+	stloc.1
+// 0x0107d84c: 0x107d84c: addiu a1, zero, 2
+	ldc.i4.2
+	stloc.2
+// 0x0107d850: 0x107d850: addiu v0, zero, -1
+	ldc.i4.m1
+	stloc 5
+// 0x0107d854: 0x107d854: sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d858: 0x107d858: jal   0x104b544 sw    s5, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 13
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b544(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d860: 0x107d860: j	 0x107d8a8 addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+	br L_107d8a8
+// --- basic block ---
+L_107d868:
+// 0x0107d868: 0x107d868: addu  a0, s2, zero
+	ldloc 12
+	stloc.1
+// 0x0107d86c: 0x107d86c: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d870: 0x107d870: jal   0x1099628 addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d878: 0x107d878: lw    v1, 48(s3)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldelem.i4
+	stloc 6
+// 0x0107d87c: 0x107d87c: addiu v0, zero, -513
+	ldc.i4 -513
+	stloc 5
+// 0x0107d880: 0x107d880: and   v0, v1, v0
+	ldloc 6
+	ldloc 5
+	and
+	stloc 5
+// 0x0107d884: 0x107d884: ori   v0, v0, 1
+	ldloc 5
+	ldc.i4.1
+	or
+	stloc 5
+// 0x0107d888: 0x107d888: addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+// 0x0107d88c: 0x107d88c: sw    v0, 48(s3)
+	ldloc 7
+	ldloc 10
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d890: 0x107d890: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d894: 0x107d894: jal   0x10995cc addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d89c: 0x107d89c: jal   0x10996e0 addu  a0, s5, zero
+	ldloc 13
+	stloc.1
+	ldloc.1
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
+	stloc 5
+// --- basic block ---
+// 0x0107d8a4: 0x107d8a4: addu  a0, s0, zero
+	ldloc 9
+	stloc.1
+L_107d8a8:
+// 0x0107d8a8: 0x107d8a8: addiu a1, sp, 276
+	ldloc.0
+	ldc.i4 276
+	add
+	stloc.2
+// 0x0107d8ac: 0x107d8ac: lui   s0, 0x80000
+	ldc.i4 524288
+	stloc 9
+// 0x0107d8b0: 0x107d8b0: jal   0x107cca8 sb    zero, 276(sp)
+	ldloc.0
+	ldc.i4 276
+	add
+	ldc.i4.s 0
+	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl93::T_412_107cca8(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d8b8: 0x107d8b8: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d8bc: 0x107d8bc: jal   0x109950c addu  a1, s4, zero
+	ldloc 8
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d8c4: 0x107d8c4: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d8c8: 0x107d8c8: jal   0x109950c addu  a1, s1, zero
+	ldloc 11
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d8d0: 0x107d8d0: lui   a1, 0x10000
+	ldc.i4 65536
+	stloc.2
+// 0x0107d8d4: 0x107d8d4: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d8d8: 0x107d8d8: addiu a3, zero, 5
+	ldc.i4.5
+	stloc 4
+// 0x0107d8dc: 0x107d8dc: addiu a1, a1, 18768
+	ldloc.2
+	ldc.i4 18768
+	add
+	stloc.2
+// 0x0107d8e0: 0x107d8e0: addiu a0, a0, 1760
+	ldloc.1
+	ldc.i4 1760
+	add
+	stloc.1
+// 0x0107d8e4: 0x107d8e4: addiu a2, zero, -1
+	ldc.i4.m1
+	stloc.3
+// 0x0107d8e8: 0x107d8e8: addiu v0, zero, 8
+	ldc.i4.8
+	stloc 5
+// 0x0107d8ec: 0x107d8ec: jal   0x1094048 sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d8f4: 0x107d8f4: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107d8f8: 0x107d8f8: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107d8fc: 0x107d8fc: addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+// 0x0107d900: 0x107d900: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107d908: 0x107d908: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107d90c: 0x107d90c: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d910: 0x107d910: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d918: 0x107d918: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d91c: 0x107d91c: jal   0x101cd70 addiu a0, a0, -24684
+	ldloc.1
+	ldc.i4 -24684
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d924: 0x107d924: lui   a3, 0x1080000
+	ldc.i4 17301504
+	stloc 4
+// 0x0107d928: 0x107d928: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d92c: 0x107d92c: addiu a3, a3, -27672
+	ldloc 4
+	ldc.i4 -27672
+	add
+	stloc 4
+// 0x0107d930: 0x107d930: addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+// 0x0107d934: 0x107d934: addiu a0, a0, -24676
+	ldloc.1
+	ldc.i4 -24676
+	add
+	stloc.1
+// 0x0107d938: 0x107d938: jal   0x10916ac addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d940: 0x107d940: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d944: 0x107d944: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d94c: 0x107d94c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d950: 0x107d950: jal   0x101cd70 addiu a0, a0, 840
+	ldloc.1
+	ldc.i4 840
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d958: 0x107d958: lui   a3, 0x1080000
+	ldc.i4 17301504
+	stloc 4
+// 0x0107d95c: 0x107d95c: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107d960: 0x107d960: addiu a3, a3, -25384
+	ldloc 4
+	ldc.i4 -25384
+	add
+	stloc 4
+// 0x0107d964: 0x107d964: addiu a2, zero, 1
+	ldc.i4.1
+	stloc.3
+// 0x0107d968: 0x107d968: addiu a0, a0, 848
+	ldloc.1
+	ldc.i4 848
+	add
+	stloc.1
+// 0x0107d96c: 0x107d96c: jal   0x10916ac addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d974: 0x107d974: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d978: 0x107d978: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d980: 0x107d980: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0107d984: 0x107d984: addiu v0, v0, -24660
+	ldloc 5
+	ldc.i4 -24660
+	add
+	stloc 5
+// 0x0107d988: 0x107d988: sw    v0, 40(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 10
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d98c: 0x107d98c: lui   v0, 0x20000
+	ldc.i4 131072
+	stloc 5
+// 0x0107d990: 0x107d990: addiu v0, v0, -24640
+	ldloc 5
+	ldc.i4 -24640
+	add
+	stloc 5
+// 0x0107d994: 0x107d994: sw    v0, 44(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 11
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d998: 0x107d998: addiu v0, zero, 1
+	ldc.i4.1
+	stloc 5
+// 0x0107d99c: 0x107d99c: sw    v0, 16(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.4
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d9a0: 0x107d9a0: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d9a4: 0x107d9a4: lui   a1, 0x20000
+	ldc.i4 131072
+	stloc.2
+// 0x0107d9a8: 0x107d9a8: lui   v0, 0x1080000
+	ldc.i4 17301504
+	stloc 5
+// 0x0107d9ac: 0x107d9ac: addiu a3, zero, 2
+	ldc.i4.2
+	stloc 4
+// 0x0107d9b0: 0x107d9b0: addiu a2, sp, 40
+	ldloc.0
+	ldc.i4.s 40
+	add
+	stloc.3
+// 0x0107d9b4: 0x107d9b4: addiu a0, a0, -24612
+	ldloc.1
+	ldc.i4 -24612
+	add
+	stloc.1
+// 0x0107d9b8: 0x107d9b8: addiu a1, a1, -24592
+	ldloc.2
+	ldc.i4 -24592
+	add
+	stloc.2
+// 0x0107d9bc: 0x107d9bc: addiu v0, v0, -17096
+	ldloc 5
+	ldc.i4 -17096
+	add
+	stloc 5
+// 0x0107d9c0: 0x107d9c0: sw    v0, 20(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.5
+	add
+	ldloc 5
+	stelem.i4
+// 0x0107d9c4: 0x107d9c4: jal   0x10914f0 sw    zero, 48(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4.s 12
+	add
+	ldc.i4.s 0
+	stelem.i4
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d9cc: 0x107d9cc: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d9d0: 0x107d9d0: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d9d8: 0x107d9d8: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107d9dc: 0x107d9dc: addiu a1, zero, 3
+	ldc.i4.3
+	stloc.2
+// 0x0107d9e0: 0x107d9e0: jal   0x109490c addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d9e8: 0x107d9e8: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d9ec: 0x107d9ec: jal   0x101cd70 addiu a0, a0, -24580
+	ldloc.1
+	ldc.i4 -24580
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107d9f4: 0x107d9f4: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107d9f8: 0x107d9f8: addu  a3, zero, zero
+	ldc.i4.s 0
+	stloc 4
+// 0x0107d9fc: 0x107d9fc: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107da00: 0x107da00: addiu a0, a0, -24544
+	ldloc.1
+	ldc.i4 -24544
+	add
+	stloc.1
+// 0x0107da04: 0x107da04: jal   0x1099358 addiu a2, zero, 12
+	ldc.i4.s 12
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107da0c: 0x107da0c: lui   a1, 0x0
+	ldc.i4.s 0
+	stloc.2
+// 0x0107da10: 0x107da10: addu  a0, v0, zero
+	ldloc 5
+	stloc.1
+// 0x0107da14: 0x107da14: addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+// 0x0107da18: 0x107da18: addiu a1, a1, 23008
+	ldloc.2
+	ldc.i4 23008
+	add
+	stloc.2
+// 0x0107da1c: 0x107da1c: jal   0x1099628 sw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldloc 5
+	stelem.i4
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
+// --- basic block ---
+// 0x0107da24: 0x107da24: lw    v0, 1680(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 420
+	add
+	ldelem.i4
+	stloc 5
+// 0x0107da28: 0x107da28: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107da2c: 0x107da2c: jal   0x109950c addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107da34: 0x107da34: lw    a0, -15616(s0)
+	ldloc 7
+	ldloc 9
+	ldc.i4.2
+	shr.un
+	ldc.i4 -3904
+	add
+	ldelem.i4
+	stloc.1
+// 0x0107da38: 0x107da38: addiu a1, zero, 3
+	ldc.i4.3
+	stloc.2
+// 0x0107da3c: 0x107da3c: jal   0x109490c addu  a2, zero, zero
+	ldc.i4.s 0
+	stloc.3
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107da44: 0x107da44: lui   a0, 0x20000
+	ldc.i4 131072
+	stloc.1
+// 0x0107da48: 0x107da48: addiu a0, a0, -26268
+	ldloc.1
+	ldc.i4 -26268
+	add
+	stloc.1
+// 0x0107da4c: 0x107da4c: jal   0x1096534 addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+L_107da54:
+// 0x0107da54: 0x107da54: jal   0x102147c sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107da5c: 0x107da5c: bne   v0, zero, 0x107daa0 sll   zero, zero, 0
+	ldloc 5
+	brtrue L_107daa0
+// --- basic block ---
+// 0x0107da64: 0x107da64: jal   0x1021910 sll   zero, zero, 0
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107da6c: 0x107da6c: j	 0x107daa0 sll   zero, zero, 0
+	br L_107daa0
+// --- basic block ---
+L_107da74:
+// 0x0107da74: 0x107da74: addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+// 0x0107da78: 0x107da78: jal   0x10997bc addu  a1, zero, zero
+	ldc.i4.s 0
+	stloc.2
+	ldloc.1
+	ldloc.2
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
+// --- basic block ---
+// 0x0107da80: 0x107da80: lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+// 0x0107da84: 0x107da84: jal   0x101cd70 addiu a0, a0, 18768
+	ldloc.1
+	ldc.i4 18768
+	add
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107da8c: 0x107da8c: addu  a1, v0, zero
+	ldloc 5
+	stloc.2
+// 0x0107da90: 0x107da90: jal   0x109ba7c addu  a0, s3, zero
+	ldloc 10
+	stloc.1
+	ldloc.0
+	ldloc.1
+	ldloc.2
+	ldloc.3
+	ldloc 4
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
+	ldsfld int32 [WazeWP7]CRunTime::saved_v1
+	stloc 6
+	stloc 5
+// --- basic block ---
+// 0x0107da98: 0x107da98: j	 0x107d120 lui   a0, 0x10000
+	ldc.i4 65536
+	stloc.1
+	br L_107d120
+// --- basic block ---
+L_107daa0:
+// 0x0107daa0: 0x107daa0: lw    ra, 1724(sp)
+// 0x0107daa4: 0x107daa4: lw    s7, 1720(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 430
+	add
+	ldelem.i4
+	stloc 14
+// 0x0107daa8: 0x107daa8: lw    s6, 1716(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 429
+	add
+	ldelem.i4
+	stloc 15
+// 0x0107daac: 0x107daac: lw    s5, 1712(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 428
+	add
+	ldelem.i4
+	stloc 13
+// 0x0107dab0: 0x107dab0: lw    s4, 1708(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 427
+	add
+	ldelem.i4
+	stloc 8
+// 0x0107dab4: 0x107dab4: lw    s3, 1704(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 426
+	add
+	ldelem.i4
+	stloc 10
+// 0x0107dab8: 0x107dab8: lw    s2, 1700(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 425
+	add
+	ldelem.i4
+	stloc 12
+// 0x0107dabc: 0x107dabc: lw    s1, 1696(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 424
+	add
+	ldelem.i4
+	stloc 11
+// 0x0107dac0: 0x107dac0: lw    s0, 1692(sp)
+	ldloc 7
+	ldloc.0
+	ldc.i4.2
+	shr.un
+	ldc.i4 423
+	add
+	ldelem.i4
+	stloc 9
+// 0x0107dac4: 0x107dac4: jr    ra addiu sp, sp, 1728
+	ldloc.0
+	ldc.i4 1728
+	add
+	stloc.0
+	br __CIBYL_function_return
+__CIBYL_function_return:
+	ldloc 6
+	stsfld int32 [WazeWP7]CRunTime::saved_v1
+	ldloc 5
+	ret
+}
+.method public static int32 RTAlerts_popup_alert_107dacc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s2,int32 s1,int32 s0,int32 s3,int32 s4,int32 s5,int32 s7,int32 s8,int32 s6,int32 t0,int32 ra,int32 lo)
@@ -109,15 +4331,15 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107d4a8: 0x107d4a8: addiu sp, sp, -1888
+// 0x0107dacc: 0x107dacc: addiu sp, sp, -1888
 	ldloc.0
 	ldc.i4 -1888
 	add
 	stloc.0
-// 0x0107d4ac: 0x107d4ac: lui   v0, 0xf0000
+// 0x0107dad0: 0x107dad0: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0107d4b0: 0x107d4b0: sw    s4, 1864(sp)
+// 0x0107dad4: 0x107dad4: sw    s4, 1864(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -126,19 +4348,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0107d4b4: 0x107d4b4: lw    s4, -30068(v0)
+// 0x0107dad8: 0x107dad8: lw    s4, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 12
-// 0x0107d4b8: 0x107d4b8: lui   v0, 0xf0000
+// 0x0107dadc: 0x107dadc: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x0107d4bc: 0x107d4bc: sw    s5, 1868(sp)
+// 0x0107dae0: 0x107dae0: sw    s5, 1868(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -147,7 +4369,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0107d4c0: 0x107d4c0: sw    s3, 1860(sp)
+// 0x0107dae4: 0x107dae4: sw    s3, 1860(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -156,7 +4378,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0107d4c4: 0x107d4c4: sw    s1, 1852(sp)
+// 0x0107dae8: 0x107dae8: sw    s1, 1852(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -165,8 +4387,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107d4c8: 0x107d4c8: sw    ra, 1884(sp)
-// 0x0107d4cc: 0x107d4cc: sw    s8, 1880(sp)
+// 0x0107daec: 0x107daec: sw    ra, 1884(sp)
+// 0x0107daf0: 0x107daf0: sw    s8, 1880(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -175,7 +4397,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0107d4d0: 0x107d4d0: sw    s7, 1876(sp)
+// 0x0107daf4: 0x107daf4: sw    s7, 1876(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -184,7 +4406,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0107d4d4: 0x107d4d4: sw    s6, 1872(sp)
+// 0x0107daf8: 0x107daf8: sw    s6, 1872(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -193,7 +4415,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0107d4d8: 0x107d4d8: sw    s2, 1856(sp)
+// 0x0107dafc: 0x107dafc: sw    s2, 1856(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -202,7 +4424,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107d4dc: 0x107d4dc: sw    s0, 1848(sp)
+// 0x0107db00: 0x107db00: sw    s0, 1848(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -211,69 +4433,69 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107d4e0: 0x107d4e0: addu  s5, a0, zero
+// 0x0107db04: 0x107db04: addu  s5, a0, zero
 	ldloc.1
 	stloc 13
-// 0x0107d4e4: 0x107d4e4: sb    zero, 420(sp)
+// 0x0107db08: 0x107db08: sb    zero, 420(sp)
 	ldloc.0
 	ldc.i4 420
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107d4e8: 0x107d4e8: lw    s3, -30072(v0)
+// 0x0107db0c: 0x107db0c: lw    s3, -29608(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7518
+	ldc.i4 -7402
 	add
 	ldelem.i4
 	stloc 11
-// 0x0107d4ec: 0x107d4ec: jal   0x101de10 addu  s1, a1, zero
+// 0x0107db10: 0x107db10: jal   0x101de20 addu  s1, a1, zero
 	ldloc.2
 	stloc 9
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d4f4: 0x107d4f4: lui   v0, 0x80000
+// 0x0107db18: 0x107db18: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107d4f8: 0x107d4f8: lw    v0, -14028(v0)
+// 0x0107db1c: 0x107db1c: lw    v0, -13564(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107d4fc: 0x107d4fc: sll   zero, zero, 0
-// 0x0107d500: 0x107d500: beq   v0, zero, 0x107e864 sll   zero, zero, 0
+// 0x0107db20: 0x107db20: sll   zero, zero, 0
+// 0x0107db24: 0x107db24: beq   v0, zero, 0x107ee88 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107e864
+	brfalse L_107ee88
 // --- basic block ---
-// 0x0107d508: 0x107d508: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0107db2c: 0x107db2c: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0107d510: 0x107d510: beq   v0, zero, 0x107d52c addiu a1, zero, 52
+// 0x0107db34: 0x107db34: beq   v0, zero, 0x107db50 addiu a1, zero, 52
 	ldloc 5
 	ldc.i4.s 52
 	stloc.2
-	brfalse L_107d52c
+	brfalse L_107db50
 // --- basic block ---
-// 0x0107d518: 0x107d518: addiu v0, zero, 77
+// 0x0107db3c: 0x107db3c: addiu v0, zero, 77
 	ldc.i4.s 77
 	stloc 5
-// 0x0107d51c: 0x107d51c: addiu s7, zero, 52
+// 0x0107db40: 0x107db40: addiu s7, zero, 52
 	ldc.i4.s 52
 	stloc 14
-// 0x0107d520: 0x107d520: addiu s6, zero, 52
+// 0x0107db44: 0x107db44: addiu s6, zero, 52
 	ldc.i4.s 52
 	stloc 16
-// 0x0107d524: 0x107d524: j	 0x107d538 sw    v0, 1828(sp)
+// 0x0107db48: 0x107db48: j	 0x107db5c sw    v0, 1828(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -282,16 +4504,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-	br L_107d538
+	br L_107db5c
 // --- basic block ---
-L_107d52c:
-// 0x0107d52c: 0x107d52c: addiu s7, zero, 34
+L_107db50:
+// 0x0107db50: 0x107db50: addiu s7, zero, 34
 	ldc.i4.s 34
 	stloc 14
-// 0x0107d530: 0x107d530: addiu s6, zero, 34
+// 0x0107db54: 0x107db54: addiu s6, zero, 34
 	ldc.i4.s 34
 	stloc 16
-// 0x0107d534: 0x107d534: sw    a1, 1828(sp)
+// 0x0107db58: 0x107db58: sw    a1, 1828(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -300,19 +4522,19 @@ L_107d52c:
 	add
 	ldloc.2
 	stelem.i4
-L_107d538:
-// 0x0107d538: 0x107d538: lui   v0, 0x80000
+L_107db5c:
+// 0x0107db5c: 0x107db5c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107d53c: 0x107d53c: addiu v0, v0, -16028
+// 0x0107db60: 0x107db60: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107d540: 0x107d540: addu  v1, v0, zero
+// 0x0107db64: 0x107db64: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0107d544: 0x107d544: lw    a0, 2000(v0)
+// 0x0107db68: 0x107db68: lw    a0, 2000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -321,37 +4543,37 @@ L_107d538:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107d548: 0x107d548: j	 0x107d58c addu  v0, zero, zero
+// 0x0107db6c: 0x107db6c: j	 0x107dbb0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_107d58c
+	br L_107dbb0
 // --- basic block ---
-L_107d550:
-// 0x0107d550: 0x107d550: lw    s0, 0(v1)
+L_107db74:
+// 0x0107db74: 0x107db74: lw    s0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0107d554: 0x107d554: addiu v0, v0, 1
+// 0x0107db78: 0x107db78: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0107d558: 0x107d558: lw    t0, 0(s0)
+// 0x0107db7c: 0x107db7c: lw    t0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 17
-// 0x0107d55c: 0x107d55c: addiu v1, v1, 4
+// 0x0107db80: 0x107db80: addiu v1, v1, 4
 	ldloc 6
 	ldc.i4.4
 	add
 	stloc 6
-// 0x0107d560: 0x107d560: bne   t0, s5, 0x107d58c sw    t0, 1836(sp)
+// 0x0107db84: 0x107db84: bne   t0, s5, 0x107dbb0 sw    t0, 1836(sp)
 	ldloc 17
 	ldloc 13
 	ldloc 7
@@ -362,9 +4584,9 @@ L_107d550:
 	add
 	ldloc 17
 	stelem.i4
-	bne.un L_107d58c
+	bne.un L_107dbb0
 // --- basic block ---
-// 0x0107d568: 0x107d568: lw    v1, 16(s0)
+// 0x0107db8c: 0x107db8c: lw    v1, 16(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -373,10 +4595,10 @@ L_107d550:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107d56c: 0x107d56c: addiu s2, zero, -1
+// 0x0107db90: 0x107db90: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 8
-// 0x0107d570: 0x107d570: sw    v1, 36(sp)
+// 0x0107db94: 0x107db94: sw    v1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -385,7 +4607,7 @@ L_107d550:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107d574: 0x107d574: lw    v0, 20(s0)
+// 0x0107db98: 0x107db98: lw    v0, 20(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -394,13 +4616,13 @@ L_107d550:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107d578: 0x107d578: sb    zero, 420(sp)
+// 0x0107db9c: 0x107db9c: sb    zero, 420(sp)
 	ldloc.0
 	ldc.i4 420
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107d57c: 0x107d57c: bne   s1, s2, 0x107d5a0 sw    v0, 40(sp)
+// 0x0107dba0: 0x107dba0: bne   s1, s2, 0x107dbc4 sw    v0, 40(sp)
 	ldloc 9
 	ldloc 8
 	ldloc 7
@@ -411,28 +4633,28 @@ L_107d550:
 	add
 	ldloc 5
 	stelem.i4
-	bne.un L_107d5a0
+	bne.un L_107dbc4
 // --- basic block ---
-// 0x0107d584: 0x107d584: j	 0x107d694 lui   a0, 0x20000
+// 0x0107dba8: 0x107dba8: j	 0x107dcb8 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_107d694
+	br L_107dcb8
 // --- basic block ---
-L_107d58c:
-// 0x0107d58c: 0x107d58c: slt   a1, v0, a0
+L_107dbb0:
+// 0x0107dbb0: 0x107dbb0: slt   a1, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc.2
-// 0x0107d590: 0x107d590: bne   a1, zero, 0x107d550 sll   zero, zero, 0
+// 0x0107dbb4: 0x107dbb4: bne   a1, zero, 0x107db74 sll   zero, zero, 0
 	ldloc.2
-	brtrue L_107d550
+	brtrue L_107db74
 // --- basic block ---
-// 0x0107d598: 0x107d598: j	 0x107e864 sll   zero, zero, 0
-	br L_107e864
+// 0x0107dbbc: 0x107dbbc: j	 0x107ee88 sll   zero, zero, 0
+	br L_107ee88
 // --- basic block ---
-L_107d5a0:
-// 0x0107d5a0: 0x107d5a0: sw    v0, 1124(sp)
+L_107dbc4:
+// 0x0107dbc4: 0x107dbc4: sw    v0, 1124(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -441,10 +4663,10 @@ L_107d5a0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107d5a4: 0x107d5a4: addiu v0, zero, 1
+// 0x0107dbc8: 0x107dbc8: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0107d5a8: 0x107d5a8: sw    v1, 1120(sp)
+// 0x0107dbcc: 0x107dbcc: sw    v1, 1120(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -453,27 +4675,27 @@ L_107d5a0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107d5ac: 0x107d5ac: bne   s1, v0, 0x107d5e4 lui   s8, 0x80000
+// 0x0107dbd0: 0x107dbd0: bne   s1, v0, 0x107dc08 lui   s8, 0x80000
 	ldloc 9
 	ldloc 5
 	ldc.i4 524288
 	stloc 15
-	bne.un L_107d5e4
+	bne.un L_107dc08
 // --- basic block ---
-// 0x0107d5b4: 0x107d5b4: addiu s2, sp, 1120
+// 0x0107dbd8: 0x107dbd8: addiu s2, sp, 1120
 	ldloc.0
 	ldc.i4 1120
 	add
 	stloc 8
-// 0x0107d5b8: 0x107d5b8: lui   a0, 0x10000
+// 0x0107dbdc: 0x107dbdc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107d5bc: 0x107d5bc: addiu a0, a0, -29680
+// 0x0107dbe0: 0x107dbe0: addiu a0, a0, -29680
 	ldloc.1
 	ldc.i4 -29680
 	add
 	stloc.1
-// 0x0107d5c0: 0x107d5c0: jal   0x101f76c addu  a1, s2, zero
+// 0x0107dbe4: 0x107dbe4: jal   0x101f77c addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -481,18 +4703,18 @@ L_107d5a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_trip_set_point_101f76c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_trip_set_point_101f77c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d5c8: 0x107d5c8: addu  a0, s2, zero
+// 0x0107dbec: 0x107dbec: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107d5cc: 0x107d5cc: addiu a1, zero, 600
+// 0x0107dbf0: 0x107dbf0: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x0107d5d0: 0x107d5d0: jal   0x1020f5c addu  a2, zero, zero
+// 0x0107dbf4: 0x107dbf4: jal   0x1020f6c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -500,47 +4722,47 @@ L_107d5a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d5d8: 0x107d5d8: sw    s1, -13984(s8)
+// 0x0107dbfc: 0x107dbfc: sw    s1, -13520(s8)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3496
+	ldc.i4 -3380
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107d5dc: 0x107d5dc: j	 0x107d66c addiu s1, zero, 1000
+// 0x0107dc00: 0x107dc00: j	 0x107dc90 addiu s1, zero, 1000
 	ldc.i4 1000
 	stloc 9
-	br L_107d66c
+	br L_107dc90
 // --- basic block ---
-L_107d5e4:
-// 0x0107d5e4: 0x107d5e4: addiu a0, sp, 300
+L_107dc08:
+// 0x0107dc08: 0x107dc08: addiu a0, sp, 300
 	ldloc.0
 	ldc.i4 300
 	add
 	stloc.1
-// 0x0107d5e8: 0x107d5e8: addiu a1, sp, 180
+// 0x0107dc0c: 0x107dc0c: addiu a1, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc.2
-// 0x0107d5ec: 0x107d5ec: addiu a2, sp, 32
+// 0x0107dc10: 0x107dc10: addiu a2, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.3
-// 0x0107d5f0: 0x107d5f0: jal   0x1029da8 sw    zero, -13984(s8)
+// 0x0107dc14: 0x107dc14: jal   0x1029db8 sw    zero, -13520(s8)
 	ldloc 7
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3496
+	ldc.i4 -3380
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -549,21 +4771,21 @@ L_107d5e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d5f8: 0x107d5f8: beq   v0, s2, 0x107d65c addiu a0, sp, 1120
+// 0x0107dc1c: 0x107dc1c: beq   v0, s2, 0x107dc80 addiu a0, sp, 1120
 	ldloc 5
 	ldloc 8
 	ldloc.0
 	ldc.i4 1120
 	add
 	stloc.1
-	beq  L_107d65c
+	beq  L_107dc80
 // --- basic block ---
-// 0x0107d600: 0x107d600: lw    v0, 304(sp)
+// 0x0107dc24: 0x107dc24: lw    v0, 304(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -572,10 +4794,10 @@ L_107d5e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107d604: 0x107d604: addu  a1, a0, zero
+// 0x0107dc28: 0x107dc28: addu  a1, a0, zero
 	ldloc.1
 	stloc.2
-// 0x0107d608: 0x107d608: sw    v0, 64(sp)
+// 0x0107dc2c: 0x107dc2c: sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -584,7 +4806,7 @@ L_107d5e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107d60c: 0x107d60c: lw    v0, 300(sp)
+// 0x0107dc30: 0x107dc30: lw    v0, 300(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -593,12 +4815,12 @@ L_107d5e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107d610: 0x107d610: addiu a0, sp, 60
+// 0x0107dc34: 0x107dc34: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x0107d614: 0x107d614: jal   0x1008eb0 sw    v0, 60(sp)
+// 0x0107dc38: 0x107dc38: jal   0x1008ec0 sw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -612,57 +4834,57 @@ L_107d5e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d61c: 0x107d61c: slti  v1, v0, 1000
+// 0x0107dc40: 0x107dc40: slti  v1, v0, 1000
 	ldloc 5
 	ldc.i4 1000
 	clt
 	stloc 6
-// 0x0107d620: 0x107d620: bne   v1, zero, 0x107d644 addiu s1, zero, 1000
+// 0x0107dc44: 0x107dc44: bne   v1, zero, 0x107dc68 addiu s1, zero, 1000
 	ldloc 6
 	ldc.i4 1000
 	stloc 9
-	brtrue L_107d644
+	brtrue L_107dc68
 // --- basic block ---
-// 0x0107d628: 0x107d628: slti  v1, v0, 2000
+// 0x0107dc4c: 0x107dc4c: slti  v1, v0, 2000
 	ldloc 5
 	ldc.i4 2000
 	clt
 	stloc 6
-// 0x0107d62c: 0x107d62c: bne   v1, zero, 0x107d644 addiu s1, zero, 1500
+// 0x0107dc50: 0x107dc50: bne   v1, zero, 0x107dc68 addiu s1, zero, 1500
 	ldloc 6
 	ldc.i4 1500
 	stloc 9
-	brtrue L_107d644
+	brtrue L_107dc68
 // --- basic block ---
-// 0x0107d634: 0x107d634: slti  v0, v0, 5000
+// 0x0107dc58: 0x107dc58: slti  v0, v0, 5000
 	ldloc 5
 	ldc.i4 5000
 	clt
 	stloc 5
-// 0x0107d638: 0x107d638: bne   v0, zero, 0x107d644 addiu s1, zero, 2500
+// 0x0107dc5c: 0x107dc5c: bne   v0, zero, 0x107dc68 addiu s1, zero, 2500
 	ldloc 5
 	ldc.i4 2500
 	stloc 9
-	brtrue L_107d644
+	brtrue L_107dc68
 // --- basic block ---
-// 0x0107d640: 0x107d640: addiu s1, zero, 5000
+// 0x0107dc64: 0x107dc64: addiu s1, zero, 5000
 	ldc.i4 5000
 	stloc 9
-L_107d644:
-// 0x0107d644: 0x107d644: addiu a0, sp, 60
+L_107dc68:
+// 0x0107dc68: 0x107dc68: addiu a0, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.1
-// 0x0107d648: 0x107d648: addiu a1, zero, 600
+// 0x0107dc6c: 0x107dc6c: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x0107d64c: 0x107d64c: jal   0x1020f5c addu  a2, zero, zero
+// 0x0107dc70: 0x107dc70: jal   0x1020f6c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -670,19 +4892,19 @@ L_107d644:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d654: 0x107d654: j	 0x107d66c sll   zero, zero, 0
-	br L_107d66c
+// 0x0107dc78: 0x107dc78: j	 0x107dc90 sll   zero, zero, 0
+	br L_107dc90
 // --- basic block ---
-L_107d65c:
-// 0x0107d65c: 0x107d65c: addiu a1, zero, 600
+L_107dc80:
+// 0x0107dc80: 0x107dc80: addiu a1, zero, 600
 	ldc.i4 600
 	stloc.2
-// 0x0107d660: 0x107d660: jal   0x1020f5c addu  a2, zero, zero
+// 0x0107dc84: 0x107dc84: jal   0x1020f6c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -690,34 +4912,34 @@ L_107d65c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_update_center_animated_1020f6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d668: 0x107d668: addiu s1, zero, 5000
+// 0x0107dc8c: 0x107dc8c: addiu s1, zero, 5000
 	ldc.i4 5000
 	stloc 9
-L_107d66c:
-// 0x0107d66c: 0x107d66c: jal   0x101f8cc sll   zero, zero, 0
+L_107dc90:
+// 0x0107dc90: 0x107dc90: jal   0x101f8dc sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_height_101f8cc(int32)
+	call int32 Cibyl23::roadmap_screen_height_101f8dc(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d674: 0x107d674: addiu a1, zero, 3
+// 0x0107dc98: 0x107dc98: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0107d678: 0x107d678: div   v0, a1
+// 0x0107dc9c: 0x107dc9c: div   v0, a1
 	ldloc 5
 	ldloc.2
 	div
 	stloc 19
-// 0x0107d67c: 0x107d67c: mflo  lo
+// 0x0107dca0: 0x107dca0: mflo  lo
 	ldloc 19
 	stloc.2
-// 0x0107d680: 0x107d680: jal   0x101fb0c addu  a0, s1, zero
+// 0x0107dca4: 0x107dca4: jal   0x101fb1c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -725,29 +4947,29 @@ L_107d66c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_scale_101fb0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_scale_101fb1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d688: 0x107d688: jal   0x1021280 sll   zero, zero, 0
+// 0x0107dcac: 0x107dcac: jal   0x1021290 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_set_orientation_fixed_1021280(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_set_orientation_fixed_1021290(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d690: 0x107d690: lui   a0, 0x20000
+// 0x0107dcb4: 0x107dcb4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_107d694:
-// 0x0107d694: 0x107d694: jal   0x10941a4 addiu a0, a0, -26748
+L_107dcb8:
+// 0x0107dcb8: 0x107dcb8: jal   0x10947c8 addiu a0, a0, -26284
 	ldloc.1
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.1
 	ldloc.0
@@ -755,41 +4977,41 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_exists_10941a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_exists_10947c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d69c: 0x107d69c: beq   v0, zero, 0x107dcc0 lui   s2, 0x20000
+// 0x0107dcc0: 0x107dcc0: beq   v0, zero, 0x107e2e4 lui   s2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 8
-	brfalse L_107dcc0
+	brfalse L_107e2e4
 // --- basic block ---
-// 0x0107d6a4: 0x107d6a4: lui   v0, 0x80000
+// 0x0107dcc8: 0x107dcc8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107d6a8: 0x107d6a8: lw    s1, -16232(v0)
+// 0x0107dccc: 0x107dccc: lw    s1, -15768(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107d6ac: 0x107d6ac: lui   v0, 0x80000
+// 0x0107dcd0: 0x107dcd0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107d6b0: 0x107d6b0: addu  a0, s1, zero
+// 0x0107dcd4: 0x107dcd4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d6b4: 0x107d6b4: jal   0x1098ff8 sw    s5, -14004(v0)
+// 0x0107dcd8: 0x107dcd8: jal   0x1099640 sw    s5, -13540(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 -3385
 	add
 	ldloc 13
 	stelem.i4
@@ -798,12 +5020,12 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d6bc: 0x107d6bc: lw    a1, 4(s0)
+// 0x0107dce0: 0x107dce0: lw    a1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -812,7 +5034,7 @@ L_107d694:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107d6c0: 0x107d6c0: lw    a2, 8(s0)
+// 0x0107dce4: 0x107dce4: lw    a2, 8(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -821,7 +5043,7 @@ L_107d694:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107d6c4: 0x107d6c4: jal   0x1077ea8 addu  a0, s0, zero
+// 0x0107dce8: 0x107dce8: jal   0x10784cc addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -829,28 +5051,28 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_get_title_1077ea8(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_get_title_10784cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d6cc: 0x107d6cc: lui   a1, 0x20000
+// 0x0107dcf0: 0x107dcf0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107d6d0: 0x107d6d0: addu  a2, v0, zero
+// 0x0107dcf4: 0x107dcf4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0107d6d4: 0x107d6d4: addiu s3, s2, -25728
+// 0x0107dcf8: 0x107dcf8: addiu s3, s2, -25264
 	ldloc 8
-	ldc.i4 -25728
+	ldc.i4 -25264
 	add
 	stloc 11
-// 0x0107d6d8: 0x107d6d8: addu  a0, s1, zero
+// 0x0107dcfc: 0x107dcfc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d6dc: 0x107d6dc: jal   0x109b3e0 addiu a1, a1, -25160
+// 0x0107dd00: 0x107dd00: jal   0x109ba28 addiu a1, a1, -24696
 	ldloc.2
-	ldc.i4 -25160
+	ldc.i4 -24696
 	add
 	stloc.2
 	ldloc.0
@@ -858,15 +5080,15 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d6e4: 0x107d6e4: addu  a1, s3, zero
+// 0x0107dd08: 0x107dd08: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0107d6e8: 0x107d6e8: jal   0x109b304 addu  a0, s1, zero
+// 0x0107dd0c: 0x107dd0c: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -874,19 +5096,19 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d6f0: 0x107d6f0: lw    a0, 0(s0)
+// 0x0107dd14: 0x107dd14: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107d6f4: 0x107d6f4: jal   0x107756c addu  s5, v0, zero
+// 0x0107dd18: 0x107dd18: jal   0x1077b90 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.0
@@ -894,15 +5116,15 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Icon_107756c(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Icon_1077b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d6fc: 0x107d6fc: addu  a1, v0, zero
+// 0x0107dd20: 0x107dd20: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107d700: 0x107d700: jal   0x109df10 addu  a0, s5, zero
+// 0x0107dd24: 0x107dd24: jal   0x109e558 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -910,15 +5132,15 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d708: 0x107d708: addu  a1, s3, zero
+// 0x0107dd2c: 0x107dd2c: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x0107d70c: 0x107d70c: jal   0x109b304 addu  a0, s1, zero
+// 0x0107dd30: 0x107dd30: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -926,51 +5148,51 @@ L_107d694:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d714: 0x107d714: jal   0x109dde0 addu  a0, v0, zero
+// 0x0107dd38: 0x107dd38: jal   0x109e428 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl118::ssd_bitmap_remove_overlays_109dde0(int32)
+	call int32 Cibyl118::ssd_bitmap_remove_overlays_109e428(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107d71c: 0x107d71c: lw    a0, 0(s0)
+// 0x0107dd40: 0x107dd40: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107d720: 0x107d720: jal   0x1077724 addu  s4, zero, zero
+// 0x0107dd44: 0x107dd44: jal   0x1077d48 addu  s4, zero, zero
 	ldc.i4.s 0
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_Of_AddOns_1077724(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_Number_Of_AddOns_1077d48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d728: 0x107d728: j	 0x107d760 addu  s5, v0, zero
+// 0x0107dd4c: 0x107dd4c: j	 0x107dd84 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
-	br L_107d760
+	br L_107dd84
 // --- basic block ---
-L_107d730:
-// 0x0107d730: 0x107d730: lw    a0, 0(s0)
+L_107dd54:
+// 0x0107dd54: 0x107dd54: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107d734: 0x107d734: jal   0x10777b8 addiu s4, s4, 1
+// 0x0107dd58: 0x107dd58: jal   0x1077ddc addiu s4, s4, 1
 	ldloc 12
 	ldc.i4.1
 	add
@@ -979,38 +5201,38 @@ L_107d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_AddOn_10777b8(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_AddOn_1077ddc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d73c: 0x107d73c: addu  s2, v0, zero
+// 0x0107dd60: 0x107dd60: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0107d740: 0x107d740: addu  a0, s1, zero
+// 0x0107dd64: 0x107dd64: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d744: 0x107d744: beq   v0, zero, 0x107d760 addu  a1, s3, zero
+// 0x0107dd68: 0x107dd68: beq   v0, zero, 0x107dd84 addu  a1, s3, zero
 	ldloc 5
 	ldloc 11
 	stloc.2
-	brfalse L_107d760
+	brfalse L_107dd84
 // --- basic block ---
-// 0x0107d74c: 0x107d74c: jal   0x109b304 sll   zero, zero, 0
+// 0x0107dd70: 0x107dd70: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d754: 0x107d754: addu  a0, v0, zero
+// 0x0107dd78: 0x107dd78: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107d758: 0x107d758: jal   0x109ddec addu  a1, s2, zero
+// 0x0107dd7c: 0x107dd7c: jal   0x109e434 addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.0
@@ -1018,40 +5240,40 @@ L_107d730:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_add_overlay_109ddec(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_add_overlay_109e434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107d760:
-// 0x0107d760: 0x107d760: slt   v0, s4, s5
+L_107dd84:
+// 0x0107dd84: 0x107dd84: slt   v0, s4, s5
 	ldloc 12
 	ldloc 13
 	clt
 	stloc 5
-// 0x0107d764: 0x107d764: bne   v0, zero, 0x107d730 addu  a1, s4, zero
+// 0x0107dd88: 0x107dd88: bne   v0, zero, 0x107dd54 addu  a1, s4, zero
 	ldloc 5
 	ldloc 12
 	stloc.2
-	brtrue L_107d730
+	brtrue L_107dd54
 // --- basic block ---
-// 0x0107d76c: 0x107d76c: lui   a1, 0x20000
+// 0x0107dd90: 0x107dd90: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107d770: 0x107d770: addiu a1, a1, -24996
+// 0x0107dd94: 0x107dd94: addiu a1, a1, -24532
 	ldloc.2
-	ldc.i4 -24996
+	ldc.i4 -24532
 	add
 	stloc.2
-// 0x0107d774: 0x107d774: addu  a0, s1, zero
+// 0x0107dd98: 0x107dd98: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d778: 0x107d778: addiu a2, s0, 557
+// 0x0107dd9c: 0x107dd9c: addiu a2, s0, 557
 	ldloc 10
 	ldc.i4 557
 	add
 	stloc.3
-// 0x0107d77c: 0x107d77c: jal   0x109b3e0 addiu s2, sp, 1120
+// 0x0107dda0: 0x107dda0: jal   0x109ba28 addiu s2, sp, 1120
 	ldloc.0
 	ldc.i4 1120
 	add
@@ -1061,18 +5283,18 @@ L_107d760:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d784: 0x107d784: addu  a1, s2, zero
+// 0x0107dda8: 0x107dda8: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x0107d788: 0x107d788: addiu a2, zero, 700
+// 0x0107ddac: 0x107ddac: addiu a2, zero, 700
 	ldc.i4 700
 	stloc.3
-// 0x0107d78c: 0x107d78c: jal   0x1079534 addu  a0, s0, zero
+// 0x0107ddb0: 0x107ddb0: jal   0x1079b58 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -1080,23 +5302,23 @@ L_107d760:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_get_report_info_str_1079534(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_get_report_info_str_1079b58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d794: 0x107d794: lui   a1, 0x20000
+// 0x0107ddb8: 0x107ddb8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107d798: 0x107d798: addu  a0, s1, zero
+// 0x0107ddbc: 0x107ddbc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d79c: 0x107d79c: addiu a1, a1, -24980
+// 0x0107ddc0: 0x107ddc0: addiu a1, a1, -24516
 	ldloc.2
-	ldc.i4 -24980
+	ldc.i4 -24516
 	add
 	stloc.2
-// 0x0107d7a0: 0x107d7a0: jal   0x109b3e0 addu  a2, s2, zero
+// 0x0107ddc4: 0x107ddc4: jal   0x109ba28 addu  a2, s2, zero
 	ldloc 8
 	stloc.3
 	ldloc.0
@@ -1104,23 +5326,23 @@ L_107d760:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d7a8: 0x107d7a8: addiu a1, sp, 180
+// 0x0107ddcc: 0x107ddcc: addiu a1, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc.2
-// 0x0107d7ac: 0x107d7ac: addu  a0, s0, zero
+// 0x0107ddd0: 0x107ddd0: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0107d7b0: 0x107d7b0: addiu a2, zero, 100
+// 0x0107ddd4: 0x107ddd4: addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
-// 0x0107d7b4: 0x107d7b4: jal   0x1077fd8 sb    zero, 180(sp)
+// 0x0107ddd8: 0x107ddd8: jal   0x10785fc sb    zero, 180(sp)
 	ldloc.0
 	ldc.i4 180
 	add
@@ -1131,30 +5353,30 @@ L_107d760:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_get_reported_by_string_1077fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_get_reported_by_string_10785fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d7bc: 0x107d7bc: lb    v0, 180(sp)
+// 0x0107dde0: 0x107dde0: lb    v0, 180(sp)
 	ldloc.0
 	ldc.i4 180
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107d7c0: 0x107d7c0: sll   zero, zero, 0
-// 0x0107d7c4: 0x107d7c4: bne   v0, zero, 0x107d7e8 lui   a1, 0x20000
+// 0x0107dde4: 0x107dde4: sll   zero, zero, 0
+// 0x0107dde8: 0x107dde8: bne   v0, zero, 0x107de0c lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_107d7e8
+	brtrue L_107de0c
 // --- basic block ---
-// 0x0107d7cc: 0x107d7cc: addu  a0, s1, zero
+// 0x0107ddf0: 0x107ddf0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d7d0: 0x107d7d0: jal   0x109b304 addiu a1, a1, -24968
+// 0x0107ddf4: 0x107ddf4: jal   0x109b94c addiu a1, a1, -24504
 	ldloc.2
-	ldc.i4 -24968
+	ldc.i4 -24504
 	add
 	stloc.2
 	ldloc.0
@@ -1162,30 +5384,30 @@ L_107d760:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d7d8: 0x107d7d8: jal   0x1099098 addu  a0, v0, zero
+// 0x0107ddfc: 0x107ddfc: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107d7e0: 0x107d7e0: j	 0x107d800 lui   a1, 0x20000
+// 0x0107de04: 0x107de04: j	 0x107de24 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_107d800
+	br L_107de24
 // --- basic block ---
-L_107d7e8:
-// 0x0107d7e8: 0x107d7e8: addu  a0, s1, zero
+L_107de0c:
+// 0x0107de0c: 0x107de0c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d7ec: 0x107d7ec: jal   0x109b304 addiu a1, a1, -24968
+// 0x0107de10: 0x107de10: jal   0x109b94c addiu a1, a1, -24504
 	ldloc.2
-	ldc.i4 -24968
+	ldc.i4 -24504
 	add
 	stloc.2
 	ldloc.0
@@ -1193,30 +5415,30 @@ L_107d7e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d7f4: 0x107d7f4: jal   0x10990ac addu  a0, v0, zero
+// 0x0107de18: 0x107de18: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d7fc: 0x107d7fc: lui   a1, 0x20000
+// 0x0107de20: 0x107de20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_107d800:
-// 0x0107d800: 0x107d800: addiu a1, a1, -25268
+L_107de24:
+// 0x0107de24: 0x107de24: addiu a1, a1, -24804
 	ldloc.2
-	ldc.i4 -25268
+	ldc.i4 -24804
 	add
 	stloc.2
-// 0x0107d804: 0x107d804: jal   0x109b304 addu  a0, s1, zero
+// 0x0107de28: 0x107de28: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1224,26 +5446,26 @@ L_107d800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d80c: 0x107d80c: beq   v0, zero, 0x107d894 addu  s2, v0, zero
+// 0x0107de30: 0x107de30: beq   v0, zero, 0x107deb8 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_107d894
+	brfalse L_107deb8
 // --- basic block ---
-// 0x0107d814: 0x107d814: lui   a1, 0x20000
+// 0x0107de38: 0x107de38: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107d818: 0x107d818: addiu a1, a1, -24948
+// 0x0107de3c: 0x107de3c: addiu a1, a1, -24484
 	ldloc.2
-	ldc.i4 -24948
+	ldc.i4 -24484
 	add
 	stloc.2
-// 0x0107d81c: 0x107d81c: jal   0x109df10 addu  a0, v0, zero
+// 0x0107de40: 0x107de40: jal   0x109e558 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1251,12 +5473,12 @@ L_107d800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d824: 0x107d824: lw    v0, 1620(s0)
+// 0x0107de48: 0x107de48: lw    v0, 1620(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -1265,19 +5487,19 @@ L_107d800:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107d828: 0x107d828: sll   zero, zero, 0
-// 0x0107d82c: 0x107d82c: beq   v0, zero, 0x107d880 lui   a1, 0x20000
+// 0x0107de4c: 0x107de4c: sll   zero, zero, 0
+// 0x0107de50: 0x107de50: beq   v0, zero, 0x107dea4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_107d880
+	brfalse L_107dea4
 // --- basic block ---
-// 0x0107d834: 0x107d834: addiu a1, a1, -25252
+// 0x0107de58: 0x107de58: addiu a1, a1, -24788
 	ldloc.2
-	ldc.i4 -25252
+	ldc.i4 -24788
 	add
 	stloc.2
-// 0x0107d838: 0x107d838: jal   0x109b304 addu  a0, s1, zero
+// 0x0107de5c: 0x107de5c: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1285,51 +5507,51 @@ L_107d800:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d840: 0x107d840: jal   0x10990ac addu  a0, v0, zero
+// 0x0107de64: 0x107de64: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d848: 0x107d848: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0107de6c: 0x107de6c: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0107d850: 0x107d850: beq   v0, zero, 0x107d85c addiu v1, zero, 32
+// 0x0107de74: 0x107de74: beq   v0, zero, 0x107de80 addiu v1, zero, 32
 	ldloc 5
 	ldc.i4.s 32
 	stloc 6
-	brfalse L_107d85c
+	brfalse L_107de80
 // --- basic block ---
-// 0x0107d858: 0x107d858: addiu v1, zero, 50
+// 0x0107de7c: 0x107de7c: addiu v1, zero, 50
 	ldc.i4.s 50
 	stloc 6
-L_107d85c:
-// 0x0107d85c: 0x107d85c: lw    a2, 0(s0)
+L_107de80:
+// 0x0107de80: 0x107de80: lw    a2, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0107d860: 0x107d860: addiu a0, zero, 1
+// 0x0107de84: 0x107de84: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107d864: 0x107d864: addiu a1, zero, 2
+// 0x0107de88: 0x107de88: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0107d868: 0x107d868: addiu a3, zero, -1
+// 0x0107de8c: 0x107de8c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107d86c: 0x107d86c: sw    v1, 16(sp)
+// 0x0107de90: 0x107de90: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1338,7 +5560,7 @@ L_107d85c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107d870: 0x107d870: jal   0x104b534 sw    s2, 20(sp)
+// 0x0107de94: 0x107de94: jal   0x104b544 sw    s2, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1352,21 +5574,21 @@ L_107d85c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b534(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b544(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d878: 0x107d878: j	 0x107d894 sll   zero, zero, 0
-	br L_107d894
+// 0x0107de9c: 0x107de9c: j	 0x107deb8 sll   zero, zero, 0
+	br L_107deb8
 // --- basic block ---
-L_107d880:
-// 0x0107d880: 0x107d880: addu  a0, s1, zero
+L_107dea4:
+// 0x0107dea4: 0x107dea4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d884: 0x107d884: jal   0x109b304 addiu a1, a1, -25252
+// 0x0107dea8: 0x107dea8: jal   0x109b94c addiu a1, a1, -24788
 	ldloc.2
-	ldc.i4 -25252
+	ldc.i4 -24788
 	add
 	stloc.2
 	ldloc.0
@@ -1374,40 +5596,40 @@ L_107d880:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d88c: 0x107d88c: jal   0x1099098 addu  a0, v0, zero
+// 0x0107deb0: 0x107deb0: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_107d894:
-// 0x0107d894: 0x107d894: lb    v0, 1520(s0)
+L_107deb8:
+// 0x0107deb8: 0x107deb8: lb    v0, 1520(s0)
 	ldloc 10
 	ldc.i4 1520
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107d898: 0x107d898: lui   s2, 0x20000
+// 0x0107debc: 0x107debc: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0107d89c: 0x107d89c: beq   v0, zero, 0x107d8ec lui   s3, 0x20000
+// 0x0107dec0: 0x107dec0: beq   v0, zero, 0x107df10 lui   s3, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 11
-	brfalse L_107d8ec
+	brfalse L_107df10
 // --- basic block ---
-// 0x0107d8a4: 0x107d8a4: addiu a1, s2, -24916
+// 0x0107dec8: 0x107dec8: addiu a1, s2, -24452
 	ldloc 8
-	ldc.i4 -24916
+	ldc.i4 -24452
 	add
 	stloc.2
-// 0x0107d8a8: 0x107d8a8: jal   0x109b304 addu  a0, s1, zero
+// 0x0107decc: 0x107decc: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1415,15 +5637,15 @@ L_107d894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d8b0: 0x107d8b0: addu  a0, v0, zero
+// 0x0107ded4: 0x107ded4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107d8b4: 0x107d8b4: jal   0x1097e5c addiu a1, s0, 1520
+// 0x0107ded8: 0x107ded8: jal   0x10984a4 addiu a1, s0, 1520
 	ldloc 10
 	ldc.i4 1520
 	add
@@ -1433,17 +5655,17 @@ L_107d894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d8bc: 0x107d8bc: addiu a1, s2, -24916
+// 0x0107dee0: 0x107dee0: addiu a1, s2, -24452
 	ldloc 8
-	ldc.i4 -24916
+	ldc.i4 -24452
 	add
 	stloc.2
-// 0x0107d8c0: 0x107d8c0: jal   0x109b304 addu  a0, s1, zero
+// 0x0107dee4: 0x107dee4: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1451,26 +5673,26 @@ L_107d894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d8c8: 0x107d8c8: jal   0x10990ac addu  a0, v0, zero
+// 0x0107deec: 0x107deec: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d8d0: 0x107d8d0: addu  a0, s1, zero
+// 0x0107def4: 0x107def4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d8d4: 0x107d8d4: jal   0x109b304 addiu a1, s3, -24896
+// 0x0107def8: 0x107def8: jal   0x109b94c addiu a1, s3, -24432
 	ldloc 11
-	ldc.i4 -24896
+	ldc.i4 -24432
 	add
 	stloc.2
 	ldloc.0
@@ -1478,32 +5700,32 @@ L_107d894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d8dc: 0x107d8dc: jal   0x10990ac addu  a0, v0, zero
+// 0x0107df00: 0x107df00: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d8e4: 0x107d8e4: j	 0x107d934 lui   a1, 0x20000
+// 0x0107df08: 0x107df08: j	 0x107df58 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_107d934
+	br L_107df58
 // --- basic block ---
-L_107d8ec:
-// 0x0107d8ec: 0x107d8ec: addiu a1, s2, -24916
+L_107df10:
+// 0x0107df10: 0x107df10: addiu a1, s2, -24452
 	ldloc 8
-	ldc.i4 -24916
+	ldc.i4 -24452
 	add
 	stloc.2
-// 0x0107d8f0: 0x107d8f0: jal   0x109b304 addu  a0, s1, zero
+// 0x0107df14: 0x107df14: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1511,20 +5733,20 @@ L_107d8ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d8f8: 0x107d8f8: lui   a1, 0x10000
+// 0x0107df1c: 0x107df1c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107d8fc: 0x107d8fc: addu  a0, v0, zero
+// 0x0107df20: 0x107df20: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107d900: 0x107d900: jal   0x1097e5c addiu a1, a1, 18500
+// 0x0107df24: 0x107df24: jal   0x10984a4 addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
 	ldloc.0
@@ -1532,17 +5754,17 @@ L_107d8ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d908: 0x107d908: addiu a1, s2, -24916
+// 0x0107df2c: 0x107df2c: addiu a1, s2, -24452
 	ldloc 8
-	ldc.i4 -24916
+	ldc.i4 -24452
 	add
 	stloc.2
-// 0x0107d90c: 0x107d90c: jal   0x109b304 addu  a0, s1, zero
+// 0x0107df30: 0x107df30: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1550,24 +5772,24 @@ L_107d8ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d914: 0x107d914: jal   0x1099098 addu  a0, v0, zero
+// 0x0107df38: 0x107df38: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107d91c: 0x107d91c: addu  a0, s1, zero
+// 0x0107df40: 0x107df40: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107d920: 0x107d920: jal   0x109b304 addiu a1, s3, -24896
+// 0x0107df44: 0x107df44: jal   0x109b94c addiu a1, s3, -24432
 	ldloc 11
-	ldc.i4 -24896
+	ldc.i4 -24432
 	add
 	stloc.2
 	ldloc.0
@@ -1575,28 +5797,28 @@ L_107d8ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d928: 0x107d928: jal   0x1099098 addu  a0, v0, zero
+// 0x0107df4c: 0x107df4c: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107d930: 0x107d930: lui   a1, 0x20000
+// 0x0107df54: 0x107df54: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_107d934:
-// 0x0107d934: 0x107d934: addiu a1, a1, -24884
+L_107df58:
+// 0x0107df58: 0x107df58: addiu a1, a1, -24420
 	ldloc.2
-	ldc.i4 -24884
+	ldc.i4 -24420
 	add
 	stloc.2
-// 0x0107d938: 0x107d938: jal   0x109b304 addu  a0, s1, zero
+// 0x0107df5c: 0x107df5c: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1604,44 +5826,44 @@ L_107d934:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d940: 0x107d940: addu  s2, v0, zero
+// 0x0107df64: 0x107df64: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0107d944: 0x107d944: lb    v0, 1624(s0)
+// 0x0107df68: 0x107df68: lb    v0, 1624(s0)
 	ldloc 10
 	ldc.i4 1624
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107d948: 0x107d948: sll   zero, zero, 0
-// 0x0107d94c: 0x107d94c: beq   v0, zero, 0x107da00 lui   v0, 0x1080000
+// 0x0107df6c: 0x107df6c: sll   zero, zero, 0
+// 0x0107df70: 0x107df70: beq   v0, zero, 0x107e024 lui   v0, 0x1080000
 	ldloc 5
 	ldc.i4 17301504
 	stloc 5
-	brfalse L_107da00
+	brfalse L_107e024
 // --- basic block ---
-// 0x0107d954: 0x107d954: addiu v0, v0, -25632
+// 0x0107df78: 0x107df78: addiu v0, v0, -24060
 	ldloc 5
-	ldc.i4 -25632
+	ldc.i4 -24060
 	add
 	stloc 5
-// 0x0107d958: 0x107d958: lui   a1, 0x20000
+// 0x0107df7c: 0x107df7c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107d95c: 0x107d95c: addiu a1, a1, -24864
+// 0x0107df80: 0x107df80: addiu a1, a1, -24400
 	ldloc.2
-	ldc.i4 -24864
+	ldc.i4 -24400
 	add
 	stloc.2
-// 0x0107d960: 0x107d960: addu  a0, s2, zero
+// 0x0107df84: 0x107df84: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107d964: 0x107d964: sw    v0, 112(s2)
+// 0x0107df88: 0x107df88: sw    v0, 112(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1650,7 +5872,7 @@ L_107d934:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107d968: 0x107d968: jal   0x109b304 sw    s0, 116(s2)
+// 0x0107df8c: 0x107df8c: jal   0x109b94c sw    s0, 116(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1664,23 +5886,23 @@ L_107d934:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d970: 0x107d970: lui   a1, 0x20000
+// 0x0107df94: 0x107df94: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107d974: 0x107d974: addu  a0, s2, zero
+// 0x0107df98: 0x107df98: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107d978: 0x107d978: addiu a1, a1, -24848
+// 0x0107df9c: 0x107df9c: addiu a1, a1, -24384
 	ldloc.2
-	ldc.i4 -24848
+	ldc.i4 -24384
 	add
 	stloc.2
-// 0x0107d97c: 0x107d97c: jal   0x109b304 addu  s3, v0, zero
+// 0x0107dfa0: 0x107dfa0: jal   0x109b94c addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -1688,49 +5910,49 @@ L_107d934:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d984: 0x107d984: addu  s4, v0, zero
+// 0x0107dfa8: 0x107dfa8: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x0107d988: 0x107d988: lb    v0, 1724(s0)
+// 0x0107dfac: 0x107dfac: lb    v0, 1724(s0)
 	ldloc 10
 	ldc.i4 1724
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107d98c: 0x107d98c: sll   zero, zero, 0
-// 0x0107d990: 0x107d990: beq   v0, zero, 0x107d9a4 sll   zero, zero, 0
+// 0x0107dfb0: 0x107dfb0: sll   zero, zero, 0
+// 0x0107dfb4: 0x107dfb4: beq   v0, zero, 0x107dfc8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107d9a4
+	brfalse L_107dfc8
 // --- basic block ---
-// 0x0107d998: 0x107d998: addu  a0, s3, zero
+// 0x0107dfbc: 0x107dfbc: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0107d99c: 0x107d99c: j	 0x107d9b0 addiu a1, s0, 1724
+// 0x0107dfc0: 0x107dfc0: j	 0x107dfd4 addiu a1, s0, 1724
 	ldloc 10
 	ldc.i4 1724
 	add
 	stloc.2
-	br L_107d9b0
+	br L_107dfd4
 // --- basic block ---
-L_107d9a4:
-// 0x0107d9a4: 0x107d9a4: lui   a1, 0x10000
+L_107dfc8:
+// 0x0107dfc8: 0x107dfc8: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107d9a8: 0x107d9a8: addu  a0, s3, zero
+// 0x0107dfcc: 0x107dfcc: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0107d9ac: 0x107d9ac: addiu a1, a1, 6612
+// 0x0107dfd0: 0x107dfd0: addiu a1, a1, 6608
 	ldloc.2
-	ldc.i4 6612
+	ldc.i4 6608
 	add
 	stloc.2
-L_107d9b0:
-// 0x0107d9b0: 0x107d9b0: jal   0x109df10 addiu s3, sp, 300
+L_107dfd4:
+// 0x0107dfd4: 0x107dfd4: jal   0x109e558 addiu s3, sp, 300
 	ldloc.0
 	ldc.i4 300
 	add
@@ -1740,17 +5962,17 @@ L_107d9b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d9b8: 0x107d9b8: lui   a0, 0x20000
+// 0x0107dfdc: 0x107dfdc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107d9bc: 0x107d9bc: jal   0x101cd60 addiu a0, a0, -22984
+// 0x0107dfe0: 0x107dfe0: jal   0x101cd70 addiu a0, a0, -22520
 	ldloc.1
-	ldc.i4 -22984
+	ldc.i4 -22520
 	add
 	stloc.1
 	ldloc.0
@@ -1758,34 +5980,34 @@ L_107d9b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d9c4: 0x107d9c4: lui   a2, 0x20000
+// 0x0107dfe8: 0x107dfe8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0107d9c8: 0x107d9c8: addu  a3, v0, zero
+// 0x0107dfec: 0x107dfec: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0107d9cc: 0x107d9cc: addiu a2, a2, -24836
+// 0x0107dff0: 0x107dff0: addiu a2, a2, -24372
 	ldloc.3
-	ldc.i4 -24836
+	ldc.i4 -24372
 	add
 	stloc.3
-// 0x0107d9d0: 0x107d9d0: addiu v0, s0, 1624
+// 0x0107dff4: 0x107dff4: addiu v0, s0, 1624
 	ldloc 10
 	ldc.i4 1624
 	add
 	stloc 5
-// 0x0107d9d4: 0x107d9d4: addu  a0, s3, zero
+// 0x0107dff8: 0x107dff8: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0107d9d8: 0x107d9d8: addiu a1, zero, 120
+// 0x0107dffc: 0x107dffc: addiu a1, zero, 120
 	ldc.i4.s 120
 	stloc.2
-// 0x0107d9dc: 0x107d9dc: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0107e000: 0x107e000: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1804,10 +6026,10 @@ L_107d9b0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d9e4: 0x107d9e4: addu  a0, s4, zero
+// 0x0107e008: 0x107e008: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0107d9e8: 0x107d9e8: jal   0x1097e5c addu  a1, s3, zero
+// 0x0107e00c: 0x107e00c: jal   0x10984a4 addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.0
@@ -1815,27 +6037,27 @@ L_107d9b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d9f0: 0x107d9f0: jal   0x10990ac addu  a0, s2, zero
+// 0x0107e014: 0x107e014: jal   0x10996f4 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107d9f8: 0x107d9f8: j	 0x107da14 lui   a1, 0x20000
+// 0x0107e01c: 0x107e01c: j	 0x107e038 lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_107da14
+	br L_107e038
 // --- basic block ---
-L_107da00:
-// 0x0107da00: 0x107da00: sw    zero, 112(s2)
+L_107e024:
+// 0x0107e024: 0x107e024: sw    zero, 112(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1844,7 +6066,7 @@ L_107da00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107da04: 0x107da04: sw    zero, 116(s2)
+// 0x0107e028: 0x107e028: sw    zero, 116(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -1853,28 +6075,28 @@ L_107da00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107da08: 0x107da08: jal   0x1099098 addu  a0, s2, zero
+// 0x0107e02c: 0x107e02c: jal   0x10996e0 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107da10: 0x107da10: lui   a1, 0x20000
+// 0x0107e034: 0x107e034: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_107da14:
-// 0x0107da14: 0x107da14: addiu a2, sp, 180
+L_107e038:
+// 0x0107e038: 0x107e038: addiu a2, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc.3
-// 0x0107da18: 0x107da18: addiu a1, a1, -24824
+// 0x0107e03c: 0x107e03c: addiu a1, a1, -24360
 	ldloc.2
-	ldc.i4 -24824
+	ldc.i4 -24360
 	add
 	stloc.2
-// 0x0107da1c: 0x107da1c: jal   0x109b3e0 addu  a0, s1, zero
+// 0x0107e040: 0x107e040: jal   0x109ba28 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -1882,20 +6104,20 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107da24: 0x107da24: lui   a1, 0x20000
+// 0x0107e048: 0x107e048: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107da28: 0x107da28: addu  a0, s1, zero
+// 0x0107e04c: 0x107e04c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107da2c: 0x107da2c: jal   0x109b304 addiu a1, a1, -25208
+// 0x0107e050: 0x107e050: jal   0x109b94c addiu a1, a1, -24744
 	ldloc.2
-	ldc.i4 -25208
+	ldc.i4 -24744
 	add
 	stloc.2
 	ldloc.0
@@ -1903,15 +6125,15 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107da34: 0x107da34: addu  a0, v0, zero
+// 0x0107e058: 0x107e058: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107da38: 0x107da38: jal   0x1078448 addu  a1, s0, zero
+// 0x0107e05c: 0x107e05c: jal   0x1078a6c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -1919,20 +6141,20 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_update_stars_1078448(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_update_stars_1078a6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107da40: 0x107da40: addiu s2, sp, 1120
+// 0x0107e064: 0x107e064: addiu s2, sp, 1120
 	ldloc.0
 	ldc.i4 1120
 	add
 	stloc 8
-// 0x0107da44: 0x107da44: addu  a0, s1, zero
+// 0x0107e068: 0x107e068: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107da48: 0x107da48: jal   0x1077e58 addu  a1, s0, zero
+// 0x0107e06c: 0x107e06c: jal   0x107847c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -1940,18 +6162,18 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_show_space_before_desc_1077e58(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_show_space_before_desc_107847c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107da50: 0x107da50: addu  a1, s2, zero
+// 0x0107e074: 0x107e074: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x0107da54: 0x107da54: addu  a0, s0, zero
+// 0x0107e078: 0x107e078: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0107da58: 0x107da58: jal   0x107c684 sb    zero, 1120(sp)
+// 0x0107e07c: 0x107e07c: jal   0x107cca8 sb    zero, 1120(sp)
 	ldloc.0
 	ldc.i4 1120
 	add
@@ -1962,23 +6184,23 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::T_412_107c684(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::T_412_107cca8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107da60: 0x107da60: lui   a1, 0x20000
+// 0x0107e084: 0x107e084: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107da64: 0x107da64: addu  a2, s2, zero
+// 0x0107e088: 0x107e088: addu  a2, s2, zero
 	ldloc 8
 	stloc.3
-// 0x0107da68: 0x107da68: addu  a0, s1, zero
+// 0x0107e08c: 0x107e08c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107da6c: 0x107da6c: jal   0x109b3e0 addiu a1, a1, -24804
+// 0x0107e090: 0x107e090: jal   0x109ba28 addiu a1, a1, -24340
 	ldloc.2
-	ldc.i4 -24804
+	ldc.i4 -24340
 	add
 	stloc.2
 	ldloc.0
@@ -1986,35 +6208,35 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107da74: 0x107da74: lb    v0, 156(s0)
+// 0x0107e098: 0x107e098: lb    v0, 156(s0)
 	ldloc 10
 	ldc.i4 156
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107da78: 0x107da78: sll   zero, zero, 0
-// 0x0107da7c: 0x107da7c: beq   v0, zero, 0x107dab0 lui   s2, 0x20000
+// 0x0107e09c: 0x107e09c: sll   zero, zero, 0
+// 0x0107e0a0: 0x107e0a0: beq   v0, zero, 0x107e0d4 lui   s2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 8
-	brfalse L_107dab0
+	brfalse L_107e0d4
 // --- basic block ---
-// 0x0107da84: 0x107da84: addiu a1, s2, -25320
+// 0x0107e0a8: 0x107e0a8: addiu a1, s2, -24856
 	ldloc 8
-	ldc.i4 -25320
+	ldc.i4 -24856
 	add
 	stloc.2
-// 0x0107da88: 0x107da88: addiu a2, s0, 156
+// 0x0107e0ac: 0x107e0ac: addiu a2, s0, 156
 	ldloc 10
 	ldc.i4 156
 	add
 	stloc.3
-// 0x0107da8c: 0x107da8c: jal   0x109b3e0 addu  a0, s1, zero
+// 0x0107e0b0: 0x107e0b0: jal   0x109ba28 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2022,17 +6244,17 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107da94: 0x107da94: addu  a0, s1, zero
+// 0x0107e0b8: 0x107e0b8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107da98: 0x107da98: jal   0x109b304 addiu a1, s2, -25320
+// 0x0107e0bc: 0x107e0bc: jal   0x109b94c addiu a1, s2, -24856
 	ldloc 8
-	ldc.i4 -25320
+	ldc.i4 -24856
 	add
 	stloc.2
 	ldloc.0
@@ -2040,38 +6262,38 @@ L_107da14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107daa0: 0x107daa0: jal   0x10990ac addu  a0, v0, zero
+// 0x0107e0c4: 0x107e0c4: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107daa8: 0x107daa8: j	 0x107dad8 sll   zero, zero, 0
-	br L_107dad8
+// 0x0107e0cc: 0x107e0cc: j	 0x107e0fc sll   zero, zero, 0
+	br L_107e0fc
 // --- basic block ---
-L_107dab0:
-// 0x0107dab0: 0x107dab0: lui   a2, 0x10000
+L_107e0d4:
+// 0x0107e0d4: 0x107e0d4: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0107dab4: 0x107dab4: addiu a2, a2, 18500
+// 0x0107e0d8: 0x107e0d8: addiu a2, a2, 18768
 	ldloc.3
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.3
-// 0x0107dab8: 0x107dab8: addiu a1, s2, -25320
+// 0x0107e0dc: 0x107e0dc: addiu a1, s2, -24856
 	ldloc 8
-	ldc.i4 -25320
+	ldc.i4 -24856
 	add
 	stloc.2
-// 0x0107dabc: 0x107dabc: jal   0x109b3e0 addu  a0, s1, zero
+// 0x0107e0e0: 0x107e0e0: jal   0x109ba28 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2079,17 +6301,17 @@ L_107dab0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_value_109b3e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_value_109ba28(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dac4: 0x107dac4: addu  a0, s1, zero
+// 0x0107e0e8: 0x107e0e8: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107dac8: 0x107dac8: jal   0x109b304 addiu a1, s2, -25320
+// 0x0107e0ec: 0x107e0ec: jal   0x109b94c addiu a1, s2, -24856
 	ldloc 8
-	ldc.i4 -25320
+	ldc.i4 -24856
 	add
 	stloc.2
 	ldloc.0
@@ -2097,20 +6319,20 @@ L_107dab0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dad0: 0x107dad0: jal   0x1099098 addu  a0, v0, zero
+// 0x0107e0f4: 0x107e0f4: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_107dad8:
-// 0x0107dad8: 0x107dad8: jal   0x1078228 addu  a0, s0, zero
+L_107e0fc:
+// 0x0107e0fc: 0x107e0fc: jal   0x107884c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2118,23 +6340,23 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RtAlerts_get_addional_text_1078228(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RtAlerts_get_addional_text_107884c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dae0: 0x107dae0: beq   v0, zero, 0x107db90 lui   a1, 0x20000
+// 0x0107e104: 0x107e104: beq   v0, zero, 0x107e1b4 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_107db90
+	brfalse L_107e1b4
 // --- basic block ---
-// 0x0107dae8: 0x107dae8: addiu a1, a1, -24788
+// 0x0107e10c: 0x107e10c: addiu a1, a1, -24324
 	ldloc.2
-	ldc.i4 -24788
+	ldc.i4 -24324
 	add
 	stloc.2
-// 0x0107daec: 0x107daec: jal   0x109b304 addu  a0, s1, zero
+// 0x0107e110: 0x107e110: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2142,29 +6364,29 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107daf4: 0x107daf4: addu  a0, v0, zero
+// 0x0107e118: 0x107e118: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107daf8: 0x107daf8: jal   0x10990ac lui   s2, 0x20000
+// 0x0107e11c: 0x107e11c: jal   0x10996f4 lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db00: 0x107db00: addiu a1, s2, -24764
+// 0x0107e124: 0x107e124: addiu a1, s2, -24300
 	ldloc 8
-	ldc.i4 -24764
+	ldc.i4 -24300
 	add
 	stloc.2
-// 0x0107db04: 0x107db04: jal   0x109b304 addu  a0, s1, zero
+// 0x0107e128: 0x107e128: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2172,15 +6394,15 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db0c: 0x107db0c: addu  a0, s0, zero
+// 0x0107e130: 0x107e130: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0107db10: 0x107db10: jal   0x1078228 addu  s3, v0, zero
+// 0x0107e134: 0x107e134: jal   0x107884c addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2188,15 +6410,15 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RtAlerts_get_addional_text_1078228(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RtAlerts_get_addional_text_107884c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db18: 0x107db18: addu  a1, v0, zero
+// 0x0107e13c: 0x107e13c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107db1c: 0x107db1c: jal   0x1097e5c addu  a0, s3, zero
+// 0x0107e140: 0x107e140: jal   0x10984a4 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2204,17 +6426,17 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db24: 0x107db24: addiu a1, s2, -24764
+// 0x0107e148: 0x107e148: addiu a1, s2, -24300
 	ldloc 8
-	ldc.i4 -24764
+	ldc.i4 -24300
 	add
 	stloc.2
-// 0x0107db28: 0x107db28: jal   0x109b304 addu  a0, s1, zero
+// 0x0107e14c: 0x107e14c: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2222,21 +6444,21 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db30: 0x107db30: jal   0x10990ac addu  a0, v0, zero
+// 0x0107e154: 0x107e154: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db38: 0x107db38: jal   0x10781f0 addu  a0, s0, zero
+// 0x0107e15c: 0x107e15c: jal   0x1078814 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2244,23 +6466,23 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RtAlerts_get_addional_text_icon_10781f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RtAlerts_get_addional_text_icon_1078814(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db40: 0x107db40: beq   v0, zero, 0x107db88 lui   s2, 0x20000
+// 0x0107e164: 0x107e164: beq   v0, zero, 0x107e1ac lui   s2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 8
-	brfalse L_107db88
+	brfalse L_107e1ac
 // --- basic block ---
-// 0x0107db48: 0x107db48: addiu a1, s2, -24748
+// 0x0107e16c: 0x107e16c: addiu a1, s2, -24284
 	ldloc 8
-	ldc.i4 -24748
+	ldc.i4 -24284
 	add
 	stloc.2
-// 0x0107db4c: 0x107db4c: jal   0x109b304 addu  a0, s1, zero
+// 0x0107e170: 0x107e170: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2268,15 +6490,15 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db54: 0x107db54: addu  a0, s0, zero
+// 0x0107e178: 0x107e178: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0107db58: 0x107db58: jal   0x10781f0 addu  s3, v0, zero
+// 0x0107e17c: 0x107e17c: jal   0x1078814 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2284,15 +6506,15 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RtAlerts_get_addional_text_icon_10781f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RtAlerts_get_addional_text_icon_1078814(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db60: 0x107db60: addu  a1, v0, zero
+// 0x0107e184: 0x107e184: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107db64: 0x107db64: jal   0x109df10 addu  a0, s3, zero
+// 0x0107e188: 0x107e188: jal   0x109e558 addu  a0, s3, zero
 	ldloc 11
 	stloc.1
 	ldloc.0
@@ -2300,17 +6522,17 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db6c: 0x107db6c: addu  a0, s1, zero
+// 0x0107e190: 0x107e190: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107db70: 0x107db70: jal   0x109b304 addiu a1, s2, -24748
+// 0x0107e194: 0x107e194: jal   0x109b94c addiu a1, s2, -24284
 	ldloc 8
-	ldc.i4 -24748
+	ldc.i4 -24284
 	add
 	stloc.2
 	ldloc.0
@@ -2318,41 +6540,41 @@ L_107dad8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db78: 0x107db78: jal   0x10990ac addu  a0, v0, zero
+// 0x0107e19c: 0x107e19c: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db80: 0x107db80: j	 0x107dba8 lui   a1, 0x20000
+// 0x0107e1a4: 0x107e1a4: j	 0x107e1cc lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_107dba8
+	br L_107e1cc
 // --- basic block ---
-L_107db88:
-// 0x0107db88: 0x107db88: j	 0x107db94 addiu a1, s2, -24748
+L_107e1ac:
+// 0x0107e1ac: 0x107e1ac: j	 0x107e1b8 addiu a1, s2, -24284
 	ldloc 8
-	ldc.i4 -24748
+	ldc.i4 -24284
 	add
 	stloc.2
-	br L_107db94
+	br L_107e1b8
 // --- basic block ---
-L_107db90:
-// 0x0107db90: 0x107db90: addiu a1, a1, -24788
+L_107e1b4:
+// 0x0107e1b4: 0x107e1b4: addiu a1, a1, -24324
 	ldloc.2
-	ldc.i4 -24788
+	ldc.i4 -24324
 	add
 	stloc.2
-L_107db94:
-// 0x0107db94: 0x107db94: jal   0x109b304 addu  a0, s1, zero
+L_107e1b8:
+// 0x0107e1b8: 0x107e1b8: jal   0x109b94c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2360,28 +6582,28 @@ L_107db94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107db9c: 0x107db9c: jal   0x1099098 addu  a0, v0, zero
+// 0x0107e1c0: 0x107e1c0: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107dba4: 0x107dba4: lui   a1, 0x20000
+// 0x0107e1c8: 0x107e1c8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_107dba8:
-// 0x0107dba8: 0x107dba8: addu  a0, s1, zero
+L_107e1cc:
+// 0x0107e1cc: 0x107e1cc: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107dbac: 0x107dbac: jal   0x109b304 addiu a1, a1, -25140
+// 0x0107e1d0: 0x107e1d0: jal   0x109b94c addiu a1, a1, -24676
 	ldloc.2
-	ldc.i4 -25140
+	ldc.i4 -24676
 	add
 	stloc.2
 	ldloc.0
@@ -2389,18 +6611,18 @@ L_107dba8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dbb4: 0x107dbb4: beq   v0, zero, 0x107dbf4 addu  a0, v0, zero
+// 0x0107e1d8: 0x107e1d8: beq   v0, zero, 0x107e218 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_107dbf4
+	brfalse L_107e218
 // --- basic block ---
-// 0x0107dbbc: 0x107dbbc: lw    v1, 4(s0)
+// 0x0107e1e0: 0x107e1e0: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -2409,15 +6631,15 @@ L_107dba8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107dbc0: 0x107dbc0: addiu v0, zero, 4
+// 0x0107e1e4: 0x107e1e4: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0107dbc4: 0x107dbc4: beq   v1, v0, 0x107dbdc sll   zero, zero, 0
+// 0x0107e1e8: 0x107e1e8: beq   v1, v0, 0x107e200 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_107dbdc
+	beq  L_107e200
 // --- basic block ---
-// 0x0107dbcc: 0x107dbcc: lw    v0, 1276(s0)
+// 0x0107e1f0: 0x107e1f0: lw    v0, 1276(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -2426,41 +6648,41 @@ L_107dba8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107dbd0: 0x107dbd0: sll   zero, zero, 0
-// 0x0107dbd4: 0x107dbd4: beq   v0, zero, 0x107dbec sll   zero, zero, 0
+// 0x0107e1f4: 0x107e1f4: sll   zero, zero, 0
+// 0x0107e1f8: 0x107e1f8: beq   v0, zero, 0x107e210 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107dbec
+	brfalse L_107e210
 // --- basic block ---
-L_107dbdc:
-// 0x0107dbdc: 0x107dbdc: jal   0x1099098 sll   zero, zero, 0
+L_107e200:
+// 0x0107e200: 0x107e200: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107dbe4: 0x107dbe4: j	 0x107dbf8 lui   a1, 0x20000
+// 0x0107e208: 0x107e208: j	 0x107e21c lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_107dbf8
+	br L_107e21c
 // --- basic block ---
-L_107dbec:
-// 0x0107dbec: 0x107dbec: jal   0x10990ac sll   zero, zero, 0
+L_107e210:
+// 0x0107e210: 0x107e210: jal   0x10996f4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107dbf4:
-// 0x0107dbf4: 0x107dbf4: lui   a1, 0x20000
+L_107e218:
+// 0x0107e218: 0x107e218: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_107dbf8:
-// 0x0107dbf8: 0x107dbf8: addu  a0, s1, zero
+L_107e21c:
+// 0x0107e21c: 0x107e21c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107dbfc: 0x107dbfc: jal   0x109b304 addiu a1, a1, -24732
+// 0x0107e220: 0x107e220: jal   0x109b94c addiu a1, a1, -24268
 	ldloc.2
-	ldc.i4 -24732
+	ldc.i4 -24268
 	add
 	stloc.2
 	ldloc.0
@@ -2468,57 +6690,57 @@ L_107dbf8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dc04: 0x107dc04: beq   v0, zero, 0x107dc34 addu  a0, v0, zero
+// 0x0107e228: 0x107e228: beq   v0, zero, 0x107e258 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_107dc34
+	brfalse L_107e258
 // --- basic block ---
-// 0x0107dc0c: 0x107dc0c: lb    v0, 708(s0)
+// 0x0107e230: 0x107e230: lb    v0, 708(s0)
 	ldloc 10
 	ldc.i4 708
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107dc10: 0x107dc10: sll   zero, zero, 0
-// 0x0107dc14: 0x107dc14: bne   v0, zero, 0x107dc2c sll   zero, zero, 0
+// 0x0107e234: 0x107e234: sll   zero, zero, 0
+// 0x0107e238: 0x107e238: bne   v0, zero, 0x107e250 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107dc2c
+	brtrue L_107e250
 // --- basic block ---
-// 0x0107dc1c: 0x107dc1c: jal   0x1099098 sll   zero, zero, 0
+// 0x0107e240: 0x107e240: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107dc24: 0x107dc24: j	 0x107dc38 lui   a1, 0x20000
+// 0x0107e248: 0x107e248: j	 0x107e25c lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-	br L_107dc38
+	br L_107e25c
 // --- basic block ---
-L_107dc2c:
-// 0x0107dc2c: 0x107dc2c: jal   0x10990ac sll   zero, zero, 0
+L_107e250:
+// 0x0107e250: 0x107e250: jal   0x10996f4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107dc34:
-// 0x0107dc34: 0x107dc34: lui   a1, 0x20000
+L_107e258:
+// 0x0107e258: 0x107e258: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_107dc38:
-// 0x0107dc38: 0x107dc38: addu  a0, s1, zero
+L_107e25c:
+// 0x0107e25c: 0x107e25c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107dc3c: 0x107dc3c: jal   0x109b304 addiu a1, a1, -24712
+// 0x0107e260: 0x107e260: jal   0x109b94c addiu a1, a1, -24248
 	ldloc.2
-	ldc.i4 -24712
+	ldc.i4 -24248
 	add
 	stloc.2
 	ldloc.0
@@ -2526,18 +6748,18 @@ L_107dc38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dc44: 0x107dc44: beq   v0, zero, 0x107dc74 addu  a0, v0, zero
+// 0x0107e268: 0x107e268: beq   v0, zero, 0x107e298 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_107dc74
+	brfalse L_107e298
 // --- basic block ---
-// 0x0107dc4c: 0x107dc4c: lw    v0, 1276(s0)
+// 0x0107e270: 0x107e270: lw    v0, 1276(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -2546,29 +6768,29 @@ L_107dc38:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107dc50: 0x107dc50: sll   zero, zero, 0
-// 0x0107dc54: 0x107dc54: bne   v0, zero, 0x107dc6c sll   zero, zero, 0
+// 0x0107e274: 0x107e274: sll   zero, zero, 0
+// 0x0107e278: 0x107e278: bne   v0, zero, 0x107e290 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107dc6c
+	brtrue L_107e290
 // --- basic block ---
-// 0x0107dc5c: 0x107dc5c: jal   0x1099098 sll   zero, zero, 0
+// 0x0107e280: 0x107e280: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107dc64: 0x107dc64: j	 0x107dc74 sll   zero, zero, 0
-	br L_107dc74
+// 0x0107e288: 0x107e288: j	 0x107e298 sll   zero, zero, 0
+	br L_107e298
 // --- basic block ---
-L_107dc6c:
-// 0x0107dc6c: 0x107dc6c: jal   0x10990ac sll   zero, zero, 0
+L_107e290:
+// 0x0107e290: 0x107e290: jal   0x10996f4 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107dc74:
-// 0x0107dc74: 0x107dc74: lw    v0, 16(s0)
+L_107e298:
+// 0x0107e298: 0x107e298: lw    v0, 16(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -2577,10 +6799,10 @@ L_107dc74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107dc78: 0x107dc78: addu  a0, s1, zero
+// 0x0107e29c: 0x107e29c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107dc7c: 0x107dc7c: sw    v0, 60(sp)
+// 0x0107e2a0: 0x107e2a0: sw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2589,7 +6811,7 @@ L_107dc74:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107dc80: 0x107dc80: lw    v0, 20(s0)
+// 0x0107e2a4: 0x107e2a4: lw    v0, 20(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -2598,12 +6820,12 @@ L_107dc74:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107dc84: 0x107dc84: addiu a1, sp, 60
+// 0x0107e2a8: 0x107e2a8: addiu a1, sp, 60
 	ldloc.0
 	ldc.i4.s 60
 	add
 	stloc.2
-// 0x0107dc88: 0x107dc88: jal   0x109e4d8 sw    v0, 64(sp)
+// 0x0107e2ac: 0x107e2ac: jal   0x109eb20 sw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2614,20 +6836,20 @@ L_107dc74:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl118::ssd_popup_update_location_109e4d8(int32,int32)
+	call int32 Cibyl118::ssd_popup_update_location_109eb20(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dc90: 0x107dc90: lui   a0, 0x20000
+// 0x0107e2b4: 0x107e2b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107dc94: 0x107dc94: addu  a1, zero, zero
+// 0x0107e2b8: 0x107e2b8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107dc98: 0x107dc98: jal   0x1095eec addiu a0, a0, -26748
+// 0x0107e2bc: 0x107e2bc: jal   0x1096534 addiu a0, a0, -26284
 	ldloc.1
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.1
 	ldloc.0
@@ -2635,23 +6857,23 @@ L_107dc74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dca0: 0x107dca0: jal   0x1095020 sll   zero, zero, 0
+// 0x0107e2c4: 0x107e2c4: jal   0x1095668 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095020(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_refresh_current_softkeys_1095668(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dca8: 0x107dca8: jal   0x1098ff8 addu  a0, s1, zero
+// 0x0107e2cc: 0x107e2cc: jal   0x1099640 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2659,12 +6881,12 @@ L_107dc74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_cache_1098ff8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_cache_1099640(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dcb0: 0x107dcb0: jal   0x1099048 addu  a0, s1, zero
+// 0x0107e2d4: 0x107e2d4: jal   0x1099690 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -2672,34 +6894,34 @@ L_107dc74:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_reset_position_1099048(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_reset_position_1099690(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dcb8: 0x107dcb8: j	 0x107e84c sll   zero, zero, 0
-	br L_107e84c
+// 0x0107e2dc: 0x107e2dc: j	 0x107ee70 sll   zero, zero, 0
+	br L_107ee70
 // --- basic block ---
-L_107dcc0:
-// 0x0107dcc0: 0x107dcc0: lw    a0, 0(s0)
+L_107e2e4:
+// 0x0107e2e4: 0x107e2e4: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107dcc4: 0x107dcc4: addiu v1, zero, -1
+// 0x0107e2e8: 0x107e2e8: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0107dcc8: 0x107dcc8: lui   v0, 0x80000
+// 0x0107e2ec: 0x107e2ec: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107dccc: 0x107dccc: jal   0x107756c sw    v1, -14000(v0)
+// 0x0107e2f0: 0x107e2f0: jal   0x1077b90 sw    v1, -13536(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3500
+	ldc.i4 -3384
 	add
 	ldloc 6
 	stelem.i4
@@ -2708,23 +6930,23 @@ L_107dcc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Icon_107756c(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Icon_1077b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dcd4: 0x107dcd4: lui   a2, 0x100000
+// 0x0107e2f8: 0x107e2f8: lui   a2, 0x100000
 	ldc.i4 1048576
 	stloc.3
-// 0x0107dcd8: 0x107dcd8: addiu a0, s2, -25728
+// 0x0107e2fc: 0x107e2fc: addiu a0, s2, -25264
 	ldloc 8
-	ldc.i4 -25728
+	ldc.i4 -25264
 	add
 	stloc.1
-// 0x0107dcdc: 0x107dcdc: addu  a1, v0, zero
+// 0x0107e300: 0x107e300: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107dce0: 0x107dce0: jal   0x109e13c ori   a2, a2, 1
+// 0x0107e304: 0x107e304: jal   0x109e784 ori   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	or
@@ -2734,19 +6956,19 @@ L_107dcc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dce8: 0x107dce8: lw    a0, 0(s0)
+// 0x0107e30c: 0x107e30c: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107dcec: 0x107dcec: jal   0x1077724 sw    v0, 1832(sp)
+// 0x0107e310: 0x107e310: jal   0x1077d48 sw    v0, 1832(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2759,28 +6981,28 @@ L_107dcc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_Of_AddOns_1077724(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_Number_Of_AddOns_1077d48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dcf4: 0x107dcf4: addu  s1, zero, zero
+// 0x0107e318: 0x107e318: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x0107dcf8: 0x107dcf8: j	 0x107dd20 addu  s2, v0, zero
+// 0x0107e31c: 0x107e31c: j	 0x107e344 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-	br L_107dd20
+	br L_107e344
 // --- basic block ---
-L_107dd00:
-// 0x0107dd00: 0x107dd00: lw    a0, 0(s0)
+L_107e324:
+// 0x0107e324: 0x107e324: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107dd04: 0x107dd04: jal   0x10777b8 addiu s1, s1, 1
+// 0x0107e328: 0x107e328: jal   0x1077ddc addiu s1, s1, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -2789,12 +7011,12 @@ L_107dd00:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_AddOn_10777b8(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_AddOn_1077ddc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dd0c: 0x107dd0c: lw    a0, 1832(sp)
+// 0x0107e330: 0x107e330: lw    a0, 1832(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2803,49 +7025,49 @@ L_107dd00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107dd10: 0x107dd10: beq   v0, zero, 0x107dd20 addu  a1, v0, zero
+// 0x0107e334: 0x107e334: beq   v0, zero, 0x107e344 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
-	brfalse L_107dd20
+	brfalse L_107e344
 // --- basic block ---
-// 0x0107dd18: 0x107dd18: jal   0x109ddec sll   zero, zero, 0
+// 0x0107e33c: 0x107e33c: jal   0x109e434 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_add_overlay_109ddec(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_add_overlay_109e434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107dd20:
-// 0x0107dd20: 0x107dd20: slt   v0, s1, s2
+L_107e344:
+// 0x0107e344: 0x107e344: slt   v0, s1, s2
 	ldloc 9
 	ldloc 8
 	clt
 	stloc 5
-// 0x0107dd24: 0x107dd24: bne   v0, zero, 0x107dd00 addu  a1, s1, zero
+// 0x0107e348: 0x107e348: bne   v0, zero, 0x107e324 addu  a1, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brtrue L_107dd00
+	brtrue L_107e324
 // --- basic block ---
-// 0x0107dd2c: 0x107dd2c: slt   v0, s4, s3
+// 0x0107e350: 0x107e350: slt   v0, s4, s3
 	ldloc 12
 	ldloc 11
 	clt
 	stloc 5
-// 0x0107dd30: 0x107dd30: beq   v0, zero, 0x107dd3c sll   zero, zero, 0
+// 0x0107e354: 0x107e354: beq   v0, zero, 0x107e360 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107dd3c
+	brfalse L_107e360
 // --- basic block ---
-// 0x0107dd38: 0x107dd38: addu  s3, s4, zero
+// 0x0107e35c: 0x107e35c: addu  s3, s4, zero
 	ldloc 12
 	stloc 11
-L_107dd3c:
-// 0x0107dd3c: 0x107dd3c: lw    a0, 1832(sp)
+L_107e360:
+// 0x0107e360: 0x107e360: lw    a0, 1832(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2854,12 +7076,12 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107dd40: 0x107dd40: addiu a1, sp, 44
+// 0x0107e364: 0x107e364: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x0107dd44: 0x107dd44: jal   0x1099350 addu  a2, zero, zero
+// 0x0107e368: 0x107e368: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -2867,12 +7089,12 @@ L_107dd3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dd4c: 0x107dd4c: lw    a2, 44(sp)
+// 0x0107e370: 0x107e370: lw    a2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2881,7 +7103,7 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107dd50: 0x107dd50: lw    v0, 1828(sp)
+// 0x0107e374: 0x107e374: lw    v0, 1828(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2890,41 +7112,41 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107dd54: 0x107dd54: subu  a2, s3, a2
+// 0x0107e378: 0x107e378: subu  a2, s3, a2
 	ldloc 11
 	ldloc.3
 	sub
 	stloc.3
-// 0x0107dd58: 0x107dd58: lui   s5, 0x10000
+// 0x0107e37c: 0x107e37c: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 13
-// 0x0107dd5c: 0x107dd5c: addiu a2, a2, -10
+// 0x0107e380: 0x107e380: addiu a2, a2, -10
 	ldloc.3
 	ldc.i4.s -10
 	add
 	stloc.3
-// 0x0107dd60: 0x107dd60: lui   a0, 0x20000
+// 0x0107e384: 0x107e384: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107dd64: 0x107dd64: addiu a3, zero, -1
+// 0x0107e388: 0x107e388: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107dd68: 0x107dd68: subu  a2, a2, v0
+// 0x0107e38c: 0x107e38c: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x0107dd6c: 0x107dd6c: addiu a0, a0, -25208
+// 0x0107e390: 0x107e390: addiu a0, a0, -24744
 	ldloc.1
-	ldc.i4 -25208
+	ldc.i4 -24744
 	add
 	stloc.1
-// 0x0107dd70: 0x107dd70: addiu a1, s5, 18500
+// 0x0107e394: 0x107e394: addiu a1, s5, 18768
 	ldloc 13
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107dd74: 0x107dd74: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0107e398: 0x107e398: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2938,48 +7160,48 @@ L_107dd3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dd7c: 0x107dd7c: addu  a0, v0, zero
+// 0x0107e3a0: 0x107e3a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107dd80: 0x107dd80: addu  a1, zero, zero
+// 0x0107e3a4: 0x107e3a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107dd84: 0x107dd84: addu  a2, zero, zero
+// 0x0107e3a8: 0x107e3a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107dd88: 0x107dd88: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0107e3ac: 0x107e3ac: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107dd90: 0x107dd90: lui   a0, 0x20000
+// 0x0107e3b4: 0x107e3b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107dd94: 0x107dd94: addiu a3, zero, -1
+// 0x0107e3b8: 0x107e3b8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107dd98: 0x107dd98: addiu a0, a0, -25188
+// 0x0107e3bc: 0x107e3bc: addiu a0, a0, -24724
 	ldloc.1
-	ldc.i4 -25188
+	ldc.i4 -24724
 	add
 	stloc.1
-// 0x0107dd9c: 0x107dd9c: addiu a1, s5, 18500
+// 0x0107e3c0: 0x107e3c0: addiu a1, s5, 18768
 	ldloc 13
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107dda0: 0x107dda0: addiu a2, zero, -1
+// 0x0107e3c4: 0x107e3c4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0107dda4: 0x107dda4: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0107e3c8: 0x107e3c8: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2993,29 +7215,29 @@ L_107dd3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ddac: 0x107ddac: addu  a0, v0, zero
+// 0x0107e3d0: 0x107e3d0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107ddb0: 0x107ddb0: addu  a1, zero, zero
+// 0x0107e3d4: 0x107e3d4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107ddb4: 0x107ddb4: addu  a2, zero, zero
+// 0x0107e3d8: 0x107e3d8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107ddb8: 0x107ddb8: jal   0x1098fe0 addu  s4, v0, zero
+// 0x0107e3dc: 0x107e3dc: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107ddc0: 0x107ddc0: lw    a1, 4(s0)
+// 0x0107e3e4: 0x107e3e4: lw    a1, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -3024,7 +7246,7 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107ddc4: 0x107ddc4: lw    a2, 8(s0)
+// 0x0107e3e8: 0x107e3e8: lw    a2, 8(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -3033,7 +7255,7 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107ddc8: 0x107ddc8: jal   0x1077ea8 addu  a0, s0, zero
+// 0x0107e3ec: 0x107e3ec: jal   0x10784cc addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -3041,26 +7263,26 @@ L_107dd3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_get_title_1077ea8(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_get_title_10784cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ddd0: 0x107ddd0: lui   a0, 0x20000
+// 0x0107e3f4: 0x107e3f4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107ddd4: 0x107ddd4: addiu a3, zero, 8
+// 0x0107e3f8: 0x107e3f8: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0107ddd8: 0x107ddd8: addu  a1, v0, zero
+// 0x0107e3fc: 0x107e3fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107dddc: 0x107dddc: addiu a0, a0, -25160
+// 0x0107e400: 0x107e400: addiu a0, a0, -24696
 	ldloc.1
-	ldc.i4 -25160
+	ldc.i4 -24696
 	add
 	stloc.1
-// 0x0107dde0: 0x107dde0: jal   0x1098d10 addiu a2, zero, 18
+// 0x0107e404: 0x107e404: jal   0x1099358 addiu a2, zero, 18
 	ldc.i4.s 18
 	stloc.3
 	ldloc.0
@@ -3068,26 +7290,26 @@ L_107dd3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dde8: 0x107dde8: lui   s2, 0x0
+// 0x0107e40c: 0x107e40c: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x0107ddec: 0x107ddec: addu  a0, v0, zero
+// 0x0107e410: 0x107e410: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107ddf0: 0x107ddf0: addu  a2, zero, zero
+// 0x0107e414: 0x107e414: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107ddf4: 0x107ddf4: addiu a1, s2, 23000
+// 0x0107e418: 0x107e418: addiu a1, s2, 23000
 	ldloc 8
 	ldc.i4 23000
 	add
 	stloc.2
-// 0x0107ddf8: 0x107ddf8: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e41c: 0x107e41c: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3099,9 +7321,9 @@ L_107dd3c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107de00: 0x107de00: lw    v0, 1844(sp)
+// 0x0107e424: 0x107e424: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3110,38 +7332,38 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107de04: 0x107de04: addu  a0, s1, zero
+// 0x0107e428: 0x107e428: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107de08: 0x107de08: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107e42c: 0x107e42c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107de10: 0x107de10: lui   a0, 0x20000
+// 0x0107e434: 0x107e434: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107de14: 0x107de14: ori   a3, zero, 32776
+// 0x0107e438: 0x107e438: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x0107de18: 0x107de18: addiu a0, a0, -24996
+// 0x0107e43c: 0x107e43c: addiu a0, a0, -24532
 	ldloc.1
-	ldc.i4 -24996
+	ldc.i4 -24532
 	add
 	stloc.1
-// 0x0107de1c: 0x107de1c: addiu a1, s0, 557
+// 0x0107e440: 0x107e440: addiu a1, s0, 557
 	ldloc 10
 	ldc.i4 557
 	add
 	stloc.2
-// 0x0107de20: 0x107de20: jal   0x1098d10 addiu a2, zero, 16
+// 0x0107e444: 0x107e444: jal   0x1099358 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.0
@@ -3149,23 +7371,23 @@ L_107dd3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107de28: 0x107de28: addu  a0, v0, zero
+// 0x0107e44c: 0x107e44c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107de2c: 0x107de2c: addiu a1, s2, 23000
+// 0x0107e450: 0x107e450: addiu a1, s2, 23000
 	ldloc 8
 	ldc.i4 23000
 	add
 	stloc.2
-// 0x0107de30: 0x107de30: addu  a2, zero, zero
+// 0x0107e454: 0x107e454: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107de34: 0x107de34: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e458: 0x107e458: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3177,9 +7399,9 @@ L_107dd3c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107de3c: 0x107de3c: lw    v0, 1844(sp)
+// 0x0107e460: 0x107e460: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3188,42 +7410,42 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107de40: 0x107de40: addu  a0, s1, zero
+// 0x0107e464: 0x107e464: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107de44: 0x107de44: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107e468: 0x107e468: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107de4c: 0x107de4c: lui   a0, 0x10000
+// 0x0107e470: 0x107e470: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107de50: 0x107de50: addiu a3, zero, 5
+// 0x0107e474: 0x107e474: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x0107de54: 0x107de54: addiu a0, a0, 1764
+// 0x0107e478: 0x107e478: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x0107de58: 0x107de58: addiu a1, s5, 18500
+// 0x0107e47c: 0x107e47c: addiu a1, s5, 18768
 	ldloc 13
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107de5c: 0x107de5c: addiu a2, zero, -1
+// 0x0107e480: 0x107e480: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0107de60: 0x107de60: addiu v0, zero, 8
+// 0x0107e484: 0x107e484: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0107de64: 0x107de64: sw    v0, 16(sp)
+// 0x0107e488: 0x107e488: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3232,7 +7454,7 @@ L_107dd3c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107de68: 0x107de68: jal   0x1093a24 sb    zero, 420(sp)
+// 0x0107e48c: 0x107e48c: jal   0x1094048 sb    zero, 420(sp)
 	ldloc.0
 	ldc.i4 420
 	add
@@ -3243,21 +7465,21 @@ L_107dd3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107de70: 0x107de70: addu  a0, v0, zero
+// 0x0107e494: 0x107e494: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107de74: 0x107de74: addu  a2, zero, zero
+// 0x0107e498: 0x107e498: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107de78: 0x107de78: addu  a1, zero, zero
+// 0x0107e49c: 0x107e49c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107de7c: 0x107de7c: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e4a0: 0x107e4a0: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3269,9 +7491,9 @@ L_107dd3c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107de84: 0x107de84: lw    v0, 1844(sp)
+// 0x0107e4a8: 0x107e4a8: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3280,40 +7502,40 @@ L_107dd3c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107de88: 0x107de88: addu  a0, s1, zero
+// 0x0107e4ac: 0x107e4ac: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107de8c: 0x107de8c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107e4b0: 0x107e4b0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107de94: 0x107de94: lb    v0, 156(s0)
+// 0x0107e4b8: 0x107e4b8: lb    v0, 156(s0)
 	ldloc 10
 	ldc.i4 156
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107de98: 0x107de98: lui   s2, 0x20000
+// 0x0107e4bc: 0x107e4bc: lui   s2, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0107de9c: 0x107de9c: beq   v0, zero, 0x107dee0 lui   s8, 0x0
+// 0x0107e4c0: 0x107e4c0: beq   v0, zero, 0x107e504 lui   s8, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 15
-	brfalse L_107dee0
+	brfalse L_107e504
 // --- basic block ---
-// 0x0107dea4: 0x107dea4: addiu s5, sp, 420
+// 0x0107e4c8: 0x107e4c8: addiu s5, sp, 420
 	ldloc.0
 	ldc.i4 420
 	add
 	stloc 13
-// 0x0107dea8: 0x107dea8: jal   0x1001b48 addu  a0, s5, zero
+// 0x0107e4cc: 0x107e4cc: jal   0x1001b48 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
@@ -3322,28 +7544,28 @@ L_107dd3c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107deb0: 0x107deb0: addiu a1, zero, 700
+// 0x0107e4d4: 0x107e4d4: addiu a1, zero, 700
 	ldc.i4 700
 	stloc.2
-// 0x0107deb4: 0x107deb4: lui   a2, 0x10000
+// 0x0107e4d8: 0x107e4d8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0107deb8: 0x107deb8: subu  a1, a1, v0
+// 0x0107e4dc: 0x107e4dc: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0107debc: 0x107debc: addiu a2, a2, 19912
+// 0x0107e4e0: 0x107e4e0: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0107dec0: 0x107dec0: addu  a0, s5, v0
+// 0x0107e4e4: 0x107e4e4: addu  a0, s5, v0
 	ldloc 13
 	ldloc 5
 	add
 	stloc.1
-// 0x0107dec4: 0x107dec4: jal   0x1000f9c addiu a3, s0, 156
+// 0x0107e4e8: 0x107e4e8: jal   0x1000f9c addiu a3, s0, 156
 	ldloc 10
 	ldc.i4 156
 	add
@@ -3358,41 +7580,41 @@ L_107dd3c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107decc: 0x107decc: addu  a1, s5, zero
+// 0x0107e4f0: 0x107e4f0: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x0107ded0: 0x107ded0: addiu a0, s2, -25320
+// 0x0107e4f4: 0x107e4f4: addiu a0, s2, -24856
 	ldloc 8
-	ldc.i4 -25320
+	ldc.i4 -24856
 	add
 	stloc.1
-// 0x0107ded4: 0x107ded4: addu  a3, zero, zero
+// 0x0107e4f8: 0x107e4f8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0107ded8: 0x107ded8: j	 0x107def0 addiu a2, zero, 16
+// 0x0107e4fc: 0x107e4fc: j	 0x107e514 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-	br L_107def0
+	br L_107e514
 // --- basic block ---
-L_107dee0:
-// 0x0107dee0: 0x107dee0: addiu a1, s5, 18500
+L_107e504:
+// 0x0107e504: 0x107e504: addiu a1, s5, 18768
 	ldloc 13
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107dee4: 0x107dee4: addiu a0, s2, -25320
+// 0x0107e508: 0x107e508: addiu a0, s2, -24856
 	ldloc 8
-	ldc.i4 -25320
+	ldc.i4 -24856
 	add
 	stloc.1
-// 0x0107dee8: 0x107dee8: addu  a3, zero, zero
+// 0x0107e50c: 0x107e50c: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0107deec: 0x107deec: addiu a2, zero, 14
+// 0x0107e510: 0x107e510: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-L_107def0:
-// 0x0107def0: 0x107def0: jal   0x1098d10 addiu s2, sp, 420
+L_107e514:
+// 0x0107e514: 0x107e514: jal   0x1099358 addiu s2, sp, 420
 	ldloc.0
 	ldc.i4 420
 	add
@@ -3402,23 +7624,23 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107def8: 0x107def8: addu  a0, v0, zero
+// 0x0107e51c: 0x107e51c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107defc: 0x107defc: addu  a2, zero, zero
+// 0x0107e520: 0x107e520: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107df00: 0x107df00: addiu a1, s8, 23008
+// 0x0107e524: 0x107e524: addiu a1, s8, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0107df04: 0x107df04: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e528: 0x107e528: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3430,9 +7652,9 @@ L_107def0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107df0c: 0x107df0c: lw    v0, 1844(sp)
+// 0x0107e530: 0x107e530: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3441,64 +7663,64 @@ L_107def0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107df10: 0x107df10: addu  a0, s4, zero
+// 0x0107e534: 0x107e534: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0107df14: 0x107df14: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107e538: 0x107e538: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107df1c: 0x107df1c: addu  a1, s4, zero
+// 0x0107e540: 0x107e540: addu  a1, s4, zero
 	ldloc 12
 	stloc.2
-// 0x0107df20: 0x107df20: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0107e544: 0x107e544: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107df28: 0x107df28: lui   s4, 0x10000
+// 0x0107e54c: 0x107e54c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0107df2c: 0x107df2c: lui   a0, 0x10000
+// 0x0107e550: 0x107e550: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107df30: 0x107df30: addiu a3, zero, 5
+// 0x0107e554: 0x107e554: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x0107df34: 0x107df34: addiu a0, a0, 1764
+// 0x0107e558: 0x107e558: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x0107df38: 0x107df38: addiu a1, s4, 18500
+// 0x0107e55c: 0x107e55c: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107df3c: 0x107df3c: addiu a2, zero, -1
+// 0x0107e560: 0x107e560: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0107df40: 0x107df40: addiu v0, zero, 8
+// 0x0107e564: 0x107e564: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0107df44: 0x107df44: sb    zero, 420(sp)
+// 0x0107e568: 0x107e568: sb    zero, 420(sp)
 	ldloc.0
 	ldc.i4 420
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107df48: 0x107df48: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107e56c: 0x107e56c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3512,21 +7734,21 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107df50: 0x107df50: addu  a0, v0, zero
+// 0x0107e574: 0x107e574: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107df54: 0x107df54: addu  a2, zero, zero
+// 0x0107e578: 0x107e578: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107df58: 0x107df58: addu  a1, zero, zero
+// 0x0107e57c: 0x107e57c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107df5c: 0x107df5c: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e580: 0x107e580: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3538,9 +7760,9 @@ L_107def0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107df64: 0x107df64: lw    v0, 1844(sp)
+// 0x0107e588: 0x107e588: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3549,27 +7771,27 @@ L_107def0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107df68: 0x107df68: sll   zero, zero, 0
-// 0x0107df6c: 0x107df6c: addu  a1, v0, zero
+// 0x0107e58c: 0x107e58c: sll   zero, zero, 0
+// 0x0107e590: 0x107e590: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107df70: 0x107df70: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0107e594: 0x107e594: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107df78: 0x107df78: addu  a1, s2, zero
+// 0x0107e59c: 0x107e59c: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x0107df7c: 0x107df7c: addu  a0, s0, zero
+// 0x0107e5a0: 0x107e5a0: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0107df80: 0x107df80: jal   0x1079534 addiu a2, zero, 700
+// 0x0107e5a4: 0x107e5a4: jal   0x1079b58 addiu a2, zero, 700
 	ldc.i4 700
 	stloc.3
 	ldloc.0
@@ -3577,28 +7799,28 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_get_report_info_str_1079534(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_get_report_info_str_1079b58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107df88: 0x107df88: lui   a0, 0x20000
+// 0x0107e5ac: 0x107e5ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107df8c: 0x107df8c: ori   a3, zero, 32776
+// 0x0107e5b0: 0x107e5b0: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x0107df90: 0x107df90: addu  a1, s2, zero
+// 0x0107e5b4: 0x107e5b4: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x0107df94: 0x107df94: addiu a0, a0, -24980
+// 0x0107e5b8: 0x107e5b8: addiu a0, a0, -24516
 	ldloc.1
-	ldc.i4 -24980
+	ldc.i4 -24516
 	add
 	stloc.1
-// 0x0107df98: 0x107df98: jal   0x1098d10 addiu a2, zero, 14
+// 0x0107e5bc: 0x107e5bc: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -3606,26 +7828,26 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dfa0: 0x107dfa0: lui   s8, 0x0
+// 0x0107e5c4: 0x107e5c4: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 15
-// 0x0107dfa4: 0x107dfa4: addu  a0, v0, zero
+// 0x0107e5c8: 0x107e5c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107dfa8: 0x107dfa8: addu  a2, zero, zero
+// 0x0107e5cc: 0x107e5cc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107dfac: 0x107dfac: addiu a1, s8, 23008
+// 0x0107e5d0: 0x107e5d0: addiu a1, s8, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0107dfb0: 0x107dfb0: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e5d4: 0x107e5d4: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3637,9 +7859,9 @@ L_107def0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107dfb8: 0x107dfb8: lw    v0, 1844(sp)
+// 0x0107e5dc: 0x107e5dc: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3648,20 +7870,20 @@ L_107def0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107dfbc: 0x107dfbc: addu  a0, s1, zero
+// 0x0107e5e0: 0x107e5e0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107dfc0: 0x107dfc0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107e5e4: 0x107e5e4: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dfc8: 0x107dfc8: lw    a2, 44(sp)
+// 0x0107e5ec: 0x107e5ec: lw    a2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3670,33 +7892,33 @@ L_107def0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107dfcc: 0x107dfcc: lui   a0, 0x20000
+// 0x0107e5f0: 0x107e5f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107dfd0: 0x107dfd0: subu  a2, s3, a2
+// 0x0107e5f4: 0x107e5f4: subu  a2, s3, a2
 	ldloc 11
 	ldloc.3
 	sub
 	stloc.3
-// 0x0107dfd4: 0x107dfd4: addiu a3, zero, -1
+// 0x0107e5f8: 0x107e5f8: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107dfd8: 0x107dfd8: addiu a2, a2, -2
+// 0x0107e5fc: 0x107e5fc: addiu a2, a2, -2
 	ldloc.3
 	ldc.i4.s -2
 	add
 	stloc.3
-// 0x0107dfdc: 0x107dfdc: addiu a0, a0, -24968
+// 0x0107e600: 0x107e600: addiu a0, a0, -24504
 	ldloc.1
-	ldc.i4 -24968
+	ldc.i4 -24504
 	add
 	stloc.1
-// 0x0107dfe0: 0x107dfe0: addiu a1, s4, 18500
+// 0x0107e604: 0x107e604: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107dfe4: 0x107dfe4: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0107e608: 0x107e608: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3710,29 +7932,29 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107dfec: 0x107dfec: addu  a0, v0, zero
+// 0x0107e610: 0x107e610: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107dff0: 0x107dff0: addu  a1, zero, zero
+// 0x0107e614: 0x107e614: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107dff4: 0x107dff4: addu  a2, zero, zero
+// 0x0107e618: 0x107e618: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107dff8: 0x107dff8: jal   0x1098fe0 addu  s5, v0, zero
+// 0x0107e61c: 0x107e61c: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 13
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e000: 0x107e000: lw    a2, 44(sp)
+// 0x0107e624: 0x107e624: lw    a2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3741,38 +7963,38 @@ L_107def0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107e004: 0x107e004: lui   a0, 0x20000
+// 0x0107e628: 0x107e628: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e008: 0x107e008: subu  a2, s3, a2
+// 0x0107e62c: 0x107e62c: subu  a2, s3, a2
 	ldloc 11
 	ldloc.3
 	sub
 	stloc.3
-// 0x0107e00c: 0x107e00c: addiu a2, a2, -6
+// 0x0107e630: 0x107e630: addiu a2, a2, -6
 	ldloc.3
 	ldc.i4.s -6
 	add
 	stloc.3
-// 0x0107e010: 0x107e010: subu  a2, a2, s6
+// 0x0107e634: 0x107e634: subu  a2, a2, s6
 	ldloc.3
 	ldloc 16
 	sub
 	stloc.3
-// 0x0107e014: 0x107e014: addiu a3, zero, -1
+// 0x0107e638: 0x107e638: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107e018: 0x107e018: addiu a0, a0, -24692
+// 0x0107e63c: 0x107e63c: addiu a0, a0, -24228
 	ldloc.1
-	ldc.i4 -24692
+	ldc.i4 -24228
 	add
 	stloc.1
-// 0x0107e01c: 0x107e01c: addiu a1, s4, 18500
+// 0x0107e640: 0x107e640: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e020: 0x107e020: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0107e644: 0x107e644: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3786,51 +8008,51 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e028: 0x107e028: addu  a0, v0, zero
+// 0x0107e64c: 0x107e64c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e02c: 0x107e02c: addu  a1, zero, zero
+// 0x0107e650: 0x107e650: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e030: 0x107e030: addu  a2, zero, zero
+// 0x0107e654: 0x107e654: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e034: 0x107e034: jal   0x1098fe0 addu  s2, v0, zero
+// 0x0107e658: 0x107e658: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e03c: 0x107e03c: lui   a0, 0x20000
+// 0x0107e660: 0x107e660: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e040: 0x107e040: addu  a3, s7, zero
+// 0x0107e664: 0x107e664: addu  a3, s7, zero
 	ldloc 14
 	stloc 4
-// 0x0107e044: 0x107e044: addu  a2, s6, zero
+// 0x0107e668: 0x107e668: addu  a2, s6, zero
 	ldloc 16
 	stloc.3
-// 0x0107e048: 0x107e048: addiu a0, a0, -25252
+// 0x0107e66c: 0x107e66c: addiu a0, a0, -24788
 	ldloc.1
-	ldc.i4 -25252
+	ldc.i4 -24788
 	add
 	stloc.1
-// 0x0107e04c: 0x107e04c: addiu a1, s4, 18500
+// 0x0107e670: 0x107e670: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e050: 0x107e050: addiu v0, zero, 16
+// 0x0107e674: 0x107e674: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0107e054: 0x107e054: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107e678: 0x107e678: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3844,47 +8066,47 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e05c: 0x107e05c: addiu a1, s8, 23008
+// 0x0107e680: 0x107e680: addiu a1, s8, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0107e060: 0x107e060: addu  a0, v0, zero
+// 0x0107e684: 0x107e684: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e064: 0x107e064: addu  a2, a1, zero
+// 0x0107e688: 0x107e688: addu  a2, a1, zero
 	ldloc.2
 	stloc.3
-// 0x0107e068: 0x107e068: jal   0x1098fe0 addu  s6, v0, zero
+// 0x0107e68c: 0x107e68c: jal   0x1099628 addu  s6, v0, zero
 	ldloc 5
 	stloc 16
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e070: 0x107e070: lui   a0, 0x20000
+// 0x0107e694: 0x107e694: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e074: 0x107e074: lui   a1, 0x20000
+// 0x0107e698: 0x107e698: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107e078: 0x107e078: addiu a2, zero, 17
+// 0x0107e69c: 0x107e69c: addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
-// 0x0107e07c: 0x107e07c: addiu a0, a0, -25268
+// 0x0107e6a0: 0x107e6a0: addiu a0, a0, -24804
 	ldloc.1
-	ldc.i4 -25268
+	ldc.i4 -24804
 	add
 	stloc.1
-// 0x0107e080: 0x107e080: jal   0x109e13c addiu a1, a1, -24948
+// 0x0107e6a4: 0x107e6a4: jal   0x109e784 addiu a1, a1, -24484
 	ldloc.2
-	ldc.i4 -24948
+	ldc.i4 -24484
 	add
 	stloc.2
 	ldloc.0
@@ -3892,18 +8114,18 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e088: 0x107e088: addu  a1, v0, zero
+// 0x0107e6ac: 0x107e6ac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e08c: 0x107e08c: addu  a0, s6, zero
+// 0x0107e6b0: 0x107e6b0: addu  a0, s6, zero
 	ldloc 16
 	stloc.1
-// 0x0107e090: 0x107e090: sw    v0, 1840(sp)
+// 0x0107e6b4: 0x107e6b4: sw    v0, 1840(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3912,41 +8134,41 @@ L_107def0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e094: 0x107e094: jal   0x1098ec4 addiu s7, sp, 80
+// 0x0107e6b8: 0x107e6b8: jal   0x109950c addiu s7, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 14
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e09c: 0x107e09c: addu  a0, s5, zero
+// 0x0107e6c0: 0x107e6c0: addu  a0, s5, zero
 	ldloc 13
 	stloc.1
-// 0x0107e0a0: 0x107e0a0: jal   0x1098ec4 addu  a1, s6, zero
+// 0x0107e6c4: 0x107e6c4: jal   0x109950c addu  a1, s6, zero
 	ldloc 16
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e0a8: 0x107e0a8: addu  a1, s7, zero
+// 0x0107e6cc: 0x107e6cc: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x0107e0ac: 0x107e0ac: addu  a0, s0, zero
+// 0x0107e6d0: 0x107e6d0: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0107e0b0: 0x107e0b0: addiu a2, zero, 100
+// 0x0107e6d4: 0x107e6d4: addiu a2, zero, 100
 	ldc.i4.s 100
 	stloc.3
-// 0x0107e0b4: 0x107e0b4: jal   0x1077fd8 sb    zero, 80(sp)
+// 0x0107e6d8: 0x107e6d8: jal   0x10785fc sb    zero, 80(sp)
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -3957,28 +8179,28 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_get_reported_by_string_1077fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_get_reported_by_string_10785fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e0bc: 0x107e0bc: lui   a0, 0x20000
+// 0x0107e6e0: 0x107e6e0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e0c0: 0x107e0c0: ori   a3, zero, 32768
+// 0x0107e6e4: 0x107e6e4: ori   a3, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 4
-// 0x0107e0c4: 0x107e0c4: addu  a1, s7, zero
+// 0x0107e6e8: 0x107e6e8: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-// 0x0107e0c8: 0x107e0c8: addiu a0, a0, -24824
+// 0x0107e6ec: 0x107e6ec: addiu a0, a0, -24360
 	ldloc.1
-	ldc.i4 -24824
+	ldc.i4 -24360
 	add
 	stloc.1
-// 0x0107e0cc: 0x107e0cc: jal   0x1098d10 addiu a2, zero, 14
+// 0x0107e6f0: 0x107e6f0: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -3986,23 +8208,23 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e0d4: 0x107e0d4: addu  a0, v0, zero
+// 0x0107e6f8: 0x107e6f8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e0d8: 0x107e0d8: addiu a1, s8, 23008
+// 0x0107e6fc: 0x107e6fc: addiu a1, s8, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0107e0dc: 0x107e0dc: addu  a2, zero, zero
+// 0x0107e700: 0x107e700: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e0e0: 0x107e0e0: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e704: 0x107e704: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4014,15 +8236,15 @@ L_107def0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e0e8: 0x107e0e8: addu  a2, zero, zero
+// 0x0107e70c: 0x107e70c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e0ec: 0x107e0ec: addu  a0, s2, zero
+// 0x0107e710: 0x107e710: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107e0f0: 0x107e0f0: jal   0x109434c addiu a1, zero, 5
+// 0x0107e714: 0x107e714: jal   0x1094970 addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
 	ldloc.0
@@ -4030,12 +8252,12 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e0f8: 0x107e0f8: lw    v0, 1844(sp)
+// 0x0107e71c: 0x107e71c: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4044,23 +8266,23 @@ L_107def0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e0fc: 0x107e0fc: addu  a0, s2, zero
+// 0x0107e720: 0x107e720: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107e100: 0x107e100: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107e724: 0x107e724: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e108: 0x107e108: addu  a0, s2, zero
+// 0x0107e72c: 0x107e72c: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107e10c: 0x107e10c: jal   0x1078448 addu  a1, s0, zero
+// 0x0107e730: 0x107e730: jal   0x1078a6c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -4068,28 +8290,28 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_update_stars_1078448(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_update_stars_1078a6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e114: 0x107e114: lui   a0, 0x20000
+// 0x0107e738: 0x107e738: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e118: 0x107e118: addiu a0, a0, -24916
+// 0x0107e73c: 0x107e73c: addiu a0, a0, -24452
 	ldloc.1
-	ldc.i4 -24916
+	ldc.i4 -24452
 	add
 	stloc.1
-// 0x0107e11c: 0x107e11c: addiu a1, s4, 18500
+// 0x0107e740: 0x107e740: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e120: 0x107e120: addiu a2, zero, 14
+// 0x0107e744: 0x107e744: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x0107e124: 0x107e124: jal   0x1098d10 ori   a3, zero, 32768
+// 0x0107e748: 0x107e748: jal   0x1099358 ori   a3, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
@@ -4099,37 +8321,37 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e12c: 0x107e12c: lui   t0, 0x20000
+// 0x0107e750: 0x107e750: lui   t0, 0x20000
 	ldc.i4 131072
 	stloc 17
-// 0x0107e130: 0x107e130: addiu a0, t0, -24896
+// 0x0107e754: 0x107e754: addiu a0, t0, -24432
 	ldloc 17
-	ldc.i4 -24896
+	ldc.i4 -24432
 	add
 	stloc.1
-// 0x0107e134: 0x107e134: addiu a3, zero, 20
+// 0x0107e758: 0x107e758: addiu a3, zero, 20
 	ldc.i4.s 20
 	stloc 4
-// 0x0107e138: 0x107e138: addu  s7, v0, zero
+// 0x0107e75c: 0x107e75c: addu  s7, v0, zero
 	ldloc 5
 	stloc 14
-// 0x0107e13c: 0x107e13c: addiu a1, s4, 18500
+// 0x0107e760: 0x107e760: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e140: 0x107e140: addiu a2, zero, 5
+// 0x0107e764: 0x107e764: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x0107e144: 0x107e144: addiu v0, zero, 4
+// 0x0107e768: 0x107e768: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0107e148: 0x107e148: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107e76c: 0x107e76c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4143,21 +8365,21 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e150: 0x107e150: addu  a0, v0, zero
+// 0x0107e774: 0x107e774: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e154: 0x107e154: addu  a2, zero, zero
+// 0x0107e778: 0x107e778: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e158: 0x107e158: addu  a1, zero, zero
+// 0x0107e77c: 0x107e77c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e15c: 0x107e15c: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107e780: 0x107e780: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4169,9 +8391,9 @@ L_107def0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e164: 0x107e164: lw    v0, 1844(sp)
+// 0x0107e788: 0x107e788: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4180,67 +8402,67 @@ L_107def0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e168: 0x107e168: addu  a0, s2, zero
+// 0x0107e78c: 0x107e78c: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107e16c: 0x107e16c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107e790: 0x107e790: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e174: 0x107e174: addu  a0, s7, zero
+// 0x0107e798: 0x107e798: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x0107e178: 0x107e178: addiu a1, s8, 23008
+// 0x0107e79c: 0x107e79c: addiu a1, s8, 23008
 	ldloc 15
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0107e17c: 0x107e17c: jal   0x1098fe0 addu  a2, zero, zero
+// 0x0107e7a0: 0x107e7a0: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e184: 0x107e184: lb    v0, 1520(s0)
+// 0x0107e7a8: 0x107e7a8: lb    v0, 1520(s0)
 	ldloc 10
 	ldc.i4 1520
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107e188: 0x107e188: sll   zero, zero, 0
-// 0x0107e18c: 0x107e18c: beq   v0, zero, 0x107e1c0 addiu s4, sp, 180
+// 0x0107e7ac: 0x107e7ac: sll   zero, zero, 0
+// 0x0107e7b0: 0x107e7b0: beq   v0, zero, 0x107e7e4 addiu s4, sp, 180
 	ldloc 5
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc 12
-	brfalse L_107e1c0
+	brfalse L_107e7e4
 // --- basic block ---
-// 0x0107e194: 0x107e194: lui   a2, 0x10000
+// 0x0107e7b8: 0x107e7b8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0107e198: 0x107e198: addu  a0, s4, zero
+// 0x0107e7bc: 0x107e7bc: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0107e19c: 0x107e19c: addiu a2, a2, 14640
+// 0x0107e7c0: 0x107e7c0: addiu a2, a2, 14636
 	ldloc.3
-	ldc.i4 14640
+	ldc.i4 14636
 	add
 	stloc.3
-// 0x0107e1a0: 0x107e1a0: addiu a3, s0, 1520
+// 0x0107e7c4: 0x107e7c4: addiu a3, s0, 1520
 	ldloc 10
 	ldc.i4 1520
 	add
 	stloc 4
-// 0x0107e1a4: 0x107e1a4: jal   0x1000f9c addiu a1, zero, 102
+// 0x0107e7c8: 0x107e7c8: jal   0x1000f9c addiu a1, zero, 102
 	ldc.i4.s 102
 	stloc.2
 	ldloc.0
@@ -4253,10 +8475,10 @@ L_107def0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e1ac: 0x107e1ac: addu  a0, s7, zero
+// 0x0107e7d0: 0x107e7d0: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x0107e1b0: 0x107e1b0: jal   0x1097e5c addu  a1, s4, zero
+// 0x0107e7d4: 0x107e7d4: jal   0x10984a4 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -4264,33 +8486,33 @@ L_107def0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e1b8: 0x107e1b8: j	 0x107e1e4 addu  a1, s7, zero
+// 0x0107e7dc: 0x107e7dc: j	 0x107e808 addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-	br L_107e1e4
+	br L_107e808
 // --- basic block ---
-L_107e1c0:
-// 0x0107e1c0: 0x107e1c0: jal   0x1099098 addu  a0, s7, zero
+L_107e7e4:
+// 0x0107e7e4: 0x107e7e4: jal   0x10996e0 addu  a0, s7, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107e1c8: 0x107e1c8: lui   v0, 0x20000
+// 0x0107e7ec: 0x107e7ec: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0107e1cc: 0x107e1cc: addu  a0, s2, zero
+// 0x0107e7f0: 0x107e7f0: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107e1d0: 0x107e1d0: jal   0x109b304 addiu a1, v0, -24896
+// 0x0107e7f4: 0x107e7f4: jal   0x109b94c addiu a1, v0, -24432
 	ldloc 5
-	ldc.i4 -24896
+	ldc.i4 -24432
 	add
 	stloc.2
 	ldloc.0
@@ -4298,59 +8520,59 @@ L_107e1c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e1d8: 0x107e1d8: jal   0x1099098 addu  a0, v0, zero
+// 0x0107e7fc: 0x107e7fc: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107e1e0: 0x107e1e0: addu  a1, s7, zero
+// 0x0107e804: 0x107e804: addu  a1, s7, zero
 	ldloc 14
 	stloc.2
-L_107e1e4:
-// 0x0107e1e4: 0x107e1e4: jal   0x1098ec4 addu  a0, s2, zero
+L_107e808:
+// 0x0107e808: 0x107e808: jal   0x109950c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e1ec: 0x107e1ec: addu  a1, s2, zero
+// 0x0107e810: 0x107e810: addu  a1, s2, zero
 	ldloc 8
 	stloc.2
-// 0x0107e1f0: 0x107e1f0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x0107e814: 0x107e814: jal   0x109950c addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e1f8: 0x107e1f8: addu  a0, s1, zero
+// 0x0107e81c: 0x107e81c: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107e1fc: 0x107e1fc: jal   0x1098ec4 addu  a1, s5, zero
+// 0x0107e820: 0x107e820: jal   0x109950c addu  a1, s5, zero
 	ldloc 13
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e204: 0x107e204: lw    a2, 44(sp)
+// 0x0107e828: 0x107e828: lw    a2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4359,36 +8581,36 @@ L_107e1e4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107e208: 0x107e208: lui   s4, 0x10000
+// 0x0107e82c: 0x107e82c: lui   s4, 0x10000
 	ldc.i4 65536
 	stloc 12
-// 0x0107e20c: 0x107e20c: subu  a2, s3, a2
+// 0x0107e830: 0x107e830: subu  a2, s3, a2
 	ldloc 11
 	ldloc.3
 	sub
 	stloc.3
-// 0x0107e210: 0x107e210: lui   a0, 0x20000
+// 0x0107e834: 0x107e834: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e214: 0x107e214: addiu a3, zero, -1
+// 0x0107e838: 0x107e838: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107e218: 0x107e218: addiu a1, s4, 18500
+// 0x0107e83c: 0x107e83c: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e21c: 0x107e21c: addiu a2, a2, -2
+// 0x0107e840: 0x107e840: addiu a2, a2, -2
 	ldloc.3
 	ldc.i4.s -2
 	add
 	stloc.3
-// 0x0107e220: 0x107e220: addiu a0, a0, -24884
+// 0x0107e844: 0x107e844: addiu a0, a0, -24420
 	ldloc.1
-	ldc.i4 -24884
+	ldc.i4 -24420
 	add
 	stloc.1
-// 0x0107e224: 0x107e224: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0107e848: 0x107e848: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4402,37 +8624,37 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e22c: 0x107e22c: addu  a0, v0, zero
+// 0x0107e850: 0x107e850: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e230: 0x107e230: addu  a1, zero, zero
+// 0x0107e854: 0x107e854: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e234: 0x107e234: addu  a2, zero, zero
+// 0x0107e858: 0x107e858: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e238: 0x107e238: jal   0x1098fe0 addu  s2, v0, zero
+// 0x0107e85c: 0x107e85c: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e240: 0x107e240: lui   v0, 0x1080000
+// 0x0107e864: 0x107e864: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x0107e244: 0x107e244: addiu v0, v0, -25632
+// 0x0107e868: 0x107e868: addiu v0, v0, -24060
 	ldloc 5
-	ldc.i4 -25632
+	ldc.i4 -24060
 	add
 	stloc 5
-// 0x0107e248: 0x107e248: sw    v0, 112(s2)
+// 0x0107e86c: 0x107e86c: sw    v0, 112(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4441,16 +8663,16 @@ L_107e1e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e24c: 0x107e24c: addu  a0, s2, zero
+// 0x0107e870: 0x107e870: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107e250: 0x107e250: addiu a1, zero, 3
+// 0x0107e874: 0x107e874: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x0107e254: 0x107e254: addu  a2, zero, zero
+// 0x0107e878: 0x107e878: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e258: 0x107e258: jal   0x10942e8 sw    s0, 116(s2)
+// 0x0107e87c: 0x107e87c: jal   0x109490c sw    s0, 116(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -4464,31 +8686,31 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e260: 0x107e260: lui   a0, 0x20000
+// 0x0107e884: 0x107e884: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e264: 0x107e264: addiu a3, zero, -1
+// 0x0107e888: 0x107e888: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107e268: 0x107e268: addiu a1, s4, 18500
+// 0x0107e88c: 0x107e88c: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e26c: 0x107e26c: addiu a0, a0, -24664
+// 0x0107e890: 0x107e890: addiu a0, a0, -24200
 	ldloc.1
-	ldc.i4 -24664
+	ldc.i4 -24200
 	add
 	stloc.1
-// 0x0107e270: 0x107e270: addiu a2, zero, -1
+// 0x0107e894: 0x107e894: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0107e274: 0x107e274: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0107e898: 0x107e898: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4502,21 +8724,21 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e27c: 0x107e27c: addu  a0, v0, zero
+// 0x0107e8a0: 0x107e8a0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e280: 0x107e280: addu  a1, zero, zero
+// 0x0107e8a4: 0x107e8a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e284: 0x107e284: addu  a2, zero, zero
+// 0x0107e8a8: 0x107e8a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e288: 0x107e288: sw    v0, 1824(sp)
+// 0x0107e8ac: 0x107e8ac: sw    v0, 1824(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4525,28 +8747,28 @@ L_107e1e4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e28c: 0x107e28c: jal   0x1098fe0 lui   s8, 0x10000
+// 0x0107e8b0: 0x107e8b0: jal   0x1099628 lui   s8, 0x10000
 	ldc.i4 65536
 	stloc 15
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e294: 0x107e294: lui   a0, 0x20000
+// 0x0107e8b8: 0x107e8b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e298: 0x107e298: addiu a2, zero, 16
+// 0x0107e8bc: 0x107e8bc: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0107e29c: 0x107e29c: addiu a0, a0, -24864
+// 0x0107e8c0: 0x107e8c0: addiu a0, a0, -24400
 	ldloc.1
-	ldc.i4 -24864
+	ldc.i4 -24400
 	add
 	stloc.1
-// 0x0107e2a0: 0x107e2a0: jal   0x109e13c addiu a1, s8, 6612
+// 0x0107e8c4: 0x107e8c4: jal   0x109e784 addiu a1, s8, 6608
 	ldloc 15
-	ldc.i4 6612
+	ldc.i4 6608
 	add
 	stloc.2
 	ldloc.0
@@ -4554,12 +8776,12 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e2a8: 0x107e2a8: lw    a0, 1824(sp)
+// 0x0107e8cc: 0x107e8cc: lw    a0, 1824(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4568,20 +8790,20 @@ L_107e1e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e2ac: 0x107e2ac: addu  a1, v0, zero
+// 0x0107e8d0: 0x107e8d0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e2b0: 0x107e2b0: jal   0x1098ec4 addu  s7, v0, zero
+// 0x0107e8d4: 0x107e8d4: jal   0x109950c addu  s7, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e2b8: 0x107e2b8: lw    a0, 1824(sp)
+// 0x0107e8dc: 0x107e8dc: lw    a0, 1824(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4590,10 +8812,10 @@ L_107e1e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e2bc: 0x107e2bc: addu  a2, zero, zero
+// 0x0107e8e0: 0x107e8e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e2c0: 0x107e2c0: jal   0x109434c addiu a1, zero, 5
+// 0x0107e8e4: 0x107e8e4: jal   0x1094970 addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
 	ldloc.0
@@ -4601,12 +8823,12 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e2c8: 0x107e2c8: lw    a1, 1824(sp)
+// 0x0107e8ec: 0x107e8ec: lw    a1, 1824(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4615,17 +8837,17 @@ L_107e1e4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107e2cc: 0x107e2cc: jal   0x1098ec4 addu  a0, s2, zero
+// 0x0107e8f0: 0x107e8f0: jal   0x109950c addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e2d4: 0x107e2d4: lw    a0, 1824(sp)
+// 0x0107e8f8: 0x107e8f8: lw    a0, 1824(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4634,12 +8856,12 @@ L_107e1e4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e2d8: 0x107e2d8: addiu a1, sp, 52
+// 0x0107e8fc: 0x107e8fc: addiu a1, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc.2
-// 0x0107e2dc: 0x107e2dc: jal   0x1099350 addu  a2, zero, zero
+// 0x0107e900: 0x107e900: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4647,12 +8869,12 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e2e4: 0x107e2e4: lw    a2, 44(sp)
+// 0x0107e908: 0x107e908: lw    a2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4661,7 +8883,7 @@ L_107e1e4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107e2e8: 0x107e2e8: lw    v0, 52(sp)
+// 0x0107e90c: 0x107e90c: lw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4670,41 +8892,41 @@ L_107e1e4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e2ec: 0x107e2ec: subu  s3, s3, a2
+// 0x0107e910: 0x107e910: subu  s3, s3, a2
 	ldloc 11
 	ldloc.3
 	sub
 	stloc 11
-// 0x0107e2f0: 0x107e2f0: addiu a2, s3, -7
+// 0x0107e914: 0x107e914: addiu a2, s3, -7
 	ldloc 11
 	ldc.i4.s -7
 	add
 	stloc.3
-// 0x0107e2f4: 0x107e2f4: lui   a0, 0x20000
+// 0x0107e918: 0x107e918: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e2f8: 0x107e2f8: subu  a2, a2, v0
+// 0x0107e91c: 0x107e91c: subu  a2, a2, v0
 	ldloc.3
 	ldloc 5
 	sub
 	stloc.3
-// 0x0107e2fc: 0x107e2fc: addiu a3, zero, -1
+// 0x0107e920: 0x107e920: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107e300: 0x107e300: addiu a1, s4, 18500
+// 0x0107e924: 0x107e924: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e304: 0x107e304: addiu a0, a0, -24640
+// 0x0107e928: 0x107e928: addiu a0, a0, -24176
 	ldloc.1
-	ldc.i4 -24640
+	ldc.i4 -24176
 	add
 	stloc.1
-// 0x0107e308: 0x107e308: addiu v0, zero, 16
+// 0x0107e92c: 0x107e92c: addiu v0, zero, 16
 	ldc.i4.s 16
 	stloc 5
-// 0x0107e30c: 0x107e30c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107e930: 0x107e930: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4718,45 +8940,45 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e314: 0x107e314: addu  a0, v0, zero
+// 0x0107e938: 0x107e938: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e318: 0x107e318: addu  a1, zero, zero
+// 0x0107e93c: 0x107e93c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e31c: 0x107e31c: addu  a2, zero, zero
+// 0x0107e940: 0x107e940: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e320: 0x107e320: jal   0x1098fe0 addu  s3, v0, zero
+// 0x0107e944: 0x107e944: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e328: 0x107e328: lui   a0, 0x20000
+// 0x0107e94c: 0x107e94c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e32c: 0x107e32c: addiu a3, zero, 16
+// 0x0107e950: 0x107e950: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x0107e330: 0x107e330: addiu a1, s4, 18500
+// 0x0107e954: 0x107e954: addiu a1, s4, 18768
 	ldloc 12
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e334: 0x107e334: addiu a0, a0, -24848
+// 0x0107e958: 0x107e958: addiu a0, a0, -24384
 	ldloc.1
-	ldc.i4 -24848
+	ldc.i4 -24384
 	add
 	stloc.1
-// 0x0107e338: 0x107e338: jal   0x1098d10 addiu a2, zero, -1
+// 0x0107e95c: 0x107e95c: jal   0x1099358 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -4764,24 +8986,24 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e340: 0x107e340: lui   a1, 0x0
+// 0x0107e964: 0x107e964: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e344: 0x107e344: addu  s4, v0, zero
+// 0x0107e968: 0x107e968: addu  s4, v0, zero
 	ldloc 5
 	stloc 12
-// 0x0107e348: 0x107e348: addu  a0, v0, zero
+// 0x0107e96c: 0x107e96c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e34c: 0x107e34c: addu  a2, zero, zero
+// 0x0107e970: 0x107e970: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e350: 0x107e350: jal   0x1098fe0 addiu a1, a1, 23008
+// 0x0107e974: 0x107e974: jal   0x1099628 addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
@@ -4789,64 +9011,64 @@ L_107e1e4:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e358: 0x107e358: addu  a0, s3, zero
+// 0x0107e97c: 0x107e97c: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0107e35c: 0x107e35c: jal   0x1098ec4 addu  a1, s4, zero
+// 0x0107e980: 0x107e980: jal   0x109950c addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e364: 0x107e364: addu  a0, s2, zero
+// 0x0107e988: 0x107e988: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0107e368: 0x107e368: jal   0x1098ec4 addu  a1, s3, zero
+// 0x0107e98c: 0x107e98c: jal   0x109950c addu  a1, s3, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e370: 0x107e370: addu  a0, s1, zero
+// 0x0107e994: 0x107e994: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107e374: 0x107e374: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0107e998: 0x107e998: jal   0x109950c addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e37c: 0x107e37c: lb    v0, 1624(s0)
+// 0x0107e9a0: 0x107e9a0: lb    v0, 1624(s0)
 	ldloc 10
 	ldc.i4 1624
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107e380: 0x107e380: sll   zero, zero, 0
-// 0x0107e384: 0x107e384: beq   v0, zero, 0x107e3f8 sll   zero, zero, 0
+// 0x0107e9a4: 0x107e9a4: sll   zero, zero, 0
+// 0x0107e9a8: 0x107e9a8: beq   v0, zero, 0x107ea1c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107e3f8
+	brfalse L_107ea1c
 // --- basic block ---
-// 0x0107e38c: 0x107e38c: lui   a0, 0x20000
+// 0x0107e9b0: 0x107e9b0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e390: 0x107e390: jal   0x101cd60 addiu a0, a0, -22984
+// 0x0107e9b4: 0x107e9b4: jal   0x101cd70 addiu a0, a0, -22520
 	ldloc.1
-	ldc.i4 -22984
+	ldc.i4 -22520
 	add
 	stloc.1
 	ldloc.0
@@ -4854,36 +9076,36 @@ L_107e1e4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e398: 0x107e398: lui   a2, 0x20000
+// 0x0107e9bc: 0x107e9bc: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0107e39c: 0x107e39c: addu  a3, v0, zero
+// 0x0107e9c0: 0x107e9c0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x0107e3a0: 0x107e3a0: addiu a2, a2, -24836
+// 0x0107e9c4: 0x107e9c4: addiu a2, a2, -24372
 	ldloc.3
-	ldc.i4 -24836
+	ldc.i4 -24372
 	add
 	stloc.3
-// 0x0107e3a4: 0x107e3a4: addiu v0, s0, 1624
+// 0x0107e9c8: 0x107e9c8: addiu v0, s0, 1624
 	ldloc 10
 	ldc.i4 1624
 	add
 	stloc 5
-// 0x0107e3a8: 0x107e3a8: addiu a0, sp, 180
+// 0x0107e9cc: 0x107e9cc: addiu a0, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
 	stloc.1
-// 0x0107e3ac: 0x107e3ac: addiu a1, zero, 120
+// 0x0107e9d0: 0x107e9d0: addiu a1, zero, 120
 	ldc.i4.s 120
 	stloc.2
-// 0x0107e3b0: 0x107e3b0: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0107e9d4: 0x107e9d4: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4902,52 +9124,52 @@ L_107e1e4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e3b8: 0x107e3b8: lb    v0, 1724(s0)
+// 0x0107e9dc: 0x107e9dc: lb    v0, 1724(s0)
 	ldloc 10
 	ldc.i4 1724
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107e3bc: 0x107e3bc: sll   zero, zero, 0
-// 0x0107e3c0: 0x107e3c0: beq   v0, zero, 0x107e3d4 sll   zero, zero, 0
+// 0x0107e9e0: 0x107e9e0: sll   zero, zero, 0
+// 0x0107e9e4: 0x107e9e4: beq   v0, zero, 0x107e9f8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107e3d4
+	brfalse L_107e9f8
 // --- basic block ---
-// 0x0107e3c8: 0x107e3c8: addu  a0, s7, zero
+// 0x0107e9ec: 0x107e9ec: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x0107e3cc: 0x107e3cc: j	 0x107e3dc addiu a1, s0, 1724
+// 0x0107e9f0: 0x107e9f0: j	 0x107ea00 addiu a1, s0, 1724
 	ldloc 10
 	ldc.i4 1724
 	add
 	stloc.2
-	br L_107e3dc
+	br L_107ea00
 // --- basic block ---
-L_107e3d4:
-// 0x0107e3d4: 0x107e3d4: addu  a0, s7, zero
+L_107e9f8:
+// 0x0107e9f8: 0x107e9f8: addu  a0, s7, zero
 	ldloc 14
 	stloc.1
-// 0x0107e3d8: 0x107e3d8: addiu a1, s8, 6612
+// 0x0107e9fc: 0x107e9fc: addiu a1, s8, 6608
 	ldloc 15
-	ldc.i4 6612
+	ldc.i4 6608
 	add
 	stloc.2
-L_107e3dc:
-// 0x0107e3dc: 0x107e3dc: jal   0x109df10 sll   zero, zero, 0
+L_107ea00:
+// 0x0107ea00: 0x107ea00: jal   0x109e558 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e3e4: 0x107e3e4: addu  a0, s4, zero
+// 0x0107ea08: 0x107ea08: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0107e3e8: 0x107e3e8: jal   0x1097e5c addiu a1, sp, 180
+// 0x0107ea0c: 0x107ea0c: jal   0x10984a4 addiu a1, sp, 180
 	ldloc.0
 	ldc.i4 180
 	add
@@ -4957,46 +9179,46 @@ L_107e3dc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e3f0: 0x107e3f0: j	 0x107e404 lui   a0, 0x20000
+// 0x0107ea14: 0x107ea14: j	 0x107ea28 lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-	br L_107e404
+	br L_107ea28
 // --- basic block ---
-L_107e3f8:
-// 0x0107e3f8: 0x107e3f8: jal   0x1099098 addu  a0, s2, zero
+L_107ea1c:
+// 0x0107ea1c: 0x107ea1c: jal   0x10996e0 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107e400: 0x107e400: lui   a0, 0x20000
+// 0x0107ea24: 0x107ea24: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_107e404:
-// 0x0107e404: 0x107e404: addu  a2, zero, zero
+L_107ea28:
+// 0x0107ea28: 0x107ea28: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e408: 0x107e408: addiu a3, zero, 10
+// 0x0107ea2c: 0x107ea2c: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x0107e40c: 0x107e40c: addiu a0, a0, -27068
+// 0x0107ea30: 0x107ea30: addiu a0, a0, -26604
 	ldloc.1
-	ldc.i4 -27068
+	ldc.i4 -26604
 	add
 	stloc.1
-// 0x0107e410: 0x107e410: addu  a1, zero, zero
+// 0x0107ea34: 0x107ea34: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e414: 0x107e414: addiu v0, zero, 8
+// 0x0107ea38: 0x107ea38: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0107e418: 0x107e418: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107ea3c: 0x107ea3c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5010,28 +9232,28 @@ L_107e404:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e420: 0x107e420: addu  a1, v0, zero
+// 0x0107ea44: 0x107ea44: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e424: 0x107e424: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0107ea48: 0x107ea48: jal   0x109950c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e42c: 0x107e42c: addu  a0, s1, zero
+// 0x0107ea50: 0x107ea50: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107e430: 0x107e430: jal   0x1077e58 addu  a1, s0, zero
+// 0x0107ea54: 0x107ea54: jal   0x107847c addu  a1, s0, zero
 	ldloc 10
 	stloc.2
 	ldloc.0
@@ -5039,30 +9261,30 @@ L_107e404:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_show_space_before_desc_1077e58(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_show_space_before_desc_107847c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e438: 0x107e438: lb    v0, 80(sp)
+// 0x0107ea5c: 0x107ea5c: lb    v0, 80(sp)
 	ldloc.0
 	ldc.i4.s 80
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107e43c: 0x107e43c: sb    zero, 420(sp)
+// 0x0107ea60: 0x107ea60: sb    zero, 420(sp)
 	ldloc.0
 	ldc.i4 420
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107e440: 0x107e440: beq   v0, zero, 0x107e494 addu  a0, s5, zero
+// 0x0107ea64: 0x107ea64: beq   v0, zero, 0x107eab8 addu  a0, s5, zero
 	ldloc 5
 	ldloc 13
 	stloc.1
-	brfalse L_107e494
+	brfalse L_107eab8
 // --- basic block ---
-// 0x0107e448: 0x107e448: lw    v0, 1620(s0)
+// 0x0107ea6c: 0x107ea6c: lw    v0, 1620(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5071,35 +9293,35 @@ L_107e404:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e44c: 0x107e44c: sll   zero, zero, 0
-// 0x0107e450: 0x107e450: beq   v0, zero, 0x107e494 addu  a0, s6, zero
+// 0x0107ea70: 0x107ea70: sll   zero, zero, 0
+// 0x0107ea74: 0x107ea74: beq   v0, zero, 0x107eab8 addu  a0, s6, zero
 	ldloc 5
 	ldloc 16
 	stloc.1
-	brfalse L_107e494
+	brfalse L_107eab8
 // --- basic block ---
-// 0x0107e458: 0x107e458: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x0107ea7c: 0x107ea7c: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0107e460: 0x107e460: beq   v0, zero, 0x107e46c addiu v1, zero, 32
+// 0x0107ea84: 0x107ea84: beq   v0, zero, 0x107ea90 addiu v1, zero, 32
 	ldloc 5
 	ldc.i4.s 32
 	stloc 6
-	brfalse L_107e46c
+	brfalse L_107ea90
 // --- basic block ---
-// 0x0107e468: 0x107e468: addiu v1, zero, 50
+// 0x0107ea8c: 0x107ea8c: addiu v1, zero, 50
 	ldc.i4.s 50
 	stloc 6
-L_107e46c:
-// 0x0107e46c: 0x107e46c: lw    a2, 0(s0)
+L_107ea90:
+// 0x0107ea90: 0x107ea90: lw    a2, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0107e470: 0x107e470: lw    t0, 1840(sp)
+// 0x0107ea94: 0x107ea94: lw    t0, 1840(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5108,16 +9330,16 @@ L_107e46c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0107e474: 0x107e474: addiu a0, zero, 1
+// 0x0107ea98: 0x107ea98: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107e478: 0x107e478: addiu a1, zero, 2
+// 0x0107ea9c: 0x107ea9c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0107e47c: 0x107e47c: addiu a3, zero, -1
+// 0x0107eaa0: 0x107eaa0: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107e480: 0x107e480: sw    v1, 16(sp)
+// 0x0107eaa4: 0x107eaa4: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5126,7 +9348,7 @@ L_107e46c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107e484: 0x107e484: jal   0x104b534 sw    t0, 20(sp)
+// 0x0107eaa8: 0x107eaa8: jal   0x104b544 sw    t0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5140,22 +9362,22 @@ L_107e46c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b534(int32,int32,int32,int32,int32)
+	call int32 Cibyl55::roadmap_social_image_download_update_bitmap_104b544(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e48c: 0x107e48c: j	 0x107e49c sll   zero, zero, 0
-	br L_107e49c
+// 0x0107eab0: 0x107eab0: j	 0x107eac0 sll   zero, zero, 0
+	br L_107eac0
 // --- basic block ---
-L_107e494:
-// 0x0107e494: 0x107e494: jal   0x1099098 sll   zero, zero, 0
+L_107eab8:
+// 0x0107eab8: 0x107eab8: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_107e49c:
-// 0x0107e49c: 0x107e49c: lw    t0, 1836(sp)
+L_107eac0:
+// 0x0107eac0: 0x107eac0: lw    t0, 1836(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5164,37 +9386,37 @@ L_107e49c:
 	add
 	ldelem.i4
 	stloc 17
-// 0x0107e4a0: 0x107e4a0: lui   v1, 0x80000
+// 0x0107eac4: 0x107eac4: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107e4a4: 0x107e4a4: sw    t0, -14004(v1)
+// 0x0107eac8: 0x107eac8: sw    t0, -13540(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 -3385
 	add
 	ldloc 17
 	stelem.i4
-// 0x0107e4a8: 0x107e4a8: addiu v0, zero, -1
+// 0x0107eacc: 0x107eacc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0107e4ac: 0x107e4ac: lui   v1, 0x80000
+// 0x0107ead0: 0x107ead0: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107e4b0: 0x107e4b0: lui   s2, 0x10000
+// 0x0107ead4: 0x107ead4: lui   s2, 0x10000
 	ldc.i4 65536
 	stloc 8
-// 0x0107e4b4: 0x107e4b4: sw    v0, -14000(v1)
+// 0x0107ead8: 0x107ead8: sw    v0, -13536(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3500
+	ldc.i4 -3384
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e4b8: 0x107e4b8: sw    v0, 16(sp)
+// 0x0107eadc: 0x107eadc: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5203,36 +9425,36 @@ L_107e49c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e4bc: 0x107e4bc: lui   a0, 0x20000
+// 0x0107eae0: 0x107eae0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e4c0: 0x107e4c0: addiu v0, sp, 36
+// 0x0107eae4: 0x107eae4: addiu v0, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc 5
-// 0x0107e4c4: 0x107e4c4: lui   a2, 0x1080000
+// 0x0107eae8: 0x107eae8: lui   a2, 0x1080000
 	ldc.i4 17301504
 	stloc.3
-// 0x0107e4c8: 0x107e4c8: addiu a1, s2, 18500
+// 0x0107eaec: 0x107eaec: addiu a1, s2, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e4cc: 0x107e4cc: addiu a0, a0, -26748
+// 0x0107eaf0: 0x107eaf0: addiu a0, a0, -26284
 	ldloc.1
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.1
-// 0x0107e4d0: 0x107e4d0: addiu a2, a2, -26532
+// 0x0107eaf4: 0x107eaf4: addiu a2, a2, -24960
 	ldloc.3
-	ldc.i4 -26532
+	ldc.i4 -24960
 	add
 	stloc.3
-// 0x0107e4d4: 0x107e4d4: addiu a3, zero, -2
+// 0x0107eaf8: 0x107eaf8: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x0107e4d8: 0x107e4d8: sw    v0, 20(sp)
+// 0x0107eafc: 0x107eafc: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5241,10 +9463,10 @@ L_107e49c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e4dc: 0x107e4dc: lui   v0, 0x10800000
+// 0x0107eb00: 0x107eb00: lui   v0, 0x10800000
 	ldc.i4 276824064
 	stloc 5
-// 0x0107e4e0: 0x107e4e0: jal   0x109e4f0 sw    v0, 24(sp)
+// 0x0107eb04: 0x107eb04: jal   0x109eb38 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5258,30 +9480,30 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_popup_new_109e4f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_popup_new_109eb38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e4e8: 0x107e4e8: lui   s3, 0x80000
+// 0x0107eb0c: 0x107eb0c: lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 11
-// 0x0107e4ec: 0x107e4ec: addiu v1, zero, 15
+// 0x0107eb10: 0x107eb10: addiu v1, zero, 15
 	ldc.i4.s 15
 	stloc 6
-// 0x0107e4f0: 0x107e4f0: addu  a0, v0, zero
+// 0x0107eb14: 0x107eb14: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e4f4: 0x107e4f4: addu  a1, zero, zero
+// 0x0107eb18: 0x107eb18: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e4f8: 0x107e4f8: addu  a2, zero, zero
+// 0x0107eb1c: 0x107eb1c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e4fc: 0x107e4fc: addu  a3, zero, zero
+// 0x0107eb20: 0x107eb20: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x0107e500: 0x107e500: sw    v1, 16(sp)
+// 0x0107eb24: 0x107eb24: sw    v1, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5290,12 +9512,12 @@ L_107e49c:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107e504: 0x107e504: jal   0x10991d0 sw    v0, -16232(s3)
+// 0x0107eb28: 0x107eb28: jal   0x1099818 sw    v0, -15768(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldloc 5
 	stelem.i4
@@ -5304,32 +9526,32 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_10991d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_click_offsets_ext_1099818(int32,int32,int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107e50c: 0x107e50c: lui   a0, 0x10000
+// 0x0107eb30: 0x107eb30: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107e510: 0x107e510: addiu a3, zero, 5
+// 0x0107eb34: 0x107eb34: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x0107e514: 0x107e514: addiu a1, s2, 18500
+// 0x0107eb38: 0x107eb38: addiu a1, s2, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e518: 0x107e518: addiu a0, a0, 1764
+// 0x0107eb3c: 0x107eb3c: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x0107e51c: 0x107e51c: addiu a2, zero, -1
+// 0x0107eb40: 0x107eb40: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0107e520: 0x107e520: addiu v0, zero, 8
+// 0x0107eb44: 0x107eb44: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0107e524: 0x107e524: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107eb48: 0x107eb48: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5343,21 +9565,21 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e52c: 0x107e52c: addu  a0, v0, zero
+// 0x0107eb50: 0x107eb50: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e530: 0x107e530: addu  a2, zero, zero
+// 0x0107eb54: 0x107eb54: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e534: 0x107e534: addu  a1, zero, zero
+// 0x0107eb58: 0x107eb58: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e538: 0x107e538: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107eb5c: 0x107eb5c: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5369,9 +9591,9 @@ L_107e49c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e540: 0x107e540: lw    v0, 1844(sp)
+// 0x0107eb64: 0x107eb64: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5380,26 +9602,26 @@ L_107e49c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e544: 0x107e544: lw    a0, -16232(s3)
+// 0x0107eb68: 0x107eb68: lw    a0, -15768(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e548: 0x107e548: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107eb6c: 0x107eb6c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e550: 0x107e550: lw    a2, 1828(sp)
+// 0x0107eb74: 0x107eb74: lw    a2, 1828(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5408,26 +9630,26 @@ L_107e49c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107e554: 0x107e554: lui   a0, 0x10000
+// 0x0107eb78: 0x107eb78: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107e558: 0x107e558: addiu a3, zero, -1
+// 0x0107eb7c: 0x107eb7c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107e55c: 0x107e55c: addiu a1, s2, 18500
+// 0x0107eb80: 0x107eb80: addiu a1, s2, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e560: 0x107e560: addiu a0, a0, 9040
+// 0x0107eb84: 0x107eb84: addiu a0, a0, 9036
 	ldloc.1
-	ldc.i4 9040
+	ldc.i4 9036
 	add
 	stloc.1
-// 0x0107e564: 0x107e564: addiu v0, zero, 2
+// 0x0107eb88: 0x107eb88: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0107e568: 0x107e568: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107eb8c: 0x107eb8c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5441,29 +9663,29 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e570: 0x107e570: addu  a0, v0, zero
+// 0x0107eb94: 0x107eb94: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e574: 0x107e574: addu  a2, zero, zero
+// 0x0107eb98: 0x107eb98: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e578: 0x107e578: addu  a1, zero, zero
+// 0x0107eb9c: 0x107eb9c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e57c: 0x107e57c: jal   0x1098fe0 addu  s4, v0, zero
+// 0x0107eba0: 0x107eba0: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e584: 0x107e584: lw    a1, 1832(sp)
+// 0x0107eba8: 0x107eba8: lw    a1, 1832(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5472,28 +9694,28 @@ L_107e49c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107e588: 0x107e588: addiu s5, sp, 420
+// 0x0107ebac: 0x107ebac: addiu s5, sp, 420
 	ldloc.0
 	ldc.i4 420
 	add
 	stloc 13
-// 0x0107e58c: 0x107e58c: jal   0x1098ec4 addu  a0, s4, zero
+// 0x0107ebb0: 0x107ebb0: jal   0x109950c addu  a0, s4, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e594: 0x107e594: addu  a1, s5, zero
+// 0x0107ebb8: 0x107ebb8: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x0107e598: 0x107e598: addu  a0, s0, zero
+// 0x0107ebbc: 0x107ebbc: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x0107e59c: 0x107e59c: jal   0x107c684 sb    zero, 420(sp)
+// 0x0107ebc0: 0x107ebc0: jal   0x107cca8 sb    zero, 420(sp)
 	ldloc.0
 	ldc.i4 420
 	add
@@ -5504,26 +9726,26 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::T_412_107c684(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::T_412_107cca8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e5a4: 0x107e5a4: lui   a0, 0x20000
+// 0x0107ebc8: 0x107ebc8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e5a8: 0x107e5a8: addiu a3, zero, 1
+// 0x0107ebcc: 0x107ebcc: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x0107e5ac: 0x107e5ac: addu  a1, s5, zero
+// 0x0107ebd0: 0x107ebd0: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x0107e5b0: 0x107e5b0: addiu a0, a0, -24804
+// 0x0107ebd4: 0x107ebd4: addiu a0, a0, -24340
 	ldloc.1
-	ldc.i4 -24804
+	ldc.i4 -24340
 	add
 	stloc.1
-// 0x0107e5b4: 0x107e5b4: jal   0x1098d10 addiu a2, zero, 14
+// 0x0107ebd8: 0x107ebd8: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -5531,26 +9753,26 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e5bc: 0x107e5bc: lui   s5, 0x0
+// 0x0107ebe0: 0x107ebe0: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x0107e5c0: 0x107e5c0: addu  a2, zero, zero
+// 0x0107ebe4: 0x107ebe4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e5c4: 0x107e5c4: addu  a0, v0, zero
+// 0x0107ebe8: 0x107ebe8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e5c8: 0x107e5c8: addiu a1, s5, 23008
+// 0x0107ebec: 0x107ebec: addiu a1, s5, 23008
 	ldloc 13
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0107e5cc: 0x107e5cc: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107ebf0: 0x107ebf0: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5562,9 +9784,9 @@ L_107e49c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e5d4: 0x107e5d4: lw    v0, 1844(sp)
+// 0x0107ebf8: 0x107ebf8: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5573,77 +9795,77 @@ L_107e49c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e5d8: 0x107e5d8: addu  a0, s4, zero
+// 0x0107ebfc: 0x107ebfc: addu  a0, s4, zero
 	ldloc 12
 	stloc.1
-// 0x0107e5dc: 0x107e5dc: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107ec00: 0x107ec00: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e5e4: 0x107e5e4: lw    a0, -16232(s3)
+// 0x0107ec08: 0x107ec08: lw    a0, -15768(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e5e8: 0x107e5e8: jal   0x1098ec4 addu  a1, s4, zero
+// 0x0107ec0c: 0x107ec0c: jal   0x109950c addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e5f0: 0x107e5f0: lw    a0, -16232(s3)
+// 0x0107ec14: 0x107ec14: lw    a0, -15768(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e5f4: 0x107e5f4: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0107ec18: 0x107ec18: jal   0x109950c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e5fc: 0x107e5fc: lui   a0, 0x20000
+// 0x0107ec20: 0x107ec20: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e600: 0x107e600: addiu a3, zero, -1
+// 0x0107ec24: 0x107ec24: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x0107e604: 0x107e604: addiu a1, s2, 18500
+// 0x0107ec28: 0x107ec28: addiu a1, s2, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e608: 0x107e608: addiu a0, a0, -24788
+// 0x0107ec2c: 0x107ec2c: addiu a0, a0, -24324
 	ldloc.1
-	ldc.i4 -24788
+	ldc.i4 -24324
 	add
 	stloc.1
-// 0x0107e60c: 0x107e60c: addiu a2, zero, -1
+// 0x0107ec30: 0x107ec30: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0107e610: 0x107e610: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0107ec34: 0x107ec34: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5657,42 +9879,42 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e618: 0x107e618: addu  a0, v0, zero
+// 0x0107ec3c: 0x107ec3c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e61c: 0x107e61c: addu  a1, zero, zero
+// 0x0107ec40: 0x107ec40: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e620: 0x107e620: addu  a2, zero, zero
+// 0x0107ec44: 0x107ec44: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e624: 0x107e624: jal   0x1098fe0 addu  s1, v0, zero
+// 0x0107ec48: 0x107ec48: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e62c: 0x107e62c: lui   a0, 0x20000
+// 0x0107ec50: 0x107ec50: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e630: 0x107e630: addiu a2, zero, 16
+// 0x0107ec54: 0x107ec54: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x0107e634: 0x107e634: addiu a1, s2, 18500
+// 0x0107ec58: 0x107ec58: addiu a1, s2, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e638: 0x107e638: jal   0x109e13c addiu a0, a0, -24748
+// 0x0107ec5c: 0x107ec5c: jal   0x109e784 addiu a0, a0, -24284
 	ldloc.1
-	ldc.i4 -24748
+	ldc.i4 -24284
 	add
 	stloc.1
 	ldloc.0
@@ -5700,34 +9922,34 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e640: 0x107e640: addu  a1, v0, zero
+// 0x0107ec64: 0x107ec64: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e644: 0x107e644: addu  a0, s1, zero
+// 0x0107ec68: 0x107ec68: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107e648: 0x107e648: jal   0x1098ec4 addu  s3, v0, zero
+// 0x0107ec6c: 0x107ec6c: jal   0x109950c addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e650: 0x107e650: addu  a0, s1, zero
+// 0x0107ec74: 0x107ec74: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107e654: 0x107e654: addiu a1, zero, 2
+// 0x0107ec78: 0x107ec78: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0107e658: 0x107e658: jal   0x109434c addu  a2, zero, zero
+// 0x0107ec7c: 0x107ec7c: jal   0x1094970 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5735,28 +9957,28 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e660: 0x107e660: lui   a0, 0x20000
+// 0x0107ec84: 0x107ec84: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e664: 0x107e664: addiu a1, s2, 18500
+// 0x0107ec88: 0x107ec88: addiu a1, s2, 18768
 	ldloc 8
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e668: 0x107e668: addiu a3, zero, 24
+// 0x0107ec8c: 0x107ec8c: addiu a3, zero, 24
 	ldc.i4.s 24
 	stloc 4
-// 0x0107e66c: 0x107e66c: addiu a0, a0, -24764
+// 0x0107ec90: 0x107ec90: addiu a0, a0, -24300
 	ldloc.1
-	ldc.i4 -24764
+	ldc.i4 -24300
 	add
 	stloc.1
-// 0x0107e670: 0x107e670: jal   0x1098d10 addiu a2, zero, 14
+// 0x0107ec94: 0x107ec94: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -5764,44 +9986,44 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e678: 0x107e678: addu  s2, v0, zero
+// 0x0107ec9c: 0x107ec9c: addu  s2, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0107e67c: 0x107e67c: addu  a0, v0, zero
+// 0x0107eca0: 0x107eca0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e680: 0x107e680: addiu a1, s5, 23008
+// 0x0107eca4: 0x107eca4: addiu a1, s5, 23008
 	ldloc 13
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x0107e684: 0x107e684: jal   0x1098fe0 addu  a2, zero, zero
+// 0x0107eca8: 0x107eca8: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e68c: 0x107e68c: addu  a0, s1, zero
+// 0x0107ecb0: 0x107ecb0: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x0107e690: 0x107e690: jal   0x1098ec4 addu  a1, s2, zero
+// 0x0107ecb4: 0x107ecb4: jal   0x109950c addu  a1, s2, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e698: 0x107e698: jal   0x1078228 addu  a0, s0, zero
+// 0x0107ecbc: 0x107ecbc: jal   0x107884c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5809,18 +10031,18 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RtAlerts_get_addional_text_1078228(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RtAlerts_get_addional_text_107884c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e6a0: 0x107e6a0: beq   v0, zero, 0x107e6e4 addu  a0, s1, zero
+// 0x0107ecc4: 0x107ecc4: beq   v0, zero, 0x107ed08 addu  a0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_107e6e4
+	brfalse L_107ed08
 // --- basic block ---
-// 0x0107e6a8: 0x107e6a8: jal   0x1078228 addu  a0, s0, zero
+// 0x0107eccc: 0x107eccc: jal   0x107884c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5828,15 +10050,15 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RtAlerts_get_addional_text_1078228(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RtAlerts_get_addional_text_107884c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e6b0: 0x107e6b0: addu  a1, v0, zero
+// 0x0107ecd4: 0x107ecd4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e6b4: 0x107e6b4: jal   0x1097e5c addu  a0, s2, zero
+// 0x0107ecd8: 0x107ecd8: jal   0x10984a4 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5844,12 +10066,12 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl113::ssd_text_set_text_1097e5c(int32,int32,int32,int32,int32)
+	call int32 Cibyl113::ssd_text_set_text_10984a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e6bc: 0x107e6bc: jal   0x10781f0 addu  a0, s0, zero
+// 0x0107ece0: 0x107ece0: jal   0x1078814 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5857,19 +10079,19 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RtAlerts_get_addional_text_icon_10781f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RtAlerts_get_addional_text_icon_1078814(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e6c4: 0x107e6c4: beq   v0, zero, 0x107e6e0 sll   zero, zero, 0
+// 0x0107ece8: 0x107ece8: beq   v0, zero, 0x107ed04 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107e6e0
+	brfalse L_107ed04
 // --- basic block ---
-// 0x0107e6cc: 0x107e6cc: addu  a0, s3, zero
+// 0x0107ecf0: 0x107ecf0: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-// 0x0107e6d0: 0x107e6d0: jal   0x109df10 addu  a1, v0, zero
+// 0x0107ecf4: 0x107ecf4: jal   0x109e558 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5877,74 +10099,74 @@ L_107e49c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_update_109df10(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_update_109e558(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e6d8: 0x107e6d8: j	 0x107e6ec lui   s2, 0x80000
+// 0x0107ecfc: 0x107ecfc: j	 0x107ed10 lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 8
-	br L_107e6ec
+	br L_107ed10
 // --- basic block ---
-L_107e6e0:
-// 0x0107e6e0: 0x107e6e0: addu  a0, s3, zero
+L_107ed04:
+// 0x0107ed04: 0x107ed04: addu  a0, s3, zero
 	ldloc 11
 	stloc.1
-L_107e6e4:
-// 0x0107e6e4: 0x107e6e4: jal   0x1099098 lui   s2, 0x80000
+L_107ed08:
+// 0x0107ed08: 0x107ed08: jal   0x10996e0 lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 8
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_107e6ec:
-// 0x0107e6ec: 0x107e6ec: lw    a0, -16232(s2)
+L_107ed10:
+// 0x0107ed10: 0x107ed10: lw    a0, -15768(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e6f0: 0x107e6f0: jal   0x1098ec4 addu  a1, s1, zero
+// 0x0107ed14: 0x107ed14: jal   0x109950c addu  a1, s1, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e6f8: 0x107e6f8: lui   a1, 0x10000
+// 0x0107ed1c: 0x107ed1c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107e6fc: 0x107e6fc: lui   a0, 0x10000
+// 0x0107ed20: 0x107ed20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107e700: 0x107e700: addiu a3, zero, 5
+// 0x0107ed24: 0x107ed24: addiu a3, zero, 5
 	ldc.i4.5
 	stloc 4
-// 0x0107e704: 0x107e704: addiu a1, a1, 18500
+// 0x0107ed28: 0x107ed28: addiu a1, a1, 18768
 	ldloc.2
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc.2
-// 0x0107e708: 0x107e708: addiu a0, a0, 1764
+// 0x0107ed2c: 0x107ed2c: addiu a0, a0, 1760
 	ldloc.1
-	ldc.i4 1764
+	ldc.i4 1760
 	add
 	stloc.1
-// 0x0107e70c: 0x107e70c: addiu a2, zero, -1
+// 0x0107ed30: 0x107ed30: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0107e710: 0x107e710: addiu v0, zero, 8
+// 0x0107ed34: 0x107ed34: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x0107e714: 0x107e714: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0107ed38: 0x107ed38: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5958,21 +10180,21 @@ L_107e6ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e71c: 0x107e71c: addu  a0, v0, zero
+// 0x0107ed40: 0x107ed40: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e720: 0x107e720: addu  a2, zero, zero
+// 0x0107ed44: 0x107ed44: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107e724: 0x107e724: addu  a1, zero, zero
+// 0x0107ed48: 0x107ed48: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107e728: 0x107e728: jal   0x1098fe0 sw    v0, 1844(sp)
+// 0x0107ed4c: 0x107ed4c: jal   0x1099628 sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5984,9 +10206,9 @@ L_107e6ec:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107e730: 0x107e730: lw    v0, 1844(sp)
+// 0x0107ed54: 0x107ed54: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5995,31 +10217,31 @@ L_107e6ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e734: 0x107e734: lw    a0, -16232(s2)
+// 0x0107ed58: 0x107ed58: lw    a0, -15768(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e738: 0x107e738: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107ed5c: 0x107ed5c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e740: 0x107e740: lui   a0, 0x10000
+// 0x0107ed64: 0x107ed64: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107e744: 0x107e744: jal   0x101cd60 addiu a0, a0, 844
+// 0x0107ed68: 0x107ed68: jal   0x101cd70 addiu a0, a0, 840
 	ldloc.1
-	ldc.i4 844
+	ldc.i4 840
 	add
 	stloc.1
 	ldloc.0
@@ -6027,31 +10249,31 @@ L_107e6ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e74c: 0x107e74c: lui   a3, 0x1080000
+// 0x0107ed70: 0x107ed70: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x0107e750: 0x107e750: lui   a0, 0x10000
+// 0x0107ed74: 0x107ed74: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107e754: 0x107e754: addiu a3, a3, -26996
+// 0x0107ed78: 0x107ed78: addiu a3, a3, -25424
 	ldloc 4
-	ldc.i4 -26996
+	ldc.i4 -25424
 	add
 	stloc 4
-// 0x0107e758: 0x107e758: addiu a2, zero, 1
+// 0x0107ed7c: 0x107ed7c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x0107e75c: 0x107e75c: addiu a0, a0, 852
+// 0x0107ed80: 0x107ed80: addiu a0, a0, 848
 	ldloc.1
-	ldc.i4 852
+	ldc.i4 848
 	add
 	stloc.1
-// 0x0107e760: 0x107e760: jal   0x1091088 addu  a1, v0, zero
+// 0x0107ed84: 0x107ed84: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6059,36 +10281,36 @@ L_107e6ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e768: 0x107e768: lw    a0, -16232(s2)
+// 0x0107ed8c: 0x107ed8c: lw    a0, -15768(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e76c: 0x107e76c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0107ed90: 0x107ed90: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e774: 0x107e774: lui   a0, 0x20000
+// 0x0107ed98: 0x107ed98: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e778: 0x107e778: jal   0x101cd60 addiu a0, a0, -21524
+// 0x0107ed9c: 0x107ed9c: jal   0x101cd70 addiu a0, a0, -21060
 	ldloc.1
-	ldc.i4 -21524
+	ldc.i4 -21060
 	add
 	stloc.1
 	ldloc.0
@@ -6096,31 +10318,31 @@ L_107e6ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e780: 0x107e780: lui   a0, 0x20000
+// 0x0107eda4: 0x107eda4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e784: 0x107e784: lui   a3, 0x1080000
+// 0x0107eda8: 0x107eda8: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x0107e788: 0x107e788: addiu a0, a0, -24712
+// 0x0107edac: 0x107edac: addiu a0, a0, -24248
 	ldloc.1
-	ldc.i4 -24712
+	ldc.i4 -24248
 	add
 	stloc.1
-// 0x0107e78c: 0x107e78c: addu  a1, v0, zero
+// 0x0107edb0: 0x107edb0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e790: 0x107e790: addiu a3, a3, -29784
+// 0x0107edb4: 0x107edb4: addiu a3, a3, -28212
 	ldloc 4
-	ldc.i4 -29784
+	ldc.i4 -28212
 	add
 	stloc 4
-// 0x0107e794: 0x107e794: jal   0x1091088 addiu a2, zero, 1
+// 0x0107edb8: 0x107edb8: jal   0x10916ac addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -6128,24 +10350,24 @@ L_107e6ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e79c: 0x107e79c: lw    a0, -16232(s2)
+// 0x0107edc0: 0x107edc0: lw    a0, -15768(s2)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e7a0: 0x107e7a0: addu  a1, v0, zero
+// 0x0107edc4: 0x107edc4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e7a4: 0x107e7a4: jal   0x1098ec4 sw    v0, 1844(sp)
+// 0x0107edc8: 0x107edc8: jal   0x109950c sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6156,12 +10378,12 @@ L_107e6ec:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e7ac: 0x107e7ac: lw    v1, 1276(s0)
+// 0x0107edd0: 0x107edd0: lw    v1, 1276(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6170,7 +10392,7 @@ L_107e6ec:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107e7b0: 0x107e7b0: lw    v0, 1844(sp)
+// 0x0107edd4: 0x107edd4: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6179,27 +10401,27 @@ L_107e6ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e7b4: 0x107e7b4: bne   v1, zero, 0x107e7c4 sll   zero, zero, 0
+// 0x0107edd8: 0x107edd8: bne   v1, zero, 0x107ede8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_107e7c4
+	brtrue L_107ede8
 // --- basic block ---
-// 0x0107e7bc: 0x107e7bc: jal   0x1099098 addu  a0, v0, zero
+// 0x0107ede0: 0x107ede0: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_107e7c4:
-// 0x0107e7c4: 0x107e7c4: lui   v0, 0x20000
+L_107ede8:
+// 0x0107ede8: 0x107ede8: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0107e7c8: 0x107e7c8: addiu v0, v0, -24616
+// 0x0107edec: 0x107edec: addiu v0, v0, -24152
 	ldloc 5
-	ldc.i4 -24616
+	ldc.i4 -24152
 	add
 	stloc 5
-// 0x0107e7cc: 0x107e7cc: sw    v0, 68(sp)
+// 0x0107edf0: 0x107edf0: sw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6208,15 +10430,15 @@ L_107e7c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e7d0: 0x107e7d0: lui   v0, 0x20000
+// 0x0107edf4: 0x107edf4: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0107e7d4: 0x107e7d4: addiu v0, v0, -24588
+// 0x0107edf8: 0x107edf8: addiu v0, v0, -24124
 	ldloc 5
-	ldc.i4 -24588
+	ldc.i4 -24124
 	add
 	stloc 5
-// 0x0107e7d8: 0x107e7d8: sw    v0, 72(sp)
+// 0x0107edfc: 0x107edfc: sw    v0, 72(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6225,10 +10447,10 @@ L_107e7c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e7dc: 0x107e7dc: addiu v0, zero, 1
+// 0x0107ee00: 0x107ee00: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0107e7e0: 0x107e7e0: sw    v0, 16(sp)
+// 0x0107ee04: 0x107ee04: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6237,39 +10459,39 @@ L_107e7c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e7e4: 0x107e7e4: lui   a0, 0x20000
+// 0x0107ee08: 0x107ee08: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107e7e8: 0x107e7e8: lui   a1, 0x20000
+// 0x0107ee0c: 0x107ee0c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107e7ec: 0x107e7ec: lui   v0, 0x1080000
+// 0x0107ee10: 0x107ee10: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x0107e7f0: 0x107e7f0: addiu a0, a0, -24732
+// 0x0107ee14: 0x107ee14: addiu a0, a0, -24268
 	ldloc.1
-	ldc.i4 -24732
+	ldc.i4 -24268
 	add
 	stloc.1
-// 0x0107e7f4: 0x107e7f4: addiu a1, a1, -24556
+// 0x0107ee18: 0x107ee18: addiu a1, a1, -24092
 	ldloc.2
-	ldc.i4 -24556
+	ldc.i4 -24092
 	add
 	stloc.2
-// 0x0107e7f8: 0x107e7f8: addiu a2, sp, 68
+// 0x0107ee1c: 0x107ee1c: addiu a2, sp, 68
 	ldloc.0
 	ldc.i4.s 68
 	add
 	stloc.3
-// 0x0107e7fc: 0x107e7fc: addiu a3, zero, 2
+// 0x0107ee20: 0x107ee20: addiu a3, zero, 2
 	ldc.i4.2
 	stloc 4
-// 0x0107e800: 0x107e800: addiu v0, v0, -25452
+// 0x0107ee24: 0x107ee24: addiu v0, v0, -23880
 	ldloc 5
-	ldc.i4 -25452
+	ldc.i4 -23880
 	add
 	stloc 5
-// 0x0107e804: 0x107e804: sw    v0, 20(sp)
+// 0x0107ee28: 0x107ee28: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6278,7 +10500,7 @@ L_107e7c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107e808: 0x107e808: jal   0x1090ecc sw    zero, 76(sp)
+// 0x0107ee2c: 0x107ee2c: jal   0x10914f0 sw    zero, 76(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6292,27 +10514,27 @@ L_107e7c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_new_1090ecc(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_new_10914f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e810: 0x107e810: lui   v1, 0x80000
+// 0x0107ee34: 0x107ee34: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107e814: 0x107e814: lw    a0, -16232(v1)
+// 0x0107ee38: 0x107ee38: lw    a0, -15768(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4058
+	ldc.i4 -3942
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e818: 0x107e818: addu  a1, v0, zero
+// 0x0107ee3c: 0x107ee3c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107e81c: 0x107e81c: jal   0x1098ec4 sw    v0, 1844(sp)
+// 0x0107ee40: 0x107ee40: jal   0x109950c sw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6323,18 +10545,18 @@ L_107e7c4:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e824: 0x107e824: lb    v1, 708(s0)
+// 0x0107ee48: 0x107ee48: lb    v1, 708(s0)
 	ldloc 10
 	ldc.i4 708
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 6
-// 0x0107e828: 0x107e828: lw    v0, 1844(sp)
+// 0x0107ee4c: 0x107ee4c: lw    v0, 1844(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6343,29 +10565,29 @@ L_107e7c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e82c: 0x107e82c: bne   v1, zero, 0x107e840 lui   a0, 0x20000
+// 0x0107ee50: 0x107ee50: bne   v1, zero, 0x107ee64 lui   a0, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc.1
-	brtrue L_107e840
+	brtrue L_107ee64
 // --- basic block ---
-// 0x0107e834: 0x107e834: jal   0x1099098 addu  a0, v0, zero
+// 0x0107ee58: 0x107ee58: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107e83c: 0x107e83c: lui   a0, 0x20000
+// 0x0107ee60: 0x107ee60: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_107e840:
-// 0x0107e840: 0x107e840: addiu a0, a0, -26748
+L_107ee64:
+// 0x0107ee64: 0x107ee64: addiu a0, a0, -26284
 	ldloc.1
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.1
-// 0x0107e844: 0x107e844: jal   0x1095eec addu  a1, zero, zero
+// 0x0107ee68: 0x107ee68: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6373,41 +10595,41 @@ L_107e840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107e84c:
-// 0x0107e84c: 0x107e84c: jal   0x102146c sll   zero, zero, 0
+L_107ee70:
+// 0x0107ee70: 0x107ee70: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e854: 0x107e854: bne   v0, zero, 0x107e864 sll   zero, zero, 0
+// 0x0107ee78: 0x107ee78: bne   v0, zero, 0x107ee88 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107e864
+	brtrue L_107ee88
 // --- basic block ---
-// 0x0107e85c: 0x107e85c: jal   0x1021900 sll   zero, zero, 0
+// 0x0107ee80: 0x107ee80: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107e864:
-// 0x0107e864: 0x107e864: lw    ra, 1884(sp)
-// 0x0107e868: 0x107e868: lw    s8, 1880(sp)
+L_107ee88:
+// 0x0107ee88: 0x107ee88: lw    ra, 1884(sp)
+// 0x0107ee8c: 0x107ee8c: lw    s8, 1880(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6416,7 +10638,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0107e86c: 0x107e86c: lw    s7, 1876(sp)
+// 0x0107ee90: 0x107ee90: lw    s7, 1876(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6425,7 +10647,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0107e870: 0x107e870: lw    s6, 1872(sp)
+// 0x0107ee94: 0x107ee94: lw    s6, 1872(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6434,7 +10656,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0107e874: 0x107e874: lw    s5, 1868(sp)
+// 0x0107ee98: 0x107ee98: lw    s5, 1868(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6443,7 +10665,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0107e878: 0x107e878: lw    s4, 1864(sp)
+// 0x0107ee9c: 0x107ee9c: lw    s4, 1864(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6452,7 +10674,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0107e87c: 0x107e87c: lw    s3, 1860(sp)
+// 0x0107eea0: 0x107eea0: lw    s3, 1860(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6461,7 +10683,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0107e880: 0x107e880: lw    s2, 1856(sp)
+// 0x0107eea4: 0x107eea4: lw    s2, 1856(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6470,7 +10692,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107e884: 0x107e884: lw    s1, 1852(sp)
+// 0x0107eea8: 0x107eea8: lw    s1, 1852(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6479,7 +10701,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107e888: 0x107e888: lw    s0, 1848(sp)
+// 0x0107eeac: 0x107eeac: lw    s0, 1848(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6488,7 +10710,7 @@ L_107e864:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107e88c: 0x107e88c: jr    ra addiu sp, sp, 1888
+// 0x0107eeb0: 0x107eeb0: jr    ra addiu sp, sp, 1888
 	ldloc.0
 	ldc.i4 1888
 	add
diff --git a/converted/Cibyl95.j b/converted/Cibyl95.j
index c6dff2b..a3648e7 100644
--- a/converted/Cibyl95.j
+++ b/converted/Cibyl95.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl95::.ctor
 
-.method public static int32 RTAlerts_Scroll_Prev_107e894(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Scroll_Prev_107eeb8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -79,32 +79,32 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_107e894:
-// 0x0107e894: 0x107e894: lui   v0, 0x80000
+L_107eeb8:
+// 0x0107eeb8: 0x107eeb8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107e898: 0x107e898: lw    v0, -14028(v0)
+// 0x0107eebc: 0x107eebc: lw    v0, -13564(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e89c: 0x107e89c: addiu sp, sp, -24
+// 0x0107eec0: 0x107eec0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107e8a0: 0x107e8a0: addiu a0, zero, 1
+// 0x0107eec4: 0x107eec4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107e8a4: 0x107e8a4: lui   v1, 0x0
+// 0x0107eec8: 0x107eec8: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0107e8a8: 0x107e8a8: sw    ra, 20(sp)
-// 0x0107e8ac: 0x107e8ac: sw    s0, 16(sp)
+// 0x0107eecc: 0x107eecc: sw    ra, 20(sp)
+// 0x0107eed0: 0x107eed0: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -113,7 +113,7 @@ L_107e894:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107e8b0: 0x107e8b0: beq   v0, zero, 0x107e95c sw    a0, 15940(v1)
+// 0x0107eed4: 0x107eed4: beq   v0, zero, 0x107ef80 sw    a0, 15940(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
@@ -123,31 +123,31 @@ L_107e894:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_107e95c
+	brfalse L_107ef80
 // --- basic block ---
-// 0x0107e8b8: 0x107e8b8: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x0107eedc: 0x107eedc: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107e8c0: 0x107e8c0: beq   v0, zero, 0x107e8e8 sll   zero, zero, 0
+// 0x0107eee4: 0x107eee4: beq   v0, zero, 0x107ef0c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107e8e8
+	brfalse L_107ef0c
 // --- basic block ---
-// 0x0107e8c8: 0x107e8c8: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0107eeec: 0x107eeec: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e8d0: 0x107e8d0: lui   a1, 0x20000
+// 0x0107eef4: 0x107eef4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107e8d4: 0x107e8d4: addu  a0, v0, zero
+// 0x0107eef8: 0x107eef8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e8d8: 0x107e8d8: jal   0x1001b14 addiu a1, a1, -26748
+// 0x0107eefc: 0x107eefc: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -155,14 +155,14 @@ L_107e894:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107e8e0: 0x107e8e0: beq   v0, zero, 0x107e8fc lui   v0, 0x80000
+// 0x0107ef04: 0x107ef04: beq   v0, zero, 0x107ef20 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107e8fc
+	brfalse L_107ef20
 // --- basic block ---
-L_107e8e8:
-// 0x0107e8e8: 0x107e8e8: jal   0x10788cc addu  a0, zero, zero
+L_107ef0c:
+// 0x0107ef0c: 0x107ef0c: jal   0x1078ef0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -170,135 +170,135 @@ L_107e8e8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e8f0: 0x107e8f0: lui   v0, 0x80000
+// 0x0107ef14: 0x107ef14: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107e8f4: 0x107e8f4: sw    zero, -14016(v0)
+// 0x0107ef18: 0x107ef18: sw    zero, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107e8f8: 0x107e8f8: lui   v0, 0x80000
+// 0x0107ef1c: 0x107ef1c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107e8fc:
-// 0x0107e8fc: 0x107e8fc: lw    v1, -14016(v0)
+L_107ef20:
+// 0x0107ef20: 0x107ef20: lw    v1, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107e900: 0x107e900: sll   zero, zero, 0
-// 0x0107e904: 0x107e904: bgtz  v1, 0x107e91c addiu v1, v1, -1
+// 0x0107ef24: 0x107ef24: sll   zero, zero, 0
+// 0x0107ef28: 0x107ef28: bgtz  v1, 0x107ef40 addiu v1, v1, -1
 	ldloc 6
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
 	ldc.i4.s 0
-	bgt L_107e91c
+	bgt L_107ef40
 // --- basic block ---
-// 0x0107e90c: 0x107e90c: lui   v1, 0x80000
+// 0x0107ef30: 0x107ef30: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107e910: 0x107e910: lw    v1, -14028(v1)
+// 0x0107ef34: 0x107ef34: lw    v1, -13564(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107e914: 0x107e914: sll   zero, zero, 0
-// 0x0107e918: 0x107e918: addiu v1, v1, -1
+// 0x0107ef38: 0x107ef38: sll   zero, zero, 0
+// 0x0107ef3c: 0x107ef3c: addiu v1, v1, -1
 	ldloc 6
 	ldc.i4.m1
 	add
 	stloc 6
-L_107e91c:
-// 0x0107e91c: 0x107e91c: sw    v1, -14016(v0)
+L_107ef40:
+// 0x0107ef40: 0x107ef40: sw    v1, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107e920: 0x107e920: lui   v0, 0x80000
+// 0x0107ef44: 0x107ef44: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107e924: 0x107e924: lw    v1, -14016(v0)
+// 0x0107ef48: 0x107ef48: lw    v1, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107e928: 0x107e928: lui   v0, 0x80000
+// 0x0107ef4c: 0x107ef4c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107e92c: 0x107e92c: sll   v1, v1, 2
+// 0x0107ef50: 0x107ef50: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0107e930: 0x107e930: addiu v0, v0, -16028
+// 0x0107ef54: 0x107ef54: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107e934: 0x107e934: addu  v0, v1, v0
+// 0x0107ef58: 0x107ef58: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0107e938: 0x107e938: lw    s0, 0(v0)
+// 0x0107ef5c: 0x107ef5c: lw    s0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107e93c: 0x107e93c: sll   zero, zero, 0
-// 0x0107e940: 0x107e940: beq   s0, zero, 0x107e95c sll   zero, zero, 0
+// 0x0107ef60: 0x107ef60: sll   zero, zero, 0
+// 0x0107ef64: 0x107ef64: beq   s0, zero, 0x107ef80 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_107e95c
+	brfalse L_107ef80
 // --- basic block ---
-// 0x0107e948: 0x107e948: jal   0x1021394 sll   zero, zero, 0
+// 0x0107ef6c: 0x107ef6c: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e950: 0x107e950: lw    a0, 0(s0)
+// 0x0107ef74: 0x107ef74: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107e954: 0x107e954: jal   0x107d4a8 addiu a1, zero, 2
+// 0x0107ef78: 0x107ef78: jal   0x107dacc addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -306,14 +306,14 @@ L_107e91c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl94::RTAlerts_popup_alert_107d4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl94::RTAlerts_popup_alert_107dacc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107e95c:
-// 0x0107e95c: 0x107e95c: lw    ra, 20(sp)
-// 0x0107e960: 0x107e960: lw    s0, 16(sp)
+L_107ef80:
+// 0x0107ef80: 0x107ef80: lw    ra, 20(sp)
+// 0x0107ef84: 0x107ef84: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -322,7 +322,7 @@ L_107e95c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107e964: 0x107e964: jr    ra addiu sp, sp, 24
+// 0x0107ef88: 0x107ef88: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -334,7 +334,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Scroll_Next_107e96c(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Scroll_Next_107ef90(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -372,32 +372,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_107e96c:
-// 0x0107e96c: 0x107e96c: lui   v0, 0x80000
+L_107ef90:
+// 0x0107ef90: 0x107ef90: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107e970: 0x107e970: lw    v0, -14028(v0)
+// 0x0107ef94: 0x107ef94: lw    v0, -13564(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107e974: 0x107e974: addiu sp, sp, -24
+// 0x0107ef98: 0x107ef98: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107e978: 0x107e978: addiu a0, zero, 1
+// 0x0107ef9c: 0x107ef9c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107e97c: 0x107e97c: lui   v1, 0x0
+// 0x0107efa0: 0x107efa0: lui   v1, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x0107e980: 0x107e980: sw    ra, 20(sp)
-// 0x0107e984: 0x107e984: sw    s0, 16(sp)
+// 0x0107efa4: 0x107efa4: sw    ra, 20(sp)
+// 0x0107efa8: 0x107efa8: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -406,7 +406,7 @@ L_107e96c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107e988: 0x107e988: beq   v0, zero, 0x107ea3c sw    a0, 15940(v1)
+// 0x0107efac: 0x107efac: beq   v0, zero, 0x107f060 sw    a0, 15940(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
@@ -416,31 +416,31 @@ L_107e96c:
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_107ea3c
+	brfalse L_107f060
 // --- basic block ---
-// 0x0107e990: 0x107e990: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x0107efb4: 0x107efb4: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107e998: 0x107e998: beq   v0, zero, 0x107e9c0 sll   zero, zero, 0
+// 0x0107efbc: 0x107efbc: beq   v0, zero, 0x107efe4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107e9c0
+	brfalse L_107efe4
 // --- basic block ---
-// 0x0107e9a0: 0x107e9a0: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0107efc4: 0x107efc4: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e9a8: 0x107e9a8: lui   a1, 0x20000
+// 0x0107efcc: 0x107efcc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107e9ac: 0x107e9ac: addu  a0, v0, zero
+// 0x0107efd0: 0x107efd0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107e9b0: 0x107e9b0: jal   0x1001b14 addiu a1, a1, -26748
+// 0x0107efd4: 0x107efd4: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -448,14 +448,14 @@ L_107e96c:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107e9b8: 0x107e9b8: beq   v0, zero, 0x107e9d8 lui   v0, 0x80000
+// 0x0107efdc: 0x107efdc: beq   v0, zero, 0x107effc lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107e9d8
+	brfalse L_107effc
 // --- basic block ---
-L_107e9c0:
-// 0x0107e9c0: 0x107e9c0: jal   0x10788cc addu  a0, zero, zero
+L_107efe4:
+// 0x0107efe4: 0x107efe4: jal   0x1078ef0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -463,152 +463,152 @@ L_107e9c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107e9c8: 0x107e9c8: addiu v1, zero, -1
+// 0x0107efec: 0x107efec: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x0107e9cc: 0x107e9cc: lui   v0, 0x80000
+// 0x0107eff0: 0x107eff0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107e9d0: 0x107e9d0: sw    v1, -14016(v0)
+// 0x0107eff4: 0x107eff4: sw    v1, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107e9d4: 0x107e9d4: lui   v0, 0x80000
+// 0x0107eff8: 0x107eff8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107e9d8:
-// 0x0107e9d8: 0x107e9d8: lw    a0, -14028(v0)
+L_107effc:
+// 0x0107effc: 0x107effc: lw    a0, -13564(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107e9dc: 0x107e9dc: lui   v0, 0x80000
+// 0x0107f000: 0x107f000: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107e9e0: 0x107e9e0: lw    v1, -14016(v0)
+// 0x0107f004: 0x107f004: lw    v1, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107e9e4: 0x107e9e4: addiu a0, a0, -1
+// 0x0107f008: 0x107f008: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x0107e9e8: 0x107e9e8: slt   a0, v1, a0
+// 0x0107f00c: 0x107f00c: slt   a0, v1, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc.1
-// 0x0107e9ec: 0x107e9ec: beq   a0, zero, 0x107e9fc addiu v1, v1, 1
+// 0x0107f010: 0x107f010: beq   a0, zero, 0x107f020 addiu v1, v1, 1
 	ldloc.1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brfalse L_107e9fc
+	brfalse L_107f020
 // --- basic block ---
-// 0x0107e9f4: 0x107e9f4: j	 0x107ea04 sw    v1, -14016(v0)
+// 0x0107f018: 0x107f018: j	 0x107f028 sw    v1, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldloc 6
 	stelem.i4
-	br L_107ea04
+	br L_107f028
 // --- basic block ---
-L_107e9fc:
-// 0x0107e9fc: 0x107e9fc: sw    zero, -14016(v0)
+L_107f020:
+// 0x0107f020: 0x107f020: sw    zero, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107ea00: 0x107ea00: lui   v0, 0x80000
+// 0x0107f024: 0x107f024: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107ea04:
-// 0x0107ea04: 0x107ea04: lw    v1, -14016(v0)
+L_107f028:
+// 0x0107f028: 0x107f028: lw    v1, -13552(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107ea08: 0x107ea08: lui   v0, 0x80000
+// 0x0107f02c: 0x107f02c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107ea0c: 0x107ea0c: sll   v1, v1, 2
+// 0x0107f030: 0x107f030: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0107ea10: 0x107ea10: addiu v0, v0, -16028
+// 0x0107f034: 0x107f034: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107ea14: 0x107ea14: addu  v0, v1, v0
+// 0x0107f038: 0x107f038: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0107ea18: 0x107ea18: lw    s0, 0(v0)
+// 0x0107f03c: 0x107f03c: lw    s0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107ea1c: 0x107ea1c: sll   zero, zero, 0
-// 0x0107ea20: 0x107ea20: beq   s0, zero, 0x107ea3c sll   zero, zero, 0
+// 0x0107f040: 0x107f040: sll   zero, zero, 0
+// 0x0107f044: 0x107f044: beq   s0, zero, 0x107f060 sll   zero, zero, 0
 	ldloc 8
-	brfalse L_107ea3c
+	brfalse L_107f060
 // --- basic block ---
-// 0x0107ea28: 0x107ea28: jal   0x1021394 sll   zero, zero, 0
+// 0x0107f04c: 0x107f04c: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ea30: 0x107ea30: lw    a0, 0(s0)
+// 0x0107f054: 0x107f054: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107ea34: 0x107ea34: jal   0x107d4a8 addiu a1, zero, 2
+// 0x0107f058: 0x107f058: jal   0x107dacc addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -616,14 +616,14 @@ L_107ea04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl94::RTAlerts_popup_alert_107d4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl94::RTAlerts_popup_alert_107dacc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107ea3c:
-// 0x0107ea3c: 0x107ea3c: lw    ra, 20(sp)
-// 0x0107ea40: 0x107ea40: lw    s0, 16(sp)
+L_107f060:
+// 0x0107f060: 0x107f060: lw    ra, 20(sp)
+// 0x0107f064: 0x107f064: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -632,7 +632,7 @@ L_107ea3c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107ea44: 0x107ea44: jr    ra addiu sp, sp, 24
+// 0x0107f068: 0x107f068: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -644,7 +644,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Popup_By_Id_No_Center_107ea4c(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Popup_By_Id_No_Center_107f070(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -682,12 +682,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107ea4c: 0x107ea4c: addiu sp, sp, -24
+// 0x0107f070: 0x107f070: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107ea50: 0x107ea50: sw    s0, 16(sp)
+// 0x0107f074: 0x107f074: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -696,32 +696,32 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107ea54: 0x107ea54: sw    ra, 20(sp)
-// 0x0107ea58: 0x107ea58: jal   0x1093f90 addu  s0, a0, zero
+// 0x0107f078: 0x107f078: sw    ra, 20(sp)
+// 0x0107f07c: 0x107f07c: jal   0x10945b4 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107ea60: 0x107ea60: beq   v0, zero, 0x107ea88 sll   zero, zero, 0
+// 0x0107f084: 0x107f084: beq   v0, zero, 0x107f0ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107ea88
+	brfalse L_107f0ac
 // --- basic block ---
-// 0x0107ea68: 0x107ea68: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0107f08c: 0x107f08c: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ea70: 0x107ea70: lui   a1, 0x20000
+// 0x0107f094: 0x107f094: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107ea74: 0x107ea74: addu  a0, v0, zero
+// 0x0107f098: 0x107f098: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107ea78: 0x107ea78: jal   0x1001b14 addiu a1, a1, -26748
+// 0x0107f09c: 0x107f09c: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -729,49 +729,49 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107ea80: 0x107ea80: beq   v0, zero, 0x107eaac sll   zero, zero, 0
+// 0x0107f0a4: 0x107f0a4: beq   v0, zero, 0x107f0d0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107eaac
+	brfalse L_107f0d0
 // --- basic block ---
-L_107ea88:
-// 0x0107ea88: 0x107ea88: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+L_107f0ac:
+// 0x0107f0ac: 0x107f0ac: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ea90: 0x107ea90: lui   a0, 0x80000
+// 0x0107f0b4: 0x107f0b4: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0107ea94: 0x107ea94: lui   a1, 0x0
+// 0x0107f0b8: 0x107f0b8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0107ea98: 0x107ea98: lui   v1, 0x80000
+// 0x0107f0bc: 0x107f0bc: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107ea9c: 0x107ea9c: addiu a0, a0, -13980
+// 0x0107f0c0: 0x107f0c0: addiu a0, a0, -13516
 	ldloc.1
-	ldc.i4 -13980
+	ldc.i4 -13516
 	add
 	stloc.1
-// 0x0107eaa0: 0x107eaa0: addiu a1, a1, 15944
+// 0x0107f0c4: 0x107f0c4: addiu a1, a1, 15944
 	ldloc.2
 	ldc.i4 15944
 	add
 	stloc.2
-// 0x0107eaa4: 0x107eaa4: j	 0x107eac4 sw    v0, -16228(v1)
+// 0x0107f0c8: 0x107f0c8: j	 0x107f0e8 sw    v0, -15764(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4057
+	ldc.i4 -3941
 	add
 	ldloc 5
 	stelem.i4
-	br L_107eac4
+	br L_107f0e8
 // --- basic block ---
-L_107eaac:
-// 0x0107eaac: 0x107eaac: jal   0x1094b64 addiu a0, zero, 2
+L_107f0d0:
+// 0x0107f0d0: 0x107f0d0: jal   0x10951ac addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -779,76 +779,76 @@ L_107eaac:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107eab4: 0x107eab4: lui   a0, 0x80000
+// 0x0107f0d8: 0x107f0d8: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0107eab8: 0x107eab8: lui   a1, 0x0
+// 0x0107f0dc: 0x107f0dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0107eabc: 0x107eabc: addiu a0, a0, -13980
+// 0x0107f0e0: 0x107f0e0: addiu a0, a0, -13516
 	ldloc.1
-	ldc.i4 -13980
+	ldc.i4 -13516
 	add
 	stloc.1
-// 0x0107eac0: 0x107eac0: addiu a1, a1, 15944
+// 0x0107f0e4: 0x107f0e4: addiu a1, a1, 15944
 	ldloc.2
 	ldc.i4 15944
 	add
 	stloc.2
-L_107eac4:
-// 0x0107eac4: 0x107eac4: jal   0x100844c sll   zero, zero, 0
+L_107f0e8:
+// 0x0107f0e8: 0x107f0e8: jal   0x100845c sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107eacc: 0x107eacc: jal   0x1021394 sll   zero, zero, 0
+// 0x0107f0f0: 0x107f0f0: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ead4: 0x107ead4: lui   a1, 0x0
+// 0x0107f0f8: 0x107f0f8: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0107ead8: 0x107ead8: lui   a0, 0x80000
+// 0x0107f0fc: 0x107f0fc: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0107eadc: 0x107eadc: addiu a1, a1, 15944
+// 0x0107f100: 0x107f100: addiu a1, a1, 15944
 	ldloc.2
 	ldc.i4 15944
 	add
 	stloc.2
-// 0x0107eae0: 0x107eae0: jal   0x100844c addiu a0, a0, -13980
+// 0x0107f104: 0x107f104: jal   0x100845c addiu a0, a0, -13516
 	ldloc.1
-	ldc.i4 -13980
+	ldc.i4 -13516
 	add
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107eae8: 0x107eae8: addu  a0, s0, zero
+// 0x0107f10c: 0x107f10c: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x0107eaec: 0x107eaec: jal   0x107d4a8 addiu a1, zero, -1
+// 0x0107f110: 0x107f110: jal   0x107dacc addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -856,13 +856,13 @@ L_107eac4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl94::RTAlerts_popup_alert_107d4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl94::RTAlerts_popup_alert_107dacc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107eaf4: 0x107eaf4: lw    ra, 20(sp)
-// 0x0107eaf8: 0x107eaf8: lw    s0, 16(sp)
+// 0x0107f118: 0x107f118: lw    ra, 20(sp)
+// 0x0107f11c: 0x107f11c: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -871,7 +871,7 @@ L_107eac4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107eafc: 0x107eafc: jr    ra addiu sp, sp, 24
+// 0x0107f120: 0x107f120: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -883,7 +883,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 OnAlertShortClick_107eb04(int32,int32,int32,int32,int32)
+.method public static int32 OnAlertShortClick_107f128(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32 v0,int32[] mem,int32 ra)
@@ -918,13 +918,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107eb04: 0x107eb04: addiu sp, sp, -24
+// 0x0107f128: 0x107f128: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107eb08: 0x107eb08: sw    ra, 20(sp)
-// 0x0107eb0c: 0x107eb0c: jal   0x1000d8c sll   zero, zero, 0
+// 0x0107f12c: 0x107f12c: sw    ra, 20(sp)
+// 0x0107f130: 0x107f130: jal   0x1000d8c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -935,26 +935,26 @@ __CIBYL_javamethod_begin:
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0107eb14: 0x107eb14: lui   v1, 0x80000
+// 0x0107f138: 0x107f138: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107eb18: 0x107eb18: lw    v1, -14028(v1)
+// 0x0107f13c: 0x107f13c: lw    v1, -13564(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107eb1c: 0x107eb1c: sll   zero, zero, 0
-// 0x0107eb20: 0x107eb20: beq   v1, zero, 0x107eb58 lui   v1, 0x0
+// 0x0107f140: 0x107f140: sll   zero, zero, 0
+// 0x0107f144: 0x107f144: beq   v1, zero, 0x107f17c lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_107eb58
+	brfalse L_107f17c
 // --- basic block ---
-// 0x0107eb28: 0x107eb28: lw    a0, 15940(v1)
+// 0x0107f14c: 0x107f14c: lw    a0, 15940(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -963,47 +963,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107eb2c: 0x107eb2c: addiu v1, zero, 4
+// 0x0107f150: 0x107f150: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x0107eb30: 0x107eb30: bne   a0, v1, 0x107eb58 lui   v1, 0x80000
+// 0x0107f154: 0x107f154: bne   a0, v1, 0x107f17c lui   v1, 0x80000
 	ldloc.1
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	bne.un L_107eb58
+	bne.un L_107f17c
 // --- basic block ---
-// 0x0107eb38: 0x107eb38: lw    a0, -14004(v1)
+// 0x0107f15c: 0x107f15c: lw    a0, -13540(v1)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 -3385
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107eb3c: 0x107eb3c: sll   zero, zero, 0
-// 0x0107eb40: 0x107eb40: bne   a0, v0, 0x107eb58 sll   zero, zero, 0
+// 0x0107f160: 0x107f160: sll   zero, zero, 0
+// 0x0107f164: 0x107f164: bne   a0, v0, 0x107f17c sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_107eb58
+	bne.un L_107f17c
 // --- basic block ---
-// 0x0107eb48: 0x107eb48: jal   0x10847d8 sll   zero, zero, 0
+// 0x0107f16c: 0x107f16c: jal   0x1084dfc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeAlertCommentsList_10847d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeAlertCommentsList_1084dfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-// 0x0107eb50: 0x107eb50: j	 0x107eb60 sll   zero, zero, 0
-	br L_107eb60
+// 0x0107f174: 0x107f174: j	 0x107f184 sll   zero, zero, 0
+	br L_107f184
 // --- basic block ---
-L_107eb58:
-// 0x0107eb58: 0x107eb58: jal   0x107ea4c addu  a0, v0, zero
+L_107f17c:
+// 0x0107f17c: 0x107f17c: jal   0x107f070 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -1011,15 +1011,15 @@ L_107eb58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_By_Id_No_Center_107ea4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_By_Id_No_Center_107f070(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 5
 	stloc 6
 // --- basic block ---
-L_107eb60:
-// 0x0107eb60: 0x107eb60: lw    ra, 20(sp)
-// 0x0107eb64: 0x107eb64: sll   zero, zero, 0
-// 0x0107eb68: 0x107eb68: jr    ra addiu sp, sp, 24
+L_107f184:
+// 0x0107f184: 0x107f184: lw    ra, 20(sp)
+// 0x0107f188: 0x107f188: sll   zero, zero, 0
+// 0x0107f18c: 0x107f18c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1031,7 +1031,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTAlerts_Popup_By_Id_107eb70(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Popup_By_Id_107f194(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 ra)
@@ -1072,12 +1072,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107eb70: 0x107eb70: addiu sp, sp, -32
+// 0x0107f194: 0x107f194: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0107eb74: 0x107eb74: sw    s1, 24(sp)
+// 0x0107f198: 0x107f198: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1086,7 +1086,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107eb78: 0x107eb78: sw    s0, 20(sp)
+// 0x0107f19c: 0x107f19c: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1095,35 +1095,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107eb7c: 0x107eb7c: sw    ra, 28(sp)
-// 0x0107eb80: 0x107eb80: addu  s1, a0, zero
+// 0x0107f1a0: 0x107f1a0: sw    ra, 28(sp)
+// 0x0107f1a4: 0x107f1a4: addu  s1, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0107eb84: 0x107eb84: jal   0x1093f90 addu  s0, a1, zero
+// 0x0107f1a8: 0x107f1a8: jal   0x10945b4 addu  s0, a1, zero
 	ldloc.2
 	stloc 8
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107eb8c: 0x107eb8c: beq   v0, zero, 0x107ebb4 sll   zero, zero, 0
+// 0x0107f1b0: 0x107f1b0: beq   v0, zero, 0x107f1d8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107ebb4
+	brfalse L_107f1d8
 // --- basic block ---
-// 0x0107eb94: 0x107eb94: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0107f1b8: 0x107f1b8: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107eb9c: 0x107eb9c: lui   a1, 0x20000
+// 0x0107f1c0: 0x107f1c0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107eba0: 0x107eba0: addu  a0, v0, zero
+// 0x0107f1c4: 0x107f1c4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107eba4: 0x107eba4: jal   0x1001b14 addiu a1, a1, -26748
+// 0x0107f1c8: 0x107f1c8: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -1131,40 +1131,40 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107ebac: 0x107ebac: beq   v0, zero, 0x107ec18 addu  a0, s1, zero
+// 0x0107f1d0: 0x107f1d0: beq   v0, zero, 0x107f23c addu  a0, s1, zero
 	ldloc 5
 	ldloc 9
 	stloc.1
-	brfalse L_107ec18
+	brfalse L_107f23c
 // --- basic block ---
-L_107ebb4:
-// 0x0107ebb4: 0x107ebb4: beq   s0, zero, 0x107ec04 addiu v1, zero, -2
+L_107f1d8:
+// 0x0107f1d8: 0x107f1d8: beq   s0, zero, 0x107f228 addiu v1, zero, -2
 	ldloc 8
 	ldc.i4.s -2
 	stloc 6
-	brfalse L_107ec04
+	brfalse L_107f228
 // --- basic block ---
-// 0x0107ebbc: 0x107ebbc: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+// 0x0107f1e0: 0x107f1e0: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ebc4: 0x107ebc4: beq   v0, zero, 0x107ebf8 addu  s0, v0, zero
+// 0x0107f1e8: 0x107f1e8: beq   v0, zero, 0x107f21c addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_107ebf8
+	brfalse L_107f21c
 // --- basic block ---
-// 0x0107ebcc: 0x107ebcc: lui   a1, 0x10000
+// 0x0107f1f0: 0x107f1f0: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107ebd0: 0x107ebd0: addiu a1, a1, -31052
+// 0x0107f1f4: 0x107f1f4: addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
 	stloc.2
-// 0x0107ebd4: 0x107ebd4: jal   0x1001b14 addu  a0, v0, zero
+// 0x0107f1f8: 0x107f1f8: jal   0x1001b14 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -1172,24 +1172,24 @@ L_107ebb4:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107ebdc: 0x107ebdc: beq   v0, zero, 0x107ebfc lui   v0, 0x80000
+// 0x0107f200: 0x107f200: beq   v0, zero, 0x107f220 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107ebfc
+	brfalse L_107f220
 // --- basic block ---
-// 0x0107ebe4: 0x107ebe4: lui   a0, 0x80000
+// 0x0107f208: 0x107f208: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0107ebe8: 0x107ebe8: lui   a1, 0x0
+// 0x0107f20c: 0x107f20c: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0107ebec: 0x107ebec: addiu a0, a0, -13980
+// 0x0107f210: 0x107f210: addiu a0, a0, -13516
 	ldloc.1
-	ldc.i4 -13980
+	ldc.i4 -13516
 	add
 	stloc.1
-// 0x0107ebf0: 0x107ebf0: jal   0x100844c addiu a1, a1, 15944
+// 0x0107f214: 0x107f214: jal   0x100845c addiu a1, a1, 15944
 	ldloc.2
 	ldc.i4 15944
 	add
@@ -1197,32 +1197,32 @@ L_107ebb4:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107ebf8:
-// 0x0107ebf8: 0x107ebf8: lui   v0, 0x80000
+L_107f21c:
+// 0x0107f21c: 0x107f21c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107ebfc:
-// 0x0107ebfc: 0x107ebfc: j	 0x107ec0c sw    s0, -16228(v0)
+L_107f220:
+// 0x0107f220: 0x107f220: j	 0x107f230 sw    s0, -15764(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4057
+	ldc.i4 -3941
 	add
 	ldloc 8
 	stelem.i4
-	br L_107ec0c
+	br L_107f230
 // --- basic block ---
-L_107ec04:
-// 0x0107ec04: 0x107ec04: lui   v0, 0x0
+L_107f228:
+// 0x0107f228: 0x107f228: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0107ec08: 0x107ec08: sw    v1, 15944(v0)
+// 0x0107f22c: 0x107f22c: sw    v1, 15944(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1231,23 +1231,23 @@ L_107ec04:
 	add
 	ldloc 6
 	stelem.i4
-L_107ec0c:
-// 0x0107ec0c: 0x107ec0c: jal   0x1021394 sll   zero, zero, 0
+L_107f230:
+// 0x0107f230: 0x107f230: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ec14: 0x107ec14: addu  a0, s1, zero
+// 0x0107f238: 0x107f238: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-L_107ec18:
-// 0x0107ec18: 0x107ec18: jal   0x107d4a8 addiu a1, zero, 1
+L_107f23c:
+// 0x0107f23c: 0x107f23c: jal   0x107dacc addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -1255,13 +1255,13 @@ L_107ec18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl94::RTAlerts_popup_alert_107d4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl94::RTAlerts_popup_alert_107dacc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ec20: 0x107ec20: lw    ra, 28(sp)
-// 0x0107ec24: 0x107ec24: lw    s1, 24(sp)
+// 0x0107f244: 0x107f244: lw    ra, 28(sp)
+// 0x0107f248: 0x107f248: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1270,7 +1270,7 @@ L_107ec18:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107ec28: 0x107ec28: lw    s0, 20(sp)
+// 0x0107f24c: 0x107f24c: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1279,7 +1279,7 @@ L_107ec18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107ec2c: 0x107ec2c: jr    ra addiu sp, sp, 32
+// 0x0107f250: 0x107f250: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -1291,7 +1291,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Add_107ec34(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Add_107f258(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s1,int32 s0,int32 s2,int32 s3,int32 s4,int32 s5,int32 t1,int32 ra,int32 t0)
@@ -1350,20 +1350,20 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107ec34: 0x107ec34: lui   v1, 0x80000
+// 0x0107f258: 0x107f258: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0107ec38: 0x107ec38: addiu sp, sp, -376
+// 0x0107f25c: 0x107f25c: addiu sp, sp, -376
 	ldloc.0
 	ldc.i4 -376
 	add
 	stloc.0
-// 0x0107ec3c: 0x107ec3c: addiu v1, v1, -16028
+// 0x0107f260: 0x107f260: addiu v1, v1, -15564
 	ldloc 7
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 7
-// 0x0107ec40: 0x107ec40: sw    s2, 356(sp)
+// 0x0107f264: 0x107f264: sw    s2, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1372,7 +1372,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107ec44: 0x107ec44: lw    s2, 2000(v1)
+// 0x0107f268: 0x107f268: lw    s2, 2000(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -1381,10 +1381,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107ec48: 0x107ec48: addiu v0, zero, -1
+// 0x0107f26c: 0x107f26c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0107ec4c: 0x107ec4c: sw    s0, 348(sp)
+// 0x0107f270: 0x107f270: sw    s0, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1393,13 +1393,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107ec50: 0x107ec50: addu  s0, a0, zero
+// 0x0107f274: 0x107f274: addu  s0, a0, zero
 	ldloc.1
 	stloc 9
-// 0x0107ec54: 0x107ec54: addiu a0, zero, 500
+// 0x0107f278: 0x107f278: addiu a0, zero, 500
 	ldc.i4 500
 	stloc.1
-// 0x0107ec58: 0x107ec58: sw    v0, 52(sp)
+// 0x0107f27c: 0x107f27c: sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1408,7 +1408,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ec5c: 0x107ec5c: sw    v0, 40(sp)
+// 0x0107f280: 0x107f280: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1417,8 +1417,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ec60: 0x107ec60: sw    ra, 372(sp)
-// 0x0107ec64: 0x107ec64: sw    s5, 368(sp)
+// 0x0107f284: 0x107f284: sw    ra, 372(sp)
+// 0x0107f288: 0x107f288: sw    s5, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1427,7 +1427,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0107ec68: 0x107ec68: sw    s4, 364(sp)
+// 0x0107f28c: 0x107f28c: sw    s4, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1436,7 +1436,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0107ec6c: 0x107ec6c: sw    s3, 360(sp)
+// 0x0107f290: 0x107f290: sw    s3, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1445,7 +1445,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0107ec70: 0x107ec70: sw    s1, 352(sp)
+// 0x0107f294: 0x107f294: sw    s1, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1454,74 +1454,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107ec74: 0x107ec74: beq   s2, a0, 0x107f728 addu  v0, zero, zero
+// 0x0107f298: 0x107f298: beq   s2, a0, 0x107fd4c addu  v0, zero, zero
 	ldloc 10
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	beq  L_107f728
+	beq  L_107fd4c
 // --- basic block ---
-// 0x0107ec7c: 0x107ec7c: lw    v0, 0(s0)
+// 0x0107f2a0: 0x107f2a0: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107ec80: 0x107ec80: j	 0x107ecc0 addu  a0, zero, zero
+// 0x0107f2a4: 0x107f2a4: j	 0x107f2e4 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_107ecc0
+	br L_107f2e4
 // --- basic block ---
-L_107ec88:
-// 0x0107ec88: 0x107ec88: lw    a1, 0(v1)
+L_107f2ac:
+// 0x0107f2ac: 0x107f2ac: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0107ec8c: 0x107ec8c: sll   zero, zero, 0
-// 0x0107ec90: 0x107ec90: lw    a1, 0(a1)
+// 0x0107f2b0: 0x107f2b0: sll   zero, zero, 0
+// 0x0107f2b4: 0x107f2b4: lw    a1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0107ec94: 0x107ec94: sll   zero, zero, 0
-// 0x0107ec98: 0x107ec98: bne   a1, v0, 0x107ecc0 addiu v1, v1, 4
+// 0x0107f2b8: 0x107f2b8: sll   zero, zero, 0
+// 0x0107f2bc: 0x107f2bc: bne   a1, v0, 0x107f2e4 addiu v1, v1, 4
 	ldloc.2
 	ldloc 5
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	bne.un L_107ecc0
+	bne.un L_107f2e4
 // --- basic block ---
-// 0x0107eca0: 0x107eca0: lui   a1, 0x20000
+// 0x0107f2c4: 0x107f2c4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107eca4: 0x107eca4: lui   a3, 0x20000
+// 0x0107f2c8: 0x107f2c8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107eca8: 0x107eca8: addiu a1, a1, -26712
+// 0x0107f2cc: 0x107f2cc: addiu a1, a1, -26248
 	ldloc.2
-	ldc.i4 -26712
+	ldc.i4 -26248
 	add
 	stloc.2
-// 0x0107ecac: 0x107ecac: addiu a3, a3, -24544
+// 0x0107f2d0: 0x107f2d0: addiu a3, a3, -24080
 	ldloc 4
-	ldc.i4 -24544
+	ldc.i4 -24080
 	add
 	stloc 4
-// 0x0107ecb0: 0x107ecb0: addiu a0, zero, 2
+// 0x0107f2d4: 0x107f2d4: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0107ecb4: 0x107ecb4: addiu a2, zero, 625
+// 0x0107f2d8: 0x107f2d8: addiu a2, zero, 625
 	ldc.i4 625
 	stloc.3
-// 0x0107ecb8: 0x107ecb8: j	 0x107ecfc sw    v0, 16(sp)
+// 0x0107f2dc: 0x107f2dc: j	 0x107f320 sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1530,23 +1530,23 @@ L_107ec88:
 	add
 	ldloc 5
 	stelem.i4
-	br L_107ecfc
+	br L_107f320
 // --- basic block ---
-L_107ecc0:
-// 0x0107ecc0: 0x107ecc0: slt   a1, a0, s2
+L_107f2e4:
+// 0x0107f2e4: 0x107f2e4: slt   a1, a0, s2
 	ldloc.1
 	ldloc 10
 	clt
 	stloc.2
-// 0x0107ecc4: 0x107ecc4: bne   a1, zero, 0x107ec88 addiu a0, a0, 1
+// 0x0107f2e8: 0x107f2e8: bne   a1, zero, 0x107f2ac addiu a0, a0, 1
 	ldloc.2
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-	brtrue L_107ec88
+	brtrue L_107f2ac
 // --- basic block ---
-// 0x0107eccc: 0x107eccc: lw    v1, 4(s0)
+// 0x0107f2f0: 0x107f2f0: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1555,38 +1555,38 @@ L_107ecc0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107ecd0: 0x107ecd0: sll   zero, zero, 0
-// 0x0107ecd4: 0x107ecd4: slti  a0, v1, 10
+// 0x0107f2f4: 0x107f2f4: sll   zero, zero, 0
+// 0x0107f2f8: 0x107f2f8: slti  a0, v1, 10
 	ldloc 7
 	ldc.i4.s 10
 	clt
 	stloc.1
-// 0x0107ecd8: 0x107ecd8: bne   a0, zero, 0x107ed0c lui   a1, 0x20000
+// 0x0107f2fc: 0x107f2fc: bne   a0, zero, 0x107f330 lui   a1, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	brtrue L_107ed0c
+	brtrue L_107f330
 // --- basic block ---
-// 0x0107ece0: 0x107ece0: lui   a3, 0x20000
+// 0x0107f304: 0x107f304: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107ece4: 0x107ece4: addiu a1, a1, -26712
+// 0x0107f308: 0x107f308: addiu a1, a1, -26248
 	ldloc.2
-	ldc.i4 -26712
+	ldc.i4 -26248
 	add
 	stloc.2
-// 0x0107ece8: 0x107ece8: addiu a3, a3, -24484
+// 0x0107f30c: 0x107f30c: addiu a3, a3, -24020
 	ldloc 4
-	ldc.i4 -24484
+	ldc.i4 -24020
 	add
 	stloc 4
-// 0x0107ecec: 0x107ecec: addiu a0, zero, 3
+// 0x0107f310: 0x107f310: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0107ecf0: 0x107ecf0: addiu a2, zero, 631
+// 0x0107f314: 0x107f314: addiu a2, zero, 631
 	ldc.i4 631
 	stloc.3
-// 0x0107ecf4: 0x107ecf4: sw    v0, 16(sp)
+// 0x0107f318: 0x107f318: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1595,7 +1595,7 @@ L_107ecc0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ecf8: 0x107ecf8: sw    v1, 20(sp)
+// 0x0107f31c: 0x107f31c: sw    v1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1604,8 +1604,8 @@ L_107ecc0:
 	add
 	ldloc 7
 	stelem.i4
-L_107ecfc:
-// 0x0107ecfc: 0x107ecfc: jal   0x100449c sll   zero, zero, 0
+L_107f320:
+// 0x0107f320: 0x107f320: jal   0x100449c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -1616,16 +1616,16 @@ L_107ecfc:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ed04: 0x107ed04: j	 0x107f728 addiu v0, zero, 1
+// 0x0107f328: 0x107f328: j	 0x107fd4c addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_107f728
+	br L_107fd4c
 // --- basic block ---
-L_107ed0c:
-// 0x0107ed0c: 0x107ed0c: lui   v0, 0x0
+L_107f330:
+// 0x0107f330: 0x107f330: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0107ed10: 0x107ed10: lw    a0, 15940(v0)
+// 0x0107f334: 0x107f334: lw    a0, 15940(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1634,15 +1634,15 @@ L_107ed0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107ed14: 0x107ed14: addiu v1, zero, 3
+// 0x0107f338: 0x107f338: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 7
-// 0x0107ed18: 0x107ed18: beq   a0, v1, 0x107ed34 sll   zero, zero, 0
+// 0x0107f33c: 0x107f33c: beq   a0, v1, 0x107f358 sll   zero, zero, 0
 	ldloc.1
 	ldloc 7
-	beq  L_107ed34
+	beq  L_107f358
 // --- basic block ---
-// 0x0107ed20: 0x107ed20: lw    v1, 1280(s0)
+// 0x0107f344: 0x107f344: lw    v1, 1280(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1651,14 +1651,14 @@ L_107ed0c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107ed24: 0x107ed24: sll   zero, zero, 0
-// 0x0107ed28: 0x107ed28: bne   v1, zero, 0x107ed34 addiu v1, zero, 2
+// 0x0107f348: 0x107f348: sll   zero, zero, 0
+// 0x0107f34c: 0x107f34c: bne   v1, zero, 0x107f358 addiu v1, zero, 2
 	ldloc 7
 	ldc.i4.2
 	stloc 7
-	brtrue L_107ed34
+	brtrue L_107f358
 // --- basic block ---
-// 0x0107ed30: 0x107ed30: sw    v1, 15940(v0)
+// 0x0107f354: 0x107f354: sw    v1, 15940(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1667,14 +1667,14 @@ L_107ed0c:
 	add
 	ldloc 7
 	stelem.i4
-L_107ed34:
-// 0x0107ed34: 0x107ed34: bne   s2, zero, 0x107ed5c lui   s1, 0x80000
+L_107f358:
+// 0x0107f358: 0x107f358: bne   s2, zero, 0x107f380 lui   s1, 0x80000
 	ldloc 10
 	ldc.i4 524288
 	stloc 8
-	brtrue L_107ed5c
+	brtrue L_107f380
 // --- basic block ---
-// 0x0107ed3c: 0x107ed3c: lw    v0, 1280(s0)
+// 0x0107f360: 0x107f360: lw    v0, 1280(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1683,22 +1683,22 @@ L_107ed34:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ed40: 0x107ed40: sll   zero, zero, 0
-// 0x0107ed44: 0x107ed44: beq   v0, zero, 0x107ed60 addiu s1, s1, -16028
+// 0x0107f364: 0x107f364: sll   zero, zero, 0
+// 0x0107f368: 0x107f368: beq   v0, zero, 0x107f384 addiu s1, s1, -15564
 	ldloc 5
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-	brfalse L_107ed60
+	brfalse L_107f384
 // --- basic block ---
-// 0x0107ed4c: 0x107ed4c: addiu v1, zero, 1
+// 0x0107f370: 0x107f370: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0107ed50: 0x107ed50: lui   v0, 0x0
+// 0x0107f374: 0x107f374: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0107ed54: 0x107ed54: sw    v1, 15940(v0)
+// 0x0107f378: 0x107f378: sw    v1, 15940(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -1707,17 +1707,17 @@ L_107ed34:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0107ed58: 0x107ed58: lui   s1, 0x80000
+// 0x0107f37c: 0x107f37c: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_107ed5c:
-// 0x0107ed5c: 0x107ed5c: addiu s1, s1, -16028
+L_107f380:
+// 0x0107f380: 0x107f380: addiu s1, s1, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-L_107ed60:
-// 0x0107ed60: 0x107ed60: jal   0x107c020 addiu a0, zero, 1840
+L_107f384:
+// 0x0107f384: 0x107f384: jal   0x107c644 addiu a0, zero, 1840
 	ldc.i4 1840
 	stloc.1
 	ldloc.0
@@ -1725,12 +1725,12 @@ L_107ed60:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::T_411_107c020(int32,int32,int32,int32,int32)
+	call int32 Cibyl93::T_411_107c644(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ed68: 0x107ed68: lw    v1, 2000(s1)
+// 0x0107f38c: 0x107f38c: lw    v1, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1739,74 +1739,74 @@ L_107ed60:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107ed6c: 0x107ed6c: sll   s2, s2, 2
+// 0x0107f390: 0x107f390: sll   s2, s2, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 10
-// 0x0107ed70: 0x107ed70: addu  s2, s2, s1
+// 0x0107f394: 0x107f394: addu  s2, s2, s1
 	ldloc 10
 	ldloc 8
 	add
 	stloc 10
-// 0x0107ed74: 0x107ed74: sll   v1, v1, 2
+// 0x0107f398: 0x107f398: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107ed78: 0x107ed78: sw    v0, 0(s2)
+// 0x0107f39c: 0x107f39c: sw    v0, 0(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x0107ed7c: 0x107ed7c: addu  v1, v1, s1
+// 0x0107f3a0: 0x107f3a0: addu  v1, v1, s1
 	ldloc 7
 	ldloc 8
 	add
 	stloc 7
-// 0x0107ed80: 0x107ed80: lw    a0, 0(v1)
+// 0x0107f3a4: 0x107f3a4: lw    a0, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107ed84: 0x107ed84: sll   zero, zero, 0
-// 0x0107ed88: 0x107ed88: bne   a0, zero, 0x107edb8 lui   a1, 0x20000
+// 0x0107f3a8: 0x107f3a8: sll   zero, zero, 0
+// 0x0107f3ac: 0x107f3ac: bne   a0, zero, 0x107f3dc lui   a1, 0x20000
 	ldloc.1
 	ldc.i4 131072
 	stloc.2
-	brtrue L_107edb8
+	brtrue L_107f3dc
 // --- basic block ---
-// 0x0107ed90: 0x107ed90: lw    v0, 0(s0)
+// 0x0107f3b4: 0x107f3b4: lw    v0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107ed94: 0x107ed94: lui   a3, 0x20000
+// 0x0107f3b8: 0x107f3b8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107ed98: 0x107ed98: addiu a1, a1, -26712
+// 0x0107f3bc: 0x107f3bc: addiu a1, a1, -26248
 	ldloc.2
-	ldc.i4 -26712
+	ldc.i4 -26248
 	add
 	stloc.2
-// 0x0107ed9c: 0x107ed9c: addiu a3, a3, -24432
+// 0x0107f3c0: 0x107f3c0: addiu a3, a3, -23968
 	ldloc 4
-	ldc.i4 -24432
+	ldc.i4 -23968
 	add
 	stloc 4
-// 0x0107eda0: 0x107eda0: addiu a0, zero, 4
+// 0x0107f3c4: 0x107f3c4: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x0107eda4: 0x107eda4: addiu a2, zero, 645
+// 0x0107f3c8: 0x107f3c8: addiu a2, zero, 645
 	ldc.i4 645
 	stloc.3
-// 0x0107eda8: 0x107eda8: jal   0x100449c sw    v0, 16(sp)
+// 0x0107f3cc: 0x107f3cc: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1825,24 +1825,24 @@ L_107ed60:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107edb0: 0x107edb0: j	 0x107f728 addu  v0, zero, zero
+// 0x0107f3d4: 0x107f3d4: j	 0x107fd4c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_107f728
+	br L_107fd4c
 // --- basic block ---
-L_107edb8:
-// 0x0107edb8: 0x107edb8: jal   0x1078f18 sll   zero, zero, 0
+L_107f3dc:
+// 0x0107f3dc: 0x107f3dc: jal   0x107953c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Alert_Init_1078f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Alert_Init_107953c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107edc0: 0x107edc0: lw    v0, 2000(s1)
+// 0x0107f3e4: 0x107f3e4: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1851,27 +1851,27 @@ L_107edb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107edc4: 0x107edc4: addu  a1, s0, zero
+// 0x0107f3e8: 0x107f3e8: addu  a1, s0, zero
 	ldloc 9
 	stloc.2
-// 0x0107edc8: 0x107edc8: sll   v0, v0, 2
+// 0x0107f3ec: 0x107f3ec: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107edcc: 0x107edcc: addu  v0, v0, s1
+// 0x0107f3f0: 0x107f3f0: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107edd0: 0x107edd0: lw    a0, 0(v0)
+// 0x0107f3f4: 0x107f3f4: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107edd4: 0x107edd4: jal   0x1001800 addiu a2, zero, 1840
+// 0x0107f3f8: 0x107f3f8: jal   0x1001800 addiu a2, zero, 1840
 	ldc.i4 1840
 	stloc.3
 	ldloc.1
@@ -1883,49 +1883,49 @@ L_107edb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107eddc: 0x107eddc: lb    v0, 1432(s0)
+// 0x0107f400: 0x107f400: lb    v0, 1432(s0)
 	ldloc 9
 	ldc.i4 1432
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107ede0: 0x107ede0: sll   zero, zero, 0
-// 0x0107ede4: 0x107ede4: beq   v0, zero, 0x107eea8 lui   s4, 0x20000
+// 0x0107f404: 0x107f404: sll   zero, zero, 0
+// 0x0107f408: 0x107f408: beq   v0, zero, 0x107f4cc lui   s4, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 12
-	brfalse L_107eea8
+	brfalse L_107f4cc
 // --- basic block ---
-// 0x0107edec: 0x107edec: addiu s2, sp, 80
+// 0x0107f410: 0x107f410: addiu s2, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
 	stloc 10
-// 0x0107edf0: 0x107edf0: lui   a3, 0x20000
+// 0x0107f414: 0x107f414: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107edf4: 0x107edf4: addiu a3, a3, -24380
+// 0x0107f418: 0x107f418: addiu a3, a3, -23916
 	ldloc 4
-	ldc.i4 -24380
+	ldc.i4 -23916
 	add
 	stloc 4
-// 0x0107edf8: 0x107edf8: addiu s3, s0, 1432
+// 0x0107f41c: 0x107f41c: addiu s3, s0, 1432
 	ldloc 9
 	ldc.i4 1432
 	add
 	stloc 11
-// 0x0107edfc: 0x107edfc: addiu a1, zero, 128
+// 0x0107f420: 0x107f420: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0107ee00: 0x107ee00: addiu a2, s4, 21592
+// 0x0107f424: 0x107f424: addiu a2, s4, 22052
 	ldloc 12
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x0107ee04: 0x107ee04: addu  a0, s2, zero
+// 0x0107f428: 0x107f428: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0107ee08: 0x107ee08: jal   0x1000f9c sw    s3, 16(sp)
+// 0x0107f42c: 0x107f42c: jal   0x1000f9c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1944,7 +1944,7 @@ L_107edb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ee10: 0x107ee10: lw    v0, 2000(s1)
+// 0x0107f434: 0x107f434: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -1953,27 +1953,27 @@ L_107edb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ee14: 0x107ee14: addu  a0, s2, zero
+// 0x0107f438: 0x107f438: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0107ee18: 0x107ee18: sll   v0, v0, 2
+// 0x0107f43c: 0x107f43c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107ee1c: 0x107ee1c: addu  v0, v0, s1
+// 0x0107f440: 0x107f440: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107ee20: 0x107ee20: lw    s5, 0(v0)
+// 0x0107f444: 0x107f444: lw    s5, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0107ee24: 0x107ee24: jal   0x1001ba8 addiu s2, sp, 208
+// 0x0107f448: 0x107f448: jal   0x1001ba8 addiu s2, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
@@ -1988,10 +1988,10 @@ L_107edb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ee2c: 0x107ee2c: lui   a3, 0x20000
+// 0x0107f450: 0x107f450: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107ee30: 0x107ee30: sw    v0, 1512(s5)
+// 0x0107f454: 0x107f454: sw    v0, 1512(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2000,23 +2000,23 @@ L_107edb8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ee34: 0x107ee34: addiu a3, a3, -24364
+// 0x0107f458: 0x107f458: addiu a3, a3, -23900
 	ldloc 4
-	ldc.i4 -24364
+	ldc.i4 -23900
 	add
 	stloc 4
-// 0x0107ee38: 0x107ee38: addiu a1, zero, 128
+// 0x0107f45c: 0x107f45c: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0107ee3c: 0x107ee3c: addiu a2, s4, 21592
+// 0x0107f460: 0x107f460: addiu a2, s4, 22052
 	ldloc 12
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x0107ee40: 0x107ee40: addu  a0, s2, zero
+// 0x0107f464: 0x107f464: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0107ee44: 0x107ee44: jal   0x1000f9c sw    s3, 16(sp)
+// 0x0107f468: 0x107f468: jal   0x1000f9c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2035,7 +2035,7 @@ L_107edb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ee4c: 0x107ee4c: lw    v0, 2000(s1)
+// 0x0107f470: 0x107f470: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2044,25 +2044,25 @@ L_107edb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ee50: 0x107ee50: sll   zero, zero, 0
-// 0x0107ee54: 0x107ee54: sll   v0, v0, 2
+// 0x0107f474: 0x107f474: sll   zero, zero, 0
+// 0x0107f478: 0x107f478: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107ee58: 0x107ee58: addu  v0, v0, s1
+// 0x0107f47c: 0x107f47c: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107ee5c: 0x107ee5c: lw    s5, 0(v0)
+// 0x0107f480: 0x107f480: lw    s5, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0107ee60: 0x107ee60: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0107f484: 0x107f484: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2075,10 +2075,10 @@ L_107edb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ee68: 0x107ee68: lui   a3, 0x20000
+// 0x0107f48c: 0x107f48c: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107ee6c: 0x107ee6c: sw    v0, 1504(s5)
+// 0x0107f490: 0x107f490: sw    v0, 1504(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2087,23 +2087,23 @@ L_107edb8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ee70: 0x107ee70: addiu a2, s4, 21592
+// 0x0107f494: 0x107f494: addiu a2, s4, 22052
 	ldloc 12
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x0107ee74: 0x107ee74: addiu a3, a3, -24352
+// 0x0107f498: 0x107f498: addiu a3, a3, -23888
 	ldloc 4
-	ldc.i4 -24352
+	ldc.i4 -23888
 	add
 	stloc 4
-// 0x0107ee78: 0x107ee78: addu  a0, s2, zero
+// 0x0107f49c: 0x107f49c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0107ee7c: 0x107ee7c: addiu a1, zero, 128
+// 0x0107f4a0: 0x107f4a0: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0107ee80: 0x107ee80: jal   0x1000f9c sw    s3, 16(sp)
+// 0x0107f4a4: 0x107f4a4: jal   0x1000f9c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2122,7 +2122,7 @@ L_107edb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ee88: 0x107ee88: lw    v0, 2000(s1)
+// 0x0107f4ac: 0x107f4ac: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2131,25 +2131,25 @@ L_107edb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ee8c: 0x107ee8c: sll   zero, zero, 0
-// 0x0107ee90: 0x107ee90: sll   v0, v0, 2
+// 0x0107f4b0: 0x107f4b0: sll   zero, zero, 0
+// 0x0107f4b4: 0x107f4b4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107ee94: 0x107ee94: addu  s1, v0, s1
+// 0x0107f4b8: 0x107f4b8: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0107ee98: 0x107ee98: lw    s1, 0(s1)
+// 0x0107f4bc: 0x107f4bc: lw    s1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107ee9c: 0x107ee9c: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0107f4c0: 0x107f4c0: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2162,7 +2162,7 @@ L_107edb8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107eea4: 0x107eea4: sw    v0, 1508(s1)
+// 0x0107f4c8: 0x107f4c8: sw    v0, 1508(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2171,58 +2171,58 @@ L_107edb8:
 	add
 	ldloc 5
 	stelem.i4
-L_107eea8:
-// 0x0107eea8: 0x107eea8: lb    v0, 1304(s0)
+L_107f4cc:
+// 0x0107f4cc: 0x107f4cc: lb    v0, 1304(s0)
 	ldloc 9
 	ldc.i4 1304
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107eeac: 0x107eeac: sll   zero, zero, 0
-// 0x0107eeb0: 0x107eeb0: beq   v0, zero, 0x107ef44 lui   s1, 0x80000
+// 0x0107f4d0: 0x107f4d0: sll   zero, zero, 0
+// 0x0107f4d4: 0x107f4d4: beq   v0, zero, 0x107f568 lui   s1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brfalse L_107ef44
+	brfalse L_107f568
 // --- basic block ---
-// 0x0107eeb8: 0x107eeb8: addiu s2, sp, 208
+// 0x0107f4dc: 0x107f4dc: addiu s2, sp, 208
 	ldloc.0
 	ldc.i4 208
 	add
 	stloc 10
-// 0x0107eebc: 0x107eebc: lui   s4, 0x20000
+// 0x0107f4e0: 0x107f4e0: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x0107eec0: 0x107eec0: lui   a3, 0x20000
+// 0x0107f4e4: 0x107f4e4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107eec4: 0x107eec4: addiu s1, s1, -16028
+// 0x0107f4e8: 0x107f4e8: addiu s1, s1, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-// 0x0107eec8: 0x107eec8: addiu a3, a3, -24340
+// 0x0107f4ec: 0x107f4ec: addiu a3, a3, -23876
 	ldloc 4
-	ldc.i4 -24340
+	ldc.i4 -23876
 	add
 	stloc 4
-// 0x0107eecc: 0x107eecc: addiu a1, zero, 128
+// 0x0107f4f0: 0x107f4f0: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0107eed0: 0x107eed0: addiu a2, s4, 21592
+// 0x0107f4f4: 0x107f4f4: addiu a2, s4, 22052
 	ldloc 12
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x0107eed4: 0x107eed4: addiu s3, s0, 1304
+// 0x0107f4f8: 0x107f4f8: addiu s3, s0, 1304
 	ldloc 9
 	ldc.i4 1304
 	add
 	stloc 11
-// 0x0107eed8: 0x107eed8: addu  a0, s2, zero
+// 0x0107f4fc: 0x107f4fc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0107eedc: 0x107eedc: jal   0x1000f9c sw    s3, 16(sp)
+// 0x0107f500: 0x107f500: jal   0x1000f9c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2241,7 +2241,7 @@ L_107eea8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107eee4: 0x107eee4: lw    v0, 2000(s1)
+// 0x0107f508: 0x107f508: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2250,25 +2250,25 @@ L_107eea8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107eee8: 0x107eee8: sll   zero, zero, 0
-// 0x0107eeec: 0x107eeec: sll   v0, v0, 2
+// 0x0107f50c: 0x107f50c: sll   zero, zero, 0
+// 0x0107f510: 0x107f510: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107eef0: 0x107eef0: addu  v0, v0, s1
+// 0x0107f514: 0x107f514: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107eef4: 0x107eef4: lw    s5, 0(v0)
+// 0x0107f518: 0x107f518: lw    s5, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x0107eef8: 0x107eef8: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0107f51c: 0x107f51c: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2281,10 +2281,10 @@ L_107eea8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ef00: 0x107ef00: lui   a3, 0x20000
+// 0x0107f524: 0x107f524: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107ef04: 0x107ef04: sw    v0, 1500(s5)
+// 0x0107f528: 0x107f528: sw    v0, 1500(s5)
 	ldloc 6
 	ldloc 13
 	ldc.i4.2
@@ -2293,23 +2293,23 @@ L_107eea8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ef08: 0x107ef08: addiu a2, s4, 21592
+// 0x0107f52c: 0x107f52c: addiu a2, s4, 22052
 	ldloc 12
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x0107ef0c: 0x107ef0c: addiu a3, a3, -24320
+// 0x0107f530: 0x107f530: addiu a3, a3, -23856
 	ldloc 4
-	ldc.i4 -24320
+	ldc.i4 -23856
 	add
 	stloc 4
-// 0x0107ef10: 0x107ef10: addu  a0, s2, zero
+// 0x0107f534: 0x107f534: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x0107ef14: 0x107ef14: addiu a1, zero, 128
+// 0x0107f538: 0x107f538: addiu a1, zero, 128
 	ldc.i4 128
 	stloc.2
-// 0x0107ef18: 0x107ef18: jal   0x1000f9c sw    s3, 16(sp)
+// 0x0107f53c: 0x107f53c: jal   0x1000f9c sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2328,7 +2328,7 @@ L_107eea8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ef20: 0x107ef20: lw    v0, 2000(s1)
+// 0x0107f544: 0x107f544: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2337,25 +2337,25 @@ L_107eea8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ef24: 0x107ef24: sll   zero, zero, 0
-// 0x0107ef28: 0x107ef28: sll   v0, v0, 2
+// 0x0107f548: 0x107f548: sll   zero, zero, 0
+// 0x0107f54c: 0x107f54c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107ef2c: 0x107ef2c: addu  s1, v0, s1
+// 0x0107f550: 0x107f550: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0107ef30: 0x107ef30: lw    s1, 0(s1)
+// 0x0107f554: 0x107f554: lw    s1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107ef34: 0x107ef34: jal   0x1001ba8 addu  a0, s2, zero
+// 0x0107f558: 0x107f558: jal   0x1001ba8 addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -2368,7 +2368,7 @@ L_107eea8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ef3c: 0x107ef3c: sw    v0, 1496(s1)
+// 0x0107f560: 0x107f560: sw    v0, 1496(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2377,16 +2377,16 @@ L_107eea8:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ef40: 0x107ef40: lui   s1, 0x80000
+// 0x0107f564: 0x107f564: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-L_107ef44:
-// 0x0107ef44: 0x107ef44: addiu s1, s1, -16028
+L_107f568:
+// 0x0107f568: 0x107f568: addiu s1, s1, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-// 0x0107ef48: 0x107ef48: lw    v0, 2000(s1)
+// 0x0107f56c: 0x107f56c: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2395,26 +2395,26 @@ L_107ef44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ef4c: 0x107ef4c: sll   zero, zero, 0
-// 0x0107ef50: 0x107ef50: sll   v0, v0, 2
+// 0x0107f570: 0x107f570: sll   zero, zero, 0
+// 0x0107f574: 0x107f574: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107ef54: 0x107ef54: addu  v0, v0, s1
+// 0x0107f578: 0x107f578: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107ef58: 0x107ef58: lw    v0, 0(v0)
+// 0x0107f57c: 0x107f57c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107ef5c: 0x107ef5c: sll   zero, zero, 0
-// 0x0107ef60: 0x107ef60: lw    a2, 1504(v0)
+// 0x0107f580: 0x107f580: sll   zero, zero, 0
+// 0x0107f584: 0x107f584: lw    a2, 1504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2423,14 +2423,14 @@ L_107ef44:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107ef64: 0x107ef64: sll   zero, zero, 0
-// 0x0107ef68: 0x107ef68: beq   a2, zero, 0x107efb8 addu  a0, zero, zero
+// 0x0107f588: 0x107f588: sll   zero, zero, 0
+// 0x0107f58c: 0x107f58c: beq   a2, zero, 0x107f5dc addu  a0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_107efb8
+	brfalse L_107f5dc
 // --- basic block ---
-// 0x0107ef70: 0x107ef70: jal   0x10a1918 addiu a1, zero, 1
+// 0x0107f594: 0x107f594: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2438,18 +2438,18 @@ L_107ef44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107ef78: 0x107ef78: bne   v0, zero, 0x107efb8 lui   a3, 0x10000
+// 0x0107f59c: 0x107f59c: bne   v0, zero, 0x107f5dc lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_107efb8
+	brtrue L_107f5dc
 // --- basic block ---
-// 0x0107ef80: 0x107ef80: lw    v0, 2000(s1)
+// 0x0107f5a4: 0x107f5a4: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2458,30 +2458,30 @@ L_107ef44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ef84: 0x107ef84: sll   zero, zero, 0
-// 0x0107ef88: 0x107ef88: sll   v0, v0, 2
+// 0x0107f5a8: 0x107f5a8: sll   zero, zero, 0
+// 0x0107f5ac: 0x107f5ac: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107ef8c: 0x107ef8c: addu  s1, v0, s1
+// 0x0107f5b0: 0x107f5b0: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0107ef90: 0x107ef90: lw    v0, 0(s1)
+// 0x0107f5b4: 0x107f5b4: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107ef94: 0x107ef94: addiu a3, a3, 18500
+// 0x0107f5b8: 0x107f5b8: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0107ef98: 0x107ef98: lw    a1, 1504(v0)
+// 0x0107f5bc: 0x107f5bc: lw    a1, 1504(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2490,13 +2490,13 @@ L_107ef44:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107ef9c: 0x107ef9c: addu  a0, zero, zero
+// 0x0107f5c0: 0x107f5c0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0107efa0: 0x107efa0: addu  a2, zero, zero
+// 0x0107f5c4: 0x107f5c4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107efa4: 0x107efa4: sw    zero, 16(sp)
+// 0x0107f5c8: 0x107f5c8: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2505,7 +2505,7 @@ L_107ef44:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107efa8: 0x107efa8: sw    zero, 20(sp)
+// 0x0107f5cc: 0x107f5cc: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2514,7 +2514,7 @@ L_107ef44:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107efac: 0x107efac: sw    zero, 24(sp)
+// 0x0107f5d0: 0x107f5d0: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2523,7 +2523,7 @@ L_107ef44:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107efb0: 0x107efb0: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0107f5d4: 0x107f5d4: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2537,21 +2537,21 @@ L_107ef44:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107efb8:
-// 0x0107efb8: 0x107efb8: lui   s1, 0x80000
+L_107f5dc:
+// 0x0107f5dc: 0x107f5dc: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0107efbc: 0x107efbc: addiu s1, s1, -16028
+// 0x0107f5e0: 0x107f5e0: addiu s1, s1, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-// 0x0107efc0: 0x107efc0: lw    v0, 2000(s1)
+// 0x0107f5e4: 0x107f5e4: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2560,26 +2560,26 @@ L_107efb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107efc4: 0x107efc4: sll   zero, zero, 0
-// 0x0107efc8: 0x107efc8: sll   v0, v0, 2
+// 0x0107f5e8: 0x107f5e8: sll   zero, zero, 0
+// 0x0107f5ec: 0x107f5ec: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107efcc: 0x107efcc: addu  v0, v0, s1
+// 0x0107f5f0: 0x107f5f0: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107efd0: 0x107efd0: lw    v0, 0(v0)
+// 0x0107f5f4: 0x107f5f4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107efd4: 0x107efd4: sll   zero, zero, 0
-// 0x0107efd8: 0x107efd8: lw    a2, 1508(v0)
+// 0x0107f5f8: 0x107f5f8: sll   zero, zero, 0
+// 0x0107f5fc: 0x107f5fc: lw    a2, 1508(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2588,14 +2588,14 @@ L_107efb8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107efdc: 0x107efdc: sll   zero, zero, 0
-// 0x0107efe0: 0x107efe0: beq   a2, zero, 0x107f030 addu  a0, zero, zero
+// 0x0107f600: 0x107f600: sll   zero, zero, 0
+// 0x0107f604: 0x107f604: beq   a2, zero, 0x107f654 addu  a0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_107f030
+	brfalse L_107f654
 // --- basic block ---
-// 0x0107efe8: 0x107efe8: jal   0x10a1918 addiu a1, zero, 1
+// 0x0107f60c: 0x107f60c: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2603,18 +2603,18 @@ L_107efb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107eff0: 0x107eff0: bne   v0, zero, 0x107f030 lui   a3, 0x10000
+// 0x0107f614: 0x107f614: bne   v0, zero, 0x107f654 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_107f030
+	brtrue L_107f654
 // --- basic block ---
-// 0x0107eff8: 0x107eff8: lw    v0, 2000(s1)
+// 0x0107f61c: 0x107f61c: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2623,30 +2623,30 @@ L_107efb8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107effc: 0x107effc: sll   zero, zero, 0
-// 0x0107f000: 0x107f000: sll   v0, v0, 2
+// 0x0107f620: 0x107f620: sll   zero, zero, 0
+// 0x0107f624: 0x107f624: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107f004: 0x107f004: addu  s1, v0, s1
+// 0x0107f628: 0x107f628: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0107f008: 0x107f008: lw    v0, 0(s1)
+// 0x0107f62c: 0x107f62c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107f00c: 0x107f00c: addiu a3, a3, 18500
+// 0x0107f630: 0x107f630: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0107f010: 0x107f010: lw    a1, 1508(v0)
+// 0x0107f634: 0x107f634: lw    a1, 1508(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2655,13 +2655,13 @@ L_107efb8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107f014: 0x107f014: addu  a0, zero, zero
+// 0x0107f638: 0x107f638: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0107f018: 0x107f018: addu  a2, zero, zero
+// 0x0107f63c: 0x107f63c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107f01c: 0x107f01c: sw    zero, 16(sp)
+// 0x0107f640: 0x107f640: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2670,7 +2670,7 @@ L_107efb8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f020: 0x107f020: sw    zero, 20(sp)
+// 0x0107f644: 0x107f644: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2679,7 +2679,7 @@ L_107efb8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f024: 0x107f024: sw    zero, 24(sp)
+// 0x0107f648: 0x107f648: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2688,7 +2688,7 @@ L_107efb8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f028: 0x107f028: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0107f64c: 0x107f64c: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2702,21 +2702,21 @@ L_107efb8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107f030:
-// 0x0107f030: 0x107f030: lui   s1, 0x80000
+L_107f654:
+// 0x0107f654: 0x107f654: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0107f034: 0x107f034: addiu s1, s1, -16028
+// 0x0107f658: 0x107f658: addiu s1, s1, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-// 0x0107f038: 0x107f038: lw    v0, 2000(s1)
+// 0x0107f65c: 0x107f65c: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2725,26 +2725,26 @@ L_107f030:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f03c: 0x107f03c: sll   zero, zero, 0
-// 0x0107f040: 0x107f040: sll   v0, v0, 2
+// 0x0107f660: 0x107f660: sll   zero, zero, 0
+// 0x0107f664: 0x107f664: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107f044: 0x107f044: addu  v0, v0, s1
+// 0x0107f668: 0x107f668: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107f048: 0x107f048: lw    v0, 0(v0)
+// 0x0107f66c: 0x107f66c: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107f04c: 0x107f04c: sll   zero, zero, 0
-// 0x0107f050: 0x107f050: lw    a2, 1496(v0)
+// 0x0107f670: 0x107f670: sll   zero, zero, 0
+// 0x0107f674: 0x107f674: lw    a2, 1496(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2753,14 +2753,14 @@ L_107f030:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107f054: 0x107f054: sll   zero, zero, 0
-// 0x0107f058: 0x107f058: beq   a2, zero, 0x107f0a8 addu  a0, zero, zero
+// 0x0107f678: 0x107f678: sll   zero, zero, 0
+// 0x0107f67c: 0x107f67c: beq   a2, zero, 0x107f6cc addu  a0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_107f0a8
+	brfalse L_107f6cc
 // --- basic block ---
-// 0x0107f060: 0x107f060: jal   0x10a1918 addiu a1, zero, 1
+// 0x0107f684: 0x107f684: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2768,18 +2768,18 @@ L_107f030:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f068: 0x107f068: bne   v0, zero, 0x107f0a8 lui   a3, 0x10000
+// 0x0107f68c: 0x107f68c: bne   v0, zero, 0x107f6cc lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_107f0a8
+	brtrue L_107f6cc
 // --- basic block ---
-// 0x0107f070: 0x107f070: lw    v0, 2000(s1)
+// 0x0107f694: 0x107f694: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2788,30 +2788,30 @@ L_107f030:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f074: 0x107f074: sll   zero, zero, 0
-// 0x0107f078: 0x107f078: sll   v0, v0, 2
+// 0x0107f698: 0x107f698: sll   zero, zero, 0
+// 0x0107f69c: 0x107f69c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107f07c: 0x107f07c: addu  s1, v0, s1
+// 0x0107f6a0: 0x107f6a0: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0107f080: 0x107f080: lw    v0, 0(s1)
+// 0x0107f6a4: 0x107f6a4: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107f084: 0x107f084: addiu a3, a3, 18500
+// 0x0107f6a8: 0x107f6a8: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0107f088: 0x107f088: lw    a1, 1496(v0)
+// 0x0107f6ac: 0x107f6ac: lw    a1, 1496(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2820,13 +2820,13 @@ L_107f030:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107f08c: 0x107f08c: addu  a0, zero, zero
+// 0x0107f6b0: 0x107f6b0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0107f090: 0x107f090: addu  a2, zero, zero
+// 0x0107f6b4: 0x107f6b4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107f094: 0x107f094: sw    zero, 16(sp)
+// 0x0107f6b8: 0x107f6b8: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2835,7 +2835,7 @@ L_107f030:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f098: 0x107f098: sw    zero, 20(sp)
+// 0x0107f6bc: 0x107f6bc: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2844,7 +2844,7 @@ L_107f030:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f09c: 0x107f09c: sw    zero, 24(sp)
+// 0x0107f6c0: 0x107f6c0: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2853,7 +2853,7 @@ L_107f030:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f0a0: 0x107f0a0: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0107f6c4: 0x107f6c4: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2867,21 +2867,21 @@ L_107f030:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107f0a8:
-// 0x0107f0a8: 0x107f0a8: lui   s1, 0x80000
+L_107f6cc:
+// 0x0107f6cc: 0x107f6cc: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0107f0ac: 0x107f0ac: addiu s1, s1, -16028
+// 0x0107f6d0: 0x107f6d0: addiu s1, s1, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-// 0x0107f0b0: 0x107f0b0: lw    v0, 2000(s1)
+// 0x0107f6d4: 0x107f6d4: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2890,26 +2890,26 @@ L_107f0a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f0b4: 0x107f0b4: sll   zero, zero, 0
-// 0x0107f0b8: 0x107f0b8: sll   v0, v0, 2
+// 0x0107f6d8: 0x107f6d8: sll   zero, zero, 0
+// 0x0107f6dc: 0x107f6dc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107f0bc: 0x107f0bc: addu  v0, v0, s1
+// 0x0107f6e0: 0x107f6e0: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107f0c0: 0x107f0c0: lw    v0, 0(v0)
+// 0x0107f6e4: 0x107f6e4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107f0c4: 0x107f0c4: sll   zero, zero, 0
-// 0x0107f0c8: 0x107f0c8: lw    a2, 1500(v0)
+// 0x0107f6e8: 0x107f6e8: sll   zero, zero, 0
+// 0x0107f6ec: 0x107f6ec: lw    a2, 1500(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2918,14 +2918,14 @@ L_107f0a8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0107f0cc: 0x107f0cc: sll   zero, zero, 0
-// 0x0107f0d0: 0x107f0d0: beq   a2, zero, 0x107f120 addu  a0, zero, zero
+// 0x0107f6f0: 0x107f6f0: sll   zero, zero, 0
+// 0x0107f6f4: 0x107f6f4: beq   a2, zero, 0x107f744 addu  a0, zero, zero
 	ldloc.3
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_107f120
+	brfalse L_107f744
 // --- basic block ---
-// 0x0107f0d8: 0x107f0d8: jal   0x10a1918 addiu a1, zero, 1
+// 0x0107f6fc: 0x107f6fc: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -2933,18 +2933,18 @@ L_107f0a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f0e0: 0x107f0e0: bne   v0, zero, 0x107f120 lui   a3, 0x10000
+// 0x0107f704: 0x107f704: bne   v0, zero, 0x107f744 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_107f120
+	brtrue L_107f744
 // --- basic block ---
-// 0x0107f0e8: 0x107f0e8: lw    v0, 2000(s1)
+// 0x0107f70c: 0x107f70c: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -2953,30 +2953,30 @@ L_107f0a8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f0ec: 0x107f0ec: sll   zero, zero, 0
-// 0x0107f0f0: 0x107f0f0: sll   v0, v0, 2
+// 0x0107f710: 0x107f710: sll   zero, zero, 0
+// 0x0107f714: 0x107f714: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107f0f4: 0x107f0f4: addu  s1, v0, s1
+// 0x0107f718: 0x107f718: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0107f0f8: 0x107f0f8: lw    v0, 0(s1)
+// 0x0107f71c: 0x107f71c: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x0107f0fc: 0x107f0fc: addiu a3, a3, 18500
+// 0x0107f720: 0x107f720: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0107f100: 0x107f100: lw    a1, 1500(v0)
+// 0x0107f724: 0x107f724: lw    a1, 1500(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2985,13 +2985,13 @@ L_107f0a8:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0107f104: 0x107f104: addu  a0, zero, zero
+// 0x0107f728: 0x107f728: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0107f108: 0x107f108: addu  a2, zero, zero
+// 0x0107f72c: 0x107f72c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107f10c: 0x107f10c: sw    zero, 16(sp)
+// 0x0107f730: 0x107f730: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3000,7 +3000,7 @@ L_107f0a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f110: 0x107f110: sw    zero, 20(sp)
+// 0x0107f734: 0x107f734: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3009,7 +3009,7 @@ L_107f0a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f114: 0x107f114: sw    zero, 24(sp)
+// 0x0107f738: 0x107f738: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3018,7 +3018,7 @@ L_107f0a8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f118: 0x107f118: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0107f73c: 0x107f73c: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3032,21 +3032,21 @@ L_107f0a8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107f120:
-// 0x0107f120: 0x107f120: lui   s1, 0x80000
+L_107f744:
+// 0x0107f744: 0x107f744: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0107f124: 0x107f124: addiu s1, s1, -16028
+// 0x0107f748: 0x107f748: addiu s1, s1, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 8
-// 0x0107f128: 0x107f128: lw    v0, 2000(s1)
+// 0x0107f74c: 0x107f74c: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3055,44 +3055,44 @@ L_107f120:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f12c: 0x107f12c: sll   zero, zero, 0
-// 0x0107f130: 0x107f130: sll   v0, v0, 2
+// 0x0107f750: 0x107f750: sll   zero, zero, 0
+// 0x0107f754: 0x107f754: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107f134: 0x107f134: addu  v0, v0, s1
+// 0x0107f758: 0x107f758: addu  v0, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 5
-// 0x0107f138: 0x107f138: lw    a2, 0(v0)
+// 0x0107f75c: 0x107f75c: lw    a2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x0107f13c: 0x107f13c: sll   zero, zero, 0
-// 0x0107f140: 0x107f140: lb    v0, 1724(a2)
+// 0x0107f760: 0x107f760: sll   zero, zero, 0
+// 0x0107f764: 0x107f764: lb    v0, 1724(a2)
 	ldloc.3
 	ldc.i4 1724
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107f144: 0x107f144: sll   zero, zero, 0
-// 0x0107f148: 0x107f148: beq   v0, zero, 0x107f19c addiu a2, a2, 1724
+// 0x0107f768: 0x107f768: sll   zero, zero, 0
+// 0x0107f76c: 0x107f76c: beq   v0, zero, 0x107f7c0 addiu a2, a2, 1724
 	ldloc 5
 	ldloc.3
 	ldc.i4 1724
 	add
 	stloc.3
-	brfalse L_107f19c
+	brfalse L_107f7c0
 // --- basic block ---
-// 0x0107f150: 0x107f150: addu  a0, zero, zero
+// 0x0107f774: 0x107f774: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0107f154: 0x107f154: jal   0x10a1918 addiu a1, zero, 1
+// 0x0107f778: 0x107f778: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -3100,18 +3100,18 @@ L_107f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f15c: 0x107f15c: bne   v0, zero, 0x107f19c lui   a3, 0x10000
+// 0x0107f780: 0x107f780: bne   v0, zero, 0x107f7c0 lui   a3, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 4
-	brtrue L_107f19c
+	brtrue L_107f7c0
 // --- basic block ---
-// 0x0107f164: 0x107f164: lw    v0, 2000(s1)
+// 0x0107f788: 0x107f788: lw    v0, 2000(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -3120,41 +3120,41 @@ L_107f120:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f168: 0x107f168: sll   zero, zero, 0
-// 0x0107f16c: 0x107f16c: sll   v0, v0, 2
+// 0x0107f78c: 0x107f78c: sll   zero, zero, 0
+// 0x0107f790: 0x107f790: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0107f170: 0x107f170: addu  s1, v0, s1
+// 0x0107f794: 0x107f794: addu  s1, v0, s1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x0107f174: 0x107f174: lw    a1, 0(s1)
+// 0x0107f798: 0x107f798: lw    a1, 0(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0107f178: 0x107f178: addiu a3, a3, 18500
+// 0x0107f79c: 0x107f79c: addiu a3, a3, 18768
 	ldloc 4
-	ldc.i4 18500
+	ldc.i4 18768
 	add
 	stloc 4
-// 0x0107f17c: 0x107f17c: addiu a1, a1, 1724
+// 0x0107f7a0: 0x107f7a0: addiu a1, a1, 1724
 	ldloc.2
 	ldc.i4 1724
 	add
 	stloc.2
-// 0x0107f180: 0x107f180: addu  a0, zero, zero
+// 0x0107f7a4: 0x107f7a4: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x0107f184: 0x107f184: addu  a2, zero, zero
+// 0x0107f7a8: 0x107f7a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107f188: 0x107f188: sw    zero, 16(sp)
+// 0x0107f7ac: 0x107f7ac: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3163,7 +3163,7 @@ L_107f120:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f18c: 0x107f18c: sw    zero, 20(sp)
+// 0x0107f7b0: 0x107f7b0: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3172,7 +3172,7 @@ L_107f120:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f190: 0x107f190: sw    zero, 24(sp)
+// 0x0107f7b4: 0x107f7b4: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3181,7 +3181,7 @@ L_107f120:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f194: 0x107f194: jal   0x10a2c58 sw    zero, 28(sp)
+// 0x0107f7b8: 0x107f7b8: jal   0x10a32a0 sw    zero, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3195,19 +3195,19 @@ L_107f120:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl122::roadmap_res_download_10a2c58(int32,int32,int32,int32,int32)
+	call int32 Cibyl122::roadmap_res_download_10a32a0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107f19c:
-// 0x0107f19c: 0x107f19c: lb    a0, 557(s0)
+L_107f7c0:
+// 0x0107f7c0: 0x107f7c0: lb    a0, 557(s0)
 	ldloc 9
 	ldc.i4 557
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x0107f1a0: 0x107f1a0: lw    v1, 16(s0)
+// 0x0107f7c4: 0x107f7c4: lw    v1, 16(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3216,7 +3216,7 @@ L_107f19c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f1a4: 0x107f1a4: lw    v0, 20(s0)
+// 0x0107f7c8: 0x107f7c8: lw    v0, 20(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3225,15 +3225,15 @@ L_107f19c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f1a8: 0x107f1a8: bne   a0, zero, 0x107f31c addiu t1, sp, 52
+// 0x0107f7cc: 0x107f7cc: bne   a0, zero, 0x107f940 addiu t1, sp, 52
 	ldloc.1
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 14
-	brtrue L_107f31c
+	brtrue L_107f940
 // --- basic block ---
-// 0x0107f1b0: 0x107f1b0: lw    t0, 12(s0)
+// 0x0107f7d4: 0x107f7d4: lw    t0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3242,7 +3242,7 @@ L_107f19c:
 	add
 	ldelem.i4
 	stloc 16
-// 0x0107f1b4: 0x107f1b4: sw    t1, 16(sp)
+// 0x0107f7d8: 0x107f7d8: sw    t1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3251,28 +3251,28 @@ L_107f19c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0107f1b8: 0x107f1b8: addu  a0, v1, zero
+// 0x0107f7dc: 0x107f7dc: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0107f1bc: 0x107f1bc: addiu t1, sp, 40
+// 0x0107f7e0: 0x107f7e0: addiu t1, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 14
-// 0x0107f1c0: 0x107f1c0: addu  a1, v0, zero
+// 0x0107f7e4: 0x107f7e4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0107f1c4: 0x107f1c4: addiu a2, sp, 36
+// 0x0107f7e8: 0x107f7e8: addiu a2, sp, 36
 	ldloc.0
 	ldc.i4.s 36
 	add
 	stloc.3
-// 0x0107f1c8: 0x107f1c8: addiu a3, sp, 32
+// 0x0107f7ec: 0x107f7ec: addiu a3, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc 4
-// 0x0107f1cc: 0x107f1cc: sw    t1, 20(sp)
+// 0x0107f7f0: 0x107f7f0: sw    t1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3281,7 +3281,7 @@ L_107f19c:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0107f1d0: 0x107f1d0: sw    t0, 24(sp)
+// 0x0107f7f4: 0x107f7f4: sw    t0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3290,7 +3290,7 @@ L_107f19c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0107f1d4: 0x107f1d4: sw    v1, 56(sp)
+// 0x0107f7f8: 0x107f7f8: sw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3299,7 +3299,7 @@ L_107f19c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0107f1d8: 0x107f1d8: jal   0x1079ff4 sw    v0, 60(sp)
+// 0x0107f7fc: 0x107f7fc: jal   0x107a618 sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3313,25 +3313,25 @@ L_107f19c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Get_City_Street_1079ff4(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::RTAlerts_Get_City_Street_107a618(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f1e0: 0x107f1e0: bne   v0, zero, 0x107f1f4 addiu v1, s0, 1111
+// 0x0107f804: 0x107f804: bne   v0, zero, 0x107f818 addiu v1, s0, 1111
 	ldloc 5
 	ldloc 9
 	ldc.i4 1111
 	add
 	stloc 7
-	brtrue L_107f1f4
+	brtrue L_107f818
 // --- basic block ---
-// 0x0107f1e8: 0x107f1e8: addiu v0, s0, 960
+// 0x0107f80c: 0x107f80c: addiu v0, s0, 960
 	ldloc 9
 	ldc.i4 960
 	add
 	stloc 5
-// 0x0107f1ec: 0x107f1ec: sw    v1, 36(sp)
+// 0x0107f810: 0x107f810: sw    v1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3340,7 +3340,7 @@ L_107f19c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0107f1f0: 0x107f1f0: sw    v0, 32(sp)
+// 0x0107f814: 0x107f814: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3349,8 +3349,8 @@ L_107f19c:
 	add
 	ldloc 5
 	stelem.i4
-L_107f1f4:
-// 0x0107f1f4: 0x107f1f4: lw    s1, 36(sp)
+L_107f818:
+// 0x0107f818: 0x107f818: lw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3359,12 +3359,12 @@ L_107f1f4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107f1f8: 0x107f1f8: sll   zero, zero, 0
-// 0x0107f1fc: 0x107f1fc: bne   s1, zero, 0x107f21c sll   zero, zero, 0
+// 0x0107f81c: 0x107f81c: sll   zero, zero, 0
+// 0x0107f820: 0x107f820: bne   s1, zero, 0x107f840 sll   zero, zero, 0
 	ldloc 8
-	brtrue L_107f21c
+	brtrue L_107f840
 // --- basic block ---
-// 0x0107f204: 0x107f204: lw    v0, 32(sp)
+// 0x0107f828: 0x107f828: lw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3373,32 +3373,32 @@ L_107f1f4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f208: 0x107f208: sll   zero, zero, 0
-// 0x0107f20c: 0x107f20c: bne   v0, zero, 0x107f26c sll   zero, zero, 0
+// 0x0107f82c: 0x107f82c: sll   zero, zero, 0
+// 0x0107f830: 0x107f830: bne   v0, zero, 0x107f890 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107f26c
+	brtrue L_107f890
 // --- basic block ---
-// 0x0107f214: 0x107f214: j	 0x107f31c sll   zero, zero, 0
-	br L_107f31c
+// 0x0107f838: 0x107f838: j	 0x107f940 sll   zero, zero, 0
+	br L_107f940
 // --- basic block ---
-L_107f21c:
-// 0x0107f21c: 0x107f21c: lb    v0, 0(s1)
+L_107f840:
+// 0x0107f840: 0x107f840: lb    v0, 0(s1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107f220: 0x107f220: sll   zero, zero, 0
-// 0x0107f224: 0x107f224: bne   v0, zero, 0x107f26c lui   v0, 0x80000
+// 0x0107f844: 0x107f844: sll   zero, zero, 0
+// 0x0107f848: 0x107f848: bne   v0, zero, 0x107f890 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_107f26c
+	brtrue L_107f890
 // --- basic block ---
-// 0x0107f22c: 0x107f22c: addiu v0, v0, -16028
+// 0x0107f850: 0x107f850: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f230: 0x107f230: lw    v1, 2000(v0)
+// 0x0107f854: 0x107f854: lw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3407,25 +3407,25 @@ L_107f21c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f234: 0x107f234: sll   zero, zero, 0
-// 0x0107f238: 0x107f238: sll   v1, v1, 2
+// 0x0107f858: 0x107f858: sll   zero, zero, 0
+// 0x0107f85c: 0x107f85c: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107f23c: 0x107f23c: addu  v0, v1, v0
+// 0x0107f860: 0x107f860: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f240: 0x107f240: lw    s1, 0(v0)
+// 0x0107f864: 0x107f864: lw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107f244: 0x107f244: jal   0x1001b48 addiu a0, s1, 557
+// 0x0107f868: 0x107f868: jal   0x1001b48 addiu a0, s1, 557
 	ldloc 8
 	ldc.i4 557
 	add
@@ -3436,18 +3436,18 @@ L_107f21c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f24c: 0x107f24c: addu  a0, s1, v0
+// 0x0107f870: 0x107f870: addu  a0, s1, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x0107f250: 0x107f250: addiu a1, zero, 151
+// 0x0107f874: 0x107f874: addiu a1, zero, 151
 	ldc.i4 151
 	stloc.2
-// 0x0107f254: 0x107f254: lui   a2, 0x10000
+// 0x0107f878: 0x107f878: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0107f258: 0x107f258: lw    a3, 32(sp)
+// 0x0107f87c: 0x107f87c: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3456,25 +3456,25 @@ L_107f21c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0107f25c: 0x107f25c: subu  a1, a1, v0
+// 0x0107f880: 0x107f880: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0107f260: 0x107f260: addiu a0, a0, 557
+// 0x0107f884: 0x107f884: addiu a0, a0, 557
 	ldloc.1
 	ldc.i4 557
 	add
 	stloc.1
-// 0x0107f264: 0x107f264: j	 0x107f2c8 addiu a2, a2, 19912
+// 0x0107f888: 0x107f888: j	 0x107f8ec addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-	br L_107f2c8
+	br L_107f8ec
 // --- basic block ---
-L_107f26c:
-// 0x0107f26c: 0x107f26c: lw    a3, 32(sp)
+L_107f890:
+// 0x0107f890: 0x107f890: lw    a3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3483,30 +3483,30 @@ L_107f26c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0107f270: 0x107f270: sll   zero, zero, 0
-// 0x0107f274: 0x107f274: beq   a3, zero, 0x107f2d8 lui   v0, 0x80000
+// 0x0107f894: 0x107f894: sll   zero, zero, 0
+// 0x0107f898: 0x107f898: beq   a3, zero, 0x107f8fc lui   v0, 0x80000
 	ldloc 4
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107f2d8
+	brfalse L_107f8fc
 // --- basic block ---
-// 0x0107f27c: 0x107f27c: lb    v0, 0(a3)
+// 0x0107f8a0: 0x107f8a0: lb    v0, 0(a3)
 	ldloc 4
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107f280: 0x107f280: sll   zero, zero, 0
-// 0x0107f284: 0x107f284: bne   v0, zero, 0x107f2d8 lui   v0, 0x80000
+// 0x0107f8a4: 0x107f8a4: sll   zero, zero, 0
+// 0x0107f8a8: 0x107f8a8: bne   v0, zero, 0x107f8fc lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_107f2d8
+	brtrue L_107f8fc
 // --- basic block ---
-// 0x0107f28c: 0x107f28c: addiu v0, v0, -16028
+// 0x0107f8b0: 0x107f8b0: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f290: 0x107f290: lw    v1, 2000(v0)
+// 0x0107f8b4: 0x107f8b4: lw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3515,25 +3515,25 @@ L_107f26c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f294: 0x107f294: sll   zero, zero, 0
-// 0x0107f298: 0x107f298: sll   v1, v1, 2
+// 0x0107f8b8: 0x107f8b8: sll   zero, zero, 0
+// 0x0107f8bc: 0x107f8bc: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107f29c: 0x107f29c: addu  v0, v1, v0
+// 0x0107f8c0: 0x107f8c0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f2a0: 0x107f2a0: lw    s2, 0(v0)
+// 0x0107f8c4: 0x107f8c4: lw    s2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0107f2a4: 0x107f2a4: jal   0x1001b48 addiu a0, s2, 557
+// 0x0107f8c8: 0x107f8c8: jal   0x1001b48 addiu a0, s2, 557
 	ldloc 10
 	ldc.i4 557
 	add
@@ -3544,37 +3544,37 @@ L_107f26c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f2ac: 0x107f2ac: addu  a0, s2, v0
+// 0x0107f8d0: 0x107f8d0: addu  a0, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc.1
-// 0x0107f2b0: 0x107f2b0: addiu a1, zero, 151
+// 0x0107f8d4: 0x107f8d4: addiu a1, zero, 151
 	ldc.i4 151
 	stloc.2
-// 0x0107f2b4: 0x107f2b4: lui   a2, 0x10000
+// 0x0107f8d8: 0x107f8d8: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0107f2b8: 0x107f2b8: subu  a1, a1, v0
+// 0x0107f8dc: 0x107f8dc: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0107f2bc: 0x107f2bc: addiu a0, a0, 557
+// 0x0107f8e0: 0x107f8e0: addiu a0, a0, 557
 	ldloc.1
 	ldc.i4 557
 	add
 	stloc.1
-// 0x0107f2c0: 0x107f2c0: addiu a2, a2, 19912
+// 0x0107f8e4: 0x107f8e4: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0107f2c4: 0x107f2c4: addu  a3, s1, zero
+// 0x0107f8e8: 0x107f8e8: addu  a3, s1, zero
 	ldloc 8
 	stloc 4
-L_107f2c8:
-// 0x0107f2c8: 0x107f2c8: jal   0x1000f9c sll   zero, zero, 0
+L_107f8ec:
+// 0x0107f8ec: 0x107f8ec: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -3585,16 +3585,16 @@ L_107f2c8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f2d0: 0x107f2d0: j	 0x107f31c sll   zero, zero, 0
-	br L_107f31c
+// 0x0107f8f4: 0x107f8f4: j	 0x107f940 sll   zero, zero, 0
+	br L_107f940
 // --- basic block ---
-L_107f2d8:
-// 0x0107f2d8: 0x107f2d8: addiu v0, v0, -16028
+L_107f8fc:
+// 0x0107f8fc: 0x107f8fc: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f2dc: 0x107f2dc: lw    v1, 2000(v0)
+// 0x0107f900: 0x107f900: lw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3603,7 +3603,7 @@ L_107f2d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f2e0: 0x107f2e0: sw    a3, 336(sp)
+// 0x0107f904: 0x107f904: sw    a3, 336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3612,24 +3612,24 @@ L_107f2d8:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0107f2e4: 0x107f2e4: sll   v1, v1, 2
+// 0x0107f908: 0x107f908: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107f2e8: 0x107f2e8: addu  v0, v1, v0
+// 0x0107f90c: 0x107f90c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f2ec: 0x107f2ec: lw    s2, 0(v0)
+// 0x0107f910: 0x107f910: lw    s2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x0107f2f0: 0x107f2f0: jal   0x1001b48 addiu a0, s2, 557
+// 0x0107f914: 0x107f914: jal   0x1001b48 addiu a0, s2, 557
 	ldloc 10
 	ldc.i4 557
 	add
@@ -3640,18 +3640,18 @@ L_107f2d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f2f8: 0x107f2f8: addu  a0, s2, v0
+// 0x0107f91c: 0x107f91c: addu  a0, s2, v0
 	ldloc 10
 	ldloc 5
 	add
 	stloc.1
-// 0x0107f2fc: 0x107f2fc: addiu a1, zero, 151
+// 0x0107f920: 0x107f920: addiu a1, zero, 151
 	ldc.i4 151
 	stloc.2
-// 0x0107f300: 0x107f300: lui   a2, 0x10000
+// 0x0107f924: 0x107f924: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0107f304: 0x107f304: lw    a3, 336(sp)
+// 0x0107f928: 0x107f928: lw    a3, 336(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3660,22 +3660,22 @@ L_107f2d8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0107f308: 0x107f308: subu  a1, a1, v0
+// 0x0107f92c: 0x107f92c: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x0107f30c: 0x107f30c: addiu a0, a0, 557
+// 0x0107f930: 0x107f930: addiu a0, a0, 557
 	ldloc.1
 	ldc.i4 557
 	add
 	stloc.1
-// 0x0107f310: 0x107f310: addiu a2, a2, -10228
+// 0x0107f934: 0x107f934: addiu a2, a2, -10232
 	ldloc.3
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.3
-// 0x0107f314: 0x107f314: jal   0x1000f9c sw    s1, 16(sp)
+// 0x0107f938: 0x107f938: jal   0x1000f9c sw    s1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3694,26 +3694,26 @@ L_107f2d8:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107f31c:
-// 0x0107f31c: 0x107f31c: lb    v0, 809(s0)
+L_107f940:
+// 0x0107f940: 0x107f940: lb    v0, 809(s0)
 	ldloc 9
 	ldc.i4 809
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107f320: 0x107f320: sll   zero, zero, 0
-// 0x0107f324: 0x107f324: beq   v0, zero, 0x107f37c lui   v0, 0x80000
+// 0x0107f944: 0x107f944: sll   zero, zero, 0
+// 0x0107f948: 0x107f948: beq   v0, zero, 0x107f9a0 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107f37c
+	brfalse L_107f9a0
 // --- basic block ---
-// 0x0107f32c: 0x107f32c: addiu v0, v0, -16028
+// 0x0107f950: 0x107f950: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f330: 0x107f330: lw    v1, 2000(v0)
+// 0x0107f954: 0x107f954: lw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3722,25 +3722,25 @@ L_107f31c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f334: 0x107f334: sll   zero, zero, 0
-// 0x0107f338: 0x107f338: sll   v1, v1, 2
+// 0x0107f958: 0x107f958: sll   zero, zero, 0
+// 0x0107f95c: 0x107f95c: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107f33c: 0x107f33c: addu  v0, v1, v0
+// 0x0107f960: 0x107f960: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f340: 0x107f340: lw    s1, 0(v0)
+// 0x0107f964: 0x107f964: lw    s1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107f344: 0x107f344: jal   0x1001b48 addiu a0, s1, 557
+// 0x0107f968: 0x107f968: jal   0x1001b48 addiu a0, s1, 557
 	ldloc 8
 	ldc.i4 557
 	add
@@ -3751,15 +3751,15 @@ L_107f31c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f34c: 0x107f34c: lui   a0, 0x10000
+// 0x0107f970: 0x107f970: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107f350: 0x107f350: addu  s2, v0, zero
+// 0x0107f974: 0x107f974: addu  s2, v0, zero
 	ldloc 5
 	stloc 10
-// 0x0107f354: 0x107f354: jal   0x101cd60 addiu a0, a0, -11444
+// 0x0107f978: 0x107f978: jal   0x101cd70 addiu a0, a0, -11448
 	ldloc.1
-	ldc.i4 -11444
+	ldc.i4 -11448
 	add
 	stloc.1
 	ldloc.0
@@ -3767,33 +3767,33 @@ L_107f31c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f35c: 0x107f35c: addu  s1, s1, s2
+// 0x0107f980: 0x107f980: addu  s1, s1, s2
 	ldloc 8
 	ldloc 10
 	add
 	stloc 8
-// 0x0107f360: 0x107f360: lui   a1, 0x10000
+// 0x0107f984: 0x107f984: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107f364: 0x107f364: addiu a0, s1, 557
+// 0x0107f988: 0x107f988: addiu a0, s1, 557
 	ldloc 8
 	ldc.i4 557
 	add
 	stloc.1
-// 0x0107f368: 0x107f368: addiu a1, a1, -11400
+// 0x0107f98c: 0x107f98c: addiu a1, a1, -11404
 	ldloc.2
-	ldc.i4 -11400
+	ldc.i4 -11404
 	add
 	stloc.2
-// 0x0107f36c: 0x107f36c: addu  a2, v0, zero
+// 0x0107f990: 0x107f990: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0107f370: 0x107f370: jal   0x1000f64 addiu a3, s0, 809
+// 0x0107f994: 0x107f994: jal   0x1000f64 addiu a3, s0, 809
 	ldloc 9
 	ldc.i4 809
 	add
@@ -3808,16 +3808,16 @@ L_107f31c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f378: 0x107f378: lui   v0, 0x80000
+// 0x0107f99c: 0x107f99c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107f37c:
-// 0x0107f37c: 0x107f37c: addiu v0, v0, -16028
+L_107f9a0:
+// 0x0107f9a0: 0x107f9a0: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f380: 0x107f380: lw    v1, 2000(v0)
+// 0x0107f9a4: 0x107f9a4: lw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3826,7 +3826,7 @@ L_107f37c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f384: 0x107f384: lw    a0, 12(s0)
+// 0x0107f9a8: 0x107f9a8: lw    a0, 12(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3835,24 +3835,24 @@ L_107f37c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f388: 0x107f388: sll   v1, v1, 2
+// 0x0107f9ac: 0x107f9ac: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107f38c: 0x107f38c: addu  v0, v1, v0
+// 0x0107f9b0: 0x107f9b0: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f390: 0x107f390: lw    v1, 0(v0)
+// 0x0107f9b4: 0x107f9b4: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0107f394: 0x107f394: lw    v0, 52(sp)
+// 0x0107f9b8: 0x107f9b8: lw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3861,8 +3861,8 @@ L_107f37c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f398: 0x107f398: sll   zero, zero, 0
-// 0x0107f39c: 0x107f39c: sw    v0, 1272(v1)
+// 0x0107f9bc: 0x107f9bc: sll   zero, zero, 0
+// 0x0107f9c0: 0x107f9c0: sw    v0, 1272(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3871,7 +3871,7 @@ L_107f37c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107f3a0: 0x107f3a0: lw    v0, 40(sp)
+// 0x0107f9c4: 0x107f9c4: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3880,8 +3880,8 @@ L_107f37c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f3a4: 0x107f3a4: sll   zero, zero, 0
-// 0x0107f3a8: 0x107f3a8: sw    v0, 1268(v1)
+// 0x0107f9c8: 0x107f9c8: sll   zero, zero, 0
+// 0x0107f9cc: 0x107f9cc: sw    v0, 1268(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3890,15 +3890,15 @@ L_107f37c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107f3ac: 0x107f3ac: addiu v0, zero, 2
+// 0x0107f9d0: 0x107f9d0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x0107f3b0: 0x107f3b0: bne   a0, v0, 0x107f3d8 sll   zero, zero, 0
+// 0x0107f9d4: 0x107f9d4: bne   a0, v0, 0x107f9fc sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	bne.un L_107f3d8
+	bne.un L_107f9fc
 // --- basic block ---
-// 0x0107f3b8: 0x107f3b8: lw    v0, 24(s0)
+// 0x0107f9dc: 0x107f9dc: lw    v0, 24(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3907,32 +3907,32 @@ L_107f37c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f3bc: 0x107f3bc: sll   zero, zero, 0
-// 0x0107f3c0: 0x107f3c0: addiu v0, v0, 180
+// 0x0107f9e0: 0x107f9e0: sll   zero, zero, 0
+// 0x0107f9e4: 0x107f9e4: addiu v0, v0, 180
 	ldloc 5
 	ldc.i4 180
 	add
 	stloc 5
-L_107f3c4:
-// 0x0107f3c4: 0x107f3c4: slti  a0, v0, 361
+L_107f9e8:
+// 0x0107f9e8: 0x107f9e8: slti  a0, v0, 361
 	ldloc 5
 	ldc.i4 361
 	clt
 	stloc.1
-// 0x0107f3c8: 0x107f3c8: beq   a0, zero, 0x107f3c4 addiu v0, v0, -360
+// 0x0107f9ec: 0x107f9ec: beq   a0, zero, 0x107f9e8 addiu v0, v0, -360
 	ldloc.1
 	ldloc 5
 	ldc.i4 -360
 	add
 	stloc 5
-	brfalse L_107f3c4
+	brfalse L_107f9e8
 // --- basic block ---
-// 0x0107f3d0: 0x107f3d0: addiu v0, v0, 360
+// 0x0107f9f4: 0x107f9f4: addiu v0, v0, 360
 	ldloc 5
 	ldc.i4 360
 	add
 	stloc 5
-// 0x0107f3d4: 0x107f3d4: sw    v0, 24(v1)
+// 0x0107f9f8: 0x107f9f8: sw    v0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3941,8 +3941,8 @@ L_107f3c4:
 	add
 	ldloc 5
 	stelem.i4
-L_107f3d8:
-// 0x0107f3d8: 0x107f3d8: lw    v1, 40(sp)
+L_107f9fc:
+// 0x0107f9fc: 0x107f9fc: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3951,17 +3951,17 @@ L_107f3d8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f3dc: 0x107f3dc: addiu v0, zero, -1
+// 0x0107fa00: 0x107fa00: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0107f3e0: 0x107f3e0: beq   v1, v0, 0x107f51c lui   v0, 0x0
+// 0x0107fa04: 0x107fa04: beq   v1, v0, 0x107fb40 lui   v0, 0x0
 	ldloc 7
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	beq  L_107f51c
+	beq  L_107fb40
 // --- basic block ---
-// 0x0107f3e8: 0x107f3e8: lw    v0, 576(v0)
+// 0x0107fa0c: 0x107fa0c: lw    v0, 576(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3970,7 +3970,7 @@ L_107f3d8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f3ec: 0x107f3ec: lw    a0, 52(sp)
+// 0x0107fa10: 0x107fa10: lw    a0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3979,30 +3979,30 @@ L_107f3d8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f3f0: 0x107f3f0: sll   zero, zero, 0
-// 0x0107f3f4: 0x107f3f4: beq   a0, v0, 0x107f40c sll   zero, zero, 0
+// 0x0107fa14: 0x107fa14: sll   zero, zero, 0
+// 0x0107fa18: 0x107fa18: beq   a0, v0, 0x107fa30 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_107f40c
+	beq  L_107fa30
 // --- basic block ---
-// 0x0107f3fc: 0x107f3fc: bltz  a0, 0x107f40c sll   zero, zero, 0
+// 0x0107fa20: 0x107fa20: bltz  a0, 0x107fa30 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_107f40c
+	blt L_107fa30
 // --- basic block ---
-// 0x0107f404: 0x107f404: jal   0x100b164 sll   zero, zero, 0
+// 0x0107fa28: 0x107fa28: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107f40c:
-// 0x0107f40c: 0x107f40c: lw    a0, 40(sp)
+L_107fa30:
+// 0x0107fa30: 0x107fa30: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4011,12 +4011,12 @@ L_107f40c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f410: 0x107f410: addiu a1, sp, 44
+// 0x0107fa34: 0x107fa34: addiu a1, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc.2
-// 0x0107f414: 0x107f414: jal   0x1003adc addiu a2, sp, 48
+// 0x0107fa38: 0x107fa38: jal   0x1003adc addiu a2, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -4029,19 +4029,19 @@ L_107f40c:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f41c: 0x107f41c: lui   v0, 0x20000
+// 0x0107fa40: 0x107fa40: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x0107f420: 0x107f420: lw    v1, 31152(v0)
+// 0x0107fa44: 0x107fa44: lw    v1, 31616(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f424: 0x107f424: lw    v0, 40(sp)
+// 0x0107fa48: 0x107fa48: lw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4050,62 +4050,62 @@ L_107f40c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f428: 0x107f428: sll   zero, zero, 0
-// 0x0107f42c: 0x107f42c: sll   v0, v0, 3
+// 0x0107fa4c: 0x107fa4c: sll   zero, zero, 0
+// 0x0107fa50: 0x107fa50: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0107f430: 0x107f430: addu  v0, v1, v0
+// 0x0107fa54: 0x107fa54: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f434: 0x107f434: lhu   a0, 0(v0)
+// 0x0107fa58: 0x107fa58: lhu   a0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x0107f438: 0x107f438: lui   v1, 0x20000
+// 0x0107fa5c: 0x107fa5c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x0107f43c: 0x107f43c: lw    v1, 31228(v1)
+// 0x0107fa60: 0x107fa60: lw    v1, 31692(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f440: 0x107f440: andi  a0, a0, 32767
+// 0x0107fa64: 0x107fa64: andi  a0, a0, 32767
 	ldloc.1
 	ldc.i4 32767
 	and
 	stloc.1
-// 0x0107f444: 0x107f444: sll   a0, a0, 3
+// 0x0107fa68: 0x107fa68: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0107f448: 0x107f448: addu  a0, v1, a0
+// 0x0107fa6c: 0x107fa6c: addu  a0, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc.1
-// 0x0107f44c: 0x107f44c: lw    a1, 0(a0)
+// 0x0107fa70: 0x107fa70: lw    a1, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0107f450: 0x107f450: lhu   v0, 2(v0)
+// 0x0107fa74: 0x107fa74: lhu   v0, 2(v0)
 	ldloc 5
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 5
-// 0x0107f454: 0x107f454: sw    a1, 64(sp)
+// 0x0107fa78: 0x107fa78: sw    a1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4114,7 +4114,7 @@ L_107f40c:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0107f458: 0x107f458: lw    a0, 4(a0)
+// 0x0107fa7c: 0x107fa7c: lw    a0, 4(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
@@ -4123,17 +4123,17 @@ L_107f40c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f45c: 0x107f45c: andi  v0, v0, 32767
+// 0x0107fa80: 0x107fa80: andi  v0, v0, 32767
 	ldloc 5
 	ldc.i4 32767
 	and
 	stloc 5
-// 0x0107f460: 0x107f460: sll   v0, v0, 3
+// 0x0107fa84: 0x107fa84: sll   v0, v0, 3
 	ldloc 5
 	ldc.i4.3
 	shl
 	stloc 5
-// 0x0107f464: 0x107f464: sw    a0, 68(sp)
+// 0x0107fa88: 0x107fa88: sw    a0, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4142,24 +4142,24 @@ L_107f40c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0107f468: 0x107f468: addu  v0, v1, v0
+// 0x0107fa8c: 0x107fa8c: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f46c: 0x107f46c: lw    v1, 0(v0)
+// 0x0107fa90: 0x107fa90: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0107f470: 0x107f470: addiu a0, sp, 64
+// 0x0107fa94: 0x107fa94: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x0107f474: 0x107f474: sw    v1, 72(sp)
+// 0x0107fa98: 0x107fa98: sw    v1, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4168,7 +4168,7 @@ L_107f40c:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0107f478: 0x107f478: lw    v0, 4(v0)
+// 0x0107fa9c: 0x107fa9c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4177,12 +4177,12 @@ L_107f40c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f47c: 0x107f47c: addiu a1, sp, 72
+// 0x0107faa0: 0x107faa0: addiu a1, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
 	stloc.2
-// 0x0107f480: 0x107f480: jal   0x1009824 sw    v0, 76(sp)
+// 0x0107faa4: 0x107faa4: jal   0x1009834 sw    v0, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4196,20 +4196,20 @@ L_107f40c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_azymuth_1009824(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_azymuth_1009834(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f488: 0x107f488: lui   v1, 0x80000
+// 0x0107faac: 0x107faac: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0107f48c: 0x107f48c: addiu v1, v1, -16028
+// 0x0107fab0: 0x107fab0: addiu v1, v1, -15564
 	ldloc 7
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 7
-// 0x0107f490: 0x107f490: lw    a0, 2000(v1)
+// 0x0107fab4: 0x107fab4: lw    a0, 2000(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4218,26 +4218,26 @@ L_107f40c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f494: 0x107f494: sll   zero, zero, 0
-// 0x0107f498: 0x107f498: sll   a0, a0, 2
+// 0x0107fab8: 0x107fab8: sll   zero, zero, 0
+// 0x0107fabc: 0x107fabc: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0107f49c: 0x107f49c: addu  v1, a0, v1
+// 0x0107fac0: 0x107fac0: addu  v1, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc 7
-// 0x0107f4a0: 0x107f4a0: lw    v1, 0(v1)
+// 0x0107fac4: 0x107fac4: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0107f4a4: 0x107f4a4: sll   zero, zero, 0
-// 0x0107f4a8: 0x107f4a8: lw    a0, 24(v1)
+// 0x0107fac8: 0x107fac8: sll   zero, zero, 0
+// 0x0107facc: 0x107facc: lw    a0, 24(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4246,73 +4246,73 @@ L_107f40c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f4ac: 0x107f4ac: sll   zero, zero, 0
-// 0x0107f4b0: 0x107f4b0: subu  a0, a0, v0
+// 0x0107fad0: 0x107fad0: sll   zero, zero, 0
+// 0x0107fad4: 0x107fad4: subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
-L_107f4b4:
-// 0x0107f4b4: 0x107f4b4: slti  v0, a0, 181
+L_107fad8:
+// 0x0107fad8: 0x107fad8: slti  v0, a0, 181
 	ldloc.1
 	ldc.i4 181
 	clt
 	stloc 5
-// 0x0107f4b8: 0x107f4b8: beq   v0, zero, 0x107f4b4 addiu a0, a0, -360
+// 0x0107fadc: 0x107fadc: beq   v0, zero, 0x107fad8 addiu a0, a0, -360
 	ldloc 5
 	ldloc.1
 	ldc.i4 -360
 	add
 	stloc.1
-	brfalse L_107f4b4
+	brfalse L_107fad8
 // --- basic block ---
-// 0x0107f4c0: 0x107f4c0: addiu a0, a0, 360
+// 0x0107fae4: 0x107fae4: addiu a0, a0, 360
 	ldloc.1
 	ldc.i4 360
 	add
 	stloc.1
-// 0x0107f4c4: 0x107f4c4: j	 0x107f4d0 slti  v0, a0, -180
+// 0x0107fae8: 0x107fae8: j	 0x107faf4 slti  v0, a0, -180
 	ldloc.1
 	ldc.i4 -180
 	clt
 	stloc 5
-	br L_107f4d0
+	br L_107faf4
 // --- basic block ---
-L_107f4cc:
-// 0x0107f4cc: 0x107f4cc: slti  v0, a0, -180
+L_107faf0:
+// 0x0107faf0: 0x107faf0: slti  v0, a0, -180
 	ldloc.1
 	ldc.i4 -180
 	clt
 	stloc 5
-L_107f4d0:
-// 0x0107f4d0: 0x107f4d0: bne   v0, zero, 0x107f4cc addiu a0, a0, 360
+L_107faf4:
+// 0x0107faf4: 0x107faf4: bne   v0, zero, 0x107faf0 addiu a0, a0, 360
 	ldloc 5
 	ldloc.1
 	ldc.i4 360
 	add
 	stloc.1
-	brtrue L_107f4cc
+	brtrue L_107faf0
 // --- basic block ---
-// 0x0107f4d8: 0x107f4d8: addiu a0, a0, -360
+// 0x0107fafc: 0x107fafc: addiu a0, a0, -360
 	ldloc.1
 	ldc.i4 -360
 	add
 	stloc.1
-// 0x0107f4dc: 0x107f4dc: addiu a0, a0, 90
+// 0x0107fb00: 0x107fb00: addiu a0, a0, 90
 	ldloc.1
 	ldc.i4.s 90
 	add
 	stloc.1
-// 0x0107f4e0: 0x107f4e0: sltiu a0, a0, 181
+// 0x0107fb04: 0x107fb04: sltiu a0, a0, 181
 	ldloc.1
 	ldc.i4 181
 	clt.un
 	stloc.1
-// 0x0107f4e4: 0x107f4e4: bne   a0, zero, 0x107f504 sll   zero, zero, 0
+// 0x0107fb08: 0x107fb08: bne   a0, zero, 0x107fb28 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_107f504
+	brtrue L_107fb28
 // --- basic block ---
-// 0x0107f4ec: 0x107f4ec: lw    v0, 48(sp)
+// 0x0107fb10: 0x107fb10: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4321,8 +4321,8 @@ L_107f4d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f4f0: 0x107f4f0: sll   zero, zero, 0
-// 0x0107f4f4: 0x107f4f4: sw    v0, 148(v1)
+// 0x0107fb14: 0x107fb14: sll   zero, zero, 0
+// 0x0107fb18: 0x107fb18: sw    v0, 148(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4331,7 +4331,7 @@ L_107f4d0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107f4f8: 0x107f4f8: lw    v0, 44(sp)
+// 0x0107fb1c: 0x107fb1c: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4340,7 +4340,7 @@ L_107f4d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f4fc: 0x107f4fc: j	 0x107f51c sw    v0, 152(v1)
+// 0x0107fb20: 0x107fb20: j	 0x107fb40 sw    v0, 152(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4349,10 +4349,10 @@ L_107f4d0:
 	add
 	ldloc 5
 	stelem.i4
-	br L_107f51c
+	br L_107fb40
 // --- basic block ---
-L_107f504:
-// 0x0107f504: 0x107f504: lw    v0, 44(sp)
+L_107fb28:
+// 0x0107fb28: 0x107fb28: lw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4361,8 +4361,8 @@ L_107f504:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f508: 0x107f508: sll   zero, zero, 0
-// 0x0107f50c: 0x107f50c: sw    v0, 148(v1)
+// 0x0107fb2c: 0x107fb2c: sll   zero, zero, 0
+// 0x0107fb30: 0x107fb30: sw    v0, 148(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4371,7 +4371,7 @@ L_107f504:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107f510: 0x107f510: lw    v0, 48(sp)
+// 0x0107fb34: 0x107fb34: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4380,8 +4380,8 @@ L_107f504:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f514: 0x107f514: sll   zero, zero, 0
-// 0x0107f518: 0x107f518: sw    v0, 152(v1)
+// 0x0107fb38: 0x107fb38: sll   zero, zero, 0
+// 0x0107fb3c: 0x107fb3c: sw    v0, 152(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4390,16 +4390,16 @@ L_107f504:
 	add
 	ldloc 5
 	stelem.i4
-L_107f51c:
-// 0x0107f51c: 0x107f51c: lui   v0, 0x80000
+L_107fb40:
+// 0x0107fb40: 0x107fb40: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107f520: 0x107f520: addiu v0, v0, -16028
+// 0x0107fb44: 0x107fb44: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f524: 0x107f524: lw    v1, 2000(v0)
+// 0x0107fb48: 0x107fb48: lw    v1, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4408,26 +4408,26 @@ L_107f51c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f528: 0x107f528: sll   zero, zero, 0
-// 0x0107f52c: 0x107f52c: sll   v1, v1, 2
+// 0x0107fb4c: 0x107fb4c: sll   zero, zero, 0
+// 0x0107fb50: 0x107fb50: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107f530: 0x107f530: addu  v1, v1, v0
+// 0x0107fb54: 0x107fb54: addu  v1, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 7
-// 0x0107f534: 0x107f534: lw    v1, 0(v1)
+// 0x0107fb58: 0x107fb58: lw    v1, 0(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x0107f538: 0x107f538: sll   zero, zero, 0
-// 0x0107f53c: 0x107f53c: lw    a0, 1824(v1)
+// 0x0107fb5c: 0x107fb5c: sll   zero, zero, 0
+// 0x0107fb60: 0x107fb60: lw    a0, 1824(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4436,12 +4436,12 @@ L_107f51c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f540: 0x107f540: sll   zero, zero, 0
-// 0x0107f544: 0x107f544: beq   a0, zero, 0x107f598 sll   zero, zero, 0
+// 0x0107fb64: 0x107fb64: sll   zero, zero, 0
+// 0x0107fb68: 0x107fb68: beq   a0, zero, 0x107fbbc sll   zero, zero, 0
 	ldloc.1
-	brfalse L_107f598
+	brfalse L_107fbbc
 // --- basic block ---
-// 0x0107f54c: 0x107f54c: lw    a0, 2004(v0)
+// 0x0107fb70: 0x107fb70: lw    a0, 2004(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4450,13 +4450,13 @@ L_107f51c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f550: 0x107f550: sll   zero, zero, 0
-// 0x0107f554: 0x107f554: addiu a0, a0, 1
+// 0x0107fb74: 0x107fb74: sll   zero, zero, 0
+// 0x0107fb78: 0x107fb78: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0107f558: 0x107f558: sw    a0, 2004(v0)
+// 0x0107fb7c: 0x107fb7c: sw    a0, 2004(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4465,7 +4465,7 @@ L_107f51c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0107f55c: 0x107f55c: lw    v0, 1280(v1)
+// 0x0107fb80: 0x107fb80: lw    v0, 1280(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4474,14 +4474,14 @@ L_107f51c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f560: 0x107f560: sll   zero, zero, 0
-// 0x0107f564: 0x107f564: bne   v0, zero, 0x107f588 addu  a0, zero, zero
+// 0x0107fb84: 0x107fb84: sll   zero, zero, 0
+// 0x0107fb88: 0x107fb88: bne   v0, zero, 0x107fbac addu  a0, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brtrue L_107f588
+	brtrue L_107fbac
 // --- basic block ---
-// 0x0107f56c: 0x107f56c: lw    v0, 1836(v1)
+// 0x0107fb90: 0x107fb90: lw    v0, 1836(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4490,17 +4490,17 @@ L_107f51c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f570: 0x107f570: sll   zero, zero, 0
-// 0x0107f574: 0x107f574: bne   v0, zero, 0x107f588 lui   v0, 0x0
+// 0x0107fb94: 0x107fb94: sll   zero, zero, 0
+// 0x0107fb98: 0x107fb98: bne   v0, zero, 0x107fbac lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_107f588
+	brtrue L_107fbac
 // --- basic block ---
-// 0x0107f57c: 0x107f57c: addiu a0, zero, 2
+// 0x0107fba0: 0x107fba0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0107f580: 0x107f580: sw    a0, 15824(v0)
+// 0x0107fba4: 0x107fba4: sw    a0, 15824(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4509,19 +4509,19 @@ L_107f51c:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0107f584: 0x107f584: addu  a0, zero, zero
+// 0x0107fba8: 0x107fba8: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-L_107f588:
-// 0x0107f588: 0x107f588: cibyl_sysc_arg 0x4
+L_107fbac:
+// 0x0107fbac: 0x107fbac: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x0107f58c: 0x107f58c: cibyl_sysc 0x212f
+// 0x0107fbb0: 0x107fbb0: cibyl_sysc 0x212f
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x0107f590: 0x107f590: addu  a0, v0, zero
+// 0x0107fbb4: 0x107fbb4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107f594: 0x107f594: sw    a0, 1832(v1)
+// 0x0107fbb8: 0x107fbb8: sw    a0, 1832(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4530,8 +4530,8 @@ L_107f588:
 	add
 	ldloc.1
 	stelem.i4
-L_107f598:
-// 0x0107f598: 0x107f598: lw    v0, 1836(s0)
+L_107fbbc:
+// 0x0107fbbc: 0x107fbbc: lw    v0, 1836(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4540,22 +4540,22 @@ L_107f598:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f59c: 0x107f59c: sll   zero, zero, 0
-// 0x0107f5a0: 0x107f5a0: beq   v0, zero, 0x107f5c4 lui   v1, 0x80000
+// 0x0107fbc0: 0x107fbc0: sll   zero, zero, 0
+// 0x0107fbc4: 0x107fbc4: beq   v0, zero, 0x107fbe8 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 7
-	brfalse L_107f5c4
+	brfalse L_107fbe8
 // --- basic block ---
-// 0x0107f5a8: 0x107f5a8: lui   v0, 0x80000
+// 0x0107fbcc: 0x107fbcc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107f5ac: 0x107f5ac: addiu v0, v0, -16028
+// 0x0107fbd0: 0x107fbd0: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f5b0: 0x107f5b0: lw    v1, 2008(v0)
+// 0x0107fbd4: 0x107fbd4: lw    v1, 2008(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4564,13 +4564,13 @@ L_107f598:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f5b4: 0x107f5b4: sll   zero, zero, 0
-// 0x0107f5b8: 0x107f5b8: addiu v1, v1, 1
+// 0x0107fbd8: 0x107fbd8: sll   zero, zero, 0
+// 0x0107fbdc: 0x107fbdc: addiu v1, v1, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-// 0x0107f5bc: 0x107f5bc: sw    v1, 2008(v0)
+// 0x0107fbe0: 0x107fbe0: sw    v1, 2008(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4579,16 +4579,16 @@ L_107f598:
 	add
 	ldloc 7
 	stelem.i4
-// 0x0107f5c0: 0x107f5c0: lui   v1, 0x80000
+// 0x0107fbe4: 0x107fbe4: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-L_107f5c4:
-// 0x0107f5c4: 0x107f5c4: addiu v1, v1, -16028
+L_107fbe8:
+// 0x0107fbe8: 0x107fbe8: addiu v1, v1, -15564
 	ldloc 7
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 7
-// 0x0107f5c8: 0x107f5c8: lw    v0, 2000(v1)
+// 0x0107fbec: 0x107fbec: lw    v0, 2000(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4597,23 +4597,23 @@ L_107f5c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f5cc: 0x107f5cc: sll   zero, zero, 0
-// 0x0107f5d0: 0x107f5d0: sll   a0, v0, 2
+// 0x0107fbf0: 0x107fbf0: sll   zero, zero, 0
+// 0x0107fbf4: 0x107fbf4: sll   a0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x0107f5d4: 0x107f5d4: addu  a0, a0, v1
+// 0x0107fbf8: 0x107fbf8: addu  a0, a0, v1
 	ldloc.1
 	ldloc 7
 	add
 	stloc.1
-// 0x0107f5d8: 0x107f5d8: addiu s2, v0, 1
+// 0x0107fbfc: 0x107fbfc: addiu s2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0107f5dc: 0x107f5dc: sw    s2, 2000(v1)
+// 0x0107fc00: 0x107fc00: sw    s2, 2000(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4622,52 +4622,52 @@ L_107f5c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107f5e0: 0x107f5e0: lw    s0, 0(a0)
+// 0x0107fc04: 0x107fc04: lw    s0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x0107f5e4: 0x107f5e4: bne   v0, zero, 0x107f614 lui   s1, 0x80000
+// 0x0107fc08: 0x107fc08: bne   v0, zero, 0x107fc38 lui   s1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brtrue L_107f614
+	brtrue L_107fc38
 // --- basic block ---
-// 0x0107f5ec: 0x107f5ec: lw    v0, -13992(s1)
+// 0x0107fc10: 0x107fc10: lw    v0, -13528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3498
+	ldc.i4 -3382
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f5f0: 0x107f5f0: sll   zero, zero, 0
-// 0x0107f5f4: 0x107f5f4: bne   v0, zero, 0x107f614 lui   a1, 0x1080000
+// 0x0107fc14: 0x107fc14: sll   zero, zero, 0
+// 0x0107fc18: 0x107fc18: bne   v0, zero, 0x107fc38 lui   a1, 0x1080000
 	ldloc 5
 	ldc.i4 17301504
 	stloc.2
-	brtrue L_107f614
+	brtrue L_107fc38
 // --- basic block ---
-// 0x0107f5fc: 0x107f5fc: lui   v0, 0x80000
+// 0x0107fc20: 0x107fc20: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107f600: 0x107f600: addiu a1, a1, -1240
+// 0x0107fc24: 0x107fc24: addiu a1, a1, 332
 	ldloc.2
-	ldc.i4 -1240
+	ldc.i4 332
 	add
 	stloc.2
-// 0x0107f604: 0x107f604: addiu a0, zero, 1000
+// 0x0107fc28: 0x107fc28: addiu a0, zero, 1000
 	ldc.i4 1000
 	stloc.1
-// 0x0107f608: 0x107f608: jal   0x104fe98 sw    zero, -14012(v0)
+// 0x0107fc2c: 0x107fc2c: jal   0x104fea8 sw    zero, -13548(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4676,22 +4676,22 @@ L_107f5c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f610: 0x107f610: sw    s2, -13992(s1)
+// 0x0107fc34: 0x107fc34: sw    s2, -13528(s1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3498
+	ldc.i4 -3382
 	add
 	ldloc 10
 	stelem.i4
-L_107f614:
-// 0x0107f614: 0x107f614: lw    v0, 1284(s0)
+L_107fc38:
+// 0x0107fc38: 0x107fc38: lw    v0, 1284(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4700,27 +4700,27 @@ L_107f614:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f618: 0x107f618: sll   zero, zero, 0
-// 0x0107f61c: 0x107f61c: beq   v0, zero, 0x107f644 sll   zero, zero, 0
+// 0x0107fc3c: 0x107fc3c: sll   zero, zero, 0
+// 0x0107fc40: 0x107fc40: beq   v0, zero, 0x107fc68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107f644
+	brfalse L_107fc68
 // --- basic block ---
-// 0x0107f624: 0x107f624: jal   0x106ac4c sll   zero, zero, 0
+// 0x0107fc48: 0x107fc48: jal   0x106b270 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_AllowPing_106ac4c(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::Realtime_AllowPing_106b270(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f62c: 0x107f62c: beq   v0, zero, 0x107f644 sll   zero, zero, 0
+// 0x0107fc50: 0x107fc50: beq   v0, zero, 0x107fc68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107f644
+	brfalse L_107fc68
 // --- basic block ---
-// 0x0107f634: 0x107f634: jal   0x107c7c4 addu  a0, s0, zero
+// 0x0107fc58: 0x107fc58: jal   0x107cde8 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4728,16 +4728,16 @@ L_107f614:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl93::RTAlerts_popup_PingWazer_107c7c4(int32,int32,int32,int32,int32)
+	call int32 Cibyl94::RTAlerts_popup_PingWazer_107cde8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f63c: 0x107f63c: j	 0x107f6d0 sll   zero, zero, 0
-	br L_107f6d0
+// 0x0107fc60: 0x107fc60: j	 0x107fcf4 sll   zero, zero, 0
+	br L_107fcf4
 // --- basic block ---
-L_107f644:
-// 0x0107f644: 0x107f644: lw    v0, 1280(s0)
+L_107fc68:
+// 0x0107fc68: 0x107fc68: lw    v0, 1280(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4746,12 +4746,12 @@ L_107f644:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f648: 0x107f648: sll   zero, zero, 0
-// 0x0107f64c: 0x107f64c: bne   v0, zero, 0x107f6d0 sll   zero, zero, 0
+// 0x0107fc6c: 0x107fc6c: sll   zero, zero, 0
+// 0x0107fc70: 0x107fc70: bne   v0, zero, 0x107fcf4 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107f6d0
+	brtrue L_107fcf4
 // --- basic block ---
-// 0x0107f654: 0x107f654: lw    v0, 1828(s0)
+// 0x0107fc78: 0x107fc78: lw    v0, 1828(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4760,43 +4760,43 @@ L_107f644:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f658: 0x107f658: sll   zero, zero, 0
-// 0x0107f65c: 0x107f65c: slti  v0, v0, 120
+// 0x0107fc7c: 0x107fc7c: sll   zero, zero, 0
+// 0x0107fc80: 0x107fc80: slti  v0, v0, 120
 	ldloc 5
 	ldc.i4.s 120
 	clt
 	stloc 5
-// 0x0107f660: 0x107f660: beq   v0, zero, 0x107f6d0 sll   zero, zero, 0
+// 0x0107fc84: 0x107fc84: beq   v0, zero, 0x107fcf4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107f6d0
+	brfalse L_107fcf4
 // --- basic block ---
-// 0x0107f668: 0x107f668: lb    v0, 1624(s0)
+// 0x0107fc8c: 0x107fc8c: lb    v0, 1624(s0)
 	ldloc 9
 	ldc.i4 1624
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x0107f66c: 0x107f66c: sll   zero, zero, 0
-// 0x0107f670: 0x107f670: beq   v0, zero, 0x107f6d0 sll   zero, zero, 0
+// 0x0107fc90: 0x107fc90: sll   zero, zero, 0
+// 0x0107fc94: 0x107fc94: beq   v0, zero, 0x107fcf4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107f6d0
+	brfalse L_107fcf4
 // --- basic block ---
-// 0x0107f678: 0x107f678: jal   0x1054434 sll   zero, zero, 0
+// 0x0107fc9c: 0x107fc9c: jal   0x1054444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_popup_config_1054434(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_popup_config_1054444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f680: 0x107f680: beq   v0, zero, 0x107f6d0 sll   zero, zero, 0
+// 0x0107fca4: 0x107fca4: beq   v0, zero, 0x107fcf4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107f6d0
+	brfalse L_107fcf4
 // --- basic block ---
-// 0x0107f688: 0x107f688: lw    v0, 1824(s0)
+// 0x0107fcac: 0x107fcac: lw    v0, 1824(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4805,42 +4805,42 @@ L_107f644:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f68c: 0x107f68c: sll   zero, zero, 0
-// 0x0107f690: 0x107f690: beq   v0, zero, 0x107f6d0 sll   zero, zero, 0
+// 0x0107fcb0: 0x107fcb0: sll   zero, zero, 0
+// 0x0107fcb4: 0x107fcb4: beq   v0, zero, 0x107fcf4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107f6d0
+	brfalse L_107fcf4
 // --- basic block ---
-// 0x0107f698: 0x107f698: jal   0x1054434 sll   zero, zero, 0
+// 0x0107fcbc: 0x107fcbc: jal   0x1054444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_popup_config_1054434(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_popup_config_1054444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f6a0: 0x107f6a0: addiu v1, zero, 1
+// 0x0107fcc4: 0x107fcc4: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 7
-// 0x0107f6a4: 0x107f6a4: beq   v0, v1, 0x107f6c4 sll   zero, zero, 0
+// 0x0107fcc8: 0x107fcc8: beq   v0, v1, 0x107fce8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	beq  L_107f6c4
+	beq  L_107fce8
 // --- basic block ---
-// 0x0107f6ac: 0x107f6ac: jal   0x1054434 sll   zero, zero, 0
+// 0x0107fcd0: 0x107fcd0: jal   0x1054444 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_get_popup_config_1054434(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_get_popup_config_1054444(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f6b4: 0x107f6b4: lw    v1, 1824(s0)
+// 0x0107fcd8: 0x107fcd8: lw    v1, 1824(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4849,21 +4849,21 @@ L_107f644:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f6b8: 0x107f6b8: sll   zero, zero, 0
-// 0x0107f6bc: 0x107f6bc: bne   v0, v1, 0x107f6d0 sll   zero, zero, 0
+// 0x0107fcdc: 0x107fcdc: sll   zero, zero, 0
+// 0x0107fce0: 0x107fce0: bne   v0, v1, 0x107fcf4 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_107f6d0
+	bne.un L_107fcf4
 // --- basic block ---
-L_107f6c4:
-// 0x0107f6c4: 0x107f6c4: lw    a0, 0(s0)
+L_107fce8:
+// 0x0107fce8: 0x107fce8: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107f6c8: 0x107f6c8: jal   0x107eb70 addiu a1, zero, 1
+// 0x0107fcec: 0x107fcec: jal   0x107f194 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -4871,13 +4871,13 @@ L_107f6c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_By_Id_107eb70(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_By_Id_107f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107f6d0:
-// 0x0107f6d0: 0x107f6d0: lw    a0, 4(s0)
+L_107fcf4:
+// 0x0107fcf4: 0x107fcf4: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4886,24 +4886,24 @@ L_107f6d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f6d4: 0x107f6d4: jal   0x10a6d54 sll   zero, zero, 0
+// 0x0107fcf8: 0x107fcf8: jal   0x10a739c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f6dc: 0x107f6dc: beq   v0, zero, 0x107f700 lui   v1, 0x80000
+// 0x0107fd00: 0x107fd00: beq   v0, zero, 0x107fd24 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 7
-	brfalse L_107f700
+	brfalse L_107fd24
 // --- basic block ---
-// 0x0107f6e4: 0x107f6e4: lw    v0, 1836(s0)
+// 0x0107fd08: 0x107fd08: lw    v0, 1836(s0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4912,12 +4912,12 @@ L_107f6d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f6e8: 0x107f6e8: sll   zero, zero, 0
-// 0x0107f6ec: 0x107f6ec: bne   v0, zero, 0x107f700 sll   zero, zero, 0
+// 0x0107fd0c: 0x107fd0c: sll   zero, zero, 0
+// 0x0107fd10: 0x107fd10: bne   v0, zero, 0x107fd24 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107f700
+	brtrue L_107fd24
 // --- basic block ---
-// 0x0107f6f4: 0x107f6f4: jal   0x107ab74 addu  a0, s0, zero
+// 0x0107fd18: 0x107fd18: jal   0x107b198 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -4925,48 +4925,48 @@ L_107f6d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::CreateAlertObject_107ab74(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::CreateAlertObject_107b198(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f6fc: 0x107f6fc: lui   v1, 0x80000
+// 0x0107fd20: 0x107fd20: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-L_107f700:
-// 0x0107f700: 0x107f700: lw    a0, -16092(v1)
+L_107fd24:
+// 0x0107fd24: 0x107fd24: lw    a0, -15628(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4023
+	ldc.i4 -3907
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f704: 0x107f704: sll   zero, zero, 0
-// 0x0107f708: 0x107f708: bne   a0, zero, 0x107f728 addiu v0, zero, 1
+// 0x0107fd28: 0x107fd28: sll   zero, zero, 0
+// 0x0107fd2c: 0x107fd2c: bne   a0, zero, 0x107fd4c addiu v0, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc 5
-	brtrue L_107f728
+	brtrue L_107fd4c
 // --- basic block ---
-// 0x0107f710: 0x107f710: lui   a1, 0x1080000
+// 0x0107fd34: 0x107fd34: lui   a1, 0x1080000
 	ldc.i4 17301504
 	stloc.2
-// 0x0107f714: 0x107f714: addiu a1, a1, -26580
+// 0x0107fd38: 0x107fd38: addiu a1, a1, -25008
 	ldloc.2
-	ldc.i4 -26580
+	ldc.i4 -25008
 	add
 	stloc.2
-// 0x0107f718: 0x107f718: addiu a0, zero, 2000
+// 0x0107fd3c: 0x107fd3c: addiu a0, zero, 2000
 	ldc.i4 2000
 	stloc.1
-// 0x0107f71c: 0x107f71c: jal   0x104fe98 sw    v0, -16092(v1)
+// 0x0107fd40: 0x107fd40: jal   0x104fea8 sw    v0, -15628(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4023
+	ldc.i4 -3907
 	add
 	ldloc 5
 	stelem.i4
@@ -4975,17 +4975,17 @@ L_107f700:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f724: 0x107f724: addiu v0, zero, 1
+// 0x0107fd48: 0x107fd48: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_107f728:
-// 0x0107f728: 0x107f728: lw    ra, 372(sp)
-// 0x0107f72c: 0x107f72c: lw    s5, 368(sp)
+L_107fd4c:
+// 0x0107fd4c: 0x107fd4c: lw    ra, 372(sp)
+// 0x0107fd50: 0x107fd50: lw    s5, 368(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4994,7 +4994,7 @@ L_107f728:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0107f730: 0x107f730: lw    s4, 364(sp)
+// 0x0107fd54: 0x107fd54: lw    s4, 364(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5003,7 +5003,7 @@ L_107f728:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0107f734: 0x107f734: lw    s3, 360(sp)
+// 0x0107fd58: 0x107fd58: lw    s3, 360(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5012,7 +5012,7 @@ L_107f728:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0107f738: 0x107f738: lw    s2, 356(sp)
+// 0x0107fd5c: 0x107fd5c: lw    s2, 356(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5021,7 +5021,7 @@ L_107f728:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107f73c: 0x107f73c: lw    s1, 352(sp)
+// 0x0107fd60: 0x107fd60: lw    s1, 352(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5030,7 +5030,7 @@ L_107f728:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107f740: 0x107f740: lw    s0, 348(sp)
+// 0x0107fd64: 0x107fd64: lw    s0, 348(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5039,7 +5039,7 @@ L_107f728:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107f744: 0x107f744: jr    ra addiu sp, sp, 376
+// 0x0107fd68: 0x107fd68: jr    ra addiu sp, sp, 376
 	ldloc.0
 	ldc.i4 376
 	add
@@ -5051,7 +5051,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Popup_107f7f4(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Popup_107fe18(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -5101,25 +5101,25 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107f7f4: 0x107f7f4: lui   v0, 0x80000
+// 0x0107fe18: 0x107fe18: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107f7f8: 0x107f7f8: lw    v0, -13988(v0)
+// 0x0107fe1c: 0x107fe1c: lw    v0, -13524(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3497
+	ldc.i4 -3381
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f7fc: 0x107f7fc: addiu sp, sp, -48
+// 0x0107fe20: 0x107fe20: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x0107f800: 0x107f800: sw    ra, 44(sp)
-// 0x0107f804: 0x107f804: sw    s3, 40(sp)
+// 0x0107fe24: 0x107fe24: sw    ra, 44(sp)
+// 0x0107fe28: 0x107fe28: sw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5128,7 +5128,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0107f808: 0x107f808: sw    s2, 36(sp)
+// 0x0107fe2c: 0x107fe2c: sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5137,7 +5137,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107f80c: 0x107f80c: sw    s1, 32(sp)
+// 0x0107fe30: 0x107fe30: sw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5146,7 +5146,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107f810: 0x107f810: beq   v0, zero, 0x107fa28 sw    s0, 28(sp)
+// 0x0107fe34: 0x107fe34: beq   v0, zero, 0x108004c sw    s0, 28(sp)
 	ldloc 5
 	ldloc 6
 	ldloc.0
@@ -5156,33 +5156,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	brfalse L_107fa28
+	brfalse L_108004c
 // --- basic block ---
-// 0x0107f818: 0x107f818: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x0107fe3c: 0x107fe3c: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107f820: 0x107f820: beq   v0, zero, 0x107f848 lui   v1, 0x80000
+// 0x0107fe44: 0x107fe44: beq   v0, zero, 0x107fe6c lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 7
-	brfalse L_107f848
+	brfalse L_107fe6c
 // --- basic block ---
-// 0x0107f828: 0x107f828: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x0107fe4c: 0x107fe4c: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f830: 0x107f830: lui   a1, 0x20000
+// 0x0107fe54: 0x107fe54: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107f834: 0x107f834: addu  a0, v0, zero
+// 0x0107fe58: 0x107fe58: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107f838: 0x107f838: jal   0x1001b14 addiu a1, a1, -26748
+// 0x0107fe5c: 0x107fe5c: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -5190,112 +5190,112 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107f840: 0x107f840: bne   v0, zero, 0x107fa28 lui   v1, 0x80000
+// 0x0107fe64: 0x107fe64: bne   v0, zero, 0x108004c lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 7
-	brtrue L_107fa28
+	brtrue L_108004c
 // --- basic block ---
-L_107f848:
-// 0x0107f848: 0x107f848: lui   v0, 0x80000
+L_107fe6c:
+// 0x0107fe6c: 0x107fe6c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107f84c: 0x107f84c: lw    v0, -14028(v0)
+// 0x0107fe70: 0x107fe70: lw    v0, -13564(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3507
+	ldc.i4 -3391
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f850: 0x107f850: lw    a0, -14016(v1)
+// 0x0107fe74: 0x107fe74: lw    a0, -13552(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f854: 0x107f854: sll   zero, zero, 0
-// 0x0107f858: 0x107f858: slt   a0, a0, v0
+// 0x0107fe78: 0x107fe78: sll   zero, zero, 0
+// 0x0107fe7c: 0x107fe7c: slt   a0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc.1
-// 0x0107f85c: 0x107f85c: bne   a0, zero, 0x107f86c lui   s1, 0x80000
+// 0x0107fe80: 0x107fe80: bne   a0, zero, 0x107fe90 lui   s1, 0x80000
 	ldloc.1
 	ldc.i4 524288
 	stloc 9
-	brtrue L_107f86c
+	brtrue L_107fe90
 // --- basic block ---
-// 0x0107f864: 0x107f864: addiu a0, zero, -1
+// 0x0107fe88: 0x107fe88: addiu a0, zero, -1
 	ldc.i4.m1
 	stloc.1
-// 0x0107f868: 0x107f868: sw    a0, -14016(v1)
+// 0x0107fe8c: 0x107fe8c: sw    a0, -13552(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldloc.1
 	stelem.i4
-L_107f86c:
-// 0x0107f86c: 0x107f86c: lw    a0, -14016(s1)
+L_107fe90:
+// 0x0107fe90: 0x107fe90: lw    a0, -13552(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f870: 0x107f870: lui   v1, 0x80000
+// 0x0107fe94: 0x107fe94: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x0107f874: 0x107f874: addiu a0, a0, 1
+// 0x0107fe98: 0x107fe98: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x0107f878: 0x107f878: sll   a1, a0, 2
+// 0x0107fe9c: 0x107fe9c: sll   a1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x0107f87c: 0x107f87c: addiu v1, v1, -16028
+// 0x0107fea0: 0x107fea0: addiu v1, v1, -15564
 	ldloc 7
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 7
-// 0x0107f880: 0x107f880: addu  a1, a1, v1
+// 0x0107fea4: 0x107fea4: addu  a1, a1, v1
 	ldloc.2
 	ldloc 7
 	add
 	stloc.2
-// 0x0107f884: 0x107f884: lw    s0, 0(a1)
+// 0x0107fea8: 0x107fea8: lw    s0, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107f888: 0x107f888: sll   zero, zero, 0
-// 0x0107f88c: 0x107f88c: beq   s0, zero, 0x107fa28 sw    a0, -14016(s1)
+// 0x0107feac: 0x107feac: sll   zero, zero, 0
+// 0x0107feb0: 0x107feb0: beq   s0, zero, 0x108004c sw    a0, -13552(s1)
 	ldloc 8
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldloc.1
 	stelem.i4
-	brfalse L_107fa28
+	brfalse L_108004c
 // --- basic block ---
-// 0x0107f894: 0x107f894: lw    a0, 1836(s0)
+// 0x0107feb8: 0x107feb8: lw    a0, 1836(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5304,12 +5304,12 @@ L_107f86c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f898: 0x107f898: sll   zero, zero, 0
-// 0x0107f89c: 0x107f89c: beq   a0, zero, 0x107f8bc sll   zero, zero, 0
+// 0x0107febc: 0x107febc: sll   zero, zero, 0
+// 0x0107fec0: 0x107fec0: beq   a0, zero, 0x107fee0 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_107f8bc
+	brfalse L_107fee0
 // --- basic block ---
-// 0x0107f8a4: 0x107f8a4: lw    v1, 2008(v1)
+// 0x0107fec8: 0x107fec8: lw    v1, 2008(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5318,17 +5318,17 @@ L_107f86c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f8a8: 0x107f8a8: sll   zero, zero, 0
-// 0x0107f8ac: 0x107f8ac: bne   v0, v1, 0x107f994 sll   zero, zero, 0
+// 0x0107fecc: 0x107fecc: sll   zero, zero, 0
+// 0x0107fed0: 0x107fed0: bne   v0, v1, 0x107ffb8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_107f994
+	bne.un L_107ffb8
 // --- basic block ---
-// 0x0107f8b4: 0x107f8b4: j	 0x107fa28 sll   zero, zero, 0
-	br L_107fa28
+// 0x0107fed8: 0x107fed8: j	 0x108004c sll   zero, zero, 0
+	br L_108004c
 // --- basic block ---
-L_107f8bc:
-// 0x0107f8bc: 0x107f8bc: lw    a0, 4(s0)
+L_107fee0:
+// 0x0107fee0: 0x107fee0: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5337,22 +5337,22 @@ L_107f8bc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f8c0: 0x107f8c0: jal   0x10a6d54 sll   zero, zero, 0
+// 0x0107fee4: 0x107fee4: jal   0x10a739c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f8c8: 0x107f8c8: beq   v0, zero, 0x107f994 sll   zero, zero, 0
+// 0x0107feec: 0x107feec: beq   v0, zero, 0x107ffb8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107f994
+	brfalse L_107ffb8
 // --- basic block ---
-// 0x0107f8d0: 0x107f8d0: lw    v0, 1264(s0)
+// 0x0107fef4: 0x107fef4: lw    v0, 1264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5361,13 +5361,13 @@ L_107f8bc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f8d4: 0x107f8d4: sll   zero, zero, 0
-// 0x0107f8d8: 0x107f8d8: bgtz  v0, 0x107f8ec sll   zero, zero, 0
+// 0x0107fef8: 0x107fef8: sll   zero, zero, 0
+// 0x0107fefc: 0x107fefc: bgtz  v0, 0x107ff10 sll   zero, zero, 0
 	ldloc 5
 	ldc.i4.s 0
-	bgt L_107f8ec
+	bgt L_107ff10
 // --- basic block ---
-// 0x0107f8e0: 0x107f8e0: jal   0x10788cc addu  a0, zero, zero
+// 0x0107ff04: 0x107ff04: jal   0x1078ef0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5375,25 +5375,25 @@ L_107f8bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f8e8: 0x107f8e8: sw    zero, -14016(s1)
+// 0x0107ff0c: 0x107ff0c: sw    zero, -13552(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107f8ec:
-// 0x0107f8ec: 0x107f8ec: lui   a0, 0x0
+L_107ff10:
+// 0x0107ff10: 0x107ff10: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0107f8f0: 0x107f8f0: lw    s1, 1264(s0)
+// 0x0107ff14: 0x107ff14: lw    s1, 1264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5402,7 +5402,7 @@ L_107f8ec:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107f8f4: 0x107f8f4: jal   0x100e788 addiu a0, a0, 15948
+// 0x0107ff18: 0x107ff18: jal   0x100e798 addiu a0, a0, 15948
 	ldloc.1
 	ldc.i4 15948
 	add
@@ -5412,23 +5412,23 @@ L_107f8ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f8fc: 0x107f8fc: slt   v0, v0, s1
+// 0x0107ff20: 0x107ff20: slt   v0, v0, s1
 	ldloc 5
 	ldloc 9
 	clt
 	stloc 5
-// 0x0107f900: 0x107f900: beq   v0, zero, 0x107f91c lui   v0, 0x0
+// 0x0107ff24: 0x107ff24: beq   v0, zero, 0x107ff40 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_107f91c
+	brfalse L_107ff40
 // --- basic block ---
-// 0x0107f908: 0x107f908: lw    v0, 15828(v0)
+// 0x0107ff2c: 0x107ff2c: lw    v0, 15828(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5437,45 +5437,45 @@ L_107f8ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f90c: 0x107f90c: sll   zero, zero, 0
-// 0x0107f910: 0x107f910: bne   v0, zero, 0x107f91c lui   v0, 0x80000
+// 0x0107ff30: 0x107ff30: sll   zero, zero, 0
+// 0x0107ff34: 0x107ff34: bne   v0, zero, 0x107ff40 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_107f91c
+	brtrue L_107ff40
 // --- basic block ---
-// 0x0107f918: 0x107f918: sw    zero, -14016(v0)
+// 0x0107ff3c: 0x107ff3c: sw    zero, -13552(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107f91c:
-// 0x0107f91c: 0x107f91c: jal   0x10a48d0 sll   zero, zero, 0
+L_107ff40:
+// 0x0107ff40: 0x107ff40: jal   0x10a4f18 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_general_settings_events_radius_10a48d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_general_settings_events_radius_10a4f18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f924: 0x107f924: addiu v1, zero, -1
+// 0x0107ff48: 0x107ff48: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x0107f928: 0x107f928: beq   v0, v1, 0x107f95c lui   v0, 0x80000
+// 0x0107ff4c: 0x107ff4c: beq   v0, v1, 0x107ff80 lui   v0, 0x80000
 	ldloc 5
 	ldloc 7
 	ldc.i4 524288
 	stloc 5
-	beq  L_107f95c
+	beq  L_107ff80
 // --- basic block ---
-// 0x0107f930: 0x107f930: lw    s0, 1264(s0)
+// 0x0107ff54: 0x107ff54: lw    s0, 1264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5484,92 +5484,92 @@ L_107f91c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107f934: 0x107f934: jal   0x10a48d0 sll   zero, zero, 0
+// 0x0107ff58: 0x107ff58: jal   0x10a4f18 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl123::roadmap_general_settings_events_radius_10a48d0(int32,int32,int32,int32,int32)
+	call int32 Cibyl123::roadmap_general_settings_events_radius_10a4f18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f93c: 0x107f93c: addiu v1, zero, 1000
+// 0x0107ff60: 0x107ff60: addiu v1, zero, 1000
 	ldc.i4 1000
 	stloc 7
-// 0x0107f940: 0x107f940: mult  v0, v1
+// 0x0107ff64: 0x107ff64: mult  v0, v1
 	ldloc 5
 	ldloc 7
 	mul
 	stloc 13
-// 0x0107f944: 0x107f944: mflo  lo
+// 0x0107ff68: 0x107ff68: mflo  lo
 	ldloc 13
 	stloc 7
-// 0x0107f948: 0x107f948: slt   s0, v1, s0
+// 0x0107ff6c: 0x107ff6c: slt   s0, v1, s0
 	ldloc 7
 	ldloc 8
 	clt
 	stloc 8
-// 0x0107f94c: 0x107f94c: beq   s0, zero, 0x107f95c lui   v0, 0x80000
+// 0x0107ff70: 0x107ff70: beq   s0, zero, 0x107ff80 lui   v0, 0x80000
 	ldloc 8
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107f95c
+	brfalse L_107ff80
 // --- basic block ---
-// 0x0107f954: 0x107f954: sw    zero, -14016(v0)
+// 0x0107ff78: 0x107ff78: sw    zero, -13552(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107f958: 0x107f958: lui   v0, 0x80000
+// 0x0107ff7c: 0x107ff7c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107f95c:
-// 0x0107f95c: 0x107f95c: lw    v1, -14016(v0)
+L_107ff80:
+// 0x0107ff80: 0x107ff80: lw    v1, -13552(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldelem.i4
 	stloc 7
-// 0x0107f960: 0x107f960: lui   v0, 0x80000
+// 0x0107ff84: 0x107ff84: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107f964: 0x107f964: sll   v1, v1, 2
+// 0x0107ff88: 0x107ff88: sll   v1, v1, 2
 	ldloc 7
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0107f968: 0x107f968: addiu v0, v0, -16028
+// 0x0107ff8c: 0x107ff8c: addiu v0, v0, -15564
 	ldloc 5
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107f96c: 0x107f96c: addu  v0, v1, v0
+// 0x0107ff90: 0x107ff90: addu  v0, v1, v0
 	ldloc 7
 	ldloc 5
 	add
 	stloc 5
-// 0x0107f970: 0x107f970: lw    s0, 0(v0)
+// 0x0107ff94: 0x107ff94: lw    s0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0107f974: 0x107f974: sll   zero, zero, 0
-// 0x0107f978: 0x107f978: beq   s0, zero, 0x107fa28 sll   zero, zero, 0
+// 0x0107ff98: 0x107ff98: sll   zero, zero, 0
+// 0x0107ff9c: 0x107ff9c: beq   s0, zero, 0x108004c sll   zero, zero, 0
 	ldloc 8
-	brfalse L_107fa28
+	brfalse L_108004c
 // --- basic block ---
-// 0x0107f980: 0x107f980: lw    a0, 4(s0)
+// 0x0107ffa4: 0x107ffa4: lw    a0, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5578,40 +5578,40 @@ L_107f95c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107f984: 0x107f984: jal   0x10a6d54 sll   zero, zero, 0
+// 0x0107ffa8: 0x107ffa8: jal   0x10a739c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_show_report_10a6d54(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_show_report_10a739c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f98c: 0x107f98c: bne   v0, zero, 0x107f9a4 lui   v0, 0x0
+// 0x0107ffb0: 0x107ffb0: bne   v0, zero, 0x107ffc8 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brtrue L_107f9a4
+	brtrue L_107ffc8
 // --- basic block ---
-L_107f994:
-// 0x0107f994: 0x107f994: jal   0x107f7f4 sll   zero, zero, 0
+L_107ffb8:
+// 0x0107ffb8: 0x107ffb8: jal   0x107fe18 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_107f7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_107fe18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f99c: 0x107f99c: j	 0x107fa28 sll   zero, zero, 0
-	br L_107fa28
+// 0x0107ffc0: 0x107ffc0: j	 0x108004c sll   zero, zero, 0
+	br L_108004c
 // --- basic block ---
-L_107f9a4:
-// 0x0107f9a4: 0x107f9a4: lw    v0, 15828(v0)
+L_107ffc8:
+// 0x0107ffc8: 0x107ffc8: lw    v0, 15828(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5620,14 +5620,14 @@ L_107f9a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f9a8: 0x107f9a8: sll   zero, zero, 0
-// 0x0107f9ac: 0x107f9ac: bne   v0, zero, 0x107fa1c lui   s1, 0x20000
+// 0x0107ffcc: 0x107ffcc: sll   zero, zero, 0
+// 0x0107ffd0: 0x107ffd0: bne   v0, zero, 0x1080040 lui   s1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc 9
-	brtrue L_107fa1c
+	brtrue L_1080040
 // --- basic block ---
-// 0x0107f9b4: 0x107f9b4: lw    v0, 1264(s0)
+// 0x0107ffd8: 0x107ffd8: lw    v0, 1264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5636,29 +5636,29 @@ L_107f9a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107f9b8: 0x107f9b8: lui   a3, 0x20000
+// 0x0107ffdc: 0x107ffdc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107f9bc: 0x107f9bc: addiu a3, a3, -24300
+// 0x0107ffe0: 0x107ffe0: addiu a3, a3, -23836
 	ldloc 4
-	ldc.i4 -24300
+	ldc.i4 -23836
 	add
 	stloc 4
-// 0x0107f9c0: 0x107f9c0: addiu a0, zero, 1
+// 0x0107ffe4: 0x107ffe4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107f9c4: 0x107f9c4: addiu a1, s1, -26712
+// 0x0107ffe8: 0x107ffe8: addiu a1, s1, -26248
 	ldloc 9
-	ldc.i4 -26712
+	ldc.i4 -26248
 	add
 	stloc.2
-// 0x0107f9c8: 0x107f9c8: addiu a2, zero, 2566
+// 0x0107ffec: 0x107ffec: addiu a2, zero, 2566
 	ldc.i4 2566
 	stloc.3
-// 0x0107f9cc: 0x107f9cc: lui   s2, 0x0
+// 0x0107fff0: 0x107fff0: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 10
-// 0x0107f9d0: 0x107f9d0: jal   0x100449c sw    v0, 16(sp)
+// 0x0107fff4: 0x107fff4: jal   0x100449c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5677,7 +5677,7 @@ L_107f9a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f9d8: 0x107f9d8: lw    s3, 1264(s0)
+// 0x0107fffc: 0x107fffc: lw    s3, 1264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5686,7 +5686,7 @@ L_107f9a4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0107f9dc: 0x107f9dc: jal   0x100e788 addiu a0, s2, 15948
+// 0x01080000: 0x1080000: jal   0x100e798 addiu a0, s2, 15948
 	ldloc 10
 	ldc.i4 15948
 	add
@@ -5696,25 +5696,25 @@ L_107f9a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f9e4: 0x107f9e4: slt   v0, v0, s3
+// 0x01080008: 0x1080008: slt   v0, v0, s3
 	ldloc 5
 	ldloc 11
 	clt
 	stloc 5
-// 0x0107f9e8: 0x107f9e8: beq   v0, zero, 0x107fa1c addiu a0, s2, 15948
+// 0x0108000c: 0x108000c: beq   v0, zero, 0x1080040 addiu a0, s2, 15948
 	ldloc 5
 	ldloc 10
 	ldc.i4 15948
 	add
 	stloc.1
-	brfalse L_107fa1c
+	brfalse L_1080040
 // --- basic block ---
-// 0x0107f9f0: 0x107f9f0: lw    s2, 1264(s0)
+// 0x01080014: 0x1080014: lw    s2, 1264(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5723,37 +5723,37 @@ L_107f9a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107f9f4: 0x107f9f4: jal   0x100e788 sll   zero, zero, 0
+// 0x01080018: 0x1080018: jal   0x100e798 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0107f9fc: 0x107f9fc: lui   a3, 0x20000
+// 0x01080020: 0x1080020: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0107fa00: 0x107fa00: addiu a1, s1, -26712
+// 0x01080024: 0x1080024: addiu a1, s1, -26248
 	ldloc 9
-	ldc.i4 -26712
+	ldc.i4 -26248
 	add
 	stloc.2
-// 0x0107fa04: 0x107fa04: addiu a3, a3, -24228
+// 0x01080028: 0x1080028: addiu a3, a3, -23764
 	ldloc 4
-	ldc.i4 -24228
+	ldc.i4 -23764
 	add
 	stloc 4
-// 0x0107fa08: 0x107fa08: addiu a0, zero, 1
+// 0x0108002c: 0x108002c: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107fa0c: 0x107fa0c: addiu a2, zero, 2569
+// 0x01080030: 0x1080030: addiu a2, zero, 2569
 	ldc.i4 2569
 	stloc.3
-// 0x0107fa10: 0x107fa10: sw    s2, 16(sp)
+// 0x01080034: 0x1080034: sw    s2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5762,7 +5762,7 @@ L_107f9a4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107fa14: 0x107fa14: jal   0x100449c sw    v0, 20(sp)
+// 0x01080038: 0x1080038: jal   0x100449c sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5781,15 +5781,15 @@ L_107f9a4:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107fa1c:
-// 0x0107fa1c: 0x107fa1c: lw    a0, 0(s0)
+L_1080040:
+// 0x01080040: 0x1080040: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107fa20: 0x107fa20: jal   0x107d4a8 addiu a1, zero, 2
+// 0x01080044: 0x1080044: jal   0x107dacc addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
 	ldloc.0
@@ -5797,14 +5797,14 @@ L_107fa1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl94::RTAlerts_popup_alert_107d4a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl94::RTAlerts_popup_alert_107dacc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_107fa28:
-// 0x0107fa28: 0x107fa28: lw    ra, 44(sp)
-// 0x0107fa2c: 0x107fa2c: lw    s3, 40(sp)
+L_108004c:
+// 0x0108004c: 0x108004c: lw    ra, 44(sp)
+// 0x01080050: 0x1080050: lw    s3, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5813,7 +5813,7 @@ L_107fa28:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0107fa30: 0x107fa30: lw    s2, 36(sp)
+// 0x01080054: 0x1080054: lw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5822,7 +5822,7 @@ L_107fa28:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107fa34: 0x107fa34: lw    s1, 32(sp)
+// 0x01080058: 0x1080058: lw    s1, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5831,7 +5831,7 @@ L_107fa28:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107fa38: 0x107fa38: lw    s0, 28(sp)
+// 0x0108005c: 0x108005c: lw    s0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5840,7 +5840,7 @@ L_107fa28:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107fa3c: 0x107fa3c: jr    ra addiu sp, sp, 48
+// 0x01080060: 0x1080060: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -5852,7 +5852,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Scroll_All_107fa44(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Scroll_All_1080068(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -5890,13 +5890,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107fa44: 0x107fa44: addiu sp, sp, -24
+// 0x01080068: 0x1080068: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x0107fa48: 0x107fa48: sw    ra, 20(sp)
-// 0x0107fa4c: 0x107fa4c: jal   0x1093f90 sw    s0, 16(sp)
+// 0x0108006c: 0x108006c: sw    ra, 20(sp)
+// 0x01080070: 0x1080070: jal   0x10945b4 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5905,30 +5905,30 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107fa54: 0x107fa54: beq   v0, zero, 0x107fa7c lui   s0, 0x80000
+// 0x01080078: 0x1080078: beq   v0, zero, 0x10800a0 lui   s0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brfalse L_107fa7c
+	brfalse L_10800a0
 // --- basic block ---
-// 0x0107fa5c: 0x107fa5c: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x01080080: 0x1080080: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fa64: 0x107fa64: lui   a1, 0x20000
+// 0x01080088: 0x1080088: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107fa68: 0x107fa68: addu  a0, v0, zero
+// 0x0108008c: 0x108008c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107fa6c: 0x107fa6c: jal   0x1001b14 addiu a1, a1, -26748
+// 0x01080090: 0x1080090: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -5936,19 +5936,19 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fa74: 0x107fa74: beq   v0, zero, 0x107fb18 lui   s0, 0x80000
+// 0x01080098: 0x1080098: beq   v0, zero, 0x108013c lui   s0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brfalse L_107fb18
+	brfalse L_108013c
 // --- basic block ---
-L_107fa7c:
-// 0x0107fa7c: 0x107fa7c: addiu v0, s0, -16028
+L_10800a0:
+// 0x010800a0: 0x10800a0: addiu v0, s0, -15564
 	ldloc 8
-	ldc.i4 -16028
+	ldc.i4 -15564
 	add
 	stloc 5
-// 0x0107fa80: 0x107fa80: lw    v1, 2008(v0)
+// 0x010800a4: 0x10800a4: lw    v1, 2008(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5957,7 +5957,7 @@ L_107fa7c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107fa84: 0x107fa84: lw    v0, 2000(v0)
+// 0x010800a8: 0x10800a8: lw    v0, 2000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5966,13 +5966,13 @@ L_107fa7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fa88: 0x107fa88: sll   zero, zero, 0
-// 0x0107fa8c: 0x107fa8c: beq   v0, v1, 0x107fb18 sll   zero, zero, 0
+// 0x010800ac: 0x10800ac: sll   zero, zero, 0
+// 0x010800b0: 0x10800b0: beq   v0, v1, 0x108013c sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	beq  L_107fb18
+	beq  L_108013c
 // --- basic block ---
-// 0x0107fa94: 0x107fa94: jal   0x10788cc addu  a0, zero, zero
+// 0x010800b8: 0x10800b8: jal   0x1078ef0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5980,24 +5980,24 @@ L_107fa7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fa9c: 0x107fa9c: lw    v0, -16028(s0)
+// 0x010800c0: 0x10800c0: lw    v0, -15564(s0)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4007
+	ldc.i4 -3891
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107faa0: 0x107faa0: lui   a0, 0x0
+// 0x010800c4: 0x10800c4: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0107faa4: 0x107faa4: lw    s0, 1264(v0)
+// 0x010800c8: 0x10800c8: lw    s0, 1264(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6006,7 +6006,7 @@ L_107fa7c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107faa8: 0x107faa8: jal   0x100e788 addiu a0, a0, 15948
+// 0x010800cc: 0x10800cc: jal   0x100e798 addiu a0, a0, 15948
 	ldloc.1
 	ldc.i4 15948
 	add
@@ -6016,23 +6016,23 @@ L_107fa7c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_integer_100e788(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_integer_100e798(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fab0: 0x107fab0: slt   v0, v0, s0
+// 0x010800d4: 0x10800d4: slt   v0, v0, s0
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 5
-// 0x0107fab4: 0x107fab4: beq   v0, zero, 0x107facc lui   v0, 0x0
+// 0x010800d8: 0x10800d8: beq   v0, zero, 0x10800f0 lui   v0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_107facc
+	brfalse L_10800f0
 // --- basic block ---
-// 0x0107fabc: 0x107fabc: lw    v0, 15828(v0)
+// 0x010800e0: 0x10800e0: lw    v0, 15828(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6041,24 +6041,24 @@ L_107fa7c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fac0: 0x107fac0: sll   zero, zero, 0
-// 0x0107fac4: 0x107fac4: beq   v0, zero, 0x107fb18 sll   zero, zero, 0
+// 0x010800e4: 0x10800e4: sll   zero, zero, 0
+// 0x010800e8: 0x10800e8: beq   v0, zero, 0x108013c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107fb18
+	brfalse L_108013c
 // --- basic block ---
-L_107facc:
-// 0x0107facc: 0x107facc: jal   0x1021394 sll   zero, zero, 0
+L_10800f0:
+// 0x010800f0: 0x10800f0: jal   0x10213a4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_hold_1021394(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_hold_10213a4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fad4: 0x107fad4: jal   0x101fc00 addu  a0, zero, zero
+// 0x010800f8: 0x10800f8: jal   0x101fc10 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -6066,62 +6066,62 @@ L_107facc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fadc: 0x107fadc: addiu v0, zero, -1
+// 0x01080100: 0x1080100: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x0107fae0: 0x107fae0: lui   v1, 0x80000
+// 0x01080104: 0x1080104: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107fae4: 0x107fae4: addiu a0, zero, 1
+// 0x01080108: 0x1080108: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x0107fae8: 0x107fae8: sw    v0, -14000(v1)
+// 0x0108010c: 0x108010c: sw    v0, -13536(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3500
+	ldc.i4 -3384
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107faec: 0x107faec: lui   v1, 0x80000
+// 0x01080110: 0x1080110: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107faf0: 0x107faf0: sw    a0, -13988(v1)
+// 0x01080114: 0x1080114: sw    a0, -13524(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3497
+	ldc.i4 -3381
 	add
 	ldloc.1
 	stelem.i4
-// 0x0107faf4: 0x107faf4: lui   v1, 0x80000
+// 0x01080118: 0x1080118: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107faf8: 0x107faf8: sw    v0, -14016(v1)
+// 0x0108011c: 0x108011c: sw    v0, -13552(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3504
+	ldc.i4 -3388
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107fafc: 0x107fafc: lui   v1, 0x80000
+// 0x01080120: 0x1080120: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107fb00: 0x107fb00: jal   0x107f7f4 sw    v0, -14004(v1)
+// 0x01080124: 0x1080124: jal   0x107fe18 sw    v0, -13540(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3501
+	ldc.i4 -3385
 	add
 	ldloc 5
 	stelem.i4
@@ -6130,20 +6130,20 @@ L_107facc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_107f7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_107fe18(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fb08: 0x107fb08: lui   a1, 0x1080000
+// 0x0108012c: 0x108012c: lui   a1, 0x1080000
 	ldc.i4 17301504
 	stloc.2
-// 0x0107fb0c: 0x107fb0c: addiu a1, a1, -2060
+// 0x01080130: 0x1080130: addiu a1, a1, -488
 	ldloc.2
-	ldc.i4 -2060
+	ldc.i4 -488
 	add
 	stloc.2
-// 0x0107fb10: 0x107fb10: jal   0x104fe98 addiu a0, zero, 6000
+// 0x01080134: 0x1080134: jal   0x104fea8 addiu a0, zero, 6000
 	ldc.i4 6000
 	stloc.1
 	ldloc.0
@@ -6151,14 +6151,14 @@ L_107facc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl59::roadmap_main_set_periodic_104fe98(int32,int32,int32,int32,int32)
+	call int32 Cibyl59::roadmap_main_set_periodic_104fea8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_107fb18:
-// 0x0107fb18: 0x107fb18: lw    ra, 20(sp)
-// 0x0107fb1c: 0x107fb1c: lw    s0, 16(sp)
+L_108013c:
+// 0x0108013c: 0x108013c: lw    ra, 20(sp)
+// 0x01080140: 0x1080140: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6167,7 +6167,7 @@ L_107fb18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107fb20: 0x107fb20: jr    ra addiu sp, sp, 24
+// 0x01080144: 0x1080144: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -6179,7 +6179,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTAlerts_Timer_107fb28(int32,int32,int32,int32,int32)
+.method public static int32 RTAlerts_Timer_108014c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -6223,13 +6223,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107fb28: 0x107fb28: addiu sp, sp, -64
+// 0x0108014c: 0x108014c: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x0107fb2c: 0x107fb2c: sw    ra, 60(sp)
-// 0x0107fb30: 0x107fb30: sw    s2, 56(sp)
+// 0x01080150: 0x1080150: sw    ra, 60(sp)
+// 0x01080154: 0x1080154: sw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6238,7 +6238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107fb34: 0x107fb34: sw    s1, 52(sp)
+// 0x01080158: 0x1080158: sw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6247,7 +6247,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107fb38: 0x107fb38: jal   0x101de10 sw    s0, 48(sp)
+// 0x0108015c: 0x108015c: jal   0x101de20 sw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6256,29 +6256,29 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fb40: 0x107fb40: jal   0x1030c08 addu  s0, v0, zero
+// 0x01080164: 0x1080164: jal   0x1030c18 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-	call int32 Cibyl35::roadmap_gps_reception_state_1030c08()
+	call int32 Cibyl35::roadmap_gps_reception_state_1030c18()
 	stloc 5
 // --- basic block ---
-// 0x0107fb48: 0x107fb48: addiu a0, sp, 16
+// 0x0108016c: 0x108016c: addiu a0, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc.1
-// 0x0107fb4c: 0x107fb4c: addu  a1, zero, zero
+// 0x01080170: 0x1080170: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107fb50: 0x107fb50: addu  a2, zero, zero
+// 0x01080174: 0x1080174: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107fb54: 0x107fb54: jal   0x1029da8 addu  s1, v0, zero
+// 0x01080178: 0x1080178: jal   0x1029db8 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -6286,12 +6286,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fb5c: 0x107fb5c: lw    v0, 28(sp)
+// 0x01080180: 0x1080180: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6300,88 +6300,88 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fb60: 0x107fb60: sll   zero, zero, 0
-// 0x0107fb64: 0x107fb64: bgez  v0, 0x107fb94 lui   s2, 0x80000
+// 0x01080184: 0x1080184: sll   zero, zero, 0
+// 0x01080188: 0x1080188: bgez  v0, 0x10801b8 lui   s2, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 10
 	ldc.i4.s 0
-	bge L_107fb94
+	bge L_10801b8
 // --- basic block ---
-// 0x0107fb6c: 0x107fb6c: lw    v0, -14008(s2)
+// 0x01080190: 0x1080190: lw    v0, -13544(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fb70: 0x107fb70: sll   zero, zero, 0
-// 0x0107fb74: 0x107fb74: beq   v0, zero, 0x107fc78 sll   zero, zero, 0
+// 0x01080194: 0x1080194: sll   zero, zero, 0
+// 0x01080198: 0x1080198: beq   v0, zero, 0x108029c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107fc78
+	brfalse L_108029c
 // --- basic block ---
-// 0x0107fb7c: 0x107fb7c: jal   0x10799b8 sll   zero, zero, 0
+// 0x010801a0: 0x10801a0: jal   0x1079fdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fb84: 0x107fb84: jal   0x106aae8 addiu a0, zero, 1
+// 0x010801a8: 0x10801a8: jal   0x106b10c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl79::RealTime_SetMapDisplayed_106aae8(int32)
+	call int32 Cibyl79::RealTime_SetMapDisplayed_106b10c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fb8c: 0x107fb8c: j	 0x107fc78 sw    zero, -14008(s2)
+// 0x010801b0: 0x10801b0: j	 0x108029c sw    zero, -13544(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_107fc78
+	br L_108029c
 // --- basic block ---
-L_107fb94:
-// 0x0107fb94: 0x107fb94: lw    v1, -14008(s2)
+L_10801b8:
+// 0x010801b8: 0x10801b8: lw    v1, -13544(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107fb98: 0x107fb98: sll   zero, zero, 0
-// 0x0107fb9c: 0x107fb9c: beq   v1, zero, 0x107fbc4 slti  v0, v0, 6
+// 0x010801bc: 0x10801bc: sll   zero, zero, 0
+// 0x010801c0: 0x10801c0: beq   v1, zero, 0x10801e8 slti  v0, v0, 6
 	ldloc 6
 	ldloc 5
 	ldc.i4.6
 	clt
 	stloc 5
-	brfalse L_107fbc4
+	brfalse L_10801e8
 // --- basic block ---
-// 0x0107fba4: 0x107fba4: bne   v0, zero, 0x107fbc4 lui   v0, 0x80000
+// 0x010801c8: 0x10801c8: bne   v0, zero, 0x10801e8 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_107fbc4
+	brtrue L_10801e8
 // --- basic block ---
-// 0x0107fbac: 0x107fbac: jal   0x10799b8 sw    zero, -14012(v0)
+// 0x010801d0: 0x10801d0: jal   0x1079fdc sw    zero, -13548(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6390,86 +6390,86 @@ L_107fb94:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fbb4: 0x107fbb4: jal   0x106aae8 addiu a0, zero, 1
+// 0x010801d8: 0x10801d8: jal   0x106b10c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl79::RealTime_SetMapDisplayed_106aae8(int32)
+	call int32 Cibyl79::RealTime_SetMapDisplayed_106b10c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fbbc: 0x107fbbc: j	 0x107fd58 sw    zero, -14008(s2)
+// 0x010801e0: 0x10801e0: j	 0x108037c sw    zero, -13544(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_107fd58
+	br L_108037c
 // --- basic block ---
-L_107fbc4:
-// 0x0107fbc4: 0x107fbc4: jal   0x1053844 sll   zero, zero, 0
-	call int32 Cibyl62::roadmap_message_ticker_is_on_1053844()
+L_10801e8:
+// 0x010801e8: 0x10801e8: jal   0x1053854 sll   zero, zero, 0
+	call int32 Cibyl62::roadmap_message_ticker_is_on_1053854()
 	stloc 5
 // --- basic block ---
-// 0x0107fbcc: 0x107fbcc: beq   v0, zero, 0x107fc00 sll   zero, zero, 0
+// 0x010801f0: 0x10801f0: beq   v0, zero, 0x1080224 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107fc00
+	brfalse L_1080224
 // --- basic block ---
-// 0x0107fbd4: 0x107fbd4: lui   s0, 0x80000
+// 0x010801f8: 0x10801f8: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x0107fbd8: 0x107fbd8: lw    v0, -14008(s0)
+// 0x010801fc: 0x10801fc: lw    v0, -13544(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fbdc: 0x107fbdc: sll   zero, zero, 0
-// 0x0107fbe0: 0x107fbe0: beq   v0, zero, 0x107fd58 sll   zero, zero, 0
+// 0x01080200: 0x1080200: sll   zero, zero, 0
+// 0x01080204: 0x1080204: beq   v0, zero, 0x108037c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107fd58
+	brfalse L_108037c
 // --- basic block ---
-// 0x0107fbe8: 0x107fbe8: jal   0x10799b8 sll   zero, zero, 0
+// 0x0108020c: 0x108020c: jal   0x1079fdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fbf0: 0x107fbf0: jal   0x106aae8 addiu a0, zero, 1
+// 0x01080214: 0x1080214: jal   0x106b10c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl79::RealTime_SetMapDisplayed_106aae8(int32)
+	call int32 Cibyl79::RealTime_SetMapDisplayed_106b10c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fbf8: 0x107fbf8: j	 0x107fd58 sw    zero, -14008(s0)
+// 0x0108021c: 0x108021c: j	 0x108037c sw    zero, -13544(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_107fd58
+	br L_108037c
 // --- basic block ---
-L_107fc00:
-// 0x0107fc00: 0x107fc00: lw    v0, 28(sp)
+L_1080224:
+// 0x01080224: 0x1080224: lw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6478,121 +6478,121 @@ L_107fc00:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fc04: 0x107fc04: sll   zero, zero, 0
-// 0x0107fc08: 0x107fc08: slti  v0, v0, 2
+// 0x01080228: 0x1080228: sll   zero, zero, 0
+// 0x0108022c: 0x108022c: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x0107fc0c: 0x107fc0c: beq   v0, zero, 0x107fc30 sltiu s1, s1, 2
+// 0x01080230: 0x1080230: beq   v0, zero, 0x1080254 sltiu s1, s1, 2
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	clt.un
 	stloc 8
-	brfalse L_107fc30
+	brfalse L_1080254
 // --- basic block ---
-// 0x0107fc14: 0x107fc14: bne   s1, zero, 0x107fc30 lui   v0, 0x80000
+// 0x01080238: 0x1080238: bne   s1, zero, 0x1080254 lui   v0, 0x80000
 	ldloc 8
 	ldc.i4 524288
 	stloc 5
-	brtrue L_107fc30
+	brtrue L_1080254
 // --- basic block ---
-// 0x0107fc1c: 0x107fc1c: lw    v1, -14012(v0)
+// 0x01080240: 0x1080240: lw    v1, -13548(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107fc20: 0x107fc20: sll   zero, zero, 0
-// 0x0107fc24: 0x107fc24: addiu v1, v1, 1
+// 0x01080244: 0x1080244: sll   zero, zero, 0
+// 0x01080248: 0x1080248: addiu v1, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x0107fc28: 0x107fc28: j	 0x107fc58 sw    v1, -14012(v0)
+// 0x0108024c: 0x108024c: j	 0x108027c sw    v1, -13548(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldloc 6
 	stelem.i4
-	br L_107fc58
+	br L_108027c
 // --- basic block ---
-L_107fc30:
-// 0x0107fc30: 0x107fc30: lui   s1, 0x80000
+L_1080254:
+// 0x01080254: 0x1080254: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0107fc34: 0x107fc34: lw    v0, -14008(s1)
+// 0x01080258: 0x1080258: lw    v0, -13544(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fc38: 0x107fc38: lui   v1, 0x80000
+// 0x0108025c: 0x108025c: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107fc3c: 0x107fc3c: beq   v0, zero, 0x107fc58 sw    zero, -14012(v1)
+// 0x01080260: 0x1080260: beq   v0, zero, 0x108027c sw    zero, -13548(v1)
 	ldloc 5
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_107fc58
+	brfalse L_108027c
 // --- basic block ---
-// 0x0107fc44: 0x107fc44: jal   0x10799b8 sll   zero, zero, 0
+// 0x01080268: 0x1080268: jal   0x1079fdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fc4c: 0x107fc4c: jal   0x106aae8 addiu a0, zero, 1
+// 0x01080270: 0x1080270: jal   0x106b10c addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.1
-	call int32 Cibyl79::RealTime_SetMapDisplayed_106aae8(int32)
+	call int32 Cibyl79::RealTime_SetMapDisplayed_106b10c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fc54: 0x107fc54: sw    zero, -14008(s1)
+// 0x01080278: 0x1080278: sw    zero, -13544(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107fc58:
-// 0x0107fc58: 0x107fc58: beq   s0, zero, 0x107fd54 lui   v0, 0x80000
+L_108027c:
+// 0x0108027c: 0x108027c: beq   s0, zero, 0x1080378 lui   v0, 0x80000
 	ldloc 9
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107fd54
+	brfalse L_1080378
 // --- basic block ---
-// 0x0107fc60: 0x107fc60: lui   a1, 0x10000
+// 0x01080284: 0x1080284: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x0107fc64: 0x107fc64: addu  a0, s0, zero
+// 0x01080288: 0x1080288: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0107fc68: 0x107fc68: jal   0x1001b14 addiu a1, a1, -31052
+// 0x0108028c: 0x108028c: jal   0x1001b14 addiu a1, a1, -31052
 	ldloc.2
 	ldc.i4 -31052
 	add
@@ -6602,42 +6602,42 @@ L_107fc58:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fc70: 0x107fc70: beq   v0, zero, 0x107fc80 sll   zero, zero, 0
+// 0x01080294: 0x1080294: beq   v0, zero, 0x10802a4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107fc80
+	brfalse L_10802a4
 // --- basic block ---
-L_107fc78:
-// 0x0107fc78: 0x107fc78: j	 0x107fd54 lui   v0, 0x80000
+L_108029c:
+// 0x0108029c: 0x108029c: j	 0x1080378 lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-	br L_107fd54
+	br L_1080378
 // --- basic block ---
-L_107fc80:
-// 0x0107fc80: 0x107fc80: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+L_10802a4:
+// 0x010802a4: 0x10802a4: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107fc88: 0x107fc88: beq   v0, zero, 0x107fcb0 lui   v0, 0x80000
+// 0x010802ac: 0x10802ac: beq   v0, zero, 0x10802d4 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107fcb0
+	brfalse L_10802d4
 // --- basic block ---
-// 0x0107fc90: 0x107fc90: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x010802b4: 0x10802b4: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fc98: 0x107fc98: lui   a1, 0x20000
+// 0x010802bc: 0x10802bc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107fc9c: 0x107fc9c: addu  a0, v0, zero
+// 0x010802c0: 0x10802c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107fca0: 0x107fca0: jal   0x1001b14 addiu a1, a1, -26748
+// 0x010802c4: 0x10802c4: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -6645,55 +6645,55 @@ L_107fc80:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fca8: 0x107fca8: bne   v0, zero, 0x107fd58 lui   v0, 0x80000
+// 0x010802cc: 0x10802cc: bne   v0, zero, 0x108037c lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_107fd58
+	brtrue L_108037c
 // --- basic block ---
-L_107fcb0:
-// 0x0107fcb0: 0x107fcb0: lw    v1, -14012(v0)
+L_10802d4:
+// 0x010802d4: 0x10802d4: lw    v1, -13548(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107fcb4: 0x107fcb4: addiu v0, zero, 30
+// 0x010802d8: 0x10802d8: addiu v0, zero, 30
 	ldc.i4.s 30
 	stloc 5
-// 0x0107fcb8: 0x107fcb8: bne   v1, v0, 0x107fd40 lui   v0, 0x80000
+// 0x010802dc: 0x10802dc: bne   v1, v0, 0x1080364 lui   v0, 0x80000
 	ldloc 6
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	bne.un L_107fd40
+	bne.un L_1080364
 // --- basic block ---
-// 0x0107fcc0: 0x107fcc0: jal   0x1093f90 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+// 0x010802e4: 0x10802e4: jal   0x10945b4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x0107fcc8: 0x107fcc8: beq   v0, zero, 0x107fcf0 sll   zero, zero, 0
+// 0x010802ec: 0x10802ec: beq   v0, zero, 0x1080314 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_107fcf0
+	brfalse L_1080314
 // --- basic block ---
-// 0x0107fcd0: 0x107fcd0: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x010802f4: 0x10802f4: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fcd8: 0x107fcd8: lui   a1, 0x20000
+// 0x010802fc: 0x10802fc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0107fcdc: 0x107fcdc: addu  a0, v0, zero
+// 0x01080300: 0x1080300: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107fce0: 0x107fce0: jal   0x1001b14 addiu a1, a1, -26748
+// 0x01080304: 0x1080304: jal   0x1001b14 addiu a1, a1, -26284
 	ldloc.2
-	ldc.i4 -26748
+	ldc.i4 -26284
 	add
 	stloc.2
 	ldloc.1
@@ -6701,36 +6701,36 @@ L_107fcb0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fce8: 0x107fce8: beq   v0, zero, 0x107fd40 lui   v0, 0x80000
+// 0x0108030c: 0x108030c: beq   v0, zero, 0x1080364 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_107fd40
+	brfalse L_1080364
 // --- basic block ---
-L_107fcf0:
-// 0x0107fcf0: 0x107fcf0: jal   0x101de10 sll   zero, zero, 0
-	call int32 Cibyl21::roadmap_trip_get_focus_name_101de10()
+L_1080314:
+// 0x01080314: 0x1080314: jal   0x101de20 sll   zero, zero, 0
+	call int32 Cibyl21::roadmap_trip_get_focus_name_101de20()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fcf8: 0x107fcf8: lui   a0, 0x80000
+// 0x0108031c: 0x108031c: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0107fcfc: 0x107fcfc: lui   a1, 0x0
+// 0x01080320: 0x1080320: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x0107fd00: 0x107fd00: addiu a0, a0, -13980
+// 0x01080324: 0x1080324: addiu a0, a0, -13516
 	ldloc.1
-	ldc.i4 -13980
+	ldc.i4 -13516
 	add
 	stloc.1
-// 0x0107fd04: 0x107fd04: addiu a1, a1, 15944
+// 0x01080328: 0x1080328: addiu a1, a1, 15944
 	ldloc.2
 	ldc.i4 15944
 	add
 	stloc.2
-// 0x0107fd08: 0x107fd08: jal   0x100844c sw    v0, 40(sp)
+// 0x0108032c: 0x108032c: jal   0x100845c sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6742,12 +6742,12 @@ L_107fcf0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fd10: 0x107fd10: lw    v0, 40(sp)
+// 0x01080334: 0x1080334: lw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6756,22 +6756,22 @@ L_107fcf0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fd14: 0x107fd14: lui   v1, 0x80000
+// 0x01080338: 0x1080338: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107fd18: 0x107fd18: sw    v0, -16228(v1)
+// 0x0108033c: 0x108033c: sw    v0, -15764(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -4057
+	ldc.i4 -3941
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107fd1c: 0x107fd1c: lui   v0, 0x0
+// 0x01080340: 0x1080340: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0107fd20: 0x107fd20: jal   0x107fa44 sw    zero, 15828(v0)
+// 0x01080344: 0x1080344: jal   0x1080068 sw    zero, 15828(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6785,69 +6785,69 @@ L_107fcf0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Scroll_All_107fa44(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Scroll_All_1080068(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fd28: 0x107fd28: jal   0x106aae8 addu  a0, zero, zero
+// 0x0108034c: 0x108034c: jal   0x106b10c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.1
-	call int32 Cibyl79::RealTime_SetMapDisplayed_106aae8(int32)
+	call int32 Cibyl79::RealTime_SetMapDisplayed_106b10c(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107fd30: 0x107fd30: addiu v1, zero, 1
+// 0x01080354: 0x1080354: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0107fd34: 0x107fd34: lui   v0, 0x80000
+// 0x01080358: 0x1080358: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107fd38: 0x107fd38: sw    v1, -14008(v0)
+// 0x0108035c: 0x108035c: sw    v1, -13544(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3502
+	ldc.i4 -3386
 	add
 	ldloc 6
 	stelem.i4
-// 0x0107fd3c: 0x107fd3c: lui   v0, 0x80000
+// 0x01080360: 0x1080360: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_107fd40:
-// 0x0107fd40: 0x107fd40: lw    v1, -14012(v0)
+L_1080364:
+// 0x01080364: 0x1080364: lw    v1, -13548(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldelem.i4
 	stloc 6
-// 0x0107fd44: 0x107fd44: sll   zero, zero, 0
-// 0x0107fd48: 0x107fd48: slti  v1, v1, 31
+// 0x01080368: 0x1080368: sll   zero, zero, 0
+// 0x0108036c: 0x108036c: slti  v1, v1, 31
 	ldloc 6
 	ldc.i4.s 31
 	clt
 	stloc 6
-// 0x0107fd4c: 0x107fd4c: bne   v1, zero, 0x107fd58 sll   zero, zero, 0
+// 0x01080370: 0x1080370: bne   v1, zero, 0x108037c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_107fd58
+	brtrue L_108037c
 // --- basic block ---
-L_107fd54:
-// 0x0107fd54: 0x107fd54: sw    zero, -14012(v0)
+L_1080378:
+// 0x01080378: 0x1080378: sw    zero, -13548(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3503
+	ldc.i4 -3387
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107fd58:
-// 0x0107fd58: 0x107fd58: lw    ra, 60(sp)
-// 0x0107fd5c: 0x107fd5c: lw    s2, 56(sp)
+L_108037c:
+// 0x0108037c: 0x108037c: lw    ra, 60(sp)
+// 0x01080380: 0x1080380: lw    s2, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6856,7 +6856,7 @@ L_107fd58:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0107fd60: 0x107fd60: lw    s1, 52(sp)
+// 0x01080384: 0x1080384: lw    s1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6865,7 +6865,7 @@ L_107fd58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0107fd64: 0x107fd64: lw    s0, 48(sp)
+// 0x01080388: 0x1080388: lw    s0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6874,7 +6874,7 @@ L_107fd58:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0107fd68: 0x107fd68: jr    ra addiu sp, sp, 64
+// 0x0108038c: 0x108038c: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
diff --git a/converted/Cibyl96.j b/converted/Cibyl96.j
index 6807a82..d934d6e 100644
--- a/converted/Cibyl96.j
+++ b/converted/Cibyl96.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl96::.ctor
 
-.method public static int32 populate_list_107fd70(int32,int32,int32,int32,int32)
+.method public static int32 populate_list_1080394(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s3,int32 s0,int32 s1,int32 s2,int32 s4,int32 s8,int32 s5,int32 s6,int32 s7,int32 ra,int32 hi,int32 lo)
@@ -109,19 +109,19 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0107fd70: 0x107fd70: addiu sp, sp, -1496
+// 0x01080394: 0x1080394: addiu sp, sp, -1496
 	ldloc.0
 	ldc.i4 -1496
 	add
 	stloc.0
-// 0x0107fd74: 0x107fd74: lui   v0, 0x80000
+// 0x01080398: 0x1080398: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0107fd78: 0x107fd78: lui   v1, 0x80000
+// 0x0108039c: 0x108039c: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x0107fd7c: 0x107fd7c: sw    ra, 1492(sp)
-// 0x0107fd80: 0x107fd80: sw    s8, 1488(sp)
+// 0x010803a0: 0x10803a0: sw    ra, 1492(sp)
+// 0x010803a4: 0x10803a4: sw    s8, 1488(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -130,7 +130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0107fd84: 0x107fd84: sw    s7, 1484(sp)
+// 0x010803a8: 0x10803a8: sw    s7, 1484(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x0107fd88: 0x107fd88: sw    s6, 1480(sp)
+// 0x010803ac: 0x10803ac: sw    s6, 1480(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -148,7 +148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x0107fd8c: 0x107fd8c: sw    s5, 1476(sp)
+// 0x010803b0: 0x10803b0: sw    s5, 1476(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -157,7 +157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0107fd90: 0x107fd90: sw    s4, 1472(sp)
+// 0x010803b4: 0x10803b4: sw    s4, 1472(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -166,7 +166,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x0107fd94: 0x107fd94: sw    s3, 1468(sp)
+// 0x010803b8: 0x10803b8: sw    s3, 1468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -175,7 +175,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0107fd98: 0x107fd98: sw    s2, 1464(sp)
+// 0x010803bc: 0x10803bc: sw    s2, 1464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -184,7 +184,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0107fd9c: 0x107fd9c: sw    s1, 1460(sp)
+// 0x010803c0: 0x10803c0: sw    s1, 1460(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -193,7 +193,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0107fda0: 0x107fda0: sw    s0, 1456(sp)
+// 0x010803c4: 0x10803c4: sw    s0, 1456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -202,68 +202,68 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0107fda4: 0x107fda4: addiu v0, v0, -13000
+// 0x010803c8: 0x10803c8: addiu v0, v0, -12536
 	ldloc 5
-	ldc.i4 -13000
+	ldc.i4 -12536
 	add
 	stloc 5
-// 0x0107fda8: 0x107fda8: addiu v1, v1, -12600
+// 0x010803cc: 0x10803cc: addiu v1, v1, -12136
 	ldloc 6
-	ldc.i4 -12600
+	ldc.i4 -12136
 	add
 	stloc 6
-L_107fdac:
-// 0x0107fdac: 0x107fdac: sw    zero, 0(v0)
+L_10803d0:
+// 0x010803d0: 0x10803d0: sw    zero, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x0107fdb0: 0x107fdb0: addiu v0, v0, 4
+// 0x010803d4: 0x10803d4: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x0107fdb4: 0x107fdb4: bne   v0, v1, 0x107fdac sll   zero, zero, 0
+// 0x010803d8: 0x10803d8: bne   v0, v1, 0x10803d0 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_107fdac
+	bne.un L_10803d0
 // --- basic block ---
-// 0x0107fdbc: 0x107fdbc: jal   0x1077084 sll   zero, zero, 0
-	call int32 Cibyl89::RTAlerts_Count_1077084()
+// 0x010803e0: 0x10803e0: jal   0x10776a8 sll   zero, zero, 0
+	call int32 Cibyl89::RTAlerts_Count_10776a8()
 	stloc 5
 // --- basic block ---
-// 0x0107fdc4: 0x107fdc4: blez  v0, 0x107fe8c addu  s2, v0, zero
+// 0x010803e8: 0x10803e8: blez  v0, 0x10804b0 addu  s2, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 11
 	ldc.i4.s 0
-	ble L_107fe8c
+	ble L_10804b0
 // --- basic block ---
-// 0x0107fdcc: 0x107fdcc: lui   s0, 0x80000
+// 0x010803f0: 0x10803f0: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x0107fdd0: 0x107fdd0: lui   s3, 0x80000
+// 0x010803f4: 0x10803f4: lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x0107fdd4: 0x107fdd4: addiu s0, s0, -12196
+// 0x010803f8: 0x10803f8: addiu s0, s0, -11732
 	ldloc 9
-	ldc.i4 -12196
+	ldc.i4 -11732
 	add
 	stloc 9
-// 0x0107fdd8: 0x107fdd8: addiu s3, s3, -13800
+// 0x010803fc: 0x10803fc: addiu s3, s3, -13336
 	ldloc 8
-	ldc.i4 -13800
+	ldc.i4 -13336
 	add
 	stloc 8
-// 0x0107fddc: 0x107fddc: j	 0x107fe78 addiu s1, zero, 1
+// 0x01080400: 0x1080400: j	 0x108049c addiu s1, zero, 1
 	ldc.i4.1
 	stloc 10
-	br L_107fe78
+	br L_108049c
 // --- basic block ---
-L_107fde4:
-// 0x0107fde4: 0x107fde4: lw    a0, -800(s0)
+L_1080408:
+// 0x01080408: 0x1080408: lw    a0, -800(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -272,12 +272,12 @@ L_107fde4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107fde8: 0x107fde8: sll   zero, zero, 0
-// 0x0107fdec: 0x107fdec: beq   a0, zero, 0x107fe00 sll   zero, zero, 0
+// 0x0108040c: 0x108040c: sll   zero, zero, 0
+// 0x01080410: 0x1080410: beq   a0, zero, 0x1080424 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_107fe00
+	brfalse L_1080424
 // --- basic block ---
-// 0x0107fdf4: 0x107fdf4: jal   0x1000930 sll   zero, zero, 0
+// 0x01080418: 0x1080418: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -288,7 +288,7 @@ L_107fde4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fdfc: 0x107fdfc: sw    zero, -800(s0)
+// 0x01080420: 0x1080420: sw    zero, -800(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -297,8 +297,8 @@ L_107fde4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107fe00:
-// 0x0107fe00: 0x107fe00: lw    a0, -1600(s0)
+L_1080424:
+// 0x01080424: 0x1080424: lw    a0, -1600(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -307,12 +307,12 @@ L_107fe00:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107fe04: 0x107fe04: sll   zero, zero, 0
-// 0x0107fe08: 0x107fe08: beq   a0, zero, 0x107fe1c sll   zero, zero, 0
+// 0x01080428: 0x1080428: sll   zero, zero, 0
+// 0x0108042c: 0x108042c: beq   a0, zero, 0x1080440 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_107fe1c
+	brfalse L_1080440
 // --- basic block ---
-// 0x0107fe10: 0x107fe10: jal   0x1000930 sll   zero, zero, 0
+// 0x01080434: 0x1080434: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -323,7 +323,7 @@ L_107fe00:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fe18: 0x107fe18: sw    zero, -1600(s0)
+// 0x0108043c: 0x108043c: sw    zero, -1600(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -332,8 +332,8 @@ L_107fe00:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107fe1c:
-// 0x0107fe1c: 0x107fe1c: lw    a0, -1200(s0)
+L_1080440:
+// 0x01080440: 0x1080440: lw    a0, -1200(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -342,12 +342,12 @@ L_107fe1c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107fe20: 0x107fe20: sll   zero, zero, 0
-// 0x0107fe24: 0x107fe24: beq   a0, zero, 0x107fe38 sll   zero, zero, 0
+// 0x01080444: 0x1080444: sll   zero, zero, 0
+// 0x01080448: 0x1080448: beq   a0, zero, 0x108045c sll   zero, zero, 0
 	ldloc.1
-	brfalse L_107fe38
+	brfalse L_108045c
 // --- basic block ---
-// 0x0107fe2c: 0x107fe2c: jal   0x1000930 sll   zero, zero, 0
+// 0x01080450: 0x1080450: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -358,7 +358,7 @@ L_107fe1c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fe34: 0x107fe34: sw    zero, -1200(s0)
+// 0x01080458: 0x1080458: sw    zero, -1200(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -367,8 +367,8 @@ L_107fe1c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107fe38:
-// 0x0107fe38: 0x107fe38: lw    a0, -400(s0)
+L_108045c:
+// 0x0108045c: 0x108045c: lw    a0, -400(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -377,14 +377,14 @@ L_107fe38:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0107fe3c: 0x107fe3c: sll   zero, zero, 0
-// 0x0107fe40: 0x107fe40: beq   a0, zero, 0x107fe54 addiu a1, zero, 1
+// 0x01080460: 0x1080460: sll   zero, zero, 0
+// 0x01080464: 0x1080464: beq   a0, zero, 0x1080478 addiu a1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc.2
-	brfalse L_107fe54
+	brfalse L_1080478
 // --- basic block ---
-// 0x0107fe48: 0x107fe48: jal   0x10992a8 addiu a2, zero, 1
+// 0x0108046c: 0x108046c: jal   0x10998f0 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -392,12 +392,12 @@ L_107fe38:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_10992a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_10998f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fe50: 0x107fe50: sw    zero, -400(s0)
+// 0x01080474: 0x1080474: sw    zero, -400(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -406,22 +406,22 @@ L_107fe38:
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_107fe54:
-// 0x0107fe54: 0x107fe54: lw    a0, 0(s0)
+L_1080478:
+// 0x01080478: 0x1080478: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107fe58: 0x107fe58: sll   zero, zero, 0
-// 0x0107fe5c: 0x107fe5c: beq   a0, zero, 0x107fe70 addiu a1, zero, 1
+// 0x0108047c: 0x108047c: sll   zero, zero, 0
+// 0x01080480: 0x1080480: beq   a0, zero, 0x1080494 addiu a1, zero, 1
 	ldloc.1
 	ldc.i4.1
 	stloc.2
-	brfalse L_107fe70
+	brfalse L_1080494
 // --- basic block ---
-// 0x0107fe64: 0x107fe64: jal   0x10992a8 addiu a2, zero, 1
+// 0x01080488: 0x1080488: jal   0x10998f0 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -429,31 +429,31 @@ L_107fe54:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_10992a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_10998f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fe6c: 0x107fe6c: sw    zero, 0(s0)
+// 0x01080490: 0x1080490: sw    zero, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-L_107fe70:
-// 0x0107fe70: 0x107fe70: addiu s1, s1, 1
+L_1080494:
+// 0x01080494: 0x1080494: addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-// 0x0107fe74: 0x107fe74: addiu s0, s0, 4
+// 0x01080498: 0x1080498: addiu s0, s0, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_107fe78:
-// 0x0107fe78: 0x107fe78: lw    v0, 2800(s3)
+L_108049c:
+// 0x0108049c: 0x108049c: lw    v0, 2800(s3)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -462,23 +462,23 @@ L_107fe78:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107fe7c: 0x107fe7c: sll   zero, zero, 0
-// 0x0107fe80: 0x107fe80: slt   v0, s1, v0
+// 0x010804a0: 0x10804a0: sll   zero, zero, 0
+// 0x010804a4: 0x10804a4: slt   v0, s1, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x0107fe84: 0x107fe84: bne   v0, zero, 0x107fde4 sll   zero, zero, 0
+// 0x010804a8: 0x10804a8: bne   v0, zero, 0x1080408 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_107fde4
+	brtrue L_1080408
 // --- basic block ---
-L_107fe8c:
-// 0x0107fe8c: 0x107fe8c: addiu a0, sp, 48
+L_10804b0:
+// 0x010804b0: 0x10804b0: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x0107fe90: 0x107fe90: jal   0x100844c addiu a1, sp, 28
+// 0x010804b4: 0x10804b4: jal   0x100845c addiu a1, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -486,26 +486,26 @@ L_107fe8c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fe98: 0x107fe98: addiu s2, s2, -1
+// 0x010804bc: 0x10804bc: addiu s2, s2, -1
 	ldloc 11
 	ldc.i4.m1
 	add
 	stloc 11
-// 0x0107fe9c: 0x107fe9c: lui   s8, 0x20000
+// 0x010804c0: 0x10804c0: lui   s8, 0x20000
 	ldc.i4 131072
 	stloc 13
-// 0x0107fea0: 0x107fea0: lui   s4, 0x80000
+// 0x010804c4: 0x10804c4: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 12
-// 0x0107fea4: 0x107fea4: addiu v0, zero, 70
+// 0x010804c8: 0x10804c8: addiu v0, zero, 70
 	ldc.i4.s 70
 	stloc 5
-// 0x0107fea8: 0x107fea8: sw    s2, 1432(sp)
+// 0x010804cc: 0x10804cc: sw    s2, 1432(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -514,23 +514,23 @@ L_107fe8c:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0107feac: 0x107feac: addiu s8, s8, -23596
+// 0x010804d0: 0x10804d0: addiu s8, s8, -23132
 	ldloc 13
-	ldc.i4 -23596
+	ldc.i4 -23132
 	add
 	stloc 13
-// 0x0107feb0: 0x107feb0: addiu s4, s4, -13800
+// 0x010804d4: 0x10804d4: addiu s4, s4, -13336
 	ldloc 12
-	ldc.i4 -13800
+	ldc.i4 -13336
 	add
 	stloc 12
-// 0x0107feb4: 0x107feb4: addiu s7, zero, 1
+// 0x010804d8: 0x10804d8: addiu s7, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x0107feb8: 0x107feb8: addu  s6, zero, zero
+// 0x010804dc: 0x10804dc: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x0107febc: 0x107febc: sw    v0, 1436(sp)
+// 0x010804e0: 0x10804e0: sw    v0, 1436(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -539,35 +539,35 @@ L_107fe8c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107fec0: 0x107fec0: addiu s5, zero, -1
+// 0x010804e4: 0x10804e4: addiu s5, zero, -1
 	ldc.i4.m1
 	stloc 14
-// 0x0107fec4: 0x107fec4: j	 0x1080820 addu  s1, zero, zero
+// 0x010804e8: 0x10804e8: j	 0x1080e44 addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1080820
+	br L_1080e44
 // --- basic block ---
-L_107fecc:
-// 0x0107fecc: 0x107fecc: lui   a0, 0x10000
+L_10804f0:
+// 0x010804f0: 0x10804f0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107fed0: 0x107fed0: addiu a3, zero, -2
+// 0x010804f4: 0x10804f4: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x0107fed4: 0x107fed4: addiu a1, a1, -23608
+// 0x010804f8: 0x10804f8: addiu a1, a1, -23144
 	ldloc.2
-	ldc.i4 -23608
+	ldc.i4 -23144
 	add
 	stloc.2
-// 0x0107fed8: 0x107fed8: addiu a2, zero, -2
+// 0x010804fc: 0x10804fc: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x0107fedc: 0x107fedc: addiu a0, a0, -7504
+// 0x01080500: 0x1080500: addiu a0, a0, -7508
 	ldloc.1
-	ldc.i4 -7504
+	ldc.i4 -7508
 	add
 	stloc.1
-// 0x0107fee0: 0x107fee0: jal   0x1093a24 sw    zero, 16(sp)
+// 0x01080504: 0x1080504: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -581,51 +581,51 @@ L_107fecc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107fee8: 0x107fee8: addu  a0, v0, zero
+// 0x0108050c: 0x108050c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0107feec: 0x107feec: addu  a1, zero, zero
+// 0x01080510: 0x1080510: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0107fef0: 0x107fef0: addu  a2, zero, zero
+// 0x01080514: 0x1080514: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0107fef4: 0x107fef4: jal   0x1098fe0 addu  s2, v0, zero
+// 0x01080518: 0x1080518: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0107fefc: 0x107fefc: addu  a0, s0, zero
+// 0x01080520: 0x1080520: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x0107ff00: 0x107ff00: sb    zero, 724(sp)
+// 0x01080524: 0x1080524: sb    zero, 724(sp)
 	ldloc.0
 	ldc.i4 724
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0107ff04: 0x107ff04: jal   0x10770d4 sb    zero, 124(sp)
+// 0x01080528: 0x1080528: jal   0x10776f8 sb    zero, 124(sp)
 	ldloc.0
 	ldc.i4.s 124
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
-	call int32 Cibyl89::RTAlerts_Get_10770d4(int32)
+	call int32 Cibyl89::RTAlerts_Get_10776f8(int32)
 	stloc 5
 // --- basic block ---
-// 0x0107ff0c: 0x107ff0c: addu  s0, v0, zero
+// 0x01080530: 0x1080530: addu  s0, v0, zero
 	ldloc 5
 	stloc 9
-// 0x0107ff10: 0x107ff10: lw    v0, 1836(v0)
+// 0x01080534: 0x1080534: lw    v0, 1836(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -634,60 +634,60 @@ L_107fecc:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ff14: 0x107ff14: sll   zero, zero, 0
-// 0x0107ff18: 0x107ff18: bne   v0, zero, 0x1080810 lui   v1, 0x80000
+// 0x01080538: 0x1080538: sll   zero, zero, 0
+// 0x0108053c: 0x108053c: bne   v0, zero, 0x1080e34 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brtrue L_1080810
+	brtrue L_1080e34
 // --- basic block ---
-// 0x0107ff20: 0x107ff20: lw    v0, -13852(v1)
+// 0x01080544: 0x1080544: lw    v0, -13388(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ff24: 0x107ff24: addiu v1, zero, 1
+// 0x01080548: 0x1080548: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0107ff28: 0x107ff28: bne   v0, v1, 0x107ff44 addiu v1, zero, 2
+// 0x0108054c: 0x108054c: bne   v0, v1, 0x1080568 addiu v1, zero, 2
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	stloc 6
-	bne.un L_107ff44
+	bne.un L_1080568
 // --- basic block ---
-// 0x0107ff30: 0x107ff30: lw    a0, 0(s0)
+// 0x01080554: 0x1080554: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0107ff34: 0x107ff34: jal   0x1077ddc sll   zero, zero, 0
+// 0x01080558: 0x1080558: jal   0x1078400 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_isAlertOnRoute_1077ddc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_isAlertOnRoute_1078400(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ff3c: 0x107ff3c: j	 0x107ff54 sll   zero, zero, 0
-	br L_107ff54
+// 0x01080560: 0x1080560: j	 0x1080578 sll   zero, zero, 0
+	br L_1080578
 // --- basic block ---
-L_107ff44:
-// 0x0107ff44: 0x107ff44: bne   v0, v1, 0x107ff5c sll   zero, zero, 0
+L_1080568:
+// 0x01080568: 0x1080568: bne   v0, v1, 0x1080580 sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_107ff5c
+	bne.un L_1080580
 // --- basic block ---
-// 0x0107ff4c: 0x107ff4c: lw    v0, 1824(s0)
+// 0x01080570: 0x1080570: lw    v0, 1824(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -696,14 +696,14 @@ L_107ff44:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ff50: 0x107ff50: sll   zero, zero, 0
-L_107ff54:
-// 0x0107ff54: 0x107ff54: beq   v0, zero, 0x1080810 sll   zero, zero, 0
+// 0x01080574: 0x1080574: sll   zero, zero, 0
+L_1080578:
+// 0x01080578: 0x1080578: beq   v0, zero, 0x1080e34 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1080810
+	brfalse L_1080e34
 // --- basic block ---
-L_107ff5c:
-// 0x0107ff5c: 0x107ff5c: lw    v0, 16(s0)
+L_1080580:
+// 0x01080580: 0x1080580: lw    v0, 16(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -712,12 +712,12 @@ L_107ff5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ff60: 0x107ff60: addiu a0, sp, 32
+// 0x01080584: 0x1080584: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x0107ff64: 0x107ff64: sw    v0, 32(sp)
+// 0x01080588: 0x1080588: sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -726,7 +726,7 @@ L_107ff5c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0107ff68: 0x107ff68: lw    v0, 20(s0)
+// 0x0108058c: 0x108058c: lw    v0, 20(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -735,10 +735,10 @@ L_107ff5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ff6c: 0x107ff6c: addiu a1, zero, 20
+// 0x01080590: 0x1080590: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x0107ff70: 0x107ff70: jal   0x10086bc sw    v0, 36(sp)
+// 0x01080594: 0x1080594: jal   0x10086cc sw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -752,12 +752,12 @@ L_107ff5c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ff78: 0x107ff78: lw    v0, 4(s0)
+// 0x0108059c: 0x108059c: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -766,22 +766,22 @@ L_107ff5c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0107ff7c: 0x107ff7c: addiu a0, zero, 2
+// 0x010805a0: 0x10805a0: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x0107ff80: 0x107ff80: bne   v0, a0, 0x107ffa4 addiu v1, sp, 724
+// 0x010805a4: 0x10805a4: bne   v0, a0, 0x10805c8 addiu v1, sp, 724
 	ldloc 5
 	ldloc.1
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-	bne.un L_107ffa4
+	bne.un L_10805c8
 // --- basic block ---
-// 0x0107ff88: 0x107ff88: addu  a0, v1, zero
+// 0x010805ac: 0x10805ac: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x0107ff8c: 0x107ff8c: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x010805b0: 0x10805b0: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -796,39 +796,39 @@ L_107ff5c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ff94: 0x107ff94: lui   a0, 0x10000
+// 0x010805b8: 0x10805b8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107ff98: 0x107ff98: addu  s3, v0, zero
+// 0x010805bc: 0x10805bc: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0107ff9c: 0x107ff9c: j	 0x10801cc addiu a0, a0, -19640
+// 0x010805c0: 0x10805c0: j	 0x10807f0 addiu a0, a0, -19640
 	ldloc.1
 	ldc.i4 -19640
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_107ffa4:
-// 0x0107ffa4: 0x107ffa4: addiu a1, zero, 1
+L_10805c8:
+// 0x010805c8: 0x10805c8: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0107ffa8: 0x107ffa8: bne   v0, a1, 0x107ffd0 addiu v1, zero, 3
+// 0x010805cc: 0x10805cc: bne   v0, a1, 0x10805f4 addiu v1, zero, 3
 	ldloc 5
 	ldloc.2
 	ldc.i4.3
 	stloc 6
-	bne.un L_107ffd0
+	bne.un L_10805f4
 // --- basic block ---
-// 0x0107ffb0: 0x107ffb0: addiu v1, sp, 724
+// 0x010805d4: 0x10805d4: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x0107ffb4: 0x107ffb4: addu  a0, v1, zero
+// 0x010805d8: 0x10805d8: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x0107ffb8: 0x107ffb8: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x010805dc: 0x10805dc: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -843,34 +843,34 @@ L_107ffa4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ffc0: 0x107ffc0: lui   a0, 0x20000
+// 0x010805e4: 0x10805e4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0107ffc4: 0x107ffc4: addu  s3, v0, zero
+// 0x010805e8: 0x10805e8: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0107ffc8: 0x107ffc8: j	 0x10801cc addiu a0, a0, -27044
+// 0x010805ec: 0x10805ec: j	 0x10807f0 addiu a0, a0, -26580
 	ldloc.1
-	ldc.i4 -27044
+	ldc.i4 -26580
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_107ffd0:
-// 0x0107ffd0: 0x107ffd0: bne   v0, v1, 0x107fff8 sll   zero, zero, 0
+L_10805f4:
+// 0x010805f4: 0x10805f4: bne   v0, v1, 0x108061c sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_107fff8
+	bne.un L_108061c
 // --- basic block ---
-// 0x0107ffd8: 0x107ffd8: addiu v1, sp, 724
+// 0x010805fc: 0x10805fc: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x0107ffdc: 0x107ffdc: addu  a0, v1, zero
+// 0x01080600: 0x1080600: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x0107ffe0: 0x107ffe0: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x01080604: 0x1080604: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -885,29 +885,29 @@ L_107ffd0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0107ffe8: 0x107ffe8: lui   a0, 0x10000
+// 0x0108060c: 0x108060c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0107ffec: 0x107ffec: addu  s3, v0, zero
+// 0x01080610: 0x1080610: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0107fff0: 0x107fff0: j	 0x10801cc addiu a0, a0, -19588
+// 0x01080614: 0x1080614: j	 0x10807f0 addiu a0, a0, -19588
 	ldloc.1
 	ldc.i4 -19588
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_107fff8:
-// 0x0107fff8: 0x107fff8: addiu a2, zero, 4
+L_108061c:
+// 0x0108061c: 0x108061c: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x0107fffc: 0x107fffc: bne   v0, a2, 0x10800dc sll   zero, zero, 0
+// 0x01080620: 0x1080620: bne   v0, a2, 0x1080700 sll   zero, zero, 0
 	ldloc 5
 	ldloc.3
-	bne.un L_10800dc
+	bne.un L_1080700
 // --- basic block ---
-// 0x01080004: 0x1080004: lw    v0, 8(s0)
+// 0x01080628: 0x1080628: lw    v0, 8(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -916,20 +916,20 @@ L_107fff8:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080008: 0x1080008: sll   zero, zero, 0
-// 0x0108000c: 0x108000c: bne   v0, zero, 0x1080034 sll   zero, zero, 0
+// 0x0108062c: 0x108062c: sll   zero, zero, 0
+// 0x01080630: 0x1080630: bne   v0, zero, 0x1080658 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1080034
+	brtrue L_1080658
 // --- basic block ---
-// 0x01080014: 0x1080014: addiu v1, sp, 724
+// 0x01080638: 0x1080638: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x01080018: 0x1080018: addu  a0, v1, zero
+// 0x0108063c: 0x108063c: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x0108001c: 0x108001c: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x01080640: 0x1080640: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -944,34 +944,34 @@ L_107fff8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080024: 0x1080024: lui   a0, 0x20000
+// 0x01080648: 0x1080648: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080028: 0x1080028: addu  s3, v0, zero
+// 0x0108064c: 0x108064c: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108002c: 0x108002c: j	 0x10801cc addiu a0, a0, -27032
+// 0x01080650: 0x1080650: j	 0x10807f0 addiu a0, a0, -26568
 	ldloc.1
-	ldc.i4 -27032
+	ldc.i4 -26568
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_1080034:
-// 0x01080034: 0x1080034: bne   v0, a1, 0x108005c sll   zero, zero, 0
+L_1080658:
+// 0x01080658: 0x1080658: bne   v0, a1, 0x1080680 sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	bne.un L_108005c
+	bne.un L_1080680
 // --- basic block ---
-// 0x0108003c: 0x108003c: addiu v1, sp, 724
+// 0x01080660: 0x1080660: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x01080040: 0x1080040: addu  a0, v1, zero
+// 0x01080664: 0x1080664: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01080044: 0x1080044: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x01080668: 0x1080668: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -986,34 +986,34 @@ L_1080034:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108004c: 0x108004c: lui   a0, 0x20000
+// 0x01080670: 0x1080670: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080050: 0x1080050: addu  s3, v0, zero
+// 0x01080674: 0x1080674: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01080054: 0x1080054: j	 0x10801cc addiu a0, a0, -27016
+// 0x01080678: 0x1080678: j	 0x10807f0 addiu a0, a0, -26552
 	ldloc.1
-	ldc.i4 -27016
+	ldc.i4 -26552
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_108005c:
-// 0x0108005c: 0x108005c: bne   v0, a0, 0x1080084 sll   zero, zero, 0
+L_1080680:
+// 0x01080680: 0x1080680: bne   v0, a0, 0x10806a8 sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	bne.un L_1080084
+	bne.un L_10806a8
 // --- basic block ---
-// 0x01080064: 0x1080064: addiu v1, sp, 724
+// 0x01080688: 0x1080688: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x01080068: 0x1080068: addu  a0, v1, zero
+// 0x0108068c: 0x108068c: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x0108006c: 0x108006c: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x01080690: 0x1080690: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1028,30 +1028,30 @@ L_108005c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080074: 0x1080074: lui   a0, 0x20000
+// 0x01080698: 0x1080698: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080078: 0x1080078: addu  s3, v0, zero
+// 0x0108069c: 0x108069c: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108007c: 0x108007c: j	 0x10801cc addiu a0, a0, -26996
+// 0x010806a0: 0x10806a0: j	 0x10807f0 addiu a0, a0, -26532
 	ldloc.1
-	ldc.i4 -26996
+	ldc.i4 -26532
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_1080084:
-// 0x01080084: 0x1080084: bne   v0, v1, 0x10800a4 addiu s3, sp, 724
+L_10806a8:
+// 0x010806a8: 0x10806a8: bne   v0, v1, 0x10806c8 addiu s3, sp, 724
 	ldloc 5
 	ldloc 6
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 8
-	bne.un L_10800a4
+	bne.un L_10806c8
 // --- basic block ---
-// 0x0108008c: 0x108008c: jal   0x1001b48 addu  a0, s3, zero
+// 0x010806b0: 0x10806b0: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -1060,21 +1060,21 @@ L_1080084:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080094: 0x1080094: lui   a0, 0x20000
+// 0x010806b8: 0x10806b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080098: 0x1080098: addu  v1, v0, zero
+// 0x010806bc: 0x10806bc: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x0108009c: 0x108009c: j	 0x10800b8 addiu a0, a0, -26980
+// 0x010806c0: 0x10806c0: j	 0x10806dc addiu a0, a0, -26516
 	ldloc.1
-	ldc.i4 -26980
+	ldc.i4 -26516
 	add
 	stloc.1
-	br L_10800b8
+	br L_10806dc
 // --- basic block ---
-L_10800a4:
-// 0x010800a4: 0x10800a4: jal   0x1001b48 addu  a0, s3, zero
+L_10806c8:
+// 0x010806c8: 0x10806c8: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -1083,19 +1083,19 @@ L_10800a4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010800ac: 0x10800ac: lui   a0, 0x20000
+// 0x010806d0: 0x10806d0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010800b0: 0x10800b0: addu  v1, v0, zero
+// 0x010806d4: 0x10806d4: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x010800b4: 0x10800b4: addiu a0, a0, 9684
+// 0x010806d8: 0x10806d8: addiu a0, a0, 10144
 	ldloc.1
-	ldc.i4 9684
+	ldc.i4 10144
 	add
 	stloc.1
-L_10800b8:
-// 0x010800b8: 0x10800b8: jal   0x101cd60 sw    v1, 1448(sp)
+L_10806dc:
+// 0x010806dc: 0x10806dc: jal   0x101cd70 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1109,12 +1109,12 @@ L_10800b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010800c0: 0x10800c0: lw    v1, 1448(sp)
+// 0x010806e4: 0x10806e4: lw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1123,49 +1123,49 @@ L_10800b8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010800c4: 0x10800c4: addiu a1, zero, 700
+// 0x010806e8: 0x10806e8: addiu a1, zero, 700
 	ldc.i4 700
 	stloc.2
-// 0x010800c8: 0x10800c8: subu  a1, a1, v1
+// 0x010806ec: 0x10806ec: subu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-// 0x010800cc: 0x10800cc: addu  a0, s3, v1
+// 0x010806f0: 0x10806f0: addu  a0, s3, v1
 	ldloc 8
 	ldloc 6
 	add
 	stloc.1
-// 0x010800d0: 0x10800d0: lui   v1, 0x10000
+// 0x010806f4: 0x10806f4: lui   v1, 0x10000
 	ldc.i4 65536
 	stloc 6
-// 0x010800d4: 0x10800d4: j	 0x10801ec addiu a2, v1, 19912
+// 0x010806f8: 0x10806f8: j	 0x1080810 addiu a2, v1, 20332
 	ldloc 6
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-	br L_10801ec
+	br L_1080810
 // --- basic block ---
-L_10800dc:
-// 0x010800dc: 0x10800dc: addiu v1, zero, 5
+L_1080700:
+// 0x01080700: 0x1080700: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 6
-// 0x010800e0: 0x10800e0: bne   v0, v1, 0x1080108 addiu v1, zero, 6
+// 0x01080704: 0x1080704: bne   v0, v1, 0x108072c addiu v1, zero, 6
 	ldloc 5
 	ldloc 6
 	ldc.i4.6
 	stloc 6
-	bne.un L_1080108
+	bne.un L_108072c
 // --- basic block ---
-// 0x010800e8: 0x10800e8: addiu v1, sp, 724
+// 0x0108070c: 0x108070c: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x010800ec: 0x10800ec: addu  a0, v1, zero
+// 0x01080710: 0x1080710: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x010800f0: 0x10800f0: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x01080714: 0x1080714: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1180,36 +1180,36 @@ L_10800dc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010800f8: 0x10800f8: lui   a0, 0x10000
+// 0x0108071c: 0x108071c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010800fc: 0x10800fc: addu  s3, v0, zero
+// 0x01080720: 0x1080720: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01080100: 0x1080100: j	 0x10801cc addiu a0, a0, -19536
+// 0x01080724: 0x1080724: j	 0x10807f0 addiu a0, a0, -19536
 	ldloc.1
 	ldc.i4 -19536
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_1080108:
-// 0x01080108: 0x1080108: bne   v0, v1, 0x1080130 addiu v1, zero, 7
+L_108072c:
+// 0x0108072c: 0x108072c: bne   v0, v1, 0x1080754 addiu v1, zero, 7
 	ldloc 5
 	ldloc 6
 	ldc.i4.7
 	stloc 6
-	bne.un L_1080130
+	bne.un L_1080754
 // --- basic block ---
-// 0x01080110: 0x1080110: addiu v1, sp, 724
+// 0x01080734: 0x1080734: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x01080114: 0x1080114: addu  a0, v1, zero
+// 0x01080738: 0x1080738: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01080118: 0x1080118: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x0108073c: 0x108073c: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1224,36 +1224,36 @@ L_1080108:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080120: 0x1080120: lui   a0, 0x10000
+// 0x01080744: 0x1080744: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01080124: 0x1080124: addu  s3, v0, zero
+// 0x01080748: 0x1080748: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01080128: 0x1080128: j	 0x10801cc addiu a0, a0, -19488
+// 0x0108074c: 0x108074c: j	 0x10807f0 addiu a0, a0, -19488
 	ldloc.1
 	ldc.i4 -19488
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_1080130:
-// 0x01080130: 0x1080130: bne   v0, v1, 0x1080158 addiu v1, zero, 8
+L_1080754:
+// 0x01080754: 0x1080754: bne   v0, v1, 0x108077c addiu v1, zero, 8
 	ldloc 5
 	ldloc 6
 	ldc.i4.8
 	stloc 6
-	bne.un L_1080158
+	bne.un L_108077c
 // --- basic block ---
-// 0x01080138: 0x1080138: addiu v1, sp, 724
+// 0x0108075c: 0x108075c: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x0108013c: 0x108013c: addu  a0, v1, zero
+// 0x01080760: 0x1080760: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01080140: 0x1080140: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x01080764: 0x1080764: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1268,36 +1268,36 @@ L_1080130:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080148: 0x1080148: lui   a0, 0x10000
+// 0x0108076c: 0x108076c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108014c: 0x108014c: addu  s3, v0, zero
+// 0x01080770: 0x1080770: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01080150: 0x1080150: j	 0x10801cc addiu a0, a0, -19444
+// 0x01080774: 0x1080774: j	 0x10807f0 addiu a0, a0, -19444
 	ldloc.1
 	ldc.i4 -19444
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_1080158:
-// 0x01080158: 0x1080158: bne   v0, v1, 0x1080180 addiu v1, zero, 9
+L_108077c:
+// 0x0108077c: 0x108077c: bne   v0, v1, 0x10807a4 addiu v1, zero, 9
 	ldloc 5
 	ldloc 6
 	ldc.i4.s 9
 	stloc 6
-	bne.un L_1080180
+	bne.un L_10807a4
 // --- basic block ---
-// 0x01080160: 0x1080160: addiu v1, sp, 724
+// 0x01080784: 0x1080784: addiu v1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-// 0x01080164: 0x1080164: addu  a0, v1, zero
+// 0x01080788: 0x1080788: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01080168: 0x1080168: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x0108078c: 0x108078c: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1312,30 +1312,30 @@ L_1080158:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080170: 0x1080170: lui   a0, 0x20000
+// 0x01080794: 0x1080794: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080174: 0x1080174: addu  s3, v0, zero
+// 0x01080798: 0x1080798: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01080178: 0x1080178: j	 0x10801cc addiu a0, a0, -26960
+// 0x0108079c: 0x108079c: j	 0x10807f0 addiu a0, a0, -26496
 	ldloc.1
-	ldc.i4 -26960
+	ldc.i4 -26496
 	add
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_1080180:
-// 0x01080180: 0x1080180: bne   v0, v1, 0x10801b4 addiu v1, sp, 724
+L_10807a4:
+// 0x010807a4: 0x10807a4: bne   v0, v1, 0x10807d8 addiu v1, sp, 724
 	ldloc 5
 	ldloc 6
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 6
-	bne.un L_10801b4
+	bne.un L_10807d8
 // --- basic block ---
-// 0x01080188: 0x1080188: lw    a1, 1512(s0)
+// 0x010807ac: 0x10807ac: lw    a1, 1512(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -1344,14 +1344,14 @@ L_1080180:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108018c: 0x108018c: sll   zero, zero, 0
-// 0x01080190: 0x1080190: beq   a1, zero, 0x10801b4 addu  a0, v1, zero
+// 0x010807b0: 0x10807b0: sll   zero, zero, 0
+// 0x010807b4: 0x10807b4: beq   a1, zero, 0x10807d8 addu  a0, v1, zero
 	ldloc.2
 	ldloc 6
 	stloc.1
-	brfalse L_10801b4
+	brfalse L_10807d8
 // --- basic block ---
-// 0x01080198: 0x1080198: sw    a1, 1444(sp)
+// 0x010807bc: 0x10807bc: sw    a1, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1360,7 +1360,7 @@ L_1080180:
 	add
 	ldloc.2
 	stelem.i4
-// 0x0108019c: 0x108019c: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x010807c0: 0x10807c0: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1375,7 +1375,7 @@ L_1080180:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010801a4: 0x10801a4: lw    a1, 1444(sp)
+// 0x010807c8: 0x10807c8: lw    a1, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1384,19 +1384,19 @@ L_1080180:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010801a8: 0x10801a8: addu  s3, v0, zero
+// 0x010807cc: 0x10807cc: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010801ac: 0x10801ac: j	 0x10801cc addu  a0, a1, zero
+// 0x010807d0: 0x10807d0: j	 0x10807f0 addu  a0, a1, zero
 	ldloc.2
 	stloc.1
-	br L_10801cc
+	br L_10807f0
 // --- basic block ---
-L_10801b4:
-// 0x010801b4: 0x10801b4: addu  a0, v1, zero
+L_10807d8:
+// 0x010807d8: 0x10807d8: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x010801b8: 0x10801b8: jal   0x1001b48 sw    v1, 1448(sp)
+// 0x010807dc: 0x10807dc: jal   0x1001b48 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1411,30 +1411,30 @@ L_10801b4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010801c0: 0x10801c0: lui   a0, 0x10000
+// 0x010807e4: 0x10807e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010801c4: 0x10801c4: addu  s3, v0, zero
+// 0x010807e8: 0x10807e8: addu  s3, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010801c8: 0x10801c8: addiu a0, a0, -19132
+// 0x010807ec: 0x10807ec: addiu a0, a0, -19132
 	ldloc.1
 	ldc.i4 -19132
 	add
 	stloc.1
-L_10801cc:
-// 0x010801cc: 0x10801cc: jal   0x101cd60 sll   zero, zero, 0
+L_10807f0:
+// 0x010807f0: 0x10807f0: jal   0x101cd70 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010801d4: 0x10801d4: lw    v1, 1448(sp)
+// 0x010807f8: 0x10807f8: lw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1443,29 +1443,29 @@ L_10801cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010801d8: 0x10801d8: addiu a1, zero, 700
+// 0x010807fc: 0x10807fc: addiu a1, zero, 700
 	ldc.i4 700
 	stloc.2
-// 0x010801dc: 0x10801dc: lui   a2, 0x10000
+// 0x01080800: 0x1080800: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010801e0: 0x10801e0: subu  a1, a1, s3
+// 0x01080804: 0x1080804: subu  a1, a1, s3
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x010801e4: 0x10801e4: addu  a0, v1, s3
+// 0x01080808: 0x1080808: addu  a0, v1, s3
 	ldloc 6
 	ldloc 8
 	add
 	stloc.1
-// 0x010801e8: 0x10801e8: addiu a2, a2, 19912
+// 0x0108080c: 0x108080c: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-L_10801ec:
-// 0x010801ec: 0x10801ec: jal   0x1000f9c addu  a3, v0, zero
+L_1080810:
+// 0x01080810: 0x1080810: jal   0x1000f9c addu  a3, v0, zero
 	ldloc 5
 	stloc 4
 	ldloc.0
@@ -1478,16 +1478,16 @@ L_10801ec:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010801f4: 0x10801f4: addu  a3, zero, zero
+// 0x01080818: 0x1080818: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x010801f8: 0x10801f8: addiu a2, zero, 16
+// 0x0108081c: 0x108081c: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x010801fc: 0x10801fc: addu  a0, s8, zero
+// 0x01080820: 0x1080820: addu  a0, s8, zero
 	ldloc 13
 	stloc.1
-// 0x01080200: 0x1080200: jal   0x1098d10 addiu a1, sp, 724
+// 0x01080824: 0x1080824: jal   0x1099358 addiu a1, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
@@ -1497,26 +1497,26 @@ L_10801ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080208: 0x1080208: lui   a1, 0x20000
+// 0x0108082c: 0x108082c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108020c: 0x108020c: addu  a0, v0, zero
+// 0x01080830: 0x1080830: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080210: 0x1080210: addu  a2, zero, zero
+// 0x01080834: 0x1080834: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01080214: 0x1080214: addiu a1, a1, -23584
+// 0x01080838: 0x1080838: addiu a1, a1, -23120
 	ldloc.2
-	ldc.i4 -23584
+	ldc.i4 -23120
 	add
 	stloc.2
-// 0x01080218: 0x1080218: jal   0x1098fe0 sw    v0, 1444(sp)
+// 0x0108083c: 0x108083c: jal   0x1099628 sw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1528,9 +1528,9 @@ L_10801ec:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01080220: 0x1080220: lw    v0, 1444(sp)
+// 0x01080844: 0x1080844: lw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1539,13 +1539,13 @@ L_10801ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080224: 0x1080224: addu  a0, s2, zero
+// 0x01080848: 0x1080848: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x01080228: 0x1080228: addu  a1, v0, zero
+// 0x0108084c: 0x108084c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108022c: 0x108022c: jal   0x1098ec4 sb    zero, 724(sp)
+// 0x01080850: 0x1080850: jal   0x109950c sb    zero, 724(sp)
 	ldloc.0
 	ldc.i4 724
 	add
@@ -1553,22 +1553,22 @@ L_10801ec:
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080234: 0x1080234: addiu a0, sp, 64
+// 0x01080858: 0x1080858: addiu a0, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
 	stloc.1
-// 0x01080238: 0x1080238: addiu a1, sp, 84
+// 0x0108085c: 0x108085c: addiu a1, sp, 84
 	ldloc.0
 	ldc.i4.s 84
 	add
 	stloc.2
-// 0x0108023c: 0x108023c: jal   0x1029da8 addiu a2, sp, 24
+// 0x01080860: 0x1080860: jal   0x1029db8 addiu a2, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1578,24 +1578,24 @@ L_10801ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080244: 0x1080244: addiu v1, zero, -1
+// 0x01080868: 0x1080868: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01080248: 0x1080248: bne   v0, v1, 0x10802b4 lui   a0, 0x20000
+// 0x0108086c: 0x108086c: bne   v0, v1, 0x10808d8 lui   a0, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc.1
-	bne.un L_10802b4
+	bne.un L_10808d8
 // --- basic block ---
-// 0x01080250: 0x1080250: jal   0x101df50 addiu a0, a0, 6792
+// 0x01080874: 0x1080874: jal   0x101df60 addiu a0, a0, 7256
 	ldloc.1
-	ldc.i4 6792
+	ldc.i4 7256
 	add
 	stloc.1
 	ldloc.0
@@ -1603,37 +1603,37 @@ L_10801ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080258: 0x1080258: beq   v0, zero, 0x1080280 lui   v1, 0x2120000
+// 0x0108087c: 0x108087c: beq   v0, zero, 0x10808a4 lui   v1, 0x2120000
 	ldloc 5
 	ldc.i4 34734080
 	stloc 6
-	brfalse L_1080280
+	brfalse L_10808a4
 // --- basic block ---
-// 0x01080260: 0x1080260: lw    a0, 0(v0)
+// 0x01080884: 0x1080884: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01080264: 0x1080264: ori   v1, v1, 60730
+// 0x01080888: 0x1080888: ori   v1, v1, 60730
 	ldloc 6
 	ldc.i4 60730
 	or
 	stloc 6
-// 0x01080268: 0x1080268: bne   a0, v1, 0x1080294 lui   v1, 0x1e90000
+// 0x0108088c: 0x108088c: bne   a0, v1, 0x10808b8 lui   v1, 0x1e90000
 	ldloc.1
 	ldloc 6
 	ldc.i4 32047104
 	stloc 6
-	bne.un L_1080294
+	bne.un L_10808b8
 // --- basic block ---
-// 0x01080270: 0x1080270: lw    a0, 4(v0)
+// 0x01080894: 0x1080894: lw    a0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1642,21 +1642,21 @@ L_10801ec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01080274: 0x1080274: ori   v1, v1, 58906
+// 0x01080898: 0x1080898: ori   v1, v1, 58906
 	ldloc 6
 	ldc.i4 58906
 	or
 	stloc 6
-// 0x01080278: 0x1080278: bne   a0, v1, 0x1080294 sll   zero, zero, 0
+// 0x0108089c: 0x108089c: bne   a0, v1, 0x10808b8 sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	bne.un L_1080294
+	bne.un L_10808b8
 // --- basic block ---
-L_1080280:
-// 0x01080280: 0x1080280: lui   a0, 0x10000
+L_10808a4:
+// 0x010808a4: 0x10808a4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01080284: 0x1080284: jal   0x101df50 addiu a0, a0, -31052
+// 0x010808a8: 0x10808a8: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -1666,24 +1666,24 @@ L_1080280:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108028c: 0x108028c: beq   v0, zero, 0x10802a4 sll   zero, zero, 0
+// 0x010808b0: 0x10808b0: beq   v0, zero, 0x10808c8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10802a4
+	brfalse L_10808c8
 // --- basic block ---
-L_1080294:
-// 0x01080294: 0x1080294: lw    v1, 0(v0)
+L_10808b8:
+// 0x010808b8: 0x10808b8: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01080298: 0x1080298: lw    v0, 4(v0)
+// 0x010808bc: 0x10808bc: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1692,7 +1692,7 @@ L_1080294:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108029c: 0x108029c: j	 0x10802ac sw    v1, 40(sp)
+// 0x010808c0: 0x10808c0: j	 0x10808d0 sw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1701,13 +1701,13 @@ L_1080294:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10802ac
+	br L_10808d0
 // --- basic block ---
-L_10802a4:
-// 0x010802a4: 0x10802a4: addiu v0, zero, -1
+L_10808c8:
+// 0x010808c8: 0x10808c8: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010802a8: 0x10802a8: sw    v0, 40(sp)
+// 0x010808cc: 0x10808cc: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1716,8 +1716,8 @@ L_10802a4:
 	add
 	ldloc 5
 	stelem.i4
-L_10802ac:
-// 0x010802ac: 0x10802ac: j	 0x10802cc sw    v0, 44(sp)
+L_10808d0:
+// 0x010808d0: 0x10808d0: j	 0x10808f0 sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1726,10 +1726,10 @@ L_10802ac:
 	add
 	ldloc 5
 	stelem.i4
-	br L_10802cc
+	br L_10808f0
 // --- basic block ---
-L_10802b4:
-// 0x010802b4: 0x10802b4: lw    v0, 68(sp)
+L_10808d8:
+// 0x010808d8: 0x10808d8: lw    v0, 68(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1738,8 +1738,8 @@ L_10802b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010802b8: 0x10802b8: sll   zero, zero, 0
-// 0x010802bc: 0x10802bc: sw    v0, 44(sp)
+// 0x010808dc: 0x10808dc: sll   zero, zero, 0
+// 0x010808e0: 0x10808e0: sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1748,7 +1748,7 @@ L_10802b4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010802c0: 0x10802c0: lw    v0, 64(sp)
+// 0x010808e4: 0x10808e4: lw    v0, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1757,8 +1757,8 @@ L_10802b4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010802c4: 0x10802c4: sll   zero, zero, 0
-// 0x010802c8: 0x10802c8: sw    v0, 40(sp)
+// 0x010808e8: 0x10808e8: sll   zero, zero, 0
+// 0x010808ec: 0x10808ec: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1767,8 +1767,8 @@ L_10802b4:
 	add
 	ldloc 5
 	stelem.i4
-L_10802cc:
-// 0x010802cc: 0x10802cc: lw    v1, 44(sp)
+L_10808f0:
+// 0x010808f0: 0x10808f0: lw    v1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1777,15 +1777,15 @@ L_10802cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010802d0: 0x10802d0: addiu v0, zero, -1
+// 0x010808f4: 0x10808f4: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010802d4: 0x10802d4: beq   v1, v0, 0x108035c sll   zero, zero, 0
+// 0x010808f8: 0x10808f8: beq   v1, v0, 0x1080980 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_108035c
+	beq  L_1080980
 // --- basic block ---
-// 0x010802dc: 0x10802dc: lw    v1, 40(sp)
+// 0x01080900: 0x1080900: lw    v1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1794,17 +1794,17 @@ L_10802cc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010802e0: 0x10802e0: sll   zero, zero, 0
-// 0x010802e4: 0x10802e4: beq   v1, v0, 0x108035c addiu a1, sp, 32
+// 0x01080904: 0x1080904: sll   zero, zero, 0
+// 0x01080908: 0x1080908: beq   v1, v0, 0x1080980 addiu a1, sp, 32
 	ldloc 6
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.2
-	beq  L_108035c
+	beq  L_1080980
 // --- basic block ---
-// 0x010802ec: 0x10802ec: jal   0x1008eb0 addiu a0, sp, 40
+// 0x01080910: 0x1080910: jal   0x1008ec0 addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1814,25 +1814,25 @@ L_10802cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010802f4: 0x10802f4: addu  s5, v0, zero
+// 0x01080918: 0x1080918: addu  s5, v0, zero
 	ldloc 5
 	stloc 14
-// 0x010802f8: 0x10802f8: jal   0x1007df4 addu  a0, v0, zero
+// 0x0108091c: 0x108091c: jal   0x1007e04 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x01080300: 0x1080300: addu  a0, s5, zero
+// 0x01080924: 0x1080924: addu  a0, s5, zero
 	ldloc 14
 	stloc.1
-// 0x01080304: 0x1080304: jal   0x1007e18 sw    v0, 1444(sp)
+// 0x01080928: 0x1080928: jal   0x1007e28 sw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1842,15 +1842,15 @@ L_10802cc:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108030c: 0x108030c: addiu v1, zero, 10
+// 0x01080930: 0x1080930: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x01080310: 0x1080310: div   v0, v1
+// 0x01080934: 0x1080934: div   v0, v1
 	ldloc 5
 	ldloc 6
 	ldloc 5
@@ -1859,7 +1859,7 @@ L_10802cc:
 	stloc 19
 	rem
 	stloc 18
-// 0x01080314: 0x1080314: lw    a3, 1444(sp)
+// 0x01080938: 0x1080938: lw    a3, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1868,26 +1868,26 @@ L_10802cc:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01080318: 0x1080318: lui   a2, 0x10000
+// 0x0108093c: 0x108093c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x0108031c: 0x108031c: addiu a2, a2, 8928
+// 0x01080940: 0x1080940: addiu a2, a2, 8924
 	ldloc.3
-	ldc.i4 8928
+	ldc.i4 8924
 	add
 	stloc.3
-// 0x01080320: 0x1080320: addiu a1, zero, 100
+// 0x01080944: 0x1080944: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x01080324: 0x1080324: addiu a0, sp, 224
+// 0x01080948: 0x1080948: addiu a0, sp, 224
 	ldloc.0
 	ldc.i4 224
 	add
 	stloc.1
-// 0x01080328: 0x1080328: mfhi  hi
+// 0x0108094c: 0x108094c: mfhi  hi
 	ldloc 18
 	stloc 5
-// 0x0108032c: 0x108032c: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01080950: 0x1080950: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1906,11 +1906,11 @@ L_10802cc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080334: 0x1080334: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x01080958: 0x1080958: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x0108033c: 0x108033c: jal   0x101cd60 addu  a0, v0, zero
+// 0x01080960: 0x1080960: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1918,28 +1918,28 @@ L_10802cc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080344: 0x1080344: lui   a2, 0x10000
+// 0x01080968: 0x1080968: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01080348: 0x1080348: addiu a2, a2, 19912
+// 0x0108096c: 0x108096c: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x0108034c: 0x108034c: addu  a3, v0, zero
+// 0x01080970: 0x1080970: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01080350: 0x1080350: addiu a0, sp, 104
+// 0x01080974: 0x1080974: addiu a0, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
 	stloc.1
-// 0x01080354: 0x1080354: jal   0x1000f9c addiu a1, zero, 20
+// 0x01080978: 0x1080978: jal   0x1000f9c addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -1952,22 +1952,22 @@ L_10802cc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108035c:
-// 0x0108035c: 0x108035c: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+L_1080980:
+// 0x01080980: 0x1080980: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01080364: 0x1080364: beq   v0, zero, 0x1080378 sll   zero, zero, 0
+// 0x01080988: 0x1080988: beq   v0, zero, 0x108099c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1080378
+	brfalse L_108099c
 // --- basic block ---
-// 0x0108036c: 0x108036c: addiu a0, zero, 110
+// 0x01080990: 0x1080990: addiu a0, zero, 110
 	ldc.i4.s 110
 	stloc.1
-// 0x01080370: 0x1080370: addiu s6, zero, 10
+// 0x01080994: 0x1080994: addiu s6, zero, 10
 	ldc.i4.s 10
 	stloc 15
-// 0x01080374: 0x1080374: sw    a0, 1436(sp)
+// 0x01080998: 0x1080998: sw    a0, 1436(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1976,26 +1976,26 @@ L_108035c:
 	add
 	ldloc.1
 	stelem.i4
-L_1080378:
-// 0x01080378: 0x1080378: lui   a0, 0x10000
+L_108099c:
+// 0x0108099c: 0x108099c: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x0108037c: 0x108037c: ori   a3, zero, 32770
+// 0x010809a0: 0x10809a0: ori   a3, zero, 32770
 	ldc.i4.s 0
 	ldc.i4 32770
 	or
 	stloc 4
-// 0x01080380: 0x1080380: addiu a1, sp, 224
+// 0x010809a4: 0x10809a4: addiu a1, sp, 224
 	ldloc.0
 	ldc.i4 224
 	add
 	stloc.2
-// 0x01080384: 0x1080384: addiu a2, zero, 16
+// 0x010809a8: 0x10809a8: addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
-// 0x01080388: 0x1080388: jal   0x1098d10 addiu a0, a0, -14588
+// 0x010809ac: 0x10809ac: jal   0x1099358 addiu a0, a0, -14592
 	ldloc.1
-	ldc.i4 -14588
+	ldc.i4 -14592
 	add
 	stloc.1
 	ldloc.0
@@ -2003,21 +2003,21 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080390: 0x1080390: addu  a0, v0, zero
+// 0x010809b4: 0x10809b4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080394: 0x1080394: addu  a2, s6, zero
+// 0x010809b8: 0x10809b8: addu  a2, s6, zero
 	ldloc 15
 	stloc.3
-// 0x01080398: 0x1080398: addu  a1, zero, zero
+// 0x010809bc: 0x10809bc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108039c: 0x108039c: jal   0x1098f84 sw    v0, 1444(sp)
+// 0x010809c0: 0x10809c0: jal   0x10995cc sw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2031,12 +2031,12 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010803a4: 0x10803a4: lw    v0, 1444(sp)
+// 0x010809c8: 0x10809c8: lw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2045,26 +2045,26 @@ L_1080378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010803a8: 0x10803a8: addu  a0, s2, zero
+// 0x010809cc: 0x10809cc: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010803ac: 0x10803ac: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010809d0: 0x10809d0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010803b4: 0x10803b4: addu  a0, s2, zero
+// 0x010809d8: 0x10809d8: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010803b8: 0x10803b8: addiu a1, zero, 5
+// 0x010809dc: 0x10809dc: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x010803bc: 0x10803bc: jal   0x109434c addiu a2, zero, 2
+// 0x010809e0: 0x10809e0: jal   0x1094970 addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -2072,30 +2072,30 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_hspace_109434c(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_hspace_1094970(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010803c4: 0x10803c4: lui   a0, 0x20000
+// 0x010809e8: 0x10809e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010803c8: 0x10803c8: ori   a3, zero, 32778
+// 0x010809ec: 0x10809ec: ori   a3, zero, 32778
 	ldc.i4.s 0
 	ldc.i4 32778
 	or
 	stloc 4
-// 0x010803cc: 0x10803cc: addiu a0, a0, -23576
+// 0x010809f0: 0x10809f0: addiu a0, a0, -23112
 	ldloc.1
-	ldc.i4 -23576
+	ldc.i4 -23112
 	add
 	stloc.1
-// 0x010803d0: 0x10803d0: addiu a1, sp, 104
+// 0x010809f4: 0x10809f4: addiu a1, sp, 104
 	ldloc.0
 	ldc.i4.s 104
 	add
 	stloc.2
-// 0x010803d4: 0x10803d4: jal   0x1098d10 addiu a2, zero, 16
+// 0x010809f8: 0x10809f8: jal   0x1099358 addiu a2, zero, 16
 	ldc.i4.s 16
 	stloc.3
 	ldloc.0
@@ -2103,21 +2103,21 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010803dc: 0x10803dc: addu  a0, v0, zero
+// 0x01080a00: 0x1080a00: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010803e0: 0x10803e0: addu  a2, s6, zero
+// 0x01080a04: 0x1080a04: addu  a2, s6, zero
 	ldloc 15
 	stloc.3
-// 0x010803e4: 0x10803e4: addu  a1, zero, zero
+// 0x01080a08: 0x1080a08: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010803e8: 0x10803e8: jal   0x1098f84 sw    v0, 1444(sp)
+// 0x01080a0c: 0x1080a0c: jal   0x10995cc sw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2131,12 +2131,12 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010803f0: 0x10803f0: lw    v0, 1444(sp)
+// 0x01080a14: 0x1080a14: lw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2145,25 +2145,25 @@ L_1080378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010803f4: 0x10803f4: addiu s3, sp, 724
+// 0x01080a18: 0x1080a18: addiu s3, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 8
-// 0x010803f8: 0x10803f8: addu  a1, v0, zero
+// 0x01080a1c: 0x1080a1c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010803fc: 0x10803fc: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01080a20: 0x1080a20: jal   0x109950c addu  a0, s2, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080404: 0x1080404: jal   0x1001b48 addu  a0, s3, zero
+// 0x01080a28: 0x1080a28: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2172,28 +2172,28 @@ L_1080378:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108040c: 0x108040c: addiu v1, zero, 700
+// 0x01080a30: 0x1080a30: addiu v1, zero, 700
 	ldc.i4 700
 	stloc 6
-// 0x01080410: 0x1080410: lui   a2, 0x10000
+// 0x01080a34: 0x1080a34: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01080414: 0x1080414: subu  a1, v1, v0
+// 0x01080a38: 0x1080a38: subu  a1, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc.2
-// 0x01080418: 0x1080418: addiu a2, a2, -10176
+// 0x01080a3c: 0x1080a3c: addiu a2, a2, -10180
 	ldloc.3
-	ldc.i4 -10176
+	ldc.i4 -10180
 	add
 	stloc.3
-// 0x0108041c: 0x108041c: addiu a3, s0, 557
+// 0x01080a40: 0x1080a40: addiu a3, s0, 557
 	ldloc 9
 	ldc.i4 557
 	add
 	stloc 4
-// 0x01080420: 0x1080420: jal   0x1000f9c addu  a0, s3, v0
+// 0x01080a44: 0x1080a44: jal   0x1000f9c addu  a0, s3, v0
 	ldloc 8
 	ldloc 5
 	add
@@ -2208,16 +2208,16 @@ L_1080378:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080428: 0x1080428: addiu a3, zero, 8
+// 0x01080a4c: 0x1080a4c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x0108042c: 0x108042c: addu  a0, s8, zero
+// 0x01080a50: 0x1080a50: addu  a0, s8, zero
 	ldloc 13
 	stloc.1
-// 0x01080430: 0x1080430: addu  a1, s3, zero
+// 0x01080a54: 0x1080a54: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x01080434: 0x1080434: jal   0x1098d10 addiu a2, zero, 14
+// 0x01080a58: 0x1080a58: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -2225,26 +2225,26 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108043c: 0x108043c: lui   a1, 0x0
+// 0x01080a60: 0x1080a60: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01080440: 0x1080440: addu  a2, zero, zero
+// 0x01080a64: 0x1080a64: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01080444: 0x1080444: addu  a0, v0, zero
+// 0x01080a68: 0x1080a68: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080448: 0x1080448: addiu a1, a1, 31980
+// 0x01080a6c: 0x1080a6c: addiu a1, a1, 31980
 	ldloc.2
 	ldc.i4 31980
 	add
 	stloc.2
-// 0x0108044c: 0x108044c: jal   0x1098fe0 sw    v0, 1444(sp)
+// 0x01080a70: 0x1080a70: jal   0x1099628 sw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2256,9 +2256,9 @@ L_1080378:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01080454: 0x1080454: lw    v0, 1444(sp)
+// 0x01080a78: 0x1080a78: lw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2267,13 +2267,13 @@ L_1080378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080458: 0x1080458: addu  a0, s2, zero
+// 0x01080a7c: 0x1080a7c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0108045c: 0x108045c: addu  a1, v0, zero
+// 0x01080a80: 0x1080a80: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01080460: 0x1080460: jal   0x1098ec4 sb    zero, 724(sp)
+// 0x01080a84: 0x1080a84: jal   0x109950c sb    zero, 724(sp)
 	ldloc.0
 	ldc.i4 724
 	add
@@ -2281,12 +2281,12 @@ L_1080378:
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080468: 0x1080468: jal   0x1001b48 addu  a0, s3, zero
+// 0x01080a8c: 0x1080a8c: jal   0x1001b48 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -2295,28 +2295,28 @@ L_1080378:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080470: 0x1080470: addiu a0, zero, 700
+// 0x01080a94: 0x1080a94: addiu a0, zero, 700
 	ldc.i4 700
 	stloc.1
-// 0x01080474: 0x1080474: lui   a2, 0x10000
+// 0x01080a98: 0x1080a98: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01080478: 0x1080478: subu  a1, a0, v0
+// 0x01080a9c: 0x1080a9c: subu  a1, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.2
-// 0x0108047c: 0x108047c: addiu a2, a2, -10176
+// 0x01080aa0: 0x1080aa0: addiu a2, a2, -10180
 	ldloc.3
-	ldc.i4 -10176
+	ldc.i4 -10180
 	add
 	stloc.3
-// 0x01080480: 0x1080480: addiu a3, s0, 156
+// 0x01080aa4: 0x1080aa4: addiu a3, s0, 156
 	ldloc 9
 	ldc.i4 156
 	add
 	stloc 4
-// 0x01080484: 0x1080484: jal   0x1000f9c addu  a0, s3, v0
+// 0x01080aa8: 0x1080aa8: jal   0x1000f9c addu  a0, s3, v0
 	ldloc 8
 	ldloc 5
 	add
@@ -2331,16 +2331,16 @@ L_1080378:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108048c: 0x108048c: addu  a0, s8, zero
+// 0x01080ab0: 0x1080ab0: addu  a0, s8, zero
 	ldloc 13
 	stloc.1
-// 0x01080490: 0x1080490: addu  a1, s3, zero
+// 0x01080ab4: 0x1080ab4: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x01080494: 0x1080494: addiu a2, zero, 14
+// 0x01080ab8: 0x1080ab8: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01080498: 0x1080498: jal   0x1098d10 ori   a3, zero, 32776
+// 0x01080abc: 0x1080abc: jal   0x1099358 ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
@@ -2350,18 +2350,18 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010804a0: 0x10804a0: addu  a1, v0, zero
+// 0x01080ac4: 0x1080ac4: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010804a4: 0x10804a4: addu  a0, s2, zero
+// 0x01080ac8: 0x1080ac8: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x010804a8: 0x10804a8: jal   0x1098ec4 sb    zero, 724(sp)
+// 0x01080acc: 0x1080acc: jal   0x109950c sb    zero, 724(sp)
 	ldloc.0
 	ldc.i4 724
 	add
@@ -2369,48 +2369,48 @@ L_1080378:
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010804b0: 0x10804b0: lb    v0, 1624(s0)
+// 0x01080ad4: 0x1080ad4: lb    v0, 1624(s0)
 	ldloc 9
 	ldc.i4 1624
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010804b4: 0x10804b4: sll   zero, zero, 0
-// 0x010804b8: 0x10804b8: bne   v0, zero, 0x1080884 addu  a0, s3, zero
+// 0x01080ad8: 0x1080ad8: sll   zero, zero, 0
+// 0x01080adc: 0x1080adc: bne   v0, zero, 0x1080ea8 addu  a0, s3, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
-	brtrue L_1080884
+	brtrue L_1080ea8
 // --- basic block ---
-// 0x010804c0: 0x10804c0: addu  a0, s0, zero
+// 0x01080ae4: 0x1080ae4: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010804c4: 0x10804c4: addiu a1, sp, 324
+// 0x01080ae8: 0x1080ae8: addiu a1, sp, 324
 	ldloc.0
 	ldc.i4 324
 	add
 	stloc.2
-// 0x010804c8: 0x10804c8: addiu a2, zero, 200
+// 0x01080aec: 0x1080aec: addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
-// 0x010804cc: 0x10804cc: sb    zero, 724(sp)
+// 0x01080af0: 0x1080af0: sb    zero, 724(sp)
 	ldloc.0
 	ldc.i4 724
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010804d0: 0x10804d0: sb    zero, 324(sp)
+// 0x01080af4: 0x1080af4: sb    zero, 324(sp)
 	ldloc.0
 	ldc.i4 324
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010804d4: 0x10804d4: jal   0x1079534 sb    zero, 524(sp)
+// 0x01080af8: 0x1080af8: jal   0x1079b58 sb    zero, 524(sp)
 	ldloc.0
 	ldc.i4 524
 	add
@@ -2421,31 +2421,31 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_get_report_info_str_1079534(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_get_report_info_str_1079b58(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010804dc: 0x10804dc: lb    v0, 32(s0)
+// 0x01080b00: 0x1080b00: lb    v0, 32(s0)
 	ldloc 9
 	ldc.i4.s 32
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x010804e0: 0x10804e0: sll   zero, zero, 0
-// 0x010804e4: 0x10804e4: beq   v0, zero, 0x10804fc sll   zero, zero, 0
+// 0x01080b04: 0x1080b04: sll   zero, zero, 0
+// 0x01080b08: 0x1080b08: beq   v0, zero, 0x1080b20 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10804fc
+	brfalse L_1080b20
 // --- basic block ---
-// 0x010804ec: 0x10804ec: addu  a0, s0, zero
+// 0x01080b10: 0x1080b10: addu  a0, s0, zero
 	ldloc 9
 	stloc.1
-// 0x010804f0: 0x10804f0: addiu a1, sp, 524
+// 0x01080b14: 0x1080b14: addiu a1, sp, 524
 	ldloc.0
 	ldc.i4 524
 	add
 	stloc.2
-// 0x010804f4: 0x10804f4: jal   0x1077fd8 addiu a2, zero, 200
+// 0x01080b18: 0x1080b18: jal   0x10785fc addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
 	ldloc.0
@@ -2453,42 +2453,42 @@ L_1080378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_get_reported_by_string_1077fd8(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_get_reported_by_string_10785fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10804fc:
-// 0x010804fc: 0x10804fc: addiu s3, sp, 724
+L_1080b20:
+// 0x01080b20: 0x1080b20: addiu s3, sp, 724
 	ldloc.0
 	ldc.i4 724
 	add
 	stloc 8
-// 0x01080500: 0x1080500: lui   a2, 0x20000
+// 0x01080b24: 0x1080b24: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01080504: 0x1080504: addiu a2, a2, -6888
+// 0x01080b28: 0x1080b28: addiu a2, a2, -6424
 	ldloc.3
-	ldc.i4 -6888
+	ldc.i4 -6424
 	add
 	stloc.3
-// 0x01080508: 0x1080508: addu  a0, s3, zero
+// 0x01080b2c: 0x1080b2c: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x0108050c: 0x108050c: addiu a1, zero, 700
+// 0x01080b30: 0x1080b30: addiu a1, zero, 700
 	ldc.i4 700
 	stloc.2
-// 0x01080510: 0x1080510: addiu a3, sp, 324
+// 0x01080b34: 0x1080b34: addiu a3, sp, 324
 	ldloc.0
 	ldc.i4 324
 	add
 	stloc 4
-// 0x01080514: 0x1080514: addiu v0, sp, 524
+// 0x01080b38: 0x1080b38: addiu v0, sp, 524
 	ldloc.0
 	ldc.i4 524
 	add
 	stloc 5
-// 0x01080518: 0x1080518: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01080b3c: 0x1080b3c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2507,27 +2507,27 @@ L_10804fc:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080520: 0x1080520: lui   a0, 0x20000
+// 0x01080b44: 0x1080b44: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080524: 0x1080524: addu  a1, s3, zero
+// 0x01080b48: 0x1080b48: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x01080528: 0x1080528: addiu a0, a0, -24824
+// 0x01080b4c: 0x1080b4c: addiu a0, a0, -24360
 	ldloc.1
-	ldc.i4 -24824
+	ldc.i4 -24360
 	add
 	stloc.1
-// 0x0108052c: 0x108052c: addiu a2, zero, 12
+// 0x01080b50: 0x1080b50: addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
-// 0x01080530: 0x1080530: ori   a3, zero, 33280
+// 0x01080b54: 0x1080b54: ori   a3, zero, 33280
 	ldc.i4.s 0
 	ldc.i4 33280
 	or
 	stloc 4
-L_1080534:
-// 0x01080534: 0x1080534: jal   0x1098d10 addiu s3, sp, 124
+L_1080b58:
+// 0x01080b58: 0x1080b58: jal   0x1099358 addiu s3, sp, 124
 	ldloc.0
 	ldc.i4.s 124
 	add
@@ -2537,26 +2537,26 @@ L_1080534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108053c: 0x108053c: lui   a1, 0x20000
+// 0x01080b60: 0x1080b60: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080540: 0x1080540: addu  a0, v0, zero
+// 0x01080b64: 0x1080b64: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080544: 0x1080544: addu  a2, zero, zero
+// 0x01080b68: 0x1080b68: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01080548: 0x1080548: addiu a1, a1, -23552
+// 0x01080b6c: 0x1080b6c: addiu a1, a1, -23088
 	ldloc.2
-	ldc.i4 -23552
+	ldc.i4 -23088
 	add
 	stloc.2
-// 0x0108054c: 0x108054c: jal   0x1098fe0 sw    v0, 1444(sp)
+// 0x01080b70: 0x1080b70: jal   0x1099628 sw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2568,9 +2568,9 @@ L_1080534:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01080554: 0x1080554: lw    v0, 1444(sp)
+// 0x01080b78: 0x1080b78: lw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2579,38 +2579,38 @@ L_1080534:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080558: 0x1080558: addu  a0, s2, zero
+// 0x01080b7c: 0x1080b7c: addu  a0, s2, zero
 	ldloc 11
 	stloc.1
-// 0x0108055c: 0x108055c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01080b80: 0x1080b80: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080564: 0x1080564: lw    a3, 0(s0)
+// 0x01080b88: 0x1080b88: lw    a3, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01080568: 0x1080568: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x01080b8c: 0x1080b8c: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x0108056c: 0x108056c: addiu a2, a2, -13884
+// 0x01080b90: 0x1080b90: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x01080570: 0x1080570: addiu a1, zero, 100
+// 0x01080b94: 0x1080b94: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x01080574: 0x1080574: jal   0x1000f9c addu  a0, s3, zero
+// 0x01080b98: 0x1080b98: jal   0x1000f9c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2623,7 +2623,7 @@ L_1080534:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108057c: 0x108057c: jal   0x1001ba8 addu  a0, s3, zero
+// 0x01080ba0: 0x1080ba0: jal   0x1001ba8 addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -2636,20 +2636,20 @@ L_1080534:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080584: 0x1080584: sll   v1, s1, 2
+// 0x01080ba8: 0x1080ba8: sll   v1, s1, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01080588: 0x1080588: addu  v1, v1, s4
+// 0x01080bac: 0x1080bac: addu  v1, v1, s4
 	ldloc 6
 	ldloc 12
 	add
 	stloc 6
-// 0x0108058c: 0x108058c: addu  a0, s3, zero
+// 0x01080bb0: 0x1080bb0: addu  a0, s3, zero
 	ldloc 8
 	stloc.1
-// 0x01080590: 0x1080590: jal   0x1001ba8 sw    v0, 0(v1)
+// 0x01080bb4: 0x1080bb4: jal   0x1001ba8 sw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2666,29 +2666,29 @@ L_1080534:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080598: 0x1080598: addiu v1, s1, 100
+// 0x01080bbc: 0x1080bbc: addiu v1, s1, 100
 	ldloc 10
 	ldc.i4.s 100
 	add
 	stloc 6
-// 0x0108059c: 0x108059c: sll   v1, v1, 2
+// 0x01080bc0: 0x1080bc0: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010805a0: 0x10805a0: addu  v1, v1, s4
+// 0x01080bc4: 0x1080bc4: addu  v1, v1, s4
 	ldloc 6
 	ldloc 12
 	add
 	stloc 6
-// 0x010805a4: 0x10805a4: lw    a0, 0(s0)
+// 0x01080bc8: 0x1080bc8: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010805a8: 0x10805a8: jal   0x107756c sw    v0, 0(v1)
+// 0x01080bcc: 0x1080bcc: jal   0x1077b90 sw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -2700,12 +2700,12 @@ L_1080534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Icon_107756c(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Icon_1077b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010805b0: 0x10805b0: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01080bd4: 0x1080bd4: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2718,22 +2718,22 @@ L_1080534:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010805b8: 0x10805b8: addiu v1, s1, 200
+// 0x01080bdc: 0x1080bdc: addiu v1, s1, 200
 	ldloc 10
 	ldc.i4 200
 	add
 	stloc 6
-// 0x010805bc: 0x10805bc: sll   v1, v1, 2
+// 0x01080be0: 0x1080be0: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010805c0: 0x10805c0: addu  v1, v1, s4
+// 0x01080be4: 0x1080be4: addu  v1, v1, s4
 	ldloc 6
 	ldloc 12
 	add
 	stloc 6
-// 0x010805c4: 0x10805c4: lw    a2, 1436(sp)
+// 0x01080be8: 0x1080be8: lw    a2, 1436(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2742,31 +2742,31 @@ L_1080534:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010805c8: 0x10805c8: lui   a0, 0x20000
+// 0x01080bec: 0x1080bec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010805cc: 0x10805cc: sw    v0, 0(v1)
+// 0x01080bf0: 0x1080bf0: sw    v0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x010805d0: 0x10805d0: addiu a3, zero, -2
+// 0x01080bf4: 0x1080bf4: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x010805d4: 0x10805d4: addiu a0, a0, -23544
+// 0x01080bf8: 0x1080bf8: addiu a0, a0, -23080
 	ldloc.1
-	ldc.i4 -23544
+	ldc.i4 -23080
 	add
 	stloc.1
-// 0x010805d8: 0x10805d8: addu  a1, zero, zero
+// 0x01080bfc: 0x1080bfc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010805dc: 0x10805dc: addiu v0, zero, 2064
+// 0x01080c00: 0x1080c00: addiu v0, zero, 2064
 	ldc.i4 2064
 	stloc 5
-// 0x010805e0: 0x10805e0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01080c04: 0x1080c04: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2780,36 +2780,36 @@ L_1080534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010805e8: 0x10805e8: addu  a0, v0, zero
+// 0x01080c0c: 0x1080c0c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010805ec: 0x10805ec: addu  a1, zero, zero
+// 0x01080c10: 0x1080c10: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010805f0: 0x10805f0: addu  a2, zero, zero
+// 0x01080c14: 0x1080c14: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010805f4: 0x10805f4: jal   0x1098fe0 addu  s3, v0, zero
+// 0x01080c18: 0x1080c18: jal   0x1099628 addu  s3, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010805fc: 0x10805fc: lw    a0, 0(s0)
+// 0x01080c20: 0x1080c20: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01080600: 0x1080600: jal   0x107756c sw    zero, 1428(sp)
+// 0x01080c24: 0x1080c24: jal   0x1077b90 sw    zero, 1428(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2823,12 +2823,12 @@ L_1080534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Icon_107756c(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Icon_1077b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080608: 0x1080608: jal   0x1001ba8 addu  a0, v0, zero
+// 0x01080c2c: 0x1080c2c: jal   0x1001ba8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2841,36 +2841,36 @@ L_1080534:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080610: 0x1080610: lw    a0, 0(s0)
+// 0x01080c34: 0x1080c34: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01080614: 0x1080614: jal   0x107756c sll   zero, zero, 0
+// 0x01080c38: 0x1080c38: jal   0x1077b90 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Icon_107756c(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Icon_1077b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108061c: 0x108061c: lui   a0, 0x10000
+// 0x01080c40: 0x1080c40: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01080620: 0x1080620: addu  a1, v0, zero
+// 0x01080c44: 0x1080c44: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01080624: 0x1080624: addiu a0, a0, -27784
+// 0x01080c48: 0x1080c48: addiu a0, a0, -27784
 	ldloc.1
 	ldc.i4 -27784
 	add
 	stloc.1
-// 0x01080628: 0x1080628: jal   0x109e13c addiu a2, zero, 1
+// 0x01080c4c: 0x1080c4c: jal   0x109e784 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -2878,23 +2878,23 @@ L_1080534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080630: 0x1080630: addu  a0, v0, zero
+// 0x01080c54: 0x1080c54: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080634: 0x1080634: addu  a2, zero, zero
+// 0x01080c58: 0x1080c58: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01080638: 0x1080638: addiu a1, sp, 56
+// 0x01080c5c: 0x1080c5c: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x0108063c: 0x108063c: jal   0x1099350 sw    v0, 1424(sp)
+// 0x01080c60: 0x1080c60: jal   0x1099998 sw    v0, 1424(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2908,12 +2908,12 @@ L_1080534:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080644: 0x1080644: lw    a1, 1424(sp)
+// 0x01080c68: 0x1080c68: lw    a1, 1424(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2922,34 +2922,34 @@ L_1080534:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01080648: 0x1080648: jal   0x1098ec4 addu  a0, s3, zero
+// 0x01080c6c: 0x1080c6c: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080650: 0x1080650: lw    a0, 0(s0)
+// 0x01080c74: 0x1080c74: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01080654: 0x1080654: jal   0x1077724 sll   zero, zero, 0
+// 0x01080c78: 0x1080c78: jal   0x1077d48 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_Of_AddOns_1077724(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_Number_Of_AddOns_1077d48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108065c: 0x108065c: j	 0x108068c sw    v0, 1440(sp)
+// 0x01080c80: 0x1080c80: j	 0x1080cb0 sw    v0, 1440(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2958,10 +2958,10 @@ L_1080534:
 	add
 	ldloc 5
 	stelem.i4
-	br L_108068c
+	br L_1080cb0
 // --- basic block ---
-L_1080664:
-// 0x01080664: 0x1080664: lw    v0, 1428(sp)
+L_1080c88:
+// 0x01080c88: 0x1080c88: lw    v0, 1428(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2970,19 +2970,19 @@ L_1080664:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080668: 0x1080668: lw    a0, 0(s0)
+// 0x01080c8c: 0x1080c8c: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108066c: 0x108066c: addiu v0, v0, 1
+// 0x01080c90: 0x1080c90: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x01080670: 0x1080670: jal   0x10777b8 sw    v0, 1428(sp)
+// 0x01080c94: 0x1080c94: jal   0x1077ddc sw    v0, 1428(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2995,12 +2995,12 @@ L_1080664:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_AddOn_10777b8(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_AddOn_1077ddc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080678: 0x1080678: lw    a0, 1424(sp)
+// 0x01080c9c: 0x1080c9c: lw    a0, 1424(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3009,25 +3009,25 @@ L_1080664:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108067c: 0x108067c: beq   v0, zero, 0x108068c addu  a1, v0, zero
+// 0x01080ca0: 0x1080ca0: beq   v0, zero, 0x1080cb0 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
-	brfalse L_108068c
+	brfalse L_1080cb0
 // --- basic block ---
-// 0x01080684: 0x1080684: jal   0x109ddec sll   zero, zero, 0
+// 0x01080ca8: 0x1080ca8: jal   0x109e434 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_add_overlay_109ddec(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_add_overlay_109e434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108068c:
-// 0x0108068c: 0x108068c: lw    a1, 1428(sp)
+L_1080cb0:
+// 0x01080cb0: 0x1080cb0: lw    a1, 1428(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3036,7 +3036,7 @@ L_108068c:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01080690: 0x1080690: lw    v1, 1440(sp)
+// 0x01080cb4: 0x1080cb4: lw    v1, 1440(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3045,19 +3045,19 @@ L_108068c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01080694: 0x1080694: sll   zero, zero, 0
-// 0x01080698: 0x1080698: slt   v0, a1, v1
+// 0x01080cb8: 0x1080cb8: sll   zero, zero, 0
+// 0x01080cbc: 0x1080cbc: slt   v0, a1, v1
 	ldloc.2
 	ldloc 6
 	clt
 	stloc 5
-// 0x0108069c: 0x108069c: bne   v0, zero, 0x1080664 lui   v1, 0x0
+// 0x01080cc0: 0x1080cc0: bne   v0, zero, 0x1080c88 lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 6
-	brtrue L_1080664
+	brtrue L_1080c88
 // --- basic block ---
-// 0x010806a4: 0x10806a4: lw    a0, 16648(v1)
+// 0x01080cc8: 0x1080cc8: lw    a0, 16648(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -3066,33 +3066,33 @@ L_108068c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010806a8: 0x10806a8: addiu v0, zero, -1
+// 0x01080ccc: 0x1080ccc: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010806ac: 0x10806ac: bne   a0, v0, 0x10806f8 lui   a1, 0x20000
+// 0x01080cd0: 0x1080cd0: bne   a0, v0, 0x1080d1c lui   a1, 0x20000
 	ldloc.1
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10806f8
+	bne.un L_1080d1c
 // --- basic block ---
-// 0x010806b4: 0x10806b4: lui   a0, 0x20000
+// 0x01080cd8: 0x1080cd8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010806b8: 0x10806b8: addiu a1, a1, -27168
+// 0x01080cdc: 0x1080cdc: addiu a1, a1, -26704
 	ldloc.2
-	ldc.i4 -27168
+	ldc.i4 -26704
 	add
 	stloc.2
-// 0x010806bc: 0x10806bc: addiu a0, a0, -23520
+// 0x01080ce0: 0x1080ce0: addiu a0, a0, -23056
 	ldloc.1
-	ldc.i4 -23520
+	ldc.i4 -23056
 	add
 	stloc.1
-// 0x010806c0: 0x10806c0: addiu a2, zero, 8
+// 0x01080ce4: 0x1080ce4: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x010806c4: 0x10806c4: jal   0x109e13c sw    v1, 1448(sp)
+// 0x01080ce8: 0x1080ce8: jal   0x109e784 sw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3106,12 +3106,12 @@ L_108068c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010806cc: 0x10806cc: lw    v1, 1448(sp)
+// 0x01080cf0: 0x1080cf0: lw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3120,18 +3120,18 @@ L_108068c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010806d0: 0x10806d0: addu  a0, v0, zero
+// 0x01080cf4: 0x1080cf4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010806d4: 0x10806d4: addiu a1, v1, 16648
+// 0x01080cf8: 0x1080cf8: addiu a1, v1, 16648
 	ldloc 6
 	ldc.i4 16648
 	add
 	stloc.2
-// 0x010806d8: 0x10806d8: addu  a2, zero, zero
+// 0x01080cfc: 0x1080cfc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010806dc: 0x10806dc: jal   0x1099350 sw    v0, 1444(sp)
+// 0x01080d00: 0x1080d00: jal   0x1099998 sw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3145,12 +3145,12 @@ L_108068c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010806e4: 0x10806e4: lw    v0, 1444(sp)
+// 0x01080d08: 0x1080d08: lw    v0, 1444(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3159,13 +3159,13 @@ L_108068c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010806e8: 0x10806e8: addiu a1, zero, 1
+// 0x01080d0c: 0x1080d0c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010806ec: 0x10806ec: addu  a0, v0, zero
+// 0x01080d10: 0x1080d10: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010806f0: 0x10806f0: jal   0x10992a8 addu  a2, zero, zero
+// 0x01080d14: 0x1080d14: jal   0x10998f0 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3173,13 +3173,13 @@ L_108068c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_free_10992a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_free_10998f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10806f8:
-// 0x010806f8: 0x10806f8: lw    a0, 1424(sp)
+L_1080d1c:
+// 0x01080d1c: 0x1080d1c: lw    a0, 1424(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3188,12 +3188,12 @@ L_10806f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010806fc: 0x10806fc: addiu a1, sp, 56
+// 0x01080d20: 0x1080d20: addiu a1, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.2
-// 0x01080700: 0x1080700: jal   0x1099350 addu  a2, zero, zero
+// 0x01080d24: 0x1080d24: jal   0x1099998 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -3201,15 +3201,15 @@ L_10806f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_get_size_1099350(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_get_size_1099998(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080708: 0x1080708: lui   v0, 0x0
+// 0x01080d2c: 0x1080d2c: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x0108070c: 0x108070c: lw    a2, 16648(v0)
+// 0x01080d30: 0x1080d30: lw    a2, 16648(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -3218,7 +3218,7 @@ L_10806f8:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01080710: 0x1080710: lw    a3, 60(sp)
+// 0x01080d34: 0x1080d34: lw    a3, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3227,21 +3227,21 @@ L_10806f8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01080714: 0x1080714: lui   a0, 0x20000
+// 0x01080d38: 0x1080d38: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080718: 0x1080718: addiu a0, a0, -23500
+// 0x01080d3c: 0x1080d3c: addiu a0, a0, -23036
 	ldloc.1
-	ldc.i4 -23500
+	ldc.i4 -23036
 	add
 	stloc.1
-// 0x0108071c: 0x108071c: addu  a1, zero, zero
+// 0x01080d40: 0x1080d40: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01080720: 0x1080720: addiu v0, zero, 8
+// 0x01080d44: 0x1080d44: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01080724: 0x1080724: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01080d48: 0x1080d48: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3255,21 +3255,21 @@ L_10806f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108072c: 0x108072c: addu  a0, v0, zero
+// 0x01080d50: 0x1080d50: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080730: 0x1080730: addu  a1, zero, zero
+// 0x01080d54: 0x1080d54: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01080734: 0x1080734: addu  a2, zero, zero
+// 0x01080d58: 0x1080d58: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01080738: 0x1080738: jal   0x1098fe0 sw    v0, 1424(sp)
+// 0x01080d5c: 0x1080d5c: jal   0x1099628 sw    v0, 1424(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3281,35 +3281,35 @@ L_10806f8:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01080740: 0x1080740: lb    v0, 708(s0)
+// 0x01080d64: 0x1080d64: lb    v0, 708(s0)
 	ldloc 9
 	ldc.i4 708
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01080744: 0x1080744: sll   zero, zero, 0
-// 0x01080748: 0x1080748: beq   v0, zero, 0x1080770 lui   a0, 0x20000
+// 0x01080d68: 0x1080d68: sll   zero, zero, 0
+// 0x01080d6c: 0x1080d6c: beq   v0, zero, 0x1080d94 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_1080770
+	brfalse L_1080d94
 // --- basic block ---
-// 0x01080750: 0x1080750: lui   a1, 0x20000
+// 0x01080d74: 0x1080d74: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080754: 0x1080754: addiu a0, a0, -23520
+// 0x01080d78: 0x1080d78: addiu a0, a0, -23056
 	ldloc.1
-	ldc.i4 -23520
+	ldc.i4 -23056
 	add
 	stloc.1
-// 0x01080758: 0x1080758: addiu a1, a1, -27168
+// 0x01080d7c: 0x1080d7c: addiu a1, a1, -26704
 	ldloc.2
-	ldc.i4 -27168
+	ldc.i4 -26704
 	add
 	stloc.2
-// 0x0108075c: 0x108075c: jal   0x109e13c addiu a2, zero, 8
+// 0x01080d80: 0x1080d80: jal   0x109e784 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -3317,12 +3317,12 @@ L_10806f8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080764: 0x1080764: lw    a0, 1424(sp)
+// 0x01080d88: 0x1080d88: lw    a0, 1424(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3331,18 +3331,18 @@ L_10806f8:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01080768: 0x1080768: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01080d8c: 0x1080d8c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1080770:
-// 0x01080770: 0x1080770: lw    a1, 1424(sp)
+L_1080d94:
+// 0x01080d94: 0x1080d94: lw    a1, 1424(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3351,72 +3351,72 @@ L_1080770:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01080774: 0x1080774: jal   0x1098ec4 addu  a0, s3, zero
+// 0x01080d98: 0x1080d98: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108077c: 0x108077c: lb    v0, 1624(s0)
+// 0x01080da0: 0x1080da0: lb    v0, 1624(s0)
 	ldloc 9
 	ldc.i4 1624
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01080780: 0x1080780: sll   zero, zero, 0
-// 0x01080784: 0x1080784: beq   v0, zero, 0x10807cc addiu a2, s1, 300
+// 0x01080da4: 0x1080da4: sll   zero, zero, 0
+// 0x01080da8: 0x1080da8: beq   v0, zero, 0x1080df0 addiu a2, s1, 300
 	ldloc 5
 	ldloc 10
 	ldc.i4 300
 	add
 	stloc.3
-	brfalse L_10807cc
+	brfalse L_1080df0
 // --- basic block ---
-// 0x0108078c: 0x108078c: lb    v0, 1724(s0)
+// 0x01080db0: 0x1080db0: lb    v0, 1724(s0)
 	ldloc 9
 	ldc.i4 1724
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01080790: 0x1080790: sll   zero, zero, 0
-// 0x01080794: 0x1080794: beq   v0, zero, 0x10807a8 lui   a0, 0x20000
+// 0x01080db4: 0x1080db4: sll   zero, zero, 0
+// 0x01080db8: 0x1080db8: beq   v0, zero, 0x1080dcc lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_10807a8
+	brfalse L_1080dcc
 // --- basic block ---
-// 0x0108079c: 0x108079c: addiu a0, a0, -23472
+// 0x01080dc0: 0x1080dc0: addiu a0, a0, -23008
 	ldloc.1
-	ldc.i4 -23472
+	ldc.i4 -23008
 	add
 	stloc.1
-// 0x010807a0: 0x10807a0: j	 0x10807b4 addiu a1, s0, 1724
+// 0x01080dc4: 0x1080dc4: j	 0x1080dd8 addiu a1, s0, 1724
 	ldloc 9
 	ldc.i4 1724
 	add
 	stloc.2
-	br L_10807b4
+	br L_1080dd8
 // --- basic block ---
-L_10807a8:
-// 0x010807a8: 0x10807a8: lui   a1, 0x10000
+L_1080dcc:
+// 0x01080dcc: 0x1080dcc: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010807ac: 0x10807ac: addiu a0, a0, -23472
+// 0x01080dd0: 0x1080dd0: addiu a0, a0, -23008
 	ldloc.1
-	ldc.i4 -23472
+	ldc.i4 -23008
 	add
 	stloc.1
-// 0x010807b0: 0x10807b0: addiu a1, a1, 6612
+// 0x01080dd4: 0x1080dd4: addiu a1, a1, 6608
 	ldloc.2
-	ldc.i4 6612
+	ldc.i4 6608
 	add
 	stloc.2
-L_10807b4:
-// 0x010807b4: 0x10807b4: jal   0x109e13c addiu a2, zero, 513
+L_1080dd8:
+// 0x01080dd8: 0x1080dd8: jal   0x109e784 addiu a2, zero, 513
 	ldc.i4 513
 	stloc.3
 	ldloc.0
@@ -3424,46 +3424,46 @@ L_10807b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010807bc: 0x10807bc: addu  a1, v0, zero
+// 0x01080de0: 0x1080de0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010807c0: 0x10807c0: jal   0x1098ec4 addu  a0, s3, zero
+// 0x01080de4: 0x1080de4: jal   0x109950c addu  a0, s3, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010807c8: 0x10807c8: addiu a2, s1, 300
+// 0x01080dec: 0x1080dec: addiu a2, s1, 300
 	ldloc 10
 	ldc.i4 300
 	add
 	stloc.3
-L_10807cc:
-// 0x010807cc: 0x10807cc: addiu a1, s1, 400
+L_1080df0:
+// 0x01080df0: 0x1080df0: addiu a1, s1, 400
 	ldloc 10
 	ldc.i4 400
 	add
 	stloc.2
-// 0x010807d0: 0x10807d0: addiu v1, s1, 500
+// 0x01080df4: 0x1080df4: addiu v1, s1, 500
 	ldloc 10
 	ldc.i4 500
 	add
 	stloc 6
-// 0x010807d4: 0x10807d4: addiu v0, s1, 600
+// 0x01080df8: 0x1080df8: addiu v0, s1, 600
 	ldloc 10
 	ldc.i4 600
 	add
 	stloc 5
-// 0x010807d8: 0x10807d8: lw    a0, 4(s0)
+// 0x01080dfc: 0x1080dfc: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -3472,81 +3472,81 @@ L_10807cc:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010807dc: 0x10807dc: sll   a2, a2, 2
+// 0x01080e00: 0x1080e00: sll   a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x010807e0: 0x10807e0: sll   a1, a1, 2
+// 0x01080e04: 0x1080e04: sll   a1, a1, 2
 	ldloc.2
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x010807e4: 0x10807e4: sll   v1, v1, 2
+// 0x01080e08: 0x1080e08: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010807e8: 0x10807e8: sll   v0, v0, 2
+// 0x01080e0c: 0x1080e0c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010807ec: 0x10807ec: addu  a2, a2, s4
+// 0x01080e10: 0x1080e10: addu  a2, a2, s4
 	ldloc.3
 	ldloc 12
 	add
 	stloc.3
-// 0x010807f0: 0x10807f0: addu  a1, a1, s4
+// 0x01080e14: 0x1080e14: addu  a1, a1, s4
 	ldloc.2
 	ldloc 12
 	add
 	stloc.2
-// 0x010807f4: 0x10807f4: addu  v1, v1, s4
+// 0x01080e18: 0x1080e18: addu  v1, v1, s4
 	ldloc 6
 	ldloc 12
 	add
 	stloc 6
-// 0x010807f8: 0x10807f8: addu  v0, v0, s4
+// 0x01080e1c: 0x1080e1c: addu  v0, v0, s4
 	ldloc 5
 	ldloc 12
 	add
 	stloc 5
-// 0x010807fc: 0x10807fc: sw    s3, 0(a2)
+// 0x01080e20: 0x1080e20: sw    s3, 0(a2)
 	ldloc 7
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01080800: 0x1080800: sw    s2, 0(a1)
+// 0x01080e24: 0x1080e24: sw    s2, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x01080804: 0x1080804: sw    a0, 0(v1)
+// 0x01080e28: 0x1080e28: sw    a0, 0(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc.1
 	stelem.i4
-// 0x01080808: 0x1080808: sw    s5, 0(v0)
+// 0x01080e2c: 0x1080e2c: sw    s5, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-// 0x0108080c: 0x108080c: addiu s1, s1, 1
+// 0x01080e30: 0x1080e30: addiu s1, s1, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_1080810:
-// 0x01080810: 0x1080810: lw    a0, 1432(sp)
+L_1080e34:
+// 0x01080e34: 0x1080e34: lw    a0, 1432(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3555,17 +3555,17 @@ L_1080810:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01080814: 0x1080814: addiu s7, s7, 1
+// 0x01080e38: 0x1080e38: addiu s7, s7, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x01080818: 0x1080818: addiu a0, a0, -1
+// 0x01080e3c: 0x1080e3c: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x0108081c: 0x108081c: sw    a0, 1432(sp)
+// 0x01080e40: 0x1080e40: sw    a0, 1432(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3574,8 +3574,8 @@ L_1080810:
 	add
 	ldloc.1
 	stelem.i4
-L_1080820:
-// 0x01080820: 0x1080820: lw    v1, 1432(sp)
+L_1080e44:
+// 0x01080e44: 0x1080e44: lw    v1, 1432(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3584,34 +3584,34 @@ L_1080820:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01080824: 0x1080824: sll   zero, zero, 0
-// 0x01080828: 0x1080828: addiu v0, v1, 1
+// 0x01080e48: 0x1080e48: sll   zero, zero, 0
+// 0x01080e4c: 0x1080e4c: addiu v0, v1, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 5
-// 0x0108082c: 0x108082c: blez  v0, 0x1080840 addiu s0, s7, -1
+// 0x01080e50: 0x1080e50: blez  v0, 0x1080e64 addiu s0, s7, -1
 	ldloc 5
 	ldloc 16
 	ldc.i4.m1
 	add
 	stloc 9
 	ldc.i4.s 0
-	ble L_1080840
+	ble L_1080e64
 // --- basic block ---
-// 0x01080834: 0x1080834: slti  v0, s1, 100
+// 0x01080e58: 0x1080e58: slti  v0, s1, 100
 	ldloc 10
 	ldc.i4.s 100
 	clt
 	stloc 5
-// 0x01080838: 0x1080838: bne   v0, zero, 0x107fecc lui   a1, 0x20000
+// 0x01080e5c: 0x1080e5c: bne   v0, zero, 0x10804f0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brtrue L_107fecc
+	brtrue L_10804f0
 // --- basic block ---
-L_1080840:
-// 0x01080840: 0x1080840: lw    a1, 28(sp)
+L_1080e64:
+// 0x01080e64: 0x1080e64: lw    a1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3620,20 +3620,20 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01080844: 0x1080844: addiu a0, sp, 48
+// 0x01080e68: 0x1080e68: addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.1
-// 0x01080848: 0x1080848: lui   v0, 0x80000
+// 0x01080e6c: 0x1080e6c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108084c: 0x108084c: jal   0x10086bc sw    s1, -11000(v0)
+// 0x01080e70: 0x1080e70: jal   0x10086cc sw    s1, -10536(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2750
+	ldc.i4 -2634
 	add
 	ldloc 10
 	stelem.i4
@@ -3642,13 +3642,13 @@ L_1080840:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080854: 0x1080854: lw    ra, 1492(sp)
-// 0x01080858: 0x1080858: lw    s8, 1488(sp)
+// 0x01080e78: 0x1080e78: lw    ra, 1492(sp)
+// 0x01080e7c: 0x1080e7c: lw    s8, 1488(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3657,7 +3657,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108085c: 0x108085c: lw    s7, 1484(sp)
+// 0x01080e80: 0x1080e80: lw    s7, 1484(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3666,7 +3666,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01080860: 0x1080860: lw    s6, 1480(sp)
+// 0x01080e84: 0x1080e84: lw    s6, 1480(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3675,7 +3675,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01080864: 0x1080864: lw    s5, 1476(sp)
+// 0x01080e88: 0x1080e88: lw    s5, 1476(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3684,7 +3684,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01080868: 0x1080868: lw    s4, 1472(sp)
+// 0x01080e8c: 0x1080e8c: lw    s4, 1472(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3693,7 +3693,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108086c: 0x108086c: lw    s3, 1468(sp)
+// 0x01080e90: 0x1080e90: lw    s3, 1468(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3702,7 +3702,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080870: 0x1080870: lw    s2, 1464(sp)
+// 0x01080e94: 0x1080e94: lw    s2, 1464(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3711,7 +3711,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01080874: 0x1080874: lw    s1, 1460(sp)
+// 0x01080e98: 0x1080e98: lw    s1, 1460(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3720,7 +3720,7 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01080878: 0x1080878: lw    s0, 1456(sp)
+// 0x01080e9c: 0x1080e9c: lw    s0, 1456(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3729,15 +3729,15 @@ L_1080840:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108087c: 0x108087c: jr    ra addiu sp, sp, 1496
+// 0x01080ea0: 0x1080ea0: jr    ra addiu sp, sp, 1496
 	ldloc.0
 	ldc.i4 1496
 	add
 	stloc.0
 	br __CIBYL_function_return
 // --- basic block ---
-L_1080884:
-// 0x01080884: 0x1080884: jal   0x1001b48 sb    zero, 724(sp)
+L_1080ea8:
+// 0x01080ea8: 0x1080ea8: jal   0x1001b48 sb    zero, 724(sp)
 	ldloc.0
 	ldc.i4 724
 	add
@@ -3749,15 +3749,15 @@ L_1080884:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108088c: 0x108088c: lui   a0, 0x20000
+// 0x01080eb0: 0x1080eb0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080890: 0x1080890: addiu a0, a0, -22984
+// 0x01080eb4: 0x1080eb4: addiu a0, a0, -22520
 	ldloc.1
-	ldc.i4 -22984
+	ldc.i4 -22520
 	add
 	stloc.1
-// 0x01080894: 0x1080894: jal   0x101cd60 sw    v0, 1448(sp)
+// 0x01080eb8: 0x1080eb8: jal   0x101cd70 sw    v0, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3771,12 +3771,12 @@ L_1080884:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108089c: 0x108089c: lw    v1, 1448(sp)
+// 0x01080ec0: 0x1080ec0: lw    v1, 1448(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3785,36 +3785,36 @@ L_1080884:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010808a0: 0x10808a0: addiu a0, zero, 700
+// 0x01080ec4: 0x1080ec4: addiu a0, zero, 700
 	ldc.i4 700
 	stloc.1
-// 0x010808a4: 0x10808a4: lui   a2, 0x20000
+// 0x01080ec8: 0x1080ec8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010808a8: 0x10808a8: subu  a1, a0, v1
+// 0x01080ecc: 0x1080ecc: subu  a1, a0, v1
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.2
-// 0x010808ac: 0x10808ac: addu  a3, v0, zero
+// 0x01080ed0: 0x1080ed0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010808b0: 0x10808b0: addiu a2, a2, -24836
+// 0x01080ed4: 0x1080ed4: addiu a2, a2, -24372
 	ldloc.3
-	ldc.i4 -24836
+	ldc.i4 -24372
 	add
 	stloc.3
-// 0x010808b4: 0x10808b4: addu  a0, s3, v1
+// 0x01080ed8: 0x1080ed8: addu  a0, s3, v1
 	ldloc 8
 	ldloc 6
 	add
 	stloc.1
-// 0x010808b8: 0x10808b8: addiu v0, s0, 1624
+// 0x01080edc: 0x1080edc: addiu v0, s0, 1624
 	ldloc 9
 	ldc.i4 1624
 	add
 	stloc 5
-// 0x010808bc: 0x10808bc: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01080ee0: 0x1080ee0: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3833,31 +3833,31 @@ L_1080884:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010808c4: 0x10808c4: lui   a0, 0x20000
+// 0x01080ee8: 0x1080ee8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010808c8: 0x10808c8: addu  a1, s3, zero
+// 0x01080eec: 0x1080eec: addu  a1, s3, zero
 	ldloc 8
 	stloc.2
-// 0x010808cc: 0x10808cc: addiu a0, a0, -23460
+// 0x01080ef0: 0x1080ef0: addiu a0, a0, -22996
 	ldloc.1
-	ldc.i4 -23460
+	ldc.i4 -22996
 	add
 	stloc.1
-// 0x010808d0: 0x10808d0: addiu a3, zero, 512
+// 0x01080ef4: 0x1080ef4: addiu a3, zero, 512
 	ldc.i4 512
 	stloc 4
-// 0x010808d4: 0x10808d4: j	 0x1080534 addiu a2, zero, 14
+// 0x01080ef8: 0x1080ef8: j	 0x1080b58 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-	br L_1080534
+	br L_1080b58
 __CIBYL_function_return:
 	ldloc 6
 	stsfld int32 [WazeWP7]CRunTime::saved_v1
 	ldloc 5
 	ret
 }
-.method public static int32 populate_first_tab_10808dc(int32,int32,int32,int32,int32)
+.method public static int32 populate_first_tab_1080f00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3901,12 +3901,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010808dc: 0x10808dc: addiu sp, sp, -56
+// 0x01080f00: 0x1080f00: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010808e0: 0x10808e0: sw    s1, 44(sp)
+// 0x01080f04: 0x1080f04: sw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3915,7 +3915,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010808e4: 0x10808e4: sw    s0, 40(sp)
+// 0x01080f08: 0x1080f08: sw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3924,13 +3924,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010808e8: 0x10808e8: lui   s1, 0x80000
+// 0x01080f0c: 0x1080f0c: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x010808ec: 0x10808ec: lui   s0, 0x80000
+// 0x01080f10: 0x1080f10: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010808f0: 0x10808f0: sw    s2, 48(sp)
+// 0x01080f14: 0x1080f14: sw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3939,24 +3939,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010808f4: 0x10808f4: sw    ra, 52(sp)
-// 0x010808f8: 0x10808f8: addiu s1, s1, -12200
+// 0x01080f18: 0x1080f18: sw    ra, 52(sp)
+// 0x01080f1c: 0x1080f1c: addiu s1, s1, -11736
 	ldloc 9
-	ldc.i4 -12200
+	ldc.i4 -11736
 	add
 	stloc 9
-// 0x010808fc: 0x10808fc: addiu s0, s0, -13800
+// 0x01080f20: 0x1080f20: addiu s0, s0, -13336
 	ldloc 8
-	ldc.i4 -13800
+	ldc.i4 -13336
 	add
 	stloc 8
-// 0x01080900: 0x1080900: j	 0x1080958 addu  s2, zero, zero
+// 0x01080f24: 0x1080f24: j	 0x1080f7c addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1080958
+	br L_1080f7c
 // --- basic block ---
-L_1080908:
-// 0x01080908: 0x1080908: lw    v0, -400(s1)
+L_1080f2c:
+// 0x01080f2c: 0x1080f2c: lw    v0, -400(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3965,14 +3965,14 @@ L_1080908:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108090c: 0x108090c: sll   zero, zero, 0
-// 0x01080910: 0x1080910: beq   v0, zero, 0x1080930 addu  a1, v0, zero
+// 0x01080f30: 0x1080f30: sll   zero, zero, 0
+// 0x01080f34: 0x1080f34: beq   v0, zero, 0x1080f54 addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
-	brfalse L_1080930
+	brfalse L_1080f54
 // --- basic block ---
-// 0x01080918: 0x1080918: lw    v0, 4(v0)
+// 0x01080f3c: 0x1080f3c: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3981,44 +3981,44 @@ L_1080908:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108091c: 0x108091c: sll   zero, zero, 0
-// 0x01080920: 0x1080920: beq   v0, zero, 0x1080930 addu  a0, v0, zero
+// 0x01080f40: 0x1080f40: sll   zero, zero, 0
+// 0x01080f44: 0x1080f44: beq   v0, zero, 0x1080f54 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1080930
+	brfalse L_1080f54
 // --- basic block ---
-// 0x01080928: 0x1080928: jal   0x109a3a8 sll   zero, zero, 0
+// 0x01080f4c: 0x1080f4c: jal   0x109a9f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_remove_109a3a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_remove_109a9f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1080930:
-// 0x01080930: 0x1080930: lw    v0, 0(s1)
+L_1080f54:
+// 0x01080f54: 0x1080f54: lw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01080934: 0x1080934: addiu s1, s1, 4
+// 0x01080f58: 0x1080f58: addiu s1, s1, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-// 0x01080938: 0x1080938: beq   v0, zero, 0x1080958 addu  a1, v0, zero
+// 0x01080f5c: 0x1080f5c: beq   v0, zero, 0x1080f7c addu  a1, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.2
-	brfalse L_1080958
+	brfalse L_1080f7c
 // --- basic block ---
-// 0x01080940: 0x1080940: lw    v0, 4(v0)
+// 0x01080f64: 0x1080f64: lw    v0, 4(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4027,26 +4027,26 @@ L_1080930:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080944: 0x1080944: sll   zero, zero, 0
-// 0x01080948: 0x1080948: beq   v0, zero, 0x1080958 addu  a0, v0, zero
+// 0x01080f68: 0x1080f68: sll   zero, zero, 0
+// 0x01080f6c: 0x1080f6c: beq   v0, zero, 0x1080f7c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1080958
+	brfalse L_1080f7c
 // --- basic block ---
-// 0x01080950: 0x1080950: jal   0x109a3a8 sll   zero, zero, 0
+// 0x01080f74: 0x1080f74: jal   0x109a9f0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_remove_109a3a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_remove_109a9f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1080958:
-// 0x01080958: 0x1080958: lw    v0, 2800(s0)
+L_1080f7c:
+// 0x01080f7c: 0x1080f7c: lw    v0, 2800(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4055,50 +4055,50 @@ L_1080958:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108095c: 0x108095c: sll   zero, zero, 0
-// 0x01080960: 0x1080960: slt   v0, s2, v0
+// 0x01080f80: 0x1080f80: sll   zero, zero, 0
+// 0x01080f84: 0x1080f84: slt   v0, s2, v0
 	ldloc 10
 	ldloc 5
 	clt
 	stloc 5
-// 0x01080964: 0x1080964: bne   v0, zero, 0x1080908 addiu s2, s2, 1
+// 0x01080f88: 0x1080f88: bne   v0, zero, 0x1080f2c addiu s2, s2, 1
 	ldloc 5
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	brtrue L_1080908
+	brtrue L_1080f2c
 // --- basic block ---
-// 0x0108096c: 0x108096c: lui   s2, 0x80000
+// 0x01080f90: 0x1080f90: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01080970: 0x1080970: lw    a0, -13824(s2)
+// 0x01080f94: 0x1080f94: lw    a0, -13360(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3456
+	ldc.i4 -3340
 	add
 	ldelem.i4
 	stloc.1
-// 0x01080974: 0x1080974: jal   0x10990ac addiu s1, zero, 1
+// 0x01080f98: 0x1080f98: jal   0x10996f4 addiu s1, zero, 1
 	ldc.i4.1
 	stloc 9
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108097c: 0x108097c: lui   v0, 0x80000
+// 0x01080fa0: 0x1080fa0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01080980: 0x1080980: addiu v0, v0, -13400
+// 0x01080fa4: 0x1080fa4: addiu v0, v0, -12936
 	ldloc 5
-	ldc.i4 -13400
+	ldc.i4 -12936
 	add
 	stloc 5
-// 0x01080984: 0x1080984: lw    a1, 2800(s0)
+// 0x01080fa8: 0x1080fa8: lw    a1, 2800(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4107,7 +4107,7 @@ L_1080958:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01080988: 0x1080988: sw    v0, 16(sp)
+// 0x01080fac: 0x1080fac: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4116,15 +4116,15 @@ L_1080958:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108098c: 0x108098c: lui   v0, 0x80000
+// 0x01080fb0: 0x1080fb0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01080990: 0x1080990: addiu v0, v0, -12600
+// 0x01080fb4: 0x1080fb4: addiu v0, v0, -12136
 	ldloc 5
-	ldc.i4 -12600
+	ldc.i4 -12136
 	add
 	stloc 5
-// 0x01080994: 0x1080994: sw    v0, 20(sp)
+// 0x01080fb8: 0x1080fb8: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4133,15 +4133,15 @@ L_1080958:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01080998: 0x1080998: lui   v0, 0x1080000
+// 0x01080fbc: 0x1080fbc: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x0108099c: 0x108099c: addiu v0, v0, 3060
+// 0x01080fc0: 0x1080fc0: addiu v0, v0, 4632
 	ldloc 5
-	ldc.i4 3060
+	ldc.i4 4632
 	add
 	stloc 5
-// 0x010809a0: 0x10809a0: sw    v0, 28(sp)
+// 0x01080fc4: 0x1080fc4: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4150,35 +4150,35 @@ L_1080958:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010809a4: 0x10809a4: lw    a0, -13824(s2)
+// 0x01080fc8: 0x1080fc8: lw    a0, -13360(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3456
+	ldc.i4 -3340
 	add
 	ldelem.i4
 	stloc.1
-// 0x010809a8: 0x10809a8: lui   a3, 0x80000
+// 0x01080fcc: 0x1080fcc: lui   a3, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x010809ac: 0x10809ac: lui   v0, 0x1080000
+// 0x01080fd0: 0x1080fd0: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x010809b0: 0x10809b0: addiu v0, v0, 2864
+// 0x01080fd4: 0x1080fd4: addiu v0, v0, 4436
 	ldloc 5
-	ldc.i4 2864
+	ldc.i4 4436
 	add
 	stloc 5
-// 0x010809b4: 0x10809b4: addiu a3, a3, -12200
+// 0x01080fd8: 0x1080fd8: addiu a3, a3, -11736
 	ldloc 4
-	ldc.i4 -12200
+	ldc.i4 -11736
 	add
 	stloc 4
-// 0x010809b8: 0x10809b8: addu  a2, s0, zero
+// 0x01080fdc: 0x1080fdc: addu  a2, s0, zero
 	ldloc 8
 	stloc.3
-// 0x010809bc: 0x10809bc: sw    v0, 32(sp)
+// 0x01080fe0: 0x1080fe0: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4187,7 +4187,7 @@ L_1080958:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010809c0: 0x10809c0: sw    zero, 24(sp)
+// 0x01080fe4: 0x1080fe4: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4196,7 +4196,7 @@ L_1080958:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010809c4: 0x10809c4: jal   0x1092088 sw    s1, 36(sp)
+// 0x01080fe8: 0x1080fe8: jal   0x10926ac sw    s1, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4210,12 +4210,12 @@ L_1080958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_widgets_1092088(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_widgets_10926ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010809cc: 0x10809cc: lw    v0, 2800(s0)
+// 0x01080ff0: 0x1080ff0: lw    v0, 2800(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4224,58 +4224,58 @@ L_1080958:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010809d0: 0x10809d0: sll   zero, zero, 0
-// 0x010809d4: 0x10809d4: bne   v0, zero, 0x1080a3c lui   v0, 0x80000
+// 0x01080ff4: 0x1080ff4: sll   zero, zero, 0
+// 0x01080ff8: 0x1080ff8: bne   v0, zero, 0x1081060 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1080a3c
+	brtrue L_1081060
 // --- basic block ---
-// 0x010809dc: 0x10809dc: lw    v0, -13852(v0)
+// 0x01081000: 0x1081000: lw    v0, -13388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc 5
-// 0x010809e0: 0x10809e0: sll   zero, zero, 0
-// 0x010809e4: 0x10809e4: bne   v0, s1, 0x1080a3c sll   zero, zero, 0
+// 0x01081004: 0x1081004: sll   zero, zero, 0
+// 0x01081008: 0x1081008: bne   v0, s1, 0x1081060 sll   zero, zero, 0
 	ldloc 5
 	ldloc 9
-	bne.un L_1080a3c
+	bne.un L_1081060
 // --- basic block ---
-// 0x010809ec: 0x10809ec: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x01081010: 0x1081010: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x010809f4: 0x10809f4: addiu v1, zero, -1
+// 0x01081018: 0x1081018: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x010809f8: 0x10809f8: bne   v0, v1, 0x1080a3c sll   zero, zero, 0
+// 0x0108101c: 0x108101c: bne   v0, v1, 0x1081060 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1080a3c
+	bne.un L_1081060
 // --- basic block ---
-// 0x01080a00: 0x1080a00: jal   0x1093fa0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+// 0x01081024: 0x1081024: jal   0x10945c4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080a08: 0x1080a08: lui   a1, 0x20000
+// 0x0108102c: 0x108102c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080a0c: 0x1080a0c: addu  a0, v0, zero
+// 0x01081030: 0x1081030: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080a10: 0x1080a10: addiu a1, a1, -23448
+// 0x01081034: 0x1081034: addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
-// 0x01080a14: 0x1080a14: jal   0x109b304 addu  s0, v0, zero
+// 0x01081038: 0x1081038: jal   0x109b94c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4283,99 +4283,99 @@ L_1080958:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080a1c: 0x1080a1c: beq   v0, zero, 0x1080a2c sll   zero, zero, 0
+// 0x01081040: 0x1081040: beq   v0, zero, 0x1081050 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1080a2c
+	brfalse L_1081050
 // --- basic block ---
-// 0x01080a24: 0x1080a24: jal   0x10990ac addu  a0, v0, zero
+// 0x01081048: 0x1081048: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1080a2c:
-// 0x01080a2c: 0x1080a2c: lui   a1, 0x20000
+L_1081050:
+// 0x01081050: 0x1081050: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080a30: 0x1080a30: addu  a0, s0, zero
+// 0x01081054: 0x1081054: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01080a34: 0x1080a34: j	 0x1080aa4 addiu a1, a1, -23432
+// 0x01081058: 0x1081058: j	 0x10810c8 addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-	br L_1080aa4
+	br L_10810c8
 // --- basic block ---
-L_1080a3c:
-// 0x01080a3c: 0x1080a3c: jal   0x106c170 sll   zero, zero, 0
+L_1081060:
+// 0x01081060: 0x1081060: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080a44: 0x1080a44: beq   v0, zero, 0x1080acc sll   zero, zero, 0
+// 0x01081068: 0x1081068: beq   v0, zero, 0x10810f0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1080acc
+	brfalse L_10810f0
 // --- basic block ---
-// 0x01080a4c: 0x1080a4c: jal   0x1053f28 sll   zero, zero, 0
-	call int32 Cibyl62::roadmap_groups_get_num_following_1053f28()
+// 0x01081070: 0x1081070: jal   0x1053f38 sll   zero, zero, 0
+	call int32 Cibyl62::roadmap_groups_get_num_following_1053f38()
 	stloc 5
 // --- basic block ---
-// 0x01080a54: 0x1080a54: bne   v0, zero, 0x1080acc lui   v0, 0x80000
+// 0x01081078: 0x1081078: bne   v0, zero, 0x10810f0 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1080acc
+	brtrue L_10810f0
 // --- basic block ---
-// 0x01080a5c: 0x1080a5c: lw    v1, -13852(v0)
+// 0x01081080: 0x1081080: lw    v1, -13388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc 7
-// 0x01080a60: 0x1080a60: addiu v0, zero, 2
+// 0x01081084: 0x1081084: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01080a64: 0x1080a64: bne   v1, v0, 0x1080acc sll   zero, zero, 0
+// 0x01081088: 0x1081088: bne   v1, v0, 0x10810f0 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1080acc
+	bne.un L_10810f0
 // --- basic block ---
-// 0x01080a6c: 0x1080a6c: jal   0x1093fa0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+// 0x01081090: 0x1081090: jal   0x10945c4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080a74: 0x1080a74: lui   a1, 0x20000
+// 0x01081098: 0x1081098: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080a78: 0x1080a78: addu  a0, v0, zero
+// 0x0108109c: 0x108109c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080a7c: 0x1080a7c: addiu a1, a1, -23432
+// 0x010810a0: 0x10810a0: addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-// 0x01080a80: 0x1080a80: jal   0x109b304 addu  s0, v0, zero
+// 0x010810a4: 0x10810a4: jal   0x109b94c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4383,96 +4383,96 @@ L_1080a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080a88: 0x1080a88: beq   v0, zero, 0x1080a9c lui   a1, 0x20000
+// 0x010810ac: 0x10810ac: beq   v0, zero, 0x10810c0 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1080a9c
+	brfalse L_10810c0
 // --- basic block ---
-// 0x01080a90: 0x1080a90: jal   0x10990ac addu  a0, v0, zero
+// 0x010810b4: 0x10810b4: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080a98: 0x1080a98: lui   a1, 0x20000
+// 0x010810bc: 0x10810bc: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1080a9c:
-// 0x01080a9c: 0x1080a9c: addu  a0, s0, zero
+L_10810c0:
+// 0x010810c0: 0x10810c0: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01080aa0: 0x1080aa0: addiu a1, a1, -23448
+// 0x010810c4: 0x10810c4: addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
-L_1080aa4:
-// 0x01080aa4: 0x1080aa4: jal   0x109b304 sll   zero, zero, 0
+L_10810c8:
+// 0x010810c8: 0x10810c8: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080aac: 0x1080aac: beq   v0, zero, 0x1080abc sll   zero, zero, 0
+// 0x010810d0: 0x10810d0: beq   v0, zero, 0x10810e0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1080abc
+	brfalse L_10810e0
 // --- basic block ---
-// 0x01080ab4: 0x1080ab4: jal   0x1099098 addu  a0, v0, zero
+// 0x010810d8: 0x10810d8: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1080abc:
-// 0x01080abc: 0x1080abc: lui   v0, 0x80000
+L_10810e0:
+// 0x010810e0: 0x10810e0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01080ac0: 0x1080ac0: lw    a0, -13824(v0)
+// 0x010810e4: 0x10810e4: lw    a0, -13360(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3456
+	ldc.i4 -3340
 	add
 	ldelem.i4
 	stloc.1
-// 0x01080ac4: 0x1080ac4: j	 0x1080b10 sll   zero, zero, 0
-	br L_1080b10
+// 0x010810e8: 0x10810e8: j	 0x1081134 sll   zero, zero, 0
+	br L_1081134
 // --- basic block ---
-L_1080acc:
-// 0x01080acc: 0x1080acc: jal   0x1093fa0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+L_10810f0:
+// 0x010810f0: 0x10810f0: jal   0x10945c4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080ad4: 0x1080ad4: lui   a1, 0x20000
+// 0x010810f8: 0x10810f8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080ad8: 0x1080ad8: addu  a0, v0, zero
+// 0x010810fc: 0x10810fc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080adc: 0x1080adc: addiu a1, a1, -23432
+// 0x01081100: 0x1081100: addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-// 0x01080ae0: 0x1080ae0: jal   0x109b304 addu  s0, v0, zero
+// 0x01081104: 0x1081104: jal   0x109b94c addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -4480,32 +4480,32 @@ L_1080acc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080ae8: 0x1080ae8: beq   v0, zero, 0x1080af8 sll   zero, zero, 0
+// 0x0108110c: 0x108110c: beq   v0, zero, 0x108111c sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1080af8
+	brfalse L_108111c
 // --- basic block ---
-// 0x01080af0: 0x1080af0: jal   0x1099098 addu  a0, v0, zero
+// 0x01081114: 0x1081114: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1080af8:
-// 0x01080af8: 0x1080af8: lui   a1, 0x20000
+L_108111c:
+// 0x0108111c: 0x108111c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080afc: 0x1080afc: addu  a0, s0, zero
+// 0x01081120: 0x1081120: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01080b00: 0x1080b00: jal   0x109b304 addiu a1, a1, -23448
+// 0x01081124: 0x1081124: jal   0x109b94c addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
 	ldloc.0
@@ -4513,26 +4513,26 @@ L_1080af8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080b08: 0x1080b08: beq   v0, zero, 0x1080b18 addu  a0, v0, zero
+// 0x0108112c: 0x108112c: beq   v0, zero, 0x108113c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1080b18
+	brfalse L_108113c
 // --- basic block ---
-L_1080b10:
-// 0x01080b10: 0x1080b10: jal   0x1099098 sll   zero, zero, 0
+L_1081134:
+// 0x01081134: 0x1081134: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1080b18:
-// 0x01080b18: 0x1080b18: lw    ra, 52(sp)
-// 0x01080b1c: 0x1080b1c: lw    s2, 48(sp)
+L_108113c:
+// 0x0108113c: 0x108113c: lw    ra, 52(sp)
+// 0x01081140: 0x1081140: lw    s2, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4541,7 +4541,7 @@ L_1080b18:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01080b20: 0x1080b20: lw    s1, 44(sp)
+// 0x01081144: 0x1081144: lw    s1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4550,7 +4550,7 @@ L_1080b18:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01080b24: 0x1080b24: lw    s0, 40(sp)
+// 0x01081148: 0x1081148: lw    s0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4559,7 +4559,7 @@ L_1080b18:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080b28: 0x1080b28: jr    ra addiu sp, sp, 56
+// 0x0108114c: 0x108114c: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4571,7 +4571,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeAlertsDeleteCallBackTabs_1080b30(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAlertsDeleteCallBackTabs_1081154(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 v1,int32 ra)
@@ -4612,21 +4612,21 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01080b30: 0x1080b30: lui   a0, 0x20000
+// 0x01081154: 0x1081154: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080b34: 0x1080b34: addiu sp, sp, -248
+// 0x01081158: 0x1081158: addiu sp, sp, -248
 	ldloc.0
 	ldc.i4 -248
 	add
 	stloc.0
-// 0x01080b38: 0x1080b38: addiu a0, a0, -23416
+// 0x0108115c: 0x108115c: addiu a0, a0, -22952
 	ldloc.1
-	ldc.i4 -23416
+	ldc.i4 -22952
 	add
 	stloc.1
-// 0x01080b3c: 0x1080b3c: sw    ra, 244(sp)
-// 0x01080b40: 0x1080b40: sw    s1, 240(sp)
+// 0x01081160: 0x1081160: sw    ra, 244(sp)
+// 0x01081164: 0x1081164: sw    s1, 240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4635,7 +4635,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01080b44: 0x1080b44: sw    s0, 236(sp)
+// 0x01081168: 0x1081168: sw    s0, 236(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4644,15 +4644,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01080b48: 0x1080b48: addu  s1, a2, zero
+// 0x0108116c: 0x108116c: addu  s1, a2, zero
 	ldloc.3
 	stloc 8
-// 0x01080b4c: 0x1080b4c: addiu s0, sp, 24
+// 0x01081170: 0x1081170: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x01080b50: 0x1080b50: jal   0x101cd60 sw    a1, 224(sp)
+// 0x01081174: 0x1081174: jal   0x101cd70 sw    a1, 224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4666,12 +4666,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01080b58: 0x1080b58: lw    a3, 224(sp)
+// 0x0108117c: 0x108117c: lw    a3, 224(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4680,18 +4680,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01080b5c: 0x1080b5c: lui   a1, 0x10000
+// 0x01081180: 0x1081180: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01080b60: 0x1080b60: addu  a0, s0, zero
+// 0x01081184: 0x1081184: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01080b64: 0x1080b64: addiu a1, a1, -25344
+// 0x01081188: 0x1081188: addiu a1, a1, -25344
 	ldloc.2
 	ldc.i4 -25344
 	add
 	stloc.2
-// 0x01080b68: 0x1080b68: jal   0x1000f64 addu  a2, v0, zero
+// 0x0108118c: 0x108118c: jal   0x1000f64 addu  a2, v0, zero
 	ldloc 6
 	stloc.3
 	ldloc.0
@@ -4704,29 +4704,29 @@ __CIBYL_javamethod_begin:
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01080b70: 0x1080b70: lui   a0, 0x10000
+// 0x01081194: 0x1081194: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01080b74: 0x1080b74: lui   a3, 0x1080000
+// 0x01081198: 0x1081198: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x01080b78: 0x1080b78: addu  a1, s0, zero
+// 0x0108119c: 0x108119c: addu  a1, s0, zero
 	ldloc 7
 	stloc.2
-// 0x01080b7c: 0x1080b7c: addiu a0, a0, -14284
+// 0x010811a0: 0x10811a0: addiu a0, a0, -14288
 	ldloc.1
-	ldc.i4 -14284
+	ldc.i4 -14288
 	add
 	stloc.1
-// 0x01080b80: 0x1080b80: addiu a3, a3, 2984
+// 0x010811a4: 0x10811a4: addiu a3, a3, 4556
 	ldloc 4
-	ldc.i4 2984
+	ldc.i4 4556
 	add
 	stloc 4
-// 0x01080b84: 0x1080b84: addu  a2, zero, zero
+// 0x010811a8: 0x10811a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01080b88: 0x1080b88: jal   0x104c320 sw    s1, 16(sp)
+// 0x010811ac: 0x10811ac: jal   0x104c330 sw    s1, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4740,16 +4740,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 6
 // --- basic block ---
-// 0x01080b90: 0x1080b90: lw    ra, 244(sp)
-// 0x01080b94: 0x1080b94: addu  v0, zero, zero
+// 0x010811b4: 0x10811b4: lw    ra, 244(sp)
+// 0x010811b8: 0x10811b8: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-// 0x01080b98: 0x1080b98: lw    s1, 240(sp)
+// 0x010811bc: 0x10811bc: lw    s1, 240(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4758,7 +4758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080b9c: 0x1080b9c: lw    s0, 236(sp)
+// 0x010811c0: 0x10811c0: lw    s0, 236(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4767,7 +4767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01080ba0: 0x1080ba0: jr    ra addiu sp, sp, 248
+// 0x010811c4: 0x10811c4: jr    ra addiu sp, sp, 248
 	ldloc.0
 	ldc.i4 248
 	add
@@ -4779,7 +4779,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 delete_callback_1080ba8(int32,int32,int32,int32,int32)
+.method public static int32 delete_callback_10811cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -4814,20 +4814,20 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01080ba8: 0x1080ba8: addiu sp, sp, -24
+// 0x010811cc: 0x10811cc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01080bac: 0x1080bac: addiu v0, zero, 3
+// 0x010811d0: 0x10811d0: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01080bb0: 0x1080bb0: bne   a0, v0, 0x1080be4 sw    ra, 20(sp)
+// 0x010811d4: 0x10811d4: bne   a0, v0, 0x1081208 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1080be4
+	bne.un L_1081208
 // --- basic block ---
-// 0x01080bb8: 0x1080bb8: jal   0x1000d8c addu  a0, a1, zero
+// 0x010811dc: 0x10811dc: jal   0x1000d8c addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -4840,7 +4840,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080bc0: 0x1080bc0: jal   0x1078cbc addu  a0, v0, zero
+// 0x010811e4: 0x10811e4: jal   0x10792e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4848,31 +4848,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::real_time_remove_alert_1078cbc(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::real_time_remove_alert_10792e0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080bc8: 0x1080bc8: beq   v0, zero, 0x1080be4 lui   a0, 0x10000
+// 0x010811ec: 0x10811ec: beq   v0, zero, 0x1081208 lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1080be4
+	brfalse L_1081208
 // --- basic block ---
-// 0x01080bd0: 0x1080bd0: lui   a1, 0x10000
+// 0x010811f4: 0x10811f4: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01080bd4: 0x1080bd4: addiu a0, a0, -14284
+// 0x010811f8: 0x10811f8: addiu a0, a0, -14288
 	ldloc.1
-	ldc.i4 -14284
+	ldc.i4 -14288
 	add
 	stloc.1
-// 0x01080bd8: 0x1080bd8: addiu a1, a1, -14252
+// 0x010811fc: 0x10811fc: addiu a1, a1, -14256
 	ldloc.2
-	ldc.i4 -14252
+	ldc.i4 -14256
 	add
 	stloc.2
-// 0x01080bdc: 0x1080bdc: jal   0x104bfe4 addiu a2, zero, 5
+// 0x01081200: 0x1081200: jal   0x104bff4 addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
 	ldloc.0
@@ -4880,15 +4880,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::roadmap_messagebox_timeout_104bfe4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::roadmap_messagebox_timeout_104bff4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1080be4:
-// 0x01080be4: 0x1080be4: lw    ra, 20(sp)
-// 0x01080be8: 0x1080be8: sll   zero, zero, 0
-// 0x01080bec: 0x1080bec: jr    ra addiu sp, sp, 24
+L_1081208:
+// 0x01081208: 0x1081208: lw    ra, 20(sp)
+// 0x0108120c: 0x108120c: sll   zero, zero, 0
+// 0x01081210: 0x1081210: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -4900,7 +4900,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeAlertsListCallBackTabs_1080bf4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAlertsListCallBackTabs_1081218(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 ra)
@@ -4938,16 +4938,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01080bf4: 0x1080bf4: addiu sp, sp, -32
+// 0x01081218: 0x1081218: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01080bf8: 0x1080bf8: addu  a0, zero, zero
+// 0x0108121c: 0x108121c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01080bfc: 0x1080bfc: sw    ra, 28(sp)
-// 0x01080c00: 0x1080c00: sw    s0, 24(sp)
+// 0x01081220: 0x1081220: sw    ra, 28(sp)
+// 0x01081224: 0x1081224: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4956,7 +4956,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01080c04: 0x1080c04: jal   0x101fc00 sw    a2, 16(sp)
+// 0x01081228: 0x1081228: jal   0x101fc10 sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4970,12 +4970,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc00(int32,int32,int32,int32,int32)
+	call int32 Cibyl23::roadmap_screen_set_Xicon_state_101fc10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080c0c: 0x1080c0c: lw    a2, 16(sp)
+// 0x01081230: 0x1081230: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4984,7 +4984,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01080c10: 0x1080c10: jal   0x1000d8c addu  a0, a2, zero
+// 0x01081234: 0x1081234: jal   0x1000d8c addu  a0, a2, zero
 	ldloc.3
 	stloc.1
 	ldloc.0
@@ -4997,40 +4997,40 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080c18: 0x1080c18: addu  a0, v0, zero
+// 0x0108123c: 0x108123c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080c1c: 0x1080c1c: jal   0x10771d8 addu  s0, v0, zero
+// 0x01081240: 0x1081240: jal   0x10777fc addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10771d8(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10777fc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080c24: 0x1080c24: bne   v0, zero, 0x1080c48 sll   zero, zero, 0
+// 0x01081248: 0x1081248: bne   v0, zero, 0x108126c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1080c48
+	brtrue L_108126c
 // --- basic block ---
-// 0x01080c2c: 0x1080c2c: jal   0x109bc0c sll   zero, zero, 0
+// 0x01081250: 0x1081250: jal   0x109c254 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_generic_list_dialog_hide_all_109bc0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_generic_list_dialog_hide_all_109c254(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080c34: 0x1080c34: addu  a0, s0, zero
+// 0x01081258: 0x1081258: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01080c38: 0x1080c38: jal   0x107eb70 addu  a1, zero, zero
+// 0x0108125c: 0x108125c: jal   0x107f194 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -5038,27 +5038,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_By_Id_107eb70(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_By_Id_107f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080c40: 0x1080c40: j	 0x1080c58 sll   zero, zero, 0
-	br L_1080c58
+// 0x01081264: 0x1081264: j	 0x108127c sll   zero, zero, 0
+	br L_108127c
 // --- basic block ---
-L_1080c48:
-// 0x01080c48: 0x1080c48: jal   0x109bc2c sll   zero, zero, 0
+L_108126c:
+// 0x0108126c: 0x108126c: jal   0x109c274 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_generic_list_dialog_hide_109bc2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_generic_list_dialog_hide_109c274(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080c50: 0x1080c50: jal   0x10847d8 addu  a0, s0, zero
+// 0x01081274: 0x1081274: jal   0x1084dfc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5066,17 +5066,17 @@ L_1080c48:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeAlertCommentsList_10847d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeAlertCommentsList_1084dfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1080c58:
-// 0x01080c58: 0x1080c58: lw    ra, 28(sp)
-// 0x01080c5c: 0x1080c5c: addiu v0, zero, 1
+L_108127c:
+// 0x0108127c: 0x108127c: lw    ra, 28(sp)
+// 0x01081280: 0x1081280: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01080c60: 0x1080c60: lw    s0, 24(sp)
+// 0x01081284: 0x1081284: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5085,7 +5085,7 @@ L_1080c58:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080c64: 0x1080c64: jr    ra addiu sp, sp, 32
+// 0x01081288: 0x1081288: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5097,7 +5097,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 create_list_1080c6c(int32,int32,int32,int32,int32)
+.method public static int32 create_list_1081290(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 v1,int32 ra)
@@ -5135,12 +5135,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01080c6c: 0x1080c6c: addiu sp, sp, -64
+// 0x01081290: 0x1081290: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01080c70: 0x1080c70: sw    s0, 56(sp)
+// 0x01081294: 0x1081294: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5149,24 +5149,24 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01080c74: 0x1080c74: lui   a1, 0x20000
+// 0x01081298: 0x1081298: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01080c78: 0x1080c78: addiu s0, sp, 24
+// 0x0108129c: 0x108129c: addiu s0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc 7
-// 0x01080c7c: 0x1080c7c: addu  a2, a0, zero
+// 0x010812a0: 0x10812a0: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x01080c80: 0x1080c80: addiu a1, a1, -23400
+// 0x010812a4: 0x10812a4: addiu a1, a1, -22936
 	ldloc.2
-	ldc.i4 -23400
+	ldc.i4 -22936
 	add
 	stloc.2
-// 0x01080c84: 0x1080c84: sw    ra, 60(sp)
-// 0x01080c88: 0x1080c88: jal   0x1000f64 addu  a0, s0, zero
+// 0x010812a8: 0x10812a8: sw    ra, 60(sp)
+// 0x010812ac: 0x10812ac: jal   0x1000f64 addu  a0, s0, zero
 	ldloc 7
 	stloc.1
 	ldloc.0
@@ -5179,19 +5179,19 @@ __CIBYL_javamethod_begin:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01080c90: 0x1080c90: addu  a0, s0, zero
+// 0x010812b4: 0x10812b4: addu  a0, s0, zero
 	ldloc 7
 	stloc.1
-// 0x01080c94: 0x1080c94: addu  a3, zero, zero
+// 0x010812b8: 0x10812b8: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01080c98: 0x1080c98: addiu a1, zero, -1
+// 0x010812bc: 0x10812bc: addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x01080c9c: 0x1080c9c: addiu a2, zero, -1
+// 0x010812c0: 0x10812c0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01080ca0: 0x1080ca0: sw    zero, 16(sp)
+// 0x010812c4: 0x10812c4: sw    zero, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5200,7 +5200,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01080ca4: 0x1080ca4: jal   0x1092750 sw    zero, 20(sp)
+// 0x010812c8: 0x10812c8: jal   0x1092d74 sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5214,31 +5214,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_new_1092750(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_new_1092d74(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01080cac: 0x1080cac: lui   a1, 0x0
+// 0x010812d0: 0x10812d0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01080cb0: 0x1080cb0: lui   a2, 0x0
+// 0x010812d4: 0x10812d4: lui   a2, 0x0
 	ldc.i4.s 0
 	stloc.3
-// 0x01080cb4: 0x1080cb4: addu  a0, v0, zero
+// 0x010812d8: 0x10812d8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080cb8: 0x1080cb8: addiu a1, a1, 23008
+// 0x010812dc: 0x10812dc: addiu a1, a1, 23008
 	ldloc.2
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01080cbc: 0x1080cbc: addiu a2, a2, 31980
+// 0x010812e0: 0x10812e0: addiu a2, a2, 31980
 	ldloc.3
 	ldc.i4 31980
 	add
 	stloc.3
-// 0x01080cc0: 0x1080cc0: jal   0x1098fe0 sw    v0, 48(sp)
+// 0x010812e4: 0x10812e4: jal   0x1099628 sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5250,9 +5250,9 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01080cc8: 0x1080cc8: lw    v0, 48(sp)
+// 0x010812ec: 0x10812ec: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5261,10 +5261,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080ccc: 0x1080ccc: addiu a1, zero, 100
+// 0x010812f0: 0x10812f0: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x01080cd0: 0x1080cd0: jal   0x1091748 addu  a0, v0, zero
+// 0x010812f4: 0x10812f4: jal   0x1091d6c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5272,13 +5272,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_list_resize_1091748(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_list_resize_1091d6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01080cd8: 0x1080cd8: lw    ra, 60(sp)
-// 0x01080cdc: 0x1080cdc: lw    v0, 48(sp)
+// 0x010812fc: 0x10812fc: lw    ra, 60(sp)
+// 0x01081300: 0x1081300: lw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5287,7 +5287,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080ce0: 0x1080ce0: lw    s0, 56(sp)
+// 0x01081304: 0x1081304: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5296,7 +5296,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01080ce4: 0x1080ce4: jr    ra addiu sp, sp, 64
+// 0x01081308: 0x1081308: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -5308,7 +5308,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_list_1080cec(int32,int32,int32,int32,int32)
+.method public static int32 report_list_1081310(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 s2,int32 ra)
@@ -5352,13 +5352,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01080cec: 0x1080cec: addiu sp, sp, -32
+// 0x01081310: 0x1081310: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01080cf0: 0x1080cf0: sw    ra, 28(sp)
-// 0x01080cf4: 0x1080cf4: sw    s2, 24(sp)
+// 0x01081314: 0x1081314: sw    ra, 28(sp)
+// 0x01081318: 0x1081318: sw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5367,7 +5367,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01080cf8: 0x1080cf8: sw    s1, 20(sp)
+// 0x0108131c: 0x108131c: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5376,7 +5376,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01080cfc: 0x1080cfc: jal   0x10799b8 sw    s0, 16(sp)
+// 0x01081320: 0x1081320: jal   0x1079fdc sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5390,12 +5390,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d04: 0x1080d04: jal   0x10788cc addu  a0, zero, zero
+// 0x01081328: 0x1081328: jal   0x1078ef0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5403,17 +5403,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d0c: 0x1080d0c: lui   a0, 0x10000
+// 0x01081330: 0x1081330: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01080d10: 0x1080d10: jal   0x101cd60 addiu a0, a0, 220
+// 0x01081334: 0x1081334: jal   0x101cd70 addiu a0, a0, 216
 	ldloc.1
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc.1
 	ldloc.0
@@ -5421,17 +5421,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d18: 0x1080d18: lui   a0, 0x20000
+// 0x0108133c: 0x108133c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080d1c: 0x1080d1c: jal   0x101cd60 addiu a0, a0, -23392
+// 0x01081340: 0x1081340: jal   0x101cd70 addiu a0, a0, -22928
 	ldloc.1
-	ldc.i4 -23392
+	ldc.i4 -22928
 	add
 	stloc.1
 	ldloc.0
@@ -5439,17 +5439,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d24: 0x1080d24: lui   a0, 0x20000
+// 0x01081348: 0x1081348: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080d28: 0x1080d28: jal   0x101cd60 addiu a0, a0, -23376
+// 0x0108134c: 0x108134c: jal   0x101cd70 addiu a0, a0, -22912
 	ldloc.1
-	ldc.i4 -23376
+	ldc.i4 -22912
 	add
 	stloc.1
 	ldloc.0
@@ -5457,17 +5457,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d30: 0x1080d30: lui   a0, 0x20000
+// 0x01081354: 0x1081354: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080d34: 0x1080d34: jal   0x101cd60 addiu a0, a0, -23360
+// 0x01081358: 0x1081358: jal   0x101cd70 addiu a0, a0, -22896
 	ldloc.1
-	ldc.i4 -23360
+	ldc.i4 -22896
 	add
 	stloc.1
 	ldloc.0
@@ -5475,17 +5475,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d3c: 0x1080d3c: lui   a0, 0x20000
+// 0x01081360: 0x1081360: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080d40: 0x1080d40: jal   0x101cd60 addiu a0, a0, -23348
+// 0x01081364: 0x1081364: jal   0x101cd70 addiu a0, a0, -22884
 	ldloc.1
-	ldc.i4 -23348
+	ldc.i4 -22884
 	add
 	stloc.1
 	ldloc.0
@@ -5493,20 +5493,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d48: 0x1080d48: lui   a0, 0x20000
+// 0x0108136c: 0x108136c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080d4c: 0x1080d4c: addiu a0, a0, -23336
+// 0x01081370: 0x1081370: addiu a0, a0, -22872
 	ldloc.1
-	ldc.i4 -23336
+	ldc.i4 -22872
 	add
 	stloc.1
-// 0x01080d50: 0x1080d50: jal   0x101cd60 lui   s1, 0x80000
+// 0x01081374: 0x1081374: jal   0x101cd70 lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 8
 	ldloc.0
@@ -5514,24 +5514,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d58: 0x1080d58: addiu s1, s1, -13824
+// 0x0108137c: 0x108137c: addiu s1, s1, -13360
 	ldloc 8
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 8
-// 0x01080d5c: 0x1080d5c: addu  s0, zero, zero
+// 0x01081380: 0x1081380: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x01080d60: 0x1080d60: addiu s2, zero, 6
+// 0x01081384: 0x1081384: addiu s2, zero, 6
 	ldc.i4.6
 	stloc 10
-L_1080d64:
-// 0x01080d64: 0x1080d64: jal   0x1080c6c addu  a0, s0, zero
+L_1081388:
+// 0x01081388: 0x1081388: jal   0x1081290 addu  a0, s0, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -5539,33 +5539,33 @@ L_1080d64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::create_list_1080c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::create_list_1081290(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d6c: 0x1080d6c: addiu s0, s0, 1
+// 0x01081390: 0x1081390: addiu s0, s0, 1
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc 9
-// 0x01080d70: 0x1080d70: sw    v0, 0(s1)
+// 0x01081394: 0x1081394: sw    v0, 0(s1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01080d74: 0x1080d74: bne   s0, s2, 0x1080d64 addiu s1, s1, 4
+// 0x01081398: 0x1081398: bne   s0, s2, 0x1081388 addiu s1, s1, 4
 	ldloc 9
 	ldloc 10
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	bne.un L_1080d64
+	bne.un L_1081388
 // --- basic block ---
-// 0x01080d7c: 0x1080d7c: jal   0x10788cc addu  a0, zero, zero
+// 0x010813a0: 0x10813a0: jal   0x1078ef0 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5573,46 +5573,46 @@ L_1080d64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d84: 0x1080d84: jal   0x10799b8 sll   zero, zero, 0
+// 0x010813a8: 0x10813a8: jal   0x1079fdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d8c: 0x1080d8c: jal   0x107fd70 sll   zero, zero, 0
+// 0x010813b0: 0x10813b0: jal   0x1080394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_list_107fd70(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_list_1080394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d94: 0x1080d94: jal   0x10808dc sll   zero, zero, 0
+// 0x010813b8: 0x10813b8: jal   0x1080f00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_first_tab_10808dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_first_tab_1080f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01080d9c: 0x1080d9c: lw    ra, 28(sp)
-// 0x01080da0: 0x1080da0: lw    s2, 24(sp)
+// 0x010813c0: 0x10813c0: lw    ra, 28(sp)
+// 0x010813c4: 0x10813c4: lw    s2, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5621,7 +5621,7 @@ L_1080d64:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01080da4: 0x1080da4: lw    s1, 20(sp)
+// 0x010813c8: 0x10813c8: lw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5630,7 +5630,7 @@ L_1080d64:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080da8: 0x1080da8: lw    s0, 16(sp)
+// 0x010813cc: 0x10813cc: lw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5639,7 +5639,7 @@ L_1080d64:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01080dac: 0x1080dac: jr    ra addiu sp, sp, 32
+// 0x010813d0: 0x10813d0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5651,7 +5651,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_softkeys_1080db4(int32,int32,int32,int32,int32)
+.method public static int32 set_softkeys_10813d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 s1,int32 v1,int32 ra)
@@ -5692,12 +5692,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01080db4: 0x1080db4: addiu sp, sp, -32
+// 0x010813d8: 0x10813d8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01080db8: 0x1080db8: sw    s0, 20(sp)
+// 0x010813dc: 0x10813dc: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5706,19 +5706,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01080dbc: 0x1080dbc: addu  s0, a0, zero
+// 0x010813e0: 0x10813e0: addu  s0, a0, zero
 	ldloc.1
 	stloc 6
-// 0x01080dc0: 0x1080dc0: lui   a0, 0x10000
+// 0x010813e4: 0x10813e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01080dc4: 0x1080dc4: addiu a0, a0, -6188
+// 0x010813e8: 0x10813e8: addiu a0, a0, -6192
 	ldloc.1
-	ldc.i4 -6188
+	ldc.i4 -6192
 	add
 	stloc.1
-// 0x01080dc8: 0x1080dc8: sw    ra, 28(sp)
-// 0x01080dcc: 0x1080dcc: jal   0x101cd60 sw    s1, 24(sp)
+// 0x010813ec: 0x10813ec: sw    ra, 28(sp)
+// 0x010813f0: 0x10813f0: jal   0x101cd70 sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5732,18 +5732,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01080dd4: 0x1080dd4: lui   s1, 0x1080000
+// 0x010813f8: 0x10813f8: lui   s1, 0x1080000
 	ldc.i4 17301504
 	stloc 8
-// 0x01080dd8: 0x1080dd8: addu  a0, s0, zero
+// 0x010813fc: 0x10813fc: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01080ddc: 0x1080ddc: jal   0x109b434 addu  a1, v0, zero
+// 0x01081400: 0x1081400: jal   0x109ba7c addu  a1, v0, zero
 	ldloc 7
 	stloc.2
 	ldloc.0
@@ -5751,24 +5751,24 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01080de4: 0x1080de4: addu  a0, s0, zero
+// 0x01081408: 0x1081408: addu  a0, s0, zero
 	ldloc 6
 	stloc.1
-// 0x01080de8: 0x1080de8: jal   0x1099174 addiu a1, s1, 4112
+// 0x0108140c: 0x108140c: jal   0x10997bc addiu a1, s1, 5684
 	ldloc 8
-	ldc.i4 4112
+	ldc.i4 5684
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01080df0: 0x1080df0: lw    a1, 16(s0)
+// 0x01081414: 0x1081414: lw    a1, 16(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -5777,9 +5777,9 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01080df4: 0x1080df4: jal   0x109c5ec addiu a0, s1, 4112
+// 0x01081418: 0x1081418: jal   0x109cc34 addiu a0, s1, 5684
 	ldloc 8
-	ldc.i4 4112
+	ldc.i4 5684
 	add
 	stloc.1
 	ldloc.0
@@ -5787,13 +5787,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01080dfc: 0x1080dfc: lw    ra, 28(sp)
-// 0x01080e00: 0x1080e00: lw    s1, 24(sp)
+// 0x01081420: 0x1081420: lw    ra, 28(sp)
+// 0x01081424: 0x1081424: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5802,7 +5802,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080e04: 0x1080e04: lw    s0, 20(sp)
+// 0x01081428: 0x1081428: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -5811,7 +5811,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01080e08: 0x1080e08: jr    ra addiu sp, sp, 32
+// 0x0108142c: 0x108142c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -5823,7 +5823,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 ShowListMenu_1080e10(int32,int32,int32,int32,int32)
+.method public static int32 ShowListMenu_1081434(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -5867,13 +5867,13 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01080e10: 0x1080e10: addiu sp, sp, -80
+// 0x01081434: 0x1081434: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x01080e14: 0x1080e14: sw    ra, 76(sp)
-// 0x01080e18: 0x1080e18: sw    s2, 72(sp)
+// 0x01081438: 0x1081438: sw    ra, 76(sp)
+// 0x0108143c: 0x108143c: sw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5882,7 +5882,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01080e1c: 0x1080e1c: sw    s1, 68(sp)
+// 0x01081440: 0x1081440: sw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5891,7 +5891,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01080e20: 0x1080e20: jal   0x1093f90 sw    s0, 64(sp)
+// 0x01081444: 0x1081444: jal   0x10945b4 sw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5900,28 +5900,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl110::ssd_dialog_is_currently_active_1093f90()
+	call int32 Cibyl110::ssd_dialog_is_currently_active_10945b4()
 	stloc 5
 // --- basic block ---
-// 0x01080e28: 0x1080e28: beq   v0, zero, 0x1080e68 lui   s0, 0x80000
+// 0x0108144c: 0x108144c: beq   v0, zero, 0x108148c lui   s0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brfalse L_1080e68
+	brfalse L_108148c
 // --- basic block ---
-// 0x01080e30: 0x1080e30: jal   0x1093fc0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_currently_active_name_1093fc0()
+// 0x01081454: 0x1081454: jal   0x10945e4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_currently_active_name_10945e4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080e38: 0x1080e38: lui   a1, 0x10000
+// 0x0108145c: 0x108145c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x01080e3c: 0x1080e3c: addu  a0, v0, zero
+// 0x01081460: 0x1081460: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080e40: 0x1080e40: jal   0x1001b14 addiu a1, a1, -19268
+// 0x01081464: 0x1081464: jal   0x1001b14 addiu a1, a1, -19268
 	ldloc.2
 	ldc.i4 -19268
 	add
@@ -5931,13 +5931,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01080e48: 0x1080e48: bne   v0, zero, 0x1080e68 lui   s0, 0x80000
+// 0x0108146c: 0x108146c: bne   v0, zero, 0x108148c lui   s0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 8
-	brtrue L_1080e68
+	brtrue L_108148c
 // --- basic block ---
-// 0x01080e50: 0x1080e50: jal   0x1094b64 addu  a0, zero, zero
+// 0x01081474: 0x1081474: jal   0x10951ac addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -5945,63 +5945,63 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080e58: 0x1080e58: jal   0x102146c sll   zero, zero, 0
+// 0x0108147c: 0x108147c: jal   0x102147c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080e60: 0x1080e60: j	 0x1080fd4 sll   zero, zero, 0
-	br L_1080fd4
+// 0x01081484: 0x1081484: j	 0x10815f8 sll   zero, zero, 0
+	br L_10815f8
 // --- basic block ---
-L_1080e68:
-// 0x01080e68: 0x1080e68: lw    v0, -13844(s0)
+L_108148c:
+// 0x0108148c: 0x108148c: lw    v0, -13380(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3461
+	ldc.i4 -3345
 	add
 	ldelem.i4
 	stloc 5
-// 0x01080e6c: 0x1080e6c: sll   zero, zero, 0
-// 0x01080e70: 0x1080e70: beq   v0, zero, 0x1080ebc lui   v0, 0x80000
+// 0x01081490: 0x1081490: sll   zero, zero, 0
+// 0x01081494: 0x1081494: beq   v0, zero, 0x10814e0 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1080ebc
+	brfalse L_10814e0
 // --- basic block ---
-// 0x01080e78: 0x1080e78: addu  a0, zero, zero
+// 0x0108149c: 0x108149c: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01080e7c: 0x1080e7c: sw    zero, -13848(v0)
+// 0x010814a0: 0x10814a0: sw    zero, -13384(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3462
+	ldc.i4 -3346
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01080e80: 0x1080e80: lui   v0, 0x80000
+// 0x010814a4: 0x10814a4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01080e84: 0x1080e84: jal   0x10788cc sw    zero, -13852(v0)
+// 0x010814a8: 0x10814a8: jal   0x1078ef0 sw    zero, -13388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -6010,54 +6010,54 @@ L_1080e68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080e8c: 0x1080e8c: jal   0x10799b8 sll   zero, zero, 0
+// 0x010814b0: 0x10814b0: jal   0x1079fdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080e94: 0x1080e94: jal   0x107fd70 sll   zero, zero, 0
+// 0x010814b8: 0x10814b8: jal   0x1080394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_list_107fd70(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_list_1080394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080e9c: 0x1080e9c: jal   0x10808dc sll   zero, zero, 0
+// 0x010814c0: 0x10814c0: jal   0x1080f00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_first_tab_10808dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_first_tab_1080f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080ea4: 0x1080ea4: lw    a0, -13844(s0)
+// 0x010814c8: 0x10814c8: lw    a0, -13380(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3461
+	ldc.i4 -3345
 	add
 	ldelem.i4
 	stloc.1
-// 0x01080ea8: 0x1080ea8: jal   0x109d1bc addu  a1, zero, zero
+// 0x010814cc: 0x10814cc: jal   0x109d804 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6065,30 +6065,30 @@ L_1080e68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d1bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_set_active_tab_109d804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080eb0: 0x1080eb0: lw    s0, -13844(s0)
+// 0x010814d4: 0x10814d4: lw    s0, -13380(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3461
+	ldc.i4 -3345
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080eb4: 0x1080eb4: j	 0x1080fcc sll   zero, zero, 0
-	br L_1080fcc
+// 0x010814d8: 0x10814d8: j	 0x10815f0 sll   zero, zero, 0
+	br L_10815f0
 // --- basic block ---
-L_1080ebc:
-// 0x01080ebc: 0x1080ebc: lui   a0, 0x10000
+L_10814e0:
+// 0x010814e0: 0x10814e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01080ec0: 0x1080ec0: jal   0x101cd60 addiu a0, a0, 220
+// 0x010814e4: 0x10814e4: jal   0x101cd70 addiu a0, a0, 216
 	ldloc.1
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc.1
 	ldloc.0
@@ -6096,20 +6096,20 @@ L_1080ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080ec8: 0x1080ec8: lui   a0, 0x20000
+// 0x010814ec: 0x10814ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080ecc: 0x1080ecc: addiu a0, a0, -23392
+// 0x010814f0: 0x10814f0: addiu a0, a0, -22928
 	ldloc.1
-	ldc.i4 -23392
+	ldc.i4 -22928
 	add
 	stloc.1
-// 0x01080ed0: 0x1080ed0: jal   0x101cd60 sw    v0, 40(sp)
+// 0x010814f4: 0x10814f4: jal   0x101cd70 sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6123,20 +6123,20 @@ L_1080ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080ed8: 0x1080ed8: lui   a0, 0x20000
+// 0x010814fc: 0x10814fc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080edc: 0x1080edc: addiu a0, a0, -23376
+// 0x01081500: 0x1081500: addiu a0, a0, -22912
 	ldloc.1
-	ldc.i4 -23376
+	ldc.i4 -22912
 	add
 	stloc.1
-// 0x01080ee0: 0x1080ee0: jal   0x101cd60 sw    v0, 44(sp)
+// 0x01081504: 0x1081504: jal   0x101cd70 sw    v0, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6150,20 +6150,20 @@ L_1080ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080ee8: 0x1080ee8: lui   a0, 0x20000
+// 0x0108150c: 0x108150c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080eec: 0x1080eec: addiu a0, a0, -23360
+// 0x01081510: 0x1081510: addiu a0, a0, -22896
 	ldloc.1
-	ldc.i4 -23360
+	ldc.i4 -22896
 	add
 	stloc.1
-// 0x01080ef0: 0x1080ef0: jal   0x101cd60 sw    v0, 48(sp)
+// 0x01081514: 0x1081514: jal   0x101cd70 sw    v0, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6177,20 +6177,20 @@ L_1080ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080ef8: 0x1080ef8: lui   a0, 0x20000
+// 0x0108151c: 0x108151c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080efc: 0x1080efc: addiu a0, a0, -23348
+// 0x01081520: 0x1081520: addiu a0, a0, -22884
 	ldloc.1
-	ldc.i4 -23348
+	ldc.i4 -22884
 	add
 	stloc.1
-// 0x01080f00: 0x1080f00: jal   0x101cd60 sw    v0, 52(sp)
+// 0x01081524: 0x1081524: jal   0x101cd70 sw    v0, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6204,20 +6204,20 @@ L_1080ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080f08: 0x1080f08: lui   a0, 0x20000
+// 0x0108152c: 0x108152c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01080f0c: 0x1080f0c: addiu a0, a0, -23336
+// 0x01081530: 0x1081530: addiu a0, a0, -22872
 	ldloc.1
-	ldc.i4 -23336
+	ldc.i4 -22872
 	add
 	stloc.1
-// 0x01080f10: 0x1080f10: sw    v0, 56(sp)
+// 0x01081534: 0x1081534: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6226,7 +6226,7 @@ L_1080ebc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01080f14: 0x1080f14: jal   0x101cd60 lui   s1, 0x80000
+// 0x01081538: 0x1081538: jal   0x101cd70 lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 9
 	ldloc.0
@@ -6234,12 +6234,12 @@ L_1080ebc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080f1c: 0x1080f1c: sw    v0, 60(sp)
+// 0x01081540: 0x1081540: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6248,19 +6248,19 @@ L_1080ebc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01080f20: 0x1080f20: addiu s1, s1, -13824
+// 0x01081544: 0x1081544: addiu s1, s1, -13360
 	ldloc 9
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 9
-// 0x01080f24: 0x1080f24: addu  s0, zero, zero
+// 0x01081548: 0x1081548: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01080f28: 0x1080f28: addiu s2, zero, 6
+// 0x0108154c: 0x108154c: addiu s2, zero, 6
 	ldc.i4.6
 	stloc 10
-L_1080f2c:
-// 0x01080f2c: 0x1080f2c: jal   0x1080c6c addu  a0, s0, zero
+L_1081550:
+// 0x01081550: 0x1081550: jal   0x1081290 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6268,36 +6268,36 @@ L_1080f2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::create_list_1080c6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::create_list_1081290(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080f34: 0x1080f34: addiu s0, s0, 1
+// 0x01081558: 0x1081558: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01080f38: 0x1080f38: sw    v0, 0(s1)
+// 0x0108155c: 0x108155c: sw    v0, 0(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 5
 	stelem.i4
-// 0x01080f3c: 0x1080f3c: bne   s0, s2, 0x1080f2c addiu s1, s1, 4
+// 0x01081560: 0x1081560: bne   s0, s2, 0x1081550 addiu s1, s1, 4
 	ldloc 8
 	ldloc 10
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-	bne.un L_1080f2c
+	bne.un L_1081550
 // --- basic block ---
-// 0x01080f44: 0x1080f44: addu  a0, zero, zero
+// 0x01081568: 0x1081568: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01080f48: 0x1080f48: jal   0x10788cc lui   s1, 0x10000
+// 0x0108156c: 0x108156c: jal   0x1078ef0 lui   s1, 0x10000
 	ldc.i4 65536
 	stloc 9
 	ldloc.0
@@ -6305,34 +6305,34 @@ L_1080f2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080f50: 0x1080f50: jal   0x10799b8 sll   zero, zero, 0
+// 0x01081574: 0x1081574: jal   0x1079fdc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Stop_Scrolling_10799b8(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Stop_Scrolling_1079fdc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080f58: 0x1080f58: jal   0x107fd70 sll   zero, zero, 0
+// 0x0108157c: 0x108157c: jal   0x1080394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_list_107fd70(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_list_1080394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080f60: 0x1080f60: jal   0x101cd60 addiu a0, s1, -19268
+// 0x01081584: 0x1081584: jal   0x101cd70 addiu a0, s1, -19268
 	ldloc 9
 	ldc.i4 -19268
 	add
@@ -6342,23 +6342,23 @@ L_1080f2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080f68: 0x1080f68: addu  a1, v0, zero
+// 0x0108158c: 0x108158c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01080f6c: 0x1080f6c: lui   v0, 0x1080000
+// 0x01081590: 0x1081590: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x01080f70: 0x1080f70: addiu v0, v0, 6108
+// 0x01081594: 0x1081594: addiu v0, v0, 7680
 	ldloc 5
-	ldc.i4 6108
+	ldc.i4 7680
 	add
 	stloc 5
-// 0x01080f74: 0x1080f74: sw    v0, 16(sp)
+// 0x01081598: 0x1081598: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6367,12 +6367,12 @@ L_1080f2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01080f78: 0x1080f78: addiu v0, sp, 40
+// 0x0108159c: 0x108159c: addiu v0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc 5
-// 0x01080f7c: 0x1080f7c: sw    v0, 24(sp)
+// 0x010815a0: 0x10815a0: sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6381,26 +6381,26 @@ L_1080f2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01080f80: 0x1080f80: lui   v0, 0x80000
+// 0x010815a4: 0x10815a4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01080f84: 0x1080f84: addu  a2, zero, zero
+// 0x010815a8: 0x10815a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01080f88: 0x1080f88: addu  a3, zero, zero
+// 0x010815ac: 0x10815ac: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01080f8c: 0x1080f8c: addiu a0, s1, -19268
+// 0x010815b0: 0x10815b0: addiu a0, s1, -19268
 	ldloc 9
 	ldc.i4 -19268
 	add
 	stloc.1
-// 0x01080f90: 0x1080f90: addiu v0, v0, -13824
+// 0x010815b4: 0x10815b4: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x01080f94: 0x1080f94: sw    s0, 32(sp)
+// 0x010815b8: 0x10815b8: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6409,7 +6409,7 @@ L_1080f2c:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01080f98: 0x1080f98: sw    v0, 28(sp)
+// 0x010815bc: 0x10815bc: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6418,7 +6418,7 @@ L_1080f2c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01080f9c: 0x1080f9c: sw    zero, 20(sp)
+// 0x010815c0: 0x10815c0: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6427,7 +6427,7 @@ L_1080f2c:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01080fa0: 0x1080fa0: jal   0x109d890 sw    zero, 36(sp)
+// 0x010815c4: 0x10815c4: jal   0x109ded8 sw    zero, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6441,22 +6441,22 @@ L_1080f2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_new_109d890(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_new_109ded8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080fa8: 0x1080fa8: addu  a0, v0, zero
+// 0x010815cc: 0x10815cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01080fac: 0x1080fac: jal   0x109cc28 addu  s0, v0, zero
+// 0x010815d0: 0x10815d0: jal   0x109d270 addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
-	call int32 Cibyl117::ssd_tabcontrol_get_dialog_109cc28(int32)
+	call int32 Cibyl117::ssd_tabcontrol_get_dialog_109d270(int32)
 	stloc 5
 // --- basic block ---
-// 0x01080fb4: 0x1080fb4: jal   0x1080db4 addu  a0, v0, zero
+// 0x010815d8: 0x10815d8: jal   0x10813d8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6464,36 +6464,36 @@ L_1080f2c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::set_softkeys_1080db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::set_softkeys_10813d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080fbc: 0x1080fbc: jal   0x10808dc sll   zero, zero, 0
+// 0x010815e0: 0x10815e0: jal   0x1080f00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_first_tab_10808dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_first_tab_1080f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01080fc4: 0x1080fc4: lui   v0, 0x80000
+// 0x010815e8: 0x10815e8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01080fc8: 0x1080fc8: sw    s0, -13844(v0)
+// 0x010815ec: 0x10815ec: sw    s0, -13380(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3461
+	ldc.i4 -3345
 	add
 	ldloc 8
 	stelem.i4
-L_1080fcc:
-// 0x01080fcc: 0x1080fcc: jal   0x109d804 addu  a0, s0, zero
+L_10815f0:
+// 0x010815f0: 0x10815f0: jal   0x109de4c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -6501,14 +6501,14 @@ L_1080fcc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl117::ssd_tabcontrol_show_109d804(int32,int32,int32,int32,int32)
+	call int32 Cibyl117::ssd_tabcontrol_show_109de4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1080fd4:
-// 0x01080fd4: 0x1080fd4: lw    ra, 76(sp)
-// 0x01080fd8: 0x1080fd8: lw    s2, 72(sp)
+L_10815f8:
+// 0x010815f8: 0x10815f8: lw    ra, 76(sp)
+// 0x010815fc: 0x10815fc: lw    s2, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6517,7 +6517,7 @@ L_1080fd4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01080fdc: 0x1080fdc: lw    s1, 68(sp)
+// 0x01081600: 0x1081600: lw    s1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6526,7 +6526,7 @@ L_1080fd4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01080fe0: 0x1080fe0: lw    s0, 64(sp)
+// 0x01081604: 0x1081604: lw    s0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6535,7 +6535,7 @@ L_1080fd4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01080fe4: 0x1080fe4: jr    ra addiu sp, sp, 80
+// 0x01081608: 0x1081608: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
diff --git a/converted/Cibyl97.j b/converted/Cibyl97.j
index 3ad35c1..28bb2ef 100644
--- a/converted/Cibyl97.j
+++ b/converted/Cibyl97.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl97::.ctor
 
-.method public static int32 RealtimeAlertsList_1080fec(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAlertsList_1081610(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -76,22 +76,22 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1080fec:
-// 0x01080fec: 0x1080fec: addiu sp, sp, -24
+L_1081610:
+// 0x01081610: 0x1081610: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01080ff0: 0x1080ff0: lui   v0, 0x80000
+// 0x01081614: 0x1081614: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01080ff4: 0x1080ff4: sw    ra, 20(sp)
-// 0x01080ff8: 0x1080ff8: jal   0x1080e10 sw    zero, -13852(v0)
+// 0x01081618: 0x1081618: sw    ra, 20(sp)
+// 0x0108161c: 0x108161c: jal   0x1081434 sw    zero, -13388(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -100,14 +100,14 @@ L_1080fec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::ShowListMenu_1080e10(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::ShowListMenu_1081434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01081000: 0x1081000: lw    ra, 20(sp)
-// 0x01081004: 0x1081004: sll   zero, zero, 0
-// 0x01081008: 0x1081008: jr    ra addiu sp, sp, 24
+// 0x01081624: 0x1081624: lw    ra, 20(sp)
+// 0x01081628: 0x1081628: sll   zero, zero, 0
+// 0x0108162c: 0x108162c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -119,7 +119,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_options_1081010(int32,int32,int32,int32,int32)
+.method public static int32 on_options_1081634(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s2,int32 s6,int32 s3,int32 s5,int32 s1,int32 s4,int32 ra)
@@ -175,12 +175,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01081010: 0x1081010: addiu sp, sp, -64
+// 0x01081634: 0x1081634: addiu sp, sp, -64
 	ldloc.0
 	ldc.i4.s -64
 	add
 	stloc.0
-// 0x01081014: 0x1081014: sw    s1, 36(sp)
+// 0x01081638: 0x1081638: sw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -189,8 +189,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01081018: 0x1081018: sw    ra, 60(sp)
-// 0x0108101c: 0x108101c: sw    s6, 56(sp)
+// 0x0108163c: 0x108163c: sw    ra, 60(sp)
+// 0x01081640: 0x1081640: sw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -199,7 +199,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01081020: 0x1081020: sw    s5, 52(sp)
+// 0x01081644: 0x1081644: sw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -208,7 +208,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01081024: 0x1081024: sw    s4, 48(sp)
+// 0x01081648: 0x1081648: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -217,7 +217,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01081028: 0x1081028: sw    s3, 44(sp)
+// 0x0108164c: 0x108164c: sw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -226,7 +226,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x0108102c: 0x108102c: sw    s2, 40(sp)
+// 0x01081650: 0x1081650: sw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -235,7 +235,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01081030: 0x1081030: jal   0x1053f94 sw    s0, 32(sp)
+// 0x01081654: 0x1081654: jal   0x1053fa4 sw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -244,87 +244,87 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-	call int32 Cibyl62::roadmap_groups_display_groups_supported_1053f94()
+	call int32 Cibyl62::roadmap_groups_display_groups_supported_1053fa4()
 	stloc 5
 // --- basic block ---
-// 0x01081038: 0x1081038: addu  s1, v0, zero
+// 0x0108165c: 0x108165c: addu  s1, v0, zero
 	ldloc 5
 	stloc 13
-// 0x0108103c: 0x108103c: lui   v0, 0x80000
+// 0x01081660: 0x1081660: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081040: 0x1081040: lw    v0, -13840(v0)
+// 0x01081664: 0x1081664: lw    v0, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081044: 0x1081044: sll   zero, zero, 0
-// 0x01081048: 0x1081048: bne   v0, zero, 0x1081060 lui   v1, 0x80000
+// 0x01081668: 0x1081668: sll   zero, zero, 0
+// 0x0108166c: 0x108166c: bne   v0, zero, 0x1081684 lui   v1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brtrue L_1081060
+	brtrue L_1081684
 // --- basic block ---
-// 0x01081050: 0x1081050: lui   v1, 0x80000
+// 0x01081674: 0x1081674: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01081054: 0x1081054: lw    s0, -11000(v1)
+// 0x01081678: 0x1081678: lw    s0, -10536(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2750
+	ldc.i4 -2634
 	add
 	ldelem.i4
 	stloc 8
-// 0x01081058: 0x1081058: j	 0x108106c slti  s0, s0, 2
+// 0x0108167c: 0x108167c: j	 0x1081690 slti  s0, s0, 2
 	ldloc 8
 	ldc.i4.2
 	clt
 	stloc 8
-	br L_108106c
+	br L_1081690
 // --- basic block ---
-L_1081060:
-// 0x01081060: 0x1081060: lw    s0, -8196(v1)
+L_1081684:
+// 0x01081684: 0x1081684: lw    s0, -7732(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2049
+	ldc.i4 -1933
 	add
 	ldelem.i4
 	stloc 8
-// 0x01081064: 0x1081064: sll   zero, zero, 0
-// 0x01081068: 0x1081068: slti  s0, s0, 1
+// 0x01081688: 0x1081688: sll   zero, zero, 0
+// 0x0108168c: 0x108168c: slti  s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	clt
 	stloc 8
-L_108106c:
-// 0x0108106c: 0x108106c: lui   s2, 0x80000
+L_1081690:
+// 0x01081690: 0x1081690: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x01081070: 0x1081070: lw    v1, -13836(s2)
+// 0x01081694: 0x1081694: lw    v1, -13372(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3459
+	ldc.i4 -3343
 	add
 	ldelem.i4
 	stloc 6
-// 0x01081074: 0x1081074: sll   zero, zero, 0
-// 0x01081078: 0x1081078: beq   v1, zero, 0x1081090 lui   v1, 0x80000
+// 0x01081698: 0x1081698: sll   zero, zero, 0
+// 0x0108169c: 0x108169c: beq   v1, zero, 0x10816b4 lui   v1, 0x80000
 	ldloc 6
 	ldc.i4 524288
 	stloc 6
-	brfalse L_1081090
+	brfalse L_10816b4
 // --- basic block ---
-// 0x01081080: 0x1081080: jal   0x1094b64 addiu a0, zero, 1
+// 0x010816a4: 0x10816a4: jal   0x10951ac addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -332,76 +332,76 @@ L_108106c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_current_1094b64(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_current_10951ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081088: 0x1081088: j	 0x108134c sw    zero, -13836(s2)
+// 0x010816ac: 0x10816ac: j	 0x1081970 sw    zero, -13372(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3459
+	ldc.i4 -3343
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_108134c
+	br L_1081970
 // --- basic block ---
-L_1081090:
-// 0x01081090: 0x1081090: sll   v0, v0, 2
+L_10816b4:
+// 0x010816b4: 0x10816b4: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01081094: 0x1081094: addiu v1, v1, -13824
+// 0x010816b8: 0x10816b8: addiu v1, v1, -13360
 	ldloc 6
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 6
-// 0x01081098: 0x1081098: addu  v0, v0, v1
+// 0x010816bc: 0x10816bc: addu  v0, v0, v1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x0108109c: 0x108109c: lw    a0, 0(v0)
+// 0x010816c0: 0x10816c0: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010810a0: 0x10810a0: jal   0x109162c sll   zero, zero, 0
+// 0x010816c4: 0x10816c4: jal   0x1091c50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010810a8: 0x10810a8: bne   v0, zero, 0x10810c4 addu  s4, zero, zero
+// 0x010816cc: 0x10816cc: bne   v0, zero, 0x10816e8 addu  s4, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc 14
-	brtrue L_10810c4
+	brtrue L_10816e8
 // --- basic block ---
-// 0x010810b0: 0x10810b0: addu  s5, zero, zero
+// 0x010816d4: 0x10816d4: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x010810b4: 0x10810b4: addu  s2, zero, zero
+// 0x010816d8: 0x10816d8: addu  s2, zero, zero
 	ldc.i4.s 0
 	stloc 9
-// 0x010810b8: 0x10810b8: addu  s6, zero, zero
+// 0x010816dc: 0x10816dc: addu  s6, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010810bc: 0x10810bc: j	 0x108112c addu  s3, zero, zero
+// 0x010816e0: 0x10816e0: j	 0x1081750 addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 11
-	br L_108112c
+	br L_1081750
 // --- basic block ---
-L_10810c4:
-// 0x010810c4: 0x10810c4: jal   0x1000d8c addu  a0, v0, zero
+L_10816e8:
+// 0x010816e8: 0x10816e8: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -414,25 +414,25 @@ L_10810c4:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010810cc: 0x10810cc: addu  s6, v0, zero
+// 0x010816f0: 0x10816f0: addu  s6, v0, zero
 	ldloc 5
 	stloc 10
-// 0x010810d0: 0x10810d0: jal   0x10771d8 addu  a0, v0, zero
+// 0x010816f4: 0x10816f4: jal   0x10777fc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10771d8(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10777fc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010810d8: 0x10810d8: addu  a0, s6, zero
+// 0x010816fc: 0x10816fc: addu  a0, s6, zero
 	ldloc 10
 	stloc.1
-// 0x010810dc: 0x10810dc: jal   0x1077bf0 sltu  s3, zero, v0
+// 0x01081700: 0x1081700: jal   0x1078214 sltu  s3, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
@@ -441,50 +441,50 @@ L_10810c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_isByMe_1077bf0(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_isByMe_1078214(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010810e4: 0x10810e4: addu  a0, s6, zero
+// 0x01081708: 0x1081708: addu  a0, s6, zero
 	ldloc 10
 	stloc.1
-// 0x010810e8: 0x10810e8: jal   0x1077274 addu  s4, v0, zero
+// 0x0108170c: 0x108170c: jal   0x1077898 addu  s4, v0, zero
 	ldloc 5
 	stloc 14
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Has_Image_1077274(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Has_Image_1077898(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010810f0: 0x10810f0: addu  a0, s6, zero
+// 0x01081714: 0x1081714: addu  a0, s6, zero
 	ldloc 10
 	stloc.1
-// 0x010810f4: 0x10810f4: jal   0x107733c addu  s5, v0, zero
+// 0x01081718: 0x1081718: jal   0x1077960 addu  s5, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Type_By_Id_107733c(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Type_By_Id_1077960(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010810fc: 0x10810fc: xori  v0, v0, 4
+// 0x01081720: 0x1081720: xori  v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	xor
 	stloc 5
-// 0x01081100: 0x1081100: addu  a0, s6, zero
+// 0x01081724: 0x1081724: addu  a0, s6, zero
 	ldloc 10
 	stloc.1
-// 0x01081104: 0x1081104: jal   0x107738c sltiu s2, v0, 1
+// 0x01081728: 0x1081728: jal   0x10779b0 sltiu s2, v0, 1
 	ldloc 5
 	ldc.i4.1
 	clt.un
@@ -493,63 +493,63 @@ L_10810c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_GroupName_By_Id_107738c(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_GroupName_By_Id_10779b0(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108110c: 0x108110c: beq   v0, zero, 0x1081124 sll   zero, zero, 0
+// 0x01081730: 0x1081730: beq   v0, zero, 0x1081748 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081124
+	brfalse L_1081748
 // --- basic block ---
-// 0x01081114: 0x1081114: lb    v0, 0(v0)
+// 0x01081738: 0x1081738: lb    v0, 0(v0)
 	ldloc 5
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01081118: 0x1081118: sll   zero, zero, 0
-// 0x0108111c: 0x108111c: bne   v0, zero, 0x1081128 andi  s1, s1, 1
+// 0x0108173c: 0x108173c: sll   zero, zero, 0
+// 0x01081740: 0x1081740: bne   v0, zero, 0x108174c andi  s1, s1, 1
 	ldloc 5
 	ldloc 13
 	ldc.i4.1
 	and
 	stloc 13
-	brtrue L_1081128
+	brtrue L_108174c
 // --- basic block ---
-L_1081124:
-// 0x01081124: 0x1081124: addu  s1, zero, zero
+L_1081748:
+// 0x01081748: 0x1081748: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 13
-L_1081128:
-// 0x01081128: 0x1081128: addiu s6, zero, 1
+L_108174c:
+// 0x0108174c: 0x108174c: addiu s6, zero, 1
 	ldc.i4.1
 	stloc 10
-L_108112c:
-// 0x0108112c: 0x108112c: sltiu a2, s0, 1
+L_1081750:
+// 0x01081750: 0x1081750: sltiu a2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x01081130: 0x1081130: subu  a2, zero, a2
+// 0x01081754: 0x1081754: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x01081134: 0x1081134: lui   a0, 0x0
+// 0x01081758: 0x1081758: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01081138: 0x1081138: addiu a0, a0, 16656
+// 0x0108175c: 0x108175c: addiu a0, a0, 16656
 	ldloc.1
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x0108113c: 0x108113c: and   a2, s6, a2
+// 0x01081760: 0x1081760: and   a2, s6, a2
 	ldloc 10
 	ldloc.3
 	and
 	stloc.3
-// 0x01081140: 0x1081140: addu  a1, zero, zero
+// 0x01081764: 0x1081764: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081144: 0x1081144: jal   0x109c504 addu  a3, zero, zero
+// 0x01081768: 0x1081768: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -557,41 +557,41 @@ L_108112c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108114c: 0x108114c: bne   s0, zero, 0x1081160 addu  a2, zero, zero
+// 0x01081770: 0x1081770: bne   s0, zero, 0x1081784 addu  a2, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_1081160
+	brtrue L_1081784
 // --- basic block ---
-// 0x01081154: 0x1081154: bne   s6, zero, 0x1081160 sltu  a2, zero, s5
+// 0x01081778: 0x1081778: bne   s6, zero, 0x1081784 sltu  a2, zero, s5
 	ldloc 10
 	ldc.i4.s 0
 	ldloc 12
 	clt.un
 	stloc.3
-	brtrue L_1081160
+	brtrue L_1081784
 // --- basic block ---
-// 0x0108115c: 0x108115c: addu  a2, zero, zero
+// 0x01081780: 0x1081780: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_1081160:
-// 0x01081160: 0x1081160: lui   a0, 0x0
+L_1081784:
+// 0x01081784: 0x1081784: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01081164: 0x1081164: addiu a0, a0, 16656
+// 0x01081788: 0x1081788: addiu a0, a0, 16656
 	ldloc.1
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x01081168: 0x1081168: addiu a1, zero, 8
+// 0x0108178c: 0x108178c: addiu a1, zero, 8
 	ldc.i4.8
 	stloc.2
-// 0x0108116c: 0x108116c: jal   0x109c504 addu  a3, zero, zero
+// 0x01081790: 0x1081790: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -599,41 +599,41 @@ L_1081160:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081174: 0x1081174: bne   s0, zero, 0x1081188 addu  a2, zero, zero
+// 0x01081798: 0x1081798: bne   s0, zero, 0x10817ac addu  a2, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_1081188
+	brtrue L_10817ac
 // --- basic block ---
-// 0x0108117c: 0x108117c: bne   s6, zero, 0x1081188 xori  a2, s2, 1
+// 0x010817a0: 0x10817a0: bne   s6, zero, 0x10817ac xori  a2, s2, 1
 	ldloc 10
 	ldloc 9
 	ldc.i4.1
 	xor
 	stloc.3
-	brtrue L_1081188
+	brtrue L_10817ac
 // --- basic block ---
-// 0x01081184: 0x1081184: addu  a2, zero, zero
+// 0x010817a8: 0x10817a8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_1081188:
-// 0x01081188: 0x1081188: lui   a0, 0x0
+L_10817ac:
+// 0x010817ac: 0x10817ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x0108118c: 0x108118c: addiu a0, a0, 16656
+// 0x010817b0: 0x10817b0: addiu a0, a0, 16656
 	ldloc.1
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x01081190: 0x1081190: addiu a1, zero, 3
+// 0x010817b4: 0x10817b4: addiu a1, zero, 3
 	ldc.i4.3
 	stloc.2
-// 0x01081194: 0x1081194: jal   0x109c504 addu  a3, zero, zero
+// 0x010817b8: 0x10817b8: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -641,49 +641,49 @@ L_1081188:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108119c: 0x108119c: bne   s0, zero, 0x10811b8 addu  a2, zero, zero
+// 0x010817c0: 0x10817c0: bne   s0, zero, 0x10817dc addu  a2, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_10811b8
+	brtrue L_10817dc
 // --- basic block ---
-// 0x010811a4: 0x10811a4: beq   s6, zero, 0x10811bc lui   s5, 0x0
+// 0x010817c8: 0x10817c8: beq   s6, zero, 0x10817e0 lui   s5, 0x0
 	ldloc 10
 	ldc.i4.s 0
 	stloc 12
-	brfalse L_10811bc
+	brfalse L_10817e0
 // --- basic block ---
-// 0x010811ac: 0x10811ac: or    s2, s4, s2
+// 0x010817d0: 0x10817d0: or    s2, s4, s2
 	ldloc 14
 	ldloc 9
 	or
 	stloc 9
-// 0x010811b0: 0x10811b0: j	 0x10811bc sltiu a2, s2, 1
+// 0x010817d4: 0x10817d4: j	 0x10817e0 sltiu a2, s2, 1
 	ldloc 9
 	ldc.i4.1
 	clt.un
 	stloc.3
-	br L_10811bc
+	br L_10817e0
 // --- basic block ---
-L_10811b8:
-// 0x010811b8: 0x10811b8: lui   s5, 0x0
+L_10817dc:
+// 0x010817dc: 0x10817dc: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 12
-L_10811bc:
-// 0x010811bc: 0x10811bc: addiu a0, s5, 16656
+L_10817e0:
+// 0x010817e0: 0x10817e0: addiu a0, s5, 16656
 	ldloc 12
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x010811c0: 0x10811c0: addiu a1, zero, 9
+// 0x010817e4: 0x10817e4: addiu a1, zero, 9
 	ldc.i4.s 9
 	stloc.2
-// 0x010811c4: 0x10811c4: jal   0x109c504 addu  a3, zero, zero
+// 0x010817e8: 0x10817e8: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -691,34 +691,34 @@ L_10811bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010811cc: 0x10811cc: sltiu a2, s0, 1
+// 0x010817f0: 0x10817f0: sltiu a2, s0, 1
 	ldloc 8
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x010811d0: 0x10811d0: subu  a2, zero, a2
+// 0x010817f4: 0x10817f4: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x010811d4: 0x10811d4: addiu a0, s5, 16656
+// 0x010817f8: 0x10817f8: addiu a0, s5, 16656
 	ldloc 12
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x010811d8: 0x10811d8: and   a2, s6, a2
+// 0x010817fc: 0x10817fc: and   a2, s6, a2
 	ldloc 10
 	ldloc.3
 	and
 	stloc.3
-// 0x010811dc: 0x10811dc: addiu a1, zero, 1
+// 0x01081800: 0x1081800: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010811e0: 0x10811e0: jal   0x109c504 addu  a3, zero, zero
+// 0x01081804: 0x1081804: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -726,44 +726,44 @@ L_10811bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010811e8: 0x10811e8: bne   s0, zero, 0x10811fc addu  a2, zero, zero
+// 0x0108180c: 0x108180c: bne   s0, zero, 0x1081820 addu  a2, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_10811fc
+	brtrue L_1081820
 // --- basic block ---
-// 0x010811f0: 0x10811f0: bne   s6, zero, 0x10811fc sltu  a2, zero, s3
+// 0x01081814: 0x1081814: bne   s6, zero, 0x1081820 sltu  a2, zero, s3
 	ldloc 10
 	ldc.i4.s 0
 	ldloc 11
 	clt.un
 	stloc.3
-	brtrue L_10811fc
+	brtrue L_1081820
 // --- basic block ---
-// 0x010811f8: 0x10811f8: addu  a2, zero, zero
+// 0x0108181c: 0x108181c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_10811fc:
-// 0x010811fc: 0x10811fc: lui   s2, 0x0
+L_1081820:
+// 0x01081820: 0x1081820: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01081200: 0x1081200: lui   s3, 0x80000
+// 0x01081824: 0x1081824: lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 11
-// 0x01081204: 0x1081204: addiu a0, s2, 16656
+// 0x01081828: 0x1081828: addiu a0, s2, 16656
 	ldloc 9
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x01081208: 0x1081208: addiu a1, zero, 2
+// 0x0108182c: 0x108182c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0108120c: 0x108120c: jal   0x109c504 addu  a3, zero, zero
+// 0x01081830: 0x1081830: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -771,53 +771,53 @@ L_10811fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081214: 0x1081214: lw    a2, -13848(s3)
+// 0x01081838: 0x1081838: lw    a2, -13384(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3462
+	ldc.i4 -3346
 	add
 	ldelem.i4
 	stloc.3
-// 0x01081218: 0x1081218: xori  v0, s0, 1
+// 0x0108183c: 0x108183c: xori  v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc 5
-// 0x0108121c: 0x108121c: xori  a2, a2, 1
+// 0x01081840: 0x1081840: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x01081220: 0x1081220: sltiu a2, a2, 1
+// 0x01081844: 0x1081844: sltiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x01081224: 0x1081224: subu  a2, zero, a2
+// 0x01081848: 0x1081848: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x01081228: 0x1081228: and   a2, v0, a2
+// 0x0108184c: 0x108184c: and   a2, v0, a2
 	ldloc 5
 	ldloc.3
 	and
 	stloc.3
-// 0x0108122c: 0x108122c: addiu a0, s2, 16656
+// 0x01081850: 0x1081850: addiu a0, s2, 16656
 	ldloc 9
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x01081230: 0x1081230: addiu a1, zero, 4
+// 0x01081854: 0x1081854: addiu a1, zero, 4
 	ldc.i4.4
 	stloc.2
-// 0x01081234: 0x1081234: jal   0x109c504 addu  a3, zero, zero
+// 0x01081858: 0x1081858: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -825,51 +825,51 @@ L_10811fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108123c: 0x108123c: lw    a2, -13848(s3)
+// 0x01081860: 0x1081860: lw    a2, -13384(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3462
+	ldc.i4 -3346
 	add
 	ldelem.i4
 	stloc.3
-// 0x01081240: 0x1081240: xori  v0, s0, 1
+// 0x01081864: 0x1081864: xori  v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc 5
-// 0x01081244: 0x1081244: sltiu a2, a2, 1
+// 0x01081868: 0x1081868: sltiu a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	clt.un
 	stloc.3
-// 0x01081248: 0x1081248: subu  a2, zero, a2
+// 0x0108186c: 0x108186c: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x0108124c: 0x108124c: and   a2, v0, a2
+// 0x01081870: 0x1081870: and   a2, v0, a2
 	ldloc 5
 	ldloc.3
 	and
 	stloc.3
-// 0x01081250: 0x1081250: lui   s3, 0x80000
+// 0x01081874: 0x1081874: lui   s3, 0x80000
 	ldc.i4 524288
 	stloc 11
-// 0x01081254: 0x1081254: addiu a0, s2, 16656
+// 0x01081878: 0x1081878: addiu a0, s2, 16656
 	ldloc 9
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x01081258: 0x1081258: addiu a1, zero, 5
+// 0x0108187c: 0x108187c: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0108125c: 0x108125c: jal   0x109c504 addu  a3, zero, zero
+// 0x01081880: 0x1081880: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -877,34 +877,34 @@ L_10811fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081264: 0x1081264: lw    a2, -13852(s3)
+// 0x01081888: 0x1081888: lw    a2, -13388(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc.3
-// 0x01081268: 0x1081268: addiu a0, s2, 16656
+// 0x0108188c: 0x108188c: addiu a0, s2, 16656
 	ldloc 9
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x0108126c: 0x108126c: sltu  a2, zero, a2
+// 0x01081890: 0x1081890: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x01081270: 0x1081270: addiu a1, zero, 13
+// 0x01081894: 0x1081894: addiu a1, zero, 13
 	ldc.i4.s 13
 	stloc.2
-// 0x01081274: 0x1081274: jal   0x109c504 addu  a3, zero, zero
+// 0x01081898: 0x1081898: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -912,53 +912,53 @@ L_10811fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108127c: 0x108127c: lw    a2, -13852(s3)
+// 0x010818a0: 0x10818a0: lw    a2, -13388(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc.3
-// 0x01081280: 0x1081280: xori  v0, s0, 1
+// 0x010818a4: 0x10818a4: xori  v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc 5
-// 0x01081284: 0x1081284: xori  a2, a2, 1
+// 0x010818a8: 0x10818a8: xori  a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	xor
 	stloc.3
-// 0x01081288: 0x1081288: sltu  a2, zero, a2
+// 0x010818ac: 0x10818ac: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x0108128c: 0x108128c: subu  a2, zero, a2
+// 0x010818b0: 0x10818b0: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x01081290: 0x1081290: and   a2, v0, a2
+// 0x010818b4: 0x10818b4: and   a2, v0, a2
 	ldloc 5
 	ldloc.3
 	and
 	stloc.3
-// 0x01081294: 0x1081294: addiu a0, s2, 16656
+// 0x010818b8: 0x10818b8: addiu a0, s2, 16656
 	ldloc 9
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x01081298: 0x1081298: addiu a1, zero, 10
+// 0x010818bc: 0x10818bc: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x0108129c: 0x108129c: jal   0x109c504 addu  a3, zero, zero
+// 0x010818c0: 0x10818c0: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -966,53 +966,53 @@ L_10811fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010812a4: 0x10812a4: lw    a2, -13852(s3)
+// 0x010818c8: 0x10818c8: lw    a2, -13388(s3)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc.3
-// 0x010812a8: 0x10812a8: xori  v0, s0, 1
+// 0x010818cc: 0x10818cc: xori  v0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	xor
 	stloc 5
-// 0x010812ac: 0x10812ac: xori  a2, a2, 2
+// 0x010818d0: 0x10818d0: xori  a2, a2, 2
 	ldloc.3
 	ldc.i4.2
 	xor
 	stloc.3
-// 0x010812b0: 0x10812b0: sltu  a2, zero, a2
+// 0x010818d4: 0x10818d4: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.3
 	clt.un
 	stloc.3
-// 0x010812b4: 0x10812b4: subu  a2, zero, a2
+// 0x010818d8: 0x10818d8: subu  a2, zero, a2
 	ldloc.3
 	neg
 	stloc.3
-// 0x010812b8: 0x10812b8: and   a2, v0, a2
+// 0x010818dc: 0x10818dc: and   a2, v0, a2
 	ldloc 5
 	ldloc.3
 	and
 	stloc.3
-// 0x010812bc: 0x10812bc: addiu a0, s2, 16656
+// 0x010818e0: 0x10818e0: addiu a0, s2, 16656
 	ldloc 9
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x010812c0: 0x10812c0: addiu a1, zero, 11
+// 0x010818e4: 0x10818e4: addiu a1, zero, 11
 	ldc.i4.s 11
 	stloc.2
-// 0x010812c4: 0x10812c4: jal   0x109c504 addu  a3, zero, zero
+// 0x010818e8: 0x10818e8: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1020,41 +1020,41 @@ L_10811fc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010812cc: 0x10812cc: bne   s0, zero, 0x10812e0 addu  a2, zero, zero
+// 0x010818f0: 0x10818f0: bne   s0, zero, 0x1081904 addu  a2, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc.3
-	brtrue L_10812e0
+	brtrue L_1081904
 // --- basic block ---
-// 0x010812d4: 0x10812d4: bne   s6, zero, 0x10812e0 sltu  a2, zero, s1
+// 0x010818f8: 0x10818f8: bne   s6, zero, 0x1081904 sltu  a2, zero, s1
 	ldloc 10
 	ldc.i4.s 0
 	ldloc 13
 	clt.un
 	stloc.3
-	brtrue L_10812e0
+	brtrue L_1081904
 // --- basic block ---
-// 0x010812dc: 0x10812dc: addu  a2, zero, zero
+// 0x01081900: 0x1081900: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-L_10812e0:
-// 0x010812e0: 0x10812e0: lui   s0, 0x0
+L_1081904:
+// 0x01081904: 0x1081904: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x010812e4: 0x10812e4: addiu a0, s0, 16656
+// 0x01081908: 0x1081908: addiu a0, s0, 16656
 	ldloc 8
 	ldc.i4 16656
 	add
 	stloc.1
-// 0x010812e8: 0x10812e8: addiu a1, zero, 12
+// 0x0108190c: 0x108190c: addiu a1, zero, 12
 	ldc.i4.s 12
 	stloc.2
-// 0x010812ec: 0x10812ec: jal   0x109c504 addu  a3, zero, zero
+// 0x01081910: 0x1081910: jal   0x109cb4c addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -1062,21 +1062,21 @@ L_10812e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010812f4: 0x10812f4: addiu a1, zero, 7
+// 0x01081918: 0x1081918: addiu a1, zero, 7
 	ldc.i4.7
 	stloc.2
-// 0x010812f8: 0x10812f8: addu  a2, zero, zero
+// 0x0108191c: 0x108191c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010812fc: 0x10812fc: addu  a3, zero, zero
+// 0x01081920: 0x1081920: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01081300: 0x1081300: jal   0x109c504 addiu a0, s0, 16656
+// 0x01081924: 0x1081924: jal   0x109cb4c addiu a0, s0, 16656
 	ldloc 8
 	ldc.i4 16656
 	add
@@ -1086,12 +1086,12 @@ L_10812e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_show_item_109c504(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_show_item_109cb4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081308: 0x1081308: jal   0x109a424 addu  a0, zero, zero
+// 0x0108192c: 0x108192c: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -1099,28 +1099,28 @@ L_10812e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081310: 0x1081310: sltu  v0, zero, v0
+// 0x01081934: 0x1081934: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01081314: 0x1081314: nor   a0, zero, v0
+// 0x01081938: 0x1081938: nor   a0, zero, v0
 	ldloc 5
 	ldc.i4.m1
 	xor
 	stloc.1
-// 0x01081318: 0x1081318: lui   a3, 0x1080000
+// 0x0108193c: 0x108193c: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x0108131c: 0x108131c: addiu v0, zero, 2
+// 0x01081940: 0x1081940: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01081320: 0x1081320: sw    v0, 20(sp)
+// 0x01081944: 0x1081944: sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1129,23 +1129,23 @@ L_10812e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01081324: 0x1081324: addiu a2, s0, 16656
+// 0x01081948: 0x1081948: addiu a2, s0, 16656
 	ldloc 8
 	ldc.i4 16656
 	add
 	stloc.3
-// 0x01081328: 0x1081328: addiu v0, zero, 1
+// 0x0108194c: 0x108194c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108132c: 0x108132c: addiu a3, a3, 6336
+// 0x01081950: 0x1081950: addiu a3, a3, 7908
 	ldloc 4
-	ldc.i4 6336
+	ldc.i4 7908
 	add
 	stloc 4
-// 0x01081330: 0x1081330: addiu a1, zero, -2
+// 0x01081954: 0x1081954: addiu a1, zero, -2
 	ldc.i4.s -2
 	stloc.2
-// 0x01081334: 0x1081334: sw    v0, 28(sp)
+// 0x01081958: 0x1081958: sw    v0, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1154,7 +1154,7 @@ L_10812e0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01081338: 0x1081338: sw    zero, 16(sp)
+// 0x0108195c: 0x108195c: sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1163,7 +1163,7 @@ L_10812e0:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108133c: 0x108133c: jal   0x109c7f0 sw    zero, 24(sp)
+// 0x01081960: 0x1081960: jal   0x109ce38 sw    zero, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1177,29 +1177,29 @@ L_10812e0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_context_menu_show_109c7f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_context_menu_show_109ce38(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081344: 0x1081344: lui   v1, 0x80000
+// 0x01081968: 0x1081968: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01081348: 0x1081348: sw    v0, -13836(v1)
+// 0x0108196c: 0x108196c: sw    v0, -13372(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3459
+	ldc.i4 -3343
 	add
 	ldloc 5
 	stelem.i4
-L_108134c:
-// 0x0108134c: 0x108134c: lw    ra, 60(sp)
-// 0x01081350: 0x1081350: addu  v0, zero, zero
+L_1081970:
+// 0x01081970: 0x1081970: lw    ra, 60(sp)
+// 0x01081974: 0x1081974: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x01081354: 0x1081354: lw    s6, 56(sp)
+// 0x01081978: 0x1081978: lw    s6, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1208,7 +1208,7 @@ L_108134c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01081358: 0x1081358: lw    s5, 52(sp)
+// 0x0108197c: 0x108197c: lw    s5, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1217,7 +1217,7 @@ L_108134c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x0108135c: 0x108135c: lw    s4, 48(sp)
+// 0x01081980: 0x1081980: lw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1226,7 +1226,7 @@ L_108134c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01081360: 0x1081360: lw    s3, 44(sp)
+// 0x01081984: 0x1081984: lw    s3, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1235,7 +1235,7 @@ L_108134c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01081364: 0x1081364: lw    s2, 40(sp)
+// 0x01081988: 0x1081988: lw    s2, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1244,7 +1244,7 @@ L_108134c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01081368: 0x1081368: lw    s1, 36(sp)
+// 0x0108198c: 0x108198c: lw    s1, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1253,7 +1253,7 @@ L_108134c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108136c: 0x108136c: lw    s0, 32(sp)
+// 0x01081990: 0x1081990: lw    s0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1262,7 +1262,7 @@ L_108134c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01081370: 0x1081370: jr    ra addiu sp, sp, 64
+// 0x01081994: 0x1081994: jr    ra addiu sp, sp, 64
 	ldloc.0
 	ldc.i4.s 64
 	add
@@ -1274,7 +1274,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_option_delete_1081378(int32,int32,int32,int32,int32)
+.method public static int32 on_option_delete_108199c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s0,int32 ra)
@@ -1315,42 +1315,42 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01081378: 0x1081378: lui   v0, 0x80000
+// 0x0108199c: 0x108199c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108137c: 0x108137c: lw    v1, -13840(v0)
+// 0x010819a0: 0x10819a0: lw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 6
-// 0x01081380: 0x1081380: lui   v0, 0x80000
+// 0x010819a4: 0x10819a4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081384: 0x1081384: sll   v1, v1, 2
+// 0x010819a8: 0x10819a8: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01081388: 0x1081388: addiu v0, v0, -13824
+// 0x010819ac: 0x10819ac: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x0108138c: 0x108138c: addiu sp, sp, -352
+// 0x010819b0: 0x10819b0: addiu sp, sp, -352
 	ldloc.0
 	ldc.i4 -352
 	add
 	stloc.0
-// 0x01081390: 0x1081390: addu  v0, v1, v0
+// 0x010819b4: 0x10819b4: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01081394: 0x1081394: sw    s1, 344(sp)
+// 0x010819b8: 0x10819b8: sw    s1, 344(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1359,18 +1359,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01081398: 0x1081398: lw    s1, 0(v0)
+// 0x010819bc: 0x10819bc: lw    s1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x0108139c: 0x108139c: sw    ra, 348(sp)
-// 0x010813a0: 0x10813a0: addu  a0, s1, zero
+// 0x010819c0: 0x10819c0: sw    ra, 348(sp)
+// 0x010819c4: 0x10819c4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010813a4: 0x10813a4: jal   0x109162c sw    s0, 340(sp)
+// 0x010819c8: 0x10819c8: jal   0x1091c50 sw    s0, 340(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1382,26 +1382,26 @@ __CIBYL_javamethod_begin:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010813ac: 0x10813ac: addu  a0, s1, zero
+// 0x010819d0: 0x10819d0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010813b0: 0x10813b0: jal   0x10915ac addu  s0, v0, zero
+// 0x010819d4: 0x10819d4: jal   0x1091bd0 addu  s0, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_string_10915ac(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_string_1091bd0(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010813b8: 0x10813b8: jal   0x1000d8c addu  a0, v0, zero
+// 0x010819dc: 0x10819dc: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -1414,18 +1414,18 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010813c0: 0x10813c0: beq   s0, zero, 0x108141c addu  s1, v0, zero
+// 0x010819e4: 0x10819e4: beq   s0, zero, 0x1081a40 addu  s1, v0, zero
 	ldloc 9
 	ldloc 5
 	stloc 8
-	brfalse L_108141c
+	brfalse L_1081a40
 // --- basic block ---
-// 0x010813c8: 0x10813c8: lui   a0, 0x20000
+// 0x010819ec: 0x10819ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010813cc: 0x10813cc: jal   0x101cd60 addiu a0, a0, -23416
+// 0x010819f0: 0x10819f0: jal   0x101cd70 addiu a0, a0, -22952
 	ldloc.1
-	ldc.i4 -23416
+	ldc.i4 -22952
 	add
 	stloc.1
 	ldloc.0
@@ -1433,15 +1433,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010813d4: 0x10813d4: addu  a0, s1, zero
+// 0x010819f8: 0x10819f8: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x010813d8: 0x10813d8: sw    v0, 328(sp)
+// 0x010819fc: 0x10819fc: sw    v0, 328(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1450,7 +1450,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010813dc: 0x10813dc: jal   0x1077430 addiu s1, sp, 24
+// 0x01081a00: 0x1081a00: jal   0x1077a54 addiu s1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1459,12 +1459,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_LocationStrByID_1077430(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_LocationStrByID_1077a54(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010813e4: 0x10813e4: lw    a2, 328(sp)
+// 0x01081a08: 0x1081a08: lw    a2, 328(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1473,18 +1473,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010813e8: 0x10813e8: lui   a1, 0x10000
+// 0x01081a0c: 0x1081a0c: lui   a1, 0x10000
 	ldc.i4 65536
 	stloc.2
-// 0x010813ec: 0x10813ec: addiu a1, a1, -25344
+// 0x01081a10: 0x1081a10: addiu a1, a1, -25344
 	ldloc.2
 	ldc.i4 -25344
 	add
 	stloc.2
-// 0x010813f0: 0x10813f0: addu  a3, v0, zero
+// 0x01081a14: 0x1081a14: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010813f4: 0x10813f4: jal   0x1000f64 addu  a0, s1, zero
+// 0x01081a18: 0x1081a18: jal   0x1000f64 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1497,29 +1497,29 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010813fc: 0x10813fc: lui   a0, 0x10000
+// 0x01081a20: 0x1081a20: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01081400: 0x1081400: lui   a3, 0x1080000
+// 0x01081a24: 0x1081a24: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x01081404: 0x1081404: addiu a0, a0, -14284
+// 0x01081a28: 0x1081a28: addiu a0, a0, -14288
 	ldloc.1
-	ldc.i4 -14284
+	ldc.i4 -14288
 	add
 	stloc.1
-// 0x01081408: 0x1081408: addu  a1, s1, zero
+// 0x01081a2c: 0x1081a2c: addu  a1, s1, zero
 	ldloc 8
 	stloc.2
-// 0x0108140c: 0x108140c: addiu a3, a3, 2984
+// 0x01081a30: 0x1081a30: addiu a3, a3, 4556
 	ldloc 4
-	ldc.i4 2984
+	ldc.i4 4556
 	add
 	stloc 4
-// 0x01081410: 0x1081410: addu  a2, zero, zero
+// 0x01081a34: 0x1081a34: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081414: 0x1081414: jal   0x104c320 sw    s0, 16(sp)
+// 0x01081a38: 0x1081a38: jal   0x104c330 sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1533,14 +1533,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_104c320(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_104c330(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_108141c:
-// 0x0108141c: 0x108141c: lw    ra, 348(sp)
-// 0x01081420: 0x1081420: lw    s1, 344(sp)
+L_1081a40:
+// 0x01081a40: 0x1081a40: lw    ra, 348(sp)
+// 0x01081a44: 0x1081a44: lw    s1, 344(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1549,7 +1549,7 @@ L_108141c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01081424: 0x1081424: lw    s0, 340(sp)
+// 0x01081a48: 0x1081a48: lw    s0, 340(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -1558,7 +1558,7 @@ L_108141c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01081428: 0x1081428: jr    ra addiu sp, sp, 352
+// 0x01081a4c: 0x1081a4c: jr    ra addiu sp, sp, 352
 	ldloc.0
 	ldc.i4 352
 	add
@@ -1570,7 +1570,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_abuse_confirm_dlg_callback_1081430(int32,int32,int32,int32,int32)
+.method public static int32 report_abuse_confirm_dlg_callback_1081a54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -1605,20 +1605,20 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01081430: 0x1081430: addiu sp, sp, -24
+// 0x01081a54: 0x1081a54: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01081434: 0x1081434: addiu v0, zero, 3
+// 0x01081a58: 0x1081a58: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x01081438: 0x1081438: bne   a0, v0, 0x1081454 sw    ra, 20(sp)
+// 0x01081a5c: 0x1081a5c: bne   a0, v0, 0x1081a78 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	bne.un L_1081454
+	bne.un L_1081a78
 // --- basic block ---
-// 0x01081440: 0x1081440: jal   0x1000d8c addu  a0, a1, zero
+// 0x01081a64: 0x1081a64: jal   0x1000d8c addu  a0, a1, zero
 	ldloc.2
 	stloc.1
 	ldloc.0
@@ -1631,10 +1631,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081448: 0x1081448: addu  a0, v0, zero
+// 0x01081a6c: 0x1081a6c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108144c: 0x108144c: jal   0x106b428 addiu a1, zero, -1
+// 0x01081a70: 0x1081a70: jal   0x106ba4c addiu a1, zero, -1
 	ldc.i4.m1
 	stloc.2
 	ldloc.0
@@ -1642,15 +1642,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::Realtime_ReportAbuse_106b428(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::Realtime_ReportAbuse_106ba4c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1081454:
-// 0x01081454: 0x1081454: lw    ra, 20(sp)
-// 0x01081458: 0x1081458: sll   zero, zero, 0
-// 0x0108145c: 0x108145c: jr    ra addiu sp, sp, 24
+L_1081a78:
+// 0x01081a78: 0x1081a78: lw    ra, 20(sp)
+// 0x01081a7c: 0x1081a7c: sll   zero, zero, 0
+// 0x01081a80: 0x1081a80: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1662,7 +1662,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 populate_tab_1081464(int32,int32,int32,int32,int32)
+.method public static int32 populate_tab_1081a88(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s4,int32 s3,int32 s0,int32 s1,int32 s5,int32 s6,int32 s7,int32 s8,int32 t1,int32 ra,int32 t0,int32 t2)
@@ -1733,12 +1733,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01081464: 0x1081464: addiu sp, sp, -96
+// 0x01081a88: 0x1081a88: addiu sp, sp, -96
 	ldloc.0
 	ldc.i4.s -96
 	add
 	stloc.0
-// 0x01081468: 0x1081468: sw    s5, 76(sp)
+// 0x01081a8c: 0x1081a8c: sw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1747,7 +1747,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108146c: 0x108146c: sw    s4, 72(sp)
+// 0x01081a90: 0x1081a90: sw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1756,7 +1756,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01081470: 0x1081470: sw    s1, 60(sp)
+// 0x01081a94: 0x1081a94: sw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1765,16 +1765,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01081474: 0x1081474: lui   s4, 0x80000
+// 0x01081a98: 0x1081a98: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x01081478: 0x1081478: lui   s1, 0x80000
+// 0x01081a9c: 0x1081a9c: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 12
-// 0x0108147c: 0x108147c: lui   s5, 0x80000
+// 0x01081aa0: 0x1081aa0: lui   s5, 0x80000
 	ldc.i4 524288
 	stloc 13
-// 0x01081480: 0x1081480: sw    s8, 88(sp)
+// 0x01081aa4: 0x1081aa4: sw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1783,7 +1783,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01081484: 0x1081484: sw    s3, 68(sp)
+// 0x01081aa8: 0x1081aa8: sw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1792,7 +1792,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01081488: 0x1081488: sw    s2, 64(sp)
+// 0x01081aac: 0x1081aac: sw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1801,7 +1801,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108148c: 0x108148c: sw    s0, 56(sp)
+// 0x01081ab0: 0x1081ab0: sw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1810,8 +1810,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01081490: 0x1081490: sw    ra, 92(sp)
-// 0x01081494: 0x1081494: sw    s7, 84(sp)
+// 0x01081ab4: 0x1081ab4: sw    ra, 92(sp)
+// 0x01081ab8: 0x1081ab8: sw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1820,7 +1820,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01081498: 0x1081498: sw    s6, 80(sp)
+// 0x01081abc: 0x1081abc: sw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1829,7 +1829,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x0108149c: 0x108149c: sw    a3, 108(sp)
+// 0x01081ac0: 0x1081ac0: sw    a3, 108(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1838,37 +1838,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x010814a0: 0x10814a0: addu  s0, a0, zero
+// 0x01081ac4: 0x1081ac4: addu  s0, a0, zero
 	ldloc.1
 	stloc 11
-// 0x010814a4: 0x10814a4: addu  s2, a1, zero
+// 0x01081ac8: 0x1081ac8: addu  s2, a1, zero
 	ldloc.2
 	stloc 8
-// 0x010814a8: 0x10814a8: addiu s4, s4, -11800
+// 0x01081acc: 0x1081acc: addiu s4, s4, -11336
 	ldloc 9
-	ldc.i4 -11800
+	ldc.i4 -11336
 	add
 	stloc 9
-// 0x010814ac: 0x10814ac: addiu s1, s1, -13800
+// 0x01081ad0: 0x1081ad0: addiu s1, s1, -13336
 	ldloc 12
-	ldc.i4 -13800
+	ldc.i4 -13336
 	add
 	stloc 12
-// 0x010814b0: 0x10814b0: addiu s5, s5, -10996
+// 0x01081ad4: 0x1081ad4: addiu s5, s5, -10532
 	ldloc 13
-	ldc.i4 -10996
+	ldc.i4 -10532
 	add
 	stloc 13
-// 0x010814b4: 0x10814b4: addu  s3, zero, zero
+// 0x01081ad8: 0x1081ad8: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 10
-// 0x010814b8: 0x10814b8: j	 0x10815c4 addu  s8, zero, zero
+// 0x01081adc: 0x1081adc: j	 0x1081be8 addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 16
-	br L_10815c4
+	br L_1081be8
 // --- basic block ---
-L_10814c0:
-// 0x010814c0: 0x10814c0: sw    v0, 40(sp)
+L_1081ae4:
+// 0x01081ae4: 0x1081ae4: sw    v0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1877,53 +1877,53 @@ L_10814c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010814c4: 0x10814c4: addu  v1, zero, zero
+// 0x01081ae8: 0x1081ae8: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x010814c8: 0x10814c8: j	 0x10815b0 addu  v0, a2, zero
+// 0x01081aec: 0x1081aec: j	 0x1081bd4 addu  v0, a2, zero
 	ldloc.3
 	stloc 5
-	br L_10815b0
+	br L_1081bd4
 // --- basic block ---
-L_10814d0:
-// 0x010814d0: 0x10814d0: lw    a0, 0(s4)
+L_1081af4:
+// 0x01081af4: 0x1081af4: lw    a0, 0(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010814d4: 0x10814d4: sll   zero, zero, 0
-// 0x010814d8: 0x10814d8: bne   a0, v0, 0x108159c addiu v1, v1, 1
+// 0x01081af8: 0x1081af8: sll   zero, zero, 0
+// 0x01081afc: 0x1081afc: bne   a0, v0, 0x1081bc0 addiu v1, v1, 1
 	ldloc.1
 	ldloc 5
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	bne.un L_108159c
+	bne.un L_1081bc0
 // --- basic block ---
-// 0x010814e0: 0x10814e0: addiu a3, s3, 100
+// 0x01081b04: 0x1081b04: addiu a3, s3, 100
 	ldloc 10
 	ldc.i4.s 100
 	add
 	stloc 4
-// 0x010814e4: 0x10814e4: addiu v0, s3, 200
+// 0x01081b08: 0x1081b08: addiu v0, s3, 200
 	ldloc 10
 	ldc.i4 200
 	add
 	stloc 5
-// 0x010814e8: 0x10814e8: sll   a3, a3, 2
+// 0x01081b0c: 0x1081b0c: sll   a3, a3, 2
 	ldloc 4
 	ldc.i4.2
 	shl
 	stloc 4
-// 0x010814ec: 0x10814ec: sll   v0, v0, 2
+// 0x01081b10: 0x1081b10: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010814f0: 0x10814f0: lw    s7, -800(s4)
+// 0x01081b14: 0x1081b14: lw    s7, -800(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1932,7 +1932,7 @@ L_10814d0:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010814f4: 0x10814f4: lw    t2, -2000(s4)
+// 0x01081b18: 0x1081b18: lw    t2, -2000(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1941,7 +1941,7 @@ L_10814d0:
 	add
 	ldelem.i4
 	stloc 20
-// 0x010814f8: 0x10814f8: lw    t0, -1600(s4)
+// 0x01081b1c: 0x1081b1c: lw    t0, -1600(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1950,7 +1950,7 @@ L_10814d0:
 	add
 	ldelem.i4
 	stloc 19
-// 0x010814fc: 0x10814fc: lw    a0, -1200(s4)
+// 0x01081b20: 0x1081b20: lw    a0, -1200(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -1959,44 +1959,44 @@ L_10814d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01081500: 0x1081500: sll   t1, s3, 2
+// 0x01081b24: 0x1081b24: sll   t1, s3, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 17
-// 0x01081504: 0x1081504: addu  t1, t1, s5
+// 0x01081b28: 0x1081b28: addu  t1, t1, s5
 	ldloc 17
 	ldloc 13
 	add
 	stloc 17
-// 0x01081508: 0x1081508: addu  a3, a3, s5
+// 0x01081b2c: 0x1081b2c: addu  a3, a3, s5
 	ldloc 4
 	ldloc 13
 	add
 	stloc 4
-// 0x0108150c: 0x108150c: addu  v0, v0, s5
+// 0x01081b30: 0x1081b30: addu  v0, v0, s5
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-// 0x01081510: 0x1081510: addu  a1, s7, zero
+// 0x01081b34: 0x1081b34: addu  a1, s7, zero
 	ldloc 15
 	stloc.2
-// 0x01081514: 0x1081514: sw    t2, 0(t1)
+// 0x01081b38: 0x1081b38: sw    t2, 0(t1)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
 	ldloc 20
 	stelem.i4
-// 0x01081518: 0x1081518: sw    t0, 0(a3)
+// 0x01081b3c: 0x1081b3c: sw    t0, 0(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldloc 19
 	stelem.i4
-// 0x0108151c: 0x108151c: beq   s7, zero, 0x1081548 sw    a0, 0(v0)
+// 0x01081b40: 0x1081b40: beq   s7, zero, 0x1081b6c sw    a0, 0(v0)
 	ldloc 15
 	ldloc 6
 	ldloc 5
@@ -2004,9 +2004,9 @@ L_10814d0:
 	shr.un
 	ldloc.1
 	stelem.i4
-	brfalse L_1081548
+	brfalse L_1081b6c
 // --- basic block ---
-// 0x01081524: 0x1081524: lw    v0, 4(s7)
+// 0x01081b48: 0x1081b48: lw    v0, 4(s7)
 	ldloc 6
 	ldloc 15
 	ldc.i4.2
@@ -2015,14 +2015,14 @@ L_10814d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081528: 0x1081528: sll   zero, zero, 0
-// 0x0108152c: 0x108152c: beq   v0, zero, 0x1081548 addu  a0, v0, zero
+// 0x01081b4c: 0x1081b4c: sll   zero, zero, 0
+// 0x01081b50: 0x1081b50: beq   v0, zero, 0x1081b6c addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1081548
+	brfalse L_1081b6c
 // --- basic block ---
-// 0x01081534: 0x1081534: sw    v1, 48(sp)
+// 0x01081b58: 0x1081b58: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2031,7 +2031,7 @@ L_10814d0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01081538: 0x1081538: jal   0x109a3a8 sw    a2, 52(sp)
+// 0x01081b5c: 0x1081b5c: jal   0x109a9f0 sw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2045,12 +2045,12 @@ L_10814d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_remove_109a3a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_remove_109a9f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081540: 0x1081540: lw    a2, 52(sp)
+// 0x01081b64: 0x1081b64: lw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2059,7 +2059,7 @@ L_10814d0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01081544: 0x1081544: lw    v1, 48(sp)
+// 0x01081b68: 0x1081b68: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2068,18 +2068,18 @@ L_10814d0:
 	add
 	ldelem.i4
 	stloc 7
-L_1081548:
-// 0x01081548: 0x1081548: addiu v0, s3, 300
+L_1081b6c:
+// 0x01081b6c: 0x1081b6c: addiu v0, s3, 300
 	ldloc 10
 	ldc.i4 300
 	add
 	stloc 5
-// 0x0108154c: 0x108154c: sll   v0, v0, 2
+// 0x01081b70: 0x1081b70: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01081550: 0x1081550: lw    s6, -400(s4)
+// 0x01081b74: 0x1081b74: lw    s6, -400(s4)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -2088,15 +2088,15 @@ L_1081548:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01081554: 0x1081554: addu  v0, v0, s5
+// 0x01081b78: 0x1081b78: addu  v0, v0, s5
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-// 0x01081558: 0x1081558: addu  a1, s6, zero
+// 0x01081b7c: 0x1081b7c: addu  a1, s6, zero
 	ldloc 14
 	stloc.2
-// 0x0108155c: 0x108155c: beq   s6, zero, 0x1081588 sw    s7, 0(v0)
+// 0x01081b80: 0x1081b80: beq   s6, zero, 0x1081bac sw    s7, 0(v0)
 	ldloc 14
 	ldloc 6
 	ldloc 5
@@ -2104,9 +2104,9 @@ L_1081548:
 	shr.un
 	ldloc 15
 	stelem.i4
-	brfalse L_1081588
+	brfalse L_1081bac
 // --- basic block ---
-// 0x01081564: 0x1081564: lw    v0, 4(s6)
+// 0x01081b88: 0x1081b88: lw    v0, 4(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
@@ -2115,14 +2115,14 @@ L_1081548:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081568: 0x1081568: sll   zero, zero, 0
-// 0x0108156c: 0x108156c: beq   v0, zero, 0x1081588 addu  a0, v0, zero
+// 0x01081b8c: 0x1081b8c: sll   zero, zero, 0
+// 0x01081b90: 0x1081b90: beq   v0, zero, 0x1081bac addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_1081588
+	brfalse L_1081bac
 // --- basic block ---
-// 0x01081574: 0x1081574: sw    v1, 48(sp)
+// 0x01081b98: 0x1081b98: sw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2131,7 +2131,7 @@ L_1081548:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01081578: 0x1081578: jal   0x109a3a8 sw    a2, 52(sp)
+// 0x01081b9c: 0x1081b9c: jal   0x109a9f0 sw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2145,12 +2145,12 @@ L_1081548:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_remove_109a3a8(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_remove_109a9f0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081580: 0x1081580: lw    a2, 52(sp)
+// 0x01081ba4: 0x1081ba4: lw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2159,7 +2159,7 @@ L_1081548:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01081584: 0x1081584: lw    v1, 48(sp)
+// 0x01081ba8: 0x1081ba8: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2168,36 +2168,36 @@ L_1081548:
 	add
 	ldelem.i4
 	stloc 7
-L_1081588:
-// 0x01081588: 0x1081588: addiu v0, s3, 400
+L_1081bac:
+// 0x01081bac: 0x1081bac: addiu v0, s3, 400
 	ldloc 10
 	ldc.i4 400
 	add
 	stloc 5
-// 0x0108158c: 0x108158c: sll   v0, v0, 2
+// 0x01081bb0: 0x1081bb0: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01081590: 0x1081590: addu  v0, v0, s5
+// 0x01081bb4: 0x1081bb4: addu  v0, v0, s5
 	ldloc 5
 	ldloc 13
 	add
 	stloc 5
-// 0x01081594: 0x1081594: sw    s6, 0(v0)
+// 0x01081bb8: 0x1081bb8: sw    s6, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 14
 	stelem.i4
-// 0x01081598: 0x1081598: addiu s3, s3, 1
+// 0x01081bbc: 0x1081bbc: addiu s3, s3, 1
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-L_108159c:
-// 0x0108159c: 0x108159c: lw    a0, 40(sp)
+L_1081bc0:
+// 0x01081bc0: 0x1081bc0: lw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2206,20 +2206,20 @@ L_108159c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010815a0: 0x10815a0: sll   zero, zero, 0
-// 0x010815a4: 0x10815a4: lw    v0, 0(a0)
+// 0x01081bc4: 0x1081bc4: sll   zero, zero, 0
+// 0x01081bc8: 0x1081bc8: lw    v0, 0(a0)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010815a8: 0x10815a8: addiu a0, a0, 4
+// 0x01081bcc: 0x1081bcc: addiu a0, a0, 4
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-// 0x010815ac: 0x10815ac: sw    a0, 40(sp)
+// 0x01081bd0: 0x1081bd0: sw    a0, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2228,28 +2228,28 @@ L_108159c:
 	add
 	ldloc.1
 	stelem.i4
-L_10815b0:
-// 0x010815b0: 0x10815b0: slt   a0, v1, s2
+L_1081bd4:
+// 0x01081bd4: 0x1081bd4: slt   a0, v1, s2
 	ldloc 7
 	ldloc 8
 	clt
 	stloc.1
-// 0x010815b4: 0x10815b4: bne   a0, zero, 0x10814d0 sll   zero, zero, 0
+// 0x01081bd8: 0x1081bd8: bne   a0, zero, 0x1081af4 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_10814d0
+	brtrue L_1081af4
 // --- basic block ---
-// 0x010815bc: 0x10815bc: addiu s8, s8, 1
+// 0x01081be0: 0x1081be0: addiu s8, s8, 1
 	ldloc 16
 	ldc.i4.1
 	add
 	stloc 16
-// 0x010815c0: 0x10815c0: addiu s4, s4, 4
+// 0x01081be4: 0x1081be4: addiu s4, s4, 4
 	ldloc 9
 	ldc.i4.4
 	add
 	stloc 9
-L_10815c4:
-// 0x010815c4: 0x10815c4: lw    v0, 2800(s1)
+L_1081be8:
+// 0x01081be8: 0x1081be8: lw    v0, 2800(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2258,54 +2258,54 @@ L_10815c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010815c8: 0x10815c8: sll   zero, zero, 0
-// 0x010815cc: 0x10815cc: slt   v0, s8, v0
+// 0x01081bec: 0x1081bec: sll   zero, zero, 0
+// 0x01081bf0: 0x1081bf0: slt   v0, s8, v0
 	ldloc 16
 	ldloc 5
 	clt
 	stloc 5
-// 0x010815d0: 0x10815d0: bne   v0, zero, 0x10814c0 addiu v0, sp, 108
+// 0x01081bf4: 0x1081bf4: bne   v0, zero, 0x1081ae4 addiu v0, sp, 108
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 108
 	add
 	stloc 5
-	brtrue L_10814c0
+	brtrue L_1081ae4
 // --- basic block ---
-// 0x010815d8: 0x10815d8: lui   s2, 0x80000
+// 0x01081bfc: 0x1081bfc: lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010815dc: 0x10815dc: sll   v0, s0, 2
+// 0x01081c00: 0x1081c00: sll   v0, s0, 2
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010815e0: 0x10815e0: addiu s2, s2, -13824
+// 0x01081c04: 0x1081c04: addiu s2, s2, -13360
 	ldloc 8
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 8
-// 0x010815e4: 0x10815e4: addu  s2, v0, s2
+// 0x01081c08: 0x1081c08: addu  s2, v0, s2
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x010815e8: 0x10815e8: lui   a2, 0x80000
+// 0x01081c0c: 0x1081c0c: lui   a2, 0x80000
 	ldc.i4 524288
 	stloc.3
-// 0x010815ec: 0x10815ec: addiu a2, a2, -10996
+// 0x01081c10: 0x1081c10: addiu a2, a2, -10532
 	ldloc.3
-	ldc.i4 -10996
+	ldc.i4 -10532
 	add
 	stloc.3
-// 0x010815f0: 0x10815f0: lw    a0, 0(s2)
+// 0x01081c14: 0x1081c14: lw    a0, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010815f4: 0x10815f4: sw    s3, 2800(a2)
+// 0x01081c18: 0x1081c18: sw    s3, 2800(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -2314,7 +2314,7 @@ L_10815c4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010815f8: 0x10815f8: jal   0x10990ac sw    a2, 52(sp)
+// 0x01081c1c: 0x1081c1c: jal   0x10996f4 sw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2324,27 +2324,27 @@ L_10815c4:
 	ldloc.3
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081600: 0x1081600: lui   v0, 0x80000
+// 0x01081c24: 0x1081c24: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081604: 0x1081604: addiu v0, v0, -10596
+// 0x01081c28: 0x1081c28: addiu v0, v0, -10132
 	ldloc 5
-	ldc.i4 -10596
+	ldc.i4 -10132
 	add
 	stloc 5
-// 0x01081608: 0x1081608: lw    a0, 0(s2)
+// 0x01081c2c: 0x1081c2c: lw    a0, 0(s2)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108160c: 0x108160c: sw    v0, 16(sp)
+// 0x01081c30: 0x1081c30: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2353,15 +2353,15 @@ L_10815c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01081610: 0x1081610: lui   v0, 0x80000
+// 0x01081c34: 0x1081c34: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081614: 0x1081614: addiu v0, v0, -9796
+// 0x01081c38: 0x1081c38: addiu v0, v0, -9332
 	ldloc 5
-	ldc.i4 -9796
+	ldc.i4 -9332
 	add
 	stloc 5
-// 0x01081618: 0x1081618: sw    v0, 20(sp)
+// 0x01081c3c: 0x1081c3c: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2370,15 +2370,15 @@ L_10815c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108161c: 0x108161c: lui   v0, 0x1080000
+// 0x01081c40: 0x1081c40: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x01081620: 0x1081620: addiu v0, v0, 3060
+// 0x01081c44: 0x1081c44: addiu v0, v0, 4632
 	ldloc 5
-	ldc.i4 3060
+	ldc.i4 4632
 	add
 	stloc 5
-// 0x01081624: 0x1081624: sw    v0, 28(sp)
+// 0x01081c48: 0x1081c48: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2387,7 +2387,7 @@ L_10815c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01081628: 0x1081628: lw    a2, 52(sp)
+// 0x01081c4c: 0x1081c4c: lw    a2, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2396,29 +2396,29 @@ L_10815c4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108162c: 0x108162c: lui   a3, 0x80000
+// 0x01081c50: 0x1081c50: lui   a3, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x01081630: 0x1081630: lui   v0, 0x1080000
+// 0x01081c54: 0x1081c54: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x01081634: 0x1081634: addiu v0, v0, 2864
+// 0x01081c58: 0x1081c58: addiu v0, v0, 4436
 	ldloc 5
-	ldc.i4 2864
+	ldc.i4 4436
 	add
 	stloc 5
-// 0x01081638: 0x1081638: addu  a1, s3, zero
+// 0x01081c5c: 0x1081c5c: addu  a1, s3, zero
 	ldloc 10
 	stloc.2
-// 0x0108163c: 0x108163c: addiu a3, a3, -9396
+// 0x01081c60: 0x1081c60: addiu a3, a3, -8932
 	ldloc 4
-	ldc.i4 -9396
+	ldc.i4 -8932
 	add
 	stloc 4
-// 0x01081640: 0x1081640: addiu s2, zero, 1
+// 0x01081c64: 0x1081c64: addiu s2, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01081644: 0x1081644: sw    v0, 32(sp)
+// 0x01081c68: 0x1081c68: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2427,7 +2427,7 @@ L_10815c4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01081648: 0x1081648: sw    zero, 24(sp)
+// 0x01081c6c: 0x1081c6c: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2436,7 +2436,7 @@ L_10815c4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108164c: 0x108164c: jal   0x1092088 sw    s2, 36(sp)
+// 0x01081c70: 0x1081c70: jal   0x10926ac sw    s2, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2450,12 +2450,12 @@ L_10815c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl109::ssd_list_populate_widgets_1092088(int32,int32,int32,int32,int32)
+	call int32 Cibyl109::ssd_list_populate_widgets_10926ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081654: 0x1081654: lw    v0, 2800(s1)
+// 0x01081c78: 0x1081c78: lw    v0, 2800(s1)
 	ldloc 6
 	ldloc 12
 	ldc.i4.2
@@ -2464,58 +2464,58 @@ L_10815c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081658: 0x1081658: sll   zero, zero, 0
-// 0x0108165c: 0x108165c: bne   v0, zero, 0x10816c4 lui   v0, 0x80000
+// 0x01081c7c: 0x1081c7c: sll   zero, zero, 0
+// 0x01081c80: 0x1081c80: bne   v0, zero, 0x1081ce8 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10816c4
+	brtrue L_1081ce8
 // --- basic block ---
-// 0x01081664: 0x1081664: lw    v0, -13852(v0)
+// 0x01081c88: 0x1081c88: lw    v0, -13388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081668: 0x1081668: sll   zero, zero, 0
-// 0x0108166c: 0x108166c: bne   v0, s2, 0x10816c4 sll   zero, zero, 0
+// 0x01081c8c: 0x1081c8c: sll   zero, zero, 0
+// 0x01081c90: 0x1081c90: bne   v0, s2, 0x1081ce8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 8
-	bne.un L_10816c4
+	bne.un L_1081ce8
 // --- basic block ---
-// 0x01081674: 0x1081674: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x01081c98: 0x1081c98: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x0108167c: 0x108167c: addiu v1, zero, -1
+// 0x01081ca0: 0x1081ca0: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01081680: 0x1081680: bne   v0, v1, 0x10816c4 sll   zero, zero, 0
+// 0x01081ca4: 0x1081ca4: bne   v0, v1, 0x1081ce8 sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_10816c4
+	bne.un L_1081ce8
 // --- basic block ---
-// 0x01081688: 0x1081688: jal   0x1093fa0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+// 0x01081cac: 0x1081cac: jal   0x10945c4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081690: 0x1081690: lui   a1, 0x20000
+// 0x01081cb4: 0x1081cb4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01081694: 0x1081694: addu  a0, v0, zero
+// 0x01081cb8: 0x1081cb8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081698: 0x1081698: addiu a1, a1, -23448
+// 0x01081cbc: 0x1081cbc: addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
-// 0x0108169c: 0x108169c: jal   0x109b304 addu  s1, v0, zero
+// 0x01081cc0: 0x1081cc0: jal   0x109b94c addu  s1, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2523,99 +2523,99 @@ L_10815c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010816a4: 0x10816a4: beq   v0, zero, 0x10816b4 sll   zero, zero, 0
+// 0x01081cc8: 0x1081cc8: beq   v0, zero, 0x1081cd8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10816b4
+	brfalse L_1081cd8
 // --- basic block ---
-// 0x010816ac: 0x10816ac: jal   0x10990ac addu  a0, v0, zero
+// 0x01081cd0: 0x1081cd0: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10816b4:
-// 0x010816b4: 0x10816b4: lui   a1, 0x20000
+L_1081cd8:
+// 0x01081cd8: 0x1081cd8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010816b8: 0x10816b8: addu  a0, s1, zero
+// 0x01081cdc: 0x1081cdc: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x010816bc: 0x10816bc: j	 0x108172c addiu a1, a1, -23432
+// 0x01081ce0: 0x1081ce0: j	 0x1081d50 addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-	br L_108172c
+	br L_1081d50
 // --- basic block ---
-L_10816c4:
-// 0x010816c4: 0x10816c4: jal   0x106c170 sll   zero, zero, 0
+L_1081ce8:
+// 0x01081ce8: 0x1081ce8: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010816cc: 0x10816cc: beq   v0, zero, 0x1081760 sll   zero, zero, 0
+// 0x01081cf0: 0x1081cf0: beq   v0, zero, 0x1081d84 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081760
+	brfalse L_1081d84
 // --- basic block ---
-// 0x010816d4: 0x10816d4: jal   0x1053f28 sll   zero, zero, 0
-	call int32 Cibyl62::roadmap_groups_get_num_following_1053f28()
+// 0x01081cf8: 0x1081cf8: jal   0x1053f38 sll   zero, zero, 0
+	call int32 Cibyl62::roadmap_groups_get_num_following_1053f38()
 	stloc 5
 // --- basic block ---
-// 0x010816dc: 0x10816dc: bne   v0, zero, 0x1081760 lui   v0, 0x80000
+// 0x01081d00: 0x1081d00: bne   v0, zero, 0x1081d84 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1081760
+	brtrue L_1081d84
 // --- basic block ---
-// 0x010816e4: 0x10816e4: lw    v1, -13852(v0)
+// 0x01081d08: 0x1081d08: lw    v1, -13388(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc 7
-// 0x010816e8: 0x10816e8: addiu v0, zero, 2
+// 0x01081d0c: 0x1081d0c: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010816ec: 0x10816ec: bne   v1, v0, 0x1081760 sll   zero, zero, 0
+// 0x01081d10: 0x1081d10: bne   v1, v0, 0x1081d84 sll   zero, zero, 0
 	ldloc 7
 	ldloc 5
-	bne.un L_1081760
+	bne.un L_1081d84
 // --- basic block ---
-// 0x010816f4: 0x10816f4: jal   0x1093fa0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+// 0x01081d18: 0x1081d18: jal   0x10945c4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010816fc: 0x10816fc: lui   a1, 0x20000
+// 0x01081d20: 0x1081d20: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01081700: 0x1081700: addu  a0, v0, zero
+// 0x01081d24: 0x1081d24: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081704: 0x1081704: addiu a1, a1, -23432
+// 0x01081d28: 0x1081d28: addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-// 0x01081708: 0x1081708: jal   0x109b304 addu  s1, v0, zero
+// 0x01081d2c: 0x1081d2c: jal   0x109b94c addu  s1, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -2623,109 +2623,109 @@ L_10816c4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081710: 0x1081710: beq   v0, zero, 0x1081724 lui   a1, 0x20000
+// 0x01081d34: 0x1081d34: beq   v0, zero, 0x1081d48 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1081724
+	brfalse L_1081d48
 // --- basic block ---
-// 0x01081718: 0x1081718: jal   0x10990ac addu  a0, v0, zero
+// 0x01081d3c: 0x1081d3c: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081720: 0x1081720: lui   a1, 0x20000
+// 0x01081d44: 0x1081d44: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_1081724:
-// 0x01081724: 0x1081724: addu  a0, s1, zero
+L_1081d48:
+// 0x01081d48: 0x1081d48: addu  a0, s1, zero
 	ldloc 12
 	stloc.1
-// 0x01081728: 0x1081728: addiu a1, a1, -23448
+// 0x01081d4c: 0x1081d4c: addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
-L_108172c:
-// 0x0108172c: 0x108172c: jal   0x109b304 sll   zero, zero, 0
+L_1081d50:
+// 0x01081d50: 0x1081d50: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081734: 0x1081734: beq   v0, zero, 0x1081744 sll   zero, zero, 0
+// 0x01081d58: 0x1081d58: beq   v0, zero, 0x1081d68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081744
+	brfalse L_1081d68
 // --- basic block ---
-// 0x0108173c: 0x108173c: jal   0x1099098 addu  a0, v0, zero
+// 0x01081d60: 0x1081d60: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_1081744:
-// 0x01081744: 0x1081744: lui   v0, 0x80000
+L_1081d68:
+// 0x01081d68: 0x1081d68: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081748: 0x1081748: sll   s0, s0, 2
+// 0x01081d6c: 0x1081d6c: sll   s0, s0, 2
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 11
-// 0x0108174c: 0x108174c: addiu v0, v0, -13824
+// 0x01081d70: 0x1081d70: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x01081750: 0x1081750: addu  s0, s0, v0
+// 0x01081d74: 0x1081d74: addu  s0, s0, v0
 	ldloc 11
 	ldloc 5
 	add
 	stloc 11
-// 0x01081754: 0x1081754: lw    a0, 0(s0)
+// 0x01081d78: 0x1081d78: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01081758: 0x1081758: j	 0x10817a4 sll   zero, zero, 0
-	br L_10817a4
+// 0x01081d7c: 0x1081d7c: j	 0x1081dc8 sll   zero, zero, 0
+	br L_1081dc8
 // --- basic block ---
-L_1081760:
-// 0x01081760: 0x1081760: jal   0x1093fa0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+L_1081d84:
+// 0x01081d84: 0x1081d84: jal   0x10945c4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081768: 0x1081768: lui   a1, 0x20000
+// 0x01081d8c: 0x1081d8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108176c: 0x108176c: addu  a0, v0, zero
+// 0x01081d90: 0x1081d90: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081770: 0x1081770: addiu a1, a1, -23432
+// 0x01081d94: 0x1081d94: addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-// 0x01081774: 0x1081774: jal   0x109b304 addu  s0, v0, zero
+// 0x01081d98: 0x1081d98: jal   0x109b94c addu  s0, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.0
@@ -2733,32 +2733,32 @@ L_1081760:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108177c: 0x108177c: beq   v0, zero, 0x108178c sll   zero, zero, 0
+// 0x01081da0: 0x1081da0: beq   v0, zero, 0x1081db0 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108178c
+	brfalse L_1081db0
 // --- basic block ---
-// 0x01081784: 0x1081784: jal   0x1099098 addu  a0, v0, zero
+// 0x01081da8: 0x1081da8: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_108178c:
-// 0x0108178c: 0x108178c: lui   a1, 0x20000
+L_1081db0:
+// 0x01081db0: 0x1081db0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01081790: 0x1081790: addu  a0, s0, zero
+// 0x01081db4: 0x1081db4: addu  a0, s0, zero
 	ldloc 11
 	stloc.1
-// 0x01081794: 0x1081794: jal   0x109b304 addiu a1, a1, -23448
+// 0x01081db8: 0x1081db8: jal   0x109b94c addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
 	ldloc.0
@@ -2766,26 +2766,26 @@ L_108178c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108179c: 0x108179c: beq   v0, zero, 0x10817ac addu  a0, v0, zero
+// 0x01081dc0: 0x1081dc0: beq   v0, zero, 0x1081dd0 addu  a0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc.1
-	brfalse L_10817ac
+	brfalse L_1081dd0
 // --- basic block ---
-L_10817a4:
-// 0x010817a4: 0x10817a4: jal   0x1099098 sll   zero, zero, 0
+L_1081dc8:
+// 0x01081dc8: 0x1081dc8: jal   0x10996e0 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_10817ac:
-// 0x010817ac: 0x10817ac: lw    ra, 92(sp)
-// 0x010817b0: 0x10817b0: lw    s8, 88(sp)
+L_1081dd0:
+// 0x01081dd0: 0x1081dd0: lw    ra, 92(sp)
+// 0x01081dd4: 0x1081dd4: lw    s8, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2794,7 +2794,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010817b4: 0x10817b4: lw    s7, 84(sp)
+// 0x01081dd8: 0x1081dd8: lw    s7, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2803,7 +2803,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010817b8: 0x10817b8: lw    s6, 80(sp)
+// 0x01081ddc: 0x1081ddc: lw    s6, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2812,7 +2812,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010817bc: 0x10817bc: lw    s5, 76(sp)
+// 0x01081de0: 0x1081de0: lw    s5, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2821,7 +2821,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010817c0: 0x10817c0: lw    s4, 72(sp)
+// 0x01081de4: 0x1081de4: lw    s4, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2830,7 +2830,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010817c4: 0x10817c4: lw    s3, 68(sp)
+// 0x01081de8: 0x1081de8: lw    s3, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2839,7 +2839,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010817c8: 0x10817c8: lw    s2, 64(sp)
+// 0x01081dec: 0x1081dec: lw    s2, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2848,7 +2848,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010817cc: 0x10817cc: lw    s1, 60(sp)
+// 0x01081df0: 0x1081df0: lw    s1, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2857,7 +2857,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010817d0: 0x10817d0: lw    s0, 56(sp)
+// 0x01081df4: 0x1081df4: lw    s0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2866,7 +2866,7 @@ L_10817ac:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010817d4: 0x10817d4: jr    ra addiu sp, sp, 96
+// 0x01081df8: 0x1081df8: jr    ra addiu sp, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
@@ -2878,7 +2878,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_tab_gain_focus_10817dc(int32,int32,int32,int32,int32)
+.method public static int32 on_tab_gain_focus_1081e00(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -2916,17 +2916,17 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010817dc: 0x10817dc: addiu sp, sp, -40
+// 0x01081e00: 0x1081e00: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010817e0: 0x10817e0: sltiu v0, a0, 6
+// 0x01081e04: 0x1081e04: sltiu v0, a0, 6
 	ldloc.1
 	ldc.i4.6
 	clt.un
 	stloc 5
-// 0x010817e4: 0x10817e4: sw    s0, 32(sp)
+// 0x01081e08: 0x1081e08: sw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -2935,81 +2935,81 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010817e8: 0x10817e8: sw    ra, 36(sp)
-// 0x010817ec: 0x10817ec: beq   v0, zero, 0x10818a8 addu  s0, a0, zero
+// 0x01081e0c: 0x1081e0c: sw    ra, 36(sp)
+// 0x01081e10: 0x1081e10: beq   v0, zero, 0x1081ecc addu  s0, a0, zero
 	ldloc 5
 	ldloc.1
 	stloc 8
-	brfalse L_10818a8
+	brfalse L_1081ecc
 // --- basic block ---
-// 0x010817f4: 0x10817f4: lui   v0, 0x20000
+// 0x01081e18: 0x1081e18: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010817f8: 0x10817f8: sll   v1, a0, 2
+// 0x01081e1c: 0x1081e1c: sll   v1, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x010817fc: 0x10817fc: addiu v0, v0, 29336
+// 0x01081e20: 0x1081e20: addiu v0, v0, 29800
 	ldloc 5
-	ldc.i4 29336
+	ldc.i4 29800
 	add
 	stloc 5
-// 0x01081800: 0x1081800: addu  v0, v0, v1
+// 0x01081e24: 0x1081e24: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01081804: 0x1081804: lw    v0, 0(v0)
+// 0x01081e28: 0x1081e28: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01081808: 0x1081808: sll   zero, zero, 0
-// 0x0108180c: 0x108180c: jr    v0 sll   zero, zero, 0
+// 0x01081e2c: 0x1081e2c: sll   zero, zero, 0
+// 0x01081e30: 0x1081e30: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1081814:
-// 0x01081814: 0x1081814: jal   0x10808dc sll   zero, zero, 0
+L_1081e38:
+// 0x01081e38: 0x1081e38: jal   0x1080f00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_first_tab_10808dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_first_tab_1080f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108181c: 0x108181c: j	 0x10818a8 sll   zero, zero, 0
-	br L_10818a8
+// 0x01081e40: 0x1081e40: j	 0x1081ecc sll   zero, zero, 0
+	br L_1081ecc
 // --- basic block ---
-L_1081824:
-// 0x01081824: 0x1081824: addiu a0, zero, 1
+L_1081e48:
+// 0x01081e48: 0x1081e48: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01081828: 0x1081828: addiu a1, zero, 1
+// 0x01081e4c: 0x1081e4c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108182c: 0x108182c: j	 0x108185c addiu a2, zero, 1
+// 0x01081e50: 0x1081e50: j	 0x1081e80 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-	br L_108185c
+	br L_1081e80
 // --- basic block ---
-L_1081834:
-// 0x01081834: 0x1081834: addiu a0, zero, 2
+L_1081e58:
+// 0x01081e58: 0x1081e58: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01081838: 0x1081838: addiu a1, zero, 2
+// 0x01081e5c: 0x1081e5c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0108183c: 0x108183c: addiu a2, zero, 4
+// 0x01081e60: 0x1081e60: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x01081840: 0x1081840: jal   0x1081464 addiu a3, zero, 3
+// 0x01081e64: 0x1081e64: jal   0x1081a88 addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
 	ldloc.0
@@ -3017,56 +3017,56 @@ L_1081834:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081848: 0x1081848: j	 0x10818a8 sll   zero, zero, 0
-	br L_10818a8
+// 0x01081e6c: 0x1081e6c: j	 0x1081ecc sll   zero, zero, 0
+	br L_1081ecc
 // --- basic block ---
-L_1081850:
-// 0x01081850: 0x1081850: addiu a0, zero, 3
+L_1081e74:
+// 0x01081e74: 0x1081e74: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01081854: 0x1081854: addiu a1, zero, 1
+// 0x01081e78: 0x1081e78: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01081858: 0x1081858: addiu a2, zero, 2
+// 0x01081e7c: 0x1081e7c: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-L_108185c:
-// 0x0108185c: 0x108185c: jal   0x1081464 sll   zero, zero, 0
+L_1081e80:
+// 0x01081e80: 0x1081e80: jal   0x1081a88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01081864: 0x1081864: j	 0x10818a8 sll   zero, zero, 0
-	br L_10818a8
+// 0x01081e88: 0x1081e88: j	 0x1081ecc sll   zero, zero, 0
+	br L_1081ecc
 // --- basic block ---
-L_108186c:
-// 0x0108186c: 0x108186c: addiu a0, zero, 4
+L_1081e90:
+// 0x01081e90: 0x1081e90: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01081870: 0x1081870: addiu a1, zero, 1
+// 0x01081e94: 0x1081e94: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01081874: 0x1081874: j	 0x108185c addu  a2, zero, zero
+// 0x01081e98: 0x1081e98: j	 0x1081e80 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_108185c
+	br L_1081e80
 // --- basic block ---
-L_108187c:
-// 0x0108187c: 0x108187c: addiu v0, zero, 7
+L_1081ea0:
+// 0x01081ea0: 0x1081ea0: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x01081880: 0x1081880: sw    v0, 16(sp)
+// 0x01081ea4: 0x1081ea4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3075,10 +3075,10 @@ L_108187c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01081884: 0x1081884: addiu v0, zero, 8
+// 0x01081ea8: 0x1081ea8: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01081888: 0x1081888: sw    v0, 20(sp)
+// 0x01081eac: 0x1081eac: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3087,22 +3087,22 @@ L_108187c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108188c: 0x108188c: addiu a0, zero, 5
+// 0x01081eb0: 0x1081eb0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x01081890: 0x1081890: addiu v0, zero, 9
+// 0x01081eb4: 0x1081eb4: addiu v0, zero, 9
 	ldc.i4.s 9
 	stloc 5
-// 0x01081894: 0x1081894: addiu a1, zero, 5
+// 0x01081eb8: 0x1081eb8: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01081898: 0x1081898: addiu a2, zero, 5
+// 0x01081ebc: 0x1081ebc: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x0108189c: 0x108189c: addiu a3, zero, 6
+// 0x01081ec0: 0x1081ec0: addiu a3, zero, 6
 	ldc.i4.6
 	stloc 4
-// 0x010818a0: 0x10818a0: jal   0x1081464 sw    v0, 24(sp)
+// 0x01081ec4: 0x1081ec4: jal   0x1081a88 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3116,26 +3116,26 @@ L_108187c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10818a8:
-// 0x010818a8: 0x10818a8: lw    ra, 36(sp)
-// 0x010818ac: 0x10818ac: lui   v0, 0x80000
+L_1081ecc:
+// 0x01081ecc: 0x1081ecc: lw    ra, 36(sp)
+// 0x01081ed0: 0x1081ed0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010818b0: 0x10818b0: sw    s0, -13840(v0)
+// 0x01081ed4: 0x1081ed4: sw    s0, -13376(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldloc 8
 	stelem.i4
-// 0x010818b4: 0x10818b4: lw    s0, 32(sp)
+// 0x01081ed8: 0x1081ed8: lw    s0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3144,7 +3144,7 @@ L_10818a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010818b8: 0x10818b8: jr    ra addiu sp, sp, 40
+// 0x01081edc: 0x1081edc: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3154,23 +3154,23 @@ L_10818a8:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17307668
-	beq  L_1081814
+	ldc.i4 17309240
+	beq  L_1081e38
 	ldloc 5
-	ldc.i4 17307684
-	beq  L_1081824
+	ldc.i4 17309256
+	beq  L_1081e48
 	ldloc 5
-	ldc.i4 17307700
-	beq  L_1081834
+	ldc.i4 17309272
+	beq  L_1081e58
 	ldloc 5
-	ldc.i4 17307728
-	beq  L_1081850
+	ldc.i4 17309300
+	beq  L_1081e74
 	ldloc 5
-	ldc.i4 17307756
-	beq  L_108186c
+	ldc.i4 17309328
+	beq  L_1081e90
 	ldloc 5
-	ldc.i4 17307772
-	beq  L_108187c
+	ldc.i4 17309344
+	beq  L_1081ea0
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 7
@@ -3178,7 +3178,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_option_selected_10818c0(int32,int32,int32,int32,int32)
+.method public static int32 on_option_selected_1081ee4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 ra)
@@ -3222,16 +3222,16 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010818c0: 0x10818c0: addiu sp, sp, -56
+// 0x01081ee4: 0x1081ee4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x010818c4: 0x10818c4: lui   v0, 0x80000
+// 0x01081ee8: 0x1081ee8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010818c8: 0x10818c8: sw    ra, 52(sp)
-// 0x010818cc: 0x10818cc: sw    s2, 48(sp)
+// 0x01081eec: 0x1081eec: sw    ra, 52(sp)
+// 0x01081ef0: 0x1081ef0: sw    s2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3240,7 +3240,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010818d0: 0x10818d0: sw    s1, 44(sp)
+// 0x01081ef4: 0x1081ef4: sw    s1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3249,7 +3249,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010818d4: 0x10818d4: sw    s0, 40(sp)
+// 0x01081ef8: 0x1081ef8: sw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3258,19 +3258,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010818d8: 0x10818d8: beq   a0, zero, 0x1081bf0 sw    zero, -13836(v0)
+// 0x01081efc: 0x1081efc: beq   a0, zero, 0x1082214 sw    zero, -13372(v0)
 	ldloc.1
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3459
+	ldc.i4 -3343
 	add
 	ldc.i4.s 0
 	stelem.i4
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x010818e0: 0x10818e0: lw    v0, 20(a1)
+// 0x01081f04: 0x1081f04: lw    v0, 20(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
@@ -3279,97 +3279,97 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010818e4: 0x10818e4: sll   zero, zero, 0
-// 0x010818e8: 0x10818e8: sltiu v1, v0, 14
+// 0x01081f08: 0x1081f08: sll   zero, zero, 0
+// 0x01081f0c: 0x1081f0c: sltiu v1, v0, 14
 	ldloc 5
 	ldc.i4.s 14
 	clt.un
 	stloc 6
-// 0x010818ec: 0x10818ec: beq   v1, zero, 0x1081bf0 lui   v1, 0x20000
+// 0x01081f10: 0x1081f10: beq   v1, zero, 0x1082214 lui   v1, 0x20000
 	ldloc 6
 	ldc.i4 131072
 	stloc 6
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x010818f4: 0x10818f4: sll   v0, v0, 2
+// 0x01081f18: 0x1081f18: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010818f8: 0x10818f8: addiu v1, v1, 29360
+// 0x01081f1c: 0x1081f1c: addiu v1, v1, 29824
 	ldloc 6
-	ldc.i4 29360
+	ldc.i4 29824
 	add
 	stloc 6
-// 0x010818fc: 0x10818fc: addu  v0, v1, v0
+// 0x01081f20: 0x1081f20: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01081900: 0x1081900: lw    v0, 0(v0)
+// 0x01081f24: 0x1081f24: lw    v0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01081904: 0x1081904: sll   zero, zero, 0
-// 0x01081908: 0x1081908: jr    v0 sll   zero, zero, 0
+// 0x01081f28: 0x1081f28: sll   zero, zero, 0
+// 0x01081f2c: 0x1081f2c: jr    v0 sll   zero, zero, 0
 	ldloc 5
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1081910:
-// 0x01081910: 0x1081910: lui   v0, 0x80000
+L_1081f34:
+// 0x01081f34: 0x1081f34: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081914: 0x1081914: lw    v1, -13840(v0)
+// 0x01081f38: 0x1081f38: lw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 6
-// 0x01081918: 0x1081918: lui   v0, 0x80000
+// 0x01081f3c: 0x1081f3c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108191c: 0x108191c: sll   v1, v1, 2
+// 0x01081f40: 0x1081f40: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01081920: 0x1081920: addiu v0, v0, -13824
+// 0x01081f44: 0x1081f44: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x01081924: 0x1081924: addu  v0, v1, v0
+// 0x01081f48: 0x1081f48: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01081928: 0x1081928: lw    a0, 0(v0)
+// 0x01081f4c: 0x1081f4c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108192c: 0x108192c: jal   0x109162c sll   zero, zero, 0
+// 0x01081f50: 0x1081f50: jal   0x1091c50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081934: 0x1081934: beq   v0, zero, 0x1081bf0 sll   zero, zero, 0
+// 0x01081f58: 0x1081f58: beq   v0, zero, 0x1082214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x0108193c: 0x108193c: jal   0x1000d8c addu  a0, v0, zero
+// 0x01081f60: 0x1081f60: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3382,7 +3382,7 @@ L_1081910:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081944: 0x1081944: jal   0x109bc0c sw    v0, 32(sp)
+// 0x01081f68: 0x1081f68: jal   0x109c254 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3396,12 +3396,12 @@ L_1081910:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_generic_list_dialog_hide_all_109bc0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_generic_list_dialog_hide_all_109c254(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108194c: 0x108194c: lw    v0, 32(sp)
+// 0x01081f70: 0x1081f70: lw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3410,10 +3410,10 @@ L_1081910:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081950: 0x1081950: addu  a1, zero, zero
+// 0x01081f74: 0x1081f74: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081954: 0x1081954: jal   0x107eb70 addu  a0, v0, zero
+// 0x01081f78: 0x1081f78: jal   0x107f194 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3421,66 +3421,66 @@ L_1081910:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Popup_By_Id_107eb70(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Popup_By_Id_107f194(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108195c: 0x108195c: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x01081f80: 0x1081f80: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_1081964:
-// 0x01081964: 0x1081964: lui   v0, 0x80000
+L_1081f88:
+// 0x01081f88: 0x1081f88: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081968: 0x1081968: lw    v1, -13840(v0)
+// 0x01081f8c: 0x1081f8c: lw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108196c: 0x108196c: lui   v0, 0x80000
+// 0x01081f90: 0x1081f90: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081970: 0x1081970: sll   v1, v1, 2
+// 0x01081f94: 0x1081f94: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01081974: 0x1081974: addiu v0, v0, -13824
+// 0x01081f98: 0x1081f98: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x01081978: 0x1081978: addu  v0, v1, v0
+// 0x01081f9c: 0x1081f9c: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x0108197c: 0x108197c: lw    a0, 0(v0)
+// 0x01081fa0: 0x1081fa0: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01081980: 0x1081980: jal   0x109162c sll   zero, zero, 0
+// 0x01081fa4: 0x1081fa4: jal   0x1091c50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081988: 0x1081988: beq   v0, zero, 0x1081bf0 sll   zero, zero, 0
+// 0x01081fac: 0x1081fac: beq   v0, zero, 0x1082214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x01081990: 0x1081990: jal   0x1000d8c addu  a0, v0, zero
+// 0x01081fb4: 0x1081fb4: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3493,7 +3493,7 @@ L_1081964:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081998: 0x1081998: jal   0x1079c10 addu  a0, v0, zero
+// 0x01081fbc: 0x1081fbc: jal   0x107a234 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3501,81 +3501,81 @@ L_1081964:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl91::RTAlerts_Download_Image_1079c10(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Download_Image_107a234(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010819a0: 0x10819a0: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x01081fc4: 0x1081fc4: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_10819a8:
-// 0x010819a8: 0x10819a8: jal   0x1081378 sll   zero, zero, 0
+L_1081fcc:
+// 0x01081fcc: 0x1081fcc: jal   0x108199c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::on_option_delete_1081378(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::on_option_delete_108199c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010819b0: 0x10819b0: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x01081fd4: 0x1081fd4: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_10819b8:
-// 0x010819b8: 0x10819b8: lui   v0, 0x80000
+L_1081fdc:
+// 0x01081fdc: 0x1081fdc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010819bc: 0x10819bc: lw    v1, -13840(v0)
+// 0x01081fe0: 0x1081fe0: lw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 6
-// 0x010819c0: 0x10819c0: lui   v0, 0x80000
+// 0x01081fe4: 0x1081fe4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010819c4: 0x10819c4: sll   v1, v1, 2
+// 0x01081fe8: 0x1081fe8: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010819c8: 0x10819c8: addiu v0, v0, -13824
+// 0x01081fec: 0x1081fec: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x010819cc: 0x10819cc: addu  v0, v1, v0
+// 0x01081ff0: 0x1081ff0: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x010819d0: 0x10819d0: lw    a0, 0(v0)
+// 0x01081ff4: 0x1081ff4: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010819d4: 0x10819d4: jal   0x109162c sll   zero, zero, 0
+// 0x01081ff8: 0x1081ff8: jal   0x1091c50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010819dc: 0x10819dc: beq   v0, zero, 0x1081bf0 sll   zero, zero, 0
+// 0x01082000: 0x1082000: beq   v0, zero, 0x1082214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x010819e4: 0x10819e4: jal   0x1000d8c addu  a0, v0, zero
+// 0x01082008: 0x1082008: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3588,37 +3588,37 @@ L_10819b8:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010819ec: 0x10819ec: addu  a0, v0, zero
+// 0x01082010: 0x1082010: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010819f0: 0x10819f0: jal   0x10771d8 addu  s0, v0, zero
+// 0x01082014: 0x1082014: jal   0x10777fc addu  s0, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10771d8(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10777fc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010819f8: 0x10819f8: beq   v0, zero, 0x1081bf0 sll   zero, zero, 0
+// 0x0108201c: 0x108201c: beq   v0, zero, 0x1082214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x01081a00: 0x1081a00: jal   0x109bc2c sll   zero, zero, 0
+// 0x01082024: 0x1082024: jal   0x109c274 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_generic_list_dialog_hide_109bc2c(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_generic_list_dialog_hide_109c274(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081a08: 0x1081a08: jal   0x10847d8 addu  a0, s0, zero
+// 0x0108202c: 0x108202c: jal   0x1084dfc addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3626,66 +3626,66 @@ L_10819b8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeAlertCommentsList_10847d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeAlertCommentsList_1084dfc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081a10: 0x1081a10: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x01082034: 0x1082034: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_1081a18:
-// 0x01081a18: 0x1081a18: lui   v0, 0x80000
+L_108203c:
+// 0x0108203c: 0x108203c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081a1c: 0x1081a1c: lw    v1, -13840(v0)
+// 0x01082040: 0x1082040: lw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 6
-// 0x01081a20: 0x1081a20: lui   v0, 0x80000
+// 0x01082044: 0x1082044: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081a24: 0x1081a24: sll   v1, v1, 2
+// 0x01082048: 0x1082048: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01081a28: 0x1081a28: addiu v0, v0, -13824
+// 0x0108204c: 0x108204c: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x01081a2c: 0x1081a2c: addu  v0, v1, v0
+// 0x01082050: 0x1082050: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01081a30: 0x1081a30: lw    a0, 0(v0)
+// 0x01082054: 0x1082054: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01081a34: 0x1081a34: jal   0x109162c sll   zero, zero, 0
+// 0x01082058: 0x1082058: jal   0x1091c50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081a3c: 0x1081a3c: beq   v0, zero, 0x1081bf0 sll   zero, zero, 0
+// 0x01082060: 0x1082060: beq   v0, zero, 0x1082214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x01081a44: 0x1081a44: jal   0x1000d8c addu  a0, v0, zero
+// 0x01082068: 0x1082068: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3698,7 +3698,7 @@ L_1081a18:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081a4c: 0x1081a4c: jal   0x1078cdc addu  a0, v0, zero
+// 0x01082070: 0x1082070: jal   0x1079300 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3706,110 +3706,110 @@ L_1081a18:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::real_time_post_alert_comment_by_id_1078cdc(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::real_time_post_alert_comment_by_id_1079300(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081a54: 0x1081a54: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x01082078: 0x1082078: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_1081a5c:
-// 0x01081a5c: 0x1081a5c: lui   v0, 0x80000
+L_1082080:
+// 0x01082080: 0x1082080: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081a60: 0x1081a60: addu  a0, zero, zero
+// 0x01082084: 0x1082084: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01081a64: 0x1081a64: j	 0x1081a7c sw    zero, -13848(v0)
+// 0x01082088: 0x1082088: j	 0x10820a0 sw    zero, -13384(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3462
+	ldc.i4 -3346
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1081a7c
+	br L_10820a0
 // --- basic block ---
-L_1081a6c:
-// 0x01081a6c: 0x1081a6c: addiu v1, zero, 1
+L_1082090:
+// 0x01082090: 0x1082090: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01081a70: 0x1081a70: lui   v0, 0x80000
+// 0x01082094: 0x1082094: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081a74: 0x1081a74: addiu a0, zero, 1
+// 0x01082098: 0x1082098: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01081a78: 0x1081a78: sw    v1, -13848(v0)
+// 0x0108209c: 0x108209c: sw    v1, -13384(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3462
+	ldc.i4 -3346
 	add
 	ldloc 6
 	stelem.i4
-L_1081a7c:
-// 0x01081a7c: 0x1081a7c: jal   0x10788cc sll   zero, zero, 0
+L_10820a0:
+// 0x010820a0: 0x10820a0: jal   0x1078ef0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Sort_List_10788cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Sort_List_1078ef0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1081a84:
-// 0x01081a84: 0x1081a84: jal   0x107fd70 sll   zero, zero, 0
+L_10820a8:
+// 0x010820a8: 0x10820a8: jal   0x1080394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_list_107fd70(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_list_1080394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081a8c: 0x1081a8c: lui   v0, 0x80000
+// 0x010820b0: 0x10820b0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081a90: 0x1081a90: lw    a0, -13840(v0)
+// 0x010820b4: 0x10820b4: lw    a0, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc.1
-// 0x01081a94: 0x1081a94: jal   0x10817dc sll   zero, zero, 0
+// 0x010820b8: 0x10820b8: jal   0x1081e00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::on_tab_gain_focus_10817dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::on_tab_gain_focus_1081e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081a9c: 0x1081a9c: jal   0x109589c sll   zero, zero, 0
+// 0x010820c0: 0x10820c0: jal   0x1095ee4 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_sort_tab_order_current_109589c(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_sort_tab_order_current_1095ee4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081aa4: 0x1081aa4: jal   0x1096264 addiu a0, zero, 4
+// 0x010820c8: 0x10820c8: jal   0x10968ac addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -3817,73 +3817,73 @@ L_1081a84:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_dialog_move_focus_1096264(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_dialog_move_focus_10968ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081aac: 0x1081aac: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x010820d0: 0x10820d0: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_1081ab4:
-// 0x01081ab4: 0x1081ab4: lui   v0, 0x80000
+L_10820d8:
+// 0x010820d8: 0x10820d8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081ab8: 0x1081ab8: lw    v1, -13840(v0)
+// 0x010820dc: 0x10820dc: lw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 6
-// 0x01081abc: 0x1081abc: lui   v0, 0x80000
+// 0x010820e0: 0x10820e0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081ac0: 0x1081ac0: sll   v1, v1, 2
+// 0x010820e4: 0x10820e4: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01081ac4: 0x1081ac4: addiu v0, v0, -13824
+// 0x010820e8: 0x10820e8: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x01081ac8: 0x1081ac8: addu  v0, v1, v0
+// 0x010820ec: 0x10820ec: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01081acc: 0x1081acc: lw    a0, 0(v0)
+// 0x010820f0: 0x10820f0: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01081ad0: 0x1081ad0: jal   0x109162c sll   zero, zero, 0
+// 0x010820f4: 0x10820f4: jal   0x1091c50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081ad8: 0x1081ad8: beq   v0, zero, 0x1081bf0 addu  s0, v0, zero
+// 0x010820fc: 0x10820fc: beq   v0, zero, 0x1082214 addu  s0, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 8
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x01081ae0: 0x1081ae0: lui   a0, 0x20000
+// 0x01082104: 0x1082104: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081ae4: 0x1081ae4: jal   0x101cd60 addiu a0, a0, -25696
+// 0x01082108: 0x1082108: jal   0x101cd70 addiu a0, a0, -25232
 	ldloc.1
-	ldc.i4 -25696
+	ldc.i4 -25232
 	add
 	stloc.1
 	ldloc.0
@@ -3891,20 +3891,20 @@ L_1081ab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081aec: 0x1081aec: lui   a0, 0x20000
+// 0x01082110: 0x1082110: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081af0: 0x1081af0: addiu a0, a0, -25680
+// 0x01082114: 0x1082114: addiu a0, a0, -25216
 	ldloc.1
-	ldc.i4 -25680
+	ldc.i4 -25216
 	add
 	stloc.1
-// 0x01081af4: 0x1081af4: jal   0x101cd60 addu  s2, v0, zero
+// 0x01082118: 0x1082118: jal   0x101cd70 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
@@ -3912,20 +3912,20 @@ L_1081ab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081afc: 0x1081afc: lui   a0, 0x10000
+// 0x01082120: 0x1082120: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01081b00: 0x1081b00: addiu a0, a0, -23936
+// 0x01082124: 0x1082124: addiu a0, a0, -23936
 	ldloc.1
 	ldc.i4 -23936
 	add
 	stloc.1
-// 0x01081b04: 0x1081b04: jal   0x101cd60 sw    v0, 32(sp)
+// 0x01082128: 0x1082128: jal   0x101cd70 sw    v0, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3939,20 +3939,20 @@ L_1081ab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081b0c: 0x1081b0c: lui   a0, 0x10000
+// 0x01082130: 0x1082130: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01081b10: 0x1081b10: addiu a0, a0, -25292
+// 0x01082134: 0x1082134: addiu a0, a0, -25292
 	ldloc.1
 	ldc.i4 -25292
 	add
 	stloc.1
-// 0x01081b14: 0x1081b14: jal   0x101cd60 addu  s1, v0, zero
+// 0x01082138: 0x1082138: jal   0x101cd70 addu  s1, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -3960,12 +3960,12 @@ L_1081ab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081b1c: 0x1081b1c: lw    a1, 32(sp)
+// 0x01082140: 0x1082140: lw    a1, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3974,21 +3974,21 @@ L_1081ab4:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01081b20: 0x1081b20: lui   a3, 0x1080000
+// 0x01082144: 0x1082144: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x01081b24: 0x1081b24: addu  a0, s2, zero
+// 0x01082148: 0x1082148: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01081b28: 0x1081b28: addiu a3, a3, 5168
+// 0x0108214c: 0x108214c: addiu a3, a3, 6740
 	ldloc 4
-	ldc.i4 5168
+	ldc.i4 6740
 	add
 	stloc 4
-// 0x01081b2c: 0x1081b2c: addu  a2, zero, zero
+// 0x01082150: 0x1082150: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081b30: 0x1081b30: sw    s0, 16(sp)
+// 0x01082154: 0x1082154: sw    s0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3997,7 +3997,7 @@ L_1081ab4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01081b34: 0x1081b34: sw    s1, 20(sp)
+// 0x01082158: 0x1082158: sw    s1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4006,7 +4006,7 @@ L_1081ab4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01081b38: 0x1081b38: jal   0x104c2a4 sw    v0, 24(sp)
+// 0x0108215c: 0x108215c: jal   0x104c2b4 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4020,153 +4020,153 @@ L_1081ab4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_custom_104c2a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_custom_104c2b4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081b40: 0x1081b40: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x01082164: 0x1082164: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_1081b48:
-// 0x01081b48: 0x1081b48: lui   v0, 0x80000
+L_108216c:
+// 0x0108216c: 0x108216c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081b4c: 0x1081b4c: j	 0x1081b70 sw    zero, -13852(v0)
+// 0x01082170: 0x1082170: j	 0x1082194 sw    zero, -13388(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_1081b70
+	br L_1082194
 // --- basic block ---
-L_1081b54:
-// 0x01081b54: 0x1081b54: addiu v1, zero, 1
+L_1082178:
+// 0x01082178: 0x1082178: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01081b58: 0x1081b58: lui   v0, 0x80000
+// 0x0108217c: 0x108217c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081b5c: 0x1081b5c: j	 0x1081a84 sw    v1, -13852(v0)
+// 0x01082180: 0x1082180: j	 0x10820a8 sw    v1, -13388(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldloc 6
 	stelem.i4
-	br L_1081a84
+	br L_10820a8
 // --- basic block ---
-L_1081b64:
-// 0x01081b64: 0x1081b64: addiu v1, zero, 2
+L_1082188:
+// 0x01082188: 0x1082188: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01081b68: 0x1081b68: lui   v0, 0x80000
+// 0x0108218c: 0x108218c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081b6c: 0x1081b6c: sw    v1, -13852(v0)
+// 0x01082190: 0x1082190: sw    v1, -13388(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldloc 6
 	stelem.i4
-L_1081b70:
-// 0x01081b70: 0x1081b70: jal   0x107fd70 sll   zero, zero, 0
+L_1082194:
+// 0x01082194: 0x1082194: jal   0x1080394 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_list_107fd70(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_list_1080394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081b78: 0x1081b78: lui   v0, 0x80000
+// 0x0108219c: 0x108219c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081b7c: 0x1081b7c: lw    a0, -13840(v0)
+// 0x010821a0: 0x10821a0: lw    a0, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc.1
-// 0x01081b80: 0x1081b80: jal   0x10817dc sll   zero, zero, 0
+// 0x010821a4: 0x10821a4: jal   0x1081e00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::on_tab_gain_focus_10817dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::on_tab_gain_focus_1081e00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081b88: 0x1081b88: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x010821ac: 0x10821ac: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_1081b90:
-// 0x01081b90: 0x1081b90: lui   v0, 0x80000
+L_10821b4:
+// 0x010821b4: 0x10821b4: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081b94: 0x1081b94: lw    v1, -13840(v0)
+// 0x010821b8: 0x10821b8: lw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldelem.i4
 	stloc 6
-// 0x01081b98: 0x1081b98: lui   v0, 0x80000
+// 0x010821bc: 0x10821bc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081b9c: 0x1081b9c: sll   v1, v1, 2
+// 0x010821c0: 0x10821c0: sll   v1, v1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01081ba0: 0x1081ba0: addiu v0, v0, -13824
+// 0x010821c4: 0x10821c4: addiu v0, v0, -13360
 	ldloc 5
-	ldc.i4 -13824
+	ldc.i4 -13360
 	add
 	stloc 5
-// 0x01081ba4: 0x1081ba4: addu  v0, v1, v0
+// 0x010821c8: 0x10821c8: addu  v0, v1, v0
 	ldloc 6
 	ldloc 5
 	add
 	stloc 5
-// 0x01081ba8: 0x1081ba8: lw    a0, 0(v0)
+// 0x010821cc: 0x10821cc: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01081bac: 0x1081bac: jal   0x109162c sll   zero, zero, 0
+// 0x010821d0: 0x10821d0: jal   0x1091c50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl108::ssd_list_selected_value_109162c(int32,int32,int32)
+	call int32 Cibyl108::ssd_list_selected_value_1091c50(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081bb4: 0x1081bb4: beq   v0, zero, 0x1081bf0 sll   zero, zero, 0
+// 0x010821d8: 0x10821d8: beq   v0, zero, 0x1082214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x01081bbc: 0x1081bbc: jal   0x1000d8c addu  a0, v0, zero
+// 0x010821e0: 0x10821e0: jal   0x1000d8c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4179,23 +4179,23 @@ L_1081b90:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081bc4: 0x1081bc4: jal   0x10770f0 addu  a0, v0, zero
+// 0x010821e8: 0x10821e8: jal   0x1077714 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_By_ID_10770f0(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_By_ID_1077714(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081bcc: 0x1081bcc: beq   v0, zero, 0x1081bf0 sll   zero, zero, 0
+// 0x010821f0: 0x10821f0: beq   v0, zero, 0x1082214 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1081bf0
+	brfalse L_1082214
 // --- basic block ---
-// 0x01081bd4: 0x1081bd4: jal   0x105474c addiu a0, v0, 1624
+// 0x010821f8: 0x10821f8: jal   0x105475c addiu a0, v0, 1624
 	ldloc 5
 	ldc.i4 1624
 	add
@@ -4205,24 +4205,24 @@ L_1081b90:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl62::roadmap_groups_show_group_105474c(int32,int32,int32,int32,int32)
+	call int32 Cibyl62::roadmap_groups_show_group_105475c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081bdc: 0x1081bdc: j	 0x1081bf0 sll   zero, zero, 0
-	br L_1081bf0
+// 0x01082200: 0x1082200: j	 0x1082214 sll   zero, zero, 0
+	br L_1082214
 // --- basic block ---
-L_1081be4:
-// 0x01081be4: 0x1081be4: lui   v0, 0x80000
+L_1082208:
+// 0x01082208: 0x1082208: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01081be8: 0x1081be8: jal   0x102146c sw    zero, -13836(v0)
+// 0x0108220c: 0x108220c: jal   0x102147c sw    zero, -13372(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3459
+	ldc.i4 -3343
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -4231,14 +4231,14 @@ L_1081be4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl24::roadmap_screen_refresh_102146c(int32,int32,int32,int32,int32)
+	call int32 Cibyl24::roadmap_screen_refresh_102147c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1081bf0:
-// 0x01081bf0: 0x1081bf0: lw    ra, 52(sp)
-// 0x01081bf4: 0x1081bf4: lw    s2, 48(sp)
+L_1082214:
+// 0x01082214: 0x1082214: lw    ra, 52(sp)
+// 0x01082218: 0x1082218: lw    s2, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4247,7 +4247,7 @@ L_1081bf0:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01081bf8: 0x1081bf8: lw    s1, 44(sp)
+// 0x0108221c: 0x108221c: lw    s1, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4256,7 +4256,7 @@ L_1081bf0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01081bfc: 0x1081bfc: lw    s0, 40(sp)
+// 0x01082220: 0x1082220: lw    s0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4265,7 +4265,7 @@ L_1081bf0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01081c00: 0x1081c00: jr    ra addiu sp, sp, 56
+// 0x01082224: 0x1082224: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -4275,47 +4275,47 @@ L_1081bf0:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17307920
-	beq  L_1081910
+	ldc.i4 17309492
+	beq  L_1081f34
 	ldloc 5
-	ldc.i4 17308004
-	beq  L_1081964
+	ldc.i4 17309576
+	beq  L_1081f88
 	ldloc 5
-	ldc.i4 17308072
-	beq  L_10819a8
+	ldc.i4 17309644
+	beq  L_1081fcc
 	ldloc 5
-	ldc.i4 17308088
-	beq  L_10819b8
+	ldc.i4 17309660
+	beq  L_1081fdc
 	ldloc 5
-	ldc.i4 17308184
-	beq  L_1081a18
+	ldc.i4 17309756
+	beq  L_108203c
 	ldloc 5
-	ldc.i4 17308252
-	beq  L_1081a5c
+	ldc.i4 17309824
+	beq  L_1082080
 	ldloc 5
-	ldc.i4 17308268
-	beq  L_1081a6c
+	ldc.i4 17309840
+	beq  L_1082090
 	ldloc 5
-	ldc.i4 17308340
-	beq  L_1081ab4
+	ldc.i4 17309912
+	beq  L_10820d8
 	ldloc 5
-	ldc.i4 17308488
-	beq  L_1081b48
+	ldc.i4 17310060
+	beq  L_108216c
 	ldloc 5
-	ldc.i4 17308500
-	beq  L_1081b54
+	ldc.i4 17310072
+	beq  L_1082178
 	ldloc 5
-	ldc.i4 17308516
-	beq  L_1081b64
+	ldc.i4 17310088
+	beq  L_1082188
 	ldloc 5
-	ldc.i4 17308560
-	beq  L_1081b90
+	ldc.i4 17310132
+	beq  L_10821b4
 	ldloc 5
-	ldc.i4 17308644
-	beq  L_1081be4
+	ldc.i4 17310216
+	beq  L_1082208
 	ldloc 5
-	ldc.i4 17308656
-	beq  L_1081bf0
+	ldc.i4 17310228
+	beq  L_1082214
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 6
@@ -4323,7 +4323,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 count_tab_1081c08(int32,int32,int32,int32,int32)
+.method public static int32 count_tab_108222c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v1,int32[] mem,int32 v0,int32 t0,int32 s0,int32 t1,int32 t4,int32 t5,int32 t2,int32 ra,int32 t3)
@@ -4379,18 +4379,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01081c08: 0x1081c08: addiu sp, sp, -32
+// 0x0108222c: 0x108222c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01081c0c: 0x1081c0c: lui   t0, 0x80000
+// 0x01082230: 0x1082230: lui   t0, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01081c10: 0x1081c10: lui   t4, 0x80000
+// 0x01082234: 0x1082234: lui   t4, 0x80000
 	ldc.i4 524288
 	stloc 11
-// 0x01081c14: 0x1081c14: sw    a3, 44(sp)
+// 0x01082238: 0x1082238: sw    a3, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4399,8 +4399,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x01081c18: 0x1081c18: sw    ra, 28(sp)
-// 0x01081c1c: 0x1081c1c: sw    s0, 24(sp)
+// 0x0108223c: 0x108223c: sw    ra, 28(sp)
+// 0x01082240: 0x1082240: sw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4409,90 +4409,90 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01081c20: 0x1081c20: addiu t0, t0, -11800
+// 0x01082244: 0x1082244: addiu t0, t0, -11336
 	ldloc 8
-	ldc.i4 -11800
+	ldc.i4 -11336
 	add
 	stloc 8
-// 0x01081c24: 0x1081c24: addiu t4, t4, -13800
+// 0x01082248: 0x1082248: addiu t4, t4, -13336
 	ldloc 11
-	ldc.i4 -13800
+	ldc.i4 -13336
 	add
 	stloc 11
-// 0x01081c28: 0x1081c28: addu  v0, zero, zero
+// 0x0108224c: 0x108224c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01081c2c: 0x1081c2c: addu  a3, zero, zero
+// 0x01082250: 0x1082250: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01081c30: 0x1081c30: j	 0x1081c80 addiu t3, sp, 44
+// 0x01082254: 0x1082254: j	 0x10822a4 addiu t3, sp, 44
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 15
-	br L_1081c80
+	br L_10822a4
 // --- basic block ---
-L_1081c38:
-// 0x01081c38: 0x1081c38: addu  t2, a2, zero
+L_108225c:
+// 0x0108225c: 0x108225c: addu  t2, a2, zero
 	ldloc.3
 	stloc 13
-// 0x01081c3c: 0x1081c3c: j	 0x1081c68 addu  t1, zero, zero
+// 0x01082260: 0x1082260: j	 0x108228c addu  t1, zero, zero
 	ldc.i4.s 0
 	stloc 10
-	br L_1081c68
+	br L_108228c
 // --- basic block ---
-L_1081c44:
-// 0x01081c44: 0x1081c44: lw    t5, 0(t0)
+L_1082268:
+// 0x01082268: 0x1082268: lw    t5, 0(t0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 12
-// 0x01081c48: 0x1081c48: sll   zero, zero, 0
-// 0x01081c4c: 0x1081c4c: beq   t5, t2, 0x1081c5c addiu t1, t1, 1
+// 0x0108226c: 0x108226c: sll   zero, zero, 0
+// 0x01082270: 0x1082270: beq   t5, t2, 0x1082280 addiu t1, t1, 1
 	ldloc 12
 	ldloc 13
 	ldloc 10
 	ldc.i4.1
 	add
 	stloc 10
-	beq  L_1081c5c
+	beq  L_1082280
 // --- basic block ---
-// 0x01081c54: 0x1081c54: bne   a0, zero, 0x1081c60 sll   zero, zero, 0
+// 0x01082278: 0x1082278: bne   a0, zero, 0x1082284 sll   zero, zero, 0
 	ldloc.1
-	brtrue L_1081c60
+	brtrue L_1082284
 // --- basic block ---
-L_1081c5c:
-// 0x01081c5c: 0x1081c5c: addiu v0, v0, 1
+L_1082280:
+// 0x01082280: 0x1082280: addiu v0, v0, 1
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-L_1081c60:
-// 0x01081c60: 0x1081c60: lw    t2, 0(v1)
+L_1082284:
+// 0x01082284: 0x1082284: lw    t2, 0(v1)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 13
-// 0x01081c64: 0x1081c64: addiu v1, v1, 4
+// 0x01082288: 0x1082288: addiu v1, v1, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-L_1081c68:
-// 0x01081c68: 0x1081c68: slt   t5, t1, a1
+L_108228c:
+// 0x0108228c: 0x108228c: slt   t5, t1, a1
 	ldloc 10
 	ldloc.2
 	clt
 	stloc 12
-// 0x01081c6c: 0x1081c6c: bne   t5, zero, 0x1081c44 sll   zero, zero, 0
+// 0x01082290: 0x1082290: bne   t5, zero, 0x1082268 sll   zero, zero, 0
 	ldloc 12
-	brtrue L_1081c44
+	brtrue L_1082268
 // --- basic block ---
-// 0x01081c74: 0x1081c74: sw    v1, 16(sp)
+// 0x01082298: 0x1082298: sw    v1, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4501,18 +4501,18 @@ L_1081c68:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01081c78: 0x1081c78: addiu a3, a3, 1
+// 0x0108229c: 0x108229c: addiu a3, a3, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-// 0x01081c7c: 0x1081c7c: addiu t0, t0, 4
+// 0x010822a0: 0x10822a0: addiu t0, t0, 4
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-L_1081c80:
-// 0x01081c80: 0x1081c80: lw    v1, 2800(t4)
+L_10822a4:
+// 0x010822a4: 0x10822a4: lw    v1, 2800(t4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -4521,35 +4521,35 @@ L_1081c80:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081c84: 0x1081c84: sll   zero, zero, 0
-// 0x01081c88: 0x1081c88: slt   v1, a3, v1
+// 0x010822a8: 0x10822a8: sll   zero, zero, 0
+// 0x010822ac: 0x10822ac: slt   v1, a3, v1
 	ldloc 4
 	ldloc 5
 	clt
 	stloc 5
-// 0x01081c8c: 0x1081c8c: bne   v1, zero, 0x1081c38 addu  v1, t3, zero
+// 0x010822b0: 0x10822b0: bne   v1, zero, 0x108225c addu  v1, t3, zero
 	ldloc 5
 	ldloc 15
 	stloc 5
-	brtrue L_1081c38
+	brtrue L_108225c
 // --- basic block ---
-// 0x01081c94: 0x1081c94: lui   s0, 0x80000
+// 0x010822b8: 0x10822b8: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 9
-// 0x01081c98: 0x1081c98: lui   a1, 0x20000
-	ldc.i4 131072
+// 0x010822bc: 0x10822bc: lui   a1, 0x10000
+	ldc.i4 65536
 	stloc.2
-// 0x01081c9c: 0x1081c9c: addiu a0, s0, -13832
+// 0x010822c0: 0x10822c0: addiu a0, s0, -13368
 	ldloc 9
-	ldc.i4 -13832
+	ldc.i4 -13368
 	add
 	stloc.1
-// 0x01081ca0: 0x1081ca0: addiu a1, a1, -13884
+// 0x010822c4: 0x10822c4: addiu a1, a1, 19088
 	ldloc.2
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.2
-// 0x01081ca4: 0x1081ca4: jal   0x1000f64 addu  a2, v0, zero
+// 0x010822c8: 0x10822c8: jal   0x1000f64 addu  a2, v0, zero
 	ldloc 7
 	stloc.3
 	ldloc.0
@@ -4562,13 +4562,13 @@ L_1081c80:
 	stloc 5
 	stloc 7
 // --- basic block ---
-// 0x01081cac: 0x1081cac: lw    ra, 28(sp)
-// 0x01081cb0: 0x1081cb0: addiu v0, s0, -13832
+// 0x010822d0: 0x10822d0: lw    ra, 28(sp)
+// 0x010822d4: 0x10822d4: addiu v0, s0, -13368
 	ldloc 9
-	ldc.i4 -13832
+	ldc.i4 -13368
 	add
 	stloc 7
-// 0x01081cb4: 0x1081cb4: lw    s0, 24(sp)
+// 0x010822d8: 0x10822d8: lw    s0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4577,7 +4577,7 @@ L_1081c80:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01081cb8: 0x1081cb8: jr    ra addiu sp, sp, 32
+// 0x010822dc: 0x10822dc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4589,7 +4589,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 show_list_1081cc0(int32,int32,int32,int32,int32)
+.method public static int32 show_list_10822e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s1,int32 s2,int32 s0,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 ra)
@@ -4648,15 +4648,15 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01081cc0: 0x1081cc0: addiu sp, sp, -72
+// 0x010822e4: 0x10822e4: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x01081cc4: 0x1081cc4: addiu a3, zero, 8192
+// 0x010822e8: 0x10822e8: addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
-// 0x01081cc8: 0x1081cc8: sw    s5, 56(sp)
+// 0x010822ec: 0x10822ec: sw    s5, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4665,14 +4665,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01081ccc: 0x1081ccc: addu  s5, a2, zero
+// 0x010822f0: 0x10822f0: addu  s5, a2, zero
 	ldloc.3
 	stloc 13
-// 0x01081cd0: 0x1081cd0: addu  a2, zero, zero
+// 0x010822f4: 0x10822f4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081cd4: 0x1081cd4: sw    ra, 68(sp)
-// 0x01081cd8: 0x1081cd8: sw    s7, 64(sp)
+// 0x010822f8: 0x10822f8: sw    ra, 68(sp)
+// 0x010822fc: 0x10822fc: sw    s7, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4681,7 +4681,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01081cdc: 0x1081cdc: sw    s6, 60(sp)
+// 0x01082300: 0x1082300: sw    s6, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4690,7 +4690,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01081ce0: 0x1081ce0: sw    s4, 52(sp)
+// 0x01082304: 0x1082304: sw    s4, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4699,7 +4699,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01081ce4: 0x1081ce4: sw    s3, 48(sp)
+// 0x01082308: 0x1082308: sw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4708,7 +4708,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01081ce8: 0x1081ce8: sw    s2, 44(sp)
+// 0x0108230c: 0x108230c: sw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4717,7 +4717,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01081cec: 0x1081cec: sw    s1, 40(sp)
+// 0x01082310: 0x1082310: sw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4726,7 +4726,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01081cf0: 0x1081cf0: sw    s0, 36(sp)
+// 0x01082314: 0x1082314: sw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4735,7 +4735,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01081cf4: 0x1081cf4: jal   0x1095a08 addu  s7, a0, zero
+// 0x01082318: 0x1082318: jal   0x1096050 addu  s7, a0, zero
 	ldloc.1
 	stloc 15
 	ldloc.0
@@ -4743,48 +4743,48 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081cfc: 0x1081cfc: addu  a0, v0, zero
+// 0x01082320: 0x1082320: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081d00: 0x1081d00: addu  a1, s5, zero
+// 0x01082324: 0x1082324: addu  a1, s5, zero
 	ldloc 13
 	stloc.2
-// 0x01081d04: 0x1081d04: jal   0x1098ec4 addu  s0, v0, zero
+// 0x01082328: 0x1082328: jal   0x109950c addu  s0, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081d0c: 0x1081d0c: lui   a0, 0x20000
+// 0x01082330: 0x1082330: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081d10: 0x1081d10: addiu s4, zero, 137
+// 0x01082334: 0x1082334: addiu s4, zero, 137
 	ldc.i4 137
 	stloc 12
-// 0x01081d14: 0x1081d14: addiu a3, zero, -2
+// 0x01082338: 0x1082338: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x01081d18: 0x1081d18: addiu a0, a0, -23448
+// 0x0108233c: 0x108233c: addiu a0, a0, -22984
 	ldloc.1
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.1
-// 0x01081d1c: 0x1081d1c: addu  a1, zero, zero
+// 0x01082340: 0x1082340: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081d20: 0x1081d20: addiu a2, zero, -2
+// 0x01082344: 0x1082344: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01081d24: 0x1081d24: jal   0x1093a24 sw    s4, 16(sp)
+// 0x01082348: 0x1082348: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4798,49 +4798,49 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081d2c: 0x1081d2c: addu  a0, v0, zero
+// 0x01082350: 0x1082350: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081d30: 0x1081d30: addu  a1, zero, zero
+// 0x01082354: 0x1082354: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081d34: 0x1081d34: addu  a2, zero, zero
+// 0x01082358: 0x1082358: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081d38: 0x1081d38: jal   0x1098fe0 addu  s2, v0, zero
+// 0x0108235c: 0x108235c: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01081d40: 0x1081d40: lui   a0, 0x20000
+// 0x01082364: 0x1082364: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081d44: 0x1081d44: addiu a3, zero, -1
+// 0x01082368: 0x1082368: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01081d48: 0x1081d48: addiu a0, a0, -23328
+// 0x0108236c: 0x108236c: addiu a0, a0, -22864
 	ldloc.1
-	ldc.i4 -23328
+	ldc.i4 -22864
 	add
 	stloc.1
-// 0x01081d4c: 0x1081d4c: addu  a1, zero, zero
+// 0x01082370: 0x1082370: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081d50: 0x1081d50: addiu a2, zero, -1
+// 0x01082374: 0x1082374: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01081d54: 0x1081d54: addiu v0, zero, 153
+// 0x01082378: 0x1082378: addiu v0, zero, 153
 	ldc.i4 153
 	stloc 5
-// 0x01081d58: 0x1081d58: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0108237c: 0x108237c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4854,34 +4854,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081d60: 0x1081d60: addu  a0, v0, zero
+// 0x01082384: 0x1082384: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081d64: 0x1081d64: addu  a1, zero, zero
+// 0x01082388: 0x1082388: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081d68: 0x1081d68: addu  a2, zero, zero
+// 0x0108238c: 0x108238c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081d6c: 0x1081d6c: jal   0x1098fe0 addu  s1, v0, zero
+// 0x01082390: 0x1082390: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01081d74: 0x1081d74: lui   a0, 0x20000
+// 0x01082398: 0x1082398: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081d78: 0x1081d78: jal   0x101cd60 addiu a0, a0, -23300
+// 0x0108239c: 0x108239c: jal   0x101cd70 addiu a0, a0, -22836
 	ldloc.1
-	ldc.i4 -23300
+	ldc.i4 -22836
 	add
 	stloc.1
 	ldloc.0
@@ -4889,26 +4889,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081d80: 0x1081d80: lui   s3, 0x20000
+// 0x010823a4: 0x10823a4: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x01081d84: 0x1081d84: addiu a3, zero, 9
+// 0x010823a8: 0x10823a8: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x01081d88: 0x1081d88: addiu a2, zero, 20
+// 0x010823ac: 0x10823ac: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x01081d8c: 0x1081d8c: addiu a0, s3, -23288
+// 0x010823b0: 0x10823b0: addiu a0, s3, -22824
 	ldloc 11
-	ldc.i4 -23288
+	ldc.i4 -22824
 	add
 	stloc.1
-// 0x01081d90: 0x1081d90: jal   0x1098d10 addu  a1, v0, zero
+// 0x010823b4: 0x10823b4: jal   0x1099358 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -4916,23 +4916,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081d98: 0x1081d98: lui   s6, 0x0
+// 0x010823bc: 0x10823bc: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x01081d9c: 0x1081d9c: addu  a0, v0, zero
+// 0x010823c0: 0x10823c0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081da0: 0x1081da0: addiu a1, s6, 23008
+// 0x010823c4: 0x10823c4: addiu a1, s6, 23008
 	ldloc 14
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01081da4: 0x1081da4: jal   0x1097af8 sw    v0, 24(sp)
+// 0x010823c8: 0x10823c8: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4943,9 +4943,9 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01081dac: 0x1081dac: lw    v0, 24(sp)
+// 0x010823d0: 0x10823d0: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -4954,26 +4954,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081db0: 0x1081db0: addu  a0, s1, zero
+// 0x010823d4: 0x10823d4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01081db4: 0x1081db4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010823d8: 0x10823d8: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081dbc: 0x1081dbc: addu  a0, s1, zero
+// 0x010823e0: 0x10823e0: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01081dc0: 0x1081dc0: addiu a1, zero, 20
+// 0x010823e4: 0x10823e4: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01081dc4: 0x1081dc4: jal   0x10942e8 addu  a2, zero, zero
+// 0x010823e8: 0x10823e8: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -4981,17 +4981,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081dcc: 0x1081dcc: lui   a0, 0x20000
+// 0x010823f0: 0x10823f0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081dd0: 0x1081dd0: jal   0x101cd60 addiu a0, a0, -23272
+// 0x010823f4: 0x10823f4: jal   0x101cd70 addiu a0, a0, -22808
 	ldloc.1
-	ldc.i4 -23272
+	ldc.i4 -22808
 	add
 	stloc.1
 	ldloc.0
@@ -4999,23 +4999,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081dd8: 0x1081dd8: addu  a1, v0, zero
+// 0x010823fc: 0x10823fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01081ddc: 0x1081ddc: addiu a2, zero, 14
+// 0x01082400: 0x1082400: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01081de0: 0x1081de0: addiu a3, zero, 1
+// 0x01082404: 0x1082404: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01081de4: 0x1081de4: jal   0x1098d10 addiu a0, s3, -23288
+// 0x01082408: 0x1082408: jal   0x1099358 addiu a0, s3, -22824
 	ldloc 11
-	ldc.i4 -23288
+	ldc.i4 -22824
 	add
 	stloc.1
 	ldloc.0
@@ -5023,23 +5023,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081dec: 0x1081dec: lui   s3, 0x20000
+// 0x01082410: 0x1082410: lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 11
-// 0x01081df0: 0x1081df0: addu  a0, v0, zero
+// 0x01082414: 0x1082414: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081df4: 0x1081df4: addiu a1, s3, -23208
+// 0x01082418: 0x1082418: addiu a1, s3, -22744
 	ldloc 11
-	ldc.i4 -23208
+	ldc.i4 -22744
 	add
 	stloc.2
-// 0x01081df8: 0x1081df8: jal   0x1097af8 sw    v0, 24(sp)
+// 0x0108241c: 0x108241c: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5050,9 +5050,9 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01081e00: 0x1081e00: lw    v0, 24(sp)
+// 0x01082424: 0x1082424: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5061,70 +5061,70 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081e04: 0x1081e04: addu  a0, s1, zero
+// 0x01082428: 0x1082428: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01081e08: 0x1081e08: jal   0x1098ec4 addu  a1, v0, zero
+// 0x0108242c: 0x108242c: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081e10: 0x1081e10: addu  a0, s2, zero
+// 0x01082434: 0x1082434: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01081e14: 0x1081e14: jal   0x1098ec4 addu  a1, s1, zero
+// 0x01082438: 0x1082438: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081e1c: 0x1081e1c: addu  a1, s2, zero
+// 0x01082440: 0x1082440: addu  a1, s2, zero
 	ldloc 9
 	stloc.2
-// 0x01081e20: 0x1081e20: jal   0x1098ec4 addu  a0, s0, zero
+// 0x01082444: 0x1082444: jal   0x109950c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081e28: 0x1081e28: jal   0x1099098 addu  a0, s2, zero
+// 0x0108244c: 0x108244c: jal   0x10996e0 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01081e30: 0x1081e30: lui   a0, 0x20000
+// 0x01082454: 0x1082454: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081e34: 0x1081e34: addiu a3, zero, -2
+// 0x01082458: 0x1082458: addiu a3, zero, -2
 	ldc.i4.s -2
 	stloc 4
-// 0x01081e38: 0x1081e38: addiu a0, a0, -23432
+// 0x0108245c: 0x108245c: addiu a0, a0, -22968
 	ldloc.1
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.1
-// 0x01081e3c: 0x1081e3c: addu  a1, zero, zero
+// 0x01082460: 0x1082460: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081e40: 0x1081e40: addiu a2, zero, -2
+// 0x01082464: 0x1082464: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01081e44: 0x1081e44: jal   0x1093a24 sw    s4, 16(sp)
+// 0x01082468: 0x1082468: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5138,35 +5138,35 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081e4c: 0x1081e4c: addu  s2, v0, zero
+// 0x01082470: 0x1082470: addu  s2, v0, zero
 	ldloc 5
 	stloc 9
-// 0x01081e50: 0x1081e50: addu  a0, v0, zero
+// 0x01082474: 0x1082474: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081e54: 0x1081e54: addu  a1, zero, zero
+// 0x01082478: 0x1082478: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081e58: 0x1081e58: jal   0x1098fe0 addu  a2, zero, zero
+// 0x0108247c: 0x108247c: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01081e60: 0x1081e60: addu  a0, s2, zero
+// 0x01082484: 0x1082484: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01081e64: 0x1081e64: addiu a1, zero, 10
+// 0x01082488: 0x1082488: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-// 0x01081e68: 0x1081e68: jal   0x10942e8 addu  a2, zero, zero
+// 0x0108248c: 0x108248c: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -5174,28 +5174,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081e70: 0x1081e70: lui   a0, 0x20000
+// 0x01082494: 0x1082494: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081e74: 0x1081e74: lui   a1, 0x20000
+// 0x01082498: 0x1082498: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01081e78: 0x1081e78: addiu a2, zero, 9
+// 0x0108249c: 0x108249c: addiu a2, zero, 9
 	ldc.i4.s 9
 	stloc.3
-// 0x01081e7c: 0x1081e7c: addiu a0, a0, -23200
+// 0x010824a0: 0x10824a0: addiu a0, a0, -22736
 	ldloc.1
-	ldc.i4 -23200
+	ldc.i4 -22736
 	add
 	stloc.1
-// 0x01081e80: 0x1081e80: jal   0x109e13c addiu a1, a1, -23184
+// 0x010824a4: 0x10824a4: jal   0x109e784 addiu a1, a1, -22720
 	ldloc.2
-	ldc.i4 -23184
+	ldc.i4 -22720
 	add
 	stloc.2
 	ldloc.0
@@ -5203,42 +5203,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081e88: 0x1081e88: addu  a1, v0, zero
+// 0x010824ac: 0x10824ac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01081e8c: 0x1081e8c: jal   0x1098ec4 addu  a0, s2, zero
+// 0x010824b0: 0x10824b0: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081e94: 0x1081e94: lui   a0, 0x20000
+// 0x010824b8: 0x10824b8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081e98: 0x1081e98: addiu a3, zero, -1
+// 0x010824bc: 0x10824bc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01081e9c: 0x1081e9c: addiu a0, a0, -23172
+// 0x010824c0: 0x10824c0: addiu a0, a0, -22708
 	ldloc.1
-	ldc.i4 -23172
+	ldc.i4 -22708
 	add
 	stloc.1
-// 0x01081ea0: 0x1081ea0: addu  a1, zero, zero
+// 0x010824c4: 0x10824c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081ea4: 0x1081ea4: addiu a2, zero, -1
+// 0x010824c8: 0x10824c8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01081ea8: 0x1081ea8: jal   0x1093a24 sw    s4, 16(sp)
+// 0x010824cc: 0x10824cc: jal   0x1094048 sw    s4, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5252,34 +5252,34 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081eb0: 0x1081eb0: addu  a0, v0, zero
+// 0x010824d4: 0x10824d4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081eb4: 0x1081eb4: addu  a1, zero, zero
+// 0x010824d8: 0x10824d8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01081eb8: 0x1081eb8: addu  a2, zero, zero
+// 0x010824dc: 0x10824dc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081ebc: 0x1081ebc: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010824e0: 0x10824e0: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01081ec4: 0x1081ec4: lui   a0, 0x20000
+// 0x010824e8: 0x10824e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081ec8: 0x1081ec8: jal   0x101cd60 addiu a0, a0, -23144
+// 0x010824ec: 0x10824ec: jal   0x101cd70 addiu a0, a0, -22680
 	ldloc.1
-	ldc.i4 -23144
+	ldc.i4 -22680
 	add
 	stloc.1
 	ldloc.0
@@ -5287,26 +5287,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081ed0: 0x1081ed0: lui   a0, 0x20000
+// 0x010824f4: 0x10824f4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081ed4: 0x1081ed4: addiu a3, zero, 9
+// 0x010824f8: 0x10824f8: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x01081ed8: 0x1081ed8: addiu a2, zero, 20
+// 0x010824fc: 0x10824fc: addiu a2, zero, 20
 	ldc.i4.s 20
 	stloc.3
-// 0x01081edc: 0x1081edc: addu  a1, v0, zero
+// 0x01082500: 0x1082500: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01081ee0: 0x1081ee0: jal   0x1098d10 addiu a0, a0, -23124
+// 0x01082504: 0x1082504: jal   0x1099358 addiu a0, a0, -22660
 	ldloc.1
-	ldc.i4 -23124
+	ldc.i4 -22660
 	add
 	stloc.1
 	ldloc.0
@@ -5314,20 +5314,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081ee8: 0x1081ee8: addu  a0, v0, zero
+// 0x0108250c: 0x108250c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081eec: 0x1081eec: addiu a1, s6, 23008
+// 0x01082510: 0x1082510: addiu a1, s6, 23008
 	ldloc 14
 	ldc.i4 23008
 	add
 	stloc.2
-// 0x01081ef0: 0x1081ef0: jal   0x1097af8 sw    v0, 24(sp)
+// 0x01082514: 0x1082514: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5338,9 +5338,9 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01081ef8: 0x1081ef8: lw    v0, 24(sp)
+// 0x0108251c: 0x108251c: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5349,26 +5349,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081efc: 0x1081efc: addu  a0, s1, zero
+// 0x01082520: 0x1082520: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01081f00: 0x1081f00: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01082524: 0x1082524: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f08: 0x1081f08: addiu a1, zero, 20
+// 0x0108252c: 0x108252c: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01081f0c: 0x1081f0c: addu  a2, zero, zero
+// 0x01082530: 0x1082530: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081f10: 0x1081f10: jal   0x10942e8 addu  a0, s1, zero
+// 0x01082534: 0x1082534: jal   0x109490c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5376,17 +5376,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f18: 0x1081f18: lui   a0, 0x20000
+// 0x0108253c: 0x108253c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081f1c: 0x1081f1c: jal   0x101cd60 addiu a0, a0, -23104
+// 0x01082540: 0x1082540: jal   0x101cd70 addiu a0, a0, -22640
 	ldloc.1
-	ldc.i4 -23104
+	ldc.i4 -22640
 	add
 	stloc.1
 	ldloc.0
@@ -5394,26 +5394,26 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f24: 0x1081f24: lui   s4, 0x20000
+// 0x01082548: 0x1082548: lui   s4, 0x20000
 	ldc.i4 131072
 	stloc 12
-// 0x01081f28: 0x1081f28: addiu a3, zero, 9
+// 0x0108254c: 0x108254c: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x01081f2c: 0x1081f2c: addiu a2, zero, 14
+// 0x01082550: 0x1082550: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01081f30: 0x1081f30: addu  a1, v0, zero
+// 0x01082554: 0x1082554: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01081f34: 0x1081f34: jal   0x1098d10 addiu a0, s4, -23052
+// 0x01082558: 0x1082558: jal   0x1099358 addiu a0, s4, -22588
 	ldloc 12
-	ldc.i4 -23052
+	ldc.i4 -22588
 	add
 	stloc.1
 	ldloc.0
@@ -5421,20 +5421,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f3c: 0x1081f3c: addu  a0, v0, zero
+// 0x01082560: 0x1082560: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081f40: 0x1081f40: addiu a1, s3, -23208
+// 0x01082564: 0x1082564: addiu a1, s3, -22744
 	ldloc 11
-	ldc.i4 -23208
+	ldc.i4 -22744
 	add
 	stloc.2
-// 0x01081f44: 0x1081f44: jal   0x1097af8 sw    v0, 24(sp)
+// 0x01082568: 0x1082568: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5445,9 +5445,9 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01081f4c: 0x1081f4c: lw    v0, 24(sp)
+// 0x01082570: 0x1082570: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5456,26 +5456,26 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081f50: 0x1081f50: addu  a0, s1, zero
+// 0x01082574: 0x1082574: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01081f54: 0x1081f54: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01082578: 0x1082578: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f5c: 0x1081f5c: addiu a1, zero, 5
+// 0x01082580: 0x1082580: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01081f60: 0x1081f60: addiu a2, zero, 8
+// 0x01082584: 0x1082584: addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
-// 0x01081f64: 0x1081f64: jal   0x10942e8 addu  a0, s1, zero
+// 0x01082588: 0x1082588: jal   0x109490c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5483,17 +5483,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f6c: 0x1081f6c: lui   a0, 0x20000
+// 0x01082590: 0x1082590: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081f70: 0x1081f70: jal   0x101cd60 addiu a0, a0, -23032
+// 0x01082594: 0x1082594: jal   0x101cd70 addiu a0, a0, -22568
 	ldloc.1
-	ldc.i4 -23032
+	ldc.i4 -22568
 	add
 	stloc.1
 	ldloc.0
@@ -5501,23 +5501,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f78: 0x1081f78: addu  a1, v0, zero
+// 0x0108259c: 0x108259c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01081f7c: 0x1081f7c: addiu a3, zero, 1
+// 0x010825a0: 0x10825a0: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01081f80: 0x1081f80: addiu a2, zero, 14
+// 0x010825a4: 0x10825a4: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01081f84: 0x1081f84: jal   0x1098d10 addiu a0, s4, -23052
+// 0x010825a8: 0x10825a8: jal   0x1099358 addiu a0, s4, -22588
 	ldloc 12
-	ldc.i4 -23052
+	ldc.i4 -22588
 	add
 	stloc.1
 	ldloc.0
@@ -5525,20 +5525,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081f8c: 0x1081f8c: addu  a0, v0, zero
+// 0x010825b0: 0x10825b0: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01081f90: 0x1081f90: addiu a1, s3, -23208
+// 0x010825b4: 0x10825b4: addiu a1, s3, -22744
 	ldloc 11
-	ldc.i4 -23208
+	ldc.i4 -22744
 	add
 	stloc.2
-// 0x01081f94: 0x1081f94: jal   0x1097af8 sw    v0, 24(sp)
+// 0x010825b8: 0x10825b8: jal   0x1098140 sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5549,9 +5549,9 @@ __CIBYL_javamethod_begin:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call void Cibyl113::ssd_text_set_color_1097af8(int32,int32)
+	call void Cibyl113::ssd_text_set_color_1098140(int32,int32)
 // --- basic block ---
-// 0x01081f9c: 0x1081f9c: lw    v0, 24(sp)
+// 0x010825c0: 0x10825c0: lw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5560,39 +5560,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01081fa0: 0x1081fa0: addu  a0, s1, zero
+// 0x010825c4: 0x10825c4: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01081fa4: 0x1081fa4: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010825c8: 0x10825c8: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081fac: 0x1081fac: addu  a0, s2, zero
+// 0x010825d0: 0x10825d0: addu  a0, s2, zero
 	ldloc 9
 	stloc.1
-// 0x01081fb0: 0x1081fb0: jal   0x1098ec4 addu  a1, s1, zero
+// 0x010825d4: 0x10825d4: jal   0x109950c addu  a1, s1, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081fb8: 0x1081fb8: addiu a1, zero, 20
+// 0x010825dc: 0x10825dc: addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
-// 0x01081fbc: 0x1081fbc: addu  a2, zero, zero
+// 0x010825e0: 0x10825e0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01081fc0: 0x1081fc0: jal   0x10942e8 addu  a0, s1, zero
+// 0x010825e4: 0x10825e4: jal   0x109490c addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -5600,15 +5600,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081fc8: 0x1081fc8: lui   a0, 0x0
+// 0x010825ec: 0x10825ec: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01081fcc: 0x1081fcc: jal   0x101cd60 addiu a0, a0, 32524
+// 0x010825f0: 0x10825f0: jal   0x101cd70 addiu a0, a0, 32524
 	ldloc.1
 	ldc.i4 32524
 	add
@@ -5618,36 +5618,36 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081fd4: 0x1081fd4: lui   a2, 0x100000
+// 0x010825f8: 0x10825f8: lui   a2, 0x100000
 	ldc.i4 1048576
 	stloc.3
-// 0x01081fd8: 0x1081fd8: lui   a3, 0x1080000
+// 0x010825fc: 0x10825fc: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x01081fdc: 0x1081fdc: lui   a0, 0x20000
+// 0x01082600: 0x1082600: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01081fe0: 0x1081fe0: ori   a2, a2, 1
+// 0x01082604: 0x1082604: ori   a2, a2, 1
 	ldloc.3
 	ldc.i4.1
 	or
 	stloc.3
-// 0x01081fe4: 0x1081fe4: addiu a3, a3, 9280
+// 0x01082608: 0x1082608: addiu a3, a3, 10852
 	ldloc 4
-	ldc.i4 9280
+	ldc.i4 10852
 	add
 	stloc 4
-// 0x01081fe8: 0x1081fe8: addiu a0, a0, -22976
+// 0x0108260c: 0x108260c: addiu a0, a0, -22512
 	ldloc.1
-	ldc.i4 -22976
+	ldc.i4 -22512
 	add
 	stloc.1
-// 0x01081fec: 0x1081fec: jal   0x1091088 addu  a1, v0, zero
+// 0x01082610: 0x1082610: jal   0x10916ac addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -5655,127 +5655,127 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl108::ssd_button_label_1091088(int32,int32,int32,int32,int32)
+	call int32 Cibyl108::ssd_button_label_10916ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01081ff4: 0x1081ff4: addu  a1, v0, zero
+// 0x01082618: 0x1082618: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01081ff8: 0x1081ff8: jal   0x1098ec4 addu  a0, s2, zero
+// 0x0108261c: 0x108261c: jal   0x109950c addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082000: 0x1082000: addu  a0, s0, zero
+// 0x01082624: 0x1082624: addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-// 0x01082004: 0x1082004: jal   0x1098ec4 addu  a1, s2, zero
+// 0x01082628: 0x1082628: jal   0x109950c addu  a1, s2, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108200c: 0x108200c: jal   0x1099098 addu  a0, s2, zero
+// 0x01082630: 0x1082630: jal   0x10996e0 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01082014: 0x1082014: lui   v0, 0x80000
+// 0x01082638: 0x1082638: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01082018: 0x1082018: lw    v0, -11000(v0)
+// 0x0108263c: 0x108263c: lw    v0, -10536(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2750
+	ldc.i4 -2634
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108201c: 0x108201c: sll   zero, zero, 0
-// 0x01082020: 0x1082020: bne   v0, zero, 0x1082034 lui   v0, 0x80000
+// 0x01082640: 0x1082640: sll   zero, zero, 0
+// 0x01082644: 0x1082644: bne   v0, zero, 0x1082658 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1082034
+	brtrue L_1082658
 // --- basic block ---
-// 0x01082028: 0x1082028: jal   0x1099098 addu  a0, s5, zero
+// 0x0108264c: 0x108264c: jal   0x10996e0 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01082030: 0x1082030: lui   v0, 0x80000
+// 0x01082654: 0x1082654: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1082034:
-// 0x01082034: 0x1082034: lw    v0, -11000(v0)
+L_1082658:
+// 0x01082658: 0x1082658: lw    v0, -10536(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2750
+	ldc.i4 -2634
 	add
 	ldelem.i4
 	stloc 5
-// 0x01082038: 0x1082038: sll   zero, zero, 0
-// 0x0108203c: 0x108203c: bne   v0, zero, 0x1082090 lui   v0, 0x80000
+// 0x0108265c: 0x108265c: sll   zero, zero, 0
+// 0x01082660: 0x1082660: bne   v0, zero, 0x10826b4 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_1082090
+	brtrue L_10826b4
 // --- basic block ---
-// 0x01082044: 0x1082044: lw    v1, -13852(v0)
+// 0x01082668: 0x1082668: lw    v1, -13388(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082048: 0x1082048: addiu v0, zero, 1
+// 0x0108266c: 0x108266c: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x0108204c: 0x108204c: bne   v1, v0, 0x1082090 sll   zero, zero, 0
+// 0x01082670: 0x1082670: bne   v1, v0, 0x10826b4 sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	bne.un L_1082090
+	bne.un L_10826b4
 // --- basic block ---
-// 0x01082054: 0x1082054: jal   0x1056874 sll   zero, zero, 0
-	call int32 Cibyl64::navigate_main_state_1056874()
+// 0x01082678: 0x1082678: jal   0x1056884 sll   zero, zero, 0
+	call int32 Cibyl64::navigate_main_state_1056884()
 	stloc 5
 // --- basic block ---
-// 0x0108205c: 0x108205c: addiu v1, zero, -1
+// 0x01082680: 0x1082680: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 6
-// 0x01082060: 0x1082060: bne   v0, v1, 0x1082090 lui   a1, 0x20000
+// 0x01082684: 0x1082684: bne   v0, v1, 0x10826b4 lui   a1, 0x20000
 	ldloc 5
 	ldloc 6
 	ldc.i4 131072
 	stloc.2
-	bne.un L_1082090
+	bne.un L_10826b4
 // --- basic block ---
-// 0x01082068: 0x1082068: addiu a1, a1, -23448
+// 0x0108268c: 0x108268c: addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
-// 0x0108206c: 0x108206c: jal   0x109b304 addu  a0, s0, zero
+// 0x01082690: 0x1082690: jal   0x109b94c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5783,86 +5783,86 @@ L_1082034:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082074: 0x1082074: beq   v0, zero, 0x1082084 sll   zero, zero, 0
+// 0x01082698: 0x1082698: beq   v0, zero, 0x10826a8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1082084
+	brfalse L_10826a8
 // --- basic block ---
-// 0x0108207c: 0x108207c: jal   0x10990ac addu  a0, v0, zero
+// 0x010826a0: 0x10826a0: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1082084:
-// 0x01082084: 0x1082084: lui   a1, 0x20000
+L_10826a8:
+// 0x010826a8: 0x10826a8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01082088: 0x1082088: j	 0x10820e4 addiu a1, a1, -23432
+// 0x010826ac: 0x10826ac: j	 0x1082708 addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-	br L_10820e4
+	br L_1082708
 // --- basic block ---
-L_1082090:
-// 0x01082090: 0x1082090: jal   0x106c170 sll   zero, zero, 0
+L_10826b4:
+// 0x010826b4: 0x10826b4: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082098: 0x1082098: beq   v0, zero, 0x10820ec sll   zero, zero, 0
+// 0x010826bc: 0x10826bc: beq   v0, zero, 0x1082710 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10820ec
+	brfalse L_1082710
 // --- basic block ---
-// 0x010820a0: 0x10820a0: jal   0x1053f28 sll   zero, zero, 0
-	call int32 Cibyl62::roadmap_groups_get_num_following_1053f28()
+// 0x010826c4: 0x10826c4: jal   0x1053f38 sll   zero, zero, 0
+	call int32 Cibyl62::roadmap_groups_get_num_following_1053f38()
 	stloc 5
 // --- basic block ---
-// 0x010820a8: 0x10820a8: bne   v0, zero, 0x10820ec lui   v0, 0x80000
+// 0x010826cc: 0x10826cc: bne   v0, zero, 0x1082710 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brtrue L_10820ec
+	brtrue L_1082710
 // --- basic block ---
-// 0x010820b0: 0x10820b0: lw    v1, -13852(v0)
+// 0x010826d4: 0x10826d4: lw    v1, -13388(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldelem.i4
 	stloc 6
-// 0x010820b4: 0x10820b4: addiu v0, zero, 2
+// 0x010826d8: 0x10826d8: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x010820b8: 0x10820b8: bne   v1, v0, 0x10820ec lui   a1, 0x20000
+// 0x010826dc: 0x10826dc: bne   v1, v0, 0x1082710 lui   a1, 0x20000
 	ldloc 6
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	bne.un L_10820ec
+	bne.un L_1082710
 // --- basic block ---
-// 0x010820c0: 0x10820c0: addiu a1, a1, -23432
+// 0x010826e4: 0x10826e4: addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-// 0x010820c4: 0x10820c4: jal   0x109b304 addu  a0, s0, zero
+// 0x010826e8: 0x10826e8: jal   0x109b94c addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5870,58 +5870,58 @@ L_1082090:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010820cc: 0x10820cc: beq   v0, zero, 0x10820dc sll   zero, zero, 0
+// 0x010826f0: 0x10826f0: beq   v0, zero, 0x1082700 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10820dc
+	brfalse L_1082700
 // --- basic block ---
-// 0x010820d4: 0x10820d4: jal   0x10990ac addu  a0, v0, zero
+// 0x010826f8: 0x10826f8: jal   0x10996f4 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_show_10990ac(int32)
+	call int32 Cibyl114::ssd_widget_show_10996f4(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_10820dc:
-// 0x010820dc: 0x10820dc: lui   a1, 0x20000
+L_1082700:
+// 0x01082700: 0x1082700: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010820e0: 0x10820e0: addiu a1, a1, -23448
+// 0x01082704: 0x1082704: addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
-L_10820e4:
-// 0x010820e4: 0x10820e4: j	 0x1082124 addu  a0, s0, zero
+L_1082708:
+// 0x01082708: 0x1082708: j	 0x1082748 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
-	br L_1082124
+	br L_1082748
 // --- basic block ---
-L_10820ec:
-// 0x010820ec: 0x10820ec: jal   0x1093fa0 sll   zero, zero, 0
-	call int32 Cibyl110::ssd_dialog_get_currently_active_1093fa0()
+L_1082710:
+// 0x01082710: 0x1082710: jal   0x10945c4 sll   zero, zero, 0
+	call int32 Cibyl110::ssd_dialog_get_currently_active_10945c4()
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010820f4: 0x10820f4: lui   a1, 0x20000
+// 0x01082718: 0x1082718: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010820f8: 0x10820f8: addu  a0, v0, zero
+// 0x0108271c: 0x108271c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010820fc: 0x10820fc: addiu a1, a1, -23432
+// 0x01082720: 0x1082720: addiu a1, a1, -22968
 	ldloc.2
-	ldc.i4 -23432
+	ldc.i4 -22968
 	add
 	stloc.2
-// 0x01082100: 0x1082100: jal   0x109b304 addu  s1, v0, zero
+// 0x01082724: 0x1082724: jal   0x109b94c addu  s1, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -5929,61 +5929,61 @@ L_10820ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082108: 0x1082108: beq   v0, zero, 0x108211c lui   a1, 0x20000
+// 0x0108272c: 0x108272c: beq   v0, zero, 0x1082740 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_108211c
+	brfalse L_1082740
 // --- basic block ---
-// 0x01082110: 0x1082110: jal   0x1099098 addu  a0, v0, zero
+// 0x01082734: 0x1082734: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-// 0x01082118: 0x1082118: lui   a1, 0x20000
+// 0x0108273c: 0x108273c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-L_108211c:
-// 0x0108211c: 0x108211c: addu  a0, s1, zero
+L_1082740:
+// 0x01082740: 0x1082740: addu  a0, s1, zero
 	ldloc 8
 	stloc.1
-// 0x01082120: 0x1082120: addiu a1, a1, -23448
+// 0x01082744: 0x1082744: addiu a1, a1, -22984
 	ldloc.2
-	ldc.i4 -23448
+	ldc.i4 -22984
 	add
 	stloc.2
-L_1082124:
-// 0x01082124: 0x1082124: jal   0x109b304 sll   zero, zero, 0
+L_1082748:
+// 0x01082748: 0x1082748: jal   0x109b94c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_get_109b304(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_get_109b94c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108212c: 0x108212c: beq   v0, zero, 0x108213c sll   zero, zero, 0
+// 0x01082750: 0x1082750: beq   v0, zero, 0x1082760 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108213c
+	brfalse L_1082760
 // --- basic block ---
-// 0x01082134: 0x1082134: jal   0x1099098 addu  a0, v0, zero
+// 0x01082758: 0x1082758: jal   0x10996e0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_hide_1099098(int32)
+	call int32 Cibyl114::ssd_widget_hide_10996e0(int32)
 	stloc 5
 // --- basic block ---
-L_108213c:
-// 0x0108213c: 0x108213c: jal   0x1080db4 addu  a0, s0, zero
+L_1082760:
+// 0x01082760: 0x1082760: jal   0x10813d8 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -5991,15 +5991,15 @@ L_108213c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::set_softkeys_1080db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::set_softkeys_10813d8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082144: 0x1082144: addu  a0, s7, zero
+// 0x01082768: 0x1082768: addu  a0, s7, zero
 	ldloc 15
 	stloc.1
-// 0x01082148: 0x1082148: jal   0x1095eec addu  a1, zero, zero
+// 0x0108276c: 0x108276c: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -6007,13 +6007,13 @@ L_108213c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082150: 0x1082150: lw    ra, 68(sp)
-// 0x01082154: 0x1082154: lw    s7, 64(sp)
+// 0x01082774: 0x1082774: lw    ra, 68(sp)
+// 0x01082778: 0x1082778: lw    s7, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6022,7 +6022,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01082158: 0x1082158: lw    s6, 60(sp)
+// 0x0108277c: 0x108277c: lw    s6, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6031,7 +6031,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 14
-// 0x0108215c: 0x108215c: lw    s5, 56(sp)
+// 0x01082780: 0x1082780: lw    s5, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6040,7 +6040,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01082160: 0x1082160: lw    s4, 52(sp)
+// 0x01082784: 0x1082784: lw    s4, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6049,7 +6049,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01082164: 0x1082164: lw    s3, 48(sp)
+// 0x01082788: 0x1082788: lw    s3, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6058,7 +6058,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01082168: 0x1082168: lw    s2, 44(sp)
+// 0x0108278c: 0x108278c: lw    s2, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6067,7 +6067,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x0108216c: 0x108216c: lw    s1, 40(sp)
+// 0x01082790: 0x1082790: lw    s1, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6076,7 +6076,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082170: 0x1082170: lw    s0, 36(sp)
+// 0x01082794: 0x1082794: lw    s0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6085,7 +6085,7 @@ L_108213c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01082174: 0x1082174: jr    ra addiu sp, sp, 72
+// 0x01082798: 0x1082798: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -6097,7 +6097,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_list_other_108217c(int32,int32,int32,int32,int32)
+.method public static int32 report_list_other_10827a0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -6132,28 +6132,28 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108217c:
-// 0x0108217c: 0x108217c: addiu sp, sp, -48
+L_10827a0:
+// 0x010827a0: 0x10827a0: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x01082180: 0x1082180: sw    ra, 44(sp)
-// 0x01082184: 0x1082184: jal   0x1080cec sll   zero, zero, 0
+// 0x010827a4: 0x10827a4: sw    ra, 44(sp)
+// 0x010827a8: 0x10827a8: jal   0x1081310 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::report_list_1080cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::report_list_1081310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108218c: 0x108218c: addiu v0, zero, 7
+// 0x010827b0: 0x10827b0: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x01082190: 0x1082190: sw    v0, 16(sp)
+// 0x010827b4: 0x10827b4: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6162,16 +6162,16 @@ L_108217c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01082194: 0x1082194: addiu v0, zero, 8
+// 0x010827b8: 0x10827b8: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01082198: 0x1082198: addiu a1, zero, 5
+// 0x010827bc: 0x10827bc: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x0108219c: 0x108219c: addiu a3, zero, 6
+// 0x010827c0: 0x10827c0: addiu a3, zero, 6
 	ldc.i4.6
 	stloc 4
-// 0x010821a0: 0x10821a0: sw    v0, 20(sp)
+// 0x010827c4: 0x10827c4: sw    v0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6180,16 +6180,16 @@ L_108217c:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010821a4: 0x10821a4: addiu a2, zero, 5
+// 0x010827c8: 0x10827c8: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x010821a8: 0x10821a8: addiu v0, zero, 9
+// 0x010827cc: 0x10827cc: addiu v0, zero, 9
 	ldc.i4.s 9
 	stloc 5
-// 0x010821ac: 0x10821ac: addiu a0, zero, 5
+// 0x010827d0: 0x10827d0: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010821b0: 0x10821b0: jal   0x1081464 sw    v0, 24(sp)
+// 0x010827d4: 0x10827d4: jal   0x1081a88 sw    v0, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6203,38 +6203,38 @@ L_108217c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010821b8: 0x10821b8: lui   v0, 0x80000
+// 0x010827dc: 0x10827dc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010821bc: 0x10821bc: lw    a2, -13804(v0)
+// 0x010827e0: 0x10827e0: lw    a2, -13340(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3451
+	ldc.i4 -3335
 	add
 	ldelem.i4
 	stloc.3
-// 0x010821c0: 0x10821c0: lui   a0, 0x10000
+// 0x010827e4: 0x10827e4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010821c4: 0x10821c4: addiu v1, zero, 5
+// 0x010827e8: 0x10827e8: addiu v1, zero, 5
 	ldc.i4.5
 	stloc 7
-// 0x010821c8: 0x10821c8: addiu a0, a0, -19488
+// 0x010827ec: 0x10827ec: addiu a0, a0, -19488
 	ldloc.1
 	ldc.i4 -19488
 	add
 	stloc.1
-// 0x010821cc: 0x10821cc: lui   v0, 0x80000
+// 0x010827f0: 0x10827f0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010821d0: 0x10821d0: sw    a2, 32(sp)
+// 0x010827f4: 0x10827f4: sw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6243,12 +6243,12 @@ L_108217c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010821d4: 0x10821d4: jal   0x101cd60 sw    v1, -13840(v0)
+// 0x010827f8: 0x10827f8: jal   0x101cd70 sw    v1, -13376(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldloc 7
 	stelem.i4
@@ -6257,12 +6257,12 @@ L_108217c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010821dc: 0x10821dc: lw    a2, 32(sp)
+// 0x01082800: 0x1082800: lw    a2, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6271,15 +6271,15 @@ L_108217c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010821e0: 0x10821e0: lui   a0, 0x20000
+// 0x01082804: 0x1082804: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010821e4: 0x10821e4: addiu a0, a0, -22972
+// 0x01082808: 0x1082808: addiu a0, a0, -22508
 	ldloc.1
-	ldc.i4 -22972
+	ldc.i4 -22508
 	add
 	stloc.1
-// 0x010821e8: 0x10821e8: jal   0x1081cc0 addu  a1, v0, zero
+// 0x0108280c: 0x108280c: jal   0x10822e4 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6287,14 +6287,14 @@ L_108217c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::show_list_1081cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::show_list_10822e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010821f0: 0x10821f0: lw    ra, 44(sp)
-// 0x010821f4: 0x10821f4: sll   zero, zero, 0
-// 0x010821f8: 0x10821f8: jr    ra addiu sp, sp, 48
+// 0x01082814: 0x1082814: lw    ra, 44(sp)
+// 0x01082818: 0x1082818: sll   zero, zero, 0
+// 0x0108281c: 0x108281c: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6306,7 +6306,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_list_chit_chats_1082200(int32,int32,int32,int32,int32)
+.method public static int32 report_list_chit_chats_1082824(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -6341,31 +6341,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1082200:
-// 0x01082200: 0x1082200: addiu sp, sp, -32
+L_1082824:
+// 0x01082824: 0x1082824: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01082204: 0x1082204: sw    ra, 28(sp)
-// 0x01082208: 0x1082208: jal   0x1080cec sll   zero, zero, 0
+// 0x01082828: 0x1082828: sw    ra, 28(sp)
+// 0x0108282c: 0x108282c: jal   0x1081310 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::report_list_1080cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::report_list_1081310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082210: 0x1082210: addiu a1, zero, 1
+// 0x01082834: 0x1082834: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01082214: 0x1082214: addu  a2, zero, zero
+// 0x01082838: 0x1082838: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01082218: 0x1082218: jal   0x1081464 addiu a0, zero, 4
+// 0x0108283c: 0x108283c: jal   0x1081a88 addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
 	ldloc.0
@@ -6373,38 +6373,38 @@ L_1082200:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082220: 0x1082220: lui   v0, 0x80000
+// 0x01082844: 0x1082844: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01082224: 0x1082224: lw    a2, -13808(v0)
+// 0x01082848: 0x1082848: lw    a2, -13344(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3452
+	ldc.i4 -3336
 	add
 	ldelem.i4
 	stloc.3
-// 0x01082228: 0x1082228: lui   a0, 0x20000
+// 0x0108284c: 0x108284c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108222c: 0x108222c: addiu v1, zero, 4
+// 0x01082850: 0x1082850: addiu v1, zero, 4
 	ldc.i4.4
 	stloc 6
-// 0x01082230: 0x1082230: addiu a0, a0, -23348
+// 0x01082854: 0x1082854: addiu a0, a0, -22884
 	ldloc.1
-	ldc.i4 -23348
+	ldc.i4 -22884
 	add
 	stloc.1
-// 0x01082234: 0x1082234: lui   v0, 0x80000
+// 0x01082858: 0x1082858: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01082238: 0x1082238: sw    a2, 16(sp)
+// 0x0108285c: 0x108285c: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6413,12 +6413,12 @@ L_1082200:
 	add
 	ldloc.3
 	stelem.i4
-// 0x0108223c: 0x108223c: jal   0x101cd60 sw    v1, -13840(v0)
+// 0x01082860: 0x1082860: jal   0x101cd70 sw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldloc 6
 	stelem.i4
@@ -6427,12 +6427,12 @@ L_1082200:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082244: 0x1082244: lw    a2, 16(sp)
+// 0x01082868: 0x1082868: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6441,15 +6441,15 @@ L_1082200:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01082248: 0x1082248: lui   a0, 0x20000
+// 0x0108286c: 0x108286c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108224c: 0x108224c: addiu a0, a0, -22952
+// 0x01082870: 0x1082870: addiu a0, a0, -22488
 	ldloc.1
-	ldc.i4 -22952
+	ldc.i4 -22488
 	add
 	stloc.1
-// 0x01082250: 0x1082250: jal   0x1081cc0 addu  a1, v0, zero
+// 0x01082874: 0x1082874: jal   0x10822e4 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -6457,14 +6457,14 @@ L_1082200:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::show_list_1081cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::show_list_10822e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082258: 0x1082258: lw    ra, 28(sp)
-// 0x0108225c: 0x108225c: sll   zero, zero, 0
-// 0x01082260: 0x1082260: jr    ra addiu sp, sp, 32
+// 0x0108287c: 0x108287c: lw    ra, 28(sp)
+// 0x01082880: 0x1082880: sll   zero, zero, 0
+// 0x01082884: 0x1082884: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl98.j b/converted/Cibyl98.j
index 6f3a964..fae3721 100644
--- a/converted/Cibyl98.j
+++ b/converted/Cibyl98.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl98::.ctor
 
-.method public static int32 report_list_accidents_1082268(int32,int32,int32,int32,int32)
+.method public static int32 report_list_accidents_108288c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -76,31 +76,31 @@
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1082268:
-// 0x01082268: 0x1082268: addiu sp, sp, -32
+L_108288c:
+// 0x0108288c: 0x108288c: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x0108226c: 0x108226c: sw    ra, 28(sp)
-// 0x01082270: 0x1082270: jal   0x1080cec sll   zero, zero, 0
+// 0x01082890: 0x1082890: sw    ra, 28(sp)
+// 0x01082894: 0x1082894: jal   0x1081310 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::report_list_1080cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::report_list_1081310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082278: 0x1082278: addiu a1, zero, 1
+// 0x0108289c: 0x108289c: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x0108227c: 0x108227c: addiu a2, zero, 2
+// 0x010828a0: 0x10828a0: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-// 0x01082280: 0x1082280: jal   0x1081464 addiu a0, zero, 3
+// 0x010828a4: 0x10828a4: jal   0x1081a88 addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
 	ldloc.0
@@ -108,38 +108,38 @@ L_1082268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082288: 0x1082288: lui   v0, 0x80000
+// 0x010828ac: 0x10828ac: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108228c: 0x108228c: lw    a2, -13812(v0)
+// 0x010828b0: 0x10828b0: lw    a2, -13348(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3453
+	ldc.i4 -3337
 	add
 	ldelem.i4
 	stloc.3
-// 0x01082290: 0x1082290: lui   a0, 0x20000
+// 0x010828b4: 0x10828b4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01082294: 0x1082294: addiu v1, zero, 3
+// 0x010828b8: 0x10828b8: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 6
-// 0x01082298: 0x1082298: addiu a0, a0, -23360
+// 0x010828bc: 0x10828bc: addiu a0, a0, -22896
 	ldloc.1
-	ldc.i4 -23360
+	ldc.i4 -22896
 	add
 	stloc.1
-// 0x0108229c: 0x108229c: lui   v0, 0x80000
+// 0x010828c0: 0x10828c0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010822a0: 0x10822a0: sw    a2, 16(sp)
+// 0x010828c4: 0x10828c4: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -148,12 +148,12 @@ L_1082268:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010822a4: 0x10822a4: jal   0x101cd60 sw    v1, -13840(v0)
+// 0x010828c8: 0x10828c8: jal   0x101cd70 sw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldloc 6
 	stelem.i4
@@ -162,12 +162,12 @@ L_1082268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010822ac: 0x10822ac: lw    a2, 16(sp)
+// 0x010828d0: 0x10828d0: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -176,15 +176,15 @@ L_1082268:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010822b0: 0x10822b0: lui   a0, 0x20000
+// 0x010828d4: 0x10828d4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010822b4: 0x10822b4: addiu a0, a0, -22928
+// 0x010828d8: 0x10828d8: addiu a0, a0, -22464
 	ldloc.1
-	ldc.i4 -22928
+	ldc.i4 -22464
 	add
 	stloc.1
-// 0x010822b8: 0x10822b8: jal   0x1081cc0 addu  a1, v0, zero
+// 0x010828dc: 0x10828dc: jal   0x10822e4 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -192,14 +192,14 @@ L_1082268:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::show_list_1081cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::show_list_10822e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010822c0: 0x10822c0: lw    ra, 28(sp)
-// 0x010822c4: 0x10822c4: sll   zero, zero, 0
-// 0x010822c8: 0x10822c8: jr    ra addiu sp, sp, 32
+// 0x010828e4: 0x10828e4: lw    ra, 28(sp)
+// 0x010828e8: 0x10828e8: sll   zero, zero, 0
+// 0x010828ec: 0x10828ec: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -211,7 +211,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_list_loads_10822d0(int32,int32,int32,int32,int32)
+.method public static int32 report_list_loads_10828f4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -246,34 +246,34 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10822d0:
-// 0x010822d0: 0x10822d0: addiu sp, sp, -32
+L_10828f4:
+// 0x010828f4: 0x10828f4: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010822d4: 0x10822d4: sw    ra, 28(sp)
-// 0x010822d8: 0x10822d8: jal   0x1080cec sll   zero, zero, 0
+// 0x010828f8: 0x10828f8: sw    ra, 28(sp)
+// 0x010828fc: 0x10828fc: jal   0x1081310 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::report_list_1080cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::report_list_1081310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010822e0: 0x10822e0: addiu a1, zero, 2
+// 0x01082904: 0x1082904: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x010822e4: 0x10822e4: addiu a3, zero, 3
+// 0x01082908: 0x1082908: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x010822e8: 0x10822e8: addiu a2, zero, 4
+// 0x0108290c: 0x108290c: addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
-// 0x010822ec: 0x10822ec: jal   0x1081464 addiu a0, zero, 2
+// 0x01082910: 0x1082910: jal   0x1081a88 addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
 	ldloc.0
@@ -281,38 +281,38 @@ L_10822d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010822f4: 0x10822f4: lui   v0, 0x80000
+// 0x01082918: 0x1082918: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010822f8: 0x10822f8: lw    a2, -13816(v0)
+// 0x0108291c: 0x108291c: lw    a2, -13352(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3454
+	ldc.i4 -3338
 	add
 	ldelem.i4
 	stloc.3
-// 0x010822fc: 0x10822fc: lui   a0, 0x20000
+// 0x01082920: 0x1082920: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01082300: 0x1082300: addiu v1, zero, 2
+// 0x01082924: 0x1082924: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01082304: 0x1082304: addiu a0, a0, 9684
+// 0x01082928: 0x1082928: addiu a0, a0, 10144
 	ldloc.1
-	ldc.i4 9684
+	ldc.i4 10144
 	add
 	stloc.1
-// 0x01082308: 0x1082308: lui   v0, 0x80000
+// 0x0108292c: 0x108292c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108230c: 0x108230c: sw    a2, 16(sp)
+// 0x01082930: 0x1082930: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -321,12 +321,12 @@ L_10822d0:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01082310: 0x1082310: jal   0x101cd60 sw    v1, -13840(v0)
+// 0x01082934: 0x1082934: jal   0x101cd70 sw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldloc 6
 	stelem.i4
@@ -335,12 +335,12 @@ L_10822d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082318: 0x1082318: lw    a2, 16(sp)
+// 0x0108293c: 0x108293c: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -349,15 +349,15 @@ L_10822d0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108231c: 0x108231c: lui   a0, 0x20000
+// 0x01082940: 0x1082940: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01082320: 0x1082320: addiu a0, a0, -22904
+// 0x01082944: 0x1082944: addiu a0, a0, -22440
 	ldloc.1
-	ldc.i4 -22904
+	ldc.i4 -22440
 	add
 	stloc.1
-// 0x01082324: 0x1082324: jal   0x1081cc0 addu  a1, v0, zero
+// 0x01082948: 0x1082948: jal   0x10822e4 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -365,14 +365,14 @@ L_10822d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::show_list_1081cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::show_list_10822e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108232c: 0x108232c: lw    ra, 28(sp)
-// 0x01082330: 0x1082330: sll   zero, zero, 0
-// 0x01082334: 0x1082334: jr    ra addiu sp, sp, 32
+// 0x01082950: 0x1082950: lw    ra, 28(sp)
+// 0x01082954: 0x1082954: sll   zero, zero, 0
+// 0x01082958: 0x1082958: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -384,7 +384,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_list_police_108233c(int32,int32,int32,int32,int32)
+.method public static int32 report_list_police_1082960(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -419,31 +419,31 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_108233c:
-// 0x0108233c: 0x108233c: addiu sp, sp, -32
+L_1082960:
+// 0x01082960: 0x1082960: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01082340: 0x1082340: sw    ra, 28(sp)
-// 0x01082344: 0x1082344: jal   0x1080cec sll   zero, zero, 0
+// 0x01082964: 0x1082964: sw    ra, 28(sp)
+// 0x01082968: 0x1082968: jal   0x1081310 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::report_list_1080cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::report_list_1081310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108234c: 0x108234c: addiu a1, zero, 1
+// 0x01082970: 0x1082970: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01082350: 0x1082350: addiu a2, zero, 1
+// 0x01082974: 0x1082974: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x01082354: 0x1082354: jal   0x1081464 addiu a0, zero, 1
+// 0x01082978: 0x1082978: jal   0x1081a88 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
 	ldloc.0
@@ -451,38 +451,38 @@ L_108233c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::populate_tab_1081464(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::populate_tab_1081a88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108235c: 0x108235c: lui   v0, 0x80000
+// 0x01082980: 0x1082980: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01082360: 0x1082360: lw    a2, -13820(v0)
+// 0x01082984: 0x1082984: lw    a2, -13356(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3455
+	ldc.i4 -3339
 	add
 	ldelem.i4
 	stloc.3
-// 0x01082364: 0x1082364: lui   a0, 0x20000
+// 0x01082988: 0x1082988: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01082368: 0x1082368: addiu v1, zero, 1
+// 0x0108298c: 0x108298c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x0108236c: 0x108236c: addiu a0, a0, -23392
+// 0x01082990: 0x1082990: addiu a0, a0, -22928
 	ldloc.1
-	ldc.i4 -23392
+	ldc.i4 -22928
 	add
 	stloc.1
-// 0x01082370: 0x1082370: lui   v0, 0x80000
+// 0x01082994: 0x1082994: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01082374: 0x1082374: sw    a2, 16(sp)
+// 0x01082998: 0x1082998: sw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -491,12 +491,12 @@ L_108233c:
 	add
 	ldloc.3
 	stelem.i4
-// 0x01082378: 0x1082378: jal   0x101cd60 sw    v1, -13840(v0)
+// 0x0108299c: 0x108299c: jal   0x101cd70 sw    v1, -13376(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldloc 6
 	stelem.i4
@@ -505,12 +505,12 @@ L_108233c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082380: 0x1082380: lw    a2, 16(sp)
+// 0x010829a4: 0x10829a4: lw    a2, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -519,15 +519,15 @@ L_108233c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01082384: 0x1082384: lui   a0, 0x20000
+// 0x010829a8: 0x10829a8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01082388: 0x1082388: addiu a0, a0, -22884
+// 0x010829ac: 0x10829ac: addiu a0, a0, -22420
 	ldloc.1
-	ldc.i4 -22884
+	ldc.i4 -22420
 	add
 	stloc.1
-// 0x0108238c: 0x108238c: jal   0x1081cc0 addu  a1, v0, zero
+// 0x010829b0: 0x10829b0: jal   0x10822e4 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -535,14 +535,14 @@ L_108233c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::show_list_1081cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::show_list_10822e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082394: 0x1082394: lw    ra, 28(sp)
-// 0x01082398: 0x1082398: sll   zero, zero, 0
-// 0x0108239c: 0x108239c: jr    ra addiu sp, sp, 32
+// 0x010829b8: 0x10829b8: lw    ra, 28(sp)
+// 0x010829bc: 0x10829bc: sll   zero, zero, 0
+// 0x010829c0: 0x10829c0: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -554,7 +554,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 report_list_all_10823a4(int32,int32,int32,int32,int32)
+.method public static int32 report_list_all_10829c8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -589,59 +589,59 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10823a4:
-// 0x010823a4: 0x10823a4: addiu sp, sp, -32
+L_10829c8:
+// 0x010829c8: 0x10829c8: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010823a8: 0x10823a8: sw    ra, 28(sp)
-// 0x010823ac: 0x10823ac: jal   0x1080cec sll   zero, zero, 0
+// 0x010829cc: 0x10829cc: sw    ra, 28(sp)
+// 0x010829d0: 0x10829d0: jal   0x1081310 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::report_list_1080cec(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::report_list_1081310(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010823b4: 0x10823b4: jal   0x10808dc sll   zero, zero, 0
+// 0x010829d8: 0x10829d8: jal   0x1080f00 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::populate_first_tab_10808dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::populate_first_tab_1080f00(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010823bc: 0x10823bc: lui   v0, 0x80000
+// 0x010829e0: 0x10829e0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010823c0: 0x10823c0: lw    a2, -13824(v0)
+// 0x010829e4: 0x10829e4: lw    a2, -13360(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3456
+	ldc.i4 -3340
 	add
 	ldelem.i4
 	stloc.3
-// 0x010823c4: 0x10823c4: lui   a0, 0x10000
+// 0x010829e8: 0x10829e8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010823c8: 0x10823c8: addiu a0, a0, 220
+// 0x010829ec: 0x10829ec: addiu a0, a0, 216
 	ldloc.1
-	ldc.i4 220
+	ldc.i4 216
 	add
 	stloc.1
-// 0x010823cc: 0x10823cc: lui   v0, 0x80000
+// 0x010829f0: 0x10829f0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010823d0: 0x10823d0: sw    a2, 16(sp)
+// 0x010829f4: 0x10829f4: sw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -650,12 +650,12 @@ L_10823a4:
 	add
 	ldloc.3
 	stelem.i4
-// 0x010823d4: 0x10823d4: jal   0x101cd60 sw    zero, -13840(v0)
+// 0x010829f8: 0x10829f8: jal   0x101cd70 sw    zero, -13376(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3460
+	ldc.i4 -3344
 	add
 	ldc.i4.s 0
 	stelem.i4
@@ -664,12 +664,12 @@ L_10823a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010823dc: 0x10823dc: lw    a2, 16(sp)
+// 0x01082a00: 0x1082a00: lw    a2, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -678,15 +678,15 @@ L_10823a4:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010823e0: 0x10823e0: lui   a0, 0x20000
+// 0x01082a04: 0x1082a04: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010823e4: 0x10823e4: addiu a0, a0, -22864
+// 0x01082a08: 0x1082a08: addiu a0, a0, -22400
 	ldloc.1
-	ldc.i4 -22864
+	ldc.i4 -22400
 	add
 	stloc.1
-// 0x010823e8: 0x10823e8: jal   0x1081cc0 addu  a1, v0, zero
+// 0x01082a0c: 0x1082a0c: jal   0x10822e4 addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.0
@@ -694,14 +694,14 @@ L_10823a4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::show_list_1081cc0(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::show_list_10822e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010823f0: 0x10823f0: lw    ra, 28(sp)
-// 0x010823f4: 0x10823f4: sll   zero, zero, 0
-// 0x010823f8: 0x10823f8: jr    ra addiu sp, sp, 32
+// 0x01082a14: 0x1082a14: lw    ra, 28(sp)
+// 0x01082a18: 0x1082a18: sll   zero, zero, 0
+// 0x01082a1c: 0x1082a1c: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -713,7 +713,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeAlertsListGroup_1082400(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAlertsListGroup_1082a24(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -748,24 +748,24 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082400: 0x1082400: addiu sp, sp, -24
+// 0x01082a24: 0x1082a24: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01082404: 0x1082404: addiu v1, zero, 2
+// 0x01082a28: 0x1082a28: addiu v1, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01082408: 0x1082408: lui   v0, 0x80000
+// 0x01082a2c: 0x1082a2c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x0108240c: 0x108240c: sw    ra, 20(sp)
-// 0x01082410: 0x1082410: jal   0x1080e10 sw    v1, -13852(v0)
+// 0x01082a30: 0x1082a30: sw    ra, 20(sp)
+// 0x01082a34: 0x1082a34: jal   0x1081434 sw    v1, -13388(v0)
 	ldloc 8
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -3463
+	ldc.i4 -3347
 	add
 	ldloc 6
 	stelem.i4
@@ -774,41 +774,41 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl96::ShowListMenu_1080e10(int32,int32,int32,int32,int32)
+	call int32 Cibyl96::ShowListMenu_1081434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082418: 0x1082418: jal   0x106c170 sll   zero, zero, 0
+// 0x01082a3c: 0x1082a3c: jal   0x106c794 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::RealTimeLoginState_106c170(int32,int32,int32,int32,int32)
+	call int32 Cibyl80::RealTimeLoginState_106c794(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082420: 0x1082420: beq   v0, zero, 0x1082430 sll   zero, zero, 0
+// 0x01082a44: 0x1082a44: beq   v0, zero, 0x1082a54 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1082430
+	brfalse L_1082a54
 // --- basic block ---
-// 0x01082428: 0x1082428: jal   0x10823a4 sll   zero, zero, 0
+// 0x01082a4c: 0x1082a4c: jal   0x10829c8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::report_list_all_10823a4(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::report_list_all_10829c8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1082430:
-// 0x01082430: 0x1082430: lw    ra, 20(sp)
-// 0x01082434: 0x1082434: sll   zero, zero, 0
-// 0x01082438: 0x1082438: jr    ra addiu sp, sp, 24
+L_1082a54:
+// 0x01082a54: 0x1082a54: lw    ra, 20(sp)
+// 0x01082a58: 0x1082a58: sll   zero, zero, 0
+// 0x01082a5c: 0x1082a5c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -820,7 +820,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 on_button_show_no_groups_1082440(int32,int32,int32,int32,int32)
+.method public static int32 on_button_show_no_groups_1082a64(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32 v1,int32[] mem)
@@ -855,13 +855,13 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082440: 0x1082440: addiu sp, sp, -24
+// 0x01082a64: 0x1082a64: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01082444: 0x1082444: sw    ra, 20(sp)
-// 0x01082448: 0x1082448: jal   0x1094a94 addu  a0, zero, zero
+// 0x01082a68: 0x1082a68: sw    ra, 20(sp)
+// 0x01082a6c: 0x1082a6c: jal   0x10950dc addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -869,27 +869,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_hide_all_1094a94(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_hide_all_10950dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01082450: 0x1082450: jal   0x102e4cc sll   zero, zero, 0
+// 0x01082a74: 0x1082a74: jal   0x102e4dc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl33::start_more_menu_102e4cc(int32,int32,int32,int32,int32)
+	call int32 Cibyl33::start_more_menu_102e4dc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01082458: 0x1082458: lw    ra, 20(sp)
-// 0x0108245c: 0x108245c: addiu v0, zero, 1
+// 0x01082a7c: 0x1082a7c: lw    ra, 20(sp)
+// 0x01082a80: 0x1082a80: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01082460: 0x1082460: jr    ra addiu sp, sp, 24
+// 0x01082a84: 0x1082a84: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -901,7 +901,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 set_counts_10825d8(int32,int32,int32,int32,int32)
+.method public static int32 set_counts_1082bfc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32 s0,int32[] mem,int32 ra)
@@ -939,22 +939,22 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010825d8: 0x10825d8: addiu sp, sp, -40
+// 0x01082bfc: 0x1082bfc: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010825dc: 0x10825dc: addu  a0, zero, zero
+// 0x01082c00: 0x1082c00: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x010825e0: 0x10825e0: addiu a1, zero, 1
+// 0x01082c04: 0x1082c04: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x010825e4: 0x10825e4: addu  a2, zero, zero
+// 0x01082c08: 0x1082c08: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010825e8: 0x10825e8: sw    ra, 36(sp)
-// 0x010825ec: 0x10825ec: jal   0x1081c08 sw    s0, 32(sp)
+// 0x01082c0c: 0x1082c0c: sw    ra, 36(sp)
+// 0x01082c10: 0x1082c10: jal   0x108222c sw    s0, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -968,28 +968,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::count_tab_1081c08(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::count_tab_108222c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010825f4: 0x10825f4: lui   s0, 0x10000
+// 0x01082c18: 0x1082c18: lui   s0, 0x10000
 	ldc.i4 65536
 	stloc 7
-// 0x010825f8: 0x10825f8: lui   a1, 0x20000
+// 0x01082c1c: 0x1082c1c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010825fc: 0x10825fc: addu  a2, v0, zero
+// 0x01082c20: 0x1082c20: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01082600: 0x1082600: addiu a0, s0, -19268
+// 0x01082c24: 0x1082c24: addiu a0, s0, -19268
 	ldloc 7
 	ldc.i4 -19268
 	add
 	stloc.1
-// 0x01082604: 0x1082604: jal   0x1096f78 addiu a1, a1, -22864
+// 0x01082c28: 0x1082c28: jal   0x10975c0 addiu a1, a1, -22400
 	ldloc.2
-	ldc.i4 -22864
+	ldc.i4 -22400
 	add
 	stloc.2
 	ldloc.0
@@ -997,18 +997,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_set_right_text_1096f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_set_right_text_10975c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108260c: 0x108260c: addiu a0, zero, 1
+// 0x01082c30: 0x1082c30: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01082610: 0x1082610: addiu a1, zero, 1
+// 0x01082c34: 0x1082c34: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01082614: 0x1082614: jal   0x1081c08 addiu a2, zero, 1
+// 0x01082c38: 0x1082c38: jal   0x108222c addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -1016,25 +1016,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::count_tab_1081c08(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::count_tab_108222c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108261c: 0x108261c: lui   a1, 0x20000
+// 0x01082c40: 0x1082c40: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01082620: 0x1082620: addu  a2, v0, zero
+// 0x01082c44: 0x1082c44: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01082624: 0x1082624: addiu a0, s0, -19268
+// 0x01082c48: 0x1082c48: addiu a0, s0, -19268
 	ldloc 7
 	ldc.i4 -19268
 	add
 	stloc.1
-// 0x01082628: 0x1082628: jal   0x1096f78 addiu a1, a1, -22884
+// 0x01082c4c: 0x1082c4c: jal   0x10975c0 addiu a1, a1, -22420
 	ldloc.2
-	ldc.i4 -22884
+	ldc.i4 -22420
 	add
 	stloc.2
 	ldloc.0
@@ -1042,21 +1042,21 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_set_right_text_1096f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_set_right_text_10975c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082630: 0x1082630: addiu a3, zero, 3
+// 0x01082c54: 0x1082c54: addiu a3, zero, 3
 	ldc.i4.3
 	stloc 4
-// 0x01082634: 0x1082634: addiu a0, zero, 2
+// 0x01082c58: 0x1082c58: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01082638: 0x1082638: addiu a1, zero, 2
+// 0x01082c5c: 0x1082c5c: addiu a1, zero, 2
 	ldc.i4.2
 	stloc.2
-// 0x0108263c: 0x108263c: jal   0x1081c08 addiu a2, zero, 4
+// 0x01082c60: 0x1082c60: jal   0x108222c addiu a2, zero, 4
 	ldc.i4.4
 	stloc.3
 	ldloc.0
@@ -1064,25 +1064,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::count_tab_1081c08(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::count_tab_108222c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082644: 0x1082644: lui   a1, 0x20000
+// 0x01082c68: 0x1082c68: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01082648: 0x1082648: addu  a2, v0, zero
+// 0x01082c6c: 0x1082c6c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x0108264c: 0x108264c: addiu a0, s0, -19268
+// 0x01082c70: 0x1082c70: addiu a0, s0, -19268
 	ldloc 7
 	ldc.i4 -19268
 	add
 	stloc.1
-// 0x01082650: 0x1082650: jal   0x1096f78 addiu a1, a1, -22904
+// 0x01082c74: 0x1082c74: jal   0x10975c0 addiu a1, a1, -22440
 	ldloc.2
-	ldc.i4 -22904
+	ldc.i4 -22440
 	add
 	stloc.2
 	ldloc.0
@@ -1090,18 +1090,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_set_right_text_1096f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_set_right_text_10975c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082658: 0x1082658: addiu a0, zero, 3
+// 0x01082c7c: 0x1082c7c: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x0108265c: 0x108265c: addiu a1, zero, 1
+// 0x01082c80: 0x1082c80: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01082660: 0x1082660: jal   0x1081c08 addiu a2, zero, 2
+// 0x01082c84: 0x1082c84: jal   0x108222c addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -1109,25 +1109,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::count_tab_1081c08(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::count_tab_108222c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082668: 0x1082668: lui   a1, 0x20000
+// 0x01082c8c: 0x1082c8c: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x0108266c: 0x108266c: addu  a2, v0, zero
+// 0x01082c90: 0x1082c90: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01082670: 0x1082670: addiu a0, s0, -19268
+// 0x01082c94: 0x1082c94: addiu a0, s0, -19268
 	ldloc 7
 	ldc.i4 -19268
 	add
 	stloc.1
-// 0x01082674: 0x1082674: jal   0x1096f78 addiu a1, a1, -22928
+// 0x01082c98: 0x1082c98: jal   0x10975c0 addiu a1, a1, -22464
 	ldloc.2
-	ldc.i4 -22928
+	ldc.i4 -22464
 	add
 	stloc.2
 	ldloc.0
@@ -1135,18 +1135,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_set_right_text_1096f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_set_right_text_10975c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108267c: 0x108267c: addiu a0, zero, 4
+// 0x01082ca0: 0x1082ca0: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01082680: 0x1082680: addiu a1, zero, 1
+// 0x01082ca4: 0x1082ca4: addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-// 0x01082684: 0x1082684: jal   0x1081c08 addu  a2, zero, zero
+// 0x01082ca8: 0x1082ca8: jal   0x108222c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -1154,25 +1154,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::count_tab_1081c08(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::count_tab_108222c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108268c: 0x108268c: lui   a1, 0x20000
+// 0x01082cb0: 0x1082cb0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01082690: 0x1082690: addu  a2, v0, zero
+// 0x01082cb4: 0x1082cb4: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01082694: 0x1082694: addiu a0, s0, -19268
+// 0x01082cb8: 0x1082cb8: addiu a0, s0, -19268
 	ldloc 7
 	ldc.i4 -19268
 	add
 	stloc.1
-// 0x01082698: 0x1082698: jal   0x1096f78 addiu a1, a1, -22952
+// 0x01082cbc: 0x1082cbc: jal   0x10975c0 addiu a1, a1, -22488
 	ldloc.2
-	ldc.i4 -22952
+	ldc.i4 -22488
 	add
 	stloc.2
 	ldloc.0
@@ -1180,15 +1180,15 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_set_right_text_1096f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_set_right_text_10975c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010826a0: 0x10826a0: addiu v0, zero, 7
+// 0x01082cc4: 0x1082cc4: addiu v0, zero, 7
 	ldc.i4.7
 	stloc 5
-// 0x010826a4: 0x10826a4: sw    v0, 16(sp)
+// 0x01082cc8: 0x1082cc8: sw    v0, 16(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1197,10 +1197,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010826a8: 0x10826a8: addiu v0, zero, 8
+// 0x01082ccc: 0x1082ccc: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x010826ac: 0x10826ac: sw    v0, 20(sp)
+// 0x01082cd0: 0x1082cd0: sw    v0, 20(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1209,22 +1209,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010826b0: 0x10826b0: addiu a0, zero, 5
+// 0x01082cd4: 0x1082cd4: addiu a0, zero, 5
 	ldc.i4.5
 	stloc.1
-// 0x010826b4: 0x10826b4: addiu a1, zero, 5
+// 0x01082cd8: 0x1082cd8: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x010826b8: 0x10826b8: addiu a2, zero, 5
+// 0x01082cdc: 0x1082cdc: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x010826bc: 0x10826bc: addiu a3, zero, 6
+// 0x01082ce0: 0x1082ce0: addiu a3, zero, 6
 	ldc.i4.6
 	stloc 4
-// 0x010826c0: 0x10826c0: addiu v0, zero, 9
+// 0x01082ce4: 0x1082ce4: addiu v0, zero, 9
 	ldc.i4.s 9
 	stloc 5
-// 0x010826c4: 0x10826c4: jal   0x1081c08 sw    v0, 24(sp)
+// 0x01082ce8: 0x1082ce8: jal   0x108222c sw    v0, 24(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1238,25 +1238,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl97::count_tab_1081c08(int32,int32,int32,int32,int32)
+	call int32 Cibyl97::count_tab_108222c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010826cc: 0x10826cc: lui   a1, 0x20000
+// 0x01082cf0: 0x1082cf0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010826d0: 0x10826d0: addiu a0, s0, -19268
+// 0x01082cf4: 0x1082cf4: addiu a0, s0, -19268
 	ldloc 7
 	ldc.i4 -19268
 	add
 	stloc.1
-// 0x010826d4: 0x10826d4: addiu a1, a1, -22972
+// 0x01082cf8: 0x1082cf8: addiu a1, a1, -22508
 	ldloc.2
-	ldc.i4 -22972
+	ldc.i4 -22508
 	add
 	stloc.2
-// 0x010826d8: 0x10826d8: jal   0x1096f78 addu  a2, v0, zero
+// 0x01082cfc: 0x1082cfc: jal   0x10975c0 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -1264,13 +1264,13 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl112::ssd_menu_set_right_text_1096f78(int32,int32,int32,int32,int32)
+	call int32 Cibyl112::ssd_menu_set_right_text_10975c0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010826e0: 0x10826e0: lw    ra, 36(sp)
-// 0x010826e4: 0x10826e4: lw    s0, 32(sp)
+// 0x01082d04: 0x1082d04: lw    ra, 36(sp)
+// 0x01082d08: 0x1082d08: lw    s0, 32(sp)
 	ldloc 8
 	ldloc.0
 	ldc.i4.2
@@ -1279,7 +1279,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010826e8: 0x10826e8: jr    ra addiu sp, sp, 40
+// 0x01082d0c: 0x1082d0c: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -1291,7 +1291,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTTrafficInfo_InitRecord_1082848(int32)
+.method public static int32 RTTrafficInfo_InitRecord_1082e6c(int32)
 {
 .maxstack 10
 .locals init (int32 a0,int32[] mem,int32 v0,int32 ra)
@@ -1311,10 +1311,10 @@ __CIBYL_function_return:
 	stloc.1
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082848: 0x1082848: addiu v0, zero, -1
+// 0x01082e6c: 0x1082e6c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc.2
-// 0x0108284c: 0x108284c: sw    v0, 12(a0)
+// 0x01082e70: 0x1082e70: sw    v0, 12(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1323,7 +1323,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01082850: 0x1082850: sw    zero, 2696(a0)
+// 0x01082e74: 0x1082e74: sw    zero, 2696(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1332,14 +1332,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01082854: 0x1082854: sw    v0, 0(a0)
+// 0x01082e78: 0x1082e78: sw    v0, 0(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldloc.2
 	stelem.i4
-// 0x01082858: 0x1082858: sw    zero, 8(a0)
+// 0x01082e7c: 0x1082e7c: sw    zero, 8(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1348,37 +1348,37 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108285c: 0x108285c: sb    zero, 221(a0)
+// 0x01082e80: 0x1082e80: sb    zero, 221(a0)
 	ldloc.0
 	ldc.i4 221
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01082860: 0x1082860: sb    zero, 20(a0)
+// 0x01082e84: 0x1082e84: sb    zero, 20(a0)
 	ldloc.0
 	ldc.i4.s 20
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01082864: 0x1082864: sb    zero, 623(a0)
+// 0x01082e88: 0x1082e88: sb    zero, 623(a0)
 	ldloc.0
 	ldc.i4 623
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01082868: 0x1082868: sb    zero, 422(a0)
+// 0x01082e8c: 0x1082e8c: sb    zero, 422(a0)
 	ldloc.0
 	ldc.i4 422
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0108286c: 0x108286c: sb    zero, 2444(a0)
+// 0x01082e90: 0x1082e90: sb    zero, 2444(a0)
 	ldloc.0
 	ldc.i4 2444
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01082870: 0x1082870: sw    zero, 824(a0)
+// 0x01082e94: 0x1082e94: sw    zero, 824(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1387,7 +1387,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01082874: 0x1082874: sw    zero, 16(a0)
+// 0x01082e98: 0x1082e98: sw    zero, 16(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1396,7 +1396,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01082878: 0x1082878: sw    zero, 2428(a0)
+// 0x01082e9c: 0x1082e9c: sw    zero, 2428(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1405,7 +1405,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108287c: 0x108287c: sw    zero, 2432(a0)
+// 0x01082ea0: 0x1082ea0: sw    zero, 2432(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1414,7 +1414,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01082880: 0x1082880: sw    zero, 2436(a0)
+// 0x01082ea4: 0x1082ea4: sw    zero, 2436(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1423,7 +1423,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01082884: 0x1082884: jr    ra sw    zero, 2440(a0)
+// 0x01082ea8: 0x1082ea8: jr    ra sw    zero, 2440(a0)
 	ldloc 1
 	ldloc.0
 	ldc.i4.2
@@ -1437,7 +1437,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 RTTrafficInfo_IsEmpty_108288c()
+.method public static int32 RTTrafficInfo_IsEmpty_1082eb0()
 {
 .maxstack 8
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1454,19 +1454,19 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108288c: 0x108288c: lui   v0, 0x80000
+// 0x01082eb0: 0x1082eb0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01082890: 0x1082890: lw    v0, -6180(v0)
+// 0x01082eb4: 0x1082eb4: lw    v0, -5716(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1545
+	ldc.i4 -1429
 	add
 	ldelem.i4
 	stloc.0
-// 0x01082894: 0x1082894: jr    ra sltiu v0, v0, 1
+// 0x01082eb8: 0x1082eb8: jr    ra sltiu v0, v0, 1
 	ldloc.0
 	ldc.i4.1
 	clt.un
@@ -1476,7 +1476,7 @@ __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RTTrafficInfo_Count_108289c()
+.method public static int32 RTTrafficInfo_Count_1082ec0()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1493,25 +1493,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108289c: 0x108289c: lui   v0, 0x80000
+// 0x01082ec0: 0x1082ec0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x010828a0: 0x10828a0: lw    v0, -6180(v0)
+// 0x01082ec4: 0x1082ec4: lw    v0, -5716(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -1545
+	ldc.i4 -1429
 	add
 	ldelem.i4
 	stloc.0
-// 0x010828a4: 0x10828a4: jr    ra sll   zero, zero, 0
+// 0x01082ec8: 0x1082ec8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RTTrafficInfo_RecordByID_10828ac(int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_RecordByID_1082ed0(int32,int32,int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1543,18 +1543,18 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010828ac: 0x10828ac: lui   v0, 0x80000
+// 0x01082ed0: 0x1082ed0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x010828b0: 0x10828b0: addiu v0, v0, -8180
+// 0x01082ed4: 0x1082ed4: addiu v0, v0, -7716
 	ldloc 4
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 4
-// 0x010828b4: 0x10828b4: addu  a1, v0, zero
+// 0x01082ed8: 0x1082ed8: addu  a1, v0, zero
 	ldloc 4
 	stloc.1
-// 0x010828b8: 0x10828b8: lw    a2, 2000(v0)
+// 0x01082edc: 0x1082edc: lw    a2, 2000(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -1563,55 +1563,55 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010828bc: 0x10828bc: j	 0x10828dc addu  v1, zero, zero
+// 0x01082ee0: 0x1082ee0: j	 0x1082f00 addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10828dc
+	br L_1082f00
 // --- basic block ---
-L_10828c4:
-// 0x010828c4: 0x10828c4: lw    v0, 0(a1)
+L_1082ee8:
+// 0x01082ee8: 0x1082ee8: lw    v0, 0(a1)
 	ldloc 6
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x010828c8: 0x10828c8: addiu v1, v1, 1
+// 0x01082eec: 0x1082eec: addiu v1, v1, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-// 0x010828cc: 0x10828cc: lw    a3, 0(v0)
+// 0x01082ef0: 0x1082ef0: lw    a3, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010828d0: 0x10828d0: sll   zero, zero, 0
-// 0x010828d4: 0x10828d4: beq   a3, a0, 0x10828e8 addiu a1, a1, 4
+// 0x01082ef4: 0x1082ef4: sll   zero, zero, 0
+// 0x01082ef8: 0x1082ef8: beq   a3, a0, 0x1082f0c addiu a1, a1, 4
 	ldloc.3
 	ldloc.0
 	ldloc.1
 	ldc.i4.4
 	add
 	stloc.1
-	beq  L_10828e8
+	beq  L_1082f0c
 // --- basic block ---
-L_10828dc:
-// 0x010828dc: 0x10828dc: slt   v0, v1, a2
+L_1082f00:
+// 0x01082f00: 0x1082f00: slt   v0, v1, a2
 	ldloc 5
 	ldloc.2
 	clt
 	stloc 4
-// 0x010828e0: 0x10828e0: bne   v0, zero, 0x10828c4 addu  v0, zero, zero
+// 0x01082f04: 0x1082f04: bne   v0, zero, 0x1082ee8 addu  v0, zero, zero
 	ldloc 4
 	ldc.i4.s 0
 	stloc 4
-	brtrue L_10828c4
+	brtrue L_1082ee8
 // --- basic block ---
-L_10828e8:
-// 0x010828e8: 0x10828e8: jr    ra sll   zero, zero, 0
+L_1082f0c:
+// 0x01082f0c: 0x1082f0c: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 5
@@ -1619,7 +1619,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 RTTrafficInfo_Get_1082934(int32)
+.method public static int32 RTTrafficInfo_Get_1082f58(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1642,44 +1642,44 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082934: 0x1082934: sltiu v1, a0, 500
+// 0x01082f58: 0x1082f58: sltiu v1, a0, 500
 	ldloc.0
 	ldc.i4 500
 	clt.un
 	stloc.2
-// 0x01082938: 0x1082938: beq   v1, zero, 0x1082954 addu  v0, zero, zero
+// 0x01082f5c: 0x1082f5c: beq   v1, zero, 0x1082f78 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_1082954
+	brfalse L_1082f78
 // --- basic block ---
-// 0x01082940: 0x1082940: lui   v0, 0x80000
+// 0x01082f64: 0x1082f64: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x01082944: 0x1082944: addiu v0, v0, -8180
+// 0x01082f68: 0x1082f68: addiu v0, v0, -7716
 	ldloc.1
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc.1
-// 0x01082948: 0x1082948: sll   a0, a0, 2
+// 0x01082f6c: 0x1082f6c: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-// 0x0108294c: 0x108294c: addu  a0, a0, v0
+// 0x01082f70: 0x1082f70: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x01082950: 0x1082950: lw    v0, 0(a0)
+// 0x01082f74: 0x1082f74: lw    v0, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-L_1082954:
-// 0x01082954: 0x1082954: jr    ra sll   zero, zero, 0
+L_1082f78:
+// 0x01082f78: 0x1082f78: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -1687,7 +1687,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 RTTrafficInfo_GetNumLines_108295c()
+.method public static int32 RTTrafficInfo_GetNumLines_1082f80()
 {
 .maxstack 5
 .locals init (int32 v0,int32 ra,int32[] mem)
@@ -1704,25 +1704,25 @@ __CIBYL_function_return:
 	stloc.2
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108295c: 0x108295c: lui   v0, 0x80000
+// 0x01082f80: 0x1082f80: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.0
-// 0x01082960: 0x1082960: lw    v0, -2176(v0)
+// 0x01082f84: 0x1082f84: lw    v0, -1712(v0)
 	ldloc 2
 	ldloc.0
 	ldc.i4.2
 	shr.un
-	ldc.i4 -544
+	ldc.i4 -428
 	add
 	ldelem.i4
 	stloc.0
-// 0x01082964: 0x1082964: jr    ra sll   zero, zero, 0
+// 0x01082f88: 0x1082f88: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.0
 	ret
 }
-.method public static int32 RTTrafficInfo_GetLine_108296c(int32)
+.method public static int32 RTTrafficInfo_GetLine_1082f90(int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 v0,int32 v1,int32 ra,int32[] mem)
@@ -1745,44 +1745,44 @@ __CIBYL_function_return:
 	stloc 4
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x0108296c: 0x108296c: sltiu v1, a0, 1000
+// 0x01082f90: 0x1082f90: sltiu v1, a0, 1000
 	ldloc.0
 	ldc.i4 1000
 	clt.un
 	stloc.2
-// 0x01082970: 0x1082970: beq   v1, zero, 0x108298c addu  v0, zero, zero
+// 0x01082f94: 0x1082f94: beq   v1, zero, 0x1082fb0 addu  v0, zero, zero
 	ldloc.2
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_108298c
+	brfalse L_1082fb0
 // --- basic block ---
-// 0x01082978: 0x1082978: lui   v0, 0x80000
+// 0x01082f9c: 0x1082f9c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x0108297c: 0x108297c: addiu v0, v0, -6176
+// 0x01082fa0: 0x1082fa0: addiu v0, v0, -5712
 	ldloc.1
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc.1
-// 0x01082980: 0x1082980: sll   a0, a0, 2
+// 0x01082fa4: 0x1082fa4: sll   a0, a0, 2
 	ldloc.0
 	ldc.i4.2
 	shl
 	stloc.0
-// 0x01082984: 0x1082984: addu  a0, a0, v0
+// 0x01082fa8: 0x1082fa8: addu  a0, a0, v0
 	ldloc.0
 	ldloc.1
 	add
 	stloc.0
-// 0x01082988: 0x1082988: lw    v0, 0(a0)
+// 0x01082fac: 0x1082fac: lw    v0, 0(a0)
 	ldloc 4
 	ldloc.0
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-L_108298c:
-// 0x0108298c: 0x108298c: jr    ra sll   zero, zero, 0
+L_1082fb0:
+// 0x01082fb0: 0x1082fb0: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc.2
@@ -1790,7 +1790,7 @@ __CIBYL_function_return:
 	ldloc.1
 	ret
 }
-.method public static int32 RTTrafficInfo_Get_Line_1082994(int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Get_Line_1082fb8(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 t1,int32[] mem,int32 t0,int32 v1,int32 ra)
@@ -1828,15 +1828,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082994: 0x1082994: lui   v0, 0x80000
+// 0x01082fb8: 0x1082fb8: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x01082998: 0x1082998: addiu v0, v0, -6176
+// 0x01082fbc: 0x1082fbc: addiu v0, v0, -5712
 	ldloc 4
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 4
-// 0x0108299c: 0x108299c: lw    v1, 4000(v0)
+// 0x01082fc0: 0x1082fc0: lw    v1, 4000(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -1845,39 +1845,39 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010829a0: 0x10829a0: sll   zero, zero, 0
-// 0x010829a4: 0x10829a4: beq   v1, zero, 0x1082a18 sll   zero, zero, 0
+// 0x01082fc4: 0x1082fc4: sll   zero, zero, 0
+// 0x01082fc8: 0x1082fc8: beq   v1, zero, 0x108303c sll   zero, zero, 0
 	ldloc 8
-	brfalse L_1082a18
+	brfalse L_108303c
 // --- basic block ---
-// 0x010829ac: 0x10829ac: sltu  a2, zero, a2
+// 0x01082fd0: 0x1082fd0: sltu  a2, zero, a2
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
-// 0x010829b0: 0x10829b0: addu  t0, v0, zero
+// 0x01082fd4: 0x1082fd4: addu  t0, v0, zero
 	ldloc 4
 	stloc 7
-// 0x010829b4: 0x10829b4: addiu a2, a2, 1
+// 0x01082fd8: 0x1082fd8: addiu a2, a2, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x010829b8: 0x10829b8: j	 0x1082a0c addu  v0, zero, zero
+// 0x01082fdc: 0x1082fdc: j	 0x1083030 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_1082a0c
+	br L_1083030
 // --- basic block ---
-L_10829c0:
-// 0x010829c0: 0x10829c0: lw    a3, 0(t0)
+L_1082fe4:
+// 0x01082fe4: 0x1082fe4: lw    a3, 0(t0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010829c4: 0x10829c4: sll   zero, zero, 0
-// 0x010829c8: 0x10829c8: lw    t1, 76(a3)
+// 0x01082fe8: 0x1082fe8: sll   zero, zero, 0
+// 0x01082fec: 0x1082fec: lw    t1, 76(a3)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -1886,16 +1886,16 @@ L_10829c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010829cc: 0x10829cc: sll   zero, zero, 0
-// 0x010829d0: 0x10829d0: beq   t1, zero, 0x1082a08 addiu t0, t0, 4
+// 0x01082ff0: 0x1082ff0: sll   zero, zero, 0
+// 0x01082ff4: 0x1082ff4: beq   t1, zero, 0x108302c addiu t0, t0, 4
 	ldloc 5
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	brfalse L_1082a08
+	brfalse L_108302c
 // --- basic block ---
-// 0x010829d8: 0x10829d8: lw    t1, 8(a3)
+// 0x01082ffc: 0x1082ffc: lw    t1, 8(a3)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -1904,13 +1904,13 @@ L_10829c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010829dc: 0x10829dc: sll   zero, zero, 0
-// 0x010829e0: 0x10829e0: bne   t1, a0, 0x1082a08 sll   zero, zero, 0
+// 0x01083000: 0x1083000: sll   zero, zero, 0
+// 0x01083004: 0x1083004: bne   t1, a0, 0x108302c sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
-	bne.un L_1082a08
+	bne.un L_108302c
 // --- basic block ---
-// 0x010829e8: 0x10829e8: lw    t1, 48(a3)
+// 0x0108300c: 0x108300c: lw    t1, 48(a3)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -1919,47 +1919,47 @@ L_10829c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010829ec: 0x10829ec: sll   zero, zero, 0
-// 0x010829f0: 0x10829f0: bne   t1, a2, 0x1082a08 sll   zero, zero, 0
+// 0x01083010: 0x1083010: sll   zero, zero, 0
+// 0x01083014: 0x1083014: bne   t1, a2, 0x108302c sll   zero, zero, 0
 	ldloc 5
 	ldloc.2
-	bne.un L_1082a08
+	bne.un L_108302c
 // --- basic block ---
-// 0x010829f8: 0x10829f8: lw    a3, 0(a3)
+// 0x0108301c: 0x108301c: lw    a3, 0(a3)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010829fc: 0x10829fc: sll   zero, zero, 0
-// 0x01082a00: 0x1082a00: beq   a3, a1, 0x1082a1c sll   zero, zero, 0
+// 0x01083020: 0x1083020: sll   zero, zero, 0
+// 0x01083024: 0x1083024: beq   a3, a1, 0x1083040 sll   zero, zero, 0
 	ldloc.3
 	ldloc.1
-	beq  L_1082a1c
+	beq  L_1083040
 // --- basic block ---
-L_1082a08:
-// 0x01082a08: 0x1082a08: addiu v0, v0, 1
+L_108302c:
+// 0x0108302c: 0x108302c: addiu v0, v0, 1
 	ldloc 4
 	ldc.i4.1
 	add
 	stloc 4
-L_1082a0c:
-// 0x01082a0c: 0x1082a0c: slt   a3, v0, v1
+L_1083030:
+// 0x01083030: 0x1083030: slt   a3, v0, v1
 	ldloc 4
 	ldloc 8
 	clt
 	stloc.3
-// 0x01082a10: 0x1082a10: bne   a3, zero, 0x10829c0 sll   zero, zero, 0
+// 0x01083034: 0x1083034: bne   a3, zero, 0x1082fe4 sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10829c0
+	brtrue L_1082fe4
 // --- basic block ---
-L_1082a18:
-// 0x01082a18: 0x1082a18: addiu v0, zero, -1
+L_108303c:
+// 0x0108303c: 0x108303c: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 4
-L_1082a1c:
-// 0x01082a1c: 0x1082a1c: jr    ra sll   zero, zero, 0
+L_1083040:
+// 0x01083040: 0x1083040: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
@@ -1967,7 +1967,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 RTTrafficInfo_Get_Avg_Speed_1082a24(int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Get_Avg_Speed_1083048(int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 t0,int32[] mem,int32 t1,int32 v1,int32 ra)
@@ -2005,15 +2005,15 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082a24: 0x1082a24: lui   v0, 0x80000
+// 0x01083048: 0x1083048: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x01082a28: 0x1082a28: addiu v0, v0, -6176
+// 0x0108304c: 0x108304c: addiu v0, v0, -5712
 	ldloc 4
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 4
-// 0x01082a2c: 0x1082a2c: lw    v1, 4000(v0)
+// 0x01083050: 0x1083050: lw    v1, 4000(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -2022,35 +2022,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082a30: 0x1082a30: sll   zero, zero, 0
-// 0x01082a34: 0x1082a34: beq   v1, zero, 0x1082aa0 sltu  a2, zero, a2
+// 0x01083054: 0x1083054: sll   zero, zero, 0
+// 0x01083058: 0x1083058: beq   v1, zero, 0x10830c4 sltu  a2, zero, a2
 	ldloc 8
 	ldc.i4.s 0
 	ldloc.2
 	clt.un
 	stloc.2
-	brfalse L_1082aa0
+	brfalse L_10830c4
 // --- basic block ---
-// 0x01082a3c: 0x1082a3c: addiu a2, a2, 1
+// 0x01083060: 0x1083060: addiu a2, a2, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x01082a40: 0x1082a40: j	 0x1082a94 addu  a3, zero, zero
+// 0x01083064: 0x1083064: j	 0x10830b8 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc.3
-	br L_1082a94
+	br L_10830b8
 // --- basic block ---
-L_1082a48:
-// 0x01082a48: 0x1082a48: lw    t0, 0(v0)
+L_108306c:
+// 0x0108306c: 0x108306c: lw    t0, 0(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01082a4c: 0x1082a4c: sll   zero, zero, 0
-// 0x01082a50: 0x1082a50: lw    t1, 76(t0)
+// 0x01083070: 0x1083070: sll   zero, zero, 0
+// 0x01083074: 0x1083074: lw    t1, 76(t0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2059,16 +2059,16 @@ L_1082a48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01082a54: 0x1082a54: sll   zero, zero, 0
-// 0x01082a58: 0x1082a58: beq   t1, zero, 0x1082a90 addiu v0, v0, 4
+// 0x01083078: 0x1083078: sll   zero, zero, 0
+// 0x0108307c: 0x108307c: beq   t1, zero, 0x10830b4 addiu v0, v0, 4
 	ldloc 7
 	ldloc 4
 	ldc.i4.4
 	add
 	stloc 4
-	brfalse L_1082a90
+	brfalse L_10830b4
 // --- basic block ---
-// 0x01082a60: 0x1082a60: lw    t1, 8(t0)
+// 0x01083084: 0x1083084: lw    t1, 8(t0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2077,13 +2077,13 @@ L_1082a48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01082a64: 0x1082a64: sll   zero, zero, 0
-// 0x01082a68: 0x1082a68: bne   t1, a0, 0x1082a90 sll   zero, zero, 0
+// 0x01083088: 0x1083088: sll   zero, zero, 0
+// 0x0108308c: 0x108308c: bne   t1, a0, 0x10830b4 sll   zero, zero, 0
 	ldloc 7
 	ldloc.0
-	bne.un L_1082a90
+	bne.un L_10830b4
 // --- basic block ---
-// 0x01082a70: 0x1082a70: lw    t1, 48(t0)
+// 0x01083094: 0x1083094: lw    t1, 48(t0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -2092,75 +2092,75 @@ L_1082a48:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01082a74: 0x1082a74: sll   zero, zero, 0
-// 0x01082a78: 0x1082a78: bne   t1, a2, 0x1082a90 sll   zero, zero, 0
+// 0x01083098: 0x1083098: sll   zero, zero, 0
+// 0x0108309c: 0x108309c: bne   t1, a2, 0x10830b4 sll   zero, zero, 0
 	ldloc 7
 	ldloc.2
-	bne.un L_1082a90
+	bne.un L_10830b4
 // --- basic block ---
-// 0x01082a80: 0x1082a80: lw    t0, 0(t0)
+// 0x010830a4: 0x10830a4: lw    t0, 0(t0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01082a84: 0x1082a84: sll   zero, zero, 0
-// 0x01082a88: 0x1082a88: beq   t0, a1, 0x1082aa8 sll   zero, zero, 0
+// 0x010830a8: 0x10830a8: sll   zero, zero, 0
+// 0x010830ac: 0x10830ac: beq   t0, a1, 0x10830cc sll   zero, zero, 0
 	ldloc 5
 	ldloc.1
-	beq  L_1082aa8
+	beq  L_10830cc
 // --- basic block ---
-L_1082a90:
-// 0x01082a90: 0x1082a90: addiu a3, a3, 1
+L_10830b4:
+// 0x010830b4: 0x10830b4: addiu a3, a3, 1
 	ldloc.3
 	ldc.i4.1
 	add
 	stloc.3
-L_1082a94:
-// 0x01082a94: 0x1082a94: slt   t0, a3, v1
+L_10830b8:
+// 0x010830b8: 0x10830b8: slt   t0, a3, v1
 	ldloc.3
 	ldloc 8
 	clt
 	stloc 5
-// 0x01082a98: 0x1082a98: bne   t0, zero, 0x1082a48 sll   zero, zero, 0
+// 0x010830bc: 0x10830bc: bne   t0, zero, 0x108306c sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1082a48
+	brtrue L_108306c
 // --- basic block ---
-L_1082aa0:
-// 0x01082aa0: 0x1082aa0: jr    ra addu  v0, zero, zero
+L_10830c4:
+// 0x010830c4: 0x10830c4: jr    ra addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	br __CIBYL_function_return
 // --- basic block ---
-L_1082aa8:
-// 0x01082aa8: 0x1082aa8: lui   v0, 0x80000
+L_10830cc:
+// 0x010830cc: 0x10830cc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x01082aac: 0x1082aac: addiu v0, v0, -6176
+// 0x010830d0: 0x10830d0: addiu v0, v0, -5712
 	ldloc 4
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 4
-// 0x01082ab0: 0x1082ab0: sll   a3, a3, 2
+// 0x010830d4: 0x10830d4: sll   a3, a3, 2
 	ldloc.3
 	ldc.i4.2
 	shl
 	stloc.3
-// 0x01082ab4: 0x1082ab4: addu  a3, a3, v0
+// 0x010830d8: 0x10830d8: addu  a3, a3, v0
 	ldloc.3
 	ldloc 4
 	add
 	stloc.3
-// 0x01082ab8: 0x1082ab8: lw    v0, 0(a3)
+// 0x010830dc: 0x10830dc: lw    v0, 0(a3)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01082abc: 0x1082abc: sll   zero, zero, 0
-// 0x01082ac0: 0x1082ac0: lw    v0, 64(v0)
+// 0x010830e0: 0x10830e0: sll   zero, zero, 0
+// 0x010830e4: 0x10830e4: lw    v0, 64(v0)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -2169,7 +2169,7 @@ L_1082aa8:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01082ac4: 0x1082ac4: jr    ra sll   zero, zero, 0
+// 0x010830e8: 0x10830e8: jr    ra sll   zero, zero, 0
 	br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
@@ -2177,7 +2177,7 @@ __CIBYL_function_return:
 	ldloc 4
 	ret
 }
-.method public static int32 RTTrafficInfo_InstrumentSegment_1082b6c(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_InstrumentSegment_1083190(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 v1,int32 s1,int32 s2,int32 s3,int32 s4,int32 s5,int32 s6,int32 s7,int32 s8,int32 lo,int32 ra)
@@ -2242,30 +2242,30 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082b6c: 0x1082b6c: lui   v0, 0x80000
+// 0x01083190: 0x1083190: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01082b70: 0x1082b70: sll   a0, a0, 2
+// 0x01083194: 0x1083194: sll   a0, a0, 2
 	ldloc.1
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01082b74: 0x1082b74: addiu v0, v0, -6176
+// 0x01083198: 0x1083198: addiu v0, v0, -5712
 	ldloc 6
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 6
-// 0x01082b78: 0x1082b78: addiu sp, sp, -56
+// 0x0108319c: 0x108319c: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01082b7c: 0x1082b7c: addu  a0, a0, v0
+// 0x010831a0: 0x10831a0: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x01082b80: 0x1082b80: sw    s0, 16(sp)
+// 0x010831a4: 0x10831a4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2274,22 +2274,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01082b84: 0x1082b84: lw    s0, 0(a0)
+// 0x010831a8: 0x10831a8: lw    s0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01082b88: 0x1082b88: sw    ra, 52(sp)
-// 0x01082b8c: 0x1082b8c: lw    a0, 0(s0)
+// 0x010831ac: 0x10831ac: sw    ra, 52(sp)
+// 0x010831b0: 0x10831b0: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01082b90: 0x1082b90: sw    s8, 48(sp)
+// 0x010831b4: 0x10831b4: sw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2298,7 +2298,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01082b94: 0x1082b94: sw    s7, 44(sp)
+// 0x010831b8: 0x10831b8: sw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2307,7 +2307,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01082b98: 0x1082b98: sw    s6, 40(sp)
+// 0x010831bc: 0x10831bc: sw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2316,7 +2316,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01082b9c: 0x1082b9c: sw    s5, 36(sp)
+// 0x010831c0: 0x10831c0: sw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2325,7 +2325,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01082ba0: 0x1082ba0: sw    s4, 32(sp)
+// 0x010831c4: 0x10831c4: sw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2334,7 +2334,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01082ba4: 0x1082ba4: sw    s3, 28(sp)
+// 0x010831c8: 0x10831c8: sw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2343,7 +2343,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01082ba8: 0x1082ba8: sw    s2, 24(sp)
+// 0x010831cc: 0x10831cc: sw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2352,7 +2352,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01082bac: 0x1082bac: jal   0x100b484 sw    s1, 20(sp)
+// 0x010831d0: 0x10831d0: jal   0x100b494 sw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2366,16 +2366,16 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01082bb4: 0x1082bb4: beq   v0, zero, 0x1082bd4 sll   zero, zero, 0
+// 0x010831d8: 0x10831d8: beq   v0, zero, 0x10831f8 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1082bd4
+	brfalse L_10831f8
 // --- basic block ---
-// 0x01082bbc: 0x1082bbc: lw    v1, 4(s0)
+// 0x010831e0: 0x10831e0: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2384,19 +2384,19 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082bc0: 0x1082bc0: sll   zero, zero, 0
-// 0x01082bc4: 0x1082bc4: blez  v1, 0x1082be0 sll   zero, zero, 0
+// 0x010831e4: 0x10831e4: sll   zero, zero, 0
+// 0x010831e8: 0x10831e8: blez  v1, 0x1083204 sll   zero, zero, 0
 	ldloc 8
 	ldc.i4.s 0
-	ble L_1082be0
+	ble L_1083204
 // --- basic block ---
-// 0x01082bcc: 0x1082bcc: beq   v0, v1, 0x1082be0 sll   zero, zero, 0
+// 0x010831f0: 0x10831f0: beq   v0, v1, 0x1083204 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	beq  L_1082be0
+	beq  L_1083204
 // --- basic block ---
-L_1082bd4:
-// 0x01082bd4: 0x1082bd4: sw    zero, 76(s0)
+L_10831f8:
+// 0x010831f8: 0x10831f8: sw    zero, 76(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2405,16 +2405,16 @@ L_1082bd4:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01082bd8: 0x1082bd8: j	 0x1082e08 addu  v0, zero, zero
+// 0x010831fc: 0x10831fc: j	 0x108342c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1082e08
+	br L_108342c
 // --- basic block ---
-L_1082be0:
-// 0x01082be0: 0x1082be0: lui   v0, 0x0
+L_1083204:
+// 0x01083204: 0x1083204: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01082be4: 0x1082be4: lw    v0, 576(v0)
+// 0x01083208: 0x1083208: lw    v0, 576(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -2423,37 +2423,37 @@ L_1082be0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082be8: 0x1082be8: lw    a0, 0(s0)
+// 0x0108320c: 0x108320c: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01082bec: 0x1082bec: sll   zero, zero, 0
-// 0x01082bf0: 0x1082bf0: beq   a0, v0, 0x1082c08 sll   zero, zero, 0
+// 0x01083210: 0x1083210: sll   zero, zero, 0
+// 0x01083214: 0x1083214: beq   a0, v0, 0x108322c sll   zero, zero, 0
 	ldloc.1
 	ldloc 6
-	beq  L_1082c08
+	beq  L_108322c
 // --- basic block ---
-// 0x01082bf8: 0x1082bf8: bltz  a0, 0x1082c08 sll   zero, zero, 0
+// 0x0108321c: 0x108321c: bltz  a0, 0x108322c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1082c08
+	blt L_108322c
 // --- basic block ---
-// 0x01082c00: 0x1082c00: jal   0x100b164 sll   zero, zero, 0
+// 0x01083224: 0x1083224: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-L_1082c08:
-// 0x01082c08: 0x1082c08: lw    v0, 8(s0)
+L_108322c:
+// 0x0108322c: 0x108322c: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2462,94 +2462,94 @@ L_1082c08:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082c0c: 0x1082c0c: lui   v1, 0x20000
+// 0x01083230: 0x1083230: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x01082c10: 0x1082c10: lw    v1, 31152(v1)
+// 0x01083234: 0x1083234: lw    v1, 31616(v1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 7788
+	ldc.i4 7904
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082c14: 0x1082c14: sll   v0, v0, 3
+// 0x01083238: 0x1083238: sll   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x01082c18: 0x1082c18: addu  v0, v1, v0
+// 0x0108323c: 0x108323c: addu  v0, v1, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 6
-// 0x01082c1c: 0x1082c1c: lhu   v0, 4(v0)
+// 0x01083240: 0x1083240: lhu   v0, 4(v0)
 	ldloc 6
 	ldc.i4.4
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc 6
-// 0x01082c20: 0x1082c20: ori   a0, zero, 65535
+// 0x01083244: 0x1083244: ori   a0, zero, 65535
 	ldc.i4.s 0
 	ldc.i4 65535
 	or
 	stloc.1
-// 0x01082c24: 0x1082c24: bne   v0, a0, 0x1082c34 lui   a0, 0x20000
+// 0x01083248: 0x1083248: bne   v0, a0, 0x1083258 lui   a0, 0x20000
 	ldloc 6
 	ldloc.1
 	ldc.i4 131072
 	stloc.1
-	bne.un L_1082c34
+	bne.un L_1083258
 // --- basic block ---
-// 0x01082c2c: 0x1082c2c: j	 0x1082c54 addiu v0, zero, -1
+// 0x01083250: 0x1083250: j	 0x1083278 addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 6
-	br L_1082c54
+	br L_1083278
 // --- basic block ---
-L_1082c34:
-// 0x01082c34: 0x1082c34: lw    a1, 31240(a0)
+L_1083258:
+// 0x01083258: 0x1083258: lw    a1, 31704(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc.2
-// 0x01082c38: 0x1082c38: sll   a0, v0, 2
+// 0x0108325c: 0x108325c: sll   a0, v0, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc.1
-// 0x01082c3c: 0x1082c3c: addu  a0, a1, a0
+// 0x01083260: 0x1083260: addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
 	stloc.1
-// 0x01082c40: 0x1082c40: lw    a0, 0(a0)
+// 0x01083264: 0x1083264: lw    a0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01082c44: 0x1082c44: addiu v0, v0, 1
+// 0x01083268: 0x1083268: addiu v0, v0, 1
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-// 0x01082c48: 0x1082c48: addu  a0, a0, v0
+// 0x0108326c: 0x108326c: addu  a0, a0, v0
 	ldloc.1
 	ldloc 6
 	add
 	stloc.1
-// 0x01082c4c: 0x1082c4c: addiu a0, a0, -1
+// 0x01083270: 0x1083270: addiu a0, a0, -1
 	ldloc.1
 	ldc.i4.m1
 	add
 	stloc.1
-// 0x01082c50: 0x1082c50: sw    a0, 56(s0)
+// 0x01083274: 0x1083274: sw    a0, 56(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2558,8 +2558,8 @@ L_1082c34:
 	add
 	ldloc.1
 	stelem.i4
-L_1082c54:
-// 0x01082c54: 0x1082c54: lw    a0, 8(s0)
+L_1083278:
+// 0x01083278: 0x1083278: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2568,7 +2568,7 @@ L_1082c54:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01082c58: 0x1082c58: sw    v0, 52(s0)
+// 0x0108327c: 0x108327c: sw    v0, 52(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2577,61 +2577,61 @@ L_1082c54:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01082c5c: 0x1082c5c: sll   a0, a0, 3
+// 0x01083280: 0x1083280: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x01082c60: 0x1082c60: addu  a0, v1, a0
+// 0x01083284: 0x1083284: addu  a0, v1, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc.1
-// 0x01082c64: 0x1082c64: lhu   a1, 0(a0)
+// 0x01083288: 0x1083288: lhu   a1, 0(a0)
 	ldloc.1
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.2
-// 0x01082c68: 0x1082c68: lui   v0, 0x20000
+// 0x0108328c: 0x108328c: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01082c6c: 0x1082c6c: lw    v1, 31228(v0)
+// 0x01083290: 0x1083290: lw    v1, 31692(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 7807
+	ldc.i4 7923
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082c70: 0x1082c70: andi  a1, a1, 32767
+// 0x01083294: 0x1083294: andi  a1, a1, 32767
 	ldloc.2
 	ldc.i4 32767
 	and
 	stloc.2
-// 0x01082c74: 0x1082c74: sll   a1, a1, 3
+// 0x01083298: 0x1083298: sll   a1, a1, 3
 	ldloc.2
 	ldc.i4.3
 	shl
 	stloc.2
-// 0x01082c78: 0x1082c78: addu  a1, v1, a1
+// 0x0108329c: 0x108329c: addu  a1, v1, a1
 	ldloc 8
 	ldloc.2
 	add
 	stloc.2
-// 0x01082c7c: 0x1082c7c: lw    v0, 0(a1)
+// 0x010832a0: 0x10832a0: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01082c80: 0x1082c80: lhu   a0, 2(a0)
+// 0x010832a4: 0x10832a4: lhu   a0, 2(a0)
 	ldloc.1
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShortUnsigned(int32)
 	stloc.1
-// 0x01082c84: 0x1082c84: sw    v0, 16(s0)
+// 0x010832a8: 0x10832a8: sw    v0, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2640,7 +2640,7 @@ L_1082c54:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01082c88: 0x1082c88: lw    a1, 4(a1)
+// 0x010832ac: 0x10832ac: lw    a1, 4(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
@@ -2649,22 +2649,22 @@ L_1082c54:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01082c8c: 0x1082c8c: andi  a0, a0, 32767
+// 0x010832b0: 0x10832b0: andi  a0, a0, 32767
 	ldloc.1
 	ldc.i4 32767
 	and
 	stloc.1
-// 0x01082c90: 0x1082c90: sll   a0, a0, 3
+// 0x010832b4: 0x10832b4: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x01082c94: 0x1082c94: addu  a0, v1, a0
+// 0x010832b8: 0x10832b8: addu  a0, v1, a0
 	ldloc 8
 	ldloc.1
 	add
 	stloc.1
-// 0x01082c98: 0x1082c98: sw    a1, 20(s0)
+// 0x010832bc: 0x10832bc: sw    a1, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2673,15 +2673,15 @@ L_1082c54:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01082c9c: 0x1082c9c: lw    v1, 0(a0)
+// 0x010832c0: 0x10832c0: lw    v1, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x01082ca0: 0x1082ca0: sll   zero, zero, 0
-// 0x01082ca4: 0x1082ca4: sw    v1, 24(s0)
+// 0x010832c4: 0x10832c4: sll   zero, zero, 0
+// 0x010832c8: 0x10832c8: sw    v1, 24(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2690,7 +2690,7 @@ L_1082c54:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082ca8: 0x1082ca8: lw    a1, 4(a0)
+// 0x010832cc: 0x10832cc: lw    a1, 4(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -2699,12 +2699,12 @@ L_1082c54:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01082cac: 0x1082cac: slt   a0, v0, v1
+// 0x010832d0: 0x10832d0: slt   a0, v0, v1
 	ldloc 6
 	ldloc 8
 	clt
 	stloc.1
-// 0x01082cb0: 0x1082cb0: beq   a0, zero, 0x1082cc4 sw    a1, 28(s0)
+// 0x010832d4: 0x10832d4: beq   a0, zero, 0x10832e8 sw    a1, 28(s0)
 	ldloc.1
 	ldloc 5
 	ldloc 7
@@ -2714,9 +2714,9 @@ L_1082c54:
 	add
 	ldloc.2
 	stelem.i4
-	brfalse L_1082cc4
+	brfalse L_10832e8
 // --- basic block ---
-// 0x01082cb8: 0x1082cb8: sw    v1, 32(s0)
+// 0x010832dc: 0x10832dc: sw    v1, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2725,7 +2725,7 @@ L_1082c54:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082cbc: 0x1082cbc: j	 0x1082ccc sw    v0, 40(s0)
+// 0x010832e0: 0x10832e0: j	 0x10832f0 sw    v0, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2734,10 +2734,10 @@ L_1082c54:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1082ccc
+	br L_10832f0
 // --- basic block ---
-L_1082cc4:
-// 0x01082cc4: 0x1082cc4: sw    v1, 40(s0)
+L_10832e8:
+// 0x010832e8: 0x10832e8: sw    v1, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2746,7 +2746,7 @@ L_1082cc4:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082cc8: 0x1082cc8: sw    v0, 32(s0)
+// 0x010832ec: 0x10832ec: sw    v0, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2755,8 +2755,8 @@ L_1082cc4:
 	add
 	ldloc 6
 	stelem.i4
-L_1082ccc:
-// 0x01082ccc: 0x1082ccc: lw    v1, 28(s0)
+L_10832f0:
+// 0x010832f0: 0x10832f0: lw    v1, 28(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2765,7 +2765,7 @@ L_1082ccc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082cd0: 0x1082cd0: lw    v0, 20(s0)
+// 0x010832f4: 0x10832f4: lw    v0, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2774,17 +2774,17 @@ L_1082ccc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082cd4: 0x1082cd4: sll   zero, zero, 0
-// 0x01082cd8: 0x1082cd8: slt   a0, v0, v1
+// 0x010832f8: 0x10832f8: sll   zero, zero, 0
+// 0x010832fc: 0x10832fc: slt   a0, v0, v1
 	ldloc 6
 	ldloc 8
 	clt
 	stloc.1
-// 0x01082cdc: 0x1082cdc: beq   a0, zero, 0x1082cf0 sll   zero, zero, 0
+// 0x01083300: 0x1083300: beq   a0, zero, 0x1083314 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1082cf0
+	brfalse L_1083314
 // --- basic block ---
-// 0x01082ce4: 0x1082ce4: sw    v1, 36(s0)
+// 0x01083308: 0x1083308: sw    v1, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2793,7 +2793,7 @@ L_1082ccc:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082ce8: 0x1082ce8: j	 0x1082cf8 sw    v0, 44(s0)
+// 0x0108330c: 0x108330c: j	 0x108331c sw    v0, 44(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2802,10 +2802,10 @@ L_1082ccc:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1082cf8
+	br L_108331c
 // --- basic block ---
-L_1082cf0:
-// 0x01082cf0: 0x1082cf0: sw    v1, 44(s0)
+L_1083314:
+// 0x01083314: 0x1083314: sw    v1, 44(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2814,7 +2814,7 @@ L_1082cf0:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082cf4: 0x1082cf4: sw    v0, 36(s0)
+// 0x01083318: 0x1083318: sw    v0, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2823,8 +2823,8 @@ L_1082cf0:
 	add
 	ldloc 6
 	stelem.i4
-L_1082cf8:
-// 0x01082cf8: 0x1082cf8: lw    s3, 52(s0)
+L_108331c:
+// 0x0108331c: 0x108331c: lw    s3, 52(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2833,17 +2833,17 @@ L_1082cf8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01082cfc: 0x1082cfc: sll   zero, zero, 0
-// 0x01082d00: 0x1082d00: bltz  s3, 0x1082dec sll   s4, s3, 2
+// 0x01083320: 0x1083320: sll   zero, zero, 0
+// 0x01083324: 0x1083324: bltz  s3, 0x1083410 sll   s4, s3, 2
 	ldloc 11
 	ldloc 11
 	ldc.i4.2
 	shl
 	stloc 12
 	ldc.i4.s 0
-	blt L_1082dec
+	blt L_1083410
 // --- basic block ---
-// 0x01082d08: 0x1082d08: lw    s2, 20(s0)
+// 0x0108332c: 0x108332c: lw    s2, 20(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2852,7 +2852,7 @@ L_1082cf8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01082d0c: 0x1082d0c: lw    s1, 16(s0)
+// 0x01083330: 0x1083330: lw    s1, 16(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2861,22 +2861,22 @@ L_1082cf8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01082d10: 0x1082d10: lui   s8, 0x0
+// 0x01083334: 0x1083334: lui   s8, 0x0
 	ldc.i4.s 0
 	stloc 16
-// 0x01082d14: 0x1082d14: lui   s6, 0x0
+// 0x01083338: 0x1083338: lui   s6, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x01082d18: 0x1082d18: lui   s5, 0x0
+// 0x0108333c: 0x108333c: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01082d1c: 0x1082d1c: j	 0x1082dd8 lui   s7, 0x20000
+// 0x01083340: 0x1083340: j	 0x10833fc lui   s7, 0x20000
 	ldc.i4 131072
 	stloc 15
-	br L_1082dd8
+	br L_10833fc
 // --- basic block ---
-L_1082d24:
-// 0x01082d24: 0x1082d24: lw    v0, 576(s8)
+L_1083348:
+// 0x01083348: 0x1083348: lw    v0, 576(s8)
 	ldloc 5
 	ldloc 16
 	ldc.i4.2
@@ -2885,7 +2885,7 @@ L_1082d24:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082d28: 0x1082d28: lw    v1, 548(s6)
+// 0x0108334c: 0x108334c: lw    v1, 548(s6)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -2894,13 +2894,13 @@ L_1082d24:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082d2c: 0x1082d2c: sll   zero, zero, 0
-// 0x01082d30: 0x1082d30: beq   v0, v1, 0x1082d44 sll   zero, zero, 0
+// 0x01083350: 0x1083350: sll   zero, zero, 0
+// 0x01083354: 0x1083354: beq   v0, v1, 0x1083368 sll   zero, zero, 0
 	ldloc 6
 	ldloc 8
-	beq  L_1082d44
+	beq  L_1083368
 // --- basic block ---
-// 0x01082d38: 0x1082d38: jal   0x100ae78 sw    v0, 548(s6)
+// 0x0108335c: 0x108335c: jal   0x100ae88 sw    v0, 548(s6)
 	ldloc 5
 	ldloc 14
 	ldc.i4.2
@@ -2914,12 +2914,12 @@ L_1082d24:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01082d40: 0x1082d40: sw    v0, 552(s5)
+// 0x01083364: 0x1083364: sw    v0, 552(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -2928,17 +2928,17 @@ L_1082d24:
 	add
 	ldloc 6
 	stelem.i4
-L_1082d44:
-// 0x01082d44: 0x1082d44: lw    v1, 31240(s7)
+L_1083368:
+// 0x01083368: 0x1083368: lw    v1, 31704(s7)
 	ldloc 5
 	ldloc 15
 	ldc.i4.2
 	shr.un
-	ldc.i4 7810
+	ldc.i4 7926
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082d48: 0x1082d48: lw    v0, 552(s5)
+// 0x0108336c: 0x108336c: lw    v0, 552(s5)
 	ldloc 5
 	ldloc 13
 	ldc.i4.2
@@ -2947,27 +2947,27 @@ L_1082d44:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082d4c: 0x1082d4c: addu  v1, v1, s4
+// 0x01083370: 0x1083370: addu  v1, v1, s4
 	ldloc 8
 	ldloc 12
 	add
 	stloc 8
-// 0x01082d50: 0x1082d50: lh    a0, 0(v1)
+// 0x01083374: 0x1083374: lh    a0, 0(v1)
 	ldloc 8
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.1
-// 0x01082d54: 0x1082d54: lh    a1, 2(v1)
+// 0x01083378: 0x1083378: lh    a1, 2(v1)
 	ldloc 8
 	ldc.i4.2
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadShort(int32)
 	stloc.2
-// 0x01082d58: 0x1082d58: mult  a0, v0
+// 0x0108337c: 0x108337c: mult  a0, v0
 	ldloc.1
 	ldloc 6
 	mul
 	stloc 17
-// 0x01082d5c: 0x1082d5c: lw    v1, 40(s0)
+// 0x01083380: 0x1083380: lw    v1, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -2976,36 +2976,36 @@ L_1082d44:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082d60: 0x1082d60: mflo  lo
+// 0x01083384: 0x1083384: mflo  lo
 	ldloc 17
 	stloc.1
-// 0x01082d64: 0x1082d64: addu  s1, s1, a0
+// 0x01083388: 0x1083388: addu  s1, s1, a0
 	ldloc 9
 	ldloc.1
 	add
 	stloc 9
-// 0x01082d68: 0x1082d68: slt   v1, s1, v1
+// 0x0108338c: 0x108338c: slt   v1, s1, v1
 	ldloc 9
 	ldloc 8
 	clt
 	stloc 8
-// 0x01082d6c: 0x1082d6c: mult  a1, v0
+// 0x01083390: 0x1083390: mult  a1, v0
 	ldloc.2
 	ldloc 6
 	mul
 	stloc 17
-// 0x01082d70: 0x1082d70: mflo  lo
+// 0x01083394: 0x1083394: mflo  lo
 	ldloc 17
 	stloc 6
-// 0x01082d74: 0x1082d74: beq   v1, zero, 0x1082d84 addu  s2, s2, v0
+// 0x01083398: 0x1083398: beq   v1, zero, 0x10833a8 addu  s2, s2, v0
 	ldloc 8
 	ldloc 10
 	ldloc 6
 	add
 	stloc 10
-	brfalse L_1082d84
+	brfalse L_10833a8
 // --- basic block ---
-// 0x01082d7c: 0x1082d7c: j	 0x1082d9c sw    s1, 40(s0)
+// 0x010833a0: 0x10833a0: j	 0x10833c0 sw    s1, 40(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3014,10 +3014,10 @@ L_1082d44:
 	add
 	ldloc 9
 	stelem.i4
-	br L_1082d9c
+	br L_10833c0
 // --- basic block ---
-L_1082d84:
-// 0x01082d84: 0x1082d84: lw    v0, 32(s0)
+L_10833a8:
+// 0x010833a8: 0x10833a8: lw    v0, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3026,17 +3026,17 @@ L_1082d84:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082d88: 0x1082d88: sll   zero, zero, 0
-// 0x01082d8c: 0x1082d8c: slt   v0, v0, s1
+// 0x010833ac: 0x10833ac: sll   zero, zero, 0
+// 0x010833b0: 0x10833b0: slt   v0, v0, s1
 	ldloc 6
 	ldloc 9
 	clt
 	stloc 6
-// 0x01082d90: 0x1082d90: beq   v0, zero, 0x1082d9c sll   zero, zero, 0
+// 0x010833b4: 0x10833b4: beq   v0, zero, 0x10833c0 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1082d9c
+	brfalse L_10833c0
 // --- basic block ---
-// 0x01082d98: 0x1082d98: sw    s1, 32(s0)
+// 0x010833bc: 0x10833bc: sw    s1, 32(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3045,8 +3045,8 @@ L_1082d84:
 	add
 	ldloc 9
 	stelem.i4
-L_1082d9c:
-// 0x01082d9c: 0x1082d9c: lw    v0, 44(s0)
+L_10833c0:
+// 0x010833c0: 0x10833c0: lw    v0, 44(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3055,17 +3055,17 @@ L_1082d9c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082da0: 0x1082da0: sll   zero, zero, 0
-// 0x01082da4: 0x1082da4: slt   v0, s2, v0
+// 0x010833c4: 0x10833c4: sll   zero, zero, 0
+// 0x010833c8: 0x10833c8: slt   v0, s2, v0
 	ldloc 10
 	ldloc 6
 	clt
 	stloc 6
-// 0x01082da8: 0x1082da8: beq   v0, zero, 0x1082db8 sll   zero, zero, 0
+// 0x010833cc: 0x10833cc: beq   v0, zero, 0x10833dc sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1082db8
+	brfalse L_10833dc
 // --- basic block ---
-// 0x01082db0: 0x1082db0: j	 0x1082dd0 sw    s2, 44(s0)
+// 0x010833d4: 0x10833d4: j	 0x10833f4 sw    s2, 44(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3074,10 +3074,10 @@ L_1082d9c:
 	add
 	ldloc 10
 	stelem.i4
-	br L_1082dd0
+	br L_10833f4
 // --- basic block ---
-L_1082db8:
-// 0x01082db8: 0x1082db8: lw    v0, 36(s0)
+L_10833dc:
+// 0x010833dc: 0x10833dc: lw    v0, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3086,17 +3086,17 @@ L_1082db8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082dbc: 0x1082dbc: sll   zero, zero, 0
-// 0x01082dc0: 0x1082dc0: slt   v0, v0, s2
+// 0x010833e0: 0x10833e0: sll   zero, zero, 0
+// 0x010833e4: 0x10833e4: slt   v0, v0, s2
 	ldloc 6
 	ldloc 10
 	clt
 	stloc 6
-// 0x01082dc4: 0x1082dc4: beq   v0, zero, 0x1082dd0 sll   zero, zero, 0
+// 0x010833e8: 0x10833e8: beq   v0, zero, 0x10833f4 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1082dd0
+	brfalse L_10833f4
 // --- basic block ---
-// 0x01082dcc: 0x1082dcc: sw    s2, 36(s0)
+// 0x010833f0: 0x10833f0: sw    s2, 36(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3105,19 +3105,19 @@ L_1082db8:
 	add
 	ldloc 10
 	stelem.i4
-L_1082dd0:
-// 0x01082dd0: 0x1082dd0: addiu s3, s3, 1
+L_10833f4:
+// 0x010833f4: 0x10833f4: addiu s3, s3, 1
 	ldloc 11
 	ldc.i4.1
 	add
 	stloc 11
-// 0x01082dd4: 0x1082dd4: addiu s4, s4, 4
+// 0x010833f8: 0x10833f8: addiu s4, s4, 4
 	ldloc 12
 	ldc.i4.4
 	add
 	stloc 12
-L_1082dd8:
-// 0x01082dd8: 0x1082dd8: lw    v0, 56(s0)
+L_10833fc:
+// 0x010833fc: 0x10833fc: lw    v0, 56(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3126,18 +3126,18 @@ L_1082dd8:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082ddc: 0x1082ddc: sll   zero, zero, 0
-// 0x01082de0: 0x1082de0: slt   v0, v0, s3
+// 0x01083400: 0x1083400: sll   zero, zero, 0
+// 0x01083404: 0x1083404: slt   v0, v0, s3
 	ldloc 6
 	ldloc 11
 	clt
 	stloc 6
-// 0x01082de4: 0x1082de4: beq   v0, zero, 0x1082d24 sll   zero, zero, 0
+// 0x01083408: 0x1083408: beq   v0, zero, 0x1083348 sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1082d24
+	brfalse L_1083348
 // --- basic block ---
-L_1082dec:
-// 0x01082dec: 0x1082dec: lw    a0, 8(s0)
+L_1083410:
+// 0x01083410: 0x1083410: lw    a0, 8(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3146,7 +3146,7 @@ L_1082dec:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01082df0: 0x1082df0: jal   0x1003b50 sll   zero, zero, 0
+// 0x01083414: 0x1083414: jal   0x1003b50 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
 	ldloc.3
@@ -3155,10 +3155,10 @@ L_1082dec:
 	stloc 8
 	stloc 6
 // --- basic block ---
-// 0x01082df8: 0x1082df8: addiu v1, zero, 1
+// 0x0108341c: 0x108341c: addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-// 0x01082dfc: 0x1082dfc: sw    v0, 12(s0)
+// 0x01083420: 0x1083420: sw    v0, 12(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3167,7 +3167,7 @@ L_1082dec:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01082e00: 0x1082e00: sw    v1, 76(s0)
+// 0x01083424: 0x1083424: sw    v1, 76(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -3176,12 +3176,12 @@ L_1082dec:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082e04: 0x1082e04: addiu v0, zero, 1
+// 0x01083428: 0x1083428: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-L_1082e08:
-// 0x01082e08: 0x1082e08: lw    ra, 52(sp)
-// 0x01082e0c: 0x1082e0c: lw    s8, 48(sp)
+L_108342c:
+// 0x0108342c: 0x108342c: lw    ra, 52(sp)
+// 0x01083430: 0x1083430: lw    s8, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3190,7 +3190,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01082e10: 0x1082e10: lw    s7, 44(sp)
+// 0x01083434: 0x1083434: lw    s7, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3199,7 +3199,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01082e14: 0x1082e14: lw    s6, 40(sp)
+// 0x01083438: 0x1083438: lw    s6, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3208,7 +3208,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01082e18: 0x1082e18: lw    s5, 36(sp)
+// 0x0108343c: 0x108343c: lw    s5, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3217,7 +3217,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01082e1c: 0x1082e1c: lw    s4, 32(sp)
+// 0x01083440: 0x1083440: lw    s4, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3226,7 +3226,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01082e20: 0x1082e20: lw    s3, 28(sp)
+// 0x01083444: 0x1083444: lw    s3, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3235,7 +3235,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01082e24: 0x1082e24: lw    s2, 24(sp)
+// 0x01083448: 0x1083448: lw    s2, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3244,7 +3244,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01082e28: 0x1082e28: lw    s1, 20(sp)
+// 0x0108344c: 0x108344c: lw    s1, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3253,7 +3253,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01082e2c: 0x1082e2c: lw    s0, 16(sp)
+// 0x01083450: 0x1083450: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3262,7 +3262,7 @@ L_1082e08:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01082e30: 0x1082e30: jr    ra addiu sp, sp, 56
+// 0x01083454: 0x1083454: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3274,7 +3274,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTTrafficInfo_InstrumentSegments_1082e38(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_InstrumentSegments_108345c(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 v1)
@@ -3321,12 +3321,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082e38: 0x1082e38: addiu sp, sp, -40
+// 0x0108345c: 0x108345c: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01082e3c: 0x1082e3c: sw    s0, 20(sp)
+// 0x01083460: 0x1083460: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3335,15 +3335,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01082e40: 0x1082e40: lui   s0, 0x80000
+// 0x01083464: 0x1083464: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01082e44: 0x1082e44: addiu s0, s0, -6176
+// 0x01083468: 0x1083468: addiu s0, s0, -5712
 	ldloc 7
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 7
-// 0x01082e48: 0x1082e48: sw    s3, 32(sp)
+// 0x0108346c: 0x108346c: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3352,7 +3352,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01082e4c: 0x1082e4c: sw    s2, 28(sp)
+// 0x01083470: 0x1083470: sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3361,7 +3361,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01082e50: 0x1082e50: sw    s1, 24(sp)
+// 0x01083474: 0x1083474: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3370,45 +3370,45 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082e54: 0x1082e54: sw    ra, 36(sp)
-// 0x01082e58: 0x1082e58: addu  s3, a0, zero
+// 0x01083478: 0x1083478: sw    ra, 36(sp)
+// 0x0108347c: 0x108347c: addu  s3, a0, zero
 	ldloc.1
 	stloc 10
-// 0x01082e5c: 0x1082e5c: addu  s1, zero, zero
+// 0x01083480: 0x1083480: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01082e60: 0x1082e60: j	 0x1082e8c addu  s2, s0, zero
+// 0x01083484: 0x1083484: j	 0x10834b0 addu  s2, s0, zero
 	ldloc 7
 	stloc 9
-	br L_1082e8c
+	br L_10834b0
 // --- basic block ---
-L_1082e68:
-// 0x01082e68: 0x1082e68: lw    v0, 0(s0)
+L_108348c:
+// 0x0108348c: 0x108348c: lw    v0, 0(s0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01082e6c: 0x1082e6c: sll   zero, zero, 0
-// 0x01082e70: 0x1082e70: lw    v0, 0(v0)
+// 0x01083490: 0x1083490: sll   zero, zero, 0
+// 0x01083494: 0x1083494: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01082e74: 0x1082e74: sll   zero, zero, 0
-// 0x01082e78: 0x1082e78: bne   v0, s3, 0x1082e88 addiu s0, s0, 4
+// 0x01083498: 0x1083498: sll   zero, zero, 0
+// 0x0108349c: 0x108349c: bne   v0, s3, 0x10834ac addiu s0, s0, 4
 	ldloc 6
 	ldloc 10
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	bne.un L_1082e88
+	bne.un L_10834ac
 // --- basic block ---
-// 0x01082e80: 0x1082e80: jal   0x1082b6c addu  a0, s1, zero
+// 0x010834a4: 0x10834a4: jal   0x1083190 addu  a0, s1, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -3416,19 +3416,19 @@ L_1082e68:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_InstrumentSegment_1082b6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_InstrumentSegment_1083190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_1082e88:
-// 0x01082e88: 0x1082e88: addiu s1, s1, 1
+L_10834ac:
+// 0x010834ac: 0x10834ac: addiu s1, s1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_1082e8c:
-// 0x01082e8c: 0x1082e8c: lw    v0, 4000(s2)
+L_10834b0:
+// 0x010834b0: 0x10834b0: lw    v0, 4000(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
@@ -3437,18 +3437,18 @@ L_1082e8c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01082e90: 0x1082e90: sll   zero, zero, 0
-// 0x01082e94: 0x1082e94: slt   v0, s1, v0
+// 0x010834b4: 0x10834b4: sll   zero, zero, 0
+// 0x010834b8: 0x10834b8: slt   v0, s1, v0
 	ldloc 8
 	ldloc 6
 	clt
 	stloc 6
-// 0x01082e98: 0x1082e98: bne   v0, zero, 0x1082e68 sll   zero, zero, 0
+// 0x010834bc: 0x10834bc: bne   v0, zero, 0x108348c sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1082e68
+	brtrue L_108348c
 // --- basic block ---
-// 0x01082ea0: 0x1082ea0: lw    ra, 36(sp)
-// 0x01082ea4: 0x1082ea4: lw    s3, 32(sp)
+// 0x010834c4: 0x10834c4: lw    ra, 36(sp)
+// 0x010834c8: 0x10834c8: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3457,7 +3457,7 @@ L_1082e8c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01082ea8: 0x1082ea8: lw    s2, 28(sp)
+// 0x010834cc: 0x10834cc: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3466,7 +3466,7 @@ L_1082e8c:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01082eac: 0x1082eac: lw    s1, 24(sp)
+// 0x010834d0: 0x10834d0: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3475,7 +3475,7 @@ L_1082e8c:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082eb0: 0x1082eb0: lw    s0, 20(sp)
+// 0x010834d4: 0x10834d4: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3484,7 +3484,7 @@ L_1082e8c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01082eb4: 0x1082eb4: jr    ra addiu sp, sp, 40
+// 0x010834d8: 0x10834d8: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3496,7 +3496,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTTrafficInfo_Get_Avg_Cross_Time_1082f0c(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Get_Avg_Cross_Time_1083530(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s1,int32 s2,int32 s3,int32 ra,int32 lo)
@@ -3546,12 +3546,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082f0c: 0x1082f0c: addiu sp, sp, -40
+// 0x01083530: 0x1083530: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x01082f10: 0x1082f10: sw    s1, 24(sp)
+// 0x01083534: 0x1083534: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3560,7 +3560,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01082f14: 0x1082f14: sw    s0, 20(sp)
+// 0x01083538: 0x1083538: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3569,8 +3569,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082f18: 0x1082f18: sw    ra, 36(sp)
-// 0x01082f1c: 0x1082f1c: sw    s3, 32(sp)
+// 0x0108353c: 0x108353c: sw    ra, 36(sp)
+// 0x01083540: 0x1083540: sw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3579,7 +3579,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01082f20: 0x1082f20: sw    s2, 28(sp)
+// 0x01083544: 0x1083544: sw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3588,28 +3588,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01082f24: 0x1082f24: jal   0x1082a24 addu  s1, a0, zero
+// 0x01083548: 0x1083548: jal   0x1083048 addu  s1, a0, zero
 	ldloc.1
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_Get_Avg_Speed_1082a24(int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_Get_Avg_Speed_1083048(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082f2c: 0x1082f2c: addu  s0, v0, zero
+// 0x01083550: 0x1083550: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01082f30: 0x1082f30: beq   s0, zero, 0x1082fa8 addu  v0, zero, zero
+// 0x01083554: 0x1083554: beq   s0, zero, 0x10835cc addu  v0, zero, zero
 	ldloc 8
 	ldc.i4.s 0
 	stloc 5
-	brfalse L_1082fa8
+	brfalse L_10835cc
 // --- basic block ---
-// 0x01082f38: 0x1082f38: jal   0x100405c addu  a0, s1, zero
+// 0x0108355c: 0x108355c: jal   0x100405c addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -3622,7 +3622,7 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082f40: 0x1082f40: jal   0x1007eb8 addu  a0, v0, zero
+// 0x01083564: 0x1083564: jal   0x1007ec8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3630,55 +3630,55 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_to_cm_1007eb8(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_to_cm_1007ec8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082f48: 0x1082f48: addiu a0, zero, 100
+// 0x0108356c: 0x108356c: addiu a0, zero, 100
 	ldc.i4.s 100
 	stloc.1
-// 0x01082f4c: 0x1082f4c: div   v0, a0
+// 0x01083570: 0x1083570: div   v0, a0
 	ldloc 5
 	ldloc.1
 	div
 	stloc 13
-// 0x01082f50: 0x1082f50: mflo  lo
+// 0x01083574: 0x1083574: mflo  lo
 	ldloc 13
 	stloc.1
-// 0x01082f54: 0x1082f54: jal   0x10c09c0 sll   zero, zero, 0
+// 0x01083578: 0x1083578: jal   0x10c1000 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082f5c: 0x1082f5c: lui   a0, 0x20000
+// 0x01083580: 0x1083580: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01082f60: 0x1082f60: lw    a3, 23700(a0)
+// 0x01083584: 0x1083584: lw    a3, 24164(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5925
+	ldc.i4 6041
 	add
 	ldelem.i4
 	stloc 4
-// 0x01082f64: 0x1082f64: lw    a2, 23696(a0)
+// 0x01083588: 0x1083588: lw    a2, 24160(a0)
 	ldloc 7
 	ldloc.1
 	ldc.i4.2
 	shr.un
-	ldc.i4 5924
+	ldc.i4 6040
 	add
 	ldelem.i4
 	stloc.3
-// 0x01082f68: 0x1082f68: addu  a1, v1, zero
+// 0x0108358c: 0x108358c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01082f6c: 0x1082f6c: jal   0x10c0798 addu  a0, v0, zero
+// 0x01083590: 0x1083590: jal   0x10c0dd8 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3686,37 +3686,37 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__muldf3_10c0798(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__muldf3_10c0dd8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082f74: 0x1082f74: addu  a0, s0, zero
+// 0x01083598: 0x1083598: addu  a0, s0, zero
 	ldloc 8
 	stloc.1
-// 0x01082f78: 0x1082f78: addu  s3, v1, zero
+// 0x0108359c: 0x108359c: addu  s3, v1, zero
 	ldloc 6
 	stloc 11
-// 0x01082f7c: 0x1082f7c: jal   0x10c09c0 addu  s2, v0, zero
+// 0x010835a0: 0x10835a0: jal   0x10c1000 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082f84: 0x1082f84: addu  a3, v1, zero
+// 0x010835a8: 0x10835a8: addu  a3, v1, zero
 	ldloc 6
 	stloc 4
-// 0x01082f88: 0x1082f88: addu  a1, s3, zero
+// 0x010835ac: 0x10835ac: addu  a1, s3, zero
 	ldloc 11
 	stloc.2
-// 0x01082f8c: 0x1082f8c: addu  a0, s2, zero
+// 0x010835b0: 0x10835b0: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01082f90: 0x1082f90: jal   0x10c07f0 addu  a2, v0, zero
+// 0x010835b4: 0x10835b4: jal   0x10c0e30 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
 	ldloc.0
@@ -3724,33 +3724,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl143::__divdf3_10c07f0(int32,int32,int32,int32,int32)
+	call int32 Cibyl143::__divdf3_10c0e30(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082f98: 0x1082f98: addu  a1, v1, zero
+// 0x010835bc: 0x10835bc: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01082f9c: 0x1082f9c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010835c0: 0x10835c0: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01082fa4: 0x1082fa4: addiu v0, v0, 1
+// 0x010835c8: 0x10835c8: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_1082fa8:
-// 0x01082fa8: 0x1082fa8: lw    ra, 36(sp)
-// 0x01082fac: 0x1082fac: lw    s3, 32(sp)
+L_10835cc:
+// 0x010835cc: 0x10835cc: lw    ra, 36(sp)
+// 0x010835d0: 0x10835d0: lw    s3, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3759,7 +3759,7 @@ L_1082fa8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01082fb0: 0x1082fb0: lw    s2, 28(sp)
+// 0x010835d4: 0x10835d4: lw    s2, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3768,7 +3768,7 @@ L_1082fa8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01082fb4: 0x1082fb4: lw    s1, 24(sp)
+// 0x010835d8: 0x10835d8: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3777,7 +3777,7 @@ L_1082fa8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01082fb8: 0x1082fb8: lw    s0, 20(sp)
+// 0x010835dc: 0x10835dc: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3786,7 +3786,7 @@ L_1082fa8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01082fbc: 0x1082fbc: jr    ra addiu sp, sp, 40
+// 0x010835e0: 0x10835e0: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -3798,7 +3798,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTTrafficInfo_GenerateAlert_1082fc4(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_GenerateAlert_10835e8(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s0,int32 t0,int32 s1,int32 ra,int32 lo)
@@ -3845,7 +3845,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01082fc4: 0x1082fc4: lw    v1, 824(a0)
+// 0x010835e8: 0x10835e8: lw    v1, 824(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -3854,12 +3854,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01082fc8: 0x1082fc8: addiu sp, sp, -1880
+// 0x010835ec: 0x10835ec: addiu sp, sp, -1880
 	ldloc.0
 	ldc.i4 -1880
 	add
 	stloc.0
-// 0x01082fcc: 0x1082fcc: sw    s0, 1868(sp)
+// 0x010835f0: 0x10835f0: sw    s0, 1868(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3868,8 +3868,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01082fd0: 0x1082fd0: sw    ra, 1876(sp)
-// 0x01082fd4: 0x1082fd4: sw    s1, 1872(sp)
+// 0x010835f4: 0x10835f4: sw    ra, 1876(sp)
+// 0x010835f8: 0x10835f8: sw    s1, 1872(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3878,22 +3878,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01082fd8: 0x1082fd8: addu  s0, a0, zero
+// 0x010835fc: 0x10835fc: addu  s0, a0, zero
 	ldloc.1
 	stloc 8
-// 0x01082fdc: 0x1082fdc: blez  v1, 0x10830c8 addu  v0, zero, zero
+// 0x01083600: 0x1083600: blez  v1, 0x10836ec addu  v0, zero, zero
 	ldloc 7
 	ldc.i4.s 0
 	stloc 6
 	ldc.i4.s 0
-	ble L_10830c8
+	ble L_10836ec
 // --- basic block ---
-// 0x01082fe4: 0x1082fe4: addiu s1, sp, 16
+// 0x01083608: 0x1083608: addiu s1, sp, 16
 	ldloc.0
 	ldc.i4.s 16
 	add
 	stloc 10
-// 0x01082fe8: 0x1082fe8: jal   0x1078f18 addu  a0, s1, zero
+// 0x0108360c: 0x108360c: jal   0x107953c addu  a0, s1, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -3901,27 +3901,27 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_Alert_Init_1078f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl91::RTAlerts_Alert_Init_107953c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01082ff0: 0x1082ff0: lw    a0, 0(s0)
+// 0x01083614: 0x1083614: lw    a0, 0(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01082ff4: 0x1082ff4: lui   t0, 0x10000
+// 0x01083618: 0x1083618: lui   t0, 0x10000
 	ldc.i4 65536
 	stloc 9
-// 0x01082ff8: 0x1082ff8: ori   t0, t0, 34464
+// 0x0108361c: 0x108361c: ori   t0, t0, 34464
 	ldloc 9
 	ldc.i4 34464
 	or
 	stloc 9
-// 0x01082ffc: 0x1082ffc: lw    v1, 8(s0)
+// 0x01083620: 0x1083620: lw    v1, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3930,7 +3930,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01083000: 0x1083000: lw    a3, 12(s0)
+// 0x01083624: 0x1083624: lw    a3, 12(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3939,7 +3939,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01083004: 0x1083004: lw    v0, 2696(s0)
+// 0x01083628: 0x1083628: lw    v0, 2696(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -3948,22 +3948,22 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083008: 0x1083008: addu  t0, a0, t0
+// 0x0108362c: 0x108362c: addu  t0, a0, t0
 	ldloc.1
 	ldloc 9
 	add
 	stloc 9
-// 0x0108300c: 0x108300c: addiu a1, s0, 2444
+// 0x01083630: 0x1083630: addiu a1, s0, 2444
 	ldloc 8
 	ldc.i4 2444
 	add
 	stloc.2
-// 0x01083010: 0x1083010: addiu a0, sp, 573
+// 0x01083634: 0x1083634: addiu a0, sp, 573
 	ldloc.0
 	ldc.i4 573
 	add
 	stloc.1
-// 0x01083014: 0x1083014: sw    t0, 16(sp)
+// 0x01083638: 0x1083638: sw    t0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3972,13 +3972,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01083018: 0x1083018: addiu a2, zero, 150
+// 0x0108363c: 0x108363c: addiu a2, zero, 150
 	ldc.i4 150
 	stloc.3
-// 0x0108301c: 0x108301c: addiu t0, zero, 4
+// 0x01083640: 0x1083640: addiu t0, zero, 4
 	ldc.i4.4
 	stloc 9
-// 0x01083020: 0x1083020: sw    v1, 44(sp)
+// 0x01083644: 0x1083644: sw    v1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3987,7 +3987,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083024: 0x1083024: sw    t0, 20(sp)
+// 0x01083648: 0x1083648: sw    t0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -3996,7 +3996,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01083028: 0x1083028: sw    a3, 24(sp)
+// 0x0108364c: 0x108364c: sw    a3, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4005,7 +4005,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 4
 	stelem.i4
-// 0x0108302c: 0x108302c: jal   0x1001af8 sw    v0, 1532(sp)
+// 0x01083650: 0x1083650: jal   0x1001af8 sw    v0, 1532(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4020,13 +4020,13 @@ __CIBYL_javamethod_begin:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 6
 // --- basic block ---
-// 0x01083034: 0x1083034: sb    zero, 722(sp)
+// 0x01083658: 0x1083658: sb    zero, 722(sp)
 	ldloc.0
 	ldc.i4 722
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01083038: 0x1083038: lw    a2, 8(s0)
+// 0x0108365c: 0x108365c: lw    a2, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4035,15 +4035,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108303c: 0x108303c: lui   a0, 0x20000
+// 0x01083660: 0x1083660: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01083040: 0x1083040: addiu a0, a0, -22688
+// 0x01083664: 0x1083664: addiu a0, a0, -22224
 	ldloc.1
-	ldc.i4 -22688
+	ldc.i4 -22224
 	add
 	stloc.1
-// 0x01083044: 0x1083044: jal   0x101cd60 sw    a2, 1860(sp)
+// 0x01083668: 0x1083668: jal   0x101cd70 sw    a2, 1860(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4057,12 +4057,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108304c: 0x108304c: jal   0x1007d9c sw    v0, 1856(sp)
+// 0x01083670: 0x1083670: jal   0x1007dac sw    v0, 1856(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4071,10 +4071,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-	call int32 Cibyl5::roadmap_math_speed_unit_1007d9c()
+	call int32 Cibyl5::roadmap_math_speed_unit_1007dac()
 	stloc 6
 // --- basic block ---
-// 0x01083054: 0x1083054: jal   0x101cd60 addu  a0, v0, zero
+// 0x01083678: 0x1083678: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -4082,12 +4082,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x0108305c: 0x108305c: lw    a1, 1856(sp)
+// 0x01083680: 0x1083680: lw    a1, 1856(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4096,7 +4096,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01083060: 0x1083060: lw    a2, 1860(sp)
+// 0x01083684: 0x1083684: lw    a2, 1860(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4105,10 +4105,10 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01083064: 0x1083064: addu  a3, v0, zero
+// 0x01083688: 0x1083688: addu  a3, v0, zero
 	ldloc 6
 	stloc 4
-// 0x01083068: 0x1083068: jal   0x1000f64 addiu a0, sp, 172
+// 0x0108368c: 0x108368c: jal   0x1000f64 addiu a0, sp, 172
 	ldloc.0
 	ldc.i4 172
 	add
@@ -4123,10 +4123,10 @@ __CIBYL_javamethod_begin:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083070: 0x1083070: addiu v0, zero, 1
+// 0x01083694: 0x1083694: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 6
-// 0x01083074: 0x1083074: sw    v0, 28(sp)
+// 0x01083698: 0x1083698: sw    v0, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4135,18 +4135,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01083078: 0x1083078: addu  v1, zero, zero
+// 0x0108369c: 0x108369c: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0108307c: 0x108307c: cibyl_sysc_arg 0x3
+// 0x010836a0: 0x10836a0: cibyl_sysc_arg 0x3
 	ldloc 7
-// 0x01083080: 0x1083080: cibyl_sysc 0x2134
+// 0x010836a4: 0x10836a4: cibyl_sysc 0x2134
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 6
-// 0x01083084: 0x1083084: addu  v1, v0, zero
+// 0x010836a8: 0x10836a8: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x01083088: 0x1083088: lw    a0, 824(s0)
+// 0x010836ac: 0x10836ac: lw    a0, 824(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4155,15 +4155,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108308c: 0x108308c: addiu v0, zero, 2
+// 0x010836b0: 0x10836b0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 6
-// 0x01083090: 0x1083090: div   a0, v0
+// 0x010836b4: 0x10836b4: div   a0, v0
 	ldloc.1
 	ldloc 6
 	div
 	stloc 12
-// 0x01083094: 0x1083094: sw    v1, 160(sp)
+// 0x010836b8: 0x10836b8: sw    v1, 160(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4172,7 +4172,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083098: 0x1083098: sw    zero, 1296(sp)
+// 0x010836bc: 0x10836bc: sw    zero, 1296(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4181,7 +4181,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108309c: 0x108309c: sw    zero, 1852(sp)
+// 0x010836c0: 0x10836c0: sw    zero, 1852(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4190,28 +4190,28 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x010830a0: 0x10830a0: addu  a0, s1, zero
+// 0x010836c4: 0x10836c4: addu  a0, s1, zero
 	ldloc 10
 	stloc.1
-// 0x010830a4: 0x10830a4: mflo  lo
+// 0x010836c8: 0x10836c8: mflo  lo
 	ldloc 12
 	stloc 6
-// 0x010830a8: 0x10830a8: addiu v0, v0, 103
+// 0x010836cc: 0x10836cc: addiu v0, v0, 103
 	ldloc 6
 	ldc.i4.s 103
 	add
 	stloc 6
-// 0x010830ac: 0x10830ac: sll   v0, v0, 3
+// 0x010836d0: 0x10836d0: sll   v0, v0, 3
 	ldloc 6
 	ldc.i4.3
 	shl
 	stloc 6
-// 0x010830b0: 0x10830b0: addu  s0, s0, v0
+// 0x010836d4: 0x10836d4: addu  s0, s0, v0
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x010830b4: 0x10830b4: lw    v1, 4(s0)
+// 0x010836d8: 0x10836d8: lw    v1, 4(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4220,7 +4220,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010830b8: 0x10830b8: lw    v0, 8(s0)
+// 0x010836dc: 0x10836dc: lw    v0, 8(s0)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -4229,7 +4229,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010830bc: 0x10830bc: sw    v1, 32(sp)
+// 0x010836e0: 0x10836e0: sw    v1, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4238,7 +4238,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010830c0: 0x10830c0: jal   0x107ec34 sw    v0, 36(sp)
+// 0x010836e4: 0x10836e4: jal   0x107f258 sw    v0, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4252,14 +4252,14 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl95::RTAlerts_Add_107ec34(int32,int32,int32,int32,int32)
+	call int32 Cibyl95::RTAlerts_Add_107f258(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-L_10830c8:
-// 0x010830c8: 0x10830c8: lw    ra, 1876(sp)
-// 0x010830cc: 0x10830cc: lw    s1, 1872(sp)
+L_10836ec:
+// 0x010836ec: 0x10836ec: lw    ra, 1876(sp)
+// 0x010836f0: 0x10836f0: lw    s1, 1872(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4268,7 +4268,7 @@ L_10830c8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010830d0: 0x10830d0: lw    s0, 1868(sp)
+// 0x010836f4: 0x10836f4: lw    s0, 1868(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4277,7 +4277,7 @@ L_10830c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010830d4: 0x10830d4: jr    ra addiu sp, sp, 1880
+// 0x010836f8: 0x10836f8: jr    ra addiu sp, sp, 1880
 	ldloc.0
 	ldc.i4 1880
 	add
@@ -4289,7 +4289,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTTrafficInfo_UpdateGeometry_10830dc(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_UpdateGeometry_1083700(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v1,int32 v0,int32 ra)
@@ -4324,7 +4324,7 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010830dc: 0x10830dc: lw    a2, 824(a0)
+// 0x01083700: 0x1083700: lw    a2, 824(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4333,46 +4333,46 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010830e0: 0x10830e0: addiu sp, sp, -32
+// 0x01083704: 0x1083704: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x010830e4: 0x10830e4: bgtz  a2, 0x1083118 sw    ra, 28(sp)
+// 0x01083708: 0x1083708: bgtz  a2, 0x108373c sw    ra, 28(sp)
 	ldloc.3
 	ldc.i4.s 0
-	bgt L_1083118
+	bgt L_108373c
 // --- basic block ---
-// 0x010830ec: 0x10830ec: lw    v0, 0(a0)
+// 0x01083710: 0x1083710: lw    v0, 0(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x010830f0: 0x10830f0: lui   a1, 0x20000
+// 0x01083714: 0x1083714: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010830f4: 0x10830f4: lui   a3, 0x20000
+// 0x01083718: 0x1083718: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010830f8: 0x10830f8: addiu a1, a1, -22668
+// 0x0108371c: 0x108371c: addiu a1, a1, -22204
 	ldloc.2
-	ldc.i4 -22668
+	ldc.i4 -22204
 	add
 	stloc.2
-// 0x010830fc: 0x10830fc: addiu a3, a3, -22624
+// 0x01083720: 0x1083720: addiu a3, a3, -22160
 	ldloc 4
-	ldc.i4 -22624
+	ldc.i4 -22160
 	add
 	stloc 4
-// 0x01083100: 0x1083100: addiu a0, zero, 4
+// 0x01083724: 0x1083724: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01083104: 0x1083104: addiu a2, zero, 562
+// 0x01083728: 0x1083728: addiu a2, zero, 562
 	ldc.i4 562
 	stloc.3
-// 0x01083108: 0x1083108: jal   0x100449c sw    v0, 16(sp)
+// 0x0108372c: 0x108372c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -4391,13 +4391,13 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 7
 // --- basic block ---
-// 0x01083110: 0x1083110: j	 0x10831c8 addu  v0, zero, zero
+// 0x01083734: 0x1083734: j	 0x10837ec addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-	br L_10831c8
+	br L_10837ec
 // --- basic block ---
-L_1083118:
-// 0x01083118: 0x1083118: lw    v0, 832(a0)
+L_108373c:
+// 0x0108373c: 0x108373c: lw    v0, 832(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4406,7 +4406,7 @@ L_1083118:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108311c: 0x108311c: lw    v1, 828(a0)
+// 0x01083740: 0x1083740: lw    v1, 828(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4415,7 +4415,7 @@ L_1083118:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083120: 0x1083120: sw    v0, 2440(a0)
+// 0x01083744: 0x1083744: sw    v0, 2440(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4424,7 +4424,7 @@ L_1083118:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083124: 0x1083124: sw    v0, 2432(a0)
+// 0x01083748: 0x1083748: sw    v0, 2432(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4433,7 +4433,7 @@ L_1083118:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083128: 0x1083128: sw    v1, 2436(a0)
+// 0x0108374c: 0x108374c: sw    v1, 2436(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4442,7 +4442,7 @@ L_1083118:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108312c: 0x108312c: sw    v1, 2428(a0)
+// 0x01083750: 0x1083750: sw    v1, 2428(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4451,16 +4451,16 @@ L_1083118:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01083130: 0x1083130: addu  v0, a0, zero
+// 0x01083754: 0x1083754: addu  v0, a0, zero
 	ldloc.1
 	stloc 7
-// 0x01083134: 0x1083134: j	 0x10831b4 addiu a1, zero, 1
+// 0x01083758: 0x1083758: j	 0x10837d8 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
-	br L_10831b4
+	br L_10837d8
 // --- basic block ---
-L_108313c:
-// 0x0108313c: 0x108313c: lw    v1, 836(v0)
+L_1083760:
+// 0x01083760: 0x1083760: lw    v1, 836(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4469,7 +4469,7 @@ L_108313c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083140: 0x1083140: lw    a3, 2428(a0)
+// 0x01083764: 0x1083764: lw    a3, 2428(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4478,17 +4478,17 @@ L_108313c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01083144: 0x1083144: sll   zero, zero, 0
-// 0x01083148: 0x1083148: slt   a3, a3, v1
+// 0x01083768: 0x1083768: sll   zero, zero, 0
+// 0x0108376c: 0x108376c: slt   a3, a3, v1
 	ldloc 4
 	ldloc 6
 	clt
 	stloc 4
-// 0x0108314c: 0x108314c: beq   a3, zero, 0x108315c sll   zero, zero, 0
+// 0x01083770: 0x1083770: beq   a3, zero, 0x1083780 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_108315c
+	brfalse L_1083780
 // --- basic block ---
-// 0x01083154: 0x1083154: j	 0x1083174 sw    v1, 2428(a0)
+// 0x01083778: 0x1083778: j	 0x1083798 sw    v1, 2428(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4497,10 +4497,10 @@ L_108313c:
 	add
 	ldloc 6
 	stelem.i4
-	br L_1083174
+	br L_1083798
 // --- basic block ---
-L_108315c:
-// 0x0108315c: 0x108315c: lw    a3, 2436(a0)
+L_1083780:
+// 0x01083780: 0x1083780: lw    a3, 2436(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4509,17 +4509,17 @@ L_108315c:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01083160: 0x1083160: sll   zero, zero, 0
-// 0x01083164: 0x1083164: slt   a3, v1, a3
+// 0x01083784: 0x1083784: sll   zero, zero, 0
+// 0x01083788: 0x1083788: slt   a3, v1, a3
 	ldloc 6
 	ldloc 4
 	clt
 	stloc 4
-// 0x01083168: 0x1083168: beq   a3, zero, 0x1083174 sll   zero, zero, 0
+// 0x0108378c: 0x108378c: beq   a3, zero, 0x1083798 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1083174
+	brfalse L_1083798
 // --- basic block ---
-// 0x01083170: 0x1083170: sw    v1, 2436(a0)
+// 0x01083794: 0x1083794: sw    v1, 2436(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4528,8 +4528,8 @@ L_108315c:
 	add
 	ldloc 6
 	stelem.i4
-L_1083174:
-// 0x01083174: 0x1083174: lw    v1, 840(v0)
+L_1083798:
+// 0x01083798: 0x1083798: lw    v1, 840(v0)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
@@ -4538,7 +4538,7 @@ L_1083174:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083178: 0x1083178: lw    a3, 2432(a0)
+// 0x0108379c: 0x108379c: lw    a3, 2432(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4547,17 +4547,17 @@ L_1083174:
 	add
 	ldelem.i4
 	stloc 4
-// 0x0108317c: 0x108317c: sll   zero, zero, 0
-// 0x01083180: 0x1083180: slt   a3, a3, v1
+// 0x010837a0: 0x10837a0: sll   zero, zero, 0
+// 0x010837a4: 0x10837a4: slt   a3, a3, v1
 	ldloc 4
 	ldloc 6
 	clt
 	stloc 4
-// 0x01083184: 0x1083184: beq   a3, zero, 0x1083194 sll   zero, zero, 0
+// 0x010837a8: 0x10837a8: beq   a3, zero, 0x10837b8 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_1083194
+	brfalse L_10837b8
 // --- basic block ---
-// 0x0108318c: 0x108318c: j	 0x10831ac sw    v1, 2432(a0)
+// 0x010837b0: 0x10837b0: j	 0x10837d0 sw    v1, 2432(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4566,10 +4566,10 @@ L_1083174:
 	add
 	ldloc 6
 	stelem.i4
-	br L_10831ac
+	br L_10837d0
 // --- basic block ---
-L_1083194:
-// 0x01083194: 0x1083194: lw    a3, 2440(a0)
+L_10837b8:
+// 0x010837b8: 0x10837b8: lw    a3, 2440(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4578,17 +4578,17 @@ L_1083194:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01083198: 0x1083198: sll   zero, zero, 0
-// 0x0108319c: 0x108319c: slt   a3, v1, a3
+// 0x010837bc: 0x10837bc: sll   zero, zero, 0
+// 0x010837c0: 0x10837c0: slt   a3, v1, a3
 	ldloc 6
 	ldloc 4
 	clt
 	stloc 4
-// 0x010831a0: 0x10831a0: beq   a3, zero, 0x10831ac sll   zero, zero, 0
+// 0x010837c4: 0x10837c4: beq   a3, zero, 0x10837d0 sll   zero, zero, 0
 	ldloc 4
-	brfalse L_10831ac
+	brfalse L_10837d0
 // --- basic block ---
-// 0x010831a8: 0x10831a8: sw    v1, 2440(a0)
+// 0x010837cc: 0x10837cc: sw    v1, 2440(a0)
 	ldloc 5
 	ldloc.1
 	ldc.i4.2
@@ -4597,42 +4597,42 @@ L_1083194:
 	add
 	ldloc 6
 	stelem.i4
-L_10831ac:
-// 0x010831ac: 0x10831ac: addiu a1, a1, 1
+L_10837d0:
+// 0x010837d0: 0x10837d0: addiu a1, a1, 1
 	ldloc.2
 	ldc.i4.1
 	add
 	stloc.2
-// 0x010831b0: 0x10831b0: addiu v0, v0, 8
+// 0x010837d4: 0x10837d4: addiu v0, v0, 8
 	ldloc 7
 	ldc.i4.8
 	add
 	stloc 7
-L_10831b4:
-// 0x010831b4: 0x10831b4: slt   v1, a1, a2
+L_10837d8:
+// 0x010837d8: 0x10837d8: slt   v1, a1, a2
 	ldloc.2
 	ldloc.3
 	clt
 	stloc 6
-// 0x010831b8: 0x10831b8: bne   v1, zero, 0x108313c sll   zero, zero, 0
+// 0x010837dc: 0x10837dc: bne   v1, zero, 0x1083760 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_108313c
+	brtrue L_1083760
 // --- basic block ---
-// 0x010831c0: 0x10831c0: jal   0x1082fc4 sll   zero, zero, 0
+// 0x010837e4: 0x10837e4: jal   0x10835e8 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_GenerateAlert_1082fc4(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_GenerateAlert_10835e8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 7
 // --- basic block ---
-L_10831c8:
-// 0x010831c8: 0x10831c8: lw    ra, 28(sp)
-// 0x010831cc: 0x10831cc: sll   zero, zero, 0
-// 0x010831d0: 0x10831d0: jr    ra addiu sp, sp, 32
+L_10837ec:
+// 0x010837ec: 0x10837ec: lw    ra, 28(sp)
+// 0x010837f0: 0x10837f0: sll   zero, zero, 0
+// 0x010837f4: 0x10837f4: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -4644,7 +4644,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RTTrafficInfo_Remove_10831d8(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Remove_10837fc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 t1,int32 v1,int32 t0,int32 t2,int32 t3,int32 ra)
@@ -4691,23 +4691,23 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010831d8: 0x10831d8: lui   v0, 0x80000
+// 0x010837fc: 0x10837fc: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x010831dc: 0x10831dc: addiu v0, v0, -8180
+// 0x01083800: 0x1083800: addiu v0, v0, -7716
 	ldloc 5
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 5
-// 0x010831e0: 0x10831e0: addiu sp, sp, -24
+// 0x01083804: 0x1083804: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010831e4: 0x10831e4: addu  v1, v0, zero
+// 0x01083808: 0x1083808: addu  v1, v0, zero
 	ldloc 5
 	stloc 8
-// 0x010831e8: 0x10831e8: lw    a2, 2000(v0)
+// 0x0108380c: 0x108380c: lw    a2, 2000(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4716,102 +4716,102 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.3
-// 0x010831ec: 0x10831ec: sw    ra, 20(sp)
-// 0x010831f0: 0x10831f0: j	 0x10832cc addu  v0, zero, zero
+// 0x01083810: 0x1083810: sw    ra, 20(sp)
+// 0x01083814: 0x1083814: j	 0x10838f0 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_10832cc
+	br L_10838f0
 // --- basic block ---
-L_10831f8:
-// 0x010831f8: 0x10831f8: lw    a1, 0(v1)
+L_108381c:
+// 0x0108381c: 0x108381c: lw    a1, 0(v1)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010831fc: 0x10831fc: sll   zero, zero, 0
-// 0x01083200: 0x1083200: lw    a1, 0(a1)
+// 0x01083820: 0x1083820: sll   zero, zero, 0
+// 0x01083824: 0x1083824: lw    a1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01083204: 0x1083204: sll   zero, zero, 0
-// 0x01083208: 0x1083208: beq   a1, a0, 0x1083218 addiu v1, v1, 4
+// 0x01083828: 0x1083828: sll   zero, zero, 0
+// 0x0108382c: 0x108382c: beq   a1, a0, 0x108383c addiu v1, v1, 4
 	ldloc.2
 	ldloc.1
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	beq  L_1083218
+	beq  L_108383c
 // --- basic block ---
-// 0x01083210: 0x1083210: j	 0x10832cc addiu v0, v0, 1
+// 0x01083834: 0x1083834: j	 0x10838f0 addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-	br L_10832cc
+	br L_10838f0
 // --- basic block ---
-L_1083218:
-// 0x01083218: 0x1083218: addiu t0, a2, -1
+L_108383c:
+// 0x0108383c: 0x108383c: addiu t0, a2, -1
 	ldloc.3
 	ldc.i4.m1
 	add
 	stloc 9
-// 0x0108321c: 0x108321c: lui   a3, 0x80000
+// 0x01083840: 0x1083840: lui   a3, 0x80000
 	ldc.i4 524288
 	stloc 4
-// 0x01083220: 0x1083220: addiu a3, a3, -8180
+// 0x01083844: 0x1083844: addiu a3, a3, -7716
 	ldloc 4
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 4
-// 0x01083224: 0x1083224: sll   v0, v0, 2
+// 0x01083848: 0x1083848: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01083228: 0x1083228: sll   t1, t0, 2
+// 0x0108384c: 0x108384c: sll   t1, t0, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x0108322c: 0x108322c: lui   a2, 0x80000
+// 0x01083850: 0x1083850: lui   a2, 0x80000
 	ldc.i4 524288
 	stloc.3
-// 0x01083230: 0x1083230: addu  t1, t1, a3
+// 0x01083854: 0x1083854: addu  t1, t1, a3
 	ldloc 7
 	ldloc 4
 	add
 	stloc 7
-// 0x01083234: 0x1083234: addu  v0, v0, a3
+// 0x01083858: 0x1083858: addu  v0, v0, a3
 	ldloc 5
 	ldloc 4
 	add
 	stloc 5
-// 0x01083238: 0x1083238: addiu a2, a2, -6176
+// 0x0108385c: 0x108385c: addiu a2, a2, -5712
 	ldloc.3
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc.3
-// 0x0108323c: 0x108323c: lw    t2, 0(v0)
+// 0x01083860: 0x1083860: lw    t2, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01083240: 0x1083240: lw    t3, 0(t1)
+// 0x01083864: 0x1083864: lw    t3, 0(t1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01083244: 0x1083244: lw    v1, 4000(a2)
+// 0x01083868: 0x1083868: lw    v1, 4000(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4820,14 +4820,14 @@ L_1083218:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01083248: 0x1083248: sw    t3, 0(v0)
+// 0x0108386c: 0x108386c: sw    t3, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x0108324c: 0x108324c: sw    t0, 2000(a3)
+// 0x01083870: 0x1083870: sw    t0, 2000(a3)
 	ldloc 6
 	ldloc 4
 	ldc.i4.2
@@ -4836,7 +4836,7 @@ L_1083218:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01083250: 0x1083250: beq   v1, zero, 0x10832b4 sw    t2, 0(t1)
+// 0x01083874: 0x1083874: beq   v1, zero, 0x10838d8 sw    t2, 0(t1)
 	ldloc 8
 	ldloc 6
 	ldloc 7
@@ -4844,26 +4844,26 @@ L_1083218:
 	shr.un
 	ldloc 10
 	stelem.i4
-	brfalse L_10832b4
+	brfalse L_10838d8
 // --- basic block ---
-// 0x01083258: 0x1083258: addu  v0, zero, zero
+// 0x0108387c: 0x108387c: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-// 0x0108325c: 0x108325c: j	 0x10832a0 addu  a3, a2, zero
+// 0x01083880: 0x1083880: j	 0x10838c4 addu  a3, a2, zero
 	ldloc.3
 	stloc 4
-	br L_10832a0
+	br L_10838c4
 // --- basic block ---
-L_1083264:
-// 0x01083264: 0x1083264: lw    t2, 0(t0)
+L_1083888:
+// 0x01083888: 0x1083888: lw    t2, 0(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01083268: 0x1083268: sll   zero, zero, 0
-// 0x0108326c: 0x108326c: lw    t1, 68(t2)
+// 0x0108388c: 0x108388c: sll   zero, zero, 0
+// 0x01083890: 0x1083890: lw    t1, 68(t2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4872,77 +4872,77 @@ L_1083264:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01083270: 0x1083270: sll   zero, zero, 0
-// 0x01083274: 0x1083274: bne   t1, a0, 0x108329c sll   zero, zero, 0
+// 0x01083894: 0x1083894: sll   zero, zero, 0
+// 0x01083898: 0x1083898: bne   t1, a0, 0x10838c0 sll   zero, zero, 0
 	ldloc 7
 	ldloc.1
-	bne.un L_108329c
+	bne.un L_10838c0
 // --- basic block ---
-// 0x0108327c: 0x108327c: addiu v1, v1, -1
+// 0x010838a0: 0x10838a0: addiu v1, v1, -1
 	ldloc 8
 	ldc.i4.m1
 	add
 	stloc 8
-// 0x01083280: 0x1083280: sll   t1, v1, 2
+// 0x010838a4: 0x10838a4: sll   t1, v1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 7
-// 0x01083284: 0x1083284: addu  t1, t1, a3
+// 0x010838a8: 0x10838a8: addu  t1, t1, a3
 	ldloc 7
 	ldloc 4
 	add
 	stloc 7
-// 0x01083288: 0x1083288: lw    t3, 0(t1)
+// 0x010838ac: 0x10838ac: lw    t3, 0(t1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x0108328c: 0x108328c: sll   zero, zero, 0
-// 0x01083290: 0x1083290: sw    t3, 0(t0)
+// 0x010838b0: 0x10838b0: sll   zero, zero, 0
+// 0x010838b4: 0x10838b4: sw    t3, 0(t0)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x01083294: 0x1083294: j	 0x10832a0 sw    t2, 0(t1)
+// 0x010838b8: 0x10838b8: j	 0x10838c4 sw    t2, 0(t1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldloc 10
 	stelem.i4
-	br L_10832a0
+	br L_10838c4
 // --- basic block ---
-L_108329c:
-// 0x0108329c: 0x108329c: addiu v0, v0, 1
+L_10838c0:
+// 0x010838c0: 0x10838c0: addiu v0, v0, 1
 	ldloc 5
 	ldc.i4.1
 	add
 	stloc 5
-L_10832a0:
-// 0x010832a0: 0x10832a0: sll   t0, v0, 2
+L_10838c4:
+// 0x010838c4: 0x10838c4: sll   t0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x010832a4: 0x10832a4: slt   t1, v0, v1
+// 0x010838c8: 0x10838c8: slt   t1, v0, v1
 	ldloc 5
 	ldloc 8
 	clt
 	stloc 7
-// 0x010832a8: 0x10832a8: bne   t1, zero, 0x1083264 addu  t0, a3, t0
+// 0x010838cc: 0x10838cc: bne   t1, zero, 0x1083888 addu  t0, a3, t0
 	ldloc 7
 	ldloc 4
 	ldloc 9
 	add
 	stloc 9
-	brtrue L_1083264
+	brtrue L_1083888
 // --- basic block ---
-// 0x010832b0: 0x10832b0: sw    v1, 4000(a2)
+// 0x010838d4: 0x10838d4: sw    v1, 4000(a2)
 	ldloc 6
 	ldloc.3
 	ldc.i4.2
@@ -4951,16 +4951,16 @@ L_10832a0:
 	add
 	ldloc 8
 	stelem.i4
-L_10832b4:
-// 0x010832b4: 0x10832b4: lui   a0, 0x10000
+L_10838d8:
+// 0x010838d8: 0x10838d8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010832b8: 0x10832b8: ori   a0, a0, 34464
+// 0x010838dc: 0x10838dc: ori   a0, a0, 34464
 	ldloc.1
 	ldc.i4 34464
 	or
 	stloc.1
-// 0x010832bc: 0x10832bc: jal   0x107a718 addu  a0, a1, a0
+// 0x010838e0: 0x10838e0: jal   0x107ad3c addu  a0, a1, a0
 	ldloc.2
 	ldloc.1
 	add
@@ -4970,33 +4970,33 @@ L_10832b4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::RTAlerts_Remove_107a718(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::RTAlerts_Remove_107ad3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010832c4: 0x10832c4: j	 0x10832dc addiu v0, zero, 1
+// 0x010838e8: 0x10838e8: j	 0x1083900 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_10832dc
+	br L_1083900
 // --- basic block ---
-L_10832cc:
-// 0x010832cc: 0x10832cc: slt   a1, v0, a2
+L_10838f0:
+// 0x010838f0: 0x10838f0: slt   a1, v0, a2
 	ldloc 5
 	ldloc.3
 	clt
 	stloc.2
-// 0x010832d0: 0x10832d0: bne   a1, zero, 0x10831f8 sll   zero, zero, 0
+// 0x010838f4: 0x10838f4: bne   a1, zero, 0x108381c sll   zero, zero, 0
 	ldloc.2
-	brtrue L_10831f8
+	brtrue L_108381c
 // --- basic block ---
-// 0x010832d8: 0x10832d8: addu  v0, zero, zero
+// 0x010838fc: 0x10838fc: addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-L_10832dc:
-// 0x010832dc: 0x10832dc: lw    ra, 20(sp)
-// 0x010832e0: 0x10832e0: sll   zero, zero, 0
-// 0x010832e4: 0x10832e4: jr    ra addiu sp, sp, 24
+L_1083900:
+// 0x01083900: 0x1083900: lw    ra, 20(sp)
+// 0x01083904: 0x1083904: sll   zero, zero, 0
+// 0x01083908: 0x1083908: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -5008,7 +5008,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTTrafficInfo_UnitChangeCb_10832ec(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_UnitChangeCb_1083910(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 s0,int32 s1,int32 v1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -5058,12 +5058,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010832ec: 0x10832ec: addiu sp, sp, -40
+// 0x01083910: 0x1083910: addiu sp, sp, -40
 	ldloc.0
 	ldc.i4.s -40
 	add
 	stloc.0
-// 0x010832f0: 0x10832f0: sw    s0, 16(sp)
+// 0x01083914: 0x1083914: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5072,18 +5072,18 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010832f4: 0x10832f4: lui   s0, 0x80000
+// 0x01083918: 0x1083918: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x010832f8: 0x10832f8: addiu s0, s0, -8180
+// 0x0108391c: 0x108391c: addiu s0, s0, -7716
 	ldloc 7
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 7
-// 0x010832fc: 0x10832fc: lui   v0, 0x20000
+// 0x01083920: 0x1083920: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01083300: 0x1083300: sw    s4, 32(sp)
+// 0x01083924: 0x1083924: sw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5092,7 +5092,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01083304: 0x1083304: sw    s3, 28(sp)
+// 0x01083928: 0x1083928: sw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5101,7 +5101,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01083308: 0x1083308: sw    s1, 20(sp)
+// 0x0108392c: 0x108392c: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5110,8 +5110,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108330c: 0x108330c: sw    ra, 36(sp)
-// 0x01083310: 0x1083310: sw    s2, 24(sp)
+// 0x01083930: 0x1083930: sw    ra, 36(sp)
+// 0x01083934: 0x1083934: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5120,33 +5120,33 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01083314: 0x1083314: lw    s4, 23640(v0)
+// 0x01083938: 0x1083938: lw    s4, 24100(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 5910
+	ldc.i4 6025
 	add
 	ldelem.i4
 	stloc 12
-// 0x01083318: 0x1083318: addu  s1, zero, zero
+// 0x0108393c: 0x108393c: addu  s1, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x0108331c: 0x108331c: j	 0x1083358 addu  s3, s0, zero
+// 0x01083940: 0x1083940: j	 0x108397c addu  s3, s0, zero
 	ldloc 7
 	stloc 11
-	br L_1083358
+	br L_108397c
 // --- basic block ---
-L_1083324:
-// 0x01083324: 0x1083324: lw    s2, 0(s0)
+L_1083948:
+// 0x01083948: 0x1083948: lw    s2, 0(s0)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01083328: 0x1083328: sll   zero, zero, 0
-// 0x0108332c: 0x108332c: lw    a0, 4(s2)
+// 0x0108394c: 0x108394c: sll   zero, zero, 0
+// 0x01083950: 0x1083950: lw    a0, 4(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5155,7 +5155,7 @@ L_1083324:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01083330: 0x1083330: jal   0x10c09ac addiu s0, s0, 4
+// 0x01083954: 0x1083954: jal   0x10c0fec addiu s0, s0, 4
 	ldloc 7
 	ldc.i4.4
 	add
@@ -5165,7 +5165,7 @@ L_1083324:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01083338: 0x1083338: jal   0x1007e8c addu  a0, v0, zero
+// 0x0108395c: 0x108395c: jal   0x1007e9c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5173,23 +5173,23 @@ L_1083324:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_meters_p_second_to_speed_unit_1007e8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_meters_p_second_to_speed_unit_1007e9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 5
 // --- basic block ---
-// 0x01083340: 0x1083340: addu  a0, v0, zero
+// 0x01083964: 0x1083964: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01083344: 0x1083344: jal   0x10c06d0 addu  a1, s4, zero
+// 0x01083968: 0x1083968: jal   0x10c0d10 addu  a1, s4, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x0108334c: 0x108334c: jal   0x10c08bc addu  a0, v0, zero
+// 0x01083970: 0x1083970: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -5197,7 +5197,7 @@ L_1083324:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01083354: 0x1083354: sw    v0, 8(s2)
+// 0x01083978: 0x1083978: sw    v0, 8(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -5206,8 +5206,8 @@ L_1083324:
 	add
 	ldloc 5
 	stelem.i4
-L_1083358:
-// 0x01083358: 0x1083358: lw    v0, 2000(s3)
+L_108397c:
+// 0x0108397c: 0x108397c: lw    v0, 2000(s3)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
@@ -5216,38 +5216,38 @@ L_1083358:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108335c: 0x108335c: sll   zero, zero, 0
-// 0x01083360: 0x1083360: slt   v0, s1, v0
+// 0x01083980: 0x1083980: sll   zero, zero, 0
+// 0x01083984: 0x1083984: slt   v0, s1, v0
 	ldloc 8
 	ldloc 5
 	clt
 	stloc 5
-// 0x01083364: 0x1083364: bne   v0, zero, 0x1083324 addiu s1, s1, 1
+// 0x01083988: 0x1083988: bne   v0, zero, 0x1083948 addiu s1, s1, 1
 	ldloc 5
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-	brtrue L_1083324
+	brtrue L_1083948
 // --- basic block ---
-// 0x0108336c: 0x108336c: lui   v0, 0x80000
+// 0x01083990: 0x1083990: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01083370: 0x1083370: lw    v0, -8184(v0)
+// 0x01083994: 0x1083994: lw    v0, -7720(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2046
+	ldc.i4 -1930
 	add
 	ldelem.i4
 	stloc 5
-// 0x01083374: 0x1083374: sll   zero, zero, 0
-// 0x01083378: 0x1083378: beq   v0, zero, 0x1083388 sll   zero, zero, 0
+// 0x01083998: 0x1083998: sll   zero, zero, 0
+// 0x0108399c: 0x108399c: beq   v0, zero, 0x10839ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1083388
+	brfalse L_10839ac
 // --- basic block ---
-// 0x01083380: 0x1083380: jalr  v0 sll   zero, zero, 0
+// 0x010839a4: 0x10839a4: jalr  v0 sll   zero, zero, 0
 	ldloc 5
 	ldloc.0
 	ldloc.1
@@ -5259,9 +5259,9 @@ L_1083358:
 	stloc 9
 	stloc 5
 // --- basic block ---
-L_1083388:
-// 0x01083388: 0x1083388: lw    ra, 36(sp)
-// 0x0108338c: 0x108338c: lw    s4, 32(sp)
+L_10839ac:
+// 0x010839ac: 0x10839ac: lw    ra, 36(sp)
+// 0x010839b0: 0x10839b0: lw    s4, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5270,7 +5270,7 @@ L_1083388:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01083390: 0x1083390: lw    s3, 28(sp)
+// 0x010839b4: 0x10839b4: lw    s3, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5279,7 +5279,7 @@ L_1083388:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01083394: 0x1083394: lw    s2, 24(sp)
+// 0x010839b8: 0x10839b8: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5288,7 +5288,7 @@ L_1083388:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01083398: 0x1083398: lw    s1, 20(sp)
+// 0x010839bc: 0x10839bc: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5297,7 +5297,7 @@ L_1083388:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108339c: 0x108339c: lw    s0, 16(sp)
+// 0x010839c0: 0x10839c0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5306,7 +5306,7 @@ L_1083388:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010833a0: 0x10833a0: jr    ra addiu sp, sp, 40
+// 0x010839c4: 0x10839c4: jr    ra addiu sp, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
@@ -5318,7 +5318,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTTrafficInfo_Add_10833a8(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Add_10839cc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s1,int32[] mem,int32 v1,int32 s2,int32 s0,int32 s3,int32 ra)
@@ -5365,20 +5365,20 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010833a8: 0x10833a8: lui   v1, 0x80000
+// 0x010839cc: 0x10839cc: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x010833ac: 0x10833ac: addiu sp, sp, -72
+// 0x010839d0: 0x10839d0: addiu sp, sp, -72
 	ldloc.0
 	ldc.i4.s -72
 	add
 	stloc.0
-// 0x010833b0: 0x10833b0: addiu v1, v1, -8180
+// 0x010839d4: 0x10839d4: addiu v1, v1, -7716
 	ldloc 8
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 8
-// 0x010833b4: 0x10833b4: sw    s2, 60(sp)
+// 0x010839d8: 0x10839d8: sw    s2, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5387,7 +5387,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x010833b8: 0x10833b8: lw    s2, 2000(v1)
+// 0x010839dc: 0x10839dc: lw    s2, 2000(v1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
@@ -5396,7 +5396,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010833bc: 0x10833bc: sw    s0, 52(sp)
+// 0x010839e0: 0x10839e0: sw    s0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5405,14 +5405,14 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x010833c0: 0x10833c0: addu  s0, a0, zero
+// 0x010839e4: 0x10839e4: addu  s0, a0, zero
 	ldloc.1
 	stloc 10
-// 0x010833c4: 0x10833c4: addiu a0, zero, 500
+// 0x010839e8: 0x10839e8: addiu a0, zero, 500
 	ldc.i4 500
 	stloc.1
-// 0x010833c8: 0x10833c8: sw    ra, 68(sp)
-// 0x010833cc: 0x10833cc: sw    s3, 64(sp)
+// 0x010839ec: 0x10839ec: sw    ra, 68(sp)
+// 0x010839f0: 0x10839f0: sw    s3, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5421,7 +5421,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x010833d0: 0x10833d0: sw    s1, 56(sp)
+// 0x010839f4: 0x10839f4: sw    s1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5430,74 +5430,74 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010833d4: 0x10833d4: beq   s2, a0, 0x1083814 addu  v0, zero, zero
+// 0x010839f8: 0x10839f8: beq   s2, a0, 0x1083e38 addu  v0, zero, zero
 	ldloc 9
 	ldloc.1
 	ldc.i4.s 0
 	stloc 5
-	beq  L_1083814
+	beq  L_1083e38
 // --- basic block ---
-// 0x010833dc: 0x10833dc: lw    v0, 0(s0)
+// 0x01083a00: 0x1083a00: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010833e0: 0x10833e0: j	 0x108342c addu  a0, zero, zero
+// 0x01083a04: 0x1083a04: j	 0x1083a50 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_108342c
+	br L_1083a50
 // --- basic block ---
-L_10833e8:
-// 0x010833e8: 0x10833e8: lw    a1, 0(v1)
+L_1083a0c:
+// 0x01083a0c: 0x1083a0c: lw    a1, 0(v1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010833ec: 0x10833ec: sll   zero, zero, 0
-// 0x010833f0: 0x10833f0: lw    a1, 0(a1)
+// 0x01083a10: 0x1083a10: sll   zero, zero, 0
+// 0x01083a14: 0x1083a14: lw    a1, 0(a1)
 	ldloc 7
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x010833f4: 0x10833f4: sll   zero, zero, 0
-// 0x010833f8: 0x10833f8: bne   a1, v0, 0x1083428 addiu v1, v1, 4
+// 0x01083a18: 0x1083a18: sll   zero, zero, 0
+// 0x01083a1c: 0x1083a1c: bne   a1, v0, 0x1083a4c addiu v1, v1, 4
 	ldloc.2
 	ldloc 5
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	bne.un L_1083428
+	bne.un L_1083a4c
 // --- basic block ---
-// 0x01083400: 0x1083400: lui   a1, 0x20000
+// 0x01083a24: 0x1083a24: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01083404: 0x1083404: lui   a3, 0x20000
+// 0x01083a28: 0x1083a28: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01083408: 0x1083408: addiu a1, a1, -22668
+// 0x01083a2c: 0x1083a2c: addiu a1, a1, -22204
 	ldloc.2
-	ldc.i4 -22668
+	ldc.i4 -22204
 	add
 	stloc.2
-// 0x0108340c: 0x108340c: addiu a3, a3, -22568
+// 0x01083a30: 0x1083a30: addiu a3, a3, -22104
 	ldloc 4
-	ldc.i4 -22568
+	ldc.i4 -22104
 	add
 	stloc 4
-// 0x01083410: 0x1083410: addiu a0, zero, 2
+// 0x01083a34: 0x1083a34: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-// 0x01083414: 0x1083414: addiu a2, zero, 456
+// 0x01083a38: 0x1083a38: addiu a2, zero, 456
 	ldc.i4 456
 	stloc.3
-// 0x01083418: 0x1083418: jal   0x100449c sw    v0, 16(sp)
+// 0x01083a3c: 0x1083a3c: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5516,57 +5516,57 @@ L_10833e8:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083420: 0x1083420: j	 0x1083814 addiu v0, zero, 1
+// 0x01083a44: 0x1083a44: j	 0x1083e38 addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-	br L_1083814
+	br L_1083e38
 // --- basic block ---
-L_1083428:
-// 0x01083428: 0x1083428: addiu a0, a0, 1
+L_1083a4c:
+// 0x01083a4c: 0x1083a4c: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-L_108342c:
-// 0x0108342c: 0x108342c: slt   a1, a0, s2
+L_1083a50:
+// 0x01083a50: 0x1083a50: slt   a1, a0, s2
 	ldloc.1
 	ldloc 9
 	clt
 	stloc.2
-// 0x01083430: 0x1083430: bne   a1, zero, 0x10833e8 lui   s1, 0x80000
+// 0x01083a54: 0x1083a54: bne   a1, zero, 0x1083a0c lui   s1, 0x80000
 	ldloc.2
 	ldc.i4 524288
 	stloc 6
-	brtrue L_10833e8
+	brtrue L_1083a0c
 // --- basic block ---
-// 0x01083438: 0x1083438: sll   s2, s2, 2
+// 0x01083a5c: 0x1083a5c: sll   s2, s2, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 9
-// 0x0108343c: 0x108343c: addiu s1, s1, -8180
+// 0x01083a60: 0x1083a60: addiu s1, s1, -7716
 	ldloc 6
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 6
-// 0x01083440: 0x1083440: addu  s2, s2, s1
+// 0x01083a64: 0x1083a64: addu  s2, s2, s1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01083444: 0x1083444: lw    v0, 0(s2)
+// 0x01083a68: 0x1083a68: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01083448: 0x1083448: sll   zero, zero, 0
-// 0x0108344c: 0x108344c: bne   v0, zero, 0x10834bc sll   zero, zero, 0
+// 0x01083a6c: 0x1083a6c: sll   zero, zero, 0
+// 0x01083a70: 0x1083a70: bne   v0, zero, 0x1083ae0 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10834bc
+	brtrue L_1083ae0
 // --- basic block ---
-// 0x01083454: 0x1083454: jal   0x1000910 addiu a0, zero, 2700
+// 0x01083a78: 0x1083a78: jal   0x1000910 addiu a0, zero, 2700
 	ldc.i4 2700
 	stloc.1
 	ldloc.0
@@ -5579,16 +5579,16 @@ L_108342c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108345c: 0x108345c: addu  a0, v0, zero
+// 0x01083a80: 0x1083a80: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01083460: 0x1083460: addu  a1, zero, zero
+// 0x01083a84: 0x1083a84: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01083464: 0x1083464: addiu a2, zero, 2700
+// 0x01083a88: 0x1083a88: addiu a2, zero, 2700
 	ldc.i4 2700
 	stloc.3
-// 0x01083468: 0x1083468: jal   0x100177c addu  s3, v0, zero
+// 0x01083a8c: 0x1083a8c: jal   0x100177c addu  s3, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
@@ -5600,7 +5600,7 @@ L_108342c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083470: 0x1083470: lw    v0, 2000(s1)
+// 0x01083a94: 0x1083a94: lw    v0, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5609,67 +5609,67 @@ L_108342c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01083474: 0x1083474: sw    s3, 0(s2)
+// 0x01083a98: 0x1083a98: sw    s3, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 11
 	stelem.i4
-// 0x01083478: 0x1083478: sll   v0, v0, 2
+// 0x01083a9c: 0x1083a9c: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0108347c: 0x108347c: addu  s1, v0, s1
+// 0x01083aa0: 0x1083aa0: addu  s1, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01083480: 0x1083480: lw    v0, 0(s1)
+// 0x01083aa4: 0x1083aa4: lw    v0, 0(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01083484: 0x1083484: sll   zero, zero, 0
-// 0x01083488: 0x1083488: bne   v0, zero, 0x10834c0 lui   s1, 0x80000
+// 0x01083aa8: 0x1083aa8: sll   zero, zero, 0
+// 0x01083aac: 0x1083aac: bne   v0, zero, 0x1083ae4 lui   s1, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 6
-	brtrue L_10834c0
+	brtrue L_1083ae4
 // --- basic block ---
-// 0x01083490: 0x1083490: lw    v0, 0(s0)
+// 0x01083ab4: 0x1083ab4: lw    v0, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01083494: 0x1083494: lui   a1, 0x20000
+// 0x01083ab8: 0x1083ab8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01083498: 0x1083498: lui   a3, 0x20000
+// 0x01083abc: 0x1083abc: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x0108349c: 0x108349c: addiu a1, a1, -22668
+// 0x01083ac0: 0x1083ac0: addiu a1, a1, -22204
 	ldloc.2
-	ldc.i4 -22668
+	ldc.i4 -22204
 	add
 	stloc.2
-// 0x010834a0: 0x10834a0: addiu a3, a3, -22508
+// 0x01083ac4: 0x1083ac4: addiu a3, a3, -22044
 	ldloc 4
-	ldc.i4 -22508
+	ldc.i4 -22044
 	add
 	stloc 4
-// 0x010834a4: 0x10834a4: addiu a0, zero, 4
+// 0x01083ac8: 0x1083ac8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x010834a8: 0x10834a8: addiu a2, zero, 464
+// 0x01083acc: 0x1083acc: addiu a2, zero, 464
 	ldc.i4 464
 	stloc.3
-// 0x010834ac: 0x10834ac: jal   0x100449c sw    v0, 16(sp)
+// 0x01083ad0: 0x1083ad0: jal   0x100449c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5688,22 +5688,22 @@ L_108342c:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010834b4: 0x10834b4: j	 0x1083814 addu  v0, zero, zero
+// 0x01083ad8: 0x1083ad8: j	 0x1083e38 addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 5
-	br L_1083814
+	br L_1083e38
 // --- basic block ---
-L_10834bc:
-// 0x010834bc: 0x10834bc: lui   s1, 0x80000
+L_1083ae0:
+// 0x01083ae0: 0x1083ae0: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 6
-L_10834c0:
-// 0x010834c0: 0x10834c0: addiu s1, s1, -8180
+L_1083ae4:
+// 0x01083ae4: 0x1083ae4: addiu s1, s1, -7716
 	ldloc 6
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 6
-// 0x010834c4: 0x10834c4: lw    v0, 2000(s1)
+// 0x01083ae8: 0x1083ae8: lw    v0, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5712,30 +5712,30 @@ L_10834c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010834c8: 0x10834c8: sll   zero, zero, 0
-// 0x010834cc: 0x10834cc: sll   v0, v0, 2
+// 0x01083aec: 0x1083aec: sll   zero, zero, 0
+// 0x01083af0: 0x1083af0: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010834d0: 0x10834d0: addu  v0, v0, s1
+// 0x01083af4: 0x1083af4: addu  v0, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x010834d4: 0x10834d4: lw    a0, 0(v0)
+// 0x01083af8: 0x1083af8: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010834d8: 0x10834d8: jal   0x1082848 sll   zero, zero, 0
+// 0x01083afc: 0x1083afc: jal   0x1082e6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl98::RTTrafficInfo_InitRecord_1082848(int32)
+	call int32 Cibyl98::RTTrafficInfo_InitRecord_1082e6c(int32)
 	stloc 5
 // --- basic block ---
-// 0x010834e0: 0x10834e0: lw    v1, 2000(s1)
+// 0x01083b04: 0x1083b04: lw    v1, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5744,7 +5744,7 @@ L_10834c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010834e4: 0x10834e4: lw    v0, 4(s0)
+// 0x01083b08: 0x1083b08: lw    v0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5753,31 +5753,31 @@ L_10834c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010834e8: 0x10834e8: sll   v1, v1, 2
+// 0x01083b0c: 0x1083b0c: sll   v1, v1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-// 0x010834ec: 0x10834ec: addu  v1, v1, s1
+// 0x01083b10: 0x1083b10: addu  v1, v1, s1
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
-// 0x010834f0: 0x10834f0: lw    s2, 0(v1)
+// 0x01083b14: 0x1083b14: lw    s2, 0(v1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x010834f4: 0x10834f4: lw    v1, 0(s0)
+// 0x01083b18: 0x1083b18: lw    v1, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 8
-// 0x010834f8: 0x10834f8: sw    v0, 4(s2)
+// 0x01083b1c: 0x1083b1c: sw    v0, 4(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5786,7 +5786,7 @@ L_10834c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010834fc: 0x10834fc: lw    v0, 2696(s0)
+// 0x01083b20: 0x1083b20: lw    v0, 2696(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5795,7 +5795,7 @@ L_10834c0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01083500: 0x1083500: lw    a0, 4(s0)
+// 0x01083b24: 0x1083b24: lw    a0, 4(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5804,14 +5804,14 @@ L_10834c0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01083504: 0x1083504: sw    v1, 0(s2)
+// 0x01083b28: 0x1083b28: sw    v1, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldloc 8
 	stelem.i4
-// 0x01083508: 0x1083508: jal   0x10c09ac sw    v0, 2696(s2)
+// 0x01083b2c: 0x1083b2c: jal   0x10c0fec sw    v0, 2696(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5825,7 +5825,7 @@ L_10834c0:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01083510: 0x1083510: jal   0x1007e8c addu  a0, v0, zero
+// 0x01083b34: 0x1083b34: jal   0x1007e9c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -5833,32 +5833,32 @@ L_10834c0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_meters_p_second_to_speed_unit_1007e8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_meters_p_second_to_speed_unit_1007e9c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083518: 0x1083518: lui   v1, 0x20000
+// 0x01083b3c: 0x1083b3c: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 8
-// 0x0108351c: 0x108351c: lw    a1, 23640(v1)
+// 0x01083b40: 0x1083b40: lw    a1, 24100(v1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
-	ldc.i4 5910
+	ldc.i4 6025
 	add
 	ldelem.i4
 	stloc.2
-// 0x01083520: 0x1083520: jal   0x10c06d0 addu  a0, v0, zero
+// 0x01083b44: 0x1083b44: jal   0x10c0d10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__addsf3_10c06d0(int32,int32)
+	call int32 Cibyl143::__addsf3_10c0d10(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01083528: 0x1083528: jal   0x10c08bc addu  a0, v0, zero
+// 0x01083b4c: 0x1083b4c: jal   0x10c0efc addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
@@ -5866,7 +5866,7 @@ L_10834c0:
 	conv.i4
 	stloc 5
 // --- basic block ---
-// 0x01083530: 0x1083530: lw    v1, 12(s0)
+// 0x01083b54: 0x1083b54: lw    v1, 12(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -5875,7 +5875,7 @@ L_10834c0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01083534: 0x1083534: sw    v0, 8(s2)
+// 0x01083b58: 0x1083b58: sw    v0, 8(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -5884,48 +5884,48 @@ L_10834c0:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01083538: 0x1083538: sltiu v0, v1, 5
+// 0x01083b5c: 0x1083b5c: sltiu v0, v1, 5
 	ldloc 8
 	ldc.i4.5
 	clt.un
 	stloc 5
-// 0x0108353c: 0x108353c: beq   v0, zero, 0x10835d0 sll   v1, v1, 2
+// 0x01083b60: 0x1083b60: beq   v0, zero, 0x1083bf4 sll   v1, v1, 2
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 8
-	brfalse L_10835d0
+	brfalse L_1083bf4
 // --- basic block ---
-// 0x01083544: 0x1083544: lui   v0, 0x20000
+// 0x01083b68: 0x1083b68: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01083548: 0x1083548: addiu v0, v0, 29416
+// 0x01083b6c: 0x1083b6c: addiu v0, v0, 29880
 	ldloc 5
-	ldc.i4 29416
+	ldc.i4 29880
 	add
 	stloc 5
-// 0x0108354c: 0x108354c: addu  v1, v0, v1
+// 0x01083b70: 0x1083b70: addu  v1, v0, v1
 	ldloc 5
 	ldloc 8
 	add
 	stloc 8
-// 0x01083550: 0x1083550: lw    v0, 0(v1)
+// 0x01083b74: 0x1083b74: lw    v0, 0(v1)
 	ldloc 7
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01083554: 0x1083554: sll   zero, zero, 0
-// 0x01083558: 0x1083558: jr    v0 addu  s2, s1, zero
+// 0x01083b78: 0x1083b78: sll   zero, zero, 0
+// 0x01083b7c: 0x1083b7c: jr    v0 addu  s2, s1, zero
 	ldloc 5
 	ldloc 6
 	stloc 9
 	br __CIBYL_local_jumptab
 // --- basic block ---
-L_1083560:
-// 0x01083560: 0x1083560: lw    s1, 2000(s1)
+L_1083b84:
+// 0x01083b84: 0x1083b84: lw    s1, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5934,25 +5934,25 @@ L_1083560:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083564: 0x1083564: sll   zero, zero, 0
-// 0x01083568: 0x1083568: sll   s1, s1, 2
+// 0x01083b88: 0x1083b88: sll   zero, zero, 0
+// 0x01083b8c: 0x1083b8c: sll   s1, s1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x0108356c: 0x108356c: addu  s2, s2, s1
+// 0x01083b90: 0x1083b90: addu  s2, s2, s1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01083570: 0x1083570: lw    v0, 0(s2)
+// 0x01083b94: 0x1083b94: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01083574: 0x1083574: j	 0x10835d0 sw    zero, 12(v0)
+// 0x01083b98: 0x1083b98: j	 0x1083bf4 sw    zero, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -5961,10 +5961,10 @@ L_1083560:
 	add
 	ldc.i4.s 0
 	stelem.i4
-	br L_10835d0
+	br L_1083bf4
 // --- basic block ---
-L_108357c:
-// 0x0108357c: 0x108357c: lw    s1, 2000(s1)
+L_1083ba0:
+// 0x01083ba0: 0x1083ba0: lw    s1, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -5973,31 +5973,31 @@ L_108357c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083580: 0x1083580: sll   zero, zero, 0
-// 0x01083584: 0x1083584: sll   s1, s1, 2
+// 0x01083ba4: 0x1083ba4: sll   zero, zero, 0
+// 0x01083ba8: 0x1083ba8: sll   s1, s1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01083588: 0x1083588: addu  s2, s2, s1
+// 0x01083bac: 0x1083bac: addu  s2, s2, s1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x0108358c: 0x108358c: lw    v0, 0(s2)
+// 0x01083bb0: 0x1083bb0: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x01083590: 0x1083590: j	 0x10835cc addiu v1, zero, 1
+// 0x01083bb4: 0x1083bb4: j	 0x1083bf0 addiu v1, zero, 1
 	ldc.i4.1
 	stloc 8
-	br L_10835cc
+	br L_1083bf0
 // --- basic block ---
-L_1083598:
-// 0x01083598: 0x1083598: lw    s1, 2000(s1)
+L_1083bbc:
+// 0x01083bbc: 0x1083bbc: lw    s1, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6006,31 +6006,31 @@ L_1083598:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108359c: 0x108359c: sll   zero, zero, 0
-// 0x010835a0: 0x10835a0: sll   s1, s1, 2
+// 0x01083bc0: 0x1083bc0: sll   zero, zero, 0
+// 0x01083bc4: 0x1083bc4: sll   s1, s1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010835a4: 0x10835a4: addu  s2, s2, s1
+// 0x01083bc8: 0x1083bc8: addu  s2, s2, s1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x010835a8: 0x10835a8: lw    v0, 0(s2)
+// 0x01083bcc: 0x1083bcc: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010835ac: 0x10835ac: j	 0x10835cc addiu v1, zero, 2
+// 0x01083bd0: 0x1083bd0: j	 0x1083bf0 addiu v1, zero, 2
 	ldc.i4.2
 	stloc 8
-	br L_10835cc
+	br L_1083bf0
 // --- basic block ---
-L_10835b4:
-// 0x010835b4: 0x10835b4: lw    s1, 2000(s1)
+L_1083bd8:
+// 0x01083bd8: 0x1083bd8: lw    s1, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6039,29 +6039,29 @@ L_10835b4:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010835b8: 0x10835b8: addiu v1, zero, 3
+// 0x01083bdc: 0x1083bdc: addiu v1, zero, 3
 	ldc.i4.3
 	stloc 8
-// 0x010835bc: 0x10835bc: sll   s1, s1, 2
+// 0x01083be0: 0x1083be0: sll   s1, s1, 2
 	ldloc 6
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010835c0: 0x10835c0: addu  s2, s2, s1
+// 0x01083be4: 0x1083be4: addu  s2, s2, s1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x010835c4: 0x10835c4: lw    v0, 0(s2)
+// 0x01083be8: 0x1083be8: lw    v0, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010835c8: 0x10835c8: sll   zero, zero, 0
-L_10835cc:
-// 0x010835cc: 0x10835cc: sw    v1, 12(v0)
+// 0x01083bec: 0x1083bec: sll   zero, zero, 0
+L_1083bf0:
+// 0x01083bf0: 0x1083bf0: sw    v1, 12(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6070,16 +6070,16 @@ L_10835cc:
 	add
 	ldloc 8
 	stelem.i4
-L_10835d0:
-// 0x010835d0: 0x10835d0: lui   s1, 0x80000
+L_1083bf4:
+// 0x01083bf4: 0x1083bf4: lui   s1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010835d4: 0x10835d4: addiu s1, s1, -8180
+// 0x01083bf8: 0x1083bf8: addiu s1, s1, -7716
 	ldloc 6
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 6
-// 0x010835d8: 0x10835d8: lw    v0, 2000(s1)
+// 0x01083bfc: 0x1083bfc: lw    v0, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6088,32 +6088,32 @@ L_10835d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010835dc: 0x10835dc: addiu a1, s0, 221
+// 0x01083c00: 0x1083c00: addiu a1, s0, 221
 	ldloc 10
 	ldc.i4 221
 	add
 	stloc.2
-// 0x010835e0: 0x10835e0: sll   v0, v0, 2
+// 0x01083c04: 0x1083c04: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010835e4: 0x10835e4: addu  v0, v0, s1
+// 0x01083c08: 0x1083c08: addu  v0, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x010835e8: 0x10835e8: lw    a0, 0(v0)
+// 0x01083c0c: 0x1083c0c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x010835ec: 0x10835ec: addiu a2, zero, 200
+// 0x01083c10: 0x1083c10: addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
-// 0x010835f0: 0x10835f0: jal   0x1001af8 addiu a0, a0, 221
+// 0x01083c14: 0x1083c14: jal   0x1001af8 addiu a0, a0, 221
 	ldloc.1
 	ldc.i4 221
 	add
@@ -6124,7 +6124,7 @@ L_10835d0:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010835f8: 0x10835f8: lw    v0, 2000(s1)
+// 0x01083c1c: 0x1083c1c: lw    v0, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6133,32 +6133,32 @@ L_10835d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010835fc: 0x10835fc: addiu a1, s0, 20
+// 0x01083c20: 0x1083c20: addiu a1, s0, 20
 	ldloc 10
 	ldc.i4.s 20
 	add
 	stloc.2
-// 0x01083600: 0x1083600: sll   v0, v0, 2
+// 0x01083c24: 0x1083c24: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01083604: 0x1083604: addu  v0, v0, s1
+// 0x01083c28: 0x1083c28: addu  v0, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01083608: 0x1083608: lw    a0, 0(v0)
+// 0x01083c2c: 0x1083c2c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108360c: 0x108360c: addiu a2, zero, 200
+// 0x01083c30: 0x1083c30: addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
-// 0x01083610: 0x1083610: jal   0x1001af8 addiu a0, a0, 20
+// 0x01083c34: 0x1083c34: jal   0x1001af8 addiu a0, a0, 20
 	ldloc.1
 	ldc.i4.s 20
 	add
@@ -6169,7 +6169,7 @@ L_10835d0:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01083618: 0x1083618: lw    v0, 2000(s1)
+// 0x01083c3c: 0x1083c3c: lw    v0, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6178,32 +6178,32 @@ L_10835d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108361c: 0x108361c: addiu a1, s0, 422
+// 0x01083c40: 0x1083c40: addiu a1, s0, 422
 	ldloc 10
 	ldc.i4 422
 	add
 	stloc.2
-// 0x01083620: 0x1083620: sll   v0, v0, 2
+// 0x01083c44: 0x1083c44: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01083624: 0x1083624: addu  v0, v0, s1
+// 0x01083c48: 0x1083c48: addu  v0, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01083628: 0x1083628: lw    a0, 0(v0)
+// 0x01083c4c: 0x1083c4c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108362c: 0x108362c: addiu a2, zero, 200
+// 0x01083c50: 0x1083c50: addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
-// 0x01083630: 0x1083630: jal   0x1001af8 addiu a0, a0, 422
+// 0x01083c54: 0x1083c54: jal   0x1001af8 addiu a0, a0, 422
 	ldloc.1
 	ldc.i4 422
 	add
@@ -6214,7 +6214,7 @@ L_10835d0:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01083638: 0x1083638: lw    v0, 2000(s1)
+// 0x01083c5c: 0x1083c5c: lw    v0, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6223,32 +6223,32 @@ L_10835d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108363c: 0x108363c: addiu a1, s0, 623
+// 0x01083c60: 0x1083c60: addiu a1, s0, 623
 	ldloc 10
 	ldc.i4 623
 	add
 	stloc.2
-// 0x01083640: 0x1083640: sll   v0, v0, 2
+// 0x01083c64: 0x1083c64: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01083644: 0x1083644: addu  v0, v0, s1
+// 0x01083c68: 0x1083c68: addu  v0, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 5
-// 0x01083648: 0x1083648: lw    a0, 0(v0)
+// 0x01083c6c: 0x1083c6c: lw    a0, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108364c: 0x108364c: addiu a2, zero, 200
+// 0x01083c70: 0x1083c70: addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
-// 0x01083650: 0x1083650: jal   0x1001af8 addiu a0, a0, 623
+// 0x01083c74: 0x1083c74: jal   0x1001af8 addiu a0, a0, 623
 	ldloc.1
 	ldc.i4 623
 	add
@@ -6259,7 +6259,7 @@ L_10835d0:
 	call int32 Cibyl1::strncpy_1001af8(int32,int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01083658: 0x1083658: lw    v0, 2000(s1)
+// 0x01083c7c: 0x1083c7c: lw    v0, 2000(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
@@ -6268,124 +6268,124 @@ L_10835d0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108365c: 0x108365c: sll   zero, zero, 0
-// 0x01083660: 0x1083660: sll   v0, v0, 2
+// 0x01083c80: 0x1083c80: sll   zero, zero, 0
+// 0x01083c84: 0x1083c84: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01083664: 0x1083664: addu  s1, v0, s1
+// 0x01083c88: 0x1083c88: addu  s1, v0, s1
 	ldloc 5
 	ldloc 6
 	add
 	stloc 6
-// 0x01083668: 0x1083668: lw    s1, 0(s1)
+// 0x01083c8c: 0x1083c8c: lw    s1, 0(s1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x0108366c: 0x108366c: sll   zero, zero, 0
-// 0x01083670: 0x1083670: lb    v0, 20(s1)
+// 0x01083c90: 0x1083c90: sll   zero, zero, 0
+// 0x01083c94: 0x1083c94: lb    v0, 20(s1)
 	ldloc 6
 	ldc.i4.s 20
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01083674: 0x1083674: lb    v1, 221(s1)
+// 0x01083c98: 0x1083c98: lb    v1, 221(s1)
 	ldloc 6
 	ldc.i4 221
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x01083678: 0x1083678: sll   zero, zero, 0
-// 0x0108367c: 0x108367c: beq   v1, zero, 0x10836a0 sltu  v0, zero, v0
+// 0x01083c9c: 0x1083c9c: sll   zero, zero, 0
+// 0x01083ca0: 0x1083ca0: beq   v1, zero, 0x1083cc4 sltu  v0, zero, v0
 	ldloc 8
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-	brfalse L_10836a0
+	brfalse L_1083cc4
 // --- basic block ---
-// 0x01083684: 0x1083684: beq   v0, zero, 0x10836a0 lui   a1, 0x10000
+// 0x01083ca8: 0x1083ca8: beq   v0, zero, 0x1083cc4 lui   a1, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.2
-	brfalse L_10836a0
+	brfalse L_1083cc4
 // --- basic block ---
-// 0x0108368c: 0x108368c: addiu a1, a1, -10228
+// 0x01083cb0: 0x1083cb0: addiu a1, a1, -10232
 	ldloc.2
-	ldc.i4 -10228
+	ldc.i4 -10232
 	add
 	stloc.2
-// 0x01083690: 0x1083690: addiu a3, s1, 221
+// 0x01083cb4: 0x1083cb4: addiu a3, s1, 221
 	ldloc 6
 	ldc.i4 221
 	add
 	stloc 4
-// 0x01083694: 0x1083694: addiu a0, s1, 2444
+// 0x01083cb8: 0x1083cb8: addiu a0, s1, 2444
 	ldloc 6
 	ldc.i4 2444
 	add
 	stloc.1
-// 0x01083698: 0x1083698: j	 0x1083708 addiu a2, s1, 20
+// 0x01083cbc: 0x1083cbc: j	 0x1083d2c addiu a2, s1, 20
 	ldloc 6
 	ldc.i4.s 20
 	add
 	stloc.3
-	br L_1083708
+	br L_1083d2c
 // --- basic block ---
-L_10836a0:
-// 0x010836a0: 0x10836a0: lb    a0, 422(s1)
+L_1083cc4:
+// 0x01083cc4: 0x1083cc4: lb    a0, 422(s1)
 	ldloc 6
 	ldc.i4 422
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc.1
-// 0x010836a4: 0x10836a4: lb    v1, 623(s1)
+// 0x01083cc8: 0x1083cc8: lb    v1, 623(s1)
 	ldloc 6
 	ldc.i4 623
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 8
-// 0x010836a8: 0x10836a8: sltu  a0, zero, a0
+// 0x01083ccc: 0x1083ccc: sltu  a0, zero, a0
 	ldc.i4.s 0
 	ldloc.1
 	clt.un
 	stloc.1
-// 0x010836ac: 0x10836ac: and   v0, v0, a0
+// 0x01083cd0: 0x1083cd0: and   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	and
 	stloc 5
-// 0x010836b0: 0x10836b0: sltu  v1, zero, v1
+// 0x01083cd4: 0x1083cd4: sltu  v1, zero, v1
 	ldc.i4.s 0
 	ldloc 8
 	clt.un
 	stloc 8
-// 0x010836b4: 0x10836b4: and   v0, v0, v1
+// 0x01083cd8: 0x1083cd8: and   v0, v0, v1
 	ldloc 5
 	ldloc 8
 	and
 	stloc 5
-// 0x010836b8: 0x10836b8: beq   v0, zero, 0x1083754 lui   v0, 0x80000
+// 0x01083cdc: 0x1083cdc: beq   v0, zero, 0x1083d78 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1083754
+	brfalse L_1083d78
 // --- basic block ---
-// 0x010836c0: 0x10836c0: addiu a0, s1, 422
+// 0x01083ce4: 0x1083ce4: addiu a0, s1, 422
 	ldloc 6
 	ldc.i4 422
 	add
 	stloc.1
-// 0x010836c4: 0x10836c4: addiu a1, s1, 623
+// 0x01083ce8: 0x1083ce8: addiu a1, s1, 623
 	ldloc 6
 	ldc.i4 623
 	add
 	stloc.2
-// 0x010836c8: 0x10836c8: jal   0x1001b14 lui   s2, 0x80000
+// 0x01083cec: 0x1083cec: jal   0x1001b14 lui   s2, 0x80000
 	ldc.i4 524288
 	stloc 9
 	ldloc.1
@@ -6393,25 +6393,25 @@ L_10836a0:
 	call int32 Cibyl1::strcmp_1001b14(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x010836d0: 0x10836d0: addiu s2, s2, -8180
+// 0x01083cf4: 0x1083cf4: addiu s2, s2, -7716
 	ldloc 9
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 9
-// 0x010836d4: 0x10836d4: bne   v0, zero, 0x1083718 addiu s1, s1, 2444
+// 0x01083cf8: 0x1083cf8: bne   v0, zero, 0x1083d3c addiu s1, s1, 2444
 	ldloc 5
 	ldloc 6
 	ldc.i4 2444
 	add
 	stloc 6
-	brtrue L_1083718
+	brtrue L_1083d3c
 // --- basic block ---
-// 0x010836dc: 0x10836dc: lui   a0, 0x20000
+// 0x01083d00: 0x1083d00: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010836e0: 0x10836e0: jal   0x101cd60 addiu a0, a0, -22444
+// 0x01083d04: 0x1083d04: jal   0x101cd70 addiu a0, a0, -21980
 	ldloc.1
-	ldc.i4 -22444
+	ldc.i4 -21980
 	add
 	stloc.1
 	ldloc.0
@@ -6419,12 +6419,12 @@ L_10836a0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010836e8: 0x10836e8: lw    v1, 2000(s2)
+// 0x01083d0c: 0x1083d0c: lw    v1, 2000(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6433,41 +6433,41 @@ L_10836a0:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010836ec: 0x10836ec: addu  a0, s1, zero
+// 0x01083d10: 0x1083d10: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x010836f0: 0x10836f0: sll   s1, v1, 2
+// 0x01083d14: 0x1083d14: sll   s1, v1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x010836f4: 0x10836f4: addu  s2, s2, s1
+// 0x01083d18: 0x1083d18: addu  s2, s2, s1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x010836f8: 0x10836f8: lw    a2, 0(s2)
+// 0x01083d1c: 0x1083d1c: lw    a2, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x010836fc: 0x10836fc: addu  a1, v0, zero
+// 0x01083d20: 0x1083d20: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01083700: 0x1083700: addiu a3, a2, 422
+// 0x01083d24: 0x1083d24: addiu a3, a2, 422
 	ldloc.3
 	ldc.i4 422
 	add
 	stloc 4
-// 0x01083704: 0x1083704: addiu a2, a2, 20
+// 0x01083d28: 0x1083d28: addiu a2, a2, 20
 	ldloc.3
 	ldc.i4.s 20
 	add
 	stloc.3
-L_1083708:
-// 0x01083708: 0x1083708: jal   0x1000f64 sll   zero, zero, 0
+L_1083d2c:
+// 0x01083d2c: 0x1083d2c: jal   0x1000f64 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6478,18 +6478,18 @@ L_1083708:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083710: 0x1083710: j	 0x1083754 lui   v0, 0x80000
+// 0x01083d34: 0x1083d34: j	 0x1083d78 lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-	br L_1083754
+	br L_1083d78
 // --- basic block ---
-L_1083718:
-// 0x01083718: 0x1083718: lui   a0, 0x20000
+L_1083d3c:
+// 0x01083d3c: 0x1083d3c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x0108371c: 0x108371c: jal   0x101cd60 addiu a0, a0, -22412
+// 0x01083d40: 0x1083d40: jal   0x101cd70 addiu a0, a0, -21948
 	ldloc.1
-	ldc.i4 -22412
+	ldc.i4 -21948
 	add
 	stloc.1
 	ldloc.0
@@ -6497,12 +6497,12 @@ L_1083718:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083724: 0x1083724: lw    v1, 2000(s2)
+// 0x01083d48: 0x1083d48: lw    v1, 2000(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
@@ -6511,45 +6511,45 @@ L_1083718:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01083728: 0x1083728: addu  a0, s1, zero
+// 0x01083d4c: 0x1083d4c: addu  a0, s1, zero
 	ldloc 6
 	stloc.1
-// 0x0108372c: 0x108372c: sll   s1, v1, 2
+// 0x01083d50: 0x1083d50: sll   s1, v1, 2
 	ldloc 8
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01083730: 0x1083730: addu  s2, s2, s1
+// 0x01083d54: 0x1083d54: addu  s2, s2, s1
 	ldloc 9
 	ldloc 6
 	add
 	stloc 9
-// 0x01083734: 0x1083734: lw    a2, 0(s2)
+// 0x01083d58: 0x1083d58: lw    a2, 0(s2)
 	ldloc 7
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.3
-// 0x01083738: 0x1083738: addu  a1, v0, zero
+// 0x01083d5c: 0x1083d5c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108373c: 0x108373c: addiu a3, a2, 422
+// 0x01083d60: 0x1083d60: addiu a3, a2, 422
 	ldloc.3
 	ldc.i4 422
 	add
 	stloc 4
-// 0x01083740: 0x1083740: addiu v0, a2, 623
+// 0x01083d64: 0x1083d64: addiu v0, a2, 623
 	ldloc.3
 	ldc.i4 623
 	add
 	stloc 5
-// 0x01083744: 0x1083744: addiu a2, a2, 20
+// 0x01083d68: 0x1083d68: addiu a2, a2, 20
 	ldloc.3
 	ldc.i4.s 20
 	add
 	stloc.3
-// 0x01083748: 0x1083748: jal   0x1000f64 sw    v0, 16(sp)
+// 0x01083d6c: 0x1083d6c: jal   0x1000f64 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6568,16 +6568,16 @@ L_1083718:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083750: 0x1083750: lui   v0, 0x80000
+// 0x01083d74: 0x1083d74: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1083754:
-// 0x01083754: 0x1083754: addiu v0, v0, -8180
+L_1083d78:
+// 0x01083d78: 0x1083d78: addiu v0, v0, -7716
 	ldloc 5
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 5
-// 0x01083758: 0x1083758: lw    v1, 2000(v0)
+// 0x01083d7c: 0x1083d7c: lw    v1, 2000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6586,13 +6586,13 @@ L_1083754:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108375c: 0x108375c: sll   zero, zero, 0
-// 0x01083760: 0x1083760: addiu v1, v1, 1
+// 0x01083d80: 0x1083d80: sll   zero, zero, 0
+// 0x01083d84: 0x1083d84: addiu v1, v1, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-// 0x01083764: 0x1083764: sw    v1, 2000(v0)
+// 0x01083d88: 0x1083d88: sw    v1, 2000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6601,7 +6601,7 @@ L_1083754:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01083768: 0x1083768: lw    s1, 16(s0)
+// 0x01083d8c: 0x1083d8c: lw    s1, 16(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -6610,29 +6610,29 @@ L_1083754:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108376c: 0x108376c: sll   zero, zero, 0
-// 0x01083770: 0x1083770: beq   s1, zero, 0x1083814 addiu v0, zero, 1
+// 0x01083d90: 0x1083d90: sll   zero, zero, 0
+// 0x01083d94: 0x1083d94: beq   s1, zero, 0x1083e38 addiu v0, zero, 1
 	ldloc 6
 	ldc.i4.1
 	stloc 5
-	brfalse L_1083814
+	brfalse L_1083e38
 // --- basic block ---
-// 0x01083778: 0x1083778: addiu a0, sp, 24
+// 0x01083d9c: 0x1083d9c: addiu a0, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.1
-// 0x0108377c: 0x108377c: addu  a1, zero, zero
+// 0x01083da0: 0x1083da0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01083780: 0x1083780: lw    s2, 0(s0)
+// 0x01083da4: 0x1083da4: lw    s2, 0(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01083784: 0x1083784: jal   0x1029da8 addu  a2, zero, zero
+// 0x01083da8: 0x1083da8: jal   0x1029db8 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -6640,12 +6640,12 @@ L_1083754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x0108378c: 0x108378c: lw    v0, 36(sp)
+// 0x01083db0: 0x1083db0: lw    v0, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6654,33 +6654,33 @@ L_1083754:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01083790: 0x1083790: sll   zero, zero, 0
-// 0x01083794: 0x1083794: slti  v0, v0, 21
+// 0x01083db4: 0x1083db4: sll   zero, zero, 0
+// 0x01083db8: 0x1083db8: slti  v0, v0, 21
 	ldloc 5
 	ldc.i4.s 21
 	clt
 	stloc 5
-// 0x01083798: 0x1083798: beq   v0, zero, 0x1083810 lui   s0, 0x80000
+// 0x01083dbc: 0x1083dbc: beq   v0, zero, 0x1083e34 lui   s0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 10
-	brfalse L_1083810
+	brfalse L_1083e34
 // --- basic block ---
-// 0x010837a0: 0x10837a0: lw    v0, -8192(s0)
+// 0x01083dc4: 0x1083dc4: lw    v0, -7728(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2048
+	ldc.i4 -1932
 	add
 	ldelem.i4
 	stloc 5
-// 0x010837a4: 0x10837a4: sll   zero, zero, 0
-// 0x010837a8: 0x10837a8: bne   v0, zero, 0x1083810 sll   zero, zero, 0
+// 0x01083dc8: 0x1083dc8: sll   zero, zero, 0
+// 0x01083dcc: 0x1083dcc: bne   v0, zero, 0x1083e34 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1083810
+	brtrue L_1083e34
 // --- basic block ---
-// 0x010837b0: 0x10837b0: jal   0x10acad0 addu  a0, s1, zero
+// 0x01083dd4: 0x1083dd4: jal   0x10ad118 addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6688,18 +6688,18 @@ L_1083754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010837b8: 0x10837b8: addiu a1, zero, 6
+// 0x01083ddc: 0x1083ddc: addiu a1, zero, 6
 	ldc.i4.6
 	stloc.2
-// 0x010837bc: 0x10837bc: addiu a2, zero, 5
+// 0x01083de0: 0x1083de0: addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-// 0x010837c0: 0x10837c0: jal   0x10ac874 addu  a0, s1, zero
+// 0x01083de4: 0x1083de4: jal   0x10acebc addu  a0, s1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6707,12 +6707,12 @@ L_1083754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_display_new_points_timed_10ac874(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_display_new_points_timed_10acebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010837c8: 0x10837c8: jal   0x1000910 addiu a0, zero, 8
+// 0x01083dec: 0x1083dec: jal   0x1000910 addiu a0, zero, 8
 	ldc.i4.8
 	stloc.1
 	ldloc.0
@@ -6725,23 +6725,23 @@ L_1083754:
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x010837d0: 0x10837d0: lui   a0, 0x20000
+// 0x01083df4: 0x1083df4: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010837d4: 0x10837d4: lui   a1, 0x20000
+// 0x01083df8: 0x1083df8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010837d8: 0x10837d8: lui   a3, 0x1080000
+// 0x01083dfc: 0x1083dfc: lui   a3, 0x1080000
 	ldc.i4 17301504
 	stloc 4
-// 0x010837dc: 0x10837dc: sw    s2, 0(v0)
+// 0x01083e00: 0x1083e00: sw    s2, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldloc 9
 	stelem.i4
-// 0x010837e0: 0x10837e0: sw    s1, 4(v0)
+// 0x01083e04: 0x1083e04: sw    s1, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6750,12 +6750,12 @@ L_1083754:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010837e4: 0x10837e4: addiu a0, a0, -22388
+// 0x01083e08: 0x1083e08: addiu a0, a0, -21924
 	ldloc.1
-	ldc.i4 -22388
+	ldc.i4 -21924
 	add
 	stloc.1
-// 0x010837e8: 0x10837e8: sw    v0, 16(sp)
+// 0x01083e0c: 0x1083e0c: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6764,23 +6764,23 @@ L_1083754:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010837ec: 0x10837ec: addiu a1, a1, -22368
+// 0x01083e10: 0x1083e10: addiu a1, a1, -21904
 	ldloc.2
-	ldc.i4 -22368
+	ldc.i4 -21904
 	add
 	stloc.2
-// 0x010837f0: 0x10837f0: addiu v0, zero, 10
+// 0x01083e14: 0x1083e14: addiu v0, zero, 10
 	ldc.i4.s 10
 	stloc 5
-// 0x010837f4: 0x10837f4: addiu a3, a3, 14384
+// 0x01083e18: 0x1083e18: addiu a3, a3, 15956
 	ldloc 4
-	ldc.i4 14384
+	ldc.i4 15956
 	add
 	stloc 4
-// 0x010837f8: 0x10837f8: addiu a2, zero, 1
+// 0x01083e1c: 0x1083e1c: addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-// 0x010837fc: 0x10837fc: jal   0x104c2dc sw    v0, 20(sp)
+// 0x01083e20: 0x1083e20: jal   0x104c2ec sw    v0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6794,32 +6794,32 @@ L_1083754:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl56::ssd_confirm_dialog_timeout_104c2dc(int32,int32,int32,int32,int32)
+	call int32 Cibyl56::ssd_confirm_dialog_timeout_104c2ec(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083804: 0x1083804: addiu v0, zero, 1
+// 0x01083e28: 0x1083e28: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01083808: 0x1083808: j	 0x1083814 sw    v0, -8192(s0)
+// 0x01083e2c: 0x1083e2c: j	 0x1083e38 sw    v0, -7728(s0)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2048
+	ldc.i4 -1932
 	add
 	ldloc 5
 	stelem.i4
-	br L_1083814
+	br L_1083e38
 // --- basic block ---
-L_1083810:
-// 0x01083810: 0x1083810: addiu v0, zero, 1
+L_1083e34:
+// 0x01083e34: 0x1083e34: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-L_1083814:
-// 0x01083814: 0x1083814: lw    ra, 68(sp)
-// 0x01083818: 0x1083818: lw    s3, 64(sp)
+L_1083e38:
+// 0x01083e38: 0x1083e38: lw    ra, 68(sp)
+// 0x01083e3c: 0x1083e3c: lw    s3, 64(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6828,7 +6828,7 @@ L_1083814:
 	add
 	ldelem.i4
 	stloc 11
-// 0x0108381c: 0x108381c: lw    s2, 60(sp)
+// 0x01083e40: 0x1083e40: lw    s2, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6837,7 +6837,7 @@ L_1083814:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01083820: 0x1083820: lw    s1, 56(sp)
+// 0x01083e44: 0x1083e44: lw    s1, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6846,7 +6846,7 @@ L_1083814:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083824: 0x1083824: lw    s0, 52(sp)
+// 0x01083e48: 0x1083e48: lw    s0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6855,7 +6855,7 @@ L_1083814:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01083828: 0x1083828: jr    ra addiu sp, sp, 72
+// 0x01083e4c: 0x1083e4c: jr    ra addiu sp, sp, 72
 	ldloc.0
 	ldc.i4.s 72
 	add
@@ -6865,17 +6865,17 @@ L_1083814:
 __CIBYL_local_jumptab:
 	stloc 5
 	ldloc 5
-	ldc.i4 17315168
-	beq  L_1083560
+	ldc.i4 17316740
+	beq  L_1083b84
 	ldloc 5
-	ldc.i4 17315196
-	beq  L_108357c
+	ldc.i4 17316768
+	beq  L_1083ba0
 	ldloc 5
-	ldc.i4 17315224
-	beq  L_1083598
+	ldc.i4 17316796
+	beq  L_1083bbc
 	ldloc 5
-	ldc.i4 17315252
-	beq  L_10835b4
+	ldc.i4 17316824
+	beq  L_1083bd8
 		br __CIBYL_function_return
 __CIBYL_function_return:
 	ldloc 8
@@ -6883,7 +6883,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 TrafficConfirmedCallback_1083830(int32,int32,int32,int32,int32)
+.method public static int32 TrafficConfirmedCallback_1083e54(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s2,int32 s1,int32 s0,int32 ra)
@@ -6927,12 +6927,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083830: 0x1083830: addiu sp, sp, -32
+// 0x01083e54: 0x1083e54: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01083834: 0x1083834: sw    s2, 24(sp)
+// 0x01083e58: 0x1083e58: sw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6941,7 +6941,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01083838: 0x1083838: lw    s2, 4(a1)
+// 0x01083e5c: 0x1083e5c: lw    s2, 4(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
@@ -6950,7 +6950,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 8
-// 0x0108383c: 0x108383c: sw    s1, 20(sp)
+// 0x01083e60: 0x1083e60: sw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6959,12 +6959,12 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01083840: 0x1083840: slti  v0, s2, 101
+// 0x01083e64: 0x1083e64: slti  v0, s2, 101
 	ldloc 8
 	ldc.i4.s 101
 	clt
 	stloc 5
-// 0x01083844: 0x1083844: sw    s0, 16(sp)
+// 0x01083e68: 0x1083e68: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -6973,34 +6973,34 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01083848: 0x1083848: sw    ra, 28(sp)
-// 0x0108384c: 0x108384c: lw    s1, 0(a1)
+// 0x01083e6c: 0x1083e6c: sw    ra, 28(sp)
+// 0x01083e70: 0x1083e70: lw    s1, 0(a1)
 	ldloc 6
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01083850: 0x1083850: beq   v0, zero, 0x10838c8 addu  s0, a1, zero
+// 0x01083e74: 0x1083e74: beq   v0, zero, 0x1083eec addu  s0, a1, zero
 	ldloc 5
 	ldloc.2
 	stloc 10
-	brfalse L_10838c8
+	brfalse L_1083eec
 // --- basic block ---
-// 0x01083858: 0x1083858: addiu v0, zero, 3
+// 0x01083e7c: 0x1083e7c: addiu v0, zero, 3
 	ldc.i4.3
 	stloc 5
-// 0x0108385c: 0x108385c: bne   a0, v0, 0x1083890 addiu v0, zero, 4
+// 0x01083e80: 0x1083e80: bne   a0, v0, 0x1083eb4 addiu v0, zero, 4
 	ldloc.1
 	ldloc 5
 	ldc.i4.4
 	stloc 5
-	bne.un L_1083890
+	bne.un L_1083eb4
 // --- basic block ---
-// 0x01083864: 0x1083864: addu  a0, s1, zero
+// 0x01083e88: 0x1083e88: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x01083868: 0x1083868: jal   0x106c28c addiu a1, zero, 100
+// 0x01083e8c: 0x1083e8c: jal   0x106c8b0 addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -7008,12 +7008,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_TrafficAlertFeedback_106c28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TrafficAlertFeedback_106c8b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01083870: 0x1083870: jal   0x10acad0 addu  a0, s2, zero
+// 0x01083e94: 0x1083e94: jal   0x10ad118 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7021,18 +7021,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01083878: 0x1083878: addu  a0, s2, zero
+// 0x01083e9c: 0x1083e9c: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x0108387c: 0x108387c: addiu a1, zero, 5
+// 0x01083ea0: 0x1083ea0: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x01083880: 0x1083880: jal   0x10ac874 addiu a2, zero, 2
+// 0x01083ea4: 0x1083ea4: jal   0x10acebc addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -7040,23 +7040,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_display_new_points_timed_10ac874(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_display_new_points_timed_10acebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01083888: 0x1083888: j	 0x10838c0 sll   zero, zero, 0
-	br L_10838c0
+// 0x01083eac: 0x1083eac: j	 0x1083ee4 sll   zero, zero, 0
+	br L_1083ee4
 // --- basic block ---
-L_1083890:
-// 0x01083890: 0x1083890: bne   a0, v0, 0x10838c0 addu  a1, zero, zero
+L_1083eb4:
+// 0x01083eb4: 0x1083eb4: bne   a0, v0, 0x1083ee4 addu  a1, zero, zero
 	ldloc.1
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	bne.un L_10838c0
+	bne.un L_1083ee4
 // --- basic block ---
-// 0x01083898: 0x1083898: jal   0x106c28c addu  a0, s1, zero
+// 0x01083ebc: 0x1083ebc: jal   0x106c8b0 addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7064,12 +7064,12 @@ L_1083890:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl80::Realtime_TrafficAlertFeedback_106c28c(int32,int32,int32,int32,int32)
+	call int32 Cibyl81::Realtime_TrafficAlertFeedback_106c8b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010838a0: 0x10838a0: jal   0x10acad0 addu  a0, s2, zero
+// 0x01083ec4: 0x1083ec4: jal   0x10ad118 addu  a0, s2, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -7077,18 +7077,18 @@ L_1083890:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_add_new_points_10acad0(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_add_new_points_10ad118(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010838a8: 0x10838a8: addu  a0, s2, zero
+// 0x01083ecc: 0x1083ecc: addu  a0, s2, zero
 	ldloc 8
 	stloc.1
-// 0x010838ac: 0x10838ac: addiu a1, zero, 5
+// 0x01083ed0: 0x1083ed0: addiu a1, zero, 5
 	ldc.i4.5
 	stloc.2
-// 0x010838b0: 0x10838b0: jal   0x10ac874 addiu a2, zero, 2
+// 0x01083ed4: 0x1083ed4: jal   0x10acebc addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
 	ldloc.0
@@ -7096,12 +7096,12 @@ L_1083890:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl129::editor_points_display_new_points_timed_10ac874(int32,int32,int32,int32,int32)
+	call int32 Cibyl129::editor_points_display_new_points_timed_10acebc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010838b8: 0x10838b8: jal   0x10831d8 addu  a0, s1, zero
+// 0x01083edc: 0x1083edc: jal   0x10837fc addu  a0, s1, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -7109,13 +7109,13 @@ L_1083890:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_Remove_10831d8(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_Remove_10837fc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10838c0:
-// 0x010838c0: 0x10838c0: jal   0x1000930 addu  a0, s0, zero
+L_1083ee4:
+// 0x01083ee4: 0x1083ee4: jal   0x1000930 addu  a0, s0, zero
 	ldloc 10
 	stloc.1
 	ldloc.0
@@ -7128,9 +7128,9 @@ L_10838c0:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10838c8:
-// 0x010838c8: 0x10838c8: lw    ra, 28(sp)
-// 0x010838cc: 0x10838cc: lw    s2, 24(sp)
+L_1083eec:
+// 0x01083eec: 0x1083eec: lw    ra, 28(sp)
+// 0x01083ef0: 0x1083ef0: lw    s2, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7139,7 +7139,7 @@ L_10838c8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010838d0: 0x10838d0: lw    s1, 20(sp)
+// 0x01083ef4: 0x1083ef4: lw    s1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7148,7 +7148,7 @@ L_10838c8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010838d4: 0x10838d4: lw    s0, 16(sp)
+// 0x01083ef8: 0x1083ef8: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -7157,7 +7157,7 @@ L_10838c8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010838d8: 0x10838d8: jr    ra addiu sp, sp, 32
+// 0x01083efc: 0x1083efc: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
diff --git a/converted/Cibyl99.j b/converted/Cibyl99.j
index 8845d7a..faa8f2d 100644
--- a/converted/Cibyl99.j
+++ b/converted/Cibyl99.j
@@ -41,7 +41,7 @@
     IL_0006:  ret
   } // end of method Cibyl99::.ctor
 
-.method public static int32 RTTrafficInfo_ClearAll_10838e0(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_ClearAll_1083f04(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 s0,int32 s1,int32 s2,int32 s3,int32 s5,int32 v1,int32 s4,int32 ra)
@@ -94,34 +94,34 @@
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010838e0: 0x10838e0: lui   a1, 0x20000
+// 0x01083f04: 0x1083f04: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010838e4: 0x10838e4: lui   a3, 0x20000
+// 0x01083f08: 0x1083f08: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x010838e8: 0x10838e8: addiu sp, sp, -48
+// 0x01083f0c: 0x1083f0c: addiu sp, sp, -48
 	ldloc.0
 	ldc.i4.s -48
 	add
 	stloc.0
-// 0x010838ec: 0x10838ec: addiu a1, a1, -22668
+// 0x01083f10: 0x1083f10: addiu a1, a1, -22204
 	ldloc.2
-	ldc.i4 -22668
+	ldc.i4 -22204
 	add
 	stloc.2
-// 0x010838f0: 0x10838f0: addiu a3, a3, -22336
+// 0x01083f14: 0x1083f14: addiu a3, a3, -21872
 	ldloc 4
-	ldc.i4 -22336
+	ldc.i4 -21872
 	add
 	stloc 4
-// 0x010838f4: 0x10838f4: addiu a0, zero, 1
+// 0x01083f18: 0x1083f18: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010838f8: 0x10838f8: addiu a2, zero, 161
+// 0x01083f1c: 0x1083f1c: addiu a2, zero, 161
 	ldc.i4 161
 	stloc.3
-// 0x010838fc: 0x10838fc: sw    s5, 40(sp)
+// 0x01083f20: 0x1083f20: sw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -130,7 +130,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01083900: 0x1083900: sw    s4, 36(sp)
+// 0x01083f24: 0x1083f24: sw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -139,7 +139,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01083904: 0x1083904: sw    s3, 32(sp)
+// 0x01083f28: 0x1083f28: sw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -148,7 +148,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01083908: 0x1083908: sw    s1, 24(sp)
+// 0x01083f2c: 0x1083f2c: sw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -157,7 +157,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108390c: 0x108390c: sw    s0, 20(sp)
+// 0x01083f30: 0x1083f30: sw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -166,8 +166,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083910: 0x1083910: sw    ra, 44(sp)
-// 0x01083914: 0x1083914: jal   0x100449c sw    s2, 28(sp)
+// 0x01083f34: 0x1083f34: sw    ra, 44(sp)
+// 0x01083f38: 0x1083f38: jal   0x100449c sw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -186,18 +186,18 @@ __CIBYL_javamethod_begin:
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x0108391c: 0x108391c: lui   v0, 0x80000
+// 0x01083f40: 0x1083f40: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01083920: 0x1083920: addiu v0, v0, -8180
+// 0x01083f44: 0x1083f44: addiu v0, v0, -7716
 	ldloc 6
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 6
-// 0x01083924: 0x1083924: lui   s5, 0x10000
+// 0x01083f48: 0x1083f48: lui   s5, 0x10000
 	ldc.i4 65536
 	stloc 11
-// 0x01083928: 0x1083928: lw    s4, 2000(v0)
+// 0x01083f4c: 0x1083f4c: lw    s4, 2000(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -206,15 +206,15 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 13
-// 0x0108392c: 0x108392c: addu  s1, v0, zero
+// 0x01083f50: 0x1083f50: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x01083930: 0x1083930: ori   s5, s5, 34464
+// 0x01083f54: 0x1083f54: ori   s5, s5, 34464
 	ldloc 11
 	ldc.i4 34464
 	or
 	stloc 11
-// 0x01083934: 0x1083934: sw    zero, 2000(v0)
+// 0x01083f58: 0x1083f58: sw    zero, 2000(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -223,41 +223,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083938: 0x1083938: addu  s0, zero, zero
+// 0x01083f5c: 0x1083f5c: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x0108393c: 0x108393c: addiu s3, zero, 500
+// 0x01083f60: 0x1083f60: addiu s3, zero, 500
 	ldc.i4 500
 	stloc 10
-L_1083940:
-// 0x01083940: 0x1083940: slt   v0, s0, s4
+L_1083f64:
+// 0x01083f64: 0x1083f64: slt   v0, s0, s4
 	ldloc 7
 	ldloc 13
 	clt
 	stloc 6
-// 0x01083944: 0x1083944: lw    s2, 0(s1)
+// 0x01083f68: 0x1083f68: lw    s2, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 9
-// 0x01083948: 0x1083948: beq   v0, zero, 0x1083964 addiu s0, s0, 1
+// 0x01083f6c: 0x1083f6c: beq   v0, zero, 0x1083f88 addiu s0, s0, 1
 	ldloc 6
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brfalse L_1083964
+	brfalse L_1083f88
 // --- basic block ---
-// 0x01083950: 0x1083950: lw    a0, 0(s2)
+// 0x01083f74: 0x1083f74: lw    a0, 0(s2)
 	ldloc 5
 	ldloc 9
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01083954: 0x1083954: jal   0x107a718 addu  a0, a0, s5
+// 0x01083f78: 0x1083f78: jal   0x107ad3c addu  a0, a0, s5
 	ldloc.1
 	ldloc 11
 	add
@@ -267,12 +267,12 @@ L_1083940:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl92::RTAlerts_Remove_107a718(int32,int32,int32,int32,int32)
+	call int32 Cibyl92::RTAlerts_Remove_107ad3c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 12
 	stloc 6
 // --- basic block ---
-// 0x0108395c: 0x108395c: jal   0x1000930 addu  a0, s2, zero
+// 0x01083f80: 0x1083f80: jal   0x1000930 addu  a0, s2, zero
 	ldloc 9
 	stloc.1
 	ldloc.0
@@ -285,32 +285,32 @@ L_1083940:
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_1083964:
-// 0x01083964: 0x1083964: sw    zero, 0(s1)
+L_1083f88:
+// 0x01083f88: 0x1083f88: sw    zero, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083968: 0x1083968: bne   s0, s3, 0x1083940 addiu s1, s1, 4
+// 0x01083f8c: 0x1083f8c: bne   s0, s3, 0x1083f64 addiu s1, s1, 4
 	ldloc 7
 	ldloc 10
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	bne.un L_1083940
+	bne.un L_1083f64
 // --- basic block ---
-// 0x01083970: 0x1083970: lui   v0, 0x80000
+// 0x01083f94: 0x1083f94: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01083974: 0x1083974: addiu v0, v0, -6176
+// 0x01083f98: 0x1083f98: addiu v0, v0, -5712
 	ldloc 6
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 6
-// 0x01083978: 0x1083978: lw    s3, 4000(v0)
+// 0x01083f9c: 0x1083f9c: lw    s3, 4000(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -319,10 +319,10 @@ L_1083964:
 	add
 	ldelem.i4
 	stloc 10
-// 0x0108397c: 0x108397c: addu  s1, v0, zero
+// 0x01083fa0: 0x1083fa0: addu  s1, v0, zero
 	ldloc 6
 	stloc 8
-// 0x01083980: 0x1083980: sw    zero, 4000(v0)
+// 0x01083fa4: 0x1083fa4: sw    zero, 4000(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -331,34 +331,34 @@ L_1083964:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083984: 0x1083984: addu  s0, zero, zero
+// 0x01083fa8: 0x1083fa8: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 7
-// 0x01083988: 0x1083988: addiu s2, zero, 1000
+// 0x01083fac: 0x1083fac: addiu s2, zero, 1000
 	ldc.i4 1000
 	stloc 9
-L_108398c:
-// 0x0108398c: 0x108398c: slt   v0, s0, s3
+L_1083fb0:
+// 0x01083fb0: 0x1083fb0: slt   v0, s0, s3
 	ldloc 7
 	ldloc 10
 	clt
 	stloc 6
-// 0x01083990: 0x1083990: beq   v0, zero, 0x10839a4 addiu s0, s0, 1
+// 0x01083fb4: 0x1083fb4: beq   v0, zero, 0x1083fc8 addiu s0, s0, 1
 	ldloc 6
 	ldloc 7
 	ldc.i4.1
 	add
 	stloc 7
-	brfalse L_10839a4
+	brfalse L_1083fc8
 // --- basic block ---
-// 0x01083998: 0x1083998: lw    a0, 0(s1)
+// 0x01083fbc: 0x1083fbc: lw    a0, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108399c: 0x108399c: jal   0x1000930 sll   zero, zero, 0
+// 0x01083fc0: 0x1083fc0: jal   0x1000930 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -369,25 +369,25 @@ L_108398c:
 	stloc 12
 	stloc 6
 // --- basic block ---
-L_10839a4:
-// 0x010839a4: 0x10839a4: sw    zero, 0(s1)
+L_1083fc8:
+// 0x01083fc8: 0x1083fc8: sw    zero, 0(s1)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x010839a8: 0x10839a8: bne   s0, s2, 0x108398c addiu s1, s1, 4
+// 0x01083fcc: 0x1083fcc: bne   s0, s2, 0x1083fb0 addiu s1, s1, 4
 	ldloc 7
 	ldloc 9
 	ldloc 8
 	ldc.i4.4
 	add
 	stloc 8
-	bne.un L_108398c
+	bne.un L_1083fb0
 // --- basic block ---
-// 0x010839b0: 0x10839b0: lw    ra, 44(sp)
-// 0x010839b4: 0x10839b4: lw    s5, 40(sp)
+// 0x01083fd4: 0x1083fd4: lw    ra, 44(sp)
+// 0x01083fd8: 0x1083fd8: lw    s5, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -396,7 +396,7 @@ L_10839a4:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010839b8: 0x10839b8: lw    s4, 36(sp)
+// 0x01083fdc: 0x1083fdc: lw    s4, 36(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -405,7 +405,7 @@ L_10839a4:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010839bc: 0x10839bc: lw    s3, 32(sp)
+// 0x01083fe0: 0x1083fe0: lw    s3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -414,7 +414,7 @@ L_10839a4:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010839c0: 0x10839c0: lw    s2, 28(sp)
+// 0x01083fe4: 0x1083fe4: lw    s2, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -423,7 +423,7 @@ L_10839a4:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010839c4: 0x10839c4: lw    s1, 24(sp)
+// 0x01083fe8: 0x1083fe8: lw    s1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -432,7 +432,7 @@ L_10839a4:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010839c8: 0x10839c8: lw    s0, 20(sp)
+// 0x01083fec: 0x1083fec: lw    s0, 20(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -441,7 +441,7 @@ L_10839a4:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010839cc: 0x10839cc: jr    ra addiu sp, sp, 48
+// 0x01083ff0: 0x1083ff0: jr    ra addiu sp, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -453,7 +453,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTTrafficInfo_Reset_10839d4(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Reset_1083ff8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32[] mem,int32 v0,int32 v1)
@@ -488,26 +488,26 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010839d4: 0x10839d4: addiu sp, sp, -24
+// 0x01083ff8: 0x1083ff8: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x010839d8: 0x10839d8: sw    ra, 20(sp)
-// 0x010839dc: 0x10839dc: jal   0x10838e0 sll   zero, zero, 0
+// 0x01083ffc: 0x1083ffc: sw    ra, 20(sp)
+// 0x01084000: 0x1084000: jal   0x1083f04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RTTrafficInfo_ClearAll_10838e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RTTrafficInfo_ClearAll_1083f04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 7
 // --- basic block ---
-// 0x010839e4: 0x10839e4: lw    ra, 20(sp)
-// 0x010839e8: 0x10839e8: sll   zero, zero, 0
-// 0x010839ec: 0x10839ec: jr    ra addiu sp, sp, 24
+// 0x01084008: 0x1084008: lw    ra, 20(sp)
+// 0x0108400c: 0x108400c: sll   zero, zero, 0
+// 0x01084010: 0x1084010: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -519,7 +519,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RTTrafficInfo_AddSegments_10839f4(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_AddSegments_1084018(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 v0,int32 v1,int32 s6,int32 s5,int32 s2,int32 s7,int32 s0,int32 s1,int32 s8,int32 s3,int32 s4,int32 ra)
@@ -581,20 +581,20 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010839f4: 0x10839f4: lui   v0, 0x80000
+// 0x01084018: 0x1084018: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010839f8: 0x10839f8: addiu sp, sp, -80
+// 0x0108401c: 0x108401c: addiu sp, sp, -80
 	ldloc.0
 	ldc.i4.s -80
 	add
 	stloc.0
-// 0x010839fc: 0x10839fc: addiu v0, v0, -8180
+// 0x01084020: 0x1084020: addiu v0, v0, -7716
 	ldloc 6
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 6
-// 0x01083a00: 0x1083a00: sw    s4, 56(sp)
+// 0x01084024: 0x1084024: sw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -603,7 +603,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01083a04: 0x1083a04: sw    s2, 48(sp)
+// 0x01084028: 0x1084028: sw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -612,7 +612,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01083a08: 0x1083a08: sw    s1, 44(sp)
+// 0x0108402c: 0x108402c: sw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -621,13 +621,13 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01083a0c: 0x1083a0c: addu  s4, a0, zero
+// 0x01084030: 0x1084030: addu  s4, a0, zero
 	ldloc.1
 	stloc 16
-// 0x01083a10: 0x1083a10: addu  v1, v0, zero
+// 0x01084034: 0x1084034: addu  v1, v0, zero
 	ldloc 6
 	stloc 7
-// 0x01083a14: 0x1083a14: lw    a0, 2000(v0)
+// 0x01084038: 0x1084038: lw    a0, 2000(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -636,8 +636,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01083a18: 0x1083a18: sw    ra, 76(sp)
-// 0x01083a1c: 0x1083a1c: sw    s8, 72(sp)
+// 0x0108403c: 0x108403c: sw    ra, 76(sp)
+// 0x01084040: 0x1084040: sw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -646,7 +646,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01083a20: 0x1083a20: sw    s7, 68(sp)
+// 0x01084044: 0x1084044: sw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -655,7 +655,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01083a24: 0x1083a24: sw    s6, 64(sp)
+// 0x01084048: 0x1084048: sw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -664,7 +664,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01083a28: 0x1083a28: sw    s5, 60(sp)
+// 0x0108404c: 0x108404c: sw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -673,7 +673,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01083a2c: 0x1083a2c: sw    s3, 52(sp)
+// 0x01084050: 0x1084050: sw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -682,7 +682,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01083a30: 0x1083a30: sw    s0, 40(sp)
+// 0x01084054: 0x1084054: sw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -691,47 +691,47 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01083a34: 0x1083a34: addu  s1, a1, zero
+// 0x01084058: 0x1084058: addu  s1, a1, zero
 	ldloc.2
 	stloc 13
-// 0x01083a38: 0x1083a38: addu  s2, a2, zero
+// 0x0108405c: 0x108405c: addu  s2, a2, zero
 	ldloc.3
 	stloc 10
-// 0x01083a3c: 0x1083a3c: j	 0x1083a78 addu  v0, zero, zero
+// 0x01084060: 0x1084060: j	 0x108409c addu  v0, zero, zero
 	ldc.i4.s 0
 	stloc 6
-	br L_1083a78
+	br L_108409c
 // --- basic block ---
-L_1083a44:
-// 0x01083a44: 0x1083a44: lw    s7, 0(v1)
+L_1084068:
+// 0x01084068: 0x1084068: lw    s7, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 11
-// 0x01083a48: 0x1083a48: sll   zero, zero, 0
-// 0x01083a4c: 0x1083a4c: lw    a1, 0(s7)
+// 0x0108406c: 0x108406c: sll   zero, zero, 0
+// 0x01084070: 0x1084070: lw    a1, 0(s7)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x01083a50: 0x1083a50: sll   zero, zero, 0
-// 0x01083a54: 0x1083a54: bne   a1, s4, 0x1083a78 addiu v1, v1, 4
+// 0x01084074: 0x1084074: sll   zero, zero, 0
+// 0x01084078: 0x1084078: bne   a1, s4, 0x108409c addiu v1, v1, 4
 	ldloc.2
 	ldloc 16
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-	bne.un L_1083a78
+	bne.un L_108409c
 // --- basic block ---
-// 0x01083a5c: 0x1083a5c: lui   s6, 0x80000
+// 0x01084080: 0x1084080: lui   s6, 0x80000
 	ldc.i4 524288
 	stloc 8
-// 0x01083a60: 0x1083a60: lw    v1, 96(sp)
+// 0x01084084: 0x1084084: lw    v1, 96(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -740,59 +740,59 @@ L_1083a44:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01083a64: 0x1083a64: addiu s6, s6, -6176
+// 0x01084088: 0x1084088: addiu s6, s6, -5712
 	ldloc 8
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 8
-// 0x01083a68: 0x1083a68: addu  s3, zero, zero
+// 0x0108408c: 0x108408c: addu  s3, zero, zero
 	ldc.i4.s 0
 	stloc 15
-// 0x01083a6c: 0x1083a6c: addu  s0, zero, zero
+// 0x01084090: 0x1084090: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 12
-// 0x01083a70: 0x1083a70: j	 0x1083bb0 addu  s8, zero, zero
+// 0x01084094: 0x1084094: j	 0x10841d4 addu  s8, zero, zero
 	ldc.i4.s 0
 	stloc 14
-	br L_1083bb0
+	br L_10841d4
 // --- basic block ---
-L_1083a78:
-// 0x01083a78: 0x1083a78: slt   a1, v0, a0
+L_108409c:
+// 0x0108409c: 0x108409c: slt   a1, v0, a0
 	ldloc 6
 	ldloc.1
 	clt
 	stloc.2
-// 0x01083a7c: 0x1083a7c: bne   a1, zero, 0x1083a44 addiu v0, v0, 1
+// 0x010840a0: 0x10840a0: bne   a1, zero, 0x1084068 addiu v0, v0, 1
 	ldloc.2
 	ldloc 6
 	ldc.i4.1
 	add
 	stloc 6
-	brtrue L_1083a44
+	brtrue L_1084068
 // --- basic block ---
-// 0x01083a84: 0x1083a84: lui   a1, 0x20000
+// 0x010840a8: 0x10840a8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01083a88: 0x1083a88: lui   a3, 0x20000
+// 0x010840ac: 0x10840ac: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01083a8c: 0x1083a8c: addiu a1, a1, -22668
+// 0x010840b0: 0x10840b0: addiu a1, a1, -22204
 	ldloc.2
-	ldc.i4 -22668
+	ldc.i4 -22204
 	add
 	stloc.2
-// 0x01083a90: 0x1083a90: addiu a3, a3, -22308
+// 0x010840b4: 0x10840b4: addiu a3, a3, -21844
 	ldloc 4
-	ldc.i4 -22308
+	ldc.i4 -21844
 	add
 	stloc 4
-// 0x01083a94: 0x1083a94: addiu a0, zero, 4
+// 0x010840b8: 0x10840b8: addiu a0, zero, 4
 	ldc.i4.4
 	stloc.1
-// 0x01083a98: 0x1083a98: addiu a2, zero, 311
+// 0x010840bc: 0x10840bc: addiu a2, zero, 311
 	ldc.i4 311
 	stloc.3
-// 0x01083a9c: 0x1083a9c: sw    zero, 16(sp)
+// 0x010840c0: 0x10840c0: sw    zero, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -801,7 +801,7 @@ L_1083a78:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083aa0: 0x1083aa0: jal   0x100449c addu  s0, zero, zero
+// 0x010840c4: 0x10840c4: jal   0x100449c addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 12
 	ldloc.0
@@ -814,11 +814,11 @@ L_1083a78:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083aa8: 0x1083aa8: j	 0x1083c08 sll   zero, zero, 0
-	br L_1083c08
+// 0x010840cc: 0x10840cc: j	 0x108422c sll   zero, zero, 0
+	br L_108422c
 // --- basic block ---
-L_1083ab0:
-// 0x01083ab0: 0x1083ab0: lw    s5, 4000(s6)
+L_10840d4:
+// 0x010840d4: 0x10840d4: lw    s5, 4000(s6)
 	ldloc 5
 	ldloc 8
 	ldc.i4.2
@@ -827,50 +827,50 @@ L_1083ab0:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01083ab4: 0x1083ab4: sll   zero, zero, 0
-// 0x01083ab8: 0x1083ab8: sll   a1, s5, 2
+// 0x010840d8: 0x10840d8: sll   zero, zero, 0
+// 0x010840dc: 0x10840dc: sll   a1, s5, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc.2
-// 0x01083abc: 0x1083abc: slti  v0, s5, 1000
+// 0x010840e0: 0x10840e0: slti  v0, s5, 1000
 	ldloc 9
 	ldc.i4 1000
 	clt
 	stloc 6
-// 0x01083ac0: 0x1083ac0: addu  a1, a1, s6
+// 0x010840e4: 0x10840e4: addu  a1, a1, s6
 	ldloc.2
 	ldloc 8
 	add
 	stloc.2
-// 0x01083ac4: 0x1083ac4: bne   v0, zero, 0x1083af0 addiu a0, s5, 1
+// 0x010840e8: 0x10840e8: bne   v0, zero, 0x1084114 addiu a0, s5, 1
 	ldloc 6
 	ldloc 9
 	ldc.i4.1
 	add
 	stloc.1
-	brtrue L_1083af0
+	brtrue L_1084114
 // --- basic block ---
-// 0x01083acc: 0x1083acc: lui   a1, 0x20000
+// 0x010840f0: 0x10840f0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01083ad0: 0x1083ad0: lui   a3, 0x20000
+// 0x010840f4: 0x10840f4: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01083ad4: 0x1083ad4: addiu a1, a1, -22668
+// 0x010840f8: 0x10840f8: addiu a1, a1, -22204
 	ldloc.2
-	ldc.i4 -22668
+	ldc.i4 -22204
 	add
 	stloc.2
-// 0x01083ad8: 0x1083ad8: addiu a3, a3, -22252
+// 0x010840fc: 0x10840fc: addiu a3, a3, -21788
 	ldloc 4
-	ldc.i4 -22252
+	ldc.i4 -21788
 	add
 	stloc 4
-// 0x01083adc: 0x1083adc: addiu a0, zero, 3
+// 0x01084100: 0x1084100: addiu a0, zero, 3
 	ldc.i4.3
 	stloc.1
-// 0x01083ae0: 0x1083ae0: jal   0x100449c addiu a2, zero, 320
+// 0x01084104: 0x1084104: jal   0x100449c addiu a2, zero, 320
 	ldc.i4 320
 	stloc.3
 	ldloc.0
@@ -883,19 +883,19 @@ L_1083ab0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083ae8: 0x1083ae8: j	 0x1083bbc sll   zero, zero, 0
-	br L_1083bbc
+// 0x0108410c: 0x108410c: j	 0x10841e0 sll   zero, zero, 0
+	br L_10841e0
 // --- basic block ---
-L_1083af0:
-// 0x01083af0: 0x1083af0: lw    v0, 0(a1)
+L_1084114:
+// 0x01084114: 0x1084114: lw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01083af4: 0x1083af4: sll   zero, zero, 0
-// 0x01083af8: 0x1083af8: bne   v0, zero, 0x1083b24 sw    a0, 4000(s6)
+// 0x01084118: 0x1084118: sll   zero, zero, 0
+// 0x0108411c: 0x108411c: bne   v0, zero, 0x1084148 sw    a0, 4000(s6)
 	ldloc 6
 	ldloc 5
 	ldloc 8
@@ -905,12 +905,12 @@ L_1083af0:
 	add
 	ldloc.1
 	stelem.i4
-	brtrue L_1083b24
+	brtrue L_1084148
 // --- basic block ---
-// 0x01083b00: 0x1083b00: addiu a0, zero, 80
+// 0x01084124: 0x1084124: addiu a0, zero, 80
 	ldc.i4.s 80
 	stloc.1
-// 0x01083b04: 0x1083b04: sw    v1, 28(sp)
+// 0x01084128: 0x1084128: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -919,7 +919,7 @@ L_1083af0:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083b08: 0x1083b08: sw    a1, 24(sp)
+// 0x0108412c: 0x108412c: sw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -928,7 +928,7 @@ L_1083af0:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01083b0c: 0x1083b0c: jal   0x1000910 sw    a3, 32(sp)
+// 0x01084130: 0x1084130: jal   0x1000910 sw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -947,7 +947,7 @@ L_1083af0:
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083b14: 0x1083b14: lw    a1, 24(sp)
+// 0x01084138: 0x1084138: lw    a1, 24(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -956,7 +956,7 @@ L_1083af0:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01083b18: 0x1083b18: lw    a3, 32(sp)
+// 0x0108413c: 0x108413c: lw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -965,7 +965,7 @@ L_1083af0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01083b1c: 0x1083b1c: lw    v1, 28(sp)
+// 0x01084140: 0x1084140: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -974,40 +974,40 @@ L_1083af0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01083b20: 0x1083b20: sw    v0, 0(a1)
+// 0x01084144: 0x1084144: sw    v0, 0(a1)
 	ldloc 5
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldloc 6
 	stelem.i4
-L_1083b24:
-// 0x01083b24: 0x1083b24: sll   v0, s5, 2
+L_1084148:
+// 0x01084148: 0x1084148: sll   v0, s5, 2
 	ldloc 9
 	ldc.i4.2
 	shl
 	stloc 6
-// 0x01083b28: 0x1083b28: addu  v0, v0, s6
+// 0x0108414c: 0x108414c: addu  v0, v0, s6
 	ldloc 6
 	ldloc 8
 	add
 	stloc 6
-// 0x01083b2c: 0x1083b2c: lw    v0, 0(v0)
+// 0x01084150: 0x1084150: lw    v0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01083b30: 0x1083b30: sll   zero, zero, 0
-// 0x01083b34: 0x1083b34: sw    s1, 0(v0)
+// 0x01084154: 0x1084154: sll   zero, zero, 0
+// 0x01084158: 0x1084158: sw    s1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 13
 	stelem.i4
-// 0x01083b38: 0x1083b38: sw    s2, 4(v0)
+// 0x0108415c: 0x108415c: sw    s2, 4(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1016,20 +1016,20 @@ L_1083b24:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01083b3c: 0x1083b3c: lw    a0, 0(v1)
+// 0x01084160: 0x1084160: lw    a0, 0(v1)
 	ldloc 5
 	ldloc 7
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01083b40: 0x1083b40: sll   zero, zero, 0
-// 0x01083b44: 0x1083b44: bltz  a0, 0x1083b58 sll   zero, zero, 0
+// 0x01084164: 0x1084164: sll   zero, zero, 0
+// 0x01084168: 0x1084168: bltz  a0, 0x108417c sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_1083b58
+	blt L_108417c
 // --- basic block ---
-// 0x01083b4c: 0x1083b4c: sw    a0, 8(v0)
+// 0x01084170: 0x1084170: sw    a0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1038,18 +1038,18 @@ L_1083b24:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01083b50: 0x1083b50: j	 0x1083b64 addiu a0, zero, 1
+// 0x01084174: 0x1084174: j	 0x1084188 addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-	br L_1083b64
+	br L_1084188
 // --- basic block ---
-L_1083b58:
-// 0x01083b58: 0x1083b58: nor   a0, zero, a0
+L_108417c:
+// 0x0108417c: 0x108417c: nor   a0, zero, a0
 	ldloc.1
 	ldc.i4.m1
 	xor
 	stloc.1
-// 0x01083b5c: 0x1083b5c: sw    a0, 8(v0)
+// 0x01084180: 0x1084180: sw    a0, 8(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1058,11 +1058,11 @@ L_1083b58:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01083b60: 0x1083b60: addiu a0, zero, 2
+// 0x01084184: 0x1084184: addiu a0, zero, 2
 	ldc.i4.2
 	stloc.1
-L_1083b64:
-// 0x01083b64: 0x1083b64: sw    a0, 48(v0)
+L_1084188:
+// 0x01084188: 0x1084188: sw    a0, 48(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1071,7 +1071,7 @@ L_1083b64:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01083b68: 0x1083b68: lw    a0, 12(s7)
+// 0x0108418c: 0x108418c: lw    a0, 12(s7)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1080,7 +1080,7 @@ L_1083b64:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01083b6c: 0x1083b6c: sw    s7, 72(v0)
+// 0x01084190: 0x1084190: sw    s7, 72(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1089,7 +1089,7 @@ L_1083b64:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01083b70: 0x1083b70: sw    a0, 60(v0)
+// 0x01084194: 0x1084194: sw    a0, 60(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1098,7 +1098,7 @@ L_1083b64:
 	add
 	ldloc.1
 	stelem.i4
-// 0x01083b74: 0x1083b74: lw    a1, 8(s7)
+// 0x01084198: 0x1084198: lw    a1, 8(s7)
 	ldloc 5
 	ldloc 11
 	ldc.i4.2
@@ -1107,10 +1107,10 @@ L_1083b64:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01083b78: 0x1083b78: addu  a0, s5, zero
+// 0x0108419c: 0x108419c: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01083b7c: 0x1083b7c: sw    a1, 64(v0)
+// 0x010841a0: 0x10841a0: sw    a1, 64(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1119,7 +1119,7 @@ L_1083b64:
 	add
 	ldloc.2
 	stelem.i4
-// 0x01083b80: 0x1083b80: sw    s4, 68(v0)
+// 0x010841a4: 0x10841a4: sw    s4, 68(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
@@ -1128,7 +1128,7 @@ L_1083b64:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01083b84: 0x1083b84: sw    v1, 28(sp)
+// 0x010841a8: 0x10841a8: sw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1137,7 +1137,7 @@ L_1083b64:
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083b88: 0x1083b88: jal   0x1082b6c sw    a3, 32(sp)
+// 0x010841ac: 0x10841ac: jal   0x1083190 sw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1151,12 +1151,12 @@ L_1083b64:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_InstrumentSegment_1082b6c(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_InstrumentSegment_1083190(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083b90: 0x1083b90: lw    v1, 28(sp)
+// 0x010841b4: 0x10841b4: lw    v1, 28(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1165,7 +1165,7 @@ L_1083b64:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01083b94: 0x1083b94: lw    a3, 32(sp)
+// 0x010841b8: 0x10841b8: lw    a3, 32(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1174,43 +1174,43 @@ L_1083b64:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01083b98: 0x1083b98: bne   v0, zero, 0x1083ba4 sll   zero, zero, 0
+// 0x010841bc: 0x10841bc: bne   v0, zero, 0x10841c8 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1083ba4
+	brtrue L_10841c8
 // --- basic block ---
-// 0x01083ba0: 0x1083ba0: addiu s3, zero, 1
+// 0x010841c4: 0x10841c4: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 15
-L_1083ba4:
-// 0x01083ba4: 0x1083ba4: addiu s8, s8, 1
+L_10841c8:
+// 0x010841c8: 0x10841c8: addiu s8, s8, 1
 	ldloc 14
 	ldc.i4.1
 	add
 	stloc 14
-// 0x01083ba8: 0x1083ba8: addiu v1, v1, 4
+// 0x010841cc: 0x10841cc: addiu v1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc 7
-// 0x01083bac: 0x1083bac: addiu s0, zero, 1
+// 0x010841d0: 0x10841d0: addiu s0, zero, 1
 	ldc.i4.1
 	stloc 12
-L_1083bb0:
-// 0x01083bb0: 0x1083bb0: slt   v0, s8, a3
+L_10841d4:
+// 0x010841d4: 0x10841d4: slt   v0, s8, a3
 	ldloc 14
 	ldloc 4
 	clt
 	stloc 6
-// 0x01083bb4: 0x1083bb4: bne   v0, zero, 0x1083ab0 sll   zero, zero, 0
+// 0x010841d8: 0x10841d8: bne   v0, zero, 0x10840d4 sll   zero, zero, 0
 	ldloc 6
-	brtrue L_1083ab0
+	brtrue L_10840d4
 // --- basic block ---
-L_1083bbc:
-// 0x01083bbc: 0x1083bbc: beq   s3, zero, 0x1083c08 sll   zero, zero, 0
+L_10841e0:
+// 0x010841e0: 0x10841e0: beq   s3, zero, 0x108422c sll   zero, zero, 0
 	ldloc 15
-	brfalse L_1083c08
+	brfalse L_108422c
 // --- basic block ---
-// 0x01083bc4: 0x1083bc4: jal   0x100b484 addu  a0, s1, zero
+// 0x010841e8: 0x10841e8: jal   0x100b494 addu  a0, s1, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -1218,25 +1218,25 @@ L_1083bbc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083bcc: 0x1083bcc: beq   v0, zero, 0x1083bdc slt   s2, v0, s2
+// 0x010841f0: 0x10841f0: beq   v0, zero, 0x1084200 slt   s2, v0, s2
 	ldloc 6
 	ldloc 6
 	ldloc 10
 	clt
 	stloc 10
-	brfalse L_1083bdc
+	brfalse L_1084200
 // --- basic block ---
-// 0x01083bd4: 0x1083bd4: beq   s2, zero, 0x1083c08 sll   zero, zero, 0
+// 0x010841f8: 0x10841f8: beq   s2, zero, 0x108422c sll   zero, zero, 0
 	ldloc 10
-	brfalse L_1083c08
+	brfalse L_108422c
 // --- basic block ---
-L_1083bdc:
-// 0x01083bdc: 0x1083bdc: jal   0x100db90 addu  a0, s1, zero
+L_1084200:
+// 0x01084200: 0x1084200: jal   0x100dba0 addu  a0, s1, zero
 	ldloc 13
 	stloc.1
 	ldloc.0
@@ -1244,60 +1244,60 @@ L_1083bdc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083be4: 0x1083be4: beq   v0, zero, 0x1083c08 lui   v1, 0xfeff0000
+// 0x01084208: 0x1084208: beq   v0, zero, 0x108422c lui   v1, 0xfeff0000
 	ldloc 6
 	ldc.i4 4278124544
 	stloc 7
-	brfalse L_1083c08
+	brfalse L_108422c
 // --- basic block ---
-// 0x01083bec: 0x1083bec: lw    a0, 0(v0)
+// 0x01084210: 0x1084210: lw    a0, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01083bf0: 0x1083bf0: ori   v1, v1, 65499
+// 0x01084214: 0x1084214: ori   v1, v1, 65499
 	ldloc 7
 	ldc.i4 65499
 	or
 	stloc 7
-// 0x01083bf4: 0x1083bf4: and   v1, a0, v1
+// 0x01084218: 0x1084218: and   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	and
 	stloc 7
-// 0x01083bf8: 0x1083bf8: lui   a0, 0x1000000
+// 0x0108421c: 0x108421c: lui   a0, 0x1000000
 	ldc.i4 16777216
 	stloc.1
-// 0x01083bfc: 0x1083bfc: ori   a0, a0, 32
+// 0x01084220: 0x1084220: ori   a0, a0, 32
 	ldloc.1
 	ldc.i4.s 32
 	or
 	stloc.1
-// 0x01083c00: 0x1083c00: or    v1, v1, a0
+// 0x01084224: 0x1084224: or    v1, v1, a0
 	ldloc 7
 	ldloc.1
 	or
 	stloc 7
-// 0x01083c04: 0x1083c04: sw    v1, 0(v0)
+// 0x01084228: 0x1084228: sw    v1, 0(v0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
 	ldloc 7
 	stelem.i4
-L_1083c08:
-// 0x01083c08: 0x1083c08: lw    ra, 76(sp)
-// 0x01083c0c: 0x1083c0c: addu  v0, s0, zero
+L_108422c:
+// 0x0108422c: 0x108422c: lw    ra, 76(sp)
+// 0x01084230: 0x1084230: addu  v0, s0, zero
 	ldloc 12
 	stloc 6
-// 0x01083c10: 0x1083c10: lw    s8, 72(sp)
+// 0x01084234: 0x1084234: lw    s8, 72(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1306,7 +1306,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 14
-// 0x01083c14: 0x1083c14: lw    s7, 68(sp)
+// 0x01084238: 0x1084238: lw    s7, 68(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1315,7 +1315,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 11
-// 0x01083c18: 0x1083c18: lw    s6, 64(sp)
+// 0x0108423c: 0x108423c: lw    s6, 64(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1324,7 +1324,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01083c1c: 0x1083c1c: lw    s5, 60(sp)
+// 0x01084240: 0x1084240: lw    s5, 60(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1333,7 +1333,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01083c20: 0x1083c20: lw    s4, 56(sp)
+// 0x01084244: 0x1084244: lw    s4, 56(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1342,7 +1342,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01083c24: 0x1083c24: lw    s3, 52(sp)
+// 0x01084248: 0x1084248: lw    s3, 52(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1351,7 +1351,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 15
-// 0x01083c28: 0x1083c28: lw    s2, 48(sp)
+// 0x0108424c: 0x108424c: lw    s2, 48(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1360,7 +1360,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01083c2c: 0x1083c2c: lw    s1, 44(sp)
+// 0x01084250: 0x1084250: lw    s1, 44(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1369,7 +1369,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 13
-// 0x01083c30: 0x1083c30: lw    s0, 40(sp)
+// 0x01084254: 0x1084254: lw    s0, 40(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -1378,7 +1378,7 @@ L_1083c08:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01083c34: 0x1083c34: jr    ra addiu sp, sp, 80
+// 0x01084258: 0x1084258: jr    ra addiu sp, sp, 80
 	ldloc.0
 	ldc.i4.s 80
 	add
@@ -1390,7 +1390,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTTrafficInfo_TileReceivedCb_1083c3c(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_TileReceivedCb_1084260(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 ra)
@@ -1428,12 +1428,12 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083c3c: 0x1083c3c: addiu sp, sp, -24
+// 0x01084260: 0x1084260: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01083c40: 0x1083c40: sw    s0, 16(sp)
+// 0x01084264: 0x1084264: sw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1442,8 +1442,8 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01083c44: 0x1083c44: sw    ra, 20(sp)
-// 0x01083c48: 0x1083c48: jal   0x100db90 addu  s0, a0, zero
+// 0x01084268: 0x1084268: sw    ra, 20(sp)
+// 0x0108426c: 0x108426c: jal   0x100dba0 addu  s0, a0, zero
 	ldloc.1
 	stloc 8
 	ldloc.0
@@ -1451,33 +1451,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_tile_status_get_100db90(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_tile_status_get_100dba0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01083c50: 0x1083c50: lw    v1, 0(v0)
+// 0x01084274: 0x1084274: lw    v1, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 7
-// 0x01083c54: 0x1083c54: lui   v0, 0x1000000
+// 0x01084278: 0x1084278: lui   v0, 0x1000000
 	ldc.i4 16777216
 	stloc 5
-// 0x01083c58: 0x1083c58: and   v0, v1, v0
+// 0x0108427c: 0x108427c: and   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	and
 	stloc 5
-// 0x01083c5c: 0x1083c5c: beq   v0, zero, 0x1083c70 lui   v0, 0x80000
+// 0x01084280: 0x1084280: beq   v0, zero, 0x1084294 lui   v0, 0x80000
 	ldloc 5
 	ldc.i4 524288
 	stloc 5
-	brfalse L_1083c70
+	brfalse L_1084294
 // --- basic block ---
-// 0x01083c64: 0x1083c64: jal   0x1082e38 addu  a0, s0, zero
+// 0x01084288: 0x1084288: jal   0x108345c addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.0
@@ -1485,30 +1485,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl98::RTTrafficInfo_InstrumentSegments_1082e38(int32,int32,int32,int32,int32)
+	call int32 Cibyl98::RTTrafficInfo_InstrumentSegments_108345c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01083c6c: 0x1083c6c: lui   v0, 0x80000
+// 0x01084290: 0x1084290: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-L_1083c70:
-// 0x01083c70: 0x1083c70: lw    v0, -8188(v0)
+L_1084294:
+// 0x01084294: 0x1084294: lw    v0, -7724(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2047
+	ldc.i4 -1931
 	add
 	ldelem.i4
 	stloc 5
-// 0x01083c74: 0x1083c74: sll   zero, zero, 0
-// 0x01083c78: 0x1083c78: beq   v0, zero, 0x1083c88 sll   zero, zero, 0
+// 0x01084298: 0x1084298: sll   zero, zero, 0
+// 0x0108429c: 0x108429c: beq   v0, zero, 0x10842ac sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1083c88
+	brfalse L_10842ac
 // --- basic block ---
-// 0x01083c80: 0x1083c80: jalr  v0 addu  a0, s0, zero
+// 0x010842a4: 0x10842a4: jalr  v0 addu  a0, s0, zero
 	ldloc 5
 	ldloc 8
 	stloc.1
@@ -1522,9 +1522,9 @@ L_1083c70:
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1083c88:
-// 0x01083c88: 0x1083c88: lw    ra, 20(sp)
-// 0x01083c8c: 0x1083c8c: lw    s0, 16(sp)
+L_10842ac:
+// 0x010842ac: 0x10842ac: lw    ra, 20(sp)
+// 0x010842b0: 0x10842b0: lw    s0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -1533,7 +1533,7 @@ L_1083c88:
 	add
 	ldelem.i4
 	stloc 8
-// 0x01083c90: 0x1083c90: jr    ra addiu sp, sp, 24
+// 0x010842b4: 0x10842b4: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1545,7 +1545,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RTTrafficInfo_Term_1083c98(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Term_10842bc(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 ra,int32 v0,int32 v1,int32[] mem)
@@ -1580,37 +1580,37 @@ __CIBYL_function_return:
 	stloc 8
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083c98: 0x1083c98: addiu sp, sp, -24
+// 0x010842bc: 0x10842bc: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01083c9c: 0x1083c9c: sw    ra, 20(sp)
-// 0x01083ca0: 0x1083ca0: jal   0x10838e0 sll   zero, zero, 0
+// 0x010842c0: 0x10842c0: sw    ra, 20(sp)
+// 0x010842c4: 0x10842c4: jal   0x1083f04 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RTTrafficInfo_ClearAll_10838e0(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RTTrafficInfo_ClearAll_1083f04(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083ca8: 0x1083ca8: jal   0x1083e8c sll   zero, zero, 0
+// 0x010842cc: 0x10842cc: jal   0x10844b0 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeTrafficInfoPluginTerm_1083e8c(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeTrafficInfoPluginTerm_10844b0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 6
 // --- basic block ---
-// 0x01083cb0: 0x1083cb0: lw    ra, 20(sp)
-// 0x01083cb4: 0x1083cb4: sll   zero, zero, 0
-// 0x01083cb8: 0x1083cb8: jr    ra addiu sp, sp, 24
+// 0x010842d4: 0x10842d4: lw    ra, 20(sp)
+// 0x010842d8: 0x10842d8: sll   zero, zero, 0
+// 0x010842dc: 0x10842dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1622,7 +1622,7 @@ __CIBYL_function_return:
 	ldloc 6
 	ret
 }
-.method public static int32 RTTrafficInfo_Init_1083cc0(int32,int32,int32,int32,int32)
+.method public static int32 RTTrafficInfo_Init_10842e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 ra)
@@ -1657,32 +1657,32 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083cc0: 0x1083cc0: lui   a1, 0x20000
+// 0x010842e4: 0x10842e4: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01083cc4: 0x1083cc4: lui   a3, 0x20000
+// 0x010842e8: 0x10842e8: lui   a3, 0x20000
 	ldc.i4 131072
 	stloc 4
-// 0x01083cc8: 0x1083cc8: addiu sp, sp, -24
+// 0x010842ec: 0x10842ec: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01083ccc: 0x1083ccc: addiu a1, a1, -22668
+// 0x010842f0: 0x10842f0: addiu a1, a1, -22204
 	ldloc.2
-	ldc.i4 -22668
+	ldc.i4 -22204
 	add
 	stloc.2
-// 0x01083cd0: 0x1083cd0: addiu a3, a3, -22220
+// 0x010842f4: 0x10842f4: addiu a3, a3, -21756
 	ldloc 4
-	ldc.i4 -22220
+	ldc.i4 -21756
 	add
 	stloc 4
-// 0x01083cd4: 0x1083cd4: addiu a0, zero, 1
+// 0x010842f8: 0x10842f8: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01083cd8: 0x1083cd8: sw    ra, 20(sp)
-// 0x01083cdc: 0x1083cdc: jal   0x100449c addiu a2, zero, 111
+// 0x010842fc: 0x10842fc: sw    ra, 20(sp)
+// 0x01084300: 0x1084300: jal   0x100449c addiu a2, zero, 111
 	ldc.i4.s 111
 	stloc.3
 	ldloc.0
@@ -1695,18 +1695,18 @@ __CIBYL_javamethod_begin:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083ce4: 0x1083ce4: lui   v0, 0x80000
+// 0x01084308: 0x1084308: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01083ce8: 0x1083ce8: addiu v0, v0, -8180
+// 0x0108430c: 0x108430c: addiu v0, v0, -7716
 	ldloc 5
-	ldc.i4 -8180
+	ldc.i4 -7716
 	add
 	stloc 5
-// 0x01083cec: 0x1083cec: lui   v1, 0x80000
+// 0x01084310: 0x1084310: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01083cf0: 0x1083cf0: sw    zero, 2000(v0)
+// 0x01084314: 0x1084314: sw    zero, 2000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1715,41 +1715,41 @@ __CIBYL_javamethod_begin:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083cf4: 0x1083cf4: addiu v1, v1, -6180
+// 0x01084318: 0x1084318: addiu v1, v1, -5716
 	ldloc 6
-	ldc.i4 -6180
+	ldc.i4 -5716
 	add
 	stloc 6
-L_1083cf8:
-// 0x01083cf8: 0x1083cf8: sw    zero, 0(v0)
+L_108431c:
+// 0x0108431c: 0x108431c: sw    zero, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083cfc: 0x1083cfc: addiu v0, v0, 4
+// 0x01084320: 0x1084320: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01083d00: 0x1083d00: bne   v0, v1, 0x1083cf8 sll   zero, zero, 0
+// 0x01084324: 0x1084324: bne   v0, v1, 0x108431c sll   zero, zero, 0
 	ldloc 5
 	ldloc 6
-	bne.un L_1083cf8
+	bne.un L_108431c
 // --- basic block ---
-// 0x01083d08: 0x1083d08: lui   v0, 0x80000
+// 0x0108432c: 0x108432c: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01083d0c: 0x1083d0c: addiu v0, v0, -6176
+// 0x01084330: 0x1084330: addiu v0, v0, -5712
 	ldloc 5
-	ldc.i4 -6176
+	ldc.i4 -5712
 	add
 	stloc 5
-// 0x01083d10: 0x1083d10: lui   v1, 0x80000
+// 0x01084334: 0x1084334: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01083d14: 0x1083d14: sw    zero, 4000(v0)
+// 0x01084338: 0x1084338: sw    zero, 4000(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -1758,51 +1758,51 @@ L_1083cf8:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083d18: 0x1083d18: addiu v1, v1, -2176
+// 0x0108433c: 0x108433c: addiu v1, v1, -1712
 	ldloc 6
-	ldc.i4 -2176
+	ldc.i4 -1712
 	add
 	stloc 6
-L_1083d1c:
-// 0x01083d1c: 0x1083d1c: sw    zero, 0(v0)
+L_1084340:
+// 0x01084340: 0x1084340: sw    zero, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldc.i4.s 0
 	stelem.i4
-// 0x01083d20: 0x1083d20: addiu v0, v0, 4
+// 0x01084344: 0x1084344: addiu v0, v0, 4
 	ldloc 5
 	ldc.i4.4
 	add
 	stloc 5
-// 0x01083d24: 0x1083d24: bne   v0, v1, 0x1083d1c lui   a0, 0x1080000
+// 0x01084348: 0x1084348: bne   v0, v1, 0x1084340 lui   a0, 0x1080000
 	ldloc 5
 	ldloc 6
 	ldc.i4 17301504
 	stloc.1
-	bne.un L_1083d1c
+	bne.un L_1084340
 // --- basic block ---
-// 0x01083d2c: 0x1083d2c: jal   0x100ca10 addiu a0, a0, 15420
+// 0x01084350: 0x1084350: jal   0x100ca20 addiu a0, a0, 16992
 	ldloc.1
-	ldc.i4 15420
+	ldc.i4 16992
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl9::roadmap_tile_register_callback_100ca10(int32)
+	call int32 Cibyl9::roadmap_tile_register_callback_100ca20(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083d34: 0x1083d34: lui   v1, 0x80000
+// 0x01084358: 0x1084358: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01083d38: 0x1083d38: jal   0x1083ec0 sw    v0, -8188(v1)
+// 0x0108435c: 0x108435c: jal   0x10844e4 sw    v0, -7724(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2047
+	ldc.i4 -1931
 	add
 	ldloc 5
 	stelem.i4
@@ -1811,39 +1811,39 @@ L_1083d1c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeTrafficInfoPluginInit_1083ec0(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeTrafficInfoPluginInit_10844e4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083d40: 0x1083d40: lui   a0, 0x1080000
+// 0x01084364: 0x1084364: lui   a0, 0x1080000
 	ldc.i4 17301504
 	stloc.1
-// 0x01083d44: 0x1083d44: jal   0x1007620 addiu a0, a0, 13036
+// 0x01084368: 0x1084368: jal   0x1007630 addiu a0, a0, 14608
 	ldloc.1
-	ldc.i4 13036
+	ldc.i4 14608
 	add
 	stloc.1
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_register_unit_change_callback_1007620(int32)
+	call int32 Cibyl5::roadmap_math_register_unit_change_callback_1007630(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083d4c: 0x1083d4c: lw    ra, 20(sp)
-// 0x01083d50: 0x1083d50: lui   v1, 0x80000
+// 0x01084370: 0x1084370: lw    ra, 20(sp)
+// 0x01084374: 0x1084374: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01083d54: 0x1083d54: sw    v0, -8184(v1)
+// 0x01084378: 0x1084378: sw    v0, -7720(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -2046
+	ldc.i4 -1930
 	add
 	ldloc 5
 	stelem.i4
-// 0x01083d58: 0x1083d58: jr    ra addiu sp, sp, 24
+// 0x0108437c: 0x108437c: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -1855,7 +1855,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeTrafficInfoOutlineIterator_1083d60(int32,int32)
+.method public static int32 RealtimeTrafficInfoOutlineIterator_1084384(int32,int32)
 {
 .maxstack 5
 .locals init (int32 a0,int32 a1,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -1881,44 +1881,44 @@ __CIBYL_function_return:
 	stloc.3
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083d60: 0x1083d60: lui   v0, 0x80000
+// 0x01084384: 0x1084384: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc.2
-// 0x01083d64: 0x1083d64: lw    v0, -2172(v0)
+// 0x01084388: 0x1084388: lw    v0, -1708(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
-	ldc.i4 -543
+	ldc.i4 -427
 	add
 	ldelem.i4
 	stloc.2
-// 0x01083d68: 0x1083d68: sll   a0, a0, 3
+// 0x0108438c: 0x108438c: sll   a0, a0, 3
 	ldloc.0
 	ldc.i4.3
 	shl
 	stloc.0
-// 0x01083d6c: 0x1083d6c: addu  v0, v0, a0
+// 0x01084390: 0x1084390: addu  v0, v0, a0
 	ldloc.2
 	ldloc.0
 	add
 	stloc.2
-// 0x01083d70: 0x1083d70: lw    v1, 0(v0)
+// 0x01084394: 0x1084394: lw    v1, 0(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01083d74: 0x1083d74: sll   zero, zero, 0
-// 0x01083d78: 0x1083d78: sw    v1, 0(a1)
+// 0x01084398: 0x1084398: sll   zero, zero, 0
+// 0x0108439c: 0x108439c: sw    v1, 0(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
 	shr.un
 	ldloc 4
 	stelem.i4
-// 0x01083d7c: 0x1083d7c: lw    v0, 4(v0)
+// 0x010843a0: 0x10843a0: lw    v0, 4(v0)
 	ldloc 3
 	ldloc.2
 	ldc.i4.2
@@ -1927,7 +1927,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01083d80: 0x1083d80: jr    ra sw    v0, 4(a1)
+// 0x010843a4: 0x10843a4: jr    ra sw    v0, 4(a1)
 	ldloc 3
 	ldloc.1
 	ldc.i4.2
@@ -1943,7 +1943,7 @@ __CIBYL_function_return:
 	ldloc.2
 	ret
 }
-.method public static int32 isDisplayingTrafficInfoOn_1083d88(int32,int32,int32,int32,int32)
+.method public static int32 isDisplayingTrafficInfoOn_10843ac(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -1978,24 +1978,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083d88: 0x1083d88: lui   a0, 0x0
+// 0x010843ac: 0x10843ac: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01083d8c: 0x1083d8c: lui   a1, 0x0
+// 0x010843b0: 0x10843b0: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01083d90: 0x1083d90: addiu sp, sp, -24
+// 0x010843b4: 0x10843b4: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01083d94: 0x1083d94: addiu a0, a0, 17036
+// 0x010843b8: 0x10843b8: addiu a0, a0, 17036
 	ldloc.1
 	ldc.i4 17036
 	add
 	stloc.1
-// 0x01083d98: 0x1083d98: sw    ra, 20(sp)
-// 0x01083d9c: 0x1083d9c: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010843bc: 0x10843bc: sw    ra, 20(sp)
+// 0x010843c0: 0x10843c0: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2005,18 +2005,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083da4: 0x1083da4: lw    ra, 20(sp)
-// 0x01083da8: 0x1083da8: sltu  v0, zero, v0
+// 0x010843c8: 0x10843c8: lw    ra, 20(sp)
+// 0x010843cc: 0x10843cc: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01083dac: 0x1083dac: jr    ra addiu sp, sp, 24
+// 0x010843d0: 0x10843d0: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2028,7 +2028,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeTrafficInfoState_1083db4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeTrafficInfoState_10843d8(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 ra,int32[] mem,int32 v1)
@@ -2063,24 +2063,24 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083db4: 0x1083db4: lui   a0, 0x0
+// 0x010843d8: 0x10843d8: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01083db8: 0x1083db8: lui   a1, 0x0
+// 0x010843dc: 0x10843dc: lui   a1, 0x0
 	ldc.i4.s 0
 	stloc.2
-// 0x01083dbc: 0x1083dbc: addiu sp, sp, -24
+// 0x010843e0: 0x10843e0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01083dc0: 0x1083dc0: addiu a0, a0, 17036
+// 0x010843e4: 0x10843e4: addiu a0, a0, 17036
 	ldloc.1
 	ldc.i4 17036
 	add
 	stloc.1
-// 0x01083dc4: 0x1083dc4: sw    ra, 20(sp)
-// 0x01083dc8: 0x1083dc8: jal   0x100e7f4 addiu a1, a1, 20820
+// 0x010843e8: 0x10843e8: sw    ra, 20(sp)
+// 0x010843ec: 0x10843ec: jal   0x100e804 addiu a1, a1, 20820
 	ldloc.2
 	ldc.i4 20820
 	add
@@ -2090,18 +2090,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083dd0: 0x1083dd0: lw    ra, 20(sp)
-// 0x01083dd4: 0x1083dd4: sltu  v0, zero, v0
+// 0x010843f4: 0x10843f4: lw    ra, 20(sp)
+// 0x010843f8: 0x10843f8: sltu  v0, zero, v0
 	ldc.i4.s 0
 	ldloc 5
 	clt.un
 	stloc 5
-// 0x01083dd8: 0x1083dd8: jr    ra addiu sp, sp, 24
+// 0x010843fc: 0x10843fc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2113,7 +2113,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeRoadToggleShowTraffic_1083de0(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeRoadToggleShowTraffic_1084404(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 s0,int32[] mem,int32 v1,int32 s1,int32 ra)
@@ -2154,13 +2154,13 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_1083de0:
-// 0x01083de0: 0x1083de0: addiu sp, sp, -32
+L_1084404:
+// 0x01084404: 0x1084404: addiu sp, sp, -32
 	ldloc.0
 	ldc.i4.s -32
 	add
 	stloc.0
-// 0x01083de4: 0x1083de4: sw    s1, 24(sp)
+// 0x01084408: 0x1084408: sw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2169,7 +2169,7 @@ L_1083de0:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01083de8: 0x1083de8: sw    s0, 20(sp)
+// 0x0108440c: 0x108440c: sw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2178,19 +2178,19 @@ L_1083de0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01083dec: 0x1083dec: lui   s1, 0x0
+// 0x01084410: 0x1084410: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01083df0: 0x1083df0: lui   s0, 0x0
+// 0x01084414: 0x1084414: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 6
-// 0x01083df4: 0x1083df4: addiu a0, s0, 17036
+// 0x01084418: 0x1084418: addiu a0, s0, 17036
 	ldloc 6
 	ldc.i4 17036
 	add
 	stloc.1
-// 0x01083df8: 0x1083df8: sw    ra, 28(sp)
-// 0x01083dfc: 0x1083dfc: jal   0x100e7f4 addiu a1, s1, 20820
+// 0x0108441c: 0x108441c: sw    ra, 28(sp)
+// 0x01084420: 0x1084420: jal   0x100e804 addiu a1, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
@@ -2200,25 +2200,25 @@ L_1083de0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083e04: 0x1083e04: beq   v0, zero, 0x1083e20 lui   a1, 0x20000
+// 0x01084428: 0x1084428: beq   v0, zero, 0x1084444 lui   a1, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.2
-	brfalse L_1083e20
+	brfalse L_1084444
 // --- basic block ---
-// 0x01083e0c: 0x1083e0c: addiu a0, s0, 17036
+// 0x01084430: 0x1084430: addiu a0, s0, 17036
 	ldloc 6
 	ldc.i4 17036
 	add
 	stloc.1
-// 0x01083e10: 0x1083e10: jal   0x100e5c0 addiu a1, a1, 9464
+// 0x01084434: 0x1084434: jal   0x100e5d0 addiu a1, a1, 9928
 	ldloc.2
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc.2
 	ldloc.0
@@ -2226,23 +2226,23 @@ L_1083de0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083e18: 0x1083e18: j	 0x1083e30 addu  a0, zero, zero
+// 0x0108443c: 0x108443c: j	 0x1084454 addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-	br L_1083e30
+	br L_1084454
 // --- basic block ---
-L_1083e20:
-// 0x01083e20: 0x1083e20: addiu a0, s0, 17036
+L_1084444:
+// 0x01084444: 0x1084444: addiu a0, s0, 17036
 	ldloc 6
 	ldc.i4 17036
 	add
 	stloc.1
-// 0x01083e24: 0x1083e24: jal   0x100e5c0 addiu a1, s1, 20820
+// 0x01084448: 0x1084448: jal   0x100e5d0 addiu a1, s1, 20820
 	ldloc 9
 	ldc.i4 20820
 	add
@@ -2252,32 +2252,32 @@ L_1083e20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_set_100e5c0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_set_100e5d0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083e2c: 0x1083e2c: addiu a0, zero, 1
+// 0x01084450: 0x1084450: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-L_1083e30:
-// 0x01083e30: 0x1083e30: jal   0x106aab0 sll   zero, zero, 0
-	call int32 Cibyl79::Realtime_SendTrafficInfo_106aab0()
+L_1084454:
+// 0x01084454: 0x1084454: jal   0x106b0d4 sll   zero, zero, 0
+	call int32 Cibyl79::Realtime_SendTrafficInfo_106b0d4()
 	stloc 5
 // --- basic block ---
-// 0x01083e38: 0x1083e38: jal   0x1021900 sll   zero, zero, 0
+// 0x0108445c: 0x108445c: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 8
 	stloc 5
 // --- basic block ---
-// 0x01083e40: 0x1083e40: lw    ra, 28(sp)
-// 0x01083e44: 0x1083e44: lw    s1, 24(sp)
+// 0x01084464: 0x1084464: lw    ra, 28(sp)
+// 0x01084468: 0x1084468: lw    s1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2286,7 +2286,7 @@ L_1083e30:
 	add
 	ldelem.i4
 	stloc 9
-// 0x01083e48: 0x1083e48: lw    s0, 20(sp)
+// 0x0108446c: 0x108446c: lw    s0, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2295,7 +2295,7 @@ L_1083e30:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083e4c: 0x1083e4c: jr    ra addiu sp, sp, 32
+// 0x01084470: 0x1084470: jr    ra addiu sp, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
@@ -2307,7 +2307,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeTrafficInfoUregister_1083e54(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeTrafficInfoUregister_1084478(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 ra)
@@ -2342,57 +2342,57 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083e54: 0x1083e54: lui   v0, 0x80000
+// 0x01084478: 0x1084478: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01083e58: 0x1083e58: lw    a0, -2168(v0)
+// 0x0108447c: 0x108447c: lw    a0, -1704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -542
+	ldc.i4 -426
 	add
 	ldelem.i4
 	stloc.1
-// 0x01083e5c: 0x1083e5c: addiu sp, sp, -24
+// 0x01084480: 0x1084480: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01083e60: 0x1083e60: addiu v0, zero, -1
+// 0x01084484: 0x1084484: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01083e64: 0x1083e64: beq   a0, v0, 0x1083e74 sw    ra, 20(sp)
+// 0x01084488: 0x1084488: beq   a0, v0, 0x1084498 sw    ra, 20(sp)
 	ldloc.1
 	ldloc 5
-	beq  L_1083e74
+	beq  L_1084498
 // --- basic block ---
-// 0x01083e6c: 0x1083e6c: jal   0x1014714 sll   zero, zero, 0
+// 0x01084490: 0x1084490: jal   0x1014724 sll   zero, zero, 0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl14::roadmap_plugin_unregister_1014714(int32,int32)
+	call int32 Cibyl14::roadmap_plugin_unregister_1014724(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_1083e74:
-// 0x01083e74: 0x1083e74: lw    ra, 20(sp)
-// 0x01083e78: 0x1083e78: addiu v1, zero, -1
+L_1084498:
+// 0x01084498: 0x1084498: lw    ra, 20(sp)
+// 0x0108449c: 0x108449c: addiu v1, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01083e7c: 0x1083e7c: lui   v0, 0x80000
+// 0x010844a0: 0x10844a0: lui   v0, 0x80000
 	ldc.i4 524288
 	stloc 5
-// 0x01083e80: 0x1083e80: sw    v1, -2168(v0)
+// 0x010844a4: 0x10844a4: sw    v1, -1704(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -542
+	ldc.i4 -426
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083e84: 0x1083e84: jr    ra addiu sp, sp, 24
+// 0x010844a8: 0x10844a8: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2404,7 +2404,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeTrafficInfoPluginTerm_1083e8c(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeTrafficInfoPluginTerm_10844b0(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32[] mem,int32 s0,int32 v0,int32 ra,int32 v1)
@@ -2442,12 +2442,12 @@ __CIBYL_function_return:
 	stloc 5
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083e8c: 0x1083e8c: addiu sp, sp, -24
+// 0x010844b0: 0x10844b0: addiu sp, sp, -24
 	ldloc.0
 	ldc.i4.s -24
 	add
 	stloc.0
-// 0x01083e90: 0x1083e90: sw    s0, 16(sp)
+// 0x010844b4: 0x10844b4: sw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2456,44 +2456,44 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01083e94: 0x1083e94: lui   s0, 0x80000
+// 0x010844b8: 0x10844b8: lui   s0, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01083e98: 0x1083e98: lw    a0, -2168(s0)
+// 0x010844bc: 0x10844bc: lw    a0, -1704(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -542
+	ldc.i4 -426
 	add
 	ldelem.i4
 	stloc.1
-// 0x01083e9c: 0x1083e9c: sw    ra, 20(sp)
-// 0x01083ea0: 0x1083ea0: jal   0x1083e54 sll   zero, zero, 0
+// 0x010844c0: 0x10844c0: sw    ra, 20(sp)
+// 0x010844c4: 0x10844c4: jal   0x1084478 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::RealtimeTrafficInfoUregister_1083e54(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::RealtimeTrafficInfoUregister_1084478(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 9
 	stloc 7
 // --- basic block ---
-// 0x01083ea8: 0x1083ea8: lw    ra, 20(sp)
-// 0x01083eac: 0x1083eac: addiu v0, zero, -1
+// 0x010844cc: 0x10844cc: lw    ra, 20(sp)
+// 0x010844d0: 0x10844d0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 7
-// 0x01083eb0: 0x1083eb0: sw    v0, -2168(s0)
+// 0x010844d4: 0x10844d4: sw    v0, -1704(s0)
 	ldloc 5
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -542
+	ldc.i4 -426
 	add
 	ldloc 7
 	stelem.i4
-// 0x01083eb4: 0x1083eb4: lw    s0, 16(sp)
+// 0x010844d8: 0x10844d8: lw    s0, 16(sp)
 	ldloc 5
 	ldloc.0
 	ldc.i4.2
@@ -2502,7 +2502,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01083eb8: 0x1083eb8: jr    ra addiu sp, sp, 24
+// 0x010844dc: 0x10844dc: jr    ra addiu sp, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
@@ -2514,7 +2514,7 @@ __CIBYL_function_return:
 	ldloc 7
 	ret
 }
-.method public static int32 RealtimeTrafficInfoPluginInit_1083ec0(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeTrafficInfoPluginInit_10844e4(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s0,int32 s5,int32 s6,int32 lo,int32 s1,int32 s2,int32 s3,int32 s4,int32 ra)
@@ -2573,12 +2573,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x01083ec0: 0x1083ec0: addiu sp, sp, -56
+// 0x010844e4: 0x10844e4: addiu sp, sp, -56
 	ldloc.0
 	ldc.i4.s -56
 	add
 	stloc.0
-// 0x01083ec4: 0x1083ec4: sw    s5, 44(sp)
+// 0x010844e8: 0x10844e8: sw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2587,7 +2587,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01083ec8: 0x1083ec8: sw    s0, 24(sp)
+// 0x010844ec: 0x10844ec: sw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2596,35 +2596,35 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01083ecc: 0x1083ecc: lui   s5, 0x0
+// 0x010844f0: 0x10844f0: lui   s5, 0x0
 	ldc.i4.s 0
 	stloc 9
-// 0x01083ed0: 0x1083ed0: lui   s0, 0x0
+// 0x010844f4: 0x10844f4: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01083ed4: 0x1083ed4: lui   a2, 0x20000
+// 0x010844f8: 0x10844f8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01083ed8: 0x1083ed8: addiu a0, s0, 26236
+// 0x010844fc: 0x10844fc: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01083edc: 0x1083edc: addiu a1, s5, 17052
+// 0x01084500: 0x1084500: addiu a1, s5, 17052
 	ldloc 9
 	ldc.i4 17052
 	add
 	stloc.2
-// 0x01083ee0: 0x1083ee0: addiu a2, a2, -22196
+// 0x01084504: 0x1084504: addiu a2, a2, -21732
 	ldloc.3
-	ldc.i4 -22196
+	ldc.i4 -21732
 	add
 	stloc.3
-// 0x01083ee4: 0x1083ee4: addu  a3, zero, zero
+// 0x01084508: 0x1084508: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01083ee8: 0x1083ee8: sw    ra, 52(sp)
-// 0x01083eec: 0x1083eec: sw    s6, 48(sp)
+// 0x0108450c: 0x108450c: sw    ra, 52(sp)
+// 0x01084510: 0x1084510: sw    s6, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2633,7 +2633,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01083ef0: 0x1083ef0: sw    s4, 40(sp)
+// 0x01084514: 0x1084514: sw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2642,7 +2642,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01083ef4: 0x1083ef4: sw    s3, 36(sp)
+// 0x01084518: 0x1084518: sw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2651,7 +2651,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01083ef8: 0x1083ef8: sw    s2, 32(sp)
+// 0x0108451c: 0x108451c: sw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2660,7 +2660,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x01083efc: 0x1083efc: sw    s1, 28(sp)
+// 0x01084520: 0x1084520: sw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2669,7 +2669,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01083f00: 0x1083f00: jal   0x100edb0 lui   s4, 0x0
+// 0x01084524: 0x1084524: jal   0x100edc0 lui   s4, 0x0
 	ldc.i4.s 0
 	stloc 15
 	ldloc.0
@@ -2677,30 +2677,30 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083f08: 0x1083f08: lui   a2, 0x20000
+// 0x0108452c: 0x108452c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01083f0c: 0x1083f0c: addiu a0, s0, 26236
+// 0x01084530: 0x1084530: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01083f10: 0x1083f10: addiu a2, a2, -22188
+// 0x01084534: 0x1084534: addiu a2, a2, -21724
 	ldloc.3
-	ldc.i4 -22188
+	ldc.i4 -21724
 	add
 	stloc.3
-// 0x01083f14: 0x1083f14: addiu a1, s4, 17068
+// 0x01084538: 0x1084538: addiu a1, s4, 17068
 	ldloc 15
 	ldc.i4 17068
 	add
 	stloc.2
-// 0x01083f18: 0x1083f18: jal   0x100edb0 addu  a3, zero, zero
+// 0x0108453c: 0x108453c: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2708,33 +2708,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083f20: 0x1083f20: lui   s3, 0x0
+// 0x01084544: 0x1084544: lui   s3, 0x0
 	ldc.i4.s 0
 	stloc 14
-// 0x01083f24: 0x1083f24: lui   a2, 0x10000
+// 0x01084548: 0x1084548: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01083f28: 0x1083f28: addiu a0, s0, 26236
+// 0x0108454c: 0x108454c: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01083f2c: 0x1083f2c: addiu a2, a2, -31204
+// 0x01084550: 0x1084550: addiu a2, a2, -31204
 	ldloc.3
 	ldc.i4 -31204
 	add
 	stloc.3
-// 0x01083f30: 0x1083f30: addiu a1, s3, 17084
+// 0x01084554: 0x1084554: addiu a1, s3, 17084
 	ldloc 14
 	ldc.i4 17084
 	add
 	stloc.2
-// 0x01083f34: 0x1083f34: jal   0x100edb0 addu  a3, zero, zero
+// 0x01084558: 0x1084558: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2742,33 +2742,33 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083f3c: 0x1083f3c: lui   s2, 0x0
+// 0x01084560: 0x1084560: lui   s2, 0x0
 	ldc.i4.s 0
 	stloc 13
-// 0x01083f40: 0x1083f40: lui   a2, 0x20000
+// 0x01084564: 0x1084564: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01083f44: 0x1083f44: addiu a0, s0, 26236
+// 0x01084568: 0x1084568: addiu a0, s0, 26236
 	ldloc 8
 	ldc.i4 26236
 	add
 	stloc.1
-// 0x01083f48: 0x1083f48: addiu a2, a2, -22180
+// 0x0108456c: 0x108456c: addiu a2, a2, -21716
 	ldloc.3
-	ldc.i4 -22180
+	ldc.i4 -21716
 	add
 	stloc.3
-// 0x01083f4c: 0x1083f4c: addiu a1, s2, 17100
+// 0x01084570: 0x1084570: addiu a1, s2, 17100
 	ldloc 13
 	ldc.i4 17100
 	add
 	stloc.2
-// 0x01083f50: 0x1083f50: jal   0x100edb0 addu  a3, zero, zero
+// 0x01084574: 0x1084574: jal   0x100edc0 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -2776,47 +2776,47 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_100edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_100edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083f58: 0x1083f58: lui   s1, 0x0
+// 0x0108457c: 0x108457c: lui   s1, 0x0
 	ldc.i4.s 0
 	stloc 12
-// 0x01083f5c: 0x1083f5c: lui   s0, 0x0
+// 0x01084580: 0x1084580: lui   s0, 0x0
 	ldc.i4.s 0
 	stloc 8
-// 0x01083f60: 0x1083f60: lui   a0, 0x10000
+// 0x01084584: 0x1084584: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01083f64: 0x1083f64: lui   v0, 0x20000
+// 0x01084588: 0x1084588: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01083f68: 0x1083f68: addu  a2, zero, zero
+// 0x0108458c: 0x108458c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01083f6c: 0x1083f6c: addiu a3, s0, 20820
+// 0x01084590: 0x1084590: addiu a3, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
 	stloc 4
-// 0x01083f70: 0x1083f70: addiu a0, a0, 12560
+// 0x01084594: 0x1084594: addiu a0, a0, 12556
 	ldloc.1
-	ldc.i4 12560
+	ldc.i4 12556
 	add
 	stloc.1
-// 0x01083f74: 0x1083f74: addiu a1, s1, 17036
+// 0x01084598: 0x1084598: addiu a1, s1, 17036
 	ldloc 12
 	ldc.i4 17036
 	add
 	stloc.2
-// 0x01083f78: 0x1083f78: addiu v0, v0, 9464
+// 0x0108459c: 0x108459c: addiu v0, v0, 9928
 	ldloc 5
-	ldc.i4 9464
+	ldc.i4 9928
 	add
 	stloc 5
-// 0x01083f7c: 0x1083f7c: sw    v0, 16(sp)
+// 0x010845a0: 0x10845a0: sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2825,7 +2825,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01083f80: 0x1083f80: jal   0x100edf8 sw    zero, 20(sp)
+// 0x010845a4: 0x10845a4: jal   0x100ee08 sw    zero, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -2839,20 +2839,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_declare_enumeration_100edf8(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_declare_enumeration_100ee08(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083f88: 0x1083f88: lui   a0, 0x20000
+// 0x010845ac: 0x10845ac: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01083f8c: 0x1083f8c: addu  a1, zero, zero
+// 0x010845b0: 0x10845b0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01083f90: 0x1083f90: jal   0x104ef00 addiu a0, a0, -22172
+// 0x010845b4: 0x10845b4: jal   0x104ef10 addiu a0, a0, -21708
 	ldloc.1
-	ldc.i4 -22172
+	ldc.i4 -21708
 	add
 	stloc.1
 	ldloc.0
@@ -2860,25 +2860,25 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083f98: 0x1083f98: lui   s6, 0x80000
+// 0x010845bc: 0x10845bc: lui   s6, 0x80000
 	ldc.i4 524288
 	stloc 10
-// 0x01083f9c: 0x1083f9c: addiu a0, s5, 17052
+// 0x010845c0: 0x10845c0: addiu a0, s5, 17052
 	ldloc 9
 	ldc.i4 17052
 	add
 	stloc.1
-// 0x01083fa0: 0x1083fa0: jal   0x100e348 sw    v0, -2164(s6)
+// 0x010845c4: 0x10845c4: jal   0x100e358 sw    v0, -1700(s6)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
-	ldc.i4 -541
+	ldc.i4 -425
 	add
 	ldloc 5
 	stelem.i4
@@ -2887,12 +2887,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083fa8: 0x1083fa8: jal   0x104edb0 addu  a0, v0, zero
+// 0x010845cc: 0x10845cc: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2900,48 +2900,48 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083fb0: 0x1083fb0: jal   0x101fa7c addiu s5, zero, 25
+// 0x010845d4: 0x10845d4: jal   0x101fa8c addiu s5, zero, 25
 	ldc.i4.s 25
 	stloc 9
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083fb8: 0x1083fb8: div   v0, s5
+// 0x010845dc: 0x10845dc: div   v0, s5
 	ldloc 5
 	ldloc 9
 	div
 	stloc 11
-// 0x01083fbc: 0x1083fbc: mflo  lo
+// 0x010845e0: 0x10845e0: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01083fc0: 0x1083fc0: jal   0x104dd5c addiu s6, s6, -2164
+// 0x010845e4: 0x10845e4: jal   0x104dd6c addiu s6, s6, -1700
 	ldloc 10
-	ldc.i4 -2164
+	ldc.i4 -1700
 	add
 	stloc 10
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083fc8: 0x1083fc8: lui   a0, 0x20000
+// 0x010845ec: 0x10845ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01083fcc: 0x1083fcc: addu  a1, zero, zero
+// 0x010845f0: 0x10845f0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01083fd0: 0x1083fd0: jal   0x104ef00 addiu a0, a0, -22144
+// 0x010845f4: 0x10845f4: jal   0x104ef10 addiu a0, a0, -21680
 	ldloc.1
-	ldc.i4 -22144
+	ldc.i4 -21680
 	add
 	stloc.1
 	ldloc.0
@@ -2949,17 +2949,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083fd8: 0x1083fd8: addiu a0, s4, 17068
+// 0x010845fc: 0x10845fc: addiu a0, s4, 17068
 	ldloc 15
 	ldc.i4 17068
 	add
 	stloc.1
-// 0x01083fdc: 0x1083fdc: jal   0x100e348 sw    v0, 4(s6)
+// 0x01084600: 0x1084600: jal   0x100e358 sw    v0, 4(s6)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -2973,12 +2973,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083fe4: 0x1083fe4: jal   0x104edb0 addu  a0, v0, zero
+// 0x01084608: 0x1084608: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -2986,42 +2986,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083fec: 0x1083fec: jal   0x101fa7c sll   zero, zero, 0
+// 0x01084610: 0x1084610: jal   0x101fa8c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01083ff4: 0x1083ff4: div   v0, s5
+// 0x01084618: 0x1084618: div   v0, s5
 	ldloc 5
 	ldloc 9
 	div
 	stloc 11
-// 0x01083ff8: 0x1083ff8: mflo  lo
+// 0x0108461c: 0x108461c: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01083ffc: 0x1083ffc: jal   0x104dd5c sll   zero, zero, 0
+// 0x01084620: 0x1084620: jal   0x104dd6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084004: 0x1084004: lui   a0, 0x20000
+// 0x01084628: 0x1084628: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084008: 0x1084008: addu  a1, zero, zero
+// 0x0108462c: 0x108462c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108400c: 0x108400c: jal   0x104ef00 addiu a0, a0, -22116
+// 0x01084630: 0x1084630: jal   0x104ef10 addiu a0, a0, -21652
 	ldloc.1
-	ldc.i4 -22116
+	ldc.i4 -21652
 	add
 	stloc.1
 	ldloc.0
@@ -3029,17 +3029,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084014: 0x1084014: addiu a0, s3, 17084
+// 0x01084638: 0x1084638: addiu a0, s3, 17084
 	ldloc 14
 	ldc.i4 17084
 	add
 	stloc.1
-// 0x01084018: 0x1084018: jal   0x100e348 sw    v0, 8(s6)
+// 0x0108463c: 0x108463c: jal   0x100e358 sw    v0, 8(s6)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -3053,12 +3053,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084020: 0x1084020: jal   0x104edb0 addu  a0, v0, zero
+// 0x01084644: 0x1084644: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3066,42 +3066,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084028: 0x1084028: jal   0x101fa7c sll   zero, zero, 0
+// 0x0108464c: 0x108464c: jal   0x101fa8c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084030: 0x1084030: div   v0, s5
+// 0x01084654: 0x1084654: div   v0, s5
 	ldloc 5
 	ldloc 9
 	div
 	stloc 11
-// 0x01084034: 0x1084034: mflo  lo
+// 0x01084658: 0x1084658: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01084038: 0x1084038: jal   0x104dd5c sll   zero, zero, 0
+// 0x0108465c: 0x108465c: jal   0x104dd6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084040: 0x1084040: lui   a0, 0x20000
+// 0x01084664: 0x1084664: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084044: 0x1084044: addu  a1, zero, zero
+// 0x01084668: 0x1084668: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084048: 0x1084048: jal   0x104ef00 addiu a0, a0, -22088
+// 0x0108466c: 0x108466c: jal   0x104ef10 addiu a0, a0, -21624
 	ldloc.1
-	ldc.i4 -22088
+	ldc.i4 -21624
 	add
 	stloc.1
 	ldloc.0
@@ -3109,17 +3109,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084050: 0x1084050: addiu a0, s2, 17100
+// 0x01084674: 0x1084674: addiu a0, s2, 17100
 	ldloc 13
 	ldc.i4 17100
 	add
 	stloc.1
-// 0x01084054: 0x1084054: jal   0x100e348 sw    v0, 12(s6)
+// 0x01084678: 0x1084678: jal   0x100e358 sw    v0, 12(s6)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -3133,12 +3133,12 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_get_100e348(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_get_100e358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108405c: 0x108405c: jal   0x104edb0 addu  a0, v0, zero
+// 0x01084680: 0x1084680: jal   0x104edc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -3146,42 +3146,42 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084064: 0x1084064: jal   0x101fa7c sll   zero, zero, 0
+// 0x01084688: 0x1084688: jal   0x101fa8c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108406c: 0x108406c: div   v0, s5
+// 0x01084690: 0x1084690: div   v0, s5
 	ldloc 5
 	ldloc 9
 	div
 	stloc 11
-// 0x01084070: 0x1084070: mflo  lo
+// 0x01084694: 0x1084694: mflo  lo
 	ldloc 11
 	stloc.1
-// 0x01084074: 0x1084074: jal   0x104dd5c sll   zero, zero, 0
+// 0x01084698: 0x1084698: jal   0x104dd6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108407c: 0x108407c: lui   a0, 0x20000
+// 0x010846a0: 0x10846a0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084080: 0x1084080: addu  a1, zero, zero
+// 0x010846a4: 0x10846a4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084084: 0x1084084: jal   0x104ef00 addiu a0, a0, -22052
+// 0x010846a8: 0x10846a8: jal   0x104ef10 addiu a0, a0, -21588
 	ldloc.1
-	ldc.i4 -22052
+	ldc.i4 -21588
 	add
 	stloc.1
 	ldloc.0
@@ -3189,28 +3189,28 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_create_pen_104ef00(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_create_pen_104ef10(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108408c: 0x108408c: lui   a0, 0x0
+// 0x010846b0: 0x10846b0: lui   a0, 0x0
 	ldc.i4.s 0
 	stloc.1
-// 0x01084090: 0x1084090: addiu a0, a0, 31980
+// 0x010846b4: 0x10846b4: addiu a0, a0, 31980
 	ldloc.1
 	ldc.i4 31980
 	add
 	stloc.1
-// 0x01084094: 0x1084094: lui   v1, 0x80000
+// 0x010846b8: 0x10846b8: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x01084098: 0x1084098: jal   0x104edb0 sw    v0, -2140(v1)
+// 0x010846bc: 0x10846bc: jal   0x104edc0 sw    v0, -1676(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -535
+	ldc.i4 -419
 	add
 	ldloc 5
 	stelem.i4
@@ -3219,17 +3219,17 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_set_foreground_104edb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_set_foreground_104edc0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010840a0: 0x10840a0: addiu a0, s1, 17036
+// 0x010846c4: 0x10846c4: addiu a0, s1, 17036
 	ldloc 12
 	ldc.i4 17036
 	add
 	stloc.1
-// 0x010840a4: 0x10840a4: jal   0x100e7f4 addiu a1, s0, 20820
+// 0x010846c8: 0x10846c8: jal   0x100e804 addiu a1, s0, 20820
 	ldloc 8
 	ldc.i4 20820
 	add
@@ -3239,18 +3239,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl10::roadmap_config_match_100e7f4(int32,int32,int32,int32,int32)
+	call int32 Cibyl10::roadmap_config_match_100e804(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010840ac: 0x10840ac: beq   v0, zero, 0x10840cc lui   a0, 0x0
+// 0x010846d0: 0x10846d0: beq   v0, zero, 0x10846f0 lui   a0, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc.1
-	brfalse L_10840cc
+	brfalse L_10846f0
 // --- basic block ---
-// 0x010840b4: 0x10840b4: jal   0x10146b8 addiu a0, a0, 17116
+// 0x010846d8: 0x10846d8: jal   0x10146c8 addiu a0, a0, 17116
 	ldloc.1
 	ldc.i4 17116
 	add
@@ -3259,32 +3259,32 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl14::roadmap_plugin_register_10146b8(int32,int32,int32,int32)
+	call int32 Cibyl14::roadmap_plugin_register_10146c8(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010840bc: 0x10840bc: lui   v1, 0x80000
+// 0x010846e0: 0x10846e0: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010840c0: 0x10840c0: addiu a0, zero, 1
+// 0x010846e4: 0x10846e4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x010840c4: 0x10840c4: jal   0x106aab0 sw    v0, -2168(v1)
+// 0x010846e8: 0x10846e8: jal   0x106b0d4 sw    v0, -1704(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -542
+	ldc.i4 -426
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl79::Realtime_SendTrafficInfo_106aab0()
+	call int32 Cibyl79::Realtime_SendTrafficInfo_106b0d4()
 	stloc 5
 // --- basic block ---
-L_10840cc:
-// 0x010840cc: 0x10840cc: lw    ra, 52(sp)
-// 0x010840d0: 0x10840d0: lw    s6, 48(sp)
+L_10846f0:
+// 0x010846f0: 0x10846f0: lw    ra, 52(sp)
+// 0x010846f4: 0x10846f4: lw    s6, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3293,7 +3293,7 @@ L_10840cc:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010840d4: 0x10840d4: lw    s5, 44(sp)
+// 0x010846f8: 0x10846f8: lw    s5, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3302,7 +3302,7 @@ L_10840cc:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010840d8: 0x10840d8: lw    s4, 40(sp)
+// 0x010846fc: 0x10846fc: lw    s4, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3311,7 +3311,7 @@ L_10840cc:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010840dc: 0x10840dc: lw    s3, 36(sp)
+// 0x01084700: 0x1084700: lw    s3, 36(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3320,7 +3320,7 @@ L_10840cc:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010840e0: 0x10840e0: lw    s2, 32(sp)
+// 0x01084704: 0x1084704: lw    s2, 32(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3329,7 +3329,7 @@ L_10840cc:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010840e4: 0x10840e4: lw    s1, 28(sp)
+// 0x01084708: 0x1084708: lw    s1, 28(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3338,7 +3338,7 @@ L_10840cc:
 	add
 	ldelem.i4
 	stloc 12
-// 0x010840e8: 0x10840e8: lw    s0, 24(sp)
+// 0x0108470c: 0x108470c: lw    s0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -3347,7 +3347,7 @@ L_10840cc:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010840ec: 0x10840ec: jr    ra addiu sp, sp, 56
+// 0x01084710: 0x1084710: jr    ra addiu sp, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
@@ -3359,7 +3359,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeTrafficInfoScreenRepaint_10840f4(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeTrafficInfoScreenRepaint_1084718(int32,int32,int32,int32,int32)
 {
 .maxstack 8
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32[] mem,int32 v1,int32 s0,int32 s1,int32 s2,int32 s4,int32 lo,int32 s5,int32 s6,int32 s8,int32 s3,int32 s7,int32 t0,int32 t1,int32 ra)
@@ -3430,14 +3430,14 @@ __CIBYL_function_return:
 	stloc 6
 __CIBYL_javamethod_begin:
 // --- basic block ---
-L_10840f4:
-// 0x010840f4: 0x10840f4: addiu sp, sp, -112
+L_1084718:
+// 0x01084718: 0x1084718: addiu sp, sp, -112
 	ldloc.0
 	ldc.i4.s -112
 	add
 	stloc.0
-// 0x010840f8: 0x10840f8: sw    ra, 108(sp)
-// 0x010840fc: 0x10840fc: sw    s8, 104(sp)
+// 0x0108471c: 0x108471c: sw    ra, 108(sp)
+// 0x01084720: 0x1084720: sw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3446,7 +3446,7 @@ L_10840f4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01084100: 0x1084100: sw    s7, 100(sp)
+// 0x01084724: 0x1084724: sw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3455,7 +3455,7 @@ L_10840f4:
 	add
 	ldloc 17
 	stelem.i4
-// 0x01084104: 0x1084104: sw    s6, 96(sp)
+// 0x01084728: 0x1084728: sw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3464,7 +3464,7 @@ L_10840f4:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01084108: 0x1084108: sw    s5, 92(sp)
+// 0x0108472c: 0x108472c: sw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3473,7 +3473,7 @@ L_10840f4:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108410c: 0x108410c: sw    s4, 88(sp)
+// 0x01084730: 0x1084730: sw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3482,7 +3482,7 @@ L_10840f4:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01084110: 0x1084110: sw    s3, 84(sp)
+// 0x01084734: 0x1084734: sw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3491,7 +3491,7 @@ L_10840f4:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01084114: 0x1084114: sw    s2, 80(sp)
+// 0x01084738: 0x1084738: sw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3500,7 +3500,7 @@ L_10840f4:
 	add
 	ldloc 10
 	stelem.i4
-// 0x01084118: 0x1084118: sw    s1, 76(sp)
+// 0x0108473c: 0x108473c: sw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3509,7 +3509,7 @@ L_10840f4:
 	add
 	ldloc 9
 	stelem.i4
-// 0x0108411c: 0x108411c: jal   0x101fa7c sw    s0, 72(sp)
+// 0x01084740: 0x1084740: jal   0x101fa8c sw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3519,82 +3519,82 @@ L_10840f4:
 	ldloc 8
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084124: 0x1084124: jal   0x1083d88 sll   zero, zero, 0
+// 0x01084748: 0x1084748: jal   0x10843ac sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl99::isDisplayingTrafficInfoOn_1083d88(int32,int32,int32,int32,int32)
+	call int32 Cibyl99::isDisplayingTrafficInfoOn_10843ac(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108412c: 0x108412c: beq   v0, zero, 0x10847a8 sll   zero, zero, 0
+// 0x01084750: 0x1084750: beq   v0, zero, 0x1084dcc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10847a8
+	brfalse L_1084dcc
 // --- basic block ---
-// 0x01084134: 0x1084134: jal   0x10a6f18 sll   zero, zero, 0
+// 0x01084758: 0x1084758: jal   0x10a7560 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl124::roadmap_map_settings_color_roads_10a6f18(int32,int32,int32,int32,int32)
+	call int32 Cibyl124::roadmap_map_settings_color_roads_10a7560(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108413c: 0x108413c: beq   v0, zero, 0x10847a8 sll   zero, zero, 0
+// 0x01084760: 0x1084760: beq   v0, zero, 0x1084dcc sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10847a8
+	brfalse L_1084dcc
 // --- basic block ---
-// 0x01084144: 0x1084144: jal   0x108288c sll   zero, zero, 0
-	call int32 Cibyl98::RTTrafficInfo_IsEmpty_108288c()
+// 0x01084768: 0x1084768: jal   0x1082eb0 sll   zero, zero, 0
+	call int32 Cibyl98::RTTrafficInfo_IsEmpty_1082eb0()
 	stloc 5
 // --- basic block ---
-// 0x0108414c: 0x108414c: bne   v0, zero, 0x10847a8 sll   zero, zero, 0
+// 0x01084770: 0x1084770: bne   v0, zero, 0x1084dcc sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10847a8
+	brtrue L_1084dcc
 // --- basic block ---
-// 0x01084154: 0x1084154: jal   0x100ae78 sll   zero, zero, 0
+// 0x01084778: 0x1084778: jal   0x100ae88 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae78(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_current_scale_factor_100ae88(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108415c: 0x108415c: slti  v0, v0, 2
+// 0x01084780: 0x1084780: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x01084160: 0x1084160: bne   v0, zero, 0x10842d4 sll   zero, zero, 0
+// 0x01084784: 0x1084784: bne   v0, zero, 0x10848f8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10842d4
+	brtrue L_10848f8
 // --- basic block ---
-// 0x01084168: 0x1084168: jal   0x108289c lui   s1, 0xe0000
+// 0x0108478c: 0x108478c: jal   0x1082ec0 lui   s1, 0xe0000
 	ldc.i4 917504
 	stloc 9
-	call int32 Cibyl98::RTTrafficInfo_Count_108289c()
+	call int32 Cibyl98::RTTrafficInfo_Count_1082ec0()
 	stloc 5
 // --- basic block ---
-// 0x01084170: 0x1084170: lui   s6, 0x80000
+// 0x01084794: 0x1084794: lui   s6, 0x80000
 	ldc.i4 524288
 	stloc 14
-// 0x01084174: 0x1084174: lui   s8, 0x1080000
+// 0x01084798: 0x1084798: lui   s8, 0x1080000
 	ldc.i4 17301504
 	stloc 15
-// 0x01084178: 0x1084178: sw    v0, 56(sp)
+// 0x0108479c: 0x108479c: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3603,55 +3603,55 @@ L_10840f4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108417c: 0x108417c: addiu s1, s1, 29604
+// 0x010847a0: 0x10847a0: addiu s1, s1, 30068
 	ldloc 9
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 9
-// 0x01084180: 0x1084180: addiu s6, s6, -2164
+// 0x010847a4: 0x10847a4: addiu s6, s6, -1700
 	ldloc 14
-	ldc.i4 -2164
+	ldc.i4 -1700
 	add
 	stloc 14
-// 0x01084184: 0x1084184: addiu s8, s8, 15712
+// 0x010847a8: 0x10847a8: addiu s8, s8, 17284
 	ldloc 15
-	ldc.i4 15712
+	ldc.i4 17284
 	add
 	stloc 15
-// 0x01084188: 0x1084188: addiu s2, zero, -1
+// 0x010847ac: 0x10847ac: addiu s2, zero, -1
 	ldc.i4.m1
 	stloc 10
-// 0x0108418c: 0x108418c: addu  s0, zero, zero
+// 0x010847b0: 0x10847b0: addu  s0, zero, zero
 	ldc.i4.s 0
 	stloc 8
-// 0x01084190: 0x1084190: addiu s5, zero, 25
+// 0x010847b4: 0x10847b4: addiu s5, zero, 25
 	ldc.i4.s 25
 	stloc 13
-// 0x01084194: 0x1084194: lui   s4, 0x80000
+// 0x010847b8: 0x10847b8: lui   s4, 0x80000
 	ldc.i4 524288
 	stloc 11
-// 0x01084198: 0x1084198: addiu s3, zero, 1
+// 0x010847bc: 0x10847bc: addiu s3, zero, 1
 	ldc.i4.1
 	stloc 16
-// 0x0108419c: 0x108419c: j	 0x10842b8 addiu s7, zero, -1
+// 0x010847c0: 0x10847c0: j	 0x10848dc addiu s7, zero, -1
 	ldc.i4.m1
 	stloc 17
-	br L_10842b8
+	br L_10848dc
 // --- basic block ---
-L_10841a4:
-// 0x010841a4: 0x10841a4: jal   0x1082934 addu  a0, s0, zero
+L_10847c8:
+// 0x010847c8: 0x10847c8: jal   0x1082f58 addu  a0, s0, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
-	call int32 Cibyl98::RTTrafficInfo_Get_1082934(int32)
+	call int32 Cibyl98::RTTrafficInfo_Get_1082f58(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010841ac: 0x10841ac: addu  v1, v0, zero
+// 0x010847d0: 0x10847d0: addu  v1, v0, zero
 	ldloc 5
 	stloc 7
-// 0x010841b0: 0x10841b0: lw    v0, 824(v0)
+// 0x010847d4: 0x10847d4: lw    v0, 824(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -3660,17 +3660,17 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010841b4: 0x10841b4: sll   zero, zero, 0
-// 0x010841b8: 0x10841b8: slti  v0, v0, 2
+// 0x010847d8: 0x10847d8: sll   zero, zero, 0
+// 0x010847dc: 0x10847dc: slti  v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	clt
 	stloc 5
-// 0x010841bc: 0x10841bc: bne   v0, zero, 0x10842b4 sll   zero, zero, 0
+// 0x010847e0: 0x10847e0: bne   v0, zero, 0x10848d8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10842b4
+	brtrue L_10848d8
 // --- basic block ---
-// 0x010841c4: 0x10841c4: lw    a0, 2436(v1)
+// 0x010847e8: 0x10847e8: lw    a0, 2436(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3679,7 +3679,7 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010841c8: 0x10841c8: lw    v0, 56(s1)
+// 0x010847ec: 0x10847ec: lw    v0, 56(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3688,17 +3688,17 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010841cc: 0x10841cc: sll   zero, zero, 0
-// 0x010841d0: 0x10841d0: slt   v0, v0, a0
+// 0x010847f0: 0x10847f0: sll   zero, zero, 0
+// 0x010847f4: 0x10847f4: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x010841d4: 0x10841d4: bne   v0, zero, 0x10842b4 sll   zero, zero, 0
+// 0x010847f8: 0x10847f8: bne   v0, zero, 0x10848d8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10842b4
+	brtrue L_10848d8
 // --- basic block ---
-// 0x010841dc: 0x10841dc: lw    a0, 2428(v1)
+// 0x01084800: 0x1084800: lw    a0, 2428(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3707,7 +3707,7 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010841e0: 0x10841e0: lw    v0, 64(s1)
+// 0x01084804: 0x1084804: lw    v0, 64(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3716,17 +3716,17 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010841e4: 0x10841e4: sll   zero, zero, 0
-// 0x010841e8: 0x10841e8: slt   v0, a0, v0
+// 0x01084808: 0x1084808: sll   zero, zero, 0
+// 0x0108480c: 0x108480c: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x010841ec: 0x10841ec: bne   v0, zero, 0x10842b4 sll   zero, zero, 0
+// 0x01084810: 0x1084810: bne   v0, zero, 0x10848d8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10842b4
+	brtrue L_10848d8
 // --- basic block ---
-// 0x010841f4: 0x10841f4: lw    a0, 2440(v1)
+// 0x01084818: 0x1084818: lw    a0, 2440(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3735,7 +3735,7 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010841f8: 0x10841f8: lw    v0, 60(s1)
+// 0x0108481c: 0x108481c: lw    v0, 60(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3744,17 +3744,17 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010841fc: 0x10841fc: sll   zero, zero, 0
-// 0x01084200: 0x1084200: slt   v0, v0, a0
+// 0x01084820: 0x1084820: sll   zero, zero, 0
+// 0x01084824: 0x1084824: slt   v0, v0, a0
 	ldloc 5
 	ldloc.1
 	clt
 	stloc 5
-// 0x01084204: 0x1084204: bne   v0, zero, 0x10842b4 sll   zero, zero, 0
+// 0x01084828: 0x1084828: bne   v0, zero, 0x10848d8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10842b4
+	brtrue L_10848d8
 // --- basic block ---
-// 0x0108420c: 0x108420c: lw    a0, 2432(v1)
+// 0x01084830: 0x1084830: lw    a0, 2432(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3763,7 +3763,7 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01084210: 0x1084210: lw    v0, 68(s1)
+// 0x01084834: 0x1084834: lw    v0, 68(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -3772,21 +3772,21 @@ L_10841a4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084214: 0x1084214: sll   zero, zero, 0
-// 0x01084218: 0x1084218: slt   v0, a0, v0
+// 0x01084838: 0x1084838: sll   zero, zero, 0
+// 0x0108483c: 0x108483c: slt   v0, a0, v0
 	ldloc.1
 	ldloc 5
 	clt
 	stloc 5
-// 0x0108421c: 0x108421c: bne   v0, zero, 0x10842b4 sll   zero, zero, 0
+// 0x01084840: 0x1084840: bne   v0, zero, 0x10848d8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10842b4
+	brtrue L_10848d8
 // --- basic block ---
-// 0x01084224: 0x1084224: j	 0x10846ec sll   zero, zero, 0
-	br L_10846ec
+// 0x01084848: 0x1084848: j	 0x1084d10 sll   zero, zero, 0
+	br L_1084d10
 // --- basic block ---
-L_108422c:
-// 0x0108422c: 0x108422c: jal   0x104e35c sw    v1, 68(sp)
+L_1084850:
+// 0x01084850: 0x1084850: jal   0x104e36c sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3800,12 +3800,12 @@ L_108422c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084234: 0x1084234: lw    v1, 68(sp)
+// 0x01084858: 0x1084858: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3814,9 +3814,9 @@ L_108422c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084238: 0x1084238: sll   zero, zero, 0
-L_108423c:
-// 0x0108423c: 0x108423c: lw    v0, 12(v1)
+// 0x0108485c: 0x108485c: sll   zero, zero, 0
+L_1084860:
+// 0x01084860: 0x1084860: lw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3825,13 +3825,13 @@ L_108423c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084240: 0x1084240: sll   zero, zero, 0
-// 0x01084244: 0x1084244: beq   s2, v0, 0x108425c sll   zero, zero, 0
+// 0x01084864: 0x1084864: sll   zero, zero, 0
+// 0x01084868: 0x1084868: beq   s2, v0, 0x1084880 sll   zero, zero, 0
 	ldloc 10
 	ldloc 5
-	beq  L_108425c
+	beq  L_1084880
 // --- basic block ---
-// 0x0108424c: 0x108424c: jal   0x101f9d0 sw    v1, 68(sp)
+// 0x01084870: 0x1084870: jal   0x101f9e0 sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3840,10 +3840,10 @@ L_108423c:
 	add
 	ldloc 7
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_draw_flush_101f9d0()
+	call int32 Cibyl23::roadmap_screen_draw_flush_101f9e0()
 	stloc 5
 // --- basic block ---
-// 0x01084254: 0x1084254: lw    v1, 68(sp)
+// 0x01084878: 0x1084878: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3852,9 +3852,9 @@ L_108423c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084258: 0x1084258: sll   zero, zero, 0
-L_108425c:
-// 0x0108425c: 0x108425c: lw    t1, 824(v1)
+// 0x0108487c: 0x108487c: sll   zero, zero, 0
+L_1084880:
+// 0x01084880: 0x1084880: lw    t1, 824(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3863,7 +3863,7 @@ L_108425c:
 	add
 	ldelem.i4
 	stloc 19
-// 0x01084260: 0x1084260: lw    s2, 12(v1)
+// 0x01084884: 0x1084884: lw    s2, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -3872,56 +3872,56 @@ L_108425c:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01084264: 0x1084264: addiu a0, t1, 102
+// 0x01084888: 0x1084888: addiu a0, t1, 102
 	ldloc 19
 	ldc.i4.s 102
 	add
 	stloc.1
-// 0x01084268: 0x1084268: sll   a0, a0, 3
+// 0x0108488c: 0x108488c: sll   a0, a0, 3
 	ldloc.1
 	ldc.i4.3
 	shl
 	stloc.1
-// 0x0108426c: 0x108426c: addiu v0, v1, 828
+// 0x01084890: 0x1084890: addiu v0, v1, 828
 	ldloc 7
 	ldc.i4 828
 	add
 	stloc 5
-// 0x01084270: 0x1084270: sll   t0, s2, 2
+// 0x01084894: 0x1084894: sll   t0, s2, 2
 	ldloc 10
 	ldc.i4.2
 	shl
 	stloc 18
-// 0x01084274: 0x1084274: addu  v1, v1, a0
+// 0x01084898: 0x1084898: addu  v1, v1, a0
 	ldloc 7
 	ldloc.1
 	add
 	stloc 7
-// 0x01084278: 0x1084278: addiu t1, t1, -2
+// 0x0108489c: 0x108489c: addiu t1, t1, -2
 	ldloc 19
 	ldc.i4.s -2
 	add
 	stloc 19
-// 0x0108427c: 0x108427c: addu  t0, s6, t0
+// 0x010848a0: 0x10848a0: addu  t0, s6, t0
 	ldloc 14
 	ldloc 18
 	add
 	stloc 18
-// 0x01084280: 0x1084280: addu  a0, v0, zero
+// 0x010848a4: 0x10848a4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084284: 0x1084284: addiu a1, v1, 4
+// 0x010848a8: 0x10848a8: addiu a1, v1, 4
 	ldloc 7
 	ldc.i4.4
 	add
 	stloc.2
-// 0x01084288: 0x1084288: addu  a2, zero, zero
+// 0x010848ac: 0x10848ac: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108428c: 0x108428c: addu  a3, v0, zero
+// 0x010848b0: 0x10848b0: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01084290: 0x1084290: sw    t1, 20(sp)
+// 0x010848b4: 0x10848b4: sw    t1, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3930,7 +3930,7 @@ L_108425c:
 	add
 	ldloc 19
 	stelem.i4
-// 0x01084294: 0x1084294: sw    t0, 28(sp)
+// 0x010848b8: 0x10848b8: sw    t0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3939,16 +3939,16 @@ L_108425c:
 	add
 	ldloc 18
 	stelem.i4
-// 0x01084298: 0x1084298: sw    v0, -2172(s4)
+// 0x010848bc: 0x10848bc: sw    v0, -1708(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -543
+	ldc.i4 -427
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108429c: 0x108429c: sw    s3, 16(sp)
+// 0x010848c0: 0x10848c0: sw    s3, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3957,7 +3957,7 @@ L_108425c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010842a0: 0x10842a0: sw    s8, 24(sp)
+// 0x010848c4: 0x10848c4: sw    s8, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3966,7 +3966,7 @@ L_108425c:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010842a4: 0x10842a4: sw    s3, 32(sp)
+// 0x010848c8: 0x10848c8: sw    s3, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3975,7 +3975,7 @@ L_108425c:
 	add
 	ldloc 16
 	stelem.i4
-// 0x010842a8: 0x10842a8: jal   0x1022e0c sw    s7, 36(sp)
+// 0x010848cc: 0x10848cc: jal   0x1022e1c sw    s7, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -3989,28 +3989,28 @@ L_108425c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010842b0: 0x10842b0: sw    zero, -2172(s4)
+// 0x010848d4: 0x10848d4: sw    zero, -1708(s4)
 	ldloc 6
 	ldloc 11
 	ldc.i4.2
 	shr.un
-	ldc.i4 -543
+	ldc.i4 -427
 	add
 	ldc.i4.s 0
 	stelem.i4
-L_10842b4:
-// 0x010842b4: 0x10842b4: addiu s0, s0, 1
+L_10848d8:
+// 0x010848d8: 0x10848d8: addiu s0, s0, 1
 	ldloc 8
 	ldc.i4.1
 	add
 	stloc 8
-L_10842b8:
-// 0x010842b8: 0x10842b8: lw    v1, 56(sp)
+L_10848dc:
+// 0x010848dc: 0x10848dc: lw    v1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4019,30 +4019,30 @@ L_10842b8:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010842bc: 0x10842bc: sll   zero, zero, 0
-// 0x010842c0: 0x10842c0: slt   v0, s0, v1
+// 0x010848e0: 0x10848e0: sll   zero, zero, 0
+// 0x010848e4: 0x10848e4: slt   v0, s0, v1
 	ldloc 8
 	ldloc 7
 	clt
 	stloc 5
-// 0x010842c4: 0x10842c4: bne   v0, zero, 0x10841a4 sll   zero, zero, 0
+// 0x010848e8: 0x10848e8: bne   v0, zero, 0x10847c8 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10841a4
+	brtrue L_10847c8
 // --- basic block ---
-// 0x010842cc: 0x10842cc: j	 0x10847a8 sll   zero, zero, 0
-	br L_10847a8
+// 0x010848f0: 0x10848f0: j	 0x1084dcc sll   zero, zero, 0
+	br L_1084dcc
 // --- basic block ---
-L_10842d4:
-// 0x010842d4: 0x10842d4: jal   0x108295c lui   s7, 0xe0000
+L_10848f8:
+// 0x010848f8: 0x10848f8: jal   0x1082f80 lui   s7, 0xe0000
 	ldc.i4 917504
 	stloc 17
-	call int32 Cibyl98::RTTrafficInfo_GetNumLines_108295c()
+	call int32 Cibyl98::RTTrafficInfo_GetNumLines_1082f80()
 	stloc 5
 // --- basic block ---
-// 0x010842dc: 0x10842dc: addiu s8, zero, -1
+// 0x01084900: 0x1084900: addiu s8, zero, -1
 	ldc.i4.m1
 	stloc 15
-// 0x010842e0: 0x10842e0: sw    v0, 60(sp)
+// 0x01084904: 0x1084904: sw    v0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4051,10 +4051,10 @@ L_10842d4:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010842e4: 0x10842e4: addiu s4, zero, -1
+// 0x01084908: 0x1084908: addiu s4, zero, -1
 	ldc.i4.m1
 	stloc 11
-// 0x010842e8: 0x10842e8: sw    s8, 56(sp)
+// 0x0108490c: 0x108490c: sw    s8, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4063,36 +4063,36 @@ L_10842d4:
 	add
 	ldloc 15
 	stelem.i4
-// 0x010842ec: 0x10842ec: addu  s5, zero, zero
+// 0x01084910: 0x1084910: addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 13
-// 0x010842f0: 0x10842f0: addiu s2, s7, 29604
+// 0x01084914: 0x1084914: addiu s2, s7, 30068
 	ldloc 17
-	ldc.i4 29604
+	ldc.i4 30068
 	add
 	stloc 10
-// 0x010842f4: 0x10842f4: lui   s6, 0xe0000
+// 0x01084918: 0x1084918: lui   s6, 0xe0000
 	ldc.i4 917504
 	stloc 14
-// 0x010842f8: 0x10842f8: j	 0x10846d0 addiu s3, zero, 25
+// 0x0108491c: 0x108491c: j	 0x1084cf4 addiu s3, zero, 25
 	ldc.i4.s 25
 	stloc 16
-	br L_10846d0
+	br L_1084cf4
 // --- basic block ---
-L_1084300:
-// 0x01084300: 0x1084300: jal   0x108296c addu  a0, s5, zero
+L_1084924:
+// 0x01084924: 0x1084924: jal   0x1082f90 addu  a0, s5, zero
 	ldloc 13
 	stloc.1
 	ldloc.1
-	call int32 Cibyl98::RTTrafficInfo_GetLine_108296c(int32)
+	call int32 Cibyl98::RTTrafficInfo_GetLine_1082f90(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084308: 0x1084308: addu  s0, v0, zero
+// 0x0108492c: 0x108492c: addu  s0, v0, zero
 	ldloc 5
 	stloc 8
-// 0x0108430c: 0x108430c: lw    v0, 72(v0)
+// 0x01084930: 0x1084930: lw    v0, 72(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4101,7 +4101,7 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084310: 0x1084310: lw    v1, 56(s2)
+// 0x01084934: 0x1084934: lw    v1, 56(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4110,7 +4110,7 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084314: 0x1084314: lw    a0, 2436(v0)
+// 0x01084938: 0x1084938: lw    a0, 2436(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4119,19 +4119,19 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01084318: 0x1084318: sll   zero, zero, 0
-// 0x0108431c: 0x108431c: slt   a0, v1, a0
+// 0x0108493c: 0x108493c: sll   zero, zero, 0
+// 0x01084940: 0x1084940: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x01084320: 0x1084320: bne   a0, zero, 0x10846c8 addu  a0, s4, zero
+// 0x01084944: 0x1084944: bne   a0, zero, 0x1084cec addu  a0, s4, zero
 	ldloc.1
 	ldloc 11
 	stloc.1
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x01084328: 0x1084328: lw    a0, 64(s2)
+// 0x0108494c: 0x108494c: lw    a0, 64(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4140,7 +4140,7 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc.1
-// 0x0108432c: 0x108432c: lw    a1, 2428(v0)
+// 0x01084950: 0x1084950: lw    a1, 2428(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4149,17 +4149,17 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01084330: 0x1084330: sll   zero, zero, 0
-// 0x01084334: 0x1084334: slt   a1, a1, a0
+// 0x01084954: 0x1084954: sll   zero, zero, 0
+// 0x01084958: 0x1084958: slt   a1, a1, a0
 	ldloc.2
 	ldloc.1
 	clt
 	stloc.2
-// 0x01084338: 0x1084338: bne   a1, zero, 0x10846b8 sll   zero, zero, 0
+// 0x0108495c: 0x108495c: bne   a1, zero, 0x1084cdc sll   zero, zero, 0
 	ldloc.2
-	brtrue L_10846b8
+	brtrue L_1084cdc
 // --- basic block ---
-// 0x01084340: 0x1084340: lw    a1, 60(s2)
+// 0x01084964: 0x1084964: lw    a1, 60(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4168,7 +4168,7 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01084344: 0x1084344: lw    a2, 2440(v0)
+// 0x01084968: 0x1084968: lw    a2, 2440(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4177,17 +4177,17 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01084348: 0x1084348: sll   zero, zero, 0
-// 0x0108434c: 0x108434c: slt   a2, a1, a2
+// 0x0108496c: 0x108496c: sll   zero, zero, 0
+// 0x01084970: 0x1084970: slt   a2, a1, a2
 	ldloc.2
 	ldloc.3
 	clt
 	stloc.3
-// 0x01084350: 0x1084350: bne   a2, zero, 0x10846b8 sll   zero, zero, 0
+// 0x01084974: 0x1084974: bne   a2, zero, 0x1084cdc sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10846b8
+	brtrue L_1084cdc
 // --- basic block ---
-// 0x01084358: 0x1084358: lw    a2, 2432(v0)
+// 0x0108497c: 0x108497c: lw    a2, 2432(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4196,7 +4196,7 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108435c: 0x108435c: lw    v0, 68(s2)
+// 0x01084980: 0x1084980: lw    v0, 68(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4205,53 +4205,53 @@ L_1084300:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084360: 0x1084360: sll   zero, zero, 0
-// 0x01084364: 0x1084364: slt   a2, a2, v0
+// 0x01084984: 0x1084984: sll   zero, zero, 0
+// 0x01084988: 0x1084988: slt   a2, a2, v0
 	ldloc.3
 	ldloc 5
 	clt
 	stloc.3
-// 0x01084368: 0x1084368: bne   a2, zero, 0x10846b8 sll   zero, zero, 0
+// 0x0108498c: 0x108498c: bne   a2, zero, 0x1084cdc sll   zero, zero, 0
 	ldloc.3
-	brtrue L_10846b8
+	brtrue L_1084cdc
 // --- basic block ---
-// 0x01084370: 0x1084370: j	 0x1084738 sll   zero, zero, 0
-	br L_1084738
+// 0x01084994: 0x1084994: j	 0x1084d5c sll   zero, zero, 0
+	br L_1084d5c
 // --- basic block ---
-L_1084378:
-// 0x01084378: 0x1084378: lw    a0, 0(s0)
+L_108499c:
+// 0x0108499c: 0x108499c: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x0108437c: 0x108437c: sll   zero, zero, 0
-// 0x01084380: 0x1084380: beq   a0, s4, 0x10846c8 addiu v0, sp, 44
+// 0x010849a0: 0x10849a0: sll   zero, zero, 0
+// 0x010849a4: 0x10849a4: beq   a0, s4, 0x1084cec addiu v0, sp, 44
 	ldloc.1
 	ldloc 11
 	ldloc.0
 	ldc.i4.s 44
 	add
 	stloc 5
-	beq  L_10846c8
+	beq  L_1084cec
 // --- basic block ---
-// 0x01084388: 0x1084388: addiu a1, sp, 48
+// 0x010849ac: 0x10849ac: addiu a1, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
 	stloc.2
-// 0x0108438c: 0x108438c: addiu a2, sp, 40
+// 0x010849b0: 0x10849b0: addiu a2, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.3
-// 0x01084390: 0x1084390: addiu a3, sp, 52
+// 0x010849b4: 0x10849b4: addiu a3, sp, 52
 	ldloc.0
 	ldc.i4.s 52
 	add
 	stloc 4
-// 0x01084394: 0x1084394: jal   0x100c85c sw    v0, 16(sp)
+// 0x010849b8: 0x10849b8: jal   0x100c86c sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4265,12 +4265,12 @@ L_1084378:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_edges_100c85c(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_edges_100c86c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108439c: 0x108439c: lw    v0, 56(s2)
+// 0x010849c0: 0x10849c0: lw    v0, 56(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4279,7 +4279,7 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010843a0: 0x10843a0: lw    v1, 48(sp)
+// 0x010849c4: 0x10849c4: lw    v1, 48(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4288,19 +4288,19 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010843a4: 0x10843a4: sll   zero, zero, 0
-// 0x010843a8: 0x10843a8: slt   v0, v0, v1
+// 0x010849c8: 0x10849c8: sll   zero, zero, 0
+// 0x010849cc: 0x10849cc: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010843ac: 0x10843ac: bne   v0, zero, 0x10846c8 addu  a0, s4, zero
+// 0x010849d0: 0x10849d0: bne   v0, zero, 0x1084cec addu  a0, s4, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x010843b4: 0x10843b4: lw    v0, 64(s2)
+// 0x010849d8: 0x10849d8: lw    v0, 64(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4309,7 +4309,7 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010843b8: 0x10843b8: lw    v1, 40(sp)
+// 0x010849dc: 0x10849dc: lw    v1, 40(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4318,17 +4318,17 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010843bc: 0x10843bc: sll   zero, zero, 0
-// 0x010843c0: 0x10843c0: slt   v0, v1, v0
+// 0x010849e0: 0x10849e0: sll   zero, zero, 0
+// 0x010849e4: 0x10849e4: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010843c4: 0x10843c4: bne   v0, zero, 0x10846c8 sll   zero, zero, 0
+// 0x010849e8: 0x10849e8: bne   v0, zero, 0x1084cec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x010843cc: 0x10843cc: lw    v0, 60(s2)
+// 0x010849f0: 0x10849f0: lw    v0, 60(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4337,7 +4337,7 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010843d0: 0x10843d0: lw    v1, 52(sp)
+// 0x010849f4: 0x10849f4: lw    v1, 52(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4346,17 +4346,17 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010843d4: 0x10843d4: sll   zero, zero, 0
-// 0x010843d8: 0x10843d8: slt   v0, v0, v1
+// 0x010849f8: 0x10849f8: sll   zero, zero, 0
+// 0x010849fc: 0x10849fc: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x010843dc: 0x10843dc: bne   v0, zero, 0x10846c8 sll   zero, zero, 0
+// 0x01084a00: 0x1084a00: bne   v0, zero, 0x1084cec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x010843e4: 0x10843e4: lw    v0, 68(s2)
+// 0x01084a08: 0x1084a08: lw    v0, 68(s2)
 	ldloc 6
 	ldloc 10
 	ldc.i4.2
@@ -4365,7 +4365,7 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010843e8: 0x10843e8: lw    v1, 44(sp)
+// 0x01084a0c: 0x1084a0c: lw    v1, 44(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4374,28 +4374,28 @@ L_1084378:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010843ec: 0x10843ec: sll   zero, zero, 0
-// 0x010843f0: 0x10843f0: slt   v0, v1, v0
+// 0x01084a10: 0x1084a10: sll   zero, zero, 0
+// 0x01084a14: 0x1084a14: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x010843f4: 0x10843f4: bne   v0, zero, 0x10846c8 sll   zero, zero, 0
+// 0x01084a18: 0x1084a18: bne   v0, zero, 0x1084cec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x010843fc: 0x10843fc: j	 0x1084750 sll   zero, zero, 0
-	br L_1084750
+// 0x01084a20: 0x1084a20: j	 0x1084d74 sll   zero, zero, 0
+	br L_1084d74
 // --- basic block ---
-L_1084404:
-// 0x01084404: 0x1084404: lw    a0, 0(s0)
+L_1084a28:
+// 0x01084a28: 0x1084a28: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084408: 0x1084408: jal   0x100d384 addu  a3, zero, zero
+// 0x01084a2c: 0x1084a2c: jal   0x100d394 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
 	ldloc.0
@@ -4403,27 +4403,27 @@ L_1084404:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl9::roadmap_tile_request_100d384(int32,int32,int32,int32,int32)
+	call int32 Cibyl9::roadmap_tile_request_100d394(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084410: 0x1084410: lw    a0, 0(s0)
+// 0x01084a34: 0x1084a34: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084414: 0x1084414: j	 0x10846cc addiu s5, s5, 1
+// 0x01084a38: 0x1084a38: j	 0x1084cf0 addiu s5, s5, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-	br L_10846cc
+	br L_1084cf0
 // --- basic block ---
-L_108441c:
-// 0x0108441c: 0x108441c: lw    a2, 40(s0)
+L_1084a40:
+// 0x01084a40: 0x1084a40: lw    a2, 40(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4432,17 +4432,17 @@ L_108441c:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01084420: 0x1084420: sll   zero, zero, 0
-// 0x01084424: 0x1084424: slt   v1, v1, a2
+// 0x01084a44: 0x1084a44: sll   zero, zero, 0
+// 0x01084a48: 0x1084a48: slt   v1, v1, a2
 	ldloc 7
 	ldloc.3
 	clt
 	stloc 7
-// 0x01084428: 0x1084428: bne   v1, zero, 0x10846b8 sll   zero, zero, 0
+// 0x01084a4c: 0x1084a4c: bne   v1, zero, 0x1084cdc sll   zero, zero, 0
 	ldloc 7
-	brtrue L_10846b8
+	brtrue L_1084cdc
 // --- basic block ---
-// 0x01084430: 0x1084430: lw    v1, 32(s0)
+// 0x01084a54: 0x1084a54: lw    v1, 32(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4451,19 +4451,19 @@ L_108441c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084434: 0x1084434: sll   zero, zero, 0
-// 0x01084438: 0x1084438: slt   a0, v1, a0
+// 0x01084a58: 0x1084a58: sll   zero, zero, 0
+// 0x01084a5c: 0x1084a5c: slt   a0, v1, a0
 	ldloc 7
 	ldloc.1
 	clt
 	stloc.1
-// 0x0108443c: 0x108443c: bne   a0, zero, 0x10846c8 addu  a0, s4, zero
+// 0x01084a60: 0x1084a60: bne   a0, zero, 0x1084cec addu  a0, s4, zero
 	ldloc.1
 	ldloc 11
 	stloc.1
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x01084444: 0x1084444: lw    v1, 44(s0)
+// 0x01084a68: 0x1084a68: lw    v1, 44(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4472,17 +4472,17 @@ L_108441c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084448: 0x1084448: sll   zero, zero, 0
-// 0x0108444c: 0x108444c: slt   a1, a1, v1
+// 0x01084a6c: 0x1084a6c: sll   zero, zero, 0
+// 0x01084a70: 0x1084a70: slt   a1, a1, v1
 	ldloc.2
 	ldloc 7
 	clt
 	stloc.2
-// 0x01084450: 0x1084450: bne   a1, zero, 0x10846c8 sll   zero, zero, 0
+// 0x01084a74: 0x1084a74: bne   a1, zero, 0x1084cec sll   zero, zero, 0
 	ldloc.2
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x01084458: 0x1084458: lw    v1, 36(s0)
+// 0x01084a7c: 0x1084a7c: lw    v1, 36(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4491,23 +4491,23 @@ L_108441c:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108445c: 0x108445c: sll   zero, zero, 0
-// 0x01084460: 0x1084460: slt   v0, v1, v0
+// 0x01084a80: 0x1084a80: sll   zero, zero, 0
+// 0x01084a84: 0x1084a84: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01084464: 0x1084464: bne   v0, zero, 0x10846c8 sll   zero, zero, 0
+// 0x01084a88: 0x1084a88: bne   v0, zero, 0x1084cec sll   zero, zero, 0
 	ldloc 5
-	brtrue L_10846c8
+	brtrue L_1084cec
 // --- basic block ---
-// 0x0108446c: 0x108446c: j	 0x1084778 addiu a0, zero, 192
+// 0x01084a90: 0x1084a90: j	 0x1084d9c addiu a0, zero, 192
 	ldc.i4 192
 	stloc.1
-	br L_1084778
+	br L_1084d9c
 // --- basic block ---
-L_1084474:
-// 0x01084474: 0x1084474: lw    v0, 16(v0)
+L_1084a98:
+// 0x01084a98: 0x1084a98: lw    v0, 16(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -4516,35 +4516,35 @@ L_1084474:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084478: 0x1084478: lw    v1, 29604(s7)
+// 0x01084a9c: 0x1084a9c: lw    v1, 30068(s7)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108447c: 0x108447c: sll   zero, zero, 0
-// 0x01084480: 0x1084480: slt   v0, v1, v0
+// 0x01084aa0: 0x1084aa0: sll   zero, zero, 0
+// 0x01084aa4: 0x1084aa4: slt   v0, v1, v0
 	ldloc 7
 	ldloc 5
 	clt
 	stloc 5
-// 0x01084484: 0x1084484: beq   v0, zero, 0x10846b8 lui   v1, 0x0
+// 0x01084aa8: 0x1084aa8: beq   v0, zero, 0x1084cdc lui   v1, 0x0
 	ldloc 5
 	ldc.i4.s 0
 	stloc 7
-	brfalse L_10846b8
+	brfalse L_1084cdc
 // --- basic block ---
-// 0x0108448c: 0x108448c: lw    a0, 0(s0)
+// 0x01084ab0: 0x1084ab0: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084490: 0x1084490: lw    v0, 576(v1)
+// 0x01084ab4: 0x1084ab4: lw    v0, 576(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4553,30 +4553,30 @@ L_1084474:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084494: 0x1084494: sll   zero, zero, 0
-// 0x01084498: 0x1084498: beq   a0, v0, 0x10844b0 sll   zero, zero, 0
+// 0x01084ab8: 0x1084ab8: sll   zero, zero, 0
+// 0x01084abc: 0x1084abc: beq   a0, v0, 0x1084ad4 sll   zero, zero, 0
 	ldloc.1
 	ldloc 5
-	beq  L_10844b0
+	beq  L_1084ad4
 // --- basic block ---
-// 0x010844a0: 0x10844a0: bltz  a0, 0x10844b0 sll   zero, zero, 0
+// 0x01084ac4: 0x1084ac4: bltz  a0, 0x1084ad4 sll   zero, zero, 0
 	ldloc.1
 	ldc.i4.s 0
-	blt L_10844b0
+	blt L_1084ad4
 // --- basic block ---
-// 0x010844a8: 0x10844a8: jal   0x100b164 sll   zero, zero, 0
+// 0x01084acc: 0x1084acc: jal   0x100b174 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl7::roadmap_square_set_current_internal_100b164(int32,int32,int32,int32,int32)
+	call int32 Cibyl7::roadmap_square_set_current_internal_100b174(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10844b0:
-// 0x010844b0: 0x10844b0: lw    v0, 12(s0)
+L_1084ad4:
+// 0x01084ad4: 0x1084ad4: lw    v0, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4585,32 +4585,32 @@ L_10844b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010844b4: 0x10844b4: addiu a0, zero, 192
+// 0x01084ad8: 0x1084ad8: addiu a0, zero, 192
 	ldc.i4 192
 	stloc.1
-// 0x010844b8: 0x10844b8: mult  v0, a0
+// 0x01084adc: 0x1084adc: mult  v0, a0
 	ldloc 5
 	ldloc.1
 	mul
 	stloc 12
-// 0x010844bc: 0x10844bc: lw    v1, 29728(s6)
+// 0x01084ae0: 0x1084ae0: lw    v1, 30192(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 7
-// 0x010844c0: 0x10844c0: mflo  lo
+// 0x01084ae4: 0x1084ae4: mflo  lo
 	ldloc 12
 	stloc 9
-// 0x010844c4: 0x10844c4: addu  v1, v1, s1
+// 0x01084ae8: 0x1084ae8: addu  v1, v1, s1
 	ldloc 7
 	ldloc 9
 	add
 	stloc 7
-// 0x010844c8: 0x10844c8: lw    a0, 8(v1)
+// 0x01084aec: 0x1084aec: lw    a0, 8(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4619,12 +4619,12 @@ L_10844b0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010844cc: 0x10844cc: sll   zero, zero, 0
-// 0x010844d0: 0x10844d0: beq   a0, zero, 0x1084544 sll   zero, zero, 0
+// 0x01084af0: 0x1084af0: sll   zero, zero, 0
+// 0x01084af4: 0x1084af4: beq   a0, zero, 0x1084b68 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1084544
+	brfalse L_1084b68
 // --- basic block ---
-// 0x010844d8: 0x10844d8: lw    v1, 16(v1)
+// 0x01084afc: 0x1084afc: lw    v1, 16(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -4633,57 +4633,57 @@ L_10844b0:
 	add
 	ldelem.i4
 	stloc 7
-// 0x010844dc: 0x10844dc: lw    a0, 29604(s7)
+// 0x01084b00: 0x1084b00: lw    a0, 30068(s7)
 	ldloc 6
 	ldloc 17
 	ldc.i4.2
 	shr.un
-	ldc.i4 7401
+	ldc.i4 7517
 	add
 	ldelem.i4
 	stloc.1
-// 0x010844e0: 0x10844e0: sll   zero, zero, 0
-// 0x010844e4: 0x10844e4: slt   v1, a0, v1
+// 0x01084b04: 0x1084b04: sll   zero, zero, 0
+// 0x01084b08: 0x1084b08: slt   v1, a0, v1
 	ldloc.1
 	ldloc 7
 	clt
 	stloc 7
-// 0x010844e8: 0x10844e8: beq   v1, zero, 0x1084544 addiu v1, zero, 16
+// 0x01084b0c: 0x1084b0c: beq   v1, zero, 0x1084b68 addiu v1, zero, 16
 	ldloc 7
 	ldc.i4.s 16
 	stloc 7
-	brfalse L_1084544
+	brfalse L_1084b68
 // --- basic block ---
-// 0x010844f0: 0x10844f0: bne   v0, v1, 0x1084508 sll   zero, zero, 0
+// 0x01084b14: 0x1084b14: bne   v0, v1, 0x1084b2c sll   zero, zero, 0
 	ldloc 5
 	ldloc 7
-	bne.un L_1084508
+	bne.un L_1084b2c
 // --- basic block ---
-// 0x010844f8: 0x10844f8: jal   0x101f998 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_fast_refresh_101f998()
+// 0x01084b1c: 0x1084b1c: jal   0x101f9a8 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_fast_refresh_101f9a8()
 	stloc 5
 // --- basic block ---
-// 0x01084500: 0x1084500: bne   v0, zero, 0x1084544 sll   zero, zero, 0
+// 0x01084b24: 0x1084b24: bne   v0, zero, 0x1084b68 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1084544
+	brtrue L_1084b68
 // --- basic block ---
-L_1084508:
-// 0x01084508: 0x1084508: lw    v0, 29728(s6)
+L_1084b2c:
+// 0x01084b2c: 0x1084b2c: lw    v0, 30192(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108450c: 0x108450c: sll   zero, zero, 0
-// 0x01084510: 0x1084510: addu  s1, v0, s1
+// 0x01084b30: 0x1084b30: sll   zero, zero, 0
+// 0x01084b34: 0x1084b34: addu  s1, v0, s1
 	ldloc 5
 	ldloc 9
 	add
 	stloc 9
-// 0x01084514: 0x1084514: lw    v0, 120(s1)
+// 0x01084b38: 0x1084b38: lw    v0, 120(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4692,12 +4692,12 @@ L_1084508:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084518: 0x1084518: sll   zero, zero, 0
-// 0x0108451c: 0x108451c: beq   v0, zero, 0x1084544 sll   zero, zero, 0
+// 0x01084b3c: 0x1084b3c: sll   zero, zero, 0
+// 0x01084b40: 0x1084b40: beq   v0, zero, 0x1084b68 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1084544
+	brfalse L_1084b68
 // --- basic block ---
-// 0x01084524: 0x1084524: lw    a0, 48(s1)
+// 0x01084b48: 0x1084b48: lw    a0, 48(s1)
 	ldloc 6
 	ldloc 9
 	ldc.i4.2
@@ -4706,81 +4706,81 @@ L_1084508:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01084528: 0x1084528: sll   zero, zero, 0
-// 0x0108452c: 0x108452c: beq   a0, zero, 0x1084544 sll   zero, zero, 0
+// 0x01084b4c: 0x1084b4c: sll   zero, zero, 0
+// 0x01084b50: 0x1084b50: beq   a0, zero, 0x1084b68 sll   zero, zero, 0
 	ldloc.1
-	brfalse L_1084544
+	brfalse L_1084b68
 // --- basic block ---
-// 0x01084534: 0x1084534: jal   0x104dd48 sll   zero, zero, 0
+// 0x01084b58: 0x1084b58: jal   0x104dd58 sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd48(int32)
+	call int32 Cibyl57::roadmap_canvas_get_thickness_104dd58(int32)
 	stloc 5
 // --- basic block ---
-// 0x0108453c: 0x108453c: j	 0x1084554 addiu s1, v0, 2
+// 0x01084b60: 0x1084b60: j	 0x1084b78 addiu s1, v0, 2
 	ldloc 5
 	ldc.i4.2
 	add
 	stloc 9
-	br L_1084554
+	br L_1084b78
 // --- basic block ---
-L_1084544:
-// 0x01084544: 0x1084544: jal   0x101fa7c sll   zero, zero, 0
+L_1084b68:
+// 0x01084b68: 0x1084b68: jal   0x101fa8c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108454c: 0x108454c: div   v0, s3
+// 0x01084b70: 0x1084b70: div   v0, s3
 	ldloc 5
 	ldloc 16
 	div
 	stloc 12
-// 0x01084550: 0x1084550: mflo  lo
+// 0x01084b74: 0x1084b74: mflo  lo
 	ldloc 12
 	stloc 9
-L_1084554:
-// 0x01084554: 0x1084554: jal   0x101fa7c sll   zero, zero, 0
+L_1084b78:
+// 0x01084b78: 0x1084b78: jal   0x101fa8c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108455c: 0x108455c: div   v0, s3
+// 0x01084b80: 0x1084b80: div   v0, s3
 	ldloc 5
 	ldloc 16
 	div
 	stloc 12
-// 0x01084560: 0x1084560: mflo  lo
+// 0x01084b84: 0x1084b84: mflo  lo
 	ldloc 12
 	stloc 5
-// 0x01084564: 0x1084564: slt   v0, s1, v0
+// 0x01084b88: 0x1084b88: slt   v0, s1, v0
 	ldloc 9
 	ldloc 5
 	clt
 	stloc 5
-// 0x01084568: 0x1084568: beq   v0, zero, 0x1084580 sll   zero, zero, 0
+// 0x01084b8c: 0x1084b8c: beq   v0, zero, 0x1084ba4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1084580
+	brfalse L_1084ba4
 // --- basic block ---
-// 0x01084570: 0x1084570: jal   0x101fa7c sll   zero, zero, 0
+// 0x01084b94: 0x1084b94: jal   0x101fa8c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084578: 0x1084578: div   v0, s3
+// 0x01084b9c: 0x1084b9c: div   v0, s3
 	ldloc 5
 	ldloc 16
 	div
 	stloc 12
-// 0x0108457c: 0x108457c: mflo  lo
+// 0x01084ba0: 0x1084ba0: mflo  lo
 	ldloc 12
 	stloc 9
-L_1084580:
-// 0x01084580: 0x1084580: lw    v0, 60(s0)
+L_1084ba4:
+// 0x01084ba4: 0x1084ba4: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4789,46 +4789,46 @@ L_1084580:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084584: 0x1084584: lui   v1, 0x80000
+// 0x01084ba8: 0x1084ba8: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 7
-// 0x01084588: 0x1084588: addiu v1, v1, -2164
+// 0x01084bac: 0x1084bac: addiu v1, v1, -1700
 	ldloc 7
-	ldc.i4 -2164
+	ldc.i4 -1700
 	add
 	stloc 7
-// 0x0108458c: 0x108458c: sll   v0, v0, 2
+// 0x01084bb0: 0x1084bb0: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x01084590: 0x1084590: addu  v0, v0, v1
+// 0x01084bb4: 0x1084bb4: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01084594: 0x1084594: lw    a0, 0(v0)
+// 0x01084bb8: 0x1084bb8: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084598: 0x1084598: jal   0x104e35c sll   zero, zero, 0
+// 0x01084bbc: 0x1084bbc: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010845a0: 0x10845a0: addu  a0, s1, zero
+// 0x01084bc4: 0x1084bc4: addu  a0, s1, zero
 	ldloc 9
 	stloc.1
-// 0x010845a4: 0x10845a4: jal   0x104dd5c sw    v0, 64(sp)
+// 0x01084bc8: 0x1084bc8: jal   0x104dd6c sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4838,12 +4838,12 @@ L_1084580:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x010845ac: 0x10845ac: lw    v0, 64(sp)
+// 0x01084bd0: 0x1084bd0: lw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4852,12 +4852,12 @@ L_1084580:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010845b0: 0x10845b0: sll   zero, zero, 0
-// 0x010845b4: 0x10845b4: beq   v0, zero, 0x10845c4 sll   zero, zero, 0
+// 0x01084bd4: 0x1084bd4: sll   zero, zero, 0
+// 0x01084bd8: 0x1084bd8: beq   v0, zero, 0x1084be8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10845c4
+	brfalse L_1084be8
 // --- basic block ---
-// 0x010845bc: 0x10845bc: jal   0x104e35c addu  a0, v0, zero
+// 0x01084be0: 0x1084be0: jal   0x104e36c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -4865,13 +4865,13 @@ L_1084580:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-L_10845c4:
-// 0x010845c4: 0x10845c4: lw    a0, 56(sp)
+L_1084be8:
+// 0x01084be8: 0x1084be8: lw    a0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4880,13 +4880,13 @@ L_10845c4:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010845c8: 0x10845c8: sll   zero, zero, 0
-// 0x010845cc: 0x10845cc: bne   s1, a0, 0x10845e4 sll   zero, zero, 0
+// 0x01084bec: 0x1084bec: sll   zero, zero, 0
+// 0x01084bf0: 0x1084bf0: bne   s1, a0, 0x1084c08 sll   zero, zero, 0
 	ldloc 9
 	ldloc.1
-	bne.un L_10845e4
+	bne.un L_1084c08
 // --- basic block ---
-// 0x010845d4: 0x10845d4: lw    v0, 60(s0)
+// 0x01084bf8: 0x1084bf8: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4895,19 +4895,19 @@ L_10845c4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010845d8: 0x10845d8: sll   zero, zero, 0
-// 0x010845dc: 0x10845dc: beq   s8, v0, 0x10845ec sll   zero, zero, 0
+// 0x01084bfc: 0x1084bfc: sll   zero, zero, 0
+// 0x01084c00: 0x1084c00: beq   s8, v0, 0x1084c10 sll   zero, zero, 0
 	ldloc 15
 	ldloc 5
-	beq  L_10845ec
+	beq  L_1084c10
 // --- basic block ---
-L_10845e4:
-// 0x010845e4: 0x10845e4: jal   0x101f9d0 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_draw_flush_101f9d0()
+L_1084c08:
+// 0x01084c08: 0x1084c08: jal   0x101f9e0 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_draw_flush_101f9e0()
 	stloc 5
 // --- basic block ---
-L_10845ec:
-// 0x010845ec: 0x10845ec: lw    v0, 52(s0)
+L_1084c10:
+// 0x01084c10: 0x1084c10: lw    v0, 52(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4916,7 +4916,7 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010845f0: 0x10845f0: lw    s8, 60(s0)
+// 0x01084c14: 0x1084c14: lw    s8, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4925,10 +4925,10 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010845f4: 0x10845f4: lui   a0, 0x80000
+// 0x01084c18: 0x1084c18: lui   a0, 0x80000
 	ldc.i4 524288
 	stloc.1
-// 0x010845f8: 0x10845f8: sw    v0, 16(sp)
+// 0x01084c1c: 0x1084c1c: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4937,12 +4937,12 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010845fc: 0x10845fc: addiu v0, s0, 24
+// 0x01084c20: 0x1084c20: addiu v0, s0, 24
 	ldloc 8
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x01084600: 0x1084600: sw    v0, 56(sp)
+// 0x01084c24: 0x1084c24: sw    v0, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4951,22 +4951,22 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01084604: 0x1084604: addiu a0, a0, -2164
+// 0x01084c28: 0x1084c28: addiu a0, a0, -1700
 	ldloc.1
-	ldc.i4 -2164
+	ldc.i4 -1700
 	add
 	stloc.1
-// 0x01084608: 0x1084608: sll   v0, s8, 2
+// 0x01084c2c: 0x1084c2c: sll   v0, s8, 2
 	ldloc 15
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0108460c: 0x108460c: addu  v0, a0, v0
+// 0x01084c30: 0x1084c30: addu  v0, a0, v0
 	ldloc.1
 	ldloc 5
 	add
 	stloc 5
-// 0x01084610: 0x1084610: lw    t0, 56(s0)
+// 0x01084c34: 0x1084c34: lw    t0, 56(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -4975,12 +4975,12 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 18
-// 0x01084614: 0x1084614: addiu v1, s0, 16
+// 0x01084c38: 0x1084c38: addiu v1, s0, 16
 	ldloc 8
 	ldc.i4.s 16
 	add
 	stloc 7
-// 0x01084618: 0x1084618: sw    v0, 28(sp)
+// 0x01084c3c: 0x1084c3c: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4989,7 +4989,7 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108461c: 0x108461c: lw    a1, 56(sp)
+// 0x01084c40: 0x1084c40: lw    a1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -4998,10 +4998,10 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01084620: 0x1084620: addiu v0, zero, 1
+// 0x01084c44: 0x1084c44: addiu v0, zero, 1
 	ldc.i4.1
 	stloc 5
-// 0x01084624: 0x1084624: sw    v0, 32(sp)
+// 0x01084c48: 0x1084c48: sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5010,19 +5010,19 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01084628: 0x1084628: addu  a0, v1, zero
+// 0x01084c4c: 0x1084c4c: addu  a0, v1, zero
 	ldloc 7
 	stloc.1
-// 0x0108462c: 0x108462c: addiu v0, zero, -1
+// 0x01084c50: 0x1084c50: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01084630: 0x1084630: addu  a2, zero, zero
+// 0x01084c54: 0x1084c54: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084634: 0x1084634: addu  a3, v1, zero
+// 0x01084c58: 0x1084c58: addu  a3, v1, zero
 	ldloc 7
 	stloc 4
-// 0x01084638: 0x1084638: sw    t0, 20(sp)
+// 0x01084c5c: 0x1084c5c: sw    t0, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5031,7 +5031,7 @@ L_10845ec:
 	add
 	ldloc 18
 	stelem.i4
-// 0x0108463c: 0x108463c: sw    zero, 24(sp)
+// 0x01084c60: 0x1084c60: sw    zero, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5040,7 +5040,7 @@ L_10845ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x01084640: 0x1084640: sw    v0, 36(sp)
+// 0x01084c64: 0x1084c64: sw    v0, 36(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5049,7 +5049,7 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01084644: 0x1084644: jal   0x1022e0c sw    v1, 68(sp)
+// 0x01084c68: 0x1084c68: jal   0x1022e1c sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5063,27 +5063,27 @@ L_10845ec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e0c(int32,int32,int32,int32,int32)
+	call int32 Cibyl26::roadmap_screen_draw_one_line_1022e1c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108464c: 0x108464c: slti  v0, s1, 4
+// 0x01084c70: 0x1084c70: slti  v0, s1, 4
 	ldloc 9
 	ldc.i4.4
 	clt
 	stloc 5
-// 0x01084650: 0x1084650: bne   v0, zero, 0x10846c4 addu  a0, s4, zero
+// 0x01084c74: 0x1084c74: bne   v0, zero, 0x1084ce8 addu  a0, s4, zero
 	ldloc 5
 	ldloc 11
 	stloc.1
-	brtrue L_10846c4
+	brtrue L_1084ce8
 // --- basic block ---
-// 0x01084658: 0x1084658: jal   0x101f998 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_fast_refresh_101f998()
+// 0x01084c7c: 0x1084c7c: jal   0x101f9a8 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_fast_refresh_101f9a8()
 	stloc 5
 // --- basic block ---
-// 0x01084660: 0x1084660: lw    v1, 68(sp)
+// 0x01084c84: 0x1084c84: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5092,13 +5092,13 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084664: 0x1084664: bne   v0, zero, 0x10846c0 addu  a0, v1, zero
+// 0x01084c88: 0x1084c88: bne   v0, zero, 0x1084ce4 addu  a0, v1, zero
 	ldloc 5
 	ldloc 7
 	stloc.1
-	brtrue L_10846c0
+	brtrue L_1084ce4
 // --- basic block ---
-// 0x0108466c: 0x108466c: lw    v0, 56(s0)
+// 0x01084c90: 0x1084c90: lw    v0, 56(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5107,7 +5107,7 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084670: 0x1084670: lw    a3, 52(s0)
+// 0x01084c94: 0x1084c94: lw    a3, 52(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5116,7 +5116,7 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01084674: 0x1084674: sw    v0, 16(sp)
+// 0x01084c98: 0x1084c98: sw    v0, 16(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5125,7 +5125,7 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01084678: 0x1084678: sw    zero, 20(sp)
+// 0x01084c9c: 0x1084c9c: sw    zero, 20(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5134,7 +5134,7 @@ L_10845ec:
 	add
 	ldc.i4.s 0
 	stelem.i4
-// 0x0108467c: 0x108467c: sw    s1, 24(sp)
+// 0x01084ca0: 0x1084ca0: sw    s1, 24(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5143,7 +5143,7 @@ L_10845ec:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01084680: 0x1084680: lw    v0, 48(s0)
+// 0x01084ca4: 0x1084ca4: lw    v0, 48(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5152,8 +5152,8 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084684: 0x1084684: sll   zero, zero, 0
-// 0x01084688: 0x1084688: sw    v0, 28(sp)
+// 0x01084ca8: 0x1084ca8: sll   zero, zero, 0
+// 0x01084cac: 0x1084cac: sw    v0, 28(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5162,7 +5162,7 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108468c: 0x108468c: lw    v0, 60(s0)
+// 0x01084cb0: 0x1084cb0: lw    v0, 60(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5171,32 +5171,32 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084690: 0x1084690: lui   v1, 0x20000
+// 0x01084cb4: 0x1084cb4: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 7
-// 0x01084694: 0x1084694: addiu v1, v1, 29436
+// 0x01084cb8: 0x1084cb8: addiu v1, v1, 29900
 	ldloc 7
-	ldc.i4 29436
+	ldc.i4 29900
 	add
 	stloc 7
-// 0x01084698: 0x1084698: sll   v0, v0, 2
+// 0x01084cbc: 0x1084cbc: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x0108469c: 0x108469c: addu  v0, v0, v1
+// 0x01084cc0: 0x1084cc0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x010846a0: 0x10846a0: lw    v0, 0(v0)
+// 0x01084cc4: 0x1084cc4: lw    v0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 5
-// 0x010846a4: 0x10846a4: lw    a1, 56(sp)
+// 0x01084cc8: 0x1084cc8: lw    a1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5205,10 +5205,10 @@ L_10845ec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x010846a8: 0x10846a8: addu  a2, a0, zero
+// 0x01084ccc: 0x1084ccc: addu  a2, a0, zero
 	ldloc.1
 	stloc.3
-// 0x010846ac: 0x10846ac: jal   0x10ac684 sw    v0, 32(sp)
+// 0x01084cd0: 0x1084cd0: jal   0x10acccc sw    v0, 32(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5217,9 +5217,9 @@ L_10845ec:
 	add
 	ldloc 5
 	stelem.i4
-	call void Cibyl129::roadmap_screen_draw_line_direction_10ac684()
+	call void Cibyl129::roadmap_screen_draw_line_direction_10acccc()
 // --- basic block ---
-// 0x010846b4: 0x10846b4: sw    s1, 56(sp)
+// 0x01084cd8: 0x1084cd8: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5228,18 +5228,18 @@ L_10845ec:
 	add
 	ldloc 9
 	stelem.i4
-L_10846b8:
-// 0x010846b8: 0x10846b8: j	 0x10846c8 addu  a0, s4, zero
+L_1084cdc:
+// 0x01084cdc: 0x1084cdc: j	 0x1084cec addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-	br L_10846c8
+	br L_1084cec
 // --- basic block ---
-L_10846c0:
-// 0x010846c0: 0x10846c0: addu  a0, s4, zero
+L_1084ce4:
+// 0x01084ce4: 0x1084ce4: addu  a0, s4, zero
 	ldloc 11
 	stloc.1
-L_10846c4:
-// 0x010846c4: 0x10846c4: sw    s1, 56(sp)
+L_1084ce8:
+// 0x01084ce8: 0x1084ce8: sw    s1, 56(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5248,18 +5248,18 @@ L_10846c4:
 	add
 	ldloc 9
 	stelem.i4
-L_10846c8:
-// 0x010846c8: 0x10846c8: addiu s5, s5, 1
+L_1084cec:
+// 0x01084cec: 0x1084cec: addiu s5, s5, 1
 	ldloc 13
 	ldc.i4.1
 	add
 	stloc 13
-L_10846cc:
-// 0x010846cc: 0x10846cc: addu  s4, a0, zero
+L_1084cf0:
+// 0x01084cf0: 0x1084cf0: addu  s4, a0, zero
 	ldloc.1
 	stloc 11
-L_10846d0:
-// 0x010846d0: 0x10846d0: lw    a0, 60(sp)
+L_1084cf4:
+// 0x01084cf4: 0x1084cf4: lw    a0, 60(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5268,21 +5268,21 @@ L_10846d0:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010846d4: 0x10846d4: sll   zero, zero, 0
-// 0x010846d8: 0x10846d8: slt   v0, s5, a0
+// 0x01084cf8: 0x1084cf8: sll   zero, zero, 0
+// 0x01084cfc: 0x1084cfc: slt   v0, s5, a0
 	ldloc 13
 	ldloc.1
 	clt
 	stloc 5
-// 0x010846dc: 0x10846dc: bne   v0, zero, 0x1084300 sll   zero, zero, 0
+// 0x01084d00: 0x1084d00: bne   v0, zero, 0x1084924 sll   zero, zero, 0
 	ldloc 5
-	brtrue L_1084300
+	brtrue L_1084924
 // --- basic block ---
-// 0x010846e4: 0x10846e4: j	 0x10847a8 sll   zero, zero, 0
-	br L_10847a8
+// 0x01084d08: 0x1084d08: j	 0x1084dcc sll   zero, zero, 0
+	br L_1084dcc
 // --- basic block ---
-L_10846ec:
-// 0x010846ec: 0x10846ec: lw    v0, 12(v1)
+L_1084d10:
+// 0x01084d10: 0x1084d10: lw    v0, 12(v1)
 	ldloc 6
 	ldloc 7
 	ldc.i4.2
@@ -5291,7 +5291,7 @@ L_10846ec:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010846f0: 0x10846f0: sw    v1, 68(sp)
+// 0x01084d14: 0x1084d14: sw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5300,35 +5300,35 @@ L_10846ec:
 	add
 	ldloc 7
 	stelem.i4
-// 0x010846f4: 0x10846f4: sll   v0, v0, 2
+// 0x01084d18: 0x1084d18: sll   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	shl
 	stloc 5
-// 0x010846f8: 0x10846f8: addu  v0, v0, s6
+// 0x01084d1c: 0x1084d1c: addu  v0, v0, s6
 	ldloc 5
 	ldloc 14
 	add
 	stloc 5
-// 0x010846fc: 0x10846fc: lw    a0, 0(v0)
+// 0x01084d20: 0x1084d20: lw    a0, 0(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084700: 0x1084700: jal   0x104e35c sll   zero, zero, 0
+// 0x01084d24: 0x1084d24: jal   0x104e36c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl58::roadmap_canvas_select_pen_104e35c(int32,int32,int32,int32,int32)
+	call int32 Cibyl58::roadmap_canvas_select_pen_104e36c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084708: 0x1084708: jal   0x101fa7c sw    v0, 64(sp)
+// 0x01084d2c: 0x1084d2c: jal   0x101fa8c sw    v0, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5338,27 +5338,27 @@ L_10846ec:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa7c(int32)
+	call int32 Cibyl23::roadmap_screen_get_screen_scale_101fa8c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084710: 0x1084710: div   v0, s5
+// 0x01084d34: 0x1084d34: div   v0, s5
 	ldloc 5
 	ldloc 13
 	div
 	stloc 12
-// 0x01084714: 0x1084714: mflo  lo
+// 0x01084d38: 0x1084d38: mflo  lo
 	ldloc 12
 	stloc.1
-// 0x01084718: 0x1084718: jal   0x104dd5c sll   zero, zero, 0
+// 0x01084d3c: 0x1084d3c: jal   0x104dd6c sll   zero, zero, 0
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd5c(int32)
+	call int32 Cibyl57::roadmap_canvas_set_thickness_104dd6c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x01084720: 0x1084720: lw    a1, 64(sp)
+// 0x01084d44: 0x1084d44: lw    a1, 64(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5367,7 +5367,7 @@ L_10846ec:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01084724: 0x1084724: lw    v1, 68(sp)
+// 0x01084d48: 0x1084d48: lw    v1, 68(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5376,17 +5376,17 @@ L_10846ec:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084728: 0x1084728: bne   a1, zero, 0x108422c addu  a0, a1, zero
+// 0x01084d4c: 0x1084d4c: bne   a1, zero, 0x1084850 addu  a0, a1, zero
 	ldloc.2
 	ldloc.2
 	stloc.1
-	brtrue L_108422c
+	brtrue L_1084850
 // --- basic block ---
-// 0x01084730: 0x1084730: j	 0x108423c sll   zero, zero, 0
-	br L_108423c
+// 0x01084d54: 0x1084d54: j	 0x1084860 sll   zero, zero, 0
+	br L_1084860
 // --- basic block ---
-L_1084738:
-// 0x01084738: 0x1084738: lw    a2, 76(s0)
+L_1084d5c:
+// 0x01084d5c: 0x1084d5c: lw    a2, 76(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5395,34 +5395,34 @@ L_1084738:
 	add
 	ldelem.i4
 	stloc.3
-// 0x0108473c: 0x108473c: sll   zero, zero, 0
-// 0x01084740: 0x1084740: beq   a2, zero, 0x1084378 sll   zero, zero, 0
+// 0x01084d60: 0x1084d60: sll   zero, zero, 0
+// 0x01084d64: 0x1084d64: beq   a2, zero, 0x108499c sll   zero, zero, 0
 	ldloc.3
-	brfalse L_1084378
+	brfalse L_108499c
 // --- basic block ---
-// 0x01084748: 0x1084748: j	 0x108441c sll   zero, zero, 0
-	br L_108441c
+// 0x01084d6c: 0x1084d6c: j	 0x1084a40 sll   zero, zero, 0
+	br L_1084a40
 // --- basic block ---
-L_1084750:
-// 0x01084750: 0x1084750: lw    a0, 0(s0)
+L_1084d74:
+// 0x01084d74: 0x1084d74: lw    a0, 0(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084754: 0x1084754: jal   0x100b484 sll   zero, zero, 0
+// 0x01084d78: 0x1084d78: jal   0x100b494 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl8::roadmap_square_version_100b484(int32,int32,int32,int32,int32)
+	call int32 Cibyl8::roadmap_square_version_100b494(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 7
 	stloc 5
 // --- basic block ---
-// 0x0108475c: 0x108475c: lw    v1, 4(s0)
+// 0x01084d80: 0x1084d80: lw    v1, 4(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5431,25 +5431,25 @@ L_1084750:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084760: 0x1084760: sll   zero, zero, 0
-// 0x01084764: 0x1084764: slt   v0, v0, v1
+// 0x01084d84: 0x1084d84: sll   zero, zero, 0
+// 0x01084d88: 0x1084d88: slt   v0, v0, v1
 	ldloc 5
 	ldloc 7
 	clt
 	stloc 5
-// 0x01084768: 0x1084768: beq   v0, zero, 0x10846b8 lui   a1, 0x100000
+// 0x01084d8c: 0x1084d8c: beq   v0, zero, 0x1084cdc lui   a1, 0x100000
 	ldloc 5
 	ldc.i4 1048576
 	stloc.2
-	brfalse L_10846b8
+	brfalse L_1084cdc
 // --- basic block ---
-// 0x01084770: 0x1084770: j	 0x1084404 addiu a2, zero, 1
+// 0x01084d94: 0x1084d94: j	 0x1084a28 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
-	br L_1084404
+	br L_1084a28
 // --- basic block ---
-L_1084778:
-// 0x01084778: 0x1084778: lw    v1, 12(s0)
+L_1084d9c:
+// 0x01084d9c: 0x1084d9c: lw    v1, 12(s0)
 	ldloc 6
 	ldloc 8
 	ldc.i4.2
@@ -5458,30 +5458,30 @@ L_1084778:
 	add
 	ldelem.i4
 	stloc 7
-// 0x0108477c: 0x108477c: sll   zero, zero, 0
-// 0x01084780: 0x1084780: mult  v1, a0
+// 0x01084da0: 0x1084da0: sll   zero, zero, 0
+// 0x01084da4: 0x1084da4: mult  v1, a0
 	ldloc 7
 	ldloc.1
 	mul
 	stloc 12
-// 0x01084784: 0x1084784: lw    v0, 29728(s6)
+// 0x01084da8: 0x1084da8: lw    v0, 30192(s6)
 	ldloc 6
 	ldloc 14
 	ldc.i4.2
 	shr.un
-	ldc.i4 7432
+	ldc.i4 7548
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084788: 0x1084788: mflo  lo
+// 0x01084dac: 0x1084dac: mflo  lo
 	ldloc 12
 	stloc 7
-// 0x0108478c: 0x108478c: addu  v0, v0, v1
+// 0x01084db0: 0x1084db0: addu  v0, v0, v1
 	ldloc 5
 	ldloc 7
 	add
 	stloc 5
-// 0x01084790: 0x1084790: lw    v1, 8(v0)
+// 0x01084db4: 0x1084db4: lw    v1, 8(v0)
 	ldloc 6
 	ldloc 5
 	ldc.i4.2
@@ -5490,19 +5490,19 @@ L_1084778:
 	add
 	ldelem.i4
 	stloc 7
-// 0x01084794: 0x1084794: sll   zero, zero, 0
-// 0x01084798: 0x1084798: beq   v1, zero, 0x10846c8 addu  a0, s4, zero
+// 0x01084db8: 0x1084db8: sll   zero, zero, 0
+// 0x01084dbc: 0x1084dbc: beq   v1, zero, 0x1084cec addu  a0, s4, zero
 	ldloc 7
 	ldloc 11
 	stloc.1
-	brfalse L_10846c8
+	brfalse L_1084cec
 // --- basic block ---
-// 0x010847a0: 0x10847a0: j	 0x1084474 sll   zero, zero, 0
-	br L_1084474
+// 0x01084dc4: 0x1084dc4: j	 0x1084a98 sll   zero, zero, 0
+	br L_1084a98
 // --- basic block ---
-L_10847a8:
-// 0x010847a8: 0x10847a8: lw    ra, 108(sp)
-// 0x010847ac: 0x10847ac: lw    s8, 104(sp)
+L_1084dcc:
+// 0x01084dcc: 0x1084dcc: lw    ra, 108(sp)
+// 0x01084dd0: 0x1084dd0: lw    s8, 104(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5511,7 +5511,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 15
-// 0x010847b0: 0x10847b0: lw    s7, 100(sp)
+// 0x01084dd4: 0x1084dd4: lw    s7, 100(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5520,7 +5520,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 17
-// 0x010847b4: 0x10847b4: lw    s6, 96(sp)
+// 0x01084dd8: 0x1084dd8: lw    s6, 96(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5529,7 +5529,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010847b8: 0x10847b8: lw    s5, 92(sp)
+// 0x01084ddc: 0x1084ddc: lw    s5, 92(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5538,7 +5538,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010847bc: 0x10847bc: lw    s4, 88(sp)
+// 0x01084de0: 0x1084de0: lw    s4, 88(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5547,7 +5547,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010847c0: 0x10847c0: lw    s3, 84(sp)
+// 0x01084de4: 0x1084de4: lw    s3, 84(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5556,7 +5556,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 16
-// 0x010847c4: 0x10847c4: lw    s2, 80(sp)
+// 0x01084de8: 0x1084de8: lw    s2, 80(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5565,7 +5565,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010847c8: 0x10847c8: lw    s1, 76(sp)
+// 0x01084dec: 0x1084dec: lw    s1, 76(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5574,7 +5574,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010847cc: 0x10847cc: lw    s0, 72(sp)
+// 0x01084df0: 0x1084df0: lw    s0, 72(sp)
 	ldloc 6
 	ldloc.0
 	ldc.i4.2
@@ -5583,7 +5583,7 @@ L_10847a8:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010847d0: 0x10847d0: jr    ra addiu sp, sp, 112
+// 0x01084df4: 0x1084df4: jr    ra addiu sp, sp, 112
 	ldloc.0
 	ldc.i4.s 112
 	add
@@ -5595,7 +5595,7 @@ __CIBYL_function_return:
 	ldloc 5
 	ret
 }
-.method public static int32 RealtimeAlertCommentsList_10847d8(int32,int32,int32,int32,int32)
+.method public static int32 RealtimeAlertCommentsList_1084dfc(int32,int32,int32,int32,int32)
 {
 .maxstack 10
 .locals init (int32 sp,int32 a0,int32 a1,int32 a2,int32 a3,int32 v0,int32 v1,int32[] mem,int32 s4,int32 s5,int32 s2,int32 s1,int32 s8,int32 s0,int32 s3,int32 s6,int32 s7,int32 lo,int32 hi,int32 ra)
@@ -5663,12 +5663,12 @@ __CIBYL_function_return:
 	stloc 7
 __CIBYL_javamethod_begin:
 // --- basic block ---
-// 0x010847d8: 0x10847d8: addiu sp, sp, -1632
+// 0x01084dfc: 0x1084dfc: addiu sp, sp, -1632
 	ldloc.0
 	ldc.i4 -1632
 	add
 	stloc.0
-// 0x010847dc: 0x10847dc: sw    s4, 1608(sp)
+// 0x01084e00: 0x1084e00: sw    s4, 1608(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5677,21 +5677,21 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 8
 	stelem.i4
-// 0x010847e0: 0x10847e0: addiu v0, zero, -1
+// 0x01084e04: 0x1084e04: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x010847e4: 0x10847e4: addu  s4, a0, zero
+// 0x01084e08: 0x1084e08: addu  s4, a0, zero
 	ldloc.1
 	stloc 8
-// 0x010847e8: 0x10847e8: lui   a0, 0x20000
+// 0x01084e0c: 0x1084e0c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010847ec: 0x10847ec: addiu a0, a0, -21524
+// 0x01084e10: 0x1084e10: addiu a0, a0, -21060
 	ldloc.1
-	ldc.i4 -21524
+	ldc.i4 -21060
 	add
 	stloc.1
-// 0x010847f0: 0x10847f0: sw    v0, 24(sp)
+// 0x01084e14: 0x1084e14: sw    v0, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5700,11 +5700,11 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010847f4: 0x10847f4: lui   v0, 0xf0000
+// 0x01084e18: 0x1084e18: lui   v0, 0xf0000
 	ldc.i4 983040
 	stloc 5
-// 0x010847f8: 0x10847f8: sw    ra, 1628(sp)
-// 0x010847fc: 0x10847fc: sw    s6, 1616(sp)
+// 0x01084e1c: 0x1084e1c: sw    ra, 1628(sp)
+// 0x01084e20: 0x1084e20: sw    s6, 1616(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5713,7 +5713,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 15
 	stelem.i4
-// 0x01084800: 0x1084800: sw    s3, 1604(sp)
+// 0x01084e24: 0x1084e24: sw    s3, 1604(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5722,7 +5722,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 14
 	stelem.i4
-// 0x01084804: 0x1084804: sw    s1, 1596(sp)
+// 0x01084e28: 0x1084e28: sw    s1, 1596(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5731,7 +5731,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 11
 	stelem.i4
-// 0x01084808: 0x1084808: sw    s0, 1592(sp)
+// 0x01084e2c: 0x1084e2c: sw    s0, 1592(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5740,7 +5740,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 13
 	stelem.i4
-// 0x0108480c: 0x108480c: sw    s8, 1624(sp)
+// 0x01084e30: 0x1084e30: sw    s8, 1624(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5749,7 +5749,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 12
 	stelem.i4
-// 0x01084810: 0x1084810: sw    s7, 1620(sp)
+// 0x01084e34: 0x1084e34: sw    s7, 1620(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5758,7 +5758,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 16
 	stelem.i4
-// 0x01084814: 0x1084814: sw    s5, 1612(sp)
+// 0x01084e38: 0x1084e38: sw    s5, 1612(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5767,7 +5767,7 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 9
 	stelem.i4
-// 0x01084818: 0x1084818: sw    s2, 1600(sp)
+// 0x01084e3c: 0x1084e3c: sw    s2, 1600(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5776,16 +5776,16 @@ __CIBYL_javamethod_begin:
 	add
 	ldloc 10
 	stelem.i4
-// 0x0108481c: 0x108481c: lw    s3, -30068(v0)
+// 0x01084e40: 0x1084e40: lw    s3, -29604(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
-	ldc.i4 -7517
+	ldc.i4 -7401
 	add
 	ldelem.i4
 	stloc 14
-// 0x01084820: 0x1084820: jal   0x101cd60 lui   s0, 0x20000
+// 0x01084e44: 0x1084e44: jal   0x101cd70 lui   s0, 0x20000
 	ldc.i4 131072
 	stloc 13
 	ldloc.0
@@ -5793,23 +5793,23 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084828: 0x1084828: addu  a1, v0, zero
+// 0x01084e4c: 0x1084e4c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108482c: 0x108482c: addu  a2, zero, zero
+// 0x01084e50: 0x1084e50: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084830: 0x1084830: addiu a3, zero, 8192
+// 0x01084e54: 0x1084e54: addiu a3, zero, 8192
 	ldc.i4 8192
 	stloc 4
-// 0x01084834: 0x1084834: jal   0x1095a08 addiu a0, s0, -21916
+// 0x01084e58: 0x1084e58: jal   0x1096050 addiu a0, s0, -21452
 	ldloc 13
-	ldc.i4 -21916
+	ldc.i4 -21452
 	add
 	stloc.1
 	ldloc.0
@@ -5817,20 +5817,20 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_new_1095a08(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_new_1096050(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108483c: 0x108483c: lui   a0, 0x10000
+// 0x01084e60: 0x1084e60: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01084840: 0x1084840: addiu a0, a0, -6188
+// 0x01084e64: 0x1084e64: addiu a0, a0, -6192
 	ldloc.1
-	ldc.i4 -6188
+	ldc.i4 -6192
 	add
 	stloc.1
-// 0x01084844: 0x1084844: jal   0x101cd60 addu  s6, v0, zero
+// 0x01084e68: 0x1084e68: jal   0x101cd70 addu  s6, v0, zero
 	ldloc 5
 	stloc 15
 	ldloc.0
@@ -5838,18 +5838,18 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108484c: 0x108484c: addu  a1, v0, zero
+// 0x01084e70: 0x1084e70: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084850: 0x1084850: addu  a0, s6, zero
+// 0x01084e74: 0x1084e74: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x01084854: 0x1084854: jal   0x109b434 lui   s1, 0x1080000
+// 0x01084e78: 0x1084e78: jal   0x109ba7c lui   s1, 0x1080000
 	ldc.i4 17301504
 	stloc 11
 	ldloc.0
@@ -5857,31 +5857,31 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109b434(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_widget_set_left_softkey_text_109ba7c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108485c: 0x108485c: addu  a0, s6, zero
+// 0x01084e80: 0x1084e80: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x01084860: 0x1084860: jal   0x1099174 addiu a1, s1, 23164
+// 0x01084e84: 0x1084e84: jal   0x10997bc addiu a1, s1, 24736
 	ldloc 11
-	ldc.i4 23164
+	ldc.i4 24736
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_left_softkey_callback_1099174(int32,int32)
+	call void Cibyl114::ssd_widget_set_left_softkey_callback_10997bc(int32,int32)
 // --- basic block ---
-// 0x01084868: 0x1084868: addiu a0, s1, 23164
+// 0x01084e8c: 0x1084e8c: addiu a0, s1, 24736
 	ldloc 11
-	ldc.i4 23164
+	ldc.i4 24736
 	add
 	stloc.1
-// 0x0108486c: 0x108486c: jal   0x109c5ec addiu a1, s0, -21916
+// 0x01084e90: 0x1084e90: jal   0x109cc34 addiu a1, s0, -21452
 	ldloc 13
-	ldc.i4 -21916
+	ldc.i4 -21452
 	add
 	stloc.2
 	ldloc.0
@@ -5889,60 +5889,60 @@ __CIBYL_javamethod_begin:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109c5ec(int32,int32,int32,int32,int32)
+	call int32 Cibyl116::ssd_contextmenu_menu_button_register_109cc34(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084874: 0x1084874: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01084e98: 0x1084e98: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0108487c: 0x108487c: beq   v0, zero, 0x108488c addiu s7, zero, 60
+// 0x01084ea0: 0x1084ea0: beq   v0, zero, 0x1084eb0 addiu s7, zero, 60
 	ldloc 5
 	ldc.i4.s 60
 	stloc 16
-	brfalse L_108488c
+	brfalse L_1084eb0
 // --- basic block ---
-// 0x01084884: 0x1084884: j	 0x1084894 addiu s2, zero, 78
+// 0x01084ea8: 0x1084ea8: j	 0x1084eb8 addiu s2, zero, 78
 	ldc.i4.s 78
 	stloc 10
-	br L_1084894
+	br L_1084eb8
 // --- basic block ---
-L_108488c:
-// 0x0108488c: 0x108488c: addiu s7, zero, 40
+L_1084eb0:
+// 0x01084eb0: 0x1084eb0: addiu s7, zero, 40
 	ldc.i4.s 40
 	stloc 16
-// 0x01084890: 0x1084890: addiu s2, zero, 52
+// 0x01084eb4: 0x1084eb4: addiu s2, zero, 52
 	ldc.i4.s 52
 	stloc 10
-L_1084894:
-// 0x01084894: 0x1084894: lui   a0, 0x20000
+L_1084eb8:
+// 0x01084eb8: 0x1084eb8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084898: 0x1084898: lui   v0, 0x40100000
+// 0x01084ebc: 0x1084ebc: lui   v0, 0x40100000
 	ldc.i4 1074790400
 	stloc 5
-// 0x0108489c: 0x108489c: addiu a0, a0, -21900
+// 0x01084ec0: 0x1084ec0: addiu a0, a0, -21436
 	ldloc.1
-	ldc.i4 -21900
+	ldc.i4 -21436
 	add
 	stloc.1
-// 0x010848a0: 0x10848a0: addu  a1, zero, zero
+// 0x01084ec4: 0x1084ec4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010848a4: 0x10848a4: addiu a2, zero, -2
+// 0x01084ec8: 0x1084ec8: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x010848a8: 0x10848a8: addiu a3, zero, -1
+// 0x01084ecc: 0x1084ecc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010848ac: 0x10848ac: ori   v0, v0, 20608
+// 0x01084ed0: 0x1084ed0: ori   v0, v0, 20608
 	ldloc 5
 	ldc.i4 20608
 	or
 	stloc 5
-// 0x010848b0: 0x10848b0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01084ed4: 0x1084ed4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -5956,36 +5956,36 @@ L_1084894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010848b8: 0x10848b8: addu  a0, s4, zero
+// 0x01084edc: 0x1084edc: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x010848bc: 0x10848bc: addu  s1, v0, zero
+// 0x01084ee0: 0x1084ee0: addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-// 0x010848c0: 0x10848c0: sb    zero, 668(sp)
+// 0x01084ee4: 0x1084ee4: sb    zero, 668(sp)
 	ldloc.0
 	ldc.i4 668
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010848c4: 0x10848c4: sb    zero, 416(sp)
+// 0x01084ee8: 0x1084ee8: sb    zero, 416(sp)
 	ldloc.0
 	ldc.i4 416
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010848c8: 0x10848c8: sb    zero, 216(sp)
+// 0x01084eec: 0x1084eec: sb    zero, 216(sp)
 	ldloc.0
 	ldc.i4 216
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x010848cc: 0x10848cc: jal   0x10771d8 sb    zero, 116(sp)
+// 0x01084ef0: 0x1084ef0: jal   0x10777fc sb    zero, 116(sp)
 	ldloc.0
 	ldc.i4.s 116
 	add
@@ -5995,33 +5995,33 @@ L_1084894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10771d8(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Number_of_Comments_10777fc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010848d4: 0x10848d4: beq   v0, zero, 0x1085688 addiu v1, zero, -1
+// 0x01084ef8: 0x1084ef8: beq   v0, zero, 0x1085cac addiu v1, zero, -1
 	ldloc 5
 	ldc.i4.m1
 	stloc 6
-	brfalse L_1085688
+	brfalse L_1085cac
 // --- basic block ---
-// 0x010848dc: 0x10848dc: jal   0x10770f0 addu  a0, s4, zero
+// 0x01084f00: 0x1084f00: jal   0x1077714 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_By_ID_10770f0(int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_By_ID_1077714(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010848e4: 0x10848e4: addu  s0, v0, zero
+// 0x01084f08: 0x1084f08: addu  s0, v0, zero
 	ldloc 5
 	stloc 13
-// 0x010848e8: 0x10848e8: lw    v0, 16(v0)
+// 0x01084f0c: 0x1084f0c: lw    v0, 16(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6030,10 +6030,10 @@ L_1084894:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010848ec: 0x10848ec: lui   v1, 0x80000
+// 0x01084f10: 0x1084f10: lui   v1, 0x80000
 	ldc.i4 524288
 	stloc 6
-// 0x010848f0: 0x10848f0: sw    v0, 40(sp)
+// 0x01084f14: 0x1084f14: sw    v0, 40(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6042,7 +6042,7 @@ L_1084894:
 	add
 	ldloc 5
 	stelem.i4
-// 0x010848f4: 0x10848f4: lw    v0, 20(s0)
+// 0x01084f18: 0x1084f18: lw    v0, 20(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -6051,17 +6051,17 @@ L_1084894:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010848f8: 0x10848f8: addiu a0, sp, 32
+// 0x01084f1c: 0x1084f1c: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x010848fc: 0x10848fc: addiu a1, sp, 24
+// 0x01084f20: 0x1084f20: addiu a1, sp, 24
 	ldloc.0
 	ldc.i4.s 24
 	add
 	stloc.2
-// 0x01084900: 0x1084900: sw    v0, 44(sp)
+// 0x01084f24: 0x1084f24: sw    v0, 44(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6070,19 +6070,19 @@ L_1084894:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01084904: 0x1084904: lui   v0, 0x0
+// 0x01084f28: 0x1084f28: lui   v0, 0x0
 	ldc.i4.s 0
 	stloc 5
-// 0x01084908: 0x1084908: sw    s4, -2132(v1)
+// 0x01084f2c: 0x1084f2c: sw    s4, -1668(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 -533
+	ldc.i4 -417
 	add
 	ldloc 8
 	stelem.i4
-// 0x0108490c: 0x108490c: jal   0x100844c sw    s4, 17180(v0)
+// 0x01084f30: 0x1084f30: jal   0x100845c sw    s4, 17180(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6094,17 +6094,17 @@ L_1084894:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call int32 Cibyl5::roadmap_math_get_context_100844c(int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_get_context_100845c(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084914: 0x1084914: addiu a0, sp, 40
+// 0x01084f38: 0x1084f38: addiu a0, sp, 40
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.1
-// 0x01084918: 0x1084918: jal   0x10086bc addiu a1, zero, 20
+// 0x01084f3c: 0x1084f3c: jal   0x10086cc addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -6112,22 +6112,22 @@ L_1084894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084920: 0x1084920: addiu a0, sp, 56
+// 0x01084f44: 0x1084f44: addiu a0, sp, 56
 	ldloc.0
 	ldc.i4.s 56
 	add
 	stloc.1
-// 0x01084924: 0x1084924: addiu a1, sp, 76
+// 0x01084f48: 0x1084f48: addiu a1, sp, 76
 	ldloc.0
 	ldc.i4.s 76
 	add
 	stloc.2
-// 0x01084928: 0x1084928: jal   0x1029da8 addiu a2, sp, 28
+// 0x01084f4c: 0x1084f4c: jal   0x1029db8 addiu a2, sp, 28
 	ldloc.0
 	ldc.i4.s 28
 	add
@@ -6137,25 +6137,25 @@ L_1084894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl31::roadmap_navigate_get_current_1029da8(int32,int32,int32,int32,int32)
+	call int32 Cibyl31::roadmap_navigate_get_current_1029db8(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084930: 0x1084930: addu  s4, v0, zero
+// 0x01084f54: 0x1084f54: addu  s4, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01084934: 0x1084934: addiu v0, zero, -1
+// 0x01084f58: 0x1084f58: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01084938: 0x1084938: bne   s4, v0, 0x1084970 lui   a0, 0x10000
+// 0x01084f5c: 0x1084f5c: bne   s4, v0, 0x1084f94 lui   a0, 0x10000
 	ldloc 8
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	bne.un L_1084970
+	bne.un L_1084f94
 // --- basic block ---
-// 0x01084940: 0x1084940: jal   0x101df50 addiu a0, a0, -31052
+// 0x01084f64: 0x1084f64: jal   0x101df60 addiu a0, a0, -31052
 	ldloc.1
 	ldc.i4 -31052
 	add
@@ -6165,23 +6165,23 @@ L_1084894:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl22::roadmap_trip_get_position_101df50(int32,int32,int32,int32,int32)
+	call int32 Cibyl22::roadmap_trip_get_position_101df60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084948: 0x1084948: beq   v0, zero, 0x1084964 sll   zero, zero, 0
+// 0x01084f6c: 0x1084f6c: beq   v0, zero, 0x1084f88 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1084964
+	brfalse L_1084f88
 // --- basic block ---
-// 0x01084950: 0x1084950: lw    v1, 0(v0)
+// 0x01084f74: 0x1084f74: lw    v1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 6
-// 0x01084954: 0x1084954: lw    v0, 4(v0)
+// 0x01084f78: 0x1084f78: lw    v0, 4(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
@@ -6190,7 +6190,7 @@ L_1084894:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084958: 0x1084958: sw    v1, 48(sp)
+// 0x01084f7c: 0x1084f7c: sw    v1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6199,7 +6199,7 @@ L_1084894:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108495c: 0x108495c: j	 0x1084988 sw    v0, 52(sp)
+// 0x01084f80: 0x1084f80: j	 0x1084fac sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6208,10 +6208,10 @@ L_1084894:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1084988
+	br L_1084fac
 // --- basic block ---
-L_1084964:
-// 0x01084964: 0x1084964: sw    s4, 48(sp)
+L_1084f88:
+// 0x01084f88: 0x1084f88: sw    s4, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6220,7 +6220,7 @@ L_1084964:
 	add
 	ldloc 8
 	stelem.i4
-// 0x01084968: 0x1084968: j	 0x1084988 sw    s4, 52(sp)
+// 0x01084f8c: 0x1084f8c: j	 0x1084fac sw    s4, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6229,10 +6229,10 @@ L_1084964:
 	add
 	ldloc 8
 	stelem.i4
-	br L_1084988
+	br L_1084fac
 // --- basic block ---
-L_1084970:
-// 0x01084970: 0x1084970: lw    v0, 60(sp)
+L_1084f94:
+// 0x01084f94: 0x1084f94: lw    v0, 60(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6241,8 +6241,8 @@ L_1084970:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084974: 0x1084974: sll   zero, zero, 0
-// 0x01084978: 0x1084978: sw    v0, 52(sp)
+// 0x01084f98: 0x1084f98: sll   zero, zero, 0
+// 0x01084f9c: 0x1084f9c: sw    v0, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6251,7 +6251,7 @@ L_1084970:
 	add
 	ldloc 5
 	stelem.i4
-// 0x0108497c: 0x108497c: lw    v0, 56(sp)
+// 0x01084fa0: 0x1084fa0: lw    v0, 56(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6260,8 +6260,8 @@ L_1084970:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084980: 0x1084980: sll   zero, zero, 0
-// 0x01084984: 0x1084984: sw    v0, 48(sp)
+// 0x01084fa4: 0x1084fa4: sll   zero, zero, 0
+// 0x01084fa8: 0x1084fa8: sw    v0, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6270,8 +6270,8 @@ L_1084970:
 	add
 	ldloc 5
 	stelem.i4
-L_1084988:
-// 0x01084988: 0x1084988: lw    v1, 52(sp)
+L_1084fac:
+// 0x01084fac: 0x1084fac: lw    v1, 52(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6280,15 +6280,15 @@ L_1084988:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108498c: 0x108498c: addiu v0, zero, -1
+// 0x01084fb0: 0x1084fb0: addiu v0, zero, -1
 	ldc.i4.m1
 	stloc 5
-// 0x01084990: 0x1084990: beq   v1, v0, 0x1084a58 sll   zero, zero, 0
+// 0x01084fb4: 0x1084fb4: beq   v1, v0, 0x108507c sll   zero, zero, 0
 	ldloc 6
 	ldloc 5
-	beq  L_1084a58
+	beq  L_108507c
 // --- basic block ---
-// 0x01084998: 0x1084998: lw    v1, 48(sp)
+// 0x01084fbc: 0x1084fbc: lw    v1, 48(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6297,17 +6297,17 @@ L_1084988:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108499c: 0x108499c: sll   zero, zero, 0
-// 0x010849a0: 0x10849a0: beq   v1, v0, 0x1084a58 addiu a1, sp, 40
+// 0x01084fc0: 0x1084fc0: sll   zero, zero, 0
+// 0x01084fc4: 0x1084fc4: beq   v1, v0, 0x108507c addiu a1, sp, 40
 	ldloc 6
 	ldloc 5
 	ldloc.0
 	ldc.i4.s 40
 	add
 	stloc.2
-	beq  L_1084a58
+	beq  L_108507c
 // --- basic block ---
-// 0x010849a8: 0x10849a8: jal   0x1008eb0 addiu a0, sp, 48
+// 0x01084fcc: 0x1084fcc: jal   0x1008ec0 addiu a0, sp, 48
 	ldloc.0
 	ldc.i4.s 48
 	add
@@ -6317,15 +6317,15 @@ L_1084988:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl6::roadmap_math_distance_1008eb0(int32,int32,int32,int32,int32)
+	call int32 Cibyl6::roadmap_math_distance_1008ec0(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010849b0: 0x10849b0: addu  a0, v0, zero
+// 0x01084fd4: 0x1084fd4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010849b4: 0x10849b4: jal   0x1007df4 sw    v0, 1580(sp)
+// 0x01084fd8: 0x1084fd8: jal   0x1007e04 sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6335,20 +6335,20 @@ L_1084988:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_1007df4(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_1007e04(int32)
 	stloc 5
 // --- basic block ---
-// 0x010849bc: 0x10849bc: addiu s8, sp, 316
+// 0x01084fe0: 0x1084fe0: addiu s8, sp, 316
 	ldloc.0
 	ldc.i4 316
 	add
 	stloc 12
-// 0x010849c0: 0x10849c0: addiu s5, sp, 96
+// 0x01084fe4: 0x1084fe4: addiu s5, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc 9
-// 0x010849c4: 0x10849c4: lw    v1, 1580(sp)
+// 0x01084fe8: 0x1084fe8: lw    v1, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6357,17 +6357,17 @@ L_1084988:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010849c8: 0x10849c8: blez  v0, 0x1084a14 lui   s4, 0x10000
+// 0x01084fec: 0x1084fec: blez  v0, 0x1085038 lui   s4, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc 8
 	ldc.i4.s 0
-	ble L_1084a14
+	ble L_1085038
 // --- basic block ---
-// 0x010849d0: 0x10849d0: addu  a0, v1, zero
+// 0x01084ff4: 0x1084ff4: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x010849d4: 0x10849d4: jal   0x1007e18 sw    v0, 1584(sp)
+// 0x01084ff8: 0x1084ff8: jal   0x1007e28 sw    v0, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6377,15 +6377,15 @@ L_1084988:
 	ldloc 5
 	stelem.i4
 	ldloc.1
-	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e18(int32)
+	call int32 Cibyl5::roadmap_math_to_trip_distance_tenths_1007e28(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010849dc: 0x10849dc: addiu v1, zero, 10
+// 0x01085000: 0x1085000: addiu v1, zero, 10
 	ldc.i4.s 10
 	stloc 6
-// 0x010849e0: 0x10849e0: div   v0, v1
+// 0x01085004: 0x1085004: div   v0, v1
 	ldloc 5
 	ldloc 6
 	ldloc 5
@@ -6394,7 +6394,7 @@ L_1084988:
 	stloc 17
 	rem
 	stloc 18
-// 0x010849e4: 0x10849e4: lw    a3, 1584(sp)
+// 0x01085008: 0x1085008: lw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6403,24 +6403,24 @@ L_1084988:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010849e8: 0x10849e8: lui   a2, 0x10000
+// 0x0108500c: 0x108500c: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x010849ec: 0x10849ec: addiu a2, a2, 8928
+// 0x01085010: 0x1085010: addiu a2, a2, 8924
 	ldloc.3
-	ldc.i4 8928
+	ldc.i4 8924
 	add
 	stloc.3
-// 0x010849f0: 0x10849f0: addu  a0, s8, zero
+// 0x01085014: 0x1085014: addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-// 0x010849f4: 0x10849f4: addiu a1, zero, 100
+// 0x01085018: 0x1085018: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x010849f8: 0x10849f8: mfhi  hi
+// 0x0108501c: 0x108501c: mfhi  hi
 	ldloc 18
 	stloc 5
-// 0x010849fc: 0x10849fc: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01085020: 0x1085020: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6439,15 +6439,15 @@ L_1084988:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084a04: 0x1084a04: jal   0x1007d84 sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_trip_unit_1007d84()
+// 0x01085028: 0x1085028: jal   0x1007d94 sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_trip_unit_1007d94()
 	stloc 5
 // --- basic block ---
-// 0x01084a0c: 0x1084a0c: j	 0x1084a3c sll   zero, zero, 0
-	br L_1084a3c
+// 0x01085030: 0x1085030: j	 0x1085060 sll   zero, zero, 0
+	br L_1085060
 // --- basic block ---
-L_1084a14:
-// 0x01084a14: 0x1084a14: jal   0x1007db4 addu  a0, v1, zero
+L_1085038:
+// 0x01085038: 0x1085038: jal   0x1007dc4 addu  a0, v1, zero
 	ldloc 6
 	stloc.1
 	ldloc.0
@@ -6455,26 +6455,26 @@ L_1084a14:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_distance_to_current_1007db4(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_distance_to_current_1007dc4(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084a1c: 0x1084a1c: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x01085040: 0x1085040: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x01084a20: 0x1084a20: addu  a0, s8, zero
+// 0x01085044: 0x1085044: addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-// 0x01084a24: 0x1084a24: addiu a2, a2, -13884
+// 0x01085048: 0x1085048: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x01084a28: 0x1084a28: addu  a3, v0, zero
+// 0x0108504c: 0x108504c: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01084a2c: 0x1084a2c: jal   0x1000f9c addiu a1, zero, 100
+// 0x01085050: 0x1085050: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -6487,12 +6487,12 @@ L_1084a14:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084a34: 0x1084a34: jal   0x1007d6c sll   zero, zero, 0
-	call int32 Cibyl5::roadmap_math_distance_unit_1007d6c()
+// 0x01085058: 0x1085058: jal   0x1007d7c sll   zero, zero, 0
+	call int32 Cibyl5::roadmap_math_distance_unit_1007d7c()
 	stloc 5
 // --- basic block ---
-L_1084a3c:
-// 0x01084a3c: 0x1084a3c: jal   0x101cd60 addu  a0, v0, zero
+L_1085060:
+// 0x01085060: 0x1085060: jal   0x101cd70 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
@@ -6500,23 +6500,23 @@ L_1084a3c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084a44: 0x1084a44: addu  a3, v0, zero
+// 0x01085068: 0x1085068: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01084a48: 0x1084a48: addu  a0, s5, zero
+// 0x0108506c: 0x108506c: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01084a4c: 0x1084a4c: addiu a2, s4, 19912
+// 0x01085070: 0x1085070: addiu a2, s4, 20332
 	ldloc 8
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01084a50: 0x1084a50: jal   0x1000f9c addiu a1, zero, 20
+// 0x01085074: 0x1085074: jal   0x1000f9c addiu a1, zero, 20
 	ldc.i4.s 20
 	stloc.2
 	ldloc.0
@@ -6529,8 +6529,8 @@ L_1084a3c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1084a58:
-// 0x01084a58: 0x1084a58: lw    a1, 24(sp)
+L_108507c:
+// 0x0108507c: 0x108507c: lw    a1, 24(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6539,12 +6539,12 @@ L_1084a58:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01084a5c: 0x1084a5c: addiu a0, sp, 32
+// 0x01085080: 0x1085080: addiu a0, sp, 32
 	ldloc.0
 	ldc.i4.s 32
 	add
 	stloc.1
-// 0x01084a60: 0x1084a60: jal   0x10086bc addiu s4, sp, 416
+// 0x01085084: 0x1085084: jal   0x10086cc addiu s4, sp, 416
 	ldloc.0
 	ldc.i4 416
 	add
@@ -6554,12 +6554,12 @@ L_1084a58:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl5::roadmap_math_set_context_10086bc(int32,int32,int32,int32,int32)
+	call int32 Cibyl5::roadmap_math_set_context_10086cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084a68: 0x1084a68: jal   0x1001b48 addu  a0, s4, zero
+// 0x0108508c: 0x108508c: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -6568,28 +6568,28 @@ L_1084a58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084a70: 0x1084a70: addiu a1, zero, 250
+// 0x01085094: 0x1085094: addiu a1, zero, 250
 	ldc.i4 250
 	stloc.2
-// 0x01084a74: 0x1084a74: lui   a2, 0x10000
+// 0x01085098: 0x1085098: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01084a78: 0x1084a78: addu  a0, s4, v0
+// 0x0108509c: 0x108509c: addu  a0, s4, v0
 	ldloc 8
 	ldloc 5
 	add
 	stloc.1
-// 0x01084a7c: 0x1084a7c: subu  a1, a1, v0
+// 0x010850a0: 0x10850a0: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x01084a80: 0x1084a80: addiu a2, a2, 19912
+// 0x010850a4: 0x10850a4: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01084a84: 0x1084a84: jal   0x1000f9c addiu a3, s0, 557
+// 0x010850a8: 0x10850a8: jal   0x1000f9c addiu a3, s0, 557
 	ldloc 13
 	ldc.i4 557
 	add
@@ -6604,18 +6604,18 @@ L_1084a58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084a8c: 0x1084a8c: addu  a0, zero, zero
+// 0x010850b0: 0x10850b0: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01084a90: 0x1084a90: cibyl_sysc_arg 0x4
+// 0x010850b4: 0x10850b4: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01084a94: 0x1084a94: cibyl_sysc 0x2139
+// 0x010850b8: 0x10850b8: cibyl_sysc 0x2139
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01084a98: 0x1084a98: addu  a0, v0, zero
+// 0x010850bc: 0x10850bc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084a9c: 0x1084a9c: lw    v0, 144(s0)
+// 0x010850c0: 0x10850c0: lw    v0, 144(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -6624,51 +6624,51 @@ L_1084a58:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084aa0: 0x1084aa0: addiu s5, sp, 668
+// 0x010850c4: 0x10850c4: addiu s5, sp, 668
 	ldloc.0
 	ldc.i4 668
 	add
 	stloc 9
-// 0x01084aa4: 0x1084aa4: jal   0x10c09c0 subu  a0, a0, v0
+// 0x010850c8: 0x10850c8: jal   0x10c1000 subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084aac: 0x1084aac: addu  a1, v1, zero
+// 0x010850d0: 0x10850d0: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x01084ab0: 0x1084ab0: jal   0x10c08d0 addu  a0, v0, zero
+// 0x010850d4: 0x10850d4: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ab8: 0x1084ab8: addu  s4, v0, zero
+// 0x010850dc: 0x10850dc: addu  s4, v0, zero
 	ldloc 5
 	stloc 8
-// 0x01084abc: 0x1084abc: nor   v0, zero, v0
+// 0x010850e0: 0x10850e0: nor   v0, zero, v0
 	ldloc 5
 	ldc.i4.m1
 	xor
 	stloc 5
-// 0x01084ac0: 0x1084ac0: sra   v0, v0, 31
+// 0x010850e4: 0x10850e4: sra   v0, v0, 31
 	ldloc 5
 	ldc.i4.s 31
 	shr
 	stloc 5
-// 0x01084ac4: 0x1084ac4: lw    v1, 4(s0)
+// 0x010850e8: 0x10850e8: lw    v1, 4(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -6677,22 +6677,22 @@ L_1084a58:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01084ac8: 0x1084ac8: and   s4, s4, v0
+// 0x010850ec: 0x10850ec: and   s4, s4, v0
 	ldloc 8
 	ldloc 5
 	and
 	stloc 8
-// 0x01084acc: 0x1084acc: addiu v0, zero, 4
+// 0x010850f0: 0x10850f0: addiu v0, zero, 4
 	ldc.i4.4
 	stloc 5
-// 0x01084ad0: 0x1084ad0: bne   v1, v0, 0x1084af0 lui   s8, 0x10000
+// 0x010850f4: 0x10850f4: bne   v1, v0, 0x1085114 lui   s8, 0x10000
 	ldloc 6
 	ldloc 5
 	ldc.i4 65536
 	stloc 12
-	bne.un L_1084af0
+	bne.un L_1085114
 // --- basic block ---
-// 0x01084ad8: 0x1084ad8: jal   0x1001b48 addu  a0, s5, zero
+// 0x010850fc: 0x10850fc: jal   0x1001b48 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6701,21 +6701,21 @@ L_1084a58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ae0: 0x1084ae0: lui   a0, 0x20000
+// 0x01085104: 0x1085104: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084ae4: 0x1084ae4: addu  v1, v0, zero
+// 0x01085108: 0x1085108: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01084ae8: 0x1084ae8: j	 0x1084b04 addiu a0, a0, -26480
+// 0x0108510c: 0x108510c: j	 0x1085128 addiu a0, a0, -26016
 	ldloc.1
-	ldc.i4 -26480
+	ldc.i4 -26016
 	add
 	stloc.1
-	br L_1084b04
+	br L_1085128
 // --- basic block ---
-L_1084af0:
-// 0x01084af0: 0x1084af0: jal   0x1001b48 addu  a0, s5, zero
+L_1085114:
+// 0x01085114: 0x1085114: jal   0x1001b48 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6724,19 +6724,19 @@ L_1084af0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084af8: 0x1084af8: lui   a0, 0x20000
+// 0x0108511c: 0x108511c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084afc: 0x1084afc: addu  v1, v0, zero
+// 0x01085120: 0x1085120: addu  v1, v0, zero
 	ldloc 5
 	stloc 6
-// 0x01084b00: 0x1084b00: addiu a0, a0, -21872
+// 0x01085124: 0x1085124: addiu a0, a0, -21408
 	ldloc.1
-	ldc.i4 -21872
+	ldc.i4 -21408
 	add
 	stloc.1
-L_1084b04:
-// 0x01084b04: 0x1084b04: jal   0x101cd60 sw    v1, 1580(sp)
+L_1085128:
+// 0x01085128: 0x1085128: jal   0x101cd70 sw    v1, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6750,12 +6750,12 @@ L_1084b04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084b0c: 0x1084b0c: lw    v1, 1580(sp)
+// 0x01085130: 0x1085130: lw    v1, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6764,33 +6764,33 @@ L_1084b04:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01084b10: 0x1084b10: addiu a1, zero, 300
+// 0x01085134: 0x1085134: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x01084b14: 0x1084b14: subu  a1, a1, v1
+// 0x01085138: 0x1085138: subu  a1, a1, v1
 	ldloc.2
 	ldloc 6
 	sub
 	stloc.2
-// 0x01084b18: 0x1084b18: addu  a0, s5, v1
+// 0x0108513c: 0x108513c: addu  a0, s5, v1
 	ldloc 9
 	ldloc 6
 	add
 	stloc.1
-// 0x01084b1c: 0x1084b1c: lui   v1, 0x20000
+// 0x01085140: 0x1085140: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01084b20: 0x1084b20: addiu a2, v1, 21592
+// 0x01085144: 0x1085144: addiu a2, v1, 22052
 	ldloc 6
-	ldc.i4 21592
+	ldc.i4 22052
 	add
 	stloc.3
-// 0x01084b24: 0x1084b24: addiu a3, s8, 19160
+// 0x01085148: 0x1085148: addiu a3, s8, 18632
 	ldloc 12
-	ldc.i4 19160
+	ldc.i4 18632
 	add
 	stloc 4
-// 0x01084b28: 0x1084b28: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0108514c: 0x108514c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -6809,25 +6809,25 @@ L_1084b04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084b30: 0x1084b30: slti  v0, s4, 60
+// 0x01085154: 0x1085154: slti  v0, s4, 60
 	ldloc 8
 	ldc.i4.s 60
 	clt
 	stloc 5
-// 0x01084b34: 0x1084b34: beq   v0, zero, 0x1084b70 addiu v0, s4, -61
+// 0x01085158: 0x1085158: beq   v0, zero, 0x1085194 addiu v0, s4, -61
 	ldloc 5
 	ldloc 8
 	ldc.i4.s -61
 	add
 	stloc 5
-	brfalse L_1084b70
+	brfalse L_1085194
 // --- basic block ---
-// 0x01084b3c: 0x1084b3c: addiu s8, sp, 668
+// 0x01085160: 0x1085160: addiu s8, sp, 668
 	ldloc.0
 	ldc.i4 668
 	add
 	stloc 12
-// 0x01084b40: 0x1084b40: jal   0x1001b48 addu  a0, s8, zero
+// 0x01085164: 0x1085164: jal   0x1001b48 addu  a0, s8, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
@@ -6836,15 +6836,15 @@ L_1084b04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084b48: 0x1084b48: lui   a0, 0x20000
+// 0x0108516c: 0x108516c: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084b4c: 0x1084b4c: addiu a0, a0, -26468
+// 0x01085170: 0x1085170: addiu a0, a0, -26004
 	ldloc.1
-	ldc.i4 -26468
+	ldc.i4 -26004
 	add
 	stloc.1
-// 0x01084b50: 0x1084b50: jal   0x101cd60 addu  s5, v0, zero
+// 0x01085174: 0x1085174: jal   0x101cd70 addu  s5, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.0
@@ -6852,47 +6852,47 @@ L_1084b04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084b58: 0x1084b58: addiu a1, zero, 300
+// 0x0108517c: 0x108517c: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x01084b5c: 0x1084b5c: subu  a1, a1, s5
+// 0x01085180: 0x1085180: subu  a1, a1, s5
 	ldloc.2
 	ldloc 9
 	sub
 	stloc.2
-// 0x01084b60: 0x1084b60: addu  a0, s8, s5
+// 0x01085184: 0x1085184: addu  a0, s8, s5
 	ldloc 12
 	ldloc 9
 	add
 	stloc.1
-// 0x01084b64: 0x1084b64: addu  a2, v0, zero
+// 0x01085188: 0x1085188: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01084b68: 0x1084b68: j	 0x1084bb0 addu  a3, s4, zero
+// 0x0108518c: 0x108518c: j	 0x10851d4 addu  a3, s4, zero
 	ldloc 8
 	stloc 4
-	br L_1084bb0
+	br L_10851d4
 // --- basic block ---
-L_1084b70:
-// 0x01084b70: 0x1084b70: sltiu v0, v0, 3539
+L_1085194:
+// 0x01085194: 0x1085194: sltiu v0, v0, 3539
 	ldloc 5
 	ldc.i4 3539
 	clt.un
 	stloc 5
-// 0x01084b74: 0x1084b74: beq   v0, zero, 0x1084bc0 addiu s5, sp, 668
+// 0x01085198: 0x1085198: beq   v0, zero, 0x10851e4 addiu s5, sp, 668
 	ldloc 5
 	ldloc.0
 	ldc.i4 668
 	add
 	stloc 9
-	brfalse L_1084bc0
+	brfalse L_10851e4
 // --- basic block ---
-// 0x01084b7c: 0x1084b7c: jal   0x1001b48 addu  a0, s5, zero
+// 0x010851a0: 0x10851a0: jal   0x1001b48 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6901,15 +6901,15 @@ L_1084b70:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084b84: 0x1084b84: lui   a0, 0x10000
+// 0x010851a8: 0x10851a8: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01084b88: 0x1084b88: addiu a0, a0, -284
+// 0x010851ac: 0x10851ac: addiu a0, a0, -288
 	ldloc.1
-	ldc.i4 -284
+	ldc.i4 -288
 	add
 	stloc.1
-// 0x01084b8c: 0x1084b8c: jal   0x101cd60 addu  s8, v0, zero
+// 0x010851b0: 0x10851b0: jal   0x101cd70 addu  s8, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -6917,15 +6917,15 @@ L_1084b70:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084b94: 0x1084b94: addiu a3, zero, 60
+// 0x010851b8: 0x10851b8: addiu a3, zero, 60
 	ldc.i4.s 60
 	stloc 4
-// 0x01084b98: 0x1084b98: div   s4, a3
+// 0x010851bc: 0x10851bc: div   s4, a3
 	ldloc 8
 	ldloc 4
 	ldloc 8
@@ -6934,27 +6934,27 @@ L_1084b70:
 	stloc 17
 	rem
 	stloc 18
-// 0x01084b9c: 0x1084b9c: addiu a1, zero, 300
+// 0x010851c0: 0x10851c0: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x01084ba0: 0x1084ba0: subu  a1, a1, s8
+// 0x010851c4: 0x10851c4: subu  a1, a1, s8
 	ldloc.2
 	ldloc 12
 	sub
 	stloc.2
-// 0x01084ba4: 0x1084ba4: addu  a0, s5, s8
+// 0x010851c8: 0x10851c8: addu  a0, s5, s8
 	ldloc 9
 	ldloc 12
 	add
 	stloc.1
-// 0x01084ba8: 0x1084ba8: addu  a2, v0, zero
+// 0x010851cc: 0x10851cc: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01084bac: 0x1084bac: mflo  lo
+// 0x010851d0: 0x10851d0: mflo  lo
 	ldloc 17
 	stloc 4
-L_1084bb0:
-// 0x01084bb0: 0x1084bb0: jal   0x1000f9c sll   zero, zero, 0
+L_10851d4:
+// 0x010851d4: 0x10851d4: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -6965,11 +6965,11 @@ L_1084bb0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084bb8: 0x1084bb8: j	 0x1084c20 sll   zero, zero, 0
-	br L_1084c20
+// 0x010851dc: 0x10851dc: j	 0x1085244 sll   zero, zero, 0
+	br L_1085244
 // --- basic block ---
-L_1084bc0:
-// 0x01084bc0: 0x1084bc0: jal   0x1001b48 addu  a0, s5, zero
+L_10851e4:
+// 0x010851e4: 0x10851e4: jal   0x1001b48 addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
@@ -6978,15 +6978,15 @@ L_1084bc0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084bc8: 0x1084bc8: lui   a0, 0x20000
+// 0x010851ec: 0x10851ec: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084bcc: 0x1084bcc: addiu a0, a0, -21860
+// 0x010851f0: 0x10851f0: addiu a0, a0, -21396
 	ldloc.1
-	ldc.i4 -21860
+	ldc.i4 -21396
 	add
 	stloc.1
-// 0x01084bd0: 0x1084bd0: jal   0x101cd60 addu  s8, v0, zero
+// 0x010851f4: 0x10851f4: jal   0x101cd70 addu  s8, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.0
@@ -6994,15 +6994,15 @@ L_1084bc0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084bd8: 0x1084bd8: addu  a0, s4, zero
+// 0x010851fc: 0x10851fc: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x01084bdc: 0x1084bdc: jal   0x10c09ac sw    v0, 1580(sp)
+// 0x01085200: 0x1085200: jal   0x10c0fec sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7016,50 +7016,50 @@ L_1084bc0:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x01084be4: 0x1084be4: lui   v1, 0x20000
+// 0x01085208: 0x1085208: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01084be8: 0x1084be8: lw    a1, 23676(v1)
+// 0x0108520c: 0x108520c: lw    a1, 24136(v1)
 	ldloc 7
 	ldloc 6
 	ldc.i4.2
 	shr.un
-	ldc.i4 5919
+	ldc.i4 6034
 	add
 	ldelem.i4
 	stloc.2
-// 0x01084bec: 0x1084bec: jal   0x10c0780 addu  a0, v0, zero
+// 0x01085210: 0x1085210: jal   0x10c0dc0 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01084bf4: 0x1084bf4: addu  a0, v0, zero
+// 0x01085218: 0x1085218: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084bf8: 0x1084bf8: jal   0x10c0874 addiu s4, zero, 300
+// 0x0108521c: 0x108521c: jal   0x10c0eb4 addiu s4, zero, 300
 	ldc.i4 300
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084c00: 0x1084c00: subu  s4, s4, s8
+// 0x01085224: 0x1085224: subu  s4, s4, s8
 	ldloc 8
 	ldloc 12
 	sub
 	stloc 8
-// 0x01084c04: 0x1084c04: addu  s5, s5, s8
+// 0x01085228: 0x1085228: addu  s5, s5, s8
 	ldloc 9
 	ldloc 12
 	add
 	stloc 9
-// 0x01084c08: 0x1084c08: lw    a2, 1580(sp)
+// 0x0108522c: 0x108522c: lw    a2, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7068,13 +7068,13 @@ L_1084bc0:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01084c0c: 0x1084c0c: addu  a0, s5, zero
+// 0x01085230: 0x1085230: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01084c10: 0x1084c10: addu  a1, s4, zero
+// 0x01085234: 0x1085234: addu  a1, s4, zero
 	ldloc 8
 	stloc.2
-// 0x01084c14: 0x1084c14: sw    v1, 20(sp)
+// 0x01085238: 0x1085238: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7083,7 +7083,7 @@ L_1084bc0:
 	add
 	ldloc 6
 	stelem.i4
-// 0x01084c18: 0x1084c18: jal   0x1000f9c sw    v0, 16(sp)
+// 0x0108523c: 0x108523c: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7102,23 +7102,23 @@ L_1084bc0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1084c20:
-// 0x01084c20: 0x1084c20: lb    v0, 32(s0)
+L_1085244:
+// 0x01085244: 0x1085244: lb    v0, 32(s0)
 	ldloc 13
 	ldc.i4.s 32
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01084c24: 0x1084c24: sll   zero, zero, 0
-// 0x01084c28: 0x1084c28: beq   v0, zero, 0x1084c58 lui   a0, 0x10000
+// 0x01085248: 0x1085248: sll   zero, zero, 0
+// 0x0108524c: 0x108524c: beq   v0, zero, 0x108527c lui   a0, 0x10000
 	ldloc 5
 	ldc.i4 65536
 	stloc.1
-	brfalse L_1084c58
+	brfalse L_108527c
 // --- basic block ---
-// 0x01084c30: 0x1084c30: jal   0x101cd60 addiu a0, a0, -13684
+// 0x01085254: 0x1085254: jal   0x101cd70 addiu a0, a0, -13688
 	ldloc.1
-	ldc.i4 -13684
+	ldc.i4 -13688
 	add
 	stloc.1
 	ldloc.0
@@ -7126,36 +7126,36 @@ L_1084c20:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084c38: 0x1084c38: lui   a2, 0x20000
+// 0x0108525c: 0x108525c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x01084c3c: 0x1084c3c: addu  a3, v0, zero
+// 0x01085260: 0x1085260: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x01084c40: 0x1084c40: addiu a2, a2, -26952
+// 0x01085264: 0x1085264: addiu a2, a2, -26488
 	ldloc.3
-	ldc.i4 -26952
+	ldc.i4 -26488
 	add
 	stloc.3
-// 0x01084c44: 0x1084c44: addiu v0, s0, 32
+// 0x01085268: 0x1085268: addiu v0, s0, 32
 	ldloc 13
 	ldc.i4.s 32
 	add
 	stloc 5
-// 0x01084c48: 0x1084c48: addiu a0, sp, 116
+// 0x0108526c: 0x108526c: addiu a0, sp, 116
 	ldloc.0
 	ldc.i4.s 116
 	add
 	stloc.1
-// 0x01084c4c: 0x1084c4c: addiu a1, zero, 100
+// 0x01085270: 0x1085270: addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
-// 0x01084c50: 0x1084c50: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01085274: 0x1085274: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7174,43 +7174,43 @@ L_1084c20:
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1084c58:
-// 0x01084c58: 0x1084c58: sb    zero, 1268(sp)
+L_108527c:
+// 0x0108527c: 0x108527c: sb    zero, 1268(sp)
 	ldloc.0
 	ldc.i4 1268
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01084c5c: 0x1084c5c: lb    v0, 156(s0)
+// 0x01085280: 0x1085280: lb    v0, 156(s0)
 	ldloc 13
 	ldc.i4 156
 	add
 	call int32 [WazeWP7]CRunTime::memoryReadByte(int32)
 	stloc 5
-// 0x01084c60: 0x1084c60: sll   zero, zero, 0
-// 0x01084c64: 0x1084c64: beq   v0, zero, 0x1084c88 lui   a0, 0x20000
+// 0x01085284: 0x1085284: sll   zero, zero, 0
+// 0x01085288: 0x1085288: beq   v0, zero, 0x10852ac lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_1084c88
+	brfalse L_10852ac
 // --- basic block ---
-// 0x01084c6c: 0x1084c6c: lui   a2, 0x10000
+// 0x01085290: 0x1085290: lui   a2, 0x10000
 	ldc.i4 65536
 	stloc.3
-// 0x01084c70: 0x1084c70: addiu a2, a2, 19912
+// 0x01085294: 0x1085294: addiu a2, a2, 20332
 	ldloc.3
-	ldc.i4 19912
+	ldc.i4 20332
 	add
 	stloc.3
-// 0x01084c74: 0x1084c74: addiu a0, sp, 1268
+// 0x01085298: 0x1085298: addiu a0, sp, 1268
 	ldloc.0
 	ldc.i4 1268
 	add
 	stloc.1
-// 0x01084c78: 0x1084c78: addiu a1, zero, 300
+// 0x0108529c: 0x108529c: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x01084c7c: 0x1084c7c: jal   0x1000f9c addiu a3, s0, 156
+// 0x010852a0: 0x10852a0: jal   0x1000f9c addiu a3, s0, 156
 	ldloc 13
 	ldc.i4 156
 	add
@@ -7225,28 +7225,28 @@ L_1084c58:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084c84: 0x1084c84: lui   a0, 0x20000
+// 0x010852a8: 0x10852a8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-L_1084c88:
-// 0x01084c88: 0x1084c88: addiu a3, zero, -1
+L_10852ac:
+// 0x010852ac: 0x10852ac: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01084c8c: 0x1084c8c: addiu a0, a0, -21844
+// 0x010852b0: 0x10852b0: addiu a0, a0, -21380
 	ldloc.1
-	ldc.i4 -21844
+	ldc.i4 -21380
 	add
 	stloc.1
-// 0x01084c90: 0x1084c90: addu  a1, zero, zero
+// 0x010852b4: 0x10852b4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084c94: 0x1084c94: addu  a2, s2, zero
+// 0x010852b8: 0x10852b8: addu  a2, s2, zero
 	ldloc 10
 	stloc.3
-// 0x01084c98: 0x1084c98: addiu v0, zero, 2
+// 0x010852bc: 0x10852bc: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01084c9c: 0x1084c9c: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010852c0: 0x10852c0: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7260,36 +7260,36 @@ L_1084c88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ca4: 0x1084ca4: addu  a0, v0, zero
+// 0x010852c8: 0x10852c8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084ca8: 0x1084ca8: addu  a1, zero, zero
+// 0x010852cc: 0x10852cc: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084cac: 0x1084cac: addu  a2, zero, zero
+// 0x010852d0: 0x10852d0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084cb0: 0x1084cb0: jal   0x1098fe0 addu  s4, v0, zero
+// 0x010852d4: 0x10852d4: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01084cb8: 0x1084cb8: lw    a0, 0(s0)
+// 0x010852dc: 0x10852dc: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084cbc: 0x1084cbc: jal   0x107756c addu  s5, zero, zero
+// 0x010852e0: 0x10852e0: jal   0x1077b90 addu  s5, zero, zero
 	ldc.i4.s 0
 	stloc 9
 	ldloc.0
@@ -7297,23 +7297,23 @@ L_1084c88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Icon_107756c(int32,int32,int32,int32,int32)
+	call int32 Cibyl89::RTAlerts_Get_Icon_1077b90(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084cc4: 0x1084cc4: lui   a0, 0x20000
+// 0x010852e8: 0x10852e8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084cc8: 0x1084cc8: addiu a0, a0, -21828
+// 0x010852ec: 0x10852ec: addiu a0, a0, -21364
 	ldloc.1
-	ldc.i4 -21828
+	ldc.i4 -21364
 	add
 	stloc.1
-// 0x01084ccc: 0x1084ccc: addu  a1, v0, zero
+// 0x010852f0: 0x10852f0: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084cd0: 0x1084cd0: jal   0x109e13c addiu a2, zero, 1
+// 0x010852f4: 0x10852f4: jal   0x109e784 addiu a2, zero, 1
 	ldc.i4.1
 	stloc.3
 	ldloc.0
@@ -7321,31 +7321,31 @@ L_1084c88:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084cd8: 0x1084cd8: lw    a0, 0(s0)
+// 0x010852fc: 0x10852fc: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084cdc: 0x1084cdc: jal   0x1077724 addu  s8, v0, zero
+// 0x01085300: 0x1085300: jal   0x1077d48 addu  s8, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_Number_Of_AddOns_1077724(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_Number_Of_AddOns_1077d48(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ce4: 0x1084ce4: j	 0x1084d0c sw    v0, 1568(sp)
+// 0x01085308: 0x1085308: j	 0x1085330 sw    v0, 1568(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7354,17 +7354,17 @@ L_1084c88:
 	add
 	ldloc 5
 	stelem.i4
-	br L_1084d0c
+	br L_1085330
 // --- basic block ---
-L_1084cec:
-// 0x01084cec: 0x1084cec: lw    a0, 0(s0)
+L_1085310:
+// 0x01085310: 0x1085310: lw    a0, 0(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.1
-// 0x01084cf0: 0x1084cf0: jal   0x10777b8 addiu s5, s5, 1
+// 0x01085314: 0x1085314: jal   0x1077ddc addiu s5, s5, 1
 	ldloc 9
 	ldc.i4.1
 	add
@@ -7373,33 +7373,33 @@ L_1084cec:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl89::RTAlerts_Get_AddOn_10777b8(int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_Get_AddOn_1077ddc(int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084cf8: 0x1084cf8: addu  a1, v0, zero
+// 0x0108531c: 0x108531c: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084cfc: 0x1084cfc: beq   v0, zero, 0x1084d0c addu  a0, s8, zero
+// 0x01085320: 0x1085320: beq   v0, zero, 0x1085330 addu  a0, s8, zero
 	ldloc 5
 	ldloc 12
 	stloc.1
-	brfalse L_1084d0c
+	brfalse L_1085330
 // --- basic block ---
-// 0x01084d04: 0x1084d04: jal   0x109ddec sll   zero, zero, 0
+// 0x01085328: 0x1085328: jal   0x109e434 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_add_overlay_109ddec(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_add_overlay_109e434(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1084d0c:
-// 0x01084d0c: 0x1084d0c: lw    v1, 1568(sp)
+L_1085330:
+// 0x01085330: 0x1085330: lw    v1, 1568(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7408,46 +7408,46 @@ L_1084d0c:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01084d10: 0x1084d10: sll   zero, zero, 0
-// 0x01084d14: 0x1084d14: slt   v0, s5, v1
+// 0x01085334: 0x1085334: sll   zero, zero, 0
+// 0x01085338: 0x1085338: slt   v0, s5, v1
 	ldloc 9
 	ldloc 6
 	clt
 	stloc 5
-// 0x01084d18: 0x1084d18: bne   v0, zero, 0x1084cec addu  a1, s5, zero
+// 0x0108533c: 0x108533c: bne   v0, zero, 0x1085310 addu  a1, s5, zero
 	ldloc 5
 	ldloc 9
 	stloc.2
-	brtrue L_1084cec
+	brtrue L_1085310
 // --- basic block ---
-// 0x01084d20: 0x1084d20: addu  a1, s8, zero
+// 0x01085344: 0x1085344: addu  a1, s8, zero
 	ldloc 12
 	stloc.2
-// 0x01084d24: 0x1084d24: addu  a0, s4, zero
+// 0x01085348: 0x1085348: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x01084d28: 0x1084d28: jal   0x1098ec4 lui   s5, 0x20000
+// 0x0108534c: 0x108534c: jal   0x109950c lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084d30: 0x1084d30: addiu a2, zero, 14
+// 0x01085354: 0x1085354: addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
-// 0x01084d34: 0x1084d34: addiu a3, zero, 9
+// 0x01085358: 0x1085358: addiu a3, zero, 9
 	ldc.i4.s 9
 	stloc 4
-// 0x01084d38: 0x1084d38: addiu a0, s5, -21816
+// 0x0108535c: 0x108535c: addiu a0, s5, -21352
 	ldloc 9
-	ldc.i4 -21816
+	ldc.i4 -21352
 	add
 	stloc.1
-// 0x01084d3c: 0x1084d3c: jal   0x1098d10 addiu a1, sp, 316
+// 0x01085360: 0x1085360: jal   0x1099358 addiu a1, sp, 316
 	ldloc.0
 	ldc.i4 316
 	add
@@ -7457,38 +7457,38 @@ L_1084d0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084d44: 0x1084d44: addu  a1, v0, zero
+// 0x01085368: 0x1085368: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084d48: 0x1084d48: jal   0x1098ec4 addu  a0, s4, zero
+// 0x0108536c: 0x108536c: jal   0x109950c addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084d50: 0x1084d50: addiu a3, zero, 1
+// 0x01085374: 0x1085374: addiu a3, zero, 1
 	ldc.i4.1
 	stloc 4
-// 0x01084d54: 0x1084d54: addiu a0, s5, -21816
+// 0x01085378: 0x1085378: addiu a0, s5, -21352
 	ldloc 9
-	ldc.i4 -21816
+	ldc.i4 -21352
 	add
 	stloc.1
-// 0x01084d58: 0x1084d58: addiu a1, sp, 96
+// 0x0108537c: 0x108537c: addiu a1, sp, 96
 	ldloc.0
 	ldc.i4.s 96
 	add
 	stloc.2
-// 0x01084d5c: 0x1084d5c: jal   0x1098d10 addiu a2, zero, 12
+// 0x01085380: 0x1085380: jal   0x1099358 addiu a2, zero, 12
 	ldc.i4.s 12
 	stloc.3
 	ldloc.0
@@ -7496,26 +7496,26 @@ L_1084d0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084d64: 0x1084d64: lui   a1, 0x20000
+// 0x01085388: 0x1085388: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01084d68: 0x1084d68: addu  a0, v0, zero
+// 0x0108538c: 0x108538c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084d6c: 0x1084d6c: addiu a1, a1, -21800
+// 0x01085390: 0x1085390: addiu a1, a1, -21336
 	ldloc.2
-	ldc.i4 -21800
+	ldc.i4 -21336
 	add
 	stloc.2
-// 0x01084d70: 0x1084d70: addu  a2, zero, zero
+// 0x01085394: 0x1085394: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084d74: 0x1084d74: jal   0x1098fe0 sw    v0, 1580(sp)
+// 0x01085398: 0x1085398: jal   0x1099628 sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7527,9 +7527,9 @@ L_1084d0c:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01084d7c: 0x1084d7c: lw    v0, 1580(sp)
+// 0x010853a0: 0x10853a0: lw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7538,20 +7538,20 @@ L_1084d0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084d80: 0x1084d80: addu  a0, s4, zero
+// 0x010853a4: 0x10853a4: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x01084d84: 0x1084d84: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010853a8: 0x10853a8: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084d8c: 0x1084d8c: lw    v0, 140(s0)
+// 0x010853b0: 0x10853b0: lw    v0, 140(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -7560,31 +7560,31 @@ L_1084d0c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084d90: 0x1084d90: sll   zero, zero, 0
-// 0x01084d94: 0x1084d94: beq   v0, zero, 0x1084e04 addu  a3, s7, zero
+// 0x010853b4: 0x10853b4: sll   zero, zero, 0
+// 0x010853b8: 0x10853b8: beq   v0, zero, 0x1085428 addu  a3, s7, zero
 	ldloc 5
 	ldloc 16
 	stloc 4
-	brfalse L_1084e04
+	brfalse L_1085428
 // --- basic block ---
-// 0x01084d9c: 0x1084d9c: lui   a0, 0x20000
+// 0x010853c0: 0x10853c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084da0: 0x1084da0: addiu a0, a0, -21792
+// 0x010853c4: 0x10853c4: addiu a0, a0, -21328
 	ldloc.1
-	ldc.i4 -21792
+	ldc.i4 -21328
 	add
 	stloc.1
-// 0x01084da4: 0x1084da4: addu  a1, zero, zero
+// 0x010853c8: 0x10853c8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084da8: 0x1084da8: addu  a2, s7, zero
+// 0x010853cc: 0x10853cc: addu  a2, s7, zero
 	ldloc 16
 	stloc.3
-// 0x01084dac: 0x1084dac: addiu v0, zero, 2
+// 0x010853d0: 0x10853d0: addiu v0, zero, 2
 	ldc.i4.2
 	stloc 5
-// 0x01084db0: 0x1084db0: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010853d4: 0x10853d4: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7598,29 +7598,29 @@ L_1084d0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084db8: 0x1084db8: addu  a0, v0, zero
+// 0x010853dc: 0x10853dc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084dbc: 0x1084dbc: addu  a1, zero, zero
+// 0x010853e0: 0x10853e0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084dc0: 0x1084dc0: addu  a2, zero, zero
+// 0x010853e4: 0x10853e4: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084dc4: 0x1084dc4: jal   0x1098fe0 addu  s5, v0, zero
+// 0x010853e8: 0x10853e8: jal   0x1099628 addu  s5, v0, zero
 	ldloc 5
 	stloc 9
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01084dcc: 0x1084dcc: lw    a0, 140(s0)
+// 0x010853f0: 0x10853f0: lw    a0, 140(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -7629,29 +7629,29 @@ L_1084d0c:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01084dd0: 0x1084dd0: jal   0x103542c sll   zero, zero, 0
+// 0x010853f4: 0x10853f4: jal   0x103543c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_mood_to_string_103542c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_mood_to_string_103543c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084dd8: 0x1084dd8: lui   a0, 0x10000
+// 0x010853fc: 0x10853fc: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x01084ddc: 0x1084ddc: addiu a0, a0, -13720
+// 0x01085400: 0x1085400: addiu a0, a0, -13724
 	ldloc.1
-	ldc.i4 -13720
+	ldc.i4 -13724
 	add
 	stloc.1
-// 0x01084de0: 0x1084de0: addu  a1, v0, zero
+// 0x01085404: 0x1085404: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084de4: 0x1084de4: jal   0x109e13c addiu a2, zero, 17
+// 0x01085408: 0x1085408: jal   0x109e784 addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
 	ldloc.0
@@ -7659,76 +7659,76 @@ L_1084d0c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084dec: 0x1084dec: addu  a1, v0, zero
+// 0x01085410: 0x1085410: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084df0: 0x1084df0: jal   0x1098ec4 addu  a0, s5, zero
+// 0x01085414: 0x1085414: jal   0x109950c addu  a0, s5, zero
 	ldloc 9
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084df8: 0x1084df8: addu  a0, s4, zero
+// 0x0108541c: 0x108541c: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x01084dfc: 0x1084dfc: jal   0x1098ec4 addu  a1, s5, zero
+// 0x01085420: 0x1085420: jal   0x109950c addu  a1, s5, zero
 	ldloc 9
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1084e04:
-// 0x01084e04: 0x1084e04: addu  a1, s4, zero
+L_1085428:
+// 0x01085428: 0x1085428: addu  a1, s4, zero
 	ldloc 8
 	stloc.2
-// 0x01084e08: 0x1084e08: jal   0x1098ec4 addu  a0, s1, zero
+// 0x0108542c: 0x108542c: jal   0x109950c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084e10: 0x1084e10: addiu a2, s3, -10
+// 0x01085434: 0x1085434: addiu a2, s3, -10
 	ldloc 14
 	ldc.i4.s -10
 	add
 	stloc.3
-// 0x01084e14: 0x1084e14: lui   a0, 0x20000
+// 0x01085438: 0x1085438: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084e18: 0x1084e18: subu  a2, a2, s2
+// 0x0108543c: 0x108543c: subu  a2, a2, s2
 	ldloc.3
 	ldloc 10
 	sub
 	stloc.3
-// 0x01084e1c: 0x1084e1c: addiu a3, zero, -1
+// 0x01085440: 0x1085440: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01084e20: 0x1084e20: addiu a0, a0, -21844
+// 0x01085444: 0x1085444: addiu a0, a0, -21380
 	ldloc.1
-	ldc.i4 -21844
+	ldc.i4 -21380
 	add
 	stloc.1
-// 0x01084e24: 0x1084e24: addu  a1, zero, zero
+// 0x01085448: 0x1085448: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084e28: 0x1084e28: jal   0x1093a24 sw    zero, 16(sp)
+// 0x0108544c: 0x108544c: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7742,45 +7742,45 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084e30: 0x1084e30: addu  a0, v0, zero
+// 0x01085454: 0x1085454: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084e34: 0x1084e34: addu  a1, zero, zero
+// 0x01085458: 0x1085458: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084e38: 0x1084e38: addu  a2, zero, zero
+// 0x0108545c: 0x108545c: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084e3c: 0x1084e3c: jal   0x1098fe0 addu  s2, v0, zero
+// 0x01085460: 0x1085460: jal   0x1099628 addu  s2, v0, zero
 	ldloc 5
 	stloc 10
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01084e44: 0x1084e44: lui   a0, 0x20000
+// 0x01085468: 0x1085468: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084e48: 0x1084e48: addiu a3, zero, 8
+// 0x0108546c: 0x108546c: addiu a3, zero, 8
 	ldc.i4.8
 	stloc 4
-// 0x01084e4c: 0x1084e4c: addiu a0, a0, -21780
+// 0x01085470: 0x1085470: addiu a0, a0, -21316
 	ldloc.1
-	ldc.i4 -21780
+	ldc.i4 -21316
 	add
 	stloc.1
-// 0x01084e50: 0x1084e50: addiu a1, sp, 416
+// 0x01085474: 0x1085474: addiu a1, sp, 416
 	ldloc.0
 	ldc.i4 416
 	add
 	stloc.2
-// 0x01084e54: 0x1084e54: jal   0x1098d10 addiu a2, zero, 14
+// 0x01085478: 0x1085478: jal   0x1099358 addiu a2, zero, 14
 	ldc.i4.s 14
 	stloc.3
 	ldloc.0
@@ -7788,26 +7788,26 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084e5c: 0x1084e5c: lui   a1, 0x20000
+// 0x01085480: 0x1085480: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01084e60: 0x1084e60: addu  a0, v0, zero
+// 0x01085484: 0x1085484: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01084e64: 0x1084e64: addu  a2, zero, zero
+// 0x01085488: 0x1085488: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084e68: 0x1084e68: addiu a1, a1, -21764
+// 0x0108548c: 0x108548c: addiu a1, a1, -21300
 	ldloc.2
-	ldc.i4 -21764
+	ldc.i4 -21300
 	add
 	stloc.2
-// 0x01084e6c: 0x1084e6c: jal   0x1098fe0 sw    v0, 1580(sp)
+// 0x01085490: 0x1085490: jal   0x1099628 sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7819,9 +7819,9 @@ L_1084e04:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01084e74: 0x1084e74: lw    v0, 1580(sp)
+// 0x01085498: 0x1085498: lw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -7830,40 +7830,40 @@ L_1084e04:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084e78: 0x1084e78: addu  a0, s2, zero
+// 0x0108549c: 0x108549c: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01084e7c: 0x1084e7c: jal   0x1098ec4 addu  a1, v0, zero
+// 0x010854a0: 0x10854a0: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084e84: 0x1084e84: lw    a3, 0(s0)
+// 0x010854a8: 0x10854a8: lw    a3, 0(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 4
-// 0x01084e88: 0x1084e88: lui   a2, 0x20000
-	ldc.i4 131072
+// 0x010854ac: 0x10854ac: lui   a2, 0x10000
+	ldc.i4 65536
 	stloc.3
-// 0x01084e8c: 0x1084e8c: addiu a2, a2, -13884
+// 0x010854b0: 0x10854b0: addiu a2, a2, 19088
 	ldloc.3
-	ldc.i4 -13884
+	ldc.i4 19088
 	add
 	stloc.3
-// 0x01084e90: 0x1084e90: addiu a0, sp, 216
+// 0x010854b4: 0x10854b4: addiu a0, sp, 216
 	ldloc.0
 	ldc.i4 216
 	add
 	stloc.1
-// 0x01084e94: 0x1084e94: jal   0x1000f9c addiu a1, zero, 100
+// 0x010854b8: 0x10854b8: jal   0x1000f9c addiu a1, zero, 100
 	ldc.i4.s 100
 	stloc.2
 	ldloc.0
@@ -7876,23 +7876,23 @@ L_1084e04:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084e9c: 0x1084e9c: lui   a0, 0x20000
+// 0x010854c0: 0x10854c0: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084ea0: 0x1084ea0: addiu a2, zero, -1
+// 0x010854c4: 0x10854c4: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01084ea4: 0x1084ea4: ori   a3, zero, 32780
+// 0x010854c8: 0x10854c8: ori   a3, zero, 32780
 	ldc.i4.s 0
 	ldc.i4 32780
 	or
 	stloc 4
-// 0x01084ea8: 0x1084ea8: addiu a0, a0, -21756
+// 0x010854cc: 0x10854cc: addiu a0, a0, -21292
 	ldloc.1
-	ldc.i4 -21756
+	ldc.i4 -21292
 	add
 	stloc.1
-// 0x01084eac: 0x1084eac: jal   0x1098d10 addiu a1, sp, 668
+// 0x010854d0: 0x10854d0: jal   0x1099358 addiu a1, sp, 668
 	ldloc.0
 	ldc.i4 668
 	add
@@ -7902,41 +7902,41 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084eb4: 0x1084eb4: addu  a1, v0, zero
+// 0x010854d8: 0x10854d8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084eb8: 0x1084eb8: addu  a0, s2, zero
+// 0x010854dc: 0x10854dc: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01084ebc: 0x1084ebc: jal   0x1098ec4 lui   s3, 0x20000
+// 0x010854e0: 0x10854e0: jal   0x109950c lui   s3, 0x20000
 	ldc.i4 131072
 	stloc 14
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ec4: 0x1084ec4: addiu a2, zero, -1
+// 0x010854e8: 0x10854e8: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01084ec8: 0x1084ec8: ori   a3, zero, 32768
+// 0x010854ec: 0x10854ec: ori   a3, zero, 32768
 	ldc.i4.s 0
 	ldc.i4 32768
 	or
 	stloc 4
-// 0x01084ecc: 0x1084ecc: addiu a0, s3, -21744
+// 0x010854f0: 0x10854f0: addiu a0, s3, -21280
 	ldloc 14
-	ldc.i4 -21744
+	ldc.i4 -21280
 	add
 	stloc.1
-// 0x01084ed0: 0x1084ed0: jal   0x1098d10 addiu a1, sp, 116
+// 0x010854f4: 0x10854f4: jal   0x1099358 addiu a1, sp, 116
 	ldloc.0
 	ldc.i4.s 116
 	add
@@ -7946,28 +7946,28 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ed8: 0x1084ed8: addu  a1, v0, zero
+// 0x010854fc: 0x10854fc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084edc: 0x1084edc: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01085500: 0x1085500: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ee4: 0x1084ee4: addu  a0, s2, zero
+// 0x01085508: 0x1085508: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01084ee8: 0x1084ee8: jal   0x1078448 addu  a1, s0, zero
+// 0x0108550c: 0x108550c: jal   0x1078a6c addu  a1, s0, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -7975,32 +7975,32 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_update_stars_1078448(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_update_stars_1078a6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ef0: 0x1084ef0: lui   a0, 0x20000
+// 0x01085514: 0x1085514: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084ef4: 0x1084ef4: addu  a2, zero, zero
+// 0x01085518: 0x1085518: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01084ef8: 0x1084ef8: addiu a3, zero, 10
+// 0x0108551c: 0x108551c: addiu a3, zero, 10
 	ldc.i4.s 10
 	stloc 4
-// 0x01084efc: 0x1084efc: addiu a0, a0, -27068
+// 0x01085520: 0x1085520: addiu a0, a0, -26604
 	ldloc.1
-	ldc.i4 -27068
+	ldc.i4 -26604
 	add
 	stloc.1
-// 0x01084f00: 0x1084f00: addu  a1, zero, zero
+// 0x01085524: 0x1085524: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01084f04: 0x1084f04: addiu v0, zero, 8
+// 0x01085528: 0x1085528: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01084f08: 0x1084f08: jal   0x1093a24 sw    v0, 16(sp)
+// 0x0108552c: 0x108552c: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8014,28 +8014,28 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f10: 0x1084f10: addu  a1, v0, zero
+// 0x01085534: 0x1085534: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084f14: 0x1084f14: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01085538: 0x1085538: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f1c: 0x1084f1c: addu  a0, s2, zero
+// 0x01085540: 0x1085540: addu  a0, s2, zero
 	ldloc 10
 	stloc.1
-// 0x01084f20: 0x1084f20: jal   0x1077e58 addu  a1, s0, zero
+// 0x01085544: 0x1085544: jal   0x107847c addu  a1, s0, zero
 	ldloc 13
 	stloc.2
 	ldloc.0
@@ -8043,23 +8043,23 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_show_space_before_desc_1077e58(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_show_space_before_desc_107847c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f28: 0x1084f28: addiu a2, zero, -1
+// 0x0108554c: 0x108554c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01084f2c: 0x1084f2c: addu  a3, zero, zero
+// 0x01085550: 0x1085550: addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-// 0x01084f30: 0x1084f30: addiu a0, s3, -21744
+// 0x01085554: 0x1085554: addiu a0, s3, -21280
 	ldloc 14
-	ldc.i4 -21744
+	ldc.i4 -21280
 	add
 	stloc.1
-// 0x01084f34: 0x1084f34: jal   0x1098d10 addiu a1, sp, 1268
+// 0x01085558: 0x1085558: jal   0x1099358 addiu a1, sp, 1268
 	ldloc.0
 	ldc.i4 1268
 	add
@@ -8069,66 +8069,66 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f3c: 0x1084f3c: addu  a1, v0, zero
+// 0x01085560: 0x1085560: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01084f40: 0x1084f40: jal   0x1098ec4 addu  a0, s2, zero
+// 0x01085564: 0x1085564: jal   0x109950c addu  a0, s2, zero
 	ldloc 10
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f48: 0x1084f48: addu  a1, s2, zero
+// 0x0108556c: 0x108556c: addu  a1, s2, zero
 	ldloc 10
 	stloc.2
-// 0x01084f4c: 0x1084f4c: jal   0x1098ec4 addu  a0, s1, zero
+// 0x01085570: 0x1085570: jal   0x109950c addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f54: 0x1084f54: addu  a1, s1, zero
+// 0x01085578: 0x1085578: addu  a1, s1, zero
 	ldloc 11
 	stloc.2
-// 0x01084f58: 0x1084f58: jal   0x1098ec4 addu  a0, s6, zero
+// 0x0108557c: 0x108557c: jal   0x109950c addu  a0, s6, zero
 	ldloc 15
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f60: 0x1084f60: jal   0x1099190 addu  a0, s1, zero
+// 0x01085584: 0x1085584: jal   0x10997d8 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
-	call int32 Cibyl114::ssd_widget_set_pointer_force_click_1099190(int32)
+	call int32 Cibyl114::ssd_widget_set_pointer_force_click_10997d8(int32)
 	stloc 5
 // --- basic block ---
-// 0x01084f68: 0x1084f68: lui   v0, 0x1080000
+// 0x0108558c: 0x108558c: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x01084f6c: 0x1084f6c: addiu v0, v0, 23116
+// 0x01085590: 0x1085590: addiu v0, v0, 24688
 	ldloc 5
-	ldc.i4 23116
+	ldc.i4 24688
 	add
 	stloc 5
-// 0x01084f70: 0x1084f70: sw    v0, 112(s1)
+// 0x01085594: 0x1085594: sw    v0, 112(s1)
 	ldloc 7
 	ldloc 11
 	ldc.i4.2
@@ -8137,7 +8137,7 @@ L_1084e04:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01084f74: 0x1084f74: lw    s2, 1300(s0)
+// 0x01085598: 0x1085598: lw    s2, 1300(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -8146,7 +8146,7 @@ L_1084e04:
 	add
 	ldelem.i4
 	stloc 10
-// 0x01084f78: 0x1084f78: jal   0x106ac04 lui   s5, 0x20000
+// 0x0108559c: 0x108559c: jal   0x106b228 lui   s5, 0x20000
 	ldc.i4 131072
 	stloc 9
 	ldloc.0
@@ -8154,20 +8154,20 @@ L_1084e04:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl79::RealTime_GetUserName_106ac04(int32,int32,int32,int32,int32)
+	call int32 Cibyl79::RealTime_GetUserName_106b228(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084f80: 0x1084f80: addiu a0, zero, 1
+// 0x010855a4: 0x10855a4: addiu a0, zero, 1
 	ldc.i4.1
 	stloc.1
-// 0x01084f84: 0x1084f84: addiu s5, s5, -21660
+// 0x010855a8: 0x10855a8: addiu s5, s5, -21196
 	ldloc 9
-	ldc.i4 -21660
+	ldc.i4 -21196
 	add
 	stloc 9
-// 0x01084f88: 0x1084f88: j	 0x1085668 sw    a0, 1568(sp)
+// 0x010855ac: 0x10855ac: j	 0x1085c8c sw    a0, 1568(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8176,30 +8176,30 @@ L_1084e04:
 	add
 	ldloc.1
 	stelem.i4
-	br L_1085668
+	br L_1085c8c
 // --- basic block ---
-L_1084f90:
-// 0x01084f90: 0x1084f90: jal   0x101fa28 addiu s4, zero, 25
+L_10855b4:
+// 0x010855b4: 0x10855b4: jal   0x101fa38 addiu s4, zero, 25
 	ldc.i4.s 25
 	stloc 8
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01084f98: 0x1084f98: beq   v0, zero, 0x1084fa4 sll   zero, zero, 0
+// 0x010855bc: 0x10855bc: beq   v0, zero, 0x10855c8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1084fa4
+	brfalse L_10855c8
 // --- basic block ---
-// 0x01084fa0: 0x1084fa0: addiu s4, zero, 40
+// 0x010855c4: 0x10855c4: addiu s4, zero, 40
 	ldc.i4.s 40
 	stloc 8
-L_1084fa4:
-// 0x01084fa4: 0x1084fa4: sb    zero, 968(sp)
+L_10855c8:
+// 0x010855c8: 0x10855c8: sb    zero, 968(sp)
 	ldloc.0
 	ldc.i4 968
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x01084fa8: 0x1084fa8: lw    v0, 528(s2)
+// 0x010855cc: 0x10855cc: lw    v0, 528(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8208,30 +8208,30 @@ L_1084fa4:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01084fac: 0x1084fac: sll   zero, zero, 0
-// 0x01084fb0: 0x1084fb0: beq   v0, zero, 0x1084fd8 lui   a2, 0x20000
+// 0x010855d0: 0x10855d0: sll   zero, zero, 0
+// 0x010855d4: 0x10855d4: beq   v0, zero, 0x10855fc lui   a2, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.3
-	brfalse L_1084fd8
+	brfalse L_10855fc
 // --- basic block ---
-// 0x01084fb8: 0x1084fb8: lui   a0, 0x20000
+// 0x010855dc: 0x10855dc: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01084fbc: 0x1084fbc: lui   a1, 0x20000
+// 0x010855e0: 0x10855e0: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01084fc0: 0x1084fc0: addiu a0, a0, -21728
+// 0x010855e4: 0x10855e4: addiu a0, a0, -21264
 	ldloc.1
-	ldc.i4 -21728
+	ldc.i4 -21264
 	add
 	stloc.1
-// 0x01084fc4: 0x1084fc4: addiu a1, a1, -21716
+// 0x010855e8: 0x10855e8: addiu a1, a1, -21252
 	ldloc.2
-	ldc.i4 -21716
+	ldc.i4 -21252
 	add
 	stloc.2
-// 0x01084fc8: 0x1084fc8: jal   0x109e13c addiu a2, zero, 8
+// 0x010855ec: 0x10855ec: jal   0x109e784 addiu a2, zero, 8
 	ldc.i4.8
 	stloc.3
 	ldloc.0
@@ -8239,26 +8239,26 @@ L_1084fa4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084fd0: 0x1084fd0: j	 0x108504c addu  s3, v0, zero
+// 0x010855f4: 0x10855f4: j	 0x1085670 addu  s3, v0, zero
 	ldloc 5
 	stloc 14
-	br L_108504c
+	br L_1085670
 // --- basic block ---
-L_1084fd8:
-// 0x01084fd8: 0x1084fd8: addiu a2, a2, -21696
+L_10855fc:
+// 0x010855fc: 0x10855fc: addiu a2, a2, -21232
 	ldloc.3
-	ldc.i4 -21696
+	ldc.i4 -21232
 	add
 	stloc.3
-// 0x01084fdc: 0x1084fdc: addu  a0, zero, zero
+// 0x01085600: 0x1085600: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01084fe0: 0x1084fe0: jal   0x10a1918 addiu a1, zero, 1
+// 0x01085604: 0x1085604: jal   0x10a1f60 addiu a1, zero, 1
 	ldc.i4.1
 	stloc.2
 	ldloc.0
@@ -8266,45 +8266,45 @@ L_1084fd8:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl121::roadmap_res_get_10a1918(int32,int32,int32,int32,int32)
+	call int32 Cibyl121::roadmap_res_get_10a1f60(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084fe8: 0x1084fe8: beq   v0, zero, 0x1084ffc addu  a2, zero, zero
+// 0x0108560c: 0x108560c: beq   v0, zero, 0x1085620 addu  a2, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.3
-	brfalse L_1084ffc
+	brfalse L_1085620
 // --- basic block ---
-// 0x01084ff0: 0x1084ff0: jal   0x104dffc addu  a0, v0, zero
+// 0x01085614: 0x1085614: jal   0x104e00c addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.1
-	call int32 Cibyl57::roadmap_canvas_image_width_104dffc(int32)
+	call int32 Cibyl57::roadmap_canvas_image_width_104e00c(int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01084ff8: 0x1084ff8: addu  a2, v0, zero
+// 0x0108561c: 0x108561c: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-L_1084ffc:
-// 0x01084ffc: 0x1084ffc: lui   a0, 0x20000
+L_1085620:
+// 0x01085620: 0x1085620: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01085000: 0x1085000: addiu a3, zero, -1
+// 0x01085624: 0x1085624: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01085004: 0x1085004: addu  a1, zero, zero
+// 0x01085628: 0x1085628: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085008: 0x1085008: addiu a0, a0, -21672
+// 0x0108562c: 0x108562c: addiu a0, a0, -21208
 	ldloc.1
-	ldc.i4 -21672
+	ldc.i4 -21208
 	add
 	stloc.1
-// 0x0108500c: 0x108500c: jal   0x1093a24 sw    zero, 16(sp)
+// 0x01085630: 0x1085630: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8318,57 +8318,57 @@ L_1084ffc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085014: 0x1085014: addu  s3, v0, zero
+// 0x01085638: 0x1085638: addu  s3, v0, zero
 	ldloc 5
 	stloc 14
-// 0x01085018: 0x1085018: addu  a0, v0, zero
+// 0x0108563c: 0x108563c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108501c: 0x108501c: addu  a1, zero, zero
+// 0x01085640: 0x1085640: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085020: 0x1085020: jal   0x1098fe0 addu  a2, zero, zero
+// 0x01085644: 0x1085644: jal   0x1099628 addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01085028: 0x1085028: addu  a0, s3, zero
+// 0x0108564c: 0x108564c: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x0108502c: 0x108502c: jal   0x1098fd8 addiu a1, s2, 8
+// 0x01085650: 0x1085650: jal   0x1099620 addiu a1, s2, 8
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_context_1098fd8(int32,int32)
+	call void Cibyl114::ssd_widget_set_context_1099620(int32,int32)
 // --- basic block ---
-// 0x01085034: 0x1085034: lui   v0, 0x1080000
+// 0x01085658: 0x1085658: lui   v0, 0x1080000
 	ldc.i4 17301504
 	stloc 5
-// 0x01085038: 0x1085038: lui   v1, 0x1080000
+// 0x0108565c: 0x108565c: lui   v1, 0x1080000
 	ldc.i4 17301504
 	stloc 6
-// 0x0108503c: 0x108503c: addiu v0, v0, 22716
+// 0x01085660: 0x1085660: addiu v0, v0, 24288
 	ldloc 5
-	ldc.i4 22716
+	ldc.i4 24288
 	add
 	stloc 5
-// 0x01085040: 0x1085040: addiu v1, v1, 22204
+// 0x01085664: 0x1085664: addiu v1, v1, 23776
 	ldloc 6
-	ldc.i4 22204
+	ldc.i4 23776
 	add
 	stloc 6
-// 0x01085044: 0x1085044: sw    v0, 184(s3)
+// 0x01085668: 0x1085668: sw    v0, 184(s3)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -8377,7 +8377,7 @@ L_1084ffc:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085048: 0x1085048: sw    v1, 112(s3)
+// 0x0108566c: 0x108566c: sw    v1, 112(s3)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -8386,8 +8386,8 @@ L_1084ffc:
 	add
 	ldloc 6
 	stelem.i4
-L_108504c:
-// 0x0108504c: 0x108504c: lw    v0, 528(s2)
+L_1085670:
+// 0x01085670: 0x1085670: lw    v0, 528(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8396,80 +8396,80 @@ L_108504c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01085050: 0x1085050: sll   zero, zero, 0
-// 0x01085054: 0x1085054: beq   v0, zero, 0x1085094 sll   zero, zero, 0
+// 0x01085674: 0x1085674: sll   zero, zero, 0
+// 0x01085678: 0x1085678: beq   v0, zero, 0x10856b8 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1085094
+	brfalse L_10856b8
 // --- basic block ---
-// 0x0108505c: 0x108505c: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01085680: 0x1085680: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01085064: 0x1085064: beq   v0, zero, 0x1085080 sll   zero, zero, 0
+// 0x01085688: 0x1085688: beq   v0, zero, 0x10856a4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1085080
+	brfalse L_10856a4
 // --- basic block ---
-// 0x0108506c: 0x108506c: addu  a0, s5, zero
+// 0x01085690: 0x1085690: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01085070: 0x1085070: addu  a1, zero, zero
+// 0x01085694: 0x1085694: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085074: 0x1085074: addiu a2, zero, 280
+// 0x01085698: 0x1085698: addiu a2, zero, 280
 	ldc.i4 280
 	stloc.3
-// 0x01085078: 0x1085078: j	 0x10850bc addiu a3, zero, 100
+// 0x0108569c: 0x108569c: j	 0x10856e0 addiu a3, zero, 100
 	ldc.i4.s 100
 	stloc 4
-	br L_10850bc
+	br L_10856e0
 // --- basic block ---
-L_1085080:
-// 0x01085080: 0x1085080: addu  a0, s5, zero
+L_10856a4:
+// 0x010856a4: 0x10856a4: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01085084: 0x1085084: addu  a1, zero, zero
+// 0x010856a8: 0x10856a8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085088: 0x1085088: addiu a2, zero, 200
+// 0x010856ac: 0x10856ac: addiu a2, zero, 200
 	ldc.i4 200
 	stloc.3
-// 0x0108508c: 0x108508c: j	 0x10850bc addiu a3, zero, 80
+// 0x010856b0: 0x10856b0: j	 0x10856e0 addiu a3, zero, 80
 	ldc.i4.s 80
 	stloc 4
-	br L_10850bc
+	br L_10856e0
 // --- basic block ---
-L_1085094:
-// 0x01085094: 0x1085094: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+L_10856b8:
+// 0x010856b8: 0x10856b8: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0108509c: 0x108509c: beq   v0, zero, 0x10850b0 addu  a1, zero, zero
+// 0x010856c0: 0x10856c0: beq   v0, zero, 0x10856d4 addu  a1, zero, zero
 	ldloc 5
 	ldc.i4.s 0
 	stloc.2
-	brfalse L_10850b0
+	brfalse L_10856d4
 // --- basic block ---
-// 0x010850a4: 0x10850a4: addu  a0, s5, zero
+// 0x010856c8: 0x10856c8: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010850a8: 0x10850a8: j	 0x10850b8 addiu a2, zero, 320
+// 0x010856cc: 0x10856cc: j	 0x10856dc addiu a2, zero, 320
 	ldc.i4 320
 	stloc.3
-	br L_10850b8
+	br L_10856dc
 // --- basic block ---
-L_10850b0:
-// 0x010850b0: 0x10850b0: addu  a0, s5, zero
+L_10856d4:
+// 0x010856d4: 0x10856d4: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x010850b4: 0x10850b4: addiu a2, zero, 205
+// 0x010856d8: 0x10856d8: addiu a2, zero, 205
 	ldc.i4 205
 	stloc.3
-L_10850b8:
-// 0x010850b8: 0x10850b8: addiu a3, zero, -1
+L_10856dc:
+// 0x010856dc: 0x10856dc: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-L_10850bc:
-// 0x010850bc: 0x10850bc: jal   0x1093a24 sw    zero, 16(sp)
+L_10856e0:
+// 0x010856e0: 0x10856e0: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8483,29 +8483,29 @@ L_10850bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010850c4: 0x10850c4: addu  a0, v0, zero
+// 0x010856e8: 0x10856e8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010850c8: 0x10850c8: addu  a1, zero, zero
+// 0x010856ec: 0x10856ec: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010850cc: 0x10850cc: addu  a2, zero, zero
+// 0x010856f0: 0x10856f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010850d0: 0x10850d0: jal   0x1098fe0 addu  s1, v0, zero
+// 0x010856f4: 0x10856f4: jal   0x1099628 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010850d8: 0x10850d8: jal   0x109a424 addu  a0, zero, zero
+// 0x010856fc: 0x10856fc: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -8513,12 +8513,12 @@ L_10850bc:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010850e0: 0x10850e0: lw    v1, 528(s2)
+// 0x01085704: 0x1085704: lw    v1, 528(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8527,73 +8527,73 @@ L_10850bc:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010850e4: 0x10850e4: beq   v0, zero, 0x1085114 sll   zero, zero, 0
+// 0x01085708: 0x1085708: beq   v0, zero, 0x1085738 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1085114
+	brfalse L_1085738
 // --- basic block ---
-// 0x010850ec: 0x10850ec: beq   v1, zero, 0x108510c addu  a0, s1, zero
+// 0x01085710: 0x1085710: beq   v1, zero, 0x1085730 addu  a0, s1, zero
 	ldloc 6
 	ldloc 11
 	stloc.1
-	brfalse L_108510c
+	brfalse L_1085730
 // --- basic block ---
-// 0x010850f4: 0x10850f4: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01085718: 0x1085718: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x010850fc: 0x10850fc: beq   v0, zero, 0x108516c addiu a1, zero, 35
+// 0x01085720: 0x1085720: beq   v0, zero, 0x1085790 addiu a1, zero, 35
 	ldloc 5
 	ldc.i4.s 35
 	stloc.2
-	brfalse L_108516c
+	brfalse L_1085790
 // --- basic block ---
-// 0x01085104: 0x1085104: j	 0x1085134 addu  a0, s1, zero
+// 0x01085728: 0x1085728: j	 0x1085758 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-	br L_1085134
+	br L_1085758
 // --- basic block ---
-L_108510c:
-// 0x0108510c: 0x108510c: j	 0x1085174 addiu a1, zero, 14
+L_1085730:
+// 0x01085730: 0x1085730: j	 0x1085798 addiu a1, zero, 14
 	ldc.i4.s 14
 	stloc.2
-	br L_1085174
+	br L_1085798
 // --- basic block ---
-L_1085114:
-// 0x01085114: 0x1085114: beq   v1, zero, 0x1085148 sll   zero, zero, 0
+L_1085738:
+// 0x01085738: 0x1085738: beq   v1, zero, 0x108576c sll   zero, zero, 0
 	ldloc 6
-	brfalse L_1085148
+	brfalse L_108576c
 // --- basic block ---
-// 0x0108511c: 0x108511c: jal   0x101fa28 sll   zero, zero, 0
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+// 0x01085740: 0x1085740: jal   0x101fa38 sll   zero, zero, 0
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01085124: 0x1085124: beq   v0, zero, 0x108513c sll   zero, zero, 0
+// 0x01085748: 0x1085748: beq   v0, zero, 0x1085760 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_108513c
+	brfalse L_1085760
 // --- basic block ---
-// 0x0108512c: 0x108512c: addu  a0, s1, zero
+// 0x01085750: 0x1085750: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01085130: 0x1085130: addiu a1, zero, 10
+// 0x01085754: 0x1085754: addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-L_1085134:
-// 0x01085134: 0x1085134: j	 0x1085178 addiu a2, zero, 5
+L_1085758:
+// 0x01085758: 0x1085758: j	 0x108579c addiu a2, zero, 5
 	ldc.i4.5
 	stloc.3
-	br L_1085178
+	br L_108579c
 // --- basic block ---
-L_108513c:
-// 0x0108513c: 0x108513c: addu  a0, s1, zero
+L_1085760:
+// 0x01085760: 0x1085760: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01085140: 0x1085140: j	 0x1085174 addiu a1, zero, 10
+// 0x01085764: 0x1085764: j	 0x1085798 addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-	br L_1085174
+	br L_1085798
 // --- basic block ---
-L_1085148:
-// 0x01085148: 0x1085148: lw    v0, 48(s3)
+L_108576c:
+// 0x0108576c: 0x108576c: lw    v0, 48(s3)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -8602,13 +8602,13 @@ L_1085148:
 	add
 	ldelem.i4
 	stloc 5
-// 0x0108514c: 0x108514c: sll   zero, zero, 0
-// 0x01085150: 0x1085150: ori   v0, v0, 2
+// 0x01085770: 0x1085770: sll   zero, zero, 0
+// 0x01085774: 0x1085774: ori   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	or
 	stloc 5
-// 0x01085154: 0x1085154: jal   0x101fa28 sw    v0, 48(s3)
+// 0x01085778: 0x1085778: jal   0x101fa38 sw    v0, 48(s3)
 	ldloc 7
 	ldloc 14
 	ldc.i4.2
@@ -8617,59 +8617,59 @@ L_1085148:
 	add
 	ldloc 5
 	stelem.i4
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x0108515c: 0x108515c: beq   v0, zero, 0x108516c addiu a1, zero, 35
+// 0x01085780: 0x1085780: beq   v0, zero, 0x1085790 addiu a1, zero, 35
 	ldloc 5
 	ldc.i4.s 35
 	stloc.2
-	brfalse L_108516c
+	brfalse L_1085790
 // --- basic block ---
-// 0x01085164: 0x1085164: j	 0x1085174 addu  a0, s1, zero
+// 0x01085788: 0x1085788: j	 0x1085798 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-	br L_1085174
+	br L_1085798
 // --- basic block ---
-L_108516c:
-// 0x0108516c: 0x108516c: addu  a0, s1, zero
+L_1085790:
+// 0x01085790: 0x1085790: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01085170: 0x1085170: addiu a1, zero, 25
+// 0x01085794: 0x1085794: addiu a1, zero, 25
 	ldc.i4.s 25
 	stloc.2
-L_1085174:
-// 0x01085174: 0x1085174: addiu a2, zero, 2
+L_1085798:
+// 0x01085798: 0x1085798: addiu a2, zero, 2
 	ldc.i4.2
 	stloc.3
-L_1085178:
-// 0x01085178: 0x1085178: jal   0x1098f84 sll   zero, zero, 0
+L_108579c:
+// 0x0108579c: 0x108579c: jal   0x10995cc sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085180: 0x1085180: addu  a3, s4, zero
+// 0x010857a4: 0x10857a4: addu  a3, s4, zero
 	ldloc 8
 	stloc 4
-// 0x01085184: 0x1085184: addu  a0, s5, zero
+// 0x010857a8: 0x10857a8: addu  a0, s5, zero
 	ldloc 9
 	stloc.1
-// 0x01085188: 0x1085188: addu  a1, zero, zero
+// 0x010857ac: 0x10857ac: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108518c: 0x108518c: addiu a2, zero, -1
+// 0x010857b0: 0x10857b0: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01085190: 0x1085190: addiu v0, zero, 8
+// 0x010857b4: 0x10857b4: addiu v0, zero, 8
 	ldc.i4.8
 	stloc 5
-// 0x01085194: 0x1085194: jal   0x1093a24 sw    v0, 16(sp)
+// 0x010857b8: 0x10857b8: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8683,34 +8683,34 @@ L_1085178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108519c: 0x108519c: addiu s4, sp, 968
+// 0x010857c0: 0x10857c0: addiu s4, sp, 968
 	ldloc.0
 	ldc.i4 968
 	add
 	stloc 8
-// 0x010851a0: 0x10851a0: addu  a1, zero, zero
+// 0x010857c4: 0x10857c4: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010851a4: 0x10851a4: addu  a2, zero, zero
+// 0x010857c8: 0x10857c8: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010851a8: 0x10851a8: addu  a0, v0, zero
+// 0x010857cc: 0x10857cc: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010851ac: 0x10851ac: jal   0x1098fe0 addu  s8, v0, zero
+// 0x010857d0: 0x10857d0: jal   0x1099628 addu  s8, v0, zero
 	ldloc 5
 	stloc 12
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010851b4: 0x10851b4: jal   0x1001b48 addu  a0, s4, zero
+// 0x010857d8: 0x10857d8: jal   0x1001b48 addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
@@ -8719,15 +8719,15 @@ L_1085178:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010851bc: 0x10851bc: lui   a0, 0x10000
+// 0x010857e0: 0x10857e0: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010851c0: 0x10851c0: addiu a0, a0, -13684
+// 0x010857e4: 0x10857e4: addiu a0, a0, -13688
 	ldloc.1
-	ldc.i4 -13684
+	ldc.i4 -13688
 	add
 	stloc.1
-// 0x010851c4: 0x10851c4: jal   0x101cd60 sw    v0, 1580(sp)
+// 0x010857e8: 0x10857e8: jal   0x101cd70 sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8741,12 +8741,12 @@ L_1085178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010851cc: 0x10851cc: lw    v1, 1580(sp)
+// 0x010857f0: 0x10857f0: lw    v1, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8755,36 +8755,36 @@ L_1085178:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010851d0: 0x10851d0: addiu a0, zero, 300
+// 0x010857f4: 0x10857f4: addiu a0, zero, 300
 	ldc.i4 300
 	stloc.1
-// 0x010851d4: 0x10851d4: lui   a2, 0x20000
+// 0x010857f8: 0x10857f8: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x010851d8: 0x10851d8: subu  a1, a0, v1
+// 0x010857fc: 0x10857fc: subu  a1, a0, v1
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.2
-// 0x010851dc: 0x10851dc: addu  a3, v0, zero
+// 0x01085800: 0x1085800: addu  a3, v0, zero
 	ldloc 5
 	stloc 4
-// 0x010851e0: 0x10851e0: addu  a0, s4, v1
+// 0x01085804: 0x1085804: addu  a0, s4, v1
 	ldloc 8
 	ldloc 6
 	add
 	stloc.1
-// 0x010851e4: 0x10851e4: addiu v0, s2, 24
+// 0x01085808: 0x1085808: addiu v0, s2, 24
 	ldloc 10
 	ldc.i4.s 24
 	add
 	stloc 5
-// 0x010851e8: 0x10851e8: addiu a2, a2, -26952
+// 0x0108580c: 0x108580c: addiu a2, a2, -26488
 	ldloc.3
-	ldc.i4 -26952
+	ldc.i4 -26488
 	add
 	stloc.3
-// 0x010851ec: 0x10851ec: jal   0x1000f9c sw    v0, 16(sp)
+// 0x01085810: 0x1085810: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8803,21 +8803,21 @@ L_1085178:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010851f4: 0x10851f4: lui   v0, 0x20000
+// 0x01085818: 0x1085818: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x010851f8: 0x10851f8: addiu a3, zero, 16
+// 0x0108581c: 0x108581c: addiu a3, zero, 16
 	ldc.i4.s 16
 	stloc 4
-// 0x010851fc: 0x10851fc: addu  a1, s4, zero
+// 0x01085820: 0x1085820: addu  a1, s4, zero
 	ldloc 8
 	stloc.2
-// 0x01085200: 0x1085200: addiu a0, v0, -21648
+// 0x01085824: 0x1085824: addiu a0, v0, -21184
 	ldloc 5
-	ldc.i4 -21648
+	ldc.i4 -21184
 	add
 	stloc.1
-// 0x01085204: 0x1085204: jal   0x1098d10 addiu a2, zero, -1
+// 0x01085828: 0x1085828: jal   0x1099358 addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
 	ldloc.0
@@ -8825,26 +8825,26 @@ L_1085178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108520c: 0x108520c: lui   a1, 0x20000
+// 0x01085830: 0x1085830: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x01085210: 0x1085210: addu  a2, zero, zero
+// 0x01085834: 0x1085834: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085214: 0x1085214: addu  a0, v0, zero
+// 0x01085838: 0x1085838: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085218: 0x1085218: addiu a1, a1, -25464
+// 0x0108583c: 0x108583c: addiu a1, a1, -25000
 	ldloc.2
-	ldc.i4 -25464
+	ldc.i4 -25000
 	add
 	stloc.2
-// 0x0108521c: 0x108521c: jal   0x1098fe0 sw    v0, 1580(sp)
+// 0x01085840: 0x1085840: jal   0x1099628 sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8856,9 +8856,9 @@ L_1085178:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01085224: 0x1085224: lw    v0, 1580(sp)
+// 0x01085848: 0x1085848: lw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8867,18 +8867,18 @@ L_1085178:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01085228: 0x1085228: addiu v1, s2, 8
+// 0x0108584c: 0x108584c: addiu v1, s2, 8
 	ldloc 10
 	ldc.i4.8
 	add
 	stloc 6
-// 0x0108522c: 0x108522c: addu  a1, v0, zero
+// 0x01085850: 0x1085850: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x01085230: 0x1085230: addu  a0, s8, zero
+// 0x01085854: 0x1085854: addu  a0, s8, zero
 	ldloc 12
 	stloc.1
-// 0x01085234: 0x1085234: jal   0x1098ec4 sw    v1, 1572(sp)
+// 0x01085858: 0x1085858: jal   0x109950c sw    v1, 1572(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8889,12 +8889,12 @@ L_1085178:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108523c: 0x108523c: lw    a1, 1572(sp)
+// 0x01085860: 0x1085860: lw    a1, 1572(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -8903,7 +8903,7 @@ L_1085178:
 	add
 	ldelem.i4
 	stloc.2
-// 0x01085240: 0x1085240: jal   0x1078364 addu  a0, s8, zero
+// 0x01085864: 0x1085864: jal   0x1078988 addu  a0, s8, zero
 	ldloc 12
 	stloc.1
 	ldloc.0
@@ -8911,29 +8911,29 @@ L_1085178:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl90::RTAlerts_add_comment_stars_1078364(int32,int32,int32,int32,int32)
+	call int32 Cibyl90::RTAlerts_add_comment_stars_1078988(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085248: 0x1085248: sb    zero, 968(sp)
+// 0x0108586c: 0x108586c: sb    zero, 968(sp)
 	ldloc.0
 	ldc.i4 968
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-// 0x0108524c: 0x108524c: addu  a0, zero, zero
+// 0x01085870: 0x1085870: addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
-// 0x01085250: 0x1085250: cibyl_sysc_arg 0x4
+// 0x01085874: 0x1085874: cibyl_sysc_arg 0x4
 	ldloc.1
-// 0x01085254: 0x1085254: cibyl_sysc 0x213e
+// 0x01085878: 0x1085878: cibyl_sysc 0x213e
 	call int32 [WazeWP7]Syscalls::time(int32)
 	stloc 5
-// 0x01085258: 0x1085258: addu  a0, v0, zero
+// 0x0108587c: 0x108587c: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x0108525c: 0x108525c: lw    v0, 20(s2)
+// 0x01085880: 0x1085880: lw    v0, 20(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -8942,64 +8942,64 @@ L_1085178:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01085260: 0x1085260: jal   0x10c09c0 subu  a0, a0, v0
+// 0x01085884: 0x1085884: jal   0x10c1000 subu  a0, a0, v0
 	ldloc.1
 	ldloc 5
 	sub
 	stloc.1
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__floatsidf_10c09c0(int32,int32)
+	call int32 Cibyl143::__floatsidf_10c1000(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085268: 0x1085268: addu  a1, v1, zero
+// 0x0108588c: 0x108588c: addu  a1, v1, zero
 	ldloc 6
 	stloc.2
-// 0x0108526c: 0x108526c: jal   0x10c08d0 addu  a0, v0, zero
+// 0x01085890: 0x1085890: jal   0x10c0f10 addu  a0, v0, zero
 	ldloc 5
 	stloc.1
 	ldloc.0
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__fixdfsi_10c08d0(int32,int32,int32)
+	call int32 Cibyl143::__fixdfsi_10c0f10(int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085274: 0x1085274: bgez  v0, 0x1085284 addu  a3, v0, zero
+// 0x01085898: 0x1085898: bgez  v0, 0x10858a8 addu  a3, v0, zero
 	ldloc 5
 	ldloc 5
 	stloc 4
 	ldc.i4.s 0
-	bge L_1085284
+	bge L_10858a8
 // --- basic block ---
-// 0x0108527c: 0x108527c: j	 0x1085290 addu  a3, zero, zero
+// 0x010858a0: 0x10858a0: j	 0x10858b4 addu  a3, zero, zero
 	ldc.i4.s 0
 	stloc 4
-	br L_1085290
+	br L_10858b4
 // --- basic block ---
-L_1085284:
-// 0x01085284: 0x1085284: slti  v0, v0, 60
+L_10858a8:
+// 0x010858a8: 0x10858a8: slti  v0, v0, 60
 	ldloc 5
 	ldc.i4.s 60
 	clt
 	stloc 5
-// 0x01085288: 0x1085288: beq   v0, zero, 0x10852d0 sll   zero, zero, 0
+// 0x010858ac: 0x10858ac: beq   v0, zero, 0x10858f4 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10852d0
+	brfalse L_10858f4
 // --- basic block ---
-L_1085290:
-// 0x01085290: 0x1085290: addiu v1, sp, 968
+L_10858b4:
+// 0x010858b4: 0x10858b4: addiu v1, sp, 968
 	ldloc.0
 	ldc.i4 968
 	add
 	stloc 6
-// 0x01085294: 0x1085294: addu  a0, v1, zero
+// 0x010858b8: 0x10858b8: addu  a0, v1, zero
 	ldloc 6
 	stloc.1
-// 0x01085298: 0x1085298: sw    v1, 1580(sp)
+// 0x010858bc: 0x10858bc: sw    v1, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9008,7 +9008,7 @@ L_1085290:
 	add
 	ldloc 6
 	stelem.i4
-// 0x0108529c: 0x108529c: jal   0x1001b48 sw    a3, 1584(sp)
+// 0x010858c0: 0x10858c0: jal   0x1001b48 sw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9023,15 +9023,15 @@ L_1085290:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010852a4: 0x10852a4: lui   a0, 0x20000
+// 0x010858c8: 0x10858c8: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x010852a8: 0x10852a8: addiu a0, a0, -26468
+// 0x010858cc: 0x10858cc: addiu a0, a0, -26004
 	ldloc.1
-	ldc.i4 -26468
+	ldc.i4 -26004
 	add
 	stloc.1
-// 0x010852ac: 0x10852ac: jal   0x101cd60 addu  s4, v0, zero
+// 0x010858d0: 0x10858d0: jal   0x101cd70 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.0
@@ -9039,12 +9039,12 @@ L_1085290:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010852b4: 0x10852b4: lw    v1, 1580(sp)
+// 0x010858d8: 0x10858d8: lw    v1, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9053,20 +9053,20 @@ L_1085290:
 	add
 	ldelem.i4
 	stloc 6
-// 0x010852b8: 0x10852b8: addiu a1, zero, 300
+// 0x010858dc: 0x10858dc: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x010852bc: 0x10852bc: subu  a1, a1, s4
+// 0x010858e0: 0x10858e0: subu  a1, a1, s4
 	ldloc.2
 	ldloc 8
 	sub
 	stloc.2
-// 0x010852c0: 0x10852c0: addu  a0, v1, s4
+// 0x010858e4: 0x10858e4: addu  a0, v1, s4
 	ldloc 6
 	ldloc 8
 	add
 	stloc.1
-// 0x010852c4: 0x10852c4: lw    a3, 1584(sp)
+// 0x010858e8: 0x10858e8: lw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9075,30 +9075,30 @@ L_1085290:
 	add
 	ldelem.i4
 	stloc 4
-// 0x010852c8: 0x10852c8: j	 0x1085320 addu  a2, v0, zero
+// 0x010858ec: 0x10858ec: j	 0x1085944 addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-	br L_1085320
+	br L_1085944
 // --- basic block ---
-L_10852d0:
-// 0x010852d0: 0x10852d0: addiu v0, a3, -61
+L_10858f4:
+// 0x010858f4: 0x10858f4: addiu v0, a3, -61
 	ldloc 4
 	ldc.i4.s -61
 	add
 	stloc 5
-// 0x010852d4: 0x10852d4: sltiu v0, v0, 3539
+// 0x010858f8: 0x10858f8: sltiu v0, v0, 3539
 	ldloc 5
 	ldc.i4 3539
 	clt.un
 	stloc 5
-// 0x010852d8: 0x10852d8: beq   v0, zero, 0x1085330 sll   zero, zero, 0
+// 0x010858fc: 0x10858fc: beq   v0, zero, 0x1085954 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1085330
+	brfalse L_1085954
 // --- basic block ---
-// 0x010852e0: 0x10852e0: addu  a0, s4, zero
+// 0x01085904: 0x1085904: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x010852e4: 0x10852e4: jal   0x1001b48 sw    a3, 1584(sp)
+// 0x01085908: 0x1085908: jal   0x1001b48 sw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9113,15 +9113,15 @@ L_10852d0:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010852ec: 0x10852ec: lui   a0, 0x10000
+// 0x01085910: 0x1085910: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010852f0: 0x10852f0: addiu a0, a0, -284
+// 0x01085914: 0x1085914: addiu a0, a0, -288
 	ldloc.1
-	ldc.i4 -284
+	ldc.i4 -288
 	add
 	stloc.1
-// 0x010852f4: 0x10852f4: jal   0x101cd60 sw    v0, 1580(sp)
+// 0x01085918: 0x1085918: jal   0x101cd70 sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9135,12 +9135,12 @@ L_10852d0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010852fc: 0x10852fc: lw    a3, 1584(sp)
+// 0x01085920: 0x1085920: lw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9149,10 +9149,10 @@ L_10852d0:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01085300: 0x1085300: addiu a0, zero, 60
+// 0x01085924: 0x1085924: addiu a0, zero, 60
 	ldc.i4.s 60
 	stloc.1
-// 0x01085304: 0x1085304: div   a3, a0
+// 0x01085928: 0x1085928: div   a3, a0
 	ldloc 4
 	ldloc.1
 	ldloc 4
@@ -9161,7 +9161,7 @@ L_10852d0:
 	stloc 17
 	rem
 	stloc 18
-// 0x01085308: 0x1085308: lw    v1, 1580(sp)
+// 0x0108592c: 0x108592c: lw    v1, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9170,27 +9170,27 @@ L_10852d0:
 	add
 	ldelem.i4
 	stloc 6
-// 0x0108530c: 0x108530c: addiu a0, zero, 300
+// 0x01085930: 0x1085930: addiu a0, zero, 300
 	ldc.i4 300
 	stloc.1
-// 0x01085310: 0x1085310: subu  a1, a0, v1
+// 0x01085934: 0x1085934: subu  a1, a0, v1
 	ldloc.1
 	ldloc 6
 	sub
 	stloc.2
-// 0x01085314: 0x1085314: addu  a2, v0, zero
+// 0x01085938: 0x1085938: addu  a2, v0, zero
 	ldloc 5
 	stloc.3
-// 0x01085318: 0x1085318: addu  a0, s4, v1
+// 0x0108593c: 0x108593c: addu  a0, s4, v1
 	ldloc 8
 	ldloc 6
 	add
 	stloc.1
-// 0x0108531c: 0x108531c: mflo  lo
+// 0x01085940: 0x1085940: mflo  lo
 	ldloc 17
 	stloc 4
-L_1085320:
-// 0x01085320: 0x1085320: jal   0x1000f9c sll   zero, zero, 0
+L_1085944:
+// 0x01085944: 0x1085944: jal   0x1000f9c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
@@ -9201,16 +9201,16 @@ L_1085320:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085328: 0x1085328: j	 0x10853b0 lui   v0, 0x20000
+// 0x0108594c: 0x108594c: j	 0x10859d4 lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-	br L_10853b0
+	br L_10859d4
 // --- basic block ---
-L_1085330:
-// 0x01085330: 0x1085330: addu  a0, s4, zero
+L_1085954:
+// 0x01085954: 0x1085954: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x01085334: 0x1085334: jal   0x1001b48 sw    a3, 1584(sp)
+// 0x01085958: 0x1085958: jal   0x1001b48 sw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9225,15 +9225,15 @@ L_1085330:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108533c: 0x108533c: lui   a0, 0x20000
+// 0x01085960: 0x1085960: lui   a0, 0x20000
 	ldc.i4 131072
 	stloc.1
-// 0x01085340: 0x1085340: addiu a0, a0, -21860
+// 0x01085964: 0x1085964: addiu a0, a0, -21396
 	ldloc.1
-	ldc.i4 -21860
+	ldc.i4 -21396
 	add
 	stloc.1
-// 0x01085344: 0x1085344: jal   0x101cd60 sw    v0, 1576(sp)
+// 0x01085968: 0x1085968: jal   0x101cd70 sw    v0, 1576(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9247,12 +9247,12 @@ L_1085330:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl21::roadmap_lang_get_101cd60(int32,int32,int32,int32,int32)
+	call int32 Cibyl21::roadmap_lang_get_101cd70(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108534c: 0x108534c: lw    a3, 1584(sp)
+// 0x01085970: 0x1085970: lw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9261,7 +9261,7 @@ L_1085330:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01085350: 0x1085350: sw    v0, 1580(sp)
+// 0x01085974: 0x1085974: sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9270,7 +9270,7 @@ L_1085330:
 	add
 	ldloc 5
 	stelem.i4
-// 0x01085354: 0x1085354: jal   0x10c09ac addu  a0, a3, zero
+// 0x01085978: 0x1085978: jal   0x10c0fec addu  a0, a3, zero
 	ldloc 4
 	stloc.1
 	ldloc.1
@@ -9278,25 +9278,25 @@ L_1085330:
 	call int32 [WazeWP7]CRunTime::floatToIntBits(float32)
 	stloc 5
 // --- basic block ---
-// 0x0108535c: 0x108535c: addu  a0, v0, zero
+// 0x01085980: 0x1085980: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085360: 0x1085360: lui   v0, 0x20000
+// 0x01085984: 0x1085984: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-// 0x01085364: 0x1085364: addiu v0, v0, 23676
+// 0x01085988: 0x1085988: addiu v0, v0, 24136
 	ldloc 5
-	ldc.i4 23676
+	ldc.i4 24136
 	add
 	stloc 5
-// 0x01085368: 0x1085368: lw    a1, 0(v0)
+// 0x0108598c: 0x108598c: lw    a1, 0(v0)
 	ldloc 7
 	ldloc 5
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc.2
-// 0x0108536c: 0x108536c: lw    v0, 1576(sp)
+// 0x01085990: 0x1085990: lw    v0, 1576(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9305,15 +9305,15 @@ L_1085330:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01085370: 0x1085370: addiu v1, zero, 300
+// 0x01085994: 0x1085994: addiu v1, zero, 300
 	ldc.i4 300
 	stloc 6
-// 0x01085374: 0x1085374: subu  a3, v1, v0
+// 0x01085998: 0x1085998: subu  a3, v1, v0
 	ldloc 6
 	ldloc 5
 	sub
 	stloc 4
-// 0x01085378: 0x1085378: jal   0x10c0780 sw    a3, 1584(sp)
+// 0x0108599c: 0x108599c: jal   0x10c0dc0 sw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9324,10 +9324,10 @@ L_1085330:
 	stelem.i4
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl143::__mulsf3_10c0780(int32,int32)
+	call int32 Cibyl143::__mulsf3_10c0dc0(int32,int32)
 	stloc 5
 // --- basic block ---
-// 0x01085380: 0x1085380: lw    v1, 1576(sp)
+// 0x010859a4: 0x10859a4: lw    v1, 1576(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9336,22 +9336,22 @@ L_1085330:
 	add
 	ldelem.i4
 	stloc 6
-// 0x01085384: 0x1085384: addu  a0, v0, zero
+// 0x010859a8: 0x10859a8: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085388: 0x1085388: jal   0x10c0874 addu  s4, s4, v1
+// 0x010859ac: 0x10859ac: jal   0x10c0eb4 addu  s4, s4, v1
 	ldloc 8
 	ldloc 6
 	add
 	stloc 8
 	ldloc.0
 	ldloc.1
-	call int32 Cibyl143::__extendsfdf2_10c0874(int32,int32)
+	call int32 Cibyl143::__extendsfdf2_10c0eb4(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085390: 0x1085390: lw    a3, 1584(sp)
+// 0x010859b4: 0x10859b4: lw    a3, 1584(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9360,7 +9360,7 @@ L_1085330:
 	add
 	ldelem.i4
 	stloc 4
-// 0x01085394: 0x1085394: lw    a2, 1580(sp)
+// 0x010859b8: 0x10859b8: lw    a2, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9369,13 +9369,13 @@ L_1085330:
 	add
 	ldelem.i4
 	stloc.3
-// 0x01085398: 0x1085398: addu  a0, s4, zero
+// 0x010859bc: 0x10859bc: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x0108539c: 0x108539c: addu  a1, a3, zero
+// 0x010859c0: 0x10859c0: addu  a1, a3, zero
 	ldloc 4
 	stloc.2
-// 0x010853a0: 0x10853a0: sw    v1, 20(sp)
+// 0x010859c4: 0x10859c4: sw    v1, 20(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9384,7 +9384,7 @@ L_1085330:
 	add
 	ldloc 6
 	stelem.i4
-// 0x010853a4: 0x10853a4: jal   0x1000f9c sw    v0, 16(sp)
+// 0x010859c8: 0x10859c8: jal   0x1000f9c sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9403,26 +9403,26 @@ L_1085330:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010853ac: 0x10853ac: lui   v0, 0x20000
+// 0x010859d0: 0x10859d0: lui   v0, 0x20000
 	ldc.i4 131072
 	stloc 5
-L_10853b0:
-// 0x010853b0: 0x10853b0: ori   a3, zero, 32776
+L_10859d4:
+// 0x010859d4: 0x10859d4: ori   a3, zero, 32776
 	ldc.i4.s 0
 	ldc.i4 32776
 	or
 	stloc 4
-// 0x010853b4: 0x10853b4: addiu a1, sp, 968
+// 0x010859d8: 0x10859d8: addiu a1, sp, 968
 	ldloc.0
 	ldc.i4 968
 	add
 	stloc.2
-// 0x010853b8: 0x10853b8: addiu a2, zero, 10
+// 0x010859dc: 0x10859dc: addiu a2, zero, 10
 	ldc.i4.s 10
 	stloc.3
-// 0x010853bc: 0x10853bc: jal   0x1098d10 addiu a0, v0, -21648
+// 0x010859e0: 0x10859e0: jal   0x1099358 addiu a0, v0, -21184
 	ldloc 5
-	ldc.i4 -21648
+	ldc.i4 -21184
 	add
 	stloc.1
 	ldloc.0
@@ -9430,26 +9430,26 @@ L_10853b0:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010853c4: 0x10853c4: lui   a1, 0x20000
+// 0x010859e8: 0x10859e8: lui   a1, 0x20000
 	ldc.i4 131072
 	stloc.2
-// 0x010853c8: 0x10853c8: addu  a0, v0, zero
+// 0x010859ec: 0x10859ec: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x010853cc: 0x10853cc: addu  a2, zero, zero
+// 0x010859f0: 0x10859f0: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x010853d0: 0x10853d0: addiu a1, a1, -21636
+// 0x010859f4: 0x10859f4: addiu a1, a1, -21172
 	ldloc.2
-	ldc.i4 -21636
+	ldc.i4 -21172
 	add
 	stloc.2
-// 0x010853d4: 0x10853d4: jal   0x1098fe0 sw    v0, 1580(sp)
+// 0x010859f8: 0x10859f8: jal   0x1099628 sw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9461,22 +9461,22 @@ L_10853b0:
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010853dc: 0x10853dc: addu  a0, s1, zero
+// 0x01085a00: 0x1085a00: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010853e0: 0x10853e0: jal   0x1098ec4 addu  a1, s8, zero
+// 0x01085a04: 0x1085a04: jal   0x109950c addu  a1, s8, zero
 	ldloc 12
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010853e8: 0x10853e8: lw    v0, 1580(sp)
+// 0x01085a0c: 0x1085a0c: lw    v0, 1580(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9485,67 +9485,67 @@ L_10853b0:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010853ec: 0x10853ec: addu  a0, s1, zero
+// 0x01085a10: 0x1085a10: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x010853f0: 0x10853f0: jal   0x1098ec4 addu  a1, v0, zero
+// 0x01085a14: 0x1085a14: jal   0x109950c addu  a1, v0, zero
 	ldloc 5
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010853f8: 0x10853f8: jal   0x101fa28 sb    zero, 968(sp)
+// 0x01085a1c: 0x1085a1c: jal   0x101fa38 sb    zero, 968(sp)
 	ldloc.0
 	ldc.i4 968
 	add
 	ldc.i4.s 0
 	call void [WazeWP7]CRunTime::memoryWriteByte(int32, int32)
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01085400: 0x1085400: beq   v0, zero, 0x108541c lui   a0, 0x20000
+// 0x01085a24: 0x1085a24: beq   v0, zero, 0x1085a40 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_108541c
+	brfalse L_1085a40
 // --- basic block ---
-// 0x01085408: 0x1085408: addiu a0, a0, -21628
+// 0x01085a2c: 0x1085a2c: addiu a0, a0, -21164
 	ldloc.1
-	ldc.i4 -21628
+	ldc.i4 -21164
 	add
 	stloc.1
-// 0x0108540c: 0x108540c: addu  a1, zero, zero
+// 0x01085a30: 0x1085a30: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085410: 0x1085410: addiu a2, zero, -2
+// 0x01085a34: 0x1085a34: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01085414: 0x1085414: j	 0x108542c addiu a3, zero, 60
+// 0x01085a38: 0x1085a38: j	 0x1085a50 addiu a3, zero, 60
 	ldc.i4.s 60
 	stloc 4
-	br L_108542c
+	br L_1085a50
 // --- basic block ---
-L_108541c:
-// 0x0108541c: 0x108541c: addiu a0, a0, -21628
+L_1085a40:
+// 0x01085a40: 0x1085a40: addiu a0, a0, -21164
 	ldloc.1
-	ldc.i4 -21628
+	ldc.i4 -21164
 	add
 	stloc.1
-// 0x01085420: 0x1085420: addu  a1, zero, zero
+// 0x01085a44: 0x1085a44: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085424: 0x1085424: addiu a2, zero, -2
+// 0x01085a48: 0x1085a48: addiu a2, zero, -2
 	ldc.i4.s -2
 	stloc.3
-// 0x01085428: 0x1085428: addiu a3, zero, -1
+// 0x01085a4c: 0x1085a4c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-L_108542c:
-// 0x0108542c: 0x108542c: jal   0x1093a24 sw    zero, 16(sp)
+L_1085a50:
+// 0x01085a50: 0x1085a50: jal   0x1094048 sw    zero, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9559,34 +9559,34 @@ L_108542c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085434: 0x1085434: addiu s8, sp, 968
+// 0x01085a58: 0x1085a58: addiu s8, sp, 968
 	ldloc.0
 	ldc.i4 968
 	add
 	stloc 12
-// 0x01085438: 0x1085438: addu  a1, zero, zero
+// 0x01085a5c: 0x1085a5c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108543c: 0x108543c: addu  a2, zero, zero
+// 0x01085a60: 0x1085a60: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085440: 0x1085440: addu  a0, v0, zero
+// 0x01085a64: 0x1085a64: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085444: 0x1085444: jal   0x1098fe0 addu  s4, v0, zero
+// 0x01085a68: 0x1085a68: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x0108544c: 0x108544c: jal   0x1001b48 addu  a0, s8, zero
+// 0x01085a70: 0x1085a70: jal   0x1001b48 addu  a0, s8, zero
 	ldloc 12
 	stloc.1
 	ldloc.1
@@ -9595,28 +9595,28 @@ L_108542c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085454: 0x1085454: addiu a1, zero, 300
+// 0x01085a78: 0x1085a78: addiu a1, zero, 300
 	ldc.i4 300
 	stloc.2
-// 0x01085458: 0x1085458: lui   a2, 0x20000
+// 0x01085a7c: 0x1085a7c: lui   a2, 0x20000
 	ldc.i4 131072
 	stloc.3
-// 0x0108545c: 0x108545c: subu  a1, a1, v0
+// 0x01085a80: 0x1085a80: subu  a1, a1, v0
 	ldloc.2
 	ldloc 5
 	sub
 	stloc.2
-// 0x01085460: 0x1085460: addiu a2, a2, -21612
+// 0x01085a84: 0x1085a84: addiu a2, a2, -21148
 	ldloc.3
-	ldc.i4 -21612
+	ldc.i4 -21148
 	add
 	stloc.3
-// 0x01085464: 0x1085464: addu  a0, s8, v0
+// 0x01085a88: 0x1085a88: addu  a0, s8, v0
 	ldloc 12
 	ldloc 5
 	add
 	stloc.1
-// 0x01085468: 0x1085468: jal   0x1000f9c addiu a3, s2, 125
+// 0x01085a8c: 0x1085a8c: jal   0x1000f9c addiu a3, s2, 125
 	ldloc 10
 	ldc.i4.s 125
 	add
@@ -9631,23 +9631,23 @@ L_108542c:
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085470: 0x1085470: lui   v1, 0x20000
+// 0x01085a94: 0x1085a94: lui   v1, 0x20000
 	ldc.i4 131072
 	stloc 6
-// 0x01085474: 0x1085474: addiu a0, v1, -21648
+// 0x01085a98: 0x1085a98: addiu a0, v1, -21184
 	ldloc 6
-	ldc.i4 -21648
+	ldc.i4 -21184
 	add
 	stloc.1
-// 0x01085478: 0x1085478: addiu a2, zero, -1
+// 0x01085a9c: 0x1085a9c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108547c: 0x108547c: ori   a3, zero, 32784
+// 0x01085aa0: 0x1085aa0: ori   a3, zero, 32784
 	ldc.i4.s 0
 	ldc.i4 32784
 	or
 	stloc 4
-// 0x01085480: 0x1085480: jal   0x1098d10 addu  a1, s8, zero
+// 0x01085aa4: 0x1085aa4: jal   0x1099358 addu  a1, s8, zero
 	ldloc 12
 	stloc.2
 	ldloc.0
@@ -9655,51 +9655,51 @@ L_108542c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_text_new_1098d10(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_text_new_1099358(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085488: 0x1085488: addu  a1, v0, zero
+// 0x01085aac: 0x1085aac: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x0108548c: 0x108548c: jal   0x1098ec4 addu  a0, s4, zero
+// 0x01085ab0: 0x1085ab0: jal   0x109950c addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085494: 0x1085494: addu  a0, s1, zero
+// 0x01085ab8: 0x1085ab8: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01085498: 0x1085498: jal   0x1098ec4 addu  a1, s4, zero
+// 0x01085abc: 0x1085abc: jal   0x109950c addu  a1, s4, zero
 	ldloc 8
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010854a0: 0x10854a0: addu  a0, s3, zero
+// 0x01085ac4: 0x1085ac4: addu  a0, s3, zero
 	ldloc 14
 	stloc.1
-// 0x010854a4: 0x10854a4: jal   0x1098ec4 addu  a1, s1, zero
+// 0x01085ac8: 0x1085ac8: jal   0x109950c addu  a1, s1, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010854ac: 0x10854ac: lw    v0, 528(s2)
+// 0x01085ad0: 0x1085ad0: lw    v0, 528(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -9708,12 +9708,12 @@ L_108542c:
 	add
 	ldelem.i4
 	stloc 5
-// 0x010854b0: 0x10854b0: sll   zero, zero, 0
-// 0x010854b4: 0x10854b4: beq   v0, zero, 0x1085510 sll   zero, zero, 0
+// 0x01085ad4: 0x1085ad4: sll   zero, zero, 0
+// 0x01085ad8: 0x1085ad8: beq   v0, zero, 0x1085b34 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_1085510
+	brfalse L_1085b34
 // --- basic block ---
-// 0x010854bc: 0x10854bc: jal   0x109a424 addu  a0, zero, zero
+// 0x01085ae0: 0x1085ae0: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -9721,66 +9721,66 @@ L_108542c:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010854c4: 0x10854c4: beq   v0, zero, 0x10854e8 lui   a0, 0x20000
+// 0x01085ae8: 0x1085ae8: beq   v0, zero, 0x1085b0c lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_10854e8
+	brfalse L_1085b0c
 // --- basic block ---
-// 0x010854cc: 0x10854cc: lui   v0, 0x100000
+// 0x01085af0: 0x1085af0: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010854d0: 0x10854d0: addiu a0, a0, -21604
+// 0x01085af4: 0x1085af4: addiu a0, a0, -21140
 	ldloc.1
-	ldc.i4 -21604
+	ldc.i4 -21140
 	add
 	stloc.1
-// 0x010854d4: 0x10854d4: addu  a1, zero, zero
+// 0x01085af8: 0x1085af8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010854d8: 0x10854d8: addiu a2, zero, -1
+// 0x01085afc: 0x1085afc: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010854dc: 0x10854dc: addiu a3, zero, -1
+// 0x01085b00: 0x1085b00: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010854e0: 0x10854e0: j	 0x1085500 ori   v0, v0, 8
+// 0x01085b04: 0x1085b04: j	 0x1085b24 ori   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	or
 	stloc 5
-	br L_1085500
+	br L_1085b24
 // --- basic block ---
-L_10854e8:
-// 0x010854e8: 0x10854e8: lui   v0, 0x100000
+L_1085b0c:
+// 0x01085b0c: 0x1085b0c: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x010854ec: 0x10854ec: addiu a0, a0, -21604
+// 0x01085b10: 0x1085b10: addiu a0, a0, -21140
 	ldloc.1
-	ldc.i4 -21604
+	ldc.i4 -21140
 	add
 	stloc.1
-// 0x010854f0: 0x10854f0: addu  a1, zero, zero
+// 0x01085b14: 0x1085b14: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x010854f4: 0x10854f4: addiu a2, zero, -1
+// 0x01085b18: 0x1085b18: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x010854f8: 0x10854f8: addiu a3, zero, -1
+// 0x01085b1c: 0x1085b1c: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x010854fc: 0x10854fc: ori   v0, v0, 2
+// 0x01085b20: 0x1085b20: ori   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	or
 	stloc 5
-L_1085500:
-// 0x01085500: 0x1085500: jal   0x1093a24 sw    v0, 16(sp)
+L_1085b24:
+// 0x01085b24: 0x1085b24: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9794,18 +9794,18 @@ L_1085500:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085508: 0x1085508: j	 0x1085608 addu  s1, v0, zero
+// 0x01085b2c: 0x1085b2c: j	 0x1085c2c addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-	br L_1085608
+	br L_1085c2c
 // --- basic block ---
-L_1085510:
-// 0x01085510: 0x1085510: jal   0x109a424 addu  a0, zero, zero
+L_1085b34:
+// 0x01085b34: 0x1085b34: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -9813,66 +9813,66 @@ L_1085510:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085518: 0x1085518: beq   v0, zero, 0x108553c lui   a0, 0x20000
+// 0x01085b3c: 0x1085b3c: beq   v0, zero, 0x1085b60 lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_108553c
+	brfalse L_1085b60
 // --- basic block ---
-// 0x01085520: 0x1085520: lui   v0, 0x100000
+// 0x01085b44: 0x1085b44: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x01085524: 0x1085524: addiu a0, a0, -21604
+// 0x01085b48: 0x1085b48: addiu a0, a0, -21140
 	ldloc.1
-	ldc.i4 -21604
+	ldc.i4 -21140
 	add
 	stloc.1
-// 0x01085528: 0x1085528: addu  a1, zero, zero
+// 0x01085b4c: 0x1085b4c: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x0108552c: 0x108552c: addiu a2, zero, -1
+// 0x01085b50: 0x1085b50: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x01085530: 0x1085530: addiu a3, zero, -1
+// 0x01085b54: 0x1085b54: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01085534: 0x1085534: j	 0x1085554 ori   v0, v0, 2
+// 0x01085b58: 0x1085b58: j	 0x1085b78 ori   v0, v0, 2
 	ldloc 5
 	ldc.i4.2
 	or
 	stloc 5
-	br L_1085554
+	br L_1085b78
 // --- basic block ---
-L_108553c:
-// 0x0108553c: 0x108553c: lui   v0, 0x100000
+L_1085b60:
+// 0x01085b60: 0x1085b60: lui   v0, 0x100000
 	ldc.i4 1048576
 	stloc 5
-// 0x01085540: 0x1085540: addiu a0, a0, -21604
+// 0x01085b64: 0x1085b64: addiu a0, a0, -21140
 	ldloc.1
-	ldc.i4 -21604
+	ldc.i4 -21140
 	add
 	stloc.1
-// 0x01085544: 0x1085544: addu  a1, zero, zero
+// 0x01085b68: 0x1085b68: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085548: 0x1085548: addiu a2, zero, -1
+// 0x01085b6c: 0x1085b6c: addiu a2, zero, -1
 	ldc.i4.m1
 	stloc.3
-// 0x0108554c: 0x108554c: addiu a3, zero, -1
+// 0x01085b70: 0x1085b70: addiu a3, zero, -1
 	ldc.i4.m1
 	stloc 4
-// 0x01085550: 0x1085550: ori   v0, v0, 8
+// 0x01085b74: 0x1085b74: ori   v0, v0, 8
 	ldloc 5
 	ldc.i4.8
 	or
 	stloc 5
-L_1085554:
-// 0x01085554: 0x1085554: jal   0x1093a24 sw    v0, 16(sp)
+L_1085b78:
+// 0x01085b78: 0x1085b78: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9886,18 +9886,18 @@ L_1085554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108555c: 0x108555c: jal   0x101fa28 addu  s1, v0, zero
+// 0x01085b80: 0x1085b80: jal   0x101fa38 addu  s1, v0, zero
 	ldloc 5
 	stloc 11
-	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa28()
+	call int32 Cibyl23::roadmap_screen_is_hd_screen_101fa38()
 	stloc 5
 // --- basic block ---
-// 0x01085564: 0x1085564: lw    v0, 140(s0)
+// 0x01085b88: 0x1085b88: lw    v0, 140(s0)
 	ldloc 7
 	ldloc 13
 	ldc.i4.2
@@ -9906,31 +9906,31 @@ L_1085554:
 	add
 	ldelem.i4
 	stloc 5
-// 0x01085568: 0x1085568: sll   zero, zero, 0
-// 0x0108556c: 0x108556c: beq   v0, zero, 0x1085608 lui   a0, 0x20000
+// 0x01085b8c: 0x1085b8c: sll   zero, zero, 0
+// 0x01085b90: 0x1085b90: beq   v0, zero, 0x1085c2c lui   a0, 0x20000
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	brfalse L_1085608
+	brfalse L_1085c2c
 // --- basic block ---
-// 0x01085574: 0x1085574: addu  a3, s7, zero
+// 0x01085b98: 0x1085b98: addu  a3, s7, zero
 	ldloc 16
 	stloc 4
-// 0x01085578: 0x1085578: addiu a0, a0, -21792
+// 0x01085b9c: 0x1085b9c: addiu a0, a0, -21328
 	ldloc.1
-	ldc.i4 -21792
+	ldc.i4 -21328
 	add
 	stloc.1
-// 0x0108557c: 0x108557c: addu  a1, zero, zero
+// 0x01085ba0: 0x1085ba0: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085580: 0x1085580: addu  a2, s7, zero
+// 0x01085ba4: 0x1085ba4: addu  a2, s7, zero
 	ldloc 16
 	stloc.3
-// 0x01085584: 0x1085584: addiu v0, zero, 514
+// 0x01085ba8: 0x1085ba8: addiu v0, zero, 514
 	ldc.i4 514
 	stloc 5
-// 0x01085588: 0x1085588: jal   0x1093a24 sw    v0, 16(sp)
+// 0x01085bac: 0x1085bac: jal   0x1094048 sw    v0, 16(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -9944,29 +9944,29 @@ L_1085554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_container_new_1093a24(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_container_new_1094048(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085590: 0x1085590: addu  a0, v0, zero
+// 0x01085bb4: 0x1085bb4: addu  a0, v0, zero
 	ldloc 5
 	stloc.1
-// 0x01085594: 0x1085594: addu  a1, zero, zero
+// 0x01085bb8: 0x1085bb8: addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
-// 0x01085598: 0x1085598: addu  a2, zero, zero
+// 0x01085bbc: 0x1085bbc: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x0108559c: 0x108559c: jal   0x1098fe0 addu  s4, v0, zero
+// 0x01085bc0: 0x1085bc0: jal   0x1099628 addu  s4, v0, zero
 	ldloc 5
 	stloc 8
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x010855a4: 0x10855a4: lw    a0, 540(s2)
+// 0x01085bc8: 0x1085bc8: lw    a0, 540(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
@@ -9975,29 +9975,29 @@ L_1085554:
 	add
 	ldelem.i4
 	stloc.1
-// 0x010855a8: 0x10855a8: jal   0x103542c sll   zero, zero, 0
+// 0x01085bcc: 0x1085bcc: jal   0x103543c sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl39::roadmap_mood_to_string_103542c(int32,int32,int32,int32,int32)
+	call int32 Cibyl39::roadmap_mood_to_string_103543c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010855b0: 0x10855b0: lui   a0, 0x10000
+// 0x01085bd4: 0x1085bd4: lui   a0, 0x10000
 	ldc.i4 65536
 	stloc.1
-// 0x010855b4: 0x10855b4: addiu a0, a0, -13720
+// 0x01085bd8: 0x1085bd8: addiu a0, a0, -13724
 	ldloc.1
-	ldc.i4 -13720
+	ldc.i4 -13724
 	add
 	stloc.1
-// 0x010855b8: 0x10855b8: addu  a1, v0, zero
+// 0x01085bdc: 0x1085bdc: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010855bc: 0x10855bc: jal   0x109e13c addiu a2, zero, 17
+// 0x01085be0: 0x1085be0: jal   0x109e784 addiu a2, zero, 17
 	ldc.i4.s 17
 	stloc.3
 	ldloc.0
@@ -10005,25 +10005,25 @@ L_1085554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl118::ssd_bitmap_new_109e13c(int32,int32,int32,int32,int32)
+	call int32 Cibyl118::ssd_bitmap_new_109e784(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010855c4: 0x10855c4: addu  a1, v0, zero
+// 0x01085be8: 0x1085be8: addu  a1, v0, zero
 	ldloc 5
 	stloc.2
-// 0x010855c8: 0x10855c8: jal   0x1098ec4 addu  a0, s4, zero
+// 0x01085bec: 0x1085bec: jal   0x109950c addu  a0, s4, zero
 	ldloc 8
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010855d0: 0x10855d0: jal   0x109a424 addu  a0, zero, zero
+// 0x01085bf4: 0x1085bf4: jal   0x109aa6c addu  a0, zero, zero
 	ldc.i4.s 0
 	stloc.1
 	ldloc.0
@@ -10031,32 +10031,32 @@ L_1085554:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl115::ssd_widget_rtl_109a424(int32,int32,int32,int32,int32)
+	call int32 Cibyl115::ssd_widget_rtl_109aa6c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010855d8: 0x10855d8: beq   v0, zero, 0x10855ec sll   zero, zero, 0
+// 0x01085bfc: 0x1085bfc: beq   v0, zero, 0x1085c10 sll   zero, zero, 0
 	ldloc 5
-	brfalse L_10855ec
+	brfalse L_1085c10
 // --- basic block ---
-// 0x010855e0: 0x10855e0: addu  a0, s4, zero
+// 0x01085c04: 0x1085c04: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x010855e4: 0x10855e4: j	 0x10855f4 addiu a1, zero, 10
+// 0x01085c08: 0x1085c08: j	 0x1085c18 addiu a1, zero, 10
 	ldc.i4.s 10
 	stloc.2
-	br L_10855f4
+	br L_1085c18
 // --- basic block ---
-L_10855ec:
-// 0x010855ec: 0x10855ec: addu  a0, s4, zero
+L_1085c10:
+// 0x01085c10: 0x1085c10: addu  a0, s4, zero
 	ldloc 8
 	stloc.1
-// 0x010855f0: 0x10855f0: addiu a1, zero, -10
+// 0x01085c14: 0x1085c14: addiu a1, zero, -10
 	ldc.i4.s -10
 	stloc.2
-L_10855f4:
-// 0x010855f4: 0x10855f4: jal   0x1098f84 addu  a2, zero, zero
+L_1085c18:
+// 0x01085c18: 0x1085c18: jal   0x10995cc addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -10064,26 +10064,26 @@ L_10855f4:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl114::ssd_widget_set_offset_1098f84(int32,int32,int32,int32,int32)
+	call int32 Cibyl114::ssd_widget_set_offset_10995cc(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x010855fc: 0x10855fc: addu  a1, s4, zero
+// 0x01085c20: 0x1085c20: addu  a1, s4, zero
 	ldloc 8
 	stloc.2
-// 0x01085600: 0x1085600: jal   0x1098ec4 addu  a0, s3, zero
+// 0x01085c24: 0x1085c24: jal   0x109950c addu  a0, s3, zero
 	ldloc 14
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-L_1085608:
-// 0x01085608: 0x1085608: lw    a1, 1572(sp)
+L_1085c2c:
+// 0x01085c2c: 0x1085c2c: lw    a1, 1572(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10092,60 +10092,60 @@ L_1085608:
 	add
 	ldelem.i4
 	stloc.2
-// 0x0108560c: 0x108560c: jal   0x1098fd8 addu  a0, s1, zero
+// 0x01085c30: 0x1085c30: jal   0x1099620 addu  a0, s1, zero
 	ldloc 11
 	stloc.1
 	ldloc.1
 	ldloc.2
-	call void Cibyl114::ssd_widget_set_context_1098fd8(int32,int32)
+	call void Cibyl114::ssd_widget_set_context_1099620(int32,int32)
 // --- basic block ---
-// 0x01085614: 0x1085614: addu  a2, zero, zero
+// 0x01085c38: 0x1085c38: addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
-// 0x01085618: 0x1085618: addu  a0, s1, zero
+// 0x01085c3c: 0x1085c3c: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x0108561c: 0x108561c: jal   0x1098fe0 addu  a1, zero, zero
+// 0x01085c40: 0x1085c40: jal   0x1099628 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.1
 	ldloc.2
 	ldloc.3
-	call void Cibyl114::ssd_widget_set_color_1098fe0(int32,int32,int32)
+	call void Cibyl114::ssd_widget_set_color_1099628(int32,int32,int32)
 // --- basic block ---
-// 0x01085624: 0x1085624: addu  a0, s1, zero
+// 0x01085c48: 0x1085c48: addu  a0, s1, zero
 	ldloc 11
 	stloc.1
-// 0x01085628: 0x1085628: jal   0x1098ec4 addu  a1, s3, zero
+// 0x01085c4c: 0x1085c4c: jal   0x109950c addu  a1, s3, zero
 	ldloc 14
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085630: 0x1085630: addu  a0, s6, zero
+// 0x01085c54: 0x1085c54: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x01085634: 0x1085634: jal   0x1098ec4 addu  a1, s1, zero
+// 0x01085c58: 0x1085c58: jal   0x109950c addu  a1, s1, zero
 	ldloc 11
 	stloc.2
 	ldloc.1
 	ldloc.2
-	call int32 Cibyl114::ssd_widget_add_1098ec4(int32,int32)
+	call int32 Cibyl114::ssd_widget_add_109950c(int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108563c: 0x108563c: addu  a0, s6, zero
+// 0x01085c60: 0x1085c60: addu  a0, s6, zero
 	ldloc 15
 	stloc.1
-// 0x01085640: 0x1085640: addiu a1, zero, 15
+// 0x01085c64: 0x1085c64: addiu a1, zero, 15
 	ldc.i4.s 15
 	stloc.2
-// 0x01085644: 0x1085644: jal   0x10942e8 addu  a2, zero, zero
+// 0x01085c68: 0x1085c68: jal   0x109490c addu  a2, zero, zero
 	ldc.i4.s 0
 	stloc.3
 	ldloc.0
@@ -10153,12 +10153,12 @@ L_1085608:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl110::ssd_dialog_add_vspace_10942e8(int32,int32,int32,int32,int32)
+	call int32 Cibyl110::ssd_dialog_add_vspace_109490c(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108564c: 0x108564c: lw    a0, 1568(sp)
+// 0x01085c70: 0x1085c70: lw    a0, 1568(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10167,15 +10167,15 @@ L_1085608:
 	add
 	ldelem.i4
 	stloc.1
-// 0x01085650: 0x1085650: addiu v0, zero, 100
+// 0x01085c74: 0x1085c74: addiu v0, zero, 100
 	ldc.i4.s 100
 	stloc 5
-// 0x01085654: 0x1085654: addiu a0, a0, 1
+// 0x01085c78: 0x1085c78: addiu a0, a0, 1
 	ldloc.1
 	ldc.i4.1
 	add
 	stloc.1
-// 0x01085658: 0x1085658: sw    a0, 1568(sp)
+// 0x01085c7c: 0x1085c7c: sw    a0, 1568(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10184,34 +10184,34 @@ L_1085608:
 	add
 	ldloc.1
 	stelem.i4
-// 0x0108565c: 0x108565c: lw    s2, 0(s2)
+// 0x01085c80: 0x1085c80: lw    s2, 0(s2)
 	ldloc 7
 	ldloc 10
 	ldc.i4.2
 	shr.un
 	ldelem.i4
 	stloc 10
-// 0x01085660: 0x1085660: beq   a0, v0, 0x1085670 lui   a0, 0x20000
+// 0x01085c84: 0x1085c84: beq   a0, v0, 0x1085c94 lui   a0, 0x20000
 	ldloc.1
 	ldloc 5
 	ldc.i4 131072
 	stloc.1
-	beq  L_1085670
+	beq  L_1085c94
 // --- basic block ---
-L_1085668:
-// 0x01085668: 0x1085668: bne   s2, zero, 0x1084f90 lui   a0, 0x20000
+L_1085c8c:
+// 0x01085c8c: 0x1085c8c: bne   s2, zero, 0x10855b4 lui   a0, 0x20000
 	ldloc 10
 	ldc.i4 131072
 	stloc.1
-	brtrue L_1084f90
+	brtrue L_10855b4
 // --- basic block ---
-L_1085670:
-// 0x01085670: 0x1085670: addiu a0, a0, -21916
+L_1085c94:
+// 0x01085c94: 0x1085c94: addiu a0, a0, -21452
 	ldloc.1
-	ldc.i4 -21916
+	ldc.i4 -21452
 	add
 	stloc.1
-// 0x01085674: 0x1085674: jal   0x1095eec addu  a1, zero, zero
+// 0x01085c98: 0x1085c98: jal   0x1096534 addu  a1, zero, zero
 	ldc.i4.s 0
 	stloc.2
 	ldloc.0
@@ -10219,31 +10219,31 @@ L_1085670:
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl111::ssd_dialog_activate_1095eec(int32,int32,int32,int32,int32)
+	call int32 Cibyl111::ssd_dialog_activate_1096534(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x0108567c: 0x108567c: jal   0x1021900 sll   zero, zero, 0
+// 0x01085ca0: 0x1085ca0: jal   0x1021910 sll   zero, zero, 0
 	ldloc.0
 	ldloc.1
 	ldloc.2
 	ldloc.3
 	ldloc 4
-	call int32 Cibyl25::roadmap_screen_redraw_1021900(int32,int32,int32,int32,int32)
+	call int32 Cibyl25::roadmap_screen_redraw_1021910(int32,int32,int32,int32,int32)
 	ldsfld int32 [WazeWP7]CRunTime::saved_v1
 	stloc 6
 	stloc 5
 // --- basic block ---
-// 0x01085684: 0x1085684: addu  v1, zero, zero
+// 0x01085ca8: 0x1085ca8: addu  v1, zero, zero
 	ldc.i4.s 0
 	stloc 6
-L_1085688:
-// 0x01085688: 0x1085688: lw    ra, 1628(sp)
-// 0x0108568c: 0x108568c: addu  v0, v1, zero
+L_1085cac:
+// 0x01085cac: 0x1085cac: lw    ra, 1628(sp)
+// 0x01085cb0: 0x1085cb0: addu  v0, v1, zero
 	ldloc 6
 	stloc 5
-// 0x01085690: 0x1085690: lw    s8, 1624(sp)
+// 0x01085cb4: 0x1085cb4: lw    s8, 1624(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10252,7 +10252,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 12
-// 0x01085694: 0x1085694: lw    s7, 1620(sp)
+// 0x01085cb8: 0x1085cb8: lw    s7, 1620(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10261,7 +10261,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 16
-// 0x01085698: 0x1085698: lw    s6, 1616(sp)
+// 0x01085cbc: 0x1085cbc: lw    s6, 1616(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10270,7 +10270,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 15
-// 0x0108569c: 0x108569c: lw    s5, 1612(sp)
+// 0x01085cc0: 0x1085cc0: lw    s5, 1612(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10279,7 +10279,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 9
-// 0x010856a0: 0x10856a0: lw    s4, 1608(sp)
+// 0x01085cc4: 0x1085cc4: lw    s4, 1608(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10288,7 +10288,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 8
-// 0x010856a4: 0x10856a4: lw    s3, 1604(sp)
+// 0x01085cc8: 0x1085cc8: lw    s3, 1604(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10297,7 +10297,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 14
-// 0x010856a8: 0x10856a8: lw    s2, 1600(sp)
+// 0x01085ccc: 0x1085ccc: lw    s2, 1600(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10306,7 +10306,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 10
-// 0x010856ac: 0x10856ac: lw    s1, 1596(sp)
+// 0x01085cd0: 0x1085cd0: lw    s1, 1596(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10315,7 +10315,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 11
-// 0x010856b0: 0x10856b0: lw    s0, 1592(sp)
+// 0x01085cd4: 0x1085cd4: lw    s0, 1592(sp)
 	ldloc 7
 	ldloc.0
 	ldc.i4.2
@@ -10324,7 +10324,7 @@ L_1085688:
 	add
 	ldelem.i4
 	stloc 13
-// 0x010856b4: 0x10856b4: jr    ra addiu sp, sp, 1632
+// 0x01085cd8: 0x1085cd8: jr    ra addiu sp, sp, 1632
 	ldloc.0
 	ldc.i4 1632
 	add
diff --git a/converted/cibyl.dll b/converted/cibyl.dll
index a441ec1..1789af9 100644
Binary files a/converted/cibyl.dll and b/converted/cibyl.dll differ
diff --git a/converted/cibyl.pdb b/converted/cibyl.pdb
index 8f7ad3c..551a85d 100644
Binary files a/converted/cibyl.pdb and b/converted/cibyl.pdb differ